diff --git a/include/ascii_util.h b/include/ascii_util.h index d9ee55583d..8f472af157 100644 --- a/include/ascii_util.h +++ b/include/ascii_util.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_ASCII_UTIL_H #include + #include "charcode.h" -#define MAX_STRING_COPY_LEN 256 +#define MAX_STRING_COPY_LEN 256 int Ascii_Length(char *str); -char* Ascii_CopyToTerminator(char *src, char *dst, char terminator); +char *Ascii_CopyToTerminator(char *src, char *dst, char terminator); int Ascii_ConvertToInt(char *str); void Ascii_SetResourceName(NNSG3dResName *resource, const char *src); BOOL IsFullWidthChar(charcode_t character); diff --git a/include/bag.h b/include/bag.h index 18c16936b0..2b6dfed3b9 100644 --- a/include/bag.h +++ b/include/bag.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_BAG_H #define POKEPLATINUM_BAG_H -#include "savedata.h" #include "constants/heap.h" +#include "savedata.h" + #define ITEM_POCKET_SIZE 165 #define KEY_ITEM_POCKET_SIZE 50 #define TMHM_POCKET_SIZE 100 @@ -69,18 +70,18 @@ void Pocket_Sort(BagItem *pocket, const u32 size); // Same as Pocket_SortEmpty, void *sub_0207D824(Bag *bag, const u8 *pockets, enum HeapId heapID); BagItem *Bag_GetItemSlot(Bag *bag, u16 pocketID, u16 slot); Bag *SaveData_GetBag(SaveData *saveData); -UnkStruct_0207D99C * sub_0207D99C(u32 param0); -void sub_0207D9B4(UnkStruct_0207D99C * param0, u32 param1, u8 * param2, u8 * param3); -u16 sub_0207D9C4(UnkStruct_0207D99C * param0); -void sub_0207D9C8(UnkStruct_0207D99C * param0, u32 param1, u8 param2, u8 param3); -void sub_0207D9D4(UnkStruct_0207D99C * param0, u16 param1); -void sub_0207D9D8(UnkStruct_0207D99C * param0, u32 param1, u8 * param2, u8 * param3); -u16 sub_0207D9E4(UnkStruct_0207D99C * param0); -u16 sub_0207D9E8(UnkStruct_0207D99C * param0); -u16 sub_0207D9EC(UnkStruct_0207D99C * param0); -void sub_0207D9F0(UnkStruct_0207D99C * param0, u32 param1, u8 param2, u8 param3); -void sub_0207D9F8(UnkStruct_0207D99C * param0); -void Bag_SetLastItemUsed(UnkStruct_0207D99C * param0, u16 param1, u16 param2); -void sub_0207DA24(UnkStruct_0207D99C * param0, u16 param1); +UnkStruct_0207D99C *sub_0207D99C(u32 param0); +void sub_0207D9B4(UnkStruct_0207D99C *param0, u32 param1, u8 *param2, u8 *param3); +u16 sub_0207D9C4(UnkStruct_0207D99C *param0); +void sub_0207D9C8(UnkStruct_0207D99C *param0, u32 param1, u8 param2, u8 param3); +void sub_0207D9D4(UnkStruct_0207D99C *param0, u16 param1); +void sub_0207D9D8(UnkStruct_0207D99C *param0, u32 param1, u8 *param2, u8 *param3); +u16 sub_0207D9E4(UnkStruct_0207D99C *param0); +u16 sub_0207D9E8(UnkStruct_0207D99C *param0); +u16 sub_0207D9EC(UnkStruct_0207D99C *param0); +void sub_0207D9F0(UnkStruct_0207D99C *param0, u32 param1, u8 param2, u8 param3); +void sub_0207D9F8(UnkStruct_0207D99C *param0); +void Bag_SetLastItemUsed(UnkStruct_0207D99C *param0, u16 param1, u16 param2); +void sub_0207DA24(UnkStruct_0207D99C *param0, u16 param1); #endif // POKEPLATINUM_BAG_H diff --git a/include/battle/ai_context.h b/include/battle/ai_context.h index 1986212d95..7444b43f30 100644 --- a/include/battle/ai_context.h +++ b/include/battle/ai_context.h @@ -23,7 +23,7 @@ typedef struct AIContext { int padding0014; // this does not match with a u32, weird u8 moveDamageRolls[LEARNED_MOVES_MAX]; - + u16 battlerMoves[MAX_BATTLERS][LEARNED_MOVES_MAX]; u8 battlerAbilities[MAX_BATTLERS]; u16 battlerHeldItems[MAX_BATTLERS]; diff --git a/include/battle/battle_context.h b/include/battle/battle_context.h index d18fab228e..204a672ac4 100644 --- a/include/battle/battle_context.h +++ b/include/battle/battle_context.h @@ -4,14 +4,14 @@ #include "constants/battle.h" #include "constants/pokemon.h" -#include "battle/ai_context.h" -#include "battle/battle_message.h" -#include "battle/battle_mon.h" - +#include "struct_decls/battle_system.h" #include "struct_decls/cell_actor_data.h" #include "struct_decls/font_oam.h" #include "struct_defs/sprite_manager_allocation.h" -#include "struct_decls/battle_system.h" + +#include "battle/ai_context.h" +#include "battle/battle_message.h" +#include "battle/battle_mon.h" #include "overlay012/struct_ball_rotation_decl.h" typedef struct BattleContext BattleContext; @@ -161,7 +161,7 @@ struct BattleContext { int sideEffectFlags; int sideEffectMon; int lastBattlerId; - + int gainedExp; int sharedExp; u32 sideGetExpMask[2]; @@ -197,13 +197,13 @@ struct BattleContext { BattleScriptTaskData *taskData; void *tmpData; - + u32 fieldConditionsMask; FieldConditions fieldConditions; u32 sideConditionsMask[NUM_BATTLE_SIDES]; SideConditions sideConditions[NUM_BATTLE_SIDES]; - + TurnFlags turnFlags[MAX_BATTLERS]; SelfTurnFlags selfTurnFlags[MAX_BATTLERS]; MoveFailFlags moveFailFlags[MAX_BATTLERS]; @@ -214,7 +214,7 @@ struct BattleContext { u32 battleStatusMask; u32 battleStatusMask2; - + int damage; int hitDamage; int criticalBoosts; @@ -243,12 +243,12 @@ struct BattleContext { u8 selectedPartySlot[MAX_BATTLERS]; u8 switchedPartySlot[MAX_BATTLERS]; u8 aiSwitchedPartySlot[MAX_BATTLERS]; - + u32 battlerActions[MAX_BATTLERS][MAX_BATTLE_ACTIONS]; u8 battlerActionOrder[MAX_BATTLERS]; u8 monSpeedOrder[MAX_BATTLERS]; u32 monSpeedValues[MAX_BATTLERS]; - + u8 ioQueue[MAX_LINK_BATTLERS][MAX_BATTLERS][BATTLE_IO_QUEUE_SIZE]; u8 ioBuffer[MAX_BATTLERS][BATTLE_IO_BUFFER_SIZE]; int battleScript[BATTLE_SCRIPT_SIZE_MAX]; @@ -282,7 +282,7 @@ struct BattleContext { u16 padding310A; u16 speedRand[MAX_BATTLERS]; - + int flingTemp; int flingScript; diff --git a/include/battle/battle_controller.h b/include/battle/battle_controller.h index a4ee5956ab..21f1623bae 100644 --- a/include/battle/battle_controller.h +++ b/include/battle/battle_controller.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_BATTLE_CONTROLLER_H #include "struct_decls/battle_system.h" + #include "battle/battle_context.h" enum BattleControlSequence { @@ -37,15 +38,15 @@ enum BattleControlSequence { BATTLE_CONTROL_USE_MOVE, BATTLE_CONTROL_UPDATE_HP, BATTLE_CONTROL_AFTER_MOVE_MESSAGE, -// 29 is an unused state + // 29 is an unused state BATTLE_CONTROL_AFTER_MOVE_EFFECT = 30, BATTLE_CONTROL_LOOP_MULTI_HIT, -// 32 is an unused state + // 32 is an unused state BATTLE_CONTROL_LOOP_FAINTED = 33, BATTLE_CONTROL_LOOP_SPREAD_MOVES, BATTLE_CONTROL_FAINT_AFTER_SELFDESTRUCT, BATTLE_CONTROL_TRIGGER_AFTER_HIT_EFFECTS, -// 37 is an unused state + // 37 is an unused state BATTLE_CONTROL_UPDATE_MOVE_BUFFERS = 38, BATTLE_CONTROL_MOVE_END, BATTLE_CONTROL_CHECK_ANY_FAINTED, @@ -92,27 +93,27 @@ enum { /** * @brief Create a new BattleContext struct from the given BattleSystem. - * + * * The context itself will be initialized along with its state-counters, its AI * context, the move data table, and the item data table. Memory for the new * structure will always be allocated from the Battle heap. - * - * @param battleSys + * + * @param battleSys * @return Address of the newly-allocated BattleContext struct. */ -void* BattleContext_New(BattleSystem *battleSys); +void *BattleContext_New(BattleSystem *battleSys); /** * @brief Main executor for the battle state machine. - * + * * If the battle is deemed to not yet be complete, then a command will be * loaded from the parent context struct and the respective state machine * function will be invoked. - * + * * For the sequence of states in the machine, see enum BattleControlSequence. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if the battle for this state machine is complete; FALSE * otherwise. */ @@ -120,22 +121,22 @@ BOOL BattleController_Main(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Free the child memory blocks allocated for a BattleContext struct. - * - * @param battleCtx + * + * @param battleCtx */ void BattleContext_Free(BattleContext *battleCtx); /** * @brief Determine if a move used by the attacking battler will hit its target. - * + * * This routine will account for both the standard accuracy formula and any * effects which would otherwise override that formula. Move status flags will * be updated with information about the move's result. - * - * @param battleSys - * @param battleCtx - * @param attacker - * @param defender + * + * @param battleSys + * @param battleCtx + * @param attacker + * @param defender * @param move */ void BattleController_CheckMoveHit(BattleSystem *battleSys, BattleContext *battleCtx, int attacker, int defender, int move); diff --git a/include/battle/battle_display.h b/include/battle/battle_display.h index 955c786444..65db80ff11 100644 --- a/include/battle/battle_display.h +++ b/include/battle/battle_display.h @@ -1,9 +1,11 @@ #ifndef POKEPLATINUM_OV16_0225CBB8_H #define POKEPLATINUM_OV16_0225CBB8_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" #include "struct_defs/battle_io.h" + +#include "battle/battle_message.h" #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_0225C168.h" #include "battle/struct_ov16_0225C17C.h" @@ -13,7 +15,6 @@ #include "battle/struct_ov16_0225C2C4.h" #include "battle/struct_ov16_0225C2D8.h" #include "battle/struct_ov16_0225C2EC.h" -#include "battle/battle_message.h" #include "battle/struct_ov16_0225C35C.h" #include "battle/struct_ov16_0225C370.h" #include "battle/struct_ov16_0225C384.h" @@ -41,121 +42,121 @@ #include "battle/struct_ov16_022674C4.h" #include "battle/struct_ov16_0226C378.h" -void ov16_0225CBB8(BattleSystem * param0, BattlerData * param1); -void ov16_0225CBDC(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C168 * param2); -void ov16_0225CE1C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C17C * param2); -void ov16_0225CF70(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C17C * param2); -void ov16_0225D118(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02264EF8 * param2); -void ov16_0225D1C4(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265050 * param2); -void ov16_0225D228(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265124 * param2); -void ov16_0225D360(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265154 * param2); -void ov16_0225D3CC(BattleSystem * param0, BattlerData * param1); -void ov16_0225D414(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022651A8 * param2); +void ov16_0225CBB8(BattleSystem *param0, BattlerData *param1); +void ov16_0225CBDC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C168 *param2); +void ov16_0225CE1C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C17C *param2); +void ov16_0225CF70(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C17C *param2); +void ov16_0225D118(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02264EF8 *param2); +void ov16_0225D1C4(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265050 *param2); +void ov16_0225D228(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265124 *param2); +void ov16_0225D360(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265154 *param2); +void ov16_0225D3CC(BattleSystem *param0, BattlerData *param1); +void ov16_0225D414(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022651A8 *param2); /** * @brief Slide the healthbar into the screen. - * - * @param battleSys - * @param battlerData - * @param healthbarData + * + * @param battleSys + * @param battlerData + * @param healthbarData */ void BattleDisplay_SlideHealthbarIn(BattleSystem *battleSys, BattlerData *battlerData, HealthbarData *healthbarData); /** * @brief Slide the healthbar out of the screen. - * - * @param battleSys - * @param battlerData + * + * @param battleSys + * @param battlerData */ void BattleDisplay_SlideHealthbarOut(BattleSystem *battleSys, BattlerData *battlerData); -void ov16_0225D5B8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C260 * param2); -void ov16_0225D698(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022656F0 * param2); -void ov16_0225D708(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C29C * param2); -void ov16_0225D794(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2B0 * param2); -void ov16_0225D840(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2C4 * param2); -void ov16_0225D8AC(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2D8 * param2); -void ov16_0225D8F0(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2EC * param2); +void ov16_0225D5B8(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C260 *param2); +void ov16_0225D698(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022656F0 *param2); +void ov16_0225D708(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C29C *param2); +void ov16_0225D794(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C2B0 *param2); +void ov16_0225D840(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C2C4 *param2); +void ov16_0225D8AC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C2D8 *param2); +void ov16_0225D8F0(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C2EC *param2); /** * @brief Print a message to the screen. - * + * * @param battleSys * @param battlerData * @param battleMsg */ void BattleDisplay_PrintMessage(BattleSystem *battleSys, BattlerData *battlerData, BattleMessage *battleMsg); -void ov16_0225D9A8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2); -void ov16_0225DA44(BattleSystem * param0, BattlerData * param1); -void ov16_0225DA74(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C35C * param2); -void ov16_0225DB00(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C370 * param2); -void ov16_0225DB74(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C384 * param2); -void ov16_0225DC4C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C398 * param2); -void ov16_0225DC7C(BattleSystem * param0, BattlerData * param1); -void ov16_0225DCB0(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3BC * param2); -void ov16_0225DD44(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3D0 * param2); -void ov16_0225DD7C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3E4 * param2); -void ov16_0225DDD8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3F8 * param2); -void ov16_0225DE30(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C40C * param2); -void ov16_0225DE88(BattleSystem * param0, BattlerData * param1); -void ov16_0225DEDC(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C430 * param2); -void ov16_0225DF34(BattleSystem * param0, BattlerData * param1); -void ov16_0225DF6C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C454 * param2); -void ov16_0225E008(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C468 * param2); -void ov16_0225E0BC(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C65C * param2); -void ov16_0225E0F4(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022664F8 * param2); +void ov16_0225D9A8(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265BBC *param2); +void ov16_0225DA44(BattleSystem *param0, BattlerData *param1); +void ov16_0225DA74(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C35C *param2); +void ov16_0225DB00(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C370 *param2); +void ov16_0225DB74(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C384 *param2); +void ov16_0225DC4C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C398 *param2); +void ov16_0225DC7C(BattleSystem *param0, BattlerData *param1); +void ov16_0225DCB0(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3BC *param2); +void ov16_0225DD44(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3D0 *param2); +void ov16_0225DD7C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3E4 *param2); +void ov16_0225DDD8(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3F8 *param2); +void ov16_0225DE30(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C40C *param2); +void ov16_0225DE88(BattleSystem *param0, BattlerData *param1); +void ov16_0225DEDC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C430 *param2); +void ov16_0225DF34(BattleSystem *param0, BattlerData *param1); +void ov16_0225DF6C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C454 *param2); +void ov16_0225E008(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C468 *param2); +void ov16_0225E0BC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C65C *param2); +void ov16_0225E0F4(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022664F8 *param2); /** * @brief Show the start-of-battle party gauge. - * - * @param battleSys - * @param battlerData - * @param partyGauge + * + * @param battleSys + * @param battlerData + * @param partyGauge */ void BattleDisplay_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); /** * @brief Hide the start-of-battle party gauge. - * - * @param battleSys - * @param battlerData - * @param partyGauge + * + * @param battleSys + * @param battlerData + * @param partyGauge */ void BattleDisplay_HideBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); /** * @brief Show the mid-battle party gauge. - * - * @param battleSys - * @param battlerData - * @param partyGauge + * + * @param battleSys + * @param battlerData + * @param partyGauge */ void BattleDisplay_ShowPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); /** * @brief Hide the mid-battle party gauge. - * - * @param battleSys - * @param battlerData - * @param partyGauge + * + * @param battleSys + * @param battlerData + * @param partyGauge */ void BattleDisplay_HidePartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); -void ov16_0225E23C(BattleSystem * param0, BattlerData * param1); -void ov16_0225E294(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2); -void ov16_0225E2C8(BattleSystem * param0, BattlerData * param1); -void ov16_0225E300(BattleSystem * param0, BattlerData * param1); -void ov16_0225E338(BattleSystem * param0, BattlerData * param1); -void ov16_0225E38C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C9F0 * param2); -void ov16_0225E3E0(BattleSystem * param0, BattlerData * param1); -void ov16_0225E434(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2); -void ov16_0225E468(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225CA4C * param2); -void ov16_0225E4C8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225CA60 * param2); -void ov16_02263730(BattleSystem * param0, BattlerData * param1); -u8 Battler_Type(BattlerData * param0); -u8 Battler_BootState(BattlerData * param0); -Sprite * ov16_02263AFC(BattlerData * param0); -Healthbar * ov16_02263B08(BattlerData * param0); -UnkStruct_ov16_0226C378 * ov16_02263B0C(BattlerData * param0); -void ov16_02263B10(BattlerData * param0); -void ov16_02263B20(BattlerData * param0, int param1); +void ov16_0225E23C(BattleSystem *param0, BattlerData *param1); +void ov16_0225E294(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265BBC *param2); +void ov16_0225E2C8(BattleSystem *param0, BattlerData *param1); +void ov16_0225E300(BattleSystem *param0, BattlerData *param1); +void ov16_0225E338(BattleSystem *param0, BattlerData *param1); +void ov16_0225E38C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C9F0 *param2); +void ov16_0225E3E0(BattleSystem *param0, BattlerData *param1); +void ov16_0225E434(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265BBC *param2); +void ov16_0225E468(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225CA4C *param2); +void ov16_0225E4C8(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225CA60 *param2); +void ov16_02263730(BattleSystem *param0, BattlerData *param1); +u8 Battler_Type(BattlerData *param0); +u8 Battler_BootState(BattlerData *param0); +Sprite *ov16_02263AFC(BattlerData *param0); +Healthbar *ov16_02263B08(BattlerData *param0); +UnkStruct_ov16_0226C378 *ov16_02263B0C(BattlerData *param0); +void ov16_02263B10(BattlerData *param0); +void ov16_02263B20(BattlerData *param0, int param1); #endif // POKEPLATINUM_OV16_0225CBB8_H diff --git a/include/battle/battle_io.h b/include/battle/battle_io.h index 2cc1820816..996cd62148 100644 --- a/include/battle/battle_io.h +++ b/include/battle/battle_io.h @@ -2,155 +2,156 @@ #define POKEPLATINUM_OV16_0226485C_H #include "struct_decls/battle_system.h" + #include "battle/battle_context.h" -#include "battle/struct_ov16_0224DDA8.h" #include "battle/battle_message.h" +#include "battle/struct_ov16_0224DDA8.h" #include "battle/struct_ov16_02265BBC.h" -void ov16_02264988(BattleSystem * param0, int param1); -void BattleIO_SetupBattleUI(BattleSystem * param0, int param1); -void BattleIO_SetEncounter(BattleSystem * param0, int param1); -void BattleIO_ShowEncounter(BattleSystem * param0, int param1); -void BattleIO_ShowPokemon(BattleSystem * param0, int param1, int param2, int param3); -void BattleIO_ReturnPokemon(BattleSystem * param0, BattleContext * param1, int param2); -void ov16_02265050(BattleSystem * param0, int param1, int param2); -void BattleIO_DeletePokemon(BattleSystem * param0, int param1); -void BattleIO_SetTrainerEncounter(BattleSystem * param0, int param1); -void BattleIO_ThrowTrainerBall(BattleSystem * param0, int param1, int param2); -void BattleIO_SlideTrainerOut(BattleSystem * param0, int param1); -void BattleIO_SlideTrainerIn(BattleSystem * param0, int param1, int param2); +void ov16_02264988(BattleSystem *param0, int param1); +void BattleIO_SetupBattleUI(BattleSystem *param0, int param1); +void BattleIO_SetEncounter(BattleSystem *param0, int param1); +void BattleIO_ShowEncounter(BattleSystem *param0, int param1); +void BattleIO_ShowPokemon(BattleSystem *param0, int param1, int param2, int param3); +void BattleIO_ReturnPokemon(BattleSystem *param0, BattleContext *param1, int param2); +void ov16_02265050(BattleSystem *param0, int param1, int param2); +void BattleIO_DeletePokemon(BattleSystem *param0, int param1); +void BattleIO_SetTrainerEncounter(BattleSystem *param0, int param1); +void BattleIO_ThrowTrainerBall(BattleSystem *param0, int param1, int param2); +void BattleIO_SlideTrainerOut(BattleSystem *param0, int param1); +void BattleIO_SlideTrainerIn(BattleSystem *param0, int param1, int param2); /** * @brief Slide the healthbar into the screen for a given battler. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @param delay Optional frame-delay to wait until execution. */ void BattleIO_SlideHealthbarIn(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int delay); /** * @brief Slide the healthbar out of the screen for a given battler. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler */ void BattleIO_SlideHealthbarOut(BattleSystem *battleSys, int battler); void BattleIO_SetCommandSelection(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int partySlot); -void ov16_022656D4(BattleSystem * param0, int param1, int param2); +void ov16_022656D4(BattleSystem *param0, int param1, int param2); void BattleIO_ShowMoveSelectScreen(BattleSystem *battleSys, BattleContext *battleCtx, int battler); -void ov16_02265790(BattleSystem * param0, int param1, int param2); +void ov16_02265790(BattleSystem *param0, int param1, int param2); void BattleIO_ShowTargetSelection(BattleSystem *battleSys, BattleContext *battleCtx, int range, int battler); -void ov16_022658CC(BattleSystem * param0, int param1, int param2); +void ov16_022658CC(BattleSystem *param0, int param1, int param2); void BattleIO_ShowBagScreen(BattleSystem *battleSys, BattleContext *battleCtx, int battler); -void ov16_02265A70(BattleSystem * param0, int param1, BattleItemUse param2); +void ov16_02265A70(BattleSystem *param0, int param1, BattleItemUse param2); void BattleIO_ShowPartyScreen(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int listMode, int canSwitch, int doubles); -void ov16_02265B10(BattleSystem * param0, int param1, int param2); +void ov16_02265B10(BattleSystem *param0, int param1, int param2); void BattleIO_ShowYesNoScreen(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int promptMsg, int yesnoType, int move, int nickname); -void BattleIO_PrintAttackMessage(BattleSystem * param0, BattleContext * param1); +void BattleIO_PrintAttackMessage(BattleSystem *param0, BattleContext *param1); /** * @brief Submit a BattleMessage to the I/O queue for display on the screen. - * - * @param battleSys - * @param battleCtx - * @param battleMsg + * + * @param battleSys + * @param battleCtx + * @param battleMsg */ void BattleIO_PrintMessage(BattleSystem *battleSys, BattleContext *battleCtx, BattleMessage *battleMsg); -void BattleIO_PlayMoveAnimation(BattleSystem * param0, BattleContext * param1, u16 param2); -void BattleIO_PlayMoveAnimationA2D(BattleSystem * param0, BattleContext * param1, u16 param2, int param3, int param4); -void BattleIO_FlickerBattler(BattleSystem * param0, int param1, u32 param2); -void BattleIO_UpdateHPGauge(BattleSystem * param0, BattleContext * param1, int param2); -void BattleIO_UpdateExpGauge(BattleSystem * param0, BattleContext * param1, int param2, int param3); -void BattleIO_PlayFaintingSequence(BattleSystem * param0, BattleContext * param1, int param2); -void BattleIO_PlaySound(BattleSystem * param0, BattleContext * param1, int param2, int param3); -void BattleIO_FadeOut(BattleSystem * param0, BattleContext * param1); -void BattleIO_ToggleVanish(BattleSystem * param0, int param1, int param2); -void BattleIO_SetStatusIcon(BattleSystem * param0, int param1, int param2); -void BattleIO_TrainerMessage(BattleSystem * param0, int param1, int param2); -void BattleIO_PlayStatusEffect(BattleSystem * param0, BattleContext * param1, int param2, int param3); -void BattleIO_PlayStatusEffectAToD(BattleSystem * param0, BattleContext * param1, int param2, int param3, int param4); -void BattleIO_PrintRecallMessage(BattleSystem * param0, BattleContext * param1, int param2, int param3); -void BattleIO_PrintSendOutMessage(BattleSystem * param0, BattleContext * param1, int param2, int param3); -void BattleIO_PrintBattleStartMessage(BattleSystem * param0, BattleContext * param1, int param2); -void BattleIO_PrintLeadMonMessage(BattleSystem * param0, BattleContext * param1, int param2); -void BattleIO_PlayLevelUpAnimation(BattleSystem * param0, int param1); +void BattleIO_PlayMoveAnimation(BattleSystem *param0, BattleContext *param1, u16 param2); +void BattleIO_PlayMoveAnimationA2D(BattleSystem *param0, BattleContext *param1, u16 param2, int param3, int param4); +void BattleIO_FlickerBattler(BattleSystem *param0, int param1, u32 param2); +void BattleIO_UpdateHPGauge(BattleSystem *param0, BattleContext *param1, int param2); +void BattleIO_UpdateExpGauge(BattleSystem *param0, BattleContext *param1, int param2, int param3); +void BattleIO_PlayFaintingSequence(BattleSystem *param0, BattleContext *param1, int param2); +void BattleIO_PlaySound(BattleSystem *param0, BattleContext *param1, int param2, int param3); +void BattleIO_FadeOut(BattleSystem *param0, BattleContext *param1); +void BattleIO_ToggleVanish(BattleSystem *param0, int param1, int param2); +void BattleIO_SetStatusIcon(BattleSystem *param0, int param1, int param2); +void BattleIO_TrainerMessage(BattleSystem *param0, int param1, int param2); +void BattleIO_PlayStatusEffect(BattleSystem *param0, BattleContext *param1, int param2, int param3); +void BattleIO_PlayStatusEffectAToD(BattleSystem *param0, BattleContext *param1, int param2, int param3, int param4); +void BattleIO_PrintRecallMessage(BattleSystem *param0, BattleContext *param1, int param2, int param3); +void BattleIO_PrintSendOutMessage(BattleSystem *param0, BattleContext *param1, int param2, int param3); +void BattleIO_PrintBattleStartMessage(BattleSystem *param0, BattleContext *param1, int param2); +void BattleIO_PrintLeadMonMessage(BattleSystem *param0, BattleContext *param1, int param2); +void BattleIO_PlayLevelUpAnimation(BattleSystem *param0, int param1); void BattleIO_SetAlertMessage(BattleSystem *battleSys, int battler, BattleMessage msg); -void ov16_022661B0(BattleSystem * param0, int param1); -void BattleIO_RefreshHPGauge(BattleSystem * param0, BattleContext * param1, int param2); -void BattleIO_UpdatePartyMon(BattleSystem * param0, BattleContext * param1, int param2); -void ov16_02266460(BattleSystem * param0, int param1); +void ov16_022661B0(BattleSystem *param0, int param1); +void BattleIO_RefreshHPGauge(BattleSystem *param0, BattleContext *param1, int param2); +void BattleIO_UpdatePartyMon(BattleSystem *param0, BattleContext *param1, int param2); +void ov16_02266460(BattleSystem *param0, int param1); void BattleIO_StopGaugeAnimation(BattleSystem *battleSys, int battler); -void BattleIO_RefreshPartyStatus(BattleSystem * param0, BattleContext * param1, int param2, int param3); -void BattleIO_ForgetMove(BattleSystem * param0, int param1, int param2, int param3); -void BattleIO_SetMosaic(BattleSystem * param0, int param1, int param2, int param3); -void BattleIO_ChangeWeatherForm(BattleSystem * param0, int param1); -void BattleIO_UpdateBG(BattleSystem * param0, int param1); -void BattleIO_ClearTouchScreen(BattleSystem * param0, int param1); +void BattleIO_RefreshPartyStatus(BattleSystem *param0, BattleContext *param1, int param2, int param3); +void BattleIO_ForgetMove(BattleSystem *param0, int param1, int param2, int param3); +void BattleIO_SetMosaic(BattleSystem *param0, int param1, int param2, int param3); +void BattleIO_ChangeWeatherForm(BattleSystem *param0, int param1); +void BattleIO_UpdateBG(BattleSystem *param0, int param1); +void BattleIO_ClearTouchScreen(BattleSystem *param0, int param1); /** * @brief Push a command to the I/O queue to show the party gauge at the start of a battle for a * given battler. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler */ void BattleIO_ShowBattleStartPartyGauge(BattleSystem *battleSys, int battler); /** * @brief Push a command to the I/O queue to hide the party gauge at the start of a battle for a * given battler. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler */ void BattleIO_HideBattleStartPartyGauge(BattleSystem *battleSys, int battler); /** * @brief Push a command to the I/O queue to show the party gauge for a given battler. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler */ void BattleIO_ShowPartyGauge(BattleSystem *battleSys, int battler); /** * @brief Push a command to the I/O queue to hide the party gauge for a given battler. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler */ void BattleIO_HidePartyGauge(BattleSystem *battleSys, int battler); /** * @brief Push a command to the I/O queue to load the graphics resources for the party gauge. - * - * @param battleSys + * + * @param battleSys */ void BattleIO_LoadPartyGaugeGraphics(BattleSystem *battleSys); /** * @brief Push a command to the I/O queue to free the graphics resources for the party gauge. - * - * @param battleSys + * + * @param battleSys */ void BattleIO_FreePartyGaugeGraphics(BattleSystem *battleSys); -void BattleIO_IncrementRecord(BattleSystem * param0, int param1, int param2, int param3); +void BattleIO_IncrementRecord(BattleSystem *param0, int param1, int param2, int param3); void BattleIO_LinkWaitMessage(BattleSystem *battleSys, int battler); -void BattleIO_RestoreSprite(BattleSystem * param0, BattleContext * param1, int param2); -void BattleIO_SpriteToOAM(BattleSystem * param0, int param1); -void BattleIO_OAMToSprite(BattleSystem * param0, int param1); -void BattleIO_ResultMessage(BattleSystem * param0); -void BattleIO_EscapeMessage(BattleSystem * param0, BattleContext * param1); -void BattleIO_ForfeitMessage(BattleSystem * param0); -void BattleIO_RefreshSprite(BattleSystem * param0, BattleContext * param1, int param2); -void BattleIO_PlayMoveHitSoundEffect(BattleSystem * param0, BattleContext * param1, int param2); -void BattleIO_PlayMusic(BattleSystem * param0, int param1, int param2); -void BattleIO_SubmitResult(BattleSystem * param0); -void BattleIO_ClearMessageBox(BattleSystem * param0); -void ClearCommand(BattleSystem * param0, int param1, int param2); -BOOL ov16_02266AE4(BattleSystem * param0, void * param1); -void ov16_02266B78(BattleSystem * param0, BattleContext * param1, UnkStruct_ov16_02265BBC * param2, int param3, int param4, int param5, int param6, u16 param7); +void BattleIO_RestoreSprite(BattleSystem *param0, BattleContext *param1, int param2); +void BattleIO_SpriteToOAM(BattleSystem *param0, int param1); +void BattleIO_OAMToSprite(BattleSystem *param0, int param1); +void BattleIO_ResultMessage(BattleSystem *param0); +void BattleIO_EscapeMessage(BattleSystem *param0, BattleContext *param1); +void BattleIO_ForfeitMessage(BattleSystem *param0); +void BattleIO_RefreshSprite(BattleSystem *param0, BattleContext *param1, int param2); +void BattleIO_PlayMoveHitSoundEffect(BattleSystem *param0, BattleContext *param1, int param2); +void BattleIO_PlayMusic(BattleSystem *param0, int param1, int param2); +void BattleIO_SubmitResult(BattleSystem *param0); +void BattleIO_ClearMessageBox(BattleSystem *param0); +void ClearCommand(BattleSystem *param0, int param1, int param2); +BOOL ov16_02266AE4(BattleSystem *param0, void *param1); +void ov16_02266B78(BattleSystem *param0, BattleContext *param1, UnkStruct_ov16_02265BBC *param2, int param3, int param4, int param5, int param6, u16 param7); #endif // POKEPLATINUM_OV16_0226485C_H diff --git a/include/battle/battle_io_command.h b/include/battle/battle_io_command.h index fbe74c71c5..2a3227acca 100644 --- a/include/battle/battle_io_command.h +++ b/include/battle/battle_io_command.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV16_0225BFFC_H #include "struct_decls/battle_system.h" + #include "battle/struct_ov16_0223C2C0.h" #include "battle/struct_ov16_0225BFFC_decl.h" -BattlerData * ov16_0225BFFC(BattleSystem * param0, UnkStruct_ov16_0223C2C0 * param1); -void ov16_0225C038(BattleSystem * param0, BattlerData * param1, int param2, int param3); -void ov16_0225C0DC(BattleSystem * param0, BattlerData * param1); -void ov16_0225C104(BattleSystem * param0, BattlerData * param1, int param2); +BattlerData *ov16_0225BFFC(BattleSystem *param0, UnkStruct_ov16_0223C2C0 *param1); +void ov16_0225C038(BattleSystem *param0, BattlerData *param1, int param2, int param3); +void ov16_0225C0DC(BattleSystem *param0, BattlerData *param1); +void ov16_0225C104(BattleSystem *param0, BattlerData *param1, int param2); #endif // POKEPLATINUM_OV16_0225BFFC_H diff --git a/include/battle/battle_lib.h b/include/battle/battle_lib.h index 9d1d55d197..06abcb983d 100644 --- a/include/battle/battle_lib.h +++ b/include/battle/battle_lib.h @@ -4,13 +4,15 @@ #include "constants/battle.h" #include "constants/sound.h" -#include "pokemon.h" #include "struct_decls/battle_system.h" + #include "battle/battle_context.h" -#include "battle/battle_mon.h" #include "battle/battle_message.h" +#include "battle/battle_mon.h" #include "battle/btlcmd.h" +#include "pokemon.h" + enum CountAbilityMode { COUNT_ALL_BATTLERS_OUR_SIDE = 0, //< Count all the battlers on our side with the ability COUNT_ALIVE_BATTLERS_OUR_SIDE, //< Count all alive battlers on our side with the ability @@ -27,9 +29,9 @@ enum CountAbilityMode { /** * @brief Initialize a BattleMon from the Pokemon in the given battler's party, * from the given party slot. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler whose party will be read from * @param partySlot The slot in the party to retrieve */ @@ -38,17 +40,17 @@ void BattleSystem_InitBattleMon(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Reload a BattleMon from the given battler's party, from the given * party slot. - * + * * Specifically, this will only reload the following fields: - * + * * - battle stats (attack, defense, etc.) * - level * - friendship * - move known in each slot * - total experience - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler whose party will be read from * @param partySlot The slot in the party to retrieve */ @@ -56,8 +58,8 @@ void BattleSystem_ReloadPokemon(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Load a script file from the specified NARC. - * - * @param battleCtx + * + * @param battleCtx * @param narc Which NARC to open for the script * @param file Which file in the NARC to load */ @@ -66,8 +68,8 @@ void BattleSystem_LoadScript(BattleContext *battleCtx, int narc, int file); /** * @brief Load a script file from the specified NARC and invoke it as a call, * returning to the previous script once finished processing. - * - * @param battleCtx + * + * @param battleCtx * @param narc Which NARC to open for the script * @param file Which file in the NARC to load */ @@ -76,11 +78,11 @@ void BattleSystem_CallScript(BattleContext *battleCtx, int narc, int file); /** * @brief Pop a script from the stack, if one is present, and load it for * execution. - * + * * If a script is loaded, then this will also pop a value from the script cursor * stack and set the internal script cursor to that value. - * - * @param battleCtx + * + * @param battleCtx * @return TRUE if there are no contents in the stack to be loaded; FALSE if * a stack was popped and should be executed. */ @@ -88,8 +90,8 @@ BOOL BattleSystem_PopScript(BattleContext *battleCtx); /** * @brief Enqueue a value onto the given IO queue for the battler. - * - * @param battleCtx + * + * @param battleCtx * @param id ID of the queue to enqueue the value onto * @param battler Battler for which the value should be enqueued * @param val Value which will be enqueued @@ -98,8 +100,8 @@ void BattleIO_EnqueueVal(BattleContext *battleCtx, int id, int battler, int val) /** * @brief Dequeue a specific value from the given IO queue for the battler. - * - * @param battleCtx + * + * @param battleCtx * @param id ID of the queue to dequeue the value from * @param battler Battler for which the value should be dequeued * @param val Value which will be dequeued @@ -109,40 +111,40 @@ void BattleIO_DequeueVal(BattleContext *battleCtx, int id, int battler, int val) /** * @brief Determine if the Battle IO queue is empty (i.e., there are no pending * actions to be executed for any players hooked into this particular battle). - * + * * As a side effect, if the queue is empty, then this routine will also set the * link-battle timeout counter back to 0. - * - * @param battleCtx + * + * @param battleCtx * @return TRUE if the queue has no remaining actions; FALSE otherwise. */ BOOL BattleIO_QueueIsEmpty(BattleContext *battleCtx); /** * @brief Increments the link-battle timeout counter. - * + * * If the counter exceeds the maximum timeout value (1800, ~= 30 seconds), * then the link will be terminated with an error state. - * - * @param battleCtx + * + * @param battleCtx */ void BattleIO_UpdateTimeout(BattleContext *battleCtx); /** * @brief Clear the battle IO queue of all data. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler */ void BattleIO_ClearBuffer(BattleContext *battleCtx, int battler); /** * @brief Get a data field value from a given battler. - * - * @param battleCtx + * + * @param battleCtx * @param battler The requested battler * @param paramID ID of the field to retrieve from the battler - * @param[out] outBuf Buffer output for non-integral values (i.e., strings) + * @param[out] outBuf Buffer output for non-integral values (i.e., strings) * @return The value of the data field, or 0 if not recognized or output is * presented via outBuf */ @@ -150,8 +152,8 @@ int BattleMon_Get(BattleContext *battleCtx, int battler, enum BattleMonParam par /** * @brief Set a data field value for a given battler. - * - * @param battleCtx + * + * @param battleCtx * @param battler The requested battler * @param paramID ID of the field to retrieve from the battler * @param buf Buffer input for the value to be set @@ -160,10 +162,10 @@ void BattleMon_Set(BattleContext *battleCtx, int battler, enum BattleMonParam pa /** * @brief Add a value to a battler's data field. - * + * * This is just a convenience wrapper around BattleMon_AddVal. - * - * @param battleCtx + * + * @param battleCtx * @param battler The battler whose data should be modified * @param paramID ID of the field which should be modified * @param val Value to be added to the battler's data field @@ -172,8 +174,8 @@ void Battler_AddVal(BattleContext *battleCtx, int battler, enum BattleMonParam p /** * @brief Add a value to a Pokemon's data field. - * - * @param mon + * + * @param mon * @param paramID ID of the field which should be modified * @param val Value to be added to the Pokemon's data field */ @@ -182,11 +184,11 @@ void BattleMon_AddVal(BattleMon *mon, enum BattleMonParam paramID, int val); /** * @brief Compare the speed of two battlers and determine which of them should * move first. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler1 - * @param battler2 + * @param battler2 * @param ignoreQuickClaw If set to TRUE, the Quick Claw and Custap Berry * flags will NOT be set after determining if they * should activate. @@ -198,7 +200,7 @@ u8 BattleSystem_CompareBattlerSpeed(BattleSystem *battleSys, BattleContext *batt /** * @brief Clear the flag denoting that a battler (or its partner) are due to * gain experience. - * + * * @param battleCtx * @param battler The battler who should not gain experience. */ @@ -206,21 +208,21 @@ void BattleSystem_ClearSideExpGain(BattleContext *battleCtx, int battler); /** * @brief Flag a given battler as due to gain experience. - * + * * If the battle involves an AI partner, then this routine will not touch the * flag for the opposing side of the battle. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler who should gain experience. */ void BattleSystem_FlagBattlerExpGain(BattleSystem *battleSys, BattleContext *battleCtx, int battler); /** * @brief Trigger a primary effect on the current move. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param[out] effect Output parameter for the effect to be loaded. * @return TRUE if an effect should be loaded, FALSE if the result should be * ignored. @@ -229,9 +231,9 @@ BOOL BattleSystem_TriggerPrimaryEffect(BattleSystem *battleSys, BattleContext *b /** * @brief Trigger a secondary effect on the current move. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param[out] effect Output parameter for the effect to be loaded. * @return TRUE if an effect should be loaded, FALSE if the result should be * ignored. @@ -240,17 +242,17 @@ BOOL BattleSystem_TriggerSecondaryEffect(BattleSystem *battleSys, BattleContext /** * @brief Find the defender for the move. - * + * * The defender can be chosen at random in certain scenarios, but only while * the randomize parameter is TRUE: - * + * * 1. The move's range is Me First * 2. The move's range is Acupressure * 3. The move is a standard single-target attack, e.g., Thunderbolt - * - * @param battleSys - * @param battleCtx - * @param attacker + * + * @param battleSys + * @param battleCtx + * @param attacker * @param move The move being used * @param randomize If TRUE, permit randomization of target-selection for certain moves * @param inRange An input range to prefer for the move over whatever range is set on the move data @@ -260,24 +262,24 @@ int BattleSystem_Defender(BattleSystem *battleSys, BattleContext *battleCtx, int /** * @brief Check for redirection abilities given an attacker using a certain move. - * + * * This routine will update the appropriate flags and the current target if the * used move is Electric- or Water-type, has single-target range, and at least * one other battler on the field has Lightning Rod or Storm Drain, respectively. - * - * @param battleSys - * @param battleCtx - * @param attacker - * @param move + * + * @param battleSys + * @param battleCtx + * @param attacker + * @param move */ void BattleSystem_CheckRedirectionAbilities(BattleSystem *battleSys, BattleContext *battleCtx, int attacker, u16 move); /** * @brief Trigger a redirection ability's effect and load the appropriate * subscript for execution. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if a subscript was loaded and should be executed for the effect, * FALSE otherwise. */ @@ -285,115 +287,115 @@ BOOL BattleSystem_TriggerRedirectionAbilities(BattleSystem *battleSys, BattleCon /** * @brief Copy the given battler back to its backing Pokemon structure in the party. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler */ void BattleMon_CopyToParty(BattleSystem *battleSys, BattleContext *battleCtx, int battler); /** * @brief Locks the battler into their current move. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler */ void Battler_LockMoveChoice(BattleSystem *battleSys, BattleContext *battleCtx, int battler); /** * @brief Unlocks the battler's future move choices. - * + * * This will also, as a convenience, toggle off the flags for Bide and semi- * invulnerable moves and reset the counters for Rollout and Fury Cutter. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler */ void Battler_UnlockMoveChoice(BattleSystem *battleSys, BattleContext *battleCtx, int battler); /** * @brief Calculate the status effect value for a battler's non-volatile * condition, if any. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return A value representing the battler's status non-volatile status. */ enum BattleAnimation Battler_StatusCondition(BattleContext *battleCtx, int battler); /** * @brief Check if the given trainer has a trainer message to be shown. - * + * * If a trainer message is to be shown, then the respective battler will be * updated with the appropriate flag, and battleCtx->msgTemp will be loaded * with the type of message to be shown. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if a message should be shown, else FALSE. */ BOOL BattleSystem_CheckTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Initialize the BattleContext structure with start-of-turn state. - * - * @param battleCtx + * + * @param battleCtx */ void BattleContext_Init(BattleContext *battleCtx); /** * @brief Initialize standard counters for the BattleContext structure. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ void BattleContext_InitCounters(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Update relevant buffers for a battler after a switch. - * + * * This handles all of the logic for what effects are zero'd out due to a * switch, as well as what effects are transferred across a switch due to * Baton Pass. - * + * * This routine will update the battler's chosen command to be MOVE_END, which * functionally ends their turn. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The switching battler */ void BattleSystem_UpdateAfterSwitch(BattleSystem *battleSys, BattleContext *battleCtx, int battler); /** * @brief Cleanup lingering state according to the given battler. - * + * * This routine will clean up any volatile status values dependent on the * fainted battler (Mean Look, Attract, Bind), all move effects and single-turn * flags, and extra data associated with the battler that is elsewhere in the * battle context struct (e.g., buffers for Conversion 2, Sketch, and Mirror * Move). - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler */ void BattleSystem_CleanupFaintedMon(BattleSystem *battleSys, BattleContext *battleCtx, int battler); /** * @brief Clear single-turn flags and buffered values in setup for the next turn. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ void BattleSystem_SetupNextTurn(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Compute which moves are invalid for the battler to use, performing * checks according to the input opcode mask. - * + * * The following op-codes are supported in the input mask: * - CHECK_INVALID_NO_MOVE -> flag empty move-slots * - CHECK_INVALID_NO_PP -> flag moves with no remaining PP @@ -404,9 +406,9 @@ void BattleSystem_SetupNextTurn(BattleSystem *battleSys, BattleContext *battleCt * - CHECK_INVALID_GRAVITY -> flag any of the battler's moves which fail in high gravity * - CHECK_INVALID_HEAL_BLOCK -> flag any of the battler's healing moves * - CHECK_INVALID_CHOICE_ITEM -> flag any of the battler's moves other than their choice-locked move - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler choosing their move * @param invalidMoves An initial mask of moves which should be deemed invalid * @param opMask An input opcode mask determining which checks should be @@ -419,10 +421,10 @@ int BattleSystem_CheckInvalidMoves(BattleSystem *battleSys, BattleContext *battl /** * @brief Determine if a battler can use the move in the given slot, populating * the input BattleMessage struct with a message to display if they cannot. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @param moveSlot The slot of the move that the battler is trying to use * @param[out] msgOut An output message for display to the player * @return TRUE if the move can be used, FALSE if it cannot @@ -431,16 +433,16 @@ BOOL BattleSystem_CanUseMove(BattleSystem *battleSys, BattleContext *battleCtx, /** * @brief Determine which slot of the Pokemon's moveset contains a given move. - * - * @param mon - * @param move + * + * @param mon + * @param move * @return The slot of the Pokemon's moveset containing the input move */ int Battler_SlotForMove(BattleMon *mon, u16 move); /** * @brief Apply type-chart effectiveness for a given move against its target. - * + * * This encapsulates the following multipliers: * - Same-Type Attack Bonus (and its modification by the ability Adaptability) * - Super/Not Very Effective multipliers for each of the defender's types @@ -449,24 +451,24 @@ int Battler_SlotForMove(BattleMon *mon, u16 move); * - Expert Belt's multiplier for super-effective moves * - Filter and Solid Rock's multipliers for defenders taking super-effective damage * - Tinted Lens's multiplier for defenders taking not-very-effective damage - * + * * The move status mask will also be updated with the correct flags. - * - * @param battleSys - * @param battleCtx - * @param move + * + * @param battleSys + * @param battleCtx + * @param move * @param inType If this is non-zero, then it will be regarded as the move's type - * @param attacker - * @param defender + * @param attacker + * @param defender * @param damage Pre-calculated starting damage value - * @param[out] moveStatusMask + * @param[out] moveStatusMask * @return Damage value after applying the type-chart and related multipliers */ int BattleSystem_ApplyTypeChart(BattleSystem *battleSys, BattleContext *battleCtx, int move, int inType, int attacker, int defender, int damage, u32 *moveStatusMask); /** * @brief Calculate the effectiveness mask of the given move. - * + * * @param battleCtx * @param move * @param inType If this is non-zero, then it will be regarded as the move's type @@ -481,9 +483,9 @@ void BattleSystem_CalcEffectiveness(BattleContext *battleCtx, int move, int inTy /** * @brief Check if a battler's move failed to execute for the turn. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return TRUE if the battler's move failed to execute for the turn, FALSE * otherwise. */ @@ -491,9 +493,9 @@ BOOL BattleContext_MoveFailed(BattleContext *battleCtx, int battler); /** * @brief Count the number of targets hit by a move. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param sameSide If TRUE, only the battlers on the same side of the field as * the defender will be counted. If FALSE, all battlers will * be counted. @@ -504,30 +506,30 @@ u8 BattleSystem_CountAliveBattlers(BattleSystem *battleSys, BattleContext *battl /** * @brief Apply a nickname tag to the given battler for message-formatting. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler * @return The battler + a nickname tag value. */ int BattleSystem_NicknameTag(BattleContext *battleSys, int battler); /** * @brief Get a battler's selected move for the turn, if any. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return The battler's selected move for the turn. */ u16 Battler_SelectedMove(BattleContext *battleCtx, int battler); /** * @brief Count the number of instances of the given ability on the battlefield. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param mode The behavior mode. See enum CountAbilityMode. - * @param battler - * @param ability + * @param battler + * @param ability * @return The number of battlers with the given ability matching the input * criteria; if the mode is one of *_FLAG, then the return value will instead * be a mask of the battlers matching the criteria. @@ -536,9 +538,9 @@ int BattleSystem_CountAbility(BattleSystem *battleSys, BattleContext *battleCtx, /** * @brief Determine if a given move is a multi-turn move. - * - * @param battleCtx - * @param move + * + * @param battleCtx + * @param move * @return TRUE if the move is a multi-turn move (one which has a charging * turn); FALSE if not */ @@ -546,11 +548,11 @@ BOOL Move_IsMultiTurn(BattleContext *battleCtx, int move); /** * @brief Access a particular entry in the type-matchup table. - * + * * If the requested entry falls outside the bounds of the table, then a * random entry's data will instead be accessed. - * - * @param battleSys + * + * @param battleSys * @param idx The index of table entry to access. * @param[out] atkType Attacking type of the table entry. * @param[out] defType Defending type of the table entry. @@ -563,7 +565,7 @@ BOOL BattleSystem_TypeMatchup(BattleSystem *battleSys, int idx, u8 *moveType, u8 /** * @brief Determine the total multiplier classification to use for an attacking * type against a pair of defending types. - * + * * This routine centers 1x damage as a return value of 40. From there, the * multiplier varies by powers of 2: * - 1/4x -> 10 @@ -571,32 +573,32 @@ BOOL BattleSystem_TypeMatchup(BattleSystem *battleSys, int idx, u8 *moveType, u8 * - 1x -> 40 * - 2x -> 80 * - 4x -> 160 - * - * @param attackingType - * @param defendingType1 - * @param defendingType2 + * + * @param attackingType + * @param defendingType1 + * @param defendingType2 * @return The total multiplier of the attacking type against a defender with - * the pair of types. + * the pair of types. */ int BattleSystem_TypeMatchupMultiplier(u8 attackingType, u8 defendingType1, u8 defendingType2); /** * @brief Determines if a move is an invoker-class move. - * + * * Invoker-class moves are those which call other moves and have no outward * effect of their own. - * - * @param move + * + * @param move * @return TRUE if the move is invoker-class, FALSE if not. */ BOOL Move_IsInvoker(u16 move); /** * @brief Check if a given move is Curse being used by a Ghost-type Pokemon. - * - * @param battleCtx - * @param move - * @param battler + * + * @param battleCtx + * @param move + * @param battler * @return TRUE if the move is Curse and the battler has the Ghost typing; * FALSE otherwise */ @@ -604,36 +606,36 @@ BOOL Move_IsGhostCurse(BattleContext *battleCtx, u16 move, int battler); /** * @brief Determine if a battler's item can be stolen. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @return FALSE */ BOOL BattleSystem_CanStealItem(BattleSystem *battleSys, BattleContext *battleCtx, int battler); /** * @brief Check if a battler is *not* holding Mail. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return TRUE if the battler is *not* holding Mail, FALSE if so. */ BOOL BattleSystem_NotHoldingMail(BattleContext *battleCtx, int battler); /** * @brief Determine if a target can be Whirlwinded away by an attacker. - * + * * If the attacker is of a lesser level than the target, then this routine has * a random chance to return FALSE. Given a random integer R between 0 and 255, * Whirlwind will fail if the following condition holds: - * + * * R * (attackerLevel + defenderLevel) defenderLevel * ----------------------------------- + 1 ≤ ------------- * 256 4 - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if Whirlwind should succeed, FALSE if it should fail. */ BOOL BattleSystem_CanWhirlwind(BattleSystem *battleSys, BattleContext *battleCtx); @@ -641,9 +643,9 @@ BOOL BattleSystem_CanWhirlwind(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Get the battler's ability, accounting for disrupting effects on itself, * e.g. Gastro Acid, Gravity, and Ingrain. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return The battler's ability */ u8 Battler_Ability(BattleContext *battleCtx, int battler); @@ -651,12 +653,12 @@ u8 Battler_Ability(BattleContext *battleCtx, int battler); /** * @brief Check if the given defender has the specified ability, treating it as * ignorable. - * + * * The ability will be ignored if the attacker has Mold Breaker. - * - * @param battleCtx - * @param attacker - * @param defender + * + * @param battleCtx + * @param attacker + * @param defender * @param ability * @return TRUE if the defender has the given ability and it is not ignored; * FALSE if the ability is ignored, or if the defender does not have it. @@ -666,25 +668,25 @@ BOOL Battler_IgnorableAbility(BattleContext *battleCtx, int attacker, int defend /** * @brief Checks if there are any Pokemon which can act as a replacement for a * fainted one. - * + * * Replacement-eligible Pokemon have HP > 0 and belong to the same party as a * fallen ally. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler which wishes to replace a fainted Pokemon. * @return TRUE if there are any Pokemon which can replace the fainted one; - * otherwise FALSE. + * otherwise FALSE. */ BOOL BattleSystem_AnyReplacementMons(BattleSystem *battleSys, BattleContext *battleCtx, int battler); /** * @brief Check if a battler is trapped and cannot switch and, optionally, * populate a message for display. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @param[out] msgOut If non-null, will be populated with a message for * display to the player * @return TRUE if the battler is trapped, FALSE if not. @@ -693,9 +695,9 @@ BOOL Battler_IsTrappedMsg(BattleSystem *battleSys, BattleContext *battleCtx, int /** * @brief Try to escape a battle. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler trying to escape * @return TRUE if escape is successful, FALSE otherwise */ @@ -703,19 +705,19 @@ BOOL Battler_CanEscape(BattleSystem *battleSys, BattleContext *battleCtx, int ba /** * @brief Check if Truant is active for the turn for a given battler. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return TRUE if the battler is loafing due to Truant, FALSE if not. */ -BOOL Battler_CheckTruant(BattleContext * battleCtx, int battler); +BOOL Battler_CheckTruant(BattleContext *battleCtx, int battler); /** * @brief Checks if a given move has been Imprisoned by one of the battler's * opponents. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler trying to execute a move. * @param move The move to be executed. * @return TRUE if any of the battler's opponents has used Imprison and also @@ -726,9 +728,9 @@ BOOL Move_Imprisoned(BattleSystem *battleSys, BattleContext *battleCtx, int batt /** * @brief Check if any active battlers are flagged as having the given move * effect. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param effectMask The requested move effect * @return TRUE if any active battler has the requested move effect; FALSE * othewise @@ -737,27 +739,27 @@ BOOL BattleSystem_AnyBattlersWithMoveEffect(BattleSystem *battleSys, BattleConte /** * @brief Setup flags for a move loop, e.g. for multi-hit or spread moves. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ void BattleSystem_SetupLoop(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Sort all active battlers by their speed for the turn, ignoring Quick * Claw type effects. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ void BattleSystem_SortMonSpeedOrder(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Check if a given move should fail due to high gravity conditions. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @param move The move to be executed * @return TRUE if the field is under high gravity conditions AND the move * should fail in such conditions; FALSE otherwise @@ -767,9 +769,9 @@ BOOL Move_FailsInHighGravity(BattleSystem *battleSys, BattleContext *battleCtx, /** * @brief Check if a given move should fail due to the battler being afflicted * by Heal Block. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler trying to execute a move * @param move The move to be executed * @return TRUE if the battler is afflicted with Heal Block AND the move should @@ -779,18 +781,18 @@ BOOL Move_HealBlocked(BattleSystem *battleSys, BattleContext *battleCtx, int bat /** * @brief Update buffers for the attacking Pokemon related to Last Resort. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ void BattleSystem_UpdateLastResort(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Count the number of moves known by a battler. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @return The number of moves known. */ int Battler_CountMoves(BattleSystem *battleSys, BattleContext *battleCtx, int battler); @@ -798,11 +800,11 @@ int Battler_CountMoves(BattleSystem *battleSys, BattleContext *battleCtx, int ba /** * @brief Trigger an immunity-granting ability of the defender based on the * attacker's current move. - * + * * Despite its name, this routine does NOT check for Levitate, which is * handled inside the type-chart check routine. - * - * @param battleCtx + * + * @param battleCtx * @param attacker * @param defender * @return A subscript to be loaded for any triggered effect. @@ -811,14 +813,14 @@ int BattleSystem_TriggerImmunityAbility(BattleContext *battleCtx, int attacker, /** * @brief Trigger an end-of-turn ability for the battler. - * + * * If an end-of-turn ability is triggered, then the respective subscript will * be loaded into the script buffer, and the battle control command will be * updated to run that script. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @return TRUE if a subscript has been loaded for a triggered effect, FALSE * otherwise. */ @@ -827,7 +829,7 @@ BOOL BattleSystem_TriggerTurnEndAbility(BattleSystem *battleSys, BattleContext * /** * @brief Perform a division, setting any zero-result to 1 or -1, matching the * sign of the dividend. - * + * * @param dividend The division's dividend. If positive, quotients of 0 will * be set to 1; if negative, quotients of 0 will be set to -1. * @param divisor The dividend's divisor. @@ -839,33 +841,33 @@ int BattleSystem_Divide(int dividend, int divisor); /** * @brief Trigger effects which process on-switch-in, e.g. weather abilities, * Intimidate, status-restoring berries, and Amulet Coin. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return A subscript which should be loaded as a triggered effect, if any. */ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Pick a random opponent for the given attacker. - * + * * In a single-battle, this will always return the lone opponent. - * + * * In a double-battle, if one of the two opponents has fainted, then the other * opponent will always be chosen. - * - * @param battleSys - * @param battleCtx - * @param attacker + * + * @param battleSys + * @param battleCtx + * @param attacker * @return A random opponent of the attacker's. */ int BattleSystem_RandomOpponent(BattleSystem *battleSys, BattleContext *battleCtx, int attacker); /** * @brief Trigger the defender's ability after a move deals damage to it. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param[out] subscript Return-param for the subscript to be loaded for any * triggered effect. * @return TRUE if the returned subscript param should be loaded for a @@ -876,12 +878,12 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba /** * @brief Triggers a battler's ability which prevents an illegal status * condition on the given battler, e.g. a paralyzed Pokemon with Limber. - * + * * This also contains the check responsible for setting the canUnburden flag. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @param skipLoad If TRUE, the routine will skip loading the subscript * responsible for curing an illegal status condition. * @return TRUE if a subscript for an ability effect was loaded, FALSE @@ -891,8 +893,8 @@ BOOL BattleSystem_RecoverStatusByAbility(BattleSystem *battleSys, BattleContext /** * @brief Check if an ability forbids a value in the given status mask. - * - * @param battleSys + * + * @param battleSys * @param ability The ability to check * @param status A mask of status values * @return TRUE if the given ability forbids some status in the given mask; @@ -903,9 +905,9 @@ BOOL Ability_ForbidsStatus(BattleContext *battleSys, int ability, int status); /** * @brief Synchronize a defender's newly-applied status with the Pokemon who * applied it. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param controllerCommand The command to return to after sharing the status * @return TRUE if a subscript has been loaded for the status-sharing effect, * FALSE if not. @@ -915,23 +917,23 @@ BOOL BattleSystem_SynchronizeStatus(BattleSystem *battleSys, BattleContext *batt /** * @brief Check if a held item should trigger due to status, an HP threshold, or * a stat reduction, then load any such triggered effect's corresponding subscript. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @return TRUE if a subscript has been loaded for a triggered effect, FALSE - * otherwise. + * otherwise. */ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battleCtx, int battler); /** * @brief Check if a Leftovers-type item should trigger at the end of the turn. - * + * * This also contains the split-effect for Black Sludge. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @return TRUE if an effect has been loaded for a subscript to be run, FALSE * otherwise. */ @@ -940,14 +942,14 @@ BOOL BattleSystem_TriggerLeftovers(BattleSystem *battleSys, BattleContext *battl /** * @brief Check if a held item should trigger due to status, an HP threshold, or * a stat reduction. - * + * * Unlike its counterpart TriggerHeldItem, this routine will return the triggered * effect subscript to the caller rather than immediately loading it for * execution. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @param[out] subscript Return param for the subscript to load for a * triggered effect. * @return TRUE if a subscript has been returned for a triggered effect, FALSE @@ -957,12 +959,12 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext /** * @brief Check if a detrimental held item should trigger at the end of the turn. - * + * * This accounts for the effects of Toxic Orb, Flame Orb, and Sticky Barb. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @return TRUE if an effect has been loaded for a subscript to be run, FALSE * otherwise. */ @@ -970,27 +972,27 @@ BOOL BattleSystem_TriggerDetrimentalHeldItem(BattleSystem *battleSys, BattleCont /** * @brief Get the battler's held item. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return Integer ID of the battler's held item */ u16 Battler_HeldItem(BattleContext *battleCtx, int battler); /** * @brief Check if a battler moved this turn. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return TRUE if the battler's turn is over, FALSE if they have yet to move. */ BOOL Battler_MovedThisTurn(BattleContext *battleCtx, int battler); /** * @brief Trigger a held item's effect when its holder takes damage. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param[out] subscript Return param for the subscript to load for a * triggered effect. * @return TRUE if a subscript should be loaded for a triggered effect, @@ -1000,9 +1002,9 @@ BOOL BattleSystem_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext *b /** * @brief Get the effect of the battler's held item. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return Integer ID of the effect of the battler's held item */ s32 Battler_HeldItemEffect(BattleContext *battleCtx, int battler); @@ -1015,12 +1017,12 @@ enum HeldItemPowerOp { /** * @brief Get the power of the battler's held item. - * + * * This routine optionally can perform a series of checks for effects which * would suppress the held item. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @param opcode Opcode controlling the behavior of this subroutine. * @return The power of the battler's held item. */ @@ -1028,69 +1030,69 @@ s32 Battler_HeldItemPower(BattleContext *battleCtx, int battler, enum HeldItemPo /** * @brief Get the Natural Gift base power for a battler's held item. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return Base power for Natural Gift. */ s32 Battler_NaturalGiftPower(BattleContext *battleCtx, int battler); /** * @brief Get the Natural Gift type for a battler's held item. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return Type for Natural Gift. */ s32 Battler_NaturalGiftType(BattleContext *battleCtx, int battler); /** * @brief Get the Pluck effect of the battler's held item. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return Pluck effect of the battler's held item. */ s32 Battler_ItemPluckEffect(BattleContext *battleCtx, int battler); /** * @brief Get the Fling effect of the battler's held item. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return Fling effect of the battler's held item. */ s32 Battler_ItemFlingEffect(BattleContext *battleCtx, int battler); /** * @brief Get the Fling power of the battler's held item. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return Fling power of the battler's held item. */ s32 Battler_ItemFlingPower(BattleContext *battleCtx, int battler); /** * @brief Check if a battler is trapped and cannot switch. - * - * @param battleSys - * @param battleCtx - * @param battler + * + * @param battleSys + * @param battleCtx + * @param battler * @return TRUE if the battler is trapped, FALSE if not. */ BOOL Battler_IsTrapped(BattleSystem *battleSys, BattleContext *battleCtx, int battler); /** * @brief Try to Pluck the given battler's berry. - * + * * This routine will determine what subsequence should be run as the stolen * effect (if any) and store it in battleCtx->scriptTemp. It will also update * the attacker's self-turn status flags to denote that the attacker has * Plucked a berry. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler whose berry is to be Plucked. * @return TRUE if a follow-up subsequence should be run to apply the berry's * Pluck effect; FALSE if no such follow-up is needed. @@ -1099,14 +1101,14 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, /** * @brief Try to Fling the attacker's item at the given battler. - * + * * This routine will determine what subsequence should be run as the flung * effect (if any) and store it in battleCtx->flingScript. It will also * determine the base power of Fling, as specified in the item data, and * store it in battleCtx->movePower. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The target of the flung item. * @return TRUE if a follow-up subsequence should be run to apply the item's * Fling effect; FALSE if no such follow-up is needed. @@ -1115,27 +1117,27 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i /** * @brief Update the count for the Metronome held item. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ void BattleSystem_UpdateMetronomeCount(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Verify the current count for the Metronome held item. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ void BattleSystem_VerifyMetronomeCount(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Determine what modulating effect to apply to a battler's cry * whenever they are sent into battle. - * - * @param battleCtx - * @param battler - * @param battlerType + * + * @param battleCtx + * @param battler + * @param battlerType * @param encounter TRUE if this is a start-of-battle cry. * @return The type of modulating effect applied to the battler's cry. */ @@ -1143,9 +1145,9 @@ enum PokemonCryMod Battler_CryModulation(BattleContext *battleCtx, int battler, /** * @brief Check if a battler can choose their action for the turn. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler * @return TRUE if the battler can choose their action for the turn, FALSE * if not. */ @@ -1153,38 +1155,38 @@ BOOL Battler_CanPickCommand(BattleContext *battleSys, int battler); /** * @brief Set the catch-data for a newly-caught Pokemon. - * + * * This will set the met-location and Poke Ball for the newly-caught Pokemon. - * - * @param battleSys - * @param battleCtx - * @param mon + * + * @param battleSys + * @param battleCtx + * @param mon */ void BattleSystem_SetPokemonCatchData(BattleSystem *battleSys, BattleContext *battleCtx, Pokemon *mon); /** * @brief Get the top byte of the IO buffer for the given battler. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return Top byte of the IO buffer for the given battler. */ u8 BattleContext_IOBufferVal(BattleContext *battleCtx, int battler); /** * @brief Check if a battler's substitute was hit. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @return TRUE if the battler's substitute was hit, FALSE if not. */ BOOL Battler_SubstituteWasHit(BattleContext *battleCtx, int battler); /** * @brief Check if the player is the attacking Pokemon's OT. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if the player is the attacking Pokemon's OT, FALSE * otherwise. */ @@ -1192,9 +1194,9 @@ BOOL BattleSystem_TrainerIsOT(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Check if the player is a given Pokemon's OT. - * - * @param battleSys - * @param mon + * + * @param battleSys + * @param mon * @return TRUE if the player is the given Pokemon's OT, FALSE otherwise. */ BOOL BattleSystem_PokemonIsOT(BattleSystem *battleSys, Pokemon *mon); @@ -1202,8 +1204,8 @@ BOOL BattleSystem_PokemonIsOT(BattleSystem *battleSys, Pokemon *mon); /** * @brief Trigger a form change for the battler stored in battleCtx->msgBattlerTemp, * if applicable. - * - * @param battleSys + * + * @param battleSys * @param battleCtx * @param[out] subscript Return-param for the subscript to be loaded for any * triggered effect. @@ -1214,18 +1216,18 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt /** * @brief Initialize the party order buffer. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ void BattleSystem_InitPartyOrder(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Switch the party order by swapping the battler in the given party slot * with an active slot. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler who is switching * @param partySlot The party slot which should be moved to an active slot */ @@ -1233,24 +1235,24 @@ void BattleSystem_SwitchSlots(BattleSystem *battleSys, BattleContext *battleCtx, /** * @brief Calculate the base damage for a move using the general damage formula. - * + * * This computes the following value: - * + * * ( ( 2 x Level ) ( Attack ) ) * ( ( --------- + 2 ) * Power * ( ------- ) ) * ( ( 5 ) ( Defense ) ) * ( --------------------------------------- ) * Burn * Screens * Targets * Weather * FlashFire + 2 * ( 50 ) - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param move The move being calculated * @param sideConditions State of the side conditions mask at the time of calculation * @param fieldConditions State of the field conditions mask at the time of calculation * @param inPower Input power for variable base-power moves * @param inType Input type for variable type moves (e.g. Hidden Power) * @param attacker - * @param defender + * @param defender * @param criticalMul Critical multiplier; must always be >= 1, 1 == no crit, * 2+ signifies a crit * @return The computed base damage for the move @@ -1268,79 +1270,79 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, /** * @brief Incorporate random variance in the given damage value. - * + * * A random factor in the range of [0.85, 1] will be used to vary the output * damage value, i.e., we compute the following: - * + * * Damage = Damage * Random([0.85, 1]) - * - * @param battleSys - * @param battleCtx - * @param damage + * + * @param battleSys + * @param battleCtx + * @param damage * @return The varied damage value. */ int BattleSystem_CalcDamageVariance(BattleSystem *battleSys, BattleContext *battleCtx, int damage); /** * @brief Calculate the critical multiplier to be applied to a move's damage. - * + * * This also performs all of the calculations for if a critical hit should/can * occur. - * - * @param battleSys - * @param battleCtx - * @param attacker - * @param defender + * + * @param battleSys + * @param battleCtx + * @param attacker + * @param defender * @param criticalStage The existing critical hit stage for the attacker * @param sideConditions State of the side conditions mask at the time of calculation * @return 1 if no critical occurs, 2 if a critical occurs, 3 if a critical - * occurs and the attacker also has the ability Sniper + * occurs and the attacker also has the ability Sniper */ int BattleSystem_CalcCriticalMulti(BattleSystem *battleSys, BattleContext *battleCtx, int attacker, int defender, int criticalStage, u32 sideConditions); /** * @brief Check if a move can be copied by Mimic. - * - * @param move + * + * @param move * @return TRUE if the move can be copied by Mimic, FALSE if not. */ BOOL Move_CanBeMimicked(u16 move); /** * @brief Check if a move can be invoked by Metronome. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler using Metronome. * @param move - * @return TRUE if the move can be invoked by Metronome, FALSE if not. + * @return TRUE if the move can be invoked by Metronome, FALSE if not. */ BOOL Move_CanBeMetronomed(BattleSystem *battleSys, BattleContext *battleCtx, int battler, u16 move); /** * @brief Check if a move can be Encored. - * - * @param battleCtx - * @param move + * + * @param battleCtx + * @param move * @return TRUE if the move can be Encored, FALSE if not. */ BOOL Move_CanBeEncored(BattleContext *battleCtx, u16 move); /** * @brief Check if a move can be copied by Me First. - * - * @param battleCtx - * @param move + * + * @param battleCtx + * @param move * @return TRUE if the move can be copied by Me First, FALSE if not. */ BOOL Move_MeFirstCanCopy(BattleContext *battleCtx, u16 move); /** * @brief Get a data element out of the given item's data structure. - * + * * This consults the item table loaded at battle start-time. - * - * @param battleCtx + * + * @param battleCtx * @param item ID of the item to be loaded * @param paramID ID of the item param to be retrieved * @return s32-representation of the data pulled from the item table @@ -1349,30 +1351,30 @@ s32 BattleSystem_GetItemData(BattleContext *battleCtx, u16 item, enum ItemDataPa /** * @brief Determine the first battler which matches the input side value. - * - * @param battleSys - * @param battleCtx - * @param side + * + * @param battleSys + * @param battleCtx + * @param side * @return The first battler which matches the input side value. */ int BattleSystem_SideToBattler(BattleSystem *battleSys, BattleContext *battleCtx, int side); /** * @brief Sort the action order for battlers based on their speed and actions. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ void BattleSystem_SortMonActionOrder(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Determine if a status effect should be shown for the given battler. - * + * * This handles the determination of if a given status effect animation should * be played if the battler is behind a substitute or is in an invulnerable * state. - * - * @param battleCtx + * + * @param battleCtx * @param battler The battler for whom the status effect should be shown. * @param status The status effect attempting to be shown. * @return TRUE if the status effect should be shown, FALSE otherwise. @@ -1381,12 +1383,12 @@ BOOL BattleSystem_ShouldShowStatusEffect(BattleContext *battleCtx, int battler, /** * @brief Trigger a held item's effect after a pivoting move has been used. - * + * * This is meant to support triggering effects such as Shell Bell, Life Orb, * and Sticky Barb transferral before the user of a pivoting move switches out. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param[out] subscript Return param for the subscript to load for a * triggered effect. * @return TRUE if a subscript should be loaded for a triggered effect, @@ -1397,32 +1399,32 @@ BOOL BattleSystem_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleCont /** * @brief Decrement additional PP from the attacker's selected move if its * target has the Pressure ability. - * - * @param battleCtx - * @param attacker - * @param defender + * + * @param battleCtx + * @param attacker + * @param defender */ void BattleSystem_DecPPForPressure(BattleContext *battleCtx, int attacker, int defender); /** * @brief Check if the recording for a battle has finished playing. - * + * * If the recording has finished, then the controller will be set to a * SCREEN_WIPE command. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if the recording has stopped, FALSE otherwise. */ BOOL Battle_RecordingStopped(BattleSystem *battleSys, BattleContext *battleCtx); /** * @brief Get an accessible field from the BattleContext struct. - * + * * See: enum BattleContextParam - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param paramID ID of the field to retrieve * @param battler Battler for retrieving the correct field, if applicable * @return Value of the field, or 0 if unrecognized. @@ -1431,9 +1433,9 @@ int BattleContext_Get(BattleSystem *battleSys, BattleContext *battleCtx, enum Ba /** * @brief Set the value of an accessible field in the BattleContext struct. - * + * * See: enum BattleContextParam - * + * * The following values may be modified: * - The full side conditions mask for a particular side * - The number of turns of Mist for a particular side @@ -1441,9 +1443,9 @@ int BattleContext_Get(BattleSystem *battleSys, BattleContext *battleCtx, enum Ba * - The total number of turns that have elapsed * - The AI's chosen target for the turn * - The AI's chosen target from a particular battler for the turn - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param paramID ID of the field to retrieve * @param battler Battler for accessing the correct field, if applicable * @param val Value to which the field should be set @@ -1453,29 +1455,29 @@ void BattleContext_Set(BattleSystem *battleSys, BattleContext *battleCtx, enum B /** * @brief Determine what Pokemon the AI will switch-in from their party after * one of their active battlers has been KO'd. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler * @return The party slot of the Pokemon to be switched in. */ int BattleAI_PostKOSwitchIn(BattleSystem *battleSys, int battler); /** * @brief Get the switched-to slot determined by the AI for a given battler. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler * @return The AI's switched-to slot for the battler. */ int BattleAI_SwitchedSlot(BattleSystem *battleSys, int battler); /** * @brief Compute the variable-type of a move, given its use by a given Pokemon. - * + * * This is used by moves such as Natural Gift, Hidden Power, and Weather Ball. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param mon The Pokemon using the move. * @param move The move being used. * @return The variable-type of a move, considering parameters of its user and diff --git a/include/battle/battle_mon.h b/include/battle/battle_mon.h index 576fe854eb..43e0cba735 100644 --- a/include/battle/battle_mon.h +++ b/include/battle/battle_mon.h @@ -19,7 +19,7 @@ typedef struct MoveEffectsData { u32 stockpileSpDefBoosts : 3; u32 truant : 1; u32 flashFire : 1; - + u32 lockOnTarget : 2; u32 mimickedMoveSlot : 4; u32 bindTarget : 2; @@ -120,7 +120,7 @@ typedef struct BattleMon { u8 timesDamaged; u8 trainerMessageFlags; - u8 gender :4; + u8 gender : 4; u8 OTGender : 4; u8 capturedBall; diff --git a/include/battle/battle_script.h b/include/battle/battle_script.h index f1f65d9768..1200e7a94f 100644 --- a/include/battle/battle_script.h +++ b/include/battle/battle_script.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_BATTLE_SCRIPT_H #include "struct_decls/battle_system.h" + #include "battle/battle_context.h" /** * @brief Execute the loaded battle script. - * + * * Scripts are executed as a sequence of byte-code instructions which emulate * a basic state machine. The execution loop will read a 4-byte sequence from * the loaded script, execute the command which is associated with the read @@ -14,9 +15,9 @@ * additional 4-byte sequences from the loaded script as data parameters for * their execution. They may also set the location of the next instruction to * be read from the script, depending on the individual command. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return The result of the final command of the script. This should always * be TRUE, as the final command of any script should be the End command. All * other commands should return FALSE. diff --git a/include/battle/btlcmd.h b/include/battle/btlcmd.h index 820dae79a6..a25ecf938d 100644 --- a/include/battle/btlcmd.h +++ b/include/battle/btlcmd.h @@ -6,14 +6,14 @@ #endif // TODO: move these to constgen -#define TRAINER_MESSAGE_LOSE 1 -#define TRAINER_MESSAGE_LOSE_1 4 -#define TRAINER_MESSAGE_LOSE_2 8 -#define TRAINER_MESSAGE_WIN 100 +#define TRAINER_MESSAGE_LOSE 1 +#define TRAINER_MESSAGE_LOSE_1 4 +#define TRAINER_MESSAGE_LOSE_2 8 +#define TRAINER_MESSAGE_WIN 100 -#define BTLSCR_MSG_TEMP (0xFF) +#define BTLSCR_MSG_TEMP (0xFF) -#define WEATHER_EFFECT_HYDRATION 1 -#define WEATHER_EFFECT_SOLAR_POWER 2 +#define WEATHER_EFFECT_HYDRATION 1 +#define WEATHER_EFFECT_SOLAR_POWER 2 #endif // POKEPLATINUM_BATTLE_BTLCMD_H diff --git a/include/battle/common.h b/include/battle/common.h index 40ee780264..bcf66c7eca 100644 --- a/include/battle/common.h +++ b/include/battle/common.h @@ -1,78 +1,76 @@ #ifndef POKEPLATINUM_BATTLE_COMMON_H #define POKEPLATINUM_BATTLE_COMMON_H -#define ATTACKING_MON (battleCtx->battleMons[battleCtx->attacker]) -#define DEFENDING_MON (battleCtx->battleMons[battleCtx->defender]) -#define FAINTED_MON (battleCtx->battleMons[battleCtx->faintedMon]) +#define ATTACKING_MON (battleCtx->battleMons[battleCtx->attacker]) +#define DEFENDING_MON (battleCtx->battleMons[battleCtx->defender]) +#define FAINTED_MON (battleCtx->battleMons[battleCtx->faintedMon]) -#define ATTACKER_MOVE_SLOT (battleCtx->moveSlot[battleCtx->attacker]) -#define ATTACKER_ACTION (battleCtx->battlerActions[battleCtx->attacker]) -#define DEFENDER_ACTION (battleCtx->battlerActions[battleCtx->defender]) +#define ATTACKER_MOVE_SLOT (battleCtx->moveSlot[battleCtx->attacker]) +#define ATTACKER_ACTION (battleCtx->battlerActions[battleCtx->attacker]) +#define DEFENDER_ACTION (battleCtx->battlerActions[battleCtx->defender]) #define ATTACKER_TURN_FLAGS (battleCtx->turnFlags[battleCtx->attacker]) #define DEFENDER_TURN_FLAGS (battleCtx->turnFlags[battleCtx->defender]) -#define ATTACKER_SELF_TURN_FLAGS (battleCtx->selfTurnFlags[battleCtx->attacker]) -#define DEFENDER_SELF_TURN_FLAGS (battleCtx->selfTurnFlags[battleCtx->defender]) +#define ATTACKER_SELF_TURN_FLAGS (battleCtx->selfTurnFlags[battleCtx->attacker]) +#define DEFENDER_SELF_TURN_FLAGS (battleCtx->selfTurnFlags[battleCtx->defender]) -#define ATTACKER_LAST_MOVE (battleCtx->movePrevByBattler[battleCtx->attacker]) -#define DEFENDER_LAST_MOVE (battleCtx->movePrevByBattler[battleCtx->defender]) +#define ATTACKER_LAST_MOVE (battleCtx->movePrevByBattler[battleCtx->attacker]) +#define DEFENDER_LAST_MOVE (battleCtx->movePrevByBattler[battleCtx->defender]) -#define FOLLOW_ME_USER(side) (battleCtx->sideConditions[side].followMeUser) -#define FOLLOW_ME_MON(side) (battleCtx->battleMons[FOLLOW_ME_USER(side)]) +#define FOLLOW_ME_USER(side) (battleCtx->sideConditions[side].followMeUser) +#define FOLLOW_ME_MON(side) (battleCtx->battleMons[FOLLOW_ME_USER(side)]) -#define CURRENT_MOVE_DATA (battleCtx->aiContext.moveTable[battleCtx->moveCur]) -#define MOVE_DATA(move) (battleCtx->aiContext.moveTable[move]) +#define CURRENT_MOVE_DATA (battleCtx->aiContext.moveTable[battleCtx->moveCur]) +#define MOVE_DATA(move) (battleCtx->aiContext.moveTable[move]) -#define LOAD_SUBSEQ(script) (BattleSystem_LoadScript(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, script)) +#define LOAD_SUBSEQ(script) (BattleSystem_LoadScript(battleCtx, NARC_INDEX_BATTLE__SKILL__SUB_SEQ, script)) // Convenience identifiers for PvE single-encounters/battles. -#define BATTLER_US 0 -#define BATTLER_THEM 1 - -#define BATTLER_OPP(battler) (battler ^ 1) - -#define CALC_SELF_HIT(move, power) (BattleSystem_CalcMoveDamage(\ - battleSys,\ - battleCtx,\ - move,\ - 0,\ - 0,\ - power,\ - 0,\ - battleCtx->attacker,\ - battleCtx->attacker,\ +#define BATTLER_US 0 +#define BATTLER_THEM 1 + +#define BATTLER_OPP(battler) (battler ^ 1) + +#define CALC_SELF_HIT(move, power) (BattleSystem_CalcMoveDamage( \ + battleSys, \ + battleCtx, \ + move, \ + 0, \ + 0, \ + power, \ + 0, \ + battleCtx->attacker, \ + battleCtx->attacker, \ 1)) -#define MON_IS_UPROARING(mon) (battleCtx->fieldConditionsMask & (FlagIndex(mon) << FIELD_CONDITION_UPROAR_SHIFT)) -#define MON_IS_IDENTIFIED(mon) ((battleCtx->battleMons[mon].statusVolatile & VOLATILE_CONDITION_FORESIGHT) \ +#define MON_IS_UPROARING(mon) (battleCtx->fieldConditionsMask & (FlagIndex(mon) << FIELD_CONDITION_UPROAR_SHIFT)) +#define MON_IS_IDENTIFIED(mon) ((battleCtx->battleMons[mon].statusVolatile & VOLATILE_CONDITION_FORESIGHT) \ || (battleCtx->battleMons[mon].moveEffectsMask & MOVE_EFFECT_MIRACLE_EYE)) -#define MON_IS_LOCKED_ONTO(mon1, mon2) ((battleCtx->battleMons[mon2].moveEffectsMask & MOVE_EFFECT_LOCK_ON) && battleCtx->battleMons[mon2].moveEffectsData.lockOnTarget == mon1) - -#define MON_HAS_TYPE(mon, type) (BattleMon_Get(battleCtx, mon, BATTLEMON_TYPE_1, NULL) == type || BattleMon_Get(battleCtx, mon, BATTLEMON_TYPE_2, NULL) == type) -#define MON_IS_NOT_TYPE(mon, type) (BattleMon_Get(battleCtx, mon, BATTLEMON_TYPE_1, NULL) != type && BattleMon_Get(battleCtx, mon, BATTLEMON_TYPE_2, NULL) != type) - -#define NO_TARGET_SINGLE_TURN (battleCtx->defender == BATTLER_NONE && Move_IsMultiTurn(battleCtx, battleCtx->moveCur) == FALSE) -#define NO_TARGET_MULTI_TURN (battleCtx->defender == BATTLER_NONE \ - && Move_IsMultiTurn(battleCtx, battleCtx->moveCur) == TRUE \ - && ( \ - (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED) \ - || (battleCtx->battleStatusMask & SYSCTL_LAST_OF_MULTI_TURN) \ - )) -#define NO_TARGET (NO_TARGET_SINGLE_TURN || NO_TARGET_MULTI_TURN) - -#define NO_CLOUD_NINE (BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_CLOUD_NINE) == FALSE \ - && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_AIR_LOCK) == FALSE) -#define NO_WEATHER ((battleCtx->fieldConditionsMask & FIELD_CONDITION_WEATHER) == FALSE \ - || BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_CLOUD_NINE) \ - || BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_AIR_LOCK)) +#define MON_IS_LOCKED_ONTO(mon1, mon2) ((battleCtx->battleMons[mon2].moveEffectsMask & MOVE_EFFECT_LOCK_ON) && battleCtx->battleMons[mon2].moveEffectsData.lockOnTarget == mon1) + +#define MON_HAS_TYPE(mon, type) (BattleMon_Get(battleCtx, mon, BATTLEMON_TYPE_1, NULL) == type || BattleMon_Get(battleCtx, mon, BATTLEMON_TYPE_2, NULL) == type) +#define MON_IS_NOT_TYPE(mon, type) (BattleMon_Get(battleCtx, mon, BATTLEMON_TYPE_1, NULL) != type && BattleMon_Get(battleCtx, mon, BATTLEMON_TYPE_2, NULL) != type) + +#define NO_TARGET_SINGLE_TURN (battleCtx->defender == BATTLER_NONE && Move_IsMultiTurn(battleCtx, battleCtx->moveCur) == FALSE) +#define NO_TARGET_MULTI_TURN (battleCtx->defender == BATTLER_NONE \ + && Move_IsMultiTurn(battleCtx, battleCtx->moveCur) == TRUE \ + && ((ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED) \ + || (battleCtx->battleStatusMask & SYSCTL_LAST_OF_MULTI_TURN))) +#define NO_TARGET (NO_TARGET_SINGLE_TURN || NO_TARGET_MULTI_TURN) + +#define NO_CLOUD_NINE (BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_CLOUD_NINE) == FALSE \ + && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_AIR_LOCK) == FALSE) +#define NO_WEATHER ((battleCtx->fieldConditionsMask & FIELD_CONDITION_WEATHER) == FALSE \ + || BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_CLOUD_NINE) \ + || BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_AIR_LOCK)) #define WEATHER_IS_RAIN (battleCtx->fieldConditionsMask & FIELD_CONDITION_RAINING) #define WEATHER_IS_SAND (battleCtx->fieldConditionsMask & FIELD_CONDITION_SANDSTORM) #define WEATHER_IS_SUN (battleCtx->fieldConditionsMask & FIELD_CONDITION_SUNNY) #define WEATHER_IS_HAIL (battleCtx->fieldConditionsMask & FIELD_CONDITION_HAILING) #define WEATHER_IS_FOG (battleCtx->fieldConditionsMask & FIELD_CONDITION_DEEP_FOG) -#define FLAG_NEGATE(flag) ((flag) ^ 0xFFFFFFFF) +#define FLAG_NEGATE(flag) ((flag) ^ 0xFFFFFFFF) -#endif // POKEPLATINUM_BATTLE_COMMON_H \ No newline at end of file +#endif // POKEPLATINUM_BATTLE_COMMON_H diff --git a/include/battle/healthbar.h b/include/battle/healthbar.h index 2a3970b9cc..6398d67682 100644 --- a/include/battle/healthbar.h +++ b/include/battle/healthbar.h @@ -1,34 +1,35 @@ #ifndef POKEPLATINUM_OV16_02266F1C_H #define POKEPLATINUM_OV16_02266F1C_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" + #include "battle/struct_ov16_022674C4.h" -#define HEALTHBAR_INFO_NONE 0 -#define HEALTHBAR_INFO_HP_GAUGE (1 << 0) -#define HEALTHBAR_INFO_CURRENT_HP (1 << 1) -#define HEALTHBAR_INFO_MAX_HP (1 << 2) -#define HEALTHBAR_INFO_LEVEL (1 << 3) -#define HEALTHBAR_INFO_NAME (1 << 4) -#define HEALTHBAR_INFO_EXP_GAUGE (1 << 5) -#define HEALTHBAR_INFO_GENDER (1 << 6) -#define HEALTHBAR_INFO_LEVEL_TEXT (1 << 7) -#define HEALTHBAR_INFO_STATUS (1 << 8) -#define HEALTHBAR_INFO_CAUGHT_SPECIES (1 << 9) -#define HEALTHBAR_INFO_COUNT_SAFARI_BALLS (1 << 10) -#define HEALTHBAR_INFO_REMAINING_SAFARI_BALLS (1 << 11) -#define HEALTHBAR_INFO_COUNT_PARK_BALLS (1 << 12) -#define HEALTHBAR_INFO_REMAINING_PARK_BALLS (1 << 13) +#define HEALTHBAR_INFO_NONE 0 +#define HEALTHBAR_INFO_HP_GAUGE (1 << 0) +#define HEALTHBAR_INFO_CURRENT_HP (1 << 1) +#define HEALTHBAR_INFO_MAX_HP (1 << 2) +#define HEALTHBAR_INFO_LEVEL (1 << 3) +#define HEALTHBAR_INFO_NAME (1 << 4) +#define HEALTHBAR_INFO_EXP_GAUGE (1 << 5) +#define HEALTHBAR_INFO_GENDER (1 << 6) +#define HEALTHBAR_INFO_LEVEL_TEXT (1 << 7) +#define HEALTHBAR_INFO_STATUS (1 << 8) +#define HEALTHBAR_INFO_CAUGHT_SPECIES (1 << 9) +#define HEALTHBAR_INFO_COUNT_SAFARI_BALLS (1 << 10) +#define HEALTHBAR_INFO_REMAINING_SAFARI_BALLS (1 << 11) +#define HEALTHBAR_INFO_COUNT_PARK_BALLS (1 << 12) +#define HEALTHBAR_INFO_REMAINING_PARK_BALLS (1 << 13) #define HEALTHBAR_INFO_ALL ~0 -#define HEALTHBAR_INFO_ALL_SAFARI (HEALTHBAR_INFO_COUNT_SAFARI_BALLS | HEALTHBAR_INFO_REMAINING_SAFARI_BALLS) -#define HEALTHBAR_INFO_ALL_PARK (HEALTHBAR_INFO_COUNT_PARK_BALLS | HEALTHBAR_INFO_REMAINING_PARK_BALLS) -#define HEALTHBAR_INFO_NOT_ON_ENEMY (HEALTHBAR_INFO_CURRENT_HP | HEALTHBAR_INFO_MAX_HP | HEALTHBAR_INFO_EXP_GAUGE) +#define HEALTHBAR_INFO_ALL_SAFARI (HEALTHBAR_INFO_COUNT_SAFARI_BALLS | HEALTHBAR_INFO_REMAINING_SAFARI_BALLS) +#define HEALTHBAR_INFO_ALL_PARK (HEALTHBAR_INFO_COUNT_PARK_BALLS | HEALTHBAR_INFO_REMAINING_PARK_BALLS) +#define HEALTHBAR_INFO_NOT_ON_ENEMY (HEALTHBAR_INFO_CURRENT_HP | HEALTHBAR_INFO_MAX_HP | HEALTHBAR_INFO_EXP_GAUGE) enum HealthbarType { HEALTHBAR_TYPE_PLAYER_SOLO = 0, @@ -53,64 +54,64 @@ enum HealthbarGaugeType { /** * @brief Load the resources required to display a healthbar. - * + * * Though a NARC handle is required as a parameter, it is assumed to always be * an open handle to pl_batt_obj.narc. - * - * @param renderer - * @param gfxHandler - * @param narc - * @param palette - * @param healthbarType + * + * @param renderer + * @param gfxHandler + * @param narc + * @param palette + * @param healthbarType */ void Healthbar_LoadResources(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, PaletteData *palette, enum HealthbarType healthbarType); -CellActorData * ov16_02267060(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2); +CellActorData *ov16_02267060(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2); /** * @brief Draw the informational parts of the healthbar, according to a set * of input flags which control exactly what components to draw. - * - * @param healthbar + * + * @param healthbar * @param hp The battler's current HP * @param flags The components to be drawn, as a bitmask. */ void Healthbar_DrawInfo(Healthbar *healthbar, u32 hp, u32 flags); -void ov16_02267220(Healthbar * param0); -void ov16_02267258(Healthbar * param0); -void ov16_022672C4(Healthbar * param0); -void ov16_02267360(Healthbar * param0); -void ov16_0226737C(Healthbar * param0); +void ov16_02267220(Healthbar *param0); +void ov16_02267258(Healthbar *param0); +void ov16_022672C4(Healthbar *param0); +void ov16_02267360(Healthbar *param0); +void ov16_0226737C(Healthbar *param0); /** * @brief Compute the battler's new HP after taking a given amount of * damage or restoring a certain amount of health. Additionally, cache * this difference, flooring it to the bounds of the battler's current * and maximum HP. - * - * @param healthbar + * + * @param healthbar * @param damage The amount of damage dealt to a battler. Negative * values are damage, positive values are recovery. */ void Healthbar_CalcHP(Healthbar *healthbar, int damage); -s32 ov16_022674F8(Healthbar * param0); -void Healthbar_CalcExp(Healthbar * param0, int param1); -s32 ov16_02267560(Healthbar * param0); -void ov16_0226757C(Healthbar * param0); -void ov16_022675AC(Healthbar * param0); -void ov16_022675D8(Healthbar * param0, int param1); +s32 ov16_022674F8(Healthbar *param0); +void Healthbar_CalcExp(Healthbar *param0, int param1); +s32 ov16_02267560(Healthbar *param0); +void ov16_0226757C(Healthbar *param0); +void ov16_022675AC(Healthbar *param0); +void ov16_022675D8(Healthbar *param0, int param1); /** * @brief Enable (or disable) the healthbar. - * - * @param battleSys + * + * @param battleSys * @param enable If TRUE, enable the healthbar; otherwise, disable it. */ void Healthbar_Enable(Healthbar *battleSys, BOOL enable); /** * @brief Offset the healthbar's position by a given value along the X and Y axes. - * - * @param healthbar + * + * @param healthbar * @param x X-axis offset for the healthbar from its current position. * @param y Y-axis offset for the healthbar from its current position. */ @@ -118,8 +119,8 @@ void Healthbar_OffsetPositionXY(Healthbar *healthbar, int x, int y); /** * @brief Scroll the healthbar in or out. - * - * @param healthbar + * + * @param healthbar * @param direction The direction to scroll the healthbar. */ void Healthbar_Scroll(Healthbar *healthbar, enum HealthbarScrollDirection direction); @@ -127,18 +128,18 @@ void Healthbar_Scroll(Healthbar *healthbar, enum HealthbarScrollDirection direct /** * @brief Determine the type of healthbar to be displayed for a given battler type * (solo player, solo enemy, or any slot in doubles) and battle type. - * + * * Pal Park and Safari Zone use a different healthbar type than normal battles. - * + * * @param battlerType The type of battler which the healthbar represents. * @param battleType The type of battle in which the healthbar will be used. * @return The resulting healthbar type; see enum HealthbarType. */ u8 Healthbar_Type(int battlerType, u32 battleType); -void ov16_0226834C(Healthbar * param0, u8 * param1); -void ov16_02268468(Healthbar * param0); -void ov16_0226846C(Healthbar * param0); -void ov16_02268470(Healthbar * param0); -void ov16_02268498(Healthbar * param0); +void ov16_0226834C(Healthbar *param0, u8 *param1); +void ov16_02268468(Healthbar *param0); +void ov16_0226846C(Healthbar *param0); +void ov16_02268470(Healthbar *param0); +void ov16_02268498(Healthbar *param0); #endif // POKEPLATINUM_OV16_02266F1C_H diff --git a/include/battle/ov16_0223B140.h b/include/battle/ov16_0223B140.h index 73debce676..659422ff35 100644 --- a/include/battle/ov16_0223B140.h +++ b/include/battle/ov16_0223B140.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_OV16_0223B140_H #define POKEPLATINUM_OV16_0223B140_H -#include "overlay_manager.h" #include "struct_decls/battle_system.h" -BOOL Battle_Main(OverlayManager * param0, int * param1); -void ov16_0223B384(BattleSystem * param0); -void ov16_0223B3E4(BattleSystem * param0); -void ov16_0223B430(BattleSystem * param0); -void ov16_0223B53C(BattleSystem * param0); -void ov16_0223B578(BattleSystem * param0); -void BattleSystem_LoadFightOverlay(BattleSystem * param0, int param1); +#include "overlay_manager.h" + +BOOL Battle_Main(OverlayManager *param0, int *param1); +void ov16_0223B384(BattleSystem *param0); +void ov16_0223B3E4(BattleSystem *param0); +void ov16_0223B430(BattleSystem *param0); +void ov16_0223B53C(BattleSystem *param0); +void ov16_0223B578(BattleSystem *param0); +void BattleSystem_LoadFightOverlay(BattleSystem *param0, int param1); #endif // POKEPLATINUM_OV16_0223B140_H diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h index 64dbeabf5d..46bd6c7fd6 100644 --- a/include/battle/ov16_0223DF00.h +++ b/include/battle/ov16_0223DF00.h @@ -3,62 +3,63 @@ #include "constants/time.h" +#include "struct_decls/battle_system.h" +#include "struct_decls/pokedexdata_decl.h" +#include "struct_decls/pokemon_animation_sys_decl.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "struct_decls/pokedexdata_decl.h" -#include "game_options.h" -#include "struct_defs/chatot_cry.h" -#include "struct_defs/struct_0205AA50.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" +#include "struct_defs/chatot_cry.h" +#include "struct_defs/struct_0205AA50.h" #include "struct_defs/trainer_data.h" -#include "struct_decls/battle_system.h" -#include "bag.h" -#include "overlay006/battle_params.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "battle/struct_ov16_0223E0C8.h" + #include "battle/battle_context.h" -#include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/battle_message.h" +#include "battle/party_gauge.h" +#include "battle/struct_ov16_0223E0C8.h" +#include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02268520.h" #include "battle/struct_ov16_02268A14_decl.h" #include "battle/struct_ov16_0226D160_decl.h" +#include "overlay006/battle_params.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "battle/party_gauge.h" +#include "bag.h" +#include "game_options.h" +#include "message.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #define ENEMY_IN_SLOT_RIGHT 0 #define ENEMY_IN_SLOT_LEFT 2 -BGL * BattleSystem_BGL(BattleSystem * param0); +BGL *BattleSystem_BGL(BattleSystem *param0); /** * @brief Get one of the allocated windows for the battle display. - * - * @param battleSys - * @param idx - * @return + * + * @param battleSys + * @param idx + * @return */ -Window* BattleSystem_Window(BattleSystem *battleSys, int idx); -u32 BattleSystem_BattleType(BattleSystem * param0); -BattleContext * BattleSystem_Context(BattleSystem * param0); -BattlerData * BattleSystem_BattlerData(BattleSystem * param0, int param1); -int BattleSystem_MaxBattlers(BattleSystem * param0); -Party * BattleSystem_Party(BattleSystem * param0, int param1); +Window *BattleSystem_Window(BattleSystem *battleSys, int idx); +u32 BattleSystem_BattleType(BattleSystem *param0); +BattleContext *BattleSystem_Context(BattleSystem *param0); +BattlerData *BattleSystem_BattlerData(BattleSystem *param0, int param1); +int BattleSystem_MaxBattlers(BattleSystem *param0); +Party *BattleSystem_Party(BattleSystem *param0, int param1); /** * @brief Get the party count for a particular battler. - * + * * - If the battle taking place is a 2vs2 battle (player-with-partner vs. two * opponent trainers), then the battler input is not modified. * - If the battle taking place is against two opponents (but the player does @@ -67,8 +68,8 @@ Party * BattleSystem_Party(BattleSystem * param0, int param1); * - If the battle taking place is otherwise a double-battle, then the battler * input will be normalized to 0 or 1. * - Otherwise, the battler input is used to retrieve the particular party. - * - * @param battleSys + * + * @param battleSys * @param battler The battler party to count. * @return Number of Pokemon in the requested battler's party. */ @@ -77,103 +78,103 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler); /** * @brief Get a Pokemon from the given battler's party, choosing it from the * given party slot. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler * @param slot Index of the Pokemon in the party to retrieve. * @return Pointer to the Pokemon struct in that battler's party slot. */ -Pokemon* BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); -UnkStruct_02007768 * ov16_0223E000(BattleSystem * param0); -UnkStruct_ov12_0221FCDC * ov16_0223E008(BattleSystem * param0); -SpriteRenderer * ov16_0223E010(BattleSystem * param0); -SpriteGfxHandler * ov16_0223E018(BattleSystem * param0); -UnkStruct_ov16_02268520 * ov16_0223E020(BattleSystem * param0, int param1); -UnkStruct_ov16_02268A14 * ov16_0223E02C(BattleSystem * param0); -PartyGauge * ov16_0223E034(BattleSystem * param0, enum PartyGaugeSide param1); -void ov16_0223E040(BattleSystem * param0, enum PartyGaugeSide param1, PartyGauge * param2); -UnkStruct_0200C440 * ov16_0223E04C(BattleSystem * param0); -UnkStruct_0200C440 * ov16_0223E054(BattleSystem * param0); -MessageLoader * BattleSystem_MessageLoader(BattleSystem * param0); -MessageLoader * ov16_0223E060(BattleSystem * param0); -PaletteData * BattleSystem_PaletteSys(BattleSystem * param0); -PokedexData * ov16_0223E068(BattleSystem * param0); -u8 * ov16_0223E06C(BattleSystem * param0); -u8 * ov16_0223E074(BattleSystem * param0); -u16 * ov16_0223E080(BattleSystem * param0); -u16 * ov16_0223E08C(BattleSystem * param0); -u16 * ov16_0223E098(BattleSystem * param0); -u16 * ov16_0223E0A4(BattleSystem * param0); -u16 * ov16_0223E0B0(BattleSystem * param0); -u16 * ov16_0223E0BC(BattleSystem * param0); -UnkStruct_ov16_0223E0C8 * ov16_0223E0C8(BattleSystem * param0); -StringTemplate * BattleSystem_StringTemplate(BattleSystem * param0); -Strbuf* ov16_0223E0D4(BattleSystem * param0); +Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); +UnkStruct_02007768 *ov16_0223E000(BattleSystem *param0); +UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *param0); +SpriteRenderer *ov16_0223E010(BattleSystem *param0); +SpriteGfxHandler *ov16_0223E018(BattleSystem *param0); +UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *param0, int param1); +UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *param0); +PartyGauge *ov16_0223E034(BattleSystem *param0, enum PartyGaugeSide param1); +void ov16_0223E040(BattleSystem *param0, enum PartyGaugeSide param1, PartyGauge *param2); +UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *param0); +UnkStruct_0200C440 *ov16_0223E054(BattleSystem *param0); +MessageLoader *BattleSystem_MessageLoader(BattleSystem *param0); +MessageLoader *ov16_0223E060(BattleSystem *param0); +PaletteData *BattleSystem_PaletteSys(BattleSystem *param0); +PokedexData *ov16_0223E068(BattleSystem *param0); +u8 *ov16_0223E06C(BattleSystem *param0); +u8 *ov16_0223E074(BattleSystem *param0); +u16 *ov16_0223E080(BattleSystem *param0); +u16 *ov16_0223E08C(BattleSystem *param0); +u16 *ov16_0223E098(BattleSystem *param0); +u16 *ov16_0223E0A4(BattleSystem *param0); +u16 *ov16_0223E0B0(BattleSystem *param0); +u16 *ov16_0223E0BC(BattleSystem *param0); +UnkStruct_ov16_0223E0C8 *ov16_0223E0C8(BattleSystem *param0); +StringTemplate *BattleSystem_StringTemplate(BattleSystem *param0); +Strbuf *ov16_0223E0D4(BattleSystem *param0); /** * @brief Get the trainer ID for a particular battler. - * + * * @param battleSys * @param battler * @return The battler's trainer ID */ u16 Battler_TrainerID(BattleSystem *battleSys, int battler); -TrainerData * BattleSystem_TrainerData(BattleSystem * param0, int param1); +TrainerData *BattleSystem_TrainerData(BattleSystem *param0, int param1); /** * @brief Get the trainer info for a particular battler. - * - * @param battleSys - * @param battler + * + * @param battleSys + * @param battler * @return The trainer info for the requested battler. */ -TrainerInfo* BattleSystem_TrainerInfo(BattleSystem *battleSys, int battler); -Bag * BattleSystem_Bag(BattleSystem * param0); -UnkStruct_0207D99C * BattleSystem_BagCursor(BattleSystem * param0); -u32 ov16_0223E1B4(BattleSystem * param0, int param1); +TrainerInfo *BattleSystem_TrainerInfo(BattleSystem *battleSys, int battler); +Bag *BattleSystem_Bag(BattleSystem *param0); +UnkStruct_0207D99C *BattleSystem_BagCursor(BattleSystem *param0); +u32 ov16_0223E1B4(BattleSystem *param0, int param1); /** * @brief Get a battler of a particular type. - * - * @param battleSys - * @param type The type of battler. + * + * @param battleSys + * @param type The type of battler. * @return ID of the battler of the given type. */ int BattleSystem_BattlerOfType(BattleSystem *battleSys, int type); -u8 BattleSystem_BattlerSlot(BattleSystem * param0, int param1); -u8 Battler_Side(BattleSystem * param0, int param1); -void * ov16_0223E220(BattleSystem * param0); -PCBoxes * ov16_0223E228(BattleSystem * param0); +u8 BattleSystem_BattlerSlot(BattleSystem *param0, int param1); +u8 Battler_Side(BattleSystem *param0, int param1); +void *ov16_0223E220(BattleSystem *param0); +PCBoxes *ov16_0223E228(BattleSystem *param0); /** * @brief Get the terrain type for the battle. - * - * @param battleSys + * + * @param battleSys * @return The battle's terrain. */ enum Terrain BattleSystem_Terrain(BattleSystem *battleSys); -int ov16_0223E240(BattleSystem * param0); -int BattleSystem_MapHeader(BattleSystem * param0); -int BattleSystem_Partner(BattleSystem * param0, int param1); +int ov16_0223E240(BattleSystem *param0); +int BattleSystem_MapHeader(BattleSystem *param0); +int BattleSystem_Partner(BattleSystem *param0, int param1); /** * @brief Get the battler who is an enemy of the input attacker and occupies * a particular slot on the opposing team. - * + * * If the battle is a double-battle, then this will only ever return the * singular opponent. - * - * @param battleSys - * @param attacker - * @param slot + * + * @param battleSys + * @param attacker + * @param slot * @return Battler who is an enemy and in the given slot on the enemy team. */ int BattleSystem_EnemyInSlot(BattleSystem *battleSys, int attacker, int slot); /** * @brief Use an item from the bag on the given battler. - * - * @param battleSys + * + * @param battleSys * @param battler The battler who is using the item * @param partySlot The party slot the battler is targeting with the item * @param moveSlot Optional parameter for PP-restoring items @@ -181,102 +182,102 @@ int BattleSystem_EnemyInSlot(BattleSystem *battleSys, int attacker, int slot); * @return TRUE if the item has an effect; FALSE otherwise */ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot, int moveSlot, int item); -u32 BattleSystem_BattleStatus(BattleSystem * param0); +u32 BattleSystem_BattleStatus(BattleSystem *param0); /** * @brief Get the time of day. - * - * @param battleSys + * + * @param battleSys * @return The time of day (e.g., morning, day, night) */ enum Time BattleSystem_Time(BattleSystem *battleSys); -int ov16_0223EC04(BattleSystem * param0); -u8 ov16_0223EC58(BattleSystem * param0, int param1, u8 param2); -u16 ov16_0223ECC4(BattleParams * param0, int * param1, int * param2); -u8 ov16_0223ED60(BattleSystem * param0); -u8 ov16_0223ED6C(BattleSystem * param0); -int BattleSystem_NumSafariBalls(BattleSystem * param0); -void BattleSystem_SetSafariBalls(BattleSystem * param0, int param1); -Options * ov16_0223EDA4(BattleSystem * param0); +int ov16_0223EC04(BattleSystem *param0); +u8 ov16_0223EC58(BattleSystem *param0, int param1, u8 param2); +u16 ov16_0223ECC4(BattleParams *param0, int *param1, int *param2); +u8 ov16_0223ED60(BattleSystem *param0); +u8 ov16_0223ED6C(BattleSystem *param0); +int BattleSystem_NumSafariBalls(BattleSystem *param0); +void BattleSystem_SetSafariBalls(BattleSystem *param0, int param1); +Options *ov16_0223EDA4(BattleSystem *param0); /** * @brief Check if battle animations are turned on. - * - * @param battleSys + * + * @param battleSys * @return TRUE if battle animations are enabled, FALSE if not. */ BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys); -int ov16_0223EDE0(BattleSystem * param0); -u8 BattleSystem_TextSpeed(BattleSystem * param0); -int BattleSystem_Ruleset(BattleSystem * param0); -PokemonAnimationSys * ov16_0223EE28(BattleSystem * param0); -ChatotCry * 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); -void ov16_0223EF68(BattleSystem * param0, Pokemon * param1); -void ov16_0223EF8C(BattleSystem * param0); -u8 * ov16_0223F1E8(BattleSystem * param0); -u16 * ov16_0223F1F0(BattleSystem * param0); -int ov16_0223F1F8(BattleSystem * param0); -u16 * ov16_0223F204(BattleSystem * param0); -u16 * ov16_0223F210(BattleSystem * param0); -int BattleSystem_FieldWeather(BattleSystem * param0); -u8 ov16_0223F228(BattleSystem * param0); -void ov16_0223F234(BattleSystem * param0, u8 param1); -int ov16_0223F240(BattleSystem * param0); -void ov16_0223F24C(BattleSystem * param0, int param1); -void ov16_0223F268(BattleSystem * param0); +int ov16_0223EDE0(BattleSystem *param0); +u8 BattleSystem_TextSpeed(BattleSystem *param0); +int BattleSystem_Ruleset(BattleSystem *param0); +PokemonAnimationSys *ov16_0223EE28(BattleSystem *param0); +ChatotCry *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); +void ov16_0223EF68(BattleSystem *param0, Pokemon *param1); +void ov16_0223EF8C(BattleSystem *param0); +u8 *ov16_0223F1E8(BattleSystem *param0); +u16 *ov16_0223F1F0(BattleSystem *param0); +int ov16_0223F1F8(BattleSystem *param0); +u16 *ov16_0223F204(BattleSystem *param0); +u16 *ov16_0223F210(BattleSystem *param0); +int BattleSystem_FieldWeather(BattleSystem *param0); +u8 ov16_0223F228(BattleSystem *param0); +void ov16_0223F234(BattleSystem *param0, u8 param1); +int ov16_0223F240(BattleSystem *param0); +void ov16_0223F24C(BattleSystem *param0, int param1); +void ov16_0223F268(BattleSystem *param0); void BattleSystem_SetCommandSelectionFlags(BattleSystem *battleSys, int flags); -void ov16_0223F290(BattleSystem * param0, int param1); -void * Battle_WaitDial(BattleSystem * param0); -void Battle_SetWaitDial(BattleSystem * param0, void * param1); -UnkStruct_ov16_0223E0C8 * ov16_0223F2AC(BattleSystem * param0, int param1); -u8 * ov16_0223F2B8(UnkStruct_ov16_0223E0C8 * param0, int param1); -void ov16_0223F2CC(UnkStruct_ov16_0223E0C8 * param0, int param1, int param2); -void ov16_0223F2E4(UnkStruct_ov16_0223E0C8 * param0, int param1, int param2); -void ov16_0223F2FC(UnkStruct_ov16_0223E0C8 * param0, int param1, int param2); -void ov16_0223F314(BattleSystem * param0, int param1); -void ov16_0223F320(BattleSystem * param0, u8 * param1); -void ov16_0223F32C(BattleSystem * param0, u8 * param1); -void ov16_0223F338(BattleSystem * param0, u8 param1); -void ov16_0223F344(BattleSystem * param0, u8 param1); -void ov16_0223F350(BattleSystem * param0, u8 param1); -void * ov16_0223F35C(BattleSystem * param0, int param1); -void ov16_0223F36C(BattleSystem * param0); -void ov16_0223F3BC(BattleSystem * param0); -void ov16_0223F3EC(BattleSystem * param0); -void ov16_0223F414(BattleSystem * param0); -u8 BattleSystem_ResultMask(BattleSystem * param0); -void BattleSystem_SetResultFlag(BattleSystem * param0, u8 param1); -u8 ov16_0223F450(BattleSystem * param0); -void BattleSystem_SetRedHPSoundFlag(BattleSystem * param0, u8 param1); -u8 ov16_0223F47C(BattleSystem * param0); -void ov16_0223F48C(BattleSystem * param0, u8 param1); -void ov16_0223F4B0(BattleSystem * param0, int param1); -u16 BattleSystem_RandNext(BattleSystem * param0); -u32 ov16_0223F4E8(BattleSystem * param0); -void ov16_0223F4F4(BattleSystem * param0, u32 param1); -void BattleSystem_Record(BattleSystem * param0, int param1, u8 param2); -BOOL ov16_0223F530(BattleSystem * param0, int param1, u8 * param2); -u8 ov16_0223F58C(BattleSystem * param0, u8 * param1); -void ov16_0223F638(BattleSystem * param0, u16 param1, u8 * param2); -u16 ov16_0223F6E4(BattleSystem * param0); -int ov16_0223F6F0(BattleSystem * param0, u16 param1); -u16 BattleSystem_TrainerItems(BattleSystem * param0, int param1, int param2); -u32 BattleSystem_RecordingStopped(BattleSystem * param0); +void ov16_0223F290(BattleSystem *param0, int param1); +void *Battle_WaitDial(BattleSystem *param0); +void Battle_SetWaitDial(BattleSystem *param0, void *param1); +UnkStruct_ov16_0223E0C8 *ov16_0223F2AC(BattleSystem *param0, int param1); +u8 *ov16_0223F2B8(UnkStruct_ov16_0223E0C8 *param0, int param1); +void ov16_0223F2CC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); +void ov16_0223F2E4(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); +void ov16_0223F2FC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); +void ov16_0223F314(BattleSystem *param0, int param1); +void ov16_0223F320(BattleSystem *param0, u8 *param1); +void ov16_0223F32C(BattleSystem *param0, u8 *param1); +void ov16_0223F338(BattleSystem *param0, u8 param1); +void ov16_0223F344(BattleSystem *param0, u8 param1); +void ov16_0223F350(BattleSystem *param0, u8 param1); +void *ov16_0223F35C(BattleSystem *param0, int param1); +void ov16_0223F36C(BattleSystem *param0); +void ov16_0223F3BC(BattleSystem *param0); +void ov16_0223F3EC(BattleSystem *param0); +void ov16_0223F414(BattleSystem *param0); +u8 BattleSystem_ResultMask(BattleSystem *param0); +void BattleSystem_SetResultFlag(BattleSystem *param0, u8 param1); +u8 ov16_0223F450(BattleSystem *param0); +void BattleSystem_SetRedHPSoundFlag(BattleSystem *param0, u8 param1); +u8 ov16_0223F47C(BattleSystem *param0); +void ov16_0223F48C(BattleSystem *param0, u8 param1); +void ov16_0223F4B0(BattleSystem *param0, int param1); +u16 BattleSystem_RandNext(BattleSystem *param0); +u32 ov16_0223F4E8(BattleSystem *param0); +void ov16_0223F4F4(BattleSystem *param0, u32 param1); +void BattleSystem_Record(BattleSystem *param0, int param1, u8 param2); +BOOL ov16_0223F530(BattleSystem *param0, int param1, u8 *param2); +u8 ov16_0223F58C(BattleSystem *param0, u8 *param1); +void ov16_0223F638(BattleSystem *param0, u16 param1, u8 *param2); +u16 ov16_0223F6E4(BattleSystem *param0); +int ov16_0223F6F0(BattleSystem *param0, u16 param1); +u16 BattleSystem_TrainerItems(BattleSystem *param0, int param1, int param2); +u32 BattleSystem_RecordingStopped(BattleSystem *param0); void BattleSystem_SetStopRecording(BattleSystem *battleSys, int flag); -BOOL ov16_0223F7A4(BattleSystem * param0); +BOOL ov16_0223F7A4(BattleSystem *param0); void BattleSystem_ShowStopPlaybackButton(BattleSystem *battleSys); -u8 BattleSystem_RecordedChatter(BattleSystem * param0, int param1); -void ov16_0223F858(BattleSystem * param0, u8 * param1); -void ov16_0223F87C(BattleSystem * param0, u8 * param1); -void ov16_0223F8AC(BattleSystem * param0, Sprite ** param1); -void BattleSystem_SetGaugePriority(BattleSystem * param0, int param1); +u8 BattleSystem_RecordedChatter(BattleSystem *param0, int param1); +void ov16_0223F858(BattleSystem *param0, u8 *param1); +void ov16_0223F87C(BattleSystem *param0, u8 *param1); +void ov16_0223F8AC(BattleSystem *param0, Sprite **param1); +void BattleSystem_SetGaugePriority(BattleSystem *param0, int param1); /** * @brief Calculate the money penalty for losing a battle. - * + * * @param party The player's party; used to scale the penalty with the * highest-level member * @param trainerInfo The player's state; used to scale the penalty with the @@ -284,31 +285,31 @@ void BattleSystem_SetGaugePriority(BattleSystem * param0, int param1); * @return The total amount of money to be deducted from the player */ u32 BattleSystem_CalcMoneyPenalty(Party *party, TrainerInfo *trainerInfo); -void BattleSystem_DexFlagSeen(BattleSystem * param0, int param1); -void ov16_0223F9A0(BattleSystem * param0, int param1); +void BattleSystem_DexFlagSeen(BattleSystem *param0, int param1); +void ov16_0223F9A0(BattleSystem *param0, int param1); /** * @brief Checks if the player has previously caught a member of this species. - * - * @param battleSys - * @param species + * + * @param battleSys + * @param species * @return TRUE if the player has previously caught a member of the given species, * FALSE if not. */ BOOL BattleSystem_CaughtSpecies(BattleSystem *battleSys, int species); void Battle_SetDefaultBlend(void); -u8 ov16_0223F9FC(BattleSystem * param0, int param1, int param2, int param3, int param4); +u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int param4); /** * @brief Print a BattleMessage to the main text display window. - * - * @param battleSys - * @param msgLoader - * @param battleMsg + * + * @param battleSys + * @param msgLoader + * @param battleMsg * @param renderDelay Delay in flames applied to rendering between each character of the string. - * @return + * @return */ u8 BattleMessage_Print(BattleSystem *battleSys, MessageLoader *msgLoader, BattleMessage *battleMsg, int renderDelay); -u8 BattleMessage_PrintToWindow(BattleSystem * param0, Window * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8); +u8 BattleMessage_PrintToWindow(BattleSystem *param0, Window *param1, MessageLoader *param2, BattleMessage *param3, int param4, int param5, int param6, int param7, int param8); #endif // POKEPLATINUM_OV16_0223DF00_H diff --git a/include/battle/ov16_02264798.h b/include/battle/ov16_02264798.h index 747eb7539a..4262959823 100644 --- a/include/battle/ov16_02264798.h +++ b/include/battle/ov16_02264798.h @@ -2,9 +2,10 @@ #define POKEPLATINUM_OV16_02264798_H #include "struct_decls/battle_system.h" + #include "battle/struct_ov16_0225BFFC_decl.h" -void ov16_02264798(BattlerData * param0, BattleSystem * param1); -void ov16_022647D8(BattlerData * param0); +void ov16_02264798(BattlerData *param0, BattleSystem *param1); +void ov16_022647D8(BattlerData *param0); #endif // POKEPLATINUM_OV16_02264798_H diff --git a/include/battle/ov16_02268520.h b/include/battle/ov16_02268520.h index c6fd0601e3..0997888d68 100644 --- a/include/battle/ov16_02268520.h +++ b/include/battle/ov16_02268520.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_OV16_02268520_H #include "struct_decls/battle_system.h" + #include "battle/struct_ov16_02268520.h" -void ov16_02268520(UnkStruct_ov16_02268520 * param0); -void ov16_0226862C(UnkStruct_ov16_02268520 * param0); -void ov16_02268660(UnkStruct_ov16_02268520 * param0); -void ov16_02268674(UnkStruct_ov16_02268520 * param0); -void ov16_022686BC(UnkStruct_ov16_02268520 * param0, int param1); -void ov16_022686CC(UnkStruct_ov16_02268520 * param0, BattleSystem * param1, u16 param2, int param3); -void ov16_02268700(UnkStruct_ov16_02268520 * param0); +void ov16_02268520(UnkStruct_ov16_02268520 *param0); +void ov16_0226862C(UnkStruct_ov16_02268520 *param0); +void ov16_02268660(UnkStruct_ov16_02268520 *param0); +void ov16_02268674(UnkStruct_ov16_02268520 *param0); +void ov16_022686BC(UnkStruct_ov16_02268520 *param0, int param1); +void ov16_022686CC(UnkStruct_ov16_02268520 *param0, BattleSystem *param1, u16 param2, int param3); +void ov16_02268700(UnkStruct_ov16_02268520 *param0); #endif // POKEPLATINUM_OV16_02268520_H diff --git a/include/battle/ov16_0226871C.h b/include/battle/ov16_0226871C.h index 1fe6fffdba..f01059d261 100644 --- a/include/battle/ov16_0226871C.h +++ b/include/battle/ov16_0226871C.h @@ -1,36 +1,37 @@ #ifndef POKEPLATINUM_OV16_0226871C_H #define POKEPLATINUM_OV16_0226871C_H +#include "struct_decls/battle_system.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "struct_decls/battle_system.h" #include "struct_defs/struct_0209C370.h" + #include "battle/struct_ov16_02268A14_decl.h" #include "battle/struct_ov16_0226AC98.h" -void ov16_02268744(BGL * param0); -void ov16_022687A0(BGL * param0); -void * ov16_022687C8(NARC * param0, NARC * param1, BattleSystem * param2, int param3, UnkStruct_0209C370 * param4); -void ov16_02268A14(UnkStruct_ov16_02268A14 * param0); -void ov16_02268A88(UnkStruct_ov16_02268A14 * param0); -void ov16_02268B8C(UnkStruct_ov16_02268A14 * param0); -void ov16_02268C04(NARC * param0, NARC * param1, UnkStruct_ov16_02268A14 * param2, int param3, int param4, void * param5); -void ov16_02268D40(NARC * param0, UnkStruct_ov16_02268A14 * param1); -void ov16_0226914C(UnkStruct_ov16_02268A14 * param0, const u8 * param1); -void ov16_02269168(UnkStruct_ov16_02268A14 * param0, u8 param1[], u8 param2[]); -void ov16_022691BC(UnkStruct_ov16_02268A14 * param0); -void ov16_02269218(UnkStruct_ov16_02268A14 * param0); -int ov16_0226925C(UnkStruct_ov16_02268A14 * param0); -BOOL ov16_02269348(UnkStruct_ov16_02268A14 * param0); +void ov16_02268744(BGL *param0); +void ov16_022687A0(BGL *param0); +void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, UnkStruct_0209C370 *param4); +void ov16_02268A14(UnkStruct_ov16_02268A14 *param0); +void ov16_02268A88(UnkStruct_ov16_02268A14 *param0); +void ov16_02268B8C(UnkStruct_ov16_02268A14 *param0); +void ov16_02268C04(NARC *param0, NARC *param1, UnkStruct_ov16_02268A14 *param2, int param3, int param4, void *param5); +void ov16_02268D40(NARC *param0, UnkStruct_ov16_02268A14 *param1); +void ov16_0226914C(UnkStruct_ov16_02268A14 *param0, const u8 *param1); +void ov16_02269168(UnkStruct_ov16_02268A14 *param0, u8 param1[], u8 param2[]); +void ov16_022691BC(UnkStruct_ov16_02268A14 *param0); +void ov16_02269218(UnkStruct_ov16_02268A14 *param0); +int ov16_0226925C(UnkStruct_ov16_02268A14 *param0); +BOOL ov16_02269348(UnkStruct_ov16_02268A14 *param0); int ov16_02269368(int param0, int param1); -void ov16_0226940C(UnkStruct_ov16_02268A14 * param0); -void ov16_0226947C(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -void ov16_0226AC98(UnkStruct_ov16_02268A14 * param0, int param1, const UnkStruct_ov16_0226AC98 * param2); -void ov16_0226BCCC(UnkStruct_ov16_02268A14 * param0, int param1); -BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 * param0); -int ov16_0226CD08(UnkStruct_ov16_02268A14 * param0); -void ov16_0226CD10(UnkStruct_ov16_02268A14 * param0, int param1); -void ov16_0226CEB0(UnkStruct_ov16_02268A14 * param0, int param1); -u8 ov16_0226D088(UnkStruct_ov16_02268A14 * param0); +void ov16_0226940C(UnkStruct_ov16_02268A14 *param0); +void ov16_0226947C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_ov16_0226AC98 *param2); +void ov16_0226BCCC(UnkStruct_ov16_02268A14 *param0, int param1); +BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 *param0); +int ov16_0226CD08(UnkStruct_ov16_02268A14 *param0); +void ov16_0226CD10(UnkStruct_ov16_02268A14 *param0, int param1); +void ov16_0226CEB0(UnkStruct_ov16_02268A14 *param0, int param1); +u8 ov16_0226D088(UnkStruct_ov16_02268A14 *param0); #endif // POKEPLATINUM_OV16_0226871C_H diff --git a/include/battle/ov16_0226DB7C.h b/include/battle/ov16_0226DB7C.h index 92a18213c2..cde1f9d8ed 100644 --- a/include/battle/ov16_0226DB7C.h +++ b/include/battle/ov16_0226DB7C.h @@ -4,18 +4,19 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" + #include "battle/struct_ov16_0226DC24_decl.h" -void ov16_0226DB7C(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); -void ov16_0226DBFC(SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov16_0226DC24 * ov16_0226DC24(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov16_0226DCA8(UnkStruct_ov16_0226DC24 * param0); -void ov16_0226DCCC(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9); -void ov16_0226DD54(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); -void ov16_0226DD7C(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4); -void ov16_0226DD9C(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4, fx32 param5); -void ov16_0226DDC0(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, fx32 param4); -void ov16_0226DDE8(UnkStruct_ov16_0226DC24 * param0); -void ov16_0226DE04(UnkStruct_ov16_0226DC24 * param0); +void ov16_0226DB7C(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); +void ov16_0226DBFC(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); +UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0); +void ov16_0226DCCC(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9); +void ov16_0226DD54(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); +void ov16_0226DD7C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4); +void ov16_0226DD9C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, fx32 param5); +void ov16_0226DDC0(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, fx32 param4); +void ov16_0226DDE8(UnkStruct_ov16_0226DC24 *param0); +void ov16_0226DE04(UnkStruct_ov16_0226DC24 *param0); #endif // POKEPLATINUM_OV16_0226DB7C_H diff --git a/include/battle/ov16_0226DE44.h b/include/battle/ov16_0226DE44.h index 389392eaba..11030c2d95 100644 --- a/include/battle/ov16_0226DE44.h +++ b/include/battle/ov16_0226DE44.h @@ -4,16 +4,17 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" + #include "battle/struct_ov16_0226DEEC_decl.h" -void ov16_0226DE44(SpriteRenderer * param0, SpriteGfxHandler * param1, u32 param2, PaletteData * param3, u32 param4, u32 param5, u32 param6, u32 param7); -void ov16_0226DEC4(SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov16_0226DEEC * ov16_0226DEEC(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov16_0226DF68(UnkStruct_ov16_0226DEEC * param0); -void ov16_0226DF80(UnkStruct_ov16_0226DEEC * param0, int param1, int param2, fx32 param3); -void ov16_0226DFB0(UnkStruct_ov16_0226DEEC * param0, int param1, int param2); -void ov16_0226DFBC(UnkStruct_ov16_0226DEEC * param0); -void ov16_0226DFD0(UnkStruct_ov16_0226DEEC * param0, int param1); -BOOL ov16_0226DFD4(UnkStruct_ov16_0226DEEC * param0); +void ov16_0226DE44(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7); +void ov16_0226DEC4(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); +UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void ov16_0226DF68(UnkStruct_ov16_0226DEEC *param0); +void ov16_0226DF80(UnkStruct_ov16_0226DEEC *param0, int param1, int param2, fx32 param3); +void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2); +void ov16_0226DFBC(UnkStruct_ov16_0226DEEC *param0); +void ov16_0226DFD0(UnkStruct_ov16_0226DEEC *param0, int param1); +BOOL ov16_0226DFD4(UnkStruct_ov16_0226DEEC *param0); #endif // POKEPLATINUM_OV16_0226DE44_H diff --git a/include/battle/ov16_0226E148.h b/include/battle/ov16_0226E148.h index c98c54c10d..63e2e0e251 100644 --- a/include/battle/ov16_0226E148.h +++ b/include/battle/ov16_0226E148.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_OV16_0226E148_H #define POKEPLATINUM_OV16_0226E148_H -#include "sys_task_manager.h" #include "struct_decls/battle_system.h" -SysTask * ov16_0226E148(BattleSystem * param0); -void ov16_0226E174(SysTask * param0); +#include "sys_task_manager.h" + +SysTask *ov16_0226E148(BattleSystem *param0); +void ov16_0226E174(SysTask *param0); #endif // POKEPLATINUM_OV16_0226E148_H diff --git a/include/battle/party_gauge.h b/include/battle/party_gauge.h index c8ef0eb9c8..c144aee84d 100644 --- a/include/battle/party_gauge.h +++ b/include/battle/party_gauge.h @@ -4,6 +4,7 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" + #include "battle/struct_ov16_0226D160_decl.h" enum PartyGaugeSide { @@ -34,53 +35,53 @@ enum HideArrowType { /** * @brief Load the graphics resources needed for the Party Gauge into memory. - * - * @param renderer - * @param gfxHandler - * @param palette + * + * @param renderer + * @param gfxHandler + * @param palette */ void PartyGauge_LoadGraphics(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, PaletteData *palette); /** * @brief Free the graphics resources needed for the Party Gauge from memory. - * - * @param gfxHandler + * + * @param gfxHandler */ void PartyGauge_FreeGraphics(SpriteGfxHandler *gfxHandler); /** * @brief Show the Party Gauge. - * + * * @param ballStatus The status of each battler's, represented as a Pokeball with a particular * masking filter. Plain Pokeballs represent healthy battlers, gray represent * fainted, darkened represent those afflicted with a status condition. For * possible values, see enum PartyGaugeBallStatus. - * + * * @param side The side of the battle for which the gauge should be displayed. - * + * * @param showType How the gauge should be displayed, whether at the start of a battle (a slow * inward scroll) or mid-battle after a KO (a faster inward scroll). - * + * * @param pos Vertical position of the gauge; only applicable for double battles, so that * the gauge does not overlap the HP bar. - * @param renderer - * @param gfxHandler + * @param renderer + * @param gfxHandler * @return Pointer to the constructed PartyGauge struct, for tracking its progress * and eventually hiding it. */ -PartyGauge* PartyGauge_Show(u8 ballStatus[], enum PartyGaugeSide side, enum ShowPartyGaugeType showType, enum PartyGaugePosition pos, SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler); +PartyGauge *PartyGauge_Show(u8 ballStatus[], enum PartyGaugeSide side, enum ShowPartyGaugeType showType, enum PartyGaugePosition pos, SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler); /** * @brief Check if the Party Gauge has finished the inward scrolling animation. - * - * @param gauge + * + * @param gauge * @return TRUE if the Party Gauge has finished its animation, else FALSE. */ BOOL PartyGauge_ShowIsDone(PartyGauge *gauge); /** * @brief Hide the Party Gauge. - * + * * @param gauge Gauge to be hidden. * @param hideArrowType Method by which the arrow element should be hidden. * @param hideGaugeType Method by which the gauge Pokeballs should be hidden. @@ -89,16 +90,16 @@ void PartyGauge_Hide(PartyGauge *gauge, enum HideArrowType hideArrowType, enum H /** * @brief Check if the Party Gauge has finished the outward vanishing animation. - * - * @param gauge + * + * @param gauge * @return TRUE if the Party Gauge has finished its animation, else FALSE. */ BOOL PartyGauge_HideIsDone(PartyGauge *gauge); /** * @brief Free the Party Gauge and its resources back to the heap. - * - * @param gauge + * + * @param gauge */ void PartyGauge_Free(PartyGauge *gauge); diff --git a/include/battle/rodata_ov16_0226F6AC.h b/include/battle/rodata_ov16_0226F6AC.h index 52e4f71198..e9645ce8a2 100644 --- a/include/battle/rodata_ov16_0226F6AC.h +++ b/include/battle/rodata_ov16_0226F6AC.h @@ -2,2502 +2,2502 @@ #define RODATA_OV16_0226F6AC_H __attribute__((aligned(4))) const u8 Unk_ov16_0226F6AC[] = { - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0xE3, - 0x5E, - 0xEE, - 0x22, - 0xE2, - 0xEE, - 0xEE, - 0x22, - 0x42, - 0x44, - 0x44, - 0x33, - 0x43, - 0x54, - 0x44, - 0x33, - 0x53, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xE5, - 0xEE, - 0xEE, - 0xE5, - 0xE5, - 0x5E, - 0xEE, - 0xE5, - 0x45, - 0x44, - 0x44, - 0xE5, - 0x45, - 0x54, - 0x55, - 0xE5, - 0x55, - 0x55, - 0x33, - 0x53, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x56, - 0x55, - 0x55, - 0x55, - 0x56, - 0x55, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x66, - 0x55, - 0x55, - 0x55, - 0x66, - 0x55, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x66, - 0x56, - 0x55, - 0x55, - 0x66, - 0x56, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x66, - 0x66, - 0x55, - 0x55, - 0x66, - 0x66, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x66, - 0x66, - 0x56, - 0x55, - 0x66, - 0x66, - 0x56, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x66, - 0x66, - 0x66, - 0x55, - 0x66, - 0x66, - 0x66, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x66, - 0x66, - 0x66, - 0x56, - 0x66, - 0x66, - 0x66, - 0x56, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x66, - 0x66, - 0x66, - 0x66, - 0x66, - 0x66, - 0x66, - 0x66, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x58, - 0x55, - 0x55, - 0x55, - 0x58, - 0x55, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x88, - 0x55, - 0x55, - 0x55, - 0x88, - 0x55, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x88, - 0x58, - 0x55, - 0x55, - 0x88, - 0x58, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x88, - 0x88, - 0x55, - 0x55, - 0x88, - 0x88, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x88, - 0x88, - 0x58, - 0x55, - 0x88, - 0x88, - 0x58, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x88, - 0x88, - 0x88, - 0x55, - 0x88, - 0x88, - 0x88, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x88, - 0x88, - 0x88, - 0x58, - 0x88, - 0x88, - 0x88, - 0x58, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x88, - 0x88, - 0x88, - 0x88, - 0x88, - 0x88, - 0x88, - 0x88, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x5A, - 0x55, - 0x55, - 0x55, - 0x5A, - 0x55, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0xAA, - 0x55, - 0x55, - 0x55, - 0xAA, - 0x55, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0xAA, - 0x5A, - 0x55, - 0x55, - 0xAA, - 0x5A, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0xAA, - 0xAA, - 0x55, - 0x55, - 0xAA, - 0xAA, - 0x55, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0xAA, - 0xAA, - 0x5A, - 0x55, - 0xAA, - 0xAA, - 0x5A, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0xAA, - 0xAA, - 0xAA, - 0x55, - 0xAA, - 0xAA, - 0xAA, - 0x55, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0xAA, - 0xAA, - 0xAA, - 0x5A, - 0xAA, - 0xAA, - 0xAA, - 0x5A, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0xAA, - 0xAA, - 0xAA, - 0xAA, - 0xAA, - 0xAA, - 0xAA, - 0xAA, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x55, - 0x55, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0x11, - 0x11, - 0x11, - 0x11, - 0x22, - 0x22, - 0x22, - 0x22, - 0xEE, - 0xEE, - 0xEE, - 0xEE, - 0x22, - 0x22, - 0x22, - 0x22, - 0x44, - 0x44, - 0x44, - 0x44, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x11, - 0x11, - 0x11, - 0x11, - 0x22, - 0x22, - 0x22, - 0x22, - 0xEC, - 0xEE, - 0xEE, - 0xEE, - 0x22, - 0x22, - 0x22, - 0x22, - 0x44, - 0x44, - 0x44, - 0x44, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x11, - 0x11, - 0x11, - 0x11, - 0x22, - 0x22, - 0x22, - 0x22, - 0xCC, - 0xEE, - 0xEE, - 0xEE, - 0x22, - 0x22, - 0x22, - 0x22, - 0x44, - 0x44, - 0x44, - 0x44, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x11, - 0x11, - 0x11, - 0x11, - 0x22, - 0x22, - 0x22, - 0x22, - 0xCC, - 0xEC, - 0xEE, - 0xEE, - 0x22, - 0x22, - 0x22, - 0x22, - 0x44, - 0x44, - 0x44, - 0x44, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x11, - 0x11, - 0x11, - 0x11, - 0x22, - 0x22, - 0x22, - 0x22, - 0xCC, - 0xCC, - 0xEE, - 0xEE, - 0x22, - 0x22, - 0x22, - 0x22, - 0x44, - 0x44, - 0x44, - 0x44, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x11, - 0x11, - 0x11, - 0x11, - 0x22, - 0x22, - 0x22, - 0x22, - 0xCC, - 0xCC, - 0xEC, - 0xEE, - 0x22, - 0x22, - 0x22, - 0x22, - 0x44, - 0x44, - 0x44, - 0x44, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x11, - 0x11, - 0x11, - 0x11, - 0x22, - 0x22, - 0x22, - 0x22, - 0xCC, - 0xCC, - 0xCC, - 0xEE, - 0x22, - 0x22, - 0x22, - 0x22, - 0x44, - 0x44, - 0x44, - 0x44, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x11, - 0x11, - 0x11, - 0x11, - 0x22, - 0x22, - 0x22, - 0x22, - 0xCC, - 0xCC, - 0xCC, - 0xEC, - 0x22, - 0x22, - 0x22, - 0x22, - 0x44, - 0x44, - 0x44, - 0x44, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x11, - 0x11, - 0x11, - 0x11, - 0x22, - 0x22, - 0x22, - 0x22, - 0xCC, - 0xCC, - 0xCC, - 0xCC, - 0x22, - 0x22, - 0x22, - 0x22, - 0x44, - 0x44, - 0x44, - 0x44, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x88, - 0x88, - 0x88, - 0x83, - 0xE8, - 0xEE, - 0x7E, - 0x83, - 0xE8, - 0x77, - 0xE7, - 0x82, - 0xE8, - 0xE4, - 0x7E, - 0x82, - 0xE8, - 0x77, - 0x87, - 0x73, - 0xE8, - 0x87, - 0x88, - 0x33, - 0x77, - 0x77, - 0x77, - 0xff, - 0xff, - 0xff, - 0xff, - 0x88, - 0x88, - 0x88, - 0x88, - 0x88, - 0xEE, - 0x7E, - 0xE8, - 0xE7, - 0x77, - 0xE7, - 0xE7, - 0xE8, - 0x87, - 0xE8, - 0xE7, - 0xE8, - 0x44, - 0xEE, - 0xE7, - 0xE8, - 0x77, - 0xE7, - 0xE7, - 0x77, - 0x77, - 0x77, - 0x77, - 0xff, - 0xff, - 0xff, - 0xff, - 0x88, - 0x88, - 0x88, - 0xff, - 0xEE, - 0x7E, - 0x88, - 0x38, - 0x77, - 0xE7, - 0x87, - 0x38, - 0x44, - 0x7E, - 0x88, - 0x28, - 0x47, - 0x87, - 0x88, - 0x28, - 0x77, - 0xE4, - 0x87, - 0x37, - 0x77, - 0x77, - 0x77, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xCC, - 0xCC, - 0xCC, - 0xC3, - 0xEC, - 0xEE, - 0xEE, - 0xC3, - 0xEC, - 0xBB, - 0xBB, - 0xC2, - 0xEC, - 0xE4, - 0xBE, - 0xC2, - 0xEC, - 0xBB, - 0xBB, - 0xB3, - 0xEC, - 0xCB, - 0xCC, - 0x33, - 0xBB, - 0xBB, - 0xBB, - 0xff, - 0xff, - 0xff, - 0xff, - 0xCC, - 0xCC, - 0xCC, - 0xCC, - 0xEB, - 0xEE, - 0xBE, - 0xEC, - 0xEB, - 0xBB, - 0xEB, - 0xBB, - 0xEC, - 0x44, - 0xBE, - 0xCC, - 0xEC, - 0x4B, - 0xCB, - 0xEC, - 0xEC, - 0xBB, - 0xE4, - 0xEB, - 0xBB, - 0xBB, - 0xBB, - 0xBB, - 0xff, - 0xff, - 0xff, - 0xff, - 0xCC, - 0xCC, - 0xCC, - 0xff, - 0xEE, - 0x4E, - 0xCB, - 0x3C, - 0xBB, - 0xBE, - 0xCB, - 0x3C, - 0xEE, - 0xCB, - 0xCC, - 0x2C, - 0xBB, - 0xCC, - 0xCC, - 0x2C, - 0xE4, - 0xEE, - 0xCB, - 0x3B, - 0xBB, - 0xBB, - 0xBB, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x11, - 0x11, - 0x11, - 0x13, - 0x11, - 0xEE, - 0xEE, - 0x13, - 0xE1, - 0xff, - 0xff, - 0x12, - 0xf1, - 0xEE, - 0xfe, - 0x12, - 0x11, - 0xff, - 0x4f, - 0x23, - 0xE1, - 0xEE, - 0xf4, - 0x33, - 0x22, - 0x22, - 0x22, - 0xff, - 0xff, - 0xff, - 0xff, - 0x11, - 0x11, - 0x11, - 0x11, - 0xef, - 0x1f, - 0x11, - 0xE1, - 0xef, - 0x1f, - 0x11, - 0xE1, - 0xE1, - 0x1f, - 0x11, - 0xE1, - 0xef, - 0x1f, - 0x11, - 0xE1, - 0xE1, - 0xEE, - 0xEE, - 0xef, - 0x22, - 0x22, - 0x22, - 0x22, - 0xff, - 0xff, - 0xff, - 0xff, - 0x11, - 0x11, - 0xf1, - 0xff, - 0xEE, - 0xfe, - 0x11, - 0x31, - 0xff, - 0xef, - 0x1f, - 0x31, - 0xE4, - 0xfe, - 0x11, - 0x21, - 0xff, - 0x1f, - 0x11, - 0x21, - 0x1f, - 0x11, - 0x11, - 0x32, - 0x22, - 0x22, - 0x22, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xDD, - 0xDD, - 0xDD, - 0xD3, - 0xED, - 0xEE, - 0x9E, - 0xD3, - 0xED, - 0x99, - 0xE9, - 0xD2, - 0xED, - 0xE4, - 0x9E, - 0xD2, - 0xED, - 0x99, - 0xD9, - 0x93, - 0xED, - 0xD9, - 0xDD, - 0x33, - 0x99, - 0x99, - 0x99, - 0xff, - 0xff, - 0xff, - 0xff, - 0xDD, - 0xDD, - 0xDD, - 0xDD, - 0xDD, - 0xEE, - 0xEE, - 0xE9, - 0xE9, - 0x99, - 0x99, - 0xE9, - 0x9D, - 0xE4, - 0x9E, - 0xED, - 0xDD, - 0x99, - 0x49, - 0xE9, - 0xED, - 0xEE, - 0x94, - 0xED, - 0x99, - 0x99, - 0x99, - 0x99, - 0xff, - 0xff, - 0xff, - 0xff, - 0xDD, - 0xDD, - 0xDD, - 0xf3, - 0xD9, - 0xED, - 0xD9, - 0x3D, - 0x94, - 0xED, - 0xD9, - 0x3D, - 0xE4, - 0xE4, - 0xD9, - 0x2D, - 0x99, - 0xEE, - 0xD9, - 0x2D, - 0xD9, - 0xE9, - 0xD9, - 0x39, - 0x99, - 0x99, - 0x99, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xAA, - 0xAA, - 0xAA, - 0xA3, - 0xEA, - 0xEE, - 0x9E, - 0xA3, - 0xEA, - 0x99, - 0xE9, - 0xA2, - 0xEA, - 0xE4, - 0x9E, - 0xA2, - 0xEA, - 0x99, - 0x49, - 0x93, - 0xEA, - 0x44, - 0x94, - 0x33, - 0x99, - 0x99, - 0x99, - 0xff, - 0xff, - 0xff, - 0xff, - 0xAA, - 0xAA, - 0xAA, - 0xAA, - 0xEA, - 0xEE, - 0x9E, - 0xEA, - 0xE9, - 0x99, - 0xE9, - 0xE9, - 0xEA, - 0x44, - 0x9E, - 0xEA, - 0xE9, - 0x49, - 0xA9, - 0xEA, - 0xEA, - 0x99, - 0xE4, - 0xE9, - 0x99, - 0x99, - 0x99, - 0x99, - 0xff, - 0xff, - 0xff, - 0xff, - 0xAA, - 0xAA, - 0xAA, - 0xff, - 0xA9, - 0xEA, - 0xA9, - 0x3A, - 0x94, - 0xEA, - 0xA9, - 0x3A, - 0xE4, - 0xE4, - 0xA9, - 0x2A, - 0x99, - 0xE4, - 0xA9, - 0x2A, - 0xA9, - 0xE9, - 0xA9, - 0x39, - 0x99, - 0x99, - 0x99, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x55, - 0xf5, - 0xff, - 0x53, - 0xA4, - 0x59, - 0x33, - 0x95, - 0x3A, - 0x9A, - 0x35, - 0x35, - 0x33, - 0x33, - 0x25, - 0x45, - 0x3E, - 0x4E, - 0x25, - 0x53, - 0xE4, - 0x54, - 0x33, - 0x33, - 0x55, - 0x35, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xaf, - 0xAA, - 0xf2, - 0xff, - 0x2A, - 0x22, - 0x2A, - 0xff, - 0x2A, - 0xff, - 0x2A, - 0xef, - 0xA2, - 0xAA, - 0x22, - 0xef, - 0x2f, - 0x2A, - 0xf2, - 0xef, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xef, - 0x2E, - 0x2E, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x2C, - 0xff, - 0xff, - 0xcf, - 0xCC, - 0xf2, - 0xff, - 0x2C, - 0x2C, - 0x2C, - 0xef, - 0xf2, - 0x2C, - 0x22, - 0xef, - 0xcf, - 0xCC, - 0xf2, - 0xef, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xef, - 0x2E, - 0x2E, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xef, - 0xff, - 0xff, - 0xff, - 0xef, - 0xff, - 0xff, - 0xff, - 0xef, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xef, - 0x2E, - 0x2E, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0xE3, - 0x5E, - 0xEE, - 0x22, - 0xE2, - 0xEE, - 0xEE, - 0x22, - 0x42, - 0x44, - 0x44, - 0x33, - 0x43, - 0x54, - 0x44, - 0x33, - 0x53, - 0x55, - 0x55, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xE5, - 0xEE, - 0xEE, - 0xE5, - 0xE5, - 0x5E, - 0xEE, - 0xE5, - 0x45, - 0x44, - 0x44, - 0xE5, - 0x45, - 0x54, - 0x55, - 0xE5, - 0x55, - 0x55, - 0x33, - 0x53, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0x5E, - 0x33, - 0x33, - 0x33, - 0x5E, - 0x22, - 0x22, - 0x22, - 0x5E, - 0x22, - 0x22, - 0x22, - 0x5E, - 0x33, - 0x33, - 0x33, - 0x55, - 0x33, - 0x33, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xff, - 0xff, - 0xef, - 0xf2, - 0xff, - 0xff, - 0x2E, - 0xff, - 0xff, - 0xef, - 0xf2, - 0xff, - 0xff, - 0x2E, - 0xff, - 0xff, - 0xef, - 0xf2, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0xE5, - 0xEE, - 0xEE, - 0x35, - 0xE5, - 0x5E, - 0xEE, - 0x25, - 0x45, - 0x44, - 0x44, - 0x25, - 0x45, - 0x54, - 0x55, - 0x35, - 0x55, - 0x55, - 0x33, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x22, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0x33, - 0xff, - 0xff, - 0xff, - 0xff, - 0xAA, - 0xAA, - 0x2A, - 0xef, - 0x22, - 0x2A, - 0x22, - 0xef, - 0xff, - 0x2A, - 0xff, - 0xef, - 0xff, - 0x22, - 0xff, - 0x2f, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xef, - 0x2E, - 0x2E, - 0x2E, - 0xef, - 0x2E, - 0x2E, - 0xEE, - 0x2E, - 0xEE, - 0x22, - 0x22, - 0x22, - 0x22, - 0xf2, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x2C, - 0x22, - 0x2C, - 0xef, - 0x2C, - 0xff, - 0x2C, - 0xef, - 0xC2, - 0xCC, - 0x22, - 0xef, - 0x2f, - 0x22, - 0xf2, - 0x2f, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xef, - 0x2E, - 0x2E, - 0x2E, - 0xef, - 0x2E, - 0x2E, - 0xEE, - 0x2E, - 0xEE, - 0x22, - 0x22, - 0x22, - 0x22, - 0xf2, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xef, - 0xff, - 0xff, - 0xff, - 0xef, - 0xff, - 0xff, - 0xff, - 0xef, - 0xff, - 0xff, - 0xff, - 0x2f, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0x2E, - 0xef, - 0x2E, - 0x2E, - 0x2E, - 0xef, - 0x2E, - 0x2E, - 0xEE, - 0x2E, - 0xEE, - 0x22, - 0x22, - 0x22, - 0x22, - 0xf2, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff, - 0xff + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0xE3, + 0x5E, + 0xEE, + 0x22, + 0xE2, + 0xEE, + 0xEE, + 0x22, + 0x42, + 0x44, + 0x44, + 0x33, + 0x43, + 0x54, + 0x44, + 0x33, + 0x53, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xE5, + 0xEE, + 0xEE, + 0xE5, + 0xE5, + 0x5E, + 0xEE, + 0xE5, + 0x45, + 0x44, + 0x44, + 0xE5, + 0x45, + 0x54, + 0x55, + 0xE5, + 0x55, + 0x55, + 0x33, + 0x53, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x56, + 0x55, + 0x55, + 0x55, + 0x56, + 0x55, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x66, + 0x55, + 0x55, + 0x55, + 0x66, + 0x55, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x66, + 0x56, + 0x55, + 0x55, + 0x66, + 0x56, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x66, + 0x66, + 0x55, + 0x55, + 0x66, + 0x66, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x66, + 0x66, + 0x56, + 0x55, + 0x66, + 0x66, + 0x56, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x66, + 0x66, + 0x66, + 0x55, + 0x66, + 0x66, + 0x66, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x66, + 0x66, + 0x66, + 0x56, + 0x66, + 0x66, + 0x66, + 0x56, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x66, + 0x66, + 0x66, + 0x66, + 0x66, + 0x66, + 0x66, + 0x66, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x58, + 0x55, + 0x55, + 0x55, + 0x58, + 0x55, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x88, + 0x55, + 0x55, + 0x55, + 0x88, + 0x55, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x88, + 0x58, + 0x55, + 0x55, + 0x88, + 0x58, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x88, + 0x88, + 0x55, + 0x55, + 0x88, + 0x88, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x88, + 0x88, + 0x58, + 0x55, + 0x88, + 0x88, + 0x58, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x88, + 0x88, + 0x88, + 0x55, + 0x88, + 0x88, + 0x88, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x88, + 0x88, + 0x88, + 0x58, + 0x88, + 0x88, + 0x88, + 0x58, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x88, + 0x88, + 0x88, + 0x88, + 0x88, + 0x88, + 0x88, + 0x88, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x5A, + 0x55, + 0x55, + 0x55, + 0x5A, + 0x55, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0xAA, + 0x55, + 0x55, + 0x55, + 0xAA, + 0x55, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0xAA, + 0x5A, + 0x55, + 0x55, + 0xAA, + 0x5A, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0xAA, + 0xAA, + 0x55, + 0x55, + 0xAA, + 0xAA, + 0x55, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0xAA, + 0xAA, + 0x5A, + 0x55, + 0xAA, + 0xAA, + 0x5A, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0xAA, + 0xAA, + 0xAA, + 0x55, + 0xAA, + 0xAA, + 0xAA, + 0x55, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0xAA, + 0xAA, + 0xAA, + 0x5A, + 0xAA, + 0xAA, + 0xAA, + 0x5A, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0xAA, + 0xAA, + 0xAA, + 0xAA, + 0xAA, + 0xAA, + 0xAA, + 0xAA, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x55, + 0x55, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0x11, + 0x11, + 0x11, + 0x11, + 0x22, + 0x22, + 0x22, + 0x22, + 0xEE, + 0xEE, + 0xEE, + 0xEE, + 0x22, + 0x22, + 0x22, + 0x22, + 0x44, + 0x44, + 0x44, + 0x44, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x11, + 0x11, + 0x11, + 0x11, + 0x22, + 0x22, + 0x22, + 0x22, + 0xEC, + 0xEE, + 0xEE, + 0xEE, + 0x22, + 0x22, + 0x22, + 0x22, + 0x44, + 0x44, + 0x44, + 0x44, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x11, + 0x11, + 0x11, + 0x11, + 0x22, + 0x22, + 0x22, + 0x22, + 0xCC, + 0xEE, + 0xEE, + 0xEE, + 0x22, + 0x22, + 0x22, + 0x22, + 0x44, + 0x44, + 0x44, + 0x44, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x11, + 0x11, + 0x11, + 0x11, + 0x22, + 0x22, + 0x22, + 0x22, + 0xCC, + 0xEC, + 0xEE, + 0xEE, + 0x22, + 0x22, + 0x22, + 0x22, + 0x44, + 0x44, + 0x44, + 0x44, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x11, + 0x11, + 0x11, + 0x11, + 0x22, + 0x22, + 0x22, + 0x22, + 0xCC, + 0xCC, + 0xEE, + 0xEE, + 0x22, + 0x22, + 0x22, + 0x22, + 0x44, + 0x44, + 0x44, + 0x44, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x11, + 0x11, + 0x11, + 0x11, + 0x22, + 0x22, + 0x22, + 0x22, + 0xCC, + 0xCC, + 0xEC, + 0xEE, + 0x22, + 0x22, + 0x22, + 0x22, + 0x44, + 0x44, + 0x44, + 0x44, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x11, + 0x11, + 0x11, + 0x11, + 0x22, + 0x22, + 0x22, + 0x22, + 0xCC, + 0xCC, + 0xCC, + 0xEE, + 0x22, + 0x22, + 0x22, + 0x22, + 0x44, + 0x44, + 0x44, + 0x44, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x11, + 0x11, + 0x11, + 0x11, + 0x22, + 0x22, + 0x22, + 0x22, + 0xCC, + 0xCC, + 0xCC, + 0xEC, + 0x22, + 0x22, + 0x22, + 0x22, + 0x44, + 0x44, + 0x44, + 0x44, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x11, + 0x11, + 0x11, + 0x11, + 0x22, + 0x22, + 0x22, + 0x22, + 0xCC, + 0xCC, + 0xCC, + 0xCC, + 0x22, + 0x22, + 0x22, + 0x22, + 0x44, + 0x44, + 0x44, + 0x44, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x88, + 0x88, + 0x88, + 0x83, + 0xE8, + 0xEE, + 0x7E, + 0x83, + 0xE8, + 0x77, + 0xE7, + 0x82, + 0xE8, + 0xE4, + 0x7E, + 0x82, + 0xE8, + 0x77, + 0x87, + 0x73, + 0xE8, + 0x87, + 0x88, + 0x33, + 0x77, + 0x77, + 0x77, + 0xff, + 0xff, + 0xff, + 0xff, + 0x88, + 0x88, + 0x88, + 0x88, + 0x88, + 0xEE, + 0x7E, + 0xE8, + 0xE7, + 0x77, + 0xE7, + 0xE7, + 0xE8, + 0x87, + 0xE8, + 0xE7, + 0xE8, + 0x44, + 0xEE, + 0xE7, + 0xE8, + 0x77, + 0xE7, + 0xE7, + 0x77, + 0x77, + 0x77, + 0x77, + 0xff, + 0xff, + 0xff, + 0xff, + 0x88, + 0x88, + 0x88, + 0xff, + 0xEE, + 0x7E, + 0x88, + 0x38, + 0x77, + 0xE7, + 0x87, + 0x38, + 0x44, + 0x7E, + 0x88, + 0x28, + 0x47, + 0x87, + 0x88, + 0x28, + 0x77, + 0xE4, + 0x87, + 0x37, + 0x77, + 0x77, + 0x77, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xCC, + 0xCC, + 0xCC, + 0xC3, + 0xEC, + 0xEE, + 0xEE, + 0xC3, + 0xEC, + 0xBB, + 0xBB, + 0xC2, + 0xEC, + 0xE4, + 0xBE, + 0xC2, + 0xEC, + 0xBB, + 0xBB, + 0xB3, + 0xEC, + 0xCB, + 0xCC, + 0x33, + 0xBB, + 0xBB, + 0xBB, + 0xff, + 0xff, + 0xff, + 0xff, + 0xCC, + 0xCC, + 0xCC, + 0xCC, + 0xEB, + 0xEE, + 0xBE, + 0xEC, + 0xEB, + 0xBB, + 0xEB, + 0xBB, + 0xEC, + 0x44, + 0xBE, + 0xCC, + 0xEC, + 0x4B, + 0xCB, + 0xEC, + 0xEC, + 0xBB, + 0xE4, + 0xEB, + 0xBB, + 0xBB, + 0xBB, + 0xBB, + 0xff, + 0xff, + 0xff, + 0xff, + 0xCC, + 0xCC, + 0xCC, + 0xff, + 0xEE, + 0x4E, + 0xCB, + 0x3C, + 0xBB, + 0xBE, + 0xCB, + 0x3C, + 0xEE, + 0xCB, + 0xCC, + 0x2C, + 0xBB, + 0xCC, + 0xCC, + 0x2C, + 0xE4, + 0xEE, + 0xCB, + 0x3B, + 0xBB, + 0xBB, + 0xBB, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x11, + 0x11, + 0x11, + 0x13, + 0x11, + 0xEE, + 0xEE, + 0x13, + 0xE1, + 0xff, + 0xff, + 0x12, + 0xf1, + 0xEE, + 0xfe, + 0x12, + 0x11, + 0xff, + 0x4f, + 0x23, + 0xE1, + 0xEE, + 0xf4, + 0x33, + 0x22, + 0x22, + 0x22, + 0xff, + 0xff, + 0xff, + 0xff, + 0x11, + 0x11, + 0x11, + 0x11, + 0xef, + 0x1f, + 0x11, + 0xE1, + 0xef, + 0x1f, + 0x11, + 0xE1, + 0xE1, + 0x1f, + 0x11, + 0xE1, + 0xef, + 0x1f, + 0x11, + 0xE1, + 0xE1, + 0xEE, + 0xEE, + 0xef, + 0x22, + 0x22, + 0x22, + 0x22, + 0xff, + 0xff, + 0xff, + 0xff, + 0x11, + 0x11, + 0xf1, + 0xff, + 0xEE, + 0xfe, + 0x11, + 0x31, + 0xff, + 0xef, + 0x1f, + 0x31, + 0xE4, + 0xfe, + 0x11, + 0x21, + 0xff, + 0x1f, + 0x11, + 0x21, + 0x1f, + 0x11, + 0x11, + 0x32, + 0x22, + 0x22, + 0x22, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xDD, + 0xDD, + 0xDD, + 0xD3, + 0xED, + 0xEE, + 0x9E, + 0xD3, + 0xED, + 0x99, + 0xE9, + 0xD2, + 0xED, + 0xE4, + 0x9E, + 0xD2, + 0xED, + 0x99, + 0xD9, + 0x93, + 0xED, + 0xD9, + 0xDD, + 0x33, + 0x99, + 0x99, + 0x99, + 0xff, + 0xff, + 0xff, + 0xff, + 0xDD, + 0xDD, + 0xDD, + 0xDD, + 0xDD, + 0xEE, + 0xEE, + 0xE9, + 0xE9, + 0x99, + 0x99, + 0xE9, + 0x9D, + 0xE4, + 0x9E, + 0xED, + 0xDD, + 0x99, + 0x49, + 0xE9, + 0xED, + 0xEE, + 0x94, + 0xED, + 0x99, + 0x99, + 0x99, + 0x99, + 0xff, + 0xff, + 0xff, + 0xff, + 0xDD, + 0xDD, + 0xDD, + 0xf3, + 0xD9, + 0xED, + 0xD9, + 0x3D, + 0x94, + 0xED, + 0xD9, + 0x3D, + 0xE4, + 0xE4, + 0xD9, + 0x2D, + 0x99, + 0xEE, + 0xD9, + 0x2D, + 0xD9, + 0xE9, + 0xD9, + 0x39, + 0x99, + 0x99, + 0x99, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xAA, + 0xAA, + 0xAA, + 0xA3, + 0xEA, + 0xEE, + 0x9E, + 0xA3, + 0xEA, + 0x99, + 0xE9, + 0xA2, + 0xEA, + 0xE4, + 0x9E, + 0xA2, + 0xEA, + 0x99, + 0x49, + 0x93, + 0xEA, + 0x44, + 0x94, + 0x33, + 0x99, + 0x99, + 0x99, + 0xff, + 0xff, + 0xff, + 0xff, + 0xAA, + 0xAA, + 0xAA, + 0xAA, + 0xEA, + 0xEE, + 0x9E, + 0xEA, + 0xE9, + 0x99, + 0xE9, + 0xE9, + 0xEA, + 0x44, + 0x9E, + 0xEA, + 0xE9, + 0x49, + 0xA9, + 0xEA, + 0xEA, + 0x99, + 0xE4, + 0xE9, + 0x99, + 0x99, + 0x99, + 0x99, + 0xff, + 0xff, + 0xff, + 0xff, + 0xAA, + 0xAA, + 0xAA, + 0xff, + 0xA9, + 0xEA, + 0xA9, + 0x3A, + 0x94, + 0xEA, + 0xA9, + 0x3A, + 0xE4, + 0xE4, + 0xA9, + 0x2A, + 0x99, + 0xE4, + 0xA9, + 0x2A, + 0xA9, + 0xE9, + 0xA9, + 0x39, + 0x99, + 0x99, + 0x99, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x55, + 0xf5, + 0xff, + 0x53, + 0xA4, + 0x59, + 0x33, + 0x95, + 0x3A, + 0x9A, + 0x35, + 0x35, + 0x33, + 0x33, + 0x25, + 0x45, + 0x3E, + 0x4E, + 0x25, + 0x53, + 0xE4, + 0x54, + 0x33, + 0x33, + 0x55, + 0x35, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xaf, + 0xAA, + 0xf2, + 0xff, + 0x2A, + 0x22, + 0x2A, + 0xff, + 0x2A, + 0xff, + 0x2A, + 0xef, + 0xA2, + 0xAA, + 0x22, + 0xef, + 0x2f, + 0x2A, + 0xf2, + 0xef, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xef, + 0x2E, + 0x2E, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x2C, + 0xff, + 0xff, + 0xcf, + 0xCC, + 0xf2, + 0xff, + 0x2C, + 0x2C, + 0x2C, + 0xef, + 0xf2, + 0x2C, + 0x22, + 0xef, + 0xcf, + 0xCC, + 0xf2, + 0xef, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xef, + 0x2E, + 0x2E, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xef, + 0xff, + 0xff, + 0xff, + 0xef, + 0xff, + 0xff, + 0xff, + 0xef, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xef, + 0x2E, + 0x2E, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0xE3, + 0x5E, + 0xEE, + 0x22, + 0xE2, + 0xEE, + 0xEE, + 0x22, + 0x42, + 0x44, + 0x44, + 0x33, + 0x43, + 0x54, + 0x44, + 0x33, + 0x53, + 0x55, + 0x55, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xE5, + 0xEE, + 0xEE, + 0xE5, + 0xE5, + 0x5E, + 0xEE, + 0xE5, + 0x45, + 0x44, + 0x44, + 0xE5, + 0x45, + 0x54, + 0x55, + 0xE5, + 0x55, + 0x55, + 0x33, + 0x53, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0x5E, + 0x33, + 0x33, + 0x33, + 0x5E, + 0x22, + 0x22, + 0x22, + 0x5E, + 0x22, + 0x22, + 0x22, + 0x5E, + 0x33, + 0x33, + 0x33, + 0x55, + 0x33, + 0x33, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xff, + 0xff, + 0xef, + 0xf2, + 0xff, + 0xff, + 0x2E, + 0xff, + 0xff, + 0xef, + 0xf2, + 0xff, + 0xff, + 0x2E, + 0xff, + 0xff, + 0xef, + 0xf2, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0xE5, + 0xEE, + 0xEE, + 0x35, + 0xE5, + 0x5E, + 0xEE, + 0x25, + 0x45, + 0x44, + 0x44, + 0x25, + 0x45, + 0x54, + 0x55, + 0x35, + 0x55, + 0x55, + 0x33, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x22, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0x33, + 0xff, + 0xff, + 0xff, + 0xff, + 0xAA, + 0xAA, + 0x2A, + 0xef, + 0x22, + 0x2A, + 0x22, + 0xef, + 0xff, + 0x2A, + 0xff, + 0xef, + 0xff, + 0x22, + 0xff, + 0x2f, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xef, + 0x2E, + 0x2E, + 0x2E, + 0xef, + 0x2E, + 0x2E, + 0xEE, + 0x2E, + 0xEE, + 0x22, + 0x22, + 0x22, + 0x22, + 0xf2, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x2C, + 0x22, + 0x2C, + 0xef, + 0x2C, + 0xff, + 0x2C, + 0xef, + 0xC2, + 0xCC, + 0x22, + 0xef, + 0x2f, + 0x22, + 0xf2, + 0x2f, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xef, + 0x2E, + 0x2E, + 0x2E, + 0xef, + 0x2E, + 0x2E, + 0xEE, + 0x2E, + 0xEE, + 0x22, + 0x22, + 0x22, + 0x22, + 0xf2, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xef, + 0xff, + 0xff, + 0xff, + 0xef, + 0xff, + 0xff, + 0xff, + 0xef, + 0xff, + 0xff, + 0xff, + 0x2f, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0x2E, + 0xef, + 0x2E, + 0x2E, + 0x2E, + 0xef, + 0x2E, + 0x2E, + 0xEE, + 0x2E, + 0xEE, + 0x22, + 0x22, + 0x22, + 0x22, + 0xf2, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff }; #endif // RODATA_OV16_0226F6AC_H diff --git a/include/battle/struct_ov16_0223E0C8.h b/include/battle/struct_ov16_0223E0C8.h index 62d345a642..89f1645f96 100644 --- a/include/battle/struct_ov16_0223E0C8.h +++ b/include/battle/struct_ov16_0223E0C8.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV16_0223E0C8_H typedef struct { - u8 * unk_00; + u8 *unk_00; int unk_04; int unk_08; int unk_0C; diff --git a/include/battle/struct_ov16_0225BFFC_t.h b/include/battle/struct_ov16_0225BFFC_t.h index 9aa8d6c55c..bfd6896c90 100644 --- a/include/battle/struct_ov16_0225BFFC_t.h +++ b/include/battle/struct_ov16_0225BFFC_t.h @@ -1,39 +1,41 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225BFFC_T_H #define POKEPLATINUM_STRUCT_OV16_0225BFFC_T_H -#include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/cell_actor_data.h" -#include "sys_task_manager.h" +#include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_defs/struct_0205AA50.h" -#include "overlay012/struct_ov12_02223764.h" -#include "overlay012/struct_ball_rotation_decl.h" + #include "battle/struct_ov16_0225BFFC_sub1.h" #include "battle/struct_ov16_022674C4.h" #include "battle/struct_ov16_0226C378.h" +#include "overlay012/struct_ball_rotation_decl.h" +#include "overlay012/struct_ov12_02223764.h" + +#include "sys_task_manager.h" #define DATA_BUF_SIZE 256 struct BattlerData { UnkStruct_ov16_0225BFFC_sub1 unk_00; - CellActorData * unk_18; - Sprite * unk_1C; - Sprite * unk_20; - Window * unk_24; + CellActorData *unk_18; + Sprite *unk_1C; + Sprite *unk_20; + Window *unk_24; Healthbar healthbar; UnkStruct_ov16_0226C378 unk_7B; - BallRotation * unk_84; - UnkStruct_ov12_02223764 * unk_88; - void * unk_8C; + BallRotation *unk_84; + UnkStruct_ov12_02223764 *unk_88; + void *unk_8C; u8 data[DATA_BUF_SIZE]; u8 battler; u8 battlerType; u8 bootState; u8 unk_193; - SysTask * unk_194; + SysTask *unk_194; u16 unk_198; int unk_19C; - NARC * unk_1A0; + NARC *unk_1A0; u8 unk_1A4; u8 unk_1A5[3]; }; diff --git a/include/battle/struct_ov16_0225C168.h b/include/battle/struct_ov16_0225C168.h index ceb742704f..73463dc979 100644 --- a/include/battle/struct_ov16_0225C168.h +++ b/include/battle/struct_ov16_0225C168.h @@ -3,9 +3,9 @@ typedef struct { u8 unk_00; - u8 unk_01_0 : 2; - u8 unk_01_2 : 1; - u8 unk_01_3 : 5; + u8 unk_01_0 : 2; + u8 unk_01_2 : 1; + u8 unk_01_3 : 5; u16 unk_02; u32 unk_04; int unk_08; diff --git a/include/battle/struct_ov16_0225C17C.h b/include/battle/struct_ov16_0225C17C.h index 6ca7743602..2fceb5120f 100644 --- a/include/battle/struct_ov16_0225C17C.h +++ b/include/battle/struct_ov16_0225C17C.h @@ -3,9 +3,9 @@ typedef struct { u8 unk_00; - u8 unk_01_0 : 2; - u8 unk_01_2 : 1; - u8 unk_01_3 : 5; + u8 unk_01_0 : 2; + u8 unk_01_2 : 1; + u8 unk_01_3 : 5; u16 unk_02; u32 unk_04; int unk_08; diff --git a/include/battle/struct_ov16_0225C29C_sub1.h b/include/battle/struct_ov16_0225C29C_sub1.h index f9017c333b..564bc8817f 100644 --- a/include/battle/struct_ov16_0225C29C_sub1.h +++ b/include/battle/struct_ov16_0225C29C_sub1.h @@ -3,9 +3,9 @@ typedef struct { u8 unk_00; - u8 unk_01_0 : 2; - u8 unk_01_2 : 1; - u8 : 5; + u8 unk_01_0 : 2; + u8 unk_01_2 : 1; + u8 : 5; u8 unk_02; u8 padding_03; s16 unk_04; diff --git a/include/battle/struct_ov16_0225C468.h b/include/battle/struct_ov16_0225C468.h index 8766e1bd65..df8468d0a7 100644 --- a/include/battle/struct_ov16_0225C468.h +++ b/include/battle/struct_ov16_0225C468.h @@ -7,9 +7,9 @@ typedef struct { s16 unk_02; u16 unk_04; u8 unk_06; - u8 unk_07_0 : 5; - u8 unk_07_5 : 2; - u8 unk_07_7 : 1; + u8 unk_07_0 : 5; + u8 unk_07_5 : 2; + u8 unk_07_7 : 1; u32 unk_08; u32 unk_0C; int unk_10; diff --git a/include/battle/struct_ov16_0225CBB8.h b/include/battle/struct_ov16_0225CBB8.h index 1beba5d274..bca0a66555 100644 --- a/include/battle/struct_ov16_0225CBB8.h +++ b/include/battle/struct_ov16_0225CBB8.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_STRUCT_OV16_0225CBB8_H #include "struct_decls/battle_system.h" + #include "overlay012/struct_ov12_02237F98_decl.h" #include "overlay012/struct_ov12_02238004_decl.h" typedef struct { - BattleSystem * unk_00; - UnkStruct_ov12_02237F98 * unk_04; - UnkStruct_ov12_02238004 * unk_08[3]; + BattleSystem *unk_00; + UnkStruct_ov12_02237F98 *unk_04; + UnkStruct_ov12_02238004 *unk_08[3]; u8 unk_14; u8 unk_15; u8 unk_16; diff --git a/include/battle/struct_ov16_0225D1C4.h b/include/battle/struct_ov16_0225D1C4.h index b85f78539f..eff720fab7 100644 --- a/include/battle/struct_ov16_0225D1C4.h +++ b/include/battle/struct_ov16_0225D1C4.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225D1C4_H #define POKEPLATINUM_STRUCT_OV16_0225D1C4_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" typedef struct { - BattleSystem * unk_00; - Sprite * unk_04; + BattleSystem *unk_00; + Sprite *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/battle/struct_ov16_0225D360.h b/include/battle/struct_ov16_0225D360.h index e47edaedca..b3d7b8a4be 100644 --- a/include/battle/struct_ov16_0225D360.h +++ b/include/battle/struct_ov16_0225D360.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV16_0225D360_H #include "struct_decls/battle_system.h" + #include "battle/struct_ov16_0225BFFC_decl.h" typedef struct { - BattleSystem * unk_00; - BattlerData * unk_04; + BattleSystem *unk_00; + BattlerData *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/battle/struct_ov16_0225D3CC.h b/include/battle/struct_ov16_0225D3CC.h index f9f3a7e9ef..b21fe6e32f 100644 --- a/include/battle/struct_ov16_0225D3CC.h +++ b/include/battle/struct_ov16_0225D3CC.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV16_0225D3CC_H #include "struct_decls/battle_system.h" + #include "battle/struct_ov16_0225BFFC_decl.h" typedef struct { - BattleSystem * unk_00; - BattlerData * unk_04; + BattleSystem *unk_00; + BattlerData *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/battle/struct_ov16_0225D5B8.h b/include/battle/struct_ov16_0225D5B8.h index 901ed49ffa..015f06560a 100644 --- a/include/battle/struct_ov16_0225D5B8.h +++ b/include/battle/struct_ov16_0225D5B8.h @@ -4,8 +4,8 @@ #include "struct_decls/battle_system.h" typedef struct { - BattleSystem * unk_00; - void * unk_04; + BattleSystem *unk_00; + void *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/battle/struct_ov16_0225D698.h b/include/battle/struct_ov16_0225D698.h index 68f5b9e7ce..df46ddfec9 100644 --- a/include/battle/struct_ov16_0225D698.h +++ b/include/battle/struct_ov16_0225D698.h @@ -4,8 +4,8 @@ #include "struct_decls/battle_system.h" typedef struct { - BattleSystem * unk_00; - void * unk_04; + BattleSystem *unk_00; + void *unk_04; int unk_08; u16 unk_0C[4]; u8 unk_14[4]; diff --git a/include/battle/struct_ov16_0225D708.h b/include/battle/struct_ov16_0225D708.h index 30ad6340aa..4ebdb083a0 100644 --- a/include/battle/struct_ov16_0225D708.h +++ b/include/battle/struct_ov16_0225D708.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV16_0225D708_H #include "struct_decls/battle_system.h" + #include "battle/struct_ov16_0225C29C_sub1.h" typedef struct { - BattleSystem * unk_00; - void * unk_04; + BattleSystem *unk_00; + void *unk_04; int unk_08; u8 unk_0C; u8 unk_0D; diff --git a/include/battle/struct_ov16_0225D794.h b/include/battle/struct_ov16_0225D794.h index 4ae035afce..a4cad02f59 100644 --- a/include/battle/struct_ov16_0225D794.h +++ b/include/battle/struct_ov16_0225D794.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_STRUCT_OV16_0225D794_H #include "struct_decls/battle_system.h" -#include "overlay013/struct_ov13_022264F4.h" + #include "battle/struct_ov16_0225D840.h" +#include "overlay013/struct_ov13_022264F4.h" typedef struct { - BattleSystem * unk_00; - UnkStruct_ov13_022264F4 * unk_04; - UnkStruct_ov16_0225D840 * unk_08; + BattleSystem *unk_00; + UnkStruct_ov13_022264F4 *unk_04; + UnkStruct_ov16_0225D840 *unk_08; u8 unk_0C; u8 unk_0D; u8 unk_0E; diff --git a/include/battle/struct_ov16_0225D840.h b/include/battle/struct_ov16_0225D840.h index 10479b46fb..be7caaef88 100644 --- a/include/battle/struct_ov16_0225D840.h +++ b/include/battle/struct_ov16_0225D840.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV16_0225D840_H #include "struct_decls/battle_system.h" + #include "overlay013/struct_ov13_0221FC20.h" typedef struct { - BattleSystem * unk_00; - UnkStruct_ov13_0221FC20 * unk_04; + BattleSystem *unk_00; + UnkStruct_ov13_0221FC20 *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/battle/struct_ov16_0225D8AC.h b/include/battle/struct_ov16_0225D8AC.h index 211871ea76..b73fd927d8 100644 --- a/include/battle/struct_ov16_0225D8AC.h +++ b/include/battle/struct_ov16_0225D8AC.h @@ -4,8 +4,8 @@ #include "struct_decls/battle_system.h" typedef struct { - BattleSystem * unk_00; - void * unk_04; + BattleSystem *unk_00; + void *unk_04; int unk_08; u8 unk_0C; u8 unk_0D; diff --git a/include/battle/struct_ov16_0225D9A8.h b/include/battle/struct_ov16_0225D9A8.h index 6603413e5c..300f6ffad8 100644 --- a/include/battle/struct_ov16_0225D9A8.h +++ b/include/battle/struct_ov16_0225D9A8.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225D9A8_H #define POKEPLATINUM_STRUCT_OV16_0225D9A8_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/battle_system.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" +#include "struct_decls/sprite_decl.h" + #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02265BBC.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" typedef struct { - BattleSystem * unk_00; - BattlerData * unk_04; - Sprite * unk_08; - UnkStruct_ov12_0221FCDC * unk_0C; + BattleSystem *unk_00; + BattlerData *unk_04; + Sprite *unk_08; + UnkStruct_ov12_0221FCDC *unk_0C; UnkStruct_ov16_02265BBC unk_10; u8 unk_68; u8 unk_69; diff --git a/include/battle/struct_ov16_0225DA44.h b/include/battle/struct_ov16_0225DA44.h index 89c7f66bef..64c30c1316 100644 --- a/include/battle/struct_ov16_0225DA44.h +++ b/include/battle/struct_ov16_0225DA44.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225DA44_H #define POKEPLATINUM_STRUCT_OV16_0225DA44_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" typedef struct { - BattleSystem * unk_00; - Sprite * unk_04; + BattleSystem *unk_00; + Sprite *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/battle/struct_ov16_0225DB74.h b/include/battle/struct_ov16_0225DB74.h index 6545e6fc99..7f049e7447 100644 --- a/include/battle/struct_ov16_0225DB74.h +++ b/include/battle/struct_ov16_0225DB74.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225DB74_H #define POKEPLATINUM_STRUCT_OV16_0225DB74_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" + #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02265BBC.h" typedef struct { - BattleSystem * unk_00; - BattlerData * unk_04; - Sprite * unk_08; + BattleSystem *unk_00; + BattlerData *unk_04; + Sprite *unk_08; UnkStruct_ov16_02265BBC unk_0C; u8 unk_64; u8 unk_65; diff --git a/include/battle/struct_ov16_0225DC7C.h b/include/battle/struct_ov16_0225DC7C.h index 84aebfc699..fe26f0d00d 100644 --- a/include/battle/struct_ov16_0225DC7C.h +++ b/include/battle/struct_ov16_0225DC7C.h @@ -4,7 +4,7 @@ #include "struct_decls/battle_system.h" typedef struct { - BattleSystem * unk_00; + BattleSystem *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; diff --git a/include/battle/struct_ov16_0225DCB0.h b/include/battle/struct_ov16_0225DCB0.h index 30ff50f169..eb97d87216 100644 --- a/include/battle/struct_ov16_0225DCB0.h +++ b/include/battle/struct_ov16_0225DCB0.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_STRUCT_OV16_0225DCB0_H #include "struct_decls/battle_system.h" + #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02265BBC.h" typedef struct { - BattleSystem * unk_00; - BattlerData * unk_04; + BattleSystem *unk_00; + BattlerData *unk_04; UnkStruct_ov16_02265BBC unk_08; u8 unk_60; u8 unk_61; diff --git a/include/battle/struct_ov16_0225DF34.h b/include/battle/struct_ov16_0225DF34.h index fe467ff3f2..d71a0aa760 100644 --- a/include/battle/struct_ov16_0225DF34.h +++ b/include/battle/struct_ov16_0225DF34.h @@ -4,8 +4,8 @@ #include "struct_decls/battle_system.h" typedef struct { - BattleSystem * unk_00; - void * unk_04; + BattleSystem *unk_00; + void *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/battle/struct_ov16_0225DF6C.h b/include/battle/struct_ov16_0225DF6C.h index b7858d621e..52a4680c52 100644 --- a/include/battle/struct_ov16_0225DF6C.h +++ b/include/battle/struct_ov16_0225DF6C.h @@ -4,7 +4,7 @@ #include "struct_decls/battle_system.h" typedef struct { - BattleSystem * unk_00; + BattleSystem *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; diff --git a/include/battle/struct_ov16_0225E0BC.h b/include/battle/struct_ov16_0225E0BC.h index 6efe78ac32..16b40e21a4 100644 --- a/include/battle/struct_ov16_0225E0BC.h +++ b/include/battle/struct_ov16_0225E0BC.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV16_0225E0BC_H #include "struct_decls/battle_system.h" + #include "overlay013/struct_ov13_0221FC20.h" typedef struct { - BattleSystem * unk_00; - UnkStruct_ov13_0221FC20 * unk_04; + BattleSystem *unk_00; + UnkStruct_ov13_0221FC20 *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/battle/struct_ov16_0225E0F4.h b/include/battle/struct_ov16_0225E0F4.h index 1d49167395..375c7718ba 100644 --- a/include/battle/struct_ov16_0225E0F4.h +++ b/include/battle/struct_ov16_0225E0F4.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225E0F4_H #define POKEPLATINUM_STRUCT_OV16_0225E0F4_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" typedef struct { - BattleSystem * unk_00; - Sprite * unk_04; + BattleSystem *unk_00; + Sprite *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/battle/struct_ov16_0225E2C8.h b/include/battle/struct_ov16_0225E2C8.h index 81e86ca829..f5932163a0 100644 --- a/include/battle/struct_ov16_0225E2C8.h +++ b/include/battle/struct_ov16_0225E2C8.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225E2C8_H #define POKEPLATINUM_STRUCT_OV16_0225E2C8_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" + #include "battle/struct_ov16_0225BFFC_decl.h" typedef struct { - BattleSystem * unk_00; - BattlerData * unk_04; - Sprite * unk_08; + BattleSystem *unk_00; + BattlerData *unk_04; + Sprite *unk_08; u8 unk_0C; u8 unk_0D; u8 unk_0E; diff --git a/include/battle/struct_ov16_0225E300.h b/include/battle/struct_ov16_0225E300.h index ef472cbfe4..e27d0b50f4 100644 --- a/include/battle/struct_ov16_0225E300.h +++ b/include/battle/struct_ov16_0225E300.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225E300_H #define POKEPLATINUM_STRUCT_OV16_0225E300_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" + #include "battle/struct_ov16_0225BFFC_decl.h" typedef struct { - BattleSystem * unk_00; - BattlerData * unk_04; - Sprite * unk_08; + BattleSystem *unk_00; + BattlerData *unk_04; + Sprite *unk_08; u8 unk_0C; u8 unk_0D; u8 unk_0E; diff --git a/include/battle/struct_ov16_0225E4E8.h b/include/battle/struct_ov16_0225E4E8.h index 610a6bfe8f..c32c4a97ef 100644 --- a/include/battle/struct_ov16_0225E4E8.h +++ b/include/battle/struct_ov16_0225E4E8.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225E4E8_H #define POKEPLATINUM_STRUCT_OV16_0225E4E8_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" + #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02268520.h" typedef struct { - BattleSystem * unk_00; - BattlerData * unk_04; - Sprite * unk_08; - UnkStruct_ov16_02268520 * unk_0C; + BattleSystem *unk_00; + BattlerData *unk_04; + Sprite *unk_08; + UnkStruct_ov16_02268520 *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; diff --git a/include/battle/struct_ov16_0225EA80.h b/include/battle/struct_ov16_0225EA80.h index c90aa1b440..15b41a304f 100644 --- a/include/battle/struct_ov16_0225EA80.h +++ b/include/battle/struct_ov16_0225EA80.h @@ -1,23 +1,24 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225EA80_H #define POKEPLATINUM_STRUCT_OV16_0225EA80_H -#include "struct_defs/archived_sprite.h" #include "struct_decls/battle_system.h" +#include "struct_defs/archived_sprite.h" + +#include "battle/struct_ov16_0225BFFC_decl.h" +#include "battle/struct_ov16_02265BBC.h" +#include "overlay012/struct_ball_rotation_decl.h" #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02223764.h" #include "overlay012/struct_ov12_02235FE0_decl.h" -#include "overlay012/struct_ball_rotation_decl.h" -#include "battle/struct_ov16_0225BFFC_decl.h" -#include "battle/struct_ov16_02265BBC.h" typedef struct { - BattleSystem * unk_00; - BattlerData * unk_04; - UnkStruct_ov12_02235FE0 * unk_08; - BallRotation * unk_0C; - UnkStruct_ov12_02223764 * unk_10; + BattleSystem *unk_00; + BattlerData *unk_04; + UnkStruct_ov12_02235FE0 *unk_08; + BallRotation *unk_0C; + UnkStruct_ov12_02223764 *unk_10; ArchivedSprite unk_14; - UnkStruct_ov12_0221FCDC * unk_24; + UnkStruct_ov12_0221FCDC *unk_24; UnkStruct_ov16_02265BBC unk_28; u8 unk_80; u8 unk_81; diff --git a/include/battle/struct_ov16_0225F764.h b/include/battle/struct_ov16_0225F764.h index 6eb3089319..e95233a31e 100644 --- a/include/battle/struct_ov16_0225F764.h +++ b/include/battle/struct_ov16_0225F764.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_OV16_0225F764_H #define POKEPLATINUM_STRUCT_OV16_0225F764_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/battle_system.h" -#include "overlay012/struct_ball_rotation_decl.h" +#include "struct_decls/sprite_decl.h" + #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02265BBC.h" +#include "overlay012/struct_ball_rotation_decl.h" typedef struct { - BattleSystem * unk_00; - BattlerData * unk_04; - Sprite * unk_08; - BallRotation * unk_0C; + BattleSystem *unk_00; + BattlerData *unk_04; + Sprite *unk_08; + BallRotation *unk_0C; UnkStruct_ov16_02265BBC unk_10; u8 unk_68; u8 unk_69; diff --git a/include/battle/struct_ov16_02260384.h b/include/battle/struct_ov16_02260384.h index b557f35d08..238abbec23 100644 --- a/include/battle/struct_ov16_02260384.h +++ b/include/battle/struct_ov16_02260384.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV16_02260384_H #define POKEPLATINUM_STRUCT_OV16_02260384_H -#include "struct_decls/cell_actor_data.h" #include "struct_decls/battle_system.h" +#include "struct_decls/cell_actor_data.h" typedef struct { - BattleSystem * unk_00; - CellActorData * unk_04; + BattleSystem *unk_00; + CellActorData *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/battle/struct_ov16_02264408.h b/include/battle/struct_ov16_02264408.h index 654fde91d0..88889131a9 100644 --- a/include/battle/struct_ov16_02264408.h +++ b/include/battle/struct_ov16_02264408.h @@ -1,21 +1,22 @@ #ifndef POKEPLATINUM_STRUCT_OV16_02264408_H #define POKEPLATINUM_STRUCT_OV16_02264408_H -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/chatot_cry.h" + #include "battle/struct_ov16_0223E0C8.h" #include "battle/struct_ov16_02264408_sub1.h" typedef struct { - SpriteRenderer * unk_00; - BGL * unk_04; - PaletteData * unk_08; - UnkStruct_ov16_0223E0C8 * unk_0C[4]; + SpriteRenderer *unk_00; + BGL *unk_04; + PaletteData *unk_08; + UnkStruct_ov16_0223E0C8 *unk_0C[4]; u8 unk_1C[4]; - Sprite * unk_20[4]; + Sprite *unk_20[4]; u32 unk_30; u16 unk_34[4]; u8 unk_3C[4]; @@ -25,9 +26,9 @@ typedef struct { u32 unk_4C[4]; int unk_50; UnkStruct_ov16_02264408_sub1 unk_54; - ChatotCry * unk_6C; - u8 * unk_70; - u16 * unk_74; + ChatotCry *unk_6C; + u8 *unk_70; + u16 *unk_74; } UnkStruct_ov16_02264408; #endif // POKEPLATINUM_STRUCT_OV16_02264408_H diff --git a/include/battle/struct_ov16_02264650_1.h b/include/battle/struct_ov16_02264650_1.h index 9565f47afb..bbb2d10477 100644 --- a/include/battle/struct_ov16_02264650_1.h +++ b/include/battle/struct_ov16_02264650_1.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV16_02264650_1_H #define POKEPLATINUM_STRUCT_OV16_02264650_1_H -#include "struct_decls/cell_actor_data.h" #include "struct_decls/battle_system.h" +#include "struct_decls/cell_actor_data.h" + #include "battle/struct_ov16_02268520.h" typedef struct { - BattleSystem * unk_00; - UnkStruct_ov16_02268520 * unk_04; - CellActorData * unk_08; + BattleSystem *unk_00; + UnkStruct_ov16_02268520 *unk_04; + CellActorData *unk_08; u8 unk_0C; u8 unk_0D; u8 unk_0E; diff --git a/include/battle/struct_ov16_02265BBC.h b/include/battle/struct_ov16_02265BBC.h index 09185b76b4..a036bdcf01 100644 --- a/include/battle/struct_ov16_02265BBC.h +++ b/include/battle/struct_ov16_02265BBC.h @@ -9,9 +9,9 @@ typedef struct { u16 unk_08; u16 unk_0A; u16 unk_0C; - u16 unk_0E_0 : 1; - u16 unk_0E_1 : 1; - u16 : 14; + u16 unk_0E_0 : 1; + u16 unk_0E_1 : 1; + u16 : 14; u32 unk_10; u16 unk_14; u16 unk_16; diff --git a/include/battle/struct_ov16_022662FC.h b/include/battle/struct_ov16_022662FC.h index 5bde489e97..16a9c08226 100644 --- a/include/battle/struct_ov16_022662FC.h +++ b/include/battle/struct_ov16_022662FC.h @@ -3,8 +3,8 @@ typedef struct { u8 unk_00; - u8 unk_01_0 : 4; - u8 unk_01_4 : 4; + u8 unk_01_0 : 4; + u8 unk_01_4 : 4; s16 unk_02; u32 unk_04; u32 unk_08; diff --git a/include/battle/struct_ov16_022674C4.h b/include/battle/struct_ov16_022674C4.h index fd2705b4bb..990be9942d 100644 --- a/include/battle/struct_ov16_022674C4.h +++ b/include/battle/struct_ov16_022674C4.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_OV16_022674C4_H #define POKEPLATINUM_STRUCT_OV16_022674C4_H +#include "struct_decls/battle_system.h" #include "struct_decls/cell_actor_data.h" -#include "sys_task_manager.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_decls/battle_system.h" + +#include "sys_task_manager.h" typedef struct { u8 state; CellActorData *mainActor; CellActorData *arrowActor; BattleSystem *battleSys; - SysTask * unk_10; + SysTask *unk_10; Window unk_14; u8 battler; u8 type; @@ -36,8 +37,8 @@ typedef struct { u8 doneScrolling : 1; u8 unk_4F_2 : 1; u8 numberMode : 1; - u8 : 4; - SysTask * unk_50; + u8 : 4; + SysTask *unk_50; u16 unk_54; } Healthbar; diff --git a/include/battle/struct_ov16_02268520.h b/include/battle/struct_ov16_02268520.h index 39c4a41c6d..a61cc55fae 100644 --- a/include/battle/struct_ov16_02268520.h +++ b/include/battle/struct_ov16_02268520.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV16_02268520_H #define POKEPLATINUM_STRUCT_OV16_02268520_H -#include "struct_decls/cell_actor_data.h" #include "struct_decls/battle_system.h" +#include "struct_decls/cell_actor_data.h" typedef struct { - CellActorData * unk_00; - BattleSystem * unk_04; + CellActorData *unk_00; + BattleSystem *unk_04; u8 unk_08; u8 unk_09; s16 unk_0A; diff --git a/include/battle/trainer_ai.h b/include/battle/trainer_ai.h index eca1bc36a4..ead5ec1289 100644 --- a/include/battle/trainer_ai.h +++ b/include/battle/trainer_ai.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_BATTLE_TRAINER_AI_H #include "struct_decls/battle_system.h" + #include "battle/battle_context.h" /** * @brief Initialize the trainer AI for a given battler. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler to be initialized * @param initScore Bitmask of moves to have their scores initialized; moves * flagged as such will be initially scored at 100 instead of 0. @@ -17,8 +18,8 @@ void TrainerAI_Init(BattleSystem *battleSys, BattleContext *battleCtx, u8 battle /** * @brief Execute the trainer AI routine for a given battler. - * - * @param battleSys + * + * @param battleSys * @param battler The battler to be executed * @return AI execution routine result */ @@ -26,8 +27,8 @@ u8 TrainerAI_Main(BattleSystem *battleSys, u8 battler); /** * @brief Pick the command for a battler to execute. - * - * @param battleSys + * + * @param battleSys * @param battler The battler who is waiting to choose their turn's action * @return The action to be executed for this battler */ diff --git a/include/berry_data.h b/include/berry_data.h index 07d0698c54..f9df94d1fb 100644 --- a/include/berry_data.h +++ b/include/berry_data.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_BERRY_DATA_H #include "struct_decls/struct_02006C24_decl.h" -#include "strbuf.h" #include "struct_decls/struct_berry_data_decl.h" -#define FIRMNESS_VERY_SOFT 1 -#define FIRMNESS_SOFT 2 -#define FIRMNESS_HARD 3 -#define FIRMNESS_VERY_HARD 4 -#define FIRMNESS_SUPER_HARD 5 +#include "strbuf.h" + +#define FIRMNESS_VERY_SOFT 1 +#define FIRMNESS_SOFT 2 +#define FIRMNESS_HARD 3 +#define FIRMNESS_VERY_HARD 4 +#define FIRMNESS_SUPER_HARD 5 /* * Constructs a new NARC which contains an open FSFile to the berry data archive. @@ -18,19 +19,19 @@ * * @returns: Pointer to the newly-allocated NARC */ -NARC * BerryData_NARC_ctor(u32 heapID); +NARC *BerryData_NARC_ctor(u32 heapID); -BerryData * sub_020973A8(NARC * param0, u32 param1, u32 param2); +BerryData *sub_020973A8(NARC *param0, u32 param1, u32 param2); /* * Closes the wrapped FSFile and returns the NARC allocation to the heap from whence it came. * * @param narc: Pointer to the NARC */ -void BerryData_NARC_dtor(NARC * narc); +void BerryData_NARC_dtor(NARC *narc); /* - * Creates a new buffer large enough to hold the data of the specified + * Creates a new buffer large enough to hold the data of the specified * NARC member in 'nuts_data.narc', then reads the data. * * @param index: Index of the NARC member within 'nuts_data.narc' which contains the berry's data @@ -38,7 +39,7 @@ void BerryData_NARC_dtor(NARC * narc); * * @returns: Pointer to the allocated buffer which contains the data that was read. */ -BerryData * BerryData_LoadDataByNarcMemberIndex(u32 index, u32 heapID); +BerryData *BerryData_LoadDataByNarcMemberIndex(u32 index, u32 heapID); /* * Creates a new buffer large enough to hold the data of the @@ -49,7 +50,7 @@ BerryData * BerryData_LoadDataByNarcMemberIndex(u32 index, u32 heapID); * * @returns: Pointer to the allocated buffer which contains the data that was read. */ -BerryData * BerryData_LoadDataByItemID(u32 itemID, u32 heapID); +BerryData *BerryData_LoadDataByItemID(u32 itemID, u32 heapID); /* * Retrieves the value of the specified attribute from a BerryData buffer @@ -59,10 +60,10 @@ BerryData * BerryData_LoadDataByItemID(u32 itemID, u32 heapID); * * @returns: The value of the specified attribute */ -u32 BerryData_GetAttribute(BerryData * berryData, u32 attributeID); +u32 BerryData_GetAttribute(BerryData *berryData, u32 attributeID); /* - * Creates a new string buffer large enough to hold the + * Creates a new string buffer large enough to hold the * name of the specified berry, then reads the string. * * @param index: Index of the NARC member within 'nuts_data.narc' which contains the berry's data @@ -70,10 +71,10 @@ u32 BerryData_GetAttribute(BerryData * berryData, u32 attributeID); * * @returns: Pointer to the allocated buffer which contains the string that was read. */ -Strbuf* BerryData_AllocAndGetName(u16 index, u32 heapID); +Strbuf *BerryData_AllocAndGetName(u16 index, u32 heapID); /* - * Creates a new string buffer large enough to hold the + * Creates a new string buffer large enough to hold the * description of the specified berry, then reads the string. * * @param index: Index of the NARC member within 'nuts_data.narc' which contains the berry's data @@ -81,6 +82,6 @@ Strbuf* BerryData_AllocAndGetName(u16 index, u32 heapID); * * @returns: Pointer to the allocated buffer which contains the string that was read. */ -Strbuf* BerryData_AllocAndGetDescription(u16 index, u16 heapID); +Strbuf *BerryData_AllocAndGetDescription(u16 index, u16 heapID); #endif // POKEPLATINUM_BERRY_DATA_H diff --git a/include/buffer_manager.h b/include/buffer_manager.h index 4bcf7ccdbf..0950f3b7a5 100644 --- a/include/buffer_manager.h +++ b/include/buffer_manager.h @@ -18,7 +18,6 @@ typedef struct BufferManager { u8 padding[2]; } BufferManager; - BufferManager *BufferManager_New(enum HeapId heapID, void *buffer1, void *buffer2); void BufferManager_Delete(BufferManager *bufferManager); void *BufferManager_GetWriteBuffer(const BufferManager *bufferManager); diff --git a/include/camera.h b/include/camera.h index 54d0aa560a..61ab0ce4d0 100644 --- a/include/camera.h +++ b/include/camera.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_CAMERA_H #define POKEPLATINUM_CAMERA_H -#include "overlay115/camera_angle.h" +#include + #include "constants/heap.h" -#include +#include "overlay115/camera_angle.h" -#define CAMERA_DELAY_NONE 0 -#define CAMERA_DELAY_X 1 -#define CAMERA_DELAY_Y 2 -#define CAMERA_DELAY_Z 4 +#define CAMERA_DELAY_NONE 0 +#define CAMERA_DELAY_X 1 +#define CAMERA_DELAY_Y 2 +#define CAMERA_DELAY_Z 4 enum CameraProjection { CAMERA_PROJECTION_PERSPECTIVE = 0, @@ -68,7 +69,7 @@ void Camera_SetAsActive(Camera *camera); void Camera_ClearActive(void); void Camera_ComputeViewMatrix(void); void Camera_ComputeViewMatrixWithRoll(void); // Calculates the view matrix with respect to the camera's Z rotation -void Camera_SetUp (const VecFx32 *up, Camera *camera); +void Camera_SetUp(const VecFx32 *up, Camera *camera); void Camera_TrackTarget(const VecFx32 *target, Camera *camera); void Camera_ReleaseTarget(Camera *camera); void Camera_SetClipping(const fx32 nearClip, const fx32 farClip, Camera *camera); diff --git a/include/charcode.h b/include/charcode.h index dedbd7c683..addd5115b4 100644 --- a/include/charcode.h +++ b/include/charcode.h @@ -9,4 +9,3 @@ BOOL CharCode_IsFormatArg(const charcode_t *cstr); u32 CharCode_FormatArgParam(const charcode_t *cstr, u32 paramIdx); #endif // POKEPLATINUM_CHARCODE_H - diff --git a/include/choose_starter/choose_starter_app.h b/include/choose_starter/choose_starter_app.h index 0fa3b83b9e..df955d8c05 100644 --- a/include/choose_starter/choose_starter_app.h +++ b/include/choose_starter/choose_starter_app.h @@ -8,4 +8,3 @@ BOOL ChooseStarter_Main(OverlayManager *ovyManager, int *state); BOOL ChooseStarter_Exit(OverlayManager *ovyManager, int *state); #endif // POKEPLATINUM_CHOOSE_STARTER_APP_H - diff --git a/include/coins.h b/include/coins.h index bd35a4f4c5..7c5ea6c230 100644 --- a/include/coins.h +++ b/include/coins.h @@ -8,15 +8,15 @@ * * @param coins: Pointer to coin case amount */ -void Coins_Init(u16 * coins); +void Coins_Init(u16 *coins); /* * Sets the amount of coins in the player's coin case * * @param coins: Pointer to coin case amount - * @param value: Value to set + * @param value: Value to set */ -void Coins_SetValue(u16 * coins, u32 value); +void Coins_SetValue(u16 *coins, u32 value); /* * Gets the amount of coins owned @@ -25,7 +25,7 @@ void Coins_SetValue(u16 * coins, u32 value); * * @returns: The amount of coins owned */ -u32 Coins_GetValue(const u16 * coins); +u32 Coins_GetValue(const u16 *coins); /* * Adds an amount of coins. It will fail if the @@ -36,7 +36,7 @@ u32 Coins_GetValue(const u16 * coins); * * @returns: TRUE if success, otherwise FALSE */ -BOOL Coins_Add(u16 * coins, u32 amount); +BOOL Coins_Add(u16 *coins, u32 amount); /* * Checks if a certain amount of coins can be @@ -47,7 +47,7 @@ BOOL Coins_Add(u16 * coins, u32 amount); * * @returns: TRUE if success, otherwise FALSE */ -BOOL Coins_CanAddAmount(const u16 * coins, u32 amount); +BOOL Coins_CanAddAmount(const u16 *coins, u32 amount); /* * Subtracts an amount of coins. It will fail if the @@ -58,6 +58,6 @@ BOOL Coins_CanAddAmount(const u16 * coins, u32 amount); * * @returns: TRUE if success, otherwise FALSE */ -BOOL Coins_Subtract(u16 * coins, u32 amount); +BOOL Coins_Subtract(u16 *coins, u32 amount); #endif // POKEPLATINUM_UNK_0202B594_H diff --git a/include/comm_player_manager.h b/include/comm_player_manager.h index fe7cef80cc..e65c2c48df 100644 --- a/include/comm_player_manager.h +++ b/include/comm_player_manager.h @@ -1,26 +1,27 @@ #ifndef POKEPLATINUM_COMM_PLAYER_MANAGER_H #define POKEPLATINUM_COMM_PLAYER_MANAGER_H -#include "field/field_system_decl.h" -#include "sys_task_manager.h" -#include "trainer_info.h" -#include "field/field_system_decl.h" -#include "struct_defs/struct_02057B48.h" #include "struct_decls/struct_0205E884_decl.h" -#include "communication_system.h" +#include "struct_defs/struct_02057B48.h" + +#include "field/field_system_decl.h" #include "overlay023/struct_ov23_0224991C_decl.h" #include "overlay023/struct_ov23_0224A294_sub1.h" #include "overlay023/struct_ov23_0224ABC4.h" #include "overlay101/struct_ov101_021D5D90_decl.h" +#include "communication_system.h" +#include "sys_task_manager.h" +#include "trainer_info.h" + typedef struct CommPlayerManager { u32 unk_00; - UnkStruct_ov23_0224991C * unk_04; - PlayerAvatar * playerAvatar[MAX_CONNECTED_PLAYERS]; - UnkStruct_ov101_021D5D90 * unk_28[MAX_CONNECTED_PLAYERS]; + UnkStruct_ov23_0224991C *unk_04; + PlayerAvatar *playerAvatar[MAX_CONNECTED_PLAYERS]; + UnkStruct_ov101_021D5D90 *unk_28[MAX_CONNECTED_PLAYERS]; u8 isActive[MAX_CONNECTED_PLAYERS]; - SysTask * task; - FieldSystem * fieldSystem; + SysTask *task; + FieldSystem *fieldSystem; UnkStruct_ov23_0224A294_sub1 unk_58; u8 unk_5A[MAX_CONNECTED_PLAYERS]; CommPlayerLocation playerLocationServer[MAX_CONNECTED_PLAYERS]; @@ -39,8 +40,8 @@ typedef struct CommPlayerManager { u8 moveTimerServer[MAX_CONNECTED_PLAYERS]; u8 moveTimer[MAX_CONNECTED_PLAYERS]; UnkStruct_ov23_0224ABC4 unk_14A[8 + 1]; - TrainerInfo * unk_27C[5]; - TrainerInfo * unk_290[MAX_CONNECTED_PLAYERS]; + TrainerInfo *unk_27C[5]; + TrainerInfo *unk_290[MAX_CONNECTED_PLAYERS]; u16 unk_2B0; u16 unk_2B2; u8 unk_2B4[4]; @@ -58,8 +59,8 @@ typedef struct CommPlayerManager { u8 unk_2C3; } CommPlayerManager; -CommPlayerManager * CommPlayerMan_Get(void); -BOOL CommPlayerMan_Init(void * param0, FieldSystem * fieldSystem, BOOL param2); +CommPlayerManager *CommPlayerMan_Get(void); +BOOL CommPlayerMan_Init(void *param0, FieldSystem *fieldSystem, BOOL param2); void CommPlayerMan_Reset(void); void CommPlayerMan_Restart(void); void CommPlayerMan_Delete(BOOL param0); @@ -74,13 +75,13 @@ u32 CommPlayer_Size(void); void CommPlayer_Destroy(u8 param0, BOOL param1, BOOL param2); BOOL sub_02057FAC(void); void sub_02057FC4(BOOL param0); -void sub_02058018(int param0, int param1, void * param2, void * param3); -void sub_0205805C(FieldSystem * fieldSystem, BOOL param1); +void sub_02058018(int param0, int param1, void *param2, void *param3); +void sub_0205805C(FieldSystem *fieldSystem, BOOL param1); BOOL CommPlayer_CheckNPCCollision(int param0, int param1); -void CommPlayer_RecvLocation(int param0, int param1, void * param2, void * param3); -void CommPlayer_RecvDelete(int param0, int param1, void * param2, void * param3); +void CommPlayer_RecvLocation(int param0, int param1, void *param2, void *param3); +void CommPlayer_RecvDelete(int param0, int param1, void *param2, void *param3); int CommPacketSizeOf_RecvLocation(void); -void CommPlayer_RecvLocationAndInit(int param0, int param1, void * param2, void * param3); +void CommPlayer_RecvLocationAndInit(int param0, int param1, void *param2, void *param3); void sub_02058B0C(int param0, int param1, BOOL param2); void sub_02058B7C(int param0); void sub_02058B94(int param0); @@ -109,7 +110,7 @@ int sub_0205900C(int param0, int param1); void sub_02059058(int param0, BOOL param1); BOOL sub_02059094(int param0); BOOL sub_020590C4(void); -void sub_02059180(int param0, int param1, void * param2, void * param3); +void sub_02059180(int param0, int param1, void *param2, void *param3); void CommPlayer_SetBattleDir(void); BOOL sub_0205928C(void); int CommPlayer_GetOppositeDir(int param0); diff --git a/include/comm_ring.h b/include/comm_ring.h index 925b786d9b..ea732fe505 100644 --- a/include/comm_ring.h +++ b/include/comm_ring.h @@ -2,20 +2,20 @@ #define POKEPLATINUM_UNK_02032188_H typedef struct { - u8 * buffer; + u8 *buffer; s16 startIndex; volatile s16 endIndex; volatile s16 backupEndIndex; s16 size; } CommRing; -void CommRing_Init(CommRing * ring, u8 * param1, int param2); -void CommRring_Write(CommRing * ring, u8 * param1, int param2, int param3); -int CommRing_Read(CommRing * ring, u8 * param1, int param2); -u8 CommRing_ReadByte(CommRing * ring); -int CommRing_Peek(CommRing * ring, u8 * param1, int param2); -int CommRing_DataSize(CommRing * ring); -int CommRing_RemainingSize(CommRing * ring); -void CommRing_UpdateEndPos(CommRing * ring); +void CommRing_Init(CommRing *ring, u8 *param1, int param2); +void CommRring_Write(CommRing *ring, u8 *param1, int param2, int param3); +int CommRing_Read(CommRing *ring, u8 *param1, int param2); +u8 CommRing_ReadByte(CommRing *ring); +int CommRing_Peek(CommRing *ring, u8 *param1, int param2); +int CommRing_DataSize(CommRing *ring); +int CommRing_RemainingSize(CommRing *ring); +void CommRing_UpdateEndPos(CommRing *ring); #endif // POKEPLATINUM_UNK_02032188_H diff --git a/include/communication_information.h b/include/communication_information.h index 4f5c6d7549..d82886d307 100644 --- a/include/communication_information.h +++ b/include/communication_information.h @@ -1,21 +1,22 @@ #ifndef POKEPLATINUM_COMMUNICATION_INFORMATION_H #define POKEPLATINUM_COMMUNICATION_INFORMATION_H -#include "trainer_info.h" +#include + #include "struct_defs/struct_0202610C.h" -#include "savedata.h" -#include +#include "savedata.h" +#include "trainer_info.h" -void CommInfo_Init(SaveData * saveData, const BattleRegulation * regulation); +void CommInfo_Init(SaveData *saveData, const BattleRegulation *regulation); void CommInfo_Delete(void); BOOL CommInfo_IsInitialized(void); void CommInfo_SendBattleRegulation(void); int CommPlayerInfo_Size(void); -void CommunicatitonInformaion_FinishReading(int param0, int param1, void * param2, void * param3); +void CommunicatitonInformaion_FinishReading(int param0, int param1, void *param2, void *param3); BOOL CommInfo_IsDataFinishedReading(void); -void CommInfo_RecvPlayerDataArray(int netId, int unused1, void * src, void * unused3); -void CommInfo_RecvPlayerData(int netId, int unused1, void * src, void * unused3); +void CommInfo_RecvPlayerDataArray(int netId, int unused1, void *src, void *unused3); +void CommInfo_RecvPlayerData(int netId, int unused1, void *src, void *unused3); BOOL CommInfo_ServerSendArray(void); BOOL CommInfo_IsReceivingData(void); void CommInfo_InitPlayer(int netId); @@ -27,17 +28,17 @@ void CommInfo_SetReceiveEnd(int netId); int CommInfo_NewNetworkId(void); int CommInfo_CountReceived(void); BOOL sub_02032E90(void); -TrainerInfo * CommInfo_TrainerInfo(int netId); -DWCFriendData * CommInfo_DWCFriendData(int netId); +TrainerInfo *CommInfo_TrainerInfo(int netId); +DWCFriendData *CommInfo_DWCFriendData(int netId); int sub_02032F40(int param0); -u16 * sub_02032F54(int netId); +u16 *sub_02032F54(int netId); int CommInfo_PlayerCountry(int netId); int CommInfo_PlayerRegion(int netId); int sub_02032FC0(int param0); BOOL CommInfo_CheckBattleRegulation(void); -void CommInfo_SavePlayerRecord(SaveData * saveData); -void sub_020331B4(SaveData * saveData, int param1); -void CommInfo_SetTradeResult(SaveData * saveData, int val); -void CommInfo_SetPersonalTrainerInfo(TrainerInfo * trainerInfo); +void CommInfo_SavePlayerRecord(SaveData *saveData); +void sub_020331B4(SaveData *saveData, int param1); +void CommInfo_SetTradeResult(SaveData *saveData, int val); +void CommInfo_SetPersonalTrainerInfo(TrainerInfo *trainerInfo); #endif // POKEPLATINUM_COMMUNICATION_INFORMATION_H diff --git a/include/communication_system.h b/include/communication_system.h index b4ffd0a3c5..e7f62cec92 100644 --- a/include/communication_system.h +++ b/include/communication_system.h @@ -3,7 +3,7 @@ #include -#define MAX_CONNECTED_PLAYERS 8 +#define MAX_CONNECTED_PLAYERS 8 BOOL CommSys_InitServer(BOOL param0, BOOL param1, int param2, BOOL param3); BOOL CommSys_InitClient(BOOL param0, BOOL param1, int param2); @@ -16,19 +16,19 @@ BOOL CommSys_Update(void); void CommSys_Reset(void); void CommSys_ResetDS(void); void CommSys_ResetBattleClient(void); -void sub_0203509C(u16 param0, u16 * param1, u16 param2); -void sub_020351F8(u16 param0, u16 * param1, u16 param2); -void sub_020352C0(u16 param0, u16 * param1, u16 param2); +void sub_0203509C(u16 param0, u16 *param1, u16 param2); +void sub_020351F8(u16 param0, u16 *param1, u16 param2); +void sub_020352C0(u16 param0, u16 *param1, u16 param2); void sub_02035664(void); void sub_02035678(void); void sub_0203568C(void); void sub_0203572C(void); void sub_02035938(u8 param0); -BOOL CommSys_SendDataHuge(int param0, const void * param1, int param2); -BOOL CommSys_SendData(int param0, const void * param1, int param2); -BOOL sub_02035A3C(int param0, const void * param1, int param2); -BOOL CommSys_SendDataServer(int param0, const void * param1, int param2); -BOOL sub_02035B48(int param0, const void * param1); +BOOL CommSys_SendDataHuge(int param0, const void *param1, int param2); +BOOL CommSys_SendData(int param0, const void *param1, int param2); +BOOL sub_02035A3C(int param0, const void *param1, int param2); +BOOL CommSys_SendDataServer(int param0, const void *param1, int param2); +BOOL sub_02035B48(int param0, const void *param1); int CommSys_SendRingRemainingSize(void); BOOL CommSys_IsPlayerConnected(u16 param0); int CommSys_ConnectedCount(void); @@ -39,13 +39,13 @@ u16 sub_02035E84(int param0); void CommSys_EnableSendMovementData(void); void CommSys_DisableSendMovementData(void); BOOL CommSys_IsSendingMovementData(void); -BOOL CommSys_WriteToQueueServer(int param0, const void * param1, int param2); -BOOL CommSys_WriteToQueue(int param0, const void * param1, int param2); -void sub_02036008(int param0, int param1, void * param2, void * param3); -void sub_02036030(int param0, int param1, void * param2, void * param3); -void sub_02036058(int param0, int param1, void * param2, void * param3); +BOOL CommSys_WriteToQueueServer(int param0, const void *param1, int param2); +BOOL CommSys_WriteToQueue(int param0, const void *param1, int param2); +void sub_02036008(int param0, int param1, void *param2, void *param3); +void sub_02036030(int param0, int param1, void *param2, void *param3); +void sub_02036058(int param0, int param1, void *param2, void *param3); u16 CommSys_CurNetId(void); -BOOL CommSys_SendDataFixedSize(int param0, const void * param1); +BOOL CommSys_SendDataFixedSize(int param0, const void *param1); BOOL Link_Message(int param0); BOOL sub_020360E8(void); BOOL CommSys_CheckError(void); @@ -54,8 +54,8 @@ int CommType_MaxPlayers(int param0); int CommType_MinPlayers(int param0); void CommSys_SetAlone(BOOL param0); BOOL CommSys_IsAlone(void); -void sub_0203619C(int param0, int param1, void * param2, void * param3); -void CommSys_Seed(MATHRandContext32 * param0); +void sub_0203619C(int param0, int param1, void *param2, void *param3); +void CommSys_Seed(MATHRandContext32 *param0); BOOL sub_02036254(int param0); BOOL sub_0203626C(int param0); BOOL sub_02036284(void); diff --git a/include/constants/battle.h b/include/constants/battle.h index 181c097981..f82f078f41 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -28,45 +28,45 @@ enum BattlerBootState { #include "constants/battle/terrain.h" #include "constants/battle/turn_flags.h" -#define BATTLE_TYPE_SINGLES (0 << 0) -#define BATTLE_TYPE_WILD_MON (0 << 0) -#define BATTLE_TYPE_TRAINER (1 << 0) -#define BATTLE_TYPE_DOUBLES (1 << 1) -#define BATTLE_TYPE_LINK (1 << 2) -#define BATTLE_TYPE_2vs2 (1 << 3) // This is, explicitly, two distinct battlers on each side -#define BATTLE_TYPE_TAG (1 << 4) // This is, explicitly, a battle with a partner -#define BATTLE_TYPE_SAFARI (1 << 5) -#define BATTLE_TYPE_AI (1 << 6) -#define BATTLE_TYPE_FRONTIER (1 << 7) -#define BATTLE_TYPE_ROAMER (1 << 8) -#define BATTLE_TYPE_PAL_PARK (1 << 9) -#define BATTLE_TYPE_CATCH_TUTORIAL (1 << 10) -#define BATTLE_TYPE_DEBUG (1 << 31) - -#define BATTLE_TYPE_TRAINER_DOUBLES (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_TRAINER) -#define BATTLE_TYPE_LINK_DOUBLES (BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER_DOUBLES) -#define BATTLE_TYPE_FRONTIER_DOUBLES (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_TRAINER_DOUBLES) -#define BATTLE_TYPE_TAG_DOUBLES (BATTLE_TYPE_TAG | BATTLE_TYPE_TRAINER_DOUBLES) -#define BATTLE_TYPE_NO_ITEMS (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER) -#define BATTLE_TYPE_AI_PARTNER (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_2vs2 | BATTLE_TYPE_AI) -#define BATTLE_TYPE_TRAINER_WITH_AI_PARTNER (BATTLE_TYPE_TRAINER | BATTLE_TYPE_AI_PARTNER) +#define BATTLE_TYPE_SINGLES (0 << 0) +#define BATTLE_TYPE_WILD_MON (0 << 0) +#define BATTLE_TYPE_TRAINER (1 << 0) +#define BATTLE_TYPE_DOUBLES (1 << 1) +#define BATTLE_TYPE_LINK (1 << 2) +#define BATTLE_TYPE_2vs2 (1 << 3) // This is, explicitly, two distinct battlers on each side +#define BATTLE_TYPE_TAG (1 << 4) // This is, explicitly, a battle with a partner +#define BATTLE_TYPE_SAFARI (1 << 5) +#define BATTLE_TYPE_AI (1 << 6) +#define BATTLE_TYPE_FRONTIER (1 << 7) +#define BATTLE_TYPE_ROAMER (1 << 8) +#define BATTLE_TYPE_PAL_PARK (1 << 9) +#define BATTLE_TYPE_CATCH_TUTORIAL (1 << 10) +#define BATTLE_TYPE_DEBUG (1 << 31) + +#define BATTLE_TYPE_TRAINER_DOUBLES (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_TRAINER) +#define BATTLE_TYPE_LINK_DOUBLES (BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER_DOUBLES) +#define BATTLE_TYPE_FRONTIER_DOUBLES (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_TRAINER_DOUBLES) +#define BATTLE_TYPE_TAG_DOUBLES (BATTLE_TYPE_TAG | BATTLE_TYPE_TRAINER_DOUBLES) +#define BATTLE_TYPE_NO_ITEMS (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER) +#define BATTLE_TYPE_AI_PARTNER (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_2vs2 | BATTLE_TYPE_AI) +#define BATTLE_TYPE_TRAINER_WITH_AI_PARTNER (BATTLE_TYPE_TRAINER | BATTLE_TYPE_AI_PARTNER) #define BATTLE_TYPE_FRONTIER_WITH_AI_PARTNER (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_TRAINER_WITH_AI_PARTNER) -#define BATTLE_TYPE_SPECIAL_WILD (BATTLE_TYPE_SAFARI | BATTLE_TYPE_ROAMER | BATTLE_TYPE_PAL_PARK | BATTLE_TYPE_CATCH_TUTORIAL) -#define BATTLE_TYPE_NO_OBEDIENCE_CHECK (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER) -#define BATTLE_TYPE_FORCED_SET_MODE (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER) -#define BATTLE_TYPE_NO_AI_ITEMS (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_SAFARI | BATTLE_TYPE_AI | BATTLE_TYPE_PAL_PARK) -#define BATTLE_TYPE_NO_MOVES (BATTLE_TYPE_SAFARI | BATTLE_TYPE_PAL_PARK) -#define BATTLE_TYPE_NO_EXPERIENCE (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_PAL_PARK) -#define BATTLE_TYPE_NO_ABILITIES (BATTLE_TYPE_SAFARI | BATTLE_TYPE_PAL_PARK) -#define BATTLE_TYPE_2vs2_TAG (BATTLE_TYPE_2vs2 | BATTLE_TYPE_TAG) -#define BATTLE_TYPE_ALWAYS_CATCH (BATTLE_TYPE_PAL_PARK | BATTLE_TYPE_CATCH_TUTORIAL) -#define BATTLE_TYPE_RESTORE_ITEMS_AFTER (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER) -#define BATTLE_TYPE_NO_TRAINER_MESSAGES (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER) - -#define MAX_LINK_BATTLERS 4 -#define MAX_BATTLERS 4 -#define NUM_BATTLE_SIDES 2 -#define MAX_BATTLERS_PER_SIDE 2 +#define BATTLE_TYPE_SPECIAL_WILD (BATTLE_TYPE_SAFARI | BATTLE_TYPE_ROAMER | BATTLE_TYPE_PAL_PARK | BATTLE_TYPE_CATCH_TUTORIAL) +#define BATTLE_TYPE_NO_OBEDIENCE_CHECK (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER) +#define BATTLE_TYPE_FORCED_SET_MODE (BATTLE_TYPE_DOUBLES | BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER) +#define BATTLE_TYPE_NO_AI_ITEMS (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_SAFARI | BATTLE_TYPE_AI | BATTLE_TYPE_PAL_PARK) +#define BATTLE_TYPE_NO_MOVES (BATTLE_TYPE_SAFARI | BATTLE_TYPE_PAL_PARK) +#define BATTLE_TYPE_NO_EXPERIENCE (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_PAL_PARK) +#define BATTLE_TYPE_NO_ABILITIES (BATTLE_TYPE_SAFARI | BATTLE_TYPE_PAL_PARK) +#define BATTLE_TYPE_2vs2_TAG (BATTLE_TYPE_2vs2 | BATTLE_TYPE_TAG) +#define BATTLE_TYPE_ALWAYS_CATCH (BATTLE_TYPE_PAL_PARK | BATTLE_TYPE_CATCH_TUTORIAL) +#define BATTLE_TYPE_RESTORE_ITEMS_AFTER (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER) +#define BATTLE_TYPE_NO_TRAINER_MESSAGES (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER) + +#define MAX_LINK_BATTLERS 4 +#define MAX_BATTLERS 4 +#define NUM_BATTLE_SIDES 2 +#define MAX_BATTLERS_PER_SIDE 2 #define BATTLE_IO_QUEUE_SIZE 16 #define BATTLE_IO_BUFFER_SIZE 256 @@ -83,28 +83,28 @@ enum BattlerBootState { #define BATTLE_RESULT_TRY_FLEE_WAIT (1 << 6) #define BATTLE_RESULT_TRY_FLEE (1 << 7) -#define BATTLE_RESULT_DRAW (BATTLE_RESULT_WIN | BATTLE_RESULT_LOSE) -#define BATTLE_RESULT_PLAYER_FLED (BATTLE_RESULT_CAPTURED_MON | BATTLE_RESULT_WIN) -#define BATTLE_RESULT_ENEMY_FLED (BATTLE_RESULT_CAPTURED_MON | BATTLE_RESULT_LOSE) +#define BATTLE_RESULT_DRAW (BATTLE_RESULT_WIN | BATTLE_RESULT_LOSE) +#define BATTLE_RESULT_PLAYER_FLED (BATTLE_RESULT_CAPTURED_MON | BATTLE_RESULT_WIN) +#define BATTLE_RESULT_ENEMY_FLED (BATTLE_RESULT_CAPTURED_MON | BATTLE_RESULT_LOSE) /* * Slot 1 is always on the controller's left; slot 2 is always on their right. * * e.g., in a single-battle: * ENEMY_SLOT_1 - * + * * PLAYER_SLOT_1 - * + * * or, in a double-battle: * ENEMY_SLOT_2 ENEMY_SLOT_1 - * + * * PLAYER_SLOT_1 PLAYER_SLOT_2 */ -#define BATTLER_PLAYER_SLOT_1 0 -#define BATTLER_ENEMY_SLOT_1 1 -#define BATTLER_PLAYER_SLOT_2 2 -#define BATTLER_ENEMY_SLOT_2 3 -#define BATTLER_NONE 0xFF +#define BATTLER_PLAYER_SLOT_1 0 +#define BATTLER_ENEMY_SLOT_1 1 +#define BATTLER_PLAYER_SLOT_2 2 +#define BATTLER_ENEMY_SLOT_2 3 +#define BATTLER_NONE 0xFF #define BATTLER_TYPE_SOLO_PLAYER 0 #define BATTLER_TYPE_SOLO_ENEMY 1 @@ -113,56 +113,56 @@ enum BattlerBootState { #define BATTLER_TYPE_PLAYER_SIDE_SLOT_2 4 #define BATTLER_TYPE_ENEMY_SIDE_SLOT_2 5 -#define BATTLE_SIDE_PLAYER 0 -#define BATTLE_SIDE_ENEMY 1 - -#define BATTLE_STATUS_FIRST_BATTLE (1 << 0) -#define BATTLE_STATUS_HONEY_TREE (1 << 1) -#define BATTLE_STATUS_NO_RUNNING (1 << 2) -#define BATTLE_STATUS_LEGENDARY (1 << 3) -#define BATTLE_STATUS_RECORDING (1 << 4) -#define BATTLE_STATUS_RECORDED (1 << 5) -#define BATTLE_STATUS_GIRATINA (1 << 6) -#define BATTLE_STATUS_DISTORTION (1 << 7) - -#define CHECK_INVALID_NO_MOVE (1 << 0) -#define CHECK_INVALID_NO_PP (1 << 1) -#define CHECK_INVALID_DISABLED (1 << 2) -#define CHECK_INVALID_TORMENTED (1 << 3) -#define CHECK_INVALID_TAUNTED (1 << 4) -#define CHECK_INVALID_IMPRISONED (1 << 5) -#define CHECK_INVALID_GRAVITY (1 << 6) -#define CHECK_INVALID_HEAL_BLOCK (1 << 7) -#define CHECK_INVALID_ENCORE (1 << 8) // this one is only implicit -#define CHECK_INVALID_CHOICE_ITEM (1 << 9) -#define CHECK_INVALID_ALL ~0 - -#define STRUGGLING_MOVE_1 (1 << 0) -#define STRUGGLING_MOVE_2 (1 << 1) -#define STRUGGLING_MOVE_3 (1 << 2) -#define STRUGGLING_MOVE_4 (1 << 3) -#define STRUGGLING_ALL (STRUGGLING_MOVE_1 | STRUGGLING_MOVE_2 | STRUGGLING_MOVE_3 | STRUGGLING_MOVE_4) +#define BATTLE_SIDE_PLAYER 0 +#define BATTLE_SIDE_ENEMY 1 + +#define BATTLE_STATUS_FIRST_BATTLE (1 << 0) +#define BATTLE_STATUS_HONEY_TREE (1 << 1) +#define BATTLE_STATUS_NO_RUNNING (1 << 2) +#define BATTLE_STATUS_LEGENDARY (1 << 3) +#define BATTLE_STATUS_RECORDING (1 << 4) +#define BATTLE_STATUS_RECORDED (1 << 5) +#define BATTLE_STATUS_GIRATINA (1 << 6) +#define BATTLE_STATUS_DISTORTION (1 << 7) + +#define CHECK_INVALID_NO_MOVE (1 << 0) +#define CHECK_INVALID_NO_PP (1 << 1) +#define CHECK_INVALID_DISABLED (1 << 2) +#define CHECK_INVALID_TORMENTED (1 << 3) +#define CHECK_INVALID_TAUNTED (1 << 4) +#define CHECK_INVALID_IMPRISONED (1 << 5) +#define CHECK_INVALID_GRAVITY (1 << 6) +#define CHECK_INVALID_HEAL_BLOCK (1 << 7) +#define CHECK_INVALID_ENCORE (1 << 8) // this one is only implicit +#define CHECK_INVALID_CHOICE_ITEM (1 << 9) +#define CHECK_INVALID_ALL ~0 + +#define STRUGGLING_MOVE_1 (1 << 0) +#define STRUGGLING_MOVE_2 (1 << 1) +#define STRUGGLING_MOVE_3 (1 << 2) +#define STRUGGLING_MOVE_4 (1 << 3) +#define STRUGGLING_ALL (STRUGGLING_MOVE_1 | STRUGGLING_MOVE_2 | STRUGGLING_MOVE_3 | STRUGGLING_MOVE_4) #define LINK_BATTLE_TIMEOUT (60 * 30) #define LINK_BATTLE_RESET_SAVEPOINT 1 -#define PAYDAY_MAX 0xFFFF -#define NUM_SCREEN_TURNS 5 +#define PAYDAY_MAX 0xFFFF +#define NUM_SCREEN_TURNS 5 #define TYPE_MULTI_IMMUNE 0 #define TYPE_MULTI_NOT_VERY_EFF 5 #define TYPE_MULTI_SUPER_EFF 20 -#define TYPE_MULTI_QUARTER_DAMAGE 10 -#define TYPE_MULTI_HALF_DAMAGE 20 -#define TYPE_MULTI_BASE_DAMAGE 40 -#define TYPE_MULTI_STAB_DAMAGE 60 -#define TYPE_MULTI_DOUBLE_DAMAGE 80 +#define TYPE_MULTI_QUARTER_DAMAGE 10 +#define TYPE_MULTI_HALF_DAMAGE 20 +#define TYPE_MULTI_BASE_DAMAGE 40 +#define TYPE_MULTI_STAB_DAMAGE 60 +#define TYPE_MULTI_DOUBLE_DAMAGE 80 #define TYPE_MULTI_QUADRUPLE_DAMAGE 160 -#define SOUNDPROOF_SLOT_1 (1 << 0) -#define SOUNDPROOF_SLOT_2 (1 << 1) -#define NO_PARTNER_SLOT_1 (1 << 2) -#define NO_PARTNER_SLOT_2 (1 << 3) +#define SOUNDPROOF_SLOT_1 (1 << 0) +#define SOUNDPROOF_SLOT_2 (1 << 1) +#define NO_PARTNER_SLOT_1 (1 << 2) +#define NO_PARTNER_SLOT_2 (1 << 3) #endif // POKEPLATINUM_CONSTANTS_BATTLE_H diff --git a/include/constants/battle/condition.h b/include/constants/battle/condition.h index 8c9aac595d..5c40a515e6 100644 --- a/include/constants/battle/condition.h +++ b/include/constants/battle/condition.h @@ -3,39 +3,39 @@ #include "constants/overworld_weather.h" -#define MON_CONDITION_NONE 0 -#define MON_CONDITION_SLEEP_0 (1 << 0) -#define MON_CONDITION_SLEEP_1 (1 << 1) -#define MON_CONDITION_SLEEP_2 (1 << 2) -#define MON_CONDITION_POISON (1 << 3) -#define MON_CONDITION_BURN (1 << 4) -#define MON_CONDITION_FREEZE (1 << 5) -#define MON_CONDITION_PARALYSIS (1 << 6) -#define MON_CONDITION_TOXIC (1 << 7) -#define MON_CONDITION_TOXIC_COUNTER_0 (1 << 8) -#define MON_CONDITION_TOXIC_COUNTER_1 (1 << 9) -#define MON_CONDITION_TOXIC_COUNTER_2 (1 << 10) -#define MON_CONDITION_TOXIC_COUNTER_3 (1 << 11) - -#define MON_CONDITION_TOXIC_COUNT_INC MON_CONDITION_TOXIC_COUNTER_0 - -#define MON_CONDITION_SLEEP (MON_CONDITION_SLEEP_0 | MON_CONDITION_SLEEP_1 | MON_CONDITION_SLEEP_2) -#define MON_CONDITION_TOXIC_COUNTER (MON_CONDITION_TOXIC_COUNTER_0 | MON_CONDITION_TOXIC_COUNTER_1 | MON_CONDITION_TOXIC_COUNTER_2 | MON_CONDITION_TOXIC_COUNTER_3) -#define MON_CONDITION_ANY_POISON (MON_CONDITION_POISON | MON_CONDITION_TOXIC | MON_CONDITION_TOXIC_COUNTER) -#define MON_CONDITION_ANY (MON_CONDITION_SLEEP | MON_CONDITION_POISON | MON_CONDITION_BURN | MON_CONDITION_FREEZE | MON_CONDITION_PARALYSIS | MON_CONDITION_TOXIC) - -#define MON_CONDITION_NOT_SLEEP ~MON_CONDITION_SLEEP -#define MON_CONDITION_CAN_SYNCHRONIZE (MON_CONDITION_POISON | MON_CONDITION_BURN | MON_CONDITION_PARALYSIS) -#define MON_CONDITION_FACADE_BOOST (MON_CONDITION_TOXIC | MON_CONDITION_POISON | MON_CONDITION_BURN | MON_CONDITION_PARALYSIS) - -#define VOLATILE_CONDITION_NONE 0 -#define VOLATILE_CONDITION_CONFUSION_0 (1 << 0) -#define VOLATILE_CONDITION_CONFUSION_1 (1 << 1) -#define VOLATILE_CONDITION_CONFUSION_2 (1 << 2) -#define VOLATILE_CONDITION_FLINCH (1 << 3) -#define VOLATILE_CONDITION_UPROAR_0 (1 << 4) -#define VOLATILE_CONDITION_UPROAR_1 (1 << 5) -#define VOLATILE_CONDITION_UPROAR_2 (1 << 6) +#define MON_CONDITION_NONE 0 +#define MON_CONDITION_SLEEP_0 (1 << 0) +#define MON_CONDITION_SLEEP_1 (1 << 1) +#define MON_CONDITION_SLEEP_2 (1 << 2) +#define MON_CONDITION_POISON (1 << 3) +#define MON_CONDITION_BURN (1 << 4) +#define MON_CONDITION_FREEZE (1 << 5) +#define MON_CONDITION_PARALYSIS (1 << 6) +#define MON_CONDITION_TOXIC (1 << 7) +#define MON_CONDITION_TOXIC_COUNTER_0 (1 << 8) +#define MON_CONDITION_TOXIC_COUNTER_1 (1 << 9) +#define MON_CONDITION_TOXIC_COUNTER_2 (1 << 10) +#define MON_CONDITION_TOXIC_COUNTER_3 (1 << 11) + +#define MON_CONDITION_TOXIC_COUNT_INC MON_CONDITION_TOXIC_COUNTER_0 + +#define MON_CONDITION_SLEEP (MON_CONDITION_SLEEP_0 | MON_CONDITION_SLEEP_1 | MON_CONDITION_SLEEP_2) +#define MON_CONDITION_TOXIC_COUNTER (MON_CONDITION_TOXIC_COUNTER_0 | MON_CONDITION_TOXIC_COUNTER_1 | MON_CONDITION_TOXIC_COUNTER_2 | MON_CONDITION_TOXIC_COUNTER_3) +#define MON_CONDITION_ANY_POISON (MON_CONDITION_POISON | MON_CONDITION_TOXIC | MON_CONDITION_TOXIC_COUNTER) +#define MON_CONDITION_ANY (MON_CONDITION_SLEEP | MON_CONDITION_POISON | MON_CONDITION_BURN | MON_CONDITION_FREEZE | MON_CONDITION_PARALYSIS | MON_CONDITION_TOXIC) + +#define MON_CONDITION_NOT_SLEEP ~MON_CONDITION_SLEEP +#define MON_CONDITION_CAN_SYNCHRONIZE (MON_CONDITION_POISON | MON_CONDITION_BURN | MON_CONDITION_PARALYSIS) +#define MON_CONDITION_FACADE_BOOST (MON_CONDITION_TOXIC | MON_CONDITION_POISON | MON_CONDITION_BURN | MON_CONDITION_PARALYSIS) + +#define VOLATILE_CONDITION_NONE 0 +#define VOLATILE_CONDITION_CONFUSION_0 (1 << 0) +#define VOLATILE_CONDITION_CONFUSION_1 (1 << 1) +#define VOLATILE_CONDITION_CONFUSION_2 (1 << 2) +#define VOLATILE_CONDITION_FLINCH (1 << 3) +#define VOLATILE_CONDITION_UPROAR_0 (1 << 4) +#define VOLATILE_CONDITION_UPROAR_1 (1 << 5) +#define VOLATILE_CONDITION_UPROAR_2 (1 << 6) // unused flag: 1 << 7 #define VOLATILE_CONDITION_BIDE_0 (1 << 8) #define VOLATILE_CONDITION_BIDE_1 (1 << 9) @@ -62,90 +62,90 @@ #define VOLATILE_CONDITION_DEFENSE_CURL (1 << 30) #define VOLATILE_CONDITION_TORMENT (1 << 31) -#define VOLATILE_CONDITION_CONFUSION (VOLATILE_CONDITION_CONFUSION_0 | VOLATILE_CONDITION_CONFUSION_1 | VOLATILE_CONDITION_CONFUSION_2) -#define VOLATILE_CONDITION_UPROAR (VOLATILE_CONDITION_UPROAR_0 | VOLATILE_CONDITION_UPROAR_1 | VOLATILE_CONDITION_UPROAR_2) -#define VOLATILE_CONDITION_BIDE (VOLATILE_CONDITION_BIDE_0 | VOLATILE_CONDITION_BIDE_1) -#define VOLATILE_CONDITION_THRASH (VOLATILE_CONDITION_THRASH_0 | VOLATILE_CONDITION_THRASH_1) -#define VOLATILE_CONDITION_BIND (VOLATILE_CONDITION_BIND_0 | VOLATILE_CONDITION_BIND_1 | VOLATILE_CONDITION_BIND_2) -#define VOLATILE_CONDITION_ATTRACT (VOLATILE_CONDITION_ATTRACT_0 | VOLATILE_CONDITION_ATTRACT_1 | VOLATILE_CONDITION_ATTRACT_2 | VOLATILE_CONDITION_ATTRACT_3) +#define VOLATILE_CONDITION_CONFUSION (VOLATILE_CONDITION_CONFUSION_0 | VOLATILE_CONDITION_CONFUSION_1 | VOLATILE_CONDITION_CONFUSION_2) +#define VOLATILE_CONDITION_UPROAR (VOLATILE_CONDITION_UPROAR_0 | VOLATILE_CONDITION_UPROAR_1 | VOLATILE_CONDITION_UPROAR_2) +#define VOLATILE_CONDITION_BIDE (VOLATILE_CONDITION_BIDE_0 | VOLATILE_CONDITION_BIDE_1) +#define VOLATILE_CONDITION_THRASH (VOLATILE_CONDITION_THRASH_0 | VOLATILE_CONDITION_THRASH_1) +#define VOLATILE_CONDITION_BIND (VOLATILE_CONDITION_BIND_0 | VOLATILE_CONDITION_BIND_1 | VOLATILE_CONDITION_BIND_2) +#define VOLATILE_CONDITION_ATTRACT (VOLATILE_CONDITION_ATTRACT_0 | VOLATILE_CONDITION_ATTRACT_1 | VOLATILE_CONDITION_ATTRACT_2 | VOLATILE_CONDITION_ATTRACT_3) #define VOLATILE_CONDITION_BATON_PASSED (VOLATILE_CONDITION_FOCUS_ENERGY \ - | VOLATILE_CONDITION_MEAN_LOOK \ - | VOLATILE_CONDITION_CONFUSION \ - | VOLATILE_CONDITION_CURSE \ - | VOLATILE_CONDITION_SUBSTITUTE) -#define VOLATILE_CONDITION_TRAPPED (VOLATILE_CONDITION_BIND \ - | VOLATILE_CONDITION_MEAN_LOOK) - -#define VOLATILE_CONDITION_CONFUSION_SHIFT 0 -#define VOLATILE_CONDITION_UPROAR_SHIFT 4 -#define VOLATILE_CONDITION_BIDE_SHIFT 8 -#define VOLATILE_CONDITION_THRASH_SHIFT 10 -#define VOLATILE_CONDITION_BIND_SHIFT 13 -#define VOLATILE_CONDITION_ATTRACT_SHIFT 16 - -#define SIDE_CONDITION_NONE 0 -#define SIDE_CONDITION_REFLECT (1 << 0) -#define SIDE_CONDITION_LIGHT_SCREEN (1 << 1) -#define SIDE_CONDITION_SPIKES (1 << 2) -#define SIDE_CONDITION_SAFEGUARD (1 << 3) -#define SIDE_CONDITION_FUTURE_SIGHT (1 << 4) -#define SIDE_CONDITION_WISH (1 << 5) -#define SIDE_CONDITION_MIST (1 << 6) -#define SIDE_CONDITION_STEALTH_ROCK (1 << 7) -#define SIDE_CONDITION_TAILWIND_0 (1 << 8) -#define SIDE_CONDITION_TAILWIND_1 (1 << 9) -#define SIDE_CONDITION_TOXIC_SPIKES (1 << 10) + | VOLATILE_CONDITION_MEAN_LOOK \ + | VOLATILE_CONDITION_CONFUSION \ + | VOLATILE_CONDITION_CURSE \ + | VOLATILE_CONDITION_SUBSTITUTE) +#define VOLATILE_CONDITION_TRAPPED (VOLATILE_CONDITION_BIND \ + | VOLATILE_CONDITION_MEAN_LOOK) + +#define VOLATILE_CONDITION_CONFUSION_SHIFT 0 +#define VOLATILE_CONDITION_UPROAR_SHIFT 4 +#define VOLATILE_CONDITION_BIDE_SHIFT 8 +#define VOLATILE_CONDITION_THRASH_SHIFT 10 +#define VOLATILE_CONDITION_BIND_SHIFT 13 +#define VOLATILE_CONDITION_ATTRACT_SHIFT 16 + +#define SIDE_CONDITION_NONE 0 +#define SIDE_CONDITION_REFLECT (1 << 0) +#define SIDE_CONDITION_LIGHT_SCREEN (1 << 1) +#define SIDE_CONDITION_SPIKES (1 << 2) +#define SIDE_CONDITION_SAFEGUARD (1 << 3) +#define SIDE_CONDITION_FUTURE_SIGHT (1 << 4) +#define SIDE_CONDITION_WISH (1 << 5) +#define SIDE_CONDITION_MIST (1 << 6) +#define SIDE_CONDITION_STEALTH_ROCK (1 << 7) +#define SIDE_CONDITION_TAILWIND_0 (1 << 8) +#define SIDE_CONDITION_TAILWIND_1 (1 << 9) +#define SIDE_CONDITION_TOXIC_SPIKES (1 << 10) // unused flag: 1 << 11 -#define SIDE_CONDITION_LUCKY_CHANT_0 (1 << 12) -#define SIDE_CONDITION_LUCKY_CHANT_1 (1 << 13) -#define SIDE_CONDITION_LUCKY_CHANT_2 (1 << 14) - -#define SIDE_CONDITION_TAILWIND (SIDE_CONDITION_TAILWIND_0 | SIDE_CONDITION_TAILWIND_1) -#define SIDE_CONDITION_LUCKY_CHANT (SIDE_CONDITION_LUCKY_CHANT_0 | SIDE_CONDITION_LUCKY_CHANT_1 | SIDE_CONDITION_LUCKY_CHANT_2) - -#define SIDE_CONDITION_TAILWIND_SHIFT SIDE_CONDITION_TAILWIND_0 -#define SIDE_CONDITION_LUCKY_CHANT_SHIFT SIDE_CONDITION_LUCKY_CHANT_0 - -#define FIELD_CONDITION_RAINING_TEMP (1 << 0) -#define FIELD_CONDITION_RAINING_PERM (1 << 1) -#define FIELD_CONDITION_SANDSTORM_TEMP (1 << 2) -#define FIELD_CONDITION_SANDSTORM_PERM (1 << 3) -#define FIELD_CONDITION_SUNNY_TEMP (1 << 4) -#define FIELD_CONDITION_SUNNY_PERM (1 << 5) -#define FIELD_CONDITION_HAILING_TEMP (1 << 6) -#define FIELD_CONDITION_HAILING_PERM (1 << 7) -#define FIELD_CONDITION_UPROAR ((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11)) // mask for which clients are in an Uproar -#define FIELD_CONDITION_GRAVITY_0 (1 << 12) -#define FIELD_CONDITION_GRAVITY_1 (1 << 13) -#define FIELD_CONDITION_GRAVITY_2 (1 << 14) -#define FIELD_CONDITION_DEEP_FOG (1 << 15) -#define FIELD_CONDITION_TRICK_ROOM_0 (1 << 16) -#define FIELD_CONDITION_TRICK_ROOM_1 (1 << 17) -#define FIELD_CONDITION_TRICK_ROOM_2 (1 << 18) - -#define FIELD_CONDITION_RAINING (FIELD_CONDITION_RAINING_TEMP | FIELD_CONDITION_RAINING_PERM) -#define FIELD_CONDITION_SANDSTORM (FIELD_CONDITION_SANDSTORM_TEMP | FIELD_CONDITION_SANDSTORM_PERM) -#define FIELD_CONDITION_SUNNY (FIELD_CONDITION_SUNNY_TEMP | FIELD_CONDITION_SUNNY_PERM) -#define FIELD_CONDITION_HAILING (FIELD_CONDITION_HAILING_TEMP | FIELD_CONDITION_HAILING_PERM) -#define FIELD_CONDITION_WEATHER (FIELD_CONDITION_RAINING \ +#define SIDE_CONDITION_LUCKY_CHANT_0 (1 << 12) +#define SIDE_CONDITION_LUCKY_CHANT_1 (1 << 13) +#define SIDE_CONDITION_LUCKY_CHANT_2 (1 << 14) + +#define SIDE_CONDITION_TAILWIND (SIDE_CONDITION_TAILWIND_0 | SIDE_CONDITION_TAILWIND_1) +#define SIDE_CONDITION_LUCKY_CHANT (SIDE_CONDITION_LUCKY_CHANT_0 | SIDE_CONDITION_LUCKY_CHANT_1 | SIDE_CONDITION_LUCKY_CHANT_2) + +#define SIDE_CONDITION_TAILWIND_SHIFT SIDE_CONDITION_TAILWIND_0 +#define SIDE_CONDITION_LUCKY_CHANT_SHIFT SIDE_CONDITION_LUCKY_CHANT_0 + +#define FIELD_CONDITION_RAINING_TEMP (1 << 0) +#define FIELD_CONDITION_RAINING_PERM (1 << 1) +#define FIELD_CONDITION_SANDSTORM_TEMP (1 << 2) +#define FIELD_CONDITION_SANDSTORM_PERM (1 << 3) +#define FIELD_CONDITION_SUNNY_TEMP (1 << 4) +#define FIELD_CONDITION_SUNNY_PERM (1 << 5) +#define FIELD_CONDITION_HAILING_TEMP (1 << 6) +#define FIELD_CONDITION_HAILING_PERM (1 << 7) +#define FIELD_CONDITION_UPROAR ((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11)) // mask for which clients are in an Uproar +#define FIELD_CONDITION_GRAVITY_0 (1 << 12) +#define FIELD_CONDITION_GRAVITY_1 (1 << 13) +#define FIELD_CONDITION_GRAVITY_2 (1 << 14) +#define FIELD_CONDITION_DEEP_FOG (1 << 15) +#define FIELD_CONDITION_TRICK_ROOM_0 (1 << 16) +#define FIELD_CONDITION_TRICK_ROOM_1 (1 << 17) +#define FIELD_CONDITION_TRICK_ROOM_2 (1 << 18) + +#define FIELD_CONDITION_RAINING (FIELD_CONDITION_RAINING_TEMP | FIELD_CONDITION_RAINING_PERM) +#define FIELD_CONDITION_SANDSTORM (FIELD_CONDITION_SANDSTORM_TEMP | FIELD_CONDITION_SANDSTORM_PERM) +#define FIELD_CONDITION_SUNNY (FIELD_CONDITION_SUNNY_TEMP | FIELD_CONDITION_SUNNY_PERM) +#define FIELD_CONDITION_HAILING (FIELD_CONDITION_HAILING_TEMP | FIELD_CONDITION_HAILING_PERM) +#define FIELD_CONDITION_WEATHER (FIELD_CONDITION_RAINING \ + | FIELD_CONDITION_SANDSTORM \ + | FIELD_CONDITION_SUNNY \ + | FIELD_CONDITION_HAILING \ + | FIELD_CONDITION_DEEP_FOG) +#define FIELD_CONDITION_SOLAR_DOWN (FIELD_CONDITION_RAINING \ | FIELD_CONDITION_SANDSTORM \ - | FIELD_CONDITION_SUNNY \ - | FIELD_CONDITION_HAILING \ + | FIELD_CONDITION_HAILING \ | FIELD_CONDITION_DEEP_FOG) -#define FIELD_CONDITION_SOLAR_DOWN (FIELD_CONDITION_RAINING \ - | FIELD_CONDITION_SANDSTORM \ - | FIELD_CONDITION_HAILING \ - | FIELD_CONDITION_DEEP_FOG) -#define FIELD_CONDITION_CASTFORM (FIELD_CONDITION_RAINING | FIELD_CONDITION_SUNNY | FIELD_CONDITION_HAILING) +#define FIELD_CONDITION_CASTFORM (FIELD_CONDITION_RAINING | FIELD_CONDITION_SUNNY | FIELD_CONDITION_HAILING) #define FIELD_CONDITION_GRAVITY (FIELD_CONDITION_GRAVITY_0 | FIELD_CONDITION_GRAVITY_1 | FIELD_CONDITION_GRAVITY_2) #define FIELD_CONDITION_GRAVITY_INIT (FIELD_CONDITION_GRAVITY_0 | FIELD_CONDITION_GRAVITY_2) #define FIELD_CONDITION_TRICK_ROOM (FIELD_CONDITION_TRICK_ROOM_0 | FIELD_CONDITION_TRICK_ROOM_1 | FIELD_CONDITION_TRICK_ROOM_2) #define FIELD_CONDITION_TRICK_ROOM_INIT (FIELD_CONDITION_TRICK_ROOM_0 | FIELD_CONDITION_TRICK_ROOM_2) -#define FIELD_CONDITION_UPROAR_SHIFT 8 -#define FIELD_CONDITION_GRAVITY_SHIFT 12 -#define FIELD_CONDITION_TRICK_ROOM_SHIFT 16 +#define FIELD_CONDITION_UPROAR_SHIFT 8 +#define FIELD_CONDITION_GRAVITY_SHIFT 12 +#define FIELD_CONDITION_TRICK_ROOM_SHIFT 16 #endif // POKEPLATINUM_CONSTANTS_BATTLE_CONDITION_H diff --git a/include/constants/battle/message_tags.h b/include/constants/battle/message_tags.h index 04448f3452..08b7fa43aa 100644 --- a/include/constants/battle/message_tags.h +++ b/include/constants/battle/message_tags.h @@ -1,9 +1,9 @@ #ifndef POKEPLATINUM_CONSTANTS_BATTLE_MESSAGE_TAGS_H #define POKEPLATINUM_CONSTANTS_BATTLE_MESSAGE_TAGS_H -#define TAG_SIDE_LOCAL_MESSAGE (1 << 6) // adjust the message for the side's source (e.g. "The foe's X used Y!") -#define TAG_GLOBAL_MESSAGE (1 << 7) // do not perform any message adjustment for a calling side +#define TAG_SIDE_LOCAL_MESSAGE (1 << 6) // adjust the message for the side's source (e.g. "The foe's X used Y!") +#define TAG_GLOBAL_MESSAGE (1 << 7) // do not perform any message adjustment for a calling side -#define BATTLE_MESSAGE_TAGS (0xFF ^ TAG_GLOBAL_MESSAGE ^ TAG_SIDE_LOCAL_MESSAGE) +#define BATTLE_MESSAGE_TAGS (0xFF ^ TAG_GLOBAL_MESSAGE ^ TAG_SIDE_LOCAL_MESSAGE) #endif // POKEPLATINUM_CONSTANTS_BATTLE_MESSAGE_TAGS_H diff --git a/include/constants/battle/moves.h b/include/constants/battle/moves.h index 6edc8b5b9e..58df357db7 100644 --- a/include/constants/battle/moves.h +++ b/include/constants/battle/moves.h @@ -1,55 +1,55 @@ #ifndef POKEPLATINUM_CONSTANTS_BATTLE_MOVES_H #define POKEPLATINUM_CONSTANTS_BATTLE_MOVES_H -#define MOVE_EFFECT_NONE 0 -#define MOVE_EFFECT_LEECH_SEED_RECIPIENT_0 (1 << 0) -#define MOVE_EFFECT_LEECH_SEED_RECIPIENT_1 (1 << 1) -#define MOVE_EFFECT_LEECH_SEED (1 << 2) -#define MOVE_EFFECT_LOCK_ON_0 (1 << 3) -#define MOVE_EFFECT_LOCK_ON_1 (1 << 4) -#define MOVE_EFFECT_PERISH_SONG (1 << 5) -#define MOVE_EFFECT_AIRBORNE (1 << 6) // Fly, Bounce -#define MOVE_EFFECT_UNDERGROUND (1 << 7) // Dig -#define MOVE_EFFECT_MINIMIZE (1 << 8) -#define MOVE_EFFECT_CHARGE (1 << 9) -#define MOVE_EFFECT_INGRAIN (1 << 10) -#define MOVE_EFFECT_YAWN_0 (1 << 11) -#define MOVE_EFFECT_YAWN_1 (1 << 12) -#define MOVE_EFFECT_IMPRISON (1 << 13) // applied to mons which use Imprison -#define MOVE_EFFECT_GRUDGE (1 << 14) -#define MOVE_EFFECT_NO_CRITICAL (1 << 15) // checked for, but never set -#define MOVE_EFFECT_MUD_SPORT (1 << 16) -#define MOVE_EFFECT_WATER_SPORT (1 << 17) -#define MOVE_EFFECT_UNDERWATER (1 << 18) // Dive +#define MOVE_EFFECT_NONE 0 +#define MOVE_EFFECT_LEECH_SEED_RECIPIENT_0 (1 << 0) +#define MOVE_EFFECT_LEECH_SEED_RECIPIENT_1 (1 << 1) +#define MOVE_EFFECT_LEECH_SEED (1 << 2) +#define MOVE_EFFECT_LOCK_ON_0 (1 << 3) +#define MOVE_EFFECT_LOCK_ON_1 (1 << 4) +#define MOVE_EFFECT_PERISH_SONG (1 << 5) +#define MOVE_EFFECT_AIRBORNE (1 << 6) // Fly, Bounce +#define MOVE_EFFECT_UNDERGROUND (1 << 7) // Dig +#define MOVE_EFFECT_MINIMIZE (1 << 8) +#define MOVE_EFFECT_CHARGE (1 << 9) +#define MOVE_EFFECT_INGRAIN (1 << 10) +#define MOVE_EFFECT_YAWN_0 (1 << 11) +#define MOVE_EFFECT_YAWN_1 (1 << 12) +#define MOVE_EFFECT_IMPRISON (1 << 13) // applied to mons which use Imprison +#define MOVE_EFFECT_GRUDGE (1 << 14) +#define MOVE_EFFECT_NO_CRITICAL (1 << 15) // checked for, but never set +#define MOVE_EFFECT_MUD_SPORT (1 << 16) +#define MOVE_EFFECT_WATER_SPORT (1 << 17) +#define MOVE_EFFECT_UNDERWATER (1 << 18) // Dive // unused flag: 1 << 19 // unused flag: 1 << 20 -#define MOVE_EFFECT_ABILITY_SUPPRESSED (1 << 21) // Gastro Acid -#define MOVE_EFFECT_MIRACLE_EYE (1 << 22) -#define MOVE_EFFECT_POWER_TRICK (1 << 23) -#define MOVE_EFFECT_AQUA_RING (1 << 24) -#define MOVE_EFFECT_HEAL_BLOCK (1 << 25) -#define MOVE_EFFECT_EMBARGO (1 << 26) -#define MOVE_EFFECT_MAGNET_RISE (1 << 27) -#define MOVE_EFFECT_CAMOUFLAGE (1 << 28) -#define MOVE_EFFECT_SHADOW_FORCE (1 << 29) -#define MOVE_EFFECT_IMPRISONED (1 << 30) // applied to mons which are affected by Imprison +#define MOVE_EFFECT_ABILITY_SUPPRESSED (1 << 21) // Gastro Acid +#define MOVE_EFFECT_MIRACLE_EYE (1 << 22) +#define MOVE_EFFECT_POWER_TRICK (1 << 23) +#define MOVE_EFFECT_AQUA_RING (1 << 24) +#define MOVE_EFFECT_HEAL_BLOCK (1 << 25) +#define MOVE_EFFECT_EMBARGO (1 << 26) +#define MOVE_EFFECT_MAGNET_RISE (1 << 27) +#define MOVE_EFFECT_CAMOUFLAGE (1 << 28) +#define MOVE_EFFECT_SHADOW_FORCE (1 << 29) +#define MOVE_EFFECT_IMPRISONED (1 << 30) // applied to mons which are affected by Imprison -#define MOVE_EFFECT_LEECH_SEED_RECIPIENT (MOVE_EFFECT_LEECH_SEED_RECIPIENT_0 | MOVE_EFFECT_LEECH_SEED_RECIPIENT_1) -#define MOVE_EFFECT_LOCK_ON (MOVE_EFFECT_LOCK_ON_0 | MOVE_EFFECT_LOCK_ON_1) -#define MOVE_EFFECT_YAWN (MOVE_EFFECT_YAWN_0 | MOVE_EFFECT_YAWN_1) +#define MOVE_EFFECT_LEECH_SEED_RECIPIENT (MOVE_EFFECT_LEECH_SEED_RECIPIENT_0 | MOVE_EFFECT_LEECH_SEED_RECIPIENT_1) +#define MOVE_EFFECT_LOCK_ON (MOVE_EFFECT_LOCK_ON_0 | MOVE_EFFECT_LOCK_ON_1) +#define MOVE_EFFECT_YAWN (MOVE_EFFECT_YAWN_0 | MOVE_EFFECT_YAWN_1) -#define MOVE_EFFECT_SEMI_INVULNERABLE (MOVE_EFFECT_AIRBORNE | MOVE_EFFECT_UNDERGROUND | MOVE_EFFECT_UNDERWATER | MOVE_EFFECT_SHADOW_FORCE) +#define MOVE_EFFECT_SEMI_INVULNERABLE (MOVE_EFFECT_AIRBORNE | MOVE_EFFECT_UNDERGROUND | MOVE_EFFECT_UNDERWATER | MOVE_EFFECT_SHADOW_FORCE) -#define MOVE_EFFECT_BATON_PASSED (MOVE_EFFECT_LEECH_SEED_RECIPIENT | MOVE_EFFECT_LEECH_SEED | MOVE_EFFECT_LOCK_ON | MOVE_EFFECT_PERISH_SONG | MOVE_EFFECT_INGRAIN \ - | MOVE_EFFECT_MUD_SPORT | MOVE_EFFECT_WATER_SPORT | MOVE_EFFECT_NO_CRITICAL | MOVE_EFFECT_POWER_TRICK|MOVE_EFFECT_AQUA_RING \ - | MOVE_EFFECT_ABILITY_SUPPRESSED | MOVE_EFFECT_EMBARGO | MOVE_EFFECT_HEAL_BLOCK | MOVE_EFFECT_MAGNET_RISE) +#define MOVE_EFFECT_BATON_PASSED (MOVE_EFFECT_LEECH_SEED_RECIPIENT | MOVE_EFFECT_LEECH_SEED | MOVE_EFFECT_LOCK_ON | MOVE_EFFECT_PERISH_SONG | MOVE_EFFECT_INGRAIN \ + | MOVE_EFFECT_MUD_SPORT | MOVE_EFFECT_WATER_SPORT | MOVE_EFFECT_NO_CRITICAL | MOVE_EFFECT_POWER_TRICK | MOVE_EFFECT_AQUA_RING \ + | MOVE_EFFECT_ABILITY_SUPPRESSED | MOVE_EFFECT_EMBARGO | MOVE_EFFECT_HEAL_BLOCK | MOVE_EFFECT_MAGNET_RISE) -#define MOVE_EFFECT_NO_WEATHER_DAMAGE (MOVE_EFFECT_UNDERGROUND | MOVE_EFFECT_UNDERWATER) +#define MOVE_EFFECT_NO_WEATHER_DAMAGE (MOVE_EFFECT_UNDERGROUND | MOVE_EFFECT_UNDERWATER) -#define MOVE_EFFECT_LOCK_ON_SHIFT 3 -#define MOVE_EFFECT_YAWN_SHIFT 11 +#define MOVE_EFFECT_LOCK_ON_SHIFT 3 +#define MOVE_EFFECT_YAWN_SHIFT 11 -#define MOVE_EFFECT_LOCK_ON_INITIAL_DURATION (1 << (MOVE_EFFECT_LOCK_ON_SHIFT + 1)) +#define MOVE_EFFECT_LOCK_ON_INITIAL_DURATION (1 << (MOVE_EFFECT_LOCK_ON_SHIFT + 1)) #define MOVE_STATUS_MISSED (1 << 0) #define MOVE_STATUS_SUPER_EFFECTIVE (1 << 1) @@ -73,11 +73,11 @@ #define MOVE_STATUS_STURDY (1 << 19) #define MOVE_STATUS_MAGNET_RISE (1 << 20) -#define MOVE_STATUS_NO_MORE_WORK (1 << 31) +#define MOVE_STATUS_NO_MORE_WORK (1 << 31) -#define MOVE_STATUS_DID_NOT_HIT (MOVE_STATUS_MISSED | MOVE_STATUS_INEFFECTIVE | MOVE_STATUS_FAILED | MOVE_STATUS_LEVITATED \ - | MOVE_STATUS_ONE_HIT_KO_FAILED | MOVE_STATUS_MULTI_HIT_DISRUPTED | MOVE_STATUS_PROTECTED | MOVE_STATUS_SEMI_INVULNERABLE \ - | MOVE_STATUS_LOST_FOCUS | MOVE_STATUS_WONDER_GUARD | MOVE_STATUS_STURDY | MOVE_STATUS_MAGNET_RISE) +#define MOVE_STATUS_DID_NOT_HIT (MOVE_STATUS_MISSED | MOVE_STATUS_INEFFECTIVE | MOVE_STATUS_FAILED | MOVE_STATUS_LEVITATED \ + | MOVE_STATUS_ONE_HIT_KO_FAILED | MOVE_STATUS_MULTI_HIT_DISRUPTED | MOVE_STATUS_PROTECTED | MOVE_STATUS_SEMI_INVULNERABLE \ + | MOVE_STATUS_LOST_FOCUS | MOVE_STATUS_WONDER_GUARD | MOVE_STATUS_STURDY | MOVE_STATUS_MAGNET_RISE) #define MOVE_STATUS_NO_EFFECTS (MOVE_STATUS_DID_NOT_HIT | MOVE_STATUS_NO_PP | MOVE_STATUS_NO_MORE_WORK) #define MOVE_STATUS_DID_NOT_AFFECT (MOVE_STATUS_INEFFECTIVE | MOVE_STATUS_WONDER_GUARD) diff --git a/include/constants/battle/side_effects.h b/include/constants/battle/side_effects.h index 1bba18cbaf..b381e502e3 100644 --- a/include/constants/battle/side_effects.h +++ b/include/constants/battle/side_effects.h @@ -1,20 +1,20 @@ #ifndef POKEPLATINUM_CONSTANTS_BATTLE_SIDE_EFFECTS_H #define POKEPLATINUM_CONSTANTS_BATTLE_SIDE_EFFECTS_H -#define MOVE_SIDE_EFFECT_BREAK_SCREENS (1 << 23) -#define MOVE_SIDE_EFFECT_CHECK_SUBSTITUTE (1 << 24) -#define MOVE_SIDE_EFFECT_CHECK_HP_AND_SUBSTITUTE (1 << 25) -#define MOVE_SIDE_EFFECT_PROBABILISTIC (1 << 26) -#define MOVE_SIDE_EFFECT_CANNOT_PREVENT (1 << 27) -#define MOVE_SIDE_EFFECT_CHECK_HP (1 << 28) -#define MOVE_SIDE_EFFECT_ON_HIT (1 << 29) -#define MOVE_SIDE_EFFECT_TO_ATTACKER (1 << 30) -#define MOVE_SIDE_EFFECT_TO_DEFENDER (1 << 31) +#define MOVE_SIDE_EFFECT_BREAK_SCREENS (1 << 23) +#define MOVE_SIDE_EFFECT_CHECK_SUBSTITUTE (1 << 24) +#define MOVE_SIDE_EFFECT_CHECK_HP_AND_SUBSTITUTE (1 << 25) +#define MOVE_SIDE_EFFECT_PROBABILISTIC (1 << 26) +#define MOVE_SIDE_EFFECT_CANNOT_PREVENT (1 << 27) +#define MOVE_SIDE_EFFECT_CHECK_HP (1 << 28) +#define MOVE_SIDE_EFFECT_ON_HIT (1 << 29) +#define MOVE_SIDE_EFFECT_TO_ATTACKER (1 << 30) +#define MOVE_SIDE_EFFECT_TO_DEFENDER (1 << 31) -#define MOVE_SIDE_EFFECT_FLAGS (MOVE_SIDE_EFFECT_BREAK_SCREENS | MOVE_SIDE_EFFECT_CHECK_SUBSTITUTE | MOVE_SIDE_EFFECT_CHECK_HP_AND_SUBSTITUTE \ - | MOVE_SIDE_EFFECT_PROBABILISTIC | MOVE_SIDE_EFFECT_CANNOT_PREVENT | MOVE_SIDE_EFFECT_CHECK_HP \ - | MOVE_SIDE_EFFECT_ON_HIT | MOVE_SIDE_EFFECT_TO_ATTACKER | MOVE_SIDE_EFFECT_TO_DEFENDER) +#define MOVE_SIDE_EFFECT_FLAGS (MOVE_SIDE_EFFECT_BREAK_SCREENS | MOVE_SIDE_EFFECT_CHECK_SUBSTITUTE | MOVE_SIDE_EFFECT_CHECK_HP_AND_SUBSTITUTE \ + | MOVE_SIDE_EFFECT_PROBABILISTIC | MOVE_SIDE_EFFECT_CANNOT_PREVENT | MOVE_SIDE_EFFECT_CHECK_HP \ + | MOVE_SIDE_EFFECT_ON_HIT | MOVE_SIDE_EFFECT_TO_ATTACKER | MOVE_SIDE_EFFECT_TO_DEFENDER) -#define MOVE_SIDE_EFFECT_SUBSCRIPT_POINTER (~MOVE_SIDE_EFFECT_FLAGS) +#define MOVE_SIDE_EFFECT_SUBSCRIPT_POINTER (~MOVE_SIDE_EFFECT_FLAGS) #endif // POKEPLATINUM_CONSTANTS_BATTLE_SIDE_EFFECTS_H diff --git a/include/constants/battle/system_control.h b/include/constants/battle/system_control.h index 33a7992288..d35e5190fd 100644 --- a/include/constants/battle/system_control.h +++ b/include/constants/battle/system_control.h @@ -1,97 +1,97 @@ #ifndef POKEPLATINUM_CONSTANTS_BATTLE_SYSTEM_CONTROL_H #define POKEPLATINUM_CONSTANTS_BATTLE_SYSTEM_CONTROL_H -#define SYSCTL_SKIP_ATTACK_MESSAGE (1 << 0) -#define SYSCTL_CHECK_LOOP_ONLY_ONCE (1 << 1) -#define SYSCTL_HIT_DURING_FLY (1 << 2) -#define SYSCTL_HIT_DURING_DIG (1 << 3) -#define SYSCTL_HIT_DURING_DIVE (1 << 4) -#define SYSCTL_FIRST_OF_MULTI_TURN (1 << 5) // this could be a charge-up move or Bide -#define SYSCTL_SKIP_SPRITE_BLINK (1 << 6) -#define SYSCTL_TRY_SYNCHRONIZE_STATUS (1 << 7) -#define SYSCTL_BATON_PASS (1 << 8) -#define SYSCTL_LAST_OF_MULTI_TURN (1 << 9) -#define SYSCTL_NONSTANDARD_ACC_CHECK (1 << 10) // used by Future Sight and OHKO moves -#define SYSCTL_IGNORE_TYPE_CHECKS (1 << 11) -#define SYSCTL_CRASH_DAMAGE (1 << 12) -#define SYSCTL_MOVE_HIT (1 << 13) // this indicates that the move hit its target(s) -#define SYSCTL_PLAYED_MOVE_ANIMATION (1 << 14) -#define SYSCTL_IGNORE_IMMUNITIES (1 << 15) -#define SYSCTL_MULTI_HIT_SKIP_MESSAGE (1 << 16) -#define SYSCTL_FAIL_STAT_STAGE_CHANGE (1 << 17) -#define SYSCTL_MESSAGE_AFTER_MISS (1 << 18) -#define SYSCTL_HIT_DURING_SHADOW_FORCE (1 << 19) -#define SYSCTL_REUSE_LAST_MOVE (1 << 20) -#define SYSCTL_TURN_OFF_MESSAGES (1 << 21) -#define SYSCTL_APPLY_SECONDARY_EFFECT (1 << 22) -#define SYSCTL_APPLY_MOLD_BREAKER (1 << 23) -#define SYSCTL_MON_FAINTED ((1 << 24) | (1 << 25) | (1 << 26) | (1 << 27)) -#define SYSCTL_MON_SELFDESTRUCTED ((1 << 28) | (1 << 29) | (1 << 30) | (1 << 31)) +#define SYSCTL_SKIP_ATTACK_MESSAGE (1 << 0) +#define SYSCTL_CHECK_LOOP_ONLY_ONCE (1 << 1) +#define SYSCTL_HIT_DURING_FLY (1 << 2) +#define SYSCTL_HIT_DURING_DIG (1 << 3) +#define SYSCTL_HIT_DURING_DIVE (1 << 4) +#define SYSCTL_FIRST_OF_MULTI_TURN (1 << 5) // this could be a charge-up move or Bide +#define SYSCTL_SKIP_SPRITE_BLINK (1 << 6) +#define SYSCTL_TRY_SYNCHRONIZE_STATUS (1 << 7) +#define SYSCTL_BATON_PASS (1 << 8) +#define SYSCTL_LAST_OF_MULTI_TURN (1 << 9) +#define SYSCTL_NONSTANDARD_ACC_CHECK (1 << 10) // used by Future Sight and OHKO moves +#define SYSCTL_IGNORE_TYPE_CHECKS (1 << 11) +#define SYSCTL_CRASH_DAMAGE (1 << 12) +#define SYSCTL_MOVE_HIT (1 << 13) // this indicates that the move hit its target(s) +#define SYSCTL_PLAYED_MOVE_ANIMATION (1 << 14) +#define SYSCTL_IGNORE_IMMUNITIES (1 << 15) +#define SYSCTL_MULTI_HIT_SKIP_MESSAGE (1 << 16) +#define SYSCTL_FAIL_STAT_STAGE_CHANGE (1 << 17) +#define SYSCTL_MESSAGE_AFTER_MISS (1 << 18) +#define SYSCTL_HIT_DURING_SHADOW_FORCE (1 << 19) +#define SYSCTL_REUSE_LAST_MOVE (1 << 20) +#define SYSCTL_TURN_OFF_MESSAGES (1 << 21) +#define SYSCTL_APPLY_SECONDARY_EFFECT (1 << 22) +#define SYSCTL_APPLY_MOLD_BREAKER (1 << 23) +#define SYSCTL_MON_FAINTED ((1 << 24) | (1 << 25) | (1 << 26) | (1 << 27)) +#define SYSCTL_MON_SELFDESTRUCTED ((1 << 28) | (1 << 29) | (1 << 30) | (1 << 31)) -#define SYSCTL_INIT_P1 (SYSCTL_SKIP_ATTACK_MESSAGE | SYSCTL_CHECK_LOOP_ONLY_ONCE | SYSCTL_HIT_DURING_FLY \ - | SYSCTL_HIT_DURING_DIG | SYSCTL_HIT_DURING_DIVE | SYSCTL_FIRST_OF_MULTI_TURN \ - | SYSCTL_SKIP_SPRITE_BLINK | SYSCTL_TRY_SYNCHRONIZE_STATUS | SYSCTL_BATON_PASS \ - | SYSCTL_LAST_OF_MULTI_TURN | SYSCTL_NONSTANDARD_ACC_CHECK | SYSCTL_IGNORE_TYPE_CHECKS) -#define SYSCTL_INIT_P2 (SYSCTL_CRASH_DAMAGE | SYSCTL_MOVE_HIT | SYSCTL_PLAYED_MOVE_ANIMATION \ - | SYSCTL_IGNORE_IMMUNITIES | SYSCTL_MULTI_HIT_SKIP_MESSAGE | SYSCTL_FAIL_STAT_STAGE_CHANGE \ - | SYSCTL_MESSAGE_AFTER_MISS | SYSCTL_HIT_DURING_SHADOW_FORCE | SYSCTL_REUSE_LAST_MOVE \ - | SYSCTL_TURN_OFF_MESSAGES | SYSCTL_APPLY_SECONDARY_EFFECT) +#define SYSCTL_INIT_P1 (SYSCTL_SKIP_ATTACK_MESSAGE | SYSCTL_CHECK_LOOP_ONLY_ONCE | SYSCTL_HIT_DURING_FLY \ + | SYSCTL_HIT_DURING_DIG | SYSCTL_HIT_DURING_DIVE | SYSCTL_FIRST_OF_MULTI_TURN \ + | SYSCTL_SKIP_SPRITE_BLINK | SYSCTL_TRY_SYNCHRONIZE_STATUS | SYSCTL_BATON_PASS \ + | SYSCTL_LAST_OF_MULTI_TURN | SYSCTL_NONSTANDARD_ACC_CHECK | SYSCTL_IGNORE_TYPE_CHECKS) +#define SYSCTL_INIT_P2 (SYSCTL_CRASH_DAMAGE | SYSCTL_MOVE_HIT | SYSCTL_PLAYED_MOVE_ANIMATION \ + | SYSCTL_IGNORE_IMMUNITIES | SYSCTL_MULTI_HIT_SKIP_MESSAGE | SYSCTL_FAIL_STAT_STAGE_CHANGE \ + | SYSCTL_MESSAGE_AFTER_MISS | SYSCTL_HIT_DURING_SHADOW_FORCE | SYSCTL_REUSE_LAST_MOVE \ + | SYSCTL_TURN_OFF_MESSAGES | SYSCTL_APPLY_SECONDARY_EFFECT) -#define SYSCTL_INIT (~(SYSCTL_INIT_P1 | SYSCTL_INIT_P2)) +#define SYSCTL_INIT (~(SYSCTL_INIT_P1 | SYSCTL_INIT_P2)) #define SYSCTL_MON_FAINTED_SHIFT 24 #define SYSCTL_MON_SELFDESTRUCTED_SHIFT 28 -#define SYSCTL_NO_EXPERIENCE_GIVEN (1 << 0) -#define SYSCTL_UPDATE_STAT_STAGES (1 << 1) -#define SYSCTL_ATTACK_MESSAGE_SHOWN (1 << 2) -#define SYSCTL_MAGIC_COAT_REFLECTED (1 << 3) -#define SYSCTL_UTURN_ACTIVE (1 << 4) -#define SYSCTL_FIRST_DAMAGE_MSG_SHOWN (1 << 5) -#define SYSCTL_MOVE_SUCCEEDED (1 << 6) // this only reflects that the move is executed, not whether it hit or missed -#define SYSCTL_STAT_STAGE_CHANGE_SHOWN (1 << 7) -#define SYSCTL_RECOVER_HP_VISUAL (1 << 8) -#define SYSCTL_FORM_CHANGE (1 << 26) -#define SYSCTL_RECALC_MON_STATS (1 << 27) +#define SYSCTL_NO_EXPERIENCE_GIVEN (1 << 0) +#define SYSCTL_UPDATE_STAT_STAGES (1 << 1) +#define SYSCTL_ATTACK_MESSAGE_SHOWN (1 << 2) +#define SYSCTL_MAGIC_COAT_REFLECTED (1 << 3) +#define SYSCTL_UTURN_ACTIVE (1 << 4) +#define SYSCTL_FIRST_DAMAGE_MSG_SHOWN (1 << 5) +#define SYSCTL_MOVE_SUCCEEDED (1 << 6) // this only reflects that the move is executed, not whether it hit or missed +#define SYSCTL_STAT_STAGE_CHANGE_SHOWN (1 << 7) +#define SYSCTL_RECOVER_HP_VISUAL (1 << 8) +#define SYSCTL_FORM_CHANGE (1 << 26) +#define SYSCTL_RECALC_MON_STATS (1 << 27) -#define SYSCTL_LINK_WAITING ((1 << 24) | (1 << 25) | SYSCTL_FORM_CHANGE | SYSCTL_RECALC_MON_STATS) -#define SYSCTL_PAYOUT_EXP ((1 << 28) | (1 << 29) | (1 << 30) | (1 << 31)) +#define SYSCTL_LINK_WAITING ((1 << 24) | (1 << 25) | SYSCTL_FORM_CHANGE | SYSCTL_RECALC_MON_STATS) +#define SYSCTL_PAYOUT_EXP ((1 << 28) | (1 << 29) | (1 << 30) | (1 << 31)) -#define SYSCTL_INIT2 (~(SYSCTL_UPDATE_STAT_STAGES \ +#define SYSCTL_INIT2 (~(SYSCTL_UPDATE_STAT_STAGES \ | SYSCTL_ATTACK_MESSAGE_SHOWN \ | SYSCTL_MAGIC_COAT_REFLECTED \ - | SYSCTL_UTURN_ACTIVE \ - | SYSCTL_MOVE_SUCCEEDED \ + | SYSCTL_UTURN_ACTIVE \ + | SYSCTL_MOVE_SUCCEEDED \ | SYSCTL_RECOVER_HP_VISUAL)) -#define SYSCTL_LINK_WAITING_SHIFT 24 -#define SYSCTL_PAYOUT_EXP_SHIFT 28 +#define SYSCTL_LINK_WAITING_SHIFT 24 +#define SYSCTL_PAYOUT_EXP_SHIFT 28 -#define SYSCTL_SKIP_OBEDIENCE_CHECK (1 << 0) -#define SYSCTL_SKIP_TYPE_CHART_CHECK (1 << 1) -#define SYSCTL_SKIP_STATUS_CHECK (1 << 2) -#define SYSCTL_SKIP_PP_DECREMENT (1 << 3) -#define SYSCTL_SKIP_IMMUNITY_TRIGGERS (1 << 4) -#define SYSCTL_SKIP_ACCURACY_CHECK (1 << 5) -#define SYSCTL_SKIP_ACCURACY_OVERRIDES (1 << 6) -#define SYSCTL_SKIP_STOLEN_CHECK (1 << 7) +#define SYSCTL_SKIP_OBEDIENCE_CHECK (1 << 0) +#define SYSCTL_SKIP_TYPE_CHART_CHECK (1 << 1) +#define SYSCTL_SKIP_STATUS_CHECK (1 << 2) +#define SYSCTL_SKIP_PP_DECREMENT (1 << 3) +#define SYSCTL_SKIP_IMMUNITY_TRIGGERS (1 << 4) +#define SYSCTL_SKIP_ACCURACY_CHECK (1 << 5) +#define SYSCTL_SKIP_ACCURACY_OVERRIDES (1 << 6) +#define SYSCTL_SKIP_STOLEN_CHECK (1 << 7) -#define SYSCTL_HIT_MULTIPLE_TARGETS (SYSCTL_SKIP_OBEDIENCE_CHECK | SYSCTL_SKIP_STATUS_CHECK | SYSCTL_SKIP_PP_DECREMENT) -#define SYSCTL_TWO_HITS (SYSCTL_SKIP_OBEDIENCE_CHECK | SYSCTL_SKIP_STATUS_CHECK | SYSCTL_SKIP_PP_DECREMENT) -#define SYSCTL_TRIPLE_KICK (SYSCTL_SKIP_OBEDIENCE_CHECK \ - | SYSCTL_SKIP_STATUS_CHECK \ - | SYSCTL_SKIP_PP_DECREMENT \ - | SYSCTL_SKIP_IMMUNITY_TRIGGERS \ - | SYSCTL_SKIP_ACCURACY_OVERRIDES \ - | SYSCTL_SKIP_STOLEN_CHECK) -#define SYSCTL_MULTI_HIT_MOVE (SYSCTL_SKIP_OBEDIENCE_CHECK \ - | SYSCTL_SKIP_STATUS_CHECK \ - | SYSCTL_SKIP_PP_DECREMENT \ - | SYSCTL_SKIP_IMMUNITY_TRIGGERS \ - | SYSCTL_SKIP_ACCURACY_CHECK \ - | SYSCTL_SKIP_ACCURACY_OVERRIDES \ - | SYSCTL_SKIP_STOLEN_CHECK) +#define SYSCTL_HIT_MULTIPLE_TARGETS (SYSCTL_SKIP_OBEDIENCE_CHECK | SYSCTL_SKIP_STATUS_CHECK | SYSCTL_SKIP_PP_DECREMENT) +#define SYSCTL_TWO_HITS (SYSCTL_SKIP_OBEDIENCE_CHECK | SYSCTL_SKIP_STATUS_CHECK | SYSCTL_SKIP_PP_DECREMENT) +#define SYSCTL_TRIPLE_KICK (SYSCTL_SKIP_OBEDIENCE_CHECK \ + | SYSCTL_SKIP_STATUS_CHECK \ + | SYSCTL_SKIP_PP_DECREMENT \ + | SYSCTL_SKIP_IMMUNITY_TRIGGERS \ + | SYSCTL_SKIP_ACCURACY_OVERRIDES \ + | SYSCTL_SKIP_STOLEN_CHECK) +#define SYSCTL_MULTI_HIT_MOVE (SYSCTL_SKIP_OBEDIENCE_CHECK \ + | SYSCTL_SKIP_STATUS_CHECK \ + | SYSCTL_SKIP_PP_DECREMENT \ + | SYSCTL_SKIP_IMMUNITY_TRIGGERS \ + | SYSCTL_SKIP_ACCURACY_CHECK \ + | SYSCTL_SKIP_ACCURACY_OVERRIDES \ + | SYSCTL_SKIP_STOLEN_CHECK) -#define BATTLER_STATUS_SWITCHING 1 +#define BATTLER_STATUS_SWITCHING 1 #endif // POKEPLATINUM_CONSTANTS_BATTLE_SYSTEM_CONTROL_H diff --git a/include/constants/battle/terrain.h b/include/constants/battle/terrain.h index 2a72c7b977..3d4d026b13 100644 --- a/include/constants/battle/terrain.h +++ b/include/constants/battle/terrain.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_CONSTANTS_BATTLE_TERRAIN_H #define POKEPLATINUM_CONSTANTS_BATTLE_TERRAIN_H -#define TERRAIN_SPECIAL TERRAIN_AARON +#define TERRAIN_SPECIAL TERRAIN_AARON -#endif // POKEPLATINUM_CONSTANTS_BATTLE_TERRAIN_H \ No newline at end of file +#endif // POKEPLATINUM_CONSTANTS_BATTLE_TERRAIN_H diff --git a/include/constants/battle/trainer_ai.h b/include/constants/battle/trainer_ai.h index 839748344f..cdf717f94f 100644 --- a/include/constants/battle/trainer_ai.h +++ b/include/constants/battle/trainer_ai.h @@ -14,21 +14,21 @@ enum AIActionChoice { AI_ENEMY_SWITCH, }; -#define AI_CONTEXT (battleCtx->aiContext) +#define AI_CONTEXT (battleCtx->aiContext) #endif -#define AI_INIT_SCORE_MOVE_1 (1 << 0) -#define AI_INIT_SCORE_MOVE_2 (1 << 1) -#define AI_INIT_SCORE_MOVE_3 (1 << 2) -#define AI_INIT_SCORE_MOVE_4 (1 << 3) +#define AI_INIT_SCORE_MOVE_1 (1 << 0) +#define AI_INIT_SCORE_MOVE_2 (1 << 1) +#define AI_INIT_SCORE_MOVE_3 (1 << 2) +#define AI_INIT_SCORE_MOVE_4 (1 << 3) -#define AI_INIT_SCORE_ALL_MOVES (AI_INIT_SCORE_MOVE_1 | AI_INIT_SCORE_MOVE_2 | AI_INIT_SCORE_MOVE_3 | AI_INIT_SCORE_MOVE_4) +#define AI_INIT_SCORE_ALL_MOVES (AI_INIT_SCORE_MOVE_1 | AI_INIT_SCORE_MOVE_2 | AI_INIT_SCORE_MOVE_3 | AI_INIT_SCORE_MOVE_4) -#define AI_STATUS_FLAG_DONE (1 << 0) -#define AI_STATUS_FLAG_ESCAPE (1 << 1) -#define AI_STATUS_FLAG_SAFARI (1 << 2) -#define AI_STATUS_FLAG_BREAK (1 << 3) -#define AI_STATUS_FLAG_CONTINUE (1 << 4) +#define AI_STATUS_FLAG_DONE (1 << 0) +#define AI_STATUS_FLAG_ESCAPE (1 << 1) +#define AI_STATUS_FLAG_SAFARI (1 << 2) +#define AI_STATUS_FLAG_BREAK (1 << 3) +#define AI_STATUS_FLAG_CONTINUE (1 << 4) #define AI_STATUS_FLAG_DONE_OFF (AI_STATUS_FLAG_DONE ^ 0xFF) #define AI_STATUS_FLAG_ESCAPE_OFF (AI_STATUS_FLAG_ESCAPE ^ 0xFF) @@ -41,11 +41,11 @@ enum AIActionChoice { #define AI_BATTLER_DEFENDER_PARTNER (AI_BATTLER_DEFENDER ^ 2) #define AI_BATTLER_ATTACKER_PARTNER (AI_BATTLER_ATTACKER ^ 2) -#define AI_MAX_STACK_SIZE 8 +#define AI_MAX_STACK_SIZE 8 -#define AI_NO_COMPARISON_MADE 0 -#define AI_NOT_HIGHEST_DAMAGE 1 -#define AI_MOVE_IS_HIGHEST_DAMAGE 2 +#define AI_NO_COMPARISON_MADE 0 +#define AI_NOT_HIGHEST_DAMAGE 1 +#define AI_MOVE_IS_HIGHEST_DAMAGE 2 #define AI_NOT_HAVE 0 #define AI_HAVE 1 diff --git a/include/constants/battle/turn_flags.h b/include/constants/battle/turn_flags.h index c74379d96b..d43e120bd6 100644 --- a/include/constants/battle/turn_flags.h +++ b/include/constants/battle/turn_flags.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_CONSTANTS_BATTLE_TURN_FLAGS_H #define POKEPLATINUM_CONSTANTS_BATTLE_TURN_FLAGS_H -#define SELF_TURN_FLAG_CLEAR 0 +#define SELF_TURN_FLAG_CLEAR 0 // unused: 1 << 0 #define SELF_TURN_FLAG_PLUCK_BERRY (1 << 1) #define SELF_TURN_FLAG_INFATUATED (1 << 2) diff --git a/include/constants/charcode.h b/include/constants/charcode.h index bba262250a..96ee633ac5 100644 --- a/include/constants/charcode.h +++ b/include/constants/charcode.h @@ -98,4 +98,3 @@ enum { }; #endif // POKEPLATINUM_CONSTANTS_CHARCODE_H - diff --git a/include/constants/communication/comm_packets.h b/include/constants/communication/comm_packets.h index b16e83c743..e254c3ff14 100644 --- a/include/constants/communication/comm_packets.h +++ b/include/constants/communication/comm_packets.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_CONSTANTS_COMM_PACKETS_H #define POKEPLATINUM_CONSTANTS_COMM_PACKETS_H -//Comm Packet Sizes -#define COMM_PACKET_SIZE_LOCATION 5 -#define COMM_PACKET_SIZE_POS_NETID 4 - +// Comm Packet Sizes +#define COMM_PACKET_SIZE_LOCATION 5 +#define COMM_PACKET_SIZE_POS_NETID 4 #endif diff --git a/include/constants/communication/comm_type.h b/include/constants/communication/comm_type.h index e5ab29468b..ee3dffbbb8 100644 --- a/include/constants/communication/comm_type.h +++ b/include/constants/communication/comm_type.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_CONSTANTS_COMM_TYPE_H #define POKEPLATINUM_CONSTANTS_COMM_TYPE_H -#define COMM_TYPE_TRADE 0 -#define COMM_TYPE_SINGLE_BATTLE 1 -#define COMM_TYPE_DOUBLE_BATTLE 2 -#define COMM_TYPE_MIX_BATTLE 3 -#define COMM_TYPE_MULTI_BATTLE_1 4 -#define COMM_TYPE_MULTI_BATTLE_2 5 -#define COMM_TYPE_POFFIN_MAKING 6 -#define COMM_TYPE_MIX_RECORDS 7 -#define COMM_TYPE_CONTEST 8 +#define COMM_TYPE_TRADE 0 +#define COMM_TYPE_SINGLE_BATTLE 1 +#define COMM_TYPE_DOUBLE_BATTLE 2 +#define COMM_TYPE_MIX_BATTLE 3 +#define COMM_TYPE_MULTI_BATTLE_1 4 +#define COMM_TYPE_MULTI_BATTLE_2 5 +#define COMM_TYPE_POFFIN_MAKING 6 +#define COMM_TYPE_MIX_RECORDS 7 +#define COMM_TYPE_CONTEST 8 #endif diff --git a/include/constants/font.h b/include/constants/font.h index aa928be208..bf85710d8f 100644 --- a/include/constants/font.h +++ b/include/constants/font.h @@ -8,11 +8,9 @@ typedef u32 FONT_COLOR; #define FONT_COLOR_SHADOW_SHIFT 8 #define FONT_COLOR_BG_SHIFT 0 -#define MAKE_FONT_COLOR(letter, shadow, bg) ((FONT_COLOR)( \ - ((letter & FONT_COLOR_MASK) << FONT_COLOR_LETTER_SHIFT) \ - | ((shadow & FONT_COLOR_MASK) << FONT_COLOR_SHADOW_SHIFT) \ - | ((bg & FONT_COLOR_MASK) << FONT_COLOR_BG_SHIFT) \ -)) +#define MAKE_FONT_COLOR(letter, shadow, bg) ((FONT_COLOR)(((letter & FONT_COLOR_MASK) << FONT_COLOR_LETTER_SHIFT) \ + | ((shadow & FONT_COLOR_MASK) << FONT_COLOR_SHADOW_SHIFT) \ + | ((bg & FONT_COLOR_MASK) << FONT_COLOR_BG_SHIFT))) enum FontType { FONT_SYSTEM = 0, diff --git a/include/constants/forms.h b/include/constants/forms.h index 3f823b6c2c..2c06f14e8c 100644 --- a/include/constants/forms.h +++ b/include/constants/forms.h @@ -3,19 +3,19 @@ #include "species.h" -#define MOVESET_FORM_DEOXYS_ATTACK NATIONAL_DEX_COUNT + 1 -#define MOVESET_FORM_DEOXYS_DEFENSE NATIONAL_DEX_COUNT + 2 -#define MOVESET_FORM_DEOXYS_SPEED NATIONAL_DEX_COUNT + 3 -#define MOVESET_FORM_WORMADAM_SANDY NATIONAL_DEX_COUNT + 4 -#define MOVESET_FORM_WORMADAM_TRASH NATIONAL_DEX_COUNT + 5 -#define MOVESET_FORM_GIRATINA_ORIGIN NATIONAL_DEX_COUNT + 6 -#define MOVESET_FORM_SHAYMIN_SKY NATIONAL_DEX_COUNT + 7 -#define MOVESET_FORM_ROTOM_HEAT NATIONAL_DEX_COUNT + 8 -#define MOVESET_FORM_ROTOM_WASH NATIONAL_DEX_COUNT + 9 -#define MOVESET_FORM_ROTOM_FROST NATIONAL_DEX_COUNT + 10 -#define MOVESET_FORM_ROTOM_FAN NATIONAL_DEX_COUNT + 11 -#define MOVESET_FORM_ROTOM_MOW NATIONAL_DEX_COUNT + 12 +#define MOVESET_FORM_DEOXYS_ATTACK NATIONAL_DEX_COUNT + 1 +#define MOVESET_FORM_DEOXYS_DEFENSE NATIONAL_DEX_COUNT + 2 +#define MOVESET_FORM_DEOXYS_SPEED NATIONAL_DEX_COUNT + 3 +#define MOVESET_FORM_WORMADAM_SANDY NATIONAL_DEX_COUNT + 4 +#define MOVESET_FORM_WORMADAM_TRASH NATIONAL_DEX_COUNT + 5 +#define MOVESET_FORM_GIRATINA_ORIGIN NATIONAL_DEX_COUNT + 6 +#define MOVESET_FORM_SHAYMIN_SKY NATIONAL_DEX_COUNT + 7 +#define MOVESET_FORM_ROTOM_HEAT NATIONAL_DEX_COUNT + 8 +#define MOVESET_FORM_ROTOM_WASH NATIONAL_DEX_COUNT + 9 +#define MOVESET_FORM_ROTOM_FROST NATIONAL_DEX_COUNT + 10 +#define MOVESET_FORM_ROTOM_FAN NATIONAL_DEX_COUNT + 11 +#define MOVESET_FORM_ROTOM_MOW NATIONAL_DEX_COUNT + 12 -#define MOVESET_MAX MOVESET_FORM_ROTOM_MOW +#define MOVESET_MAX MOVESET_FORM_ROTOM_MOW -#endif \ No newline at end of file +#endif diff --git a/include/constants/gba/species.h b/include/constants/gba/species.h index fb4fad0339..0dd9450a9e 100644 --- a/include/constants/gba/species.h +++ b/include/constants/gba/species.h @@ -4,141 +4,141 @@ // IDs up to 251 (Celebi) are the same as Gen 4's species. // IDs between 252 and 276 correspond to Gen 3's SPECIES_OLD_UNOWN B to Z. -#define GBA_SPECIES_TREECKO 277 -#define GBA_SPECIES_GROVYLE 278 -#define GBA_SPECIES_SCEPTILE 279 -#define GBA_SPECIES_TORCHIC 280 -#define GBA_SPECIES_COMBUSKEN 281 -#define GBA_SPECIES_BLAZIKEN 282 -#define GBA_SPECIES_MUDKIP 283 -#define GBA_SPECIES_MARSHTOMP 284 -#define GBA_SPECIES_SWAMPERT 285 -#define GBA_SPECIES_POOCHYENA 286 -#define GBA_SPECIES_MIGHTYENA 287 -#define GBA_SPECIES_ZIGZAGOON 288 -#define GBA_SPECIES_LINOONE 289 -#define GBA_SPECIES_WURMPLE 290 -#define GBA_SPECIES_SILCOON 291 -#define GBA_SPECIES_BEAUTIFLY 292 -#define GBA_SPECIES_CASCOON 293 -#define GBA_SPECIES_DUSTOX 294 -#define GBA_SPECIES_LOTAD 295 -#define GBA_SPECIES_LOMBRE 296 -#define GBA_SPECIES_LUDICOLO 297 -#define GBA_SPECIES_SEEDOT 298 -#define GBA_SPECIES_NUZLEAF 299 -#define GBA_SPECIES_SHIFTRY 300 -#define GBA_SPECIES_NINCADA 301 -#define GBA_SPECIES_NINJASK 302 -#define GBA_SPECIES_SHEDINJA 303 -#define GBA_SPECIES_TAILLOW 304 -#define GBA_SPECIES_SWELLOW 305 -#define GBA_SPECIES_SHROOMISH 306 -#define GBA_SPECIES_BRELOOM 307 -#define GBA_SPECIES_SPINDA 308 -#define GBA_SPECIES_WINGULL 309 -#define GBA_SPECIES_PELIPPER 310 -#define GBA_SPECIES_SURSKIT 311 -#define GBA_SPECIES_MASQUERAIN 312 -#define GBA_SPECIES_WAILMER 313 -#define GBA_SPECIES_WAILORD 314 -#define GBA_SPECIES_SKITTY 315 -#define GBA_SPECIES_DELCATTY 316 -#define GBA_SPECIES_KECLEON 317 -#define GBA_SPECIES_BALTOY 318 -#define GBA_SPECIES_CLAYDOL 319 -#define GBA_SPECIES_NOSEPASS 320 -#define GBA_SPECIES_TORKOAL 321 -#define GBA_SPECIES_SABLEYE 322 -#define GBA_SPECIES_BARBOACH 323 -#define GBA_SPECIES_WHISCASH 324 -#define GBA_SPECIES_LUVDISC 325 -#define GBA_SPECIES_CORPHISH 326 -#define GBA_SPECIES_CRAWDAUNT 327 -#define GBA_SPECIES_FEEBAS 328 -#define GBA_SPECIES_MILOTIC 329 -#define GBA_SPECIES_CARVANHA 330 -#define GBA_SPECIES_SHARPEDO 331 -#define GBA_SPECIES_TRAPINCH 332 -#define GBA_SPECIES_VIBRAVA 333 -#define GBA_SPECIES_FLYGON 334 -#define GBA_SPECIES_MAKUHITA 335 -#define GBA_SPECIES_HARIYAMA 336 -#define GBA_SPECIES_ELECTRIKE 337 -#define GBA_SPECIES_MANECTRIC 338 -#define GBA_SPECIES_NUMEL 339 -#define GBA_SPECIES_CAMERUPT 340 -#define GBA_SPECIES_SPHEAL 341 -#define GBA_SPECIES_SEALEO 342 -#define GBA_SPECIES_WALREIN 343 -#define GBA_SPECIES_CACNEA 344 -#define GBA_SPECIES_CACTURNE 345 -#define GBA_SPECIES_SNORUNT 346 -#define GBA_SPECIES_GLALIE 347 -#define GBA_SPECIES_LUNATONE 348 -#define GBA_SPECIES_SOLROCK 349 -#define GBA_SPECIES_AZURILL 350 -#define GBA_SPECIES_SPOINK 351 -#define GBA_SPECIES_GRUMPIG 352 -#define GBA_SPECIES_PLUSLE 353 -#define GBA_SPECIES_MINUN 354 -#define GBA_SPECIES_MAWILE 355 -#define GBA_SPECIES_MEDITITE 356 -#define GBA_SPECIES_MEDICHAM 357 -#define GBA_SPECIES_SWABLU 358 -#define GBA_SPECIES_ALTARIA 359 -#define GBA_SPECIES_WYNAUT 360 -#define GBA_SPECIES_DUSKULL 361 -#define GBA_SPECIES_DUSCLOPS 362 -#define GBA_SPECIES_ROSELIA 363 -#define GBA_SPECIES_SLAKOTH 364 -#define GBA_SPECIES_VIGOROTH 365 -#define GBA_SPECIES_SLAKING 366 -#define GBA_SPECIES_GULPIN 367 -#define GBA_SPECIES_SWALOT 368 -#define GBA_SPECIES_TROPIUS 369 -#define GBA_SPECIES_WHISMUR 370 -#define GBA_SPECIES_LOUDRED 371 -#define GBA_SPECIES_EXPLOUD 372 -#define GBA_SPECIES_CLAMPERL 373 -#define GBA_SPECIES_HUNTAIL 374 -#define GBA_SPECIES_GOREBYSS 375 -#define GBA_SPECIES_ABSOL 376 -#define GBA_SPECIES_SHUPPET 377 -#define GBA_SPECIES_BANETTE 378 -#define GBA_SPECIES_SEVIPER 379 -#define GBA_SPECIES_ZANGOOSE 380 -#define GBA_SPECIES_RELICANTH 381 -#define GBA_SPECIES_ARON 382 -#define GBA_SPECIES_LAIRON 383 -#define GBA_SPECIES_AGGRON 384 -#define GBA_SPECIES_CASTFORM 385 -#define GBA_SPECIES_VOLBEAT 386 -#define GBA_SPECIES_ILLUMISE 387 -#define GBA_SPECIES_LILEEP 388 -#define GBA_SPECIES_CRADILY 389 -#define GBA_SPECIES_ANORITH 390 -#define GBA_SPECIES_ARMALDO 391 -#define GBA_SPECIES_RALTS 392 -#define GBA_SPECIES_KIRLIA 393 -#define GBA_SPECIES_GARDEVOIR 394 -#define GBA_SPECIES_BAGON 395 -#define GBA_SPECIES_SHELGON 396 -#define GBA_SPECIES_SALAMENCE 397 -#define GBA_SPECIES_BELDUM 398 -#define GBA_SPECIES_METANG 399 -#define GBA_SPECIES_METAGROSS 400 -#define GBA_SPECIES_REGIROCK 401 -#define GBA_SPECIES_REGICE 402 -#define GBA_SPECIES_REGISTEEL 403 -#define GBA_SPECIES_KYOGRE 404 -#define GBA_SPECIES_GROUDON 405 -#define GBA_SPECIES_RAYQUAZA 406 -#define GBA_SPECIES_LATIAS 407 -#define GBA_SPECIES_LATIOS 408 -#define GBA_SPECIES_JIRACHI 409 -#define GBA_SPECIES_DEOXYS 410 -#define GBA_SPECIES_CHIMECHO 411 -#define GBA_SPECIES_EGG 412 +#define GBA_SPECIES_TREECKO 277 +#define GBA_SPECIES_GROVYLE 278 +#define GBA_SPECIES_SCEPTILE 279 +#define GBA_SPECIES_TORCHIC 280 +#define GBA_SPECIES_COMBUSKEN 281 +#define GBA_SPECIES_BLAZIKEN 282 +#define GBA_SPECIES_MUDKIP 283 +#define GBA_SPECIES_MARSHTOMP 284 +#define GBA_SPECIES_SWAMPERT 285 +#define GBA_SPECIES_POOCHYENA 286 +#define GBA_SPECIES_MIGHTYENA 287 +#define GBA_SPECIES_ZIGZAGOON 288 +#define GBA_SPECIES_LINOONE 289 +#define GBA_SPECIES_WURMPLE 290 +#define GBA_SPECIES_SILCOON 291 +#define GBA_SPECIES_BEAUTIFLY 292 +#define GBA_SPECIES_CASCOON 293 +#define GBA_SPECIES_DUSTOX 294 +#define GBA_SPECIES_LOTAD 295 +#define GBA_SPECIES_LOMBRE 296 +#define GBA_SPECIES_LUDICOLO 297 +#define GBA_SPECIES_SEEDOT 298 +#define GBA_SPECIES_NUZLEAF 299 +#define GBA_SPECIES_SHIFTRY 300 +#define GBA_SPECIES_NINCADA 301 +#define GBA_SPECIES_NINJASK 302 +#define GBA_SPECIES_SHEDINJA 303 +#define GBA_SPECIES_TAILLOW 304 +#define GBA_SPECIES_SWELLOW 305 +#define GBA_SPECIES_SHROOMISH 306 +#define GBA_SPECIES_BRELOOM 307 +#define GBA_SPECIES_SPINDA 308 +#define GBA_SPECIES_WINGULL 309 +#define GBA_SPECIES_PELIPPER 310 +#define GBA_SPECIES_SURSKIT 311 +#define GBA_SPECIES_MASQUERAIN 312 +#define GBA_SPECIES_WAILMER 313 +#define GBA_SPECIES_WAILORD 314 +#define GBA_SPECIES_SKITTY 315 +#define GBA_SPECIES_DELCATTY 316 +#define GBA_SPECIES_KECLEON 317 +#define GBA_SPECIES_BALTOY 318 +#define GBA_SPECIES_CLAYDOL 319 +#define GBA_SPECIES_NOSEPASS 320 +#define GBA_SPECIES_TORKOAL 321 +#define GBA_SPECIES_SABLEYE 322 +#define GBA_SPECIES_BARBOACH 323 +#define GBA_SPECIES_WHISCASH 324 +#define GBA_SPECIES_LUVDISC 325 +#define GBA_SPECIES_CORPHISH 326 +#define GBA_SPECIES_CRAWDAUNT 327 +#define GBA_SPECIES_FEEBAS 328 +#define GBA_SPECIES_MILOTIC 329 +#define GBA_SPECIES_CARVANHA 330 +#define GBA_SPECIES_SHARPEDO 331 +#define GBA_SPECIES_TRAPINCH 332 +#define GBA_SPECIES_VIBRAVA 333 +#define GBA_SPECIES_FLYGON 334 +#define GBA_SPECIES_MAKUHITA 335 +#define GBA_SPECIES_HARIYAMA 336 +#define GBA_SPECIES_ELECTRIKE 337 +#define GBA_SPECIES_MANECTRIC 338 +#define GBA_SPECIES_NUMEL 339 +#define GBA_SPECIES_CAMERUPT 340 +#define GBA_SPECIES_SPHEAL 341 +#define GBA_SPECIES_SEALEO 342 +#define GBA_SPECIES_WALREIN 343 +#define GBA_SPECIES_CACNEA 344 +#define GBA_SPECIES_CACTURNE 345 +#define GBA_SPECIES_SNORUNT 346 +#define GBA_SPECIES_GLALIE 347 +#define GBA_SPECIES_LUNATONE 348 +#define GBA_SPECIES_SOLROCK 349 +#define GBA_SPECIES_AZURILL 350 +#define GBA_SPECIES_SPOINK 351 +#define GBA_SPECIES_GRUMPIG 352 +#define GBA_SPECIES_PLUSLE 353 +#define GBA_SPECIES_MINUN 354 +#define GBA_SPECIES_MAWILE 355 +#define GBA_SPECIES_MEDITITE 356 +#define GBA_SPECIES_MEDICHAM 357 +#define GBA_SPECIES_SWABLU 358 +#define GBA_SPECIES_ALTARIA 359 +#define GBA_SPECIES_WYNAUT 360 +#define GBA_SPECIES_DUSKULL 361 +#define GBA_SPECIES_DUSCLOPS 362 +#define GBA_SPECIES_ROSELIA 363 +#define GBA_SPECIES_SLAKOTH 364 +#define GBA_SPECIES_VIGOROTH 365 +#define GBA_SPECIES_SLAKING 366 +#define GBA_SPECIES_GULPIN 367 +#define GBA_SPECIES_SWALOT 368 +#define GBA_SPECIES_TROPIUS 369 +#define GBA_SPECIES_WHISMUR 370 +#define GBA_SPECIES_LOUDRED 371 +#define GBA_SPECIES_EXPLOUD 372 +#define GBA_SPECIES_CLAMPERL 373 +#define GBA_SPECIES_HUNTAIL 374 +#define GBA_SPECIES_GOREBYSS 375 +#define GBA_SPECIES_ABSOL 376 +#define GBA_SPECIES_SHUPPET 377 +#define GBA_SPECIES_BANETTE 378 +#define GBA_SPECIES_SEVIPER 379 +#define GBA_SPECIES_ZANGOOSE 380 +#define GBA_SPECIES_RELICANTH 381 +#define GBA_SPECIES_ARON 382 +#define GBA_SPECIES_LAIRON 383 +#define GBA_SPECIES_AGGRON 384 +#define GBA_SPECIES_CASTFORM 385 +#define GBA_SPECIES_VOLBEAT 386 +#define GBA_SPECIES_ILLUMISE 387 +#define GBA_SPECIES_LILEEP 388 +#define GBA_SPECIES_CRADILY 389 +#define GBA_SPECIES_ANORITH 390 +#define GBA_SPECIES_ARMALDO 391 +#define GBA_SPECIES_RALTS 392 +#define GBA_SPECIES_KIRLIA 393 +#define GBA_SPECIES_GARDEVOIR 394 +#define GBA_SPECIES_BAGON 395 +#define GBA_SPECIES_SHELGON 396 +#define GBA_SPECIES_SALAMENCE 397 +#define GBA_SPECIES_BELDUM 398 +#define GBA_SPECIES_METANG 399 +#define GBA_SPECIES_METAGROSS 400 +#define GBA_SPECIES_REGIROCK 401 +#define GBA_SPECIES_REGICE 402 +#define GBA_SPECIES_REGISTEEL 403 +#define GBA_SPECIES_KYOGRE 404 +#define GBA_SPECIES_GROUDON 405 +#define GBA_SPECIES_RAYQUAZA 406 +#define GBA_SPECIES_LATIAS 407 +#define GBA_SPECIES_LATIOS 408 +#define GBA_SPECIES_JIRACHI 409 +#define GBA_SPECIES_DEOXYS 410 +#define GBA_SPECIES_CHIMECHO 411 +#define GBA_SPECIES_EGG 412 #endif // POKEPLATINUM_CONSTANTS_GBA_SPECIES_H diff --git a/include/constants/heap.h b/include/constants/heap.h index b2b16423cb..21df8c8689 100644 --- a/include/constants/heap.h +++ b/include/constants/heap.h @@ -21,8 +21,7 @@ enum HeapId { HEAP_ID_LIBRARY_TV = 120, }; -enum HeapSize -{ +enum HeapSize { HEAP_SIZE_POKETCH_MAIN = 0xc000, HEAP_SIZE_POKETCH_APP = 0xc000, diff --git a/include/constants/items.h b/include/constants/items.h index f823b7ce8b..7633a7b543 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -34,85 +34,85 @@ enum { #define POCKET_KEY_ITEMS 7 #define POCKET_MAX 8 -#define ITEM_RECOVER_CONFUSION (1 << 0) -#define ITEM_RECOVER_PARALYSIS (1 << 1) -#define ITEM_RECOVER_FREEZE (1 << 2) -#define ITEM_RECOVER_BURN (1 << 3) -#define ITEM_RECOVER_POISON (1 << 4) -#define ITEM_RECOVER_SLEEP (1 << 5) -#define ITEM_RECOVER_FULL (ITEM_RECOVER_SLEEP \ - | ITEM_RECOVER_POISON \ - | ITEM_RECOVER_BURN \ - | ITEM_RECOVER_FREEZE \ - | ITEM_RECOVER_PARALYSIS) +#define ITEM_RECOVER_CONFUSION (1 << 0) +#define ITEM_RECOVER_PARALYSIS (1 << 1) +#define ITEM_RECOVER_FREEZE (1 << 2) +#define ITEM_RECOVER_BURN (1 << 3) +#define ITEM_RECOVER_POISON (1 << 4) +#define ITEM_RECOVER_SLEEP (1 << 5) +#define ITEM_RECOVER_FULL (ITEM_RECOVER_SLEEP \ + | ITEM_RECOVER_POISON \ + | ITEM_RECOVER_BURN \ + | ITEM_RECOVER_FREEZE \ + | ITEM_RECOVER_PARALYSIS) #define FIRST_MAIL_IDX ITEM_GRASS_MAIL -#define LAST_MAIL_IDX ITEM_BRICK_MAIL -#define NUM_MAILS (LAST_MAIL_IDX - FIRST_MAIL_IDX + 1) +#define LAST_MAIL_IDX ITEM_BRICK_MAIL +#define NUM_MAILS (LAST_MAIL_IDX - FIRST_MAIL_IDX + 1) #define FIRST_BERRY_IDX ITEM_CHERI_BERRY -#define LAST_BERRY_IDX ITEM_ROWAP_BERRY -#define NUM_BERRIES (LAST_BERRY_IDX - FIRST_BERRY_IDX + 1) +#define LAST_BERRY_IDX ITEM_ROWAP_BERRY +#define NUM_BERRIES (LAST_BERRY_IDX - FIRST_BERRY_IDX + 1) -#define NUM_ITEMS MAX_ITEMS - 1 +#define NUM_ITEMS MAX_ITEMS - 1 -#define FLING_EFFECT_NONE 0 -#define FLING_EFFECT_PRZ_RESTORE 1 -#define FLING_EFFECT_SLP_RESTORE 2 -#define FLING_EFFECT_PSN_RESTORE 3 -#define FLING_EFFECT_BRN_RESTORE 4 -#define FLING_EFFECT_FRZ_RESTORE 5 -#define FLING_EFFECT_PP_RESTORE 6 -#define FLING_EFFECT_HP_RESTORE 7 -#define FLING_EFFECT_CNF_RESTORE 8 -#define FLING_EFFECT_ALL_RESTORE 9 -#define FLING_EFFECT_HP_PCT_RESTORE 10 -#define FLING_EFFECT_HP_RESTORE_SPICY 11 -#define FLING_EFFECT_HP_RESTORE_DRY 12 -#define FLING_EFFECT_HP_RESTORE_SWEET 13 -#define FLING_EFFECT_HP_RESTORE_BITTER 14 -#define FLING_EFFECT_HP_RESTORE_SOUR 15 -#define FLING_EFFECT_ATK_UP 16 -#define FLING_EFFECT_DEF_UP 17 -#define FLING_EFFECT_SPEED_UP 18 -#define FLING_EFFECT_SPATK_UP 19 -#define FLING_EFFECT_SPDEF_UP 20 -#define FLING_EFFECT_CRIT_UP 21 -#define FLING_EFFECT_RANDOM_UP2 22 -#define FLING_EFFECT_TEMP_ACC_UP 23 -#define FLING_EFFECT_STATDOWN_RESTORE 24 -#define FLING_EFFECT_HEAL_INFATUATION 25 -#define FLING_EFFECT_FLINCH 26 -#define FLING_EFFECT_PARALYZE 27 -#define FLING_EFFECT_POISON 28 -#define FLING_EFFECT_BADLY_POISON 29 -#define FLING_EFFECT_BURN 30 +#define FLING_EFFECT_NONE 0 +#define FLING_EFFECT_PRZ_RESTORE 1 +#define FLING_EFFECT_SLP_RESTORE 2 +#define FLING_EFFECT_PSN_RESTORE 3 +#define FLING_EFFECT_BRN_RESTORE 4 +#define FLING_EFFECT_FRZ_RESTORE 5 +#define FLING_EFFECT_PP_RESTORE 6 +#define FLING_EFFECT_HP_RESTORE 7 +#define FLING_EFFECT_CNF_RESTORE 8 +#define FLING_EFFECT_ALL_RESTORE 9 +#define FLING_EFFECT_HP_PCT_RESTORE 10 +#define FLING_EFFECT_HP_RESTORE_SPICY 11 +#define FLING_EFFECT_HP_RESTORE_DRY 12 +#define FLING_EFFECT_HP_RESTORE_SWEET 13 +#define FLING_EFFECT_HP_RESTORE_BITTER 14 +#define FLING_EFFECT_HP_RESTORE_SOUR 15 +#define FLING_EFFECT_ATK_UP 16 +#define FLING_EFFECT_DEF_UP 17 +#define FLING_EFFECT_SPEED_UP 18 +#define FLING_EFFECT_SPATK_UP 19 +#define FLING_EFFECT_SPDEF_UP 20 +#define FLING_EFFECT_CRIT_UP 21 +#define FLING_EFFECT_RANDOM_UP2 22 +#define FLING_EFFECT_TEMP_ACC_UP 23 +#define FLING_EFFECT_STATDOWN_RESTORE 24 +#define FLING_EFFECT_HEAL_INFATUATION 25 +#define FLING_EFFECT_FLINCH 26 +#define FLING_EFFECT_PARALYZE 27 +#define FLING_EFFECT_POISON 28 +#define FLING_EFFECT_BADLY_POISON 29 +#define FLING_EFFECT_BURN 30 -#define PLUCK_EFFECT_NONE 0 -#define PLUCK_EFFECT_PRZ_RESTORE 1 -#define PLUCK_EFFECT_SLP_RESTORE 2 -#define PLUCK_EFFECT_PSN_RESTORE 3 -#define PLUCK_EFFECT_BRN_RESTORE 4 -#define PLUCK_EFFECT_FRZ_RESTORE 5 -#define PLUCK_EFFECT_PP_RESTORE 6 -#define PLUCK_EFFECT_HP_RESTORE 7 -#define PLUCK_EFFECT_CNF_RESTORE 8 -#define PLUCK_EFFECT_ALL_RESTORE 9 -#define PLUCK_EFFECT_HP_PCT_RESTORE 10 -#define PLUCK_EFFECT_HP_RESTORE_SPICY 11 -#define PLUCK_EFFECT_HP_RESTORE_DRY 12 -#define PLUCK_EFFECT_HP_RESTORE_SWEET 13 -#define PLUCK_EFFECT_HP_RESTORE_BITTER 14 -#define PLUCK_EFFECT_HP_RESTORE_SOUR 15 -#define PLUCK_EFFECT_ATK_UP 16 -#define PLUCK_EFFECT_DEF_UP 17 -#define PLUCK_EFFECT_SPEED_UP 18 -#define PLUCK_EFFECT_SPATK_UP 19 -#define PLUCK_EFFECT_SPDEF_UP 20 -#define PLUCK_EFFECT_CRIT_UP 21 -#define PLUCK_EFFECT_RANDOM_UP2 22 -#define PLUCK_EFFECT_TEMP_ACC_UP 23 +#define PLUCK_EFFECT_NONE 0 +#define PLUCK_EFFECT_PRZ_RESTORE 1 +#define PLUCK_EFFECT_SLP_RESTORE 2 +#define PLUCK_EFFECT_PSN_RESTORE 3 +#define PLUCK_EFFECT_BRN_RESTORE 4 +#define PLUCK_EFFECT_FRZ_RESTORE 5 +#define PLUCK_EFFECT_PP_RESTORE 6 +#define PLUCK_EFFECT_HP_RESTORE 7 +#define PLUCK_EFFECT_CNF_RESTORE 8 +#define PLUCK_EFFECT_ALL_RESTORE 9 +#define PLUCK_EFFECT_HP_PCT_RESTORE 10 +#define PLUCK_EFFECT_HP_RESTORE_SPICY 11 +#define PLUCK_EFFECT_HP_RESTORE_DRY 12 +#define PLUCK_EFFECT_HP_RESTORE_SWEET 13 +#define PLUCK_EFFECT_HP_RESTORE_BITTER 14 +#define PLUCK_EFFECT_HP_RESTORE_SOUR 15 +#define PLUCK_EFFECT_ATK_UP 16 +#define PLUCK_EFFECT_DEF_UP 17 +#define PLUCK_EFFECT_SPEED_UP 18 +#define PLUCK_EFFECT_SPATK_UP 19 +#define PLUCK_EFFECT_SPDEF_UP 20 +#define PLUCK_EFFECT_CRIT_UP 21 +#define PLUCK_EFFECT_RANDOM_UP2 22 +#define PLUCK_EFFECT_TEMP_ACC_UP 23 -#define ITEM_RETURN_ID 0xFFFF +#define ITEM_RETURN_ID 0xFFFF #endif // POKEPLATINUM_CONSTANTS_ITEMS_H diff --git a/include/constants/map_object.h b/include/constants/map_object.h index 1d9975e860..1d038abf21 100644 --- a/include/constants/map_object.h +++ b/include/constants/map_object.h @@ -1,34 +1,34 @@ #ifndef POKEPLATINUM_CONSTANTS_MAP_OBJECT_H #define POKEPLATINUM_CONSTANTS_MAP_OBJECT_H -//Facing Direction -#define DIR_NORTH 0 -#define DIR_SOUTH 1 -#define DIR_WEST 2 -#define DIR_EAST 3 -#define DIR_NONE -1 +// Facing Direction +#define DIR_NORTH 0 +#define DIR_SOUTH 1 +#define DIR_WEST 2 +#define DIR_EAST 3 +#define DIR_NONE -1 -//Status Flags -#define MAP_OBJ_STATUS_0 (1 << 0) -#define MAP_OBJ_STATUS_START_MOVEMENT (1 << 2) -#define MAP_OBJ_STATUS_END_MOVEMENT (1 << 3) -#define MAP_OBJ_STATUS_4 (1 << 4) -#define MAP_OBJ_STATUS_PAUSE_MOVEMENT (1 << 6) -#define MAP_OBJ_STATUS_LOCK_DIR (1 << 7) -#define MAP_OBJ_STATUS_PAUSE_ANIMATION (1 << 8) -#define MAP_OBJ_STATUS_HIDE (1 << 9) -#define MAP_OBJ_STATUS_10 (1 << 10) -#define MAP_OBJ_STATUS_11 (1 << 11) -#define MAP_OBJ_STATUS_12 (1 << 12) -#define MAP_OBJ_STATUS_13 (1 << 13) -#define MAP_OBJ_STATUS_14 (1 << 14) -#define MAP_OBJ_STATUS_16 (1 << 16) -#define MAP_OBJ_STATUS_17 (1 << 17) -#define MAP_OBJ_STATUS_18 (1 << 18) -#define MAP_OBJ_STATUS_19 (1 << 19) -#define MAP_OBJ_STATUS_HIDE_SHADOW (1 << 20) -#define MAP_OBJ_STATUS_21 (1 << 21) -#define MAP_OBJ_STATUS_22 (1 << 22) -#define MAP_OBJ_STATUS_23 (1 << 23) +// Status Flags +#define MAP_OBJ_STATUS_0 (1 << 0) +#define MAP_OBJ_STATUS_START_MOVEMENT (1 << 2) +#define MAP_OBJ_STATUS_END_MOVEMENT (1 << 3) +#define MAP_OBJ_STATUS_4 (1 << 4) +#define MAP_OBJ_STATUS_PAUSE_MOVEMENT (1 << 6) +#define MAP_OBJ_STATUS_LOCK_DIR (1 << 7) +#define MAP_OBJ_STATUS_PAUSE_ANIMATION (1 << 8) +#define MAP_OBJ_STATUS_HIDE (1 << 9) +#define MAP_OBJ_STATUS_10 (1 << 10) +#define MAP_OBJ_STATUS_11 (1 << 11) +#define MAP_OBJ_STATUS_12 (1 << 12) +#define MAP_OBJ_STATUS_13 (1 << 13) +#define MAP_OBJ_STATUS_14 (1 << 14) +#define MAP_OBJ_STATUS_16 (1 << 16) +#define MAP_OBJ_STATUS_17 (1 << 17) +#define MAP_OBJ_STATUS_18 (1 << 18) +#define MAP_OBJ_STATUS_19 (1 << 19) +#define MAP_OBJ_STATUS_HIDE_SHADOW (1 << 20) +#define MAP_OBJ_STATUS_21 (1 << 21) +#define MAP_OBJ_STATUS_22 (1 << 22) +#define MAP_OBJ_STATUS_23 (1 << 23) #endif diff --git a/include/constants/moves.h b/include/constants/moves.h index 2c5bf46ee0..2b5d0a9331 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -3,8 +3,8 @@ #include "consts/moves.h" -#define LEARNED_MOVES_MAX 4 +#define LEARNED_MOVES_MAX 4 #define NUM_MOVES MOVE_SHADOW_FORCE -#endif //POKEPLATINUM_CONSTANTS_MOVES_H +#endif // POKEPLATINUM_CONSTANTS_MOVES_H diff --git a/include/constants/overworld_weather.h b/include/constants/overworld_weather.h index 6a2f27b645..f1dbf4d7ee 100644 --- a/include/constants/overworld_weather.h +++ b/include/constants/overworld_weather.h @@ -1,26 +1,26 @@ #ifndef POKEPLATINUM_CONSTANTS_OVERWORLD_WEATHER_H #define POKEPLATINUM_CONSTANTS_OVERWORLD_WEATHER_H -#define OVERWORLD_WEATHER_CLEAR 0 -#define OVERWORLD_WEATHER_CLOUDY 1 -#define OVERWORLD_WEATHER_RAINING 2 -#define OVERWORLD_WEATHER_HEAVY_RAIN 3 -#define OVERWORLD_WEATHER_THUNDERSTORM 4 -#define OVERWORLD_WEATHER_SNOWING 5 -#define OVERWORLD_WEATHER_HEAVY_SNOW 6 -#define OVERWORLD_WEATHER_BLIZZARD 7 -#define OVERWORLD_WEATHER_CLEAR_8 8 -#define OVERWORLD_WEATHER_SLOW_ASHFALL 9 -#define OVERWORLD_WEATHER_SANDSTORM 10 -#define OVERWORLD_WEATHER_HAILING 11 -#define OVERWORLD_WEATHER_SPIRITS 12 -#define OVERWORLD_WEATHER_CLEAR_13 13 -#define OVERWORLD_WEATHER_FOG 14 -#define OVERWORLD_WEATHER_DEEP_FOG 15 -#define OVERWORLD_WEATHER_DARK_FLASH 16 +#define OVERWORLD_WEATHER_CLEAR 0 +#define OVERWORLD_WEATHER_CLOUDY 1 +#define OVERWORLD_WEATHER_RAINING 2 +#define OVERWORLD_WEATHER_HEAVY_RAIN 3 +#define OVERWORLD_WEATHER_THUNDERSTORM 4 +#define OVERWORLD_WEATHER_SNOWING 5 +#define OVERWORLD_WEATHER_HEAVY_SNOW 6 +#define OVERWORLD_WEATHER_BLIZZARD 7 +#define OVERWORLD_WEATHER_CLEAR_8 8 +#define OVERWORLD_WEATHER_SLOW_ASHFALL 9 +#define OVERWORLD_WEATHER_SANDSTORM 10 +#define OVERWORLD_WEATHER_HAILING 11 +#define OVERWORLD_WEATHER_SPIRITS 12 +#define OVERWORLD_WEATHER_CLEAR_13 13 +#define OVERWORLD_WEATHER_FOG 14 +#define OVERWORLD_WEATHER_DEEP_FOG 15 +#define OVERWORLD_WEATHER_DARK_FLASH 16 // these are only for the Battle Frontier -#define OVERWORLD_WEATHER_HARSH_SUN 1001 -#define OVERWORLD_WEATHER_TRICK_ROOM 1002 +#define OVERWORLD_WEATHER_HARSH_SUN 1001 +#define OVERWORLD_WEATHER_TRICK_ROOM 1002 -#endif //POKEPLATINUM_CONSTANTS_OVERWORLD_WEATHER_H +#endif // POKEPLATINUM_CONSTANTS_OVERWORLD_WEATHER_H diff --git a/include/constants/palette.h b/include/constants/palette.h index daf1186720..76e45af8e7 100644 --- a/include/constants/palette.h +++ b/include/constants/palette.h @@ -22,21 +22,21 @@ enum PaletteBufferId { PLTTBUF_MAX, }; -#define PLTTBUF_MAIN_BG_F (1<scriptPtr++)) - -void ScriptContext_Init(ScriptContext * ctx, const ScrCmdFunc * cmdTable, u32 cmdTableSize); -BOOL ScriptContext_Start(ScriptContext * ctx, const u8 * ptr); -void ScriptContext_Pause(ScriptContext * ctx, ShouldResumeScriptFunc shouldResume); -void ScriptContext_Stop(ScriptContext * ctx); -void ScriptContext_SetTaskManager(ScriptContext * ctx, TaskManager * taskManager); -BOOL ScriptContext_Run(ScriptContext * ctx); -void ScriptContext_Jump(ScriptContext * ctx, const u8 * ptr); -void ScriptContext_Call(ScriptContext * ctx, const u8 * ptr); -void ScriptContext_Return(ScriptContext * ctx); -u16 ScriptContext_ReadHalfWord(ScriptContext * ctx); -u32 ScriptContext_ReadWord(ScriptContext * ctx); +#define ScriptContext_ReadByte(ctx) (*(ctx->scriptPtr++)) + +void ScriptContext_Init(ScriptContext *ctx, const ScrCmdFunc *cmdTable, u32 cmdTableSize); +BOOL ScriptContext_Start(ScriptContext *ctx, const u8 *ptr); +void ScriptContext_Pause(ScriptContext *ctx, ShouldResumeScriptFunc shouldResume); +void ScriptContext_Stop(ScriptContext *ctx); +void ScriptContext_SetTaskManager(ScriptContext *ctx, TaskManager *taskManager); +BOOL ScriptContext_Run(ScriptContext *ctx); +void ScriptContext_Jump(ScriptContext *ctx, const u8 *ptr); +void ScriptContext_Call(ScriptContext *ctx, const u8 *ptr); +void ScriptContext_Return(ScriptContext *ctx); +u16 ScriptContext_ReadHalfWord(ScriptContext *ctx); +u32 ScriptContext_ReadWord(ScriptContext *ctx); #endif // POKEPLATINUM_FIELD_SCRIPT_CONTEXT_H diff --git a/include/field_system.h b/include/field_system.h index a94a0b5a9e..b0cfa16adf 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -2,21 +2,23 @@ #define POKEPLATINUM_FIELD_SYSTEM_H #include "struct_decls/struct_02018340_decl.h" + #include "field/field_system_decl.h" +#include "overlay025/poketch_system.h" + #include "overlay_manager.h" #include "savedata.h" -#include "overlay025/poketch_system.h" -void sub_0203CD00(FieldSystem * fieldSystem); -void sub_0203CD44(FieldSystem * fieldSystem); -BOOL sub_0203CD4C(FieldSystem * fieldSystem); -BOOL sub_0203CD5C(FieldSystem * fieldSystem); -BOOL sub_0203CD74(FieldSystem * fieldSystem); -void sub_0203CD84(FieldSystem * fieldSystem, const OverlayManagerTemplate * param1, void * param2); +void sub_0203CD00(FieldSystem *fieldSystem); +void sub_0203CD44(FieldSystem *fieldSystem); +BOOL sub_0203CD4C(FieldSystem *fieldSystem); +BOOL sub_0203CD5C(FieldSystem *fieldSystem); +BOOL sub_0203CD74(FieldSystem *fieldSystem); +void sub_0203CD84(FieldSystem *fieldSystem, const OverlayManagerTemplate *param1, void *param2); void sub_0203D128(void); void sub_0203D140(void); -PoketchSystem * FieldSystem_GetPoketchSystem(void); -BGL * sub_0203D170(void * param0); -SaveData * FieldSystem_SaveData(void * param0); +PoketchSystem *FieldSystem_GetPoketchSystem(void); +BGL *sub_0203D170(void *param0); +SaveData *FieldSystem_SaveData(void *param0); #endif // POKEPLATINUM_UNK_0203CC84_H diff --git a/include/flags.h b/include/flags.h index b983b56ac7..4f0046f307 100644 --- a/include/flags.h +++ b/include/flags.h @@ -3,18 +3,18 @@ /** * @brief Gets a bitmask with a single bit set at the specified index. - * - * @param index + * + * @param index * @return A bitmask with a single bit set at the specified index. */ u32 FlagIndex(int index); /** * @brief Gets the index of the lowest set bit of the given number - * - * @param num - * @return The index of the lowest set bit of the given number + * + * @param num + * @return The index of the lowest set bit of the given number */ int LowestBit(u32 num); -#endif // POKEPLATINUM_FLAGS_H \ No newline at end of file +#endif // POKEPLATINUM_FLAGS_H diff --git a/include/functypes/funcptr_02007C34.h b/include/functypes/funcptr_02007C34.h index ffe7cf59a8..68c09cd78d 100644 --- a/include/functypes/funcptr_02007C34.h +++ b/include/functypes/funcptr_02007C34.h @@ -4,6 +4,6 @@ #include "struct_decls/sprite_decl.h" #include "struct_defs/struct_02007C7C_sub1.h" -typedef void (UnkFuncPtr_02007C34)(Sprite *, UnkStruct_02007C7C_sub1 *); +typedef void(UnkFuncPtr_02007C34)(Sprite *, UnkStruct_02007C7C_sub1 *); #endif // POKEPLATINUM_FUNCPTR_02007C34_H diff --git a/include/functypes/funcptr_0200F634.h b/include/functypes/funcptr_0200F634.h index 7a07e82cb3..36a6b41237 100644 --- a/include/functypes/funcptr_0200F634.h +++ b/include/functypes/funcptr_0200F634.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_0200F634_H #define POKEPLATINUM_FUNCPTR_0200F634_H -typedef void (* UnkFuncPtr_0200F634)(void *); +typedef void (*UnkFuncPtr_0200F634)(void *); #endif // POKEPLATINUM_FUNCPTR_0200F634_H diff --git a/include/functypes/funcptr_0200F6D8.h b/include/functypes/funcptr_0200F6D8.h index 6651ef379a..adb3cb40d6 100644 --- a/include/functypes/funcptr_0200F6D8.h +++ b/include/functypes/funcptr_0200F6D8.h @@ -3,6 +3,6 @@ #include "struct_defs/struct_0200F7A0.h" -typedef BOOL (* UnkFuncPtr_0200F6D8)(UnkStruct_0200F7A0 *); +typedef BOOL (*UnkFuncPtr_0200F6D8)(UnkStruct_0200F7A0 *); #endif // POKEPLATINUM_FUNCPTR_0200F6D8_H diff --git a/include/functypes/funcptr_02014014.h b/include/functypes/funcptr_02014014.h index 4fa38891e9..630baf09f7 100644 --- a/include/functypes/funcptr_02014014.h +++ b/include/functypes/funcptr_02014014.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_02014014_H #define POKEPLATINUM_FUNCPTR_02014014_H -typedef u32 (* UnkFuncPtr_02014014)(u32, BOOL); +typedef u32 (*UnkFuncPtr_02014014)(u32, BOOL); #endif // POKEPLATINUM_FUNCPTR_02014014_H diff --git a/include/functypes/funcptr_020146F4.h b/include/functypes/funcptr_020146F4.h index a7c5482a3b..b0ad1f17d8 100644 --- a/include/functypes/funcptr_020146F4.h +++ b/include/functypes/funcptr_020146F4.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_FUNCPTR_020146F4_H #define POKEPLATINUM_FUNCPTR_020146F4_H - #include "spl.h" -typedef void (* UnkFuncPtr_020146F4)(UnkSPLStruct6 *); +typedef void (*UnkFuncPtr_020146F4)(UnkSPLStruct6 *); #endif // POKEPLATINUM_FUNCPTR_020146F4_H diff --git a/include/functypes/funcptr_0201D834.h b/include/functypes/funcptr_0201D834.h index 3aebf1386a..baa956ca99 100644 --- a/include/functypes/funcptr_0201D834.h +++ b/include/functypes/funcptr_0201D834.h @@ -3,6 +3,6 @@ #include "struct_defs/struct_0201D738.h" -typedef BOOL (* UnkFuncPtr_0201D834)(UnkStruct_0201D738 *, u16); +typedef BOOL (*UnkFuncPtr_0201D834)(UnkStruct_0201D738 *, u16); #endif // POKEPLATINUM_FUNCPTR_0201D834_H diff --git a/include/functypes/funcptr_02021444.h b/include/functypes/funcptr_02021444.h index 2acfba51f5..8894757a7f 100644 --- a/include/functypes/funcptr_02021444.h +++ b/include/functypes/funcptr_02021444.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020216E0_decl.h" -typedef void (* UnkFuncPtr_02021444)(UnkStruct_020216E0 *, void *); +typedef void (*UnkFuncPtr_02021444)(UnkStruct_020216E0 *, void *); #endif // POKEPLATINUM_FUNCPTR_02021444_H diff --git a/include/functypes/funcptr_02023FCC.h b/include/functypes/funcptr_02023FCC.h index 208ae63b7c..84b92b8d3c 100644 --- a/include/functypes/funcptr_02023FCC.h +++ b/include/functypes/funcptr_02023FCC.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_02023FCC_H #define POKEPLATINUM_FUNCPTR_02023FCC_H -typedef void (* UnkFuncPtr_02023FCC)(u32, u32, void *); +typedef void (*UnkFuncPtr_02023FCC)(u32, u32, void *); #endif // POKEPLATINUM_FUNCPTR_02023FCC_H diff --git a/include/functypes/funcptr_02024220.h b/include/functypes/funcptr_02024220.h index 087b8bccee..525841f7f4 100644 --- a/include/functypes/funcptr_02024220.h +++ b/include/functypes/funcptr_02024220.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_02024220_H #define POKEPLATINUM_FUNCPTR_02024220_H -typedef void (* UnkFuncPtr_02024220)(void); +typedef void (*UnkFuncPtr_02024220)(void); #endif // POKEPLATINUM_FUNCPTR_02024220_H diff --git a/include/functypes/funcptr_020312B8.h b/include/functypes/funcptr_020312B8.h index d64da38cde..b7e4225795 100644 --- a/include/functypes/funcptr_020312B8.h +++ b/include/functypes/funcptr_020312B8.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_FUNCPTR_020312B8_H #define POKEPLATINUM_FUNCPTR_020312B8_H - #include -typedef void (* UnkFuncPtr_020312B8)(WMBssDesc *); +typedef void (*UnkFuncPtr_020312B8)(WMBssDesc *); #endif // POKEPLATINUM_FUNCPTR_020312B8_H diff --git a/include/functypes/funcptr_02031E6C.h b/include/functypes/funcptr_02031E6C.h index 7f98352062..3b0bda5e11 100644 --- a/include/functypes/funcptr_02031E6C.h +++ b/include/functypes/funcptr_02031E6C.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_02031E6C_H #define POKEPLATINUM_FUNCPTR_02031E6C_H -typedef void (* UnkFuncPtr_02031E6C)(u16, u16 *, u16); +typedef void (*UnkFuncPtr_02031E6C)(u16, u16 *, u16); #endif // POKEPLATINUM_FUNCPTR_02031E6C_H diff --git a/include/functypes/funcptr_02031E9C.h b/include/functypes/funcptr_02031E9C.h index 37560d9a56..e8e514fe0a 100644 --- a/include/functypes/funcptr_02031E9C.h +++ b/include/functypes/funcptr_02031E9C.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_02031E9C_H #define POKEPLATINUM_FUNCPTR_02031E9C_H -typedef void (* UnkFuncPtr_02031E9C)(BOOL); +typedef void (*UnkFuncPtr_02031E9C)(BOOL); #endif // POKEPLATINUM_FUNCPTR_02031E9C_H diff --git a/include/functypes/funcptr_020320FC.h b/include/functypes/funcptr_020320FC.h index 262c5abd2c..d3769b04ce 100644 --- a/include/functypes/funcptr_020320FC.h +++ b/include/functypes/funcptr_020320FC.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_020320FC_H #define POKEPLATINUM_FUNCPTR_020320FC_H -typedef void (* UnkFuncPtr_020320FC)(u32, int); +typedef void (*UnkFuncPtr_020320FC)(u32, int); #endif // POKEPLATINUM_FUNCPTR_020320FC_H diff --git a/include/functypes/funcptr_02032110.h b/include/functypes/funcptr_02032110.h index 6b4763fc94..63e5a3d28c 100644 --- a/include/functypes/funcptr_02032110.h +++ b/include/functypes/funcptr_02032110.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_02032110_H #define POKEPLATINUM_FUNCPTR_02032110_H -typedef void (* UnkFuncPtr_02032110)(int); +typedef void (*UnkFuncPtr_02032110)(int); #endif // POKEPLATINUM_FUNCPTR_02032110_H diff --git a/include/functypes/funcptr_02032868.h b/include/functypes/funcptr_02032868.h index e20e0d2596..84668d8dd0 100644 --- a/include/functypes/funcptr_02032868.h +++ b/include/functypes/funcptr_02032868.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_02032868_H #define POKEPLATINUM_FUNCPTR_02032868_H -typedef int (* UnkFuncPtr_02032868)(void); +typedef int (*UnkFuncPtr_02032868)(void); #endif // POKEPLATINUM_FUNCPTR_02032868_H diff --git a/include/functypes/funcptr_0203290C.h b/include/functypes/funcptr_0203290C.h index 0b46509a10..568141fa3e 100644 --- a/include/functypes/funcptr_0203290C.h +++ b/include/functypes/funcptr_0203290C.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_0203290C_H #define POKEPLATINUM_FUNCPTR_0203290C_H -typedef u8 *(* UnkFuncPtr_0203290C)(int, void *, int); +typedef u8 *(*UnkFuncPtr_0203290C)(int, void *, int); #endif // POKEPLATINUM_FUNCPTR_0203290C_H diff --git a/include/functypes/funcptr_0203B7C0.h b/include/functypes/funcptr_0203B7C0.h index eee0f150b8..8e236796da 100644 --- a/include/functypes/funcptr_0203B7C0.h +++ b/include/functypes/funcptr_0203B7C0.h @@ -4,6 +4,6 @@ #include "struct_decls/struct_02070950_decl.h" #include "struct_decls/struct_020709CC_decl.h" -typedef void (* UnkFuncPtr_0203B7C0)(UnkStruct_020709CC *, const UnkStruct_02070950 *); +typedef void (*UnkFuncPtr_0203B7C0)(UnkStruct_020709CC *, const UnkStruct_02070950 *); #endif // POKEPLATINUM_FUNCPTR_0203B7C0_H diff --git a/include/functypes/funcptr_0203BC5C.h b/include/functypes/funcptr_0203BC5C.h index af8d78d017..86bdcfa384 100644 --- a/include/functypes/funcptr_0203BC5C.h +++ b/include/functypes/funcptr_0203BC5C.h @@ -4,6 +4,6 @@ #include "struct_defs/struct_020684D0.h" #include "struct_defs/struct_02068630.h" -typedef void (* UnkFuncPtr_0203BC5C)(UnkStruct_02068630 *, const UnkStruct_020684D0 *); +typedef void (*UnkFuncPtr_0203BC5C)(UnkStruct_02068630 *, const UnkStruct_020684D0 *); #endif // POKEPLATINUM_FUNCPTR_0203BC5C_H diff --git a/include/functypes/funcptr_02050904.h b/include/functypes/funcptr_02050904.h index bf45e88da7..847c25bfec 100644 --- a/include/functypes/funcptr_02050904.h +++ b/include/functypes/funcptr_02050904.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -typedef BOOL (* FieldTask)(TaskManager *); +typedef BOOL (*FieldTask)(TaskManager *); #endif // POKEPLATINUM_FUNCPTR_02050904_H diff --git a/include/functypes/funcptr_020598EC.h b/include/functypes/funcptr_020598EC.h index 649c0ab92f..656e7a13c0 100644 --- a/include/functypes/funcptr_020598EC.h +++ b/include/functypes/funcptr_020598EC.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_020598EC_H #define POKEPLATINUM_FUNCPTR_020598EC_H -typedef void (* FieldCommTask)(void); +typedef void (*FieldCommTask)(void); #endif // POKEPLATINUM_FUNCPTR_020598EC_H diff --git a/include/functypes/funcptr_0205AB10.h b/include/functypes/funcptr_0205AB10.h index dd027bd9a4..387c3cb774 100644 --- a/include/functypes/funcptr_0205AB10.h +++ b/include/functypes/funcptr_0205AB10.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_party_decl.h" -typedef void (UnkFuncPtr_0205AB10)(BOOL, const Party *); +typedef void(UnkFuncPtr_0205AB10)(BOOL, const Party *); #endif // POKEPLATINUM_FUNCPTR_0205AB10_H diff --git a/include/functypes/funcptr_02069238.h b/include/functypes/funcptr_02069238.h index 3978b8fda0..4abaf1a0df 100644 --- a/include/functypes/funcptr_02069238.h +++ b/include/functypes/funcptr_02069238.h @@ -3,6 +3,6 @@ #include "struct_defs/struct_020684D0.h" -typedef u32 (* UnkFuncPtr_02069238)(const UnkStruct_020684D0 *); +typedef u32 (*UnkFuncPtr_02069238)(const UnkStruct_020684D0 *); #endif // POKEPLATINUM_FUNCPTR_02069238_H diff --git a/include/functypes/funcptr_02071330.h b/include/functypes/funcptr_02071330.h index cd392ac9bf..61cf0d83d0 100644 --- a/include/functypes/funcptr_02071330.h +++ b/include/functypes/funcptr_02071330.h @@ -3,6 +3,6 @@ #include "overlay101/struct_ov101_021D5D90_decl.h" -typedef int (* UnkFuncPtr_02071330)(UnkStruct_ov101_021D5D90 *, void *); +typedef int (*UnkFuncPtr_02071330)(UnkStruct_ov101_021D5D90 *, void *); #endif // POKEPLATINUM_FUNCPTR_02071330_H diff --git a/include/functypes/funcptr_02071330_1.h b/include/functypes/funcptr_02071330_1.h index eea2b662e2..24aa91f9fd 100644 --- a/include/functypes/funcptr_02071330_1.h +++ b/include/functypes/funcptr_02071330_1.h @@ -3,6 +3,6 @@ #include "overlay101/struct_ov101_021D5D90_decl.h" -typedef void (* UnkFuncPtr_02071330_1)(UnkStruct_ov101_021D5D90 *, void *); +typedef void (*UnkFuncPtr_02071330_1)(UnkStruct_ov101_021D5D90 *, void *); #endif // POKEPLATINUM_FUNCPTR_02071330_1_H diff --git a/include/functypes/funcptr_02071330_2.h b/include/functypes/funcptr_02071330_2.h index 96a6bdf6fe..1d07b21dcc 100644 --- a/include/functypes/funcptr_02071330_2.h +++ b/include/functypes/funcptr_02071330_2.h @@ -3,6 +3,6 @@ #include "overlay101/struct_ov101_021D5D90_decl.h" -typedef void (* UnkFuncPtr_02071330_2)(UnkStruct_ov101_021D5D90 *, void *); +typedef void (*UnkFuncPtr_02071330_2)(UnkStruct_ov101_021D5D90 *, void *); #endif // POKEPLATINUM_FUNCPTR_02071330_2_H diff --git a/include/functypes/funcptr_02071330_3.h b/include/functypes/funcptr_02071330_3.h index 0ecf7cb637..88e9ef6df5 100644 --- a/include/functypes/funcptr_02071330_3.h +++ b/include/functypes/funcptr_02071330_3.h @@ -3,6 +3,6 @@ #include "overlay101/struct_ov101_021D5D90_decl.h" -typedef void (* UnkFuncPtr_02071330_3)(UnkStruct_ov101_021D5D90 *, void *); +typedef void (*UnkFuncPtr_02071330_3)(UnkStruct_ov101_021D5D90 *, void *); #endif // POKEPLATINUM_FUNCPTR_02071330_3_H diff --git a/include/functypes/funcptr_02071330_4.h b/include/functypes/funcptr_02071330_4.h index fc036d9135..4a392390e1 100644 --- a/include/functypes/funcptr_02071330_4.h +++ b/include/functypes/funcptr_02071330_4.h @@ -3,6 +3,6 @@ #include "overlay101/struct_ov101_021D5D90_decl.h" -typedef void (* UnkFuncPtr_02071330_4)(UnkStruct_ov101_021D5D90 *, void *); +typedef void (*UnkFuncPtr_02071330_4)(UnkStruct_ov101_021D5D90 *, void *); #endif // POKEPLATINUM_FUNCPTR_02071330_4_H diff --git a/include/functypes/funcptr_02071330_5.h b/include/functypes/funcptr_02071330_5.h index 53493ebae0..59270106b7 100644 --- a/include/functypes/funcptr_02071330_5.h +++ b/include/functypes/funcptr_02071330_5.h @@ -3,6 +3,6 @@ #include "overlay101/struct_ov101_021D5D90_decl.h" -typedef void (* UnkFuncPtr_02071330_5)(UnkStruct_ov101_021D5D90 *, void *); +typedef void (*UnkFuncPtr_02071330_5)(UnkStruct_ov101_021D5D90 *, void *); #endif // POKEPLATINUM_FUNCPTR_02071330_5_H diff --git a/include/functypes/funcptr_0207E634.h b/include/functypes/funcptr_0207E634.h index 50976fccf6..c79629129a 100644 --- a/include/functypes/funcptr_0207E634.h +++ b/include/functypes/funcptr_0207E634.h @@ -3,6 +3,6 @@ #include "struct_defs/struct_0207F248.h" -typedef void (* UnkFuncPtr_0207E634)(GameWindowLayout *, int *); +typedef void (*UnkFuncPtr_0207E634)(GameWindowLayout *, int *); #endif // POKEPLATINUM_FUNCPTR_0207E634_H diff --git a/include/functypes/funcptr_0207F248.h b/include/functypes/funcptr_0207F248.h index b314df85ec..a673e54116 100644 --- a/include/functypes/funcptr_0207F248.h +++ b/include/functypes/funcptr_0207F248.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_0207F248_H #define POKEPLATINUM_FUNCPTR_0207F248_H -typedef int (* GenericFunctionPtr)(void *); +typedef int (*GenericFunctionPtr)(void *); #endif // POKEPLATINUM_FUNCPTR_0207F248_H diff --git a/include/functypes/funcptr_02084808.h b/include/functypes/funcptr_02084808.h index 623d88d37f..37517321fd 100644 --- a/include/functypes/funcptr_02084808.h +++ b/include/functypes/funcptr_02084808.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02070950_decl.h" -typedef int (* UnkFuncPtr_02084808)(const UnkStruct_02070950 *); +typedef int (*UnkFuncPtr_02084808)(const UnkStruct_02070950 *); #endif // POKEPLATINUM_FUNCPTR_02084808_H diff --git a/include/functypes/funcptr_0209B988.h b/include/functypes/funcptr_0209B988.h index 99695a0969..957dafe318 100644 --- a/include/functypes/funcptr_0209B988.h +++ b/include/functypes/funcptr_0209B988.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_0209B988_H #define POKEPLATINUM_FUNCPTR_0209B988_H -typedef void (* UnkFuncPtr_0209B988)(void *); +typedef void (*UnkFuncPtr_0209B988)(void *); #endif // POKEPLATINUM_FUNCPTR_0209B988_H diff --git a/include/functypes/funcptr_020EC560.h b/include/functypes/funcptr_020EC560.h index 946864e9d1..0e9707197a 100644 --- a/include/functypes/funcptr_020EC560.h +++ b/include/functypes/funcptr_020EC560.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -typedef BOOL (* UnkFuncPtr_020EC560)(TaskManager *); +typedef BOOL (*UnkFuncPtr_020EC560)(TaskManager *); #endif // POKEPLATINUM_FUNCPTR_020EC560_H diff --git a/include/functypes/funcptr_020EC57C.h b/include/functypes/funcptr_020EC57C.h index 48567ab9af..6904288d9e 100644 --- a/include/functypes/funcptr_020EC57C.h +++ b/include/functypes/funcptr_020EC57C.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -typedef void (* UnkFuncPtr_020EC57C)(FieldSystem *); +typedef void (*UnkFuncPtr_020EC57C)(FieldSystem *); #endif // POKEPLATINUM_FUNCPTR_020EC57C_H diff --git a/include/functypes/funcptr_020EDF0C.h b/include/functypes/funcptr_020EDF0C.h index dd2eb6a460..fb3184fe38 100644 --- a/include/functypes/funcptr_020EDF0C.h +++ b/include/functypes/funcptr_020EDF0C.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_020EDF0C)(MapObject *); +typedef void (*UnkFuncPtr_020EDF0C)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_020EDF0C_H diff --git a/include/functypes/funcptr_020EDF0C_1.h b/include/functypes/funcptr_020EDF0C_1.h index 5d04bf1efc..8ec3e18e59 100644 --- a/include/functypes/funcptr_020EDF0C_1.h +++ b/include/functypes/funcptr_020EDF0C_1.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_020EDF0C_1)(MapObject *); +typedef void (*UnkFuncPtr_020EDF0C_1)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_020EDF0C_1_H diff --git a/include/functypes/funcptr_020EDF0C_2.h b/include/functypes/funcptr_020EDF0C_2.h index b75c916c91..3f1a02d616 100644 --- a/include/functypes/funcptr_020EDF0C_2.h +++ b/include/functypes/funcptr_020EDF0C_2.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_020EDF0C_2)(MapObject *); +typedef void (*UnkFuncPtr_020EDF0C_2)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_020EDF0C_2_H diff --git a/include/functypes/funcptr_020EDF0C_3.h b/include/functypes/funcptr_020EDF0C_3.h index 4e36f5a814..0396b7c1dc 100644 --- a/include/functypes/funcptr_020EDF0C_3.h +++ b/include/functypes/funcptr_020EDF0C_3.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_020EDF0C_3)(MapObject *); +typedef void (*UnkFuncPtr_020EDF0C_3)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_020EDF0C_3_H diff --git a/include/functypes/funcptr_020EF718.h b/include/functypes/funcptr_020EF718.h index aa449463fd..4b51061e82 100644 --- a/include/functypes/funcptr_020EF718.h +++ b/include/functypes/funcptr_020EF718.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -typedef void (* UnkFuncPtr_020EF718)(FieldSystem *); +typedef void (*UnkFuncPtr_020EF718)(FieldSystem *); #endif // POKEPLATINUM_FUNCPTR_020EF718_H diff --git a/include/functypes/funcptr_020EF744.h b/include/functypes/funcptr_020EF744.h index 8b393f430a..bbe6b66c41 100644 --- a/include/functypes/funcptr_020EF744.h +++ b/include/functypes/funcptr_020EF744.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -typedef void (* UnkFuncPtr_020EF744)(FieldSystem *); +typedef void (*UnkFuncPtr_020EF744)(FieldSystem *); #endif // POKEPLATINUM_FUNCPTR_020EF744_H diff --git a/include/functypes/funcptr_020EF770.h b/include/functypes/funcptr_020EF770.h index 183c03414a..bcda0c0f27 100644 --- a/include/functypes/funcptr_020EF770.h +++ b/include/functypes/funcptr_020EF770.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -typedef BOOL (* UnkFuncPtr_020EF770)(FieldSystem *, const int, const int, const fx32, BOOL *); +typedef BOOL (*UnkFuncPtr_020EF770)(FieldSystem *, const int, const int, const fx32, BOOL *); #endif // POKEPLATINUM_FUNCPTR_020EF770_H diff --git a/include/functypes/funcptr_020F8E60.h b/include/functypes/funcptr_020F8E60.h index e0bd907dee..e68a92510f 100644 --- a/include/functypes/funcptr_020F8E60.h +++ b/include/functypes/funcptr_020F8E60.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_020F8E60_H #define POKEPLATINUM_FUNCPTR_020F8E60_H -typedef void (* UnkFuncPtr_020F8E60)(int, int, void *, void *); +typedef void (*UnkFuncPtr_020F8E60)(int, int, void *, void *); #endif // POKEPLATINUM_FUNCPTR_020F8E60_H diff --git a/include/functypes/struct_0207F248_1.h b/include/functypes/struct_0207F248_1.h index 32015e768c..b21a43dd20 100644 --- a/include/functypes/struct_0207F248_1.h +++ b/include/functypes/struct_0207F248_1.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_0207F248_1_H #define POKEPLATINUM_STRUCT_0207F248_1_H -typedef int (* GameWindowLayout_1)(void *); +typedef int (*GameWindowLayout_1)(void *); #endif // POKEPLATINUM_STRUCT_0207F248_1_H diff --git a/include/game_options.h b/include/game_options.h index 54870379b0..39ae3ec9df 100644 --- a/include/game_options.h +++ b/include/game_options.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_GAME_OPTIONS_H #define POKEPLATINUM_GAME_OPTIONS_H -#include "savedata.h" #include "constants/game_options.h" +#include "savedata.h" + typedef struct Options { u16 textSpeed : 4; u16 soundMode : 2; @@ -14,7 +15,7 @@ typedef struct Options { u16 : 1; } Options; -Options* Options_New(u32 heapID); +Options *Options_New(u32 heapID); void Options_Copy(const Options *src, Options *dest); void Options_Init(Options *options); void Options_SetSystemButtonMode(SaveData *saveData, enum OptionsButtonMode mode); diff --git a/include/global/assert.h b/include/global/assert.h index fdde9a625f..0c123edff7 100644 --- a/include/global/assert.h +++ b/include/global/assert.h @@ -11,7 +11,7 @@ #define GF_ASSERT(expr) ((expr) ? (void)0 : ErrorHandling_AssertFail()) #else #define GF_ASSERT(...) ((void)0) -#endif //PM_KEEP_ASSERTS +#endif // PM_KEEP_ASSERTS /* * void ErrorHandling_AssertFail(void) @@ -22,4 +22,4 @@ */ void ErrorHandling_AssertFail(void); -#endif //POKEPLATINUM_ASSERT_H +#endif // POKEPLATINUM_ASSERT_H diff --git a/include/global/pm_version.h b/include/global/pm_version.h index 4309679916..0558ffa852 100644 --- a/include/global/pm_version.h +++ b/include/global/pm_version.h @@ -1,25 +1,25 @@ #ifndef POKEPLATINUM_PM_VERSION_H #define POKEPLATINUM_PM_VERSION_H -#define SAPPHIRE 1 -#define RUBY 2 -#define EMERALD 3 -#define FIRERED 4 -#define LEAFGREEN 5 -#define HEARTGOLD 7 +#define SAPPHIRE 1 +#define RUBY 2 +#define EMERALD 3 +#define FIRERED 4 +#define LEAFGREEN 5 +#define HEARTGOLD 7 #define SOULSILVER 8 -#define DIAMOND 10 -#define PEARL 11 -#define PLATINUM 12 -#define COLOSSEUM 15 +#define DIAMOND 10 +#define PEARL 11 +#define PLATINUM 12 +#define COLOSSEUM 15 #define JAPANESE 1 -#define ENGLISH 2 -#define FRENCH 3 -#define ITALIAN 4 -#define GERMAN 5 -#define SPANISH 7 -#define KOREAN 8 +#define ENGLISH 2 +#define FRENCH 3 +#define ITALIAN 4 +#define GERMAN 5 +#define SPANISH 7 +#define KOREAN 8 extern const u8 Unk_020E4C40; extern const u8 Unk_020E4C44; diff --git a/include/gx_layers.h b/include/gx_layers.h index c1a5ab1a98..f602e06f24 100644 --- a/include/gx_layers.h +++ b/include/gx_layers.h @@ -3,7 +3,7 @@ #include "struct_defs/struct_02099F80.h" -void GXLayers_SetBanks(const UnkStruct_02099F80 * banks); +void GXLayers_SetBanks(const UnkStruct_02099F80 *banks); void GXLayers_DisableEngineALayers(void); void GXLayers_EngineAToggleLayers(u8 layerMask, u8 enable); void GXLayers_EngineASetLayers(int layers); @@ -12,6 +12,6 @@ void GXLayers_EngineBToggleLayers(u8 layerMask, u8 enable); void GXLayers_EngineBSetLayers(int layers); void GXLayers_TurnBothDispOn(void); void GXLayers_SwapDisplay(void); -int GXLayers_EngineAGetLayers(void); +int GXLayers_EngineAGetLayers(void); #endif // POKEPLATINUM_GX_LAYERS_H diff --git a/include/heap.h b/include/heap.h index 5b9d7fdaf5..0496e52f72 100644 --- a/include/heap.h +++ b/include/heap.h @@ -1,21 +1,22 @@ #ifndef POKEPLATINUM_UNK_02017E74_H #define POKEPLATINUM_UNK_02017E74_H -#include "struct_defs/struct_02017E74.h" +#include + #include "constants/heap.h" -#include +#include "struct_defs/struct_02017E74.h" BOOL Heap_Create(u32 parent, u32 child, u32 size); BOOL Heap_CreateAtEnd(u32 parent, u32 child, u32 size); void Heap_Destroy(u32 heapID); -void * Heap_AllocFromHeap(u32 heapID, u32 size); -void * Heap_AllocFromHeapAtEnd(u32 heapID, u32 size); -void Heap_FreeToHeap(void * ptr); -void Heap_FreeToHeapExplicit(u32 heapID, void * ptr); +void *Heap_AllocFromHeap(u32 heapID, u32 size); +void *Heap_AllocFromHeapAtEnd(u32 heapID, u32 size); +void Heap_FreeToHeap(void *ptr); +void Heap_FreeToHeapExplicit(u32 heapID, void *ptr); u32 Heap_FndGetTotalFreeSizeForExpHeap(u32 heapID); -void Heap_FndInitAllocatorForExpHeap(NNSFndAllocator * pAllocator, u32 heapID, int alignment); -void Heap_ReallocFromHeap(void * ptr, u32 newSize); +void Heap_FndInitAllocatorForExpHeap(NNSFndAllocator *pAllocator, u32 heapID, int alignment); +void Heap_ReallocFromHeap(void *ptr, u32 newSize); BOOL GF_heap_c_dummy_return_true(u32 heapID); #endif // POKEPLATINUM_UNK_02017E74_H diff --git a/include/inlines.h b/include/inlines.h index e3c25886bb..013fe2602c 100644 --- a/include/inlines.h +++ b/include/inlines.h @@ -4,33 +4,33 @@ #include #include "struct_decls/struct_02006C24_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_0203A790_decl.h" -#include "vars_flags.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" -#include "struct_defs/struct_02049FA8.h" #include "overlay061/struct_ov61_0222C3B0.h" #include "assert.h" +#include "field_overworld_state.h" +#include "field_script_context.h" +#include "heap.h" +#include "map_header.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" -#include "sys_task.h" -#include "heap.h" #include "unk_0201D15C.h" -#include "map_header.h" -#include "field_overworld_state.h" -#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_0206A8DC.h" +#include "vars_flags.h" static inline void inline_ov61_0222C3B0_sub_1(UnkStruct_ov61_0222C3B0 *); static inline void inline_ov61_0222C3B0_sub(SysTask *, void *); -static inline void inline_ov61_0222C3B0 (UnkStruct_ov61_0222C3B0 * param0, NARC * param1, int param2, int param3) +static inline void inline_ov61_0222C3B0(UnkStruct_ov61_0222C3B0 *param0, NARC *param1, int param2, int param3) { - NNSG2dPaletteData * v0; - void * v1; + NNSG2dPaletteData *v0; + void *v1; MI_CpuClear8(param0, sizeof(UnkStruct_ov61_0222C3B0)); @@ -45,7 +45,7 @@ static inline void inline_ov61_0222C3B0 (UnkStruct_ov61_0222C3B0 * param0, NARC param0->unk_00 = SysTask_ExecuteOnVBlank(inline_ov61_0222C3B0_sub, param0, 20); } -static inline void inline_ov61_0222C160 (UnkStruct_ov61_0222C3B0 * param0) +static inline void inline_ov61_0222C160(UnkStruct_ov61_0222C3B0 *param0) { if (param0->unk_00 != NULL) { SysTask_Done(param0->unk_00); @@ -54,22 +54,22 @@ static inline void inline_ov61_0222C160 (UnkStruct_ov61_0222C3B0 * param0) } } -static inline void inline_ov61_0222C0F8 (UnkStruct_ov61_0222C3B0 * param0) +static inline void inline_ov61_0222C0F8(UnkStruct_ov61_0222C3B0 *param0) { return; } -static inline void inline_ov61_0222C1FC (UnkStruct_ov61_0222C3B0 * param0) +static inline void inline_ov61_0222C1FC(UnkStruct_ov61_0222C3B0 *param0) { return; } -static inline void inline_ov96_0223BDEC (UnkStruct_ov61_0222C3B0 * param0, BOOL param1) +static inline void inline_ov96_0223BDEC(UnkStruct_ov61_0222C3B0 *param0, BOOL param1) { param0->unk_04 = param1; } -static inline void inline_ov61_0222C3B0_sub_1 (UnkStruct_ov61_0222C3B0 * param0) +static inline void inline_ov61_0222C3B0_sub_1(UnkStruct_ov61_0222C3B0 *param0) { int v0, v1, v2, v3, v4, v5; v1 = 0; @@ -97,9 +97,9 @@ static inline void inline_ov61_0222C3B0_sub_1 (UnkStruct_ov61_0222C3B0 * param0) DC_FlushRange(param0->unk_88, (((16 << 8) / 0x300 + 2) * (4 - 1)) * 16 * sizeof(u16)); } -static inline void inline_ov61_0222C3B0_sub (SysTask * param0, void * param1) +static inline void inline_ov61_0222C3B0_sub(SysTask *param0, void *param1) { - UnkStruct_ov61_0222C3B0 * v0 = param1; + UnkStruct_ov61_0222C3B0 *v0 = param1; if (v0->unk_04 == 0) { return; @@ -129,10 +129,10 @@ static inline void inline_ov61_0222C3B0_sub (SysTask * param0, void * param1) } } -static inline void inline_ov47_0225621C_sub (FieldSystem * fieldSystem, int * param1, int * param2) +static inline void inline_ov47_0225621C_sub(FieldSystem *fieldSystem, int *param1, int *param2) { - FieldOverworldState * v0 = SaveData_GetFieldOverworldState(fieldSystem->saveData); - Location * location = sub_0203A72C(v0); + FieldOverworldState *v0 = SaveData_GetFieldOverworldState(fieldSystem->saveData); + Location *location = sub_0203A72C(v0); if (MapHeader_IsOnMainMatrix(fieldSystem->location->mapId)) { *param1 = fieldSystem->location->x; @@ -143,14 +143,14 @@ static inline void inline_ov47_0225621C_sub (FieldSystem * fieldSystem, int * pa } } -static inline void inline_ov47_0225621C (FieldSystem * fieldSystem, int * param1, int * param2) +static inline void inline_ov47_0225621C(FieldSystem *fieldSystem, int *param1, int *param2) { inline_ov47_0225621C_sub(fieldSystem, param1, param2); *param1 /= 32; *param2 /= 32; } -static inline void Location_Set (Location * location, int mapId, int param2, int param3, int param4, int param5) +static inline void Location_Set(Location *location, int mapId, int param2, int param3, int param4, int param5) { location->mapId = mapId; location->unk_04 = param2; @@ -159,52 +159,52 @@ static inline void Location_Set (Location * location, int mapId, int param2, int location->unk_10 = param5; } -static inline u16 * ScriptContext_GetVarPointer (ScriptContext * ctx) +static inline u16 *ScriptContext_GetVarPointer(ScriptContext *ctx) { return FieldSystem_GetVarPointer(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx)); } -static inline u16 ScriptContext_GetVar (ScriptContext * ctx) +static inline u16 ScriptContext_GetVar(ScriptContext *ctx) { return sub_0203F150(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx)); } -static inline void inline_0204E650 (VarsFlags * param0) +static inline void inline_0204E650(VarsFlags *param0) { sub_0206AEAC(param0, 1); } -static inline void inline_0204E650_1 (VarsFlags * param0) +static inline void inline_0204E650_1(VarsFlags *param0) { sub_0206AEAC(param0, 0); } -static inline BOOL inline_0204E650_2 (VarsFlags * param0) +static inline BOOL inline_0204E650_2(VarsFlags *param0) { return sub_0206AEAC(param0, 2); } -static inline void inline_02044528 (VarsFlags * param0) +static inline void inline_02044528(VarsFlags *param0) { sub_0206AF2C(param0, 1); } -static inline BOOL inline_020535E8 (VarsFlags * param0) +static inline BOOL inline_020535E8(VarsFlags *param0) { return sub_0206AF2C(param0, 2); } -static inline void inline_0203A8E8 (VarsFlags * param0, u32 param1) +static inline void inline_0203A8E8(VarsFlags *param0, u32 param1) { sub_0206AF3C(param0, 1, param1); } -static inline BOOL inline_0208BE68 (VarsFlags * param0, u32 param1) +static inline BOOL inline_0208BE68(VarsFlags *param0, u32 param1) { return sub_0206AF3C(param0, 2, param1); } -inline u16 inline_020564D0 (const u16 param0) +inline u16 inline_020564D0(const u16 param0) { GF_ASSERT(param0 != 0); @@ -216,42 +216,42 @@ inline u16 inline_020564D0 (const u16 param0) v0 = (0xffff / param0) + 1; v1 = LCRNG_Next() / v0; - GF_ASSERT((v1 < param0)); + GF_ASSERT(v1 < param0); return v1; } } -static inline u32 inline_0202D4B0_sub1 (u32 param0, u32 param1, u32 param2, int param3) +static inline u32 inline_0202D4B0_sub1(u32 param0, u32 param1, u32 param2, int param3) { return (param0 << 24) | ((param1 & 0xff) << 16) | ((param2 & 0xff) << 8) | param3; } -static inline u32 inline_0202D4B0 (RTCDate * param0) +static inline u32 inline_0202D4B0(RTCDate *param0) { return inline_0202D4B0_sub1(param0->year, param0->month, param0->day, param0->week); } -static inline u8 inline_0202D558_sub1 (u32 param0) +static inline u8 inline_0202D558_sub1(u32 param0) { return param0 >> 24; } -static inline u8 inline_0202D558_sub2 (u32 param0) +static inline u8 inline_0202D558_sub2(u32 param0) { return (param0 >> 16) & 0xff; } -static inline u8 inline_0202D558_sub3 (u32 param0) +static inline u8 inline_0202D558_sub3(u32 param0) { return (param0 >> 8) & 0xff; } -static inline u8 inline_0202D558_sub4 (u32 param0) +static inline u8 inline_0202D558_sub4(u32 param0) { return param0 & 0xff; } -static inline void inline_0202D558 (u32 param0, RTCDate * param1) +static inline void inline_0202D558(u32 param0, RTCDate *param1) { param1->year = inline_0202D558_sub1(param0); param1->month = inline_0202D558_sub2(param0); @@ -259,7 +259,7 @@ static inline void inline_0202D558 (u32 param0, RTCDate * param1) param1->week = inline_0202D558_sub4(param0); } -static inline BOOL inline_0203A944 (u32 param0) +static inline BOOL inline_0203A944(u32 param0) { if (((param0 % 4 == 0) && (param0 % 100 != 0)) || (param0 % 400 == 0)) { return 1; @@ -268,7 +268,7 @@ static inline BOOL inline_0203A944 (u32 param0) } } -static inline BOOL inline_ov12_02235998 (int param0, int param1) +static inline BOOL inline_ov12_02235998(int param0, int param1) { if ((param0 & param1) == param1) { return 1; diff --git a/include/item.h b/include/item.h index 24c5a9fbb2..5f63f6823c 100644 --- a/include/item.h +++ b/include/item.h @@ -76,10 +76,10 @@ typedef struct ItemData { } ItemData; enum ItemFileType { - ITEM_FILE_TYPE_DATA, - ITEM_FILE_TYPE_ICON, - ITEM_FILE_TYPE_PALETTE, - ITEM_FILE_TYPE_GBA, + ITEM_FILE_TYPE_DATA, + ITEM_FILE_TYPE_ICON, + ITEM_FILE_TYPE_PALETTE, + ITEM_FILE_TYPE_GBA, }; enum ItemDataParam { @@ -162,7 +162,7 @@ void Item_MoveInPocket(void *pocket, u16 srcSlot, u16 dstSlot); * Each type points to a different value for the item's entry in sItemArchiveIDs. * * @param item - * @param type The type of ID to get. + * @param type The type of ID to get. * @return The item's ID of the specified type. */ u16 Item_FileID(u16 item, enum ItemFileType type); @@ -197,7 +197,7 @@ u16 Item_IconNANRFile(void); * @param heapID ID of the heap to own the allocated memory. * @return The loaded data structure. */ -void* Item_Load(u16 item, enum ItemFileType type, u32 heapID); +void *Item_Load(u16 item, enum ItemFileType type, u32 heapID); /** * @brief Load the name of the item into a string buffer. @@ -284,14 +284,14 @@ u8 Item_MailNumber(u16 item); * @brief Get the item for a given mail number. * * @param mail - * @return The item for the mail number, or ITEM_NONE if none exists. + * @return The item for the mail number, or ITEM_NONE if none exists. */ u16 Item_ForMailNumber(u8 mail); /** * @brief Check if a given item is a berry. * - * @param item + * @param item * @return TRUE if the item is a berry, FALSE otherwise. */ u8 Item_IsBerry(u16 item); @@ -315,7 +315,7 @@ u16 Item_ForBerryNumber(u8 item); /** * @brief Check if a given item is herbal medicine. * - * @param item + * @param item * @return TRUE if the item is herbal medicine, FALSE otherwise. */ u8 Item_IsHerbalMedicine(u16 item); @@ -326,7 +326,7 @@ u8 Item_IsHerbalMedicine(u16 item); * @param heapID The heap which will own the item table's allocation. * @return The full table of item data. */ -void* ItemTable_Load(int heapID); +void *ItemTable_Load(int heapID); /** * @brief Get the ItemData value at a given index from within a loaded table. @@ -335,6 +335,6 @@ void* ItemTable_Load(int heapID); * @param index Index of the ItemData to be retrieved. * @return ItemData at a given index within the loaded item table. */ -ItemData* ItemTable_Index(ItemData *itemTable, u16 index); +ItemData *ItemTable_Index(ItemData *itemTable, u16 index); -#endif // POKEPLATINUM_ITEM_DATA_H \ No newline at end of file +#endif // POKEPLATINUM_ITEM_DATA_H diff --git a/include/journal.h b/include/journal.h index 2209e6c92a..128edd2c66 100644 --- a/include/journal.h +++ b/include/journal.h @@ -2,63 +2,63 @@ #define POKEPLATINUM_JOURNAL_H #include "play_time.h" -#include "trainer_info.h" #include "savedata.h" +#include "trainer_info.h" typedef struct Journal_t Journal; int Journal_SaveSize(void); -void Journal_Init(Journal * param0); -Journal * SaveData_GetJournal(SaveData * param0); -Journal * Journal_GetSavedPage(Journal * param0, BOOL param1); -BOOL Journal_CheckOpenOnContinue(Journal * param0, BOOL param1); -void sub_0202B758(Journal * param0, void * param1, u8 param2); -void * sub_0202BC58(u16 param0, u32 param1); -void * sub_0202BCE4(u32 param0); -void * sub_0202BCF0(u32 param0); -void * sub_0202BCFC(u32 param0); -void * sub_0202BD08(u32 param0); -void * sub_0202BD14(u32 param0); -void * sub_0202BD20(u32 param0); -void * sub_0202BD2C(u32 param0); -void * sub_0202BD38(u32 param0); -void * sub_0202BD44(u16 param0, u32 param1); -void * sub_0202BD58(u16 param0, u16 param1, u32 param2); -void * sub_0202BD70(u16 param0, u32 param1); -void * sub_0202BD84(u16 param0, u32 param1); -void * sub_0202BD98(u16 param0, u32 param1); -void * sub_0202BDAC(u16 param0, u32 param1); -void * sub_0202BDC0(u16 param0, u32 param1); -void * sub_0202BDD4(u32 param0); -void * sub_0202BDE0(u32 param0); -void * sub_0202BDEC(u16 param0, u32 param1); -void * sub_0202BE00(u8 param0, u16 param1, u32 param2); -void * sub_0202BE14(u32 param0); -void * sub_0202BE20(u32 param0); -void * sub_0202BE2C(u32 param0, u32 param1); -void * sub_0202BE4C(const PlayTime * playTime, u16 param1, u8 param2, u8 param3, u32 param4); -void * sub_0202BECC(const PlayTime * playTime, u16 param1, u8 param2, u8 param3, u32 param4); -void * sub_0202BF4C(u16 param0, u16 param1, u32 param2); -void * sub_0202BFCC(u16 * param0, u8 param1, u8 param2, u32 param3); -void * sub_0202C00C(u16 * param0, u8 param1, u8 param2, u32 param3); -void * sub_0202C04C(u16 * param0, u16 * param1, u8 param2, u8 param3, u8 param4, u32 param5); -void * sub_0202C0AC(u16 * param0, u8 param1, u8 param2, u32 param3); -void * sub_0202C0EC(u16 * param0, u8 param1, u32 param2); -void * sub_0202C11C(u16 * param0, u8 param1, u16 * param2, u8 param3, u32 param4); -void * sub_0202C168(u32 param0); -void * sub_0202C174(u16 * param0, u8 param1, u8 param2, u32 param3); -void * sub_0202C1B4(u32 param0); -void * sub_0202C1C0(u8 param0, u32 param1); -void * sub_0202C1E0(u32 param0); -void * sub_0202C1EC(u16 * param0, u8 param1, u16 * param2, u8 param3, u32 param4); -void * sub_0202C238(u32 param0); -void * sub_0202C244(u32 param0, u32 param1); -void * sub_0202C250(const u16 * param0, u8 param1, u32 param2, u32 param3); -void * sub_0202C280(int param0, u32 param1, u32 param2); -void sub_0202C2A4(Journal * param0, void * param1, u8 param2, u8 param3); -void sub_0202C5C4(TrainerInfo * param0, Journal * param1, u32 param2, u32 param3, u32 param4); +void Journal_Init(Journal *param0); +Journal *SaveData_GetJournal(SaveData *param0); +Journal *Journal_GetSavedPage(Journal *param0, BOOL param1); +BOOL Journal_CheckOpenOnContinue(Journal *param0, BOOL param1); +void sub_0202B758(Journal *param0, void *param1, u8 param2); +void *sub_0202BC58(u16 param0, u32 param1); +void *sub_0202BCE4(u32 param0); +void *sub_0202BCF0(u32 param0); +void *sub_0202BCFC(u32 param0); +void *sub_0202BD08(u32 param0); +void *sub_0202BD14(u32 param0); +void *sub_0202BD20(u32 param0); +void *sub_0202BD2C(u32 param0); +void *sub_0202BD38(u32 param0); +void *sub_0202BD44(u16 param0, u32 param1); +void *sub_0202BD58(u16 param0, u16 param1, u32 param2); +void *sub_0202BD70(u16 param0, u32 param1); +void *sub_0202BD84(u16 param0, u32 param1); +void *sub_0202BD98(u16 param0, u32 param1); +void *sub_0202BDAC(u16 param0, u32 param1); +void *sub_0202BDC0(u16 param0, u32 param1); +void *sub_0202BDD4(u32 param0); +void *sub_0202BDE0(u32 param0); +void *sub_0202BDEC(u16 param0, u32 param1); +void *sub_0202BE00(u8 param0, u16 param1, u32 param2); +void *sub_0202BE14(u32 param0); +void *sub_0202BE20(u32 param0); +void *sub_0202BE2C(u32 param0, u32 param1); +void *sub_0202BE4C(const PlayTime *playTime, u16 param1, u8 param2, u8 param3, u32 param4); +void *sub_0202BECC(const PlayTime *playTime, u16 param1, u8 param2, u8 param3, u32 param4); +void *sub_0202BF4C(u16 param0, u16 param1, u32 param2); +void *sub_0202BFCC(u16 *param0, u8 param1, u8 param2, u32 param3); +void *sub_0202C00C(u16 *param0, u8 param1, u8 param2, u32 param3); +void *sub_0202C04C(u16 *param0, u16 *param1, u8 param2, u8 param3, u8 param4, u32 param5); +void *sub_0202C0AC(u16 *param0, u8 param1, u8 param2, u32 param3); +void *sub_0202C0EC(u16 *param0, u8 param1, u32 param2); +void *sub_0202C11C(u16 *param0, u8 param1, u16 *param2, u8 param3, u32 param4); +void *sub_0202C168(u32 param0); +void *sub_0202C174(u16 *param0, u8 param1, u8 param2, u32 param3); +void *sub_0202C1B4(u32 param0); +void *sub_0202C1C0(u8 param0, u32 param1); +void *sub_0202C1E0(u32 param0); +void *sub_0202C1EC(u16 *param0, u8 param1, u16 *param2, u8 param3, u32 param4); +void *sub_0202C238(u32 param0); +void *sub_0202C244(u32 param0, u32 param1); +void *sub_0202C250(const u16 *param0, u8 param1, u32 param2, u32 param3); +void *sub_0202C280(int param0, u32 param1, u32 param2); +void sub_0202C2A4(Journal *param0, void *param1, u8 param2, u8 param3); +void sub_0202C5C4(TrainerInfo *param0, Journal *param1, u32 param2, u32 param3, u32 param4); u32 sub_0202C6A4(u32 param0); -void sub_0202C704(Journal * param0, u32 param1, u32 param2); -void sub_0202C720(Journal * param0, u16 param1, u16 param2, u32 param3); +void sub_0202C704(Journal *param0, u32 param1, u32 param2); +void sub_0202C720(Journal *param0, u16 param1, u16 param2, u32 param3); #endif // POKEPLATINUM_JOURNAL_H diff --git a/include/library_tv/library_tv.h b/include/library_tv/library_tv.h index c6df327c41..ce1a6377f2 100644 --- a/include/library_tv/library_tv.h +++ b/include/library_tv/library_tv.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_LIBRARY_TV_H #define POKEPLATINUM_LIBRARY_TV_H +#include "overlay_manager.h" -BOOL LibraryTV_Init(OverlayManager * ovy, int * state); -BOOL LibraryTV_Main(OverlayManager * ovy, int * state); -BOOL LibraryTV_Exit(OverlayManager * ovy, int * state); +BOOL LibraryTV_Init(OverlayManager *ovy, int *state); +BOOL LibraryTV_Main(OverlayManager *ovy, int *state); +BOOL LibraryTV_Exit(OverlayManager *ovy, int *state); #endif // POKEPLATINUM_LIBRARY_TV_H diff --git a/include/map_header_data.h b/include/map_header_data.h index e355b956c5..19ffdefd14 100644 --- a/include/map_header_data.h +++ b/include/map_header_data.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_MAP_HEADER_DATA_H #include "constants/heap.h" + #include "field/field_system_decl.h" #include "overlay006/struct_ov6_02242634.h" @@ -55,37 +56,37 @@ typedef struct MapHeaderData { u32 numObjectEvents; u32 numWarpEvents; u32 numCoordEvents; - const BgEvent * bgEvents; - const ObjectEvent * objectEvents; - const WarpEvent * warpEvents; - const CoordEvent * coordEvents; + const BgEvent *bgEvents; + const ObjectEvent *objectEvents; + const WarpEvent *warpEvents; + const CoordEvent *coordEvents; u32 tmpEventsBuf[512]; u32 scripts[64]; UnkStruct_ov6_02242634 wildEncounters; } MapHeaderData; -void MapHeaderData_Init(FieldSystem * fieldSystem, enum HeapId heapID); -void MapHeaderData_Free(FieldSystem * fieldSystem); -void MapHeaderData_Load(FieldSystem * fieldSystem, int headerID); -void sub_0203A418(FieldSystem * fieldSystem); -const BgEvent * MapHeaderData_GetBgEvents(const FieldSystem * fieldSystem); -int MapHeaderData_GetNumBgEvents(const FieldSystem * fieldSystem); -const WarpEvent * MapHeaderData_GetWarpEventByIndex(const FieldSystem * fieldSystem, int index); -int MapHeaderData_GetIndexOfWarpEventAtPos(const FieldSystem * fieldSystem, int x, int z); -int MapHeaderData_GetNumCoordEvents(const FieldSystem * fieldSystem); -const CoordEvent * MapHeaderData_GetCoordEvents(const FieldSystem * fieldSystem); -u32 MapHeaderData_GetNumObjectEvents(const FieldSystem * fieldSystem); -const ObjectEvent * MapHeaderData_GetObjectEvents(const FieldSystem * fieldSystem); -BOOL MapHeaderData_SetObjectEventPos(FieldSystem * fieldSystem, int index, u16 x, u16 z); -BOOL MapHeaderData_SetObjectEventDir(FieldSystem * fieldSystem, int localID, int dir); -BOOL MapHeaderData_SetObjectEventMovementType(FieldSystem * fieldSystem, int localID, int movementType); -BOOL MapHeaderData_SetWarpEventPos(FieldSystem * fieldSystem, u16 index, u16 x, u16 z); -BOOL MapHeaderData_SetWarpEventDestHeaderID(FieldSystem * fieldSystem, u16 index, u16 destHeaderID); -BOOL MapHeaderData_SetWarpEventDestWarpID(FieldSystem * fieldSystem, u16 index, u16 destWarpID); -BOOL MapHeaderData_SetBgEventPos(FieldSystem * fieldSystem, u16 index, u16 x, u16 z); -void MapHeaderData_LoadWildEncounters(UnkStruct_ov6_02242634 * param0, int headerID); -const UnkStruct_ov6_02242634 * MapHeaderData_GetWildEncounters(const FieldSystem * fieldSystem); -const u8 * MapHeaderData_GetScripts(const FieldSystem * fieldSystem); -BOOL MapHeaderData_IsAnyObjectEventAtPos(const FieldSystem * fieldSystem, u16 x, u16 z); +void MapHeaderData_Init(FieldSystem *fieldSystem, enum HeapId heapID); +void MapHeaderData_Free(FieldSystem *fieldSystem); +void MapHeaderData_Load(FieldSystem *fieldSystem, int headerID); +void sub_0203A418(FieldSystem *fieldSystem); +const BgEvent *MapHeaderData_GetBgEvents(const FieldSystem *fieldSystem); +int MapHeaderData_GetNumBgEvents(const FieldSystem *fieldSystem); +const WarpEvent *MapHeaderData_GetWarpEventByIndex(const FieldSystem *fieldSystem, int index); +int MapHeaderData_GetIndexOfWarpEventAtPos(const FieldSystem *fieldSystem, int x, int z); +int MapHeaderData_GetNumCoordEvents(const FieldSystem *fieldSystem); +const CoordEvent *MapHeaderData_GetCoordEvents(const FieldSystem *fieldSystem); +u32 MapHeaderData_GetNumObjectEvents(const FieldSystem *fieldSystem); +const ObjectEvent *MapHeaderData_GetObjectEvents(const FieldSystem *fieldSystem); +BOOL MapHeaderData_SetObjectEventPos(FieldSystem *fieldSystem, int index, u16 x, u16 z); +BOOL MapHeaderData_SetObjectEventDir(FieldSystem *fieldSystem, int localID, int dir); +BOOL MapHeaderData_SetObjectEventMovementType(FieldSystem *fieldSystem, int localID, int movementType); +BOOL MapHeaderData_SetWarpEventPos(FieldSystem *fieldSystem, u16 index, u16 x, u16 z); +BOOL MapHeaderData_SetWarpEventDestHeaderID(FieldSystem *fieldSystem, u16 index, u16 destHeaderID); +BOOL MapHeaderData_SetWarpEventDestWarpID(FieldSystem *fieldSystem, u16 index, u16 destWarpID); +BOOL MapHeaderData_SetBgEventPos(FieldSystem *fieldSystem, u16 index, u16 x, u16 z); +void MapHeaderData_LoadWildEncounters(UnkStruct_ov6_02242634 *param0, int headerID); +const UnkStruct_ov6_02242634 *MapHeaderData_GetWildEncounters(const FieldSystem *fieldSystem); +const u8 *MapHeaderData_GetScripts(const FieldSystem *fieldSystem); +BOOL MapHeaderData_IsAnyObjectEventAtPos(const FieldSystem *fieldSystem, u16 x, u16 z); #endif // POKEPLATINUM_MAP_HEADER_DATA_H diff --git a/include/map_object.h b/include/map_object.h index 1a3abbad20..f926a7fc7f 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -1,266 +1,268 @@ #ifndef POKEPLATINUM_UNK_02061804_H #define POKEPLATINUM_UNK_02061804_H -#include "map_header_data.h" +#include + +#include "constants/map_object.h" + #include "struct_decls/struct_02006C24_decl.h" -#include "sys_task_manager.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "struct_defs/struct_02061D3C.h" + +#include "field/field_system_decl.h" #include "functypes/funcptr_020EDF0C.h" #include "functypes/funcptr_020EDF0C_1.h" #include "functypes/funcptr_020EDF0C_2.h" -#include "overlay005/struct_ov5_021ED0A4.h" #include "overlay005/funcptr_ov5_021FB0F0.h" #include "overlay005/funcptr_ov5_021FB0F0_1.h" #include "overlay005/funcptr_ov5_021FB0F0_2.h" #include "overlay005/funcptr_ov5_021FB0F0_3.h" #include "overlay005/funcptr_ov5_021FB0F0_4.h" +#include "overlay005/struct_ov5_021ED0A4.h" -#include - -#include "constants/map_object.h" +#include "map_header_data.h" +#include "sys_task_manager.h" -MapObjectManager * MapObjectMan_New(FieldSystem * fieldSystem, int param1, int param2); -void MapObjectMan_Delete(MapObjectManager * param0); -void sub_0206184C(MapObjectManager * param0, int param1, int param2, int param3, const ObjectEvent * param4); -MapObject * MapObjectMan_AddMapObjectFromHeader(const MapObjectManager * param0, const ObjectEvent * param1, int param2); -MapObject * MapObjectMan_AddMapObject(const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6); -MapObject * sub_02061A74(const MapObjectManager * param0, int param1, int param2, int param3, const ObjectEvent * param4); -void sub_02061AB4(MapObject * param0, int param1); -void sub_02061AD4(MapObject * param0, int param1); -void MapObject_Delete(MapObject * param0); -void sub_02061B28(MapObject * param0); -void sub_02061B48(MapObject * param0); -void MapObjectMan_DeleteAll(MapObjectManager * param0); -void sub_02061BF0(MapObjectManager * param0); -void sub_02061C48(MapObjectManager * param0); -void MapObjectMan_SaveAll(FieldSystem * fieldSystem, const MapObjectManager * param1, MapObjectSave * param2, int param3); -void MapObjectMan_LoadAllObjects(const MapObjectManager * param0, MapObjectSave * param1, int param2); -void sub_02062068(const MapObjectManager * param0, int param1, int param2, const ObjectEvent * param3); -MapObject * MapObjMan_LocalMapObjByIndex(const MapObjectManager * param0, int param1); -MapObject * sub_02062570(const MapObjectManager * param0, int param1); -int sub_020625B0(const MapObjectManager * param0, MapObject ** param1, int * param2, u32 param3); -int sub_020626B4(const MapObject * param0); -int sub_02062758(const MapObject * param0, int param1); -int sub_02062764(const MapObject * param0, int param1, int param2); -int sub_020627B4(const MapObject * param0, int param1, int param2, int param3); -void MapObjectMan_SetMaxObjects(MapObjectManager * param0, int param1); -int MapObjectMan_GetMaxObjects(const MapObjectManager * param0); -void sub_02062838(MapObjectManager * param0, u32 param1); -void sub_02062840(MapObjectManager * param0, u32 param1); -u32 sub_0206284C(const MapObjectManager * param0, u32 param1); -void sub_02062854(MapObjectManager * param0, int param1); -int sub_02062858(const MapObjectManager * param0); -UnkStruct_ov5_021ED0A4 * sub_0206285C(const MapObjectManager * param0); -void sub_02062860(MapObjectManager * param0, MapObject * param1); -const MapObject * sub_02062868(const MapObjectManager * param0); -MapObject * sub_02062878(const MapObjectManager * param0); -void sub_02062880(const MapObject ** param0); -void MapObjectMan_SetFieldSystem(MapObjectManager * param0, FieldSystem * fieldSystem); -FieldSystem * MapObjectMan_FieldSystem(const MapObjectManager * param0); -void sub_0206289C(MapObjectManager * param0, NARC * param1); -NARC * sub_020628A0(const MapObjectManager * param0); -void sub_020628B4(MapObject * param0, u32 param1); -u32 sub_020628B8(const MapObject * param0); -void MapObject_SetStatusFlagOn(MapObject * param0, u32 param1); -void MapObject_SetStatusFlagOff(MapObject * param0, u32 param1); -u32 MapObject_CheckStatus(const MapObject * param0, u32 param1); -u32 MapObject_GetStateFlag(const MapObject * param0, u32 param1); -void sub_020628E8(MapObject * param0, u32 param1); -u32 sub_020628EC(const MapObject * param0); -void sub_020628F0(MapObject * param0, u32 param1); -void sub_020628F8(MapObject * param0, u32 param1); -u32 sub_02062904(const MapObject * param0, u32 param1); -void MapObject_SetId(MapObject * param0, u32 param1); -u32 MapObject_Id(const MapObject * param0); -void sub_02062914(MapObject * param0, int param1); -int sub_02062918(const MapObject * param0); -void sub_0206291C(MapObject * param0, u32 param1); -u32 sub_02062920(const MapObject * param0); -u32 sub_02062924(const MapObject * param0); -void sub_02062944(MapObject * param0, u32 param1); -u32 MapObject_GetMoveCode(const MapObject * param0); -void sub_0206294C(MapObject * param0, u32 param1); -u32 MapObject_GetEventType(const MapObject * param0); -void sub_02062954(MapObject * param0, u32 param1); -u32 sub_02062958(const MapObject * param0); -void sub_0206295C(MapObject * param0, u32 param1); -u32 MapObject_GetEventID(const MapObject * param0); -void sub_02062964(MapObject * param0, int param1); -u32 sub_02062968(const MapObject * param0); -void sub_0206296C(MapObject * param0, int param1); -void MapObject_SetDir(MapObject * param0, int param1); -int MapObject_Dir(const MapObject * param0); -int sub_02062990(const MapObject * param0); -void sub_02062994(MapObject * param0, int param1); -int MapObject_GetMoveDir(const MapObject * param0); -void sub_020629A0(MapObject * param0, int param1); -void sub_020629B4(MapObject * param0, int param1, int param2); -int sub_020629D8(const MapObject * param0, int param1); -void sub_020629FC(MapObject * param0, int param1); -int MapObject_MaxXOffset(const MapObject * param0); -void sub_02062A04(MapObject * param0, int param1); -int MapObject_MaxZOffset(const MapObject * param0); -void sub_02062A0C(MapObject * param0, u32 param1); -u32 sub_02062A14(const MapObject * param0); -void sub_02062A1C(MapObject * param0, SysTask * param1); -SysTask * sub_02062A24(const MapObject * param0); -void sub_02062A2C(const MapObject * param0); -void MapObject_SetMapObjectManager(MapObject * param0, const MapObjectManager * param1); -const MapObjectManager * MapObject_MapObjectManager(const MapObject * param0); -void * sub_02062A54(MapObject * param0, int param1); -void * sub_02062A78(MapObject * param0); -void * sub_02062A7C(MapObject * param0, int param1); -void * sub_02062AA0(MapObject * param0); -void * sub_02062AA4(MapObject * param0, int param1); -void * sub_02062AC8(MapObject * param0); -void * sub_02062ACC(MapObject * param0, int param1); -void * sub_02062AF0(MapObject * param0); -void sub_02062AF8(MapObject * param0, UnkFuncPtr_020EDF0C param1); -void sub_02062B00(MapObject * param0); -void sub_02062B0C(MapObject * param0, UnkFuncPtr_020EDF0C_1 param1); -void sub_02062B14(MapObject * param0); -void sub_02062B20(MapObject * param0, UnkFuncPtr_020EDF0C_2 param1); -void sub_02062B28(MapObject * param0); -void sub_02062B34(MapObject * param0); -void sub_02062B4C(MapObject * param0, UnkFuncPtr_ov5_021FB0F0 param1); -void sub_02062B54(MapObject * param0); -void sub_02062B60(MapObject * param0, UnkFuncPtr_ov5_021FB0F0_1 param1); -void sub_02062B68(MapObject * param0); -void sub_02062B74(MapObject * param0, UnkFuncPtr_ov5_021FB0F0_2 param1); -void sub_02062B7C(MapObject * param0); -void sub_02062B88(MapObject * param0, UnkFuncPtr_ov5_021FB0F0_3 param1); -void sub_02062B90(MapObject * param0); -void sub_02062B9C(MapObject * param0, UnkFuncPtr_ov5_021FB0F0_4 param1); -void sub_02062BA4(MapObject * param0); -void MapObject_SetAnimationCode(MapObject * param0, int param1); -int MapObject_AnimationCode(const MapObject * param0); -void sub_02062BC0(MapObject * param0, int param1); -void sub_02062BC8(MapObject * param0); -int sub_02062BD8(const MapObject * param0); -void sub_02062BE0(MapObject * param0, u32 param1); -u32 sub_02062BE8(const MapObject * param0); -void sub_02062BF0(MapObject * param0, u32 param1); -u32 sub_02062BF8(const MapObject * param0); -FieldSystem * MapObject_FieldSystem(const MapObject * param0); -int sub_02062C0C(const MapObject * param0); -int sub_02062C18(const MapObject * param0); -void MapObjectMan_StopAllMovement(MapObjectManager * param0); -void sub_02062C3C(MapObjectManager * param0); -void MapObjectMan_PauseAllMovement(MapObjectManager * param0); -void MapObjectMan_UnpauseAllMovement(MapObjectManager * param0); -int MapObjectMan_IsDrawInitialized(const MapObjectManager * param0); -u32 sub_02062CBC(const MapObject * param0, u32 param1); -void sub_02062CCC(MapObjectManager * param0, int param1); -int sub_02062CE4(const MapObjectManager * param0); -int sub_02062CF8(const MapObject * param0); -void sub_02062D04(MapObject * param0); -void sub_02062D10(MapObject * param0); -int MapObject_IsMoving(const MapObject * param0); -void sub_02062D28(MapObject * param0); -void sub_02062D34(MapObject * param0); -void sub_02062D40(MapObject * param0); -int sub_02062D4C(const MapObject * param0); -int sub_02062D58(const MapObject * param0); -void MapObject_SetHidden(MapObject * param0, int param1); -void sub_02062D80(MapObject * param0, int param1); -int sub_02062D9C(MapObject * param0); -void sub_02062DB4(MapObject * param0, int param1); -void sub_02062DD0(MapObject * param0); -void sub_02062DDC(MapObject * param0); -int MapObject_IsMovementPaused(const MapObject * param0); -int sub_02062DFC(const MapObject * param0); -void sub_02062E28(MapObject * param0, int param1); -int sub_02062E44(const MapObject * param0); -void sub_02062E5C(MapObject * param0, int param1); -void sub_02062E78(MapObject * param0, int param1); -int sub_02062E94(const MapObject * param0); -void sub_02062EAC(MapObject * param0, int param1); -int sub_02062EC8(const MapObject * param0); -void sub_02062EE0(MapObject * param0, int param1); -int sub_02062EFC(const MapObject * param0); -void sub_02062F14(MapObject * param0, int param1); -int sub_02062F30(const MapObject * param0); -void sub_02062F48(MapObject * param0, int param1); -int sub_02062F64(const MapObject * param0); -int sub_02062F7C(const MapObject * param0); -void sub_02062F90(MapObject * param0, int param1); -int sub_02062FAC(const MapObject * param0); -void sub_02062FC4(MapObject * param0, int param1); -int sub_02062FDC(const MapObject * param0); -int MapObject_XInitial(const MapObject * param0); -void MapObject_SetXInitial(MapObject * param0, int param1); -int MapObject_YInitial(const MapObject * param0); -void MapObject_SetYInitial(MapObject * param0, int param1); -int MapObject_ZInitial(const MapObject * param0); -void MapObject_SetZInitial(MapObject * param0, int param1); -int MapObject_XPosPrev(const MapObject * param0); -void MapObject_SetXPosPrev(MapObject * param0, int param1); -int MapObject_YPosPrev(const MapObject * param0); -void MapObject_SetYPosPrev(MapObject * param0, int param1); -int MapObject_ZPosPrev(const MapObject * param0); -void MapObject_SetZPosPrev(MapObject * param0, int param1); -int MapObject_GetXPos(const MapObject * param0); -void MapObject_SetX(MapObject * param0, int param1); -void MapObject_AddX(MapObject * param0, int param1); -int MapObject_GetYPos(const MapObject * param0); -void MapObject_SetY(MapObject * param0, int param1); -void MapObject_AddY(MapObject * param0, int param1); -int MapObject_GetZPos(const MapObject * param0); -void MapObject_SetZ(MapObject * param0, int param1); -void MapObject_AddZ(MapObject * param0, int param1); -void MapObject_PosVectorOut(const MapObject * param0, VecFx32 * param1); -void MapObject_SetPosVec(MapObject * param0, const VecFx32 * param1); -const VecFx32 * MapObject_PosVector(const MapObject * param0); -fx32 sub_02063074(const MapObject * param0); -void sub_02063078(const MapObject * param0, VecFx32 * param1); -void sub_02063088(MapObject * param0, const VecFx32 * param1); -VecFx32 * sub_02063098(MapObject * param0); -void sub_0206309C(const MapObject * param0, VecFx32 * param1); -void sub_020630AC(MapObject * param0, const VecFx32 * param1); -void sub_020630BC(const MapObject * param0, VecFx32 * param1); -void sub_020630CC(MapObject * param0, const VecFx32 * param1); -int sub_020630DC(const MapObject * param0); -void sub_020630F0(ObjectEvent * param0, int param1); -int sub_020630F4(const ObjectEvent * param0); -void sub_020630F8(ObjectEvent * param0, int param1); -int sub_020630FC(const ObjectEvent * param0); -void sub_02063100(ObjectEvent * param0, int param1); -int sub_02063104(const ObjectEvent * param0); -void sub_02063108(ObjectEvent * param0, int param1); -int sub_0206310C(const ObjectEvent * param0); -void sub_02063110(ObjectEvent * param0, int param1); -int sub_02063114(const ObjectEvent * param0); -void sub_02063118(ObjectEvent * param0, int param1); -int sub_0206311C(const ObjectEvent * param0); -void sub_02063120(ObjectEvent * param0, int param1); -int sub_02063124(const ObjectEvent * param0); -void sub_0206312C(ObjectEvent * param0, int param1, int param2); -int sub_02063150(const ObjectEvent * param0, int param1); -void sub_02063174(ObjectEvent * param0, int param1); -int sub_02063178(const ObjectEvent * param0); -void sub_02063180(ObjectEvent * param0, int param1); -int sub_02063184(const ObjectEvent * param0); -void ObjectEvent_SetXPos(ObjectEvent * param0, int param1); -int sub_02063190(const ObjectEvent * param0); -void sub_02063194(ObjectEvent * param0, int param1); -int sub_02063198(const ObjectEvent * param0); -void ObjectEvent_SetZPos(ObjectEvent * param0, int param1); -int sub_020631A0(const ObjectEvent * param0); -MapObject * sub_0206326C(const MapObjectManager * param0, int param1, int param2, int param3); -void sub_020632D4(MapObject * param0, const VecFx32 * param1, int param2); -void MapObject_SetPosDir(MapObject * param0, int param1, int param2, int param3, int param4); -void MapObject_SetMoveCode(MapObject * param0, u32 param1); -void sub_020633C8(MapObject * param0, int param1); -void sub_020633E0(MapObject * param0); -void sub_020633E4(MapObject * param0); -void sub_020633E8(MapObject * param0); -void sub_020633EC(MapObject * param0); -void sub_020633F0(MapObject * param0); -void sub_020633F4(MapObject * param0); -void sub_020633F8(MapObject * param0); -void sub_020633FC(MapObject * param0); +MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int param1, int param2); +void MapObjectMan_Delete(MapObjectManager *param0); +void sub_0206184C(MapObjectManager *param0, int param1, int param2, int param3, const ObjectEvent *param4); +MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *param0, const ObjectEvent *param1, int param2); +MapObject *MapObjectMan_AddMapObject(const MapObjectManager *param0, int param1, int param2, int param3, int param4, int param5, int param6); +MapObject *sub_02061A74(const MapObjectManager *param0, int param1, int param2, int param3, const ObjectEvent *param4); +void sub_02061AB4(MapObject *param0, int param1); +void sub_02061AD4(MapObject *param0, int param1); +void MapObject_Delete(MapObject *param0); +void sub_02061B28(MapObject *param0); +void sub_02061B48(MapObject *param0); +void MapObjectMan_DeleteAll(MapObjectManager *param0); +void sub_02061BF0(MapObjectManager *param0); +void sub_02061C48(MapObjectManager *param0); +void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *param1, MapObjectSave *param2, int param3); +void MapObjectMan_LoadAllObjects(const MapObjectManager *param0, MapObjectSave *param1, int param2); +void sub_02062068(const MapObjectManager *param0, int param1, int param2, const ObjectEvent *param3); +MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *param0, int param1); +MapObject *sub_02062570(const MapObjectManager *param0, int param1); +int sub_020625B0(const MapObjectManager *param0, MapObject **param1, int *param2, u32 param3); +int sub_020626B4(const MapObject *param0); +int sub_02062758(const MapObject *param0, int param1); +int sub_02062764(const MapObject *param0, int param1, int param2); +int sub_020627B4(const MapObject *param0, int param1, int param2, int param3); +void MapObjectMan_SetMaxObjects(MapObjectManager *param0, int param1); +int MapObjectMan_GetMaxObjects(const MapObjectManager *param0); +void sub_02062838(MapObjectManager *param0, u32 param1); +void sub_02062840(MapObjectManager *param0, u32 param1); +u32 sub_0206284C(const MapObjectManager *param0, u32 param1); +void sub_02062854(MapObjectManager *param0, int param1); +int sub_02062858(const MapObjectManager *param0); +UnkStruct_ov5_021ED0A4 *sub_0206285C(const MapObjectManager *param0); +void sub_02062860(MapObjectManager *param0, MapObject *param1); +const MapObject *sub_02062868(const MapObjectManager *param0); +MapObject *sub_02062878(const MapObjectManager *param0); +void sub_02062880(const MapObject **param0); +void MapObjectMan_SetFieldSystem(MapObjectManager *param0, FieldSystem *fieldSystem); +FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *param0); +void sub_0206289C(MapObjectManager *param0, NARC *param1); +NARC *sub_020628A0(const MapObjectManager *param0); +void sub_020628B4(MapObject *param0, u32 param1); +u32 sub_020628B8(const MapObject *param0); +void MapObject_SetStatusFlagOn(MapObject *param0, u32 param1); +void MapObject_SetStatusFlagOff(MapObject *param0, u32 param1); +u32 MapObject_CheckStatus(const MapObject *param0, u32 param1); +u32 MapObject_GetStateFlag(const MapObject *param0, u32 param1); +void sub_020628E8(MapObject *param0, u32 param1); +u32 sub_020628EC(const MapObject *param0); +void sub_020628F0(MapObject *param0, u32 param1); +void sub_020628F8(MapObject *param0, u32 param1); +u32 sub_02062904(const MapObject *param0, u32 param1); +void MapObject_SetId(MapObject *param0, u32 param1); +u32 MapObject_Id(const MapObject *param0); +void sub_02062914(MapObject *param0, int param1); +int sub_02062918(const MapObject *param0); +void sub_0206291C(MapObject *param0, u32 param1); +u32 sub_02062920(const MapObject *param0); +u32 sub_02062924(const MapObject *param0); +void sub_02062944(MapObject *param0, u32 param1); +u32 MapObject_GetMoveCode(const MapObject *param0); +void sub_0206294C(MapObject *param0, u32 param1); +u32 MapObject_GetEventType(const MapObject *param0); +void sub_02062954(MapObject *param0, u32 param1); +u32 sub_02062958(const MapObject *param0); +void sub_0206295C(MapObject *param0, u32 param1); +u32 MapObject_GetEventID(const MapObject *param0); +void sub_02062964(MapObject *param0, int param1); +u32 sub_02062968(const MapObject *param0); +void sub_0206296C(MapObject *param0, int param1); +void MapObject_SetDir(MapObject *param0, int param1); +int MapObject_Dir(const MapObject *param0); +int sub_02062990(const MapObject *param0); +void sub_02062994(MapObject *param0, int param1); +int MapObject_GetMoveDir(const MapObject *param0); +void sub_020629A0(MapObject *param0, int param1); +void sub_020629B4(MapObject *param0, int param1, int param2); +int sub_020629D8(const MapObject *param0, int param1); +void sub_020629FC(MapObject *param0, int param1); +int MapObject_MaxXOffset(const MapObject *param0); +void sub_02062A04(MapObject *param0, int param1); +int MapObject_MaxZOffset(const MapObject *param0); +void sub_02062A0C(MapObject *param0, u32 param1); +u32 sub_02062A14(const MapObject *param0); +void sub_02062A1C(MapObject *param0, SysTask *param1); +SysTask *sub_02062A24(const MapObject *param0); +void sub_02062A2C(const MapObject *param0); +void MapObject_SetMapObjectManager(MapObject *param0, const MapObjectManager *param1); +const MapObjectManager *MapObject_MapObjectManager(const MapObject *param0); +void *sub_02062A54(MapObject *param0, int param1); +void *sub_02062A78(MapObject *param0); +void *sub_02062A7C(MapObject *param0, int param1); +void *sub_02062AA0(MapObject *param0); +void *sub_02062AA4(MapObject *param0, int param1); +void *sub_02062AC8(MapObject *param0); +void *sub_02062ACC(MapObject *param0, int param1); +void *sub_02062AF0(MapObject *param0); +void sub_02062AF8(MapObject *param0, UnkFuncPtr_020EDF0C param1); +void sub_02062B00(MapObject *param0); +void sub_02062B0C(MapObject *param0, UnkFuncPtr_020EDF0C_1 param1); +void sub_02062B14(MapObject *param0); +void sub_02062B20(MapObject *param0, UnkFuncPtr_020EDF0C_2 param1); +void sub_02062B28(MapObject *param0); +void sub_02062B34(MapObject *param0); +void sub_02062B4C(MapObject *param0, UnkFuncPtr_ov5_021FB0F0 param1); +void sub_02062B54(MapObject *param0); +void sub_02062B60(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_1 param1); +void sub_02062B68(MapObject *param0); +void sub_02062B74(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_2 param1); +void sub_02062B7C(MapObject *param0); +void sub_02062B88(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_3 param1); +void sub_02062B90(MapObject *param0); +void sub_02062B9C(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_4 param1); +void sub_02062BA4(MapObject *param0); +void MapObject_SetAnimationCode(MapObject *param0, int param1); +int MapObject_AnimationCode(const MapObject *param0); +void sub_02062BC0(MapObject *param0, int param1); +void sub_02062BC8(MapObject *param0); +int sub_02062BD8(const MapObject *param0); +void sub_02062BE0(MapObject *param0, u32 param1); +u32 sub_02062BE8(const MapObject *param0); +void sub_02062BF0(MapObject *param0, u32 param1); +u32 sub_02062BF8(const MapObject *param0); +FieldSystem *MapObject_FieldSystem(const MapObject *param0); +int sub_02062C0C(const MapObject *param0); +int sub_02062C18(const MapObject *param0); +void MapObjectMan_StopAllMovement(MapObjectManager *param0); +void sub_02062C3C(MapObjectManager *param0); +void MapObjectMan_PauseAllMovement(MapObjectManager *param0); +void MapObjectMan_UnpauseAllMovement(MapObjectManager *param0); +int MapObjectMan_IsDrawInitialized(const MapObjectManager *param0); +u32 sub_02062CBC(const MapObject *param0, u32 param1); +void sub_02062CCC(MapObjectManager *param0, int param1); +int sub_02062CE4(const MapObjectManager *param0); +int sub_02062CF8(const MapObject *param0); +void sub_02062D04(MapObject *param0); +void sub_02062D10(MapObject *param0); +int MapObject_IsMoving(const MapObject *param0); +void sub_02062D28(MapObject *param0); +void sub_02062D34(MapObject *param0); +void sub_02062D40(MapObject *param0); +int sub_02062D4C(const MapObject *param0); +int sub_02062D58(const MapObject *param0); +void MapObject_SetHidden(MapObject *param0, int param1); +void sub_02062D80(MapObject *param0, int param1); +int sub_02062D9C(MapObject *param0); +void sub_02062DB4(MapObject *param0, int param1); +void sub_02062DD0(MapObject *param0); +void sub_02062DDC(MapObject *param0); +int MapObject_IsMovementPaused(const MapObject *param0); +int sub_02062DFC(const MapObject *param0); +void sub_02062E28(MapObject *param0, int param1); +int sub_02062E44(const MapObject *param0); +void sub_02062E5C(MapObject *param0, int param1); +void sub_02062E78(MapObject *param0, int param1); +int sub_02062E94(const MapObject *param0); +void sub_02062EAC(MapObject *param0, int param1); +int sub_02062EC8(const MapObject *param0); +void sub_02062EE0(MapObject *param0, int param1); +int sub_02062EFC(const MapObject *param0); +void sub_02062F14(MapObject *param0, int param1); +int sub_02062F30(const MapObject *param0); +void sub_02062F48(MapObject *param0, int param1); +int sub_02062F64(const MapObject *param0); +int sub_02062F7C(const MapObject *param0); +void sub_02062F90(MapObject *param0, int param1); +int sub_02062FAC(const MapObject *param0); +void sub_02062FC4(MapObject *param0, int param1); +int sub_02062FDC(const MapObject *param0); +int MapObject_XInitial(const MapObject *param0); +void MapObject_SetXInitial(MapObject *param0, int param1); +int MapObject_YInitial(const MapObject *param0); +void MapObject_SetYInitial(MapObject *param0, int param1); +int MapObject_ZInitial(const MapObject *param0); +void MapObject_SetZInitial(MapObject *param0, int param1); +int MapObject_XPosPrev(const MapObject *param0); +void MapObject_SetXPosPrev(MapObject *param0, int param1); +int MapObject_YPosPrev(const MapObject *param0); +void MapObject_SetYPosPrev(MapObject *param0, int param1); +int MapObject_ZPosPrev(const MapObject *param0); +void MapObject_SetZPosPrev(MapObject *param0, int param1); +int MapObject_GetXPos(const MapObject *param0); +void MapObject_SetX(MapObject *param0, int param1); +void MapObject_AddX(MapObject *param0, int param1); +int MapObject_GetYPos(const MapObject *param0); +void MapObject_SetY(MapObject *param0, int param1); +void MapObject_AddY(MapObject *param0, int param1); +int MapObject_GetZPos(const MapObject *param0); +void MapObject_SetZ(MapObject *param0, int param1); +void MapObject_AddZ(MapObject *param0, int param1); +void MapObject_PosVectorOut(const MapObject *param0, VecFx32 *param1); +void MapObject_SetPosVec(MapObject *param0, const VecFx32 *param1); +const VecFx32 *MapObject_PosVector(const MapObject *param0); +fx32 sub_02063074(const MapObject *param0); +void sub_02063078(const MapObject *param0, VecFx32 *param1); +void sub_02063088(MapObject *param0, const VecFx32 *param1); +VecFx32 *sub_02063098(MapObject *param0); +void sub_0206309C(const MapObject *param0, VecFx32 *param1); +void sub_020630AC(MapObject *param0, const VecFx32 *param1); +void sub_020630BC(const MapObject *param0, VecFx32 *param1); +void sub_020630CC(MapObject *param0, const VecFx32 *param1); +int sub_020630DC(const MapObject *param0); +void sub_020630F0(ObjectEvent *param0, int param1); +int sub_020630F4(const ObjectEvent *param0); +void sub_020630F8(ObjectEvent *param0, int param1); +int sub_020630FC(const ObjectEvent *param0); +void sub_02063100(ObjectEvent *param0, int param1); +int sub_02063104(const ObjectEvent *param0); +void sub_02063108(ObjectEvent *param0, int param1); +int sub_0206310C(const ObjectEvent *param0); +void sub_02063110(ObjectEvent *param0, int param1); +int sub_02063114(const ObjectEvent *param0); +void sub_02063118(ObjectEvent *param0, int param1); +int sub_0206311C(const ObjectEvent *param0); +void sub_02063120(ObjectEvent *param0, int param1); +int sub_02063124(const ObjectEvent *param0); +void sub_0206312C(ObjectEvent *param0, int param1, int param2); +int sub_02063150(const ObjectEvent *param0, int param1); +void sub_02063174(ObjectEvent *param0, int param1); +int sub_02063178(const ObjectEvent *param0); +void sub_02063180(ObjectEvent *param0, int param1); +int sub_02063184(const ObjectEvent *param0); +void ObjectEvent_SetXPos(ObjectEvent *param0, int param1); +int sub_02063190(const ObjectEvent *param0); +void sub_02063194(ObjectEvent *param0, int param1); +int sub_02063198(const ObjectEvent *param0); +void ObjectEvent_SetZPos(ObjectEvent *param0, int param1); +int sub_020631A0(const ObjectEvent *param0); +MapObject *sub_0206326C(const MapObjectManager *param0, int param1, int param2, int param3); +void sub_020632D4(MapObject *param0, const VecFx32 *param1, int param2); +void MapObject_SetPosDir(MapObject *param0, int param1, int param2, int param3, int param4); +void MapObject_SetMoveCode(MapObject *param0, u32 param1); +void sub_020633C8(MapObject *param0, int param1); +void sub_020633E0(MapObject *param0); +void sub_020633E4(MapObject *param0); +void sub_020633E8(MapObject *param0); +void sub_020633EC(MapObject *param0); +void sub_020633F0(MapObject *param0); +void sub_020633F4(MapObject *param0); +void sub_020633F8(MapObject *param0); +void sub_020633FC(MapObject *param0); #endif // POKEPLATINUM_UNK_02061804_H diff --git a/include/map_object_move.h b/include/map_object_move.h index 6055b28932..69bbd37843 100644 --- a/include/map_object_move.h +++ b/include/map_object_move.h @@ -1,41 +1,42 @@ #ifndef POKEPLATINUM_MAP_OBJECT_MOVE_H #define POKEPLATINUM_MAP_OBJECT_MOVE_H -#include "field/field_system_decl.h" +#include + #include "struct_decls/struct_02061AB4_decl.h" -#include +#include "field/field_system_decl.h" -void MapObject_InitMove(MapObject * param0); -void MapObject_Move(MapObject * param0); -u32 sub_02063E18(const MapObject * param0, const VecFx32 * param1, int param2, int param3, int param4, int param5); -u32 sub_02063E94(const MapObject * param0, int param1, int param2, int param3, int param4); -u32 sub_02063EBC(const MapObject * param0, int param1); -int sub_02063F00(const MapObject * param0, int param1, int param2, int param3); -int sub_02063FAC(const MapObject * param0, int param1, int param2, int param3); -int sub_02064004(const MapObject * param0, int param1, int param2, int param3); -int sub_0206406C(MapObject * param0, u32 param1); -int sub_020640A0(MapObject * param0, u32 param1); -int MapObject_IsOnSnow(MapObject * param0, u32 param1); -int sub_02064108(MapObject * param0, u32 param1); -int sub_0206413C(MapObject * param0, u32 param1); -int sub_0206415C(MapObject * param0, u32 param1); -int sub_0206417C(MapObject * param0, u32 param1); +void MapObject_InitMove(MapObject *param0); +void MapObject_Move(MapObject *param0); +u32 sub_02063E18(const MapObject *param0, const VecFx32 *param1, int param2, int param3, int param4, int param5); +u32 sub_02063E94(const MapObject *param0, int param1, int param2, int param3, int param4); +u32 sub_02063EBC(const MapObject *param0, int param1); +int sub_02063F00(const MapObject *param0, int param1, int param2, int param3); +int sub_02063FAC(const MapObject *param0, int param1, int param2, int param3); +int sub_02064004(const MapObject *param0, int param1, int param2, int param3); +int sub_0206406C(MapObject *param0, u32 param1); +int sub_020640A0(MapObject *param0, u32 param1); +int MapObject_IsOnSnow(MapObject *param0, u32 param1); +int sub_02064108(MapObject *param0, u32 param1); +int sub_0206413C(MapObject *param0, u32 param1); +int sub_0206415C(MapObject *param0, u32 param1); +int sub_0206417C(MapObject *param0, u32 param1); int MapObject_GetDxFromDir(int param0); int MapObject_GetDyFromDir(int param0); -void sub_020641B4(MapObject * param0, int param1); -void sub_02064208(MapObject * param0); -u32 sub_02064238(MapObject * param0, int param1); -void MapObject_AddVecToPos(MapObject * param0, const VecFx32 * param1); -void MapObject_StepDirection(MapObject * param0, int param1, fx32 param2); -int sub_020642F8(MapObject * param0); -int sub_02064390(MapObject * param0); -void VecFx32_StepDirection(int param0, VecFx32 * param1, fx32 param2); -void sub_02064450(int param0, int param1, VecFx32 * param2); -void sub_02064464(MapObject * param0); +void sub_020641B4(MapObject *param0, int param1); +void sub_02064208(MapObject *param0); +u32 sub_02064238(MapObject *param0, int param1); +void MapObject_AddVecToPos(MapObject *param0, const VecFx32 *param1); +void MapObject_StepDirection(MapObject *param0, int param1, fx32 param2); +int sub_020642F8(MapObject *param0); +int sub_02064390(MapObject *param0); +void VecFx32_StepDirection(int param0, VecFx32 *param1, fx32 param2); +void sub_02064450(int param0, int param1, VecFx32 *param2); +void sub_02064464(MapObject *param0); int Direction_GetOpposite(int param0); int sub_02064488(int param0, int param1, int param2, int param3); -int sub_020644A4(FieldSystem * fieldSystem, VecFx32 * param1); -int sub_020644D0(FieldSystem * fieldSystem, VecFx32 * param1, int param2); +int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *param1); +int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2); #endif // POKEPLATINUM_MAP_OBJECT_MOVE_H diff --git a/include/message.h b/include/message.h index a369d1fb25..eddcfb69d6 100644 --- a/include/message.h +++ b/include/message.h @@ -36,25 +36,25 @@ enum MessageLoaderType { /** * @brief Load a message file out of the given NARC. - * - * @param narcID + * + * @param narcID * @param dataID Index of the message data file in the NARC. * @param heapID Which heap will own the allocation. * @return Allocated message data. */ -MessageBank * MessageBank_Load(u32 param0, u32 param1, u32 param2); +MessageBank *MessageBank_Load(u32 param0, u32 param1, u32 param2); /** * @brief Free allocated message data back to the heap. - * - * @param msgData + * + * @param msgData */ -void MessageBank_Free(MessageBank * param0); +void MessageBank_Free(MessageBank *param0); /** * @brief Get an entry out of the pre-loaded message bank and copy it into the * destination buffer. - * + * * @param bank Loaded message bank. * @param entryID Entry in the message bank to load. * @param dst Destination character buffer. @@ -64,7 +64,7 @@ void MessageBank_Get(const MessageBank *bank, u32 entryID, charcode_t *dst); /** * @brief Load a message bank from an archive, then load an entry from that bank * and copy it into the destination buffer. - * + * * @param narcID Archive from which to load the message bank. * @param bankID Index of the bank to load from the archive. * @param entryID Index of the entry to load from the bank. @@ -76,7 +76,7 @@ void MessageBank_GetFromNARC(u32 narcID, u32 bankID, u32 entryID, u32 heapID, ch /** * @brief Get an entry out of the pre-loaded message bank and copy it into the * destination Strbuf struct. - * + * * @param bank Loaded message bank. * @param entryID Entry in the message bank to load. * @param strbuf Destination Strbuf struct. @@ -86,18 +86,18 @@ void MessageBank_GetStrbuf(const MessageBank *bank, u32 entryID, Strbuf *strbuf) /** * @brief Load a message bank from an archive, then load an entry from that bank * and copy it into a newly-allocated Strbuf struct. - * + * * @param bank Loaded message bank. * @param entryID Entry in the message bank to load. * @param heapID Heap on which to allocate the new Strbuf struct. * @return A newly-allocated Strbuf struct containing the loaded bank entry. */ -Strbuf* MessageBank_GetNewStrbuf(const MessageBank *bank, u32 entryID, u32 heapID); +Strbuf *MessageBank_GetNewStrbuf(const MessageBank *bank, u32 entryID, u32 heapID); /** * @brief Load a message bank from an archive, then load an entry from that bank * and copy it into the destination Strbuf struct. - * + * * @param narcID Archive from which to load the message bank. * @param bankID Index of the bank to load from the archive. * @param entryID Index of the entry to load from the bank. @@ -109,7 +109,7 @@ void MessageBank_GetStrbufFromNARC(u32 narcID, u32 bankID, u32 entryID, u32 heap /** * @brief Load a message bank from an archive, then load an entry from that bank * and copy it into the destination Strbuf struct. - * + * * @param narc Archive from which to load the message bank. * @param bankID Index of the bank to load from the archive. * @param entryID Index of the entry to load from the bank. @@ -121,30 +121,30 @@ void MessageBank_GetStrbufFromHandle(NARC *narc, u32 bankID, u32 entryID, u32 he /** * @brief Load a message bank from an archive, then load an entry from that bank * and copy it into a destination Strbuf struct. - * + * * @param narcID Archive from which to load the message bank. * @param bankID Index of the bank to load from the archive. * @param entryID Index of the entry to load from the bank. * @param heapID Heap on which to allocate the loaded archive. * @return A newly-allocated Strbuf struct containing the loaded bank entry. */ -Strbuf* MessageBank_GetNewStrbufFromNARC(u32 narcID, u32 bankID, u32 entryID, u32 heapID); +Strbuf *MessageBank_GetNewStrbufFromNARC(u32 narcID, u32 bankID, u32 entryID, u32 heapID); /** * @brief Load a message bank from an archive, then load an entry from that bank * and copy it into a destination Strbuf struct. - * + * * @param narc Archive from which to load the message bank. * @param bankID Index of the bank to load from the archive. * @param entryID Index of the entry to load from the bank. * @param heapID Heap on which to allocate the loaded archive. * @return A newly-allocated Strbuf struct containing the loaded bank entry. */ -Strbuf* MessageBank_GetNewStrbufFromHandle(NARC *narc, u32 bankID, u32 entryID, u32 heapID); +Strbuf *MessageBank_GetNewStrbufFromHandle(NARC *narc, u32 bankID, u32 entryID, u32 heapID); /** * @brief Get the number of entries in a pre-loaded message bank. - * + * * @param bank Pre-loaded message bank. * @return Number of entries in the bank. */ @@ -152,7 +152,7 @@ u32 MessageBank_EntryCount(const MessageBank *bank); /** * @brief Get the number of entries in a bank by loading it from an archive. - * + * * @param narcID Archive from which to load the bank. * @param bankID Index of the bank to load from the archive. * @return Number of entries in the loaded bank. @@ -162,25 +162,25 @@ u32 MessageBank_NARCEntryCount(u32 narcID, u32 bankID); /** * @brief Initialize a new MessageLoader struct targeting a given archive and * message bank. - * + * * @param type The load-type; controls if we use a bank or NARC handle. * @param narcID Archive from which to load any banks. * @param bankID Index of the bank we are targeting. - * @param heapID Heap on which to allocate the loaded archive. + * @param heapID Heap on which to allocate the loaded archive. * @return Initialized MessageLoader struct. */ -MessageLoader* MessageLoader_Init(enum MessageLoaderType type, u32 narcID, u32 bankID, u32 heapID); +MessageLoader *MessageLoader_Init(enum MessageLoaderType type, u32 narcID, u32 bankID, u32 heapID); /** * @brief Free a MessageLoader struct back to its owning heap. - * + * * @param loader The struct to be freed. */ void MessageLoader_Free(MessageLoader *loader); /** * @brief Load a bank entry into the destination Strbuf struct. - * + * * @param loader The loader; controls the entry load from a message bank. * @param entryID The entry to be loaded from the loader's target bank. * @param strbuf Destination Strbuf struct. @@ -189,16 +189,16 @@ void MessageLoader_GetStrbuf(const MessageLoader *loader, u32 entryID, Strbuf *s /** * @brief Load a bank entry and copy it into a newly-allocated Strbuf struct. - * + * * @param loader The loader; controls the entry load from a message bank. * @param entryID The entry to be loaded from the loader's target bank. * @return A newly-allocated Strbuf struct containing the loaded bank entry. */ -Strbuf* MessageLoader_GetNewStrbuf(const MessageLoader *loader, u32 entryID); +Strbuf *MessageLoader_GetNewStrbuf(const MessageLoader *loader, u32 entryID); /** * @brief Get the number of entries in the loader's target message bank. - * + * * @param loader The loader. * @return The number of entries in the loader's target message bank. */ @@ -206,7 +206,7 @@ u32 MessageLoader_MessageCount(const MessageLoader *loader); /** * @brief Load a bank entry into the destination buffer. - * + * * @param loader The loader; controls the entry load from a message bank. * @param entryID The entry to be loaded from the loader's target bank. * @param dst The destination buffer. @@ -216,7 +216,7 @@ void MessageLoader_Get(const MessageLoader *loader, u32 entryID, charcode_t *dst /** * @brief Load the name of a Pokemon species into the destination buffer into * a destination buffer. - * + * * @param species The target species ID; targets an entry in pl_personal. * @param heapID Heap on which to allocate the temporary message bank load. * @param dst The destination buffer. diff --git a/include/message_util.h b/include/message_util.h index 62b84e65ea..4a79e89f8e 100644 --- a/include/message_util.h +++ b/include/message_util.h @@ -2,13 +2,13 @@ #define POKEPLATINUM_MESSAGE_UTIL_H #include "message.h" -#include "string_template.h" #include "strbuf.h" +#include "string_template.h" -#define EXPANDED_STRING_SIZE 1024 +#define EXPANDED_STRING_SIZE 1024 -Strbuf* MessageUtil_ExpandedStrbuf(StringTemplate *template, MessageLoader *loader, u32 entryID, u32 heapID); -Strbuf* MessageUtil_MoveName(u32 moveID, u32 heapID); -Strbuf* MessageUtil_SpeciesName(u32 species, u32 heapID); +Strbuf *MessageUtil_ExpandedStrbuf(StringTemplate *template, MessageLoader *loader, u32 entryID, u32 heapID); +Strbuf *MessageUtil_MoveName(u32 moveID, u32 heapID); +Strbuf *MessageUtil_SpeciesName(u32 species, u32 heapID); #endif // POKEPLATINUM_MESSAGE_UTIL_H diff --git a/include/move_table.h b/include/move_table.h index 176b2eae56..70afd31840 100644 --- a/include/move_table.h +++ b/include/move_table.h @@ -25,17 +25,17 @@ typedef struct MoveTable { /** * @brief Load the full move table into a destination buffer. - * + * * No allocation happens here; the destination buffer is assumed to be * allocated on entry. - * + * * @param buf */ void MoveTable_Load(void *buf); /** * @brief Load a param for a given move from the global move table. - * + * * @param move The move to load. * @param param The param value to load. * @return Value of the parameter for the requested move. @@ -45,7 +45,7 @@ u32 MoveTable_LoadParam(int move, enum MoveAttribute param); /** * @brief Compute the maximum PP for a given move according to a specified * number of PP Ups applied to that move. - * + * * @param move * @param ppUps The number of PP Ups which have been applied to this move. * @return The maximum PP of the move, accounting for PP Ups. @@ -54,7 +54,7 @@ u8 MoveTable_CalcMaxPP(u16 move, u8 ppUps); /** * @brief Get a param value for a given move table entry. - * + * * @param entry A pre-loaded move table entry. * @param param The param to get. * @return Value of the parameter for the given move. diff --git a/include/narc.h b/include/narc.h index ee4c41208f..a8059d2e9c 100644 --- a/include/narc.h +++ b/include/narc.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_UNK_020068C8_H #define POKEPLATINUM_UNK_020068C8_H -#include "struct_decls/struct_02006C24_decl.h" - #include "constants/narc.h" +#include "struct_decls/struct_02006C24_decl.h" + /* * The NARC struct wraps NitroSDK type FSFile and manages the important * offsets to the FATB and the FIMG chunks within the file. - * + * * FATB defines the regions within the FIMG to which the data are allocated. */ struct NARC { @@ -25,7 +25,7 @@ struct NARC { * @param narcIndex: Index of NARC to read * @param memebrIndex: Index of FAT member within the NARC */ -void NARC_ReadWholeMemberByIndexPair(void * dest, int narcIndex, int memberIndex); +void NARC_ReadWholeMemberByIndexPair(void *dest, int narcIndex, int memberIndex); /* * Creates a new buffer large enough to hold the content of the archive member, then reads its data. @@ -37,8 +37,8 @@ void NARC_ReadWholeMemberByIndexPair(void * dest, int narcIndex, int memberIndex * * @returns: Pointer to the allocated buffer which contains the data that was read. */ -void * NARC_AllocAndReadWholeMemberByIndexPair(int narcIndex, int memberIndex, int heapID); -void * NARC_AllocAtEndAndReadWholeMemberByIndexPair(int narcIndex, int memberIndex, int heapID); +void *NARC_AllocAndReadWholeMemberByIndexPair(int narcIndex, int memberIndex, int heapID); +void *NARC_AllocAtEndAndReadWholeMemberByIndexPair(int narcIndex, int memberIndex, int heapID); /* * Reads a portion of an archive member into an existing buffer @@ -49,7 +49,7 @@ void * NARC_AllocAtEndAndReadWholeMemberByIndexPair(int narcIndex, int memberInd * @param offset: Byte offset to start reading, relative to start of member, up to the end of member * @param bytesToRead: Number of bytes to read, up to the total bytesToRead of member minus offset */ -void NARC_ReadFromMemberByIndexPair(void * dest, int narcIndex, int memberIndex, int offset, int bytesToRead); +void NARC_ReadFromMemberByIndexPair(void *dest, int narcIndex, int memberIndex, int offset, int bytesToRead); /* * Creates a new buffer large enough to hold the size of the data to read, then reads the specified data slice. @@ -63,8 +63,8 @@ void NARC_ReadFromMemberByIndexPair(void * dest, int narcIndex, int memberIndex, * * @returns: Pointer to the allocated buffer which contains the data that was read. */ -void * NARC_AllocAndReadFromMemberByIndexPair(int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead); -void * NARC_AllocAtEndAndReadFromMemberByIndexPair(int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead); +void *NARC_AllocAndReadFromMemberByIndexPair(int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead); +void *NARC_AllocAtEndAndReadFromMemberByIndexPair(int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead); /* * Gets the size of a NARC member. Useful when managing the read buffer yourself and the NARC has variable @@ -86,14 +86,14 @@ u32 NARC_GetMemberSizeByIndexPair(int narcIndex, int memberIndex); * * @returns: Pointer to the newly-allocated NARC */ -NARC * NARC_ctor(u32 narcIndex, u32 heapID); +NARC *NARC_ctor(u32 narcIndex, u32 heapID); /* * Closes the wrapped FSFile and returns the NARC allocation to the heap from whence it came. * * @param narc: Pointer to the NARC */ -void NARC_dtor(NARC * narc); +void NARC_dtor(NARC *narc); /* * Creates a new buffer large enough to hold the content of the archive member, then reads its data. @@ -104,7 +104,7 @@ void NARC_dtor(NARC * narc); * * @returns: Pointer to the allocated buffer which contains the data that was read. */ -void * NARC_AllocAndReadWholeMember(NARC * narc, u32 memberIndex, u32 heapID); +void *NARC_AllocAndReadWholeMember(NARC *narc, u32 memberIndex, u32 heapID); /* * Reads NARC member to preallocated buffer dest, which should be large enough to hold the data. @@ -113,7 +113,7 @@ void * NARC_AllocAndReadWholeMember(NARC * narc, u32 memberIndex, u32 heapID); * @param memberIndex: Index of FAT member within the NARC * @param dest: Pointer to the destination buffer */ -void NARC_ReadWholeMember(NARC * narc, u32 memberIndex, void * dest); +void NARC_ReadWholeMember(NARC *narc, u32 memberIndex, void *dest); /* * Gets the size of a NARC member. Useful when managing the read buffer yourself and the NARC has variable @@ -124,7 +124,7 @@ void NARC_ReadWholeMember(NARC * narc, u32 memberIndex, void * dest); * * @returns: Size in bytes of the member */ -u32 NARC_GetMemberSize(NARC * narc, u32 memberIndex); +u32 NARC_GetMemberSize(NARC *narc, u32 memberIndex); /* * Reads a portion of an archive member into an existing buffer @@ -135,7 +135,7 @@ u32 NARC_GetMemberSize(NARC * narc, u32 memberIndex); * @param bytesToRead: Number of bytes to read, up to the total bytesToRead of member minus offset * @param dest: Pointer to destination buffer, should be large enough to hold the data */ -void NARC_ReadFromMember(NARC * narc, u32 memberIndex, u32 offset, u32 bytesToRead, void * dest); +void NARC_ReadFromMember(NARC *narc, u32 memberIndex, u32 offset, u32 bytesToRead, void *dest); /* * Reads a portion of the archive file from the current cursor into an existing buffer @@ -144,9 +144,9 @@ void NARC_ReadFromMember(NARC * narc, u32 memberIndex, u32 offset, u32 bytesToRe * @param bytesToRead: Number of bytes to read, up to the total bytesToRead of member minus offset * @param dest: Pointer to destination buffer, should be large enough to hold the data */ -void NARC_ReadFile(NARC * narc, u32 bytesToRead, void * dest); +void NARC_ReadFile(NARC *narc, u32 bytesToRead, void *dest); -void sub_02006E28(NARC * param0, u32 param1); +void sub_02006E28(NARC *param0, u32 param1); /* * Gets the total number of archive members @@ -155,6 +155,6 @@ void sub_02006E28(NARC * param0, u32 param1); * * @returns: Number of archive members */ -u16 NARC_GetFileCount(NARC * narc); +u16 NARC_GetFileCount(NARC *narc); #endif // POKEPLATINUM_UNK_020068C8_H diff --git a/include/overlay004/funcptr_ov4_021D1104.h b/include/overlay004/funcptr_ov4_021D1104.h index d5a4e15ed1..e38e9944dc 100644 --- a/include/overlay004/funcptr_ov4_021D1104.h +++ b/include/overlay004/funcptr_ov4_021D1104.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV4_021D1104_H #define POKEPLATINUM_FUNCPTR_OV4_021D1104_H -typedef void (* UnkFuncPtr_ov4_021D1104) (u16, u16 *, u16); +typedef void (*UnkFuncPtr_ov4_021D1104)(u16, u16 *, u16); #endif // POKEPLATINUM_FUNCPTR_OV4_021D1104_H diff --git a/include/overlay004/funcptr_ov4_021D1120.h b/include/overlay004/funcptr_ov4_021D1120.h index dbf6b7218d..bf45e95d78 100644 --- a/include/overlay004/funcptr_ov4_021D1120.h +++ b/include/overlay004/funcptr_ov4_021D1120.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV4_021D1120_H #define POKEPLATINUM_FUNCPTR_OV4_021D1120_H -typedef void (* UnkFuncPtr_ov4_021D1120) (u16, void *); +typedef void (*UnkFuncPtr_ov4_021D1120)(u16, void *); #endif // POKEPLATINUM_FUNCPTR_OV4_021D1120_H diff --git a/include/overlay004/funcptr_ov4_021D113C.h b/include/overlay004/funcptr_ov4_021D113C.h index 1acd563b12..af5c7541fb 100644 --- a/include/overlay004/funcptr_ov4_021D113C.h +++ b/include/overlay004/funcptr_ov4_021D113C.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV4_021D113C_H #define POKEPLATINUM_FUNCPTR_OV4_021D113C_H -typedef BOOL (* UnkFuncPtr_ov4_021D113C) (int); +typedef BOOL (*UnkFuncPtr_ov4_021D113C)(int); #endif // POKEPLATINUM_FUNCPTR_OV4_021D113C_H diff --git a/include/overlay004/funcptr_ov4_021D1150.h b/include/overlay004/funcptr_ov4_021D1150.h index b440fd83f7..12c6ba2a6c 100644 --- a/include/overlay004/funcptr_ov4_021D1150.h +++ b/include/overlay004/funcptr_ov4_021D1150.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV4_021D1150_H #define POKEPLATINUM_FUNCPTR_OV4_021D1150_H -typedef void (* UnkFuncPtr_ov4_021D1150) (u16, void *); +typedef void (*UnkFuncPtr_ov4_021D1150)(u16, void *); #endif // POKEPLATINUM_FUNCPTR_OV4_021D1150_H diff --git a/include/overlay004/ov4_021D0D80.h b/include/overlay004/ov4_021D0D80.h index 72416250ff..6cd71b94a6 100644 --- a/include/overlay004/ov4_021D0D80.h +++ b/include/overlay004/ov4_021D0D80.h @@ -1,29 +1,30 @@ #ifndef POKEPLATINUM_OV4_021D0D80_H #define POKEPLATINUM_OV4_021D0D80_H -#include "savedata.h" +#include + #include "overlay004/funcptr_ov4_021D1104.h" #include "overlay004/funcptr_ov4_021D1120.h" #include "overlay004/funcptr_ov4_021D113C.h" #include "overlay004/funcptr_ov4_021D1150.h" -#include +#include "savedata.h" -int ov4_021D0D80(SaveData * param0, int param1, int param2, int param3); +int ov4_021D0D80(SaveData *param0, int param1, int param2, int param3); void ov4_021D0F68(); int ov4_021D0FEC(); void ov4_021D1104(UnkFuncPtr_ov4_021D1104 param0, UnkFuncPtr_ov4_021D1104 param1); -void ov4_021D1120(UnkFuncPtr_ov4_021D1120 param0, void * param1); +void ov4_021D1120(UnkFuncPtr_ov4_021D1120 param0, void *param1); void ov4_021D113C(UnkFuncPtr_ov4_021D113C param0); -void ov4_021D1150(UnkFuncPtr_ov4_021D1150 param0, void * param1); -int ov4_021D116C(u8 * param0, int param1, BOOL param2, u32 param3); +void ov4_021D1150(UnkFuncPtr_ov4_021D1150 param0, void *param1); +int ov4_021D116C(u8 *param0, int param1, BOOL param2, u32 param3); int ov4_021D12D4(int param0); BOOL ov4_021D1404(); -int ov4_021D142C(void * param0, int param1); -int ov4_021D14D4(void * param0, int param1); -int ov4_021D1590(void * param0, int param1); -void * ov4_021D1AA0(DWCAllocType param0, u32 param1, int param2); -void ov4_021D1B04(DWCAllocType param0, void * param1, u32 param2); +int ov4_021D142C(void *param0, int param1); +int ov4_021D14D4(void *param0, int param1); +int ov4_021D1590(void *param0, int param1); +void *ov4_021D1AA0(DWCAllocType param0, u32 param1, int param2); +void ov4_021D1B04(DWCAllocType param0, void *param1, u32 param2); int ov4_021D1B5C(void); int ov4_021D1E30(); void ov4_021D1E74(int param0); @@ -31,10 +32,10 @@ void ov4_021D1F18(void); int ov4_021D1F3C(int param0, int param1); int ov4_021D20B0(int param0); int ov4_021D2134(); -void ov4_021D2170(void (* func)(int)); +void ov4_021D2170(void (*func)(int)); void ov4_021D2184(void); -void ov4_021D2198(void * param0, int param1); -BOOL ov4_021D222C(const void * param0, int param1); +void ov4_021D2198(void *param0, int param1); +BOOL ov4_021D222C(const void *param0, int param1); u8 ov4_021D2234(int param0); int ov4_021D2248(int param0, int param1, BOOL param2); int ov4_021D2388(); diff --git a/include/overlay004/ov4_021D2808.h b/include/overlay004/ov4_021D2808.h index 20f0b9d0c1..50a9fa9c22 100644 --- a/include/overlay004/ov4_021D2808.h +++ b/include/overlay004/ov4_021D2808.h @@ -2,10 +2,10 @@ #define POKEPLATINUM_OV4_021D2808_H void ov4_021D2B28(); -BOOL ov4_021D2C70(int param0, void * param1, int param2); +BOOL ov4_021D2C70(int param0, void *param1, int param2); void ov4_021D2CC0(int param0, int param1, int param2); void ov4_021D2EA4(); -void ov4_021D2EF4(void (* func)()); +void ov4_021D2EF4(void (*func)()); void ov4_021D2F08(void); BOOL ov4_021D2F7C(void); void ov4_021D2FA4(); diff --git a/include/overlay005/encounter_effect.h b/include/overlay005/encounter_effect.h index 1d793a1b21..930880a309 100644 --- a/include/overlay005/encounter_effect.h +++ b/include/overlay005/encounter_effect.h @@ -1,25 +1,26 @@ #ifndef POKEPLATINUM_ENCOUNTER_EFFECT_H #define POKEPLATINUM_ENCOUNTER_EFFECT_H -#include "overlay005/hblank_system.h" +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "field/field_system_decl.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system_decl.h" #include "overlay005/encounter_effect.h" -#include "overlay005/linear_interpolation_task_s32.h" +#include "overlay005/hblank_system.h" #include "overlay005/linear_interpolation_task_fx32.h" +#include "overlay005/linear_interpolation_task_s32.h" #include "overlay005/quadratic_interpolation_task_fx32.h" #include "overlay005/struct_ov5_021DDF24.h" #include "overlay005/struct_ov5_021DE47C.h" #include "overlay005/struct_ov5_021DE5A4.h" #include "overlay006/battle_params.h" -#include "enc_effects.h" - -#include +#include "enc_effects.h" +#include "sys_task_manager.h" typedef struct EncounterEffect { int state; diff --git a/include/overlay005/funcptr_ov5_021E9630.h b/include/overlay005/funcptr_ov5_021E9630.h index ad4c47aac0..5c0491fac4 100644 --- a/include/overlay005/funcptr_ov5_021E9630.h +++ b/include/overlay005/funcptr_ov5_021E9630.h @@ -3,6 +3,6 @@ #include "overlay005/struct_ov5_021E1608_decl.h" -typedef void (* UnkFuncPtr_ov5_021E9630)(void *, const int, UnkStruct_ov5_021E1608 * const); +typedef void (*UnkFuncPtr_ov5_021E9630)(void *, const int, UnkStruct_ov5_021E1608 *const); #endif // POKEPLATINUM_FUNCPTR_OV5_021E9630_H diff --git a/include/overlay005/funcptr_ov5_021EE454.h b/include/overlay005/funcptr_ov5_021EE454.h index 41143c51b9..1773226f3f 100644 --- a/include/overlay005/funcptr_ov5_021EE454.h +++ b/include/overlay005/funcptr_ov5_021EE454.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020216E0_decl.h" -typedef void (* UnkFuncPtr_ov5_021EE454)(void *, const UnkStruct_020216E0 *); +typedef void (*UnkFuncPtr_ov5_021EE454)(void *, const UnkStruct_020216E0 *); #endif // POKEPLATINUM_FUNCPTR_OV5_021EE454_H diff --git a/include/overlay005/funcptr_ov5_021FB0F0.h b/include/overlay005/funcptr_ov5_021FB0F0.h index e632ca6dcd..9bc39d4a41 100644 --- a/include/overlay005/funcptr_ov5_021FB0F0.h +++ b/include/overlay005/funcptr_ov5_021FB0F0.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_ov5_021FB0F0)(MapObject *); +typedef void (*UnkFuncPtr_ov5_021FB0F0)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_H diff --git a/include/overlay005/funcptr_ov5_021FB0F0_1.h b/include/overlay005/funcptr_ov5_021FB0F0_1.h index c3aee1e0ec..4d154e46f7 100644 --- a/include/overlay005/funcptr_ov5_021FB0F0_1.h +++ b/include/overlay005/funcptr_ov5_021FB0F0_1.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_ov5_021FB0F0_1)(MapObject *); +typedef void (*UnkFuncPtr_ov5_021FB0F0_1)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_1_H diff --git a/include/overlay005/funcptr_ov5_021FB0F0_2.h b/include/overlay005/funcptr_ov5_021FB0F0_2.h index 0d57b66ef1..125a0a7224 100644 --- a/include/overlay005/funcptr_ov5_021FB0F0_2.h +++ b/include/overlay005/funcptr_ov5_021FB0F0_2.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_ov5_021FB0F0_2)(MapObject *); +typedef void (*UnkFuncPtr_ov5_021FB0F0_2)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_2_H diff --git a/include/overlay005/funcptr_ov5_021FB0F0_3.h b/include/overlay005/funcptr_ov5_021FB0F0_3.h index bd8e10ac17..0e336c590b 100644 --- a/include/overlay005/funcptr_ov5_021FB0F0_3.h +++ b/include/overlay005/funcptr_ov5_021FB0F0_3.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_ov5_021FB0F0_3)(MapObject *); +typedef void (*UnkFuncPtr_ov5_021FB0F0_3)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_3_H diff --git a/include/overlay005/funcptr_ov5_021FB0F0_4.h b/include/overlay005/funcptr_ov5_021FB0F0_4.h index 976e0d7e4d..b3c92e3326 100644 --- a/include/overlay005/funcptr_ov5_021FB0F0_4.h +++ b/include/overlay005/funcptr_ov5_021FB0F0_4.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_02061AB4_decl.h" -typedef void (* UnkFuncPtr_ov5_021FB0F0_4)(MapObject *); +typedef void (*UnkFuncPtr_ov5_021FB0F0_4)(MapObject *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_4_H diff --git a/include/overlay005/funcptr_ov5_021FF85C.h b/include/overlay005/funcptr_ov5_021FF85C.h index abc5eeb414..05f88e9aae 100644 --- a/include/overlay005/funcptr_ov5_021FF85C.h +++ b/include/overlay005/funcptr_ov5_021FF85C.h @@ -3,6 +3,6 @@ #include "overlay005/struct_ov5_021DF47C_decl.h" -typedef void * (* UnkFuncPtr_ov5_021FF85C)(UnkStruct_ov5_021DF47C *); +typedef void *(*UnkFuncPtr_ov5_021FF85C)(UnkStruct_ov5_021DF47C *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FF85C_H diff --git a/include/overlay005/funcptr_ov5_021FF85C_1.h b/include/overlay005/funcptr_ov5_021FF85C_1.h index 330c933517..a640222b8f 100644 --- a/include/overlay005/funcptr_ov5_021FF85C_1.h +++ b/include/overlay005/funcptr_ov5_021FF85C_1.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV5_021FF85C_1_H #define POKEPLATINUM_FUNCPTR_OV5_021FF85C_1_H -typedef void (* UnkFuncPtr_ov5_021FF85C_1)(void *); +typedef void (*UnkFuncPtr_ov5_021FF85C_1)(void *); #endif // POKEPLATINUM_FUNCPTR_OV5_021FF85C_1_H diff --git a/include/overlay005/hblank_system.h b/include/overlay005/hblank_system.h index d4828d9a3d..b8480cdaf7 100644 --- a/include/overlay005/hblank_system.h +++ b/include/overlay005/hblank_system.h @@ -7,7 +7,7 @@ typedef struct HBlankTask HBlankTask; -typedef void (* HBlankCallback)(HBlankTask *task, void *param); +typedef void (*HBlankCallback)(HBlankTask *task, void *param); struct HBlankTask { BOOL used; diff --git a/include/overlay005/motion_blur.h b/include/overlay005/motion_blur.h index 49abbf3522..b996f28d56 100644 --- a/include/overlay005/motion_blur.h +++ b/include/overlay005/motion_blur.h @@ -2,9 +2,11 @@ #define POKEPLATINUM_MOTION_BLUR_H #include -#include "sys_task_manager.h" + #include "constants/heap.h" +#include "sys_task_manager.h" + typedef struct MotionBlurParams { GXDispMode displayMode; GXBGMode bgMode; diff --git a/include/overlay005/ov5_021D0D80.h b/include/overlay005/ov5_021D0D80.h index 6026a1b396..78f9e514d2 100644 --- a/include/overlay005/ov5_021D0D80.h +++ b/include/overlay005/ov5_021D0D80.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV5_021D0D80_H #include "struct_decls/struct_02018340_decl.h" + #include "field/field_system_decl.h" -void ov5_021D12D0(FieldSystem * fieldSystem, u32 param1); -void ov5_021D1434(BGL * param0); -void ov5_021D143C(BGL * param0); -void ov5_021D16F4(FieldSystem * fieldSystem, BOOL param1); -void ov5_021D1718(FieldSystem * fieldSystem, BOOL param1); +void ov5_021D12D0(FieldSystem *fieldSystem, u32 param1); +void ov5_021D1434(BGL *param0); +void ov5_021D143C(BGL *param0); +void ov5_021D16F4(FieldSystem *fieldSystem, BOOL param1); +void ov5_021D1718(FieldSystem *fieldSystem, BOOL param1); void ov5_021D1744(const u8 param0); #endif // POKEPLATINUM_OV5_021D0D80_H diff --git a/include/overlay005/ov5_021D1A94.h b/include/overlay005/ov5_021D1A94.h index 808c56781c..48d4398949 100644 --- a/include/overlay005/ov5_021D1A94.h +++ b/include/overlay005/ov5_021D1A94.h @@ -6,11 +6,11 @@ #include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay006/struct_ov6_0223E6EC.h" -UnkStruct_ov5_021D1A94 * ov5_021D1A94(FieldSystem * fieldSystem, int param1, int param2); -void ov5_021D1AE4(UnkStruct_ov5_021D1A94 * param0); -void ov5_021D1B18(UnkStruct_ov5_021D1A94 * param0); -UnkStruct_ov5_021D1BEC * ov5_021D1B6C(UnkStruct_ov5_021D1A94 * param0, const UnkStruct_ov6_0223E6EC * param1); -void ov5_021D1BEC(UnkStruct_ov5_021D1BEC * param0); -void * ov5_021D1C2C(UnkStruct_ov5_021D1BEC * param0); +UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, int param1, int param2); +void ov5_021D1AE4(UnkStruct_ov5_021D1A94 *param0); +void ov5_021D1B18(UnkStruct_ov5_021D1A94 *param0); +UnkStruct_ov5_021D1BEC *ov5_021D1B6C(UnkStruct_ov5_021D1A94 *param0, const UnkStruct_ov6_0223E6EC *param1); +void ov5_021D1BEC(UnkStruct_ov5_021D1BEC *param0); +void *ov5_021D1C2C(UnkStruct_ov5_021D1BEC *param0); #endif // POKEPLATINUM_OV5_021D1A94_H diff --git a/include/overlay005/ov5_021D2F14.h b/include/overlay005/ov5_021D2F14.h index dbaea2be5b..c6193f742a 100644 --- a/include/overlay005/ov5_021D2F14.h +++ b/include/overlay005/ov5_021D2F14.h @@ -1,28 +1,29 @@ #ifndef POKEPLATINUM_OV5_021D2F14_H #define POKEPLATINUM_OV5_021D2F14_H -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/cell_actor_data.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02022550_decl.h" +#include "struct_defs/sprite_template.h" + #include "overlay005/struct_ov5_021D30A8.h" #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_02241308.h" -void ov5_021D2F14(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F2EC * param1, u32 param2, u32 param3); -void ov5_021D30A8(UnkStruct_ov5_021D30A8 * param0); -GraphicElementData * ov5_021D3104(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1); -void ov5_021D3190(UnkStruct_ov5_021D30A8 * param0, UnkStruct_ov104_02241308 * param1, u32 param2, u32 param3); -void ov5_021D3270(UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int param3, int param4, int param5, int param6); -void ov5_021D32E8(UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4, int param5, int param6); -void ov5_021D3360(UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int param3, int param4); -void ov5_021D3374(UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4); -void ov5_021D3388(UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int param3, int param4); -void ov5_021D339C(UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4); -void ov5_021D33B0(UnkStruct_ov5_021D30A8 * param0, int param1, int param2, BOOL param3, int param4, int param5); -void ov5_021D3414(UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5); -CellActorData * ov5_021D3584(UnkStruct_ov5_021D30A8 * param0, const SpriteTemplate * param1); -void ov5_021D375C(UnkStruct_ov5_021D30A8 * param0); +void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const UnkStruct_ov7_0224F2EC *param1, u32 param2, u32 param3); +void ov5_021D30A8(UnkStruct_ov5_021D30A8 *param0); +GraphicElementData *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const UnkStruct_ov7_0224F358 *param1); +void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, UnkStruct_ov104_02241308 *param1, u32 param2, u32 param3); +void ov5_021D3270(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4, int param5, int param6); +void ov5_021D32E8(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4, int param5, int param6); +void ov5_021D3360(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4); +void ov5_021D3374(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4); +void ov5_021D3388(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4); +void ov5_021D339C(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4); +void ov5_021D33B0(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, BOOL param3, int param4, int param5); +void ov5_021D3414(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5); +CellActorData *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate *param1); +void ov5_021D375C(UnkStruct_ov5_021D30A8 *param0); #endif // POKEPLATINUM_OV5_021D2F14_H diff --git a/include/overlay005/ov5_021D37AC.h b/include/overlay005/ov5_021D37AC.h index 99b9a1e489..c7662fbbdc 100644 --- a/include/overlay005/ov5_021D37AC.h +++ b/include/overlay005/ov5_021D37AC.h @@ -1,45 +1,45 @@ #ifndef POKEPLATINUM_OV5_021D37AC_H #define POKEPLATINUM_OV5_021D37AC_H +#include + #include "overlay005/struct_ov5_021D3CAC_decl.h" #include "overlay005/struct_ov5_021D3CE4_decl.h" #include "overlay005/struct_ov5_021D41B4_decl.h" -#include - -UnkStruct_ov5_021D3CAC * ov5_021D38B8(void); -UnkStruct_ov5_021D3CE4 * ov5_021D3978(const int param0, const int param1, const int param2, const int param3, const BOOL param4, const BOOL param5, const BOOL param6, NNSG3dResMdl * param7, NNSG3dResTex * param8, UnkStruct_ov5_021D3CAC * param9); -void ov5_021D3A50(const int param0, NNSG3dResMdl * param1, NNSG3dResTex * param2, UnkStruct_ov5_021D3CAC * param3); -BOOL ov5_021D3B24(const int param0, const int param1, const BOOL param2, NNSG3dRenderObj * param3, UnkStruct_ov5_021D3CAC * param4); -BOOL ov5_021D3BE4(const int param0, NNSG3dRenderObj * param1, UnkStruct_ov5_021D3CAC * param2); -void ov5_021D3CAC(UnkStruct_ov5_021D3CAC * param0); -void ov5_021D3CE4(UnkStruct_ov5_021D3CE4 * param0, UnkStruct_ov5_021D3CAC * param1); -void ov5_021D3D18(UnkStruct_ov5_021D3CAC * param0, NNSG3dRenderObj * param1, const int param2, const int param3); -void ov5_021D3D7C(UnkStruct_ov5_021D3CAC * param0); -UnkStruct_ov5_021D3CE4 * ov5_021D3DA0(const int param0, UnkStruct_ov5_021D3CAC * param1); -UnkStruct_ov5_021D3CE4 * ov5_021D3DE4(const int param0, const int param1, UnkStruct_ov5_021D3CAC * param2); -void ov5_021D3E40(UnkStruct_ov5_021D3CE4 * param0, const BOOL param1); -void ov5_021D3E44(UnkStruct_ov5_021D3CE4 * param0); -BOOL ov5_021D3E4C(UnkStruct_ov5_021D3CE4 * param0); -void ov5_021D3E7C(UnkStruct_ov5_021D3CE4 * param0); -void ov5_021D3E9C(UnkStruct_ov5_021D3CE4 * param0); -void ov5_021D3EBC(UnkStruct_ov5_021D3CE4 * param0); -void ov5_021D3F04(UnkStruct_ov5_021D3CE4 * param0, const BOOL param1); -void ov5_021D3F08(UnkStruct_ov5_021D3CE4 * param0, const int param1); -void ov5_021D3F0C(UnkStruct_ov5_021D3CE4 * param0, const int param1); -void ov5_021D3F10(UnkStruct_ov5_021D3CAC * param0); -BOOL ov5_021D3F70(const UnkStruct_ov5_021D3CE4 * param0); -u16 ov5_021D3F84(UnkStruct_ov5_021D3CAC * param0); -const u8 ov5_021D3F94(UnkStruct_ov5_021D3CAC * param0, const int param1); -UnkStruct_ov5_021D41B4 * ov5_021D4194(void); -void ov5_021D41B4(UnkStruct_ov5_021D41B4 ** param0); -void ov5_021D41C8(UnkStruct_ov5_021D3CAC * param0, UnkStruct_ov5_021D41B4 * const param1, const int param2, const int param3, NNSG3dRenderObj * param4, NNSG3dResMdl * param5, NNSG3dResTex * param6, const int param7, const u8 param8, const BOOL param9); -void ov5_021D4220(UnkStruct_ov5_021D41B4 * const param0, const int param1, const u8 param2, NNSG3dRenderObj * param3); -void ov5_021D4250(UnkStruct_ov5_021D41B4 * const param0, const int param1, const int param2); -void ov5_021D4278(UnkStruct_ov5_021D41B4 * const param0, const int param1, const int param2, const int param3); -void ov5_021D42B0(UnkStruct_ov5_021D3CAC * param0, UnkStruct_ov5_021D41B4 * param1, const int param2); -UnkStruct_ov5_021D3CE4 * ov5_021D42D8(UnkStruct_ov5_021D41B4 * const param0, const int param1); -const BOOL ov5_021D42F0(UnkStruct_ov5_021D41B4 * const param0, const int param1); -const int ov5_021D4310(UnkStruct_ov5_021D41B4 * const param0, const int param1); +UnkStruct_ov5_021D3CAC *ov5_021D38B8(void); +UnkStruct_ov5_021D3CE4 *ov5_021D3978(const int param0, const int param1, const int param2, const int param3, const BOOL param4, const BOOL param5, const BOOL param6, NNSG3dResMdl *param7, NNSG3dResTex *param8, UnkStruct_ov5_021D3CAC *param9); +void ov5_021D3A50(const int param0, NNSG3dResMdl *param1, NNSG3dResTex *param2, UnkStruct_ov5_021D3CAC *param3); +BOOL ov5_021D3B24(const int param0, const int param1, const BOOL param2, NNSG3dRenderObj *param3, UnkStruct_ov5_021D3CAC *param4); +BOOL ov5_021D3BE4(const int param0, NNSG3dRenderObj *param1, UnkStruct_ov5_021D3CAC *param2); +void ov5_021D3CAC(UnkStruct_ov5_021D3CAC *param0); +void ov5_021D3CE4(UnkStruct_ov5_021D3CE4 *param0, UnkStruct_ov5_021D3CAC *param1); +void ov5_021D3D18(UnkStruct_ov5_021D3CAC *param0, NNSG3dRenderObj *param1, const int param2, const int param3); +void ov5_021D3D7C(UnkStruct_ov5_021D3CAC *param0); +UnkStruct_ov5_021D3CE4 *ov5_021D3DA0(const int param0, UnkStruct_ov5_021D3CAC *param1); +UnkStruct_ov5_021D3CE4 *ov5_021D3DE4(const int param0, const int param1, UnkStruct_ov5_021D3CAC *param2); +void ov5_021D3E40(UnkStruct_ov5_021D3CE4 *param0, const BOOL param1); +void ov5_021D3E44(UnkStruct_ov5_021D3CE4 *param0); +BOOL ov5_021D3E4C(UnkStruct_ov5_021D3CE4 *param0); +void ov5_021D3E7C(UnkStruct_ov5_021D3CE4 *param0); +void ov5_021D3E9C(UnkStruct_ov5_021D3CE4 *param0); +void ov5_021D3EBC(UnkStruct_ov5_021D3CE4 *param0); +void ov5_021D3F04(UnkStruct_ov5_021D3CE4 *param0, const BOOL param1); +void ov5_021D3F08(UnkStruct_ov5_021D3CE4 *param0, const int param1); +void ov5_021D3F0C(UnkStruct_ov5_021D3CE4 *param0, const int param1); +void ov5_021D3F10(UnkStruct_ov5_021D3CAC *param0); +BOOL ov5_021D3F70(const UnkStruct_ov5_021D3CE4 *param0); +u16 ov5_021D3F84(UnkStruct_ov5_021D3CAC *param0); +const u8 ov5_021D3F94(UnkStruct_ov5_021D3CAC *param0, const int param1); +UnkStruct_ov5_021D41B4 *ov5_021D4194(void); +void ov5_021D41B4(UnkStruct_ov5_021D41B4 **param0); +void ov5_021D41C8(UnkStruct_ov5_021D3CAC *param0, UnkStruct_ov5_021D41B4 *const param1, const int param2, const int param3, NNSG3dRenderObj *param4, NNSG3dResMdl *param5, NNSG3dResTex *param6, const int param7, const u8 param8, const BOOL param9); +void ov5_021D4220(UnkStruct_ov5_021D41B4 *const param0, const int param1, const u8 param2, NNSG3dRenderObj *param3); +void ov5_021D4250(UnkStruct_ov5_021D41B4 *const param0, const int param1, const int param2); +void ov5_021D4278(UnkStruct_ov5_021D41B4 *const param0, const int param1, const int param2, const int param3); +void ov5_021D42B0(UnkStruct_ov5_021D3CAC *param0, UnkStruct_ov5_021D41B4 *param1, const int param2); +UnkStruct_ov5_021D3CE4 *ov5_021D42D8(UnkStruct_ov5_021D41B4 *const param0, const int param1); +const BOOL ov5_021D42F0(UnkStruct_ov5_021D41B4 *const param0, const int param1); +const int ov5_021D4310(UnkStruct_ov5_021D41B4 *const param0, const int param1); #endif // POKEPLATINUM_OV5_021D37AC_H diff --git a/include/overlay005/ov5_021D431C.h b/include/overlay005/ov5_021D431C.h index 135e265bd0..505eb0e61a 100644 --- a/include/overlay005/ov5_021D431C.h +++ b/include/overlay005/ov5_021D431C.h @@ -1,29 +1,30 @@ #ifndef POKEPLATINUM_OV5_021D431C_H #define POKEPLATINUM_OV5_021D431C_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" + +#include "field/field_system_decl.h" #include "overlay005/struct_ov5_021D432C_decl.h" #include "overlay005/struct_ov5_021D4E00_decl.h" -UnkStruct_ov5_021D432C * ov5_021D431C(void); -void ov5_021D432C(UnkStruct_ov5_021D432C * param0); -void ov5_021D4334(const int param0, const int param1, UnkStruct_ov5_021D432C * param2); -BOOL ov5_021D433C(FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1); -BOOL ov5_021D453C(FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1); -BOOL ov5_021D4858(FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, const u8 param2); -BOOL ov5_021D4A24(FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, const u8 param2); -void ov5_021D4BF4(FieldSystem * fieldSystem, const int param1, const int param2, const u8 param3); -void ov5_021D4C88(FieldSystem * fieldSystem, const u8 param1); -void ov5_021D4CEC(FieldSystem * fieldSystem, const u8 param1); -void ov5_021D4D48(FieldSystem * fieldSystem, const u8 param1); -void ov5_021D4D68(FieldSystem * fieldSystem, const u8 param1); -void ov5_021D4D78(const int param0, const int param1, const int param2, FieldSystem * param3); -UnkStruct_ov5_021D4E00 * ov5_021D4E00(void); -BOOL ov5_021D4E10(TaskManager * param0); -BOOL ov5_021D4F14(TaskManager * param0); -BOOL ov5_021D4FA0(TaskManager * param0); -BOOL ov5_021D5020(TaskManager * param0); -BOOL ov5_021D5150(TaskManager * param0); +UnkStruct_ov5_021D432C *ov5_021D431C(void); +void ov5_021D432C(UnkStruct_ov5_021D432C *param0); +void ov5_021D4334(const int param0, const int param1, UnkStruct_ov5_021D432C *param2); +BOOL ov5_021D433C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1); +BOOL ov5_021D453C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1); +BOOL ov5_021D4858(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1, const u8 param2); +BOOL ov5_021D4A24(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1, const u8 param2); +void ov5_021D4BF4(FieldSystem *fieldSystem, const int param1, const int param2, const u8 param3); +void ov5_021D4C88(FieldSystem *fieldSystem, const u8 param1); +void ov5_021D4CEC(FieldSystem *fieldSystem, const u8 param1); +void ov5_021D4D48(FieldSystem *fieldSystem, const u8 param1); +void ov5_021D4D68(FieldSystem *fieldSystem, const u8 param1); +void ov5_021D4D78(const int param0, const int param1, const int param2, FieldSystem *param3); +UnkStruct_ov5_021D4E00 *ov5_021D4E00(void); +BOOL ov5_021D4E10(TaskManager *param0); +BOOL ov5_021D4F14(TaskManager *param0); +BOOL ov5_021D4FA0(TaskManager *param0); +BOOL ov5_021D5020(TaskManager *param0); +BOOL ov5_021D5150(TaskManager *param0); #endif // POKEPLATINUM_OV5_021D431C_H diff --git a/include/overlay005/ov5_021D521C.h b/include/overlay005/ov5_021D521C.h index 033ef3103e..605891e3ab 100644 --- a/include/overlay005/ov5_021D521C.h +++ b/include/overlay005/ov5_021D521C.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_OV5_021D521C_H #define POKEPLATINUM_OV5_021D521C_H +#include + #include "overlay005/struct_ov5_021D52F4.h" #include "overlay005/struct_ov5_021D538C_decl.h" #include "overlay005/struct_ov5_021D5894.h" -#include - -UnkStruct_ov5_021D538C * ov5_021D521C(UnkStruct_ov5_021D5894 * param0, const u8 param1); -void ov5_021D5278(UnkStruct_ov5_021D538C ** param0); -void ov5_021D5298(UnkStruct_ov5_021D538C * param0); -void ov5_021D52F4(const UnkStruct_ov5_021D52F4 * param0, UnkStruct_ov5_021D5894 * param1); -void ov5_021D53A4(NNSG3dResMdl * param0); +UnkStruct_ov5_021D538C *ov5_021D521C(UnkStruct_ov5_021D5894 *param0, const u8 param1); +void ov5_021D5278(UnkStruct_ov5_021D538C **param0); +void ov5_021D5298(UnkStruct_ov5_021D538C *param0); +void ov5_021D52F4(const UnkStruct_ov5_021D52F4 *param0, UnkStruct_ov5_021D5894 *param1); +void ov5_021D53A4(NNSG3dResMdl *param0); #endif // POKEPLATINUM_OV5_021D521C_H diff --git a/include/overlay005/ov5_021D56BC.h b/include/overlay005/ov5_021D56BC.h index b5a2fb13d0..176a251eb2 100644 --- a/include/overlay005/ov5_021D56BC.h +++ b/include/overlay005/ov5_021D56BC.h @@ -4,11 +4,11 @@ #include "overlay005/struct_ov5_021D5778_decl.h" #include "overlay005/struct_ov5_021D57B4.h" -UnkStruct_ov5_021D5778 * ov5_021D56BC(void); -void ov5_021D56D4(const char * param0, UnkStruct_ov5_021D5778 * param1); -void ov5_021D5778(UnkStruct_ov5_021D5778 * param0); -void ov5_021D5790(const int param0, const UnkStruct_ov5_021D5778 * param1, u16 * param2); -void ov5_021D579C(const int param0, const UnkStruct_ov5_021D5778 * param1, u16 * param2, u16 * param3); -UnkStruct_ov5_021D57B4 const * ov5_021D57B4(const u16 param0, const UnkStruct_ov5_021D5778 * param1); +UnkStruct_ov5_021D5778 *ov5_021D56BC(void); +void ov5_021D56D4(const char *param0, UnkStruct_ov5_021D5778 *param1); +void ov5_021D5778(UnkStruct_ov5_021D5778 *param0); +void ov5_021D5790(const int param0, const UnkStruct_ov5_021D5778 *param1, u16 *param2); +void ov5_021D579C(const int param0, const UnkStruct_ov5_021D5778 *param1, u16 *param2, u16 *param3); +UnkStruct_ov5_021D57B4 const *ov5_021D57B4(const u16 param0, const UnkStruct_ov5_021D5778 *param1); #endif // POKEPLATINUM_OV5_021D56BC_H diff --git a/include/overlay005/ov5_021D57BC.h b/include/overlay005/ov5_021D57BC.h index a9f6579847..c5074ef719 100644 --- a/include/overlay005/ov5_021D57BC.h +++ b/include/overlay005/ov5_021D57BC.h @@ -1,18 +1,18 @@ #ifndef POKEPLATINUM_OV5_021D57BC_H #define POKEPLATINUM_OV5_021D57BC_H -#include "overlay005/struct_ov5_021D57D8_decl.h" - #include -UnkStruct_ov5_021D57D8 * ov5_021D57BC(void); -void ov5_021D57D8(UnkStruct_ov5_021D57D8 ** param0); -BOOL ov5_021D57EC(UnkStruct_ov5_021D57D8 * param0); -int ov5_021D57F0(UnkStruct_ov5_021D57D8 * param0); -int ov5_021D57F4(UnkStruct_ov5_021D57D8 * param0); -GXRgb ov5_021D57F8(UnkStruct_ov5_021D57D8 * param0); -void ov5_021D57FC(UnkStruct_ov5_021D57D8 * param0, int param1, BOOL param2, int param3, int param4, int param5); -void ov5_021D5834(UnkStruct_ov5_021D57D8 * param0, int param1, GXRgb param2, int param3); -void ov5_021D585C(UnkStruct_ov5_021D57D8 * param0, const char * param1); +#include "overlay005/struct_ov5_021D57D8_decl.h" + +UnkStruct_ov5_021D57D8 *ov5_021D57BC(void); +void ov5_021D57D8(UnkStruct_ov5_021D57D8 **param0); +BOOL ov5_021D57EC(UnkStruct_ov5_021D57D8 *param0); +int ov5_021D57F0(UnkStruct_ov5_021D57D8 *param0); +int ov5_021D57F4(UnkStruct_ov5_021D57D8 *param0); +GXRgb ov5_021D57F8(UnkStruct_ov5_021D57D8 *param0); +void ov5_021D57FC(UnkStruct_ov5_021D57D8 *param0, int param1, BOOL param2, int param3, int param4, int param5); +void ov5_021D5834(UnkStruct_ov5_021D57D8 *param0, int param1, GXRgb param2, int param3); +void ov5_021D585C(UnkStruct_ov5_021D57D8 *param0, const char *param1); #endif // POKEPLATINUM_OV5_021D57BC_H diff --git a/include/overlay005/ov5_021D5878.h b/include/overlay005/ov5_021D5878.h index e58738b79d..108758e58c 100644 --- a/include/overlay005/ov5_021D5878.h +++ b/include/overlay005/ov5_021D5878.h @@ -1,24 +1,24 @@ #ifndef POKEPLATINUM_OV5_021D5878_H #define POKEPLATINUM_OV5_021D5878_H -#include "overlay005/struct_ov5_021D5894.h" - #include #include -UnkStruct_ov5_021D5894 * ov5_021D5878(void); -void ov5_021D5894(UnkStruct_ov5_021D5894 ** param0); -void ov5_021D58A8(UnkStruct_ov5_021D5894 * param0, int param1); -void ov5_021D5948(UnkStruct_ov5_021D5894 * param0, NNSG3dResMdl * param1, int param2); -void ov5_021D5A50(UnkStruct_ov5_021D5894 * param0, int param1, fx16 param2, fx16 param3, fx16 param4); -void ov5_021D5A78(UnkStruct_ov5_021D5894 * param0, int param1, GXRgb param2); -void ov5_021D5A8C(UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2, BOOL param3); -void ov5_021D5AA0(UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2); -void ov5_021D5AB4(UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2, BOOL param3); -void ov5_021D5AC8(UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2); -void ov5_021D5ADC(UnkStruct_ov5_021D5894 * param0, GXPolygonMode param1, BOOL param2); -void ov5_021D5AF0(UnkStruct_ov5_021D5894 * param0, GXCull param1, BOOL param2); -void ov5_021D5B04(UnkStruct_ov5_021D5894 * param0, int param1, BOOL param2); -void ov5_021D5B18(UnkStruct_ov5_021D5894 * param0, int param1, BOOL param2, BOOL param3); +#include "overlay005/struct_ov5_021D5894.h" + +UnkStruct_ov5_021D5894 *ov5_021D5878(void); +void ov5_021D5894(UnkStruct_ov5_021D5894 **param0); +void ov5_021D58A8(UnkStruct_ov5_021D5894 *param0, int param1); +void ov5_021D5948(UnkStruct_ov5_021D5894 *param0, NNSG3dResMdl *param1, int param2); +void ov5_021D5A50(UnkStruct_ov5_021D5894 *param0, int param1, fx16 param2, fx16 param3, fx16 param4); +void ov5_021D5A78(UnkStruct_ov5_021D5894 *param0, int param1, GXRgb param2); +void ov5_021D5A8C(UnkStruct_ov5_021D5894 *param0, GXRgb param1, BOOL param2, BOOL param3); +void ov5_021D5AA0(UnkStruct_ov5_021D5894 *param0, GXRgb param1, BOOL param2); +void ov5_021D5AB4(UnkStruct_ov5_021D5894 *param0, GXRgb param1, BOOL param2, BOOL param3); +void ov5_021D5AC8(UnkStruct_ov5_021D5894 *param0, GXRgb param1, BOOL param2); +void ov5_021D5ADC(UnkStruct_ov5_021D5894 *param0, GXPolygonMode param1, BOOL param2); +void ov5_021D5AF0(UnkStruct_ov5_021D5894 *param0, GXCull param1, BOOL param2); +void ov5_021D5B04(UnkStruct_ov5_021D5894 *param0, int param1, BOOL param2); +void ov5_021D5B18(UnkStruct_ov5_021D5894 *param0, int param1, BOOL param2, BOOL param3); #endif // POKEPLATINUM_OV5_021D5878_H diff --git a/include/overlay005/ov5_021D5B40.h b/include/overlay005/ov5_021D5B40.h index a888af8175..07db6e1adb 100644 --- a/include/overlay005/ov5_021D5B40.h +++ b/include/overlay005/ov5_021D5B40.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV5_021D5B40_H #define POKEPLATINUM_OV5_021D5B40_H -#include "field/field_system_decl.h" - #include -void ov5_021D5B40(const VecFx32 * param0, FieldSystem * fieldSystem, const int param2, const BOOL param3); -void ov5_021D5BA8(FieldSystem * param0); +#include "field/field_system_decl.h" + +void ov5_021D5B40(const VecFx32 *param0, FieldSystem *fieldSystem, const int param2, const BOOL param3); +void ov5_021D5BA8(FieldSystem *param0); #endif // POKEPLATINUM_OV5_021D5B40_H diff --git a/include/overlay005/ov5_021D5BC0.h b/include/overlay005/ov5_021D5BC0.h index e662ebcddb..c6f5feb747 100644 --- a/include/overlay005/ov5_021D5BC0.h +++ b/include/overlay005/ov5_021D5BC0.h @@ -3,9 +3,9 @@ #include "field/field_system_decl.h" -void ov5_021D5BD8(FieldSystem * fieldSystem); -BOOL ov5_021D5BF4(FieldSystem * fieldSystem); -void ov5_021D5C14(FieldSystem * fieldSystem); -BOOL ov5_021D5C30(FieldSystem * fieldSystem); +void ov5_021D5BD8(FieldSystem *fieldSystem); +BOOL ov5_021D5BF4(FieldSystem *fieldSystem); +void ov5_021D5C14(FieldSystem *fieldSystem); +BOOL ov5_021D5C30(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV5_021D5BC0_H diff --git a/include/overlay005/ov5_021D5CB0.h b/include/overlay005/ov5_021D5CB0.h index e96259861e..bd46bf79b6 100644 --- a/include/overlay005/ov5_021D5CB0.h +++ b/include/overlay005/ov5_021D5CB0.h @@ -1,15 +1,15 @@ #ifndef POKEPLATINUM_OV5_021D5CB0_H #define POKEPLATINUM_OV5_021D5CB0_H -#include "overlay005/struct_ov5_021D5CB0_decl.h" - #include -UnkStruct_ov5_021D5CB0 * ov5_021D5CB0(void); -int ov5_021D5CE4(UnkStruct_ov5_021D5CB0 * param0, NNSG3dResTex * param1); -void ov5_021D5DEC(UnkStruct_ov5_021D5CB0 * param0); -void ov5_021D5E5C(UnkStruct_ov5_021D5CB0 * param0, int param1); -void ov5_021D5E8C(UnkStruct_ov5_021D5CB0 * param0); -void ov5_021D5EAC(UnkStruct_ov5_021D5CB0 * param0); +#include "overlay005/struct_ov5_021D5CB0_decl.h" + +UnkStruct_ov5_021D5CB0 *ov5_021D5CB0(void); +int ov5_021D5CE4(UnkStruct_ov5_021D5CB0 *param0, NNSG3dResTex *param1); +void ov5_021D5DEC(UnkStruct_ov5_021D5CB0 *param0); +void ov5_021D5E5C(UnkStruct_ov5_021D5CB0 *param0, int param1); +void ov5_021D5E8C(UnkStruct_ov5_021D5CB0 *param0); +void ov5_021D5EAC(UnkStruct_ov5_021D5CB0 *param0); #endif // POKEPLATINUM_OV5_021D5CB0_H diff --git a/include/overlay005/ov5_021D5EB8.h b/include/overlay005/ov5_021D5EB8.h index 8ab2ca0b0d..36f737b416 100644 --- a/include/overlay005/ov5_021D5EB8.h +++ b/include/overlay005/ov5_021D5EB8.h @@ -5,14 +5,14 @@ #include "overlay005/struct_ov5_021D5EF8_decl.h" #include "overlay005/struct_ov5_021D6594_decl.h" -UnkStruct_ov5_021D5EF8 * ov5_021D5EB8(FieldSystem * fieldSystem); -void ov5_021D5EF8(UnkStruct_ov5_021D5EF8 * param0); -void ov5_021D5F24(UnkStruct_ov5_021D5EF8 * param0, int param1); -BOOL ov5_021D5F7C(UnkStruct_ov5_021D5EF8 * param0, int param1); -u32 ov5_021D5FE0(UnkStruct_ov5_021D5EF8 * param0); -UnkStruct_ov5_021D6594 * ov5_021D6364(FieldSystem * fieldSystem); -void ov5_021D63A4(UnkStruct_ov5_021D6594 ** param0); -BOOL ov5_021D6418(UnkStruct_ov5_021D6594 * param0, int param1, int param2); -int ov5_021D64D0(UnkStruct_ov5_021D6594 * param0, int param1); +UnkStruct_ov5_021D5EF8 *ov5_021D5EB8(FieldSystem *fieldSystem); +void ov5_021D5EF8(UnkStruct_ov5_021D5EF8 *param0); +void ov5_021D5F24(UnkStruct_ov5_021D5EF8 *param0, int param1); +BOOL ov5_021D5F7C(UnkStruct_ov5_021D5EF8 *param0, int param1); +u32 ov5_021D5FE0(UnkStruct_ov5_021D5EF8 *param0); +UnkStruct_ov5_021D6594 *ov5_021D6364(FieldSystem *fieldSystem); +void ov5_021D63A4(UnkStruct_ov5_021D6594 **param0); +BOOL ov5_021D6418(UnkStruct_ov5_021D6594 *param0, int param1, int param2); +int ov5_021D64D0(UnkStruct_ov5_021D6594 *param0, int param1); #endif // POKEPLATINUM_OV5_021D5EB8_H diff --git a/include/overlay005/ov5_021DC018.h b/include/overlay005/ov5_021DC018.h index 5f0ee9537a..eab4797801 100644 --- a/include/overlay005/ov5_021DC018.h +++ b/include/overlay005/ov5_021DC018.h @@ -1,35 +1,37 @@ #ifndef POKEPLATINUM_OV5_021DC018_H #define POKEPLATINUM_OV5_021DC018_H -#include "message.h" -#include "string_template.h" -#include "field/field_system_decl.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DC1A4_decl.h" -UnkStruct_ov5_021DC1A4 * ov5_021DC150(FieldSystem * fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8); -void ov5_021DC1A4(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2); -void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 * param0); -void ov5_021DC424(UnkStruct_ov5_021DC1A4 * param0); -UnkStruct_ov5_021DC1A4 * ov5_021DC48C(FieldSystem * fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8); -void ov5_021DC4B0(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2, u32 param3); -void ov5_021DC4B8(UnkStruct_ov5_021DC1A4 * param0); -void ov5_021DC528(UnkStruct_ov5_021DC1A4 * param0, u16 param1); -void ov5_021DC600(UnkStruct_ov5_021DC1A4 * param0, u16 * param1, u16 * param2); -void ov5_021DCB24(FieldSystem * fieldSystem, u8 param1, u8 param2, u16 * param3, StringTemplate * param4, u16 param5); +#include "message.h" +#include "string_template.h" + +UnkStruct_ov5_021DC1A4 *ov5_021DC150(FieldSystem *fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, Window *param7, MessageLoader *param8); +void ov5_021DC1A4(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2); +void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 *param0); +void ov5_021DC424(UnkStruct_ov5_021DC1A4 *param0); +UnkStruct_ov5_021DC1A4 *ov5_021DC48C(FieldSystem *fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, Window *param7, MessageLoader *param8); +void ov5_021DC4B0(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2, u32 param3); +void ov5_021DC4B8(UnkStruct_ov5_021DC1A4 *param0); +void ov5_021DC528(UnkStruct_ov5_021DC1A4 *param0, u16 param1); +void ov5_021DC600(UnkStruct_ov5_021DC1A4 *param0, u16 *param1, u16 *param2); +void ov5_021DCB24(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 *param3, StringTemplate *param4, u16 param5); u16 ov5_021DCCC8(int param0); -void ov5_021DCD94(UnkStruct_ov5_021DC1A4 * param0, u8 param1); -Window * ov5_021DCEB0(FieldSystem * fieldSystem, u8 param1, u8 param2); -void ov5_021DCF58(Window * param0); -void ov5_021DCF6C(FieldSystem * fieldSystem, Window * param1); -Window * ov5_021DD020(FieldSystem * fieldSystem, u8 param1, u8 param2); -void ov5_021DD084(Window * param0); -void ov5_021DD098(FieldSystem * fieldSystem, Window * param1); -Window * ov5_021DD140(FieldSystem * fieldSystem, u8 param1, u8 param2); -void ov5_021DD1A4(FieldSystem * fieldSystem, Window * param1); -UnkStruct_ov5_021DC1A4 * ov5_021DD250(FieldSystem * fieldSystem, u8 param1, u8 param2, u16 * param3, StringTemplate * param4, u8 param5, u8 param6, u8 param7, u8 param8); -void ov5_021DD3A8(UnkStruct_ov5_021DC1A4 * param0); -void ov5_021DD3F4(UnkStruct_ov5_021DC1A4 * param0, BOOL param1); -void ov5_021DD410(UnkStruct_ov5_021DC1A4 * param0, BOOL param1); +void ov5_021DCD94(UnkStruct_ov5_021DC1A4 *param0, u8 param1); +Window *ov5_021DCEB0(FieldSystem *fieldSystem, u8 param1, u8 param2); +void ov5_021DCF58(Window *param0); +void ov5_021DCF6C(FieldSystem *fieldSystem, Window *param1); +Window *ov5_021DD020(FieldSystem *fieldSystem, u8 param1, u8 param2); +void ov5_021DD084(Window *param0); +void ov5_021DD098(FieldSystem *fieldSystem, Window *param1); +Window *ov5_021DD140(FieldSystem *fieldSystem, u8 param1, u8 param2); +void ov5_021DD1A4(FieldSystem *fieldSystem, Window *param1); +UnkStruct_ov5_021DC1A4 *ov5_021DD250(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 *param3, StringTemplate *param4, u8 param5, u8 param6, u8 param7, u8 param8); +void ov5_021DD3A8(UnkStruct_ov5_021DC1A4 *param0); +void ov5_021DD3F4(UnkStruct_ov5_021DC1A4 *param0, BOOL param1); +void ov5_021DD410(UnkStruct_ov5_021DC1A4 *param0, BOOL param1); #endif // POKEPLATINUM_OV5_021DC018_H diff --git a/include/overlay005/ov5_021DD42C.h b/include/overlay005/ov5_021DD42C.h index d0affa894c..2005953836 100644 --- a/include/overlay005/ov5_021DD42C.h +++ b/include/overlay005/ov5_021DD42C.h @@ -1,14 +1,16 @@ #ifndef POKEPLATINUM_OV5_021DD42C_H #define POKEPLATINUM_OV5_021DD42C_H -#include "message.h" -#include "field_script_context.h" #include "overlay005/struct_ov5_021DD42C.h" -void ov5_021DD42C(UnkStruct_ov5_021DD42C * param0, ScriptContext * param1); -void ov5_021DD444(ScriptContext * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4); -void ov5_021DD498(ScriptContext * param0, const MessageLoader * param1, int param2); -void ov5_021DD4CC(ScriptContext * param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5); -void ov5_021DD530(ScriptContext * param0, StringTemplate * param1, u8 param2, u8 param3); +#include "field_script_context.h" +#include "message.h" +#include "string_template.h" + +void ov5_021DD42C(UnkStruct_ov5_021DD42C *param0, ScriptContext *param1); +void ov5_021DD444(ScriptContext *param0, const MessageLoader *param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C *param4); +void ov5_021DD498(ScriptContext *param0, const MessageLoader *param1, int param2); +void ov5_021DD4CC(ScriptContext *param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5); +void ov5_021DD530(ScriptContext *param0, StringTemplate *param1, u8 param2, u8 param3); #endif // POKEPLATINUM_OV5_021DD42C_H diff --git a/include/overlay005/ov5_021DD6FC.h b/include/overlay005/ov5_021DD6FC.h index 87f2337c40..c7fb5c55b0 100644 --- a/include/overlay005/ov5_021DD6FC.h +++ b/include/overlay005/ov5_021DD6FC.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV5_021DD6FC_H #include "struct_decls/struct_02018340_decl.h" + #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DD9C8_decl.h" -UnkStruct_ov5_021DD9C8 * ov5_021DD98C(BGL * param0); -void ov5_021DD9C8(UnkStruct_ov5_021DD9C8 * param0); -void ov5_021DD9E8(UnkStruct_ov5_021DD9C8 * param0, const int param1, const int param2); -void ov5_021DDA78(UnkStruct_ov5_021DD9C8 * param0); -void ov5_021DDAA4(FieldSystem * fieldSystem); +UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BGL *param0); +void ov5_021DD9C8(UnkStruct_ov5_021DD9C8 *param0); +void ov5_021DD9E8(UnkStruct_ov5_021DD9C8 *param0, const int param1, const int param2); +void ov5_021DDA78(UnkStruct_ov5_021DD9C8 *param0); +void ov5_021DDAA4(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV5_021DD6FC_H diff --git a/include/overlay005/ov5_021DDAE4.h b/include/overlay005/ov5_021DDAE4.h index 7e4731ca01..dfb39e3cc1 100644 --- a/include/overlay005/ov5_021DDAE4.h +++ b/include/overlay005/ov5_021DDAE4.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -void ov5_021DDBC8(TaskManager * param0); +void ov5_021DDBC8(TaskManager *param0); #endif // POKEPLATINUM_OV5_021DDAE4_H diff --git a/include/overlay005/ov5_021DF440.h b/include/overlay005/ov5_021DF440.h index 6ba5de05ca..285bc4e6d3 100644 --- a/include/overlay005/ov5_021DF440.h +++ b/include/overlay005/ov5_021DF440.h @@ -1,51 +1,52 @@ #ifndef POKEPLATINUM_OV5_021DF440_H #define POKEPLATINUM_OV5_021DF440_H +#include + #include "struct_decls/struct_020216E0_decl.h" -#include "struct_defs/struct_020217F4.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_02061AB4_decl.h" +#include "struct_defs/struct_020217F4.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" + +#include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay005/struct_ov5_021DF84C.h" #include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include - -UnkStruct_ov5_021DF47C * ov5_021DF440(FieldSystem * fieldSystem, u32 param1, u32 param2); -void ov5_021DF47C(UnkStruct_ov5_021DF47C * param0, u32 param1); -void ov5_021DF488(UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov5_021DF4A8(UnkStruct_ov5_021DF47C * param0, u32 param1); -void ov5_021DF4C8(UnkStruct_ov5_021DF47C * param0, const u32 * param1); -int ov5_021DF4E4(UnkStruct_ov5_021DF47C * param0, u32 param1); -void ov5_021DF4F8(UnkStruct_ov5_021DF47C * param0); -void ov5_021DF500(UnkStruct_ov5_021DF47C * param0); -void * ov5_021DF528(const UnkStruct_ov5_021DF47C * param0, u32 param1, int param2); -void * ov5_021DF53C(const UnkStruct_ov5_021DF47C * param0, u32 param1, int param2, u32 param3); -void ov5_021DF554(void * param0); -void * ov5_021DF55C(UnkStruct_ov5_021DF47C * param0, u32 param1); -FieldSystem * ov5_021DF574(const UnkStruct_ov5_021DF47C * param0); -UnkStruct_ov5_021DF47C * ov5_021DF578(const MapObject * param0); -u32 ov5_021DF5A8(UnkStruct_ov5_021DF47C * param0, u32 param1); -void ov5_021DF5B4(UnkStruct_ov5_021DF47C * param0, u32 param1, void * param2); -void * ov5_021DF5C0(UnkStruct_ov5_021DF47C * param0, u32 param1, int param2); -UnkStruct_ov101_021D5D90 * ov5_021DF72C(const UnkStruct_ov5_021DF47C * param0, const UnkStruct_ov101_021D86B0 * param1, const VecFx32 * param2, int param3, const void * param4, int param5); -void ov5_021DF74C(UnkStruct_ov101_021D5D90 * param0); -UnkStruct_020216E0 * ov5_021DF7F8(UnkStruct_ov5_021DF47C * param0, const UnkStruct_ov5_021DF84C * param1, const VecFx32 * param2); -UnkStruct_020216E0 * ov5_021DF84C(UnkStruct_ov5_021DF47C * param0, u32 param1, const VecFx32 * param2); -UnkStruct_ov5_021DF84C * ov5_021DF864(UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2, u32 param3, u32 param4, int param5, const UnkStruct_020217F4 * param6); -void ov5_021DF9D4(UnkStruct_ov5_021DF47C * param0, u32 param1); -void ov5_021DF9E0(UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2); -void * ov5_021DF9FC(UnkStruct_ov5_021DF47C * param0, u32 param1); -void ov5_021DFA08(UnkStruct_ov5_021DF47C * param0, u32 param1); -void ov5_021DFA14(UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2); -void ov5_021DFA30(UnkStruct_ov5_021DF47C * param0, u32 param1); -void ov5_021DFA3C(UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2, u32 param3); -void ov5_021DFA7C(UnkStruct_ov5_021DF47C * param0, u32 param1); -void ov5_021DFB00(UnkStruct_ov5_021DF47C * param0, UnkStruct_02073838 * param1, u32 param2, u32 param3, int param4); -void ov5_021DFB24(UnkStruct_ov5_021DF47C * param0, UnkStruct_02073974 * param1, u32 param2, u32 param3, u32 param4); -void ov5_021DFB40(UnkStruct_ov5_021DF47C * param0, UnkStruct_02073974 * param1, const UnkStruct_02073838 * param2, UnkStruct_02073974 * param3, u32 param4); +UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, u32 param2); +void ov5_021DF47C(UnkStruct_ov5_021DF47C *param0, u32 param1); +void ov5_021DF488(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void ov5_021DF4A8(UnkStruct_ov5_021DF47C *param0, u32 param1); +void ov5_021DF4C8(UnkStruct_ov5_021DF47C *param0, const u32 *param1); +int ov5_021DF4E4(UnkStruct_ov5_021DF47C *param0, u32 param1); +void ov5_021DF4F8(UnkStruct_ov5_021DF47C *param0); +void ov5_021DF500(UnkStruct_ov5_021DF47C *param0); +void *ov5_021DF528(const UnkStruct_ov5_021DF47C *param0, u32 param1, int param2); +void *ov5_021DF53C(const UnkStruct_ov5_021DF47C *param0, u32 param1, int param2, u32 param3); +void ov5_021DF554(void *param0); +void *ov5_021DF55C(UnkStruct_ov5_021DF47C *param0, u32 param1); +FieldSystem *ov5_021DF574(const UnkStruct_ov5_021DF47C *param0); +UnkStruct_ov5_021DF47C *ov5_021DF578(const MapObject *param0); +u32 ov5_021DF5A8(UnkStruct_ov5_021DF47C *param0, u32 param1); +void ov5_021DF5B4(UnkStruct_ov5_021DF47C *param0, u32 param1, void *param2); +void *ov5_021DF5C0(UnkStruct_ov5_021DF47C *param0, u32 param1, int param2); +UnkStruct_ov101_021D5D90 *ov5_021DF72C(const UnkStruct_ov5_021DF47C *param0, const UnkStruct_ov101_021D86B0 *param1, const VecFx32 *param2, int param3, const void *param4, int param5); +void ov5_021DF74C(UnkStruct_ov101_021D5D90 *param0); +UnkStruct_020216E0 *ov5_021DF7F8(UnkStruct_ov5_021DF47C *param0, const UnkStruct_ov5_021DF84C *param1, const VecFx32 *param2); +UnkStruct_020216E0 *ov5_021DF84C(UnkStruct_ov5_021DF47C *param0, u32 param1, const VecFx32 *param2); +UnkStruct_ov5_021DF84C *ov5_021DF864(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3, u32 param4, int param5, const UnkStruct_020217F4 *param6); +void ov5_021DF9D4(UnkStruct_ov5_021DF47C *param0, u32 param1); +void ov5_021DF9E0(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2); +void *ov5_021DF9FC(UnkStruct_ov5_021DF47C *param0, u32 param1); +void ov5_021DFA08(UnkStruct_ov5_021DF47C *param0, u32 param1); +void ov5_021DFA14(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2); +void ov5_021DFA30(UnkStruct_ov5_021DF47C *param0, u32 param1); +void ov5_021DFA3C(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3); +void ov5_021DFA7C(UnkStruct_ov5_021DF47C *param0, u32 param1); +void ov5_021DFB00(UnkStruct_ov5_021DF47C *param0, UnkStruct_02073838 *param1, u32 param2, u32 param3, int param4); +void ov5_021DFB24(UnkStruct_ov5_021DF47C *param0, UnkStruct_02073974 *param1, u32 param2, u32 param3, u32 param4); +void ov5_021DFB40(UnkStruct_ov5_021DF47C *param0, UnkStruct_02073974 *param1, const UnkStruct_02073838 *param2, UnkStruct_02073974 *param3, u32 param4); #endif // POKEPLATINUM_OV5_021DF440_H diff --git a/include/overlay005/ov5_021DFB54.h b/include/overlay005/ov5_021DFB54.h index a5ba0f7a81..056d5bc345 100644 --- a/include/overlay005/ov5_021DFB54.h +++ b/include/overlay005/ov5_021DFB54.h @@ -1,26 +1,28 @@ #ifndef POKEPLATINUM_OV5_021DFB54_H #define POKEPLATINUM_OV5_021DFB54_H -#include "sys_task_manager.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0205E884_decl.h" -void PlayerAvatar_SetRequestStateBit(PlayerAvatar * playerAvatar, u32 param1); -void PlayerAvatar_RequestChangeState(PlayerAvatar * playerAvatar); -int ov5_021DFDE0(FieldSystem * fieldSystem, PlayerAvatar * param1, int param2, int param3); -void ov5_021E00EC(TaskManager * param0, int param1, int param2); -int ov5_021E0118(PlayerAvatar * playerAvatar, u32 param1, u32 param2); -void ov5_021E0734(TaskManager * param0, int param1, int param2); +#include "field/field_system_decl.h" + +#include "sys_task_manager.h" + +void PlayerAvatar_SetRequestStateBit(PlayerAvatar *playerAvatar, u32 param1); +void PlayerAvatar_RequestChangeState(PlayerAvatar *playerAvatar); +int ov5_021DFDE0(FieldSystem *fieldSystem, PlayerAvatar *param1, int param2, int param3); +void ov5_021E00EC(TaskManager *param0, int param1, int param2); +int ov5_021E0118(PlayerAvatar *playerAvatar, u32 param1, u32 param2); +void ov5_021E0734(TaskManager *param0, int param1, int param2); int ov5_021E0760(u32 param0, int param1); -void ov5_021E097C(FieldSystem * fieldSystem, int param1); -void ov5_021E0998(TaskManager * param0, int param1, int param2); -void ov5_021E0DD4(TaskManager * param0); -void ov5_021E0E94(PlayerAvatar * playerAvatar); -void ov5_021E0EEC(PlayerAvatar * playerAvatar); -SysTask * ov5_021E1000(FieldSystem * fieldSystem); -void ov5_021E100C(SysTask * param0); -SysTask * FieldSystem_StartVsSeekerTask(FieldSystem * fieldSystem); -void FieldSystem_EndVsSeekerTask(SysTask * param0); +void ov5_021E097C(FieldSystem *fieldSystem, int param1); +void ov5_021E0998(TaskManager *param0, int param1, int param2); +void ov5_021E0DD4(TaskManager *param0); +void ov5_021E0E94(PlayerAvatar *playerAvatar); +void ov5_021E0EEC(PlayerAvatar *playerAvatar); +SysTask *ov5_021E1000(FieldSystem *fieldSystem); +void ov5_021E100C(SysTask *param0); +SysTask *FieldSystem_StartVsSeekerTask(FieldSystem *fieldSystem); +void FieldSystem_EndVsSeekerTask(SysTask *param0); #endif // POKEPLATINUM_OV5_021DFB54_H diff --git a/include/overlay005/ov5_021E1154.h b/include/overlay005/ov5_021E1154.h index 9747cc8b9a..20db055ce9 100644 --- a/include/overlay005/ov5_021E1154.h +++ b/include/overlay005/ov5_021E1154.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV5_021E1154_H #define POKEPLATINUM_OV5_021E1154_H -#include "field/field_system_decl.h" #include "struct_decls/struct_0205E884_decl.h" -int ov5_021E1154(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2); +#include "field/field_system_decl.h" + +int ov5_021E1154(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2); #endif // POKEPLATINUM_OV5_021E1154_H diff --git a/include/overlay005/ov5_021E135C.h b/include/overlay005/ov5_021E135C.h index 8609a09061..37a9175d64 100644 --- a/include/overlay005/ov5_021E135C.h +++ b/include/overlay005/ov5_021E135C.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void ov5_021E15A8(FieldSystem * fieldSystem, BOOL param1, BOOL * param2); +void ov5_021E15A8(FieldSystem *fieldSystem, BOOL param1, BOOL *param2); #endif // POKEPLATINUM_OV5_021E135C_H diff --git a/include/overlay005/ov5_021E15F4.h b/include/overlay005/ov5_021E15F4.h index 8cbda1f4c4..02e4070540 100644 --- a/include/overlay005/ov5_021E15F4.h +++ b/include/overlay005/ov5_021E15F4.h @@ -1,33 +1,34 @@ #ifndef POKEPLATINUM_OV5_021E15F4_H #define POKEPLATINUM_OV5_021E15F4_H +#include +#include + #include "struct_decls/struct_02006C24_decl.h" + #include "overlay005/struct_ov5_021D3CAC_decl.h" #include "overlay005/struct_ov5_021D5894.h" #include "overlay005/struct_ov5_021E1608_decl.h" #include "overlay005/struct_ov5_021E1890_decl.h" #include "overlay005/struct_ov5_021EF76C_decl.h" -#include -#include - -UnkStruct_ov5_021E1608 * ov5_021E15F4(const u8 param0); -void ov5_021E1608(UnkStruct_ov5_021E1608 * param0); -void ov5_021E1610(UnkStruct_ov5_021E1608 * param0); -void ov5_021E1674(const int param0, UnkStruct_ov5_021E1608 * param1); -void ov5_021E16CC(NARC * param0, const int param1, UnkStruct_ov5_021EF76C * const param2, UnkStruct_ov5_021E1608 * param3, UnkStruct_ov5_021D3CAC * param4); -void ov5_021E17CC(const VecFx32 * param0, const UnkStruct_ov5_021EF76C * param1, const BOOL param2, UnkStruct_ov5_021D5894 * const param3, UnkStruct_ov5_021E1608 * param4); -VecFx32 * ov5_021E1890(UnkStruct_ov5_021E1890 * param0); -VecFx32 ov5_021E1894(const UnkStruct_ov5_021E1890 * param0); -void ov5_021E18A4(UnkStruct_ov5_021E1890 * param0, const VecFx32 * param1); -void ov5_021E18B4(UnkStruct_ov5_021E1890 * param0, const BOOL param1); -int ov5_021E18B8(const UnkStruct_ov5_021E1890 * param0); -NNSG3dRenderObj * ov5_021E18BC(const UnkStruct_ov5_021E1890 * param0); -NNSG3dResMdl * ov5_021E18C0(const UnkStruct_ov5_021E1890 * param0); -UnkStruct_ov5_021E1890 * ov5_021E18C4(UnkStruct_ov5_021E1608 * param0, const u8 param1); -UnkStruct_ov5_021E1890 * ov5_021E18CC(UnkStruct_ov5_021E1608 * param0, const int param1); -UnkStruct_ov5_021E1890 * ov5_021E18E0(UnkStruct_ov5_021E1608 * param0, const int param1); -u8 ov5_021E19CC(UnkStruct_ov5_021E1608 * param0, UnkStruct_ov5_021EF76C * const param1, const int param2, const VecFx32 * param3, const VecFx32 * param4, UnkStruct_ov5_021D3CAC * param5); -void ov5_021E1A6C(UnkStruct_ov5_021E1608 * param0, UnkStruct_ov5_021EF76C * const param1); +UnkStruct_ov5_021E1608 *ov5_021E15F4(const u8 param0); +void ov5_021E1608(UnkStruct_ov5_021E1608 *param0); +void ov5_021E1610(UnkStruct_ov5_021E1608 *param0); +void ov5_021E1674(const int param0, UnkStruct_ov5_021E1608 *param1); +void ov5_021E16CC(NARC *param0, const int param1, UnkStruct_ov5_021EF76C *const param2, UnkStruct_ov5_021E1608 *param3, UnkStruct_ov5_021D3CAC *param4); +void ov5_021E17CC(const VecFx32 *param0, const UnkStruct_ov5_021EF76C *param1, const BOOL param2, UnkStruct_ov5_021D5894 *const param3, UnkStruct_ov5_021E1608 *param4); +VecFx32 *ov5_021E1890(UnkStruct_ov5_021E1890 *param0); +VecFx32 ov5_021E1894(const UnkStruct_ov5_021E1890 *param0); +void ov5_021E18A4(UnkStruct_ov5_021E1890 *param0, const VecFx32 *param1); +void ov5_021E18B4(UnkStruct_ov5_021E1890 *param0, const BOOL param1); +int ov5_021E18B8(const UnkStruct_ov5_021E1890 *param0); +NNSG3dRenderObj *ov5_021E18BC(const UnkStruct_ov5_021E1890 *param0); +NNSG3dResMdl *ov5_021E18C0(const UnkStruct_ov5_021E1890 *param0); +UnkStruct_ov5_021E1890 *ov5_021E18C4(UnkStruct_ov5_021E1608 *param0, const u8 param1); +UnkStruct_ov5_021E1890 *ov5_021E18CC(UnkStruct_ov5_021E1608 *param0, const int param1); +UnkStruct_ov5_021E1890 *ov5_021E18E0(UnkStruct_ov5_021E1608 *param0, const int param1); +u8 ov5_021E19CC(UnkStruct_ov5_021E1608 *param0, UnkStruct_ov5_021EF76C *const param1, const int param2, const VecFx32 *param3, const VecFx32 *param4, UnkStruct_ov5_021D3CAC *param5); +void ov5_021E1A6C(UnkStruct_ov5_021E1608 *param0, UnkStruct_ov5_021EF76C *const param1); #endif // POKEPLATINUM_OV5_021E15F4_H diff --git a/include/overlay005/ov5_021E1B08.h b/include/overlay005/ov5_021E1B08.h index 2886a52487..65322422f0 100644 --- a/include/overlay005/ov5_021E1B08.h +++ b/include/overlay005/ov5_021E1B08.h @@ -1,18 +1,19 @@ #ifndef POKEPLATINUM_OV5_021E1B08_H #define POKEPLATINUM_OV5_021E1B08_H -#include "field/field_system_decl.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system_decl.h" #include "overlay005/struct_ov5_021E1B20_decl.h" -void * ov5_021E1B08(u32 param0); -void ov5_021E1B20(UnkStruct_ov5_021E1B20 * param0); -void ov5_021E1B38(UnkStruct_ov5_021E1B20 * param0, u16 param1, u16 param2); -void ov5_021E1B40(UnkStruct_ov5_021E1B20 * param0, u8 param1); -Window * ov5_021E1B50(UnkStruct_ov5_021E1B20 * param0); -u8 ov5_021E1B54(UnkStruct_ov5_021E1B20 * param0); -BOOL ov5_021E1B58(UnkStruct_ov5_021E1B20 * param0); -void ov5_021E1B68(FieldSystem * fieldSystem); -void ov5_021E1BCC(FieldSystem * fieldSystem, u8 param1); +void *ov5_021E1B08(u32 param0); +void ov5_021E1B20(UnkStruct_ov5_021E1B20 *param0); +void ov5_021E1B38(UnkStruct_ov5_021E1B20 *param0, u16 param1, u16 param2); +void ov5_021E1B40(UnkStruct_ov5_021E1B20 *param0, u8 param1); +Window *ov5_021E1B50(UnkStruct_ov5_021E1B20 *param0); +u8 ov5_021E1B54(UnkStruct_ov5_021E1B20 *param0); +BOOL ov5_021E1B58(UnkStruct_ov5_021E1B20 *param0); +void ov5_021E1B68(FieldSystem *fieldSystem); +void ov5_021E1BCC(FieldSystem *fieldSystem, u8 param1); #endif // POKEPLATINUM_OV5_021E1B08_H diff --git a/include/overlay005/ov5_021E1D20.h b/include/overlay005/ov5_021E1D20.h index 352f56c3d6..5383a20af4 100644 --- a/include/overlay005/ov5_021E1D20.h +++ b/include/overlay005/ov5_021E1D20.h @@ -4,11 +4,11 @@ #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021E1FF4_decl.h" -void ov5_021E1F04(UnkStruct_ov5_021E1FF4 * param0); -void ov5_021E1F7C(UnkStruct_ov5_021E1FF4 * param0); -UnkStruct_ov5_021E1FF4 * ov5_021E1F98(FieldSystem * fieldSystem, int param1, u8 param2); -void ov5_021E1FF4(UnkStruct_ov5_021E1FF4 * param0); -BOOL ov5_021E200C(FieldSystem * fieldSystem); -void ov5_021E2064(FieldSystem * fieldSystem); +void ov5_021E1F04(UnkStruct_ov5_021E1FF4 *param0); +void ov5_021E1F7C(UnkStruct_ov5_021E1FF4 *param0); +UnkStruct_ov5_021E1FF4 *ov5_021E1F98(FieldSystem *fieldSystem, int param1, u8 param2); +void ov5_021E1FF4(UnkStruct_ov5_021E1FF4 *param0); +BOOL ov5_021E200C(FieldSystem *fieldSystem); +void ov5_021E2064(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV5_021E1D20_H diff --git a/include/overlay005/ov5_021E622C.h b/include/overlay005/ov5_021E622C.h index be2cadf949..2f69424ed4 100644 --- a/include/overlay005/ov5_021E622C.h +++ b/include/overlay005/ov5_021E622C.h @@ -1,40 +1,42 @@ #ifndef POKEPLATINUM_OV5_021E622C_H #define POKEPLATINUM_OV5_021E622C_H -#include "string_template.h" -#include "trainer_info.h" #include "struct_decls/struct_02026218_decl.h" #include "struct_decls/struct_02026310_decl.h" +#include "struct_decls/struct_party_decl.h" + #include "field/field_system_decl.h" + #include "pokemon.h" -#include "struct_decls/struct_party_decl.h" #include "savedata.h" +#include "string_template.h" +#include "trainer_info.h" -u8 ov5_021E6238(UnkStruct_02026310 * param0); -int ov5_021E6270(UnkStruct_02026310 * param0); -void ov5_021E6358(Party * param0, int param1, UnkStruct_02026310 * param2, SaveData * param3); -u16 ov5_021E64F8(Party * param0, StringTemplate * param1, UnkStruct_02026310 * param2, u8 param3); -int ov5_021E6520(BoxPokemon * param0, u32 param1); -int ov5_021E6568(UnkStruct_02026218 * param0); -int ov5_021E6590(UnkStruct_02026218 * param0); -u8 ov5_021E65B0(UnkStruct_02026218 * param0, StringTemplate * param1); -int ov5_021E65EC(UnkStruct_02026218 * param0, StringTemplate * param1); -int ov5_021E6630(UnkStruct_02026310 * param0, u8 param1, StringTemplate * param2); -u8 ov5_021E6640(UnkStruct_02026310 * param0, int param1, StringTemplate * param2); -void ov5_021E6720(UnkStruct_02026310 * param0); -void ov5_021E6B40(UnkStruct_02026310 * param0); -void ov5_021E6CF0(Pokemon * param0, u16 param1, u8 param2, TrainerInfo * param3, int param4, int param5); -void ov5_021E6DE8(Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4); -void ov5_021E6EA8(UnkStruct_02026310 * param0, Party * param1, TrainerInfo * param2); -BOOL ov5_021E7154(UnkStruct_02026310 * param0, Party * param1, FieldSystem * fieldSystem); -Pokemon * ov5_021E7278(Party * param0); -void ov5_021E72BC(UnkStruct_02026310 * param0, StringTemplate * param1); -void ov5_021E7308(UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 param3, u8 param4, StringTemplate * param5); -u16 ov5_021E73A0(Party * param0, int param1, StringTemplate * param2); -u8 ov5_021E73C8(UnkStruct_02026310 * param0); +u8 ov5_021E6238(UnkStruct_02026310 *param0); +int ov5_021E6270(UnkStruct_02026310 *param0); +void ov5_021E6358(Party *param0, int param1, UnkStruct_02026310 *param2, SaveData *param3); +u16 ov5_021E64F8(Party *param0, StringTemplate *param1, UnkStruct_02026310 *param2, u8 param3); +int ov5_021E6520(BoxPokemon *param0, u32 param1); +int ov5_021E6568(UnkStruct_02026218 *param0); +int ov5_021E6590(UnkStruct_02026218 *param0); +u8 ov5_021E65B0(UnkStruct_02026218 *param0, StringTemplate *param1); +int ov5_021E65EC(UnkStruct_02026218 *param0, StringTemplate *param1); +int ov5_021E6630(UnkStruct_02026310 *param0, u8 param1, StringTemplate *param2); +u8 ov5_021E6640(UnkStruct_02026310 *param0, int param1, StringTemplate *param2); +void ov5_021E6720(UnkStruct_02026310 *param0); +void ov5_021E6B40(UnkStruct_02026310 *param0); +void ov5_021E6CF0(Pokemon *param0, u16 param1, u8 param2, TrainerInfo *param3, int param4, int param5); +void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 param3, u8 param4); +void ov5_021E6EA8(UnkStruct_02026310 *param0, Party *param1, TrainerInfo *param2); +BOOL ov5_021E7154(UnkStruct_02026310 *param0, Party *param1, FieldSystem *fieldSystem); +Pokemon *ov5_021E7278(Party *param0); +void ov5_021E72BC(UnkStruct_02026310 *param0, StringTemplate *param1); +void ov5_021E7308(UnkStruct_02026310 *param0, u32 param1, u32 param2, u32 param3, u8 param4, StringTemplate *param5); +u16 ov5_021E73A0(Party *param0, int param1, StringTemplate *param2); +u8 ov5_021E73C8(UnkStruct_02026310 *param0); u8 ov5_021E73F0(u32 param0); -u32 ov5_021E7420(UnkStruct_02026310 * param0); -void ov5_021E771C(Pokemon * param0, int param1); -u32 ov5_021E7790(BoxPokemon ** param0); +u32 ov5_021E7420(UnkStruct_02026310 *param0); +void ov5_021E771C(Pokemon *param0, int param1); +u32 ov5_021E7790(BoxPokemon **param0); #endif // POKEPLATINUM_OV5_021E622C_H diff --git a/include/overlay005/ov5_021E779C.h b/include/overlay005/ov5_021E779C.h index 7ed3e254aa..10d15c1101 100644 --- a/include/overlay005/ov5_021E779C.h +++ b/include/overlay005/ov5_021E779C.h @@ -1,65 +1,66 @@ #ifndef POKEPLATINUM_OV5_021E779C_H #define POKEPLATINUM_OV5_021E779C_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02039E30_decl.h" + #include "field/field_system_decl.h" +#include "overlay005/funcptr_ov5_021E9630.h" #include "overlay005/struct_ov5_021D3CAC_decl.h" #include "overlay005/struct_ov5_021D5894.h" #include "overlay005/struct_ov5_021E1608_decl.h" #include "overlay005/struct_ov5_021E8F60_decl.h" -#include "overlay005/funcptr_ov5_021E9630.h" #include "overlay005/struct_ov5_021EF13C_decl.h" #include "overlay005/struct_ov5_021EF76C_decl.h" -#include - -void ov5_021E7A54(UnkStruct_ov5_021E8F60 * param0); -void ov5_021E8188(FieldSystem * fieldSystem, UnkStruct_ov5_021E8F60 * param1); -UnkStruct_ov5_021E8F60 * ov5_021E9084(UnkStruct_02039E30 * param0, UnkStruct_ov5_021EF76C * param1, UnkStruct_ov5_021D3CAC * param2, const int param3); -void ov5_021E9150(UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2); -void ov5_021E9190(const u8 param0, UnkStruct_ov5_021E8F60 * param1); -void ov5_021E91FC(const UnkStruct_ov5_021E8F60 * param0, UnkStruct_ov5_021D5894 * const param1); -void ov5_021E9230(fx32 param0, fx32 param1, int * param2, int * param3); -void ov5_021E924C(UnkStruct_ov5_021E8F60 * param0); -void ov5_021E92E4(UnkStruct_ov5_021E8F60 * param0); -BOOL ov5_021E9300(const UnkStruct_ov5_021E8F60 * param0); -void ov5_021E931C(VecFx32 const * param0, UnkStruct_ov5_021E8F60 * param1); -void ov5_021E9338(UnkStruct_ov5_021E8F60 * param0); -void ov5_021E9340(const u8 param0, const UnkStruct_ov5_021E8F60 * param1, UnkStruct_ov5_021E1608 ** param2); -u8 ov5_021E9354(const UnkStruct_ov5_021E8F60 * param0); +void ov5_021E7A54(UnkStruct_ov5_021E8F60 *param0); +void ov5_021E8188(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1); +UnkStruct_ov5_021E8F60 *ov5_021E9084(UnkStruct_02039E30 *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_ov5_021D3CAC *param2, const int param3); +void ov5_021E9150(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2); +void ov5_021E9190(const u8 param0, UnkStruct_ov5_021E8F60 *param1); +void ov5_021E91FC(const UnkStruct_ov5_021E8F60 *param0, UnkStruct_ov5_021D5894 *const param1); +void ov5_021E9230(fx32 param0, fx32 param1, int *param2, int *param3); +void ov5_021E924C(UnkStruct_ov5_021E8F60 *param0); +void ov5_021E92E4(UnkStruct_ov5_021E8F60 *param0); +BOOL ov5_021E9300(const UnkStruct_ov5_021E8F60 *param0); +void ov5_021E931C(VecFx32 const *param0, UnkStruct_ov5_021E8F60 *param1); +void ov5_021E9338(UnkStruct_ov5_021E8F60 *param0); +void ov5_021E9340(const u8 param0, const UnkStruct_ov5_021E8F60 *param1, UnkStruct_ov5_021E1608 **param2); +u8 ov5_021E9354(const UnkStruct_ov5_021E8F60 *param0); u8 ov5_021E935C(const u32 param0, const int param1); -u8 ov5_021E9390(const int param0, const u8 param1, const UnkStruct_ov5_021E8F60 * param2); -int ov5_021E9560(const UnkStruct_ov5_021E8F60 * param0, const u8 param1); -BOOL ov5_021E9580(const UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, u8 * param3); -const UnkStruct_ov5_021EF13C * ov5_021E9610(const UnkStruct_ov5_021E8F60 * param0, const u8 param1); -u16 const * ov5_021E9624(const UnkStruct_ov5_021E8F60 * param0, const u8 param1); -void ov5_021E9630(UnkStruct_ov5_021E8F60 * param0, UnkFuncPtr_ov5_021E9630 param1, void * param2); -NARC * ov5_021E9828(UnkStruct_ov5_021E8F60 * param0); -UnkStruct_ov5_021E8F60 * ov5_021E9830(UnkStruct_02039E30 * param0, UnkStruct_ov5_021EF76C * param1, NARC * param2); -void ov5_021E98C8(UnkStruct_ov5_021E8F60 * param0, UnkStruct_02039E30 * param1, UnkStruct_ov5_021EF76C * param2, NARC * param3); -void ov5_021E9938(UnkStruct_ov5_021E8F60 * param0); -void ov5_021E9998(UnkStruct_ov5_021E8F60 * param0); -void ov5_021E99C4(UnkStruct_ov5_021E8F60 * param0); -void ov5_021E99D8(UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2); -void ov5_021E9AAC(UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, int * param3); -void ov5_021E9B10(UnkStruct_ov5_021E8F60 * param0, int param1, int param2); -void ov5_021E9C0C(const UnkStruct_ov5_021E8F60 * param0, const UnkStruct_ov5_021D5894 * param1); -void ov5_021E9CD8(UnkStruct_ov5_021E8F60 * param0); -void ov5_021E9D3C(UnkStruct_02039E30 * param0, UnkStruct_ov5_021EF76C * param1, UnkStruct_ov5_021E8F60 * param2, UnkStruct_ov5_021E8F60 * param3, const int param4, const int param5); -void ov5_021E9F98(UnkStruct_ov5_021E8F60 * param0, UnkStruct_ov5_021E8F60 * param1); -void ov5_021EA174(FieldSystem * fieldSystem, UnkStruct_ov5_021E8F60 * param1); -void ov5_021EA540(UnkStruct_ov5_021E8F60 * param0, UnkStruct_02039E30 * param1, UnkStruct_ov5_021EF76C * param2); -void ov5_021EA58C(UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, int * param3); -void ov5_021EA5E0(UnkStruct_ov5_021E8F60 * param0, int param1, int param2); -void ov5_021EA678(UnkStruct_ov5_021E8F60 * param0, int param1, int param2, int param3); -void ov5_021EA6A4(UnkStruct_ov5_021E8F60 * param0, int param1); -int ov5_021EA6AC(const UnkStruct_ov5_021E8F60 * param0); -int ov5_021EA6B4(const UnkStruct_ov5_021E8F60 * param0); -void ov5_021EA6BC(const UnkStruct_ov5_021E8F60 * param0, VecFx32 * param1); -void ov5_021EA6D0(UnkStruct_ov5_021E8F60 * param0, int param1); -void ov5_021EA6D8(UnkStruct_ov5_021E8F60 * param0, UnkStruct_02039E30 * param1); -void ov5_021EA6E0(UnkStruct_ov5_021E8F60 * param0, int param1, BOOL param2); -void ov5_021EA6F4(UnkStruct_ov5_021E8F60 * param0, int param1, int param2); +u8 ov5_021E9390(const int param0, const u8 param1, const UnkStruct_ov5_021E8F60 *param2); +int ov5_021E9560(const UnkStruct_ov5_021E8F60 *param0, const u8 param1); +BOOL ov5_021E9580(const UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, u8 *param3); +const UnkStruct_ov5_021EF13C *ov5_021E9610(const UnkStruct_ov5_021E8F60 *param0, const u8 param1); +u16 const *ov5_021E9624(const UnkStruct_ov5_021E8F60 *param0, const u8 param1); +void ov5_021E9630(UnkStruct_ov5_021E8F60 *param0, UnkFuncPtr_ov5_021E9630 param1, void *param2); +NARC *ov5_021E9828(UnkStruct_ov5_021E8F60 *param0); +UnkStruct_ov5_021E8F60 *ov5_021E9830(UnkStruct_02039E30 *param0, UnkStruct_ov5_021EF76C *param1, NARC *param2); +void ov5_021E98C8(UnkStruct_ov5_021E8F60 *param0, UnkStruct_02039E30 *param1, UnkStruct_ov5_021EF76C *param2, NARC *param3); +void ov5_021E9938(UnkStruct_ov5_021E8F60 *param0); +void ov5_021E9998(UnkStruct_ov5_021E8F60 *param0); +void ov5_021E99C4(UnkStruct_ov5_021E8F60 *param0); +void ov5_021E99D8(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2); +void ov5_021E9AAC(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, int *param3); +void ov5_021E9B10(UnkStruct_ov5_021E8F60 *param0, int param1, int param2); +void ov5_021E9C0C(const UnkStruct_ov5_021E8F60 *param0, const UnkStruct_ov5_021D5894 *param1); +void ov5_021E9CD8(UnkStruct_ov5_021E8F60 *param0); +void ov5_021E9D3C(UnkStruct_02039E30 *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_ov5_021E8F60 *param2, UnkStruct_ov5_021E8F60 *param3, const int param4, const int param5); +void ov5_021E9F98(UnkStruct_ov5_021E8F60 *param0, UnkStruct_ov5_021E8F60 *param1); +void ov5_021EA174(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1); +void ov5_021EA540(UnkStruct_ov5_021E8F60 *param0, UnkStruct_02039E30 *param1, UnkStruct_ov5_021EF76C *param2); +void ov5_021EA58C(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, int *param3); +void ov5_021EA5E0(UnkStruct_ov5_021E8F60 *param0, int param1, int param2); +void ov5_021EA678(UnkStruct_ov5_021E8F60 *param0, int param1, int param2, int param3); +void ov5_021EA6A4(UnkStruct_ov5_021E8F60 *param0, int param1); +int ov5_021EA6AC(const UnkStruct_ov5_021E8F60 *param0); +int ov5_021EA6B4(const UnkStruct_ov5_021E8F60 *param0); +void ov5_021EA6BC(const UnkStruct_ov5_021E8F60 *param0, VecFx32 *param1); +void ov5_021EA6D0(UnkStruct_ov5_021E8F60 *param0, int param1); +void ov5_021EA6D8(UnkStruct_ov5_021E8F60 *param0, UnkStruct_02039E30 *param1); +void ov5_021EA6E0(UnkStruct_ov5_021E8F60 *param0, int param1, BOOL param2); +void ov5_021EA6F4(UnkStruct_ov5_021E8F60 *param0, int param1, int param2); #endif // POKEPLATINUM_OV5_021E779C_H diff --git a/include/overlay005/ov5_021EA714.h b/include/overlay005/ov5_021EA714.h index e5bccbf17c..4f9cb7146e 100644 --- a/include/overlay005/ov5_021EA714.h +++ b/include/overlay005/ov5_021EA714.h @@ -3,12 +3,12 @@ #include "field/field_system_decl.h" -void ov5_021EA714(FieldSystem * fieldSystem, int param1, u32 param2); -void ov5_021EA728(FieldSystem * fieldSystem); -void ov5_021EA790(FieldSystem * fieldSystem); -u8 ov5_021EA7CC(FieldSystem * fieldSystem); -void ov5_021EA830(FieldSystem * fieldSystem); -void ov5_021EA848(FieldSystem * fieldSystem); -BOOL ov5_021EA854(FieldSystem * fieldSystem); +void ov5_021EA714(FieldSystem *fieldSystem, int param1, u32 param2); +void ov5_021EA728(FieldSystem *fieldSystem); +void ov5_021EA790(FieldSystem *fieldSystem); +u8 ov5_021EA7CC(FieldSystem *fieldSystem); +void ov5_021EA830(FieldSystem *fieldSystem); +void ov5_021EA848(FieldSystem *fieldSystem); +BOOL ov5_021EA854(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV5_021EA714_H diff --git a/include/overlay005/ov5_021EA874.h b/include/overlay005/ov5_021EA874.h index 21cc01751d..ba956da0c9 100644 --- a/include/overlay005/ov5_021EA874.h +++ b/include/overlay005/ov5_021EA874.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void ov5_021EAF50(FieldSystem * fieldSystem); +void ov5_021EAF50(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV5_021EA874_H diff --git a/include/overlay005/ov5_021EAFA4.h b/include/overlay005/ov5_021EAFA4.h index 739a5dbaa6..b069ed64f2 100644 --- a/include/overlay005/ov5_021EAFA4.h +++ b/include/overlay005/ov5_021EAFA4.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_OV5_021EAFA4_H #define POKEPLATINUM_OV5_021EAFA4_H -#include "camera.h" +#include + #include "overlay005/struct_ov5_021EB0E0_decl.h" -#include +#include "camera.h" -VecFx32 ov5_021EAFA4(const u16 param0, const u16 param1, const UnkStruct_ov5_021EB0E0 * param2); -UnkStruct_ov5_021EB0E0 * ov5_021EB0C8(Camera * const camera); -void ov5_021EB0E0(UnkStruct_ov5_021EB0E0 * param0, Camera * const camera); -void ov5_021EB184(UnkStruct_ov5_021EB0E0 ** param0); +VecFx32 ov5_021EAFA4(const u16 param0, const u16 param1, const UnkStruct_ov5_021EB0E0 *param2); +UnkStruct_ov5_021EB0E0 *ov5_021EB0C8(Camera *const camera); +void ov5_021EB0E0(UnkStruct_ov5_021EB0E0 *param0, Camera *const camera); +void ov5_021EB184(UnkStruct_ov5_021EB0E0 **param0); #endif // POKEPLATINUM_OV5_021EAFA4_H diff --git a/include/overlay005/ov5_021EB1A0.h b/include/overlay005/ov5_021EB1A0.h index 8e8e7a0ffd..7de8cb5674 100644 --- a/include/overlay005/ov5_021EB1A0.h +++ b/include/overlay005/ov5_021EB1A0.h @@ -4,50 +4,50 @@ #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -UnkStruct_020216E0 * ov5_021EB1A0(MapObject * param0); -void ov5_021EB2EC(MapObject * param0); -void ov5_021EB314(MapObject * param0); -void ov5_021EB328(MapObject * param0); -void ov5_021EB354(MapObject * param0); -void ov5_021EB398(MapObject * param0); -void ov5_021EB40C(MapObject * param0); -void ov5_021EB438(MapObject * param0); -void ov5_021EB720(MapObject * param0); -void ov5_021EB7F8(MapObject * param0); -void ov5_021EB834(MapObject * param0); -void ov5_021EB848(MapObject * param0); -void ov5_021EB874(MapObject * param0); -void ov5_021EB8B8(MapObject * param0); -void ov5_021EB944(MapObject * param0); -void ov5_021EBA0C(MapObject * param0); -void ov5_021EBA34(MapObject * param0); -void ov5_021EBA60(MapObject * param0); -void ov5_021EBA8C(MapObject * param0); -void ov5_021EBAD0(MapObject * param0); -void ov5_021EBF50(MapObject * param0); -void ov5_021EC15C(MapObject * param0); -void ov5_021EC3F0(MapObject * param0); -void ov5_021EC454(MapObject * param0); -void ov5_021EC4BC(MapObject * param0); -void ov5_021EC554(MapObject * param0); -void ov5_021EC5C0(MapObject * param0); -void ov5_021EC734(MapObject * param0); -void ov5_021EC75C(MapObject * param0); -void ov5_021EC760(MapObject * param0); -void ov5_021EC778(MapObject * param0); -void ov5_021EC790(MapObject * param0); -void ov5_021EC7B8(MapObject * param0); -void ov5_021EC7D0(MapObject * param0); -void ov5_021EC7F0(MapObject * param0); -void ov5_021EC824(MapObject * param0); -void ov5_021EC858(MapObject * param0); -void ov5_021EC86C(MapObject * param0); -void ov5_021EC898(MapObject * param0); -void ov5_021EC8EC(MapObject * param0); -void ov5_021EC938(MapObject * param0); -void ov5_021EC95C(MapObject * param0); -void ov5_021EC970(MapObject * param0); -void ov5_021EC9A0(MapObject * param0); -void ov5_021EC9E8(MapObject * param0); +UnkStruct_020216E0 *ov5_021EB1A0(MapObject *param0); +void ov5_021EB2EC(MapObject *param0); +void ov5_021EB314(MapObject *param0); +void ov5_021EB328(MapObject *param0); +void ov5_021EB354(MapObject *param0); +void ov5_021EB398(MapObject *param0); +void ov5_021EB40C(MapObject *param0); +void ov5_021EB438(MapObject *param0); +void ov5_021EB720(MapObject *param0); +void ov5_021EB7F8(MapObject *param0); +void ov5_021EB834(MapObject *param0); +void ov5_021EB848(MapObject *param0); +void ov5_021EB874(MapObject *param0); +void ov5_021EB8B8(MapObject *param0); +void ov5_021EB944(MapObject *param0); +void ov5_021EBA0C(MapObject *param0); +void ov5_021EBA34(MapObject *param0); +void ov5_021EBA60(MapObject *param0); +void ov5_021EBA8C(MapObject *param0); +void ov5_021EBAD0(MapObject *param0); +void ov5_021EBF50(MapObject *param0); +void ov5_021EC15C(MapObject *param0); +void ov5_021EC3F0(MapObject *param0); +void ov5_021EC454(MapObject *param0); +void ov5_021EC4BC(MapObject *param0); +void ov5_021EC554(MapObject *param0); +void ov5_021EC5C0(MapObject *param0); +void ov5_021EC734(MapObject *param0); +void ov5_021EC75C(MapObject *param0); +void ov5_021EC760(MapObject *param0); +void ov5_021EC778(MapObject *param0); +void ov5_021EC790(MapObject *param0); +void ov5_021EC7B8(MapObject *param0); +void ov5_021EC7D0(MapObject *param0); +void ov5_021EC7F0(MapObject *param0); +void ov5_021EC824(MapObject *param0); +void ov5_021EC858(MapObject *param0); +void ov5_021EC86C(MapObject *param0); +void ov5_021EC898(MapObject *param0); +void ov5_021EC8EC(MapObject *param0); +void ov5_021EC938(MapObject *param0); +void ov5_021EC95C(MapObject *param0); +void ov5_021EC970(MapObject *param0); +void ov5_021EC9A0(MapObject *param0); +void ov5_021EC9E8(MapObject *param0); #endif // POKEPLATINUM_OV5_021EB1A0_H diff --git a/include/overlay005/ov5_021ECA70.h b/include/overlay005/ov5_021ECA70.h index 2d04c3e3e8..198f8e5b0c 100644 --- a/include/overlay005/ov5_021ECA70.h +++ b/include/overlay005/ov5_021ECA70.h @@ -3,17 +3,18 @@ #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021ECB8C_decl.h" -void ov5_021ECA70(MapObject * param0); -void ov5_021ECA90(MapObject * param0); -void ov5_021ECABC(MapObject * param0); -void ov5_021ECAC4(MapObject * param0); -void ov5_021ECAF0(MapObject * param0); -void ov5_021ECB34(MapObject * param0); -void ov5_021ECB58(MapObject * param0); -void ov5_021ECB78(MapObject * param0); -UnkStruct_020216E0 * ov5_021ECB80(MapObject * param0); -UnkStruct_020216E0 * ov5_021ECB8C(UnkStruct_ov5_021ECB8C * param0); +void ov5_021ECA70(MapObject *param0); +void ov5_021ECA90(MapObject *param0); +void ov5_021ECABC(MapObject *param0); +void ov5_021ECAC4(MapObject *param0); +void ov5_021ECAF0(MapObject *param0); +void ov5_021ECB34(MapObject *param0); +void ov5_021ECB58(MapObject *param0); +void ov5_021ECB78(MapObject *param0); +UnkStruct_020216E0 *ov5_021ECB80(MapObject *param0); +UnkStruct_020216E0 *ov5_021ECB8C(UnkStruct_ov5_021ECB8C *param0); #endif // POKEPLATINUM_OV5_021ECA70_H diff --git a/include/overlay005/ov5_021ECC20.h b/include/overlay005/ov5_021ECC20.h index 2d92fda6d1..e1da95d9f2 100644 --- a/include/overlay005/ov5_021ECC20.h +++ b/include/overlay005/ov5_021ECC20.h @@ -1,24 +1,25 @@ #ifndef POKEPLATINUM_OV5_021ECC20_H #define POKEPLATINUM_OV5_021ECC20_H +#include + #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021ECD10.h" -#include +#include "overlay005/struct_ov5_021ECD10.h" -void ov5_021ECC20(MapObjectManager * param0, int param1, int param2, const int * param3, int param4); -void ov5_021ECC78(MapObjectManager * param0); -void MapObject_Draw(MapObject * param0); -const UnkStruct_ov5_021ECD10 * ov5_021ECD04(const MapObject * param0); -int ov5_021ECD38(const MapObject * param0); -void * ov5_021ECD68(const MapObjectManager * param0, u32 param1, int param2); -void ov5_021ECDA0(const MapObject * param0, VecFx32 * param1); -void ov5_021ECDFC(MapObject * param0, int param1); -void ov5_021ECE18(MapObject * param0); -void ov5_021ECE30(MapObject * param0); -void ov5_021ECE34(MapObject * param0); -void ov5_021ECE38(MapObject * param0); -void ov5_021ECE3C(MapObject * param0); +void ov5_021ECC20(MapObjectManager *param0, int param1, int param2, const int *param3, int param4); +void ov5_021ECC78(MapObjectManager *param0); +void MapObject_Draw(MapObject *param0); +const UnkStruct_ov5_021ECD10 *ov5_021ECD04(const MapObject *param0); +int ov5_021ECD38(const MapObject *param0); +void *ov5_021ECD68(const MapObjectManager *param0, u32 param1, int param2); +void ov5_021ECDA0(const MapObject *param0, VecFx32 *param1); +void ov5_021ECDFC(MapObject *param0, int param1); +void ov5_021ECE18(MapObject *param0); +void ov5_021ECE30(MapObject *param0); +void ov5_021ECE34(MapObject *param0); +void ov5_021ECE38(MapObject *param0); +void ov5_021ECE3C(MapObject *param0); #endif // POKEPLATINUM_OV5_021ECC20_H diff --git a/include/overlay005/ov5_021ECE40.h b/include/overlay005/ov5_021ECE40.h index 7a41cd58f3..57b24e201b 100644 --- a/include/overlay005/ov5_021ECE40.h +++ b/include/overlay005/ov5_021ECE40.h @@ -7,39 +7,40 @@ #include "struct_decls/struct_02022BD8_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" + +#include "overlay005/funcptr_ov5_021EE454.h" #include "overlay005/struct_ov5_021DF84C.h" #include "overlay005/struct_ov5_021ED01C.h" #include "overlay005/struct_ov5_021ED0A4.h" -#include "overlay005/funcptr_ov5_021EE454.h" -void ov5_021ECE40(UnkStruct_ov5_021ED0A4 * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5, const int * param6, int param7); -void ov5_021ECE94(UnkStruct_ov5_021ED0A4 * param0); -int ov5_021ECEB4(MapObject * param0, UnkStruct_020216E0 ** param1, int param2); -int ov5_021ECF04(MapObject * param0, UnkStruct_020216E0 ** param1); -UnkStruct_020216E0 * ov5_021ECF1C(MapObject * param0, int param1); -void ov5_021ECF70(const MapObject * param0, UnkStruct_020216E0 ** param1, int param2); -void ov5_021ECFA4(const MapObject * param0, UnkStruct_020216E0 ** param1); -void ov5_021ECFD8(const MapObject * param0, UnkStruct_020216E0 ** param1, int param2); -void ov5_021ED01C(UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1); -void ov5_021ED03C(UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1); -void ov5_021ED060(MapObject * param0, UnkStruct_020216E0 ** param1, int param2); -int ov5_021ED150(const MapObjectManager * param0, u32 param1, UnkStruct_ov5_021DF84C * param2); -void ov5_021EDA38(MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1); -void ov5_021EDBC4(const MapObjectManager * param0, int param1, MapObject * param2); -void ov5_021EDC84(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02020C44 * param1); -UnkStruct_02020C44 * ov5_021EDC8C(UnkStruct_ov5_021ED0A4 * param0); -void ov5_021EDC94(UnkStruct_ov5_021ED0A4 * param0, int param1); -UnkStruct_0202298C * ov5_021EDC98(const UnkStruct_ov5_021ED0A4 * param0); -UnkStruct_0202298C * ov5_021EDCA0(const UnkStruct_ov5_021ED0A4 * param0); -void ov5_021EDCA8(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02022BD8 * param1); -UnkStruct_02022BD8 * ov5_021EDCB0(const UnkStruct_ov5_021ED0A4 * param0); -void ov5_021EDD78(MapObject * param0, int param1); -int ov5_021EDD94(MapObject * param0); -BOOL ov5_021EDEB4(MapObject * param0, UnkStruct_020216E0 * param1); -void ov5_021EDED8(MapObject * param0, UnkStruct_020216E0 * param1); +void ov5_021ECE40(UnkStruct_ov5_021ED0A4 *param0, const MapObjectManager *param1, int param2, int param3, int param4, int param5, const int *param6, int param7); +void ov5_021ECE94(UnkStruct_ov5_021ED0A4 *param0); +int ov5_021ECEB4(MapObject *param0, UnkStruct_020216E0 **param1, int param2); +int ov5_021ECF04(MapObject *param0, UnkStruct_020216E0 **param1); +UnkStruct_020216E0 *ov5_021ECF1C(MapObject *param0, int param1); +void ov5_021ECF70(const MapObject *param0, UnkStruct_020216E0 **param1, int param2); +void ov5_021ECFA4(const MapObject *param0, UnkStruct_020216E0 **param1); +void ov5_021ECFD8(const MapObject *param0, UnkStruct_020216E0 **param1, int param2); +void ov5_021ED01C(UnkStruct_020216E0 *param0, UnkStruct_ov5_021ED01C *param1); +void ov5_021ED03C(UnkStruct_020216E0 *param0, UnkStruct_ov5_021ED01C *param1); +void ov5_021ED060(MapObject *param0, UnkStruct_020216E0 **param1, int param2); +int ov5_021ED150(const MapObjectManager *param0, u32 param1, UnkStruct_ov5_021DF84C *param2); +void ov5_021EDA38(MapObjectManager *param0, UnkStruct_ov5_021ED0A4 *param1); +void ov5_021EDBC4(const MapObjectManager *param0, int param1, MapObject *param2); +void ov5_021EDC84(UnkStruct_ov5_021ED0A4 *param0, UnkStruct_02020C44 *param1); +UnkStruct_02020C44 *ov5_021EDC8C(UnkStruct_ov5_021ED0A4 *param0); +void ov5_021EDC94(UnkStruct_ov5_021ED0A4 *param0, int param1); +UnkStruct_0202298C *ov5_021EDC98(const UnkStruct_ov5_021ED0A4 *param0); +UnkStruct_0202298C *ov5_021EDCA0(const UnkStruct_ov5_021ED0A4 *param0); +void ov5_021EDCA8(UnkStruct_ov5_021ED0A4 *param0, UnkStruct_02022BD8 *param1); +UnkStruct_02022BD8 *ov5_021EDCB0(const UnkStruct_ov5_021ED0A4 *param0); +void ov5_021EDD78(MapObject *param0, int param1); +int ov5_021EDD94(MapObject *param0); +BOOL ov5_021EDEB4(MapObject *param0, UnkStruct_020216E0 *param1); +void ov5_021EDED8(MapObject *param0, UnkStruct_020216E0 *param1); int ov5_021EDF18(int param0); int ov5_021EDF24(int param0); int ov5_021EDF30(int param0); -UnkStruct_020216E0 * ov5_021EE3FC(MapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3); +UnkStruct_020216E0 *ov5_021EE3FC(MapObject *param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void *param3); #endif // POKEPLATINUM_OV5_021ECE40_H diff --git a/include/overlay005/ov5_021EE75C.h b/include/overlay005/ov5_021EE75C.h index c45368e706..f04876605f 100644 --- a/include/overlay005/ov5_021EE75C.h +++ b/include/overlay005/ov5_021EE75C.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void ov5_021EE7C0(FieldSystem * fieldSystem); +void ov5_021EE7C0(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV5_021EE75C_H diff --git a/include/overlay005/ov5_021EE7D4.h b/include/overlay005/ov5_021EE7D4.h index e233e5c845..d76c8cc2e1 100644 --- a/include/overlay005/ov5_021EE7D4.h +++ b/include/overlay005/ov5_021EE7D4.h @@ -3,9 +3,9 @@ #include "field/field_system_decl.h" -u8 ov5_021EE920(FieldSystem * fieldSystem, u16 param1); -void ov5_021EE9BC(FieldSystem * fieldSystem, u16 param1); -void ov5_021EEA54(FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3); -void ov5_021EEA84(FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3); +u8 ov5_021EE920(FieldSystem *fieldSystem, u16 param1); +void ov5_021EE9BC(FieldSystem *fieldSystem, u16 param1); +void ov5_021EEA54(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3); +void ov5_021EEA84(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3); #endif // POKEPLATINUM_OV5_021EE7D4_H diff --git a/include/overlay005/ov5_021EEAC8.h b/include/overlay005/ov5_021EEAC8.h index 4752aaae1e..55d75a7d9f 100644 --- a/include/overlay005/ov5_021EEAC8.h +++ b/include/overlay005/ov5_021EEAC8.h @@ -3,11 +3,11 @@ #include "overlay005/struct_ov5_021EEB48_decl.h" -UnkStruct_ov5_021EEB48 * ov5_021EEAC8(const BOOL param0); -void ov5_021EEB48(UnkStruct_ov5_021EEB48 * param0); -void ov5_021EEB84(const u8 param0, const UnkStruct_ov5_021EEB48 * param1, void ** param2); -void ov5_021EEB90(const u8 param0, const UnkStruct_ov5_021EEB48 * param1, void ** param2); -UnkStruct_ov5_021EEB48 * ov5_021EEBC0(const BOOL param0); -void ov5_021EEC24(UnkStruct_ov5_021EEB48 * param0, UnkStruct_ov5_021EEB48 * param1); +UnkStruct_ov5_021EEB48 *ov5_021EEAC8(const BOOL param0); +void ov5_021EEB48(UnkStruct_ov5_021EEB48 *param0); +void ov5_021EEB84(const u8 param0, const UnkStruct_ov5_021EEB48 *param1, void **param2); +void ov5_021EEB90(const u8 param0, const UnkStruct_ov5_021EEB48 *param1, void **param2); +UnkStruct_ov5_021EEB48 *ov5_021EEBC0(const BOOL param0); +void ov5_021EEC24(UnkStruct_ov5_021EEB48 *param0, UnkStruct_ov5_021EEB48 *param1); #endif // POKEPLATINUM_OV5_021EEAC8_H diff --git a/include/overlay005/ov5_021EEC68.h b/include/overlay005/ov5_021EEC68.h index feffb3c92c..b15579f074 100644 --- a/include/overlay005/ov5_021EEC68.h +++ b/include/overlay005/ov5_021EEC68.h @@ -3,6 +3,6 @@ #include "overlay005/struct_ov5_021EF13C_decl.h" -BOOL ov5_021EED9C(const fx32 param0, const fx32 param1, const fx32 param2, const UnkStruct_ov5_021EF13C * param3, fx32 * param4); +BOOL ov5_021EED9C(const fx32 param0, const fx32 param1, const fx32 param2, const UnkStruct_ov5_021EF13C *param3, fx32 *param4); #endif // POKEPLATINUM_OV5_021EEC68_H diff --git a/include/overlay005/ov5_021EEF34.h b/include/overlay005/ov5_021EEF34.h index 0027d3afa8..823787dc69 100644 --- a/include/overlay005/ov5_021EEF34.h +++ b/include/overlay005/ov5_021EEF34.h @@ -2,15 +2,17 @@ #define POKEPLATINUM_OV5_021EEF34_H #include "struct_decls/struct_02006C24_decl.h" -#include "sys_task_manager.h" + #include "overlay005/struct_ov5_021EF13C_decl.h" -UnkStruct_ov5_021EF13C * ov5_021EF13C(void); -void ov5_021EF158(NARC * param0, const int param1, UnkStruct_ov5_021EF13C * param2, u8 * param3); -void ov5_021EF1D0(UnkStruct_ov5_021EF13C * param0); -void ov5_021EF1DC(UnkStruct_ov5_021EF13C * param0); -SysTask * ov5_021EF1F0(NARC * param0, const int param1, UnkStruct_ov5_021EF13C * param2, int * param3, u8 ** param4, int * param5); -void ov5_021EF23C(SysTask * param0); -void ov5_021EF248(UnkStruct_ov5_021EF13C * param0); +#include "sys_task_manager.h" + +UnkStruct_ov5_021EF13C *ov5_021EF13C(void); +void ov5_021EF158(NARC *param0, const int param1, UnkStruct_ov5_021EF13C *param2, u8 *param3); +void ov5_021EF1D0(UnkStruct_ov5_021EF13C *param0); +void ov5_021EF1DC(UnkStruct_ov5_021EF13C *param0); +SysTask *ov5_021EF1F0(NARC *param0, const int param1, UnkStruct_ov5_021EF13C *param2, int *param3, u8 **param4, int *param5); +void ov5_021EF23C(SysTask *param0); +void ov5_021EF248(UnkStruct_ov5_021EF13C *param0); #endif // POKEPLATINUM_OV5_021EEF34_H diff --git a/include/overlay005/ov5_021EF250.h b/include/overlay005/ov5_021EF250.h index 2b5c1bd355..e09217f546 100644 --- a/include/overlay005/ov5_021EF250.h +++ b/include/overlay005/ov5_021EF250.h @@ -3,11 +3,11 @@ #include "overlay005/struct_ov5_021EF300_decl.h" -UnkStruct_ov5_021EF300 * ov5_021EF28C(const u8 param0, const u8 param1); -void ov5_021EF2CC(const u8 param0, const int param1, const int param2, const int param3, const int param4, const fx32 param5, UnkStruct_ov5_021EF300 * param6); -void ov5_021EF300(UnkStruct_ov5_021EF300 * param0); -BOOL ov5_021EF314(const int param0, const int param1, const UnkStruct_ov5_021EF300 * param2, u8 * param3); -fx32 ov5_021EF35C(const u8 param0, const UnkStruct_ov5_021EF300 * param1); -void ov5_021EF388(const u8 param0, const fx32 param1, UnkStruct_ov5_021EF300 * param2); +UnkStruct_ov5_021EF300 *ov5_021EF28C(const u8 param0, const u8 param1); +void ov5_021EF2CC(const u8 param0, const int param1, const int param2, const int param3, const int param4, const fx32 param5, UnkStruct_ov5_021EF300 *param6); +void ov5_021EF300(UnkStruct_ov5_021EF300 *param0); +BOOL ov5_021EF314(const int param0, const int param1, const UnkStruct_ov5_021EF300 *param2, u8 *param3); +fx32 ov5_021EF35C(const u8 param0, const UnkStruct_ov5_021EF300 *param1); +void ov5_021EF388(const u8 param0, const fx32 param1, UnkStruct_ov5_021EF300 *param2); #endif // POKEPLATINUM_OV5_021EF250_H diff --git a/include/overlay005/ov5_021EF4BC.h b/include/overlay005/ov5_021EF4BC.h index c3e2991f2d..374b2c6c1d 100644 --- a/include/overlay005/ov5_021EF4BC.h +++ b/include/overlay005/ov5_021EF4BC.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_OV5_021EF4BC_H #define POKEPLATINUM_OV5_021EF4BC_H -#include "hblank_system.h" #include "overlay005/struct_ov5_021EF4F8_decl.h" -UnkStruct_ov5_021EF4F8 * ov5_021EF4BC(u32 param0, HBlankSystem * param1); -void ov5_021EF4F8(UnkStruct_ov5_021EF4F8 * param0); -void ov5_021EF518(UnkStruct_ov5_021EF4F8 * param0); +#include "hblank_system.h" + +UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(u32 param0, HBlankSystem *param1); +void ov5_021EF4F8(UnkStruct_ov5_021EF4F8 *param0); +void ov5_021EF518(UnkStruct_ov5_021EF4F8 *param0); #endif // POKEPLATINUM_OV5_021EF4BC_H diff --git a/include/overlay005/ov5_021EF75C.h b/include/overlay005/ov5_021EF75C.h index a2d5859037..96a4f45223 100644 --- a/include/overlay005/ov5_021EF75C.h +++ b/include/overlay005/ov5_021EF75C.h @@ -1,22 +1,22 @@ #ifndef POKEPLATINUM_OV5_021EF75C_H #define POKEPLATINUM_OV5_021EF75C_H +#include + #include "overlay005/struct_ov5_021D3CAC_decl.h" #include "overlay005/struct_ov5_021D5778_decl.h" #include "overlay005/struct_ov5_021EF76C_decl.h" -#include - -UnkStruct_ov5_021EF76C * ov5_021EF76C(int param0, UnkStruct_ov5_021D3CAC * param1); -void ov5_021EF7A0(UnkStruct_ov5_021EF76C * param0); -NNSG3dResFileHeader ** ov5_021EF9E8(const int param0, UnkStruct_ov5_021EF76C * const param1); -void ov5_021EFA10(UnkStruct_ov5_021EF76C ** param0); -NNSG3dResTex * ov5_021EFA8C(const UnkStruct_ov5_021EF76C * param0); -NNSG3dResTex * ov5_021EFAA0(const UnkStruct_ov5_021EF76C * param0); -const UnkStruct_ov5_021D5778 * ov5_021EFAB4(const UnkStruct_ov5_021EF76C * param0); -BOOL ov5_021EFAC0(const UnkStruct_ov5_021EF76C * param0); -u8 ov5_021EFAD8(const UnkStruct_ov5_021EF76C * param0); -int ov5_021EFAE8(const UnkStruct_ov5_021EF76C * param0, const int param1); -BOOL ov5_021EFAF8(const UnkStruct_ov5_021EF76C * param0, const int param1); +UnkStruct_ov5_021EF76C *ov5_021EF76C(int param0, UnkStruct_ov5_021D3CAC *param1); +void ov5_021EF7A0(UnkStruct_ov5_021EF76C *param0); +NNSG3dResFileHeader **ov5_021EF9E8(const int param0, UnkStruct_ov5_021EF76C *const param1); +void ov5_021EFA10(UnkStruct_ov5_021EF76C **param0); +NNSG3dResTex *ov5_021EFA8C(const UnkStruct_ov5_021EF76C *param0); +NNSG3dResTex *ov5_021EFAA0(const UnkStruct_ov5_021EF76C *param0); +const UnkStruct_ov5_021D5778 *ov5_021EFAB4(const UnkStruct_ov5_021EF76C *param0); +BOOL ov5_021EFAC0(const UnkStruct_ov5_021EF76C *param0); +u8 ov5_021EFAD8(const UnkStruct_ov5_021EF76C *param0); +int ov5_021EFAE8(const UnkStruct_ov5_021EF76C *param0, const int param1); +BOOL ov5_021EFAF8(const UnkStruct_ov5_021EF76C *param0, const int param1); #endif // POKEPLATINUM_OV5_021EF75C_H diff --git a/include/overlay005/ov5_021EFB0C.h b/include/overlay005/ov5_021EFB0C.h index f00a99ec5a..93b852d70d 100644 --- a/include/overlay005/ov5_021EFB0C.h +++ b/include/overlay005/ov5_021EFB0C.h @@ -5,14 +5,14 @@ #include "overlay005/struct_ov5_021E1608_decl.h" #include "overlay005/struct_ov5_021EFB30_decl.h" -UnkStruct_ov5_021EFB30 * ov5_021EFB0C(void); -void ov5_021EFB30(UnkStruct_ov5_021EFB30 ** param0); -BOOL ov5_021EFB40(FieldSystem * fieldSystem, int * param1); -u16 ov5_021EFB94(FieldSystem * fieldSystem); -void ov5_021EFBDC(FieldSystem * fieldSystem); -void ov5_021EFC90(FieldSystem * fieldSystem); -int ov5_021EFFE4(FieldSystem * fieldSystem); -void ov5_021F0030(void * param0, const int param1, UnkStruct_ov5_021E1608 * const param2); -void ov5_021F0040(FieldSystem * fieldSystem); +UnkStruct_ov5_021EFB30 *ov5_021EFB0C(void); +void ov5_021EFB30(UnkStruct_ov5_021EFB30 **param0); +BOOL ov5_021EFB40(FieldSystem *fieldSystem, int *param1); +u16 ov5_021EFB94(FieldSystem *fieldSystem); +void ov5_021EFBDC(FieldSystem *fieldSystem); +void ov5_021EFC90(FieldSystem *fieldSystem); +int ov5_021EFFE4(FieldSystem *fieldSystem); +void ov5_021F0030(void *param0, const int param1, UnkStruct_ov5_021E1608 *const param2); +void ov5_021F0040(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV5_021EFB0C_H diff --git a/include/overlay005/ov5_021F007C.h b/include/overlay005/ov5_021F007C.h index 7e6b0fba00..5780dc16b1 100644 --- a/include/overlay005/ov5_021F007C.h +++ b/include/overlay005/ov5_021F007C.h @@ -1,18 +1,19 @@ #ifndef POKEPLATINUM_OV5_021F007C_H #define POKEPLATINUM_OV5_021F007C_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" + +#include "field/field_system_decl.h" #include "overlay005/struct_ov5_021D1BEC_decl.h" -UnkStruct_ov5_021D1BEC * ov5_021F01F0(FieldSystem * fieldSystem); -UnkStruct_ov5_021D1BEC * ov5_021F0204(FieldSystem * fieldSystem); -void ov5_021F0218(UnkStruct_ov5_021D1BEC * param0); -BOOL ov5_021F0220(UnkStruct_ov5_021D1BEC * param0); -UnkStruct_ov5_021D1BEC * ov5_021F022C(FieldSystem * fieldSystem); -UnkStruct_ov5_021D1BEC * ov5_021F0240(FieldSystem * fieldSystem); -BOOL ov5_021F0254(UnkStruct_ov5_021D1BEC * param0); +UnkStruct_ov5_021D1BEC *ov5_021F01F0(FieldSystem *fieldSystem); +UnkStruct_ov5_021D1BEC *ov5_021F0204(FieldSystem *fieldSystem); +void ov5_021F0218(UnkStruct_ov5_021D1BEC *param0); +BOOL ov5_021F0220(UnkStruct_ov5_021D1BEC *param0); +UnkStruct_ov5_021D1BEC *ov5_021F022C(FieldSystem *fieldSystem); +UnkStruct_ov5_021D1BEC *ov5_021F0240(FieldSystem *fieldSystem); +BOOL ov5_021F0254(UnkStruct_ov5_021D1BEC *param0); u32 ov5_021F0484(void); -BOOL ov5_021F0488(TaskManager * param0); +BOOL ov5_021F0488(TaskManager *param0); #endif // POKEPLATINUM_OV5_021F007C_H diff --git a/include/overlay005/ov5_021F067C.h b/include/overlay005/ov5_021F067C.h index 8c8b33c205..260a8dc6f7 100644 --- a/include/overlay005/ov5_021F067C.h +++ b/include/overlay005/ov5_021F067C.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_OV5_021F067C_H #include "struct_decls/struct_02006C24_decl.h" + #include "overlay005/struct_ov5_021F06D8_decl.h" -UnkStruct_ov5_021F06D8 * ov5_021F067C(u32 param0, u32 param1, u32 param2, u32 param3); -void ov5_021F06D8(UnkStruct_ov5_021F06D8 * param0); -void * ov5_021F070C(UnkStruct_ov5_021F06D8 * param0, u32 param1, u32 param2, int param3); -void ov5_021F0740(UnkStruct_ov5_021F06D8 * param0, u32 param1); -void * ov5_021F075C(UnkStruct_ov5_021F06D8 * param0, u32 param1); -int ov5_021F0770(UnkStruct_ov5_021F06D8 * param0, u32 param1); -void * ov5_021F0784(UnkStruct_ov5_021F06D8 * param0, u32 param1, NARC * param2, u32 param3, int param4); +UnkStruct_ov5_021F06D8 *ov5_021F067C(u32 param0, u32 param1, u32 param2, u32 param3); +void ov5_021F06D8(UnkStruct_ov5_021F06D8 *param0); +void *ov5_021F070C(UnkStruct_ov5_021F06D8 *param0, u32 param1, u32 param2, int param3); +void ov5_021F0740(UnkStruct_ov5_021F06D8 *param0, u32 param1); +void *ov5_021F075C(UnkStruct_ov5_021F06D8 *param0, u32 param1); +int ov5_021F0770(UnkStruct_ov5_021F06D8 *param0, u32 param1); +void *ov5_021F0784(UnkStruct_ov5_021F06D8 *param0, u32 param1, NARC *param2, u32 param3, int param4); #endif // POKEPLATINUM_OV5_021F067C_H diff --git a/include/overlay005/ov5_021F0824.h b/include/overlay005/ov5_021F0824.h index ae0262296a..191903eb8f 100644 --- a/include/overlay005/ov5_021F0824.h +++ b/include/overlay005/ov5_021F0824.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void ov5_021F0824(FieldSystem * fieldSystem); +void ov5_021F0824(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV5_021F0824_H diff --git a/include/overlay005/ov5_021F08CC.h b/include/overlay005/ov5_021F08CC.h index f457c2397d..8c1e830bfe 100644 --- a/include/overlay005/ov5_021F08CC.h +++ b/include/overlay005/ov5_021F08CC.h @@ -1,15 +1,17 @@ #ifndef POKEPLATINUM_OV5_021F08CC_H #define POKEPLATINUM_OV5_021F08CC_H -#include "sys_task_manager.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" -void * ov5_021F08CC(FieldSystem * fieldSystem, u32 param1, int param2); -BOOL ov5_021F08F8(TaskManager * param0); -SysTask * ov5_021F09B4(FieldSystem * fieldSystem, int param1, BOOL param2); -int ov5_021F09D8(SysTask * param0); -int ov5_021F09E4(SysTask * param0); -void ov5_021F09F0(SysTask * param0); +#include "field/field_system_decl.h" + +#include "sys_task_manager.h" + +void *ov5_021F08CC(FieldSystem *fieldSystem, u32 param1, int param2); +BOOL ov5_021F08F8(TaskManager *param0); +SysTask *ov5_021F09B4(FieldSystem *fieldSystem, int param1, BOOL param2); +int ov5_021F09D8(SysTask *param0); +int ov5_021F09E4(SysTask *param0); +void ov5_021F09F0(SysTask *param0); #endif // POKEPLATINUM_OV5_021F08CC_H diff --git a/include/overlay005/ov5_021F0EB0.h b/include/overlay005/ov5_021F0EB0.h index 3bde2f18a2..b4a7bc27f2 100644 --- a/include/overlay005/ov5_021F0EB0.h +++ b/include/overlay005/ov5_021F0EB0.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_OV5_021F0EB0_H #define POKEPLATINUM_OV5_021F0EB0_H -#include "sys_task_manager.h" #include "field/field_system_decl.h" -SysTask * ov5_021F0EB0(FieldSystem * fieldSystem, u32 param1); -BOOL ov5_021F0EF0(SysTask * param0); -void ov5_021F0EFC(SysTask * param0); -void ov5_021F0F10(SysTask * param0, int param1, fx32 param2, u32 param3); +#include "sys_task_manager.h" + +SysTask *ov5_021F0EB0(FieldSystem *fieldSystem, u32 param1); +BOOL ov5_021F0EF0(SysTask *param0); +void ov5_021F0EFC(SysTask *param0); +void ov5_021F0F10(SysTask *param0, int param1, fx32 param2, u32 param3); #endif // POKEPLATINUM_OV5_021F0EB0_H diff --git a/include/overlay005/ov5_021F101C.h b/include/overlay005/ov5_021F101C.h index 96a2fc301d..94f273f4a2 100644 --- a/include/overlay005/ov5_021F101C.h +++ b/include/overlay005/ov5_021F101C.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -BOOL ov5_021F101C(TaskManager * param0); +BOOL ov5_021F101C(TaskManager *param0); #endif // POKEPLATINUM_OV5_021F101C_H diff --git a/include/overlay005/ov5_021F10E8.h b/include/overlay005/ov5_021F10E8.h index 0201a2a959..ab8e1c4471 100644 --- a/include/overlay005/ov5_021F10E8.h +++ b/include/overlay005/ov5_021F10E8.h @@ -1,19 +1,20 @@ #ifndef POKEPLATINUM_OV5_021F10E8_H #define POKEPLATINUM_OV5_021F10E8_H +#include + #include "struct_decls/struct_02061AB4_decl.h" #include "struct_defs/struct_02073B50.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -#include - -void * ov5_021F10E8(UnkStruct_ov5_021DF47C * param0); -void ov5_021F10FC(void * param0); -void ov5_021F1188(UnkStruct_ov5_021DF47C * param0, u32 param1); -void ov5_021F11C0(UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2); -UnkStruct_02073B50 * ov5_021F11FC(UnkStruct_ov5_021DF47C * param0, u32 param1); -UnkStruct_ov101_021D5D90 * ov5_021F121C(const MapObject * param0, const VecFx32 * param1); -void FieldEffect_InitRenderObject(UnkStruct_ov5_021DF47C * param0); +void *ov5_021F10E8(UnkStruct_ov5_021DF47C *param0); +void ov5_021F10FC(void *param0); +void ov5_021F1188(UnkStruct_ov5_021DF47C *param0, u32 param1); +void ov5_021F11C0(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2); +UnkStruct_02073B50 *ov5_021F11FC(UnkStruct_ov5_021DF47C *param0, u32 param1); +UnkStruct_ov101_021D5D90 *ov5_021F121C(const MapObject *param0, const VecFx32 *param1); +void FieldEffect_InitRenderObject(UnkStruct_ov5_021DF47C *param0); #endif // POKEPLATINUM_OV5_021F10E8_H diff --git a/include/overlay005/ov5_021F134C.h b/include/overlay005/ov5_021F134C.h index 28bb3f381b..71d40e22e8 100644 --- a/include/overlay005/ov5_021F134C.h +++ b/include/overlay005/ov5_021F134C.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV5_021F134C_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F134C(UnkStruct_ov5_021DF47C * param0); -void ov5_021F1370(void * param0); -void ov5_021F1570(MapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F16D4(MapObject * param0, int param1); +void *ov5_021F134C(UnkStruct_ov5_021DF47C *param0); +void ov5_021F1370(void *param0); +void ov5_021F1570(MapObject *param0); +UnkStruct_ov101_021D5D90 *ov5_021F16D4(MapObject *param0, int param1); #endif // POKEPLATINUM_OV5_021F134C_H diff --git a/include/overlay005/ov5_021F17B8.h b/include/overlay005/ov5_021F17B8.h index 932e8ed848..bc257de185 100644 --- a/include/overlay005/ov5_021F17B8.h +++ b/include/overlay005/ov5_021F17B8.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_OV5_021F17B8_H #define POKEPLATINUM_OV5_021F17B8_H +#include + #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay005/struct_ov5_021DF84C.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -#include - -void * ov5_021F17B8(UnkStruct_ov5_021DF47C * param0); -void ov5_021F17D4(void * param0); -void ov5_021F1800(MapObject * param0, int param1); -UnkStruct_ov101_021D5D90 * ov5_021F1BA4(UnkStruct_ov5_021DF47C * param0, const UnkStruct_ov5_021DF84C * param1, const UnkStruct_020216E0 * param2, const VecFx32 * param3, int param4, int param5); +void *ov5_021F17B8(UnkStruct_ov5_021DF47C *param0); +void ov5_021F17D4(void *param0); +void ov5_021F1800(MapObject *param0, int param1); +UnkStruct_ov101_021D5D90 *ov5_021F1BA4(UnkStruct_ov5_021DF47C *param0, const UnkStruct_ov5_021DF84C *param1, const UnkStruct_020216E0 *param2, const VecFx32 *param3, int param4, int param5); #endif // POKEPLATINUM_OV5_021F17B8_H diff --git a/include/overlay005/ov5_021F1CC8.h b/include/overlay005/ov5_021F1CC8.h index cee0189d96..b3cbd678cc 100644 --- a/include/overlay005/ov5_021F1CC8.h +++ b/include/overlay005/ov5_021F1CC8.h @@ -2,16 +2,17 @@ #define POKEPLATINUM_OV5_021F1CC8_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F1CC8(UnkStruct_ov5_021DF47C * param0); -void ov5_021F1CE8(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1E8C(const MapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1E98(const MapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1EA4(const MapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1EB0(const MapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1EBC(const MapObject * param0); -UnkStruct_ov101_021D5D90 * ov5_021F1EC8(const MapObject * param0); +void *ov5_021F1CC8(UnkStruct_ov5_021DF47C *param0); +void ov5_021F1CE8(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F1E8C(const MapObject *param0); +UnkStruct_ov101_021D5D90 *ov5_021F1E98(const MapObject *param0); +UnkStruct_ov101_021D5D90 *ov5_021F1EA4(const MapObject *param0); +UnkStruct_ov101_021D5D90 *ov5_021F1EB0(const MapObject *param0); +UnkStruct_ov101_021D5D90 *ov5_021F1EBC(const MapObject *param0); +UnkStruct_ov101_021D5D90 *ov5_021F1EC8(const MapObject *param0); #endif // POKEPLATINUM_OV5_021F1CC8_H diff --git a/include/overlay005/ov5_021F204C.h b/include/overlay005/ov5_021F204C.h index 63d255cbb5..a9d5f565c9 100644 --- a/include/overlay005/ov5_021F204C.h +++ b/include/overlay005/ov5_021F204C.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_OV5_021F204C_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F204C(UnkStruct_ov5_021DF47C * param0); -void ov5_021F2068(void * param0); -void ov5_021F20D4(MapObject * param0); -void * ov5_021F21E0(UnkStruct_ov5_021DF47C * param0); -void ov5_021F21F4(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F22BC(MapObject * param0); +void *ov5_021F204C(UnkStruct_ov5_021DF47C *param0); +void ov5_021F2068(void *param0); +void ov5_021F20D4(MapObject *param0); +void *ov5_021F21E0(UnkStruct_ov5_021DF47C *param0); +void ov5_021F21F4(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F22BC(MapObject *param0); #endif // POKEPLATINUM_OV5_021F204C_H diff --git a/include/overlay005/ov5_021F23D0.h b/include/overlay005/ov5_021F23D0.h index d9f17bf8fa..b752c7ff0c 100644 --- a/include/overlay005/ov5_021F23D0.h +++ b/include/overlay005/ov5_021F23D0.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV5_021F23D0_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F23D0(UnkStruct_ov5_021DF47C * param0); -void ov5_021F23EC(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F2438(MapObject * param0); -void ov5_021F247C(UnkStruct_ov101_021D5D90 * param0); +void *ov5_021F23D0(UnkStruct_ov5_021DF47C *param0); +void ov5_021F23EC(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F2438(MapObject *param0); +void ov5_021F247C(UnkStruct_ov101_021D5D90 *param0); #endif // POKEPLATINUM_OV5_021F23D0_H diff --git a/include/overlay005/ov5_021F25C0.h b/include/overlay005/ov5_021F25C0.h index c37c5aa7d3..6aaae05ac1 100644 --- a/include/overlay005/ov5_021F25C0.h +++ b/include/overlay005/ov5_021F25C0.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV5_021F25C0_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F25C0(UnkStruct_ov5_021DF47C * param0); -void ov5_021F25DC(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F261C(MapObject * param0, int param1, int param2, int param3, int param4); -void ov5_021F2838(UnkStruct_ov101_021D5D90 * param0, int param1); +void *ov5_021F25C0(UnkStruct_ov5_021DF47C *param0); +void ov5_021F25DC(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F261C(MapObject *param0, int param1, int param2, int param3, int param4); +void ov5_021F2838(UnkStruct_ov101_021D5D90 *param0, int param1); #endif // POKEPLATINUM_OV5_021F25C0_H diff --git a/include/overlay005/ov5_021F2850.h b/include/overlay005/ov5_021F2850.h index 6d180cc551..ca21e0a722 100644 --- a/include/overlay005/ov5_021F2850.h +++ b/include/overlay005/ov5_021F2850.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV5_021F2850_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F2850(UnkStruct_ov5_021DF47C * param0); -void ov5_021F2864(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F28F4(MapObject * param0, int param1, int param2, int param3, int param4); -void ov5_021F2974(UnkStruct_ov101_021D5D90 * param0, int param1); +void *ov5_021F2850(UnkStruct_ov5_021DF47C *param0); +void ov5_021F2864(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F28F4(MapObject *param0, int param1, int param2, int param3, int param4); +void ov5_021F2974(UnkStruct_ov101_021D5D90 *param0, int param1); #endif // POKEPLATINUM_OV5_021F2850_H diff --git a/include/overlay005/ov5_021F2A7C.h b/include/overlay005/ov5_021F2A7C.h index e14f2cbd27..ada3825051 100644 --- a/include/overlay005/ov5_021F2A7C.h +++ b/include/overlay005/ov5_021F2A7C.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV5_021F2A7C_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F2A7C(UnkStruct_ov5_021DF47C * param0); -void ov5_021F2A98(void * param0); -void ov5_021F2AE4(MapObject * param0, int param1, int param2, int param3); +void *ov5_021F2A7C(UnkStruct_ov5_021DF47C *param0); +void ov5_021F2A98(void *param0); +void ov5_021F2AE4(MapObject *param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F2A7C_H diff --git a/include/overlay005/ov5_021F2BD0.h b/include/overlay005/ov5_021F2BD0.h index 85af779b45..94884942f1 100644 --- a/include/overlay005/ov5_021F2BD0.h +++ b/include/overlay005/ov5_021F2BD0.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV5_021F2BD0_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F2BD0(UnkStruct_ov5_021DF47C * param0); -void ov5_021F2BEC(void * param0); -void ov5_021F2C38(MapObject * param0, int param1, int param2, int param3); +void *ov5_021F2BD0(UnkStruct_ov5_021DF47C *param0); +void ov5_021F2BEC(void *param0); +void ov5_021F2C38(MapObject *param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F2BD0_H diff --git a/include/overlay005/ov5_021F2D20.h b/include/overlay005/ov5_021F2D20.h index 7104b291e0..8bb1218787 100644 --- a/include/overlay005/ov5_021F2D20.h +++ b/include/overlay005/ov5_021F2D20.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_OV5_021F2D20_H #define POKEPLATINUM_OV5_021F2D20_H -#include "field/field_system_decl.h" #include "struct_decls/struct_02061AB4_decl.h" + +#include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F2D20(UnkStruct_ov5_021DF47C * param0); -void ov5_021F2D3C(void * param0); -void ov5_021F2EA4(MapObject * param0, int param1); -UnkStruct_ov101_021D5D90 * ov5_021F3154(FieldSystem * fieldSystem, int param1, int param2, int param3); -int ov5_021F31A8(UnkStruct_ov101_021D5D90 * param0); +void *ov5_021F2D20(UnkStruct_ov5_021DF47C *param0); +void ov5_021F2D3C(void *param0); +void ov5_021F2EA4(MapObject *param0, int param1); +UnkStruct_ov101_021D5D90 *ov5_021F3154(FieldSystem *fieldSystem, int param1, int param2, int param3); +int ov5_021F31A8(UnkStruct_ov101_021D5D90 *param0); #endif // POKEPLATINUM_OV5_021F2D20_H diff --git a/include/overlay005/ov5_021F3284.h b/include/overlay005/ov5_021F3284.h index dd72f3b901..9151cb0680 100644 --- a/include/overlay005/ov5_021F3284.h +++ b/include/overlay005/ov5_021F3284.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV5_021F3284_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F3284(UnkStruct_ov5_021DF47C * param0); -void ov5_021F32A0(void * param0); -void ov5_021F331C(MapObject * param0, int param1); +void *ov5_021F3284(UnkStruct_ov5_021DF47C *param0); +void ov5_021F32A0(void *param0); +void ov5_021F331C(MapObject *param0, int param1); #endif // POKEPLATINUM_OV5_021F3284_H diff --git a/include/overlay005/ov5_021F348C.h b/include/overlay005/ov5_021F348C.h index a778d39802..93dfcd39bf 100644 --- a/include/overlay005/ov5_021F348C.h +++ b/include/overlay005/ov5_021F348C.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV5_021F348C_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F348C(UnkStruct_ov5_021DF47C * param0); -void ov5_021F34A8(void * param0); -void ov5_021F34B8(UnkStruct_ov5_021DF47C * param0); -void ov5_021F3638(MapObject * param0); -void ov5_021F3678(MapObject * param0, int param1); +void *ov5_021F348C(UnkStruct_ov5_021DF47C *param0); +void ov5_021F34A8(void *param0); +void ov5_021F34B8(UnkStruct_ov5_021DF47C *param0); +void ov5_021F3638(MapObject *param0); +void ov5_021F3678(MapObject *param0, int param1); #endif // POKEPLATINUM_OV5_021F348C_H diff --git a/include/overlay005/ov5_021F37A8.h b/include/overlay005/ov5_021F37A8.h index e736b6f611..fb8d687b93 100644 --- a/include/overlay005/ov5_021F37A8.h +++ b/include/overlay005/ov5_021F37A8.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV5_021F37A8_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F37A8(UnkStruct_ov5_021DF47C * param0); -void ov5_021F37C4(void * param0); -void ov5_021F3844(MapObject * param0, int param1); +void *ov5_021F37A8(UnkStruct_ov5_021DF47C *param0); +void ov5_021F37C4(void *param0); +void ov5_021F3844(MapObject *param0, int param1); #endif // POKEPLATINUM_OV5_021F37A8_H diff --git a/include/overlay005/ov5_021F3A50.h b/include/overlay005/ov5_021F3A50.h index 27413f171d..8747657d3a 100644 --- a/include/overlay005/ov5_021F3A50.h +++ b/include/overlay005/ov5_021F3A50.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV5_021F3A50_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F3A50(UnkStruct_ov5_021DF47C * param0); -void ov5_021F3A6C(void * param0); -void ov5_021F3AEC(MapObject * param0, int param1); +void *ov5_021F3A50(UnkStruct_ov5_021DF47C *param0); +void ov5_021F3A6C(void *param0); +void ov5_021F3AEC(MapObject *param0, int param1); #endif // POKEPLATINUM_OV5_021F3A50_H diff --git a/include/overlay005/ov5_021F3D00.h b/include/overlay005/ov5_021F3D00.h index b19c77b36d..547f07571a 100644 --- a/include/overlay005/ov5_021F3D00.h +++ b/include/overlay005/ov5_021F3D00.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV5_021F3D00_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F3D00(UnkStruct_ov5_021DF47C * param0); -void ov5_021F3D1C(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F3D90(MapObject * param0, int param1); +void *ov5_021F3D00(UnkStruct_ov5_021DF47C *param0); +void ov5_021F3D1C(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F3D90(MapObject *param0, int param1); #endif // POKEPLATINUM_OV5_021F3D00_H diff --git a/include/overlay005/ov5_021F3E74.h b/include/overlay005/ov5_021F3E74.h index 33a4c7425e..14d3f47d80 100644 --- a/include/overlay005/ov5_021F3E74.h +++ b/include/overlay005/ov5_021F3E74.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV5_021F3E74_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F3E74(UnkStruct_ov5_021DF47C * param0); -void ov5_021F3E90(void * param0); -void ov5_021F3F10(MapObject * param0); +void *ov5_021F3E74(UnkStruct_ov5_021DF47C *param0); +void ov5_021F3E90(void *param0); +void ov5_021F3F10(MapObject *param0); #endif // POKEPLATINUM_OV5_021F3E74_H diff --git a/include/overlay005/ov5_021F4018.h b/include/overlay005/ov5_021F4018.h index e12e935d81..0da093ee18 100644 --- a/include/overlay005/ov5_021F4018.h +++ b/include/overlay005/ov5_021F4018.h @@ -4,9 +4,9 @@ #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F4018(UnkStruct_ov5_021DF47C * param0); -void ov5_021F4034(void * param0); -void ov5_021F4098(FieldSystem * fieldSystem, int param1); -void ov5_021F416C(FieldSystem * fieldSystem, int param1); +void *ov5_021F4018(UnkStruct_ov5_021DF47C *param0); +void ov5_021F4034(void *param0); +void ov5_021F4098(FieldSystem *fieldSystem, int param1); +void ov5_021F416C(FieldSystem *fieldSystem, int param1); #endif // POKEPLATINUM_OV5_021F4018_H diff --git a/include/overlay005/ov5_021F428C.h b/include/overlay005/ov5_021F428C.h index 49198121df..095619e94a 100644 --- a/include/overlay005/ov5_021F428C.h +++ b/include/overlay005/ov5_021F428C.h @@ -5,15 +5,15 @@ #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F428C(UnkStruct_ov5_021DF47C * param0); -void ov5_021F42A8(void * param0); -void ov5_021F42D8(UnkStruct_ov5_021DF47C * param0, int param1, int param2); -UnkStruct_ov101_021D5D90 * ov5_021F4474(FieldSystem * fieldSystem, int param1, int param2, fx32 param3); -void ov5_021F44A4(UnkStruct_ov101_021D5D90 * param0); -BOOL ov5_021F453C(UnkStruct_ov101_021D5D90 * param0); -UnkStruct_ov101_021D5D90 * ov5_021F4668(FieldSystem * fieldSystem, int param1, int param2, fx32 param3); -void ov5_021F4698(UnkStruct_ov101_021D5D90 * param0, int param1, BOOL param2); -void ov5_021F4714(UnkStruct_ov101_021D5D90 * param0, fx32 param1); -BOOL ov5_021F4720(UnkStruct_ov101_021D5D90 * param0); +void *ov5_021F428C(UnkStruct_ov5_021DF47C *param0); +void ov5_021F42A8(void *param0); +void ov5_021F42D8(UnkStruct_ov5_021DF47C *param0, int param1, int param2); +UnkStruct_ov101_021D5D90 *ov5_021F4474(FieldSystem *fieldSystem, int param1, int param2, fx32 param3); +void ov5_021F44A4(UnkStruct_ov101_021D5D90 *param0); +BOOL ov5_021F453C(UnkStruct_ov101_021D5D90 *param0); +UnkStruct_ov101_021D5D90 *ov5_021F4668(FieldSystem *fieldSystem, int param1, int param2, fx32 param3); +void ov5_021F4698(UnkStruct_ov101_021D5D90 *param0, int param1, BOOL param2); +void ov5_021F4714(UnkStruct_ov101_021D5D90 *param0, fx32 param1); +BOOL ov5_021F4720(UnkStruct_ov101_021D5D90 *param0); #endif // POKEPLATINUM_OV5_021F428C_H diff --git a/include/overlay005/ov5_021F47B0.h b/include/overlay005/ov5_021F47B0.h index 85370050d1..50d65bea5c 100644 --- a/include/overlay005/ov5_021F47B0.h +++ b/include/overlay005/ov5_021F47B0.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV5_021F47B0_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F47B0(UnkStruct_ov5_021DF47C * param0); -void ov5_021F47CC(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F4840(UnkStruct_ov5_021DF47C * param0, const MapObject * param1, int param2, int param3); -UnkStruct_ov101_021D5D90 * ov5_021F4CEC(UnkStruct_ov5_021DF47C * param0, int param1, int param2, int param3); +void *ov5_021F47B0(UnkStruct_ov5_021DF47C *param0); +void ov5_021F47CC(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F4840(UnkStruct_ov5_021DF47C *param0, const MapObject *param1, int param2, int param3); +UnkStruct_ov101_021D5D90 *ov5_021F4CEC(UnkStruct_ov5_021DF47C *param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F47B0_H diff --git a/include/overlay005/ov5_021F4DAC.h b/include/overlay005/ov5_021F4DAC.h index d4264f42ff..3f3024ed1c 100644 --- a/include/overlay005/ov5_021F4DAC.h +++ b/include/overlay005/ov5_021F4DAC.h @@ -3,7 +3,7 @@ #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F4DAC(UnkStruct_ov5_021DF47C * param0); -void ov5_021F4DC8(void * param0); +void *ov5_021F4DAC(UnkStruct_ov5_021DF47C *param0); +void ov5_021F4DC8(void *param0); #endif // POKEPLATINUM_OV5_021F4DAC_H diff --git a/include/overlay005/ov5_021F4E08.h b/include/overlay005/ov5_021F4E08.h index 3b081da3b2..3a58edcf7d 100644 --- a/include/overlay005/ov5_021F4E08.h +++ b/include/overlay005/ov5_021F4E08.h @@ -5,9 +5,9 @@ #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F4E08(UnkStruct_ov5_021DF47C * param0); -void ov5_021F4E28(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F4EAC(FieldSystem * fieldSystem, int param1, int param2, int param3, int param4); -UnkStruct_ov101_021D5D90 * ov5_021F4F18(FieldSystem * fieldSystem, int param1, int param2, int param3, int param4); +void *ov5_021F4E08(UnkStruct_ov5_021DF47C *param0); +void ov5_021F4E28(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F4EAC(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4); +UnkStruct_ov101_021D5D90 *ov5_021F4F18(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4); #endif // POKEPLATINUM_OV5_021F4E08_H diff --git a/include/overlay005/ov5_021F5060.h b/include/overlay005/ov5_021F5060.h index 29505edefa..d0ff04276a 100644 --- a/include/overlay005/ov5_021F5060.h +++ b/include/overlay005/ov5_021F5060.h @@ -3,7 +3,7 @@ #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F5060(UnkStruct_ov5_021DF47C * param0); -void ov5_021F507C(void * param0); +void *ov5_021F5060(UnkStruct_ov5_021DF47C *param0); +void ov5_021F507C(void *param0); #endif // POKEPLATINUM_OV5_021F5060_H diff --git a/include/overlay005/ov5_021F50BC.h b/include/overlay005/ov5_021F50BC.h index c5a780701b..36ffe22ff4 100644 --- a/include/overlay005/ov5_021F50BC.h +++ b/include/overlay005/ov5_021F50BC.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV5_021F50BC_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F50BC(UnkStruct_ov5_021DF47C * param0); -void ov5_021F50D8(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F511C(MapObject * param0); +void *ov5_021F50BC(UnkStruct_ov5_021DF47C *param0); +void ov5_021F50D8(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F511C(MapObject *param0); #endif // POKEPLATINUM_OV5_021F50BC_H diff --git a/include/overlay005/ov5_021F5284.h b/include/overlay005/ov5_021F5284.h index e92d42a3f4..723780f496 100644 --- a/include/overlay005/ov5_021F5284.h +++ b/include/overlay005/ov5_021F5284.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV5_021F5284_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F5284(UnkStruct_ov5_021DF47C * param0); -void ov5_021F52A0(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F52E4(MapObject * param0); +void *ov5_021F5284(UnkStruct_ov5_021DF47C *param0); +void ov5_021F52A0(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F52E4(MapObject *param0); #endif // POKEPLATINUM_OV5_021F5284_H diff --git a/include/overlay005/ov5_021F5428.h b/include/overlay005/ov5_021F5428.h index 7168a0d427..e451961b62 100644 --- a/include/overlay005/ov5_021F5428.h +++ b/include/overlay005/ov5_021F5428.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV5_021F5428_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F5428(UnkStruct_ov5_021DF47C * param0); -void ov5_021F5444(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F5488(MapObject * param0); +void *ov5_021F5428(UnkStruct_ov5_021DF47C *param0); +void ov5_021F5444(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F5488(MapObject *param0); #endif // POKEPLATINUM_OV5_021F5428_H diff --git a/include/overlay005/ov5_021F55CC.h b/include/overlay005/ov5_021F55CC.h index 33b093329b..ffe0a89fff 100644 --- a/include/overlay005/ov5_021F55CC.h +++ b/include/overlay005/ov5_021F55CC.h @@ -4,8 +4,8 @@ #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F55CC(UnkStruct_ov5_021DF47C * param0); -void ov5_021F55E8(void * param0); -void ov5_021F5634(FieldSystem * fieldSystem, int param1, int param2, int param3); +void *ov5_021F55CC(UnkStruct_ov5_021DF47C *param0); +void ov5_021F55E8(void *param0); +void ov5_021F5634(FieldSystem *fieldSystem, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F55CC_H diff --git a/include/overlay005/ov5_021F575C.h b/include/overlay005/ov5_021F575C.h index 67ac71005e..a154f46a2e 100644 --- a/include/overlay005/ov5_021F575C.h +++ b/include/overlay005/ov5_021F575C.h @@ -4,8 +4,8 @@ #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F575C(UnkStruct_ov5_021DF47C * param0); -void ov5_021F5778(void * param0); -void ov5_021F57C8(FieldSystem * fieldSystem, int param1, int param2); +void *ov5_021F575C(UnkStruct_ov5_021DF47C *param0); +void ov5_021F5778(void *param0); +void ov5_021F57C8(FieldSystem *fieldSystem, int param1, int param2); #endif // POKEPLATINUM_OV5_021F575C_H diff --git a/include/overlay005/ov5_021F5894.h b/include/overlay005/ov5_021F5894.h index 0d57ed5eaf..e8acdf8828 100644 --- a/include/overlay005/ov5_021F5894.h +++ b/include/overlay005/ov5_021F5894.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV5_021F5894_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F5894(UnkStruct_ov5_021DF47C * param0); -void ov5_021F58B0(void * param0); -void ov5_021F58FC(MapObject * param0, int param1, int param2, int param3); +void *ov5_021F5894(UnkStruct_ov5_021DF47C *param0); +void ov5_021F58B0(void *param0); +void ov5_021F58FC(MapObject *param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F5894_H diff --git a/include/overlay005/ov5_021F5A10.h b/include/overlay005/ov5_021F5A10.h index 1ace03c8e8..4dbe9789a4 100644 --- a/include/overlay005/ov5_021F5A10.h +++ b/include/overlay005/ov5_021F5A10.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_OV5_021F5A10_H #define POKEPLATINUM_OV5_021F5A10_H -#include "field/field_system_decl.h" #include "struct_decls/struct_02061AB4_decl.h" + +#include "field/field_system_decl.h" #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F5A10(UnkStruct_ov5_021DF47C * param0); -void ov5_021F5A24(void * param0); -void ov5_021F5AA4(FieldSystem * fieldSystem, BOOL param1); -int ov5_021F5C4C(UnkStruct_ov101_021D5D90 * param0); -void ov5_021F5C58(UnkStruct_ov101_021D5D90 * param0); -UnkStruct_ov101_021D5D90 * ov5_021F5D8C(MapObject * param0, int param1, int param2, int param3); +void *ov5_021F5A10(UnkStruct_ov5_021DF47C *param0); +void ov5_021F5A24(void *param0); +void ov5_021F5AA4(FieldSystem *fieldSystem, BOOL param1); +int ov5_021F5C4C(UnkStruct_ov101_021D5D90 *param0); +void ov5_021F5C58(UnkStruct_ov101_021D5D90 *param0); +UnkStruct_ov101_021D5D90 *ov5_021F5D8C(MapObject *param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV5_021F5A10_H diff --git a/include/overlay005/ov5_021F600C.h b/include/overlay005/ov5_021F600C.h index c45039cfe1..b39a69ea0b 100644 --- a/include/overlay005/ov5_021F600C.h +++ b/include/overlay005/ov5_021F600C.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV5_021F600C_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -void * ov5_021F600C(UnkStruct_ov5_021DF47C * param0); -void ov5_021F6028(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F6094(MapObject * param0); +void *ov5_021F600C(UnkStruct_ov5_021DF47C *param0); +void ov5_021F6028(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F6094(MapObject *param0); #endif // POKEPLATINUM_OV5_021F600C_H diff --git a/include/overlay005/ov5_021F61BC.h b/include/overlay005/ov5_021F61BC.h index 724bf0e383..86e845f02c 100644 --- a/include/overlay005/ov5_021F61BC.h +++ b/include/overlay005/ov5_021F61BC.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV5_021F61BC_H #include "struct_decls/struct_0205E884_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" -void * ov5_021F61BC(UnkStruct_ov5_021DF47C * param0); -void ov5_021F61D8(void * param0); -void ov5_021F6218(PlayerAvatar * playerAvatar); +void *ov5_021F61BC(UnkStruct_ov5_021DF47C *param0); +void ov5_021F61D8(void *param0); +void ov5_021F6218(PlayerAvatar *playerAvatar); #endif // POKEPLATINUM_OV5_021F61BC_H diff --git a/include/overlay005/ov5_021F6454.h b/include/overlay005/ov5_021F6454.h index 480cfe3a0f..5d5161ce72 100644 --- a/include/overlay005/ov5_021F6454.h +++ b/include/overlay005/ov5_021F6454.h @@ -3,27 +3,27 @@ #include "field_script_context.h" -BOOL ScrCmd_2DE(ScriptContext * param0); -BOOL ScrCmd_2EE(ScriptContext * param0); -BOOL ScrCmd_31D(ScriptContext * param0); -BOOL ScrCmd_31E(ScriptContext * param0); -BOOL ScrCmd_2F1(ScriptContext * param0); -BOOL ScrCmd_303(ScriptContext * param0); -BOOL ScrCmd_304(ScriptContext * param0); -BOOL ScrCmd_2FF(ScriptContext * param0); -BOOL ScrCmd_300(ScriptContext * param0); -BOOL ScrCmd_301(ScriptContext * param0); -BOOL ScrCmd_305(ScriptContext * param0); -BOOL ScrCmd_30F(ScriptContext * param0); -BOOL ScrCmd_316(ScriptContext * param0); -BOOL ScrCmd_32C(ScriptContext * param0); -BOOL ScrCmd_32D(ScriptContext * param0); -BOOL ScrCmd_32E(ScriptContext * param0); -BOOL ScrCmd_331(ScriptContext * param0); -BOOL ScrCmd_332(ScriptContext * param0); -BOOL ScrCmd_338(ScriptContext * param0); -BOOL ScrCmd_339(ScriptContext * param0); -BOOL ScrCmd_330(ScriptContext * param0); -BOOL ScrCmd_333(ScriptContext * param0); +BOOL ScrCmd_2DE(ScriptContext *param0); +BOOL ScrCmd_2EE(ScriptContext *param0); +BOOL ScrCmd_31D(ScriptContext *param0); +BOOL ScrCmd_31E(ScriptContext *param0); +BOOL ScrCmd_2F1(ScriptContext *param0); +BOOL ScrCmd_303(ScriptContext *param0); +BOOL ScrCmd_304(ScriptContext *param0); +BOOL ScrCmd_2FF(ScriptContext *param0); +BOOL ScrCmd_300(ScriptContext *param0); +BOOL ScrCmd_301(ScriptContext *param0); +BOOL ScrCmd_305(ScriptContext *param0); +BOOL ScrCmd_30F(ScriptContext *param0); +BOOL ScrCmd_316(ScriptContext *param0); +BOOL ScrCmd_32C(ScriptContext *param0); +BOOL ScrCmd_32D(ScriptContext *param0); +BOOL ScrCmd_32E(ScriptContext *param0); +BOOL ScrCmd_331(ScriptContext *param0); +BOOL ScrCmd_332(ScriptContext *param0); +BOOL ScrCmd_338(ScriptContext *param0); +BOOL ScrCmd_339(ScriptContext *param0); +BOOL ScrCmd_330(ScriptContext *param0); +BOOL ScrCmd_333(ScriptContext *param0); #endif // POKEPLATINUM_OV5_021F6454_H diff --git a/include/overlay005/ov5_021F77A8.h b/include/overlay005/ov5_021F77A8.h index bac820fa4a..178384370a 100644 --- a/include/overlay005/ov5_021F77A8.h +++ b/include/overlay005/ov5_021F77A8.h @@ -3,13 +3,13 @@ #include "field_script_context.h" -BOOL ScrCmd_337(ScriptContext * param0); -BOOL ScrCmd_2E5(ScriptContext * param0); -BOOL ScrCmd_2E9(ScriptContext * param0); -BOOL ScrCmd_2EA(ScriptContext * param0); -BOOL ScrCmd_2EB(ScriptContext * param0); -BOOL ScrCmd_2E6(ScriptContext * param0); -BOOL ScrCmd_2EC(ScriptContext * param0); -BOOL ScrCmd_2ED(ScriptContext * param0); +BOOL ScrCmd_337(ScriptContext *param0); +BOOL ScrCmd_2E5(ScriptContext *param0); +BOOL ScrCmd_2E9(ScriptContext *param0); +BOOL ScrCmd_2EA(ScriptContext *param0); +BOOL ScrCmd_2EB(ScriptContext *param0); +BOOL ScrCmd_2E6(ScriptContext *param0); +BOOL ScrCmd_2EC(ScriptContext *param0); +BOOL ScrCmd_2ED(ScriptContext *param0); #endif // POKEPLATINUM_OV5_021F77A8_H diff --git a/include/overlay005/ov5_021F8370.h b/include/overlay005/ov5_021F8370.h index 778d59a3c9..7542f704ab 100644 --- a/include/overlay005/ov5_021F8370.h +++ b/include/overlay005/ov5_021F8370.h @@ -3,9 +3,9 @@ #include "field/field_system_decl.h" -void ov5_021F8370(FieldSystem * fieldSystem); -void ov5_021F83C0(FieldSystem * fieldSystem); -BOOL ov5_021F83D4(FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4); -BOOL ov5_021F8410(FieldSystem * fieldSystem, const int param1, const int param2, const int param3); +void ov5_021F8370(FieldSystem *fieldSystem); +void ov5_021F83C0(FieldSystem *fieldSystem); +BOOL ov5_021F83D4(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4); +BOOL ov5_021F8410(FieldSystem *fieldSystem, const int param1, const int param2, const int param3); #endif // POKEPLATINUM_OV5_021F8370_H diff --git a/include/overlay005/ov5_021F8560.h b/include/overlay005/ov5_021F8560.h index 40405dd7a9..31e21cac30 100644 --- a/include/overlay005/ov5_021F8560.h +++ b/include/overlay005/ov5_021F8560.h @@ -1,22 +1,23 @@ #ifndef POKEPLATINUM_OV5_021F8560_H #define POKEPLATINUM_OV5_021F8560_H +#include + #include "struct_decls/struct_0205E884_decl.h" + #include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay005/struct_ov5_02201C58.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -#include - -void * ov5_021F8560(UnkStruct_ov5_021DF47C * param0); -void ov5_021F857C(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F85BC(PlayerAvatar * playerAvatar, int param1, int param2, int param3, int param4, int param5, int param6); -UnkStruct_ov5_02201C58 * ov5_021F88A8(UnkStruct_ov101_021D5D90 * param0); -void ov5_021F88B4(UnkStruct_ov101_021D5D90 * param0, int param1, int param2); -void ov5_021F88CC(UnkStruct_ov101_021D5D90 * param0, int param1); -void ov5_021F88DC(UnkStruct_ov101_021D5D90 * param0, int param1); -VecFx32 * ov5_021F88F0(UnkStruct_ov101_021D5D90 * param0); -VecFx32 * ov5_021F88FC(UnkStruct_ov101_021D5D90 * param0); -void ov5_021F8908(UnkStruct_ov101_021D5D90 * param0, u16 param1); +void *ov5_021F8560(UnkStruct_ov5_021DF47C *param0); +void ov5_021F857C(void *param0); +UnkStruct_ov101_021D5D90 *ov5_021F85BC(PlayerAvatar *playerAvatar, int param1, int param2, int param3, int param4, int param5, int param6); +UnkStruct_ov5_02201C58 *ov5_021F88A8(UnkStruct_ov101_021D5D90 *param0); +void ov5_021F88B4(UnkStruct_ov101_021D5D90 *param0, int param1, int param2); +void ov5_021F88CC(UnkStruct_ov101_021D5D90 *param0, int param1); +void ov5_021F88DC(UnkStruct_ov101_021D5D90 *param0, int param1); +VecFx32 *ov5_021F88F0(UnkStruct_ov101_021D5D90 *param0); +VecFx32 *ov5_021F88FC(UnkStruct_ov101_021D5D90 *param0); +void ov5_021F8908(UnkStruct_ov101_021D5D90 *param0, u16 param1); #endif // POKEPLATINUM_OV5_021F8560_H diff --git a/include/overlay005/struct_ov5_021D30A8.h b/include/overlay005/struct_ov5_021D30A8.h index e71f7fc94f..ea55e9f188 100644 --- a/include/overlay005/struct_ov5_021D30A8.h +++ b/include/overlay005/struct_ov5_021D30A8.h @@ -1,18 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_OV5_021D30A8_H #define POKEPLATINUM_STRUCT_OV5_021D30A8_H -#include "struct_defs/struct_02009508.h" #include "struct_decls/struct_02009714_decl.h" +#include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_02009508.h" #include "struct_defs/struct_02009CFC.h" #include "struct_defs/struct_0200C738.h" -#include "struct_decls/struct_020218BC_decl.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009508 * unk_190; - UnkStruct_02009714 * unk_194[6]; - UnkStruct_02009CFC * unk_1AC[6]; + UnkStruct_02009508 *unk_190; + UnkStruct_02009714 *unk_194[6]; + UnkStruct_02009CFC *unk_1AC[6]; u16 unk_1C4; u16 unk_1C6; } UnkStruct_ov5_021D30A8; diff --git a/include/overlay005/struct_ov5_021D52F4.h b/include/overlay005/struct_ov5_021D52F4.h index 3c06e3d795..863bdd2acd 100644 --- a/include/overlay005/struct_ov5_021D52F4.h +++ b/include/overlay005/struct_ov5_021D52F4.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_STRUCT_OV5_021D52F4_H #define POKEPLATINUM_STRUCT_OV5_021D52F4_H - -#include #include +#include typedef struct { u32 unk_00; diff --git a/include/overlay005/struct_ov5_021D5894.h b/include/overlay005/struct_ov5_021D5894.h index 9cecbd0a21..fe89795198 100644 --- a/include/overlay005/struct_ov5_021D5894.h +++ b/include/overlay005/struct_ov5_021D5894.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_STRUCT_OV5_021D5894_H #define POKEPLATINUM_STRUCT_OV5_021D5894_H - -#include #include +#include typedef struct UnkStruct_ov5_021D5894_t { VecFx16 unk_00[4]; diff --git a/include/overlay005/struct_ov5_021DE47C.h b/include/overlay005/struct_ov5_021DE47C.h index 7832ecf8d9..e02d239796 100644 --- a/include/overlay005/struct_ov5_021DE47C.h +++ b/include/overlay005/struct_ov5_021DE47C.h @@ -2,13 +2,13 @@ #define POKEPLATINUM_STRUCT_OV5_021DE47C_H #include "struct_decls/struct_02009714_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_0200C738.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; + UnkStruct_02009714 *unk_190[4]; } UnkStruct_ov5_021DE47C; #endif // POKEPLATINUM_STRUCT_OV5_021DE47C_H diff --git a/include/overlay005/struct_ov5_021DE5A4.h b/include/overlay005/struct_ov5_021DE5A4.h index 55c6aa22c8..c75d4d26b8 100644 --- a/include/overlay005/struct_ov5_021DE5A4.h +++ b/include/overlay005/struct_ov5_021DE5A4.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_STRUCT_OV5_021DE5A4_H #include "struct_decls/struct_02009DC8_decl.h" + #include "overlay019/struct_ov19_021DA864.h" typedef struct { - UnkStruct_02009DC8 * unk_00[4]; + UnkStruct_02009DC8 *unk_00[4]; UnkStruct_ov19_021DA864 unk_10; } UnkStruct_ov5_021DE5A4; diff --git a/include/overlay005/struct_ov5_021DF7F8.h b/include/overlay005/struct_ov5_021DF7F8.h index 3973222893..922d92f43b 100644 --- a/include/overlay005/struct_ov5_021DF7F8.h +++ b/include/overlay005/struct_ov5_021DF7F8.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV5_021DF7F8_H #define POKEPLATINUM_STRUCT_OV5_021DF7F8_H +#include + #include "struct_decls/struct_02020C44_decl.h" -#include "overlay005/struct_ov5_021DF84C.h" -#include +#include "overlay005/struct_ov5_021DF84C.h" typedef struct { - UnkStruct_02020C44 * unk_00; - const UnkStruct_ov5_021DF84C * unk_04; + UnkStruct_02020C44 *unk_00; + const UnkStruct_ov5_021DF84C *unk_04; VecFx32 unk_08; VecFx32 unk_14; } UnkStruct_ov5_021DF7F8; diff --git a/include/overlay005/struct_ov5_021DF84C.h b/include/overlay005/struct_ov5_021DF84C.h index 149e35931f..b7c814cd07 100644 --- a/include/overlay005/struct_ov5_021DF84C.h +++ b/include/overlay005/struct_ov5_021DF84C.h @@ -1,15 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV5_021DF84C_H #define POKEPLATINUM_STRUCT_OV5_021DF84C_H +#include + #include "struct_defs/struct_020217F4.h" #include "struct_defs/struct_02024184.h" -#include - typedef struct { - void * unk_00; - const NNSG3dResTex * unk_04; - const UnkStruct_020217F4 * unk_08; + void *unk_00; + const NNSG3dResTex *unk_04; + const UnkStruct_020217F4 *unk_08; UnkStruct_02024184 unk_0C; NNSGfdTexKey unk_1C; NNSGfdTexKey unk_20; diff --git a/include/overlay005/struct_ov5_021E52A8_sub2.h b/include/overlay005/struct_ov5_021E52A8_sub2.h index dec0359fd6..8a72bd087d 100644 --- a/include/overlay005/struct_ov5_021E52A8_sub2.h +++ b/include/overlay005/struct_ov5_021E52A8_sub2.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV5_021E52A8_SUB2_H #define POKEPLATINUM_STRUCT_OV5_021E52A8_SUB2_H -#include "struct_decls/struct_02018340_decl.h" - #include +#include "struct_decls/struct_02018340_decl.h" + typedef struct { - BGL * unk_00; + BGL *unk_00; MtxFx22 unk_04; u32 unk_14; int unk_18; diff --git a/include/overlay005/struct_ov5_021EC700.h b/include/overlay005/struct_ov5_021EC700.h index ff4ad3eddd..6be105ed09 100644 --- a/include/overlay005/struct_ov5_021EC700.h +++ b/include/overlay005/struct_ov5_021EC700.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV5_021EC700_H #define POKEPLATINUM_STRUCT_OV5_021EC700_H - #include typedef struct { diff --git a/include/overlay005/struct_ov5_021ED0A4.h b/include/overlay005/struct_ov5_021ED0A4.h index 3a8f5705a0..dc3f175fdc 100644 --- a/include/overlay005/struct_ov5_021ED0A4.h +++ b/include/overlay005/struct_ov5_021ED0A4.h @@ -5,6 +5,7 @@ #include "struct_decls/struct_0202298C_decl.h" #include "struct_decls/struct_02022BD8_decl.h" #include "struct_decls/struct_02061830_decl.h" + #include "overlay005/struct_ov5_021DF84C.h" #include "overlay005/struct_ov5_021ED110.h" #include "overlay005/struct_ov5_021EDF3C.h" @@ -22,16 +23,16 @@ typedef struct UnkStruct_ov5_021ED0A4_t { int unk_20[8]; int unk_40[8]; int unk_60[32]; - UnkStruct_02020C44 * unk_E0; - UnkStruct_ov5_021DF84C * unk_E4; - UnkStruct_0202298C * unk_E8; - UnkStruct_0202298C * unk_EC; - UnkStruct_02022BD8 * unk_F0; - UnkStruct_ov5_021ED110 * unk_F4; - UnkStruct_ov5_021F06D8 * unk_F8; - UnkStruct_ov5_021F06D8 * unk_FC; - UnkStruct_ov5_021EDF3C * unk_100; - const MapObjectManager * unk_104; + UnkStruct_02020C44 *unk_E0; + UnkStruct_ov5_021DF84C *unk_E4; + UnkStruct_0202298C *unk_E8; + UnkStruct_0202298C *unk_EC; + UnkStruct_02022BD8 *unk_F0; + UnkStruct_ov5_021ED110 *unk_F4; + UnkStruct_ov5_021F06D8 *unk_F8; + UnkStruct_ov5_021F06D8 *unk_FC; + UnkStruct_ov5_021EDF3C *unk_100; + const MapObjectManager *unk_104; } UnkStruct_ov5_021ED0A4; #endif // POKEPLATINUM_STRUCT_OV5_021ED0A4_H diff --git a/include/overlay005/struct_ov5_021ED110.h b/include/overlay005/struct_ov5_021ED110.h index c847281727..d72c07c25e 100644 --- a/include/overlay005/struct_ov5_021ED110.h +++ b/include/overlay005/struct_ov5_021ED110.h @@ -5,7 +5,7 @@ typedef struct { u32 unk_00; - UnkStruct_ov5_021DF84C * unk_04; + UnkStruct_ov5_021DF84C *unk_04; } UnkStruct_ov5_021ED110; #endif // POKEPLATINUM_STRUCT_OV5_021ED110_H diff --git a/include/overlay005/struct_ov5_021EDD04.h b/include/overlay005/struct_ov5_021EDD04.h index 8ff42c938b..29e4693b75 100644 --- a/include/overlay005/struct_ov5_021EDD04.h +++ b/include/overlay005/struct_ov5_021EDD04.h @@ -7,7 +7,7 @@ typedef struct { int unk_00; int unk_04; int unk_06; - const UnkStruct_020217F4 * unk_08; + const UnkStruct_020217F4 *unk_08; } UnkStruct_ov5_021EDD04; #endif // POKEPLATINUM_STRUCT_OV5_021EDD04_H diff --git a/include/overlay005/struct_ov5_021EDF3C.h b/include/overlay005/struct_ov5_021EDF3C.h index 0b2c445618..bae68236b2 100644 --- a/include/overlay005/struct_ov5_021EDF3C.h +++ b/include/overlay005/struct_ov5_021EDF3C.h @@ -1,25 +1,26 @@ #ifndef POKEPLATINUM_STRUCT_OV5_021EDF3C_H #define POKEPLATINUM_STRUCT_OV5_021EDF3C_H -#include "sys_task_manager.h" #include "overlay005/struct_ov5_021ED0A4.h" #include "overlay005/struct_ov5_021EDFBC.h" #include "overlay005/struct_ov5_021EE134.h" #include "overlay005/struct_ov5_021EE294.h" +#include "sys_task_manager.h" + typedef struct { s16 unk_00; s16 unk_02; vs16 unk_04; vu16 unk_06; - UnkStruct_ov5_021EE294 * unk_08; - UnkStruct_ov5_021EDFBC * unk_0C; - UnkStruct_ov5_021EE134 * unk_10; - struct UnkStruct_ov5_021ED0A4_t * unk_14; - SysTask * unk_18; - SysTask * unk_1C; - SysTask * unk_20; - SysTask * unk_24; + UnkStruct_ov5_021EE294 *unk_08; + UnkStruct_ov5_021EDFBC *unk_0C; + UnkStruct_ov5_021EE134 *unk_10; + struct UnkStruct_ov5_021ED0A4_t *unk_14; + SysTask *unk_18; + SysTask *unk_1C; + SysTask *unk_20; + SysTask *unk_24; } UnkStruct_ov5_021EDF3C; #endif // POKEPLATINUM_STRUCT_OV5_021EDF3C_H diff --git a/include/overlay005/struct_ov5_021EDFBC.h b/include/overlay005/struct_ov5_021EDFBC.h index 9f0e6ac54e..4f1f613849 100644 --- a/include/overlay005/struct_ov5_021EDFBC.h +++ b/include/overlay005/struct_ov5_021EDFBC.h @@ -7,7 +7,7 @@ typedef struct { u32 unk_00; int unk_04; int unk_08; - UnkStruct_02022BD8 * unk_0C; + UnkStruct_02022BD8 *unk_0C; } UnkStruct_ov5_021EDFBC; #endif // POKEPLATINUM_STRUCT_OV5_021EDFBC_H diff --git a/include/overlay005/struct_ov5_021EE134.h b/include/overlay005/struct_ov5_021EE134.h index 62fd8f37dc..e486b2d052 100644 --- a/include/overlay005/struct_ov5_021EE134.h +++ b/include/overlay005/struct_ov5_021EE134.h @@ -6,7 +6,7 @@ typedef struct { vu32 unk_00; int unk_04; - UnkStruct_02022BD8 * unk_08; + UnkStruct_02022BD8 *unk_08; } UnkStruct_ov5_021EE134; #endif // POKEPLATINUM_STRUCT_OV5_021EE134_H diff --git a/include/overlay005/struct_ov5_021EE294.h b/include/overlay005/struct_ov5_021EE294.h index 67ea42a0f8..26be72346b 100644 --- a/include/overlay005/struct_ov5_021EE294.h +++ b/include/overlay005/struct_ov5_021EE294.h @@ -6,8 +6,8 @@ typedef struct { int unk_00; - MapObject * unk_04; - UnkStruct_020216E0 ** unk_08; + MapObject *unk_04; + UnkStruct_020216E0 **unk_08; } UnkStruct_ov5_021EE294; #endif // POKEPLATINUM_STRUCT_OV5_021EE294_H diff --git a/include/overlay005/struct_ov5_021EF13C.h b/include/overlay005/struct_ov5_021EF13C.h index 92aec969d9..4257774e94 100644 --- a/include/overlay005/struct_ov5_021EF13C.h +++ b/include/overlay005/struct_ov5_021EF13C.h @@ -1,19 +1,19 @@ #ifndef POKEPLATINUM_STRUCT_OV5_021EF13C_H #define POKEPLATINUM_STRUCT_OV5_021EF13C_H +#include + #include "overlay005/struct_ov5_021EEC68.h" #include "overlay005/struct_ov5_021EED38.h" #include "overlay005/struct_ov5_021EF13C_sub1.h" -#include - typedef struct UnkStruct_ov5_021EF13C_t { - UnkStruct_ov5_021EF13C_sub1 * unk_00; - fx32 * unk_04; - UnkStruct_ov5_021EED38 * unk_08; - u16 * unk_0C; - UnkStruct_ov5_021EEC68 * unk_10; - VecFx32 * unk_14; + UnkStruct_ov5_021EF13C_sub1 *unk_00; + fx32 *unk_04; + UnkStruct_ov5_021EED38 *unk_08; + u16 *unk_0C; + UnkStruct_ov5_021EEC68 *unk_10; + VecFx32 *unk_14; BOOL unk_18; int unk_1C; } UnkStruct_ov5_021EF13C; diff --git a/include/overlay005/struct_ov5_021FB97C.h b/include/overlay005/struct_ov5_021FB97C.h index 996241750a..fbb791735e 100644 --- a/include/overlay005/struct_ov5_021FB97C.h +++ b/include/overlay005/struct_ov5_021FB97C.h @@ -5,7 +5,7 @@ typedef struct { u32 unk_00; - const UnkStruct_ov5_021FB0F0 * unk_04; + const UnkStruct_ov5_021FB0F0 *unk_04; } UnkStruct_ov5_021FB97C; #endif // POKEPLATINUM_STRUCT_OV5_021FB97C_H diff --git a/include/overlay005/vs_seeker.h b/include/overlay005/vs_seeker.h index a3409aec68..34e72e6620 100644 --- a/include/overlay005/vs_seeker.h +++ b/include/overlay005/vs_seeker.h @@ -1,11 +1,13 @@ #ifndef POKEPLATINUM_VS_SEEKER_H #define POKEPLATINUM_VS_SEEKER_H -#include "field/field_system_decl.h" -#include "string_template.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" +#include "field/field_system_decl.h" + +#include "string_template.h" + void VsSeeker_Start(TaskManager *taskMan, StringTemplate *template, u16 *outResult); BOOL VsSeeker_UpdateStepCount(FieldSystem *fieldSystem); u16 VsSeeker_GetRematchTrainerID(FieldSystem *fieldSystem, MapObject *trainerObj, u16 trainerID); diff --git a/include/overlay006/battle_params.h b/include/overlay006/battle_params.h index f4e5ea0da1..b2ef7782ba 100644 --- a/include/overlay006/battle_params.h +++ b/include/overlay006/battle_params.h @@ -1,23 +1,25 @@ #ifndef POKEPLATINUM_BATTLE_PARAMS_H #define POKEPLATINUM_BATTLE_PARAMS_H -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "game_options.h" #include "struct_decls/struct_02027F8C_decl.h" -#include "journal.h" #include "struct_decls/struct_0202C878_decl.h" -#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "poketch_data.h" #include "struct_decls/struct_0206D140_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" +#include "struct_defs/chatot_cry.h" +#include "struct_defs/struct_0209C370.h" #include "struct_defs/trainer_data.h" + +#include "overlay006/struct_ov6_02240D5C_sub1.h" + #include "bag.h" -#include "struct_defs/struct_0209C370.h" +#include "game_options.h" +#include "journal.h" +#include "poketch_data.h" #include "savedata.h" -#include "overlay006/struct_ov6_02240D5C_sub1.h" +#include "trainer_info.h" typedef struct { u32 battleType; @@ -25,20 +27,20 @@ typedef struct { int unk_14; int trainerIDs[4]; TrainerData trainerData[4]; - TrainerInfo * unk_D0[4]; - Bag * unk_E0; - UnkStruct_0207D99C * unk_E4; - PokedexData * unk_E8; - PCBoxes * unk_EC; - ChatotCry * unk_F0[4]; + TrainerInfo *unk_D0[4]; + Bag *unk_E0; + UnkStruct_0207D99C *unk_E4; + PokedexData *unk_E8; + PCBoxes *unk_EC; + ChatotCry *unk_F0[4]; PoketchData *poketchData; - UnkStruct_0202C878 * unk_104; - Options * unk_108; - UnkStruct_0206D140 * unk_10C; + UnkStruct_0202C878 *unk_104; + Options *unk_108; + UnkStruct_0206D140 *unk_10C; BattleParams_sub1 unk_110; - UnkStruct_0202CD88 * unk_11C; - Journal * unk_120; - UnkStruct_02027F8C * unk_124; + UnkStruct_0202CD88 *unk_11C; + Journal *unk_120; + UnkStruct_02027F8C *unk_124; int unk_128; int unk_12C; int unk_130; @@ -54,16 +56,16 @@ typedef struct { u32 unk_164; int unk_168; u32 unk_16C; - void * unk_170; + void *unk_170; u32 unk_174; int unk_178[4]; u16 unk_188; u8 unk_18A; u8 unk_18B; int unk_18C; - UnkStruct_0209C370 * unk_190; + UnkStruct_0209C370 *unk_190; u8 unk_194[4]; - SaveData * unk_198; + SaveData *unk_198; u32 unk_19C; } BattleParams; diff --git a/include/overlay006/funcptr_ov6_0223E6EC.h b/include/overlay006/funcptr_ov6_0223E6EC.h index 73bf1033e3..928e8c8da0 100644 --- a/include/overlay006/funcptr_ov6_0223E6EC.h +++ b/include/overlay006/funcptr_ov6_0223E6EC.h @@ -4,6 +4,6 @@ #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021D1BEC_decl.h" -typedef void (* UnkFuncPtr_ov6_0223E6EC)(UnkStruct_ov5_021D1BEC *, FieldSystem *, void *); +typedef void (*UnkFuncPtr_ov6_0223E6EC)(UnkStruct_ov5_021D1BEC *, FieldSystem *, void *); #endif // POKEPLATINUM_FUNCPTR_OV6_0223E6EC_H diff --git a/include/overlay006/ov6_0223E140.h b/include/overlay006/ov6_0223E140.h index 26485c2f5c..b1ccab0137 100644 --- a/include/overlay006/ov6_0223E140.h +++ b/include/overlay006/ov6_0223E140.h @@ -1,9 +1,9 @@ #ifndef POKEPLATINUM_OV6_0223E140_H #define POKEPLATINUM_OV6_0223E140_H -#include "camera.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" + +#include "field/field_system_decl.h" #include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay006/struct_ov6_0223FDE4_decl.h" #include "overlay006/struct_ov6_02240000_decl.h" @@ -13,58 +13,60 @@ #include "overlay006/struct_ov6_02240A00_decl.h" #include "overlay006/struct_ov6_02240C44_decl.h" -void ov6_0223E384(TaskManager * param0); -void ov6_0223E4EC(TaskManager * param0); -UnkStruct_ov5_021D1BEC * ov6_0223E6EC(FieldSystem * fieldSystem); -void ov6_0223E700(UnkStruct_ov5_021D1BEC * param0); -BOOL ov6_0223E708(UnkStruct_ov5_021D1BEC * param0); -UnkStruct_ov5_021D1BEC * ov6_0223E814(FieldSystem * fieldSystem); -void ov6_0223E828(UnkStruct_ov5_021D1BEC * param0); -UnkStruct_ov5_021D1BEC * ov6_0223EA74(FieldSystem * fieldSystem, u32 param1); -UnkStruct_ov5_021D1BEC * ov6_0223FCCC(FieldSystem * fieldSystem); -void ov6_0223FCE0(UnkStruct_ov5_021D1BEC * param0); -void ov6_0223FCE8(UnkStruct_ov5_021D1BEC * param0); -u32 ov6_0223FCF4(UnkStruct_ov5_021D1BEC * param0); -UnkStruct_ov6_0223FDE4 * ov6_0223FDE4(u32 param0); -void ov6_0223FE08(UnkStruct_ov6_0223FDE4 * param0); -void ov6_0223FE1C(UnkStruct_ov6_0223FDE4 * param0, fx32 param1, fx32 param2, u32 param3, u32 param4, Camera * camera); -void ov6_0223FE9C(UnkStruct_ov6_0223FDE4 * param0); -BOOL ov6_0223FF6C(UnkStruct_ov6_0223FDE4 * param0); -u32 ov6_0223FFF4(const UnkStruct_ov6_0223FDE4 * param0); -fx32 ov6_0223FFF8(const UnkStruct_ov6_0223FDE4 * param0); -void ov6_0223FFFC(UnkStruct_ov6_0223FDE4 * param0, fx32 param1); -void ov6_02240000(UnkStruct_ov6_02240000 * param0, u32 param1, u32 param2, u32 param3); -int ov6_02240060(const UnkStruct_ov6_02240000 * param0); -UnkStruct_ov6_022400A8 * ov6_02240074(FieldSystem * fieldSystem); -void ov6_022400A8(UnkStruct_ov6_022400A8 * param0); -void ov6_022400C4(UnkStruct_ov6_022400A8 * param0); -UnkStruct_ov6_022401B8 * ov6_02240104(u32 param0, FieldSystem * fieldSystem); -void ov6_022401B8(UnkStruct_ov6_022401B8 * param0); -void ov6_022401D0(UnkStruct_ov6_022401B8 * param0, u32 param1); -BOOL ov6_02240214(UnkStruct_ov6_022401B8 * param0); -void ov6_02240228(UnkStruct_ov6_022401B8 * param0); -UnkStruct_ov6_02240774 * ov6_02240768(u32 param0); -void ov6_02240774(UnkStruct_ov6_02240774 * param0); -void ov6_0224077C(UnkStruct_ov6_02240774 * param0, u16 param1, u16 param2, u16 param3); -void ov6_022407A8(UnkStruct_ov6_02240774 * param0); -void ov6_022407B0(UnkStruct_ov6_02240774 * param0); -UnkStruct_ov6_02240A00 * ov6_022409F4(u32 param0); -void ov6_02240A00(UnkStruct_ov6_02240A00 * param0); -void ov6_02240A08(UnkStruct_ov6_02240A00 * param0); -void ov6_02240A10(UnkStruct_ov6_02240A00 * param0); -void ov6_02240A18(UnkStruct_ov6_02240A00 * param0, fx32 param1, fx32 param2, fx32 param3); -void ov6_02240A50(UnkStruct_ov6_02240A00 * param0, fx32 param1, fx32 param2, fx32 param3); -void ov6_02240A8C(UnkStruct_ov6_02240A00 * param0, fx32 param1, fx32 param2, fx32 param3); -UnkStruct_ov6_02240774 * ov6_02240AC8(u32 param0); -void ov6_02240AD4(UnkStruct_ov6_02240774 * param0); -void ov6_02240ADC(UnkStruct_ov6_02240774 * param0); -void ov6_02240AE4(UnkStruct_ov6_02240774 * param0); -void ov6_02240AEC(UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3); -void ov6_02240B24(UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3); -void ov6_02240B60(UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3); -UnkStruct_ov6_02240C44 * ov6_02240B9C(u32 param0, FieldSystem * fieldSystem); -void ov6_02240C44(UnkStruct_ov6_02240C44 * param0, u32 param1); -BOOL ov6_02240C7C(UnkStruct_ov6_02240C44 * param0); -void ov6_02240C94(UnkStruct_ov6_02240C44 * param0); +#include "camera.h" + +void ov6_0223E384(TaskManager *param0); +void ov6_0223E4EC(TaskManager *param0); +UnkStruct_ov5_021D1BEC *ov6_0223E6EC(FieldSystem *fieldSystem); +void ov6_0223E700(UnkStruct_ov5_021D1BEC *param0); +BOOL ov6_0223E708(UnkStruct_ov5_021D1BEC *param0); +UnkStruct_ov5_021D1BEC *ov6_0223E814(FieldSystem *fieldSystem); +void ov6_0223E828(UnkStruct_ov5_021D1BEC *param0); +UnkStruct_ov5_021D1BEC *ov6_0223EA74(FieldSystem *fieldSystem, u32 param1); +UnkStruct_ov5_021D1BEC *ov6_0223FCCC(FieldSystem *fieldSystem); +void ov6_0223FCE0(UnkStruct_ov5_021D1BEC *param0); +void ov6_0223FCE8(UnkStruct_ov5_021D1BEC *param0); +u32 ov6_0223FCF4(UnkStruct_ov5_021D1BEC *param0); +UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(u32 param0); +void ov6_0223FE08(UnkStruct_ov6_0223FDE4 *param0); +void ov6_0223FE1C(UnkStruct_ov6_0223FDE4 *param0, fx32 param1, fx32 param2, u32 param3, u32 param4, Camera *camera); +void ov6_0223FE9C(UnkStruct_ov6_0223FDE4 *param0); +BOOL ov6_0223FF6C(UnkStruct_ov6_0223FDE4 *param0); +u32 ov6_0223FFF4(const UnkStruct_ov6_0223FDE4 *param0); +fx32 ov6_0223FFF8(const UnkStruct_ov6_0223FDE4 *param0); +void ov6_0223FFFC(UnkStruct_ov6_0223FDE4 *param0, fx32 param1); +void ov6_02240000(UnkStruct_ov6_02240000 *param0, u32 param1, u32 param2, u32 param3); +int ov6_02240060(const UnkStruct_ov6_02240000 *param0); +UnkStruct_ov6_022400A8 *ov6_02240074(FieldSystem *fieldSystem); +void ov6_022400A8(UnkStruct_ov6_022400A8 *param0); +void ov6_022400C4(UnkStruct_ov6_022400A8 *param0); +UnkStruct_ov6_022401B8 *ov6_02240104(u32 param0, FieldSystem *fieldSystem); +void ov6_022401B8(UnkStruct_ov6_022401B8 *param0); +void ov6_022401D0(UnkStruct_ov6_022401B8 *param0, u32 param1); +BOOL ov6_02240214(UnkStruct_ov6_022401B8 *param0); +void ov6_02240228(UnkStruct_ov6_022401B8 *param0); +UnkStruct_ov6_02240774 *ov6_02240768(u32 param0); +void ov6_02240774(UnkStruct_ov6_02240774 *param0); +void ov6_0224077C(UnkStruct_ov6_02240774 *param0, u16 param1, u16 param2, u16 param3); +void ov6_022407A8(UnkStruct_ov6_02240774 *param0); +void ov6_022407B0(UnkStruct_ov6_02240774 *param0); +UnkStruct_ov6_02240A00 *ov6_022409F4(u32 param0); +void ov6_02240A00(UnkStruct_ov6_02240A00 *param0); +void ov6_02240A08(UnkStruct_ov6_02240A00 *param0); +void ov6_02240A10(UnkStruct_ov6_02240A00 *param0); +void ov6_02240A18(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3); +void ov6_02240A50(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3); +void ov6_02240A8C(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3); +UnkStruct_ov6_02240774 *ov6_02240AC8(u32 param0); +void ov6_02240AD4(UnkStruct_ov6_02240774 *param0); +void ov6_02240ADC(UnkStruct_ov6_02240774 *param0); +void ov6_02240AE4(UnkStruct_ov6_02240774 *param0); +void ov6_02240AEC(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3); +void ov6_02240B24(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3); +void ov6_02240B60(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3); +UnkStruct_ov6_02240C44 *ov6_02240B9C(u32 param0, FieldSystem *fieldSystem); +void ov6_02240C44(UnkStruct_ov6_02240C44 *param0, u32 param1); +BOOL ov6_02240C7C(UnkStruct_ov6_02240C44 *param0); +void ov6_02240C94(UnkStruct_ov6_02240C44 *param0); #endif // POKEPLATINUM_OV6_0223E140_H diff --git a/include/overlay006/ov6_02240C9C.h b/include/overlay006/ov6_02240C9C.h index 3bdb5dcf82..a6a48708c1 100644 --- a/include/overlay006/ov6_02240C9C.h +++ b/include/overlay006/ov6_02240C9C.h @@ -1,18 +1,19 @@ #ifndef POKEPLATINUM_OV6_02240C9C_H #define POKEPLATINUM_OV6_02240C9C_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" + +#include "field/field_system_decl.h" #include "overlay006/battle_params.h" #include "overlay006/struct_ov6_02242634.h" -void ov6_02240C9C(const UnkStruct_ov6_02242634 * param0, int * param1, int * param2); -BOOL ov6_02240D5C(FieldSystem * fieldSystem); -BOOL ov6_0224106C(FieldSystem * fieldSystem, const int param1, BattleParams ** param2); -BOOL ov6_022411C8(FieldSystem * fieldSystem, TaskManager * param1); -BOOL ov6_022413E4(FieldSystem * fieldSystem, BattleParams ** param1); -void ov6_02242034(FieldSystem * fieldSystem, BattleParams * param1); -void ov6_022420D4(FieldSystem * fieldSystem, u16 param1, u8 param2, BattleParams * param3); -BOOL ov6_02242110(FieldSystem * fieldSystem, u8 param1); +void ov6_02240C9C(const UnkStruct_ov6_02242634 *param0, int *param1, int *param2); +BOOL ov6_02240D5C(FieldSystem *fieldSystem); +BOOL ov6_0224106C(FieldSystem *fieldSystem, const int param1, BattleParams **param2); +BOOL ov6_022411C8(FieldSystem *fieldSystem, TaskManager *param1); +BOOL ov6_022413E4(FieldSystem *fieldSystem, BattleParams **param1); +void ov6_02242034(FieldSystem *fieldSystem, BattleParams *param1); +void ov6_022420D4(FieldSystem *fieldSystem, u16 param1, u8 param2, BattleParams *param3); +BOOL ov6_02242110(FieldSystem *fieldSystem, u8 param1); #endif // POKEPLATINUM_OV6_02240C9C_H diff --git a/include/overlay006/ov6_022426AC.h b/include/overlay006/ov6_022426AC.h index 8b08811cc4..36a08849ea 100644 --- a/include/overlay006/ov6_022426AC.h +++ b/include/overlay006/ov6_022426AC.h @@ -3,12 +3,12 @@ #include "overlay006/struct_ov6_022426B8_decl.h" -UnkStruct_ov6_022426B8 * ov6_022426AC(const int param0); -void ov6_022426B8(UnkStruct_ov6_022426B8 * param0); -void ov6_022426C0(UnkStruct_ov6_022426B8 * param0, const int param1); -void ov6_022427F4(UnkStruct_ov6_022426B8 * param0); -void ov6_02242814(UnkStruct_ov6_022426B8 * param0); -BOOL ov6_02242820(UnkStruct_ov6_022426B8 * param0); -void ov6_02242828(UnkStruct_ov6_022426B8 * param0); +UnkStruct_ov6_022426B8 *ov6_022426AC(const int param0); +void ov6_022426B8(UnkStruct_ov6_022426B8 *param0); +void ov6_022426C0(UnkStruct_ov6_022426B8 *param0, const int param1); +void ov6_022427F4(UnkStruct_ov6_022426B8 *param0); +void ov6_02242814(UnkStruct_ov6_022426B8 *param0); +BOOL ov6_02242820(UnkStruct_ov6_022426B8 *param0); +void ov6_02242828(UnkStruct_ov6_022426B8 *param0); #endif // POKEPLATINUM_OV6_022426AC_H diff --git a/include/overlay006/ov6_02242984.h b/include/overlay006/ov6_02242984.h index 4d42a7bd4b..66a35f4419 100644 --- a/include/overlay006/ov6_02242984.h +++ b/include/overlay006/ov6_02242984.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_OV6_02242984_H #define POKEPLATINUM_OV6_02242984_H -#include "field/field_system_decl.h" #include "struct_defs/struct_02049FA8.h" + +#include "field/field_system_decl.h" #include "overlay006/struct_ov6_02242A8C_decl.h" -int ov6_02242984(FieldSystem * fieldSystem); -UnkStruct_ov6_02242A8C * ov6_02242A10(const int param0, FieldSystem * fieldSystem); -void ov6_02242A8C(UnkStruct_ov6_02242A8C * param0); -void ov6_02242A94(const u8 param0, UnkStruct_ov6_02242A8C * param1); -Location * ov6_02242AEC(UnkStruct_ov6_02242A8C * param0); +int ov6_02242984(FieldSystem *fieldSystem); +UnkStruct_ov6_02242A8C *ov6_02242A10(const int param0, FieldSystem *fieldSystem); +void ov6_02242A8C(UnkStruct_ov6_02242A8C *param0); +void ov6_02242A94(const u8 param0, UnkStruct_ov6_02242A8C *param1); +Location *ov6_02242AEC(UnkStruct_ov6_02242A8C *param0); #endif // POKEPLATINUM_OV6_02242984_H diff --git a/include/overlay006/ov6_02242AF0.h b/include/overlay006/ov6_02242AF0.h index d2aca9e1d8..04cfe7a8a0 100644 --- a/include/overlay006/ov6_02242AF0.h +++ b/include/overlay006/ov6_02242AF0.h @@ -3,8 +3,8 @@ #include "field/field_system_decl.h" -void ov6_02242AF0(FieldSystem * fieldSystem); -void ov6_02242B58(FieldSystem * fieldSystem, const u16 param1, const u16 param2); -u32 ov6_02242C3C(FieldSystem * fieldSystem, const u16 param1); +void ov6_02242AF0(FieldSystem *fieldSystem); +void ov6_02242B58(FieldSystem *fieldSystem, const u16 param1, const u16 param2); +u32 ov6_02242C3C(FieldSystem *fieldSystem, const u16 param1); #endif // POKEPLATINUM_OV6_02242AF0_H diff --git a/include/overlay006/ov6_02242F74.h b/include/overlay006/ov6_02242F74.h index 534a3e7353..0ab3bb0737 100644 --- a/include/overlay006/ov6_02242F74.h +++ b/include/overlay006/ov6_02242F74.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_OV6_02242F74_H #define POKEPLATINUM_OV6_02242F74_H -void ov6_02242F74(const int param0, const BOOL param1, const int param2, int * param3, int * param4); +void ov6_02242F74(const int param0, const BOOL param1, const int param2, int *param3, int *param4); #endif // POKEPLATINUM_OV6_02242F74_H diff --git a/include/overlay006/ov6_02243004.h b/include/overlay006/ov6_02243004.h index 3c6ce1b429..20f15e90ff 100644 --- a/include/overlay006/ov6_02243004.h +++ b/include/overlay006/ov6_02243004.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -BOOL ov6_02243004(FieldSystem * fieldSystem, int param1); +BOOL ov6_02243004(FieldSystem *fieldSystem, int param1); #endif // POKEPLATINUM_OV6_02243004_H diff --git a/include/overlay006/ov6_022430C4.h b/include/overlay006/ov6_022430C4.h index 0656ea52bc..54ddf7c31a 100644 --- a/include/overlay006/ov6_022430C4.h +++ b/include/overlay006/ov6_022430C4.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_OV6_022430C4_H #define POKEPLATINUM_OV6_022430C4_H -#include "field/field_system_decl.h" #include "struct_defs/struct_020698E4.h" -int ov6_022430C4(FieldSystem * fieldSystem); -int ov6_022430E8(FieldSystem * fieldSystem, const u8 param1); -int ov6_02243114(FieldSystem * fieldSystem, const u8 param1); -int ov6_02243140(FieldSystem * fieldSystem); -int GetRadarSpecies(FieldSystem * fieldSystem); -void ov6_02243160(UnkStruct_020698E4 * param0); +#include "field/field_system_decl.h" + +int ov6_022430C4(FieldSystem *fieldSystem); +int ov6_022430E8(FieldSystem *fieldSystem, const u8 param1); +int ov6_02243114(FieldSystem *fieldSystem, const u8 param1); +int ov6_02243140(FieldSystem *fieldSystem); +int GetRadarSpecies(FieldSystem *fieldSystem); +void ov6_02243160(UnkStruct_020698E4 *param0); #endif // POKEPLATINUM_OV6_022430C4_H diff --git a/include/overlay006/ov6_02243218.h b/include/overlay006/ov6_02243218.h index 7ff45f2b42..6926823657 100644 --- a/include/overlay006/ov6_02243218.h +++ b/include/overlay006/ov6_02243218.h @@ -2,6 +2,6 @@ #define POKEPLATINUM_OV6_02243218_H u32 ov6_02243218(const u32 param0); -void ov6_0224322C(const u32 param0, u16 * param1, u16 * param2); +void ov6_0224322C(const u32 param0, u16 *param1, u16 *param2); #endif // POKEPLATINUM_OV6_02243218_H diff --git a/include/overlay006/ov6_02243258.h b/include/overlay006/ov6_02243258.h index 0f9d1b33d2..9e8b248304 100644 --- a/include/overlay006/ov6_02243258.h +++ b/include/overlay006/ov6_02243258.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_OV6_02243258_H #define POKEPLATINUM_OV6_02243258_H -#include "sys_task_manager.h" #include "field/field_system_decl.h" + #include "pokemon.h" +#include "sys_task_manager.h" -SysTask * ov6_02243F88(FieldSystem * fieldSystem, u32 param1, Pokemon * param2, int param3); -int ov6_02243FBC(SysTask * param0); -void ov6_02243FC8(SysTask * param0); -SysTask * ov6_02245CCC(FieldSystem * fieldSystem, int param1); -int ov6_02245CF0(SysTask * param0); -void ov6_02245CFC(SysTask * param0); +SysTask *ov6_02243F88(FieldSystem *fieldSystem, u32 param1, Pokemon *param2, int param3); +int ov6_02243FBC(SysTask *param0); +void ov6_02243FC8(SysTask *param0); +SysTask *ov6_02245CCC(FieldSystem *fieldSystem, int param1); +int ov6_02245CF0(SysTask *param0); +void ov6_02245CFC(SysTask *param0); #endif // POKEPLATINUM_OV6_02243258_H diff --git a/include/overlay006/ov6_02246034.h b/include/overlay006/ov6_02246034.h index a0776a1b25..e4c455c623 100644 --- a/include/overlay006/ov6_02246034.h +++ b/include/overlay006/ov6_02246034.h @@ -4,6 +4,6 @@ #include "field/field_system_decl.h" #include "overlay006/battle_params.h" -void ov6_02246034(FieldSystem * fieldSystem, BattleParams * param1); +void ov6_02246034(FieldSystem *fieldSystem, BattleParams *param1); #endif // POKEPLATINUM_OV6_02246034_H diff --git a/include/overlay006/ov6_02246184.h b/include/overlay006/ov6_02246184.h index 8e9b689e36..dbd01d0308 100644 --- a/include/overlay006/ov6_02246184.h +++ b/include/overlay006/ov6_02246184.h @@ -2,15 +2,16 @@ #define POKEPLATINUM_OV6_02246184_H #include "field/field_system_decl.h" -#include "pokemon.h" #include "overlay006/struct_ov6_02246204_decl.h" #include "overlay006/struct_ov6_02246254.h" -UnkStruct_ov6_02246204 * ov6_02246184(u32 param0, u32 param1); -void ov6_02246204(UnkStruct_ov6_02246204 * param0); -u32 ov6_02246224(const UnkStruct_ov6_02246204 * param0); -u32 ov6_0224622C(const UnkStruct_ov6_02246204 * param0); -void ov6_02246234(FieldSystem * fieldSystem, UnkStruct_ov6_02246204 * param1, int param2); -void ov6_02246254(FieldSystem * fieldSystem, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, Pokemon * param4, Pokemon * param5); +#include "pokemon.h" + +UnkStruct_ov6_02246204 *ov6_02246184(u32 param0, u32 param1); +void ov6_02246204(UnkStruct_ov6_02246204 *param0); +u32 ov6_02246224(const UnkStruct_ov6_02246204 *param0); +u32 ov6_0224622C(const UnkStruct_ov6_02246204 *param0); +void ov6_02246234(FieldSystem *fieldSystem, UnkStruct_ov6_02246204 *param1, int param2); +void ov6_02246254(FieldSystem *fieldSystem, UnkStruct_ov6_02246204 *param1, int param2, UnkStruct_ov6_02246254 *param3, Pokemon *param4, Pokemon *param5); #endif // POKEPLATINUM_OV6_02246184_H diff --git a/include/overlay006/ov6_02246444.h b/include/overlay006/ov6_02246444.h index b0cfd0ca61..a6fca4f086 100644 --- a/include/overlay006/ov6_02246444.h +++ b/include/overlay006/ov6_02246444.h @@ -4,13 +4,13 @@ #include "field/field_system_decl.h" #include "overlay006/struct_ov6_022465F4_decl.h" -void ov6_0224647C(UnkStruct_ov6_022465F4 * param0); -int ov6_0224648C(const UnkStruct_ov6_022465F4 * param0); -int ov6_02246490(const UnkStruct_ov6_022465F4 * param0); -const u16 * ov6_02246494(const UnkStruct_ov6_022465F4 * param0); -void * ov6_02246498(UnkStruct_ov6_022465F4 * param0); -int ov6_022464A4(const UnkStruct_ov6_022465F4 * param0); -UnkStruct_ov6_022465F4 * ov6_022465A0(FieldSystem * fieldSystem, int param1, int param2); -void ov6_022465F4(UnkStruct_ov6_022465F4 * param0); +void ov6_0224647C(UnkStruct_ov6_022465F4 *param0); +int ov6_0224648C(const UnkStruct_ov6_022465F4 *param0); +int ov6_02246490(const UnkStruct_ov6_022465F4 *param0); +const u16 *ov6_02246494(const UnkStruct_ov6_022465F4 *param0); +void *ov6_02246498(UnkStruct_ov6_022465F4 *param0); +int ov6_022464A4(const UnkStruct_ov6_022465F4 *param0); +UnkStruct_ov6_022465F4 *ov6_022465A0(FieldSystem *fieldSystem, int param1, int param2); +void ov6_022465F4(UnkStruct_ov6_022465F4 *param0); #endif // POKEPLATINUM_OV6_02246444_H diff --git a/include/overlay006/ov6_022465FC.h b/include/overlay006/ov6_022465FC.h index 1d31b2637f..781360fc89 100644 --- a/include/overlay006/ov6_022465FC.h +++ b/include/overlay006/ov6_022465FC.h @@ -3,11 +3,13 @@ #include "field/field_system_decl.h" -void ov6_022465FC(FieldSystem * fieldSystem); -int ov6_0224660C(FieldSystem * fieldSystem); -int ov6_022468B0(FieldSystem * fieldSystem, BOOL param1, BOOL param2); -int ov6_02246920(FieldSystem * fieldSystem); -int ov6_02246978(FieldSystem * fieldSystem, int param1); -BOOL ov6_022469E0(FieldSystem * fieldSystem, StringTemplate * param1, int param2, u16 * param3, u16 * param4); +#include "string_template.h" + +void ov6_022465FC(FieldSystem *fieldSystem); +int ov6_0224660C(FieldSystem *fieldSystem); +int ov6_022468B0(FieldSystem *fieldSystem, BOOL param1, BOOL param2); +int ov6_02246920(FieldSystem *fieldSystem); +int ov6_02246978(FieldSystem *fieldSystem, int param1); +BOOL ov6_022469E0(FieldSystem *fieldSystem, StringTemplate *param1, int param2, u16 *param3, u16 *param4); #endif // POKEPLATINUM_OV6_022465FC_H diff --git a/include/overlay006/ov6_02246A30.h b/include/overlay006/ov6_02246A30.h index f5ecfc0298..491e0c602f 100644 --- a/include/overlay006/ov6_02246A30.h +++ b/include/overlay006/ov6_02246A30.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -int ov6_02246B40(FieldSystem * fieldSystem); +int ov6_02246B40(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV6_02246A30_H diff --git a/include/overlay006/ov6_02246BF4.h b/include/overlay006/ov6_02246BF4.h index 9e46716e08..7237cbd273 100644 --- a/include/overlay006/ov6_02246BF4.h +++ b/include/overlay006/ov6_02246BF4.h @@ -2,8 +2,9 @@ #define POKEPLATINUM_OV6_02246BF4_H #include "field/field_system_decl.h" + #include "savedata.h" -BOOL ov6_02246BF4(SaveData * param0, FieldSystem * fieldSystem); +BOOL ov6_02246BF4(SaveData *param0, FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV6_02246BF4_H diff --git a/include/overlay006/ov6_02246C24.h b/include/overlay006/ov6_02246C24.h index 9db661c163..910b987238 100644 --- a/include/overlay006/ov6_02246C24.h +++ b/include/overlay006/ov6_02246C24.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void ov6_02246C24(FieldSystem * fieldSystem, const u8 param1); +void ov6_02246C24(FieldSystem *fieldSystem, const u8 param1); #endif // POKEPLATINUM_OV6_02246C24_H diff --git a/include/overlay006/ov6_02246F00.h b/include/overlay006/ov6_02246F00.h index d70cc26759..a1ef0baada 100644 --- a/include/overlay006/ov6_02246F00.h +++ b/include/overlay006/ov6_02246F00.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void ov6_02246F00(FieldSystem * fieldSystem, const u8 param1, const u8 param2); +void ov6_02246F00(FieldSystem *fieldSystem, const u8 param1, const u8 param2); #endif // POKEPLATINUM_OV6_02246F00_H diff --git a/include/overlay006/ov6_02247078.h b/include/overlay006/ov6_02247078.h index 6213502bfd..fcdea1a0dd 100644 --- a/include/overlay006/ov6_02247078.h +++ b/include/overlay006/ov6_02247078.h @@ -3,8 +3,8 @@ #include "field/field_system_decl.h" -void ov6_02247078(FieldSystem * fieldSystem, const u8 param1); -void ov6_022470E8(FieldSystem * fieldSystem, const u8 param1); -void ov6_022470F4(FieldSystem * fieldSystem, const u8 param1); +void ov6_02247078(FieldSystem *fieldSystem, const u8 param1); +void ov6_022470E8(FieldSystem *fieldSystem, const u8 param1); +void ov6_022470F4(FieldSystem *fieldSystem, const u8 param1); #endif // POKEPLATINUM_OV6_02247078_H diff --git a/include/overlay006/ov6_02247100.h b/include/overlay006/ov6_02247100.h index 6bf52229ee..50595ab888 100644 --- a/include/overlay006/ov6_02247100.h +++ b/include/overlay006/ov6_02247100.h @@ -1,17 +1,19 @@ #ifndef POKEPLATINUM_OV6_02247100_H #define POKEPLATINUM_OV6_02247100_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" + +#include "field/field_system_decl.h" + #include "pokemon.h" -void * ov6_02247100(FieldSystem * fieldSystem, u32 param1); -BOOL ov6_02247120(TaskManager * param0); -void * ov6_022472C8(FieldSystem * fieldSystem, u32 param1, int param2); -BOOL ov6_022472E8(TaskManager * param0); -void * ov6_02247488(FieldSystem *, Pokemon *, u32 param0); -BOOL ov6_022474AC(TaskManager * param0); -void * ov6_02247530(FieldSystem * fieldSystem, Pokemon * param1, u32 param2); -BOOL ov6_02247554(TaskManager * param0); +void *ov6_02247100(FieldSystem *fieldSystem, u32 param1); +BOOL ov6_02247120(TaskManager *param0); +void *ov6_022472C8(FieldSystem *fieldSystem, u32 param1, int param2); +BOOL ov6_022472E8(TaskManager *param0); +void *ov6_02247488(FieldSystem *, Pokemon *, u32 param0); +BOOL ov6_022474AC(TaskManager *param0); +void *ov6_02247530(FieldSystem *fieldSystem, Pokemon *param1, u32 param2); +BOOL ov6_02247554(TaskManager *param0); #endif // POKEPLATINUM_OV6_02247100_H diff --git a/include/overlay006/ov6_022475B0.h b/include/overlay006/ov6_022475B0.h index 8b7089fbaa..5ac8c3e3cc 100644 --- a/include/overlay006/ov6_022475B0.h +++ b/include/overlay006/ov6_022475B0.h @@ -3,7 +3,7 @@ #include "savedata.h" -void ov6_022475B0(SaveData * param0); -int ov6_02247624(SaveData * param0); +void ov6_022475B0(SaveData *param0); +int ov6_02247624(SaveData *param0); #endif // POKEPLATINUM_OV6_022475B0_H diff --git a/include/overlay006/ov6_02247660.h b/include/overlay006/ov6_02247660.h index f3e11b0588..62c64700eb 100644 --- a/include/overlay006/ov6_02247660.h +++ b/include/overlay006/ov6_02247660.h @@ -3,8 +3,8 @@ #include "field/field_system_decl.h" -BOOL ov6_02247660(FieldSystem * fieldSystem); -void ov6_02247794(u8 * param0, u8 * param1); -void ov6_022477A0(int * param0); +BOOL ov6_02247660(FieldSystem *fieldSystem); +void ov6_02247794(u8 *param0, u8 *param1); +void ov6_022477A0(int *param0); #endif // POKEPLATINUM_OV6_02247660_H diff --git a/include/overlay006/ov6_022477B8.h b/include/overlay006/ov6_022477B8.h index 8f116bffcc..4820b0bba8 100644 --- a/include/overlay006/ov6_022477B8.h +++ b/include/overlay006/ov6_022477B8.h @@ -3,6 +3,6 @@ #include "overlay006/struct_ov6_02242634.h" -void ov6_022477B8(const UnkStruct_ov6_02242634 * param0, const BOOL param1, int * param2, int * param3); +void ov6_022477B8(const UnkStruct_ov6_02242634 *param0, const BOOL param1, int *param2, int *param3); #endif // POKEPLATINUM_OV6_022477B8_H diff --git a/include/overlay006/ov6_02247830.h b/include/overlay006/ov6_02247830.h index 552a7195f9..6f6a4995cf 100644 --- a/include/overlay006/ov6_02247830.h +++ b/include/overlay006/ov6_02247830.h @@ -3,6 +3,6 @@ #include "trainer_info.h" -int ov6_022479D0(const TrainerInfo * param0, u16 param1, u16 param2, u16 param3, u16 param4, u32 param5); +int ov6_022479D0(const TrainerInfo *param0, u16 param1, u16 param2, u16 param3, u16 param4, u32 param5); #endif // POKEPLATINUM_OV6_02247830_H diff --git a/include/overlay006/ov6_02247A0C.h b/include/overlay006/ov6_02247A0C.h index 6cf49400e2..c1d99f793f 100644 --- a/include/overlay006/ov6_02247A0C.h +++ b/include/overlay006/ov6_02247A0C.h @@ -3,8 +3,8 @@ #include "struct_decls/struct_020508D4_decl.h" -void ov6_02247A0C(TaskManager * param0); -void * ov6_02247A90(void * param0); -void ov6_02247CC8(void * param0); +void ov6_02247A0C(TaskManager *param0); +void *ov6_02247A90(void *param0); +void ov6_02247CC8(void *param0); #endif // POKEPLATINUM_OV6_02247A0C_H diff --git a/include/overlay006/ov6_02247D30.h b/include/overlay006/ov6_02247D30.h index 23527749ca..ff3d9486f1 100644 --- a/include/overlay006/ov6_02247D30.h +++ b/include/overlay006/ov6_02247D30.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void ov6_02247D30(FieldSystem * fieldSystem, const u8 param1); +void ov6_02247D30(FieldSystem *fieldSystem, const u8 param1); #endif // POKEPLATINUM_OV6_02247D30_H diff --git a/include/overlay006/ov6_02247F5C.h b/include/overlay006/ov6_02247F5C.h index bcaa212cea..dad6898a7d 100644 --- a/include/overlay006/ov6_02247F5C.h +++ b/include/overlay006/ov6_02247F5C.h @@ -3,7 +3,7 @@ #include "field/field_system_decl.h" -void ov6_02247F5C(FieldSystem * fieldSystem); -void ov6_02247FBC(FieldSystem * fieldSystem); +void ov6_02247F5C(FieldSystem *fieldSystem); +void ov6_02247FBC(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV6_02247F5C_H diff --git a/include/overlay006/ov6_02248050.h b/include/overlay006/ov6_02248050.h index 2c68533ef0..7c9c241335 100644 --- a/include/overlay006/ov6_02248050.h +++ b/include/overlay006/ov6_02248050.h @@ -4,16 +4,16 @@ #include "field/field_system_decl.h" #include "overlay005/struct_ov5_021D1BEC_decl.h" -UnkStruct_ov5_021D1BEC * ov6_0224830C(FieldSystem * fieldSystem); -void ov6_02248320(UnkStruct_ov5_021D1BEC * param0); -BOOL ov6_02248328(UnkStruct_ov5_021D1BEC * param0); -UnkStruct_ov5_021D1BEC * ov6_02248450(FieldSystem * fieldSystem); -UnkStruct_ov5_021D1BEC * ov6_02248464(FieldSystem * fieldSystem); -void ov6_02248478(UnkStruct_ov5_021D1BEC * param0); -BOOL ov6_02248480(UnkStruct_ov5_021D1BEC * param0); -UnkStruct_ov5_021D1BEC * ov6_022485F4(FieldSystem * fieldSystem); -void ov6_02248608(UnkStruct_ov5_021D1BEC * param0); -UnkStruct_ov5_021D1BEC * ov6_0224892C(FieldSystem * fieldSystem); -void ov6_02248940(UnkStruct_ov5_021D1BEC * param0); +UnkStruct_ov5_021D1BEC *ov6_0224830C(FieldSystem *fieldSystem); +void ov6_02248320(UnkStruct_ov5_021D1BEC *param0); +BOOL ov6_02248328(UnkStruct_ov5_021D1BEC *param0); +UnkStruct_ov5_021D1BEC *ov6_02248450(FieldSystem *fieldSystem); +UnkStruct_ov5_021D1BEC *ov6_02248464(FieldSystem *fieldSystem); +void ov6_02248478(UnkStruct_ov5_021D1BEC *param0); +BOOL ov6_02248480(UnkStruct_ov5_021D1BEC *param0); +UnkStruct_ov5_021D1BEC *ov6_022485F4(FieldSystem *fieldSystem); +void ov6_02248608(UnkStruct_ov5_021D1BEC *param0); +UnkStruct_ov5_021D1BEC *ov6_0224892C(FieldSystem *fieldSystem); +void ov6_02248940(UnkStruct_ov5_021D1BEC *param0); #endif // POKEPLATINUM_OV6_02248050_H diff --git a/include/overlay006/ov6_02248948.h b/include/overlay006/ov6_02248948.h index 4f1ffe86cb..5048dc64f8 100644 --- a/include/overlay006/ov6_02248948.h +++ b/include/overlay006/ov6_02248948.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void ov6_0224899C(FieldSystem * fieldSystem, u16 * param1, u32 param2, u32 param3); +void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, u32 param3); #endif // POKEPLATINUM_OV6_02248948_H diff --git a/include/overlay006/ov6_022489E4.h b/include/overlay006/ov6_022489E4.h index d1310b85d7..5c98fb9d99 100644 --- a/include/overlay006/ov6_022489E4.h +++ b/include/overlay006/ov6_022489E4.h @@ -1,28 +1,30 @@ #ifndef POKEPLATINUM_OV6_022489E4_H #define POKEPLATINUM_OV6_022489E4_H -#include "strbuf.h" -#include "pokemon.h" #include "struct_defs/struct_020954F0.h" #include "struct_defs/struct_02095C48.h" + #include "overlay006/struct_ov6_02248BE8.h" #include "overlay006/struct_ov6_02248DD8.h" -void ov6_022489E4(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248A64(UnkStruct_02095C48 * param0); -void ov6_02248AC8(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248AF0(UnkStruct_02095C48 * param0, int param1, const Pokemon * param2); -void ov6_02248B30(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248B70(UnkStruct_02095C48 * param0, Pokemon ** param1); -void ov6_02248BC0(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248BE8(UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_02248BE8 * param2); -void ov6_02248C28(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248C68(UnkStruct_02095C48 * param0, int param1, const UnkStruct_020954F0 * param2); -void ov6_02248CBC(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248CE8(UnkStruct_02095C48 * param0, int param1, const Strbuf *param2); -void ov6_02248D38(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248D64(UnkStruct_02095C48 * param0, int param1, void * param2); -void ov6_02248DA0(int param0, int param1, void * param2, void * param3); -BOOL ov6_02248DD8(UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_02248DD8 * param2); +#include "pokemon.h" +#include "strbuf.h" + +void ov6_022489E4(int param0, int param1, void *param2, void *param3); +BOOL ov6_02248A64(UnkStruct_02095C48 *param0); +void ov6_02248AC8(int param0, int param1, void *param2, void *param3); +BOOL ov6_02248AF0(UnkStruct_02095C48 *param0, int param1, const Pokemon *param2); +void ov6_02248B30(int param0, int param1, void *param2, void *param3); +BOOL ov6_02248B70(UnkStruct_02095C48 *param0, Pokemon **param1); +void ov6_02248BC0(int param0, int param1, void *param2, void *param3); +BOOL ov6_02248BE8(UnkStruct_02095C48 *param0, int param1, const UnkStruct_ov6_02248BE8 *param2); +void ov6_02248C28(int param0, int param1, void *param2, void *param3); +BOOL ov6_02248C68(UnkStruct_02095C48 *param0, int param1, const UnkStruct_020954F0 *param2); +void ov6_02248CBC(int param0, int param1, void *param2, void *param3); +BOOL ov6_02248CE8(UnkStruct_02095C48 *param0, int param1, const Strbuf *param2); +void ov6_02248D38(int param0, int param1, void *param2, void *param3); +BOOL ov6_02248D64(UnkStruct_02095C48 *param0, int param1, void *param2); +void ov6_02248DA0(int param0, int param1, void *param2, void *param3); +BOOL ov6_02248DD8(UnkStruct_02095C48 *param0, int param1, const UnkStruct_ov6_02248DD8 *param2); #endif // POKEPLATINUM_OV6_022489E4_H diff --git a/include/overlay006/struct_ov6_02246254.h b/include/overlay006/struct_ov6_02246254.h index 6818c866dd..6412015696 100644 --- a/include/overlay006/struct_ov6_02246254.h +++ b/include/overlay006/struct_ov6_02246254.h @@ -1,17 +1,17 @@ #ifndef POKEPLATINUM_STRUCT_OV6_02246254_H #define POKEPLATINUM_STRUCT_OV6_02246254_H -#include "trainer_info.h" #include "game_options.h" #include "pokemon.h" +#include "trainer_info.h" typedef struct { - const BoxPokemon * unk_00; - const BoxPokemon * unk_04; - const TrainerInfo * unk_08; + const BoxPokemon *unk_00; + const BoxPokemon *unk_04; + const TrainerInfo *unk_08; int unk_0C; int unk_10; - const Options * unk_14; + const Options *unk_14; } UnkStruct_ov6_02246254; #endif // POKEPLATINUM_STRUCT_OV6_02246254_H diff --git a/include/overlay007/communication_club.h b/include/overlay007/communication_club.h index 9bd747a06a..d1e414cf19 100644 --- a/include/overlay007/communication_club.h +++ b/include/overlay007/communication_club.h @@ -3,10 +3,10 @@ #include "field/field_system_decl.h" -void ov7_0224B414(FieldSystem * fieldSystem, int param1, int param2, int param3); +void ov7_0224B414(FieldSystem *fieldSystem, int param1, int param2, int param3); void ov7_0224B450(void); u32 ov7_0224B460(void); -void ov7_0224B47C(FieldSystem * fieldSystem, int param1, int param2, int param3); +void ov7_0224B47C(FieldSystem *fieldSystem, int param1, int param2, int param3); void ov7_0224B4B8(void); u32 CommClub_CheckWindowOpenClient(void); BOOL ov7_0224B4E4(void); diff --git a/include/overlay007/ov7_0224B4E8.h b/include/overlay007/ov7_0224B4E8.h index fc158aeda5..844d69f0ec 100644 --- a/include/overlay007/ov7_0224B4E8.h +++ b/include/overlay007/ov7_0224B4E8.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -void ov7_0224BE7C(TaskManager * param0, u16 * param1); +void ov7_0224BE7C(TaskManager *param0, u16 *param1); #endif // POKEPLATINUM_OV7_0224B4E8_H diff --git a/include/overlay007/ov7_0224BE9C.h b/include/overlay007/ov7_0224BE9C.h index 75fad0d569..9c25a5f9c9 100644 --- a/include/overlay007/ov7_0224BE9C.h +++ b/include/overlay007/ov7_0224BE9C.h @@ -2,11 +2,13 @@ #define POKEPLATINUM_OV7_0224BE9C_H #include "struct_decls/struct_02018340_decl.h" -#include "savedata.h" + #include "overlay007/struct_ov7_0224BEFC_decl.h" -UnkStruct_ov7_0224BEFC * ov7_0224BE9C(u32 param0, SaveData * param1, BGL * param2); -void ov7_0224BEFC(UnkStruct_ov7_0224BEFC * param0); -BOOL ov7_0224BF2C(UnkStruct_ov7_0224BEFC * param0); +#include "savedata.h" + +UnkStruct_ov7_0224BEFC *ov7_0224BE9C(u32 param0, SaveData *param1, BGL *param2); +void ov7_0224BEFC(UnkStruct_ov7_0224BEFC *param0); +BOOL ov7_0224BF2C(UnkStruct_ov7_0224BEFC *param0); #endif // POKEPLATINUM_OV7_0224BE9C_H diff --git a/include/overlay007/ov7_0224CD28.h b/include/overlay007/ov7_0224CD28.h index e37d80026c..67606392fd 100644 --- a/include/overlay007/ov7_0224CD28.h +++ b/include/overlay007/ov7_0224CD28.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_OV7_0224CD28_H #define POKEPLATINUM_OV7_0224CD28_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" -void ov7_0224CDA4(TaskManager * param0, FieldSystem * fieldSystem, u16 * param2, u8 param3, BOOL param4); -BOOL ov7_0224CEAC(TaskManager * param0); +#include "field/field_system_decl.h" + +void ov7_0224CDA4(TaskManager *param0, FieldSystem *fieldSystem, u16 *param2, u8 param3, BOOL param4); +BOOL ov7_0224CEAC(TaskManager *param0); #endif // POKEPLATINUM_OV7_0224CD28_H diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h index ec9d72ccfc..6c902fa0b0 100644 --- a/include/overlay007/struct_ov7_0224D008.h +++ b/include/overlay007/struct_ov7_0224D008.h @@ -3,52 +3,54 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "camera.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" -#include "journal.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "vars_flags.h" #include "struct_defs/struct_0205AA50.h" -#include "savedata.h" + #include "overlay005/struct_ov5_021D30A8.h" +#include "camera.h" +#include "game_options.h" +#include "journal.h" +#include "message.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" +#include "vars_flags.h" + typedef struct { - BGL * unk_00; - void * unk_04; + BGL *unk_00; + void *unk_04; Window unk_08[6]; Window unk_68; - BmpList * unk_78; - ResourceMetadata * unk_7C; - UIControlData * unk_80; - ResourceMetadata * unk_84; - MessageLoader * unk_88; - StringTemplate * unk_8C; - Camera * camera; + BmpList *unk_78; + ResourceMetadata *unk_7C; + UIControlData *unk_80; + ResourceMetadata *unk_84; + MessageLoader *unk_88; + StringTemplate *unk_8C; + Camera *camera; UnkStruct_ov5_021D30A8 unk_94; - GraphicElementData * unk_25C[4]; + GraphicElementData *unk_25C[4]; u16 unk_26C[2]; - TrainerInfo * unk_270; - void * unk_274; - Options * unk_278; - Journal * unk_27C; - UnkStruct_0202CD88 * unk_280; - SaveData * unk_284; - VarsFlags * unk_288; + TrainerInfo *unk_270; + void *unk_274; + Options *unk_278; + Journal *unk_27C; + UnkStruct_0202CD88 *unk_280; + SaveData *unk_284; + VarsFlags *unk_288; BOOL unk_28C; - u16 * unk_290; + u16 *unk_290; u8 unk_294; u8 unk_295; u8 unk_296; u8 unk_297; - Strbuf* unk_298; + Strbuf *unk_298; u8 unk_29C[4]; int unk_2A0; u8 unk_2A4; @@ -61,7 +63,7 @@ typedef struct { s16 unk_2AC; u16 unk_2AE; u32 unk_2B0; - UnkStruct_0200C440 * unk_2B4; + UnkStruct_0200C440 *unk_2B4; } UnkStruct_ov7_0224D008; #endif // POKEPLATINUM_STRUCT_OV7_0224D008_H diff --git a/include/overlay007/struct_ov7_0224F2EC.h b/include/overlay007/struct_ov7_0224F2EC.h index c1d17d2e0a..d41e3d45b9 100644 --- a/include/overlay007/struct_ov7_0224F2EC.h +++ b/include/overlay007/struct_ov7_0224F2EC.h @@ -2,15 +2,15 @@ #define POKEPLATINUM_STRUCT_OV7_0224F2EC_H typedef union { - const char * val1[7]; + const char *val1[7]; struct { - const char * unk_00; - const char * unk_04; - const char * unk_08; - const char * unk_0C; - const char * unk_10; - const char * unk_14; - const char * unk_18; + const char *unk_00; + const char *unk_04; + const char *unk_08; + const char *unk_0C; + const char *unk_10; + const char *unk_14; + const char *unk_18; } val2; } UnkStruct_ov7_0224F2EC; diff --git a/include/overlay008/ov8_02249960.h b/include/overlay008/ov8_02249960.h index e529a0378b..f0dc9dee9a 100644 --- a/include/overlay008/ov8_02249960.h +++ b/include/overlay008/ov8_02249960.h @@ -1,36 +1,38 @@ #ifndef POKEPLATINUM_OV8_02249960_H #define POKEPLATINUM_OV8_02249960_H +#include "struct_defs/struct_0205AA50.h" + +#include "field/field_system_decl.h" + #include "message.h" #include "strbuf.h" -#include "field/field_system_decl.h" -#include "struct_defs/struct_0205AA50.h" -void ov8_0224997C(FieldSystem * fieldSystem); -BOOL ov8_02249A40(FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4); -void ov8_02249DBC(FieldSystem * fieldSystem); -void ov8_02249FB8(FieldSystem * fieldSystem); -void ov8_0224A8C8(FieldSystem * fieldSystem); -BOOL ov8_0224AAA8(FieldSystem * fieldSystem); -void ov8_0224AAE8(FieldSystem * fieldSystem); -BOOL ov8_0224AAFC(FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4); -void ov8_0224ABD4(FieldSystem * fieldSystem); -void ov8_0224ACAC(FieldSystem * fieldSystem); -BOOL ov8_0224ACC0(FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4); -void ov8_0224AD34(FieldSystem * fieldSystem, const u8 param1); -void ov8_0224B020(FieldSystem * fieldSystem); -void ov8_0224B0FC(FieldSystem * fieldSystem); -BOOL ov8_0224B110(FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4); -BOOL ov8_0224B67C(FieldSystem * fieldSystem, Window * param1, MessageLoader * param2, Strbuf *param3); -BOOL ov8_0224B714(FieldSystem * fieldSystem, int param1, int param2, int param3); -void ov8_0224B764(FieldSystem * fieldSystem); -void ov8_0224B7C0(FieldSystem * fieldSystem); -BOOL ov8_0224B7D4(FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4); -BOOL ov8_0224BF4C(FieldSystem * fieldSystem); -void ov8_0224C198(FieldSystem * fieldSystem); -void ov8_0224C388(FieldSystem * fieldSystem); -BOOL ov8_0224C51C(FieldSystem * fieldSystem); -BOOL ov8_0224C5DC(FieldSystem * fieldSystem, void * param1); -BOOL ov8_0224C62C(FieldSystem * fieldSystem, int param1, int param2, int * param3); +void ov8_0224997C(FieldSystem *fieldSystem); +BOOL ov8_02249A40(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4); +void ov8_02249DBC(FieldSystem *fieldSystem); +void ov8_02249FB8(FieldSystem *fieldSystem); +void ov8_0224A8C8(FieldSystem *fieldSystem); +BOOL ov8_0224AAA8(FieldSystem *fieldSystem); +void ov8_0224AAE8(FieldSystem *fieldSystem); +BOOL ov8_0224AAFC(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4); +void ov8_0224ABD4(FieldSystem *fieldSystem); +void ov8_0224ACAC(FieldSystem *fieldSystem); +BOOL ov8_0224ACC0(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4); +void ov8_0224AD34(FieldSystem *fieldSystem, const u8 param1); +void ov8_0224B020(FieldSystem *fieldSystem); +void ov8_0224B0FC(FieldSystem *fieldSystem); +BOOL ov8_0224B110(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4); +BOOL ov8_0224B67C(FieldSystem *fieldSystem, Window *param1, MessageLoader *param2, Strbuf *param3); +BOOL ov8_0224B714(FieldSystem *fieldSystem, int param1, int param2, int param3); +void ov8_0224B764(FieldSystem *fieldSystem); +void ov8_0224B7C0(FieldSystem *fieldSystem); +BOOL ov8_0224B7D4(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4); +BOOL ov8_0224BF4C(FieldSystem *fieldSystem); +void ov8_0224C198(FieldSystem *fieldSystem); +void ov8_0224C388(FieldSystem *fieldSystem); +BOOL ov8_0224C51C(FieldSystem *fieldSystem); +BOOL ov8_0224C5DC(FieldSystem *fieldSystem, void *param1); +BOOL ov8_0224C62C(FieldSystem *fieldSystem, int param1, int param2, int *param3); #endif // POKEPLATINUM_OV8_02249960_H diff --git a/include/overlay009/ov9_02249960.h b/include/overlay009/ov9_02249960.h index e3832972af..65ba885b21 100644 --- a/include/overlay009/ov9_02249960.h +++ b/include/overlay009/ov9_02249960.h @@ -2,41 +2,42 @@ #define POKEPLATINUM_OV9_02249960_H #include "struct_decls/struct_020216E0_decl.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" + +#include "field/field_system_decl.h" #include "overlay009/struct_ov9_0224F6EC_decl.h" -void ov9_02249960(FieldSystem * fieldSystem); -void ov9_02249A60(FieldSystem * fieldSystem); -BOOL ov9_02249E50(FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4); -void ov9_02249F9C(FieldSystem * fieldSystem); -void ov9_02249FD0(FieldSystem * fieldSystem); -int ov9_0224A520(FieldSystem * fieldSystem, MapObject * param1); -void ov9_0224A558(FieldSystem * fieldSystem, UnkStruct_020216E0 * param1, int param2); -void ov9_0224A564(FieldSystem * fieldSystem, const UnkStruct_020216E0 * param1); -BOOL ov9_0224A59C(FieldSystem * fieldSystem, int param1); -BOOL ov9_0224A67C(FieldSystem * fieldSystem, int param1); -BOOL ov9_0224A71C(FieldSystem * fieldSystem); -BOOL ov9_0224A800(FieldSystem * fieldSystem, int param1); -void ov9_0224CA50(FieldSystem * fieldSystem); -void ov9_0224CA5C(FieldSystem * fieldSystem); -void ov9_0224E884(FieldSystem * fieldSystem, u16 param1); -void ov9_0224E8A8(FieldSystem * fieldSystem); -void ov9_0224F158(FieldSystem * fieldSystem, u16 param1); -void ov9_0224F16C(FieldSystem * fieldSystem, u16 param1); -BOOL ov9_0224F240(const MapObject * param0, int param1); -BOOL ov9_0224F2B0(const MapObject * param0); -UnkStruct_ov9_0224F6EC * ov9_0224F2BC(FieldSystem * fieldSystem, TaskManager * param1, MapObject * param2); -BOOL ov9_0224F6EC(UnkStruct_ov9_0224F6EC * param0); -void ov9_02250780(FieldSystem * fieldSystem); -BOOL ov9_02250F74(FieldSystem * fieldSystem); -BOOL ov9_02250F90(FieldSystem * fieldSystem, int param1, int param2, int param3); -BOOL ov9_02250FBC(FieldSystem * fieldSystem, int param1, int param2, int param3); -BOOL ov9_02250FD8(FieldSystem * fieldSystem, int param1, int param2, int param3); -void ov9_02251000(FieldSystem * fieldSystem, int param1, int param2, int param3); -BOOL ov9_02251044(FieldSystem * fieldSystem, int param1, int param2, int param3, u32 * param4); -void ov9_02251094(int param0, int * param1, int * param2, int * param3); -BOOL ov9_022511A0(FieldSystem * fieldSystem, int param1, int param2, int param3); +void ov9_02249960(FieldSystem *fieldSystem); +void ov9_02249A60(FieldSystem *fieldSystem); +BOOL ov9_02249E50(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4); +void ov9_02249F9C(FieldSystem *fieldSystem); +void ov9_02249FD0(FieldSystem *fieldSystem); +int ov9_0224A520(FieldSystem *fieldSystem, MapObject *param1); +void ov9_0224A558(FieldSystem *fieldSystem, UnkStruct_020216E0 *param1, int param2); +void ov9_0224A564(FieldSystem *fieldSystem, const UnkStruct_020216E0 *param1); +BOOL ov9_0224A59C(FieldSystem *fieldSystem, int param1); +BOOL ov9_0224A67C(FieldSystem *fieldSystem, int param1); +BOOL ov9_0224A71C(FieldSystem *fieldSystem); +BOOL ov9_0224A800(FieldSystem *fieldSystem, int param1); +void ov9_0224CA50(FieldSystem *fieldSystem); +void ov9_0224CA5C(FieldSystem *fieldSystem); +void ov9_0224E884(FieldSystem *fieldSystem, u16 param1); +void ov9_0224E8A8(FieldSystem *fieldSystem); +void ov9_0224F158(FieldSystem *fieldSystem, u16 param1); +void ov9_0224F16C(FieldSystem *fieldSystem, u16 param1); +BOOL ov9_0224F240(const MapObject *param0, int param1); +BOOL ov9_0224F2B0(const MapObject *param0); +UnkStruct_ov9_0224F6EC *ov9_0224F2BC(FieldSystem *fieldSystem, TaskManager *param1, MapObject *param2); +BOOL ov9_0224F6EC(UnkStruct_ov9_0224F6EC *param0); +void ov9_02250780(FieldSystem *fieldSystem); +BOOL ov9_02250F74(FieldSystem *fieldSystem); +BOOL ov9_02250F90(FieldSystem *fieldSystem, int param1, int param2, int param3); +BOOL ov9_02250FBC(FieldSystem *fieldSystem, int param1, int param2, int param3); +BOOL ov9_02250FD8(FieldSystem *fieldSystem, int param1, int param2, int param3); +void ov9_02251000(FieldSystem *fieldSystem, int param1, int param2, int param3); +BOOL ov9_02251044(FieldSystem *fieldSystem, int param1, int param2, int param3, u32 *param4); +void ov9_02251094(int param0, int *param1, int *param2, int *param3); +BOOL ov9_022511A0(FieldSystem *fieldSystem, int param1, int param2, int param3); #endif // POKEPLATINUM_OV9_02249960_H diff --git a/include/overlay010/ov10_0221F800.h b/include/overlay010/ov10_0221F800.h index 8baa196b0b..955a93ceaf 100644 --- a/include/overlay010/ov10_0221F800.h +++ b/include/overlay010/ov10_0221F800.h @@ -3,6 +3,6 @@ #include "overlay010/struct_ov10_0221F800.h" -void ov10_0221F800(UnkStruct_ov10_0221F800 * param0); +void ov10_0221F800(UnkStruct_ov10_0221F800 *param0); #endif // POKEPLATINUM_OV10_0221F800_H diff --git a/include/overlay010/struct_ov10_0221F800.h b/include/overlay010/struct_ov10_0221F800.h index f310ffaaca..aa25e8a343 100644 --- a/include/overlay010/struct_ov10_0221F800.h +++ b/include/overlay010/struct_ov10_0221F800.h @@ -1,14 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_OV10_0221F800_H #define POKEPLATINUM_STRUCT_OV10_0221F800_H -#include "strbuf.h" #include "struct_decls/struct_party_decl.h" + #include "overlay006/battle_params.h" +#include "strbuf.h" + typedef struct { - BattleParams * unk_00; - Party * unk_04[4]; - Strbuf* unk_14[4]; + BattleParams *unk_00; + Party *unk_04[4]; + Strbuf *unk_14[4]; u32 unk_24; u8 unk_28; u8 unk_29; diff --git a/include/overlay011/ov11_0221F800.h b/include/overlay011/ov11_0221F800.h index 09eaa6a3e2..92bd8c43b7 100644 --- a/include/overlay011/ov11_0221F800.h +++ b/include/overlay011/ov11_0221F800.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02002F38_decl.h" -const u16 * ov11_0221F800(int param0); -void ov11_0221F81C(PaletteData * param0, int param1, int param2, int param3, int param4); +const u16 *ov11_0221F800(int param0); +void ov11_0221F81C(PaletteData *param0, int param1, int param2, int param3, int param4); #endif // POKEPLATINUM_OV11_0221F800_H diff --git a/include/overlay011/ov11_0221F840.h b/include/overlay011/ov11_0221F840.h index 190a7033d6..3cac52e7ac 100644 --- a/include/overlay011/ov11_0221F840.h +++ b/include/overlay011/ov11_0221F840.h @@ -3,9 +3,9 @@ #include "struct_decls/struct_02014014_decl.h" -UnkStruct_02014014 * ov11_0221F840(int param0); -UnkStruct_02014014 * ov11_0221F888(int param0); -void ov11_0221F8D8(UnkStruct_02014014 * param0); +UnkStruct_02014014 *ov11_0221F840(int param0); +UnkStruct_02014014 *ov11_0221F888(int param0); +void ov11_0221F8D8(UnkStruct_02014014 *param0); void ov11_0221F8F0(void); #endif // POKEPLATINUM_OV11_0221F840_H diff --git a/include/overlay012/funcptr_ov12_02226274.h b/include/overlay012/funcptr_ov12_02226274.h index 8cbe0b26ec..f4e60821b7 100644 --- a/include/overlay012/funcptr_ov12_02226274.h +++ b/include/overlay012/funcptr_ov12_02226274.h @@ -3,6 +3,6 @@ #include "overlay012/struct_ov12_02225F6C.h" -typedef BOOL (* UnkFuncPtr_ov12_02226274)(UnkStruct_ov12_02225F6C *); +typedef BOOL (*UnkFuncPtr_ov12_02226274)(UnkStruct_ov12_02225F6C *); #endif // POKEPLATINUM_FUNCPTR_OV12_02226274_H diff --git a/include/overlay012/funcptr_ov12_02239E64_1.h b/include/overlay012/funcptr_ov12_02239E64_1.h index a5fbef222b..ab6cc92265 100644 --- a/include/overlay012/funcptr_ov12_02239E64_1.h +++ b/include/overlay012/funcptr_ov12_02239E64_1.h @@ -4,8 +4,9 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02022550_decl.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" -typedef void (* UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, SpriteRenderer *, SpriteGfxHandler *, GraphicElementData *); +typedef void (*UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, SpriteRenderer *, SpriteGfxHandler *, GraphicElementData *); #endif // POKEPLATINUM_FUNCPTR_OV12_02239E64_1_H diff --git a/include/overlay012/funcptr_ov12_02239E68.h b/include/overlay012/funcptr_ov12_02239E68.h index c0c426a0d3..12e0f16253 100644 --- a/include/overlay012/funcptr_ov12_02239E68.h +++ b/include/overlay012/funcptr_ov12_02239E68.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_FUNCPTR_OV12_02239E68_H #define POKEPLATINUM_FUNCPTR_OV12_02239E68_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" -typedef void (* UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, SpriteRenderer *, SpriteGfxHandler *, CellActorData *); +typedef void (*UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, SpriteRenderer *, SpriteGfxHandler *, CellActorData *); #endif // POKEPLATINUM_FUNCPTR_OV12_02239E68_H diff --git a/include/overlay012/funcptr_ov12_02239EEC.h b/include/overlay012/funcptr_ov12_02239EEC.h index 079ca2c553..e383dd45f1 100644 --- a/include/overlay012/funcptr_ov12_02239EEC.h +++ b/include/overlay012/funcptr_ov12_02239EEC.h @@ -3,6 +3,6 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" -typedef void (* UnkFuncPtr_ov12_02239EEC)(UnkStruct_ov12_0221FCDC *); +typedef void (*UnkFuncPtr_ov12_02239EEC)(UnkStruct_ov12_0221FCDC *); #endif // POKEPLATINUM_FUNCPTR_OV12_02239EEC_H diff --git a/include/overlay012/ov12_0221FC20.h b/include/overlay012/ov12_0221FC20.h index 5f6dee9158..5cfdbc57a5 100644 --- a/include/overlay012/ov12_0221FC20.h +++ b/include/overlay012/ov12_0221FC20.h @@ -1,91 +1,92 @@ #ifndef POKEPLATINUM_OV12_0221FC20_H #define POKEPLATINUM_OV12_0221FC20_H -#include "struct_decls/struct_02002F38_decl.h" +#include "struct_decls/battle_system.h" +#include "struct_decls/cell_actor_data.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "struct_decls/battle_system.h" +#include "struct_defs/sprite_template.h" + +#include "battle/struct_ov16_02264408.h" +#include "battle/struct_ov16_02265BBC.h" +#include "overlay012/funcptr_ov12_02239EEC.h" #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02223178_decl.h" #include "overlay012/struct_ov12_02223764.h" #include "overlay012/struct_ov12_022380DC.h" -#include "overlay012/funcptr_ov12_02239EEC.h" -#include "battle/struct_ov16_02264408.h" -#include "battle/struct_ov16_02265BBC.h" -#include "struct_defs/sprite_template.h" #include "spl.h" +#include "sys_task_manager.h" -UnkStruct_ov12_0221FCDC * ov12_0221FCDC(int param0); -void ov12_0221FDC0(UnkStruct_ov12_0221FCDC * param0, BOOL param1); -BOOL ov12_0221FDD4(UnkStruct_ov12_0221FCDC * param0); -int ov12_0221FDE4(UnkStruct_ov12_0221FCDC * param0); -BOOL ov12_0221FDF4(UnkStruct_ov12_0221FCDC * param0); -BOOL ov12_0221FE30(UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov16_02265BBC * param1, u16 param2, UnkStruct_ov16_02264408 * param3); -BOOL ov12_0222016C(UnkStruct_ov12_0221FCDC * param0); -BOOL ov12_02220188(UnkStruct_ov12_0221FCDC * param0); -BOOL ov12_02220198(UnkStruct_ov12_0221FCDC * param0); -BOOL ov12_022201B4(UnkStruct_ov12_0221FCDC * param0); -SysTask * ov12_022201CC(UnkStruct_ov12_0221FCDC * param0, SysTaskFunc param1, void * param2, u32 param3); -SysTask * ov12_022201E8(UnkStruct_ov12_0221FCDC * param0, SysTaskFunc param1, void * param2); -SysTask * ov12_02220204(UnkStruct_ov12_0221FCDC * param0, SysTaskFunc param1, void * param2, u32 param3); -void ov12_02220220(UnkStruct_ov12_0221FCDC * param0, SysTask * param1); -void ov12_02220230(UnkStruct_ov12_0221FCDC * param0, SysTask * param1); -u16 ov12_02220240(UnkStruct_ov12_0221FCDC * param0); -u16 ov12_02220248(UnkStruct_ov12_0221FCDC * param0); -UnkStruct_02014014 * ov12_02220250(UnkStruct_ov12_0221FCDC * param0); -UnkStruct_02014014 * ov12_02220260(UnkStruct_ov12_0221FCDC * param0, int param1); -UnkSPLStruct6 * ov12_0222026C(UnkStruct_ov12_0221FCDC * param0, int param1); -BGL * ov12_02220278(UnkStruct_ov12_0221FCDC * param0); -s32 ov12_02220280(UnkStruct_ov12_0221FCDC * param0, int param1); -CellActorData * ov12_02220298(UnkStruct_ov12_0221FCDC * param0, int param1); -CellActorData * ov12_022202C0(UnkStruct_ov12_0221FCDC * param0, int param1); -SpriteGfxHandler * ov12_022202EC(UnkStruct_ov12_0221FCDC * param0); -SpriteGfxHandler * ov12_02220300(UnkStruct_ov12_0221FCDC * param0); -SpriteRenderer * ov12_02220308(UnkStruct_ov12_0221FCDC * param0); +UnkStruct_ov12_0221FCDC *ov12_0221FCDC(int param0); +void ov12_0221FDC0(UnkStruct_ov12_0221FCDC *param0, BOOL param1); +BOOL ov12_0221FDD4(UnkStruct_ov12_0221FCDC *param0); +int ov12_0221FDE4(UnkStruct_ov12_0221FCDC *param0); +BOOL ov12_0221FDF4(UnkStruct_ov12_0221FCDC *param0); +BOOL ov12_0221FE30(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov16_02265BBC *param1, u16 param2, UnkStruct_ov16_02264408 *param3); +BOOL ov12_0222016C(UnkStruct_ov12_0221FCDC *param0); +BOOL ov12_02220188(UnkStruct_ov12_0221FCDC *param0); +BOOL ov12_02220198(UnkStruct_ov12_0221FCDC *param0); +BOOL ov12_022201B4(UnkStruct_ov12_0221FCDC *param0); +SysTask *ov12_022201CC(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2, u32 param3); +SysTask *ov12_022201E8(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2); +SysTask *ov12_02220204(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2, u32 param3); +void ov12_02220220(UnkStruct_ov12_0221FCDC *param0, SysTask *param1); +void ov12_02220230(UnkStruct_ov12_0221FCDC *param0, SysTask *param1); +u16 ov12_02220240(UnkStruct_ov12_0221FCDC *param0); +u16 ov12_02220248(UnkStruct_ov12_0221FCDC *param0); +UnkStruct_02014014 *ov12_02220250(UnkStruct_ov12_0221FCDC *param0); +UnkStruct_02014014 *ov12_02220260(UnkStruct_ov12_0221FCDC *param0, int param1); +UnkSPLStruct6 *ov12_0222026C(UnkStruct_ov12_0221FCDC *param0, int param1); +BGL *ov12_02220278(UnkStruct_ov12_0221FCDC *param0); +s32 ov12_02220280(UnkStruct_ov12_0221FCDC *param0, int param1); +CellActorData *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1); +CellActorData *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1); +SpriteGfxHandler *ov12_022202EC(UnkStruct_ov12_0221FCDC *param0); +SpriteGfxHandler *ov12_02220300(UnkStruct_ov12_0221FCDC *param0); +SpriteRenderer *ov12_02220308(UnkStruct_ov12_0221FCDC *param0); void ov12_02220474(void); -int ov12_02220540(UnkStruct_ov12_0221FCDC * param0, int param1); -void ov12_02220590(UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_022380DC * param1, int param2); -void ov12_02221238(UnkStruct_ov12_0221FCDC * param0, int param1); -void ov12_02222338(UnkStruct_ov12_0221FCDC * param0); -int ov12_02222354(UnkStruct_ov12_0221FCDC * param0); -void ov12_02222590(UnkStruct_ov12_0221FCDC * param0, int param1); -void ov12_02222664(UnkStruct_ov12_0221FCDC * param0, int param1); +int ov12_02220540(UnkStruct_ov12_0221FCDC *param0, int param1); +void ov12_02220590(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_022380DC *param1, int param2); +void ov12_02221238(UnkStruct_ov12_0221FCDC *param0, int param1); +void ov12_02222338(UnkStruct_ov12_0221FCDC *param0); +int ov12_02222354(UnkStruct_ov12_0221FCDC *param0); +void ov12_02222590(UnkStruct_ov12_0221FCDC *param0, int param1); +void ov12_02222664(UnkStruct_ov12_0221FCDC *param0, int param1); UnkFuncPtr_ov12_02239EEC ov12_02223164(u32 param0); -int ov12_02223178(UnkStruct_ov12_02223178 * param0); -s8 ov12_0222317C(UnkStruct_ov12_0221FCDC * param0, s8 param1); +int ov12_02223178(UnkStruct_ov12_02223178 *param0); +s8 ov12_0222317C(UnkStruct_ov12_0221FCDC *param0, s8 param1); s8 ov12_02223234(s8 param0, s8 param1, s8 param2); -BOOL ov12_0222325C(UnkStruct_ov12_0221FCDC * param0, int param1[], int param2); -SpriteTemplate ov12_0222329C(UnkStruct_ov12_0221FCDC * param0); -int ov12_022232B8(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_022232C4(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_022232D0(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_022232E0(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_022232EC(UnkStruct_ov12_0221FCDC * param0, int param1); -Sprite * ov12_022232FC(UnkStruct_ov12_0221FCDC * param0, int param1); -PaletteData * ov12_0222332C(UnkStruct_ov12_0221FCDC * param0); -int ov12_02223334(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_02223344(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_02223354(UnkStruct_ov12_0221FCDC * param0, int param1); -BOOL ov12_02223364(UnkStruct_ov12_0221FCDC * param0); -BOOL ov12_0222337C(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_0222339C(UnkStruct_ov12_0221FCDC * param0); -int ov12_022233B0(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_022233EC(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_02223428(UnkStruct_ov12_0221FCDC * param0, int param1); -void ov12_02223460(UnkStruct_ov12_0221FCDC * param0, int param1); -void ov12_02223488(UnkStruct_ov12_0221FCDC * param0); -BOOL ov12_022234A8(UnkStruct_ov12_0221FCDC * param0, int param1); +BOOL ov12_0222325C(UnkStruct_ov12_0221FCDC *param0, int param1[], int param2); +SpriteTemplate ov12_0222329C(UnkStruct_ov12_0221FCDC *param0); +int ov12_022232B8(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_022232C4(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_022232D0(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_022232E0(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_022232EC(UnkStruct_ov12_0221FCDC *param0, int param1); +Sprite *ov12_022232FC(UnkStruct_ov12_0221FCDC *param0, int param1); +PaletteData *ov12_0222332C(UnkStruct_ov12_0221FCDC *param0); +int ov12_02223334(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_02223344(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_02223354(UnkStruct_ov12_0221FCDC *param0, int param1); +BOOL ov12_02223364(UnkStruct_ov12_0221FCDC *param0); +BOOL ov12_0222337C(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_0222339C(UnkStruct_ov12_0221FCDC *param0); +int ov12_022233B0(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_022233EC(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_02223428(UnkStruct_ov12_0221FCDC *param0, int param1); +void ov12_02223460(UnkStruct_ov12_0221FCDC *param0, int param1); +void ov12_02223488(UnkStruct_ov12_0221FCDC *param0); +BOOL ov12_022234A8(UnkStruct_ov12_0221FCDC *param0, int param1); int ov12_022234E4(int param0, int param1); -UnkStruct_ov12_02223764 * ov12_022234F8(BattleSystem * param0, int param1, int param2); -UnkStruct_ov12_02223764 * ov12_02223764(BattleSystem * param0, int param1); -void ov12_02223770(UnkStruct_ov12_02223764 * param0); -void ov12_022237A4(UnkStruct_ov12_02223764 * param0, int param1); -int ov12_022237D8(UnkStruct_ov12_02223764 * param0); +UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *param0, int param1, int param2); +UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *param0, int param1); +void ov12_02223770(UnkStruct_ov12_02223764 *param0); +void ov12_022237A4(UnkStruct_ov12_02223764 *param0, int param1); +int ov12_022237D8(UnkStruct_ov12_02223764 *param0); #endif // POKEPLATINUM_OV12_0221FC20_H diff --git a/include/overlay012/ov12_022237EC.h b/include/overlay012/ov12_022237EC.h index b071f560b6..e3ad3c1bcf 100644 --- a/include/overlay012/ov12_022237EC.h +++ b/include/overlay012/ov12_022237EC.h @@ -6,11 +6,11 @@ #include "spl.h" -UnkStruct_02014014 * ov12_022237F0(int param0, int param1, int param2); -UnkStruct_02014014 * ov12_02223818(int param0, int param1, int param2, int param3); -void * ov12_02223844(NARC * param0, int param1, int param2); -UnkStruct_02014014 * ov12_0222384C(NARC * param0, int param1, int param2, int param3); -UnkSPLStruct6 * ov12_02223880(UnkStruct_02014014 * param0, int param1, int param2, void * param3); -void ov12_02223894(UnkStruct_02014014 * param0); +UnkStruct_02014014 *ov12_022237F0(int param0, int param1, int param2); +UnkStruct_02014014 *ov12_02223818(int param0, int param1, int param2, int param3); +void *ov12_02223844(NARC *param0, int param1, int param2); +UnkStruct_02014014 *ov12_0222384C(NARC *param0, int param1, int param2, int param3); +UnkSPLStruct6 *ov12_02223880(UnkStruct_02014014 *param0, int param1, int param2, void *param3); +void ov12_02223894(UnkStruct_02014014 *param0); #endif // POKEPLATINUM_OV12_022237EC_H diff --git a/include/overlay012/ov12_0222389C.h b/include/overlay012/ov12_0222389C.h index e393907514..dd518ef8c6 100644 --- a/include/overlay012/ov12_0222389C.h +++ b/include/overlay012/ov12_0222389C.h @@ -1,29 +1,28 @@ #ifndef POKEPLATINUM_OV12_0222389C_H #define POKEPLATINUM_OV12_0222389C_H - #include "spl.h" -void ov12_022238DC(UnkSPLStruct6 * param0); -void ov12_022238E0(UnkSPLStruct6 * param0); -void ov12_02223998(UnkSPLStruct6 * param0); -void ov12_022239F4(UnkSPLStruct6 * param0); -void ov12_02223A38(UnkSPLStruct6 * param0); -void ov12_02223A7C(UnkSPLStruct6 * param0); -void ov12_02223AC8(UnkSPLStruct6 * param0); -void ov12_02223B30(UnkSPLStruct6 * param0); -void ov12_02223B98(UnkSPLStruct6 * param0); -void ov12_02224168(UnkSPLStruct6 * param0); -void ov12_02224174(UnkSPLStruct6 * param0); -void ov12_02224180(UnkSPLStruct6 * param0); -void ov12_0222418C(UnkSPLStruct6 * param0); -void ov12_02224198(UnkSPLStruct6 * param0); -void ov12_022241A4(UnkSPLStruct6 * param0); -void ov12_022241B0(UnkSPLStruct6 * param0); -void ov12_022241BC(UnkSPLStruct6 * param0); -void ov12_022241C8(UnkSPLStruct6 * param0); -void ov12_022241D4(UnkSPLStruct6 * param0); -void ov12_022241E0(UnkSPLStruct6 * param0); -void ov12_022241EC(UnkSPLStruct6 * param0); +void ov12_022238DC(UnkSPLStruct6 *param0); +void ov12_022238E0(UnkSPLStruct6 *param0); +void ov12_02223998(UnkSPLStruct6 *param0); +void ov12_022239F4(UnkSPLStruct6 *param0); +void ov12_02223A38(UnkSPLStruct6 *param0); +void ov12_02223A7C(UnkSPLStruct6 *param0); +void ov12_02223AC8(UnkSPLStruct6 *param0); +void ov12_02223B30(UnkSPLStruct6 *param0); +void ov12_02223B98(UnkSPLStruct6 *param0); +void ov12_02224168(UnkSPLStruct6 *param0); +void ov12_02224174(UnkSPLStruct6 *param0); +void ov12_02224180(UnkSPLStruct6 *param0); +void ov12_0222418C(UnkSPLStruct6 *param0); +void ov12_02224198(UnkSPLStruct6 *param0); +void ov12_022241A4(UnkSPLStruct6 *param0); +void ov12_022241B0(UnkSPLStruct6 *param0); +void ov12_022241BC(UnkSPLStruct6 *param0); +void ov12_022241C8(UnkSPLStruct6 *param0); +void ov12_022241D4(UnkSPLStruct6 *param0); +void ov12_022241E0(UnkSPLStruct6 *param0); +void ov12_022241EC(UnkSPLStruct6 *param0); #endif // POKEPLATINUM_OV12_0222389C_H diff --git a/include/overlay012/ov12_0222421C.h b/include/overlay012/ov12_0222421C.h index d6f6e6c661..fd604b2e13 100644 --- a/include/overlay012/ov12_0222421C.h +++ b/include/overlay012/ov12_0222421C.h @@ -5,7 +5,7 @@ #include "spl.h" -void ov12_02224F14(UnkSPLStruct6 * param0); -s8 ov12_02224FC4(UnkStruct_ov12_02225640 * param0); +void ov12_02224F14(UnkSPLStruct6 *param0); +s8 ov12_02224FC4(UnkStruct_ov12_02225640 *param0); #endif // POKEPLATINUM_OV12_0222421C_H diff --git a/include/overlay012/ov12_02225104.h b/include/overlay012/ov12_02225104.h index 3bb6bb22b2..1f78d24782 100644 --- a/include/overlay012/ov12_02225104.h +++ b/include/overlay012/ov12_02225104.h @@ -5,7 +5,7 @@ #include "spl.h" -void ov12_022255D4(int param0, UnkSPLStruct6 * param1, UnkStruct_ov12_02225640 * param2); +void ov12_022255D4(int param0, UnkSPLStruct6 *param1, UnkStruct_ov12_02225640 *param2); int ov12_022255EC(int param0); int ov12_02225614(void); diff --git a/include/overlay012/ov12_02225640.h b/include/overlay012/ov12_02225640.h index 6d54a80465..4406cf689a 100644 --- a/include/overlay012/ov12_02225640.h +++ b/include/overlay012/ov12_02225640.h @@ -5,6 +5,6 @@ #include "spl.h" -void ov12_0222584C(int param0, UnkSPLStruct6 * param1, UnkStruct_ov12_02225640 * param2); +void ov12_0222584C(int param0, UnkSPLStruct6 *param1, UnkStruct_ov12_02225640 *param2); #endif // POKEPLATINUM_OV12_02225640_H diff --git a/include/overlay012/ov12_02225864.h b/include/overlay012/ov12_02225864.h index fbee68b2b4..e586f5570b 100644 --- a/include/overlay012/ov12_02225864.h +++ b/include/overlay012/ov12_02225864.h @@ -1,86 +1,87 @@ #ifndef POKEPLATINUM_OV12_02225864_H #define POKEPLATINUM_OV12_02225864_H -#include "struct_decls/struct_02002F38_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/cell_actor_data.h" +#include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02002F38_decl.h" + +#include "overlay012/funcptr_ov12_02226274.h" #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02225D50.h" #include "overlay012/struct_ov12_02225F6C.h" #include "overlay012/struct_ov12_02226274.h" -#include "overlay012/funcptr_ov12_02226274.h" #include "overlay012/struct_ov12_02226454.h" #include "overlay012/struct_ov12_02226504_decl.h" #include "overlay012/struct_ov12_0222660C_decl.h" #include "overlay012/struct_ov12_022267D4_decl.h" -void ov12_02225864(int param0, int param1, s16 * param2, s16 * param3); -void ov12_02225898(UnkStruct_ov12_0221FCDC * param0, int param1, s16 * param2, s16 * param3); -s16 ov12_022258E0(UnkStruct_ov12_0221FCDC * param0, int param1, int param2); -u8 ov12_02225950(CellActorData * param0); -int ov12_02225964(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_0222598C(UnkStruct_ov12_0221FCDC * param0, int param1); +void ov12_02225864(int param0, int param1, s16 *param2, s16 *param3); +void ov12_02225898(UnkStruct_ov12_0221FCDC *param0, int param1, s16 *param2, s16 *param3); +s16 ov12_022258E0(UnkStruct_ov12_0221FCDC *param0, int param1, int param2); +u8 ov12_02225950(CellActorData *param0); +int ov12_02225964(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_0222598C(UnkStruct_ov12_0221FCDC *param0, int param1); fx32 ov12_022259A0(fx32 param0, fx32 param1, u32 param2); u32 ov12_022259AC(fx32 param0, fx32 param1, fx32 param2); -void ov12_022259DC(UnkStruct_ov12_02225F6C * param0, CellActorData * param1, s16 param2, s16 param3); -void ov12_022259FC(UnkStruct_ov12_02225F6C * param0, CellActorData * param1); -void ov12_02225A18(UnkStruct_ov12_02225F6C * param0, Sprite * param1, s16 param2, s16 param3); -void ov12_02225A3C(UnkStruct_ov12_02225F6C * param0, Sprite * param1); -void ov12_02225A5C(UnkStruct_ov12_02225F6C * param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, int param7); -void ov12_02225A8C(UnkStruct_ov12_02225F6C * param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, u16 param7); -BOOL ov12_02225AE0(UnkStruct_ov12_02225F6C * param0); -BOOL ov12_02225B78(UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, CellActorData * param3); -BOOL ov12_02225BA0(UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, Sprite * param3); -void ov12_02225BC8(UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, s16 param3, s16 param4, u16 param5); -BOOL ov12_02225C14(UnkStruct_ov12_02225F6C * param0); -BOOL ov12_02225C50(UnkStruct_ov12_02225F6C * param0, CellActorData * param1); -BOOL ov12_02225C74(UnkStruct_ov12_02225F6C * param0, Sprite * param1); -void ov12_02225C98(UnkStruct_ov12_02225F6C * param0, UnkStruct_ov12_02225F6C * param1, s16 param2, s16 param3, s16 param4, s16 param5, u16 param6, fx32 param7); -BOOL ov12_02225CE4(UnkStruct_ov12_02225F6C * param0, UnkStruct_ov12_02225F6C * param1); -BOOL ov12_02225D2C(UnkStruct_ov12_02225F6C * param0, UnkStruct_ov12_02225F6C * param1, CellActorData * param2); -void ov12_02225D50(UnkStruct_ov12_02225D50 * param0, s32 param1, s32 param2, u32 param3); -void ov12_02225D78(UnkStruct_ov12_02225D50 * param0, s16 param1, s16 param2, u32 param3); -BOOL ov12_02225DA0(UnkStruct_ov12_02225D50 * param0); -BOOL ov12_02225DC8(UnkStruct_ov12_02225D50 * param0); -void ov12_02225DF4(UnkStruct_ov12_02225D50 * param0, u16 param1, u16 param2, fx32 param3, u32 param4); -BOOL ov12_02225E0C(UnkStruct_ov12_02225D50 * param0); -void ov12_02225E68(UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, s16 param3, u32 param4); -BOOL ov12_02225EB8(UnkStruct_ov12_02225F6C * param0); -void ov12_02225EF0(UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, s16 param3, s16 param4, s16 param5, u32 param6); -BOOL ov12_02225F6C(UnkStruct_ov12_02225F6C * param0); -void ov12_02225FA4(UnkStruct_ov12_02225F6C * param0, f32 * param1, f32 * param2); -s16 ov12_02225FD4(s16 param0, int param1, fx32 param2); -void ov12_02226024(Sprite * param0, s16 param1, s16 param2, fx32 param3, int param4); -void ov12_0222605C(CellActorData * param0, s16 param1, s16 param2, fx32 param3, int param4); -BOOL ov12_022260A8(UnkStruct_ov12_02225F6C * param0, CellActorData * param1); -BOOL ov12_022260C8(UnkStruct_ov12_02225F6C * param0, Sprite * param1); -BOOL ov12_022260E8(UnkStruct_ov12_02225F6C * param0, Sprite * param1); -void ov12_02226108(UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, u32 param3, u32 param4); -BOOL ov12_02226138(UnkStruct_ov12_02225F6C * param0); -BOOL ov12_0222619C(UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, Sprite * param3); -void ov12_022261C4(UnkStruct_ov12_02226274 * param0, UnkStruct_ov12_02225F6C * param1, UnkFuncPtr_ov12_02226274 param2, s16 param3, s16 param4, u16 param5, u8 param6, u8 param7, CellActorData * param8, CellActorData * param9, CellActorData * param10, CellActorData * param11); -BOOL ov12_02226274(UnkStruct_ov12_02226274 * param0); -void ov12_022263A4(UnkStruct_ov12_02225F6C * param0, int param1, int param2); -void ov12_02226424(UnkStruct_ov12_02226454 * param0, s16 param1, s16 param2, s16 param3, s16 param4, int param5); -BOOL ov12_02226454(const UnkStruct_ov12_02226454 * param0); -UnkStruct_ov12_02226504 * ov12_02226544(u32 param0, u32 param1, int param2); -void ov12_022265C0(UnkStruct_ov12_02226504 * param0); -void * ov12_022265E4(const UnkStruct_ov12_02226504 * param0); -void ov12_022265F8(UnkStruct_ov12_02226504 * param0); -UnkStruct_ov12_0222660C * ov12_0222662C(u8 param0, u8 param1, u16 param2, fx32 param3, s16 param4, u32 param5, u32 param6, u32 param7, int param8); -void ov12_0222669C(UnkStruct_ov12_0222660C * param0); -void * ov12_022266C0(const UnkStruct_ov12_0222660C * param0); -void ov12_022266D4(UnkStruct_ov12_0222660C * param0); +void ov12_022259DC(UnkStruct_ov12_02225F6C *param0, CellActorData *param1, s16 param2, s16 param3); +void ov12_022259FC(UnkStruct_ov12_02225F6C *param0, CellActorData *param1); +void ov12_02225A18(UnkStruct_ov12_02225F6C *param0, Sprite *param1, s16 param2, s16 param3); +void ov12_02225A3C(UnkStruct_ov12_02225F6C *param0, Sprite *param1); +void ov12_02225A5C(UnkStruct_ov12_02225F6C *param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, int param7); +void ov12_02225A8C(UnkStruct_ov12_02225F6C *param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, u16 param7); +BOOL ov12_02225AE0(UnkStruct_ov12_02225F6C *param0); +BOOL ov12_02225B78(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, CellActorData *param3); +BOOL ov12_02225BA0(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, Sprite *param3); +void ov12_02225BC8(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, s16 param3, s16 param4, u16 param5); +BOOL ov12_02225C14(UnkStruct_ov12_02225F6C *param0); +BOOL ov12_02225C50(UnkStruct_ov12_02225F6C *param0, CellActorData *param1); +BOOL ov12_02225C74(UnkStruct_ov12_02225F6C *param0, Sprite *param1); +void ov12_02225C98(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1, s16 param2, s16 param3, s16 param4, s16 param5, u16 param6, fx32 param7); +BOOL ov12_02225CE4(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1); +BOOL ov12_02225D2C(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1, CellActorData *param2); +void ov12_02225D50(UnkStruct_ov12_02225D50 *param0, s32 param1, s32 param2, u32 param3); +void ov12_02225D78(UnkStruct_ov12_02225D50 *param0, s16 param1, s16 param2, u32 param3); +BOOL ov12_02225DA0(UnkStruct_ov12_02225D50 *param0); +BOOL ov12_02225DC8(UnkStruct_ov12_02225D50 *param0); +void ov12_02225DF4(UnkStruct_ov12_02225D50 *param0, u16 param1, u16 param2, fx32 param3, u32 param4); +BOOL ov12_02225E0C(UnkStruct_ov12_02225D50 *param0); +void ov12_02225E68(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, s16 param3, u32 param4); +BOOL ov12_02225EB8(UnkStruct_ov12_02225F6C *param0); +void ov12_02225EF0(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, s16 param3, s16 param4, s16 param5, u32 param6); +BOOL ov12_02225F6C(UnkStruct_ov12_02225F6C *param0); +void ov12_02225FA4(UnkStruct_ov12_02225F6C *param0, f32 *param1, f32 *param2); +s16 ov12_02225FD4(s16 param0, int param1, fx32 param2); +void ov12_02226024(Sprite *param0, s16 param1, s16 param2, fx32 param3, int param4); +void ov12_0222605C(CellActorData *param0, s16 param1, s16 param2, fx32 param3, int param4); +BOOL ov12_022260A8(UnkStruct_ov12_02225F6C *param0, CellActorData *param1); +BOOL ov12_022260C8(UnkStruct_ov12_02225F6C *param0, Sprite *param1); +BOOL ov12_022260E8(UnkStruct_ov12_02225F6C *param0, Sprite *param1); +void ov12_02226108(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, u32 param3, u32 param4); +BOOL ov12_02226138(UnkStruct_ov12_02225F6C *param0); +BOOL ov12_0222619C(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, Sprite *param3); +void ov12_022261C4(UnkStruct_ov12_02226274 *param0, UnkStruct_ov12_02225F6C *param1, UnkFuncPtr_ov12_02226274 param2, s16 param3, s16 param4, u16 param5, u8 param6, u8 param7, CellActorData *param8, CellActorData *param9, CellActorData *param10, CellActorData *param11); +BOOL ov12_02226274(UnkStruct_ov12_02226274 *param0); +void ov12_022263A4(UnkStruct_ov12_02225F6C *param0, int param1, int param2); +void ov12_02226424(UnkStruct_ov12_02226454 *param0, s16 param1, s16 param2, s16 param3, s16 param4, int param5); +BOOL ov12_02226454(const UnkStruct_ov12_02226454 *param0); +UnkStruct_ov12_02226504 *ov12_02226544(u32 param0, u32 param1, int param2); +void ov12_022265C0(UnkStruct_ov12_02226504 *param0); +void *ov12_022265E4(const UnkStruct_ov12_02226504 *param0); +void ov12_022265F8(UnkStruct_ov12_02226504 *param0); +UnkStruct_ov12_0222660C *ov12_0222662C(u8 param0, u8 param1, u16 param2, fx32 param3, s16 param4, u32 param5, u32 param6, u32 param7, int param8); +void ov12_0222669C(UnkStruct_ov12_0222660C *param0); +void *ov12_022266C0(const UnkStruct_ov12_0222660C *param0); +void ov12_022266D4(UnkStruct_ov12_0222660C *param0); u32 ov12_022266E8(u16 param0, u16 param1); u32 ov12_022266F0(int param0); -void ov12_02226728(s16 param0, s16 param1, s16 param2, s16 param3, s16 * param4, s16 * param5); -void ov12_02226744(s16 param0, s16 param1, s16 param2, s16 param3, fx32 * param4); -void ov12_0222676C(s16 param0, s16 param1, s16 param2, s16 param3, u16 * param4); -BOOL ov12_022267A8(int * param0, int param1, s32 param2); -BOOL ov12_02226848(UnkStruct_ov12_022267D4 * param0); -void ov12_02226858(UnkStruct_ov12_022267D4 * param0); -UnkStruct_ov12_022267D4 * ov12_02226870(PaletteData * param0, int param1, int param2, u16 param3, u16 param4, s8 param5, s8 param6, u8 param7, u8 param8, u16 param9, int param10); -void ov12_02226924(UnkStruct_ov12_0221FCDC * param0); -void ov12_02226954(UnkStruct_ov12_0221FCDC * param0); +void ov12_02226728(s16 param0, s16 param1, s16 param2, s16 param3, s16 *param4, s16 *param5); +void ov12_02226744(s16 param0, s16 param1, s16 param2, s16 param3, fx32 *param4); +void ov12_0222676C(s16 param0, s16 param1, s16 param2, s16 param3, u16 *param4); +BOOL ov12_022267A8(int *param0, int param1, s32 param2); +BOOL ov12_02226848(UnkStruct_ov12_022267D4 *param0); +void ov12_02226858(UnkStruct_ov12_022267D4 *param0); +UnkStruct_ov12_022267D4 *ov12_02226870(PaletteData *param0, int param1, int param2, u16 param3, u16 param4, s8 param5, s8 param6, u8 param7, u8 param8, u16 param9, int param10); +void ov12_02226924(UnkStruct_ov12_0221FCDC *param0); +void ov12_02226954(UnkStruct_ov12_0221FCDC *param0); #endif // POKEPLATINUM_OV12_02225864_H diff --git a/include/overlay012/ov12_022269C0.h b/include/overlay012/ov12_022269C0.h index a2bc78c39c..052f155ad0 100644 --- a/include/overlay012/ov12_022269C0.h +++ b/include/overlay012/ov12_022269C0.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_OV12_022269C0_H #define POKEPLATINUM_OV12_022269C0_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_022269C0(UnkStruct_ov12_0221FCDC * param0); -void ov12_022269EC(UnkStruct_ov12_0221FCDC * param0); -void ov12_02226A3C(UnkStruct_ov12_0221FCDC * param0); -void ov12_02226A88(UnkStruct_ov12_0221FCDC * param0); -void ov12_02226B1C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); +void ov12_022269C0(UnkStruct_ov12_0221FCDC *param0); +void ov12_022269EC(UnkStruct_ov12_0221FCDC *param0); +void ov12_02226A3C(UnkStruct_ov12_0221FCDC *param0); +void ov12_02226A88(UnkStruct_ov12_0221FCDC *param0); +void ov12_02226B1C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); #endif // POKEPLATINUM_OV12_022269C0_H diff --git a/include/overlay012/ov12_02226B84.h b/include/overlay012/ov12_02226B84.h index b3ef0780c3..53a6606af3 100644 --- a/include/overlay012/ov12_02226B84.h +++ b/include/overlay012/ov12_02226B84.h @@ -1,50 +1,51 @@ #ifndef POKEPLATINUM_OV12_02226B84_H #define POKEPLATINUM_OV12_02226B84_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_02226CB0(UnkStruct_ov12_0221FCDC * param0); -void ov12_02226EB0(UnkStruct_ov12_0221FCDC * param0); -void ov12_022271D8(UnkStruct_ov12_0221FCDC * param0); -void ov12_02227408(UnkStruct_ov12_0221FCDC * param0); -void ov12_02227534(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222777C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02227828(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222797C(UnkStruct_ov12_0221FCDC * param0); -void ov12_02227CBC(UnkStruct_ov12_0221FCDC * param0); -void ov12_02227F30(UnkStruct_ov12_0221FCDC * param0); -void ov12_02228168(UnkStruct_ov12_0221FCDC * param0); -void ov12_02228214(UnkStruct_ov12_0221FCDC * param0); -void ov12_022282BC(UnkStruct_ov12_0221FCDC * param0); -void ov12_02228394(UnkStruct_ov12_0221FCDC * param0); -void ov12_02228520(UnkStruct_ov12_0221FCDC * param0); -void ov12_022287CC(UnkStruct_ov12_0221FCDC * param0); -void ov12_02228A0C(UnkStruct_ov12_0221FCDC * param0); -void ov12_02228B40(UnkStruct_ov12_0221FCDC * param0); -void ov12_02228C6C(UnkStruct_ov12_0221FCDC * param0); -void ov12_02228E00(UnkStruct_ov12_0221FCDC * param0); -void ov12_02228EC0(UnkStruct_ov12_0221FCDC * param0); -void ov12_02228FB4(UnkStruct_ov12_0221FCDC * param0); -void ov12_022290DC(UnkStruct_ov12_0221FCDC * param0); -void ov12_022291AC(UnkStruct_ov12_0221FCDC * param0); -void ov12_02229304(UnkStruct_ov12_0221FCDC * param0); -void ov12_02229638(UnkStruct_ov12_0221FCDC * param0); -void ov12_02229810(UnkStruct_ov12_0221FCDC * param0); -void ov12_02229908(UnkStruct_ov12_0221FCDC * param0); -void ov12_02229B28(UnkStruct_ov12_0221FCDC * param0); -void ov12_02229C5C(UnkStruct_ov12_0221FCDC * param0); -void ov12_02229E54(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222A00C(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222A1AC(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222A34C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222A410(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222A5C0(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222A604(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222A8F4(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222AB50(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222AC40(UnkStruct_ov12_0221FCDC * param0); +void ov12_02226CB0(UnkStruct_ov12_0221FCDC *param0); +void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0); +void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0); +void ov12_02227408(UnkStruct_ov12_0221FCDC *param0); +void ov12_02227534(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222777C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02227828(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222797C(UnkStruct_ov12_0221FCDC *param0); +void ov12_02227CBC(UnkStruct_ov12_0221FCDC *param0); +void ov12_02227F30(UnkStruct_ov12_0221FCDC *param0); +void ov12_02228168(UnkStruct_ov12_0221FCDC *param0); +void ov12_02228214(UnkStruct_ov12_0221FCDC *param0); +void ov12_022282BC(UnkStruct_ov12_0221FCDC *param0); +void ov12_02228394(UnkStruct_ov12_0221FCDC *param0); +void ov12_02228520(UnkStruct_ov12_0221FCDC *param0); +void ov12_022287CC(UnkStruct_ov12_0221FCDC *param0); +void ov12_02228A0C(UnkStruct_ov12_0221FCDC *param0); +void ov12_02228B40(UnkStruct_ov12_0221FCDC *param0); +void ov12_02228C6C(UnkStruct_ov12_0221FCDC *param0); +void ov12_02228E00(UnkStruct_ov12_0221FCDC *param0); +void ov12_02228EC0(UnkStruct_ov12_0221FCDC *param0); +void ov12_02228FB4(UnkStruct_ov12_0221FCDC *param0); +void ov12_022290DC(UnkStruct_ov12_0221FCDC *param0); +void ov12_022291AC(UnkStruct_ov12_0221FCDC *param0); +void ov12_02229304(UnkStruct_ov12_0221FCDC *param0); +void ov12_02229638(UnkStruct_ov12_0221FCDC *param0); +void ov12_02229810(UnkStruct_ov12_0221FCDC *param0); +void ov12_02229908(UnkStruct_ov12_0221FCDC *param0); +void ov12_02229B28(UnkStruct_ov12_0221FCDC *param0); +void ov12_02229C5C(UnkStruct_ov12_0221FCDC *param0); +void ov12_02229E54(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222A00C(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222A1AC(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222A34C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222A410(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222A5C0(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222A604(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222A8F4(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222AB50(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222AC40(UnkStruct_ov12_0221FCDC *param0); #endif // POKEPLATINUM_OV12_02226B84_H diff --git a/include/overlay012/ov12_0222AC70.h b/include/overlay012/ov12_0222AC70.h index fdc40743e6..00fdf07358 100644 --- a/include/overlay012/ov12_0222AC70.h +++ b/include/overlay012/ov12_0222AC70.h @@ -1,29 +1,30 @@ #ifndef POKEPLATINUM_OV12_0222AC70_H #define POKEPLATINUM_OV12_0222AC70_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_0222AE68(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222B194(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222B45C(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222B68C(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222B9E0(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222BAE4(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222BCF4(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222BE48(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222BFA8(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222C0C0(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222C3C0(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222C5FC(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222C6D4(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222C8F8(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222CA2C(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222CB90(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222CC54(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222CFA0(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222D56C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); +void ov12_0222AE68(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222B194(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222B45C(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222B68C(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222B9E0(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222BAE4(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222BCF4(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222BE48(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222BFA8(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222C0C0(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222C3C0(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222C5FC(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222C6D4(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222C8F8(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222CA2C(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222CB90(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222CC54(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222CFA0(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222D56C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); #endif // POKEPLATINUM_OV12_0222AC70_H diff --git a/include/overlay012/ov12_0222D6B0.h b/include/overlay012/ov12_0222D6B0.h index dc29a2d7a0..8dd4656ef3 100644 --- a/include/overlay012/ov12_0222D6B0.h +++ b/include/overlay012/ov12_0222D6B0.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_OV12_0222D6B0_H #define POKEPLATINUM_OV12_0222D6B0_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_0222D7C0(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222DB60(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222DEFC(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222E1A8(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222E248(CellActorData * param0); -void ov12_0222E2F8(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222E61C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); +void ov12_0222D7C0(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222DB60(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222DEFC(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222E1A8(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222E248(CellActorData *param0); +void ov12_0222E2F8(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); #endif // POKEPLATINUM_OV12_0222D6B0_H diff --git a/include/overlay012/ov12_0222E784.h b/include/overlay012/ov12_0222E784.h index 12e454a69c..5502b5d949 100644 --- a/include/overlay012/ov12_0222E784.h +++ b/include/overlay012/ov12_0222E784.h @@ -3,6 +3,6 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_0222E810(UnkStruct_ov12_0221FCDC * param0); +void ov12_0222E810(UnkStruct_ov12_0221FCDC *param0); #endif // POKEPLATINUM_OV12_0222E784_H diff --git a/include/overlay012/ov12_0222E91C.h b/include/overlay012/ov12_0222E91C.h index 7b63c62ebe..b4e7973684 100644 --- a/include/overlay012/ov12_0222E91C.h +++ b/include/overlay012/ov12_0222E91C.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_OV12_0222E91C_H #define POKEPLATINUM_OV12_0222E91C_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_0222EAA0(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222EC90(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0222EFB0(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222F2F8(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222F5EC(UnkStruct_ov12_0221FCDC * param0); +void ov12_0222EAA0(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0222EFB0(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222F5EC(UnkStruct_ov12_0221FCDC *param0); #endif // POKEPLATINUM_OV12_0222E91C_H diff --git a/include/overlay012/ov12_0222F700.h b/include/overlay012/ov12_0222F700.h index 5855a9b0e9..6121edd516 100644 --- a/include/overlay012/ov12_0222F700.h +++ b/include/overlay012/ov12_0222F700.h @@ -1,43 +1,44 @@ #ifndef POKEPLATINUM_OV12_0222F700_H #define POKEPLATINUM_OV12_0222F700_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_0222F770(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222F9E4(UnkStruct_ov12_0221FCDC * param0); -void ov12_0222FE30(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_022300C4(UnkStruct_ov12_0221FCDC * param0); -void ov12_022303D0(UnkStruct_ov12_0221FCDC * param0); -void ov12_02230754(UnkStruct_ov12_0221FCDC * param0); -void ov12_02230804(UnkStruct_ov12_0221FCDC * param0); -void ov12_02230A8C(UnkStruct_ov12_0221FCDC * param0); -void ov12_02230CEC(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02231010(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_022312A4(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02231444(UnkStruct_ov12_0221FCDC * param0); -void ov12_02231650(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02231950(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02231C1C(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02231E7C(UnkStruct_ov12_0221FCDC * param0); -void ov12_02232024(UnkStruct_ov12_0221FCDC * param0); -void ov12_02232378(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_0223249C(UnkStruct_ov12_0221FCDC * param0); -void ov12_022326AC(UnkStruct_ov12_0221FCDC * param0); -void ov12_022329E0(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02232CA8(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02233178(UnkStruct_ov12_0221FCDC * param0); -void ov12_02233454(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02233734(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_022339C4(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02233CD4(UnkStruct_ov12_0221FCDC * param0); -void ov12_02233F30(UnkStruct_ov12_0221FCDC * param0); -void ov12_02234008(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02234214(UnkStruct_ov12_0221FCDC * param0); -void ov12_022342C4(UnkStruct_ov12_0221FCDC * param0); -void ov12_022344D0(UnkStruct_ov12_0221FCDC * param0); -void ov12_0223464C(UnkStruct_ov12_0221FCDC * param0); +void ov12_0222F770(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222F9E4(UnkStruct_ov12_0221FCDC *param0); +void ov12_0222FE30(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_022300C4(UnkStruct_ov12_0221FCDC *param0); +void ov12_022303D0(UnkStruct_ov12_0221FCDC *param0); +void ov12_02230754(UnkStruct_ov12_0221FCDC *param0); +void ov12_02230804(UnkStruct_ov12_0221FCDC *param0); +void ov12_02230A8C(UnkStruct_ov12_0221FCDC *param0); +void ov12_02230CEC(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02231010(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_022312A4(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02231444(UnkStruct_ov12_0221FCDC *param0); +void ov12_02231650(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02231950(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02231C1C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02231E7C(UnkStruct_ov12_0221FCDC *param0); +void ov12_02232024(UnkStruct_ov12_0221FCDC *param0); +void ov12_02232378(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_0223249C(UnkStruct_ov12_0221FCDC *param0); +void ov12_022326AC(UnkStruct_ov12_0221FCDC *param0); +void ov12_022329E0(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02232CA8(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02233178(UnkStruct_ov12_0221FCDC *param0); +void ov12_02233454(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02233734(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_022339C4(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02233CD4(UnkStruct_ov12_0221FCDC *param0); +void ov12_02233F30(UnkStruct_ov12_0221FCDC *param0); +void ov12_02234008(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02234214(UnkStruct_ov12_0221FCDC *param0); +void ov12_022342C4(UnkStruct_ov12_0221FCDC *param0); +void ov12_022344D0(UnkStruct_ov12_0221FCDC *param0); +void ov12_0223464C(UnkStruct_ov12_0221FCDC *param0); #endif // POKEPLATINUM_OV12_0222F700_H diff --git a/include/overlay012/ov12_022346A4.h b/include/overlay012/ov12_022346A4.h index 8d7f1f4a11..fcd7bf962f 100644 --- a/include/overlay012/ov12_022346A4.h +++ b/include/overlay012/ov12_022346A4.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_OV12_022346A4_H #define POKEPLATINUM_OV12_022346A4_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_022346A4(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_022348C8(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02234A10(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); -void ov12_02234D98(UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3); +void ov12_022346A4(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_022348C8(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02234A10(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); +void ov12_02234D98(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3); #endif // POKEPLATINUM_OV12_022346A4_H diff --git a/include/overlay012/ov12_02234E44.h b/include/overlay012/ov12_02234E44.h index fa168c6520..3c62ea3714 100644 --- a/include/overlay012/ov12_02234E44.h +++ b/include/overlay012/ov12_02234E44.h @@ -3,9 +3,9 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" -void ov12_022351A4(UnkStruct_ov12_0221FCDC * param0); -void ov12_022351D0(UnkStruct_ov12_0221FCDC * param0); -void ov12_022351FC(UnkStruct_ov12_0221FCDC * param0); -void ov12_02235228(UnkStruct_ov12_0221FCDC * param0); +void ov12_022351A4(UnkStruct_ov12_0221FCDC *param0); +void ov12_022351D0(UnkStruct_ov12_0221FCDC *param0); +void ov12_022351FC(UnkStruct_ov12_0221FCDC *param0); +void ov12_02235228(UnkStruct_ov12_0221FCDC *param0); #endif // POKEPLATINUM_OV12_02234E44_H diff --git a/include/overlay012/ov12_02235254.h b/include/overlay012/ov12_02235254.h index d6c382ca48..b8cd3d5087 100644 --- a/include/overlay012/ov12_02235254.h +++ b/include/overlay012/ov12_02235254.h @@ -1,59 +1,60 @@ #ifndef POKEPLATINUM_OV12_02235254_H #define POKEPLATINUM_OV12_02235254_H -#include "struct_decls/sprite_decl.h" +#include + #include "struct_decls/cell_actor_data.h" +#include "struct_decls/sprite_decl.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02235350.h" #include "overlay012/struct_ov12_0223595C.h" #include "overlay012/struct_ov12_02235998.h" -#include - -int ov12_02235254(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_0223525C(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_02235288(UnkStruct_ov12_0221FCDC * param0, int param1); -int ov12_022352AC(UnkStruct_ov12_0221FCDC * param0, int param1); +int ov12_02235254(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_0223525C(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_02235288(UnkStruct_ov12_0221FCDC *param0, int param1); +int ov12_022352AC(UnkStruct_ov12_0221FCDC *param0, int param1); int ov12_02235310(int param0); -void ov12_02235350(int param0, int param1, UnkStruct_ov12_02235350 * param2); -void ov12_022353AC(UnkStruct_ov12_0221FCDC * param0, int param1, UnkStruct_ov12_02235350 * param2); -void ov12_02235448(int param0, VecFx32 * param1, int param2, int param3); -void ov12_02235458(int param0, VecFx32 * param1, int param2, int param3); -void ov12_02235468(int param0, VecFx32 * param1, int param2, int param3); -void ov12_02235478(int param0, VecFx32 * param1, int param2, int param3); -void ov12_02235488(int param0, VecFx32 * param1, int param2, int param3); -void ov12_02235498(int param0, VecFx32 * param1, int param2, int param3); -void ov12_022354A8(int param0, VecFx32 * param1, int param2, int param3); -void ov12_022354B8(int param0, VecFx32 * param1, int param2, int param3); -void ov12_022354C8(int param0, VecFx32 * param1, int param2, int param3); -void ov12_022354D8(int param0, VecFx32 * param1, int param2, int param3); -void ov12_022354E8(int param0, VecFx32 * param1, int param2, int param3); -void ov12_022354F8(int param0, VecFx32 * param1, int param2, int param3); -void ov12_02235508(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_02235538(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_02235568(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_02235598(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_022355C8(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_022355F8(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_02235628(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_02235658(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_02235688(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_022356B8(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_022356E8(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_02235718(UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2); -void ov12_02235748(VecFx32 * param0); -void ov12_02235758(int param0, VecFx32 * param1, int param2, int param3); -void ov12_02235760(int param0, VecFx32 * param1); -void ov12_02235780(UnkStruct_ov12_0221FCDC * param0, int param1, int param2); -void ov12_022357BC(UnkStruct_ov12_0221FCDC * param0, int param1, int param2, int param3); -void ov12_022357EC(UnkStruct_ov12_0221FCDC * param0, int param1, int param2); -void ov12_02235838(UnkStruct_ov12_0221FCDC * param0, int param1, BOOL param2); -void ov12_02235918(Sprite * param0, UnkStruct_ov12_02235350 * param1); -void ov12_02235950(CellActorData * param0, UnkStruct_ov12_02235350 * param1); -void ov12_0223595C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_0223595C * param1); -void ov12_02235998(UnkStruct_ov12_0221FCDC * param0, int param1, UnkStruct_ov12_02235998 * param2, int * param3); -void ov12_02235D74(UnkStruct_ov12_0221FCDC * param0, int param1, UnkStruct_ov12_02235998 * param2, int * param3); -void * ov12_02235E50(UnkStruct_ov12_0221FCDC * param0, int param1); -void ov12_02235E80(void * param0); +void ov12_02235350(int param0, int param1, UnkStruct_ov12_02235350 *param2); +void ov12_022353AC(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235350 *param2); +void ov12_02235448(int param0, VecFx32 *param1, int param2, int param3); +void ov12_02235458(int param0, VecFx32 *param1, int param2, int param3); +void ov12_02235468(int param0, VecFx32 *param1, int param2, int param3); +void ov12_02235478(int param0, VecFx32 *param1, int param2, int param3); +void ov12_02235488(int param0, VecFx32 *param1, int param2, int param3); +void ov12_02235498(int param0, VecFx32 *param1, int param2, int param3); +void ov12_022354A8(int param0, VecFx32 *param1, int param2, int param3); +void ov12_022354B8(int param0, VecFx32 *param1, int param2, int param3); +void ov12_022354C8(int param0, VecFx32 *param1, int param2, int param3); +void ov12_022354D8(int param0, VecFx32 *param1, int param2, int param3); +void ov12_022354E8(int param0, VecFx32 *param1, int param2, int param3); +void ov12_022354F8(int param0, VecFx32 *param1, int param2, int param3); +void ov12_02235508(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_02235538(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_02235568(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_02235598(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_022355C8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_022355F8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_02235628(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_02235658(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_02235688(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_022356B8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_022356E8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_02235718(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2); +void ov12_02235748(VecFx32 *param0); +void ov12_02235758(int param0, VecFx32 *param1, int param2, int param3); +void ov12_02235760(int param0, VecFx32 *param1); +void ov12_02235780(UnkStruct_ov12_0221FCDC *param0, int param1, int param2); +void ov12_022357BC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2, int param3); +void ov12_022357EC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2); +void ov12_02235838(UnkStruct_ov12_0221FCDC *param0, int param1, BOOL param2); +void ov12_02235918(Sprite *param0, UnkStruct_ov12_02235350 *param1); +void ov12_02235950(CellActorData *param0, UnkStruct_ov12_02235350 *param1); +void ov12_0223595C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_0223595C *param1); +void ov12_02235998(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3); +void ov12_02235D74(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3); +void *ov12_02235E50(UnkStruct_ov12_0221FCDC *param0, int param1); +void ov12_02235E80(void *param0); #endif // POKEPLATINUM_OV12_02235254_H diff --git a/include/overlay012/ov12_02235E94.h b/include/overlay012/ov12_02235E94.h index cc344533b3..86263bf5cf 100644 --- a/include/overlay012/ov12_02235E94.h +++ b/include/overlay012/ov12_02235E94.h @@ -2,42 +2,42 @@ #define POKEPLATINUM_OV12_02235E94_H #include "functypes/funcptr_020146F4.h" +#include "overlay012/struct_ball_rotation_decl.h" #include "overlay012/struct_ov12_02235FE0_decl.h" #include "overlay012/struct_ov12_02236030.h" #include "overlay012/struct_ov12_02236648_decl.h" #include "overlay012/struct_ov12_02236690.h" #include "overlay012/struct_ov12_02237728.h" -#include "overlay012/struct_ball_rotation_decl.h" -UnkStruct_ov12_02235FE0 * ov12_02235FE0(int param0); -UnkStruct_ov12_02235FE0 * ov12_02236004(int param0, const UnkStruct_ov12_02236030 * param1); -void ov12_02236030(UnkStruct_ov12_02235FE0 * param0, const UnkStruct_ov12_02236030 * param1); -void ov12_02236320(UnkStruct_ov12_02235FE0 * param0); -BOOL ov12_02236374(UnkStruct_ov12_02235FE0 * param0); -void ov12_02236384(UnkStruct_ov12_02235FE0 * param0, UnkFuncPtr_020146F4 param1); -void ov12_022363B4(UnkStruct_ov12_02235FE0 * param0); -BOOL ov12_022363C4(UnkStruct_ov12_02235FE0 * param0); -void ov12_02236428(UnkStruct_ov12_02235FE0 * param0); -UnkStruct_ov12_02236648 * ov12_02236690(UnkStruct_ov12_02236690 * param0); -void ov12_022366F0(UnkStruct_ov12_02236648 * param0); -BOOL ov12_02236764(UnkStruct_ov12_02236648 * param0); -void ov12_02236780(UnkStruct_ov12_02236648 * param0); -void ov12_022368C8(BallRotation * param0, int param1); -BOOL ov12_022368D0(BallRotation * param0, int param1); -BallRotation * ov12_02237728(BallThrow * param0); -BOOL ov12_022377F8(BallRotation * param0); -BOOL ov12_02237810(BallRotation * param0); -void ov12_02237828(BallRotation * param0, int param1); -BOOL ov12_0223782C(BallRotation * param0, int param1); -void ov12_0223783C(BallRotation * param0); -void ov12_0223786C(BallRotation * param0, int param1); -int ov12_02237890(BallRotation * param0); -void ov12_02237E0C(BallRotation * param0, int param1); -void ov12_02237E18(BallRotation * param0, s16 param1, s16 param2); -void ov12_02237E24(BallRotation * param0, u16 param1); -void ov12_02237E30(BallRotation * param0, BOOL param1); -void ov12_02237E34(BallRotation * param0, int param1); -void ov12_02237E40(BallRotation * param0, int param1); -void ov12_02237E4C(BallRotation * param0, int param1); +UnkStruct_ov12_02235FE0 *ov12_02235FE0(int param0); +UnkStruct_ov12_02235FE0 *ov12_02236004(int param0, const UnkStruct_ov12_02236030 *param1); +void ov12_02236030(UnkStruct_ov12_02235FE0 *param0, const UnkStruct_ov12_02236030 *param1); +void ov12_02236320(UnkStruct_ov12_02235FE0 *param0); +BOOL ov12_02236374(UnkStruct_ov12_02235FE0 *param0); +void ov12_02236384(UnkStruct_ov12_02235FE0 *param0, UnkFuncPtr_020146F4 param1); +void ov12_022363B4(UnkStruct_ov12_02235FE0 *param0); +BOOL ov12_022363C4(UnkStruct_ov12_02235FE0 *param0); +void ov12_02236428(UnkStruct_ov12_02235FE0 *param0); +UnkStruct_ov12_02236648 *ov12_02236690(UnkStruct_ov12_02236690 *param0); +void ov12_022366F0(UnkStruct_ov12_02236648 *param0); +BOOL ov12_02236764(UnkStruct_ov12_02236648 *param0); +void ov12_02236780(UnkStruct_ov12_02236648 *param0); +void ov12_022368C8(BallRotation *param0, int param1); +BOOL ov12_022368D0(BallRotation *param0, int param1); +BallRotation *ov12_02237728(BallThrow *param0); +BOOL ov12_022377F8(BallRotation *param0); +BOOL ov12_02237810(BallRotation *param0); +void ov12_02237828(BallRotation *param0, int param1); +BOOL ov12_0223782C(BallRotation *param0, int param1); +void ov12_0223783C(BallRotation *param0); +void ov12_0223786C(BallRotation *param0, int param1); +int ov12_02237890(BallRotation *param0); +void ov12_02237E0C(BallRotation *param0, int param1); +void ov12_02237E18(BallRotation *param0, s16 param1, s16 param2); +void ov12_02237E24(BallRotation *param0, u16 param1); +void ov12_02237E30(BallRotation *param0, BOOL param1); +void ov12_02237E34(BallRotation *param0, int param1); +void ov12_02237E40(BallRotation *param0, int param1); +void ov12_02237E4C(BallRotation *param0, int param1); #endif // POKEPLATINUM_OV12_02235E94_H diff --git a/include/overlay012/ov12_02237E54.h b/include/overlay012/ov12_02237E54.h index f098dbaff7..99a4c4b984 100644 --- a/include/overlay012/ov12_02237E54.h +++ b/include/overlay012/ov12_02237E54.h @@ -4,7 +4,7 @@ #include "struct_defs/struct_0202CA64.h" int ov12_02237E54(s16 param0, s16 param1, s16 param2, s16 param3); -int ov12_02237E80(UnkStruct_0202CA64 * param0); -int ov12_02237EA0(UnkStruct_0202CA64 * param0); +int ov12_02237E80(UnkStruct_0202CA64 *param0); +int ov12_02237EA0(UnkStruct_0202CA64 *param0); #endif // POKEPLATINUM_OV12_02237E54_H diff --git a/include/overlay012/ov12_02237EFC.h b/include/overlay012/ov12_02237EFC.h index 71466bfa0f..56fd04598a 100644 --- a/include/overlay012/ov12_02237EFC.h +++ b/include/overlay012/ov12_02237EFC.h @@ -6,12 +6,12 @@ #include "overlay012/struct_ov12_02237F98_decl.h" #include "overlay012/struct_ov12_02238004_decl.h" -UnkStruct_ov12_02237F98 * ov12_02237EFC(int param0, UnkStruct_ov12_02237EFC * param1); -UnkStruct_ov12_02238004 * ov12_02237F38(UnkStruct_ov12_02237F98 * param0, UnkStruct_ov12_02237F38 * param1); -void ov12_02237F74(UnkStruct_ov12_02237F98 * param0); -void ov12_02237F98(UnkStruct_ov12_02237F98 * param0); -UnkStruct_ov12_02238004 * ov12_02237FC8(int param0, UnkStruct_ov12_02237F38 * param1); -void ov12_02238004(UnkStruct_ov12_02238004 * param0); -BOOL ov12_0223802C(UnkStruct_ov12_02238004 * param0); +UnkStruct_ov12_02237F98 *ov12_02237EFC(int param0, UnkStruct_ov12_02237EFC *param1); +UnkStruct_ov12_02238004 *ov12_02237F38(UnkStruct_ov12_02237F98 *param0, UnkStruct_ov12_02237F38 *param1); +void ov12_02237F74(UnkStruct_ov12_02237F98 *param0); +void ov12_02237F98(UnkStruct_ov12_02237F98 *param0); +UnkStruct_ov12_02238004 *ov12_02237FC8(int param0, UnkStruct_ov12_02237F38 *param1); +void ov12_02238004(UnkStruct_ov12_02238004 *param0); +BOOL ov12_0223802C(UnkStruct_ov12_02238004 *param0); #endif // POKEPLATINUM_OV12_02237EFC_H diff --git a/include/overlay012/ov12_022380BC.h b/include/overlay012/ov12_022380BC.h index 85e09d63e1..ec0091311b 100644 --- a/include/overlay012/ov12_022380BC.h +++ b/include/overlay012/ov12_022380BC.h @@ -3,10 +3,10 @@ #include "overlay012/struct_ov12_022380DC.h" -void ov12_022380BC(UnkStruct_ov12_022380DC * param0, int param1); -void ov12_022380CC(UnkStruct_ov12_022380DC * param0, int param1); -void ov12_022382BC(UnkStruct_ov12_022380DC * param0, int param1); -void ov12_02238390(UnkStruct_ov12_022380DC * param0, int param1); +void ov12_022380BC(UnkStruct_ov12_022380DC *param0, int param1); +void ov12_022380CC(UnkStruct_ov12_022380DC *param0, int param1); +void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int param1); +void ov12_02238390(UnkStruct_ov12_022380DC *param0, int param1); s16 ov12_022384CC(int param0, int param1); #endif // POKEPLATINUM_OV12_022380BC_H diff --git a/include/overlay012/struct_ov12_02223764.h b/include/overlay012/struct_ov12_02223764.h index 680e00f87a..54ad62ab77 100644 --- a/include/overlay012/struct_ov12_02223764.h +++ b/include/overlay012/struct_ov12_02223764.h @@ -1,20 +1,21 @@ #ifndef POKEPLATINUM_STRUCT_OV12_02223764_H #define POKEPLATINUM_STRUCT_OV12_02223764_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/cell_actor_data.h" -#include "overlay012/struct_ov12_02223764_sub1.h" +#include "struct_decls/sprite_decl.h" + #include "battle/struct_ov16_0223E0C8.h" +#include "overlay012/struct_ov12_02223764_sub1.h" typedef struct { int unk_00; int unk_04; UnkStruct_ov12_02223764_sub1 unk_08; int unk_14[4]; - CellActorData * unk_24[4]; - UnkStruct_ov16_0223E0C8 * unk_34[4]; + CellActorData *unk_24[4]; + UnkStruct_ov16_0223E0C8 *unk_34[4]; u8 unk_44[4]; - Sprite * unk_48[4]; + Sprite *unk_48[4]; } UnkStruct_ov12_02223764; #endif // POKEPLATINUM_STRUCT_OV12_02223764_H diff --git a/include/overlay012/struct_ov12_02223764_sub1.h b/include/overlay012/struct_ov12_02223764_sub1.h index e44a93a745..9ac5e719d7 100644 --- a/include/overlay012/struct_ov12_02223764_sub1.h +++ b/include/overlay012/struct_ov12_02223764_sub1.h @@ -6,9 +6,9 @@ #include "struct_decls/struct_0200C704_decl.h" typedef struct { - SpriteRenderer * unk_00; - SpriteGfxHandler * unk_04; - PaletteData * unk_08; + SpriteRenderer *unk_00; + SpriteGfxHandler *unk_04; + PaletteData *unk_08; } UnkStruct_ov12_02223764_sub1; #endif // POKEPLATINUM_STRUCT_OV12_02223764_SUB1_H diff --git a/include/overlay012/struct_ov12_02225640.h b/include/overlay012/struct_ov12_02225640.h index 0daac09039..12b848f66f 100644 --- a/include/overlay012/struct_ov12_02225640.h +++ b/include/overlay012/struct_ov12_02225640.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV12_02225640_H #define POKEPLATINUM_STRUCT_OV12_02225640_H +#include + #include "struct_decls/struct_02014014_decl.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include +#include "overlay012/struct_ov12_0221FCDC_decl.h" typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - UnkStruct_02014014 * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + UnkStruct_02014014 *unk_04; s8 unk_08; int unk_0C[6]; int unk_24; diff --git a/include/overlay012/struct_ov12_02226274.h b/include/overlay012/struct_ov12_02226274.h index 3438e9387c..0138115a04 100644 --- a/include/overlay012/struct_ov12_02226274.h +++ b/include/overlay012/struct_ov12_02226274.h @@ -2,15 +2,16 @@ #define POKEPLATINUM_STRUCT_OV12_02226274_H #include "struct_decls/cell_actor_data.h" -#include "overlay012/struct_ov12_02225F6C.h" + #include "overlay012/funcptr_ov12_02226274.h" +#include "overlay012/struct_ov12_02225F6C.h" typedef struct { s16 unk_00; s16 unk_02; UnkStruct_ov12_02225F6C unk_04[4]; UnkFuncPtr_ov12_02226274 unk_94; - CellActorData * unk_98[4]; + CellActorData *unk_98[4]; u16 unk_A8; u16 unk_AA; u8 unk_AC; diff --git a/include/overlay012/struct_ov12_0223595C.h b/include/overlay012/struct_ov12_0223595C.h index c35c26ac60..79382426b8 100644 --- a/include/overlay012/struct_ov12_0223595C.h +++ b/include/overlay012/struct_ov12_0223595C.h @@ -5,6 +5,7 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" + #include "overlay012/struct_ov12_0221FCDC_decl.h" typedef struct { @@ -12,12 +13,12 @@ typedef struct { u8 unk_01; u8 unk_02; u8 unk_03; - UnkStruct_ov12_0221FCDC * unk_04; - SpriteRenderer * unk_08; - SpriteGfxHandler * unk_0C; - SpriteGfxHandler * unk_10; - BGL * unk_14; - PaletteData * unk_18; + UnkStruct_ov12_0221FCDC *unk_04; + SpriteRenderer *unk_08; + SpriteGfxHandler *unk_0C; + SpriteGfxHandler *unk_10; + BGL *unk_14; + PaletteData *unk_18; } UnkStruct_ov12_0223595C; #endif // POKEPLATINUM_STRUCT_OV12_0223595C_H diff --git a/include/overlay012/struct_ov12_02235998.h b/include/overlay012/struct_ov12_02235998.h index 535f55cd85..8d4ce72e6e 100644 --- a/include/overlay012/struct_ov12_02235998.h +++ b/include/overlay012/struct_ov12_02235998.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_OV12_02235998_H #define POKEPLATINUM_STRUCT_OV12_02235998_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/cell_actor_data.h" +#include "struct_decls/sprite_decl.h" + #include "overlay012/struct_ov12_02235350.h" typedef struct { UnkStruct_ov12_02235350 unk_00; UnkStruct_ov12_02235350 unk_04; - Sprite * unk_08; - CellActorData * unk_0C; + Sprite *unk_08; + CellActorData *unk_0C; int unk_10; } UnkStruct_ov12_02235998; diff --git a/include/overlay012/struct_ov12_02236030.h b/include/overlay012/struct_ov12_02236030.h index 0228b1a1d2..b2240cc8bc 100644 --- a/include/overlay012/struct_ov12_02236030.h +++ b/include/overlay012/struct_ov12_02236030.h @@ -6,7 +6,7 @@ typedef struct { int unk_00; int unk_04; - Pokemon * unk_08; + Pokemon *unk_08; } UnkStruct_ov12_02236030; #endif // POKEPLATINUM_STRUCT_OV12_02236030_H diff --git a/include/overlay012/struct_ov12_02237728.h b/include/overlay012/struct_ov12_02237728.h index dcd20a38dc..b79bf7da3d 100644 --- a/include/overlay012/struct_ov12_02237728.h +++ b/include/overlay012/struct_ov12_02237728.h @@ -1,9 +1,9 @@ #ifndef POKEPLATINUM_STRUCT_OV12_02237728_H #define POKEPLATINUM_STRUCT_OV12_02237728_H +#include "struct_decls/battle_system.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" -#include "struct_decls/battle_system.h" typedef struct BallThrow { int type; diff --git a/include/overlay012/struct_ov12_022380DC.h b/include/overlay012/struct_ov12_022380DC.h index 03ef7d8c11..152b1e1abf 100644 --- a/include/overlay012/struct_ov12_022380DC.h +++ b/include/overlay012/struct_ov12_022380DC.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_STRUCT_OV12_022380DC_H #include "struct_decls/sprite_decl.h" + #include "battle/struct_ov16_0223E0C8.h" typedef struct { int unk_00; int unk_04; - UnkStruct_ov16_0223E0C8 * unk_08[4]; - Sprite * unk_18[4]; + UnkStruct_ov16_0223E0C8 *unk_08[4]; + Sprite *unk_18[4]; u16 unk_28[4]; u8 unk_30[4]; u8 unk_34[4]; diff --git a/include/overlay013/ov13_0221FC20.h b/include/overlay013/ov13_0221FC20.h index c9d1683028..b48d5e37a4 100644 --- a/include/overlay013/ov13_0221FC20.h +++ b/include/overlay013/ov13_0221FC20.h @@ -4,10 +4,10 @@ #include "overlay013/struct_ov13_0221FC20.h" #include "overlay013/struct_ov13_022213F0.h" -void ov13_0221FC20(UnkStruct_ov13_0221FC20 * param0); -u8 ov13_022213F0(UnkStruct_ov13_022213F0 * param0, s32 param1); -u8 ov13_0222196C(UnkStruct_ov13_022213F0 * param0); -u8 ov13_0222198C(UnkStruct_ov13_022213F0 * param0); -u8 ov13_022219AC(UnkStruct_ov13_022213F0 * param0, u8 param1); +void ov13_0221FC20(UnkStruct_ov13_0221FC20 *param0); +u8 ov13_022213F0(UnkStruct_ov13_022213F0 *param0, s32 param1); +u8 ov13_0222196C(UnkStruct_ov13_022213F0 *param0); +u8 ov13_0222198C(UnkStruct_ov13_022213F0 *param0); +u8 ov13_022219AC(UnkStruct_ov13_022213F0 *param0, u8 param1); #endif // POKEPLATINUM_OV13_0221FC20_H diff --git a/include/overlay013/ov13_02221A88.h b/include/overlay013/ov13_02221A88.h index c4e5979443..a374ffd566 100644 --- a/include/overlay013/ov13_02221A88.h +++ b/include/overlay013/ov13_02221A88.h @@ -3,18 +3,18 @@ #include "overlay013/struct_ov13_022213F0.h" -void ov13_02221A88(UnkStruct_ov13_022213F0 * param0); -void ov13_02221AC4(UnkStruct_ov13_022213F0 * param0, u32 param1); -void ov13_02221BB0(UnkStruct_ov13_022213F0 * param0); -void ov13_02221BC8(UnkStruct_ov13_022213F0 * param0); -void ov13_02221BF8(UnkStruct_ov13_022213F0 * param0, u32 param1); -void ov13_02223118(UnkStruct_ov13_022213F0 * param0); -void ov13_02223448(UnkStruct_ov13_022213F0 * param0, u8 param1); -void ov13_022234A8(UnkStruct_ov13_022213F0 * param0, u8 param1); -void ov13_02223F5C(UnkStruct_ov13_022213F0 * param0, u16 param1, u16 param2); -void ov13_022240E0(UnkStruct_ov13_022213F0 * param0); -void ov13_02224108(UnkStruct_ov13_022213F0 * param0); -void ov13_02224144(UnkStruct_ov13_022213F0 * param0); -void ov13_0222449C(UnkStruct_ov13_022213F0 * param0); +void ov13_02221A88(UnkStruct_ov13_022213F0 *param0); +void ov13_02221AC4(UnkStruct_ov13_022213F0 *param0, u32 param1); +void ov13_02221BB0(UnkStruct_ov13_022213F0 *param0); +void ov13_02221BC8(UnkStruct_ov13_022213F0 *param0); +void ov13_02221BF8(UnkStruct_ov13_022213F0 *param0, u32 param1); +void ov13_02223118(UnkStruct_ov13_022213F0 *param0); +void ov13_02223448(UnkStruct_ov13_022213F0 *param0, u8 param1); +void ov13_022234A8(UnkStruct_ov13_022213F0 *param0, u8 param1); +void ov13_02223F5C(UnkStruct_ov13_022213F0 *param0, u16 param1, u16 param2); +void ov13_022240E0(UnkStruct_ov13_022213F0 *param0); +void ov13_02224108(UnkStruct_ov13_022213F0 *param0); +void ov13_02224144(UnkStruct_ov13_022213F0 *param0); +void ov13_0222449C(UnkStruct_ov13_022213F0 *param0); #endif // POKEPLATINUM_OV13_02221A88_H diff --git a/include/overlay013/ov13_02224500.h b/include/overlay013/ov13_02224500.h index 2ce7057b8c..a5534d4855 100644 --- a/include/overlay013/ov13_02224500.h +++ b/include/overlay013/ov13_02224500.h @@ -3,12 +3,12 @@ #include "overlay013/struct_ov13_022213F0.h" -void ov13_02224500(UnkStruct_ov13_022213F0 * param0); -void ov13_02224970(UnkStruct_ov13_022213F0 * param0); -void ov13_02224B7C(UnkStruct_ov13_022213F0 * param0, u32 param1); -void ov13_022252E8(UnkStruct_ov13_022213F0 * param0); -void ov13_0222537C(UnkStruct_ov13_022213F0 * param0); -void ov13_0222563C(UnkStruct_ov13_022213F0 * param0, u8 param1); -void ov13_022256E8(UnkStruct_ov13_022213F0 * param0); +void ov13_02224500(UnkStruct_ov13_022213F0 *param0); +void ov13_02224970(UnkStruct_ov13_022213F0 *param0); +void ov13_02224B7C(UnkStruct_ov13_022213F0 *param0, u32 param1); +void ov13_022252E8(UnkStruct_ov13_022213F0 *param0); +void ov13_0222537C(UnkStruct_ov13_022213F0 *param0); +void ov13_0222563C(UnkStruct_ov13_022213F0 *param0, u8 param1); +void ov13_022256E8(UnkStruct_ov13_022213F0 *param0); #endif // POKEPLATINUM_OV13_02224500_H diff --git a/include/overlay013/ov13_02225710.h b/include/overlay013/ov13_02225710.h index b5d5364a8a..8d59dad260 100644 --- a/include/overlay013/ov13_02225710.h +++ b/include/overlay013/ov13_02225710.h @@ -3,12 +3,12 @@ #include "overlay013/struct_ov13_022213F0.h" -void ov13_02225710(UnkStruct_ov13_022213F0 * param0, u16 * param1); -void ov13_02225A3C(UnkStruct_ov13_022213F0 * param0, u16 * param1); -void ov13_02225FCC(UnkStruct_ov13_022213F0 * param0, u8 param1); -void ov13_0222601C(UnkStruct_ov13_022213F0 * param0); -void ov13_022260EC(UnkStruct_ov13_022213F0 * param0, u8 param1); -void ov13_02226444(UnkStruct_ov13_022213F0 * param0, u8 param1); -void ov13_022264C4(UnkStruct_ov13_022213F0 * param0); +void ov13_02225710(UnkStruct_ov13_022213F0 *param0, u16 *param1); +void ov13_02225A3C(UnkStruct_ov13_022213F0 *param0, u16 *param1); +void ov13_02225FCC(UnkStruct_ov13_022213F0 *param0, u8 param1); +void ov13_0222601C(UnkStruct_ov13_022213F0 *param0); +void ov13_022260EC(UnkStruct_ov13_022213F0 *param0, u8 param1); +void ov13_02226444(UnkStruct_ov13_022213F0 *param0, u8 param1); +void ov13_022264C4(UnkStruct_ov13_022213F0 *param0); #endif // POKEPLATINUM_OV13_02225710_H diff --git a/include/overlay013/ov13_022264F4.h b/include/overlay013/ov13_022264F4.h index bae60323aa..0d995a0a1f 100644 --- a/include/overlay013/ov13_022264F4.h +++ b/include/overlay013/ov13_022264F4.h @@ -4,7 +4,7 @@ #include "overlay013/struct_ov13_022264F4.h" #include "overlay013/struct_ov13_02227244.h" -void ov13_022264F4(UnkStruct_ov13_022264F4 * param0); -int ov13_02227244(UnkStruct_ov13_02227244 * param0); +void ov13_022264F4(UnkStruct_ov13_022264F4 *param0); +int ov13_02227244(UnkStruct_ov13_02227244 *param0); #endif // POKEPLATINUM_OV13_022264F4_H diff --git a/include/overlay013/ov13_02227288.h b/include/overlay013/ov13_02227288.h index 4a69dbb103..3d9f7d7280 100644 --- a/include/overlay013/ov13_02227288.h +++ b/include/overlay013/ov13_02227288.h @@ -3,14 +3,14 @@ #include "overlay013/struct_ov13_02227244.h" -void ov13_02227288(UnkStruct_ov13_02227244 * param0); -void ov13_022272AC(UnkStruct_ov13_02227244 * param0, u32 param1); -void ov13_02227324(UnkStruct_ov13_02227244 * param0); -void ov13_02227334(UnkStruct_ov13_02227244 * param0); -void ov13_02227350(UnkStruct_ov13_02227244 * param0, u32 param1); -void ov13_02227650(UnkStruct_ov13_02227244 * param0); -void ov13_02227698(UnkStruct_ov13_02227244 * param0); -void ov13_022279F4(UnkStruct_ov13_02227244 * param0); -void ov13_02227A1C(UnkStruct_ov13_02227244 * param0); +void ov13_02227288(UnkStruct_ov13_02227244 *param0); +void ov13_022272AC(UnkStruct_ov13_02227244 *param0, u32 param1); +void ov13_02227324(UnkStruct_ov13_02227244 *param0); +void ov13_02227334(UnkStruct_ov13_02227244 *param0); +void ov13_02227350(UnkStruct_ov13_02227244 *param0, u32 param1); +void ov13_02227650(UnkStruct_ov13_02227244 *param0); +void ov13_02227698(UnkStruct_ov13_02227244 *param0); +void ov13_022279F4(UnkStruct_ov13_02227244 *param0); +void ov13_02227A1C(UnkStruct_ov13_02227244 *param0); #endif // POKEPLATINUM_OV13_02227288_H diff --git a/include/overlay013/ov13_02227A4C.h b/include/overlay013/ov13_02227A4C.h index d4aa8d912a..9270414083 100644 --- a/include/overlay013/ov13_02227A4C.h +++ b/include/overlay013/ov13_02227A4C.h @@ -3,9 +3,9 @@ #include "overlay013/struct_ov13_02227244.h" -u8 ov13_02227A4C(UnkStruct_ov13_02227244 * param0); -void ov13_02227A7C(UnkStruct_ov13_02227244 * param0); -void ov13_02227AC8(UnkStruct_ov13_02227244 * param0); -u16 ov13_02227BA8(UnkStruct_ov13_02227244 * param0, u32 param1); +u8 ov13_02227A4C(UnkStruct_ov13_02227244 *param0); +void ov13_02227A7C(UnkStruct_ov13_02227244 *param0); +void ov13_02227AC8(UnkStruct_ov13_02227244 *param0); +u16 ov13_02227BA8(UnkStruct_ov13_02227244 *param0, u32 param1); #endif // POKEPLATINUM_OV13_02227A4C_H diff --git a/include/overlay013/ov13_02227BDC.h b/include/overlay013/ov13_02227BDC.h index 04c8ea5d83..0b0f94986b 100644 --- a/include/overlay013/ov13_02227BDC.h +++ b/include/overlay013/ov13_02227BDC.h @@ -3,11 +3,11 @@ #include "overlay013/struct_ov13_02227244.h" -void ov13_02227BDC(UnkStruct_ov13_02227244 * param0); -void ov13_02227E08(UnkStruct_ov13_02227244 * param0); -void ov13_02227E68(UnkStruct_ov13_02227244 * param0, u32 param1); -void ov13_02228008(UnkStruct_ov13_02227244 * param0, u8 param1); -void ov13_02228050(UnkStruct_ov13_02227244 * param0); -void ov13_022280F0(UnkStruct_ov13_02227244 * param0, u8 param1); +void ov13_02227BDC(UnkStruct_ov13_02227244 *param0); +void ov13_02227E08(UnkStruct_ov13_02227244 *param0); +void ov13_02227E68(UnkStruct_ov13_02227244 *param0, u32 param1); +void ov13_02228008(UnkStruct_ov13_02227244 *param0, u8 param1); +void ov13_02228050(UnkStruct_ov13_02227244 *param0); +void ov13_022280F0(UnkStruct_ov13_02227244 *param0, u8 param1); #endif // POKEPLATINUM_OV13_02227BDC_H diff --git a/include/overlay013/ov13_02228128.h b/include/overlay013/ov13_02228128.h index 7cd24f5e88..1f3c69eaef 100644 --- a/include/overlay013/ov13_02228128.h +++ b/include/overlay013/ov13_02228128.h @@ -3,9 +3,9 @@ #include "overlay013/struct_ov13_02227244.h" -void ov13_02228128(UnkStruct_ov13_02227244 * param0, u16 * param1); -void ov13_0222880C(UnkStruct_ov13_02227244 * param0, u8 param1, u8 param2); -void ov13_02228848(UnkStruct_ov13_02227244 * param0); -void ov13_02228924(UnkStruct_ov13_02227244 * param0, u8 param1); +void ov13_02228128(UnkStruct_ov13_02227244 *param0, u16 *param1); +void ov13_0222880C(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2); +void ov13_02228848(UnkStruct_ov13_02227244 *param0); +void ov13_02228924(UnkStruct_ov13_02227244 *param0, u8 param1); #endif // POKEPLATINUM_OV13_02228128_H diff --git a/include/overlay013/ov13_02228A38.h b/include/overlay013/ov13_02228A38.h index 1aa4d2aa6d..e7379b0bf3 100644 --- a/include/overlay013/ov13_02228A38.h +++ b/include/overlay013/ov13_02228A38.h @@ -2,19 +2,20 @@ #define POKEPLATINUM_OV13_02228A38_H #include "struct_defs/struct_020F1DB8.h" -#include "overlay013/struct_ov13_02228A50_decl.h" + #include "battle/struct_ov16_0226DC24_decl.h" +#include "overlay013/struct_ov13_02228A50_decl.h" -UnkStruct_ov13_02228A50 * ov13_02228A38(u32 param0); -void ov13_02228A50(UnkStruct_ov13_02228A50 * param0); -UnkStruct_ov16_0226DC24 * ov13_02228A58(UnkStruct_ov13_02228A50 * param0); -u8 ov13_02228A5C(UnkStruct_ov13_02228A50 * param0); -void ov13_02228A60(UnkStruct_ov13_02228A50 * param0, u8 param1); -void ov13_02228A64(UnkStruct_ov13_02228A50 * param0, UnkStruct_ov16_0226DC24 * param1); -void ov13_02228A68(UnkStruct_ov13_02228A50 * param0, u8 param1); -void ov13_02228A90(UnkStruct_ov13_02228A50 * param0); -void ov13_02228A9C(UnkStruct_ov13_02228A50 * param0, const ByteFlagSet * param1); -void ov13_02228AC8(UnkStruct_ov13_02228A50 * param0, u32 param1); -u32 ov13_02228B64(UnkStruct_ov13_02228A50 * param0); +UnkStruct_ov13_02228A50 *ov13_02228A38(u32 param0); +void ov13_02228A50(UnkStruct_ov13_02228A50 *param0); +UnkStruct_ov16_0226DC24 *ov13_02228A58(UnkStruct_ov13_02228A50 *param0); +u8 ov13_02228A5C(UnkStruct_ov13_02228A50 *param0); +void ov13_02228A60(UnkStruct_ov13_02228A50 *param0, u8 param1); +void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, UnkStruct_ov16_0226DC24 *param1); +void ov13_02228A68(UnkStruct_ov13_02228A50 *param0, u8 param1); +void ov13_02228A90(UnkStruct_ov13_02228A50 *param0); +void ov13_02228A9C(UnkStruct_ov13_02228A50 *param0, const ByteFlagSet *param1); +void ov13_02228AC8(UnkStruct_ov13_02228A50 *param0, u32 param1); +u32 ov13_02228B64(UnkStruct_ov13_02228A50 *param0); #endif // POKEPLATINUM_OV13_02228A38_H diff --git a/include/overlay013/struct_ov13_0221FC20.h b/include/overlay013/struct_ov13_0221FC20.h index 3411ec09b8..b922269fb7 100644 --- a/include/overlay013/struct_ov13_0221FC20.h +++ b/include/overlay013/struct_ov13_0221FC20.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV13_0221FC20_H #define POKEPLATINUM_STRUCT_OV13_0221FC20_H -#include "struct_decls/struct_party_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/struct_party_decl.h" typedef struct { - Party * unk_00; - void * unk_04; - BattleSystem * unk_08; + Party *unk_00; + void *unk_04; + BattleSystem *unk_08; u32 unk_0C; u8 unk_10; u8 unk_11; diff --git a/include/overlay013/struct_ov13_022213F0.h b/include/overlay013/struct_ov13_022213F0.h index 57bbc6b032..d805ee55c4 100644 --- a/include/overlay013/struct_ov13_022213F0.h +++ b/include/overlay013/struct_ov13_022213F0.h @@ -1,24 +1,26 @@ #ifndef POKEPLATINUM_STRUCT_OV13_022213F0_H #define POKEPLATINUM_STRUCT_OV13_022213F0_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02002F38_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay013/struct_ov13_0221FC20.h" #include "overlay013/struct_ov13_02221ED0.h" #include "overlay013/struct_ov13_02228A50_decl.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" + typedef struct { - UnkStruct_ov13_0221FC20 * unk_00; + UnkStruct_ov13_0221FC20 *unk_00; UnkStruct_ov13_02221ED0 unk_04[6]; - BGL * unk_1E0; - PaletteData * unk_1E4; + BGL *unk_1E0; + PaletteData *unk_1E4; u16 unk_1E8[4][96]; u16 unk_4E8[4][96]; u16 unk_7E8[4][65]; @@ -37,14 +39,14 @@ typedef struct { u8 unk_1F9F_0 : 4; u8 unk_1F9F_4 : 3; u8 unk_1F9F_7 : 1; - UnkStruct_0200C440 * unk_1FA0; - MessageLoader * unk_1FA4; - StringTemplate * unk_1FA8; - Strbuf* unk_1FAC; - SpriteGfxHandler * unk_1FB0; - CellActorData * unk_1FB4[38]; + UnkStruct_0200C440 *unk_1FA0; + MessageLoader *unk_1FA4; + StringTemplate *unk_1FA8; + Strbuf *unk_1FAC; + SpriteGfxHandler *unk_1FB0; + CellActorData *unk_1FB4[38]; Window unk_204C[2]; - Window * unk_206C; + Window *unk_206C; u8 unk_2070; u8 unk_2071; u8 unk_2072; @@ -58,7 +60,7 @@ typedef struct { u8 unk_2079; u16 unk_207A; u16 unk_207C[4]; - UnkStruct_ov13_02228A50 * unk_2084; + UnkStruct_ov13_02228A50 *unk_2084; u8 unk_2088; u8 unk_2089; u8 unk_208A; diff --git a/include/overlay013/struct_ov13_02221ED0.h b/include/overlay013/struct_ov13_02221ED0.h index f15999867d..66edaaecbd 100644 --- a/include/overlay013/struct_ov13_02221ED0.h +++ b/include/overlay013/struct_ov13_02221ED0.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV13_02221ED0_H #define POKEPLATINUM_STRUCT_OV13_02221ED0_H -#include "pokemon.h" #include "overlay013/struct_ov13_022236B8.h" +#include "pokemon.h" + typedef struct { - Pokemon * unk_00; + Pokemon *unk_00; u16 unk_04; u16 unk_06; u16 unk_08; diff --git a/include/overlay013/struct_ov13_022264F4.h b/include/overlay013/struct_ov13_022264F4.h index 40fbc01659..38ac70d9a8 100644 --- a/include/overlay013/struct_ov13_022264F4.h +++ b/include/overlay013/struct_ov13_022264F4.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV13_022264F4_H #define POKEPLATINUM_STRUCT_OV13_022264F4_H -#include "trainer_info.h" #include "struct_decls/battle_system.h" + #include "bag.h" +#include "trainer_info.h" typedef struct { - BattleSystem * unk_00; - TrainerInfo * unk_04; - Bag * unk_08; + BattleSystem *unk_00; + TrainerInfo *unk_04; + Bag *unk_08; u32 unk_0C; s32 unk_10; u32 unk_14; diff --git a/include/overlay013/struct_ov13_02227244.h b/include/overlay013/struct_ov13_02227244.h index 64d32e1672..6bb0f7ddda 100644 --- a/include/overlay013/struct_ov13_02227244.h +++ b/include/overlay013/struct_ov13_02227244.h @@ -1,38 +1,40 @@ #ifndef POKEPLATINUM_STRUCT_OV13_02227244_H #define POKEPLATINUM_STRUCT_OV13_02227244_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02002F38_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" -#include "bag.h" + +#include "battle/struct_ov16_0226DEEC_decl.h" #include "overlay013/struct_ov13_022264F4.h" #include "overlay013/struct_ov13_02228A50_decl.h" -#include "battle/struct_ov16_0226DEEC_decl.h" + +#include "bag.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" typedef struct { - UnkStruct_ov13_022264F4 * unk_00; - BGL * unk_04; - PaletteData * unk_08; - UnkStruct_0200C440 * unk_0C; - MessageLoader * unk_10; - StringTemplate * unk_14; - Strbuf* unk_18; + UnkStruct_ov13_022264F4 *unk_00; + BGL *unk_04; + PaletteData *unk_08; + UnkStruct_0200C440 *unk_0C; + MessageLoader *unk_10; + StringTemplate *unk_14; + Strbuf *unk_18; Window unk_1C; - Window * unk_2C; + Window *unk_2C; u8 unk_30; u8 unk_31; u8 unk_32; - UnkStruct_ov13_02228A50 * unk_34; - UnkStruct_ov16_0226DEEC * unk_38; + UnkStruct_ov13_02228A50 *unk_34; + UnkStruct_ov16_0226DEEC *unk_38; BagItem unk_3C[5][36]; - SpriteGfxHandler * unk_30C; - CellActorData * unk_310[6]; + SpriteGfxHandler *unk_30C; + CellActorData *unk_310[6]; u16 unk_328[3][144]; u16 unk_688[4][130]; u16 unk_A98[3][25]; diff --git a/include/overlay017/ov17_0223B140.h b/include/overlay017/ov17_0223B140.h index 2742895979..07d7e3cbdc 100644 --- a/include/overlay017/ov17_0223B140.h +++ b/include/overlay017/ov17_0223B140.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_OV17_0223B140_H #define POKEPLATINUM_OV17_0223B140_H -#include "overlay_manager.h" #include "overlay017/struct_ov17_02246F24.h" -int ov17_0223B140(OverlayManager * param0, int * param1); -int ov17_0223B444(OverlayManager * param0, int * param1); -int ov17_0223B580(OverlayManager * param0, int * param1); -void ov17_0223BB14(UnkStruct_ov17_02246F24 * param0, int param1, int param2); +#include "overlay_manager.h" + +int ov17_0223B140(OverlayManager *param0, int *param1); +int ov17_0223B444(OverlayManager *param0, int *param1); +int ov17_0223B580(OverlayManager *param0, int *param1); +void ov17_0223BB14(UnkStruct_ov17_02246F24 *param0, int param1, int param2); #endif // POKEPLATINUM_OV17_0223B140_H diff --git a/include/overlay017/ov17_0223CB1C.h b/include/overlay017/ov17_0223CB1C.h index f10ad7d1cc..e64366d9a1 100644 --- a/include/overlay017/ov17_0223CB1C.h +++ b/include/overlay017/ov17_0223CB1C.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV17_0223CB1C_H #define POKEPLATINUM_OV17_0223CB1C_H +#include "overlay_manager.h" -int ov17_0223CB1C(OverlayManager * param0, int * param1); -int ov17_0223CDDC(OverlayManager * param0, int * param1); -int ov17_0223CF8C(OverlayManager * param0, int * param1); +int ov17_0223CB1C(OverlayManager *param0, int *param1); +int ov17_0223CDDC(OverlayManager *param0, int *param1); +int ov17_0223CF8C(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV17_0223CB1C_H diff --git a/include/overlay017/ov17_0223DAD0.h b/include/overlay017/ov17_0223DAD0.h index 416e1b701b..0fc520521c 100644 --- a/include/overlay017/ov17_0223DAD0.h +++ b/include/overlay017/ov17_0223DAD0.h @@ -3,9 +3,9 @@ #include "overlay_manager.h" -int ov17_0223DAD0(OverlayManager * param0, int * param1); -int ov17_0223DDD4(OverlayManager * param0, int * param1); -int ov17_0223DF0C(OverlayManager * param0, int * param1); +int ov17_0223DAD0(OverlayManager *param0, int *param1); +int ov17_0223DDD4(OverlayManager *param0, int *param1); +int ov17_0223DF0C(OverlayManager *param0, int *param1); int ov17_0223F0BC(int param0, int param1); #endif // POKEPLATINUM_OV17_0223DAD0_H diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h index d8a708022b..948b16c9d4 100644 --- a/include/overlay017/ov17_0223F118.h +++ b/include/overlay017/ov17_0223F118.h @@ -6,27 +6,29 @@ #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02095C48.h" + #include "overlay017/struct_ov17_0223F2E4.h" #include "overlay017/struct_ov17_0223F6E8.h" #include "overlay017/struct_ov17_0223F744.h" -GenericPointerData * ov17_0223F140(int param0); -void ov17_0223F1E0(GenericPointerData * param0); -void ov17_0223F1E8(int param0, BGL * param1, SpriteGfxHandler * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); -void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 * param0); -void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 * param0, int param1, int param2, int param3); -Strbuf* ov17_0223F310(u32 param0, u32 param1); -void ov17_0223F334(UnkStruct_02095C48 * param0, int param1); -void ov17_0223F374(UnkStruct_02095C48 * param0); -void ov17_0223F560(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, int param4, int param5, int param6); -void ov17_0223F5E8(SpriteGfxHandler * param0, int param1, int param2, int param3, int param4); -void ov17_0223F630(UnkStruct_ov17_0223F6E8 * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10); -void ov17_0223F6C4(UnkStruct_ov17_0223F6E8 * param0); -UnkStruct_ov17_0223F744 * ov17_0223F70C(int param0, PaletteData * param1, const u16 * param2, int param3, int param4, u32 param5); -void ov17_0223F744(UnkStruct_ov17_0223F744 * param0); +#include "strbuf.h" + +GenericPointerData *ov17_0223F140(int param0); +void ov17_0223F1E0(GenericPointerData *param0); +void ov17_0223F1E8(int param0, BGL *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); +void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 *param0); +void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 *param0, int param1, int param2, int param3); +Strbuf *ov17_0223F310(u32 param0, u32 param1); +void ov17_0223F334(UnkStruct_02095C48 *param0, int param1); +void ov17_0223F374(UnkStruct_02095C48 *param0); +void ov17_0223F560(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, int param4, int param5, int param6); +void ov17_0223F5E8(SpriteGfxHandler *param0, int param1, int param2, int param3, int param4); +void ov17_0223F630(UnkStruct_ov17_0223F6E8 *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10); +void ov17_0223F6C4(UnkStruct_ov17_0223F6E8 *param0); +UnkStruct_ov17_0223F744 *ov17_0223F70C(int param0, PaletteData *param1, const u16 *param2, int param3, int param4, u32 param5); +void ov17_0223F744(UnkStruct_ov17_0223F744 *param0); BOOL ov17_0223F760(void); #endif // POKEPLATINUM_OV17_0223F118_H diff --git a/include/overlay017/ov17_0223F7E4.h b/include/overlay017/ov17_0223F7E4.h index d6918cab20..9401fba0cd 100644 --- a/include/overlay017/ov17_0223F7E4.h +++ b/include/overlay017/ov17_0223F7E4.h @@ -3,17 +3,18 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02095C48.h" + #include "overlay017/struct_ov17_0223F7E4_decl.h" #include "overlay017/struct_ov17_0223F88C.h" #include "overlay017/struct_ov17_022472F8.h" -void ov17_0223F80C(BGL * param0); -void ov17_0223F864(BGL * param0); -void * ov17_0223F88C(UnkStruct_02095C48 * param0, UnkStruct_ov17_0223F88C * param1, UnkStruct_ov17_022472F8 * param2); -void ov17_0223F960(UnkStruct_ov17_0223F7E4 * param0); -void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2, void * param3); -int ov17_0223FAF8(UnkStruct_ov17_0223F7E4 * param0); -BOOL ov17_0223FBC0(UnkStruct_ov17_0223F7E4 * param0); -void ov17_02240A80(UnkStruct_ov17_0223F7E4 * param0, u16 param1[]); +void ov17_0223F80C(BGL *param0); +void ov17_0223F864(BGL *param0); +void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1, UnkStruct_ov17_022472F8 *param2); +void ov17_0223F960(UnkStruct_ov17_0223F7E4 *param0); +void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void *param3); +int ov17_0223FAF8(UnkStruct_ov17_0223F7E4 *param0); +BOOL ov17_0223FBC0(UnkStruct_ov17_0223F7E4 *param0); +void ov17_02240A80(UnkStruct_ov17_0223F7E4 *param0, u16 param1[]); #endif // POKEPLATINUM_OV17_0223F7E4_H diff --git a/include/overlay017/ov17_02241270.h b/include/overlay017/ov17_02241270.h index 1b8aaef5c3..3fbc832ce2 100644 --- a/include/overlay017/ov17_02241270.h +++ b/include/overlay017/ov17_02241270.h @@ -1,18 +1,18 @@ #ifndef POKEPLATINUM_OV17_02241270_H #define POKEPLATINUM_OV17_02241270_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" -void ov17_02241270(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -CellActorData * ov17_022412C0(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2); -void ov17_022412F0(SpriteGfxHandler * param0); -void ov17_02241314(CellActorData * param0); -void ov17_0224131C(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -CellActorData * ov17_0224136C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4); -void ov17_022413AC(CellActorData * param0); -void ov17_022413B4(SpriteGfxHandler * param0); +void ov17_02241270(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +CellActorData *ov17_022412C0(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2); +void ov17_022412F0(SpriteGfxHandler *param0); +void ov17_02241314(CellActorData *param0); +void ov17_0224131C(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +CellActorData *ov17_0224136C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, int param4); +void ov17_022413AC(CellActorData *param0); +void ov17_022413B4(SpriteGfxHandler *param0); #endif // POKEPLATINUM_OV17_02241270_H diff --git a/include/overlay017/ov17_022413D8.h b/include/overlay017/ov17_022413D8.h index ce601fa134..1f5e495752 100644 --- a/include/overlay017/ov17_022413D8.h +++ b/include/overlay017/ov17_022413D8.h @@ -6,6 +6,7 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_defs/struct_02095C48.h" + #include "overlay017/struct_ov17_0223F88C.h" #include "overlay017/struct_ov17_0224145C.h" #include "overlay017/struct_ov17_0224365C.h" @@ -15,60 +16,60 @@ #include "overlay017/struct_ov17_022472F8.h" void ov17_022413D8(void); -void ov17_022413E4(UnkStruct_ov17_02246F24 * param0, int param1, int param2); -void ov17_02241428(UnkStruct_ov17_02246F24 * param0); -UnkStruct_ov17_0224145C * ov17_0224145C(UnkStruct_ov17_02246F24 * param0, int param1); -void ov17_02241494(UnkStruct_ov17_0224145C * param0); -void ov17_022414B0(UnkStruct_ov17_0224145C * param0); -BOOL ov17_022414BC(UnkStruct_ov17_0224145C * param0); -void ov17_02241524(UnkStruct_ov17_0223F88C * param0, int param1); -void ov17_022415E4(UnkStruct_ov17_0223F88C * param0); -void ov17_022416E4(UnkStruct_ov17_0223F88C * param0); -void ov17_02241928(UnkStruct_ov17_0223F88C * param0, UnkStruct_02095C48 * param1, NARC * param2); -void ov17_0224197C(UnkStruct_ov17_0223F88C * param0); -void ov17_022419AC(PaletteData * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, NARC * param3); -void ov17_02241A00(SpriteGfxHandler * param0); -void ov17_02241A24(UnkStruct_ov17_0223F88C * param0); -void ov17_02241A64(UnkStruct_ov17_0223F88C * param0); -void ov17_02241A8C(UnkStruct_ov17_0223F88C * param0, int param1, int param2); -void ov17_02241B1C(UnkStruct_ov17_0223F88C * param0); -void ov17_02241B3C(UnkStruct_ov17_02246F24 * param0, int param1, int param2, u8 * param3); -void ov17_02241D94(UnkStruct_ov17_0223F88C * param0, int param1, NARC * param2); -void ov17_02241E24(UnkStruct_ov17_0223F88C * param0); -void ov17_02241E58(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_02241EA4(SpriteGfxHandler * param0); -void ov17_02241EF0(UnkStruct_ov17_0223F88C * param0); -void ov17_02241F34(UnkStruct_ov17_0223F88C * param0, int param1, int param2, int param3); -void ov17_02242154(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_022421E0(SpriteGfxHandler * param0); -void ov17_02242248(UnkStruct_ov17_0223F88C * param0); -BOOL ov17_022424A8(UnkStruct_ov17_0223F88C * param0, int param1); -void ov17_022424D4(UnkStruct_ov17_0223F88C * param0, int param1, int param2); -void ov17_022426E8(UnkStruct_ov17_02246F24 * param0, int param1, u8 * param2); -void ov17_02242DA8(UnkStruct_ov17_02246F24 * param0); -void ov17_02242E5C(UnkStruct_ov17_02246F24 * param0, u32 param1, const UnkStruct_ov17_022449B8 * param2, const void * param3); -void ov17_02242E9C(UnkStruct_ov17_02246F24 * param0, int param1, int param2, const UnkStruct_ov17_022449B8 * param3, const void * param4); -int ov17_02242ECC(UnkStruct_ov17_02246F24 * param0); -void ov17_02242EE4(UnkStruct_ov17_02246F24 * param0, int param1); -void ov17_02242FA4(UnkStruct_ov17_02246F24 * param0); -void ov17_02242FC0(UnkStruct_ov17_02246F24 * param0); -void ov17_02242FE8(UnkStruct_ov17_02246F24 * param0); -void ov17_02243040(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_0224308C(SpriteGfxHandler * param0); -void ov17_022430AC(UnkStruct_ov17_0223F88C * param0, int param1, int param2); -void ov17_022430F8(UnkStruct_ov17_0223F88C * param0); -void ov17_02243120(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_022449B8 * param1, int param2); -u32 ov17_0224314C(int param0, int param1, UnkStruct_ov17_022449B8 * param2); +void ov17_022413E4(UnkStruct_ov17_02246F24 *param0, int param1, int param2); +void ov17_02241428(UnkStruct_ov17_02246F24 *param0); +UnkStruct_ov17_0224145C *ov17_0224145C(UnkStruct_ov17_02246F24 *param0, int param1); +void ov17_02241494(UnkStruct_ov17_0224145C *param0); +void ov17_022414B0(UnkStruct_ov17_0224145C *param0); +BOOL ov17_022414BC(UnkStruct_ov17_0224145C *param0); +void ov17_02241524(UnkStruct_ov17_0223F88C *param0, int param1); +void ov17_022415E4(UnkStruct_ov17_0223F88C *param0); +void ov17_022416E4(UnkStruct_ov17_0223F88C *param0); +void ov17_02241928(UnkStruct_ov17_0223F88C *param0, UnkStruct_02095C48 *param1, NARC *param2); +void ov17_0224197C(UnkStruct_ov17_0223F88C *param0); +void ov17_022419AC(PaletteData *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, NARC *param3); +void ov17_02241A00(SpriteGfxHandler *param0); +void ov17_02241A24(UnkStruct_ov17_0223F88C *param0); +void ov17_02241A64(UnkStruct_ov17_0223F88C *param0); +void ov17_02241A8C(UnkStruct_ov17_0223F88C *param0, int param1, int param2); +void ov17_02241B1C(UnkStruct_ov17_0223F88C *param0); +void ov17_02241B3C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, u8 *param3); +void ov17_02241D94(UnkStruct_ov17_0223F88C *param0, int param1, NARC *param2); +void ov17_02241E24(UnkStruct_ov17_0223F88C *param0); +void ov17_02241E58(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_02241EA4(SpriteGfxHandler *param0); +void ov17_02241EF0(UnkStruct_ov17_0223F88C *param0); +void ov17_02241F34(UnkStruct_ov17_0223F88C *param0, int param1, int param2, int param3); +void ov17_02242154(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_022421E0(SpriteGfxHandler *param0); +void ov17_02242248(UnkStruct_ov17_0223F88C *param0); +BOOL ov17_022424A8(UnkStruct_ov17_0223F88C *param0, int param1); +void ov17_022424D4(UnkStruct_ov17_0223F88C *param0, int param1, int param2); +void ov17_022426E8(UnkStruct_ov17_02246F24 *param0, int param1, u8 *param2); +void ov17_02242DA8(UnkStruct_ov17_02246F24 *param0); +void ov17_02242E5C(UnkStruct_ov17_02246F24 *param0, u32 param1, const UnkStruct_ov17_022449B8 *param2, const void *param3); +void ov17_02242E9C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, const UnkStruct_ov17_022449B8 *param3, const void *param4); +int ov17_02242ECC(UnkStruct_ov17_02246F24 *param0); +void ov17_02242EE4(UnkStruct_ov17_02246F24 *param0, int param1); +void ov17_02242FA4(UnkStruct_ov17_02246F24 *param0); +void ov17_02242FC0(UnkStruct_ov17_02246F24 *param0); +void ov17_02242FE8(UnkStruct_ov17_02246F24 *param0); +void ov17_02243040(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_0224308C(SpriteGfxHandler *param0); +void ov17_022430AC(UnkStruct_ov17_0223F88C *param0, int param1, int param2); +void ov17_022430F8(UnkStruct_ov17_0223F88C *param0); +void ov17_02243120(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_022449B8 *param1, int param2); +u32 ov17_0224314C(int param0, int param1, UnkStruct_ov17_022449B8 *param2); int ov17_02243174(int param0); -void ov17_022431A0(UnkStruct_ov17_02246F24 * param0, int param1, u8 param2, int param3, int param4, u8 * param5); -void ov17_0224331C(UnkStruct_ov17_02246F24 * param0, int param1, int param2, u8 * param3, UnkStruct_ov17_0224145C * param4); -UnkStruct_ov17_0224365C * ov17_0224365C(UnkStruct_ov17_02246F24 * param0, int param1); -void ov17_02243690(UnkStruct_ov17_0224365C * param0); -void ov17_022436D0(UnkStruct_ov17_02246F24 * param0, int param1, int param2, int param3, u8 * param4); +void ov17_022431A0(UnkStruct_ov17_02246F24 *param0, int param1, u8 param2, int param3, int param4, u8 *param5); +void ov17_0224331C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, u8 *param3, UnkStruct_ov17_0224145C *param4); +UnkStruct_ov17_0224365C *ov17_0224365C(UnkStruct_ov17_02246F24 *param0, int param1); +void ov17_02243690(UnkStruct_ov17_0224365C *param0); +void ov17_022436D0(UnkStruct_ov17_02246F24 *param0, int param1, int param2, int param3, u8 *param4); u32 ov17_02243944(int param0); u32 ov17_02243970(int param0); u32 ov17_0224399C(int param0); -void ov17_022439C8(UnkStruct_02095C48 * param0, int param1, int param2, UnkStruct_ov17_022439C8 * param3); -int ov17_02243A98(UnkStruct_ov17_022472F8 * param0, int param1, int param2); +void ov17_022439C8(UnkStruct_02095C48 *param0, int param1, int param2, UnkStruct_ov17_022439C8 *param3); +int ov17_02243A98(UnkStruct_ov17_022472F8 *param0, int param1, int param2); #endif // POKEPLATINUM_OV17_022413D8_H diff --git a/include/overlay017/ov17_02243AC4.h b/include/overlay017/ov17_02243AC4.h index 99a15f0a61..ce25b136df 100644 --- a/include/overlay017/ov17_02243AC4.h +++ b/include/overlay017/ov17_02243AC4.h @@ -3,9 +3,9 @@ #include "overlay017/struct_ov17_022472F8.h" -int ov17_02243AC4(UnkStruct_ov17_022472F8 * param0, int param1); +int ov17_02243AC4(UnkStruct_ov17_022472F8 *param0, int param1); int ov17_02243AE4(int param0); int ov17_02243AF0(int param0, int param1, int param2, int param3); -void ov17_02243B0C(UnkStruct_ov17_022472F8 * param0); +void ov17_02243B0C(UnkStruct_ov17_022472F8 *param0); #endif // POKEPLATINUM_OV17_02243AC4_H diff --git a/include/overlay017/ov17_02243C28.h b/include/overlay017/ov17_02243C28.h index 0139060f6c..ed8e63fb8e 100644 --- a/include/overlay017/ov17_02243C28.h +++ b/include/overlay017/ov17_02243C28.h @@ -3,6 +3,6 @@ #include "overlay017/struct_ov17_02246F24.h" -void ov17_02243C28(UnkStruct_ov17_02246F24 * param0); +void ov17_02243C28(UnkStruct_ov17_02246F24 *param0); #endif // POKEPLATINUM_OV17_02243C28_H diff --git a/include/overlay017/ov17_02245F14.h b/include/overlay017/ov17_02245F14.h index ed82a18eb8..34aba88380 100644 --- a/include/overlay017/ov17_02245F14.h +++ b/include/overlay017/ov17_02245F14.h @@ -5,19 +5,19 @@ #include "overlay017/struct_ov17_02246540.h" #include "overlay017/struct_ov17_02246F24.h" -void ov17_02245F44(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1); -void ov17_02245FB4(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2); -void ov17_02246018(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2); -void ov17_02246044(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1); -void ov17_022460C8(UnkStruct_ov17_02246540 * param0); -void ov17_022460DC(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2); -void ov17_02246138(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2); -void ov17_02246160(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3); -void ov17_02246228(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3); -BOOL ov17_022462A4(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3); -BOOL ov17_02246304(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3); -BOOL ov17_02246364(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3); -void ov17_022463C4(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, UnkStruct_ov17_022463C4 * param3); -void ov17_02246518(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, UnkStruct_ov17_022463C4 * param3); +void ov17_02245F44(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1); +void ov17_02245FB4(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2); +void ov17_02246018(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2); +void ov17_02246044(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1); +void ov17_022460C8(UnkStruct_ov17_02246540 *param0); +void ov17_022460DC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2); +void ov17_02246138(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2); +void ov17_02246160(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3); +void ov17_02246228(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3); +BOOL ov17_022462A4(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3); +BOOL ov17_02246304(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3); +BOOL ov17_02246364(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3); +void ov17_022463C4(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, UnkStruct_ov17_022463C4 *param3); +void ov17_02246518(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, UnkStruct_ov17_022463C4 *param3); #endif // POKEPLATINUM_OV17_02245F14_H diff --git a/include/overlay017/ov17_02246ECC.h b/include/overlay017/ov17_02246ECC.h index bd96292ab4..51636fe2d4 100644 --- a/include/overlay017/ov17_02246ECC.h +++ b/include/overlay017/ov17_02246ECC.h @@ -4,6 +4,6 @@ #include "overlay017/struct_ov17_0223BE58.h" #include "overlay017/struct_ov17_02246F24.h" -void ov17_02246ECC(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BE58 * param1); +void ov17_02246ECC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BE58 *param1); #endif // POKEPLATINUM_OV17_02246ECC_H diff --git a/include/overlay017/ov17_022476F8.h b/include/overlay017/ov17_022476F8.h index 7a328d90dc..3e33e35389 100644 --- a/include/overlay017/ov17_022476F8.h +++ b/include/overlay017/ov17_022476F8.h @@ -4,18 +4,19 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" + #include "overlay017/struct_ov17_022476F8.h" #include "overlay017/struct_ov17_0224792C.h" #include "overlay017/struct_ov17_02247A48.h" -void ov17_022476F8(UnkStruct_ov17_022476F8 * param0, int param1); -void ov17_02247734(UnkStruct_ov17_022476F8 * param0); -void ov17_0224774C(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_02247798(SpriteGfxHandler * param0); -void ov17_022477B8(UnkStruct_ov17_02247A48 * param0, int param1, int param2, fx32 param3, int param4); -void ov17_022478D0(UnkStruct_ov17_02247A48 * param0, int param1); -void ov17_02247918(UnkStruct_ov17_02247A48 * param0); -void ov17_02247A08(UnkStruct_ov17_02247A48 * param0, u32 param1, const UnkStruct_ov17_0224792C * param2); -int ov17_02247A3C(UnkStruct_ov17_02247A48 * param0); +void ov17_022476F8(UnkStruct_ov17_022476F8 *param0, int param1); +void ov17_02247734(UnkStruct_ov17_022476F8 *param0); +void ov17_0224774C(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_02247798(SpriteGfxHandler *param0); +void ov17_022477B8(UnkStruct_ov17_02247A48 *param0, int param1, int param2, fx32 param3, int param4); +void ov17_022478D0(UnkStruct_ov17_02247A48 *param0, int param1); +void ov17_02247918(UnkStruct_ov17_02247A48 *param0); +void ov17_02247A08(UnkStruct_ov17_02247A48 *param0, u32 param1, const UnkStruct_ov17_0224792C *param2); +int ov17_02247A3C(UnkStruct_ov17_02247A48 *param0); #endif // POKEPLATINUM_OV17_022476F8_H diff --git a/include/overlay017/ov17_02247A48.h b/include/overlay017/ov17_02247A48.h index bc00553d69..671417a640 100644 --- a/include/overlay017/ov17_02247A48.h +++ b/include/overlay017/ov17_02247A48.h @@ -3,6 +3,6 @@ #include "overlay017/struct_ov17_02247A48.h" -void ov17_02247A48(UnkStruct_ov17_02247A48 * param0); +void ov17_02247A48(UnkStruct_ov17_02247A48 *param0); #endif // POKEPLATINUM_OV17_02247A48_H diff --git a/include/overlay017/ov17_022492DC.h b/include/overlay017/ov17_022492DC.h index 7ce65dcc81..4bc767a191 100644 --- a/include/overlay017/ov17_022492DC.h +++ b/include/overlay017/ov17_022492DC.h @@ -3,18 +3,19 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02095C48.h" + #include "overlay017/struct_ov17_022492DC_decl.h" #include "overlay017/struct_ov17_0224A1EC.h" -void ov17_02249300(BGL * param0); -void ov17_02249358(BGL * param0); -void * ov17_02249380(UnkStruct_02095C48 * param0, UnkStruct_ov17_0224A1EC * param1); -void ov17_022493A4(UnkStruct_ov17_022492DC * param0); -void ov17_022493C4(UnkStruct_ov17_022492DC * param0); -void ov17_02249640(UnkStruct_ov17_022492DC * param0, int param1, int param2, void * param3); -int ov17_02249760(UnkStruct_ov17_022492DC * param0); -BOOL ov17_02249804(UnkStruct_ov17_022492DC * param0); -int ov17_02249814(UnkStruct_ov17_022492DC * param0); -void ov17_0224A0E0(UnkStruct_ov17_022492DC * param0, u16 param1, u8 param2); +void ov17_02249300(BGL *param0); +void ov17_02249358(BGL *param0); +void *ov17_02249380(UnkStruct_02095C48 *param0, UnkStruct_ov17_0224A1EC *param1); +void ov17_022493A4(UnkStruct_ov17_022492DC *param0); +void ov17_022493C4(UnkStruct_ov17_022492DC *param0); +void ov17_02249640(UnkStruct_ov17_022492DC *param0, int param1, int param2, void *param3); +int ov17_02249760(UnkStruct_ov17_022492DC *param0); +BOOL ov17_02249804(UnkStruct_ov17_022492DC *param0); +int ov17_02249814(UnkStruct_ov17_022492DC *param0); +void ov17_0224A0E0(UnkStruct_ov17_022492DC *param0, u16 param1, u8 param2); #endif // POKEPLATINUM_OV17_022492DC_H diff --git a/include/overlay017/ov17_0224A0FC.h b/include/overlay017/ov17_0224A0FC.h index 66a9d2afc0..b25663f8d5 100644 --- a/include/overlay017/ov17_0224A0FC.h +++ b/include/overlay017/ov17_0224A0FC.h @@ -1,10 +1,13 @@ #ifndef POKEPLATINUM_OV17_0224A0FC_H #define POKEPLATINUM_OV17_0224A0FC_H -#include "struct_decls/struct_02006C24_decl.h" +#include + #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" + #include "overlay017/struct_ov17_0224A1EC.h" #include "overlay017/struct_ov17_0224ABFC.h" #include "overlay017/struct_ov17_0224B058.h" @@ -15,95 +18,93 @@ #include "overlay017/struct_ov17_0224EDE0.h" #include "overlay017/struct_ov17_02253084.h" -#include - s16 ov17_0224A0FC(int param0); s16 ov17_0224A10C(int param0); s16 ov17_0224A120(int param0); -void ov17_0224A134(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224A1EC(UnkStruct_ov17_0224A1EC * param0); -void ov17_0224A20C(SpriteRenderer * param0, SpriteGfxHandler * param1); -void ov17_0224A210(SpriteGfxHandler * param0); -void ov17_0224A214(UnkStruct_ov17_0224A1EC * param0, int param1, int param2); -void ov17_0224A368(UnkStruct_ov17_0224A1EC * param0, int param1, int param2, int param3); -void ov17_0224A390(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_0224A428(SpriteGfxHandler * param0); -void ov17_0224A580(UnkStruct_ov17_0224A1EC * param0); -void ov17_0224A5A8(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_0224A5F8(SpriteGfxHandler * param0); -void ov17_0224A61C(UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2); -void ov17_0224A650(UnkStruct_ov17_0224A1EC * param0); -void ov17_0224A674(UnkStruct_ov17_0224A1EC * param0); -void ov17_0224A7B8(UnkStruct_ov17_0224A1EC * param0); -void ov17_0224A7E0(UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, int param3, int param4, u8 param5); -void ov17_0224A95C(UnkStruct_ov17_0224A1EC * param0); -void ov17_0224A984(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_0224A9D4(SpriteGfxHandler * param0); -void ov17_0224A9F8(UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2); -void ov17_0224AA1C(UnkStruct_ov17_0224A1EC * param0); -void ov17_0224AA38(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224AA58(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224AA94(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_0224AAE4(SpriteGfxHandler * param0); -void ov17_0224AB08(UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2); -void ov17_0224ABB0(UnkStruct_ov17_0224A1EC * param0); -void ov17_0224ABDC(UnkStruct_ov17_0224A1EC * param0, int param1); -void ov17_0224AC78(UnkStruct_ov17_0224ABFC * param0, int param1, int param2); -void ov17_0224AC80(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_0224ACD0(SpriteGfxHandler * param0); -void ov17_0224ACF4(UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2); -void ov17_0224ACF8(UnkStruct_ov17_0224A1EC * param0); -void ov17_0224ACFC(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_0224AD4C(SpriteGfxHandler * param0); -BOOL ov17_0224AD70(UnkStruct_ov17_0224DF54 * param0, int param1, int param2); -void ov17_0224AFA8(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_0224AFF8(SpriteGfxHandler * param0); -BOOL ov17_0224B01C(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224B058(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224B068(UnkStruct_ov17_0224A1EC * param0, int param1); -void ov17_0224B09C(Sprite * param0, UnkStruct_ov17_0224B09C * param1); -void ov17_0224B0CC(UnkStruct_ov17_0224A1EC * param0); -void ov17_0224B20C(UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_0224EDE0 * param1); -void ov17_0224B59C(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224B5B8(UnkStruct_ov17_0224DF54 * param0); -BOOL ov17_0224B5C8(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224BC4C(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224BC68(UnkStruct_ov17_0224DF54 * param0, int param1, int param2); -void ov17_0224BD00(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224BD28(UnkStruct_ov17_0224DF54 * param0, int param1, int param2); -int ov17_0224BDF0(UnkStruct_ov17_0224DF54 * param0, int param1); -int ov17_0224BE24(UnkStruct_ov17_0224DF54 * param0, int param1); -void ov17_0224C2CC(UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruct_ov17_0224C0C0 * param2); -int ov17_0224C300(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224C310(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2); -void ov17_0224C360(SpriteGfxHandler * param0); -void ov17_0224C384(UnkStruct_ov17_0224DF54 * param0, SpriteRenderer * param1, SpriteGfxHandler * param2); -void ov17_0224C3E4(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224C434(UnkStruct_ov17_0224B058 * param0, u32 param1, u32 param2, int param3); -void ov17_0224C47C(UnkStruct_ov17_0224B058 * param0, int param1); -void ov17_0224C49C(UnkStruct_ov17_0224C384 * param0, u32 param1, u32 param2, int param3); -void ov17_0224C540(UnkStruct_ov17_0224C384 * param0); -void ov17_0224C54C(UnkStruct_ov17_0224C384 * param0, int param1); +void ov17_0224A134(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224A1EC(UnkStruct_ov17_0224A1EC *param0); +void ov17_0224A20C(SpriteRenderer *param0, SpriteGfxHandler *param1); +void ov17_0224A210(SpriteGfxHandler *param0); +void ov17_0224A214(UnkStruct_ov17_0224A1EC *param0, int param1, int param2); +void ov17_0224A368(UnkStruct_ov17_0224A1EC *param0, int param1, int param2, int param3); +void ov17_0224A390(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_0224A428(SpriteGfxHandler *param0); +void ov17_0224A580(UnkStruct_ov17_0224A1EC *param0); +void ov17_0224A5A8(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_0224A5F8(SpriteGfxHandler *param0); +void ov17_0224A61C(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2); +void ov17_0224A650(UnkStruct_ov17_0224A1EC *param0); +void ov17_0224A674(UnkStruct_ov17_0224A1EC *param0); +void ov17_0224A7B8(UnkStruct_ov17_0224A1EC *param0); +void ov17_0224A7E0(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, int param3, int param4, u8 param5); +void ov17_0224A95C(UnkStruct_ov17_0224A1EC *param0); +void ov17_0224A984(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_0224A9D4(SpriteGfxHandler *param0); +void ov17_0224A9F8(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2); +void ov17_0224AA1C(UnkStruct_ov17_0224A1EC *param0); +void ov17_0224AA38(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224AA58(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224AA94(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_0224AAE4(SpriteGfxHandler *param0); +void ov17_0224AB08(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2); +void ov17_0224ABB0(UnkStruct_ov17_0224A1EC *param0); +void ov17_0224ABDC(UnkStruct_ov17_0224A1EC *param0, int param1); +void ov17_0224AC78(UnkStruct_ov17_0224ABFC *param0, int param1, int param2); +void ov17_0224AC80(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_0224ACD0(SpriteGfxHandler *param0); +void ov17_0224ACF4(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2); +void ov17_0224ACF8(UnkStruct_ov17_0224A1EC *param0); +void ov17_0224ACFC(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_0224AD4C(SpriteGfxHandler *param0); +BOOL ov17_0224AD70(UnkStruct_ov17_0224DF54 *param0, int param1, int param2); +void ov17_0224AFA8(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_0224AFF8(SpriteGfxHandler *param0); +BOOL ov17_0224B01C(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224B058(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224B068(UnkStruct_ov17_0224A1EC *param0, int param1); +void ov17_0224B09C(Sprite *param0, UnkStruct_ov17_0224B09C *param1); +void ov17_0224B0CC(UnkStruct_ov17_0224A1EC *param0); +void ov17_0224B20C(UnkStruct_ov17_0224DF54 *param0, const UnkStruct_ov17_0224EDE0 *param1); +void ov17_0224B59C(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224B5B8(UnkStruct_ov17_0224DF54 *param0); +BOOL ov17_0224B5C8(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224BC4C(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224BC68(UnkStruct_ov17_0224DF54 *param0, int param1, int param2); +void ov17_0224BD00(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224BD28(UnkStruct_ov17_0224DF54 *param0, int param1, int param2); +int ov17_0224BDF0(UnkStruct_ov17_0224DF54 *param0, int param1); +int ov17_0224BE24(UnkStruct_ov17_0224DF54 *param0, int param1); +void ov17_0224C2CC(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_ov17_0224C0C0 *param2); +int ov17_0224C300(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224C310(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2); +void ov17_0224C360(SpriteGfxHandler *param0); +void ov17_0224C384(UnkStruct_ov17_0224DF54 *param0, SpriteRenderer *param1, SpriteGfxHandler *param2); +void ov17_0224C3E4(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224C434(UnkStruct_ov17_0224B058 *param0, u32 param1, u32 param2, int param3); +void ov17_0224C47C(UnkStruct_ov17_0224B058 *param0, int param1); +void ov17_0224C49C(UnkStruct_ov17_0224C384 *param0, u32 param1, u32 param2, int param3); +void ov17_0224C540(UnkStruct_ov17_0224C384 *param0); +void ov17_0224C54C(UnkStruct_ov17_0224C384 *param0, int param1); int ov17_0224C57C(int param0); -void ov17_0224C5A0(UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruct_ov17_0224C0C0 * param2); -void ov17_0224C640(UnkStruct_ov17_0224DF54 * param0); -s64 ov17_0224C660(UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_02253084 * param1, int param2); -s64 ov17_0224C6A8(UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_02253084 * param1, int param2); -void ov17_0224C6B0(UnkStruct_ov17_0224DF54 * param0, int param1, u8 * param2); -void ov17_0224C848(UnkStruct_ov17_0224DF54 * param0); +void ov17_0224C5A0(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_ov17_0224C0C0 *param2); +void ov17_0224C640(UnkStruct_ov17_0224DF54 *param0); +s64 ov17_0224C660(UnkStruct_ov17_0224DF54 *param0, const UnkStruct_ov17_02253084 *param1, int param2); +s64 ov17_0224C6A8(UnkStruct_ov17_0224DF54 *param0, const UnkStruct_ov17_02253084 *param1, int param2); +void ov17_0224C6B0(UnkStruct_ov17_0224DF54 *param0, int param1, u8 *param2); +void ov17_0224C848(UnkStruct_ov17_0224DF54 *param0); void ov17_0224C84C(void); -void ov17_0224C864(UnkStruct_ov17_0224DF54 * param0, int param1); -void ov17_0224C8E8(UnkStruct_ov17_0224DF54 * param0, u32 param1); -void ov17_0224C9A4(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224C9D4(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224C9F0(UnkStruct_ov17_0224DF54 * param0, int param1); -void ov17_0224CA90(UnkStruct_ov17_0224DF54 * param0, u32 param1, s32 param2, s32 param3, s32 param4, fx32 param5); -void ov17_0224CD84(UnkStruct_ov17_0224DF54 * param0, u32 param1, u32 param2, int param3, int param4, u16 param5); -void ov17_0224CDB4(UnkStruct_ov17_0224DF54 * param0, int param1); -void ov17_0224CDC0(UnkStruct_ov17_0224DF54 * param0, int param1, int param2); -void ov17_0224CE08(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224CE28(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224CEE4(UnkStruct_ov17_0224DF54 * param0, int param1, GXRgb param2, GXRgb param3, int param4, int param5, u8 * param6); +void ov17_0224C864(UnkStruct_ov17_0224DF54 *param0, int param1); +void ov17_0224C8E8(UnkStruct_ov17_0224DF54 *param0, u32 param1); +void ov17_0224C9A4(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224C9D4(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224C9F0(UnkStruct_ov17_0224DF54 *param0, int param1); +void ov17_0224CA90(UnkStruct_ov17_0224DF54 *param0, u32 param1, s32 param2, s32 param3, s32 param4, fx32 param5); +void ov17_0224CD84(UnkStruct_ov17_0224DF54 *param0, u32 param1, u32 param2, int param3, int param4, u16 param5); +void ov17_0224CDB4(UnkStruct_ov17_0224DF54 *param0, int param1); +void ov17_0224CDC0(UnkStruct_ov17_0224DF54 *param0, int param1, int param2); +void ov17_0224CE08(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224CE28(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224CEE4(UnkStruct_ov17_0224DF54 *param0, int param1, GXRgb param2, GXRgb param3, int param4, int param5, u8 *param6); BOOL ov17_0224CFA8(u32 param0); #endif // POKEPLATINUM_OV17_0224A0FC_H diff --git a/include/overlay017/ov17_0224CFB8.h b/include/overlay017/ov17_0224CFB8.h index b5d38489e4..333fecc299 100644 --- a/include/overlay017/ov17_0224CFB8.h +++ b/include/overlay017/ov17_0224CFB8.h @@ -6,10 +6,10 @@ #include "overlay017/struct_ov17_0224DF54.h" #include "overlay017/struct_ov17_0224EDE0.h" -void ov17_0224CFB8(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224D6B0(UnkStruct_ov17_0224D69C * param0, const UnkStruct_ov17_0224EDE0 * param1); +void ov17_0224CFB8(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224D6B0(UnkStruct_ov17_0224D69C *param0, const UnkStruct_ov17_0224EDE0 *param1); int ov17_0224DD28(int param0); int ov17_0224DD5C(int param0); -void ov17_0224DE54(int param0, int param1, u32 param2, u32 param3, const UnkStruct_ov17_0224DD90 * param4, UnkStruct_ov17_0224EDE0 * param5, const UnkStruct_ov17_0224EDE0 * param6, int param7, int param8, int param9, int param10); +void ov17_0224DE54(int param0, int param1, u32 param2, u32 param3, const UnkStruct_ov17_0224DD90 *param4, UnkStruct_ov17_0224EDE0 *param5, const UnkStruct_ov17_0224EDE0 *param6, int param7, int param8, int param9, int param10); #endif // POKEPLATINUM_OV17_0224CFB8_H diff --git a/include/overlay017/ov17_0224E930.h b/include/overlay017/ov17_0224E930.h index f336d55d3a..03d66754f6 100644 --- a/include/overlay017/ov17_0224E930.h +++ b/include/overlay017/ov17_0224E930.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224E958.h" #include "overlay017/struct_ov17_02253084.h" -void ov17_0224E930(UnkStruct_ov17_0224E958 * param0, int param1, int param2, u32 param3, int param4); -void ov17_0224E958(UnkStruct_ov17_0224E958 * param0); -void ov17_0224E990(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0224E958 * param1, u32 param2, u32 param3); -void ov17_0224ED8C(int param0, UnkStruct_ov17_0224DF54 * param1, UnkStruct_ov17_0224E958 * param2, u32 param3, u32 param4, u32 param5, const UnkStruct_ov17_02253084 * param6, UnkStruct_ov17_0224D69C * param7); +void ov17_0224E930(UnkStruct_ov17_0224E958 *param0, int param1, int param2, u32 param3, int param4); +void ov17_0224E958(UnkStruct_ov17_0224E958 *param0); +void ov17_0224E990(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0224E958 *param1, u32 param2, u32 param3); +void ov17_0224ED8C(int param0, UnkStruct_ov17_0224DF54 *param1, UnkStruct_ov17_0224E958 *param2, u32 param3, u32 param4, u32 param5, const UnkStruct_ov17_02253084 *param6, UnkStruct_ov17_0224D69C *param7); #endif // POKEPLATINUM_OV17_0224E930_H diff --git a/include/overlay017/ov17_0224F080.h b/include/overlay017/ov17_0224F080.h index ed525fb547..c7874fd573 100644 --- a/include/overlay017/ov17_0224F080.h +++ b/include/overlay017/ov17_0224F080.h @@ -1,23 +1,23 @@ #ifndef POKEPLATINUM_OV17_0224F080_H #define POKEPLATINUM_OV17_0224F080_H +#include + +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_defs/sprite_template.h" -#include - u32 ov17_0224F080(int param0); u32 ov17_0224F098(void); u32 ov17_0224F09C(void); u8 ov17_0224F0A0(int param0); u32 ov17_0224F0B8(void); -void ov17_0224F0BC(SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); -void ov17_0224F0F0(SpriteRenderer * param0, SpriteGfxHandler * param1, u32 param2, u32 param3); -void ov17_0224F138(SpriteGfxHandler * param0, u32 param1); -void ov17_0224F140(SpriteGfxHandler * param0, u32 param1, u32 param2); -CellActorData * ov17_0224F154(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, const SpriteTemplate * param3); -void ov17_0224F184(CellActorData * param0); +void ov17_0224F0BC(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); +void ov17_0224F0F0(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3); +void ov17_0224F138(SpriteGfxHandler *param0, u32 param1); +void ov17_0224F140(SpriteGfxHandler *param0, u32 param1, u32 param2); +CellActorData *ov17_0224F154(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3); +void ov17_0224F184(CellActorData *param0); #endif // POKEPLATINUM_OV17_0224F080_H diff --git a/include/overlay017/ov17_0224F18C.h b/include/overlay017/ov17_0224F18C.h index 24c4a6fa91..81df74e9ec 100644 --- a/include/overlay017/ov17_0224F18C.h +++ b/include/overlay017/ov17_0224F18C.h @@ -5,13 +5,13 @@ #include "overlay017/struct_ov17_02243C80.h" #include "overlay017/struct_ov17_0224F30C.h" -void ov17_0224F18C(UnkStruct_ov17_0224F30C * param0, const UnkStruct_ov17_02243C28 * param1); -int ov17_0224F1F8(UnkStruct_ov17_0224F30C * param0, u8 param1, u16 param2, void * param3, int param4); -void ov17_0224F26C(UnkStruct_ov17_0224F30C * param0, const UnkStruct_ov17_02243C80 * param1, void * param2, int param3); -int ov17_0224F30C(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -BOOL ov17_0224F35C(UnkStruct_ov17_0224F30C * param0); -BOOL ov17_0224F3D0(UnkStruct_ov17_0224F30C * param0); -int ov17_0224F3D8(UnkStruct_ov17_0224F30C * param0, void * param1); -BOOL ov17_0224F4B8(UnkStruct_ov17_0224F30C * param0, int param1, int param2, int param3); +void ov17_0224F18C(UnkStruct_ov17_0224F30C *param0, const UnkStruct_ov17_02243C28 *param1); +int ov17_0224F1F8(UnkStruct_ov17_0224F30C *param0, u8 param1, u16 param2, void *param3, int param4); +void ov17_0224F26C(UnkStruct_ov17_0224F30C *param0, const UnkStruct_ov17_02243C80 *param1, void *param2, int param3); +int ov17_0224F30C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +BOOL ov17_0224F35C(UnkStruct_ov17_0224F30C *param0); +BOOL ov17_0224F3D0(UnkStruct_ov17_0224F30C *param0); +int ov17_0224F3D8(UnkStruct_ov17_0224F30C *param0, void *param1); +BOOL ov17_0224F4B8(UnkStruct_ov17_0224F30C *param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV17_0224F18C_H diff --git a/include/overlay017/ov17_0224F4D4.h b/include/overlay017/ov17_0224F4D4.h index 5aaba3cfd0..04a7ef0cf8 100644 --- a/include/overlay017/ov17_0224F4D4.h +++ b/include/overlay017/ov17_0224F4D4.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV17_0224F4D4_H #define POKEPLATINUM_OV17_0224F4D4_H +#include "overlay_manager.h" -int ov17_0224F4D4(OverlayManager * param0, int * param1); -int ov17_0224F754(OverlayManager * param0, int * param1); -int ov17_0224F86C(OverlayManager * param0, int * param1); +int ov17_0224F4D4(OverlayManager *param0, int *param1); +int ov17_0224F754(OverlayManager *param0, int *param1); +int ov17_0224F86C(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV17_0224F4D4_H diff --git a/include/overlay017/ov17_02250744.h b/include/overlay017/ov17_02250744.h index 9102f2b6e3..2938e5aea7 100644 --- a/include/overlay017/ov17_02250744.h +++ b/include/overlay017/ov17_02250744.h @@ -3,39 +3,40 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_defs/struct_02095C48.h" + #include "overlay017/struct_ov17_0224FCA0.h" #include "overlay017/struct_ov17_022507C4.h" #include "overlay017/struct_ov17_022508E4.h" -void ov17_02250744(UnkStruct_ov17_0224FCA0 * param0); -void ov17_022507C4(UnkStruct_ov17_022507C4 * param0); -void ov17_02250968(UnkStruct_ov17_0224FCA0 * param0, u32 param1, const UnkStruct_ov17_022508E4 * param2); -int ov17_0225099C(UnkStruct_ov17_0224FCA0 * param0); -void ov17_022509AC(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250A84(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250A88(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250AD8(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250B00(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250CEC(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250D24(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250D28(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250D8C(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250DB0(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250EFC(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250F68(UnkStruct_ov17_0224FCA0 * param0, NARC * param1); -void ov17_02250FBC(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250FE4(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02251020(UnkStruct_ov17_0224FCA0 * param0); -void ov17_0225122C(UnkStruct_ov17_0224FCA0 * param0, NARC * param1); -void ov17_022512E0(UnkStruct_ov17_0224FCA0 * param0); -void ov17_0225131C(UnkStruct_ov17_0224FCA0 * param0, int param1, int param2); -void ov17_02251344(UnkStruct_ov17_0224FCA0 * param0, NARC * param1); -void ov17_022513C0(UnkStruct_ov17_0224FCA0 * param0); -void ov17_022513F4(UnkStruct_ov17_0224FCA0 * param0, int param1, int param2, int param3, int param4); -void ov17_02251544(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02251598(UnkStruct_ov17_0224FCA0 * param0, int param1, u8 * param2); -void ov17_02251718(UnkStruct_ov17_0224FCA0 * param0, int param1, int param2, u8 * param3); -void ov17_02251930(UnkStruct_02095C48 * param0, int param1, s16 param2[]); -void ov17_02251A1C(UnkStruct_ov17_0224FCA0 * param0); +void ov17_02250744(UnkStruct_ov17_0224FCA0 *param0); +void ov17_022507C4(UnkStruct_ov17_022507C4 *param0); +void ov17_02250968(UnkStruct_ov17_0224FCA0 *param0, u32 param1, const UnkStruct_ov17_022508E4 *param2); +int ov17_0225099C(UnkStruct_ov17_0224FCA0 *param0); +void ov17_022509AC(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250A84(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250A88(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250AD8(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250B00(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250CEC(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250D24(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250D28(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250D8C(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250DB0(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250EFC(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250F68(UnkStruct_ov17_0224FCA0 *param0, NARC *param1); +void ov17_02250FBC(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250FE4(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02251020(UnkStruct_ov17_0224FCA0 *param0); +void ov17_0225122C(UnkStruct_ov17_0224FCA0 *param0, NARC *param1); +void ov17_022512E0(UnkStruct_ov17_0224FCA0 *param0); +void ov17_0225131C(UnkStruct_ov17_0224FCA0 *param0, int param1, int param2); +void ov17_02251344(UnkStruct_ov17_0224FCA0 *param0, NARC *param1); +void ov17_022513C0(UnkStruct_ov17_0224FCA0 *param0); +void ov17_022513F4(UnkStruct_ov17_0224FCA0 *param0, int param1, int param2, int param3, int param4); +void ov17_02251544(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02251598(UnkStruct_ov17_0224FCA0 *param0, int param1, u8 *param2); +void ov17_02251718(UnkStruct_ov17_0224FCA0 *param0, int param1, int param2, u8 *param3); +void ov17_02251930(UnkStruct_02095C48 *param0, int param1, s16 param2[]); +void ov17_02251A1C(UnkStruct_ov17_0224FCA0 *param0); #endif // POKEPLATINUM_OV17_02250744_H diff --git a/include/overlay017/ov17_02251D6C.h b/include/overlay017/ov17_02251D6C.h index 9e1a798bdd..72d37489e5 100644 --- a/include/overlay017/ov17_02251D6C.h +++ b/include/overlay017/ov17_02251D6C.h @@ -3,6 +3,6 @@ #include "overlay017/struct_ov17_0224FCA0.h" -void ov17_02251D6C(UnkStruct_ov17_0224FCA0 * param0); +void ov17_02251D6C(UnkStruct_ov17_0224FCA0 *param0); #endif // POKEPLATINUM_OV17_02251D6C_H diff --git a/include/overlay017/ov17_02252A70.h b/include/overlay017/ov17_02252A70.h index 14d62cee75..0217e2df14 100644 --- a/include/overlay017/ov17_02252A70.h +++ b/include/overlay017/ov17_02252A70.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02029C88_decl.h" -u32 ov17_02252A70(const UnkStruct_02029C88 * param0, const u8 * param1); -u8 * ov17_02252A9C(u32 param0, u32 param1); +u32 ov17_02252A70(const UnkStruct_02029C88 *param0, const u8 *param1); +u8 *ov17_02252A9C(u32 param0, u32 param1); #endif // POKEPLATINUM_OV17_02252A70_H diff --git a/include/overlay017/ov17_02252AB0.h b/include/overlay017/ov17_02252AB0.h index 00061b4917..2d0f7abbc1 100644 --- a/include/overlay017/ov17_02252AB0.h +++ b/include/overlay017/ov17_02252AB0.h @@ -4,14 +4,15 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" + #include "overlay017/struct_ov17_02252B48_decl.h" -void ov17_02252AB0(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, u32 param3, u32 param4, u32 param5, u32 param6); -void ov17_02252B20(SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov17_02252B48 * ov17_02252B48(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov17_02252BCC(UnkStruct_ov17_02252B48 * param0); -void ov17_02252BF0(UnkStruct_ov17_02252B48 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9); -void ov17_02252C78(UnkStruct_ov17_02252B48 * param0, int param1, int param2, int param3, int param4, fx32 param5); -void ov17_02252C9C(UnkStruct_ov17_02252B48 * param0); +void ov17_02252AB0(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, u32 param3, u32 param4, u32 param5, u32 param6); +void ov17_02252B20(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); +UnkStruct_ov17_02252B48 *ov17_02252B48(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void ov17_02252BCC(UnkStruct_ov17_02252B48 *param0); +void ov17_02252BF0(UnkStruct_ov17_02252B48 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9); +void ov17_02252C78(UnkStruct_ov17_02252B48 *param0, int param1, int param2, int param3, int param4, fx32 param5); +void ov17_02252C9C(UnkStruct_ov17_02252B48 *param0); #endif // POKEPLATINUM_OV17_02252AB0_H diff --git a/include/overlay017/ov17_02252CEC.h b/include/overlay017/ov17_02252CEC.h index a4f8f4c479..56dc0956f0 100644 --- a/include/overlay017/ov17_02252CEC.h +++ b/include/overlay017/ov17_02252CEC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV17_02252CEC_H #define POKEPLATINUM_OV17_02252CEC_H -void ov17_02252CEC(int param0, int param1, void * param2, void * param3); -void ov17_02252D7C(int param0, int param1, void * param2, void * param3); +void ov17_02252CEC(int param0, int param1, void *param2, void *param3); +void ov17_02252D7C(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_OV17_02252CEC_H diff --git a/include/overlay017/struct_ov17_0223F2E4.h b/include/overlay017/struct_ov17_0223F2E4.h index 65cf031696..947c9eb2d5 100644 --- a/include/overlay017/struct_ov17_0223F2E4.h +++ b/include/overlay017/struct_ov17_0223F2E4.h @@ -5,7 +5,7 @@ #include "struct_defs/sprite_manager_allocation.h" typedef struct { - FontOAM * unk_00; + FontOAM *unk_00; SpriteManagerAllocation unk_04; u16 unk_10; } UnkStruct_ov17_0223F2E4; diff --git a/include/overlay017/struct_ov17_0223F6E8.h b/include/overlay017/struct_ov17_0223F6E8.h index a1eca25b3e..64564514c7 100644 --- a/include/overlay017/struct_ov17_0223F6E8.h +++ b/include/overlay017/struct_ov17_0223F6E8.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV17_0223F6E8_H #include "struct_decls/cell_actor_data.h" + #include "sys_task_manager.h" typedef struct { - CellActorData * unk_00[6]; - SysTask * unk_18; + CellActorData *unk_00[6]; + SysTask *unk_18; } UnkStruct_ov17_0223F6E8; #endif // POKEPLATINUM_STRUCT_OV17_0223F6E8_H diff --git a/include/overlay017/struct_ov17_0223F744.h b/include/overlay017/struct_ov17_0223F744.h index f9e029929a..1632ebd52e 100644 --- a/include/overlay017/struct_ov17_0223F744.h +++ b/include/overlay017/struct_ov17_0223F744.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_STRUCT_OV17_0223F744_H #include "struct_decls/struct_02002F38_decl.h" + #include "sys_task_manager.h" typedef struct { - SysTask * unk_00; - PaletteData * unk_04; + SysTask *unk_00; + PaletteData *unk_04; s32 unk_08; - const u16 * unk_0C; + const u16 *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h index 2b7c11e5c4..05e665c4b7 100644 --- a/include/overlay017/struct_ov17_0223F88C.h +++ b/include/overlay017/struct_ov17_0223F88C.h @@ -1,50 +1,52 @@ #ifndef POKEPLATINUM_STRUCT_OV17_0223F88C_H #define POKEPLATINUM_STRUCT_OV17_0223F88C_H +#include "struct_decls/cell_actor_data.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48_sub1.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" + #include "battle/struct_ov16_0223E0C8.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay017/struct_ov17_0223F2E4.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" + typedef struct { - UnkStruct_02095C48_sub1 * unk_00; - UnkStruct_02007768 * unk_04; - Sprite * unk_08[4]; - SpriteRenderer * unk_18; - SpriteGfxHandler * unk_1C; - UnkStruct_ov12_0221FCDC * unk_20; - BGL * unk_24; + UnkStruct_02095C48_sub1 *unk_00; + UnkStruct_02007768 *unk_04; + Sprite *unk_08[4]; + SpriteRenderer *unk_18; + SpriteGfxHandler *unk_1C; + UnkStruct_ov12_0221FCDC *unk_20; + BGL *unk_24; Window unk_28[1]; - MessageLoader * unk_38; - MessageLoader * unk_3C; - MessageLoader * unk_40; - MessageLoader * unk_44; - StringTemplate * unk_48; - Strbuf* unk_4C; - PaletteData * unk_50; - UnkStruct_02012744 * unk_54; + MessageLoader *unk_38; + MessageLoader *unk_3C; + MessageLoader *unk_40; + MessageLoader *unk_44; + StringTemplate *unk_48; + Strbuf *unk_4C; + PaletteData *unk_50; + UnkStruct_02012744 *unk_54; UnkStruct_ov16_0223E0C8 unk_58[4]; UnkStruct_ov16_0223E0C8 unk_98; - CellActorData * unk_A8[3]; - CellActorData * unk_B4[3]; - CellActorData * unk_C0; - CellActorData * unk_C4[4][6]; - CellActorData * unk_124[3][5]; - CellActorData * unk_160[4]; - CellActorData * unk_170[3]; - CellActorData * unk_17C; + CellActorData *unk_A8[3]; + CellActorData *unk_B4[3]; + CellActorData *unk_C0; + CellActorData *unk_C4[4][6]; + CellActorData *unk_124[3][5]; + CellActorData *unk_160[4]; + CellActorData *unk_170[3]; + CellActorData *unk_17C; UnkStruct_ov17_0223F2E4 unk_180[4]; UnkStruct_ov17_0223F2E4 unk_1C8[4]; u8 unk_210; diff --git a/include/overlay017/struct_ov17_0224145C.h b/include/overlay017/struct_ov17_0224145C.h index c5cae2b2a1..32cde3488c 100644 --- a/include/overlay017/struct_ov17_0224145C.h +++ b/include/overlay017/struct_ov17_0224145C.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV17_0224145C_H #include "struct_decls/struct_02002F38_decl.h" + #include "sys_task_manager.h" typedef struct { - PaletteData * unk_00; - SysTask * unk_04; + PaletteData *unk_00; + SysTask *unk_04; s16 unk_08; u8 unk_0A; u8 unk_0B; diff --git a/include/overlay017/struct_ov17_0224365C.h b/include/overlay017/struct_ov17_0224365C.h index 6655785aba..7e74a817c7 100644 --- a/include/overlay017/struct_ov17_0224365C.h +++ b/include/overlay017/struct_ov17_0224365C.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV17_0224365C_H #define POKEPLATINUM_STRUCT_OV17_0224365C_H -#include "sys_task_manager.h" #include "overlay017/struct_ov17_02246F24.h" +#include "sys_task_manager.h" + typedef struct { - UnkStruct_ov17_02246F24 * unk_00; - SysTask * unk_04; + UnkStruct_ov17_02246F24 *unk_00; + SysTask *unk_04; u8 unk_08; } UnkStruct_ov17_0224365C; diff --git a/include/overlay017/struct_ov17_02243C28.h b/include/overlay017/struct_ov17_02243C28.h index b4220f65cb..1cc1a38d7f 100644 --- a/include/overlay017/struct_ov17_02243C28.h +++ b/include/overlay017/struct_ov17_02243C28.h @@ -4,7 +4,7 @@ #include "overlay017/struct_ov17_022539E4.h" typedef struct { - const struct UnkStruct_ov17_022539E4_t * unk_00; + const struct UnkStruct_ov17_022539E4_t *unk_00; u16 unk_04; u8 unk_06; u8 unk_07; diff --git a/include/overlay017/struct_ov17_02243D34.h b/include/overlay017/struct_ov17_02243D34.h index 300bf8f395..a91c6ead0d 100644 --- a/include/overlay017/struct_ov17_02243D34.h +++ b/include/overlay017/struct_ov17_02243D34.h @@ -5,7 +5,7 @@ #include "overlay017/struct_ov17_02246F24.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; UnkStruct_ov17_02243C80 unk_04; u16 unk_0C; u8 unk_0E; diff --git a/include/overlay017/struct_ov17_02243DCC.h b/include/overlay017/struct_ov17_02243DCC.h index 1c73edaa8e..031e78d337 100644 --- a/include/overlay017/struct_ov17_02243DCC.h +++ b/include/overlay017/struct_ov17_02243DCC.h @@ -6,7 +6,7 @@ #include "overlay017/struct_ov17_02246F24.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; UnkStruct_ov17_02243C80 unk_04; u8 unk_0C; u16 unk_0E; diff --git a/include/overlay017/struct_ov17_02243F10.h b/include/overlay017/struct_ov17_02243F10.h index f08e7a88ee..8933707d4f 100644 --- a/include/overlay017/struct_ov17_02243F10.h +++ b/include/overlay017/struct_ov17_02243F10.h @@ -5,7 +5,7 @@ #include "overlay017/struct_ov17_02246F24.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; UnkStruct_ov17_02243C80 unk_04; s32 unk_0C; s32 unk_10; diff --git a/include/overlay017/struct_ov17_02244240.h b/include/overlay017/struct_ov17_02244240.h index 5eb2114ae7..2ad3aeadb6 100644 --- a/include/overlay017/struct_ov17_02244240.h +++ b/include/overlay017/struct_ov17_02244240.h @@ -6,7 +6,7 @@ #include "overlay017/struct_ov17_02246F24.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; UnkStruct_ov17_02243C80 unk_04; u8 unk_0C; u8 unk_0D; diff --git a/include/overlay017/struct_ov17_022443F8.h b/include/overlay017/struct_ov17_022443F8.h index c54d48f3a8..f738589ec0 100644 --- a/include/overlay017/struct_ov17_022443F8.h +++ b/include/overlay017/struct_ov17_022443F8.h @@ -8,7 +8,7 @@ #include "overlay017/struct_ov17_02246F24_sub1.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; UnkStruct_ov17_02243C80 unk_04; u8 unk_0C; u8 unk_0D; diff --git a/include/overlay017/struct_ov17_022444BC.h b/include/overlay017/struct_ov17_022444BC.h index 5f14e7dcbe..9177f38263 100644 --- a/include/overlay017/struct_ov17_022444BC.h +++ b/include/overlay017/struct_ov17_022444BC.h @@ -33,7 +33,7 @@ typedef struct { u32 unk_28_8 : 2; u32 unk_28_10 : 2; u32 unk_28_12 : 8; - u32 : 12; + u32 : 12; } UnkStruct_ov17_022444BC; #endif // POKEPLATINUM_STRUCT_OV17_022444BC_H diff --git a/include/overlay017/struct_ov17_02244970.h b/include/overlay017/struct_ov17_02244970.h index 664cb87586..66e9ff1043 100644 --- a/include/overlay017/struct_ov17_02244970.h +++ b/include/overlay017/struct_ov17_02244970.h @@ -6,7 +6,7 @@ #include "overlay017/struct_ov17_02246F24.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; UnkStruct_ov17_02243C80 unk_04; u8 unk_0C; u8 unk_0D; diff --git a/include/overlay017/struct_ov17_02244C08.h b/include/overlay017/struct_ov17_02244C08.h index 2c419ec917..45bf8ec7bf 100644 --- a/include/overlay017/struct_ov17_02244C08.h +++ b/include/overlay017/struct_ov17_02244C08.h @@ -7,7 +7,7 @@ #include "overlay017/struct_ov17_02246F24_sub1.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; UnkStruct_ov17_02243C80 unk_04; u8 unk_0C; u8 unk_0D; @@ -22,7 +22,7 @@ typedef struct { s16 unk_F6; u8 unk_F8; u8 unk_F9; - UnkStruct_ov17_0224365C * unk_FC; + UnkStruct_ov17_0224365C *unk_FC; } UnkStruct_ov17_02244C08; #endif // POKEPLATINUM_STRUCT_OV17_02244C08_H diff --git a/include/overlay017/struct_ov17_02245690.h b/include/overlay017/struct_ov17_02245690.h index fb44e4e268..9f642579de 100644 --- a/include/overlay017/struct_ov17_02245690.h +++ b/include/overlay017/struct_ov17_02245690.h @@ -7,7 +7,7 @@ #include "overlay017/struct_ov17_02246F24_sub1.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; UnkStruct_ov17_02243C80 unk_04; u8 unk_0C; s8 unk_0D; @@ -16,7 +16,7 @@ typedef struct { s16 unk_EE; u8 unk_F0; u8 unk_F1; - UnkStruct_ov17_0224365C * unk_F4; + UnkStruct_ov17_0224365C *unk_F4; } UnkStruct_ov17_02245690; #endif // POKEPLATINUM_STRUCT_OV17_02245690_H diff --git a/include/overlay017/struct_ov17_02245C60.h b/include/overlay017/struct_ov17_02245C60.h index a47b483694..60acc6cb27 100644 --- a/include/overlay017/struct_ov17_02245C60.h +++ b/include/overlay017/struct_ov17_02245C60.h @@ -7,10 +7,10 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; - UnkStruct_ov17_0224145C * unk_10[4]; + UnkStruct_ov17_0224F30C *unk_0C; + UnkStruct_ov17_0224145C *unk_10[4]; u8 unk_20; u8 unk_21; u8 unk_22; diff --git a/include/overlay017/struct_ov17_02245E14.h b/include/overlay017/struct_ov17_02245E14.h index e05c23c751..358128d1c9 100644 --- a/include/overlay017/struct_ov17_02245E14.h +++ b/include/overlay017/struct_ov17_02245E14.h @@ -7,9 +7,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_02246540_sub1.h b/include/overlay017/struct_ov17_02246540_sub1.h index 63a913d7af..a03670d261 100644 --- a/include/overlay017/struct_ov17_02246540_sub1.h +++ b/include/overlay017/struct_ov17_02246540_sub1.h @@ -4,7 +4,7 @@ typedef struct { u32 unk_00_0 : 16; u32 unk_00_16 : 8; - u32 : 8; + u32 : 8; } UnkStruct_ov17_02246540_sub1; #endif // POKEPLATINUM_STRUCT_OV17_02246540_SUB1_H diff --git a/include/overlay017/struct_ov17_02246F24.h b/include/overlay017/struct_ov17_02246F24.h index 4a94e86056..34a00142d2 100644 --- a/include/overlay017/struct_ov17_02246F24.h +++ b/include/overlay017/struct_ov17_02246F24.h @@ -1,9 +1,9 @@ #ifndef POKEPLATINUM_STRUCT_OV17_02246F24_H #define POKEPLATINUM_STRUCT_OV17_02246F24_H -#include "sys_task_manager.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02095C48.h" + #include "overlay017/struct_ov17_0223BCE8.h" #include "overlay017/struct_ov17_0223F88C.h" #include "overlay017/struct_ov17_02246F24_sub1.h" @@ -11,15 +11,17 @@ #include "overlay017/struct_ov17_022472F8.h" #include "overlay017/struct_ov17_0224F30C.h" +#include "sys_task_manager.h" + typedef struct { - UnkStruct_02095C48 * unk_00; - SysTask * unk_04; - GenericPointerData * unk_08; + UnkStruct_02095C48 *unk_00; + SysTask *unk_04; + GenericPointerData *unk_08; UnkStruct_ov17_0223F88C unk_0C; UnkStruct_ov17_022472F8 unk_220; UnkStruct_ov17_02246F24_sub1 unk_304; UnkStruct_ov17_02246F24_sub2 unk_3E2[4]; - void * unk_7E4; + void *unk_7E4; u16 unk_7E8; u16 unk_7EA; u8 unk_7EC; diff --git a/include/overlay017/struct_ov17_022476F8.h b/include/overlay017/struct_ov17_022476F8.h index 581995cb0b..006c1dc0a1 100644 --- a/include/overlay017/struct_ov17_022476F8.h +++ b/include/overlay017/struct_ov17_022476F8.h @@ -1,36 +1,38 @@ #ifndef POKEPLATINUM_STRUCT_OV17_022476F8_H #define POKEPLATINUM_STRUCT_OV17_022476F8_H +#include "struct_decls/cell_actor_data.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48_sub1.h" + #include "battle/struct_ov16_0223E0C8.h" #include "overlay017/struct_ov17_0223F6E8.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" + typedef struct { - UnkStruct_02095C48_sub1 * unk_00; - UnkStruct_02007768 * unk_04; - Sprite * unk_08[4]; - Sprite * unk_18; - SpriteRenderer * unk_1C; - SpriteGfxHandler * unk_20; - BGL * unk_24; + UnkStruct_02095C48_sub1 *unk_00; + UnkStruct_02007768 *unk_04; + Sprite *unk_08[4]; + Sprite *unk_18; + SpriteRenderer *unk_1C; + SpriteGfxHandler *unk_20; + BGL *unk_24; Window unk_28[1]; - MessageLoader * unk_38; - StringTemplate * unk_3C; - Strbuf* unk_40; - PaletteData * unk_44; + MessageLoader *unk_38; + StringTemplate *unk_3C; + Strbuf *unk_40; + PaletteData *unk_44; UnkStruct_ov16_0223E0C8 unk_48[4]; - CellActorData * unk_88[8]; + CellActorData *unk_88[8]; UnkStruct_ov17_0223F6E8 unk_A8; u8 unk_C4; } UnkStruct_ov17_022476F8; diff --git a/include/overlay017/struct_ov17_02247A48.h b/include/overlay017/struct_ov17_02247A48.h index 9795e65158..bd8c2aee32 100644 --- a/include/overlay017/struct_ov17_02247A48.h +++ b/include/overlay017/struct_ov17_02247A48.h @@ -1,9 +1,9 @@ #ifndef POKEPLATINUM_STRUCT_OV17_02247A48_H #define POKEPLATINUM_STRUCT_OV17_02247A48_H -#include "sys_task_manager.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02095C48.h" + #include "overlay017/struct_ov17_0223D60C.h" #include "overlay017/struct_ov17_022476F8.h" #include "overlay017/struct_ov17_02247A48_sub1.h" @@ -12,10 +12,12 @@ #include "overlay017/struct_ov17_0224B09C.h" #include "overlay017/struct_ov17_0224F30C.h" +#include "sys_task_manager.h" + typedef struct { - UnkStruct_02095C48 * unk_00; - SysTask * unk_04; - GenericPointerData * unk_08; + UnkStruct_02095C48 *unk_00; + SysTask *unk_04; + GenericPointerData *unk_08; UnkStruct_ov17_022476F8 unk_0C; UnkStruct_ov17_02247A48_sub1 unk_D2; UnkStruct_ov17_02249260 unk_E0; diff --git a/include/overlay017/struct_ov17_02247C5C.h b/include/overlay017/struct_ov17_02247C5C.h index 2623fbe084..b5198fbb95 100644 --- a/include/overlay017/struct_ov17_02247C5C.h +++ b/include/overlay017/struct_ov17_02247C5C.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; s16 unk_12; diff --git a/include/overlay017/struct_ov17_02247DC8.h b/include/overlay017/struct_ov17_02247DC8.h index 84a5896f0d..26b6ddbf07 100644 --- a/include/overlay017/struct_ov17_02247DC8.h +++ b/include/overlay017/struct_ov17_02247DC8.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; s32 unk_14; diff --git a/include/overlay017/struct_ov17_02247F8C.h b/include/overlay017/struct_ov17_02247F8C.h index 3d5f53ec52..5efb3bdb37 100644 --- a/include/overlay017/struct_ov17_02247F8C.h +++ b/include/overlay017/struct_ov17_02247F8C.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_02248198.h b/include/overlay017/struct_ov17_02248198.h index 5e2cf31405..586de2ca59 100644 --- a/include/overlay017/struct_ov17_02248198.h +++ b/include/overlay017/struct_ov17_02248198.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; s32 unk_14; diff --git a/include/overlay017/struct_ov17_022482B0.h b/include/overlay017/struct_ov17_022482B0.h index a0f71038cd..64fd091e52 100644 --- a/include/overlay017/struct_ov17_022482B0.h +++ b/include/overlay017/struct_ov17_022482B0.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; s8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_02248464.h b/include/overlay017/struct_ov17_02248464.h index 2438116e10..23aac3b9a9 100644 --- a/include/overlay017/struct_ov17_02248464.h +++ b/include/overlay017/struct_ov17_02248464.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; s8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_02248744.h b/include/overlay017/struct_ov17_02248744.h index 5c76b3cf0e..2dd0ed3878 100644 --- a/include/overlay017/struct_ov17_02248744.h +++ b/include/overlay017/struct_ov17_02248744.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; s32 unk_14; diff --git a/include/overlay017/struct_ov17_02248860.h b/include/overlay017/struct_ov17_02248860.h index 76301cb1d7..e101336458 100644 --- a/include/overlay017/struct_ov17_02248860.h +++ b/include/overlay017/struct_ov17_02248860.h @@ -10,9 +10,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; UnkStruct_ov17_022489C8 unk_14; diff --git a/include/overlay017/struct_ov17_022489C8.h b/include/overlay017/struct_ov17_022489C8.h index b7cb31cb11..d1765253de 100644 --- a/include/overlay017/struct_ov17_022489C8.h +++ b/include/overlay017/struct_ov17_022489C8.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV17_022489C8_H #define POKEPLATINUM_STRUCT_OV17_022489C8_H -#include "pokemon.h" #include "overlay012/struct_ov12_02235FE0_decl.h" #include "overlay012/struct_ov12_02236030.h" +#include "pokemon.h" + typedef struct { UnkStruct_ov12_02236030 unk_00; - UnkStruct_ov12_02235FE0 * unk_0C; - Pokemon * unk_10; + UnkStruct_ov12_02235FE0 *unk_0C; + Pokemon *unk_10; u8 unk_14; u8 unk_15; } UnkStruct_ov17_022489C8; diff --git a/include/overlay017/struct_ov17_02248A24.h b/include/overlay017/struct_ov17_02248A24.h index 698497a92d..fdc5ec0bf6 100644 --- a/include/overlay017/struct_ov17_02248A24.h +++ b/include/overlay017/struct_ov17_02248A24.h @@ -5,8 +5,8 @@ #include "overlay017/struct_ov17_02247A48.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; - BallRotation * unk_04; + UnkStruct_ov17_02247A48 *unk_00; + BallRotation *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/overlay017/struct_ov17_02248AA4.h b/include/overlay017/struct_ov17_02248AA4.h index 38e8cb69b6..4a81555c2a 100644 --- a/include/overlay017/struct_ov17_02248AA4.h +++ b/include/overlay017/struct_ov17_02248AA4.h @@ -4,7 +4,7 @@ #include "overlay017/struct_ov17_02247A48.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; fx32 unk_04; fx32 unk_08; u8 unk_0C; diff --git a/include/overlay017/struct_ov17_02248BE0.h b/include/overlay017/struct_ov17_02248BE0.h index 0e0f3b1fa8..1cd912af1b 100644 --- a/include/overlay017/struct_ov17_02248BE0.h +++ b/include/overlay017/struct_ov17_02248BE0.h @@ -4,7 +4,7 @@ #include "overlay017/struct_ov17_02247A48.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; s32 unk_04; s32 unk_08; u8 unk_0C; diff --git a/include/overlay017/struct_ov17_02248DA4.h b/include/overlay017/struct_ov17_02248DA4.h index 1fdd7ed624..bbb401c705 100644 --- a/include/overlay017/struct_ov17_02248DA4.h +++ b/include/overlay017/struct_ov17_02248DA4.h @@ -7,9 +7,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_02248EC4.h b/include/overlay017/struct_ov17_02248EC4.h index 2769a65c35..2f0b6c2a1d 100644 --- a/include/overlay017/struct_ov17_02248EC4.h +++ b/include/overlay017/struct_ov17_02248EC4.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; s8 unk_11; s8 unk_12; diff --git a/include/overlay017/struct_ov17_02249014.h b/include/overlay017/struct_ov17_02249014.h index 9aba9647c3..0bc1e3d790 100644 --- a/include/overlay017/struct_ov17_02249014.h +++ b/include/overlay017/struct_ov17_02249014.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; s8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_022492AC.h b/include/overlay017/struct_ov17_022492AC.h index 9b13ddba37..680c3889de 100644 --- a/include/overlay017/struct_ov17_022492AC.h +++ b/include/overlay017/struct_ov17_022492AC.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_02247A48 * unk_00; + UnkStruct_ov17_02247A48 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; } UnkStruct_ov17_022492AC; diff --git a/include/overlay017/struct_ov17_0224A1EC.h b/include/overlay017/struct_ov17_0224A1EC.h index 78dcb55752..ef0ccfefac 100644 --- a/include/overlay017/struct_ov17_0224A1EC.h +++ b/include/overlay017/struct_ov17_0224A1EC.h @@ -1,20 +1,17 @@ #ifndef POKEPLATINUM_STRUCT_OV17_0224A1EC_H #define POKEPLATINUM_STRUCT_OV17_0224A1EC_H +#include "struct_decls/cell_actor_data.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48_sub1.h" + #include "battle/struct_ov16_0223E0C8.h" #include "overlay017/struct_ov17_0223F2E4.h" #include "overlay017/struct_ov17_0224A1EC_sub1.h" @@ -27,34 +24,39 @@ #include "overlay017/struct_ov17_0224C9A4.h" #include "overlay017/struct_ov17_02253084.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" + typedef struct { - UnkStruct_02095C48_sub1 * unk_00; + UnkStruct_02095C48_sub1 *unk_00; UnkStruct_ov17_0224B09C unk_04[4]; - UnkStruct_02007768 * unk_44; - Sprite * unk_48[4]; - SpriteRenderer * unk_58; - SpriteGfxHandler * unk_5C; - BGL * unk_60; + UnkStruct_02007768 *unk_44; + Sprite *unk_48[4]; + SpriteRenderer *unk_58; + SpriteGfxHandler *unk_5C; + BGL *unk_60; Window unk_64[2]; - MessageLoader * unk_84; - StringTemplate * unk_88; - Strbuf* unk_8C; - PaletteData * unk_90; - UnkStruct_02012744 * unk_94; + MessageLoader *unk_84; + StringTemplate *unk_88; + Strbuf *unk_8C; + PaletteData *unk_90; + UnkStruct_02012744 *unk_94; UnkStruct_ov16_0223E0C8 unk_98[4]; - CellActorData * unk_D8[68]; - CellActorData * unk_1E8; - SysTask * unk_1EC; + CellActorData *unk_D8[68]; + CellActorData *unk_1E8; + SysTask *unk_1EC; UnkStruct_ov17_0224C9A4 unk_1F0; - UnkStruct_ov17_0224C384 * unk_1FC; + UnkStruct_ov17_0224C384 *unk_1FC; UnkStruct_ov17_0224ABFC unk_200[4]; UnkStruct_ov17_0224A1EC_sub1 unk_254[4]; UnkStruct_ov17_0224AE84 unk_290[4][16]; UnkStruct_ov17_0224B058 unk_910; UnkStruct_ov17_0224A8D4 unk_92C[3]; - CellActorData * unk_960[3]; + CellActorData *unk_960[3]; UnkStruct_ov17_0223F2E4 unk_96C[3][3]; - const UnkStruct_ov17_02253084 * unk_A10; + const UnkStruct_ov17_02253084 *unk_A10; u8 unk_A14[4]; u8 unk_A18; u8 unk_A19[4]; diff --git a/include/overlay017/struct_ov17_0224A1EC_sub1.h b/include/overlay017/struct_ov17_0224A1EC_sub1.h index 281e371857..8d90f11c43 100644 --- a/include/overlay017/struct_ov17_0224A1EC_sub1.h +++ b/include/overlay017/struct_ov17_0224A1EC_sub1.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_STRUCT_OV17_0224A1EC_SUB1_H #include "struct_decls/cell_actor_data.h" + #include "sys_task_manager.h" struct UnkStruct_ov17_0224DF54_t; typedef struct { - SysTask * unk_00; - CellActorData * unk_04; - struct UnkStruct_ov17_0224DF54_t * unk_08; + SysTask *unk_00; + CellActorData *unk_04; + struct UnkStruct_ov17_0224DF54_t *unk_08; u8 unk_0C; u8 unk_0D; s8 unk_0E; diff --git a/include/overlay017/struct_ov17_0224A8D4.h b/include/overlay017/struct_ov17_0224A8D4.h index efbc5d6890..a86a47ed5f 100644 --- a/include/overlay017/struct_ov17_0224A8D4.h +++ b/include/overlay017/struct_ov17_0224A8D4.h @@ -2,13 +2,15 @@ #define POKEPLATINUM_STRUCT_OV17_0224A8D4_H #include "struct_decls/cell_actor_data.h" -#include "sys_task_manager.h" + #include "overlay017/struct_ov17_0223F2E4.h" +#include "sys_task_manager.h" + typedef struct { - CellActorData * unk_00; - UnkStruct_ov17_0223F2E4 * unk_04; - SysTask * unk_08; + CellActorData *unk_00; + UnkStruct_ov17_0223F2E4 *unk_04; + SysTask *unk_08; s32 unk_0C; u8 unk_10; } UnkStruct_ov17_0224A8D4; diff --git a/include/overlay017/struct_ov17_0224ABFC.h b/include/overlay017/struct_ov17_0224ABFC.h index 8926fdda32..7d59930df6 100644 --- a/include/overlay017/struct_ov17_0224ABFC.h +++ b/include/overlay017/struct_ov17_0224ABFC.h @@ -2,16 +2,18 @@ #define POKEPLATINUM_STRUCT_OV17_0224ABFC_H #include "struct_decls/cell_actor_data.h" -#include "sys_task_manager.h" + #include "overlay017/struct_ov17_0224B09C.h" +#include "sys_task_manager.h" + struct UnkStruct_ov17_0224DF54_t; typedef struct { - SysTask * unk_00; - CellActorData * unk_04; - struct UnkStruct_ov17_0224DF54_t * unk_08; - UnkStruct_ov17_0224B09C * unk_0C; + SysTask *unk_00; + CellActorData *unk_04; + struct UnkStruct_ov17_0224DF54_t *unk_08; + UnkStruct_ov17_0224B09C *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_0224AE84.h b/include/overlay017/struct_ov17_0224AE84.h index bacd2a1788..89fdfee51e 100644 --- a/include/overlay017/struct_ov17_0224AE84.h +++ b/include/overlay017/struct_ov17_0224AE84.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV17_0224AE84_H #include "struct_decls/cell_actor_data.h" + #include "sys_task_manager.h" typedef struct { - SysTask * unk_00; - CellActorData * unk_04; + SysTask *unk_00; + CellActorData *unk_04; s32 unk_08; s32 unk_0C; s32 unk_10; diff --git a/include/overlay017/struct_ov17_0224B058.h b/include/overlay017/struct_ov17_0224B058.h index 6effa9adcf..42b6ec7437 100644 --- a/include/overlay017/struct_ov17_0224B058.h +++ b/include/overlay017/struct_ov17_0224B058.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV17_0224B058_H #include "struct_decls/cell_actor_data.h" + #include "sys_task_manager.h" typedef struct { - SysTask * unk_00; - CellActorData * unk_04; + SysTask *unk_00; + CellActorData *unk_04; s32 unk_08; s32 unk_0C; s32 unk_10; diff --git a/include/overlay017/struct_ov17_0224B09C.h b/include/overlay017/struct_ov17_0224B09C.h index 3f41d571e8..155763fef5 100644 --- a/include/overlay017/struct_ov17_0224B09C.h +++ b/include/overlay017/struct_ov17_0224B09C.h @@ -4,7 +4,7 @@ #include "overlay022/struct_ov22_0225B1BC_decl.h" typedef struct { - UnkStruct_ov22_0225B1BC * unk_00; + UnkStruct_ov22_0225B1BC *unk_00; int unk_04; int unk_08; int unk_0C; diff --git a/include/overlay017/struct_ov17_0224BE50.h b/include/overlay017/struct_ov17_0224BE50.h index c4e961b854..b0bf43687e 100644 --- a/include/overlay017/struct_ov17_0224BE50.h +++ b/include/overlay017/struct_ov17_0224BE50.h @@ -2,16 +2,18 @@ #define POKEPLATINUM_STRUCT_OV17_0224BE50_H #include "struct_decls/sprite_decl.h" -#include "sys_task_manager.h" + #include "overlay017/struct_ov17_0224B09C.h" +#include "sys_task_manager.h" + struct UnkStruct_ov17_0224DF54_t; typedef struct { - struct UnkStruct_ov17_0224DF54_t * unk_00; - SysTask * unk_04; - Sprite * unk_08; - UnkStruct_ov17_0224B09C * unk_0C; + struct UnkStruct_ov17_0224DF54_t *unk_00; + SysTask *unk_04; + Sprite *unk_08; + UnkStruct_ov17_0224B09C *unk_0C; s32 unk_10; s32 unk_14; u8 unk_18; @@ -27,7 +29,7 @@ typedef struct { u8 unk_24_4 : 1; u8 unk_24_5 : 1; u8 unk_24_6 : 1; - u8 : 1; + u8 : 1; } UnkStruct_ov17_0224BE50; #endif // POKEPLATINUM_STRUCT_OV17_0224BE50_H diff --git a/include/overlay017/struct_ov17_0224C384.h b/include/overlay017/struct_ov17_0224C384.h index a48a58ad9c..e131dbd38a 100644 --- a/include/overlay017/struct_ov17_0224C384.h +++ b/include/overlay017/struct_ov17_0224C384.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_STRUCT_OV17_0224C384_H #include "struct_decls/cell_actor_data.h" + #include "sys_task_manager.h" struct UnkStruct_ov17_0224DF54_t; typedef struct { - SysTask * unk_00; - CellActorData * unk_04; - struct UnkStruct_ov17_0224DF54_t * unk_08; + SysTask *unk_00; + CellActorData *unk_04; + struct UnkStruct_ov17_0224DF54_t *unk_08; u8 unk_0C; } UnkStruct_ov17_0224C384; diff --git a/include/overlay017/struct_ov17_0224C9A4.h b/include/overlay017/struct_ov17_0224C9A4.h index ba0bcd6644..ef46f86a94 100644 --- a/include/overlay017/struct_ov17_0224C9A4.h +++ b/include/overlay017/struct_ov17_0224C9A4.h @@ -6,8 +6,8 @@ struct UnkStruct_ov17_0224DF54_t; typedef struct { - struct UnkStruct_ov17_0224DF54_t * unk_00; - SysTask * unk_04; + struct UnkStruct_ov17_0224DF54_t *unk_00; + SysTask *unk_04; u16 unk_08; u8 unk_0A; u8 unk_0B; diff --git a/include/overlay017/struct_ov17_0224CD84.h b/include/overlay017/struct_ov17_0224CD84.h index ca4033416b..b356d223be 100644 --- a/include/overlay017/struct_ov17_0224CD84.h +++ b/include/overlay017/struct_ov17_0224CD84.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV17_0224CD84_H typedef struct { - u16 * unk_00; + u16 *unk_00; u16 unk_04; u16 unk_06; u16 unk_08; diff --git a/include/overlay017/struct_ov17_0224D078.h b/include/overlay017/struct_ov17_0224D078.h index b558c7caa4..0801a57bfd 100644 --- a/include/overlay017/struct_ov17_0224D078.h +++ b/include/overlay017/struct_ov17_0224D078.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; + UnkStruct_ov17_0224DF54 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; s8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_0224D240.h b/include/overlay017/struct_ov17_0224D240.h index 318fe76764..8b20da818f 100644 --- a/include/overlay017/struct_ov17_0224D240.h +++ b/include/overlay017/struct_ov17_0224D240.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; + UnkStruct_ov17_0224DF54 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; s8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_0224D41C.h b/include/overlay017/struct_ov17_0224D41C.h index f6216c510c..73d4be9fdf 100644 --- a/include/overlay017/struct_ov17_0224D41C.h +++ b/include/overlay017/struct_ov17_0224D41C.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; + UnkStruct_ov17_0224DF54 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; s16 unk_12; diff --git a/include/overlay017/struct_ov17_0224D69C.h b/include/overlay017/struct_ov17_0224D69C.h index 87ccd58b49..002be73baa 100644 --- a/include/overlay017/struct_ov17_0224D69C.h +++ b/include/overlay017/struct_ov17_0224D69C.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_OV17_0224D69C_H #define POKEPLATINUM_STRUCT_OV17_0224D69C_H -#include "sys_task_manager.h" #include "overlay017/struct_ov17_0224DF54.h" #include "overlay017/struct_ov17_0224EDE0.h" +#include "sys_task_manager.h" + typedef struct { - SysTask * unk_00; - UnkStruct_ov17_0224DF54 * unk_04; + SysTask *unk_00; + UnkStruct_ov17_0224DF54 *unk_04; UnkStruct_ov17_0224EDE0 unk_08; u8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_0224D710.h b/include/overlay017/struct_ov17_0224D710.h index 08ac0924d9..36a3bb09fc 100644 --- a/include/overlay017/struct_ov17_0224D710.h +++ b/include/overlay017/struct_ov17_0224D710.h @@ -10,9 +10,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; + UnkStruct_ov17_0224DF54 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; @@ -22,7 +22,7 @@ typedef struct { UnkStruct_ov17_0224DF54_sub2 unk_18; UnkStruct_ov17_0224DC1C unk_50; UnkStruct_ov17_0224E958 unk_58[4]; - UnkStruct_ov17_0224D69C * unk_140[4]; + UnkStruct_ov17_0224D69C *unk_140[4]; } UnkStruct_ov17_0224D710; #endif // POKEPLATINUM_STRUCT_OV17_0224D710_H diff --git a/include/overlay017/struct_ov17_0224DC1C.h b/include/overlay017/struct_ov17_0224DC1C.h index 7ee7e3c52f..5071f0c204 100644 --- a/include/overlay017/struct_ov17_0224DC1C.h +++ b/include/overlay017/struct_ov17_0224DC1C.h @@ -4,7 +4,7 @@ #include "overlay017/struct_ov17_0224DF54.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; + UnkStruct_ov17_0224DF54 *unk_00; u8 unk_04; u8 unk_05; } UnkStruct_ov17_0224DC1C; diff --git a/include/overlay017/struct_ov17_0224DF54.h b/include/overlay017/struct_ov17_0224DF54.h index 70a65d7b1a..e149cd9480 100644 --- a/include/overlay017/struct_ov17_0224DF54.h +++ b/include/overlay017/struct_ov17_0224DF54.h @@ -2,9 +2,9 @@ #define POKEPLATINUM_STRUCT_OV17_0224DF54_H #include "struct_decls/struct_02014014_decl.h" -#include "sys_task_manager.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02095C48.h" + #include "overlay017/struct_ov17_0223E838.h" #include "overlay017/struct_ov17_0224A1EC.h" #include "overlay017/struct_ov17_0224B5C8.h" @@ -17,12 +17,14 @@ #include "overlay017/struct_ov17_0224EDE0.h" #include "overlay017/struct_ov17_0224F30C.h" +#include "sys_task_manager.h" + typedef struct UnkStruct_ov17_0224DF54_t { - UnkStruct_02095C48 * unk_00; - SysTask * unk_04; - SysTask * unk_08; - UnkStruct_02014014 * unk_0C; - GenericPointerData * unk_10; + UnkStruct_02095C48 *unk_00; + SysTask *unk_04; + SysTask *unk_08; + UnkStruct_02014014 *unk_0C; + GenericPointerData *unk_10; UnkStruct_ov17_0224A1EC unk_14; UnkStruct_ov17_0224DF54_sub1 unk_A3C; UnkStruct_ov17_0224DF54_sub2 unk_A6C; @@ -31,7 +33,7 @@ typedef struct UnkStruct_ov17_0224DF54_t { UnkStruct_ov17_0224BE50 unk_FC8[4]; UnkStruct_ov17_0224CD84 unk_1050; UnkStruct_ov17_0224CAC0 unk_1064; - void * unk_1074; + void *unk_1074; u8 unk_1078; u64 unk_107C; u64 unk_1084; diff --git a/include/overlay017/struct_ov17_0224DFF8.h b/include/overlay017/struct_ov17_0224DFF8.h index e59db92c1f..6a1b60bf4a 100644 --- a/include/overlay017/struct_ov17_0224DFF8.h +++ b/include/overlay017/struct_ov17_0224DFF8.h @@ -8,9 +8,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; + UnkStruct_ov17_0224DF54 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11[4]; UnkStruct_ov17_0224E1F4 unk_18[4]; diff --git a/include/overlay017/struct_ov17_0224E1F4.h b/include/overlay017/struct_ov17_0224E1F4.h index b58bcc8669..366aa9e0df 100644 --- a/include/overlay017/struct_ov17_0224E1F4.h +++ b/include/overlay017/struct_ov17_0224E1F4.h @@ -2,13 +2,15 @@ #define POKEPLATINUM_STRUCT_OV17_0224E1F4_H #include "struct_decls/sprite_decl.h" -#include "pokemon.h" + #include "overlay017/struct_ov17_0224B09C.h" +#include "pokemon.h" + typedef struct { - Pokemon * unk_00; - Sprite * unk_04; - UnkStruct_ov17_0224B09C * unk_08; + Pokemon *unk_00; + Sprite *unk_04; + UnkStruct_ov17_0224B09C *unk_08; u8 unk_0C; u8 unk_0D; u16 unk_0E; diff --git a/include/overlay017/struct_ov17_0224E4A8.h b/include/overlay017/struct_ov17_0224E4A8.h index 74c1ced06c..3201a47b79 100644 --- a/include/overlay017/struct_ov17_0224E4A8.h +++ b/include/overlay017/struct_ov17_0224E4A8.h @@ -7,9 +7,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; + UnkStruct_ov17_0224DF54 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; UnkStruct_ov17_0224DF54_sub2 unk_10; u8 unk_45; } UnkStruct_ov17_0224E4A8; diff --git a/include/overlay017/struct_ov17_0224E584.h b/include/overlay017/struct_ov17_0224E584.h index f52a185ca4..8039036301 100644 --- a/include/overlay017/struct_ov17_0224E584.h +++ b/include/overlay017/struct_ov17_0224E584.h @@ -7,9 +7,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; + UnkStruct_ov17_0224DF54 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; UnkStruct_ov17_0224DF54_sub2 unk_10; u8 unk_45; } UnkStruct_ov17_0224E584; diff --git a/include/overlay017/struct_ov17_0224E6C8.h b/include/overlay017/struct_ov17_0224E6C8.h index 3812d15f3f..b7ac07b78f 100644 --- a/include/overlay017/struct_ov17_0224E6C8.h +++ b/include/overlay017/struct_ov17_0224E6C8.h @@ -7,9 +7,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; + UnkStruct_ov17_0224DF54 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_0224E86C.h b/include/overlay017/struct_ov17_0224E86C.h index a701fb7ea6..6eff4cad08 100644 --- a/include/overlay017/struct_ov17_0224E86C.h +++ b/include/overlay017/struct_ov17_0224E86C.h @@ -7,9 +7,9 @@ #include "overlay017/struct_ov17_0224F30C.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; + UnkStruct_ov17_0224DF54 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; UnkStruct_ov17_0224DF54_sub2 unk_10; u32 unk_48; u8 unk_4C; diff --git a/include/overlay017/struct_ov17_0224EDE0.h b/include/overlay017/struct_ov17_0224EDE0.h index 3d90a67325..1cbd8063c5 100644 --- a/include/overlay017/struct_ov17_0224EDE0.h +++ b/include/overlay017/struct_ov17_0224EDE0.h @@ -12,7 +12,7 @@ typedef struct { u8 unk_08_0 : 1; u8 unk_08_1 : 1; u8 unk_08_2 : 1; - u8 : 5; + u8 : 5; } UnkStruct_ov17_0224EDE0; #endif // POKEPLATINUM_STRUCT_OV17_0224EDE0_H diff --git a/include/overlay017/struct_ov17_0224F30C.h b/include/overlay017/struct_ov17_0224F30C.h index 6792b785c1..43e39136a4 100644 --- a/include/overlay017/struct_ov17_0224F30C.h +++ b/include/overlay017/struct_ov17_0224F30C.h @@ -4,7 +4,7 @@ struct UnkStruct_ov17_022539E4_t; typedef struct { - const struct UnkStruct_ov17_022539E4_t * unk_00; + const struct UnkStruct_ov17_022539E4_t *unk_00; u16 unk_04; u8 unk_06; u8 unk_07; diff --git a/include/overlay017/struct_ov17_0224F3D8.h b/include/overlay017/struct_ov17_0224F3D8.h index 10a66e0147..c102eac060 100644 --- a/include/overlay017/struct_ov17_0224F3D8.h +++ b/include/overlay017/struct_ov17_0224F3D8.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV17_0224F3D8_H typedef struct { - void * unk_00[4]; + void *unk_00[4]; } UnkStruct_ov17_0224F3D8; #endif // POKEPLATINUM_STRUCT_OV17_0224F3D8_H diff --git a/include/overlay017/struct_ov17_0224FCA0.h b/include/overlay017/struct_ov17_0224FCA0.h index b5820afb7c..ef0b377e40 100644 --- a/include/overlay017/struct_ov17_0224FCA0.h +++ b/include/overlay017/struct_ov17_0224FCA0.h @@ -1,9 +1,9 @@ #ifndef POKEPLATINUM_STRUCT_OV17_0224FCA0_H #define POKEPLATINUM_STRUCT_OV17_0224FCA0_H -#include "sys_task_manager.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02095C48.h" + #include "overlay017/struct_ov17_0224F30C.h" #include "overlay017/struct_ov17_0224FCA0_sub1.h" #include "overlay017/struct_ov17_0224FCA0_sub2.h" @@ -11,16 +11,18 @@ #include "overlay017/struct_ov17_0224FECC.h" #include "overlay017/struct_ov17_022507C4.h" +#include "sys_task_manager.h" + typedef struct { - UnkStruct_02095C48 * unk_00; - SysTask * unk_04; - SysTask * unk_08; - GenericPointerData * unk_0C; + UnkStruct_02095C48 *unk_00; + SysTask *unk_04; + SysTask *unk_08; + GenericPointerData *unk_0C; UnkStruct_ov17_022507C4 unk_10; UnkStruct_ov17_0224FCA0_sub1 unk_39A; UnkStruct_ov17_0224FCA0_sub2 unk_434; UnkStruct_ov17_0224FCA0_sub3 unk_446[4]; - void * unk_848; + void *unk_848; u16 unk_84C; u16 unk_84E; u8 unk_850; diff --git a/include/overlay017/struct_ov17_022507C4.h b/include/overlay017/struct_ov17_022507C4.h index 59afe3316d..ace346c613 100644 --- a/include/overlay017/struct_ov17_022507C4.h +++ b/include/overlay017/struct_ov17_022507C4.h @@ -1,44 +1,46 @@ #ifndef POKEPLATINUM_STRUCT_OV17_022507C4_H #define POKEPLATINUM_STRUCT_OV17_022507C4_H +#include "struct_decls/cell_actor_data.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48_sub1.h" + #include "battle/struct_ov16_0223E0C8.h" #include "overlay017/struct_ov17_0223F6E8.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" + typedef struct { - UnkStruct_02095C48_sub1 * unk_00; - UnkStruct_02007768 * unk_04; - Sprite * unk_08[4]; - SpriteRenderer * unk_18; - SpriteGfxHandler * unk_1C; - BGL * unk_20; + UnkStruct_02095C48_sub1 *unk_00; + UnkStruct_02007768 *unk_04; + Sprite *unk_08[4]; + SpriteRenderer *unk_18; + SpriteGfxHandler *unk_1C; + BGL *unk_20; Window unk_24[9]; - MessageLoader * unk_B4; - StringTemplate * unk_B8; - Strbuf* unk_BC; - PaletteData * unk_C0; - UnkStruct_02012744 * unk_C4; + MessageLoader *unk_B4; + StringTemplate *unk_B8; + Strbuf *unk_BC; + PaletteData *unk_C0; + UnkStruct_02012744 *unk_C4; UnkStruct_ov16_0223E0C8 unk_C8[4]; UnkStruct_ov17_0223F6E8 unk_108; - SysTask * unk_124; - CellActorData * unk_128[4]; - CellActorData * unk_138[4]; - CellActorData * unk_148[4][12]; - CellActorData * unk_208[4][12]; - CellActorData * unk_2C8[4][12]; + SysTask *unk_124; + CellActorData *unk_128[4]; + CellActorData *unk_138[4]; + CellActorData *unk_148[4][12]; + CellActorData *unk_208[4][12]; + CellActorData *unk_2C8[4][12]; u8 unk_388; } UnkStruct_ov17_022507C4; diff --git a/include/overlay017/struct_ov17_02251EAC.h b/include/overlay017/struct_ov17_02251EAC.h index 05647f6295..379d7b1bfa 100644 --- a/include/overlay017/struct_ov17_02251EAC.h +++ b/include/overlay017/struct_ov17_02251EAC.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224FCA0.h" typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; + UnkStruct_ov17_0224FCA0 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; s8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_0225201C.h b/include/overlay017/struct_ov17_0225201C.h index e7e7c852bf..36a038d2c7 100644 --- a/include/overlay017/struct_ov17_0225201C.h +++ b/include/overlay017/struct_ov17_0225201C.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224FCA0.h" typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; + UnkStruct_ov17_0224FCA0 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; s8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_0225228C.h b/include/overlay017/struct_ov17_0225228C.h index 12fbc46f7f..471ab94aad 100644 --- a/include/overlay017/struct_ov17_0225228C.h +++ b/include/overlay017/struct_ov17_0225228C.h @@ -7,9 +7,9 @@ #include "overlay017/struct_ov17_022508E4.h" typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; + UnkStruct_ov17_0224FCA0 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_022523AC.h b/include/overlay017/struct_ov17_022523AC.h index c23208c5c7..99eb1420e1 100644 --- a/include/overlay017/struct_ov17_022523AC.h +++ b/include/overlay017/struct_ov17_022523AC.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224FCA0.h" typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; + UnkStruct_ov17_0224FCA0 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; } UnkStruct_ov17_022523AC; diff --git a/include/overlay017/struct_ov17_02252580.h b/include/overlay017/struct_ov17_02252580.h index c11936ee76..f475288486 100644 --- a/include/overlay017/struct_ov17_02252580.h +++ b/include/overlay017/struct_ov17_02252580.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224FCA0.h" typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; + UnkStruct_ov17_0224FCA0 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11[4]; u8 unk_15; diff --git a/include/overlay017/struct_ov17_0225266C.h b/include/overlay017/struct_ov17_0225266C.h index a1b88f3376..4012f550f6 100644 --- a/include/overlay017/struct_ov17_0225266C.h +++ b/include/overlay017/struct_ov17_0225266C.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224FCA0.h" typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; + UnkStruct_ov17_0224FCA0 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; diff --git a/include/overlay017/struct_ov17_02252858.h b/include/overlay017/struct_ov17_02252858.h index b5e0d9beeb..82c5183258 100644 --- a/include/overlay017/struct_ov17_02252858.h +++ b/include/overlay017/struct_ov17_02252858.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224FCA0.h" typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; + UnkStruct_ov17_0224FCA0 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; u8 unk_11; s16 unk_12; diff --git a/include/overlay017/struct_ov17_022529C8.h b/include/overlay017/struct_ov17_022529C8.h index 5e1f45e874..063a823a5e 100644 --- a/include/overlay017/struct_ov17_022529C8.h +++ b/include/overlay017/struct_ov17_022529C8.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224FCA0.h" typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; + UnkStruct_ov17_0224FCA0 *unk_00; UnkStruct_ov17_02243C80 unk_04; - UnkStruct_ov17_0224F30C * unk_0C; + UnkStruct_ov17_0224F30C *unk_0C; u8 unk_10; s16 unk_12; } UnkStruct_ov17_022529C8; diff --git a/include/overlay017/struct_ov17_022539E4.h b/include/overlay017/struct_ov17_022539E4.h index c0137692c8..63a97228c5 100644 --- a/include/overlay017/struct_ov17_022539E4.h +++ b/include/overlay017/struct_ov17_022539E4.h @@ -6,9 +6,9 @@ #include "overlay017/struct_ov17_0224F3D8.h" typedef struct UnkStruct_ov17_022539E4_t { - int (* unk_00)(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); - void (* unk_04)(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); - void (* unk_08)(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4); + int (*unk_00)(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); + void (*unk_04)(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); + void (*unk_08)(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4); } UnkStruct_ov17_022539E4; #endif // POKEPLATINUM_STRUCT_OV17_022539E4_H diff --git a/include/overlay019/funcptr_ov19_021D79B8.h b/include/overlay019/funcptr_ov19_021D79B8.h index b681b7ccec..b821493e56 100644 --- a/include/overlay019/funcptr_ov19_021D79B8.h +++ b/include/overlay019/funcptr_ov19_021D79B8.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV19_021D79B8_H #define POKEPLATINUM_FUNCPTR_OV19_021D79B8_H -typedef void (* UnkFuncPtr_ov19_021D79B8)(void *); +typedef void (*UnkFuncPtr_ov19_021D79B8)(void *); #endif // POKEPLATINUM_FUNCPTR_OV19_021D79B8_H diff --git a/include/overlay019/ov19_021D0D80.h b/include/overlay019/ov19_021D0D80.h index 494e882242..cbe5e24127 100644 --- a/include/overlay019/ov19_021D0D80.h +++ b/include/overlay019/ov19_021D0D80.h @@ -1,60 +1,62 @@ #ifndef POKEPLATINUM_OV19_021D0D80_H #define POKEPLATINUM_OV19_021D0D80_H -#include "overlay_manager.h" -#include "message.h" -#include "string_template.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D4F5C.h" #include "overlay019/struct_ov19_021D5BAC.h" #include "overlay019/struct_ov19_021D5DF8_decl.h" #include "overlay019/struct_ov19_021D5FAC.h" -int ov19_021D0D80(OverlayManager * param0, int * param1); -int ov19_021D0DEC(OverlayManager * param0, int * param1); -int ov19_021D0E58(OverlayManager * param0, int * param1); -BOOL ov19_021D3B18(const UnkStruct_ov19_021D5DF8 * param0); -BOOL ov19_021D3B20(const UnkStruct_ov19_021D5DF8 * param0); -MessageLoader * ov19_021D5DE8(const UnkStruct_ov19_021D5DF8 * param0); -const StringTemplate * ov19_021D5DF0(const UnkStruct_ov19_021D5DF8 * param0); -int ov19_021D5DF8(const UnkStruct_ov19_021D5DF8 * param0); -u32 ov19_021D5E08(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5E10(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5E14(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5E1C(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5E24(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5E2C(const UnkStruct_ov19_021D4DF0 * param0); -BOOL ov19_021D5E34(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5E38(const UnkStruct_ov19_021D4DF0 * param0); -BOOL ov19_021D5E3C(const UnkStruct_ov19_021D4DF0 * param0); -BOOL ov19_021D5E4C(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5E68(const UnkStruct_ov19_021D4DF0 * param0); -const UnkStruct_ov19_021D5BAC * ov19_021D5E70(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5E74(const UnkStruct_ov19_021D4DF0 * param0); -const UnkStruct_ov19_021D4F5C * ov19_021D5E8C(const UnkStruct_ov19_021D4DF0 * param0); -const PCBoxes * ov19_021D5E90(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5E94(const UnkStruct_ov19_021D4DF0 * param0); -BoxPokemon * ov19_021D5E9C(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5EA0(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5EA8(const UnkStruct_ov19_021D4DF0 * param0); -s32 ov19_021D5EB0(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5EB8(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5EC0(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5EC8(const UnkStruct_ov19_021D4DF0 * param0); -BOOL ov19_021D5EE0(const UnkStruct_ov19_021D4DF0 * param0); -void ov19_021D5EE8(const UnkStruct_ov19_021D4DF0 * param0, u32 * param1, u32 * param2, u32 * param3, u32 * param4); -BOOL ov19_021D5F20(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5F3C(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5F6C(const UnkStruct_ov19_021D4DF0 * param0, u32 param1); -u32 ov19_021D5F7C(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5F88(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5F9C(const UnkStruct_ov19_021D4DF0 * param0); -u32 ov19_021D5FA4(const UnkStruct_ov19_021D4DF0 * param0); -const UnkStruct_ov19_021D5FAC * ov19_021D5FAC(const UnkStruct_ov19_021D4DF0 * param0, int param1); -BOOL ov19_021D5FB8(const UnkStruct_ov19_021D4DF0 * param0, int param1); -BOOL ov19_021D5FC0(const UnkStruct_ov19_021D4DF0 * param0); -BOOL ov19_021D5FC8(const UnkStruct_ov19_021D4DF0 * param0); +#include "message.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "string_template.h" + +int ov19_021D0D80(OverlayManager *param0, int *param1); +int ov19_021D0DEC(OverlayManager *param0, int *param1); +int ov19_021D0E58(OverlayManager *param0, int *param1); +BOOL ov19_021D3B18(const UnkStruct_ov19_021D5DF8 *param0); +BOOL ov19_021D3B20(const UnkStruct_ov19_021D5DF8 *param0); +MessageLoader *ov19_021D5DE8(const UnkStruct_ov19_021D5DF8 *param0); +const StringTemplate *ov19_021D5DF0(const UnkStruct_ov19_021D5DF8 *param0); +int ov19_021D5DF8(const UnkStruct_ov19_021D5DF8 *param0); +u32 ov19_021D5E08(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5E10(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5E14(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5E1C(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5E24(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5E2C(const UnkStruct_ov19_021D4DF0 *param0); +BOOL ov19_021D5E34(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5E38(const UnkStruct_ov19_021D4DF0 *param0); +BOOL ov19_021D5E3C(const UnkStruct_ov19_021D4DF0 *param0); +BOOL ov19_021D5E4C(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5E68(const UnkStruct_ov19_021D4DF0 *param0); +const UnkStruct_ov19_021D5BAC *ov19_021D5E70(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5E74(const UnkStruct_ov19_021D4DF0 *param0); +const UnkStruct_ov19_021D4F5C *ov19_021D5E8C(const UnkStruct_ov19_021D4DF0 *param0); +const PCBoxes *ov19_021D5E90(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5E94(const UnkStruct_ov19_021D4DF0 *param0); +BoxPokemon *ov19_021D5E9C(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5EA0(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5EA8(const UnkStruct_ov19_021D4DF0 *param0); +s32 ov19_021D5EB0(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5EB8(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5EC0(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5EC8(const UnkStruct_ov19_021D4DF0 *param0); +BOOL ov19_021D5EE0(const UnkStruct_ov19_021D4DF0 *param0); +void ov19_021D5EE8(const UnkStruct_ov19_021D4DF0 *param0, u32 *param1, u32 *param2, u32 *param3, u32 *param4); +BOOL ov19_021D5F20(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5F3C(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5F6C(const UnkStruct_ov19_021D4DF0 *param0, u32 param1); +u32 ov19_021D5F7C(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5F88(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5F9C(const UnkStruct_ov19_021D4DF0 *param0); +u32 ov19_021D5FA4(const UnkStruct_ov19_021D4DF0 *param0); +const UnkStruct_ov19_021D5FAC *ov19_021D5FAC(const UnkStruct_ov19_021D4DF0 *param0, int param1); +BOOL ov19_021D5FB8(const UnkStruct_ov19_021D4DF0 *param0, int param1); +BOOL ov19_021D5FC0(const UnkStruct_ov19_021D4DF0 *param0); +BOOL ov19_021D5FC8(const UnkStruct_ov19_021D4DF0 *param0); #endif // POKEPLATINUM_OV19_021D0D80_H diff --git a/include/overlay019/ov19_021D603C.h b/include/overlay019/ov19_021D603C.h index 2dc48c0b6a..0096b012e2 100644 --- a/include/overlay019/ov19_021D603C.h +++ b/include/overlay019/ov19_021D603C.h @@ -3,8 +3,8 @@ #include "overlay019/struct_ov19_021D6104.h" -void ov19_021D603C(UnkStruct_ov19_021D6104 * param0, int param1, int param2, int param3, int param4); -int ov19_021D60A8(UnkStruct_ov19_021D6104 * param0); -int ov19_021D614C(const UnkStruct_ov19_021D6104 * param0); +void ov19_021D603C(UnkStruct_ov19_021D6104 *param0, int param1, int param2, int param3, int param4); +int ov19_021D60A8(UnkStruct_ov19_021D6104 *param0); +int ov19_021D614C(const UnkStruct_ov19_021D6104 *param0); #endif // POKEPLATINUM_OV19_021D603C_H diff --git a/include/overlay019/ov19_021D61B0.h b/include/overlay019/ov19_021D61B0.h index 6ebc2c6e9b..83cd870284 100644 --- a/include/overlay019/ov19_021D61B0.h +++ b/include/overlay019/ov19_021D61B0.h @@ -1,14 +1,16 @@ #ifndef POKEPLATINUM_OV19_021D61B0_H #define POKEPLATINUM_OV19_021D61B0_H +#include + #include "struct_decls/struct_02007768_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" + +#include "overlay019/funcptr_ov19_021D79B8.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D5DF8_decl.h" #include "overlay019/struct_ov19_021D61B0_decl.h" -#include "overlay019/funcptr_ov19_021D79B8.h" #include "overlay019/struct_ov19_021D8318.h" #include "overlay019/struct_ov19_021D8E00.h" #include "overlay019/struct_ov19_021DA384.h" @@ -17,28 +19,28 @@ #include "overlay019/struct_ov19_021DC680.h" #include "overlay019/struct_ov19_021DE3E8_decl.h" -#include +#include "sys_task_manager.h" -BOOL ov19_021D61B0(UnkStruct_ov19_021D61B0 ** param0, const UnkStruct_ov19_021D4DF0 * param1, const UnkStruct_ov19_021D5DF8 * param2); -void ov19_021D64A0(UnkStruct_ov19_021D61B0 * param0); -void ov19_021D6594(UnkStruct_ov19_021D61B0 * param0, u32 param1); -BOOL ov19_021D6600(UnkStruct_ov19_021D61B0 * param0, u32 param1); -BOOL ov19_021D6628(UnkStruct_ov19_021D61B0 * param0); -SysTask * ov19_021D77C8(SysTaskFunc param0, void * param1, u32 param2); -NNSG2dImagePaletteProxy * ov19_021D77D0(UnkStruct_ov19_021D61B0 * param0); -UnkStruct_ov19_021DA384 * ov19_021D77D8(UnkStruct_ov19_021D61B0 * param0); -UnkStruct_ov19_021D8318 * ov19_021D77E0(UnkStruct_ov19_021D61B0 * param0); -UnkStruct_ov19_021DC680 * ov19_021D77E8(UnkStruct_ov19_021D61B0 * param0); -UnkStruct_ov19_021D8E00 * ov19_021D77F4(UnkStruct_ov19_021D61B0 * param0); -UnkStruct_ov19_021DE3E8 * ov19_021D7800(UnkStruct_ov19_021D61B0 * param0); -UnkStruct_ov19_021DBA9C * ov19_021D780C(UnkStruct_ov19_021D61B0 * param0); -UnkStruct_02007768 * ov19_021D7818(UnkStruct_ov19_021D61B0 * param0); -int ov19_021D7820(UnkStruct_ov19_021D61B0 * param0); -void ov19_021D783C(UnkStruct_ov19_021DA864 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, NNSG2dCellDataBank * param3, NNSG2dCellAnimBankData * param4, u32 param5); -GraphicElementData * ov19_021D785C(GraphicElementManager * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5); -void ov19_021D78AC(GraphicElementData * param0, u32 param1); -void ov19_021D78C8(const u16 * param0, u16 * param1, u32 param2, u16 param3, u32 param4); -const UnkStruct_ov19_021D5DF8 * ov19_021D7964(UnkStruct_ov19_021D61B0 * param0); -void ov19_021D79B8(void * param0, UnkFuncPtr_ov19_021D79B8 param1, void * param2); +BOOL ov19_021D61B0(UnkStruct_ov19_021D61B0 **param0, const UnkStruct_ov19_021D4DF0 *param1, const UnkStruct_ov19_021D5DF8 *param2); +void ov19_021D64A0(UnkStruct_ov19_021D61B0 *param0); +void ov19_021D6594(UnkStruct_ov19_021D61B0 *param0, u32 param1); +BOOL ov19_021D6600(UnkStruct_ov19_021D61B0 *param0, u32 param1); +BOOL ov19_021D6628(UnkStruct_ov19_021D61B0 *param0); +SysTask *ov19_021D77C8(SysTaskFunc param0, void *param1, u32 param2); +NNSG2dImagePaletteProxy *ov19_021D77D0(UnkStruct_ov19_021D61B0 *param0); +UnkStruct_ov19_021DA384 *ov19_021D77D8(UnkStruct_ov19_021D61B0 *param0); +UnkStruct_ov19_021D8318 *ov19_021D77E0(UnkStruct_ov19_021D61B0 *param0); +UnkStruct_ov19_021DC680 *ov19_021D77E8(UnkStruct_ov19_021D61B0 *param0); +UnkStruct_ov19_021D8E00 *ov19_021D77F4(UnkStruct_ov19_021D61B0 *param0); +UnkStruct_ov19_021DE3E8 *ov19_021D7800(UnkStruct_ov19_021D61B0 *param0); +UnkStruct_ov19_021DBA9C *ov19_021D780C(UnkStruct_ov19_021D61B0 *param0); +UnkStruct_02007768 *ov19_021D7818(UnkStruct_ov19_021D61B0 *param0); +int ov19_021D7820(UnkStruct_ov19_021D61B0 *param0); +void ov19_021D783C(UnkStruct_ov19_021DA864 *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, NNSG2dCellDataBank *param3, NNSG2dCellAnimBankData *param4, u32 param5); +GraphicElementData *ov19_021D785C(GraphicElementManager *param0, UnkStruct_ov19_021DA864 *param1, u32 param2, u32 param3, u32 param4, int param5); +void ov19_021D78AC(GraphicElementData *param0, u32 param1); +void ov19_021D78C8(const u16 *param0, u16 *param1, u32 param2, u16 param3, u32 param4); +const UnkStruct_ov19_021D5DF8 *ov19_021D7964(UnkStruct_ov19_021D61B0 *param0); +void ov19_021D79B8(void *param0, UnkFuncPtr_ov19_021D79B8 param1, void *param2); #endif // POKEPLATINUM_OV19_021D61B0_H diff --git a/include/overlay019/ov19_021D79F8.h b/include/overlay019/ov19_021D79F8.h index 4879a9251b..741710e96b 100644 --- a/include/overlay019/ov19_021D79F8.h +++ b/include/overlay019/ov19_021D79F8.h @@ -3,31 +3,32 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D4F5C.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D8318.h" #include "overlay019/struct_ov19_021DCD18.h" -BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4); -void ov19_021D7A74(UnkStruct_ov19_021D8318 * param0); -void ov19_021D7A9C(UnkStruct_ov19_021D8318 * param0); -void ov19_021D7B4C(UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, int param2, BOOL param3); -void ov19_021D7D70(UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, int param2); -BOOL ov19_021D7E1C(UnkStruct_ov19_021D8318 * param0); -void ov19_021D8350(UnkStruct_ov19_021D8318 * param0); -BOOL ov19_021D8370(UnkStruct_ov19_021D8318 * param0); -void ov19_021D8408(UnkStruct_ov19_021D8318 * param0, u32 param1, s32 param2, UnkStruct_ov19_021DCD18 * param3); -void ov19_021D845C(UnkStruct_ov19_021D8318 * param0, u32 param1, const UnkStruct_ov19_021DCD18 * param2); -UnkStruct_ov19_021DCD18 * ov19_021D84C8(UnkStruct_ov19_021D8318 * param0, u32 param1); -void ov19_021D84E0(UnkStruct_ov19_021D8318 * param0); -void ov19_021D8860(UnkStruct_ov19_021D8318 * param0, u32 param1); -BOOL ov19_021D8898(UnkStruct_ov19_021D8318 * param0); -void ov19_021D8938(UnkStruct_ov19_021D8318 * param0); -void ov19_021D8988(UnkStruct_ov19_021D8318 * param0, u32 param1, u32 param2); -void ov19_021D89F4(UnkStruct_ov19_021D8318 * param0, u32 param1); -void ov19_021D8A24(UnkStruct_ov19_021D8318 * param0); -void ov19_021D8A6C(UnkStruct_ov19_021D8318 * param0); -void ov19_021D8B14(UnkStruct_ov19_021D8318 * param0); +BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4); +void ov19_021D7A74(UnkStruct_ov19_021D8318 *param0); +void ov19_021D7A9C(UnkStruct_ov19_021D8318 *param0); +void ov19_021D7B4C(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2, BOOL param3); +void ov19_021D7D70(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2); +BOOL ov19_021D7E1C(UnkStruct_ov19_021D8318 *param0); +void ov19_021D8350(UnkStruct_ov19_021D8318 *param0); +BOOL ov19_021D8370(UnkStruct_ov19_021D8318 *param0); +void ov19_021D8408(UnkStruct_ov19_021D8318 *param0, u32 param1, s32 param2, UnkStruct_ov19_021DCD18 *param3); +void ov19_021D845C(UnkStruct_ov19_021D8318 *param0, u32 param1, const UnkStruct_ov19_021DCD18 *param2); +UnkStruct_ov19_021DCD18 *ov19_021D84C8(UnkStruct_ov19_021D8318 *param0, u32 param1); +void ov19_021D84E0(UnkStruct_ov19_021D8318 *param0); +void ov19_021D8860(UnkStruct_ov19_021D8318 *param0, u32 param1); +BOOL ov19_021D8898(UnkStruct_ov19_021D8318 *param0); +void ov19_021D8938(UnkStruct_ov19_021D8318 *param0); +void ov19_021D8988(UnkStruct_ov19_021D8318 *param0, u32 param1, u32 param2); +void ov19_021D89F4(UnkStruct_ov19_021D8318 *param0, u32 param1); +void ov19_021D8A24(UnkStruct_ov19_021D8318 *param0); +void ov19_021D8A6C(UnkStruct_ov19_021D8318 *param0); +void ov19_021D8B14(UnkStruct_ov19_021D8318 *param0); #endif // POKEPLATINUM_OV19_021D79F8_H diff --git a/include/overlay019/ov19_021D8B54.h b/include/overlay019/ov19_021D8B54.h index 969770cde1..22a9aa9aa1 100644 --- a/include/overlay019/ov19_021D8B54.h +++ b/include/overlay019/ov19_021D8B54.h @@ -1,47 +1,48 @@ #ifndef POKEPLATINUM_OV19_021D8B54_H #define POKEPLATINUM_OV19_021D8B54_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D8E00.h" -#include - -BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4); -void ov19_021D8C1C(UnkStruct_ov19_021D8E00 * param0, NARC * param1); -void ov19_021D8E84(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D8F60(UnkStruct_ov19_021D8E00 * param0); -BOOL ov19_021D9074(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9230(UnkStruct_ov19_021D8E00 * param0); -BOOL ov19_021D9278(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9368(UnkStruct_ov19_021D8E00 * param0); -BOOL ov19_021D939C(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D94B4(UnkStruct_ov19_021D8E00 * param0); -BOOL ov19_021D9530(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9690(UnkStruct_ov19_021D8E00 * param0); -BOOL ov19_021D9704(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D97FC(UnkStruct_ov19_021D8E00 * param0); -BOOL ov19_021D9858(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9900(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9938(UnkStruct_ov19_021D8E00 * param0); -BOOL ov19_021D995C(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D99F4(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9A2C(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9A64(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9A8C(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9AB0(UnkStruct_ov19_021D8E00 * param0, u32 param1); -void ov19_021D9AEC(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9B10(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9B1C(UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1); -void ov19_021D9B34(UnkStruct_ov19_021D8E00 * param0); -BOOL ov19_021D9B64(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9BD4(UnkStruct_ov19_021D8E00 * param0); -BOOL ov19_021D9C04(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9C74(UnkStruct_ov19_021D8E00 * param0); -BOOL ov19_021D9CA0(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9D10(UnkStruct_ov19_021D8E00 * param0); -void ov19_021D9D28(UnkStruct_ov19_021D8E00 * param0); +BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, GraphicElementManager *param3, NARC *param4); +void ov19_021D8C1C(UnkStruct_ov19_021D8E00 *param0, NARC *param1); +void ov19_021D8E84(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D8F60(UnkStruct_ov19_021D8E00 *param0); +BOOL ov19_021D9074(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9230(UnkStruct_ov19_021D8E00 *param0); +BOOL ov19_021D9278(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9368(UnkStruct_ov19_021D8E00 *param0); +BOOL ov19_021D939C(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D94B4(UnkStruct_ov19_021D8E00 *param0); +BOOL ov19_021D9530(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9690(UnkStruct_ov19_021D8E00 *param0); +BOOL ov19_021D9704(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D97FC(UnkStruct_ov19_021D8E00 *param0); +BOOL ov19_021D9858(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9900(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9938(UnkStruct_ov19_021D8E00 *param0); +BOOL ov19_021D995C(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D99F4(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9A2C(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9A64(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9A8C(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9AB0(UnkStruct_ov19_021D8E00 *param0, u32 param1); +void ov19_021D9AEC(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9B10(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9B1C(UnkStruct_ov19_021D8E00 *param0, VecFx32 *param1); +void ov19_021D9B34(UnkStruct_ov19_021D8E00 *param0); +BOOL ov19_021D9B64(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9BD4(UnkStruct_ov19_021D8E00 *param0); +BOOL ov19_021D9C04(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9C74(UnkStruct_ov19_021D8E00 *param0); +BOOL ov19_021D9CA0(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9D10(UnkStruct_ov19_021D8E00 *param0); +void ov19_021D9D28(UnkStruct_ov19_021D8E00 *param0); #endif // POKEPLATINUM_OV19_021D8B54_H diff --git a/include/overlay019/ov19_021DA270.h b/include/overlay019/ov19_021DA270.h index a302100490..3ab8edaf5c 100644 --- a/include/overlay019/ov19_021DA270.h +++ b/include/overlay019/ov19_021DA270.h @@ -1,33 +1,35 @@ #ifndef POKEPLATINUM_OV19_021DA270_H #define POKEPLATINUM_OV19_021DA270_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "pokemon.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DCD18.h" -#include +#include "pokemon.h" -BOOL ov19_021DA270(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4); -void ov19_021DA384(UnkStruct_ov19_021DA384 * param0); -void ov19_021DA3CC(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -void ov19_021DA3F0(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -void ov19_021DA418(const UnkStruct_ov19_021DCD18 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -void ov19_021DA428(UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, s32 param2, s32 param3, u32 param4, u32 param5, u32 param6, UnkStruct_ov19_021DCD18 * param7); -void ov19_021DA548(UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, u32 param2, u32 param3, u8 * param4, s32 param5, s32 param6, u32 param7, u32 param8, u32 param9, UnkStruct_ov19_021DCD18 * param10); -void ov19_021DA63C(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -void ov19_021DA68C(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -void ov19_021DA690(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -void ov19_021DA694(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, BOOL param2); -void ov19_021DA744(UnkStruct_ov19_021DA384 * param0, void * param1, u32 param2, u32 param3); -void ov19_021DA754(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -void ov19_021DA7B8(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -BOOL ov19_021DA7E0(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1); -void ov19_021DA7F4(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, BOOL param2); -NNSG2dCellDataBank * ov19_021DA80C(UnkStruct_ov19_021DA384 * param0); -NNSG2dAnimBankData * ov19_021DA810(UnkStruct_ov19_021DA384 * param0); +BOOL ov19_021DA270(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, GraphicElementManager *param3, NARC *param4); +void ov19_021DA384(UnkStruct_ov19_021DA384 *param0); +void ov19_021DA3CC(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2); +void ov19_021DA3F0(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2); +void ov19_021DA418(const UnkStruct_ov19_021DCD18 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2); +void ov19_021DA428(UnkStruct_ov19_021DA384 *param0, BoxPokemon *param1, s32 param2, s32 param3, u32 param4, u32 param5, u32 param6, UnkStruct_ov19_021DCD18 *param7); +void ov19_021DA548(UnkStruct_ov19_021DA384 *param0, BoxPokemon *param1, u32 param2, u32 param3, u8 *param4, s32 param5, s32 param6, u32 param7, u32 param8, u32 param9, UnkStruct_ov19_021DCD18 *param10); +void ov19_021DA63C(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2); +void ov19_021DA68C(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2); +void ov19_021DA690(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2); +void ov19_021DA694(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, BOOL param2); +void ov19_021DA744(UnkStruct_ov19_021DA384 *param0, void *param1, u32 param2, u32 param3); +void ov19_021DA754(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2); +void ov19_021DA7B8(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2); +BOOL ov19_021DA7E0(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1); +void ov19_021DA7F4(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, BOOL param2); +NNSG2dCellDataBank *ov19_021DA80C(UnkStruct_ov19_021DA384 *param0); +NNSG2dAnimBankData *ov19_021DA810(UnkStruct_ov19_021DA384 *param0); #endif // POKEPLATINUM_OV19_021DA270_H diff --git a/include/overlay019/ov19_021DA814.h b/include/overlay019/ov19_021DA814.h index 9f69724964..a6d208d066 100644 --- a/include/overlay019/ov19_021DA814.h +++ b/include/overlay019/ov19_021DA814.h @@ -3,13 +3,14 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA8D8.h" -BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4); -void ov19_021DA864(UnkStruct_ov19_021DA8D8 * param0, NARC * param1); -void ov19_021DA8D8(UnkStruct_ov19_021DA8D8 * param0); -void ov19_021DA8FC(UnkStruct_ov19_021DA8D8 * param0, int param1); +BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, GraphicElementManager *param3, NARC *param4); +void ov19_021DA864(UnkStruct_ov19_021DA8D8 *param0, NARC *param1); +void ov19_021DA8D8(UnkStruct_ov19_021DA8D8 *param0); +void ov19_021DA8FC(UnkStruct_ov19_021DA8D8 *param0, int param1); #endif // POKEPLATINUM_OV19_021DA814_H diff --git a/include/overlay019/ov19_021DA92C.h b/include/overlay019/ov19_021DA92C.h index ae7381a24a..f58405a0ab 100644 --- a/include/overlay019/ov19_021DA92C.h +++ b/include/overlay019/ov19_021DA92C.h @@ -2,24 +2,26 @@ #define POKEPLATINUM_OV19_021DA92C_H #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA9E0.h" -BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, const MessageLoader * param5, NARC * param6); -void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 * param0); -void ov19_021DAA80(UnkStruct_ov19_021DA9E0 * param0); -void ov19_021DAA90(UnkStruct_ov19_021DA9E0 * param0); -BOOL ov19_021DAAC4(UnkStruct_ov19_021DA9E0 * param0); -void ov19_021DAADC(UnkStruct_ov19_021DA9E0 * param0); -void ov19_021DAF98(UnkStruct_ov19_021DA9E0 * param0); -void ov19_021DAFF8(UnkStruct_ov19_021DA9E0 * param0); -void ov19_021DB078(UnkStruct_ov19_021DA9E0 * param0); -BOOL ov19_021DB220(UnkStruct_ov19_021DA9E0 * param0); -void ov19_021DB224(UnkStruct_ov19_021DA9E0 * param0); -void ov19_021DB2B0(UnkStruct_ov19_021DA9E0 * param0); +#include "message.h" + +BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4, const MessageLoader *param5, NARC *param6); +void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 *param0); +void ov19_021DAA80(UnkStruct_ov19_021DA9E0 *param0); +void ov19_021DAA90(UnkStruct_ov19_021DA9E0 *param0); +BOOL ov19_021DAAC4(UnkStruct_ov19_021DA9E0 *param0); +void ov19_021DAADC(UnkStruct_ov19_021DA9E0 *param0); +void ov19_021DAF98(UnkStruct_ov19_021DA9E0 *param0); +void ov19_021DAFF8(UnkStruct_ov19_021DA9E0 *param0); +void ov19_021DB078(UnkStruct_ov19_021DA9E0 *param0); +BOOL ov19_021DB220(UnkStruct_ov19_021DA9E0 *param0); +void ov19_021DB224(UnkStruct_ov19_021DA9E0 *param0); +void ov19_021DB2B0(UnkStruct_ov19_021DA9E0 *param0); #endif // POKEPLATINUM_OV19_021DA92C_H diff --git a/include/overlay019/ov19_021DB2FC.h b/include/overlay019/ov19_021DB2FC.h index 74795ba93c..d13a256b80 100644 --- a/include/overlay019/ov19_021DB2FC.h +++ b/include/overlay019/ov19_021DB2FC.h @@ -2,22 +2,24 @@ #define POKEPLATINUM_OV19_021DB2FC_H #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DB6F0.h" #include "overlay019/struct_ov19_021DF964.h" -BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, MessageLoader * param5, const StringTemplate * param6, int param7, NARC * param8); -void ov19_021DB370(UnkStruct_ov19_021DB6F0 * param0); -void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 * param0); -void ov19_021DB448(UnkStruct_ov19_021DB6F0 * param0, u32 param1); -void ov19_021DB57C(UnkStruct_ov19_021DB6F0 * param0, const UnkStruct_ov19_021DF964 * param1); -void ov19_021DB6F0(UnkStruct_ov19_021DB6F0 * param0); -void ov19_021DB724(UnkStruct_ov19_021DB6F0 * param0); -void ov19_021DB748(UnkStruct_ov19_021DB6F0 * param0, const UnkStruct_ov19_021DF964 * param1); -void ov19_021DB790(UnkStruct_ov19_021DB6F0 * param0, const UnkStruct_ov19_021DF964 * param1); +#include "message.h" + +BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4, MessageLoader *param5, const StringTemplate *param6, int param7, NARC *param8); +void ov19_021DB370(UnkStruct_ov19_021DB6F0 *param0); +void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0); +void ov19_021DB448(UnkStruct_ov19_021DB6F0 *param0, u32 param1); +void ov19_021DB57C(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF964 *param1); +void ov19_021DB6F0(UnkStruct_ov19_021DB6F0 *param0); +void ov19_021DB724(UnkStruct_ov19_021DB6F0 *param0); +void ov19_021DB748(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF964 *param1); +void ov19_021DB790(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF964 *param1); #endif // POKEPLATINUM_OV19_021DB2FC_H diff --git a/include/overlay019/ov19_021DB8E4.h b/include/overlay019/ov19_021DB8E4.h index 54084319ae..3f03345703 100644 --- a/include/overlay019/ov19_021DB8E4.h +++ b/include/overlay019/ov19_021DB8E4.h @@ -1,28 +1,29 @@ #ifndef POKEPLATINUM_OV19_021DB8E4_H #define POKEPLATINUM_OV19_021DB8E4_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DBA9C.h" -#include - -BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, NARC * param5); -void ov19_021DBA9C(UnkStruct_ov19_021DBA9C * param0); -void ov19_021DBAD0(UnkStruct_ov19_021DBA9C * param0); -void ov19_021DBB48(UnkStruct_ov19_021DBA9C * param0); -BOOL ov19_021DBB68(UnkStruct_ov19_021DBA9C * param0); -void ov19_021DBB70(UnkStruct_ov19_021DBA9C * param0); -void ov19_021DBB94(UnkStruct_ov19_021DBA9C * param0); -BOOL ov19_021DBBA0(UnkStruct_ov19_021DBA9C * param0); -void ov19_021DBBA8(UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 param2, NNS_G2D_VRAM_TYPE param3, NNSG2dImageProxy * param4); -NNSG2dCellDataBank * ov19_021DBD3C(UnkStruct_ov19_021DBA9C * param0); -void ov19_021DC29C(UnkStruct_ov19_021DBA9C * param0); -BOOL ov19_021DC364(UnkStruct_ov19_021DBA9C * param0); -void ov19_021DC3F4(UnkStruct_ov19_021DBA9C * param0); -BOOL ov19_021DC43C(UnkStruct_ov19_021DBA9C * param0); +BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4, NARC *param5); +void ov19_021DBA9C(UnkStruct_ov19_021DBA9C *param0); +void ov19_021DBAD0(UnkStruct_ov19_021DBA9C *param0); +void ov19_021DBB48(UnkStruct_ov19_021DBA9C *param0); +BOOL ov19_021DBB68(UnkStruct_ov19_021DBA9C *param0); +void ov19_021DBB70(UnkStruct_ov19_021DBA9C *param0); +void ov19_021DBB94(UnkStruct_ov19_021DBA9C *param0); +BOOL ov19_021DBBA0(UnkStruct_ov19_021DBA9C *param0); +void ov19_021DBBA8(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2, NNS_G2D_VRAM_TYPE param3, NNSG2dImageProxy *param4); +NNSG2dCellDataBank *ov19_021DBD3C(UnkStruct_ov19_021DBA9C *param0); +void ov19_021DC29C(UnkStruct_ov19_021DBA9C *param0); +BOOL ov19_021DC364(UnkStruct_ov19_021DBA9C *param0); +void ov19_021DC3F4(UnkStruct_ov19_021DBA9C *param0); +BOOL ov19_021DC43C(UnkStruct_ov19_021DBA9C *param0); #endif // POKEPLATINUM_OV19_021DB8E4_H diff --git a/include/overlay019/ov19_021DC5F0.h b/include/overlay019/ov19_021DC5F0.h index 53037e930e..dcf425236a 100644 --- a/include/overlay019/ov19_021DC5F0.h +++ b/include/overlay019/ov19_021DC5F0.h @@ -4,32 +4,33 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DC680.h" #include "overlay019/struct_ov19_021DCD18.h" -BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, NARC * param5); -void ov19_021DC680(UnkStruct_ov19_021DC680 * param0); -void ov19_021DC6A0(UnkStruct_ov19_021DC680 * param0); -void ov19_021DC6C8(UnkStruct_ov19_021DC680 * param0); -BOOL ov19_021DC6F8(UnkStruct_ov19_021DC680 * param0); -void ov19_021DC768(UnkStruct_ov19_021DC680 * param0); -BOOL ov19_021DC788(UnkStruct_ov19_021DC680 * param0); -void ov19_021DC834(UnkStruct_ov19_021DC680 * param0); -BOOL ov19_021DC95C(UnkStruct_ov19_021DC680 * param0); -void ov19_021DC96C(UnkStruct_ov19_021DC680 * param0); -BOOL ov19_021DCA08(UnkStruct_ov19_021DC680 * param0); -void ov19_021DCAC0(UnkStruct_ov19_021DC680 * param0); -void ov19_021DCAFC(UnkStruct_ov19_021DC680 * param0, u32 param1); -BOOL ov19_021DCB20(UnkStruct_ov19_021DC680 * param0); -void ov19_021DCBA0(UnkStruct_ov19_021DC680 * param0); -void ov19_021DCBDC(UnkStruct_ov19_021DC680 * param0, u32 param1, u32 param2); -void ov19_021DCC14(UnkStruct_ov19_021DC680 * param0); -void ov19_021DCC44(UnkStruct_ov19_021DC680 * param0, u32 param1, u32 param2, UnkStruct_ov19_021DCD18 * param3); -void ov19_021DCC80(UnkStruct_ov19_021DC680 * param0, u32 param1, const UnkStruct_ov19_021DCD18 * param2); -void ov19_021DCCD4(UnkStruct_ov19_021DC680 * param0, u32 param1, const UnkStruct_ov19_021DCD18 * param2); -UnkStruct_ov19_021DCD18 * ov19_021DCD18(UnkStruct_ov19_021DC680 * param0, u32 param1); -void ov19_021DCD30(UnkStruct_ov19_021DC680 * param0, u32 param1, s32 * param2, s32 * param3); +BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4, NARC *param5); +void ov19_021DC680(UnkStruct_ov19_021DC680 *param0); +void ov19_021DC6A0(UnkStruct_ov19_021DC680 *param0); +void ov19_021DC6C8(UnkStruct_ov19_021DC680 *param0); +BOOL ov19_021DC6F8(UnkStruct_ov19_021DC680 *param0); +void ov19_021DC768(UnkStruct_ov19_021DC680 *param0); +BOOL ov19_021DC788(UnkStruct_ov19_021DC680 *param0); +void ov19_021DC834(UnkStruct_ov19_021DC680 *param0); +BOOL ov19_021DC95C(UnkStruct_ov19_021DC680 *param0); +void ov19_021DC96C(UnkStruct_ov19_021DC680 *param0); +BOOL ov19_021DCA08(UnkStruct_ov19_021DC680 *param0); +void ov19_021DCAC0(UnkStruct_ov19_021DC680 *param0); +void ov19_021DCAFC(UnkStruct_ov19_021DC680 *param0, u32 param1); +BOOL ov19_021DCB20(UnkStruct_ov19_021DC680 *param0); +void ov19_021DCBA0(UnkStruct_ov19_021DC680 *param0); +void ov19_021DCBDC(UnkStruct_ov19_021DC680 *param0, u32 param1, u32 param2); +void ov19_021DCC14(UnkStruct_ov19_021DC680 *param0); +void ov19_021DCC44(UnkStruct_ov19_021DC680 *param0, u32 param1, u32 param2, UnkStruct_ov19_021DCD18 *param3); +void ov19_021DCC80(UnkStruct_ov19_021DC680 *param0, u32 param1, const UnkStruct_ov19_021DCD18 *param2); +void ov19_021DCCD4(UnkStruct_ov19_021DC680 *param0, u32 param1, const UnkStruct_ov19_021DCD18 *param2); +UnkStruct_ov19_021DCD18 *ov19_021DCD18(UnkStruct_ov19_021DC680 *param0, u32 param1); +void ov19_021DCD30(UnkStruct_ov19_021DC680 *param0, u32 param1, s32 *param2, s32 *param3); #endif // POKEPLATINUM_OV19_021DC5F0_H diff --git a/include/overlay019/ov19_021DCF88.h b/include/overlay019/ov19_021DCF88.h index a006d23371..f300d89ab8 100644 --- a/include/overlay019/ov19_021DCF88.h +++ b/include/overlay019/ov19_021DCF88.h @@ -4,19 +4,20 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DCF88_decl.h" -BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4); -void ov19_021DD078(UnkStruct_ov19_021DCF88 * param0); -void ov19_021DD114(UnkStruct_ov19_021DCF88 * param0, NARC * param1); -void ov19_021DD378(UnkStruct_ov19_021DCF88 * param0); -BOOL ov19_021DD45C(UnkStruct_ov19_021DCF88 * param0); -void ov19_021DD714(UnkStruct_ov19_021DCF88 * param0); -BOOL ov19_021DD740(UnkStruct_ov19_021DCF88 * param0); -void ov19_021DD768(UnkStruct_ov19_021DCF88 * param0); -BOOL ov19_021DD820(UnkStruct_ov19_021DCF88 * param0); -void ov19_021DE2F4(UnkStruct_ov19_021DCF88 * param0); +BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4); +void ov19_021DD078(UnkStruct_ov19_021DCF88 *param0); +void ov19_021DD114(UnkStruct_ov19_021DCF88 *param0, NARC *param1); +void ov19_021DD378(UnkStruct_ov19_021DCF88 *param0); +BOOL ov19_021DD45C(UnkStruct_ov19_021DCF88 *param0); +void ov19_021DD714(UnkStruct_ov19_021DCF88 *param0); +BOOL ov19_021DD740(UnkStruct_ov19_021DCF88 *param0); +void ov19_021DD768(UnkStruct_ov19_021DCF88 *param0); +BOOL ov19_021DD820(UnkStruct_ov19_021DCF88 *param0); +void ov19_021DE2F4(UnkStruct_ov19_021DCF88 *param0); #endif // POKEPLATINUM_OV19_021DCF88_H diff --git a/include/overlay019/ov19_021DE3E8.h b/include/overlay019/ov19_021DE3E8.h index 6f0a377760..cb43ef690f 100644 --- a/include/overlay019/ov19_021DE3E8.h +++ b/include/overlay019/ov19_021DE3E8.h @@ -1,30 +1,31 @@ #ifndef POKEPLATINUM_OV19_021DE3E8_H #define POKEPLATINUM_OV19_021DE3E8_H +#include + #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DE3E8_decl.h" -#include - -BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4); -void ov19_021DE440(UnkStruct_ov19_021DE3E8 * param0); -void ov19_021DE584(UnkStruct_ov19_021DE3E8 * param0); -void ov19_021DE7A0(UnkStruct_ov19_021DE3E8 * param0); -BOOL ov19_021DE800(UnkStruct_ov19_021DE3E8 * param0); -void ov19_021DE954(UnkStruct_ov19_021DE3E8 * param0); -BOOL ov19_021DE9A8(UnkStruct_ov19_021DE3E8 * param0); -void ov19_021DE9B8(UnkStruct_ov19_021DE3E8 * param0); -BOOL ov19_021DE9E4(UnkStruct_ov19_021DE3E8 * param0); -void ov19_021DEA18(UnkStruct_ov19_021DE3E8 * param0); -BOOL ov19_021DEA64(UnkStruct_ov19_021DE3E8 * param0); -void ov19_021DEA74(UnkStruct_ov19_021DE3E8 * param0); -BOOL ov19_021DEB08(UnkStruct_ov19_021DE3E8 * param0); -void ov19_021DEB18(UnkStruct_ov19_021DE3E8 * param0); -BOOL ov19_021DEB60(UnkStruct_ov19_021DE3E8 * param0); -void ov19_021DEB9C(UnkStruct_ov19_021DE3E8 * param0, const VecFx32 * param1); -void ov19_021DEBDC(UnkStruct_ov19_021DE3E8 * param0, u32 param1); +BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4); +void ov19_021DE440(UnkStruct_ov19_021DE3E8 *param0); +void ov19_021DE584(UnkStruct_ov19_021DE3E8 *param0); +void ov19_021DE7A0(UnkStruct_ov19_021DE3E8 *param0); +BOOL ov19_021DE800(UnkStruct_ov19_021DE3E8 *param0); +void ov19_021DE954(UnkStruct_ov19_021DE3E8 *param0); +BOOL ov19_021DE9A8(UnkStruct_ov19_021DE3E8 *param0); +void ov19_021DE9B8(UnkStruct_ov19_021DE3E8 *param0); +BOOL ov19_021DE9E4(UnkStruct_ov19_021DE3E8 *param0); +void ov19_021DEA18(UnkStruct_ov19_021DE3E8 *param0); +BOOL ov19_021DEA64(UnkStruct_ov19_021DE3E8 *param0); +void ov19_021DEA74(UnkStruct_ov19_021DE3E8 *param0); +BOOL ov19_021DEB08(UnkStruct_ov19_021DE3E8 *param0); +void ov19_021DEB18(UnkStruct_ov19_021DE3E8 *param0); +BOOL ov19_021DEB60(UnkStruct_ov19_021DE3E8 *param0); +void ov19_021DEB9C(UnkStruct_ov19_021DE3E8 *param0, const VecFx32 *param1); +void ov19_021DEBDC(UnkStruct_ov19_021DE3E8 *param0, u32 param1); #endif // POKEPLATINUM_OV19_021DE3E8_H diff --git a/include/overlay019/ov19_021DEC04.h b/include/overlay019/ov19_021DEC04.h index ff0bbe1b79..9a0cb2220d 100644 --- a/include/overlay019/ov19_021DEC04.h +++ b/include/overlay019/ov19_021DEC04.h @@ -2,20 +2,22 @@ #define POKEPLATINUM_OV19_021DEC04_H #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DEC04_decl.h" -BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, MessageLoader * param5, NARC * param6); -void ov19_021DECAC(UnkStruct_ov19_021DEC04 * param0); -void ov19_021DECE8(UnkStruct_ov19_021DEC04 * param0, NARC * param1); -void ov19_021DEDDC(UnkStruct_ov19_021DEC04 * param0, BOOL param1); -void ov19_021DEE34(UnkStruct_ov19_021DEC04 * param0); -BOOL ov19_021DEE84(UnkStruct_ov19_021DEC04 * param0); -void ov19_021DEE88(UnkStruct_ov19_021DEC04 * param0); -BOOL ov19_021DEEA8(UnkStruct_ov19_021DEC04 * param0); +#include "message.h" + +BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4, MessageLoader *param5, NARC *param6); +void ov19_021DECAC(UnkStruct_ov19_021DEC04 *param0); +void ov19_021DECE8(UnkStruct_ov19_021DEC04 *param0, NARC *param1); +void ov19_021DEDDC(UnkStruct_ov19_021DEC04 *param0, BOOL param1); +void ov19_021DEE34(UnkStruct_ov19_021DEC04 *param0); +BOOL ov19_021DEE84(UnkStruct_ov19_021DEC04 *param0); +void ov19_021DEE88(UnkStruct_ov19_021DEC04 *param0); +BOOL ov19_021DEEA8(UnkStruct_ov19_021DEC04 *param0); #endif // POKEPLATINUM_OV19_021DEC04_H diff --git a/include/overlay019/ov19_021DF964.h b/include/overlay019/ov19_021DF964.h index dab7d1ba83..2e387a3ed6 100644 --- a/include/overlay019/ov19_021DF964.h +++ b/include/overlay019/ov19_021DF964.h @@ -5,16 +5,16 @@ #include "enums.h" -void ov19_021DF964(UnkStruct_ov19_021D4DF0 * param0, u32 param1); -void ov19_021DF990(UnkStruct_ov19_021D4DF0 * param0); -void ov19_021DFAD0(UnkStruct_ov19_021D4DF0 * param0); -void ov19_021DFB50(UnkStruct_ov19_021D4DF0 * param0); -void ov19_021DFB94(UnkStruct_ov19_021D4DF0 * param0, UnkEnum_021DFB94 param1); -void ov19_021DFC04(UnkStruct_ov19_021D4DF0 * param0, UnkEnum_021DFB94 param1); -void ov19_021DFC80(UnkStruct_ov19_021D4DF0 * param0); -void ov19_021DFCE4(UnkStruct_ov19_021D4DF0 * param0, u32 param1); -int ov19_021DFD2C(UnkStruct_ov19_021D4DF0 * param0); -UnkEnum_021DFB94 ov19_021DFDDC(UnkStruct_ov19_021D4DF0 * param0); -UnkEnum_021DFB94 ov19_021DFDEC(UnkStruct_ov19_021D4DF0 * param0); +void ov19_021DF964(UnkStruct_ov19_021D4DF0 *param0, u32 param1); +void ov19_021DF990(UnkStruct_ov19_021D4DF0 *param0); +void ov19_021DFAD0(UnkStruct_ov19_021D4DF0 *param0); +void ov19_021DFB50(UnkStruct_ov19_021D4DF0 *param0); +void ov19_021DFB94(UnkStruct_ov19_021D4DF0 *param0, UnkEnum_021DFB94 param1); +void ov19_021DFC04(UnkStruct_ov19_021D4DF0 *param0, UnkEnum_021DFB94 param1); +void ov19_021DFC80(UnkStruct_ov19_021D4DF0 *param0); +void ov19_021DFCE4(UnkStruct_ov19_021D4DF0 *param0, u32 param1); +int ov19_021DFD2C(UnkStruct_ov19_021D4DF0 *param0); +UnkEnum_021DFB94 ov19_021DFDDC(UnkStruct_ov19_021D4DF0 *param0); +UnkEnum_021DFB94 ov19_021DFDEC(UnkStruct_ov19_021D4DF0 *param0); #endif // POKEPLATINUM_OV19_021DF964_H diff --git a/include/overlay019/struct_ov19_021D3CFC.h b/include/overlay019/struct_ov19_021D3CFC.h index 5b7f14e23c..c50be76048 100644 --- a/include/overlay019/struct_ov19_021D3CFC.h +++ b/include/overlay019/struct_ov19_021D3CFC.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV19_021D3CFC_H typedef struct { - void * unk_00; + void *unk_00; u8 unk_04; s8 unk_05; s8 unk_06; diff --git a/include/overlay019/struct_ov19_021D4DF0.h b/include/overlay019/struct_ov19_021D4DF0.h index ba3efb3570..2cc9986a1e 100644 --- a/include/overlay019/struct_ov19_021D4DF0.h +++ b/include/overlay019/struct_ov19_021D4DF0.h @@ -3,6 +3,7 @@ #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" + #include "overlay019/struct_ov19_021D3CFC.h" #include "overlay019/struct_ov19_021D4DE4.h" #include "overlay019/struct_ov19_021D4EE4.h" @@ -14,8 +15,8 @@ #include "overlay019/struct_ov19_021DF964.h" typedef struct { - const PCBoxes * unk_00; - const Party * unk_04; + const PCBoxes *unk_00; + const Party *unk_04; UnkStruct_ov19_021D3CFC unk_08; UnkStruct_ov19_021D5594 unk_14; UnkStruct_ov19_021D4F5C unk_40; diff --git a/include/overlay019/struct_ov19_021D4F5C.h b/include/overlay019/struct_ov19_021D4F5C.h index f9c8f7eb3f..617ebe5737 100644 --- a/include/overlay019/struct_ov19_021D4F5C.h +++ b/include/overlay019/struct_ov19_021D4F5C.h @@ -7,7 +7,7 @@ typedef struct { u8 unk_00; u8 unk_01; u8 padding_02[2]; - Strbuf* unk_04; + Strbuf *unk_04; } UnkStruct_ov19_021D4F5C; #endif // POKEPLATINUM_STRUCT_OV19_021D4F5C_H diff --git a/include/overlay019/struct_ov19_021D5594.h b/include/overlay019/struct_ov19_021D5594.h index 273cf227d1..dcf1b57a0a 100644 --- a/include/overlay019/struct_ov19_021D5594.h +++ b/include/overlay019/struct_ov19_021D5594.h @@ -4,7 +4,7 @@ #include "pokemon.h" typedef struct { - BoxPokemon * unk_00; + BoxPokemon *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; diff --git a/include/overlay019/struct_ov19_021D5BAC.h b/include/overlay019/struct_ov19_021D5BAC.h index 8832480ae9..775ffccfd7 100644 --- a/include/overlay019/struct_ov19_021D5BAC.h +++ b/include/overlay019/struct_ov19_021D5BAC.h @@ -4,7 +4,7 @@ #include "strbuf.h" typedef struct { - void * unk_00; + void *unk_00; u16 unk_04; u16 unk_06; u16 unk_08; @@ -15,11 +15,11 @@ typedef struct { u8 unk_0E; u8 unk_0F; u8 padding_10[4]; - Strbuf* unk_14; - Strbuf* unk_18; - Strbuf* unk_1C; - Strbuf* unk_20; - Strbuf* unk_24; + Strbuf *unk_14; + Strbuf *unk_18; + Strbuf *unk_1C; + Strbuf *unk_20; + Strbuf *unk_24; } UnkStruct_ov19_021D5BAC; #endif // POKEPLATINUM_STRUCT_OV19_021D5BAC_H diff --git a/include/overlay019/struct_ov19_021D5FAC.h b/include/overlay019/struct_ov19_021D5FAC.h index 208271c33d..06ed0eea5a 100644 --- a/include/overlay019/struct_ov19_021D5FAC.h +++ b/include/overlay019/struct_ov19_021D5FAC.h @@ -4,7 +4,7 @@ #include "strbuf.h" typedef struct { - void * unk_00; + void *unk_00; u16 unk_04; u8 unk_06; u8 unk_07; @@ -21,8 +21,8 @@ typedef struct { u16 unk_1C; u16 unk_1E; u16 unk_20[4]; - Strbuf* unk_28; - Strbuf* unk_2C; + Strbuf *unk_28; + Strbuf *unk_2C; } UnkStruct_ov19_021D5FAC; #endif // POKEPLATINUM_STRUCT_OV19_021D5FAC_H diff --git a/include/overlay019/struct_ov19_021D6104.h b/include/overlay019/struct_ov19_021D6104.h index 678ab43626..1cb91f9059 100644 --- a/include/overlay019/struct_ov19_021D6104.h +++ b/include/overlay019/struct_ov19_021D6104.h @@ -17,7 +17,7 @@ typedef struct UnkStruct_ov19_021D6104_t { int unk_24; TouchScreenHitTable unk_28; TouchScreenHitTable unk_2C; - int (* unk_30)(struct UnkStruct_ov19_021D6104_t *, BOOL, BOOL); + int (*unk_30)(struct UnkStruct_ov19_021D6104_t *, BOOL, BOOL); } UnkStruct_ov19_021D6104; #endif // POKEPLATINUM_STRUCT_OV19_021D6104_H diff --git a/include/overlay019/struct_ov19_021D8318.h b/include/overlay019/struct_ov19_021D8318.h index d032a5969c..aaa2237aef 100644 --- a/include/overlay019/struct_ov19_021D8318.h +++ b/include/overlay019/struct_ov19_021D8318.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_OV19_021D8318_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA384.h" @@ -38,10 +39,10 @@ typedef struct { int unk_5858; int unk_585C; u16 unk_5860[9][16]; - UnkStruct_ov19_021DA384 * unk_58F0; - BGL * unk_58F4; - const UnkStruct_ov19_021D4DF0 * unk_58F8; - UnkStruct_ov19_021D61B0 * unk_58FC; + UnkStruct_ov19_021DA384 *unk_58F0; + BGL *unk_58F4; + const UnkStruct_ov19_021D4DF0 *unk_58F8; + UnkStruct_ov19_021D61B0 *unk_58FC; } UnkStruct_ov19_021D8318; #endif // POKEPLATINUM_STRUCT_OV19_021D8318_H diff --git a/include/overlay019/struct_ov19_021D8E00.h b/include/overlay019/struct_ov19_021D8E00.h index ccf269cf33..558957bd99 100644 --- a/include/overlay019/struct_ov19_021D8E00.h +++ b/include/overlay019/struct_ov19_021D8E00.h @@ -1,8 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021D8E00_H #define POKEPLATINUM_STRUCT_OV19_021D8E00_H +#include + #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D8318.h" @@ -11,29 +14,27 @@ #include "overlay019/struct_ov19_021DCD18.h" #include "overlay019/struct_ov19_021DE3E8_decl.h" -#include - typedef struct { - GraphicElementManager * unk_00; - GraphicElementData * unk_04; - GraphicElementData * unk_08; - GraphicElementData * unk_0C; - GraphicElementData * unk_10; - void * unk_14; - void * unk_18; - NNSG2dCellDataBank * unk_1C; - NNSG2dAnimBankData * unk_20; + GraphicElementManager *unk_00; + GraphicElementData *unk_04; + GraphicElementData *unk_08; + GraphicElementData *unk_0C; + GraphicElementData *unk_10; + void *unk_14; + void *unk_18; + NNSG2dCellDataBank *unk_1C; + NNSG2dAnimBankData *unk_20; NNSG2dImageProxy unk_24; - UnkStruct_ov19_021DA384 * unk_48; + UnkStruct_ov19_021DA384 *unk_48; UnkStruct_ov19_021DCD18 unk_4C[30]; struct { fx32 unk_00; fx32 unk_04; } unk_664[30]; u32 unk_754; - UnkStruct_ov19_021D8318 * unk_758; - UnkStruct_ov19_021DC680 * unk_75C; - UnkStruct_ov19_021DE3E8 * unk_760; + UnkStruct_ov19_021D8318 *unk_758; + UnkStruct_ov19_021DC680 *unk_75C; + UnkStruct_ov19_021DE3E8 *unk_760; s32 unk_764; s32 unk_768; s32 unk_76C; @@ -54,8 +55,8 @@ typedef struct { u8 unk_78D; u8 unk_78E; u8 padding_78F; - const UnkStruct_ov19_021D4DF0 * unk_790; - UnkStruct_ov19_021D61B0 * unk_794; + const UnkStruct_ov19_021D4DF0 *unk_790; + UnkStruct_ov19_021D61B0 *unk_794; } UnkStruct_ov19_021D8E00; #endif // POKEPLATINUM_STRUCT_OV19_021D8E00_H diff --git a/include/overlay019/struct_ov19_021DA384.h b/include/overlay019/struct_ov19_021DA384.h index eecdeb7b3f..99be8c6bc8 100644 --- a/include/overlay019/struct_ov19_021DA384.h +++ b/include/overlay019/struct_ov19_021DA384.h @@ -1,28 +1,29 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DA384_H #define POKEPLATINUM_STRUCT_OV19_021DA384_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" -#include - typedef struct { - void * unk_00; - NNSG2dAnimBankData * unk_04; - void * unk_08; + void *unk_00; + NNSG2dAnimBankData *unk_04; + void *unk_08; u8 padding_0C; - NNSG2dCellDataBank * unk_10; - void * unk_14; - void * unk_18; - NNSG2dCellDataBank * unk_1C; - NNSG2dAnimBankData * unk_20; - GraphicElementManager * unk_24; + NNSG2dCellDataBank *unk_10; + void *unk_14; + void *unk_18; + NNSG2dCellDataBank *unk_1C; + NNSG2dAnimBankData *unk_20; + GraphicElementManager *unk_24; u8 padding_28[24]; - const UnkStruct_ov19_021D4DF0 * unk_40; - UnkStruct_ov19_021D61B0 * unk_44; - NARC * unk_48; + const UnkStruct_ov19_021D4DF0 *unk_40; + UnkStruct_ov19_021D61B0 *unk_44; + NARC *unk_48; u8 unk_4C[640]; } UnkStruct_ov19_021DA384; diff --git a/include/overlay019/struct_ov19_021DA864.h b/include/overlay019/struct_ov19_021DA864.h index 7739101ffd..46f6b00c4e 100644 --- a/include/overlay019/struct_ov19_021DA864.h +++ b/include/overlay019/struct_ov19_021DA864.h @@ -1,17 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DA864_H #define POKEPLATINUM_STRUCT_OV19_021DA864_H - #include typedef struct { - const NNSG2dImageProxy * unk_00; - const NNSG2dCharacterData * unk_04; - const NNSG2dImagePaletteProxy * unk_08; - NNSG2dCellDataBank * unk_0C; - const NNSG2dCellAnimBankData * unk_10; - const NNSG2dMultiCellDataBank * unk_14; - const NNSG2dMultiCellAnimBankData * unk_18; + const NNSG2dImageProxy *unk_00; + const NNSG2dCharacterData *unk_04; + const NNSG2dImagePaletteProxy *unk_08; + NNSG2dCellDataBank *unk_0C; + const NNSG2dCellAnimBankData *unk_10; + const NNSG2dMultiCellDataBank *unk_14; + const NNSG2dMultiCellAnimBankData *unk_18; int unk_1C; u8 unk_20; u8 padding_21[3]; diff --git a/include/overlay019/struct_ov19_021DA8D8.h b/include/overlay019/struct_ov19_021DA8D8.h index 3b331e9f1d..2356698f61 100644 --- a/include/overlay019/struct_ov19_021DA8D8.h +++ b/include/overlay019/struct_ov19_021DA8D8.h @@ -1,24 +1,25 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DA8D8_H #define POKEPLATINUM_STRUCT_OV19_021DA8D8_H +#include + #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" -#include - typedef struct { - GraphicElementManager * unk_00; - GraphicElementData * unk_04; - void * unk_08; - void * unk_0C; - NNSG2dCellDataBank * unk_10; - NNSG2dAnimBankData * unk_14; + GraphicElementManager *unk_00; + GraphicElementData *unk_04; + void *unk_08; + void *unk_0C; + NNSG2dCellDataBank *unk_10; + NNSG2dAnimBankData *unk_14; NNSG2dImageProxy unk_18; - GraphicElementManager * unk_3C; - const UnkStruct_ov19_021D4DF0 * unk_40; - UnkStruct_ov19_021D61B0 * unk_44; + GraphicElementManager *unk_3C; + const UnkStruct_ov19_021D4DF0 *unk_40; + UnkStruct_ov19_021D61B0 *unk_44; } UnkStruct_ov19_021DA8D8; #endif // POKEPLATINUM_STRUCT_OV19_021DA8D8_H diff --git a/include/overlay019/struct_ov19_021DA9E0.h b/include/overlay019/struct_ov19_021DA9E0.h index 0460c0c5a0..00471c9c09 100644 --- a/include/overlay019/struct_ov19_021DA9E0.h +++ b/include/overlay019/struct_ov19_021DA9E0.h @@ -1,40 +1,42 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DA9E0_H #define POKEPLATINUM_STRUCT_OV19_021DA9E0_H -#include "struct_decls/struct_02007768_decl.h" +#include + #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" -#include +#include "strbuf.h" +#include "sys_task_manager.h" typedef struct { BOOL unk_00; - Window * unk_04; - BGL * unk_08; - GraphicElementManager * unk_0C; - const UnkStruct_ov19_021D4DF0 * unk_10; - UnkStruct_ov19_021D61B0 * unk_14; - UnkStruct_0200C440 * unk_18; - UnkStruct_0200C440 * unk_1C; - UnkStruct_02007768 * unk_20; - Sprite * unk_24; - void * unk_28; - NNSG2dCellDataBank * unk_2C; - GraphicElementData * unk_30; - void * unk_34; - NNSG2dCellDataBank * unk_38; - GraphicElementData * unk_3C[2]; - Strbuf* unk_44; - Strbuf* unk_48; - SysTask * unk_4C; + Window *unk_04; + BGL *unk_08; + GraphicElementManager *unk_0C; + const UnkStruct_ov19_021D4DF0 *unk_10; + UnkStruct_ov19_021D61B0 *unk_14; + UnkStruct_0200C440 *unk_18; + UnkStruct_0200C440 *unk_1C; + UnkStruct_02007768 *unk_20; + Sprite *unk_24; + void *unk_28; + NNSG2dCellDataBank *unk_2C; + GraphicElementData *unk_30; + void *unk_34; + NNSG2dCellDataBank *unk_38; + GraphicElementData *unk_3C[2]; + Strbuf *unk_44; + Strbuf *unk_48; + SysTask *unk_4C; u8 padding_50[4]; } UnkStruct_ov19_021DA9E0; diff --git a/include/overlay019/struct_ov19_021DB6F0.h b/include/overlay019/struct_ov19_021DB6F0.h index 41bf695a24..54db9c128d 100644 --- a/include/overlay019/struct_ov19_021DB6F0.h +++ b/include/overlay019/struct_ov19_021DB6F0.h @@ -1,32 +1,34 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DB6F0_H #define POKEPLATINUM_STRUCT_OV19_021DB6F0_H -#include "message.h" -#include "string_template.h" +#include + #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" -#include +#include "message.h" +#include "strbuf.h" +#include "string_template.h" typedef struct { - BGL * unk_00; + BGL *unk_00; u8 padding_04[4]; - const UnkStruct_ov19_021D4DF0 * unk_08; - UnkStruct_ov19_021D61B0 * unk_0C; - MessageLoader * unk_10; - MessageLoader * unk_14; - Window * unk_18; + const UnkStruct_ov19_021D4DF0 *unk_08; + UnkStruct_ov19_021D61B0 *unk_0C; + MessageLoader *unk_10; + MessageLoader *unk_14; + Window *unk_18; u16 unk_1C; u16 unk_1E; int unk_20; - void * unk_24; - NNSG2dCharacterData * unk_28; - const StringTemplate * unk_2C; - Strbuf* unk_30; - Strbuf* unk_34; + void *unk_24; + NNSG2dCharacterData *unk_28; + const StringTemplate *unk_2C; + Strbuf *unk_30; + Strbuf *unk_34; } UnkStruct_ov19_021DB6F0; #endif // POKEPLATINUM_STRUCT_OV19_021DB6F0_H diff --git a/include/overlay019/struct_ov19_021DBA9C.h b/include/overlay019/struct_ov19_021DBA9C.h index 265ec8815b..f3ba90ce8e 100644 --- a/include/overlay019/struct_ov19_021DBA9C.h +++ b/include/overlay019/struct_ov19_021DBA9C.h @@ -1,48 +1,50 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DBA9C_H #define POKEPLATINUM_STRUCT_OV19_021DBA9C_H -#include "message.h" +#include + #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/struct_0201AE08.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" +#include "struct_defs/struct_0201AE08.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" -#include +#include "message.h" +#include "strbuf.h" +#include "sys_task_manager.h" typedef struct { - UnkStruct_ov19_021D61B0 * unk_00; - BGL * unk_04; - GraphicElementManager * unk_08; - const UnkStruct_ov19_021D4DF0 * unk_0C; - Window * unk_10; - void * unk_14; - NNSG2dCharacterData * unk_18; - void * unk_1C; - NNSG2dCellDataBank * unk_20; + UnkStruct_ov19_021D61B0 *unk_00; + BGL *unk_04; + GraphicElementManager *unk_08; + const UnkStruct_ov19_021D4DF0 *unk_0C; + Window *unk_10; + void *unk_14; + NNSG2dCharacterData *unk_18; + void *unk_1C; + NNSG2dCellDataBank *unk_20; u8 padding_24[8]; - void * unk_2C; - NNSG2dScreenData * unk_30; - void * unk_34; - NNSG2dScreenData * unk_38; + void *unk_2C; + NNSG2dScreenData *unk_30; + void *unk_34; + NNSG2dScreenData *unk_38; UnkStruct_0201AE08 unk_3C; - UnkStruct_0200C440 * unk_44; - GraphicElementData * unk_48[18]; - GraphicElementData * unk_90; + UnkStruct_0200C440 *unk_44; + GraphicElementData *unk_48[18]; + GraphicElementData *unk_90; u32 unk_94[18]; - SysTask * unk_DC; + SysTask *unk_DC; s32 unk_E0; u16 unk_E4[8][48]; u8 unk_3E4[18][1024]; u8 unk_4BE4[18]; u8 padding_4BF6[2]; - MessageLoader * unk_4BF8; - Strbuf* unk_4BFC; + MessageLoader *unk_4BF8; + Strbuf *unk_4BFC; } UnkStruct_ov19_021DBA9C; #endif // POKEPLATINUM_STRUCT_OV19_021DBA9C_H diff --git a/include/overlay019/struct_ov19_021DC680.h b/include/overlay019/struct_ov19_021DC680.h index 8ef8940911..363b04a7d8 100644 --- a/include/overlay019/struct_ov19_021DC680.h +++ b/include/overlay019/struct_ov19_021DC680.h @@ -1,25 +1,26 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DC680_H #define POKEPLATINUM_STRUCT_OV19_021DC680_H +#include + #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D8318.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DCD18.h" -#include - typedef struct { - UnkStruct_ov19_021D61B0 * unk_00; - BGL * unk_04; - GraphicElementManager * unk_08; - const UnkStruct_ov19_021D4DF0 * unk_0C; - UnkStruct_ov19_021D8318 * unk_10; - void * unk_14; - NNSG2dScreenData * unk_18; - void * unk_1C; + UnkStruct_ov19_021D61B0 *unk_00; + BGL *unk_04; + GraphicElementManager *unk_08; + const UnkStruct_ov19_021D4DF0 *unk_0C; + UnkStruct_ov19_021D8318 *unk_10; + void *unk_14; + NNSG2dScreenData *unk_18; + void *unk_1C; fx32 unk_20; fx32 unk_24; u8 unk_28; @@ -29,7 +30,7 @@ typedef struct { BOOL unk_2C; u32 unk_30; int unk_34; - UnkStruct_ov19_021DA384 * unk_38; + UnkStruct_ov19_021DA384 *unk_38; UnkStruct_ov19_021DCD18 unk_3C[6]; u8 unk_174; u8 padding_175[3]; diff --git a/include/overlay019/struct_ov19_021DCD18.h b/include/overlay019/struct_ov19_021DCD18.h index e028b20df2..1d816ab1ed 100644 --- a/include/overlay019/struct_ov19_021DCD18.h +++ b/include/overlay019/struct_ov19_021DCD18.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DCD18_H #define POKEPLATINUM_STRUCT_OV19_021DCD18_H -#include "struct_decls/struct_02022550_decl.h" - #include +#include "struct_decls/struct_02022550_decl.h" + typedef struct { - GraphicElementData * unk_00; + GraphicElementData *unk_00; NNSG2dImageProxy unk_04; u32 unk_28; u16 unk_2C; diff --git a/include/overlay019/struct_ov19_021DF964.h b/include/overlay019/struct_ov19_021DF964.h index 852aa81aaa..9029fbfc7a 100644 --- a/include/overlay019/struct_ov19_021DF964.h +++ b/include/overlay019/struct_ov19_021DF964.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV19_021DF964_H #define POKEPLATINUM_STRUCT_OV19_021DF964_H - #include "enums.h" typedef struct { diff --git a/include/overlay020/ov20_021D0D80.h b/include/overlay020/ov20_021D0D80.h index 857825fa17..c7dfe1e530 100644 --- a/include/overlay020/ov20_021D0D80.h +++ b/include/overlay020/ov20_021D0D80.h @@ -1,29 +1,30 @@ #ifndef POKEPLATINUM_OV20_021D0D80_H #define POKEPLATINUM_OV20_021D0D80_H +#include "overlay020/struct_ov20_021D16E8_decl.h" + #include "overlay_manager.h" #include "strbuf.h" -#include "overlay020/struct_ov20_021D16E8_decl.h" -int ov20_021D0D80(OverlayManager * param0, int * param1); -int ov20_021D0DF8(OverlayManager * param0, int * param1); -int ov20_021D0EA8(OverlayManager * param0, int * param1); -u32 ov20_021D1F84(const UnkStruct_ov20_021D16E8 * param0); -u32 ov20_021D1F88(const UnkStruct_ov20_021D16E8 * param0); -u32 ov20_021D1F94(const UnkStruct_ov20_021D16E8 * param0); -u32 ov20_021D1F9C(const UnkStruct_ov20_021D16E8 * param0); -u16 ov20_021D1FA8(const UnkStruct_ov20_021D16E8 * param0, int param1); -Strbuf* ov20_021D1FC0(const UnkStruct_ov20_021D16E8 * param0, u32 param1); -u32 ov20_021D1FCC(const UnkStruct_ov20_021D16E8 * param0); -u32 ov20_021D1FD4(const UnkStruct_ov20_021D16E8 * param0); -u32 ov20_021D1FDC(const UnkStruct_ov20_021D16E8 * param0); -u32 ov20_021D1FE4(const UnkStruct_ov20_021D16E8 * param0); -void ov20_021D2008(const UnkStruct_ov20_021D16E8 * param0, u32 param1, Strbuf *param2); -u32 ov20_021D2034(const UnkStruct_ov20_021D16E8 * param0); -int ov20_021D2040(const UnkStruct_ov20_021D16E8 * param0); -BOOL ov20_021D204C(const UnkStruct_ov20_021D16E8 * param0); -BOOL ov20_021D2060(const UnkStruct_ov20_021D16E8 * param0); -int ov20_021D2080(const UnkStruct_ov20_021D16E8 * param0); -u32 ov20_021D208C(const UnkStruct_ov20_021D16E8 * param0); +int ov20_021D0D80(OverlayManager *param0, int *param1); +int ov20_021D0DF8(OverlayManager *param0, int *param1); +int ov20_021D0EA8(OverlayManager *param0, int *param1); +u32 ov20_021D1F84(const UnkStruct_ov20_021D16E8 *param0); +u32 ov20_021D1F88(const UnkStruct_ov20_021D16E8 *param0); +u32 ov20_021D1F94(const UnkStruct_ov20_021D16E8 *param0); +u32 ov20_021D1F9C(const UnkStruct_ov20_021D16E8 *param0); +u16 ov20_021D1FA8(const UnkStruct_ov20_021D16E8 *param0, int param1); +Strbuf *ov20_021D1FC0(const UnkStruct_ov20_021D16E8 *param0, u32 param1); +u32 ov20_021D1FCC(const UnkStruct_ov20_021D16E8 *param0); +u32 ov20_021D1FD4(const UnkStruct_ov20_021D16E8 *param0); +u32 ov20_021D1FDC(const UnkStruct_ov20_021D16E8 *param0); +u32 ov20_021D1FE4(const UnkStruct_ov20_021D16E8 *param0); +void ov20_021D2008(const UnkStruct_ov20_021D16E8 *param0, u32 param1, Strbuf *param2); +u32 ov20_021D2034(const UnkStruct_ov20_021D16E8 *param0); +int ov20_021D2040(const UnkStruct_ov20_021D16E8 *param0); +BOOL ov20_021D204C(const UnkStruct_ov20_021D16E8 *param0); +BOOL ov20_021D2060(const UnkStruct_ov20_021D16E8 *param0); +int ov20_021D2080(const UnkStruct_ov20_021D16E8 *param0); +u32 ov20_021D208C(const UnkStruct_ov20_021D16E8 *param0); #endif // POKEPLATINUM_OV20_021D0D80_H diff --git a/include/overlay020/ov20_021D2098.h b/include/overlay020/ov20_021D2098.h index 2ca47bbae6..1520f63037 100644 --- a/include/overlay020/ov20_021D2098.h +++ b/include/overlay020/ov20_021D2098.h @@ -2,24 +2,26 @@ #define POKEPLATINUM_OV20_021D2098_H #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_020998EC_decl.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D2128_decl.h" -UnkStruct_ov20_021D2128 * ov20_021D2098(const UnkStruct_ov20_021D16E8 * param0, const UnkStruct_020998EC * param1); -void ov20_021D2128(UnkStruct_ov20_021D2128 * param0); -SysTask * ov20_021D2170(SysTaskFunc param0, void * param1, int param2); -void ov20_021D21A0(UnkStruct_ov20_021D2128 * param0, int param1); -BOOL ov20_021D21F8(UnkStruct_ov20_021D2128 * param0); -BOOL ov20_021D2210(UnkStruct_ov20_021D2128 * param0, int param1); -u32 ov20_021D2DF4(UnkStruct_ov20_021D2128 * param0); -BGL * ov20_021D2E04(UnkStruct_ov20_021D2128 * param0); -GraphicElementManager * ov20_021D2E08(UnkStruct_ov20_021D2128 * param0); -void ov20_021D2E0C(UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3); -GraphicElementData * ov20_021D2E50(UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5); +#include "sys_task_manager.h" + +UnkStruct_ov20_021D2128 *ov20_021D2098(const UnkStruct_ov20_021D16E8 *param0, const UnkStruct_020998EC *param1); +void ov20_021D2128(UnkStruct_ov20_021D2128 *param0); +SysTask *ov20_021D2170(SysTaskFunc param0, void *param1, int param2); +void ov20_021D21A0(UnkStruct_ov20_021D2128 *param0, int param1); +BOOL ov20_021D21F8(UnkStruct_ov20_021D2128 *param0); +BOOL ov20_021D2210(UnkStruct_ov20_021D2128 *param0, int param1); +u32 ov20_021D2DF4(UnkStruct_ov20_021D2128 *param0); +BGL *ov20_021D2E04(UnkStruct_ov20_021D2128 *param0); +GraphicElementManager *ov20_021D2E08(UnkStruct_ov20_021D2128 *param0); +void ov20_021D2E0C(UnkStruct_ov20_021D2128 *param0, UnkStruct_ov19_021DA864 *param1, u32 param2, u32 param3); +GraphicElementData *ov20_021D2E50(UnkStruct_ov20_021D2128 *param0, UnkStruct_ov19_021DA864 *param1, u32 param2, u32 param3, u32 param4, int param5); #endif // POKEPLATINUM_OV20_021D2098_H diff --git a/include/overlay020/ov20_021D2EA4.h b/include/overlay020/ov20_021D2EA4.h index a190e1db6e..af7a75ff10 100644 --- a/include/overlay020/ov20_021D2EA4.h +++ b/include/overlay020/ov20_021D2EA4.h @@ -3,24 +3,25 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020998EC_decl.h" + #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D2128_decl.h" #include "overlay020/struct_ov20_021D30F8_decl.h" -UnkStruct_ov20_021D30F8 * ov20_021D2EA4(UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2); -void ov20_021D2EF0(UnkStruct_ov20_021D30F8 * param0); -void ov20_021D2F50(UnkStruct_ov20_021D30F8 * param0, NARC * param1); -void ov20_021D3228(UnkStruct_ov20_021D30F8 * param0); -u32 ov20_021D3574(const UnkStruct_ov20_021D30F8 * param0); -void ov20_021D3578(UnkStruct_ov20_021D30F8 * param0, u32 param1); -void ov20_021D3684(UnkStruct_ov20_021D30F8 * param0); -void ov20_021D3690(UnkStruct_ov20_021D30F8 * param0); -void ov20_021D369C(UnkStruct_ov20_021D30F8 * param0, BOOL param1); -void ov20_021D36B0(UnkStruct_ov20_021D30F8 * param0); -void ov20_021D36D0(UnkStruct_ov20_021D30F8 * param0); -void ov20_021D3700(UnkStruct_ov20_021D30F8 * param0, int param1); -void ov20_021D3790(UnkStruct_ov20_021D30F8 * param0, int param1); -void ov20_021D381C(UnkStruct_ov20_021D30F8 * param0, int param1); -void ov20_021D384C(UnkStruct_ov20_021D30F8 * param0); +UnkStruct_ov20_021D30F8 *ov20_021D2EA4(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2); +void ov20_021D2EF0(UnkStruct_ov20_021D30F8 *param0); +void ov20_021D2F50(UnkStruct_ov20_021D30F8 *param0, NARC *param1); +void ov20_021D3228(UnkStruct_ov20_021D30F8 *param0); +u32 ov20_021D3574(const UnkStruct_ov20_021D30F8 *param0); +void ov20_021D3578(UnkStruct_ov20_021D30F8 *param0, u32 param1); +void ov20_021D3684(UnkStruct_ov20_021D30F8 *param0); +void ov20_021D3690(UnkStruct_ov20_021D30F8 *param0); +void ov20_021D369C(UnkStruct_ov20_021D30F8 *param0, BOOL param1); +void ov20_021D36B0(UnkStruct_ov20_021D30F8 *param0); +void ov20_021D36D0(UnkStruct_ov20_021D30F8 *param0); +void ov20_021D3700(UnkStruct_ov20_021D30F8 *param0, int param1); +void ov20_021D3790(UnkStruct_ov20_021D30F8 *param0, int param1); +void ov20_021D381C(UnkStruct_ov20_021D30F8 *param0, int param1); +void ov20_021D384C(UnkStruct_ov20_021D30F8 *param0); #endif // POKEPLATINUM_OV20_021D2EA4_H diff --git a/include/overlay020/ov20_021D3864.h b/include/overlay020/ov20_021D3864.h index 3afc91dce1..2499a56582 100644 --- a/include/overlay020/ov20_021D3864.h +++ b/include/overlay020/ov20_021D3864.h @@ -3,19 +3,20 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020998EC_decl.h" + #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D2128_decl.h" #include "overlay020/struct_ov20_021D3980_decl.h" -UnkStruct_ov20_021D3980 * ov20_021D3864(UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2); -void ov20_021D3880(UnkStruct_ov20_021D3980 * param0); -void ov20_021D3898(UnkStruct_ov20_021D3980 * param0, NARC * param1); -void ov20_021D39BC(UnkStruct_ov20_021D3980 * param0); -void ov20_021D39C8(UnkStruct_ov20_021D3980 * param0); -void ov20_021D39D4(UnkStruct_ov20_021D3980 * param0, BOOL param1); -BOOL ov20_021D39E0(UnkStruct_ov20_021D3980 * param0); -void ov20_021D39EC(UnkStruct_ov20_021D3980 * param0, int param1); -void ov20_021D3A2C(UnkStruct_ov20_021D3980 * param0); -void ov20_021D3A40(UnkStruct_ov20_021D3980 * param0); +UnkStruct_ov20_021D3980 *ov20_021D3864(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2); +void ov20_021D3880(UnkStruct_ov20_021D3980 *param0); +void ov20_021D3898(UnkStruct_ov20_021D3980 *param0, NARC *param1); +void ov20_021D39BC(UnkStruct_ov20_021D3980 *param0); +void ov20_021D39C8(UnkStruct_ov20_021D3980 *param0); +void ov20_021D39D4(UnkStruct_ov20_021D3980 *param0, BOOL param1); +BOOL ov20_021D39E0(UnkStruct_ov20_021D3980 *param0); +void ov20_021D39EC(UnkStruct_ov20_021D3980 *param0, int param1); +void ov20_021D3A2C(UnkStruct_ov20_021D3980 *param0); +void ov20_021D3A40(UnkStruct_ov20_021D3980 *param0); #endif // POKEPLATINUM_OV20_021D3864_H diff --git a/include/overlay020/ov20_021D3A54.h b/include/overlay020/ov20_021D3A54.h index 328d690bd2..373e74cce8 100644 --- a/include/overlay020/ov20_021D3A54.h +++ b/include/overlay020/ov20_021D3A54.h @@ -3,28 +3,29 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020998EC_decl.h" + #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D2128_decl.h" #include "overlay020/struct_ov20_021D3E0C_decl.h" -UnkStruct_ov20_021D3E0C * ov20_021D3A54(UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2); -void ov20_021D3A80(UnkStruct_ov20_021D3E0C * param0); -void ov20_021D3A98(UnkStruct_ov20_021D3E0C * param0, NARC * param1); -void ov20_021D3E48(UnkStruct_ov20_021D3E0C * param0, BOOL param1); -void ov20_021D3E74(UnkStruct_ov20_021D3E0C * param0, u32 param1); -void ov20_021D3EF8(UnkStruct_ov20_021D3E0C * param0); -BOOL ov20_021D3F10(UnkStruct_ov20_021D3E0C * param0); -void ov20_021D3F60(UnkStruct_ov20_021D3E0C * param0); -BOOL ov20_021D3F84(UnkStruct_ov20_021D3E0C * param0); -void ov20_021D3FD0(UnkStruct_ov20_021D3E0C * param0); -void ov20_021D3FE0(UnkStruct_ov20_021D3E0C * param0); -BOOL ov20_021D3FF8(UnkStruct_ov20_021D3E0C * param0); -void ov20_021D4004(UnkStruct_ov20_021D3E0C * param0); -BOOL ov20_021D4020(UnkStruct_ov20_021D3E0C * param0); -void ov20_021D403C(UnkStruct_ov20_021D3E0C * param0); -BOOL ov20_021D4078(UnkStruct_ov20_021D3E0C * param0); -void ov20_021D4084(UnkStruct_ov20_021D3E0C * param0); -void ov20_021D40A8(UnkStruct_ov20_021D3E0C * param0); -BOOL ov20_021D40DC(UnkStruct_ov20_021D3E0C * param0); +UnkStruct_ov20_021D3E0C *ov20_021D3A54(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2); +void ov20_021D3A80(UnkStruct_ov20_021D3E0C *param0); +void ov20_021D3A98(UnkStruct_ov20_021D3E0C *param0, NARC *param1); +void ov20_021D3E48(UnkStruct_ov20_021D3E0C *param0, BOOL param1); +void ov20_021D3E74(UnkStruct_ov20_021D3E0C *param0, u32 param1); +void ov20_021D3EF8(UnkStruct_ov20_021D3E0C *param0); +BOOL ov20_021D3F10(UnkStruct_ov20_021D3E0C *param0); +void ov20_021D3F60(UnkStruct_ov20_021D3E0C *param0); +BOOL ov20_021D3F84(UnkStruct_ov20_021D3E0C *param0); +void ov20_021D3FD0(UnkStruct_ov20_021D3E0C *param0); +void ov20_021D3FE0(UnkStruct_ov20_021D3E0C *param0); +BOOL ov20_021D3FF8(UnkStruct_ov20_021D3E0C *param0); +void ov20_021D4004(UnkStruct_ov20_021D3E0C *param0); +BOOL ov20_021D4020(UnkStruct_ov20_021D3E0C *param0); +void ov20_021D403C(UnkStruct_ov20_021D3E0C *param0); +BOOL ov20_021D4078(UnkStruct_ov20_021D3E0C *param0); +void ov20_021D4084(UnkStruct_ov20_021D3E0C *param0); +void ov20_021D40A8(UnkStruct_ov20_021D3E0C *param0); +BOOL ov20_021D40DC(UnkStruct_ov20_021D3E0C *param0); #endif // POKEPLATINUM_OV20_021D3A54_H diff --git a/include/overlay020/ov20_021D40E8.h b/include/overlay020/ov20_021D40E8.h index 59d944c794..f5192dccd8 100644 --- a/include/overlay020/ov20_021D40E8.h +++ b/include/overlay020/ov20_021D40E8.h @@ -2,21 +2,22 @@ #define POKEPLATINUM_OV20_021D40E8_H #include "struct_decls/struct_020998EC_decl.h" + #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D2128_decl.h" #include "overlay020/struct_ov20_021D4210_decl.h" -UnkStruct_ov20_021D4210 * ov20_021D40E8(UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2); -void ov20_021D4164(UnkStruct_ov20_021D4210 * param0); -void ov20_021D41A8(UnkStruct_ov20_021D4210 * param0); -void ov20_021D4294(UnkStruct_ov20_021D4210 * param0); -void ov20_021D42E4(UnkStruct_ov20_021D4210 * param0); -BOOL ov20_021D4390(UnkStruct_ov20_021D4210 * param0); -void ov20_021D43B4(UnkStruct_ov20_021D4210 * param0); -BOOL ov20_021D43D8(UnkStruct_ov20_021D4210 * param0); -void ov20_021D4440(UnkStruct_ov20_021D4210 * param0, BOOL param1); -void ov20_021D4480(UnkStruct_ov20_021D4210 * param0, u32 param1); -void ov20_021D44BC(UnkStruct_ov20_021D4210 * param0, int param1); -BOOL ov20_021D4578(UnkStruct_ov20_021D4210 * param0); +UnkStruct_ov20_021D4210 *ov20_021D40E8(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2); +void ov20_021D4164(UnkStruct_ov20_021D4210 *param0); +void ov20_021D41A8(UnkStruct_ov20_021D4210 *param0); +void ov20_021D4294(UnkStruct_ov20_021D4210 *param0); +void ov20_021D42E4(UnkStruct_ov20_021D4210 *param0); +BOOL ov20_021D4390(UnkStruct_ov20_021D4210 *param0); +void ov20_021D43B4(UnkStruct_ov20_021D4210 *param0); +BOOL ov20_021D43D8(UnkStruct_ov20_021D4210 *param0); +void ov20_021D4440(UnkStruct_ov20_021D4210 *param0, BOOL param1); +void ov20_021D4480(UnkStruct_ov20_021D4210 *param0, u32 param1); +void ov20_021D44BC(UnkStruct_ov20_021D4210 *param0, int param1); +BOOL ov20_021D4578(UnkStruct_ov20_021D4210 *param0); #endif // POKEPLATINUM_OV20_021D40E8_H diff --git a/include/overlay020/ov20_021D4728.h b/include/overlay020/ov20_021D4728.h index 8ddd8b5b35..964b4e1297 100644 --- a/include/overlay020/ov20_021D4728.h +++ b/include/overlay020/ov20_021D4728.h @@ -3,16 +3,17 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020998EC_decl.h" + #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D2128_decl.h" #include "overlay020/struct_ov20_021D4AD4_decl.h" -UnkStruct_ov20_021D4AD4 * ov20_021D4728(UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2); -void ov20_021D4764(UnkStruct_ov20_021D4AD4 * param0); -void ov20_021D4774(UnkStruct_ov20_021D4AD4 * param0, NARC * param1); -void ov20_021D4BA4(UnkStruct_ov20_021D4AD4 * param0); -BOOL ov20_021D4C2C(UnkStruct_ov20_021D4AD4 * param0); -void ov20_021D4DBC(UnkStruct_ov20_021D4AD4 * param0, BOOL param1); -void ov20_021D4DF4(UnkStruct_ov20_021D4AD4 * param0, int param1, int param2); +UnkStruct_ov20_021D4AD4 *ov20_021D4728(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2); +void ov20_021D4764(UnkStruct_ov20_021D4AD4 *param0); +void ov20_021D4774(UnkStruct_ov20_021D4AD4 *param0, NARC *param1); +void ov20_021D4BA4(UnkStruct_ov20_021D4AD4 *param0); +BOOL ov20_021D4C2C(UnkStruct_ov20_021D4AD4 *param0); +void ov20_021D4DBC(UnkStruct_ov20_021D4AD4 *param0, BOOL param1); +void ov20_021D4DF4(UnkStruct_ov20_021D4AD4 *param0, int param1, int param2); #endif // POKEPLATINUM_OV20_021D4728_H diff --git a/include/overlay020/ov20_021D4E38.h b/include/overlay020/ov20_021D4E38.h index adc933004b..74b4a8a938 100644 --- a/include/overlay020/ov20_021D4E38.h +++ b/include/overlay020/ov20_021D4E38.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_OV20_021D4E38_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay020/struct_ov20_021D4E8C.h" #include "overlay020/struct_ov20_021D4FF0.h" -void ov20_021D4E38(UnkStruct_ov20_021D4E8C * param0, BGL * param1, u32 param2, int param3, int param4, int param5); -BOOL ov20_021D4E8C(UnkStruct_ov20_021D4E8C * param0); -void ov20_021D4F1C(UnkStruct_ov20_021D4FF0 * param0, int param1, int param2, int param3, int param4, int param5); -BOOL ov20_021D4F4C(UnkStruct_ov20_021D4FF0 * param0); -void ov20_021D4FB0(UnkStruct_ov20_021D4FF0 * param0, int param1, int param2, int param3, int param4); -BOOL ov20_021D4FF0(UnkStruct_ov20_021D4FF0 * param0); +void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BGL *param1, u32 param2, int param3, int param4, int param5); +BOOL ov20_021D4E8C(UnkStruct_ov20_021D4E8C *param0); +void ov20_021D4F1C(UnkStruct_ov20_021D4FF0 *param0, int param1, int param2, int param3, int param4, int param5); +BOOL ov20_021D4F4C(UnkStruct_ov20_021D4FF0 *param0); +void ov20_021D4FB0(UnkStruct_ov20_021D4FF0 *param0, int param1, int param2, int param3, int param4); +BOOL ov20_021D4FF0(UnkStruct_ov20_021D4FF0 *param0); #endif // POKEPLATINUM_OV20_021D4E38_H diff --git a/include/overlay020/ov20_021D5044.h b/include/overlay020/ov20_021D5044.h index d611648ebd..c6e8290b51 100644 --- a/include/overlay020/ov20_021D5044.h +++ b/include/overlay020/ov20_021D5044.h @@ -5,7 +5,7 @@ u32 ov20_021D5044(void); void ov20_021D5048(u32 param0, Strbuf *param1); -void ov20_021D506C(u32 param0, u32 * param1, u32 * param2); +void ov20_021D506C(u32 param0, u32 *param1, u32 *param2); int ov20_021D5098(u32 param0); int ov20_021D50B4(u32 param0); int ov20_021D50D0(u32 param0); diff --git a/include/overlay020/struct_ov20_021D4E8C.h b/include/overlay020/struct_ov20_021D4E8C.h index 21f13a43c3..2750ea85ec 100644 --- a/include/overlay020/struct_ov20_021D4E8C.h +++ b/include/overlay020/struct_ov20_021D4E8C.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_STRUCT_OV20_021D4E8C_H #include "struct_decls/struct_02018340_decl.h" + #include "sys_task_manager.h" typedef struct { - BGL * unk_00; + BGL *unk_00; u32 unk_04; int unk_08; fx32 unk_0C; @@ -13,7 +14,7 @@ typedef struct { fx32 unk_14; u16 unk_18; u16 unk_1A; - SysTask * unk_1C; + SysTask *unk_1C; } UnkStruct_ov20_021D4E8C; #endif // POKEPLATINUM_STRUCT_OV20_021D4E8C_H diff --git a/include/overlay020/struct_ov20_021D4FF0.h b/include/overlay020/struct_ov20_021D4FF0.h index 84287dd1fa..311d0124bf 100644 --- a/include/overlay020/struct_ov20_021D4FF0.h +++ b/include/overlay020/struct_ov20_021D4FF0.h @@ -11,7 +11,7 @@ typedef struct { int unk_10; int unk_14; int unk_18; - SysTask * unk_1C; + SysTask *unk_1C; } UnkStruct_ov20_021D4FF0; #endif // POKEPLATINUM_STRUCT_OV20_021D4FF0_H diff --git a/include/overlay021/funcptr_ov21_021D41EC.h b/include/overlay021/funcptr_ov21_021D41EC.h index 6e907a3521..8d7ee241b0 100644 --- a/include/overlay021/funcptr_ov21_021D41EC.h +++ b/include/overlay021/funcptr_ov21_021D41EC.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_FUNCPTR_OV21_021D41EC_H #define POKEPLATINUM_FUNCPTR_OV21_021D41EC_H - #include "overlay021/struct_ov21_021E6A68.h" -typedef int (* UnkFuncPtr_ov21_021D41EC)(UnkStruct_ov21_021E6A68 * param0, void * param1); +typedef int (*UnkFuncPtr_ov21_021D41EC)(UnkStruct_ov21_021E6A68 *param0, void *param1); #endif // POKEPLATINUM_FUNCPTR_OV21_021D41EC_H diff --git a/include/overlay021/funcptr_ov21_021D420C.h b/include/overlay021/funcptr_ov21_021D420C.h index 6b149abc5f..2c270a3a26 100644 --- a/include/overlay021/funcptr_ov21_021D420C.h +++ b/include/overlay021/funcptr_ov21_021D420C.h @@ -1,10 +1,9 @@ #ifndef POKEPLATINUM_FUNCPTR_OV21_021D420C_H #define POKEPLATINUM_FUNCPTR_OV21_021D420C_H -#include "overlay021/struct_ov21_021E6B20.h" - #include "overlay021/struct_ov21_021E6A68.h" +#include "overlay021/struct_ov21_021E6B20.h" -typedef int (* UnkFuncPtr_ov21_021D420C)(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); +typedef int (*UnkFuncPtr_ov21_021D420C)(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); #endif // POKEPLATINUM_FUNCPTR_OV21_021D420C_H diff --git a/include/overlay021/funcptr_ov21_021E9B74.h b/include/overlay021/funcptr_ov21_021E9B74.h index 5466ffe27d..fef4ce8467 100644 --- a/include/overlay021/funcptr_ov21_021E9B74.h +++ b/include/overlay021/funcptr_ov21_021E9B74.h @@ -4,6 +4,6 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -typedef void (* UnkFuncPtr_ov21_021E9B74)(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); +typedef void (*UnkFuncPtr_ov21_021E9B74)(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); #endif // POKEPLATINUM_FUNCPTR_OV21_021E9B74_H diff --git a/include/overlay021/funcptr_ov21_021E9B9C.h b/include/overlay021/funcptr_ov21_021E9B9C.h index 9576866e98..085dcd9231 100644 --- a/include/overlay021/funcptr_ov21_021E9B9C.h +++ b/include/overlay021/funcptr_ov21_021E9B9C.h @@ -3,6 +3,6 @@ #include "overlay021/struct_ov21_021E68F4.h" -typedef void (* UnkFuncPtr_ov21_021E9B9C)(UnkStruct_ov21_021E68F4 * param0); +typedef void (*UnkFuncPtr_ov21_021E9B9C)(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_FUNCPTR_OV21_021E9B9C_H diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h index c90cff0b82..f0acc3f61c 100644 --- a/include/overlay021/ov21_021D0D80.h +++ b/include/overlay021/ov21_021D0D80.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_OV21_021D0D80_H #define POKEPLATINUM_OV21_021D0D80_H -#include "overlay_manager.h" +#include + #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "touch_screen.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay021/struct_ov21_021D0D80_1.h" #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -19,57 +19,59 @@ #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021E68F4.h" -#include +#include "overlay_manager.h" +#include "strbuf.h" +#include "touch_screen.h" -int ov21_021D0D80(OverlayManager * param0, int * param1); -int ov21_021D0E3C(OverlayManager * param0, int * param1); -int ov21_021D0EC8(OverlayManager * param0, int * param1); -UnkStruct_ov21_021D0F60 * ov21_021D0F60(int param0, const UnkStruct_ov21_021D0D80_1 * param1); -BOOL ov21_021D10B8(UnkStruct_ov21_021D0F60 * param0); +int ov21_021D0D80(OverlayManager *param0, int *param1); +int ov21_021D0E3C(OverlayManager *param0, int *param1); +int ov21_021D0EC8(OverlayManager *param0, int *param1); +UnkStruct_ov21_021D0F60 *ov21_021D0F60(int param0, const UnkStruct_ov21_021D0D80_1 *param1); +BOOL ov21_021D10B8(UnkStruct_ov21_021D0F60 *param0); void ov21_021D12B0(int param0); void ov21_021D12C4(void); -void ov21_021D12D8(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021D3FE0 * ov21_021D12EC(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021D3FE0 * ov21_021D1300(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021D3FE0 * ov21_021D1314(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021D3FE0 * ov21_021D1328(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021D423C * ov21_021D133C(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021D423C * ov21_021D1350(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021D423C * ov21_021D1364(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021D423C * ov21_021D1378(UnkStruct_ov21_021D0F60 * param0); -int * ov21_021D138C(UnkStruct_ov21_021D0F60 * param0); -int * ov21_021D13A0(UnkStruct_ov21_021D0F60 * param0); -int * ov21_021D13B4(UnkStruct_ov21_021D0F60 * param0); -int * ov21_021D13C8(UnkStruct_ov21_021D0F60 * param0); -BOOL * ov21_021D13DC(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021D3320 * ov21_021D13EC(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021D13FC * ov21_021D13FC(UnkStruct_ov21_021D0F60 * param0); -UnkStruct_ov21_021E68F4 * ov21_021D1410(UnkStruct_ov21_021D0F60 * param0, int param1); -UnkStruct_ov21_021E68F4 * ov21_021D1430(UnkStruct_ov21_021D0F60 * param0, int param1); -void ov21_021D144C(GraphicElementData * param0, int param1); -void ov21_021D1498(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2); -void ov21_021D1524(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4); +void ov21_021D12D8(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021D3FE0 *ov21_021D12EC(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021D3FE0 *ov21_021D1300(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021D3FE0 *ov21_021D1314(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021D3FE0 *ov21_021D1328(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021D423C *ov21_021D133C(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021D423C *ov21_021D1350(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021D423C *ov21_021D1364(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021D423C *ov21_021D1378(UnkStruct_ov21_021D0F60 *param0); +int *ov21_021D138C(UnkStruct_ov21_021D0F60 *param0); +int *ov21_021D13A0(UnkStruct_ov21_021D0F60 *param0); +int *ov21_021D13B4(UnkStruct_ov21_021D0F60 *param0); +int *ov21_021D13C8(UnkStruct_ov21_021D0F60 *param0); +BOOL *ov21_021D13DC(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021D3320 *ov21_021D13EC(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021D13FC *ov21_021D13FC(UnkStruct_ov21_021D0F60 *param0); +UnkStruct_ov21_021E68F4 *ov21_021D1410(UnkStruct_ov21_021D0F60 *param0, int param1); +UnkStruct_ov21_021E68F4 *ov21_021D1430(UnkStruct_ov21_021D0F60 *param0, int param1); +void ov21_021D144C(GraphicElementData *param0, int param1); +void ov21_021D1498(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2); +void ov21_021D1524(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4); void ov21_021D154C(TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4); -void ov21_021D1558(UnkStruct_ov21_021D157C * param0, BGL * param1, int param2, NNSG2dScreenData * param3, int param4, int param5, int param6, int param7, int param8); -BOOL ov21_021D157C(UnkStruct_ov21_021D157C * param0); -void ov21_021D1650(Window * param0, int param1, int param2, int param3); -Window * ov21_021D16D8(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3); -Window * ov21_021D170C(UnkStruct_ov21_021D4C0C * param0, int param1, int param2); -Window * ov21_021D172C(UnkStruct_ov21_021D4C0C * param0, int param1, int param2); -void ov21_021D1778(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, fx32 param4, fx32 param5); -void ov21_021D1848(UnkStruct_ov21_021D13FC * param0, int param1, int param2); -void ov21_021D1858(UnkStruct_ov21_021D22F8 * param0, int param1, int param2); -void ov21_021D1890(UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5); -u32 ov21_021D19D8(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6, int param7); -u32 ov21_021D1A34(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); -u32 ov21_021D1A78(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); -u32 ov21_021D1AC0(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); -u32 ov21_021D1B08(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); -u32 ov21_021D1B4C(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); -u32 ov21_021D1B94(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); -u32 ov21_021D1BD8(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); -u32 ov21_021D1C30(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); -u32 ov21_021D1C88(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6); -Strbuf* ov21_021D1CE0(int param0, int param1); +void ov21_021D1558(UnkStruct_ov21_021D157C *param0, BGL *param1, int param2, NNSG2dScreenData *param3, int param4, int param5, int param6, int param7, int param8); +BOOL ov21_021D157C(UnkStruct_ov21_021D157C *param0); +void ov21_021D1650(Window *param0, int param1, int param2, int param3); +Window *ov21_021D16D8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3); +Window *ov21_021D170C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2); +Window *ov21_021D172C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2); +void ov21_021D1778(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, fx32 param4, fx32 param5); +void ov21_021D1848(UnkStruct_ov21_021D13FC *param0, int param1, int param2); +void ov21_021D1858(UnkStruct_ov21_021D22F8 *param0, int param1, int param2); +void ov21_021D1890(UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5); +u32 ov21_021D19D8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6, int param7); +u32 ov21_021D1A34(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); +u32 ov21_021D1A78(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); +u32 ov21_021D1AC0(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); +u32 ov21_021D1B08(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); +u32 ov21_021D1B4C(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); +u32 ov21_021D1B94(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); +u32 ov21_021D1BD8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); +u32 ov21_021D1C30(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); +u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6); +Strbuf *ov21_021D1CE0(int param0, int param1); #endif // POKEPLATINUM_OV21_021D0D80_H diff --git a/include/overlay021/ov21_021D1FA4.h b/include/overlay021/ov21_021D1FA4.h index b6839ce363..a71d3bc10e 100644 --- a/include/overlay021/ov21_021D1FA4.h +++ b/include/overlay021/ov21_021D1FA4.h @@ -1,13 +1,17 @@ #ifndef POKEPLATINUM_OV21_021D1FA4_H #define POKEPLATINUM_OV21_021D1FA4_H -#include "struct_decls/struct_02006C24_decl.h" +#include +#include + #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" + #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D22F8.h" #include "overlay021/struct_ov21_021D23F8.h" @@ -16,56 +20,53 @@ #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021D4EE4_decl.h" -#include -#include - -void ov21_021D1FA4(UnkStruct_ov21_021D13FC * param0, int param1); -void ov21_021D2098(UnkStruct_ov21_021D13FC * param0); -void ov21_021D2124(UnkStruct_ov21_021D13FC * param0); -void ov21_021D214C(UnkStruct_ov21_021D13FC * param0); -void ov21_021D2164(UnkStruct_ov21_021D13FC * param0, int param1, int param2); -Sprite * ov21_021D2170(const UnkStruct_ov21_021D13FC * param0); -void ov21_021D217C(const UnkStruct_ov21_021D13FC * param0, BOOL param1); -void ov21_021D2188(UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3, int param4, u8 param5, u32 param6, int param7, int param8, int param9); -void ov21_021D222C(UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3); -void ov21_021D2250(UnkStruct_ov21_021D13FC * param0, int * param1, int * param2, int param3); -Sprite * ov21_021D2274(const UnkStruct_ov21_021D13FC * param0, int param1); -void ov21_021D2280(const UnkStruct_ov21_021D13FC * param0, BOOL param1, int param2); -GraphicElementData * ov21_021D22A8(const UnkStruct_ov21_021D13FC * param0); -GraphicElementData * ov21_021D22C4(const UnkStruct_ov21_021D13FC * param0); -void ov21_021D22E0(UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D4CB8 * param1, int param2, int param3, u32 param4); -void ov21_021D22F8(UnkStruct_ov21_021D22F8 * param0, UnkStruct_ov21_021D4CB8 * param1, int param2, int param3, u32 param4); -UnkStruct_02009DC8 * ov21_021D2344(const UnkStruct_ov21_021D13FC * param0, int param1); -void ov21_021D2360(const UnkStruct_ov21_021D13FC * param0, GXOamMode param1); -void ov21_021D238C(const UnkStruct_ov21_021D13FC * param0, int param1); -void ov21_021D23C0(const UnkStruct_ov21_021D13FC * param0, BOOL param1); -void ov21_021D23F8(UnkStruct_ov21_021D23F8 * param0, u8 param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); -BOOL ov21_021D2424(UnkStruct_ov21_021D23F8 * param0); -int ov21_021D2484(UnkStruct_ov21_021D23F8 * param0); -int ov21_021D24B8(UnkStruct_ov21_021D23F8 * param0); -BOOL ov21_021D24EC(UnkStruct_ov21_021D23F8 * param0); -void ov21_021D24FC(const UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D23F8 * param1); -void ov21_021D251C(const UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D23F8 * param1, int param2); -void ov21_021D2544(const UnkStruct_ov21_021D4EE4 * param0, UnkStruct_ov21_021D13FC * param1); -void ov21_021D2574(UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3, int param4); -void ov21_021D2584(UnkStruct_ov21_021D2584 * param0, int param1); -BOOL ov21_021D25A0(UnkStruct_ov21_021D2584 * param0); -void ov21_021D25AC(UnkStruct_ov21_021D2584 * param0, BOOL param1); -void ov21_021D25B8(const UnkStruct_ov21_021D4EE4 * param0, UnkStruct_ov21_021D13FC * param1); -void ov21_021D25E8(UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3, int param4); -void ov21_021D2648(UnkStruct_ov21_021D2648 * param0, int param1, int param2, int param3, int param4, int param5); -BOOL ov21_021D2664(UnkStruct_ov21_021D2648 * param0); -NARC * ov21_021D26E0(UnkStruct_ov21_021D13FC * param0); -void * ov21_021D26E8(UnkStruct_ov21_021D13FC * param0, u32 param1, BOOL param2, u32 param3); -u32 ov21_021D2724(UnkStruct_ov21_021D13FC * param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); -void ov21_021D276C(UnkStruct_ov21_021D13FC * param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); -void * ov21_021D27B8(UnkStruct_ov21_021D13FC * param0, u32 param1, BOOL param2, NNSG2dScreenData ** param3, u32 param4); -void * ov21_021D27E0(UnkStruct_ov21_021D13FC * param0, u32 param1, NNSG2dPaletteData ** param2, u32 param3); -void * ov21_021D2808(UnkStruct_ov21_021D13FC * param0, u32 param1, BOOL param2, NNSG2dCharacterData ** param3, u32 param4); -void ov21_021D2B88(UnkStruct_ov21_021D22F8 * param0, UnkStruct_02009714 ** param1, int param2, NARC * param3); -void ov21_021D2C58(UnkStruct_ov21_021D22F8 * param0, UnkStruct_02009714 ** param1); -void ov21_021D2D88(UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4); -void ov21_021D2E1C(UnkStruct_ov21_021D22F8 * param0); -void ov21_021D2E44(UnkStruct_ov21_021D22F8 * param0, BOOL param1); +void ov21_021D1FA4(UnkStruct_ov21_021D13FC *param0, int param1); +void ov21_021D2098(UnkStruct_ov21_021D13FC *param0); +void ov21_021D2124(UnkStruct_ov21_021D13FC *param0); +void ov21_021D214C(UnkStruct_ov21_021D13FC *param0); +void ov21_021D2164(UnkStruct_ov21_021D13FC *param0, int param1, int param2); +Sprite *ov21_021D2170(const UnkStruct_ov21_021D13FC *param0); +void ov21_021D217C(const UnkStruct_ov21_021D13FC *param0, BOOL param1); +void ov21_021D2188(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3, int param4, u8 param5, u32 param6, int param7, int param8, int param9); +void ov21_021D222C(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3); +void ov21_021D2250(UnkStruct_ov21_021D13FC *param0, int *param1, int *param2, int param3); +Sprite *ov21_021D2274(const UnkStruct_ov21_021D13FC *param0, int param1); +void ov21_021D2280(const UnkStruct_ov21_021D13FC *param0, BOOL param1, int param2); +GraphicElementData *ov21_021D22A8(const UnkStruct_ov21_021D13FC *param0); +GraphicElementData *ov21_021D22C4(const UnkStruct_ov21_021D13FC *param0); +void ov21_021D22E0(UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D4CB8 *param1, int param2, int param3, u32 param4); +void ov21_021D22F8(UnkStruct_ov21_021D22F8 *param0, UnkStruct_ov21_021D4CB8 *param1, int param2, int param3, u32 param4); +UnkStruct_02009DC8 *ov21_021D2344(const UnkStruct_ov21_021D13FC *param0, int param1); +void ov21_021D2360(const UnkStruct_ov21_021D13FC *param0, GXOamMode param1); +void ov21_021D238C(const UnkStruct_ov21_021D13FC *param0, int param1); +void ov21_021D23C0(const UnkStruct_ov21_021D13FC *param0, BOOL param1); +void ov21_021D23F8(UnkStruct_ov21_021D23F8 *param0, u8 param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); +BOOL ov21_021D2424(UnkStruct_ov21_021D23F8 *param0); +int ov21_021D2484(UnkStruct_ov21_021D23F8 *param0); +int ov21_021D24B8(UnkStruct_ov21_021D23F8 *param0); +BOOL ov21_021D24EC(UnkStruct_ov21_021D23F8 *param0); +void ov21_021D24FC(const UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D23F8 *param1); +void ov21_021D251C(const UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D23F8 *param1, int param2); +void ov21_021D2544(const UnkStruct_ov21_021D4EE4 *param0, UnkStruct_ov21_021D13FC *param1); +void ov21_021D2574(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3, int param4); +void ov21_021D2584(UnkStruct_ov21_021D2584 *param0, int param1); +BOOL ov21_021D25A0(UnkStruct_ov21_021D2584 *param0); +void ov21_021D25AC(UnkStruct_ov21_021D2584 *param0, BOOL param1); +void ov21_021D25B8(const UnkStruct_ov21_021D4EE4 *param0, UnkStruct_ov21_021D13FC *param1); +void ov21_021D25E8(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3, int param4); +void ov21_021D2648(UnkStruct_ov21_021D2648 *param0, int param1, int param2, int param3, int param4, int param5); +BOOL ov21_021D2664(UnkStruct_ov21_021D2648 *param0); +NARC *ov21_021D26E0(UnkStruct_ov21_021D13FC *param0); +void *ov21_021D26E8(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, u32 param3); +u32 ov21_021D2724(UnkStruct_ov21_021D13FC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +void ov21_021D276C(UnkStruct_ov21_021D13FC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); +void *ov21_021D27B8(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4); +void *ov21_021D27E0(UnkStruct_ov21_021D13FC *param0, u32 param1, NNSG2dPaletteData **param2, u32 param3); +void *ov21_021D2808(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4); +void ov21_021D2B88(UnkStruct_ov21_021D22F8 *param0, UnkStruct_02009714 **param1, int param2, NARC *param3); +void ov21_021D2C58(UnkStruct_ov21_021D22F8 *param0, UnkStruct_02009714 **param1); +void ov21_021D2D88(UnkStruct_ov21_021D22F8 *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3, int param4); +void ov21_021D2E1C(UnkStruct_ov21_021D22F8 *param0); +void ov21_021D2E44(UnkStruct_ov21_021D22F8 *param0, BOOL param1); #endif // POKEPLATINUM_OV21_021D1FA4_H diff --git a/include/overlay021/ov21_021D3208.h b/include/overlay021/ov21_021D3208.h index dcc8a3f907..82f4458056 100644 --- a/include/overlay021/ov21_021D3208.h +++ b/include/overlay021/ov21_021D3208.h @@ -1,60 +1,61 @@ #ifndef POKEPLATINUM_OV21_021D3208_H #define POKEPLATINUM_OV21_021D3208_H -#include "strbuf.h" #include "overlay021/struct_ov21_021D3208.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D37DC.h" -void ov21_021D3208(UnkStruct_ov21_021D3320 * param0, UnkStruct_ov21_021D3208 * param1, int param2); -void ov21_021D3320(UnkStruct_ov21_021D3320 * param0); -u32 ov21_021D334C(const UnkStruct_ov21_021D3320 * param0, int param1, int param2); -u32 ov21_021D335C(const UnkStruct_ov21_021D3320 * param0, int param1); -u32 ov21_021D3374(const UnkStruct_ov21_021D3320 * param0, int param1); -u32 ov21_021D338C(const UnkStruct_ov21_021D3320 * param0, int param1); -u32 ov21_021D33A4(const UnkStruct_ov21_021D3320 * param0, int param1); -u32 ov21_021D33BC(const UnkStruct_ov21_021D3320 * param0, int param1); -u32 ov21_021D33D4(const UnkStruct_ov21_021D3320 * param0, u32 param1); -u32 ov21_021D33E0(const UnkStruct_ov21_021D3320 * param0, int param1); -u32 ov21_021D33F8(const UnkStruct_ov21_021D3320 * param0); -u32 ov21_021D3404(const UnkStruct_ov21_021D3320 * param0, int param1); -u32 ov21_021D3410(const UnkStruct_ov21_021D3320 * param0, u32 param1, int param2); -u32 ov21_021D341C(const UnkStruct_ov21_021D3320 * param0, u32 param1); -BOOL ov21_021D3428(const UnkStruct_ov21_021D3320 * param0); -void ov21_021D3434(UnkStruct_ov21_021D3320 * param0, u32 param1); -u32 ov21_021D3440(const UnkStruct_ov21_021D3320 * param0); -void ov21_021D344C(UnkStruct_ov21_021D3320 * param0, u32 param1); -u32 ov21_021D3458(const UnkStruct_ov21_021D3320 * param0); -BOOL ov21_021D3464(UnkStruct_ov21_021D3320 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, BOOL param8); -BOOL ov21_021D3684(UnkStruct_ov21_021D3320 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7); -BOOL ov21_021D36A4(const UnkStruct_ov21_021D3320 * param0, int param1); -BOOL ov21_021D36C0(UnkStruct_ov21_021D3320 * param0, int param1); -int ov21_021D36D8(const UnkStruct_ov21_021D3320 * param0); -BOOL ov21_021D36E4(const UnkStruct_ov21_021D3320 * param0, int param1); -BOOL ov21_021D36FC(UnkStruct_ov21_021D3320 * param0, int param1); -BOOL ov21_021D371C(UnkStruct_ov21_021D3320 * param0, int param1); -int ov21_021D375C(const UnkStruct_ov21_021D3320 * param0); -int ov21_021D3768(const UnkStruct_ov21_021D3320 * param0); -int ov21_021D3770(const UnkStruct_ov21_021D3320 * param0, u32 param1); -BOOL ov21_021D3794(UnkStruct_ov21_021D3320 * param0, int param1); -int ov21_021D37BC(const UnkStruct_ov21_021D3320 * param0); -int ov21_021D37CC(const UnkStruct_ov21_021D3320 * param0); -const UnkStruct_ov21_021D37DC * ov21_021D37DC(const UnkStruct_ov21_021D3320 * param0, int param1); -BOOL ov21_021D37F8(const UnkStruct_ov21_021D3320 * param0, int param1); -BOOL ov21_021D3810(UnkStruct_ov21_021D3320 * param0, int param1); -BOOL ov21_021D3844(UnkStruct_ov21_021D3320 * param0, int param1); -BOOL ov21_021D387C(UnkStruct_ov21_021D3320 * param0, int param1); -int ov21_021D3898(const UnkStruct_ov21_021D3320 * param0); -int ov21_021D38A4(const UnkStruct_ov21_021D3320 * param0); -int ov21_021D38B0(const UnkStruct_ov21_021D3320 * param0, int param1); -void ov21_021D38C0(UnkStruct_ov21_021D3320 * param0); -int ov21_021D38FC(const UnkStruct_ov21_021D3320 * param0); -int ov21_021D3908(const UnkStruct_ov21_021D3320 * param0); -Strbuf* ov21_021D3914(const UnkStruct_ov21_021D3320 * param0); -u32 ov21_021D3920(const UnkStruct_ov21_021D3320 * param0); -BOOL ov21_021D392C(const UnkStruct_ov21_021D3320 * param0, int param1); -BOOL ov21_021D3954(const UnkStruct_ov21_021D3320 * param0); -void ov21_021D3960(UnkStruct_ov21_021D3320 * param0); -u32 ov21_021D3998(const UnkStruct_ov21_021D3320 * param0); +#include "strbuf.h" + +void ov21_021D3208(UnkStruct_ov21_021D3320 *param0, UnkStruct_ov21_021D3208 *param1, int param2); +void ov21_021D3320(UnkStruct_ov21_021D3320 *param0); +u32 ov21_021D334C(const UnkStruct_ov21_021D3320 *param0, int param1, int param2); +u32 ov21_021D335C(const UnkStruct_ov21_021D3320 *param0, int param1); +u32 ov21_021D3374(const UnkStruct_ov21_021D3320 *param0, int param1); +u32 ov21_021D338C(const UnkStruct_ov21_021D3320 *param0, int param1); +u32 ov21_021D33A4(const UnkStruct_ov21_021D3320 *param0, int param1); +u32 ov21_021D33BC(const UnkStruct_ov21_021D3320 *param0, int param1); +u32 ov21_021D33D4(const UnkStruct_ov21_021D3320 *param0, u32 param1); +u32 ov21_021D33E0(const UnkStruct_ov21_021D3320 *param0, int param1); +u32 ov21_021D33F8(const UnkStruct_ov21_021D3320 *param0); +u32 ov21_021D3404(const UnkStruct_ov21_021D3320 *param0, int param1); +u32 ov21_021D3410(const UnkStruct_ov21_021D3320 *param0, u32 param1, int param2); +u32 ov21_021D341C(const UnkStruct_ov21_021D3320 *param0, u32 param1); +BOOL ov21_021D3428(const UnkStruct_ov21_021D3320 *param0); +void ov21_021D3434(UnkStruct_ov21_021D3320 *param0, u32 param1); +u32 ov21_021D3440(const UnkStruct_ov21_021D3320 *param0); +void ov21_021D344C(UnkStruct_ov21_021D3320 *param0, u32 param1); +u32 ov21_021D3458(const UnkStruct_ov21_021D3320 *param0); +BOOL ov21_021D3464(UnkStruct_ov21_021D3320 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, BOOL param8); +BOOL ov21_021D3684(UnkStruct_ov21_021D3320 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7); +BOOL ov21_021D36A4(const UnkStruct_ov21_021D3320 *param0, int param1); +BOOL ov21_021D36C0(UnkStruct_ov21_021D3320 *param0, int param1); +int ov21_021D36D8(const UnkStruct_ov21_021D3320 *param0); +BOOL ov21_021D36E4(const UnkStruct_ov21_021D3320 *param0, int param1); +BOOL ov21_021D36FC(UnkStruct_ov21_021D3320 *param0, int param1); +BOOL ov21_021D371C(UnkStruct_ov21_021D3320 *param0, int param1); +int ov21_021D375C(const UnkStruct_ov21_021D3320 *param0); +int ov21_021D3768(const UnkStruct_ov21_021D3320 *param0); +int ov21_021D3770(const UnkStruct_ov21_021D3320 *param0, u32 param1); +BOOL ov21_021D3794(UnkStruct_ov21_021D3320 *param0, int param1); +int ov21_021D37BC(const UnkStruct_ov21_021D3320 *param0); +int ov21_021D37CC(const UnkStruct_ov21_021D3320 *param0); +const UnkStruct_ov21_021D37DC *ov21_021D37DC(const UnkStruct_ov21_021D3320 *param0, int param1); +BOOL ov21_021D37F8(const UnkStruct_ov21_021D3320 *param0, int param1); +BOOL ov21_021D3810(UnkStruct_ov21_021D3320 *param0, int param1); +BOOL ov21_021D3844(UnkStruct_ov21_021D3320 *param0, int param1); +BOOL ov21_021D387C(UnkStruct_ov21_021D3320 *param0, int param1); +int ov21_021D3898(const UnkStruct_ov21_021D3320 *param0); +int ov21_021D38A4(const UnkStruct_ov21_021D3320 *param0); +int ov21_021D38B0(const UnkStruct_ov21_021D3320 *param0, int param1); +void ov21_021D38C0(UnkStruct_ov21_021D3320 *param0); +int ov21_021D38FC(const UnkStruct_ov21_021D3320 *param0); +int ov21_021D3908(const UnkStruct_ov21_021D3320 *param0); +Strbuf *ov21_021D3914(const UnkStruct_ov21_021D3320 *param0); +u32 ov21_021D3920(const UnkStruct_ov21_021D3320 *param0); +BOOL ov21_021D392C(const UnkStruct_ov21_021D3320 *param0, int param1); +BOOL ov21_021D3954(const UnkStruct_ov21_021D3320 *param0); +void ov21_021D3960(UnkStruct_ov21_021D3320 *param0); +u32 ov21_021D3998(const UnkStruct_ov21_021D3320 *param0); #endif // POKEPLATINUM_OV21_021D3208_H diff --git a/include/overlay021/ov21_021D3FE0.h b/include/overlay021/ov21_021D3FE0.h index 5361fdfa3a..13387051d5 100644 --- a/include/overlay021/ov21_021D3FE0.h +++ b/include/overlay021/ov21_021D3FE0.h @@ -4,13 +4,13 @@ #include "overlay021/struct_ov21_021D3FE0_decl.h" #include "overlay021/struct_ov21_021D4008.h" -UnkStruct_ov21_021D3FE0 * ov21_021D3FE0(int param0); -void ov21_021D4008(UnkStruct_ov21_021D3FE0 * param0, const UnkStruct_ov21_021D4008 * param1); -int ov21_021D4078(UnkStruct_ov21_021D3FE0 * param0); -int ov21_021D4100(UnkStruct_ov21_021D3FE0 * param0); -void ov21_021D4194(UnkStruct_ov21_021D3FE0 * param0, BOOL param1); -void ov21_021D4198(UnkStruct_ov21_021D3FE0 * param0); -BOOL ov21_021D41A8(UnkStruct_ov21_021D3FE0 * param0); -BOOL ov21_021D41C0(UnkStruct_ov21_021D3FE0 * param0); +UnkStruct_ov21_021D3FE0 *ov21_021D3FE0(int param0); +void ov21_021D4008(UnkStruct_ov21_021D3FE0 *param0, const UnkStruct_ov21_021D4008 *param1); +int ov21_021D4078(UnkStruct_ov21_021D3FE0 *param0); +int ov21_021D4100(UnkStruct_ov21_021D3FE0 *param0); +void ov21_021D4194(UnkStruct_ov21_021D3FE0 *param0, BOOL param1); +void ov21_021D4198(UnkStruct_ov21_021D3FE0 *param0); +BOOL ov21_021D41A8(UnkStruct_ov21_021D3FE0 *param0); +BOOL ov21_021D41C0(UnkStruct_ov21_021D3FE0 *param0); #endif // POKEPLATINUM_OV21_021D3FE0_H diff --git a/include/overlay021/ov21_021D423C.h b/include/overlay021/ov21_021D423C.h index 61e6065434..cea4aee333 100644 --- a/include/overlay021/ov21_021D423C.h +++ b/include/overlay021/ov21_021D423C.h @@ -4,9 +4,9 @@ #include "overlay021/struct_ov21_021D423C_decl.h" #include "overlay021/struct_ov21_021D4660.h" -UnkStruct_ov21_021D423C * ov21_021D423C(int param0); -void ov21_021D426C(UnkStruct_ov21_021D423C * param0, UnkStruct_ov21_021D4660 * param1, int param2); -const UnkStruct_ov21_021D4660 * ov21_021D4284(UnkStruct_ov21_021D423C * param0, int param1); -BOOL ov21_021D42D4(UnkStruct_ov21_021D423C * param0); +UnkStruct_ov21_021D423C *ov21_021D423C(int param0); +void ov21_021D426C(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1, int param2); +const UnkStruct_ov21_021D4660 *ov21_021D4284(UnkStruct_ov21_021D423C *param0, int param1); +BOOL ov21_021D42D4(UnkStruct_ov21_021D423C *param0); #endif // POKEPLATINUM_OV21_021D423C_H diff --git a/include/overlay021/ov21_021D4340.h b/include/overlay021/ov21_021D4340.h index f780808a68..a343529178 100644 --- a/include/overlay021/ov21_021D4340.h +++ b/include/overlay021/ov21_021D4340.h @@ -5,24 +5,24 @@ #include "overlay021/struct_ov21_021D4340_1.h" #include "overlay021/struct_ov21_021D4660.h" -BOOL ov21_021D4340(UnkStruct_ov21_021D4340_1 * param0); -BOOL ov21_021D43A8(UnkStruct_ov21_021D4340_1 * param0); -BOOL ov21_021D4434(UnkStruct_ov21_021D4340_1 * param0); -BOOL ov21_021D4558(UnkStruct_ov21_021D4340_1 * param0); -void ov21_021D4660(UnkStruct_ov21_021D4660 * param0); -void ov21_021D467C(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D4704(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D475C(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D47F0(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D4878(UnkStruct_ov21_021D4660 * param0, UnkStruct_ov21_021D0F60 * param1, int param2, int param3); -void ov21_021D48B8(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D491C(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D4980(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D49E4(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D4A3C(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D4A94(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D4AF8(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D4B50(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); -void ov21_021D4BB4(int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3); +BOOL ov21_021D4340(UnkStruct_ov21_021D4340_1 *param0); +BOOL ov21_021D43A8(UnkStruct_ov21_021D4340_1 *param0); +BOOL ov21_021D4434(UnkStruct_ov21_021D4340_1 *param0); +BOOL ov21_021D4558(UnkStruct_ov21_021D4340_1 *param0); +void ov21_021D4660(UnkStruct_ov21_021D4660 *param0); +void ov21_021D467C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4704(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D475C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D47F0(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, UnkStruct_ov21_021D0F60 *param1, int param2, int param3); +void ov21_021D48B8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D491C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4980(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D49E4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4A3C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4A94(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4AF8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4B50(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); +void ov21_021D4BB4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3); #endif // POKEPLATINUM_OV21_021D4340_H diff --git a/include/overlay021/ov21_021D4C0C.h b/include/overlay021/ov21_021D4C0C.h index d638404443..2b1c55c706 100644 --- a/include/overlay021/ov21_021D4C0C.h +++ b/include/overlay021/ov21_021D4C0C.h @@ -1,23 +1,25 @@ #ifndef POKEPLATINUM_OV21_021D4C0C_H #define POKEPLATINUM_OV21_021D4C0C_H -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay021/struct_ov21_021D1FA4.h" #include "overlay021/struct_ov21_021D4C0C_decl.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" -UnkStruct_ov21_021D4C0C * ov21_021D4C0C(const UnkStruct_ov21_021D1FA4 * param0); -void ov21_021D4C6C(UnkStruct_ov21_021D4C0C * param0); -UnkStruct_ov21_021D4CA0 * ov21_021D4CA0(const UnkStruct_ov21_021D4CB8 * param0); -UnkStruct_ov21_021D4CA0 * ov21_021D4CB8(const UnkStruct_ov21_021D4CB8 * param0, int param1); -void ov21_021D4D1C(UnkStruct_ov21_021D4CA0 * param0); -void ov21_021D4D3C(UnkStruct_ov21_021D4C0C * param0); -Window * ov21_021D4D6C(UnkStruct_ov21_021D4C0C * param0, int param1, int param2); -void ov21_021D4DA0(Window * param0); -u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C * param0, Window * param1, u32 param2, u32 param3, int param4, int param5); -void ov21_021D4E10(UnkStruct_ov21_021D4C0C * param0, Window * param1, u32 param2, u32 param3); -void ov21_021D4E80(UnkStruct_ov21_021D4C0C * param0, Window * param1, Strbuf *param2, int param3, int param4); +#include "strbuf.h" + +UnkStruct_ov21_021D4C0C *ov21_021D4C0C(const UnkStruct_ov21_021D1FA4 *param0); +void ov21_021D4C6C(UnkStruct_ov21_021D4C0C *param0); +UnkStruct_ov21_021D4CA0 *ov21_021D4CA0(const UnkStruct_ov21_021D4CB8 *param0); +UnkStruct_ov21_021D4CA0 *ov21_021D4CB8(const UnkStruct_ov21_021D4CB8 *param0, int param1); +void ov21_021D4D1C(UnkStruct_ov21_021D4CA0 *param0); +void ov21_021D4D3C(UnkStruct_ov21_021D4C0C *param0); +Window *ov21_021D4D6C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2); +void ov21_021D4DA0(Window *param0); +u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3, int param4, int param5); +void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3); +void ov21_021D4E80(UnkStruct_ov21_021D4C0C *param0, Window *param1, Strbuf *param2, int param3, int param4); #endif // POKEPLATINUM_OV21_021D4C0C_H diff --git a/include/overlay021/ov21_021D4EE4.h b/include/overlay021/ov21_021D4EE4.h index 2fe77e633a..4b69d4436e 100644 --- a/include/overlay021/ov21_021D4EE4.h +++ b/include/overlay021/ov21_021D4EE4.h @@ -4,14 +4,14 @@ #include "overlay021/struct_ov21_021D4EE4_decl.h" #include "overlay021/struct_ov21_021D4FE4.h" -UnkStruct_ov21_021D4EE4 * ov21_021D4EE4(int param0); -void ov21_021D4EFC(UnkStruct_ov21_021D4EE4 * param0); -void ov21_021D4F04(UnkStruct_ov21_021D4EE4 * param0, const UnkStruct_ov21_021D4FE4 * param1, int param2, int param3); -void ov21_021D4F20(UnkStruct_ov21_021D4EE4 * param0, int param1, int param2); -int ov21_021D4F7C(const UnkStruct_ov21_021D4EE4 * param0); -void ov21_021D4F94(const UnkStruct_ov21_021D4EE4 * param0, int * param1, int * param2); -void ov21_021D4FBC(const UnkStruct_ov21_021D4EE4 * param0, int * param1, int * param2); -void ov21_021D4FE4(UnkStruct_ov21_021D4FE4 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7); -void ov21_021D4FFC(int param0, int * param1, int * param2, int param3, int param4, int param5, int param6); +UnkStruct_ov21_021D4EE4 *ov21_021D4EE4(int param0); +void ov21_021D4EFC(UnkStruct_ov21_021D4EE4 *param0); +void ov21_021D4F04(UnkStruct_ov21_021D4EE4 *param0, const UnkStruct_ov21_021D4FE4 *param1, int param2, int param3); +void ov21_021D4F20(UnkStruct_ov21_021D4EE4 *param0, int param1, int param2); +int ov21_021D4F7C(const UnkStruct_ov21_021D4EE4 *param0); +void ov21_021D4F94(const UnkStruct_ov21_021D4EE4 *param0, int *param1, int *param2); +void ov21_021D4FBC(const UnkStruct_ov21_021D4EE4 *param0, int *param1, int *param2); +void ov21_021D4FE4(UnkStruct_ov21_021D4FE4 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7); +void ov21_021D4FFC(int param0, int *param1, int *param2, int param3, int param4, int param5, int param6); #endif // POKEPLATINUM_OV21_021D4EE4_H diff --git a/include/overlay021/ov21_021D517C.h b/include/overlay021/ov21_021D517C.h index 77c4e9918a..56b0ae29b0 100644 --- a/include/overlay021/ov21_021D517C.h +++ b/include/overlay021/ov21_021D517C.h @@ -3,7 +3,7 @@ #include "struct_defs/struct_0205AA50.h" -void ov21_021D517C(Window * param0, u8 * param1, u16 param2, u16 param3, u8 param4, u8 * param5, u8 param6, u8 param7, u16 param8, u16 param9); -void ov21_021D5214(u8 * param0, u8 param1, u8 param2); +void ov21_021D517C(Window *param0, u8 *param1, u16 param2, u16 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u16 param8, u16 param9); +void ov21_021D5214(u8 *param0, u8 param1, u8 param2); #endif // POKEPLATINUM_OV21_021D517C_H diff --git a/include/overlay021/ov21_021D5600.h b/include/overlay021/ov21_021D5600.h index 02b6c0be1e..ce6d8162b1 100644 --- a/include/overlay021/ov21_021D5600.h +++ b/include/overlay021/ov21_021D5600.h @@ -5,8 +5,8 @@ void ov21_021D5600(Strbuf *param0); int ov21_021D5608(int param0); -Strbuf* ov21_021D561C(int param0, int param1, int param2); -Strbuf* ov21_021D566C(int param0, int param1, int param2); -Strbuf* ov21_021D56BC(int param0, int param1, int param2, int param3); +Strbuf *ov21_021D561C(int param0, int param1, int param2); +Strbuf *ov21_021D566C(int param0, int param1, int param2); +Strbuf *ov21_021D56BC(int param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV21_021D5600_H diff --git a/include/overlay021/ov21_021D57B4.h b/include/overlay021/ov21_021D57B4.h index e85d6f25e2..f7f8f71361 100644 --- a/include/overlay021/ov21_021D57B4.h +++ b/include/overlay021/ov21_021D57B4.h @@ -2,17 +2,18 @@ #define POKEPLATINUM_OV21_021D57B4_H #include "struct_decls/struct_02022550_decl.h" + #include "overlay021/struct_ov21_021D5844.h" #include "overlay021/struct_ov21_021D5868.h" #include "overlay021/struct_ov21_021D5890.h" -void ov21_021D57B4(UnkStruct_ov21_021D5844 * param0, int param1, int param2, int param3); -void ov21_021D5844(UnkStruct_ov21_021D5844 * param0); -UnkStruct_ov21_021D5868 * ov21_021D5868(int param0, int * param1); -UnkStruct_ov21_021D5890 * ov21_021D5890(int param0, int * param1); -void ov21_021D58C0(u8 * param0, u8 param1, u8 param2, const UnkStruct_ov21_021D5890 * param3); -u32 ov21_021D5948(u8 * param0, int param1, int param2, const UnkStruct_ov21_021D5890 * param3, const UnkStruct_ov21_021D5844 * param4, const u8 * param5, u32 param6); -void ov21_021D59D8(GraphicElementData * param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 * param5, int param6, int param7); -int ov21_021D5A20(GraphicElementData ** param0, int param1, int param2, int param3, int param4, int param5, int param6, const UnkStruct_ov21_021D5868 * param7, const UnkStruct_ov21_021D5844 * param8, int param9, int param10, const u8 * param11, u32 param12, u32 * param13); +void ov21_021D57B4(UnkStruct_ov21_021D5844 *param0, int param1, int param2, int param3); +void ov21_021D5844(UnkStruct_ov21_021D5844 *param0); +UnkStruct_ov21_021D5868 *ov21_021D5868(int param0, int *param1); +UnkStruct_ov21_021D5890 *ov21_021D5890(int param0, int *param1); +void ov21_021D58C0(u8 *param0, u8 param1, u8 param2, const UnkStruct_ov21_021D5890 *param3); +u32 ov21_021D5948(u8 *param0, int param1, int param2, const UnkStruct_ov21_021D5890 *param3, const UnkStruct_ov21_021D5844 *param4, const u8 *param5, u32 param6); +void ov21_021D59D8(GraphicElementData *param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 *param5, int param6, int param7); +int ov21_021D5A20(GraphicElementData **param0, int param1, int param2, int param3, int param4, int param5, int param6, const UnkStruct_ov21_021D5868 *param7, const UnkStruct_ov21_021D5844 *param8, int param9, int param10, const u8 *param11, u32 param12, u32 *param13); #endif // POKEPLATINUM_OV21_021D57B4_H diff --git a/include/overlay021/ov21_021D5AEC.h b/include/overlay021/ov21_021D5AEC.h index e7cf15fab6..4f22aaf29b 100644 --- a/include/overlay021/ov21_021D5AEC.h +++ b/include/overlay021/ov21_021D5AEC.h @@ -5,8 +5,8 @@ #include "overlay021/struct_ov21_021D5B68.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021D5AEC(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021D5B50(UnkStruct_ov21_021E68F4 * param0); -BOOL ov21_021D5B68(const UnkStruct_ov21_021D5B68 * param0); +void ov21_021D5AEC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021D5B50(UnkStruct_ov21_021E68F4 *param0); +BOOL ov21_021D5B68(const UnkStruct_ov21_021D5B68 *param0); #endif // POKEPLATINUM_OV21_021D5AEC_H diff --git a/include/overlay021/ov21_021D76B0.h b/include/overlay021/ov21_021D76B0.h index 9206e6a638..958d6a5ee6 100644 --- a/include/overlay021/ov21_021D76B0.h +++ b/include/overlay021/ov21_021D76B0.h @@ -4,7 +4,7 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021D76B0(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021D7710(UnkStruct_ov21_021E68F4 * param0); +void ov21_021D76B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021D7710(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021D76B0_H diff --git a/include/overlay021/ov21_021D85B0.h b/include/overlay021/ov21_021D85B0.h index 7f00e3f747..14d4d2f6e5 100644 --- a/include/overlay021/ov21_021D85B0.h +++ b/include/overlay021/ov21_021D85B0.h @@ -4,21 +4,21 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021D85B0(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021D8610(UnkStruct_ov21_021E68F4 * param0); -void ov21_021D8628(UnkStruct_ov21_021E68F4 * param0, int param1); -int ov21_021D863C(const UnkStruct_ov21_021E68F4 * param0); -void ov21_021D8644(UnkStruct_ov21_021E68F4 * param0, int param1); -int ov21_021D8658(const UnkStruct_ov21_021E68F4 * param0); -void ov21_021D8660(UnkStruct_ov21_021E68F4 * param0, int param1); -int ov21_021D8674(const UnkStruct_ov21_021E68F4 * param0); -void ov21_021D867C(UnkStruct_ov21_021E68F4 * param0, int param1, int param2); -int ov21_021D8698(const UnkStruct_ov21_021E68F4 * param0, int param1); -void ov21_021D86A8(UnkStruct_ov21_021E68F4 * param0, int param1); -int ov21_021D86BC(const UnkStruct_ov21_021E68F4 * param0); -void ov21_021D86C4(UnkStruct_ov21_021E68F4 * param0, BOOL param1); -BOOL ov21_021D86D0(const UnkStruct_ov21_021E68F4 * param0); -int ov21_021D86D8(const UnkStruct_ov21_021E68F4 * param0); -int ov21_021D86E0(const UnkStruct_ov21_021E68F4 * param0); +void ov21_021D85B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021D8610(UnkStruct_ov21_021E68F4 *param0); +void ov21_021D8628(UnkStruct_ov21_021E68F4 *param0, int param1); +int ov21_021D863C(const UnkStruct_ov21_021E68F4 *param0); +void ov21_021D8644(UnkStruct_ov21_021E68F4 *param0, int param1); +int ov21_021D8658(const UnkStruct_ov21_021E68F4 *param0); +void ov21_021D8660(UnkStruct_ov21_021E68F4 *param0, int param1); +int ov21_021D8674(const UnkStruct_ov21_021E68F4 *param0); +void ov21_021D867C(UnkStruct_ov21_021E68F4 *param0, int param1, int param2); +int ov21_021D8698(const UnkStruct_ov21_021E68F4 *param0, int param1); +void ov21_021D86A8(UnkStruct_ov21_021E68F4 *param0, int param1); +int ov21_021D86BC(const UnkStruct_ov21_021E68F4 *param0); +void ov21_021D86C4(UnkStruct_ov21_021E68F4 *param0, BOOL param1); +BOOL ov21_021D86D0(const UnkStruct_ov21_021E68F4 *param0); +int ov21_021D86D8(const UnkStruct_ov21_021E68F4 *param0); +int ov21_021D86E0(const UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021D85B0_H diff --git a/include/overlay021/ov21_021D94BC.h b/include/overlay021/ov21_021D94BC.h index 30e1a3192d..97870d2779 100644 --- a/include/overlay021/ov21_021D94BC.h +++ b/include/overlay021/ov21_021D94BC.h @@ -4,7 +4,7 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021D94BC(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021D951C(UnkStruct_ov21_021E68F4 * param0); +void ov21_021D94BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021D951C(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021D94BC_H diff --git a/include/overlay021/ov21_021DC9BC.h b/include/overlay021/ov21_021DC9BC.h index ea92a4dc9a..378533dfef 100644 --- a/include/overlay021/ov21_021DC9BC.h +++ b/include/overlay021/ov21_021DC9BC.h @@ -4,12 +4,12 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021DC9BC(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021DCA14(UnkStruct_ov21_021E68F4 * param0); -int ov21_021DCA28(const UnkStruct_ov21_021E68F4 * param0); -void ov21_021DCA30(UnkStruct_ov21_021E68F4 * param0, int param1); -void ov21_021DCA44(UnkStruct_ov21_021E68F4 * param0, int param1, int param2); -void ov21_021DCA4C(UnkStruct_ov21_021E68F4 * param0, int param1); -void ov21_021DCA54(UnkStruct_ov21_021E68F4 * param0, int param1); +void ov21_021DC9BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021DCA14(UnkStruct_ov21_021E68F4 *param0); +int ov21_021DCA28(const UnkStruct_ov21_021E68F4 *param0); +void ov21_021DCA30(UnkStruct_ov21_021E68F4 *param0, int param1); +void ov21_021DCA44(UnkStruct_ov21_021E68F4 *param0, int param1, int param2); +void ov21_021DCA4C(UnkStruct_ov21_021E68F4 *param0, int param1); +void ov21_021DCA54(UnkStruct_ov21_021E68F4 *param0, int param1); #endif // POKEPLATINUM_OV21_021DC9BC_H diff --git a/include/overlay021/ov21_021DDD2C.h b/include/overlay021/ov21_021DDD2C.h index e3dc01aadc..ac870e272b 100644 --- a/include/overlay021/ov21_021DDD2C.h +++ b/include/overlay021/ov21_021DDD2C.h @@ -4,7 +4,7 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021DDD2C(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021DDD8C(UnkStruct_ov21_021E68F4 * param0); +void ov21_021DDD2C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021DDD8C(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021DDD2C_H diff --git a/include/overlay021/ov21_021DE668.h b/include/overlay021/ov21_021DE668.h index 177325dedd..275fd840f2 100644 --- a/include/overlay021/ov21_021DE668.h +++ b/include/overlay021/ov21_021DE668.h @@ -2,17 +2,18 @@ #define POKEPLATINUM_OV21_021DE668_H #include "struct_defs/struct_0205AA50.h" + #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D4C0C_decl.h" #include "overlay021/struct_ov21_021DE6D4.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021DE668(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021DE6C0(UnkStruct_ov21_021E68F4 * param0); -BOOL ov21_021DE6D4(UnkStruct_ov21_021DE6D4 * param0, int param1); -BOOL ov21_021DE6D8(UnkStruct_ov21_021DE6D4 * param0, int param1); -void ov21_021DEB8C(Window * param0, int param1, int param2, int param3, u32 param4); +void ov21_021DE668(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021DE6C0(UnkStruct_ov21_021E68F4 *param0); +BOOL ov21_021DE6D4(UnkStruct_ov21_021DE6D4 *param0, int param1); +BOOL ov21_021DE6D8(UnkStruct_ov21_021DE6D4 *param0, int param1); +void ov21_021DEB8C(Window *param0, int param1, int param2, int param3, u32 param4); int ov21_021DF180(int param0); -Window * ov21_021DF30C(UnkStruct_ov21_021D4C0C * param0, int param1, int param2); +Window *ov21_021DF30C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2); #endif // POKEPLATINUM_OV21_021DE668_H diff --git a/include/overlay021/ov21_021DF734.h b/include/overlay021/ov21_021DF734.h index 8aa6abdd5a..1179d6989f 100644 --- a/include/overlay021/ov21_021DF734.h +++ b/include/overlay021/ov21_021DF734.h @@ -4,8 +4,8 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021DF734(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021DF78C(UnkStruct_ov21_021E68F4 * param0); -BOOL ov21_021DF7A0(UnkStruct_ov21_021E68F4 * param0, int param1); +void ov21_021DF734(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021DF78C(UnkStruct_ov21_021E68F4 *param0); +BOOL ov21_021DF7A0(UnkStruct_ov21_021E68F4 *param0, int param1); #endif // POKEPLATINUM_OV21_021DF734_H diff --git a/include/overlay021/ov21_021E0C68.h b/include/overlay021/ov21_021E0C68.h index ae847e8340..2a62e25ccb 100644 --- a/include/overlay021/ov21_021E0C68.h +++ b/include/overlay021/ov21_021E0C68.h @@ -4,12 +4,12 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E0C68(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021E0CC0(UnkStruct_ov21_021E68F4 * param0); -void ov21_021E0CD4(UnkStruct_ov21_021E68F4 * param0, int param1, int param2); -void ov21_021E0CDC(UnkStruct_ov21_021E68F4 * param0, int param1); -BOOL ov21_021E0CE4(UnkStruct_ov21_021E68F4 * param0); -BOOL ov21_021E0CE8(UnkStruct_ov21_021E68F4 * param0, int param1); -void ov21_021E0CF8(UnkStruct_ov21_021E68F4 * param0, int param1); +void ov21_021E0C68(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E0CC0(UnkStruct_ov21_021E68F4 *param0); +void ov21_021E0CD4(UnkStruct_ov21_021E68F4 *param0, int param1, int param2); +void ov21_021E0CDC(UnkStruct_ov21_021E68F4 *param0, int param1); +BOOL ov21_021E0CE4(UnkStruct_ov21_021E68F4 *param0); +BOOL ov21_021E0CE8(UnkStruct_ov21_021E68F4 *param0, int param1); +void ov21_021E0CF8(UnkStruct_ov21_021E68F4 *param0, int param1); #endif // POKEPLATINUM_OV21_021E0C68_H diff --git a/include/overlay021/ov21_021E1924.h b/include/overlay021/ov21_021E1924.h index 3f277519b6..b66575b6d6 100644 --- a/include/overlay021/ov21_021E1924.h +++ b/include/overlay021/ov21_021E1924.h @@ -4,7 +4,7 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E1924(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021E1984(UnkStruct_ov21_021E68F4 * param0); +void ov21_021E1924(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E1984(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E1924_H diff --git a/include/overlay021/ov21_021E29DC.h b/include/overlay021/ov21_021E29DC.h index 8048a8b10f..22a4a65ccc 100644 --- a/include/overlay021/ov21_021E29DC.h +++ b/include/overlay021/ov21_021E29DC.h @@ -4,14 +4,14 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E29DC(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021E2A3C(UnkStruct_ov21_021E68F4 * param0); -BOOL ov21_021E2A54(const UnkStruct_ov21_021E68F4 * param0); -void ov21_021E332C(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021E338C(UnkStruct_ov21_021E68F4 * param0); -BOOL ov21_021E33A4(const UnkStruct_ov21_021E68F4 * param0); -BOOL ov21_021E33AC(const UnkStruct_ov21_021E68F4 * param0); -void ov21_021E33B4(UnkStruct_ov21_021E68F4 * param0, BOOL param1); -BOOL ov21_021E33BC(const UnkStruct_ov21_021E68F4 * param0); +void ov21_021E29DC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E2A3C(UnkStruct_ov21_021E68F4 *param0); +BOOL ov21_021E2A54(const UnkStruct_ov21_021E68F4 *param0); +void ov21_021E332C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E338C(UnkStruct_ov21_021E68F4 *param0); +BOOL ov21_021E33A4(const UnkStruct_ov21_021E68F4 *param0); +BOOL ov21_021E33AC(const UnkStruct_ov21_021E68F4 *param0); +void ov21_021E33B4(UnkStruct_ov21_021E68F4 *param0, BOOL param1); +BOOL ov21_021E33BC(const UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E29DC_H diff --git a/include/overlay021/ov21_021E3FFC.h b/include/overlay021/ov21_021E3FFC.h index 4d61665672..d8865ca0d4 100644 --- a/include/overlay021/ov21_021E3FFC.h +++ b/include/overlay021/ov21_021E3FFC.h @@ -4,10 +4,10 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E3FFC(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021E4054(UnkStruct_ov21_021E68F4 * param0); -void ov21_021E4068(UnkStruct_ov21_021E68F4 * param0, int param1, int param2); -void ov21_021E4070(UnkStruct_ov21_021E68F4 * param0, int param1); -void ov21_021E4078(UnkStruct_ov21_021E68F4 * param0, int param1); +void ov21_021E3FFC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E4054(UnkStruct_ov21_021E68F4 *param0); +void ov21_021E4068(UnkStruct_ov21_021E68F4 *param0, int param1, int param2); +void ov21_021E4070(UnkStruct_ov21_021E68F4 *param0, int param1); +void ov21_021E4078(UnkStruct_ov21_021E68F4 *param0, int param1); #endif // POKEPLATINUM_OV21_021E3FFC_H diff --git a/include/overlay021/ov21_021E4CA4.h b/include/overlay021/ov21_021E4CA4.h index 02309b6488..1c08101afb 100644 --- a/include/overlay021/ov21_021E4CA4.h +++ b/include/overlay021/ov21_021E4CA4.h @@ -4,8 +4,8 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E4CA4(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021E4D04(UnkStruct_ov21_021E68F4 * param0); -int ov21_021E4D1C(const UnkStruct_ov21_021E68F4 * param0); +void ov21_021E4CA4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E4D04(UnkStruct_ov21_021E68F4 *param0); +int ov21_021E4D1C(const UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E4CA4_H diff --git a/include/overlay021/ov21_021E6014.h b/include/overlay021/ov21_021E6014.h index 167e0392b5..ab71b4c9c7 100644 --- a/include/overlay021/ov21_021E6014.h +++ b/include/overlay021/ov21_021E6014.h @@ -4,7 +4,7 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E6014(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021E6074(UnkStruct_ov21_021E68F4 * param0); +void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E6074(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E6014_H diff --git a/include/overlay021/ov21_021E68F4.h b/include/overlay021/ov21_021E68F4.h index 977db73eea..f231f79e0a 100644 --- a/include/overlay021/ov21_021E68F4.h +++ b/include/overlay021/ov21_021E68F4.h @@ -4,7 +4,7 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E68F4(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021E6954(UnkStruct_ov21_021E68F4 * param0); +void ov21_021E68F4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E6954(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E68F4_H diff --git a/include/overlay021/ov21_021E737C.h b/include/overlay021/ov21_021E737C.h index 5f6ca16dfb..aa4b7c263b 100644 --- a/include/overlay021/ov21_021E737C.h +++ b/include/overlay021/ov21_021E737C.h @@ -4,7 +4,7 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E737C(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021E73D4(UnkStruct_ov21_021E68F4 * param0); +void ov21_021E737C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E73D4(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E737C_H diff --git a/include/overlay021/ov21_021E8484.h b/include/overlay021/ov21_021E8484.h index 08bb88d75c..eff3d31156 100644 --- a/include/overlay021/ov21_021E8484.h +++ b/include/overlay021/ov21_021E8484.h @@ -4,7 +4,7 @@ #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021E68F4.h" -void ov21_021E8484(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2); -void ov21_021E84E4(UnkStruct_ov21_021E68F4 * param0); +void ov21_021E8484(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2); +void ov21_021E84E4(UnkStruct_ov21_021E68F4 *param0); #endif // POKEPLATINUM_OV21_021E8484_H diff --git a/include/overlay021/ov21_021E8D48.h b/include/overlay021/ov21_021E8D48.h index 4665224e15..a4d2e98357 100644 --- a/include/overlay021/ov21_021E8D48.h +++ b/include/overlay021/ov21_021E8D48.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV21_021E8D48_H #include "struct_decls/sprite_decl.h" + #include "overlay021/struct_ov21_021E8D48_decl.h" #include "overlay021/struct_ov21_021E8E0C.h" -UnkStruct_ov21_021E8D48 * ov21_021E8D48(const UnkStruct_ov21_021E8E0C * param0); -void ov21_021E8DD0(UnkStruct_ov21_021E8D48 * param0); -BOOL ov21_021E8DEC(const UnkStruct_ov21_021E8D48 * param0); -Sprite * ov21_021E8E00(UnkStruct_ov21_021E8D48 * param0); -void ov21_021E8E04(UnkStruct_ov21_021E8D48 * param0, BOOL param1); +UnkStruct_ov21_021E8D48 *ov21_021E8D48(const UnkStruct_ov21_021E8E0C *param0); +void ov21_021E8DD0(UnkStruct_ov21_021E8D48 *param0); +BOOL ov21_021E8DEC(const UnkStruct_ov21_021E8D48 *param0); +Sprite *ov21_021E8E00(UnkStruct_ov21_021E8D48 *param0); +void ov21_021E8E04(UnkStruct_ov21_021E8D48 *param0, BOOL param1); #endif // POKEPLATINUM_OV21_021E8D48_H diff --git a/include/overlay021/struct_ov21_021D0D80.h b/include/overlay021/struct_ov21_021D0D80.h index 71b5560538..8000e02faf 100644 --- a/include/overlay021/struct_ov21_021D0D80.h +++ b/include/overlay021/struct_ov21_021D0D80.h @@ -1,19 +1,20 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021D0D80_H #define POKEPLATINUM_STRUCT_OV21_021D0D80_H -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0209ACBC_decl.h" +#include "trainer_info.h" + typedef struct { - const PokedexData * unk_00; - const TrainerInfo * unk_04; + const PokedexData *unk_00; + const TrainerInfo *unk_04; int unk_08; BOOL unk_0C; BOOL unk_10; BOOL unk_14; BOOL unk_18; - UnkStruct_0209ACBC * unk_1C; + UnkStruct_0209ACBC *unk_1C; } UnkStruct_ov21_021D0D80; #endif // POKEPLATINUM_STRUCT_OV21_021D0D80_H diff --git a/include/overlay021/struct_ov21_021D0D80_1.h b/include/overlay021/struct_ov21_021D0D80_1.h index ee8d99c35f..bbef0c564a 100644 --- a/include/overlay021/struct_ov21_021D0D80_1.h +++ b/include/overlay021/struct_ov21_021D0D80_1.h @@ -1,19 +1,20 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021D0D80_1_H #define POKEPLATINUM_STRUCT_OV21_021D0D80_1_H -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0209ACBC_decl.h" +#include "trainer_info.h" + typedef struct { - const PokedexData * unk_00; - const TrainerInfo * unk_04; + const PokedexData *unk_00; + const TrainerInfo *unk_04; int unk_08; BOOL unk_0C; BOOL unk_10; BOOL unk_14; BOOL unk_18; - UnkStruct_0209ACBC * unk_1C; + UnkStruct_0209ACBC *unk_1C; } UnkStruct_ov21_021D0D80_1; #endif // POKEPLATINUM_STRUCT_OV21_021D0D80_1_H diff --git a/include/overlay021/struct_ov21_021D13FC.h b/include/overlay021/struct_ov21_021D13FC.h index b05f1ce22e..dcdd3cb0ad 100644 --- a/include/overlay021/struct_ov21_021D13FC.h +++ b/include/overlay021/struct_ov21_021D13FC.h @@ -1,40 +1,42 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021D13FC_H #define POKEPLATINUM_STRUCT_OV21_021D13FC_H +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02009714_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay021/struct_ov21_021D22F8.h" #include "overlay021/struct_ov21_021D23F8.h" #include "overlay021/struct_ov21_021D2584.h" #include "overlay021/struct_ov21_021D3124.h" #include "overlay021/struct_ov21_021D4C0C_decl.h" +#include "sys_task_manager.h" + typedef struct { - BGL * unk_00; + BGL *unk_00; Window unk_04; UnkStruct_0200C738 unk_14; - GraphicElementManager * unk_138; - UnkStruct_02009714 * unk_13C[4]; - UnkStruct_ov21_021D4C0C * unk_14C; - UnkStruct_02007768 * unk_150; - Sprite * unk_154[4]; - UnkStruct_02015064 * unk_164; + GraphicElementManager *unk_138; + UnkStruct_02009714 *unk_13C[4]; + UnkStruct_ov21_021D4C0C *unk_14C; + UnkStruct_02007768 *unk_150; + Sprite *unk_154[4]; + UnkStruct_02015064 *unk_164; UnkStruct_ov21_021D23F8 unk_168; UnkStruct_ov21_021D23F8 unk_18C; UnkStruct_ov21_021D22F8 unk_1B0; UnkStruct_ov21_021D2584 unk_1E0; UnkStruct_ov21_021D3124 unk_218; - SysTask * unk_270; - SysTask * unk_274; - NARC * unk_278; + SysTask *unk_270; + SysTask *unk_274; + NARC *unk_278; } UnkStruct_ov21_021D13FC; #endif // POKEPLATINUM_STRUCT_OV21_021D13FC_H diff --git a/include/overlay021/struct_ov21_021D157C.h b/include/overlay021/struct_ov21_021D157C.h index d872548123..8dc047de7b 100644 --- a/include/overlay021/struct_ov21_021D157C.h +++ b/include/overlay021/struct_ov21_021D157C.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021D157C_H #define POKEPLATINUM_STRUCT_OV21_021D157C_H -#include "struct_decls/struct_02018340_decl.h" - #include +#include "struct_decls/struct_02018340_decl.h" + typedef struct { - BGL * unk_00; - NNSG2dScreenData * unk_04; + BGL *unk_00; + NNSG2dScreenData *unk_04; int unk_08; int unk_0C; int unk_10; diff --git a/include/overlay021/struct_ov21_021D1FA4.h b/include/overlay021/struct_ov21_021D1FA4.h index 7c74ac02e3..54c23658f7 100644 --- a/include/overlay021/struct_ov21_021D1FA4.h +++ b/include/overlay021/struct_ov21_021D1FA4.h @@ -5,8 +5,8 @@ #include "struct_decls/struct_020218BC_decl.h" typedef struct { - GraphicElementManager * unk_00; - BGL * unk_04; + GraphicElementManager *unk_00; + BGL *unk_04; int unk_08; int unk_0C; } UnkStruct_ov21_021D1FA4; diff --git a/include/overlay021/struct_ov21_021D22F8.h b/include/overlay021/struct_ov21_021D22F8.h index 3559048968..5a32b8c10c 100644 --- a/include/overlay021/struct_ov21_021D22F8.h +++ b/include/overlay021/struct_ov21_021D22F8.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021D22F8_H #define POKEPLATINUM_STRUCT_OV21_021D22F8_H +#include + #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay021/struct_ov21_021D4CA0.h" -#include +#include "overlay021/struct_ov21_021D4CA0.h" typedef struct { - GraphicElementData * unk_00; - GraphicElementData * unk_04; - UnkStruct_ov21_021D4CA0 * unk_08; - UnkStruct_02009DC8 * unk_0C[4]; + GraphicElementData *unk_00; + GraphicElementData *unk_04; + UnkStruct_ov21_021D4CA0 *unk_08; + UnkStruct_02009DC8 *unk_0C[4]; VecFx32 unk_1C; int unk_28; u32 unk_2C; diff --git a/include/overlay021/struct_ov21_021D2584.h b/include/overlay021/struct_ov21_021D2584.h index 4bcc71dc3c..86bfc3617a 100644 --- a/include/overlay021/struct_ov21_021D2584.h +++ b/include/overlay021/struct_ov21_021D2584.h @@ -5,8 +5,8 @@ #include "struct_decls/struct_02022550_decl.h" typedef struct { - GraphicElementData * unk_00[4]; - UnkStruct_02009DC8 * unk_10[4]; + GraphicElementData *unk_00[4]; + UnkStruct_02009DC8 *unk_10[4]; int unk_20; int unk_24; int unk_28; diff --git a/include/overlay021/struct_ov21_021D3124.h b/include/overlay021/struct_ov21_021D3124.h index 1eb3b651b8..77f40c9c2c 100644 --- a/include/overlay021/struct_ov21_021D3124.h +++ b/include/overlay021/struct_ov21_021D3124.h @@ -5,7 +5,7 @@ #include "overlay021/struct_ov21_021D2648.h" typedef struct { - UnkStruct_ov21_021D2584 * unk_00; + UnkStruct_ov21_021D2584 *unk_00; UnkStruct_ov21_021D2648 unk_04; UnkStruct_ov21_021D2648 unk_24; int unk_44; diff --git a/include/overlay021/struct_ov21_021D3208.h b/include/overlay021/struct_ov21_021D3208.h index aae9cc2698..13d0b724d2 100644 --- a/include/overlay021/struct_ov21_021D3208.h +++ b/include/overlay021/struct_ov21_021D3208.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021D3208_H #define POKEPLATINUM_STRUCT_OV21_021D3208_H -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" +#include "trainer_info.h" + typedef struct { - const PokedexData * unk_00; - const TrainerInfo * unk_04; + const PokedexData *unk_00; + const TrainerInfo *unk_04; int unk_08; BOOL unk_0C; BOOL unk_10; diff --git a/include/overlay021/struct_ov21_021D3320.h b/include/overlay021/struct_ov21_021D3320.h index 9111897da9..ed943afb42 100644 --- a/include/overlay021/struct_ov21_021D3320.h +++ b/include/overlay021/struct_ov21_021D3320.h @@ -1,13 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021D3320_H #define POKEPLATINUM_STRUCT_OV21_021D3320_H -#include "strbuf.h" #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02098700_decl.h" + #include "overlay021/struct_ov21_021D3A60.h" +#include "strbuf.h" + typedef struct { - const PokedexData * unk_00; + const PokedexData *unk_00; UnkStruct_ov21_021D3A60 unk_04; int unk_1730; BOOL unk_1734; @@ -15,10 +17,10 @@ typedef struct { int unk_173C; int unk_1740; int unk_1744; - HeightWeightData * unk_1748; + HeightWeightData *unk_1748; u32 unk_174C; u32 unk_1750; - Strbuf* unk_1754; + Strbuf *unk_1754; int unk_1758; u16 unk_175C; u16 unk_175E; diff --git a/include/overlay021/struct_ov21_021D3A60.h b/include/overlay021/struct_ov21_021D3A60.h index 7baa9d24de..912161f845 100644 --- a/include/overlay021/struct_ov21_021D3A60.h +++ b/include/overlay021/struct_ov21_021D3A60.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021D3A60_H #define POKEPLATINUM_STRUCT_OV21_021D3A60_H -#include "overlay021/struct_ov21_021D37DC.h" #include "constants/species.h" +#include "overlay021/struct_ov21_021D37DC.h" + typedef struct { UnkStruct_ov21_021D37DC unk_00[NATIONAL_DEX_COUNT]; int unk_F68; diff --git a/include/overlay021/struct_ov21_021D4008.h b/include/overlay021/struct_ov21_021D4008.h index e65e9f9ddb..b7d08d80aa 100644 --- a/include/overlay021/struct_ov21_021D4008.h +++ b/include/overlay021/struct_ov21_021D4008.h @@ -5,10 +5,10 @@ #include "overlay021/funcptr_ov21_021D420C.h" typedef struct { - void * unk_00; - void * unk_04; - const UnkFuncPtr_ov21_021D41EC * unk_08; - const UnkFuncPtr_ov21_021D420C * unk_0C; + void *unk_00; + void *unk_04; + const UnkFuncPtr_ov21_021D41EC *unk_08; + const UnkFuncPtr_ov21_021D420C *unk_0C; } UnkStruct_ov21_021D4008; #endif // POKEPLATINUM_STRUCT_OV21_021D4008_H diff --git a/include/overlay021/struct_ov21_021D4340.h b/include/overlay021/struct_ov21_021D4340.h index 9fe4cb6639..f6cfd916fb 100644 --- a/include/overlay021/struct_ov21_021D4340.h +++ b/include/overlay021/struct_ov21_021D4340.h @@ -6,9 +6,9 @@ #include "overlay021/struct_ov21_021E68F4.h" typedef struct { - UnkStruct_ov21_021E68F4 * unk_00; - UnkStruct_ov21_021D3FE0 * unk_04; - UnkStruct_ov21_021D423C * unk_08; + UnkStruct_ov21_021E68F4 *unk_00; + UnkStruct_ov21_021D3FE0 *unk_04; + UnkStruct_ov21_021D423C *unk_08; } UnkStruct_ov21_021D4340; #endif // POKEPLATINUM_STRUCT_OV21_021D4340_H diff --git a/include/overlay021/struct_ov21_021D4340_1.h b/include/overlay021/struct_ov21_021D4340_1.h index 8578dc2ce8..3bad501c04 100644 --- a/include/overlay021/struct_ov21_021D4340_1.h +++ b/include/overlay021/struct_ov21_021D4340_1.h @@ -3,8 +3,8 @@ typedef struct { int unk_00; - void * unk_04; - void * unk_08; + void *unk_04; + void *unk_08; } UnkStruct_ov21_021D4340_1; #endif // POKEPLATINUM_STRUCT_OV21_021D4340_1_H diff --git a/include/overlay021/struct_ov21_021D43A8.h b/include/overlay021/struct_ov21_021D43A8.h index 203c353de0..63f30dd75e 100644 --- a/include/overlay021/struct_ov21_021D43A8.h +++ b/include/overlay021/struct_ov21_021D43A8.h @@ -4,11 +4,11 @@ #include "overlay021/struct_ov21_021D3FE0_decl.h" typedef struct { - UnkStruct_ov21_021D3FE0 * unk_00; - UnkStruct_ov21_021D3FE0 * unk_04; - UnkStruct_ov21_021D3FE0 * unk_08; - UnkStruct_ov21_021D3FE0 * unk_0C; - BOOL * unk_10; + UnkStruct_ov21_021D3FE0 *unk_00; + UnkStruct_ov21_021D3FE0 *unk_04; + UnkStruct_ov21_021D3FE0 *unk_08; + UnkStruct_ov21_021D3FE0 *unk_0C; + BOOL *unk_10; } UnkStruct_ov21_021D43A8; #endif // POKEPLATINUM_STRUCT_OV21_021D43A8_H diff --git a/include/overlay021/struct_ov21_021D4434.h b/include/overlay021/struct_ov21_021D4434.h index 78474bb98b..6a06086e40 100644 --- a/include/overlay021/struct_ov21_021D4434.h +++ b/include/overlay021/struct_ov21_021D4434.h @@ -6,18 +6,18 @@ #include "overlay021/struct_ov21_021E68F4.h" typedef struct { - UnkStruct_ov21_021D3FE0 * unk_00; - UnkStruct_ov21_021D3FE0 * unk_04; - UnkStruct_ov21_021D3FE0 * unk_08; - UnkStruct_ov21_021D3FE0 * unk_0C; - UnkStruct_ov21_021D423C * unk_10; - UnkStruct_ov21_021D423C * unk_14; - UnkStruct_ov21_021D423C * unk_18; - UnkStruct_ov21_021D423C * unk_1C; - UnkStruct_ov21_021E68F4 * unk_20; - UnkStruct_ov21_021E68F4 * unk_24; - UnkStruct_ov21_021E68F4 * unk_28; - UnkStruct_ov21_021E68F4 * unk_2C; + UnkStruct_ov21_021D3FE0 *unk_00; + UnkStruct_ov21_021D3FE0 *unk_04; + UnkStruct_ov21_021D3FE0 *unk_08; + UnkStruct_ov21_021D3FE0 *unk_0C; + UnkStruct_ov21_021D423C *unk_10; + UnkStruct_ov21_021D423C *unk_14; + UnkStruct_ov21_021D423C *unk_18; + UnkStruct_ov21_021D423C *unk_1C; + UnkStruct_ov21_021E68F4 *unk_20; + UnkStruct_ov21_021E68F4 *unk_24; + UnkStruct_ov21_021E68F4 *unk_28; + UnkStruct_ov21_021E68F4 *unk_2C; } UnkStruct_ov21_021D4434; #endif // POKEPLATINUM_STRUCT_OV21_021D4434_H diff --git a/include/overlay021/struct_ov21_021D4558.h b/include/overlay021/struct_ov21_021D4558.h index 45ea993171..363018080e 100644 --- a/include/overlay021/struct_ov21_021D4558.h +++ b/include/overlay021/struct_ov21_021D4558.h @@ -6,12 +6,12 @@ #include "overlay021/struct_ov21_021E68F4.h" typedef struct { - UnkStruct_ov21_021D3FE0 * unk_00; - UnkStruct_ov21_021D3FE0 * unk_04; - UnkStruct_ov21_021D423C * unk_08; - UnkStruct_ov21_021D423C * unk_0C; - UnkStruct_ov21_021E68F4 * unk_10; - UnkStruct_ov21_021E68F4 * unk_14; + UnkStruct_ov21_021D3FE0 *unk_00; + UnkStruct_ov21_021D3FE0 *unk_04; + UnkStruct_ov21_021D423C *unk_08; + UnkStruct_ov21_021D423C *unk_0C; + UnkStruct_ov21_021E68F4 *unk_10; + UnkStruct_ov21_021E68F4 *unk_14; } UnkStruct_ov21_021D4558; #endif // POKEPLATINUM_STRUCT_OV21_021D4558_H diff --git a/include/overlay021/struct_ov21_021D4660.h b/include/overlay021/struct_ov21_021D4660.h index 8711444ff0..d1215af9e0 100644 --- a/include/overlay021/struct_ov21_021D4660.h +++ b/include/overlay021/struct_ov21_021D4660.h @@ -5,7 +5,11 @@ typedef struct { int unk_00; - BOOL (* unk_04)(UnkStruct_ov21_021D4340_1 * param0); + + // clang-format off + BOOL(*unk_04)(UnkStruct_ov21_021D4340_1 *param0); + // clang-format on + UnkStruct_ov21_021D4340_1 unk_08; } UnkStruct_ov21_021D4660; diff --git a/include/overlay021/struct_ov21_021D4CA0.h b/include/overlay021/struct_ov21_021D4CA0.h index 311e269d5e..0e0a359aee 100644 --- a/include/overlay021/struct_ov21_021D4CA0.h +++ b/include/overlay021/struct_ov21_021D4CA0.h @@ -5,7 +5,7 @@ #include "struct_defs/sprite_manager_allocation.h" typedef struct { - FontOAM * unk_00; + FontOAM *unk_00; SpriteManagerAllocation unk_04; } UnkStruct_ov21_021D4CA0; diff --git a/include/overlay021/struct_ov21_021D4CB8.h b/include/overlay021/struct_ov21_021D4CB8.h index 7e28f70125..1dfd4adf4d 100644 --- a/include/overlay021/struct_ov21_021D4CB8.h +++ b/include/overlay021/struct_ov21_021D4CB8.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_OV21_021D4CB8_H #define POKEPLATINUM_STRUCT_OV21_021D4CB8_H +#include + #include "struct_decls/struct_02022550_decl.h" #include "struct_defs/struct_0205AA50.h" -#include "overlay021/struct_ov21_021D4C0C_decl.h" -#include +#include "overlay021/struct_ov21_021D4C0C_decl.h" typedef struct { - UnkStruct_ov21_021D4C0C * unk_00; - const Window * unk_04; - const NNSG2dImagePaletteProxy * unk_08; - const GraphicElementData * unk_0C; + UnkStruct_ov21_021D4C0C *unk_00; + const Window *unk_04; + const NNSG2dImagePaletteProxy *unk_08; + const GraphicElementData *unk_0C; int unk_10; int unk_14; int unk_18; diff --git a/include/overlay021/struct_ov21_021D5844.h b/include/overlay021/struct_ov21_021D5844.h index ab9aa67c06..144c5ec7b1 100644 --- a/include/overlay021/struct_ov21_021D5844.h +++ b/include/overlay021/struct_ov21_021D5844.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_OV21_021D5844_H typedef struct { - int * unk_00; + int *unk_00; int unk_04; } UnkStruct_ov21_021D5844; diff --git a/include/overlay021/struct_ov21_021D5B68.h b/include/overlay021/struct_ov21_021D5B68.h index 6866d46960..92af2efde0 100644 --- a/include/overlay021/struct_ov21_021D5B68.h +++ b/include/overlay021/struct_ov21_021D5B68.h @@ -4,8 +4,8 @@ #include "overlay021/struct_ov21_021D3320.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; int unk_08; int unk_0C; int unk_10; diff --git a/include/overlay021/struct_ov21_021DE6D4.h b/include/overlay021/struct_ov21_021DE6D4.h index 5f84e41184..dcee75bba1 100644 --- a/include/overlay021/struct_ov21_021DE6D4.h +++ b/include/overlay021/struct_ov21_021DE6D4.h @@ -5,11 +5,11 @@ #include "overlay021/struct_ov21_021E68F4.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; int unk_08; int unk_0C; - const UnkStruct_ov21_021E68F4 * unk_10; + const UnkStruct_ov21_021E68F4 *unk_10; int unk_14; int unk_18; BOOL unk_1C; diff --git a/include/overlay021/struct_ov21_021E68F4.h b/include/overlay021/struct_ov21_021E68F4.h index 0af0046ac8..adc68d043a 100644 --- a/include/overlay021/struct_ov21_021E68F4.h +++ b/include/overlay021/struct_ov21_021E68F4.h @@ -6,11 +6,11 @@ #include "overlay021/struct_ov21_021D4660.h" typedef struct { - void * unk_00; - void * unk_04; + void *unk_00; + void *unk_04; UnkFuncPtr_ov21_021D41EC unk_08[3]; UnkFuncPtr_ov21_021D420C unk_14[3]; - UnkStruct_ov21_021D4660 * unk_20; + UnkStruct_ov21_021D4660 *unk_20; int unk_24; } UnkStruct_ov21_021E68F4; diff --git a/include/overlay021/struct_ov21_021E6A68.h b/include/overlay021/struct_ov21_021E6A68.h index a0592eb113..fcceb7fc3d 100644 --- a/include/overlay021/struct_ov21_021E6A68.h +++ b/include/overlay021/struct_ov21_021E6A68.h @@ -4,7 +4,7 @@ typedef struct { int unk_00; int unk_04; - void * unk_08; + void *unk_08; BOOL unk_0C; BOOL unk_10; } UnkStruct_ov21_021E6A68; diff --git a/include/overlay021/struct_ov21_021E6B20.h b/include/overlay021/struct_ov21_021E6B20.h index 7f6c56aba4..c9044d180e 100644 --- a/include/overlay021/struct_ov21_021E6B20.h +++ b/include/overlay021/struct_ov21_021E6B20.h @@ -4,7 +4,7 @@ typedef struct { int unk_00; int unk_04; - void * unk_08; + void *unk_08; } UnkStruct_ov21_021E6B20; #endif // POKEPLATINUM_STRUCT_OV21_021E6B20_H diff --git a/include/overlay021/struct_ov21_021E7F40.h b/include/overlay021/struct_ov21_021E7F40.h index 1a07408fef..0d35c0bef5 100644 --- a/include/overlay021/struct_ov21_021E7F40.h +++ b/include/overlay021/struct_ov21_021E7F40.h @@ -6,9 +6,9 @@ #include "struct_decls/struct_020151A4_decl.h" typedef struct { - UnkStruct_02015064 * unk_00; - UnkStruct_02015128 * unk_04; - UnkStruct_020151A4 * unk_08; + UnkStruct_02015064 *unk_00; + UnkStruct_02015128 *unk_04; + UnkStruct_020151A4 *unk_08; s16 unk_0C; s16 unk_0E; u16 unk_10; diff --git a/include/overlay021/struct_ov21_021E8E0C.h b/include/overlay021/struct_ov21_021E8E0C.h index 548d011cd8..77b334ff49 100644 --- a/include/overlay021/struct_ov21_021E8E0C.h +++ b/include/overlay021/struct_ov21_021E8E0C.h @@ -4,14 +4,15 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02018340_decl.h" + #include "pokemon.h" typedef struct { - BGL * unk_00; - PaletteData * unk_04; - UnkStruct_02007768 * unk_08; + BGL *unk_00; + PaletteData *unk_04; + UnkStruct_02007768 *unk_08; int unk_0C; - Pokemon * unk_10; + Pokemon *unk_10; int unk_14; } UnkStruct_ov21_021E8E0C; diff --git a/include/overlay022/funcptr_ov22_02259D78.h b/include/overlay022/funcptr_ov22_02259D78.h index e2d83b536a..ca6902dced 100644 --- a/include/overlay022/funcptr_ov22_02259D78.h +++ b/include/overlay022/funcptr_ov22_02259D78.h @@ -3,6 +3,6 @@ #include "overlay022/struct_ov22_02259C58.h" -typedef void (* UnkFuncPtr_ov22_02259D78)(UnkStruct_ov22_02259C58 * param0, void * param1); +typedef void (*UnkFuncPtr_ov22_02259D78)(UnkStruct_ov22_02259C58 *param0, void *param1); #endif // POKEPLATINUM_FUNCPTR_OV22_02259D78_H diff --git a/include/overlay022/ov22_02254DE0.h b/include/overlay022/ov22_02254DE0.h index 497aae3f98..b29c27fae3 100644 --- a/include/overlay022/ov22_02254DE0.h +++ b/include/overlay022/ov22_02254DE0.h @@ -1,24 +1,24 @@ #ifndef POKEPLATINUM_OV22_02254DE0_H #define POKEPLATINUM_OV22_02254DE0_H +#include + #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_0225500C.h" #include "overlay022/struct_ov22_02255040.h" -#include - -UnkStruct_ov22_02254DE0 * ov22_02254DE0(int param0, int param1); -void ov22_02254E0C(UnkStruct_ov22_02254DE0 * param0); -UnkStruct_ov22_02255040 * ov22_02254E20(UnkStruct_ov22_0225500C * param0); -BOOL ov22_02254E44(UnkStruct_ov22_02255040 * param0); -BOOL ov22_02254E54(UnkStruct_ov22_02255040 * param0, int * param1, int * param2, NNSG2dCharacterData * param3); -BOOL ov22_02254EDC(UnkStruct_ov22_02255040 * param0, int param1, int param2); -void ov22_02254EF4(UnkStruct_ov22_02255040 * param0, s16 param1, s16 param2); -void ov22_02254F00(UnkStruct_ov22_02255040 * param0, int * param1, int * param2); -void ov22_02254F30(UnkStruct_ov22_02255040 * param0, int * param1, int * param2); -void ov22_02254F60(UnkStruct_ov22_02255040 * param0, BOOL param1); -void ov22_02254F6C(UnkStruct_ov22_02255040 * param0, int param1); -int ov22_02254F78(UnkStruct_ov22_02255040 * param0); -void ov22_02254F84(UnkStruct_ov22_02255040 * param0, int * param1, int * param2); +UnkStruct_ov22_02254DE0 *ov22_02254DE0(int param0, int param1); +void ov22_02254E0C(UnkStruct_ov22_02254DE0 *param0); +UnkStruct_ov22_02255040 *ov22_02254E20(UnkStruct_ov22_0225500C *param0); +BOOL ov22_02254E44(UnkStruct_ov22_02255040 *param0); +BOOL ov22_02254E54(UnkStruct_ov22_02255040 *param0, int *param1, int *param2, NNSG2dCharacterData *param3); +BOOL ov22_02254EDC(UnkStruct_ov22_02255040 *param0, int param1, int param2); +void ov22_02254EF4(UnkStruct_ov22_02255040 *param0, s16 param1, s16 param2); +void ov22_02254F00(UnkStruct_ov22_02255040 *param0, int *param1, int *param2); +void ov22_02254F30(UnkStruct_ov22_02255040 *param0, int *param1, int *param2); +void ov22_02254F60(UnkStruct_ov22_02255040 *param0, BOOL param1); +void ov22_02254F6C(UnkStruct_ov22_02255040 *param0, int param1); +int ov22_02254F78(UnkStruct_ov22_02255040 *param0); +void ov22_02254F84(UnkStruct_ov22_02255040 *param0, int *param1, int *param2); #endif // POKEPLATINUM_OV22_02254DE0_H diff --git a/include/overlay022/ov22_02255094.h b/include/overlay022/ov22_02255094.h index 479bffd416..5a4006e6e0 100644 --- a/include/overlay022/ov22_02255094.h +++ b/include/overlay022/ov22_02255094.h @@ -1,49 +1,50 @@ #ifndef POKEPLATINUM_OV22_02255094_H #define POKEPLATINUM_OV22_02255094_H +#include +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" + #include "overlay022/struct_ov22_022550D4.h" #include "overlay022/struct_ov22_02255CB8.h" #include "overlay022/struct_ov22_0225A0E4.h" -#include -#include - void ov22_02255094(void); void ov22_022550B4(void); -void ov22_022550D4(UnkStruct_ov22_0225A0E4 * param0); -void ov22_02255134(UnkStruct_ov22_0225A0E4 * param0); -void ov22_02255180(UnkStruct_ov22_0225A0E4 * param0); -void ov22_022551B4(UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1); -void ov22_022551D0(UnkStruct_ov22_0225A0E4 * param0); -GraphicElementData * ov22_022551E4(UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5); -void ov22_02255248(UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5); -void ov22_02255268(UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6); -void ov22_0225528C(UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4); -void ov22_022552A8(UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4); -void ov22_022552C4(UnkStruct_ov22_0225A0E4 * param0, int param1); -void ov22_022552D8(UnkStruct_ov22_0225A0E4 * param0, int param1); -void ov22_022552EC(UnkStruct_ov22_0225A0E4 * param0, int param1); -void ov22_02255300(UnkStruct_ov22_0225A0E4 * param0, int param1); -void ov22_02255314(UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1); -void ov22_02255338(UnkStruct_ov22_02255CB8 * param0); -NNSG2dCharacterData * ov22_02255340(UnkStruct_ov22_0225A0E4 * param0, void * param1, int param2); +void ov22_022550D4(UnkStruct_ov22_0225A0E4 *param0); +void ov22_02255134(UnkStruct_ov22_0225A0E4 *param0); +void ov22_02255180(UnkStruct_ov22_0225A0E4 *param0); +void ov22_022551B4(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1); +void ov22_022551D0(UnkStruct_ov22_0225A0E4 *param0); +GraphicElementData *ov22_022551E4(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, int param3, int param4, int param5); +void ov22_02255248(UnkStruct_ov22_0225A0E4 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5); +void ov22_02255268(UnkStruct_ov22_0225A0E4 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6); +void ov22_0225528C(UnkStruct_ov22_0225A0E4 *param0, NARC *param1, int param2, BOOL param3, int param4); +void ov22_022552A8(UnkStruct_ov22_0225A0E4 *param0, NARC *param1, int param2, BOOL param3, int param4); +void ov22_022552C4(UnkStruct_ov22_0225A0E4 *param0, int param1); +void ov22_022552D8(UnkStruct_ov22_0225A0E4 *param0, int param1); +void ov22_022552EC(UnkStruct_ov22_0225A0E4 *param0, int param1); +void ov22_02255300(UnkStruct_ov22_0225A0E4 *param0, int param1); +void ov22_02255314(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1); +void ov22_02255338(UnkStruct_ov22_02255CB8 *param0); +NNSG2dCharacterData *ov22_02255340(UnkStruct_ov22_0225A0E4 *param0, void *param1, int param2); void ov22_02255360(void); void ov22_02255390(void); -void ov22_022553F8(UnkStruct_ov22_0225A0E4 * param0); -void ov22_02255410(UnkStruct_ov22_02255CB8 * param0, int param1); -int ov22_02255420(NNSG2dCharacterData * param0, int param1, int param2, int param3); -void ov22_0225547C(UnkStruct_ov22_0225A0E4 * param0, const UnkStruct_ov22_022550D4 * param1, int param2); -void ov22_022554A8(UnkStruct_ov22_0225A0E4 * param0, BGL * param1, int param2); -void ov22_022554F8(UnkStruct_ov22_0225A0E4 * param0); -void ov22_02255524(UnkStruct_ov22_0225A0E4 * param0); -void ov22_02255530(UnkStruct_ov22_0225A0E4 * param0); -void ov22_0225553C(UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, u16 param3, const VecFx32 * param4); -void ov22_022555D4(UnkStruct_ov22_0225A0E4 * param0, int param1); -void ov22_022555FC(UnkStruct_ov22_0225A0E4 * param0); -void ov22_0225561C(UnkStruct_ov22_0225A0E4 * param0); -void ov22_0225562C(UnkStruct_ov22_0225A0E4 * param0); +void ov22_022553F8(UnkStruct_ov22_0225A0E4 *param0); +void ov22_02255410(UnkStruct_ov22_02255CB8 *param0, int param1); +int ov22_02255420(NNSG2dCharacterData *param0, int param1, int param2, int param3); +void ov22_0225547C(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1, int param2); +void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BGL *param1, int param2); +void ov22_022554F8(UnkStruct_ov22_0225A0E4 *param0); +void ov22_02255524(UnkStruct_ov22_0225A0E4 *param0); +void ov22_02255530(UnkStruct_ov22_0225A0E4 *param0); +void ov22_0225553C(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, u16 param3, const VecFx32 *param4); +void ov22_022555D4(UnkStruct_ov22_0225A0E4 *param0, int param1); +void ov22_022555FC(UnkStruct_ov22_0225A0E4 *param0); +void ov22_0225561C(UnkStruct_ov22_0225A0E4 *param0); +void ov22_0225562C(UnkStruct_ov22_0225A0E4 *param0); #endif // POKEPLATINUM_OV22_02255094_H diff --git a/include/overlay022/ov22_02255D44.h b/include/overlay022/ov22_02255D44.h index 0996f12e0f..421299dc57 100644 --- a/include/overlay022/ov22_02255D44.h +++ b/include/overlay022/ov22_02255D44.h @@ -3,12 +3,12 @@ #include "overlay_manager.h" -int ov22_02255D44(OverlayManager * param0, int * param1); -int ov22_02255E50(OverlayManager * param0, int * param1); -int ov22_02256098(OverlayManager * param0, int * param1); -int ov22_02256174(OverlayManager * param0, int * param1); -int ov22_022562EC(OverlayManager * param0, int * param1); -int ov22_02256600(OverlayManager * param0, int * param1); -void ov22_022577EC(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, int * param5, int * param6); +int ov22_02255D44(OverlayManager *param0, int *param1); +int ov22_02255E50(OverlayManager *param0, int *param1); +int ov22_02256098(OverlayManager *param0, int *param1); +int ov22_02256174(OverlayManager *param0, int *param1); +int ov22_022562EC(OverlayManager *param0, int *param1); +int ov22_02256600(OverlayManager *param0, int *param1); +void ov22_022577EC(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, int *param5, int *param6); #endif // POKEPLATINUM_OV22_02255D44_H diff --git a/include/overlay022/ov22_022578F4.h b/include/overlay022/ov22_022578F4.h index ad9a4a314e..20692c988d 100644 --- a/include/overlay022/ov22_022578F4.h +++ b/include/overlay022/ov22_022578F4.h @@ -1,41 +1,43 @@ #ifndef POKEPLATINUM_OV22_022578F4_H #define POKEPLATINUM_OV22_022578F4_H +#include +#include + #include "struct_defs/archived_sprite.h" -#include "pokemon.h" + #include "overlay022/struct_ov22_02257964.h" #include "overlay022/struct_ov22_02259560.h" #include "overlay022/struct_ov22_0225B388.h" -#include -#include +#include "pokemon.h" -void ov22_022578F4(UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_0225B388 * param1); -void ov22_02257948(UnkStruct_ov22_02257964 * param0); -void ov22_02257964(UnkStruct_ov22_02257964 * param0, Pokemon * param1, ArchivedSprite * param2, int param3, int param4, int param5, int param6); -void ov22_02257998(UnkStruct_ov22_02257964 * param0, Pokemon * param1, ArchivedSprite * param2, int param3); -void ov22_022579B4(UnkStruct_ov22_02257964 * param0, Pokemon * param1, ArchivedSprite * param2, int param3); -void ov22_022579D8(UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * param1); -void ov22_022579E8(UnkStruct_ov22_02259560 * param0); -void ov22_022579F0(UnkStruct_ov22_02257964 * param0); -BOOL ov22_022579FC(UnkStruct_ov22_02257964 * param0, int param1, int param2, int param3, int param4); -BOOL ov22_02257A5C(UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * param1, NNSG2dCharacterData ** param2); -void ov22_02257A80(UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * param1); -void ov22_02257A98(UnkStruct_ov22_02257964 * param0); -void ov22_02257AB0(UnkStruct_ov22_02257964 * param0, int param1, int param2); -void ov22_02257ACC(UnkStruct_ov22_02257964 * param0, int param1, int param2); -void ov22_02257AD8(UnkStruct_ov22_02257964 * param0, int param1, int param2, int param3, int param4); -void ov22_02257B10(UnkStruct_ov22_02257964 * param0); -void ov22_02257B1C(UnkStruct_ov22_02257964 * param0, int param1); -void ov22_02257B74(UnkStruct_ov22_02257964 * param0, int param1); -BOOL ov22_02257BE8(UnkStruct_ov22_02257964 * param0); -BOOL ov22_02257C04(UnkStruct_ov22_02257964 * param0, int param1, int param2); -UnkStruct_ov22_02259560 * ov22_02257C20(UnkStruct_ov22_02257964 * param0, int * param1, int * param2, NNSG2dCharacterData ** param3); -void ov22_02257C88(UnkStruct_ov22_02257964 * param0, int param1, int param2); -void ov22_02257CD4(UnkStruct_ov22_02257964 * param0); -void ov22_02257CE0(UnkStruct_ov22_02257964 * param0, int * param1, int * param2); -int ov22_02257D00(UnkStruct_ov22_02257964 * param0); -void ov22_02257D04(UnkStruct_ov22_02257964 * param0, int * param1, int * param2); -void ov22_02257D70(UnkStruct_ov22_02257964 * param0, GXRgb param1); +void ov22_022578F4(UnkStruct_ov22_02257964 *param0, UnkStruct_ov22_0225B388 *param1); +void ov22_02257948(UnkStruct_ov22_02257964 *param0); +void ov22_02257964(UnkStruct_ov22_02257964 *param0, Pokemon *param1, ArchivedSprite *param2, int param3, int param4, int param5, int param6); +void ov22_02257998(UnkStruct_ov22_02257964 *param0, Pokemon *param1, ArchivedSprite *param2, int param3); +void ov22_022579B4(UnkStruct_ov22_02257964 *param0, Pokemon *param1, ArchivedSprite *param2, int param3); +void ov22_022579D8(UnkStruct_ov22_02257964 *param0, UnkStruct_ov22_02259560 *param1); +void ov22_022579E8(UnkStruct_ov22_02259560 *param0); +void ov22_022579F0(UnkStruct_ov22_02257964 *param0); +BOOL ov22_022579FC(UnkStruct_ov22_02257964 *param0, int param1, int param2, int param3, int param4); +BOOL ov22_02257A5C(UnkStruct_ov22_02257964 *param0, UnkStruct_ov22_02259560 *param1, NNSG2dCharacterData **param2); +void ov22_02257A80(UnkStruct_ov22_02257964 *param0, UnkStruct_ov22_02259560 *param1); +void ov22_02257A98(UnkStruct_ov22_02257964 *param0); +void ov22_02257AB0(UnkStruct_ov22_02257964 *param0, int param1, int param2); +void ov22_02257ACC(UnkStruct_ov22_02257964 *param0, int param1, int param2); +void ov22_02257AD8(UnkStruct_ov22_02257964 *param0, int param1, int param2, int param3, int param4); +void ov22_02257B10(UnkStruct_ov22_02257964 *param0); +void ov22_02257B1C(UnkStruct_ov22_02257964 *param0, int param1); +void ov22_02257B74(UnkStruct_ov22_02257964 *param0, int param1); +BOOL ov22_02257BE8(UnkStruct_ov22_02257964 *param0); +BOOL ov22_02257C04(UnkStruct_ov22_02257964 *param0, int param1, int param2); +UnkStruct_ov22_02259560 *ov22_02257C20(UnkStruct_ov22_02257964 *param0, int *param1, int *param2, NNSG2dCharacterData **param3); +void ov22_02257C88(UnkStruct_ov22_02257964 *param0, int param1, int param2); +void ov22_02257CD4(UnkStruct_ov22_02257964 *param0); +void ov22_02257CE0(UnkStruct_ov22_02257964 *param0, int *param1, int *param2); +int ov22_02257D00(UnkStruct_ov22_02257964 *param0); +void ov22_02257D04(UnkStruct_ov22_02257964 *param0, int *param1, int *param2); +void ov22_02257D70(UnkStruct_ov22_02257964 *param0, GXRgb param1); #endif // POKEPLATINUM_OV22_022578F4_H diff --git a/include/overlay022/ov22_02257F50.h b/include/overlay022/ov22_02257F50.h index 71c0067f9e..c6f360dab3 100644 --- a/include/overlay022/ov22_02257F50.h +++ b/include/overlay022/ov22_02257F50.h @@ -1,34 +1,34 @@ #ifndef POKEPLATINUM_OV22_02257F50_H #define POKEPLATINUM_OV22_02257F50_H +#include + #include "overlay022/struct_ov22_02257F50.h" #include "overlay022/struct_ov22_02258470.h" #include "overlay022/struct_ov22_0225899C.h" #include "overlay022/struct_ov22_02259560.h" -#include - -void ov22_02257F50(UnkStruct_ov22_02257F50 * param0, UnkStruct_ov22_02258470 * param1); -void ov22_02257F88(UnkStruct_ov22_02257F50 * param0); -int ov22_02257FB0(int param0, int param1, UnkStruct_ov22_0225899C * param2); -void ov22_0225804C(int param0, int param1, int * param2, int * param3, int param4, int param5, UnkStruct_ov22_0225899C * param6); -void ov22_022580A4(UnkStruct_ov22_02257F50 * param0, int param1, int param2); -void ov22_0225818C(UnkStruct_ov22_02257F50 * param0, int param1, int param2, UnkStruct_ov22_02259560 * param3); -void ov22_022581B8(UnkStruct_ov22_02259560 * param0); -void ov22_022581C0(UnkStruct_ov22_02257F50 * param0); -void ov22_022581EC(UnkStruct_ov22_02257F50 * param0); -BOOL ov22_02258218(UnkStruct_ov22_02257F50 * param0, int param1, int param2); -BOOL ov22_02258258(UnkStruct_ov22_02257F50 * param0, int param1, int param2); -void ov22_022582C0(UnkStruct_ov22_02257F50 * param0, int param1, int param2); -BOOL ov22_022582E8(UnkStruct_ov22_02257F50 * param0); -BOOL ov22_02258304(UnkStruct_ov22_02257F50 * param0, int param1, int param2); -UnkStruct_ov22_02259560 * ov22_02258320(UnkStruct_ov22_02257F50 * param0, int * param1, int * param2, NNSG2dCharacterData ** param3); -void ov22_02258354(UnkStruct_ov22_02257F50 * param0, int param1); -void ov22_022583A0(UnkStruct_ov22_02257F50 * param0, int param1, int param2, int param3, BOOL * param4); -void ov22_02258408(UnkStruct_ov22_02257F50 * param0); -int ov22_02258414(UnkStruct_ov22_02257F50 * param0); -int ov22_02258424(UnkStruct_ov22_02257F50 * param0, int param1); -void ov22_0225844C(UnkStruct_ov22_02257F50 * param0, int param1, int param2, int param3, int param4); -BOOL ov22_02258460(UnkStruct_ov22_02257F50 * param0); +void ov22_02257F50(UnkStruct_ov22_02257F50 *param0, UnkStruct_ov22_02258470 *param1); +void ov22_02257F88(UnkStruct_ov22_02257F50 *param0); +int ov22_02257FB0(int param0, int param1, UnkStruct_ov22_0225899C *param2); +void ov22_0225804C(int param0, int param1, int *param2, int *param3, int param4, int param5, UnkStruct_ov22_0225899C *param6); +void ov22_022580A4(UnkStruct_ov22_02257F50 *param0, int param1, int param2); +void ov22_0225818C(UnkStruct_ov22_02257F50 *param0, int param1, int param2, UnkStruct_ov22_02259560 *param3); +void ov22_022581B8(UnkStruct_ov22_02259560 *param0); +void ov22_022581C0(UnkStruct_ov22_02257F50 *param0); +void ov22_022581EC(UnkStruct_ov22_02257F50 *param0); +BOOL ov22_02258218(UnkStruct_ov22_02257F50 *param0, int param1, int param2); +BOOL ov22_02258258(UnkStruct_ov22_02257F50 *param0, int param1, int param2); +void ov22_022582C0(UnkStruct_ov22_02257F50 *param0, int param1, int param2); +BOOL ov22_022582E8(UnkStruct_ov22_02257F50 *param0); +BOOL ov22_02258304(UnkStruct_ov22_02257F50 *param0, int param1, int param2); +UnkStruct_ov22_02259560 *ov22_02258320(UnkStruct_ov22_02257F50 *param0, int *param1, int *param2, NNSG2dCharacterData **param3); +void ov22_02258354(UnkStruct_ov22_02257F50 *param0, int param1); +void ov22_022583A0(UnkStruct_ov22_02257F50 *param0, int param1, int param2, int param3, BOOL *param4); +void ov22_02258408(UnkStruct_ov22_02257F50 *param0); +int ov22_02258414(UnkStruct_ov22_02257F50 *param0); +int ov22_02258424(UnkStruct_ov22_02257F50 *param0, int param1); +void ov22_0225844C(UnkStruct_ov22_02257F50 *param0, int param1, int param2, int param3, int param4); +BOOL ov22_02258460(UnkStruct_ov22_02257F50 *param0); #endif // POKEPLATINUM_OV22_02257F50_H diff --git a/include/overlay022/ov22_022588F0.h b/include/overlay022/ov22_022588F0.h index 3e092ee58a..75758fcc17 100644 --- a/include/overlay022/ov22_022588F0.h +++ b/include/overlay022/ov22_022588F0.h @@ -3,7 +3,7 @@ #include "overlay022/struct_ov22_02258A48.h" -void ov22_022588F0(UnkStruct_ov22_02258A48 * param0); -void ov22_0225890C(UnkStruct_ov22_02258A48 * param0); +void ov22_022588F0(UnkStruct_ov22_02258A48 *param0); +void ov22_0225890C(UnkStruct_ov22_02258A48 *param0); #endif // POKEPLATINUM_OV22_022588F0_H diff --git a/include/overlay022/ov22_0225894C.h b/include/overlay022/ov22_0225894C.h index c4a0d9e131..0be4f1e33c 100644 --- a/include/overlay022/ov22_0225894C.h +++ b/include/overlay022/ov22_0225894C.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV22_0225894C_H #include "struct_decls/struct_02029D04_decl.h" + #include "overlay022/struct_ov22_0225899C.h" -void ov22_0225894C(const UnkStruct_02029D04 * param0, UnkStruct_ov22_0225899C * param1); -u32 ov22_0225899C(const UnkStruct_ov22_0225899C * param0, u32 param1); -u32 ov22_022589B0(const UnkStruct_ov22_0225899C * param0, u32 param1); -u32 ov22_022589BC(const UnkStruct_ov22_0225899C * param0, u32 param1); +void ov22_0225894C(const UnkStruct_02029D04 *param0, UnkStruct_ov22_0225899C *param1); +u32 ov22_0225899C(const UnkStruct_ov22_0225899C *param0, u32 param1); +u32 ov22_022589B0(const UnkStruct_ov22_0225899C *param0, u32 param1); +u32 ov22_022589BC(const UnkStruct_ov22_0225899C *param0, u32 param1); #endif // POKEPLATINUM_OV22_0225894C_H diff --git a/include/overlay022/ov22_022589E0.h b/include/overlay022/ov22_022589E0.h index b5f1c5cf6f..fb275d7b78 100644 --- a/include/overlay022/ov22_022589E0.h +++ b/include/overlay022/ov22_022589E0.h @@ -7,7 +7,7 @@ #include "overlay022/struct_ov22_0225A0E4.h" #include "overlay022/struct_ov22_0225A428.h" -void ov22_022589E0(UnkStruct_ov22_02258A48 * param0, UnkStruct_ov22_02257964 * param1, UnkStruct_ov22_02257F50 * param2, UnkStruct_ov22_0225A0E4 * param3, UnkStruct_ov22_0225A428 * param4, BOOL param5); -void ov22_02258A34(UnkStruct_ov22_02258A48 * param0); +void ov22_022589E0(UnkStruct_ov22_02258A48 *param0, UnkStruct_ov22_02257964 *param1, UnkStruct_ov22_02257F50 *param2, UnkStruct_ov22_0225A0E4 *param3, UnkStruct_ov22_0225A428 *param4, BOOL param5); +void ov22_02258A34(UnkStruct_ov22_02258A48 *param0); #endif // POKEPLATINUM_OV22_022589E0_H diff --git a/include/overlay022/ov22_02259098.h b/include/overlay022/ov22_02259098.h index b53ec4356d..0a922b2b62 100644 --- a/include/overlay022/ov22_02259098.h +++ b/include/overlay022/ov22_02259098.h @@ -1,28 +1,30 @@ #ifndef POKEPLATINUM_OV22_02259098_H #define POKEPLATINUM_OV22_02259098_H +#include + #include "struct_decls/struct_02007768_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_020298D8.h" -#include "pokemon.h" + #include "overlay022/struct_ov22_022596B0.h" #include "overlay022/struct_ov22_0225A0E4.h" -#include +#include "pokemon.h" -void ov22_02259098(UnkStruct_ov22_0225A0E4 * param0, ArchivedSprite * param1); -void ov22_022590C0(UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Pokemon * param2, ArchivedSprite * param3, int param4); -void ov22_022590D4(UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Pokemon * param2, ArchivedSprite * param3, int param4, BOOL param5); -void ov22_022591B8(UnkStruct_020298D8 * param0); -void ov22_022591D0(UnkStruct_020298D8 * param0, int param1); -int ov22_022591E0(UnkStruct_020298D8 * param0); -void ov22_022591EC(UnkStruct_020298D8 * param0, int param1, int param2); -BOOL ov22_02259238(UnkStruct_020298D8 * param0); -BOOL ov22_02259244(UnkStruct_020298D8 * param0, int param1, int param2); -void ov22_02259250(UnkStruct_020298D8 * param0, int * param1, int * param2); -void ov22_02259270(UnkStruct_020298D8 * param0, int * param1, int * param2); -BOOL ov22_02259278(UnkStruct_020298D8 * param0, int * param1, int * param2, NNSG2dCharacterData * param3); -BOOL ov22_022592F0(UnkStruct_020298D8 * param0, int param1, int param2, NNSG2dCharacterData * param3); -void ov22_02259358(UnkStruct_020298D8 * param0, UnkStruct_ov22_022596B0 * param1); +void ov22_02259098(UnkStruct_ov22_0225A0E4 *param0, ArchivedSprite *param1); +void ov22_022590C0(UnkStruct_020298D8 *param0, UnkStruct_02007768 *param1, Pokemon *param2, ArchivedSprite *param3, int param4); +void ov22_022590D4(UnkStruct_020298D8 *param0, UnkStruct_02007768 *param1, Pokemon *param2, ArchivedSprite *param3, int param4, BOOL param5); +void ov22_022591B8(UnkStruct_020298D8 *param0); +void ov22_022591D0(UnkStruct_020298D8 *param0, int param1); +int ov22_022591E0(UnkStruct_020298D8 *param0); +void ov22_022591EC(UnkStruct_020298D8 *param0, int param1, int param2); +BOOL ov22_02259238(UnkStruct_020298D8 *param0); +BOOL ov22_02259244(UnkStruct_020298D8 *param0, int param1, int param2); +void ov22_02259250(UnkStruct_020298D8 *param0, int *param1, int *param2); +void ov22_02259270(UnkStruct_020298D8 *param0, int *param1, int *param2); +BOOL ov22_02259278(UnkStruct_020298D8 *param0, int *param1, int *param2, NNSG2dCharacterData *param3); +BOOL ov22_022592F0(UnkStruct_020298D8 *param0, int param1, int param2, NNSG2dCharacterData *param3); +void ov22_02259358(UnkStruct_020298D8 *param0, UnkStruct_ov22_022596B0 *param1); #endif // POKEPLATINUM_OV22_02259098_H diff --git a/include/overlay022/ov22_02259484.h b/include/overlay022/ov22_02259484.h index e5793bf5b1..ce629033a4 100644 --- a/include/overlay022/ov22_02259484.h +++ b/include/overlay022/ov22_02259484.h @@ -4,12 +4,12 @@ #include "overlay022/struct_ov22_02259484.h" #include "overlay022/struct_ov22_02259560.h" -void ov22_02259484(UnkStruct_ov22_02259484 * param0, int param1, int param2); -void ov22_022594AC(UnkStruct_ov22_02259484 * param0); -UnkStruct_ov22_02259560 * ov22_022594C0(UnkStruct_ov22_02259484 * param0, void * param1, int param2); -void ov22_02259510(UnkStruct_ov22_02259560 * param0); -void ov22_02259520(UnkStruct_ov22_02259560 * param0, UnkStruct_ov22_02259560 * param1); -void ov22_02259530(UnkStruct_ov22_02259560 * param0); -void ov22_02259540(UnkStruct_ov22_02259560 * param0); +void ov22_02259484(UnkStruct_ov22_02259484 *param0, int param1, int param2); +void ov22_022594AC(UnkStruct_ov22_02259484 *param0); +UnkStruct_ov22_02259560 *ov22_022594C0(UnkStruct_ov22_02259484 *param0, void *param1, int param2); +void ov22_02259510(UnkStruct_ov22_02259560 *param0); +void ov22_02259520(UnkStruct_ov22_02259560 *param0, UnkStruct_ov22_02259560 *param1); +void ov22_02259530(UnkStruct_ov22_02259560 *param0); +void ov22_02259540(UnkStruct_ov22_02259560 *param0); #endif // POKEPLATINUM_OV22_02259484_H diff --git a/include/overlay022/ov22_02259560.h b/include/overlay022/ov22_02259560.h index 45e52b45e4..02116bf002 100644 --- a/include/overlay022/ov22_02259560.h +++ b/include/overlay022/ov22_02259560.h @@ -1,19 +1,19 @@ #ifndef POKEPLATINUM_OV22_02259560_H #define POKEPLATINUM_OV22_02259560_H -#include "overlay022/struct_ov22_02259560.h" - #include -void ov22_02259560(UnkStruct_ov22_02259560 * param0, int param1); -BOOL ov22_02259578(UnkStruct_ov22_02259560 * param0, int param1, int param2); -BOOL ov22_022595AC(UnkStruct_ov22_02259560 * param0, int * param1, int * param2, NNSG2dCharacterData ** param3); -void ov22_022595F8(UnkStruct_ov22_02259560 * param0, int param1, int param2); -void ov22_02259648(UnkStruct_ov22_02259560 * param0, int * param1, int * param2); -void ov22_02259698(UnkStruct_ov22_02259560 * param0, int * param1, int * param2); -void ov22_022596B0(UnkStruct_ov22_02259560 * param0, int * param1, int * param2, int * param3, int * param4); -void ov22_022596EC(UnkStruct_ov22_02259560 * param0, int param1, int param2); -void ov22_02259724(UnkStruct_ov22_02259560 * param0, int * param1, int * param2, int * param3, int * param4); -void ov22_02259780(UnkStruct_ov22_02259560 * param0, int * param1, int * param2); +#include "overlay022/struct_ov22_02259560.h" + +void ov22_02259560(UnkStruct_ov22_02259560 *param0, int param1); +BOOL ov22_02259578(UnkStruct_ov22_02259560 *param0, int param1, int param2); +BOOL ov22_022595AC(UnkStruct_ov22_02259560 *param0, int *param1, int *param2, NNSG2dCharacterData **param3); +void ov22_022595F8(UnkStruct_ov22_02259560 *param0, int param1, int param2); +void ov22_02259648(UnkStruct_ov22_02259560 *param0, int *param1, int *param2); +void ov22_02259698(UnkStruct_ov22_02259560 *param0, int *param1, int *param2); +void ov22_022596B0(UnkStruct_ov22_02259560 *param0, int *param1, int *param2, int *param3, int *param4); +void ov22_022596EC(UnkStruct_ov22_02259560 *param0, int param1, int param2); +void ov22_02259724(UnkStruct_ov22_02259560 *param0, int *param1, int *param2, int *param3, int *param4); +void ov22_02259780(UnkStruct_ov22_02259560 *param0, int *param1, int *param2); #endif // POKEPLATINUM_OV22_02259560_H diff --git a/include/overlay022/ov22_022597BC.h b/include/overlay022/ov22_022597BC.h index a18a372b21..71b9b2dbde 100644 --- a/include/overlay022/ov22_022597BC.h +++ b/include/overlay022/ov22_022597BC.h @@ -6,11 +6,11 @@ #include "overlay022/struct_ov22_022599A0.h" #include "overlay022/struct_ov22_0225AF44.h" -void ov22_022597BC(UnkStruct_ov22_022597BC * param0, UnkStruct_ov22_022599A0 * param1); -void ov22_02259804(UnkStruct_ov22_022597BC * param0); -void ov22_02259820(UnkStruct_ov22_02259820 * param0, UnkStruct_ov22_0225AF44 * param1); -void ov22_02259838(UnkStruct_ov22_02259820 * param0, int param1); -void ov22_022598A0(UnkStruct_ov22_02259820 * param0); -void ov22_022598F4(UnkStruct_ov22_022597BC * param0, UnkStruct_ov22_022599A0 * param1, int param2, int param3, int param4, BOOL * param5); +void ov22_022597BC(UnkStruct_ov22_022597BC *param0, UnkStruct_ov22_022599A0 *param1); +void ov22_02259804(UnkStruct_ov22_022597BC *param0); +void ov22_02259820(UnkStruct_ov22_02259820 *param0, UnkStruct_ov22_0225AF44 *param1); +void ov22_02259838(UnkStruct_ov22_02259820 *param0, int param1); +void ov22_022598A0(UnkStruct_ov22_02259820 *param0); +void ov22_022598F4(UnkStruct_ov22_022597BC *param0, UnkStruct_ov22_022599A0 *param1, int param2, int param3, int param4, BOOL *param5); #endif // POKEPLATINUM_OV22_022597BC_H diff --git a/include/overlay022/ov22_02259C58.h b/include/overlay022/ov22_02259C58.h index 5bbd077a0a..2778aaa56a 100644 --- a/include/overlay022/ov22_02259C58.h +++ b/include/overlay022/ov22_02259C58.h @@ -1,6 +1,7 @@ #ifndef POKEPLATINUM_OV22_02259C58_H #define POKEPLATINUM_OV22_02259C58_H +#include "overlay022/funcptr_ov22_02259D78.h" #include "overlay022/struct_ov22_02259C58.h" #include "overlay022/struct_ov22_02259C58_1.h" #include "overlay022/struct_ov22_02259C9C.h" @@ -8,23 +9,21 @@ #include "overlay022/struct_ov22_0225A0E4.h" #include "overlay022/struct_ov22_0225A154.h" -#include "overlay022/funcptr_ov22_02259D78.h" - -void ov22_02259C58(UnkStruct_ov22_02259C58 * param0, UnkStruct_ov22_02259C58_1 * param1); -void ov22_02259C9C(UnkStruct_ov22_0225A154 * param0, UnkStruct_ov22_02259C9C * param1); -void ov22_02259CE8(UnkStruct_ov22_02259C58 * param0); -void ov22_02259D00(UnkStruct_ov22_0225A154 * param0); -void ov22_02259D1C(UnkStruct_ov22_02259C58 * param0, int param1); -void ov22_02259D2C(UnkStruct_ov22_02259D2C * param0, int param1, int param2); -void ov22_02259D78(UnkStruct_ov22_02259C58 * param0, UnkFuncPtr_ov22_02259D78 param1, void * param2, int param3); -void ov22_02259D98(UnkStruct_ov22_02259C58 * param0); -void ov22_02259DA4(UnkStruct_ov22_02259C58 * param0); -void ov22_02259DB0(UnkStruct_ov22_02259C58 * param0); -void ov22_02259DBC(UnkStruct_ov22_02259D2C * param0, UnkStruct_ov22_0225A0E4 * param1); -void ov22_02259F24(UnkStruct_ov22_02259D2C * param0, UnkStruct_ov22_0225A0E4 * param1); -void ov22_02259F88(UnkStruct_ov22_02259D2C * param0); -void ov22_02259FA0(UnkStruct_ov22_02259D2C * param0); -void ov22_02259FC4(UnkStruct_ov22_02259D2C * param0, int param1, int param2); -void ov22_02259FF4(UnkStruct_ov22_02259D2C * param0, int param1, UnkFuncPtr_ov22_02259D78 param2, void * param3, int param4); +void ov22_02259C58(UnkStruct_ov22_02259C58 *param0, UnkStruct_ov22_02259C58_1 *param1); +void ov22_02259C9C(UnkStruct_ov22_0225A154 *param0, UnkStruct_ov22_02259C9C *param1); +void ov22_02259CE8(UnkStruct_ov22_02259C58 *param0); +void ov22_02259D00(UnkStruct_ov22_0225A154 *param0); +void ov22_02259D1C(UnkStruct_ov22_02259C58 *param0, int param1); +void ov22_02259D2C(UnkStruct_ov22_02259D2C *param0, int param1, int param2); +void ov22_02259D78(UnkStruct_ov22_02259C58 *param0, UnkFuncPtr_ov22_02259D78 param1, void *param2, int param3); +void ov22_02259D98(UnkStruct_ov22_02259C58 *param0); +void ov22_02259DA4(UnkStruct_ov22_02259C58 *param0); +void ov22_02259DB0(UnkStruct_ov22_02259C58 *param0); +void ov22_02259DBC(UnkStruct_ov22_02259D2C *param0, UnkStruct_ov22_0225A0E4 *param1); +void ov22_02259F24(UnkStruct_ov22_02259D2C *param0, UnkStruct_ov22_0225A0E4 *param1); +void ov22_02259F88(UnkStruct_ov22_02259D2C *param0); +void ov22_02259FA0(UnkStruct_ov22_02259D2C *param0); +void ov22_02259FC4(UnkStruct_ov22_02259D2C *param0, int param1, int param2); +void ov22_02259FF4(UnkStruct_ov22_02259D2C *param0, int param1, UnkFuncPtr_ov22_02259D78 param2, void *param3, int param4); #endif // POKEPLATINUM_OV22_02259C58_H diff --git a/include/overlay022/ov22_0225A428.h b/include/overlay022/ov22_0225A428.h index b37a36dce2..bec3896cf5 100644 --- a/include/overlay022/ov22_0225A428.h +++ b/include/overlay022/ov22_0225A428.h @@ -4,15 +4,15 @@ #include "overlay022/struct_ov22_02256BAC.h" #include "overlay022/struct_ov22_0225A428.h" -void ov22_0225A428(UnkStruct_ov22_0225A428 * param0, UnkStruct_ov22_02256BAC * param1, int param2); -void ov22_0225A560(UnkStruct_ov22_0225A428 * param0); -void ov22_0225A610(UnkStruct_ov22_0225A428 * param0); -void ov22_0225A628(UnkStruct_ov22_0225A428 * param0, int param1, int param2, int param3); -s32 ov22_0225A660(UnkStruct_ov22_0225A428 * param0, int param1, int param2, int param3); -void ov22_0225A6A0(UnkStruct_ov22_0225A428 * param0); -void ov22_0225A6B8(UnkStruct_ov22_0225A428 * param0, int param1); -int ov22_0225A6C4(const UnkStruct_ov22_0225A428 * param0); -void ov22_0225A6CC(UnkStruct_ov22_0225A428 * param0, int param1); -BOOL ov22_0225A6D4(const UnkStruct_ov22_0225A428 * param0); +void ov22_0225A428(UnkStruct_ov22_0225A428 *param0, UnkStruct_ov22_02256BAC *param1, int param2); +void ov22_0225A560(UnkStruct_ov22_0225A428 *param0); +void ov22_0225A610(UnkStruct_ov22_0225A428 *param0); +void ov22_0225A628(UnkStruct_ov22_0225A428 *param0, int param1, int param2, int param3); +s32 ov22_0225A660(UnkStruct_ov22_0225A428 *param0, int param1, int param2, int param3); +void ov22_0225A6A0(UnkStruct_ov22_0225A428 *param0); +void ov22_0225A6B8(UnkStruct_ov22_0225A428 *param0, int param1); +int ov22_0225A6C4(const UnkStruct_ov22_0225A428 *param0); +void ov22_0225A6CC(UnkStruct_ov22_0225A428 *param0, int param1); +BOOL ov22_0225A6D4(const UnkStruct_ov22_0225A428 *param0); #endif // POKEPLATINUM_OV22_0225A428_H diff --git a/include/overlay022/ov22_0225AF44.h b/include/overlay022/ov22_0225AF44.h index 4daa43e852..1aa4ca35a2 100644 --- a/include/overlay022/ov22_0225AF44.h +++ b/include/overlay022/ov22_0225AF44.h @@ -4,8 +4,8 @@ #include "overlay022/struct_ov22_02257964.h" #include "overlay022/struct_ov22_0225AF68.h" -void ov22_0225AF44(UnkStruct_ov22_0225AF68 * param0, const UnkStruct_ov22_02257964 * param1, int param2); -void ov22_0225AF68(UnkStruct_ov22_0225AF68 * param0); -void ov22_0225AF74(UnkStruct_ov22_0225AF68 * param0); +void ov22_0225AF44(UnkStruct_ov22_0225AF68 *param0, const UnkStruct_ov22_02257964 *param1, int param2); +void ov22_0225AF68(UnkStruct_ov22_0225AF68 *param0); +void ov22_0225AF74(UnkStruct_ov22_0225AF68 *param0); #endif // POKEPLATINUM_OV22_0225AF44_H diff --git a/include/overlay022/ov22_0225AF8C.h b/include/overlay022/ov22_0225AF8C.h index a895cbc7dd..3cd4f44444 100644 --- a/include/overlay022/ov22_0225AF8C.h +++ b/include/overlay022/ov22_0225AF8C.h @@ -1,28 +1,29 @@ #ifndef POKEPLATINUM_OV22_0225AF8C_H #define POKEPLATINUM_OV22_0225AF8C_H +#include + #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029C88_decl.h" + #include "overlay022/struct_ov22_0225AF8C.h" #include "overlay022/struct_ov22_0225B1BC_decl.h" -#include - -UnkStruct_ov22_0225B1BC * ov22_0225AF8C(const UnkStruct_ov22_0225AF8C * param0, const UnkStruct_02029C68 * param1); -UnkStruct_ov22_0225B1BC * ov22_0225AFB0(const UnkStruct_ov22_0225AF8C * param0, const UnkStruct_02029C88 * param1); -UnkStruct_ov22_0225B1BC * ov22_0225AFD4(const UnkStruct_ov22_0225AF8C * param0, const UnkStruct_02029C88 * param1); -void ov22_0225AFF8(UnkStruct_ov22_0225B1BC * param0); -void ov22_0225B020(UnkStruct_ov22_0225B1BC * param0); -void ov22_0225B06C(UnkStruct_ov22_0225B1BC * param0); -void ov22_0225B074(UnkStruct_ov22_0225B1BC * param0, BOOL param1); -void ov22_0225B07C(UnkStruct_ov22_0225B1BC * param0, BOOL param1); -void ov22_0225B080(UnkStruct_ov22_0225B1BC * param0, int param1, int param2); -void ov22_0225B0D8(UnkStruct_ov22_0225B1BC * param0, int param1, int param2); -void ov22_0225B0E4(UnkStruct_ov22_0225B1BC * param0, u16 param1); -void ov22_0225B0EC(UnkStruct_ov22_0225B1BC * param0, fx32 param1, fx32 param2, fx32 param3); -void ov22_0225B100(UnkStruct_ov22_0225B1BC * param0, int param1, int param2); -void ov22_0225B158(UnkStruct_ov22_0225B1BC * param0, int param1, int param2, int param3); -void ov22_0225B198(UnkStruct_ov22_0225B1BC * param0, GXRgb param1); -void ov22_0225B1AC(UnkStruct_ov22_0225B1BC * param0, int param1); +UnkStruct_ov22_0225B1BC *ov22_0225AF8C(const UnkStruct_ov22_0225AF8C *param0, const UnkStruct_02029C68 *param1); +UnkStruct_ov22_0225B1BC *ov22_0225AFB0(const UnkStruct_ov22_0225AF8C *param0, const UnkStruct_02029C88 *param1); +UnkStruct_ov22_0225B1BC *ov22_0225AFD4(const UnkStruct_ov22_0225AF8C *param0, const UnkStruct_02029C88 *param1); +void ov22_0225AFF8(UnkStruct_ov22_0225B1BC *param0); +void ov22_0225B020(UnkStruct_ov22_0225B1BC *param0); +void ov22_0225B06C(UnkStruct_ov22_0225B1BC *param0); +void ov22_0225B074(UnkStruct_ov22_0225B1BC *param0, BOOL param1); +void ov22_0225B07C(UnkStruct_ov22_0225B1BC *param0, BOOL param1); +void ov22_0225B080(UnkStruct_ov22_0225B1BC *param0, int param1, int param2); +void ov22_0225B0D8(UnkStruct_ov22_0225B1BC *param0, int param1, int param2); +void ov22_0225B0E4(UnkStruct_ov22_0225B1BC *param0, u16 param1); +void ov22_0225B0EC(UnkStruct_ov22_0225B1BC *param0, fx32 param1, fx32 param2, fx32 param3); +void ov22_0225B100(UnkStruct_ov22_0225B1BC *param0, int param1, int param2); +void ov22_0225B158(UnkStruct_ov22_0225B1BC *param0, int param1, int param2, int param3); +void ov22_0225B198(UnkStruct_ov22_0225B1BC *param0, GXRgb param1); +void ov22_0225B1AC(UnkStruct_ov22_0225B1BC *param0, int param1); #endif // POKEPLATINUM_OV22_0225AF8C_H diff --git a/include/overlay022/ov22_0225B660.h b/include/overlay022/ov22_0225B660.h index d9c423a4b1..1d63b9c95f 100644 --- a/include/overlay022/ov22_0225B660.h +++ b/include/overlay022/ov22_0225B660.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV22_0225B660_H #define POKEPLATINUM_OV22_0225B660_H +#include "overlay_manager.h" -int ov22_0225B660(OverlayManager * param0, int * param1); -int ov22_0225B738(OverlayManager * param0, int * param1); -int ov22_0225B7FC(OverlayManager * param0, int * param1); +int ov22_0225B660(OverlayManager *param0, int *param1); +int ov22_0225B738(OverlayManager *param0, int *param1); +int ov22_0225B7FC(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV22_0225B660_H diff --git a/include/overlay022/struct_ov22_02254DE0.h b/include/overlay022/struct_ov22_02254DE0.h index eaa7e20e04..77fb3679f3 100644 --- a/include/overlay022/struct_ov22_02254DE0.h +++ b/include/overlay022/struct_ov22_02254DE0.h @@ -4,7 +4,7 @@ #include "overlay022/struct_ov22_02255040.h" typedef struct { - UnkStruct_ov22_02255040 * unk_00; + UnkStruct_ov22_02255040 *unk_00; int unk_04; } UnkStruct_ov22_02254DE0; diff --git a/include/overlay022/struct_ov22_0225500C.h b/include/overlay022/struct_ov22_0225500C.h index 53aa61f00c..8e5a820945 100644 --- a/include/overlay022/struct_ov22_0225500C.h +++ b/include/overlay022/struct_ov22_0225500C.h @@ -4,13 +4,14 @@ #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" + #include "overlay022/struct_ov22_02254DE0.h" typedef struct { - UnkStruct_ov22_02254DE0 * unk_00; - UnkStruct_02015064 * unk_04; - UnkStruct_02015128 * unk_08; - UnkStruct_020151A4 * unk_0C; + UnkStruct_ov22_02254DE0 *unk_00; + UnkStruct_02015064 *unk_04; + UnkStruct_02015128 *unk_08; + UnkStruct_020151A4 *unk_0C; int unk_10; int unk_14; u32 unk_18; diff --git a/include/overlay022/struct_ov22_02255040.h b/include/overlay022/struct_ov22_02255040.h index 366e0afefa..039e2ab0a9 100644 --- a/include/overlay022/struct_ov22_02255040.h +++ b/include/overlay022/struct_ov22_02255040.h @@ -5,7 +5,7 @@ typedef struct { int unk_00; - UnkStruct_02015214 * unk_04; + UnkStruct_02015214 *unk_04; } UnkStruct_ov22_02255040; #endif // POKEPLATINUM_STRUCT_OV22_02255040_H diff --git a/include/overlay022/struct_ov22_022557A0.h b/include/overlay022/struct_ov22_022557A0.h index e6662cb170..ec2a83c2e3 100644 --- a/include/overlay022/struct_ov22_022557A0.h +++ b/include/overlay022/struct_ov22_022557A0.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV22_022557A0_H #define POKEPLATINUM_STRUCT_OV22_022557A0_H -#include "struct_decls/struct_02015064_decl.h" - #include +#include "struct_decls/struct_02015064_decl.h" + typedef struct { - UnkStruct_02015064 * unk_00; - NNSG2dCharacterData * unk_04; + UnkStruct_02015064 *unk_00; + NNSG2dCharacterData *unk_04; } UnkStruct_ov22_022557A0; #endif // POKEPLATINUM_STRUCT_OV22_022557A0_H diff --git a/include/overlay022/struct_ov22_02255800.h b/include/overlay022/struct_ov22_02255800.h index cc997a0a14..a01cabd968 100644 --- a/include/overlay022/struct_ov22_02255800.h +++ b/include/overlay022/struct_ov22_02255800.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV22_02255800_H #define POKEPLATINUM_STRUCT_OV22_02255800_H -#include "struct_decls/struct_02015064_decl.h" - #include +#include "struct_decls/struct_02015064_decl.h" + typedef struct { - UnkStruct_02015064 * unk_00; - NNSG2dPaletteData * unk_04; + UnkStruct_02015064 *unk_00; + NNSG2dPaletteData *unk_04; u32 unk_08; } UnkStruct_ov22_02255800; diff --git a/include/overlay022/struct_ov22_02255CB8.h b/include/overlay022/struct_ov22_02255CB8.h index 9546f08d22..68b5ed60ac 100644 --- a/include/overlay022/struct_ov22_02255CB8.h +++ b/include/overlay022/struct_ov22_02255CB8.h @@ -2,16 +2,17 @@ #define POKEPLATINUM_STRUCT_OV22_02255CB8_H #include "struct_decls/struct_0202298C_decl.h" + #include "overlay022/struct_ov22_022557A0.h" #include "overlay022/struct_ov22_02255800.h" typedef struct { - UnkStruct_ov22_022557A0 * unk_00; + UnkStruct_ov22_022557A0 *unk_00; int unk_04; - UnkStruct_ov22_02255800 * unk_08; + UnkStruct_ov22_02255800 *unk_08; int unk_0C; - UnkStruct_0202298C * unk_10; - UnkStruct_0202298C * unk_14; + UnkStruct_0202298C *unk_10; + UnkStruct_0202298C *unk_14; } UnkStruct_ov22_02255CB8; #endif // POKEPLATINUM_STRUCT_OV22_02255CB8_H diff --git a/include/overlay022/struct_ov22_02256BAC.h b/include/overlay022/struct_ov22_02256BAC.h index b8744c8d5f..b69bf6781f 100644 --- a/include/overlay022/struct_ov22_02256BAC.h +++ b/include/overlay022/struct_ov22_02256BAC.h @@ -5,20 +5,21 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "game_options.h" #include "struct_defs/struct_02095C60.h" +#include "game_options.h" + typedef struct { - BGL * unk_00; - GraphicElementManager * unk_04; - UnkStruct_02009714 ** unk_08; - const Options * unk_0C; + BGL *unk_00; + GraphicElementManager *unk_04; + UnkStruct_02009714 **unk_08; + const Options *unk_0C; int unk_10; int unk_14; int unk_18; int unk_1C; - UnkStruct_02095C60 * unk_20; - NARC * unk_24; + UnkStruct_02095C60 *unk_20; + NARC *unk_24; } UnkStruct_ov22_02256BAC; #endif // POKEPLATINUM_STRUCT_OV22_02256BAC_H diff --git a/include/overlay022/struct_ov22_02257964_sub1.h b/include/overlay022/struct_ov22_02257964_sub1.h index b991435f4c..28aa64ac41 100644 --- a/include/overlay022/struct_ov22_02257964_sub1.h +++ b/include/overlay022/struct_ov22_02257964_sub1.h @@ -5,7 +5,7 @@ #include "overlay022/struct_ov22_02259560.h" typedef struct { - UnkStruct_ov22_02259484 * unk_00; + UnkStruct_ov22_02259484 *unk_00; UnkStruct_ov22_02259560 unk_04; UnkStruct_ov22_02259560 unk_14; int unk_24; diff --git a/include/overlay022/struct_ov22_02257964_sub2.h b/include/overlay022/struct_ov22_02257964_sub2.h index 4824e7d7b6..fe32b68c9f 100644 --- a/include/overlay022/struct_ov22_02257964_sub2.h +++ b/include/overlay022/struct_ov22_02257964_sub2.h @@ -7,17 +7,18 @@ #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_020298D8.h" + #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_022597BC.h" typedef struct { - UnkStruct_02015064 * unk_00; - UnkStruct_02015128 ** unk_04; - UnkStruct_020151A4 ** unk_08; - u8 * unk_0C; - UnkStruct_02007768 * unk_10; - BGL * unk_14; - UnkStruct_ov22_02254DE0 * unk_18; + UnkStruct_02015064 *unk_00; + UnkStruct_02015128 **unk_04; + UnkStruct_020151A4 **unk_08; + u8 *unk_0C; + UnkStruct_02007768 *unk_10; + BGL *unk_14; + UnkStruct_ov22_02254DE0 *unk_18; UnkStruct_ov22_022597BC unk_1C; int unk_48; UnkStruct_020298D8 unk_4C; diff --git a/include/overlay022/struct_ov22_02257F50_sub1.h b/include/overlay022/struct_ov22_02257F50_sub1.h index 4d28a78de2..811c43655a 100644 --- a/include/overlay022/struct_ov22_02257F50_sub1.h +++ b/include/overlay022/struct_ov22_02257F50_sub1.h @@ -7,8 +7,8 @@ typedef struct { int unk_00; - UnkStruct_ov22_0225899C * unk_04; - UnkStruct_ov22_02259484 * unk_08; + UnkStruct_ov22_0225899C *unk_04; + UnkStruct_ov22_02259484 *unk_08; UnkStruct_ov22_02257F50_sub1_sub1 unk_0C[4]; int unk_3C; int unk_40; diff --git a/include/overlay022/struct_ov22_02257F50_sub1_sub1.h b/include/overlay022/struct_ov22_02257F50_sub1_sub1.h index c592b7a1da..57dd816967 100644 --- a/include/overlay022/struct_ov22_02257F50_sub1_sub1.h +++ b/include/overlay022/struct_ov22_02257F50_sub1_sub1.h @@ -4,7 +4,7 @@ #include "overlay022/struct_ov22_02259560.h" typedef struct { - UnkStruct_ov22_02259560 * unk_00; + UnkStruct_ov22_02259560 *unk_00; int unk_04; int unk_08; } UnkStruct_ov22_02257F50_sub1_sub1; diff --git a/include/overlay022/struct_ov22_02257F50_sub2.h b/include/overlay022/struct_ov22_02257F50_sub2.h index 15d0f98cb1..81ac238d19 100644 --- a/include/overlay022/struct_ov22_02257F50_sub2.h +++ b/include/overlay022/struct_ov22_02257F50_sub2.h @@ -5,18 +5,19 @@ #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02018340_decl.h" + #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_022597BC.h" typedef struct { - UnkStruct_02015064 * unk_00; - UnkStruct_02015128 ** unk_04; - UnkStruct_020151A4 ** unk_08; - u8 * unk_0C; - BGL * unk_10; - UnkStruct_ov22_02254DE0 * unk_14; + UnkStruct_02015064 *unk_00; + UnkStruct_02015128 **unk_04; + UnkStruct_020151A4 **unk_08; + u8 *unk_0C; + BGL *unk_10; + UnkStruct_ov22_02254DE0 *unk_14; UnkStruct_ov22_022597BC unk_18; - UnkStruct_ov22_02254DE0 * unk_44; + UnkStruct_ov22_02254DE0 *unk_44; } UnkStruct_ov22_02257F50_sub2; #endif // POKEPLATINUM_STRUCT_OV22_02257F50_SUB2_H diff --git a/include/overlay022/struct_ov22_02258470.h b/include/overlay022/struct_ov22_02258470.h index 877db9d597..3920fe08c6 100644 --- a/include/overlay022/struct_ov22_02258470.h +++ b/include/overlay022/struct_ov22_02258470.h @@ -5,22 +5,23 @@ #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02018340_decl.h" + #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_0225899C.h" #include "overlay022/struct_ov22_02259484.h" typedef struct { - UnkStruct_02015064 * unk_00; - UnkStruct_02015128 ** unk_04; - UnkStruct_020151A4 ** unk_08; - u8 * unk_0C; - BGL * unk_10; - UnkStruct_ov22_02254DE0 * unk_14; - UnkStruct_ov22_02259484 * unk_18; + UnkStruct_02015064 *unk_00; + UnkStruct_02015128 **unk_04; + UnkStruct_020151A4 **unk_08; + u8 *unk_0C; + BGL *unk_10; + UnkStruct_ov22_02254DE0 *unk_14; + UnkStruct_ov22_02259484 *unk_18; int unk_1C; int unk_20; int unk_24; - UnkStruct_ov22_0225899C * unk_28; + UnkStruct_ov22_0225899C *unk_28; } UnkStruct_ov22_02258470; #endif // POKEPLATINUM_STRUCT_OV22_02258470_H diff --git a/include/overlay022/struct_ov22_02258A48.h b/include/overlay022/struct_ov22_02258A48.h index c9bc92eec6..2bfd1ec359 100644 --- a/include/overlay022/struct_ov22_02258A48.h +++ b/include/overlay022/struct_ov22_02258A48.h @@ -2,11 +2,11 @@ #define POKEPLATINUM_STRUCT_OV22_02258A48_H typedef struct UnkStruct_ov22_02258A48_t { - void * unk_00; - void (* unk_04)(struct UnkStruct_ov22_02258A48_t * param0); - void (* unk_08)(struct UnkStruct_ov22_02258A48_t * param0); - void (* unk_0C)(struct UnkStruct_ov22_02258A48_t * param0); - void (* unk_10)(struct UnkStruct_ov22_02258A48_t * param0); + void *unk_00; + void (*unk_04)(struct UnkStruct_ov22_02258A48_t *param0); + void (*unk_08)(struct UnkStruct_ov22_02258A48_t *param0); + void (*unk_0C)(struct UnkStruct_ov22_02258A48_t *param0); + void (*unk_10)(struct UnkStruct_ov22_02258A48_t *param0); s16 unk_14; s16 unk_16; u8 unk_18; diff --git a/include/overlay022/struct_ov22_02259484.h b/include/overlay022/struct_ov22_02259484.h index 0d1fc8d662..6a591293bd 100644 --- a/include/overlay022/struct_ov22_02259484.h +++ b/include/overlay022/struct_ov22_02259484.h @@ -4,7 +4,7 @@ #include "overlay022/struct_ov22_02259560.h" typedef struct { - UnkStruct_ov22_02259560 * unk_00; + UnkStruct_ov22_02259560 *unk_00; int unk_04; } UnkStruct_ov22_02259484; diff --git a/include/overlay022/struct_ov22_02259560.h b/include/overlay022/struct_ov22_02259560.h index e812a338bf..c9182ff77f 100644 --- a/include/overlay022/struct_ov22_02259560.h +++ b/include/overlay022/struct_ov22_02259560.h @@ -4,10 +4,10 @@ #include "overlay022/struct_ov22_02259560.h" typedef struct UnkStruct_ov22_02259560_t { - void * unk_00; + void *unk_00; int unk_04; - struct UnkStruct_ov22_02259560_t * unk_08; - struct UnkStruct_ov22_02259560_t * unk_0C; + struct UnkStruct_ov22_02259560_t *unk_08; + struct UnkStruct_ov22_02259560_t *unk_0C; } UnkStruct_ov22_02259560; #endif // POKEPLATINUM_STRUCT_OV22_02259560_H diff --git a/include/overlay022/struct_ov22_022597BC.h b/include/overlay022/struct_ov22_022597BC.h index d51a99d20d..57005a1d5b 100644 --- a/include/overlay022/struct_ov22_022597BC.h +++ b/include/overlay022/struct_ov22_022597BC.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" typedef struct { - BGL * unk_00; + BGL *unk_00; int unk_04; int unk_08; int unk_0C; diff --git a/include/overlay022/struct_ov22_02259820.h b/include/overlay022/struct_ov22_02259820.h index fc6c05983b..31207ac18a 100644 --- a/include/overlay022/struct_ov22_02259820.h +++ b/include/overlay022/struct_ov22_02259820.h @@ -4,7 +4,7 @@ #include "overlay022/struct_ov22_022597BC.h" typedef struct { - const UnkStruct_ov22_022597BC * unk_00; + const UnkStruct_ov22_022597BC *unk_00; int unk_04; int unk_08; int unk_0C; diff --git a/include/overlay022/struct_ov22_022599A0.h b/include/overlay022/struct_ov22_022599A0.h index 1e9182e94f..7ab22d7425 100644 --- a/include/overlay022/struct_ov22_022599A0.h +++ b/include/overlay022/struct_ov22_022599A0.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" typedef struct { - BGL * unk_00; + BGL *unk_00; int unk_04; int unk_08; int unk_0C; diff --git a/include/overlay022/struct_ov22_02259C58.h b/include/overlay022/struct_ov22_02259C58.h index dbb2e12bfc..18b917b802 100644 --- a/include/overlay022/struct_ov22_02259C58.h +++ b/include/overlay022/struct_ov22_02259C58.h @@ -4,10 +4,10 @@ #include "struct_decls/struct_02022550_decl.h" typedef struct UnkStruct_ov22_02259C58_tag { - GraphicElementData * unk_00; + GraphicElementData *unk_00; int unk_04; - void * unk_08; - void (* unk_0C)(struct UnkStruct_ov22_02259C58_tag * param0, void * param1); + void *unk_08; + void (*unk_0C)(struct UnkStruct_ov22_02259C58_tag *param0, void *param1); } UnkStruct_ov22_02259C58; #endif // POKEPLATINUM_STRUCT_OV22_02259C58_H diff --git a/include/overlay022/struct_ov22_02259C58_1.h b/include/overlay022/struct_ov22_02259C58_1.h index 6ebf135032..33c5881cf1 100644 --- a/include/overlay022/struct_ov22_02259C58_1.h +++ b/include/overlay022/struct_ov22_02259C58_1.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV22_02259C58_1_H #define POKEPLATINUM_STRUCT_OV22_02259C58_1_H -#include "overlay115/struct_ov115_02261520.h" - #include "overlay022/funcptr_ov22_02259D78.h" +#include "overlay115/struct_ov115_02261520.h" typedef struct { - UnkStruct_ov115_02261520 * unk_00; + UnkStruct_ov115_02261520 *unk_00; UnkFuncPtr_ov22_02259D78 unk_04; - void * unk_08; + void *unk_08; int unk_0C; } UnkStruct_ov22_02259C58_1; diff --git a/include/overlay022/struct_ov22_02259C9C.h b/include/overlay022/struct_ov22_02259C9C.h index 222e9fd8bc..594869464f 100644 --- a/include/overlay022/struct_ov22_02259C9C.h +++ b/include/overlay022/struct_ov22_02259C9C.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_OV22_02259C9C_H #define POKEPLATINUM_STRUCT_OV22_02259C9C_H +#include + #include "struct_decls/struct_02012744_decl.h" #include "struct_defs/struct_0205AA50.h" -#include "overlay022/struct_ov22_02259C58_1.h" -#include +#include "overlay022/struct_ov22_02259C58_1.h" typedef struct { UnkStruct_ov22_02259C58_1 unk_00; - const Window * unk_10; - const UnkStruct_02012744 * unk_14; - const NNSG2dImagePaletteProxy * unk_18; + const Window *unk_10; + const UnkStruct_02012744 *unk_14; + const NNSG2dImagePaletteProxy *unk_18; int unk_1C; int unk_20; int unk_24; diff --git a/include/overlay022/struct_ov22_02259D2C.h b/include/overlay022/struct_ov22_02259D2C.h index 4c4e5c8a88..4355c52763 100644 --- a/include/overlay022/struct_ov22_02259D2C.h +++ b/include/overlay022/struct_ov22_02259D2C.h @@ -2,17 +2,19 @@ #define POKEPLATINUM_STRUCT_OV22_02259D2C_H #include "struct_decls/struct_02012744_decl.h" -#include "touch_screen.h" #include "struct_decls/struct_02023FCC_decl.h" + #include "overlay022/struct_ov22_02259C58.h" #include "overlay022/struct_ov22_0225A154.h" +#include "touch_screen.h" + typedef struct { UnkStruct_ov22_02259C58 unk_00[4]; UnkStruct_ov22_0225A154 unk_40; BOOL unk_60; - UnkStruct_02012744 * unk_64; - UnkStruct_02023FCC * unk_68; + UnkStruct_02012744 *unk_64; + UnkStruct_02023FCC *unk_68; TouchScreenHitTable unk_6C[5]; } UnkStruct_ov22_02259D2C; diff --git a/include/overlay022/struct_ov22_0225A0E4.h b/include/overlay022/struct_ov22_0225A0E4.h index 6326b6f8c2..8590f6b136 100644 --- a/include/overlay022/struct_ov22_0225A0E4.h +++ b/include/overlay022/struct_ov22_0225A0E4.h @@ -1,41 +1,41 @@ #ifndef POKEPLATINUM_STRUCT_OV22_0225A0E4_H #define POKEPLATINUM_STRUCT_OV22_0225A0E4_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02009714_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_0202298C_decl.h" - -#include +#include "struct_defs/struct_0200C738.h" typedef struct { - UnkStruct_02015064 * unk_00; - UnkStruct_02015128 ** unk_04; + UnkStruct_02015064 *unk_00; + UnkStruct_02015128 **unk_04; int unk_08; int unk_0C; - UnkStruct_020151A4 ** unk_10; + UnkStruct_020151A4 **unk_10; int unk_14; int unk_18; BOOL unk_1C; - UnkStruct_02007768 * unk_20; + UnkStruct_02007768 *unk_20; NNSGfdTexKey unk_24; NNSGfdPlttKey unk_28; BOOL unk_2C; - u8 * unk_30; - UnkStruct_0202298C * unk_34; - NNSG2dCharacterData ** unk_38; + u8 *unk_30; + UnkStruct_0202298C *unk_34; + NNSG2dCharacterData **unk_38; int unk_3C; - BGL * unk_40; - GraphicElementManager * unk_44; - UnkStruct_02009714 * unk_48[4]; + BGL *unk_40; + GraphicElementManager *unk_44; + UnkStruct_02009714 *unk_48[4]; UnkStruct_0200C738 unk_58; - NARC * unk_5C; + NARC *unk_5C; } UnkStruct_ov22_0225A0E4; #endif // POKEPLATINUM_STRUCT_OV22_0225A0E4_H diff --git a/include/overlay022/struct_ov22_0225A154.h b/include/overlay022/struct_ov22_0225A154.h index fb43236578..a89bc8a23e 100644 --- a/include/overlay022/struct_ov22_0225A154.h +++ b/include/overlay022/struct_ov22_0225A154.h @@ -3,11 +3,12 @@ #include "struct_decls/font_oam.h" #include "struct_defs/sprite_manager_allocation.h" + #include "overlay022/struct_ov22_02259C58.h" typedef struct { UnkStruct_ov22_02259C58 unk_00; - FontOAM * unk_10; + FontOAM *unk_10; SpriteManagerAllocation unk_14; } UnkStruct_ov22_0225A154; diff --git a/include/overlay022/struct_ov22_0225A428.h b/include/overlay022/struct_ov22_0225A428.h index c8c1680898..7fb1f24112 100644 --- a/include/overlay022/struct_ov22_0225A428.h +++ b/include/overlay022/struct_ov22_0225A428.h @@ -3,24 +3,26 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay022/struct_ov22_022597BC.h" #include "overlay022/struct_ov22_0225A914.h" #include "overlay022/struct_ov22_0225AB54.h" +#include "strbuf.h" + typedef struct { UnkStruct_ov22_022597BC unk_00; - Window * unk_2C; - GraphicElementManager * unk_30; - UnkStruct_02009714 ** unk_34; + Window *unk_2C; + GraphicElementManager *unk_30; + UnkStruct_02009714 **unk_34; UnkStruct_ov22_0225A914 unk_38; UnkStruct_ov22_0225AB54 unk_A0; - Window * unk_134; + Window *unk_134; int unk_138; int unk_13C; u32 unk_140; - Strbuf* unk_144; + Strbuf *unk_144; } UnkStruct_ov22_0225A428; #endif // POKEPLATINUM_STRUCT_OV22_0225A428_H diff --git a/include/overlay022/struct_ov22_0225A914.h b/include/overlay022/struct_ov22_0225A914.h index e8ae739c3e..cc63d21e07 100644 --- a/include/overlay022/struct_ov22_0225A914.h +++ b/include/overlay022/struct_ov22_0225A914.h @@ -5,8 +5,8 @@ #include "struct_decls/struct_02022550_decl.h" typedef struct { - UnkStruct_02009DC8 * unk_00[4]; - GraphicElementData * unk_10[20]; + UnkStruct_02009DC8 *unk_00[4]; + GraphicElementData *unk_10[20]; int unk_60; int unk_64; } UnkStruct_ov22_0225A914; diff --git a/include/overlay022/struct_ov22_0225AB54.h b/include/overlay022/struct_ov22_0225AB54.h index f26dd18453..738e5322c9 100644 --- a/include/overlay022/struct_ov22_0225AB54.h +++ b/include/overlay022/struct_ov22_0225AB54.h @@ -2,21 +2,23 @@ #define POKEPLATINUM_STRUCT_OV22_0225AB54_H #include "struct_decls/struct_02009DC8_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C60.h" + #include "overlay022/struct_ov22_0225AE9C.h" +#include "sys_task_manager.h" + typedef struct { - UnkStruct_02009DC8 * unk_00[4]; - GraphicElementData * unk_10[2]; - Window * unk_18; + UnkStruct_02009DC8 *unk_00[4]; + GraphicElementData *unk_10[2]; + Window *unk_18; int unk_1C; int unk_20; - SysTask * unk_24; - SysTask * unk_28; - UnkStruct_02095C60 * unk_2C; + SysTask *unk_24; + SysTask *unk_28; + UnkStruct_02095C60 *unk_2C; UnkStruct_ov22_0225AE9C unk_30; BOOL unk_90; } UnkStruct_ov22_0225AB54; diff --git a/include/overlay022/struct_ov22_0225AE9C.h b/include/overlay022/struct_ov22_0225AE9C.h index 0b1e0de398..8e47b3ea2e 100644 --- a/include/overlay022/struct_ov22_0225AE9C.h +++ b/include/overlay022/struct_ov22_0225AE9C.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV22_0225AE9C_H #define POKEPLATINUM_STRUCT_OV22_0225AE9C_H +#include + #include "struct_decls/struct_02022550_decl.h" -#include "overlay022/struct_ov22_0225AD68.h" -#include +#include "overlay022/struct_ov22_0225AD68.h" typedef struct { BOOL unk_00; - GraphicElementData * unk_04[2]; + GraphicElementData *unk_04[2]; VecFx32 unk_0C[2]; UnkStruct_ov22_0225AD68 unk_24; UnkStruct_ov22_0225AD68 unk_38; diff --git a/include/overlay022/struct_ov22_0225AF44.h b/include/overlay022/struct_ov22_0225AF44.h index 74bf5c9a8d..be2095a82a 100644 --- a/include/overlay022/struct_ov22_0225AF44.h +++ b/include/overlay022/struct_ov22_0225AF44.h @@ -4,7 +4,7 @@ #include "overlay022/struct_ov22_022597BC.h" typedef struct { - const UnkStruct_ov22_022597BC * unk_00; + const UnkStruct_ov22_022597BC *unk_00; int unk_04; int unk_08; int unk_0C; diff --git a/include/overlay022/struct_ov22_0225AF68.h b/include/overlay022/struct_ov22_0225AF68.h index 1357e96e1f..f0a8c51dee 100644 --- a/include/overlay022/struct_ov22_0225AF68.h +++ b/include/overlay022/struct_ov22_0225AF68.h @@ -5,7 +5,7 @@ #include "overlay022/struct_ov22_02259820.h" typedef struct { - const UnkStruct_ov22_02257964 * unk_00; + const UnkStruct_ov22_02257964 *unk_00; UnkStruct_ov22_02259820 unk_04; } UnkStruct_ov22_0225AF68; diff --git a/include/overlay022/struct_ov22_0225AF8C.h b/include/overlay022/struct_ov22_0225AF8C.h index 66138a0e2b..de8211dc7a 100644 --- a/include/overlay022/struct_ov22_0225AF8C.h +++ b/include/overlay022/struct_ov22_0225AF8C.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" typedef struct { - BGL * unk_00; + BGL *unk_00; int unk_04; int unk_08; int unk_0C; diff --git a/include/overlay022/struct_ov22_0225B388.h b/include/overlay022/struct_ov22_0225B388.h index eb13aa2e53..a37b63584f 100644 --- a/include/overlay022/struct_ov22_0225B388.h +++ b/include/overlay022/struct_ov22_0225B388.h @@ -6,18 +6,19 @@ #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02018340_decl.h" + #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_02259484.h" typedef struct { - UnkStruct_02015064 * unk_00; - UnkStruct_02015128 ** unk_04; - UnkStruct_020151A4 ** unk_08; - u8 * unk_0C; - UnkStruct_02007768 * unk_10; - BGL * unk_14; - UnkStruct_ov22_02254DE0 * unk_18; - UnkStruct_ov22_02259484 * unk_1C; + UnkStruct_02015064 *unk_00; + UnkStruct_02015128 **unk_04; + UnkStruct_020151A4 **unk_08; + u8 *unk_0C; + UnkStruct_02007768 *unk_10; + BGL *unk_14; + UnkStruct_ov22_02254DE0 *unk_18; + UnkStruct_ov22_02259484 *unk_1C; int unk_20; } UnkStruct_ov22_0225B388; diff --git a/include/overlay023/funcptr_ov23_022427DC.h b/include/overlay023/funcptr_ov23_022427DC.h index d978525182..5aec9991df 100644 --- a/include/overlay023/funcptr_ov23_022427DC.h +++ b/include/overlay023/funcptr_ov23_022427DC.h @@ -3,6 +3,6 @@ #include "overlay023/struct_ov23_0224271C_decl.h" -typedef UnkStruct_ov23_0224271C *(* UnkFuncPtr_ov23_022427DC)(UnkStruct_ov23_0224271C *, int); +typedef UnkStruct_ov23_0224271C *(*UnkFuncPtr_ov23_022427DC)(UnkStruct_ov23_0224271C *, int); #endif // POKEPLATINUM_FUNCPTR_OV23_022427DC_H diff --git a/include/overlay023/funcptr_ov23_022431EC.h b/include/overlay023/funcptr_ov23_022431EC.h index d3bb675442..5d5e40a3ac 100644 --- a/include/overlay023/funcptr_ov23_022431EC.h +++ b/include/overlay023/funcptr_ov23_022431EC.h @@ -3,6 +3,6 @@ #include "sys_task_manager.h" -typedef void (* UnkFuncPtr_ov23_022431EC)(SysTask *, void *); +typedef void (*UnkFuncPtr_ov23_022431EC)(SysTask *, void *); #endif // POKEPLATINUM_FUNCPTR_OV23_022431EC_H diff --git a/include/overlay023/funcptr_ov23_02248D20.h b/include/overlay023/funcptr_ov23_02248D20.h index 07467122db..7d9067ce2c 100644 --- a/include/overlay023/funcptr_ov23_02248D20.h +++ b/include/overlay023/funcptr_ov23_02248D20.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020298B0_decl.h" -typedef void (* UnkFuncPtr_ov23_02248D20)(UndergroundData *, int, int); +typedef void (*UnkFuncPtr_ov23_02248D20)(UndergroundData *, int, int); #endif // POKEPLATINUM_FUNCPTR_OV23_02248D20_H diff --git a/include/overlay023/funcptr_ov23_0224DCB8.h b/include/overlay023/funcptr_ov23_0224DCB8.h index 3dd71f010e..45f5cd3832 100644 --- a/include/overlay023/funcptr_ov23_0224DCB8.h +++ b/include/overlay023/funcptr_ov23_0224DCB8.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV23_0224DCB8_H #define POKEPLATINUM_FUNCPTR_OV23_0224DCB8_H -typedef void (* UnkFuncPtr_ov23_0224DCB8)(int); +typedef void (*UnkFuncPtr_ov23_0224DCB8)(int); #endif // POKEPLATINUM_FUNCPTR_OV23_0224DCB8_H diff --git a/include/overlay023/funcptr_ov23_0224F758.h b/include/overlay023/funcptr_ov23_0224F758.h index 9e02da750d..56aaa9cee6 100644 --- a/include/overlay023/funcptr_ov23_0224F758.h +++ b/include/overlay023/funcptr_ov23_0224F758.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV23_0224F758_H #define POKEPLATINUM_FUNCPTR_OV23_0224F758_H -typedef void (* UnkFuncPtr_ov23_0224F758)(int); +typedef void (*UnkFuncPtr_ov23_0224F758)(int); #endif // POKEPLATINUM_FUNCPTR_OV23_0224F758_H diff --git a/include/overlay023/funcptr_ov23_0224F914.h b/include/overlay023/funcptr_ov23_0224F914.h index 2c7eac61c6..7c011e765f 100644 --- a/include/overlay023/funcptr_ov23_0224F914.h +++ b/include/overlay023/funcptr_ov23_0224F914.h @@ -3,6 +3,6 @@ #include "overlay023/struct_ov23_02250CD4.h" -typedef void (* UnkFuncPtr_ov23_0224F914)(UnkStruct_ov23_02250CD4 *); +typedef void (*UnkFuncPtr_ov23_0224F914)(UnkStruct_ov23_02250CD4 *); #endif // POKEPLATINUM_FUNCPTR_OV23_0224F914_H diff --git a/include/overlay023/funcptr_ov23_0224FD84.h b/include/overlay023/funcptr_ov23_0224FD84.h index 5d8555e389..dcb14866fb 100644 --- a/include/overlay023/funcptr_ov23_0224FD84.h +++ b/include/overlay023/funcptr_ov23_0224FD84.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV23_0224FD84_H #define POKEPLATINUM_FUNCPTR_OV23_0224FD84_H -typedef int (* UnkFuncPtr_ov23_0224FD84)(int, void *); +typedef int (*UnkFuncPtr_ov23_0224FD84)(int, void *); #endif // POKEPLATINUM_FUNCPTR_OV23_0224FD84_H diff --git a/include/overlay023/funcptr_ov23_0224FE38.h b/include/overlay023/funcptr_ov23_0224FE38.h index bb5fb55249..024f41a2a3 100644 --- a/include/overlay023/funcptr_ov23_0224FE38.h +++ b/include/overlay023/funcptr_ov23_0224FE38.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV23_0224FE38_H #define POKEPLATINUM_FUNCPTR_OV23_0224FE38_H -typedef int (* UnkFuncPtr_ov23_0224FE38)(void *); +typedef int (*UnkFuncPtr_ov23_0224FE38)(void *); #endif // POKEPLATINUM_FUNCPTR_OV23_0224FE38_H diff --git a/include/overlay023/funcptr_ov23_0225021C.h b/include/overlay023/funcptr_ov23_0225021C.h index 962d155f24..12be6b7b7d 100644 --- a/include/overlay023/funcptr_ov23_0225021C.h +++ b/include/overlay023/funcptr_ov23_0225021C.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV23_0225021C_H #define POKEPLATINUM_FUNCPTR_OV23_0225021C_H -typedef int (* UnkFuncPtr_ov23_0225021C)(int, void *); +typedef int (*UnkFuncPtr_ov23_0225021C)(int, void *); #endif // POKEPLATINUM_FUNCPTR_OV23_0225021C_H diff --git a/include/overlay023/funcptr_ov23_022515D8.h b/include/overlay023/funcptr_ov23_022515D8.h index ff66c7bdbc..60675182d7 100644 --- a/include/overlay023/funcptr_ov23_022515D8.h +++ b/include/overlay023/funcptr_ov23_022515D8.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_0200112C_decl.h" -typedef void (* UnkFuncPtr_ov23_022515D8)(BmpList *, u32, u8); +typedef void (*UnkFuncPtr_ov23_022515D8)(BmpList *, u32, u8); #endif // POKEPLATINUM_FUNCPTR_OV23_022515D8_H diff --git a/include/overlay023/funcptr_ov23_022537D4.h b/include/overlay023/funcptr_ov23_022537D4.h index 917ad1e86d..302667e572 100644 --- a/include/overlay023/funcptr_ov23_022537D4.h +++ b/include/overlay023/funcptr_ov23_022537D4.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV23_022537D4_H #define POKEPLATINUM_FUNCPTR_OV23_022537D4_H -typedef void (* UnkFuncPtr_ov23_022537D4)(void); +typedef void (*UnkFuncPtr_ov23_022537D4)(void); #endif // POKEPLATINUM_FUNCPTR_OV23_022537D4_H diff --git a/include/overlay023/funcptr_ov23_02253834.h b/include/overlay023/funcptr_ov23_02253834.h index dcb575a05d..ed3a4045a7 100644 --- a/include/overlay023/funcptr_ov23_02253834.h +++ b/include/overlay023/funcptr_ov23_02253834.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV23_02253834_H #define POKEPLATINUM_FUNCPTR_OV23_02253834_H -typedef void (* UnkFuncPtr_ov23_02253834)(void *); +typedef void (*UnkFuncPtr_ov23_02253834)(void *); #endif // POKEPLATINUM_FUNCPTR_OV23_02253834_H diff --git a/include/overlay023/funcptr_ov23_02253E90.h b/include/overlay023/funcptr_ov23_02253E90.h index a55c641386..929e16fec6 100644 --- a/include/overlay023/funcptr_ov23_02253E90.h +++ b/include/overlay023/funcptr_ov23_02253E90.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV23_02253E90_H #define POKEPLATINUM_FUNCPTR_OV23_02253E90_H -typedef void (* UnkFuncPtr_ov23_02253E90)(void *); +typedef void (*UnkFuncPtr_ov23_02253E90)(void *); #endif // POKEPLATINUM_FUNCPTR_OV23_02253E90_H diff --git a/include/overlay023/ov23_0223E140.h b/include/overlay023/ov23_0223E140.h index 4eff35296d..75ae5cb31c 100644 --- a/include/overlay023/ov23_0223E140.h +++ b/include/overlay023/ov23_0223E140.h @@ -1,27 +1,28 @@ #ifndef POKEPLATINUM_OV23_0223E140_H #define POKEPLATINUM_OV23_0223E140_H -#include "strbuf.h" +#include + #include "field/field_system_decl.h" #include "overlay023/struct_ov23_0224271C_decl.h" -#include +#include "strbuf.h" -void ov23_0223E1E4(void * param0, FieldSystem * fieldSystem); +void ov23_0223E1E4(void *param0, FieldSystem *fieldSystem); int ov23_0223E2E8(void); void ov23_0223E2F0(void); void ov23_0223E2F4(void); void ov23_0223E2F8(void); -BOOL ov23_0223E354(int param0, UnkStruct_ov23_0224271C * param1); -void ov23_0223E650(int param0, int param1, MATHRandContext16 * param2); +BOOL ov23_0223E354(int param0, UnkStruct_ov23_0224271C *param1); +void ov23_0223E650(int param0, int param1, MATHRandContext16 *param2); void ov23_0223E878(void); -void ov23_0223E9D4(int param0, int param1, void * param2, void * param3); -void ov23_0223EAF8(int param0, int param1, void * param2, void * param3); -void ov23_0223EB8C(int param0, int param1, void * param2, void * param3); -void ov23_0223EBC0(int param0, int param1, void * param2, void * param3); -void ov23_0223EBE4(int param0, int param1, void * param2, void * param3); +void ov23_0223E9D4(int param0, int param1, void *param2, void *param3); +void ov23_0223EAF8(int param0, int param1, void *param2, void *param3); +void ov23_0223EB8C(int param0, int param1, void *param2, void *param3); +void ov23_0223EBC0(int param0, int param1, void *param2, void *param3); +void ov23_0223EBE4(int param0, int param1, void *param2, void *param3); int ov23_0223EBFC(void); -void ov23_0223EC00(int param0, int param1, void * param2, void * param3); +void ov23_0223EC00(int param0, int param1, void *param2, void *param3); int ov23_0223EC30(void); BOOL ov23_02241200(int param0, int param1); int ov23_0224121C(int param0); @@ -30,8 +31,8 @@ int ov23_0224125C(int param0); int ov23_02241294(int param0); void ov23_022412F0(void); void ov23_02241364(void); -void ov23_022413A0(int param0, int param1, void * param2, void * param3); -void ov23_0224142C(int param0, int param1, void * param2, void * param3); +void ov23_022413A0(int param0, int param1, void *param2, void *param3); +void ov23_0224142C(int param0, int param1, void *param2, void *param3); int ov23_022414D0(void); BOOL ov23_022415B8(Strbuf *param0); void ov23_0224160C(void); diff --git a/include/overlay023/ov23_022416A8.h b/include/overlay023/ov23_022416A8.h index a628e9657c..e5cafbc9ec 100644 --- a/include/overlay023/ov23_022416A8.h +++ b/include/overlay023/ov23_022416A8.h @@ -1,29 +1,30 @@ #ifndef POKEPLATINUM_OV23_022416A8_H #define POKEPLATINUM_OV23_022416A8_H -#include "strbuf.h" +#include + #include "field/field_system_decl.h" #include "overlay023/struct_ov23_02241A80.h" #include "overlay023/struct_ov23_02241A88.h" -#include +#include "strbuf.h" -void ov23_022416E0(void * param0, FieldSystem * fieldSystem); +void ov23_022416E0(void *param0, FieldSystem *fieldSystem); int ov23_022417C4(void); void ov23_022417CC(void); void ov23_022417E0(void); void ov23_022417F4(void); void ov23_02241810(void); -void ov23_022419B4(int param0, int param1, void * param2, void * param3); -void ov23_02241A80(UnkStruct_ov23_02241A80 * param0, int param1); -BOOL ov23_02241A88(UnkStruct_ov23_02241A80 * param0, UnkStruct_ov23_02241A88 * param1); +void ov23_022419B4(int param0, int param1, void *param2, void *param3); +void ov23_02241A80(UnkStruct_ov23_02241A80 *param0, int param1); +BOOL ov23_02241A88(UnkStruct_ov23_02241A80 *param0, UnkStruct_ov23_02241A88 *param1); void ov23_02241AE8(int param0, int param1, int param2, int param3); BOOL ov23_02241CF4(int param0); BOOL ov23_02241D04(int param0, int param1); int ov23_02241D18(int param0); int ov23_02241D38(int param0); BOOL ov23_02241D58(Strbuf *param0); -int ov23_02241DF8(MATHRandContext16 * param0); +int ov23_02241DF8(MATHRandContext16 *param0); void ov23_02241E6C(void); void ov23_02241ED0(void); int ov23_02241F0C(int param0); diff --git a/include/overlay023/ov23_02241F74.h b/include/overlay023/ov23_02241F74.h index 78c5da0eda..4ea3a49c8c 100644 --- a/include/overlay023/ov23_02241F74.h +++ b/include/overlay023/ov23_02241F74.h @@ -1,46 +1,48 @@ #ifndef POKEPLATINUM_OV23_02241F74_H #define POKEPLATINUM_OV23_02241F74_H -#include "sys_task_manager.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_02029894_decl.h" + #include "field/field_system_decl.h" -#include "savedata.h" -#include "overlay023/struct_ov23_0224271C_decl.h" #include "overlay023/funcptr_ov23_022427DC.h" #include "overlay023/funcptr_ov23_022431EC.h" +#include "overlay023/struct_ov23_0224271C_decl.h" #include "overlay023/struct_ov23_02253E2C_decl.h" -UnkStruct_ov23_02253E2C * ov23_0224219C(void); -UnkStruct_ov23_02253E2C * ov23_022421AC(void); -UnkStruct_ov23_02253E2C * ov23_022421BC(void); -UnkStruct_ov23_02253E2C * ov23_022421CC(void); -UnkStruct_ov23_02253E2C * ov23_022421DC(void); +#include "savedata.h" +#include "strbuf.h" +#include "sys_task_manager.h" +#include "trainer_info.h" + +UnkStruct_ov23_02253E2C *ov23_0224219C(void); +UnkStruct_ov23_02253E2C *ov23_022421AC(void); +UnkStruct_ov23_02253E2C *ov23_022421BC(void); +UnkStruct_ov23_02253E2C *ov23_022421CC(void); +UnkStruct_ov23_02253E2C *ov23_022421DC(void); void ov23_022421EC(void); -BOOL ov23_0224223C(TrainerInfo * param0, TrainerInfo * param1, int param2, Strbuf *param3); -BOOL ov23_022422A8(TrainerInfo * param0, int param1, int param2, Strbuf *param3); +BOOL ov23_0224223C(TrainerInfo *param0, TrainerInfo *param1, int param2, Strbuf *param3); +BOOL ov23_022422A8(TrainerInfo *param0, int param1, int param2, Strbuf *param3); BOOL ov23_0224240C(int param0, int param1); BOOL ov23_02242458(void); -void ov23_022425F8(int param0, int param1, void * param2, void * param3); -void ov23_02242624(int param0, int param1, void * param2, void * param3); -void ov23_02242654(int param0, int param1, void * param2, void * param3); -int ov23_0224271C(UnkStruct_ov23_0224271C * param0); -int ov23_02242788(UnkStruct_ov23_0224271C * param0); +void ov23_022425F8(int param0, int param1, void *param2, void *param3); +void ov23_02242624(int param0, int param1, void *param2, void *param3); +void ov23_02242654(int param0, int param1, void *param2, void *param3); +int ov23_0224271C(UnkStruct_ov23_0224271C *param0); +int ov23_02242788(UnkStruct_ov23_0224271C *param0); void ov23_022427DC(int param0, UnkFuncPtr_ov23_022427DC param1); void ov23_022427F8(void); void ov23_02242814(void); void ov23_02242830(u8 param0); int ov23_022428D4(void); -void ov23_022428D8(int param0, int param1, void * param2, void * param3); +void ov23_022428D8(int param0, int param1, void *param2, void *param3); void ov23_02242B14(void); -void ov23_02242BC0(FieldSystem * fieldSystem); +void ov23_02242BC0(FieldSystem *fieldSystem); void ov23_02242C78(void); void ov23_02242CB4(void); void ov23_02242D08(void); -void ov23_02242D44(FieldSystem * fieldSystem); +void ov23_02242D44(FieldSystem *fieldSystem); BOOL ov23_02242D60(Strbuf *param0); -UnkStruct_02029894 * ov23_02242E10(SaveData * param0); +UnkStruct_02029894 *ov23_02242E10(SaveData *param0); int ov23_02242E28(void); int ov23_02242E40(void); BOOL ov23_02242E58(int param0, int param1); @@ -60,15 +62,15 @@ void ov23_022430D0(u16 param0); void ov23_022430E0(u16 param0, u16 param1, u16 param2); u16 ov23_02243154(u16 param0); u16 ov23_0224318C(u16 param0); -void ov23_022431C4(int param0, int param1, void * param2, void * param3); -void ov23_022431EC(void * param0, SysTask * param1, UnkFuncPtr_ov23_022431EC param2); +void ov23_022431C4(int param0, int param1, void *param2, void *param3); +void ov23_022431EC(void *param0, SysTask *param1, UnkFuncPtr_ov23_022431EC param2); void ov23_02243204(void); BOOL ov23_0224321C(void); BOOL ov23_02243298(int param0); void ov23_02243360(void); -void ov23_02243390(int param0, int param1, void * param2, void * param3); +void ov23_02243390(int param0, int param1, void *param2, void *param3); int ov23_022433B8(void); -void ov23_022433BC(int param0, int param1, void * param2, void * param3); +void ov23_022433BC(int param0, int param1, void *param2, void *param3); int ov23_022433D0(void); #endif // POKEPLATINUM_OV23_02241F74_H diff --git a/include/overlay023/ov23_0224340C.h b/include/overlay023/ov23_0224340C.h index 30ef8ff0e2..658af2a753 100644 --- a/include/overlay023/ov23_0224340C.h +++ b/include/overlay023/ov23_0224340C.h @@ -1,70 +1,72 @@ #ifndef POKEPLATINUM_OV23_0224340C_H #define POKEPLATINUM_OV23_0224340C_H +#include + #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" + #include "field/field_system_decl.h" #include "overlay023/struct_ov23_0224271C_decl.h" -#include +#include "strbuf.h" -void ov23_022434BC(void * param0, FieldSystem * fieldSystem); +void ov23_022434BC(void *param0, FieldSystem *fieldSystem); void ov23_02243520(void); void ov23_022435A8(void); void ov23_022435DC(void); -void ov23_02243670(FieldSystem * fieldSystem); +void ov23_02243670(FieldSystem *fieldSystem); void ov23_022436F0(int param0); int ov23_02243858(void); int ov23_02243860(void); void ov23_02243AD4(u8 param0); void ov23_02243AE8(void); void ov23_02243AF0(void); -void ov23_02243B0C(int param0, int param1, void * param2, void * param3); +void ov23_02243B0C(int param0, int param1, void *param2, void *param3); int ov23_02243C38(void); -int ov23_02243C3C(int param0, int param1, MATHRandContext16 * param2, int param3); +int ov23_02243C3C(int param0, int param1, MATHRandContext16 *param2, int param3); void ov23_02243CE8(void); -void ov23_02243ED4(int param0, int param1, void * param2, void * param3); -void ov23_02243F78(int param0, int param1, void * param2, void * param3); +void ov23_02243ED4(int param0, int param1, void *param2, void *param3); +void ov23_02243F78(int param0, int param1, void *param2, void *param3); int ov23_02243F98(void); -void ov23_02243F9C(int param0, int param1, void * param2, void * param3); -void ov23_0224401C(int param0, int param1, void * param2, void * param3); +void ov23_02243F9C(int param0, int param1, void *param2, void *param3); +void ov23_0224401C(int param0, int param1, void *param2, void *param3); int ov23_02244048(void); BOOL ov23_0224404C(void); void ov23_02244068(void); int ov23_0224407C(void); -BOOL ov23_02244080(int param0, UnkStruct_ov23_0224271C * param1, u8 param2); +BOOL ov23_02244080(int param0, UnkStruct_ov23_0224271C *param1, u8 param2); int ov23_0224413C(void); -void ov23_02244140(int param0, int param1, void * param2, void * param3); +void ov23_02244140(int param0, int param1, void *param2, void *param3); BOOL ov23_022442D8(int param0, int param1); int ov23_022442EC(void); void ov23_022443CC(int param0, int param1, int param2, int param3, int param4, int param5); BOOL ov23_0224444C(int param0); BOOL ov23_02244470(int param0); -void ov23_0224448C(int param0, int param1, void * param2, void * param3); -void ov23_022445E8(int param0, int param1, void * param2, void * param3); -void ov23_0224461C(int param0, int param1, void * param2, void * param3); +void ov23_0224448C(int param0, int param1, void *param2, void *param3); +void ov23_022445E8(int param0, int param1, void *param2, void *param3); +void ov23_0224461C(int param0, int param1, void *param2, void *param3); void ov23_02244638(void); -void ov23_0224467C(int param0, int param1, void * param2, void * param3); +void ov23_0224467C(int param0, int param1, void *param2, void *param3); BOOL ov23_022446B0(Strbuf *param0); BOOL ov23_02244784(Strbuf *param0); void ov23_02244858(int param0, BOOL param1); int ov23_02245408(void); -void ov23_0224540C(int param0, int param1, void * param2, void * param3); -void ov23_0224546C(int param0, int param1, void * param2, void * param3); -void ov23_022454B4(int param0, int param1, void * param2, void * param3); -void ov23_02245540(int param0, int param1, void * param2, void * param3); +void ov23_0224540C(int param0, int param1, void *param2, void *param3); +void ov23_0224546C(int param0, int param1, void *param2, void *param3); +void ov23_022454B4(int param0, int param1, void *param2, void *param3); +void ov23_02245540(int param0, int param1, void *param2, void *param3); void ov23_02245560(int param0, int param1); -void ov23_022455B4(int param0, int param1, void * param2, void * param3); +void ov23_022455B4(int param0, int param1, void *param2, void *param3); int ov23_02245694(void); int ov23_02245698(int param0); int ov23_022456CC(int param0); void ov23_02245728(void); void ov23_02245784(void); -void ov23_022457E4(int param0, int param1, void * param2, void * param3); -void ov23_0224589C(int param0, int param1, void * param2, void * param3); +void ov23_022457E4(int param0, int param1, void *param2, void *param3); +void ov23_0224589C(int param0, int param1, void *param2, void *param3); int ov23_02245908(void); -void ov23_022468A8(BGL * param0); -void ov23_022489F8(FieldSystem * fieldSystem, int param1, int param2, int param3, int param4, u8 * param5, int param6, u8 * param7, int param8, u8 * param9, int param10); +void ov23_022468A8(BGL *param0); +void ov23_022489F8(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, u8 *param5, int param6, u8 *param7, int param8, u8 *param9, int param10); void ov23_02248B98(int param0); #endif // POKEPLATINUM_OV23_0224340C_H diff --git a/include/overlay023/ov23_02248C08.h b/include/overlay023/ov23_02248C08.h index f3d12a57cc..964bf27044 100644 --- a/include/overlay023/ov23_02248C08.h +++ b/include/overlay023/ov23_02248C08.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV23_02248C08_H #include "struct_decls/struct_020298B0_decl.h" + #include "overlay023/funcptr_ov23_02248D20.h" #include "overlay023/struct_ov23_02248D20.h" #include "overlay084/struct_ov84_02240FA8.h" -UnkStruct_ov23_02248D20 * ov23_02248C08(UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UndergroundData * param5, BOOL param6); -u32 ov23_02248D20(UnkStruct_ov23_02248D20 * param0); -void ov23_02248EF8(UnkStruct_ov23_02248D20 * param0, u16 * param1, u16 * param2); +UnkStruct_ov23_02248D20 *ov23_02248C08(UnkStruct_ov84_02240FA8 *param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UndergroundData *param5, BOOL param6); +u32 ov23_02248D20(UnkStruct_ov23_02248D20 *param0); +void ov23_02248EF8(UnkStruct_ov23_02248D20 *param0, u16 *param1, u16 *param2); #endif // POKEPLATINUM_OV23_02248C08_H diff --git a/include/overlay023/ov23_02248F1C.h b/include/overlay023/ov23_02248F1C.h index 9ca9349126..7745b53b85 100644 --- a/include/overlay023/ov23_02248F1C.h +++ b/include/overlay023/ov23_02248F1C.h @@ -4,7 +4,7 @@ #include "field/field_system_decl.h" #include "overlay023/struct_ov23_0224942C_decl.h" -UnkStruct_ov23_0224942C * ov23_02249404(FieldSystem * fieldSystem); -void ov23_0224942C(UnkStruct_ov23_0224942C * param0); +UnkStruct_ov23_0224942C *ov23_02249404(FieldSystem *fieldSystem); +void ov23_0224942C(UnkStruct_ov23_0224942C *param0); #endif // POKEPLATINUM_OV23_02248F1C_H diff --git a/include/overlay023/ov23_02249918.h b/include/overlay023/ov23_02249918.h index 87a1138f08..17bb12031f 100644 --- a/include/overlay023/ov23_02249918.h +++ b/include/overlay023/ov23_02249918.h @@ -5,12 +5,12 @@ #include "overlay023/struct_ov23_02249978_decl.h" int ov23_02249918(void); -void ov23_0224991C(UnkStruct_ov23_0224991C * param0); -void ov23_02249938(UnkStruct_ov23_0224991C * param0); -UnkStruct_ov23_02249978 * ov23_0224993C(UnkStruct_ov23_0224991C * param0, int param1); -void ov23_02249954(UnkStruct_ov23_0224991C * param0); -void ov23_02249994(UnkStruct_ov23_02249978 * param0, int param1); -BOOL ov23_0224999C(UnkStruct_ov23_02249978 * param0); -BOOL ov23_022499AC(UnkStruct_ov23_02249978 * param0); +void ov23_0224991C(UnkStruct_ov23_0224991C *param0); +void ov23_02249938(UnkStruct_ov23_0224991C *param0); +UnkStruct_ov23_02249978 *ov23_0224993C(UnkStruct_ov23_0224991C *param0, int param1); +void ov23_02249954(UnkStruct_ov23_0224991C *param0); +void ov23_02249994(UnkStruct_ov23_02249978 *param0, int param1); +BOOL ov23_0224999C(UnkStruct_ov23_02249978 *param0); +BOOL ov23_022499AC(UnkStruct_ov23_02249978 *param0); #endif // POKEPLATINUM_OV23_02249918_H diff --git a/include/overlay023/ov23_022499E4.h b/include/overlay023/ov23_022499E4.h index 3cc144facd..4d27d3f781 100644 --- a/include/overlay023/ov23_022499E4.h +++ b/include/overlay023/ov23_022499E4.h @@ -3,7 +3,7 @@ #include "field/field_system_decl.h" -void ov23_022499E8(FieldSystem * fieldSystem); +void ov23_022499E8(FieldSystem *fieldSystem); void ov23_02249A2C(void); void ov23_02249A5C(void); void ov23_02249A74(void); diff --git a/include/overlay023/ov23_0224A1D0.h b/include/overlay023/ov23_0224A1D0.h index 8ee33546b7..5f9764c4be 100644 --- a/include/overlay023/ov23_0224A1D0.h +++ b/include/overlay023/ov23_0224A1D0.h @@ -2,27 +2,27 @@ #define POKEPLATINUM_OV23_0224A1D0_H void ov23_0224A1D0(void); -void ov23_0224A348(int param0, int param1, void * param2, void * param3); -void ov23_0224A3A8(int param0, int param1, void * param2, void * param3); -void ov23_0224A410(int param0, int param1, void * param2, void * param3); +void ov23_0224A348(int param0, int param1, void *param2, void *param3); +void ov23_0224A3A8(int param0, int param1, void *param2, void *param3); +void ov23_0224A410(int param0, int param1, void *param2, void *param3); int ov23_0224A56C(void); -void ov23_0224A570(int param0, int param1, void * param2, void * param3); +void ov23_0224A570(int param0, int param1, void *param2, void *param3); BOOL ov23_0224A658(int param0, int param1, BOOL param2); BOOL ov23_0224A6B8(int param0); -void ov23_0224A77C(int param0, int param1, void * param2, void * param3); +void ov23_0224A77C(int param0, int param1, void *param2, void *param3); void ov23_0224AA84(void); -u8 * ov23_0224AAA0(int param0, void * param1, int param2); +u8 *ov23_0224AAA0(int param0, void *param1, int param2); void ov23_0224AAB0(void); int ov23_0224AB2C(void); -void ov23_0224AB30(int param0, int param1, void * param2, void * param3); -void ov23_0224ABC4(int param0, int param1, void * param2, void * param3); +void ov23_0224AB30(int param0, int param1, void *param2, void *param3); +void ov23_0224ABC4(int param0, int param1, void *param2, void *param3); int ov23_0224AC0C(void); -void ov23_0224AC10(int param0, int param1, void * param2, void * param3); +void ov23_0224AC10(int param0, int param1, void *param2, void *param3); BOOL ov23_0224AC3C(void); void ov23_0224AC4C(void); BOOL ov23_0224ACC0(int param0); -void ov23_0224ACE8(int param0, int param1, void * param2, void * param3); -void ov23_0224ACF8(int param0, int param1, void * param2, void * param3); +void ov23_0224ACE8(int param0, int param1, void *param2, void *param3); +void ov23_0224ACF8(int param0, int param1, void *param2, void *param3); int ov23_0224AD04(int param0); int ov23_0224AD40(int param0); void ov23_0224AD7C(int param0, int param1); diff --git a/include/overlay023/ov23_0224B05C.h b/include/overlay023/ov23_0224B05C.h index 492b408714..1840e57199 100644 --- a/include/overlay023/ov23_0224B05C.h +++ b/include/overlay023/ov23_0224B05C.h @@ -1,14 +1,16 @@ #ifndef POKEPLATINUM_OV23_0224B05C_H #define POKEPLATINUM_OV23_0224B05C_H -#include "strbuf.h" #include "struct_decls/struct_02029894_decl.h" + #include "field/field_system_decl.h" -#include "savedata.h" #include "overlay023/struct_ov23_0224271C_decl.h" -void ov23_0224B144(void * param0, FieldSystem * fieldSystem); -void ov23_0224B2C8(FieldSystem * fieldSystem); +#include "savedata.h" +#include "strbuf.h" + +void ov23_0224B144(void *param0, FieldSystem *fieldSystem); +void ov23_0224B2C8(FieldSystem *fieldSystem); void ov23_0224B430(void); void ov23_0224B460(void); void ov23_0224B4E4(void); @@ -17,32 +19,32 @@ void ov23_0224B598(void); int ov23_0224B5C4(void); void ov23_0224B5CC(int param0); void ov23_0224B61C(int param0); -void ov23_0224B6AC(int param0, int param1, void * param2, void * param3); -void ov23_0224B700(int param0, int param1, void * param2, void * param3); +void ov23_0224B6AC(int param0, int param1, void *param2, void *param3); +void ov23_0224B700(int param0, int param1, void *param2, void *param3); int ov23_0224B72C(void); -void ov23_0224B730(int param0, int param1, void * param2, void * param3); +void ov23_0224B730(int param0, int param1, void *param2, void *param3); int ov23_0224B798(void); BOOL ov23_0224B8E0(int param0, int param1, int param2); int ov23_0224C100(void); -void ov23_0224C104(int param0, int param1, void * param2, void * param3); +void ov23_0224C104(int param0, int param1, void *param2, void *param3); void ov23_0224C198(void); -void ov23_0224C1A4(int param0, int param1, void * param2, void * param3); +void ov23_0224C1A4(int param0, int param1, void *param2, void *param3); BOOL ov23_0224C1C8(int param0); void ov23_0224C21C(void); void ov23_0224C23C(int param0); -void ov23_0224C25C(int param0, int param1, void * param2, void * param3); -void ov23_0224C384(int param0, int param1, void * param2, void * param3); +void ov23_0224C25C(int param0, int param1, void *param2, void *param3); +void ov23_0224C384(int param0, int param1, void *param2, void *param3); int ov23_0224C41C(void); BOOL ov23_0224C420(void); void ov23_0224C434(void); -void ov23_0224C4CC(int param0, int param1, void * param2, void * param3); +void ov23_0224C4CC(int param0, int param1, void *param2, void *param3); int ov23_0224C584(void); void ov23_0224CD68(void); int ov23_0224CD7C(void); -void ov23_0224CD80(int param0, int param1, void * param2, void * param3); -void ov23_0224CF18(int param0, int param1, void * param2, void * param3); +void ov23_0224CD80(int param0, int param1, void *param2, void *param3); +void ov23_0224CF18(int param0, int param1, void *param2, void *param3); BOOL ov23_0224D020(Strbuf *param0); -UnkStruct_02029894 * ov23_0224D130(SaveData * param0); +UnkStruct_02029894 *ov23_0224D130(SaveData *param0); int ov23_0224D150(void); int ov23_0224D178(void); BOOL ov23_0224D1A0(int param0, int param1); @@ -50,14 +52,14 @@ int ov23_0224D39C(int param0); void ov23_0224D3B0(void); void ov23_0224D3BC(int param0); void ov23_0224D3D0(int param0, int param1); -BOOL ov23_0224D454(int param0, UnkStruct_ov23_0224271C * param1); -void ov23_0224D4CC(int param0, int param1, void * param2, void * param3); +BOOL ov23_0224D454(int param0, UnkStruct_ov23_0224271C *param1); +void ov23_0224D4CC(int param0, int param1, void *param2, void *param3); int ov23_0224D4FC(void); void ov23_0224D500(int param0, int param1); void ov23_0224D518(int param0, int param1); void ov23_0224D530(int param0); -void ov23_0224D698(int param0, int param1, void * param2, void * param3); -void ov23_0224D6AC(int param0, int param1, void * param2, void * param3); +void ov23_0224D698(int param0, int param1, void *param2, void *param3); +void ov23_0224D6AC(int param0, int param1, void *param2, void *param3); int ov23_0224D6F4(void); BOOL ov23_0224D7C8(int param0); BOOL ov23_0224D87C(int param0); diff --git a/include/overlay023/ov23_0224DC40.h b/include/overlay023/ov23_0224DC40.h index 85400c7a8a..3385e99071 100644 --- a/include/overlay023/ov23_0224DC40.h +++ b/include/overlay023/ov23_0224DC40.h @@ -4,18 +4,18 @@ #include "field/field_system_decl.h" #include "overlay023/funcptr_ov23_0224DCB8.h" -void ov23_0224DCB8(int param0, UnkFuncPtr_ov23_0224DCB8 param1, FieldSystem * fieldSystem); -void ov23_0224F07C(int param0, int param1, FieldSystem * fieldSystem); -void ov23_0224F0F0(int param0, int param1, void * param2, void * param3); -void ov23_0224F0FC(int param0, int param1, void * param2, void * param3); -void ov23_0224F108(int param0, int param1, void * param2, void * param3); -void ov23_0224F138(int param0, int param1, void * param2, void * param3); +void ov23_0224DCB8(int param0, UnkFuncPtr_ov23_0224DCB8 param1, FieldSystem *fieldSystem); +void ov23_0224F07C(int param0, int param1, FieldSystem *fieldSystem); +void ov23_0224F0F0(int param0, int param1, void *param2, void *param3); +void ov23_0224F0FC(int param0, int param1, void *param2, void *param3); +void ov23_0224F108(int param0, int param1, void *param2, void *param3); +void ov23_0224F138(int param0, int param1, void *param2, void *param3); int ov23_0224F174(void); -void ov23_0224F178(int param0, int param1, void * param2, void * param3); -void ov23_0224F184(int param0, int param1, void * param2, void * param3); +void ov23_0224F178(int param0, int param1, void *param2, void *param3); +void ov23_0224F184(int param0, int param1, void *param2, void *param3); int ov23_0224F1F8(void); -void ov23_0224F1FC(int param0, int param1, void * param2, void * param3); -void ov23_0224F208(int param0, int param1, void * param2, void * param3); +void ov23_0224F1FC(int param0, int param1, void *param2, void *param3); +void ov23_0224F208(int param0, int param1, void *param2, void *param3); int ov23_0224F248(void); void ov23_0224F24C(void); diff --git a/include/overlay023/ov23_0224F294.h b/include/overlay023/ov23_0224F294.h index 1c7ce902e7..8c6033af69 100644 --- a/include/overlay023/ov23_0224F294.h +++ b/include/overlay023/ov23_0224F294.h @@ -2,45 +2,47 @@ #define POKEPLATINUM_OV23_0224F294_H #include "struct_decls/struct_0200112C_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020298B0_decl.h" + #include "field/field_system_decl.h" #include "overlay023/funcptr_ov23_0224F758.h" #include "overlay023/struct_ov23_02250CD4.h" -void ov23_0224F588(UndergroundData * param0); +#include "sys_task_manager.h" + +void ov23_0224F588(UndergroundData *param0); void ov23_0224F5B8(void); -int ov23_0224F5F0(int param0, void * param1); -int ov23_0224F61C(int param0, void * param1); +int ov23_0224F5F0(int param0, void *param1); +int ov23_0224F61C(int param0, void *param1); void ov23_0224F634(int param0); -int ov23_0224F66C(int param0, void * param1); -int ov23_0224F684(int param0, void * param1); -int ov23_0224F69C(int param0, void * param1); -int ov23_0224F6C8(int param0, void * param1); +int ov23_0224F66C(int param0, void *param1); +int ov23_0224F684(int param0, void *param1); +int ov23_0224F69C(int param0, void *param1); +int ov23_0224F6C8(int param0, void *param1); BOOL ov23_0224F6E0(int param0, int param1); BOOL ov23_0224F710(int param0); BOOL ov23_0224F730(int param0); BOOL ov23_0224F744(int param0); -void ov23_0224F758(UnkFuncPtr_ov23_0224F758 param0, FieldSystem * fieldSystem); -void ov23_0224FB7C(UnkStruct_ov23_02250CD4 * param0); +void ov23_0224F758(UnkFuncPtr_ov23_0224F758 param0, FieldSystem *fieldSystem); +void ov23_0224FB7C(UnkStruct_ov23_02250CD4 *param0); void ov23_0224FD68(int param0); -void ov23_0224FD84(BmpList * param0, u32 param1, u8 param2); -void ov23_0224FDBC(UnkStruct_ov23_02250CD4 * param0); -void ov23_0224FDE0(UnkStruct_ov23_02250CD4 * param0); +void ov23_0224FD84(BmpList *param0, u32 param1, u8 param2); +void ov23_0224FDBC(UnkStruct_ov23_02250CD4 *param0); +void ov23_0224FDE0(UnkStruct_ov23_02250CD4 *param0); void ov23_02250128(int param0); -void ov23_02250184(UnkStruct_ov23_02250CD4 * param0); -void ov23_02250540(BmpList * param0, u32 param1, u8 param2); -void ov23_02250578(UnkStruct_ov23_02250CD4 * param0); -void ov23_02250598(UnkStruct_ov23_02250CD4 * param0); -void ov23_02250A50(UnkFuncPtr_ov23_0224F758 param0, FieldSystem * fieldSystem); -void ov23_02250C3C(BmpList * param0, u32 param1, u8 param2); -void ov23_02250CB0(UnkStruct_ov23_02250CD4 * param0); -void ov23_02250CD4(UnkStruct_ov23_02250CD4 * param0); -void ov23_02250D2C(UnkStruct_ov23_02250CD4 * param0); -void ov23_02250D5C(UnkStruct_ov23_02250CD4 * param0); -void ov23_02251044(void * param0, u32 param1); -void * ov23_022511B0(UnkFuncPtr_ov23_0224F758 param0, FieldSystem * fieldSystem); -void ov23_02251238(UnkStruct_ov23_02250CD4 * param0, int param1, int param2); -void ov23_02251270(SysTask * param0, void * param1); +void ov23_02250184(UnkStruct_ov23_02250CD4 *param0); +void ov23_02250540(BmpList *param0, u32 param1, u8 param2); +void ov23_02250578(UnkStruct_ov23_02250CD4 *param0); +void ov23_02250598(UnkStruct_ov23_02250CD4 *param0); +void ov23_02250A50(UnkFuncPtr_ov23_0224F758 param0, FieldSystem *fieldSystem); +void ov23_02250C3C(BmpList *param0, u32 param1, u8 param2); +void ov23_02250CB0(UnkStruct_ov23_02250CD4 *param0); +void ov23_02250CD4(UnkStruct_ov23_02250CD4 *param0); +void ov23_02250D2C(UnkStruct_ov23_02250CD4 *param0); +void ov23_02250D5C(UnkStruct_ov23_02250CD4 *param0); +void ov23_02251044(void *param0, u32 param1); +void *ov23_022511B0(UnkFuncPtr_ov23_0224F758 param0, FieldSystem *fieldSystem); +void ov23_02251238(UnkStruct_ov23_02250CD4 *param0, int param1, int param2); +void ov23_02251270(SysTask *param0, void *param1); #endif // POKEPLATINUM_OV23_0224F294_H diff --git a/include/overlay023/ov23_0225128C.h b/include/overlay023/ov23_0225128C.h index 34af4cb43a..92588097de 100644 --- a/include/overlay023/ov23_0225128C.h +++ b/include/overlay023/ov23_0225128C.h @@ -4,12 +4,12 @@ #include "overlay023/struct_ov23_0224271C_decl.h" #include "overlay023/struct_ov23_02250CD4.h" -void ov23_0225128C(UnkStruct_ov23_02250CD4 * param0, int param1, int param2, int param3); -int ov23_022512D4(UnkStruct_ov23_0224271C * param0, int param1); -BOOL ov23_02251324(int param0, UnkStruct_ov23_0224271C * param1); -void ov23_022513B0(int param0, int param1, void * param2, void * param3); +void ov23_0225128C(UnkStruct_ov23_02250CD4 *param0, int param1, int param2, int param3); +int ov23_022512D4(UnkStruct_ov23_0224271C *param0, int param1); +BOOL ov23_02251324(int param0, UnkStruct_ov23_0224271C *param1); +void ov23_022513B0(int param0, int param1, void *param2, void *param3); int ov23_02251414(void); -void ov23_0225215C(int param0, int param1, void * param2, void * param3); -void ov23_02252178(int param0, int param1, void * param2, void * param3); +void ov23_0225215C(int param0, int param1, void *param2, void *param3); +void ov23_02252178(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_OV23_0225128C_H diff --git a/include/overlay023/ov23_022521F0.h b/include/overlay023/ov23_022521F0.h index f795a58fca..b406e9f469 100644 --- a/include/overlay023/ov23_022521F0.h +++ b/include/overlay023/ov23_022521F0.h @@ -4,16 +4,16 @@ #include "field/field_system_decl.h" #include "overlay023/struct_ov23_02250CD4.h" -int ov23_02252C70(void * param0); -void * ov23_02252C98(BOOL param0, FieldSystem * fieldSystem, int param2); +int ov23_02252C70(void *param0); +void *ov23_02252C98(BOOL param0, FieldSystem *fieldSystem, int param2); int ov23_02252C9C(int param0); void ov23_02252CD4(void); void ov23_02252CE0(int param0, int param1); void ov23_02252CF4(int param0, int param1); void ov23_02252D08(int param0, int param1); -void ov23_02252D74(UnkStruct_ov23_02250CD4 * param0, int param1); -void ov23_02252DF4(UnkStruct_ov23_02250CD4 * param0); -void ov23_02252E18(UnkStruct_ov23_02250CD4 * param0); -void ov23_022534A0(FieldSystem * fieldSystem); +void ov23_02252D74(UnkStruct_ov23_02250CD4 *param0, int param1); +void ov23_02252DF4(UnkStruct_ov23_02250CD4 *param0); +void ov23_02252E18(UnkStruct_ov23_02250CD4 *param0); +void ov23_022534A0(FieldSystem *fieldSystem); #endif // POKEPLATINUM_OV23_022521F0_H diff --git a/include/overlay023/ov23_02253598.h b/include/overlay023/ov23_02253598.h index 2b261eff6f..dbea306de7 100644 --- a/include/overlay023/ov23_02253598.h +++ b/include/overlay023/ov23_02253598.h @@ -2,27 +2,29 @@ #define POKEPLATINUM_OV23_02253598_H #include "struct_decls/struct_02018340_decl.h" -#include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_020298B0_decl.h" -#include "savedata.h" -#include "overlay023/struct_ov23_02253598_decl.h" + #include "overlay023/funcptr_ov23_02253834.h" +#include "overlay023/struct_ov23_02253598_decl.h" + +#include "savedata.h" +#include "trainer_info.h" -void ov23_02253598(UnkStruct_ov23_02253598 * param0, SecretBaseRecord * param1, SaveData * param2); +void ov23_02253598(UnkStruct_ov23_02253598 *param0, SecretBaseRecord *param1, SaveData *param2); void ov23_022535CC(void); void ov23_022535EC(void); void ov23_02253604(void); int ov23_02253608(void); -void ov23_02253834(BGL * param0, TrainerInfo * param1, UnkFuncPtr_ov23_02253834 param2, void * param3, BOOL param4); +void ov23_02253834(BGL *param0, TrainerInfo *param1, UnkFuncPtr_ov23_02253834 param2, void *param3, BOOL param4); void ov23_022538FC(int param0); void ov23_02253968(void); -void ov23_02253998(int param0, int param1, void * param2, void * param3); -void ov23_022539A8(int param0, int param1, void * param2, void * param3); +void ov23_02253998(int param0, int param1, void *param2, void *param3); +void ov23_022539A8(int param0, int param1, void *param2, void *param3); BOOL ov23_022539D8(void); void ov23_022539E8(void); -void ov23_02253A00(SecretBaseRecord * param0, int param1); -void * ov23_02253C64(BGL * param0, TrainerInfo * param1, UndergroundData * param2, UnkFuncPtr_ov23_02253834 param3, void * param4); -void ov23_02253D10(void * param0); +void ov23_02253A00(SecretBaseRecord *param0, int param1); +void *ov23_02253C64(BGL *param0, TrainerInfo *param1, UndergroundData *param2, UnkFuncPtr_ov23_02253834 param3, void *param4); +void ov23_02253D10(void *param0); #endif // POKEPLATINUM_OV23_02253598_H diff --git a/include/overlay023/ov23_02253D40.h b/include/overlay023/ov23_02253D40.h index bcc358208b..dcc3dd97fc 100644 --- a/include/overlay023/ov23_02253D40.h +++ b/include/overlay023/ov23_02253D40.h @@ -1,44 +1,46 @@ #ifndef POKEPLATINUM_OV23_02253D40_H #define POKEPLATINUM_OV23_02253D40_H -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "trainer_info.h" + #include "overlay023/struct_ov23_02253E2C_decl.h" #include "overlay023/struct_ov23_02253F60.h" #include "overlay084/struct_ov84_02240FA8.h" -const UnkStruct_ov84_02240FA8 * ov23_02253D40(void); -UnkStruct_ov23_02253E2C * ov23_02253D48(int param0, int param1, BGL * param2, int param3, int param4); -void ov23_02253DD8(UnkStruct_ov23_02253E2C * param0); -void ov23_02253DFC(UnkStruct_ov23_02253E2C * param0, int param1, int param2); -void ov23_02253E2C(UnkStruct_ov23_02253E2C * param0, BGL * param1, u16 param2, u16 param3); -MessageLoader * ov23_02253E3C(UnkStruct_ov23_02253E2C * param0); -int ov23_02253F40(UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3); -int ov23_02253F60(UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3); -int ov23_02253F78(UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3, int param4); -void ov23_02253F98(UnkStruct_ov23_02253E2C * param0); -void ov23_02254044(UnkStruct_ov23_02253E2C * param0); -void ov23_02254050(UnkStruct_ov23_02253E2C * param0, TrainerInfo * param1); -void ov23_02254068(UnkStruct_ov23_02253E2C * param0, TrainerInfo * param1); -void ov23_02254080(UnkStruct_ov23_02253E2C * param0, int param1); -void ov23_02254098(UnkStruct_ov23_02253E2C * param0, int param1); -void ov23_022540B0(UnkStruct_ov23_02253E2C * param0, int param1); -void ov23_022540C8(UnkStruct_ov23_02253E2C * param0, int param1); -void ov23_022540E0(UnkStruct_ov23_02253E2C * param0, int param1, int param2); -void ov23_022540F4(UnkStruct_ov23_02253E2C * param0, int param1); -void ov23_0225410C(UnkStruct_ov23_02253E2C * param0, int param1, int param2); -void ov23_0225412C(UnkStruct_ov23_02253E2C * param0, int param1); -void ov23_02254154(UnkStruct_ov23_02253E2C * param0, int param1, int param2); -void ov23_02254178(UnkStruct_ov23_02253E2C * param0, int param1); -void ov23_022541A0(UnkStruct_ov23_02253E2C * param0, int param1, int param2); -void ov23_022541B4(UnkStruct_ov23_02253E2C * param0, int param1, int param2); -void ov23_022541C8(UnkStruct_ov23_02253E2C * param0, int param1, int param2); -void ov23_022541DC(UnkStruct_ov23_02253E2C * param0, int param1, int param2); -void ov23_022541F0(UnkStruct_ov23_02253E2C * param0, int param1, int param2); -void ov23_02254204(UnkStruct_ov23_02253E2C * param0, int param1); -void ov23_02254210(UnkStruct_ov23_02253E2C * param0); -BOOL ov23_02254238(UnkStruct_ov23_02253E2C * param0); -void ov23_02254250(UnkStruct_ov23_02253E2C * param0); +#include "message.h" +#include "trainer_info.h" + +const UnkStruct_ov84_02240FA8 *ov23_02253D40(void); +UnkStruct_ov23_02253E2C *ov23_02253D48(int param0, int param1, BGL *param2, int param3, int param4); +void ov23_02253DD8(UnkStruct_ov23_02253E2C *param0); +void ov23_02253DFC(UnkStruct_ov23_02253E2C *param0, int param1, int param2); +void ov23_02253E2C(UnkStruct_ov23_02253E2C *param0, BGL *param1, u16 param2, u16 param3); +MessageLoader *ov23_02253E3C(UnkStruct_ov23_02253E2C *param0); +int ov23_02253F40(UnkStruct_ov23_02253E2C *param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3); +int ov23_02253F60(UnkStruct_ov23_02253E2C *param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3); +int ov23_02253F78(UnkStruct_ov23_02253E2C *param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3, int param4); +void ov23_02253F98(UnkStruct_ov23_02253E2C *param0); +void ov23_02254044(UnkStruct_ov23_02253E2C *param0); +void ov23_02254050(UnkStruct_ov23_02253E2C *param0, TrainerInfo *param1); +void ov23_02254068(UnkStruct_ov23_02253E2C *param0, TrainerInfo *param1); +void ov23_02254080(UnkStruct_ov23_02253E2C *param0, int param1); +void ov23_02254098(UnkStruct_ov23_02253E2C *param0, int param1); +void ov23_022540B0(UnkStruct_ov23_02253E2C *param0, int param1); +void ov23_022540C8(UnkStruct_ov23_02253E2C *param0, int param1); +void ov23_022540E0(UnkStruct_ov23_02253E2C *param0, int param1, int param2); +void ov23_022540F4(UnkStruct_ov23_02253E2C *param0, int param1); +void ov23_0225410C(UnkStruct_ov23_02253E2C *param0, int param1, int param2); +void ov23_0225412C(UnkStruct_ov23_02253E2C *param0, int param1); +void ov23_02254154(UnkStruct_ov23_02253E2C *param0, int param1, int param2); +void ov23_02254178(UnkStruct_ov23_02253E2C *param0, int param1); +void ov23_022541A0(UnkStruct_ov23_02253E2C *param0, int param1, int param2); +void ov23_022541B4(UnkStruct_ov23_02253E2C *param0, int param1, int param2); +void ov23_022541C8(UnkStruct_ov23_02253E2C *param0, int param1, int param2); +void ov23_022541DC(UnkStruct_ov23_02253E2C *param0, int param1, int param2); +void ov23_022541F0(UnkStruct_ov23_02253E2C *param0, int param1, int param2); +void ov23_02254204(UnkStruct_ov23_02253E2C *param0, int param1); +void ov23_02254210(UnkStruct_ov23_02253E2C *param0); +BOOL ov23_02254238(UnkStruct_ov23_02253E2C *param0); +void ov23_02254250(UnkStruct_ov23_02253E2C *param0); #endif // POKEPLATINUM_OV23_02253D40_H diff --git a/include/overlay023/ov23_022542CC.h b/include/overlay023/ov23_022542CC.h index 443d8f074d..4d971c80b8 100644 --- a/include/overlay023/ov23_022542CC.h +++ b/include/overlay023/ov23_022542CC.h @@ -5,16 +5,16 @@ #include "overlay023/struct_ov23_022542D8_decl.h" #include "overlay023/struct_ov23_02254594_decl.h" -UnkStruct_ov23_022542D8 * ov23_022542CC(void); -void ov23_022542D8(UnkStruct_ov23_022542D8 * param0, FieldSystem * fieldSystem, u16 * param2, u16 * param3); -void ov23_0225430C(UnkStruct_ov23_022542D8 * param0); -const u32 ov23_02254314(UnkStruct_ov23_022542D8 * param0); -BOOL ov23_02254318(UnkStruct_ov23_022542D8 * param0); -UnkStruct_ov23_02254594 * ov23_02254588(void); -void ov23_02254594(UnkStruct_ov23_02254594 * param0, FieldSystem * fieldSystem, u16 * param2, u16 * param3); -void ov23_022545C4(UnkStruct_ov23_02254594 * param0, const u8 param1, const u8 param2); -void ov23_022545D0(UnkStruct_ov23_02254594 * param0); -const u32 ov23_022545D8(UnkStruct_ov23_02254594 * param0); -BOOL ov23_022545DC(UnkStruct_ov23_02254594 * param0); +UnkStruct_ov23_022542D8 *ov23_022542CC(void); +void ov23_022542D8(UnkStruct_ov23_022542D8 *param0, FieldSystem *fieldSystem, u16 *param2, u16 *param3); +void ov23_0225430C(UnkStruct_ov23_022542D8 *param0); +const u32 ov23_02254314(UnkStruct_ov23_022542D8 *param0); +BOOL ov23_02254318(UnkStruct_ov23_022542D8 *param0); +UnkStruct_ov23_02254594 *ov23_02254588(void); +void ov23_02254594(UnkStruct_ov23_02254594 *param0, FieldSystem *fieldSystem, u16 *param2, u16 *param3); +void ov23_022545C4(UnkStruct_ov23_02254594 *param0, const u8 param1, const u8 param2); +void ov23_022545D0(UnkStruct_ov23_02254594 *param0); +const u32 ov23_022545D8(UnkStruct_ov23_02254594 *param0); +BOOL ov23_022545DC(UnkStruct_ov23_02254594 *param0); #endif // POKEPLATINUM_OV23_022542CC_H diff --git a/include/overlay023/ov23_02254A14.h b/include/overlay023/ov23_02254A14.h index 8691f295cf..d8813fe63e 100644 --- a/include/overlay023/ov23_02254A14.h +++ b/include/overlay023/ov23_02254A14.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV23_02254A14_H #define POKEPLATINUM_OV23_02254A14_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" -void ov23_02254D98(FieldSystem * fieldSystem, TaskManager * param1); +#include "field/field_system_decl.h" + +void ov23_02254D98(FieldSystem *fieldSystem, TaskManager *param1); #endif // POKEPLATINUM_OV23_02254A14_H diff --git a/include/overlay023/struct_ov23_02248D20.h b/include/overlay023/struct_ov23_02248D20.h index 5fb28a3386..f2df37575f 100644 --- a/include/overlay023/struct_ov23_02248D20.h +++ b/include/overlay023/struct_ov23_02248D20.h @@ -5,14 +5,15 @@ #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_020298B0_decl.h" + #include "overlay023/funcptr_ov23_02248D20.h" typedef struct { UnkFuncPtr_ov23_02248D20 unk_00; - UndergroundData * unk_04; - ResourceMetadata * unk_08; - BmpList * unk_0C; - UnkStruct_020149F0 * unk_10; + UndergroundData *unk_04; + ResourceMetadata *unk_08; + BmpList *unk_0C; + UnkStruct_020149F0 *unk_10; u16 unk_14; u16 unk_16; u16 unk_18; diff --git a/include/overlay023/struct_ov23_02250CD4.h b/include/overlay023/struct_ov23_02250CD4.h index f224f8c7d8..0278a77483 100644 --- a/include/overlay023/struct_ov23_02250CD4.h +++ b/include/overlay023/struct_ov23_02250CD4.h @@ -1,53 +1,55 @@ #ifndef POKEPLATINUM_STRUCT_OV23_02250CD4_H #define POKEPLATINUM_STRUCT_OV23_02250CD4_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "string_template.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02013A04_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "field/field_system_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0206A844.h" + +#include "field/field_system_decl.h" #include "overlay005/struct_ov5_021D30A8.h" -#include "overlay023/struct_ov23_02248D20.h" #include "overlay023/funcptr_ov23_0224F758.h" #include "overlay023/funcptr_ov23_0224FD84.h" #include "overlay023/funcptr_ov23_0224FE38.h" #include "overlay023/funcptr_ov23_0225021C.h" #include "overlay023/funcptr_ov23_022515D8.h" +#include "overlay023/struct_ov23_02248D20.h" + +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" typedef struct { - void * unk_00; - SysTask * unk_04; - UnkStruct_0206A844 * unk_08; - FieldSystem * fieldSystem; + void *unk_00; + SysTask *unk_04; + UnkStruct_0206A844 *unk_08; + FieldSystem *fieldSystem; Window unk_10; Window unk_20; Window unk_30; - ResourceMetadata * unk_40; - ResourceMetadata * unk_44; - BmpList * unk_48; - UnkStruct_ov23_02248D20 * unk_4C; - BmpList * unk_50; - UIControlData * unk_54; - ResourceMetadata * unk_58; - UIControlData * unk_5C; + ResourceMetadata *unk_40; + ResourceMetadata *unk_44; + BmpList *unk_48; + UnkStruct_ov23_02248D20 *unk_4C; + BmpList *unk_50; + UIControlData *unk_54; + ResourceMetadata *unk_58; + UIControlData *unk_5C; UnkFuncPtr_ov23_022515D8 unk_60; UnkFuncPtr_ov23_022515D8 unk_64; - Strbuf* unk_68; - Strbuf* unk_6C; - StringTemplate * unk_70; + Strbuf *unk_68; + Strbuf *unk_6C; + StringTemplate *unk_70; UnkStruct_ov5_021D30A8 unk_74; - CellActorData * unk_23C[8]; + CellActorData *unk_23C[8]; u32 unk_25C; UnkFuncPtr_ov23_0224F758 unk_260; UnkFuncPtr_ov23_0224FE38 unk_264; UnkFuncPtr_ov23_0224FD84 unk_268; UnkFuncPtr_ov23_0225021C unk_26C; - void * unk_270; + void *unk_270; u8 unk_274[5]; u8 unk_279[5]; u8 unk_27E[5]; diff --git a/include/overlay023/struct_ov23_02253F60.h b/include/overlay023/struct_ov23_02253F60.h index b45e1292d3..1c0d229e0f 100644 --- a/include/overlay023/struct_ov23_02253F60.h +++ b/include/overlay023/struct_ov23_02253F60.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV23_02253F60_H #define POKEPLATINUM_STRUCT_OV23_02253F60_H -typedef void (* UnkStruct_ov23_02253F60)(int); +typedef void (*UnkStruct_ov23_02253F60)(int); #endif // POKEPLATINUM_STRUCT_OV23_02253F60_H diff --git a/include/overlay024/ov24_02253CE0.h b/include/overlay024/ov24_02253CE0.h index 10521603cd..437541ca41 100644 --- a/include/overlay024/ov24_02253CE0.h +++ b/include/overlay024/ov24_02253CE0.h @@ -3,8 +3,8 @@ #include "struct_decls/struct_02018340_decl.h" -void ov24_02253CE0(BGL * param0); -void ov24_02253DA4(BGL * param0); -BOOL ov24_02253DB4(BGL * param0); +void ov24_02253CE0(BGL *param0); +void ov24_02253DA4(BGL *param0); +BOOL ov24_02253DB4(BGL *param0); #endif // POKEPLATINUM_OV24_02253CE0_H diff --git a/include/overlay025/ov25_02254560.h b/include/overlay025/ov25_02254560.h index 5ad852fcdd..3eeb4b0008 100644 --- a/include/overlay025/ov25_02254560.h +++ b/include/overlay025/ov25_02254560.h @@ -1,23 +1,24 @@ #ifndef POKEPLATINUM_OV25_02254560_H #define POKEPLATINUM_OV25_02254560_H +#include + #include "struct_decls/struct_02018340_decl.h" + #include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_02254560_1.h" #include "overlay025/struct_ov25_02254560_decl.h" #include "overlay025/struct_ov25_022555E8_decl.h" -#include - -BOOL ov25_02254560(UnkStruct_ov25_02254560 ** param0, const UnkStruct_ov25_02254560_1 * param1, NNSG2dOamManagerInstance * param2, PoketchSystem *poketchSys); -UnkStruct_ov25_022555E8 * ov25_02254664(void); -BGL * ov25_02254674(void); +BOOL ov25_02254560(UnkStruct_ov25_02254560 **param0, const UnkStruct_ov25_02254560_1 *param1, NNSG2dOamManagerInstance *param2, PoketchSystem *poketchSys); +UnkStruct_ov25_022555E8 *ov25_02254664(void); +BGL *ov25_02254674(void); void ov25_022546B8(u32 param0, u32 param1); void ov25_022546F0(u32 param0, u32 param1); -void ov25_02254728(u16 * param0); -void ov25_02254754(UnkStruct_ov25_02254560 * param0); -void ov25_022547D0(UnkStruct_ov25_02254560 * param0, u32 param1); -BOOL ov25_022547F4(UnkStruct_ov25_02254560 * param0, u32 param1); -BOOL ov25_02254800(UnkStruct_ov25_02254560 * param0); +void ov25_02254728(u16 *param0); +void ov25_02254754(UnkStruct_ov25_02254560 *param0); +void ov25_022547D0(UnkStruct_ov25_02254560 *param0, u32 param1); +BOOL ov25_022547F4(UnkStruct_ov25_02254560 *param0, u32 param1); +BOOL ov25_02254800(UnkStruct_ov25_02254560 *param0); #endif // POKEPLATINUM_OV25_02254560_H diff --git a/include/overlay025/ov25_02255090.h b/include/overlay025/ov25_02255090.h index 9f1635ddbb..80071acf10 100644 --- a/include/overlay025/ov25_02255090.h +++ b/include/overlay025/ov25_02255090.h @@ -2,25 +2,26 @@ #define POKEPLATINUM_OV25_02255090_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" -void ov25_02255090(u32 * param0, u32 param1); -BOOL ov25_02255130(u32 * param0, u32 param1); -BOOL ov25_02255154(u32 * param0); -void ov25_0225517C(const UnkStruct_ov25_0225517C * param0, u32 param1, void * param2, const void * param3, u32 * param4, u32 param5, u32 param6); -void ov25_02255224(u32 * param0, UnkStruct_ov25_02255224 * param1); -void * ov25_0225523C(UnkStruct_ov25_02255224 * param0); -const void * ov25_02255240(UnkStruct_ov25_02255224 * param0); -void * ov25_02255244(UnkStruct_ov25_02255224 * param0); -u32 ov25_02255248(UnkStruct_ov25_02255224 * param0); -void ov25_0225524C(UnkStruct_ov25_02255224 * param0); -void ov25_02255254(UnkStruct_ov25_02255224 * param0, u32 param1); -void ov25_02255258(u16 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); -void ov25_02255290(u16 * param0, u32 param1); +void ov25_02255090(u32 *param0, u32 param1); +BOOL ov25_02255130(u32 *param0, u32 param1); +BOOL ov25_02255154(u32 *param0); +void ov25_0225517C(const UnkStruct_ov25_0225517C *param0, u32 param1, void *param2, const void *param3, u32 *param4, u32 param5, u32 param6); +void ov25_02255224(u32 *param0, UnkStruct_ov25_02255224 *param1); +void *ov25_0225523C(UnkStruct_ov25_02255224 *param0); +const void *ov25_02255240(UnkStruct_ov25_02255224 *param0); +void *ov25_02255244(UnkStruct_ov25_02255224 *param0); +u32 ov25_02255248(UnkStruct_ov25_02255224 *param0); +void ov25_0225524C(UnkStruct_ov25_02255224 *param0); +void ov25_02255254(UnkStruct_ov25_02255224 *param0, u32 param1); +void ov25_02255258(u16 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); +void ov25_02255290(u16 *param0, u32 param1); void ov25_02255308(u32 param0, u32 param1); void ov25_02255360(u32 param0); -void ov25_022553A0(u32 param0, const u32 * param1, u32 param2, BOOL param3); -void ov25_02255440(BGL * param0, u32 param1, u32 param2); +void ov25_022553A0(u32 param0, const u32 *param1, u32 param2, BOOL param3); +void ov25_02255440(BGL *param0, u32 param1, u32 param2); #endif // POKEPLATINUM_OV25_02255090_H diff --git a/include/overlay025/ov25_02255540.h b/include/overlay025/ov25_02255540.h index 30da49658c..0c01f01d8c 100644 --- a/include/overlay025/ov25_02255540.h +++ b/include/overlay025/ov25_02255540.h @@ -1,30 +1,30 @@ #ifndef POKEPLATINUM_OV25_02255540_H #define POKEPLATINUM_OV25_02255540_H +#include + #include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" #include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" -#include - -UnkStruct_ov25_022555E8 * ov25_02255540(NNSG2dOamManagerInstance * param0, u32 param1); -void ov25_022555E8(UnkStruct_ov25_022555E8 * param0); -void ov25_02255614(UnkStruct_ov25_022555E8 * param0); -UnkStruct_ov25_022558C4 * ov25_02255810(UnkStruct_ov25_022555E8 * param0, const UnkStruct_ov25_02255810 * param1, const UnkStruct_ov25_02255958 * param2); -void ov25_022558B0(UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_022558C4 * param1); -void ov25_022558C4(UnkStruct_ov25_022558C4 * param0, u32 param1); -BOOL ov25_022558E0(UnkStruct_ov25_022558C4 * param0); -void ov25_022558F0(UnkStruct_ov25_022558C4 * param0, fx32 param1, fx32 param2); -void ov25_02255900(UnkStruct_ov25_022558C4 * param0, fx32 param1, fx32 param2); -void ov25_02255908(const UnkStruct_ov25_022558C4 * param0, fx32 * param1, fx32 * param2); -void ov25_02255914(UnkStruct_ov25_022558C4 * param0, BOOL param1); -void ov25_0225591C(UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_022558C4 * param1, u32 param2); -void ov25_02255938(UnkStruct_ov25_022558C4 * param0, u32 param1); -void ov25_02255940(UnkStruct_ov25_022558C4 * param0, u32 param1); -void ov25_02255948(UnkStruct_ov25_022558C4 * param0, BOOL param1); -void ov25_02255950(UnkStruct_ov25_022558C4 * param0, u16 param1); -BOOL ov25_02255958(UnkStruct_ov25_02255958 * param0, u32 param1, u32 param2, u32 param3, int param4); -void ov25_022559B0(UnkStruct_ov25_02255958 * param0); +UnkStruct_ov25_022555E8 *ov25_02255540(NNSG2dOamManagerInstance *param0, u32 param1); +void ov25_022555E8(UnkStruct_ov25_022555E8 *param0); +void ov25_02255614(UnkStruct_ov25_022555E8 *param0); +UnkStruct_ov25_022558C4 *ov25_02255810(UnkStruct_ov25_022555E8 *param0, const UnkStruct_ov25_02255810 *param1, const UnkStruct_ov25_02255958 *param2); +void ov25_022558B0(UnkStruct_ov25_022555E8 *param0, UnkStruct_ov25_022558C4 *param1); +void ov25_022558C4(UnkStruct_ov25_022558C4 *param0, u32 param1); +BOOL ov25_022558E0(UnkStruct_ov25_022558C4 *param0); +void ov25_022558F0(UnkStruct_ov25_022558C4 *param0, fx32 param1, fx32 param2); +void ov25_02255900(UnkStruct_ov25_022558C4 *param0, fx32 param1, fx32 param2); +void ov25_02255908(const UnkStruct_ov25_022558C4 *param0, fx32 *param1, fx32 *param2); +void ov25_02255914(UnkStruct_ov25_022558C4 *param0, BOOL param1); +void ov25_0225591C(UnkStruct_ov25_022555E8 *param0, UnkStruct_ov25_022558C4 *param1, u32 param2); +void ov25_02255938(UnkStruct_ov25_022558C4 *param0, u32 param1); +void ov25_02255940(UnkStruct_ov25_022558C4 *param0, u32 param1); +void ov25_02255948(UnkStruct_ov25_022558C4 *param0, BOOL param1); +void ov25_02255950(UnkStruct_ov25_022558C4 *param0, u16 param1); +BOOL ov25_02255958(UnkStruct_ov25_02255958 *param0, u32 param1, u32 param2, u32 param3, int param4); +void ov25_022559B0(UnkStruct_ov25_02255958 *param0); #endif // POKEPLATINUM_OV25_02255540_H diff --git a/include/overlay025/ov25_02255DBC.h b/include/overlay025/ov25_02255DBC.h index b804419f4a..7f0a23aa33 100644 --- a/include/overlay025/ov25_02255DBC.h +++ b/include/overlay025/ov25_02255DBC.h @@ -1,8 +1,8 @@ #ifndef POKEPLATINUM_OV25_02255DBC_H #define POKEPLATINUM_OV25_02255DBC_H -void ov25_02255DBC(u32 param0, u32 param1, u32 * param2, u32 * param3); -void ov25_02255DFC(int param0, u32 * param1, u32 * param2); -BOOL ov25_02255E24(int param0, u32 * param1, u32 * param2); +void ov25_02255DBC(u32 param0, u32 param1, u32 *param2, u32 *param3); +void ov25_02255DFC(int param0, u32 *param1, u32 *param2); +BOOL ov25_02255E24(int param0, u32 *param1, u32 *param2); #endif // POKEPLATINUM_OV25_02255DBC_H diff --git a/include/overlay025/poketch_button.h b/include/overlay025/poketch_button.h index eca36dca23..a309c741e6 100644 --- a/include/overlay025/poketch_button.h +++ b/include/overlay025/poketch_button.h @@ -3,27 +3,27 @@ #include "touch_screen.h" -#define BUTTON_TIMER_MAX 0xffff +#define BUTTON_TIMER_MAX 0xffff #define BUTTON_MANAGER_NUM_TIMERS_PER_BUTTON 2 -typedef void (* PoketchButtonCallback)(u32, u32, u32, void *); +typedef void (*PoketchButtonCallback)(u32, u32, u32, void *); enum ButtonManagerState { - BUTTON_MANAGER_STATE_NULL = 0, - BUTTON_MANAGER_STATE_TOUCH, - BUTTON_MANAGER_STATE_DRAGGING, - BUTTON_MANAGER_STATE_TAP, - BUTTON_MANAGER_STATE_DOUBLE_TAP, - BUTTON_MANAGER_STATE_TIMER0, - BUTTON_MANAGER_STATE_TIMER1, - BUTTON_MANAGER_STATE_REPEAT, + BUTTON_MANAGER_STATE_NULL = 0, + BUTTON_MANAGER_STATE_TOUCH, + BUTTON_MANAGER_STATE_DRAGGING, + BUTTON_MANAGER_STATE_TAP, + BUTTON_MANAGER_STATE_DOUBLE_TAP, + BUTTON_MANAGER_STATE_TIMER0, + BUTTON_MANAGER_STATE_TIMER1, + BUTTON_MANAGER_STATE_REPEAT, }; /** Button states similar to a game input */ enum ButtonTouchState { - BUTTON_TOUCH_PRESSED = 0, //!< up last frame, down this frame - BUTTON_TOUCH_RELEASED, //!< down last frame, up this frame - BUTTON_TOUCH_DOWN, //!< down last frame, down this frame + BUTTON_TOUCH_PRESSED = 0, //!< up last frame, down this frame + BUTTON_TOUCH_RELEASED, //!< down last frame, up this frame + BUTTON_TOUCH_DOWN, //!< down last frame, down this frame }; /** States in the Button State Machine */ @@ -47,15 +47,15 @@ typedef struct PoketchButton { } PoketchButton; typedef struct PoketchButtonManager { - const TouchScreenHitTable * hitTable; + const TouchScreenHitTable *hitTable; PoketchButtonCallback callback; u32 heapID; u32 numButtons; - void * buttonCallbackData; - PoketchButton * buttons; + void *buttonCallbackData; + PoketchButton *buttons; } PoketchButtonManager; -PoketchButtonManager * PoketchButtonManager_New(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID); +PoketchButtonManager *PoketchButtonManager_New(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID); void PoketchButtonManager_Free(PoketchButtonManager *buttonManager); void PoketchButtonManager_Update(PoketchButtonManager *buttonManager); void PoketchButtonManager_SetButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time); diff --git a/include/overlay025/poketch_system.h b/include/overlay025/poketch_system.h index 8742d2529d..c10317d93b 100644 --- a/include/overlay025/poketch_system.h +++ b/include/overlay025/poketch_system.h @@ -1,18 +1,19 @@ #ifndef POKEPLATINUM_POKETCH_SYSTEM_H #define POKEPLATINUM_POKETCH_SYSTEM_H +#include + #include "struct_decls/struct_02018340_decl.h" + #include "field/field_system_decl.h" +#include "overlay025/poketch_button.h" +#include "overlay025/struct_ov25_02254560_1.h" +#include "overlay025/struct_ov25_02254560_decl.h" + #include "poketch_data.h" #include "savedata.h" #include "sys_task_manager.h" -#include "overlay025/struct_ov25_02254560_decl.h" -#include "overlay025/struct_ov25_02254560_1.h" -#include "overlay025/poketch_button.h" - -#include - #define POKETCH_PEDOMETER_MAX 99999 #define POKETCH_SCREEN_MIN_X 16 @@ -67,16 +68,16 @@ enum PoketchBorderColor { enum PoketchEventID { POKETCH_EVENT_SLEEP = 0, POKETCH_EVENT_PLAYER_MOVED, - + POKETCH_EVENT_SAVE = 4, POKETCH_EVENT_PEDOMETER, }; typedef struct PoketchSystem PoketchSystem; -typedef BOOL (* PoketchAppInitFunction)(void **app, PoketchSystem *poketchSys, BGL *bgl, u32 appID); -typedef void (* PoketchAppShutdownFunction)(void *app); -typedef void (* PoketchAppSaveFunction)(void *app); +typedef BOOL (*PoketchAppInitFunction)(void **app, PoketchSystem *poketchSys, BGL *bgl, u32 appID); +typedef void (*PoketchAppShutdownFunction)(void *app); +typedef void (*PoketchAppSaveFunction)(void *app); struct PoketchSystem { u8 systemState; @@ -92,22 +93,22 @@ struct PoketchSystem { u32 appSkipTimer; enum PoketchAppID loadedAppID; FSOverlayID loadedAppOverlayID; - UnkStruct_ov25_02254560 * unk_1C; + UnkStruct_ov25_02254560 *unk_1C; UnkStruct_ov25_02254560_1 unk_20; - void * unk_24; + void *unk_24; PoketchButtonManager *buttonManager; u32 unk_2C; u32 unk_30; - PoketchSystem ** poketchSysPtr; - SysTask * unk_38; + PoketchSystem **poketchSysPtr; + SysTask *unk_38; PoketchAppInitFunction currAppInit; PoketchAppShutdownFunction currAppShutdown; PoketchAppSaveFunction currAppSave; - void * appSaveData; + void *appSaveData; BGL *bgl; - NNSG2dOamManagerInstance * oamManager; + NNSG2dOamManagerInstance *oamManager; SaveData *saveData; PoketchData *poketchData; @@ -125,7 +126,7 @@ void PoketchSystem_SetAppFunctions(PoketchAppInitFunction initFunction, PoketchA void PoketchSystem_NotifyAppLoaded(PoketchSystem *poketchSys); void PoketchSystem_NotifyAppUnloaded(PoketchSystem *poketchSys); void PoketchSystem_SetSaveFunction(PoketchAppSaveFunction saveFunction, void *saveData); -UnkStruct_ov25_02254560 * ov25_02254418(void); +UnkStruct_ov25_02254560 *ov25_02254418(void); void PoketchSystem_PlaySoundEffect(u32 soundID); void ov25_02254444(u32 param0, u32 param1); BOOL PoketchSystem_GetDisplayHeldCoords(u32 *x, u32 *y); @@ -134,9 +135,9 @@ BOOL ov25_0225450C(const PoketchSystem *poketchSys); void ov25_02254518(const PoketchSystem *poketchSys, PoketchButtonManager *buttonManager); BOOL PoketchSystem_IsPlayerMoving(const PoketchSystem *poketchSys); BOOL PoketchSystem_PedometerUpdated(const PoketchSystem *poketchSys); -FieldSystem * PoketchSystem_GetFieldSystem(const PoketchSystem *poketchSys); -PoketchData * PoketchSystem_GetPoketchData(const PoketchSystem *poketchSys); -SaveData * PoketchSystem_GetSaveData(const PoketchSystem *poketchSys); +FieldSystem *PoketchSystem_GetFieldSystem(const PoketchSystem *poketchSys); +PoketchData *PoketchSystem_GetPoketchData(const PoketchSystem *poketchSys); +SaveData *PoketchSystem_GetSaveData(const PoketchSystem *poketchSys); int PoketchSystem_GetBorderColor(const PoketchSystem *poketchSys); #endif // POKEPLATINUM_POKETCH_SYSTEM_H diff --git a/include/overlay025/struct_ov25_02255810.h b/include/overlay025/struct_ov25_02255810.h index 94000f14a8..a439cb2473 100644 --- a/include/overlay025/struct_ov25_02255810.h +++ b/include/overlay025/struct_ov25_02255810.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV25_02255810_H #define POKEPLATINUM_STRUCT_OV25_02255810_H - #include typedef struct { diff --git a/include/overlay025/struct_ov25_02255958.h b/include/overlay025/struct_ov25_02255958.h index 69f55795b4..af58fea2c5 100644 --- a/include/overlay025/struct_ov25_02255958.h +++ b/include/overlay025/struct_ov25_02255958.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV25_02255958_H #define POKEPLATINUM_STRUCT_OV25_02255958_H - #include typedef struct { - void * unk_00; - void * unk_04; - NNSG2dCellDataBank * unk_08; - NNSG2dAnimBankData * unk_0C; + void *unk_00; + void *unk_04; + NNSG2dCellDataBank *unk_08; + NNSG2dAnimBankData *unk_0C; u32 unk_10; } UnkStruct_ov25_02255958; diff --git a/include/overlay026/ov26_02256404.h b/include/overlay026/ov26_02256404.h index 20f0df5a6c..f753d30ac1 100644 --- a/include/overlay026/ov26_02256404.h +++ b/include/overlay026/ov26_02256404.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV26_02256404_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay026/struct_ov26_02256404_1.h" #include "overlay026/struct_ov26_02256404_decl.h" -BOOL ov26_02256404(UnkStruct_ov26_02256404 ** param0, const UnkStruct_ov26_02256404_1 * param1, BGL * param2); -void ov26_0225649C(UnkStruct_ov26_02256404 * param0); -void ov26_022564A8(UnkStruct_ov26_02256404 * param0, u32 param1); -BOOL ov26_022564CC(UnkStruct_ov26_02256404 * param0, u32 param1); -BOOL ov26_022564D8(UnkStruct_ov26_02256404 * param0); +BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_02256404_1 *param1, BGL *param2); +void ov26_0225649C(UnkStruct_ov26_02256404 *param0); +void ov26_022564A8(UnkStruct_ov26_02256404 *param0, u32 param1); +BOOL ov26_022564CC(UnkStruct_ov26_02256404 *param0, u32 param1); +BOOL ov26_022564D8(UnkStruct_ov26_02256404 *param0); #endif // POKEPLATINUM_OV26_02256404_H diff --git a/include/overlay026/struct_ov26_02256404_1.h b/include/overlay026/struct_ov26_02256404_1.h index 0061ad119c..1b35341c26 100644 --- a/include/overlay026/struct_ov26_02256404_1.h +++ b/include/overlay026/struct_ov26_02256404_1.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV26_02256404_1_H #define POKEPLATINUM_STRUCT_OV26_02256404_1_H - #include typedef struct { diff --git a/include/overlay027/ov27_0225680C.h b/include/overlay027/ov27_0225680C.h index 019aef0eca..bf91fb5c13 100644 --- a/include/overlay027/ov27_0225680C.h +++ b/include/overlay027/ov27_0225680C.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV27_0225680C_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay027/struct_ov27_0225680C_1.h" #include "overlay027/struct_ov27_0225680C_decl.h" -BOOL ov27_0225680C(UnkStruct_ov27_0225680C ** param0, const UnkStruct_ov27_0225680C_1 * param1, BGL * param2); -void ov27_02256890(UnkStruct_ov27_0225680C * param0); -void ov27_022569C8(UnkStruct_ov27_0225680C * param0, u32 param1); -BOOL ov27_022569EC(UnkStruct_ov27_0225680C * param0, u32 param1); -BOOL ov27_022569F8(UnkStruct_ov27_0225680C * param0); +BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_0225680C_1 *param1, BGL *param2); +void ov27_02256890(UnkStruct_ov27_0225680C *param0); +void ov27_022569C8(UnkStruct_ov27_0225680C *param0, u32 param1); +BOOL ov27_022569EC(UnkStruct_ov27_0225680C *param0, u32 param1); +BOOL ov27_022569F8(UnkStruct_ov27_0225680C *param0); #endif // POKEPLATINUM_OV27_0225680C_H diff --git a/include/overlay028/ov28_0225697C.h b/include/overlay028/ov28_0225697C.h index 8157074448..db467c7fb9 100644 --- a/include/overlay028/ov28_0225697C.h +++ b/include/overlay028/ov28_0225697C.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV28_0225697C_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay028/struct_ov28_0225697C_1.h" #include "overlay028/struct_ov28_0225697C_decl.h" -BOOL ov28_0225697C(UnkStruct_ov28_0225697C ** param0, const UnkStruct_ov28_0225697C_1 * param1, BGL * param2); -void ov28_022569AC(UnkStruct_ov28_0225697C * param0); -void ov28_022569B8(UnkStruct_ov28_0225697C * param0, u32 param1); -BOOL ov28_022569DC(UnkStruct_ov28_0225697C * param0, u32 param1); -BOOL ov28_022569E8(UnkStruct_ov28_0225697C * param0); +BOOL ov28_0225697C(UnkStruct_ov28_0225697C **param0, const UnkStruct_ov28_0225697C_1 *param1, BGL *param2); +void ov28_022569AC(UnkStruct_ov28_0225697C *param0); +void ov28_022569B8(UnkStruct_ov28_0225697C *param0, u32 param1); +BOOL ov28_022569DC(UnkStruct_ov28_0225697C *param0, u32 param1); +BOOL ov28_022569E8(UnkStruct_ov28_0225697C *param0); #endif // POKEPLATINUM_OV28_0225697C_H diff --git a/include/overlay028/ov28_02256E9C.h b/include/overlay028/ov28_02256E9C.h index cd55cdb8f5..d335cfe776 100644 --- a/include/overlay028/ov28_02256E9C.h +++ b/include/overlay028/ov28_02256E9C.h @@ -3,19 +3,19 @@ #include "overlay028/struct_ov28_02256E9C_decl.h" -BOOL ov28_02256E9C(UnkStruct_ov28_02256E9C ** param0, u32 param1); -void ov28_02256EC0(UnkStruct_ov28_02256E9C * param0); -void ov28_02256EC8(UnkStruct_ov28_02256E9C * param0); -void ov28_02256ED8(UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1); -void ov28_02256EE8(const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1, UnkStruct_ov28_02256E9C * param2); -void ov28_02256F74(const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1, UnkStruct_ov28_02256E9C * param2); -void ov28_02257028(const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1, UnkStruct_ov28_02256E9C * param2); -void ov28_02257058(const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1, UnkStruct_ov28_02256E9C * param2); -BOOL ov28_0225717C(UnkStruct_ov28_02256E9C * param0, u32 param1); -BOOL ov28_022571B8(UnkStruct_ov28_02256E9C * param0, u32 param1); -BOOL ov28_022571F4(const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1); -BOOL ov28_02257240(const UnkStruct_ov28_02256E9C * param0, u32 param1); -BOOL ov28_0225726C(const UnkStruct_ov28_02256E9C * param0, u16 * param1); -s64 ov28_02257468(const UnkStruct_ov28_02256E9C * param0); +BOOL ov28_02256E9C(UnkStruct_ov28_02256E9C **param0, u32 param1); +void ov28_02256EC0(UnkStruct_ov28_02256E9C *param0); +void ov28_02256EC8(UnkStruct_ov28_02256E9C *param0); +void ov28_02256ED8(UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1); +void ov28_02256EE8(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1, UnkStruct_ov28_02256E9C *param2); +void ov28_02256F74(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1, UnkStruct_ov28_02256E9C *param2); +void ov28_02257028(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1, UnkStruct_ov28_02256E9C *param2); +void ov28_02257058(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1, UnkStruct_ov28_02256E9C *param2); +BOOL ov28_0225717C(UnkStruct_ov28_02256E9C *param0, u32 param1); +BOOL ov28_022571B8(UnkStruct_ov28_02256E9C *param0, u32 param1); +BOOL ov28_022571F4(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1); +BOOL ov28_02257240(const UnkStruct_ov28_02256E9C *param0, u32 param1); +BOOL ov28_0225726C(const UnkStruct_ov28_02256E9C *param0, u16 *param1); +s64 ov28_02257468(const UnkStruct_ov28_02256E9C *param0); #endif // POKEPLATINUM_OV28_02256E9C_H diff --git a/include/overlay028/struct_ov28_0225697C_1.h b/include/overlay028/struct_ov28_0225697C_1.h index a3bc30ba78..0cf3ba44cb 100644 --- a/include/overlay028/struct_ov28_0225697C_1.h +++ b/include/overlay028/struct_ov28_0225697C_1.h @@ -6,9 +6,9 @@ typedef struct { u16 unk_00; u16 unk_02; - UnkStruct_ov28_02256E9C * unk_04; - UnkStruct_ov28_02256E9C * unk_08; - UnkStruct_ov28_02256E9C * unk_0C; + UnkStruct_ov28_02256E9C *unk_04; + UnkStruct_ov28_02256E9C *unk_08; + UnkStruct_ov28_02256E9C *unk_0C; } UnkStruct_ov28_0225697C_1; #endif // POKEPLATINUM_STRUCT_OV28_0225697C_1_H diff --git a/include/overlay029/ov29_022566C8.h b/include/overlay029/ov29_022566C8.h index 448b95e836..5655d8c32d 100644 --- a/include/overlay029/ov29_022566C8.h +++ b/include/overlay029/ov29_022566C8.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV29_022566C8_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay029/struct_ov29_022566C8_1.h" #include "overlay029/struct_ov29_022566C8_decl.h" -BOOL ov29_022566C8(UnkStruct_ov29_022566C8 ** param0, const UnkStruct_ov29_022566C8_1 * param1, BGL * param2); -void ov29_02256770(UnkStruct_ov29_022566C8 * param0); -void ov29_022567B4(UnkStruct_ov29_022566C8 * param0, u32 param1); -BOOL ov29_022567D8(UnkStruct_ov29_022566C8 * param0, u32 param1); -BOOL ov29_022567E4(UnkStruct_ov29_022566C8 * param0); +BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566C8_1 *param1, BGL *param2); +void ov29_02256770(UnkStruct_ov29_022566C8 *param0); +void ov29_022567B4(UnkStruct_ov29_022566C8 *param0, u32 param1); +BOOL ov29_022567D8(UnkStruct_ov29_022566C8 *param0, u32 param1); +BOOL ov29_022567E4(UnkStruct_ov29_022566C8 *param0); #endif // POKEPLATINUM_OV29_022566C8_H diff --git a/include/overlay030/ov30_022563EC.h b/include/overlay030/ov30_022563EC.h index 898920d6c3..a9d6d502e2 100644 --- a/include/overlay030/ov30_022563EC.h +++ b/include/overlay030/ov30_022563EC.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV30_022563EC_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay030/struct_ov30_022563EC_1.h" #include "overlay030/struct_ov30_022563EC_decl.h" -BOOL ov30_022563EC(UnkStruct_ov30_022563EC ** param0, const UnkStruct_ov30_022563EC_1 * param1, BGL * param2); -void ov30_02256444(UnkStruct_ov30_022563EC * param0); -void ov30_02256464(UnkStruct_ov30_022563EC * param0, u32 param1); -BOOL ov30_02256488(UnkStruct_ov30_022563EC * param0, u32 param1); -BOOL ov30_02256494(UnkStruct_ov30_022563EC * param0); +BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563EC_1 *param1, BGL *param2); +void ov30_02256444(UnkStruct_ov30_022563EC *param0); +void ov30_02256464(UnkStruct_ov30_022563EC *param0, u32 param1); +BOOL ov30_02256488(UnkStruct_ov30_022563EC *param0, u32 param1); +BOOL ov30_02256494(UnkStruct_ov30_022563EC *param0); #endif // POKEPLATINUM_OV30_022563EC_H diff --git a/include/overlay030/struct_ov30_022563EC_1.h b/include/overlay030/struct_ov30_022563EC_1.h index 2d1948f498..e42c99c8d3 100644 --- a/include/overlay030/struct_ov30_022563EC_1.h +++ b/include/overlay030/struct_ov30_022563EC_1.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV30_022563EC_1_H #define POKEPLATINUM_STRUCT_OV30_022563EC_1_H - #include typedef struct { diff --git a/include/overlay031/ov31_02256554.h b/include/overlay031/ov31_02256554.h index fea78ae3cb..3544bb348a 100644 --- a/include/overlay031/ov31_02256554.h +++ b/include/overlay031/ov31_02256554.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV31_02256554_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay031/struct_ov31_02256554_1.h" #include "overlay031/struct_ov31_02256554_decl.h" -BOOL ov31_02256554(UnkStruct_ov31_02256554 ** param0, const UnkStruct_ov31_02256554_1 * param1, BGL * param2); -void ov31_02256584(UnkStruct_ov31_02256554 * param0); -void ov31_02256590(UnkStruct_ov31_02256554 * param0, u32 param1); -BOOL ov31_022565B4(UnkStruct_ov31_02256554 * param0, u32 param1); -BOOL ov31_022565C0(UnkStruct_ov31_02256554 * param0); +BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_02256554_1 *param1, BGL *param2); +void ov31_02256584(UnkStruct_ov31_02256554 *param0); +void ov31_02256590(UnkStruct_ov31_02256554 *param0, u32 param1); +BOOL ov31_022565B4(UnkStruct_ov31_02256554 *param0, u32 param1); +BOOL ov31_022565C0(UnkStruct_ov31_02256554 *param0); #endif // POKEPLATINUM_OV31_02256554_H diff --git a/include/overlay032/ov32_02256470.h b/include/overlay032/ov32_02256470.h index 55d907d903..ca584d9b96 100644 --- a/include/overlay032/ov32_02256470.h +++ b/include/overlay032/ov32_02256470.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_OV32_02256470_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay032/struct_ov32_02256470_1.h" #include "overlay032/struct_ov32_02256470_decl.h" -BOOL ov32_02256470(UnkStruct_ov32_02256470 ** param0, const UnkStruct_ov32_02256470_1 * param1, BGL * param2); -void ov32_02256508(UnkStruct_ov32_02256470 * param0); -void ov32_02256538(UnkStruct_ov32_02256470 * param0, u32 param1); -BOOL ov32_0225655C(UnkStruct_ov32_02256470 * param0, u32 param1); -BOOL ov32_02256568(UnkStruct_ov32_02256470 * param0); +BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_02256470_1 *param1, BGL *param2); +void ov32_02256508(UnkStruct_ov32_02256470 *param0); +void ov32_02256538(UnkStruct_ov32_02256470 *param0, u32 param1); +BOOL ov32_0225655C(UnkStruct_ov32_02256470 *param0, u32 param1); +BOOL ov32_02256568(UnkStruct_ov32_02256470 *param0); u32 ov32_02256B78(u32 param0, u32 param1, u32 param2); #endif // POKEPLATINUM_OV32_02256470_H diff --git a/include/overlay033/ov33_02256474.h b/include/overlay033/ov33_02256474.h index 7f3e2d4c4a..8849c96ab0 100644 --- a/include/overlay033/ov33_02256474.h +++ b/include/overlay033/ov33_02256474.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV33_02256474_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay033/struct_ov33_02256474_1.h" #include "overlay033/struct_ov33_02256474_decl.h" -BOOL ov33_02256474(UnkStruct_ov33_02256474 ** param0, const UnkStruct_ov33_02256474_1 * param1, BGL * param2); -void ov33_022564F0(UnkStruct_ov33_02256474 * param0); -void ov33_02256548(UnkStruct_ov33_02256474 * param0, u32 param1); -BOOL ov33_0225656C(UnkStruct_ov33_02256474 * param0, u32 param1); -BOOL ov33_02256578(UnkStruct_ov33_02256474 * param0); +BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_02256474_1 *param1, BGL *param2); +void ov33_022564F0(UnkStruct_ov33_02256474 *param0); +void ov33_02256548(UnkStruct_ov33_02256474 *param0, u32 param1); +BOOL ov33_0225656C(UnkStruct_ov33_02256474 *param0, u32 param1); +BOOL ov33_02256578(UnkStruct_ov33_02256474 *param0); #endif // POKEPLATINUM_OV33_02256474_H diff --git a/include/overlay034/ov34_02256540.h b/include/overlay034/ov34_02256540.h index 99a63e526a..94b229f9c8 100644 --- a/include/overlay034/ov34_02256540.h +++ b/include/overlay034/ov34_02256540.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_OV34_02256540_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay034/struct_ov34_02256540_1.h" #include "overlay034/struct_ov34_02256540_decl.h" -BOOL ov34_02256540(UnkStruct_ov34_02256540 ** param0, const UnkStruct_ov34_02256540_1 * param1, BGL * param2); -void ov34_02256604(UnkStruct_ov34_02256540 * param0); -void ov34_02256640(UnkStruct_ov34_02256540 * param0, u32 param1); -BOOL ov34_02256664(UnkStruct_ov34_02256540 * param0, u32 param1); -BOOL ov34_02256670(UnkStruct_ov34_02256540 * param0); -void ov34_02256A0C(UnkStruct_ov34_02256540 * param0); +BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_02256540_1 *param1, BGL *param2); +void ov34_02256604(UnkStruct_ov34_02256540 *param0); +void ov34_02256640(UnkStruct_ov34_02256540 *param0, u32 param1); +BOOL ov34_02256664(UnkStruct_ov34_02256540 *param0, u32 param1); +BOOL ov34_02256670(UnkStruct_ov34_02256540 *param0); +void ov34_02256A0C(UnkStruct_ov34_02256540 *param0); #endif // POKEPLATINUM_OV34_02256540_H diff --git a/include/overlay035/ov35_02256410.h b/include/overlay035/ov35_02256410.h index df70ece6e7..bc2094dd99 100644 --- a/include/overlay035/ov35_02256410.h +++ b/include/overlay035/ov35_02256410.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV35_02256410_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay035/struct_ov35_02256410_1.h" #include "overlay035/struct_ov35_02256410_decl.h" -BOOL ov35_02256410(UnkStruct_ov35_02256410 ** param0, const UnkStruct_ov35_02256410_1 * param1, BGL * param2); -void ov35_0225644C(UnkStruct_ov35_02256410 * param0); -void ov35_02256548(UnkStruct_ov35_02256410 * param0, u32 param1); -BOOL ov35_0225656C(UnkStruct_ov35_02256410 * param0, u32 param1); -BOOL ov35_02256578(UnkStruct_ov35_02256410 * param0); +BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_02256410_1 *param1, BGL *param2); +void ov35_0225644C(UnkStruct_ov35_02256410 *param0); +void ov35_02256548(UnkStruct_ov35_02256410 *param0, u32 param1); +BOOL ov35_0225656C(UnkStruct_ov35_02256410 *param0, u32 param1); +BOOL ov35_02256578(UnkStruct_ov35_02256410 *param0); #endif // POKEPLATINUM_OV35_02256410_H diff --git a/include/overlay036/poketch_app_pedometer.h b/include/overlay036/poketch_app_pedometer.h index eb1ee0db60..8509dfdb76 100644 --- a/include/overlay036/poketch_app_pedometer.h +++ b/include/overlay036/poketch_app_pedometer.h @@ -8,10 +8,10 @@ typedef struct { typedef struct UnkStruct_ov36_02256404_t UnkStruct_ov36_02256404; -BOOL ov36_02256404(UnkStruct_ov36_02256404 ** param0, const UnkStruct_ov36_02256404_1 * param1, BGL * param2); -void ov36_02256440(UnkStruct_ov36_02256404 * param0); -void ov36_0225653C(UnkStruct_ov36_02256404 * param0, u32 param1); -BOOL ov36_02256560(UnkStruct_ov36_02256404 * param0, u32 param1); -BOOL ov36_0225656C(UnkStruct_ov36_02256404 * param0); +BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_02256404_1 *param1, BGL *param2); +void ov36_02256440(UnkStruct_ov36_02256404 *param0); +void ov36_0225653C(UnkStruct_ov36_02256404 *param0, u32 param1); +BOOL ov36_02256560(UnkStruct_ov36_02256404 *param0, u32 param1); +BOOL ov36_0225656C(UnkStruct_ov36_02256404 *param0); #endif // POKEPLATINUM_POKETCH_APP_PEDOMETER_H diff --git a/include/overlay037/ov37_022563D4.h b/include/overlay037/ov37_022563D4.h index 75b6b1a5b1..7ff5a96b64 100644 --- a/include/overlay037/ov37_022563D4.h +++ b/include/overlay037/ov37_022563D4.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV37_022563D4_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay037/struct_ov37_022563D4_1.h" #include "overlay037/struct_ov37_022563D4_decl.h" -BOOL ov37_022563D4(UnkStruct_ov37_022563D4 ** param0, const UnkStruct_ov37_022563D4_1 * param1, BGL * param2); -void ov37_02256410(UnkStruct_ov37_022563D4 * param0); -void ov37_02256488(UnkStruct_ov37_022563D4 * param0, u32 param1); -BOOL ov37_022564AC(UnkStruct_ov37_022563D4 * param0, u32 param1); -BOOL ov37_022564B8(UnkStruct_ov37_022563D4 * param0); +BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563D4_1 *param1, BGL *param2); +void ov37_02256410(UnkStruct_ov37_022563D4 *param0); +void ov37_02256488(UnkStruct_ov37_022563D4 *param0, u32 param1); +BOOL ov37_022564AC(UnkStruct_ov37_022563D4 *param0, u32 param1); +BOOL ov37_022564B8(UnkStruct_ov37_022563D4 *param0); #endif // POKEPLATINUM_OV37_022563D4_H diff --git a/include/overlay038/ov38_0225632C.h b/include/overlay038/ov38_0225632C.h index ead82156d1..0850cd73a0 100644 --- a/include/overlay038/ov38_0225632C.h +++ b/include/overlay038/ov38_0225632C.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV38_0225632C_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay038/struct_ov38_0225632C_1.h" #include "overlay038/struct_ov38_0225632C_decl.h" -BOOL ov38_0225632C(UnkStruct_ov38_0225632C ** param0, const UnkStruct_ov38_0225632C_1 * param1, BGL * param2); -void ov38_0225635C(UnkStruct_ov38_0225632C * param0); -void ov38_02256368(UnkStruct_ov38_0225632C * param0, u32 param1); -BOOL ov38_0225638C(UnkStruct_ov38_0225632C * param0, u32 param1); -BOOL ov38_02256398(UnkStruct_ov38_0225632C * param0); +BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_0225632C_1 *param1, BGL *param2); +void ov38_0225635C(UnkStruct_ov38_0225632C *param0); +void ov38_02256368(UnkStruct_ov38_0225632C *param0, u32 param1); +BOOL ov38_0225638C(UnkStruct_ov38_0225632C *param0, u32 param1); +BOOL ov38_02256398(UnkStruct_ov38_0225632C *param0); #endif // POKEPLATINUM_OV38_0225632C_H diff --git a/include/overlay039/ov39_022563DC.h b/include/overlay039/ov39_022563DC.h index c319f83e90..8d2b07dc6e 100644 --- a/include/overlay039/ov39_022563DC.h +++ b/include/overlay039/ov39_022563DC.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV39_022563DC_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay039/struct_ov39_022563DC_1.h" #include "overlay039/struct_ov39_022563DC_decl.h" -BOOL ov39_022563DC(UnkStruct_ov39_022563DC ** param0, const UnkStruct_ov39_022563DC_1 * param1, BGL * param2); -void ov39_0225640C(UnkStruct_ov39_022563DC * param0); -void ov39_02256418(UnkStruct_ov39_022563DC * param0, u32 param1); -BOOL ov39_0225643C(UnkStruct_ov39_022563DC * param0, u32 param1); -BOOL ov39_02256448(UnkStruct_ov39_022563DC * param0); +BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563DC_1 *param1, BGL *param2); +void ov39_0225640C(UnkStruct_ov39_022563DC *param0); +void ov39_02256418(UnkStruct_ov39_022563DC *param0, u32 param1); +BOOL ov39_0225643C(UnkStruct_ov39_022563DC *param0, u32 param1); +BOOL ov39_02256448(UnkStruct_ov39_022563DC *param0); #endif // POKEPLATINUM_OV39_022563DC_H diff --git a/include/overlay040/ov40_0225645C.h b/include/overlay040/ov40_0225645C.h index 4a4dc741b5..ed0aa14b3b 100644 --- a/include/overlay040/ov40_0225645C.h +++ b/include/overlay040/ov40_0225645C.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV40_0225645C_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay040/struct_ov40_0225645C_1.h" #include "overlay040/struct_ov40_0225645C_decl.h" -BOOL ov40_0225645C(UnkStruct_ov40_0225645C ** param0, const UnkStruct_ov40_0225645C_1 * param1, BGL * param2); -void ov40_022564B8(UnkStruct_ov40_0225645C * param0); -void ov40_022565C8(UnkStruct_ov40_0225645C * param0, u32 param1); -BOOL ov40_022565EC(UnkStruct_ov40_0225645C * param0, u32 param1); -BOOL ov40_022565F8(UnkStruct_ov40_0225645C * param0); +BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_0225645C_1 *param1, BGL *param2); +void ov40_022564B8(UnkStruct_ov40_0225645C *param0); +void ov40_022565C8(UnkStruct_ov40_0225645C *param0, u32 param1); +BOOL ov40_022565EC(UnkStruct_ov40_0225645C *param0, u32 param1); +BOOL ov40_022565F8(UnkStruct_ov40_0225645C *param0); #endif // POKEPLATINUM_OV40_0225645C_H diff --git a/include/overlay041/ov41_022567B0.h b/include/overlay041/ov41_022567B0.h index 3f504ce01d..08c2363fce 100644 --- a/include/overlay041/ov41_022567B0.h +++ b/include/overlay041/ov41_022567B0.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV41_022567B0_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay041/struct_ov41_022567B0_1.h" #include "overlay041/struct_ov41_022567B0_decl.h" -BOOL ov41_022567B0(UnkStruct_ov41_022567B0 ** param0, const UnkStruct_ov41_022567B0_1 * param1, BGL * param2); -void ov41_022567F8(UnkStruct_ov41_022567B0 * param0); -void ov41_0225688C(UnkStruct_ov41_022567B0 * param0, u32 param1); -BOOL ov41_022568B0(UnkStruct_ov41_022567B0 * param0, u32 param1); -BOOL ov41_022568BC(UnkStruct_ov41_022567B0 * param0); +BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567B0_1 *param1, BGL *param2); +void ov41_022567F8(UnkStruct_ov41_022567B0 *param0); +void ov41_0225688C(UnkStruct_ov41_022567B0 *param0, u32 param1); +BOOL ov41_022568B0(UnkStruct_ov41_022567B0 *param0, u32 param1); +BOOL ov41_022568BC(UnkStruct_ov41_022567B0 *param0); #endif // POKEPLATINUM_OV41_022567B0_H diff --git a/include/overlay042/ov42_022563D4.h b/include/overlay042/ov42_022563D4.h index a513c03dc2..7aadde08f9 100644 --- a/include/overlay042/ov42_022563D4.h +++ b/include/overlay042/ov42_022563D4.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV42_022563D4_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay042/struct_ov42_022563D4_1.h" #include "overlay042/struct_ov42_022563D4_decl.h" -BOOL ov42_022563D4(UnkStruct_ov42_022563D4 ** param0, const UnkStruct_ov42_022563D4_1 * param1, BGL * param2); -void ov42_0225648C(UnkStruct_ov42_022563D4 * param0); -void ov42_022564A0(UnkStruct_ov42_022563D4 * param0, u32 param1); -BOOL ov42_022564C4(UnkStruct_ov42_022563D4 * param0, u32 param1); -BOOL ov42_022564D0(UnkStruct_ov42_022563D4 * param0); +BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563D4_1 *param1, BGL *param2); +void ov42_0225648C(UnkStruct_ov42_022563D4 *param0); +void ov42_022564A0(UnkStruct_ov42_022563D4 *param0, u32 param1); +BOOL ov42_022564C4(UnkStruct_ov42_022563D4 *param0, u32 param1); +BOOL ov42_022564D0(UnkStruct_ov42_022563D4 *param0); #endif // POKEPLATINUM_OV42_022563D4_H diff --git a/include/overlay043/ov43_02256544.h b/include/overlay043/ov43_02256544.h index f1d252e4a7..7681d7b2a9 100644 --- a/include/overlay043/ov43_02256544.h +++ b/include/overlay043/ov43_02256544.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV43_02256544_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay043/struct_ov43_02256544_1.h" #include "overlay043/struct_ov43_02256544_decl.h" -BOOL ov43_02256544(UnkStruct_ov43_02256544 ** param0, const UnkStruct_ov43_02256544_1 * param1, BGL * param2); -void ov43_02256680(UnkStruct_ov43_02256544 * param0); -void ov43_022566B0(UnkStruct_ov43_02256544 * param0, u32 param1); -BOOL ov43_022566D4(UnkStruct_ov43_02256544 * param0, u32 param1); -BOOL ov43_022566E0(UnkStruct_ov43_02256544 * param0); +BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_02256544_1 *param1, BGL *param2); +void ov43_02256680(UnkStruct_ov43_02256544 *param0); +void ov43_022566B0(UnkStruct_ov43_02256544 *param0, u32 param1); +BOOL ov43_022566D4(UnkStruct_ov43_02256544 *param0, u32 param1); +BOOL ov43_022566E0(UnkStruct_ov43_02256544 *param0); #endif // POKEPLATINUM_OV43_02256544_H diff --git a/include/overlay044/ov44_022565BC.h b/include/overlay044/ov44_022565BC.h index 879b3f6162..9b2e12810d 100644 --- a/include/overlay044/ov44_022565BC.h +++ b/include/overlay044/ov44_022565BC.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV44_022565BC_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay044/struct_ov44_022565BC_1.h" #include "overlay044/struct_ov44_022565BC_decl.h" -BOOL ov44_022565BC(UnkStruct_ov44_022565BC ** param0, const UnkStruct_ov44_022565BC_1 * param1, BGL * param2); -void ov44_022565F8(UnkStruct_ov44_022565BC * param0); -void ov44_02256744(UnkStruct_ov44_022565BC * param0, u32 param1); -BOOL ov44_02256768(UnkStruct_ov44_022565BC * param0, u32 param1); -BOOL ov44_02256774(UnkStruct_ov44_022565BC * param0); +BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565BC_1 *param1, BGL *param2); +void ov44_022565F8(UnkStruct_ov44_022565BC *param0); +void ov44_02256744(UnkStruct_ov44_022565BC *param0, u32 param1); +BOOL ov44_02256768(UnkStruct_ov44_022565BC *param0, u32 param1); +BOOL ov44_02256774(UnkStruct_ov44_022565BC *param0); #endif // POKEPLATINUM_OV44_022565BC_H diff --git a/include/overlay045/ov45_022566EC.h b/include/overlay045/ov45_022566EC.h index 3b1c3f83ef..2d2f9e9b2e 100644 --- a/include/overlay045/ov45_022566EC.h +++ b/include/overlay045/ov45_022566EC.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_OV45_022566EC_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay045/struct_ov45_022566EC_1.h" #include "overlay045/struct_ov45_022566EC_decl.h" -BOOL ov45_022566EC(UnkStruct_ov45_022566EC ** param0, const UnkStruct_ov45_022566EC_1 * param1, BGL * param2); -void ov45_02256728(UnkStruct_ov45_022566EC * param0); -void ov45_02256918(UnkStruct_ov45_022566EC * param0, u32 param1); -BOOL ov45_0225693C(UnkStruct_ov45_022566EC * param0, u32 param1); -BOOL ov45_02256948(UnkStruct_ov45_022566EC * param0); -void ov45_02256C90(UnkStruct_ov45_022566EC * param0); +BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566EC_1 *param1, BGL *param2); +void ov45_02256728(UnkStruct_ov45_022566EC *param0); +void ov45_02256918(UnkStruct_ov45_022566EC *param0, u32 param1); +BOOL ov45_0225693C(UnkStruct_ov45_022566EC *param0, u32 param1); +BOOL ov45_02256948(UnkStruct_ov45_022566EC *param0); +void ov45_02256C90(UnkStruct_ov45_022566EC *param0); #endif // POKEPLATINUM_OV45_022566EC_H diff --git a/include/overlay046/ov46_02256BCC.h b/include/overlay046/ov46_02256BCC.h index 7a8d7b23ba..c4c83aaed6 100644 --- a/include/overlay046/ov46_02256BCC.h +++ b/include/overlay046/ov46_02256BCC.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_OV46_02256BCC_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay046/struct_ov46_02256BCC_1.h" #include "overlay046/struct_ov46_02256BCC_decl.h" -BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC ** param0, const UnkStruct_ov46_02256BCC_1 * param1, BGL * param2); -void ov46_02256C0C(UnkStruct_ov46_02256BCC * param0); -void ov46_02256D24(UnkStruct_ov46_02256BCC * param0, u32 param1); -BOOL ov46_02256D48(UnkStruct_ov46_02256BCC * param0, u32 param1); -BOOL ov46_02256D54(UnkStruct_ov46_02256BCC * param0); -u32 ov46_0225710C(UnkStruct_ov46_02256BCC * param0); +BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256BCC_1 *param1, BGL *param2); +void ov46_02256C0C(UnkStruct_ov46_02256BCC *param0); +void ov46_02256D24(UnkStruct_ov46_02256BCC *param0, u32 param1); +BOOL ov46_02256D48(UnkStruct_ov46_02256BCC *param0, u32 param1); +BOOL ov46_02256D54(UnkStruct_ov46_02256BCC *param0); +u32 ov46_0225710C(UnkStruct_ov46_02256BCC *param0); #endif // POKEPLATINUM_OV46_02256BCC_H diff --git a/include/overlay047/ov47_02256634.h b/include/overlay047/ov47_02256634.h index 0ee2a41360..8e20b5c634 100644 --- a/include/overlay047/ov47_02256634.h +++ b/include/overlay047/ov47_02256634.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV47_02256634_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay047/struct_ov47_02256634_1.h" #include "overlay047/struct_ov47_02256634_decl.h" -BOOL ov47_02256634(UnkStruct_ov47_02256634 ** param0, const UnkStruct_ov47_02256634_1 * param1, BGL * param2); -void ov47_02256670(UnkStruct_ov47_02256634 * param0); -void ov47_0225686C(UnkStruct_ov47_02256634 * param0, u32 param1); -BOOL ov47_02256890(UnkStruct_ov47_02256634 * param0, u32 param1); -BOOL ov47_0225689C(UnkStruct_ov47_02256634 * param0); +BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_02256634_1 *param1, BGL *param2); +void ov47_02256670(UnkStruct_ov47_02256634 *param0); +void ov47_0225686C(UnkStruct_ov47_02256634 *param0, u32 param1); +BOOL ov47_02256890(UnkStruct_ov47_02256634 *param0, u32 param1); +BOOL ov47_0225689C(UnkStruct_ov47_02256634 *param0); #endif // POKEPLATINUM_OV47_02256634_H diff --git a/include/overlay048/ov48_0225650C.h b/include/overlay048/ov48_0225650C.h index 2725b11ac9..780eeacdc9 100644 --- a/include/overlay048/ov48_0225650C.h +++ b/include/overlay048/ov48_0225650C.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV48_0225650C_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay048/struct_ov48_0225650C_1.h" #include "overlay048/struct_ov48_0225650C_decl.h" -BOOL ov48_0225650C(UnkStruct_ov48_0225650C ** param0, const UnkStruct_ov48_0225650C_1 * param1, BGL * param2); -void ov48_0225654C(UnkStruct_ov48_0225650C * param0); -void ov48_02256558(UnkStruct_ov48_0225650C * param0, u32 param1); -BOOL ov48_0225657C(UnkStruct_ov48_0225650C * param0, u32 param1); -BOOL ov48_02256588(UnkStruct_ov48_0225650C * param0); +BOOL ov48_0225650C(UnkStruct_ov48_0225650C **param0, const UnkStruct_ov48_0225650C_1 *param1, BGL *param2); +void ov48_0225654C(UnkStruct_ov48_0225650C *param0); +void ov48_02256558(UnkStruct_ov48_0225650C *param0, u32 param1); +BOOL ov48_0225657C(UnkStruct_ov48_0225650C *param0, u32 param1); +BOOL ov48_02256588(UnkStruct_ov48_0225650C *param0); #endif // POKEPLATINUM_OV48_0225650C_H diff --git a/include/overlay049/ov49_022563D4.h b/include/overlay049/ov49_022563D4.h index 9f54d2762f..f22b8a3804 100644 --- a/include/overlay049/ov49_022563D4.h +++ b/include/overlay049/ov49_022563D4.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV49_022563D4_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay049/struct_ov49_022563D4_1.h" #include "overlay049/struct_ov49_022563D4_decl.h" -BOOL ov49_022563D4(UnkStruct_ov49_022563D4 ** param0, const UnkStruct_ov49_022563D4_1 * param1, BGL * param2); -void ov49_02256480(UnkStruct_ov49_022563D4 * param0); -void ov49_02256494(UnkStruct_ov49_022563D4 * param0, u32 param1); -BOOL ov49_022564B8(UnkStruct_ov49_022563D4 * param0, u32 param1); -BOOL ov49_022564C4(UnkStruct_ov49_022563D4 * param0); +BOOL ov49_022563D4(UnkStruct_ov49_022563D4 **param0, const UnkStruct_ov49_022563D4_1 *param1, BGL *param2); +void ov49_02256480(UnkStruct_ov49_022563D4 *param0); +void ov49_02256494(UnkStruct_ov49_022563D4 *param0, u32 param1); +BOOL ov49_022564B8(UnkStruct_ov49_022563D4 *param0, u32 param1); +BOOL ov49_022564C4(UnkStruct_ov49_022563D4 *param0); #endif // POKEPLATINUM_OV49_022563D4_H diff --git a/include/overlay050/ov50_02256510.h b/include/overlay050/ov50_02256510.h index f3e2b604ab..f9ed9785f0 100644 --- a/include/overlay050/ov50_02256510.h +++ b/include/overlay050/ov50_02256510.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV50_02256510_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay050/struct_ov50_02256510_1.h" #include "overlay050/struct_ov50_02256510_decl.h" -BOOL ov50_02256510(UnkStruct_ov50_02256510 ** param0, const UnkStruct_ov50_02256510_1 * param1, BGL * param2); -void ov50_0225654C(UnkStruct_ov50_02256510 * param0); -void ov50_022565FC(UnkStruct_ov50_02256510 * param0, u32 param1); -BOOL ov50_02256620(UnkStruct_ov50_02256510 * param0, u32 param1); -BOOL ov50_0225662C(UnkStruct_ov50_02256510 * param0); +BOOL ov50_02256510(UnkStruct_ov50_02256510 **param0, const UnkStruct_ov50_02256510_1 *param1, BGL *param2); +void ov50_0225654C(UnkStruct_ov50_02256510 *param0); +void ov50_022565FC(UnkStruct_ov50_02256510 *param0, u32 param1); +BOOL ov50_02256620(UnkStruct_ov50_02256510 *param0, u32 param1); +BOOL ov50_0225662C(UnkStruct_ov50_02256510 *param0); #endif // POKEPLATINUM_OV50_02256510_H diff --git a/include/overlay051/ov51_0225632C.h b/include/overlay051/ov51_0225632C.h index aa1a58c36f..ceace0e1f7 100644 --- a/include/overlay051/ov51_0225632C.h +++ b/include/overlay051/ov51_0225632C.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV51_0225632C_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay051/struct_ov51_0225632C_1.h" #include "overlay051/struct_ov51_0225632C_decl.h" -BOOL ov51_0225632C(UnkStruct_ov51_0225632C ** param0, const UnkStruct_ov51_0225632C_1 * param1, BGL * param2); -void ov51_0225635C(UnkStruct_ov51_0225632C * param0); -void ov51_02256368(UnkStruct_ov51_0225632C * param0, u32 param1); -BOOL ov51_0225638C(UnkStruct_ov51_0225632C * param0, u32 param1); -BOOL ov51_02256398(UnkStruct_ov51_0225632C * param0); +BOOL ov51_0225632C(UnkStruct_ov51_0225632C **param0, const UnkStruct_ov51_0225632C_1 *param1, BGL *param2); +void ov51_0225635C(UnkStruct_ov51_0225632C *param0); +void ov51_02256368(UnkStruct_ov51_0225632C *param0, u32 param1); +BOOL ov51_0225638C(UnkStruct_ov51_0225632C *param0, u32 param1); +BOOL ov51_02256398(UnkStruct_ov51_0225632C *param0); #endif // POKEPLATINUM_OV51_0225632C_H diff --git a/include/overlay052/ov52_02256694.h b/include/overlay052/ov52_02256694.h index 8a3c49ff2a..2e0ae0421a 100644 --- a/include/overlay052/ov52_02256694.h +++ b/include/overlay052/ov52_02256694.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV52_02256694_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay052/struct_ov52_02256694_1.h" #include "overlay052/struct_ov52_02256694_decl.h" -BOOL ov52_02256694(UnkStruct_ov52_02256694 ** param0, const UnkStruct_ov52_02256694_1 * param1, BGL * param2); -void ov52_022566EC(UnkStruct_ov52_02256694 * param0); -void ov52_022567A4(UnkStruct_ov52_02256694 * param0, u32 param1); -BOOL ov52_022567C8(UnkStruct_ov52_02256694 * param0, u32 param1); -BOOL ov52_022567D4(UnkStruct_ov52_02256694 * param0); +BOOL ov52_02256694(UnkStruct_ov52_02256694 **param0, const UnkStruct_ov52_02256694_1 *param1, BGL *param2); +void ov52_022566EC(UnkStruct_ov52_02256694 *param0); +void ov52_022567A4(UnkStruct_ov52_02256694 *param0, u32 param1); +BOOL ov52_022567C8(UnkStruct_ov52_02256694 *param0, u32 param1); +BOOL ov52_022567D4(UnkStruct_ov52_02256694 *param0); #endif // POKEPLATINUM_OV52_02256694_H diff --git a/include/overlay053/ov53_02256420.h b/include/overlay053/ov53_02256420.h index 5edea130b0..626dff51a2 100644 --- a/include/overlay053/ov53_02256420.h +++ b/include/overlay053/ov53_02256420.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV53_02256420_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay053/struct_ov53_02256420_1.h" #include "overlay053/struct_ov53_02256420_decl.h" -BOOL ov53_02256420(UnkStruct_ov53_02256420 ** param0, const UnkStruct_ov53_02256420_1 * param1, BGL * param2); -void ov53_02256454(UnkStruct_ov53_02256420 * param0); -void ov53_02256460(UnkStruct_ov53_02256420 * param0, u32 param1); -BOOL ov53_02256484(UnkStruct_ov53_02256420 * param0, u32 param1); -BOOL ov53_02256490(UnkStruct_ov53_02256420 * param0); +BOOL ov53_02256420(UnkStruct_ov53_02256420 **param0, const UnkStruct_ov53_02256420_1 *param1, BGL *param2); +void ov53_02256454(UnkStruct_ov53_02256420 *param0); +void ov53_02256460(UnkStruct_ov53_02256420 *param0, u32 param1); +BOOL ov53_02256484(UnkStruct_ov53_02256420 *param0, u32 param1); +BOOL ov53_02256490(UnkStruct_ov53_02256420 *param0); #endif // POKEPLATINUM_OV53_02256420_H diff --git a/include/overlay054/ov54_0225642C.h b/include/overlay054/ov54_0225642C.h index deeb494f76..4489d0af7a 100644 --- a/include/overlay054/ov54_0225642C.h +++ b/include/overlay054/ov54_0225642C.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV54_0225642C_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay054/struct_ov54_0225642C_1.h" #include "overlay054/struct_ov54_0225642C_decl.h" -BOOL ov54_0225642C(UnkStruct_ov54_0225642C ** param0, const UnkStruct_ov54_0225642C_1 * param1, BGL * param2); -void ov54_02256460(UnkStruct_ov54_0225642C * param0); -void ov54_0225646C(UnkStruct_ov54_0225642C * param0, u32 param1); -BOOL ov54_02256490(UnkStruct_ov54_0225642C * param0, u32 param1); -BOOL ov54_0225649C(UnkStruct_ov54_0225642C * param0); +BOOL ov54_0225642C(UnkStruct_ov54_0225642C **param0, const UnkStruct_ov54_0225642C_1 *param1, BGL *param2); +void ov54_02256460(UnkStruct_ov54_0225642C *param0); +void ov54_0225646C(UnkStruct_ov54_0225642C *param0, u32 param1); +BOOL ov54_02256490(UnkStruct_ov54_0225642C *param0, u32 param1); +BOOL ov54_0225649C(UnkStruct_ov54_0225642C *param0); #endif // POKEPLATINUM_OV54_0225642C_H diff --git a/include/overlay055/ov55_0225632C.h b/include/overlay055/ov55_0225632C.h index cf531f23ef..507ccc5a7f 100644 --- a/include/overlay055/ov55_0225632C.h +++ b/include/overlay055/ov55_0225632C.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_OV55_0225632C_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay055/struct_ov55_0225632C_1.h" #include "overlay055/struct_ov55_0225632C_decl.h" -BOOL ov55_0225632C(UnkStruct_ov55_0225632C ** param0, const UnkStruct_ov55_0225632C_1 * param1, BGL * param2); -void ov55_02256360(UnkStruct_ov55_0225632C * param0); -void ov55_02256378(UnkStruct_ov55_0225632C * param0, u32 param1); -BOOL ov55_0225639C(UnkStruct_ov55_0225632C * param0, u32 param1); -BOOL ov55_022563A8(UnkStruct_ov55_0225632C * param0); +BOOL ov55_0225632C(UnkStruct_ov55_0225632C **param0, const UnkStruct_ov55_0225632C_1 *param1, BGL *param2); +void ov55_02256360(UnkStruct_ov55_0225632C *param0); +void ov55_02256378(UnkStruct_ov55_0225632C *param0, u32 param1); +BOOL ov55_0225639C(UnkStruct_ov55_0225632C *param0, u32 param1); +BOOL ov55_022563A8(UnkStruct_ov55_0225632C *param0); #endif // POKEPLATINUM_OV55_0225632C_H diff --git a/include/overlay056/ov56_022561C0.h b/include/overlay056/ov56_022561C0.h index ed44c1e46f..72abed4f9b 100644 --- a/include/overlay056/ov56_022561C0.h +++ b/include/overlay056/ov56_022561C0.h @@ -4,7 +4,7 @@ #include "field/field_system_decl.h" #include "overlay056/struct_ov56_02256468_decl.h" -UnkStruct_ov56_02256468 * ov56_02256410(FieldSystem * fieldSystem); -void ov56_02256468(UnkStruct_ov56_02256468 * param0); +UnkStruct_ov56_02256468 *ov56_02256410(FieldSystem *fieldSystem); +void ov56_02256468(UnkStruct_ov56_02256468 *param0); #endif // POKEPLATINUM_OV56_022561C0_H diff --git a/include/overlay057/const_ov57_021D0F70.h b/include/overlay057/const_ov57_021D0F70.h index 4b01281899..3cac6c7f77 100644 --- a/include/overlay057/const_ov57_021D0F70.h +++ b/include/overlay057/const_ov57_021D0F70.h @@ -1,6 +1,7 @@ #ifndef POKEPLATINUM_CONST_OV57_021D0F70_H #define POKEPLATINUM_CONST_OV57_021D0F70_H +#include "overlay_manager.h" extern const OverlayManagerTemplate Unk_ov57_021D0F70; diff --git a/include/overlay057/ov57_021D0F30.h b/include/overlay057/ov57_021D0F30.h index df61557f57..f626a9c610 100644 --- a/include/overlay057/ov57_021D0F30.h +++ b/include/overlay057/ov57_021D0F30.h @@ -3,7 +3,7 @@ #include "savedata.h" -void ov57_021D0F30(int param0, SaveData * param1); -void ov57_021D0F44(int param0, SaveData * param1); +void ov57_021D0F30(int param0, SaveData *param1); +void ov57_021D0F44(int param0, SaveData *param1); #endif // POKEPLATINUM_OV57_021D0F30_H diff --git a/include/overlay058/ov58_021D0D80.h b/include/overlay058/ov58_021D0D80.h index a44c31d9ad..9d2bbadfee 100644 --- a/include/overlay058/ov58_021D0D80.h +++ b/include/overlay058/ov58_021D0D80.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_OV58_021D0D80_H #define POKEPLATINUM_OV58_021D0D80_H -#include "overlay_manager.h" #include "struct_decls/struct_02095EAC_decl.h" -int ov58_021D0D80(OverlayManager * param0, int * param1); -int ov58_021D0F08(OverlayManager * param0, int * param1); -int ov58_021D1018(OverlayManager * param0, int * param1); -void ov58_021D2434(UnkStruct_02095EAC * param0, int param1, u8 param2); +#include "overlay_manager.h" + +int ov58_021D0D80(OverlayManager *param0, int *param1); +int ov58_021D0F08(OverlayManager *param0, int *param1); +int ov58_021D1018(OverlayManager *param0, int *param1); +void ov58_021D2434(UnkStruct_02095EAC *param0, int param1, u8 param2); int ov58_021D2A4C(void); #endif // POKEPLATINUM_OV58_021D0D80_H diff --git a/include/overlay059/ov59_021D0D80.h b/include/overlay059/ov59_021D0D80.h index 8337787263..e40258c642 100644 --- a/include/overlay059/ov59_021D0D80.h +++ b/include/overlay059/ov59_021D0D80.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_OV59_021D0D80_H #define POKEPLATINUM_OV59_021D0D80_H -#include "overlay_manager.h" #include "struct_decls/struct_020961E8_decl.h" -int ov59_021D0D80(OverlayManager * param0, int * param1); -int ov59_021D0F00(OverlayManager * param0, int * param1); -int ov59_021D0FF4(OverlayManager * param0, int * param1); -void ov59_021D1D40(UnkStruct_020961E8 * param0); -void ov59_021D2204(UnkStruct_020961E8 * param0, int param1, u8 param2); -void ov59_021D22EC(UnkStruct_020961E8 * param0, int param1, u8 param2); +#include "overlay_manager.h" + +int ov59_021D0D80(OverlayManager *param0, int *param1); +int ov59_021D0F00(OverlayManager *param0, int *param1); +int ov59_021D0FF4(OverlayManager *param0, int *param1); +void ov59_021D1D40(UnkStruct_020961E8 *param0); +void ov59_021D2204(UnkStruct_020961E8 *param0, int param1, u8 param2); +void ov59_021D22EC(UnkStruct_020961E8 *param0, int param1, u8 param2); int ov59_021D2544(void); #endif // POKEPLATINUM_OV59_021D0D80_H diff --git a/include/overlay059/ov59_021D2A2C.h b/include/overlay059/ov59_021D2A2C.h index 54caa86c02..ab468470ef 100644 --- a/include/overlay059/ov59_021D2A2C.h +++ b/include/overlay059/ov59_021D2A2C.h @@ -3,8 +3,8 @@ #include "struct_decls/struct_0202B4A0_decl.h" -u32 ov59_021D2A2C(UnkStruct_0202B4A0 * param0); -void * ov59_021D2A30(UnkStruct_0202B4A0 * param0); -void ov59_021D2AC4(int param0, int param1, UnkStruct_0202B4A0 * param2, const void ** param3); +u32 ov59_021D2A2C(UnkStruct_0202B4A0 *param0); +void *ov59_021D2A30(UnkStruct_0202B4A0 *param0); +void ov59_021D2AC4(int param0, int param1, UnkStruct_0202B4A0 *param2, const void **param3); #endif // POKEPLATINUM_OV59_021D2A2C_H diff --git a/include/overlay059/ov59_021D2B44.h b/include/overlay059/ov59_021D2B44.h index 5cec189005..d3f188532b 100644 --- a/include/overlay059/ov59_021D2B44.h +++ b/include/overlay059/ov59_021D2B44.h @@ -3,19 +3,20 @@ #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_0202E794_decl.h" + #include "savedata.h" -u32 ov59_021D2B44(const SaveData * param0); -u32 ov59_021D2B4C(const SaveData * param0); -u32 ov59_021D2B54(const SaveData * param0); -UnkStruct_0202E794 * ov59_021D2C28(SaveData * param0, int param1, u32 param2); -UnkStruct_0202E794 * ov59_021D2C70(SaveData * param0, int param1, u32 param2); -UnkStruct_0202E794 * ov59_021D2CB4(SaveData * param0, int param1, u32 param2); -UnkStruct_0202E794 * ov59_021D2CF8(SaveData * param0, int param1, u32 param2); -UnkStruct_0202E794 * ov59_021D2D3C(SaveData * param0, int param1, u32 param2); -UnkStruct_0202E794 * ov59_021D2D80(SaveData * param0, int param1, u32 param2); -void ov59_021D2F10(TVBroadcast * param0, int param1, int param2, const void ** param3, const void ** param4); -void ov59_021D2F38(TVBroadcast * param0, int param1, int param2, const void ** param3, const void ** param4); -void ov59_021D2F60(TVBroadcast * param0, int param1, int param2, const void ** param3, const void ** param4); +u32 ov59_021D2B44(const SaveData *param0); +u32 ov59_021D2B4C(const SaveData *param0); +u32 ov59_021D2B54(const SaveData *param0); +UnkStruct_0202E794 *ov59_021D2C28(SaveData *param0, int param1, u32 param2); +UnkStruct_0202E794 *ov59_021D2C70(SaveData *param0, int param1, u32 param2); +UnkStruct_0202E794 *ov59_021D2CB4(SaveData *param0, int param1, u32 param2); +UnkStruct_0202E794 *ov59_021D2CF8(SaveData *param0, int param1, u32 param2); +UnkStruct_0202E794 *ov59_021D2D3C(SaveData *param0, int param1, u32 param2); +UnkStruct_0202E794 *ov59_021D2D80(SaveData *param0, int param1, u32 param2); +void ov59_021D2F10(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4); +void ov59_021D2F38(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4); +void ov59_021D2F60(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4); #endif // POKEPLATINUM_OV59_021D2B44_H diff --git a/include/overlay059/ov59_021D2F88.h b/include/overlay059/ov59_021D2F88.h index 0b8be985d1..7f1761a4b9 100644 --- a/include/overlay059/ov59_021D2F88.h +++ b/include/overlay059/ov59_021D2F88.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_OV59_021D2F88_H #define POKEPLATINUM_OV59_021D2F88_H -#include "savedata.h" #include "overlay059/struct_ov59_021D30E0.h" -void ov59_021D30E0(SaveData * param0, UnkStruct_ov59_021D30E0 * param1); -void ov59_021D313C(SaveData * param0, const UnkStruct_ov59_021D30E0 * param1); +#include "savedata.h" + +void ov59_021D30E0(SaveData *param0, UnkStruct_ov59_021D30E0 *param1); +void ov59_021D313C(SaveData *param0, const UnkStruct_ov59_021D30E0 *param1); #endif // POKEPLATINUM_OV59_021D2F88_H diff --git a/include/overlay059/struct_ov59_021D109C.h b/include/overlay059/struct_ov59_021D109C.h index c6a000172f..a1278679e6 100644 --- a/include/overlay059/struct_ov59_021D109C.h +++ b/include/overlay059/struct_ov59_021D109C.h @@ -1,15 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_OV59_021D109C_H #define POKEPLATINUM_STRUCT_OV59_021D109C_H - #include typedef struct { int unk_00; int unk_04; int unk_08; - void * unk_0C; - NNSG2dPaletteData * unk_10; + void *unk_0C; + NNSG2dPaletteData *unk_10; } UnkStruct_ov59_021D109C; #endif // POKEPLATINUM_STRUCT_OV59_021D109C_H diff --git a/include/overlay060/ov60_0221F800.h b/include/overlay060/ov60_0221F800.h index 701df65470..c7d7754e35 100644 --- a/include/overlay060/ov60_0221F800.h +++ b/include/overlay060/ov60_0221F800.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV60_0221F800_H #define POKEPLATINUM_OV60_0221F800_H -int ov60_0221F838(u32 param0, const u8 * param1, int param2, u8 * param3, int param4); +int ov60_0221F838(u32 param0, const u8 *param1, int param2, u8 *param3, int param4); u32 ov60_0221F944(u32 param0); #endif // POKEPLATINUM_OV60_0221F800_H diff --git a/include/overlay060/ov60_0221F968.h b/include/overlay060/ov60_0221F968.h index fcf8af2c1a..675261dab1 100644 --- a/include/overlay060/ov60_0221F968.h +++ b/include/overlay060/ov60_0221F968.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_OV60_0221F968_H void ov60_0221FC84(void); -int ov60_0221FCA8(const u8 * param0, int param1, const void * param2, int param3, u8 * param4, int param5); +int ov60_0221FCA8(const u8 *param0, int param1, const void *param2, int param3, u8 *param4, int param5); int ov60_0221FD48(void); void ov60_0221FDEC(void); int ov60_0221FE14(void); diff --git a/include/overlay061/funcptr_ov61_0222B920.h b/include/overlay061/funcptr_ov61_0222B920.h index 0a65111c48..5b1dff3bcf 100644 --- a/include/overlay061/funcptr_ov61_0222B920.h +++ b/include/overlay061/funcptr_ov61_0222B920.h @@ -3,6 +3,6 @@ #include "overlay062/struct_ov62_0223CAA4.h" -typedef void (* UnkFuncPtr_ov61_0222B920)(void *, const UnkStruct_ov62_0223CAA4 *); +typedef void (*UnkFuncPtr_ov61_0222B920)(void *, const UnkStruct_ov62_0223CAA4 *); #endif // POKEPLATINUM_FUNCPTR_OV61_0222B920_H diff --git a/include/overlay061/funcptr_ov61_0222B920_1.h b/include/overlay061/funcptr_ov61_0222B920_1.h index ac5c0c6477..5bbcbd2310 100644 --- a/include/overlay061/funcptr_ov61_0222B920_1.h +++ b/include/overlay061/funcptr_ov61_0222B920_1.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV61_0222B920_1_H #define POKEPLATINUM_FUNCPTR_OV61_0222B920_1_H -typedef BOOL (* UnkFuncPtr_ov61_0222B920_1)(void *, void *); +typedef BOOL (*UnkFuncPtr_ov61_0222B920_1)(void *, void *); #endif // POKEPLATINUM_FUNCPTR_OV61_0222B920_1_H diff --git a/include/overlay061/ov61_0222AE60.h b/include/overlay061/ov61_0222AE60.h index 1c00eee631..21a839f16c 100644 --- a/include/overlay061/ov61_0222AE60.h +++ b/include/overlay061/ov61_0222AE60.h @@ -4,18 +4,20 @@ #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02030A80_decl.h" #include "struct_decls/struct_020797DC_decl.h" -#include "savedata.h" + #include "overlay061/struct_ov61_0222AE80.h" #include "overlay061/struct_ov61_0222AFC0.h" #include "overlay061/struct_ov61_0222AFCC.h" #include "overlay062/struct_ov62_02239DA4.h" -void ov61_0222AE60(SaveData * param0, const UnkStruct_02029C68 * param1, UnkStruct_ov61_0222AE80 * param2); -void ov61_0222AE80(const UnkStruct_ov61_0222AE80 * param0, UnkStruct_02029C68 * param1); -void ov61_0222AE88(SaveData * param0, const PCBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3, int param4); -void ov61_0222AF88(SaveData * param0, UnkStruct_ov62_02239DA4 * param1, int param2); -void ov61_0222AFA4(SaveData * param0, const UnkStruct_02030A80 * param1, UnkStruct_ov61_0222AFC0 * param2); -void ov61_0222AFC0(const UnkStruct_ov61_0222AFC0 * param0, UnkStruct_02030A80 * param1); -void ov61_0222AFCC(SaveData * param0, const UnkStruct_02030A80 * param1, UnkStruct_ov61_0222AFCC * param2); +#include "savedata.h" + +void ov61_0222AE60(SaveData *param0, const UnkStruct_02029C68 *param1, UnkStruct_ov61_0222AE80 *param2); +void ov61_0222AE80(const UnkStruct_ov61_0222AE80 *param0, UnkStruct_02029C68 *param1); +void ov61_0222AE88(SaveData *param0, const PCBoxes *param1, int param2, UnkStruct_ov62_02239DA4 *param3, int param4); +void ov61_0222AF88(SaveData *param0, UnkStruct_ov62_02239DA4 *param1, int param2); +void ov61_0222AFA4(SaveData *param0, const UnkStruct_02030A80 *param1, UnkStruct_ov61_0222AFC0 *param2); +void ov61_0222AFC0(const UnkStruct_ov61_0222AFC0 *param0, UnkStruct_02030A80 *param1); +void ov61_0222AFCC(SaveData *param0, const UnkStruct_02030A80 *param1, UnkStruct_ov61_0222AFCC *param2); #endif // POKEPLATINUM_OV61_0222AE60_H diff --git a/include/overlay061/ov61_0222B008.h b/include/overlay061/ov61_0222B008.h index 8f50fb2812..a311ddf690 100644 --- a/include/overlay061/ov61_0222B008.h +++ b/include/overlay061/ov61_0222B008.h @@ -4,29 +4,30 @@ #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02030A80_decl.h" #include "struct_decls/struct_020797DC_decl.h" + #include "overlay061/struct_ov61_0222B2D8.h" #include "overlay062/struct_ov62_022349A8.h" #include "overlay062/struct_ov62_0223CAA4.h" #include "overlay062/struct_ov62_02241130.h" -int ov61_0222B008(UnkStruct_ov62_022349A8 * param0, const UnkStruct_ov62_02241130 * param1); -void ov61_0222B0F0(UnkStruct_ov62_022349A8 * param0); -int ov61_0222B1B4(UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1, UnkStruct_02029C68 * param2); -int ov61_0222B1FC(UnkStruct_ov62_022349A8 * param0, int param1); -int ov61_0222B224(UnkStruct_ov62_022349A8 * param0, int param1, UnkStruct_02030A80 * param2, const PCBoxes * param3, int param4); -int ov61_0222B290(UnkStruct_ov62_022349A8 * param0, int param1); -int ov61_0222B2B8(UnkStruct_ov62_022349A8 * param0); -int ov61_0222B2D8(UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1, UnkStruct_ov61_0222B2D8 param2[]); -int ov61_0222B338(UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1); -int ov61_0222B394(UnkStruct_ov62_022349A8 * param0, u16 param1, u8 param2, u8 param3, u8 param4); -int ov61_0222B3EC(UnkStruct_ov62_022349A8 * param0); -int ov61_0222B44C(UnkStruct_ov62_022349A8 * param0); -int ov61_0222B4A8(UnkStruct_ov62_022349A8 * param0); -int ov61_0222B4E4(UnkStruct_ov62_022349A8 * param0); -int ov61_0222B524(UnkStruct_ov62_022349A8 * param0, u64 param1); -int ov61_0222B550(UnkStruct_ov62_022349A8 * param0, u64 param1); -int ov61_0222B57C(UnkStruct_ov62_022349A8 * param0); -BOOL ov61_0222BB48(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov62_0223CAA4 ** param1); -BOOL ov61_0222BBBC(UnkStruct_ov62_022349A8 * param0); +int ov61_0222B008(UnkStruct_ov62_022349A8 *param0, const UnkStruct_ov62_02241130 *param1); +void ov61_0222B0F0(UnkStruct_ov62_022349A8 *param0); +int ov61_0222B1B4(UnkStruct_ov62_022349A8 *param0, UnkStruct_02030A80 *param1, UnkStruct_02029C68 *param2); +int ov61_0222B1FC(UnkStruct_ov62_022349A8 *param0, int param1); +int ov61_0222B224(UnkStruct_ov62_022349A8 *param0, int param1, UnkStruct_02030A80 *param2, const PCBoxes *param3, int param4); +int ov61_0222B290(UnkStruct_ov62_022349A8 *param0, int param1); +int ov61_0222B2B8(UnkStruct_ov62_022349A8 *param0); +int ov61_0222B2D8(UnkStruct_ov62_022349A8 *param0, UnkStruct_02030A80 *param1, UnkStruct_ov61_0222B2D8 param2[]); +int ov61_0222B338(UnkStruct_ov62_022349A8 *param0, UnkStruct_02030A80 *param1); +int ov61_0222B394(UnkStruct_ov62_022349A8 *param0, u16 param1, u8 param2, u8 param3, u8 param4); +int ov61_0222B3EC(UnkStruct_ov62_022349A8 *param0); +int ov61_0222B44C(UnkStruct_ov62_022349A8 *param0); +int ov61_0222B4A8(UnkStruct_ov62_022349A8 *param0); +int ov61_0222B4E4(UnkStruct_ov62_022349A8 *param0); +int ov61_0222B524(UnkStruct_ov62_022349A8 *param0, u64 param1); +int ov61_0222B550(UnkStruct_ov62_022349A8 *param0, u64 param1); +int ov61_0222B57C(UnkStruct_ov62_022349A8 *param0); +BOOL ov61_0222BB48(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov62_0223CAA4 **param1); +BOOL ov61_0222BBBC(UnkStruct_ov62_022349A8 *param0); #endif // POKEPLATINUM_OV61_0222B008_H diff --git a/include/overlay061/ov61_0222BC4C.h b/include/overlay061/ov61_0222BC4C.h index cacbf84bc5..e51d811537 100644 --- a/include/overlay061/ov61_0222BC4C.h +++ b/include/overlay061/ov61_0222BC4C.h @@ -11,22 +11,22 @@ #include "overlay062/struct_ov62_022349A8.h" #include "overlay062/struct_ov62_0223DF10.h" -int ov61_0222BC4C(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1); -int ov61_0222BC70(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1); -int ov61_0222BC90(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BC90 ** param1, int param2); -int ov61_0222BCD0(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1); -int ov61_0222BCF8(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1); -int ov61_0222BD18(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BCF8_sub1_sub1 ** param1, int param2); -int ov61_0222BD64(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1); -void ov61_0222BD78(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov62_0223DF10 ** param1); -int ov61_0222BD88(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1); -void ov61_0222BDAC(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BDAC ** param1, UnkStruct_ov61_0222BDAC_1 ** param2); -int ov61_0222BDC8(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1); -u64 ov61_0222BDF0(UnkStruct_ov62_022349A8 * param0); -int ov61_0222BE00(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1); -int ov61_0222BE20(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BE20 ** param1, int param2); -int ov61_0222BEB8(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1); -int ov61_0222BED8(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BED8 ** param1); -int ov61_0222BF24(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1); +int ov61_0222BC4C(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1); +int ov61_0222BC70(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1); +int ov61_0222BC90(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222BC90 **param1, int param2); +int ov61_0222BCD0(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1); +int ov61_0222BCF8(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1); +int ov61_0222BD18(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222BCF8_sub1_sub1 **param1, int param2); +int ov61_0222BD64(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1); +void ov61_0222BD78(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov62_0223DF10 **param1); +int ov61_0222BD88(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1); +void ov61_0222BDAC(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222BDAC **param1, UnkStruct_ov61_0222BDAC_1 **param2); +int ov61_0222BDC8(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1); +u64 ov61_0222BDF0(UnkStruct_ov62_022349A8 *param0); +int ov61_0222BE00(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1); +int ov61_0222BE20(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222BE20 **param1, int param2); +int ov61_0222BEB8(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1); +int ov61_0222BED8(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222BED8 **param1); +int ov61_0222BF24(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1); #endif // POKEPLATINUM_OV61_0222BC4C_H diff --git a/include/overlay061/ov61_0222BF44.h b/include/overlay061/ov61_0222BF44.h index daf31cbe57..234918b55b 100644 --- a/include/overlay061/ov61_0222BF44.h +++ b/include/overlay061/ov61_0222BF44.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV61_0222BF44_H #define POKEPLATINUM_OV61_0222BF44_H +#include "overlay_manager.h" -int ov61_0222BF44(OverlayManager * param0, int * param1); -int ov61_0222C0F8(OverlayManager * param0, int * param1); -int ov61_0222C160(OverlayManager * param0, int * param1); +int ov61_0222BF44(OverlayManager *param0, int *param1); +int ov61_0222C0F8(OverlayManager *param0, int *param1); +int ov61_0222C160(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV61_0222BF44_H diff --git a/include/overlay061/struct_ov61_0222BED8_sub1_sub1.h b/include/overlay061/struct_ov61_0222BED8_sub1_sub1.h index 970b2f5a2f..5ef27444c8 100644 --- a/include/overlay061/struct_ov61_0222BED8_sub1_sub1.h +++ b/include/overlay061/struct_ov61_0222BED8_sub1_sub1.h @@ -13,7 +13,7 @@ typedef struct { u8 unk_1E_2 : 1; u8 unk_1E_3 : 1; u8 unk_1E_4 : 1; - u8 : 3; + u8 : 3; u8 unk_1F; } UnkStruct_ov61_0222BED8_sub1_sub1; diff --git a/include/overlay061/struct_ov61_0222C3B0.h b/include/overlay061/struct_ov61_0222C3B0.h index 7ea0add997..086a7ffd81 100644 --- a/include/overlay061/struct_ov61_0222C3B0.h +++ b/include/overlay061/struct_ov61_0222C3B0.h @@ -4,7 +4,7 @@ #include "sys_task_manager.h" typedef struct { - SysTask * unk_00; + SysTask *unk_00; BOOL unk_04; u16 unk_08[4][16]; u16 unk_88[21][16]; diff --git a/include/overlay062/funcptr_ov62_022349A8.h b/include/overlay062/funcptr_ov62_022349A8.h index 9707ba5edc..3a142f0af0 100644 --- a/include/overlay062/funcptr_ov62_022349A8.h +++ b/include/overlay062/funcptr_ov62_022349A8.h @@ -3,6 +3,6 @@ #include "strbuf.h" -typedef void (* UnkFuncPtr_ov62_022349A8)(void *, Strbuf *); +typedef void (*UnkFuncPtr_ov62_022349A8)(void *, Strbuf *); #endif // POKEPLATINUM_FUNCPTR_OV62_022349A8_H diff --git a/include/overlay062/ov62_0222F2C0.h b/include/overlay062/ov62_0222F2C0.h index c405627404..96d3338ac1 100644 --- a/include/overlay062/ov62_0222F2C0.h +++ b/include/overlay062/ov62_0222F2C0.h @@ -3,27 +3,27 @@ #include "struct_defs/struct_0208C06C.h" -void ov62_0222F2C0(UnkStruct_0208C06C * param0); -void ov62_0222F514(UnkStruct_0208C06C * param0); +void ov62_0222F2C0(UnkStruct_0208C06C *param0); +void ov62_0222F514(UnkStruct_0208C06C *param0); void ov62_0222F824(int param0); -void ov62_0222F834(UnkStruct_0208C06C * param0); -void ov62_0222F8E4(void * param0); -BOOL ov62_0222F910(UnkStruct_0208C06C * param0, int * param1); -void ov62_0222FB44(UnkStruct_0208C06C * param0, int param1, BOOL param2, int * param3); -void ov62_0222FB60(UnkStruct_0208C06C * param0, int param1); -void ov62_0222FB6C(UnkStruct_0208C06C * param0, int param1); -void ov62_0222FB74(UnkStruct_0208C06C * param0); -BOOL ov62_0222FB90(UnkStruct_0208C06C * param0); -BOOL ov62_0222FBF8(UnkStruct_0208C06C * param0); -void ov62_0222FC1C(UnkStruct_0208C06C * param0); -BOOL ov62_0222FD3C(UnkStruct_0208C06C * param0); -void ov62_0222FF40(UnkStruct_0208C06C * param0); -void ov62_0222FF7C(UnkStruct_0208C06C * param0); -void ov62_02230014(UnkStruct_0208C06C * param0); -void ov62_02230054(UnkStruct_0208C06C * param0); -void ov62_02230060(UnkStruct_0208C06C * param0); -void ov62_02230098(UnkStruct_0208C06C * param0); -BOOL ov62_022300BC(UnkStruct_0208C06C * param0); -void ov62_022300C8(UnkStruct_0208C06C * param0, int param1); +void ov62_0222F834(UnkStruct_0208C06C *param0); +void ov62_0222F8E4(void *param0); +BOOL ov62_0222F910(UnkStruct_0208C06C *param0, int *param1); +void ov62_0222FB44(UnkStruct_0208C06C *param0, int param1, BOOL param2, int *param3); +void ov62_0222FB60(UnkStruct_0208C06C *param0, int param1); +void ov62_0222FB6C(UnkStruct_0208C06C *param0, int param1); +void ov62_0222FB74(UnkStruct_0208C06C *param0); +BOOL ov62_0222FB90(UnkStruct_0208C06C *param0); +BOOL ov62_0222FBF8(UnkStruct_0208C06C *param0); +void ov62_0222FC1C(UnkStruct_0208C06C *param0); +BOOL ov62_0222FD3C(UnkStruct_0208C06C *param0); +void ov62_0222FF40(UnkStruct_0208C06C *param0); +void ov62_0222FF7C(UnkStruct_0208C06C *param0); +void ov62_02230014(UnkStruct_0208C06C *param0); +void ov62_02230054(UnkStruct_0208C06C *param0); +void ov62_02230060(UnkStruct_0208C06C *param0); +void ov62_02230098(UnkStruct_0208C06C *param0); +BOOL ov62_022300BC(UnkStruct_0208C06C *param0); +void ov62_022300C8(UnkStruct_0208C06C *param0, int param1); #endif // POKEPLATINUM_OV62_0222F2C0_H diff --git a/include/overlay062/ov62_022300D8.h b/include/overlay062/ov62_022300D8.h index 2fc028a444..ea35d2d631 100644 --- a/include/overlay062/ov62_022300D8.h +++ b/include/overlay062/ov62_022300D8.h @@ -2,51 +2,53 @@ #define POKEPLATINUM_OV62_022300D8_H #include "struct_decls/cell_actor_data.h" -#include "sys_task_manager.h" -#include "struct_defs/struct_0208C06C.h" #include "struct_decls/struct_020F3DCC_decl.h" +#include "struct_defs/struct_0208C06C.h" + #include "overlay062/struct_ov62_022307C0_sub1.h" #include "overlay062/struct_ov62_0223118C.h" #include "overlay062/struct_ov62_022312B0.h" -void ov62_022300D8(UnkStruct_0208C06C * param0); -void ov62_022302A8(UnkStruct_0208C06C * param0, int param1, BOOL param2); -void ov62_022302F0(UnkStruct_0208C06C * param0, int param1); -void ov62_02230330(UnkStruct_0208C06C * param0); -void ov62_02230464(UnkStruct_0208C06C * param0); -void ov62_0223066C(UnkStruct_0208C06C * param0); -void ov62_0223069C(UnkStruct_0208C06C * param0); -void ov62_022306B8(UnkStruct_0208C06C * param0); -void ov62_022307A0(UnkStruct_0208C06C * param0); -void ov62_022307C0(UnkStruct_0208C06C * param0); -void ov62_0223088C(UnkStruct_0208C06C * param0); -void ov62_02230A5C(UnkStruct_0208C06C * param0); -void ov62_02230AB8(UnkStruct_0208C06C * param0); -void ov62_02230AF0(UnkStruct_0208C06C * param0); -void ov62_02230B74(UnkStruct_0208C06C * param0); -void ov62_02230B9C(UnkStruct_0208C06C * param0, BOOL param1); -void ov62_02230C28(SysTask * param0, void * param1); -void ov62_02230E68(CellActorData * param0, s16 param1, s16 param2); -void ov62_02230E74(CellActorData * param0, s16 * param1, s16 * param2); -void ov62_02230E80(UnkStruct_0208C06C * param0); -void ov62_02230FC8(UnkStruct_0208C06C * param0, UnkStruct_ov62_022307C0_sub1 * param1, int param2, const UnkStruct_020F3DCC * param3); -void ov62_0223113C(UnkStruct_0208C06C * param0); -void ov62_0223118C(UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * param1, int param2); -void ov62_0223124C(UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * param1, int param2); -void ov62_022312B0(UnkStruct_ov62_022312B0 * param0); -void ov62_022312CC(UnkStruct_0208C06C * param0, int param1); -void ov62_0223131C(UnkStruct_0208C06C * param0, int param1); -void ov62_0223136C(UnkStruct_0208C06C * param0, int param1); -void ov62_022313BC(UnkStruct_0208C06C * param0); -CellActorData * ov62_022313E0(UnkStruct_0208C06C * param0, int param1); -void ov62_02231454(UnkStruct_0208C06C * param0); -void ov62_0223146C(UnkStruct_0208C06C * param0); -void ov62_022314A8(UnkStruct_0208C06C * param0); -void ov62_022314F0(int * param0, int * param1, int param2, int param3, int param4, int param5, int param6); -void ov62_02231560(int * param0, int * param1, int param2, int param3, int param4, int param5, int param6); -void ov62_022315C8(int * param0, int * param1, int param2); -BOOL ov62_022315E0(int * param0, int * param1, int param2, int param3); -BOOL ov62_02231664(int * param0, int param1); -void ov62_02231688(int * param0); +#include "sys_task_manager.h" + +void ov62_022300D8(UnkStruct_0208C06C *param0); +void ov62_022302A8(UnkStruct_0208C06C *param0, int param1, BOOL param2); +void ov62_022302F0(UnkStruct_0208C06C *param0, int param1); +void ov62_02230330(UnkStruct_0208C06C *param0); +void ov62_02230464(UnkStruct_0208C06C *param0); +void ov62_0223066C(UnkStruct_0208C06C *param0); +void ov62_0223069C(UnkStruct_0208C06C *param0); +void ov62_022306B8(UnkStruct_0208C06C *param0); +void ov62_022307A0(UnkStruct_0208C06C *param0); +void ov62_022307C0(UnkStruct_0208C06C *param0); +void ov62_0223088C(UnkStruct_0208C06C *param0); +void ov62_02230A5C(UnkStruct_0208C06C *param0); +void ov62_02230AB8(UnkStruct_0208C06C *param0); +void ov62_02230AF0(UnkStruct_0208C06C *param0); +void ov62_02230B74(UnkStruct_0208C06C *param0); +void ov62_02230B9C(UnkStruct_0208C06C *param0, BOOL param1); +void ov62_02230C28(SysTask *param0, void *param1); +void ov62_02230E68(CellActorData *param0, s16 param1, s16 param2); +void ov62_02230E74(CellActorData *param0, s16 *param1, s16 *param2); +void ov62_02230E80(UnkStruct_0208C06C *param0); +void ov62_02230FC8(UnkStruct_0208C06C *param0, UnkStruct_ov62_022307C0_sub1 *param1, int param2, const UnkStruct_020F3DCC *param3); +void ov62_0223113C(UnkStruct_0208C06C *param0); +void ov62_0223118C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *param1, int param2); +void ov62_0223124C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *param1, int param2); +void ov62_022312B0(UnkStruct_ov62_022312B0 *param0); +void ov62_022312CC(UnkStruct_0208C06C *param0, int param1); +void ov62_0223131C(UnkStruct_0208C06C *param0, int param1); +void ov62_0223136C(UnkStruct_0208C06C *param0, int param1); +void ov62_022313BC(UnkStruct_0208C06C *param0); +CellActorData *ov62_022313E0(UnkStruct_0208C06C *param0, int param1); +void ov62_02231454(UnkStruct_0208C06C *param0); +void ov62_0223146C(UnkStruct_0208C06C *param0); +void ov62_022314A8(UnkStruct_0208C06C *param0); +void ov62_022314F0(int *param0, int *param1, int param2, int param3, int param4, int param5, int param6); +void ov62_02231560(int *param0, int *param1, int param2, int param3, int param4, int param5, int param6); +void ov62_022315C8(int *param0, int *param1, int param2); +BOOL ov62_022315E0(int *param0, int *param1, int param2, int param3); +BOOL ov62_02231664(int *param0, int param1); +void ov62_02231688(int *param0); #endif // POKEPLATINUM_OV62_022300D8_H diff --git a/include/overlay062/ov62_02231690.h b/include/overlay062/ov62_02231690.h index 5066bab213..5b0eec5698 100644 --- a/include/overlay062/ov62_02231690.h +++ b/include/overlay062/ov62_02231690.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_OV62_02231690_H #define POKEPLATINUM_OV62_02231690_H -#include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/cell_actor_data.h" -#include "strbuf.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0202F41C_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208B878.h" #include "struct_defs/struct_0208C06C.h" + #include "overlay062/struct_ov62_022312B0.h" #include "overlay062/struct_ov62_022323B8.h" #include "overlay062/struct_ov62_02233310.h" @@ -17,88 +16,91 @@ #include "overlay062/struct_ov62_0223CAA4.h" #include "overlay062/struct_ov62_02248CDC.h" -StringTemplate * ov62_02231690(u32 param0); -int ov62_022316A0(UnkStruct_0208C06C * param0); -int ov62_022316D0(UnkStruct_0208C06C * param0); -int ov62_02231710(UnkStruct_0208C06C * param0, int param1); -void ov62_022317CC(UnkStruct_0208C06C * param0, int param1); -void ov62_022318E8(UnkStruct_0208C06C * param0); -u16 * ov62_02231948(int param0, int param1, int * param2); -void ov62_0223196C(UnkStruct_0208C06C * param0, BOOL param1); -BOOL ov62_02231974(UnkStruct_0208C06C * param0); -void ov62_0223197C(UnkStruct_0208C06C * param0, int param1); -void ov62_02231A1C(UnkStruct_0208C06C * param0); -void ov62_02231A88(UnkStruct_0208C06C * param0); -void ov62_02231AAC(UnkStruct_0208C06C * param0, int param1); -void ov62_02231B3C(UnkStruct_0208C06C * param0, int param1); -void ov62_02231B8C(UnkStruct_0208C06C * param0); -void ov62_02231BC4(UnkStruct_0208C06C * param0, int param1); +#include "message.h" +#include "strbuf.h" + +StringTemplate *ov62_02231690(u32 param0); +int ov62_022316A0(UnkStruct_0208C06C *param0); +int ov62_022316D0(UnkStruct_0208C06C *param0); +int ov62_02231710(UnkStruct_0208C06C *param0, int param1); +void ov62_022317CC(UnkStruct_0208C06C *param0, int param1); +void ov62_022318E8(UnkStruct_0208C06C *param0); +u16 *ov62_02231948(int param0, int param1, int *param2); +void ov62_0223196C(UnkStruct_0208C06C *param0, BOOL param1); +BOOL ov62_02231974(UnkStruct_0208C06C *param0); +void ov62_0223197C(UnkStruct_0208C06C *param0, int param1); +void ov62_02231A1C(UnkStruct_0208C06C *param0); +void ov62_02231A88(UnkStruct_0208C06C *param0); +void ov62_02231AAC(UnkStruct_0208C06C *param0, int param1); +void ov62_02231B3C(UnkStruct_0208C06C *param0, int param1); +void ov62_02231B8C(UnkStruct_0208C06C *param0); +void ov62_02231BC4(UnkStruct_0208C06C *param0, int param1); int ov62_02232234(int param0, int param1); -void ov62_02232378(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1); -void ov62_02232394(UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1); -void ov62_022323B8(UnkStruct_ov62_022323B8 * param0, int param1); -void ov62_022324A0(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2); -void ov62_02232594(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, MessageLoader * param2, const UnkStruct_ov62_02248CDC * param3); -void ov62_02232778(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, MessageLoader * param2, const UnkStruct_ov62_02248CDC * param3, int param4, int param5, Strbuf *param6); -void ov62_02232AAC(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, const UnkStruct_ov62_02248CDC * param2, Strbuf *param3[20][2]); -int ov62_02232BB4(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, Strbuf *param2[20][2]); -int ov62_02232C78(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, int param2, int param3, Strbuf *param4); -int ov62_02232F68(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1); -int ov62_02233064(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1); -void ov62_022331C8(UnkStruct_ov62_02233310 * param0, s16 param1); -void ov62_022332AC(UnkStruct_ov62_02233310 * param0, s16 param1); -void ov62_022332FC(UnkStruct_ov62_02233310 * param0); -void ov62_02233310(UnkStruct_ov62_02233310 * param0); -void ov62_0223331C(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1, int param2); -void ov62_02233434(UnkStruct_ov62_02233310 * param0, s16 param1, s16 param2); -void ov62_02233454(UnkStruct_ov62_02233310 * param0); -void ov62_0223349C(UnkStruct_ov62_02233310 * param0); -void ov62_022334FC(UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param1); -void ov62_022335B0(UnkStruct_ov62_0223359C * param0, UnkStruct_0208C06C * param1); -void ov62_022335BC(UnkStruct_ov62_0223359C * param0, UnkStruct_0208C06C * param1, int param2); -void ov62_022335F4(UnkStruct_ov62_0223359C * param0); -void ov62_02233600(UnkStruct_ov62_0223359C * param0); -void ov62_02233608(UnkStruct_ov62_0223359C * param0, u32 param1); -void ov62_02233638(UnkStruct_ov62_0223359C * param0, UnkStruct_ov62_02233310 * param1); -void ov62_02233664(UnkStruct_ov62_0223359C * param0); -void ov62_02233704(UnkStruct_0208C06C * param0, u32 param1); -void ov62_0223371C(UnkStruct_0208C06C * param0); -void ov62_0223376C(UnkStruct_0208C06C * param0, int param1); -BOOL ov62_02233790(UnkStruct_0208C06C * param0); -void ov62_022337D4(UnkStruct_0208C06C * param0); -BOOL ov62_022337F0(UnkStruct_0208C06C * param0, int param1, u8 param2); -void ov62_0223381C(UnkStruct_0208C06C * param0, BOOL param1); -void ov62_02233828(void * param0, const UnkStruct_ov62_0223CAA4 * param1); -void ov62_022338A8(UnkStruct_0208C06C * param0); -void ov62_022339A0(UnkStruct_0208C06C * param0); -void ov62_022339DC(UnkStruct_0208C06C * param0); -void ov62_02233A44(UnkStruct_0208C06C * param0); -NARC * ov62_02233A68(int param0); -void ov62_02233A74(NARC * param0); -CellActorData * ov62_02233A7C(UnkStruct_0208C06C * param0, NARC * param1, int param2, int param3, int param4, int param5); -void ov62_02233B24(UnkStruct_0208C06C * param0, int param1, CellActorData * param2); -void ov62_02233B40(UnkStruct_0208C06C * param0, int param1, CellActorData * param2); -BOOL ov62_02233F94(UnkStruct_0202F41C * param0); -int ov62_02233FEC(UnkStruct_ov62_02233F74 * param0); -void ov62_02234214(UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C * param1); -void ov62_02234228(UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C * param1); -void ov62_0223427C(UnkStruct_ov62_02233F74 * param0, int param1); -int ov62_0223429C(Window * param0, Strbuf *param1); -void ov62_022342BC(UnkStruct_0208C06C * param0); -BOOL ov62_022342CC(UnkStruct_0208C06C * param0); +void ov62_02232378(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1); +void ov62_02232394(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1); +void ov62_022323B8(UnkStruct_ov62_022323B8 *param0, int param1); +void ov62_022324A0(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, const UnkStruct_ov62_02248CDC *param2); +void ov62_02232594(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, MessageLoader *param2, const UnkStruct_ov62_02248CDC *param3); +void ov62_02232778(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, MessageLoader *param2, const UnkStruct_ov62_02248CDC *param3, int param4, int param5, Strbuf *param6); +void ov62_02232AAC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, const UnkStruct_ov62_02248CDC *param2, Strbuf *param3[20][2]); +int ov62_02232BB4(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, Strbuf *param2[20][2]); +int ov62_02232C78(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, int param2, int param3, Strbuf *param4); +int ov62_02232F68(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1); +int ov62_02233064(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1); +void ov62_022331C8(UnkStruct_ov62_02233310 *param0, s16 param1); +void ov62_022332AC(UnkStruct_ov62_02233310 *param0, s16 param1); +void ov62_022332FC(UnkStruct_ov62_02233310 *param0); +void ov62_02233310(UnkStruct_ov62_02233310 *param0); +void ov62_0223331C(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, int param2); +void ov62_02233434(UnkStruct_ov62_02233310 *param0, s16 param1, s16 param2); +void ov62_02233454(UnkStruct_ov62_02233310 *param0); +void ov62_0223349C(UnkStruct_ov62_02233310 *param0); +void ov62_022334FC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1); +void ov62_022335B0(UnkStruct_ov62_0223359C *param0, UnkStruct_0208C06C *param1); +void ov62_022335BC(UnkStruct_ov62_0223359C *param0, UnkStruct_0208C06C *param1, int param2); +void ov62_022335F4(UnkStruct_ov62_0223359C *param0); +void ov62_02233600(UnkStruct_ov62_0223359C *param0); +void ov62_02233608(UnkStruct_ov62_0223359C *param0, u32 param1); +void ov62_02233638(UnkStruct_ov62_0223359C *param0, UnkStruct_ov62_02233310 *param1); +void ov62_02233664(UnkStruct_ov62_0223359C *param0); +void ov62_02233704(UnkStruct_0208C06C *param0, u32 param1); +void ov62_0223371C(UnkStruct_0208C06C *param0); +void ov62_0223376C(UnkStruct_0208C06C *param0, int param1); +BOOL ov62_02233790(UnkStruct_0208C06C *param0); +void ov62_022337D4(UnkStruct_0208C06C *param0); +BOOL ov62_022337F0(UnkStruct_0208C06C *param0, int param1, u8 param2); +void ov62_0223381C(UnkStruct_0208C06C *param0, BOOL param1); +void ov62_02233828(void *param0, const UnkStruct_ov62_0223CAA4 *param1); +void ov62_022338A8(UnkStruct_0208C06C *param0); +void ov62_022339A0(UnkStruct_0208C06C *param0); +void ov62_022339DC(UnkStruct_0208C06C *param0); +void ov62_02233A44(UnkStruct_0208C06C *param0); +NARC *ov62_02233A68(int param0); +void ov62_02233A74(NARC *param0); +CellActorData *ov62_02233A7C(UnkStruct_0208C06C *param0, NARC *param1, int param2, int param3, int param4, int param5); +void ov62_02233B24(UnkStruct_0208C06C *param0, int param1, CellActorData *param2); +void ov62_02233B40(UnkStruct_0208C06C *param0, int param1, CellActorData *param2); +BOOL ov62_02233F94(UnkStruct_0202F41C *param0); +int ov62_02233FEC(UnkStruct_ov62_02233F74 *param0); +void ov62_02234214(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *param1); +void ov62_02234228(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *param1); +void ov62_0223427C(UnkStruct_ov62_02233F74 *param0, int param1); +int ov62_0223429C(Window *param0, Strbuf *param1); +void ov62_022342BC(UnkStruct_0208C06C *param0); +BOOL ov62_022342CC(UnkStruct_0208C06C *param0); void ov62_02234314(void); -void ov62_02234358(UnkStruct_0208C06C * param0, UnkStruct_0208B878 * param1, s16 param2, s16 param3); +void ov62_02234358(UnkStruct_0208C06C *param0, UnkStruct_0208B878 *param1, s16 param2, s16 param3); int ov62_0223438C(u64 param0); -void ov62_022343B8(UnkStruct_0208C06C * param0, int param1, int param2); -void ov62_02234520(UnkStruct_0208C06C * param0); -BOOL ov62_02234534(UnkStruct_0208C06C * param0); -void ov62_02234540(UnkStruct_0208C06C * param0, BOOL param1); -void ov62_0223454C(UnkStruct_0208C06C * param0, UnkStruct_ov62_022312B0 * param1, int param2, int param3, s16 param4, s16 param5, s16 param6, s16 param7, int param8, BOOL param9); -void ov62_022345A8(UnkStruct_ov62_022312B0 * param0); -int ov62_022345B8(UnkStruct_0208C06C * param0, int param1, int param2, int param3); -void ov62_022348B8(UnkStruct_0208C06C * param0, int param1, int param2, int param3); -void ov62_022348FC(UnkStruct_0208C06C * param0); -BOOL ov62_02234970(UnkStruct_0208C06C * param0, u64 param1); -void ov62_022349A8(UnkStruct_0208C06C * param0, Strbuf *param1); +void ov62_022343B8(UnkStruct_0208C06C *param0, int param1, int param2); +void ov62_02234520(UnkStruct_0208C06C *param0); +BOOL ov62_02234534(UnkStruct_0208C06C *param0); +void ov62_02234540(UnkStruct_0208C06C *param0, BOOL param1); +void ov62_0223454C(UnkStruct_0208C06C *param0, UnkStruct_ov62_022312B0 *param1, int param2, int param3, s16 param4, s16 param5, s16 param6, s16 param7, int param8, BOOL param9); +void ov62_022345A8(UnkStruct_ov62_022312B0 *param0); +int ov62_022345B8(UnkStruct_0208C06C *param0, int param1, int param2, int param3); +void ov62_022348B8(UnkStruct_0208C06C *param0, int param1, int param2, int param3); +void ov62_022348FC(UnkStruct_0208C06C *param0); +BOOL ov62_02234970(UnkStruct_0208C06C *param0, u64 param1); +void ov62_022349A8(UnkStruct_0208C06C *param0, Strbuf *param1); #endif // POKEPLATINUM_OV62_02231690_H diff --git a/include/overlay062/ov62_02234A10.h b/include/overlay062/ov62_02234A10.h index 68a181a0f2..bb88729880 100644 --- a/include/overlay062/ov62_02234A10.h +++ b/include/overlay062/ov62_02234A10.h @@ -3,8 +3,8 @@ #include "struct_defs/struct_0208C06C.h" -BOOL ov62_02234CDC(UnkStruct_0208C06C * param0); -BOOL ov62_02234EF8(UnkStruct_0208C06C * param0); -BOOL ov62_02235008(UnkStruct_0208C06C * param0); +BOOL ov62_02234CDC(UnkStruct_0208C06C *param0); +BOOL ov62_02234EF8(UnkStruct_0208C06C *param0); +BOOL ov62_02235008(UnkStruct_0208C06C *param0); #endif // POKEPLATINUM_OV62_02234A10_H diff --git a/include/overlay062/ov62_02235278.h b/include/overlay062/ov62_02235278.h index fb8812fee7..a4931fe57a 100644 --- a/include/overlay062/ov62_02235278.h +++ b/include/overlay062/ov62_02235278.h @@ -3,6 +3,6 @@ #include "sys_task_manager.h" -void ov62_022354A4(SysTask * param0, void * param1); +void ov62_022354A4(SysTask *param0, void *param1); #endif // POKEPLATINUM_OV62_02235278_H diff --git a/include/overlay062/ov62_02237D24.h b/include/overlay062/ov62_02237D24.h index 9b3da8b057..6ee00eed5a 100644 --- a/include/overlay062/ov62_02237D24.h +++ b/include/overlay062/ov62_02237D24.h @@ -3,7 +3,7 @@ #include "overlay062/struct_ov62_0223CAA4.h" -void ov62_02239D34(void * param0, const UnkStruct_ov62_0223CAA4 * param1); -void ov62_02239D38(void * param0, const UnkStruct_ov62_0223CAA4 * param1); +void ov62_02239D34(void *param0, const UnkStruct_ov62_0223CAA4 *param1); +void ov62_02239D38(void *param0, const UnkStruct_ov62_0223CAA4 *param1); #endif // POKEPLATINUM_OV62_02237D24_H diff --git a/include/overlay062/ov62_02239D60.h b/include/overlay062/ov62_02239D60.h index aedef1d816..e6a8c04d48 100644 --- a/include/overlay062/ov62_02239D60.h +++ b/include/overlay062/ov62_02239D60.h @@ -3,7 +3,7 @@ #include "overlay062/struct_ov62_0223CAA4.h" -void ov62_0223CAA4(void * param0, const UnkStruct_ov62_0223CAA4 * param1); -void ov62_0223CAA8(void * param0, const UnkStruct_ov62_0223CAA4 * param1); +void ov62_0223CAA4(void *param0, const UnkStruct_ov62_0223CAA4 *param1); +void ov62_0223CAA8(void *param0, const UnkStruct_ov62_0223CAA4 *param1); #endif // POKEPLATINUM_OV62_02239D60_H diff --git a/include/overlay062/ov62_0223CAEC.h b/include/overlay062/ov62_0223CAEC.h index b84c1d8680..fe9d5b6065 100644 --- a/include/overlay062/ov62_0223CAEC.h +++ b/include/overlay062/ov62_0223CAEC.h @@ -3,7 +3,7 @@ #include "overlay062/struct_ov62_0223CAA4.h" -void ov62_0223DF10(void * param0, const UnkStruct_ov62_0223CAA4 * param1); -void ov62_0223DF4C(void * param0, const UnkStruct_ov62_0223CAA4 * param1); +void ov62_0223DF10(void *param0, const UnkStruct_ov62_0223CAA4 *param1); +void ov62_0223DF4C(void *param0, const UnkStruct_ov62_0223CAA4 *param1); #endif // POKEPLATINUM_OV62_0223CAEC_H diff --git a/include/overlay062/ov62_0224112C.h b/include/overlay062/ov62_0224112C.h index 0af8f536b9..343d3a38c8 100644 --- a/include/overlay062/ov62_0224112C.h +++ b/include/overlay062/ov62_0224112C.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV62_0224112C_H #include "struct_defs/struct_0208C06C.h" + #include "overlay062/struct_ov62_022349A8.h" -UnkStruct_ov62_022349A8 * ov62_0224112C(UnkStruct_0208C06C * param0); -void ov62_02241130(UnkStruct_0208C06C * param0); -BOOL ov62_022411B8(UnkStruct_0208C06C * param0); -void ov62_022411D4(UnkStruct_0208C06C * param0); -void ov62_022411EC(UnkStruct_0208C06C * param0); +UnkStruct_ov62_022349A8 *ov62_0224112C(UnkStruct_0208C06C *param0); +void ov62_02241130(UnkStruct_0208C06C *param0); +BOOL ov62_022411B8(UnkStruct_0208C06C *param0); +void ov62_022411D4(UnkStruct_0208C06C *param0); +void ov62_022411EC(UnkStruct_0208C06C *param0); #endif // POKEPLATINUM_OV62_0224112C_H diff --git a/include/overlay062/ov62_02241204.h b/include/overlay062/ov62_02241204.h index 58e974b3a4..80d5942e32 100644 --- a/include/overlay062/ov62_02241204.h +++ b/include/overlay062/ov62_02241204.h @@ -3,8 +3,8 @@ #include "overlay062/struct_ov62_0223CAA4.h" -void ov62_02246944(void * param0, const UnkStruct_ov62_0223CAA4 * param1); -void ov62_02246968(void * param0, const UnkStruct_ov62_0223CAA4 * param1); -void ov62_0224699C(void * param0, const UnkStruct_ov62_0223CAA4 * param1); +void ov62_02246944(void *param0, const UnkStruct_ov62_0223CAA4 *param1); +void ov62_02246968(void *param0, const UnkStruct_ov62_0223CAA4 *param1); +void ov62_0224699C(void *param0, const UnkStruct_ov62_0223CAA4 *param1); #endif // POKEPLATINUM_OV62_02241204_H diff --git a/include/overlay062/ov62_02246B00.h b/include/overlay062/ov62_02246B00.h index f6fa87c118..f70446e808 100644 --- a/include/overlay062/ov62_02246B00.h +++ b/include/overlay062/ov62_02246B00.h @@ -1,40 +1,41 @@ #ifndef POKEPLATINUM_OV62_02246B00_H #define POKEPLATINUM_OV62_02246B00_H -#include "game_options.h" #include "overlay062/struct_ov62_02246B00.h" #include "overlay062/struct_ov62_02246BF4.h" -UnkStruct_ov62_02246B00 * ov62_02246B00(int param0, int param1, int param2[], Options * param3); -void ov62_02246B4C(UnkStruct_ov62_02246B00 * param0); -void ov62_02246B70(UnkStruct_ov62_02246BF4 * param0, int param1); -void ov62_02246BF4(UnkStruct_ov62_02246BF4 * param0); -void ov62_02246D60(UnkStruct_ov62_02246BF4 * param0, int param1); -BOOL ov62_02246D78(UnkStruct_ov62_02246BF4 * param0); -BOOL ov62_02246DB8(UnkStruct_ov62_02246BF4 * param0); -BOOL ov62_02246DD0(UnkStruct_ov62_02246BF4 * param0); -BOOL ov62_02246DF8(UnkStruct_ov62_02246BF4 * param0); -BOOL ov62_02247084(UnkStruct_ov62_02246BF4 * param0); -void ov62_022470A8(UnkStruct_ov62_02246BF4 * param0); -void ov62_02247160(UnkStruct_ov62_02246BF4 * param0); -void ov62_02247220(UnkStruct_ov62_02246BF4 * param0); -void ov62_0224730C(u32 param0, u32 param1, void * param2); -void ov62_022474A8(UnkStruct_ov62_02246BF4 * param0); -void ov62_02247504(UnkStruct_ov62_02246BF4 * param0); -int ov62_02247518(UnkStruct_ov62_02246BF4 * param0, int param1); -int ov62_02247540(UnkStruct_ov62_02246BF4 * param0, int param1); -void ov62_02247574(UnkStruct_ov62_02246BF4 * param0); -void ov62_02247694(UnkStruct_ov62_02246BF4 * param0); -void ov62_02247754(UnkStruct_ov62_02246BF4 * param0); -void ov62_0224784C(UnkStruct_ov62_02246BF4 * param0); -void ov62_02247968(UnkStruct_ov62_02246BF4 * param0, int param1, BOOL param2); -void ov62_02247998(UnkStruct_ov62_02246BF4 * param0, int param1); -void ov62_022479D4(UnkStruct_ov62_02246BF4 * param0, int param1); -void ov62_02247A20(UnkStruct_ov62_02246BF4 * param0, int param1, int param2); -void ov62_02247A70(UnkStruct_ov62_02246BF4 * param0); +#include "game_options.h" + +UnkStruct_ov62_02246B00 *ov62_02246B00(int param0, int param1, int param2[], Options *param3); +void ov62_02246B4C(UnkStruct_ov62_02246B00 *param0); +void ov62_02246B70(UnkStruct_ov62_02246BF4 *param0, int param1); +void ov62_02246BF4(UnkStruct_ov62_02246BF4 *param0); +void ov62_02246D60(UnkStruct_ov62_02246BF4 *param0, int param1); +BOOL ov62_02246D78(UnkStruct_ov62_02246BF4 *param0); +BOOL ov62_02246DB8(UnkStruct_ov62_02246BF4 *param0); +BOOL ov62_02246DD0(UnkStruct_ov62_02246BF4 *param0); +BOOL ov62_02246DF8(UnkStruct_ov62_02246BF4 *param0); +BOOL ov62_02247084(UnkStruct_ov62_02246BF4 *param0); +void ov62_022470A8(UnkStruct_ov62_02246BF4 *param0); +void ov62_02247160(UnkStruct_ov62_02246BF4 *param0); +void ov62_02247220(UnkStruct_ov62_02246BF4 *param0); +void ov62_0224730C(u32 param0, u32 param1, void *param2); +void ov62_022474A8(UnkStruct_ov62_02246BF4 *param0); +void ov62_02247504(UnkStruct_ov62_02246BF4 *param0); +int ov62_02247518(UnkStruct_ov62_02246BF4 *param0, int param1); +int ov62_02247540(UnkStruct_ov62_02246BF4 *param0, int param1); +void ov62_02247574(UnkStruct_ov62_02246BF4 *param0); +void ov62_02247694(UnkStruct_ov62_02246BF4 *param0); +void ov62_02247754(UnkStruct_ov62_02246BF4 *param0); +void ov62_0224784C(UnkStruct_ov62_02246BF4 *param0); +void ov62_02247968(UnkStruct_ov62_02246BF4 *param0, int param1, BOOL param2); +void ov62_02247998(UnkStruct_ov62_02246BF4 *param0, int param1); +void ov62_022479D4(UnkStruct_ov62_02246BF4 *param0, int param1); +void ov62_02247A20(UnkStruct_ov62_02246BF4 *param0, int param1, int param2); +void ov62_02247A70(UnkStruct_ov62_02246BF4 *param0); int ov62_02247B3C(int param0, BOOL param1); -void ov62_02247B48(UnkStruct_ov62_02246BF4 * param0); -void ov62_02247B88(UnkStruct_ov62_02246BF4 * param0, int param1); -void ov62_02247CE0(UnkStruct_ov62_02246BF4 * param0); +void ov62_02247B48(UnkStruct_ov62_02246BF4 *param0); +void ov62_02247B88(UnkStruct_ov62_02246BF4 *param0, int param1); +void ov62_02247CE0(UnkStruct_ov62_02246BF4 *param0); #endif // POKEPLATINUM_OV62_02246B00_H diff --git a/include/overlay062/ov62_02248408.h b/include/overlay062/ov62_02248408.h index bd86b836d2..e28f51476c 100644 --- a/include/overlay062/ov62_02248408.h +++ b/include/overlay062/ov62_02248408.h @@ -2,13 +2,15 @@ #define POKEPLATINUM_OV62_02248408_H #include "struct_decls/struct_0202F264_decl.h" -#include "savedata.h" + #include "overlay006/battle_params.h" -void ov62_02248408(BattleRecording * param0, BattleParams * param1, int param2); -int ov62_02248598(SaveData * param0, int param1, u8 param2, u16 * param3, u16 * param4); -void ov62_02248624(SaveData * param0); -int ov62_02248658(SaveData * param0, u64 param1, u16 * param2, u16 * param3); -int ov62_022486A4(SaveData * param0, int param1); +#include "savedata.h" + +void ov62_02248408(BattleRecording *param0, BattleParams *param1, int param2); +int ov62_02248598(SaveData *param0, int param1, u8 param2, u16 *param3, u16 *param4); +void ov62_02248624(SaveData *param0); +int ov62_02248658(SaveData *param0, u64 param1, u16 *param2, u16 *param3); +int ov62_022486A4(SaveData *param0, int param1); #endif // POKEPLATINUM_OV62_02248408_H diff --git a/include/overlay062/ov62_const_funcptr_tables.h b/include/overlay062/ov62_const_funcptr_tables.h index 826be8e6c9..89641a6bb1 100644 --- a/include/overlay062/ov62_const_funcptr_tables.h +++ b/include/overlay062/ov62_const_funcptr_tables.h @@ -3,19 +3,19 @@ #include "struct_defs/struct_0208C06C.h" -extern BOOL(*const Unk_ov62_02248F58[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_022490DC[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02249680[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_0224962C[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02249618[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02248BD8[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02248BF0[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02249790[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02248C28[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02248C50[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02248D08[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02248D20[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02248E24[])(UnkStruct_0208C06C *); -extern BOOL(*const Unk_ov62_02248E50[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02248F58[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_022490DC[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02249680[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_0224962C[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02249618[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02248BD8[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02248BF0[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02249790[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02248C28[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02248C50[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02248D08[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02248D20[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02248E24[])(UnkStruct_0208C06C *); +extern BOOL (*const Unk_ov62_02248E50[])(UnkStruct_0208C06C *); #endif POKEPLATINUM_OV62_CONST_FUNCPTR_TABLES_H diff --git a/include/overlay062/struct_ov62_022307C0.h b/include/overlay062/struct_ov62_022307C0.h index 5dff584368..9a98aa67cf 100644 --- a/include/overlay062/struct_ov62_022307C0.h +++ b/include/overlay062/struct_ov62_022307C0.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_STRUCT_OV62_022307C0_H #include "struct_decls/struct_020F3DCC_decl.h" + #include "overlay062/struct_ov62_022307C0_sub1.h" typedef struct { UnkStruct_ov62_022307C0_sub1 unk_00[5]; UnkStruct_ov62_022307C0_sub1 unk_C8[5]; - const UnkStruct_020F3DCC * unk_190[5]; + const UnkStruct_020F3DCC *unk_190[5]; int unk_1A4; u8 padding_1A8[4]; int unk_1AC; diff --git a/include/overlay062/struct_ov62_022307C0_sub1.h b/include/overlay062/struct_ov62_022307C0_sub1.h index 70a7bb8373..aacd89d05e 100644 --- a/include/overlay062/struct_ov62_022307C0_sub1.h +++ b/include/overlay062/struct_ov62_022307C0_sub1.h @@ -2,18 +2,19 @@ #define POKEPLATINUM_STRUCT_OV62_022307C0_SUB1_H #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02012B20_decl.h" #include "struct_decls/font_oam.h" +#include "struct_decls/struct_02012B20_decl.h" #include "struct_defs/sprite_manager_allocation.h" + #include "touch_screen.h" typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; u8 padding_04[8]; BOOL unk_0C; - TouchScreenRect * unk_10; - FontOAM * unk_14; - UnkStruct_02012B20 * unk_18; + TouchScreenRect *unk_10; + FontOAM *unk_14; + UnkStruct_02012B20 *unk_18; SpriteManagerAllocation unk_1C; } UnkStruct_ov62_022307C0_sub1; diff --git a/include/overlay062/struct_ov62_02230C28.h b/include/overlay062/struct_ov62_02230C28.h index 54cd186f4a..2d7e84ee1b 100644 --- a/include/overlay062/struct_ov62_02230C28.h +++ b/include/overlay062/struct_ov62_02230C28.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV62_02230C28_H #include "struct_decls/cell_actor_data.h" + #include "sys_task_manager.h" typedef struct { - CellActorData * unk_00[2]; - SysTask * unk_08; + CellActorData *unk_00[2]; + SysTask *unk_08; fx32 unk_0C; f32 unk_10; s16 unk_14; diff --git a/include/overlay062/struct_ov62_0223118C.h b/include/overlay062/struct_ov62_0223118C.h index e6adda4d85..d5675400f9 100644 --- a/include/overlay062/struct_ov62_0223118C.h +++ b/include/overlay062/struct_ov62_0223118C.h @@ -4,38 +4,40 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "touch_screen.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_defs/struct_0207C690.h" + #include "overlay062/struct_ov62_0223118C_sub1.h" #include "overlay062/struct_ov62_02233310.h" #include "overlay062/struct_ov62_0223359C.h" #include "overlay062/struct_ov62_022349A8.h" +#include "message.h" +#include "touch_screen.h" + typedef struct { - NARC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + NARC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; u8 padding_0C[4]; - BGL * unk_10; - PaletteData * unk_14; - UnkStruct_02023FCC * unk_18; + BGL *unk_10; + PaletteData *unk_14; + UnkStruct_02023FCC *unk_18; TouchScreenRect unk_1C[5]; BOOL unk_30; - MessageLoader * unk_34; - MessageLoader * unk_38; - UnkStruct_02012744 * unk_3C; + MessageLoader *unk_34; + MessageLoader *unk_38; + UnkStruct_02012744 *unk_3C; int unk_40; int unk_44; u8 unk_48; u8 padding_49[3]; - GenericPointerData * unk_4C; - UnkStruct_02007768 * unk_50; + GenericPointerData *unk_4C; + UnkStruct_02007768 *unk_50; UnkStruct_ov62_022349A8 unk_54; UnkStruct_ov62_0223359C unk_46C; UnkStruct_ov62_02233310 unk_48C; diff --git a/include/overlay062/struct_ov62_022312B0.h b/include/overlay062/struct_ov62_022312B0.h index 5c368de771..4d9854263f 100644 --- a/include/overlay062/struct_ov62_022312B0.h +++ b/include/overlay062/struct_ov62_022312B0.h @@ -2,15 +2,15 @@ #define POKEPLATINUM_STRUCT_OV62_022312B0_H #include "struct_decls/cell_actor_data.h" -#include "struct_decls/struct_02012B20_decl.h" #include "struct_decls/font_oam.h" +#include "struct_decls/struct_02012B20_decl.h" #include "struct_defs/sprite_manager_allocation.h" typedef struct { u8 padding_00[4]; - CellActorData * unk_08; - FontOAM * unk_0C; - UnkStruct_02012B20 * unk_10; + CellActorData *unk_08; + FontOAM *unk_0C; + UnkStruct_02012B20 *unk_10; SpriteManagerAllocation unk_14; } UnkStruct_ov62_022312B0; diff --git a/include/overlay062/struct_ov62_022323B8.h b/include/overlay062/struct_ov62_022323B8.h index 2dda924e51..d42231f443 100644 --- a/include/overlay062/struct_ov62_022323B8.h +++ b/include/overlay062/struct_ov62_022323B8.h @@ -6,9 +6,9 @@ #include "struct_defs/struct_0205AA50.h" typedef struct { - UnkStruct_02030A80 * unk_00; - CellActorData * unk_04; - CellActorData * unk_08; + UnkStruct_02030A80 *unk_00; + CellActorData *unk_04; + CellActorData *unk_08; Window unk_0C[8]; } UnkStruct_ov62_022323B8; diff --git a/include/overlay062/struct_ov62_02233310.h b/include/overlay062/struct_ov62_02233310.h index 833ede7c8c..2e80ec342c 100644 --- a/include/overlay062/struct_ov62_02233310.h +++ b/include/overlay062/struct_ov62_02233310.h @@ -1,12 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_OV62_02233310_H #define POKEPLATINUM_STRUCT_OV62_02233310_H -#include "message.h" #include "struct_decls/cell_actor_data.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay062/struct_ov62_02233310_sub1.h" #include "overlay062/struct_ov62_02248CDC.h" +#include "message.h" + typedef struct { int unk_00; int unk_04; @@ -16,9 +18,9 @@ typedef struct { int unk_10; int unk_14; Window unk_18; - const UnkStruct_ov62_02248CDC * unk_28; - CellActorData * unk_2C[2]; - MessageLoader * unk_34; + const UnkStruct_ov62_02248CDC *unk_28; + CellActorData *unk_2C[2]; + MessageLoader *unk_34; UnkStruct_ov62_02233310_sub1 unk_38; BOOL unk_48; u8 padding_4C[4]; diff --git a/include/overlay062/struct_ov62_0223359C.h b/include/overlay062/struct_ov62_0223359C.h index f141315a32..198401e93c 100644 --- a/include/overlay062/struct_ov62_0223359C.h +++ b/include/overlay062/struct_ov62_0223359C.h @@ -11,7 +11,7 @@ typedef struct { s16 unk_10; u8 padding_12[2]; BOOL unk_14; - CellActorData * unk_18[2]; + CellActorData *unk_18[2]; } UnkStruct_ov62_0223359C; #endif // POKEPLATINUM_STRUCT_OV62_0223359C_H diff --git a/include/overlay062/struct_ov62_02233828.h b/include/overlay062/struct_ov62_02233828.h index ccb4120a2c..1b99843b07 100644 --- a/include/overlay062/struct_ov62_02233828.h +++ b/include/overlay062/struct_ov62_02233828.h @@ -5,11 +5,11 @@ #include "overlay061/struct_ov61_0222BED8.h" typedef struct { - UnkStruct_ov61_0222BED8 * unk_00; + UnkStruct_ov61_0222BED8 *unk_00; UnkStruct_ov61_0222BED8 unk_04; u8 unk_1D54; u8 padding_1D55[3]; - UnkStruct_ov61_0222BE20 * unk_1D58[30]; + UnkStruct_ov61_0222BE20 *unk_1D58[30]; UnkStruct_ov61_0222BE20 unk_1DD0[30]; int unk_3900; u8 unk_3904[32]; diff --git a/include/overlay062/struct_ov62_02233F74.h b/include/overlay062/struct_ov62_02233F74.h index 1d45a6b380..edcf9df2a3 100644 --- a/include/overlay062/struct_ov62_02233F74.h +++ b/include/overlay062/struct_ov62_02233F74.h @@ -7,10 +7,10 @@ #include "struct_defs/struct_0205AA50.h" typedef struct { - UnkStruct_02030A80 * unk_00; - UnkStruct_0202F41C * unk_04; + UnkStruct_02030A80 *unk_00; + UnkStruct_0202F41C *unk_04; u8 padding_08[4]; - CellActorData * unk_0C[12]; + CellActorData *unk_0C[12]; Window unk_3C[8]; } UnkStruct_ov62_02233F74; diff --git a/include/overlay062/struct_ov62_022349A8.h b/include/overlay062/struct_ov62_022349A8.h index 89485e2ed8..680474b84f 100644 --- a/include/overlay062/struct_ov62_022349A8.h +++ b/include/overlay062/struct_ov62_022349A8.h @@ -1,10 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV62_022349A8_H #define POKEPLATINUM_STRUCT_OV62_022349A8_H -#include "message.h" -#include "string_template.h" -#include "strbuf.h" -#include "savedata.h" #include "overlay061/struct_ov61_0222B138.h" #include "overlay061/struct_ov61_0222B920.h" #include "overlay062/funcptr_ov62_022349A8.h" @@ -13,19 +9,24 @@ #include "overlay062/struct_ov62_022349A8_sub3.h" #include "overlay062/struct_ov62_0223CAA4.h" +#include "message.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" + typedef struct { - SaveData * unk_00; + SaveData *unk_00; UnkFuncPtr_ov62_022349A8 unk_04; - void * unk_08; + void *unk_08; UnkStruct_ov62_022349A8_sub1 unk_0C; int unk_144; int unk_148; int unk_14C; UnkStruct_ov62_022349A8_sub2 unk_150; UnkStruct_ov62_0223CAA4 unk_17C; - void * unk_18C; + void *unk_18C; UnkStruct_ov62_022349A8_sub3 unk_190; - void * unk_3B4; + void *unk_3B4; int unk_3B8; int unk_3BC; int unk_3C0; @@ -39,9 +40,9 @@ typedef struct { int unk_3E8; int unk_3EC; int unk_3F0; - MessageLoader * unk_3F4; - StringTemplate * unk_3F8; - Strbuf* unk_3FC; + MessageLoader *unk_3F4; + StringTemplate *unk_3F8; + Strbuf *unk_3FC; UnkStruct_ov61_0222B920 unk_400; u8 unk_40D; u8 unk_40E; diff --git a/include/overlay062/struct_ov62_022349A8_sub2.h b/include/overlay062/struct_ov62_022349A8_sub2.h index ababf9b704..0f62ae09f7 100644 --- a/include/overlay062/struct_ov62_022349A8_sub2.h +++ b/include/overlay062/struct_ov62_022349A8_sub2.h @@ -4,7 +4,7 @@ #include "overlay061/funcptr_ov61_0222B920.h" typedef struct { - void * unk_00; + void *unk_00; UnkFuncPtr_ov61_0222B920 unk_04; UnkFuncPtr_ov61_0222B920 unk_08; UnkFuncPtr_ov61_0222B920 unk_0C; diff --git a/include/overlay062/struct_ov62_022349A8_sub3.h b/include/overlay062/struct_ov62_022349A8_sub3.h index d845da20de..bf401772b6 100644 --- a/include/overlay062/struct_ov62_022349A8_sub3.h +++ b/include/overlay062/struct_ov62_022349A8_sub3.h @@ -13,7 +13,7 @@ typedef struct { UnkStruct_ov62_022349A8_sub3_sub1 unk_00_val1; UnkStruct_ov62_022349A8_sub3_sub2 unk_00_val2; UnkStruct_ov62_0223D518_sub1 unk_00_val3; - UnkStruct_ov62_022349A8_sub3_sub3 * unk_00_val4; + UnkStruct_ov62_022349A8_sub3_sub3 *unk_00_val4; UnkStruct_ov62_022349A8_sub3_sub4 unk_00_val5; UnkStruct_ov62_022349A8_sub3_sub5 unk_00_val6; }; diff --git a/include/overlay062/struct_ov62_022354A4.h b/include/overlay062/struct_ov62_022354A4.h index da24827c57..398aeea499 100644 --- a/include/overlay062/struct_ov62_022354A4.h +++ b/include/overlay062/struct_ov62_022354A4.h @@ -16,11 +16,11 @@ typedef struct { u8 unk_1C; u8 unk_1D; u8 padding_1E[2]; - CellActorData * unk_20; - FontOAM * unk_24; - UnkStruct_0208B878 * unk_28; - BOOL * unk_2C; - BOOL * unk_30; + CellActorData *unk_20; + FontOAM *unk_24; + UnkStruct_0208B878 *unk_28; + BOOL *unk_2C; + BOOL *unk_30; } UnkStruct_ov62_022354A4; #endif // POKEPLATINUM_STRUCT_OV62_022354A4_H diff --git a/include/overlay062/struct_ov62_0223E01C_sub1.h b/include/overlay062/struct_ov62_0223E01C_sub1.h index eb03fc0312..5d9d81e9d2 100644 --- a/include/overlay062/struct_ov62_0223E01C_sub1.h +++ b/include/overlay062/struct_ov62_0223E01C_sub1.h @@ -6,8 +6,8 @@ typedef struct { int unk_00; int unk_04; - u16 * unk_08; - MessageLoader * unk_0C; + u16 *unk_08; + MessageLoader *unk_0C; BOOL unk_10; } UnkStruct_ov62_0223E01C_sub1; diff --git a/include/overlay062/struct_ov62_0223E01C_sub1_sub1.h b/include/overlay062/struct_ov62_0223E01C_sub1_sub1.h index e810a4dd3d..16b9ff96be 100644 --- a/include/overlay062/struct_ov62_0223E01C_sub1_sub1.h +++ b/include/overlay062/struct_ov62_0223E01C_sub1_sub1.h @@ -5,7 +5,7 @@ typedef struct { int unk_00; - CellActorData * unk_04; + CellActorData *unk_04; } UnkStruct_ov62_0223E01C_sub1_sub1; #endif // POKEPLATINUM_STRUCT_OV62_0223E01C_SUB1_SUB1_H diff --git a/include/overlay062/struct_ov62_0223E01C_sub2.h b/include/overlay062/struct_ov62_0223E01C_sub2.h index 53786603c6..35eaaf903c 100644 --- a/include/overlay062/struct_ov62_0223E01C_sub2.h +++ b/include/overlay062/struct_ov62_0223E01C_sub2.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_STRUCT_OV62_0223E01C_SUB2_H #include "struct_decls/struct_02006C24_decl.h" + #include "overlay062/struct_ov62_0223E01C_sub1_sub1.h" typedef struct { - NARC * unk_00; + NARC *unk_00; int unk_04; int unk_08; UnkStruct_ov62_0223E01C_sub1_sub1 unk_0C[5][6]; diff --git a/include/overlay062/struct_ov62_02241130.h b/include/overlay062/struct_ov62_02241130.h index d4ee7e5aa3..c4c662a91a 100644 --- a/include/overlay062/struct_ov62_02241130.h +++ b/include/overlay062/struct_ov62_02241130.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_OV62_02241130_H #define POKEPLATINUM_STRUCT_OV62_02241130_H -#include "savedata.h" #include "overlay062/funcptr_ov62_022349A8.h" #include "overlay062/struct_ov62_022349A8_sub2.h" +#include "savedata.h" + typedef struct { int unk_00; int unk_04; - SaveData * unk_08; + SaveData *unk_08; UnkStruct_ov62_022349A8_sub2 unk_0C; UnkFuncPtr_ov62_022349A8 unk_38; - void * unk_3C; + void *unk_3C; } UnkStruct_ov62_02241130; #endif // POKEPLATINUM_STRUCT_OV62_02241130_H diff --git a/include/overlay062/struct_ov62_02246B00.h b/include/overlay062/struct_ov62_02246B00.h index edb822cc71..a0b8e3674c 100644 --- a/include/overlay062/struct_ov62_02246B00.h +++ b/include/overlay062/struct_ov62_02246B00.h @@ -1,15 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV62_02246B00_H #define POKEPLATINUM_STRUCT_OV62_02246B00_H -#include "strbuf.h" #include "game_options.h" +#include "strbuf.h" typedef struct { int unk_00; int unk_04[4]; u8 padding_14[4]; - Strbuf* unk_18; - Options * unk_1C; + Strbuf *unk_18; + Options *unk_1C; } UnkStruct_ov62_02246B00; #endif // POKEPLATINUM_STRUCT_OV62_02246B00_H diff --git a/include/overlay062/struct_ov62_02246BF4.h b/include/overlay062/struct_ov62_02246BF4.h index c06c3c3291..8e14c6b341 100644 --- a/include/overlay062/struct_ov62_02246BF4.h +++ b/include/overlay062/struct_ov62_02246BF4.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_OV62_02246BF4_H #include "struct_defs/struct_0208C06C.h" + #include "overlay062/struct_ov62_02246B00.h" #include "overlay062/struct_ov62_02246BF4_sub1.h" #include "overlay062/struct_ov62_02246BF4_sub2.h" @@ -29,7 +30,7 @@ typedef struct { UnkStruct_ov62_02246B00 unk_2A8; BOOL unk_2C8; u64 unk_2CC; - UnkStruct_0208C06C * unk_2D4; + UnkStruct_0208C06C *unk_2D4; } UnkStruct_ov62_02246BF4; #endif // POKEPLATINUM_STRUCT_OV62_02246BF4_H diff --git a/include/overlay062/struct_ov62_02246BF4_sub1.h b/include/overlay062/struct_ov62_02246BF4_sub1.h index fa36684315..8605e87438 100644 --- a/include/overlay062/struct_ov62_02246BF4_sub1.h +++ b/include/overlay062/struct_ov62_02246BF4_sub1.h @@ -2,15 +2,17 @@ #define POKEPLATINUM_STRUCT_OV62_02246BF4_SUB1_H #include "struct_decls/cell_actor_data.h" -#include "touch_screen.h" + #include "overlay062/struct_ov62_02246BF4_sub1_sub1.h" +#include "touch_screen.h" + typedef struct { int unk_00; int unk_04; BOOL unk_08; - CellActorData * unk_0C; - TouchScreenRect * unk_10; + CellActorData *unk_0C; + TouchScreenRect *unk_10; UnkStruct_ov62_02246BF4_sub1_sub1 unk_14; u8 padding_1A[2]; } UnkStruct_ov62_02246BF4_sub1; diff --git a/include/overlay062/struct_ov62_02246BF4_sub2.h b/include/overlay062/struct_ov62_02246BF4_sub2.h index d9a6918101..4b0f5dfaa8 100644 --- a/include/overlay062/struct_ov62_02246BF4_sub2.h +++ b/include/overlay062/struct_ov62_02246BF4_sub2.h @@ -6,16 +6,17 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "touch_screen.h" #include "struct_decls/struct_02023FCC_decl.h" +#include "touch_screen.h" + typedef struct { - NARC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; - BGL * unk_0C; - PaletteData * unk_10; - UnkStruct_02023FCC * unk_14; + NARC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; + BGL *unk_0C; + PaletteData *unk_10; + UnkStruct_02023FCC *unk_14; TouchScreenRect unk_18[24]; BOOL unk_78; } UnkStruct_ov62_02246BF4_sub2; diff --git a/include/overlay062/struct_ov62_02248CDC.h b/include/overlay062/struct_ov62_02248CDC.h index f4b83b7c94..75a1e03188 100644 --- a/include/overlay062/struct_ov62_02248CDC.h +++ b/include/overlay062/struct_ov62_02248CDC.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV62_02248CDC_H #define POKEPLATINUM_STRUCT_OV62_02248CDC_H -#include "touch_screen.h" #include "overlay062/struct_ov62_02249380.h" +#include "touch_screen.h" + typedef struct { - const UnkStruct_ov62_02249380 * unk_00; + const UnkStruct_ov62_02249380 *unk_00; int unk_04; int unk_08; int unk_0C; @@ -15,7 +16,7 @@ typedef struct { int unk_1C; int unk_20; u32 unk_24; - const TouchScreenRect * unk_28; + const TouchScreenRect *unk_28; } UnkStruct_ov62_02248CDC; #endif // POKEPLATINUM_STRUCT_OV62_02248CDC_H diff --git a/include/overlay063/ov63_0222AE60.h b/include/overlay063/ov63_0222AE60.h index 61589df613..d790bdc3a1 100644 --- a/include/overlay063/ov63_0222AE60.h +++ b/include/overlay063/ov63_0222AE60.h @@ -4,34 +4,35 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" + #include "overlay063/struct_ov63_0222AE60_decl.h" #include "overlay063/struct_ov63_0222BB38_decl.h" #include "overlay064/struct_ov64_022302EC.h" -UnkStruct_ov63_0222AE60 * ov63_0222AE60(GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3); -void ov63_0222AF14(UnkStruct_ov63_0222AE60 * param0); -void ov63_0222AF94(UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, int param3, u32 param4); -void ov63_0222AFD0(UnkStruct_ov63_0222AE60 * param0, u32 param1); -BOOL ov63_0222AFE4(const UnkStruct_ov63_0222AE60 * param0, u32 param1); -void ov63_0222AFF8(UnkStruct_ov63_0222AE60 * param0); -void ov63_0222B02C(UnkStruct_ov63_0222AE60 * param0, u32 param1, int param2, u32 param3); -void ov63_0222B078(UnkStruct_ov63_0222AE60 * param0); -void ov63_0222B0A0(UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, u32 param3); -void ov63_0222B0B8(UnkStruct_ov63_0222AE60 * param0); -UnkStruct_ov63_0222BB38 * ov63_0222B0C0(UnkStruct_ov63_0222AE60 * param0, const UnkStruct_ov64_022302EC * param1, u32 param2, u32 param3); -void ov63_0222B210(UnkStruct_ov63_0222BB38 * param0); -const GraphicElementData * ov63_0222B234(const UnkStruct_ov63_0222BB38 * param0); -void ov63_0222B238(UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2); -void ov63_0222B278(UnkStruct_ov63_0222BB38 * param0, u16 param1); -u16 ov63_0222B284(const UnkStruct_ov63_0222BB38 * param0); -void ov63_0222B294(UnkStruct_ov63_0222BB38 * param0, BOOL param1); -BOOL ov63_0222B2B0(const UnkStruct_ov63_0222BB38 * param0); -int ov63_0222B2BC(const UnkStruct_ov63_0222BB38 * param0); -int ov63_0222B2C4(const UnkStruct_ov63_0222BB38 * param0); -void ov63_0222B2C8(UnkStruct_ov63_0222BB38 * param0, u16 param1); -u16 ov63_0222B2D4(const UnkStruct_ov63_0222BB38 * param0); -void ov63_0222B2E0(UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2); -void ov63_0222B308(UnkStruct_ov63_0222BB38 * param0, int param1, int param2); -void ov63_0222B33C(UnkStruct_ov63_0222BB38 * param0); +UnkStruct_ov63_0222AE60 *ov63_0222AE60(GraphicElementManager *param0, PaletteData *param1, u32 param2, u32 param3); +void ov63_0222AF14(UnkStruct_ov63_0222AE60 *param0); +void ov63_0222AF94(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4); +void ov63_0222AFD0(UnkStruct_ov63_0222AE60 *param0, u32 param1); +BOOL ov63_0222AFE4(const UnkStruct_ov63_0222AE60 *param0, u32 param1); +void ov63_0222AFF8(UnkStruct_ov63_0222AE60 *param0); +void ov63_0222B02C(UnkStruct_ov63_0222AE60 *param0, u32 param1, int param2, u32 param3); +void ov63_0222B078(UnkStruct_ov63_0222AE60 *param0); +void ov63_0222B0A0(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, u32 param3); +void ov63_0222B0B8(UnkStruct_ov63_0222AE60 *param0); +UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const UnkStruct_ov64_022302EC *param1, u32 param2, u32 param3); +void ov63_0222B210(UnkStruct_ov63_0222BB38 *param0); +const GraphicElementData *ov63_0222B234(const UnkStruct_ov63_0222BB38 *param0); +void ov63_0222B238(UnkStruct_ov63_0222BB38 *param0, s16 param1, s16 param2); +void ov63_0222B278(UnkStruct_ov63_0222BB38 *param0, u16 param1); +u16 ov63_0222B284(const UnkStruct_ov63_0222BB38 *param0); +void ov63_0222B294(UnkStruct_ov63_0222BB38 *param0, BOOL param1); +BOOL ov63_0222B2B0(const UnkStruct_ov63_0222BB38 *param0); +int ov63_0222B2BC(const UnkStruct_ov63_0222BB38 *param0); +int ov63_0222B2C4(const UnkStruct_ov63_0222BB38 *param0); +void ov63_0222B2C8(UnkStruct_ov63_0222BB38 *param0, u16 param1); +u16 ov63_0222B2D4(const UnkStruct_ov63_0222BB38 *param0); +void ov63_0222B2E0(UnkStruct_ov63_0222BB38 *param0, s16 param1, s16 param2); +void ov63_0222B308(UnkStruct_ov63_0222BB38 *param0, int param1, int param2); +void ov63_0222B33C(UnkStruct_ov63_0222BB38 *param0); #endif // POKEPLATINUM_OV63_0222AE60_H diff --git a/include/overlay063/ov63_0222BCE8.h b/include/overlay063/ov63_0222BCE8.h index b99dd6dec2..7297816b33 100644 --- a/include/overlay063/ov63_0222BCE8.h +++ b/include/overlay063/ov63_0222BCE8.h @@ -4,13 +4,13 @@ #include "overlay063/struct_ov63_0222BCE8_decl.h" #include "overlay063/union_ov63_0222BDAC.h" -UnkStruct_ov63_0222BCE8 * ov63_0222BCE8(u16 param0, u16 param1, u32 param2); -void ov63_0222BD30(UnkStruct_ov63_0222BCE8 * param0); -u16 ov63_0222BD48(const UnkStruct_ov63_0222BCE8 * param0); -u16 ov63_0222BD4C(const UnkStruct_ov63_0222BCE8 * param0); -void ov63_0222BD50(UnkStruct_ov63_0222BCE8 * param0, const UnkUnion_ov63_0222BDAC * param1); -UnkUnion_ov63_0222BDAC ov63_0222BD70(const UnkStruct_ov63_0222BCE8 * param0, u16 param1, u16 param2); -BOOL ov63_0222BDAC(const UnkStruct_ov63_0222BCE8 * param0, u16 param1, u16 param2); -u32 ov63_0222BDE4(const UnkStruct_ov63_0222BCE8 * param0, u16 param1, u16 param2); +UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, u32 param2); +void ov63_0222BD30(UnkStruct_ov63_0222BCE8 *param0); +u16 ov63_0222BD48(const UnkStruct_ov63_0222BCE8 *param0); +u16 ov63_0222BD4C(const UnkStruct_ov63_0222BCE8 *param0); +void ov63_0222BD50(UnkStruct_ov63_0222BCE8 *param0, const UnkUnion_ov63_0222BDAC *param1); +UnkUnion_ov63_0222BDAC ov63_0222BD70(const UnkStruct_ov63_0222BCE8 *param0, u16 param1, u16 param2); +BOOL ov63_0222BDAC(const UnkStruct_ov63_0222BCE8 *param0, u16 param1, u16 param2); +u32 ov63_0222BDE4(const UnkStruct_ov63_0222BCE8 *param0, u16 param1, u16 param2); #endif // POKEPLATINUM_OV63_0222BCE8_H diff --git a/include/overlay063/ov63_0222BE18.h b/include/overlay063/ov63_0222BE18.h index eb9ccbe47a..4923422384 100644 --- a/include/overlay063/ov63_0222BE18.h +++ b/include/overlay063/ov63_0222BE18.h @@ -7,27 +7,27 @@ #include "overlay063/struct_ov63_0222CCB8.h" #include "overlay065/struct_ov65_022376D0.h" -UnkStruct_ov63_0222BE18 * ov63_0222BE18(u32 param0, u32 param1); -void ov63_0222BE58(UnkStruct_ov63_0222BE18 * param0); -void ov63_0222BE70(UnkStruct_ov63_0222BE18 * param0, const UnkStruct_ov63_0222CCB8 * param1); -void ov63_0222BE84(UnkStruct_ov63_0222BE18 * param0); -u32 ov63_0222BEB0(const UnkStruct_ov63_0222BE18 * param0); -UnkStruct_ov63_0222BEC0 * ov63_0222BEC0(UnkStruct_ov63_0222BE18 * param0, const UnkStruct_ov65_022376D0 * param1); -void ov63_0222BF08(UnkStruct_ov63_0222BEC0 * param0); -UnkStruct_ov63_0222BEC0 * ov63_0222BF18(UnkStruct_ov63_0222BE18 * param0, u16 param1); -UnkStruct_ov63_0222BEC0 * ov63_0222BF50(UnkStruct_ov63_0222BE18 * param0, u16 param1); -const UnkStruct_ov63_0222BEC0 * ov63_0222BF80(const UnkStruct_ov63_0222BE18 * param0, u16 param1); -const UnkStruct_ov63_0222BEC0 * ov63_0222BF88(const UnkStruct_ov63_0222BE18 * param0, u16 param1); -s32 ov63_0222BF90(const UnkStruct_ov63_0222BEC0 * param0, int param1); -void ov63_0222C000(UnkStruct_ov63_0222BEC0 * param0, int param1, s32 param2); +UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, u32 param1); +void ov63_0222BE58(UnkStruct_ov63_0222BE18 *param0); +void ov63_0222BE70(UnkStruct_ov63_0222BE18 *param0, const UnkStruct_ov63_0222CCB8 *param1); +void ov63_0222BE84(UnkStruct_ov63_0222BE18 *param0); +u32 ov63_0222BEB0(const UnkStruct_ov63_0222BE18 *param0); +UnkStruct_ov63_0222BEC0 *ov63_0222BEC0(UnkStruct_ov63_0222BE18 *param0, const UnkStruct_ov65_022376D0 *param1); +void ov63_0222BF08(UnkStruct_ov63_0222BEC0 *param0); +UnkStruct_ov63_0222BEC0 *ov63_0222BF18(UnkStruct_ov63_0222BE18 *param0, u16 param1); +UnkStruct_ov63_0222BEC0 *ov63_0222BF50(UnkStruct_ov63_0222BE18 *param0, u16 param1); +const UnkStruct_ov63_0222BEC0 *ov63_0222BF80(const UnkStruct_ov63_0222BE18 *param0, u16 param1); +const UnkStruct_ov63_0222BEC0 *ov63_0222BF88(const UnkStruct_ov63_0222BE18 *param0, u16 param1); +s32 ov63_0222BF90(const UnkStruct_ov63_0222BEC0 *param0, int param1); +void ov63_0222C000(UnkStruct_ov63_0222BEC0 *param0, int param1, s32 param2); UnkStruct_ov63_0222CC3C ov63_0222C078(UnkStruct_ov63_0222CC3C param0, int param1); int ov63_0222C0AC(int param0); -UnkStruct_ov63_0222CC3C ov63_0222C0E4(const UnkStruct_ov63_0222BEC0 * param0); -UnkStruct_ov63_0222CC3C ov63_0222C0F0(const UnkStruct_ov63_0222BEC0 * param0); -UnkStruct_ov63_0222CC3C ov63_0222C0FC(const UnkStruct_ov63_0222BEC0 * param0); -void ov63_0222C1A4(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1); -void ov63_0222C1B4(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1); -const UnkStruct_ov63_0222BEC0 * ov63_0222C1C4(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BE18 * param1, int param2); -const UnkStruct_ov63_0222BEC0 * ov63_0222C2AC(const UnkStruct_ov63_0222BE18 * param0, UnkStruct_ov63_0222CC3C param1); +UnkStruct_ov63_0222CC3C ov63_0222C0E4(const UnkStruct_ov63_0222BEC0 *param0); +UnkStruct_ov63_0222CC3C ov63_0222C0F0(const UnkStruct_ov63_0222BEC0 *param0); +UnkStruct_ov63_0222CC3C ov63_0222C0FC(const UnkStruct_ov63_0222BEC0 *param0); +void ov63_0222C1A4(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1); +void ov63_0222C1B4(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1); +const UnkStruct_ov63_0222BEC0 *ov63_0222C1C4(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BE18 *param1, int param2); +const UnkStruct_ov63_0222BEC0 *ov63_0222C2AC(const UnkStruct_ov63_0222BE18 *param0, UnkStruct_ov63_0222CC3C param1); #endif // POKEPLATINUM_OV63_0222BE18_H diff --git a/include/overlay063/ov63_0222CA88.h b/include/overlay063/ov63_0222CA88.h index b2f6ba6cce..996a38b1c4 100644 --- a/include/overlay063/ov63_0222CA88.h +++ b/include/overlay063/ov63_0222CA88.h @@ -6,6 +6,6 @@ #include "overlay063/struct_ov63_0222CCB8.h" #include "overlay063/struct_ov63_0222D894.h" -BOOL ov63_0222CA88(const UnkStruct_ov63_0222BCE8 * param0, const UnkStruct_ov63_0222BE18 * param1, const UnkStruct_ov63_0222D894 * param2, UnkStruct_ov63_0222CCB8 * param3); +BOOL ov63_0222CA88(const UnkStruct_ov63_0222BCE8 *param0, const UnkStruct_ov63_0222BE18 *param1, const UnkStruct_ov63_0222D894 *param2, UnkStruct_ov63_0222CCB8 *param3); #endif // POKEPLATINUM_OV63_0222CA88_H diff --git a/include/overlay063/ov63_0222CCE4.h b/include/overlay063/ov63_0222CCE4.h index 8aa69a1b95..28ed369ee8 100644 --- a/include/overlay063/ov63_0222CCE4.h +++ b/include/overlay063/ov63_0222CCE4.h @@ -3,34 +3,35 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020218BC_decl.h" + #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222CD2C.h" #include "overlay063/struct_ov63_0222CE44.h" -UnkStruct_ov63_0222CD2C * ov63_0222CCE4(GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov63_0222CD2C * ov63_0222CD2C(GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6); -void ov63_0222CD9C(UnkStruct_ov63_0222CD2C * param0); -void ov63_0222CDE8(UnkStruct_ov63_0222CD2C * param0, u32 param1, int param2, u32 param3); -void ov63_0222CE0C(UnkStruct_ov63_0222CD2C * param0, u32 param1); -BOOL ov63_0222CE18(const UnkStruct_ov63_0222CD2C * param0, u32 param1); -void ov63_0222CE24(UnkStruct_ov63_0222CD2C * param0); -void ov63_0222CE30(UnkStruct_ov63_0222CD2C * param0, int param1, u32 param2); -UnkStruct_ov63_0222CE44 * ov63_0222CE44(UnkStruct_ov63_0222CD2C * param0, const UnkStruct_ov63_0222BEC0 * param1, BOOL param2, u32 param3); -void ov63_0222CECC(UnkStruct_ov63_0222CE44 * param0); -void ov63_0222CEE4(UnkStruct_ov63_0222CD2C * param0); -void ov63_0222CF14(UnkStruct_ov63_0222CE44 * param0); -void ov63_0222CFA4(UnkStruct_ov63_0222CE44 * param0, BOOL param1); -void ov63_0222CFA8(UnkStruct_ov63_0222CE44 * param0); -void ov63_0222CFB4(UnkStruct_ov63_0222CE44 * param0); -void ov63_0222CFC0(UnkStruct_ov63_0222CE44 * param0); -void ov63_0222CFE0(UnkStruct_ov63_0222CE44 * param0, UnkStruct_ov63_0222CC3C param1); -BOOL ov63_0222CFFC(const UnkStruct_ov63_0222CE44 * param0); -void ov63_0222D008(UnkStruct_ov63_0222CE44 * param0, BOOL param1); -u16 ov63_0222D014(const UnkStruct_ov63_0222CE44 * param0); -void ov63_0222D020(UnkStruct_ov63_0222CE44 * param0, int param1); +UnkStruct_ov63_0222CD2C *ov63_0222CCE4(GraphicElementManager *param0, PaletteData *param1, u32 param2, u32 param3, u32 param4); +UnkStruct_ov63_0222CD2C *ov63_0222CD2C(GraphicElementManager *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6); +void ov63_0222CD9C(UnkStruct_ov63_0222CD2C *param0); +void ov63_0222CDE8(UnkStruct_ov63_0222CD2C *param0, u32 param1, int param2, u32 param3); +void ov63_0222CE0C(UnkStruct_ov63_0222CD2C *param0, u32 param1); +BOOL ov63_0222CE18(const UnkStruct_ov63_0222CD2C *param0, u32 param1); +void ov63_0222CE24(UnkStruct_ov63_0222CD2C *param0); +void ov63_0222CE30(UnkStruct_ov63_0222CD2C *param0, int param1, u32 param2); +UnkStruct_ov63_0222CE44 *ov63_0222CE44(UnkStruct_ov63_0222CD2C *param0, const UnkStruct_ov63_0222BEC0 *param1, BOOL param2, u32 param3); +void ov63_0222CECC(UnkStruct_ov63_0222CE44 *param0); +void ov63_0222CEE4(UnkStruct_ov63_0222CD2C *param0); +void ov63_0222CF14(UnkStruct_ov63_0222CE44 *param0); +void ov63_0222CFA4(UnkStruct_ov63_0222CE44 *param0, BOOL param1); +void ov63_0222CFA8(UnkStruct_ov63_0222CE44 *param0); +void ov63_0222CFB4(UnkStruct_ov63_0222CE44 *param0); +void ov63_0222CFC0(UnkStruct_ov63_0222CE44 *param0); +void ov63_0222CFE0(UnkStruct_ov63_0222CE44 *param0, UnkStruct_ov63_0222CC3C param1); +BOOL ov63_0222CFFC(const UnkStruct_ov63_0222CE44 *param0); +void ov63_0222D008(UnkStruct_ov63_0222CE44 *param0, BOOL param1); +u16 ov63_0222D014(const UnkStruct_ov63_0222CE44 *param0); +void ov63_0222D020(UnkStruct_ov63_0222CE44 *param0, int param1); u32 ov63_0222D034(s16 param0, BOOL param1); -u32 ov63_0222D050(const UnkStruct_ov63_0222CE44 * param0); -void ov63_0222D060(UnkStruct_ov63_0222CE44 * param0, UnkStruct_ov63_0222CC3C param1); +u32 ov63_0222D050(const UnkStruct_ov63_0222CE44 *param0); +void ov63_0222D060(UnkStruct_ov63_0222CE44 *param0, UnkStruct_ov63_0222CC3C param1); #endif // POKEPLATINUM_OV63_0222CCE4_H diff --git a/include/overlay063/ov63_0222D160.h b/include/overlay063/ov63_0222D160.h index 32e9732dde..577dfbe090 100644 --- a/include/overlay063/ov63_0222D160.h +++ b/include/overlay063/ov63_0222D160.h @@ -4,10 +4,10 @@ #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222D160.h" -void ov63_0222D160(UnkStruct_ov63_0222D160 * param0, const UnkStruct_ov63_0222BEC0 * param1); -void ov63_0222D19C(UnkStruct_ov63_0222D160 * param0); -void ov63_0222D1A8(UnkStruct_ov63_0222D160 * param0, s16 param1, s16 param2); -s16 ov63_0222D1B0(const UnkStruct_ov63_0222D160 * param0); -s16 ov63_0222D1B8(const UnkStruct_ov63_0222D160 * param0); +void ov63_0222D160(UnkStruct_ov63_0222D160 *param0, const UnkStruct_ov63_0222BEC0 *param1); +void ov63_0222D19C(UnkStruct_ov63_0222D160 *param0); +void ov63_0222D1A8(UnkStruct_ov63_0222D160 *param0, s16 param1, s16 param2); +s16 ov63_0222D1B0(const UnkStruct_ov63_0222D160 *param0); +s16 ov63_0222D1B8(const UnkStruct_ov63_0222D160 *param0); #endif // POKEPLATINUM_OV63_0222D160_H diff --git a/include/overlay063/ov63_0222D1C0.h b/include/overlay063/ov63_0222D1C0.h index 2ac93bb5fd..2da7ea2d03 100644 --- a/include/overlay063/ov63_0222D1C0.h +++ b/include/overlay063/ov63_0222D1C0.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_OV63_0222D1C0_H #define POKEPLATINUM_OV63_0222D1C0_H -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02018340_decl.h" +#include "struct_defs/struct_0200C738.h" + #include "overlay063/struct_ov63_0222D160.h" #include "overlay063/struct_ov63_0222D1C0_decl.h" #include "overlay065/struct_ov65_0223582C.h" -UnkStruct_ov63_0222D1C0 * ov63_0222D1C0(UnkStruct_0200C738 * param0, BGL * param1, const UnkStruct_ov65_0223582C * param2, u32 param3); -void ov63_0222D214(UnkStruct_ov63_0222D1C0 * param0); -void ov63_0222D228(UnkStruct_ov63_0222D1C0 * param0, const UnkStruct_ov63_0222D160 * param1); +UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(UnkStruct_0200C738 *param0, BGL *param1, const UnkStruct_ov65_0223582C *param2, u32 param3); +void ov63_0222D214(UnkStruct_ov63_0222D1C0 *param0); +void ov63_0222D228(UnkStruct_ov63_0222D1C0 *param0, const UnkStruct_ov63_0222D160 *param1); #endif // POKEPLATINUM_OV63_0222D1C0_H diff --git a/include/overlay063/ov63_0222D77C.h b/include/overlay063/ov63_0222D77C.h index 3247a6f025..ac4dfb5b8b 100644 --- a/include/overlay063/ov63_0222D77C.h +++ b/include/overlay063/ov63_0222D77C.h @@ -6,13 +6,13 @@ #include "overlay063/struct_ov63_0222D848_decl.h" #include "overlay063/struct_ov63_0222D894.h" -UnkStruct_ov63_0222D77C * ov63_0222D77C(u32 param0, u32 param1); -void ov63_0222D7B4(UnkStruct_ov63_0222D77C * param0); -void ov63_0222D7C8(UnkStruct_ov63_0222D77C * param0, const UnkStruct_ov63_0222CCB8 * param1); -BOOL ov63_0222D810(UnkStruct_ov63_0222D77C * param0, UnkStruct_ov63_0222CCB8 * param1); -UnkStruct_ov63_0222D848 * ov63_0222D848(u32 param0, u32 param1); -void ov63_0222D880(UnkStruct_ov63_0222D848 * param0); -void ov63_0222D894(UnkStruct_ov63_0222D848 * param0, const UnkStruct_ov63_0222D894 * param1); -BOOL ov63_0222D8D0(UnkStruct_ov63_0222D848 * param0, UnkStruct_ov63_0222D894 * param1); +UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, u32 param1); +void ov63_0222D7B4(UnkStruct_ov63_0222D77C *param0); +void ov63_0222D7C8(UnkStruct_ov63_0222D77C *param0, const UnkStruct_ov63_0222CCB8 *param1); +BOOL ov63_0222D810(UnkStruct_ov63_0222D77C *param0, UnkStruct_ov63_0222CCB8 *param1); +UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, u32 param1); +void ov63_0222D880(UnkStruct_ov63_0222D848 *param0); +void ov63_0222D894(UnkStruct_ov63_0222D848 *param0, const UnkStruct_ov63_0222D894 *param1); +BOOL ov63_0222D8D0(UnkStruct_ov63_0222D848 *param0, UnkStruct_ov63_0222D894 *param1); #endif // POKEPLATINUM_OV63_0222D77C_H diff --git a/include/overlay063/struct_ov63_0222CD2C.h b/include/overlay063/struct_ov63_0222CD2C.h index d0fb644730..96beafd915 100644 --- a/include/overlay063/struct_ov63_0222CD2C.h +++ b/include/overlay063/struct_ov63_0222CD2C.h @@ -5,8 +5,8 @@ #include "overlay063/struct_ov63_0222CE44.h" typedef struct { - UnkStruct_ov63_0222AE60 * unk_00; - UnkStruct_ov63_0222CE44 * unk_04; + UnkStruct_ov63_0222AE60 *unk_00; + UnkStruct_ov63_0222CE44 *unk_04; u16 unk_08; u8 unk_0A; u8 unk_0B; diff --git a/include/overlay063/struct_ov63_0222CE44.h b/include/overlay063/struct_ov63_0222CE44.h index a0a132d533..47d275da34 100644 --- a/include/overlay063/struct_ov63_0222CE44.h +++ b/include/overlay063/struct_ov63_0222CE44.h @@ -5,8 +5,8 @@ #include "overlay063/struct_ov63_0222BEC0_decl.h" typedef struct { - const UnkStruct_ov63_0222BEC0 * unk_00; - UnkStruct_ov63_0222BB38 * unk_04; + const UnkStruct_ov63_0222BEC0 *unk_00; + UnkStruct_ov63_0222BB38 *unk_04; u16 unk_08; u16 unk_0A; u16 unk_0C; diff --git a/include/overlay064/ov64_0222DCE0.h b/include/overlay064/ov64_0222DCE0.h index af17b8fde3..8a9ff5bfef 100644 --- a/include/overlay064/ov64_0222DCE0.h +++ b/include/overlay064/ov64_0222DCE0.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_OV64_0222DCE0_H #define POKEPLATINUM_OV64_0222DCE0_H - -int ov64_0222DCE0(OverlayManager * param0, int * param1); -int ov64_0222DDAC(OverlayManager * param0, int * param1); -int ov64_0222DEA4(OverlayManager * param0, int * param1); +int ov64_0222DCE0(OverlayManager *param0, int *param1); +int ov64_0222DDAC(OverlayManager *param0, int *param1); +int ov64_0222DEA4(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV64_0222DCE0_H diff --git a/include/overlay065/ov65_0222DCE0.h b/include/overlay065/ov65_0222DCE0.h index 8a32a0791a..9b7b85a439 100644 --- a/include/overlay065/ov65_0222DCE0.h +++ b/include/overlay065/ov65_0222DCE0.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV65_0222DCE0_H #define POKEPLATINUM_OV65_0222DCE0_H +#include "overlay_manager.h" -int ov65_0222E2A8(OverlayManager * param0, int * param1); -int ov65_0222E3FC(OverlayManager * param0, int * param1); -int ov65_0222E548(OverlayManager * param0, int * param1); +int ov65_0222E2A8(OverlayManager *param0, int *param1); +int ov65_0222E3FC(OverlayManager *param0, int *param1); +int ov65_0222E548(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV65_0222DCE0_H diff --git a/include/overlay065/ov65_02235060.h b/include/overlay065/ov65_02235060.h index 853831adff..47451f3e0b 100644 --- a/include/overlay065/ov65_02235060.h +++ b/include/overlay065/ov65_02235060.h @@ -3,32 +3,33 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" + #include "overlay065/struct_ov65_02235130_decl.h" #include "overlay065/struct_ov65_022354D8.h" -void ov65_02235060(UnkStruct_ov65_02235130 * param0, u32 param1, NARC * param2, BGL * param3, u32 param4, u32 param5); -void ov65_02235130(UnkStruct_ov65_02235130 * param0); -BOOL ov65_02235194(const UnkStruct_ov65_02235130 * param0); -u32 ov65_02235198(UnkStruct_ov65_02235130 * param0); -void ov65_02235244(UnkStruct_ov65_02235130 * param0); -u8 ov65_02235254(const UnkStruct_ov65_02235130 * param0); -u32 ov65_02235270(const UnkStruct_ov65_02235130 * param0); -u32 ov65_022352CC(const UnkStruct_ov65_02235130 * param0); -void ov65_0223532C(UnkStruct_ov65_02235130 * param0, const UnkStruct_ov65_022354D8 * param1); -void ov65_02235370(UnkStruct_ov65_02235130 * param0); -void ov65_02235378(UnkStruct_ov65_02235130 * param0, BOOL param1); -BOOL ov65_0223537C(const UnkStruct_ov65_02235130 * param0); -UnkStruct_ov65_022354D8 * ov65_02235380(UnkStruct_ov65_02235130 * param0, u32 param1); -UnkStruct_ov65_022354D8 * ov65_022353EC(UnkStruct_ov65_02235130 * param0, u32 param1, u8 param2); -void ov65_02235478(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -void ov65_022354B8(UnkStruct_ov65_022354D8 * param0); -u8 ov65_022354D8(const UnkStruct_ov65_022354D8 * param0); -int ov65_022354E8(const UnkStruct_ov65_022354D8 * param0); -void ov65_022354F8(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1, int param2); -void ov65_0223556C(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -void ov65_0223558C(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1, int param2); -void ov65_022355B0(UnkStruct_ov65_02235130 * param0); -void ov65_022355EC(UnkStruct_ov65_02235130 * param0); -void ov65_022355FC(UnkStruct_ov65_02235130 * param0); +void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, BGL *param3, u32 param4, u32 param5); +void ov65_02235130(UnkStruct_ov65_02235130 *param0); +BOOL ov65_02235194(const UnkStruct_ov65_02235130 *param0); +u32 ov65_02235198(UnkStruct_ov65_02235130 *param0); +void ov65_02235244(UnkStruct_ov65_02235130 *param0); +u8 ov65_02235254(const UnkStruct_ov65_02235130 *param0); +u32 ov65_02235270(const UnkStruct_ov65_02235130 *param0); +u32 ov65_022352CC(const UnkStruct_ov65_02235130 *param0); +void ov65_0223532C(UnkStruct_ov65_02235130 *param0, const UnkStruct_ov65_022354D8 *param1); +void ov65_02235370(UnkStruct_ov65_02235130 *param0); +void ov65_02235378(UnkStruct_ov65_02235130 *param0, BOOL param1); +BOOL ov65_0223537C(const UnkStruct_ov65_02235130 *param0); +UnkStruct_ov65_022354D8 *ov65_02235380(UnkStruct_ov65_02235130 *param0, u32 param1); +UnkStruct_ov65_022354D8 *ov65_022353EC(UnkStruct_ov65_02235130 *param0, u32 param1, u8 param2); +void ov65_02235478(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +void ov65_022354B8(UnkStruct_ov65_022354D8 *param0); +u8 ov65_022354D8(const UnkStruct_ov65_022354D8 *param0); +int ov65_022354E8(const UnkStruct_ov65_022354D8 *param0); +void ov65_022354F8(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, int param2); +void ov65_0223556C(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +void ov65_0223558C(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, int param2); +void ov65_022355B0(UnkStruct_ov65_02235130 *param0); +void ov65_022355EC(UnkStruct_ov65_02235130 *param0); +void ov65_022355FC(UnkStruct_ov65_02235130 *param0); #endif // POKEPLATINUM_OV65_02235060_H diff --git a/include/overlay065/ov65_02236474.h b/include/overlay065/ov65_02236474.h index e1418dff64..e297754c3c 100644 --- a/include/overlay065/ov65_02236474.h +++ b/include/overlay065/ov65_02236474.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_OV65_02236474_H #define POKEPLATINUM_OV65_02236474_H -#include "overlay063/union_ov63_0222BDAC.h" #include "overlay063/struct_ov63_0222CC3C.h" +#include "overlay063/union_ov63_0222BDAC.h" UnkStruct_ov63_0222CC3C ov65_02236474(u32 param0); -const UnkUnion_ov63_0222BDAC * ov65_02236480(u32 param0); +const UnkUnion_ov63_0222BDAC *ov65_02236480(u32 param0); #endif // POKEPLATINUM_OV65_02236474_H diff --git a/include/overlay065/ov65_0223648C.h b/include/overlay065/ov65_0223648C.h index b185c859f9..c78ff926ef 100644 --- a/include/overlay065/ov65_0223648C.h +++ b/include/overlay065/ov65_0223648C.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_OV65_0223648C_H #define POKEPLATINUM_OV65_0223648C_H -#include "overlay_manager.h" #include "overlay065/struct_ov65_022366E4.h" #include "overlay065/struct_ov65_02236744_decl.h" #include "overlay065/struct_ov65_02236760.h" -int ov65_0223648C(OverlayManager * param0, int * param1); -int ov65_02236548(OverlayManager * param0, int * param1); -int ov65_0223668C(OverlayManager * param0, int * param1); -void ov65_022366E4(UnkStruct_ov65_02236744 * param0, const UnkStruct_ov65_022366E4 * param1); -void ov65_02236744(UnkStruct_ov65_02236744 * param0); -void ov65_02236760(UnkStruct_ov65_02236744 * param0, const UnkStruct_ov65_02236760 * param1); +#include "overlay_manager.h" + +int ov65_0223648C(OverlayManager *param0, int *param1); +int ov65_02236548(OverlayManager *param0, int *param1); +int ov65_0223668C(OverlayManager *param0, int *param1); +void ov65_022366E4(UnkStruct_ov65_02236744 *param0, const UnkStruct_ov65_022366E4 *param1); +void ov65_02236744(UnkStruct_ov65_02236744 *param0); +void ov65_02236760(UnkStruct_ov65_02236744 *param0, const UnkStruct_ov65_02236760 *param1); #endif // POKEPLATINUM_OV65_0223648C_H diff --git a/include/overlay065/struct_ov65_0222E99C.h b/include/overlay065/struct_ov65_0222E99C.h index ac941936f4..8de8ed0f7b 100644 --- a/include/overlay065/struct_ov65_0222E99C.h +++ b/include/overlay065/struct_ov65_0222E99C.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV65_0222E99C_H #define POKEPLATINUM_STRUCT_OV65_0222E99C_H - #include typedef struct { - void * unk_00; - NNSG2dScreenData * unk_04; - void * unk_08; - NNSG2dCharacterData * unk_0C; + void *unk_00; + NNSG2dScreenData *unk_04; + void *unk_08; + NNSG2dCharacterData *unk_0C; } UnkStruct_ov65_0222E99C; #endif // POKEPLATINUM_STRUCT_OV65_0222E99C_H diff --git a/include/overlay065/struct_ov65_0222EBE0_t.h b/include/overlay065/struct_ov65_0222EBE0_t.h index 2f2638f7f9..c115163d3a 100644 --- a/include/overlay065/struct_ov65_0222EBE0_t.h +++ b/include/overlay065/struct_ov65_0222EBE0_t.h @@ -3,54 +3,56 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "overlay_manager.h" #include "struct_decls/struct_02009714_decl.h" -#include "message.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202B370_decl.h" +#include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207DFAC.h" -#include "savedata.h" + #include "overlay061/struct_ov61_0222C3B0.h" #include "overlay065/struct_ov65_0222E99C.h" #include "overlay065/struct_ov65_02234E50.h" #include "overlay065/struct_ov65_02235130.h" #include "overlay065/struct_ov65_022354D8.h" +#include "message.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" +#include "trainer_info.h" + struct UnkStruct_ov65_0222EBE0_t { - UnkStruct_0202B370 * unk_00; - UnkStruct_0207DFAC * unk_04; + UnkStruct_0202B370 *unk_00; + UnkStruct_0207DFAC *unk_04; int unk_08; u8 unk_0C[32]; u8 unk_2C[32]; int unk_4C[32]; int unk_CC[32]; - ResourceMetadata * unk_14C; - BmpList * unk_150; - ResourceMetadata * unk_154; - BmpList * unk_158; - BGL * unk_15C; - SaveData * unk_160; - StringTemplate * unk_164; - MessageLoader * unk_168; - MessageLoader * unk_16C; - Strbuf* unk_170; - Strbuf* unk_174; - Strbuf* unk_178; - Strbuf* unk_17C; + ResourceMetadata *unk_14C; + BmpList *unk_150; + ResourceMetadata *unk_154; + BmpList *unk_158; + BGL *unk_15C; + SaveData *unk_160; + StringTemplate *unk_164; + MessageLoader *unk_168; + MessageLoader *unk_16C; + Strbuf *unk_170; + Strbuf *unk_174; + Strbuf *unk_178; + Strbuf *unk_17C; int unk_180; - UIControlData * unk_184; - void * unk_188; - GraphicElementManager * unk_18C; + UIControlData *unk_184; + void *unk_188; + GraphicElementManager *unk_18C; UnkStruct_0200C738 unk_190; - UnkStruct_02009714 * unk_31C[4]; - UnkStruct_02012744 * unk_32C; + UnkStruct_02009714 *unk_31C[4]; + UnkStruct_02012744 *unk_32C; Window unk_330; Window unk_340; Window unk_350; @@ -66,11 +68,11 @@ struct UnkStruct_ov65_0222EBE0_t { int unk_3B4; int unk_3B8; int unk_3BC; - TrainerInfo * unk_3C0; + TrainerInfo *unk_3C0; u8 unk_3C4; u8 unk_3C5; BOOL unk_3C8; - OverlayManager * unk_3CC; + OverlayManager *unk_3CC; int unk_3D0; u16 unk_3D4; u16 unk_3D6[3]; @@ -81,7 +83,7 @@ struct UnkStruct_ov65_0222EBE0_t { BOOL unk_3E4; int unk_3E8; UnkStruct_ov65_02235130 unk_3EC; - UnkStruct_ov65_022354D8 * unk_B4C[33]; + UnkStruct_ov65_022354D8 *unk_B4C[33]; UnkStruct_ov65_0222E99C unk_BD0; UnkStruct_ov65_02234E50 unk_BE0; BOOL unk_E28; diff --git a/include/overlay065/struct_ov65_02234E50.h b/include/overlay065/struct_ov65_02234E50.h index 4baa601339..4c567657a2 100644 --- a/include/overlay065/struct_ov65_02234E50.h +++ b/include/overlay065/struct_ov65_02234E50.h @@ -1,25 +1,26 @@ #ifndef POKEPLATINUM_STRUCT_OV65_02234E50_H #define POKEPLATINUM_STRUCT_OV65_02234E50_H -#include "struct_decls/struct_02009DC8_decl.h" -#include "string_template.h" +#include + #include "struct_decls/font_oam.h" -#include "struct_defs/sprite_manager_allocation.h" +#include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023FCC_decl.h" +#include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0205AA50.h" -#include +#include "string_template.h" typedef struct { - StringTemplate * unk_00; - void * unk_04; - NNSG2dScreenData * unk_08; - void * unk_0C[7]; - NNSG2dScreenData * unk_28[7]; - void * unk_44; - NNSG2dScreenData * unk_48; - UnkStruct_02023FCC * unk_4C; + StringTemplate *unk_00; + void *unk_04; + NNSG2dScreenData *unk_08; + void *unk_0C[7]; + NNSG2dScreenData *unk_28[7]; + void *unk_44; + NNSG2dScreenData *unk_48; + UnkStruct_02023FCC *unk_4C; u8 unk_50[32]; u8 unk_70; u8 unk_71; @@ -33,14 +34,14 @@ typedef struct { Window unk_7C[8]; Window unk_FC[8][2]; Window unk_1FC; - UnkStruct_02009DC8 * unk_20C[4]; - GraphicElementData * unk_21C[3]; + UnkStruct_02009DC8 *unk_20C[4]; + GraphicElementData *unk_21C[3]; SpriteManagerAllocation unk_228; - FontOAM * unk_234; + FontOAM *unk_234; u32 unk_238; u32 unk_23C; u32 unk_240; - UnkStruct_02023FCC * unk_244; + UnkStruct_02023FCC *unk_244; } UnkStruct_ov65_02234E50; #endif // POKEPLATINUM_STRUCT_OV65_02234E50_H diff --git a/include/overlay065/struct_ov65_02235130.h b/include/overlay065/struct_ov65_02235130.h index 5d0c887487..9818c91737 100644 --- a/include/overlay065/struct_ov65_02235130.h +++ b/include/overlay065/struct_ov65_02235130.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_OV65_02235130_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay063/struct_ov63_0222BCE8_decl.h" #include "overlay063/struct_ov63_0222BE18_decl.h" #include "overlay063/struct_ov63_0222CD2C.h" @@ -17,17 +18,17 @@ typedef struct UnkStruct_ov65_02235130_t { u32 unk_04; u32 unk_08; BOOL unk_0C; - BGL * unk_10; + BGL *unk_10; UnkStruct_ov65_022358CC unk_14; UnkStruct_ov65_022354D8 unk_1F0[48]; - UnkStruct_ov65_022354D8 * unk_730; + UnkStruct_ov65_022354D8 *unk_730; UnkStruct_ov65_02236318 unk_734; - UnkStruct_ov63_0222BCE8 * unk_748; - UnkStruct_ov63_0222BE18 * unk_74C; - UnkStruct_ov63_0222CD2C * unk_750; + UnkStruct_ov63_0222BCE8 *unk_748; + UnkStruct_ov63_0222BE18 *unk_74C; + UnkStruct_ov63_0222CD2C *unk_750; UnkStruct_ov63_0222D160 unk_754; - UnkStruct_ov63_0222D1C0 * unk_758; - UnkStruct_ov63_0222D848 * unk_75C; + UnkStruct_ov63_0222D1C0 *unk_758; + UnkStruct_ov63_0222D848 *unk_75C; } UnkStruct_ov65_02235130; #endif // POKEPLATINUM_STRUCT_OV65_02235130_H diff --git a/include/overlay065/struct_ov65_022354D8.h b/include/overlay065/struct_ov65_022354D8.h index a43f357c54..68d03a3faa 100644 --- a/include/overlay065/struct_ov65_022354D8.h +++ b/include/overlay065/struct_ov65_022354D8.h @@ -6,16 +6,20 @@ #include "overlay065/struct_ov65_02235130_decl.h" typedef struct UnkStruct_ov65_022354D8_t { - UnkStruct_ov63_0222BEC0 * unk_00; - UnkStruct_ov63_0222CE44 * unk_04; + UnkStruct_ov63_0222BEC0 *unk_00; + UnkStruct_ov63_0222CE44 *unk_04; s16 unk_08; u8 unk_0A; u8 unk_0B; u16 unk_0C; u16 unk_0E; - BOOL (* unk_10)(UnkStruct_ov65_02235130 *, struct UnkStruct_ov65_022354D8_t *); - BOOL (* unk_14)(UnkStruct_ov65_02235130 *, struct UnkStruct_ov65_022354D8_t *); - void (* unk_18)(UnkStruct_ov65_02235130 *, struct UnkStruct_ov65_022354D8_t *); + + // clang-format off + BOOL(*unk_10)(UnkStruct_ov65_02235130 *, struct UnkStruct_ov65_022354D8_t *); + BOOL(*unk_14)(UnkStruct_ov65_02235130 *, struct UnkStruct_ov65_022354D8_t *); + // clang-format on + + void (*unk_18)(UnkStruct_ov65_02235130 *, struct UnkStruct_ov65_022354D8_t *); } UnkStruct_ov65_022354D8; #endif // POKEPLATINUM_STRUCT_OV65_022354D8_H diff --git a/include/overlay065/struct_ov65_022358CC.h b/include/overlay065/struct_ov65_022358CC.h index 72691051e3..849ad085c1 100644 --- a/include/overlay065/struct_ov65_022358CC.h +++ b/include/overlay065/struct_ov65_022358CC.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_STRUCT_OV65_022358CC_H #include "struct_decls/struct_02009714_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_0200C738.h" + #include "overlay065/struct_ov65_022358CC_sub1.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; + UnkStruct_02009714 *unk_190[4]; UnkStruct_ov65_022358CC_sub1 unk_1A0; } UnkStruct_ov65_022358CC; diff --git a/include/overlay065/struct_ov65_022358CC_sub1.h b/include/overlay065/struct_ov65_022358CC_sub1.h index cf0e7d9ebc..49be294660 100644 --- a/include/overlay065/struct_ov65_022358CC_sub1.h +++ b/include/overlay065/struct_ov65_022358CC_sub1.h @@ -3,13 +3,14 @@ #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" + #include "overlay019/struct_ov19_021DA864.h" typedef struct { - UnkStruct_02009DC8 * unk_00[4]; + UnkStruct_02009DC8 *unk_00[4]; UnkStruct_ov19_021DA864 unk_10; - GraphicElementData * unk_34; - GraphicElementData * unk_38; + GraphicElementData *unk_34; + GraphicElementData *unk_38; } UnkStruct_ov65_022358CC_sub1; #endif // POKEPLATINUM_STRUCT_OV65_022358CC_SUB1_H diff --git a/include/overlay065/struct_ov65_02236318.h b/include/overlay065/struct_ov65_02236318.h index 83215a2048..2ede398e95 100644 --- a/include/overlay065/struct_ov65_02236318.h +++ b/include/overlay065/struct_ov65_02236318.h @@ -1,12 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV65_02236318_H #define POKEPLATINUM_STRUCT_OV65_02236318_H - #include typedef struct { - void * unk_00; - NNSG2dPaletteData * unk_04; + void *unk_00; + NNSG2dPaletteData *unk_04; u8 unk_08; u8 unk_09; s16 unk_0A; diff --git a/include/overlay066/ov66_0222DCE0.h b/include/overlay066/ov66_0222DCE0.h index 67bf5b95e1..7b136b9731 100644 --- a/include/overlay066/ov66_0222DCE0.h +++ b/include/overlay066/ov66_0222DCE0.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV66_0222DCE0_H #define POKEPLATINUM_OV66_0222DCE0_H +#include "overlay_manager.h" -int ov66_0222DCE0(OverlayManager * param0, int * param1); -int ov66_0222DD6C(OverlayManager * param0, int * param1); -int ov66_0222DD90(OverlayManager * param0, int * param1); +int ov66_0222DCE0(OverlayManager *param0, int *param1); +int ov66_0222DD6C(OverlayManager *param0, int *param1); +int ov66_0222DD90(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV66_0222DCE0_H diff --git a/include/overlay066/ov66_0222DDF0.h b/include/overlay066/ov66_0222DDF0.h index 3a54df109c..36952a9cee 100644 --- a/include/overlay066/ov66_0222DDF0.h +++ b/include/overlay066/ov66_0222DDF0.h @@ -1,8 +1,8 @@ #ifndef POKEPLATINUM_OV66_0222DDF0_H #define POKEPLATINUM_OV66_0222DDF0_H -#include "trainer_info.h" -#include "savedata.h" +#include + #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay066/struct_ov66_0222E294.h" #include "overlay066/struct_ov66_0222E71C_decl.h" @@ -15,141 +15,142 @@ #include "overlay068/struct_ov68_0225DC74.h" #include "enums.h" -#include +#include "savedata.h" +#include "trainer_info.h" -UnkStruct_ov66_0222DFF8 * ov66_0222DDF0(SaveData * param0, u32 param1); -void ov66_0222DEEC(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222DF58(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222DFF4(UnkStruct_ov66_0222DFF8 * param0); -int ov66_0222DFF8(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E004(const UnkStruct_ov66_0222DFF8 * param0); -UnkStruct_ov66_0223177C * ov66_0222E00C(UnkStruct_ov66_0222DFF8 * param0); -const UnkStruct_ov66_02231560 * ov66_0222E010(UnkStruct_ov66_0222DFF8 * param0); -const UnkStruct_ov66_02231428 * ov66_0222E028(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E02C(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -BOOL ov66_0222E058(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -BOOL ov66_0222E084(UnkStruct_ov66_0222DFF8 * param0, int param1); -BOOL ov66_0222E09C(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -SaveData * ov66_0222E0C4(UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E0C8(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E0DC(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E0F4(const UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222E10C(UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E120(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E12C(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E138(const UnkStruct_ov66_0222DFF8 * param0); -int ov66_0222E158(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E170(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E190(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E19C(const UnkStruct_ov66_0222DFF8 * param0); -PPW_LOBBY_TIME_EVENT ov66_0222E1B8(const UnkStruct_ov66_0222DFF8 * param0); -PPW_LOBBY_TIME_EVENT ov66_0222E1D0(const UnkStruct_ov66_0222DFF8 * param0); -PPW_LOBBY_TIME_EVENT ov66_0222E1E8(const UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222E200(UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E210(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E220(const UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222E22C(UnkStruct_ov66_0222DFF8 * param0, BOOL param1); -void ov66_0222E238(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222E24C(UnkStruct_ov66_0222DFF8 * param0, s32 param1, u32 param2); -void ov66_0222E27C(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222E294(const UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov66_0222E294 * param1); -void ov66_0222E2A4(UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E2B4(const UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222E2C4(UnkStruct_ov66_0222DFF8 * param0, BOOL param1); -void ov66_0222E2CC(const UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222E31C(UnkStruct_ov66_0222DFF8 * param0, BOOL param1); -u32 ov66_0222E338(const UnkStruct_ov66_0222DFF8 * param0); -s32 ov66_0222E344(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E34C(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -const UnkStruct_ov66_0222E71C * ov66_0222E374(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -UnkStruct_ov66_0222E71C * ov66_0222E3BC(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222E3E4(UnkStruct_ov66_0222DFF8 * param0, int param1); -void ov66_0222E500(UnkStruct_ov66_0222DFF8 * param0, int param1, s32 param2); -void ov66_0222E528(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222E56C(UnkStruct_ov66_0222DFF8 * param0, int param1, int param2); -void ov66_0222E5D8(UnkStruct_ov66_0222DFF8 * param0, u32 param1, u32 param2); -void ov66_0222E640(const UnkStruct_ov66_0222E71C * param0, TrainerInfo * param1, u32 param2); -u32 ov66_0222E71C(const UnkStruct_ov66_0222E71C * param0); -int ov66_0222E728(const UnkStruct_ov66_0222E71C * param0, u32 param1); -s32 ov66_0222E760(const UnkStruct_ov66_0222E71C * param0, u32 param1); -s32 ov66_0222E798(const UnkStruct_ov66_0222E71C * param0); -u32 ov66_0222E79C(const UnkStruct_ov66_0222E71C * param0); -int ov66_0222E7A0(const UnkStruct_ov66_0222E71C * param0); -UnkStruct_ov66_02231428 ov66_0222E7C4(const UnkStruct_ov66_0222E71C * param0); -u32 ov66_0222E7C8(const UnkStruct_ov66_0222E71C * param0); -u32 ov66_0222E80C(const UnkStruct_ov66_0222E71C * param0); -BOOL ov66_0222E824(const UnkStruct_ov66_0222E71C * param0); -u32 ov66_0222E850(const UnkStruct_ov66_0222E71C * param0); -u32 ov66_0222E858(const UnkStruct_ov66_0222E71C * param0); -u32 ov66_0222E880(const UnkStruct_ov66_0222E71C * param0); -u32 ov66_0222E8A4(const UnkStruct_ov66_0222E71C * param0); -u32 ov66_0222E8C4(const UnkStruct_ov66_0222E71C * param0); -BOOL ov66_0222E8D8(const UnkStruct_ov66_0222E71C * param0); -int ov66_0222E8E8(const UnkStruct_ov66_0222E71C * param0, u32 param1); -void ov66_0222E908(const UnkStruct_ov66_0222E71C * param0, UnkStruct_ov66_0222E908 * param1); -TrainerInfo * ov66_0222E918(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222E924(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222E934(const UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov66_02232068 * param1); -BOOL ov66_0222E944(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -const UnkStruct_ov66_02230914 * ov66_0222E954(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -u32 ov66_0222E964(const UnkStruct_ov66_0222DFF8 * param0); -u32 ov66_0222E974(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222E990(UnkStruct_ov66_0222DFF8 * param0, u32 param1, u32 param2); -void ov66_0222E9CC(UnkStruct_ov66_0222DFF8 * param0, u32 param1, u32 param2, u32 param3); -void ov66_0222EA10(UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7); -void ov66_0222EAB4(UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); -u32 ov66_0222EB28(const UnkStruct_ov66_0222DFF8 * param0); -u32 ov66_0222EB38(const UnkStruct_ov66_0222DFF8 * param0); -u32 ov66_0222EB48(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222EB54(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222EB6C(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -int ov66_0222EB7C(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -u32 ov66_0222EB8C(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -u32 ov66_0222EB9C(const UnkStruct_ov66_0222DFF8 * param0); -u32 ov66_0222EBA4(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -u32 ov66_0222EBB4(UnkStruct_ov66_0222DFF8 * param0, u32 param1, int param2); -void ov66_0222EBC4(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222EBD4(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -BOOL ov66_0222EBE4(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222EBF4(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222EC04(u32 param0, u32 * param1, u32 * param2); -void ov66_0222EC20(UnkStruct_ov66_0222DFF8 * param0, u32 param1, int param2); -int ov66_0222EC30(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222EC40(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222EC50(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222EC60(UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222EC70(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222ECD4(UnkStruct_ov66_0222DFF8 * param0, u16 param1); -void ov66_0222ED7C(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222EDC0(UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222EDF4(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222EE08(const UnkStruct_ov66_0222DFF8 * param0); -u32 ov66_0222EE1C(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222EE24(const UnkStruct_ov66_0222DFF8 * param0); -int ov66_0222EE30(const UnkStruct_ov66_0222DFF8 * param0); -u16 ov66_0222EE3C(const UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222EE44(const UnkStruct_ov66_0222DFF8 * param0, u32 param1); -BOOL ov66_0222EE68(const UnkStruct_ov66_0222DFF8 * param0); -s16 ov66_0222EE90(const UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222EEA0(UnkStruct_ov66_0222DFF8 * param0); -BOOL ov66_0222EEAC(const UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222EEB8(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222EED4(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222EEE4(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222EEF4(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222EF44(UnkStruct_ov66_0222DFF8 * param0, u32 param1); -void ov66_0222EF94(UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1); -void ov66_0222F000(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222F020(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222F030(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222F040(UnkStruct_ov66_0222DFF8 * param0, int param1); -int ov66_0222F05C(const UnkStruct_ov66_0222DFF8 * param0); -u32 ov66_0222F0DC(const UnkStruct_ov66_0222DFF8 * param0); -int ov66_0222F104(const UnkStruct_ov66_0222DFF8 * param0); -u32 ov66_0222F114(const UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222F124(UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov68_0225DC74 * param1); -BOOL ov66_0222F144(const UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov68_0225DC74 * param1); -void ov66_0222F16C(UnkStruct_ov66_0222DFF8 * param0); -void ov66_0222F198(UnkStruct_ov66_0222DFF8 * param0); +UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *param0, u32 param1); +void ov66_0222DEEC(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222DF58(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222DFF4(UnkStruct_ov66_0222DFF8 *param0); +int ov66_0222DFF8(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E004(const UnkStruct_ov66_0222DFF8 *param0); +UnkStruct_ov66_0223177C *ov66_0222E00C(UnkStruct_ov66_0222DFF8 *param0); +const UnkStruct_ov66_02231560 *ov66_0222E010(UnkStruct_ov66_0222DFF8 *param0); +const UnkStruct_ov66_02231428 *ov66_0222E028(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E02C(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +BOOL ov66_0222E058(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +BOOL ov66_0222E084(UnkStruct_ov66_0222DFF8 *param0, int param1); +BOOL ov66_0222E09C(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +SaveData *ov66_0222E0C4(UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E0C8(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E0DC(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E0F4(const UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222E10C(UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E120(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E12C(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E138(const UnkStruct_ov66_0222DFF8 *param0); +int ov66_0222E158(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E170(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E190(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E19C(const UnkStruct_ov66_0222DFF8 *param0); +PPW_LOBBY_TIME_EVENT ov66_0222E1B8(const UnkStruct_ov66_0222DFF8 *param0); +PPW_LOBBY_TIME_EVENT ov66_0222E1D0(const UnkStruct_ov66_0222DFF8 *param0); +PPW_LOBBY_TIME_EVENT ov66_0222E1E8(const UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222E200(UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E210(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E220(const UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222E22C(UnkStruct_ov66_0222DFF8 *param0, BOOL param1); +void ov66_0222E238(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222E24C(UnkStruct_ov66_0222DFF8 *param0, s32 param1, u32 param2); +void ov66_0222E27C(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222E294(const UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov66_0222E294 *param1); +void ov66_0222E2A4(UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E2B4(const UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222E2C4(UnkStruct_ov66_0222DFF8 *param0, BOOL param1); +void ov66_0222E2CC(const UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222E31C(UnkStruct_ov66_0222DFF8 *param0, BOOL param1); +u32 ov66_0222E338(const UnkStruct_ov66_0222DFF8 *param0); +s32 ov66_0222E344(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E34C(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +const UnkStruct_ov66_0222E71C *ov66_0222E374(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +UnkStruct_ov66_0222E71C *ov66_0222E3BC(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222E3E4(UnkStruct_ov66_0222DFF8 *param0, int param1); +void ov66_0222E500(UnkStruct_ov66_0222DFF8 *param0, int param1, s32 param2); +void ov66_0222E528(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222E56C(UnkStruct_ov66_0222DFF8 *param0, int param1, int param2); +void ov66_0222E5D8(UnkStruct_ov66_0222DFF8 *param0, u32 param1, u32 param2); +void ov66_0222E640(const UnkStruct_ov66_0222E71C *param0, TrainerInfo *param1, u32 param2); +u32 ov66_0222E71C(const UnkStruct_ov66_0222E71C *param0); +int ov66_0222E728(const UnkStruct_ov66_0222E71C *param0, u32 param1); +s32 ov66_0222E760(const UnkStruct_ov66_0222E71C *param0, u32 param1); +s32 ov66_0222E798(const UnkStruct_ov66_0222E71C *param0); +u32 ov66_0222E79C(const UnkStruct_ov66_0222E71C *param0); +int ov66_0222E7A0(const UnkStruct_ov66_0222E71C *param0); +UnkStruct_ov66_02231428 ov66_0222E7C4(const UnkStruct_ov66_0222E71C *param0); +u32 ov66_0222E7C8(const UnkStruct_ov66_0222E71C *param0); +u32 ov66_0222E80C(const UnkStruct_ov66_0222E71C *param0); +BOOL ov66_0222E824(const UnkStruct_ov66_0222E71C *param0); +u32 ov66_0222E850(const UnkStruct_ov66_0222E71C *param0); +u32 ov66_0222E858(const UnkStruct_ov66_0222E71C *param0); +u32 ov66_0222E880(const UnkStruct_ov66_0222E71C *param0); +u32 ov66_0222E8A4(const UnkStruct_ov66_0222E71C *param0); +u32 ov66_0222E8C4(const UnkStruct_ov66_0222E71C *param0); +BOOL ov66_0222E8D8(const UnkStruct_ov66_0222E71C *param0); +int ov66_0222E8E8(const UnkStruct_ov66_0222E71C *param0, u32 param1); +void ov66_0222E908(const UnkStruct_ov66_0222E71C *param0, UnkStruct_ov66_0222E908 *param1); +TrainerInfo *ov66_0222E918(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222E924(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222E934(const UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov66_02232068 *param1); +BOOL ov66_0222E944(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +const UnkStruct_ov66_02230914 *ov66_0222E954(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +u32 ov66_0222E964(const UnkStruct_ov66_0222DFF8 *param0); +u32 ov66_0222E974(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222E990(UnkStruct_ov66_0222DFF8 *param0, u32 param1, u32 param2); +void ov66_0222E9CC(UnkStruct_ov66_0222DFF8 *param0, u32 param1, u32 param2, u32 param3); +void ov66_0222EA10(UnkStruct_ov66_0222DFF8 *param0, enum PlazaMinigame param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7); +void ov66_0222EAB4(UnkStruct_ov66_0222DFF8 *param0, enum PlazaMinigame param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6); +u32 ov66_0222EB28(const UnkStruct_ov66_0222DFF8 *param0); +u32 ov66_0222EB38(const UnkStruct_ov66_0222DFF8 *param0); +u32 ov66_0222EB48(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222EB54(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222EB6C(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +int ov66_0222EB7C(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +u32 ov66_0222EB8C(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +u32 ov66_0222EB9C(const UnkStruct_ov66_0222DFF8 *param0); +u32 ov66_0222EBA4(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +u32 ov66_0222EBB4(UnkStruct_ov66_0222DFF8 *param0, u32 param1, int param2); +void ov66_0222EBC4(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222EBD4(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +BOOL ov66_0222EBE4(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222EBF4(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222EC04(u32 param0, u32 *param1, u32 *param2); +void ov66_0222EC20(UnkStruct_ov66_0222DFF8 *param0, u32 param1, int param2); +int ov66_0222EC30(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222EC40(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222EC50(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222EC60(UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222EC70(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222ECD4(UnkStruct_ov66_0222DFF8 *param0, u16 param1); +void ov66_0222ED7C(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222EDC0(UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222EDF4(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222EE08(const UnkStruct_ov66_0222DFF8 *param0); +u32 ov66_0222EE1C(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222EE24(const UnkStruct_ov66_0222DFF8 *param0); +int ov66_0222EE30(const UnkStruct_ov66_0222DFF8 *param0); +u16 ov66_0222EE3C(const UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222EE44(const UnkStruct_ov66_0222DFF8 *param0, u32 param1); +BOOL ov66_0222EE68(const UnkStruct_ov66_0222DFF8 *param0); +s16 ov66_0222EE90(const UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222EEA0(UnkStruct_ov66_0222DFF8 *param0); +BOOL ov66_0222EEAC(const UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222EEB8(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222EED4(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222EEE4(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222EEF4(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222EF44(UnkStruct_ov66_0222DFF8 *param0, u32 param1); +void ov66_0222EF94(UnkStruct_ov66_0222DFF8 *param0, enum PlazaMinigame param1); +void ov66_0222F000(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222F020(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222F030(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222F040(UnkStruct_ov66_0222DFF8 *param0, int param1); +int ov66_0222F05C(const UnkStruct_ov66_0222DFF8 *param0); +u32 ov66_0222F0DC(const UnkStruct_ov66_0222DFF8 *param0); +int ov66_0222F104(const UnkStruct_ov66_0222DFF8 *param0); +u32 ov66_0222F114(const UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222F124(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov68_0225DC74 *param1); +BOOL ov66_0222F144(const UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov68_0225DC74 *param1); +void ov66_0222F16C(UnkStruct_ov66_0222DFF8 *param0); +void ov66_0222F198(UnkStruct_ov66_0222DFF8 *param0); #endif // POKEPLATINUM_OV66_0222DDF0_H diff --git a/include/overlay066/ov66_02230C44.h b/include/overlay066/ov66_02230C44.h index c5ab6f59dd..a55fca4df9 100644 --- a/include/overlay066/ov66_02230C44.h +++ b/include/overlay066/ov66_02230C44.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_OV66_02230C44_H #define POKEPLATINUM_OV66_02230C44_H -#include "savedata.h" #include "overlay066/struct_ov66_0222DCE0_sub1.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay066/struct_ov66_02230C90_decl.h" -UnkStruct_ov66_02230C90 * ov66_02230C44(BOOL param0, SaveData * param1, UnkStruct_ov66_0222DCE0_sub1 * param2, UnkStruct_ov66_0222DFF8 * param3, u32 param4); -void ov66_02230C90(UnkStruct_ov66_02230C90 * param0); -void ov66_02230CAC(UnkStruct_ov66_02230C90 * param0); -int ov66_02230CB8(UnkStruct_ov66_02230C90 * param0); -void ov66_02230CE8(UnkStruct_ov66_02230C90 * param0); +#include "savedata.h" + +UnkStruct_ov66_02230C90 *ov66_02230C44(BOOL param0, SaveData *param1, UnkStruct_ov66_0222DCE0_sub1 *param2, UnkStruct_ov66_0222DFF8 *param3, u32 param4); +void ov66_02230C90(UnkStruct_ov66_02230C90 *param0); +void ov66_02230CAC(UnkStruct_ov66_02230C90 *param0); +int ov66_02230CB8(UnkStruct_ov66_02230C90 *param0); +void ov66_02230CE8(UnkStruct_ov66_02230C90 *param0); #endif // POKEPLATINUM_OV66_02230C44_H diff --git a/include/overlay066/ov66_02231428.h b/include/overlay066/ov66_02231428.h index 67bd6b9dbf..83301fcd21 100644 --- a/include/overlay066/ov66_02231428.h +++ b/include/overlay066/ov66_02231428.h @@ -4,15 +4,15 @@ #include "overlay066/struct_ov66_02231428.h" #include "overlay066/struct_ov66_02231560.h" -void ov66_02231428(UnkStruct_ov66_02231428 * param0, const s64 * param1); -void ov66_0223144C(const UnkStruct_ov66_02231428 * param0, const UnkStruct_ov66_02231428 * param1, UnkStruct_ov66_02231428 * param2); -void ov66_022314BC(const UnkStruct_ov66_02231428 * param0, const UnkStruct_ov66_02231428 * param1, UnkStruct_ov66_02231428 * param2); -void ov66_02231560(UnkStruct_ov66_02231560 * param0, u16 param1, u8 param2, BOOL param3); -u16 ov66_022315D8(const UnkStruct_ov66_02231560 * param0, u8 param1); -u8 ov66_022315FC(const UnkStruct_ov66_02231560 * param0, u8 param1); -BOOL ov66_02231624(const UnkStruct_ov66_02231560 * param0, u8 param1); -BOOL ov66_0223164C(const UnkStruct_ov66_02231560 * param0, u8 param1); -void ov66_02231668(void * param0); +void ov66_02231428(UnkStruct_ov66_02231428 *param0, const s64 *param1); +void ov66_0223144C(const UnkStruct_ov66_02231428 *param0, const UnkStruct_ov66_02231428 *param1, UnkStruct_ov66_02231428 *param2); +void ov66_022314BC(const UnkStruct_ov66_02231428 *param0, const UnkStruct_ov66_02231428 *param1, UnkStruct_ov66_02231428 *param2); +void ov66_02231560(UnkStruct_ov66_02231560 *param0, u16 param1, u8 param2, BOOL param3); +u16 ov66_022315D8(const UnkStruct_ov66_02231560 *param0, u8 param1); +u8 ov66_022315FC(const UnkStruct_ov66_02231560 *param0, u8 param1); +BOOL ov66_02231624(const UnkStruct_ov66_02231560 *param0, u8 param1); +BOOL ov66_0223164C(const UnkStruct_ov66_02231560 *param0, u8 param1); +void ov66_02231668(void *param0); BOOL ov66_022316C4(u16 param0, u16 param1); u32 ov66_022316E8(int param0); int ov66_022316F4(int param0, int param1); diff --git a/include/overlay066/ov66_0223177C.h b/include/overlay066/ov66_0223177C.h index 8eb2ddc343..84c269ba29 100644 --- a/include/overlay066/ov66_0223177C.h +++ b/include/overlay066/ov66_0223177C.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_OV66_0223177C_H #define POKEPLATINUM_OV66_0223177C_H -#include "strbuf.h" #include "overlay066/struct_ov66_02231428.h" #include "overlay066/struct_ov66_0223177C_decl.h" #include "overlay066/struct_ov66_0223185C.h" @@ -16,34 +15,35 @@ #include "overlay066/struct_ov66_02232068.h" #include "enums.h" +#include "strbuf.h" -UnkStruct_ov66_0223177C * ov66_0223177C(u32 param0); -void ov66_022317AC(UnkStruct_ov66_0223177C * param0); -void ov66_022317C0(UnkStruct_ov66_0223177C * param0); -void ov66_022317D8(UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231428 * param1); -void ov66_022317E4(UnkStruct_ov66_0223177C * param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3); -BOOL ov66_022317F0(UnkStruct_ov66_0223177C * param0, u32 param1); -void ov66_0223180C(UnkStruct_ov66_0223177C * param0, u32 param1); -void ov66_0223185C(UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_0223185C * param1); -void ov66_022318AC(UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_022318AC * param1); -void ov66_02231908(UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231908 * param1); -void ov66_0223199C(UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_0223199C * param1); -void ov66_022319FC(UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_022319FC * param1); -void ov66_02231A58(UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231A58 * param1); -void ov66_02231AB4(UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231AB4 * param1); -void ov66_02231B24(UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231B24 * param1, const UnkStruct_ov66_02232068 * param2); -void ov66_02231B80(UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231B80 * param1); -void ov66_02231C04(UnkStruct_ov66_0223177C * param0); -BOOL ov66_02231C10(const UnkStruct_ov66_0223177C * param0, UnkStruct_ov66_02231428 * param1); -BOOL ov66_02231C18(const UnkStruct_ov66_0223177C * param0, u32 param1); -u32 ov66_02231C24(const UnkStruct_ov66_0223177C * param0, u32 param1); -BOOL ov66_02231C30(const UnkStruct_ov66_0223177C * param0, u32 param1); -BOOL ov66_02231C3C(const UnkStruct_ov66_0223177C * param0, u32 param1); -BOOL ov66_02231C48(const UnkStruct_ov66_0223177C * param0, u32 param1); -UnkEnum_ov66_02231E6C ov66_02231C54(const UnkStruct_ov66_0223177C * param0); -BOOL ov66_02231C60(const UnkStruct_ov66_0223177C * param0); -int ov66_02231C78(const UnkStruct_ov66_0223177C * param0); -BOOL ov66_02231C94(const UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02232068 * param1, int param2, Strbuf *param3, u32 param4); -u32 ov66_02231D00(const UnkStruct_ov66_0223177C * param0, int param1, u32 param2); +UnkStruct_ov66_0223177C *ov66_0223177C(u32 param0); +void ov66_022317AC(UnkStruct_ov66_0223177C *param0); +void ov66_022317C0(UnkStruct_ov66_0223177C *param0); +void ov66_022317D8(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231428 *param1); +void ov66_022317E4(UnkStruct_ov66_0223177C *param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3); +BOOL ov66_022317F0(UnkStruct_ov66_0223177C *param0, u32 param1); +void ov66_0223180C(UnkStruct_ov66_0223177C *param0, u32 param1); +void ov66_0223185C(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_0223185C *param1); +void ov66_022318AC(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_022318AC *param1); +void ov66_02231908(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231908 *param1); +void ov66_0223199C(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_0223199C *param1); +void ov66_022319FC(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_022319FC *param1); +void ov66_02231A58(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231A58 *param1); +void ov66_02231AB4(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231AB4 *param1); +void ov66_02231B24(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231B24 *param1, const UnkStruct_ov66_02232068 *param2); +void ov66_02231B80(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231B80 *param1); +void ov66_02231C04(UnkStruct_ov66_0223177C *param0); +BOOL ov66_02231C10(const UnkStruct_ov66_0223177C *param0, UnkStruct_ov66_02231428 *param1); +BOOL ov66_02231C18(const UnkStruct_ov66_0223177C *param0, u32 param1); +u32 ov66_02231C24(const UnkStruct_ov66_0223177C *param0, u32 param1); +BOOL ov66_02231C30(const UnkStruct_ov66_0223177C *param0, u32 param1); +BOOL ov66_02231C3C(const UnkStruct_ov66_0223177C *param0, u32 param1); +BOOL ov66_02231C48(const UnkStruct_ov66_0223177C *param0, u32 param1); +UnkEnum_ov66_02231E6C ov66_02231C54(const UnkStruct_ov66_0223177C *param0); +BOOL ov66_02231C60(const UnkStruct_ov66_0223177C *param0); +int ov66_02231C78(const UnkStruct_ov66_0223177C *param0); +BOOL ov66_02231C94(const UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02232068 *param1, int param2, Strbuf *param3, u32 param4); +u32 ov66_02231D00(const UnkStruct_ov66_0223177C *param0, int param1, u32 param2); #endif // POKEPLATINUM_OV66_0223177C_H diff --git a/include/overlay066/ov66_022324F0.h b/include/overlay066/ov66_022324F0.h index 210ac5076f..33ee416e99 100644 --- a/include/overlay066/ov66_022324F0.h +++ b/include/overlay066/ov66_022324F0.h @@ -1,57 +1,57 @@ #ifndef POKEPLATINUM_OV66_022324F0_H #define POKEPLATINUM_OV66_022324F0_H -#include "savedata.h" +#include #include "overlay066/struct_ov66_022324F0.h" #include "overlay066/struct_ov66_02232B20.h" #include "overlay066/struct_ov66_022589B4.h" -#include #include "enums.h" +#include "savedata.h" -void ov66_022324F0(u32 param0, SaveData * param1, u32 param2, const UnkStruct_ov66_022324F0 * param3, void * param4); +void ov66_022324F0(u32 param0, SaveData *param1, u32 param2, const UnkStruct_ov66_022324F0 *param3, void *param4); void ov66_02232598(void); UnkEnum_ov66_0223287C ov66_022325D8(void); PPW_LOBBY_ERROR ov66_022326DC(void); s32 ov66_0223270C(PPW_LOBBY_ERROR param0); -BOOL ov66_02232714(const void * param0); -BOOL ov66_02232720(const void * param0, u32 param1); +BOOL ov66_02232714(const void *param0); +BOOL ov66_02232720(const void *param0, u32 param1); BOOL ov66_02232804(void); void ov66_0223282C(void); BOOL ov66_02232854(void); UnkEnum_ov66_0223287C ov66_0223287C(void); BOOL ov66_022328CC(void); s32 ov66_022328F0(void); -void ov66_02232908(const void * param0); -const void * ov66_0223293C(s32 param0); -void ov66_0223295C(s32 param0, s64 * param1); -s32 ov66_02232988(void); -s32 ov66_022329E4(s32 param0); +void ov66_02232908(const void *param0); +const void *ov66_0223293C(s32 param0); +void ov66_0223295C(s32 param0, s64 *param1); +s32 ov66_02232988(void); +s32 ov66_022329E4(s32 param0); BOOL ov66_02232A48(UnkEnum_ov66_022336B8 param0); UnkEnum_ov66_02232A84 ov66_02232A84(void); BOOL ov66_02232AA4(void); BOOL ov66_02232AD4(void); BOOL ov66_02232B00(UnkEnum_ov66_022336B8 param0); -void ov66_02232B20(UnkStruct_ov66_02232B20 * param0); -void ov66_02232B4C(UnkStruct_ov66_02232B20 * param0); +void ov66_02232B20(UnkStruct_ov66_02232B20 *param0); +void ov66_02232B4C(UnkStruct_ov66_02232B20 *param0); u32 ov66_02232B78(s32 param0); u32 ov66_02232B8C(s32 param0); s32 ov66_02232BA0(u32 param0); s32 ov66_02232BB4(u32 param0); -void ov66_02232BC8(s64 * param0); +void ov66_02232BC8(s64 *param0); u32 ov66_02232BEC(UnkEnum_ov66_02232BEC param0); BOOL ov66_02232C8C(void); BOOL ov66_02232CB8(void); u16 ov66_02232CD4(u8 param0); u8 ov66_02232D00(u8 param0); -void ov66_02232D30(const UnkStruct_ov66_022589B4 * param0, u32 param1, void * param2); -void ov66_02232D60(const UnkStruct_ov66_022589B4 * param0, u32 param1, void * param2); +void ov66_02232D30(const UnkStruct_ov66_022589B4 *param0, u32 param1, void *param2); +void ov66_02232D60(const UnkStruct_ov66_022589B4 *param0, u32 param1, void *param2); void ov66_02232D90(void); void ov66_02232DC8(void); -void ov66_02232E00(u32 param0, const void * param1, u32 param2); -void ov66_02232E5C(u32 param0, s32 param1, const void * param2, u32 param3); -void ov66_02232EBC(u32 param0, const void * param1, u32 param2); +void ov66_02232E00(u32 param0, const void *param1, u32 param2); +void ov66_02232E5C(u32 param0, s32 param1, const void *param2, u32 param3); +void ov66_02232EBC(u32 param0, const void *param1, u32 param2); BOOL ov66_02232F38(UnkEnum_ov66_02232F38 param0, u32 param1); void ov66_02233064(void); void ov66_022330CC(void); @@ -70,7 +70,7 @@ s32 ov66_022333BC(s32 param0); void ov66_022333E4(s32 param0); UnkEnum_ov66_02233434 ov66_02233434(void); s32 ov66_02233454(UnkEnum_ov66_02233454 param0); -u16 * ov66_02233538(UnkEnum_ov66_02233538 param0); +u16 *ov66_02233538(UnkEnum_ov66_02233538 param0); BOOL ov66_022335C0(UnkEnum_ov66_022335C0 param0, u32 param1); void ov66_0223361C(void); diff --git a/include/overlay066/ov66_022343A8.h b/include/overlay066/ov66_022343A8.h index 73178557d2..11cb8ea74f 100644 --- a/include/overlay066/ov66_022343A8.h +++ b/include/overlay066/ov66_022343A8.h @@ -1,32 +1,32 @@ #ifndef POKEPLATINUM_OV66_022343A8_H #define POKEPLATINUM_OV66_022343A8_H +#include + #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay066/struct_ov66_02234548_decl.h" #include "overlay066/struct_ov66_02234798_decl.h" -#include - -UnkStruct_ov66_02234548 * ov66_022343A8(u32 param0, u32 param1, u32 param2, u32 param3); -void ov66_02234548(UnkStruct_ov66_02234548 * param0); -void ov66_02234590(UnkStruct_ov66_02234548 * param0); -void ov66_022345C4(UnkStruct_ov66_02234548 * param0); -void ov66_02234604(UnkStruct_ov66_02234548 * param0); -void ov66_02234610(UnkStruct_ov66_02234548 * param0, u32 param1); -UnkStruct_ov66_02234798 * ov66_0223461C(UnkStruct_ov66_02234548 * param0, const UnkStruct_ov63_0222BEC0 * param1); -void ov66_02234798(UnkStruct_ov66_02234798 * param0); -void ov66_022347B0(UnkStruct_ov66_02234798 * param0, BOOL param1); -void ov66_022347C4(UnkStruct_ov66_02234798 * param0, u32 param1); -BOOL ov66_022347CC(const UnkStruct_ov66_02234798 * param0); -void ov66_022347D4(UnkStruct_ov66_02234798 * param0, const UnkStruct_ov63_0222CC3C * param1); -void ov66_022347F8(UnkStruct_ov66_02234798 * param0, const VecFx32 * param1); -void ov66_0223481C(const UnkStruct_ov66_02234798 * param0, VecFx32 * param1); -void ov66_02234834(UnkStruct_ov66_02234798 * param0, int param1); -void ov66_02234850(UnkStruct_ov66_02234798 * param0, int param1); -void ov66_0223487C(UnkStruct_ov66_02234798 * param0); -void ov66_02234888(UnkStruct_ov66_02234798 * param0, u8 param1); -void ov66_0223488C(UnkStruct_ov66_02234798 * param0, BOOL param1); -BOOL ov66_022348A8(const UnkStruct_ov66_02234798 * param0); +UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 param2, u32 param3); +void ov66_02234548(UnkStruct_ov66_02234548 *param0); +void ov66_02234590(UnkStruct_ov66_02234548 *param0); +void ov66_022345C4(UnkStruct_ov66_02234548 *param0); +void ov66_02234604(UnkStruct_ov66_02234548 *param0); +void ov66_02234610(UnkStruct_ov66_02234548 *param0, u32 param1); +UnkStruct_ov66_02234798 *ov66_0223461C(UnkStruct_ov66_02234548 *param0, const UnkStruct_ov63_0222BEC0 *param1); +void ov66_02234798(UnkStruct_ov66_02234798 *param0); +void ov66_022347B0(UnkStruct_ov66_02234798 *param0, BOOL param1); +void ov66_022347C4(UnkStruct_ov66_02234798 *param0, u32 param1); +BOOL ov66_022347CC(const UnkStruct_ov66_02234798 *param0); +void ov66_022347D4(UnkStruct_ov66_02234798 *param0, const UnkStruct_ov63_0222CC3C *param1); +void ov66_022347F8(UnkStruct_ov66_02234798 *param0, const VecFx32 *param1); +void ov66_0223481C(const UnkStruct_ov66_02234798 *param0, VecFx32 *param1); +void ov66_02234834(UnkStruct_ov66_02234798 *param0, int param1); +void ov66_02234850(UnkStruct_ov66_02234798 *param0, int param1); +void ov66_0223487C(UnkStruct_ov66_02234798 *param0); +void ov66_02234888(UnkStruct_ov66_02234798 *param0, u8 param1); +void ov66_0223488C(UnkStruct_ov66_02234798 *param0, BOOL param1); +BOOL ov66_022348A8(const UnkStruct_ov66_02234798 *param0); #endif // POKEPLATINUM_OV66_022343A8_H diff --git a/include/overlay066/struct_ov66_0222DCE0.h b/include/overlay066/struct_ov66_0222DCE0.h index 3ebe68e865..8b16a9789b 100644 --- a/include/overlay066/struct_ov66_0222DCE0.h +++ b/include/overlay066/struct_ov66_0222DCE0.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV66_0222DCE0_H #define POKEPLATINUM_STRUCT_OV66_0222DCE0_H -#include "savedata.h" #include "overlay066/struct_ov66_0222DCE0_sub1.h" +#include "savedata.h" + typedef struct { - UnkStruct_ov66_0222DCE0_sub1 * unk_00; - SaveData * unk_04; + UnkStruct_ov66_0222DCE0_sub1 *unk_00; + SaveData *unk_04; BOOL unk_08; } UnkStruct_ov66_0222DCE0; diff --git a/include/overlay066/struct_ov66_02230DBC.h b/include/overlay066/struct_ov66_02230DBC.h index 37dda4d7f7..93509767f3 100644 --- a/include/overlay066/struct_ov66_02230DBC.h +++ b/include/overlay066/struct_ov66_02230DBC.h @@ -1,18 +1,19 @@ #ifndef POKEPLATINUM_STRUCT_OV66_02230DBC_H #define POKEPLATINUM_STRUCT_OV66_02230DBC_H -#include "trainer_info.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay066/struct_ov66_0222E294.h" #include "overlay066/struct_ov66_02232068.h" +#include "trainer_info.h" + typedef struct { u32 unk_00; UnkStruct_ov66_0222E294 unk_04; UnkStruct_ov66_02232068 unk_08; BOOL unk_1C; - TrainerInfo * unk_20[4]; - UnkStruct_ov66_0222DFF8 * unk_30; + TrainerInfo *unk_20[4]; + UnkStruct_ov66_0222DFF8 *unk_30; } UnkStruct_ov66_02230DBC; #endif // POKEPLATINUM_STRUCT_OV66_02230DBC_H diff --git a/include/overlay066/struct_ov66_02230E68.h b/include/overlay066/struct_ov66_02230E68.h index 476b0eacab..353bcf95e8 100644 --- a/include/overlay066/struct_ov66_02230E68.h +++ b/include/overlay066/struct_ov66_02230E68.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_OV66_02230E68_H #define POKEPLATINUM_STRUCT_OV66_02230E68_H -#include "savedata.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay070/struct_ov70_02263910.h" +#include "savedata.h" + typedef struct { - SaveData * unk_00; + SaveData *unk_00; int unk_04; int unk_08; UnkStruct_ov70_02263910 unk_0C; int unk_18; - UnkStruct_ov66_0222DFF8 * unk_1C; + UnkStruct_ov66_0222DFF8 *unk_1C; } UnkStruct_ov66_02230E68; #endif // POKEPLATINUM_STRUCT_OV66_02230E68_H diff --git a/include/overlay066/struct_ov66_02230F50.h b/include/overlay066/struct_ov66_02230F50.h index 67d25cfa4a..29455b7b70 100644 --- a/include/overlay066/struct_ov66_02230F50.h +++ b/include/overlay066/struct_ov66_02230F50.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_STRUCT_OV66_02230F50_H #define POKEPLATINUM_STRUCT_OV66_02230F50_H -#include "savedata.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay066/struct_ov66_02231428.h" #include "overlay066/struct_ov66_02231560.h" +#include "savedata.h" + typedef struct { - const UnkStruct_ov66_02231560 * unk_00; - SaveData * unk_04; + const UnkStruct_ov66_02231560 *unk_00; + SaveData *unk_04; UnkStruct_ov66_02231428 unk_08; - UnkStruct_ov66_0222DFF8 * unk_0C; + UnkStruct_ov66_0222DFF8 *unk_0C; } UnkStruct_ov66_02230F50; #endif // POKEPLATINUM_STRUCT_OV66_02230F50_H diff --git a/include/overlay066/struct_ov66_02230FA0.h b/include/overlay066/struct_ov66_02230FA0.h index 7c9be26317..228f0c0912 100644 --- a/include/overlay066/struct_ov66_02230FA0.h +++ b/include/overlay066/struct_ov66_02230FA0.h @@ -6,9 +6,9 @@ #include "overlay066/struct_ov66_0223177C_decl.h" typedef struct { - UnkStruct_ov66_0223177C * unk_00; - const UnkStruct_ov66_02231428 * unk_04; - UnkStruct_ov66_0222DFF8 * unk_08; + UnkStruct_ov66_0223177C *unk_00; + const UnkStruct_ov66_02231428 *unk_04; + UnkStruct_ov66_0222DFF8 *unk_08; } UnkStruct_ov66_02230FA0; #endif // POKEPLATINUM_STRUCT_OV66_02230FA0_H diff --git a/include/overlay066/struct_ov66_02231024.h b/include/overlay066/struct_ov66_02231024.h index 97a7506237..7cb5f48216 100644 --- a/include/overlay066/struct_ov66_02231024.h +++ b/include/overlay066/struct_ov66_02231024.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_OV66_02231024_H #define POKEPLATINUM_STRUCT_OV66_02231024_H -#include "savedata.h" #include "overlay066/struct_ov66_0222DCE0_sub1.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "savedata.h" + typedef struct { - SaveData * unk_00; - UnkStruct_ov66_0222DFF8 * unk_04; + SaveData *unk_00; + UnkStruct_ov66_0222DFF8 *unk_04; BOOL unk_08; - UnkStruct_ov66_0222DCE0_sub1 * unk_0C; + UnkStruct_ov66_0222DCE0_sub1 *unk_0C; BOOL unk_10; } UnkStruct_ov66_02231024; diff --git a/include/overlay066/struct_ov66_02231134.h b/include/overlay066/struct_ov66_02231134.h index 01e8d03699..46e08f0ec1 100644 --- a/include/overlay066/struct_ov66_02231134.h +++ b/include/overlay066/struct_ov66_02231134.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV66_02231134_H #define POKEPLATINUM_STRUCT_OV66_02231134_H -#include "savedata.h" #include "overlay066/struct_ov66_02230DBC.h" +#include "savedata.h" + typedef struct { UnkStruct_ov66_02230DBC unk_00; - SaveData * unk_34; + SaveData *unk_34; BOOL unk_38; u32 unk_3C; } UnkStruct_ov66_02231134; diff --git a/include/overlay066/struct_ov66_0223127C.h b/include/overlay066/struct_ov66_0223127C.h index bf44e24457..14769c1936 100644 --- a/include/overlay066/struct_ov66_0223127C.h +++ b/include/overlay066/struct_ov66_0223127C.h @@ -4,7 +4,7 @@ #include "overlay066/struct_ov66_0222DFF8_decl.h" typedef struct { - UnkStruct_ov66_0222DFF8 * unk_00; + UnkStruct_ov66_0222DFF8 *unk_00; u8 unk_04; u8 padding_05[3]; } UnkStruct_ov66_0223127C; diff --git a/include/overlay066/struct_ov66_02231300.h b/include/overlay066/struct_ov66_02231300.h index cb7cb3f556..65ad73a7a4 100644 --- a/include/overlay066/struct_ov66_02231300.h +++ b/include/overlay066/struct_ov66_02231300.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV66_02231300_H #define POKEPLATINUM_STRUCT_OV66_02231300_H -#include "savedata.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "savedata.h" + typedef struct { - SaveData * unk_00; - UnkStruct_ov66_0222DFF8 * unk_04; + SaveData *unk_00; + UnkStruct_ov66_0222DFF8 *unk_04; BOOL unk_08; } UnkStruct_ov66_02231300; diff --git a/include/overlay066/struct_ov66_02231374.h b/include/overlay066/struct_ov66_02231374.h index 6958909231..8e76787dbc 100644 --- a/include/overlay066/struct_ov66_02231374.h +++ b/include/overlay066/struct_ov66_02231374.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV66_02231374_H #define POKEPLATINUM_STRUCT_OV66_02231374_H -#include "savedata.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "savedata.h" + typedef struct { - SaveData * unk_00; - UnkStruct_ov66_0222DFF8 * unk_04; + SaveData *unk_00; + UnkStruct_ov66_0222DFF8 *unk_04; int unk_08; } UnkStruct_ov66_02231374; diff --git a/include/overlay066/struct_ov66_0223185C.h b/include/overlay066/struct_ov66_0223185C.h index 79aa16f94e..0406c9cfcf 100644 --- a/include/overlay066/struct_ov66_0223185C.h +++ b/include/overlay066/struct_ov66_0223185C.h @@ -4,8 +4,8 @@ #include "trainer_info.h" typedef struct { - const TrainerInfo * unk_00; - const TrainerInfo * unk_04; + const TrainerInfo *unk_00; + const TrainerInfo *unk_04; u16 unk_08; u16 unk_0A; } UnkStruct_ov66_0223185C; diff --git a/include/overlay066/struct_ov66_022318AC.h b/include/overlay066/struct_ov66_022318AC.h index d49316f8f2..a8f682a14a 100644 --- a/include/overlay066/struct_ov66_022318AC.h +++ b/include/overlay066/struct_ov66_022318AC.h @@ -4,8 +4,8 @@ #include "trainer_info.h" typedef struct { - const TrainerInfo * unk_00; - const TrainerInfo * unk_04; + const TrainerInfo *unk_00; + const TrainerInfo *unk_04; u16 unk_08; u16 unk_0A; u32 unk_0C; diff --git a/include/overlay066/struct_ov66_02231908.h b/include/overlay066/struct_ov66_02231908.h index 875d36c0c4..918ba793e3 100644 --- a/include/overlay066/struct_ov66_02231908.h +++ b/include/overlay066/struct_ov66_02231908.h @@ -1,17 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_OV66_02231908_H #define POKEPLATINUM_STRUCT_OV66_02231908_H -#include "trainer_info.h" - #include "enums.h" +#include "trainer_info.h" typedef struct { enum PlazaMinigame unk_00; u32 unk_04; - const TrainerInfo * unk_08; - const TrainerInfo * unk_0C; - const TrainerInfo * unk_10; - const TrainerInfo * unk_14; + const TrainerInfo *unk_08; + const TrainerInfo *unk_0C; + const TrainerInfo *unk_10; + const TrainerInfo *unk_14; u16 unk_18; u16 unk_1A; u16 unk_1C; diff --git a/include/overlay066/struct_ov66_0223199C.h b/include/overlay066/struct_ov66_0223199C.h index 54c7aae1f5..69bd29963d 100644 --- a/include/overlay066/struct_ov66_0223199C.h +++ b/include/overlay066/struct_ov66_0223199C.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV66_0223199C_H #define POKEPLATINUM_STRUCT_OV66_0223199C_H -#include "trainer_info.h" - #include "enums.h" +#include "trainer_info.h" typedef struct { enum PlazaMinigame unk_00; u32 unk_04; - const TrainerInfo * unk_08; + const TrainerInfo *unk_08; u16 unk_0C; } UnkStruct_ov66_0223199C; diff --git a/include/overlay066/struct_ov66_022319FC.h b/include/overlay066/struct_ov66_022319FC.h index 975cfd9882..67e258d85e 100644 --- a/include/overlay066/struct_ov66_022319FC.h +++ b/include/overlay066/struct_ov66_022319FC.h @@ -5,10 +5,10 @@ typedef struct { u32 unk_00; - const TrainerInfo * unk_04; - const TrainerInfo * unk_08; - const TrainerInfo * unk_0C; - const TrainerInfo * unk_10; + const TrainerInfo *unk_04; + const TrainerInfo *unk_08; + const TrainerInfo *unk_0C; + const TrainerInfo *unk_10; u16 unk_14; u16 unk_16; u16 unk_18; diff --git a/include/overlay066/struct_ov66_02231A58.h b/include/overlay066/struct_ov66_02231A58.h index cf50c03c2d..e6d86992a4 100644 --- a/include/overlay066/struct_ov66_02231A58.h +++ b/include/overlay066/struct_ov66_02231A58.h @@ -5,10 +5,10 @@ typedef struct { u32 unk_00; - const TrainerInfo * unk_04; - const TrainerInfo * unk_08; - const TrainerInfo * unk_0C; - const TrainerInfo * unk_10; + const TrainerInfo *unk_04; + const TrainerInfo *unk_08; + const TrainerInfo *unk_0C; + const TrainerInfo *unk_10; u16 unk_14; u16 unk_16; u16 unk_18; diff --git a/include/overlay066/struct_ov66_02231AB4.h b/include/overlay066/struct_ov66_02231AB4.h index d2ea2da892..96e697ee5d 100644 --- a/include/overlay066/struct_ov66_02231AB4.h +++ b/include/overlay066/struct_ov66_02231AB4.h @@ -4,7 +4,7 @@ #include "overlay066/struct_ov66_02231428.h" typedef struct { - const UnkStruct_ov66_02231428 * unk_00; + const UnkStruct_ov66_02231428 *unk_00; int unk_04; } UnkStruct_ov66_02231AB4; diff --git a/include/overlay066/struct_ov66_02231B80.h b/include/overlay066/struct_ov66_02231B80.h index d37c0249b1..45deb5d2e6 100644 --- a/include/overlay066/struct_ov66_02231B80.h +++ b/include/overlay066/struct_ov66_02231B80.h @@ -1,17 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_OV66_02231B80_H #define POKEPLATINUM_STRUCT_OV66_02231B80_H -#include "trainer_info.h" - #include "enums.h" +#include "trainer_info.h" typedef struct { enum PlazaMinigame unk_00; u32 unk_04; - const TrainerInfo * unk_08; - const TrainerInfo * unk_0C; - const TrainerInfo * unk_10; - const TrainerInfo * unk_14; + const TrainerInfo *unk_08; + const TrainerInfo *unk_0C; + const TrainerInfo *unk_10; + const TrainerInfo *unk_14; u16 unk_18; u16 unk_1A; u16 unk_1C; diff --git a/include/overlay066/struct_ov66_022324F0.h b/include/overlay066/struct_ov66_022324F0.h index 67a225be0d..9a5b99cf60 100644 --- a/include/overlay066/struct_ov66_022324F0.h +++ b/include/overlay066/struct_ov66_022324F0.h @@ -3,11 +3,11 @@ #include -typedef void (* UnkFuncPtr_ov66_0222DDF0_1)(s32, const void *, void *, BOOL); -typedef void (* UnkFuncPtr_ov66_0222DDF0_2)(s32, void *); -typedef void (* UnkFuncPtr_ov66_0222DDF0_3)(s32, const void *, void *); -typedef void (* UnkFuncPtr_ov66_0222DDF0_4)(PPW_LOBBY_TIME_EVENT, void *); -typedef void (* UnkFuncPtr_ov66_0222DDF0_5)(const void *, u32, void *); +typedef void (*UnkFuncPtr_ov66_0222DDF0_1)(s32, const void *, void *, BOOL); +typedef void (*UnkFuncPtr_ov66_0222DDF0_2)(s32, void *); +typedef void (*UnkFuncPtr_ov66_0222DDF0_3)(s32, const void *, void *); +typedef void (*UnkFuncPtr_ov66_0222DDF0_4)(PPW_LOBBY_TIME_EVENT, void *); +typedef void (*UnkFuncPtr_ov66_0222DDF0_5)(const void *, u32, void *); typedef struct { UnkFuncPtr_ov66_0222DDF0_1 unk_00; diff --git a/include/overlay066/struct_ov66_02232B20.h b/include/overlay066/struct_ov66_02232B20.h index f043f954bb..44b8b9386f 100644 --- a/include/overlay066/struct_ov66_02232B20.h +++ b/include/overlay066/struct_ov66_02232B20.h @@ -3,7 +3,7 @@ typedef struct { u32 unk_00; - const s32 * unk_04; + const s32 *unk_04; } UnkStruct_ov66_02232B20; #endif // POKEPLATINUM_STRUCT_OV66_02232B20_H diff --git a/include/overlay066/struct_ov66_022589B4.h b/include/overlay066/struct_ov66_022589B4.h index c03fc6c077..c0b9b0a6cc 100644 --- a/include/overlay066/struct_ov66_022589B4.h +++ b/include/overlay066/struct_ov66_022589B4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV66_022589B4_H #define POKEPLATINUM_STRUCT_OV66_022589B4_H -typedef void (* UnkFuncPtr_ov66_022589B4)(s32, const void *, u32, void *); +typedef void (*UnkFuncPtr_ov66_022589B4)(s32, const void *, u32, void *); typedef struct { UnkFuncPtr_ov66_022589B4 unk_00; diff --git a/include/overlay067/ov67_0225C700.h b/include/overlay067/ov67_0225C700.h index d37ccc5aa3..ff0d05aacc 100644 --- a/include/overlay067/ov67_0225C700.h +++ b/include/overlay067/ov67_0225C700.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_OV67_0225C700_H #define POKEPLATINUM_OV67_0225C700_H +#include "overlay_manager.h" -int ov67_0225C700(OverlayManager * param0, int * param1); -int ov67_0225C820(OverlayManager * param0, int * param1); -int ov67_0225CB1C(OverlayManager * param0, int * param1); -int ov67_0225CB8C(OverlayManager * param0, int * param1); -int ov67_0225CC6C(OverlayManager * param0, int * param1); -int ov67_0225CDC0(OverlayManager * param0, int * param1); +int ov67_0225C700(OverlayManager *param0, int *param1); +int ov67_0225C820(OverlayManager *param0, int *param1); +int ov67_0225CB1C(OverlayManager *param0, int *param1); +int ov67_0225CB8C(OverlayManager *param0, int *param1); +int ov67_0225CC6C(OverlayManager *param0, int *param1); +int ov67_0225CDC0(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV67_0225C700_H diff --git a/include/overlay068/ov68_0225C700.h b/include/overlay068/ov68_0225C700.h index e9832360b0..d85aef74b4 100644 --- a/include/overlay068/ov68_0225C700.h +++ b/include/overlay068/ov68_0225C700.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV68_0225C700_H #define POKEPLATINUM_OV68_0225C700_H +#include "overlay_manager.h" -int ov68_0225C700(OverlayManager * param0, int * param1); -int ov68_0225C798(OverlayManager * param0, int * param1); -int ov68_0225C8A8(OverlayManager * param0, int * param1); +int ov68_0225C700(OverlayManager *param0, int *param1); +int ov68_0225C798(OverlayManager *param0, int *param1); +int ov68_0225C8A8(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV68_0225C700_H diff --git a/include/overlay069/ov69_0225C700.h b/include/overlay069/ov69_0225C700.h index a2efc6320d..9910925d73 100644 --- a/include/overlay069/ov69_0225C700.h +++ b/include/overlay069/ov69_0225C700.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV69_0225C700_H #define POKEPLATINUM_OV69_0225C700_H +#include "overlay_manager.h" -int ov69_0225C700(OverlayManager * param0, int * param1); -int ov69_0225C820(OverlayManager * param0, int * param1); -int ov69_0225C8FC(OverlayManager * param0, int * param1); +int ov69_0225C700(OverlayManager *param0, int *param1); +int ov69_0225C820(OverlayManager *param0, int *param1); +int ov69_0225C8FC(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV69_0225C700_H diff --git a/include/overlay070/funcptr_ov70_02261C60.h b/include/overlay070/funcptr_ov70_02261C60.h index 5230a3ba0f..7bfcba1aac 100644 --- a/include/overlay070/funcptr_ov70_02261C60.h +++ b/include/overlay070/funcptr_ov70_02261C60.h @@ -4,6 +4,6 @@ #include "overlay070/struct_ov70_02260BB8_decl.h" #include "overlay070/struct_ov70_022610B8_decl.h" -typedef void (* UnkFuncPtr_ov70_02261C60)(UnkStruct_ov70_02260BB8 *, UnkStruct_ov70_022610B8 *); +typedef void (*UnkFuncPtr_ov70_02261C60)(UnkStruct_ov70_02260BB8 *, UnkStruct_ov70_022610B8 *); #endif // POKEPLATINUM_FUNCPTR_OV70_02261C60_H diff --git a/include/overlay070/funcptr_ov70_0226DA18.h b/include/overlay070/funcptr_ov70_0226DA18.h index c67cca50d8..1600c128e3 100644 --- a/include/overlay070/funcptr_ov70_0226DA18.h +++ b/include/overlay070/funcptr_ov70_0226DA18.h @@ -4,6 +4,6 @@ #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_02263344_decl.h" -typedef BOOL (* UnkFuncPtr_ov70_0226DA18)(UnkStruct_ov70_02263344 *, UnkStruct_ov70_0225DEE8 *, u32); +typedef BOOL (*UnkFuncPtr_ov70_0226DA18)(UnkStruct_ov70_02263344 *, UnkStruct_ov70_0225DEE8 *, u32); #endif // POKEPLATINUM_FUNCPTR_OV70_0226DA18_H diff --git a/include/overlay070/ov70_0225C700.h b/include/overlay070/ov70_0225C700.h index 869b5ed953..b6dc4327ca 100644 --- a/include/overlay070/ov70_0225C700.h +++ b/include/overlay070/ov70_0225C700.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_OV70_0225C700_H #define POKEPLATINUM_OV70_0225C700_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017294.h" -#include "overlay063/struct_ov63_0222CC3C.h" -#include +#include "overlay063/struct_ov63_0222CC3C.h" -void ov70_0225C700(const UnkStruct_ov63_0222CC3C * param0, VecFx32 * param1); -void ov70_0225C714(const VecFx32 * param0, UnkStruct_ov63_0222CC3C * param1); -void ov70_0225C730(void ** param0, NARC * param1, u32 param2, u32 param3); -BOOL ov70_0225C7A0(const UnkStruct_020170F4 * param0, const UnkStruct_02017294 * param1); +void ov70_0225C700(const UnkStruct_ov63_0222CC3C *param0, VecFx32 *param1); +void ov70_0225C714(const VecFx32 *param0, UnkStruct_ov63_0222CC3C *param1); +void ov70_0225C730(void **param0, NARC *param1, u32 param2, u32 param3); +BOOL ov70_0225C7A0(const UnkStruct_020170F4 *param0, const UnkStruct_02017294 *param1); #endif // POKEPLATINUM_OV70_0225C700_H diff --git a/include/overlay070/ov70_0225C858.h b/include/overlay070/ov70_0225C858.h index 5f02d419d5..c3c00885d3 100644 --- a/include/overlay070/ov70_0225C858.h +++ b/include/overlay070/ov70_0225C858.h @@ -4,17 +4,17 @@ #include "overlay063/struct_ov63_0222BCE8_decl.h" #include "overlay070/struct_ov70_0225C894_decl.h" -UnkStruct_ov70_0225C894 * ov70_0225C858(u32 param0); -void ov70_0225C894(UnkStruct_ov70_0225C894 * param0); -u16 ov70_0225C8A8(const UnkStruct_ov70_0225C894 * param0); -BOOL ov70_0225C8AC(const UnkStruct_ov70_0225C894 * param0, u16 param1, u16 param2); -u32 ov70_0225C8B8(const UnkStruct_ov70_0225C894 * param0, u16 param1, u16 param2); -u32 ov70_0225C8C4(const UnkStruct_ov70_0225C894 * param0, u16 param1, u16 param2); -BOOL ov70_0225C8D8(const UnkStruct_ov70_0225C894 * param0, u32 param1, u16 * param2, u16 * param3, u32 param4); +UnkStruct_ov70_0225C894 *ov70_0225C858(u32 param0); +void ov70_0225C894(UnkStruct_ov70_0225C894 *param0); +u16 ov70_0225C8A8(const UnkStruct_ov70_0225C894 *param0); +BOOL ov70_0225C8AC(const UnkStruct_ov70_0225C894 *param0, u16 param1, u16 param2); +u32 ov70_0225C8B8(const UnkStruct_ov70_0225C894 *param0, u16 param1, u16 param2); +u32 ov70_0225C8C4(const UnkStruct_ov70_0225C894 *param0, u16 param1, u16 param2); +BOOL ov70_0225C8D8(const UnkStruct_ov70_0225C894 *param0, u32 param1, u16 *param2, u16 *param3, u32 param4); BOOL ov70_0225C930(u32 param0); BOOL ov70_0225C950(u32 param0); BOOL ov70_0225C970(u32 param0); BOOL ov70_0225C990(u32 param0); -const UnkStruct_ov63_0222BCE8 * ov70_0225C9B0(const UnkStruct_ov70_0225C894 * param0); +const UnkStruct_ov63_0222BCE8 *ov70_0225C9B0(const UnkStruct_ov70_0225C894 *param0); #endif // POKEPLATINUM_OV70_0225C858_H diff --git a/include/overlay070/ov70_0225C9B4.h b/include/overlay070/ov70_0225C9B4.h index 75aa54e59e..7938726770 100644 --- a/include/overlay070/ov70_0225C9B4.h +++ b/include/overlay070/ov70_0225C9B4.h @@ -1,54 +1,54 @@ #ifndef POKEPLATINUM_OV70_0225C9B4_H #define POKEPLATINUM_OV70_0225C9B4_H +#include + #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222D894.h" #include "overlay070/struct_ov70_0225C894_decl.h" #include "overlay070/struct_ov70_0225CA20_decl.h" #include "overlay070/struct_ov70_0225CC54_decl.h" -#include - -UnkStruct_ov70_0225CA20 * ov70_0225C9B4(u32 param0, u32 param1, const UnkStruct_ov70_0225C894 * param2, u32 param3, u32 param4); -void ov70_0225CA20(UnkStruct_ov70_0225CA20 * param0); -void ov70_0225CA44(UnkStruct_ov70_0225CA20 * param0); -void ov70_0225CA5C(UnkStruct_ov70_0225CA20 * param0); -void ov70_0225CAD4(UnkStruct_ov70_0225CA20 * param0); -void ov70_0225CAE0(UnkStruct_ov70_0225CA20 * param0); -void ov70_0225CAEC(UnkStruct_ov70_0225CA20 * param0, int param1); -void ov70_0225CB08(UnkStruct_ov70_0225CA20 * param0, int param1); -void ov70_0225CB1C(UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov63_0222D894 * param1); -UnkStruct_ov70_0225CC54 * ov70_0225CB28(UnkStruct_ov70_0225CA20 * param0, u32 param1); -UnkStruct_ov70_0225CC54 * ov70_0225CB5C(UnkStruct_ov70_0225CA20 * param0, u32 param1, u32 param2, u32 param3); -UnkStruct_ov70_0225CC54 * ov70_0225CBB8(UnkStruct_ov70_0225CA20 * param0, u32 param1, u32 param2); -void ov70_0225CC54(UnkStruct_ov70_0225CC54 * param0); -UnkStruct_ov70_0225CC54 * ov70_0225CC70(UnkStruct_ov70_0225CA20 * param0, u32 param1); -UnkStruct_ov70_0225CC54 * ov70_0225CCAC(UnkStruct_ov70_0225CA20 * param0); -UnkStruct_ov70_0225CC54 * ov70_0225CCB0(UnkStruct_ov70_0225CA20 * param0); -void ov70_0225CCB4(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov63_0222CC3C param1); -void ov70_0225CD04(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -UnkStruct_ov63_0222CC3C ov70_0225CD34(const UnkStruct_ov70_0225CC54 * param0); -u32 ov70_0225CD60(const UnkStruct_ov70_0225CC54 * param0, int param1); -void ov70_0225CD7C(UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225CC54 * param1, int param2, int param3); -void ov70_0225CDAC(UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225CC54 * param1, int param2, int param3); -void ov70_0225CDEC(UnkStruct_ov70_0225CA20 * param0, UnkStruct_ov70_0225CC54 * param1, int param2); -BOOL ov70_0225CE38(const UnkStruct_ov70_0225CC54 * param0); -int ov70_0225CE3C(const UnkStruct_ov70_0225CC54 * param0); -UnkStruct_ov70_0225CC54 * ov70_0225CE40(UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225CC54 * param1); -BOOL ov70_0225CE70(const UnkStruct_ov70_0225CC54 * param0); -const UnkStruct_ov70_0225CC54 * ov70_0225CE7C(const UnkStruct_ov70_0225CA20 * param0, u16 param1, u16 param2); -BOOL ov70_0225CEDC(const UnkStruct_ov70_0225CC54 * param0, u16 param1, u16 param2); -BOOL ov70_0225CF4C(UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225CC54 * param1, u32 * param2, UnkStruct_ov63_0222CC3C * param3); -void ov70_0225D030(UnkStruct_ov70_0225CC54 * param0, BOOL param1); -void ov70_0225D03C(UnkStruct_ov70_0225CC54 * param0, const UnkStruct_ov63_0222CC3C * param1); -void ov70_0225D048(UnkStruct_ov70_0225CC54 * param0, const VecFx32 * param1); -void ov70_0225D054(const UnkStruct_ov70_0225CC54 * param0, VecFx32 * param1); -void ov70_0225D060(UnkStruct_ov70_0225CC54 * param0, int param1); -void ov70_0225D06C(UnkStruct_ov70_0225CC54 * param0, BOOL param1); -void ov70_0225D084(UnkStruct_ov70_0225CC54 * param0, BOOL param1); -void ov70_0225D09C(UnkStruct_ov70_0225CC54 * param0, BOOL param1); -void ov70_0225D0B4(UnkStruct_ov70_0225CC54 * param0, u32 param1); -void ov70_0225D0C0(UnkStruct_ov70_0225CC54 * param0, BOOL param1); -BOOL ov70_0225D0CC(const UnkStruct_ov70_0225CC54 * param0); +UnkStruct_ov70_0225CA20 *ov70_0225C9B4(u32 param0, u32 param1, const UnkStruct_ov70_0225C894 *param2, u32 param3, u32 param4); +void ov70_0225CA20(UnkStruct_ov70_0225CA20 *param0); +void ov70_0225CA44(UnkStruct_ov70_0225CA20 *param0); +void ov70_0225CA5C(UnkStruct_ov70_0225CA20 *param0); +void ov70_0225CAD4(UnkStruct_ov70_0225CA20 *param0); +void ov70_0225CAE0(UnkStruct_ov70_0225CA20 *param0); +void ov70_0225CAEC(UnkStruct_ov70_0225CA20 *param0, int param1); +void ov70_0225CB08(UnkStruct_ov70_0225CA20 *param0, int param1); +void ov70_0225CB1C(UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov63_0222D894 *param1); +UnkStruct_ov70_0225CC54 *ov70_0225CB28(UnkStruct_ov70_0225CA20 *param0, u32 param1); +UnkStruct_ov70_0225CC54 *ov70_0225CB5C(UnkStruct_ov70_0225CA20 *param0, u32 param1, u32 param2, u32 param3); +UnkStruct_ov70_0225CC54 *ov70_0225CBB8(UnkStruct_ov70_0225CA20 *param0, u32 param1, u32 param2); +void ov70_0225CC54(UnkStruct_ov70_0225CC54 *param0); +UnkStruct_ov70_0225CC54 *ov70_0225CC70(UnkStruct_ov70_0225CA20 *param0, u32 param1); +UnkStruct_ov70_0225CC54 *ov70_0225CCAC(UnkStruct_ov70_0225CA20 *param0); +UnkStruct_ov70_0225CC54 *ov70_0225CCB0(UnkStruct_ov70_0225CA20 *param0); +void ov70_0225CCB4(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov63_0222CC3C param1); +void ov70_0225CD04(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +UnkStruct_ov63_0222CC3C ov70_0225CD34(const UnkStruct_ov70_0225CC54 *param0); +u32 ov70_0225CD60(const UnkStruct_ov70_0225CC54 *param0, int param1); +void ov70_0225CD7C(UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov70_0225CC54 *param1, int param2, int param3); +void ov70_0225CDAC(UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov70_0225CC54 *param1, int param2, int param3); +void ov70_0225CDEC(UnkStruct_ov70_0225CA20 *param0, UnkStruct_ov70_0225CC54 *param1, int param2); +BOOL ov70_0225CE38(const UnkStruct_ov70_0225CC54 *param0); +int ov70_0225CE3C(const UnkStruct_ov70_0225CC54 *param0); +UnkStruct_ov70_0225CC54 *ov70_0225CE40(UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov70_0225CC54 *param1); +BOOL ov70_0225CE70(const UnkStruct_ov70_0225CC54 *param0); +const UnkStruct_ov70_0225CC54 *ov70_0225CE7C(const UnkStruct_ov70_0225CA20 *param0, u16 param1, u16 param2); +BOOL ov70_0225CEDC(const UnkStruct_ov70_0225CC54 *param0, u16 param1, u16 param2); +BOOL ov70_0225CF4C(UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov70_0225CC54 *param1, u32 *param2, UnkStruct_ov63_0222CC3C *param3); +void ov70_0225D030(UnkStruct_ov70_0225CC54 *param0, BOOL param1); +void ov70_0225D03C(UnkStruct_ov70_0225CC54 *param0, const UnkStruct_ov63_0222CC3C *param1); +void ov70_0225D048(UnkStruct_ov70_0225CC54 *param0, const VecFx32 *param1); +void ov70_0225D054(const UnkStruct_ov70_0225CC54 *param0, VecFx32 *param1); +void ov70_0225D060(UnkStruct_ov70_0225CC54 *param0, int param1); +void ov70_0225D06C(UnkStruct_ov70_0225CC54 *param0, BOOL param1); +void ov70_0225D084(UnkStruct_ov70_0225CC54 *param0, BOOL param1); +void ov70_0225D09C(UnkStruct_ov70_0225CC54 *param0, BOOL param1); +void ov70_0225D0B4(UnkStruct_ov70_0225CC54 *param0, u32 param1); +void ov70_0225D0C0(UnkStruct_ov70_0225CC54 *param0, BOOL param1); +BOOL ov70_0225D0CC(const UnkStruct_ov70_0225CC54 *param0); #endif // POKEPLATINUM_OV70_0225C9B4_H diff --git a/include/overlay070/ov70_0225D9A4.h b/include/overlay070/ov70_0225D9A4.h index 783ea44060..7eb56fc060 100644 --- a/include/overlay070/ov70_0225D9A4.h +++ b/include/overlay070/ov70_0225D9A4.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_OV70_0225D9A4_H #define POKEPLATINUM_OV70_0225D9A4_H -#include "overlay_manager.h" #include "struct_decls/struct_02013A04_decl.h" -#include "strbuf.h" + #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay070/struct_ov70_0225C894_decl.h" #include "overlay070/struct_ov70_0225CA20_decl.h" @@ -15,83 +14,85 @@ #include "overlay084/struct_ov84_02240FA8.h" #include "enums.h" +#include "overlay_manager.h" +#include "strbuf.h" -int ov70_0225D9A4(OverlayManager * param0, int * param1); -int ov70_0225DB90(OverlayManager * param0, int * param1); -int ov70_0225DDF8(OverlayManager * param0, int * param1); -UnkStruct_ov66_0222DFF8 * ov70_0225DEE8(UnkStruct_ov70_0225DEE8 * param0); -UnkStruct_ov70_02263910 * ov70_0225DEEC(UnkStruct_ov70_0225DEE8 * param0); -UnkStruct_ov70_0225CA20 * ov70_0225DEF0(UnkStruct_ov70_0225DEE8 * param0); -UnkStruct_ov70_02261E10 * ov70_0225DEF8(UnkStruct_ov70_0225DEE8 * param0); -UnkStruct_ov70_0225C894 * ov70_0225DF00(UnkStruct_ov70_0225DEE8 * param0); -UnkStruct_ov70_02260AD4 * ov70_0225DF08(UnkStruct_ov70_0225DEE8 * param0); -UnkStruct_ov70_022630A4 * ov70_0225DF10(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225DF18(UnkStruct_ov70_0225DEE8 * param0, BOOL param1); -u32 ov70_0225DF2C(const UnkStruct_ov70_0225DEE8 * param0); -BOOL ov70_0225DF30(const UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225DF34(UnkStruct_ov70_0225DEE8 * param0, BOOL param1); -void ov70_0225DF38(UnkStruct_ov70_0225DEE8 * param0, u8 param1); -void ov70_0225DF3C(UnkStruct_ov70_0225DEE8 * param0, u8 param1); -u8 ov70_0225DF40(const UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225DF44(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225DF4C(UnkStruct_ov70_0225DEE8 * param0, u8 param1, BOOL param2); -BOOL ov70_0225DF64(const UnkStruct_ov70_0225DEE8 * param0, u8 param1); -void ov70_0225DF6C(UnkStruct_ov70_0225DEE8 * param0, u8 param1, BOOL param2); -BOOL ov70_0225DF84(const UnkStruct_ov70_0225DEE8 * param0, u8 param1); -void ov70_0225DF8C(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1); -void ov70_0225DF9C(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1); -BOOL ov70_0225DFAC(const UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225DFBC(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225DFCC(UnkStruct_ov70_0225DEE8 * param0); -BOOL ov70_0225DFDC(const UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225DFEC(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225DFFC(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1); -void ov70_0225E00C(UnkStruct_ov70_0225DEE8 * param0, u32 param1); -void ov70_0225E020(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -void ov70_0225E034(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E044(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1, u32 param2); -const ResourceMetadata * ov70_0225E054(const UnkStruct_ov70_0225DEE8 * param0); -BOOL ov70_0225E064(const UnkStruct_ov70_0225DEE8 * param0, u32 param1); -void ov70_0225E074(UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_ov84_02240FA8 * param1, u16 param2, u16 param3); -void ov70_0225E0A4(UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_ov84_02240FA8 * param1, u16 param2, u16 param3, u8 param4, u8 param5, u8 param6); -u32 ov70_0225E0D4(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E0E4(UnkStruct_ov70_0225DEE8 * param0, u16 * param1, u16 * param2); -void ov70_0225E0F4(UnkStruct_ov70_0225DEE8 * param0, BOOL param1); -void ov70_0225E104(UnkStruct_ov70_0225DEE8 * param0, u8 param1, u8 param2, u8 param3, u8 param4); -void ov70_0225E12C(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E13C(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1, u8 param2, u8 param3); -void ov70_0225E14C(UnkStruct_ov70_0225DEE8 * param0, u16 param1, u16 param2, u16 param3, u16 param4); -void ov70_0225E164(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E194(UnkStruct_ov70_0225DEE8 * param0); -int ov70_0225E1C4(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E1F8(UnkStruct_ov70_0225DEE8 * param0); -Strbuf* ov70_0225E20C(UnkStruct_ov70_0225DEE8 * param0, int param1, u32 param2); -void ov70_0225E21C(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2, u32 param3, int param4); -void ov70_0225E234(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -void ov70_0225E27C(UnkStruct_ov70_0225DEE8 * param0, enum PlazaMinigame param1, u32 param2); -void ov70_0225E28C(UnkStruct_ov70_0225DEE8 * param0, int param1, u32 param2); -void ov70_0225E29C(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -void ov70_0225E2AC(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -void ov70_0225E2BC(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -void ov70_0225E2CC(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -void ov70_0225E2DC(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -void ov70_0225E2EC(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -void ov70_0225E2FC(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -void ov70_0225E30C(UnkStruct_ov70_0225DEE8 * param0, u32 param1, int param2); -void ov70_0225E328(UnkStruct_ov70_0225DEE8 * param0, u32 param1, BOOL param2); -void ov70_0225E378(UnkStruct_ov70_0225DEE8 * param0, u32 param1); -void ov70_0225E390(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E3D0(UnkStruct_ov70_0225DEE8 * param0); -u32 ov70_0225E3E0(const UnkStruct_ov70_0225DEE8 * param0); -BOOL ov70_0225E3F0(const UnkStruct_ov70_0225DEE8 * param0); -BOOL ov70_0225E400(const UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E410(UnkStruct_ov70_0225DEE8 * param0); -BOOL ov70_0225E420(const UnkStruct_ov70_0225DEE8 * param0, u32 param1); -void ov70_0225E430(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E43C(UnkStruct_ov70_0225DEE8 * param0, BOOL param1); -void ov70_0225E44C(UnkStruct_ov70_0225DEE8 * param0); -BOOL ov70_0225E45C(UnkStruct_ov70_0225DEE8 * param0); -void ov70_0225E46C(UnkStruct_ov70_0225DEE8 * param0, u32 param1); -BOOL ov70_0225E4AC(const UnkStruct_ov70_0225DEE8 * param0, u32 param1); +int ov70_0225D9A4(OverlayManager *param0, int *param1); +int ov70_0225DB90(OverlayManager *param0, int *param1); +int ov70_0225DDF8(OverlayManager *param0, int *param1); +UnkStruct_ov66_0222DFF8 *ov70_0225DEE8(UnkStruct_ov70_0225DEE8 *param0); +UnkStruct_ov70_02263910 *ov70_0225DEEC(UnkStruct_ov70_0225DEE8 *param0); +UnkStruct_ov70_0225CA20 *ov70_0225DEF0(UnkStruct_ov70_0225DEE8 *param0); +UnkStruct_ov70_02261E10 *ov70_0225DEF8(UnkStruct_ov70_0225DEE8 *param0); +UnkStruct_ov70_0225C894 *ov70_0225DF00(UnkStruct_ov70_0225DEE8 *param0); +UnkStruct_ov70_02260AD4 *ov70_0225DF08(UnkStruct_ov70_0225DEE8 *param0); +UnkStruct_ov70_022630A4 *ov70_0225DF10(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225DF18(UnkStruct_ov70_0225DEE8 *param0, BOOL param1); +u32 ov70_0225DF2C(const UnkStruct_ov70_0225DEE8 *param0); +BOOL ov70_0225DF30(const UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225DF34(UnkStruct_ov70_0225DEE8 *param0, BOOL param1); +void ov70_0225DF38(UnkStruct_ov70_0225DEE8 *param0, u8 param1); +void ov70_0225DF3C(UnkStruct_ov70_0225DEE8 *param0, u8 param1); +u8 ov70_0225DF40(const UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225DF44(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225DF4C(UnkStruct_ov70_0225DEE8 *param0, u8 param1, BOOL param2); +BOOL ov70_0225DF64(const UnkStruct_ov70_0225DEE8 *param0, u8 param1); +void ov70_0225DF6C(UnkStruct_ov70_0225DEE8 *param0, u8 param1, BOOL param2); +BOOL ov70_0225DF84(const UnkStruct_ov70_0225DEE8 *param0, u8 param1); +void ov70_0225DF8C(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1); +void ov70_0225DF9C(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1); +BOOL ov70_0225DFAC(const UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225DFBC(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225DFCC(UnkStruct_ov70_0225DEE8 *param0); +BOOL ov70_0225DFDC(const UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225DFEC(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225DFFC(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1); +void ov70_0225E00C(UnkStruct_ov70_0225DEE8 *param0, u32 param1); +void ov70_0225E020(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +void ov70_0225E034(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225E044(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1, u32 param2); +const ResourceMetadata *ov70_0225E054(const UnkStruct_ov70_0225DEE8 *param0); +BOOL ov70_0225E064(const UnkStruct_ov70_0225DEE8 *param0, u32 param1); +void ov70_0225E074(UnkStruct_ov70_0225DEE8 *param0, const UnkStruct_ov84_02240FA8 *param1, u16 param2, u16 param3); +void ov70_0225E0A4(UnkStruct_ov70_0225DEE8 *param0, const UnkStruct_ov84_02240FA8 *param1, u16 param2, u16 param3, u8 param4, u8 param5, u8 param6); +u32 ov70_0225E0D4(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225E0E4(UnkStruct_ov70_0225DEE8 *param0, u16 *param1, u16 *param2); +void ov70_0225E0F4(UnkStruct_ov70_0225DEE8 *param0, BOOL param1); +void ov70_0225E104(UnkStruct_ov70_0225DEE8 *param0, u8 param1, u8 param2, u8 param3, u8 param4); +void ov70_0225E12C(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225E13C(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1, u8 param2, u8 param3); +void ov70_0225E14C(UnkStruct_ov70_0225DEE8 *param0, u16 param1, u16 param2, u16 param3, u16 param4); +void ov70_0225E164(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225E194(UnkStruct_ov70_0225DEE8 *param0); +int ov70_0225E1C4(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225E1F8(UnkStruct_ov70_0225DEE8 *param0); +Strbuf *ov70_0225E20C(UnkStruct_ov70_0225DEE8 *param0, int param1, u32 param2); +void ov70_0225E21C(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2, u32 param3, int param4); +void ov70_0225E234(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +void ov70_0225E27C(UnkStruct_ov70_0225DEE8 *param0, enum PlazaMinigame param1, u32 param2); +void ov70_0225E28C(UnkStruct_ov70_0225DEE8 *param0, int param1, u32 param2); +void ov70_0225E29C(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +void ov70_0225E2AC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +void ov70_0225E2BC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +void ov70_0225E2CC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +void ov70_0225E2DC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +void ov70_0225E2EC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +void ov70_0225E2FC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +void ov70_0225E30C(UnkStruct_ov70_0225DEE8 *param0, u32 param1, int param2); +void ov70_0225E328(UnkStruct_ov70_0225DEE8 *param0, u32 param1, BOOL param2); +void ov70_0225E378(UnkStruct_ov70_0225DEE8 *param0, u32 param1); +void ov70_0225E390(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225E3D0(UnkStruct_ov70_0225DEE8 *param0); +u32 ov70_0225E3E0(const UnkStruct_ov70_0225DEE8 *param0); +BOOL ov70_0225E3F0(const UnkStruct_ov70_0225DEE8 *param0); +BOOL ov70_0225E400(const UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225E410(UnkStruct_ov70_0225DEE8 *param0); +BOOL ov70_0225E420(const UnkStruct_ov70_0225DEE8 *param0, u32 param1); +void ov70_0225E430(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225E43C(UnkStruct_ov70_0225DEE8 *param0, BOOL param1); +void ov70_0225E44C(UnkStruct_ov70_0225DEE8 *param0); +BOOL ov70_0225E45C(UnkStruct_ov70_0225DEE8 *param0); +void ov70_0225E46C(UnkStruct_ov70_0225DEE8 *param0, u32 param1); +BOOL ov70_0225E4AC(const UnkStruct_ov70_0225DEE8 *param0, u32 param1); #endif // POKEPLATINUM_OV70_0225D9A4_H diff --git a/include/overlay070/ov70_02260A70.h b/include/overlay070/ov70_02260A70.h index 690b542ee1..676c659a57 100644 --- a/include/overlay070/ov70_02260A70.h +++ b/include/overlay070/ov70_02260A70.h @@ -4,12 +4,12 @@ #include "overlay070/struct_ov70_0225CC54_decl.h" #include "overlay070/struct_ov70_02260AD4_decl.h" -UnkStruct_ov70_02260AD4 * ov70_02260A70(u32 param0); -void ov70_02260AD4(UnkStruct_ov70_02260AD4 * param0); -void ov70_02260AEC(UnkStruct_ov70_02260AD4 * param0); -void ov70_02260B18(UnkStruct_ov70_02260AD4 * param0, fx32 param1, fx32 param2, fx32 param3); -void ov70_02260B20(UnkStruct_ov70_02260AD4 * param0, fx32 param1, fx32 param2, fx32 param3); -void ov70_02260B38(UnkStruct_ov70_02260AD4 * param0, const UnkStruct_ov70_0225CC54 * param1); -void ov70_02260B3C(UnkStruct_ov70_02260AD4 * param0); +UnkStruct_ov70_02260AD4 *ov70_02260A70(u32 param0); +void ov70_02260AD4(UnkStruct_ov70_02260AD4 *param0); +void ov70_02260AEC(UnkStruct_ov70_02260AD4 *param0); +void ov70_02260B18(UnkStruct_ov70_02260AD4 *param0, fx32 param1, fx32 param2, fx32 param3); +void ov70_02260B20(UnkStruct_ov70_02260AD4 *param0, fx32 param1, fx32 param2, fx32 param3); +void ov70_02260B38(UnkStruct_ov70_02260AD4 *param0, const UnkStruct_ov70_0225CC54 *param1); +void ov70_02260B3C(UnkStruct_ov70_02260AD4 *param0); #endif // POKEPLATINUM_OV70_02260A70_H diff --git a/include/overlay070/ov70_02260B44.h b/include/overlay070/ov70_02260B44.h index a9d9fec0f2..0a47c18eef 100644 --- a/include/overlay070/ov70_02260B44.h +++ b/include/overlay070/ov70_02260B44.h @@ -1,52 +1,52 @@ #ifndef POKEPLATINUM_OV70_02260B44_H #define POKEPLATINUM_OV70_02260B44_H +#include + #include "overlay063/struct_ov63_0222CC3C.h" +#include "overlay070/funcptr_ov70_02261C60.h" #include "overlay070/struct_ov70_02260BB8_decl.h" #include "overlay070/struct_ov70_02260E8C_decl.h" #include "overlay070/struct_ov70_022610B8_decl.h" -#include "overlay070/funcptr_ov70_02261C60.h" - -#include -UnkStruct_ov70_02260BB8 * ov70_02260B44(u32 param0, u32 param1, u32 param2, u32 param3); -void ov70_02260BB8(UnkStruct_ov70_02260BB8 * param0); -void ov70_02260BE8(UnkStruct_ov70_02260BB8 * param0); -void ov70_02260C50(UnkStruct_ov70_02260BB8 * param0); -void ov70_02260CE0(UnkStruct_ov70_02260BB8 * param0); -void ov70_02260CE4(UnkStruct_ov70_02260BB8 * param0, int param1, int param2, u32 param3, u32 param4); -void ov70_02260D80(UnkStruct_ov70_02260BB8 * param0); -void ov70_02260DC8(UnkStruct_ov70_02260BB8 * param0); -void ov70_02260DF4(UnkStruct_ov70_02260BB8 * param0); -UnkStruct_ov70_02260E8C * ov70_02260E20(UnkStruct_ov70_02260BB8 * param0, int param1, int param2, const VecFx32 * param3); -void ov70_02260E8C(UnkStruct_ov70_02260E8C * param0); -void ov70_02260EA0(UnkStruct_ov70_02260E8C * param0, const VecFx32 * param1); -void ov70_02260EE4(UnkStruct_ov70_02260E8C * param0, const VecFx32 * param1); -void ov70_02260F28(const UnkStruct_ov70_02260E8C * param0, VecFx32 * param1); -void ov70_02260F38(UnkStruct_ov70_02260E8C * param0, BOOL param1); -BOOL ov70_02260F44(UnkStruct_ov70_02260E8C * param0); -BOOL ov70_02260F5C(UnkStruct_ov70_02260E8C * param0); -void ov70_02260F74(UnkStruct_ov70_02260E8C * param0, u16 param1); -BOOL ov70_02260F80(const UnkStruct_ov70_02260E8C * param0); -BOOL ov70_02260F88(const UnkStruct_ov70_02260E8C * param0); -UnkStruct_ov70_022610B8 * ov70_02260F90(UnkStruct_ov70_02260BB8 * param0, int param1, u32 param2, u32 param3); -void ov70_02261058(UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1); -int ov70_022610B8(const UnkStruct_ov70_022610B8 * param0); -void ov70_022610BC(UnkStruct_ov70_022610B8 * param0, UnkStruct_ov63_0222CC3C param1); -UnkStruct_ov63_0222CC3C ov70_022610E4(const UnkStruct_ov70_022610B8 * param0); -void ov70_0226110C(UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, int param2, int param3); -void ov70_0226111C(UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, int param2, int param3, UnkFuncPtr_ov70_02261C60 param4); -void ov70_02261220(UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, int param2); -void ov70_0226128C(UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1); -BOOL ov70_022612B4(const UnkStruct_ov70_02260BB8 * param0, const UnkStruct_ov70_022610B8 * param1, int param2); -void ov70_022612F0(UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, int param2, fx32 param3); -BOOL ov70_02261348(const UnkStruct_ov70_022610B8 * param0, int param1); -fx32 ov70_02261368(const UnkStruct_ov70_022610B8 * param0, int param1); -void ov70_0226138C(UnkStruct_ov70_022610B8 * param0, BOOL param1); -void ov70_02261398(UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, u32 param2); -void ov70_022613C0(UnkStruct_ov70_022610B8 * param0, fx32 param1); -void ov70_022613C8(UnkStruct_ov70_022610B8 * param0, u8 param1, u8 param2); -void ov70_022613E0(UnkStruct_ov70_022610B8 * param0); -void ov70_022613E8(UnkStruct_ov70_022610B8 * param0, fx32 param1, fx32 param2, fx32 param3); +UnkStruct_ov70_02260BB8 *ov70_02260B44(u32 param0, u32 param1, u32 param2, u32 param3); +void ov70_02260BB8(UnkStruct_ov70_02260BB8 *param0); +void ov70_02260BE8(UnkStruct_ov70_02260BB8 *param0); +void ov70_02260C50(UnkStruct_ov70_02260BB8 *param0); +void ov70_02260CE0(UnkStruct_ov70_02260BB8 *param0); +void ov70_02260CE4(UnkStruct_ov70_02260BB8 *param0, int param1, int param2, u32 param3, u32 param4); +void ov70_02260D80(UnkStruct_ov70_02260BB8 *param0); +void ov70_02260DC8(UnkStruct_ov70_02260BB8 *param0); +void ov70_02260DF4(UnkStruct_ov70_02260BB8 *param0); +UnkStruct_ov70_02260E8C *ov70_02260E20(UnkStruct_ov70_02260BB8 *param0, int param1, int param2, const VecFx32 *param3); +void ov70_02260E8C(UnkStruct_ov70_02260E8C *param0); +void ov70_02260EA0(UnkStruct_ov70_02260E8C *param0, const VecFx32 *param1); +void ov70_02260EE4(UnkStruct_ov70_02260E8C *param0, const VecFx32 *param1); +void ov70_02260F28(const UnkStruct_ov70_02260E8C *param0, VecFx32 *param1); +void ov70_02260F38(UnkStruct_ov70_02260E8C *param0, BOOL param1); +BOOL ov70_02260F44(UnkStruct_ov70_02260E8C *param0); +BOOL ov70_02260F5C(UnkStruct_ov70_02260E8C *param0); +void ov70_02260F74(UnkStruct_ov70_02260E8C *param0, u16 param1); +BOOL ov70_02260F80(const UnkStruct_ov70_02260E8C *param0); +BOOL ov70_02260F88(const UnkStruct_ov70_02260E8C *param0); +UnkStruct_ov70_022610B8 *ov70_02260F90(UnkStruct_ov70_02260BB8 *param0, int param1, u32 param2, u32 param3); +void ov70_02261058(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1); +int ov70_022610B8(const UnkStruct_ov70_022610B8 *param0); +void ov70_022610BC(UnkStruct_ov70_022610B8 *param0, UnkStruct_ov63_0222CC3C param1); +UnkStruct_ov63_0222CC3C ov70_022610E4(const UnkStruct_ov70_022610B8 *param0); +void ov70_0226110C(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1, int param2, int param3); +void ov70_0226111C(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1, int param2, int param3, UnkFuncPtr_ov70_02261C60 param4); +void ov70_02261220(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1, int param2); +void ov70_0226128C(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1); +BOOL ov70_022612B4(const UnkStruct_ov70_02260BB8 *param0, const UnkStruct_ov70_022610B8 *param1, int param2); +void ov70_022612F0(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1, int param2, fx32 param3); +BOOL ov70_02261348(const UnkStruct_ov70_022610B8 *param0, int param1); +fx32 ov70_02261368(const UnkStruct_ov70_022610B8 *param0, int param1); +void ov70_0226138C(UnkStruct_ov70_022610B8 *param0, BOOL param1); +void ov70_02261398(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1, u32 param2); +void ov70_022613C0(UnkStruct_ov70_022610B8 *param0, fx32 param1); +void ov70_022613C8(UnkStruct_ov70_022610B8 *param0, u8 param1, u8 param2); +void ov70_022613E0(UnkStruct_ov70_022610B8 *param0); +void ov70_022613E8(UnkStruct_ov70_022610B8 *param0, fx32 param1, fx32 param2, fx32 param3); #endif // POKEPLATINUM_OV70_02260B44_H diff --git a/include/overlay070/ov70_02261E10.h b/include/overlay070/ov70_02261E10.h index 1e1c6e7e9f..91d52e1522 100644 --- a/include/overlay070/ov70_02261E10.h +++ b/include/overlay070/ov70_02261E10.h @@ -1,37 +1,38 @@ #ifndef POKEPLATINUM_OV70_02261E10_H #define POKEPLATINUM_OV70_02261E10_H +#include + #include "overlay070/struct_ov70_0225C894_decl.h" #include "overlay070/struct_ov70_02261E10_decl.h" -#include #include "enums.h" -UnkStruct_ov70_02261E10 * ov70_02261E10(int param0, int param1, const UnkStruct_ov70_0225C894 * param2, u32 param3, u32 param4); -void ov70_022621AC(UnkStruct_ov70_02261E10 * param0); -void ov70_02262210(UnkStruct_ov70_02261E10 * param0); -void ov70_02262298(UnkStruct_ov70_02261E10 * param0); -void ov70_022622A4(UnkStruct_ov70_02261E10 * param0); -void ov70_022622B0(UnkStruct_ov70_02261E10 * param0, u32 param1, fx32 param2); -void ov70_022622EC(UnkStruct_ov70_02261E10 * param0, u32 param1, const VecFx32 * param2); -void ov70_02262318(const UnkStruct_ov70_02261E10 * param0, u32 param1, u32 param2, VecFx32 * param3); -BOOL ov70_02262374(UnkStruct_ov70_02261E10 * param0, u32 param1); -BOOL ov70_0226239C(UnkStruct_ov70_02261E10 * param0, u32 param1); -void ov70_022623C4(UnkStruct_ov70_02261E10 * param0, u32 param1, BOOL param2); -void ov70_022623F0(UnkStruct_ov70_02261E10 * param0, u32 param1, u16 param2); -BOOL ov70_0226241C(const UnkStruct_ov70_02261E10 * param0, u32 param1); -BOOL ov70_02262444(const UnkStruct_ov70_02261E10 * param0, u32 param1); -void ov70_0226246C(UnkStruct_ov70_02261E10 * param0); -void ov70_02262478(UnkStruct_ov70_02261E10 * param0); -void ov70_02262484(UnkStruct_ov70_02261E10 * param0, u8 param1, u8 param2); -void ov70_0226251C(UnkStruct_ov70_02261E10 * param0, BOOL param1); -void ov70_022625D8(UnkStruct_ov70_02261E10 * param0, fx32 param1); -void ov70_0226260C(UnkStruct_ov70_02261E10 * param0); -void ov70_02262658(UnkStruct_ov70_02261E10 * param0, int param1); -BOOL ov70_0226271C(const UnkStruct_ov70_02261E10 * param0); -void ov70_02262724(UnkStruct_ov70_02261E10 * param0, BOOL param1, fx32 param2); -BOOL ov70_02262754(UnkStruct_ov70_02261E10 * param0, u32 param1, BOOL param2, fx32 param3); -void ov70_0226278C(UnkStruct_ov70_02261E10 * param0, fx32 param1); -void ov70_022627BC(UnkStruct_ov70_02261E10 * param0, enum PlazaMinigame param1, u32 param2, BOOL param3, BOOL param4, BOOL param5); +UnkStruct_ov70_02261E10 *ov70_02261E10(int param0, int param1, const UnkStruct_ov70_0225C894 *param2, u32 param3, u32 param4); +void ov70_022621AC(UnkStruct_ov70_02261E10 *param0); +void ov70_02262210(UnkStruct_ov70_02261E10 *param0); +void ov70_02262298(UnkStruct_ov70_02261E10 *param0); +void ov70_022622A4(UnkStruct_ov70_02261E10 *param0); +void ov70_022622B0(UnkStruct_ov70_02261E10 *param0, u32 param1, fx32 param2); +void ov70_022622EC(UnkStruct_ov70_02261E10 *param0, u32 param1, const VecFx32 *param2); +void ov70_02262318(const UnkStruct_ov70_02261E10 *param0, u32 param1, u32 param2, VecFx32 *param3); +BOOL ov70_02262374(UnkStruct_ov70_02261E10 *param0, u32 param1); +BOOL ov70_0226239C(UnkStruct_ov70_02261E10 *param0, u32 param1); +void ov70_022623C4(UnkStruct_ov70_02261E10 *param0, u32 param1, BOOL param2); +void ov70_022623F0(UnkStruct_ov70_02261E10 *param0, u32 param1, u16 param2); +BOOL ov70_0226241C(const UnkStruct_ov70_02261E10 *param0, u32 param1); +BOOL ov70_02262444(const UnkStruct_ov70_02261E10 *param0, u32 param1); +void ov70_0226246C(UnkStruct_ov70_02261E10 *param0); +void ov70_02262478(UnkStruct_ov70_02261E10 *param0); +void ov70_02262484(UnkStruct_ov70_02261E10 *param0, u8 param1, u8 param2); +void ov70_0226251C(UnkStruct_ov70_02261E10 *param0, BOOL param1); +void ov70_022625D8(UnkStruct_ov70_02261E10 *param0, fx32 param1); +void ov70_0226260C(UnkStruct_ov70_02261E10 *param0); +void ov70_02262658(UnkStruct_ov70_02261E10 *param0, int param1); +BOOL ov70_0226271C(const UnkStruct_ov70_02261E10 *param0); +void ov70_02262724(UnkStruct_ov70_02261E10 *param0, BOOL param1, fx32 param2); +BOOL ov70_02262754(UnkStruct_ov70_02261E10 *param0, u32 param1, BOOL param2, fx32 param3); +void ov70_0226278C(UnkStruct_ov70_02261E10 *param0, fx32 param1); +void ov70_022627BC(UnkStruct_ov70_02261E10 *param0, enum PlazaMinigame param1, u32 param2, BOOL param3, BOOL param4, BOOL param5); #endif // POKEPLATINUM_OV70_02261E10_H diff --git a/include/overlay070/ov70_02262DA8.h b/include/overlay070/ov70_02262DA8.h index e1622a559f..52d7b0d621 100644 --- a/include/overlay070/ov70_02262DA8.h +++ b/include/overlay070/ov70_02262DA8.h @@ -6,19 +6,19 @@ #include "overlay070/struct_ov70_02263344_decl.h" #include "overlay070/struct_ov70_0226DA18.h" -UnkStruct_ov70_022630A4 * ov70_02262DA8(UnkStruct_ov70_0225DEE8 * param0, u32 param1); -void ov70_02262DF4(UnkStruct_ov70_022630A4 * param0); -void ov70_02262E20(UnkStruct_ov70_022630A4 * param0); -void ov70_02262E2C(UnkStruct_ov70_022630A4 * param0); -void * ov70_02262E38(UnkStruct_ov70_02263344 * param0); -void * ov70_02262E3C(UnkStruct_ov70_02263344 * param0, u32 param1); -void ov70_02262E64(UnkStruct_ov70_02263344 * param0); -void * ov70_02262E80(UnkStruct_ov70_02263344 * param0); -u32 ov70_02262E84(const UnkStruct_ov70_02263344 * param0); -void ov70_02262E88(UnkStruct_ov70_02263344 * param0, u32 param1); -void ov70_02262E8C(UnkStruct_ov70_02263344 * param0); -void ov70_02262E94(UnkStruct_ov70_022630A4 * param0, u32 param1, const UnkStruct_ov70_0226DA18 * param2, void * param3); -void ov70_02262EC0(UnkStruct_ov70_022630A4 * param0, u32 param1, const UnkStruct_ov70_0226DA18 * param2, void * param3); -void ov70_02262EEC(UnkStruct_ov70_022630A4 * param0, u32 param1, BOOL param2); +UnkStruct_ov70_022630A4 *ov70_02262DA8(UnkStruct_ov70_0225DEE8 *param0, u32 param1); +void ov70_02262DF4(UnkStruct_ov70_022630A4 *param0); +void ov70_02262E20(UnkStruct_ov70_022630A4 *param0); +void ov70_02262E2C(UnkStruct_ov70_022630A4 *param0); +void *ov70_02262E38(UnkStruct_ov70_02263344 *param0); +void *ov70_02262E3C(UnkStruct_ov70_02263344 *param0, u32 param1); +void ov70_02262E64(UnkStruct_ov70_02263344 *param0); +void *ov70_02262E80(UnkStruct_ov70_02263344 *param0); +u32 ov70_02262E84(const UnkStruct_ov70_02263344 *param0); +void ov70_02262E88(UnkStruct_ov70_02263344 *param0, u32 param1); +void ov70_02262E8C(UnkStruct_ov70_02263344 *param0); +void ov70_02262E94(UnkStruct_ov70_022630A4 *param0, u32 param1, const UnkStruct_ov70_0226DA18 *param2, void *param3); +void ov70_02262EC0(UnkStruct_ov70_022630A4 *param0, u32 param1, const UnkStruct_ov70_0226DA18 *param2, void *param3); +void ov70_02262EEC(UnkStruct_ov70_022630A4 *param0, u32 param1, BOOL param2); #endif // POKEPLATINUM_OV70_02262DA8_H diff --git a/include/overlay070/ov70_022630A4.h b/include/overlay070/ov70_022630A4.h index edcd8501fe..e63fc914af 100644 --- a/include/overlay070/ov70_022630A4.h +++ b/include/overlay070/ov70_022630A4.h @@ -3,7 +3,7 @@ #include "overlay070/struct_ov70_0225DEE8_decl.h" -void ov70_022630A4(UnkStruct_ov70_0225DEE8 * param0); -void ov70_022630EC(UnkStruct_ov70_0225DEE8 * param0); +void ov70_022630A4(UnkStruct_ov70_0225DEE8 *param0); +void ov70_022630EC(UnkStruct_ov70_0225DEE8 *param0); #endif // POKEPLATINUM_OV70_022630A4_H diff --git a/include/overlay070/ov70_02265F38.h b/include/overlay070/ov70_02265F38.h index 7539160f77..76ce10824d 100644 --- a/include/overlay070/ov70_02265F38.h +++ b/include/overlay070/ov70_02265F38.h @@ -4,8 +4,8 @@ #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_02263344_decl.h" -BOOL ov70_02265F38(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -BOOL ov70_022669B8(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -BOOL ov70_022669FC(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); +BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +BOOL ov70_022669B8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +BOOL ov70_022669FC(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); #endif // POKEPLATINUM_OV70_02265F38_H diff --git a/include/overlay070/ov70_02266E9C.h b/include/overlay070/ov70_02266E9C.h index c496ff7ef3..a97f99d4fe 100644 --- a/include/overlay070/ov70_02266E9C.h +++ b/include/overlay070/ov70_02266E9C.h @@ -4,9 +4,9 @@ #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_02263344_decl.h" -BOOL ov70_02266E9C(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -BOOL ov70_02267A44(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -BOOL ov70_02268390(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -BOOL ov70_0226889C(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); +BOOL ov70_02266E9C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +BOOL ov70_02267A44(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +BOOL ov70_02268390(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +BOOL ov70_0226889C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); #endif // POKEPLATINUM_OV70_02266E9C_H diff --git a/include/overlay070/ov70_02269190.h b/include/overlay070/ov70_02269190.h index bd0826109d..cffed41dd9 100644 --- a/include/overlay070/ov70_02269190.h +++ b/include/overlay070/ov70_02269190.h @@ -7,11 +7,11 @@ #include "overlay070/struct_ov70_02260AD4_decl.h" #include "overlay070/struct_ov70_02269204_decl.h" -UnkStruct_ov70_02269204 * ov70_02269190(UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov70_0225C894 * param1, UnkStruct_ov70_02260AD4 * param2, UnkStruct_ov70_0225CA20 * param3, u32 param4, u32 param5); -void ov70_02269204(UnkStruct_ov70_02269204 * param0); -void ov70_02269220(UnkStruct_ov70_02269204 * param0); -void ov70_02269240(UnkStruct_ov70_02269204 * param0); -void ov70_02269268(UnkStruct_ov70_02269204 * param0, u32 param1, u32 param2); -BOOL ov70_02269298(const UnkStruct_ov70_02269204 * param0, u32 param1); +UnkStruct_ov70_02269204 *ov70_02269190(UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov70_0225C894 *param1, UnkStruct_ov70_02260AD4 *param2, UnkStruct_ov70_0225CA20 *param3, u32 param4, u32 param5); +void ov70_02269204(UnkStruct_ov70_02269204 *param0); +void ov70_02269220(UnkStruct_ov70_02269204 *param0); +void ov70_02269240(UnkStruct_ov70_02269204 *param0); +void ov70_02269268(UnkStruct_ov70_02269204 *param0, u32 param1, u32 param2); +BOOL ov70_02269298(const UnkStruct_ov70_02269204 *param0, u32 param1); #endif // POKEPLATINUM_OV70_02269190_H diff --git a/include/overlay070/ov70_0226C338.h b/include/overlay070/ov70_0226C338.h index 1937dd5318..da41ca44a2 100644 --- a/include/overlay070/ov70_0226C338.h +++ b/include/overlay070/ov70_0226C338.h @@ -3,11 +3,11 @@ #include "overlay070/struct_ov70_0226C39C_decl.h" -UnkStruct_ov70_0226C39C * ov70_0226C338(u32 param0, int param1, int param2, int param3); -void ov70_0226C39C(UnkStruct_ov70_0226C39C * param0); -void ov70_0226C3A4(UnkStruct_ov70_0226C39C * param0); -void ov70_0226C430(UnkStruct_ov70_0226C39C * param0, int param1); -void ov70_0226C4A0(UnkStruct_ov70_0226C39C * param0, int param1); -void ov70_0226C4C8(UnkStruct_ov70_0226C39C * param0, int param1); +UnkStruct_ov70_0226C39C *ov70_0226C338(u32 param0, int param1, int param2, int param3); +void ov70_0226C39C(UnkStruct_ov70_0226C39C *param0); +void ov70_0226C3A4(UnkStruct_ov70_0226C39C *param0); +void ov70_0226C430(UnkStruct_ov70_0226C39C *param0, int param1); +void ov70_0226C4A0(UnkStruct_ov70_0226C39C *param0, int param1); +void ov70_0226C4C8(UnkStruct_ov70_0226C39C *param0, int param1); #endif // POKEPLATINUM_OV70_0226C338_H diff --git a/include/overlay070/ov70_0226C60C.h b/include/overlay070/ov70_0226C60C.h index 80b7987f02..f8c516cb57 100644 --- a/include/overlay070/ov70_0226C60C.h +++ b/include/overlay070/ov70_0226C60C.h @@ -4,9 +4,9 @@ #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_0226C6F8_decl.h" -UnkStruct_ov70_0226C6F8 * ov70_0226C60C(u32 param0, UnkStruct_ov70_0225DEE8 * param1); -void ov70_0226C6F8(UnkStruct_ov70_0226C6F8 * param0); -void ov70_0226C718(UnkStruct_ov70_0226C6F8 * param0); -BOOL ov70_0226C810(const UnkStruct_ov70_0226C6F8 * param0, u32 param1, int param2); +UnkStruct_ov70_0226C6F8 *ov70_0226C60C(u32 param0, UnkStruct_ov70_0225DEE8 *param1); +void ov70_0226C6F8(UnkStruct_ov70_0226C6F8 *param0); +void ov70_0226C718(UnkStruct_ov70_0226C6F8 *param0); +BOOL ov70_0226C810(const UnkStruct_ov70_0226C6F8 *param0, u32 param1, int param2); #endif // POKEPLATINUM_OV70_0226C60C_H diff --git a/include/overlay070/ov70_0226C8B4.h b/include/overlay070/ov70_0226C8B4.h index 17f27298e1..b8943acbba 100644 --- a/include/overlay070/ov70_0226C8B4.h +++ b/include/overlay070/ov70_0226C8B4.h @@ -5,8 +5,8 @@ #include "overlay070/struct_ov70_02261E10_decl.h" #include "overlay070/struct_ov70_0226C914_decl.h" -UnkStruct_ov70_0226C914 * ov70_0226C8B4(const UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov70_02261E10 * param1, u32 param2); -void ov70_0226C914(UnkStruct_ov70_0226C914 * param0); -void ov70_0226C924(UnkStruct_ov70_0226C914 * param0); +UnkStruct_ov70_0226C914 *ov70_0226C8B4(const UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov70_02261E10 *param1, u32 param2); +void ov70_0226C914(UnkStruct_ov70_0226C914 *param0); +void ov70_0226C924(UnkStruct_ov70_0226C914 *param0); #endif // POKEPLATINUM_OV70_0226C8B4_H diff --git a/include/overlay070/ov70_0226CC74.h b/include/overlay070/ov70_0226CC74.h index a0da061986..c7b9bb465f 100644 --- a/include/overlay070/ov70_0226CC74.h +++ b/include/overlay070/ov70_0226CC74.h @@ -4,6 +4,6 @@ #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_02263344_decl.h" -BOOL ov70_0226CC74(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); +BOOL ov70_0226CC74(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); #endif // POKEPLATINUM_OV70_0226CC74_H diff --git a/include/overlay070/ov70_0226CE54.h b/include/overlay070/ov70_0226CE54.h index aca3d27d81..8e78a98e65 100644 --- a/include/overlay070/ov70_0226CE54.h +++ b/include/overlay070/ov70_0226CE54.h @@ -4,9 +4,9 @@ #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_0226CF38_decl.h" -UnkStruct_ov70_0226CF38 * ov70_0226CE54(UnkStruct_ov70_0225DEE8 * param0, u32 param1); -void ov70_0226CF38(UnkStruct_ov70_0226CF38 * param0); -void ov70_0226CF40(UnkStruct_ov70_0226CF38 * param0); -BOOL ov70_0226CFFC(const UnkStruct_ov70_0226CF38 * param0, u32 param1, int param2); +UnkStruct_ov70_0226CF38 *ov70_0226CE54(UnkStruct_ov70_0225DEE8 *param0, u32 param1); +void ov70_0226CF38(UnkStruct_ov70_0226CF38 *param0); +void ov70_0226CF40(UnkStruct_ov70_0226CF38 *param0); +BOOL ov70_0226CFFC(const UnkStruct_ov70_0226CF38 *param0, u32 param1, int param2); #endif // POKEPLATINUM_OV70_0226CE54_H diff --git a/include/overlay071/ov71_0223B140.h b/include/overlay071/ov71_0223B140.h index 9ee1dd5bee..145c3b9303 100644 --- a/include/overlay071/ov71_0223B140.h +++ b/include/overlay071/ov71_0223B140.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV71_0223B140_H #define POKEPLATINUM_OV71_0223B140_H +#include "overlay_manager.h" -int ov71_0223B140(OverlayManager * param0, int * param1); -int ov71_0223B388(OverlayManager * param0, int * param1); -int ov71_0223B5B8(OverlayManager * param0, int * param1); +int ov71_0223B140(OverlayManager *param0, int *param1); +int ov71_0223B388(OverlayManager *param0, int *param1); +int ov71_0223B5B8(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV71_0223B140_H diff --git a/include/overlay071/ov71_0223C69C.h b/include/overlay071/ov71_0223C69C.h index 7086426d8b..59fd4afa3a 100644 --- a/include/overlay071/ov71_0223C69C.h +++ b/include/overlay071/ov71_0223C69C.h @@ -2,16 +2,17 @@ #define POKEPLATINUM_OV71_0223C69C_H #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02072014.h" -void ov71_0223C69C(BGL * param0, Window * param1); -void ov71_0223C6D4(Window * param0); -void ov71_0223C6F0(Window * param0, const TrainerCard * param1); -void ov71_0223CA28(Window * param0, const TrainerCard * param1); -void ov71_0223CD44(Window * param0, const u8 param1, const u8 param2); -void ov71_0223CDE8(Window * param0, const TrainerCard * param1, Strbuf *param2); -void ov71_0223CECC(Window * param0, const BOOL param1, Strbuf *param2); +#include "strbuf.h" + +void ov71_0223C69C(BGL *param0, Window *param1); +void ov71_0223C6D4(Window *param0); +void ov71_0223C6F0(Window *param0, const TrainerCard *param1); +void ov71_0223CA28(Window *param0, const TrainerCard *param1); +void ov71_0223CD44(Window *param0, const u8 param1, const u8 param2); +void ov71_0223CDE8(Window *param0, const TrainerCard *param1, Strbuf *param2); +void ov71_0223CECC(Window *param0, const BOOL param1, Strbuf *param2); #endif // POKEPLATINUM_OV71_0223C69C_H diff --git a/include/overlay071/ov71_0223CF0C.h b/include/overlay071/ov71_0223CF0C.h index 8a991a3d0c..95c73daab0 100644 --- a/include/overlay071/ov71_0223CF0C.h +++ b/include/overlay071/ov71_0223CF0C.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV71_0223CF0C_H #include "struct_decls/struct_02006C24_decl.h" + #include "overlay071/struct_ov71_0223D238.h" -void ov71_0223CF0C(UnkStruct_ov71_0223D238 * param0, NARC * param1); -void ov71_0223D070(UnkStruct_ov71_0223D238 * param0, const u8 * param1); -void ov71_0223D238(UnkStruct_ov71_0223D238 * param0); -void ov71_0223D298(UnkStruct_ov71_0223D238 * param0, const u8 param1, const u8 param2); +void ov71_0223CF0C(UnkStruct_ov71_0223D238 *param0, NARC *param1); +void ov71_0223D070(UnkStruct_ov71_0223D238 *param0, const u8 *param1); +void ov71_0223D238(UnkStruct_ov71_0223D238 *param0); +void ov71_0223D298(UnkStruct_ov71_0223D238 *param0, const u8 param1, const u8 param2); #endif // POKEPLATINUM_OV71_0223CF0C_H diff --git a/include/overlay071/ov71_0223D324.h b/include/overlay071/ov71_0223D324.h index c9cf16c92b..3f3b535f2d 100644 --- a/include/overlay071/ov71_0223D324.h +++ b/include/overlay071/ov71_0223D324.h @@ -3,7 +3,7 @@ #include "overlay071/struct_ov71_0223D324.h" -void ov71_0223D324(UnkStruct_ov71_0223D324 * param0); -void ov71_0223D338(UnkStruct_ov71_0223D324 * param0, const int param1, const u8 param2); +void ov71_0223D324(UnkStruct_ov71_0223D324 *param0); +void ov71_0223D338(UnkStruct_ov71_0223D324 *param0, const int param1, const u8 param2); #endif // POKEPLATINUM_OV71_0223D324_H diff --git a/include/overlay071/struct_ov71_0223B620.h b/include/overlay071/struct_ov71_0223B620.h index b4e5e1a5df..00b4e0306a 100644 --- a/include/overlay071/struct_ov71_0223B620.h +++ b/include/overlay071/struct_ov71_0223B620.h @@ -1,23 +1,25 @@ #ifndef POKEPLATINUM_STRUCT_OV71_0223B620_H #define POKEPLATINUM_STRUCT_OV71_0223B620_H +#include + #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02072014.h" + #include "overlay071/struct_ov71_0223C444.h" #include "overlay071/struct_ov71_0223D238.h" #include "overlay071/struct_ov71_0223D324.h" -#include +#include "strbuf.h" typedef struct { - BGL * unk_00; + BGL *unk_00; Window unk_04[11]; - TrainerCard * unk_B4; + TrainerCard *unk_B4; u8 unk_B8[12288]; - void * unk_30B8; - NNSG2dCharacterData * unk_30BC; + void *unk_30B8; + NNSG2dCharacterData *unk_30BC; BOOL unk_30C0; BOOL unk_30C4; fx32 unk_30C8; @@ -32,11 +34,11 @@ typedef struct { int unk_334C; BOOL unk_3350; UnkStruct_ov71_0223D324 unk_3354; - void * unk_335C; - NNSG2dScreenData * unk_3360; + void *unk_335C; + NNSG2dScreenData *unk_3360; UnkStruct_ov71_0223C444 unk_3364; - Strbuf* unk_336C; - Strbuf* unk_3370; + Strbuf *unk_336C; + Strbuf *unk_3370; u8 unk_3374[8]; u8 unk_337C; u8 unk_337D; diff --git a/include/overlay071/struct_ov71_0223D238.h b/include/overlay071/struct_ov71_0223D238.h index d4f5dd4692..5e3477e6fa 100644 --- a/include/overlay071/struct_ov71_0223D238.h +++ b/include/overlay071/struct_ov71_0223D238.h @@ -1,22 +1,22 @@ #ifndef POKEPLATINUM_STRUCT_OV71_0223D238_H #define POKEPLATINUM_STRUCT_OV71_0223D238_H +#include + #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" - -#include +#include "struct_defs/struct_0200C738.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; - UnkStruct_02009DC8 * unk_1A0[2][4]; - GraphicElementData * unk_1C0[25]; - void * unk_224[8]; - NNSG2dPaletteData * unk_244[8]; + UnkStruct_02009714 *unk_190[4]; + UnkStruct_02009DC8 *unk_1A0[2][4]; + GraphicElementData *unk_1C0[25]; + void *unk_224[8]; + NNSG2dPaletteData *unk_244[8]; } UnkStruct_ov71_0223D238; #endif // POKEPLATINUM_STRUCT_OV71_0223D238_H diff --git a/include/overlay072/ov72_0223D7A0.h b/include/overlay072/ov72_0223D7A0.h index 6abf374376..1983ea9d5c 100644 --- a/include/overlay072/ov72_0223D7A0.h +++ b/include/overlay072/ov72_0223D7A0.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV72_0223D7A0_H #define POKEPLATINUM_OV72_0223D7A0_H +#include "overlay_manager.h" -int ov72_0223D7A0(OverlayManager * param0, int * param1); -int ov72_0223D920(OverlayManager * param0, int * param1); -int ov72_0223D984(OverlayManager * param0, int * param1); +int ov72_0223D7A0(OverlayManager *param0, int *param1); +int ov72_0223D920(OverlayManager *param0, int *param1); +int ov72_0223D984(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV72_0223D7A0_H diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h index da2ea32101..b92a3f7895 100644 --- a/include/overlay072/struct_ov72_0223DB98_t.h +++ b/include/overlay072/struct_ov72_0223DB98_t.h @@ -3,49 +3,51 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" -#include "string_template.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "game_options.h" #include "struct_decls/struct_0202CD88_decl.h" +#include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay072/struct_ov72_0223E7D8.h" #include "overlay072/struct_ov72_0223E80C.h" #include "overlay072/struct_ov72_0223EAD8.h" +#include "game_options.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" + struct UnkStruct_ov72_0223DB98_t { - BGL * unk_00; + BGL *unk_00; BOOL unk_04; - UnkStruct_0202CD88 * unk_08; - Options * unk_0C; - StringTemplate * unk_10; - MessageLoader * unk_14; - Strbuf* unk_18[5]; - Strbuf* unk_2C; - Strbuf* unk_30; - Strbuf* unk_34; + UnkStruct_0202CD88 *unk_08; + Options *unk_0C; + StringTemplate *unk_10; + MessageLoader *unk_14; + Strbuf *unk_18[5]; + Strbuf *unk_2C; + Strbuf *unk_30; + Strbuf *unk_34; int unk_38; - GraphicElementManager * unk_3C; + GraphicElementManager *unk_3C; UnkStruct_0200C738 unk_40; - UnkStruct_02009714 * unk_1CC[4]; - UnkStruct_02009DC8 * unk_1DC[2][4]; + UnkStruct_02009714 *unk_1CC[4]; + UnkStruct_02009DC8 *unk_1DC[2][4]; UnkStruct_ov19_021DA864 unk_1FC; UnkStruct_ov19_021DA864 unk_220; - GraphicElementData * unk_244[14]; - GraphicElementData * unk_27C[14]; - GraphicElementData * unk_2B4[9]; + GraphicElementData *unk_244[14]; + GraphicElementData *unk_27C[14]; + GraphicElementData *unk_2B4[9]; Window unk_2D8[5]; Window unk_328; Window unk_338; Window unk_348; Window unk_358; - Window * unk_368[2]; + Window *unk_368[2]; int unk_370; int unk_374; int unk_378; @@ -57,9 +59,9 @@ struct UnkStruct_ov72_0223DB98_t { UnkStruct_ov72_0223E7D8 unk_4391[5]; UnkStruct_ov72_0223E80C unk_43E6[5]; u8 unk_43FA[6144]; - u8 * unk_5BFC; + u8 *unk_5BFC; u8 unk_5C00[256]; - UnkStruct_02015920 * unk_5D00; + UnkStruct_02015920 *unk_5D00; UnkStruct_ov72_0223EAD8 unk_5D04; int unk_5D0C; int unk_5D10; diff --git a/include/overlay072/struct_ov72_0223E2A8.h b/include/overlay072/struct_ov72_0223E2A8.h index 7ab059e21f..6f60181207 100644 --- a/include/overlay072/struct_ov72_0223E2A8.h +++ b/include/overlay072/struct_ov72_0223E2A8.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV72_0223E2A8_H #define POKEPLATINUM_STRUCT_OV72_0223E2A8_H - #include typedef struct { diff --git a/include/overlay074/ov74_021D0D80.h b/include/overlay074/ov74_021D0D80.h index 6e80ed0f82..c8e099ff41 100644 --- a/include/overlay074/ov74_021D0D80.h +++ b/include/overlay074/ov74_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV74_021D0D80_H #define POKEPLATINUM_OV74_021D0D80_H +#include "overlay_manager.h" -int ov74_021D0D80(OverlayManager * param0, int * param1); -int ov74_021D0E58(OverlayManager * param0, int * param1); -int ov74_021D0F60(OverlayManager * param0, int * param1); +int ov74_021D0D80(OverlayManager *param0, int *param1); +int ov74_021D0E58(OverlayManager *param0, int *param1); +int ov74_021D0F60(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV74_021D0D80_H diff --git a/include/overlay075/ov75_021D0D80.h b/include/overlay075/ov75_021D0D80.h index 9b5072182c..2132bab6de 100644 --- a/include/overlay075/ov75_021D0D80.h +++ b/include/overlay075/ov75_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV75_021D0D80_H #define POKEPLATINUM_OV75_021D0D80_H +#include "overlay_manager.h" -int ov75_021D0D80(OverlayManager * param0, int * param1); -int ov75_021D0DF8(OverlayManager * param0, int * param1); -int ov75_021D0E10(OverlayManager * param0, int * param1); +int ov75_021D0D80(OverlayManager *param0, int *param1); +int ov75_021D0DF8(OverlayManager *param0, int *param1); +int ov75_021D0E10(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV75_021D0D80_H diff --git a/include/overlay076/funcptr_ov76_0223D674.h b/include/overlay076/funcptr_ov76_0223D674.h index fe1fd40c84..ca63a08202 100644 --- a/include/overlay076/funcptr_ov76_0223D674.h +++ b/include/overlay076/funcptr_ov76_0223D674.h @@ -3,6 +3,6 @@ #include "overlay076/struct_ov76_0223DE00.h" -typedef int (* UnkFuncPtr_ov76_0223D674)(UnkStruct_ov76_0223DE00 *); +typedef int (*UnkFuncPtr_ov76_0223D674)(UnkStruct_ov76_0223DE00 *); #endif // POKEPLATINUM_FUNCPTR_OV76_0223D674_H diff --git a/include/overlay076/ov76_0223B140.h b/include/overlay076/ov76_0223B140.h index 10da79803c..1680254bee 100644 --- a/include/overlay076/ov76_0223B140.h +++ b/include/overlay076/ov76_0223B140.h @@ -2,28 +2,30 @@ #define POKEPLATINUM_OV76_0223B140_H #include "struct_decls/cell_actor_data.h" -#include "touch_screen.h" #include "struct_defs/struct_0202CA28.h" + #include "overlay076/struct_ov76_0223DE00.h" -void ov76_0223B184(TouchScreenRect *rect, CellActorData * param1, BOOL param2); -void ov76_0223B1E0(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223B208(UnkStruct_ov76_0223DE00 * param0); -int ov76_0223B278(UnkStruct_ov76_0223DE00 * param0, u8 param1); -BOOL ov76_0223B2F8(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223B314(UnkStruct_ov76_0223DE00 * param0, u8 param1); -void ov76_0223B36C(UnkStruct_ov76_0223DE00 * param0, u8 param1, u8 param2); -void ov76_0223B400(UnkStruct_ov76_0223DE00 * param0); -BOOL ov76_0223B52C(UnkStruct_ov76_0223DE00 * param0, u8 param1); -BOOL ov76_0223B5C4(UnkStruct_ov76_0223DE00 * param0, u32 param1, u8 param2); -void ov76_0223B678(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223B69C(UnkStruct_ov76_0223DE00 * param0, int param1); -BOOL ov76_0223B6C4(UnkStruct_ov76_0223DE00 * param0, int param1); -void ov76_0223B704(UnkStruct_ov76_0223DE00 * param0, int param1); -void ov76_0223B758(UnkStruct_ov76_0223DE00 * param0, int param1); -BOOL ov76_0223B78C(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223B7D4(UnkStruct_ov76_0223DE00 * param0, int param1); -void ov76_0223B808(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223B848(UnkStruct_0202CA28 * param0, UnkStruct_ov76_0223DE00 * param1); +#include "touch_screen.h" + +void ov76_0223B184(TouchScreenRect *rect, CellActorData *param1, BOOL param2); +void ov76_0223B1E0(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223B208(UnkStruct_ov76_0223DE00 *param0); +int ov76_0223B278(UnkStruct_ov76_0223DE00 *param0, u8 param1); +BOOL ov76_0223B2F8(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223B314(UnkStruct_ov76_0223DE00 *param0, u8 param1); +void ov76_0223B36C(UnkStruct_ov76_0223DE00 *param0, u8 param1, u8 param2); +void ov76_0223B400(UnkStruct_ov76_0223DE00 *param0); +BOOL ov76_0223B52C(UnkStruct_ov76_0223DE00 *param0, u8 param1); +BOOL ov76_0223B5C4(UnkStruct_ov76_0223DE00 *param0, u32 param1, u8 param2); +void ov76_0223B678(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223B69C(UnkStruct_ov76_0223DE00 *param0, int param1); +BOOL ov76_0223B6C4(UnkStruct_ov76_0223DE00 *param0, int param1); +void ov76_0223B704(UnkStruct_ov76_0223DE00 *param0, int param1); +void ov76_0223B758(UnkStruct_ov76_0223DE00 *param0, int param1); +BOOL ov76_0223B78C(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223B7D4(UnkStruct_ov76_0223DE00 *param0, int param1); +void ov76_0223B808(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223B848(UnkStruct_0202CA28 *param0, UnkStruct_ov76_0223DE00 *param1); #endif // POKEPLATINUM_OV76_0223B140_H diff --git a/include/overlay076/ov76_0223B870.h b/include/overlay076/ov76_0223B870.h index 6b93f02af5..f47c9b9eee 100644 --- a/include/overlay076/ov76_0223B870.h +++ b/include/overlay076/ov76_0223B870.h @@ -8,64 +8,65 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" + #include "overlay076/struct_ov76_0223C398.h" #include "overlay076/struct_ov76_0223DE00.h" -void ov76_0223B8A8(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223B8C4(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223B904(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223B940(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223B96C(UnkStruct_ov76_0223DE00 * param0, BOOL param1); -void ov76_0223B98C(UnkStruct_ov76_0223DE00 * param0, int param1, int param2, int param3, int param4); -void ov76_0223BA90(UnkStruct_ov76_0223DE00 * param0, int param1); -void ov76_0223BB04(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223BBAC(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223BC70(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223BD30(UnkStruct_ov76_0223DE00 * param0, s8 param1, int param2); -GenericPointerData * ov76_0223BE6C(void); +void ov76_0223B8A8(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223B8C4(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223B904(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223B940(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223B96C(UnkStruct_ov76_0223DE00 *param0, BOOL param1); +void ov76_0223B98C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2, int param3, int param4); +void ov76_0223BA90(UnkStruct_ov76_0223DE00 *param0, int param1); +void ov76_0223BB04(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223BBAC(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223BC70(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223BD30(UnkStruct_ov76_0223DE00 *param0, s8 param1, int param2); +GenericPointerData *ov76_0223BE6C(void); void ov76_0223BE8C(void); void ov76_0223BF10(void); void ov76_0223BF50(void); -void ov76_0223BF74(BGL * param0, Window * param1, int param2, UnkStruct_ov76_0223DE00 * param3, int param4); -void ov76_0223C0EC(int param0, s16 * param1, s16 * param2); -void ov76_0223C110(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C188(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C288(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C304(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C32C(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C354(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C398(UnkStruct_ov76_0223C398 * param0); -void ov76_0223C424(UnkStruct_ov76_0223C398 * param0); -void ov76_0223C438(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223C4AC(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C544(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C568(UnkStruct_ov76_0223DE00 * param0, int param1); -void ov76_0223C588(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C5A4(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10); -void ov76_0223C61C(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223C7E0(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C80C(UnkStruct_ov76_0223DE00 * param0, int param1, int param2); -void ov76_0223C88C(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C8BC(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C8EC(BGL * param0, PaletteData * param1, int param2); -void ov76_0223C974(BGL * param0, PaletteData * param1, int param2); -void ov76_0223CA30(Window * param0, int param1); -void ov76_0223CA98(BGL * param0, Window * param1, int param2, int param3, int param4, int param5, int param6, int param7); -void ov76_0223CB58(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223CC8C(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223CD20(UnkStruct_ov76_0223DE00 * param0, int param1); -void ov76_0223CDA4(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223CDC4(Window * param0, int param1); +void ov76_0223BF74(BGL *param0, Window *param1, int param2, UnkStruct_ov76_0223DE00 *param3, int param4); +void ov76_0223C0EC(int param0, s16 *param1, s16 *param2); +void ov76_0223C110(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C188(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C288(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C304(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C32C(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C354(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C398(UnkStruct_ov76_0223C398 *param0); +void ov76_0223C424(UnkStruct_ov76_0223C398 *param0); +void ov76_0223C438(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223C4AC(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C544(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C568(UnkStruct_ov76_0223DE00 *param0, int param1); +void ov76_0223C588(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C5A4(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC *param10); +void ov76_0223C61C(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223C7E0(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C80C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2); +void ov76_0223C88C(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C8BC(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C8EC(BGL *param0, PaletteData *param1, int param2); +void ov76_0223C974(BGL *param0, PaletteData *param1, int param2); +void ov76_0223CA30(Window *param0, int param1); +void ov76_0223CA98(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7); +void ov76_0223CB58(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223CC8C(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223CD20(UnkStruct_ov76_0223DE00 *param0, int param1); +void ov76_0223CDA4(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223CDC4(Window *param0, int param1); void ov76_0223CE2C(void); void ov76_0223CE44(void); void ov76_0223CE64(void); -void ov76_0223CE84(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223CF24(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223CF88(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223CFEC(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223D16C(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223D2F4(UnkStruct_ov76_0223DE00 * param0, int param1); -void ov76_0223D318(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223D31C(UnkStruct_ov76_0223DE00 * param0); +void ov76_0223CE84(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223CF24(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223CF88(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223CFEC(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223D16C(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223D2F4(UnkStruct_ov76_0223DE00 *param0, int param1); +void ov76_0223D318(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223D31C(UnkStruct_ov76_0223DE00 *param0); #endif // POKEPLATINUM_OV76_0223B870_H diff --git a/include/overlay076/ov76_0223D338.h b/include/overlay076/ov76_0223D338.h index 9bdc708973..06da0a0eda 100644 --- a/include/overlay076/ov76_0223D338.h +++ b/include/overlay076/ov76_0223D338.h @@ -4,30 +4,31 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0202CA28.h" + #include "overlay076/struct_ov76_0223DE00.h" -void ov76_0223D338(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223D350(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223D368(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223D384(UnkStruct_ov76_0223DE00 * param0); +void ov76_0223D338(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223D350(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223D368(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223D384(UnkStruct_ov76_0223DE00 *param0); void ov76_0223D3A0(void); -void ov76_0223D3CC(UnkStruct_ov76_0223DE00 * param0); -int ov76_0223D430(UnkStruct_0202CA28 * param0); -int ov76_0223D45C(UnkStruct_ov76_0223DE00 * param0, int param1); -BOOL ov76_0223D550(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223D94C(CellActorData * param0, int param1); -void ov76_0223DA34(u32 param0, u32 param1, void * param2); -BOOL ov76_0223DCB0(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223DCB8(UnkStruct_ov76_0223DE00 * param0, BOOL param1); -void ov76_0223DCC0(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223DD88(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223DE00(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223DF70(UnkStruct_ov76_0223DE00 * param0, int param1); -void ov76_0223DF84(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223E91C(UnkStruct_ov76_0223DE00 * param0, int param1); +void ov76_0223D3CC(UnkStruct_ov76_0223DE00 *param0); +int ov76_0223D430(UnkStruct_0202CA28 *param0); +int ov76_0223D45C(UnkStruct_ov76_0223DE00 *param0, int param1); +BOOL ov76_0223D550(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223D94C(CellActorData *param0, int param1); +void ov76_0223DA34(u32 param0, u32 param1, void *param2); +BOOL ov76_0223DCB0(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223DCB8(UnkStruct_ov76_0223DE00 *param0, BOOL param1); +void ov76_0223DCC0(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223DD88(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223DE00(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223DF70(UnkStruct_ov76_0223DE00 *param0, int param1); +void ov76_0223DF84(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223E91C(UnkStruct_ov76_0223DE00 *param0, int param1); void ov76_0223EB20(int param0); void ov76_0223EB54(int param0); -void ov76_0223EB64(BGL * param0); -void ov76_0223ECB0(void * param0); +void ov76_0223EB64(BGL *param0); +void ov76_0223ECB0(void *param0); #endif // POKEPLATINUM_OV76_0223D338_H diff --git a/include/overlay076/struct_ov76_0223B52C.h b/include/overlay076/struct_ov76_0223B52C.h index 686b0b46cc..b127bd668b 100644 --- a/include/overlay076/struct_ov76_0223B52C.h +++ b/include/overlay076/struct_ov76_0223B52C.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_OV76_0223B52C_H #include "struct_decls/cell_actor_data.h" + #include "touch_screen.h" typedef struct { @@ -10,8 +11,8 @@ typedef struct { u8 unk_05; u8 unk_06; u8 padding_07; - CellActorData * unk_08; - TouchScreenRect * unk_0C; + CellActorData *unk_08; + TouchScreenRect *unk_0C; } UnkStruct_ov76_0223B52C; #endif // POKEPLATINUM_STRUCT_OV76_0223B52C_H diff --git a/include/overlay076/struct_ov76_0223BBAC.h b/include/overlay076/struct_ov76_0223BBAC.h index f89bf1f4e7..8cdff4b856 100644 --- a/include/overlay076/struct_ov76_0223BBAC.h +++ b/include/overlay076/struct_ov76_0223BBAC.h @@ -4,7 +4,7 @@ #include "struct_decls/cell_actor_data.h" typedef struct { - CellActorData * unk_00[13]; + CellActorData *unk_00[13]; } UnkStruct_ov76_0223BBAC; #endif // POKEPLATINUM_STRUCT_OV76_0223BBAC_H diff --git a/include/overlay076/struct_ov76_0223C398.h b/include/overlay076/struct_ov76_0223C398.h index dbaa548679..a147489d68 100644 --- a/include/overlay076/struct_ov76_0223C398.h +++ b/include/overlay076/struct_ov76_0223C398.h @@ -1,52 +1,54 @@ #ifndef POKEPLATINUM_STRUCT_OV76_0223C398_H #define POKEPLATINUM_STRUCT_OV76_0223C398_H +#include "struct_decls/font_oam.h" +#include "struct_decls/pokemon_animation_sys_decl.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/sprite_manager_allocation.h" -#include "touch_screen.h" #include "struct_decls/struct_02023FCC_decl.h" +#include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" -#include "overlay012/struct_ov12_02235FE0_decl.h" + #include "overlay012/struct_ball_rotation_decl.h" +#include "overlay012/struct_ov12_02235FE0_decl.h" #include "overlay022/struct_ov22_02258A48.h" +#include "touch_screen.h" + typedef struct { int unk_00; BOOL unk_04; - SpriteRenderer * unk_08; - SpriteGfxHandler * unk_0C; - BGL * unk_10; - PaletteData * unk_14; + SpriteRenderer *unk_08; + SpriteGfxHandler *unk_0C; + BGL *unk_10; + PaletteData *unk_14; Window unk_18[11]; - ResourceMetadata * unk_C8; - UIControlData * unk_CC; - UnkStruct_02007768 * unk_D0; - Sprite * unk_D4; + ResourceMetadata *unk_C8; + UIControlData *unk_CC; + UnkStruct_02007768 *unk_D0; + Sprite *unk_D4; int unk_D8; UnkStruct_ov22_02258A48 unk_DC; - UnkStruct_02023FCC * unk_F8; + UnkStruct_02023FCC *unk_F8; TouchScreenRect unk_FC[21]; - UnkStruct_02015920 * unk_150; - UnkStruct_ov12_02235FE0 * unk_154; - BallRotation * unk_158; - GenericPointerData * unk_15C; - UnkStruct_02012744 * unk_160; - FontOAM * unk_164[2]; + UnkStruct_02015920 *unk_150; + UnkStruct_ov12_02235FE0 *unk_154; + BallRotation *unk_158; + GenericPointerData *unk_15C; + UnkStruct_02012744 *unk_160; + FontOAM *unk_164[2]; SpriteManagerAllocation unk_16C[2]; BOOL unk_184; - PokemonAnimationSys * unk_188; + PokemonAnimationSys *unk_188; BOOL unk_18C; } UnkStruct_ov76_0223C398; diff --git a/include/overlay076/struct_ov76_0223DD88_sub1.h b/include/overlay076/struct_ov76_0223DD88_sub1.h index 8661af7012..0061aea40e 100644 --- a/include/overlay076/struct_ov76_0223DD88_sub1.h +++ b/include/overlay076/struct_ov76_0223DD88_sub1.h @@ -5,7 +5,7 @@ typedef struct { int unk_00; - UnkStruct_0202CA28 * unk_04; + UnkStruct_0202CA28 *unk_04; } UnkStruct_ov76_0223DD88_sub1; #endif // POKEPLATINUM_STRUCT_OV76_0223DD88_SUB1_H diff --git a/include/overlay076/struct_ov76_0223DD88_sub2.h b/include/overlay076/struct_ov76_0223DD88_sub2.h index c608fe8327..587edc52db 100644 --- a/include/overlay076/struct_ov76_0223DD88_sub2.h +++ b/include/overlay076/struct_ov76_0223DD88_sub2.h @@ -6,7 +6,7 @@ typedef struct { int unk_00; int unk_04; - CellActorData * unk_08; + CellActorData *unk_08; } UnkStruct_ov76_0223DD88_sub2; #endif // POKEPLATINUM_STRUCT_OV76_0223DD88_SUB2_H diff --git a/include/overlay076/struct_ov76_0223DE00.h b/include/overlay076/struct_ov76_0223DE00.h index cf602c6077..0c8773d886 100644 --- a/include/overlay076/struct_ov76_0223DE00.h +++ b/include/overlay076/struct_ov76_0223DE00.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV76_0223DE00_H #define POKEPLATINUM_STRUCT_OV76_0223DE00_H -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/cell_actor_data.h" -#include "struct_defs/struct_0202CA28.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0202CA88_decl.h" -#include "pokemon.h" +#include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_02097F18.h" + #include "overlay076/struct_ov76_0223B52C.h" #include "overlay076/struct_ov76_0223BBAC.h" #include "overlay076/struct_ov76_0223C398.h" @@ -14,18 +14,20 @@ #include "overlay076/struct_ov76_0223DD88_sub2.h" #include "overlay076/struct_ov76_0223DD88_sub3.h" +#include "pokemon.h" + typedef struct { - UnkStruct_02097F18 * unk_00; + UnkStruct_02097F18 *unk_00; UnkStruct_ov76_0223DD88_sub1 unk_04[12]; - UnkStruct_0202CA88 * unk_64; + UnkStruct_0202CA88 *unk_64; UnkStruct_0202CA28 unk_68; u8 unk_80[81]; u8 padding_D1[3]; UnkStruct_ov76_0223C398 unk_D4; UnkStruct_ov76_0223DD88_sub2 unk_264[12]; - CellActorData * unk_2F4[2]; - CellActorData * unk_2FC[6]; - CellActorData * unk_314[4]; + CellActorData *unk_2F4[2]; + CellActorData *unk_2FC[6]; + CellActorData *unk_314[4]; UnkStruct_ov76_0223B52C unk_324[8]; int unk_3A4[8]; int unk_3C4[2]; @@ -37,8 +39,8 @@ typedef struct { int unk_3E0; UnkStruct_ov76_0223BBAC unk_3E4; UnkStruct_ov76_0223DD88_sub3 unk_418; - Pokemon * unk_428; - NARC * unk_42C; + Pokemon *unk_428; + NARC *unk_42C; } UnkStruct_ov76_0223DE00; #endif // POKEPLATINUM_STRUCT_OV76_0223DE00_H diff --git a/include/overlay077/ov77_021D54B0.h b/include/overlay077/ov77_021D54B0.h index 036708bdc3..e366642ea0 100644 --- a/include/overlay077/ov77_021D54B0.h +++ b/include/overlay077/ov77_021D54B0.h @@ -5,20 +5,20 @@ #include "overlay077/struct_ov77_021D6734_decl.h" const int ov77_021D555C(void); -void ov77_021D5564(UnkStruct_ov77_021D5564 * param0); -void ov77_021D5BAC(UnkStruct_ov77_021D5564 * param0); -void ov77_021D5C3C(UnkStruct_ov77_021D5564 * param0); -void ov77_021D5FB4(UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 * param1); -void ov77_021D6000(UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 * param1); -void ov77_021D6020(UnkStruct_ov77_021D5564 * param0); -void ov77_021D603C(UnkStruct_ov77_021D5564 * param0, const u8 param1, const u8 param2); -void ov77_021D6050(UnkStruct_ov77_021D5564 * param0, const u8 param1); -void ov77_021D607C(UnkStruct_ov77_021D5564 * param0); -BOOL ov77_021D60E0(UnkStruct_ov77_021D5564 * param0, int param1); -BOOL ov77_021D61B8(UnkStruct_ov77_021D5564 * param0, int param1); -void ov77_021D6290(UnkStruct_ov77_021D5564 * param0, fx32 param1); -void ov77_021D636C(UnkStruct_ov77_021D5564 * param0, int param1); -void ov77_021D6470(UnkStruct_ov77_021D5564 * param0, int param1); -void ov77_021D6530(UnkStruct_ov77_021D5564 * param0, const int param1); +void ov77_021D5564(UnkStruct_ov77_021D5564 *param0); +void ov77_021D5BAC(UnkStruct_ov77_021D5564 *param0); +void ov77_021D5C3C(UnkStruct_ov77_021D5564 *param0); +void ov77_021D5FB4(UnkStruct_ov77_021D5564 *param0, UnkStruct_ov77_021D6734 *param1); +void ov77_021D6000(UnkStruct_ov77_021D5564 *param0, UnkStruct_ov77_021D6734 *param1); +void ov77_021D6020(UnkStruct_ov77_021D5564 *param0); +void ov77_021D603C(UnkStruct_ov77_021D5564 *param0, const u8 param1, const u8 param2); +void ov77_021D6050(UnkStruct_ov77_021D5564 *param0, const u8 param1); +void ov77_021D607C(UnkStruct_ov77_021D5564 *param0); +BOOL ov77_021D60E0(UnkStruct_ov77_021D5564 *param0, int param1); +BOOL ov77_021D61B8(UnkStruct_ov77_021D5564 *param0, int param1); +void ov77_021D6290(UnkStruct_ov77_021D5564 *param0, fx32 param1); +void ov77_021D636C(UnkStruct_ov77_021D5564 *param0, int param1); +void ov77_021D6470(UnkStruct_ov77_021D5564 *param0, int param1); +void ov77_021D6530(UnkStruct_ov77_021D5564 *param0, const int param1); #endif // POKEPLATINUM_OV77_021D54B0_H diff --git a/include/overlay077/ov77_021D6670.h b/include/overlay077/ov77_021D6670.h index e6b633ca0d..874de10ed3 100644 --- a/include/overlay077/ov77_021D6670.h +++ b/include/overlay077/ov77_021D6670.h @@ -2,15 +2,16 @@ #define POKEPLATINUM_OV77_021D6670_H #include "struct_decls/struct_02022550_decl.h" + #include "overlay077/struct_ov77_021D670C_decl.h" #include "overlay077/struct_ov77_021D6734_decl.h" -UnkStruct_ov77_021D670C * ov77_021D670C(void); -UnkStruct_ov77_021D6734 * ov77_021D6734(const int param0); -void ov77_021D6760(UnkStruct_ov77_021D6734 * param0); -GraphicElementData ** ov77_021D6794(UnkStruct_ov77_021D6734 * param0, const int param1); -void ov77_021D67B0(UnkStruct_ov77_021D670C * param0); -void ov77_021D69C0(UnkStruct_ov77_021D670C * param0, const int param1); -void ov77_021D6BA0(UnkStruct_ov77_021D6734 * param0, int param1); +UnkStruct_ov77_021D670C *ov77_021D670C(void); +UnkStruct_ov77_021D6734 *ov77_021D6734(const int param0); +void ov77_021D6760(UnkStruct_ov77_021D6734 *param0); +GraphicElementData **ov77_021D6794(UnkStruct_ov77_021D6734 *param0, const int param1); +void ov77_021D67B0(UnkStruct_ov77_021D670C *param0); +void ov77_021D69C0(UnkStruct_ov77_021D670C *param0, const int param1); +void ov77_021D6BA0(UnkStruct_ov77_021D6734 *param0, int param1); #endif // POKEPLATINUM_OV77_021D6670_H diff --git a/include/overlay077/ov77_021D6C70.h b/include/overlay077/ov77_021D6C70.h index ae4e308ba3..ef11cf6515 100644 --- a/include/overlay077/ov77_021D6C70.h +++ b/include/overlay077/ov77_021D6C70.h @@ -2,17 +2,18 @@ #define POKEPLATINUM_OV77_021D6C70_H #include "struct_decls/struct_02014014_decl.h" + #include "overlay077/struct_ov77_021D6CFC_decl.h" #include "spl.h" const int ov77_021D6CB8(void); -UnkStruct_02014014 * ov77_021D6CBC(UnkStruct_ov77_021D6CFC * param0); -UnkSPLStruct6 * ov77_021D6CD0(UnkStruct_ov77_021D6CFC * param0, int param1); -void ov77_021D6CFC(UnkStruct_ov77_021D6CFC * param0); -void ov77_021D6E28(UnkStruct_ov77_021D6CFC * param0); -void ov77_021D6E40(UnkStruct_ov77_021D6CFC * param0); -void ov77_021D6E50(UnkStruct_ov77_021D6CFC * param0); -BOOL ov77_021D6E78(UnkStruct_ov77_021D6CFC * param0, const u8 param1, const int param2); +UnkStruct_02014014 *ov77_021D6CBC(UnkStruct_ov77_021D6CFC *param0); +UnkSPLStruct6 *ov77_021D6CD0(UnkStruct_ov77_021D6CFC *param0, int param1); +void ov77_021D6CFC(UnkStruct_ov77_021D6CFC *param0); +void ov77_021D6E28(UnkStruct_ov77_021D6CFC *param0); +void ov77_021D6E40(UnkStruct_ov77_021D6CFC *param0); +void ov77_021D6E50(UnkStruct_ov77_021D6CFC *param0); +BOOL ov77_021D6E78(UnkStruct_ov77_021D6CFC *param0, const u8 param1, const int param2); #endif // POKEPLATINUM_OV77_021D6C70_H diff --git a/include/overlay079/ov79_021D0D80.h b/include/overlay079/ov79_021D0D80.h index 68569f78e4..3c990add2e 100644 --- a/include/overlay079/ov79_021D0D80.h +++ b/include/overlay079/ov79_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV79_021D0D80_H #define POKEPLATINUM_OV79_021D0D80_H +#include "overlay_manager.h" -int ov79_021D0D80(OverlayManager * param0, int * param1); -int ov79_021D0DC4(OverlayManager * param0, int * param1); -int ov79_021D0DDC(OverlayManager * param0, int * param1); +int ov79_021D0D80(OverlayManager *param0, int *param1); +int ov79_021D0DC4(OverlayManager *param0, int *param1); +int ov79_021D0DDC(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV79_021D0D80_H diff --git a/include/overlay079/ov79_021D183C.h b/include/overlay079/ov79_021D183C.h index 848dcbd1de..e6f6f5932b 100644 --- a/include/overlay079/ov79_021D183C.h +++ b/include/overlay079/ov79_021D183C.h @@ -3,15 +3,15 @@ #include "overlay079/struct_ov79_021D0E1C_decl.h" -void ov79_021D196C(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D1AB8(UnkStruct_ov79_021D0E1C * param0, BOOL param1); -void ov79_021D1B24(UnkStruct_ov79_021D0E1C * param0, u8 param1, u8 param2); -void ov79_021D1C44(UnkStruct_ov79_021D0E1C * param0, u8 param1); -void ov79_021D1ED8(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D1F60(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D1FBC(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D2008(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D2054(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D2078(UnkStruct_ov79_021D0E1C * param0); +void ov79_021D196C(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D1AB8(UnkStruct_ov79_021D0E1C *param0, BOOL param1); +void ov79_021D1B24(UnkStruct_ov79_021D0E1C *param0, u8 param1, u8 param2); +void ov79_021D1C44(UnkStruct_ov79_021D0E1C *param0, u8 param1); +void ov79_021D1ED8(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D1F60(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D1FBC(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D2008(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D2054(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D2078(UnkStruct_ov79_021D0E1C *param0); #endif // POKEPLATINUM_OV79_021D183C_H diff --git a/include/overlay079/ov79_021D20F4.h b/include/overlay079/ov79_021D20F4.h index 4ca76668dd..6f271f5ce5 100644 --- a/include/overlay079/ov79_021D20F4.h +++ b/include/overlay079/ov79_021D20F4.h @@ -3,9 +3,9 @@ #include "overlay079/struct_ov79_021D0E1C_decl.h" -void ov79_021D20F4(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D21CC(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D21F8(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D2214(UnkStruct_ov79_021D0E1C * param0, BOOL param1); +void ov79_021D20F4(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D21CC(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D21F8(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D2214(UnkStruct_ov79_021D0E1C *param0, BOOL param1); #endif // POKEPLATINUM_OV79_021D20F4_H diff --git a/include/overlay079/ov79_021D2268.h b/include/overlay079/ov79_021D2268.h index 636826147e..f6f42b90ab 100644 --- a/include/overlay079/ov79_021D2268.h +++ b/include/overlay079/ov79_021D2268.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV79_021D2268_H #define POKEPLATINUM_OV79_021D2268_H +#include "overlay_manager.h" -int ov79_021D22AC(OverlayManager * param0, int * param1); -int ov79_021D22E4(OverlayManager * param0, int * param1); -int ov79_021D2460(OverlayManager * param0, int * param1); +int ov79_021D22AC(OverlayManager *param0, int *param1); +int ov79_021D22E4(OverlayManager *param0, int *param1); +int ov79_021D2460(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV79_021D2268_H diff --git a/include/overlay079/ov79_021D3768.h b/include/overlay079/ov79_021D3768.h index 99e8984e2a..34e19054a3 100644 --- a/include/overlay079/ov79_021D3768.h +++ b/include/overlay079/ov79_021D3768.h @@ -4,8 +4,8 @@ #include "overlay079/struct_ov79_021D3820.h" #include "overlay079/struct_ov79_021D38D0.h" -void ov79_021D3768(UnkStruct_ov79_021D3820 * param0, UnkStruct_ov79_021D38D0 * param1, int param2); -void ov79_021D3820(UnkStruct_ov79_021D3820 * param0); -void ov79_021D385C(UnkStruct_ov79_021D3820 * param0); +void ov79_021D3768(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int param2); +void ov79_021D3820(UnkStruct_ov79_021D3820 *param0); +void ov79_021D385C(UnkStruct_ov79_021D3820 *param0); #endif // POKEPLATINUM_OV79_021D3768_H diff --git a/include/overlay079/struct_ov79_021D0E1C.h b/include/overlay079/struct_ov79_021D0E1C.h index 32c90bba8b..2e4a06545c 100644 --- a/include/overlay079/struct_ov79_021D0E1C.h +++ b/include/overlay079/struct_ov79_021D0E1C.h @@ -1,23 +1,25 @@ #ifndef POKEPLATINUM_STRUCT_OV79_021D0E1C_H #define POKEPLATINUM_STRUCT_OV79_021D0E1C_H +#include + #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_defs/struct_020158A8.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" +#include "struct_defs/struct_020158A8.h" #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0209903C.h" #include "struct_defs/struct_0209916C.h" + #include "overlay079/struct_ov79_021D0E1C_sub1.h" #include "overlay084/struct_ov84_02240FA8.h" -#include +#include "message.h" typedef struct UnkStruct_ov79_021D0E1C_t { int unk_00; @@ -34,32 +36,32 @@ typedef struct UnkStruct_ov79_021D0E1C_t { u8 unk_1D; u8 unk_1E; u8 unk_1F; - UnkStruct_0203D9B8 * unk_20; - BGL * unk_24; - UnkStruct_020158A8 * unk_28; - MessageLoader * unk_2C; + UnkStruct_0203D9B8 *unk_20; + BGL *unk_24; + UnkStruct_020158A8 *unk_28; + MessageLoader *unk_2C; UnkStruct_ov79_021D0E1C_sub1 unk_30; u16 unk_80; u16 unk_82; UnkStruct_ov84_02240FA8 unk_84; UnkStruct_ov84_02240FA8 unk_A4; - BmpList * unk_C4; - BmpList * unk_C8; - ResourceMetadata * unk_CC; - ResourceMetadata * unk_D0; - UIControlData * unk_D4; - void * unk_D8; - void * unk_DC; - NNSG2dScreenData * unk_E0; - NNSG2dScreenData * unk_E4; + BmpList *unk_C4; + BmpList *unk_C8; + ResourceMetadata *unk_CC; + ResourceMetadata *unk_D0; + UIControlData *unk_D4; + void *unk_D8; + void *unk_DC; + NNSG2dScreenData *unk_E0; + NNSG2dScreenData *unk_E4; Window unk_E8[13]; - SpriteRenderer * unk_1B8; - SpriteGfxHandler * unk_1BC; - GraphicElementData * unk_1C0[3]; - GraphicElementData * unk_1CC[5]; - GraphicElementData * unk_1E0[6]; - UnkStruct_0209903C * unk_1F8; - UnkStruct_0209916C * unk_1FC; + SpriteRenderer *unk_1B8; + SpriteGfxHandler *unk_1BC; + GraphicElementData *unk_1C0[3]; + GraphicElementData *unk_1CC[5]; + GraphicElementData *unk_1E0[6]; + UnkStruct_0209903C *unk_1F8; + UnkStruct_0209916C *unk_1FC; } UnkStruct_ov79_021D0E1C; #endif // POKEPLATINUM_STRUCT_OV79_021D0E1C_H diff --git a/include/overlay079/struct_ov79_021D0E1C_sub1.h b/include/overlay079/struct_ov79_021D0E1C_sub1.h index c50162f25c..42fdd875cc 100644 --- a/include/overlay079/struct_ov79_021D0E1C_sub1.h +++ b/include/overlay079/struct_ov79_021D0E1C_sub1.h @@ -1,20 +1,20 @@ #ifndef POKEPLATINUM_STRUCT_OV79_021D0E1C_SUB1_H #define POKEPLATINUM_STRUCT_OV79_021D0E1C_SUB1_H -#include "string_template.h" #include "strbuf.h" +#include "string_template.h" typedef struct { - StringTemplate * unk_00; - Strbuf* unk_04; - Strbuf* unk_08; - Strbuf* unk_0C; - Strbuf* unk_10; - Strbuf* unk_14; - Strbuf* unk_18; - Strbuf* unk_1C; - Strbuf* unk_20[6]; - Strbuf* unk_38[5]; + StringTemplate *unk_00; + Strbuf *unk_04; + Strbuf *unk_08; + Strbuf *unk_0C; + Strbuf *unk_10; + Strbuf *unk_14; + Strbuf *unk_18; + Strbuf *unk_1C; + Strbuf *unk_20[6]; + Strbuf *unk_38[5]; u8 unk_4C; u8 unk_4D[3]; } UnkStruct_ov79_021D0E1C_sub1; diff --git a/include/overlay079/struct_ov79_021D3820.h b/include/overlay079/struct_ov79_021D3820.h index 87a5131274..8bff57b77b 100644 --- a/include/overlay079/struct_ov79_021D3820.h +++ b/include/overlay079/struct_ov79_021D3820.h @@ -3,13 +3,14 @@ #include "struct_decls/sprite_decl.h" #include "struct_defs/archived_sprite.h" + #include "camera.h" typedef struct { - Camera * camera; - void * unk_04; + Camera *camera; + void *unk_04; ArchivedSprite unk_08; - Sprite * unk_18; + Sprite *unk_18; } UnkStruct_ov79_021D3820; #endif // POKEPLATINUM_STRUCT_OV79_021D3820_H diff --git a/include/overlay079/struct_ov79_021D38D0.h b/include/overlay079/struct_ov79_021D38D0.h index 4b6834d0e6..6b968654c9 100644 --- a/include/overlay079/struct_ov79_021D38D0.h +++ b/include/overlay079/struct_ov79_021D38D0.h @@ -1,17 +1,17 @@ #ifndef POKEPLATINUM_STRUCT_OV79_021D38D0_H #define POKEPLATINUM_STRUCT_OV79_021D38D0_H -#include "strbuf.h" #include "pokemon.h" +#include "strbuf.h" typedef struct { - Pokemon * unk_00; + Pokemon *unk_00; u16 unk_04; u8 unk_06; u8 unk_07; u8 unk_08; u8 unk_09; - Strbuf* unk_0C; + Strbuf *unk_0C; } UnkStruct_ov79_021D38D0; #endif // POKEPLATINUM_STRUCT_OV79_021D38D0_H diff --git a/include/overlay080/ov80_021D0D80.h b/include/overlay080/ov80_021D0D80.h index f54a0805ad..bed34293f7 100644 --- a/include/overlay080/ov80_021D0D80.h +++ b/include/overlay080/ov80_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV80_021D0D80_H #define POKEPLATINUM_OV80_021D0D80_H +#include "overlay_manager.h" -int ov80_021D0D80(OverlayManager * param0, int * param1); -int ov80_021D0DD8(OverlayManager * param0, int * param1); -int ov80_021D0E50(OverlayManager * param0, int * param1); +int ov80_021D0D80(OverlayManager *param0, int *param1); +int ov80_021D0DD8(OverlayManager *param0, int *param1); +int ov80_021D0E50(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV80_021D0D80_H diff --git a/include/overlay080/ov80_021D2A08.h b/include/overlay080/ov80_021D2A08.h index 4e07f3e272..80a2242055 100644 --- a/include/overlay080/ov80_021D2A08.h +++ b/include/overlay080/ov80_021D2A08.h @@ -3,9 +3,9 @@ #include "overlay080/struct_ov80_021D2A08.h" -void ov80_021D2A08(UnkStruct_ov80_021D2A08 * param0); -void ov80_021D2AC0(UnkStruct_ov80_021D2A08 * param0); -void ov80_021D2AE0(UnkStruct_ov80_021D2A08 * param0); -void ov80_021D2AEC(UnkStruct_ov80_021D2A08 * param0); +void ov80_021D2A08(UnkStruct_ov80_021D2A08 *param0); +void ov80_021D2AC0(UnkStruct_ov80_021D2A08 *param0); +void ov80_021D2AE0(UnkStruct_ov80_021D2A08 *param0); +void ov80_021D2AEC(UnkStruct_ov80_021D2A08 *param0); #endif // POKEPLATINUM_OV80_021D2A08_H diff --git a/include/overlay080/ov80_021D2AF4.h b/include/overlay080/ov80_021D2AF4.h index 9378b157fe..be39f8e7ed 100644 --- a/include/overlay080/ov80_021D2AF4.h +++ b/include/overlay080/ov80_021D2AF4.h @@ -3,18 +3,19 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" + #include "overlay080/struct_ov80_021D2AF4.h" #include "overlay080/struct_ov80_021D2C1C.h" #include "overlay080/struct_ov80_021D2C5C.h" #include "overlay080/struct_ov80_021D2E10.h" -UnkStruct_ov80_021D2C1C * ov80_021D2AF4(SpriteRenderer * param0, SpriteGfxHandler * param1, u8 * param2, short param3, int param4); -void ov80_021D2C1C(UnkStruct_ov80_021D2C1C * param0); -UnkStruct_ov80_021D2C5C * ov80_021D2C5C(UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int param3); -int ov80_021D2CC0(UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int param3); -void ov80_021D2D28(UnkStruct_ov80_021D2C1C * param0, int param1); -UnkStruct_ov80_021D2E10 * ov80_021D2D70(const char * param0, int param1); -void ov80_021D2E10(UnkStruct_ov80_021D2E10 * param0); -UnkStruct_ov80_021D2AF4 * ov80_021D2E24(UnkStruct_ov80_021D2E10 * param0, int param1, int param2, u16 param3); +UnkStruct_ov80_021D2C1C *ov80_021D2AF4(SpriteRenderer *param0, SpriteGfxHandler *param1, u8 *param2, short param3, int param4); +void ov80_021D2C1C(UnkStruct_ov80_021D2C1C *param0); +UnkStruct_ov80_021D2C5C *ov80_021D2C5C(UnkStruct_ov80_021D2C1C *param0, int param1, int param2, int param3); +int ov80_021D2CC0(UnkStruct_ov80_021D2C1C *param0, int param1, int param2, int param3); +void ov80_021D2D28(UnkStruct_ov80_021D2C1C *param0, int param1); +UnkStruct_ov80_021D2E10 *ov80_021D2D70(const char *param0, int param1); +void ov80_021D2E10(UnkStruct_ov80_021D2E10 *param0); +UnkStruct_ov80_021D2AF4 *ov80_021D2E24(UnkStruct_ov80_021D2E10 *param0, int param1, int param2, u16 param3); #endif // POKEPLATINUM_OV80_021D2AF4_H diff --git a/include/overlay080/struct_ov80_021D2A08.h b/include/overlay080/struct_ov80_021D2A08.h index d966924f2c..06d3f0ca26 100644 --- a/include/overlay080/struct_ov80_021D2A08.h +++ b/include/overlay080/struct_ov80_021D2A08.h @@ -1,20 +1,22 @@ #ifndef POKEPLATINUM_STRUCT_OV80_021D2A08_H #define POKEPLATINUM_STRUCT_OV80_021D2A08_H -#include "message.h" +#include + +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02039EBC_decl.h" #include "struct_defs/struct_0203D8AC.h" + #include "overlay080/struct_ov80_021D259C.h" #include "overlay080/struct_ov80_021D2AF4.h" #include "overlay080/struct_ov80_021D2C1C.h" #include "overlay080/struct_ov80_021D2E10.h" -#include +#include "message.h" +#include "strbuf.h" typedef struct UnkStruct_ov80_021D2A08_t { u8 unk_00; @@ -29,39 +31,39 @@ typedef struct UnkStruct_ov80_021D2A08_t { int unk_1C; int unk_20; int unk_24; - BGL * unk_28; - UnkStruct_0203D8AC * unk_2C; - UnkStruct_02039EBC * unk_30; - void * unk_34; - int (* unk_38)(struct UnkStruct_ov80_021D2A08_t *); - UnkStruct_ov80_021D2C1C * unk_3C; - UnkStruct_ov80_021D2E10 * unk_40; + BGL *unk_28; + UnkStruct_0203D8AC *unk_2C; + UnkStruct_02039EBC *unk_30; + void *unk_34; + int (*unk_38)(struct UnkStruct_ov80_021D2A08_t *); + UnkStruct_ov80_021D2C1C *unk_3C; + UnkStruct_ov80_021D2E10 *unk_40; UnkStruct_ov80_021D259C unk_44[5]; - MessageLoader * unk_80; - MessageLoader * unk_84; - Strbuf* unk_88; + MessageLoader *unk_80; + MessageLoader *unk_84; + Strbuf *unk_88; int unk_8C; int unk_90; - UnkStruct_ov80_021D2AF4 * unk_94; - void * unk_98; - void * unk_9C; - void * unk_A0; - void * unk_A4; - void * unk_A8; - void * unk_AC; - void * unk_B0; - void * unk_B4; - NNSG2dScreenData * unk_B8; - NNSG2dScreenData * unk_BC; - NNSG2dScreenData * unk_C0; - NNSG2dScreenData * unk_C4; - NNSG2dScreenData * unk_C8; - NNSG2dScreenData * unk_CC; - NNSG2dScreenData * unk_D0; - NNSG2dScreenData * unk_D4; - SpriteRenderer * unk_D8; - SpriteGfxHandler * unk_DC; - CellActorData * unk_E0; + UnkStruct_ov80_021D2AF4 *unk_94; + void *unk_98; + void *unk_9C; + void *unk_A0; + void *unk_A4; + void *unk_A8; + void *unk_AC; + void *unk_B0; + void *unk_B4; + NNSG2dScreenData *unk_B8; + NNSG2dScreenData *unk_BC; + NNSG2dScreenData *unk_C0; + NNSG2dScreenData *unk_C4; + NNSG2dScreenData *unk_C8; + NNSG2dScreenData *unk_CC; + NNSG2dScreenData *unk_D0; + NNSG2dScreenData *unk_D4; + SpriteRenderer *unk_D8; + SpriteGfxHandler *unk_DC; + CellActorData *unk_E0; } UnkStruct_ov80_021D2A08; #endif // POKEPLATINUM_STRUCT_OV80_021D2A08_H diff --git a/include/overlay080/struct_ov80_021D2C1C.h b/include/overlay080/struct_ov80_021D2C1C.h index e910ca153c..be989a2eb2 100644 --- a/include/overlay080/struct_ov80_021D2C1C.h +++ b/include/overlay080/struct_ov80_021D2C1C.h @@ -7,8 +7,8 @@ typedef struct { u16 unk_00; u8 unk_02; u8 unk_03; - UnkStruct_ov80_021D2C5C * unk_04; - UnkStruct_ov80_021D2C5C * unk_08; + UnkStruct_ov80_021D2C5C *unk_04; + UnkStruct_ov80_021D2C5C *unk_08; } UnkStruct_ov80_021D2C1C; #endif // POKEPLATINUM_STRUCT_OV80_021D2C1C_H diff --git a/include/overlay080/struct_ov80_021D2C5C.h b/include/overlay080/struct_ov80_021D2C5C.h index 84ed4d5ea6..ce71489216 100644 --- a/include/overlay080/struct_ov80_021D2C5C.h +++ b/include/overlay080/struct_ov80_021D2C5C.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_STRUCT_OV80_021D2C5C_H #include "struct_decls/struct_02022550_decl.h" + #include "overlay080/struct_ov80_021D2C5C_sub1.h" typedef struct { UnkStruct_ov80_021D2C5C_sub1 unk_00; int unk_14; - GraphicElementData * unk_18; + GraphicElementData *unk_18; } UnkStruct_ov80_021D2C5C; #endif // POKEPLATINUM_STRUCT_OV80_021D2C5C_H diff --git a/include/overlay080/struct_ov80_021D2E10.h b/include/overlay080/struct_ov80_021D2E10.h index a8196c5e0b..1e1ac93c96 100644 --- a/include/overlay080/struct_ov80_021D2E10.h +++ b/include/overlay080/struct_ov80_021D2E10.h @@ -5,7 +5,7 @@ typedef struct { int unk_00; - UnkStruct_ov80_021D2AF4 * unk_04; + UnkStruct_ov80_021D2AF4 *unk_04; } UnkStruct_ov80_021D2E10; #endif // POKEPLATINUM_STRUCT_OV80_021D2E10_H diff --git a/include/overlay080/struct_ov80_021D2E94.h b/include/overlay080/struct_ov80_021D2E94.h index ac7a960044..440e2d7e9e 100644 --- a/include/overlay080/struct_ov80_021D2E94.h +++ b/include/overlay080/struct_ov80_021D2E94.h @@ -4,15 +4,15 @@ #include "overlay080/struct_ov80_021D2A08.h" typedef struct { - int (* unk_00)(UnkStruct_ov80_021D2A08 *); - int (* unk_04)(UnkStruct_ov80_021D2A08 *); - int (* unk_08)(UnkStruct_ov80_021D2A08 *); - int (* unk_0C)(UnkStruct_ov80_021D2A08 *); - int (* unk_10)(UnkStruct_ov80_021D2A08 *); - int (* unk_14)(UnkStruct_ov80_021D2A08 *); - int (* unk_18)(UnkStruct_ov80_021D2A08 *); - int (* unk_1C)(UnkStruct_ov80_021D2A08 *); - int (* unk_20)(UnkStruct_ov80_021D2A08 *); + int (*unk_00)(UnkStruct_ov80_021D2A08 *); + int (*unk_04)(UnkStruct_ov80_021D2A08 *); + int (*unk_08)(UnkStruct_ov80_021D2A08 *); + int (*unk_0C)(UnkStruct_ov80_021D2A08 *); + int (*unk_10)(UnkStruct_ov80_021D2A08 *); + int (*unk_14)(UnkStruct_ov80_021D2A08 *); + int (*unk_18)(UnkStruct_ov80_021D2A08 *); + int (*unk_1C)(UnkStruct_ov80_021D2A08 *); + int (*unk_20)(UnkStruct_ov80_021D2A08 *); } UnkStruct_ov80_021D2E94; #endif // POKEPLATINUM_STRUCT_OV80_021D2E94_H diff --git a/include/overlay081/ov81_021D0D80.h b/include/overlay081/ov81_021D0D80.h index b2d22ea8b3..d78c61ae99 100644 --- a/include/overlay081/ov81_021D0D80.h +++ b/include/overlay081/ov81_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV81_021D0D80_H #define POKEPLATINUM_OV81_021D0D80_H +#include "overlay_manager.h" -int ov81_021D0D80(OverlayManager * param0, int * param1); -int ov81_021D0E70(OverlayManager * param0, int * param1); -int ov81_021D0EC4(OverlayManager * param0, int * param1); +int ov81_021D0D80(OverlayManager *param0, int *param1); +int ov81_021D0E70(OverlayManager *param0, int *param1); +int ov81_021D0EC4(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV81_021D0D80_H diff --git a/include/overlay081/ov81_021D1610.h b/include/overlay081/ov81_021D1610.h index aa77a2d013..67b4b115c3 100644 --- a/include/overlay081/ov81_021D1610.h +++ b/include/overlay081/ov81_021D1610.h @@ -3,8 +3,8 @@ #include "overlay081/struct_ov81_021D1610.h" -void ov81_021D1610(UnkStruct_ov81_021D1610 * param0); -void ov81_021D1634(UnkStruct_ov81_021D1610 * param0); -void ov81_021D164C(UnkStruct_ov81_021D1610 * param0, u32 param1); +void ov81_021D1610(UnkStruct_ov81_021D1610 *param0); +void ov81_021D1634(UnkStruct_ov81_021D1610 *param0); +void ov81_021D164C(UnkStruct_ov81_021D1610 *param0, u32 param1); #endif // POKEPLATINUM_OV81_021D1610_H diff --git a/include/overlay081/struct_ov81_021D1610.h b/include/overlay081/struct_ov81_021D1610.h index 3cf2eee743..d7a0bc31aa 100644 --- a/include/overlay081/struct_ov81_021D1610.h +++ b/include/overlay081/struct_ov81_021D1610.h @@ -1,24 +1,25 @@ #ifndef POKEPLATINUM_STRUCT_OV81_021D1610_H #define POKEPLATINUM_STRUCT_OV81_021D1610_H -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "journal.h" #include "struct_defs/struct_0205AA50.h" + +#include "journal.h" +#include "message.h" #include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" typedef struct { - BGL * unk_00; + BGL *unk_00; Window unk_04[4]; - Journal * unk_44; - TrainerInfo * unk_48; - SaveData * unk_4C; - MessageLoader * unk_50; - StringTemplate * unk_54; - Strbuf* unk_58; + Journal *unk_44; + TrainerInfo *unk_48; + SaveData *unk_4C; + MessageLoader *unk_50; + StringTemplate *unk_54; + Strbuf *unk_58; u16 unk_5C[1024]; u16 unk_85C[1024]; s8 unk_105C; diff --git a/include/overlay082/ov82_0223B140.h b/include/overlay082/ov82_0223B140.h index d2f286467e..22e72f9e4d 100644 --- a/include/overlay082/ov82_0223B140.h +++ b/include/overlay082/ov82_0223B140.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_OV82_0223B140_H #define POKEPLATINUM_OV82_0223B140_H +#include "overlay_manager.h" -BOOL ov82_0223B140(OverlayManager ** param0); -int ov82_0223B164(OverlayManager * param0, int * param1); -int ov82_0223B1D4(OverlayManager * param0, int * param1); -int ov82_0223B24C(OverlayManager * param0, int * param1); +BOOL ov82_0223B140(OverlayManager **param0); +int ov82_0223B164(OverlayManager *param0, int *param1); +int ov82_0223B1D4(OverlayManager *param0, int *param1); +int ov82_0223B24C(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV82_0223B140_H diff --git a/include/overlay082/ov82_0223B2E0.h b/include/overlay082/ov82_0223B2E0.h index f976b2096e..612eb79e5b 100644 --- a/include/overlay082/ov82_0223B2E0.h +++ b/include/overlay082/ov82_0223B2E0.h @@ -3,9 +3,9 @@ #include "overlay083/struct_ov83_0223C344.h" -int ov82_0223B2E0(UnkStruct_ov83_0223C344 * param0, int * param1); -int ov82_0223B330(UnkStruct_ov83_0223C344 * param0, int * param1); -int ov82_0223B35C(UnkStruct_ov83_0223C344 * param0, int * param1); -int ov82_0223B37C(UnkStruct_ov83_0223C344 * param0, int * param1); +int ov82_0223B2E0(UnkStruct_ov83_0223C344 *param0, int *param1); +int ov82_0223B330(UnkStruct_ov83_0223C344 *param0, int *param1); +int ov82_0223B35C(UnkStruct_ov83_0223C344 *param0, int *param1); +int ov82_0223B37C(UnkStruct_ov83_0223C344 *param0, int *param1); #endif // POKEPLATINUM_OV82_0223B2E0_H diff --git a/include/overlay082/struct_ov82_0223B164.h b/include/overlay082/struct_ov82_0223B164.h index 74ae1dbd9a..057f9693aa 100644 --- a/include/overlay082/struct_ov82_0223B164.h +++ b/include/overlay082/struct_ov82_0223B164.h @@ -1,22 +1,23 @@ #ifndef POKEPLATINUM_STRUCT_OV82_0223B164_H #define POKEPLATINUM_STRUCT_OV82_0223B164_H -#include "trainer_info.h" -#include "game_options.h" #include "struct_decls/struct_0202AB28_decl.h" -#include "journal.h" + #include "bag.h" +#include "game_options.h" +#include "journal.h" #include "savedata.h" +#include "trainer_info.h" typedef struct { u8 padding_00[4]; int unk_04; - UnkStruct_0202AB28 * unk_08; - SaveData * unk_0C; - TrainerInfo * unk_10; - Bag * unk_14; - Options * unk_18; - Journal * unk_1C; + UnkStruct_0202AB28 *unk_08; + SaveData *unk_0C; + TrainerInfo *unk_10; + Bag *unk_14; + Options *unk_18; + Journal *unk_1C; BOOL unk_20; BOOL unk_24; } UnkStruct_ov82_0223B164; diff --git a/include/overlay083/ov83_0223B5A0.h b/include/overlay083/ov83_0223B5A0.h index fd58b5e3a2..f948b326f5 100644 --- a/include/overlay083/ov83_0223B5A0.h +++ b/include/overlay083/ov83_0223B5A0.h @@ -3,8 +3,8 @@ #include "overlay083/struct_ov83_0223B784.h" -void ov83_0223B774(UnkStruct_ov83_0223B784 * param0, int param1); -void ov83_0223B77C(UnkStruct_ov83_0223B784 * param0, int param1); -void ov83_0223B784(UnkStruct_ov83_0223B784 * param0); +void ov83_0223B774(UnkStruct_ov83_0223B784 *param0, int param1); +void ov83_0223B77C(UnkStruct_ov83_0223B784 *param0, int param1); +void ov83_0223B784(UnkStruct_ov83_0223B784 *param0); #endif // POKEPLATINUM_OV83_0223B5A0_H diff --git a/include/overlay083/ov83_0223C958.h b/include/overlay083/ov83_0223C958.h index 2db1240a8b..a13a6e5faa 100644 --- a/include/overlay083/ov83_0223C958.h +++ b/include/overlay083/ov83_0223C958.h @@ -3,11 +3,11 @@ #include "overlay083/struct_ov83_0223B784.h" -void ov83_0223C958(UnkStruct_ov83_0223B784 * param0); -void ov83_0223CAA4(UnkStruct_ov83_0223B784 * param0); -int ov83_0223CB5C(UnkStruct_ov83_0223B784 * param0, int * param1); -int ov83_0223CB8C(UnkStruct_ov83_0223B784 * param0, int * param1); -void ov83_0223CBA4(UnkStruct_ov83_0223B784 * param0); -void ov83_0223CBFC(UnkStruct_ov83_0223B784 * param0); +void ov83_0223C958(UnkStruct_ov83_0223B784 *param0); +void ov83_0223CAA4(UnkStruct_ov83_0223B784 *param0); +int ov83_0223CB5C(UnkStruct_ov83_0223B784 *param0, int *param1); +int ov83_0223CB8C(UnkStruct_ov83_0223B784 *param0, int *param1); +void ov83_0223CBA4(UnkStruct_ov83_0223B784 *param0); +void ov83_0223CBFC(UnkStruct_ov83_0223B784 *param0); #endif // POKEPLATINUM_OV83_0223C958_H diff --git a/include/overlay083/ov83_0223D144.h b/include/overlay083/ov83_0223D144.h index 0a4d89ad25..6666a3432c 100644 --- a/include/overlay083/ov83_0223D144.h +++ b/include/overlay083/ov83_0223D144.h @@ -3,7 +3,7 @@ #include "struct_defs/struct_02039A58.h" -const CommCmdTable * ov83_0223D144(void); +const CommCmdTable *ov83_0223D144(void); int ov83_0223D14C(void); #endif // POKEPLATINUM_OV83_0223D144_H diff --git a/include/overlay083/ov83_0223D150.h b/include/overlay083/ov83_0223D150.h index 20acb6e4a1..3ea9039b76 100644 --- a/include/overlay083/ov83_0223D150.h +++ b/include/overlay083/ov83_0223D150.h @@ -1,22 +1,23 @@ #ifndef POKEPLATINUM_OV83_0223D150_H #define POKEPLATINUM_OV83_0223D150_H -#include "trainer_info.h" #include "overlay083/struct_ov83_0223B784.h" -void ov83_0223D150(UnkStruct_ov83_0223B784 * param0, TrainerInfo * param1); -void ov83_0223D1EC(UnkStruct_ov83_0223B784 * param0); -void ov83_0223D204(int param0, int param1, void * param2, void * param3); -void ov83_0223D210(int param0, int param1, void * param2, void * param3); -void ov83_0223D21C(int param0, int param1, void * param2, void * param3); -void ov83_0223D258(int param0, int param1, void * param2, void * param3); -void ov83_0223D2E8(int param0, int param1, void * param2, void * param3); -void ov83_0223D354(int param0, int param1, void * param2, void * param3); -void ov83_0223D3A8(int param0, int param1, void * param2, void * param3); -void ov83_0223D3D8(int param0, int param1, void * param2, void * param3); -void ov83_0223D3F8(int param0, int param1, void * param2, void * param3); -void ov83_0223D410(int param0, int param1, void * param2, void * param3); -void ov83_0223D430(int param0, int param1, void * param2, void * param3); +#include "trainer_info.h" + +void ov83_0223D150(UnkStruct_ov83_0223B784 *param0, TrainerInfo *param1); +void ov83_0223D1EC(UnkStruct_ov83_0223B784 *param0); +void ov83_0223D204(int param0, int param1, void *param2, void *param3); +void ov83_0223D210(int param0, int param1, void *param2, void *param3); +void ov83_0223D21C(int param0, int param1, void *param2, void *param3); +void ov83_0223D258(int param0, int param1, void *param2, void *param3); +void ov83_0223D2E8(int param0, int param1, void *param2, void *param3); +void ov83_0223D354(int param0, int param1, void *param2, void *param3); +void ov83_0223D3A8(int param0, int param1, void *param2, void *param3); +void ov83_0223D3D8(int param0, int param1, void *param2, void *param3); +void ov83_0223D3F8(int param0, int param1, void *param2, void *param3); +void ov83_0223D410(int param0, int param1, void *param2, void *param3); +void ov83_0223D430(int param0, int param1, void *param2, void *param3); int ov83_0223D4AC(void); int ov83_0223D4B0(void); int ov83_0223D4B4(void); diff --git a/include/overlay083/ov83_0223D4CC.h b/include/overlay083/ov83_0223D4CC.h index affe068c26..283c769e14 100644 --- a/include/overlay083/ov83_0223D4CC.h +++ b/include/overlay083/ov83_0223D4CC.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV83_0223D4CC_H #include "struct_defs/struct_02039A58.h" + #include "overlay083/struct_ov83_0223D4CC_decl.h" -UnkStruct_ov83_0223D4CC * ov83_0223D4CC(const CommCmdTable * param0, int param1, void * param2, int param3, int param4); -BOOL ov83_0223D508(int param0, const void * param1, int param2, UnkStruct_ov83_0223D4CC * param3); -void ov83_0223D558(UnkStruct_ov83_0223D4CC * param0); -int ov83_0223D570(UnkStruct_ov83_0223D4CC * param0); +UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, void *param2, int param3, int param4); +BOOL ov83_0223D508(int param0, const void *param1, int param2, UnkStruct_ov83_0223D4CC *param3); +void ov83_0223D558(UnkStruct_ov83_0223D4CC *param0); +int ov83_0223D570(UnkStruct_ov83_0223D4CC *param0); #endif // POKEPLATINUM_OV83_0223D4CC_H diff --git a/include/overlay083/ov83_0223D6A8.h b/include/overlay083/ov83_0223D6A8.h index 969f247f5e..e8d29bee1f 100644 --- a/include/overlay083/ov83_0223D6A8.h +++ b/include/overlay083/ov83_0223D6A8.h @@ -1,11 +1,14 @@ #ifndef POKEPLATINUM_OV83_0223D6A8_H #define POKEPLATINUM_OV83_0223D6A8_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" + #include "overlay083/struct_ov83_0223D4CC_decl.h" #include "overlay083/struct_ov83_0223D784.h" #include "overlay083/struct_ov83_0223D95C.h" @@ -26,95 +29,93 @@ #include "overlay083/struct_ov83_0223F7A4.h" #include "overlay083/struct_ov83_0223FE50.h" -#include - -void ov83_0223D754(UnkStruct_ov83_0223D784 * param0, int param1, int param2, int param3); -void ov83_0223D784(UnkStruct_ov83_0223D784 * param0); -void ov83_0223D7A8(UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, NARC * param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9); -void ov83_0223D894(UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, NARC * param2, UnkStruct_02009DC8 * param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov83_0223D95C(UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1); -GraphicElementData * ov83_0223D9A8(UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6); -void ov83_0223D9DC(UnkStruct_ov83_0223D9EC * param0, fx32 param1, fx32 param2, int param3); -BOOL ov83_0223D9EC(UnkStruct_ov83_0223D9EC * param0); -void ov83_0223DA34(UnkStruct_ov83_0223DA94 * param0, fx32 param1, fx32 param2, fx32 param3, int param4); -BOOL ov83_0223DA94(UnkStruct_ov83_0223DA94 * param0); +void ov83_0223D754(UnkStruct_ov83_0223D784 *param0, int param1, int param2, int param3); +void ov83_0223D784(UnkStruct_ov83_0223D784 *param0); +void ov83_0223D7A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, NARC *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9); +void ov83_0223D894(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, NARC *param2, UnkStruct_02009DC8 *param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void ov83_0223D95C(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1); +GraphicElementData *ov83_0223D9A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6); +void ov83_0223D9DC(UnkStruct_ov83_0223D9EC *param0, fx32 param1, fx32 param2, int param3); +BOOL ov83_0223D9EC(UnkStruct_ov83_0223D9EC *param0); +void ov83_0223DA34(UnkStruct_ov83_0223DA94 *param0, fx32 param1, fx32 param2, fx32 param3, int param4); +BOOL ov83_0223DA94(UnkStruct_ov83_0223DA94 *param0); VecFx32 ov83_0223DAFC(fx32 param0, fx32 param1, fx32 param2); -void ov83_0223DB18(UnkStruct_ov83_0223DB30 * param0, int param1); -void ov83_0223DB30(UnkStruct_ov83_0223DB30 * param0); -void ov83_0223DB4C(UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223DB4C * param1, UnkStruct_ov83_0223D784 * param2, UnkStruct_ov83_0223D95C * param3, u32 param4); -void ov83_0223DC1C(UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223D784 * param1); -void ov83_0223DC68(UnkStruct_ov83_0223DB30 * param0); -u32 ov83_0223DD30(UnkStruct_ov83_0223DB30 * param0); -void ov83_0223DEA0(UnkStruct_ov83_0223E138 * param0, int param1, UnkStruct_ov83_0223DEA0 * param2, UnkStruct_ov83_0223FE50 * param3, int param4, u32 param5); -void ov83_0223DEC4(UnkStruct_ov83_0223E138 * param0); -void ov83_0223DEE0(UnkStruct_ov83_0223E138 * param0, BGL * param1, u32 param2, NARC * param3); -void ov83_0223DF10(UnkStruct_ov83_0223E138 * param0); -void ov83_0223DF30(UnkStruct_ov83_0223E138 * param0, int param1); -void ov83_0223DF70(UnkStruct_ov83_0223E138 * param0); -void ov83_0223DF84(UnkStruct_ov83_0223E138 * param0); -void ov83_0223DFAC(UnkStruct_ov83_0223E138 * param0); -void ov83_0223E244(UnkStruct_ov83_0223E244 * param0); -void ov83_0223E260(UnkStruct_ov83_0223E244 * param0); -void ov83_0223E28C(UnkStruct_ov83_0223E244 * param0, UnkStruct_ov83_0223D784 * param1, UnkStruct_ov83_0223D95C * param2, u32 param3, u32 param4, u32 param5); -void ov83_0223E2C8(UnkStruct_ov83_0223E244 * param0); -void ov83_0223E2E4(UnkStruct_ov83_0223E244 * param0); -void ov83_0223E2FC(UnkStruct_ov83_0223E244 * param0); -BOOL ov83_0223E32C(UnkStruct_ov83_0223E244 * param0); -void ov83_0223E340(UnkStruct_ov83_0223E340 * param0); -void ov83_0223E34C(UnkStruct_ov83_0223E340 * param0); -void ov83_0223E368(UnkStruct_ov83_0223E340 * param0, UnkStruct_02015064 * param1, u32 param2, NARC * param3); -void ov83_0223E438(UnkStruct_ov83_0223E340 * param0); -void ov83_0223E484(UnkStruct_ov83_0223E340 * param0, u32 param1, BOOL param2); -void ov83_0223E4A4(UnkStruct_ov83_0223E340 * param0, u16 param1); -void ov83_0223E4C0(UnkStruct_ov83_0223E340 * param0, fx32 param1); -void ov83_0223E4E0(UnkStruct_ov83_0223E340 * param0, u32 param1, u32 param2); -void ov83_0223E500(UnkStruct_ov83_0223E340 * param0); -void ov83_0223E51C(UnkStruct_ov83_0223E340 * param0, int param1); -void ov83_0223E5A4(UnkStruct_ov83_0223E5C0 * param0, const UnkStruct_ov83_0223FE50 * param1, u32 param2, UnkStruct_ov83_0223D4CC * param3); -void ov83_0223E5C0(UnkStruct_ov83_0223E5C0 * param0); -void ov83_0223E5DC(UnkStruct_ov83_0223E5C0 * param0, UnkStruct_ov83_0223D784 * param1, UnkStruct_ov83_0223D95C * param2, u32 param3); -void ov83_0223E63C(UnkStruct_ov83_0223E5C0 * param0); -void ov83_0223E658(UnkStruct_ov83_0223E5C0 * param0); -void ov83_0223E69C(UnkStruct_ov83_0223E5C0 * param0, BOOL param1); -void ov83_0223E6D4(UnkStruct_ov83_0223E824 * param0, int param1, UnkStruct_ov83_0223DEA0 * param2, UnkStruct_ov83_0223FE50 * param3, int param4, u32 param5); -void ov83_0223E6F8(UnkStruct_ov83_0223E824 * param0); -void ov83_0223E720(UnkStruct_ov83_0223E824 * param0, BGL * param1, u32 param2, NARC * param3); -void ov83_0223E760(UnkStruct_ov83_0223E824 * param0); -void ov83_0223E908(UnkStruct_ov83_0223E824 * param0, u32 param1); -BOOL ov83_0223E984(const UnkStruct_ov83_0223E824 * param0); -void ov83_0223E994(UnkStruct_ov83_0223E824 * param0); -void ov83_0223E9BC(UnkStruct_ov83_0223E824 * param0); -void ov83_0223E9D0(UnkStruct_ov83_0223E824 * param0); -void ov83_0223EC4C(UnkStruct_ov83_0223E824 * param0, u32 param1); -void ov83_0223EC70(UnkStruct_ov83_0223E824 * param0); -void ov83_0223EC8C(UnkStruct_ov83_0223E824 * param0, u32 param1); -void ov83_0223ED3C(UnkStruct_ov83_0223ED3C * param0); -void ov83_0223ED4C(UnkStruct_ov83_0223ED3C * param0); -void ov83_0223ED6C(UnkStruct_ov83_0223ED3C * param0, UnkStruct_ov83_0223D784 * param1, UnkStruct_ov83_0223D95C * param2, u32 param3); -void ov83_0223ED78(UnkStruct_ov83_0223ED3C * param0); -void ov83_0223EDA4(UnkStruct_ov83_0223ED3C * param0, UnkStruct_ov83_0223FE50 * param1); -void ov83_0223EDDC(UnkStruct_ov83_0223ED3C * param0, int param1, int param2); -void ov83_0223EFCC(UnkStruct_ov83_0223ED3C * param0); -void ov83_0223F29C(UnkStruct_ov83_0223F29C * param0); -void ov83_0223F2A8(UnkStruct_ov83_0223F29C * param0); -void ov83_0223F2C4(UnkStruct_ov83_0223F29C * param0, UnkStruct_ov83_0223D784 * param1, u32 param2, NARC * param3); -void ov83_0223F348(UnkStruct_ov83_0223F29C * param0); -void ov83_0223F378(UnkStruct_ov83_0223F29C * param0); -void ov83_0223F3A0(UnkStruct_ov83_0223F29C * param0, int param1); -void ov83_0223F3D0(UnkStruct_ov83_0223F29C * param0, int param1); -BOOL ov83_0223F3F0(const UnkStruct_ov83_0223F29C * param0, int param1); -void ov83_0223F494(UnkStruct_ov83_0223F4AC * param0, int param1); -void ov83_0223F4AC(UnkStruct_ov83_0223F4AC * param0); -void ov83_0223F4CC(UnkStruct_ov83_0223F4AC * param0, UnkStruct_ov83_0223D784 * param1, UnkStruct_ov83_0223D95C * param2, u32 param3); -void ov83_0223F510(UnkStruct_ov83_0223F4AC * param0); -void ov83_0223F52C(UnkStruct_ov83_0223F4AC * param0); -void ov83_0223F544(UnkStruct_ov83_0223F4AC * param0, int param1, int param2); -void ov83_0223F730(UnkStruct_ov83_0223F770 * param0, int param1, int param2, int param3, int param4); -void ov83_0223F770(UnkStruct_ov83_0223F770 * param0); -void ov83_0223F784(UnkStruct_ov83_0223F770 * param0); -void ov83_0223F790(UnkStruct_ov83_0223F7A4 * param0, int param1, BGL * param2); -void ov83_0223F7A4(UnkStruct_ov83_0223F7A4 * param0); -void ov83_0223F7B0(UnkStruct_ov83_0223F7A4 * param0); -u32 ov83_0223F7DC(UnkStruct_ov83_0223F7A4 * param0); +void ov83_0223DB18(UnkStruct_ov83_0223DB30 *param0, int param1); +void ov83_0223DB30(UnkStruct_ov83_0223DB30 *param0); +void ov83_0223DB4C(UnkStruct_ov83_0223DB30 *param0, UnkStruct_ov83_0223DB4C *param1, UnkStruct_ov83_0223D784 *param2, UnkStruct_ov83_0223D95C *param3, u32 param4); +void ov83_0223DC1C(UnkStruct_ov83_0223DB30 *param0, UnkStruct_ov83_0223D784 *param1); +void ov83_0223DC68(UnkStruct_ov83_0223DB30 *param0); +u32 ov83_0223DD30(UnkStruct_ov83_0223DB30 *param0); +void ov83_0223DEA0(UnkStruct_ov83_0223E138 *param0, int param1, UnkStruct_ov83_0223DEA0 *param2, UnkStruct_ov83_0223FE50 *param3, int param4, u32 param5); +void ov83_0223DEC4(UnkStruct_ov83_0223E138 *param0); +void ov83_0223DEE0(UnkStruct_ov83_0223E138 *param0, BGL *param1, u32 param2, NARC *param3); +void ov83_0223DF10(UnkStruct_ov83_0223E138 *param0); +void ov83_0223DF30(UnkStruct_ov83_0223E138 *param0, int param1); +void ov83_0223DF70(UnkStruct_ov83_0223E138 *param0); +void ov83_0223DF84(UnkStruct_ov83_0223E138 *param0); +void ov83_0223DFAC(UnkStruct_ov83_0223E138 *param0); +void ov83_0223E244(UnkStruct_ov83_0223E244 *param0); +void ov83_0223E260(UnkStruct_ov83_0223E244 *param0); +void ov83_0223E28C(UnkStruct_ov83_0223E244 *param0, UnkStruct_ov83_0223D784 *param1, UnkStruct_ov83_0223D95C *param2, u32 param3, u32 param4, u32 param5); +void ov83_0223E2C8(UnkStruct_ov83_0223E244 *param0); +void ov83_0223E2E4(UnkStruct_ov83_0223E244 *param0); +void ov83_0223E2FC(UnkStruct_ov83_0223E244 *param0); +BOOL ov83_0223E32C(UnkStruct_ov83_0223E244 *param0); +void ov83_0223E340(UnkStruct_ov83_0223E340 *param0); +void ov83_0223E34C(UnkStruct_ov83_0223E340 *param0); +void ov83_0223E368(UnkStruct_ov83_0223E340 *param0, UnkStruct_02015064 *param1, u32 param2, NARC *param3); +void ov83_0223E438(UnkStruct_ov83_0223E340 *param0); +void ov83_0223E484(UnkStruct_ov83_0223E340 *param0, u32 param1, BOOL param2); +void ov83_0223E4A4(UnkStruct_ov83_0223E340 *param0, u16 param1); +void ov83_0223E4C0(UnkStruct_ov83_0223E340 *param0, fx32 param1); +void ov83_0223E4E0(UnkStruct_ov83_0223E340 *param0, u32 param1, u32 param2); +void ov83_0223E500(UnkStruct_ov83_0223E340 *param0); +void ov83_0223E51C(UnkStruct_ov83_0223E340 *param0, int param1); +void ov83_0223E5A4(UnkStruct_ov83_0223E5C0 *param0, const UnkStruct_ov83_0223FE50 *param1, u32 param2, UnkStruct_ov83_0223D4CC *param3); +void ov83_0223E5C0(UnkStruct_ov83_0223E5C0 *param0); +void ov83_0223E5DC(UnkStruct_ov83_0223E5C0 *param0, UnkStruct_ov83_0223D784 *param1, UnkStruct_ov83_0223D95C *param2, u32 param3); +void ov83_0223E63C(UnkStruct_ov83_0223E5C0 *param0); +void ov83_0223E658(UnkStruct_ov83_0223E5C0 *param0); +void ov83_0223E69C(UnkStruct_ov83_0223E5C0 *param0, BOOL param1); +void ov83_0223E6D4(UnkStruct_ov83_0223E824 *param0, int param1, UnkStruct_ov83_0223DEA0 *param2, UnkStruct_ov83_0223FE50 *param3, int param4, u32 param5); +void ov83_0223E6F8(UnkStruct_ov83_0223E824 *param0); +void ov83_0223E720(UnkStruct_ov83_0223E824 *param0, BGL *param1, u32 param2, NARC *param3); +void ov83_0223E760(UnkStruct_ov83_0223E824 *param0); +void ov83_0223E908(UnkStruct_ov83_0223E824 *param0, u32 param1); +BOOL ov83_0223E984(const UnkStruct_ov83_0223E824 *param0); +void ov83_0223E994(UnkStruct_ov83_0223E824 *param0); +void ov83_0223E9BC(UnkStruct_ov83_0223E824 *param0); +void ov83_0223E9D0(UnkStruct_ov83_0223E824 *param0); +void ov83_0223EC4C(UnkStruct_ov83_0223E824 *param0, u32 param1); +void ov83_0223EC70(UnkStruct_ov83_0223E824 *param0); +void ov83_0223EC8C(UnkStruct_ov83_0223E824 *param0, u32 param1); +void ov83_0223ED3C(UnkStruct_ov83_0223ED3C *param0); +void ov83_0223ED4C(UnkStruct_ov83_0223ED3C *param0); +void ov83_0223ED6C(UnkStruct_ov83_0223ED3C *param0, UnkStruct_ov83_0223D784 *param1, UnkStruct_ov83_0223D95C *param2, u32 param3); +void ov83_0223ED78(UnkStruct_ov83_0223ED3C *param0); +void ov83_0223EDA4(UnkStruct_ov83_0223ED3C *param0, UnkStruct_ov83_0223FE50 *param1); +void ov83_0223EDDC(UnkStruct_ov83_0223ED3C *param0, int param1, int param2); +void ov83_0223EFCC(UnkStruct_ov83_0223ED3C *param0); +void ov83_0223F29C(UnkStruct_ov83_0223F29C *param0); +void ov83_0223F2A8(UnkStruct_ov83_0223F29C *param0); +void ov83_0223F2C4(UnkStruct_ov83_0223F29C *param0, UnkStruct_ov83_0223D784 *param1, u32 param2, NARC *param3); +void ov83_0223F348(UnkStruct_ov83_0223F29C *param0); +void ov83_0223F378(UnkStruct_ov83_0223F29C *param0); +void ov83_0223F3A0(UnkStruct_ov83_0223F29C *param0, int param1); +void ov83_0223F3D0(UnkStruct_ov83_0223F29C *param0, int param1); +BOOL ov83_0223F3F0(const UnkStruct_ov83_0223F29C *param0, int param1); +void ov83_0223F494(UnkStruct_ov83_0223F4AC *param0, int param1); +void ov83_0223F4AC(UnkStruct_ov83_0223F4AC *param0); +void ov83_0223F4CC(UnkStruct_ov83_0223F4AC *param0, UnkStruct_ov83_0223D784 *param1, UnkStruct_ov83_0223D95C *param2, u32 param3); +void ov83_0223F510(UnkStruct_ov83_0223F4AC *param0); +void ov83_0223F52C(UnkStruct_ov83_0223F4AC *param0); +void ov83_0223F544(UnkStruct_ov83_0223F4AC *param0, int param1, int param2); +void ov83_0223F730(UnkStruct_ov83_0223F770 *param0, int param1, int param2, int param3, int param4); +void ov83_0223F770(UnkStruct_ov83_0223F770 *param0); +void ov83_0223F784(UnkStruct_ov83_0223F770 *param0); +void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int param1, BGL *param2); +void ov83_0223F7A4(UnkStruct_ov83_0223F7A4 *param0); +void ov83_0223F7B0(UnkStruct_ov83_0223F7A4 *param0); +u32 ov83_0223F7DC(UnkStruct_ov83_0223F7A4 *param0); #endif // POKEPLATINUM_OV83_0223D6A8_H diff --git a/include/overlay083/ov83_0223F7F4.h b/include/overlay083/ov83_0223F7F4.h index 1f753c8cd6..778f1024a2 100644 --- a/include/overlay083/ov83_0223F7F4.h +++ b/include/overlay083/ov83_0223F7F4.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_OV83_0223F7F4_H #include "struct_defs/struct_0202A93C.h" + #include "overlay083/struct_ov83_0223F820.h" #include "overlay083/struct_ov83_0223F88C.h" #include "overlay083/struct_ov83_0223F8AC.h" @@ -14,30 +15,30 @@ #include "overlay083/struct_ov83_0223FE50.h" s32 ov83_0223F7F4(int param0, int param1, int param2, int param3, int param4, int param5); -void ov83_0223F820(UnkStruct_ov83_0223F820 * param0); -void ov83_0223F83C(UnkStruct_ov83_0223F820 * param0); -void ov83_0223F88C(UnkStruct_ov83_0223F88C * param0, UnkStruct_ov83_0223F820 * param1); -u16 ov83_0223F900(UnkStruct_ov83_0223F8AC * param0, const UnkStruct_ov83_0223FE50 * param1, u32 param2, u32 param3); -u16 ov83_0223FA84(const UnkStruct_ov83_0223F8AC * param0); -u32 ov83_0223FA8C(const UnkStruct_ov83_0223F8AC * param0); -void ov83_0223FA90(UnkStruct_ov83_0223F8AC * param0, int param1); -s32 ov83_0223FAA8(const UnkStruct_ov83_0223F8AC * param0); -void ov83_0223FAAC(UnkStruct_ov83_0223FAAC * param0, s32 param1, int param2); +void ov83_0223F820(UnkStruct_ov83_0223F820 *param0); +void ov83_0223F83C(UnkStruct_ov83_0223F820 *param0); +void ov83_0223F88C(UnkStruct_ov83_0223F88C *param0, UnkStruct_ov83_0223F820 *param1); +u16 ov83_0223F900(UnkStruct_ov83_0223F8AC *param0, const UnkStruct_ov83_0223FE50 *param1, u32 param2, u32 param3); +u16 ov83_0223FA84(const UnkStruct_ov83_0223F8AC *param0); +u32 ov83_0223FA8C(const UnkStruct_ov83_0223F8AC *param0); +void ov83_0223FA90(UnkStruct_ov83_0223F8AC *param0, int param1); +s32 ov83_0223FAA8(const UnkStruct_ov83_0223F8AC *param0); +void ov83_0223FAAC(UnkStruct_ov83_0223FAAC *param0, s32 param1, int param2); BOOL ov83_0223FB30(s32 param0, int param1); BOOL ov83_0223FB50(s32 param0, int param1); fx32 ov83_0223FB68(u16 param0, int param1); -void ov83_0223FBA4(UnkStruct_ov83_0223FBA4 * param0); -void ov83_0223FBBC(UnkStruct_ov83_0223FBA4 * param0, int param1, s32 param2, BOOL param3); -BOOL ov83_0223FC3C(const UnkStruct_ov83_0223FBA4 * param0, s32 param1); -BOOL ov83_0223FC58(UnkStruct_ov83_0223FC58 * param0, UnkStruct_ov83_0223F8AC * param1); -void ov83_0223FCE8(UnkStruct_ov83_0223FDB0_sub1 * param0, const UnkStruct_ov83_0223FE50 * param1, int param2, s32 param3, int param4, BOOL param5, BOOL param6); -void ov83_0223FDB0(UnkStruct_ov83_0223FDB0 * param0); -BOOL ov83_0223FDD8(UnkStruct_ov83_0223FDB0 * param0, const UnkStruct_ov83_0223FE50 * param1, u32 param2); -void ov83_0223FE50(UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FE50 * param1, int param2); -void ov83_0223FEC0(UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FE50 * param1, int param2); -void ov83_0223FF44(UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FCE8 * param1, int param2); -void ov83_0223FFA0(UnkStruct_ov83_0223FDB0 * param0); -void ov83_0223FFD4(UnkStruct_ov83_0223FDB0 * param0, Poffin * param1, const UnkStruct_ov83_0223FE50 * param2, u32 param3, u32 param4); -void ov83_022401AC(UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FE50 * param1, int param2); +void ov83_0223FBA4(UnkStruct_ov83_0223FBA4 *param0); +void ov83_0223FBBC(UnkStruct_ov83_0223FBA4 *param0, int param1, s32 param2, BOOL param3); +BOOL ov83_0223FC3C(const UnkStruct_ov83_0223FBA4 *param0, s32 param1); +BOOL ov83_0223FC58(UnkStruct_ov83_0223FC58 *param0, UnkStruct_ov83_0223F8AC *param1); +void ov83_0223FCE8(UnkStruct_ov83_0223FDB0_sub1 *param0, const UnkStruct_ov83_0223FE50 *param1, int param2, s32 param3, int param4, BOOL param5, BOOL param6); +void ov83_0223FDB0(UnkStruct_ov83_0223FDB0 *param0); +BOOL ov83_0223FDD8(UnkStruct_ov83_0223FDB0 *param0, const UnkStruct_ov83_0223FE50 *param1, u32 param2); +void ov83_0223FE50(UnkStruct_ov83_0223FDB0 *param0, UnkStruct_ov83_0223FE50 *param1, int param2); +void ov83_0223FEC0(UnkStruct_ov83_0223FDB0 *param0, UnkStruct_ov83_0223FE50 *param1, int param2); +void ov83_0223FF44(UnkStruct_ov83_0223FDB0 *param0, UnkStruct_ov83_0223FCE8 *param1, int param2); +void ov83_0223FFA0(UnkStruct_ov83_0223FDB0 *param0); +void ov83_0223FFD4(UnkStruct_ov83_0223FDB0 *param0, Poffin *param1, const UnkStruct_ov83_0223FE50 *param2, u32 param3, u32 param4); +void ov83_022401AC(UnkStruct_ov83_0223FDB0 *param0, UnkStruct_ov83_0223FE50 *param1, int param2); #endif // POKEPLATINUM_OV83_0223F7F4_H diff --git a/include/overlay083/struct_ov83_0223B784.h b/include/overlay083/struct_ov83_0223B784.h index 349070ef51..912c7efebf 100644 --- a/include/overlay083/struct_ov83_0223B784.h +++ b/include/overlay083/struct_ov83_0223B784.h @@ -3,6 +3,7 @@ #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02018340_decl.h" + #include "overlay083/struct_ov83_0223D4CC_decl.h" #include "overlay083/struct_ov83_0223D784.h" #include "overlay083/struct_ov83_0223D95C.h" @@ -34,13 +35,13 @@ typedef struct { u8 unk_1A; u8 unk_1B; int unk_1C; - BGL * unk_20; + BGL *unk_20; int unk_24; int unk_28; UnkStruct_ov83_0223D784 unk_2C; UnkStruct_ov83_0223D95C unk_1CC[6]; BOOL unk_31C; - UnkStruct_02015064 * unk_320; + UnkStruct_02015064 *unk_320; u32 unk_324; u32 unk_328; BOOL unk_32C; @@ -64,7 +65,7 @@ typedef struct { UnkStruct_ov83_0223F770 unk_1478; UnkStruct_ov83_0223F7A4 unk_1480; int unk_1488; - UnkStruct_ov83_0223D4CC * unk_148C; + UnkStruct_ov83_0223D4CC *unk_148C; int unk_1490; UnkStruct_ov83_0223FE50 unk_1494; BOOL unk_15DC; diff --git a/include/overlay083/struct_ov83_0223C344.h b/include/overlay083/struct_ov83_0223C344.h index 50e8187e8d..27ed552716 100644 --- a/include/overlay083/struct_ov83_0223C344.h +++ b/include/overlay083/struct_ov83_0223C344.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV83_0223C344_H #define POKEPLATINUM_STRUCT_OV83_0223C344_H -#include "overlay_manager.h" -#include "bag.h" #include "overlay082/struct_ov82_0223B164.h" +#include "bag.h" +#include "overlay_manager.h" + typedef struct { int unk_00; u16 unk_04; @@ -12,11 +13,11 @@ typedef struct { u16 unk_06_8 : 4; u16 unk_06_12 : 4; int unk_08; - UnkStruct_0207D99C * unk_0C; - UnkStruct_ov82_0223B164 * unk_10; + UnkStruct_0207D99C *unk_0C; + UnkStruct_ov82_0223B164 *unk_10; int unk_14; - void * unk_18; - OverlayManager * unk_1C; + void *unk_18; + OverlayManager *unk_1C; BOOL unk_20; s16 unk_24; u8 unk_26; diff --git a/include/overlay083/struct_ov83_0223D784.h b/include/overlay083/struct_ov83_0223D784.h index c77ae774ec..f15dde7c6b 100644 --- a/include/overlay083/struct_ov83_0223D784.h +++ b/include/overlay083/struct_ov83_0223D784.h @@ -2,13 +2,13 @@ #define POKEPLATINUM_STRUCT_OV83_0223D784_H #include "struct_decls/struct_02009714_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_0200C738.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; + UnkStruct_02009714 *unk_190[4]; } UnkStruct_ov83_0223D784; #endif // POKEPLATINUM_STRUCT_OV83_0223D784_H diff --git a/include/overlay083/struct_ov83_0223D95C.h b/include/overlay083/struct_ov83_0223D95C.h index a668daabb9..2162d98aff 100644 --- a/include/overlay083/struct_ov83_0223D95C.h +++ b/include/overlay083/struct_ov83_0223D95C.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_STRUCT_OV83_0223D95C_H #include "struct_decls/struct_02009DC8_decl.h" + #include "overlay019/struct_ov19_021DA864.h" typedef struct { - UnkStruct_02009DC8 * unk_00[4]; + UnkStruct_02009DC8 *unk_00[4]; BOOL unk_10; UnkStruct_ov19_021DA864 unk_14; } UnkStruct_ov83_0223D95C; diff --git a/include/overlay083/struct_ov83_0223D9A8.h b/include/overlay083/struct_ov83_0223D9A8.h index 6c109eaaa5..c8b22f8a66 100644 --- a/include/overlay083/struct_ov83_0223D9A8.h +++ b/include/overlay083/struct_ov83_0223D9A8.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV83_0223D9A8_H #define POKEPLATINUM_STRUCT_OV83_0223D9A8_H +#include + #include "struct_decls/struct_020218BC_decl.h" -#include "overlay019/struct_ov19_021DA864.h" -#include +#include "overlay019/struct_ov19_021DA864.h" typedef struct { - GraphicElementManager * unk_00; - const UnkStruct_ov19_021DA864 * unk_04; + GraphicElementManager *unk_00; + const UnkStruct_ov19_021DA864 *unk_04; VecFx32 unk_08; u32 unk_14; int unk_18; diff --git a/include/overlay083/struct_ov83_0223DB30.h b/include/overlay083/struct_ov83_0223DB30.h index 354de6073c..e9ca18640b 100644 --- a/include/overlay083/struct_ov83_0223DB30.h +++ b/include/overlay083/struct_ov83_0223DB30.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_STRUCT_OV83_0223DB30_H #include "struct_decls/struct_02022550_decl.h" + #include "overlay083/struct_ov83_0223D95C.h" #include "overlay083/struct_ov83_0223DA94.h" typedef struct { BOOL unk_00; BOOL unk_04; - GraphicElementData * unk_08[4]; - GraphicElementData * unk_18[4]; + GraphicElementData *unk_08[4]; + GraphicElementData *unk_18[4]; UnkStruct_ov83_0223D95C unk_28[4]; int unk_108; UnkStruct_ov83_0223DA94 unk_10C[4]; diff --git a/include/overlay083/struct_ov83_0223DEA0.h b/include/overlay083/struct_ov83_0223DEA0.h index 08fcf4d644..34e02f26df 100644 --- a/include/overlay083/struct_ov83_0223DEA0.h +++ b/include/overlay083/struct_ov83_0223DEA0.h @@ -2,26 +2,26 @@ #define POKEPLATINUM_STRUCT_OV83_0223DEA0_H #include "message.h" -#include "string_template.h" #include "strbuf.h" +#include "string_template.h" typedef struct { - MessageLoader * unk_00; - StringTemplate * unk_04; - Strbuf* unk_08; - Strbuf* unk_0C; - Strbuf* unk_10; - Strbuf* unk_14; - Strbuf* unk_18; - Strbuf* unk_1C; - Strbuf* unk_20; - Strbuf* unk_24; - Strbuf* unk_28; - Strbuf* unk_2C; - Strbuf* unk_30; - Strbuf* unk_34; - Strbuf* unk_38[5]; - Strbuf* unk_4C[10]; + MessageLoader *unk_00; + StringTemplate *unk_04; + Strbuf *unk_08; + Strbuf *unk_0C; + Strbuf *unk_10; + Strbuf *unk_14; + Strbuf *unk_18; + Strbuf *unk_1C; + Strbuf *unk_20; + Strbuf *unk_24; + Strbuf *unk_28; + Strbuf *unk_2C; + Strbuf *unk_30; + Strbuf *unk_34; + Strbuf *unk_38[5]; + Strbuf *unk_4C[10]; } UnkStruct_ov83_0223DEA0; #endif // POKEPLATINUM_STRUCT_OV83_0223DEA0_H diff --git a/include/overlay083/struct_ov83_0223E138.h b/include/overlay083/struct_ov83_0223E138.h index c1e511b2c1..7fb8a51e1a 100644 --- a/include/overlay083/struct_ov83_0223E138.h +++ b/include/overlay083/struct_ov83_0223E138.h @@ -1,26 +1,27 @@ #ifndef POKEPLATINUM_STRUCT_OV83_0223E138_H #define POKEPLATINUM_STRUCT_OV83_0223E138_H +#include + #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay083/struct_ov83_0223DEA0.h" #include "overlay083/struct_ov83_0223FE50.h" -#include - typedef struct { int unk_00; - BGL * unk_04; - Window * unk_08; - Window * unk_0C; + BGL *unk_04; + Window *unk_08; + Window *unk_0C; int unk_10; int unk_14; - UnkStruct_ov83_0223DEA0 * unk_18; - UnkStruct_ov83_0223FE50 * unk_1C; - void * unk_20; - NNSG2dScreenData * unk_24; - void * unk_28; - NNSG2dScreenData * unk_2C; + UnkStruct_ov83_0223DEA0 *unk_18; + UnkStruct_ov83_0223FE50 *unk_1C; + void *unk_20; + NNSG2dScreenData *unk_24; + void *unk_28; + NNSG2dScreenData *unk_2C; BOOL unk_30; } UnkStruct_ov83_0223E138; diff --git a/include/overlay083/struct_ov83_0223E244.h b/include/overlay083/struct_ov83_0223E244.h index 00ec229faa..9ee97b3a7a 100644 --- a/include/overlay083/struct_ov83_0223E244.h +++ b/include/overlay083/struct_ov83_0223E244.h @@ -6,7 +6,7 @@ typedef struct { BOOL unk_00; BOOL unk_04; - GraphicElementData * unk_08; + GraphicElementData *unk_08; } UnkStruct_ov83_0223E244; #endif // POKEPLATINUM_STRUCT_OV83_0223E244_H diff --git a/include/overlay083/struct_ov83_0223E340.h b/include/overlay083/struct_ov83_0223E340.h index 678d066583..3543f74127 100644 --- a/include/overlay083/struct_ov83_0223E340.h +++ b/include/overlay083/struct_ov83_0223E340.h @@ -4,12 +4,13 @@ #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02015214_decl.h" + #include "overlay083/struct_ov83_0223D9EC.h" typedef struct { - UnkStruct_02015128 * unk_00[6]; - UnkStruct_020151A4 * unk_18[8]; - UnkStruct_02015214 * unk_38[8]; + UnkStruct_02015128 *unk_00[6]; + UnkStruct_020151A4 *unk_18[8]; + UnkStruct_02015214 *unk_38[8]; UnkStruct_ov83_0223D9EC unk_58; int unk_6C; int unk_70; diff --git a/include/overlay083/struct_ov83_0223E5C0.h b/include/overlay083/struct_ov83_0223E5C0.h index 96822f7270..5c26d6e98b 100644 --- a/include/overlay083/struct_ov83_0223E5C0.h +++ b/include/overlay083/struct_ov83_0223E5C0.h @@ -2,15 +2,16 @@ #define POKEPLATINUM_STRUCT_OV83_0223E5C0_H #include "struct_decls/struct_02022550_decl.h" + #include "overlay083/struct_ov83_0223D4CC_decl.h" #include "overlay083/struct_ov83_0223FE50.h" typedef struct { BOOL unk_00; - GraphicElementData * unk_04[4]; - const UnkStruct_ov83_0223FE50 * unk_14; + GraphicElementData *unk_04[4]; + const UnkStruct_ov83_0223FE50 *unk_14; u32 unk_18; - UnkStruct_ov83_0223D4CC * unk_1C; + UnkStruct_ov83_0223D4CC *unk_1C; } UnkStruct_ov83_0223E5C0; #endif // POKEPLATINUM_STRUCT_OV83_0223E5C0_H diff --git a/include/overlay083/struct_ov83_0223E824.h b/include/overlay083/struct_ov83_0223E824.h index 598c30616a..e6ecc529e7 100644 --- a/include/overlay083/struct_ov83_0223E824.h +++ b/include/overlay083/struct_ov83_0223E824.h @@ -2,23 +2,25 @@ #define POKEPLATINUM_STRUCT_OV83_0223E824_H #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay083/struct_ov83_0223DEA0.h" #include "overlay083/struct_ov83_0223FE50.h" +#include "sys_task_manager.h" + typedef struct { int unk_00; - BGL * unk_04; - Window * unk_08[4]; + BGL *unk_04; + Window *unk_08[4]; int unk_18; - UnkStruct_ov83_0223DEA0 * unk_1C; + UnkStruct_ov83_0223DEA0 *unk_1C; int unk_20; - UnkStruct_ov83_0223FE50 * unk_24; + UnkStruct_ov83_0223FE50 *unk_24; BOOL unk_28; - SysTask * unk_2C; + SysTask *unk_2C; int unk_30; - void * unk_34; + void *unk_34; } UnkStruct_ov83_0223E824; #endif // POKEPLATINUM_STRUCT_OV83_0223E824_H diff --git a/include/overlay083/struct_ov83_0223ED3C.h b/include/overlay083/struct_ov83_0223ED3C.h index c62a6f17fe..2652eae8f8 100644 --- a/include/overlay083/struct_ov83_0223ED3C.h +++ b/include/overlay083/struct_ov83_0223ED3C.h @@ -7,8 +7,8 @@ typedef struct { int unk_00; - UnkStruct_ov83_0223D784 * unk_04; - UnkStruct_ov83_0223D95C * unk_08; + UnkStruct_ov83_0223D784 *unk_04; + UnkStruct_ov83_0223D95C *unk_08; u32 unk_0C; UnkStruct_ov83_0223F054 unk_10[8]; int unk_410; diff --git a/include/overlay083/struct_ov83_0223F054.h b/include/overlay083/struct_ov83_0223F054.h index 082422efb6..45a3546969 100644 --- a/include/overlay083/struct_ov83_0223F054.h +++ b/include/overlay083/struct_ov83_0223F054.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV83_0223F054_H #define POKEPLATINUM_STRUCT_OV83_0223F054_H +#include + #include "struct_decls/struct_02022550_decl.h" -#include "overlay083/struct_ov83_0223DA94.h" -#include +#include "overlay083/struct_ov83_0223DA94.h" typedef struct { BOOL unk_00; @@ -18,7 +19,7 @@ typedef struct { UnkStruct_ov83_0223DA94 unk_30; UnkStruct_ov83_0223DA94 unk_48; UnkStruct_ov83_0223DA94 unk_60; - GraphicElementData * unk_78; + GraphicElementData *unk_78; int unk_7C; } UnkStruct_ov83_0223F054; diff --git a/include/overlay083/struct_ov83_0223F29C.h b/include/overlay083/struct_ov83_0223F29C.h index 8ca677439f..72dc4e8efa 100644 --- a/include/overlay083/struct_ov83_0223F29C.h +++ b/include/overlay083/struct_ov83_0223F29C.h @@ -6,7 +6,7 @@ #include "overlay083/struct_ov83_0223F410.h" typedef struct { - UnkStruct_ov83_0223D784 * unk_00; + UnkStruct_ov83_0223D784 *unk_00; UnkStruct_ov83_0223D95C unk_04; UnkStruct_ov83_0223F410 unk_3C[4]; int unk_7C; diff --git a/include/overlay083/struct_ov83_0223F410.h b/include/overlay083/struct_ov83_0223F410.h index 3f23e28a19..627c57ba97 100644 --- a/include/overlay083/struct_ov83_0223F410.h +++ b/include/overlay083/struct_ov83_0223F410.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02022550_decl.h" typedef struct { - GraphicElementData * unk_00; + GraphicElementData *unk_00; int unk_04; int unk_08; BOOL unk_0C; diff --git a/include/overlay083/struct_ov83_0223F670.h b/include/overlay083/struct_ov83_0223F670.h index 0914a44b03..b56b93678d 100644 --- a/include/overlay083/struct_ov83_0223F670.h +++ b/include/overlay083/struct_ov83_0223F670.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV83_0223F670_H #define POKEPLATINUM_STRUCT_OV83_0223F670_H +#include + #include "struct_decls/struct_02022550_decl.h" -#include "overlay083/struct_ov83_0223DA94.h" -#include +#include "overlay083/struct_ov83_0223DA94.h" typedef struct { BOOL unk_00; @@ -12,7 +13,7 @@ typedef struct { VecFx32 unk_08; UnkStruct_ov83_0223DA94 unk_14; UnkStruct_ov83_0223DA94 unk_2C; - GraphicElementData * unk_44; + GraphicElementData *unk_44; } UnkStruct_ov83_0223F670; #endif // POKEPLATINUM_STRUCT_OV83_0223F670_H diff --git a/include/overlay083/struct_ov83_0223F770.h b/include/overlay083/struct_ov83_0223F770.h index 601d239702..bd59608925 100644 --- a/include/overlay083/struct_ov83_0223F770.h +++ b/include/overlay083/struct_ov83_0223F770.h @@ -5,8 +5,8 @@ #include "struct_defs/struct_0209916C.h" typedef struct { - UnkStruct_0209903C * unk_00; - UnkStruct_0209916C * unk_04; + UnkStruct_0209903C *unk_00; + UnkStruct_0209916C *unk_04; } UnkStruct_ov83_0223F770; #endif // POKEPLATINUM_STRUCT_OV83_0223F770_H diff --git a/include/overlay083/struct_ov83_0223F7A4.h b/include/overlay083/struct_ov83_0223F7A4.h index e8b41e1cec..ef69f2549c 100644 --- a/include/overlay083/struct_ov83_0223F7A4.h +++ b/include/overlay083/struct_ov83_0223F7A4.h @@ -5,8 +5,8 @@ #include "struct_decls/struct_02018340_decl.h" typedef struct { - UnkStruct_02015920 * unk_00; - BGL * unk_04; + UnkStruct_02015920 *unk_00; + BGL *unk_04; } UnkStruct_ov83_0223F7A4; #endif // POKEPLATINUM_STRUCT_OV83_0223F7A4_H diff --git a/include/overlay083/struct_ov83_0223FE50.h b/include/overlay083/struct_ov83_0223FE50.h index 6b663144f2..bbe2dae0a9 100644 --- a/include/overlay083/struct_ov83_0223FE50.h +++ b/include/overlay083/struct_ov83_0223FE50.h @@ -1,13 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV83_0223FE50_H #define POKEPLATINUM_STRUCT_OV83_0223FE50_H -#include "trainer_info.h" #include "struct_defs/struct_0202A93C.h" + #include "overlay083/struct_ov83_0223D2E8.h" #include "overlay083/struct_ov83_0223DB4C.h" #include "overlay083/struct_ov83_0223DB4C_sub1.h" #include "overlay083/struct_ov83_022401AC.h" +#include "trainer_info.h" + typedef struct { UnkStruct_ov83_0223DB4C_sub1 unk_00; UnkStruct_ov83_0223D2E8 unk_04; @@ -16,14 +18,14 @@ typedef struct { UnkStruct_ov83_022401AC unk_58; UnkStruct_ov83_0223DB4C unk_6C; UnkStruct_ov83_0223D2E8 unk_90[4]; - Poffin * unk_100; + Poffin *unk_100; u32 unk_104[4]; UnkStruct_ov83_0223DB4C_sub1 unk_114[4]; u8 unk_124[4]; u8 unk_128[4]; u8 unk_12C[4]; u8 unk_130[4]; - const TrainerInfo * unk_134[4]; + const TrainerInfo *unk_134[4]; u8 unk_144; u8 unk_145; } UnkStruct_ov83_0223FE50; diff --git a/include/overlay084/funcptr_ov84_0223D730.h b/include/overlay084/funcptr_ov84_0223D730.h index 1ec86617e4..fb7fa35328 100644 --- a/include/overlay084/funcptr_ov84_0223D730.h +++ b/include/overlay084/funcptr_ov84_0223D730.h @@ -3,6 +3,6 @@ #include "overlay084/struct_ov84_0223B5A0.h" -typedef int (* UnkFuncPtr_ov84_0223D730)(UnkStruct_ov84_0223B5A0 * param0); +typedef int (*UnkFuncPtr_ov84_0223D730)(UnkStruct_ov84_0223B5A0 *param0); #endif // POKEPLATINUM_FUNCPTR_OV84_0223D730_H diff --git a/include/overlay084/ov84_0223B5A0.h b/include/overlay084/ov84_0223B5A0.h index 1b4119addb..2572f663e7 100644 --- a/include/overlay084/ov84_0223B5A0.h +++ b/include/overlay084/ov84_0223B5A0.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_OV84_0223B5A0_H #define POKEPLATINUM_OV84_0223B5A0_H -#include "overlay_manager.h" #include "overlay084/struct_ov84_0223B5A0.h" -int ov84_0223B5A0(OverlayManager * param0, int * param1); -int ov84_0223B76C(OverlayManager * param0, int * param1); -int ov84_0223B900(OverlayManager * param0, int * param1); -u16 ov84_0223BE5C(UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2); +#include "overlay_manager.h" + +int ov84_0223B5A0(OverlayManager *param0, int *param1); +int ov84_0223B76C(OverlayManager *param0, int *param1); +int ov84_0223B900(OverlayManager *param0, int *param1); +u16 ov84_0223BE5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u16 param2); const u32 ov84_0223D84C(u32 param0); #endif // POKEPLATINUM_OV84_0223B5A0_H diff --git a/include/overlay084/ov84_0223F040.h b/include/overlay084/ov84_0223F040.h index 3c05c36e99..1176447101 100644 --- a/include/overlay084/ov84_0223F040.h +++ b/include/overlay084/ov84_0223F040.h @@ -2,39 +2,41 @@ #define POKEPLATINUM_OV84_0223F040_H #include "struct_defs/struct_0205AA50.h" -#include "bag.h" + #include "overlay084/struct_ov84_0223B5A0.h" -void ov84_0223F040(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223F1DC(Window * param0); -void ov84_0223F1F8(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223F238(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223F25C(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223F2FC(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223F3AC(UnkStruct_ov84_0223B5A0 * param0, u8 param1, u8 param2); -void ov84_0223F438(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223F528(UnkStruct_ov84_0223B5A0 * param0, u16 param1); -void ov84_0223F584(UnkStruct_ov84_0223B5A0 * param0, u16 param1); -void ov84_0223F7D4(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223F800(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223F81C(UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2, u32 param3); -void ov84_0223F8D0(UnkStruct_ov84_0223B5A0 * param0, BagItem * param1, u32 param2); -void ov84_0223F94C(UnkStruct_ov84_0223B5A0 * param0, BagItem * param1, u32 param2); -void ov84_0223F9F0(UnkStruct_ov84_0223B5A0 * param0, u32 param1); -void ov84_0223FA44(UnkStruct_ov84_0223B5A0 * param0, u32 param1); -void ov84_0223FA88(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223FB50(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223FB70(UnkStruct_ov84_0223B5A0 * param0, u8 * param1, u8 param2); -void ov84_0223FD84(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223FE18(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223FE94(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223FF44(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223FFC0(UnkStruct_ov84_0223B5A0 * param0); -void ov84_0223FFF0(UnkStruct_ov84_0223B5A0 * param0); -u8 ov84_022400A0(UnkStruct_ov84_0223B5A0 * param0); -void ov84_02240120(UnkStruct_ov84_0223B5A0 * param0); -void ov84_02240148(UnkStruct_ov84_0223B5A0 * param0, u8 param1); -void ov84_02240248(UnkStruct_ov84_0223B5A0 * param0, u8 param1); -void ov84_02240328(UnkStruct_ov84_0223B5A0 * param0); +#include "bag.h" + +void ov84_0223F040(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223F1DC(Window *param0); +void ov84_0223F1F8(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223F238(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223F25C(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223F2FC(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223F3AC(UnkStruct_ov84_0223B5A0 *param0, u8 param1, u8 param2); +void ov84_0223F438(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223F528(UnkStruct_ov84_0223B5A0 *param0, u16 param1); +void ov84_0223F584(UnkStruct_ov84_0223B5A0 *param0, u16 param1); +void ov84_0223F7D4(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223F800(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223F81C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u16 param2, u32 param3); +void ov84_0223F8D0(UnkStruct_ov84_0223B5A0 *param0, BagItem *param1, u32 param2); +void ov84_0223F94C(UnkStruct_ov84_0223B5A0 *param0, BagItem *param1, u32 param2); +void ov84_0223F9F0(UnkStruct_ov84_0223B5A0 *param0, u32 param1); +void ov84_0223FA44(UnkStruct_ov84_0223B5A0 *param0, u32 param1); +void ov84_0223FA88(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223FB50(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223FB70(UnkStruct_ov84_0223B5A0 *param0, u8 *param1, u8 param2); +void ov84_0223FD84(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223FE18(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223FE94(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223FF44(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223FFC0(UnkStruct_ov84_0223B5A0 *param0); +void ov84_0223FFF0(UnkStruct_ov84_0223B5A0 *param0); +u8 ov84_022400A0(UnkStruct_ov84_0223B5A0 *param0); +void ov84_02240120(UnkStruct_ov84_0223B5A0 *param0); +void ov84_02240148(UnkStruct_ov84_0223B5A0 *param0, u8 param1); +void ov84_02240248(UnkStruct_ov84_0223B5A0 *param0, u8 param1); +void ov84_02240328(UnkStruct_ov84_0223B5A0 *param0); #endif // POKEPLATINUM_OV84_0223F040_H diff --git a/include/overlay084/ov84_022403F4.h b/include/overlay084/ov84_022403F4.h index 4578fc3e68..427e888feb 100644 --- a/include/overlay084/ov84_022403F4.h +++ b/include/overlay084/ov84_022403F4.h @@ -3,18 +3,18 @@ #include "overlay084/struct_ov84_0223B5A0.h" -void ov84_022403F4(UnkStruct_ov84_0223B5A0 * param0); -void ov84_02240A88(UnkStruct_ov84_0223B5A0 * param0); -void ov84_02240ABC(UnkStruct_ov84_0223B5A0 * param0); -void ov84_02240AD8(UnkStruct_ov84_0223B5A0 * param0, u16 param1); -void ov84_02240B34(UnkStruct_ov84_0223B5A0 * param0, u8 param1); -u8 ov84_02240B50(UnkStruct_ov84_0223B5A0 * param0); -void ov84_02240B68(UnkStruct_ov84_0223B5A0 * param0); -void ov84_02240B80(UnkStruct_ov84_0223B5A0 * param0); -void ov84_02240CF0(UnkStruct_ov84_0223B5A0 * param0, u8 param1); -void ov84_02240D3C(UnkStruct_ov84_0223B5A0 * param0, u8 param1); -void ov84_02240D5C(UnkStruct_ov84_0223B5A0 * param0, u16 param1, u8 param2); -void ov84_02240E24(UnkStruct_ov84_0223B5A0 * param0, s16 param1, s16 param2); -void ov84_02240E5C(UnkStruct_ov84_0223B5A0 * param0); +void ov84_022403F4(UnkStruct_ov84_0223B5A0 *param0); +void ov84_02240A88(UnkStruct_ov84_0223B5A0 *param0); +void ov84_02240ABC(UnkStruct_ov84_0223B5A0 *param0); +void ov84_02240AD8(UnkStruct_ov84_0223B5A0 *param0, u16 param1); +void ov84_02240B34(UnkStruct_ov84_0223B5A0 *param0, u8 param1); +u8 ov84_02240B50(UnkStruct_ov84_0223B5A0 *param0); +void ov84_02240B68(UnkStruct_ov84_0223B5A0 *param0); +void ov84_02240B80(UnkStruct_ov84_0223B5A0 *param0); +void ov84_02240CF0(UnkStruct_ov84_0223B5A0 *param0, u8 param1); +void ov84_02240D3C(UnkStruct_ov84_0223B5A0 *param0, u8 param1); +void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2); +void ov84_02240E24(UnkStruct_ov84_0223B5A0 *param0, s16 param1, s16 param2); +void ov84_02240E5C(UnkStruct_ov84_0223B5A0 *param0); #endif // POKEPLATINUM_OV84_022403F4_H diff --git a/include/overlay084/struct_ov84_0223B5A0.h b/include/overlay084/struct_ov84_0223B5A0.h index 918bb9d81f..a722e3111f 100644 --- a/include/overlay084/struct_ov84_0223B5A0.h +++ b/include/overlay084/struct_ov84_0223B5A0.h @@ -1,53 +1,55 @@ #ifndef POKEPLATINUM_STRUCT_OV84_0223B5A0_H #define POKEPLATINUM_STRUCT_OV84_0223B5A0_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_decls/struct_0207CB08_decl.h" -#include "bag.h" +#include "struct_defs/struct_0205AA50.h" + #include "overlay084/struct_ov84_0223B5A0_sub1.h" #include "overlay084/struct_ov84_0223C920.h" +#include "bag.h" +#include "game_options.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" + typedef struct { - BGL * unk_00; + BGL *unk_00; Window unk_04[11]; Window unk_B4[1]; - UnkStruct_0207CB08 * unk_C4; - Bag * unk_C8; - TrainerInfo * unk_CC; - Options * unk_D0; - NARC * unk_D4; - SpriteRenderer * unk_D8; - SpriteGfxHandler * unk_DC; - CellActorData * unk_E0[12]; - UnkStruct_0200C440 * unk_110; - MessageLoader * unk_114; - StringTemplate * unk_118; - MessageLoader * unk_11C; - MessageLoader * unk_120; - Strbuf* unk_124[12]; - ResourceMetadata * unk_154; - UIControlData * unk_158; - BmpList * unk_15C; - ResourceMetadata * unk_160; - Strbuf* unk_164[165]; - Strbuf* unk_3F8; - Strbuf* unk_3FC; - Strbuf* unk_400; - Strbuf* unk_404[8]; + UnkStruct_0207CB08 *unk_C4; + Bag *unk_C8; + TrainerInfo *unk_CC; + Options *unk_D0; + NARC *unk_D4; + SpriteRenderer *unk_D8; + SpriteGfxHandler *unk_DC; + CellActorData *unk_E0[12]; + UnkStruct_0200C440 *unk_110; + MessageLoader *unk_114; + StringTemplate *unk_118; + MessageLoader *unk_11C; + MessageLoader *unk_120; + Strbuf *unk_124[12]; + ResourceMetadata *unk_154; + UIControlData *unk_158; + BmpList *unk_15C; + ResourceMetadata *unk_160; + Strbuf *unk_164[165]; + Strbuf *unk_3F8; + Strbuf *unk_3FC; + Strbuf *unk_400; + Strbuf *unk_404[8]; u8 unk_424; u8 unk_425; u8 unk_426; diff --git a/include/overlay084/struct_ov84_0223BA5C.h b/include/overlay084/struct_ov84_0223BA5C.h index 7cacc0a421..6bfb44791d 100644 --- a/include/overlay084/struct_ov84_0223BA5C.h +++ b/include/overlay084/struct_ov84_0223BA5C.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV84_0223BA5C_H #define POKEPLATINUM_STRUCT_OV84_0223BA5C_H - #include typedef struct { diff --git a/include/overlay084/struct_ov84_0223BE5C.h b/include/overlay084/struct_ov84_0223BE5C.h index 4ec9562366..8ba835d8a3 100644 --- a/include/overlay084/struct_ov84_0223BE5C.h +++ b/include/overlay084/struct_ov84_0223BE5C.h @@ -4,7 +4,7 @@ #include "bag.h" typedef struct { - BagItem * unk_00; + BagItem *unk_00; u16 unk_04; u16 unk_06; u8 unk_08; diff --git a/include/overlay084/struct_ov84_02240FA8.h b/include/overlay084/struct_ov84_02240FA8.h index 639d0cdbf8..96bd9b101f 100644 --- a/include/overlay084/struct_ov84_02240FA8.h +++ b/include/overlay084/struct_ov84_02240FA8.h @@ -6,10 +6,10 @@ #include "struct_defs/struct_0205AA50.h" typedef struct { - const ResourceMetadata * unk_00; - void (* unk_04)(BmpList *, u32, u8); - void (* unk_08)(BmpList *, u32, u8); - Window * unk_0C; + const ResourceMetadata *unk_00; + void (*unk_04)(BmpList *, u32, u8); + void (*unk_08)(BmpList *, u32, u8); + Window *unk_0C; u16 unk_10; u16 unk_12; u8 unk_14; @@ -24,7 +24,7 @@ typedef struct { u16 unk_1A_7 : 2; u16 unk_1A_9 : 6; u16 unk_1A_15 : 1; - void * unk_1C; + void *unk_1C; } UnkStruct_ov84_02240FA8; #endif // POKEPLATINUM_STRUCT_OV84_02240FA8_H diff --git a/include/overlay085/ov85_02241440.h b/include/overlay085/ov85_02241440.h index 6b389b4c1e..249eda0fa7 100644 --- a/include/overlay085/ov85_02241440.h +++ b/include/overlay085/ov85_02241440.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_OV85_02241440_H #define POKEPLATINUM_OV85_02241440_H +#include "overlay_manager.h" -int ov85_02241440(OverlayManager * param0, int * param1); -int ov85_0224154C(OverlayManager * param0, int * param1); -int ov85_022415A0(OverlayManager * param0, int * param1); +int ov85_02241440(OverlayManager *param0, int *param1); +int ov85_0224154C(OverlayManager *param0, int *param1); +int ov85_022415A0(OverlayManager *param0, int *param1); u32 ov85_02241EB0(u32 param0); u32 ov85_02241EB4(u32 param0); diff --git a/include/overlay086/ov86_0223B140.h b/include/overlay086/ov86_0223B140.h index ac24fb99d9..e455c72e70 100644 --- a/include/overlay086/ov86_0223B140.h +++ b/include/overlay086/ov86_0223B140.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV86_0223B140_H #define POKEPLATINUM_OV86_0223B140_H +#include "overlay_manager.h" -int ov86_0223B140(OverlayManager * param0, int * param1); -int ov86_0223B2E4(OverlayManager * param0, int * param1); -int ov86_0223B394(OverlayManager * param0, int * param1); +int ov86_0223B140(OverlayManager *param0, int *param1); +int ov86_0223B2E4(OverlayManager *param0, int *param1); +int ov86_0223B394(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV86_0223B140_H diff --git a/include/overlay087/ov87_021D0D80.h b/include/overlay087/ov87_021D0D80.h index 0cadfb9e6f..0c405b8a29 100644 --- a/include/overlay087/ov87_021D0D80.h +++ b/include/overlay087/ov87_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV87_021D0D80_H #define POKEPLATINUM_OV87_021D0D80_H +#include "overlay_manager.h" -int ov87_021D0D80(OverlayManager * param0, int * param1); -int ov87_021D0DFC(OverlayManager * param0, int * param1); -int ov87_021D0E2C(OverlayManager * param0, int * param1); +int ov87_021D0D80(OverlayManager *param0, int *param1); +int ov87_021D0DFC(OverlayManager *param0, int *param1); +int ov87_021D0E2C(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV87_021D0D80_H diff --git a/include/overlay087/ov87_021D106C.h b/include/overlay087/ov87_021D106C.h index a9402cf0a9..f0c90eb2e2 100644 --- a/include/overlay087/ov87_021D106C.h +++ b/include/overlay087/ov87_021D106C.h @@ -5,9 +5,9 @@ #include "overlay087/struct_ov87_021D106C_decl.h" #include "overlay087/struct_ov87_021D12C0.h" -UnkStruct_ov87_021D106C * ov87_021D106C(UnkStruct_ov87_021D0D80 * param0, const UnkStruct_ov87_021D12C0 * param1); -void ov87_021D1140(UnkStruct_ov87_021D106C * param0); -BOOL ov87_021D11D0(UnkStruct_ov87_021D106C * param0, int param1); -BOOL ov87_021D11F8(UnkStruct_ov87_021D106C * param0); +UnkStruct_ov87_021D106C *ov87_021D106C(UnkStruct_ov87_021D0D80 *param0, const UnkStruct_ov87_021D12C0 *param1); +void ov87_021D1140(UnkStruct_ov87_021D106C *param0); +BOOL ov87_021D11D0(UnkStruct_ov87_021D106C *param0, int param1); +BOOL ov87_021D11F8(UnkStruct_ov87_021D106C *param0); #endif // POKEPLATINUM_OV87_021D106C_H diff --git a/include/overlay087/struct_ov87_021D0D80_decl.h b/include/overlay087/struct_ov87_021D0D80_decl.h index 234d3e1102..3bae4637aa 100644 --- a/include/overlay087/struct_ov87_021D0D80_decl.h +++ b/include/overlay087/struct_ov87_021D0D80_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV87_021D0D80_DECL_H #define POKEPLATINUM_STRUCT_OV87_021D0D80_DECL_H -typedef struct UnkStruct_ov87_021D0D80_t UnkStruct_ov87_021D0D80; +typedef struct UnkStruct_ov87_021D0D80_t UnkStruct_ov87_021D0D80; #endif // POKEPLATINUM_STRUCT_OV87_021D0D80_DECL_H diff --git a/include/overlay087/struct_ov87_021D106C_decl.h b/include/overlay087/struct_ov87_021D106C_decl.h index ff6e626c1f..f883b73ba1 100644 --- a/include/overlay087/struct_ov87_021D106C_decl.h +++ b/include/overlay087/struct_ov87_021D106C_decl.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV87_021D106C_DECL_H #define POKEPLATINUM_STRUCT_OV87_021D106C_DECL_H -typedef struct UnkStruct_ov87_021D106C_t UnkStruct_ov87_021D106C; +typedef struct UnkStruct_ov87_021D106C_t UnkStruct_ov87_021D106C; #endif // POKEPLATINUM_STRUCT_OV87_021D106C_DECL_H diff --git a/include/overlay087/struct_ov87_021D12C0.h b/include/overlay087/struct_ov87_021D12C0.h index f10035bdfe..92069d365b 100644 --- a/include/overlay087/struct_ov87_021D12C0.h +++ b/include/overlay087/struct_ov87_021D12C0.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV87_021D12C0_H #define POKEPLATINUM_STRUCT_OV87_021D12C0_H +#include + #include "overlay087/struct_ov87_021D1640.h" #include "enums.h" -#include typedef struct { int unk_00; diff --git a/include/overlay087/struct_ov87_021D1640.h b/include/overlay087/struct_ov87_021D1640.h index 36f6543b26..d152c7775c 100644 --- a/include/overlay087/struct_ov87_021D1640.h +++ b/include/overlay087/struct_ov87_021D1640.h @@ -4,8 +4,8 @@ #include "strbuf.h" typedef struct { - Strbuf* unk_00; - Strbuf* unk_04; + Strbuf *unk_00; + Strbuf *unk_04; u32 unk_08; u32 unk_0C; u16 unk_10; diff --git a/include/overlay088/ov88_0223B140.h b/include/overlay088/ov88_0223B140.h index 6e936dd0f0..8d10741b93 100644 --- a/include/overlay088/ov88_0223B140.h +++ b/include/overlay088/ov88_0223B140.h @@ -1,14 +1,16 @@ #ifndef POKEPLATINUM_OV88_0223B140_H #define POKEPLATINUM_OV88_0223B140_H -#include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_02095E80_decl.h" +#include "struct_decls/struct_party_decl.h" + +#include "overlay_manager.h" -int ov88_0223B140(OverlayManager * param0, int * param1); -int ov88_0223B57C(OverlayManager * param0, int * param1); -int ov88_0223C03C(OverlayManager * param0, int * param1); +int ov88_0223B140(OverlayManager *param0, int *param1); +int ov88_0223B57C(OverlayManager *param0, int *param1); +int ov88_0223C03C(OverlayManager *param0, int *param1); void ov88_0223D044(int param0, int param1, int param2); -void ov88_0223D058(UnkStruct_02095E80 * param0, int param1, int param2); -void ov88_0223D098(int param0, Party * param1, int param2); +void ov88_0223D058(UnkStruct_02095E80 *param0, int param1, int param2); +void ov88_0223D098(int param0, Party *param1, int param2); #endif // POKEPLATINUM_OV88_0223B140_H diff --git a/include/overlay088/ov88_0223E9C4.h b/include/overlay088/ov88_0223E9C4.h index 4492d15e24..aef230f3c3 100644 --- a/include/overlay088/ov88_0223E9C4.h +++ b/include/overlay088/ov88_0223E9C4.h @@ -3,19 +3,21 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "game_options.h" #include "struct_defs/struct_0205AA50.h" -void ov88_0223E9C4(BGL * param0, Window * param1, Options * param2); -void ov88_0223EC04(Window * param0); -void ov88_0223EC78(Window * param0, Strbuf *param1, int param2, u32 param3, int param4, int param5); -int ov88_0223ECBC(Window * param0, int param1, int param2, MessageLoader * param3, StringTemplate * param4); -u32 ov88_0223ED2C(BGL * param0, UIControlData ** param1, int * param2); -void ov88_0223ED80(Window * param0); -BmpList * ov88_0223ED94(ResourceMetadata * param0, int param1, Window * param2, BGL * param3); +#include "game_options.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" + +void ov88_0223E9C4(BGL *param0, Window *param1, Options *param2); +void ov88_0223EC04(Window *param0); +void ov88_0223EC78(Window *param0, Strbuf *param1, int param2, u32 param3, int param4, int param5); +int ov88_0223ECBC(Window *param0, int param1, int param2, MessageLoader *param3, StringTemplate *param4); +u32 ov88_0223ED2C(BGL *param0, UIControlData **param1, int *param2); +void ov88_0223ED80(Window *param0); +BmpList *ov88_0223ED94(ResourceMetadata *param0, int param1, Window *param2, BGL *param3); #endif // POKEPLATINUM_OV88_0223E9C4_H diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h index 30884eaea2..3df53e8de1 100644 --- a/include/overlay088/struct_ov88_0223C370.h +++ b/include/overlay088/struct_ov88_0223C370.h @@ -1,36 +1,38 @@ #ifndef POKEPLATINUM_STRUCT_OV88_0223C370_H #define POKEPLATINUM_STRUCT_OV88_0223C370_H -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "game_options.h" #include "struct_decls/struct_02027F8C_decl.h" -#include "journal.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202CD88_decl.h" +#include "struct_decls/struct_party_decl.h" + #include "field/field_system_decl.h" + +#include "game_options.h" +#include "journal.h" #include "pokemon.h" -#include "struct_decls/struct_party_decl.h" #include "savedata.h" +#include "trainer_info.h" typedef struct { - FieldSystem * fieldSystem; - TrainerInfo * unk_04; - Party * unk_08; - UnkStruct_02027F8C * unk_0C; - SaveData * unk_10; - UnkStruct_0202C878 * unk_14; - Options * unk_18; - Journal * unk_1C; - UnkStruct_0202CD88 * unk_20; - PokedexData * unk_24; + FieldSystem *fieldSystem; + TrainerInfo *unk_04; + Party *unk_08; + UnkStruct_02027F8C *unk_0C; + SaveData *unk_10; + UnkStruct_0202C878 *unk_14; + Options *unk_18; + Journal *unk_1C; + UnkStruct_0202CD88 *unk_20; + PokedexData *unk_24; int unk_28; int unk_2C; int unk_30; int unk_34; - TrainerInfo * unk_38; - Pokemon * unk_3C; - Pokemon * unk_40; + TrainerInfo *unk_38; + Pokemon *unk_3C; + Pokemon *unk_40; } UnkStruct_ov88_0223C370; #endif // POKEPLATINUM_STRUCT_OV88_0223C370_H diff --git a/include/overlay090/ov90_021D0D80.h b/include/overlay090/ov90_021D0D80.h index 533161bc32..0b9fa13e2a 100644 --- a/include/overlay090/ov90_021D0D80.h +++ b/include/overlay090/ov90_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV90_021D0D80_H #define POKEPLATINUM_OV90_021D0D80_H +#include "overlay_manager.h" -int ov90_021D0D80(OverlayManager * param0, int * param1); -int ov90_021D0DE8(OverlayManager * param0, int * param1); -int ov90_021D0E04(OverlayManager * param0, int * param1); +int ov90_021D0D80(OverlayManager *param0, int *param1); +int ov90_021D0DE8(OverlayManager *param0, int *param1); +int ov90_021D0E04(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV90_021D0D80_H diff --git a/include/overlay090/struct_ov90_021D0D80.h b/include/overlay090/struct_ov90_021D0D80.h index e61ee7f966..0773985423 100644 --- a/include/overlay090/struct_ov90_021D0D80.h +++ b/include/overlay090/struct_ov90_021D0D80.h @@ -4,7 +4,7 @@ #include "savedata.h" typedef struct { - SaveData * unk_00; + SaveData *unk_00; u16 unk_04; u16 unk_06; } UnkStruct_ov90_021D0D80; diff --git a/include/overlay090/struct_ov90_021D1750.h b/include/overlay090/struct_ov90_021D1750.h index d588f5c0cb..b414b1a0e9 100644 --- a/include/overlay090/struct_ov90_021D1750.h +++ b/include/overlay090/struct_ov90_021D1750.h @@ -10,8 +10,8 @@ typedef struct { u16 unk_18[4]; union { struct { - u8 unk_20_val1_0 : 1; - u8 unk_20_val1_1 : 1; + u8 unk_20_val1_0 : 1; + u8 unk_20_val1_1 : 1; u8 : 6; }; u8 unk_20_val2; diff --git a/include/overlay091/ov91_021D0D80.h b/include/overlay091/ov91_021D0D80.h index 4ecc67bfa2..b2d75e5119 100644 --- a/include/overlay091/ov91_021D0D80.h +++ b/include/overlay091/ov91_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV91_021D0D80_H #define POKEPLATINUM_OV91_021D0D80_H +#include "overlay_manager.h" -int ov91_021D0D80(OverlayManager * param0, int * param1); -int ov91_021D0E08(OverlayManager * param0, int * param1); -int ov91_021D0EBC(OverlayManager * param0, int * param1); +int ov91_021D0D80(OverlayManager *param0, int *param1); +int ov91_021D0E08(OverlayManager *param0, int *param1); +int ov91_021D0EBC(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV91_021D0D80_H diff --git a/include/overlay092/ov92_021D0D80.h b/include/overlay092/ov92_021D0D80.h index f7faec13d8..2f8c290594 100644 --- a/include/overlay092/ov92_021D0D80.h +++ b/include/overlay092/ov92_021D0D80.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_OV92_021D0D80_H #define POKEPLATINUM_OV92_021D0D80_H +#include "overlay_manager.h" #include "strbuf.h" -int ov92_021D0D80(OverlayManager * param0, int * param1); -int ov92_021D0EB8(OverlayManager * param0, int * param1); -int ov92_021D1478(OverlayManager * param0, int * param1); +int ov92_021D0D80(OverlayManager *param0, int *param1); +int ov92_021D0EB8(OverlayManager *param0, int *param1); +int ov92_021D1478(OverlayManager *param0, int *param1); BOOL ov92_021D27E8(int param0, int param1, Strbuf *param2, Strbuf *param3, int param4); BOOL ov92_021D2854(int param0); diff --git a/include/overlay093/ov93_021D0D80.h b/include/overlay093/ov93_021D0D80.h index 231322f085..870fda588e 100644 --- a/include/overlay093/ov93_021D0D80.h +++ b/include/overlay093/ov93_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV93_021D0D80_H #define POKEPLATINUM_OV93_021D0D80_H +#include "overlay_manager.h" -int ov93_021D0D80(OverlayManager * param0, int * param1); -int ov93_021D0E70(OverlayManager * param0, int * param1); -int ov93_021D0F58(OverlayManager * param0, int * param1); +int ov93_021D0D80(OverlayManager *param0, int *param1); +int ov93_021D0E70(OverlayManager *param0, int *param1); +int ov93_021D0F58(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV93_021D0D80_H diff --git a/include/overlay093/ov93_021D111C.h b/include/overlay093/ov93_021D111C.h index 5098daa2df..629ddcb9f6 100644 --- a/include/overlay093/ov93_021D111C.h +++ b/include/overlay093/ov93_021D111C.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV93_021D111C_H #define POKEPLATINUM_OV93_021D111C_H +#include "overlay_manager.h" -int ov93_021D111C(OverlayManager * param0, int * param1); -int ov93_021D120C(OverlayManager * param0, int * param1); -int ov93_021D12F0(OverlayManager * param0, int * param1); +int ov93_021D111C(OverlayManager *param0, int *param1); +int ov93_021D120C(OverlayManager *param0, int *param1); +int ov93_021D12F0(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV93_021D111C_H diff --git a/include/overlay094/ov94_0223B140.h b/include/overlay094/ov94_0223B140.h index 0e42cee5c4..b6cc56a920 100644 --- a/include/overlay094/ov94_0223B140.h +++ b/include/overlay094/ov94_0223B140.h @@ -12,17 +12,17 @@ void ov94_0223B15C(void); void ov94_0223B7AC(void); BOOL ov94_0223B7B8(void); s32 ov94_0223B7D8(void); -void ov94_0223B7E4(const UnkStruct_ov94_0223BA88 * param0); +void ov94_0223B7E4(const UnkStruct_ov94_0223BA88 *param0); void ov94_0223B834(void); -void ov94_0223B888(UnkStruct_ov94_0223BA88 * param0); -void ov94_0223B8D8(UnkStruct_ov94_0223BA88 * param0); +void ov94_0223B888(UnkStruct_ov94_0223BA88 *param0); +void ov94_0223B8D8(UnkStruct_ov94_0223BA88 *param0); void ov94_0223B928(void); void ov94_0223B96C(void); -void ov94_0223B9B0(const UnkStruct_ov94_0223BA88_sub3 * param0, s32 param1, UnkStruct_ov94_0223BA88 * param2); -void ov94_0223BA24(const UnkStruct_ov94_0223BA24 * param0, UnkStruct_ov94_0223BA88 * param1); -void ov94_0223BA88(s32 param0, const UnkStruct_ov94_0223BA88 * param1, UnkStruct_ov94_0223BA88 * param2); +void ov94_0223B9B0(const UnkStruct_ov94_0223BA88_sub3 *param0, s32 param1, UnkStruct_ov94_0223BA88 *param2); +void ov94_0223BA24(const UnkStruct_ov94_0223BA24 *param0, UnkStruct_ov94_0223BA88 *param1); +void ov94_0223BA88(s32 param0, const UnkStruct_ov94_0223BA88 *param1, UnkStruct_ov94_0223BA88 *param2); void ov94_0223BAEC(void); void ov94_0223BB40(void); -void ov94_0223BB84(const UnkStruct_ov96_0223B574 * param0, UnkStruct_ov96_0223B574_1 * param1); +void ov94_0223BB84(const UnkStruct_ov96_0223B574 *param0, UnkStruct_ov96_0223B574_1 *param1); #endif // POKEPLATINUM_OV94_0223B140_H diff --git a/include/overlay094/ov94_0223BCB0.h b/include/overlay094/ov94_0223BCB0.h index bab0a1d0e3..c5a05783d1 100644 --- a/include/overlay094/ov94_0223BCB0.h +++ b/include/overlay094/ov94_0223BCB0.h @@ -4,23 +4,26 @@ #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay094/struct_ov94_0223FD4C_decl.h" #include "overlay115/struct_ov115_02261520.h" -int ov94_0223BCB0(OverlayManager * param0, int * param1); -int ov94_0223BE2C(OverlayManager * param0, int * param1); -int ov94_0223BF54(OverlayManager * param0, int * param1); -void ov94_0223C300(UnkStruct_ov115_02261520 * param0, UnkStruct_ov94_0223FD4C * param1, UnkStruct_ov19_021DA864 * param2, int param3); -UIControlData * ov94_0223C3C0(BGL * param0, int param1, int param2); -void ov94_0223C3F4(UnkStruct_ov94_0223FD4C * param0, int param1, int param2); -void ov94_0223C3FC(GraphicElementData * param0, int param1, int param2); +#include "overlay_manager.h" + +int ov94_0223BCB0(OverlayManager *param0, int *param1); +int ov94_0223BE2C(OverlayManager *param0, int *param1); +int ov94_0223BF54(OverlayManager *param0, int *param1); +void ov94_0223C300(UnkStruct_ov115_02261520 *param0, UnkStruct_ov94_0223FD4C *param1, UnkStruct_ov19_021DA864 *param2, int param3); +UIControlData *ov94_0223C3C0(BGL *param0, int param1, int param2); +void ov94_0223C3F4(UnkStruct_ov94_0223FD4C *param0, int param1, int param2); +void ov94_0223C3FC(GraphicElementData *param0, int param1, int param2); int ov94_0223C4B4(void); -void ov94_0223C4C0(UnkStruct_ov94_0223FD4C * param0, int param1, int param2); -void ov94_0223C4C8(UnkStruct_ov94_0223FD4C * param0); -int ov94_0223C4D4(UnkStruct_ov94_0223FD4C * param0); -void ov94_0223C584(UnkStruct_ov94_0223FD4C * param0); -void ov94_0223C5D8(UnkStruct_ov94_0223FD4C * param0); -void ov94_0223C5F4(UnkStruct_ov94_0223FD4C * param0); +void ov94_0223C4C0(UnkStruct_ov94_0223FD4C *param0, int param1, int param2); +void ov94_0223C4C8(UnkStruct_ov94_0223FD4C *param0); +int ov94_0223C4D4(UnkStruct_ov94_0223FD4C *param0); +void ov94_0223C584(UnkStruct_ov94_0223FD4C *param0); +void ov94_0223C5D8(UnkStruct_ov94_0223FD4C *param0); +void ov94_0223C5F4(UnkStruct_ov94_0223FD4C *param0); #endif // POKEPLATINUM_OV94_0223BCB0_H diff --git a/include/overlay094/ov94_0223C610.h b/include/overlay094/ov94_0223C610.h index 65a406adb0..0da260c2c0 100644 --- a/include/overlay094/ov94_0223C610.h +++ b/include/overlay094/ov94_0223C610.h @@ -1,14 +1,16 @@ #ifndef POKEPLATINUM_OV94_0223C610_H #define POKEPLATINUM_OV94_0223C610_H -#include "message.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay094/struct_ov94_0223FD4C_decl.h" -int ov94_0223C610(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0223C6D4(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0223C6F4(UnkStruct_ov94_0223FD4C * param0, int param1); -void ov94_0223D030(Window * param0, MessageLoader * param1, int param2, u16 param3); -void ov94_0223D068(UnkStruct_ov94_0223FD4C * param0); +#include "message.h" + +int ov94_0223C610(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0223C6D4(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0223C6F4(UnkStruct_ov94_0223FD4C *param0, int param1); +void ov94_0223D030(Window *param0, MessageLoader *param1, int param2, u16 param3); +void ov94_0223D068(UnkStruct_ov94_0223FD4C *param0); #endif // POKEPLATINUM_OV94_0223C610_H diff --git a/include/overlay094/ov94_0223D0C4.h b/include/overlay094/ov94_0223D0C4.h index 7aafff3a6d..d283fda7c1 100644 --- a/include/overlay094/ov94_0223D0C4.h +++ b/include/overlay094/ov94_0223D0C4.h @@ -1,17 +1,20 @@ #ifndef POKEPLATINUM_OV94_0223D0C4_H #define POKEPLATINUM_OV94_0223D0C4_H -#include "message.h" #include "struct_defs/struct_0205AA50.h" -#include "pokemon.h" + #include "overlay094/struct_ov94_0223BA88_sub2.h" #include "overlay094/struct_ov94_0223FD4C_decl.h" -int ov94_0223D0C4(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0223D19C(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0223D1B0(UnkStruct_ov94_0223FD4C * param0, int param1); -void ov94_0223D910(MessageLoader * param0, MessageLoader * param1, StringTemplate * param2, Window param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5); -void ov94_0223DA78(MessageLoader * param0, Window param1[], u16 * param2, Pokemon * param3, Window param4[]); -void ov94_0223DB2C(Pokemon * param0); +#include "message.h" +#include "pokemon.h" +#include "string_template.h" + +int ov94_0223D0C4(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0223D19C(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0223D1B0(UnkStruct_ov94_0223FD4C *param0, int param1); +void ov94_0223D910(MessageLoader *param0, MessageLoader *param1, StringTemplate *param2, Window param3[], BoxPokemon *param4, UnkStruct_ov94_0223BA88_sub2 *param5); +void ov94_0223DA78(MessageLoader *param0, Window param1[], u16 *param2, Pokemon *param3, Window param4[]); +void ov94_0223DB2C(Pokemon *param0); #endif // POKEPLATINUM_OV94_0223D0C4_H diff --git a/include/overlay094/ov94_0223DC04.h b/include/overlay094/ov94_0223DC04.h index 900c45e444..2e35c07727 100644 --- a/include/overlay094/ov94_0223DC04.h +++ b/include/overlay094/ov94_0223DC04.h @@ -3,8 +3,8 @@ #include "overlay094/struct_ov94_0223FD4C_decl.h" -int ov94_0223DC04(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0223DCE4(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0223DCF8(UnkStruct_ov94_0223FD4C * param0, int param1); +int ov94_0223DC04(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0223DCE4(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0223DCF8(UnkStruct_ov94_0223FD4C *param0, int param1); #endif // POKEPLATINUM_OV94_0223DC04_H diff --git a/include/overlay094/ov94_0223E46C.h b/include/overlay094/ov94_0223E46C.h index 08e5c9e53d..d537b372b5 100644 --- a/include/overlay094/ov94_0223E46C.h +++ b/include/overlay094/ov94_0223E46C.h @@ -3,8 +3,8 @@ #include "overlay094/struct_ov94_0223FD4C_decl.h" -int ov94_0223E46C(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0223E560(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0223E574(UnkStruct_ov94_0223FD4C * param0, int param1); +int ov94_0223E46C(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0223E560(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0223E574(UnkStruct_ov94_0223FD4C *param0, int param1); #endif // POKEPLATINUM_OV94_0223E46C_H diff --git a/include/overlay094/ov94_0223FB48.h b/include/overlay094/ov94_0223FB48.h index 08c4da1ecc..1e9c4c2f03 100644 --- a/include/overlay094/ov94_0223FB48.h +++ b/include/overlay094/ov94_0223FB48.h @@ -1,16 +1,18 @@ #ifndef POKEPLATINUM_OV94_0223FB48_H #define POKEPLATINUM_OV94_0223FB48_H -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" + #include "overlay094/struct_ov94_0223FD4C_decl.h" -int ov94_0223FB48(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0223FBBC(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0223FBDC(UnkStruct_ov94_0223FD4C * param0, int param1); +#include "pokemon.h" + +int ov94_0223FB48(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0223FBBC(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0223FBDC(UnkStruct_ov94_0223FD4C *param0, int param1); int ov94_022411D0(int param0); -BoxPokemon * ov94_022411DC(Party * param0, PCBoxes * param1, int param2, int param3); -BOOL ov94_02241498(Pokemon * param0); +BoxPokemon *ov94_022411DC(Party *param0, PCBoxes *param1, int param2, int param3); +BOOL ov94_02241498(Pokemon *param0); #endif // POKEPLATINUM_OV94_0223FB48_H diff --git a/include/overlay094/ov94_022414B8.h b/include/overlay094/ov94_022414B8.h index f5adad4bb3..c0305b6804 100644 --- a/include/overlay094/ov94_022414B8.h +++ b/include/overlay094/ov94_022414B8.h @@ -1,41 +1,44 @@ #ifndef POKEPLATINUM_OV94_022414B8_H #define POKEPLATINUM_OV94_022414B8_H +#include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0200112C_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/pokedexdata_decl.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay094/struct_ov94_0223BA88.h" #include "overlay094/struct_ov94_0223BA88_sub3.h" #include "overlay094/struct_ov94_0223FD4C_decl.h" #include "overlay094/struct_ov94_0223FD4C_sub3.h" #include "overlay094/struct_ov94_02242AAC.h" -int ov94_022414B8(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_02241548(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_02241568(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_02241B80(UnkStruct_ov94_0223BA88_sub3 * param0, int param1); -void ov94_02242158(Window * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5); -void ov94_0224218C(Window * param0, MessageLoader * param1, MessageLoader * param2, int param3, int param4, int param5, u32 param6); -void ov94_02242204(Window * param0, MessageLoader * param1, int param2, int param3, int param4, int param5, u32 param6); -void ov94_0224226C(Window * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5, int param6, int param7); -void ov94_022422B8(Window * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5, int param6); -void ov94_022422D4(MessageLoader * param0, MessageLoader * param1, StringTemplate * param2, Window param3[], int param4, int param5, int param6); -void ov94_02242368(MessageLoader * param0, MessageLoader * param1, StringTemplate * param2, Window param3[], int param4, int param5, int param6); -u16 * ov94_02242524(int param0, int param1, int * param2); -u8 * ov94_02242548(int param0); -void ov94_022425A8(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1); -BmpList * ov94_022426A8(UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3); -BmpList * ov94_022427C0(UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, PokedexData * param6); -BmpList * ov94_02242840(ResourceMetadata ** param0, Window * param1, MessageLoader * param2); -BmpList * ov94_022428B0(ResourceMetadata ** param0, Window * param1, MessageLoader * param2, int param3); -void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 * param0, int param1, int param2); +#include "message.h" +#include "string_template.h" + +int ov94_022414B8(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_02241548(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_02241568(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_02241B80(UnkStruct_ov94_0223BA88_sub3 *param0, int param1); +void ov94_02242158(Window *param0, MessageLoader *param1, int param2, int param3, int param4, u32 param5); +void ov94_0224218C(Window *param0, MessageLoader *param1, MessageLoader *param2, int param3, int param4, int param5, u32 param6); +void ov94_02242204(Window *param0, MessageLoader *param1, int param2, int param3, int param4, int param5, u32 param6); +void ov94_0224226C(Window *param0, MessageLoader *param1, int param2, int param3, int param4, u32 param5, int param6, int param7); +void ov94_022422B8(Window *param0, MessageLoader *param1, int param2, int param3, int param4, u32 param5, int param6); +void ov94_022422D4(MessageLoader *param0, MessageLoader *param1, StringTemplate *param2, Window param3[], int param4, int param5, int param6); +void ov94_02242368(MessageLoader *param0, MessageLoader *param1, StringTemplate *param2, Window param3[], int param4, int param5, int param6); +u16 *ov94_02242524(int param0, int param1, int *param2); +u8 *ov94_02242548(int param0); +void ov94_022425A8(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1); +BmpList *ov94_022426A8(UnkStruct_ov94_0223FD4C *param0, ResourceMetadata **param1, Window *param2, MessageLoader *param3); +BmpList *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, ResourceMetadata **param1, Window *param2, MessageLoader *param3, MessageLoader *param4, UnkStruct_ov94_0223FD4C_sub3 *param5, PokedexData *param6); +BmpList *ov94_02242840(ResourceMetadata **param0, Window *param1, MessageLoader *param2); +BmpList *ov94_022428B0(ResourceMetadata **param0, Window *param1, MessageLoader *param2, int param3); +void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 *param0, int param1, int param2); int ov94_02242970(int param0, int param1, int param2); -BmpList * ov94_022429B4(ResourceMetadata ** param0, Window * param1, MessageLoader * param2, MessageLoader * param3); -void ov94_02242A44(UnkStruct_ov94_0223FD4C * param0, int param1); -u32 ov94_02242A6C(BmpList * param0, u16 * param1); -void ov94_02242AAC(UnkStruct_ov94_02242AAC * param0); -void ov94_02242AC4(UnkStruct_ov94_02242AAC * param0, int param1, int param2, int param3); +BmpList *ov94_022429B4(ResourceMetadata **param0, Window *param1, MessageLoader *param2, MessageLoader *param3); +void ov94_02242A44(UnkStruct_ov94_0223FD4C *param0, int param1); +u32 ov94_02242A6C(BmpList *param0, u16 *param1); +void ov94_02242AAC(UnkStruct_ov94_02242AAC *param0); +void ov94_02242AC4(UnkStruct_ov94_02242AAC *param0, int param1, int param2, int param3); #endif // POKEPLATINUM_OV94_022414B8_H diff --git a/include/overlay094/ov94_02242AD0.h b/include/overlay094/ov94_02242AD0.h index 7d146013bd..4e691a266d 100644 --- a/include/overlay094/ov94_02242AD0.h +++ b/include/overlay094/ov94_02242AD0.h @@ -3,8 +3,8 @@ #include "overlay094/struct_ov94_0223FD4C_decl.h" -int ov94_02242AD0(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_02242B14(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_02242B34(UnkStruct_ov94_0223FD4C * param0, int param1); +int ov94_02242AD0(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_02242B14(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_02242B34(UnkStruct_ov94_0223FD4C *param0, int param1); #endif // POKEPLATINUM_OV94_02242AD0_H diff --git a/include/overlay094/ov94_02243EF8.h b/include/overlay094/ov94_02243EF8.h index 30775215fc..204ffbcfda 100644 --- a/include/overlay094/ov94_02243EF8.h +++ b/include/overlay094/ov94_02243EF8.h @@ -3,12 +3,12 @@ #include "overlay094/struct_ov94_0223FD4C_decl.h" -void ov94_02243EF8(UnkStruct_ov94_0223FD4C * param0, int param1); -void ov94_02243FA8(UnkStruct_ov94_0223FD4C * param0, int param1); -void ov94_022440B8(UnkStruct_ov94_0223FD4C * param0, int param1); +void ov94_02243EF8(UnkStruct_ov94_0223FD4C *param0, int param1); +void ov94_02243FA8(UnkStruct_ov94_0223FD4C *param0, int param1); +void ov94_022440B8(UnkStruct_ov94_0223FD4C *param0, int param1); int ov94_02244214(int param0); -void ov94_02244234(UnkStruct_ov94_0223FD4C * param0, int param1, int param2); -void ov94_022442E4(UnkStruct_ov94_0223FD4C * param0); -void ov94_022443B8(UnkStruct_ov94_0223FD4C * param0); +void ov94_02244234(UnkStruct_ov94_0223FD4C *param0, int param1, int param2); +void ov94_022442E4(UnkStruct_ov94_0223FD4C *param0); +void ov94_022443B8(UnkStruct_ov94_0223FD4C *param0); #endif // POKEPLATINUM_OV94_02243EF8_H diff --git a/include/overlay094/ov94_022443E0.h b/include/overlay094/ov94_022443E0.h index 7df9381031..aa7907d31f 100644 --- a/include/overlay094/ov94_022443E0.h +++ b/include/overlay094/ov94_022443E0.h @@ -3,8 +3,8 @@ #include "overlay094/struct_ov94_0223FD4C_decl.h" -int ov94_022443E0(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_02244490(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_022444BC(UnkStruct_ov94_0223FD4C * param0, int param1); +int ov94_022443E0(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_02244490(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_022444BC(UnkStruct_ov94_0223FD4C *param0, int param1); #endif // POKEPLATINUM_OV94_022443E0_H diff --git a/include/overlay094/ov94_022444C8.h b/include/overlay094/ov94_022444C8.h index 31b9b63737..9e56d4e486 100644 --- a/include/overlay094/ov94_022444C8.h +++ b/include/overlay094/ov94_022444C8.h @@ -3,8 +3,8 @@ #include "overlay094/struct_ov94_0223FD4C_decl.h" -int ov94_022444C8(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_02244678(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_0224484C(UnkStruct_ov94_0223FD4C * param0, int param1); +int ov94_022444C8(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_02244678(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_0224484C(UnkStruct_ov94_0223FD4C *param0, int param1); #endif // POKEPLATINUM_OV94_022444C8_H diff --git a/include/overlay094/ov94_02244950.h b/include/overlay094/ov94_02244950.h index fb05c39683..04270e05e8 100644 --- a/include/overlay094/ov94_02244950.h +++ b/include/overlay094/ov94_02244950.h @@ -1,17 +1,19 @@ #ifndef POKEPLATINUM_OV94_02244950_H #define POKEPLATINUM_OV94_02244950_H -#include "message.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay094/struct_ov94_0223FD4C_decl.h" -int ov94_02244950(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_022449FC(UnkStruct_ov94_0223FD4C * param0, int param1); -int ov94_02244A2C(UnkStruct_ov94_0223FD4C * param0, int param1); -void ov94_02245824(UnkStruct_ov94_0223FD4C * param0, MessageLoader * param1, int param2, int param3, u16 param4); -void ov94_022458CC(Window * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); -void ov94_02245900(Window * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); -void ov94_02245934(UnkStruct_ov94_0223FD4C * param0); +#include "message.h" +#include "strbuf.h" + +int ov94_02244950(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_022449FC(UnkStruct_ov94_0223FD4C *param0, int param1); +int ov94_02244A2C(UnkStruct_ov94_0223FD4C *param0, int param1); +void ov94_02245824(UnkStruct_ov94_0223FD4C *param0, MessageLoader *param1, int param2, int param3, u16 param4); +void ov94_022458CC(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); +void ov94_02245900(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); +void ov94_02245934(UnkStruct_ov94_0223FD4C *param0); #endif // POKEPLATINUM_OV94_02244950_H diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h index eaefe6de90..910bf875a1 100644 --- a/include/overlay094/struct_ov94_0223FD4C.h +++ b/include/overlay094/struct_ov94_0223FD4C.h @@ -1,27 +1,24 @@ #ifndef POKEPLATINUM_STRUCT_OV94_0223FD4C_H #define POKEPLATINUM_STRUCT_OV94_0223FD4C_H +#include +#include + #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "overlay_manager.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" -#include "string_template.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202B370_decl.h" -#include "struct_defs/struct_0203E0FC.h" -#include "struct_defs/struct_0205AA50.h" -#include "pokemon.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_defs/pokemon_summary.h" +#include "struct_defs/struct_0200C738.h" +#include "struct_defs/struct_0203E0FC.h" +#include "struct_defs/struct_0205AA50.h" + #include "overlay006/struct_ov6_02246254.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay061/struct_ov61_0222C3B0.h" @@ -35,13 +32,18 @@ #include "overlay096/struct_ov96_0223B574.h" #include "overlay096/struct_ov96_0223B574_1.h" -#include -#include +#include "message.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" +#include "trainer_info.h" typedef struct UnkStruct_ov94_0223FD4C_t { - UnkStruct_0203E0FC * unk_00; - BGL * unk_04; - UnkStruct_0202B370 * unk_08; + UnkStruct_0203E0FC *unk_00; + BGL *unk_04; + UnkStruct_0202B370 *unk_08; int unk_0C; int unk_10; int unk_14; @@ -60,13 +62,13 @@ typedef struct UnkStruct_ov94_0223FD4C_t { int unk_40; int unk_44; int unk_48; - void * unk_4C; + void *unk_4C; NNSFndHeapHandle unk_50; DWCInetControl unk_54; - OverlayManager * unk_B4; + OverlayManager *unk_B4; PokemonSummary unk_B8; UnkStruct_ov6_02246254 unk_E8; - UnkStruct_0207AE68 * unk_100; + UnkStruct_0207AE68 *unk_100; int unk_104; u16 unk_108; u16 unk_10A; @@ -74,10 +76,10 @@ typedef struct UnkStruct_ov94_0223FD4C_t { u16 unk_10E; u16 unk_110; u16 unk_112; - BoxPokemon * unk_114; + BoxPokemon *unk_114; int unk_118; int unk_11C; - TrainerInfo * unk_120; + TrainerInfo *unk_120; UnkStruct_ov94_0223FD4C_sub1 unk_124; UnkStruct_ov94_0223BA88 unk_12C; UnkStruct_ov94_0223BA88 unk_250[7]; @@ -87,34 +89,34 @@ typedef struct UnkStruct_ov94_0223FD4C_t { UnkStruct_ov94_0223BA88_sub3 unk_B7A; UnkStruct_ov94_0223BA88_sub3 unk_B80; int unk_B88; - StringTemplate * unk_B8C; - MessageLoader * unk_B90; - MessageLoader * unk_B94; - MessageLoader * unk_B98; - MessageLoader * unk_B9C; - MessageLoader * unk_BA0; - Strbuf* unk_BA4; - Strbuf* unk_BA8; - Strbuf* unk_BAC; - Strbuf* unk_BB0; - Strbuf* unk_BB4[10]; - Strbuf* unk_BDC; + StringTemplate *unk_B8C; + MessageLoader *unk_B90; + MessageLoader *unk_B94; + MessageLoader *unk_B98; + MessageLoader *unk_B9C; + MessageLoader *unk_BA0; + Strbuf *unk_BA4; + Strbuf *unk_BA8; + Strbuf *unk_BAC; + Strbuf *unk_BB0; + Strbuf *unk_BB4[10]; + Strbuf *unk_BDC; int unk_BE0; - GraphicElementManager * unk_BE4; + GraphicElementManager *unk_BE4; UnkStruct_0200C738 unk_BE8; - UnkStruct_02009714 * unk_D74[4]; - UnkStruct_02009DC8 * unk_D84[3][4]; + UnkStruct_02009714 *unk_D74[4]; + UnkStruct_02009DC8 *unk_D84[3][4]; UnkStruct_ov19_021DA864 unk_DB4; UnkStruct_ov19_021DA864 unk_DD8; UnkStruct_ov19_021DA864 unk_DFC; - GraphicElementData * unk_E20; - GraphicElementData * unk_E24; - GraphicElementData * unk_E28[30]; - GraphicElementData * unk_EA0[30]; - GraphicElementData * unk_F18[6]; - GraphicElementData * unk_F30; - GraphicElementData * unk_F34[8]; - GraphicElementData * unk_F54[2]; + GraphicElementData *unk_E20; + GraphicElementData *unk_E24; + GraphicElementData *unk_E28[30]; + GraphicElementData *unk_EA0[30]; + GraphicElementData *unk_F18[6]; + GraphicElementData *unk_F30; + GraphicElementData *unk_F34[8]; + GraphicElementData *unk_F54[2]; Window unk_F5C; Window unk_F6C; Window unk_F7C; @@ -123,29 +125,29 @@ typedef struct UnkStruct_ov94_0223FD4C_t { Window unk_FCC[13]; Window unk_109C; Window unk_10AC[2]; - ResourceMetadata * unk_10CC; - UIControlData * unk_10D0; - UIControlData * unk_10D4; - BmpList * unk_10D8; - void * unk_10DC; + ResourceMetadata *unk_10CC; + UIControlData *unk_10D0; + UIControlData *unk_10D4; + BmpList *unk_10D8; + void *unk_10DC; int unk_10E0; - UnkStruct_ov94_0223FD4C_sub3 * unk_10E4; + UnkStruct_ov94_0223FD4C_sub3 *unk_10E4; u16 unk_10E8; u16 unk_10EA; - SysTask * unk_10EC; + SysTask *unk_10EC; u16 unk_10F0; u16 unk_10F2; - void * unk_10F4; - NNSG2dCharacterData * unk_10F8; - void * unk_10FC; - NNSG2dPaletteData * unk_1100; - Pokemon * unk_1104; - UnkStruct_ov94_0223FD4C_sub2 * unk_1108; + void *unk_10F4; + NNSG2dCharacterData *unk_10F8; + void *unk_10FC; + NNSG2dPaletteData *unk_1100; + Pokemon *unk_1104; + UnkStruct_ov94_0223FD4C_sub2 *unk_1108; u16 unk_110C; u16 unk_110E; u32 unk_1110; - void * unk_1114; - void (* unk_1118)(void * param0); + void *unk_1114; + void (*unk_1118)(void *param0); UnkStruct_ov94_02242AAC unk_111C; UnkStruct_ov96_0223B574 unk_1144; UnkStruct_ov96_0223B574_1 unk_11A8; diff --git a/include/overlay094/struct_ov94_0223FD4C_sub3.h b/include/overlay094/struct_ov94_0223FD4C_sub3.h index 7c8abe73df..d9554d6d44 100644 --- a/include/overlay094/struct_ov94_0223FD4C_sub3.h +++ b/include/overlay094/struct_ov94_0223FD4C_sub3.h @@ -11,8 +11,8 @@ typedef struct { u16 unk_0A; int unk_0C; int unk_10; - u8 * unk_14; - u16 * unk_18; + u8 *unk_14; + u16 *unk_18; int unk_1C; int unk_20; int unk_24; diff --git a/include/overlay095/ov95_02246C20.h b/include/overlay095/ov95_02246C20.h index 428661629a..3d9cadf493 100644 --- a/include/overlay095/ov95_02246C20.h +++ b/include/overlay095/ov95_02246C20.h @@ -1,45 +1,47 @@ #ifndef POKEPLATINUM_OV95_02246C20_H #define POKEPLATINUM_OV95_02246C20_H -#include "overlay_manager.h" -#include "message.h" -#include "string_template.h" +#include + #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "pokemon.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay095/struct_ov95_02247004_decl.h" #include "overlay095/struct_ov95_022472C4_decl.h" #include "overlay095/struct_ov95_02247568.h" #include "overlay095/struct_ov95_02247628_decl.h" -#include +#include "message.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "string_template.h" -int ov95_02246C20(OverlayManager * param0, int * param1); -int ov95_02246E1C(OverlayManager * param0, int * param1); -int ov95_02246E7C(OverlayManager * param0, int * param1); -UnkStruct_ov95_02247004 * ov95_02246F30(BOOL * param0, int param1); -void ov95_02247004(UnkStruct_ov95_02247004 * param0); -void ov95_02247018(UnkStruct_ov95_02247004 * param0); -UnkStruct_ov95_022472C4 * ov95_022472C4(BGL * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, int param5, volatile BOOL * param6); -void ov95_022473E8(UnkStruct_ov95_02247628 * param0, int param1, u32 param2, u32 param3, BOOL param4); -void ov95_022474D4(UnkStruct_ov95_02247628 * param0, int param1, u32 param2, u32 param3, u32 param4, u32 param5); -void ov95_02247568(UnkStruct_ov95_02247568 * param0, u32 param1, u32 param2, u32 param3); -void ov95_022475A0(UnkStruct_ov95_02247568 * param0); -void ov95_022475C4(UnkStruct_ov19_021DA864 * param0, UnkStruct_ov95_02247568 * param1, NNSG2dImageProxy * param2, NNSG2dImagePaletteProxy * param3, u32 param4); -GraphicElementData * ov95_022475E4(UnkStruct_ov95_02247628 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5); -BGL * ov95_02247628(UnkStruct_ov95_02247628 * param0); -StringTemplate * ov95_0224762C(UnkStruct_ov95_02247628 * param0); -MessageLoader * ov95_02247630(UnkStruct_ov95_02247628 * param0); -const BoxPokemon * ov95_02247634(UnkStruct_ov95_02247628 * param0); -const BoxPokemon * ov95_0224763C(UnkStruct_ov95_02247628 * param0); -u32 ov95_02247644(UnkStruct_ov95_02247628 * param0); -u16 ov95_0224764C(UnkStruct_ov95_02247628 * param0); -u16 ov95_02247654(UnkStruct_ov95_02247628 * param0); -u16 ov95_02247660(UnkStruct_ov95_02247628 * param0); -u16 ov95_02247668(UnkStruct_ov95_02247628 * param0); -int ov95_02247674(UnkStruct_ov95_02247628 * param0); -int ov95_02247680(UnkStruct_ov95_02247628 * param0); -void ov95_022476C8(void * param0); +int ov95_02246C20(OverlayManager *param0, int *param1); +int ov95_02246E1C(OverlayManager *param0, int *param1); +int ov95_02246E7C(OverlayManager *param0, int *param1); +UnkStruct_ov95_02247004 *ov95_02246F30(BOOL *param0, int param1); +void ov95_02247004(UnkStruct_ov95_02247004 *param0); +void ov95_02247018(UnkStruct_ov95_02247004 *param0); +UnkStruct_ov95_022472C4 *ov95_022472C4(BGL *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, int param5, volatile BOOL *param6); +void ov95_022473E8(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 param3, BOOL param4); +void ov95_022474D4(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 param3, u32 param4, u32 param5); +void ov95_02247568(UnkStruct_ov95_02247568 *param0, u32 param1, u32 param2, u32 param3); +void ov95_022475A0(UnkStruct_ov95_02247568 *param0); +void ov95_022475C4(UnkStruct_ov19_021DA864 *param0, UnkStruct_ov95_02247568 *param1, NNSG2dImageProxy *param2, NNSG2dImagePaletteProxy *param3, u32 param4); +GraphicElementData *ov95_022475E4(UnkStruct_ov95_02247628 *param0, UnkStruct_ov19_021DA864 *param1, u32 param2, u32 param3, u32 param4, int param5); +BGL *ov95_02247628(UnkStruct_ov95_02247628 *param0); +StringTemplate *ov95_0224762C(UnkStruct_ov95_02247628 *param0); +MessageLoader *ov95_02247630(UnkStruct_ov95_02247628 *param0); +const BoxPokemon *ov95_02247634(UnkStruct_ov95_02247628 *param0); +const BoxPokemon *ov95_0224763C(UnkStruct_ov95_02247628 *param0); +u32 ov95_02247644(UnkStruct_ov95_02247628 *param0); +u16 ov95_0224764C(UnkStruct_ov95_02247628 *param0); +u16 ov95_02247654(UnkStruct_ov95_02247628 *param0); +u16 ov95_02247660(UnkStruct_ov95_02247628 *param0); +u16 ov95_02247668(UnkStruct_ov95_02247628 *param0); +int ov95_02247674(UnkStruct_ov95_02247628 *param0); +int ov95_02247680(UnkStruct_ov95_02247628 *param0); +void ov95_022476C8(void *param0); #endif // POKEPLATINUM_OV95_02246C20_H diff --git a/include/overlay095/ov95_022476F0.h b/include/overlay095/ov95_022476F0.h index ae57c3b289..324916e8d5 100644 --- a/include/overlay095/ov95_022476F0.h +++ b/include/overlay095/ov95_022476F0.h @@ -1,28 +1,28 @@ #ifndef POKEPLATINUM_OV95_022476F0_H #define POKEPLATINUM_OV95_022476F0_H +#include + #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" #include "overlay115/camera_angle.h" -#include - -UnkStruct_ov95_0224773C * ov95_022476F0(u32 param0, fx32 param1, fx32 param2, fx32 param3); -void ov95_0224773C(UnkStruct_ov95_0224773C * param0); -void ov95_02247770(UnkStruct_ov95_0224773C * param0); -UnkStruct_ov95_02247958 * ov95_022478B4(UnkStruct_ov95_0224773C * param0, int param1, u32 param2, u32 param3, fx32 param4, fx32 param5, fx32 param6, BOOL param7); -void ov95_02247958(const UnkStruct_ov95_02247958 * param0, VecFx32 * param1); -void ov95_02247968(UnkStruct_ov95_02247958 * param0, const VecFx32 * param1); -void ov95_02247978(const UnkStruct_ov95_02247958 * param0, VecFx16 * param1); -void ov95_02247990(UnkStruct_ov95_02247958 * param0, const VecFx16 * param1); -void ov95_022479A8(UnkStruct_ov95_02247958 * param0, BOOL param1); -void ov95_022479AC(UnkStruct_ov95_02247958 * param0, int param1); -void ov95_022479D4(UnkStruct_ov95_02247958 * param0, fx32 param1); -BOOL ov95_022479DC(UnkStruct_ov95_02247958 * param0); -void ov95_02247A90(UnkStruct_ov95_0224773C * param0, VecFx32 * param1); -void ov95_02247AB0(UnkStruct_ov95_0224773C * param0, const CameraAngle *cameraAngle); -void ov95_02247AC0(UnkStruct_ov95_0224773C * param0, const CameraAngle *cameraAngle); -void ov95_02247AD0(UnkStruct_ov95_0224773C * param0, u8 param1); -void ov95_02247AE0(UnkStruct_ov95_0224773C * param0, u16 param1); +UnkStruct_ov95_0224773C *ov95_022476F0(u32 param0, fx32 param1, fx32 param2, fx32 param3); +void ov95_0224773C(UnkStruct_ov95_0224773C *param0); +void ov95_02247770(UnkStruct_ov95_0224773C *param0); +UnkStruct_ov95_02247958 *ov95_022478B4(UnkStruct_ov95_0224773C *param0, int param1, u32 param2, u32 param3, fx32 param4, fx32 param5, fx32 param6, BOOL param7); +void ov95_02247958(const UnkStruct_ov95_02247958 *param0, VecFx32 *param1); +void ov95_02247968(UnkStruct_ov95_02247958 *param0, const VecFx32 *param1); +void ov95_02247978(const UnkStruct_ov95_02247958 *param0, VecFx16 *param1); +void ov95_02247990(UnkStruct_ov95_02247958 *param0, const VecFx16 *param1); +void ov95_022479A8(UnkStruct_ov95_02247958 *param0, BOOL param1); +void ov95_022479AC(UnkStruct_ov95_02247958 *param0, int param1); +void ov95_022479D4(UnkStruct_ov95_02247958 *param0, fx32 param1); +BOOL ov95_022479DC(UnkStruct_ov95_02247958 *param0); +void ov95_02247A90(UnkStruct_ov95_0224773C *param0, VecFx32 *param1); +void ov95_02247AB0(UnkStruct_ov95_0224773C *param0, const CameraAngle *cameraAngle); +void ov95_02247AC0(UnkStruct_ov95_0224773C *param0, const CameraAngle *cameraAngle); +void ov95_02247AD0(UnkStruct_ov95_0224773C *param0, u8 param1); +void ov95_02247AE0(UnkStruct_ov95_0224773C *param0, u16 param1); #endif // POKEPLATINUM_OV95_022476F0_H diff --git a/include/overlay095/ov95_02247B6C.h b/include/overlay095/ov95_02247B6C.h index ea75918286..e41454e44c 100644 --- a/include/overlay095/ov95_02247B6C.h +++ b/include/overlay095/ov95_02247B6C.h @@ -3,8 +3,8 @@ #include "overlay095/struct_ov95_02247628_decl.h" -void * ov95_02247B6C(UnkStruct_ov95_02247628 * param0); -void ov95_02247BC8(void * param0); -BOOL ov95_02247C34(void * param0, int * param1); +void *ov95_02247B6C(UnkStruct_ov95_02247628 *param0); +void ov95_02247BC8(void *param0); +BOOL ov95_02247C34(void *param0, int *param1); #endif // POKEPLATINUM_OV95_02247B6C_H diff --git a/include/overlay095/ov95_02248590.h b/include/overlay095/ov95_02248590.h index 19d65abd6b..25e2db0458 100644 --- a/include/overlay095/ov95_02248590.h +++ b/include/overlay095/ov95_02248590.h @@ -3,8 +3,8 @@ #include "overlay095/struct_ov95_02247628_decl.h" -void * ov95_02248590(UnkStruct_ov95_02247628 * param0); -void ov95_022485FC(void * param0); -BOOL ov95_02248650(void * param0, int * param1); +void *ov95_02248590(UnkStruct_ov95_02247628 *param0); +void ov95_022485FC(void *param0); +BOOL ov95_02248650(void *param0, int *param1); #endif // POKEPLATINUM_OV95_02248590_H diff --git a/include/overlay095/ov95_02249740.h b/include/overlay095/ov95_02249740.h index 70887e29b4..c1b0727646 100644 --- a/include/overlay095/ov95_02249740.h +++ b/include/overlay095/ov95_02249740.h @@ -3,8 +3,8 @@ #include "overlay095/struct_ov95_02247628_decl.h" -void * ov95_02249740(UnkStruct_ov95_02247628 * param0); -void ov95_02249770(void * param0); -BOOL ov95_022497A0(void * param0, int * param1); +void *ov95_02249740(UnkStruct_ov95_02247628 *param0); +void ov95_02249770(void *param0); +BOOL ov95_022497A0(void *param0, int *param1); #endif // POKEPLATINUM_OV95_02249740_H diff --git a/include/overlay095/ov95_02249F90.h b/include/overlay095/ov95_02249F90.h index 0abfc9b5fa..6bdd3f5736 100644 --- a/include/overlay095/ov95_02249F90.h +++ b/include/overlay095/ov95_02249F90.h @@ -3,8 +3,8 @@ #include "overlay095/struct_ov95_02247628_decl.h" -void * ov95_02249F90(UnkStruct_ov95_02247628 * param0); -void ov95_02249FB4(void * param0); -BOOL ov95_02249FC8(void * param0, int * param1); +void *ov95_02249F90(UnkStruct_ov95_02247628 *param0); +void ov95_02249FB4(void *param0); +BOOL ov95_02249FC8(void *param0, int *param1); #endif // POKEPLATINUM_OV95_02249F90_H diff --git a/include/overlay095/ov95_0224A390.h b/include/overlay095/ov95_0224A390.h index 4790041ec3..e9deb99218 100644 --- a/include/overlay095/ov95_0224A390.h +++ b/include/overlay095/ov95_0224A390.h @@ -3,8 +3,8 @@ #include "overlay095/struct_ov95_02247628_decl.h" -void * ov95_0224A390(UnkStruct_ov95_02247628 * param0); -void ov95_0224A3CC(void * param0); -BOOL ov95_0224A3FC(void * param0, int * param1); +void *ov95_0224A390(UnkStruct_ov95_02247628 *param0); +void ov95_0224A3CC(void *param0); +BOOL ov95_0224A3FC(void *param0, int *param1); #endif // POKEPLATINUM_OV95_0224A390_H diff --git a/include/overlay095/ov95_0224ABC0.h b/include/overlay095/ov95_0224ABC0.h index e213bf7542..cf718b4be1 100644 --- a/include/overlay095/ov95_0224ABC0.h +++ b/include/overlay095/ov95_0224ABC0.h @@ -3,8 +3,8 @@ #include "overlay095/struct_ov95_02247628_decl.h" -void * ov95_0224ABC0(UnkStruct_ov95_02247628 * param0); -void ov95_0224ABF4(void * param0); -BOOL ov95_0224AC2C(void * param0, int * param1); +void *ov95_0224ABC0(UnkStruct_ov95_02247628 *param0); +void ov95_0224ABF4(void *param0); +BOOL ov95_0224AC2C(void *param0, int *param1); #endif // POKEPLATINUM_OV95_0224ABC0_H diff --git a/include/overlay095/ov95_0224B3D8.h b/include/overlay095/ov95_0224B3D8.h index 233cdcb612..bddd305d78 100644 --- a/include/overlay095/ov95_0224B3D8.h +++ b/include/overlay095/ov95_0224B3D8.h @@ -3,8 +3,8 @@ #include "overlay095/struct_ov95_02247628_decl.h" -void * ov95_0224B3D8(UnkStruct_ov95_02247628 * param0); -void ov95_0224B438(void * param0); -BOOL ov95_0224B49C(void * param0, int * param1); +void *ov95_0224B3D8(UnkStruct_ov95_02247628 *param0); +void ov95_0224B438(void *param0); +BOOL ov95_0224B49C(void *param0, int *param1); #endif // POKEPLATINUM_OV95_0224B3D8_H diff --git a/include/overlay095/struct_ov95_02247568.h b/include/overlay095/struct_ov95_02247568.h index 6949d1d1f0..19e0cc8cda 100644 --- a/include/overlay095/struct_ov95_02247568.h +++ b/include/overlay095/struct_ov95_02247568.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV95_02247568_H #define POKEPLATINUM_STRUCT_OV95_02247568_H - #include typedef struct { - void * unk_00; - void * unk_04; - NNSG2dCellDataBank * unk_08; - NNSG2dAnimBankData * unk_0C; + void *unk_00; + void *unk_04; + NNSG2dCellDataBank *unk_08; + NNSG2dAnimBankData *unk_0C; } UnkStruct_ov95_02247568; #endif // POKEPLATINUM_STRUCT_OV95_02247568_H diff --git a/include/overlay096/ov96_0223B140.h b/include/overlay096/ov96_0223B140.h index 8a1da03f3f..f5b2fbe3ed 100644 --- a/include/overlay096/ov96_0223B140.h +++ b/include/overlay096/ov96_0223B140.h @@ -11,9 +11,9 @@ void ov96_0223B15C(void); BOOL ov96_0223B3D4(void); s32 ov96_0223B3F4(void); void ov96_0223B400(s32 param0); -void ov96_0223B450(s32 param0, s32 param1, UnkStruct_ov96_0223B450 * param2); -void ov96_0223B4B0(s32 param0, s32 param1, s32 param2, const UnkStruct_ov96_0223B450_sub1 * param3); +void ov96_0223B450(s32 param0, s32 param1, UnkStruct_ov96_0223B450 *param2); +void ov96_0223B4B0(s32 param0, s32 param1, s32 param2, const UnkStruct_ov96_0223B450_sub1 *param3); void ov96_0223B530(void); -void ov96_0223B574(const UnkStruct_ov96_0223B574 * param0, UnkStruct_ov96_0223B574_1 * param1); +void ov96_0223B574(const UnkStruct_ov96_0223B574 *param0, UnkStruct_ov96_0223B574_1 *param1); #endif // POKEPLATINUM_OV96_0223B140_H diff --git a/include/overlay096/ov96_0223B6A0.h b/include/overlay096/ov96_0223B6A0.h index c2ee102b88..3278f38007 100644 --- a/include/overlay096/ov96_0223B6A0.h +++ b/include/overlay096/ov96_0223B6A0.h @@ -2,19 +2,21 @@ #define POKEPLATINUM_OV96_0223B6A0_H #include "struct_decls/struct_02001AF4_decl.h" -#include "overlay_manager.h" #include "struct_decls/struct_02018340_decl.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay096/struct_ov96_0223BF40_decl.h" #include "overlay115/struct_ov115_02261520.h" -int ov96_0223B6A0(OverlayManager * param0, int * param1); -int ov96_0223B7F8(OverlayManager * param0, int * param1); -int ov96_0223B8CC(OverlayManager * param0, int * param1); -void ov96_0223BAE0(UnkStruct_ov115_02261520 * param0, UnkStruct_ov96_0223BF40 * param1, UnkStruct_ov19_021DA864 * param2, int param3); -UIControlData * ov96_0223BBC8(BGL * param0, int param1, int param2); -void ov96_0223BBFC(UnkStruct_ov96_0223BF40 * param0, int param1, int param2); +#include "overlay_manager.h" + +int ov96_0223B6A0(OverlayManager *param0, int *param1); +int ov96_0223B7F8(OverlayManager *param0, int *param1); +int ov96_0223B8CC(OverlayManager *param0, int *param1); +void ov96_0223BAE0(UnkStruct_ov115_02261520 *param0, UnkStruct_ov96_0223BF40 *param1, UnkStruct_ov19_021DA864 *param2, int param3); +UIControlData *ov96_0223BBC8(BGL *param0, int param1, int param2); +void ov96_0223BBFC(UnkStruct_ov96_0223BF40 *param0, int param1, int param2); int ov96_0223BC50(void); -void ov96_0223BC5C(UnkStruct_ov96_0223BF40 * param0, int param1, int param2); +void ov96_0223BC5C(UnkStruct_ov96_0223BF40 *param0, int param1, int param2); #endif // POKEPLATINUM_OV96_0223B6A0_H diff --git a/include/overlay096/ov96_0223BCE0.h b/include/overlay096/ov96_0223BCE0.h index 3f01b2fb33..c6e85d1c30 100644 --- a/include/overlay096/ov96_0223BCE0.h +++ b/include/overlay096/ov96_0223BCE0.h @@ -1,15 +1,17 @@ #ifndef POKEPLATINUM_OV96_0223BCE0_H #define POKEPLATINUM_OV96_0223BCE0_H -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay096/struct_ov96_0223BF40_decl.h" -int ov96_0223BCE0(UnkStruct_ov96_0223BF40 * param0, int param1); -int ov96_0223BDBC(UnkStruct_ov96_0223BF40 * param0, int param1); -int ov96_0223BDEC(UnkStruct_ov96_0223BF40 * param0, int param1); -void ov96_0223D8A4(Window * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); -void ov96_0223D8D8(Window * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); -void ov96_0223D948(UnkStruct_ov96_0223BF40 * param0); +#include "strbuf.h" + +int ov96_0223BCE0(UnkStruct_ov96_0223BF40 *param0, int param1); +int ov96_0223BDBC(UnkStruct_ov96_0223BF40 *param0, int param1); +int ov96_0223BDEC(UnkStruct_ov96_0223BF40 *param0, int param1); +void ov96_0223D8A4(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); +void ov96_0223D8D8(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); +void ov96_0223D948(UnkStruct_ov96_0223BF40 *param0); #endif // POKEPLATINUM_OV96_0223BCE0_H diff --git a/include/overlay096/struct_ov96_0223B450_sub1.h b/include/overlay096/struct_ov96_0223B450_sub1.h index a8b9eb0f4f..d9ae82a724 100644 --- a/include/overlay096/struct_ov96_0223B450_sub1.h +++ b/include/overlay096/struct_ov96_0223B450_sub1.h @@ -14,9 +14,9 @@ typedef struct { s8 unk_C0[8]; union { struct { - u8 unk_C8_val1_0 : 1; - u8 unk_C8_val1_1 : 1; - u8 : 6; + u8 unk_C8_val1_0 : 1; + u8 unk_C8_val1_1 : 1; + u8 : 6; }; u8 unk_C8_val2; }; diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h index 0d22ebe49a..9b8367b148 100644 --- a/include/overlay096/struct_ov96_0223BF40_t.h +++ b/include/overlay096/struct_ov96_0223BF40_t.h @@ -1,19 +1,19 @@ #ifndef POKEPLATINUM_STRUCT_OV96_0223BF40_T_H #define POKEPLATINUM_STRUCT_OV96_0223BF40_T_H +#include +#include + #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" -#include "string_template.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" +#include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0206BC70.h" -#include "pokemon.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay061/struct_ov61_0222C3B0.h" #include "overlay096/struct_ov96_0223B450.h" @@ -21,12 +21,14 @@ #include "overlay096/struct_ov96_0223B574.h" #include "overlay096/struct_ov96_0223B574_1.h" -#include -#include +#include "message.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" struct UnkStruct_ov96_0223BF40_t { - UnkStruct_0206BC70 * unk_00; - BGL * unk_04; + UnkStruct_0206BC70 *unk_00; + BGL *unk_04; int unk_08; int unk_0C; int unk_10; @@ -34,7 +36,7 @@ struct UnkStruct_ov96_0223BF40_t { int unk_18; int unk_1C; int unk_20; - void * unk_24; + void *unk_24; NNSFndHeapHandle unk_28; DWCInetControl unk_2C; int unk_8C; @@ -47,27 +49,27 @@ struct UnkStruct_ov96_0223BF40_t { u16 unk_BBA; u16 unk_BBC; u16 unk_BBE; - BoxPokemon * unk_BC0; + BoxPokemon *unk_BC0; int unk_BC4; int unk_BC8; - StringTemplate * unk_BCC; - MessageLoader * unk_BD0; - MessageLoader * unk_BD4; - MessageLoader * unk_BD8; - Strbuf* unk_BDC; - Strbuf* unk_BE0; - Strbuf* unk_BE4; - Strbuf* unk_BE8; - Strbuf* unk_BEC; + StringTemplate *unk_BCC; + MessageLoader *unk_BD0; + MessageLoader *unk_BD4; + MessageLoader *unk_BD8; + Strbuf *unk_BDC; + Strbuf *unk_BE0; + Strbuf *unk_BE4; + Strbuf *unk_BE8; + Strbuf *unk_BEC; int unk_BF0; - GraphicElementManager * unk_BF4; + GraphicElementManager *unk_BF4; UnkStruct_0200C738 unk_BF8; - UnkStruct_02009714 * unk_D84[4]; - UnkStruct_02009DC8 * unk_D94[3][4]; + UnkStruct_02009714 *unk_D84[4]; + UnkStruct_02009DC8 *unk_D94[3][4]; UnkStruct_ov19_021DA864 unk_DC4; UnkStruct_ov19_021DA864 unk_DE8; UnkStruct_ov19_021DA864 unk_E0C; - GraphicElementData * unk_E30[2]; + GraphicElementData *unk_E30[2]; Window unk_E38; Window unk_E48; Window unk_E58; @@ -75,8 +77,8 @@ struct UnkStruct_ov96_0223BF40_t { Window unk_E78; Window unk_E88[3]; Window unk_EB8[11]; - UIControlData * unk_F68; - void * unk_F6C; + UIControlData *unk_F68; + void *unk_F6C; int unk_F70; int unk_F74; int unk_F78; diff --git a/include/overlay097/box_pokemon_gba.h b/include/overlay097/box_pokemon_gba.h index cf9962f2dd..59c1c27819 100644 --- a/include/overlay097/box_pokemon_gba.h +++ b/include/overlay097/box_pokemon_gba.h @@ -31,38 +31,38 @@ typedef struct { } PokemonGBASubstruct2; typedef struct { - u32 pokerus:8; - u32 metLocation:8; - u32 metLevel:7; - u32 metGame:4; - u32 pokeball:4; - u32 otGender:1; - u32 hpIV:5; - u32 attackIV:5; - u32 defenseIV:5; - u32 speedIV:5; - u32 spAttackIV:5; - u32 spDefenseIV:5; - u32 isEgg:1; - u32 abilityNum:1; - u32 coolRibbon:3; // Stores the highest contest rank achieved in the Cool category. - u32 beautyRibbon:3; // Stores the highest contest rank achieved in the Beauty category. - u32 cuteRibbon:3; // Stores the highest contest rank achieved in the Cute category. - u32 smartRibbon:3; // Stores the highest contest rank achieved in the Smart category. - u32 toughRibbon:3; // Stores the highest contest rank achieved in the Tough category. - u32 championRibbon:1; // Given when defeating the Champion in both RSE and FRLG. - u32 winningRibbon:1; // Given at the Battle Tower's Level 50 challenge by winning a set of seven battles that extends the current streak to 56 or more. - u32 victoryRibbon:1; // Given at the Battle Tower's Level 100 challenge by winning a set of seven battles that extends the current streak to 56 or more. - u32 artistRibbon:1; // Given at the Contest Hall by winning a Master Rank contest with at least 800 points, and agreeing to have the Pokémon's portrait placed in the museum after being offered. - u32 effortRibbon:1; // Given at Slateport's market to Pokémon with maximum EVs. - u32 marineRibbon:1; // Never distributed. - u32 landRibbon:1; // Never distributed. - u32 skyRibbon:1; // Never distributed. - u32 countryRibbon:1; // Distributed during Pokémon Festa '04 and '05 to tournament winners. - u32 nationalRibbon:1; // Given to purified Shadow Pokémon in Colosseum/XD. - u32 earthRibbon:1; // Given to teams that have beaten Mt. Battle's 100-battle challenge in Colosseum/XD. - u32 worldRibbon:1; // Distributed during Pokémon Festa '04 and '05 to tournament winners. - u32 unusedRibbons:4; // Discarded in Gen 4. + u32 pokerus : 8; + u32 metLocation : 8; + u32 metLevel : 7; + u32 metGame : 4; + u32 pokeball : 4; + u32 otGender : 1; + u32 hpIV : 5; + u32 attackIV : 5; + u32 defenseIV : 5; + u32 speedIV : 5; + u32 spAttackIV : 5; + u32 spDefenseIV : 5; + u32 isEgg : 1; + u32 abilityNum : 1; + u32 coolRibbon : 3; // Stores the highest contest rank achieved in the Cool category. + u32 beautyRibbon : 3; // Stores the highest contest rank achieved in the Beauty category. + u32 cuteRibbon : 3; // Stores the highest contest rank achieved in the Cute category. + u32 smartRibbon : 3; // Stores the highest contest rank achieved in the Smart category. + u32 toughRibbon : 3; // Stores the highest contest rank achieved in the Tough category. + u32 championRibbon : 1; // Given when defeating the Champion in both RSE and FRLG. + u32 winningRibbon : 1; // Given at the Battle Tower's Level 50 challenge by winning a set of seven battles that extends the current streak to 56 or more. + u32 victoryRibbon : 1; // Given at the Battle Tower's Level 100 challenge by winning a set of seven battles that extends the current streak to 56 or more. + u32 artistRibbon : 1; // Given at the Contest Hall by winning a Master Rank contest with at least 800 points, and agreeing to have the Pokémon's portrait placed in the museum after being offered. + u32 effortRibbon : 1; // Given at Slateport's market to Pokémon with maximum EVs. + u32 marineRibbon : 1; // Never distributed. + u32 landRibbon : 1; // Never distributed. + u32 skyRibbon : 1; // Never distributed. + u32 countryRibbon : 1; // Distributed during Pokémon Festa '04 and '05 to tournament winners. + u32 nationalRibbon : 1; // Given to purified Shadow Pokémon in Colosseum/XD. + u32 earthRibbon : 1; // Given to teams that have beaten Mt. Battle's 100-battle challenge in Colosseum/XD. + u32 worldRibbon : 1; // Distributed during Pokémon Festa '04 and '05 to tournament winners. + u32 unusedRibbons : 4; // Discarded in Gen 4. // The functionality of this bit changed in FRLG: // In RS, this bit does nothing, is never set, & is accidentally unset when hatching Eggs. @@ -70,7 +70,7 @@ typedef struct { // If set, a Pokémon is a fateful encounter in FRLG's summary screen if hatched & for all Pokémon in Gen 4+ summary screens. // Set for in-game event island legendaries, events distributed after a certain date, & Pokémon from XD: Gale of Darkness. // Not to be confused with METLOC_FATEFUL_ENCOUNTER. - u32 modernFatefulEncounter:1; + u32 modernFatefulEncounter : 1; } PokemonGBASubstruct3; typedef struct BoxPokemonGBA { @@ -78,18 +78,18 @@ typedef struct BoxPokemonGBA { u32 otId; u8 nickname[10]; u8 language; - u8 isBadEgg:1; - u8 hasSpecies:1; - u8 isEgg:1; - u8 unused:5; + u8 isBadEgg : 1; + u8 hasSpecies : 1; + u8 isEgg : 1; + u8 unused : 5; u8 otName[7]; u8 markings; u16 checksum; u16 unknown; u8 secure[sizeof(PokemonGBASubstruct0) - + sizeof(PokemonGBASubstruct1) - + sizeof(PokemonGBASubstruct2) - + sizeof(PokemonGBASubstruct3)]; + + sizeof(PokemonGBASubstruct1) + + sizeof(PokemonGBASubstruct2) + + sizeof(PokemonGBASubstruct3)]; } BoxPokemonGBA; #endif // POKEPLATINUM_BOX_POKEMON_GBA_H diff --git a/include/overlay097/funcptr_ov97_02238A4C.h b/include/overlay097/funcptr_ov97_02238A4C.h index 2eb0879be0..b0887a9f07 100644 --- a/include/overlay097/funcptr_ov97_02238A4C.h +++ b/include/overlay097/funcptr_ov97_02238A4C.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_FUNCPTR_OV97_02238A4C_H #define POKEPLATINUM_FUNCPTR_OV97_02238A4C_H -typedef void (* UnkFuncPtr_ov97_02238A4C)(int); +typedef void (*UnkFuncPtr_ov97_02238A4C)(int); #endif // POKEPLATINUM_FUNCPTR_OV97_02238A4C_H diff --git a/include/overlay097/ov97_0222D04C.h b/include/overlay097/ov97_0222D04C.h index 231a9ba568..624684191d 100644 --- a/include/overlay097/ov97_0222D04C.h +++ b/include/overlay097/ov97_0222D04C.h @@ -1,19 +1,20 @@ #ifndef POKEPLATINUM_OV97_0222D04C_H #define POKEPLATINUM_OV97_0222D04C_H -#include "savedata.h" #include "overlay097/struct_ov97_0222D04C.h" -void ov97_0222D1C4(UnkStruct_ov97_0222D04C * param0, SaveData * param1, int param2); -void ov97_0222D1F0(const void * param0, int param1); -void ov97_0222D200(UnkStruct_ov97_0222D04C * param0, int param1); +#include "savedata.h" + +void ov97_0222D1C4(UnkStruct_ov97_0222D04C *param0, SaveData *param1, int param2); +void ov97_0222D1F0(const void *param0, int param1); +void ov97_0222D200(UnkStruct_ov97_0222D04C *param0, int param1); void ov97_0222D234(int param0); -int ov97_0222D250(UnkStruct_ov97_0222D04C * param0); -void ov97_0222D284(int param0, int param1, void * param2, void * param3); +int ov97_0222D250(UnkStruct_ov97_0222D04C *param0); +void ov97_0222D284(int param0, int param1, void *param2, void *param3); int ov97_0222D2A0(void); int ov97_0222D2B0(void); -u8 * ov97_0222D2B8(int param0, void * param1, int param2); -void ov97_0222D2C4(int param0, int param1, void * param2, void * param3); +u8 *ov97_0222D2B8(int param0, void *param1, int param2); +void ov97_0222D2C4(int param0, int param1, void *param2, void *param3); void ov97_0222D2DC(void); #endif // POKEPLATINUM_OV97_0222D04C_H diff --git a/include/overlay097/ov97_0222D2F8.h b/include/overlay097/ov97_0222D2F8.h index 93ffa12431..7ebe3daa7b 100644 --- a/include/overlay097/ov97_0222D2F8.h +++ b/include/overlay097/ov97_0222D2F8.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_OV97_0222D2F8_H #define POKEPLATINUM_OV97_0222D2F8_H -void ov97_0222D2F8(void * param0); +void ov97_0222D2F8(void *param0); #endif // POKEPLATINUM_OV97_0222D2F8_H diff --git a/include/overlay097/ov97_0222D30C.h b/include/overlay097/ov97_0222D30C.h index 3e779ead86..e170d726a2 100644 --- a/include/overlay097/ov97_0222D30C.h +++ b/include/overlay097/ov97_0222D30C.h @@ -3,9 +3,11 @@ #include "overlay097/struct_ov97_0222D04C.h" -void ov97_0222D344(UnkStruct_ov97_0222D04C * param0, int param1); -void ov97_0222E13C(UnkStruct_ov97_0222D04C * param0); -OverlayManager * ov97_022301A4(void); -void ov97_022301B0(OverlayManager * param0); +#include "overlay_manager.h" + +void ov97_0222D344(UnkStruct_ov97_0222D04C *param0, int param1); +void ov97_0222E13C(UnkStruct_ov97_0222D04C *param0); +OverlayManager *ov97_022301A4(void); +void ov97_022301B0(OverlayManager *param0); #endif // POKEPLATINUM_OV97_0222D30C_H diff --git a/include/overlay097/ov97_02232054.h b/include/overlay097/ov97_02232054.h index 0dcee39e75..2d2d284825 100644 --- a/include/overlay097/ov97_02232054.h +++ b/include/overlay097/ov97_02232054.h @@ -2,11 +2,13 @@ #define POKEPLATINUM_OV97_02232054_H #include "struct_decls/struct_02018340_decl.h" -#include "savedata.h" + #include "overlay097/struct_ov97_0223829C.h" +#include "savedata.h" + void ov97_02232054(void); -void ov97_02232074(BGL * param0); -int ov97_02232148(SaveData * param0, UnkStruct_ov97_0223829C * param1); +void ov97_02232074(BGL *param0); +int ov97_02232148(SaveData *param0, UnkStruct_ov97_0223829C *param1); #endif // POKEPLATINUM_OV97_02232054_H diff --git a/include/overlay097/ov97_02232200.h b/include/overlay097/ov97_02232200.h index 7ac0b32051..bd6461ee0c 100644 --- a/include/overlay097/ov97_02232200.h +++ b/include/overlay097/ov97_02232200.h @@ -1,22 +1,22 @@ #ifndef POKEPLATINUM_OV97_02232200_H #define POKEPLATINUM_OV97_02232200_H -void ov97_022323B0(void * param0); -void ov97_022323CC(void * param0); -void ov97_022323E4(void * param0); -void ov97_02232424(void * param0); -void ov97_0223245C(void * param0); -void ov97_022324C4(void * param0); -void ov97_022324EC(void * param0); -void ov97_022327B8(void * param0); -void ov97_022328D4(void * param0); -void ov97_02232944(void * param0); -void ov97_02232998(void * param0); -void ov97_02232A7C(void * param0); -void ov97_02232C94(void * param0); -void ov97_02232D18(void * param0); -void ov97_02232D3C(void * param0); -void ov97_02232D60(void * param0); -void ov97_02232DA4(void * param0); +void ov97_022323B0(void *param0); +void ov97_022323CC(void *param0); +void ov97_022323E4(void *param0); +void ov97_02232424(void *param0); +void ov97_0223245C(void *param0); +void ov97_022324C4(void *param0); +void ov97_022324EC(void *param0); +void ov97_022327B8(void *param0); +void ov97_022328D4(void *param0); +void ov97_02232944(void *param0); +void ov97_02232998(void *param0); +void ov97_02232A7C(void *param0); +void ov97_02232C94(void *param0); +void ov97_02232D18(void *param0); +void ov97_02232D3C(void *param0); +void ov97_02232D60(void *param0); +void ov97_02232DA4(void *param0); #endif // POKEPLATINUM_OV97_02232200_H diff --git a/include/overlay097/ov97_02232DC8.h b/include/overlay097/ov97_02232DC8.h index 7ad70ed19a..f9ff700d31 100644 --- a/include/overlay097/ov97_02232DC8.h +++ b/include/overlay097/ov97_02232DC8.h @@ -3,7 +3,7 @@ #include "overlay097/struct_ov97_02232E38.h" -void ov97_02232E38(UnkStruct_ov97_02232E38 * param0, void * param1); +void ov97_02232E38(UnkStruct_ov97_02232E38 *param0, void *param1); void ov97_022330DC(void); void ov97_02233120(void); BOOL ov97_0223316C(u32 param0); @@ -12,7 +12,7 @@ u32 ov97_02233230(void); u32 ov97_02233248(void); void ov97_02233268(void); void ov97_0223329C(void); -void ov97_022332C8(void * param0, u32 param1, u32 param2); +void ov97_022332C8(void *param0, u32 param1, u32 param2); BOOL ov97_022332F4(void); BOOL ov97_02233320(void); BOOL ov97_0223334C(void); diff --git a/include/overlay097/ov97_02233408.h b/include/overlay097/ov97_02233408.h index ff57c76fe0..5db9200a99 100644 --- a/include/overlay097/ov97_02233408.h +++ b/include/overlay097/ov97_02233408.h @@ -1,20 +1,20 @@ #ifndef POKEPLATINUM_OV97_02233408_H #define POKEPLATINUM_OV97_02233408_H +#include + #include "overlay097/struct_ov97_0223222C.h" #include "overlay097/struct_ov97_02232254.h" #include "overlay097/struct_ov97_02232620.h" #include "overlay097/struct_ov97_02232AC8.h" #include "overlay097/struct_ov97_02233268.h" -#include "overlay097/union_ov97_022334FC.h" #include "overlay097/struct_ov97_022335A8.h" #include "overlay097/struct_ov97_022335C8.h" #include "overlay097/struct_ov97_022339EC.h" +#include "overlay097/union_ov97_022334FC.h" -#include - -WMParentParam * ov97_02233408(void); -UnkStruct_ov97_0223222C * ov97_02233410(void); +WMParentParam *ov97_02233408(void); +UnkStruct_ov97_0223222C *ov97_02233410(void); int ov97_02233418(void); void ov97_02233424(int param0); int ov97_02233430(void); @@ -23,36 +23,36 @@ int ov97_02233448(void); void ov97_02233454(int param0); u32 ov97_02233460(void); void ov97_0223346C(u32 param0); -WMScanParam * ov97_02233478(void); +WMScanParam *ov97_02233478(void); u32 ov97_02233484(void); u32 ov97_02233490(void); -void * ov97_0223349C(void); -void * ov97_022334A8(void); -WMBssDesc * ov97_022334B4(void); +void *ov97_0223349C(void); +void *ov97_022334A8(void); +WMBssDesc *ov97_022334B4(void); void ov97_022334C0(u16 param0); BOOL ov97_022334CC(void); void ov97_022334D8(BOOL param0); void ov97_022334E4(BOOL param0); void ov97_022334F0(BOOL param0); -UnkUnion_ov97_022334FC * ov97_022334FC(void); -UnkStruct_ov97_02232620 * ov97_02233508(void); -UnkStruct_ov97_02232254 * ov97_02233510(void); +UnkUnion_ov97_022334FC *ov97_022334FC(void); +UnkStruct_ov97_02232620 *ov97_02233508(void); +UnkStruct_ov97_02232254 *ov97_02233510(void); void ov97_02233518(void); -UnkStruct_ov97_02232AC8 * ov97_02233538(void); +UnkStruct_ov97_02232AC8 *ov97_02233538(void); void ov97_02233548(void); u32 ov97_02233554(void); u32 ov97_02233560(void); u32 ov97_02233570(void); u32 ov97_02233580(void); u32 ov97_0223358C(void); -UnkStruct_ov97_02233268 * ov97_02233590(void); -UnkStruct_ov97_022339EC * ov97_0223359C(void); -UnkStruct_ov97_022335A8 ov97_022335A8(u8 * param0); -UnkStruct_ov97_022335C8 ov97_022335C8(u8 * param0); -void ov97_022335EC(u32 param0, u32 * param1, u32 * param2); +UnkStruct_ov97_02233268 *ov97_02233590(void); +UnkStruct_ov97_022339EC *ov97_0223359C(void); +UnkStruct_ov97_022335A8 ov97_022335A8(u8 *param0); +UnkStruct_ov97_022335C8 ov97_022335C8(u8 *param0); +void ov97_022335EC(u32 param0, u32 *param1, u32 *param2); u32 ov97_02233614(void); -void ov97_02233674(void * param0, void * param1, u32 param2, int param3, u32 param4); -void ov97_022337A4(void * param0); -BOOL ov97_022337D8(void * param0); +void ov97_02233674(void *param0, void *param1, u32 param2, int param3, u32 param4); +void ov97_022337A4(void *param0); +BOOL ov97_022337D8(void *param0); #endif // POKEPLATINUM_OV97_02233408_H diff --git a/include/overlay097/ov97_022337FC.h b/include/overlay097/ov97_022337FC.h index 48aaccf671..c37bb75a62 100644 --- a/include/overlay097/ov97_022337FC.h +++ b/include/overlay097/ov97_022337FC.h @@ -1,17 +1,17 @@ #ifndef POKEPLATINUM_OV97_022337FC_H #define POKEPLATINUM_OV97_022337FC_H +#include + #include "overlay097/struct_ov97_02232254.h" #include "overlay097/struct_ov97_02232620.h" #include "overlay097/struct_ov97_02233674.h" -#include - void ov97_022337FC(WMErrCode param0); void ov97_02233800(WMStateCode param0); -void ov97_02233804(WMBssDesc * param0); -void ov97_02233808(UnkStruct_ov97_02232620 * param0); -void ov97_0223380C(UnkStruct_ov97_02232254 * param0); -void ov97_02233810(UnkStruct_ov97_02233674 * param0); +void ov97_02233804(WMBssDesc *param0); +void ov97_02233808(UnkStruct_ov97_02232620 *param0); +void ov97_0223380C(UnkStruct_ov97_02232254 *param0); +void ov97_02233810(UnkStruct_ov97_02233674 *param0); #endif // POKEPLATINUM_OV97_022337FC_H diff --git a/include/overlay097/ov97_02233814.h b/include/overlay097/ov97_02233814.h index eeb839ac9f..e5914d2520 100644 --- a/include/overlay097/ov97_02233814.h +++ b/include/overlay097/ov97_02233814.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV97_02233814_H #define POKEPLATINUM_OV97_02233814_H -BOOL ov97_02233814(const void * param0, u32 param1, u16 param2); +BOOL ov97_02233814(const void *param0, u32 param1, u16 param2); BOOL ov97_02233854(void); BOOL ov97_02233870(void); BOOL ov97_02233890(u32 param0); diff --git a/include/overlay097/ov97_02235D18.h b/include/overlay097/ov97_02235D18.h index 94e12540e2..e957914e6d 100644 --- a/include/overlay097/ov97_02235D18.h +++ b/include/overlay097/ov97_02235D18.h @@ -3,7 +3,7 @@ #include "overlay097/struct_ov97_02236340.h" -int ov97_02235D2C(void * param0); +int ov97_02235D2C(void *param0); void ov97_02235DA4(void); int ov97_02235DB0(void); int ov97_02235DBC(void); @@ -11,7 +11,7 @@ int ov97_022360D8(void); BOOL ov97_02236280(void); int ov97_022362C8(void); int ov97_02236308(void); -PokemonStorageGBA * ov97_02236340(void); -void * ov97_02236350(void); +PokemonStorageGBA *ov97_02236340(void); +void *ov97_02236350(void); #endif // POKEPLATINUM_OV97_02235D18_H diff --git a/include/overlay097/ov97_0223635C.h b/include/overlay097/ov97_0223635C.h index 9f1f47e360..47702e3175 100644 --- a/include/overlay097/ov97_0223635C.h +++ b/include/overlay097/ov97_0223635C.h @@ -2,6 +2,6 @@ #define POKEPLATINUM_OV97_0223635C_H u32 ov97_0223635C(void); -u8 * ov97_02236378(void); +u8 *ov97_02236378(void); #endif // POKEPLATINUM_OV97_0223635C_H diff --git a/include/overlay097/ov97_02236380.h b/include/overlay097/ov97_02236380.h index d612e46e70..22fa0d2d1a 100644 --- a/include/overlay097/ov97_02236380.h +++ b/include/overlay097/ov97_02236380.h @@ -3,9 +3,9 @@ #include "overlay097/box_pokemon_gba.h" -u32 GetGBABoxMonData(BoxPokemonGBA * boxMon, int field, u8 * data); -void SetGBABoxMonData(BoxPokemonGBA * boxMon, int field, const u8 * dataArg); +u32 GetGBABoxMonData(BoxPokemonGBA *boxMon, int field, u8 *data); +void SetGBABoxMonData(BoxPokemonGBA *boxMon, int field, const u8 *dataArg); int ov97_02236DD0(int param0); -u32 ov97_02236E00(BoxPokemonGBA * param0); +u32 ov97_02236E00(BoxPokemonGBA *param0); #endif // POKEPLATINUM_OV97_02236380_H diff --git a/include/overlay097/ov97_02237520.h b/include/overlay097/ov97_02237520.h index 5aa5c4bb92..5476832415 100644 --- a/include/overlay097/ov97_02237520.h +++ b/include/overlay097/ov97_02237520.h @@ -3,6 +3,6 @@ void ov97_02237520(u32 param0); int ov97_02237624(void); -BOOL ov97_0223764C(void * param0, int param1); +BOOL ov97_0223764C(void *param0, int param1); #endif // POKEPLATINUM_OV97_02237520_H diff --git a/include/overlay097/ov97_02237694.h b/include/overlay097/ov97_02237694.h index c377527523..17754cdcbe 100644 --- a/include/overlay097/ov97_02237694.h +++ b/include/overlay097/ov97_02237694.h @@ -6,42 +6,45 @@ #include "struct_decls/struct_02022550_decl.h" #include "struct_defs/struct_0202DF40.h" #include "struct_defs/struct_0205AA50.h" -#include "savedata.h" -#include "overlay097/union_ov97_0222D2B0.h" + #include "overlay097/struct_ov97_02237808.h" #include "overlay097/struct_ov97_02237AEC.h" #include "overlay097/struct_ov97_0223829C.h" +#include "overlay097/union_ov97_0222D2B0.h" + +#include "overlay_manager.h" +#include "savedata.h" void ov97_02237694(int param0); -void * ov97_022376C4(OverlayManager * param0, int param1, int param2, int param3); -void ov97_022376FC(BGL * param0, int param1, u8 param2, u32 param3, u32 param4); +void *ov97_022376C4(OverlayManager *param0, int param1, int param2, int param3); +void ov97_022376FC(BGL *param0, int param1, u8 param2, u32 param3, u32 param4); void ov97_02237784(int param0); -void ov97_02237790(int param0, int param1, int * param2, int param3); -void ov97_022377F0(int * param0); -void ov97_02237808(UnkStruct_ov97_02237808 * param0, Window * param1, int param2, int param3, int param4, int param5); -void ov97_02237858(UnkStruct_ov97_02237808 * param0, int param1, int param2, int param3); -void ov97_02237860(UnkStruct_ov97_02237808 * param0, int param1, int param2); -void ov97_02237868(UnkStruct_ov97_02237808 * param0, int param1, int param2); -int ov97_0223795C(BGL * param0, UnkStruct_ov97_02237808 * param1, int param2, int param3, int param4); -int ov97_02237A18(UnkStruct_ov97_02237808 * param0); +void ov97_02237790(int param0, int param1, int *param2, int param3); +void ov97_022377F0(int *param0); +void ov97_02237808(UnkStruct_ov97_02237808 *param0, Window *param1, int param2, int param3, int param4, int param5); +void ov97_02237858(UnkStruct_ov97_02237808 *param0, int param1, int param2, int param3); +void ov97_02237860(UnkStruct_ov97_02237808 *param0, int param1, int param2); +void ov97_02237868(UnkStruct_ov97_02237808 *param0, int param1, int param2); +int ov97_0223795C(BGL *param0, UnkStruct_ov97_02237808 *param1, int param2, int param3, int param4); +int ov97_02237A18(UnkStruct_ov97_02237808 *param0); void ov97_02237A20(void); BOOL ov97_02237A60(void); void ov97_02237A74(void); -UnkStruct_ov97_02237AEC * ov97_02237AEC(void); +UnkStruct_ov97_02237AEC *ov97_02237AEC(void); void ov97_02237B0C(int param0, int param1, int param2, int param3, int param4, int param5); void ov97_02237C80(fx32 param0, fx32 param1); void ov97_02237CA0(void); void ov97_02237CAC(int param0); -GraphicElementData * ov97_02237D14(int param0, GraphicElementData * param1, int param2, int param3, int param4); +GraphicElementData *ov97_02237D14(int param0, GraphicElementData *param1, int param2, int param3, int param4); void ov97_02237DA0(void); u32 ov97_02237E4C(int param0); -void ov97_02238194(BGL * param0, UnkStruct_0202DF40 * param1); -void ov97_0223829C(UnkStruct_ov97_0223829C * param0, UnkUnion_ov97_0222D2B0 * param1, int param2); -void ov97_02238324(UnkStruct_ov97_0223829C * param0, UnkUnion_ov97_0222D2B0 * param1, int param2); -void ov97_022383C4(BmpList * param0, u32 param1, u8 param2); +void ov97_02238194(BGL *param0, UnkStruct_0202DF40 *param1); +void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2); +void ov97_02238324(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2); +void ov97_022383C4(BmpList *param0, u32 param1, u8 param2); void ov97_02238400(BOOL param0); void ov97_02238440(void); -void ov97_0223846C(SaveData * param0); +void ov97_0223846C(SaveData *param0); int ov97_0223847C(void); void ov97_022384F4(void); void ov97_0223850C(void); diff --git a/include/overlay097/ov97_02238534.h b/include/overlay097/ov97_02238534.h index d80c988f4c..a611ebbfc2 100644 --- a/include/overlay097/ov97_02238534.h +++ b/include/overlay097/ov97_02238534.h @@ -4,9 +4,9 @@ #include "overlay097/funcptr_ov97_02238A4C.h" BOOL ov97_022389C8(void); -BOOL ov97_02238A4C(void * param0, UnkFuncPtr_ov97_02238A4C param1, void * param2); +BOOL ov97_02238A4C(void *param0, UnkFuncPtr_ov97_02238A4C param1, void *param2); int ov97_02238CA0(void); int ov97_02238D4C(void); -void * ov97_02238D54(void); +void *ov97_02238D54(void); #endif // POKEPLATINUM_OV97_02238534_H diff --git a/include/overlay097/ov97_022392E4.h b/include/overlay097/ov97_022392E4.h index 00ed466f72..415941fa18 100644 --- a/include/overlay097/ov97_022392E4.h +++ b/include/overlay097/ov97_022392E4.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_OV97_022392E4_H #define POKEPLATINUM_OV97_022392E4_H -BOOL ov97_0223936C(const u8 * param0, u16 * param1, u32 param2, u32 param3); +BOOL ov97_0223936C(const u8 *param0, u16 *param1, u32 param2, u32 param3); #endif // POKEPLATINUM_OV97_022392E4_H diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h index 90af4ef038..c9c1fe81d8 100644 --- a/include/overlay097/struct_ov97_0222D04C.h +++ b/include/overlay097/struct_ov97_0222D04C.h @@ -1,33 +1,35 @@ #ifndef POKEPLATINUM_STRUCT_OV97_0222D04C_H #define POKEPLATINUM_STRUCT_OV97_0222D04C_H +#include + #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" -#include "string_template.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "game_options.h" +#include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" -#include "savedata.h" + #include "overlay019/struct_ov19_021DA864.h" -#include "overlay097/union_ov97_0222D2B0.h" #include "overlay097/struct_ov97_0223829C.h" +#include "overlay097/union_ov97_0222D2B0.h" -#include +#include "game_options.h" +#include "message.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" typedef struct { - BGL * unk_00; - SaveData * unk_04; - Options * unk_08; - StringTemplate * unk_0C; - MessageLoader * unk_10; - Strbuf* unk_14; + BGL *unk_00; + SaveData *unk_04; + Options *unk_08; + StringTemplate *unk_0C; + MessageLoader *unk_10; + Strbuf *unk_14; Window unk_18; Window unk_28[3]; Window unk_58; @@ -35,8 +37,8 @@ typedef struct { int unk_6C; int unk_70; int unk_74; - BmpList * unk_78; - ResourceMetadata * unk_7C; + BmpList *unk_78; + ResourceMetadata *unk_7C; int unk_80; int unk_84; int unk_88; @@ -45,21 +47,21 @@ typedef struct { int unk_438; int unk_43C; int unk_440; - GraphicElementManager * unk_444; + GraphicElementManager *unk_444; UnkStruct_0200C738 unk_448; - UnkStruct_02009714 * unk_5D4[6]; - UnkStruct_02009DC8 * unk_5EC[6]; + UnkStruct_02009714 *unk_5D4[6]; + UnkStruct_02009DC8 *unk_5EC[6]; UnkStruct_ov19_021DA864 unk_604; - GraphicElementData * unk_628; + GraphicElementData *unk_628; int unk_62C; int unk_630; int unk_634; u8 unk_638[4096]; int unk_1638; - int * unk_163C; + int *unk_163C; int unk_1640; int unk_1644; - u8 * unk_1648; + u8 *unk_1648; DWCInetControl unk_164C; BOOL unk_16AC; int unk_16B0; @@ -74,12 +76,16 @@ typedef struct { int unk_26D0; int unk_26D4; DWCErrorType unk_26D8; - BOOL (* unk_26DC)(void); + + // clang-format off + BOOL(*unk_26DC)(void); + // clang-format on + Window unk_26E0; UnkUnion_ov97_0222D2B0 unk_26F0; - void (* unk_2A48)(void *); + void (*unk_2A48)(void *); int unk_2A4C; - void * unk_2A50; + void *unk_2A50; int unk_2A54; } UnkStruct_ov97_0222D04C; diff --git a/include/overlay097/struct_ov97_0222D250.h b/include/overlay097/struct_ov97_0222D250.h index cf3c52f359..16a55ccff7 100644 --- a/include/overlay097/struct_ov97_0222D250.h +++ b/include/overlay097/struct_ov97_0222D250.h @@ -11,7 +11,7 @@ typedef struct { u8 unk_4E_3 : 1; u8 unk_4E_4 : 1; u8 unk_4E_5 : 1; - u8 : 2; + u8 : 2; u8 padding_4F; } UnkStruct_ov97_0222D250; diff --git a/include/overlay097/struct_ov97_0223222C.h b/include/overlay097/struct_ov97_0223222C.h index 4b303b1694..43c3bdcf6d 100644 --- a/include/overlay097/struct_ov97_0223222C.h +++ b/include/overlay097/struct_ov97_0223222C.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV97_0223222C_H #define POKEPLATINUM_STRUCT_OV97_0223222C_H +#include + #include "overlay097/struct_ov97_02232AC8.h" #include "overlay097/struct_ov97_02233268.h" -#include "overlay097/union_ov97_022334FC.h" #include "overlay097/struct_ov97_022339EC.h" - -#include +#include "overlay097/union_ov97_022334FC.h" typedef struct { u8 unk_00; @@ -22,13 +22,13 @@ typedef struct { BOOL unk_18; BOOL unk_1C; BOOL unk_20; - WMscanParam * unk_24; - WMbssDesc * unk_28; + WMscanParam *unk_24; + WMbssDesc *unk_28; u32 unk_2C; u32 unk_30; - void * unk_34; - void * unk_38; - void * unk_3C; + void *unk_34; + void *unk_38; + void *unk_3C; UnkStruct_ov97_02233268 unk_40; UnkStruct_ov97_022339EC unk_78; UnkUnion_ov97_022334FC unk_90; diff --git a/include/overlay097/struct_ov97_02232AC8.h b/include/overlay097/struct_ov97_02232AC8.h index 61da57b4f1..f9b41f1d61 100644 --- a/include/overlay097/struct_ov97_02232AC8.h +++ b/include/overlay097/struct_ov97_02232AC8.h @@ -2,10 +2,10 @@ #define POKEPLATINUM_STRUCT_OV97_02232AC8_H typedef struct { - void * unk_00; - void * unk_04; - void * unk_08; - void * unk_0C; + void *unk_00; + void *unk_04; + void *unk_08; + void *unk_0C; u32 unk_10; u32 unk_14; vu8 unk_18; diff --git a/include/overlay097/struct_ov97_02232E38.h b/include/overlay097/struct_ov97_02232E38.h index 1cbf2a7118..724661b5da 100644 --- a/include/overlay097/struct_ov97_02232E38.h +++ b/include/overlay097/struct_ov97_02232E38.h @@ -6,8 +6,8 @@ typedef struct { u32 unk_00_8 : 4; u32 unk_00_12 : 4; u32 unk_00_16 : 16; - const u16 * unk_04; - const u16 * unk_08; + const u16 *unk_04; + const u16 *unk_08; } UnkStruct_ov97_02232E38; #endif // POKEPLATINUM_STRUCT_OV97_02232E38_H diff --git a/include/overlay097/struct_ov97_02236340.h b/include/overlay097/struct_ov97_02236340.h index 87e1c425b2..ab5bc250a5 100644 --- a/include/overlay097/struct_ov97_02236340.h +++ b/include/overlay097/struct_ov97_02236340.h @@ -3,7 +3,7 @@ #include "overlay097/box_pokemon_gba.h" -#define GBA_TOTAL_BOXES_COUNT 14 +#define GBA_TOTAL_BOXES_COUNT 14 typedef struct { u8 currentBox; diff --git a/include/overlay097/struct_ov97_0223635C.h b/include/overlay097/struct_ov97_0223635C.h index 968417922e..e4026dc5d4 100644 --- a/include/overlay097/struct_ov97_0223635C.h +++ b/include/overlay097/struct_ov97_0223635C.h @@ -17,7 +17,7 @@ typedef struct { u16 unk_14_9 : 1; u16 unk_14_10 : 1; u16 unk_14_11 : 1; - u16 : 4; + u16 : 4; } UnkStruct_ov97_0223635C; #endif // POKEPLATINUM_STRUCT_OV97_0223635C_H diff --git a/include/overlay097/struct_ov97_02237808.h b/include/overlay097/struct_ov97_02237808.h index aff0553dc2..28a01b2c6c 100644 --- a/include/overlay097/struct_ov97_02237808.h +++ b/include/overlay097/struct_ov97_02237808.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_STRUCT_OV97_02237808_H #define POKEPLATINUM_STRUCT_OV97_02237808_H -#include "string_template.h" #include "struct_defs/struct_0205AA50.h" +#include "string_template.h" + typedef struct { int unk_00; int unk_04; int unk_08; int unk_0C; - Window * unk_10; - StringTemplate * unk_14; + Window *unk_10; + StringTemplate *unk_14; int unk_18; int unk_1C; int unk_20; diff --git a/include/overlay097/struct_ov97_02237AEC.h b/include/overlay097/struct_ov97_02237AEC.h index fe58459429..06c34bdfa4 100644 --- a/include/overlay097/struct_ov97_02237AEC.h +++ b/include/overlay097/struct_ov97_02237AEC.h @@ -3,15 +3,16 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_0200C738.h" + #include "overlay019/struct_ov19_021DA864.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[6]; - UnkStruct_02009DC8 * unk_1A8[2][6]; + UnkStruct_02009714 *unk_190[6]; + UnkStruct_02009DC8 *unk_1A8[2][6]; UnkStruct_ov19_021DA864 unk_1D8[2]; int unk_220; int unk_224; diff --git a/include/overlay097/struct_ov97_0223F450.h b/include/overlay097/struct_ov97_0223F450.h index 787c61cd53..7ec1b2fd4d 100644 --- a/include/overlay097/struct_ov97_0223F450.h +++ b/include/overlay097/struct_ov97_0223F450.h @@ -9,16 +9,16 @@ typedef struct { u32 unk_00; u32 unk_04; u8 unk_08[32]; - const void * unk_28; - const void * unk_2C; - const void * unk_30; - const void * unk_34; - u8 * const * unk_38; - const u8 * unk_3C; - const void * unk_40; - const void * unk_44; - const void * unk_48; - const void * unk_4C; + const void *unk_28; + const void *unk_2C; + const void *unk_30; + const void *unk_34; + u8 *const *unk_38; + const u8 *unk_3C; + const void *unk_40; + const void *unk_44; + const void *unk_48; + const void *unk_4C; u32 unk_50; u32 unk_54; u32 unk_58; @@ -42,13 +42,13 @@ typedef struct { u32 unk_B0; u32 unk_B4; UnkStruct_ov97_0223F450_sub2 unk_B8; - const void * unk_BC; - const void * unk_C0; - const void * unk_C4; - const void * unk_C8; - const void * unk_CC; - const void * unk_D0; - const void * unk_D4; + const void *unk_BC; + const void *unk_C0; + const void *unk_C4; + const void *unk_C8; + const void *unk_CC; + const void *unk_D0; + const void *unk_D4; u32 unk_D8; u32 unk_DC; u32 unk_E0; diff --git a/include/overlay098/ov98_02246C20.h b/include/overlay098/ov98_02246C20.h index 40d761c0a7..48eb857e51 100644 --- a/include/overlay098/ov98_02246C20.h +++ b/include/overlay098/ov98_02246C20.h @@ -3,23 +3,23 @@ #include "overlay098/struct_ov98_02246E88.h" -int ov98_02246C20(OverlayManager * param0, int * param1); -int ov98_02246C98(OverlayManager * param0, int * param1); -int ov98_02246DC0(OverlayManager * param0, int * param1); -void ov98_02246E88(UnkStruct_ov98_02246E88 * param0, int param1, int param2); -void ov98_02246E94(UnkStruct_ov98_02246E88 * param0); -void ov98_02246E9C(UnkStruct_ov98_02246E88 * param0, int param1); -int ov98_02246EA4(UnkStruct_ov98_02246E88 * param0); -void ov98_02246EF8(UnkStruct_ov98_02246E88 * param0); -void ov98_02246F24(UnkStruct_ov98_02246E88 * param0); -void ov98_02246F48(UnkStruct_ov98_02246E88 * param0); -void ov98_02246F5C(UnkStruct_ov98_02246E88 * param0); -void ov98_02246F74(UnkStruct_ov98_02246E88 * param0); -void ov98_02246F88(UnkStruct_ov98_02246E88 * param0); -void ov98_02246F94(UnkStruct_ov98_02246E88 * param0, u32 param1); -u32 ov98_02246F9C(UnkStruct_ov98_02246E88 * param0); -u32 ov98_02246FA4(UnkStruct_ov98_02246E88 * param0); -void ov98_02246FAC(UnkStruct_ov98_02246E88 * param0, int param1); -int ov98_02246FB4(UnkStruct_ov98_02246E88 * param0); +int ov98_02246C20(OverlayManager *param0, int *param1); +int ov98_02246C98(OverlayManager *param0, int *param1); +int ov98_02246DC0(OverlayManager *param0, int *param1); +void ov98_02246E88(UnkStruct_ov98_02246E88 *param0, int param1, int param2); +void ov98_02246E94(UnkStruct_ov98_02246E88 *param0); +void ov98_02246E9C(UnkStruct_ov98_02246E88 *param0, int param1); +int ov98_02246EA4(UnkStruct_ov98_02246E88 *param0); +void ov98_02246EF8(UnkStruct_ov98_02246E88 *param0); +void ov98_02246F24(UnkStruct_ov98_02246E88 *param0); +void ov98_02246F48(UnkStruct_ov98_02246E88 *param0); +void ov98_02246F5C(UnkStruct_ov98_02246E88 *param0); +void ov98_02246F74(UnkStruct_ov98_02246E88 *param0); +void ov98_02246F88(UnkStruct_ov98_02246E88 *param0); +void ov98_02246F94(UnkStruct_ov98_02246E88 *param0, u32 param1); +u32 ov98_02246F9C(UnkStruct_ov98_02246E88 *param0); +u32 ov98_02246FA4(UnkStruct_ov98_02246E88 *param0); +void ov98_02246FAC(UnkStruct_ov98_02246E88 *param0, int param1); +int ov98_02246FB4(UnkStruct_ov98_02246E88 *param0); #endif // POKEPLATINUM_OV98_02246C20_H diff --git a/include/overlay098/ov98_022471C8.h b/include/overlay098/ov98_022471C8.h index 1054e6ec25..2c62f28442 100644 --- a/include/overlay098/ov98_022471C8.h +++ b/include/overlay098/ov98_022471C8.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_OV98_022471C8_H #define POKEPLATINUM_OV98_022471C8_H - -int ov98_022471C8(OverlayManager * param0, int * param1); -int ov98_022473D8(OverlayManager * param0, int * param1); -int ov98_02247440(OverlayManager * param0, int * param1); +int ov98_022471C8(OverlayManager *param0, int *param1); +int ov98_022473D8(OverlayManager *param0, int *param1); +int ov98_02247440(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV98_022471C8_H diff --git a/include/overlay098/ov98_022499C8.h b/include/overlay098/ov98_022499C8.h index 7c83207ba9..89043aabb3 100644 --- a/include/overlay098/ov98_022499C8.h +++ b/include/overlay098/ov98_022499C8.h @@ -3,8 +3,8 @@ #include "strbuf.h" -void ov98_022499C8(Strbuf *param0, char * param1, int param2); +void ov98_022499C8(Strbuf *param0, char *param1, int param2); int ov98_02249A80(Strbuf *param0, int param1); -void ov98_02249ACC(const char * param0, u32 * param1, int param2); +void ov98_02249ACC(const char *param0, u32 *param1, int param2); #endif // POKEPLATINUM_OV98_022499C8_H diff --git a/include/overlay098/struct_ov98_02246E88.h b/include/overlay098/struct_ov98_02246E88.h index 23ca53241d..a14922fb69 100644 --- a/include/overlay098/struct_ov98_02246E88.h +++ b/include/overlay098/struct_ov98_02246E88.h @@ -1,21 +1,22 @@ #ifndef POKEPLATINUM_STRUCT_OV98_02246E88_H #define POKEPLATINUM_STRUCT_OV98_02246E88_H -#include "overlay_manager.h" -#include "strbuf.h" -#include "game_options.h" -#include "savedata.h" +#include +#include + #include "overlay096/struct_ov96_0223B574.h" #include "overlay096/struct_ov96_0223B574_1.h" -#include -#include +#include "game_options.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" typedef struct { - OverlayManager * unk_00; - SaveData * unk_04; - Options * unk_08; - void * unk_0C; + OverlayManager *unk_00; + SaveData *unk_04; + Options *unk_08; + void *unk_0C; NNSFndHeapHandle unk_10; DWCInetControl unk_14; u16 unk_7C; @@ -27,15 +28,15 @@ typedef struct { int unk_8C; int unk_90; u8 padding_94[4]; - void * unk_98; + void *unk_98; UnkStruct_ov96_0223B574 unk_9C; UnkStruct_ov96_0223B574_1 unk_100; u32 unk_108; u32 unk_10C; u8 unk_110; u8 unk_111[3]; - Strbuf* unk_114; - Strbuf* unk_118; + Strbuf *unk_114; + Strbuf *unk_118; BOOL unk_11C; } UnkStruct_ov98_02246E88; diff --git a/include/overlay098/struct_ov98_02247168.h b/include/overlay098/struct_ov98_02247168.h index 505bbbf898..27f8217a49 100644 --- a/include/overlay098/struct_ov98_02247168.h +++ b/include/overlay098/struct_ov98_02247168.h @@ -4,7 +4,7 @@ #include "savedata.h" typedef struct { - SaveData * unk_00; + SaveData *unk_00; int unk_04; int unk_08; } UnkStruct_ov98_02247168; diff --git a/include/overlay099/ov99_021D0D80.h b/include/overlay099/ov99_021D0D80.h index faf026fce1..d48ce60a07 100644 --- a/include/overlay099/ov99_021D0D80.h +++ b/include/overlay099/ov99_021D0D80.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_OV99_021D0D80_H #define POKEPLATINUM_OV99_021D0D80_H -#include "overlay_manager.h" #include "overlay099/struct_ov99_021D2CB0.h" -int ov99_021D0D80(OverlayManager * param0, int * param1); -int ov99_021D1028(OverlayManager * param0, int * param1); -int ov99_021D11A8(OverlayManager * param0, int * param1); -void ov99_021D1270(UnkStruct_ov99_021D2CB0 * param0); -void ov99_021D12F0(UnkStruct_ov99_021D2CB0 * param0); +#include "overlay_manager.h" + +int ov99_021D0D80(OverlayManager *param0, int *param1); +int ov99_021D1028(OverlayManager *param0, int *param1); +int ov99_021D11A8(OverlayManager *param0, int *param1); +void ov99_021D1270(UnkStruct_ov99_021D2CB0 *param0); +void ov99_021D12F0(UnkStruct_ov99_021D2CB0 *param0); #endif // POKEPLATINUM_OV99_021D0D80_H diff --git a/include/overlay099/ov99_021D1A54.h b/include/overlay099/ov99_021D1A54.h index 7eb705f4b8..370501c62d 100644 --- a/include/overlay099/ov99_021D1A54.h +++ b/include/overlay099/ov99_021D1A54.h @@ -3,8 +3,8 @@ #include "overlay099/struct_ov99_021D2CB0.h" -void ov99_021D1CC8(UnkStruct_ov99_021D2CB0 * param0, int param1); -void ov99_021D1CFC(UnkStruct_ov99_021D2CB0 * param0, int param1); -BOOL ov99_021D1D30(UnkStruct_ov99_021D2CB0 * param0, int param1); +void ov99_021D1CC8(UnkStruct_ov99_021D2CB0 *param0, int param1); +void ov99_021D1CFC(UnkStruct_ov99_021D2CB0 *param0, int param1); +BOOL ov99_021D1D30(UnkStruct_ov99_021D2CB0 *param0, int param1); #endif // POKEPLATINUM_OV99_021D1A54_H diff --git a/include/overlay099/ov99_021D2C08.h b/include/overlay099/ov99_021D2C08.h index 8abe671243..28d9fecf80 100644 --- a/include/overlay099/ov99_021D2C08.h +++ b/include/overlay099/ov99_021D2C08.h @@ -4,6 +4,6 @@ #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D3A40.h" -BOOL ov99_021D2C08(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1); +BOOL ov99_021D2C08(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1); #endif // POKEPLATINUM_OV99_021D2C08_H diff --git a/include/overlay099/ov99_021D2E28.h b/include/overlay099/ov99_021D2E28.h index 00fd1ed4a6..24f8566095 100644 --- a/include/overlay099/ov99_021D2E28.h +++ b/include/overlay099/ov99_021D2E28.h @@ -4,6 +4,6 @@ #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D3A40.h" -BOOL ov99_021D2E28(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1); +BOOL ov99_021D2E28(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1); #endif // POKEPLATINUM_OV99_021D2E28_H diff --git a/include/overlay099/ov99_021D340C.h b/include/overlay099/ov99_021D340C.h index e3c075032b..6f4de4d835 100644 --- a/include/overlay099/ov99_021D340C.h +++ b/include/overlay099/ov99_021D340C.h @@ -4,6 +4,6 @@ #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D3A40.h" -BOOL ov99_021D340C(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1); +BOOL ov99_021D340C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1); #endif // POKEPLATINUM_OV99_021D340C_H diff --git a/include/overlay099/ov99_021D3A40.h b/include/overlay099/ov99_021D3A40.h index cebea1755a..3ad7280d51 100644 --- a/include/overlay099/ov99_021D3A40.h +++ b/include/overlay099/ov99_021D3A40.h @@ -4,7 +4,7 @@ #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D3A40.h" -BOOL ov99_021D3A40(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1); -BOOL ov99_021D3B2C(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1); +BOOL ov99_021D3A40(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1); +BOOL ov99_021D3B2C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1); #endif // POKEPLATINUM_OV99_021D3A40_H diff --git a/include/overlay099/ov99_021D3C18.h b/include/overlay099/ov99_021D3C18.h index 8adbafa453..5e559af43a 100644 --- a/include/overlay099/ov99_021D3C18.h +++ b/include/overlay099/ov99_021D3C18.h @@ -4,6 +4,6 @@ #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D3A40.h" -BOOL ov99_021D3C18(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1); +BOOL ov99_021D3C18(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1); #endif // POKEPLATINUM_OV99_021D3C18_H diff --git a/include/overlay099/ov99_021D3DE0.h b/include/overlay099/ov99_021D3DE0.h index 6a3b22a2a4..1f6a956f61 100644 --- a/include/overlay099/ov99_021D3DE0.h +++ b/include/overlay099/ov99_021D3DE0.h @@ -4,6 +4,6 @@ #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D3A40.h" -BOOL ov99_021D3DE0(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1); +BOOL ov99_021D3DE0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1); #endif // POKEPLATINUM_OV99_021D3DE0_H diff --git a/include/overlay099/ov99_021D3E78.h b/include/overlay099/ov99_021D3E78.h index f0526dd6b7..7f44134771 100644 --- a/include/overlay099/ov99_021D3E78.h +++ b/include/overlay099/ov99_021D3E78.h @@ -1,13 +1,15 @@ #ifndef POKEPLATINUM_OV99_021D3E78_H #define POKEPLATINUM_OV99_021D3E78_H -#include "message.h" #include "struct_decls/struct_02018340_decl.h" + #include "overlay099/struct_ov99_021D3E78_decl.h" -UnkStruct_ov99_021D3E78 * ov99_021D3E78(BGL * param0, int param1, int param2, int param3, MessageLoader * param4); -void ov99_021D3F38(UnkStruct_ov99_021D3E78 * param0); -BOOL ov99_021D3F6C(UnkStruct_ov99_021D3E78 * param0, int param1); +#include "message.h" + +UnkStruct_ov99_021D3E78 *ov99_021D3E78(BGL *param0, int param1, int param2, int param3, MessageLoader *param4); +void ov99_021D3F38(UnkStruct_ov99_021D3E78 *param0); +BOOL ov99_021D3F6C(UnkStruct_ov99_021D3E78 *param0, int param1); int ov99_021D4130(void); #endif // POKEPLATINUM_OV99_021D3E78_H diff --git a/include/overlay099/ov99_021D4134.h b/include/overlay099/ov99_021D4134.h index fb2fed10df..3331360d8a 100644 --- a/include/overlay099/ov99_021D4134.h +++ b/include/overlay099/ov99_021D4134.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV99_021D4134_H #include "struct_decls/cell_actor_data.h" + #include "overlay099/struct_ov99_021D2CB0.h" -void ov99_021D4134(UnkStruct_ov99_021D2CB0 * param0, int param1); -void ov99_021D4170(UnkStruct_ov99_021D2CB0 * param0); -BOOL ov99_021D425C(UnkStruct_ov99_021D2CB0 * param0, s32 param1); -void ov99_021D439C(UnkStruct_ov99_021D2CB0 * param0, int param1, int param2, int param3); -void ov99_021D44CC(UnkStruct_ov99_021D2CB0 * param0, CellActorData * param1); +void ov99_021D4134(UnkStruct_ov99_021D2CB0 *param0, int param1); +void ov99_021D4170(UnkStruct_ov99_021D2CB0 *param0); +BOOL ov99_021D425C(UnkStruct_ov99_021D2CB0 *param0, s32 param1); +void ov99_021D439C(UnkStruct_ov99_021D2CB0 *param0, int param1, int param2, int param3); +void ov99_021D44CC(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1); #endif // POKEPLATINUM_OV99_021D4134_H diff --git a/include/overlay099/struct_ov99_021D2CB0.h b/include/overlay099/struct_ov99_021D2CB0.h index 7ece3be53a..b099079359 100644 --- a/include/overlay099/struct_ov99_021D2CB0.h +++ b/include/overlay099/struct_ov99_021D2CB0.h @@ -1,44 +1,46 @@ #ifndef POKEPLATINUM_STRUCT_OV99_021D2CB0_H #define POKEPLATINUM_STRUCT_OV99_021D2CB0_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" +#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017294.h" -#include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "camera.h" #include "struct_defs/struct_0203E274.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" + #include "overlay099/struct_ov99_021D2CB0_sub1.h" #include "overlay099/struct_ov99_021D2CB0_sub2.h" #include "overlay099/struct_ov99_021D3A40.h" #include "overlay099/struct_ov99_021D3E78_decl.h" +#include "camera.h" +#include "message.h" +#include "sys_task_manager.h" + typedef struct { - UnkStruct_0203E274 * unk_00; + UnkStruct_0203E274 *unk_00; BOOL unk_04; - BGL * unk_08; - PaletteData * unk_0C; - GenericPointerData * unk_10; - SysTask * unk_14; - SpriteRenderer * unk_18; - SpriteGfxHandler * unk_1C; - MessageLoader * unk_20; - Window * unk_24; - Camera * camera; + BGL *unk_08; + PaletteData *unk_0C; + GenericPointerData *unk_10; + SysTask *unk_14; + SpriteRenderer *unk_18; + SpriteGfxHandler *unk_1C; + MessageLoader *unk_20; + Window *unk_24; + Camera *camera; UnkStruct_020170F4 unk_2C[4]; UnkStruct_02017294 unk_6C[2][16]; UnkStruct_ov99_021D2CB0_sub1 unk_F6C; UnkStruct_ov99_021D3A40 unk_FA4; - CellActorData * unk_10E0[5]; - u8 * unk_10F4; - NARC * unk_10F8; + CellActorData *unk_10E0[5]; + u8 *unk_10F4; + NARC *unk_10F8; u32 unk_10FC; u8 unk_1100; u8 unk_1101; @@ -46,8 +48,8 @@ typedef struct { u8 unk_1103; u8 unk_1104; u8 unk_1105; - UnkStruct_ov99_021D3E78 * unk_1108; - UnkStruct_ov99_021D3E78 * unk_110C; + UnkStruct_ov99_021D3E78 *unk_1108; + UnkStruct_ov99_021D3E78 *unk_110C; BOOL unk_1110; UnkStruct_ov99_021D2CB0_sub2 unk_1114; } UnkStruct_ov99_021D2CB0; diff --git a/include/overlay100/ov100_021D0D80.h b/include/overlay100/ov100_021D0D80.h index 25bebd401e..933d0987a1 100644 --- a/include/overlay100/ov100_021D0D80.h +++ b/include/overlay100/ov100_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV100_021D0D80_H #define POKEPLATINUM_OV100_021D0D80_H +#include "overlay_manager.h" -int ov100_021D0D80(OverlayManager * param0, int * param1); -int ov100_021D0EA8(OverlayManager * param0, int * param1); -int ov100_021D0F44(OverlayManager * param0, int * param1); +int ov100_021D0D80(OverlayManager *param0, int *param1); +int ov100_021D0EA8(OverlayManager *param0, int *param1); +int ov100_021D0F44(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV100_021D0D80_H diff --git a/include/overlay100/ov100_021D13E4.h b/include/overlay100/ov100_021D13E4.h index 662bd17cdd..b84527c544 100644 --- a/include/overlay100/ov100_021D13E4.h +++ b/include/overlay100/ov100_021D13E4.h @@ -3,8 +3,8 @@ #include "overlay100/struct_ov100_021D4DD8.h" -void * ov100_021D13E4(UnkStruct_ov100_021D4DD8 * param0); -BOOL ov100_021D14A8(void * param0); -BOOL ov100_021D16C4(void * param0); +void *ov100_021D13E4(UnkStruct_ov100_021D4DD8 *param0); +BOOL ov100_021D14A8(void *param0); +BOOL ov100_021D16C4(void *param0); #endif // POKEPLATINUM_OV100_021D13E4_H diff --git a/include/overlay100/ov100_021D1C44.h b/include/overlay100/ov100_021D1C44.h index f22b35f235..eb32ce96cc 100644 --- a/include/overlay100/ov100_021D1C44.h +++ b/include/overlay100/ov100_021D1C44.h @@ -3,8 +3,8 @@ #include "overlay100/struct_ov100_021D4DD8.h" -void * ov100_021D2340(UnkStruct_ov100_021D4DD8 * param0); -BOOL ov100_021D2428(void * param0); -BOOL ov100_021D2C8C(void * param0); +void *ov100_021D2340(UnkStruct_ov100_021D4DD8 *param0); +BOOL ov100_021D2428(void *param0); +BOOL ov100_021D2C8C(void *param0); #endif // POKEPLATINUM_OV100_021D1C44_H diff --git a/include/overlay100/ov100_021D2F0C.h b/include/overlay100/ov100_021D2F0C.h index c1249f12c2..fbaf6cec12 100644 --- a/include/overlay100/ov100_021D2F0C.h +++ b/include/overlay100/ov100_021D2F0C.h @@ -3,8 +3,8 @@ #include "overlay100/struct_ov100_021D4DD8.h" -void * ov100_021D3620(UnkStruct_ov100_021D4DD8 * param0); -BOOL ov100_021D39E4(void * param0); -BOOL ov100_021D3FD4(void * param0); +void *ov100_021D3620(UnkStruct_ov100_021D4DD8 *param0); +BOOL ov100_021D39E4(void *param0); +BOOL ov100_021D3FD4(void *param0); #endif // POKEPLATINUM_OV100_021D2F0C_H diff --git a/include/overlay100/ov100_021D400C.h b/include/overlay100/ov100_021D400C.h index 1c0ec77feb..81391ef86f 100644 --- a/include/overlay100/ov100_021D400C.h +++ b/include/overlay100/ov100_021D400C.h @@ -3,7 +3,7 @@ #include "sys_task_manager.h" -void ov100_021D4414(SysTask * param0, void * param1); -void ov100_021D4438(SysTask * param0, void * param1); +void ov100_021D4414(SysTask *param0, void *param1); +void ov100_021D4438(SysTask *param0, void *param1); #endif // POKEPLATINUM_OV100_021D400C_H diff --git a/include/overlay100/ov100_021D44C0.h b/include/overlay100/ov100_021D44C0.h index 8658db8b6e..40b975a454 100644 --- a/include/overlay100/ov100_021D44C0.h +++ b/include/overlay100/ov100_021D44C0.h @@ -4,8 +4,8 @@ #include "overlay100/struct_ov100_021D49B4.h" #include "overlay100/struct_ov100_021D54D0.h" -void ov100_021D44C0(UnkStruct_ov100_021D49B4 * param0, UnkStruct_ov100_021D54D0 * param1); -void ov100_021D4510(UnkStruct_ov100_021D49B4 * param0); -void ov100_021D45A4(UnkStruct_ov100_021D49B4 * param0); +void ov100_021D44C0(UnkStruct_ov100_021D49B4 *param0, UnkStruct_ov100_021D54D0 *param1); +void ov100_021D4510(UnkStruct_ov100_021D49B4 *param0); +void ov100_021D45A4(UnkStruct_ov100_021D49B4 *param0); #endif // POKEPLATINUM_OV100_021D44C0_H diff --git a/include/overlay100/ov100_021D46C8.h b/include/overlay100/ov100_021D46C8.h index d10001302f..69a971a8ff 100644 --- a/include/overlay100/ov100_021D46C8.h +++ b/include/overlay100/ov100_021D46C8.h @@ -1,32 +1,33 @@ #ifndef POKEPLATINUM_OV100_021D46C8_H #define POKEPLATINUM_OV100_021D46C8_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_defs/struct_020985E4.h" + #include "overlay100/struct_ov100_021D46C8.h" #include "overlay100/struct_ov100_021D4890.h" #include "overlay100/struct_ov100_021D49B4.h" #include "overlay100/struct_ov100_021D4DD8.h" -#include - -int ov100_021D46C8(UnkStruct_ov100_021D46C8 * param0, UnkStruct_020985E4 * param1, int param2); -void ov100_021D4788(UnkStruct_ov100_021D46C8 * param0); -void ov100_021D47A0(UnkStruct_ov100_021D46C8 * param0); -void ov100_021D4844(UnkStruct_ov100_021D46C8 * param0); -void ov100_021D4890(UnkStruct_ov100_021D4890 * param0); -BOOL ov100_021D4920(UnkStruct_ov100_021D4890 * param0); -void ov100_021D49B4(UnkStruct_ov100_021D49B4 * param0); -void ov100_021D4A84(UnkStruct_ov100_021D49B4 * param0); -void ov100_021D4A90(int param0, UnkStruct_ov100_021D49B4 * param1, NNSFndAllocator * param2); -void ov100_021D4AA4(UnkStruct_ov100_021D49B4 * param0, NNSFndAllocator * param1, int param2); -void ov100_021D4AC8(UnkStruct_ov100_021D49B4 * param0, int param1, NARC * param2); -void ov100_021D4B10(UnkStruct_ov100_021D49B4 * param0, UnkStruct_ov100_021D49B4 * param1, int param2, NARC * param3); -void ov100_021D4B4C(int param0, UnkStruct_ov100_021D49B4 * param1, int param2, NARC * param3, NNSFndAllocator * param4); -void ov100_021D4BA0(int param0, UnkStruct_ov100_021D49B4 * param1, UnkStruct_ov100_021D49B4 * param2, int param3, NARC * param4, NNSFndAllocator * param5); -void ov100_021D4BF0(UnkStruct_ov100_021D46C8 * param0); -void ov100_021D4C94(UnkStruct_ov100_021D46C8 * param0, int param1); +int ov100_021D46C8(UnkStruct_ov100_021D46C8 *param0, UnkStruct_020985E4 *param1, int param2); +void ov100_021D4788(UnkStruct_ov100_021D46C8 *param0); +void ov100_021D47A0(UnkStruct_ov100_021D46C8 *param0); +void ov100_021D4844(UnkStruct_ov100_021D46C8 *param0); +void ov100_021D4890(UnkStruct_ov100_021D4890 *param0); +BOOL ov100_021D4920(UnkStruct_ov100_021D4890 *param0); +void ov100_021D49B4(UnkStruct_ov100_021D49B4 *param0); +void ov100_021D4A84(UnkStruct_ov100_021D49B4 *param0); +void ov100_021D4A90(int param0, UnkStruct_ov100_021D49B4 *param1, NNSFndAllocator *param2); +void ov100_021D4AA4(UnkStruct_ov100_021D49B4 *param0, NNSFndAllocator *param1, int param2); +void ov100_021D4AC8(UnkStruct_ov100_021D49B4 *param0, int param1, NARC *param2); +void ov100_021D4B10(UnkStruct_ov100_021D49B4 *param0, UnkStruct_ov100_021D49B4 *param1, int param2, NARC *param3); +void ov100_021D4B4C(int param0, UnkStruct_ov100_021D49B4 *param1, int param2, NARC *param3, NNSFndAllocator *param4); +void ov100_021D4BA0(int param0, UnkStruct_ov100_021D49B4 *param1, UnkStruct_ov100_021D49B4 *param2, int param3, NARC *param4, NNSFndAllocator *param5); +void ov100_021D4BF0(UnkStruct_ov100_021D46C8 *param0); +void ov100_021D4C94(UnkStruct_ov100_021D46C8 *param0, int param1); void ov100_021D4DC8(int param0); -void ov100_021D4DD8(UnkStruct_ov100_021D4DD8 * param0, int param1); +void ov100_021D4DD8(UnkStruct_ov100_021D4DD8 *param0, int param1); #endif // POKEPLATINUM_OV100_021D46C8_H diff --git a/include/overlay100/ov100_021D4E04.h b/include/overlay100/ov100_021D4E04.h index 54776bdcf6..669aa0fdec 100644 --- a/include/overlay100/ov100_021D4E04.h +++ b/include/overlay100/ov100_021D4E04.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_OV100_021D4E04_H #define POKEPLATINUM_OV100_021D4E04_H +#include + #include "overlay100/struct_ov100_021D4E3C.h" #include "overlay100/struct_ov100_021D4EBC.h" #include "overlay100/struct_ov100_021D4F9C_decl.h" -#include - -void ov100_021D4E3C(UnkStruct_ov100_021D4E3C * param0, u32 param1); -void ov100_021D4E58(UnkStruct_ov100_021D4E3C * param0); -void ov100_021D4E70(UnkStruct_ov100_021D4E3C * param0, u8 param1, u8 param2, u16 param3, fx32 param4, s16 param5, u32 param6, u32 param7, u32 param8, int param9); -UnkStruct_ov100_021D4F9C * ov100_021D4EBC(UnkStruct_ov100_021D4EBC * param0); -void ov100_021D4F0C(UnkStruct_ov100_021D4F9C ** param0, GXDispMode param1, GXBGMode param2, GXBG0As param3); +void ov100_021D4E3C(UnkStruct_ov100_021D4E3C *param0, u32 param1); +void ov100_021D4E58(UnkStruct_ov100_021D4E3C *param0); +void ov100_021D4E70(UnkStruct_ov100_021D4E3C *param0, u8 param1, u8 param2, u16 param3, fx32 param4, s16 param5, u32 param6, u32 param7, u32 param8, int param9); +UnkStruct_ov100_021D4F9C *ov100_021D4EBC(UnkStruct_ov100_021D4EBC *param0); +void ov100_021D4F0C(UnkStruct_ov100_021D4F9C **param0, GXDispMode param1, GXBGMode param2, GXBG0As param3); #endif // POKEPLATINUM_OV100_021D4E04_H diff --git a/include/overlay100/struct_ov100_021D1808.h b/include/overlay100/struct_ov100_021D1808.h index 359e286746..ee01be6dc1 100644 --- a/include/overlay100/struct_ov100_021D1808.h +++ b/include/overlay100/struct_ov100_021D1808.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_OV100_021D1808_H #include "struct_defs/struct_020985E4.h" + #include "overlay100/struct_ov100_021D1808_sub1.h" #include "overlay100/struct_ov100_021D1808_sub2.h" #include "overlay100/struct_ov100_021D46C8.h" @@ -12,8 +13,8 @@ typedef struct { int unk_08; UnkStruct_ov100_021D1808_sub1 unk_0C; UnkStruct_ov100_021D1808_sub2 unk_1A4; - UnkStruct_ov100_021D46C8 * unk_7C4; - UnkStruct_020985E4 * unk_7C8; + UnkStruct_ov100_021D46C8 *unk_7C4; + UnkStruct_020985E4 *unk_7C8; } UnkStruct_ov100_021D1808; #endif // POKEPLATINUM_STRUCT_OV100_021D1808_H diff --git a/include/overlay100/struct_ov100_021D1C98.h b/include/overlay100/struct_ov100_021D1C98.h index f419a3a671..5a06b007db 100644 --- a/include/overlay100/struct_ov100_021D1C98.h +++ b/include/overlay100/struct_ov100_021D1C98.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_OV100_021D1C98_H #include "struct_defs/struct_020985E4.h" + #include "overlay100/struct_ov100_021D1808_sub1.h" #include "overlay100/struct_ov100_021D1C98_sub1.h" #include "overlay100/struct_ov100_021D46C8.h" @@ -11,8 +12,8 @@ typedef struct { int unk_04; UnkStruct_ov100_021D1808_sub1 unk_08; UnkStruct_ov100_021D1C98_sub1 unk_1A0; - UnkStruct_ov100_021D46C8 * unk_1EBC; - UnkStruct_020985E4 * unk_1EC0; + UnkStruct_ov100_021D46C8 *unk_1EBC; + UnkStruct_020985E4 *unk_1EC0; } UnkStruct_ov100_021D1C98; #endif // POKEPLATINUM_STRUCT_OV100_021D1C98_H diff --git a/include/overlay100/struct_ov100_021D3084.h b/include/overlay100/struct_ov100_021D3084.h index f5b628e8e9..e10beb9dfb 100644 --- a/include/overlay100/struct_ov100_021D3084.h +++ b/include/overlay100/struct_ov100_021D3084.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_OV100_021D3084_H #include "struct_defs/struct_020985E4.h" + #include "overlay100/struct_ov100_021D1C98_sub1.h" #include "overlay100/struct_ov100_021D37F4.h" #include "overlay100/struct_ov100_021D46C8.h" @@ -11,8 +12,8 @@ typedef struct { int unk_04; int unk_08; UnkStruct_ov100_021D1C98_sub1 unk_0C; - UnkStruct_ov100_021D46C8 * unk_1D28; - UnkStruct_020985E4 * unk_1D2C; + UnkStruct_ov100_021D46C8 *unk_1D28; + UnkStruct_020985E4 *unk_1D2C; UnkStruct_ov100_021D37F4 unk_1D30[2]; } UnkStruct_ov100_021D3084; diff --git a/include/overlay100/struct_ov100_021D36CC.h b/include/overlay100/struct_ov100_021D36CC.h index a8f09d45d2..6c2b937e75 100644 --- a/include/overlay100/struct_ov100_021D36CC.h +++ b/include/overlay100/struct_ov100_021D36CC.h @@ -8,7 +8,7 @@ typedef struct { int unk_04; int unk_08; int unk_0C; - UnkStruct_ov100_021D4890 * unk_10; + UnkStruct_ov100_021D4890 *unk_10; } UnkStruct_ov100_021D36CC; #endif // POKEPLATINUM_STRUCT_OV100_021D36CC_H diff --git a/include/overlay100/struct_ov100_021D37F4.h b/include/overlay100/struct_ov100_021D37F4.h index c86b9c9048..0703bdbd44 100644 --- a/include/overlay100/struct_ov100_021D37F4.h +++ b/include/overlay100/struct_ov100_021D37F4.h @@ -8,8 +8,8 @@ typedef struct { int unk_04; int unk_08; s16 unk_0C; - UnkStruct_ov100_021D49B4 * unk_10; - UnkStruct_ov100_021D49B4 * unk_14; + UnkStruct_ov100_021D49B4 *unk_10; + UnkStruct_ov100_021D49B4 *unk_14; } UnkStruct_ov100_021D37F4; #endif // POKEPLATINUM_STRUCT_OV100_021D37F4_H diff --git a/include/overlay100/struct_ov100_021D4104.h b/include/overlay100/struct_ov100_021D4104.h index c0095360cb..0d75f42d45 100644 --- a/include/overlay100/struct_ov100_021D4104.h +++ b/include/overlay100/struct_ov100_021D4104.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_OV100_021D4104_H #include "struct_decls/cell_actor_data.h" + #include "sys_task_manager.h" typedef struct { - CellActorData * unk_00; - CellActorData * unk_04; + CellActorData *unk_00; + CellActorData *unk_04; int unk_08; int unk_0C; s16 unk_10; @@ -20,7 +21,7 @@ typedef struct { int unk_28[4]; int unk_38; BOOL unk_3C; - SysTask * unk_40; + SysTask *unk_40; } UnkStruct_ov100_021D4104; #endif // POKEPLATINUM_STRUCT_OV100_021D4104_H diff --git a/include/overlay100/struct_ov100_021D46C8.h b/include/overlay100/struct_ov100_021D46C8.h index bc9b425611..0c6e826e51 100644 --- a/include/overlay100/struct_ov100_021D46C8.h +++ b/include/overlay100/struct_ov100_021D46C8.h @@ -1,38 +1,40 @@ #ifndef POKEPLATINUM_STRUCT_OV100_021D46C8_H #define POKEPLATINUM_STRUCT_OV100_021D46C8_H +#include +#include + #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "camera.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" + #include "overlay100/struct_ov100_021D36CC.h" #include "overlay100/struct_ov100_021D46C8_sub1.h" #include "overlay100/struct_ov100_021D4890.h" #include "overlay100/struct_ov100_021D4F9C_decl.h" -#include -#include +#include "camera.h" +#include "message.h" typedef struct { - NARC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; - BGL * unk_0C; - PaletteData * unk_10; - GenericPointerData * unk_14; - Camera * camera; + NARC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; + BGL *unk_0C; + PaletteData *unk_10; + GenericPointerData *unk_14; + Camera *camera; NNSFndAllocator unk_1C; - MessageLoader * unk_2C; + MessageLoader *unk_2C; Window unk_30; int unk_40; VecFx32 unk_44; UnkStruct_ov100_021D46C8_sub1 unk_50; - UnkStruct_ov100_021D4F9C * unk_54; + UnkStruct_ov100_021D4F9C *unk_54; UnkStruct_ov100_021D4890 unk_58; UnkStruct_ov100_021D36CC unk_AC; u8 unk_C0; diff --git a/include/overlay100/struct_ov100_021D4890.h b/include/overlay100/struct_ov100_021D4890.h index 070d273736..bdab90493c 100644 --- a/include/overlay100/struct_ov100_021D4890.h +++ b/include/overlay100/struct_ov100_021D4890.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV100_021D4890_H #define POKEPLATINUM_STRUCT_OV100_021D4890_H +#include + #include "overlay115/camera_angle.h" -#include "camera.h" -#include +#include "camera.h" typedef struct { - Camera * camera; - VecFx32 * unk_04; + Camera *camera; + VecFx32 *unk_04; int unk_08; s32 unk_0C; s32 unk_10; diff --git a/include/overlay100/struct_ov100_021D49B4.h b/include/overlay100/struct_ov100_021D49B4.h index 093cebd1a8..b5c41e8caa 100644 --- a/include/overlay100/struct_ov100_021D49B4.h +++ b/include/overlay100/struct_ov100_021D49B4.h @@ -4,6 +4,7 @@ #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017248.h" #include "struct_defs/struct_02017294.h" + #include "overlay100/struct_ov100_021D54D0.h" typedef struct { @@ -23,7 +24,7 @@ typedef struct { int unk_178; int unk_17C; int unk_180; - UnkStruct_ov100_021D54D0 * unk_184; + UnkStruct_ov100_021D54D0 *unk_184; } UnkStruct_ov100_021D49B4; #endif // POKEPLATINUM_STRUCT_OV100_021D49B4_H diff --git a/include/overlay100/struct_ov100_021D4DD8.h b/include/overlay100/struct_ov100_021D4DD8.h index f9113d0f6a..37429cd2a1 100644 --- a/include/overlay100/struct_ov100_021D4DD8.h +++ b/include/overlay100/struct_ov100_021D4DD8.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_STRUCT_OV100_021D4DD8_H #include "struct_defs/struct_020985E4.h" + #include "overlay100/struct_ov100_021D46C8.h" typedef struct { BOOL unk_00; int unk_04; - void * unk_08; + void *unk_08; UnkStruct_ov100_021D46C8 unk_0C; - UnkStruct_020985E4 * unk_D0; + UnkStruct_020985E4 *unk_D0; } UnkStruct_ov100_021D4DD8; #endif // POKEPLATINUM_STRUCT_OV100_021D4DD8_H diff --git a/include/overlay100/struct_ov100_021D4E3C.h b/include/overlay100/struct_ov100_021D4E3C.h index a6bb736e28..df0301a9e9 100644 --- a/include/overlay100/struct_ov100_021D4E3C.h +++ b/include/overlay100/struct_ov100_021D4E3C.h @@ -5,8 +5,8 @@ #include "sys_task_manager.h" typedef struct { - ScreenScrollManager * screenScrollMgr; - SysTask * unk_04; + ScreenScrollManager *screenScrollMgr; + SysTask *unk_04; u32 unk_08; } UnkStruct_ov100_021D4E3C; diff --git a/include/overlay100/struct_ov100_021D4EBC.h b/include/overlay100/struct_ov100_021D4EBC.h index b13a261dea..b119cc199c 100644 --- a/include/overlay100/struct_ov100_021D4EBC.h +++ b/include/overlay100/struct_ov100_021D4EBC.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV100_021D4EBC_H #define POKEPLATINUM_STRUCT_OV100_021D4EBC_H - #include typedef struct { diff --git a/include/overlay101/const_ov101_021D9568.h b/include/overlay101/const_ov101_021D9568.h index 29577d32c4..bcd3bef667 100644 --- a/include/overlay101/const_ov101_021D9568.h +++ b/include/overlay101/const_ov101_021D9568.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_CONST_OV101_021D9568_H #define POKEPLATINUM_CONST_OV101_021D9568_H - #include "enums.h" extern const u32 Unk_ov101_021D9568[UnkEnum_ov101_021D9934_06]; diff --git a/include/overlay101/const_ov101_021D9688.h b/include/overlay101/const_ov101_021D9688.h index 7fa43fbc76..0515982b55 100644 --- a/include/overlay101/const_ov101_021D9688.h +++ b/include/overlay101/const_ov101_021D9688.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_CONST_OV101_021D9688_H #define POKEPLATINUM_CONST_OV101_021D9688_H - #include "enums.h" extern const UnkEnum_ov101_021D9688 Unk_ov101_021D9688[3][21]; diff --git a/include/overlay101/ov101_021D0D80.h b/include/overlay101/ov101_021D0D80.h index feaa09c874..d16038347e 100644 --- a/include/overlay101/ov101_021D0D80.h +++ b/include/overlay101/ov101_021D0D80.h @@ -1,19 +1,19 @@ #ifndef POKEPLATINUM_OV101_021D0D80_H #define POKEPLATINUM_OV101_021D0D80_H -#include "overlay_manager.h" #include "overlay101/struct_ov101_021D13C8_decl.h" #include "enums.h" +#include "overlay_manager.h" -int ov101_021D0D80(OverlayManager * param0, int * param1); -int ov101_021D0E40(OverlayManager * param0, int * param1); -int ov101_021D0EE4(OverlayManager * param0, int * param1); -void ov101_021D13C8(UnkStruct_ov101_021D13C8 * param0); -void ov101_021D148C(UnkStruct_ov101_021D13C8 * param0, u32 param1); -void ov101_021D14E4(UnkStruct_ov101_021D13C8 * param0); -void ov101_021D1894(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D1894 param1); -void * ov101_021D1998(u32 param0); -void * ov101_021D19E4(UnkStruct_ov101_021D13C8 * param0, u32 param1, int param2); +int ov101_021D0D80(OverlayManager *param0, int *param1); +int ov101_021D0E40(OverlayManager *param0, int *param1); +int ov101_021D0EE4(OverlayManager *param0, int *param1); +void ov101_021D13C8(UnkStruct_ov101_021D13C8 *param0); +void ov101_021D148C(UnkStruct_ov101_021D13C8 *param0, u32 param1); +void ov101_021D14E4(UnkStruct_ov101_021D13C8 *param0); +void ov101_021D1894(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D1894 param1); +void *ov101_021D1998(u32 param0); +void *ov101_021D19E4(UnkStruct_ov101_021D13C8 *param0, u32 param1, int param2); #endif // POKEPLATINUM_OV101_021D0D80_H diff --git a/include/overlay101/ov101_021D1A28.h b/include/overlay101/ov101_021D1A28.h index 7afb200ebf..4cc848ca62 100644 --- a/include/overlay101/ov101_021D1A28.h +++ b/include/overlay101/ov101_021D1A28.h @@ -5,10 +5,10 @@ #include "enums.h" -void ov101_021D1A28(UnkStruct_ov101_021D13C8 * param0); -void ov101_021D1A4C(UnkStruct_ov101_021D13C8 * param0); -int ov101_021D1AAC(UnkStruct_ov101_021D13C8 * param0); -UnkEnum_ov101_021D9688 ov101_021D55A4(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1, int param2); -UnkEnum_ov101_021D9688 ov101_021D55D4(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1, int param2); +void ov101_021D1A28(UnkStruct_ov101_021D13C8 *param0); +void ov101_021D1A4C(UnkStruct_ov101_021D13C8 *param0); +int ov101_021D1AAC(UnkStruct_ov101_021D13C8 *param0); +UnkEnum_ov101_021D9688 ov101_021D55A4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1, int param2); +UnkEnum_ov101_021D9688 ov101_021D55D4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1, int param2); #endif // POKEPLATINUM_OV101_021D1A28_H diff --git a/include/overlay101/ov101_021D59AC.h b/include/overlay101/ov101_021D59AC.h index 1eca7c2390..4a3ae2bdab 100644 --- a/include/overlay101/ov101_021D59AC.h +++ b/include/overlay101/ov101_021D59AC.h @@ -6,27 +6,27 @@ #include "enums.h" -void ov101_021D59AC(UnkStruct_ov101_021D13C8 * param0); -void ov101_021D5AF0(UnkStruct_ov101_021D13C8 * param0); -void ov101_021D5C28(UnkStruct_ov101_021D13C8 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D5D58(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D5814 param1); -void ov101_021D5D90(UnkStruct_ov101_021D5D90 * param0, UnkEnum_ov101_021D5D90 param1); -void ov101_021D5DA4(UnkStruct_ov101_021D5D90 * param0, int param1); -int ov101_021D5DC4(UnkStruct_ov101_021D5D90 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D6484(UnkStruct_ov101_021D13C8 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D6764(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D6764 param1); -void ov101_021D679C(UnkStruct_ov101_021D5D90 * param0, UnkEnum_ov101_021D679C param1); -int ov101_021D67B0(UnkStruct_ov101_021D5D90 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D6DF0(UnkStruct_ov101_021D13C8 * param0); -int ov101_021D6E1C(UnkStruct_ov101_021D5D90 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D7228(UnkStruct_ov101_021D13C8 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D72D4(UnkStruct_ov101_021D13C8 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D73B4(UnkStruct_ov101_021D13C8 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D7460(UnkStruct_ov101_021D13C8 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D7550(UnkStruct_ov101_021D13C8 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D76B4(UnkStruct_ov101_021D13C8 * param0); -UnkStruct_ov101_021D5D90 * ov101_021D77E4(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D77E4 param1); -UnkStruct_ov101_021D5D90 * ov101_021D79BC(UnkStruct_ov101_021D13C8 * param0, u32 param1); -UnkStruct_ov101_021D5D90 * ov101_021D7B08(UnkStruct_ov101_021D13C8 * param0); +void ov101_021D59AC(UnkStruct_ov101_021D13C8 *param0); +void ov101_021D5AF0(UnkStruct_ov101_021D13C8 *param0); +void ov101_021D5C28(UnkStruct_ov101_021D13C8 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D5D58(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D5814 param1); +void ov101_021D5D90(UnkStruct_ov101_021D5D90 *param0, UnkEnum_ov101_021D5D90 param1); +void ov101_021D5DA4(UnkStruct_ov101_021D5D90 *param0, int param1); +int ov101_021D5DC4(UnkStruct_ov101_021D5D90 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D6484(UnkStruct_ov101_021D13C8 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D6764(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D6764 param1); +void ov101_021D679C(UnkStruct_ov101_021D5D90 *param0, UnkEnum_ov101_021D679C param1); +int ov101_021D67B0(UnkStruct_ov101_021D5D90 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D6DF0(UnkStruct_ov101_021D13C8 *param0); +int ov101_021D6E1C(UnkStruct_ov101_021D5D90 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D7228(UnkStruct_ov101_021D13C8 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D72D4(UnkStruct_ov101_021D13C8 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D73B4(UnkStruct_ov101_021D13C8 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D7460(UnkStruct_ov101_021D13C8 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D7550(UnkStruct_ov101_021D13C8 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D76B4(UnkStruct_ov101_021D13C8 *param0); +UnkStruct_ov101_021D5D90 *ov101_021D77E4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D77E4 param1); +UnkStruct_ov101_021D5D90 *ov101_021D79BC(UnkStruct_ov101_021D13C8 *param0, u32 param1); +UnkStruct_ov101_021D5D90 *ov101_021D7B08(UnkStruct_ov101_021D13C8 *param0); #endif // POKEPLATINUM_OV101_021D59AC_H diff --git a/include/overlay101/ov101_021D7E48.h b/include/overlay101/ov101_021D7E48.h index 3a95211363..13d147fe28 100644 --- a/include/overlay101/ov101_021D7E48.h +++ b/include/overlay101/ov101_021D7E48.h @@ -1,28 +1,29 @@ #ifndef POKEPLATINUM_OV101_021D7E48_H #define POKEPLATINUM_OV101_021D7E48_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02022550_decl.h" + #include "overlay101/struct_ov101_021D7E48_decl.h" #include "overlay101/struct_ov101_021D8544.h" -#include - -UnkStruct_ov101_021D7E48 * ov101_021D7E48(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9, u32 param10); -void ov101_021D7FB4(UnkStruct_ov101_021D7E48 * param0); -void ov101_021D80D4(UnkStruct_ov101_021D7E48 * param0); -void ov101_021D80E4(UnkStruct_ov101_021D7E48 * param0, u32 param1, NARC * param2, u32 param3, u32 param4); -void ov101_021D814C(UnkStruct_ov101_021D7E48 * param0, u32 param1); -void ov101_021D8180(UnkStruct_ov101_021D7E48 * param0, u32 param1); -void ov101_021D81B4(UnkStruct_ov101_021D7E48 * param0, u32 param1, NARC * param2, u32 param3, u32 param4); -void ov101_021D8220(UnkStruct_ov101_021D7E48 * param0, u32 param1); -void ov101_021D8254(UnkStruct_ov101_021D7E48 * param0, u32 param1); -void ov101_021D8288(UnkStruct_ov101_021D7E48 * param0, NARC * param1, u32 param2, u32 param3); -void ov101_021D82F0(UnkStruct_ov101_021D7E48 * param0, NARC * param1, u32 param2, u32 param3); -void ov101_021D8358(UnkStruct_ov101_021D7E48 * param0, u32 param1, u32 param2, u32 param3, u32 param4); -void ov101_021D84A4(UnkStruct_ov101_021D7E48 * param0, UnkStruct_ov101_021D8544 * param1, const VecFx32 * param2, u32 param3, int param4, u32 param5, u32 param6, u32 param7, u32 param8, int param9, int param10); -void ov101_021D8544(UnkStruct_ov101_021D8544 * param0); -void ov101_021D8560(GraphicElementData * param0, VecFx32 * param1); -void ov101_021D8574(GraphicElementData * param0, VecFx32 * param1); +UnkStruct_ov101_021D7E48 *ov101_021D7E48(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9, u32 param10); +void ov101_021D7FB4(UnkStruct_ov101_021D7E48 *param0); +void ov101_021D80D4(UnkStruct_ov101_021D7E48 *param0); +void ov101_021D80E4(UnkStruct_ov101_021D7E48 *param0, u32 param1, NARC *param2, u32 param3, u32 param4); +void ov101_021D814C(UnkStruct_ov101_021D7E48 *param0, u32 param1); +void ov101_021D8180(UnkStruct_ov101_021D7E48 *param0, u32 param1); +void ov101_021D81B4(UnkStruct_ov101_021D7E48 *param0, u32 param1, NARC *param2, u32 param3, u32 param4); +void ov101_021D8220(UnkStruct_ov101_021D7E48 *param0, u32 param1); +void ov101_021D8254(UnkStruct_ov101_021D7E48 *param0, u32 param1); +void ov101_021D8288(UnkStruct_ov101_021D7E48 *param0, NARC *param1, u32 param2, u32 param3); +void ov101_021D82F0(UnkStruct_ov101_021D7E48 *param0, NARC *param1, u32 param2, u32 param3); +void ov101_021D8358(UnkStruct_ov101_021D7E48 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void ov101_021D84A4(UnkStruct_ov101_021D7E48 *param0, UnkStruct_ov101_021D8544 *param1, const VecFx32 *param2, u32 param3, int param4, u32 param5, u32 param6, u32 param7, u32 param8, int param9, int param10); +void ov101_021D8544(UnkStruct_ov101_021D8544 *param0); +void ov101_021D8560(GraphicElementData *param0, VecFx32 *param1); +void ov101_021D8574(GraphicElementData *param0, VecFx32 *param1); #endif // POKEPLATINUM_OV101_021D7E48_H diff --git a/include/overlay101/struct_ov101_021D13C8.h b/include/overlay101/struct_ov101_021D13C8.h index 62f37832ea..0cabd2a5f9 100644 --- a/include/overlay101/struct_ov101_021D13C8.h +++ b/include/overlay101/struct_ov101_021D13C8.h @@ -1,9 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D13C8_H #define POKEPLATINUM_STRUCT_OV101_021D13C8_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020711EC_decl.h" + #include "overlay101/struct_ov101_021D148C.h" #include "overlay101/struct_ov101_021D1894.h" #include "overlay101/struct_ov101_021D2D88.h" @@ -13,7 +16,6 @@ #include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D7E48_decl.h" -#include #include "enums.h" typedef struct UnkStruct_ov101_021D13C8_t { @@ -58,14 +60,14 @@ typedef struct UnkStruct_ov101_021D13C8_t { UnkStruct_ov101_021D4F58 unk_184; UnkStruct_ov101_021D148C unk_408; UnkStruct_ov101_021D1894 unk_424; - NARC * unk_438; - BGL * unk_43C; - NNSG2dScreenData * unk_440; - NNSG2dCharacterData * unk_444; - NNSG2dPaletteData * unk_448; - UnkStruct_020711EC * unk_44C; - UnkStruct_ov101_021D7E48 * unk_450; - UnkStruct_ov101_021D5D90 * unk_454; + NARC *unk_438; + BGL *unk_43C; + NNSG2dScreenData *unk_440; + NNSG2dCharacterData *unk_444; + NNSG2dPaletteData *unk_448; + UnkStruct_020711EC *unk_44C; + UnkStruct_ov101_021D7E48 *unk_450; + UnkStruct_ov101_021D5D90 *unk_454; u32 unk_458; u32 unk_45C; u32 unk_460; diff --git a/include/overlay101/struct_ov101_021D148C.h b/include/overlay101/struct_ov101_021D148C.h index 6162c79fd6..8a51226dae 100644 --- a/include/overlay101/struct_ov101_021D148C.h +++ b/include/overlay101/struct_ov101_021D148C.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D148C_H #define POKEPLATINUM_STRUCT_OV101_021D148C_H +#include "struct_defs/struct_0205AA50.h" + #include "message.h" #include "string_template.h" -#include "struct_defs/struct_0205AA50.h" typedef struct { - MessageLoader * unk_00; - StringTemplate * unk_04; + MessageLoader *unk_00; + StringTemplate *unk_04; Window unk_08[1]; - void * unk_18; + void *unk_18; } UnkStruct_ov101_021D148C; #endif // POKEPLATINUM_STRUCT_OV101_021D148C_H diff --git a/include/overlay101/struct_ov101_021D1894.h b/include/overlay101/struct_ov101_021D1894.h index a6910fa568..21c44c0ed1 100644 --- a/include/overlay101/struct_ov101_021D1894.h +++ b/include/overlay101/struct_ov101_021D1894.h @@ -1,16 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D1894_H #define POKEPLATINUM_STRUCT_OV101_021D1894_H -#include "sys_task_manager.h" - #include "enums.h" +#include "sys_task_manager.h" typedef struct { u32 unk_00; int unk_04; UnkEnum_ov101_021D1894 unk_08; UnkEnum_ov101_021D1894 unk_0C; - SysTask * unk_10; + SysTask *unk_10; } UnkStruct_ov101_021D1894; #endif // POKEPLATINUM_STRUCT_OV101_021D1894_H diff --git a/include/overlay101/struct_ov101_021D2D88.h b/include/overlay101/struct_ov101_021D2D88.h index c70ff9ae10..4ea50cb365 100644 --- a/include/overlay101/struct_ov101_021D2D88.h +++ b/include/overlay101/struct_ov101_021D2D88.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D2D88_H #define POKEPLATINUM_STRUCT_OV101_021D2D88_H -#include "sys_task_manager.h" #include "overlay101/struct_ov101_021D13C8_decl.h" #include "enums.h" +#include "sys_task_manager.h" typedef struct { u32 unk_00; @@ -14,8 +14,8 @@ typedef struct { UnkEnum_ov101_021D2BDC unk_10; int unk_14; int unk_18; - SysTask * unk_1C; - UnkStruct_ov101_021D13C8 * unk_20; + SysTask *unk_1C; + UnkStruct_ov101_021D13C8 *unk_20; } UnkStruct_ov101_021D2D88; #endif // POKEPLATINUM_STRUCT_OV101_021D2D88_H diff --git a/include/overlay101/struct_ov101_021D4714.h b/include/overlay101/struct_ov101_021D4714.h index 1f4e1ef7fb..69c6cf74bc 100644 --- a/include/overlay101/struct_ov101_021D4714.h +++ b/include/overlay101/struct_ov101_021D4714.h @@ -1,18 +1,19 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D4714_H #define POKEPLATINUM_STRUCT_OV101_021D4714_H -#include "sys_task_manager.h" #include "overlay101/struct_ov101_021D13C8_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" +#include "sys_task_manager.h" + typedef struct { u32 unk_00; u32 unk_04; int unk_08; - UnkStruct_ov101_021D13C8 * unk_0C; - SysTask * unk_10; - UnkStruct_ov101_021D5D90 * unk_14; - UnkStruct_ov101_021D5D90 * unk_18; + UnkStruct_ov101_021D13C8 *unk_0C; + SysTask *unk_10; + UnkStruct_ov101_021D5D90 *unk_14; + UnkStruct_ov101_021D5D90 *unk_18; } UnkStruct_ov101_021D4714; #endif // POKEPLATINUM_STRUCT_OV101_021D4714_H diff --git a/include/overlay101/struct_ov101_021D4764.h b/include/overlay101/struct_ov101_021D4764.h index c540e09d13..beb16e5db5 100644 --- a/include/overlay101/struct_ov101_021D4764.h +++ b/include/overlay101/struct_ov101_021D4764.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D4764_H #define POKEPLATINUM_STRUCT_OV101_021D4764_H -#include "sys_task_manager.h" #include "overlay101/struct_ov101_021D13C8_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" #include "enums.h" +#include "sys_task_manager.h" typedef struct { u32 unk_00; @@ -16,16 +16,16 @@ typedef struct { int unk_14; UnkEnum_ov101_021D5814 unk_18; UnkEnum_ov101_021D6764 unk_1C; - UnkStruct_ov101_021D13C8 * unk_20; - SysTask * unk_24; - UnkStruct_ov101_021D5D90 * unk_28; - UnkStruct_ov101_021D5D90 * unk_2C; - UnkStruct_ov101_021D5D90 * unk_30; - UnkStruct_ov101_021D5D90 * unk_34; - UnkStruct_ov101_021D5D90 * unk_38; - UnkStruct_ov101_021D5D90 * unk_3C; - UnkStruct_ov101_021D5D90 * unk_40; - UnkStruct_ov101_021D5D90 * unk_44; + UnkStruct_ov101_021D13C8 *unk_20; + SysTask *unk_24; + UnkStruct_ov101_021D5D90 *unk_28; + UnkStruct_ov101_021D5D90 *unk_2C; + UnkStruct_ov101_021D5D90 *unk_30; + UnkStruct_ov101_021D5D90 *unk_34; + UnkStruct_ov101_021D5D90 *unk_38; + UnkStruct_ov101_021D5D90 *unk_3C; + UnkStruct_ov101_021D5D90 *unk_40; + UnkStruct_ov101_021D5D90 *unk_44; } UnkStruct_ov101_021D4764; #endif // POKEPLATINUM_STRUCT_OV101_021D4764_H diff --git a/include/overlay101/struct_ov101_021D4F58.h b/include/overlay101/struct_ov101_021D4F58.h index fe9dbeea56..a4047c3158 100644 --- a/include/overlay101/struct_ov101_021D4F58.h +++ b/include/overlay101/struct_ov101_021D4F58.h @@ -4,7 +4,7 @@ #include "overlay101/struct_ov101_021D13C8_decl.h" typedef struct { - UnkStruct_ov101_021D13C8 * unk_00; + UnkStruct_ov101_021D13C8 *unk_00; u16 unk_04[16]; u16 unk_24[16]; u16 unk_44[16]; diff --git a/include/overlay101/struct_ov101_021D8544.h b/include/overlay101/struct_ov101_021D8544.h index e65b043b0f..fb5fe84443 100644 --- a/include/overlay101/struct_ov101_021D8544.h +++ b/include/overlay101/struct_ov101_021D8544.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D8544_H #define POKEPLATINUM_STRUCT_OV101_021D8544_H -#include "struct_decls/struct_02022550_decl.h" - #include +#include "struct_decls/struct_02022550_decl.h" + typedef struct { int unk_00; - GraphicElementData * unk_04; - const NNSG2dImageProxy * unk_08; + GraphicElementData *unk_04; + const NNSG2dImageProxy *unk_08; } UnkStruct_ov101_021D8544; #endif // POKEPLATINUM_STRUCT_OV101_021D8544_H diff --git a/include/overlay101/struct_ov101_021D9784.h b/include/overlay101/struct_ov101_021D9784.h index 246e726f88..22c4a17620 100644 --- a/include/overlay101/struct_ov101_021D9784.h +++ b/include/overlay101/struct_ov101_021D9784.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D9784_H #define POKEPLATINUM_STRUCT_OV101_021D9784_H - #include "enums.h" typedef struct { diff --git a/include/overlay101/struct_ov101_021D9934.h b/include/overlay101/struct_ov101_021D9934.h index 068afca3b9..195c9ee23a 100644 --- a/include/overlay101/struct_ov101_021D9934.h +++ b/include/overlay101/struct_ov101_021D9934.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D9934_H #define POKEPLATINUM_STRUCT_OV101_021D9934_H - #include "enums.h" typedef struct { diff --git a/include/overlay101/struct_ov101_021D9AE4.h b/include/overlay101/struct_ov101_021D9AE4.h index 771d501e92..423e2d4a81 100644 --- a/include/overlay101/struct_ov101_021D9AE4.h +++ b/include/overlay101/struct_ov101_021D9AE4.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV101_021D9AE4_H #define POKEPLATINUM_STRUCT_OV101_021D9AE4_H - #include "enums.h" typedef struct { diff --git a/include/overlay102/ov102_021D0D80.h b/include/overlay102/ov102_021D0D80.h index 41b34c641e..70c804528c 100644 --- a/include/overlay102/ov102_021D0D80.h +++ b/include/overlay102/ov102_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV102_021D0D80_H #define POKEPLATINUM_OV102_021D0D80_H +#include "overlay_manager.h" -int ov102_021D0D80(OverlayManager * param0, int * param1); -int ov102_021D0E2C(OverlayManager * param0, int * param1); -int ov102_021D0F50(OverlayManager * param0, int * param1); +int ov102_021D0D80(OverlayManager *param0, int *param1); +int ov102_021D0E2C(OverlayManager *param0, int *param1); +int ov102_021D0F50(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV102_021D0D80_H diff --git a/include/overlay104/funcptr_ov104_0222E930.h b/include/overlay104/funcptr_ov104_0222E930.h index 2ae4a94afd..2096000d47 100644 --- a/include/overlay104/funcptr_ov104_0222E930.h +++ b/include/overlay104/funcptr_ov104_0222E930.h @@ -3,6 +3,6 @@ #include "overlay104/struct_ov104_0222E930_decl.h" -typedef BOOL (* UnkFuncPtr_ov104_0222E930)(UnkStruct_ov104_0222E930 *); +typedef BOOL (*UnkFuncPtr_ov104_0222E930)(UnkStruct_ov104_0222E930 *); #endif // POKEPLATINUM_FUNCPTR_OV104_0222E930_H diff --git a/include/overlay104/funcptr_ov104_0222E974.h b/include/overlay104/funcptr_ov104_0222E974.h index 440ba665b9..efdb4ed3a0 100644 --- a/include/overlay104/funcptr_ov104_0222E974.h +++ b/include/overlay104/funcptr_ov104_0222E974.h @@ -3,6 +3,6 @@ #include "overlay104/struct_ov104_0222E930_decl.h" -typedef BOOL (* UnkFuncPtr_ov104_0222E974)(UnkStruct_ov104_0222E930 *); +typedef BOOL (*UnkFuncPtr_ov104_0222E974)(UnkStruct_ov104_0222E930 *); #endif // POKEPLATINUM_FUNCPTR_OV104_0222E974_H diff --git a/include/overlay104/ov104_0222DCE0.h b/include/overlay104/ov104_0222DCE0.h index 2a24a8d0b7..26d9fdd97b 100644 --- a/include/overlay104/ov104_0222DCE0.h +++ b/include/overlay104/ov104_0222DCE0.h @@ -1,39 +1,41 @@ #ifndef POKEPLATINUM_OV104_0222DCE0_H #define POKEPLATINUM_OV104_0222DCE0_H -#include "string_template.h" #include "struct_decls/struct_02022550_decl.h" -#include "trainer_info.h" +#include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0204B184.h" #include "struct_defs/struct_0204B1E8.h" -#include "pokemon.h" -#include "struct_decls/struct_party_decl.h" -#include "savedata.h" + #include "overlay006/battle_params.h" #include "overlay104/struct_ov104_0223A348.h" #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223A348_sub2.h" -UnkStruct_0204B184 * ov104_0222DCE0(u16 param0, int param1, int param2); -void ov104_0222DCF4(UnkStruct_0204B1E8 * param0, int param1, int param2); -UnkStruct_0204B184 * ov104_0222DD04(UnkStruct_ov104_0223A348_sub1 * param0, int param1, int param2, int param3); -u32 ov104_0222DD6C(UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, u32 param2, u32 param3, u8 param4, u8 param5, BOOL param6, int param7, int param8); -void ov104_0222DF40(const UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * param1, u8 param2); +#include "pokemon.h" +#include "savedata.h" +#include "string_template.h" +#include "trainer_info.h" + +UnkStruct_0204B184 *ov104_0222DCE0(u16 param0, int param1, int param2); +void ov104_0222DCF4(UnkStruct_0204B1E8 *param0, int param1, int param2); +UnkStruct_0204B184 *ov104_0222DD04(UnkStruct_ov104_0223A348_sub1 *param0, int param1, int param2, int param3); +u32 ov104_0222DD6C(UnkStruct_ov104_0223A348_sub2 *param0, u16 param1, u32 param2, u32 param3, u8 param4, u8 param5, BOOL param6, int param7, int param8); +void ov104_0222DF40(const UnkStruct_ov104_0223A348_sub2 *param0, Pokemon *param1, u8 param2); u16 ov104_0222E10C(u8 param0); -void ov104_0222E134(SaveData * param0, Pokemon * param1); -void ov104_0222E1C0(SaveData * param0, Party * param1, Pokemon * param2); -void ov104_0222E1D8(GraphicElementData * param0, u8 param1); -void ov104_0222E204(GraphicElementData * param0, s16 param1, s16 param2, u8 param3); +void ov104_0222E134(SaveData *param0, Pokemon *param1); +void ov104_0222E1C0(SaveData *param0, Party *param1, Pokemon *param2); +void ov104_0222E1D8(GraphicElementData *param0, u8 param1); +void ov104_0222E204(GraphicElementData *param0, s16 param1, s16 param2, u8 param3); u8 ov104_0222E240(u16 param0, u16 param1); -void ov104_0222E278(UnkStruct_ov104_0223A348 * param0, u16 param1, int param2, int param3); -void ov104_0222E284(BattleParams * param0, UnkStruct_ov104_0223A348_sub1 * param1, int param2, int param3, int param4); -u32 ov104_0222E2F0(UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, int param2, u8 param3, u32 param4, int param5, int param6); -void ov104_0222E330(UnkStruct_ov104_0223A348_sub2 * param0, u16 param1[], u8 param2[], u32 param3[], u32 param4[], int param5, int param6, int param7); +void ov104_0222E278(UnkStruct_ov104_0223A348 *param0, u16 param1, int param2, int param3); +void ov104_0222E284(BattleParams *param0, UnkStruct_ov104_0223A348_sub1 *param1, int param2, int param3, int param4); +u32 ov104_0222E2F0(UnkStruct_ov104_0223A348_sub2 *param0, u16 param1, int param2, u8 param3, u32 param4, int param5, int param6); +void ov104_0222E330(UnkStruct_ov104_0223A348_sub2 *param0, u16 param1[], u8 param2[], u32 param3[], u32 param4[], int param5, int param6, int param7); u8 ov104_0222E3A8(u16 param0); -BOOL ov104_0222E3E4(UnkStruct_0204B184 * param0, const u16 param1[], const u16 param2[], int param3, int param4, u16 param5[], int param6); -void ov104_0222E4BC(u8 param0, u16 param1, u16 param2, u16 * param3, UnkStruct_ov104_0223A348_sub2 * param4, u8 * param5, u32 * param6, u8 param7); -void ov104_0222E5D0(StringTemplate * param0, u32 param1); -int ov104_0222E5F0(const TrainerInfo * param0); -void ov104_0222E630(SaveData * param0); +BOOL ov104_0222E3E4(UnkStruct_0204B184 *param0, const u16 param1[], const u16 param2[], int param3, int param4, u16 param5[], int param6); +void ov104_0222E4BC(u8 param0, u16 param1, u16 param2, u16 *param3, UnkStruct_ov104_0223A348_sub2 *param4, u8 *param5, u32 *param6, u8 param7); +void ov104_0222E5D0(StringTemplate *param0, u32 param1); +int ov104_0222E5F0(const TrainerInfo *param0); +void ov104_0222E630(SaveData *param0); #endif // POKEPLATINUM_OV104_0222DCE0_H diff --git a/include/overlay104/ov104_0222E63C.h b/include/overlay104/ov104_0222E63C.h index 482ad5f5b4..9be24a52d5 100644 --- a/include/overlay104/ov104_0222E63C.h +++ b/include/overlay104/ov104_0222E63C.h @@ -2,18 +2,19 @@ #define POKEPLATINUM_OV104_0222E63C_H #include "struct_decls/struct_0209B75C_decl.h" + #include "overlay104/struct_ov104_0222E8C8.h" #include "overlay104/struct_ov104_022320B4_decl.h" #include "overlay104/struct_ov104_0223C4CC_decl.h" -UnkStruct_ov104_022320B4 * ov104_0222E63C(UnkStruct_0209B75C * param0, int param1, int param2); -BOOL ov104_0222E6A8(UnkStruct_ov104_022320B4 * param0); -void ov104_0222E710(UnkStruct_ov104_022320B4 * param0); -void ov104_0222E748(UnkStruct_ov104_022320B4 * param0, int param1, int param2); -void ov104_0222E86C(UnkStruct_ov104_022320B4 * param0, int param1, int param2); -UnkStruct_ov104_0222E8C8 * ov104_0222E8C8(UnkStruct_ov104_022320B4 * param0, int param1); -void ov104_0222E8E8(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0222E8C8 * param1); -u16 * ov104_0222E91C(UnkStruct_ov104_022320B4 * param0, int param1); -UnkStruct_ov104_0223C4CC * ov104_0222E924(UnkStruct_ov104_022320B4 * param0); +UnkStruct_ov104_022320B4 *ov104_0222E63C(UnkStruct_0209B75C *param0, int param1, int param2); +BOOL ov104_0222E6A8(UnkStruct_ov104_022320B4 *param0); +void ov104_0222E710(UnkStruct_ov104_022320B4 *param0); +void ov104_0222E748(UnkStruct_ov104_022320B4 *param0, int param1, int param2); +void ov104_0222E86C(UnkStruct_ov104_022320B4 *param0, int param1, int param2); +UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, int param1); +void ov104_0222E8E8(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0222E8C8 *param1); +u16 *ov104_0222E91C(UnkStruct_ov104_022320B4 *param0, int param1); +UnkStruct_ov104_0223C4CC *ov104_0222E924(UnkStruct_ov104_022320B4 *param0); #endif // POKEPLATINUM_OV104_0222E63C_H diff --git a/include/overlay104/ov104_0222E930.h b/include/overlay104/ov104_0222E930.h index 8c36f4b496..4c51aadcee 100644 --- a/include/overlay104/ov104_0222E930.h +++ b/include/overlay104/ov104_0222E930.h @@ -2,19 +2,19 @@ #define POKEPLATINUM_OV104_0222E930_H #include "overlay104/funcptr_ov104_0222E930.h" -#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/funcptr_ov104_0222E974.h" +#include "overlay104/struct_ov104_0222E930_decl.h" -void ov104_0222E930(UnkStruct_ov104_0222E930 * param0, const UnkFuncPtr_ov104_0222E930 * param1, u32 param2); -u8 ov104_0222E968(UnkStruct_ov104_0222E930 * param0, const u8 * param1); -void ov104_0222E974(UnkStruct_ov104_0222E930 * param0, UnkFuncPtr_ov104_0222E974 param1); -void ov104_0222E980(UnkStruct_ov104_0222E930 * param0); -u8 ov104_0222E988(UnkStruct_ov104_0222E930 * param0); -u8 ov104_0222E9F8(UnkStruct_ov104_0222E930 * param0, const u8 * param1); -const u8 * ov104_0222EA14(UnkStruct_ov104_0222E930 * param0); -void ov104_0222EA2C(UnkStruct_ov104_0222E930 * param0, u8 * param1); -void ov104_0222EA3C(UnkStruct_ov104_0222E930 * param0); -u16 ov104_0222EA48(UnkStruct_ov104_0222E930 * param0); -u32 ov104_0222EA60(UnkStruct_ov104_0222E930 * param0); +void ov104_0222E930(UnkStruct_ov104_0222E930 *param0, const UnkFuncPtr_ov104_0222E930 *param1, u32 param2); +u8 ov104_0222E968(UnkStruct_ov104_0222E930 *param0, const u8 *param1); +void ov104_0222E974(UnkStruct_ov104_0222E930 *param0, UnkFuncPtr_ov104_0222E974 param1); +void ov104_0222E980(UnkStruct_ov104_0222E930 *param0); +u8 ov104_0222E988(UnkStruct_ov104_0222E930 *param0); +u8 ov104_0222E9F8(UnkStruct_ov104_0222E930 *param0, const u8 *param1); +const u8 *ov104_0222EA14(UnkStruct_ov104_0222E930 *param0); +void ov104_0222EA2C(UnkStruct_ov104_0222E930 *param0, u8 *param1); +void ov104_0222EA3C(UnkStruct_ov104_0222E930 *param0); +u16 ov104_0222EA48(UnkStruct_ov104_0222E930 *param0); +u32 ov104_0222EA60(UnkStruct_ov104_0222E930 *param0); #endif // POKEPLATINUM_OV104_0222E930_H diff --git a/include/overlay104/ov104_0222EA90.h b/include/overlay104/ov104_0222EA90.h index 525b946f7b..2f221a9498 100644 --- a/include/overlay104/ov104_0222EA90.h +++ b/include/overlay104/ov104_0222EA90.h @@ -4,7 +4,7 @@ #include "overlay104/struct_ov104_0223C4CC_decl.h" int ov104_0222EA90(int param0, int param1); -void ov104_0222EB8C(UnkStruct_ov104_0223C4CC * param0, void ** param1, int param2); -void ov104_0222EBA4(UnkStruct_ov104_0223C4CC * param0, void ** param1, int param2); +void ov104_0222EB8C(UnkStruct_ov104_0223C4CC *param0, void **param1, int param2); +void ov104_0222EBA4(UnkStruct_ov104_0223C4CC *param0, void **param1, int param2); #endif // POKEPLATINUM_OV104_0222EA90_H diff --git a/include/overlay104/ov104_0222ECE8.h b/include/overlay104/ov104_0222ECE8.h index 45b31bde0a..b43a9fbfb3 100644 --- a/include/overlay104/ov104_0222ECE8.h +++ b/include/overlay104/ov104_0222ECE8.h @@ -6,59 +6,59 @@ #include "overlay104/struct_ov104_0223BA10.h" #include "overlay104/struct_ov104_0223BFFC.h" -void ov104_0222ECE8(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222ED00(UnkStruct_ov104_0223B5C0 * param0); -void ov104_0222ED2C(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222ED44(UnkStruct_ov104_0223B5C0 * param0); -void ov104_0222ED74(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222EDA8(UnkStruct_ov104_0223B5C0 * param0); -void ov104_0222EDDC(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222EE14(UnkStruct_ov104_0223B5C0 * param0, u8 param1); -void ov104_0222EE38(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222EE60(UnkStruct_ov104_0223B5C0 * param0); -void ov104_0222EEA8(int param0, int param1, void * param2, void * param3); -u8 * ov104_0222EED8(int param0, void * param1, int param2); -BOOL ov104_0222EEF8(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0222EF30(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222EF64(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0222EF94(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222EFCC(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0222F03C(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F0B4(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0222F124(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F1A0(UnkStruct_ov104_0223ADA0 * param0, u8 param1); -void ov104_0222F1C4(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F1EC(UnkStruct_ov104_0223ADA0 * param0, u8 param1); -void ov104_0222F210(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F238(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0222F31C(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F3B8(UnkStruct_ov104_0223BA10 * param0); -void ov104_0222F418(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F44C(UnkStruct_ov104_0223BA10 * param0); -void ov104_0222F480(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F4B8(UnkStruct_ov104_0223BA10 * param0); -void ov104_0222F530(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F5D4(UnkStruct_ov104_0223BA10 * param0); -void ov104_0222F650(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F6C8(UnkStruct_ov104_0223BA10 * param0, u16 param1); -void ov104_0222F6E8(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F710(UnkStruct_ov104_0223BA10 * param0, u16 param1); -void ov104_0222F730(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F758(UnkStruct_ov104_0223BA10 * param0); -void ov104_0222F7BC(int param0, int param1, void * param2, void * param3); -u8 * ov104_0222F84C(int param0, void * param1, int param2); -BOOL ov104_0222F86C(UnkStruct_ov104_0223BFFC * param0); -void ov104_0222F8A0(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F8D0(UnkStruct_ov104_0223BFFC * param0); -void ov104_0222F908(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F944(UnkStruct_ov104_0223BFFC * param0); -void ov104_0222F9C0(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222FA38(UnkStruct_ov104_0223BFFC * param0, u16 param1); -void ov104_0222FA5C(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222FA84(UnkStruct_ov104_0223BFFC * param0, u16 param1); -void ov104_0222FAA8(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222FAD0(UnkStruct_ov104_0223BFFC * param0); -void ov104_0222FB34(int param0, int param1, void * param2, void * param3); -u8 * ov104_0222FBC4(int param0, void * param1, int param2); +void ov104_0222ECE8(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222ED00(UnkStruct_ov104_0223B5C0 *param0); +void ov104_0222ED2C(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222ED44(UnkStruct_ov104_0223B5C0 *param0); +void ov104_0222ED74(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222EDA8(UnkStruct_ov104_0223B5C0 *param0); +void ov104_0222EDDC(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222EE14(UnkStruct_ov104_0223B5C0 *param0, u8 param1); +void ov104_0222EE38(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222EE60(UnkStruct_ov104_0223B5C0 *param0); +void ov104_0222EEA8(int param0, int param1, void *param2, void *param3); +u8 *ov104_0222EED8(int param0, void *param1, int param2); +BOOL ov104_0222EEF8(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0222EF30(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222EF64(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0222EF94(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222EFCC(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0222F03C(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F0B4(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0222F124(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F1A0(UnkStruct_ov104_0223ADA0 *param0, u8 param1); +void ov104_0222F1C4(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F1EC(UnkStruct_ov104_0223ADA0 *param0, u8 param1); +void ov104_0222F210(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F238(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0222F31C(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F3B8(UnkStruct_ov104_0223BA10 *param0); +void ov104_0222F418(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F44C(UnkStruct_ov104_0223BA10 *param0); +void ov104_0222F480(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F4B8(UnkStruct_ov104_0223BA10 *param0); +void ov104_0222F530(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F5D4(UnkStruct_ov104_0223BA10 *param0); +void ov104_0222F650(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F6C8(UnkStruct_ov104_0223BA10 *param0, u16 param1); +void ov104_0222F6E8(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F710(UnkStruct_ov104_0223BA10 *param0, u16 param1); +void ov104_0222F730(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F758(UnkStruct_ov104_0223BA10 *param0); +void ov104_0222F7BC(int param0, int param1, void *param2, void *param3); +u8 *ov104_0222F84C(int param0, void *param1, int param2); +BOOL ov104_0222F86C(UnkStruct_ov104_0223BFFC *param0); +void ov104_0222F8A0(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F8D0(UnkStruct_ov104_0223BFFC *param0); +void ov104_0222F908(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F944(UnkStruct_ov104_0223BFFC *param0); +void ov104_0222F9C0(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222FA38(UnkStruct_ov104_0223BFFC *param0, u16 param1); +void ov104_0222FA5C(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222FA84(UnkStruct_ov104_0223BFFC *param0, u16 param1); +void ov104_0222FAA8(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222FAD0(UnkStruct_ov104_0223BFFC *param0); +void ov104_0222FB34(int param0, int param1, void *param2, void *param3); +u8 *ov104_0222FBC4(int param0, void *param1, int param2); #endif // POKEPLATINUM_OV104_0222ECE8_H diff --git a/include/overlay104/ov104_0222FBE4.h b/include/overlay104/ov104_0222FBE4.h index 3f08e95ee2..10b34cbc80 100644 --- a/include/overlay104/ov104_0222FBE4.h +++ b/include/overlay104/ov104_0222FBE4.h @@ -3,9 +3,9 @@ #include "overlay104/struct_ov104_0222E930_decl.h" -u16 * ov104_0222FBE4(UnkStruct_ov104_0222E930 * param0); -u16 ov104_0222FC00(UnkStruct_ov104_0222E930 * param0); -u16 * ov104_0222FC14(UnkStruct_ov104_0222E930 * param0, u16 param1); -u16 ov104_0222FC8C(UnkStruct_ov104_0222E930 * param0, u16 param1); +u16 *ov104_0222FBE4(UnkStruct_ov104_0222E930 *param0); +u16 ov104_0222FC00(UnkStruct_ov104_0222E930 *param0); +u16 *ov104_0222FC14(UnkStruct_ov104_0222E930 *param0, u16 param1); +u16 ov104_0222FC8C(UnkStruct_ov104_0222E930 *param0, u16 param1); #endif // POKEPLATINUM_OV104_0222FBE4_H diff --git a/include/overlay104/ov104_02231F74.h b/include/overlay104/ov104_02231F74.h index 593bbab144..d45cd6e3c8 100644 --- a/include/overlay104/ov104_02231F74.h +++ b/include/overlay104/ov104_02231F74.h @@ -1,11 +1,8 @@ #ifndef POKEPLATINUM_OV104_02231F74_H #define POKEPLATINUM_OV104_02231F74_H -#include "message.h" -#include "string_template.h" #include "struct_decls/cell_actor_data.h" -#include "sys_task_manager.h" -#include "pokemon.h" + #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CCB8.h" #include "overlay104/struct_ov104_0222E930_decl.h" @@ -14,33 +11,38 @@ #include "overlay104/struct_ov104_02232B5C_decl.h" #include "overlay104/struct_ov104_0223C4CC_decl.h" -void ov104_02231F74(UnkStruct_ov104_022320B4 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov104_0222FEDC * param4); -void ov104_02232088(UnkStruct_ov104_022320B4 * param0); -void ov104_022320B4(UnkStruct_ov104_022320B4 * param0, u8 param1, u16 param2, u16 param3, u16 param4, s16 param5, u8 param6); -UnkStruct_ov104_02232B5C * ov104_02232258(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, MessageLoader * param7); -void ov104_022322A8(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); -void ov104_022322B0(UnkStruct_ov104_02232B5C * param0); -UnkStruct_ov104_02232B5C * ov104_022325FC(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, MessageLoader * param7); -void ov104_0223261C(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); -void ov104_02232624(UnkStruct_ov104_02232B5C * param0); -void ov104_02232B5C(UnkStruct_ov104_02232B5C * param0); -void ov104_02232B78(SysTask * param0, void * param1); -void ov104_02232C80(UnkStruct_ov63_0222CCB8 * param0, UnkStruct_ov63_0222BEC0 * param1, int param2, int param3); -void ov104_02232CE0(UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9); -void ov104_02232E80(UnkStruct_ov104_0223C4CC * param0, int param1); -void ov104_02232EC0(UnkStruct_ov104_0223C4CC * param0); -void ov104_02232F28(UnkStruct_ov104_0223C4CC * param0); -CellActorData * ov104_02232F4C(UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int param2, int param3, int param4); -void ov104_02232FD4(UnkStruct_ov104_0223C4CC * param0, CellActorData * param1, int param2); -void ov104_02232FEC(UnkStruct_ov104_0223C4CC * param0); -void ov104_0223307C(UnkStruct_ov104_0223C4CC * param0); -CellActorData * ov104_022330AC(UnkStruct_ov104_0223C4CC * param0, int param1, int param2); -void ov104_022330F0(UnkStruct_ov104_0223C4CC * param0, CellActorData * param1); -void ov104_022330FC(UnkStruct_ov104_0222E930 * param0, u16 * param1); -void ov104_0223310C(UnkStruct_ov104_0222E930 * param0, u16 * param1, u32 param2); -void ov104_0223319C(SysTask * param0, void * param1); -void ov104_022331E8(SysTask * param0, void * param1); -void ov104_0223327C(UnkStruct_ov104_02232B5C * param0, int param1); -void ov104_02233298(UnkStruct_ov104_02232B5C * param0, int param1); +#include "message.h" +#include "pokemon.h" +#include "string_template.h" +#include "sys_task_manager.h" + +void ov104_02231F74(UnkStruct_ov104_022320B4 *param0, const MessageLoader *param1, u16 param2, u8 param3, UnkStruct_ov104_0222FEDC *param4); +void ov104_02232088(UnkStruct_ov104_022320B4 *param0); +void ov104_022320B4(UnkStruct_ov104_022320B4 *param0, u8 param1, u16 param2, u16 param3, u16 param4, s16 param5, u8 param6); +UnkStruct_ov104_02232B5C *ov104_02232258(UnkStruct_ov104_022320B4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, MessageLoader *param7); +void ov104_022322A8(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 param2, u32 param3); +void ov104_022322B0(UnkStruct_ov104_02232B5C *param0); +UnkStruct_ov104_02232B5C *ov104_022325FC(UnkStruct_ov104_022320B4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, MessageLoader *param7); +void ov104_0223261C(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 param2, u32 param3); +void ov104_02232624(UnkStruct_ov104_02232B5C *param0); +void ov104_02232B5C(UnkStruct_ov104_02232B5C *param0); +void ov104_02232B78(SysTask *param0, void *param1); +void ov104_02232C80(UnkStruct_ov63_0222CCB8 *param0, UnkStruct_ov63_0222BEC0 *param1, int param2, int param3); +void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9); +void ov104_02232E80(UnkStruct_ov104_0223C4CC *param0, int param1); +void ov104_02232EC0(UnkStruct_ov104_0223C4CC *param0); +void ov104_02232F28(UnkStruct_ov104_0223C4CC *param0); +CellActorData *ov104_02232F4C(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param2, int param3, int param4); +void ov104_02232FD4(UnkStruct_ov104_0223C4CC *param0, CellActorData *param1, int param2); +void ov104_02232FEC(UnkStruct_ov104_0223C4CC *param0); +void ov104_0223307C(UnkStruct_ov104_0223C4CC *param0); +CellActorData *ov104_022330AC(UnkStruct_ov104_0223C4CC *param0, int param1, int param2); +void ov104_022330F0(UnkStruct_ov104_0223C4CC *param0, CellActorData *param1); +void ov104_022330FC(UnkStruct_ov104_0222E930 *param0, u16 *param1); +void ov104_0223310C(UnkStruct_ov104_0222E930 *param0, u16 *param1, u32 param2); +void ov104_0223319C(SysTask *param0, void *param1); +void ov104_022331E8(SysTask *param0, void *param1); +void ov104_0223327C(UnkStruct_ov104_02232B5C *param0, int param1); +void ov104_02233298(UnkStruct_ov104_02232B5C *param0, int param1); #endif // POKEPLATINUM_OV104_02231F74_H diff --git a/include/overlay104/ov104_022332B4.h b/include/overlay104/ov104_022332B4.h index 5a241b43df..313d7f6ac9 100644 --- a/include/overlay104/ov104_022332B4.h +++ b/include/overlay104/ov104_022332B4.h @@ -3,21 +3,21 @@ #include "overlay104/struct_ov104_0222E930_decl.h" -BOOL ov104_022332B4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022332F4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02233310(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02233324(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223338C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022333B4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022333F8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223348C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022334A0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022334B4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022334C8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022334DC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022338E0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022338FC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223392C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223397C(UnkStruct_ov104_0222E930 * param0); +BOOL ov104_022332B4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022332F4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02233310(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02233324(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223338C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022333B4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022333F8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223348C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022334A0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022334B4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022334C8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022334DC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022338E0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022338FC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223392C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223397C(UnkStruct_ov104_0222E930 *param0); #endif // POKEPLATINUM_OV104_022332B4_H diff --git a/include/overlay104/ov104_022339B4.h b/include/overlay104/ov104_022339B4.h index 608f5238dc..c162a541db 100644 --- a/include/overlay104/ov104_022339B4.h +++ b/include/overlay104/ov104_022339B4.h @@ -1,26 +1,27 @@ #ifndef POKEPLATINUM_OV104_022339B4_H #define POKEPLATINUM_OV104_022339B4_H -#include "savedata.h" #include "overlay104/struct_ov104_0223ADA0.h" -UnkStruct_ov104_0223ADA0 * ov104_022339B4(SaveData * param0, u16 param1, u8 param2, u8 param3); -void ov104_02233B98(UnkStruct_ov104_0223ADA0 * param0, u16 param1); -void ov104_022340D0(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0223410C(UnkStruct_ov104_0223ADA0 * param0, void * param1); -u16 ov104_02234130(void * param0, u8 param1); -void ov104_02234148(UnkStruct_ov104_0223ADA0 * param0, u8 param1); -u16 ov104_02234430(UnkStruct_ov104_0223ADA0 * param0); -u16 ov104_0223443C(UnkStruct_ov104_0223ADA0 * param0); -u16 ov104_02234440(UnkStruct_ov104_0223ADA0 * param0, u8 param1); -void ov104_02234474(UnkStruct_ov104_0223ADA0 * param0); -void ov104_02234480(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0223449C(UnkStruct_ov104_0223ADA0 * param0); -void ov104_02234570(UnkStruct_ov104_0223ADA0 * param0); -void ov104_022346A4(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0223470C(UnkStruct_ov104_0223ADA0 * param0); -void ov104_02234790(UnkStruct_ov104_0223ADA0 * param0); -BOOL ov104_022347A4(UnkStruct_ov104_0223ADA0 * param0, u16 param1, u16 param2); -u16 ov104_022347F8(UnkStruct_ov104_0223ADA0 * param0); +#include "savedata.h" + +UnkStruct_ov104_0223ADA0 *ov104_022339B4(SaveData *param0, u16 param1, u8 param2, u8 param3); +void ov104_02233B98(UnkStruct_ov104_0223ADA0 *param0, u16 param1); +void ov104_022340D0(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0223410C(UnkStruct_ov104_0223ADA0 *param0, void *param1); +u16 ov104_02234130(void *param0, u8 param1); +void ov104_02234148(UnkStruct_ov104_0223ADA0 *param0, u8 param1); +u16 ov104_02234430(UnkStruct_ov104_0223ADA0 *param0); +u16 ov104_0223443C(UnkStruct_ov104_0223ADA0 *param0); +u16 ov104_02234440(UnkStruct_ov104_0223ADA0 *param0, u8 param1); +void ov104_02234474(UnkStruct_ov104_0223ADA0 *param0); +void ov104_02234480(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0223449C(UnkStruct_ov104_0223ADA0 *param0); +void ov104_02234570(UnkStruct_ov104_0223ADA0 *param0); +void ov104_022346A4(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0223470C(UnkStruct_ov104_0223ADA0 *param0); +void ov104_02234790(UnkStruct_ov104_0223ADA0 *param0); +BOOL ov104_022347A4(UnkStruct_ov104_0223ADA0 *param0, u16 param1, u16 param2); +u16 ov104_022347F8(UnkStruct_ov104_0223ADA0 *param0); #endif // POKEPLATINUM_OV104_022339B4_H diff --git a/include/overlay104/ov104_02234838.h b/include/overlay104/ov104_02234838.h index b4871e04cc..b4f626c9fb 100644 --- a/include/overlay104/ov104_02234838.h +++ b/include/overlay104/ov104_02234838.h @@ -3,18 +3,18 @@ #include "overlay104/struct_ov104_0222E930_decl.h" -BOOL ov104_02234838(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223488C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022348A8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022348BC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234994(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022349B8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234A1C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234C80(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234C9C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234CCC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234D18(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234D50(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234D6C(UnkStruct_ov104_0222E930 * param0); +BOOL ov104_02234838(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223488C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022348A8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022348BC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234994(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022349B8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234A1C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234C80(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234C9C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234CCC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234D18(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234D50(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234D6C(UnkStruct_ov104_0222E930 *param0); #endif // POKEPLATINUM_OV104_02234838_H diff --git a/include/overlay104/ov104_02234DB4.h b/include/overlay104/ov104_02234DB4.h index eacd24f096..b63f356e88 100644 --- a/include/overlay104/ov104_02234DB4.h +++ b/include/overlay104/ov104_02234DB4.h @@ -1,24 +1,25 @@ #ifndef POKEPLATINUM_OV104_02234DB4_H #define POKEPLATINUM_OV104_02234DB4_H -#include "savedata.h" #include "overlay104/struct_ov104_0223B5C0.h" -UnkStruct_ov104_0223B5C0 * ov104_02234DB4(SaveData * param0, u16 param1, u8 param2, u8 param3, u8 param4); -void ov104_022350B0(UnkStruct_ov104_0223B5C0 * param0, u16 param1); -void ov104_02235190(UnkStruct_ov104_0223B5C0 * param0); -void ov104_022351CC(UnkStruct_ov104_0223B5C0 * param0, void * param1); -u16 ov104_02235208(void * param0, u8 param1); -void ov104_0223520C(UnkStruct_ov104_0223B5C0 * param0, u16 * param1); -void ov104_0223526C(UnkStruct_ov104_0223B5C0 * param0, u8 param1); -u16 ov104_022354B0(UnkStruct_ov104_0223B5C0 * param0); -u16 ov104_022354BC(UnkStruct_ov104_0223B5C0 * param0); -u16 ov104_022354C0(UnkStruct_ov104_0223B5C0 * param0, u8 param1); -void ov104_022354F4(UnkStruct_ov104_0223B5C0 * param0); -void ov104_02235518(UnkStruct_ov104_0223B5C0 * param0); -BOOL ov104_02235534(UnkStruct_ov104_0223B5C0 * param0, u16 param1, u16 param2); -u16 ov104_02235578(UnkStruct_ov104_0223B5C0 * param0); -void ov104_022356A0(UnkStruct_ov104_0223B5C0 * param0); -void ov104_022356F4(UnkStruct_ov104_0223B5C0 * param0); +#include "savedata.h" + +UnkStruct_ov104_0223B5C0 *ov104_02234DB4(SaveData *param0, u16 param1, u8 param2, u8 param3, u8 param4); +void ov104_022350B0(UnkStruct_ov104_0223B5C0 *param0, u16 param1); +void ov104_02235190(UnkStruct_ov104_0223B5C0 *param0); +void ov104_022351CC(UnkStruct_ov104_0223B5C0 *param0, void *param1); +u16 ov104_02235208(void *param0, u8 param1); +void ov104_0223520C(UnkStruct_ov104_0223B5C0 *param0, u16 *param1); +void ov104_0223526C(UnkStruct_ov104_0223B5C0 *param0, u8 param1); +u16 ov104_022354B0(UnkStruct_ov104_0223B5C0 *param0); +u16 ov104_022354BC(UnkStruct_ov104_0223B5C0 *param0); +u16 ov104_022354C0(UnkStruct_ov104_0223B5C0 *param0, u8 param1); +void ov104_022354F4(UnkStruct_ov104_0223B5C0 *param0); +void ov104_02235518(UnkStruct_ov104_0223B5C0 *param0); +BOOL ov104_02235534(UnkStruct_ov104_0223B5C0 *param0, u16 param1, u16 param2); +u16 ov104_02235578(UnkStruct_ov104_0223B5C0 *param0); +void ov104_022356A0(UnkStruct_ov104_0223B5C0 *param0); +void ov104_022356F4(UnkStruct_ov104_0223B5C0 *param0); #endif // POKEPLATINUM_OV104_02234DB4_H diff --git a/include/overlay104/ov104_022358E8.h b/include/overlay104/ov104_022358E8.h index 02da25e169..38ea817602 100644 --- a/include/overlay104/ov104_022358E8.h +++ b/include/overlay104/ov104_022358E8.h @@ -3,27 +3,27 @@ #include "overlay104/struct_ov104_0222E930_decl.h" -BOOL ov104_022358E8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223594C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235968(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223597C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022359D0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235A24(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235AAC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235AE8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235B98(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235BAC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235F9C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235FB8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235FE8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02236038(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02236090(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022360A8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022360C0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022360D8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02236120(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02236150(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223617C(UnkStruct_ov104_0222E930 * param0); +BOOL ov104_022358E8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223594C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235968(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223597C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022359D0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235A24(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235AAC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235AE8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235B98(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235BAC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235F9C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235FB8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235FE8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02236038(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02236090(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022360A8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022360C0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022360D8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02236120(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02236150(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223617C(UnkStruct_ov104_0222E930 *param0); #endif // POKEPLATINUM_OV104_022358E8_H diff --git a/include/overlay104/ov104_022361B4.h b/include/overlay104/ov104_022361B4.h index 6befc8879f..82b4f2b04d 100644 --- a/include/overlay104/ov104_022361B4.h +++ b/include/overlay104/ov104_022361B4.h @@ -1,30 +1,31 @@ #ifndef POKEPLATINUM_OV104_022361B4_H #define POKEPLATINUM_OV104_022361B4_H -#include "savedata.h" #include "overlay104/struct_ov104_022320B4_decl.h" #include "overlay104/struct_ov104_0223BA10.h" -UnkStruct_ov104_0223BA10 * ov104_022361B4(SaveData * param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 * param6); -void ov104_02236514(UnkStruct_ov104_0223BA10 * param0, u16 param1); -void ov104_022367AC(UnkStruct_ov104_0223BA10 * param0); -void ov104_022367DC(UnkStruct_ov104_0223BA10 * param0, void * param1); -u16 ov104_02236834(void * param0, u8 param1); -void ov104_02236848(UnkStruct_ov104_0223BA10 * param0, u8 param1); -u16 ov104_02236B48(UnkStruct_ov104_0223BA10 * param0); -u16 ov104_02236B54(UnkStruct_ov104_0223BA10 * param0); -u16 ov104_02236B58(UnkStruct_ov104_0223BA10 * param0, u8 param1); -void ov104_02236B8C(UnkStruct_ov104_0223BA10 * param0); -void ov104_02236BD0(UnkStruct_ov104_0223BA10 * param0); -void ov104_02236BF0(UnkStruct_ov104_0223BA10 * param0); -void ov104_02236BF8(UnkStruct_ov104_0223BA10 * param0); -void ov104_02236C50(UnkStruct_ov104_0223BA10 * param0); -int ov104_02236D10(UnkStruct_ov104_0223BA10 * param0); -void ov104_02236ED8(SaveData * param0, u8 param1, int param2); -BOOL ov104_02236F70(UnkStruct_ov104_0223BA10 * param0, u16 param1, u16 param2); -void ov104_02236FC0(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 * param1); -void ov104_022370E0(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 * param1); -void ov104_02237180(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 * param1); -u16 ov104_02237338(UnkStruct_ov104_0223BA10 * param0); +#include "savedata.h" + +UnkStruct_ov104_0223BA10 *ov104_022361B4(SaveData *param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 *param6); +void ov104_02236514(UnkStruct_ov104_0223BA10 *param0, u16 param1); +void ov104_022367AC(UnkStruct_ov104_0223BA10 *param0); +void ov104_022367DC(UnkStruct_ov104_0223BA10 *param0, void *param1); +u16 ov104_02236834(void *param0, u8 param1); +void ov104_02236848(UnkStruct_ov104_0223BA10 *param0, u8 param1); +u16 ov104_02236B48(UnkStruct_ov104_0223BA10 *param0); +u16 ov104_02236B54(UnkStruct_ov104_0223BA10 *param0); +u16 ov104_02236B58(UnkStruct_ov104_0223BA10 *param0, u8 param1); +void ov104_02236B8C(UnkStruct_ov104_0223BA10 *param0); +void ov104_02236BD0(UnkStruct_ov104_0223BA10 *param0); +void ov104_02236BF0(UnkStruct_ov104_0223BA10 *param0); +void ov104_02236BF8(UnkStruct_ov104_0223BA10 *param0); +void ov104_02236C50(UnkStruct_ov104_0223BA10 *param0); +int ov104_02236D10(UnkStruct_ov104_0223BA10 *param0); +void ov104_02236ED8(SaveData *param0, u8 param1, int param2); +BOOL ov104_02236F70(UnkStruct_ov104_0223BA10 *param0, u16 param1, u16 param2); +void ov104_02236FC0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1); +void ov104_022370E0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1); +void ov104_02237180(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1); +u16 ov104_02237338(UnkStruct_ov104_0223BA10 *param0); #endif // POKEPLATINUM_OV104_022361B4_H diff --git a/include/overlay104/ov104_02237378.h b/include/overlay104/ov104_02237378.h index 83da8cbab3..c91d686fb6 100644 --- a/include/overlay104/ov104_02237378.h +++ b/include/overlay104/ov104_02237378.h @@ -3,20 +3,20 @@ #include "overlay104/struct_ov104_0222E930_decl.h" -BOOL ov104_02237378(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022373DC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022373F8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223740C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237460(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022375F8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237720(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237734(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237748(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237CAC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237CC8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237CF8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237D48(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237D84(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237D98(UnkStruct_ov104_0222E930 * param0); +BOOL ov104_02237378(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022373DC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022373F8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223740C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237460(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022375F8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237720(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237734(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237748(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237CAC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237CC8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237CF8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237D48(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237D84(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237D98(UnkStruct_ov104_0222E930 *param0); #endif // POKEPLATINUM_OV104_02237378_H diff --git a/include/overlay104/ov104_02237DD8.h b/include/overlay104/ov104_02237DD8.h index e96728abd9..a8ec3fe0b9 100644 --- a/include/overlay104/ov104_02237DD8.h +++ b/include/overlay104/ov104_02237DD8.h @@ -2,38 +2,40 @@ #define POKEPLATINUM_OV104_02237DD8_H #include "struct_decls/struct_party_decl.h" -#include "savedata.h" + #include "overlay104/struct_ov104_0223BFFC.h" #include "overlay104/struct_ov104_0223C4CC_decl.h" -UnkStruct_ov104_0223BFFC * ov104_02237DD8(SaveData * param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 * param6); -void ov104_0223806C(UnkStruct_ov104_0223BFFC * param0, u16 param1); -void ov104_02238210(UnkStruct_ov104_0223BFFC * param0); -void ov104_02238240(UnkStruct_ov104_0223BFFC * param0, void * param1); -u16 ov104_02238264(void * param0, u8 param1); -void ov104_02238278(UnkStruct_ov104_0223BFFC * param0, u8 param1); -u16 ov104_02238454(UnkStruct_ov104_0223BFFC * param0); -u16 ov104_02238460(UnkStruct_ov104_0223BFFC * param0); -u16 ov104_02238464(UnkStruct_ov104_0223BFFC * param0, u8 param1); -u16 ov104_02238498(UnkStruct_ov104_0223BFFC * param0, u8 param1); -void ov104_022384A8(UnkStruct_ov104_0223BFFC * param0); -void ov104_022384B4(UnkStruct_ov104_0223BFFC * param0); -void ov104_022384D4(UnkStruct_ov104_0223BFFC * param0); -void ov104_022384DC(UnkStruct_ov104_0223BFFC * param0); -int ov104_02238538(UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * param2, int param3); -void ov104_02238658(void * param0, UnkStruct_ov104_0223C4CC * param1); -void ov104_02238728(void * param0, UnkStruct_ov104_0223C4CC * param1); -void ov104_02238764(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2); -void ov104_02238814(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2); -void ov104_0223886C(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2, u16 param3); -void ov104_022388A4(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2, u16 param3); -void ov104_022388DC(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2); -void ov104_022389A0(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2); -void ov104_022389F4(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2, u16 param3, u16 param4); +#include "savedata.h" + +UnkStruct_ov104_0223BFFC *ov104_02237DD8(SaveData *param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 *param6); +void ov104_0223806C(UnkStruct_ov104_0223BFFC *param0, u16 param1); +void ov104_02238210(UnkStruct_ov104_0223BFFC *param0); +void ov104_02238240(UnkStruct_ov104_0223BFFC *param0, void *param1); +u16 ov104_02238264(void *param0, u8 param1); +void ov104_02238278(UnkStruct_ov104_0223BFFC *param0, u8 param1); +u16 ov104_02238454(UnkStruct_ov104_0223BFFC *param0); +u16 ov104_02238460(UnkStruct_ov104_0223BFFC *param0); +u16 ov104_02238464(UnkStruct_ov104_0223BFFC *param0, u8 param1); +u16 ov104_02238498(UnkStruct_ov104_0223BFFC *param0, u8 param1); +void ov104_022384A8(UnkStruct_ov104_0223BFFC *param0); +void ov104_022384B4(UnkStruct_ov104_0223BFFC *param0); +void ov104_022384D4(UnkStruct_ov104_0223BFFC *param0); +void ov104_022384DC(UnkStruct_ov104_0223BFFC *param0); +int ov104_02238538(UnkStruct_ov104_0223BFFC *param0, Party *param1, Party *param2, int param3); +void ov104_02238658(void *param0, UnkStruct_ov104_0223C4CC *param1); +void ov104_02238728(void *param0, UnkStruct_ov104_0223C4CC *param1); +void ov104_02238764(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2); +void ov104_02238814(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2); +void ov104_0223886C(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2, u16 param3); +void ov104_022388A4(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2, u16 param3); +void ov104_022388DC(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2); +void ov104_022389A0(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2); +void ov104_022389F4(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2, u16 param3, u16 param4); void ov104_02238AB4(u8 param0, u8 param1); -BOOL ov104_02238B40(UnkStruct_ov104_0223BFFC * param0, u16 param1, u16 param2); -void ov104_02238B88(UnkStruct_ov104_0223BFFC * param0, u8 param1); -u16 ov104_02239014(UnkStruct_ov104_0223BFFC * param0); -void ov104_02239054(Party * param0, Party * param1, int param2, int param3); +BOOL ov104_02238B40(UnkStruct_ov104_0223BFFC *param0, u16 param1, u16 param2); +void ov104_02238B88(UnkStruct_ov104_0223BFFC *param0, u8 param1); +u16 ov104_02239014(UnkStruct_ov104_0223BFFC *param0); +void ov104_02239054(Party *param0, Party *param1, int param2, int param3); #endif // POKEPLATINUM_OV104_02237DD8_H diff --git a/include/overlay104/ov104_02239080.h b/include/overlay104/ov104_02239080.h index eadf18fbf2..ac936959e4 100644 --- a/include/overlay104/ov104_02239080.h +++ b/include/overlay104/ov104_02239080.h @@ -3,12 +3,12 @@ #include "overlay104/struct_ov104_0222E930_decl.h" -BOOL ov104_02239080(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239090(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022390A0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022390D8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022390E8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223910C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223911C(UnkStruct_ov104_0222E930 * param0); +BOOL ov104_02239080(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239090(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022390A0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022390D8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022390E8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223910C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223911C(UnkStruct_ov104_0222E930 *param0); #endif // POKEPLATINUM_OV104_02239080_H diff --git a/include/overlay104/ov104_02239130.h b/include/overlay104/ov104_02239130.h index f89f52b130..80e620a04d 100644 --- a/include/overlay104/ov104_02239130.h +++ b/include/overlay104/ov104_02239130.h @@ -3,12 +3,12 @@ #include "overlay104/struct_ov104_0222E930_decl.h" -BOOL ov104_02239130(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022392C0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239300(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239314(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239364(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223939C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239400(UnkStruct_ov104_0222E930 * param0); +BOOL ov104_02239130(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022392C0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239300(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239314(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239364(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223939C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239400(UnkStruct_ov104_0222E930 *param0); #endif // POKEPLATINUM_OV104_02239130_H diff --git a/include/overlay104/ov104_022394A4.h b/include/overlay104/ov104_022394A4.h index 1b667d295a..2337656813 100644 --- a/include/overlay104/ov104_022394A4.h +++ b/include/overlay104/ov104_022394A4.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_OV104_022394A4_H #include "struct_defs/struct_0204AFC4.h" + #include "savedata.h" -void ov104_022394A4(UnkStruct_0204AFC4 * param0, SaveData * param1); -u16 ov104_02239588(UnkStruct_0204AFC4 * param0, u16 param1); -void ov104_022395A0(UnkStruct_0204AFC4 * param0, u16 param1); -u16 ov104_022395B4(UnkStruct_0204AFC4 * param0); -u16 ov104_022395D8(UnkStruct_0204AFC4 * param0); +void ov104_022394A4(UnkStruct_0204AFC4 *param0, SaveData *param1); +u16 ov104_02239588(UnkStruct_0204AFC4 *param0, u16 param1); +void ov104_022395A0(UnkStruct_0204AFC4 *param0, u16 param1); +u16 ov104_022395B4(UnkStruct_0204AFC4 *param0); +u16 ov104_022395D8(UnkStruct_0204AFC4 *param0); #endif // POKEPLATINUM_OV104_022394A4_H diff --git a/include/overlay104/ov104_022395F0.h b/include/overlay104/ov104_022395F0.h index 824b6c5027..b42eed581f 100644 --- a/include/overlay104/ov104_022395F0.h +++ b/include/overlay104/ov104_022395F0.h @@ -3,18 +3,18 @@ #include "overlay104/struct_ov104_0222E930_decl.h" -BOOL ov104_022395F0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239610(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239624(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239660(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022396A4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022396D4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223971C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239794(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022397B0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239B14(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239BF4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239C10(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239C44(UnkStruct_ov104_0222E930 * param0); +BOOL ov104_022395F0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239610(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239624(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239660(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022396A4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022396D4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223971C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239794(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022397B0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239B14(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239BF4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239C10(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239C44(UnkStruct_ov104_0222E930 *param0); #endif // POKEPLATINUM_OV104_022395F0_H diff --git a/include/overlay104/ov104_02239C58.h b/include/overlay104/ov104_02239C58.h index 8123768e2c..5d09d9b423 100644 --- a/include/overlay104/ov104_02239C58.h +++ b/include/overlay104/ov104_02239C58.h @@ -3,11 +3,12 @@ #include "struct_decls/struct_0209B75C_decl.h" #include "struct_defs/struct_0209BBA4.h" + #include "savedata.h" -UnkStruct_0209BBA4 * ov104_02239C58(SaveData * param0); -void ov104_02239C7C(UnkStruct_0209BBA4 * param0); -BOOL ov104_02239C88(UnkStruct_0209BBA4 * param0, u16 param1, u16 param2, u16 param3); -void ov104_02239CD0(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, u16 param2); +UnkStruct_0209BBA4 *ov104_02239C58(SaveData *param0); +void ov104_02239C7C(UnkStruct_0209BBA4 *param0); +BOOL ov104_02239C88(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2, u16 param3); +void ov104_02239CD0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, u16 param2); #endif // POKEPLATINUM_OV104_02239C58_H diff --git a/include/overlay104/ov104_0223A0C4.h b/include/overlay104/ov104_0223A0C4.h index 259ef4a8df..a5d8431597 100644 --- a/include/overlay104/ov104_0223A0C4.h +++ b/include/overlay104/ov104_0223A0C4.h @@ -3,16 +3,18 @@ #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204B404.h" -#include "savedata.h" + #include "overlay006/battle_params.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223A348.h" -BOOL ov104_0223A0C4(UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 * param1, u16 param2, int param3, u16 * param4, u16 * param5, UnkStruct_0204B404 * param6, int param7); -void ov104_0223A30C(SaveData * param0, UnkStruct_ov104_0223A348 * param1, const u8 param2); -BattleParams * ov104_0223A580(UnkStruct_0204AFC4 * param0, UnkStruct_ov104_02230BE4 * param1); -void ov104_0223A734(UnkStruct_0204AFC4 * param0, u16 param1); -u16 ov104_0223A750(UnkStruct_0204AFC4 * param0, const u16 * param1); +#include "savedata.h" + +BOOL ov104_0223A0C4(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348 *param1, u16 param2, int param3, u16 *param4, u16 *param5, UnkStruct_0204B404 *param6, int param7); +void ov104_0223A30C(SaveData *param0, UnkStruct_ov104_0223A348 *param1, const u8 param2); +BattleParams *ov104_0223A580(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_02230BE4 *param1); +void ov104_0223A734(UnkStruct_0204AFC4 *param0, u16 param1); +u16 ov104_0223A750(UnkStruct_0204AFC4 *param0, const u16 *param1); int ov104_0223A790(u8 param0); #endif // POKEPLATINUM_OV104_0223A0C4_H diff --git a/include/overlay104/ov104_0223A7F4.h b/include/overlay104/ov104_0223A7F4.h index 53bd732c71..b0b1b62c27 100644 --- a/include/overlay104/ov104_0223A7F4.h +++ b/include/overlay104/ov104_0223A7F4.h @@ -8,17 +8,17 @@ #include "overlay104/struct_ov104_0224028C.h" void ov104_0223A860(u8 param0, int param1, u16 param2[], u8 param3); -const UnkStruct_ov104_0224028C * ov104_0223A8A8(int param0, int param1); -BOOL ov104_0223A918(const u16 param0[], const u16 param1[], int param2, int param3, u16 param4[], int param5, const UnkStruct_ov104_0224028C * param6, u16 param7, u8 param8[]); +const UnkStruct_ov104_0224028C *ov104_0223A8A8(int param0, int param1); +BOOL ov104_0223A918(const u16 param0[], const u16 param1[], int param2, int param3, u16 param4[], int param5, const UnkStruct_ov104_0224028C *param6, u16 param7, u8 param8[]); u8 ov104_0223AA50(u8 param0); u8 ov104_0223AA74(u8 param0, BOOL param1); -void ov104_0223AAA0(u16 param0, u8 param1, u16 * param2, UnkStruct_ov104_0223A348_sub2 * param3, u8 * param4, u32 * param5, u16 param6, u16 * param7, u16 * param8); -void ov104_0223AB0C(u8 param0, u16 param1, u8 param2, UnkStruct_ov104_0223A348_sub2 * param3, u16 * param4, UnkStruct_ov104_0223A348_sub2 * param5, u8 * param6, u32 * param7, int param8); -BattleParams * ov104_0223ABA0(UnkStruct_ov104_0223ADA0 * param0, UnkStruct_ov104_02230BE4 * param1); -u8 ov104_0223ADA0(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0223ADB0(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0223AE30(UnkStruct_ov104_0223ADA0 * param0); +void ov104_0223AAA0(u16 param0, u8 param1, u16 *param2, UnkStruct_ov104_0223A348_sub2 *param3, u8 *param4, u32 *param5, u16 param6, u16 *param7, u16 *param8); +void ov104_0223AB0C(u8 param0, u16 param1, u8 param2, UnkStruct_ov104_0223A348_sub2 *param3, u16 *param4, UnkStruct_ov104_0223A348_sub2 *param5, u8 *param6, u32 *param7, int param8); +BattleParams *ov104_0223ABA0(UnkStruct_ov104_0223ADA0 *param0, UnkStruct_ov104_02230BE4 *param1); +u8 ov104_0223ADA0(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0223ADB0(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0223AE30(UnkStruct_ov104_0223ADA0 *param0); BOOL ov104_0223AED4(u8 param0); -u16 ov104_0223AF34(UnkStruct_ov104_0223ADA0 * param0); +u16 ov104_0223AF34(UnkStruct_ov104_0223ADA0 *param0); #endif // POKEPLATINUM_OV104_0223A7F4_H diff --git a/include/overlay104/ov104_0223AF58.h b/include/overlay104/ov104_0223AF58.h index 09bbdacb0c..71b169ca5d 100644 --- a/include/overlay104/ov104_0223AF58.h +++ b/include/overlay104/ov104_0223AF58.h @@ -8,13 +8,13 @@ void ov104_0223AF58(u8 param0, u8 param1, u8 param2, u8 param3, u16 param4[]); void ov104_0223AFB4(u8 param0, u8 param1, int param2, u8 param3, u8 param4, u16 param5[]); void ov104_0223B0C8(u8 param0, u8 param1, u8 param2, u8 param3, u16 param4, u16 param5[], u8 param6); -BattleParams * ov104_0223B250(UnkStruct_ov104_0223B5C0 * param0, UnkStruct_ov104_02230BE4 * param1); +BattleParams *ov104_0223B250(UnkStruct_ov104_0223B5C0 *param0, UnkStruct_ov104_02230BE4 *param1); u8 ov104_0223B500(u8 param0); u8 ov104_0223B50C(u8 param0); u8 ov104_0223B5A4(u8 param0); BOOL ov104_0223B5B0(u8 param0); -u8 ov104_0223B5C0(UnkStruct_ov104_0223B5C0 * param0); -u16 ov104_0223B64C(UnkStruct_ov104_0223B5C0 * param0); +u8 ov104_0223B5C0(UnkStruct_ov104_0223B5C0 *param0); +u16 ov104_0223B64C(UnkStruct_ov104_0223B5C0 *param0); fx32 ov104_0223B6C4(u32 param0); #endif // POKEPLATINUM_OV104_0223AF58_H diff --git a/include/overlay104/ov104_0223B6F4.h b/include/overlay104/ov104_0223B6F4.h index 5f9e659d56..ad578b1a8a 100644 --- a/include/overlay104/ov104_0223B6F4.h +++ b/include/overlay104/ov104_0223B6F4.h @@ -3,25 +3,27 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0203068C_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" + #include "overlay006/battle_params.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223BA10.h" +#include "pokemon.h" + void ov104_0223B760(u8 param0, int param1, u16 param2[], u8 param3); u8 ov104_0223B7A8(u8 param0, BOOL param1); u8 ov104_0223B7DC(u8 param0, BOOL param1); -BattleParams * ov104_0223B810(UnkStruct_ov104_0223BA10 * param0, UnkStruct_ov104_02230BE4 * param1); -u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 * param0); +BattleParams *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104_02230BE4 *param1); +u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 *param0); BOOL ov104_0223BA14(u8 param0); -void ov104_0223BA24(Party * param0); -void ov104_0223BA7C(UnkStruct_ov104_0223BA10 * param0, Pokemon * param1); -void ov104_0223BAA0(UnkStruct_ov104_0223BA10 * param0, Party * param1, Pokemon * param2); -void ov104_0223BAB8(UnkStruct_ov104_0223BA10 * param0); -u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 * param0); -void ov104_0223BB84(BGL * param0, UnkStruct_ov104_0223BA10 * param1, u32 param2); +void ov104_0223BA24(Party *param0); +void ov104_0223BA7C(UnkStruct_ov104_0223BA10 *param0, Pokemon *param1); +void ov104_0223BAA0(UnkStruct_ov104_0223BA10 *param0, Party *param1, Pokemon *param2); +void ov104_0223BAB8(UnkStruct_ov104_0223BA10 *param0); +u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 *param0); +void ov104_0223BB84(BGL *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2); u16 ov104_0223BC24(u16 param0); -void ov104_0223BC2C(UnkStruct_0203068C * param0, u8 param1, int param2); +void ov104_0223BC2C(UnkStruct_0203068C *param0, u8 param1, int param2); #endif // POKEPLATINUM_OV104_0223B6F4_H diff --git a/include/overlay104/ov104_0223BCBC.h b/include/overlay104/ov104_0223BCBC.h index 759c8beb34..1ec4b85779 100644 --- a/include/overlay104/ov104_0223BCBC.h +++ b/include/overlay104/ov104_0223BCBC.h @@ -1,23 +1,25 @@ #ifndef POKEPLATINUM_OV104_0223BCBC_H #define POKEPLATINUM_OV104_0223BCBC_H -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" + #include "overlay006/battle_params.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223BFFC.h" +#include "pokemon.h" + void ov104_0223BD28(u8 param0, int param1, u16 param2[], u8 param3); u8 ov104_0223BD70(u8 param0, BOOL param1); u8 ov104_0223BDA4(u8 param0, BOOL param1); -BattleParams * ov104_0223BDD8(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_02230BE4 * param1); -u8 ov104_0223BFFC(UnkStruct_ov104_0223BFFC * param0); +BattleParams *ov104_0223BDD8(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_02230BE4 *param1); +u8 ov104_0223BFFC(UnkStruct_ov104_0223BFFC *param0); BOOL ov104_0223C000(u8 param0); -void ov104_0223C010(UnkStruct_ov104_0223BFFC * param0, Pokemon * param1); -void ov104_0223C034(UnkStruct_ov104_0223BFFC * param0, Party * param1, Pokemon * param2); -void ov104_0223C04C(UnkStruct_ov104_0223BFFC * param0); -u16 ov104_0223C0BC(UnkStruct_ov104_0223BFFC * param0, u8 param1); -u16 ov104_0223C124(UnkStruct_ov104_0223BFFC * param0); +void ov104_0223C010(UnkStruct_ov104_0223BFFC *param0, Pokemon *param1); +void ov104_0223C034(UnkStruct_ov104_0223BFFC *param0, Party *param1, Pokemon *param2); +void ov104_0223C04C(UnkStruct_ov104_0223BFFC *param0); +u16 ov104_0223C0BC(UnkStruct_ov104_0223BFFC *param0, u8 param1); +u16 ov104_0223C124(UnkStruct_ov104_0223BFFC *param0); u8 ov104_0223C148(u8 param0); #endif // POKEPLATINUM_OV104_0223BCBC_H diff --git a/include/overlay104/ov104_0223C164.h b/include/overlay104/ov104_0223C164.h index 718340e8a5..97d7630500 100644 --- a/include/overlay104/ov104_0223C164.h +++ b/include/overlay104/ov104_0223C164.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV104_0223C164_H #include "struct_decls/struct_02018340_decl.h" + #include "overlay104/struct_ov104_0223C23C_decl.h" -UnkStruct_ov104_0223C23C * ov104_0223C164(BGL * param0); -void ov104_0223C23C(UnkStruct_ov104_0223C23C * param0); +UnkStruct_ov104_0223C23C *ov104_0223C164(BGL *param0); +void ov104_0223C23C(UnkStruct_ov104_0223C23C *param0); u16 ov104_0223C264(u8 param0); u16 ov104_0223C29C(u8 param0); diff --git a/include/overlay104/ov104_0223C2D4.h b/include/overlay104/ov104_0223C2D4.h index 91cb51f5b7..7691933209 100644 --- a/include/overlay104/ov104_0223C2D4.h +++ b/include/overlay104/ov104_0223C2D4.h @@ -3,6 +3,7 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_0209B75C_decl.h" + #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CE44.h" #include "overlay104/struct_ov104_0223C4CC_decl.h" @@ -10,23 +11,23 @@ #include "overlay104/struct_ov104_0223C688.h" #include "overlay104/struct_ov104_0223D570.h" -UnkStruct_ov104_0223C4CC * ov104_0223C2D4(UnkStruct_0209B75C * param0); -void ov104_0223C4CC(UnkStruct_ov104_0223C4CC * param0); -void ov104_0223C634(UnkStruct_ov104_0223C4CC * param0); -void ov104_0223C688(UnkStruct_ov104_0223C4CC * param0); -void ov104_0223D0EC(UnkStruct_ov104_0223C4CC * param0, const UnkStruct_ov104_0223C688 * param1); -void ov104_0223D148(UnkStruct_ov104_0223C4CC * param0, int param1); -UnkStruct_ov63_0222BEC0 * ov104_0223D180(UnkStruct_ov104_0223C4CC * param0, const UnkStruct_ov104_0223D570 * param1, int param2); -void ov104_0223D200(UnkStruct_ov104_0223C4CC * param0, UnkStruct_ov63_0222BEC0 * param1); -void ov104_0223D258(UnkStruct_ov104_0223C4CC * param0, u16 param1, UnkStruct_ov63_0222BEC0 ** param2, UnkStruct_ov63_0222CE44 ** param3); -void ov104_0223D29C(UnkStruct_ov104_0223C4CC * param0, u16 param1); -void ov104_0223D2CC(UnkStruct_ov104_0223C4CC * param0, u16 param1); -CellActorData * ov104_0223D2FC(UnkStruct_ov104_0223C4CC * param0, u16 param1, u16 param2); -void ov104_0223D348(UnkStruct_ov104_0223C4CC * param0, u16 param1); -CellActorData * ov104_0223D370(UnkStruct_ov104_0223C4CC * param0, u16 param1); -void ov104_0223D378(UnkStruct_ov104_0223C4CC * param0, u16 param1, int param2); -u32 ov104_0223D3A4(UnkStruct_ov104_0223C4CC * param0, u16 param1); -void ov104_0223D554(UnkStruct_ov104_0223C4CC * param0, s16 * param1, s16 * param2); -UnkStruct_ov104_0223C634 * ov104_0223D5A8(UnkStruct_0209B75C * param0, int param1); +UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0); +void ov104_0223C4CC(UnkStruct_ov104_0223C4CC *param0); +void ov104_0223C634(UnkStruct_ov104_0223C4CC *param0); +void ov104_0223C688(UnkStruct_ov104_0223C4CC *param0); +void ov104_0223D0EC(UnkStruct_ov104_0223C4CC *param0, const UnkStruct_ov104_0223C688 *param1); +void ov104_0223D148(UnkStruct_ov104_0223C4CC *param0, int param1); +UnkStruct_ov63_0222BEC0 *ov104_0223D180(UnkStruct_ov104_0223C4CC *param0, const UnkStruct_ov104_0223D570 *param1, int param2); +void ov104_0223D200(UnkStruct_ov104_0223C4CC *param0, UnkStruct_ov63_0222BEC0 *param1); +void ov104_0223D258(UnkStruct_ov104_0223C4CC *param0, u16 param1, UnkStruct_ov63_0222BEC0 **param2, UnkStruct_ov63_0222CE44 **param3); +void ov104_0223D29C(UnkStruct_ov104_0223C4CC *param0, u16 param1); +void ov104_0223D2CC(UnkStruct_ov104_0223C4CC *param0, u16 param1); +CellActorData *ov104_0223D2FC(UnkStruct_ov104_0223C4CC *param0, u16 param1, u16 param2); +void ov104_0223D348(UnkStruct_ov104_0223C4CC *param0, u16 param1); +CellActorData *ov104_0223D370(UnkStruct_ov104_0223C4CC *param0, u16 param1); +void ov104_0223D378(UnkStruct_ov104_0223C4CC *param0, u16 param1, int param2); +u32 ov104_0223D3A4(UnkStruct_ov104_0223C4CC *param0, u16 param1); +void ov104_0223D554(UnkStruct_ov104_0223C4CC *param0, s16 *param1, s16 *param2); +UnkStruct_ov104_0223C634 *ov104_0223D5A8(UnkStruct_0209B75C *param0, int param1); #endif // POKEPLATINUM_OV104_0223C2D4_H diff --git a/include/overlay104/ov104_0223D5D0.h b/include/overlay104/ov104_0223D5D0.h index 17c1c39b91..9f8f281f75 100644 --- a/include/overlay104/ov104_0223D5D0.h +++ b/include/overlay104/ov104_0223D5D0.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_OV104_0223D5D0_H #include "struct_decls/struct_02014014_decl.h" + #include "overlay104/struct_ov104_0223D5F0_decl.h" -UnkStruct_ov104_0223D5F0 * ov104_0223D5D0(int param0); -void ov104_0223D5F0(UnkStruct_ov104_0223D5F0 * param0); -UnkStruct_02014014 * ov104_0223D614(UnkStruct_ov104_0223D5F0 * param0, int param1, int param2, int param3); -void ov104_0223D68C(UnkStruct_ov104_0223D5F0 * param0, int param1); +UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int param0); +void ov104_0223D5F0(UnkStruct_ov104_0223D5F0 *param0); +UnkStruct_02014014 *ov104_0223D614(UnkStruct_ov104_0223D5F0 *param0, int param1, int param2, int param3); +void ov104_0223D68C(UnkStruct_ov104_0223D5F0 *param0, int param1); int ov104_0223D6A8(void); -UnkStruct_02014014 * ov104_0223D6D0(UnkStruct_ov104_0223D5F0 * param0, int param1); -BOOL ov104_0223D6E4(UnkStruct_ov104_0223D5F0 * param0); +UnkStruct_02014014 *ov104_0223D6D0(UnkStruct_ov104_0223D5F0 *param0, int param1); +BOOL ov104_0223D6E4(UnkStruct_ov104_0223D5F0 *param0); #endif // POKEPLATINUM_OV104_0223D5D0_H diff --git a/include/overlay104/ov104_0223D768.h b/include/overlay104/ov104_0223D768.h index 6d46c69d39..5e7ab554bc 100644 --- a/include/overlay104/ov104_0223D768.h +++ b/include/overlay104/ov104_0223D768.h @@ -1,15 +1,15 @@ #ifndef POKEPLATINUM_OV104_0223D768_H #define POKEPLATINUM_OV104_0223D768_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" -void ov104_0223D768(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, PaletteData * param3, u16 param4); -void ov104_0223D7EC(SpriteGfxHandler * param0, u16 param1); -CellActorData * ov104_0223D828(SpriteRenderer * param0, SpriteGfxHandler * param1, u16 param2); -void ov104_0223D858(CellActorData * param0); +void ov104_0223D768(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, PaletteData *param3, u16 param4); +void ov104_0223D7EC(SpriteGfxHandler *param0, u16 param1); +CellActorData *ov104_0223D828(SpriteRenderer *param0, SpriteGfxHandler *param1, u16 param2); +void ov104_0223D858(CellActorData *param0); #endif // POKEPLATINUM_OV104_0223D768_H diff --git a/include/overlay104/ov104_0223D860.h b/include/overlay104/ov104_0223D860.h index 0b88ec30d6..2aad4e931d 100644 --- a/include/overlay104/ov104_0223D860.h +++ b/include/overlay104/ov104_0223D860.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_0209B75C_decl.h" -void ov104_0223D860(UnkStruct_0209B75C * param0, u16 param1, u8 param2, s16 param3[], int param4); -void ov104_0223D8C4(UnkStruct_0209B75C * param0); +void ov104_0223D860(UnkStruct_0209B75C *param0, u16 param1, u8 param2, s16 param3[], int param4); +void ov104_0223D8C4(UnkStruct_0209B75C *param0); #endif // POKEPLATINUM_OV104_0223D860_H diff --git a/include/overlay104/ov104_0223D9E4.h b/include/overlay104/ov104_0223D9E4.h index ab5ce3e050..168120cbe2 100644 --- a/include/overlay104/ov104_0223D9E4.h +++ b/include/overlay104/ov104_0223D9E4.h @@ -3,9 +3,10 @@ #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02018340_decl.h" + #include "overlay104/struct_ov104_0223DA28_decl.h" -UnkStruct_ov104_0223DA28 * ov104_0223D9E4(BGL * param0, PaletteData * param1); -void ov104_0223DA28(UnkStruct_ov104_0223DA28 * param0); +UnkStruct_ov104_0223DA28 *ov104_0223D9E4(BGL *param0, PaletteData *param1); +void ov104_0223DA28(UnkStruct_ov104_0223DA28 *param0); #endif // POKEPLATINUM_OV104_0223D9E4_H diff --git a/include/overlay104/ov104_0223E894.h b/include/overlay104/ov104_0223E894.h index e2381cd887..f96f3c7e03 100644 --- a/include/overlay104/ov104_0223E894.h +++ b/include/overlay104/ov104_0223E894.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_OV104_0223E894_H #include "struct_defs/struct_0205AA50.h" + #include "overlay104/struct_ov104_0223E9EC.h" #include "overlay104/struct_ov104_0223EA38.h" #include "overlay104/struct_ov104_0223EA84_decl.h" @@ -10,25 +11,25 @@ #include "overlay104/struct_ov104_0223F174_decl.h" #include "overlay104/struct_ov104_0223F1B4.h" -void ov104_0223E894(int param0, u32 param1, u32 param2, BOOL * param3, u32 param4); +void ov104_0223E894(int param0, u32 param1, u32 param2, BOOL *param3, u32 param4); void ov104_0223E9CC(int param0, int param1); -void ov104_0223E9EC(UnkStruct_ov104_0223E9EC * param0, int param1, int param2, int param3, int param4); -BOOL ov104_0223E9F8(UnkStruct_ov104_0223E9EC * param0); -void ov104_0223EA28(UnkStruct_ov104_0223EA38 * param0, int param1, int param2, int param3); -BOOL ov104_0223EA38(UnkStruct_ov104_0223EA38 * param0); -UnkStruct_ov104_0223EA84 * ov104_0223EA64(u32 param0); -void ov104_0223EA7C(UnkStruct_ov104_0223EA84 * param0); -void ov104_0223EA84(UnkStruct_ov104_0223EA84 * param0, int param1, int param2, int param3, int param4, int param5, Window * param6, u32 param7, u32 param8, u8 param9); -BOOL ov104_0223EADC(UnkStruct_ov104_0223EA84 * param0); -UnkStruct_ov104_0223EBD0 * ov104_0223EBA0(u32 param0); -void ov104_0223EBD0(UnkStruct_ov104_0223EBD0 * param0); -void ov104_0223EBF0(UnkStruct_ov104_0223EBD0 * param0, u8 param1, u8 param2, Window * param3, u8 param4); -BOOL ov104_0223EC34(UnkStruct_ov104_0223EBD0 * param0); -BOOL ov104_0223EE44(UnkStruct_ov104_0223EBD0 * param0); -void ov104_0223F094(UnkStruct_ov104_0223F094 * param0, u32 param1); -void ov104_0223F0B0(UnkStruct_ov104_0223F094 * param0, u8 param1, u8 param2, u16 param3, fx32 param4, s16 param5, u32 param6, u32 param7, u32 param8); -UnkStruct_ov104_0223F174 * ov104_0223F1B4(u32 param0, UnkStruct_ov104_0223F1B4 * param1, int param2); -void ov104_0223F258(UnkStruct_ov104_0223F174 * param0); -void * ov104_0223F27C(const UnkStruct_ov104_0223F174 * param0); +void ov104_0223E9EC(UnkStruct_ov104_0223E9EC *param0, int param1, int param2, int param3, int param4); +BOOL ov104_0223E9F8(UnkStruct_ov104_0223E9EC *param0); +void ov104_0223EA28(UnkStruct_ov104_0223EA38 *param0, int param1, int param2, int param3); +BOOL ov104_0223EA38(UnkStruct_ov104_0223EA38 *param0); +UnkStruct_ov104_0223EA84 *ov104_0223EA64(u32 param0); +void ov104_0223EA7C(UnkStruct_ov104_0223EA84 *param0); +void ov104_0223EA84(UnkStruct_ov104_0223EA84 *param0, int param1, int param2, int param3, int param4, int param5, Window *param6, u32 param7, u32 param8, u8 param9); +BOOL ov104_0223EADC(UnkStruct_ov104_0223EA84 *param0); +UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(u32 param0); +void ov104_0223EBD0(UnkStruct_ov104_0223EBD0 *param0); +void ov104_0223EBF0(UnkStruct_ov104_0223EBD0 *param0, u8 param1, u8 param2, Window *param3, u8 param4); +BOOL ov104_0223EC34(UnkStruct_ov104_0223EBD0 *param0); +BOOL ov104_0223EE44(UnkStruct_ov104_0223EBD0 *param0); +void ov104_0223F094(UnkStruct_ov104_0223F094 *param0, u32 param1); +void ov104_0223F0B0(UnkStruct_ov104_0223F094 *param0, u8 param1, u8 param2, u16 param3, fx32 param4, s16 param5, u32 param6, u32 param7, u32 param8); +UnkStruct_ov104_0223F174 *ov104_0223F1B4(u32 param0, UnkStruct_ov104_0223F1B4 *param1, int param2); +void ov104_0223F258(UnkStruct_ov104_0223F174 *param0); +void *ov104_0223F27C(const UnkStruct_ov104_0223F174 *param0); #endif // POKEPLATINUM_OV104_0223E894_H diff --git a/include/overlay104/struct_ov104_0222E930_t.h b/include/overlay104/struct_ov104_0222E930_t.h index a916c8456b..dae4a84718 100644 --- a/include/overlay104/struct_ov104_0222E930_t.h +++ b/include/overlay104/struct_ov104_0222E930_t.h @@ -1,24 +1,25 @@ #ifndef POKEPLATINUM_STRUCT_OV104_0222E930_T_H #define POKEPLATINUM_STRUCT_OV104_0222E930_T_H -#include "message.h" #include "overlay104/funcptr_ov104_0222E930.h" #include "overlay104/funcptr_ov104_0222E974.h" #include "overlay104/struct_ov104_022320B4_decl.h" +#include "message.h" + struct UnkStruct_ov104_0222E930_t { - UnkStruct_ov104_022320B4 * unk_00; + UnkStruct_ov104_022320B4 *unk_00; u32 unk_04; u16 unk_08[8]; u8 unk_18; u8 unk_19; - const u8 * unk_1C; - const u8 * unk_20[20]; - const UnkFuncPtr_ov104_0222E930 * unk_70; + const u8 *unk_1C; + const u8 *unk_20[20]; + const UnkFuncPtr_ov104_0222E930 *unk_70; u32 unk_74; u16 unk_78[4]; - MessageLoader * unk_80; - u8 * unk_84; + MessageLoader *unk_80; + u8 *unk_84; UnkFuncPtr_ov104_0222E974 unk_88; u8 unk_8C; }; diff --git a/include/overlay104/struct_ov104_02230BE4.h b/include/overlay104/struct_ov104_02230BE4.h index 3be28b6ced..77c5d9d5ab 100644 --- a/include/overlay104/struct_ov104_02230BE4.h +++ b/include/overlay104/struct_ov104_02230BE4.h @@ -1,25 +1,27 @@ #ifndef POKEPLATINUM_STRUCT_OV104_02230BE4_H #define POKEPLATINUM_STRUCT_OV104_02230BE4_H -#include "game_options.h" -#include "journal.h" +#include "struct_defs/struct_0209C370.h" + #include "field/field_system_decl.h" + #include "bag.h" -#include "struct_defs/struct_0209C370.h" +#include "game_options.h" +#include "journal.h" #include "savedata.h" typedef struct { - void * unk_00; - const Options * unk_04; - SaveData * unk_08; - Journal * unk_0C; - UnkStruct_0207D99C * unk_10; + void *unk_00; + const Options *unk_04; + SaveData *unk_08; + Journal *unk_0C; + UnkStruct_0207D99C *unk_10; int unk_14; int unk_18; int unk_1C; - UnkStruct_0209C370 * unk_20; + UnkStruct_0209C370 *unk_20; u8 unk_24; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; } UnkStruct_ov104_02230BE4; #endif // POKEPLATINUM_STRUCT_OV104_02230BE4_H diff --git a/include/overlay104/struct_ov104_022320B4_t.h b/include/overlay104/struct_ov104_022320B4_t.h index e1042790ff..6ef795d84a 100644 --- a/include/overlay104/struct_ov104_022320B4_t.h +++ b/include/overlay104/struct_ov104_022320B4_t.h @@ -2,26 +2,28 @@ #define POKEPLATINUM_STRUCT_OV104_022320B4_T_H #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" -#include "string_template.h" -#include "strbuf.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_decls/struct_0209B75C_decl.h" +#include "struct_defs/struct_0205AA50.h" + #include "overlay104/struct_ov104_0222E8C8.h" #include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_02232B5C_decl.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" + struct UnkStruct_ov104_022320B4_t { - UnkStruct_0209B75C * unk_00; - UnkStruct_ov104_0222E930 * unk_04[8]; + UnkStruct_0209B75C *unk_00; + UnkStruct_ov104_0222E930 *unk_04[8]; UnkStruct_ov104_0222E8C8 unk_24; int unk_34; u8 unk_38; - MessageLoader * unk_3C; - u8 * unk_40; - StringTemplate * unk_44; - Strbuf* unk_48; - Strbuf* unk_4C; + MessageLoader *unk_3C; + u8 *unk_40; + StringTemplate *unk_44; + Strbuf *unk_48; + Strbuf *unk_4C; u8 unk_50; s8 unk_51; u16 unk_52; @@ -30,22 +32,22 @@ struct UnkStruct_ov104_022320B4_t { u8 unk_59; u8 unk_5A; BOOL unk_5C; - UnkStruct_ov104_02232B5C * unk_60; + UnkStruct_ov104_02232B5C *unk_60; Window unk_64; - UIControlData * unk_74; - u16 * unk_78; - void * unk_7C; - void * unk_80; - void * unk_84; + UIControlData *unk_74; + u16 *unk_78; + void *unk_7C; + void *unk_80; + void *unk_84; Window unk_88; Window unk_98; - Window * unk_A8; - Window * unk_AC; + Window *unk_A8; + Window *unk_AC; u16 unk_B0; u16 unk_B2; u16 unk_B4; u16 unk_B6; - u16 * unk_B8; + u16 *unk_B8; }; #endif // POKEPLATINUM_STRUCT_OV104_022320B4_T_H diff --git a/include/overlay104/struct_ov104_02232B78.h b/include/overlay104/struct_ov104_02232B78.h index fb5b839b07..f5d2209b7d 100644 --- a/include/overlay104/struct_ov104_02232B78.h +++ b/include/overlay104/struct_ov104_02232B78.h @@ -10,10 +10,10 @@ typedef struct { u8 unk_01; s16 unk_02; u16 unk_04; - u8 * unk_08; - const UnkStruct_ov104_02232B78_sub1 * unk_0C; - UnkStruct_ov63_0222D77C * unk_10; - UnkStruct_ov104_0223C634 * unk_14; + u8 *unk_08; + const UnkStruct_ov104_02232B78_sub1 *unk_0C; + UnkStruct_ov63_0222D77C *unk_10; + UnkStruct_ov104_0223C634 *unk_14; } UnkStruct_ov104_02232B78; #endif // POKEPLATINUM_STRUCT_OV104_02232B78_H diff --git a/include/overlay104/struct_ov104_0223319C.h b/include/overlay104/struct_ov104_0223319C.h index 32b223813f..0e4a1c30ec 100644 --- a/include/overlay104/struct_ov104_0223319C.h +++ b/include/overlay104/struct_ov104_0223319C.h @@ -4,7 +4,7 @@ #include "sys_task_manager.h" typedef struct { - SysTask * unk_00; + SysTask *unk_00; s16 unk_04; s16 unk_06; s8 unk_08; diff --git a/include/overlay104/struct_ov104_022331E8.h b/include/overlay104/struct_ov104_022331E8.h index 393a7833c1..06bf82d755 100644 --- a/include/overlay104/struct_ov104_022331E8.h +++ b/include/overlay104/struct_ov104_022331E8.h @@ -4,7 +4,7 @@ #include "sys_task_manager.h" typedef struct { - SysTask * unk_00; + SysTask *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; diff --git a/include/overlay104/struct_ov104_02234130.h b/include/overlay104/struct_ov104_02234130.h index 5d54a84a59..dabb03a40b 100644 --- a/include/overlay104/struct_ov104_02234130.h +++ b/include/overlay104/struct_ov104_02234130.h @@ -2,18 +2,19 @@ #define POKEPLATINUM_STRUCT_OV104_02234130_H #include "struct_decls/struct_party_decl.h" + #include "savedata.h" typedef struct { - SaveData * unk_00; + SaveData *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; u8 padding_07; - Party * unk_08; - Party * unk_0C; + Party *unk_08; + Party *unk_0C; u16 unk_10[6]; - void * unk_1C; + void *unk_1C; u8 padding_20[4]; } UnkStruct_ov104_02234130; diff --git a/include/overlay104/struct_ov104_02235208.h b/include/overlay104/struct_ov104_02235208.h index 289a04dd47..4c945ed3e3 100644 --- a/include/overlay104/struct_ov104_02235208.h +++ b/include/overlay104/struct_ov104_02235208.h @@ -2,17 +2,18 @@ #define POKEPLATINUM_STRUCT_OV104_02235208_H #include "struct_decls/struct_party_decl.h" + #include "savedata.h" typedef struct { - SaveData * unk_00; + SaveData *unk_00; u8 unk_04; u8 unk_05; u16 unk_06; - u8 * unk_08; - Party * unk_0C; - void * unk_10; - u16 * unk_14; + u8 *unk_08; + Party *unk_0C; + void *unk_10; + u16 *unk_14; u16 unk_18; u8 padding_1A[6]; } UnkStruct_ov104_02235208; diff --git a/include/overlay104/struct_ov104_0223597C.h b/include/overlay104/struct_ov104_0223597C.h index e34797eb4e..09d2064e32 100644 --- a/include/overlay104/struct_ov104_0223597C.h +++ b/include/overlay104/struct_ov104_0223597C.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_STRUCT_OV104_0223597C_H #include "struct_decls/struct_party_decl.h" + #include "savedata.h" typedef struct { - SaveData * unk_00; + SaveData *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; @@ -14,11 +15,11 @@ typedef struct { u8 unk_0C[4]; u8 unk_10[4]; u8 unk_14[4]; - Party * unk_18; - Party * unk_1C; + Party *unk_18; + Party *unk_1C; u16 unk_20; u8 padding[2]; - void * unk_24; + void *unk_24; u16 unk_28; u8 padding2[6]; } UnkStruct_ov104_0223597C; diff --git a/include/overlay104/struct_ov104_02238240.h b/include/overlay104/struct_ov104_02238240.h index 8274ae7de1..d64732c8d7 100644 --- a/include/overlay104/struct_ov104_02238240.h +++ b/include/overlay104/struct_ov104_02238240.h @@ -2,27 +2,28 @@ #define POKEPLATINUM_STRUCT_OV104_02238240_H #include "struct_decls/struct_party_decl.h" + #include "savedata.h" typedef struct { - SaveData * unk_00; + SaveData *unk_00; u8 unk_04; u8 padding_05[2]; u8 unk_07; - int * unk_08; - u8 * unk_0C; - u8 * unk_10; - u16 * unk_14; + int *unk_08; + u8 *unk_0C; + u8 *unk_10; + u16 *unk_14; u16 unk_18; u8 padding_1A[2]; u16 unk_1C; u16 unk_1E; u8 padding_20[16]; - Party * unk_30; - Party * unk_34; + Party *unk_30; + Party *unk_34; u16 unk_38; u8 padding_3A[2]; - void * unk_3C; + void *unk_3C; u8 padding_3E[2]; u8 unk_40; u8 padding_41[3]; diff --git a/include/overlay104/struct_ov104_0223A348_sub2.h b/include/overlay104/struct_ov104_0223A348_sub2.h index 364e30d6b9..b92321fe5f 100644 --- a/include/overlay104/struct_ov104_0223A348_sub2.h +++ b/include/overlay104/struct_ov104_0223A348_sub2.h @@ -15,14 +15,14 @@ typedef struct { u32 unk_10; union { struct { - u32 unk_14_val1_0 : 5; - u32 unk_14_val1_5 : 5; - u32 unk_14_val1_10 : 5; - u32 unk_14_val1_15 : 5; - u32 unk_14_val1_20 : 5; - u32 unk_14_val1_25 : 5; - u32 unk_14_val1_30 : 1; - u32 : 1; + u32 unk_14_val1_0 : 5; + u32 unk_14_val1_5 : 5; + u32 unk_14_val1_10 : 5; + u32 unk_14_val1_15 : 5; + u32 unk_14_val1_20 : 5; + u32 unk_14_val1_25 : 5; + u32 unk_14_val1_30 : 1; + u32 : 1; }; u32 unk_14_val2; }; diff --git a/include/overlay104/struct_ov104_0223ADA0.h b/include/overlay104/struct_ov104_0223ADA0.h index d33ade15d1..28543dac46 100644 --- a/include/overlay104/struct_ov104_0223ADA0.h +++ b/include/overlay104/struct_ov104_0223ADA0.h @@ -1,13 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV104_0223ADA0_H #define POKEPLATINUM_STRUCT_OV104_0223ADA0_H -#include "sys_task_manager.h" -#include "struct_defs/struct_0202FF58.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" +#include "struct_defs/struct_0202FF58.h" + #include "overlay104/struct_ov104_0223A348.h" #include "overlay104/struct_ov104_0223A348_sub2.h" +#include "savedata.h" +#include "sys_task_manager.h" + typedef struct { int unk_00; u8 unk_04; @@ -33,14 +35,14 @@ typedef struct { u32 unk_3E0[4]; UnkStruct_ov104_0223A348_sub2 unk_3F0[4]; u16 unk_4D0; - Party * unk_4D4; - Party * unk_4D8; + Party *unk_4D4; + Party *unk_4D8; u16 unk_4DC[6]; u16 unk_4E8[6]; - UnkStruct_0202FF58 * unk_4F4; - SaveData * unk_4F8; - void * unk_4FC; - SysTask * unk_500; + UnkStruct_0202FF58 *unk_4F4; + SaveData *unk_4F8; + void *unk_4FC; + SysTask *unk_500; u16 unk_504[60]; u8 unk_57C; u8 unk_57D; diff --git a/include/overlay104/struct_ov104_0223B5C0.h b/include/overlay104/struct_ov104_0223B5C0.h index 8fb12dd2f0..7fa83a44e7 100644 --- a/include/overlay104/struct_ov104_0223B5C0.h +++ b/include/overlay104/struct_ov104_0223B5C0.h @@ -2,12 +2,14 @@ #define POKEPLATINUM_STRUCT_OV104_0223B5C0_H #include "struct_decls/struct_02030114_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" + #include "overlay104/struct_ov104_0223A348.h" #include "overlay104/struct_ov104_0223A348_sub2.h" +#include "pokemon.h" +#include "savedata.h" + typedef struct { int unk_00; u8 unk_04; @@ -22,16 +24,16 @@ typedef struct { u16 unk_18[20]; UnkStruct_ov104_0223A348 unk_40[2]; u8 unk_260[2]; - Party * unk_264; + Party *unk_264; u16 unk_268[20]; UnkStruct_ov104_0223A348_sub2 unk_290[20]; u16 unk_6F0; u16 unk_6F2; u8 unk_6F4; u8 unk_6F5; - UnkStruct_02030114 * unk_6F8; - SaveData * unk_6FC; - void * unk_700; + UnkStruct_02030114 *unk_6F8; + SaveData *unk_6FC; + void *unk_700; u8 unk_704[4][9]; u16 unk_728[2]; u16 unk_72C[44]; @@ -39,7 +41,7 @@ typedef struct { u8 unk_984[2][512]; u16 unk_D84[2]; u8 unk_D88; - Pokemon * unk_D8C; + Pokemon *unk_D8C; u8 unk_D90; u32 unk_D94; } UnkStruct_ov104_0223B5C0; diff --git a/include/overlay104/struct_ov104_0223BA10.h b/include/overlay104/struct_ov104_0223BA10.h index 126c0d4b1f..b956daceb6 100644 --- a/include/overlay104/struct_ov104_0223BA10.h +++ b/include/overlay104/struct_ov104_0223BA10.h @@ -3,15 +3,17 @@ #include "struct_decls/struct_020302DC_decl.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" + #include "overlay104/struct_ov104_0223A348.h" #include "overlay104/struct_ov104_0223A348_sub2.h" +#include "savedata.h" + typedef struct { int unk_00; - SaveData * unk_04; - UnkStruct_020302DC * unk_08; - void * unk_0C; + SaveData *unk_04; + UnkStruct_020302DC *unk_08; + void *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; @@ -24,8 +26,8 @@ typedef struct { u16 unk_22; u8 unk_24[3]; u8 unk_27; - Party * unk_28; - Party * unk_2C; + Party *unk_28; + Party *unk_2C; u16 unk_30[14]; UnkStruct_ov104_0223A348 unk_4C[2]; u16 unk_26C[4]; @@ -56,7 +58,7 @@ typedef struct { u8 unk_A1A; u8 unk_A1B; u16 unk_A1C; - u16 * unk_A20; + u16 *unk_A20; u32 unk_A24; } UnkStruct_ov104_0223BA10; diff --git a/include/overlay104/struct_ov104_0223BFFC.h b/include/overlay104/struct_ov104_0223BFFC.h index ba8b5281ab..af97b415e5 100644 --- a/include/overlay104/struct_ov104_0223BFFC.h +++ b/include/overlay104/struct_ov104_0223BFFC.h @@ -4,15 +4,17 @@ #include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" + #include "overlay104/struct_ov104_0223A348.h" #include "overlay104/struct_ov104_0223A348_sub2.h" +#include "savedata.h" + typedef struct { int unk_00; - SaveData * unk_04; - UnkStruct_020304A0 * unk_08; - void * unk_0C; + SaveData *unk_04; + UnkStruct_020304A0 *unk_08; + void *unk_0C; u8 unk_10; u8 unk_11; u8 unk_12; @@ -30,12 +32,12 @@ typedef struct { int unk_28; u8 unk_2C[3]; u8 unk_2F; - CellActorData * unk_30[4]; - CellActorData * unk_40[4]; - CellActorData * unk_50[4]; - CellActorData * unk_60[4]; - Party * unk_70; - Party * unk_74; + CellActorData *unk_30[4]; + CellActorData *unk_40[4]; + CellActorData *unk_50[4]; + CellActorData *unk_60[4]; + Party *unk_70; + Party *unk_74; u16 unk_78[14]; u32 unk_94[4]; u32 unk_A4[4]; @@ -62,7 +64,7 @@ typedef struct { u8 unk_A7B; u8 unk_A7C; u8 unk_A7D; - u16 * unk_A80; + u16 *unk_A80; u32 unk_A84; } UnkStruct_ov104_0223BFFC; diff --git a/include/overlay104/struct_ov104_0223C4CC.h b/include/overlay104/struct_ov104_0223C4CC.h index 58cd0ef4ec..7d34cd3cc5 100644 --- a/include/overlay104/struct_ov104_0223C4CC.h +++ b/include/overlay104/struct_ov104_0223C4CC.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_OV104_0223C4CC_H #define POKEPLATINUM_STRUCT_OV104_0223C4CC_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "struct_defs/struct_0207C690.h" #include "struct_decls/struct_0209B75C_decl.h" +#include "struct_defs/struct_0207C690.h" + #include "overlay063/struct_ov63_0222BCE8_decl.h" #include "overlay063/struct_ov63_0222BE18_decl.h" #include "overlay063/struct_ov63_0222CD2C.h" @@ -21,31 +21,33 @@ #include "overlay104/struct_ov104_0223D3B0_1.h" #include "overlay104/struct_ov104_0223D5F0_decl.h" +#include "sys_task_manager.h" + typedef struct UnkStruct_ov104_0223C4CC_t { - BGL * unk_00; - PaletteData * unk_04; - UnkStruct_0209B75C * unk_08; - GenericPointerData * unk_0C; - UnkStruct_ov104_0223D5F0 * unk_10; - UnkStruct_ov63_0222BE18 * unk_14; - UnkStruct_ov63_0222BCE8 * unk_18; + BGL *unk_00; + PaletteData *unk_04; + UnkStruct_0209B75C *unk_08; + GenericPointerData *unk_0C; + UnkStruct_ov104_0223D5F0 *unk_10; + UnkStruct_ov63_0222BE18 *unk_14; + UnkStruct_ov63_0222BCE8 *unk_18; UnkStruct_ov63_0222D160 unk_1C; - UnkStruct_ov63_0222CD2C * unk_20; - UnkStruct_ov63_0222D1C0 * unk_24; - UnkStruct_ov63_0222D1C0 * unk_28; - UnkStruct_ov63_0222D848 * unk_2C; - UnkStruct_ov63_0222D77C * unk_30; + UnkStruct_ov63_0222CD2C *unk_20; + UnkStruct_ov63_0222D1C0 *unk_24; + UnkStruct_ov63_0222D1C0 *unk_28; + UnkStruct_ov63_0222D848 *unk_2C; + UnkStruct_ov63_0222D77C *unk_30; struct { - SpriteRenderer * unk_00; - SpriteGfxHandler * unk_04; + SpriteRenderer *unk_00; + SpriteGfxHandler *unk_04; } unk_34; UnkStruct_ov104_0223D3B0_1 unk_3C; - CellActorData * unk_80[4]; - void * unk_90; - SysTask * unk_94; - SysTask * unk_98; - SysTask * unk_9C; - SysTask * unk_A0; + CellActorData *unk_80[4]; + void *unk_90; + SysTask *unk_94; + SysTask *unk_98; + SysTask *unk_9C; + SysTask *unk_A0; UnkStruct_ov104_0223319C unk_A4; UnkStruct_ov104_022331E8 unk_B0; u16 unk_BC; diff --git a/include/overlay104/struct_ov104_0223C634.h b/include/overlay104/struct_ov104_0223C634.h index 14aeb092d6..2caeb46284 100644 --- a/include/overlay104/struct_ov104_0223C634.h +++ b/include/overlay104/struct_ov104_0223C634.h @@ -1,18 +1,19 @@ #ifndef POKEPLATINUM_STRUCT_OV104_0223C634_H #define POKEPLATINUM_STRUCT_OV104_0223C634_H -#include "sys_task_manager.h" #include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CE44.h" #include "overlay104/struct_ov104_0223D570.h" #include "overlay104/struct_ov104_0223D8F0.h" +#include "sys_task_manager.h" + typedef struct { - UnkStruct_ov63_0222BEC0 * unk_00; - UnkStruct_ov63_0222CE44 * unk_04; + UnkStruct_ov63_0222BEC0 *unk_00; + UnkStruct_ov63_0222CE44 *unk_04; UnkStruct_ov104_0223D570 unk_08; UnkStruct_ov104_0223D8F0 unk_26; - SysTask * unk_38; + SysTask *unk_38; } UnkStruct_ov104_0223C634; #endif // POKEPLATINUM_STRUCT_OV104_0223C634_H diff --git a/include/overlay104/struct_ov104_0223D3B0_1.h b/include/overlay104/struct_ov104_0223D3B0_1.h index 5e6fccbb15..3252480523 100644 --- a/include/overlay104/struct_ov104_0223D3B0_1.h +++ b/include/overlay104/struct_ov104_0223D3B0_1.h @@ -4,7 +4,7 @@ #include "struct_decls/cell_actor_data.h" typedef struct { - CellActorData * unk_00[8]; + CellActorData *unk_00[8]; u16 unk_20[8]; u32 unk_30; u16 unk_34[8]; diff --git a/include/overlay104/struct_ov104_0223F094.h b/include/overlay104/struct_ov104_0223F094.h index 879ae56a30..6d4740e092 100644 --- a/include/overlay104/struct_ov104_0223F094.h +++ b/include/overlay104/struct_ov104_0223F094.h @@ -5,8 +5,8 @@ #include "sys_task_manager.h" typedef struct { - ScreenScrollManager * screenScrollMgr; - SysTask * unk_04; + ScreenScrollManager *screenScrollMgr; + SysTask *unk_04; u32 unk_08; } UnkStruct_ov104_0223F094; diff --git a/include/overlay104/struct_ov104_022412F4.h b/include/overlay104/struct_ov104_022412F4.h index 21f3be8b2d..769721f082 100644 --- a/include/overlay104/struct_ov104_022412F4.h +++ b/include/overlay104/struct_ov104_022412F4.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV104_022412F4_H #define POKEPLATINUM_STRUCT_OV104_022412F4_H - #include typedef struct { diff --git a/include/overlay105/ov105_02241AE0.h b/include/overlay105/ov105_02241AE0.h index 76d07c9f50..1ac617baf8 100644 --- a/include/overlay105/ov105_02241AE0.h +++ b/include/overlay105/ov105_02241AE0.h @@ -3,12 +3,12 @@ #include "overlay_manager.h" -int ov105_02241AE0(OverlayManager * param0, int * param1); -int ov105_02241BD8(OverlayManager * param0, int * param1); -int ov105_02241F54(OverlayManager * param0, int * param1); -void ov105_0224569C(int param0, int param1, void * param2, void * param3); -void ov105_02245744(int param0, int param1, void * param2, void * param3); -void ov105_022457B8(int param0, int param1, void * param2, void * param3); -void ov105_022458A4(int param0, int param1, void * param2, void * param3); +int ov105_02241AE0(OverlayManager *param0, int *param1); +int ov105_02241BD8(OverlayManager *param0, int *param1); +int ov105_02241F54(OverlayManager *param0, int *param1); +void ov105_0224569C(int param0, int param1, void *param2, void *param3); +void ov105_02245744(int param0, int param1, void *param2, void *param3); +void ov105_022457B8(int param0, int param1, void *param2, void *param3); +void ov105_022458A4(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_OV105_02241AE0_H diff --git a/include/overlay105/ov105_02245AAC.h b/include/overlay105/ov105_02245AAC.h index 4feb596677..d02f31402c 100644 --- a/include/overlay105/ov105_02245AAC.h +++ b/include/overlay105/ov105_02245AAC.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV105_02245AAC_H #include "struct_decls/struct_02022550_decl.h" + #include "overlay105/struct_ov105_02245AAC.h" -void ov105_02245AAC(UnkStruct_ov105_02245AAC * param0); -GraphicElementData * ov105_02245BA4(UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5); -void ov105_02245C50(UnkStruct_ov105_02245AAC * param0); +void ov105_02245AAC(UnkStruct_ov105_02245AAC *param0); +GraphicElementData *ov105_02245BA4(UnkStruct_ov105_02245AAC *param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5); +void ov105_02245C50(UnkStruct_ov105_02245AAC *param0); #endif // POKEPLATINUM_OV105_02245AAC_H diff --git a/include/overlay105/ov105_02245CD0.h b/include/overlay105/ov105_02245CD0.h index 043a8e51a0..7895a29b39 100644 --- a/include/overlay105/ov105_02245CD0.h +++ b/include/overlay105/ov105_02245CD0.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_OV105_02245CD0_H #define POKEPLATINUM_OV105_02245CD0_H -#include "struct_decls/struct_02007768_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02007768_decl.h" + #include "pokemon.h" void ov105_02245CD0(void); -void ov105_02245D50(UnkStruct_02007768 * param0); -Sprite * ov105_02245D88(UnkStruct_02007768 * param0, int param1, Pokemon * param2, int param3, int param4, int param5); -void ov105_02245DB8(Sprite * param0, int param1); +void ov105_02245D50(UnkStruct_02007768 *param0); +Sprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5); +void ov105_02245DB8(Sprite *param0, int param1); #endif // POKEPLATINUM_OV105_02245CD0_H diff --git a/include/overlay105/ov105_02245DC4.h b/include/overlay105/ov105_02245DC4.h index 75365bab61..1c270cccc3 100644 --- a/include/overlay105/ov105_02245DC4.h +++ b/include/overlay105/ov105_02245DC4.h @@ -4,9 +4,9 @@ #include "overlay105/struct_ov105_02245AAC.h" #include "overlay105/struct_ov105_02245E1C_decl.h" -UnkStruct_ov105_02245E1C * ov105_02245DC4(UnkStruct_ov105_02245AAC * param0, u32 param1, int param2, int param3, u32 param4); -void * ov105_02245E1C(UnkStruct_ov105_02245E1C * param0); -void ov105_02245E30(UnkStruct_ov105_02245E1C * param0, int param1, int param2); -BOOL ov105_02245E48(UnkStruct_ov105_02245E1C * param0); +UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 param4); +void *ov105_02245E1C(UnkStruct_ov105_02245E1C *param0); +void ov105_02245E30(UnkStruct_ov105_02245E1C *param0, int param1, int param2); +BOOL ov105_02245E48(UnkStruct_ov105_02245E1C *param0); #endif // POKEPLATINUM_OV105_02245DC4_H diff --git a/include/overlay105/ov105_02245E54.h b/include/overlay105/ov105_02245E54.h index 1cf0f2dc4a..0f950a3c3c 100644 --- a/include/overlay105/ov105_02245E54.h +++ b/include/overlay105/ov105_02245E54.h @@ -1,25 +1,25 @@ #ifndef POKEPLATINUM_OV105_02245E54_H #define POKEPLATINUM_OV105_02245E54_H +#include + #include "overlay105/struct_ov105_02245AAC.h" #include "overlay105/struct_ov105_02245EA8_decl.h" -#include - -UnkStruct_ov105_02245EA8 * ov105_02245E54(UnkStruct_ov105_02245AAC * param0, int param1, int param2, u32 param3); -void * ov105_02245EA8(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245EBC(UnkStruct_ov105_02245EA8 * param0, int param1); -VecFx32 ov105_02245EC8(UnkStruct_ov105_02245EA8 * param0, int param1, int param2); -void ov105_02245F14(UnkStruct_ov105_02245EA8 * param0, int param1, int param2); -const VecFx32 * ov105_02245F2C(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245F38(UnkStruct_ov105_02245EA8 * param0, u8 param1); -u8 ov105_02245F3C(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245F44(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245F50(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245F5C(UnkStruct_ov105_02245EA8 * param0); -int ov105_02245F88(UnkStruct_ov105_02245EA8 * param0); -int ov105_02245F8C(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245F90(UnkStruct_ov105_02245EA8 * param0, u32 param1); -void ov105_02245FAC(UnkStruct_ov105_02245EA8 * param0, u32 param1); +UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int param1, int param2, u32 param3); +void *ov105_02245EA8(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245EBC(UnkStruct_ov105_02245EA8 *param0, int param1); +VecFx32 ov105_02245EC8(UnkStruct_ov105_02245EA8 *param0, int param1, int param2); +void ov105_02245F14(UnkStruct_ov105_02245EA8 *param0, int param1, int param2); +const VecFx32 *ov105_02245F2C(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245F38(UnkStruct_ov105_02245EA8 *param0, u8 param1); +u8 ov105_02245F3C(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245F44(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245F50(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245F5C(UnkStruct_ov105_02245EA8 *param0); +int ov105_02245F88(UnkStruct_ov105_02245EA8 *param0); +int ov105_02245F8C(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245F90(UnkStruct_ov105_02245EA8 *param0, u32 param1); +void ov105_02245FAC(UnkStruct_ov105_02245EA8 *param0, u32 param1); #endif // POKEPLATINUM_OV105_02245E54_H diff --git a/include/overlay105/ov105_02245FB8.h b/include/overlay105/ov105_02245FB8.h index a8745854fb..f04a2b4088 100644 --- a/include/overlay105/ov105_02245FB8.h +++ b/include/overlay105/ov105_02245FB8.h @@ -5,12 +5,12 @@ #include "overlay105/struct_ov105_02246060_decl.h" #include "overlay105/struct_ov105_02246394.h" -UnkStruct_ov105_02246060 * ov105_02245FB8(UnkStruct_ov105_02245AAC * param0, u8 param1, u8 param2, u8 param3, u8 param4, const UnkStruct_ov105_02246394 * param5, const u8 * param6); -void * ov105_02246060(UnkStruct_ov105_02246060 * param0); -void ov105_02246074(UnkStruct_ov105_02246060 * param0, int param1); -void ov105_02246080(UnkStruct_ov105_02246060 * param0); -u8 ov105_022461A0(UnkStruct_ov105_02246060 * param0); -void ov105_022461A4(UnkStruct_ov105_02246060 * param0, int param1); -void ov105_022461C0(UnkStruct_ov105_02246060 * param0, u8 param1); +UnkStruct_ov105_02246060 *ov105_02245FB8(UnkStruct_ov105_02245AAC *param0, u8 param1, u8 param2, u8 param3, u8 param4, const UnkStruct_ov105_02246394 *param5, const u8 *param6); +void *ov105_02246060(UnkStruct_ov105_02246060 *param0); +void ov105_02246074(UnkStruct_ov105_02246060 *param0, int param1); +void ov105_02246080(UnkStruct_ov105_02246060 *param0); +u8 ov105_022461A0(UnkStruct_ov105_02246060 *param0); +void ov105_022461A4(UnkStruct_ov105_02246060 *param0, int param1); +void ov105_022461C0(UnkStruct_ov105_02246060 *param0, u8 param1); #endif // POKEPLATINUM_OV105_02245FB8_H diff --git a/include/overlay105/ov105_02246214.h b/include/overlay105/ov105_02246214.h index 484f887b9a..0c558cb3a2 100644 --- a/include/overlay105/ov105_02246214.h +++ b/include/overlay105/ov105_02246214.h @@ -4,9 +4,9 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" -void ov105_02246214(BGL * param0, Window * param1); -void ov105_02246244(Window * param0); -void ov105_02246260(BGL * param0, Window * param1); -void ov105_0224628C(Window * param0, int param1); +void ov105_02246214(BGL *param0, Window *param1); +void ov105_02246244(Window *param0); +void ov105_02246260(BGL *param0, Window *param1); +void ov105_0224628C(Window *param0, int param1); #endif // POKEPLATINUM_OV105_02246214_H diff --git a/include/overlay105/struct_ov105_02245AAC.h b/include/overlay105/struct_ov105_02245AAC.h index edc6310d77..8cb5758cf1 100644 --- a/include/overlay105/struct_ov105_02245AAC.h +++ b/include/overlay105/struct_ov105_02245AAC.h @@ -3,14 +3,14 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_0200C738.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; - UnkStruct_02009DC8 * unk_1A0[1][4]; + UnkStruct_02009714 *unk_190[4]; + UnkStruct_02009DC8 *unk_1A0[1][4]; } UnkStruct_ov105_02245AAC; #endif // POKEPLATINUM_STRUCT_OV105_02245AAC_H diff --git a/include/overlay106/ov106_02241AE0.h b/include/overlay106/ov106_02241AE0.h index 39bc0b496d..48abdf7aa7 100644 --- a/include/overlay106/ov106_02241AE0.h +++ b/include/overlay106/ov106_02241AE0.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_OV106_02241AE0_H #define POKEPLATINUM_OV106_02241AE0_H -#include "overlay_manager.h" #include "overlay106/struct_ov106_02243118_decl.h" -int ov106_02241AE0(OverlayManager * param0, int * param1); -int ov106_02241B9C(OverlayManager * param0, int * param1); -int ov106_02241CF0(OverlayManager * param0, int * param1); -void ov106_02243118(UnkStruct_ov106_02243118 * param0, u16 param1); -void ov106_02243130(int param0, int param1, void * param2, void * param3); -void ov106_0224313C(UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2); -void ov106_02243180(int param0, int param1, void * param2, void * param3); -void ov106_022431D4(UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2); -void ov106_022431E0(int param0, int param1, void * param2, void * param3); +#include "overlay_manager.h" + +int ov106_02241AE0(OverlayManager *param0, int *param1); +int ov106_02241B9C(OverlayManager *param0, int *param1); +int ov106_02241CF0(OverlayManager *param0, int *param1); +void ov106_02243118(UnkStruct_ov106_02243118 *param0, u16 param1); +void ov106_02243130(int param0, int param1, void *param2, void *param3); +void ov106_0224313C(UnkStruct_ov106_02243118 *param0, u16 param1, u16 param2); +void ov106_02243180(int param0, int param1, void *param2, void *param3); +void ov106_022431D4(UnkStruct_ov106_02243118 *param0, u16 param1, u16 param2); +void ov106_022431E0(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_OV106_02241AE0_H diff --git a/include/overlay106/ov106_02243310.h b/include/overlay106/ov106_02243310.h index 481601b434..a9f97bd530 100644 --- a/include/overlay106/ov106_02243310.h +++ b/include/overlay106/ov106_02243310.h @@ -2,11 +2,13 @@ #define POKEPLATINUM_OV106_02243310_H #include "struct_decls/struct_02022550_decl.h" -#include "pokemon.h" + #include "overlay106/struct_ov106_02243310.h" -void ov106_02243310(UnkStruct_ov106_02243310 * param0, Pokemon * param1); -GraphicElementData * ov106_022434BC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4); -void ov106_02243570(UnkStruct_ov106_02243310 * param0); +#include "pokemon.h" + +void ov106_02243310(UnkStruct_ov106_02243310 *param0, Pokemon *param1); +GraphicElementData *ov106_022434BC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u32 param3, u8 param4); +void ov106_02243570(UnkStruct_ov106_02243310 *param0); #endif // POKEPLATINUM_OV106_02243310_H diff --git a/include/overlay106/ov106_022435FC.h b/include/overlay106/ov106_022435FC.h index d26645329b..c6741178de 100644 --- a/include/overlay106/ov106_022435FC.h +++ b/include/overlay106/ov106_022435FC.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_OV106_022435FC_H #define POKEPLATINUM_OV106_022435FC_H -#include "pokemon.h" #include "overlay106/struct_ov106_02243310.h" #include "overlay106/struct_ov106_02243650_decl.h" -UnkStruct_ov106_02243650 * ov106_022435FC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u16 param3, u16 param4, const u8 * param5); -void * ov106_02243650(UnkStruct_ov106_02243650 * param0); -void ov106_02243664(UnkStruct_ov106_02243650 * param0, int param1); -void ov106_02243670(UnkStruct_ov106_02243650 * param0, u16 param1, u16 param2); -void ov106_022436B0(UnkStruct_ov106_02243650 * param0, u32 param1); -void ov106_022436CC(UnkStruct_ov106_02243650 * param0, Pokemon * param1); +#include "pokemon.h" + +UnkStruct_ov106_02243650 *ov106_022435FC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u16 param3, u16 param4, const u8 *param5); +void *ov106_02243650(UnkStruct_ov106_02243650 *param0); +void ov106_02243664(UnkStruct_ov106_02243650 *param0, int param1); +void ov106_02243670(UnkStruct_ov106_02243650 *param0, u16 param1, u16 param2); +void ov106_022436B0(UnkStruct_ov106_02243650 *param0, u32 param1); +void ov106_022436CC(UnkStruct_ov106_02243650 *param0, Pokemon *param1); #endif // POKEPLATINUM_OV106_022435FC_H diff --git a/include/overlay106/ov106_022436E0.h b/include/overlay106/ov106_022436E0.h index f53193fd2a..b7e66dba41 100644 --- a/include/overlay106/ov106_022436E0.h +++ b/include/overlay106/ov106_022436E0.h @@ -4,9 +4,9 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" -void ov106_022436E0(BGL * param0, Window * param1); -void ov106_02243710(Window * param0); -void ov106_0224372C(BGL * param0, Window * param1); -void ov106_02243758(Window * param0, int param1); +void ov106_022436E0(BGL *param0, Window *param1); +void ov106_02243710(Window *param0); +void ov106_0224372C(BGL *param0, Window *param1); +void ov106_02243758(Window *param0, int param1); #endif // POKEPLATINUM_OV106_022436E0_H diff --git a/include/overlay106/struct_ov106_02243310.h b/include/overlay106/struct_ov106_02243310.h index f90f0f6260..1157c8bbb8 100644 --- a/include/overlay106/struct_ov106_02243310.h +++ b/include/overlay106/struct_ov106_02243310.h @@ -3,14 +3,14 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_0200C738.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; - UnkStruct_02009DC8 * unk_1A0[2][4]; + UnkStruct_02009714 *unk_190[4]; + UnkStruct_02009DC8 *unk_1A0[2][4]; } UnkStruct_ov106_02243310; #endif // POKEPLATINUM_STRUCT_OV106_02243310_H diff --git a/include/overlay107/ov107_02241AE0.h b/include/overlay107/ov107_02241AE0.h index 77a60da037..3781e1e31b 100644 --- a/include/overlay107/ov107_02241AE0.h +++ b/include/overlay107/ov107_02241AE0.h @@ -3,12 +3,12 @@ #include "overlay_manager.h" -int ov107_02241AE0(OverlayManager * param0, int * param1); -int ov107_02241BD4(OverlayManager * param0, int * param1); -int ov107_02241D2C(OverlayManager * param0, int * param1); -void ov107_02245338(int param0, int param1, void * param2, void * param3); -void ov107_022453A0(int param0, int param1, void * param2, void * param3); -void ov107_02245408(int param0, int param1, void * param2, void * param3); -void ov107_02245438(int param0, int param1, void * param2, void * param3); +int ov107_02241AE0(OverlayManager *param0, int *param1); +int ov107_02241BD4(OverlayManager *param0, int *param1); +int ov107_02241D2C(OverlayManager *param0, int *param1); +void ov107_02245338(int param0, int param1, void *param2, void *param3); +void ov107_022453A0(int param0, int param1, void *param2, void *param3); +void ov107_02245408(int param0, int param1, void *param2, void *param3); +void ov107_02245438(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_OV107_02241AE0_H diff --git a/include/overlay107/ov107_02245EB0.h b/include/overlay107/ov107_02245EB0.h index 9b910934af..0426a07575 100644 --- a/include/overlay107/ov107_02245EB0.h +++ b/include/overlay107/ov107_02245EB0.h @@ -3,12 +3,12 @@ #include "overlay_manager.h" -int ov107_02245EB0(OverlayManager * param0, int * param1); -int ov107_02245FD0(OverlayManager * param0, int * param1); -int ov107_02246130(OverlayManager * param0, int * param1); -void ov107_02248910(int param0, int param1, void * param2, void * param3); -void ov107_02248978(int param0, int param1, void * param2, void * param3); -void ov107_022489E0(int param0, int param1, void * param2, void * param3); -void ov107_02248A10(int param0, int param1, void * param2, void * param3); +int ov107_02245EB0(OverlayManager *param0, int *param1); +int ov107_02245FD0(OverlayManager *param0, int *param1); +int ov107_02246130(OverlayManager *param0, int *param1); +void ov107_02248910(int param0, int param1, void *param2, void *param3); +void ov107_02248978(int param0, int param1, void *param2, void *param3); +void ov107_022489E0(int param0, int param1, void *param2, void *param3); +void ov107_02248A10(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_OV107_02245EB0_H diff --git a/include/overlay107/ov107_02249604.h b/include/overlay107/ov107_02249604.h index 0691a06a81..a38b4cad35 100644 --- a/include/overlay107/ov107_02249604.h +++ b/include/overlay107/ov107_02249604.h @@ -3,12 +3,13 @@ #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_party_decl.h" + #include "overlay107/struct_ov107_02249954.h" -void ov107_02249604(UnkStruct_ov107_02249954 * param0, Party * param1, u8 param2); -GraphicElementData * ov107_022498A4(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7); -void ov107_02249954(UnkStruct_ov107_02249954 * param0); -void ov107_022499BC(UnkStruct_ov107_02249954 * param0, u16 param1); -void ov107_022499FC(UnkStruct_ov107_02249954 * param0, u16 param1); +void ov107_02249604(UnkStruct_ov107_02249954 *param0, Party *param1, u8 param2); +GraphicElementData *ov107_022498A4(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7); +void ov107_02249954(UnkStruct_ov107_02249954 *param0); +void ov107_022499BC(UnkStruct_ov107_02249954 *param0, u16 param1); +void ov107_022499FC(UnkStruct_ov107_02249954 *param0, u16 param1); #endif // POKEPLATINUM_OV107_02249604_H diff --git a/include/overlay107/ov107_02249B1C.h b/include/overlay107/ov107_02249B1C.h index b8bc850dd9..657b921858 100644 --- a/include/overlay107/ov107_02249B1C.h +++ b/include/overlay107/ov107_02249B1C.h @@ -1,21 +1,22 @@ #ifndef POKEPLATINUM_OV107_02249B1C_H #define POKEPLATINUM_OV107_02249B1C_H -#include "pokemon.h" #include "overlay107/struct_ov107_02249954.h" #include "overlay107/struct_ov107_02249B8C_decl.h" -UnkStruct_ov107_02249B8C * ov107_02249B1C(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, s16 param5, s16 param6, int param7, const u8 * param8); -void * ov107_02249B8C(UnkStruct_ov107_02249B8C * param0); -void ov107_02249BAC(UnkStruct_ov107_02249B8C * param0, int param1); -void ov107_02249BB8(UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2); -void ov107_02249BEC(UnkStruct_ov107_02249B8C * param0, u32 param1); -void ov107_02249C08(UnkStruct_ov107_02249B8C * param0, Pokemon * param1); -void ov107_02249C1C(UnkStruct_ov107_02249B8C * param0, u8 param1); -void ov107_02249C28(UnkStruct_ov107_02249B8C * param0, u8 param1); -BOOL ov107_02249C40(UnkStruct_ov107_02249B8C * param0); -void ov107_02249C4C(UnkStruct_ov107_02249B8C * param0, u8 param1); -void ov107_02249C58(UnkStruct_ov107_02249B8C * param0, s16 param1, s16 param2); -void ov107_02249C60(UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2); +#include "pokemon.h" + +UnkStruct_ov107_02249B8C *ov107_02249B1C(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, s16 param5, s16 param6, int param7, const u8 *param8); +void *ov107_02249B8C(UnkStruct_ov107_02249B8C *param0); +void ov107_02249BAC(UnkStruct_ov107_02249B8C *param0, int param1); +void ov107_02249BB8(UnkStruct_ov107_02249B8C *param0, u16 param1, u16 param2); +void ov107_02249BEC(UnkStruct_ov107_02249B8C *param0, u32 param1); +void ov107_02249C08(UnkStruct_ov107_02249B8C *param0, Pokemon *param1); +void ov107_02249C1C(UnkStruct_ov107_02249B8C *param0, u8 param1); +void ov107_02249C28(UnkStruct_ov107_02249B8C *param0, u8 param1); +BOOL ov107_02249C40(UnkStruct_ov107_02249B8C *param0); +void ov107_02249C4C(UnkStruct_ov107_02249B8C *param0, u8 param1); +void ov107_02249C58(UnkStruct_ov107_02249B8C *param0, s16 param1, s16 param2); +void ov107_02249C60(UnkStruct_ov107_02249B8C *param0, u16 param1, u16 param2); #endif // POKEPLATINUM_OV107_02249B1C_H diff --git a/include/overlay107/ov107_02249C98.h b/include/overlay107/ov107_02249C98.h index 46a8b50e7d..91ef303c70 100644 --- a/include/overlay107/ov107_02249C98.h +++ b/include/overlay107/ov107_02249C98.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV107_02249C98_H #include "savedata.h" +#include "string_template.h" u8 ov107_02249C98(u8 param0, u8 param1); u8 ov107_02249C9C(u8 param0, u8 param1); -u8 ov107_02249CAC(SaveData * param0, u8 param1, u8 param2); +u8 ov107_02249CAC(SaveData *param0, u8 param1, u8 param2); void ov107_02249CE0(u32 param0, u16 param1); -void ov107_02249CF4(StringTemplate * param0, u32 param1); +void ov107_02249CF4(StringTemplate *param0, u32 param1); #endif // POKEPLATINUM_OV107_02249C98_H diff --git a/include/overlay107/ov107_02249D14.h b/include/overlay107/ov107_02249D14.h index e43018a2fd..7ea837654e 100644 --- a/include/overlay107/ov107_02249D14.h +++ b/include/overlay107/ov107_02249D14.h @@ -4,9 +4,9 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" -void ov107_02249D14(BGL * param0, Window * param1, u8 param2); -void ov107_02249D5C(Window * param0, u8 param1); -void ov107_02249D84(BGL * param0, Window * param1); -void ov107_02249DBC(Window * param0, int param1); +void ov107_02249D14(BGL *param0, Window *param1, u8 param2); +void ov107_02249D5C(Window *param0, u8 param1); +void ov107_02249D84(BGL *param0, Window *param1); +void ov107_02249DBC(Window *param0, int param1); #endif // POKEPLATINUM_OV107_02249D14_H diff --git a/include/overlay107/struct_ov107_02249954.h b/include/overlay107/struct_ov107_02249954.h index 2d9b7ccf70..cdf91134ef 100644 --- a/include/overlay107/struct_ov107_02249954.h +++ b/include/overlay107/struct_ov107_02249954.h @@ -3,14 +3,14 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_0200C738.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; - UnkStruct_02009DC8 * unk_1A0[7][4]; + UnkStruct_02009714 *unk_190[4]; + UnkStruct_02009DC8 *unk_1A0[7][4]; } UnkStruct_ov107_02249954; #endif // POKEPLATINUM_STRUCT_OV107_02249954_H diff --git a/include/overlay108/ov108_02241AE0.h b/include/overlay108/ov108_02241AE0.h index b256460b0c..f79469ff9d 100644 --- a/include/overlay108/ov108_02241AE0.h +++ b/include/overlay108/ov108_02241AE0.h @@ -3,11 +3,11 @@ #include "overlay_manager.h" -int ov108_02241AE0(OverlayManager * param0, int * param1); -int ov108_02241C38(OverlayManager * param0, int * param1); -int ov108_02241D70(OverlayManager * param0, int * param1); -void ov108_02242AB0(int param0, int param1, void * param2, void * param3); -void ov108_02242B24(int param0, int param1, void * param2, void * param3); -void ov108_02242B84(int param0, int param1, void * param2, void * param3); +int ov108_02241AE0(OverlayManager *param0, int *param1); +int ov108_02241C38(OverlayManager *param0, int *param1); +int ov108_02241D70(OverlayManager *param0, int *param1); +void ov108_02242AB0(int param0, int param1, void *param2, void *param3); +void ov108_02242B24(int param0, int param1, void *param2, void *param3); +void ov108_02242B84(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_OV108_02241AE0_H diff --git a/include/overlay108/ov108_02243030.h b/include/overlay108/ov108_02243030.h index 39569bb153..f000fb8658 100644 --- a/include/overlay108/ov108_02243030.h +++ b/include/overlay108/ov108_02243030.h @@ -3,10 +3,11 @@ #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_party_decl.h" + #include "overlay108/struct_ov108_02243030.h" -void ov108_02243030(UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3); -GraphicElementData * ov108_022430F0(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7); -void ov108_02243194(UnkStruct_ov108_02243030 * param0); +void ov108_02243030(UnkStruct_ov108_02243030 *param0, Party *param1, Party *param2, u8 param3); +GraphicElementData *ov108_022430F0(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7); +void ov108_02243194(UnkStruct_ov108_02243030 *param0); #endif // POKEPLATINUM_OV108_02243030_H diff --git a/include/overlay108/ov108_0224351C.h b/include/overlay108/ov108_0224351C.h index 33485c9f88..7b73ddd85e 100644 --- a/include/overlay108/ov108_0224351C.h +++ b/include/overlay108/ov108_0224351C.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_OV108_0224351C_H #define POKEPLATINUM_OV108_0224351C_H -#include "pokemon.h" #include "overlay108/struct_ov108_02243030.h" #include "overlay108/struct_ov108_02243594_decl.h" -UnkStruct_ov108_02243594 * ov108_0224351C(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u16 param5, u16 param6, u32 param7, int param8, u8 param9); -void * ov108_02243594(UnkStruct_ov108_02243594 * param0); -void ov108_022435A8(UnkStruct_ov108_02243594 * param0, int param1); -void ov108_022435B4(UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2); -void ov108_022435F4(UnkStruct_ov108_02243594 * param0, u32 param1); -void ov108_02243610(UnkStruct_ov108_02243594 * param0, Pokemon * param1); -void ov108_02243624(UnkStruct_ov108_02243594 * param0, u8 param1); +#include "pokemon.h" + +UnkStruct_ov108_02243594 *ov108_0224351C(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u16 param5, u16 param6, u32 param7, int param8, u8 param9); +void *ov108_02243594(UnkStruct_ov108_02243594 *param0); +void ov108_022435A8(UnkStruct_ov108_02243594 *param0, int param1); +void ov108_022435B4(UnkStruct_ov108_02243594 *param0, u16 param1, u16 param2); +void ov108_022435F4(UnkStruct_ov108_02243594 *param0, u32 param1); +void ov108_02243610(UnkStruct_ov108_02243594 *param0, Pokemon *param1); +void ov108_02243624(UnkStruct_ov108_02243594 *param0, u8 param1); #endif // POKEPLATINUM_OV108_0224351C_H diff --git a/include/overlay108/ov108_02243630.h b/include/overlay108/ov108_02243630.h index 9366adf114..fa6f56b8ed 100644 --- a/include/overlay108/ov108_02243630.h +++ b/include/overlay108/ov108_02243630.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" -void ov108_02243630(BGL * param0, Window * param1); -void ov108_02243660(Window * param0); +void ov108_02243630(BGL *param0, Window *param1); +void ov108_02243660(Window *param0); #endif // POKEPLATINUM_OV108_02243630_H diff --git a/include/overlay108/struct_ov108_02243030.h b/include/overlay108/struct_ov108_02243030.h index 66f67c1444..0369f22dca 100644 --- a/include/overlay108/struct_ov108_02243030.h +++ b/include/overlay108/struct_ov108_02243030.h @@ -3,14 +3,14 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_0200C738.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; - UnkStruct_02009DC8 * unk_1A0[11][4]; + UnkStruct_02009714 *unk_190[4]; + UnkStruct_02009DC8 *unk_1A0[11][4]; } UnkStruct_ov108_02243030; #endif // POKEPLATINUM_STRUCT_OV108_02243030_H diff --git a/include/overlay109/ov109_021D0D80.h b/include/overlay109/ov109_021D0D80.h index bf223719b7..b7423a70b0 100644 --- a/include/overlay109/ov109_021D0D80.h +++ b/include/overlay109/ov109_021D0D80.h @@ -1,20 +1,22 @@ #ifndef POKEPLATINUM_OV109_021D0D80_H #define POKEPLATINUM_OV109_021D0D80_H -#include "overlay_manager.h" #include "struct_defs/struct_0209C0F0.h" + #include "overlay109/struct_ov109_021D0F70_decl.h" #include "overlay109/struct_ov109_021D1048.h" #include "overlay109/struct_ov109_021D17EC.h" -int ov109_021D0D80(OverlayManager * param0, int * param1); -int ov109_021D0EB4(OverlayManager * param0, int * param1); -int ov109_021D0F2C(OverlayManager * param0, int * param1); -void ov109_021D3A68(UnkStruct_ov109_021D0F70 * param0, u32 param1); -void ov109_021D3A70(UnkStruct_ov109_021D0F70 * param0, const UnkStruct_0209C0F0 * param1); -void ov109_021D3B24(UnkStruct_ov109_021D0F70 * param0, const UnkStruct_ov109_021D1048 * param1); -void ov109_021D3B50(UnkStruct_ov109_021D0F70 * param0, int param1); -void ov109_021D3BE4(UnkStruct_ov109_021D0F70 * param0, int param1, int param2); -void ov109_021D3BEC(UnkStruct_ov109_021D0F70 * param0, const UnkStruct_ov109_021D17EC * param1); +#include "overlay_manager.h" + +int ov109_021D0D80(OverlayManager *param0, int *param1); +int ov109_021D0EB4(OverlayManager *param0, int *param1); +int ov109_021D0F2C(OverlayManager *param0, int *param1); +void ov109_021D3A68(UnkStruct_ov109_021D0F70 *param0, u32 param1); +void ov109_021D3A70(UnkStruct_ov109_021D0F70 *param0, const UnkStruct_0209C0F0 *param1); +void ov109_021D3B24(UnkStruct_ov109_021D0F70 *param0, const UnkStruct_ov109_021D1048 *param1); +void ov109_021D3B50(UnkStruct_ov109_021D0F70 *param0, int param1); +void ov109_021D3BE4(UnkStruct_ov109_021D0F70 *param0, int param1, int param2); +void ov109_021D3BEC(UnkStruct_ov109_021D0F70 *param0, const UnkStruct_ov109_021D17EC *param1); #endif // POKEPLATINUM_OV109_021D0D80_H diff --git a/include/overlay109/ov109_021D3D50.h b/include/overlay109/ov109_021D3D50.h index 330ef3b201..73fd8bd669 100644 --- a/include/overlay109/ov109_021D3D50.h +++ b/include/overlay109/ov109_021D3D50.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_OV109_021D3D50_H #define POKEPLATINUM_OV109_021D3D50_H -#include "overlay_manager.h" #include "overlay109/struct_ov109_021D5140_decl.h" -int ov109_021D3D50(OverlayManager * param0, int * param1); -int ov109_021D3EB0(OverlayManager * param0, int * param1); -int ov109_021D3F9C(OverlayManager * param0, int * param1); -void ov109_021D5140(UnkStruct_ov109_021D5140 * param0, int param1, u8 param2); -void ov109_021D5258(UnkStruct_ov109_021D5140 * param0, int param1, u8 param2); +#include "overlay_manager.h" + +int ov109_021D3D50(OverlayManager *param0, int *param1); +int ov109_021D3EB0(OverlayManager *param0, int *param1); +int ov109_021D3F9C(OverlayManager *param0, int *param1); +void ov109_021D5140(UnkStruct_ov109_021D5140 *param0, int param1, u8 param2); +void ov109_021D5258(UnkStruct_ov109_021D5140 *param0, int param1, u8 param2); #endif // POKEPLATINUM_OV109_021D3D50_H diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h index 6118a32baa..a6e0cb6bf0 100644 --- a/include/overlay109/struct_ov109_021D5140.h +++ b/include/overlay109/struct_ov109_021D5140.h @@ -1,74 +1,76 @@ #ifndef POKEPLATINUM_STRUCT_OV109_021D5140_H #define POKEPLATINUM_STRUCT_OV109_021D5140_H +#include + #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" -#include "string_template.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" +#include "struct_decls/struct_0209C194_decl.h" +#include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0209BDF8.h" -#include "struct_decls/struct_0209C194_decl.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay109/struct_ov109_021D5140_sub1.h" #include "overlay109/struct_ov109_021D5140_sub2.h" #include "overlay109/struct_ov109_021D5140_sub3.h" -#include +#include "message.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" +#include "trainer_info.h" typedef struct UnkStruct_ov109_021D5140_t { int unk_00; int unk_04; int unk_08; - UnkStruct_0209C194 * unk_0C; - UnkStruct_0209BDF8 * unk_10; - BGL * unk_14; + UnkStruct_0209C194 *unk_0C; + UnkStruct_0209BDF8 *unk_10; + BGL *unk_14; BOOL unk_18; UnkStruct_ov109_021D5140_sub1 unk_1C; - SysTask * unk_30; - StringTemplate * unk_34; - MessageLoader * unk_38; - Strbuf* unk_3C[5]; - Strbuf* unk_50; - Strbuf* unk_54; - Strbuf* unk_58; + SysTask *unk_30; + StringTemplate *unk_34; + MessageLoader *unk_38; + Strbuf *unk_3C[5]; + Strbuf *unk_50; + Strbuf *unk_54; + Strbuf *unk_58; int unk_5C; - GraphicElementManager * unk_60; + GraphicElementManager *unk_60; UnkStruct_0200C738 unk_64; - UnkStruct_02009714 * unk_1F0[4]; - UnkStruct_02009DC8 * unk_200[3][4]; + UnkStruct_02009714 *unk_1F0[4]; + UnkStruct_02009DC8 *unk_200[3][4]; UnkStruct_ov19_021DA864 unk_230; UnkStruct_ov19_021DA864 unk_254; UnkStruct_ov19_021DA864 unk_278; - GraphicElementData * unk_29C[14]; - GraphicElementData * unk_2D4[14]; + GraphicElementData *unk_29C[14]; + GraphicElementData *unk_2D4[14]; Window unk_30C[5]; Window unk_35C; Window unk_36C; Window unk_37C; - Window * unk_38C[2]; - UIControlData * unk_394; - void * unk_398[2]; - NNSG2dCharacterData * unk_3A0[2]; - void * unk_3A8[2]; - NNSG2dPaletteData * unk_3B0[2]; + Window *unk_38C[2]; + UIControlData *unk_394; + void *unk_398[2]; + NNSG2dCharacterData *unk_3A0[2]; + void *unk_3A8[2]; + NNSG2dPaletteData *unk_3B0[2]; int unk_3B8; int unk_3BC; int unk_3C0; int unk_3C4; u8 unk_3C8[8][2]; - TrainerInfo * unk_3D8[5][2]; + TrainerInfo *unk_3D8[5][2]; int unk_400[5]; int unk_414; u16 unk_418; - u16 * unk_41C; + u16 *unk_41C; u8 unk_420; u8 unk_421; UnkStruct_ov109_021D5140_sub2 unk_424; diff --git a/include/overlay109/struct_ov109_021D5140_sub1.h b/include/overlay109/struct_ov109_021D5140_sub1.h index 15fba3d93b..881988727e 100644 --- a/include/overlay109/struct_ov109_021D5140_sub1.h +++ b/include/overlay109/struct_ov109_021D5140_sub1.h @@ -1,15 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_OV109_021D5140_SUB1_H #define POKEPLATINUM_STRUCT_OV109_021D5140_SUB1_H - #include typedef struct { int unk_00; int unk_04; int unk_08; - void * unk_0C; - NNSG2dPaletteData * unk_10; + void *unk_0C; + NNSG2dPaletteData *unk_10; } UnkStruct_ov109_021D5140_sub1; #endif // POKEPLATINUM_STRUCT_OV109_021D5140_SUB1_H diff --git a/include/overlay110/ov110_021D0D80.h b/include/overlay110/ov110_021D0D80.h index e6ee3e2279..f89b623ce8 100644 --- a/include/overlay110/ov110_021D0D80.h +++ b/include/overlay110/ov110_021D0D80.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_OV110_021D0D80_H #define POKEPLATINUM_OV110_021D0D80_H - -int ov110_021D0D80(OverlayManager * param0, int * param1); -int ov110_021D0E9C(OverlayManager * param0, int * param1); -int ov110_021D0EF0(OverlayManager * param0, int * param1); +int ov110_021D0D80(OverlayManager *param0, int *param1); +int ov110_021D0E9C(OverlayManager *param0, int *param1); +int ov110_021D0EF0(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV110_021D0D80_H diff --git a/include/overlay110/ov110_021D2124.h b/include/overlay110/ov110_021D2124.h index 0be797fc34..3d71958079 100644 --- a/include/overlay110/ov110_021D2124.h +++ b/include/overlay110/ov110_021D2124.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" -void ov110_021D2124(BGL * param0, Window * param1, u8 param2); -void ov110_021D216C(Window * param0, u8 param1); +void ov110_021D2124(BGL *param0, Window *param1, u8 param2); +void ov110_021D216C(Window *param0, u8 param1); #endif // POKEPLATINUM_OV110_021D2124_H diff --git a/include/overlay111/ov111_021D0D80.h b/include/overlay111/ov111_021D0D80.h index 15e4c4d66d..954c40c09d 100644 --- a/include/overlay111/ov111_021D0D80.h +++ b/include/overlay111/ov111_021D0D80.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV111_021D0D80_H #define POKEPLATINUM_OV111_021D0D80_H +#include "overlay_manager.h" -int ov111_021D0D80(OverlayManager * param0, int * param1); -int ov111_021D0E34(OverlayManager * param0, int * param1); -int ov111_021D0F40(OverlayManager * param0, int * param1); +int ov111_021D0D80(OverlayManager *param0, int *param1); +int ov111_021D0E34(OverlayManager *param0, int *param1); +int ov111_021D0F40(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV111_021D0D80_H diff --git a/include/overlay111/ov111_021D2F80.h b/include/overlay111/ov111_021D2F80.h index 51b3dfcda5..50a43ac1ff 100644 --- a/include/overlay111/ov111_021D2F80.h +++ b/include/overlay111/ov111_021D2F80.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_OV111_021D2F80_H #include "struct_decls/struct_02022550_decl.h" + #include "overlay111/struct_ov111_021D2F80.h" -void ov111_021D2F80(UnkStruct_ov111_021D2F80 * param0); -GraphicElementData * ov111_021D3280(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5); -void ov111_021D3320(UnkStruct_ov111_021D2F80 * param0); -void ov111_021D33B0(UnkStruct_ov111_021D2F80 * param0, int param1); +void ov111_021D2F80(UnkStruct_ov111_021D2F80 *param0); +GraphicElementData *ov111_021D3280(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5); +void ov111_021D3320(UnkStruct_ov111_021D2F80 *param0); +void ov111_021D33B0(UnkStruct_ov111_021D2F80 *param0, int param1); #endif // POKEPLATINUM_OV111_021D2F80_H diff --git a/include/overlay111/ov111_021D33F4.h b/include/overlay111/ov111_021D33F4.h index 815fb5f414..3614cff5af 100644 --- a/include/overlay111/ov111_021D33F4.h +++ b/include/overlay111/ov111_021D33F4.h @@ -1,23 +1,23 @@ #ifndef POKEPLATINUM_OV111_021D33F4_H #define POKEPLATINUM_OV111_021D33F4_H +#include + #include "overlay111/struct_ov111_021D2F80.h" #include "overlay111/struct_ov111_021D33F4_decl.h" -#include - -UnkStruct_ov111_021D33F4 * ov111_021D33F4(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u16 param3, u16 param4, u8 param5, u32 param6, u32 param7); -void * ov111_021D3448(UnkStruct_ov111_021D33F4 * param0); -void ov111_021D345C(UnkStruct_ov111_021D33F4 * param0, int param1); -void ov111_021D3468(UnkStruct_ov111_021D33F4 * param0, u32 param1); -void ov111_021D3474(UnkStruct_ov111_021D33F4 * param0, int param1, int param2); -void ov111_021D349C(UnkStruct_ov111_021D33F4 * param0, int * param1, int * param2); -void ov111_021D34C4(UnkStruct_ov111_021D33F4 * param0, u32 param1); -void ov111_021D34E0(UnkStruct_ov111_021D33F4 * param0, u32 param1); -void ov111_021D34F4(UnkStruct_ov111_021D33F4 * param0, VecFx32 * param1); -void ov111_021D3500(UnkStruct_ov111_021D33F4 * param0, u32 param1); -void ov111_021D350C(UnkStruct_ov111_021D33F4 * param0, int param1); -void ov111_021D3530(UnkStruct_ov111_021D33F4 * param0, BOOL param1); -BOOL ov111_021D353C(UnkStruct_ov111_021D33F4 * param0); +UnkStruct_ov111_021D33F4 *ov111_021D33F4(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u16 param3, u16 param4, u8 param5, u32 param6, u32 param7); +void *ov111_021D3448(UnkStruct_ov111_021D33F4 *param0); +void ov111_021D345C(UnkStruct_ov111_021D33F4 *param0, int param1); +void ov111_021D3468(UnkStruct_ov111_021D33F4 *param0, u32 param1); +void ov111_021D3474(UnkStruct_ov111_021D33F4 *param0, int param1, int param2); +void ov111_021D349C(UnkStruct_ov111_021D33F4 *param0, int *param1, int *param2); +void ov111_021D34C4(UnkStruct_ov111_021D33F4 *param0, u32 param1); +void ov111_021D34E0(UnkStruct_ov111_021D33F4 *param0, u32 param1); +void ov111_021D34F4(UnkStruct_ov111_021D33F4 *param0, VecFx32 *param1); +void ov111_021D3500(UnkStruct_ov111_021D33F4 *param0, u32 param1); +void ov111_021D350C(UnkStruct_ov111_021D33F4 *param0, int param1); +void ov111_021D3530(UnkStruct_ov111_021D33F4 *param0, BOOL param1); +BOOL ov111_021D353C(UnkStruct_ov111_021D33F4 *param0); #endif // POKEPLATINUM_OV111_021D33F4_H diff --git a/include/overlay111/ov111_021D3548.h b/include/overlay111/ov111_021D3548.h index a20e0be717..9a3f71d089 100644 --- a/include/overlay111/ov111_021D3548.h +++ b/include/overlay111/ov111_021D3548.h @@ -4,9 +4,9 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" -void ov111_021D3548(BGL * param0, Window * param1); -void ov111_021D3578(Window * param0); -void ov111_021D3594(BGL * param0, Window * param1); -void ov111_021D35C0(Window * param0, int param1); +void ov111_021D3548(BGL *param0, Window *param1); +void ov111_021D3578(Window *param0); +void ov111_021D3594(BGL *param0, Window *param1); +void ov111_021D35C0(Window *param0, int param1); #endif // POKEPLATINUM_OV111_021D3548_H diff --git a/include/overlay111/struct_ov111_021D2F80.h b/include/overlay111/struct_ov111_021D2F80.h index 9f62e8ee55..96cca1931d 100644 --- a/include/overlay111/struct_ov111_021D2F80.h +++ b/include/overlay111/struct_ov111_021D2F80.h @@ -3,14 +3,14 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_0200C738.h" typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; - UnkStruct_02009DC8 * unk_1A0[5][4]; + UnkStruct_02009714 *unk_190[4]; + UnkStruct_02009DC8 *unk_1A0[5][4]; } UnkStruct_ov111_021D2F80; #endif // POKEPLATINUM_STRUCT_OV111_021D2F80_H diff --git a/include/overlay112/ov112_0225C700.h b/include/overlay112/ov112_0225C700.h index b0de66a693..c0ff79c2a4 100644 --- a/include/overlay112/ov112_0225C700.h +++ b/include/overlay112/ov112_0225C700.h @@ -1,9 +1,8 @@ #ifndef POKEPLATINUM_OV112_0225C700_H #define POKEPLATINUM_OV112_0225C700_H - -int ov112_0225C700(OverlayManager * param0, int * param1); -int ov112_0225C7C4(OverlayManager * param0, int * param1); -int ov112_0225C8FC(OverlayManager * param0, int * param1); +int ov112_0225C700(OverlayManager *param0, int *param1); +int ov112_0225C7C4(OverlayManager *param0, int *param1); +int ov112_0225C8FC(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV112_0225C700_H diff --git a/include/overlay113/footprint_data.h b/include/overlay113/footprint_data.h index 006f576235..b0234a5582 100644 --- a/include/overlay113/footprint_data.h +++ b/include/overlay113/footprint_data.h @@ -7,5 +7,4 @@ typedef struct FootprintData { u16 unk_02; } FootprintData; -#endif // POKEPLATINUM_FOOTPRINT_DATA_H - +#endif // POKEPLATINUM_FOOTPRINT_DATA_H diff --git a/include/overlay113/ov113_0225C700.h b/include/overlay113/ov113_0225C700.h index d79a27ef0d..9f3722c163 100644 --- a/include/overlay113/ov113_0225C700.h +++ b/include/overlay113/ov113_0225C700.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_OV113_0225C700_H #define POKEPLATINUM_OV113_0225C700_H -#include "overlay_manager.h" #include "overlay113/struct_ov113_0225DBCC_decl.h" #include "overlay113/struct_ov113_022607EC.h" #include "overlay113/struct_ov113_02260818.h" -int ov113_0225C700(OverlayManager * param0, int * param1); -int ov113_0225CA04(OverlayManager * param0, int * param1); -int ov113_0225CDFC(OverlayManager * param0, int * param1); -UnkStruct_ov113_022607EC * ov113_0225DD44(UnkStruct_ov113_0225DBCC * param0); -BOOL ov113_0225DDC0(UnkStruct_ov113_0225DBCC * param0, const UnkStruct_ov113_02260818 * param1, s32 param2); -void ov113_0225E044(UnkStruct_ov113_0225DBCC * param0, s32 param1); -void ov113_0225E05C(UnkStruct_ov113_0225DBCC * param0, u32 param1); +#include "overlay_manager.h" + +int ov113_0225C700(OverlayManager *param0, int *param1); +int ov113_0225CA04(OverlayManager *param0, int *param1); +int ov113_0225CDFC(OverlayManager *param0, int *param1); +UnkStruct_ov113_022607EC *ov113_0225DD44(UnkStruct_ov113_0225DBCC *param0); +BOOL ov113_0225DDC0(UnkStruct_ov113_0225DBCC *param0, const UnkStruct_ov113_02260818 *param1, s32 param2); +void ov113_0225E044(UnkStruct_ov113_0225DBCC *param0, s32 param1); +void ov113_0225E05C(UnkStruct_ov113_0225DBCC *param0, u32 param1); #endif // POKEPLATINUM_OV113_0225C700_H diff --git a/include/overlay113/ov113_0225E368.h b/include/overlay113/ov113_0225E368.h index 74fd6fdd0b..730e5f2c85 100644 --- a/include/overlay113/ov113_0225E368.h +++ b/include/overlay113/ov113_0225E368.h @@ -2,17 +2,19 @@ #define POKEPLATINUM_OV113_0225E368_H #include "struct_decls/struct_02006C24_decl.h" -#include "camera.h" + #include "overlay113/struct_ov113_0225DBCC_decl.h" #include "overlay113/struct_ov113_0225EB20.h" #include "overlay113/struct_ov113_02260818.h" -void ov113_0225E368(UnkStruct_ov113_0225EB20 * param0, BOOL param1); -void ov113_0225E378(UnkStruct_ov113_0225EB20 * param0); -BOOL ov113_0225E398(UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225EB20 * param1, const UnkStruct_ov113_02260818 * param2, NARC * param3, NARC * param4, BOOL param5); -void ov113_0225E3F0(UnkStruct_ov113_0225EB20 * param0, Camera * camera, int param2, int param3); -void ov113_0225E4A0(UnkStruct_ov113_0225EB20 * param0); -void ov113_0225E4E8(UnkStruct_ov113_0225EB20 * param0); -void ov113_0225E65C(UnkStruct_ov113_0225EB20 * param0, int param1); +#include "camera.h" + +void ov113_0225E368(UnkStruct_ov113_0225EB20 *param0, BOOL param1); +void ov113_0225E378(UnkStruct_ov113_0225EB20 *param0); +BOOL ov113_0225E398(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_0225EB20 *param1, const UnkStruct_ov113_02260818 *param2, NARC *param3, NARC *param4, BOOL param5); +void ov113_0225E3F0(UnkStruct_ov113_0225EB20 *param0, Camera *camera, int param2, int param3); +void ov113_0225E4A0(UnkStruct_ov113_0225EB20 *param0); +void ov113_0225E4E8(UnkStruct_ov113_0225EB20 *param0); +void ov113_0225E65C(UnkStruct_ov113_0225EB20 *param0, int param1); #endif // POKEPLATINUM_OV113_0225E368_H diff --git a/include/overlay113/ov113_02260620.h b/include/overlay113/ov113_02260620.h index 1cb2437bce..fed00bfc00 100644 --- a/include/overlay113/ov113_02260620.h +++ b/include/overlay113/ov113_02260620.h @@ -1,16 +1,18 @@ #ifndef POKEPLATINUM_OV113_02260620_H #define POKEPLATINUM_OV113_02260620_H -#include "message.h" -#include "string_template.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay113/struct_ov113_02260818.h" -void ov113_02260620(MessageLoader * param0, StringTemplate * param1, Window param2[], UnkStruct_ov66_0222DFF8 * param3, s32 param4); +#include "message.h" +#include "string_template.h" + +void ov113_02260620(MessageLoader *param0, StringTemplate *param1, Window param2[], UnkStruct_ov66_0222DFF8 *param3, s32 param4); void ov113_02260714(Window param0[], u32 param1); u16 ov113_0226072C(int param0, u32 param1); -int ov113_02260748(UnkStruct_ov113_02260818 * param0, int param1); +int ov113_02260748(UnkStruct_ov113_02260818 *param0, int param1); BOOL PokemonHasOverworldFootprint(int param0, int param1, BOOL param2); int PokemonOverworldFootprintSize(int param0, int param1); diff --git a/include/overlay113/ov113_022607D8.h b/include/overlay113/ov113_022607D8.h index c9dbb39fb6..b18b123270 100644 --- a/include/overlay113/ov113_022607D8.h +++ b/include/overlay113/ov113_022607D8.h @@ -4,7 +4,7 @@ #include "overlay113/struct_ov113_0225DBCC_decl.h" #include "overlay113/struct_ov113_02260818.h" -void ov113_022607D8(UnkStruct_ov113_0225DBCC * param0); -BOOL ov113_02260818(const UnkStruct_ov113_02260818 * param0); +void ov113_022607D8(UnkStruct_ov113_0225DBCC *param0); +BOOL ov113_02260818(const UnkStruct_ov113_02260818 *param0); #endif // POKEPLATINUM_OV113_022607D8_H diff --git a/include/overlay113/struct_ov113_0225EB20.h b/include/overlay113/struct_ov113_0225EB20.h index 906b291ac9..a5eb19cfd8 100644 --- a/include/overlay113/struct_ov113_0225EB20.h +++ b/include/overlay113/struct_ov113_0225EB20.h @@ -1,19 +1,19 @@ #ifndef POKEPLATINUM_STRUCT_OV113_0225EB20_H #define POKEPLATINUM_STRUCT_OV113_0225EB20_H +#include + #include "overlay113/struct_ov113_0225E6B8_decl.h" #include "overlay113/struct_ov113_0225EB20_sub1.h" #include "overlay113/struct_ov113_0225EDCC.h" #include "overlay113/struct_ov113_0225FD80.h" -#include - typedef struct { UnkStruct_ov113_0225EB20_sub1 unk_00; UnkStruct_ov113_0225FD80 unk_B0; - UnkStruct_ov113_0225E6B8 * unk_B4[128]; - UnkStruct_ov113_0225E6B8 * unk_2B4[128]; - NNSG3dResTex * unk_4B4[32]; + UnkStruct_ov113_0225E6B8 *unk_B4[128]; + UnkStruct_ov113_0225E6B8 *unk_2B4[128]; + NNSG3dResTex *unk_4B4[32]; u32 unk_534[2]; UnkStruct_ov113_0225EDCC unk_53C[128]; u8 unk_73C; diff --git a/include/overlay113/struct_ov113_0225FEE0.h b/include/overlay113/struct_ov113_0225FEE0.h index 6c366d51fa..2389f9efdc 100644 --- a/include/overlay113/struct_ov113_0225FEE0.h +++ b/include/overlay113/struct_ov113_0225FEE0.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV113_0225FEE0_H #define POKEPLATINUM_STRUCT_OV113_0225FEE0_H - #include typedef struct { diff --git a/include/overlay113/struct_ov113_02260394.h b/include/overlay113/struct_ov113_02260394.h index 570d357ba3..fd48775a13 100644 --- a/include/overlay113/struct_ov113_02260394.h +++ b/include/overlay113/struct_ov113_02260394.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV113_02260394_H #define POKEPLATINUM_STRUCT_OV113_02260394_H - #include typedef struct { diff --git a/include/overlay113/struct_ov113_0226046C.h b/include/overlay113/struct_ov113_0226046C.h index 7c2ffbd9cc..67cff4ef1e 100644 --- a/include/overlay113/struct_ov113_0226046C.h +++ b/include/overlay113/struct_ov113_0226046C.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV113_0226046C_H #define POKEPLATINUM_STRUCT_OV113_0226046C_H - #include typedef struct { diff --git a/include/overlay114/ov114_0225C700.h b/include/overlay114/ov114_0225C700.h index af40d759df..37b0a22fcf 100644 --- a/include/overlay114/ov114_0225C700.h +++ b/include/overlay114/ov114_0225C700.h @@ -2,8 +2,7 @@ #define POKEPLATINUM_OV114_0225C700_H #include "struct_decls/struct_020218BC_decl.h" -#include "trainer_info.h" -#include "savedata.h" + #include "overlay066/struct_ov66_02230DBC.h" #include "overlay114/struct_ov114_0225C76C.h" #include "overlay114/struct_ov114_0225C9A8.h" @@ -11,34 +10,37 @@ #include "overlay114/struct_ov114_0225D678_decl.h" #include "overlay114/struct_ov114_0225E854_decl.h" -void ov114_0225C700(UnkStruct_ov114_0225C76C * param0, BOOL param1, SaveData * param2, BOOL param3, UnkStruct_ov66_02230DBC * param4); -u32 ov114_0225C76C(const UnkStruct_ov114_0225C76C * param0, u32 param1); -u32 ov114_0225C78C(const UnkStruct_ov114_0225C76C * param0, u32 param1); -BOOL ov114_0225C7A4(const UnkStruct_ov114_0225C76C * param0, u32 param1); -TrainerInfo * ov114_0225C7CC(const UnkStruct_ov114_0225C76C * param0, u32 param1); -UnkStruct_ov114_0225D678 * ov114_0225C814(const UnkStruct_ov114_0225C76C * param0, u32 param1); -UnkStruct_ov114_0225D678 * ov114_0225C820(const UnkStruct_ov114_0225C76C * param0, u32 param1); -UnkStruct_ov114_0225D678 * ov114_0225C82C(const UnkStruct_ov114_0225C76C * param0, u32 param1); -void ov114_0225C838(UnkStruct_ov114_0225D678 * param0); -BOOL ov114_0225C8BC(const UnkStruct_ov114_0225D678 * param0); -int ov114_0225C8CC(const UnkStruct_ov114_0225D678 * param0); -UnkStruct_ov114_0225E854 * ov114_0225C8E0(const UnkStruct_ov114_0225C76C * param0, const UnkStruct_ov114_0225C9A8 * param1, u32 param2); -UnkStruct_ov114_0225E854 * ov114_0225C8EC(const UnkStruct_ov114_0225C76C * param0, const UnkStruct_ov114_0225C9A8 * param1, u32 param2); -UnkStruct_ov114_0225E854 * ov114_0225C8F8(const UnkStruct_ov114_0225C76C * param0, const UnkStruct_ov114_0225C9A8 * param1, u32 param2); -void ov114_0225C904(UnkStruct_ov114_0225E854 * param0); -BOOL ov114_0225C9A0(const UnkStruct_ov114_0225E854 * param0); -BOOL ov114_0225C9A4(const UnkStruct_ov114_0225E854 * param0); -void ov114_0225C9A8(UnkStruct_ov114_0225C9A8 * param0, u32 param1); -void ov114_0225CA24(UnkStruct_ov114_0225D678 * param0, int param1); -void ov114_0225CA2C(UnkStruct_ov114_0225E854 * param0, u32 param1, BOOL param2); -void ov114_0225CA44(UnkStruct_ov114_0225E854 * param0, BOOL param1); -BOOL ov114_0225CA54(UnkStruct_ov114_0225C76C * param0); -BOOL ov114_0225CA98(const UnkStruct_ov114_0225C76C * param0); -UnkStruct_ov114_0225CAD4 * ov114_0225CAD4(GraphicElementManager * param0, u32 param1); -void ov114_0225CB38(UnkStruct_ov114_0225CAD4 * param0); -int ov114_0225CB74(UnkStruct_ov114_0225CAD4 * param0); -void ov114_0225CB8C(UnkStruct_ov114_0225CAD4 * param0); -void ov114_0225CBB0(UnkStruct_ov114_0225CAD4 * param0); -BOOL ov114_0225CBE0(const UnkStruct_ov114_0225CAD4 * param0); +#include "savedata.h" +#include "trainer_info.h" + +void ov114_0225C700(UnkStruct_ov114_0225C76C *param0, BOOL param1, SaveData *param2, BOOL param3, UnkStruct_ov66_02230DBC *param4); +u32 ov114_0225C76C(const UnkStruct_ov114_0225C76C *param0, u32 param1); +u32 ov114_0225C78C(const UnkStruct_ov114_0225C76C *param0, u32 param1); +BOOL ov114_0225C7A4(const UnkStruct_ov114_0225C76C *param0, u32 param1); +TrainerInfo *ov114_0225C7CC(const UnkStruct_ov114_0225C76C *param0, u32 param1); +UnkStruct_ov114_0225D678 *ov114_0225C814(const UnkStruct_ov114_0225C76C *param0, u32 param1); +UnkStruct_ov114_0225D678 *ov114_0225C820(const UnkStruct_ov114_0225C76C *param0, u32 param1); +UnkStruct_ov114_0225D678 *ov114_0225C82C(const UnkStruct_ov114_0225C76C *param0, u32 param1); +void ov114_0225C838(UnkStruct_ov114_0225D678 *param0); +BOOL ov114_0225C8BC(const UnkStruct_ov114_0225D678 *param0); +int ov114_0225C8CC(const UnkStruct_ov114_0225D678 *param0); +UnkStruct_ov114_0225E854 *ov114_0225C8E0(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2); +UnkStruct_ov114_0225E854 *ov114_0225C8EC(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2); +UnkStruct_ov114_0225E854 *ov114_0225C8F8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2); +void ov114_0225C904(UnkStruct_ov114_0225E854 *param0); +BOOL ov114_0225C9A0(const UnkStruct_ov114_0225E854 *param0); +BOOL ov114_0225C9A4(const UnkStruct_ov114_0225E854 *param0); +void ov114_0225C9A8(UnkStruct_ov114_0225C9A8 *param0, u32 param1); +void ov114_0225CA24(UnkStruct_ov114_0225D678 *param0, int param1); +void ov114_0225CA2C(UnkStruct_ov114_0225E854 *param0, u32 param1, BOOL param2); +void ov114_0225CA44(UnkStruct_ov114_0225E854 *param0, BOOL param1); +BOOL ov114_0225CA54(UnkStruct_ov114_0225C76C *param0); +BOOL ov114_0225CA98(const UnkStruct_ov114_0225C76C *param0); +UnkStruct_ov114_0225CAD4 *ov114_0225CAD4(GraphicElementManager *param0, u32 param1); +void ov114_0225CB38(UnkStruct_ov114_0225CAD4 *param0); +int ov114_0225CB74(UnkStruct_ov114_0225CAD4 *param0); +void ov114_0225CB8C(UnkStruct_ov114_0225CAD4 *param0); +void ov114_0225CBB0(UnkStruct_ov114_0225CAD4 *param0); +BOOL ov114_0225CBE0(const UnkStruct_ov114_0225CAD4 *param0); #endif // POKEPLATINUM_OV114_0225C700_H diff --git a/include/overlay114/ov114_02260038.h b/include/overlay114/ov114_02260038.h index aa3582c01c..52a7b409d7 100644 --- a/include/overlay114/ov114_02260038.h +++ b/include/overlay114/ov114_02260038.h @@ -3,7 +3,7 @@ #include "struct_defs/struct_02039A58.h" -const CommCmdTable * ov114_02260038(void); +const CommCmdTable *ov114_02260038(void); int ov114_02260040(void); #endif // POKEPLATINUM_OV114_02260038_H diff --git a/include/overlay114/ov114_02260044.h b/include/overlay114/ov114_02260044.h index 12a5ae3abb..234c427501 100644 --- a/include/overlay114/ov114_02260044.h +++ b/include/overlay114/ov114_02260044.h @@ -4,14 +4,14 @@ #include "overlay114/struct_ov114_0225D678_decl.h" #include "overlay114/struct_ov114_0225E854_decl.h" -void ov114_02260044(UnkStruct_ov114_0225E854 * param0); -void ov114_02260060(UnkStruct_ov114_0225D678 * param0); +void ov114_02260044(UnkStruct_ov114_0225E854 *param0); +void ov114_02260060(UnkStruct_ov114_0225D678 *param0); int ov114_0226007C(void); int ov114_02260080(void); -void ov114_02260084(int param0, int param1, void * param2, void * param3); -void ov114_02260090(int param0, int param1, void * param2, void * param3); -void ov114_022600A0(int param0, int param1, void * param2, void * param3); -void ov114_022600B0(int param0, int param1, void * param2, void * param3); -void ov114_022600BC(int param0, int param1, void * param2, void * param3); +void ov114_02260084(int param0, int param1, void *param2, void *param3); +void ov114_02260090(int param0, int param1, void *param2, void *param3); +void ov114_022600A0(int param0, int param1, void *param2, void *param3); +void ov114_022600B0(int param0, int param1, void *param2, void *param3); +void ov114_022600BC(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_OV114_02260044_H diff --git a/include/overlay114/struct_ov114_0225C76C.h b/include/overlay114/struct_ov114_0225C76C.h index 41fa5df741..81c14ef51e 100644 --- a/include/overlay114/struct_ov114_0225C76C.h +++ b/include/overlay114/struct_ov114_0225C76C.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_OV114_0225C76C_H #define POKEPLATINUM_STRUCT_OV114_0225C76C_H -#include "savedata.h" #include "overlay066/struct_ov66_02230DBC.h" +#include "savedata.h" + typedef struct { - SaveData * unk_00; + SaveData *unk_00; u8 unk_04[4]; u8 unk_08; u8 unk_09; u8 unk_0A; u8 unk_0B; - UnkStruct_ov66_02230DBC * unk_0C; + UnkStruct_ov66_02230DBC *unk_0C; } UnkStruct_ov114_0225C76C; #endif // POKEPLATINUM_STRUCT_OV114_0225C76C_H diff --git a/include/overlay115/ov115_02260440.h b/include/overlay115/ov115_02260440.h index 9a24994e5a..9042bdbf1f 100644 --- a/include/overlay115/ov115_02260440.h +++ b/include/overlay115/ov115_02260440.h @@ -1,22 +1,23 @@ #ifndef POKEPLATINUM_OV115_02260440_H #define POKEPLATINUM_OV115_02260440_H -#include "overlay_manager.h" #include "overlay115/struct_ov115_0226095C_decl.h" #include "overlay115/struct_ov115_02265AD0.h" #include "overlay115/struct_ov115_02265AD4.h" -int ov115_02260440(OverlayManager * param0, int * param1); -int ov115_0226048C(OverlayManager * param0, int * param1); -int ov115_022608E4(OverlayManager * param0, int * param1); -void ov115_0226095C(UnkStruct_ov115_0226095C * param0); -void ov115_02260964(UnkStruct_ov115_0226095C * param0); -void ov115_0226096C(UnkStruct_ov115_0226095C * param0, const UnkStruct_ov115_02265AD0 * param1, u32 param2); -void ov115_02260988(UnkStruct_ov115_0226095C * param0, const UnkStruct_ov115_02265AD0 * param1, u32 param2); -void ov115_02260994(UnkStruct_ov115_0226095C * param0, u32 param1, u32 param2); -void ov115_022609B4(UnkStruct_ov115_0226095C * param0, const UnkStruct_ov115_02265AD4 * param1, u32 param2); -void ov115_022609D8(UnkStruct_ov115_0226095C * param0, u32 param1); -void ov115_022609E4(UnkStruct_ov115_0226095C * param0, u32 param1, u32 param2); -void ov115_02260A48(UnkStruct_ov115_0226095C * param0); +#include "overlay_manager.h" + +int ov115_02260440(OverlayManager *param0, int *param1); +int ov115_0226048C(OverlayManager *param0, int *param1); +int ov115_022608E4(OverlayManager *param0, int *param1); +void ov115_0226095C(UnkStruct_ov115_0226095C *param0); +void ov115_02260964(UnkStruct_ov115_0226095C *param0); +void ov115_0226096C(UnkStruct_ov115_0226095C *param0, const UnkStruct_ov115_02265AD0 *param1, u32 param2); +void ov115_02260988(UnkStruct_ov115_0226095C *param0, const UnkStruct_ov115_02265AD0 *param1, u32 param2); +void ov115_02260994(UnkStruct_ov115_0226095C *param0, u32 param1, u32 param2); +void ov115_022609B4(UnkStruct_ov115_0226095C *param0, const UnkStruct_ov115_02265AD4 *param1, u32 param2); +void ov115_022609D8(UnkStruct_ov115_0226095C *param0, u32 param1); +void ov115_022609E4(UnkStruct_ov115_0226095C *param0, u32 param1, u32 param2); +void ov115_02260A48(UnkStruct_ov115_0226095C *param0); #endif // POKEPLATINUM_OV115_02260440_H diff --git a/include/overlay115/ov115_02260BBC.h b/include/overlay115/ov115_02260BBC.h index 8306ad087c..70ffa641ac 100644 --- a/include/overlay115/ov115_02260BBC.h +++ b/include/overlay115/ov115_02260BBC.h @@ -6,15 +6,15 @@ #include "overlay115/struct_ov115_02265AD0.h" #include "overlay115/struct_ov115_02265AD4.h" -UnkStruct_ov115_02260BE4 * ov115_02260BBC(u32 param0, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 * param3); -void ov115_02260BE4(UnkStruct_ov115_02260BE4 * param0); -BOOL ov115_02260BEC(UnkStruct_ov115_02260BE4 * param0); -BOOL ov115_02260C54(const UnkStruct_ov115_02260BE4 * param0); -void ov115_02260C5C(UnkStruct_ov115_02260BE4 * param0); -u32 ov115_02260C64(const UnkStruct_ov115_02260BE4 * param0); -void ov115_02260C6C(UnkStruct_ov115_02260BE4 * param0, const UnkStruct_ov115_02265AD0 * param1, u32 param2); -void ov115_02260C7C(UnkStruct_ov115_02260BE4 * param0, u32 param1, u32 param2); -BOOL ov115_02260CA4(const UnkStruct_ov115_02260BE4 * param0); -void ov115_02260CBC(UnkStruct_ov115_02260BE4 * param0, UnkStruct_ov115_02265AD4 * param1); +UnkStruct_ov115_02260BE4 *ov115_02260BBC(u32 param0, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3); +void ov115_02260BE4(UnkStruct_ov115_02260BE4 *param0); +BOOL ov115_02260BEC(UnkStruct_ov115_02260BE4 *param0); +BOOL ov115_02260C54(const UnkStruct_ov115_02260BE4 *param0); +void ov115_02260C5C(UnkStruct_ov115_02260BE4 *param0); +u32 ov115_02260C64(const UnkStruct_ov115_02260BE4 *param0); +void ov115_02260C6C(UnkStruct_ov115_02260BE4 *param0, const UnkStruct_ov115_02265AD0 *param1, u32 param2); +void ov115_02260C7C(UnkStruct_ov115_02260BE4 *param0, u32 param1, u32 param2); +BOOL ov115_02260CA4(const UnkStruct_ov115_02260BE4 *param0); +void ov115_02260CBC(UnkStruct_ov115_02260BE4 *param0, UnkStruct_ov115_02265AD4 *param1); #endif // POKEPLATINUM_OV115_02260BBC_H diff --git a/include/overlay115/ov115_02260CEC.h b/include/overlay115/ov115_02260CEC.h index 0899606c9a..2335c6aeaa 100644 --- a/include/overlay115/ov115_02260CEC.h +++ b/include/overlay115/ov115_02260CEC.h @@ -7,19 +7,19 @@ #include "overlay115/struct_ov115_02265AD0.h" #include "overlay115/struct_ov115_02265AD4.h" -UnkStruct_ov115_02260D78 * ov115_02260CEC(u32 param0, u32 param1, u32 param2, u32 param3, UnkStruct_ov115_02262F50 * param4); -void ov115_02260D78(UnkStruct_ov115_02260D78 * param0); -BOOL ov115_02260DAC(UnkStruct_ov115_02260D78 * param0, u32 param1); -BOOL ov115_02260F70(UnkStruct_ov115_02260D78 * param0, u32 param1); -BOOL ov115_022610D4(UnkStruct_ov115_02260D78 * param0); -void ov115_022611C8(UnkStruct_ov115_02260D78 * param0); -s32 ov115_022611E0(const UnkStruct_ov115_02260D78 * param0); -void ov115_022611E4(UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02265AD0 * param1); -BOOL ov115_02261224(UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02265AD0 * param1); -void ov115_02261260(UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02265AD4 * param1); -u32 ov115_02261274(const UnkStruct_ov115_02260D78 * param0); -void ov115_02261278(UnkStruct_ov115_02260D78 * param0, u32 param1); -void ov115_022612AC(UnkStruct_ov115_02260D78 * param0, u32 param1, u32 param2); -void ov115_022612BC(UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_022612BC * param1); +UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 param0, u32 param1, u32 param2, u32 param3, UnkStruct_ov115_02262F50 *param4); +void ov115_02260D78(UnkStruct_ov115_02260D78 *param0); +BOOL ov115_02260DAC(UnkStruct_ov115_02260D78 *param0, u32 param1); +BOOL ov115_02260F70(UnkStruct_ov115_02260D78 *param0, u32 param1); +BOOL ov115_022610D4(UnkStruct_ov115_02260D78 *param0); +void ov115_022611C8(UnkStruct_ov115_02260D78 *param0); +s32 ov115_022611E0(const UnkStruct_ov115_02260D78 *param0); +void ov115_022611E4(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_02265AD0 *param1); +BOOL ov115_02261224(UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02265AD0 *param1); +void ov115_02261260(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_02265AD4 *param1); +u32 ov115_02261274(const UnkStruct_ov115_02260D78 *param0); +void ov115_02261278(UnkStruct_ov115_02260D78 *param0, u32 param1); +void ov115_022612AC(UnkStruct_ov115_02260D78 *param0, u32 param1, u32 param2); +void ov115_022612BC(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_022612BC *param1); #endif // POKEPLATINUM_OV115_02260CEC_H diff --git a/include/overlay115/ov115_02265A18.h b/include/overlay115/ov115_02265A18.h index 6d82753512..0faf3dd42b 100644 --- a/include/overlay115/ov115_02265A18.h +++ b/include/overlay115/ov115_02265A18.h @@ -3,7 +3,7 @@ #include "struct_defs/struct_02039A58.h" -const CommCmdTable * ov115_02265A18(void); +const CommCmdTable *ov115_02265A18(void); int ov115_02265A20(void); #endif // POKEPLATINUM_OV115_02265A18_H diff --git a/include/overlay115/ov115_02265A24.h b/include/overlay115/ov115_02265A24.h index 72d975e2cd..4b0d29705d 100644 --- a/include/overlay115/ov115_02265A24.h +++ b/include/overlay115/ov115_02265A24.h @@ -3,16 +3,16 @@ #include "overlay115/struct_ov115_0226095C_decl.h" -void ov115_02265A24(UnkStruct_ov115_0226095C * param0); +void ov115_02265A24(UnkStruct_ov115_0226095C *param0); int ov115_02265A40(void); -void ov115_02265A44(int param0, int param1, void * param2, void * param3); -void ov115_02265A50(int param0, int param1, void * param2, void * param3); -void ov115_02265A5C(int param0, int param1, void * param2, void * param3); -void ov115_02265A84(int param0, int param1, void * param2, void * param3); -void ov115_02265A94(int param0, int param1, void * param2, void * param3); -void ov115_02265AA4(int param0, int param1, void * param2, void * param3); -void ov115_02265AB4(int param0, int param1, void * param2, void * param3); -void ov115_02265AC0(int param0, int param1, void * param2, void * param3); +void ov115_02265A44(int param0, int param1, void *param2, void *param3); +void ov115_02265A50(int param0, int param1, void *param2, void *param3); +void ov115_02265A5C(int param0, int param1, void *param2, void *param3); +void ov115_02265A84(int param0, int param1, void *param2, void *param3); +void ov115_02265A94(int param0, int param1, void *param2, void *param3); +void ov115_02265AA4(int param0, int param1, void *param2, void *param3); +void ov115_02265AB4(int param0, int param1, void *param2, void *param3); +void ov115_02265AC0(int param0, int param1, void *param2, void *param3); int ov115_02265AD0(void); int ov115_02265AD4(void); int ov115_02265AD8(void); diff --git a/include/overlay115/struct_ov115_02260440.h b/include/overlay115/struct_ov115_02260440.h index 77369b5215..fcd9b15fd9 100644 --- a/include/overlay115/struct_ov115_02260440.h +++ b/include/overlay115/struct_ov115_02260440.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV115_02260440_H #define POKEPLATINUM_STRUCT_OV115_02260440_H -#include "savedata.h" #include "overlay066/struct_ov66_02230DBC.h" +#include "savedata.h" + typedef struct { UnkStruct_ov66_02230DBC unk_00; - SaveData * unk_34; + SaveData *unk_34; u8 unk_38; u8 unk_39; u8 padding[2]; diff --git a/include/overlay115/struct_ov115_02261520.h b/include/overlay115/struct_ov115_02261520.h index acc469df2b..327eb131d6 100644 --- a/include/overlay115/struct_ov115_02261520.h +++ b/include/overlay115/struct_ov115_02261520.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV115_02261520_H #define POKEPLATINUM_STRUCT_OV115_02261520_H +#include + #include "struct_decls/struct_020218BC_decl.h" -#include "overlay019/struct_ov19_021DA864.h" -#include +#include "overlay019/struct_ov19_021DA864.h" typedef struct { - GraphicElementManager * unk_00; - const UnkStruct_ov19_021DA864 * unk_04; + GraphicElementManager *unk_00; + const UnkStruct_ov19_021DA864 *unk_04; VecFx32 unk_08; VecFx32 unk_14; u16 unk_20; diff --git a/include/overlay115/struct_ov115_02262F50.h b/include/overlay115/struct_ov115_02262F50.h index 0ffe71ccb8..9e931b1afc 100644 --- a/include/overlay115/struct_ov115_02262F50.h +++ b/include/overlay115/struct_ov115_02262F50.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_OV115_02262F50_H #define POKEPLATINUM_STRUCT_OV115_02262F50_H -#include "trainer_info.h" #include "overlay115/struct_ov115_02262DC4.h" +#include "trainer_info.h" + typedef struct { u32 unk_00; - UnkStruct_ov115_02262DC4 * unk_04; - const TrainerInfo * unk_08[4]; + UnkStruct_ov115_02262DC4 *unk_04; + const TrainerInfo *unk_08[4]; u32 unk_18[4]; } UnkStruct_ov115_02262F50; diff --git a/include/overlay115/struct_ov115_02265AD0.h b/include/overlay115/struct_ov115_02265AD0.h index 3e225c2079..726b67b7ce 100644 --- a/include/overlay115/struct_ov115_02265AD0.h +++ b/include/overlay115/struct_ov115_02265AD0.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV115_02265AD0_H #define POKEPLATINUM_STRUCT_OV115_02265AD0_H - #include typedef struct { diff --git a/include/overlay116/ov116_02260440.h b/include/overlay116/ov116_02260440.h index 7a9dc9aecf..7d39933799 100644 --- a/include/overlay116/ov116_02260440.h +++ b/include/overlay116/ov116_02260440.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_OV116_02260440_H #include "struct_defs/struct_02039A58.h" + #include "overlay116/struct_ov116_0226139C.h" -const CommCmdTable * ov116_0226049C(void); +const CommCmdTable *ov116_0226049C(void); int ov116_022604A4(void); -void ov116_022604A8(UnkStruct_ov116_0226139C * param0); +void ov116_022604A8(UnkStruct_ov116_0226139C *param0); #endif // POKEPLATINUM_OV116_02260440_H diff --git a/include/overlay116/ov116_022604C4.h b/include/overlay116/ov116_022604C4.h index 6524910df5..a297fa5daf 100644 --- a/include/overlay116/ov116_022604C4.h +++ b/include/overlay116/ov116_022604C4.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_OV116_022604C4_H #define POKEPLATINUM_OV116_022604C4_H -#include "overlay_manager.h" #include "overlay116/struct_ov116_0226139C.h" -int ov116_022609B4(OverlayManager * param0, int * param1); -int ov116_02260CF4(OverlayManager * param0, int * param1); -int ov116_0226126C(OverlayManager * param0, int * param1); -void ov116_0226139C(UnkStruct_ov116_0226139C * param0); -BOOL ov116_022617C4(UnkStruct_ov116_0226139C * param0); -void ov116_022617D4(UnkStruct_ov116_0226139C * param0); -void ov116_022617DC(UnkStruct_ov116_0226139C * param0); +#include "overlay_manager.h" + +int ov116_022609B4(OverlayManager *param0, int *param1); +int ov116_02260CF4(OverlayManager *param0, int *param1); +int ov116_0226126C(OverlayManager *param0, int *param1); +void ov116_0226139C(UnkStruct_ov116_0226139C *param0); +BOOL ov116_022617C4(UnkStruct_ov116_0226139C *param0); +void ov116_022617D4(UnkStruct_ov116_0226139C *param0); +void ov116_022617DC(UnkStruct_ov116_0226139C *param0); #endif // POKEPLATINUM_OV116_022604C4_H diff --git a/include/overlay116/ov116_02261870.h b/include/overlay116/ov116_02261870.h index 83a14ebee9..d157c7cfc6 100644 --- a/include/overlay116/ov116_02261870.h +++ b/include/overlay116/ov116_02261870.h @@ -1,44 +1,45 @@ #ifndef POKEPLATINUM_OV116_02261870_H #define POKEPLATINUM_OV116_02261870_H -#include "struct_decls/struct_02006C24_decl.h" +#include + #include "struct_decls/cell_actor_data.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_defs/struct_02017294.h" + #include "overlay116/struct_ov116_0226139C.h" #include "overlay116/struct_ov116_02262A8C.h" #include "overlay116/struct_ov116_0226501C.h" -#include - -void ov116_02261870(UnkStruct_02017294 * param0, MtxFx43 * param1, VecFx32 * param2); -void ov116_022618A8(UnkStruct_ov116_0226501C * param0, NARC * param1, int param2); -void ov116_022618B4(UnkStruct_ov116_0226501C * param0, int param1); -void ov116_0226192C(UnkStruct_ov116_0226501C * param0); -void ov116_02261940(UnkStruct_ov116_0226139C * param0); -void ov116_02261C48(UnkStruct_ov116_02262A8C * param0, int param1); -void ov116_02261C88(UnkStruct_ov116_0226139C * param0); -void ov116_02261D08(UnkStruct_ov116_02262A8C * param0); -void ov116_02261D70(UnkStruct_ov116_02262A8C * param0); -void ov116_02261DF0(UnkStruct_ov116_02262A8C * param0); -void ov116_02261E0C(UnkStruct_ov116_02262A8C * param0, BOOL param1, int param2); -void ov116_02261E28(UnkStruct_ov116_02262A8C * param0); -void ov116_02261E40(UnkStruct_ov116_02262A8C * param0); -void ov116_02261E58(UnkStruct_ov116_02262A8C * param0, int param1, int param2); -int ov116_02261EA4(UnkStruct_ov116_02262A8C * param0, int param1); -void ov116_02261F08(UnkStruct_ov116_02262A8C * param0); -void ov116_02261F3C(UnkStruct_ov116_02262A8C * param0); -void ov116_02261F70(UnkStruct_ov116_02262A8C * param0); -void ov116_02262004(UnkStruct_ov116_02262A8C * param0); -void ov116_02262034(UnkStruct_ov116_0226139C * param0, int param1); -void ov116_022620AC(UnkStruct_ov116_0226139C * param0, UnkStruct_ov116_02262A8C * param1); -void ov116_02262264(UnkStruct_ov116_02262A8C * param0); -void ov116_022622C8(UnkStruct_ov116_0226139C * param0); -void ov116_022625A8(UnkStruct_ov116_0226139C * param0, UnkStruct_ov116_02262A8C * param1); -CellActorData * ov116_022626E8(UnkStruct_ov116_02262A8C * param0, s16 param1, s16 param2); -void ov116_02262724(UnkStruct_ov116_02262A8C * param0); -void ov116_0226281C(UnkStruct_ov116_02262A8C * param0); -void ov116_02262840(UnkStruct_ov116_02262A8C * param0); -void ov116_022628AC(UnkStruct_ov116_02262A8C * param0); -void ov116_022628B8(UnkStruct_ov116_0226139C * param0); +void ov116_02261870(UnkStruct_02017294 *param0, MtxFx43 *param1, VecFx32 *param2); +void ov116_022618A8(UnkStruct_ov116_0226501C *param0, NARC *param1, int param2); +void ov116_022618B4(UnkStruct_ov116_0226501C *param0, int param1); +void ov116_0226192C(UnkStruct_ov116_0226501C *param0); +void ov116_02261940(UnkStruct_ov116_0226139C *param0); +void ov116_02261C48(UnkStruct_ov116_02262A8C *param0, int param1); +void ov116_02261C88(UnkStruct_ov116_0226139C *param0); +void ov116_02261D08(UnkStruct_ov116_02262A8C *param0); +void ov116_02261D70(UnkStruct_ov116_02262A8C *param0); +void ov116_02261DF0(UnkStruct_ov116_02262A8C *param0); +void ov116_02261E0C(UnkStruct_ov116_02262A8C *param0, BOOL param1, int param2); +void ov116_02261E28(UnkStruct_ov116_02262A8C *param0); +void ov116_02261E40(UnkStruct_ov116_02262A8C *param0); +void ov116_02261E58(UnkStruct_ov116_02262A8C *param0, int param1, int param2); +int ov116_02261EA4(UnkStruct_ov116_02262A8C *param0, int param1); +void ov116_02261F08(UnkStruct_ov116_02262A8C *param0); +void ov116_02261F3C(UnkStruct_ov116_02262A8C *param0); +void ov116_02261F70(UnkStruct_ov116_02262A8C *param0); +void ov116_02262004(UnkStruct_ov116_02262A8C *param0); +void ov116_02262034(UnkStruct_ov116_0226139C *param0, int param1); +void ov116_022620AC(UnkStruct_ov116_0226139C *param0, UnkStruct_ov116_02262A8C *param1); +void ov116_02262264(UnkStruct_ov116_02262A8C *param0); +void ov116_022622C8(UnkStruct_ov116_0226139C *param0); +void ov116_022625A8(UnkStruct_ov116_0226139C *param0, UnkStruct_ov116_02262A8C *param1); +CellActorData *ov116_022626E8(UnkStruct_ov116_02262A8C *param0, s16 param1, s16 param2); +void ov116_02262724(UnkStruct_ov116_02262A8C *param0); +void ov116_0226281C(UnkStruct_ov116_02262A8C *param0); +void ov116_02262840(UnkStruct_ov116_02262A8C *param0); +void ov116_022628AC(UnkStruct_ov116_02262A8C *param0); +void ov116_022628B8(UnkStruct_ov116_0226139C *param0); #endif // POKEPLATINUM_OV116_02261870_H diff --git a/include/overlay116/ov116_02262A44.h b/include/overlay116/ov116_02262A44.h index 42f1cc6cbd..f7a526a26a 100644 --- a/include/overlay116/ov116_02262A44.h +++ b/include/overlay116/ov116_02262A44.h @@ -4,8 +4,8 @@ #include "overlay116/struct_ov116_02262A44.h" #include "overlay116/struct_ov116_022649E4.h" -UnkStruct_ov116_02262A44 * ov116_02262A44(int param0, UnkStruct_ov116_022649E4 * param1); -void ov116_02262A6C(UnkStruct_ov116_02262A44 * param0); -BOOL ov116_02262A74(UnkStruct_ov116_02262A44 * param0); +UnkStruct_ov116_02262A44 *ov116_02262A44(int param0, UnkStruct_ov116_022649E4 *param1); +void ov116_02262A6C(UnkStruct_ov116_02262A44 *param0); +BOOL ov116_02262A74(UnkStruct_ov116_02262A44 *param0); #endif // POKEPLATINUM_OV116_02262A44_H diff --git a/include/overlay116/ov116_02262A8C.h b/include/overlay116/ov116_02262A8C.h index 4d7f78d49d..6469da5e2f 100644 --- a/include/overlay116/ov116_02262A8C.h +++ b/include/overlay116/ov116_02262A8C.h @@ -1,21 +1,22 @@ #ifndef POKEPLATINUM_OV116_02262A8C_H #define POKEPLATINUM_OV116_02262A8C_H -#include "sys_task_manager.h" #include "overlay116/struct_ov116_02262A8C.h" #include "overlay116/struct_ov116_022649E4.h" -UnkStruct_ov116_02262A8C * ov116_02262A8C(int param0, u32 param1, UnkStruct_ov116_022649E4 * param2); -void ov116_02262AE4(UnkStruct_ov116_02262A8C * param0); -void ov116_02262C64(UnkStruct_ov116_02262A8C * param0); -BOOL ov116_02262C6C(UnkStruct_ov116_02262A8C * param0, int * param1); -void ov116_02262C84(UnkStruct_ov116_02262A8C * param0); -void ov116_02262E50(SysTask * param0, void * param1); -void ov116_02263158(SysTask * param0, void * param1); -void ov116_02263B30(UnkStruct_ov116_02262A8C * param0); -void ov116_02263BA0(UnkStruct_ov116_02262A8C * param0); -void ov116_02263DB8(UnkStruct_ov116_02262A8C * param0); -void ov116_02263DE8(UnkStruct_ov116_02262A8C * param0); -void ov116_02263E20(UnkStruct_ov116_02262A8C * param0); +#include "sys_task_manager.h" + +UnkStruct_ov116_02262A8C *ov116_02262A8C(int param0, u32 param1, UnkStruct_ov116_022649E4 *param2); +void ov116_02262AE4(UnkStruct_ov116_02262A8C *param0); +void ov116_02262C64(UnkStruct_ov116_02262A8C *param0); +BOOL ov116_02262C6C(UnkStruct_ov116_02262A8C *param0, int *param1); +void ov116_02262C84(UnkStruct_ov116_02262A8C *param0); +void ov116_02262E50(SysTask *param0, void *param1); +void ov116_02263158(SysTask *param0, void *param1); +void ov116_02263B30(UnkStruct_ov116_02262A8C *param0); +void ov116_02263BA0(UnkStruct_ov116_02262A8C *param0); +void ov116_02263DB8(UnkStruct_ov116_02262A8C *param0); +void ov116_02263DE8(UnkStruct_ov116_02262A8C *param0); +void ov116_02263E20(UnkStruct_ov116_02262A8C *param0); #endif // POKEPLATINUM_OV116_02262A8C_H diff --git a/include/overlay116/ov116_0226432C.h b/include/overlay116/ov116_0226432C.h index 0c0782280b..ca51553469 100644 --- a/include/overlay116/ov116_0226432C.h +++ b/include/overlay116/ov116_0226432C.h @@ -6,16 +6,16 @@ #include "overlay116/struct_ov116_0226469C.h" #include "overlay116/struct_ov116_0226501C.h" -BOOL ov116_0226432C(UnkStruct_ov116_0226501C * param0, int param1, int param2, int param3, int param4, f32 param5, BOOL param6); -BOOL ov116_0226452C(UnkStruct_ov116_0226501C * param0, f32 param1); -int ov116_02264680(UnkStruct_ov116_0226139C * param0, int param1); -void ov116_0226469C(UnkStruct_ov116_0226469C * param0, fx32 param1, fx32 param2, fx32 param3, int param4); -BOOL ov116_022646FC(UnkStruct_ov116_0226469C * param0); -void ov116_02264764(UnkStruct_ov116_0226469C * param0, fx32 param1, fx32 param2, s32 param3); -BOOL ov116_02264774(UnkStruct_ov116_0226469C * param0); -void ov116_0226493C(UnkStruct_ov116_02262A8C * param0, s16 param1, s16 param2); -void ov116_02264FEC(UnkStruct_ov116_02262A8C * param0, BOOL * param1); -void ov116_02265470(UnkStruct_ov116_02262A8C * param0); -void ov116_02265A1C(UnkStruct_ov116_02262A8C * param0); +BOOL ov116_0226432C(UnkStruct_ov116_0226501C *param0, int param1, int param2, int param3, int param4, f32 param5, BOOL param6); +BOOL ov116_0226452C(UnkStruct_ov116_0226501C *param0, f32 param1); +int ov116_02264680(UnkStruct_ov116_0226139C *param0, int param1); +void ov116_0226469C(UnkStruct_ov116_0226469C *param0, fx32 param1, fx32 param2, fx32 param3, int param4); +BOOL ov116_022646FC(UnkStruct_ov116_0226469C *param0); +void ov116_02264764(UnkStruct_ov116_0226469C *param0, fx32 param1, fx32 param2, s32 param3); +BOOL ov116_02264774(UnkStruct_ov116_0226469C *param0); +void ov116_0226493C(UnkStruct_ov116_02262A8C *param0, s16 param1, s16 param2); +void ov116_02264FEC(UnkStruct_ov116_02262A8C *param0, BOOL *param1); +void ov116_02265470(UnkStruct_ov116_02262A8C *param0); +void ov116_02265A1C(UnkStruct_ov116_02262A8C *param0); #endif // POKEPLATINUM_OV116_0226432C_H diff --git a/include/overlay116/ov116_02266FEC.h b/include/overlay116/ov116_02266FEC.h index 52bc31223d..31446cbcbd 100644 --- a/include/overlay116/ov116_02266FEC.h +++ b/include/overlay116/ov116_02266FEC.h @@ -1,19 +1,19 @@ #ifndef POKEPLATINUM_OV116_02266FEC_H #define POKEPLATINUM_OV116_02266FEC_H +#include + #include "overlay116/union_ov116_02266FEC.h" #include "overlay116/union_ov116_022671EC.h" -#include - -void ov116_02266FEC(UnkUnion_ov116_02266FEC * param0); -void ov116_02266FFC(UnkUnion_ov116_02266FEC * param0, UnkUnion_ov116_02266FEC * param1); -void ov116_0226700C(UnkUnion_ov116_02266FEC * param0, const UnkUnion_ov116_02266FEC * param1, const UnkUnion_ov116_02266FEC * param2); -f32 ov116_0226711C(const UnkUnion_ov116_02266FEC * param0); -f32 ov116_02267160(const UnkUnion_ov116_02266FEC * param0); -void ov116_022671B8(UnkUnion_ov116_02266FEC * param0, const UnkUnion_ov116_02266FEC * param1, f32 param2); -void ov116_022671EC(UnkUnion_ov116_022671EC * param0, const UnkUnion_ov116_02266FEC * param1); -void ov116_022673FC(const UnkUnion_ov116_022671EC * param0, MtxFx44 * param1); -void ov116_02267728(const UnkUnion_ov116_022671EC * param0, MtxFx43 * param1); +void ov116_02266FEC(UnkUnion_ov116_02266FEC *param0); +void ov116_02266FFC(UnkUnion_ov116_02266FEC *param0, UnkUnion_ov116_02266FEC *param1); +void ov116_0226700C(UnkUnion_ov116_02266FEC *param0, const UnkUnion_ov116_02266FEC *param1, const UnkUnion_ov116_02266FEC *param2); +f32 ov116_0226711C(const UnkUnion_ov116_02266FEC *param0); +f32 ov116_02267160(const UnkUnion_ov116_02266FEC *param0); +void ov116_022671B8(UnkUnion_ov116_02266FEC *param0, const UnkUnion_ov116_02266FEC *param1, f32 param2); +void ov116_022671EC(UnkUnion_ov116_022671EC *param0, const UnkUnion_ov116_02266FEC *param1); +void ov116_022673FC(const UnkUnion_ov116_022671EC *param0, MtxFx44 *param1); +void ov116_02267728(const UnkUnion_ov116_022671EC *param0, MtxFx43 *param1); #endif // POKEPLATINUM_OV116_02266FEC_H diff --git a/include/overlay116/struct_ov116_0226139C.h b/include/overlay116/struct_ov116_0226139C.h index acd18e43d4..c3198fe476 100644 --- a/include/overlay116/struct_ov116_0226139C.h +++ b/include/overlay116/struct_ov116_0226139C.h @@ -15,8 +15,8 @@ #include "overlay116/struct_ov116_022649E4.h" typedef struct { - UnkStruct_ov116_02262A44 * unk_00; - UnkStruct_ov116_02262A8C * unk_04; + UnkStruct_ov116_02262A44 *unk_00; + UnkStruct_ov116_02262A8C *unk_04; BOOL unk_08; BOOL unk_0C; BOOL unk_10; @@ -26,12 +26,12 @@ typedef struct { u32 unk_44; UnkStruct_ov116_022649E4 unk_48; u32 unk_78; - UnkStruct_ov114_0225CAD4 * unk_7C; - UnkStruct_ov66_02231134 * unk_80; + UnkStruct_ov114_0225CAD4 *unk_7C; + UnkStruct_ov66_02231134 *unk_80; UnkStruct_ov114_0225C76C unk_84; - UnkStruct_ov114_0225D678 * unk_94; + UnkStruct_ov114_0225D678 *unk_94; UnkStruct_ov114_0225C9A8 unk_98; - UnkStruct_ov114_0225E854 * unk_B0; + UnkStruct_ov114_0225E854 *unk_B0; int unk_B4[4]; BOOL unk_C4; } UnkStruct_ov116_0226139C; diff --git a/include/overlay116/struct_ov116_02262A44.h b/include/overlay116/struct_ov116_02262A44.h index 3e63c9b198..a9dc890f37 100644 --- a/include/overlay116/struct_ov116_02262A44.h +++ b/include/overlay116/struct_ov116_02262A44.h @@ -8,7 +8,7 @@ typedef struct { int unk_04; s16 unk_08; u8 padding_0A; - UnkStruct_ov116_022649E4 * unk_0C; + UnkStruct_ov116_022649E4 *unk_0C; } UnkStruct_ov116_02262A44; #endif // POKEPLATINUM_STRUCT_OV116_02262A44_H diff --git a/include/overlay116/struct_ov116_02262A8C.h b/include/overlay116/struct_ov116_02262A8C.h index badd9f71ee..77249acee1 100644 --- a/include/overlay116/struct_ov116_02262A8C.h +++ b/include/overlay116/struct_ov116_02262A8C.h @@ -1,8 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_OV116_02262A8C_H #define POKEPLATINUM_STRUCT_OV116_02262A8C_H +#include + #include "struct_decls/cell_actor_data.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay116/struct_ov116_02260490.h" #include "overlay116/struct_ov116_02262A8C_sub1.h" #include "overlay116/struct_ov116_02262A8C_sub2.h" @@ -13,24 +16,22 @@ #include "overlay116/struct_ov116_0226534C.h" #include "overlay116/struct_ov116_022660A8.h" -#include - typedef struct { u32 unk_00; int unk_04; int unk_08; int unk_0C; u8 padding_10[4]; - UnkStruct_ov116_022649E4 * unk_14; + UnkStruct_ov116_022649E4 *unk_14; u8 padding_18[4]; - CellActorData * unk_1C[3]; - CellActorData * unk_20[3]; - CellActorData * unk_24[3]; - CellActorData * unk_28[36]; - CellActorData * unk_B8[4]; - CellActorData * unk_C8[2]; - CellActorData * unk_D0[2]; - CellActorData * unk_D8; + CellActorData *unk_1C[3]; + CellActorData *unk_20[3]; + CellActorData *unk_24[3]; + CellActorData *unk_28[36]; + CellActorData *unk_B8[4]; + CellActorData *unk_C8[2]; + CellActorData *unk_D0[2]; + CellActorData *unk_D8; u16 unk_DC[4]; u8 padding_E4[12]; int unk_F0; diff --git a/include/overlay116/struct_ov116_02262CB8.h b/include/overlay116/struct_ov116_02262CB8.h index 24e5a82cde..0c8d9767cc 100644 --- a/include/overlay116/struct_ov116_02262CB8.h +++ b/include/overlay116/struct_ov116_02262CB8.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_OV116_02262CB8_H #include "struct_decls/cell_actor_data.h" + #include "overlay116/struct_ov116_0226469C.h" #include "overlay116/struct_ov116_022649E4.h" @@ -9,10 +10,10 @@ typedef struct { int unk_00; int unk_04; int unk_08; - CellActorData * unk_0C; - CellActorData * unk_10; + CellActorData *unk_0C; + CellActorData *unk_10; UnkStruct_ov116_0226469C unk_14; - UnkStruct_ov116_022649E4 * unk_2C; + UnkStruct_ov116_022649E4 *unk_2C; } UnkStruct_ov116_02262CB8; #endif // POKEPLATINUM_STRUCT_OV116_02262CB8_H diff --git a/include/overlay116/struct_ov116_02262D08.h b/include/overlay116/struct_ov116_02262D08.h index fad1094583..11e99c1165 100644 --- a/include/overlay116/struct_ov116_02262D08.h +++ b/include/overlay116/struct_ov116_02262D08.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_OV116_02262D08_H #include "struct_decls/cell_actor_data.h" + #include "overlay116/struct_ov116_0226469C.h" #include "overlay116/struct_ov116_022649E4.h" #include "overlay116/struct_ov116_0226501C.h" @@ -10,14 +11,14 @@ typedef struct { int unk_00; int unk_04; u8 padding_08[4]; - CellActorData * unk_0C; + CellActorData *unk_0C; UnkStruct_ov116_0226469C unk_10; int unk_28; - int * unk_2C; + int *unk_2C; BOOL unk_30; - UnkStruct_ov116_0226501C * unk_34; - UnkStruct_ov116_0226501C * unk_38; - UnkStruct_ov116_022649E4 * unk_3C; + UnkStruct_ov116_0226501C *unk_34; + UnkStruct_ov116_0226501C *unk_38; + UnkStruct_ov116_022649E4 *unk_3C; int unk_40; } UnkStruct_ov116_02262D08; diff --git a/include/overlay116/struct_ov116_02262DC0.h b/include/overlay116/struct_ov116_02262DC0.h index 5ccc3f1e49..d46202aa33 100644 --- a/include/overlay116/struct_ov116_02262DC0.h +++ b/include/overlay116/struct_ov116_02262DC0.h @@ -1,26 +1,26 @@ #ifndef POKEPLATINUM_STRUCT_OV116_02262DC0_H #define POKEPLATINUM_STRUCT_OV116_02262DC0_H +#include + #include "overlay116/struct_ov116_0226469C.h" #include "overlay116/struct_ov116_022649E4.h" #include "overlay116/struct_ov116_0226501C.h" -#include - typedef struct { int unk_00; int unk_04; int unk_08; - int * unk_0C; - UnkStruct_ov116_0226501C * unk_10; - UnkStruct_ov116_0226501C * unk_14; + int *unk_0C; + UnkStruct_ov116_0226501C *unk_10; + UnkStruct_ov116_0226501C *unk_14; u8 padding_18[8]; VecFx32 unk_20; u8 padding_2C[24]; UnkStruct_ov116_0226469C unk_44; UnkStruct_ov116_0226469C unk_5C; int unk_74; - UnkStruct_ov116_022649E4 * unk_78; + UnkStruct_ov116_022649E4 *unk_78; } UnkStruct_ov116_02262DC0; #endif // POKEPLATINUM_STRUCT_OV116_02262DC0_H diff --git a/include/overlay116/struct_ov116_022647BC.h b/include/overlay116/struct_ov116_022647BC.h index eb8cef548e..2656637409 100644 --- a/include/overlay116/struct_ov116_022647BC.h +++ b/include/overlay116/struct_ov116_022647BC.h @@ -2,15 +2,16 @@ #define POKEPLATINUM_STRUCT_OV116_022647BC_H #include "struct_decls/cell_actor_data.h" + #include "overlay116/struct_ov116_0226469C.h" #include "overlay116/struct_ov116_022649E4.h" typedef struct { BOOL unk_00; int unk_04; - CellActorData * unk_08[3]; + CellActorData *unk_08[3]; UnkStruct_ov116_0226469C unk_14[3][2]; - UnkStruct_ov116_022649E4 * unk_A4; + UnkStruct_ov116_022649E4 *unk_A4; } UnkStruct_ov116_022647BC; #endif // POKEPLATINUM_STRUCT_OV116_022647BC_H diff --git a/include/overlay116/struct_ov116_022649E4.h b/include/overlay116/struct_ov116_022649E4.h index 7d833c1997..e6854b72a9 100644 --- a/include/overlay116/struct_ov116_022649E4.h +++ b/include/overlay116/struct_ov116_022649E4.h @@ -1,26 +1,28 @@ #ifndef POKEPLATINUM_STRUCT_OV116_022649E4_H #define POKEPLATINUM_STRUCT_OV116_022649E4_H +#include + #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "camera.h" #include "struct_defs/struct_0207C690.h" + #include "overlay116/struct_ov116_022649E4_sub1.h" -#include +#include "camera.h" typedef struct { - NARC * unk_00; - NARC * unk_04; - SpriteRenderer * unk_08; - SpriteGfxHandler * unk_0C; - BGL * unk_10; - PaletteData * unk_14; - GenericPointerData * unk_18; - Camera * camera; + NARC *unk_00; + NARC *unk_04; + SpriteRenderer *unk_08; + SpriteGfxHandler *unk_0C; + BGL *unk_10; + PaletteData *unk_14; + GenericPointerData *unk_18; + Camera *camera; u8 padding_20[4]; NNSFndAllocator unk_24; UnkStruct_ov116_022649E4_sub1 unk_2C; diff --git a/include/overlay116/struct_ov116_0226501C.h b/include/overlay116/struct_ov116_0226501C.h index 06756d5b1b..c5a981f650 100644 --- a/include/overlay116/struct_ov116_0226501C.h +++ b/include/overlay116/struct_ov116_0226501C.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV116_0226501C_H #define POKEPLATINUM_STRUCT_OV116_0226501C_H +#include + #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017248.h" #include "struct_defs/struct_02017294.h" + #include "overlay116/union_ov116_02266FEC.h" #include "overlay116/union_ov116_022671EC.h" -#include - typedef struct { UnkStruct_02017294 unk_00; UnkStruct_020170F4 unk_78; diff --git a/include/overlay116/struct_ov116_0226534C.h b/include/overlay116/struct_ov116_0226534C.h index 8d139a9f24..c387f865a5 100644 --- a/include/overlay116/struct_ov116_0226534C.h +++ b/include/overlay116/struct_ov116_0226534C.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_STRUCT_OV116_0226534C_H #define POKEPLATINUM_STRUCT_OV116_0226534C_H -#include "sys_task_manager.h" #include "overlay116/struct_ov116_022649E4.h" #include "overlay116/struct_ov116_02265470.h" +#include "sys_task_manager.h" + typedef struct { int unk_00; - int * unk_04; + int *unk_04; UnkStruct_ov116_02265470 unk_08[5]; - SysTask * unk_80; - UnkStruct_ov116_022649E4 * unk_84; + SysTask *unk_80; + UnkStruct_ov116_022649E4 *unk_84; } UnkStruct_ov116_0226534C; #endif // POKEPLATINUM_STRUCT_OV116_0226534C_H diff --git a/include/overlay116/struct_ov116_02265470.h b/include/overlay116/struct_ov116_02265470.h index b6ae74502c..bbdeea9255 100644 --- a/include/overlay116/struct_ov116_02265470.h +++ b/include/overlay116/struct_ov116_02265470.h @@ -4,7 +4,7 @@ typedef struct { int unk_00; BOOL unk_04; - void * unk_08[8]; + void *unk_08[8]; int unk_28[10]; BOOL unk_50[10]; } UnkStruct_ov116_02265470; diff --git a/include/overlay116/struct_ov116_02265D84.h b/include/overlay116/struct_ov116_02265D84.h index e7bb410bca..cdadf8d833 100644 --- a/include/overlay116/struct_ov116_02265D84.h +++ b/include/overlay116/struct_ov116_02265D84.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_STRUCT_OV116_02265D84_H #include "struct_decls/cell_actor_data.h" + #include "overlay116/struct_ov116_0226469C.h" typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; int unk_04; s16 unk_08; u8 padding_0A[6]; diff --git a/include/overlay116/struct_ov116_022660A8.h b/include/overlay116/struct_ov116_022660A8.h index 3a2a2141db..4d54dbc1a9 100644 --- a/include/overlay116/struct_ov116_022660A8.h +++ b/include/overlay116/struct_ov116_022660A8.h @@ -1,25 +1,26 @@ #ifndef POKEPLATINUM_STRUCT_OV116_022660A8_H #define POKEPLATINUM_STRUCT_OV116_022660A8_H -#include "sys_task_manager.h" #include "overlay116/struct_ov116_0226469C.h" #include "overlay116/struct_ov116_022649E4.h" #include "overlay116/struct_ov116_02265AA4.h" +#include "sys_task_manager.h" + typedef struct { UnkStruct_ov116_02265AA4 unk_00; u8 padding_04[4]; - SysTask * unk_08; - int * unk_0C; - int * unk_10; - int * unk_14; + SysTask *unk_08; + int *unk_0C; + int *unk_10; + int *unk_14; int unk_18; int unk_1C; u8 padding_20[4]; int unk_24; BOOL unk_28; BOOL unk_2C; - UnkStruct_ov116_022649E4 * unk_30; + UnkStruct_ov116_022649E4 *unk_30; UnkStruct_ov116_0226469C unk_34[5]; } UnkStruct_ov116_022660A8; diff --git a/include/overlay117/ov117_02260440.h b/include/overlay117/ov117_02260440.h index 72daba9952..9d93fdc144 100644 --- a/include/overlay117/ov117_02260440.h +++ b/include/overlay117/ov117_02260440.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV117_02260440_H #define POKEPLATINUM_OV117_02260440_H +#include "overlay_manager.h" -int ov117_02260440(OverlayManager * param0, int * param1); -int ov117_02260474(OverlayManager * param0, int * param1); -int ov117_022605C0(OverlayManager * param0, int * param1); +int ov117_02260440(OverlayManager *param0, int *param1); +int ov117_02260474(OverlayManager *param0, int *param1); +int ov117_022605C0(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV117_02260440_H diff --git a/include/overlay117/ov117_02260668.h b/include/overlay117/ov117_02260668.h index c2bc9dbd32..5ed48080db 100644 --- a/include/overlay117/ov117_02260668.h +++ b/include/overlay117/ov117_02260668.h @@ -4,19 +4,21 @@ #include "overlay117/struct_ov117_02261280_decl.h" #include "overlay117/struct_ov117_022621D4.h" -int ov117_02260668(OverlayManager * param0, int * param1); -int ov117_0226098C(OverlayManager * param0, int * param1); -int ov117_02260C10(OverlayManager * param0, int * param1); -void ov117_02261600(UnkStruct_ov117_02261280 * param0, int param1); -BOOL ov117_02261E38(UnkStruct_ov117_02261280 * param0, int param1); -BOOL ov117_02261FF4(UnkStruct_ov117_02261280 * param0); -void ov117_02262044(UnkStruct_ov117_02261280 * param0, int param1, const UnkStruct_ov117_022621D4 * param2); -UnkStruct_ov117_022621D4 * ov117_022620A0(UnkStruct_ov117_02261280 * param0, int param1); -void ov117_02262130(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1); -UnkStruct_ov117_022621D4 * ov117_022621D4(UnkStruct_ov117_02261280 * param0); -int ov117_022622B8(UnkStruct_ov117_02261280 * param0); -int ov117_022622C4(UnkStruct_ov117_02261280 * param0, int param1); -int ov117_0226235C(UnkStruct_ov117_02261280 * param0, int param1); -void ov117_0226238C(UnkStruct_ov117_02261280 * param0, int param1, u8 param2); +#include "overlay_manager.h" + +int ov117_02260668(OverlayManager *param0, int *param1); +int ov117_0226098C(OverlayManager *param0, int *param1); +int ov117_02260C10(OverlayManager *param0, int *param1); +void ov117_02261600(UnkStruct_ov117_02261280 *param0, int param1); +BOOL ov117_02261E38(UnkStruct_ov117_02261280 *param0, int param1); +BOOL ov117_02261FF4(UnkStruct_ov117_02261280 *param0); +void ov117_02262044(UnkStruct_ov117_02261280 *param0, int param1, const UnkStruct_ov117_022621D4 *param2); +UnkStruct_ov117_022621D4 *ov117_022620A0(UnkStruct_ov117_02261280 *param0, int param1); +void ov117_02262130(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1); +UnkStruct_ov117_022621D4 *ov117_022621D4(UnkStruct_ov117_02261280 *param0); +int ov117_022622B8(UnkStruct_ov117_02261280 *param0); +int ov117_022622C4(UnkStruct_ov117_02261280 *param0, int param1); +int ov117_0226235C(UnkStruct_ov117_02261280 *param0, int param1); +void ov117_0226238C(UnkStruct_ov117_02261280 *param0, int param1, u8 param2); #endif // POKEPLATINUM_OV117_02260668_H diff --git a/include/overlay117/ov117_022626B0.h b/include/overlay117/ov117_022626B0.h index 4bbd67b12c..a126f50244 100644 --- a/include/overlay117/ov117_022626B0.h +++ b/include/overlay117/ov117_022626B0.h @@ -4,9 +4,9 @@ #include "overlay117/struct_ov117_02261280_decl.h" #include "overlay117/struct_ov117_022626B0_decl.h" -UnkStruct_ov117_022626B0 * ov117_022626B0(UnkStruct_ov117_02261280 * param0); -void ov117_02262760(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 * param1); -void ov117_02262798(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 * param1); -void ov117_02262950(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 * param1); +UnkStruct_ov117_022626B0 *ov117_022626B0(UnkStruct_ov117_02261280 *param0); +void ov117_02262760(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022626B0 *param1); +void ov117_02262798(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022626B0 *param1); +void ov117_02262950(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022626B0 *param1); #endif // POKEPLATINUM_OV117_022626B0_H diff --git a/include/overlay117/ov117_02263AF0.h b/include/overlay117/ov117_02263AF0.h index c9616d25ad..e3b59c1fb7 100644 --- a/include/overlay117/ov117_02263AF0.h +++ b/include/overlay117/ov117_02263AF0.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_OV117_02263AF0_H #define POKEPLATINUM_OV117_02263AF0_H -#include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/cell_actor_data.h" +#include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" + #include "overlay117/struct_ov117_02261280_decl.h" #include "overlay117/struct_ov117_02263DAC.h" #include "overlay117/struct_ov117_02264E84.h" @@ -16,47 +16,49 @@ #include "overlay117/struct_ov117_02265EC8.h" #include "overlay117/struct_ov117_02266274.h" -void ov117_02263AF0(BGL * param0, int param1, int param2, UnkStruct_ov117_02263DAC * param3); +#include "strbuf.h" + +void ov117_02263AF0(BGL *param0, int param1, int param2, UnkStruct_ov117_02263DAC *param3); int ov117_02263CF4(int param0); -void ov117_02263D80(UnkStruct_ov117_02261280 * param0, BGL * param1, UnkStruct_ov117_02263DAC * param2); -BOOL ov117_02263DC4(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02264E84 * param1); -void ov117_02263EF8(UnkStruct_ov117_02261280 * param0); -void ov117_022641E4(UnkStruct_ov117_02261280 * param0); -void ov117_02264508(UnkStruct_ov117_02261280 * param0); -BOOL ov117_02264560(UnkStruct_ov117_02261280 * param0); -BOOL ov117_02264808(UnkStruct_ov117_02261280 * param0); -void ov117_022648E0(UnkStruct_ov117_02261280 * param0); -void ov117_02264914(UnkStruct_ov117_02261280 * param0); -BOOL ov117_02264930(UnkStruct_ov117_02261280 * param0); -void ov117_02264AB0(UnkStruct_ov117_02261280 * param0); -void ov117_02264AF0(UnkStruct_ov117_02261280 * param0); -void ov117_02264BF8(UnkStruct_ov117_02261280 * param0); -void ov117_02264D1C(UnkStruct_ov117_02261280 * param0); -void ov117_02264E14(UnkStruct_ov117_02261280 * param0, int param1, s32 param2, UnkStruct_ov117_02264E84 * param3); -BOOL ov117_02264E3C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02264E84 * param1); -UnkStruct_ov117_02264E84 * ov117_02264E84(UnkStruct_ov117_02261280 * param0); -BOOL ov117_02264EB8(UnkStruct_ov117_02261280 * param0, int param1); -void ov117_02264FB0(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0226504C * param1); -void ov117_0226504C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0226504C * param1); -void ov117_02265064(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1); -void ov117_022651E0(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1); -void ov117_02265210(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1); -void ov117_02265254(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1); -void ov117_02265ABC(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1); -void ov117_02265B3C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1); -void ov117_02265B58(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1, int param2, int param3, int param4); -void ov117_02265C1C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1); -void ov117_02265DB8(BGL * param0, SpriteGfxHandler * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); -void ov117_02265EB0(UnkStruct_ov117_02265EB0 * param0); -void ov117_02265EC8(UnkStruct_ov117_02265EC8 * param0); -void ov117_02265F34(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265EC8 * param1); -void ov117_02265F98(UnkStruct_ov117_02265EC8 * param0, int param1); -CellActorData * ov117_02266130(UnkStruct_ov117_02261280 * param0); -void ov117_02266150(UnkStruct_ov117_02261280 * param0); -void ov117_02266210(UnkStruct_ov117_02261280 * param0); -void ov117_02266238(UnkStruct_ov117_02261280 * param0, CellActorData * param1); -CellActorData * ov117_02266244(UnkStruct_ov117_02261280 * param0); -void ov117_02266268(UnkStruct_ov117_02261280 * param0, CellActorData * param1); -BOOL ov117_02266274(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02266274 * param1); +void ov117_02263D80(UnkStruct_ov117_02261280 *param0, BGL *param1, UnkStruct_ov117_02263DAC *param2); +BOOL ov117_02263DC4(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02264E84 *param1); +void ov117_02263EF8(UnkStruct_ov117_02261280 *param0); +void ov117_022641E4(UnkStruct_ov117_02261280 *param0); +void ov117_02264508(UnkStruct_ov117_02261280 *param0); +BOOL ov117_02264560(UnkStruct_ov117_02261280 *param0); +BOOL ov117_02264808(UnkStruct_ov117_02261280 *param0); +void ov117_022648E0(UnkStruct_ov117_02261280 *param0); +void ov117_02264914(UnkStruct_ov117_02261280 *param0); +BOOL ov117_02264930(UnkStruct_ov117_02261280 *param0); +void ov117_02264AB0(UnkStruct_ov117_02261280 *param0); +void ov117_02264AF0(UnkStruct_ov117_02261280 *param0); +void ov117_02264BF8(UnkStruct_ov117_02261280 *param0); +void ov117_02264D1C(UnkStruct_ov117_02261280 *param0); +void ov117_02264E14(UnkStruct_ov117_02261280 *param0, int param1, s32 param2, UnkStruct_ov117_02264E84 *param3); +BOOL ov117_02264E3C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264E84 *param1); +UnkStruct_ov117_02264E84 *ov117_02264E84(UnkStruct_ov117_02261280 *param0); +BOOL ov117_02264EB8(UnkStruct_ov117_02261280 *param0, int param1); +void ov117_02264FB0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226504C *param1); +void ov117_0226504C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226504C *param1); +void ov117_02265064(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1); +void ov117_022651E0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1); +void ov117_02265210(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1); +void ov117_02265254(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1); +void ov117_02265ABC(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1); +void ov117_02265B3C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1); +void ov117_02265B58(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1, int param2, int param3, int param4); +void ov117_02265C1C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1); +void ov117_02265DB8(BGL *param0, SpriteGfxHandler *param1, UnkStruct_02012744 *param2, UnkStruct_ov117_02265EB0 *param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14); +void ov117_02265EB0(UnkStruct_ov117_02265EB0 *param0); +void ov117_02265EC8(UnkStruct_ov117_02265EC8 *param0); +void ov117_02265F34(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265EC8 *param1); +void ov117_02265F98(UnkStruct_ov117_02265EC8 *param0, int param1); +CellActorData *ov117_02266130(UnkStruct_ov117_02261280 *param0); +void ov117_02266150(UnkStruct_ov117_02261280 *param0); +void ov117_02266210(UnkStruct_ov117_02261280 *param0); +void ov117_02266238(UnkStruct_ov117_02261280 *param0, CellActorData *param1); +CellActorData *ov117_02266244(UnkStruct_ov117_02261280 *param0); +void ov117_02266268(UnkStruct_ov117_02261280 *param0, CellActorData *param1); +BOOL ov117_02266274(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266274 *param1); #endif // POKEPLATINUM_OV117_02263AF0_H diff --git a/include/overlay117/ov117_02266498.h b/include/overlay117/ov117_02266498.h index 57eccfee34..79bbe62f39 100644 --- a/include/overlay117/ov117_02266498.h +++ b/include/overlay117/ov117_02266498.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_OV117_02266498_H #define POKEPLATINUM_OV117_02266498_H +#include "overlay_manager.h" -int ov117_02266498(OverlayManager * param0, int * param1); -int ov117_022664BC(OverlayManager * param0, int * param1); -int ov117_022665E8(OverlayManager * param0, int * param1); +int ov117_02266498(OverlayManager *param0, int *param1); +int ov117_022664BC(OverlayManager *param0, int *param1); +int ov117_022665E8(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_OV117_02266498_H diff --git a/include/overlay117/ov117_022665FC.h b/include/overlay117/ov117_022665FC.h index e8ba009e85..4e3c63ec12 100644 --- a/include/overlay117/ov117_022665FC.h +++ b/include/overlay117/ov117_022665FC.h @@ -4,9 +4,9 @@ #include "overlay117/struct_ov117_02261280_decl.h" #include "overlay117/struct_ov117_022621D4.h" -void ov117_022665FC(void * param0); -BOOL ov117_02266624(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022621D4 * param1); -BOOL ov117_02266648(UnkStruct_ov117_02261280 * param0); -BOOL ov117_022666A4(UnkStruct_ov117_02261280 * param0); +void ov117_022665FC(void *param0); +BOOL ov117_02266624(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022621D4 *param1); +BOOL ov117_02266648(UnkStruct_ov117_02261280 *param0); +BOOL ov117_022666A4(UnkStruct_ov117_02261280 *param0); #endif // POKEPLATINUM_OV117_022665FC_H diff --git a/include/overlay117/ov117_022666C0.h b/include/overlay117/ov117_022666C0.h index 37be6abe64..ac3aa7e19f 100644 --- a/include/overlay117/ov117_022666C0.h +++ b/include/overlay117/ov117_022666C0.h @@ -5,13 +5,13 @@ #include "overlay117/struct_ov117_022621D4.h" #include "overlay117/struct_ov117_02264E84.h" -BOOL ov117_022666C0(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022621D4 * param1); -void ov117_022666E8(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02264E84 * param1); -void ov117_02266730(UnkStruct_ov117_02261280 * param0, int param1, u8 param2); -void ov117_02266784(UnkStruct_ov117_02261280 * param0, int param1, int param2, u8 param3); -void ov117_022667F4(UnkStruct_ov117_02261280 * param0, u8 param1); -void ov117_02266834(UnkStruct_ov117_02261280 * param0, u8 param1); -void ov117_0226687C(UnkStruct_ov117_02261280 * param0, int param1, u8 param2); -void ov117_022668B8(UnkStruct_ov117_02261280 * param0, u8 param1); +BOOL ov117_022666C0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022621D4 *param1); +void ov117_022666E8(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02264E84 *param1); +void ov117_02266730(UnkStruct_ov117_02261280 *param0, int param1, u8 param2); +void ov117_02266784(UnkStruct_ov117_02261280 *param0, int param1, int param2, u8 param3); +void ov117_022667F4(UnkStruct_ov117_02261280 *param0, u8 param1); +void ov117_02266834(UnkStruct_ov117_02261280 *param0, u8 param1); +void ov117_0226687C(UnkStruct_ov117_02261280 *param0, int param1, u8 param2); +void ov117_022668B8(UnkStruct_ov117_02261280 *param0, u8 param1); #endif // POKEPLATINUM_OV117_022666C0_H diff --git a/include/overlay117/struct_ov117_02260440.h b/include/overlay117/struct_ov117_02260440.h index e655dbfea3..49b6c4e135 100644 --- a/include/overlay117/struct_ov117_02260440.h +++ b/include/overlay117/struct_ov117_02260440.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_OV117_02260440_H #define POKEPLATINUM_STRUCT_OV117_02260440_H -#include "savedata.h" #include "overlay066/struct_ov66_02230DBC.h" +#include "savedata.h" + typedef struct { UnkStruct_ov66_02230DBC unk_00; - SaveData * unk_34; + SaveData *unk_34; u8 unk_38; u8 unk_39; u8 padding[2]; diff --git a/include/overlay117/struct_ov117_022605C0.h b/include/overlay117/struct_ov117_022605C0.h index 6342a66459..6d4970aec8 100644 --- a/include/overlay117/struct_ov117_022605C0.h +++ b/include/overlay117/struct_ov117_022605C0.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_OV117_022605C0_H #define POKEPLATINUM_STRUCT_OV117_022605C0_H -#include "overlay_manager.h" #include "overlay114/struct_ov114_0225C76C.h" #include "overlay114/struct_ov114_0225C9A8.h" +#include "overlay_manager.h" + typedef struct { UnkStruct_ov114_0225C76C unk_00; UnkStruct_ov114_0225C9A8 unk_10; - OverlayManager * unk_28; + OverlayManager *unk_28; u8 unk_2C[4]; u8 unk_30; u8 unk_31; diff --git a/include/overlay117/struct_ov117_02261280.h b/include/overlay117/struct_ov117_02261280.h index 5d394d08bc..2aa576e30b 100644 --- a/include/overlay117/struct_ov117_02261280.h +++ b/include/overlay117/struct_ov117_02261280.h @@ -1,19 +1,17 @@ #ifndef POKEPLATINUM_STRUCT_OV117_02261280_H #define POKEPLATINUM_STRUCT_OV117_02261280_H +#include + #include "struct_decls/struct_02002F38_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "camera.h" -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" + #include "overlay114/struct_ov114_0225CAD4_decl.h" #include "overlay117/struct_ov117_022605C0.h" #include "overlay117/struct_ov117_02261280_sub1.h" @@ -33,32 +31,36 @@ #include "overlay117/struct_ov117_02265EC8.h" #include "overlay117/struct_ov117_02266274.h" -#include +#include "camera.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" typedef struct UnkStruct_ov117_02261280_t { - UnkStruct_ov117_022605C0 * unk_00; + UnkStruct_ov117_022605C0 *unk_00; int unk_04; u32 unk_08; u32 unk_0C[4]; - UnkStruct_ov114_0225CAD4 * unk_1C; + UnkStruct_ov114_0225CAD4 *unk_1C; int unk_20; - SpriteRenderer * unk_24; - SpriteGfxHandler * unk_28; - BGL * unk_2C; + SpriteRenderer *unk_24; + SpriteGfxHandler *unk_28; + BGL *unk_2C; Window unk_30[5]; - MessageLoader * unk_80; - StringTemplate * unk_84; - Strbuf* unk_88; - PaletteData * unk_8C; - UnkStruct_02012744 * unk_90; - SysTask * unk_94; - GenericPointerData * unk_98; - Camera * camera1; - Camera * camera2; - UnkStruct_02014014 * unk_A4; + MessageLoader *unk_80; + StringTemplate *unk_84; + Strbuf *unk_88; + PaletteData *unk_8C; + UnkStruct_02012744 *unk_90; + SysTask *unk_94; + GenericPointerData *unk_98; + Camera *camera1; + Camera *camera2; + UnkStruct_02014014 *unk_A4; NNSFndAllocator unk_A8; UnkStruct_ov117_02262664 unk_B8; - UnkStruct_ov117_022626B0 * unk_D4; + UnkStruct_ov117_022626B0 *unk_D4; UnkStruct_ov117_02261F08 unk_D8; UnkStruct_ov117_02261C2C unk_13A0; UnkStruct_ov117_02263DAC unk_1428; diff --git a/include/overlay117/struct_ov117_02263EF8.h b/include/overlay117/struct_ov117_02263EF8.h index 74788582d9..57e9444fba 100644 --- a/include/overlay117/struct_ov117_02263EF8.h +++ b/include/overlay117/struct_ov117_02263EF8.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_OV117_02263EF8_H #include "struct_decls/cell_actor_data.h" + #include "overlay117/struct_ov117_02266F10.h" typedef struct { @@ -12,8 +13,8 @@ typedef struct { s16 unk_0C; u8 unk_0E; u8 padding_0F[1]; - CellActorData * unk_10; - const UnkStruct_ov117_02266F10 * unk_14; + CellActorData *unk_10; + const UnkStruct_ov117_02266F10 *unk_14; } UnkStruct_ov117_02263EF8; #endif // POKEPLATINUM_STRUCT_OV117_02263EF8_H diff --git a/include/overlay117/struct_ov117_02264508.h b/include/overlay117/struct_ov117_02264508.h index 1612576dbc..382a210bca 100644 --- a/include/overlay117/struct_ov117_02264508.h +++ b/include/overlay117/struct_ov117_02264508.h @@ -4,7 +4,7 @@ #include "struct_decls/cell_actor_data.h" typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; fx32 unk_04; fx32 unk_08; fx32 unk_0C; diff --git a/include/overlay117/struct_ov117_02264930.h b/include/overlay117/struct_ov117_02264930.h index 60110cbd3a..1b752ea330 100644 --- a/include/overlay117/struct_ov117_02264930.h +++ b/include/overlay117/struct_ov117_02264930.h @@ -4,7 +4,7 @@ #include "struct_decls/cell_actor_data.h" typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; diff --git a/include/overlay117/struct_ov117_0226504C.h b/include/overlay117/struct_ov117_0226504C.h index 4035928a2e..0398c41011 100644 --- a/include/overlay117/struct_ov117_0226504C.h +++ b/include/overlay117/struct_ov117_0226504C.h @@ -4,7 +4,7 @@ #include "struct_decls/cell_actor_data.h" typedef struct { - CellActorData * unk_00[4]; + CellActorData *unk_00[4]; } UnkStruct_ov117_0226504C; #endif // POKEPLATINUM_STRUCT_OV117_0226504C_H diff --git a/include/overlay117/struct_ov117_02265428.h b/include/overlay117/struct_ov117_02265428.h index d0c38dfb48..a827e99013 100644 --- a/include/overlay117/struct_ov117_02265428.h +++ b/include/overlay117/struct_ov117_02265428.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_STRUCT_OV117_02265428_H #include "struct_decls/cell_actor_data.h" + #include "overlay117/struct_ov117_02266344.h" typedef struct { - CellActorData * unk_00; - CellActorData * unk_04; - CellActorData * unk_08; + CellActorData *unk_00; + CellActorData *unk_04; + CellActorData *unk_08; fx32 unk_0C; u8 unk_10; u8 unk_11; diff --git a/include/overlay117/struct_ov117_02265C1C.h b/include/overlay117/struct_ov117_02265C1C.h index 4b69e1b56a..a999d49c22 100644 --- a/include/overlay117/struct_ov117_02265C1C.h +++ b/include/overlay117/struct_ov117_02265C1C.h @@ -4,8 +4,8 @@ #include "struct_decls/cell_actor_data.h" typedef struct { - CellActorData * unk_00; - CellActorData * unk_04; + CellActorData *unk_00; + CellActorData *unk_04; fx32 unk_08; fx32 unk_0C; s16 unk_10; diff --git a/include/overlay117/struct_ov117_02265EB0.h b/include/overlay117/struct_ov117_02265EB0.h index e185ac5f82..5ba54879ed 100644 --- a/include/overlay117/struct_ov117_02265EB0.h +++ b/include/overlay117/struct_ov117_02265EB0.h @@ -5,7 +5,7 @@ #include "struct_defs/sprite_manager_allocation.h" typedef struct { - FontOAM * unk_00; + FontOAM *unk_00; SpriteManagerAllocation unk_04; u16 unk_10; u8 padding_12[2]; diff --git a/include/overlay117/struct_ov117_02265EC8.h b/include/overlay117/struct_ov117_02265EC8.h index 08101a9694..79a3801ceb 100644 --- a/include/overlay117/struct_ov117_02265EC8.h +++ b/include/overlay117/struct_ov117_02265EC8.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_STRUCT_OV117_02265EC8_H #include "struct_decls/cell_actor_data.h" + #include "overlay117/struct_ov117_02265EB0.h" typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; UnkStruct_ov117_02265EB0 unk_04[6][2]; UnkStruct_ov117_02265EB0 unk_F4; UnkStruct_ov117_02265EB0 unk_108[6]; diff --git a/include/overlay117/struct_ov117_02266274.h b/include/overlay117/struct_ov117_02266274.h index 040ee4a213..5891fc4e2b 100644 --- a/include/overlay117/struct_ov117_02266274.h +++ b/include/overlay117/struct_ov117_02266274.h @@ -4,7 +4,7 @@ #include "struct_decls/cell_actor_data.h" typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; s16 unk_04; s16 unk_06; s16 unk_08; diff --git a/include/overlay117/struct_ov117_02266344.h b/include/overlay117/struct_ov117_02266344.h index da18ead68e..4ea934309a 100644 --- a/include/overlay117/struct_ov117_02266344.h +++ b/include/overlay117/struct_ov117_02266344.h @@ -4,7 +4,7 @@ #include "struct_decls/cell_actor_data.h" typedef struct { - CellActorData * unk_00[2]; + CellActorData *unk_00[2]; fx32 unk_08[2]; fx32 unk_10[2]; u8 unk_18; diff --git a/include/overlay118/ov118_021D0D80.h b/include/overlay118/ov118_021D0D80.h index 20e21274e0..0877f01e8e 100644 --- a/include/overlay118/ov118_021D0D80.h +++ b/include/overlay118/ov118_021D0D80.h @@ -3,7 +3,7 @@ #include "struct_defs/struct_0207F248.h" -void ov118_021D0D80(GameWindowLayout * param0); -int ov118_021D0DBC(GameWindowLayout * param0); +void ov118_021D0D80(GameWindowLayout *param0); +int ov118_021D0DBC(GameWindowLayout *param0); #endif // POKEPLATINUM_OV118_021D0D80_H diff --git a/include/overlay119/ov119_021D0D80.h b/include/overlay119/ov119_021D0D80.h index dae85c16ff..3ef358d3fd 100644 --- a/include/overlay119/ov119_021D0D80.h +++ b/include/overlay119/ov119_021D0D80.h @@ -5,46 +5,48 @@ #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" -#include "pokemon.h" #include "struct_defs/struct_0207C690.h" + #include "overlay119/struct_ov119_021D0FD0.h" #include "overlay119/struct_ov119_021D14DC.h" #include "overlay119/struct_ov119_021D17B8.h" #include "overlay119/struct_ov119_021D1930.h" +#include "pokemon.h" + void ov119_021D0D80(void); void ov119_021D0DA8(void); -GenericPointerData * ov119_021D0DD4(void); +GenericPointerData *ov119_021D0DD4(void); void ov119_021D0DF4(void); void ov119_021D0E78(void); -void ov119_021D0EB8(BGL * param0); -void ov119_021D0FD0(void * param0); +void ov119_021D0EB8(BGL *param0); +void ov119_021D0FD0(void *param0); void ov119_021D1004(void); void ov119_021D1028(void); void ov119_021D1048(void); -void ov119_021D1068(BGL * param0, PaletteData * param1, int param2); -void ov119_021D10F0(BGL * param0, Window * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); -int ov119_021D1158(Window * param0, int param1, Pokemon * param2, int param3); -void ov119_021D11E4(UnkStruct_ov119_021D0FD0 * param0, BGL * param1, Window * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); -void ov119_021D12CC(UnkStruct_ov119_021D0FD0 * param0); -void ov119_021D12F8(Window * param0); -void ov119_021D1308(BGL * param0, PaletteData * param1); -void ov119_021D135C(BGL * param0, PaletteData * param1); -void ov119_021D145C(UnkStruct_02014014 * param0); -UnkStruct_ov119_021D14DC * ov119_021D14AC(UnkStruct_ov119_021D1930 * param0); -void ov119_021D14DC(UnkStruct_ov119_021D14DC * param0, int param1); -BOOL ov119_021D14F8(UnkStruct_ov119_021D14DC * param0); -void ov119_021D150C(UnkStruct_ov119_021D14DC * param0); -void ov119_021D1514(UnkStruct_ov119_021D0FD0 * param0); -void ov119_021D161C(UnkStruct_ov119_021D0FD0 * param0); -BOOL ov119_021D16C0(UnkStruct_ov119_021D0FD0 * param0, int param1); -int ov119_021D176C(UnkStruct_ov119_021D0FD0 * param0, int param1); -void ov119_021D17A0(UnkStruct_ov119_021D0FD0 * param0); -void ov119_021D17B8(UnkStruct_ov119_021D17B8 * param0); -void ov119_021D1844(UnkStruct_ov119_021D17B8 * param0); -void ov119_021D1858(UnkStruct_ov119_021D0FD0 * param0); -void ov119_021D18C0(UnkStruct_ov119_021D0FD0 * param0); -void ov119_021D1900(UnkStruct_ov119_021D0FD0 * param0); -void ov119_021D190C(UnkStruct_ov119_021D0FD0 * param0, int param1); +void ov119_021D1068(BGL *param0, PaletteData *param1, int param2); +void ov119_021D10F0(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); +int ov119_021D1158(Window *param0, int param1, Pokemon *param2, int param3); +void ov119_021D11E4(UnkStruct_ov119_021D0FD0 *param0, BGL *param1, Window *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); +void ov119_021D12CC(UnkStruct_ov119_021D0FD0 *param0); +void ov119_021D12F8(Window *param0); +void ov119_021D1308(BGL *param0, PaletteData *param1); +void ov119_021D135C(BGL *param0, PaletteData *param1); +void ov119_021D145C(UnkStruct_02014014 *param0); +UnkStruct_ov119_021D14DC *ov119_021D14AC(UnkStruct_ov119_021D1930 *param0); +void ov119_021D14DC(UnkStruct_ov119_021D14DC *param0, int param1); +BOOL ov119_021D14F8(UnkStruct_ov119_021D14DC *param0); +void ov119_021D150C(UnkStruct_ov119_021D14DC *param0); +void ov119_021D1514(UnkStruct_ov119_021D0FD0 *param0); +void ov119_021D161C(UnkStruct_ov119_021D0FD0 *param0); +BOOL ov119_021D16C0(UnkStruct_ov119_021D0FD0 *param0, int param1); +int ov119_021D176C(UnkStruct_ov119_021D0FD0 *param0, int param1); +void ov119_021D17A0(UnkStruct_ov119_021D0FD0 *param0); +void ov119_021D17B8(UnkStruct_ov119_021D17B8 *param0); +void ov119_021D1844(UnkStruct_ov119_021D17B8 *param0); +void ov119_021D1858(UnkStruct_ov119_021D0FD0 *param0); +void ov119_021D18C0(UnkStruct_ov119_021D0FD0 *param0); +void ov119_021D1900(UnkStruct_ov119_021D0FD0 *param0); +void ov119_021D190C(UnkStruct_ov119_021D0FD0 *param0, int param1); #endif // POKEPLATINUM_OV119_021D0D80_H diff --git a/include/overlay119/ov119_021D191C.h b/include/overlay119/ov119_021D191C.h index 6cb573289e..3d7e3b06e2 100644 --- a/include/overlay119/ov119_021D191C.h +++ b/include/overlay119/ov119_021D191C.h @@ -3,6 +3,6 @@ #include "overlay119/struct_ov119_021D0FD0.h" -BOOL ov119_021D191C(UnkStruct_ov119_021D0FD0 * param0); +BOOL ov119_021D191C(UnkStruct_ov119_021D0FD0 *param0); #endif // POKEPLATINUM_OV119_021D191C_H diff --git a/include/overlay119/struct_ov119_021D0FD0.h b/include/overlay119/struct_ov119_021D0FD0.h index 716799057b..5b2187bded 100644 --- a/include/overlay119/struct_ov119_021D0FD0.h +++ b/include/overlay119/struct_ov119_021D0FD0.h @@ -1,24 +1,25 @@ #ifndef POKEPLATINUM_STRUCT_OV119_021D0FD0_H #define POKEPLATINUM_STRUCT_OV119_021D0FD0_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/cell_actor_data.h" +#include "struct_decls/sprite_decl.h" #include "struct_defs/struct_0209843C.h" + #include "overlay119/struct_ov119_021D16C0.h" #include "overlay119/struct_ov119_021D17B8.h" typedef struct { - UnkStruct_0209843C * unk_00; + UnkStruct_0209843C *unk_00; UnkStruct_ov119_021D17B8 unk_04; int unk_5C; int unk_60; int unk_64; int unk_68; u8 unk_6C; - Sprite * unk_70; - CellActorData * unk_74; - CellActorData * unk_78; - CellActorData * unk_7C; + Sprite *unk_70; + CellActorData *unk_74; + CellActorData *unk_78; + CellActorData *unk_7C; UnkStruct_ov119_021D16C0 unk_80; } UnkStruct_ov119_021D0FD0; diff --git a/include/overlay119/struct_ov119_021D14DC.h b/include/overlay119/struct_ov119_021D14DC.h index 7dfa13ce25..1e4c4ec763 100644 --- a/include/overlay119/struct_ov119_021D14DC.h +++ b/include/overlay119/struct_ov119_021D14DC.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_STRUCT_OV119_021D14DC_H #include "struct_decls/struct_02014014_decl.h" + #include "overlay119/struct_ov119_021D1930.h" #include "spl.h" typedef struct { UnkStruct_ov119_021D1930 unk_00; - UnkSPLStruct6 * unk_08; - UnkStruct_02014014 * unk_0C; + UnkSPLStruct6 *unk_08; + UnkStruct_02014014 *unk_0C; } UnkStruct_ov119_021D14DC; #endif // POKEPLATINUM_STRUCT_OV119_021D14DC_H diff --git a/include/overlay119/struct_ov119_021D17B8.h b/include/overlay119/struct_ov119_021D17B8.h index 6b31e4a8ba..91be488609 100644 --- a/include/overlay119/struct_ov119_021D17B8.h +++ b/include/overlay119/struct_ov119_021D17B8.h @@ -1,6 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_OV119_021D17B8_H #define POKEPLATINUM_STRUCT_OV119_021D17B8_H +#include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" @@ -8,28 +9,28 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" + #include "overlay119/struct_ov119_021D14DC.h" typedef struct { - BGL * unk_00; - PaletteData * unk_04; + BGL *unk_00; + PaletteData *unk_04; int unk_08; int unk_0C; int unk_10; Window unk_14[2]; - GenericPointerData * unk_34; - UnkStruct_02007768 * unk_38; - NARC * unk_3C; - UnkStruct_ov119_021D14DC * unk_40; - ResourceMetadata * unk_44; - UIControlData * unk_48; - SpriteGfxHandler * unk_4C; - SpriteRenderer * unk_50; - PokemonAnimationSys * unk_54; + GenericPointerData *unk_34; + UnkStruct_02007768 *unk_38; + NARC *unk_3C; + UnkStruct_ov119_021D14DC *unk_40; + ResourceMetadata *unk_44; + UIControlData *unk_48; + SpriteGfxHandler *unk_4C; + SpriteRenderer *unk_50; + PokemonAnimationSys *unk_54; } UnkStruct_ov119_021D17B8; #endif // POKEPLATINUM_STRUCT_OV119_021D17B8_H diff --git a/include/overlay_manager.h b/include/overlay_manager.h index 36fc0adc96..f02a9e1e67 100644 --- a/include/overlay_manager.h +++ b/include/overlay_manager.h @@ -5,7 +5,7 @@ #include "constants/heap.h" -#define FS_OVERLAY_ID_NONE -1 +#define FS_OVERLAY_ID_NONE -1 typedef struct OverlayManager OverlayManager; @@ -28,13 +28,12 @@ struct OverlayManager { OverlayManager *child; }; -OverlayManager* OverlayManager_New(const OverlayManagerTemplate *template, void *args, const enum HeapId heapID); +OverlayManager *OverlayManager_New(const OverlayManagerTemplate *template, void *args, const enum HeapId heapID); void OverlayManager_Free(OverlayManager *ovyManager); -void* OverlayManager_NewData(OverlayManager *ovyManager, u32 size, enum HeapId heapID); -void* OverlayManager_Data(OverlayManager *ovyManager); +void *OverlayManager_NewData(OverlayManager *ovyManager, u32 size, enum HeapId heapID); +void *OverlayManager_Data(OverlayManager *ovyManager); void OverlayManager_FreeData(OverlayManager *ovyManager); -void* OverlayManager_Args(OverlayManager *ovyManager); +void *OverlayManager_Args(OverlayManager *ovyManager); BOOL OverlayManager_Exec(OverlayManager *ovyManager); #endif // POKEPLATINUM_OVERLAY_MANAGER_H - diff --git a/include/party.h b/include/party.h index f1692d96b9..b0406f5b42 100644 --- a/include/party.h +++ b/include/party.h @@ -1,23 +1,24 @@ #ifndef POKEPLATINUM_UNK_02079FEC_H #define POKEPLATINUM_UNK_02079FEC_H -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" + +#include "pokemon.h" #include "savedata.h" int Party_SaveSize(void); -Party * Party_New(u32 param0); -void Party_Init(Party * param0); -void Party_InitWithCapacity(Party * party, int capacity); -BOOL Party_AddPokemon(Party * party, Pokemon * pokemon); -BOOL Party_RemovePokemonBySlotIndex(Party * party, int slot); -int Party_GetCapacity(const Party * party); -int Party_GetCurrentCount(const Party * party); -Pokemon * Party_GetPokemonBySlotIndex(const Party * party, int slot); -void sub_0207A128(Party * party, int slot, Pokemon * param2); -BOOL Party_SwapSlots(Party * party, int slotA, int slotB); -void Party_cpy(const Party * src, Party * dest); -BOOL Party_HasSpecies(const Party * party, int species); -Party * Party_GetFromSavedata(SaveData * party); +Party *Party_New(u32 param0); +void Party_Init(Party *param0); +void Party_InitWithCapacity(Party *party, int capacity); +BOOL Party_AddPokemon(Party *party, Pokemon *pokemon); +BOOL Party_RemovePokemonBySlotIndex(Party *party, int slot); +int Party_GetCapacity(const Party *party); +int Party_GetCurrentCount(const Party *party); +Pokemon *Party_GetPokemonBySlotIndex(const Party *party, int slot); +void sub_0207A128(Party *party, int slot, Pokemon *param2); +BOOL Party_SwapSlots(Party *party, int slotA, int slotB); +void Party_cpy(const Party *src, Party *dest); +BOOL Party_HasSpecies(const Party *party, int species); +Party *Party_GetFromSavedata(SaveData *party); #endif // POKEPLATINUM_UNK_02079FEC_H diff --git a/include/pch/global_pch.h b/include/pch/global_pch.h index 25be7574f2..fa77a9a3e4 100644 --- a/include/pch/global_pch.h +++ b/include/pch/global_pch.h @@ -4,16 +4,16 @@ #include #pragma thumb on #include - -#include #include +#include + +#include "constants/pokemon.h" +#include "global/assert.h" #include "global/config.h" // MUST COME BEFORE ANY OTHER GAMEFREAK HEADERS #include "global/pm_version.h" -#include "global/assert.h" -#include "constants/pokemon.h" -#define NELEMS(a) (sizeof(a) / sizeof(*(a))) +#define NELEMS(a) (sizeof(a) / sizeof(*(a))) #define XtOffset(pointer_type, field) ((unsigned int)&(((pointer_type)NULL)->field)) typedef struct { diff --git a/include/player_avatar.h b/include/player_avatar.h index dce6b6674c..adb1f9d0dc 100644 --- a/include/player_avatar.h +++ b/include/player_avatar.h @@ -1,103 +1,104 @@ #ifndef POKEPLATINUM_PLAYER_AVATAR_H #define POKEPLATINUM_PLAYER_AVATAR_H -#include "field/field_system_decl.h" +#include + +#include "constants/player_avatar.h" + #include "struct_decls/struct_0205E884_decl.h" -#include "struct_defs/struct_0205EC34.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "constants/player_avatar.h" +#include "struct_defs/struct_0205EC34.h" -#include +#include "field/field_system_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" -PlayerAvatar * PlayerAvatar_Init(const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6, PlayerData * param7); -PlayerAvatar * sub_0205E820(const MapObjectManager * param0, PlayerData * param1, int param2); -void PlayerAvatar_InitDraw(PlayerAvatar * playerAvatar, int param1); -void Player_Delete(PlayerAvatar * playerAvatar); -void Player_DeleteAll(PlayerAvatar * playerAvatar); -MapObject * sub_0205EA24(const MapObjectManager * param0); -int PlayerAvatar_GetDir(PlayerAvatar * const playerAvatar); -void Player_SetDir(PlayerAvatar * playerAvatar, int param1); -int PlayerAvatar_GetMoveDir(PlayerAvatar * const playerAvatar); -int sub_0205EAA0(PlayerAvatar * const playerAvatar); -int Player_GetXPos(PlayerAvatar * const playerAvatar); -int Player_GetZPos(PlayerAvatar * const playerAvatar); -int PlayerAvatar_XPosPrev(PlayerAvatar * const playerAvatar); -int PlayerAvatar_ZPosPrev(PlayerAvatar * const playerAvatar); -void PlayerAvatar_PosVectorOut(PlayerAvatar * const playerAvatar, VecFx32 * param1); -const VecFx32 * PlayerAvatar_PosVector(PlayerAvatar * const playerAvatar); -void sub_0205EB08(PlayerAvatar * playerAvatar, int param1); -int PlayerAvatar_MoveState(const PlayerAvatar * playerAvatar); -void sub_0205EB10(PlayerAvatar * playerAvatar, int param1); -int Player_MoveState(const PlayerAvatar * playerAvatar); -void PlayerAvatar_SetHidden(PlayerAvatar * playerAvatar, int param1); -void PlayerAvatar_SetMapObject(PlayerAvatar * playerAvatar, MapObject * param1); -MapObject * Player_MapObject(PlayerAvatar * playerAvatar); -const MapObject * PlayerAvatar_ConstMapObject(const PlayerAvatar * playerAvatar); -void PlayerAvatar_SetPlayerState(PlayerAvatar * playerAvatar, int param1); -int PlayerAvatar_GetPlayerState(PlayerAvatar * playerAvatar); -void PlayerAvatar_TurnOnRequestStateBit(PlayerAvatar * playerAvatar, u32 param1); -void PlayerAvatar_SetRequestStateFlag(PlayerAvatar * playerAvatar, u32 param1); -u32 PlayerAvatar_RequestStateFlag(PlayerAvatar * playerAvatar); -void PlayerAvatar_SetGender(PlayerAvatar * playerAvatar, int param1); -int PlayerAvatar_Gender(PlayerAvatar * playerAvatar); -int PlayerAvatar_Speed(PlayerAvatar * playerAvatar); -void PlayerAvatar_SetSpeed(PlayerAvatar * playerAvatar, int param1); -void PlayerAvatar_ClearSpeed(PlayerAvatar * playerAvatar); -int PlayerAvatar_AddMoveSpeed(PlayerAvatar * playerAvatar, int param1, int param2); -void sub_0205EBDC(PlayerAvatar * playerAvatar, int param1); -int sub_0205EBE0(PlayerAvatar * playerAvatar); -void sub_0205EBE4(PlayerAvatar * playerAvatar, int param1); -int sub_0205EBE8(PlayerAvatar * playerAvatar); -void sub_0205EBEC(PlayerAvatar * playerAvatar, int param1, int param2); -void sub_0205EC00(PlayerAvatar * playerAvatar, UnkStruct_ov101_021D5D90 * param1); -UnkStruct_ov101_021D5D90 * sub_0205EC04(PlayerAvatar * playerAvatar); -PlayerData * PlayerAvatar_PlayerData(PlayerAvatar * playerAvatar); -void sub_0205EC10(PlayerAvatar * playerAvatar, u32 param1); -u32 sub_0205EC14(PlayerAvatar * playerAvatar); -void sub_0205EC18(PlayerAvatar * playerAvatar, int param1); -int sub_0205EC1C(PlayerAvatar * playerAvatar); -void sub_0205EC20(PlayerAvatar * playerAvatar, u32 param1, int param2); -void PlayerData_Init(PlayerData * param0); -int PlayerData_HasRunningShoes(PlayerData * param0); -void PlayerData_SetRunningShoes(PlayerData * param0, int param1); -int PlayerData_CyclingGear(PlayerData * param0); -void PlayerData_SetCyclingGear(PlayerData * param0, int param1); -void PlayerAvatar_SetCyclingGear(PlayerAvatar * playerAvatar, int param1); -int PlayerAvatar_CyclingGear(PlayerAvatar * playerAvatar); -u32 sub_0205EC94(PlayerData * param0); -void sub_0205ECA0(PlayerData * param0, u32 param1); -void sub_0205ECA8(PlayerAvatar * playerAvatar, u32 param1); -void sub_0205ECB8(PlayerAvatar * playerAvatar, const VecFx32 * param1, int param2); -void sub_0205ECE0(PlayerAvatar * playerAvatar, int param1, int param2, int param3); -void sub_0205ED0C(PlayerAvatar * playerAvatar, fx32 param1); -void sub_0205ED2C(PlayerAvatar * playerAvatar, int param1); -void sub_0205ED48(PlayerAvatar * playerAvatar, int param1); +PlayerAvatar *PlayerAvatar_Init(const MapObjectManager *param0, int param1, int param2, int param3, int param4, int param5, int param6, PlayerData *param7); +PlayerAvatar *sub_0205E820(const MapObjectManager *param0, PlayerData *param1, int param2); +void PlayerAvatar_InitDraw(PlayerAvatar *playerAvatar, int param1); +void Player_Delete(PlayerAvatar *playerAvatar); +void Player_DeleteAll(PlayerAvatar *playerAvatar); +MapObject *sub_0205EA24(const MapObjectManager *param0); +int PlayerAvatar_GetDir(PlayerAvatar *const playerAvatar); +void Player_SetDir(PlayerAvatar *playerAvatar, int param1); +int PlayerAvatar_GetMoveDir(PlayerAvatar *const playerAvatar); +int sub_0205EAA0(PlayerAvatar *const playerAvatar); +int Player_GetXPos(PlayerAvatar *const playerAvatar); +int Player_GetZPos(PlayerAvatar *const playerAvatar); +int PlayerAvatar_XPosPrev(PlayerAvatar *const playerAvatar); +int PlayerAvatar_ZPosPrev(PlayerAvatar *const playerAvatar); +void PlayerAvatar_PosVectorOut(PlayerAvatar *const playerAvatar, VecFx32 *param1); +const VecFx32 *PlayerAvatar_PosVector(PlayerAvatar *const playerAvatar); +void sub_0205EB08(PlayerAvatar *playerAvatar, int param1); +int PlayerAvatar_MoveState(const PlayerAvatar *playerAvatar); +void sub_0205EB10(PlayerAvatar *playerAvatar, int param1); +int Player_MoveState(const PlayerAvatar *playerAvatar); +void PlayerAvatar_SetHidden(PlayerAvatar *playerAvatar, int param1); +void PlayerAvatar_SetMapObject(PlayerAvatar *playerAvatar, MapObject *param1); +MapObject *Player_MapObject(PlayerAvatar *playerAvatar); +const MapObject *PlayerAvatar_ConstMapObject(const PlayerAvatar *playerAvatar); +void PlayerAvatar_SetPlayerState(PlayerAvatar *playerAvatar, int param1); +int PlayerAvatar_GetPlayerState(PlayerAvatar *playerAvatar); +void PlayerAvatar_TurnOnRequestStateBit(PlayerAvatar *playerAvatar, u32 param1); +void PlayerAvatar_SetRequestStateFlag(PlayerAvatar *playerAvatar, u32 param1); +u32 PlayerAvatar_RequestStateFlag(PlayerAvatar *playerAvatar); +void PlayerAvatar_SetGender(PlayerAvatar *playerAvatar, int param1); +int PlayerAvatar_Gender(PlayerAvatar *playerAvatar); +int PlayerAvatar_Speed(PlayerAvatar *playerAvatar); +void PlayerAvatar_SetSpeed(PlayerAvatar *playerAvatar, int param1); +void PlayerAvatar_ClearSpeed(PlayerAvatar *playerAvatar); +int PlayerAvatar_AddMoveSpeed(PlayerAvatar *playerAvatar, int param1, int param2); +void sub_0205EBDC(PlayerAvatar *playerAvatar, int param1); +int sub_0205EBE0(PlayerAvatar *playerAvatar); +void sub_0205EBE4(PlayerAvatar *playerAvatar, int param1); +int sub_0205EBE8(PlayerAvatar *playerAvatar); +void sub_0205EBEC(PlayerAvatar *playerAvatar, int param1, int param2); +void sub_0205EC00(PlayerAvatar *playerAvatar, UnkStruct_ov101_021D5D90 *param1); +UnkStruct_ov101_021D5D90 *sub_0205EC04(PlayerAvatar *playerAvatar); +PlayerData *PlayerAvatar_PlayerData(PlayerAvatar *playerAvatar); +void sub_0205EC10(PlayerAvatar *playerAvatar, u32 param1); +u32 sub_0205EC14(PlayerAvatar *playerAvatar); +void sub_0205EC18(PlayerAvatar *playerAvatar, int param1); +int sub_0205EC1C(PlayerAvatar *playerAvatar); +void sub_0205EC20(PlayerAvatar *playerAvatar, u32 param1, int param2); +void PlayerData_Init(PlayerData *param0); +int PlayerData_HasRunningShoes(PlayerData *param0); +void PlayerData_SetRunningShoes(PlayerData *param0, int param1); +int PlayerData_CyclingGear(PlayerData *param0); +void PlayerData_SetCyclingGear(PlayerData *param0, int param1); +void PlayerAvatar_SetCyclingGear(PlayerAvatar *playerAvatar, int param1); +int PlayerAvatar_CyclingGear(PlayerAvatar *playerAvatar); +u32 sub_0205EC94(PlayerData *param0); +void sub_0205ECA0(PlayerData *param0, u32 param1); +void sub_0205ECA8(PlayerAvatar *playerAvatar, u32 param1); +void sub_0205ECB8(PlayerAvatar *playerAvatar, const VecFx32 *param1, int param2); +void sub_0205ECE0(PlayerAvatar *playerAvatar, int param1, int param2, int param3); +void sub_0205ED0C(PlayerAvatar *playerAvatar, fx32 param1); +void sub_0205ED2C(PlayerAvatar *playerAvatar, int param1); +void sub_0205ED48(PlayerAvatar *playerAvatar, int param1); int Player_MoveStateFromGender(int param0, int param1); u32 sub_0205EED8(int param0); -PlayerAvatar * sub_0205EF3C(FieldSystem * fieldSystem); -void sub_0205EF40(PlayerAvatar * playerAvatar, int param1); -int sub_0205EF58(PlayerAvatar * playerAvatar); -void sub_0205EF6C(PlayerAvatar * playerAvatar, int param1); -int sub_0205EF84(PlayerAvatar * playerAvatar); -void sub_0205EF98(PlayerAvatar * playerAvatar, int param1); -int sub_0205EFB0(PlayerAvatar * playerAvatar); -void sub_0205EFC4(PlayerAvatar * playerAvatar, int param1); -int sub_0205EFDC(PlayerAvatar * playerAvatar); -void PlayerAvatar_SetInDeepSwamp(PlayerAvatar * playerAvatar, int param1); -int PlayerAvatar_IsNotInDeepSwamp(PlayerAvatar * playerAvatar); -void sub_0205F01C(PlayerAvatar * playerAvatar, int param1); -int sub_0205F034(PlayerAvatar * playerAvatar); -void sub_0205F048(PlayerAvatar * playerAvatar); -void sub_0205F054(PlayerAvatar * playerAvatar); -int sub_0205F060(PlayerAvatar * playerAvatar); -void sub_0205F074(PlayerAvatar * playerAvatar, int param1); -int sub_0205F08C(PlayerAvatar * playerAvatar); -void PlayerAvatar_SetDistortionState(PlayerAvatar * playerAvatar, enum AvatarDistortionState state); -enum AvatarDistortionState PlayerAvatar_MapDistortionState(PlayerAvatar * const playerAvatar); -BOOL PlayerAvatar_DistortionGravityChanged(PlayerAvatar * const playerAvatar); -BOOL PlayerAvatar_DistortionStateOnFloor(PlayerAvatar * const playerAvatar); +PlayerAvatar *sub_0205EF3C(FieldSystem *fieldSystem); +void sub_0205EF40(PlayerAvatar *playerAvatar, int param1); +int sub_0205EF58(PlayerAvatar *playerAvatar); +void sub_0205EF6C(PlayerAvatar *playerAvatar, int param1); +int sub_0205EF84(PlayerAvatar *playerAvatar); +void sub_0205EF98(PlayerAvatar *playerAvatar, int param1); +int sub_0205EFB0(PlayerAvatar *playerAvatar); +void sub_0205EFC4(PlayerAvatar *playerAvatar, int param1); +int sub_0205EFDC(PlayerAvatar *playerAvatar); +void PlayerAvatar_SetInDeepSwamp(PlayerAvatar *playerAvatar, int param1); +int PlayerAvatar_IsNotInDeepSwamp(PlayerAvatar *playerAvatar); +void sub_0205F01C(PlayerAvatar *playerAvatar, int param1); +int sub_0205F034(PlayerAvatar *playerAvatar); +void sub_0205F048(PlayerAvatar *playerAvatar); +void sub_0205F054(PlayerAvatar *playerAvatar); +int sub_0205F060(PlayerAvatar *playerAvatar); +void sub_0205F074(PlayerAvatar *playerAvatar, int param1); +int sub_0205F08C(PlayerAvatar *playerAvatar); +void PlayerAvatar_SetDistortionState(PlayerAvatar *playerAvatar, enum AvatarDistortionState state); +enum AvatarDistortionState PlayerAvatar_MapDistortionState(PlayerAvatar *const playerAvatar); +BOOL PlayerAvatar_DistortionGravityChanged(PlayerAvatar *const playerAvatar); +BOOL PlayerAvatar_DistortionStateOnFloor(PlayerAvatar *const playerAvatar); #endif // POKEPLATINUM_PLAYER_AVATAR_H diff --git a/include/poffin.h b/include/poffin.h index c17b6c068e..c8cd350006 100644 --- a/include/poffin.h +++ b/include/poffin.h @@ -1,8 +1,9 @@ #ifndef POKEPLATINUM_POFFIN_H #define POKEPLATINUM_POFFIN_H -#include "struct_defs/struct_0202A93C.h" #include "struct_decls/struct_0202AB28_decl.h" +#include "struct_defs/struct_0202A93C.h" + #include "savedata.h" typedef enum { @@ -17,24 +18,24 @@ typedef enum { } PoffinAttributeID; int Poffin_sizeof(void); -BOOL sub_0202A914(Poffin * poffin); -void Poffin_clear(Poffin * poffin); -Poffin * Poffin_malloc(int heapID); -void Poffin_copy(Poffin * src, Poffin * dest); -u8 Poffin_GetAttribute(Poffin * poffin, PoffinAttributeID attributeID); -int sub_0202A9E4(Poffin * poffin, u8 * param1, u8 param2, BOOL isFoul); -void Poffin_StoreAttributesToArray(Poffin * poffin, u8 * dest); -u8 Poffin_CalcLevel(Poffin * poffin); -UnkStruct_0202AB28 * Poffin_GetSavedataBlock(SaveData * savedata); +BOOL sub_0202A914(Poffin *poffin); +void Poffin_clear(Poffin *poffin); +Poffin *Poffin_malloc(int heapID); +void Poffin_copy(Poffin *src, Poffin *dest); +u8 Poffin_GetAttribute(Poffin *poffin, PoffinAttributeID attributeID); +int sub_0202A9E4(Poffin *poffin, u8 *param1, u8 param2, BOOL isFoul); +void Poffin_StoreAttributesToArray(Poffin *poffin, u8 *dest); +u8 Poffin_CalcLevel(Poffin *poffin); +UnkStruct_0202AB28 *Poffin_GetSavedataBlock(SaveData *savedata); int Poffin_SaveSize(void); -void Poffin_Init(UnkStruct_0202AB28 * param0); -u16 sub_0202AB54(UnkStruct_0202AB28 * param0); -u16 sub_0202AB74(UnkStruct_0202AB28 * param0, Poffin * param1); -BOOL sub_0202AB98(UnkStruct_0202AB28 * param0, u16 param1); -void sub_0202ABD4(UnkStruct_0202AB28 * param0); -void sub_0202AC54(UnkStruct_0202AB28 * param0, u16 param1, Poffin * param2); -Poffin * sub_0202AC70(UnkStruct_0202AB28 * param0, u16 param1, int param2); -u16 sub_0202AC98(UnkStruct_0202AB28 * param0); -u16 sub_0202ACC0(UnkStruct_0202AB28 * param0); +void Poffin_Init(UnkStruct_0202AB28 *param0); +u16 sub_0202AB54(UnkStruct_0202AB28 *param0); +u16 sub_0202AB74(UnkStruct_0202AB28 *param0, Poffin *param1); +BOOL sub_0202AB98(UnkStruct_0202AB28 *param0, u16 param1); +void sub_0202ABD4(UnkStruct_0202AB28 *param0); +void sub_0202AC54(UnkStruct_0202AB28 *param0, u16 param1, Poffin *param2); +Poffin *sub_0202AC70(UnkStruct_0202AB28 *param0, u16 param1, int param2); +u16 sub_0202AC98(UnkStruct_0202AB28 *param0); +u16 sub_0202ACC0(UnkStruct_0202AB28 *param0); #endif // POKEPLATINUM_POFFIN_H diff --git a/include/pokemon.h b/include/pokemon.h index f6e88e4f40..837f399af4 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -1,35 +1,36 @@ #ifndef POKEPLATINUM_POKEMON_H #define POKEPLATINUM_POKEMON_H +#include + #include "constants/moves.h" #include "constants/sound.h" #include "constants/string.h" +#include "struct_decls/cell_actor_data.h" +#include "struct_decls/pokemon_animation_sys_decl.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_defs/sprite_animation_frame.h" -#include "struct_decls/sprite_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" -#include "struct_decls/pokemon_animation_sys_decl.h" -#include "trainer_info.h" -#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_02078B40_decl.h" #include "struct_decls/struct_party_decl.h" +#include "struct_defs/archived_sprite.h" +#include "struct_defs/chatot_cry.h" +#include "struct_defs/sprite_animation_frame.h" + #include "overlay005/struct_ov5_021DE5D0.h" #include "string.h" +#include "trainer_info.h" -#include - -#define OTID_NOT_SET 0 -#define OTID_SET 1 -#define OTID_NOT_SHINY 2 +#define OTID_NOT_SET 0 +#define OTID_SET 1 +#define OTID_NOT_SHINY 2 -#define FACE_BACK 0 -#define FACE_FRONT 2 +#define FACE_BACK 0 +#define FACE_FRONT 2 /** * @brief Pokemon Personal data structure. This contains data that is the same across all pokemon of the same species/form @@ -75,7 +76,7 @@ typedef struct PokemonPersonalData { } PokemonPersonalData; /** - * @brief Block A of the BoxPokemon data structure + * @brief Block A of the BoxPokemon data structure */ typedef struct PokemonDataBlockA { u16 species; //!< The Pokemon's species; their National Pokedex number. @@ -97,7 +98,7 @@ typedef struct PokemonDataBlockA { u8 spDefEV; //!< The Pokemon's current Special Defense EVs. u8 cool; //!< The Pokemon's current Cool stat. - u8 beauty; //!< The Pokemon's current Beauty stat. + u8 beauty; //!< The Pokemon's current Beauty stat. u8 cute; //!< The Pokemon's current Cute stat. u8 smart; //!< The Pokemon's current Smart stat. u8 tough; //!< The Pokemon's current Tough stat. @@ -107,7 +108,7 @@ typedef struct PokemonDataBlockA { } PokemonDataBlockA; /** - * @brief Block B of the BoxPokemon data structure + * @brief Block B of the BoxPokemon data structure */ typedef struct PokemonDataBlockB { u16 moves[LEARNED_MOVES_MAX]; //!< List of moves currently known by the Pokemon. @@ -225,45 +226,45 @@ typedef struct Pokemon { /** * @brief Zeros out a Pokemon data structure, then encrypts the result - * - * @param mon + * + * @param mon */ void Pokemon_Init(Pokemon *mon); /** * @brief Zeros out a BoxPokemon data structure, then encrypts the result - * - * @param boxMon + * + * @param boxMon */ void BoxPokemon_Init(BoxPokemon *boxMon); /** * @brief Returns the size in bytes of a Pokemon struct as an int - * + * * @return Size in bytes of a Pokemon struct */ int Pokemon_StructSize(void); /** * @brief Allocates a Pokemon struct on the given heap, then calls ZeroMonData() on it - * - * @param heapID + * + * @param heapID * @return A new empty but encrypted Pokemon struct */ Pokemon *Pokemon_New(u32 heapID); /** * @brief Decrypts a Pokemon data structure. PartyPokemon data is encrypted using the pokemons personality value, BoxPokemon data using a checksum value - * - * @param mon + * + * @param mon * @return Whether the pokemons data was decrypted by this call. Passed to EncryptMon() to decide whether to reencrypt the data or not */ BOOL Pokemon_EnterDecryptionContext(Pokemon *mon); /** * @brief Encrypts a Pokemon data structure. PartyPokemon data is encrypted using the pokemons personality value, BoxPokemon data using a checksum value - * - * @param mon + * + * @param mon * @param encrypt Whether to encrypt the data or not. If this is false, the function does nothing and returns false. * @return Whether the pokemons data was encrypted by this call. */ @@ -271,16 +272,16 @@ BOOL Pokemon_ExitDecryptionContext(Pokemon *mon, BOOL encrypt); /** * @brief Decrypts a BoxPokemon data structure - * - * @param boxMon + * + * @param boxMon * @return Whether the pokemons data was decrypted by this call. Passed to EncryptBoxMon() to decide whether to reencrypt the data or not */ BOOL BoxPokemon_EnterDecryptionContext(BoxPokemon *boxMon); /** * @brief Encrypts a BoxPokemon data structure - * - * @param boxMon + * + * @param boxMon * @param encrypt Whether to encrypt the data or not. If this is false, the function does nothing and returns false. * @return Whether the pokemons data was encrypted by this call. */ @@ -294,23 +295,23 @@ void sub_02074158(Pokemon *mon, u16 monSpecies, u8 monLevel, u32 monCombinedIVs, /** * @brief Calculates and stores the current level and stats for a given Pokemon based on its IVs, EVs etc. - * - * @param mon + * + * @param mon */ void Pokemon_CalcLevelAndStats(Pokemon *mon); /** * @brief Calculates and stores the current stats for a given Pokemon based on its IVs, EVs etc. - * - * @param mon + * + * @param mon */ void Pokemon_CalcStats(Pokemon *mon); /** * @brief Gets a value from a Pokemon, storing it in dest if neccessary - * - * @param mon - * @param param + * + * @param mon + * @param param * @param[out] dest Pointer for storing longer data * @return The requested value */ @@ -318,9 +319,9 @@ u32 Pokemon_GetValue(Pokemon *mon, enum PokemonDataParam param, void *dest); /** * @brief Gets a value from a Pokemon, storing it in dest if neccessary - * - * @param boxMon - * @param param + * + * @param boxMon + * @param param * @param[out] dest Pointer for storing longer data * @return The requested value */ @@ -328,73 +329,73 @@ u32 BoxPokemon_GetValue(BoxPokemon *boxMon, enum PokemonDataParam param, void *d /** * @brief Sets a value in a Pokemon, reading it from value if neccessary - * - * @param mon + * + * @param mon * @param param - * @param value + * @param value */ void Pokemon_SetValue(Pokemon *mon, enum PokemonDataParam param, const void *value); /** * @brief Sets a value in a BoxPokemon, reading it from value if neccessary - * - * @param boxMon - * @param param - * @param value + * + * @param boxMon + * @param param + * @param value */ void BoxPokemon_SetValue(BoxPokemon *boxMon, enum PokemonDataParam param, const void *value); /** - * @brief Increases some numerical fields in a Pokemon by the given value. Does nothing if the field is not supported - * + * @brief Increases some numerical fields in a Pokemon by the given value. Does nothing if the field is not supported + * * @todo list of supported fields? * - * @param mon - * @param param - * @param value + * @param mon + * @param param + * @param value */ void Pokemon_IncreaseValue(Pokemon *mon, enum PokemonDataParam param, int value); /** * @brief Gets a PokemonPersonalData based on a pokemon species and form - * - * @param monSpecies + * + * @param monSpecies * @param monForm * @param heapID The index of the heap that the PokemonPersonalData should be loaded into - * @return PokemonPersonalData* + * @return PokemonPersonalData* */ PokemonPersonalData *PokemonPersonalData_FromMonForm(int monSpecies, int monForm, int heapID); /** * @brief Gets a PokemonPersonalData based on a pokemon species - * - * @param monSpecies + * + * @param monSpecies * @param heapID The index of the heap that the PokemonPersonalData should be loaded into - * @return PokemonPersonalData* + * @return PokemonPersonalData* */ PokemonPersonalData *PokemonPersonalData_FromMonSpecies(int monSpecies, int heapID); /** * @brief Gets a value from a PokemonPersonalData structure - * - * @param monPersonalData - * @param param What value to get + * + * @param monPersonalData + * @param param What value to get * @return The requested value */ u32 PokemonPersonalData_GetValue(PokemonPersonalData *monPersonalData, enum PokemonPersonalDataParam param); /** * @brief Frees a PokemonPersonalData structure from the heap - * - * @param monPersonalData + * + * @param monPersonalData */ void PokemonPersonalData_Free(PokemonPersonalData *monPersonalData); /** * @brief Loads a PokemonPersonalData based on its species and form and gets a value from it - * - * @param monSpecies - * @param monForm + * + * @param monSpecies + * @param monForm * @param param What value to get * @return The requested value */ @@ -402,8 +403,8 @@ u32 PokemonPersonalData_GetFormValue(int monSpecies, int monForm, enum PokemonPe /** * @brief Loads a PokemonPersonalData based on its species and gets a value from it - * - * @param monSpecies + * + * @param monSpecies * @param param What value to get * @return The requested value */ @@ -411,33 +412,33 @@ u32 PokemonPersonalData_GetSpeciesValue(int monSpecies, enum PokemonPersonalData /** * @brief Gets how much progress a Pokemon has made towards its next level as a percentage - * - * @param mon + * + * @param mon * @return how much progress a Pokemon has made towards its next level as a percentage */ u8 Pokemon_GetPercentToNextLevel(Pokemon *mon); /** * @brief Gets how much experience is needed for the given Pokemon to level up - * - * @param boxMon + * + * @param boxMon * @return The amount of exp. needed for the given Pokemon to level up */ u32 Pokemon_GetExpToNextLevel(Pokemon *mon); /** * @brief Gets the amount of expeirence needed for the given Pokemon to reach its current level - * - * @param mon - * @return The amount of exp. needed for the given Pokemon to reach its current level + * + * @param mon + * @return The amount of exp. needed for the given Pokemon to reach its current level */ u32 Pokemon_GetCurrentLevelBaseExp(Pokemon *mon); /** * @brief Gets the amount of expeirence needed for a pokemon species to reach a specified level - * - * @param monSpecies - * @param monLevel + * + * @param monSpecies + * @param monLevel * @return The amount of exp. needed for the given pokemon species to reach the specified level */ u32 Pokemon_GetSpeciesBaseExpAt(int monSpecies, int monLevel); @@ -460,7 +461,7 @@ u32 BoxPokemon_GetLevel(BoxPokemon *boxMon); /** * @brief Gets the level of a pokemon based on its species and exp - * + * * @param monSpecies * @param monExp * @return The pokemons level @@ -469,10 +470,10 @@ u32 Pokemon_GetSpeciesLevelAt(u16 monSpecies, u32 monExp); /** * @brief Gets the level of a pokemon based on its personal data and exp - * - * @param monPersonalData + * + * @param monPersonalData * @param unused_monSpecies unused - * @param monExp + * @param monExp * @return The pokemons level */ u32 PokemonPersonalData_GetLevelAt(PokemonPersonalData *monPersonalData, u16 unused_monSpecies, u32 monExp); @@ -495,17 +496,17 @@ u8 BoxPokemon_GetNature(BoxPokemon *boxMon); /** * @brief Gets the nature of a pokemon based on its personality value - * - * @param monPersonality + * + * @param monPersonality * @return The pokemons nature */ u8 Pokemon_GetNatureOf(u32 monPersonality); /** * @brief Gets the affinitiy of a given pokemon nature to a given stat - * - * @param monNature - * @param statType + * + * @param monNature + * @param statType * @return 1 if stat is increased, -1 if stat is decreased, else 0 */ s8 Pokemon_GetStatAffinityOf(u8 monNature, u8 statType); @@ -514,52 +515,52 @@ void Pokemon_UpdateFriendship(Pokemon *mon, u8 param1, u16 param2); /** * @brief Gets the gender of a Pokemon based on its species and personality value - * - * @param boxMon - * @return The pokemons gender + * + * @param boxMon + * @return The pokemons gender */ u8 Pokemon_GetGender(Pokemon *mon); /** * @brief Gets the gender of a BoxPokemon based on its species and personality value - * - * @param boxMon - * @return The pokemons gender + * + * @param boxMon + * @return The pokemons gender */ u8 BoxPokemon_GetGender(BoxPokemon *boxMon); /** * @brief Gets the gender of a pokemon based on its species and personality value - * - * @param monSpecies - * @param monPersonality + * + * @param monSpecies + * @param monPersonality * @return The pokemons gender */ u8 Pokemon_GetGenderOf(u16 monSpecies, u32 monPersonality); /** * @brief Gets the gender of a pokemon based on its PokemonPersonalData and personality value - * - * @param monPersonalData + * + * @param monPersonalData * @param unused_monSpecies unused - * @param monPersonality + * @param monPersonality * @return The pokemons gender */ u8 PokemonPersonalData_GetGenderOf(PokemonPersonalData *monPersonalData, u16 unused_monSpecies, u32 monPersonality); /** * @brief Gets whether a BoxPokemon is shiny based on its Original Trainer ID and its personality value - * - * @param mon + * + * @param mon * @return Whether the pokemon is shiny or not */ u8 Pokemon_IsShiny(Pokemon *mon); /** * @brief Gets whether a pokemon is shiny based on its Original Trainer ID and its personality value - * - * @param monOTID - * @param monPersonality + * + * @param monOTID + * @param monPersonality * @return Whether the pokemon is shiny or not */ u8 Pokemon_IsPersonalityShiny(u32 monOTID, u32 monPersonality); @@ -567,7 +568,7 @@ u8 Pokemon_IsPersonalityShiny(u32 monOTID, u32 monPersonality); /** * @brief Computes a personality value which, when applied to the given trainer ID, will result * in a shiny Pokemon. - * + * * @param monOTID * @return The computed personality value */ @@ -575,7 +576,7 @@ u32 Pokemon_FindShinyPersonality(u32 monOTID); /** * @brief Build an ArchivedSprite for a Pokemon. - * + * * @param sprite Pointer to the sprite structure to be populated * @param mon The Pokemon whose data will be used to build the sprite * @param face Which face of the Pokemon the player sees @@ -585,7 +586,7 @@ void Pokemon_BuildArchivedSprite(ArchivedSprite *sprite, Pokemon *mon, u8 face); /** * @brief Build an ArchivedSprite for a Pokemon, preferring sprites from * Diamond/Pearl where possible. - * + * * @param sprite Pointer to the sprite structure to be populated * @param mon The Pokemon whose data will be used to build the sprite * @param face Which face of the Pokemon the player sees @@ -594,7 +595,7 @@ void Pokemon_BuildArchivedDPSprite(ArchivedSprite *sprite, Pokemon *mon, u8 face /** * @brief Build an ArchivedSprite for a BoxPokemon. - * + * * @param sprite Pointer to the sprite structure to be populated * @param mon The Pokemon whose data will be used to build the sprite * @param face Which face of the Pokemon the player sees @@ -605,7 +606,7 @@ void BoxPokemon_BuildArchivedSprite(ArchivedSprite *sprite, BoxPokemon *boxMon, /** * @brief Build an ArchivedSprite for a Pokemon sprite according to the input * species, form, and gender. - * + * * @param sprite Pointer to the sprite structure to be populated * @param species The Pokemon's species * @param gender The Pokemon's gender @@ -618,36 +619,36 @@ void BuildArchivedPokemonSprite(ArchivedSprite *sprite, u16 monSpecies, u8 monGe /** * @brief Sanitizes a pokemon form. If the given form is greater than the max for the given species, returns zero, else returns the form unchanged - * - * @param monSpecies - * @param monForm + * + * @param monSpecies + * @param monForm * @return The sanitized pokemon form */ u8 Pokemon_SanitizeFormId(u16 monSpecies, u8 monForm); /** * @brief Load the Y-offset applied to a Pokemon's sprite-face on display. - * - * @param mon - * @param face + * + * @param mon + * @param face * @return Y-offset applied to the sprite-face on display */ u8 Pokemon_SpriteYOffset(Pokemon *mon, u8 face); /** * @brief Load the Y-offset applied to a Pokemon's DP sprite-face on display. - * - * @param mon - * @param face + * + * @param mon + * @param face * @return Y-offset applied to the DP sprite-face on display */ u8 Pokemon_DPSpriteYOffset(Pokemon *mon, u8 face); /** * @brief Load the Y-offset applied to a Pokemon's sprite-face on display. - * - * @param mon - * @param face + * + * @param mon + * @param face * @param preferDP If TRUE, prefer Diamond/Pearl sprites, where possible * @return Y-offset applied to the sprite-face on display */ @@ -655,7 +656,7 @@ u8 BoxPokemon_SpriteYOffset(BoxPokemon *boxMon, u8 face, BOOL preferDP); /** * @brief Load the Y-offset applied to a Pokemon's sprite-face on display. - * + * * @param species The Pokemon's species * @param gender The Pokemon's gender * @param face Which face of the Pokemon the player sees @@ -670,38 +671,38 @@ void sub_02076AAC(int param0, int param1, UnkStruct_ov5_021DE5D0 *param2); /** * @brief Returns the size in bytes of a Pokemon struct as a u32 - * + * * @return Size in bytes of a Pokemon struct */ u32 Pokemon_GetStructSize(void); /** * @brief Returns the size in bytes of a BoxPokemon struct as a u32 - * + * * @return Size in bytes of a BoxPokemon struct */ u32 BoxPokemon_GetStructSize(void); /** * @brief Gets the form of a Pokemon - * - * @param mon + * + * @param mon * @return The pokemons form */ u8 Pokemon_GetForm(Pokemon *mon); /** * @brief Gets the form of a BoxPokemon - * - * @param boxMon + * + * @param boxMon * @return The pokemons form */ u8 BoxPokemon_GetForm(BoxPokemon *boxMon); /** * @brief Gets the BoxPokemon data for a given Pokemon - * - * @param mon + * + * @param mon * @return The BoxPokemon data for a given Pokemon */ BoxPokemon *Pokemon_GetBoxPokemon(Pokemon *mon); @@ -713,36 +714,36 @@ u16 sub_02076FD4(const u16 monSpecies); /** * @brief Adds a move to the moveset of a Pokemon - * - * @param mon - * @param moveID + * + * @param mon + * @param moveID * @return The given moveID if successful, 0xfffe if already known, 0xffff if there is no room for the move */ u16 Pokemon_AddMove(Pokemon *mon, u16 moveID); /** * @brief Deletes the first move of a Pokemon and adds the given move to the end of its moveset - * - * @param mon - * @param moveID + * + * @param mon + * @param moveID */ void Pokemon_ReplaceMove(Pokemon *mon, u16 moveID); /** * @brief Sets the given moveSlot of a Pokemon, removing its PP Ups - * - * @param mon - * @param moveID - * @param moveSlot + * + * @param mon + * @param moveID + * @param moveSlot */ void Pokemon_ResetMoveSlot(Pokemon *mon, u16 moveID, u8 moveSlot); /** * @brief Sets the given moveSlot of a Pokemon, retaining the PP Ups for that slot - * - * @param mon - * @param moveID - * @param moveSlot + * + * @param mon + * @param moveID + * @param moveSlot */ void Pokemon_SetMoveSlot(Pokemon *mon, u16 moveID, u8 moveSlot); @@ -750,27 +751,27 @@ u16 Pokemon_LevelUpMove(Pokemon *mon, int *index, u16 *moveID); /** * @brief Swaps the places of two moves on a Pokemon - * - * @param mon - * @param moveSlot1 - * @param moveSlot2 + * + * @param mon + * @param moveSlot1 + * @param moveSlot2 */ void Pokemon_SwapMoveSlots(Pokemon *mon, int moveSlot1, int moveSlot2); /** * @brief Swaps the places of two moves on a BoxPokemon - * - * @param boxMon - * @param moveSlot1 - * @param moveSlot2 + * + * @param boxMon + * @param moveSlot1 + * @param moveSlot2 */ void BoxPokemon_SwapMoveSlots(BoxPokemon *boxMon, int moveSlot1, int moveSlot2); /** * @brief Deletes the given moveSlot of a Pokemon, shifting the ones above it down - * - * @param mon - * @param moveSlot + * + * @param mon + * @param moveSlot */ void Pokemon_ClearMoveSlot(Pokemon *mon, u32 moveSlot); @@ -778,15 +779,15 @@ void Pokemon_FromBoxPokemon(BoxPokemon *boxMon, Pokemon *mon); /** * @brief Gets the level of the highest level pokemon in the Party - * - * @param party - * @return The level of the highest level pokemon in the Party + * + * @param party + * @return The level of the highest level pokemon in the Party */ u8 Party_GetMaxLevel(Party *party); /** * @brief Gets the Sinnoh Pokedex number of a pokemon from its National Pokedex number - * + * * @param species The National Pokedex number of a pokemon * @return The Sinnoh Pokedex number of that pokemon (or zero if none exists) */ @@ -795,7 +796,7 @@ u16 Pokemon_SinnohDexNumber(u16 species); /** * @brief Gets the National Pokedex number of a pokemon from its Sinnoh Pokedex number * (Note: Inputting 0 here will return 493 (Arceus)) - * + * * @param sinnohDexNumber The Sinnoh Pokedex number of a pokemon * @return The National Pokedex number of that pokemon (or zero if none exists) */ @@ -807,29 +808,29 @@ void BoxPokemon_FromPokemon(Pokemon *src, BoxPokemon *dest); /** * @brief Gets the affinitiy of a given Pokemon to a given flavor - * - * @param mon - * @param flavor + * + * @param mon + * @param flavor * @return 1 if liked flavor, -1 if disliked flavor, else 0 */ s8 Pokemon_GetFlavorAffinity(Pokemon *mon, int flavor); /** * @brief Gets the affinitiy of a given Pokemon personality to a given flavor - * - * @param monPersonality - * @param flavor + * + * @param monPersonality + * @param flavor * @return 1 if liked flavor, -1 if disliked flavor, else 0 */ s8 Pokemon_GetFlavorAffinityOf(u32 monPersonality, int flavor); /** * @brief Gets all moves that the given pokemon species and form can learn by leveling up - * - * @param monSpecies - * @param monForm + * + * @param monSpecies + * @param monForm * @param[out] monLevelUpMoveIDs Pointer to a u16 array for storing the level up moves - * @return int + * @return int */ int Pokemon_LoadLevelUpMoveIdsOf(int monSpecies, int monForm, u16 *monLevelUpMoveIDs); @@ -842,97 +843,97 @@ BOOL Pokemon_CanSpreadPokerus(Pokemon *mon); /** * @brief Sets Arceus' form based on its held item. Has no effect if the given Pokemon is not an Arceus - * - * @param mon + * + * @param mon */ void Pokemon_SetArceusForm(Pokemon *mon); /** * @brief Sets Arceus' form based on its held item. Has no effect if the given Pokemon is not an Arceus - * - * @param boxMon + * + * @param boxMon */ void BoxPokemon_SetArceusForm(BoxPokemon *boxMon); /** * @brief Get Arceus' form given an items hold effect - * - * @param itemHoldEffect + * + * @param itemHoldEffect * @return The form arceus should be in */ u8 Pokemon_GetArceusTypeOf(u16 itemHoldEffect); /** * @brief Sets Giratina's form based on its held item. Has no effect if the given Pokemon is not a Giratina - * - * @param mon + * + * @param mon * @return The form Giratina was set to, or -1 if the given BoxPokemon was not a Giratina */ int Pokemon_SetGiratinaForm(Pokemon *mon); /** * @brief Sets Giratina's form based on its held item. Has no effect if the given BoxPokemon is not a Giratina - * - * @param boxMon + * + * @param boxMon * @return The form Giratina was set to, or -1 if the given BoxPokemon was not a Giratina */ int BoxPokemon_SetGiratinaForm(BoxPokemon *boxMon); /** * @brief Set Giratina to its Origin form. Has no effect if the given Pokemon is not a Giratina - * - * @param mon + * + * @param mon */ void Pokemon_SetGiratinaOriginForm(Pokemon *mon); /** * @brief Iterates over all the Pokemon in Party, setting the form of any Giratina. * If param1 is 1, always sets Giratina into Origin form, otherwise its form is based on held item - * - * @param party - * @param param1 + * + * @param party + * @param param1 */ void Party_SetGiratinaForm(Party *party, int param1); /** * @brief Sets Shaymin to the given form. Has no effect if the given Pokemon is not a Shaymin - * - * @param mon - * @param monForm + * + * @param mon + * @param monForm */ void Pokemon_SetShayminForm(Pokemon *mon, int monForm); /** * @brief Sets Shaymin to the given form. Has no effect if the given BoxPokemon is not a Shaymin - * - * @param boxMon - * @param monForm + * + * @param boxMon + * @param monForm */ void BoxPokemon_SetShayminForm(BoxPokemon *boxMon, int monForm); /** * @brief Checks whether Shaymin is allowed to change into Sky Form. Always returns false if the given Pokemon is not a Shaymin - * - * @param mon + * + * @param mon * @return Whether Shaymin is allowed to change into Sky Form */ BOOL Pokemon_CanShayminSkyForm(Pokemon *mon); /** * @brief Iterates over all the Pokemon in Party, setting the form of any Shaymin to land form. - * - * @param party + * + * @param party */ void Party_SetShayminLandForm(Party *party); /** * @brief Sets all Shaymin in the party to Land form at night - * + * * @todo Verify this, seems correct but not sure what param1 does to the calculation here (time zone offset?) - * - * @param party - * @param param1 - * @param rtcTime + * + * @param party + * @param param1 + * @param rtcTime * @return Whether Shaymin should be set to Land form */ BOOL Party_SetShayminForm(Party *party, int param1, const RTCTime *rtcTime); @@ -940,50 +941,50 @@ BOOL Party_SetShayminForm(Party *party, int param1, const RTCTime *rtcTime); /** * @brief Sets Rotom to the given form. Has no effect if the given Pokemon is not a Rotom * If Rotom should learn a form specific move and there is no room, overwrites moveSlot with the new move - * - * @param mon - * @param monForm - * @param moveSlot + * + * @param mon + * @param monForm + * @param moveSlot * @return Whether the given pokemon was a Rotom */ BOOL Pokemon_SetRotomForm(Pokemon *mon, int monForm, int moveSlot); /** * @brief Loads a Level-Up move table based on a pokemon species and form into the pointed to array - * - * @param monSpecies - * @param monForm + * + * @param monSpecies + * @param monForm * @param[out] monLevelUpMoves Pointer to a u16 array to store the move table */ void Pokemon_LoadLevelUpMovesOf(int monSpecies, int monForm, u16 *monLevelUpMoves); /** * @brief Play a Pokemon's cry, according to the given species and form number. - * + * * @param chatotCry Chatot cry data from the save block. Only used * if the Pokemon itself is Chatot. * @param crymod Modification to apply to the Pokemon's cry. - * @param species - * @param form - * @param pan - * @param volume + * @param species + * @param form + * @param pan + * @param volume * @param forceDefaultChatot If TRUE, force usage of Chatot's default cry. - * @param heapID + * @param heapID */ void Pokemon_PlayCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID); /** * @brief Play a Pokemon's cry, according to the given species and form number. - * + * * @param chatotCry Chatot cry data from the save block. Only used * if the Pokemon itself is Chatot. * @param crymod Modification to apply to the Pokemon's cry. - * @param species - * @param form - * @param pan - * @param volume + * @param species + * @param form + * @param pan + * @param volume * @param forceDefaultChatot If TRUE, force usage of Chatot's default cry. - * @param heapID + * @param heapID * @param delay Number of frames until playback will begin. */ void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID, u8 delay); @@ -1014,7 +1015,7 @@ void sub_0207896C(BoxPokemon *boxMon); /** * @brief Load the animation frames for a given species and a client type * (implicitly defining which face of the sprite is visible to the player). - * + * * @param narc Handle to the pl_poke_data archive * @param[out] frames Out-param for the loaded frame data * @param species Species to be loaded @@ -1024,7 +1025,7 @@ void PokeSprite_LoadAnimationFrames(NARC *narc, SpriteAnimationFrame *frames, u1 /** * @brief Load the animation data for a given species and a client type. - * + * * @param narc Handle to the pl_poke_data archive * @param animationSys Animation system container * @param sprite Pre-loaded Pokemon sprite @@ -1037,7 +1038,7 @@ void PokeSprite_LoadAnimation(NARC *narc, PokemonAnimationSys *animationSys, Spr /** * @brief Load the cry delay for a given species and a client type. - * + * * @param narc Handle to the pl_poke_data archive * @param[out] cryDelay Out-param for the loaded cry delay value * @param species Species to be loaded @@ -1047,7 +1048,7 @@ void PokeSprite_LoadCryDelay(NARC *narc, u8 *cryDelay, u16 species, u16 clientTy /** * @brief Load the vertical offset for a given species and a client type. - * + * * @param narc Handle to the pl_poke_data archive * @param[out] yOffset Out-param for the loaded vertical offset value * @param species Species to be loaded @@ -1057,7 +1058,7 @@ void PokeSprite_LoadYOffset(NARC *narc, s8 *yOffset, u16 species); /** * @brief Load the shadow's horizontal offset for a given species and a client type. - * + * * @param narc Handle to the pl_poke_data archive * @param[out] xOffsetShadow Out-param for the loaded cry delay value * @param species Species to be loaded @@ -1067,7 +1068,7 @@ void PokeSprite_LoadXOffsetShadow(NARC *narc, s8 *xOffsetShadow, u16 species); /** * @brief Load the shadow size for a given species and a client type. - * + * * @param narc Handle to the pl_poke_data archive * @param[out] shadowSize Out-param for the loaded cry delay value * @param species Species to be loaded diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index d49c3b323d..adc8b93b62 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -5,16 +5,16 @@ /** * @brief Get the index of the sprite-tiles file used for a given BoxPokemon. - * - * @param mon + * + * @param mon * @return Index of the sprite-tiles file for this Pokemon in pl_poke_icon.narc */ u32 BoxPokemon_IconSpriteIndex(const BoxPokemon *mon); /** * @brief Get the index of the sprite-tiles file used for a given Pokemon. - * - * @param mon + * + * @param mon * @return Index of the sprite-tiles file for this Pokemon in pl_poke_icon.narc */ u32 Pokemon_IconSpriteIndex(Pokemon *mon); @@ -22,20 +22,20 @@ u32 Pokemon_IconSpriteIndex(Pokemon *mon); /** * @brief Get the index of the sprite-tiles file used for a given combination * of species+form and whether or not the Pokemon is in an egg. - * - * @param species - * @param isEgg - * @param form + * + * @param species + * @param isEgg + * @param form * @return Index of the sprite-tiles file for the given tuple in pl_poke_icon.narc */ u32 PokeIconSpriteIndex(u32 species, u32 isEgg, u32 form); /** * @brief Get the form offset for a given BoxPokemon's icon. - * + * * In essence, this is just a nice wrapper around BoxPokemon_GetForm for species * known to have alternate forms (visual or mechanical). - * + * * @param mon * @return Form offset */ @@ -44,61 +44,61 @@ u16 BoxPokemon_IconFormOffset(const BoxPokemon *mon); /** * @brief Get the index of the palette used by a given combination of species+form * and whether or not the Pokemon is in an egg. - * - * @param species - * @param form - * @param isEgg + * + * @param species + * @param form + * @param isEgg * @return Index in the shared palette file for all Pokemon icons. */ const u8 PokeIconPaletteIndex(u32 species, u32 form, u32 isEgg); /** * @brief Get the index of the palette used by a given BoxPokemon. - * - * @param mon + * + * @param mon * @return Index in the shared palette file for all Pokemon icons. */ const u8 BoxPokemon_IconPaletteIndex(const BoxPokemon *mon); /** * @brief Get the index of the palette used by a given Pokemon. - * - * @param mon + * + * @param mon * @return Index in the shared palette file for all Pokemon icons. */ const u8 Pokemon_IconPaletteIndex(Pokemon *mon); /** * @brief Get the file-index of the shared palettes file in pl_poke_icon.narc. - * + * * @return File-index of the shared palettes file */ u32 PokeIconPalettesFileIndex(void); /** * @brief Get the file-index of the shared cells file in pl_poke_icon.narc. - * + * * @return File-index of the shared cells file */ u32 PokeIconCellsFileIndex(void); /** * @brief Get the file-index of the shared 32K cells file in pl_poke_icon.narc. - * + * * @return File-index of the shared cells file */ u32 PokeIcon32KCellsFileIndex(void); /** * @brief Get the file-index of the shared 64K cells file in pl_poke_icon.narc. - * + * * @return File-index of the shared cells file */ u32 PokeIcon64KCellsFileIndex(void); /** * @brief Get the file-index of the shared animation file in pl_poke_icon.narc. - * + * * @return File-index of the shared animation file */ u32 PokeIconAnimationFileIndex(void); @@ -106,7 +106,7 @@ u32 PokeIconAnimationFileIndex(void); /** * @brief Get the file-index of the shared 32K animation file in * pl_poke_icon.narc. - * + * * @return File-index of the shared 32K animation file */ u32 PokeIcon32KAnimationFileIndex(void); @@ -114,7 +114,7 @@ u32 PokeIcon32KAnimationFileIndex(void); /** * @brief Get the file-index of the shared 64K animation file in * pl_poke_icon.narc. - * + * * @return File-index of the shared 64K animation file */ u32 PokeIcon64KAnimationFileIndex(void); diff --git a/include/pokemon_summary_app.h b/include/pokemon_summary_app.h index b3b5417e94..89101844d8 100644 --- a/include/pokemon_summary_app.h +++ b/include/pokemon_summary_app.h @@ -1,23 +1,24 @@ #ifndef POKEPLATINUM_UNK_0208C324_H #define POKEPLATINUM_UNK_0208C324_H -#include "trainer_info.h" -#include "pokemon.h" -#include "struct_defs/pokemon_summary_app.h" #include "struct_defs/pokemon_summary.h" +#include "struct_defs/pokemon_summary_app.h" + +#include "pokemon.h" #include "savedata.h" +#include "trainer_info.h" -BOOL PokemonSummary_ShowContestData(SaveData * param0); -void PokemonSummary_FlagVisiblePages(PokemonSummary * param0, const u8 * param1); -u8 PokemonSummary_PageIsVisble(PokemonSummaryApp * param0, u32 param1); -u8 PokemonSummary_CountVisiblePages(PokemonSummaryApp * param0); -void * PokemonSummary_MonData(PokemonSummaryApp * param0); -u8 PokemonSummary_RibbonAt(PokemonSummaryApp * param0, u8 param1); -void PokemonSummary_SetPlayerProfile(PokemonSummary * param0, const TrainerInfo * param1); +BOOL PokemonSummary_ShowContestData(SaveData *param0); +void PokemonSummary_FlagVisiblePages(PokemonSummary *param0, const u8 *param1); +u8 PokemonSummary_PageIsVisble(PokemonSummaryApp *param0, u32 param1); +u8 PokemonSummary_CountVisiblePages(PokemonSummaryApp *param0); +void *PokemonSummary_MonData(PokemonSummaryApp *param0); +u8 PokemonSummary_RibbonAt(PokemonSummaryApp *param0, u8 param1); +void PokemonSummary_SetPlayerProfile(PokemonSummary *param0, const TrainerInfo *param1); u32 PokemonSummary_StatusIconChar(void); u32 PokemonSummary_StatusIconPltt(void); u32 PokemonSummary_StatusIconCell(void); u32 PokemonSummary_StatusIconAnim(void); -u32 PokemonSummary_StatusIconAnimIdx(Pokemon * param0); +u32 PokemonSummary_StatusIconAnimIdx(Pokemon *param0); #endif // POKEPLATINUM_UNK_0208C324_H diff --git a/include/pokeradar.h b/include/pokeradar.h index 01da475c71..cca5049d12 100644 --- a/include/pokeradar.h +++ b/include/pokeradar.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_POKERADAR_H #define POKEPLATINUM_POKERADAR_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" +#include "field/field_system_decl.h" + typedef struct RadarChain RadarChain; -#define NUM_GRASS_PATCHES 4 +#define NUM_GRASS_PATCHES 4 #define RADAR_BATTERY_STEPS 50 enum PatchShakeType { diff --git a/include/poketch_data.h b/include/poketch_data.h index 11d605372b..992728ff4c 100644 --- a/include/poketch_data.h +++ b/include/poketch_data.h @@ -4,10 +4,10 @@ #include "pokemon.h" #include "savedata.h" -#define POKETCH_MAPMARKER_COUNT 6 +#define POKETCH_MAPMARKER_COUNT 6 #define POKETCH_POKEMONHISTORY_MAX 12 -#define POKETCH_REGISTRY_SIZE 32 -#define POKETCH_DOTART_SIZE_BYTES 120 +#define POKETCH_REGISTRY_SIZE 32 +#define POKETCH_DOTART_SIZE_BYTES 120 /** Poketch app IDs, used to register and switch between apps in the Poketch */ enum PoketchAppID { @@ -34,8 +34,8 @@ enum PoketchAppID { POKETCH_APPID_KITCHENTIMER, POKETCH_APPID_COLORCHANGER, POKETCH_APPID_MATCHUPCHECKER, - POKETCH_APPID_STOPWATCH, // unused - POKETCH_APPID_ALARMCLOCK, // unused + POKETCH_APPID_STOPWATCH, // unused + POKETCH_APPID_ALARMCLOCK, // unused POKETCH_APPID_MAX, @@ -56,21 +56,20 @@ enum PoketchScreenColor { POKETCH_SCREEN_COLOR_MAX, }; - /** * @brief All of the Poketch's internally tracked data including settings, registered apps, and the data for some apps (eg. pedometer, alarm clock). */ typedef struct PoketchData { u8 poketchEnabled : 1; - u8 pedometerEnabled : 1; //!< Whether or not the pedometer is registered and will take step count updates. - u8 dotArtModifiedByPlayer : 1; //!< Whether or not the dot art data has ever been modified by the user. This flag can never be set to FALSE. - u8 screenColor : 3; //!< Screen palette color (see PoketchScreenColor enum above) + u8 pedometerEnabled : 1; //!< Whether or not the pedometer is registered and will take step count updates. + u8 dotArtModifiedByPlayer : 1; //!< Whether or not the dot art data has ever been modified by the user. This flag can never be set to FALSE. + u8 screenColor : 3; //!< Screen palette color (see PoketchScreenColor enum above) // u8 padding : 2; - s8 appCount; //!< Number of currently registered apps - s8 appIndex; //!< Currently selected app - u8 appRegistry[POKETCH_REGISTRY_SIZE]; //!< Registration status of all apps. Indices 0-24 correspond to the App IDs in poketch_data.h. Indices 25-31 are unused. - + s8 appCount; //!< Number of currently registered apps + s8 appIndex; //!< Currently selected app + u8 appRegistry[POKETCH_REGISTRY_SIZE]; //!< Registration status of all apps. Indices 0-24 correspond to the App IDs in poketch_data.h. Indices 25-31 are unused. + u32 stepCount; u16 alarmSet : 1; @@ -78,27 +77,27 @@ typedef struct PoketchData { u16 alarmMinute : 6; // u16 padding : 4; - u8 dotArtData[POKETCH_DOTART_SIZE_BYTES]; //!< All pixel information for the Dot Art app + u8 dotArtData[POKETCH_DOTART_SIZE_BYTES]; //!< All pixel information for the Dot Art app - u32 calendarMarkBitmap; //!< Bitmap for every day in the calendar month and whether it's been marked + u32 calendarMarkBitmap; //!< Bitmap for every day in the calendar month and whether it's been marked u8 calendarMonth; /** - * @brief XY coordinates of a single Map Marker in the Marking Map app - */ + * @brief XY coordinates of a single Map Marker in the Marking Map app + */ struct { u8 x; u8 y; } markMapPositions[POKETCH_MAPMARKER_COUNT]; /** - * @brief Relevant data for Pokemon History app - */ + * @brief Relevant data for Pokemon History app + */ struct { u16 species; u16 icon; u32 form; - } pokemonHistoryQueue[POKETCH_POKEMONHISTORY_MAX]; //!< The pokemon to display in the Pokemon History app + } pokemonHistoryQueue[POKETCH_POKEMONHISTORY_MAX]; //!< The pokemon to display in the Pokemon History app } PoketchData; int Poketch_SaveSize(void); @@ -147,7 +146,7 @@ void PoketchData_AlarmTime(const PoketchData *poketchData, u32 *hour, u32 *minut void PoketchData_SetAlarm(PoketchData *poketchData, BOOL enabled, u32 hour, u32 minute); /** - * Marks the given date on the Calendar app as highlighted. + * Marks the given date on the Calendar app as highlighted. * Passing this function a new month will change the month on the calendar and clear all days except the given one. */ void PoketchData_SetCalendarMark(PoketchData *poketchData, u32 month, u32 day); @@ -171,7 +170,7 @@ void PoketchData_SetMapMarker(PoketchData *poketchData, int index, u8 x, u8 y); void PoketchData_MapMarkerPos(const PoketchData *poketchData, int index, u8 *x, u8 *y); /** - * Checks whether or not the Dot Art data has been modified at any point. + * Checks whether or not the Dot Art data has been modified at any point. * This will return FALSE until PoketchData_ModifyDotArtData is called, at which point it will always return TRUE. */ BOOL PoketchData_DotArtModified(const PoketchData *poketchData); @@ -199,6 +198,6 @@ void PoketchData_PokemonHistorySpeciesAndIcon(const PoketchData *poketchData, in */ u32 PoketchData_PokemonHistoryForm(const PoketchData *poketchData, int index); -PoketchData* SaveData_PoketchData(SaveData *saveData); +PoketchData *SaveData_PoketchData(SaveData *saveData); #endif // POKEPLATINUM_POKETCH_DATA_H diff --git a/include/roaming_pokemon.h b/include/roaming_pokemon.h index 2ef35d195b..80ee37c696 100644 --- a/include/roaming_pokemon.h +++ b/include/roaming_pokemon.h @@ -2,22 +2,23 @@ #define POKEPLATINUM_ROAMING_POKEMON_H #include "struct_defs/struct_0202D7B0.h" + #include "savedata.h" -#define ROAMING_SLOT_MESPRIT (0) -#define ROAMING_SLOT_CRESSELIA (1) -#define ROAMING_SLOT_DARKRAI (2) // Unused in-game, see: https://tcrf.net/Pok%C3%A9mon_Platinum#Unused_Roaming_Darkrai -#define ROAMING_SLOT_MOLTRES (3) -#define ROAMING_SLOT_ZAPDOS (4) -#define ROAMING_SLOT_ARTICUNO (5) -#define ROAMING_SLOT_MAX (6) +#define ROAMING_SLOT_MESPRIT (0) +#define ROAMING_SLOT_CRESSELIA (1) +#define ROAMING_SLOT_DARKRAI (2) // Unused in-game, see: https://tcrf.net/Pok%C3%A9mon_Platinum#Unused_Roaming_Darkrai +#define ROAMING_SLOT_MOLTRES (3) +#define ROAMING_SLOT_ZAPDOS (4) +#define ROAMING_SLOT_ARTICUNO (5) +#define ROAMING_SLOT_MAX (6) -void sub_0206C33C(UnkStruct_0202D7B0 * param0, const u8 param1); -void sub_0206C354(UnkStruct_0202D7B0 * param0); -void sub_0206C37C(UnkStruct_0202D7B0 * param0); +void sub_0206C33C(UnkStruct_0202D7B0 *param0, const u8 param1); +void sub_0206C354(UnkStruct_0202D7B0 *param0); +void sub_0206C37C(UnkStruct_0202D7B0 *param0); int sub_0206C3C8(const u8 param0); -BOOL sub_0206C3E0(UnkStruct_0202D7B0 * param0); -void sub_0206C404(UnkStruct_0202D7B0 * param0, const int param1); -void RoamingPokemon_ActivateSlot(SaveData * saveData, const u8 speciesID); +BOOL sub_0206C3E0(UnkStruct_0202D7B0 *param0); +void sub_0206C404(UnkStruct_0202D7B0 *param0, const int param1); +void RoamingPokemon_ActivateSlot(SaveData *saveData, const u8 speciesID); #endif // POKEPLATINUM_ROAMING_POKEMON_H diff --git a/include/rtc.h b/include/rtc.h index fcc1a38ea2..29cd3f6474 100644 --- a/include/rtc.h +++ b/include/rtc.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_RTC_H #define POKEPLATINUM_RTC_H - #include enum TimeOfDay { @@ -14,12 +13,12 @@ enum TimeOfDay { void InitRTC(void); void UpdateRTC(void); -void GetCurrentDateTime(RTCDate * date, RTCTime * time); -void GetCurrentTime(RTCTime * time); -void GetCurrentDate(RTCDate * date); +void GetCurrentDateTime(RTCDate *date, RTCTime *time); +void GetCurrentTime(RTCTime *time); +void GetCurrentDate(RTCDate *date); int GetSecondsSinceMidnight(void); s64 GetTimestamp(void); -int DayNumberForDate(const RTCDate * date); +int DayNumberForDate(const RTCDate *date); BOOL IsNight(void); enum TimeOfDay GetTimeOfDay(void); enum TimeOfDay TimeOfDayForHour(int hour); diff --git a/include/savedata.h b/include/savedata.h index b8eced8103..44b47f2e53 100644 --- a/include/savedata.h +++ b/include/savedata.h @@ -1,8 +1,8 @@ #ifndef POKEPLATINUM_SAVEDATA_H #define POKEPLATINUM_SAVEDATA_H -#include "constants/savedata/savedata.h" #include "constants/savedata/save_table.h" +#include "constants/savedata/savedata.h" typedef struct SaveBlockFooter { u32 saveCounter; @@ -76,10 +76,10 @@ typedef struct SaveCheckFooter { u16 checksum; } SaveCheckFooter; -SaveData* SaveData_Init(void); -SaveData* SaveData_Ptr(void); -void* SaveData_SaveTable(SaveData *saveData, int saveTableID); -const void* SaveData_SaveTableConst(const SaveData *saveData, int saveTableID); +SaveData *SaveData_Init(void); +SaveData *SaveData_Ptr(void); +void *SaveData_SaveTable(SaveData *saveData, int saveTableID); +const void *SaveData_SaveTableConst(const SaveData *saveData, int saveTableID); BOOL SaveData_Erase(SaveData *saveData); BOOL SaveData_Load(SaveData *saveData); int SaveData_Save(SaveData *saveData); @@ -101,8 +101,8 @@ int SaveTableEntry_BodySize(int saveTableID); void SaveDataExtra_Init(SaveData *saveData); int SaveDataExtra_Save(const SaveData *saveData, int extraSaveID, void *data); int SaveDataExtra_SaveMirror(SaveData *saveData, int extraSaveID, void *data); -void* SaveDataExtra_Get(SaveData *saveData, int heapID, int extraSaveID, int *loadResult); -void* SaveDataExtra_Mirror(SaveData *saveData, int heapID, int extraSaveID, int *loadResult, BOOL *isOld); +void *SaveDataExtra_Get(SaveData *saveData, int heapID, int extraSaveID, int *loadResult); +void *SaveDataExtra_Mirror(SaveData *saveData, int heapID, int extraSaveID, int *loadResult, BOOL *isOld); BOOL SaveData_CardBackupType(void); BOOL SaveData_CardSave(u32 address, void *data, u32 size); BOOL SaveData_CardLoad(u32 address, void *data, u32 size); diff --git a/include/savedata/save_table.h b/include/savedata/save_table.h index baf67613ba..ef30187ffd 100644 --- a/include/savedata/save_table.h +++ b/include/savedata/save_table.h @@ -1,18 +1,20 @@ #ifndef POKEPLATINUM_SAVEDATA_LOAD_HELPERS_H #define POKEPLATINUM_SAVEDATA_LOAD_HELPERS_H -#include "struct_defs/struct_0202440C.h" +#include "constants/savedata/save_table.h" + #include "struct_decls/struct_0202442C_decl.h" #include "struct_decls/struct_02024440_decl.h" -#include "struct_defs/struct_0202DF8C.h" -#include "struct_defs/struct_0202F264.h" #include "struct_decls/struct_020308A0_decl.h" #include "struct_decls/struct_020797DC_decl.h" +#include "struct_defs/struct_0202440C.h" +#include "struct_defs/struct_0202DF8C.h" +#include "struct_defs/struct_0202F264.h" + #include "savedata.h" -#include "constants/savedata/save_table.h" typedef int (*SaveEntrySizeFunc)(void); -typedef void (*SaveEntryInitFunc)(void*); +typedef void (*SaveEntryInitFunc)(void *); typedef struct SaveTableEntry { int dataID; //< Canonical ID for the entry. Used by external functions to retrieve it from the table. @@ -28,57 +30,57 @@ extern const int gExtraSaveTableSize; /** * @brief Loads the TVBroadcast sector of the save data. - * + * * This routine also performs a standard CRC of the sector before loading it. - * - * @param save + * + * @param save * @return Address of the TVBroadcast sector of the save data. */ -TVBroadcast* SaveData_TVBroadcast(SaveData *save); +TVBroadcast *SaveData_TVBroadcast(SaveData *save); /** * @brief Loads the PCBoxes sector of the save data. - * + * * This routine does NOT perform any CRC on the sectors before loading them. - * - * @param save + * + * @param save * @return Address of the PCBoxes sector of the save data. */ -PCBoxes* SaveData_PCBoxes(SaveData *save); +PCBoxes *SaveData_PCBoxes(SaveData *save); /** * @brief Loads the MysteryGift sector of the save data. - * + * * This routine also performs a standard CRC of the sector before loading it. - * - * @param save + * + * @param save * @return Address of the MysteryGift sector of the save data. */ -MysteryGift* SaveData_MysteryGift(SaveData *save); +MysteryGift *SaveData_MysteryGift(SaveData *save); /** * @brief Loads the PalParkTransfer sector of the save data. - * + * * This routine does NOT perform any CRC on the sectors before loading them. - * - * @param save + * + * @param save * @return Address of the PalParkTransfer sector of the save data. */ -PalParkTransfer* SaveData_PalParkTransfer(SaveData *save); +PalParkTransfer *SaveData_PalParkTransfer(SaveData *save); /** * @brief Loads the HallOfFame sector from the extended save data. - * + * * @param save The save data. * @param heapID Heap on which to allocate the HallOfFame sector. * @param resultCode Load-result opcode output. * @return Address of the allocated HallOfFame data. */ -HallOfFame* SaveData_HallOfFame(SaveData *save, int heapID, int *resultCode); +HallOfFame *SaveData_HallOfFame(SaveData *save, int heapID, int *resultCode); /** * @brief Saves a mirror of the given HallOfFame data into the extended save. - * + * * @param save The save data. * @param hof The hall-of-fame data to save. * @return Save-result opcode. @@ -87,18 +89,18 @@ int SaveData_SaveHallOfFame(SaveData *save, HallOfFame *hof); /** * @brief Loads the BattleRecording sector from the extended save data. - * + * * @param save The save data. * @param heapID Heap on which to allocate the BattleRecording sector. * @param resultCode Load-result opcode output. * @param recNum Which recording slot to load. * @return Address of the allocated BattleRecording data. */ -BattleRecording* SaveData_BattleRecording(SaveData *save, int heapID, int *resultCode, int recNum); +BattleRecording *SaveData_BattleRecording(SaveData *save, int heapID, int *resultCode, int recNum); /** * @brief Saves a mirror of the given BattleRecording data into the extended save. - * + * * @param save The save data. * @param rec The battle recording data to save. * @param recNum Which recording slot to save. @@ -108,17 +110,17 @@ int SaveData_SaveBattleRecording(SaveData *save, BattleRecording *rec, int recNu /** * @brief Loads the BattleFrontierStage sector from the extended save data. - * + * * @param save The save data. * @param heapID Heap on which to allocate the BattleRecording sector. * @param resultCode Load-result opcode output. * @return Address of the allocated BattleFrontierStage data. */ -BattleFrontierStage* SaveData_BattleFrontierStage(SaveData *save, int heapID, int *resultCode); +BattleFrontierStage *SaveData_BattleFrontierStage(SaveData *save, int heapID, int *resultCode); /** * @brief Saves a mirror of the given BattleRecording data into the extended save. - * + * * @param save The save data. * @param frontier The battle frontier data to save. * @return Save-result opcode. diff --git a/include/savedata_misc.h b/include/savedata_misc.h index 15b66f42fe..96dcde809d 100644 --- a/include/savedata_misc.h +++ b/include/savedata_misc.h @@ -1,15 +1,17 @@ #ifndef POKEPLATINUM_SAVEDATA_MISC_H #define POKEPLATINUM_SAVEDATA_MISC_H -#include "struct_defs/sentence.h" -#include "strbuf.h" +#include "constants/savedata/save_table.h" +#include "constants/string.h" + #include "struct_decls/struct_02027854_decl.h" #include "struct_decls/struct_02027860_decl.h" +#include "struct_defs/sentence.h" #include "struct_defs/struct_02027854.h" #include "struct_defs/struct_02027860.h" + #include "savedata.h" -#include "constants/savedata/save_table.h" -#include "constants/string.h" +#include "strbuf.h" typedef struct ExtraSaveKey { u32 keys[EXTRA_SAVE_TABLE_ENTRY_MAX - 1]; @@ -36,13 +38,13 @@ typedef struct MiscSaveBlock { int MiscSaveBlock_SaveSize(void); void MiscSaveBlock_Init(MiscSaveBlock *miscSave); -MiscSaveBlock* SaveData_MiscSaveBlock(SaveData *saveData); -const MiscSaveBlock* SaveData_MiscSaveBlockConst(const SaveData *saveData); -UnkStruct_02027854* sub_02027854(SaveData *saveData); -UnkStruct_02027860* sub_02027860(SaveData *saveData); -const u16* MiscSaveBlock_RivalName(const MiscSaveBlock *miscSave); +MiscSaveBlock *SaveData_MiscSaveBlock(SaveData *saveData); +const MiscSaveBlock *SaveData_MiscSaveBlockConst(const SaveData *saveData); +UnkStruct_02027854 *sub_02027854(SaveData *saveData); +UnkStruct_02027860 *sub_02027860(SaveData *saveData); +const u16 *MiscSaveBlock_RivalName(const MiscSaveBlock *miscSave); void MiscSaveBlock_SetRivalName(MiscSaveBlock *miscSave, Strbuf *name); -const u16* MiscSaveBlock_TabletName(const MiscSaveBlock *miscSave); +const u16 *MiscSaveBlock_TabletName(const MiscSaveBlock *miscSave); void MiscSaveBlock_SetTabletName(MiscSaveBlock *miscSave, Strbuf *name); void MiscSaveBlock_SetInitFlag(MiscSaveBlock *miscSave); u32 MiscSaveBlock_InitFlag(const MiscSaveBlock *miscSave); diff --git a/include/scrcmd.h b/include/scrcmd.h index 19fba3b1a8..86100ed575 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -3,7 +3,7 @@ #include "field_script_context.h" -BOOL sub_02041CC8(ScriptContext * ctx); -BOOL sub_02041D60(ScriptContext * ctx); +BOOL sub_02041CC8(ScriptContext *ctx); +BOOL sub_02041D60(ScriptContext *ctx); #endif // POKEPLATINUM_SCRCMD_H diff --git a/include/screen_scroll_manager.h b/include/screen_scroll_manager.h index 27ce7dc24c..0815817486 100644 --- a/include/screen_scroll_manager.h +++ b/include/screen_scroll_manager.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_SCREEN_SCROLL_MANAGER_H #define POKEPLATINUM_SCREEN_SCROLL_MANAGER_H -#include "sys_task_manager.h" #include "constants/heap.h" + +#include "sys_task_manager.h" // #include "buffer_manager.h" -#define SCREEN_SCROLL_MANAGER_BUFFER_SIZE 192 +#define SCREEN_SCROLL_MANAGER_BUFFER_SIZE 192 #define SCREEN_SCROLL_MANAGER_SCALING_FACTOR 100 -#define SCREEN_SCROLL_MANAGER_MAX_SCROLL (SCREEN_SCROLL_MANAGER_BUFFER_SIZE * SCREEN_SCROLL_MANAGER_SCALING_FACTOR) +#define SCREEN_SCROLL_MANAGER_MAX_SCROLL (SCREEN_SCROLL_MANAGER_BUFFER_SIZE * SCREEN_SCROLL_MANAGER_SCALING_FACTOR) struct BufferManager; @@ -26,7 +27,6 @@ typedef struct ScreenScrollManager { s16 scrollSpeed; } ScreenScrollManager; - ScreenScrollManager *ScreenScrollManager_New(enum HeapId heapID); void ScreenScrollManager_ScrollX(ScreenScrollManager *screenScrollMgr, u8 start, u8 end, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bg, u32 initValue, u32 priority); void ScreenScrollManager_ScrollY(ScreenScrollManager *screenScrollMgr, u8 start, u8 end, u16 angleIncrement, fx32 amplitude, s16 speed, u32 bg, u32 initValue, u32 priority); diff --git a/include/strbuf.h b/include/strbuf.h index 79da67d80b..e1ccc6c1a3 100644 --- a/include/strbuf.h +++ b/include/strbuf.h @@ -52,17 +52,17 @@ enum CharsetMode { /** * @brief Init routine. Allocates memory for a new Strbuf, initializes it * with an integrity-check value, and exposes its address. - * + * * @param size The size of the new Strbuf to allocate from the heap. * @param heapID ID of the heap to own the new Strbuf. * @return Address to the new Strbuf. */ -Strbuf* Strbuf_Init(u32 size, u32 heapID); +Strbuf *Strbuf_Init(u32 size, u32 heapID); /** * @brief Free routine. Destroys an existing Strbuf and returns its memory * to the owning heap. - * + * * @param strbuf Address to the Strbuf to be freed. */ void Strbuf_Free(Strbuf *strbuf); @@ -71,7 +71,7 @@ void Strbuf_Free(Strbuf *strbuf); * @brief Clears out a string of any existing character data. The first value * in the underlying data buffer is set to `CHAR_EOS`, and `strbuf->size` is * set to 0. - * + * * @param strbuf Address to the Strbuf to be cleared. */ void Strbuf_Clear(Strbuf *strbuf); @@ -80,7 +80,7 @@ void Strbuf_Clear(Strbuf *strbuf); * @brief Copies the contents of the data buffer in `src` to the data buffer * in `dst`. Fails if the contents of `src` will not fit into `dst`'s * allocated memory. - * + * * @param dst Destination buffer. `dst->size` and `dst->data` will be modified. * @param src Source buffer. `src->size` and `src->data` will be accessed. */ @@ -89,25 +89,25 @@ void Strbuf_Copy(Strbuf *dst, const Strbuf *src); /** * @brief Clones the contents of a given Strbuf into a new Strbuf and returns * the address of the newly-created struct. - * + * * This is effectively a nice wrapper around the following code: - * + * * ```c * Strbuf *dst = Strbuf_Init(src->size + 1, heapID); * Strbuf_Copy(dst, src); * ``` - * + * * @param src Source buffer to clone. * @param heapID ID of the heap which will own the new Strbuf. * @return Address to the cloned Strbuf. */ -Strbuf* Strbuf_Clone(const Strbuf *src, u32 heapID); +Strbuf *Strbuf_Clone(const Strbuf *src, u32 heapID); /** * @brief Format a number into a destination buffer. - * + * * The destination buffer must already be initialized. - * + * * @param[out] dst Destination buffer. * @param num Number to be formatted. * @param maxDigits Maximum number of digits to format, right-justified. @@ -118,9 +118,9 @@ void Strbuf_FormatInt(Strbuf *dst, int num, u32 maxDigits, enum PaddingMode padd /** * @brief Format a number into a destination buffer. - * + * * The destination buffer must already be initialized. - * + * * @param[out] dst Destination buffer. * @param num Number to be formatted. * @param maxDigits Maximum number of digits to format, right-justified. @@ -131,7 +131,7 @@ void Strbuf_FormatU64(Strbuf *dst, u64 num, u32 maxDigits, enum PaddingMode padd /** * @brief Parses a numeric string into a number. - * + * * @param src Numeric string. * @param[out] success Flag denoting if the result string was fully processed. * @return Parsed result. @@ -140,7 +140,7 @@ u64 Strbuf_AtoI(const Strbuf *src, BOOL *success); /** * @brief Compares two strings. Follows the `strcmp` standard. - * + * * @param str1 First string. * @param str2 Second string. * @return 0 if the strings match, 1 if they do not. @@ -149,7 +149,7 @@ int Strbuf_Compare(const Strbuf *str1, const Strbuf *str2); /** * @brief Accessor for the length of a string. - * + * * @param strbuf * @return `strbuf->size` */ @@ -157,18 +157,18 @@ u32 Strbuf_Length(const Strbuf *strbuf); /** * @brief Counts the number of lines in a string. - * - * @param strbuf + * + * @param strbuf * @return The number of lines in `strbuf`. */ u32 Strbuf_NumLines(const Strbuf *strbuf); /** * @brief Copies a particular line number from `src` into `dst`. - * + * * Lines are zero-indexed, e.g. `lineNum == 0` will copy the first line, * `lineNum == 1` will copy the second line, etc. - * + * * @param[out] dst Destination buffer. * @param src Source buffer. * @param lineNum Number of the line to copy, zero-indexed. @@ -177,7 +177,7 @@ void Strbuf_CopyLineNum(Strbuf *dst, const Strbuf *src, u32 lineNum); /** * @brief Copies data from a raw character buffer into a managed Strbuf. - * + * * @param[out] dst Destination buffer. * @param src Raw character source buffer. */ @@ -186,7 +186,7 @@ void Strbuf_CopyChars(Strbuf *dst, const charcode_t *src); /** * @brief Copies a specific number of values from a raw character buffer into * a managed Strbuf. - * + * * @param[out] dst Destination buffer. * @param src Raw character source buffer. * @param num Number of values to copy. @@ -195,9 +195,9 @@ void Strbuf_CopyNumChars(Strbuf *dst, const charcode_t *src, u32 num); /** * @brief Dumps the contents of a Strbuf into a raw character buffer. - * + * * Fails if `src->size + 1 > dstSize`. - * + * * @param src Source buffer. * @param[out] dst Destination buffer. * @param dstSize Size of `dst`. @@ -206,17 +206,17 @@ void Strbuf_ToChars(const Strbuf *src, charcode_t *dst, u32 dstSize); /** * @brief Accessor for the underlying data buffer of a managed string. - * - * @param strbuf + * + * @param strbuf * @return Underlying data buffer for `strbuf`. */ -const charcode_t* Strbuf_GetData(const Strbuf *strbuf); +const charcode_t *Strbuf_GetData(const Strbuf *strbuf); /** * @brief Concatenates `src` onto the end of `dst`, if allocation permits. - * + * * Fails if `dst->maxSize < dst->size + src->size + 1`. - * + * * @param[out] dst Destination buffer. * @param src Source buffer. */ @@ -224,9 +224,9 @@ void Strbuf_Concat(Strbuf *dst, const Strbuf *src); /** * @brief Appends a single character onto `dst`, if allocation permits. - * + * * Fails if `dst->maxSize >= dst->size + 1`. - * + * * @param[out] dst Destination buffer. * @param c Character to append. */ @@ -234,11 +234,11 @@ void Strbuf_AppendChar(Strbuf *dst, charcode_t c); /** * @brief Checks if a given string is a trainer name. - * + * * Trainer names are identified using a specific leader character which denotes * different handling methods for their concatenation. - * - * @param strbuf + * + * @param strbuf * @return TRUE if `strbuf` is a trainer name, FALSE otherwise. */ BOOL Strbuf_IsTrainerName(Strbuf *strbuf); @@ -246,9 +246,9 @@ BOOL Strbuf_IsTrainerName(Strbuf *strbuf); /** * @brief Concatenates `src` onto the end of `dst`, accounting for trainer * name compression. - * + * * If `src` is not a trainer name, then this falls back to `Strbuf_Concat`. - * + * * @param[out] dst Destination buffer. * @param src Source buffer. */ @@ -256,8 +256,8 @@ void Strbuf_ConcatTrainerName(Strbuf *dst, Strbuf *src); /** * @brief Converts a particular character to uppercase. - * - * @param strbuf + * + * @param strbuf * @param i Index of the character to capitalize, zero-indexed. */ void Strbuf_UpperChar(Strbuf *strbuf, int i); diff --git a/include/string_template.h b/include/string_template.h index 1ad443578a..15d434943d 100644 --- a/include/string_template.h +++ b/include/string_template.h @@ -5,18 +5,17 @@ #include "consts/gender.h" #include "consts/moves.h" -#include "pokemon.h" -#include "savedata.h" -#include "strbuf.h" -#include "trainer_info.h" - #include "struct_decls/struct_020797DC_decl.h" #include "struct_defs/trainer_data.h" #include "enums.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" +#include "trainer_info.h" -#define STRING_TEMPLATE_DEFAULT_MAX_ARGS 8 -#define STRING_TEMPLATE_DEFAULT_MAX_LENGTH 32 +#define STRING_TEMPLATE_DEFAULT_MAX_ARGS 8 +#define STRING_TEMPLATE_DEFAULT_MAX_LENGTH 32 typedef struct StringTemplateArgHeader { u8 unused_00; @@ -113,4 +112,3 @@ void StringTemplate_Format(const StringTemplate *template, Strbuf *dst, const St void StringTemplate_ClearArgs(StringTemplate *template); #endif // POKEPLATINUM_STRING_TEMPLATE_H - diff --git a/include/struct_defs/archived_poke_sprite_data.h b/include/struct_defs/archived_poke_sprite_data.h index 78e8431dc0..ad0ddaaaaa 100644 --- a/include/struct_defs/archived_poke_sprite_data.h +++ b/include/struct_defs/archived_poke_sprite_data.h @@ -3,8 +3,8 @@ #include "struct_defs/sprite_animation_frame.h" -#define MAX_FACES 2 -#define MAX_ANIMATION_FRAMES 10 +#define MAX_FACES 2 +#define MAX_ANIMATION_FRAMES 10 typedef struct PokeSpriteFaceData { u8 cryDelay; ///< How long to wait before playing the cry. diff --git a/include/struct_defs/archived_sprite.h b/include/struct_defs/archived_sprite.h index e34107cfbc..89733f9fe1 100644 --- a/include/struct_defs/archived_sprite.h +++ b/include/struct_defs/archived_sprite.h @@ -6,7 +6,7 @@ typedef struct ArchivedSprite { u16 character; //< File index to pull from the archive for the character data (tiles) u16 palette; //< File index to pull from the archive for the palette data u16 spindaSpots; //< Simple flag denoting whether the rendered sprite should be pseudo-randomized with splotches (only for Spinda's front-sprite). - + u8 dummy; //< Dummy value; never used or set to anything other than 0. u32 personality; //< Cached personality value for Pokemon front-sprites. Specifically used for Spinda spots. diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index 3896edf209..54951a5e66 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -1,97 +1,99 @@ #ifndef POKEPLATINUM_STRUCT_BATTLE_SYSTEM_T_H #define POKEPLATINUM_STRUCT_BATTLE_SYSTEM_T_H +#include + #include "constants/battle.h" #include "constants/time.h" +#include "struct_decls/pokedexdata_decl.h" +#include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "struct_decls/pokedexdata_decl.h" -#include "game_options.h" #include "struct_decls/struct_02027F8C_decl.h" -#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "poketch_data.h" -#include "struct_defs/struct_0205AA50.h" #include "struct_decls/struct_0206D140_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" -#include "struct_defs/trainer_data.h" +#include "struct_defs/chatot_cry.h" +#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" -#include "bag.h" #include "struct_defs/struct_0209C370.h" -#include "overlay006/struct_ov6_02240D5C_sub1.h" -#include "overlay010/struct_ov10_0221F800.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "battle/struct_ov16_0223E0C8.h" +#include "struct_defs/trainer_data.h" + #include "battle/battle_context.h" +#include "battle/struct_ov16_0223E0C8.h" #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02268520.h" #include "battle/struct_ov16_02268A14_decl.h" #include "battle/struct_ov16_0226D160_decl.h" +#include "overlay006/struct_ov6_02240D5C_sub1.h" +#include "overlay010/struct_ov10_0221F800.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include +#include "bag.h" +#include "game_options.h" +#include "message.h" +#include "poketch_data.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" +#include "trainer_info.h" struct BattleSystem { - GenericPointerData * unk_00; - BGL * unk_04; + GenericPointerData *unk_00; + BGL *unk_04; Window *windows; - MessageLoader * unk_0C; - MessageLoader * unk_10; + MessageLoader *unk_0C; + MessageLoader *unk_10; StringTemplate *strFormatter; Strbuf *msgBuffer; - SysTask * unk_1C; - SysTask * unk_20; - SysTask * unk_24; - PaletteData * unk_28; + SysTask *unk_1C; + SysTask *unk_20; + SysTask *unk_24; + PaletteData *unk_28; u32 battleType; BattleContext *battleCtx; BattlerData *battlers[MAX_BATTLERS]; int maxBattlers; TrainerInfo *trainerInfo[4]; - Bag * unk_58; - UnkStruct_0207D99C * unk_5C; + Bag *unk_58; + UnkStruct_0207D99C *unk_5C; PokedexData *pokedex; PCBoxes *pcBoxes; Party *parties[4]; - ChatotCry * unk_78[4]; - UnkStruct_02007768 * unk_88; - UnkStruct_ov12_0221FCDC * unk_8C; - SpriteRenderer * unk_90; - SpriteGfxHandler * unk_94; + ChatotCry *unk_78[4]; + UnkStruct_02007768 *unk_88; + UnkStruct_ov12_0221FCDC *unk_8C; + SpriteRenderer *unk_90; + SpriteGfxHandler *unk_94; PoketchData *poketchData; - UnkStruct_0206D140 * unk_9C; + UnkStruct_0206D140 *unk_9C; u16 trainerIDs[4]; u8 unk_A8[4]; TrainerData trainers[4]; UnkStruct_ov16_02268520 unk_17C[2]; - UnkStruct_ov16_02268A14 * unk_198; - PartyGauge * unk_19C[2]; - UnkStruct_0200C440 * unk_1A4; - UnkStruct_0200C440 * unk_1A8; - void * unk_1AC; - Options * unk_1B0; - UnkStruct_02027F8C * unk_1B4; - void * unk_1B8; - UnkStruct_0209C370 * unk_1BC; - UnkStruct_ov10_0221F800 * unk_1C0; - PokemonAnimationSys * unk_1C4; + UnkStruct_ov16_02268A14 *unk_198; + PartyGauge *unk_19C[2]; + UnkStruct_0200C440 *unk_1A4; + UnkStruct_0200C440 *unk_1A8; + void *unk_1AC; + Options *unk_1B0; + UnkStruct_02027F8C *unk_1B4; + void *unk_1B8; + UnkStruct_0209C370 *unk_1BC; + UnkStruct_ov10_0221F800 *unk_1C0; + PokemonAnimationSys *unk_1C4; NNSG2dCellTransferState *cellTransferState; UnkStruct_ov16_0223E0C8 unk_1CC[4]; BattleParams_sub1 unk_20C; - UnkStruct_0202CD88 * unk_218; - u8 * unk_21C; - u16 * unk_220; + UnkStruct_0202CD88 *unk_218; + u8 *unk_21C; + u16 *unk_220; u8 unk_224[4096]; u8 unk_1224[4096]; u16 unk_2224[112]; @@ -102,8 +104,8 @@ struct BattleSystem { u16 unk_23EA; u16 unk_23EC; u16 unk_23EE; - u8 * unk_23F0; - u8 * unk_23F4; + u8 *unk_23F0; + u8 *unk_23F4; u8 unk_23F8; u8 unk_23F9; u8 unk_23FA; diff --git a/include/struct_defs/choose_starter_data.h b/include/struct_defs/choose_starter_data.h index da39efc269..4c92688379 100644 --- a/include/struct_defs/choose_starter_data.h +++ b/include/struct_defs/choose_starter_data.h @@ -9,4 +9,3 @@ typedef struct ChooseStarterData { } ChooseStarterData; #endif // POKEPLATINUM_STRUCT_020425E0_H - diff --git a/include/struct_defs/fraction.h b/include/struct_defs/fraction.h index d7465bf00d..4ff00160e4 100644 --- a/include/struct_defs/fraction.h +++ b/include/struct_defs/fraction.h @@ -6,4 +6,4 @@ typedef struct Fraction { u8 denominator; } Fraction; -#endif POKEPLATINUM_STRUCT_FRACTION_H \ No newline at end of file +#endif POKEPLATINUM_STRUCT_FRACTION_H diff --git a/include/struct_defs/pokemon_summary.h b/include/struct_defs/pokemon_summary.h index dfa3cabf90..ca58827bea 100644 --- a/include/struct_defs/pokemon_summary.h +++ b/include/struct_defs/pokemon_summary.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_POKEMON_SUMMARY_H #define POKEPLATINUM_STRUCT_POKEMON_SUMMARY_H -#include "game_options.h" #include "struct_defs/chatot_cry.h" +#include "game_options.h" + typedef struct PokemonSummary { void *monData; //!< Pointer to generic Pokemon data Options *options; // unk_04 diff --git a/include/struct_defs/pokemon_summary_app.h b/include/struct_defs/pokemon_summary_app.h index 187869a09d..9780f381e7 100644 --- a/include/struct_defs/pokemon_summary_app.h +++ b/include/struct_defs/pokemon_summary_app.h @@ -3,24 +3,25 @@ #include "constants/moves.h" +#include "struct_decls/cell_actor_data.h" +#include "struct_decls/pokemon_animation_sys_decl.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" -#include "struct_decls/pokemon_animation_sys_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "camera.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_defs/archived_poke_sprite_data.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02091850.h" -#include "struct_defs/pokemon_summary.h" + +#include "camera.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" typedef struct PokemonSummaryAppData { Strbuf *speciesName; @@ -41,7 +42,7 @@ typedef struct PokemonSummaryAppData { u32 curExp; u32 curLevelExp; u32 nextLevelExp; - + u16 curHP; u16 maxHP; u16 attack; @@ -77,7 +78,7 @@ typedef struct PokemonSummaryAppData { } PokemonSummaryAppData; typedef struct PokemonSummaryAppSpriteData { - Camera * camera; + Camera *camera; void *spriteManager; SpriteAnimationFrame frames[MAX_ANIMATION_FRAMES]; PokemonAnimationSys *animationSys; @@ -102,7 +103,7 @@ typedef struct PokemonSummaryApp { SpriteRenderer *renderer; SpriteGfxHandler *gfxHandler; - GraphicElementData * unk_41C[77]; + GraphicElementData *unk_41C[77]; CellActorData *actor[77]; UnkStruct_0200C440 *unk_684; diff --git a/include/struct_defs/struct_020032D0.h b/include/struct_defs/struct_020032D0.h index a9c5893f52..9c52490785 100644 --- a/include/struct_defs/struct_020032D0.h +++ b/include/struct_defs/struct_020032D0.h @@ -4,8 +4,8 @@ #include "struct_defs/struct_0200330C.h" typedef struct { - u16 * unk_00; - u16 * unk_04; + u16 *unk_00; + u16 *unk_04; u32 unk_08; UnkStruct_0200330C unk_0C; } UnkStruct_020032D0; diff --git a/include/struct_defs/struct_02004CB4.h b/include/struct_defs/struct_02004CB4.h index 74e47fcb40..13eb1791ee 100644 --- a/include/struct_defs/struct_02004CB4.h +++ b/include/struct_defs/struct_02004CB4.h @@ -1,13 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_02004CB4_H #define POKEPLATINUM_STRUCT_02004CB4_H - #include typedef struct { - NNSSndWaveOutHandle * unk_00; + NNSSndWaveOutHandle *unk_00; NNSSndWaveFormat unk_04; - const void * unk_08; + const void *unk_08; BOOL unk_0C; int unk_10; int unk_14; diff --git a/include/struct_defs/struct_02007768.h b/include/struct_defs/struct_02007768.h index e0e3ae0637..444d7b138b 100644 --- a/include/struct_defs/struct_02007768.h +++ b/include/struct_defs/struct_02007768.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_02007768_H #define POKEPLATINUM_STRUCT_02007768_H -#include "struct_defs/struct_02007C7C.h" - #include +#include "struct_defs/struct_02007C7C.h" + typedef struct UnkStruct_02007768_t { Sprite unk_00[4]; NNSG2dImageProxy unk_2B0; @@ -14,9 +14,9 @@ typedef struct UnkStruct_02007768_t { u32 unk_2F0; u32 unk_2F4; u32 unk_2F8; - u8 * unk_2FC; - u16 * unk_300; - u16 * unk_304; + u8 *unk_2FC; + u16 *unk_300; + u16 *unk_304; NNSG2dCharacterData unk_308; NNSG2dPaletteData unk_320; u8 unk_330; diff --git a/include/struct_defs/struct_02007C7C.h b/include/struct_defs/struct_02007C7C.h index e3c6165460..c8d8348b22 100644 --- a/include/struct_defs/struct_02007C7C.h +++ b/include/struct_defs/struct_02007C7C.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_02007C7C_H #define POKEPLATINUM_STRUCT_02007C7C_H +#include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" -#include "functypes/funcptr_02007C34.h" #include "struct_defs/struct_02007C7C_sub1.h" #include "struct_defs/struct_02007C7C_sub2.h" -#include "struct_defs/archived_sprite.h" + +#include "functypes/funcptr_02007C34.h" typedef struct Sprite { u32 unk_00_0 : 1; @@ -22,7 +23,7 @@ typedef struct Sprite { u8 unk_5B; u8 unk_5C[10]; u8 unk_66[2]; - UnkFuncPtr_02007C34 * unk_68; + UnkFuncPtr_02007C34 *unk_68; UnkStruct_02007C7C_sub2 unk_6C; UnkStruct_02007C7C_sub2 unk_78; SpriteAnimationFrame unk_84[10]; diff --git a/include/struct_defs/struct_02007C7C_sub1.h b/include/struct_defs/struct_02007C7C_sub1.h index 7eabd29633..15b4d71788 100644 --- a/include/struct_defs/struct_02007C7C_sub1.h +++ b/include/struct_defs/struct_02007C7C_sub1.h @@ -25,23 +25,23 @@ typedef struct { u8 unk_26; u8 unk_27; u32 unk_28; - u32 unk_2C_0 : 5; - u32 unk_2C_5 : 5; + u32 unk_2C_0 : 5; + u32 unk_2C_5 : 5; u32 unk_2C_10 : 5; u32 unk_2C_15 : 5; u32 unk_2C_20 : 5; u32 unk_2C_25 : 5; - u32 : 2; - u32 unk_30_0 : 1; - u32 unk_30_1 : 1; - u32 unk_30_2 : 5; - u32 : 2; - u32 unk_30_9 : 1; + u32 : 2; + u32 unk_30_0 : 1; + u32 unk_30_1 : 1; + u32 unk_30_2 : 5; + u32 : 2; + u32 unk_30_9 : 1; u32 unk_30_10 : 1; u32 unk_30_11 : 1; u32 unk_30_12 : 1; u32 unk_30_13 : 4; - u32 : 15; + u32 : 15; } UnkStruct_02007C7C_sub1; #endif // POKEPLATINUM_STRUCT_02007C7C_SUB1_H diff --git a/include/struct_defs/struct_02007C7C_sub2.h b/include/struct_defs/struct_02007C7C_sub2.h index 01006f72c7..5ebb1726f8 100644 --- a/include/struct_defs/struct_02007C7C_sub2.h +++ b/include/struct_defs/struct_02007C7C_sub2.h @@ -2,12 +2,12 @@ #define POKEPLATINUM_STRUCT_02007C7C_SUB2_H typedef struct { - u16 unk_00_0 : 2; - u16 unk_00_2 : 1; - u16 unk_00_3 : 1; - u16 unk_00_4 : 1; - u16 unk_00_5 : 2; - u16 : 9; + u16 unk_00_0 : 2; + u16 unk_00_2 : 1; + u16 unk_00_3 : 1; + u16 unk_00_4 : 1; + u16 unk_00_5 : 2; + u16 : 9; s8 unk_02; u8 padding_03; s16 unk_04; diff --git a/include/struct_defs/struct_02008900.h b/include/struct_defs/struct_02008900.h index 7ca0e07dcf..ba54405e29 100644 --- a/include/struct_defs/struct_02008900.h +++ b/include/struct_defs/struct_02008900.h @@ -10,7 +10,7 @@ typedef struct { u8 unk_03; u8 unk_04[10]; u8 padding_0E[2]; - const SpriteAnimationFrame * unk_10; + const SpriteAnimationFrame *unk_10; } UnkStruct_02008900; #endif // POKEPLATINUM_STRUCT_02008900_H diff --git a/include/struct_defs/struct_02009508.h b/include/struct_defs/struct_02009508.h index 9a09902519..d95294aff2 100644 --- a/include/struct_defs/struct_02009508.h +++ b/include/struct_defs/struct_02009508.h @@ -4,7 +4,7 @@ #include "overlay019/struct_ov19_021DA864.h" typedef struct { - UnkStruct_ov19_021DA864 * unk_00; + UnkStruct_ov19_021DA864 *unk_00; int unk_04; } UnkStruct_02009508; diff --git a/include/struct_defs/struct_020095C4.h b/include/struct_defs/struct_020095C4.h index 08b8ab4740..75382b3edc 100644 --- a/include/struct_defs/struct_020095C4.h +++ b/include/struct_defs/struct_020095C4.h @@ -1,12 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_020095C4_H #define POKEPLATINUM_STRUCT_020095C4_H - #include typedef struct { int unk_00; - NNSG2dRendererInstance * unk_04; + NNSG2dRendererInstance *unk_04; int unk_08; } UnkStruct_020095C4; diff --git a/include/struct_defs/struct_02009CFC.h b/include/struct_defs/struct_02009CFC.h index 655eb3ac26..70d207e3c5 100644 --- a/include/struct_defs/struct_02009CFC.h +++ b/include/struct_defs/struct_02009CFC.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02009DC8_decl.h" typedef struct { - UnkStruct_02009DC8 ** unk_00; + UnkStruct_02009DC8 **unk_00; int unk_04; int unk_08; } UnkStruct_02009CFC; diff --git a/include/struct_defs/struct_0200A328.h b/include/struct_defs/struct_0200A328.h index 747e5124fa..429c079ca5 100644 --- a/include/struct_defs/struct_0200A328.h +++ b/include/struct_defs/struct_0200A328.h @@ -1,11 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_0200A328_H #define POKEPLATINUM_STRUCT_0200A328_H - #include typedef struct { - NNSG2dCharacterData * unk_00; + NNSG2dCharacterData *unk_00; u32 unk_04; u32 unk_08; u32 unk_0C; diff --git a/include/struct_defs/struct_0200A5C8.h b/include/struct_defs/struct_0200A5C8.h index 6a2920acc5..78771c7e32 100644 --- a/include/struct_defs/struct_0200A5C8.h +++ b/include/struct_defs/struct_0200A5C8.h @@ -1,11 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_0200A5C8_H #define POKEPLATINUM_STRUCT_0200A5C8_H - #include typedef struct { - NNSG2dPaletteData * unk_00; + NNSG2dPaletteData *unk_00; u32 unk_04; u32 unk_08; u32 unk_0C; diff --git a/include/struct_defs/struct_0200C738.h b/include/struct_defs/struct_0200C738.h index 74db3d2d85..c1f49c7ee2 100644 --- a/include/struct_defs/struct_0200C738.h +++ b/include/struct_defs/struct_0200C738.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_0200C738_H #define POKEPLATINUM_STRUCT_0200C738_H - #include typedef struct { diff --git a/include/struct_defs/struct_0200D0F4.h b/include/struct_defs/struct_0200D0F4.h index 070d8aead3..fe792f29e6 100644 --- a/include/struct_defs/struct_0200D0F4.h +++ b/include/struct_defs/struct_0200D0F4.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_0200D0F4_H #define POKEPLATINUM_STRUCT_0200D0F4_H -#include "struct_defs/struct_02009508.h" #include "struct_decls/struct_02022550_decl.h" +#include "struct_defs/struct_02009508.h" + #include "overlay019/struct_ov19_021DA864.h" typedef struct CellActorData { - GraphicElementData * unk_00; - UnkStruct_ov19_021DA864 * unk_04; - UnkStruct_02009508 * unk_08; + GraphicElementData *unk_00; + UnkStruct_ov19_021DA864 *unk_04; + UnkStruct_02009508 *unk_08; int unk_0C; } CellActorData; diff --git a/include/struct_defs/struct_0200F600.h b/include/struct_defs/struct_0200F600.h index b3aaba4751..0a76bc5d65 100644 --- a/include/struct_defs/struct_0200F600.h +++ b/include/struct_defs/struct_0200F600.h @@ -4,7 +4,7 @@ #include "functypes/funcptr_0200F634.h" typedef struct { - void * unk_00[2]; + void *unk_00[2]; UnkFuncPtr_0200F634 unk_08[2]; int unk_10[2]; } UnkStruct_0200F600; diff --git a/include/struct_defs/struct_0200F7A0.h b/include/struct_defs/struct_0200F7A0.h index b3c986524c..79203b0da2 100644 --- a/include/struct_defs/struct_0200F7A0.h +++ b/include/struct_defs/struct_0200F7A0.h @@ -10,9 +10,9 @@ typedef struct { int unk_08; int unk_0C; int unk_10; - void * unk_14; - UnkStruct_02010658 * unk_18; - UnkStruct_0200F600 * unk_1C; + void *unk_14; + UnkStruct_02010658 *unk_18; + UnkStruct_0200F600 *unk_1C; int unk_20; u16 unk_24; u8 padding_26[2]; diff --git a/include/struct_defs/struct_020127E8.h b/include/struct_defs/struct_020127E8.h index 6ec5ea096a..84f63ed84b 100644 --- a/include/struct_defs/struct_020127E8.h +++ b/include/struct_defs/struct_020127E8.h @@ -1,19 +1,19 @@ #ifndef POKEPLATINUM_STRUCT_020127E8_H #define POKEPLATINUM_STRUCT_020127E8_H +#include + #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_defs/struct_0205AA50.h" -#include - typedef struct { - const UnkStruct_02012744 * unk_00; - const Window * unk_04; - GraphicElementManager * unk_08; - const NNSG2dImagePaletteProxy * unk_0C; - const GraphicElementData * unk_10; + const UnkStruct_02012744 *unk_00; + const Window *unk_04; + GraphicElementManager *unk_08; + const NNSG2dImagePaletteProxy *unk_0C; + const GraphicElementData *unk_10; int unk_14; int unk_18; int unk_1C; diff --git a/include/struct_defs/struct_02013A04_t.h b/include/struct_defs/struct_02013A04_t.h index a84c49eb8b..c777835b5b 100644 --- a/include/struct_defs/struct_02013A04_t.h +++ b/include/struct_defs/struct_02013A04_t.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_02013A04_T_H struct ResourceMetadata_t { - const void * unk_00; + const void *unk_00; u32 unk_04; }; diff --git a/include/struct_defs/struct_020147B8.h b/include/struct_defs/struct_020147B8.h index 29163a2ec8..8ae22c433c 100644 --- a/include/struct_defs/struct_020147B8.h +++ b/include/struct_defs/struct_020147B8.h @@ -1,15 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_020147B8_H #define POKEPLATINUM_STRUCT_020147B8_H - #include typedef struct UnkSPLStruct8_t UnkSPLStruct8; struct UnkSPLStruct6_t; typedef struct { - void (* unk_00)(const void *, UnkSPLStruct8 *, VecFx32 *, struct UnkSPLStruct6_t *); - const void * unk_04; + void (*unk_00)(const void *, UnkSPLStruct8 *, VecFx32 *, struct UnkSPLStruct6_t *); + const void *unk_04; } UnkStruct_020147B8; #endif // POKEPLATINUM_STRUCT_020147B8_H diff --git a/include/struct_defs/struct_02014874.h b/include/struct_defs/struct_02014874.h index 70dac81182..f368f375dd 100644 --- a/include/struct_defs/struct_02014874.h +++ b/include/struct_defs/struct_02014874.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02014874_H #define POKEPLATINUM_STRUCT_02014874_H - #include typedef struct { diff --git a/include/struct_defs/struct_02014890.h b/include/struct_defs/struct_02014890.h index 3fa652035c..950c5d08b2 100644 --- a/include/struct_defs/struct_02014890.h +++ b/include/struct_defs/struct_02014890.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02014890_H #define POKEPLATINUM_STRUCT_02014890_H - #include typedef struct { diff --git a/include/struct_defs/struct_02014970.h b/include/struct_defs/struct_02014970.h index 58239e09ec..e654c469d9 100644 --- a/include/struct_defs/struct_02014970.h +++ b/include/struct_defs/struct_02014970.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02014970_H #define POKEPLATINUM_STRUCT_02014970_H - #include typedef struct { diff --git a/include/struct_defs/struct_020158A8.h b/include/struct_defs/struct_020158A8.h index 62efbc4cd4..a316e9b6d8 100644 --- a/include/struct_defs/struct_020158A8.h +++ b/include/struct_defs/struct_020158A8.h @@ -5,8 +5,8 @@ #include "strbuf.h" typedef struct { - MessageLoader * unk_00; - Strbuf* unk_04[29]; + MessageLoader *unk_00; + Strbuf *unk_04[29]; } UnkStruct_020158A8; #endif // POKEPLATINUM_STRUCT_020158A8_H diff --git a/include/struct_defs/struct_02015958.h b/include/struct_defs/struct_02015958.h index d5d1f26e13..94adb24a56 100644 --- a/include/struct_defs/struct_02015958.h +++ b/include/struct_defs/struct_02015958.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" typedef struct { - BGL * unk_00; + BGL *unk_00; u32 unk_04; u32 unk_08; u32 unk_0C; diff --git a/include/struct_defs/struct_020170F4.h b/include/struct_defs/struct_020170F4.h index b0823b3a27..5573320ca3 100644 --- a/include/struct_defs/struct_020170F4.h +++ b/include/struct_defs/struct_020170F4.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_020170F4_H #define POKEPLATINUM_STRUCT_020170F4_H - #include typedef struct { - void * unk_00; - NNSG3dResMdlSet * unk_04; - NNSG3dResMdl * unk_08; - NNSG3dResTex * unk_0C; + void *unk_00; + NNSG3dResMdlSet *unk_04; + NNSG3dResMdl *unk_08; + NNSG3dResTex *unk_0C; } UnkStruct_020170F4; #endif // POKEPLATINUM_STRUCT_020170F4_H diff --git a/include/struct_defs/struct_02017248.h b/include/struct_defs/struct_02017248.h index 3b6860303d..97f950494d 100644 --- a/include/struct_defs/struct_02017248.h +++ b/include/struct_defs/struct_02017248.h @@ -1,13 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_02017248_H #define POKEPLATINUM_STRUCT_02017248_H - #include typedef struct { - void * unk_00; - void * unk_04; - NNSG3dAnmObj * unk_08; + void *unk_00; + void *unk_04; + NNSG3dAnmObj *unk_08; fx32 unk_0C; BOOL unk_10; } UnkStruct_02017248; diff --git a/include/struct_defs/struct_02017294.h b/include/struct_defs/struct_02017294.h index d88de74eef..8b98dcff56 100644 --- a/include/struct_defs/struct_02017294.h +++ b/include/struct_defs/struct_02017294.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02017294_H #define POKEPLATINUM_STRUCT_02017294_H - #include #include diff --git a/include/struct_defs/struct_02017498.h b/include/struct_defs/struct_02017498.h index 9a098bcf16..15477461cd 100644 --- a/include/struct_defs/struct_02017498.h +++ b/include/struct_defs/struct_02017498.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_STRUCT_02017498_H #define POKEPLATINUM_STRUCT_02017498_H -#include "overlay_manager.h" -#include "struct_defs/struct_0203E6C0.h" - #include #include +#include "struct_defs/struct_0203E6C0.h" + +#include "overlay_manager.h" + typedef struct { - UnkStruct_0203E6C0 * unk_00; + UnkStruct_0203E6C0 *unk_00; BOOL unk_10; - OverlayManager * unk_14; - void * unk_18; + OverlayManager *unk_14; + void *unk_18; NNSFndHeapHandle unk_1C; DWCInetControl unk_20; int unk_88; diff --git a/include/struct_defs/struct_0201AE08.h b/include/struct_defs/struct_0201AE08.h index 4eaa3a71e8..f3d2c5d339 100644 --- a/include/struct_defs/struct_0201AE08.h +++ b/include/struct_defs/struct_0201AE08.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0201AE08_H typedef struct { - const u8 * unk_00; + const u8 *unk_00; u16 unk_04; u16 unk_06; } UnkStruct_0201AE08; diff --git a/include/struct_defs/struct_0201D738.h b/include/struct_defs/struct_0201D738.h index 27cbd45b57..d406a93bba 100644 --- a/include/struct_defs/struct_0201D738.h +++ b/include/struct_defs/struct_0201D738.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0201D738_H #define POKEPLATINUM_STRUCT_0201D738_H -#include "strbuf.h" #include "struct_defs/struct_0205AA50.h" +#include "strbuf.h" + typedef struct { union { - const u16 * unk_00_val1; - const Strbuf* unk_00_val2; + const u16 *unk_00_val1; + const Strbuf *unk_00_val2; }; - Window * unk_04; + Window *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/struct_defs/struct_0201D834.h b/include/struct_defs/struct_0201D834.h index 902318c316..82b5bdf302 100644 --- a/include/struct_defs/struct_0201D834.h +++ b/include/struct_defs/struct_0201D834.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_0201D834_H #include "struct_defs/struct_0201D738.h" + #include "functypes/funcptr_0201D834.h" typedef struct { @@ -17,7 +18,7 @@ typedef struct { u8 unk_2C; u8 unk_2D; u16 unk_2E; - void * unk_30; + void *unk_30; } UnkStruct_0201D834; #endif // POKEPLATINUM_STRUCT_0201D834_H diff --git a/include/struct_defs/struct_02024184.h b/include/struct_defs/struct_02024184.h index 3480fdfa95..84fd66b624 100644 --- a/include/struct_defs/struct_02024184.h +++ b/include/struct_defs/struct_02024184.h @@ -2,9 +2,9 @@ #define POKEPLATINUM_STRUCT_02024184_H typedef struct { - const u16 * unk_00; - const u8 * unk_04; - const u8 * unk_08; + const u16 *unk_00; + const u8 *unk_04; + const u8 *unk_08; u32 unk_0C; } UnkStruct_02024184; diff --git a/include/struct_defs/struct_020298D8.h b/include/struct_defs/struct_020298D8.h index a694589deb..029ef82470 100644 --- a/include/struct_defs/struct_020298D8.h +++ b/include/struct_defs/struct_020298D8.h @@ -2,15 +2,17 @@ #define POKEPLATINUM_STRUCT_020298D8_H #include "struct_decls/sprite_decl.h" -#include "touch_screen.h" -#include "pokemon.h" + #include "overlay022/struct_ov22_022596B0.h" +#include "pokemon.h" +#include "touch_screen.h" + typedef struct { - Sprite * unk_00; + Sprite *unk_00; TouchScreenHitTable unk_04; UnkStruct_ov22_022596B0 unk_08; - Pokemon * unk_0C; + Pokemon *unk_0C; } UnkStruct_020298D8; #endif // POKEPLATINUM_STRUCT_020298D8_H diff --git a/include/struct_defs/struct_0202B370.h b/include/struct_defs/struct_0202B370.h index 8b038f4629..3d2fbbf25a 100644 --- a/include/struct_defs/struct_0202B370.h +++ b/include/struct_defs/struct_0202B370.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_0202B370_H #define POKEPLATINUM_STRUCT_0202B370_H -#include "struct_defs/struct_0202B370_sub1.h" - #include +#include "struct_defs/struct_0202B370_sub1.h" + typedef struct UnkStruct_0202B370_t { DWCUserData unk_00; DWCFriendData unk_40[32]; diff --git a/include/struct_defs/struct_0202D764.h b/include/struct_defs/struct_0202D764.h index b50a068bd9..b7c7171135 100644 --- a/include/struct_defs/struct_0202D764.h +++ b/include/struct_defs/struct_0202D764.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_0202D764_H #include "struct_defs/struct_0202D63C.h" + #include "overlay090/struct_ov90_021D1750.h" typedef struct UnkStruct_0202D764_t { diff --git a/include/struct_defs/struct_0202DF40.h b/include/struct_defs/struct_0202DF40.h index 0bd48a2517..20260b9554 100644 --- a/include/struct_defs/struct_0202DF40.h +++ b/include/struct_defs/struct_0202DF40.h @@ -5,8 +5,8 @@ typedef struct { u16 unk_00; - u16 unk_02_0 : 2; - u16 : 14; + u16 unk_02_0 : 2; + u16 : 14; UnkUnion_0204C4D0 unk_04; } UnkStruct_0202DF40; diff --git a/include/struct_defs/struct_0202EE10_sub1.h b/include/struct_defs/struct_0202EE10_sub1.h index abdde39d86..89fc6c85d2 100644 --- a/include/struct_defs/struct_0202EE10_sub1.h +++ b/include/struct_defs/struct_0202EE10_sub1.h @@ -6,7 +6,7 @@ typedef struct { u32 unk_00; u32 unk_04; - Strbuf* unk_08; + Strbuf *unk_08; } UnkStruct_0202EE10_sub1; #endif // POKEPLATINUM_STRUCT_0202EE10_SUB1_H diff --git a/include/struct_defs/struct_0202F298.h b/include/struct_defs/struct_0202F298.h index f809478747..8f1dab0b0c 100644 --- a/include/struct_defs/struct_0202F298.h +++ b/include/struct_defs/struct_0202F298.h @@ -1,12 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_0202F298_H #define POKEPLATINUM_STRUCT_0202F298_H -#include "game_options.h" #include "struct_defs/struct_0202F298_sub1.h" #include "struct_defs/struct_0202FAA8.h" #include "struct_defs/struct_0202FAA8_sub1.h" #include "struct_defs/struct_0202FD30.h" +#include "game_options.h" #include "trainer_info.h" typedef struct UnkStruct_0202F298_t { diff --git a/include/struct_defs/struct_0202FF58.h b/include/struct_defs/struct_0202FF58.h index d599c101b0..642bf674d2 100644 --- a/include/struct_defs/struct_0202FF58.h +++ b/include/struct_defs/struct_0202FF58.h @@ -2,9 +2,9 @@ #define POKEPLATINUM_STRUCT_0202FF58_H typedef struct { - u8 unk_00_0 : 1; - u8 unk_00_1 : 3; - u8 unk_00_4 : 1; + u8 unk_00_0 : 1; + u8 unk_00_1 : 3; + u8 unk_00_4 : 1; u8 : 3; u8 unk_01; u16 padding_02; diff --git a/include/struct_defs/struct_020322D8.h b/include/struct_defs/struct_020322D8.h index 129cc5eed7..d37a1b0127 100644 --- a/include/struct_defs/struct_020322D8.h +++ b/include/struct_defs/struct_020322D8.h @@ -4,14 +4,14 @@ #include "struct_defs/struct_020322D8.h" typedef struct UnkStruct_020322D8_t { - u8 * unk_00; - struct UnkStruct_020322D8_t * unk_04; - struct UnkStruct_020322D8_t * unk_08; + u8 *unk_00; + struct UnkStruct_020322D8_t *unk_04; + struct UnkStruct_020322D8_t *unk_08; u16 unk_0C; u8 unk_0E; u8 unk_0F_0 : 1; u8 unk_0F_1 : 1; - u8 : 6; + u8 : 6; } UnkStruct_020322D8; #endif // POKEPLATINUM_STRUCT_020322D8_H diff --git a/include/struct_defs/struct_020322F8.h b/include/struct_defs/struct_020322F8.h index a96e82cb8e..7fe958fad0 100644 --- a/include/struct_defs/struct_020322F8.h +++ b/include/struct_defs/struct_020322F8.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_STRUCT_020322F8_H #define POKEPLATINUM_STRUCT_020322F8_H -#include "comm_ring.h" #include "struct_defs/struct_020322D8.h" #include "struct_defs/struct_02032318.h" +#include "comm_ring.h" + typedef struct { UnkStruct_02032318 unk_00; UnkStruct_02032318 unk_08; - UnkStruct_020322D8 * unk_10; - CommRing * unk_14; - void * unk_18; + UnkStruct_020322D8 *unk_10; + CommRing *unk_14; + void *unk_18; int unk_1C; } CommQueueMan; diff --git a/include/struct_defs/struct_02032318.h b/include/struct_defs/struct_02032318.h index e777243edf..adff1ce2d7 100644 --- a/include/struct_defs/struct_02032318.h +++ b/include/struct_defs/struct_02032318.h @@ -4,8 +4,8 @@ #include "struct_defs/struct_020322D8.h" typedef struct { - UnkStruct_020322D8 * unk_00; - UnkStruct_020322D8 * unk_04; + UnkStruct_020322D8 *unk_00; + UnkStruct_020322D8 *unk_04; } UnkStruct_02032318; #endif // POKEPLATINUM_STRUCT_02032318_H diff --git a/include/struct_defs/struct_0203233C.h b/include/struct_defs/struct_0203233C.h index 8a01e920f3..d0a46c5d41 100644 --- a/include/struct_defs/struct_0203233C.h +++ b/include/struct_defs/struct_0203233C.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_STRUCT_0203233C_H typedef struct { - u8 * unk_00; + u8 *unk_00; int unk_04; } UnkStruct_0203233C; diff --git a/include/struct_defs/struct_0203CC84.h b/include/struct_defs/struct_0203CC84.h index e01ea5acd9..51effb6652 100644 --- a/include/struct_defs/struct_0203CC84.h +++ b/include/struct_defs/struct_0203CC84.h @@ -6,7 +6,7 @@ typedef struct { int unk_00; BOOL unk_04; - SaveData * unk_08; + SaveData *unk_08; } UnkStruct_0203CC84; #endif // POKEPLATINUM_STRUCT_0203CC84_H diff --git a/include/struct_defs/struct_0203D8AC.h b/include/struct_defs/struct_0203D8AC.h index f91c35ebfa..a8d0047b2a 100644 --- a/include/struct_defs/struct_0203D8AC.h +++ b/include/struct_defs/struct_0203D8AC.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_STRUCT_0203D8AC_H #include "struct_defs/union_0206B878.h" + #include "overlay080/struct_ov80_021D259C.h" typedef struct { diff --git a/include/struct_defs/struct_0203D9B8.h b/include/struct_defs/struct_0203D9B8.h index 3d1606ec3e..e5c5aebb8c 100644 --- a/include/struct_defs/struct_0203D9B8.h +++ b/include/struct_defs/struct_0203D9B8.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_0203D9B8_H #define POKEPLATINUM_STRUCT_0203D9B8_H -#include "trainer_info.h" -#include "game_options.h" #include "struct_decls/struct_0202AB28_decl.h" #include "struct_decls/struct_party_decl.h" -#include "bag.h" #include "struct_defs/struct_020989DC.h" +#include "bag.h" +#include "game_options.h" +#include "trainer_info.h" + typedef struct { u8 unk_00; u8 unk_01; @@ -15,11 +16,11 @@ typedef struct { u8 unk_03; u16 unk_04; u16 unk_06; - UnkStruct_0202AB28 * unk_08; - TrainerInfo * unk_0C; - Party * unk_10; - Bag * unk_14; - Options * unk_18; + UnkStruct_0202AB28 *unk_08; + TrainerInfo *unk_0C; + Party *unk_10; + Bag *unk_14; + Options *unk_18; UnkStruct_020989DC unk_1C[100]; } UnkStruct_0203D9B8; diff --git a/include/struct_defs/struct_0203DA00.h b/include/struct_defs/struct_0203DA00.h index 2c7ade0859..a5821ba3a7 100644 --- a/include/struct_defs/struct_0203DA00.h +++ b/include/struct_defs/struct_0203DA00.h @@ -1,21 +1,22 @@ #ifndef POKEPLATINUM_STRUCT_0203DA00_H #define POKEPLATINUM_STRUCT_0203DA00_H -#include "trainer_info.h" -#include "game_options.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029D04_decl.h" #include "struct_decls/struct_0202CD88_decl.h" + +#include "game_options.h" #include "pokemon.h" +#include "trainer_info.h" typedef struct { - Pokemon * unk_00; - UnkStruct_02029C68 * unk_04; - const UnkStruct_02029D04 * unk_08; - const Options * unk_0C; - UnkStruct_0202CD88 * unk_10; - const TrainerInfo * unk_14; - BOOL * unk_18; + Pokemon *unk_00; + UnkStruct_02029C68 *unk_04; + const UnkStruct_02029D04 *unk_08; + const Options *unk_0C; + UnkStruct_0202CD88 *unk_10; + const TrainerInfo *unk_14; + BOOL *unk_18; BOOL unk_1C; } UnkStruct_0203DA00; diff --git a/include/struct_defs/struct_0203DDFC.h b/include/struct_defs/struct_0203DDFC.h index 7b8509cdbf..c6708f097a 100644 --- a/include/struct_defs/struct_0203DDFC.h +++ b/include/struct_defs/struct_0203DDFC.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_0203DDFC_H #define POKEPLATINUM_STRUCT_0203DDFC_H +#include "struct_decls/struct_0205C22C_decl.h" + #include "game_options.h" #include "journal.h" -#include "struct_decls/struct_0205C22C_decl.h" typedef struct { - UnkStruct_0205C22C * unk_00; - Journal * unk_04; - Options * unk_08; + UnkStruct_0205C22C *unk_00; + Journal *unk_04; + Options *unk_08; } UnkStruct_0203DDFC; #endif // POKEPLATINUM_STRUCT_0203DDFC_H diff --git a/include/struct_defs/struct_0203DE34.h b/include/struct_defs/struct_0203DE34.h index a734405a4b..9616415359 100644 --- a/include/struct_defs/struct_0203DE34.h +++ b/include/struct_defs/struct_0203DE34.h @@ -1,18 +1,19 @@ #ifndef POKEPLATINUM_STRUCT_0203DE34_H #define POKEPLATINUM_STRUCT_0203DE34_H -#include "game_options.h" -#include "journal.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_0205C22C_decl.h" + +#include "game_options.h" +#include "journal.h" #include "savedata.h" typedef struct { - SaveData * unk_00; - UnkStruct_0205C22C * unk_04; - Options * unk_08; - UnkStruct_0202CD88 * unk_0C; - Journal * unk_10; + SaveData *unk_00; + UnkStruct_0205C22C *unk_04; + Options *unk_08; + UnkStruct_0202CD88 *unk_0C; + Journal *unk_10; } UnkStruct_0203DE34; #endif // POKEPLATINUM_STRUCT_0203DE34_H diff --git a/include/struct_defs/struct_0203E0FC.h b/include/struct_defs/struct_0203E0FC.h index 2325d3ef43..0ba9eb6cdc 100644 --- a/include/struct_defs/struct_0203E0FC.h +++ b/include/struct_defs/struct_0203E0FC.h @@ -1,34 +1,35 @@ #ifndef POKEPLATINUM_STRUCT_0203E0FC_H #define POKEPLATINUM_STRUCT_0203E0FC_H -#include "struct_decls/struct_02025CCC_decl.h" -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "game_options.h" +#include "struct_decls/struct_02025CCC_decl.h" #include "struct_decls/struct_0202B370_decl.h" -#include "journal.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_0202DA40_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" + #include "bag.h" +#include "game_options.h" +#include "journal.h" #include "savedata.h" +#include "trainer_info.h" typedef struct { - UnkStruct_0202DA40 * unk_00; - UnkStruct_02025CCC * unk_04; - Party * unk_08; - PCBoxes * unk_0C; - PokedexData * unk_10; - UnkStruct_0202B370 * unk_14; - UnkStruct_0202C878 * unk_18; - TrainerInfo * unk_1C; - SaveData * unk_20; - Options * unk_24; - UnkStruct_0202CD88 * unk_28; - Journal * unk_2C; - Bag * unk_30; + UnkStruct_0202DA40 *unk_00; + UnkStruct_02025CCC *unk_04; + Party *unk_08; + PCBoxes *unk_0C; + PokedexData *unk_10; + UnkStruct_0202B370 *unk_14; + UnkStruct_0202C878 *unk_18; + TrainerInfo *unk_1C; + SaveData *unk_20; + Options *unk_24; + UnkStruct_0202CD88 *unk_28; + Journal *unk_2C; + Bag *unk_30; int unk_34; int unk_38; int unk_3C; diff --git a/include/struct_defs/struct_0203E234.h b/include/struct_defs/struct_0203E234.h index 4553b991b0..619266185d 100644 --- a/include/struct_defs/struct_0203E234.h +++ b/include/struct_defs/struct_0203E234.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_0203E234_H #define POKEPLATINUM_STRUCT_0203E234_H +#include "struct_decls/struct_party_decl.h" + #include "play_time.h" #include "trainer_info.h" -#include "struct_decls/struct_party_decl.h" typedef struct { - const TrainerInfo * unk_00; - const Party * unk_04; - const PlayTime * playTime; + const TrainerInfo *unk_00; + const Party *unk_04; + const PlayTime *playTime; } UnkStruct_0203E234; #endif // POKEPLATINUM_STRUCT_0203E234_H diff --git a/include/struct_defs/struct_0203E274.h b/include/struct_defs/struct_0203E274.h index ce9d8ae8fb..9d8e44f098 100644 --- a/include/struct_defs/struct_0203E274.h +++ b/include/struct_defs/struct_0203E274.h @@ -6,7 +6,7 @@ typedef struct { int unk_00; BOOL unk_04; - const PokedexData * unk_08; + const PokedexData *unk_08; } UnkStruct_0203E274; #endif // POKEPLATINUM_STRUCT_0203E274_H diff --git a/include/struct_defs/struct_0203E2FC.h b/include/struct_defs/struct_0203E2FC.h index 0227ecd68c..da641fd629 100644 --- a/include/struct_defs/struct_0203E2FC.h +++ b/include/struct_defs/struct_0203E2FC.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_0203E2FC_H #define POKEPLATINUM_STRUCT_0203E2FC_H -#include "trainer_info.h" #include "game_options.h" #include "pokemon.h" +#include "trainer_info.h" typedef struct { - Pokemon * unk_00; - Options * unk_04; - TrainerInfo * unk_08; + Pokemon *unk_00; + Options *unk_04; + TrainerInfo *unk_08; u16 unk_0C; } UnkStruct_0203E2FC; diff --git a/include/struct_defs/struct_0203E348.h b/include/struct_defs/struct_0203E348.h index 2861a5ca10..e8846f71f6 100644 --- a/include/struct_defs/struct_0203E348.h +++ b/include/struct_defs/struct_0203E348.h @@ -4,9 +4,9 @@ #include "struct_decls/struct_0202CD88_decl.h" typedef struct { - int * unk_00; + int *unk_00; int unk_04; - UnkStruct_0202CD88 * unk_08; + UnkStruct_0202CD88 *unk_08; int unk_0C; int unk_10; } UnkStruct_0203E348; diff --git a/include/struct_defs/struct_0203E53C.h b/include/struct_defs/struct_0203E53C.h index 2a3c354d90..e10ad8b513 100644 --- a/include/struct_defs/struct_0203E53C.h +++ b/include/struct_defs/struct_0203E53C.h @@ -4,7 +4,7 @@ #include "savedata.h" typedef struct { - SaveData * unk_00; + SaveData *unk_00; int unk_04; } UnkStruct_0203E53C; diff --git a/include/struct_defs/struct_0203E564.h b/include/struct_defs/struct_0203E564.h index 927d525757..0e9555db55 100644 --- a/include/struct_defs/struct_0203E564.h +++ b/include/struct_defs/struct_0203E564.h @@ -4,7 +4,7 @@ #include "savedata.h" typedef struct { - SaveData * unk_00; + SaveData *unk_00; u8 unk_04; u8 unk_05; u16 unk_06; diff --git a/include/struct_defs/struct_0203E608.h b/include/struct_defs/struct_0203E608.h index 75240c76aa..2d31842d9c 100644 --- a/include/struct_defs/struct_0203E608.h +++ b/include/struct_defs/struct_0203E608.h @@ -4,7 +4,7 @@ #include "savedata.h" typedef struct { - SaveData * unk_00; + SaveData *unk_00; u8 unk_04; u8 padding_05[3]; u16 unk_08[3]; diff --git a/include/struct_defs/struct_0203E6C0.h b/include/struct_defs/struct_0203E6C0.h index 1c80c99379..97be36692a 100644 --- a/include/struct_defs/struct_0203E6C0.h +++ b/include/struct_defs/struct_0203E6C0.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_0203E6C0_H #include "field/field_system_decl.h" + #include "savedata.h" typedef struct { - FieldSystem * fieldSystem; - SaveData * unk_04; + FieldSystem *fieldSystem; + SaveData *unk_04; int unk_08; u8 unk_0C; u8 padding_0D[3]; diff --git a/include/struct_defs/struct_02041DC8.h b/include/struct_defs/struct_02041DC8.h index 6cf5855e9f..b4591f8ddb 100644 --- a/include/struct_defs/struct_02041DC8.h +++ b/include/struct_defs/struct_02041DC8.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_0202A750_decl.h" typedef struct { - UnkStruct_0202A750 * unk_00; + UnkStruct_0202A750 *unk_00; u32 unk_04; u32 unk_08; } UnkStruct_02041DC8; diff --git a/include/struct_defs/struct_02042434.h b/include/struct_defs/struct_02042434.h index 9798649de0..42db35dc83 100644 --- a/include/struct_defs/struct_02042434.h +++ b/include/struct_defs/struct_02042434.h @@ -4,7 +4,7 @@ #include "savedata.h" typedef struct { - SaveData * unk_00; + SaveData *unk_00; int unk_04; BOOL unk_08; } UnkStruct_02042434; diff --git a/include/struct_defs/struct_0204AFC4.h b/include/struct_defs/struct_0204AFC4.h index 65019ad3b1..9f039a6e98 100644 --- a/include/struct_defs/struct_0204AFC4.h +++ b/include/struct_defs/struct_0204AFC4.h @@ -5,6 +5,7 @@ #include "struct_decls/struct_0202D750_decl.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_0204B404.h" + #include "overlay104/struct_ov104_0223A348.h" typedef struct UnkStruct_0204AFC4_t { @@ -35,8 +36,8 @@ typedef struct UnkStruct_0204AFC4_t { u16 unk_36[4]; u16 unk_3E[14]; Location unk_5C; - UnkStruct_0202D060 * unk_70; - UnkStruct_0202D750 * unk_74; + UnkStruct_0202D060 *unk_70; + UnkStruct_0202D750 *unk_74; UnkStruct_ov104_0223A348 unk_78[2]; UnkStruct_ov104_0223A348 unk_298[5]; UnkStruct_0204B404 unk_7E8[5]; @@ -44,7 +45,7 @@ typedef struct UnkStruct_0204AFC4_t { u16 unk_83E[35]; u16 unk_884[35]; int unk_8CC; - void * unk_8D0; + void *unk_8D0; u8 unk_8D4; u8 unk_8D5; u8 unk_8D6; diff --git a/include/struct_defs/struct_0204F3D0.h b/include/struct_defs/struct_0204F3D0.h index 854eb5beb1..0915bfb35a 100644 --- a/include/struct_defs/struct_0204F3D0.h +++ b/include/struct_defs/struct_0204F3D0.h @@ -7,7 +7,7 @@ typedef struct { u8 padding_02[2]; u16 unk_04; u16 unk_06; - u16 * unk_08; + u16 *unk_08; } UnkStruct_0204F3D0; #endif // POKEPLATINUM_STRUCT_0204F3D0_H diff --git a/include/struct_defs/struct_0204FCF8.h b/include/struct_defs/struct_0204FCF8.h index 9e5391a061..5bd34e051e 100644 --- a/include/struct_defs/struct_0204FCF8.h +++ b/include/struct_defs/struct_0204FCF8.h @@ -7,7 +7,7 @@ typedef struct { u8 padding_02[2]; u16 unk_04[2]; u16 unk_08[2]; - u16 * unk_0C; + u16 *unk_0C; } UnkStruct_0204FCF8; #endif // POKEPLATINUM_STRUCT_0204FCF8_H diff --git a/include/struct_defs/struct_02050224.h b/include/struct_defs/struct_02050224.h index 86218cbab2..63f60102b7 100644 --- a/include/struct_defs/struct_02050224.h +++ b/include/struct_defs/struct_02050224.h @@ -7,7 +7,7 @@ typedef struct { u8 padding_02[2]; u16 unk_04[2]; u16 unk_08[2]; - u16 * unk_0C; + u16 *unk_0C; } UnkStruct_02050224; #endif // POKEPLATINUM_STRUCT_02050224_H diff --git a/include/struct_defs/struct_02055BA8.h b/include/struct_defs/struct_02055BA8.h index dfb7e8e0ff..947417d097 100644 --- a/include/struct_defs/struct_02055BA8.h +++ b/include/struct_defs/struct_02055BA8.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02055BA8_H #define POKEPLATINUM_STRUCT_02055BA8_H - #include typedef struct { diff --git a/include/struct_defs/struct_0205964C.h b/include/struct_defs/struct_0205964C.h index 6f61cd8c0d..af8caae9fc 100644 --- a/include/struct_defs/struct_0205964C.h +++ b/include/struct_defs/struct_0205964C.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_0205964C_H #define POKEPLATINUM_STRUCT_0205964C_H -#include "sys_task_manager.h" -#include "field/field_system_decl.h" -#include "functypes/funcptr_020598EC.h" -#include "struct_defs/struct_02072014.h" -#include "struct_decls/struct_party_decl.h" - #include +#include "struct_decls/struct_party_decl.h" +#include "struct_defs/struct_02072014.h" + +#include "field/field_system_decl.h" +#include "functypes/funcptr_020598EC.h" +#include "sys_task_manager.h" #endif // POKEPLATINUM_STRUCT_0205964C_H diff --git a/include/struct_defs/struct_0205AA50.h b/include/struct_defs/struct_0205AA50.h index 94892fec8f..3221ab2d89 100644 --- a/include/struct_defs/struct_0205AA50.h +++ b/include/struct_defs/struct_0205AA50.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_02018340_decl.h" typedef struct { - BGL * unk_00; + BGL *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; @@ -12,8 +12,8 @@ typedef struct { u8 unk_08; u8 unk_09; u16 unk_0A_0 : 15; - u16 unk_0A_15 : 1; - void * unk_0C; + u16 unk_0A_15 : 1; + void *unk_0C; } Window; #endif // POKEPLATINUM_STRUCT_0205AA50_H diff --git a/include/struct_defs/struct_0205C22C.h b/include/struct_defs/struct_0205C22C.h index f21c022ab7..ebd3de1428 100644 --- a/include/struct_defs/struct_0205C22C.h +++ b/include/struct_defs/struct_0205C22C.h @@ -1,22 +1,24 @@ #ifndef POKEPLATINUM_STRUCT_0205C22C_H #define POKEPLATINUM_STRUCT_0205C22C_H -#include "sys_task_manager.h" #include "struct_decls/struct_02027F8C_decl.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_0205B43C_decl.h" -#include "struct_defs/struct_0205C680.h" #include "struct_decls/struct_0205C95C_decl.h" #include "struct_decls/struct_0205E884_decl.h" +#include "struct_defs/struct_0205C680.h" + +#include "field/field_system_decl.h" + +#include "sys_task_manager.h" typedef struct UnkStruct_0205C22C_t { - UnkStruct_0205B43C * unk_00; - SysTask * unk_04; - PlayerAvatar * playerAvatar; + UnkStruct_0205B43C *unk_00; + SysTask *unk_04; + PlayerAvatar *playerAvatar; UnkStruct_0205C680 unk_0C[50 + 1]; - FieldSystem * fieldSystem; - UnkStruct_02027F8C * unk_474; - UnkStruct_0205C95C * unk_478; + FieldSystem *fieldSystem; + UnkStruct_02027F8C *unk_474; + UnkStruct_0205C95C *unk_478; int unk_47C; int unk_480; } UnkStruct_0205C22C; diff --git a/include/struct_defs/struct_0205C680.h b/include/struct_defs/struct_0205C680.h index ce8af23cac..d154b23480 100644 --- a/include/struct_defs/struct_0205C680.h +++ b/include/struct_defs/struct_0205C680.h @@ -15,8 +15,8 @@ typedef struct { u8 unk_09; u8 padding_0A[2]; u32 unk_0C; - UnkStruct_ov101_021D5D90 * unk_10; - UnkStruct_ov101_021D5D90 * unk_14; + UnkStruct_ov101_021D5D90 *unk_10; + UnkStruct_ov101_021D5D90 *unk_14; } UnkStruct_0205C680; #endif // POKEPLATINUM_STRUCT_0205C680_H diff --git a/include/struct_defs/struct_0205C924.h b/include/struct_defs/struct_0205C924.h index 226f8b95ab..a265d98f2f 100644 --- a/include/struct_defs/struct_0205C924.h +++ b/include/struct_defs/struct_0205C924.h @@ -2,12 +2,13 @@ #define POKEPLATINUM_STRUCT_0205C924_H #include "struct_defs/sentence.h" + #include "strbuf.h" typedef struct { - Strbuf* unk_00; - Strbuf* unk_04; - Strbuf* unk_08; + Strbuf *unk_00; + Strbuf *unk_04; + Strbuf *unk_08; u32 unk_0C; int unk_10; Sentence unk_14; diff --git a/include/struct_defs/struct_020684D0.h b/include/struct_defs/struct_020684D0.h index 969c91ec88..9f11865370 100644 --- a/include/struct_defs/struct_020684D0.h +++ b/include/struct_defs/struct_020684D0.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_020684D0_H #define POKEPLATINUM_STRUCT_020684D0_H -#include "field/field_system_decl.h" #include "struct_decls/struct_0205E884_decl.h" +#include "field/field_system_decl.h" + typedef struct { int unk_00; BOOL unk_04; @@ -12,8 +13,8 @@ typedef struct { u16 unk_0E; u16 unk_10; u8 padding_12[2]; - PlayerAvatar * playerAvatar; - FieldSystem * fieldSystem; + PlayerAvatar *playerAvatar; + FieldSystem *fieldSystem; } UnkStruct_020684D0; #endif // POKEPLATINUM_STRUCT_020684D0_H diff --git a/include/struct_defs/struct_02068630.h b/include/struct_defs/struct_02068630.h index 74a5c7368b..81390ff099 100644 --- a/include/struct_defs/struct_02068630.h +++ b/include/struct_defs/struct_02068630.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_020508D4_decl.h" typedef struct { - TaskManager * unk_00; + TaskManager *unk_00; u16 unk_04; u8 unk_06; u8 padding_07; diff --git a/include/struct_defs/struct_0206A844.h b/include/struct_defs/struct_0206A844.h index 87e05f620f..677795b471 100644 --- a/include/struct_defs/struct_0206A844.h +++ b/include/struct_defs/struct_0206A844.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_0206A844_H #include "struct_defs/struct_0200D0F4.h" + #include "overlay005/struct_ov5_021D30A8.h" typedef struct { UnkStruct_ov5_021D30A8 unk_00; - CellActorData * unk_1C8[2]; + CellActorData *unk_1C8[2]; } UnkStruct_0206A844; #endif // POKEPLATINUM_STRUCT_0206A844_H diff --git a/include/struct_defs/struct_0206BC70.h b/include/struct_defs/struct_0206BC70.h index 76ea7cc41b..e477171911 100644 --- a/include/struct_defs/struct_0206BC70.h +++ b/include/struct_defs/struct_0206BC70.h @@ -1,21 +1,22 @@ #ifndef POKEPLATINUM_STRUCT_0206BC70_H #define POKEPLATINUM_STRUCT_0206BC70_H +#include + #include "struct_decls/struct_02025CCC_decl.h" -#include "game_options.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_decls/struct_0202D764_decl.h" -#include "savedata.h" -#include +#include "game_options.h" +#include "savedata.h" typedef struct { - UnkStruct_0202D750 * unk_00; - UnkStruct_0202D764 * unk_04; - UnkStruct_02025CCC * unk_08; - SaveData * unk_0C; - Options * unk_10; - DWCUserData * unk_14; + UnkStruct_0202D750 *unk_00; + UnkStruct_0202D764 *unk_04; + UnkStruct_02025CCC *unk_08; + SaveData *unk_0C; + Options *unk_10; + DWCUserData *unk_14; int unk_18; int unk_1C; int unk_20; diff --git a/include/struct_defs/struct_0206C8D4.h b/include/struct_defs/struct_0206C8D4.h index 88ec6ebef1..2f0a50c361 100644 --- a/include/struct_defs/struct_0206C8D4.h +++ b/include/struct_defs/struct_0206C8D4.h @@ -6,7 +6,7 @@ typedef struct { u8 unk_00; u8 padding_01[3]; - UnkStruct_ov5_021D5894 * unk_04; + UnkStruct_ov5_021D5894 *unk_04; } UnkStruct_0206C8D4; #endif // POKEPLATINUM_STRUCT_0206C8D4_H diff --git a/include/struct_defs/struct_020708E0.h b/include/struct_defs/struct_020708E0.h index 3719d9b2d9..63942b90a6 100644 --- a/include/struct_defs/struct_020708E0.h +++ b/include/struct_defs/struct_020708E0.h @@ -1,34 +1,35 @@ #ifndef POKEPLATINUM_STRUCT_020708E0_H #define POKEPLATINUM_STRUCT_020708E0_H -#include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/cell_actor_data.h" +#include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "functypes/funcptr_02050904.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020684D0.h" #include "struct_defs/struct_02070950.h" + +#include "functypes/funcptr_02050904.h" #include "overlay005/struct_ov5_021D30A8.h" typedef struct { Window unk_00; Window unk_10; - UIControlData * unk_20; - ResourceMetadata * unk_24; + UIControlData *unk_20; + ResourceMetadata *unk_24; u16 unk_28; u16 state; u32 unk_2C; u8 unk_30[7]; UnkStruct_ov5_021D30A8 unk_38; - CellActorData * unk_200[8]; + CellActorData *unk_200[8]; u32 unk_220; u32 unk_224; u32 unk_228; FieldTask unk_22C; UnkStruct_020684D0 unk_230; UnkStruct_02070950 unk_24C; - void * unk_25C; - void * unk_260; + void *unk_25C; + void *unk_260; } FieldMenu; enum FieldMenuState { diff --git a/include/struct_defs/struct_02070950.h b/include/struct_defs/struct_02070950.h index eb7a4f4070..33b7c47cea 100644 --- a/include/struct_defs/struct_02070950.h +++ b/include/struct_defs/struct_02070950.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_02070950_H #define POKEPLATINUM_STRUCT_02070950_H -#include "field/field_system_decl.h" #include "struct_decls/struct_02061AB4_decl.h" +#include "field/field_system_decl.h" + typedef struct UnkStruct_02070950_t { u32 unk_00; - FieldSystem * fieldSystem; - MapObject * unk_08; + FieldSystem *fieldSystem; + MapObject *unk_08; u16 unk_0C; } UnkStruct_02070950; diff --git a/include/struct_defs/struct_020709CC.h b/include/struct_defs/struct_020709CC.h index eb8027b990..08769b8575 100644 --- a/include/struct_defs/struct_020709CC.h +++ b/include/struct_defs/struct_020709CC.h @@ -4,7 +4,7 @@ #include "struct_decls/struct_020508D4_decl.h" typedef struct UnkStruct_020709CC_t { - TaskManager * unk_00; + TaskManager *unk_00; u16 unk_04; u16 unk_06; } UnkStruct_020709CC; diff --git a/include/struct_defs/struct_020711C8.h b/include/struct_defs/struct_020711C8.h index 4b08ff50d2..3ad11c12ce 100644 --- a/include/struct_defs/struct_020711C8.h +++ b/include/struct_defs/struct_020711C8.h @@ -4,8 +4,8 @@ #include "pokemon.h" typedef struct { - Pokemon * unk_00; - void * unk_04; + Pokemon *unk_00; + void *unk_04; } UnkStruct_020711C8; #endif // POKEPLATINUM_STRUCT_020711C8_H diff --git a/include/struct_defs/struct_02072014.h b/include/struct_defs/struct_02072014.h index ee6858e96e..e27f42c3dc 100644 --- a/include/struct_defs/struct_02072014.h +++ b/include/struct_defs/struct_02072014.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_STRUCT_02072014_H #define POKEPLATINUM_STRUCT_02072014_H -#include "play_time.h" #include "struct_defs/struct_02072014_sub1.h" +#include "play_time.h" + typedef struct { u8 unk_00; u8 unk_01; diff --git a/include/struct_defs/struct_02073838.h b/include/struct_defs/struct_02073838.h index c20561b469..84f5996c38 100644 --- a/include/struct_defs/struct_02073838.h +++ b/include/struct_defs/struct_02073838.h @@ -1,15 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_02073838_H #define POKEPLATINUM_STRUCT_02073838_H - #include typedef struct { BOOL unk_00; - NNSG3dResFileHeader * unk_04; - NNSG3dResMdlSet * unk_08; - NNSG3dResMdl * unk_0C; - NNSG3dResTex * unk_10; + NNSG3dResFileHeader *unk_04; + NNSG3dResMdlSet *unk_08; + NNSG3dResMdl *unk_0C; + NNSG3dResTex *unk_10; } UnkStruct_02073838; #endif // POKEPLATINUM_STRUCT_02073838_H diff --git a/include/struct_defs/struct_02073974.h b/include/struct_defs/struct_02073974.h index 81b5ab03cd..99a08b2465 100644 --- a/include/struct_defs/struct_02073974.h +++ b/include/struct_defs/struct_02073974.h @@ -1,15 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_02073974_H #define POKEPLATINUM_STRUCT_02073974_H - #include typedef struct { u32 unk_00; fx32 unk_04; - void * unk_08; - void * unk_0C; - NNSG3dAnmObj * unk_10; + void *unk_08; + void *unk_0C; + NNSG3dAnmObj *unk_10; NNSFndAllocator unk_14; } UnkStruct_02073974; diff --git a/include/struct_defs/struct_02073B50.h b/include/struct_defs/struct_02073B50.h index fc6200fcdd..89bf943dfc 100644 --- a/include/struct_defs/struct_02073B50.h +++ b/include/struct_defs/struct_02073B50.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02073B50_H #define POKEPLATINUM_STRUCT_02073B50_H - #include typedef struct { diff --git a/include/struct_defs/struct_02078B40.h b/include/struct_defs/struct_02078B40.h index d9993eb4a6..9302dcc76e 100644 --- a/include/struct_defs/struct_02078B40.h +++ b/include/struct_defs/struct_02078B40.h @@ -22,7 +22,7 @@ typedef struct UnkStruct_02078B40_t { u16 unk_1C[4]; u8 unk_24[4]; u8 unk_28[4]; - u32 hpIV : 5; + u32 hpIV : 5; u32 atkIV : 5; u32 defIV : 5; u32 speedIV : 5; diff --git a/include/struct_defs/struct_0207A778.h b/include/struct_defs/struct_0207A778.h index 21822c1a28..7eb5c32c0a 100644 --- a/include/struct_defs/struct_0207A778.h +++ b/include/struct_defs/struct_0207A778.h @@ -5,19 +5,20 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay006/battle_params.h" typedef struct { - BattleParams * unk_00; - BGL * unk_04; - Window * unk_08; - PaletteData * unk_0C; - UnkStruct_02027F8C * unk_10[4]; + BattleParams *unk_00; + BGL *unk_04; + Window *unk_08; + PaletteData *unk_0C; + UnkStruct_02027F8C *unk_10[4]; u8 unk_20[0x1000]; u8 unk_1020; u8 unk_1021; u16 unk_1022; - void * unk_1024; + void *unk_1024; } UnkStruct_0207A778; #endif // POKEPLATINUM_STRUCT_0207A778_H diff --git a/include/struct_defs/struct_0207ACB4.h b/include/struct_defs/struct_0207ACB4.h index be41890f53..35caa61388 100644 --- a/include/struct_defs/struct_0207ACB4.h +++ b/include/struct_defs/struct_0207ACB4.h @@ -4,7 +4,7 @@ #include "struct_decls/battle_system.h" typedef struct { - BattleSystem * unk_00; + BattleSystem *unk_00; u8 unk_04; } UnkStruct_0207ACB4; diff --git a/include/struct_defs/struct_0207AD40.h b/include/struct_defs/struct_0207AD40.h index 664e329634..8b56ee3cde 100644 --- a/include/struct_defs/struct_0207AD40.h +++ b/include/struct_defs/struct_0207AD40.h @@ -4,7 +4,7 @@ #include "struct_decls/battle_system.h" typedef struct { - BattleSystem * unk_00; + BattleSystem *unk_00; u8 unk_04; } UnkStruct_0207AD40; diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index 11db538115..3321b0d761 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -1,50 +1,52 @@ #ifndef POKEPLATINUM_STRUCT_0207AE68_T_H #define POKEPLATINUM_STRUCT_0207AE68_T_H +#include "struct_decls/pokedexdata_decl.h" +#include "struct_decls/pokemon_animation_sys_decl.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" -#include "message.h" -#include "string_template.h" -#include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "struct_decls/pokedexdata_decl.h" -#include "game_options.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "poketch_data.h" -#include "struct_defs/struct_0205AA50.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" +#include "struct_defs/pokemon_summary.h" +#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_0207C8C4.h" + #include "bag.h" -#include "struct_defs/pokemon_summary.h" +#include "game_options.h" +#include "message.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "poketch_data.h" +#include "strbuf.h" +#include "string_template.h" struct UnkStruct_0207AE68_t { - BGL * unk_00; - Window * unk_04; - MessageLoader * unk_08; - StringTemplate * unk_0C; - Strbuf* unk_10; - PaletteData * unk_14; - UnkStruct_02007768 * unk_18; - Sprite * unk_1C[2]; - Party * unk_24; - Pokemon * unk_28; - Options * unk_2C; - UnkStruct_0207C8C4 * unk_30; - GenericPointerData * unk_34; - OverlayManager * unk_38; - PokemonSummary * unk_3C; - void * unk_40; - PokemonAnimationSys * unk_44; - PokedexData * unk_48; - Bag * unk_4C; - UnkStruct_0202CD88 * unk_50; + BGL *unk_00; + Window *unk_04; + MessageLoader *unk_08; + StringTemplate *unk_0C; + Strbuf *unk_10; + PaletteData *unk_14; + UnkStruct_02007768 *unk_18; + Sprite *unk_1C[2]; + Party *unk_24; + Pokemon *unk_28; + Options *unk_2C; + UnkStruct_0207C8C4 *unk_30; + GenericPointerData *unk_34; + OverlayManager *unk_38; + PokemonSummary *unk_3C; + void *unk_40; + PokemonAnimationSys *unk_44; + PokedexData *unk_48; + Bag *unk_4C; + UnkStruct_0202CD88 *unk_50; PoketchData *poketchData; - void * unk_58; + void *unk_58; int unk_5C; u16 unk_60; u16 unk_62; @@ -64,7 +66,7 @@ struct UnkStruct_0207AE68_t { u8 unk_75; int unk_78; int unk_7C; - NARC * unk_80; + NARC *unk_80; u8 unk_84; u8 unk_85; u8 unk_86; diff --git a/include/struct_defs/struct_0207C690.h b/include/struct_defs/struct_0207C690.h index 952966c2e7..5bc2f15fd7 100644 --- a/include/struct_defs/struct_0207C690.h +++ b/include/struct_defs/struct_0207C690.h @@ -3,8 +3,8 @@ typedef struct { int unk_00; - void * unk_04; - void * unk_08; + void *unk_04; + void *unk_08; } GenericPointerData; #endif // POKEPLATINUM_STRUCT_0207C690_H diff --git a/include/struct_defs/struct_0207C8C4.h b/include/struct_defs/struct_0207C8C4.h index 2a71e00c74..2ec4f01491 100644 --- a/include/struct_defs/struct_0207C8C4.h +++ b/include/struct_defs/struct_0207C8C4.h @@ -8,8 +8,8 @@ typedef struct { UnkStruct_0207C894 unk_00; - UnkSPLStruct6 * unk_08; - UnkStruct_02014014 * unk_0C; + UnkSPLStruct6 *unk_08; + UnkStruct_02014014 *unk_0C; } UnkStruct_0207C8C4; #endif // POKEPLATINUM_STRUCT_0207C8C4_H diff --git a/include/struct_defs/struct_0207CB08.h b/include/struct_defs/struct_0207CB08.h index c947716894..47d89adec3 100644 --- a/include/struct_defs/struct_0207CB08.h +++ b/include/struct_defs/struct_0207CB08.h @@ -1,19 +1,20 @@ #ifndef POKEPLATINUM_STRUCT_0207CB08_H #define POKEPLATINUM_STRUCT_0207CB08_H -#include "savedata.h" #include "overlay084/struct_ov84_0223BE5C.h" +#include "savedata.h" + typedef struct UnkStruct_0207CB08_t { - SaveData * unk_00; + SaveData *unk_00; UnkStruct_ov84_0223BE5C unk_04[8]; u8 unk_64; u8 unk_65; u16 unk_66; u16 unk_68; u8 padding_6A[2]; - void * unk_6C; - void * unk_70; + void *unk_6C; + void *unk_70; u8 unk_74; u8 unk_75; u16 unk_76_0 : 1; diff --git a/include/struct_defs/struct_0207DE04.h b/include/struct_defs/struct_0207DE04.h index 83e52e9036..adb19f166b 100644 --- a/include/struct_defs/struct_0207DE04.h +++ b/include/struct_defs/struct_0207DE04.h @@ -10,7 +10,7 @@ typedef struct { u8 unk_03; u8 unk_04; u8 unk_05[3]; - SaveData * unk_08; + SaveData *unk_08; } UnkStruct_0207DE04; #endif // POKEPLATINUM_STRUCT_0207DE04_H diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h index 462db2f0a7..5b2f2fb60c 100644 --- a/include/struct_defs/struct_0207F248.h +++ b/include/struct_defs/struct_0207F248.h @@ -1,51 +1,53 @@ #ifndef POKEPLATINUM_STRUCT_0207F248_H #define POKEPLATINUM_STRUCT_0207F248_H +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" -#include "string_template.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" +#include "struct_decls/struct_02098700_decl.h" +#include "struct_defs/funcptr_0207F248_sub1.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" -#include "functypes/funcptr_0207F248.h" -#include "struct_defs/funcptr_0207F248_sub1.h" #include "struct_defs/struct_020831B4.h" #include "struct_defs/struct_02083D1C.h" -#include "struct_decls/struct_02098700_decl.h" #include "struct_defs/struct_02098C44.h" #include "struct_defs/struct_020F1DB8.h" + +#include "functypes/funcptr_0207F248.h" #include "overlay118/struct_ov118_021D0FDC_decl.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" + typedef struct { - BGL * unk_00; + BGL *unk_00; Window unk_04[37]; Window unk_254[1]; u16 unk_264[96]; u16 unk_324[96]; u16 unk_3E4[96]; u16 unk_4A4[128]; - PartyManagementData * unk_5A4; - SpriteRenderer * unk_5A8; - SpriteGfxHandler * unk_5AC; - GraphicElementData * unk_5B0[29]; - CellActorData * unk_624[29]; - UnkStruct_0200C440 * unk_698; - MessageLoader * unk_69C; - StringTemplate * unk_6A0; - Strbuf* unk_6A4; - Strbuf* unk_6A8; - Strbuf* unk_6AC[20]; - ResourceMetadata * unk_6FC; - UIControlData * unk_700; + PartyManagementData *unk_5A4; + SpriteRenderer *unk_5A8; + SpriteGfxHandler *unk_5AC; + GraphicElementData *unk_5B0[29]; + CellActorData *unk_624[29]; + UnkStruct_0200C440 *unk_698; + MessageLoader *unk_69C; + StringTemplate *unk_6A0; + Strbuf *unk_6A4; + Strbuf *unk_6A8; + Strbuf *unk_6AC[20]; + ResourceMetadata *unk_6FC; + UIControlData *unk_700; StrBufWrapper unk_704[6]; - const ByteFlagSet * unk_7F4; + const ByteFlagSet *unk_7F4; DualArrayShortData unk_7F8; GenericFunctionPtr unk_B00; FunctionPtrPair unk_B04; @@ -60,9 +62,9 @@ typedef struct { u8 unk_B12; u8 unk_B13; u16 unk_B14[6]; - HeightWeightData * unk_B20; - OverlayMetadata * unk_B24; - GenericPointerData * unk_B28; + HeightWeightData *unk_B20; + OverlayMetadata *unk_B24; + GenericPointerData *unk_B28; } GameWindowLayout; #endif // POKEPLATINUM_STRUCT_0207F248_H diff --git a/include/struct_defs/struct_02081CF4.h b/include/struct_defs/struct_02081CF4.h index 74a54dbc45..ddb2b70e74 100644 --- a/include/struct_defs/struct_02081CF4.h +++ b/include/struct_defs/struct_02081CF4.h @@ -5,8 +5,8 @@ #include "struct_defs/struct_0205AA50.h" typedef struct { - const ResourceMetadata * unk_00; - Window * unk_04; + const ResourceMetadata *unk_00; + Window *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; diff --git a/include/struct_defs/struct_020831B4.h b/include/struct_defs/struct_020831B4.h index ceeecfcf48..3c4e86b527 100644 --- a/include/struct_defs/struct_020831B4.h +++ b/include/struct_defs/struct_020831B4.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_STRUCT_020831B4_H #include "struct_decls/struct_02022550_decl.h" + #include "strbuf.h" typedef struct { - Strbuf* unk_00; + Strbuf *unk_00; u16 unk_04; u16 unk_06; u16 unk_08; @@ -26,7 +27,7 @@ typedef struct { s16 unk_1C; s16 unk_1E; s16 unk_20; - GraphicElementData * unk_24; + GraphicElementData *unk_24; u8 unk_28; u8 unk_29; } StrBufWrapper; diff --git a/include/struct_defs/struct_0208737C.h b/include/struct_defs/struct_0208737C.h index 45841367c8..5ea624734e 100644 --- a/include/struct_defs/struct_0208737C.h +++ b/include/struct_defs/struct_0208737C.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_0208737C_H #define POKEPLATINUM_STRUCT_0208737C_H -#include "strbuf.h" -#include "game_options.h" #include "struct_decls/struct_020797DC_decl.h" +#include "game_options.h" +#include "strbuf.h" + typedef struct { int unk_00; int unk_04; @@ -12,11 +13,11 @@ typedef struct { int unk_0C; int unk_10; int unk_14; - Strbuf* unk_18; + Strbuf *unk_18; u16 unk_1C[20]; int unk_44; - PCBoxes * unk_48; - Options * unk_4C; + PCBoxes *unk_48; + Options *unk_4C; } UnkStruct_0208737C; #endif // POKEPLATINUM_STRUCT_0208737C_H diff --git a/include/struct_defs/struct_02089438.h b/include/struct_defs/struct_02089438.h index aed7e5aa4e..73c3960156 100644 --- a/include/struct_defs/struct_02089438.h +++ b/include/struct_defs/struct_02089438.h @@ -1,15 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_02089438_H #define POKEPLATINUM_STRUCT_02089438_H -#include "strbuf.h" #include "game_options.h" +#include "strbuf.h" typedef struct { int unk_00; int unk_04[5]; int unk_18; - Strbuf* unk_1C; - Options * unk_20; + Strbuf *unk_1C; + Options *unk_20; int unk_24; u32 unk_28; u32 unk_2C; diff --git a/include/struct_defs/struct_02089688_sub1.h b/include/struct_defs/struct_02089688_sub1.h index f40829afd6..b25785067b 100644 --- a/include/struct_defs/struct_02089688_sub1.h +++ b/include/struct_defs/struct_02089688_sub1.h @@ -1,29 +1,30 @@ #ifndef POKEPLATINUM_STRUCT_02089688_SUB1_H #define POKEPLATINUM_STRUCT_02089688_SUB1_H +#include "struct_decls/font_oam.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02018340_decl.h" -#include "struct_defs/sprite_manager_allocation.h" -#include "touch_screen.h" #include "struct_decls/struct_02023FCC_decl.h" +#include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0205AA50.h" +#include "touch_screen.h" + typedef struct { - NARC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; - BGL * unk_0C; - PaletteData * unk_10; - UnkStruct_02023FCC * unk_14; + NARC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; + BGL *unk_0C; + PaletteData *unk_10; + UnkStruct_02023FCC *unk_14; TouchScreenRect unk_18[28]; BOOL unk_88; - UnkStruct_02012744 * unk_8C; - FontOAM * unk_90[2]; + UnkStruct_02012744 *unk_8C; + FontOAM *unk_90[2]; SpriteManagerAllocation unk_98[2]; Window unk_B0; } UnkStruct_02089688_sub1; diff --git a/include/struct_defs/struct_0208AF44.h b/include/struct_defs/struct_0208AF44.h index 2b97fb1d48..ce1a8859fa 100644 --- a/include/struct_defs/struct_0208AF44.h +++ b/include/struct_defs/struct_0208AF44.h @@ -2,15 +2,16 @@ #define POKEPLATINUM_STRUCT_0208AF44_H #include "struct_decls/cell_actor_data.h" -#include "touch_screen.h" #include "struct_defs/struct_0208AF44_sub1.h" +#include "touch_screen.h" + typedef struct { int unk_00; int unk_04; BOOL unk_08; - CellActorData * unk_0C; - TouchScreenRect * unk_10; + CellActorData *unk_0C; + TouchScreenRect *unk_10; UnkStruct_0208AF44_sub1 unk_14; } UnkStruct_0208AF44; diff --git a/include/struct_defs/struct_0208B878.h b/include/struct_defs/struct_0208B878.h index 66d99f1f1d..b93934f14a 100644 --- a/include/struct_defs/struct_0208B878.h +++ b/include/struct_defs/struct_0208B878.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_STRUCT_0208B878_H #define POKEPLATINUM_STRUCT_0208B878_H -#include "sys_task_manager.h" #include "struct_defs/struct_0208B284.h" #include "struct_defs/struct_0208B878_sub1.h" #include "struct_defs/struct_0208B878_sub2.h" +#include "sys_task_manager.h" + typedef struct { UnkStruct_0208B878_sub1 unk_00; UnkStruct_0208B284 unk_10; @@ -14,7 +15,7 @@ typedef struct { int unk_E8; int unk_EC; BOOL unk_F0; - SysTask * unk_F4; + SysTask *unk_F4; int unk_F8; int unk_FC; int unk_100; diff --git a/include/struct_defs/struct_0208B878_sub1.h b/include/struct_defs/struct_0208B878_sub1.h index 544c499de4..46fe31f209 100644 --- a/include/struct_defs/struct_0208B878_sub1.h +++ b/include/struct_defs/struct_0208B878_sub1.h @@ -7,10 +7,10 @@ #include "struct_decls/struct_0200C704_decl.h" typedef struct { - NARC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; - PaletteData * unk_0C; + NARC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; + PaletteData *unk_0C; } UnkStruct_0208B878_sub1; #endif // POKEPLATINUM_STRUCT_0208B878_SUB1_H diff --git a/include/struct_defs/struct_0208B878_sub2.h b/include/struct_defs/struct_0208B878_sub2.h index cfff8c52a1..d5e6c26a9a 100644 --- a/include/struct_defs/struct_0208B878_sub2.h +++ b/include/struct_defs/struct_0208B878_sub2.h @@ -4,7 +4,7 @@ #include "struct_decls/cell_actor_data.h" typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; s16 unk_04; s16 unk_06; int unk_08; diff --git a/include/struct_defs/struct_0208C06C.h b/include/struct_defs/struct_0208C06C.h index 0b10b522a0..da9c40ab30 100644 --- a/include/struct_defs/struct_0208C06C.h +++ b/include/struct_defs/struct_0208C06C.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_0208C06C_H #define POKEPLATINUM_STRUCT_0208C06C_H -#include "sys_task_manager.h" #include "struct_decls/struct_0202F41C_decl.h" #include "struct_decls/struct_02030A80_decl.h" #include "struct_defs/struct_0205AA50.h" @@ -10,46 +9,49 @@ #include "struct_defs/struct_0208C06C_sub1.h" #include "struct_defs/struct_0208C06C_sub2.h" #include "struct_defs/struct_020F3DCC.h" -#include "savedata.h" + #include "overlay062/struct_ov62_022307C0.h" #include "overlay062/struct_ov62_02230C28.h" #include "overlay062/struct_ov62_0223118C.h" #include "overlay062/struct_ov62_02233750.h" #include "overlay062/struct_ov62_02233828.h" +#include "savedata.h" +#include "sys_task_manager.h" + typedef struct { int unk_00; int unk_04; int unk_08; int unk_0C; - int * unk_10; + int *unk_10; UnkStruct_ov62_0223118C unk_14; UnkStruct_ov62_02233750 unk_52C; UnkStruct_ov62_022307C0 unk_534; - UnkStruct_0208B878 * unk_6F0; - UnkStruct_0208B878 * unk_6F4; + UnkStruct_0208B878 *unk_6F0; + UnkStruct_0208B878 *unk_6F4; UnkStruct_ov62_02230C28 unk_6F8[6]; - const UnkStruct_020F3DCC * unk_818; - const UnkStruct_020F3DCC * unk_81C[5]; - SaveData * unk_830; + const UnkStruct_020F3DCC *unk_818; + const UnkStruct_020F3DCC *unk_81C[5]; + SaveData *unk_830; u16 unk_834; u16 unk_836; UnkStruct_0208C06C_sub1 unk_838; - void * unk_860; + void *unk_860; u8 padding_864[4]; - UnkStruct_0208BA84 * unk_868; + UnkStruct_0208BA84 *unk_868; int unk_86C; BOOL unk_870; u32 unk_874; - u8 * unk_878; - UnkStruct_0202F41C * unk_87C[4]; - UnkStruct_02030A80 * unk_88C[4]; + u8 *unk_878; + UnkStruct_0202F41C *unk_87C[4]; + UnkStruct_02030A80 *unk_88C[4]; BOOL unk_89C; BOOL unk_8A0; Window unk_8A4; UnkStruct_ov62_02233828 unk_8B4; UnkStruct_0208C06C_sub2 unk_41D8; - SysTask * unk_41E8; + SysTask *unk_41E8; } UnkStruct_0208C06C; #endif // POKEPLATINUM_STRUCT_0208C06C_H diff --git a/include/struct_defs/struct_0208C06C_sub2.h b/include/struct_defs/struct_0208C06C_sub2.h index 85bd2d7c98..86ef867773 100644 --- a/include/struct_defs/struct_0208C06C_sub2.h +++ b/include/struct_defs/struct_0208C06C_sub2.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_0208C06C_SUB2_H #define POKEPLATINUM_STRUCT_0208C06C_SUB2_H -#include "sys_task_manager.h" #include "struct_defs/struct_0208B878.h" +#include "sys_task_manager.h" + typedef struct { BOOL unk_00; int unk_04; - UnkStruct_0208B878 * unk_08; - SysTask * unk_0C; + UnkStruct_0208B878 *unk_08; + SysTask *unk_0C; } UnkStruct_0208C06C_sub2; #endif // POKEPLATINUM_STRUCT_0208C06C_SUB2_H diff --git a/include/struct_defs/struct_02090800.h b/include/struct_defs/struct_02090800.h index 9eb0aa9a5a..f7011d52af 100644 --- a/include/struct_defs/struct_02090800.h +++ b/include/struct_defs/struct_02090800.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_STRUCT_02090800_H #define POKEPLATINUM_STRUCT_02090800_H +#include "struct_defs/struct_02090800_sub1.h" + #include "message.h" -#include "string_template.h" #include "pokemon.h" -#include "struct_defs/struct_02090800_sub1.h" +#include "string_template.h" typedef struct { int unk_00; - MessageLoader * unk_04; - StringTemplate * unk_08; - Pokemon * unk_0C; + MessageLoader *unk_04; + StringTemplate *unk_08; + Pokemon *unk_0C; BOOL unk_10; PokemonInfoDisplayStruct_sub1 unk_14; PokemonInfoDisplayStruct_sub1 unk_1C; diff --git a/include/struct_defs/struct_02090800_sub1.h b/include/struct_defs/struct_02090800_sub1.h index a0b7ddc81e..8c79b4989b 100644 --- a/include/struct_defs/struct_02090800_sub1.h +++ b/include/struct_defs/struct_02090800_sub1.h @@ -5,7 +5,7 @@ typedef struct { int unk_00; - Strbuf* unk_04; + Strbuf *unk_04; } PokemonInfoDisplayStruct_sub1; #endif // POKEPLATINUM_STRUCT_02090800_SUB1_H diff --git a/include/struct_defs/struct_02091850.h b/include/struct_defs/struct_02091850.h index 866823f762..267280fb4f 100644 --- a/include/struct_defs/struct_02091850.h +++ b/include/struct_defs/struct_02091850.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02091850_H #define POKEPLATINUM_STRUCT_02091850_H - #include typedef struct { diff --git a/include/struct_defs/struct_02093800.h b/include/struct_defs/struct_02093800.h index 84cf6790a6..8bc5fd6424 100644 --- a/include/struct_defs/struct_02093800.h +++ b/include/struct_defs/struct_02093800.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_02093800_H #define POKEPLATINUM_STRUCT_02093800_H -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" #include "struct_decls/struct_0202A750_decl.h" + +#include "game_options.h" #include "pokemon.h" #include "savedata.h" +#include "strbuf.h" +#include "trainer_info.h" typedef struct { u8 unk_00; @@ -16,13 +17,13 @@ typedef struct { u8 unk_04; u8 unk_05; u8 padding_06[2]; - Pokemon * unk_08; - const Strbuf* unk_0C; - const TrainerInfo * unk_10; - UnkStruct_0202A750 * unk_14; - const Options * unk_18; - SaveData * unk_1C; - void * unk_20; + Pokemon *unk_08; + const Strbuf *unk_0C; + const TrainerInfo *unk_10; + UnkStruct_0202A750 *unk_14; + const Options *unk_18; + SaveData *unk_1C; + void *unk_20; } UnkStruct_02093800; #endif // POKEPLATINUM_STRUCT_02093800_H diff --git a/include/struct_defs/struct_02093BBC.h b/include/struct_defs/struct_02093BBC.h index 9e7594e8e8..3375132d92 100644 --- a/include/struct_defs/struct_02093BBC.h +++ b/include/struct_defs/struct_02093BBC.h @@ -1,24 +1,25 @@ #ifndef POKEPLATINUM_STRUCT_02093BBC_H #define POKEPLATINUM_STRUCT_02093BBC_H -#include "trainer_info.h" -#include "game_options.h" #include "struct_decls/struct_02029C88_decl.h" #include "struct_decls/struct_02029D04_decl.h" -#include "pokemon.h" #include "struct_defs/struct_02095C60.h" +#include "game_options.h" +#include "pokemon.h" +#include "trainer_info.h" + typedef struct { - Pokemon * unk_00; - UnkStruct_02029C88 * unk_04; + Pokemon *unk_00; + UnkStruct_02029C88 *unk_04; int unk_08; int unk_0C; int unk_10; int unk_14; - const UnkStruct_02029D04 * unk_18; - UnkStruct_02095C60 * unk_1C; - const Options * unk_20; - const TrainerInfo * unk_24; + const UnkStruct_02029D04 *unk_18; + UnkStruct_02095C60 *unk_1C; + const Options *unk_20; + const TrainerInfo *unk_24; } UnkStruct_02093BBC; #endif // POKEPLATINUM_STRUCT_02093BBC_H diff --git a/include/struct_defs/struct_02094A58.h b/include/struct_defs/struct_02094A58.h index 43612e8833..d824d00458 100644 --- a/include/struct_defs/struct_02094A58.h +++ b/include/struct_defs/struct_02094A58.h @@ -4,8 +4,8 @@ #include "sys_task_manager.h" typedef struct { - SysTask * unk_00; - const u8 * unk_04; + SysTask *unk_00; + const u8 *unk_04; s16 unk_08; u8 unk_0A; u8 unk_0B; diff --git a/include/struct_defs/struct_02095C48.h b/include/struct_defs/struct_02095C48.h index ae7d5668e2..3cc84dec38 100644 --- a/include/struct_defs/struct_02095C48.h +++ b/include/struct_defs/struct_02095C48.h @@ -1,22 +1,23 @@ #ifndef POKEPLATINUM_STRUCT_02095C48_H #define POKEPLATINUM_STRUCT_02095C48_H -#include "sys_task_manager.h" -#include "trainer_info.h" -#include "game_options.h" #include "struct_decls/struct_0202A750_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02094A58.h" #include "struct_defs/struct_02095C48_sub1.h" #include "struct_defs/struct_02095C60.h" + +#include "game_options.h" +#include "pokemon.h" #include "savedata.h" +#include "sys_task_manager.h" +#include "trainer_info.h" typedef struct { UnkStruct_02095C48_sub1 unk_00; - Party * unk_148; - void * unk_14C[4]; - void * unk_150; + Party *unk_148; + void *unk_14C[4]; + void *unk_150; u8 unk_154; u8 unk_155; u8 unk_156[4]; @@ -24,24 +25,24 @@ typedef struct { u8 unk_15B; int unk_15C; int padding_160; - SysTask * unk_164; + SysTask *unk_164; u8 unk_168[4][256]; u8 unk_568; u8 unk_569[1024]; u8 unk_969[4][1024]; u8 padding_1969[3]; - const Options * unk_196C; - SaveData * unk_1970; - Pokemon * unk_1974; - const TrainerInfo * unk_1978; + const Options *unk_196C; + SaveData *unk_1970; + Pokemon *unk_1974; + const TrainerInfo *unk_1978; u8 unk_197C; u8 unk_197D; u8 unk_197E; u8 padding_197F; - UnkStruct_0202A750 * unk_1980; + UnkStruct_0202A750 *unk_1980; UnkStruct_02095C60 unk_1984; - void * unk_199C; - UnkStruct_02094A58 * unk_19A0; + void *unk_199C; + UnkStruct_02094A58 *unk_19A0; u32 unk_19A4; } UnkStruct_02095C48; diff --git a/include/struct_defs/struct_02095C48_sub1.h b/include/struct_defs/struct_02095C48_sub1.h index 346d179876..49c0b4778d 100644 --- a/include/struct_defs/struct_02095C48_sub1.h +++ b/include/struct_defs/struct_02095C48_sub1.h @@ -1,19 +1,21 @@ #ifndef POKEPLATINUM_STRUCT_02095C48_SUB1_H #define POKEPLATINUM_STRUCT_02095C48_SUB1_H -#include "strbuf.h" #include "struct_decls/struct_02029C88_decl.h" -#include "pokemon.h" #include "struct_defs/struct_020954F0.h" #include "struct_defs/struct_02095C48_sub1_sub1.h" + #include "overlay006/struct_ov6_02248BE8.h" +#include "pokemon.h" +#include "strbuf.h" + typedef struct { - Pokemon * unk_00[4]; + Pokemon *unk_00[4]; UnkStruct_ov6_02248BE8 unk_10[4]; UnkStruct_020954F0 unk_C0[3]; - Strbuf* unk_D8[4]; - UnkStruct_02029C88 * unk_E8[4]; + Strbuf *unk_D8[4]; + UnkStruct_02029C88 *unk_E8[4]; u8 unk_F8[4]; u8 unk_FC[4]; u8 unk_100[4]; diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h index ca50d15607..48fd4a4113 100644 --- a/include/struct_defs/struct_02095E80_t.h +++ b/include/struct_defs/struct_02095E80_t.h @@ -1,46 +1,48 @@ #ifndef POKEPLATINUM_STRUCT_02095E80_T_H #define POKEPLATINUM_STRUCT_02095E80_T_H +#include +#include + #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "overlay_manager.h" -#include "struct_defs/archived_sprite.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" -#include "string_template.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "struct_defs/struct_02027F8C.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0202B370_decl.h" +#include "struct_decls/struct_02095E80_decl.h" +#include "struct_decls/struct_party_decl.h" +#include "struct_defs/archived_sprite.h" #include "struct_defs/chatot_cry.h" -#include "field/field_system_decl.h" +#include "struct_defs/pokemon_summary.h" +#include "struct_defs/struct_0200C738.h" +#include "struct_defs/struct_02027F8C.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_decls/struct_party_decl.h" -#include "struct_decls/struct_02095E80_decl.h" #include "struct_defs/struct_02095E80_sub1.h" -#include "struct_defs/pokemon_summary.h" -#include "savedata.h" + +#include "field/field_system_decl.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay088/struct_ov88_0223C370.h" #include "overlay088/struct_ov88_0223C8AC.h" -#include -#include +#include "message.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" struct UnkStruct_02095E80_t { - FieldSystem * fieldSystem; - SaveData * unk_04; - UnkStruct_ov88_0223C370 * unk_08; + FieldSystem *fieldSystem; + SaveData *unk_04; + UnkStruct_ov88_0223C370 *unk_08; PokemonSummary unk_0C; int unk_3C; - OverlayManager * unk_40; + OverlayManager *unk_40; int unk_44; int unk_48; int unk_4C; @@ -63,31 +65,31 @@ struct UnkStruct_02095E80_t { u32 unk_154[2][3]; int unk_16C; int unk_170; - BGL * unk_174; - StringTemplate * unk_178; - StringTemplate * unk_17C; - StringTemplate * unk_180; - MessageLoader * unk_184; - Strbuf* unk_188; - Strbuf* unk_18C; - Strbuf* unk_190; - GraphicElementManager * unk_194; + BGL *unk_174; + StringTemplate *unk_178; + StringTemplate *unk_17C; + StringTemplate *unk_180; + MessageLoader *unk_184; + Strbuf *unk_188; + Strbuf *unk_18C; + Strbuf *unk_190; + GraphicElementManager *unk_194; UnkStruct_0200C738 unk_198; - UnkStruct_02009714 * unk_324[4]; - UnkStruct_02009DC8 * unk_334[2][4]; + UnkStruct_02009714 *unk_324[4]; + UnkStruct_02009DC8 *unk_334[2][4]; UnkStruct_ov19_021DA864 unk_354; UnkStruct_ov19_021DA864 unk_378; - GraphicElementData * unk_39C[14]; - GraphicElementData * unk_3D4[12]; - GraphicElementData * unk_404[12]; - GraphicElementData * unk_434[12]; - GraphicElementData * unk_464[6]; - GraphicElementData * unk_47C; - SysTask * unk_480[7]; + GraphicElementData *unk_39C[14]; + GraphicElementData *unk_3D4[12]; + GraphicElementData *unk_404[12]; + GraphicElementData *unk_434[12]; + GraphicElementData *unk_464[6]; + GraphicElementData *unk_47C; + SysTask *unk_480[7]; Window unk_49C[34]; - UIControlData * unk_6BC; - ResourceMetadata * unk_6C0; - UIControlData * unk_6C4; + UIControlData *unk_6BC; + ResourceMetadata *unk_6C0; + UIControlData *unk_6C4; int unk_6C8; int unk_6CC; int unk_6D0; @@ -99,19 +101,19 @@ struct UnkStruct_02095E80_t { int unk_7BC; int unk_7C0; int unk_7C4[7]; - void * unk_7E0; - NNSG2dCharacterData * unk_7E4; - void * unk_7E8[12]; - NNSG2dCharacterData * unk_818[12]; + void *unk_7E0; + NNSG2dCharacterData *unk_7E4; + void *unk_7E8[12]; + NNSG2dCharacterData *unk_818[12]; u8 unk_848[2][3200]; ArchivedSprite unk_2148[2]; int unk_2168; u8 unk_216C[256]; - int (* unk_226C)(UnkStruct_02095E80 *); - Party * unk_2270; - Party * unk_2274; - ChatotCry * unk_2278; - UnkStruct_02027F8C * unk_227C; + int (*unk_226C)(UnkStruct_02095E80 *); + Party *unk_2270; + Party *unk_2274; + ChatotCry *unk_2278; + UnkStruct_02027F8C *unk_227C; UnkStruct_02027F8C unk_2280; int unk_2308; int unk_230C; @@ -125,17 +127,17 @@ struct UnkStruct_02095E80_t { int unk_3644[32]; int unk_36C4; int unk_36C8; - StringTemplate * unk_36CC; - MessageLoader * unk_36D0; - ResourceMetadata * unk_36D4; - BmpList * unk_36D8; + StringTemplate *unk_36CC; + MessageLoader *unk_36D0; + ResourceMetadata *unk_36D4; + BmpList *unk_36D8; Window unk_36DC; - UnkStruct_0202B370 * unk_36EC; + UnkStruct_0202B370 *unk_36EC; int unk_36F0; int unk_36F4; int unk_36F8; int unk_36FC; - void * unk_3700; + void *unk_3700; int unk_3704; int unk_3708; }; diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h index 4cee959907..6658ae45e4 100644 --- a/include/struct_defs/struct_02095EAC_t.h +++ b/include/struct_defs/struct_02095EAC_t.h @@ -3,46 +3,48 @@ #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" -#include "string_template.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" +#include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0203DDFC.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095EAC_sub1.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay058/struct_ov58_021D2754.h" #include "overlay058/struct_ov58_021D2820.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" + struct UnkStruct_02095EAC_t { - BGL * unk_00; + BGL *unk_00; BOOL unk_04; - UnkStruct_0203DDFC * unk_08; - StringTemplate * unk_0C; - MessageLoader * unk_10; - Strbuf* unk_14[5]; - Strbuf* unk_28; - Strbuf* unk_2C; + UnkStruct_0203DDFC *unk_08; + StringTemplate *unk_0C; + MessageLoader *unk_10; + Strbuf *unk_14[5]; + Strbuf *unk_28; + Strbuf *unk_2C; int unk_30; - GraphicElementManager * unk_34; + GraphicElementManager *unk_34; UnkStruct_0200C738 unk_38; - UnkStruct_02009714 * unk_1C4[4]; - UnkStruct_02009DC8 * unk_1D4[2][4]; + UnkStruct_02009714 *unk_1C4[4]; + UnkStruct_02009DC8 *unk_1D4[2][4]; UnkStruct_ov19_021DA864 unk_1F4; UnkStruct_ov19_021DA864 unk_218; - GraphicElementData * unk_23C[14]; - GraphicElementData * unk_274[14]; - GraphicElementData * unk_2AC[12]; + GraphicElementData *unk_23C[14]; + GraphicElementData *unk_274[14]; + GraphicElementData *unk_2AC[12]; Window unk_2DC[5]; Window unk_32C; Window unk_33C; Window unk_34C; - Window * unk_35C[2]; + Window *unk_35C[2]; int unk_364; int unk_368; int unk_36C; @@ -53,7 +55,7 @@ struct UnkStruct_02095EAC_t { int unk_380; int unk_384; u8 unk_388[8][2]; - TrainerInfo * unk_398[8][2]; + TrainerInfo *unk_398[8][2]; u8 unk_3D8[16384]; u16 unk_43D8; u8 unk_43DA; @@ -61,7 +63,7 @@ struct UnkStruct_02095EAC_t { UnkStruct_ov58_021D2820 unk_43DC; UnkStruct_ov58_021D2820 unk_43E6[5]; UnkStruct_ov58_021D2754 unk_4418[5]; - u8 * unk_442C; + u8 *unk_442C; int unk_4430; u8 unk_4434[14400]; UnkStruct_02095EAC_sub1 unk_7C74; @@ -72,7 +74,7 @@ struct UnkStruct_02095EAC_t { s16 unk_941E; u8 unk_9420; UnkStruct_ov58_021D2820 unk_9421[5]; - UnkStruct_02015920 * unk_9454; + UnkStruct_02015920 *unk_9454; int unk_9458; int unk_945C; int unk_9460; diff --git a/include/struct_defs/struct_020961E8_t.h b/include/struct_defs/struct_020961E8_t.h index 19e106a2c1..da0efd2a22 100644 --- a/include/struct_defs/struct_020961E8_t.h +++ b/include/struct_defs/struct_020961E8_t.h @@ -1,77 +1,79 @@ #ifndef POKEPLATINUM_STRUCT_020961E8_T_H #define POKEPLATINUM_STRUCT_020961E8_T_H +#include + #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" -#include "string_template.h" -#include "struct_defs/struct_0200C738.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" +#include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0203DE34.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020961E8_sub1.h" -#include "savedata.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay059/struct_ov59_021D109C.h" #include "overlay059/struct_ov59_021D30E0.h" -#include +#include "message.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" +#include "trainer_info.h" struct UnkStruct_020961E8_t { - BGL * unk_00; + BGL *unk_00; BOOL unk_04; - UnkStruct_0203DE34 * unk_08; + UnkStruct_0203DE34 *unk_08; UnkStruct_ov59_021D109C unk_0C; - SysTask * unk_20; - StringTemplate * unk_24; - MessageLoader * unk_28; - Strbuf* unk_2C[5]; - Strbuf* unk_40; - Strbuf* unk_44; - Strbuf* unk_48; + SysTask *unk_20; + StringTemplate *unk_24; + MessageLoader *unk_28; + Strbuf *unk_2C[5]; + Strbuf *unk_40; + Strbuf *unk_44; + Strbuf *unk_48; int unk_4C; - GraphicElementManager * unk_50; + GraphicElementManager *unk_50; UnkStruct_0200C738 unk_54; - UnkStruct_02009714 * unk_1E0[4]; - UnkStruct_02009DC8 * unk_1F0[3][4]; + UnkStruct_02009714 *unk_1E0[4]; + UnkStruct_02009DC8 *unk_1F0[3][4]; UnkStruct_ov19_021DA864 unk_220; UnkStruct_ov19_021DA864 unk_244; UnkStruct_ov19_021DA864 unk_268; - GraphicElementData * unk_28C[14]; - GraphicElementData * unk_2C4[14]; + GraphicElementData *unk_28C[14]; + GraphicElementData *unk_2C4[14]; Window unk_2FC[5]; Window unk_34C; Window unk_35C; Window unk_36C; - Window * unk_37C[2]; - UIControlData * unk_384; - void * unk_388[2]; - NNSG2dCharacterData * unk_390[2]; - void * unk_398[2]; - NNSG2dPaletteData * unk_3A0[2]; + Window *unk_37C[2]; + UIControlData *unk_384; + void *unk_388[2]; + NNSG2dCharacterData *unk_390[2]; + void *unk_398[2]; + NNSG2dPaletteData *unk_3A0[2]; int unk_3A8; int unk_3AC; int unk_3B0; int unk_3B4; u8 unk_3B8[8][2]; - TrainerInfo * unk_3C8[5][2]; + TrainerInfo *unk_3C8[5][2]; int unk_3F0[5]; int unk_404; u16 unk_408; - u16 * unk_40C; + u16 *unk_40C; u8 unk_410; u8 unk_411; int unk_414; UnkStruct_ov59_021D30E0 unk_418; UnkStruct_ov59_021D30E0 unk_FD8[5]; int unk_4A98; - SaveData * unk_4A9C; + SaveData *unk_4A9C; int unk_4AA0; u8 unk_4AA4; volatile int unk_4AA8; diff --git a/include/struct_defs/struct_02097728.h b/include/struct_defs/struct_02097728.h index 0fa124e3c8..2412ee128d 100644 --- a/include/struct_defs/struct_02097728.h +++ b/include/struct_defs/struct_02097728.h @@ -1,8 +1,9 @@ #ifndef POKEPLATINUM_STRUCT_02097728_H #define POKEPLATINUM_STRUCT_02097728_H -#include "struct_defs/struct_0202818C.h" #include "struct_decls/struct_02028430_decl.h" +#include "struct_defs/struct_0202818C.h" + #include "savedata.h" typedef struct { @@ -13,9 +14,9 @@ typedef struct { u16 unk_0C; u8 unk_0E; u8 unk_0F; - SaveData * unk_10; - UnkStruct_0202818C * unk_14; - UnkStruct_02028430 * unk_18; + SaveData *unk_10; + UnkStruct_0202818C *unk_14; + UnkStruct_02028430 *unk_18; } UnkStruct_02097728; #endif // POKEPLATINUM_STRUCT_02097728_H diff --git a/include/struct_defs/struct_020978D8.h b/include/struct_defs/struct_020978D8.h index a7c64c2066..3f620bb0d3 100644 --- a/include/struct_defs/struct_020978D8.h +++ b/include/struct_defs/struct_020978D8.h @@ -2,21 +2,22 @@ #define POKEPLATINUM_STRUCT_020978D8_H #include "struct_defs/sentence.h" -#include "strbuf.h" -#include "game_options.h" #include "struct_defs/union_02028328.h" +#include "game_options.h" +#include "strbuf.h" + typedef struct { u16 unk_00; u8 unk_02; u8 unk_03; - Options * unk_04; + Options *unk_04; u32 unk_08; u8 unk_0C; u8 unk_0D; u8 unk_0E; u8 unk_0F; - Strbuf* unk_10; + Strbuf *unk_10; UnkUnion_02028328 unk_14[3]; Sentence unk_1A[3]; } UnkStruct_020978D8; diff --git a/include/struct_defs/struct_02097F18.h b/include/struct_defs/struct_02097F18.h index 74504fc788..d71fcae2cf 100644 --- a/include/struct_defs/struct_02097F18.h +++ b/include/struct_defs/struct_02097F18.h @@ -1,19 +1,20 @@ #ifndef POKEPLATINUM_STRUCT_02097F18_H #define POKEPLATINUM_STRUCT_02097F18_H -#include "game_options.h" #include "struct_decls/struct_0202CA1C_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" + +#include "game_options.h" +#include "pokemon.h" #include "savedata.h" typedef struct { int unk_00; - Pokemon * unk_04[6]; - Party * unk_1C; - UnkStruct_0202CA1C * unk_20; - Options * unk_24; - SaveData * unk_28; + Pokemon *unk_04[6]; + Party *unk_1C; + UnkStruct_0202CA1C *unk_20; + Options *unk_24; + SaveData *unk_28; u8 unk_2C; u8 unk_2D; u8 padding[2]; diff --git a/include/struct_defs/struct_0209843C.h b/include/struct_defs/struct_0209843C.h index ccba0818ba..27cf55b533 100644 --- a/include/struct_defs/struct_0209843C.h +++ b/include/struct_defs/struct_0209843C.h @@ -7,7 +7,7 @@ typedef struct { int unk_00; BOOL unk_04; - UnkStruct_0208737C * unk_08; + UnkStruct_0208737C *unk_08; UnkStruct_0203E2FC unk_0C; } UnkStruct_0209843C; diff --git a/include/struct_defs/struct_020985E4.h b/include/struct_defs/struct_020985E4.h index dfe7a48314..c236343266 100644 --- a/include/struct_defs/struct_020985E4.h +++ b/include/struct_defs/struct_020985E4.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_STRUCT_020985E4_H #define POKEPLATINUM_STRUCT_020985E4_H -#include "trainer_info.h" #include "game_options.h" +#include "trainer_info.h" typedef struct { int unk_00; - Options * unk_04; - const TrainerInfo * unk_08; + Options *unk_04; + const TrainerInfo *unk_08; } UnkStruct_020985E4; #endif // POKEPLATINUM_STRUCT_020985E4_H diff --git a/include/struct_defs/struct_0209862C.h b/include/struct_defs/struct_0209862C.h index ab9e630ae1..750c86a1a6 100644 --- a/include/struct_defs/struct_0209862C.h +++ b/include/struct_defs/struct_0209862C.h @@ -3,7 +3,7 @@ typedef struct { int unk_00; - void * unk_04; + void *unk_04; } UnkStruct_0209862C; #endif // POKEPLATINUM_STRUCT_0209862C_H diff --git a/include/struct_defs/struct_02098C44.h b/include/struct_defs/struct_02098C44.h index fe9bb4ad26..9be1a01e26 100644 --- a/include/struct_defs/struct_02098C44.h +++ b/include/struct_defs/struct_02098C44.h @@ -1,18 +1,19 @@ #ifndef POKEPLATINUM_STRUCT_02098C44_H #define POKEPLATINUM_STRUCT_02098C44_H -#include "game_options.h" #include "struct_decls/struct_party_decl.h" +#include "game_options.h" + typedef struct { - Party * unk_00; - void * unk_04; - void * unk_08; - Options * unk_0C; - void * unk_10; - void * unk_14; - void * unk_18; - void * unk_1C; + Party *unk_00; + void *unk_04; + void *unk_08; + Options *unk_0C; + void *unk_10; + void *unk_14; + void *unk_18; + void *unk_1C; u8 unk_20; u8 unk_21; u8 unk_22; diff --git a/include/struct_defs/struct_02098DE8.h b/include/struct_defs/struct_02098DE8.h index 88262e40e3..7506d53e25 100644 --- a/include/struct_defs/struct_02098DE8.h +++ b/include/struct_defs/struct_02098DE8.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_STRUCT_02098DE8_H #include "struct_defs/struct_0202A93C.h" + #include "pokemon.h" typedef struct { - Pokemon * unk_00; - Poffin * unk_04; + Pokemon *unk_00; + Poffin *unk_04; u16 unk_08; u8 unk_0A; u8 unk_0B; diff --git a/include/struct_defs/struct_0209903C.h b/include/struct_defs/struct_0209903C.h index b6596f3587..a15ea98955 100644 --- a/include/struct_defs/struct_0209903C.h +++ b/include/struct_defs/struct_0209903C.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_0209903C_H #define POKEPLATINUM_STRUCT_0209903C_H -#include "struct_defs/struct_02009508.h" #include "struct_decls/struct_02009714_decl.h" +#include "struct_decls/struct_020218BC_decl.h" +#include "struct_defs/struct_02009508.h" #include "struct_defs/struct_02009CFC.h" #include "struct_defs/struct_0200C738.h" -#include "struct_decls/struct_020218BC_decl.h" #include "struct_defs/struct_0209903C_sub1.h" typedef struct { @@ -15,12 +15,12 @@ typedef struct { u16 unk_0A; u16 unk_0C; u16 unk_0E; - GraphicElementManager * unk_10; + GraphicElementManager *unk_10; UnkStruct_0200C738 unk_14; - UnkStruct_02009508 * unk_1A0; - UnkStruct_02009714 * unk_1A4[4]; - UnkStruct_02009CFC * unk_1B4[4]; - UnkStruct_0209903C_sub1 * unk_1C4; + UnkStruct_02009508 *unk_1A0; + UnkStruct_02009714 *unk_1A4[4]; + UnkStruct_02009CFC *unk_1B4[4]; + UnkStruct_0209903C_sub1 *unk_1C4; } UnkStruct_0209903C; #endif // POKEPLATINUM_STRUCT_0209903C_H diff --git a/include/struct_defs/struct_0209916C.h b/include/struct_defs/struct_0209916C.h index c46dda8e52..fb66c6df99 100644 --- a/include/struct_defs/struct_0209916C.h +++ b/include/struct_defs/struct_0209916C.h @@ -5,7 +5,7 @@ typedef struct { u16 unk_00; - CellActorData * unk_04; + CellActorData *unk_04; } UnkStruct_0209916C; #endif // POKEPLATINUM_STRUCT_0209916C_H diff --git a/include/struct_defs/struct_020997B8.h b/include/struct_defs/struct_020997B8.h index 0bb4301a81..f8d334e115 100644 --- a/include/struct_defs/struct_020997B8.h +++ b/include/struct_defs/struct_020997B8.h @@ -1,15 +1,15 @@ #ifndef POKEPLATINUM_STRUCT_020997B8_H #define POKEPLATINUM_STRUCT_020997B8_H -#include "trainer_info.h" #include "game_options.h" #include "pokemon.h" +#include "trainer_info.h" typedef struct { - Pokemon * unk_00; - TrainerInfo * unk_04; - Options * unk_08; - u16 * unk_0C; + Pokemon *unk_00; + TrainerInfo *unk_04; + Options *unk_08; + u16 *unk_0C; u16 unk_10; u16 unk_12; u8 unk_14; diff --git a/include/struct_defs/struct_02099F80.h b/include/struct_defs/struct_02099F80.h index cef2239f80..75eb0699cb 100644 --- a/include/struct_defs/struct_02099F80.h +++ b/include/struct_defs/struct_02099F80.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_02099F80_H #define POKEPLATINUM_STRUCT_02099F80_H - #include typedef struct { diff --git a/include/struct_defs/struct_0209BBA4.h b/include/struct_defs/struct_0209BBA4.h index 09b1676890..3ee5b84a13 100644 --- a/include/struct_defs/struct_0209BBA4.h +++ b/include/struct_defs/struct_0209BBA4.h @@ -1,14 +1,16 @@ #ifndef POKEPLATINUM_STRUCT_0209BBA4_H #define POKEPLATINUM_STRUCT_0209BBA4_H -#include "field/field_system_decl.h" -#include "struct_defs/struct_02098C44.h" #include "struct_defs/pokemon_summary.h" +#include "struct_defs/struct_02098C44.h" + +#include "field/field_system_decl.h" + #include "savedata.h" typedef struct { - SaveData * unk_00; - void * unk_04; + SaveData *unk_00; + void *unk_04; u16 unk_08[40]; u8 unk_58; u8 unk_59; @@ -24,16 +26,16 @@ typedef struct { u16 unk_7E[4]; u16 unk_86[4]; u16 unk_8E[4]; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; u8 unk_9C; u8 unk_9D; u8 unk_9E; u8 unk_9F; u8 unk_A0; u8 unk_A1[4]; - PartyManagementData * unk_A8; - PokemonSummary * unk_AC; - u16 * unk_B0; + PartyManagementData *unk_A8; + PokemonSummary *unk_AC; + u16 *unk_B0; } UnkStruct_0209BBA4; #endif // POKEPLATINUM_STRUCT_0209BBA4_H diff --git a/include/struct_defs/struct_0209BDF8.h b/include/struct_defs/struct_0209BDF8.h index c2db36b422..89e022b48c 100644 --- a/include/struct_defs/struct_0209BDF8.h +++ b/include/struct_defs/struct_0209BDF8.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_STRUCT_0209BDF8_H #define POKEPLATINUM_STRUCT_0209BDF8_H -#include "struct_defs/struct_0209BDF8_sub1.h" #include "struct_decls/struct_0209C194_decl.h" +#include "struct_defs/struct_0209BDF8_sub1.h" typedef struct { - UnkStruct_0209C194 * unk_00; + UnkStruct_0209C194 *unk_00; u8 unk_04[24]; int unk_1C; int unk_20; @@ -22,8 +22,8 @@ typedef struct { s16 unk_46; u16 unk_48; u16 unk_4A; - u8 * unk_4C; - u8 * unk_50; + u8 *unk_4C; + u8 *unk_50; UnkStruct_0209BDF8_sub1 unk_54; } UnkStruct_0209BDF8; diff --git a/include/struct_defs/struct_0209C194.h b/include/struct_defs/struct_0209C194.h index bc1f7a672c..bb1aec6700 100644 --- a/include/struct_defs/struct_0209C194.h +++ b/include/struct_defs/struct_0209C194.h @@ -3,6 +3,7 @@ #include "struct_defs/struct_0209BDF8.h" #include "struct_defs/struct_0209C194_1.h" + #include "overlay109/struct_ov109_021D0F70_decl.h" #include "overlay109/struct_ov109_021D5140_decl.h" @@ -13,9 +14,9 @@ typedef struct UnkStruct_0209C194_t { u32 unk_0C; BOOL unk_10; UnkStruct_0209C194_1 unk_14; - UnkStruct_0209BDF8 * unk_34; - UnkStruct_ov109_021D0F70 * unk_38; - UnkStruct_ov109_021D5140 * unk_3C; + UnkStruct_0209BDF8 *unk_34; + UnkStruct_ov109_021D0F70 *unk_38; + UnkStruct_ov109_021D5140 *unk_3C; } UnkStruct_0209C194; #endif // POKEPLATINUM_STRUCT_0209C194_H diff --git a/include/struct_defs/struct_0209C194_1.h b/include/struct_defs/struct_0209C194_1.h index 7217d63c8a..44d13814d1 100644 --- a/include/struct_defs/struct_0209C194_1.h +++ b/include/struct_defs/struct_0209C194_1.h @@ -1,22 +1,24 @@ #ifndef POKEPLATINUM_STRUCT_0209C194_1_H #define POKEPLATINUM_STRUCT_0209C194_1_H -#include "game_options.h" -#include "journal.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_0205C22C_decl.h" + +#include "field/field_system_decl.h" + +#include "game_options.h" +#include "journal.h" #include "savedata.h" typedef struct { int unk_00; int unk_04; - SaveData * unk_08; - UnkStruct_0205C22C * unk_0C; - Options * unk_10; - UnkStruct_0202CD88 * unk_14; - Journal * unk_18; - FieldSystem * fieldSystem; + SaveData *unk_08; + UnkStruct_0205C22C *unk_0C; + Options *unk_10; + UnkStruct_0202CD88 *unk_14; + Journal *unk_18; + FieldSystem *fieldSystem; } UnkStruct_0209C194_1; #endif // POKEPLATINUM_STRUCT_0209C194_1_H diff --git a/include/struct_defs/struct_020F3DCC.h b/include/struct_defs/struct_020F3DCC.h index 90c1910ae1..1e6f1e66ea 100644 --- a/include/struct_defs/struct_020F3DCC.h +++ b/include/struct_defs/struct_020F3DCC.h @@ -12,7 +12,7 @@ typedef struct UnkStruct_020F3DCC_t { int unk_14; int unk_18; int unk_1C; - const UnkStruct_020F3DCC * unk_20; + const UnkStruct_020F3DCC *unk_20; } UnkStruct_020F3DCC; #endif // POKEPLATINUM_STRUCT_020F3DCC_H diff --git a/include/struct_defs/trainer_data.h b/include/struct_defs/trainer_data.h index c08893c74b..8987614325 100644 --- a/include/struct_defs/trainer_data.h +++ b/include/struct_defs/trainer_data.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_STRUCT_TRAINER_DATA_H #include "constants/string.h" -#include "strbuf.h" #include "struct_defs/sentence.h" +#include "strbuf.h" + enum TrainerDataType { TRDATATYPE_BASE = 0, TRDATATYPE_WITH_MOVES, @@ -14,7 +15,7 @@ enum TrainerDataType { }; /** - * @brief Trainer data encapsulation. Contains all trainer-level data needed to instantiate a trainer battle. + * @brief Trainer data encapsulation. Contains all trainer-level data needed to instantiate a trainer battle. */ typedef struct TrainerData { u8 type; //< The data type of the trainer; controls which TrainerMon struct is used for the party. @@ -34,10 +35,10 @@ typedef struct TrainerData { Sentence loseMsg; //< The message to display if the trainer loses. } TrainerData; -#define MAX_DV 255 +#define MAX_DV 255 /** - * @brief The most basic Trainer Pokemon structure. No item is held, and moves are populated from the learnset. + * @brief The most basic Trainer Pokemon structure. No item is held, and moves are populated from the learnset. */ typedef struct TrainerMonBase { u16 dv; //< Difficulty value; determines how many IVs the Pokemon will have in each stat. diff --git a/include/sys_task_manager.h b/include/sys_task_manager.h index 66da4bddec..c220a14129 100644 --- a/include/sys_task_manager.h +++ b/include/sys_task_manager.h @@ -3,7 +3,7 @@ typedef struct SysTask SysTask; typedef struct SysTaskManager SysTaskManager; -typedef void (*SysTaskFunc)(SysTask*, void*); +typedef void (*SysTaskFunc)(SysTask *, void *); enum TaskState { TASK_STATE_ACTIVE = 0, @@ -26,9 +26,9 @@ typedef struct SysTaskManager { SysTask sentinelTask; SysTask **taskStack; SysTask *tasks; - BOOL locked; // The task manager can't execute while a task is being added - SysTask *currentTask; // The task that is currently being executed - SysTask *nextTask; // The task that will be executed next + BOOL locked; // The task manager can't execute while a task is being added + SysTask *currentTask; // The task that is currently being executed + SysTask *nextTask; // The task that will be executed next } SysTaskManager; u32 SysTaskManager_GetRequiredSize(u32 maxTasks); diff --git a/include/touch_screen.h b/include/touch_screen.h index 322f631626..cf2d6bc5fc 100644 --- a/include/touch_screen.h +++ b/include/touch_screen.h @@ -3,12 +3,12 @@ #define TOUCHSCREEN_USE_CIRCLE 0xfe -/** +/** * These two structs represent regions that can be checked on the touch screen. * The first struct, TouchScreenRect, is for strictly rectangular regions. * The second struct, TouchScreenHitTable, is for rectangles OR circles. * To enable circle mode, set the 'code' value to TOUCHSCREEN_USE_CIRCLE. -*/ + */ typedef union { struct { u8 top; @@ -35,7 +35,7 @@ BOOL TouchScreen_Touched(void); /** * @brief Check if the touch screen is tapped. - * + * * @return TRUE if the touch screen is tapped, FALSE otherwise. */ BOOL TouchScreen_Tapped(void); diff --git a/include/trainer_data.h b/include/trainer_data.h index ff07f51b95..02d42de7f1 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -3,11 +3,13 @@ #include "constants/trainer.h" -#include "strbuf.h" #include "struct_defs/trainer_data.h" -#include "savedata.h" + #include "overlay006/battle_params.h" +#include "savedata.h" +#include "strbuf.h" + enum TrainerDataParam { TRDATA_TYPE = 0, TRDATA_CLASS, @@ -23,10 +25,10 @@ enum TrainerDataParam { /** * @brief Initialize the TrainerData structs within the BattleParams struct. - * + * * This routine is responsible for loading the name of a trainer and building * their party from the data archives. - * + * * @param battleParams The parent BattleParams struct for the encounter. * @param save Save data; used to pull out the rival's name, if needed. * @param heapID Heap on which to allocate message bank access. @@ -35,7 +37,7 @@ void TrainerData_Encounter(BattleParams *battleParams, const SaveData *save, int /** * @brief Get a parameter for the given trainer ID from the data archive. - * + * * @param trainerID ID of the trainer whose data should be retrieved. * @param paramID ID of the data field to be retrieved. * @return Value of the trainer's data field in the archive. @@ -44,9 +46,9 @@ u32 TrainerData_LoadParam(int trainerID, enum TrainerDataParam paramID); /** * @brief Check if the given trainer has a message of the specified type. - * + * * @param trainerID ID of the trainer being queried. - * @param msgType The type of message for which we are looking. + * @param msgType The type of message for which we are looking. * @param heapID Heap on which to allocate archive access. * @return TRUE if the trainer has a message of the given type; FALSE if not. */ @@ -54,11 +56,11 @@ BOOL TrainerData_HasMessageType(int trainerID, enum TrainerMessageType msgType, /** * @brief Load the trainer's message of a given type into the provided Strbuf. - * + * * If no such message exists, then the Strbuf will be cleared. - * + * * @param trainerID ID of the trainer being queried. - * @param msgType The type of message for which we are looking. + * @param msgType The type of message for which we are looking. * @param[out] strbuf Strbuf which will contain the result message. * @param heapID Heap on which to allocate archive access. */ @@ -66,7 +68,7 @@ void TrainerData_LoadMessage(int trainerID, enum TrainerMessageType msgType, Str /** * @brief Load data for the requested trainer. - * + * * @param trainerID ID of the trainer to be loaded. * @param[out] trdata Struct which will contain the loaded trainer data. */ @@ -74,11 +76,11 @@ void TrainerData_Load(int trainerID, TrainerData *trdata); /** * @brief Load data for the requested trainer's party. - * + * * The struct pointer passed to this function will determine exactly how much * data is loaded; see the definitions of the various TrainerMon... structs in * struct_defs/trainer_data.h for exact specifications. - * + * * @param trainerID ID of the trainer whose party is to be loaded. * @param[out] trparty Struct which will contain the loaded trainer party data. */ @@ -86,7 +88,7 @@ void TrainerData_LoadParty(int trainerID, void *trparty); /** * @brief Get the gender for a particular trainer class. - * + * * @param trclass Class of the trainer. * @return Gender identifier for the trainer class; see: enum Gender. */ diff --git a/include/trainer_info.h b/include/trainer_info.h index 8be114309e..a647a0c644 100644 --- a/include/trainer_info.h +++ b/include/trainer_info.h @@ -21,24 +21,24 @@ typedef struct TrainerInfo { /** * @brief Get the size of a TrainerInfo struct. - * + * * @return Size of the struct. */ int TrainerInfo_Size(void); /** * @brief Create a new TrainerInfo struct and initialize it. - * + * * @see TrainerInfo_Init - * + * * @param heapID Heap on which to allocate the new struct. * @return Address of the new struct. */ -TrainerInfo* TrainerInfo_New(u32 heapID); +TrainerInfo *TrainerInfo_New(u32 heapID); /** * @brief Copy a source TrainerInfo struct into a destination struct, byte-for-byte. - * + * * @param src The source struct. * @param dst The destination struct. */ @@ -46,17 +46,17 @@ void TrainerInfo_Copy(const TrainerInfo *src, TrainerInfo *dst); /** * @brief Initialize an allocated TrainerInfo struct to the base state. - * + * * Zeroes out all data within the given struct and resets the region * code and version to be those specified for the ROM. - * + * * @param info The struct to be initialized. */ void TrainerInfo_Init(TrainerInfo *info); /** * @brief Check if the trainer has no name. - * + * * @param info The trainer info. * @return TRUE if the trainer's name is empty; FALSE if it contains any data. */ @@ -64,7 +64,7 @@ BOOL TrainerInfo_HasNoName(const TrainerInfo *info); /** * @brief Set the trainer's name. - * + * * @param info The trainer info. * @param name Player's new name, as a character buffer. */ @@ -72,7 +72,7 @@ void TrainerInfo_SetName(TrainerInfo *info, const charcode_t *name); /** * @brief Set the trainer's name. - * + * * @param info The trainer info. * @param name Player's new name, as a Strbuf struct. */ @@ -80,15 +80,15 @@ void TrainerInfo_SetNameFromStrbuf(TrainerInfo *info, const Strbuf *name); /** * @brief Get the trainer's name. - * + * * @param info The trainer info. * @return The trainer's name, as a character buffer. */ -const charcode_t* TrainerInfo_Name(const TrainerInfo *info); +const charcode_t *TrainerInfo_Name(const TrainerInfo *info); /** * @brief Get the trainer's name. - * + * * @param info The trainer info. * @param name Pre-allocated Strbuf struct to receive the trainer's name. */ @@ -96,16 +96,16 @@ void TrainerInfo_NameStrbuf(const TrainerInfo *info, Strbuf *name); /** * @brief Get the trainer's name. - * + * * @param info The trainer info. * @param heapID Heap on which to allocate the new Strbuf struct. * @return The trainer's name, as a Strbuf struct. */ -Strbuf* TrainerInfo_NameNewStrbuf(const TrainerInfo *info, int heapID); +Strbuf *TrainerInfo_NameNewStrbuf(const TrainerInfo *info, int heapID); /** * @brief Set the trainer's ID. - * + * * @param info The trainer info. * @param id New trainer ID. */ @@ -113,10 +113,10 @@ void TrainerInfo_SetID(TrainerInfo *info, u32 id); /** * @brief Get the trainer's ID. - * + * * Note that this is the complete 32-byte ID; it includes both the visible * trainer ID and the invisible "secret ID." - * + * * @param info The trainer info. * @return The trainer's ID. */ @@ -124,9 +124,9 @@ u32 TrainerInfo_ID(const TrainerInfo *info); /** * @brief Get the lower half of the trainer's ID. - * + * * This constitutes only the visible trainer ID. - * + * * @param info The trainer info. * @return The lower half of the trainer's ID. */ @@ -134,7 +134,7 @@ u16 TrainerInfo_ID_LowHalf(const TrainerInfo *info); /** * @brief Set the trainer's gender. - * + * * @param info The trainer info. * @param gender New trainer gender. */ @@ -142,7 +142,7 @@ void TrainerInfo_SetGender(TrainerInfo *info, int gender); /** * @brief Get the trainer's gender. - * + * * @param info The trainer info. * @return The trainer's gender. */ @@ -150,7 +150,7 @@ u32 TrainerInfo_Gender(const TrainerInfo *info); /** * @brief Check if the trainer has a certain badge. - * + * * @param info The trainer info. * @param badgeNum Number of the badge to check, 0-indexed. * @return TRUE if the trainer has the badge, FALSE otherwise. @@ -159,7 +159,7 @@ BOOL TrainerInfo_HasBadge(const TrainerInfo *info, int badgeNum); /** * @brief Set the flag denoting possession of a given badge. - * + * * @param info The trainer info. * @param badgeNum Number of the badge to set. */ @@ -167,7 +167,7 @@ void TrainerInfo_SetBadge(TrainerInfo *info, int badgeNum); /** * @brief Get the number of badges owned by the trainer. - * + * * @param info The trainer info. * @return Number of badges acquired. */ @@ -175,7 +175,7 @@ int TrainerInfo_BadgeCount(const TrainerInfo *info); /** * @brief Get the trainer's current money. - * + * * @param info The trainer info. * @return How much money the trainer has. */ @@ -183,7 +183,7 @@ u32 TrainerInfo_Money(const TrainerInfo *info); /** * @brief Set the trainer's current money. - * + * * @param info The trainer info. * @param money How much money the trainer should have. * @return The trainer's new current money. @@ -192,7 +192,7 @@ u32 TrainerInfo_SetMoney(TrainerInfo *info, u32 money); /** * @brief Get the trainer's appearance in the Union Room. - * + * * @param info * @return The trainer's Union Room apperance. */ @@ -200,7 +200,7 @@ u8 TrainerInfo_Appearance(const TrainerInfo *info); /** * @brief Set the trainer's appearance in the Union Room. - * + * * @param info The trainer info. * @param appearance New appearance setting. */ @@ -208,7 +208,7 @@ void TrainerInfo_SetAppearance(TrainerInfo *info, u8 appearance); /** * @brief Give the trainer a specified amount of money. - * + * * @param info The trainer info. * @param money The amount of money to give the trainer. * @return The trainer's new current money. @@ -217,7 +217,7 @@ u32 TrainerInfo_GiveMoney(TrainerInfo *info, u32 money); /** * @brief Take a specified amount of money from the trainer. - * + * * @param info The trainer info. * @param money The amount of money to take from the trainer. * @return The trainer's new current money. @@ -226,7 +226,7 @@ u32 TrainerInfo_TakeMoney(TrainerInfo *info, u32 money); /** * @brief Get the trainer's game code. - * + * * @param info The trainer info. * @return The trainer's game code. */ @@ -234,7 +234,7 @@ u8 TrainerInfo_GameCode(const TrainerInfo *info); /** * @brief Set the trainer's game code. - * + * * @param info The trainer info. * @param gameCode New game code. */ @@ -242,14 +242,14 @@ void TrainerInfo_SetGameCode(TrainerInfo *info, u8 gameCode); /** * @brief Get the game code for interfacing with Diamond and Pearl. - * + * * @return 0 */ u8 TrainerInfo_DPGameCode(void); /** * @brief Get the trainer's region code. - * + * * @param info The trainer info. * @return The trainer's region code. */ @@ -257,7 +257,7 @@ u8 TrainerInfo_RegionCode(const TrainerInfo *info); /** * @brief Set the trainer's region code. - * + * * @param info The trainer info. * @param regionCode New region code. */ @@ -265,14 +265,14 @@ void TrainerInfo_SetRegionCode(TrainerInfo *info, u8 regionCode); /** * @brief Set the "game cleared" flag for the trainer. - * + * * @param info The trainer info. */ void TrainerInfo_SetMainStoryCleared(TrainerInfo *info); /** * @brief Check if the trainer has cleared the main game. - * + * * @param info The trainer info. * @return TRUE if the trainer has cleared the main game; FALSE otherwise. */ @@ -280,14 +280,14 @@ BOOL TrainerInfo_IsMainStoryCleared(TrainerInfo *info); /** * @brief Set the "has the National Dex" flag for the trainer. - * + * * @param info The trainer info. */ void TrainerInfo_GiveNationalDex(TrainerInfo *info); /** * @brief Check if the trainer has the National Dex. - * + * * @param info The trainer info. * @return TRUE if the trainer has the National Dex; FALSE otherwise. */ @@ -295,11 +295,11 @@ BOOL TrainerInfo_HasNationalDex(TrainerInfo *info); /** * @brief Compare two trainer states for equality - * + * * Two trainer states are deemed to be equal if: * 1. They have the same name. * 2. They have the same 32-byte ID. - * + * * @param info1 The first trainer info. * @param info2 The second trainer info. * @return TRUE if the trainer states are deemed equal; FALSE if not. diff --git a/include/tutor_movesets.h b/include/tutor_movesets.h index faaa095c16..615f46633f 100644 --- a/include/tutor_movesets.h +++ b/include/tutor_movesets.h @@ -30,4 +30,3 @@ typedef struct MovesetMask { } MovesetMask; #endif // POKEPLATINUM_TUTOR_MOVESETS_H - diff --git a/include/unk_02000C88.h b/include/unk_02000C88.h index 510d4b9893..f46f1abf70 100644 --- a/include/unk_02000C88.h +++ b/include/unk_02000C88.h @@ -5,7 +5,7 @@ #include "overlay_manager.h" -void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate * param1); +void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); void InitRNG(void); void HandleConsoleFold(void); diff --git a/include/unk_0200112C.h b/include/unk_0200112C.h index 01f2024736..dae895b405 100644 --- a/include/unk_0200112C.h +++ b/include/unk_0200112C.h @@ -3,20 +3,21 @@ #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" + #include "overlay084/struct_ov84_02240FA8.h" -BmpList * sub_0200112C(const UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3); -u32 sub_02001288(BmpList * param0); -void sub_02001384(BmpList * param0, u16 * param1, u16 * param2); -void sub_020013AC(BmpList * param0); -void sub_020013D8(BmpList * param0, u8 param1, u8 param2, u8 param3); -u32 sub_02001408(BmpList * param0, UnkStruct_ov84_02240FA8 * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 * param6, u16 * param7); -void sub_0200147C(BmpList * param0, u8 param1, u8 param2, u8 param3); -void sub_020014D0(BmpList * param0, u16 * param1); -void sub_020014DC(BmpList * param0, u16 * param1, u16 * param2); -u8 sub_020014F0(BmpList * param0); -u32 sub_020014F8(BmpList * param0, u16 param1); -u32 sub_02001504(BmpList * param0, u8 param1); -void sub_020015CC(BmpList * param0, ResourceMetadata * param1); +BmpList *sub_0200112C(const UnkStruct_ov84_02240FA8 *param0, u16 param1, u16 param2, u8 param3); +u32 sub_02001288(BmpList *param0); +void sub_02001384(BmpList *param0, u16 *param1, u16 *param2); +void sub_020013AC(BmpList *param0); +void sub_020013D8(BmpList *param0, u8 param1, u8 param2, u8 param3); +u32 sub_02001408(BmpList *param0, UnkStruct_ov84_02240FA8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 *param6, u16 *param7); +void sub_0200147C(BmpList *param0, u8 param1, u8 param2, u8 param3); +void sub_020014D0(BmpList *param0, u16 *param1); +void sub_020014DC(BmpList *param0, u16 *param1, u16 *param2); +u8 sub_020014F0(BmpList *param0); +u32 sub_020014F8(BmpList *param0, u16 param1); +u32 sub_02001504(BmpList *param0, u8 param1); +void sub_020015CC(BmpList *param0, ResourceMetadata *param1); #endif // POKEPLATINUM_UNK_0200112C_H diff --git a/include/unk_02001AF4.h b/include/unk_02001AF4.h index 84a2dbdf5a..a7044443f7 100644 --- a/include/unk_02001AF4.h +++ b/include/unk_02001AF4.h @@ -5,22 +5,23 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" + #include "overlay061/struct_ov61_0222C884.h" -UIControlData * sub_02001AF4(const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5); -UIControlData * sub_02001B7C(const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5); -UIControlData * sub_02001B9C(const UnkStruct_02081CF4 * param0, u8 param1, u8 param2); -void sub_02001BC4(UIControlData * param0, u8 * param1); -u32 sub_02001BE0(UIControlData * param0); -u32 sub_02001C94(UIControlData * param0, u16 param1); -u32 sub_02001D44(UIControlData * param0, u8 param1); -u8 sub_02001DC4(UIControlData * param0); -u8 sub_02001DC8(UIControlData * param0); -UIControlData * sub_02002054(BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u8 param4, u32 param5); -UIControlData * sub_02002100(BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u32 param4); -u32 sub_02002114(UIControlData * param0, u32 param1); -u32 sub_02002134(UIControlData * param0, u8 param1, u32 param2); -void sub_02002154(UIControlData * param0, u32 param1); -void sub_02002180(Window * param0, u32 param1, u32 param2); +UIControlData *sub_02001AF4(const UnkStruct_02081CF4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5); +UIControlData *sub_02001B7C(const UnkStruct_02081CF4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5); +UIControlData *sub_02001B9C(const UnkStruct_02081CF4 *param0, u8 param1, u8 param2); +void sub_02001BC4(UIControlData *param0, u8 *param1); +u32 sub_02001BE0(UIControlData *param0); +u32 sub_02001C94(UIControlData *param0, u16 param1); +u32 sub_02001D44(UIControlData *param0, u8 param1); +u8 sub_02001DC4(UIControlData *param0); +u8 sub_02001DC8(UIControlData *param0); +UIControlData *sub_02002054(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u8 param4, u32 param5); +UIControlData *sub_02002100(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4); +u32 sub_02002114(UIControlData *param0, u32 param1); +u32 sub_02002134(UIControlData *param0, u8 param1, u32 param2); +void sub_02002154(UIControlData *param0, u32 param1); +void sub_02002180(Window *param0, u32 param1, u32 param2); #endif // POKEPLATINUM_UNK_02001AF4_H diff --git a/include/unk_020021B0.h b/include/unk_020021B0.h index 32d8656724..bd34c16979 100644 --- a/include/unk_020021B0.h +++ b/include/unk_020021B0.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_UNK_020021B0_H #define POKEPLATINUM_UNK_020021B0_H -u16 * GF_strcpy(u16 * param0, const u16 * param1); -u16 * sub_020021D0(u16 * param0, const u16 * param1, u32 param2); -u32 GF_strlen(const u16 * param0); -BOOL GF_strcmp(const u16 * param0, const u16 * param1); -BOOL GF_strncmp(const u16 * param0, const u16 * param1, u32 param2); -u16 * sub_02002278(u16 * param0, u16 param1, u32 param2); -u16 * sub_02002294(u16 * param0, u32 param1); -u16 * sub_020022A4(u16 * param0, s32 param1, u32 param2, u32 param3); +u16 *GF_strcpy(u16 *param0, const u16 *param1); +u16 *sub_020021D0(u16 *param0, const u16 *param1, u32 param2); +u32 GF_strlen(const u16 *param0); +BOOL GF_strcmp(const u16 *param0, const u16 *param1); +BOOL GF_strncmp(const u16 *param0, const u16 *param1, u32 param2); +u16 *sub_02002278(u16 *param0, u16 param1, u32 param2); +u16 *sub_02002294(u16 *param0, u32 param1); +u16 *sub_020022A4(u16 *param0, s32 param1, u32 param2, u32 param3); #endif // POKEPLATINUM_UNK_020021B0_H diff --git a/include/unk_02002328.h b/include/unk_02002328.h index b11dd0170d..1e2b6e393f 100644 --- a/include/unk_02002328.h +++ b/include/unk_02002328.h @@ -3,14 +3,14 @@ #include "struct_defs/struct_0201D834.h" -int sub_02002328(UnkStruct_0201D834 * param0); +int sub_02002328(UnkStruct_0201D834 *param0); void sub_020027A8(u16 param0); -void sub_020027B4(UnkStruct_0201D834 * param0); -void sub_020027E0(UnkStruct_0201D834 * param0); -void sub_02002968(UnkStruct_0201D834 * param0); -BOOL sub_02002A44(UnkStruct_0201D834 * param0); -BOOL sub_02002A80(UnkStruct_0201D834 * param0); -BOOL sub_02002AA4(UnkStruct_0201D834 * param0); +void sub_020027B4(UnkStruct_0201D834 *param0); +void sub_020027E0(UnkStruct_0201D834 *param0); +void sub_02002968(UnkStruct_0201D834 *param0); +BOOL sub_02002A44(UnkStruct_0201D834 *param0); +BOOL sub_02002A80(UnkStruct_0201D834 *param0); +BOOL sub_02002AA4(UnkStruct_0201D834 *param0); void sub_02002AC8(int param0); void sub_02002AE4(int param0); void sub_02002B20(int param0); diff --git a/include/unk_02002B7C.h b/include/unk_02002B7C.h index b09846ac09..4b6b484a1d 100644 --- a/include/unk_02002B7C.h +++ b/include/unk_02002B7C.h @@ -3,6 +3,7 @@ #include "struct_defs/struct_02002328.h" #include "struct_defs/struct_0201D834.h" + #include "strbuf.h" void sub_02002B7C(void); @@ -10,9 +11,9 @@ void sub_02002BB8(int param0, u32 param1); void sub_02002BEC(int param0, u32 param1); void sub_02002C28(int param0); void sub_02002C60(int param0); -const UnkStruct_02002328 * sub_02002CFC(int param0, u16 param1); -int sub_02002D18(int param0, UnkStruct_0201D834 * param1); -u32 sub_02002D48(int param0, const u16 * param1, u32 param2); +const UnkStruct_02002328 *sub_02002CFC(int param0, u16 param1); +int sub_02002D18(int param0, UnkStruct_0201D834 *param1); +u32 sub_02002D48(int param0, const u16 *param1, u32 param2); u32 sub_02002D7C(int param0, const Strbuf *param1, u32 param2); u32 sub_02002DB4(int param0, Strbuf *param1, Strbuf *param2); u8 sub_02002DF8(u8 param0, u8 param1); diff --git a/include/unk_02002F38.h b/include/unk_02002F38.h index 3615c27eb4..aeb10d65ad 100644 --- a/include/unk_02002F38.h +++ b/include/unk_02002F38.h @@ -3,31 +3,31 @@ #include "struct_decls/struct_02002F38_decl.h" -PaletteData * sub_02002F38(int param0); -void sub_02002F54(PaletteData * param0); -void sub_02002F5C(PaletteData * param0, int param1, void * param2, void * param3, u32 param4); -void sub_02002F70(PaletteData * param0, int param1, u32 param2, u32 param3); -void sub_02002FA0(PaletteData * param0, int param1); -void sub_02002FBC(PaletteData * param0, const void * param1, int param2, u16 param3, u16 param4); -void sub_02002FEC(PaletteData * param0, u32 bankID, u32 memberIndex, u32 param3, int param4, u32 param5, u16 param6, u16 param7); -void PaletteSys_LoadPalette(PaletteData * param0, u32 bankID, u32 memberIndex, u32 param3, int param4, u32 param5, u16 param6); -void sub_02003070(PaletteData * param0, int param1, u16 param2, u32 param3); -void sub_020030E4(u32 param0, u32 param1, u32 param2, u32 param3, u16 param4, void * param5); -void sub_02003120(PaletteData * param0, int param1, u16 param2, int param3, u16 param4, u16 param5); -u16 * sub_02003164(PaletteData * param0, int param1); -u16 * sub_0200316C(PaletteData * param0, int param1); -u8 sub_02003178(PaletteData * param0, u16 param1, u16 param2, s8 param3, u8 param4, u8 param5, u16 param6); -void sub_02003694(PaletteData * param0); -u16 sub_0200384C(PaletteData * param0); -void sub_02003858(PaletteData * param0, int param1); -void sub_0200387C(PaletteData * param0, u8 param1); -void sub_020038B0(PaletteData * param0, int param1, int param2, u16 param3, u16 param4, u16 param5); -u16 sub_02003910(PaletteData * param0, int param1, int param2, u16 param3); -void sub_0200393C(const u16 * param0, u16 * param1, u16 param2, u8 param3, u16 param4); -void sub_020039B0(PaletteData * param0, int param1, u16 param2, u16 param3, u8 param4, u16 param5); -void sub_020039F8(const u16 * param0, u16 * param1, u16 param2, u8 param3, u16 param4); -void sub_02003A2C(PaletteData * param0, int param1, u16 param2, u8 param3, u16 param4); -void sub_02003A8C(u16 * param0, int param1, int param2, int param3, int param4); -void sub_02003B08(PaletteData * param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6, int param7, int param8, int param9); +PaletteData *sub_02002F38(int param0); +void sub_02002F54(PaletteData *param0); +void sub_02002F5C(PaletteData *param0, int param1, void *param2, void *param3, u32 param4); +void sub_02002F70(PaletteData *param0, int param1, u32 param2, u32 param3); +void sub_02002FA0(PaletteData *param0, int param1); +void sub_02002FBC(PaletteData *param0, const void *param1, int param2, u16 param3, u16 param4); +void sub_02002FEC(PaletteData *param0, u32 bankID, u32 memberIndex, u32 param3, int param4, u32 param5, u16 param6, u16 param7); +void PaletteSys_LoadPalette(PaletteData *param0, u32 bankID, u32 memberIndex, u32 param3, int param4, u32 param5, u16 param6); +void sub_02003070(PaletteData *param0, int param1, u16 param2, u32 param3); +void sub_020030E4(u32 param0, u32 param1, u32 param2, u32 param3, u16 param4, void *param5); +void sub_02003120(PaletteData *param0, int param1, u16 param2, int param3, u16 param4, u16 param5); +u16 *sub_02003164(PaletteData *param0, int param1); +u16 *sub_0200316C(PaletteData *param0, int param1); +u8 sub_02003178(PaletteData *param0, u16 param1, u16 param2, s8 param3, u8 param4, u8 param5, u16 param6); +void sub_02003694(PaletteData *param0); +u16 sub_0200384C(PaletteData *param0); +void sub_02003858(PaletteData *param0, int param1); +void sub_0200387C(PaletteData *param0, u8 param1); +void sub_020038B0(PaletteData *param0, int param1, int param2, u16 param3, u16 param4, u16 param5); +u16 sub_02003910(PaletteData *param0, int param1, int param2, u16 param3); +void sub_0200393C(const u16 *param0, u16 *param1, u16 param2, u8 param3, u16 param4); +void sub_020039B0(PaletteData *param0, int param1, u16 param2, u16 param3, u8 param4, u16 param5); +void sub_020039F8(const u16 *param0, u16 *param1, u16 param2, u8 param3, u16 param4); +void sub_02003A2C(PaletteData *param0, int param1, u16 param2, u8 param3, u16 param4); +void sub_02003A8C(u16 *param0, int param1, int param2, int param3, int param4); +void sub_02003B08(PaletteData *param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6, int param7, int param8, int param9); #endif // POKEPLATINUM_UNK_02002F38_H diff --git a/include/unk_02003B60.h b/include/unk_02003B60.h index a9c77ff437..2ab464dea9 100644 --- a/include/unk_02003B60.h +++ b/include/unk_02003B60.h @@ -1,25 +1,26 @@ #ifndef POKEPLATINUM_UNK_02003B60_H #define POKEPLATINUM_UNK_02003B60_H +#include + #include "struct_decls/struct_02003D54_decl.h" -#include "game_options.h" #include "struct_defs/chatot_cry.h" -#include +#include "game_options.h" -void sub_02003B60(ChatotCry * param0, Options * param1); +void sub_02003B60(ChatotCry *param0, Options *param1); void UpdateSound(void); void sub_02003D0C(int param0); -UnkStruct_02003D54 * sub_02003D54(void); -void * sub_02003D5C(int param0); -int sub_02004014(int * param0); +UnkStruct_02003D54 *sub_02003D54(void); +void *sub_02003D5C(int param0); +int sub_02004014(int *param0); void sub_0200403C(int param0); BOOL sub_02004050(u16 param0); BOOL sub_02004068(u16 param0); BOOL sub_02004080(u16 param0, u32 param1); BOOL sub_0200409C(u16 param0); BOOL sub_020040B4(u16 param0); -NNSSndHandle * sub_020040CC(int param0); +NNSSndHandle *sub_020040CC(int param0); int sub_020040F0(int param0); #endif // POKEPLATINUM_UNK_02003B60_H diff --git a/include/unk_020041CC.h b/include/unk_020041CC.h index fb0b800c19..73e20d6990 100644 --- a/include/unk_020041CC.h +++ b/include/unk_020041CC.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_UNK_020041CC_H #define POKEPLATINUM_UNK_020041CC_H -#include "struct_defs/struct_02004CB4.h" - +#include #include #include -#include + +#include "struct_defs/struct_02004CB4.h" void sub_020041CC(u8 param0); u8 sub_020041DC(void); @@ -32,16 +32,16 @@ void sub_02004AD4(u16 param0, int param1); BOOL sub_02004AE8(int param0, int param1, u16 param2); int sub_02004B04(int param0); u8 sub_02004B18(u16 param0); -int sub_02004B34(NNSSndHandle * param0); -const NNSSndArcBankInfo * sub_02004B3C(int param0); +int sub_02004B34(NNSSndHandle *param0); +const NNSSndArcBankInfo *sub_02004B3C(int param0); u16 sub_02004B48(int param0); -MICResult sub_02004B5C(MICAutoParam * param0); +MICResult sub_02004B5C(MICAutoParam *param0); MICResult sub_02004B64(void); -MICResult sub_02004B70(MICSamplingType param0, void * param1, MICCallback param2, void * param3); -NNSSndWaveOutHandle * sub_02004B78(u32 param0); +MICResult sub_02004B70(MICSamplingType param0, void *param1, MICCallback param2, void *param3); +NNSSndWaveOutHandle *sub_02004B78(u32 param0); BOOL sub_02004BCC(u32 param0); void sub_02004C4C(u32 param0); -BOOL sub_02004CB4(UnkStruct_02004CB4 * param0, u32 param1); +BOOL sub_02004CB4(UnkStruct_02004CB4 *param0, u32 param1); void sub_02004CF4(u32 param0); BOOL sub_02004D04(u32 param0); void sub_02004D14(u32 param0, u8 param1); @@ -65,16 +65,16 @@ void sub_02004FCC(int param0); void sub_02004FDC(int param0); int sub_02004FEC(void); void sub_0200500C(int param0); -void * sub_02005014(void); +void *sub_02005014(void); void sub_0200501C(int param0); -BOOL sub_0200502C(u8 param0, u16 param1, int param2, int param3, u8 param4, void * param5); -BOOL sub_02005068(u8 param0, u16 param1, int param2, int param3, int param4, u8 param5, void * param6); -const u8 * sub_020050E0(const SNDWaveData * param0); -const u32 sub_020050EC(const SNDWaveData * param0); -const SNDWaveData * sub_020050F8(int param0); -u32 sub_02005188(int param0, const SNDWaveData * param1, int param2); +BOOL sub_0200502C(u8 param0, u16 param1, int param2, int param3, u8 param4, void *param5); +BOOL sub_02005068(u8 param0, u16 param1, int param2, int param3, int param4, u8 param5, void *param6); +const u8 *sub_020050E0(const SNDWaveData *param0); +const u32 sub_020050EC(const SNDWaveData *param0); +const SNDWaveData *sub_020050F8(int param0); +u32 sub_02005188(int param0, const SNDWaveData *param1, int param2); u32 sub_020051C4(int param0); -void sub_020051D0(const SNDWaveData * param0, u8 * param1, int param2, int param3); +void sub_020051D0(const SNDWaveData *param0, u8 *param1, int param2, int param3); void sub_020053CC(int param0); void sub_0200544C(int param0, int param1); void sub_02005454(BOOL param0); diff --git a/include/unk_02006224.h b/include/unk_02006224.h index 0d71317125..0a9e9c6d9c 100644 --- a/include/unk_02006224.h +++ b/include/unk_02006224.h @@ -1,21 +1,21 @@ #ifndef POKEPLATINUM_UNK_02006224_H #define POKEPLATINUM_UNK_02006224_H -#include "struct_defs/chatot_cry.h" - #include +#include "struct_defs/chatot_cry.h" + BOOL CheckMicRecordingStatus(void); -BOOL IsChatotCryStructReadyForProcessing(const ChatotCry * param0); -BOOL ProcessAudioInput(const ChatotCry * param0, u32 param1, int param2, int param3); +BOOL IsChatotCryStructReadyForProcessing(const ChatotCry *param0); +BOOL ProcessAudioInput(const ChatotCry *param0, u32 param1, int param2, int param3); void ResetMicStatusFlags(void); MICResult StartMicSampling(void); MICResult StopMicSampling(void); -void StoreMicDataInChatotCryStruct(ChatotCry * param0); +void StoreMicDataInChatotCryStruct(ChatotCry *param0); void Sound_FlagDefaultChatotCry(u8 param0); -BOOL Sound_PlayChatotCry(ChatotCry * param0, u32 param1, int param2, int param3); -BOOL Sound_PlayDelayedChatotCry(ChatotCry * param0, u32 param1, int param2, int param3, u8 param4); -int Sound_Chatter(ChatotCry * param0); +BOOL Sound_PlayChatotCry(ChatotCry *param0, u32 param1, int param2, int param3); +BOOL Sound_PlayDelayedChatotCry(ChatotCry *param0, u32 param1, int param2, int param3, u8 param4); +int Sound_Chatter(ChatotCry *param0); BOOL Sound_CanPlayChatotCry(int param0); #endif // POKEPLATINUM_UNK_02006224_H diff --git a/include/unk_02006E3C.h b/include/unk_02006E3C.h index 85a1749a68..a5637c4534 100644 --- a/include/unk_02006E3C.h +++ b/include/unk_02006E3C.h @@ -1,39 +1,39 @@ #ifndef POKEPLATINUM_UNK_02006E3C_H #define POKEPLATINUM_UNK_02006E3C_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include - -u32 sub_02006E3C(u32 param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); -void sub_02006E60(u32 param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +u32 sub_02006E3C(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +void sub_02006E60(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); void sub_02006E84(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); void sub_02006E9C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6); u32 sub_02006EC0(u32 param0, u32 param1, int param2, u32 param3, u32 param4, BOOL param5, u32 param6); -void sub_02006EE0(u32 param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy * param5); -u32 sub_02006F00(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy * param8); -void sub_02006F28(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy * param8); -void * sub_02006F50(u32 param0, u32 param1, BOOL param2, NNSG2dCharacterData ** param3, u32 param4); -void * sub_02006F6C(u32 param0, u32 param1, BOOL param2, NNSG2dScreenData ** param3, u32 param4); -void * sub_02006F88(u32 bankID, u32 memberIndex, NNSG2dPaletteData ** param2, u32 param3); -void * sub_02006FA0(u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank ** param3, u32 param4); -void * sub_02006FBC(u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData ** param3, u32 param4); -void * sub_02006FD8(u32 param0, u32 param1, u32 param2); -void * sub_02006FE8(u32 param0, u32 param1, BOOL param2, u32 param3, int param4); -void * sub_02007068(u32 param0, u32 param1, BOOL param2, u32 param3, int param4, u32 * param5); -u32 sub_020070E8(NARC * param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); -void sub_0200710C(NARC * param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); -void sub_02007130(NARC * param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); -void sub_02007148(NARC * param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6); -void sub_0200716C(NARC * param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy * param5); -u32 sub_0200718C(NARC * param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy * param8); -void * sub_020071B4(NARC * param0, u32 param1, BOOL param2, NNSG2dCharacterData ** param3, u32 param4); -void * sub_020071D0(NARC * param0, u32 param1, BOOL param2, NNSG2dScreenData ** param3, u32 param4); -void * sub_020071EC(NARC * param0, u32 param1, NNSG2dPaletteData ** param2, u32 param3); -void * sub_02007204(NARC * param0, u32 param1, BOOL param2, NNSG2dCellDataBank ** param3, u32 param4); -void * sub_02007220(NARC * param0, u32 param1, BOOL param2, NNSG2dAnimBankData ** param3, u32 param4); -void * sub_0200723C(NARC * param0, u32 param1, BOOL param2, u32 param3, int param4); -void * sub_02007250(NARC * param0, u32 param1, BOOL param2, u32 param3, int param4, u32 * param5); +void sub_02006EE0(u32 param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5); +u32 sub_02006F00(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8); +void sub_02006F28(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8); +void *sub_02006F50(u32 param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4); +void *sub_02006F6C(u32 param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4); +void *sub_02006F88(u32 bankID, u32 memberIndex, NNSG2dPaletteData **param2, u32 param3); +void *sub_02006FA0(u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4); +void *sub_02006FBC(u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4); +void *sub_02006FD8(u32 param0, u32 param1, u32 param2); +void *sub_02006FE8(u32 param0, u32 param1, BOOL param2, u32 param3, int param4); +void *sub_02007068(u32 param0, u32 param1, BOOL param2, u32 param3, int param4, u32 *param5); +u32 sub_020070E8(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +void sub_0200710C(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +void sub_02007130(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); +void sub_02007148(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6); +void sub_0200716C(NARC *param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5); +u32 sub_0200718C(NARC *param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8); +void *sub_020071B4(NARC *param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4); +void *sub_020071D0(NARC *param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4); +void *sub_020071EC(NARC *param0, u32 param1, NNSG2dPaletteData **param2, u32 param3); +void *sub_02007204(NARC *param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4); +void *sub_02007220(NARC *param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4); +void *sub_0200723C(NARC *param0, u32 param1, BOOL param2, u32 param3, int param4); +void *sub_02007250(NARC *param0, u32 param1, BOOL param2, u32 param3, int param4, u32 *param5); #endif // POKEPLATINUM_UNK_02006E3C_H diff --git a/include/unk_0200762C.h b/include/unk_0200762C.h index fab72cbb1d..0928b230a2 100644 --- a/include/unk_0200762C.h +++ b/include/unk_0200762C.h @@ -1,48 +1,49 @@ #ifndef POKEPLATINUM_UNK_0200762C_H #define POKEPLATINUM_UNK_0200762C_H +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02007768_decl.h" +#include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" -#include "functypes/funcptr_02007C34.h" -#include "struct_decls/sprite_decl.h" #include "struct_defs/struct_02008900.h" -#include "struct_defs/archived_sprite.h" -void * sub_0200762C(int param0); -void sub_02007768(UnkStruct_02007768 * param0); -void sub_02007B6C(UnkStruct_02007768 * param0); -void sub_02007B98(Sprite * param0, int param1); -void sub_02007C10(Sprite * param0, SpriteAnimationFrame * param1); -BOOL sub_02007C24(Sprite * param0); -Sprite * sub_02007C34(UnkStruct_02007768 * param0, ArchivedSprite * param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame * param6, UnkFuncPtr_02007C34 * param7); -Sprite * sub_02007C7C(UnkStruct_02007768 * param0, ArchivedSprite * param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame * param7, UnkFuncPtr_02007C34 * param8); -void sub_02007DC8(Sprite * param0); -void sub_02007DD4(UnkStruct_02007768 * param0); -void sub_02007DEC(Sprite * param0, int param1, int param2); -int sub_020080C0(Sprite * param0, int param1); -void sub_02008274(Sprite * param0, int param1, int param2); -void sub_020086D4(Sprite * param0, int param1, int param2, int param3, int param4); -void sub_020086FC(Sprite * param0, int param1, int param2, int param3, int param4); -void sub_0200872C(UnkStruct_02007768 * param0, int param1, int param2, int param3, int param4); -void sub_02008780(Sprite * param0); -BOOL sub_020087B4(Sprite * param0); -void sub_020087C8(Sprite * param0, int param1); -void sub_020088E0(UnkStruct_02008900 * param0, const SpriteAnimationFrame * param1); -int sub_02008900(UnkStruct_02008900 * param0); -void sub_020089A0(Sprite * param0); -void sub_020089B0(Sprite * param0); -void sub_02008A0C(Sprite * param0); -void sub_02008A78(UnkStruct_02007768 * param0, u32 param1, u32 param2); -void sub_02008A84(UnkStruct_02007768 * param0, u32 param1, u32 param2); -ArchivedSprite * sub_02008A90(Sprite * param0); -void sub_02008A94(UnkStruct_02007768 * param0); -void sub_02008B2C(UnkStruct_02007768 * param0, int param1); -BOOL sub_02008B38(Sprite * param0); -void sub_02008B54(UnkStruct_02007768 * param0, u32 param1); -void sub_02008B60(UnkStruct_02007768 * param0, u32 param1); -void sub_020091D8(u8 * param0, u32 param1, BOOL param2); -void sub_02009348(u8 * param0); -void sub_02009370(u8 * param0); -void sub_020093A0(u8 * param0, int param1); +#include "functypes/funcptr_02007C34.h" + +void *sub_0200762C(int param0); +void sub_02007768(UnkStruct_02007768 *param0); +void sub_02007B6C(UnkStruct_02007768 *param0); +void sub_02007B98(Sprite *param0, int param1); +void sub_02007C10(Sprite *param0, SpriteAnimationFrame *param1); +BOOL sub_02007C24(Sprite *param0); +Sprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7); +Sprite *sub_02007C7C(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8); +void sub_02007DC8(Sprite *param0); +void sub_02007DD4(UnkStruct_02007768 *param0); +void sub_02007DEC(Sprite *param0, int param1, int param2); +int sub_020080C0(Sprite *param0, int param1); +void sub_02008274(Sprite *param0, int param1, int param2); +void sub_020086D4(Sprite *param0, int param1, int param2, int param3, int param4); +void sub_020086FC(Sprite *param0, int param1, int param2, int param3, int param4); +void sub_0200872C(UnkStruct_02007768 *param0, int param1, int param2, int param3, int param4); +void sub_02008780(Sprite *param0); +BOOL sub_020087B4(Sprite *param0); +void sub_020087C8(Sprite *param0, int param1); +void sub_020088E0(UnkStruct_02008900 *param0, const SpriteAnimationFrame *param1); +int sub_02008900(UnkStruct_02008900 *param0); +void sub_020089A0(Sprite *param0); +void sub_020089B0(Sprite *param0); +void sub_02008A0C(Sprite *param0); +void sub_02008A78(UnkStruct_02007768 *param0, u32 param1, u32 param2); +void sub_02008A84(UnkStruct_02007768 *param0, u32 param1, u32 param2); +ArchivedSprite *sub_02008A90(Sprite *param0); +void sub_02008A94(UnkStruct_02007768 *param0); +void sub_02008B2C(UnkStruct_02007768 *param0, int param1); +BOOL sub_02008B38(Sprite *param0); +void sub_02008B54(UnkStruct_02007768 *param0, u32 param1); +void sub_02008B60(UnkStruct_02007768 *param0, u32 param1); +void sub_020091D8(u8 *param0, u32 param1, BOOL param2); +void sub_02009348(u8 *param0); +void sub_02009370(u8 *param0); +void sub_020093A0(u8 *param0, int param1); #endif // POKEPLATINUM_UNK_0200762C_H diff --git a/include/unk_020093B4.h b/include/unk_020093B4.h index 83a60a0b86..47d564c9a1 100644 --- a/include/unk_020093B4.h +++ b/include/unk_020093B4.h @@ -1,22 +1,23 @@ #ifndef POKEPLATINUM_UNK_020093B4_H #define POKEPLATINUM_UNK_020093B4_H +#include + +#include "struct_decls/struct_02009714_decl.h" +#include "struct_decls/struct_020218BC_decl.h" #include "struct_defs/struct_02009508.h" #include "struct_defs/struct_02009508_1.h" -#include "struct_decls/struct_02009714_decl.h" #include "struct_defs/struct_0200C738.h" -#include "struct_decls/struct_020218BC_decl.h" -#include "overlay019/struct_ov19_021DA864.h" -#include +#include "overlay019/struct_ov19_021DA864.h" -void sub_020093B4(UnkStruct_ov19_021DA864 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, UnkStruct_02009714 * param9, UnkStruct_02009714 * param10, UnkStruct_02009714 * param11, UnkStruct_02009714 * param12, UnkStruct_02009714 * param13, UnkStruct_02009714 * param14); -void sub_020094F0(UnkStruct_ov19_021DA864 * param0); -UnkStruct_02009508 * sub_02009508(const UnkStruct_02009508_1 * param0, int param1, UnkStruct_02009714 * param2, UnkStruct_02009714 * param3, UnkStruct_02009714 * param4, UnkStruct_02009714 * param5, UnkStruct_02009714 * param6, UnkStruct_02009714 * param7); -void sub_020095A8(UnkStruct_02009508 * param0); -GraphicElementManager * sub_020095C4(int param0, UnkStruct_0200C738 * param1, int param2); -void sub_0200962C(UnkStruct_0200C738 * param0, fx32 param1, fx32 param2); -void sub_0200964C(UnkStruct_0200C738 * param0, fx32 param1, fx32 param2); +void sub_020093B4(UnkStruct_ov19_021DA864 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, UnkStruct_02009714 *param9, UnkStruct_02009714 *param10, UnkStruct_02009714 *param11, UnkStruct_02009714 *param12, UnkStruct_02009714 *param13, UnkStruct_02009714 *param14); +void sub_020094F0(UnkStruct_ov19_021DA864 *param0); +UnkStruct_02009508 *sub_02009508(const UnkStruct_02009508_1 *param0, int param1, UnkStruct_02009714 *param2, UnkStruct_02009714 *param3, UnkStruct_02009714 *param4, UnkStruct_02009714 *param5, UnkStruct_02009714 *param6, UnkStruct_02009714 *param7); +void sub_020095A8(UnkStruct_02009508 *param0); +GraphicElementManager *sub_020095C4(int param0, UnkStruct_0200C738 *param1, int param2); +void sub_0200962C(UnkStruct_0200C738 *param0, fx32 param1, fx32 param2); +void sub_0200964C(UnkStruct_0200C738 *param0, fx32 param1, fx32 param2); void sub_0200966C(u32 param0, GXOBJVRamModeChar param1); void sub_02009704(u32 param0); diff --git a/include/unk_02009714.h b/include/unk_02009714.h index 691c8bd274..18182dc791 100644 --- a/include/unk_02009714.h +++ b/include/unk_02009714.h @@ -1,57 +1,57 @@ #ifndef POKEPLATINUM_UNK_02009714_H #define POKEPLATINUM_UNK_02009714_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" -#include "struct_defs/struct_02009CFC.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02009F38_decl.h" +#include "struct_defs/struct_02009CFC.h" -#include - -UnkStruct_02009714 * sub_02009714(int param0, int param1, int param2); -void sub_02009754(UnkStruct_02009714 * param0); -UnkStruct_02009DC8 * sub_02009794(UnkStruct_02009714 * param0, const UnkStruct_02009F38 * param1, int param2, int param3); -UnkStruct_02009DC8 * sub_0200985C(UnkStruct_02009714 * param0, int param1, int param2, BOOL param3, int param4, int param5, int param6); -UnkStruct_02009DC8 * sub_020098B8(UnkStruct_02009714 * param0, int param1, int param2, BOOL param3, int param4, int param5, int param6, int param7); -UnkStruct_02009DC8 * sub_02009918(UnkStruct_02009714 * param0, int param1, int param2, BOOL param3, int param4, int param5, int param6); -void sub_02009968(UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, int param2, int param3, BOOL param4, int param5); -void sub_020099D4(UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, int param2, int param3, BOOL param4, int param5); -UnkStruct_02009DC8 * sub_02009A4C(UnkStruct_02009714 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6); -UnkStruct_02009DC8 * sub_02009AA8(UnkStruct_02009714 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6, int param7); -UnkStruct_02009DC8 * sub_02009B04(UnkStruct_02009714 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6, int param7); -UnkStruct_02009DC8 * sub_02009B64(UnkStruct_02009714 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6, int param7, int param8); -UnkStruct_02009DC8 * sub_02009BC4(UnkStruct_02009714 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6); -void sub_02009C14(UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, NARC * param2, int param3, BOOL param4, int param5); -int sub_02009C80(UnkStruct_02009714 * param0, const UnkStruct_02009F38 * param1, UnkStruct_02009CFC * param2, int param3); -void sub_02009CB4(UnkStruct_02009714 * param0, const UnkStruct_02009F38 * param1, int param2, int param3, UnkStruct_02009CFC * param4, int param5); -UnkStruct_02009CFC * sub_02009CFC(int param0, int param1); -void sub_02009D20(UnkStruct_02009CFC * param0); -BOOL sub_02009D34(const UnkStruct_02009714 * param0, int param1); -void sub_02009D4C(UnkStruct_02009DC8 * param0); -void sub_02009D68(UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1); -void sub_02009D9C(UnkStruct_02009714 * param0); -UnkStruct_02009DC8 * sub_02009DC8(const UnkStruct_02009714 * param0, int param1); -int sub_02009E08(const UnkStruct_02009DC8 * param0); -NNSG2dCharacterData * sub_02009E1C(const UnkStruct_02009DC8 * param0); -NNSG2dPaletteData * sub_02009E34(const UnkStruct_02009DC8 * param0); -NNSG2dCellDataBank * sub_02009E4C(const UnkStruct_02009DC8 * param0); -NNSG2dCellAnimBankData * sub_02009E64(const UnkStruct_02009DC8 * param0); -NNSG2dMultiCellDataBank * sub_02009E7C(const UnkStruct_02009DC8 * param0); -NNSG2dMultiCellAnimBankData * sub_02009E94(const UnkStruct_02009DC8 * param0); -int sub_02009EAC(const UnkStruct_02009DC8 * param0); -int sub_02009EBC(const UnkStruct_02009DC8 * param0); -int sub_02009EE8(const UnkStruct_02009DC8 * param0); -void sub_02009F08(UnkStruct_02009DC8 * param0, int param1); +UnkStruct_02009714 *sub_02009714(int param0, int param1, int param2); +void sub_02009754(UnkStruct_02009714 *param0); +UnkStruct_02009DC8 *sub_02009794(UnkStruct_02009714 *param0, const UnkStruct_02009F38 *param1, int param2, int param3); +UnkStruct_02009DC8 *sub_0200985C(UnkStruct_02009714 *param0, int param1, int param2, BOOL param3, int param4, int param5, int param6); +UnkStruct_02009DC8 *sub_020098B8(UnkStruct_02009714 *param0, int param1, int param2, BOOL param3, int param4, int param5, int param6, int param7); +UnkStruct_02009DC8 *sub_02009918(UnkStruct_02009714 *param0, int param1, int param2, BOOL param3, int param4, int param5, int param6); +void sub_02009968(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, int param2, int param3, BOOL param4, int param5); +void sub_020099D4(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, int param2, int param3, BOOL param4, int param5); +UnkStruct_02009DC8 *sub_02009A4C(UnkStruct_02009714 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6); +UnkStruct_02009DC8 *sub_02009AA8(UnkStruct_02009714 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6, int param7); +UnkStruct_02009DC8 *sub_02009B04(UnkStruct_02009714 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6, int param7); +UnkStruct_02009DC8 *sub_02009B64(UnkStruct_02009714 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6, int param7, int param8); +UnkStruct_02009DC8 *sub_02009BC4(UnkStruct_02009714 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6); +void sub_02009C14(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, NARC *param2, int param3, BOOL param4, int param5); +int sub_02009C80(UnkStruct_02009714 *param0, const UnkStruct_02009F38 *param1, UnkStruct_02009CFC *param2, int param3); +void sub_02009CB4(UnkStruct_02009714 *param0, const UnkStruct_02009F38 *param1, int param2, int param3, UnkStruct_02009CFC *param4, int param5); +UnkStruct_02009CFC *sub_02009CFC(int param0, int param1); +void sub_02009D20(UnkStruct_02009CFC *param0); +BOOL sub_02009D34(const UnkStruct_02009714 *param0, int param1); +void sub_02009D4C(UnkStruct_02009DC8 *param0); +void sub_02009D68(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1); +void sub_02009D9C(UnkStruct_02009714 *param0); +UnkStruct_02009DC8 *sub_02009DC8(const UnkStruct_02009714 *param0, int param1); +int sub_02009E08(const UnkStruct_02009DC8 *param0); +NNSG2dCharacterData *sub_02009E1C(const UnkStruct_02009DC8 *param0); +NNSG2dPaletteData *sub_02009E34(const UnkStruct_02009DC8 *param0); +NNSG2dCellDataBank *sub_02009E4C(const UnkStruct_02009DC8 *param0); +NNSG2dCellAnimBankData *sub_02009E64(const UnkStruct_02009DC8 *param0); +NNSG2dMultiCellDataBank *sub_02009E7C(const UnkStruct_02009DC8 *param0); +NNSG2dMultiCellAnimBankData *sub_02009E94(const UnkStruct_02009DC8 *param0); +int sub_02009EAC(const UnkStruct_02009DC8 *param0); +int sub_02009EBC(const UnkStruct_02009DC8 *param0); +int sub_02009EE8(const UnkStruct_02009DC8 *param0); +void sub_02009F08(UnkStruct_02009DC8 *param0, int param1); int sub_02009F34(void); -UnkStruct_02009F38 * sub_02009F38(UnkStruct_02009F38 * param0, int param1); -void sub_02009F40(const void * param0, UnkStruct_02009F38 * param1, int param2); -void sub_02009F8C(UnkStruct_02009F38 * param0); -int sub_02009FA4(const UnkStruct_02009F38 * param0); -int sub_02009FB4(const UnkStruct_02009F38 * param0, int param1); -int sub_02009FE8(const UnkStruct_02009F38 * param0, int param1); -int sub_0200A014(const UnkStruct_02009F38 * param0, int param1); -int sub_0200A040(const UnkStruct_02009F38 * param0, int param1); -int sub_0200A074(const UnkStruct_02009F38 * param0, int param1); +UnkStruct_02009F38 *sub_02009F38(UnkStruct_02009F38 *param0, int param1); +void sub_02009F40(const void *param0, UnkStruct_02009F38 *param1, int param2); +void sub_02009F8C(UnkStruct_02009F38 *param0); +int sub_02009FA4(const UnkStruct_02009F38 *param0); +int sub_02009FB4(const UnkStruct_02009F38 *param0, int param1); +int sub_02009FE8(const UnkStruct_02009F38 *param0, int param1); +int sub_0200A014(const UnkStruct_02009F38 *param0, int param1); +int sub_0200A040(const UnkStruct_02009F38 *param0, int param1); +int sub_0200A074(const UnkStruct_02009F38 *param0, int param1); #endif // POKEPLATINUM_UNK_02009714_H diff --git a/include/unk_0200A328.h b/include/unk_0200A328.h index 5ae2e9fe4d..dac85ae8e7 100644 --- a/include/unk_0200A328.h +++ b/include/unk_0200A328.h @@ -1,32 +1,32 @@ #ifndef POKEPLATINUM_UNK_0200A328_H #define POKEPLATINUM_UNK_0200A328_H -#include "struct_defs/struct_02009CFC.h" -#include "struct_decls/struct_02009DC8_decl.h" - #include -BOOL sub_0200A328(const UnkStruct_02009DC8 * param0); -void sub_0200A368(const UnkStruct_02009CFC * param0); -BOOL sub_0200A39C(const UnkStruct_02009DC8 * param0); -BOOL sub_0200A3DC(const UnkStruct_02009DC8 * param0); -void sub_0200A41C(const UnkStruct_02009CFC * param0); -BOOL sub_0200A450(const UnkStruct_02009DC8 * param0); -void sub_0200A490(const UnkStruct_02009DC8 * param0, const UnkStruct_02009DC8 * param1); -void sub_0200A4C0(const UnkStruct_02009DC8 * param0); -void sub_0200A4E4(UnkStruct_02009DC8 * param0); -void sub_0200A508(UnkStruct_02009CFC * param0); -NNSG2dImageProxy * sub_0200A534(const UnkStruct_02009DC8 * param0); -NNSG2dImageProxy * sub_0200A558(const UnkStruct_02009DC8 * param0, const UnkStruct_02009DC8 * param1); -void sub_0200A5B4(const NNSG2dImageProxy * param0); -BOOL sub_0200A5C8(const UnkStruct_02009DC8 * param0); -void sub_0200A60C(const UnkStruct_02009CFC * param0); -BOOL sub_0200A640(const UnkStruct_02009DC8 * param0); -void sub_0200A684(const UnkStruct_02009CFC * param0); -void sub_0200A6B8(const UnkStruct_02009DC8 * param0); -void sub_0200A6DC(UnkStruct_02009DC8 * param0); -void sub_0200A700(UnkStruct_02009CFC * param0); -const NNSG2dImagePaletteProxy * sub_0200A72C(const UnkStruct_02009DC8 * param0, NNSG2dImageProxy * param1); -u32 sub_0200A760(const UnkStruct_02009DC8 * param0, NNS_G2D_VRAM_TYPE param1); +#include "struct_decls/struct_02009DC8_decl.h" +#include "struct_defs/struct_02009CFC.h" + +BOOL sub_0200A328(const UnkStruct_02009DC8 *param0); +void sub_0200A368(const UnkStruct_02009CFC *param0); +BOOL sub_0200A39C(const UnkStruct_02009DC8 *param0); +BOOL sub_0200A3DC(const UnkStruct_02009DC8 *param0); +void sub_0200A41C(const UnkStruct_02009CFC *param0); +BOOL sub_0200A450(const UnkStruct_02009DC8 *param0); +void sub_0200A490(const UnkStruct_02009DC8 *param0, const UnkStruct_02009DC8 *param1); +void sub_0200A4C0(const UnkStruct_02009DC8 *param0); +void sub_0200A4E4(UnkStruct_02009DC8 *param0); +void sub_0200A508(UnkStruct_02009CFC *param0); +NNSG2dImageProxy *sub_0200A534(const UnkStruct_02009DC8 *param0); +NNSG2dImageProxy *sub_0200A558(const UnkStruct_02009DC8 *param0, const UnkStruct_02009DC8 *param1); +void sub_0200A5B4(const NNSG2dImageProxy *param0); +BOOL sub_0200A5C8(const UnkStruct_02009DC8 *param0); +void sub_0200A60C(const UnkStruct_02009CFC *param0); +BOOL sub_0200A640(const UnkStruct_02009DC8 *param0); +void sub_0200A684(const UnkStruct_02009CFC *param0); +void sub_0200A6B8(const UnkStruct_02009DC8 *param0); +void sub_0200A6DC(UnkStruct_02009DC8 *param0); +void sub_0200A700(UnkStruct_02009CFC *param0); +const NNSG2dImagePaletteProxy *sub_0200A72C(const UnkStruct_02009DC8 *param0, NNSG2dImageProxy *param1); +u32 sub_0200A760(const UnkStruct_02009DC8 *param0, NNS_G2D_VRAM_TYPE param1); #endif // POKEPLATINUM_UNK_0200A328_H diff --git a/include/unk_0200A784.h b/include/unk_0200A784.h index 6ce6e8c31d..4225900d25 100644 --- a/include/unk_0200A784.h +++ b/include/unk_0200A784.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_UNK_0200A784_H #define POKEPLATINUM_UNK_0200A784_H - #include void sub_0200A784(int param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); void sub_0200A858(void); void sub_0200A878(void); -void sub_0200A8B0(NNSG2dRenderSurface * param0, NNSG2dViewRect * param1, NNSG2dSurfaceType param2, NNSG2dRendererInstance * param3); -NNSG2dOamManagerInstance * sub_0200A914(int param0); +void sub_0200A8B0(NNSG2dRenderSurface *param0, NNSG2dViewRect *param1, NNSG2dSurfaceType param2, NNSG2dRendererInstance *param3); +NNSG2dOamManagerInstance *sub_0200A914(int param0); void sub_0200A93C(int param0); void sub_0200A944(int param0); diff --git a/include/unk_0200C440.h b/include/unk_0200C440.h index c471328912..2d2fd81bfe 100644 --- a/include/unk_0200C440.h +++ b/include/unk_0200C440.h @@ -4,11 +4,11 @@ #include "struct_decls/struct_0200C440_decl.h" #include "struct_defs/struct_0205AA50.h" -UnkStruct_0200C440 * sub_0200C440(u32 param0, u32 param1, u32 param2, u32 param3); -void sub_0200C560(UnkStruct_0200C440 * param0); -void sub_0200C578(UnkStruct_0200C440 * param0, int param1, Window * param2, u32 param3, u32 param4); -void sub_0200C5BC(UnkStruct_0200C440 * param0, s32 param1, u32 param2, int param3, Window * param4, u32 param5, u32 param6); -void sub_0200C648(UnkStruct_0200C440 * param0, int param1, s32 param2, u32 param3, int param4, Window * param5, u32 param6, u32 param7); -void sub_0200C67C(UnkStruct_0200C440 * param0, s32 param1, u32 param2, int param3, void * param4); +UnkStruct_0200C440 *sub_0200C440(u32 param0, u32 param1, u32 param2, u32 param3); +void sub_0200C560(UnkStruct_0200C440 *param0); +void sub_0200C578(UnkStruct_0200C440 *param0, int param1, Window *param2, u32 param3, u32 param4); +void sub_0200C5BC(UnkStruct_0200C440 *param0, s32 param1, u32 param2, int param3, Window *param4, u32 param5, u32 param6); +void sub_0200C648(UnkStruct_0200C440 *param0, int param1, s32 param2, u32 param3, int param4, Window *param5, u32 param6, u32 param7); +void sub_0200C67C(UnkStruct_0200C440 *param0, s32 param1, u32 param2, int param3, void *param4); #endif // POKEPLATINUM_UNK_0200C440_H diff --git a/include/unk_0200C6E4.h b/include/unk_0200C6E4.h index 106782a4e5..ba8d818474 100644 --- a/include/unk_0200C6E4.h +++ b/include/unk_0200C6E4.h @@ -1,139 +1,140 @@ #ifndef POKEPLATINUM_UNK_0200C6E4_H #define POKEPLATINUM_UNK_0200C6E4_H +#include +#include + #include "constants/palette.h" +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_defs/struct_0200C738.h" -#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" +#include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200C738.h" + #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" -#include -#include - -SpriteRenderer * sub_0200C6E4(int param0); -SpriteGfxHandler * sub_0200C704(SpriteRenderer * param0); -UnkStruct_0200C738 * sub_0200C738(SpriteRenderer * param0); -BOOL sub_0200C73C(SpriteRenderer * param0, const UnkStruct_ov104_0224133C * param1, const UnkStruct_ov104_022412F4 * param2, int param3); -BOOL sub_0200C7C0(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2); -void sub_0200C7E4(GraphicElementData * param0); -void sub_0200C7EC(SpriteGfxHandler * param0); +SpriteRenderer *sub_0200C6E4(int param0); +SpriteGfxHandler *sub_0200C704(SpriteRenderer *param0); +UnkStruct_0200C738 *sub_0200C738(SpriteRenderer *param0); +BOOL sub_0200C73C(SpriteRenderer *param0, const UnkStruct_ov104_0224133C *param1, const UnkStruct_ov104_022412F4 *param2, int param3); +BOOL sub_0200C7C0(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2); +void sub_0200C7E4(GraphicElementData *param0); +void sub_0200C7EC(SpriteGfxHandler *param0); void sub_0200C800(void); void sub_0200C808(void); -void sub_0200C810(SpriteGfxHandler * param0); -void sub_0200C81C(SpriteGfxHandler * param0); -void sub_0200C82C(SpriteGfxHandler * param0); -void sub_0200C880(SpriteRenderer * param0); -void sub_0200C8A0(SpriteRenderer * param0, SpriteGfxHandler * param1); -void sub_0200C8B0(SpriteRenderer * param0, SpriteGfxHandler * param1); -void sub_0200C8D4(SpriteRenderer * param0); -BOOL sub_0200C8F0(SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F2EC * param2); -GraphicElementData * sub_0200CA08(SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F358 * param2); -GraphicElementData * sub_0200CA44(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, s16 param3, s16 param4, s16 param5, u16 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13); -BOOL sub_0200CB30(SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov104_02241308 * param2); -BOOL sub_0200CBDC(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6); +void sub_0200C810(SpriteGfxHandler *param0); +void sub_0200C81C(SpriteGfxHandler *param0); +void sub_0200C82C(SpriteGfxHandler *param0); +void sub_0200C880(SpriteRenderer *param0); +void sub_0200C8A0(SpriteRenderer *param0, SpriteGfxHandler *param1); +void sub_0200C8B0(SpriteRenderer *param0, SpriteGfxHandler *param1); +void sub_0200C8D4(SpriteRenderer *param0); +BOOL sub_0200C8F0(SpriteRenderer *param0, SpriteGfxHandler *param1, const UnkStruct_ov7_0224F2EC *param2); +GraphicElementData *sub_0200CA08(SpriteRenderer *param0, SpriteGfxHandler *param1, const UnkStruct_ov7_0224F358 *param2); +GraphicElementData *sub_0200CA44(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, s16 param3, s16 param4, s16 param5, u16 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13); +BOOL sub_0200CB30(SpriteRenderer *param0, SpriteGfxHandler *param1, const UnkStruct_ov104_02241308 *param2); +BOOL sub_0200CBDC(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, BOOL param4, int param5, int param6); BOOL SpriteRenderer_LoadCharResObjFromOpenNarc(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, int fileID, BOOL compressed, int vram, int resID); -s8 sub_0200CC9C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5, int param6, int param7); -s8 sub_0200CD0C(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, int param4, int param5, int param6, int param7); -u8 sub_0200CD7C(PaletteData * param0, int param1, SpriteRenderer * param2, SpriteGfxHandler * param3, int param4, int param5, int param6, int param7, int param8, int param9); +s8 sub_0200CC9C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, int param4, int param5, int param6, int param7); +s8 sub_0200CD0C(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, int param4, int param5, int param6, int param7); +u8 sub_0200CD7C(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, int param4, int param5, int param6, int param7, int param8, int param9); u8 SpriteRenderer_LoadPalette(PaletteData *palette, enum PaletteBufferId paletteBuffer, SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, int fileID, BOOL compressed, int palID, int vram, int resID); -BOOL sub_0200CE0C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5); +BOOL sub_0200CE0C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, int param4, int param5); BOOL SpriteRenderer_LoadCellResObjFromOpenNarc(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, int fileID, BOOL compressed, int resID); -BOOL sub_0200CE3C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5); +BOOL sub_0200CE3C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, int param4, int param5); BOOL SpriteRenderer_LoadAnimResObjFromOpenNarc(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, int fileID, BOOL compressed, int resID); -CellActorData * SpriteActor_LoadResources(SpriteRenderer * param0, SpriteGfxHandler * param1, const SpriteTemplate * param2); -const NNSG2dImagePaletteProxy * sub_0200D04C(SpriteGfxHandler * param0, int param1); -u32 sub_0200D05C(SpriteGfxHandler * param0, int param1, NNS_G2D_VRAM_TYPE param2); -BOOL SpriteGfxHandler_UnloadCharObjById(SpriteGfxHandler * param0, int param1); -BOOL SpriteGfxHandler_UnloadPlttObjById(SpriteGfxHandler * param0, int param1); -BOOL SpriteGfxHandler_UnloadCellObjById(SpriteGfxHandler * param0, int param1); -BOOL SpriteGfxHandler_UnloadAnimObjById(SpriteGfxHandler * param0, int param1); -void sub_0200D0B0(SpriteRenderer * param0, SpriteGfxHandler * param1); -void sub_0200D0F4(CellActorData * param0); -void SpriteActor_UpdateObject(GraphicElementData * param0); -void sub_0200D330(CellActorData * param0); -void sub_0200D33C(CellActorData * param0); -void sub_0200D34C(CellActorData * param0, fx32 param1); -u32 sub_0200D358(CellActorData * param0); -void sub_0200D364(CellActorData * param0, u32 param1); -void sub_0200D370(CellActorData * param0, u32 param1); -u32 sub_0200D37C(CellActorData * param0); -void sub_0200D388(GraphicElementData * param0, int param1); -void sub_0200D390(CellActorData * param0, int param1); -void sub_0200D39C(GraphicElementData * param0, fx32 param1); -void sub_0200D3A4(CellActorData * param0, fx32 param1); -BOOL sub_0200D3B0(GraphicElementData * param0); -BOOL sub_0200D3B8(CellActorData * param0); -void sub_0200D3C4(GraphicElementData * param0, u16 param1); -void sub_0200D3CC(CellActorData * param0, u16 param1); -u16 sub_0200D3D8(GraphicElementData * param0); -u16 sub_0200D3E0(CellActorData * param0); -void SpriteActor_DrawSprite(GraphicElementData * param0, int param1); -void SpriteActor_EnableObject(CellActorData * param0, int param1); -int sub_0200D400(GraphicElementData * param0); -int sub_0200D408(CellActorData * param0); -void sub_0200D414(GraphicElementData * param0, int param1); -void sub_0200D41C(CellActorData * param0, int param1); -void sub_0200D428(GraphicElementData * param0, int param1); -void sub_0200D430(CellActorData * param0, int param1); -int sub_0200D43C(CellActorData * param0); -void sub_0200D448(GraphicElementData * param0, int param1); -int sub_0200D454(CellActorData * param0); -void sub_0200D460(CellActorData * param0, int param1); -void sub_0200D46C(GraphicElementData * param0, int param1); -void sub_0200D474(CellActorData * param0, int param1); -u32 sub_0200D480(GraphicElementData * param0); -u32 sub_0200D488(CellActorData * param0); -void SpriteActor_SetPositionXY(GraphicElementData * param0, s16 param1, s16 param2); -void SpriteActor_SetSpritePositionXY(CellActorData * param0, s16 param1, s16 param2); -void sub_0200D4D0(GraphicElementData * param0, s16 param1, s16 param2, fx32 param3); -void sub_0200D500(CellActorData * param0, s16 param1, s16 param2, fx32 param3); -void sub_0200D50C(GraphicElementData * param0, s16 * param1, s16 * param2); -void SpriteActor_GetSpritePositionXY(CellActorData * param0, s16 * param1, s16 * param2); -void sub_0200D55C(GraphicElementData * param0, s16 * param1, s16 * param2, fx32 param3); -void sub_0200D5A0(CellActorData * param0, s16 * param1, s16 * param2, fx32 param3); -void sub_0200D5AC(GraphicElementData * param0, s16 param1, s16 param2); -void sub_0200D5DC(CellActorData * param0, s16 param1, s16 param2); -void sub_0200D5E8(CellActorData * param0, fx32 param1, fx32 param2); -void sub_0200D614(CellActorData * param0, fx32 param1, fx32 param2); -void sub_0200D638(CellActorData * param0, fx32 * param1, fx32 * param2); -void sub_0200D650(CellActorData * param0, fx32 param1, fx32 param2, fx32 param3); -void sub_0200D67C(CellActorData * param0, fx32 * param1, fx32 * param2, fx32 param3); -void sub_0200D69C(GraphicElementData * param0, int param1); -void sub_0200D6A4(CellActorData * param0, int param1); -void sub_0200D6B0(GraphicElementData * param0, f32 param1, f32 param2); -void sub_0200D6E8(CellActorData * param0, f32 param1, f32 param2); -void sub_0200D6F4(GraphicElementData * param0, f32 param1, f32 param2); -void sub_0200D74C(CellActorData * param0, f32 param1, f32 param2); -void sub_0200D758(GraphicElementData * param0, f32 * param1, f32 * param2); -void sub_0200D788(CellActorData * param0, f32 * param1, f32 * param2); -void sub_0200D794(GraphicElementData * param0, u16 param1); -void sub_0200D79C(CellActorData * param0, u16 param1); -void sub_0200D7A8(GraphicElementData * param0, s32 param1); -void sub_0200D7C0(CellActorData * param0, s32 param1); -void sub_0200D7CC(GraphicElementData * param0, int param1); -void sub_0200D7D4(CellActorData * param0, int param1); -void sub_0200D7E0(CellActorData * param0, s16 param1, s16 param2); -void sub_0200D7FC(CellActorData * param0, BOOL param1); -void sub_0200D808(GraphicElementData * param0, GXOamMode param1); -void SpriteActor_SetOAMMode(CellActorData * param0, GXOamMode param1); -u32 sub_0200D81C(CellActorData * param0); -BOOL sub_0200D828(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6); -BOOL sub_0200D888(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6); -BOOL sub_0200D8E8(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, BOOL param4, int param5, int param6); -void sub_0200D948(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5); -void sub_0200D97C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5); -GraphicElementManager * sub_0200D9B0(SpriteGfxHandler * param0); -void sub_0200D9B4(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, BOOL param4, int param5); +CellActorData *SpriteActor_LoadResources(SpriteRenderer *param0, SpriteGfxHandler *param1, const SpriteTemplate *param2); +const NNSG2dImagePaletteProxy *sub_0200D04C(SpriteGfxHandler *param0, int param1); +u32 sub_0200D05C(SpriteGfxHandler *param0, int param1, NNS_G2D_VRAM_TYPE param2); +BOOL SpriteGfxHandler_UnloadCharObjById(SpriteGfxHandler *param0, int param1); +BOOL SpriteGfxHandler_UnloadPlttObjById(SpriteGfxHandler *param0, int param1); +BOOL SpriteGfxHandler_UnloadCellObjById(SpriteGfxHandler *param0, int param1); +BOOL SpriteGfxHandler_UnloadAnimObjById(SpriteGfxHandler *param0, int param1); +void sub_0200D0B0(SpriteRenderer *param0, SpriteGfxHandler *param1); +void sub_0200D0F4(CellActorData *param0); +void SpriteActor_UpdateObject(GraphicElementData *param0); +void sub_0200D330(CellActorData *param0); +void sub_0200D33C(CellActorData *param0); +void sub_0200D34C(CellActorData *param0, fx32 param1); +u32 sub_0200D358(CellActorData *param0); +void sub_0200D364(CellActorData *param0, u32 param1); +void sub_0200D370(CellActorData *param0, u32 param1); +u32 sub_0200D37C(CellActorData *param0); +void sub_0200D388(GraphicElementData *param0, int param1); +void sub_0200D390(CellActorData *param0, int param1); +void sub_0200D39C(GraphicElementData *param0, fx32 param1); +void sub_0200D3A4(CellActorData *param0, fx32 param1); +BOOL sub_0200D3B0(GraphicElementData *param0); +BOOL sub_0200D3B8(CellActorData *param0); +void sub_0200D3C4(GraphicElementData *param0, u16 param1); +void sub_0200D3CC(CellActorData *param0, u16 param1); +u16 sub_0200D3D8(GraphicElementData *param0); +u16 sub_0200D3E0(CellActorData *param0); +void SpriteActor_DrawSprite(GraphicElementData *param0, int param1); +void SpriteActor_EnableObject(CellActorData *param0, int param1); +int sub_0200D400(GraphicElementData *param0); +int sub_0200D408(CellActorData *param0); +void sub_0200D414(GraphicElementData *param0, int param1); +void sub_0200D41C(CellActorData *param0, int param1); +void sub_0200D428(GraphicElementData *param0, int param1); +void sub_0200D430(CellActorData *param0, int param1); +int sub_0200D43C(CellActorData *param0); +void sub_0200D448(GraphicElementData *param0, int param1); +int sub_0200D454(CellActorData *param0); +void sub_0200D460(CellActorData *param0, int param1); +void sub_0200D46C(GraphicElementData *param0, int param1); +void sub_0200D474(CellActorData *param0, int param1); +u32 sub_0200D480(GraphicElementData *param0); +u32 sub_0200D488(CellActorData *param0); +void SpriteActor_SetPositionXY(GraphicElementData *param0, s16 param1, s16 param2); +void SpriteActor_SetSpritePositionXY(CellActorData *param0, s16 param1, s16 param2); +void sub_0200D4D0(GraphicElementData *param0, s16 param1, s16 param2, fx32 param3); +void sub_0200D500(CellActorData *param0, s16 param1, s16 param2, fx32 param3); +void sub_0200D50C(GraphicElementData *param0, s16 *param1, s16 *param2); +void SpriteActor_GetSpritePositionXY(CellActorData *param0, s16 *param1, s16 *param2); +void sub_0200D55C(GraphicElementData *param0, s16 *param1, s16 *param2, fx32 param3); +void sub_0200D5A0(CellActorData *param0, s16 *param1, s16 *param2, fx32 param3); +void sub_0200D5AC(GraphicElementData *param0, s16 param1, s16 param2); +void sub_0200D5DC(CellActorData *param0, s16 param1, s16 param2); +void sub_0200D5E8(CellActorData *param0, fx32 param1, fx32 param2); +void sub_0200D614(CellActorData *param0, fx32 param1, fx32 param2); +void sub_0200D638(CellActorData *param0, fx32 *param1, fx32 *param2); +void sub_0200D650(CellActorData *param0, fx32 param1, fx32 param2, fx32 param3); +void sub_0200D67C(CellActorData *param0, fx32 *param1, fx32 *param2, fx32 param3); +void sub_0200D69C(GraphicElementData *param0, int param1); +void sub_0200D6A4(CellActorData *param0, int param1); +void sub_0200D6B0(GraphicElementData *param0, f32 param1, f32 param2); +void sub_0200D6E8(CellActorData *param0, f32 param1, f32 param2); +void sub_0200D6F4(GraphicElementData *param0, f32 param1, f32 param2); +void sub_0200D74C(CellActorData *param0, f32 param1, f32 param2); +void sub_0200D758(GraphicElementData *param0, f32 *param1, f32 *param2); +void sub_0200D788(CellActorData *param0, f32 *param1, f32 *param2); +void sub_0200D794(GraphicElementData *param0, u16 param1); +void sub_0200D79C(CellActorData *param0, u16 param1); +void sub_0200D7A8(GraphicElementData *param0, s32 param1); +void sub_0200D7C0(CellActorData *param0, s32 param1); +void sub_0200D7CC(GraphicElementData *param0, int param1); +void sub_0200D7D4(CellActorData *param0, int param1); +void sub_0200D7E0(CellActorData *param0, s16 param1, s16 param2); +void sub_0200D7FC(CellActorData *param0, BOOL param1); +void sub_0200D808(GraphicElementData *param0, GXOamMode param1); +void SpriteActor_SetOAMMode(CellActorData *param0, GXOamMode param1); +u32 sub_0200D81C(CellActorData *param0); +BOOL sub_0200D828(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, BOOL param4, int param5, int param6); +BOOL sub_0200D888(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, BOOL param4, int param5, int param6); +BOOL sub_0200D8E8(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, BOOL param4, int param5, int param6); +void sub_0200D948(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, BOOL param4, int param5); +void sub_0200D97C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, BOOL param4, int param5); +GraphicElementManager *sub_0200D9B0(SpriteGfxHandler *param0); +void sub_0200D9B4(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, BOOL param4, int param5); #endif // POKEPLATINUM_UNK_0200C6E4_H diff --git a/include/unk_0200DA60.h b/include/unk_0200DA60.h index c8a4a95ee9..1d641ad6c0 100644 --- a/include/unk_0200DA60.h +++ b/include/unk_0200DA60.h @@ -3,29 +3,30 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" + #include "pokemon.h" -#define TEXT_WINDOW_SIZE 30 +#define TEXT_WINDOW_SIZE 30 -void Window_SetFrame(BGL * param0, u8 param1, u16 param2, u8 param3, u32 param4); +void Window_SetFrame(BGL *param0, u8 param1, u16 param2, u8 param3, u32 param4); u32 Window_FramePalette(void); -void sub_0200DAA4(BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); -void Window_Show(Window * param0, u8 param1, u16 param2, u8 param3); -void Window_Clear(Window * param0, u8 param1); +void sub_0200DAA4(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); +void Window_Show(Window *param0, u8 param1, u16 param2, u8 param3); +void Window_Clear(Window *param0, u8 param1); u32 sub_0200DD04(u32 param0); u32 sub_0200DD08(u32 param0); -void sub_0200DD0C(BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); -void sub_0200E010(Window * param0, u32 param1, u32 param2); -void sub_0200E060(Window * param0, u8 param1, u16 param2, u8 param3); -void sub_0200E084(Window * param0, u8 param1); -void sub_0200E218(BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); -void sub_0200E2A4(BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 param5, u32 param6); -void sub_0200E69C(Window * param0, u8 param1, u16 param2, u8 param3, u8 param4); -void sub_0200E744(Window * param0, u8 param1, u8 param2); -void * sub_0200E7FC(Window * param0, u32 param1); -void DeleteWaitDial(void * param0); -void sub_0200EBC8(void * param0); -u8 * sub_0200EBF0(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, u16 param6, u8 param7, int param8); -u8 * sub_0200EC48(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon * param6, int param7); +void sub_0200DD0C(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); +void sub_0200E010(Window *param0, u32 param1, u32 param2); +void sub_0200E060(Window *param0, u8 param1, u16 param2, u8 param3); +void sub_0200E084(Window *param0, u8 param1); +void sub_0200E218(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5); +void sub_0200E2A4(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 param5, u32 param6); +void sub_0200E69C(Window *param0, u8 param1, u16 param2, u8 param3, u8 param4); +void sub_0200E744(Window *param0, u8 param1, u8 param2); +void *sub_0200E7FC(Window *param0, u32 param1); +void DeleteWaitDial(void *param0); +void sub_0200EBC8(void *param0); +u8 *sub_0200EBF0(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, u16 param6, u8 param7, int param8); +u8 *sub_0200EC48(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon *param6, int param7); #endif // POKEPLATINUM_UNK_0200DA60_H diff --git a/include/unk_0200F174.h b/include/unk_0200F174.h index d42c7e5c88..64c42e5774 100644 --- a/include/unk_0200F174.h +++ b/include/unk_0200F174.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_UNK_0200F174_H #include "struct_defs/struct_0200F600.h" + #include "functypes/funcptr_0200F634.h" void sub_0200F174(int param0, int param1, int param2, u16 param3, int param4, int param5, int param6); @@ -15,10 +16,10 @@ void sub_0200F370(u16 param0); void sub_0200F3B0(int param0, u16 param1); void sub_0200F42C(u16 param0); void sub_0200F44C(int param0, int param1); -void sub_0200F634(UnkStruct_0200F600 * param0, void * param1, UnkFuncPtr_0200F634 param2, int param3); -void sub_0200F6AC(UnkStruct_0200F600 * param0, int param1); -void sub_0200F6D8(UnkStruct_0200F600 * param0, void * param1, UnkFuncPtr_0200F634 param2, int param3, int param4); -void sub_0200F704(UnkStruct_0200F600 * param0, int param1, int param2); -void sub_0200F764(void * param0); +void sub_0200F634(UnkStruct_0200F600 *param0, void *param1, UnkFuncPtr_0200F634 param2, int param3); +void sub_0200F6AC(UnkStruct_0200F600 *param0, int param1); +void sub_0200F6D8(UnkStruct_0200F600 *param0, void *param1, UnkFuncPtr_0200F634 param2, int param3, int param4); +void sub_0200F704(UnkStruct_0200F600 *param0, int param1, int param2); +void sub_0200F764(void *param0); #endif // POKEPLATINUM_UNK_0200F174_H diff --git a/include/unk_0200F85C.h b/include/unk_0200F85C.h index 61320698c3..b2063e262a 100644 --- a/include/unk_0200F85C.h +++ b/include/unk_0200F85C.h @@ -3,47 +3,47 @@ #include "struct_defs/struct_0200F7A0.h" -BOOL sub_0200F85C(UnkStruct_0200F7A0 * param0); -BOOL sub_0200F878(UnkStruct_0200F7A0 * param0); -BOOL sub_0200F898(UnkStruct_0200F7A0 * param0); -BOOL sub_0200F8D4(UnkStruct_0200F7A0 * param0); -BOOL sub_0200F90C(UnkStruct_0200F7A0 * param0); -BOOL sub_0200F948(UnkStruct_0200F7A0 * param0); -BOOL sub_0200F980(UnkStruct_0200F7A0 * param0); -BOOL sub_0200F9AC(UnkStruct_0200F7A0 * param0); -BOOL sub_0200F9D8(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FA14(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FA4C(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FA88(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FAC0(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FAEC(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FB18(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FB4C(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FB7C(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FBA8(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FBD4(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FC00(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FC2C(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FC58(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FC84(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FCB0(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FCDC(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FD08(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FD34(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FD60(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FD8C(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FDE0(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FE30(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FE6C(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FEA4(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FEEC(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FF30(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FF78(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FFBC(UnkStruct_0200F7A0 * param0); -BOOL sub_0200FFE8(UnkStruct_0200F7A0 * param0); -BOOL sub_02010014(UnkStruct_0200F7A0 * param0); -BOOL sub_02010040(UnkStruct_0200F7A0 * param0); -BOOL sub_0201006C(UnkStruct_0200F7A0 * param0); -BOOL sub_020100A8(UnkStruct_0200F7A0 * param0); +BOOL sub_0200F85C(UnkStruct_0200F7A0 *param0); +BOOL sub_0200F878(UnkStruct_0200F7A0 *param0); +BOOL sub_0200F898(UnkStruct_0200F7A0 *param0); +BOOL sub_0200F8D4(UnkStruct_0200F7A0 *param0); +BOOL sub_0200F90C(UnkStruct_0200F7A0 *param0); +BOOL sub_0200F948(UnkStruct_0200F7A0 *param0); +BOOL sub_0200F980(UnkStruct_0200F7A0 *param0); +BOOL sub_0200F9AC(UnkStruct_0200F7A0 *param0); +BOOL sub_0200F9D8(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FA14(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FA4C(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FA88(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FAC0(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FAEC(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FB18(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FB4C(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FB7C(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FBA8(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FBD4(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FC00(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FC2C(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FC58(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FC84(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FCB0(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FCDC(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FD08(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FD34(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FD60(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FD8C(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FDE0(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FE30(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FE6C(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FEA4(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FEEC(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FF30(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FF78(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FFBC(UnkStruct_0200F7A0 *param0); +BOOL sub_0200FFE8(UnkStruct_0200F7A0 *param0); +BOOL sub_02010014(UnkStruct_0200F7A0 *param0); +BOOL sub_02010040(UnkStruct_0200F7A0 *param0); +BOOL sub_0201006C(UnkStruct_0200F7A0 *param0); +BOOL sub_020100A8(UnkStruct_0200F7A0 *param0); #endif // POKEPLATINUM_UNK_0200F85C_H diff --git a/include/unk_02012480.h b/include/unk_02012480.h index 85b514b0bd..5b5c3441a6 100644 --- a/include/unk_02012480.h +++ b/include/unk_02012480.h @@ -7,9 +7,9 @@ void sub_02012480(int param0, int param1); void sub_020124AC(int param0, BOOL param1, int param2, int param3); void sub_02012534(int param0, BOOL param1, int param2); void sub_02012574(int param0, int param1, int param2, int param3, int param4, int param5); -void sub_02012634(UnkStruct_02010658 * param0, int param1, int param2); -void sub_02012650(UnkStruct_02010658 * param0, int param1, BOOL param2, int param3, int param4); -void sub_02012678(UnkStruct_02010658 * param0, int param1, BOOL param2, int param3); -void sub_02012698(UnkStruct_02010658 * param0, int param1, int param2, int param3, int param4, int param5, int param6); +void sub_02012634(UnkStruct_02010658 *param0, int param1, int param2); +void sub_02012650(UnkStruct_02010658 *param0, int param1, BOOL param2, int param3, int param4); +void sub_02012678(UnkStruct_02010658 *param0, int param1, BOOL param2, int param3); +void sub_02012698(UnkStruct_02010658 *param0, int param1, int param2, int param3, int param4, int param5, int param6); #endif // POKEPLATINUM_UNK_02012480_H diff --git a/include/unk_02012744.h b/include/unk_02012744.h index 9a174e94eb..7082ca19a2 100644 --- a/include/unk_02012744.h +++ b/include/unk_02012744.h @@ -1,37 +1,37 @@ #ifndef POKEPLATINUM_UNK_02012744_H #define POKEPLATINUM_UNK_02012744_H +#include + +#include "struct_decls/font_oam.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_defs/struct_020127E8.h" #include "struct_decls/struct_02012B20_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02022550_decl.h" +#include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_0205AA50.h" -#include - -UnkStruct_02012744 * sub_02012744(int param0, int param1); -void sub_020127BC(UnkStruct_02012744 * param0); -FontOAM * sub_020127E8(const UnkStruct_020127E8 * param0); -void sub_02012870(FontOAM * param0); -int sub_02012898(const Window * param0, int param1, int param2); -void sub_020128C4(FontOAM * param0, int param1, int param2); -void sub_02012938(FontOAM * param0); -void sub_020129A4(const FontOAM * param0, int * param1, int * param2); -void sub_020129D0(FontOAM * param0, BOOL param1); -void sub_02012A00(FontOAM * param0, u8 param1); -void sub_02012A30(FontOAM * param0, u32 param1); -void sub_02012A60(FontOAM * param0, u32 param1); -void sub_02012A90(FontOAM * param0, u32 param1); -void sub_02012AC0(FontOAM * param0, u32 param1); -void sub_02012AF0(FontOAM * param0, GXOamMode param1); -UnkStruct_02012B20 * sub_02012B20(const Window * param0, int param1); -void sub_02012B48(UnkStruct_02012B20 * param0); -int sub_02012B58(const UnkStruct_02012B20 * param0, int param1); -FontOAM * sub_02012B60(const UnkStruct_020127E8 * param0, const UnkStruct_02012B20 * param1); -void sub_02012BD8(FontOAM * param0); -void sub_02012BE0(FontOAM * param0, const UnkStruct_02012B20 * param1, const Window * param2, int param3); -void sub_02012C60(const Window * param0, int param1, int param2, int param3, int param4, char * param5); -void sub_020131E0(FontOAM * param0, const GraphicElementData * param1); +UnkStruct_02012744 *sub_02012744(int param0, int param1); +void sub_020127BC(UnkStruct_02012744 *param0); +FontOAM *sub_020127E8(const UnkStruct_020127E8 *param0); +void sub_02012870(FontOAM *param0); +int sub_02012898(const Window *param0, int param1, int param2); +void sub_020128C4(FontOAM *param0, int param1, int param2); +void sub_02012938(FontOAM *param0); +void sub_020129A4(const FontOAM *param0, int *param1, int *param2); +void sub_020129D0(FontOAM *param0, BOOL param1); +void sub_02012A00(FontOAM *param0, u8 param1); +void sub_02012A30(FontOAM *param0, u32 param1); +void sub_02012A60(FontOAM *param0, u32 param1); +void sub_02012A90(FontOAM *param0, u32 param1); +void sub_02012AC0(FontOAM *param0, u32 param1); +void sub_02012AF0(FontOAM *param0, GXOamMode param1); +UnkStruct_02012B20 *sub_02012B20(const Window *param0, int param1); +void sub_02012B48(UnkStruct_02012B20 *param0); +int sub_02012B58(const UnkStruct_02012B20 *param0, int param1); +FontOAM *sub_02012B60(const UnkStruct_020127E8 *param0, const UnkStruct_02012B20 *param1); +void sub_02012BD8(FontOAM *param0); +void sub_02012BE0(FontOAM *param0, const UnkStruct_02012B20 *param1, const Window *param2, int param3); +void sub_02012C60(const Window *param0, int param1, int param2, int param3, int param4, char *param5); +void sub_020131E0(FontOAM *param0, const GraphicElementData *param1); #endif // POKEPLATINUM_UNK_02012744_H diff --git a/include/unk_020131EC.h b/include/unk_020131EC.h index 2d5ed455bf..60758f2534 100644 --- a/include/unk_020131EC.h +++ b/include/unk_020131EC.h @@ -3,17 +3,17 @@ #include "struct_defs/struct_02013610.h" -void sub_020133D4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void * param7); -void * sub_020134A8(int param0, int param1, int param2, int param3, int param4, int param5, int param6); -void sub_020134E4(int param0, int param1, int param2, int param3, int param4, int param5, int * param6, const void * param7, void * param8); -void sub_02013560(int param0, int param1, const UnkStruct_02013610 * param2, int * param3, const void * param4, void * param5); -void sub_02013584(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void * param7); -void sub_020135F0(int param0, int param1, int param2, const UnkStruct_02013610 * param3, void * param4); -void sub_02013610(int param0, int param1, int param2, void * param3); -void * sub_0201363C(int param0, int param1, int param2); -void * sub_02013660(int param0, int param1, int param2); -void sub_020136A4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void * param7, u32 param8, BOOL param9, int param10, int param11); -void sub_02013720(int param0, int param1, int param2, const UnkStruct_02013610 * param3, void * param4, u32 param5, BOOL param6, int param7, int param8); -void sub_02013750(int param0, int param1, int param2, void * param3, u32 param4, BOOL param5, int param6, int param7); +void sub_020133D4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7); +void *sub_020134A8(int param0, int param1, int param2, int param3, int param4, int param5, int param6); +void sub_020134E4(int param0, int param1, int param2, int param3, int param4, int param5, int *param6, const void *param7, void *param8); +void sub_02013560(int param0, int param1, const UnkStruct_02013610 *param2, int *param3, const void *param4, void *param5); +void sub_02013584(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7); +void sub_020135F0(int param0, int param1, int param2, const UnkStruct_02013610 *param3, void *param4); +void sub_02013610(int param0, int param1, int param2, void *param3); +void *sub_0201363C(int param0, int param1, int param2); +void *sub_02013660(int param0, int param1, int param2); +void sub_020136A4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11); +void sub_02013720(int param0, int param1, int param2, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8); +void sub_02013750(int param0, int param1, int param2, void *param3, u32 param4, BOOL param5, int param6, int param7); #endif // POKEPLATINUM_UNK_020131EC_H diff --git a/include/unk_02013A04.h b/include/unk_02013A04.h index 9a8387e498..e76b1d416b 100644 --- a/include/unk_02013A04.h +++ b/include/unk_02013A04.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_UNK_02013A04_H #define POKEPLATINUM_UNK_02013A04_H -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" + +#include "message.h" #include "strbuf.h" -ResourceMetadata * sub_02013A04(u32 param0, u32 param1); -void sub_02013A3C(ResourceMetadata * param0); -void sub_02013A4C(ResourceMetadata * param0, const MessageLoader * param1, u32 param2, u32 param3); -void sub_02013A6C(ResourceMetadata * param0, const Strbuf *param1, u32 param2); -void sub_02013A90(ResourceMetadata * param0, const ResourceMetadata * param1); -void sub_02013AE8(ResourceMetadata * param0); +ResourceMetadata *sub_02013A04(u32 param0, u32 param1); +void sub_02013A3C(ResourceMetadata *param0); +void sub_02013A4C(ResourceMetadata *param0, const MessageLoader *param1, u32 param2, u32 param3); +void sub_02013A6C(ResourceMetadata *param0, const Strbuf *param1, u32 param2); +void sub_02013A90(ResourceMetadata *param0, const ResourceMetadata *param1); +void sub_02013AE8(ResourceMetadata *param0); #endif // POKEPLATINUM_UNK_02013A04_H diff --git a/include/unk_02014000.h b/include/unk_02014000.h index a89a91dd08..30b672d09b 100644 --- a/include/unk_02014000.h +++ b/include/unk_02014000.h @@ -1,55 +1,57 @@ #ifndef POKEPLATINUM_UNK_02014000_H #define POKEPLATINUM_UNK_02014000_H -#include "functypes/funcptr_02014014.h" +#include +#include + #include "struct_decls/struct_02014014_decl.h" + +#include "functypes/funcptr_02014014.h" #include "functypes/funcptr_020146F4.h" -#include "camera.h" +#include "camera.h" #include "spl.h" -#include -#include void sub_02014000(void); -UnkStruct_02014014 * sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 param1, void * param2, int param3, int param4, int param5); -void sub_0201411C(UnkStruct_02014014 * param0); +UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 param1, void *param2, int param3, int param4, int param5); +void sub_0201411C(UnkStruct_02014014 *param0); void sub_020141E4(void); -void * sub_020144C4(int param0, int param1, int param2); -void sub_020144CC(UnkStruct_02014014 * param0, void * param1, int param2, int param3); +void *sub_020144C4(int param0, int param1, int param2); +void sub_020144CC(UnkStruct_02014014 *param0, void *param1, int param2, int param3); void sub_020145B4(NNSGfdTexKey param0); void sub_020145F4(NNSGfdPlttKey param0); -void sub_02014638(UnkStruct_02014014 * param0); -void sub_02014674(UnkStruct_02014014 * param0); +void sub_02014638(UnkStruct_02014014 *param0); +void sub_02014674(UnkStruct_02014014 *param0); int sub_02014680(void); int sub_0201469C(void); int sub_020146C0(void); -UnkSPLStruct6 * sub_020146E4(UnkStruct_02014014 * param0, int param1, const VecFx32 * param2); -UnkSPLStruct6 * sub_020146F4(UnkStruct_02014014 * param0, int param1, UnkFuncPtr_020146F4 param2, void * param3); -s32 sub_02014710(UnkStruct_02014014 * param0); -void sub_02014718(UnkStruct_02014014 * param0); -void sub_02014724(UnkStruct_02014014 * param0, UnkSPLStruct6 * param1); -void * sub_02014730(UnkStruct_02014014 * param0); -void sub_02014734(UnkStruct_02014014 * param0, VecFx32 * param1); -void sub_02014744(UnkStruct_02014014 * param0, const VecFx32 * param1); -void * sub_02014764(void); -void sub_02014770(VecFx32 * param0); -Camera * sub_02014784(UnkStruct_02014014 * param0); -void sub_02014788(UnkStruct_02014014 * param0, int param1); -u8 sub_02014790(UnkStruct_02014014 * param0); -void sub_02014798(UnkSPLStruct6 * param0, VecFx16 * param1); -void sub_020147B0(UnkSPLStruct6 * param0, fx32 param1); -void sub_02014874(UnkSPLStruct6 * param0, VecFx16 * param1); -void sub_02014890(UnkSPLStruct6 * param0, VecFx32 * param1); -void sub_020148A8(UnkSPLStruct6 * param0, VecFx32 * param1); -void sub_020148DC(UnkSPLStruct6 * param0, fx16 * param1); -void sub_020148F4(UnkSPLStruct6 * param0, fx16 * param1); -void sub_02014910(UnkSPLStruct6 * param0, u16 * param1); -void sub_02014924(UnkSPLStruct6 * param0, u16 * param1); -void sub_02014940(UnkSPLStruct6 * param0, u16 * param1); -void sub_02014954(UnkSPLStruct6 * param0, u16 * param1); -void sub_02014970(UnkSPLStruct6 * param0, VecFx32 * param1); -void sub_02014988(UnkSPLStruct6 * param0, VecFx32 * param1); -void sub_020149BC(UnkSPLStruct6 * param0, fx16 * param1); -void sub_020149D4(UnkSPLStruct6 * param0, fx16 * param1); +UnkSPLStruct6 *sub_020146E4(UnkStruct_02014014 *param0, int param1, const VecFx32 *param2); +UnkSPLStruct6 *sub_020146F4(UnkStruct_02014014 *param0, int param1, UnkFuncPtr_020146F4 param2, void *param3); +s32 sub_02014710(UnkStruct_02014014 *param0); +void sub_02014718(UnkStruct_02014014 *param0); +void sub_02014724(UnkStruct_02014014 *param0, UnkSPLStruct6 *param1); +void *sub_02014730(UnkStruct_02014014 *param0); +void sub_02014734(UnkStruct_02014014 *param0, VecFx32 *param1); +void sub_02014744(UnkStruct_02014014 *param0, const VecFx32 *param1); +void *sub_02014764(void); +void sub_02014770(VecFx32 *param0); +Camera *sub_02014784(UnkStruct_02014014 *param0); +void sub_02014788(UnkStruct_02014014 *param0, int param1); +u8 sub_02014790(UnkStruct_02014014 *param0); +void sub_02014798(UnkSPLStruct6 *param0, VecFx16 *param1); +void sub_020147B0(UnkSPLStruct6 *param0, fx32 param1); +void sub_02014874(UnkSPLStruct6 *param0, VecFx16 *param1); +void sub_02014890(UnkSPLStruct6 *param0, VecFx32 *param1); +void sub_020148A8(UnkSPLStruct6 *param0, VecFx32 *param1); +void sub_020148DC(UnkSPLStruct6 *param0, fx16 *param1); +void sub_020148F4(UnkSPLStruct6 *param0, fx16 *param1); +void sub_02014910(UnkSPLStruct6 *param0, u16 *param1); +void sub_02014924(UnkSPLStruct6 *param0, u16 *param1); +void sub_02014940(UnkSPLStruct6 *param0, u16 *param1); +void sub_02014954(UnkSPLStruct6 *param0, u16 *param1); +void sub_02014970(UnkSPLStruct6 *param0, VecFx32 *param1); +void sub_02014988(UnkSPLStruct6 *param0, VecFx32 *param1); +void sub_020149BC(UnkSPLStruct6 *param0, fx16 *param1); +void sub_020149D4(UnkSPLStruct6 *param0, fx16 *param1); #endif // POKEPLATINUM_UNK_02014000_H diff --git a/include/unk_020149F0.h b/include/unk_020149F0.h index 52a08ed670..9e98946d86 100644 --- a/include/unk_020149F0.h +++ b/include/unk_020149F0.h @@ -4,9 +4,9 @@ #include "struct_decls/struct_020149F0_decl.h" #include "struct_defs/struct_0205AA50.h" -UnkStruct_020149F0 * sub_020149F0(u32 param0); -void sub_02014A20(UnkStruct_020149F0 * param0); -void sub_02014A40(UnkStruct_020149F0 * param0, u32 param1); -void sub_02014A58(const UnkStruct_020149F0 * param0, Window * param1, u32 param2, u32 param3); +UnkStruct_020149F0 *sub_020149F0(u32 param0); +void sub_02014A20(UnkStruct_020149F0 *param0); +void sub_02014A40(UnkStruct_020149F0 *param0, u32 param1); +void sub_02014A58(const UnkStruct_020149F0 *param0, Window *param1, u32 param2, u32 param3); #endif // POKEPLATINUM_UNK_020149F0_H diff --git a/include/unk_02014A84.h b/include/unk_02014A84.h index a0ada9a0c5..18acebd8c9 100644 --- a/include/unk_02014A84.h +++ b/include/unk_02014A84.h @@ -2,24 +2,25 @@ #define POKEPLATINUM_UNK_02014A84_H #include "struct_defs/sentence.h" + #include "strbuf.h" -void sub_02014A84(Sentence * param0); -void sub_02014A9C(Sentence * param0, u32 param1); -void sub_02014AB4(Sentence * param0); -void sub_02014AC4(Sentence * param0, int param1); -Strbuf* sub_02014B34(const Sentence * param0, u32 param1); -Strbuf* sub_02014BA0(const Sentence * param0, u32 param1); -BOOL sub_02014BBC(const Sentence * param0); -BOOL sub_02014BD0(const Sentence * param0); -u16 sub_02014C78(const Sentence * param0, int param1); -u32 sub_02014C80(const Sentence * param0); -u32 sub_02014C84(const Sentence * param0); -BOOL sub_02014C88(const Sentence * param0, const Sentence * param1); -void sub_02014CC0(Sentence * param0, const Sentence * param1); +void sub_02014A84(Sentence *param0); +void sub_02014A9C(Sentence *param0, u32 param1); +void sub_02014AB4(Sentence *param0); +void sub_02014AC4(Sentence *param0, int param1); +Strbuf *sub_02014B34(const Sentence *param0, u32 param1); +Strbuf *sub_02014BA0(const Sentence *param0, u32 param1); +BOOL sub_02014BBC(const Sentence *param0); +BOOL sub_02014BD0(const Sentence *param0); +u16 sub_02014C78(const Sentence *param0, int param1); +u32 sub_02014C80(const Sentence *param0); +u32 sub_02014C84(const Sentence *param0); +BOOL sub_02014C88(const Sentence *param0, const Sentence *param1); +void sub_02014CC0(Sentence *param0, const Sentence *param1); u32 sub_02014CD4(u32 param0); -void sub_02014CE0(Sentence * param0, u32 param1, u32 param2); -void sub_02014CF8(Sentence * param0, u32 param1, u16 param2); -void sub_02014D10(Sentence * param0); +void sub_02014CE0(Sentence *param0, u32 param1, u32 param2); +void sub_02014CF8(Sentence *param0, u32 param1, u16 param2); +void sub_02014D10(Sentence *param0); #endif // POKEPLATINUM_UNK_02014A84_H diff --git a/include/unk_02014D38.h b/include/unk_02014D38.h index 9cef362a07..9c36a068a8 100644 --- a/include/unk_02014D38.h +++ b/include/unk_02014D38.h @@ -4,28 +4,29 @@ #include "struct_decls/struct_02014D38_decl.h" #include "struct_decls/struct_02014EC4_decl.h" #include "struct_decls/struct_02014FB0_decl.h" -#include "strbuf.h" + #include "savedata.h" +#include "strbuf.h" -UnkStruct_02014D38 * sub_02014D38(u32 param0); -void sub_02014D70(UnkStruct_02014D38 * param0); -void sub_02014D90(UnkStruct_02014D38 * param0, u16 param1, Strbuf *param2); +UnkStruct_02014D38 *sub_02014D38(u32 param0); +void sub_02014D70(UnkStruct_02014D38 *param0); +void sub_02014D90(UnkStruct_02014D38 *param0, u16 param1, Strbuf *param2); void sub_02014DB8(u16 param0, Strbuf *param1); -u16 sub_02014DFC(u32 param0, u32 param1); -BOOL sub_02014E4C(u16 param0, u32 * param1, u32 * param2); +u16 sub_02014DFC(u32 param0, u32 param1); +BOOL sub_02014E4C(u16 param0, u32 *param1, u32 *param2); u32 Sentence_SaveSize(void); -void Sentence_Init(void * param0); -UnkStruct_02014EC4 * sub_02014EC4(SaveData * param0); -BOOL sub_02014ED8(const UnkStruct_02014EC4 * param0, u32 param1); -u32 sub_02014EE4(UnkStruct_02014EC4 * param0); -BOOL sub_02014F48(UnkStruct_02014EC4 * param0); -u16 sub_02014F64(u32 param0); -BOOL sub_02014F8C(const UnkStruct_02014EC4 * param0, int param1); -void sub_02014F98(UnkStruct_02014EC4 * param0, int param1); -UnkStruct_02014FB0 * sub_02014FB0(u32 param0); -void sub_02014FF0(UnkStruct_02014FB0 * param0); -u32 sub_02015004(const UnkStruct_02014FB0 * param0); -u16 sub_02015008(const UnkStruct_02014FB0 * param0, u32 param1); -s16 sub_02015030(const UnkStruct_02014FB0 * param0, u16 param1); +void Sentence_Init(void *param0); +UnkStruct_02014EC4 *sub_02014EC4(SaveData *param0); +BOOL sub_02014ED8(const UnkStruct_02014EC4 *param0, u32 param1); +u32 sub_02014EE4(UnkStruct_02014EC4 *param0); +BOOL sub_02014F48(UnkStruct_02014EC4 *param0); +u16 sub_02014F64(u32 param0); +BOOL sub_02014F8C(const UnkStruct_02014EC4 *param0, int param1); +void sub_02014F98(UnkStruct_02014EC4 *param0, int param1); +UnkStruct_02014FB0 *sub_02014FB0(u32 param0); +void sub_02014FF0(UnkStruct_02014FB0 *param0); +u32 sub_02015004(const UnkStruct_02014FB0 *param0); +u16 sub_02015008(const UnkStruct_02014FB0 *param0, u32 param1); +s16 sub_02015030(const UnkStruct_02014FB0 *param0, u16 param1); #endif // POKEPLATINUM_UNK_02014D38_H diff --git a/include/unk_02015064.h b/include/unk_02015064.h index 9e6079ee7e..eed7e4a8a0 100644 --- a/include/unk_02015064.h +++ b/include/unk_02015064.h @@ -1,45 +1,46 @@ #ifndef POKEPLATINUM_UNK_02015064_H #define POKEPLATINUM_UNK_02015064_H +#include +#include + #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02015214_decl.h" + #include "overlay021/struct_ov21_021E7F40.h" #include "overlay022/struct_ov22_022550D4.h" #include "overlay022/struct_ov22_022557A0.h" #include "overlay022/struct_ov22_02255800.h" -#include -#include - -UnkStruct_02015064 * sub_02015064(const UnkStruct_ov22_022550D4 * param0); -void sub_020150A8(UnkStruct_02015064 * param0); -void sub_020150EC(UnkStruct_02015064 * param0); -UnkStruct_02015128 * sub_02015128(const UnkStruct_ov22_022557A0 * param0); -void sub_02015164(UnkStruct_02015128 * param0); -void sub_0201517C(UnkStruct_02015064 * param0); -UnkStruct_020151A4 * sub_020151A4(const UnkStruct_ov22_02255800 * param0); -void sub_020151D4(UnkStruct_020151A4 * param0); -void sub_020151EC(UnkStruct_02015064 * param0); -UnkStruct_02015214 * sub_02015214(const UnkStruct_ov21_021E7F40 * param0); -void sub_02015238(UnkStruct_02015214 * param0); -void sub_02015240(UnkStruct_02015214 * param0, BOOL param1); -void sub_02015254(UnkStruct_02015214 * param0, s16 param1, s16 param2); -NNSG2dSVec2 sub_0201525C(UnkStruct_02015214 * param0); -void sub_02015268(UnkStruct_02015214 * param0, s16 param1, s16 param2); -void sub_02015270(UnkStruct_02015214 * param0, fx32 param1, fx32 param2); -void sub_02015278(UnkStruct_02015214 * param0, int param1, int param2); -NNSG2dSVec2 sub_02015280(UnkStruct_02015214 * param0); -void sub_0201528C(UnkStruct_02015214 * param0, int param1); -int sub_02015290(UnkStruct_02015214 * param0); -void sub_02015294(UnkStruct_02015214 * param0, u8 param1); -void sub_0201529C(UnkStruct_02015214 * param0, GXRgb param1); -void sub_020152A0(UnkStruct_02015214 * param0, NNSG2dImageAttr * param1); -void sub_020152A4(UnkStruct_02015214 * param0, u32 param1); -void sub_020152A8(UnkStruct_02015214 * param0, u32 param1); -void sub_020152AC(UnkStruct_02015214 * param0, u32 param1); -void sub_020152B0(UnkStruct_02015214 * param0, int param1, BOOL param2); -void sub_020152BC(UnkStruct_02015214 * param0, u16 param1); +UnkStruct_02015064 *sub_02015064(const UnkStruct_ov22_022550D4 *param0); +void sub_020150A8(UnkStruct_02015064 *param0); +void sub_020150EC(UnkStruct_02015064 *param0); +UnkStruct_02015128 *sub_02015128(const UnkStruct_ov22_022557A0 *param0); +void sub_02015164(UnkStruct_02015128 *param0); +void sub_0201517C(UnkStruct_02015064 *param0); +UnkStruct_020151A4 *sub_020151A4(const UnkStruct_ov22_02255800 *param0); +void sub_020151D4(UnkStruct_020151A4 *param0); +void sub_020151EC(UnkStruct_02015064 *param0); +UnkStruct_02015214 *sub_02015214(const UnkStruct_ov21_021E7F40 *param0); +void sub_02015238(UnkStruct_02015214 *param0); +void sub_02015240(UnkStruct_02015214 *param0, BOOL param1); +void sub_02015254(UnkStruct_02015214 *param0, s16 param1, s16 param2); +NNSG2dSVec2 sub_0201525C(UnkStruct_02015214 *param0); +void sub_02015268(UnkStruct_02015214 *param0, s16 param1, s16 param2); +void sub_02015270(UnkStruct_02015214 *param0, fx32 param1, fx32 param2); +void sub_02015278(UnkStruct_02015214 *param0, int param1, int param2); +NNSG2dSVec2 sub_02015280(UnkStruct_02015214 *param0); +void sub_0201528C(UnkStruct_02015214 *param0, int param1); +int sub_02015290(UnkStruct_02015214 *param0); +void sub_02015294(UnkStruct_02015214 *param0, u8 param1); +void sub_0201529C(UnkStruct_02015214 *param0, GXRgb param1); +void sub_020152A0(UnkStruct_02015214 *param0, NNSG2dImageAttr *param1); +void sub_020152A4(UnkStruct_02015214 *param0, u32 param1); +void sub_020152A8(UnkStruct_02015214 *param0, u32 param1); +void sub_020152AC(UnkStruct_02015214 *param0, u32 param1); +void sub_020152B0(UnkStruct_02015214 *param0, int param1, BOOL param2); +void sub_020152BC(UnkStruct_02015214 *param0, u16 param1); #endif // POKEPLATINUM_UNK_02015064_H diff --git a/include/unk_0201567C.h b/include/unk_0201567C.h index 7b9c4d1426..b5f94fef44 100644 --- a/include/unk_0201567C.h +++ b/include/unk_0201567C.h @@ -3,8 +3,8 @@ #include "struct_decls/struct_02002F38_decl.h" -void * sub_0201567C(PaletteData * param0, u16 param1, u16 param2, u32 param3); -void sub_02015738(void * param0, u8 param1); -void sub_02015760(void * param0); +void *sub_0201567C(PaletteData *param0, u16 param1, u16 param2, u32 param3); +void sub_02015738(void *param0, u8 param1); +void sub_02015760(void *param0); #endif // POKEPLATINUM_UNK_0201567C_H diff --git a/include/unk_020158A8.h b/include/unk_020158A8.h index a6e5d77d98..4a16ca1f51 100644 --- a/include/unk_020158A8.h +++ b/include/unk_020158A8.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_UNK_020158A8_H #include "struct_defs/struct_020158A8.h" + #include "strbuf.h" -UnkStruct_020158A8 * sub_020158A8(int param0); -void sub_020158F4(UnkStruct_020158A8 * param0); -const Strbuf* sub_02015918(UnkStruct_020158A8 * param0, int param1); +UnkStruct_020158A8 *sub_020158A8(int param0); +void sub_020158F4(UnkStruct_020158A8 *param0); +const Strbuf *sub_02015918(UnkStruct_020158A8 *param0, int param1); #endif // POKEPLATINUM_UNK_020158A8_H diff --git a/include/unk_02015920.h b/include/unk_02015920.h index b2003864b3..d6f1a2a7ed 100644 --- a/include/unk_02015920.h +++ b/include/unk_02015920.h @@ -4,11 +4,11 @@ #include "struct_decls/struct_02015920_decl.h" #include "struct_defs/struct_02015958.h" -UnkStruct_02015920 * sub_02015920(u32 param0); -void sub_02015938(UnkStruct_02015920 * param0); -void sub_02015958(UnkStruct_02015920 * param0, const UnkStruct_02015958 * param1); -u32 sub_020159C0(UnkStruct_02015920 * param0); -u32 sub_020159FC(UnkStruct_02015920 * param0); -void sub_02015A54(UnkStruct_02015920 * param0); +UnkStruct_02015920 *sub_02015920(u32 param0); +void sub_02015938(UnkStruct_02015920 *param0); +void sub_02015958(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); +u32 sub_020159C0(UnkStruct_02015920 *param0); +u32 sub_020159FC(UnkStruct_02015920 *param0); +void sub_02015A54(UnkStruct_02015920 *param0); #endif // POKEPLATINUM_UNK_02015920_H diff --git a/include/unk_02015F84.h b/include/unk_02015F84.h index 8c5e8c2c12..8e64eb96c1 100644 --- a/include/unk_02015F84.h +++ b/include/unk_02015F84.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_UNK_02015F84_H #define POKEPLATINUM_UNK_02015F84_H -#include "struct_decls/sprite_decl.h" #include "struct_decls/pokemon_animation_sys_decl.h" +#include "struct_decls/sprite_decl.h" #include "struct_defs/poke_animation_settings.h" -PokemonAnimationSys * sub_02015F84(const int param0, const int param1, const u8 param2); -void sub_02015FB8(PokemonAnimationSys * param0); -void PokeAnimation_Init(PokemonAnimationSys * param0, Sprite * param1, const PokeAnimationSettings * param2, const u8 param3); -BOOL sub_020160F4(PokemonAnimationSys * param0, const u8 param1); -void sub_02016114(PokemonAnimationSys * param0, const u8 param1); +PokemonAnimationSys *sub_02015F84(const int param0, const int param1, const u8 param2); +void sub_02015FB8(PokemonAnimationSys *param0); +void PokeAnimation_Init(PokemonAnimationSys *param0, Sprite *param1, const PokeAnimationSettings *param2, const u8 param3); +BOOL sub_020160F4(PokemonAnimationSys *param0, const u8 param1); +void sub_02016114(PokemonAnimationSys *param0, const u8 param1); #endif // POKEPLATINUM_UNK_02015F84_H diff --git a/include/unk_020170BC.h b/include/unk_020170BC.h index 31d94f140f..1c63191bef 100644 --- a/include/unk_020170BC.h +++ b/include/unk_020170BC.h @@ -1,37 +1,37 @@ #ifndef POKEPLATINUM_UNK_020170BC_H #define POKEPLATINUM_UNK_020170BC_H +#include +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017248.h" #include "struct_defs/struct_02017294.h" -#include -#include - -void sub_020170BC(UnkStruct_020170F4 * param0, u32 param1, u32 param2, u32 param3); -void sub_020170D8(UnkStruct_020170F4 * param0, NARC * param1, u32 param2, u32 param3); -void sub_02017110(UnkStruct_020170F4 * param0); -void sub_02017164(UnkStruct_02017248 * param0, const UnkStruct_020170F4 * param1, NARC * param2, u32 param3, u32 param4, NNSFndAllocator * param5); -void sub_02017190(UnkStruct_02017248 * param0, const UnkStruct_020170F4 * param1, void * param2, NNSFndAllocator * param3); -void sub_020171A0(UnkStruct_02017248 * param0, NNSFndAllocator * param1); -void sub_020171CC(UnkStruct_02017248 * param0, fx32 param1); -BOOL sub_02017204(UnkStruct_02017248 * param0, fx32 param1); -void sub_02017240(UnkStruct_02017248 * param0, fx32 param1); -fx32 sub_02017248(const UnkStruct_02017248 * param0); -fx32 sub_0201724C(const UnkStruct_02017248 * param0); -void sub_02017258(UnkStruct_02017294 * param0, UnkStruct_020170F4 * param1); -void sub_0201727C(UnkStruct_02017294 * param0, UnkStruct_02017248 * param1); -void sub_02017288(UnkStruct_02017294 * param0, UnkStruct_02017248 * param1); -void sub_02017294(UnkStruct_02017294 * param0); -void sub_02017330(UnkStruct_02017294 * param0, const MtxFx33 * param1); -void sub_02017348(UnkStruct_02017294 * param0, BOOL param1); -BOOL sub_0201734C(const UnkStruct_02017294 * param0); -void sub_02017350(UnkStruct_02017294 * param0, fx32 param1, fx32 param2, fx32 param3); -void sub_02017358(const UnkStruct_02017294 * param0, fx32 * param1, fx32 * param2, fx32 * param3); -void sub_0201736C(UnkStruct_02017294 * param0, fx32 param1, fx32 param2, fx32 param3); -void sub_02017374(const UnkStruct_02017294 * param0, fx32 * param1, fx32 * param2, fx32 * param3); -void sub_02017388(UnkStruct_02017294 * param0, u16 param1, u32 param2); -u16 sub_02017394(const UnkStruct_02017294 * param0, u32 param1); +void sub_020170BC(UnkStruct_020170F4 *param0, u32 param1, u32 param2, u32 param3); +void sub_020170D8(UnkStruct_020170F4 *param0, NARC *param1, u32 param2, u32 param3); +void sub_02017110(UnkStruct_020170F4 *param0); +void sub_02017164(UnkStruct_02017248 *param0, const UnkStruct_020170F4 *param1, NARC *param2, u32 param3, u32 param4, NNSFndAllocator *param5); +void sub_02017190(UnkStruct_02017248 *param0, const UnkStruct_020170F4 *param1, void *param2, NNSFndAllocator *param3); +void sub_020171A0(UnkStruct_02017248 *param0, NNSFndAllocator *param1); +void sub_020171CC(UnkStruct_02017248 *param0, fx32 param1); +BOOL sub_02017204(UnkStruct_02017248 *param0, fx32 param1); +void sub_02017240(UnkStruct_02017248 *param0, fx32 param1); +fx32 sub_02017248(const UnkStruct_02017248 *param0); +fx32 sub_0201724C(const UnkStruct_02017248 *param0); +void sub_02017258(UnkStruct_02017294 *param0, UnkStruct_020170F4 *param1); +void sub_0201727C(UnkStruct_02017294 *param0, UnkStruct_02017248 *param1); +void sub_02017288(UnkStruct_02017294 *param0, UnkStruct_02017248 *param1); +void sub_02017294(UnkStruct_02017294 *param0); +void sub_02017330(UnkStruct_02017294 *param0, const MtxFx33 *param1); +void sub_02017348(UnkStruct_02017294 *param0, BOOL param1); +BOOL sub_0201734C(const UnkStruct_02017294 *param0); +void sub_02017350(UnkStruct_02017294 *param0, fx32 param1, fx32 param2, fx32 param3); +void sub_02017358(const UnkStruct_02017294 *param0, fx32 *param1, fx32 *param2, fx32 *param3); +void sub_0201736C(UnkStruct_02017294 *param0, fx32 param1, fx32 param2, fx32 param3); +void sub_02017374(const UnkStruct_02017294 *param0, fx32 *param1, fx32 *param2, fx32 *param3); +void sub_02017388(UnkStruct_02017294 *param0, u16 param1, u32 param2); +u16 sub_02017394(const UnkStruct_02017294 *param0, u32 param1); #endif // POKEPLATINUM_UNK_020170BC_H diff --git a/include/unk_02017498.h b/include/unk_02017498.h index 66d1496122..399fd6951e 100644 --- a/include/unk_02017498.h +++ b/include/unk_02017498.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_UNK_02017498_H #define POKEPLATINUM_UNK_02017498_H +#include "overlay_manager.h" -int sub_02017498(OverlayManager * param0, int * param1); -int sub_02017524(OverlayManager * param0, int * param1); -int sub_02017658(OverlayManager * param0, int * param1); +int sub_02017498(OverlayManager *param0, int *param1); +int sub_02017524(OverlayManager *param0, int *param1); +int sub_02017658(OverlayManager *param0, int *param1); #endif // POKEPLATINUM_UNK_02017498_H diff --git a/include/unk_02017728.h b/include/unk_02017728.h index c33ae273cd..ca0b43068a 100644 --- a/include/unk_02017728.h +++ b/include/unk_02017728.h @@ -9,7 +9,7 @@ void DisableHBlank(void); BOOL SetHBlankCallback(Callback cb, void *data); void sub_0201789C(void); void InitGraphics(void); -void * ReadFileToHeap(int heapID, const char *filename); +void *ReadFileToHeap(int heapID, const char *filename); void ReadFileToBuffer(const char *filename, void **buf); void sub_02017ACC(void); void InitKeypadAndTouchpad(void); diff --git a/include/unk_02018340.h b/include/unk_02018340.h index a84754da7a..31e95973d8 100644 --- a/include/unk_02018340.h +++ b/include/unk_02018340.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_UNK_02018340_H #define POKEPLATINUM_UNK_02018340_H +#include + #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0201AE08.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" -#include - enum BGLFrame { BGL_FRAME_MAIN_0 = 0, BGL_FRAME_MAIN_1, @@ -30,85 +31,85 @@ enum BGLScreenSize { SCREEN_SIZE_1024x1024, }; -BGL * sub_02018340(u32 param0); -u32 sub_02018364(BGL * param0); -void sub_02018368(const UnkStruct_ov84_0223BA5C * param0); -void sub_020183A0(const UnkStruct_ov84_0223BA5C * param0, u8 param1); -void sub_020183C4(BGL * param0, u8 param1, const UnkStruct_ov97_0222DB78 * param2, u8 param3); -void sub_02018898(BGL * param0, u8 param1, u8 param2, u8 param3); -void sub_02019044(BGL * param0, u8 param1); +BGL *sub_02018340(u32 param0); +u32 sub_02018364(BGL *param0); +void sub_02018368(const UnkStruct_ov84_0223BA5C *param0); +void sub_020183A0(const UnkStruct_ov84_0223BA5C *param0, u8 param1); +void sub_020183C4(BGL *param0, u8 param1, const UnkStruct_ov97_0222DB78 *param2, u8 param3); +void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3); +void sub_02019044(BGL *param0, u8 param1); void BGL_SetPriority(u8 param0, u8 param1); void sub_02019120(u8 param0, u8 param1); -void sub_02019184(BGL * param0, u8 param1, u8 param2, int param3); -int sub_020192EC(BGL * param0, u32 param1); -int sub_020192F8(BGL * param0, u32 param1); -void sub_02019348(BGL * param0, u8 param1, const MtxFx22 * param2, int param3, int param4); -void sub_02019410(const void * param0, void * param1, u32 param2); -void sub_02019448(BGL * param0, u8 param1); -void sub_02019460(BGL * param0, u8 param1, const void * param2, u32 param3, u32 param4); -void sub_02019574(BGL * param0, u8 param1, const void * param2, u32 param3); -void sub_0201958C(BGL * param0, u8 param1, const void * param2, u32 param3, u32 param4); +void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3); +int sub_020192EC(BGL *param0, u32 param1); +int sub_020192F8(BGL *param0, u32 param1); +void sub_02019348(BGL *param0, u8 param1, const MtxFx22 *param2, int param3, int param4); +void sub_02019410(const void *param0, void *param1, u32 param2); +void sub_02019448(BGL *param0, u8 param1); +void sub_02019460(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4); +void sub_02019574(BGL *param0, u8 param1, const void *param2, u32 param3); +void sub_0201958C(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4); void sub_02019690(u8 param0, u32 param1, u32 param2, u32 param3); -void sub_020196C0(BGL * param0, u32 param1, u32 param2, u32 param3, u32 param4); -void sub_0201972C(u8 param0, void * param1, u16 param2, u16 param3); +void sub_020196C0(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void sub_0201972C(u8 param0, void *param1, u16 param2, u16 param3); void sub_0201975C(u8 param0, u16 param1); -void sub_020198C0(BGL * param0, u8 param1, const void * param2, u8 param3, u8 param4, u8 param5, u8 param6); -void sub_020198E8(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void * param6, u8 param7, u8 param8, u8 param9, u8 param10); -void sub_02019964(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void * param6, u8 param7, u8 param8, u8 param9, u8 param10); -void sub_02019CB8(BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7); -void sub_02019E2C(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); -void sub_02019EBC(BGL * param0, u8 param1); -void sub_02019EE0(BGL * param0, u8 param1, u16 param2); -void sub_02019F04(BGL * param0, u8 param1, u16 param2); -void * sub_02019F28(u8 param0); -void sub_02019F80(const u8 * param0, u32 param1, u8 * param2, u8 param3); -void * sub_02019FC0(const u8 * param0, u32 param1, u8 param2, u32 param3); -void * sub_02019FE4(BGL * param0, u8 param1); -int sub_02019FF0(BGL * param0, u8 param1); -u16 sub_02019FFC(BGL * param0, u8 param1); -u8 sub_0201A008(BGL * param0, u8 param1); -void sub_0201A1E4(const UnkStruct_0201AE08 * param0, const UnkStruct_0201AE08 * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); -void sub_0201A424(const UnkStruct_0201AE08 * param0, const UnkStruct_0201AE08 * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); -void sub_0201A60C(const UnkStruct_0201AE08 * param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); -void sub_0201A6D0(const UnkStruct_0201AE08 * param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); -Window * sub_0201A778(u32 param0, u8 param1); -void Window_Init(Window * param0); -u8 BGL_WindowAdded(Window * param0); -void BGL_AddWindow(BGL * param0, Window * param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8); -void BGL_AddFramelessWindow(BGL * param0, Window * param1, u8 param2, u8 param3, u16 param4, u8 param5); -void sub_0201A8D4(BGL * param0, Window * param1, const UnkStruct_ov61_0222C884 * param2); -void BGL_DeleteWindow(Window * param0); -void sub_0201A928(Window * param0, u8 param1); -void sub_0201A954(Window * param0); -void sub_0201A9A4(Window * param0); -void sub_0201A9F4(Window * param0); -void sub_0201AA10(Window * param0, u32 param1, u32 param2); -void sub_0201AA3C(Window * param0); -void sub_0201ACCC(Window * param0); -void sub_0201ACF4(Window * param0); -void sub_0201AD10(Window * param0); -void BGL_FillWindow(Window * param0, u8 param1); -void sub_0201ADDC(Window * param0, void * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9); -void sub_0201AE08(Window * param0, void * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10); -void BGL_WindowColor(Window * param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5); -void sub_0201AED0(Window * param0, const u8 * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6); -void sub_0201C04C(Window * param0, u8 param1, u8 param2, u8 param3); -BGL * sub_0201C28C(Window * param0); -u8 sub_0201C290(Window * param0); -u8 sub_0201C294(Window * param0); -u8 sub_0201C298(Window * param0); -u8 sub_0201C29C(Window * param0); -u8 sub_0201C2A0(Window * param0); -u16 sub_0201C2A4(Window * param0); -void sub_0201C2AC(Window * param0, u8 param1); -void sub_0201C2B0(Window * param0, u8 param1); -void sub_0201C2B4(Window * param0, u8 param1); -void sub_0201C2B8(BGL * param0); -void sub_0201C3C0(BGL * param0, u8 param1); -void sub_0201C63C(BGL * param0, u8 param1, u8 param2, int param3); -void sub_0201C660(BGL * param0, u8 param1, u8 param2, u16 param3); -void sub_0201C6A8(BGL * param0, u8 param1, u8 param2, fx32 param3); -void sub_0201C718(BGL * param0, u8 param1, u8 param2, int param3); -u8 sub_0201C784(BGL * param0, u8 param1, u16 param2, u16 param3, u16 * param4); +void sub_020198C0(BGL *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6); +void sub_020198E8(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); +void sub_02019964(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); +void sub_02019CB8(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7); +void sub_02019E2C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); +void sub_02019EBC(BGL *param0, u8 param1); +void sub_02019EE0(BGL *param0, u8 param1, u16 param2); +void sub_02019F04(BGL *param0, u8 param1, u16 param2); +void *sub_02019F28(u8 param0); +void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3); +void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3); +void *sub_02019FE4(BGL *param0, u8 param1); +int sub_02019FF0(BGL *param0, u8 param1); +u16 sub_02019FFC(BGL *param0, u8 param1); +u8 sub_0201A008(BGL *param0, u8 param1); +void sub_0201A1E4(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); +void sub_0201A424(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8); +void sub_0201A60C(const UnkStruct_0201AE08 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); +void sub_0201A6D0(const UnkStruct_0201AE08 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5); +Window *sub_0201A778(u32 param0, u8 param1); +void Window_Init(Window *param0); +u8 BGL_WindowAdded(Window *param0); +void BGL_AddWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8); +void BGL_AddFramelessWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5); +void sub_0201A8D4(BGL *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2); +void BGL_DeleteWindow(Window *param0); +void sub_0201A928(Window *param0, u8 param1); +void sub_0201A954(Window *param0); +void sub_0201A9A4(Window *param0); +void sub_0201A9F4(Window *param0); +void sub_0201AA10(Window *param0, u32 param1, u32 param2); +void sub_0201AA3C(Window *param0); +void sub_0201ACCC(Window *param0); +void sub_0201ACF4(Window *param0); +void sub_0201AD10(Window *param0); +void BGL_FillWindow(Window *param0, u8 param1); +void sub_0201ADDC(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9); +void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10); +void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5); +void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6); +void sub_0201C04C(Window *param0, u8 param1, u8 param2, u8 param3); +BGL *sub_0201C28C(Window *param0); +u8 sub_0201C290(Window *param0); +u8 sub_0201C294(Window *param0); +u8 sub_0201C298(Window *param0); +u8 sub_0201C29C(Window *param0); +u8 sub_0201C2A0(Window *param0); +u16 sub_0201C2A4(Window *param0); +void sub_0201C2AC(Window *param0, u8 param1); +void sub_0201C2B0(Window *param0, u8 param1); +void sub_0201C2B4(Window *param0, u8 param1); +void sub_0201C2B8(BGL *param0); +void sub_0201C3C0(BGL *param0, u8 param1); +void sub_0201C63C(BGL *param0, u8 param1, u8 param2, int param3); +void sub_0201C660(BGL *param0, u8 param1, u8 param2, u16 param3); +void sub_0201C6A8(BGL *param0, u8 param1, u8 param2, fx32 param3); +void sub_0201C718(BGL *param0, u8 param1, u8 param2, int param3); +u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4); #endif // POKEPLATINUM_UNK_02018340_H diff --git a/include/unk_0201C970.h b/include/unk_0201C970.h index 0495f60173..0c8f7749e3 100644 --- a/include/unk_0201C970.h +++ b/include/unk_0201C970.h @@ -1,19 +1,18 @@ #ifndef POKEPLATINUM_UNK_0201C970_H #define POKEPLATINUM_UNK_0201C970_H - #include #include void sub_0201C970(const u8, const char *, NNSG3dResMdl **, NNSG3dResFileHeader **); void sub_0201CA24(const u8, const char *, NNSG3dRenderObj *, NNSG3dResMdl **, NNSG3dResFileHeader **); void sub_0201CA3C(NNSG3dRenderObj *, NNSG3dResMdl **, NNSG3dResFileHeader **); -BOOL sub_0201CA5C(NNSG3dResTex * param0); +BOOL sub_0201CA5C(NNSG3dResTex *param0); void sub_0201CA74(NNSG3dRenderObj *, const VecFx32 *, const MtxFx33 *, const VecFx32 *); void sub_0201CAB0(NNSG3dRenderObj *, const VecFx32 *, const MtxFx33 *, const VecFx32 *); void sub_0201CAF4(const u8 param0); void sub_0201CBA0(void); -BOOL sub_0201CBB0(void * param0, NNSG3dResTex * param1); -BOOL sub_0201CBCC(NNSG3dResTex * param0); +BOOL sub_0201CBB0(void *param0, NNSG3dResTex *param1); +BOOL sub_0201CBCC(NNSG3dResTex *param0); #endif // POKEPLATINUM_UNK_0201C970_H diff --git a/include/unk_0201CED8.h b/include/unk_0201CED8.h index 972a84e836..03e3ca343f 100644 --- a/include/unk_0201CED8.h +++ b/include/unk_0201CED8.h @@ -1,13 +1,13 @@ #ifndef POKEPLATINUM_UNK_0201CED8_H #define POKEPLATINUM_UNK_0201CED8_H -#include "struct_defs/struct_0201CFEC.h" - #include #include -u32 sub_0201CED8(const NNSG3dResMdl * param0, const VecFx32 * param1, const MtxFx33 * param2, const VecFx32 * param3); -u32 sub_0201CF7C(const VecFx32 * param0, const UnkStruct_0201CFEC * param1); -void sub_0201CFEC(const fx32 param0, const fx32 param1, const fx32 param2, UnkStruct_0201CFEC * param3); +#include "struct_defs/struct_0201CFEC.h" + +u32 sub_0201CED8(const NNSG3dResMdl *param0, const VecFx32 *param1, const MtxFx33 *param2, const VecFx32 *param3); +u32 sub_0201CF7C(const VecFx32 *param0, const UnkStruct_0201CFEC *param1); +void sub_0201CFEC(const fx32 param0, const fx32 param1, const fx32 param2, UnkStruct_0201CFEC *param3); #endif // POKEPLATINUM_UNK_0201CED8_H diff --git a/include/unk_0201D15C.h b/include/unk_0201D15C.h index fb22c6c177..d9110473ae 100644 --- a/include/unk_0201D15C.h +++ b/include/unk_0201D15C.h @@ -1,30 +1,29 @@ #ifndef POKEPLATINUM_UNK_0201D15C_H #define POKEPLATINUM_UNK_0201D15C_H - #include fx32 sub_0201D15C(u16 param0); fx32 sub_0201D1D4(u16 param0); fx32 sub_0201D250(u16 param0); fx32 sub_0201D264(u16 param0); -u16 sub_0201D278(u16 param0); -u16 sub_0201D2A4(u16 param0); +u16 sub_0201D278(u16 param0); +u16 sub_0201D2A4(u16 param0); fx32 sub_0201D2B8(fx32 param0); fx32 sub_0201D2C4(fx32 param0); -u32 LCRNG_GetSeed(void); +u32 LCRNG_GetSeed(void); void LCRNG_SetSeed(u32 seed); -u16 LCRNG_Next(void); -u32 ARNG_Next(u32 seed); +u16 LCRNG_Next(void); +u32 ARNG_Next(u32 seed); void MTRNG_SetSeed(u32 seed); -u32 MTRNG_Next(void); -void sub_0201D470(MtxFx22 * param0, u16 param1, fx32 param2, fx32 param3, u8 param4); -s32 sub_0201D4CC(s32 param0, s32 param1, s32 param2, s32 param3, u32 param4); -s32 sub_0201D580(u16 param0, s32 param1); -u32 sub_0201D5B8(const void * param0, u32 param1); +u32 MTRNG_Next(void); +void sub_0201D470(MtxFx22 *param0, u16 param1, fx32 param2, fx32 param3, u8 param4); +s32 sub_0201D4CC(s32 param0, s32 param1, s32 param2, s32 param3, u32 param4); +s32 sub_0201D580(u16 param0, s32 param1); +u32 sub_0201D5B8(const void *param0, u32 param1); void EncryptData(void *data, u32 bytes, u32 seed); void DecryptData(void *data, u32 bytes, u32 seed); -u16 sub_0201D628(const void * param0, u32 param1); +u16 sub_0201D628(const void *param0, u32 param1); void sub_0201D640(int param0); #endif // POKEPLATINUM_UNK_0201D15C_H diff --git a/include/unk_0201D670.h b/include/unk_0201D670.h index 0adead11d2..a1b5b4b2fc 100644 --- a/include/unk_0201D670.h +++ b/include/unk_0201D670.h @@ -4,18 +4,20 @@ #include "struct_defs/struct_0201D670.h" #include "struct_defs/struct_0201D738.h" #include "struct_defs/struct_0201D834.h" +#include "struct_defs/struct_0205AA50.h" + #include "functypes/funcptr_0201D834.h" + #include "strbuf.h" -#include "struct_defs/struct_0205AA50.h" -void sub_0201D670(const UnkStruct_0201D670 * param0); +void sub_0201D670(const UnkStruct_0201D670 *param0); void sub_0201D710(void); u8 Message_Printing(u8 param0); void PrintString_ForceStop(u8 param0); /** * @brief Print a string into the target window. - * + * * @param window The window which will display the printed string. * @param fontID ID of the font to be used. * @param strbuf String which will be printed. @@ -23,14 +25,14 @@ void PrintString_ForceStop(u8 param0); * @param yOffset Y-offset to apply to the top-edge of the cursor before printing. * @param renderDelay Delay in frames to apply between rendering each character of the string. * @param callback Callback function when done printing. - * @return + * @return */ u8 PrintStringSimple(Window *window, u32 fontID, const Strbuf *strbuf, u32 xOffset, u32 yOffset, u32 renderDelay, UnkFuncPtr_0201D834 callback); -u8 sub_0201D78C(Window * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, UnkFuncPtr_0201D834 param7); -u8 PrintStringWithColorAndMargins(Window * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkFuncPtr_0201D834 param9); -u8 sub_0201D834(const UnkStruct_0201D738 * param0, u32 param1, UnkFuncPtr_0201D834 param2); +u8 sub_0201D78C(Window *param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, UnkFuncPtr_0201D834 param7); +u8 PrintStringWithColorAndMargins(Window *param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkFuncPtr_0201D834 param9); +u8 sub_0201D834(const UnkStruct_0201D738 *param0, u32 param1, UnkFuncPtr_0201D834 param2); void sub_0201D9FC(u8 param0, u8 param1, u8 param2); void sub_0201DAA0(u32 param0, u32 param1); -void sub_0201DB8C(UnkStruct_0201D834 * param0, u16 param1, u16 param2, u16 param3); +void sub_0201DB8C(UnkStruct_0201D834 *param0, u16 param1, u16 param2, u16 param3); #endif // POKEPLATINUM_UNK_0201D670_H diff --git a/include/unk_0201DBEC.h b/include/unk_0201DBEC.h index fb26dfd89e..895d8d5f0c 100644 --- a/include/unk_0201DBEC.h +++ b/include/unk_0201DBEC.h @@ -1,15 +1,14 @@ #ifndef POKEPLATINUM_UNK_0201DBEC_H #define POKEPLATINUM_UNK_0201DBEC_H - #include void sub_0201DBEC(u32 param0, int param1); void sub_0201DC3C(void); -BOOL sub_0201DC68(NNS_GFD_DST_TYPE param0, u32 param1, void * param2, u32 param3); +BOOL sub_0201DC68(NNS_GFD_DST_TYPE param0, u32 param1, void *param2, u32 param3); void sub_0201DCAC(void); -NNSG2dCellTransferState * sub_0201DCC8(int param0, int param1); +NNSG2dCellTransferState *sub_0201DCC8(int param0, int param1); void sub_0201DCE8(void); -void sub_0201DCF0(NNSG2dCellTransferState * param0); +void sub_0201DCF0(NNSG2dCellTransferState *param0); #endif // POKEPLATINUM_UNK_0201DBEC_H diff --git a/include/unk_0201DD00.h b/include/unk_0201DD00.h index 7412ef436d..caec35fd03 100644 --- a/include/unk_0201DD00.h +++ b/include/unk_0201DD00.h @@ -1,21 +1,21 @@ #ifndef POKEPLATINUM_UNK_0201DD00_H #define POKEPLATINUM_UNK_0201DD00_H +#include + #include "struct_decls/struct_0201DD00_decl.h" #include "struct_decls/struct_0201DDF4_decl.h" #include "struct_defs/struct_02024184.h" -#include - -UnkStruct_0201DD00 * sub_0201DD00(int param0, int param1); -void sub_0201DD3C(UnkStruct_0201DD00 * param0); -UnkStruct_0201DDF4 * sub_0201DD54(UnkStruct_0201DD00 * param0, const UnkStruct_02024184 * param1, const NNSG3dResTex * param2, NNSGfdTexKey param3, NNSGfdPlttKey param4, const fx32 param5); -void sub_0201DDAC(UnkStruct_0201DDF4 * param0); -void sub_0201DDB4(UnkStruct_0201DD00 * param0); -void sub_0201DDD8(UnkStruct_0201DDF4 * param0, const fx32 param1); -void * sub_0201DEAC(NNSG3dResTex * param0, const u8 param1); -void * sub_0201DEFC(NNSG3dResTex * param0, const u8 param1); -void * sub_0201DF50(NNSG3dResTex * param0, const char * param1); -int sub_0201DFE4(NNSG3dResTex * param0, const char * param1); +UnkStruct_0201DD00 *sub_0201DD00(int param0, int param1); +void sub_0201DD3C(UnkStruct_0201DD00 *param0); +UnkStruct_0201DDF4 *sub_0201DD54(UnkStruct_0201DD00 *param0, const UnkStruct_02024184 *param1, const NNSG3dResTex *param2, NNSGfdTexKey param3, NNSGfdPlttKey param4, const fx32 param5); +void sub_0201DDAC(UnkStruct_0201DDF4 *param0); +void sub_0201DDB4(UnkStruct_0201DD00 *param0); +void sub_0201DDD8(UnkStruct_0201DDF4 *param0, const fx32 param1); +void *sub_0201DEAC(NNSG3dResTex *param0, const u8 param1); +void *sub_0201DEFC(NNSG3dResTex *param0, const u8 param1); +void *sub_0201DF50(NNSG3dResTex *param0, const char *param1); +int sub_0201DFE4(NNSG3dResTex *param0, const char *param1); #endif // POKEPLATINUM_UNK_0201DD00_H diff --git a/include/unk_0201E010.h b/include/unk_0201E010.h index 02010247d2..a285dc1e97 100644 --- a/include/unk_0201E010.h +++ b/include/unk_0201E010.h @@ -3,8 +3,8 @@ #include "struct_defs/struct_020F1DB8.h" -void sub_0201E010(const ByteFlagSet * param0, u8 * param1, u8 * param2); -void sub_0201E01C(const ByteFlagSet * param0, u8 * param1, u8 * param2); -u8 sub_0201E028(const ByteFlagSet * param0, u8 * param1, u8 * param2, u8 * param3, u8 * param4, u8 param5, u8 param6); +void sub_0201E010(const ByteFlagSet *param0, u8 *param1, u8 *param2); +void sub_0201E01C(const ByteFlagSet *param0, u8 *param1, u8 *param2); +u8 sub_0201E028(const ByteFlagSet *param0, u8 *param1, u8 *param2, u8 *param3, u8 *param4, u8 param5, u8 param6); #endif // POKEPLATINUM_UNK_0201E010_H diff --git a/include/unk_0201E190.h b/include/unk_0201E190.h index 833122f428..79500fa77a 100644 --- a/include/unk_0201E190.h +++ b/include/unk_0201E190.h @@ -1,14 +1,13 @@ #ifndef POKEPLATINUM_UNK_0201E190_H #define POKEPLATINUM_UNK_0201E190_H - #include fx32 sub_0201E190(fx32 param0, fx32 param1); fx32 sub_0201E198(fx32 param0, fx32 param1); -fx32 VEC_AngleBetween(const VecFx32 * param0, const VecFx32 * param1); -void sub_0201E268(MtxFx33 * param0, VecFx32 * param1); -void sub_0201E2E0(MtxFx33 * param0, u16 param1, u16 param2, u16 param3); -void sub_0201E34C(u16 param0, fx32 param1, fx32 param2, fx32 * param3, fx32 * param4); +fx32 VEC_AngleBetween(const VecFx32 *param0, const VecFx32 *param1); +void sub_0201E268(MtxFx33 *param0, VecFx32 *param1); +void sub_0201E2E0(MtxFx33 *param0, u16 param1, u16 param2, u16 param3); +void sub_0201E34C(u16 param0, fx32 param1, fx32 param2, fx32 *param3, fx32 *param4); #endif // POKEPLATINUM_UNK_0201E190_H diff --git a/include/unk_0201E3D8.h b/include/unk_0201E3D8.h index 9371f09234..ecfe25fb5b 100644 --- a/include/unk_0201E3D8.h +++ b/include/unk_0201E3D8.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_UNK_0201E3D8_H #define POKEPLATINUM_UNK_0201E3D8_H -#include "overlay072/struct_ov72_0223E2A8.h" - #include +#include "overlay072/struct_ov72_0223E2A8.h" + void sub_0201E3D8(void); -u32 sub_0201E3F4(TPData * param0, u32 param1, u32 param2); +u32 sub_0201E3F4(TPData *param0, u32 param1, u32 param2); u32 sub_0201E450(u32 param0); u32 sub_0201E530(void); -u32 sub_0201E564(UnkStruct_ov72_0223E2A8 * param0, u32 param1, u32 param2); -void sub_0201E5C0(TPData * param0, u32 param1); +u32 sub_0201E564(UnkStruct_ov72_0223E2A8 *param0, u32 param1, u32 param2); +void sub_0201E5C0(TPData *param0, u32 param1); void AfterSleep(void); void BeforeSleep(void); diff --git a/include/unk_0201E86C.h b/include/unk_0201E86C.h index f13bc70f57..b2d12414a9 100644 --- a/include/unk_0201E86C.h +++ b/include/unk_0201E86C.h @@ -1,32 +1,33 @@ #ifndef POKEPLATINUM_UNK_0201E86C_H #define POKEPLATINUM_UNK_0201E86C_H -#include "struct_defs/struct_0200A328.h" -#include "struct_defs/sprite_manager_allocation.h" -#include "overlay022/struct_ov22_022559F8.h" - #include #include -void sub_0201E86C(const UnkStruct_ov22_022559F8 * param0); -void sub_0201E88C(const UnkStruct_ov22_022559F8 * param0, GXOBJVRamModeChar param1, GXOBJVRamModeChar param2); +#include "struct_defs/sprite_manager_allocation.h" +#include "struct_defs/struct_0200A328.h" + +#include "overlay022/struct_ov22_022559F8.h" + +void sub_0201E86C(const UnkStruct_ov22_022559F8 *param0); +void sub_0201E88C(const UnkStruct_ov22_022559F8 *param0, GXOBJVRamModeChar param1, GXOBJVRamModeChar param2); void sub_0201E958(void); void sub_0201E994(void); void sub_0201E9C0(u32 param0, u32 param1, u32 param2); -BOOL sub_0201EA24(const UnkStruct_0200A328 * param0); -BOOL sub_0201EA7C(const UnkStruct_0200A328 * param0); +BOOL sub_0201EA24(const UnkStruct_0200A328 *param0); +BOOL sub_0201EA7C(const UnkStruct_0200A328 *param0); BOOL sub_0201EAD8(int param0); -void sub_0201EB08(int param0, NNSG2dCharacterData * param1); +void sub_0201EB08(int param0, NNSG2dCharacterData *param1); void sub_0201EB50(int param0); void sub_0201EBA0(void); -NNSG2dImageProxy * sub_0201EBDC(int param0); -NNSG2dImageProxy * sub_0201EC00(int param0, u32 param1); -NNSG2dImageProxy * sub_0201EC84(const NNSG2dImageProxy * param0); -void sub_0201ED1C(const NNSG2dImageProxy * param0); -BOOL sub_0201ED94(int param0, int param1, int param2, SpriteManagerAllocation * param3); -void sub_0201EE28(SpriteManagerAllocation * param0); -void * sub_0201EE9C(void); -void sub_0201EEB8(void * param0); +NNSG2dImageProxy *sub_0201EBDC(int param0); +NNSG2dImageProxy *sub_0201EC00(int param0, u32 param1); +NNSG2dImageProxy *sub_0201EC84(const NNSG2dImageProxy *param0); +void sub_0201ED1C(const NNSG2dImageProxy *param0); +BOOL sub_0201ED94(int param0, int param1, int param2, SpriteManagerAllocation *param3); +void sub_0201EE28(SpriteManagerAllocation *param0); +void *sub_0201EE9C(void); +void sub_0201EEB8(void *param0); void sub_0201F460(void); int sub_0201F6F4(int param0); diff --git a/include/unk_0201F834.h b/include/unk_0201F834.h index c5e25fbb6c..65a4a35c5a 100644 --- a/include/unk_0201F834.h +++ b/include/unk_0201F834.h @@ -1,22 +1,22 @@ #ifndef POKEPLATINUM_UNK_0201F834_H #define POKEPLATINUM_UNK_0201F834_H -#include "struct_defs/struct_0200A5C8.h" - #include +#include "struct_defs/struct_0200A5C8.h" + void sub_0201F834(int param0, int param1); void sub_0201F890(u16 param0, u32 param1); void sub_0201F8B4(void); void sub_0201F8E4(void); -BOOL sub_0201F90C(const UnkStruct_0200A5C8 * param0); -BOOL sub_0201F950(const UnkStruct_0200A5C8 * param0); -void sub_0201F990(int param0, NNSG2dPaletteData * param1); +BOOL sub_0201F90C(const UnkStruct_0200A5C8 *param0); +BOOL sub_0201F950(const UnkStruct_0200A5C8 *param0); +void sub_0201F990(int param0, NNSG2dPaletteData *param1); BOOL sub_0201F9DC(int param0); void sub_0201F9F0(int param0); void sub_0201FA18(void); -NNSG2dImagePaletteProxy * sub_0201FA58(int param0); -NNSG2dImagePaletteProxy * sub_0201FA80(int param0, NNSG2dImageProxy * param1); -u32 sub_0201FAB4(const NNSG2dImagePaletteProxy * param0, u32 param1); +NNSG2dImagePaletteProxy *sub_0201FA58(int param0); +NNSG2dImagePaletteProxy *sub_0201FA80(int param0, NNSG2dImageProxy *param1); +u32 sub_0201FAB4(const NNSG2dImagePaletteProxy *param0, u32 param1); #endif // POKEPLATINUM_UNK_0201F834_H diff --git a/include/unk_02020AEC.h b/include/unk_02020AEC.h index 439e0f0fdf..f2fdb6ed4c 100644 --- a/include/unk_02020AEC.h +++ b/include/unk_02020AEC.h @@ -1,52 +1,53 @@ #ifndef POKEPLATINUM_UNK_02020AEC_H #define POKEPLATINUM_UNK_02020AEC_H +#include +#include + #include "struct_decls/struct_02020C44_decl.h" -#include "functypes/funcptr_02021444.h" #include "struct_decls/struct_020216E0_decl.h" #include "struct_defs/struct_020217F4.h" #include "struct_defs/struct_02024184.h" + +#include "functypes/funcptr_02021444.h" #include "overlay005/struct_ov5_021DF7F8.h" #include "overlay005/struct_ov5_021DF84C.h" #include "overlay005/struct_ov5_021EDDAC.h" -#include -#include - -void sub_02020B14(UnkStruct_020216E0 * param0); +void sub_02020B14(UnkStruct_020216E0 *param0); void sub_02020B90(int param0, int param1); void sub_02020BD0(void); void sub_02020C08(void); -UnkStruct_02020C44 * sub_02020C44(const UnkStruct_ov5_021EDDAC * param0); -BOOL sub_02020CCC(UnkStruct_02020C44 * param0); -BOOL sub_02020D14(UnkStruct_02020C44 * param0); -BOOL sub_02020D50(UnkStruct_02020C44 * param0); -void sub_02020D68(UnkStruct_02020C44 * param0); -UnkStruct_020216E0 * sub_0202119C(const UnkStruct_ov5_021DF7F8 * param0); -BOOL sub_020211FC(UnkStruct_020216E0 * param0); -void sub_0202125C(UnkStruct_ov5_021DF84C * param0, void * param1, const NNSG3dResTex * param2, const UnkStruct_020217F4 * param3, const UnkStruct_02024184 * param4, NNSGfdTexKey param5, NNSGfdTexKey param6, NNSGfdPlttKey param7); -void sub_02021284(UnkStruct_ov5_021DF84C * param0, void * param1, const NNSG3dResTex * param2, const UnkStruct_020217F4 * param3, const UnkStruct_02024184 * param4); -void sub_020212A8(UnkStruct_020216E0 * param0, const VecFx32 * param1); -const VecFx32 * sub_020212C0(const UnkStruct_020216E0 * param0); -void sub_020212D0(UnkStruct_020216E0 * param0, const VecFx32 * param1); -const VecFx32 * sub_020212EC(const UnkStruct_020216E0 * param0); -void sub_020212FC(UnkStruct_020216E0 * param0, const MtxFx33 * param1); -const MtxFx33 * sub_02021310(const UnkStruct_020216E0 * param0); -void sub_02021320(UnkStruct_020216E0 * param0, u8 param1); -u8 sub_02021334(const UnkStruct_020216E0 * param0); -void sub_02021344(UnkStruct_020216E0 * param0, int param1); -int sub_02021358(const UnkStruct_020216E0 * param0); -int sub_02021368(UnkStruct_020216E0 * param0, fx32 param1); -void sub_02021380(UnkStruct_020216E0 * param0, fx32 param1); -fx32 sub_02021394(const UnkStruct_020216E0 * param0); -void sub_020213A4(UnkStruct_020216E0 * param0, fx32 param1); -fx32 sub_020213D4(const UnkStruct_020216E0 * param0); -NNSG3dResMdl * sub_020213F4(const UnkStruct_020216E0 * param0); -int sub_02021404(const UnkStruct_020216E0 * param0); -void sub_02021414(UnkStruct_020216E0 * param0); -NNSG3dResMdl * sub_02021430(UnkStruct_020216E0 * param0); -NNSG3dResTex * sub_02021438(UnkStruct_020216E0 * param0); -NNSG3dRenderObj * sub_02021440(UnkStruct_020216E0 * param0); -void sub_02021444(UnkStruct_020216E0 * param0, UnkFuncPtr_02021444 param1, void * param2); +UnkStruct_02020C44 *sub_02020C44(const UnkStruct_ov5_021EDDAC *param0); +BOOL sub_02020CCC(UnkStruct_02020C44 *param0); +BOOL sub_02020D14(UnkStruct_02020C44 *param0); +BOOL sub_02020D50(UnkStruct_02020C44 *param0); +void sub_02020D68(UnkStruct_02020C44 *param0); +UnkStruct_020216E0 *sub_0202119C(const UnkStruct_ov5_021DF7F8 *param0); +BOOL sub_020211FC(UnkStruct_020216E0 *param0); +void sub_0202125C(UnkStruct_ov5_021DF84C *param0, void *param1, const NNSG3dResTex *param2, const UnkStruct_020217F4 *param3, const UnkStruct_02024184 *param4, NNSGfdTexKey param5, NNSGfdTexKey param6, NNSGfdPlttKey param7); +void sub_02021284(UnkStruct_ov5_021DF84C *param0, void *param1, const NNSG3dResTex *param2, const UnkStruct_020217F4 *param3, const UnkStruct_02024184 *param4); +void sub_020212A8(UnkStruct_020216E0 *param0, const VecFx32 *param1); +const VecFx32 *sub_020212C0(const UnkStruct_020216E0 *param0); +void sub_020212D0(UnkStruct_020216E0 *param0, const VecFx32 *param1); +const VecFx32 *sub_020212EC(const UnkStruct_020216E0 *param0); +void sub_020212FC(UnkStruct_020216E0 *param0, const MtxFx33 *param1); +const MtxFx33 *sub_02021310(const UnkStruct_020216E0 *param0); +void sub_02021320(UnkStruct_020216E0 *param0, u8 param1); +u8 sub_02021334(const UnkStruct_020216E0 *param0); +void sub_02021344(UnkStruct_020216E0 *param0, int param1); +int sub_02021358(const UnkStruct_020216E0 *param0); +int sub_02021368(UnkStruct_020216E0 *param0, fx32 param1); +void sub_02021380(UnkStruct_020216E0 *param0, fx32 param1); +fx32 sub_02021394(const UnkStruct_020216E0 *param0); +void sub_020213A4(UnkStruct_020216E0 *param0, fx32 param1); +fx32 sub_020213D4(const UnkStruct_020216E0 *param0); +NNSG3dResMdl *sub_020213F4(const UnkStruct_020216E0 *param0); +int sub_02021404(const UnkStruct_020216E0 *param0); +void sub_02021414(UnkStruct_020216E0 *param0); +NNSG3dResMdl *sub_02021430(UnkStruct_020216E0 *param0); +NNSG3dResTex *sub_02021438(UnkStruct_020216E0 *param0); +NNSG3dRenderObj *sub_02021440(UnkStruct_020216E0 *param0); +void sub_02021444(UnkStruct_020216E0 *param0, UnkFuncPtr_02021444 param1, void *param2); #endif // POKEPLATINUM_UNK_02020AEC_H diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h index 28464d49cb..491b087a48 100644 --- a/include/unk_020218BC.h +++ b/include/unk_020218BC.h @@ -1,69 +1,70 @@ #ifndef POKEPLATINUM_UNK_020218BC_H #define POKEPLATINUM_UNK_020218BC_H -#include "struct_defs/struct_020095C4.h" +#include +#include +#include + #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" +#include "struct_defs/struct_020095C4.h" + #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay115/struct_ov115_02261520.h" -#include -#include -#include - -GraphicElementManager * sub_020218BC(const UnkStruct_020095C4 * param0); -BOOL sub_02021964(GraphicElementManager * param0); -BOOL sub_020219A4(GraphicElementManager * param0, u8 param1); -BOOL sub_020219C0(GraphicElementManager * param0); -void sub_020219F8(const GraphicElementManager * param0); -void sub_02021A78(GraphicElementData * param0); -GraphicElementData * sub_02021AA0(const UnkStruct_ov115_02261520 * param0); -GraphicElementData * sub_02021B90(const UnkStruct_ov83_0223D9A8 * param0); -void sub_02021BD4(GraphicElementData * param0); -void sub_02021C50(GraphicElementData * param0, const VecFx32 * param1); -void sub_02021C60(GraphicElementData * param0, const VecFx32 * param1); -void sub_02021C70(GraphicElementData * param0, const VecFx32 * param1); -void sub_02021C80(GraphicElementData * param0, const VecFx32 * param1, int param2); -void sub_02021C94(GraphicElementData * param0, u16 param1); -void sub_02021C98(GraphicElementData * param0, u16 param1, int param2); -void sub_02021CAC(GraphicElementData * param0, int param1); -void sub_02021CC8(GraphicElementData * param0, int param1); -void sub_02021CE4(GraphicElementData * param0, fx32 param1); -void sub_02021CF8(GraphicElementData * param0, int param1); -void sub_02021D0C(GraphicElementData * param0, int param1); -const VecFx32 * sub_02021D28(const GraphicElementData * param0); -const VecFx32 * sub_02021D2C(const GraphicElementData * param0); -u16 sub_02021D30(const GraphicElementData * param0); -int sub_02021D34(const GraphicElementData * param0); -int sub_02021D3C(const GraphicElementData * param0); -u32 sub_02021D44(const GraphicElementData * param0); -void SpriteActor_SetSpriteAnimActive(GraphicElementData * param0, u32 param1); -void sub_02021DCC(GraphicElementData * param0, u32 param1); -void sub_02021DE0(GraphicElementData * param0); -u32 sub_02021E24(const GraphicElementData * param0); -void sub_02021E2C(GraphicElementData * param0, fx32 param1); -void SpriteActor_SetAnimFrame(GraphicElementData * param0, u16 param1); -u16 sub_02021E74(const GraphicElementData * param0); -void sub_02021E80(GraphicElementData * param0, u8 param1); -u8 sub_02021E88(const GraphicElementData * param0); -void sub_02021E90(GraphicElementData * param0, u32 param1); -void sub_02021EC4(GraphicElementData * param0, u32 param1); -u32 sub_02021EE8(const GraphicElementData * param0); -void sub_02021EF0(GraphicElementData * param0, u32 param1); -void sub_02021F24(GraphicElementData * param0, u32 param1); -u32 sub_02021F48(const GraphicElementData * param0); -void sub_02021F58(GraphicElementData * param0, u32 param1); -u32 sub_02021F74(const GraphicElementData * param0); -void sub_02021F7C(GraphicElementData * param0, const NNSG2dImageProxy * param1); -NNSG2dImageProxy * SpriteActor_ImageProxy(GraphicElementData * param0); -NNSG2dImagePaletteProxy * sub_02021F9C(GraphicElementData * param0); -void sub_02021FA0(GraphicElementData * param0, BOOL param1); -NNS_G2D_VRAM_TYPE sub_02021FC8(const GraphicElementData * param0); -BOOL sub_02021FD0(GraphicElementData * param0); -void sub_02021FE0(GraphicElementData * param0, GXOamMode param1); +GraphicElementManager *sub_020218BC(const UnkStruct_020095C4 *param0); +BOOL sub_02021964(GraphicElementManager *param0); +BOOL sub_020219A4(GraphicElementManager *param0, u8 param1); +BOOL sub_020219C0(GraphicElementManager *param0); +void sub_020219F8(const GraphicElementManager *param0); +void sub_02021A78(GraphicElementData *param0); +GraphicElementData *sub_02021AA0(const UnkStruct_ov115_02261520 *param0); +GraphicElementData *sub_02021B90(const UnkStruct_ov83_0223D9A8 *param0); +void sub_02021BD4(GraphicElementData *param0); +void sub_02021C50(GraphicElementData *param0, const VecFx32 *param1); +void sub_02021C60(GraphicElementData *param0, const VecFx32 *param1); +void sub_02021C70(GraphicElementData *param0, const VecFx32 *param1); +void sub_02021C80(GraphicElementData *param0, const VecFx32 *param1, int param2); +void sub_02021C94(GraphicElementData *param0, u16 param1); +void sub_02021C98(GraphicElementData *param0, u16 param1, int param2); +void sub_02021CAC(GraphicElementData *param0, int param1); +void sub_02021CC8(GraphicElementData *param0, int param1); +void sub_02021CE4(GraphicElementData *param0, fx32 param1); +void sub_02021CF8(GraphicElementData *param0, int param1); +void sub_02021D0C(GraphicElementData *param0, int param1); +const VecFx32 *sub_02021D28(const GraphicElementData *param0); +const VecFx32 *sub_02021D2C(const GraphicElementData *param0); +u16 sub_02021D30(const GraphicElementData *param0); +int sub_02021D34(const GraphicElementData *param0); +int sub_02021D3C(const GraphicElementData *param0); +u32 sub_02021D44(const GraphicElementData *param0); +void SpriteActor_SetSpriteAnimActive(GraphicElementData *param0, u32 param1); +void sub_02021DCC(GraphicElementData *param0, u32 param1); +void sub_02021DE0(GraphicElementData *param0); +u32 sub_02021E24(const GraphicElementData *param0); +void sub_02021E2C(GraphicElementData *param0, fx32 param1); +void SpriteActor_SetAnimFrame(GraphicElementData *param0, u16 param1); +u16 sub_02021E74(const GraphicElementData *param0); +void sub_02021E80(GraphicElementData *param0, u8 param1); +u8 sub_02021E88(const GraphicElementData *param0); +void sub_02021E90(GraphicElementData *param0, u32 param1); +void sub_02021EC4(GraphicElementData *param0, u32 param1); +u32 sub_02021EE8(const GraphicElementData *param0); +void sub_02021EF0(GraphicElementData *param0, u32 param1); +void sub_02021F24(GraphicElementData *param0, u32 param1); +u32 sub_02021F48(const GraphicElementData *param0); +void sub_02021F58(GraphicElementData *param0, u32 param1); +u32 sub_02021F74(const GraphicElementData *param0); +void sub_02021F7C(GraphicElementData *param0, const NNSG2dImageProxy *param1); +NNSG2dImageProxy *SpriteActor_ImageProxy(GraphicElementData *param0); +NNSG2dImagePaletteProxy *sub_02021F9C(GraphicElementData *param0); +void sub_02021FA0(GraphicElementData *param0, BOOL param1); +NNS_G2D_VRAM_TYPE sub_02021FC8(const GraphicElementData *param0); +BOOL sub_02021FD0(GraphicElementData *param0); +void sub_02021FE0(GraphicElementData *param0, GXOamMode param1); void sub_02022014(int param0); void sub_0202204C(int param0); -u32 sub_0202207C(const GraphicElementData * param0, u32 param1, u32 param2); -u32 sub_020220F4(const GraphicElementData * param0); +u32 sub_0202207C(const GraphicElementData *param0, u32 param1, u32 param2); +u32 sub_020220F4(const GraphicElementData *param0); #endif // POKEPLATINUM_UNK_020218BC_H diff --git a/include/unk_0202298C.h b/include/unk_0202298C.h index 8103a110f3..2cc8c05670 100644 --- a/include/unk_0202298C.h +++ b/include/unk_0202298C.h @@ -1,43 +1,43 @@ #ifndef POKEPLATINUM_UNK_0202298C_H #define POKEPLATINUM_UNK_0202298C_H +#include + #include "struct_decls/struct_0202298C_decl.h" #include "struct_decls/struct_02022BC0_decl.h" #include "struct_decls/struct_02022BD8_2_decl.h" #include "struct_decls/struct_02022BD8_decl.h" -#include - -UnkStruct_0202298C * sub_0202298C(int param0, int param1); -void sub_020229D8(UnkStruct_0202298C * param0); -BOOL sub_020229F8(UnkStruct_0202298C * param0, int param1); -UnkStruct_02022BC0 * sub_02022A1C(UnkStruct_0202298C * param0, void * param1, int param2); -UnkStruct_02022BC0 * sub_02022A58(UnkStruct_0202298C * param0, const char * param1, int param2, int param3); -void sub_02022AB0(UnkStruct_0202298C * param0, UnkStruct_02022BC0 * param1); -void sub_02022AE4(UnkStruct_0202298C * param0); -UnkStruct_02022BC0 * sub_02022B20(UnkStruct_0202298C * param0, int param1); -void * sub_02022B54(UnkStruct_02022BC0 * param0); -void sub_02022B64(UnkStruct_02022BC0 * param0, void * param1); -int sub_02022B80(UnkStruct_02022BC0 * param0); -UnkStruct_02022BD8 * sub_02022BD8(int param0, int param1); -void sub_02022C1C(UnkStruct_02022BD8 * param0); -BOOL sub_02022C40(const UnkStruct_02022BD8 * param0, int param1); -UnkStruct_02022BD8_2 * sub_02022C58(const UnkStruct_02022BD8 * param0, void * param1, int param2, u32 param3, u32 param4); -UnkStruct_02022BD8_2 * sub_02022C9C(UnkStruct_02022BD8 * param0, void * param1, int param2, u32 param3, int param4); -void sub_02022CB4(UnkStruct_02022BD8 * param0, UnkStruct_02022BD8_2 * param1); -void sub_02022D38(UnkStruct_02022BD8 * param0, int param1); -void sub_02022D58(UnkStruct_02022BD8 * param0); -UnkStruct_02022BD8_2 * sub_02022D98(const UnkStruct_02022BD8 * param0, int param1); -int sub_02022DE0(const UnkStruct_02022BD8_2 * param0); -NNSG3dResTex * sub_02022DF4(const UnkStruct_02022BD8_2 * param0); -void sub_02022E08(UnkStruct_02022BD8_2 * param0); -void sub_02022E38(UnkStruct_02022BD8 * param0, int param1); -void sub_02022E54(UnkStruct_02022BD8_2 * param0); -void sub_02022EA0(UnkStruct_02022BD8 * param0, int param1); -void sub_02022EBC(UnkStruct_02022BD8_2 * param0); -NNSGfdTexKey sub_02022EF4(const UnkStruct_02022BD8_2 * param0); -NNSGfdTexKey sub_02022F04(const UnkStruct_02022BD8_2 * param0); -NNSGfdPlttKey sub_02022F14(const UnkStruct_02022BD8_2 * param0); -u32 sub_02022F24(NNSG3dResFileHeader * param0); +UnkStruct_0202298C *sub_0202298C(int param0, int param1); +void sub_020229D8(UnkStruct_0202298C *param0); +BOOL sub_020229F8(UnkStruct_0202298C *param0, int param1); +UnkStruct_02022BC0 *sub_02022A1C(UnkStruct_0202298C *param0, void *param1, int param2); +UnkStruct_02022BC0 *sub_02022A58(UnkStruct_0202298C *param0, const char *param1, int param2, int param3); +void sub_02022AB0(UnkStruct_0202298C *param0, UnkStruct_02022BC0 *param1); +void sub_02022AE4(UnkStruct_0202298C *param0); +UnkStruct_02022BC0 *sub_02022B20(UnkStruct_0202298C *param0, int param1); +void *sub_02022B54(UnkStruct_02022BC0 *param0); +void sub_02022B64(UnkStruct_02022BC0 *param0, void *param1); +int sub_02022B80(UnkStruct_02022BC0 *param0); +UnkStruct_02022BD8 *sub_02022BD8(int param0, int param1); +void sub_02022C1C(UnkStruct_02022BD8 *param0); +BOOL sub_02022C40(const UnkStruct_02022BD8 *param0, int param1); +UnkStruct_02022BD8_2 *sub_02022C58(const UnkStruct_02022BD8 *param0, void *param1, int param2, u32 param3, u32 param4); +UnkStruct_02022BD8_2 *sub_02022C9C(UnkStruct_02022BD8 *param0, void *param1, int param2, u32 param3, int param4); +void sub_02022CB4(UnkStruct_02022BD8 *param0, UnkStruct_02022BD8_2 *param1); +void sub_02022D38(UnkStruct_02022BD8 *param0, int param1); +void sub_02022D58(UnkStruct_02022BD8 *param0); +UnkStruct_02022BD8_2 *sub_02022D98(const UnkStruct_02022BD8 *param0, int param1); +int sub_02022DE0(const UnkStruct_02022BD8_2 *param0); +NNSG3dResTex *sub_02022DF4(const UnkStruct_02022BD8_2 *param0); +void sub_02022E08(UnkStruct_02022BD8_2 *param0); +void sub_02022E38(UnkStruct_02022BD8 *param0, int param1); +void sub_02022E54(UnkStruct_02022BD8_2 *param0); +void sub_02022EA0(UnkStruct_02022BD8 *param0, int param1); +void sub_02022EBC(UnkStruct_02022BD8_2 *param0); +NNSGfdTexKey sub_02022EF4(const UnkStruct_02022BD8_2 *param0); +NNSGfdTexKey sub_02022F04(const UnkStruct_02022BD8_2 *param0); +NNSGfdPlttKey sub_02022F14(const UnkStruct_02022BD8_2 *param0); +u32 sub_02022F24(NNSG3dResFileHeader *param0); #endif // POKEPLATINUM_UNK_0202298C_H diff --git a/include/unk_0202309C.h b/include/unk_0202309C.h index b9b60accdd..eb278f3f56 100644 --- a/include/unk_0202309C.h +++ b/include/unk_0202309C.h @@ -1,12 +1,11 @@ #ifndef POKEPLATINUM_UNK_0202309C_H #define POKEPLATINUM_UNK_0202309C_H - #include -void sub_0202309C(NNSG2dRendererInstance * param0, fx32 param1); -void sub_020230AC(NNSG2dRenderSurface * param0, NNSG2dViewRect * param1, NNSG2dOamRegisterFunction param2, NNSG2dAffineRegisterFunction param3, NNSG2dRndCellCullingFunction param4, NNSG2dSurfaceType param5, NNSG2dRendererInstance * param6); -void sub_020230E0(NNSG2dRenderSurface * param0, NNSG2dViewRect * param1); -BOOL sub_020230F0(const NNSG2dCellData * param0, const MtxFx32 * param1, const NNSG2dViewRect * param2); +void sub_0202309C(NNSG2dRendererInstance *param0, fx32 param1); +void sub_020230AC(NNSG2dRenderSurface *param0, NNSG2dViewRect *param1, NNSG2dOamRegisterFunction param2, NNSG2dAffineRegisterFunction param3, NNSG2dRndCellCullingFunction param4, NNSG2dSurfaceType param5, NNSG2dRendererInstance *param6); +void sub_020230E0(NNSG2dRenderSurface *param0, NNSG2dViewRect *param1); +BOOL sub_020230F0(const NNSG2dCellData *param0, const MtxFx32 *param1, const NNSG2dViewRect *param2); #endif // POKEPLATINUM_UNK_0202309C_H diff --git a/include/unk_020232E0.h b/include/unk_020232E0.h index 4237bfbafa..3b65cea8da 100644 --- a/include/unk_020232E0.h +++ b/include/unk_020232E0.h @@ -1,16 +1,16 @@ #ifndef POKEPLATINUM_UNK_020232E0_H #define POKEPLATINUM_UNK_020232E0_H -#include "struct_defs/struct_02002328.h" #include "struct_decls/struct_02023350_decl.h" +#include "struct_defs/struct_02002328.h" -UnkStruct_02023350 * sub_020232E0(u32 param0, u32 param1, int param2, BOOL param3, u32 param4); -void sub_02023318(UnkStruct_02023350 * param0); -void sub_02023330(UnkStruct_02023350 * param0, int param1, u32 param2); -void sub_020234A0(const UnkStruct_02023350 * param0, u16 param1, UnkStruct_02002328 * param2); -u32 sub_02023620(const UnkStruct_02023350 * param0, const u16 * param1, u32 param2); -BOOL sub_0202366C(const UnkStruct_02023350 * param0, const u16 * param1); -u32 sub_020236D0(const UnkStruct_02023350 * param0, const u16 * param1, u32 param2); -u32 sub_02023738(const UnkStruct_02023350 * param0, const u16 * param1); +UnkStruct_02023350 *sub_020232E0(u32 param0, u32 param1, int param2, BOOL param3, u32 param4); +void sub_02023318(UnkStruct_02023350 *param0); +void sub_02023330(UnkStruct_02023350 *param0, int param1, u32 param2); +void sub_020234A0(const UnkStruct_02023350 *param0, u16 param1, UnkStruct_02002328 *param2); +u32 sub_02023620(const UnkStruct_02023350 *param0, const u16 *param1, u32 param2); +BOOL sub_0202366C(const UnkStruct_02023350 *param0, const u16 *param1); +u32 sub_020236D0(const UnkStruct_02023350 *param0, const u16 *param1, u32 param2); +u32 sub_02023738(const UnkStruct_02023350 *param0, const u16 *param1); #endif // POKEPLATINUM_UNK_020232E0_H diff --git a/include/unk_02023FCC.h b/include/unk_02023FCC.h index cc3ed3d357..32caf1bf58 100644 --- a/include/unk_02023FCC.h +++ b/include/unk_02023FCC.h @@ -1,12 +1,14 @@ #ifndef POKEPLATINUM_UNK_02023FCC_H #define POKEPLATINUM_UNK_02023FCC_H -#include "touch_screen.h" -#include "functypes/funcptr_02023FCC.h" #include "struct_decls/struct_02023FCC_decl.h" -UnkStruct_02023FCC * sub_02023FCC(const TouchScreenHitTable *hitTable, u32 param1, UnkFuncPtr_02023FCC param2, void * param3, u32 param4); -void sub_02024034(UnkStruct_02023FCC * param0); -void sub_0202404C(UnkStruct_02023FCC * param0); +#include "functypes/funcptr_02023FCC.h" + +#include "touch_screen.h" + +UnkStruct_02023FCC *sub_02023FCC(const TouchScreenHitTable *hitTable, u32 param1, UnkFuncPtr_02023FCC param2, void *param3, u32 param4); +void sub_02024034(UnkStruct_02023FCC *param0); +void sub_0202404C(UnkStruct_02023FCC *param0); #endif // POKEPLATINUM_UNK_02023FCC_H diff --git a/include/unk_0202414C.h b/include/unk_0202414C.h index 743f003bf8..19298eed8e 100644 --- a/include/unk_0202414C.h +++ b/include/unk_0202414C.h @@ -4,7 +4,7 @@ #include "struct_defs/struct_0202144C.h" #include "struct_defs/struct_02024184.h" -UnkStruct_0202144C sub_0202414C(const UnkStruct_02024184 * param0, const u16 param1); -void sub_02024184(const void * param0, UnkStruct_02024184 * param1); +UnkStruct_0202144C sub_0202414C(const UnkStruct_02024184 *param0, const u16 param1); +void sub_02024184(const void *param0, UnkStruct_02024184 *param1); #endif // POKEPLATINUM_UNK_0202414C_H diff --git a/include/unk_0202419C.h b/include/unk_0202419C.h index cd0df37870..6ba8f7f80d 100644 --- a/include/unk_0202419C.h +++ b/include/unk_0202419C.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_UNK_0202419C_H #define POKEPLATINUM_UNK_0202419C_H - #include void sub_0202419C(void); diff --git a/include/unk_02024220.h b/include/unk_02024220.h index eb9de9ac14..dedb7fcb9e 100644 --- a/include/unk_02024220.h +++ b/include/unk_02024220.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_UNK_02024220_H #define POKEPLATINUM_UNK_02024220_H -#include "functypes/funcptr_02024220.h" #include "struct_defs/struct_0207C690.h" -GenericPointerData * sub_02024220(u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5); -void sub_020242C4(GenericPointerData * param0); +#include "functypes/funcptr_02024220.h" + +GenericPointerData *sub_02024220(u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5); +void sub_020242C4(GenericPointerData *param0); #endif // POKEPLATINUM_UNK_02024220_H diff --git a/include/unk_02024358.h b/include/unk_02024358.h index eb5e390413..8876610647 100644 --- a/include/unk_02024358.h +++ b/include/unk_02024358.h @@ -2,6 +2,6 @@ #define POKEPLATINUM_UNK_02024358_H void sub_02024358(void); -void sub_020243E0(const char * param0); +void sub_020243E0(const char *param0); #endif // POKEPLATINUM_UNK_02024358_H diff --git a/include/unk_02025CB0.h b/include/unk_02025CB0.h index 2757e4adcb..0fb3dd2955 100644 --- a/include/unk_02025CB0.h +++ b/include/unk_02025CB0.h @@ -3,24 +3,25 @@ #include "struct_decls/struct_02025CCC_decl.h" #include "struct_defs/struct_02055BA8.h" + #include "savedata.h" int SystemData_SaveSize(void); -void SystemData_Init(UnkStruct_02025CCC * param0); -UnkStruct_02025CCC * sub_02025CCC(SaveData * param0); -UnkStruct_02055BA8 * sub_02025CD8(SaveData * param0); -void sub_02025CE4(UnkStruct_02025CCC * param0); -BOOL sub_02025D10(const UnkStruct_02025CCC * param0); -BOOL sub_02025D40(const UnkStruct_02025CCC * param0); -u8 sub_02025D5C(const UnkStruct_02025CCC * param0); -u8 sub_02025D60(const UnkStruct_02025CCC * param0); -BOOL sub_02025D64(const UnkStruct_02025CCC * param0); -void sub_02025D6C(UnkStruct_02025CCC * param0, BOOL param1); -s32 sub_02025D74(const UnkStruct_02025CCC * param0); -void sub_02025D78(UnkStruct_02025CCC * param0, s32 param1); -void sub_02025D84(UnkStruct_02055BA8 * param0); -BOOL sub_02025DB8(const UnkStruct_02055BA8 * param0); -void sub_02025DC8(UnkStruct_02055BA8 * param0, int param1); -void sub_02025DE8(UnkStruct_02055BA8 * param0); +void SystemData_Init(UnkStruct_02025CCC *param0); +UnkStruct_02025CCC *sub_02025CCC(SaveData *param0); +UnkStruct_02055BA8 *sub_02025CD8(SaveData *param0); +void sub_02025CE4(UnkStruct_02025CCC *param0); +BOOL sub_02025D10(const UnkStruct_02025CCC *param0); +BOOL sub_02025D40(const UnkStruct_02025CCC *param0); +u8 sub_02025D5C(const UnkStruct_02025CCC *param0); +u8 sub_02025D60(const UnkStruct_02025CCC *param0); +BOOL sub_02025D64(const UnkStruct_02025CCC *param0); +void sub_02025D6C(UnkStruct_02025CCC *param0, BOOL param1); +s32 sub_02025D74(const UnkStruct_02025CCC *param0); +void sub_02025D78(UnkStruct_02025CCC *param0, s32 param1); +void sub_02025D84(UnkStruct_02055BA8 *param0); +BOOL sub_02025DB8(const UnkStruct_02055BA8 *param0); +void sub_02025DC8(UnkStruct_02055BA8 *param0, int param1); +void sub_02025DE8(UnkStruct_02055BA8 *param0); #endif // POKEPLATINUM_UNK_02025CB0_H diff --git a/include/unk_02025E08.h b/include/unk_02025E08.h index 644139be56..524847cb13 100644 --- a/include/unk_02025E08.h +++ b/include/unk_02025E08.h @@ -2,16 +2,17 @@ #define POKEPLATINUM_UNK_02025E08_H #include "struct_decls/struct_02025E0C_decl.h" -#include "play_time.h" -#include "trainer_info.h" + #include "game_options.h" +#include "play_time.h" #include "savedata.h" +#include "trainer_info.h" int Player_SaveSize(void); -void Player_Init(UnkStruct_02025E0C * param0); -TrainerInfo * SaveData_GetTrainerInfo(SaveData * param0); -Options * SaveData_Options(SaveData * param0); -u16 * sub_02025E50(SaveData * param0); -PlayTime * SaveData_GetPlayTime(SaveData * param0); +void Player_Init(UnkStruct_02025E0C *param0); +TrainerInfo *SaveData_GetTrainerInfo(SaveData *param0); +Options *SaveData_Options(SaveData *param0); +u16 *sub_02025E50(SaveData *param0); +PlayTime *SaveData_GetPlayTime(SaveData *param0); #endif // POKEPLATINUM_UNK_02025E08_H diff --git a/include/unk_0202602C.h b/include/unk_0202602C.h index b62b87c37e..787f59fa45 100644 --- a/include/unk_0202602C.h +++ b/include/unk_0202602C.h @@ -1,19 +1,20 @@ #ifndef POKEPLATINUM_UNK_0202602C_H #define POKEPLATINUM_UNK_0202602C_H -#include "strbuf.h" #include "struct_decls/struct_02026030_decl.h" #include "struct_defs/struct_0202610C.h" + #include "savedata.h" +#include "strbuf.h" int sub_0202602C(void); int RegulationBattles_SaveSize(void); -void BattleRegulation_Copy(const BattleRegulation * param0, BattleRegulation * param1); -void RegulationBattles_Init(UnkStruct_02026030 * param0); -void sub_0202604C(const BattleRegulation * param0, Strbuf *param1); -Strbuf* sub_0202605C(const BattleRegulation * param0, int param1); -int sub_02026074(const BattleRegulation * param0, int param1); -BattleRegulation * sub_0202610C(SaveData * param0, int param1); -void sub_0202613C(SaveData * param0, const BattleRegulation * param1); +void BattleRegulation_Copy(const BattleRegulation *param0, BattleRegulation *param1); +void RegulationBattles_Init(UnkStruct_02026030 *param0); +void sub_0202604C(const BattleRegulation *param0, Strbuf *param1); +Strbuf *sub_0202605C(const BattleRegulation *param0, int param1); +int sub_02026074(const BattleRegulation *param0, int param1); +BattleRegulation *sub_0202610C(SaveData *param0, int param1); +void sub_0202613C(SaveData *param0, const BattleRegulation *param1); #endif // POKEPLATINUM_UNK_0202602C_H diff --git a/include/unk_02026150.h b/include/unk_02026150.h index 2d1cb28240..8ac19c7535 100644 --- a/include/unk_02026150.h +++ b/include/unk_02026150.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_UNK_02026150_H #define POKEPLATINUM_UNK_02026150_H -#include "strbuf.h" #include "struct_defs/struct_0202610C.h" + #include "savedata.h" +#include "strbuf.h" -const BattleRegulation * sub_02026150(SaveData * param0, int param1); -void sub_0202616C(SaveData * param0, int param1, Strbuf *param2, int param3); -const BattleRegulation * sub_020261A8(void); -int sub_020261B0(const BattleRegulation * param0); +const BattleRegulation *sub_02026150(SaveData *param0, int param1); +void sub_0202616C(SaveData *param0, int param1, Strbuf *param2, int param3); +const BattleRegulation *sub_020261A8(void); +int sub_020261B0(const BattleRegulation *param0); #endif // POKEPLATINUM_UNK_02026150_H diff --git a/include/unk_020261E4.h b/include/unk_020261E4.h index 64e0aaa5bf..b01a6534ee 100644 --- a/include/unk_020261E4.h +++ b/include/unk_020261E4.h @@ -5,27 +5,28 @@ #include "struct_decls/struct_02026224_decl.h" #include "struct_decls/struct_02026310_decl.h" #include "struct_defs/struct_0202818C.h" + #include "pokemon.h" #include "savedata.h" int Daycare_SaveSize(void); -void Daycare_Init(UnkStruct_02026310 * param0); -UnkStruct_02026218 * sub_02026218(UnkStruct_02026310 * param0, int param1); -BoxPokemon * sub_02026220(UnkStruct_02026218 * param0); -UnkStruct_02026224 * sub_02026224(UnkStruct_02026218 * param0); -u32 sub_02026228(const UnkStruct_02026218 * param0); -UnkStruct_0202818C * sub_02026230(UnkStruct_02026224 * param0); -int sub_02026234(const UnkStruct_02026310 * param0); -int sub_02026248(const UnkStruct_02026310 * param0); -int sub_02026250(const UnkStruct_02026310 * param0); -void sub_02026258(UnkStruct_02026218 * param0, int param1); -void sub_02026260(UnkStruct_02026218 * param0, int param1); -void sub_02026270(UnkStruct_02026310 * param0, int param1); -void sub_02026278(UnkStruct_02026310 * param0, int param1); -BOOL sub_02026280(UnkStruct_02026310 * param0); -void sub_020262A8(UnkStruct_02026218 * param0, const UnkStruct_02026218 * param1); -void sub_020262C0(UnkStruct_02026224 * param0); -void sub_020262F4(UnkStruct_02026218 * param0); -UnkStruct_02026310 * sub_02026310(SaveData * param0); +void Daycare_Init(UnkStruct_02026310 *param0); +UnkStruct_02026218 *sub_02026218(UnkStruct_02026310 *param0, int param1); +BoxPokemon *sub_02026220(UnkStruct_02026218 *param0); +UnkStruct_02026224 *sub_02026224(UnkStruct_02026218 *param0); +u32 sub_02026228(const UnkStruct_02026218 *param0); +UnkStruct_0202818C *sub_02026230(UnkStruct_02026224 *param0); +int sub_02026234(const UnkStruct_02026310 *param0); +int sub_02026248(const UnkStruct_02026310 *param0); +int sub_02026250(const UnkStruct_02026310 *param0); +void sub_02026258(UnkStruct_02026218 *param0, int param1); +void sub_02026260(UnkStruct_02026218 *param0, int param1); +void sub_02026270(UnkStruct_02026310 *param0, int param1); +void sub_02026278(UnkStruct_02026310 *param0, int param1); +BOOL sub_02026280(UnkStruct_02026310 *param0); +void sub_020262A8(UnkStruct_02026218 *param0, const UnkStruct_02026218 *param1); +void sub_020262C0(UnkStruct_02026224 *param0); +void sub_020262F4(UnkStruct_02026218 *param0); +UnkStruct_02026310 *sub_02026310(SaveData *param0); #endif // POKEPLATINUM_UNK_020261E4_H diff --git a/include/unk_0202631C.h b/include/unk_0202631C.h index f3c0cf11a4..3a047e89bf 100644 --- a/include/unk_0202631C.h +++ b/include/unk_0202631C.h @@ -2,51 +2,52 @@ #define POKEPLATINUM_UNK_0202631C_H #include "struct_decls/pokedexdata_decl.h" + #include "pokemon.h" #include "savedata.h" int Pokedex_SaveSize(void); -PokedexData * sub_02026324(u32 param0); -void sub_02026338(const PokedexData * param0, PokedexData * param1); -void Pokedex_Init(PokedexData * param0); -u16 sub_02026DD0(const PokedexData * param0); -u16 sub_02026E0C(const PokedexData * param0); -u16 sub_02026E48(const PokedexData * param0); -u16 sub_02026E64(const PokedexData * param0); -u16 sub_02026EAC(const PokedexData * param0); -BOOL sub_02026EF4(const PokedexData * param0); -BOOL sub_02026F0C(const PokedexData * param0); -u16 sub_02026F20(const PokedexData * param0); -u16 sub_02026F58(const PokedexData * param0); -BOOL Pokedex_CaughtSpecies(const PokedexData * param0, u16 param1); -BOOL sub_02026FE8(const PokedexData * param0, u16 param1); -u32 sub_0202702C(const PokedexData * param0, u8 param1); -u32 sub_02027058(const PokedexData * param0, u16 param1, int param2); -u32 sub_020270AC(const PokedexData * param0, int param1); -u32 sub_020270DC(const PokedexData * param0); -u32 sub_020270F8(const PokedexData * param0, int param1); -u32 sub_02027130(const PokedexData * param0); -u32 sub_02027154(const PokedexData * param0, int param1); -u32 sub_0202718C(const PokedexData * param0); -u32 sub_020271B0(const PokedexData * param0, int param1); -u32 sub_020271E8(const PokedexData * param0); -u32 sub_02027208(const PokedexData * param0, int param1); -u32 sub_02027240(const PokedexData * param0); -u32 sub_02027264(const PokedexData * param0, int param1); -u32 sub_02027288(const PokedexData * param0); -void sub_020272A4(PokedexData * param0, Pokemon * param1); -void sub_0202736C(PokedexData * param0, Pokemon * param1); -void sub_02027454(PokedexData * param0); -BOOL sub_02027474(const PokedexData * param0); -BOOL sub_02027494(const PokedexData * param0); -void sub_020274B0(PokedexData * param0); -BOOL sub_020274D0(const PokedexData * param0, u16 param1, u32 param2); -void sub_02027508(PokedexData * param0); -BOOL sub_02027514(const PokedexData * param0); -BOOL sub_02027520(const PokedexData * param0); -void sub_02027540(PokedexData * param0); -PokedexData * SaveData_Pokedex(SaveData * param0); -u32 sub_0202756C(const PokedexData * param0, int param1, int param2); -u32 sub_020276C8(const PokedexData * param0, int param1); +PokedexData *sub_02026324(u32 param0); +void sub_02026338(const PokedexData *param0, PokedexData *param1); +void Pokedex_Init(PokedexData *param0); +u16 sub_02026DD0(const PokedexData *param0); +u16 sub_02026E0C(const PokedexData *param0); +u16 sub_02026E48(const PokedexData *param0); +u16 sub_02026E64(const PokedexData *param0); +u16 sub_02026EAC(const PokedexData *param0); +BOOL sub_02026EF4(const PokedexData *param0); +BOOL sub_02026F0C(const PokedexData *param0); +u16 sub_02026F20(const PokedexData *param0); +u16 sub_02026F58(const PokedexData *param0); +BOOL Pokedex_CaughtSpecies(const PokedexData *param0, u16 param1); +BOOL sub_02026FE8(const PokedexData *param0, u16 param1); +u32 sub_0202702C(const PokedexData *param0, u8 param1); +u32 sub_02027058(const PokedexData *param0, u16 param1, int param2); +u32 sub_020270AC(const PokedexData *param0, int param1); +u32 sub_020270DC(const PokedexData *param0); +u32 sub_020270F8(const PokedexData *param0, int param1); +u32 sub_02027130(const PokedexData *param0); +u32 sub_02027154(const PokedexData *param0, int param1); +u32 sub_0202718C(const PokedexData *param0); +u32 sub_020271B0(const PokedexData *param0, int param1); +u32 sub_020271E8(const PokedexData *param0); +u32 sub_02027208(const PokedexData *param0, int param1); +u32 sub_02027240(const PokedexData *param0); +u32 sub_02027264(const PokedexData *param0, int param1); +u32 sub_02027288(const PokedexData *param0); +void sub_020272A4(PokedexData *param0, Pokemon *param1); +void sub_0202736C(PokedexData *param0, Pokemon *param1); +void sub_02027454(PokedexData *param0); +BOOL sub_02027474(const PokedexData *param0); +BOOL sub_02027494(const PokedexData *param0); +void sub_020274B0(PokedexData *param0); +BOOL sub_020274D0(const PokedexData *param0, u16 param1, u32 param2); +void sub_02027508(PokedexData *param0); +BOOL sub_02027514(const PokedexData *param0); +BOOL sub_02027520(const PokedexData *param0); +void sub_02027540(PokedexData *param0); +PokedexData *SaveData_Pokedex(SaveData *param0); +u32 sub_0202756C(const PokedexData *param0, int param1, int param2); +u32 sub_020276C8(const PokedexData *param0, int param1); #endif // POKEPLATINUM_UNK_0202631C_H diff --git a/include/unk_02027B70.h b/include/unk_02027B70.h index 797d2cf80a..4359636497 100644 --- a/include/unk_02027B70.h +++ b/include/unk_02027B70.h @@ -4,21 +4,21 @@ #include "struct_decls/struct_02027854_decl.h" #include "struct_defs/struct_02027BF4.h" -void sub_02027B70(UnkStruct_02027854 * param0); -void sub_02027B90(UnkStruct_02027854 * param0, int param1, const u16 * param2, int param3); -UnkStruct_02027BF4 * sub_02027BF4(int param0); -int sub_02027D04(const UnkStruct_02027854 * param0, int param1); -int sub_02027D10(const UnkStruct_02027854 * param0, int param1); -int sub_02027D18(const UnkStruct_02027854 * param0, int param1); -int sub_02027D34(const UnkStruct_02027854 * param0, int param1); -void sub_02027D40(UnkStruct_02027854 * param0, int param1, const UnkStruct_02027BF4 * param2, int param3); -void sub_02027D78(UnkStruct_02027854 * param0, int param1); -BOOL sub_02027D84(const UnkStruct_02027854 * param0, int param1); -void sub_02027D90(UnkStruct_02027854 * param0, int param1, BOOL param2); -int sub_02027D9C(const UnkStruct_02027854 * param0, int param1); -void sub_02027DA8(UnkStruct_02027854 * param0, int param1, int param2); -int sub_02027DB4(const UnkStruct_02027854 * param0, int param1); -int sub_02027DC0(UnkStruct_02027854 * param0, int param1); -void sub_02027EAC(UnkStruct_02027854 * param0, const UnkStruct_02027BF4 * param1, int param2); +void sub_02027B70(UnkStruct_02027854 *param0); +void sub_02027B90(UnkStruct_02027854 *param0, int param1, const u16 *param2, int param3); +UnkStruct_02027BF4 *sub_02027BF4(int param0); +int sub_02027D04(const UnkStruct_02027854 *param0, int param1); +int sub_02027D10(const UnkStruct_02027854 *param0, int param1); +int sub_02027D18(const UnkStruct_02027854 *param0, int param1); +int sub_02027D34(const UnkStruct_02027854 *param0, int param1); +void sub_02027D40(UnkStruct_02027854 *param0, int param1, const UnkStruct_02027BF4 *param2, int param3); +void sub_02027D78(UnkStruct_02027854 *param0, int param1); +BOOL sub_02027D84(const UnkStruct_02027854 *param0, int param1); +void sub_02027D90(UnkStruct_02027854 *param0, int param1, BOOL param2); +int sub_02027D9C(const UnkStruct_02027854 *param0, int param1); +void sub_02027DA8(UnkStruct_02027854 *param0, int param1, int param2); +int sub_02027DB4(const UnkStruct_02027854 *param0, int param1); +int sub_02027DC0(UnkStruct_02027854 *param0, int param1); +void sub_02027EAC(UnkStruct_02027854 *param0, const UnkStruct_02027BF4 *param1, int param2); #endif // POKEPLATINUM_UNK_02027B70_H diff --git a/include/unk_02027F50.h b/include/unk_02027F50.h index 8fdcb868e5..18f0b637ad 100644 --- a/include/unk_02027F50.h +++ b/include/unk_02027F50.h @@ -3,9 +3,9 @@ #include "struct_decls/struct_02027860_decl.h" -void sub_02027F50(UnkStruct_02027860 * param0); -void * sub_02027F5C(UnkStruct_02027860 * param0, int param1); -void * sub_02027F6C(UnkStruct_02027860 * param0, int param1); -int sub_02027F80(const UnkStruct_02027860 * param0); +void sub_02027F50(UnkStruct_02027860 *param0); +void *sub_02027F5C(UnkStruct_02027860 *param0, int param1); +void *sub_02027F6C(UnkStruct_02027860 *param0, int param1); +int sub_02027F80(const UnkStruct_02027860 *param0); #endif // POKEPLATINUM_UNK_02027F50_H diff --git a/include/unk_02027F84.h b/include/unk_02027F84.h index 93b877151f..07eb1d750e 100644 --- a/include/unk_02027F84.h +++ b/include/unk_02027F84.h @@ -2,15 +2,16 @@ #define POKEPLATINUM_UNK_02027F84_H #include "struct_decls/struct_02027F8C_decl.h" + #include "savedata.h" int PalPad_SaveSize(void); -UnkStruct_02027F8C * sub_02027F8C(SaveData * param0); -void PalPad_Init(UnkStruct_02027F8C * param0); -const u16 * sub_02027FBC(const UnkStruct_02027F8C * param0, int param1); -u8 sub_02027FC4(const UnkStruct_02027F8C * param0, int param1); -BOOL sub_02027FCC(const UnkStruct_02027F8C * param0, const UnkStruct_02027F8C * param1); -void sub_02027FEC(UnkStruct_02027F8C * param0, UnkStruct_02027F8C * param1, int param2, int param3); -int sub_020280E0(UnkStruct_02027F8C * param0, u32 param1); +UnkStruct_02027F8C *sub_02027F8C(SaveData *param0); +void PalPad_Init(UnkStruct_02027F8C *param0); +const u16 *sub_02027FBC(const UnkStruct_02027F8C *param0, int param1); +u8 sub_02027FC4(const UnkStruct_02027F8C *param0, int param1); +BOOL sub_02027FCC(const UnkStruct_02027F8C *param0, const UnkStruct_02027F8C *param1); +void sub_02027FEC(UnkStruct_02027F8C *param0, UnkStruct_02027F8C *param1, int param2, int param3); +int sub_020280E0(UnkStruct_02027F8C *param0, u32 param1); #endif // POKEPLATINUM_UNK_02027F84_H diff --git a/include/unk_02028124.h b/include/unk_02028124.h index 163125efca..d546f9a318 100644 --- a/include/unk_02028124.h +++ b/include/unk_02028124.h @@ -1,35 +1,36 @@ #ifndef POKEPLATINUM_UNK_02028124_H #define POKEPLATINUM_UNK_02028124_H +#include "struct_decls/struct_02028430_decl.h" #include "struct_defs/sentence.h" #include "struct_defs/struct_0202818C.h" -#include "struct_decls/struct_02028430_decl.h" + #include "savedata.h" -void sub_02028124(UnkStruct_0202818C * param0); -BOOL sub_0202817C(UnkStruct_0202818C * param0); -UnkStruct_0202818C * sub_0202818C(int param0); -void sub_020281A0(UnkStruct_0202818C * param0, UnkStruct_0202818C * param1); -void sub_020281AC(UnkStruct_0202818C * param0, u8 param1, u8 param2, SaveData * param3); -u32 sub_02028308(const UnkStruct_0202818C * param0); -u16 * sub_0202830C(UnkStruct_0202818C * param0); -u8 sub_02028310(const UnkStruct_0202818C * param0); -u8 sub_02028314(const UnkStruct_0202818C * param0); -void sub_02028318(UnkStruct_0202818C * param0, const u8 param1); -u8 sub_02028320(const UnkStruct_0202818C * param0); -u8 sub_02028324(const UnkStruct_0202818C * param0); -u16 sub_02028328(const UnkStruct_0202818C * param0, u8 param1, u8 param2, u16 param3); -u16 sub_02028408(const UnkStruct_0202818C * param0); -Sentence * sub_0202840C(UnkStruct_0202818C * param0, u8 param1); -void sub_0202841C(UnkStruct_0202818C * param0, Sentence * param1, u8 param2); -UnkStruct_02028430 * sub_02028430(SaveData * param0); +void sub_02028124(UnkStruct_0202818C *param0); +BOOL sub_0202817C(UnkStruct_0202818C *param0); +UnkStruct_0202818C *sub_0202818C(int param0); +void sub_020281A0(UnkStruct_0202818C *param0, UnkStruct_0202818C *param1); +void sub_020281AC(UnkStruct_0202818C *param0, u8 param1, u8 param2, SaveData *param3); +u32 sub_02028308(const UnkStruct_0202818C *param0); +u16 *sub_0202830C(UnkStruct_0202818C *param0); +u8 sub_02028310(const UnkStruct_0202818C *param0); +u8 sub_02028314(const UnkStruct_0202818C *param0); +void sub_02028318(UnkStruct_0202818C *param0, const u8 param1); +u8 sub_02028320(const UnkStruct_0202818C *param0); +u8 sub_02028324(const UnkStruct_0202818C *param0); +u16 sub_02028328(const UnkStruct_0202818C *param0, u8 param1, u8 param2, u16 param3); +u16 sub_02028408(const UnkStruct_0202818C *param0); +Sentence *sub_0202840C(UnkStruct_0202818C *param0, u8 param1); +void sub_0202841C(UnkStruct_0202818C *param0, Sentence *param1, u8 param2); +UnkStruct_02028430 *sub_02028430(SaveData *param0); int Mail_SaveSize(void); -void Mail_Init(UnkStruct_02028430 * param0); -int sub_0202845C(UnkStruct_02028430 * param0, int param1); -void sub_02028470(UnkStruct_02028430 * param0, int param1, int param2); -void sub_02028480(UnkStruct_02028430 * param0, int param1, int param2, UnkStruct_0202818C * param3); -int sub_02028494(UnkStruct_02028430 * param0, int param1); -UnkStruct_0202818C * sub_020284A8(UnkStruct_02028430 * param0, int param1, int param2, int param3); -void sub_020284CC(UnkStruct_02028430 * param0, int param1, int param2, UnkStruct_0202818C * param3); +void Mail_Init(UnkStruct_02028430 *param0); +int sub_0202845C(UnkStruct_02028430 *param0, int param1); +void sub_02028470(UnkStruct_02028430 *param0, int param1, int param2); +void sub_02028480(UnkStruct_02028430 *param0, int param1, int param2, UnkStruct_0202818C *param3); +int sub_02028494(UnkStruct_02028430 *param0, int param1); +UnkStruct_0202818C *sub_020284A8(UnkStruct_02028430 *param0, int param1, int param2, int param3); +void sub_020284CC(UnkStruct_02028430 *param0, int param1, int param2, UnkStruct_0202818C *param3); #endif // POKEPLATINUM_UNK_02028124_H diff --git a/include/unk_0202854C.h b/include/unk_0202854C.h index 8be644178a..0012e0f182 100644 --- a/include/unk_0202854C.h +++ b/include/unk_0202854C.h @@ -1,135 +1,136 @@ #ifndef POKEPLATINUM_UNK_0202854C_H #define POKEPLATINUM_UNK_0202854C_H -#include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_02029894_decl.h" #include "struct_decls/struct_020298B0_decl.h" + #include "savedata.h" +#include "trainer_info.h" int Underground_SaveSize(void); int sub_02028554(void); int sub_02028558(void); -SecretBaseRecord * sub_0202855C(u32 param0); -void Underground_Init(UndergroundData * param0); -void sub_02028658(SaveData * param0, int param1); -void sub_02028758(SaveData * param0, s32 param1, BOOL param2); -void sub_0202878C(SaveData * param0); -void sub_020287E0(SaveData * param0); -void sub_020287F8(SaveData * param0); -BOOL sub_02028810(SaveData * param0); -void sub_02028828(UndergroundData * param0); -void sub_02028830(UndergroundData * param0, const TrainerInfo * param1); -TrainerInfo * sub_020288C8(const UndergroundData * param0, int param1, int param2); -u32 sub_02028930(UndergroundData * param0); +SecretBaseRecord *sub_0202855C(u32 param0); +void Underground_Init(UndergroundData *param0); +void sub_02028658(SaveData *param0, int param1); +void sub_02028758(SaveData *param0, s32 param1, BOOL param2); +void sub_0202878C(SaveData *param0); +void sub_020287E0(SaveData *param0); +void sub_020287F8(SaveData *param0); +BOOL sub_02028810(SaveData *param0); +void sub_02028828(UndergroundData *param0); +void sub_02028830(UndergroundData *param0, const TrainerInfo *param1); +TrainerInfo *sub_020288C8(const UndergroundData *param0, int param1, int param2); +u32 sub_02028930(UndergroundData *param0); int sub_02028938(int param0); -BOOL sub_0202895C(UndergroundData * param0, int param1); -BOOL sub_02028984(UndergroundData * param0, int param1); -int sub_020289A0(UndergroundData * param0); -int sub_020289B8(UndergroundData * param0, int param1); -int sub_020289C4(UndergroundData * param0, int param1); -void sub_02028A10(UndergroundData * param0, int param1, int param2); -int sub_02028ACC(UndergroundData * param0, int param1, int param2); -BOOL sub_02028AFC(UndergroundData * param0, int param1); -void sub_02028B20(UndergroundData * param0, int param1); -void sub_02028B34(UndergroundData * param0); -int sub_02028B70(UndergroundData * param0); -int sub_02028B88(UndergroundData * param0, int param1); -int sub_02028B94(UndergroundData * param0, int param1); -BOOL sub_02028BC8(UndergroundData * param0, int param1); -void sub_02028BE8(UndergroundData * param0, int param1, int param2); -int sub_02028C3C(UndergroundData * param0); -int sub_02028C54(UndergroundData * param0, int param1); -int sub_02028C60(UndergroundData * param0, int param1); -int sub_02028C6C(UndergroundData * param0, int param1); -BOOL sub_02028CB0(UndergroundData * param0, int param1, int param2); -void sub_02028CD8(UndergroundData * param0, int param1, int param2); -int sub_02028D58(UndergroundData * param0); -int sub_02028D74(UndergroundData * param0, int param1); -int sub_02028D80(UndergroundData * param0, int param1); -BOOL sub_02028DB4(UndergroundData * param0, int param1); -void sub_02028DD8(UndergroundData * param0, int param1, int param2); -int sub_02028E28(UndergroundData * param0); -int sub_02028E44(UndergroundData * param0, int param1); -int sub_02028E50(UndergroundData * param0, int param1); -BOOL sub_02028E84(UndergroundData * param0, int param1); -void sub_02028EA8(UndergroundData * param0, int param1, int param2); -void sub_02028EF8(UndergroundData * param0, int param1, int param2, int param3, int param4); -int sub_02028F40(UndergroundData * param0, int param1); -int sub_02028F5C(UndergroundData * param0, int param1); -int sub_02028F88(UndergroundData * param0, int param1); -void sub_02028FB4(UndergroundData * param0, int param1); -void sub_02028FE0(UndergroundData * param0, int param1, int param2, int param3, int param4, int param5); -int sub_02029030(UndergroundData * param0, int param1); -int sub_0202903C(UndergroundData * param0, int param1); -int sub_0202905C(UndergroundData * param0, int param1); -int sub_0202907C(UndergroundData * param0, int param1); -void sub_02029088(UndergroundData * param0, int param1, int param2, int param3, int param4, int param5, int param6); -int sub_020290DC(UndergroundData * param0, int param1); -int sub_020290E8(UndergroundData * param0, int param1); -int sub_02029108(UndergroundData * param0, int param1); -int sub_02029128(UndergroundData * param0, int param1); -int sub_02029134(UndergroundData * param0, int param1); -int sub_02029140(UndergroundData * param0, int param1, int param2); -void sub_020291A4(UndergroundData * param0, int param1); -int sub_020291CC(UndergroundData * param0, int param1); -int sub_020291EC(UndergroundData * param0, int param1); -BOOL sub_0202920C(UndergroundData * param0); -void sub_02029220(UndergroundData * param0); -BOOL sub_02029234(UndergroundData * param0); -void sub_02029240(UndergroundData * param0); -void sub_02029250(UndergroundData * param0, int param1); -BOOL sub_02029274(UndergroundData * param0, int param1); -void sub_0202929C(UndergroundData * param0); -int sub_020292B4(UndergroundData * param0); -void sub_020292C0(UnkStruct_02029894 * param0); -void sub_020292CC(UnkStruct_02029894 * param0); -void sub_02029300(UnkStruct_02029894 * param0); -void sub_02029308(UnkStruct_02029894 * param0, int param1, int param2, int param3, int param4); -void sub_02029364(UnkStruct_02029894 * param0, int param1, int param2, int param3); -int sub_020293B0(const UnkStruct_02029894 * param0, int param1); -int sub_020293FC(const UnkStruct_02029894 * param0, int param1); -int sub_0202942C(const UnkStruct_02029894 * param0, int param1); -int sub_02029460(const UnkStruct_02029894 * param0); -int sub_0202948C(const UnkStruct_02029894 * param0); -int sub_020294B8(const SecretBaseRecord * param0); -int sub_020294C0(const SecretBaseRecord * param0); -void sub_020294D4(SecretBaseRecord * param0, int param1); -int sub_020294EC(const SecretBaseRecord * param0); -void sub_020294F4(SecretBaseRecord * param0, int param1); -int sub_02029524(const SecretBaseRecord * param0); -void sub_0202952C(SecretBaseRecord * param0); -void sub_0202955C(SecretBaseRecord * param0); -int sub_0202958C(const SecretBaseRecord * param0); -int sub_020295B8(const SecretBaseRecord * param0); -void sub_020295C0(SecretBaseRecord * param0); -int sub_020295F0(const SecretBaseRecord * param0); -void sub_020295F8(SecretBaseRecord * param0, int param1); -int sub_0202963C(const SecretBaseRecord * param0); -void sub_02029644(SecretBaseRecord * param0, int param1); -void sub_02029688(SecretBaseRecord * param0, int param1); -int sub_020296CC(const SecretBaseRecord * param0); -void sub_020296D4(SecretBaseRecord * param0); -int sub_02029704(const SecretBaseRecord * param0); -void sub_0202970C(SecretBaseRecord * param0); -int sub_0202973C(const SecretBaseRecord * param0); -void sub_02029744(SecretBaseRecord * param0); -int sub_02029774(const SecretBaseRecord * param0); -void sub_0202977C(SecretBaseRecord * param0); -int sub_020297AC(const SecretBaseRecord * param0); -void sub_020297B4(SecretBaseRecord * param0); -int sub_020297E4(const SecretBaseRecord * param0); -void sub_020297EC(SecretBaseRecord * param0); -int sub_0202981C(const SecretBaseRecord * param0); -void sub_02029824(SecretBaseRecord * param0); -void sub_02029854(UnkStruct_02029894 * param0, int param1, int param2, int param3); -int sub_02029874(const UnkStruct_02029894 * param0); -int sub_0202987C(const UnkStruct_02029894 * param0); -int sub_02029884(const UnkStruct_02029894 * param0); -BOOL sub_0202988C(const UnkStruct_02029894 * param0); -UnkStruct_02029894 * sub_02029894(SaveData * param0); -SecretBaseRecord * SaveData_SecretBaseRecord(SaveData * param0); -SecretBaseRecord * sub_020298AC(UnkStruct_02029894 * param0); -UndergroundData * sub_020298B0(SaveData * param0); +BOOL sub_0202895C(UndergroundData *param0, int param1); +BOOL sub_02028984(UndergroundData *param0, int param1); +int sub_020289A0(UndergroundData *param0); +int sub_020289B8(UndergroundData *param0, int param1); +int sub_020289C4(UndergroundData *param0, int param1); +void sub_02028A10(UndergroundData *param0, int param1, int param2); +int sub_02028ACC(UndergroundData *param0, int param1, int param2); +BOOL sub_02028AFC(UndergroundData *param0, int param1); +void sub_02028B20(UndergroundData *param0, int param1); +void sub_02028B34(UndergroundData *param0); +int sub_02028B70(UndergroundData *param0); +int sub_02028B88(UndergroundData *param0, int param1); +int sub_02028B94(UndergroundData *param0, int param1); +BOOL sub_02028BC8(UndergroundData *param0, int param1); +void sub_02028BE8(UndergroundData *param0, int param1, int param2); +int sub_02028C3C(UndergroundData *param0); +int sub_02028C54(UndergroundData *param0, int param1); +int sub_02028C60(UndergroundData *param0, int param1); +int sub_02028C6C(UndergroundData *param0, int param1); +BOOL sub_02028CB0(UndergroundData *param0, int param1, int param2); +void sub_02028CD8(UndergroundData *param0, int param1, int param2); +int sub_02028D58(UndergroundData *param0); +int sub_02028D74(UndergroundData *param0, int param1); +int sub_02028D80(UndergroundData *param0, int param1); +BOOL sub_02028DB4(UndergroundData *param0, int param1); +void sub_02028DD8(UndergroundData *param0, int param1, int param2); +int sub_02028E28(UndergroundData *param0); +int sub_02028E44(UndergroundData *param0, int param1); +int sub_02028E50(UndergroundData *param0, int param1); +BOOL sub_02028E84(UndergroundData *param0, int param1); +void sub_02028EA8(UndergroundData *param0, int param1, int param2); +void sub_02028EF8(UndergroundData *param0, int param1, int param2, int param3, int param4); +int sub_02028F40(UndergroundData *param0, int param1); +int sub_02028F5C(UndergroundData *param0, int param1); +int sub_02028F88(UndergroundData *param0, int param1); +void sub_02028FB4(UndergroundData *param0, int param1); +void sub_02028FE0(UndergroundData *param0, int param1, int param2, int param3, int param4, int param5); +int sub_02029030(UndergroundData *param0, int param1); +int sub_0202903C(UndergroundData *param0, int param1); +int sub_0202905C(UndergroundData *param0, int param1); +int sub_0202907C(UndergroundData *param0, int param1); +void sub_02029088(UndergroundData *param0, int param1, int param2, int param3, int param4, int param5, int param6); +int sub_020290DC(UndergroundData *param0, int param1); +int sub_020290E8(UndergroundData *param0, int param1); +int sub_02029108(UndergroundData *param0, int param1); +int sub_02029128(UndergroundData *param0, int param1); +int sub_02029134(UndergroundData *param0, int param1); +int sub_02029140(UndergroundData *param0, int param1, int param2); +void sub_020291A4(UndergroundData *param0, int param1); +int sub_020291CC(UndergroundData *param0, int param1); +int sub_020291EC(UndergroundData *param0, int param1); +BOOL sub_0202920C(UndergroundData *param0); +void sub_02029220(UndergroundData *param0); +BOOL sub_02029234(UndergroundData *param0); +void sub_02029240(UndergroundData *param0); +void sub_02029250(UndergroundData *param0, int param1); +BOOL sub_02029274(UndergroundData *param0, int param1); +void sub_0202929C(UndergroundData *param0); +int sub_020292B4(UndergroundData *param0); +void sub_020292C0(UnkStruct_02029894 *param0); +void sub_020292CC(UnkStruct_02029894 *param0); +void sub_02029300(UnkStruct_02029894 *param0); +void sub_02029308(UnkStruct_02029894 *param0, int param1, int param2, int param3, int param4); +void sub_02029364(UnkStruct_02029894 *param0, int param1, int param2, int param3); +int sub_020293B0(const UnkStruct_02029894 *param0, int param1); +int sub_020293FC(const UnkStruct_02029894 *param0, int param1); +int sub_0202942C(const UnkStruct_02029894 *param0, int param1); +int sub_02029460(const UnkStruct_02029894 *param0); +int sub_0202948C(const UnkStruct_02029894 *param0); +int sub_020294B8(const SecretBaseRecord *param0); +int sub_020294C0(const SecretBaseRecord *param0); +void sub_020294D4(SecretBaseRecord *param0, int param1); +int sub_020294EC(const SecretBaseRecord *param0); +void sub_020294F4(SecretBaseRecord *param0, int param1); +int sub_02029524(const SecretBaseRecord *param0); +void sub_0202952C(SecretBaseRecord *param0); +void sub_0202955C(SecretBaseRecord *param0); +int sub_0202958C(const SecretBaseRecord *param0); +int sub_020295B8(const SecretBaseRecord *param0); +void sub_020295C0(SecretBaseRecord *param0); +int sub_020295F0(const SecretBaseRecord *param0); +void sub_020295F8(SecretBaseRecord *param0, int param1); +int sub_0202963C(const SecretBaseRecord *param0); +void sub_02029644(SecretBaseRecord *param0, int param1); +void sub_02029688(SecretBaseRecord *param0, int param1); +int sub_020296CC(const SecretBaseRecord *param0); +void sub_020296D4(SecretBaseRecord *param0); +int sub_02029704(const SecretBaseRecord *param0); +void sub_0202970C(SecretBaseRecord *param0); +int sub_0202973C(const SecretBaseRecord *param0); +void sub_02029744(SecretBaseRecord *param0); +int sub_02029774(const SecretBaseRecord *param0); +void sub_0202977C(SecretBaseRecord *param0); +int sub_020297AC(const SecretBaseRecord *param0); +void sub_020297B4(SecretBaseRecord *param0); +int sub_020297E4(const SecretBaseRecord *param0); +void sub_020297EC(SecretBaseRecord *param0); +int sub_0202981C(const SecretBaseRecord *param0); +void sub_02029824(SecretBaseRecord *param0); +void sub_02029854(UnkStruct_02029894 *param0, int param1, int param2, int param3); +int sub_02029874(const UnkStruct_02029894 *param0); +int sub_0202987C(const UnkStruct_02029894 *param0); +int sub_02029884(const UnkStruct_02029894 *param0); +BOOL sub_0202988C(const UnkStruct_02029894 *param0); +UnkStruct_02029894 *sub_02029894(SaveData *param0); +SecretBaseRecord *SaveData_SecretBaseRecord(SaveData *param0); +SecretBaseRecord *sub_020298AC(UnkStruct_02029894 *param0); +UndergroundData *sub_020298B0(SaveData *param0); #endif // POKEPLATINUM_UNK_0202854C_H diff --git a/include/unk_020298BC.h b/include/unk_020298BC.h index a4693e8ea4..52b48d36d3 100644 --- a/include/unk_020298BC.h +++ b/include/unk_020298BC.h @@ -1,91 +1,93 @@ #ifndef POKEPLATINUM_UNK_020298BC_H #define POKEPLATINUM_UNK_020298BC_H -#include "strbuf.h" -#include "struct_defs/struct_020298D8.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029C88_decl.h" #include "struct_decls/struct_02029D04_decl.h" #include "struct_decls/struct_0202A138_decl.h" #include "struct_decls/struct_0202A150_decl.h" #include "struct_decls/struct_0202A750_decl.h" -#include "pokemon.h" -#include "savedata.h" +#include "struct_defs/struct_020298D8.h" + #include "overlay022/struct_ov22_02255040.h" #include "overlay061/struct_ov61_0222AE80.h" -void ImageClip_Init(UnkStruct_0202A750 * param0); +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" + +void ImageClip_Init(UnkStruct_0202A750 *param0); int ImageClip_SaveSize(void); int sub_02029C60(void); int sub_02029C64(void); -UnkStruct_02029C68 * sub_02029C68(u32 param0); -UnkStruct_02029C88 * sub_02029C88(u32 param0); -UnkStruct_02029C68 * sub_02029CA8(UnkStruct_0202A750 * param0, int param1); -UnkStruct_02029C88 * sub_02029CD0(UnkStruct_0202A750 * param0, int param1); -UnkStruct_02029D04 * sub_02029D04(UnkStruct_0202A750 * param0); -BOOL sub_02029D10(const UnkStruct_0202A750 * param0, int param1); -BOOL sub_02029D2C(const UnkStruct_0202A750 * param0, int param1); -BOOL sub_02029D50(const UnkStruct_02029D04 * param0, u32 param1, u32 param2); -BOOL sub_02029D80(const UnkStruct_02029D04 * param0, u32 param1); -u32 sub_02029D94(const UnkStruct_02029D04 * param0, u32 param1); -u32 sub_02029DD4(const UnkStruct_02029D04 * param0, u32 param1); -u32 sub_02029DF0(const UnkStruct_02029D04 * param0); -u32 sub_02029E0C(const UnkStruct_02029D04 * param0); -void sub_02029E2C(UnkStruct_02029D04 * param0, u32 param1, u32 param2); -void sub_02029EA0(UnkStruct_02029D04 * param0, u32 param1, u32 param2); -void sub_02029EFC(UnkStruct_02029D04 * param0, u32 param1); -BOOL sub_02029F34(const UnkStruct_02029C68 * param0); -void sub_02029F5C(UnkStruct_02029C68 * param0); -void sub_02029F84(UnkStruct_02029C68 * param0); -void sub_02029FAC(UnkStruct_02029C68 * param0, Pokemon * param1, UnkStruct_020298D8 * param2); -void sub_02029FD0(UnkStruct_02029C68 * param0, const UnkStruct_ov22_02255040 * param1, int param2); -void sub_0202A084(UnkStruct_02029C68 * param0, u8 param1); -void sub_0202A0A0(UnkStruct_02029C68 * param0, u16 param1); -void sub_0202A0CC(UnkStruct_02029C68 * param0, const UnkStruct_02029C68 * param1); -void sub_0202A0EC(UnkStruct_02029C68 * param0, const Strbuf *param1, int param2); -BOOL sub_0202A110(const UnkStruct_02029C68 * param0, int param1); -const UnkStruct_0202A138 * sub_0202A138(const UnkStruct_02029C68 * param0); -const UnkStruct_0202A150 * sub_0202A150(const UnkStruct_02029C68 * param0, int param1); -u16 sub_0202A184(const UnkStruct_02029C68 * param0); -void sub_0202A1A0(const UnkStruct_02029C68 * param0, Strbuf *param1); -u32 sub_0202A1C0(const UnkStruct_02029C68 * param0); -u8 sub_0202A1DC(const UnkStruct_02029C68 * param0); -u16 sub_0202A1F4(const UnkStruct_02029C68 * param0); -u8 sub_0202A200(const UnkStruct_02029C68 * param0); -BOOL sub_0202A218(const UnkStruct_02029C88 * param0); -void sub_0202A240(UnkStruct_02029C88 * param0); -void sub_0202A25C(UnkStruct_02029C88 * param0); -void sub_0202A284(UnkStruct_02029C88 * param0, Pokemon * param1, UnkStruct_020298D8 * param2); -void sub_0202A2A8(UnkStruct_02029C88 * param0, const UnkStruct_ov22_02255040 * param1, int param2); -void sub_0202A35C(UnkStruct_02029C88 * param0, u8 param1); -void sub_0202A378(UnkStruct_02029C88 * param0, u32 param1); -void sub_0202A390(UnkStruct_02029C88 * param0, const UnkStruct_02029C88 * param1); -void sub_0202A3B0(UnkStruct_02029C88 * param0, Pokemon * param1, s8 param2); -void sub_0202A3EC(UnkStruct_02029C88 * param0, u32 param1, u8 param2, u8 param3, u8 param4, s8 param5); -BOOL sub_0202A488(const UnkStruct_02029C88 * param0, int param1); -void sub_0202A4B4(UnkStruct_02029C88 * param0, const Strbuf *param1, int param2); -const UnkStruct_0202A138 * sub_0202A4D8(const UnkStruct_02029C88 * param0); -const UnkStruct_0202A150 * sub_0202A4F0(const UnkStruct_02029C88 * param0, int param1); -void sub_0202A524(const UnkStruct_02029C88 * param0, Strbuf *param1); -u32 sub_0202A544(const UnkStruct_02029C88 * param0); -void sub_0202A560(const UnkStruct_02029C88 * param0, Pokemon * param1); -u8 sub_0202A580(const UnkStruct_02029C88 * param0, int param1); -u8 sub_0202A5B8(const UnkStruct_02029C88 * param0); -u32 sub_0202A5D0(const UnkStruct_02029C88 * param0); -u16 sub_0202A5E8(const UnkStruct_0202A138 * param0); -void sub_0202A5EC(const UnkStruct_0202A138 * param0, Strbuf *param1); -u32 sub_0202A5FC(const UnkStruct_0202A138 * param0); -s8 sub_0202A604(const UnkStruct_0202A138 * param0); -u8 sub_0202A60C(const UnkStruct_0202A138 * param0); -u8 sub_0202A614(const UnkStruct_0202A138 * param0); -void sub_0202A61C(const UnkStruct_0202A138 * param0, Pokemon * param1); -u8 sub_0202A624(const UnkStruct_0202A150 * param0); -u8 sub_0202A628(const UnkStruct_0202A150 * param0); -u8 sub_0202A62C(const UnkStruct_0202A150 * param0); -s8 sub_0202A630(const UnkStruct_0202A150 * param0); -void sub_0202A6A8(u8 param0, int param1, UnkStruct_0202A750 * param2, const void ** param3); -UnkStruct_0202A750 * sub_0202A750(SaveData * param0); -void sub_0202A75C(const UnkStruct_02029C68 * param0, UnkStruct_ov61_0222AE80 * param1); -void sub_0202A824(const UnkStruct_ov61_0222AE80 * param0, UnkStruct_02029C68 * param1); +UnkStruct_02029C68 *sub_02029C68(u32 param0); +UnkStruct_02029C88 *sub_02029C88(u32 param0); +UnkStruct_02029C68 *sub_02029CA8(UnkStruct_0202A750 *param0, int param1); +UnkStruct_02029C88 *sub_02029CD0(UnkStruct_0202A750 *param0, int param1); +UnkStruct_02029D04 *sub_02029D04(UnkStruct_0202A750 *param0); +BOOL sub_02029D10(const UnkStruct_0202A750 *param0, int param1); +BOOL sub_02029D2C(const UnkStruct_0202A750 *param0, int param1); +BOOL sub_02029D50(const UnkStruct_02029D04 *param0, u32 param1, u32 param2); +BOOL sub_02029D80(const UnkStruct_02029D04 *param0, u32 param1); +u32 sub_02029D94(const UnkStruct_02029D04 *param0, u32 param1); +u32 sub_02029DD4(const UnkStruct_02029D04 *param0, u32 param1); +u32 sub_02029DF0(const UnkStruct_02029D04 *param0); +u32 sub_02029E0C(const UnkStruct_02029D04 *param0); +void sub_02029E2C(UnkStruct_02029D04 *param0, u32 param1, u32 param2); +void sub_02029EA0(UnkStruct_02029D04 *param0, u32 param1, u32 param2); +void sub_02029EFC(UnkStruct_02029D04 *param0, u32 param1); +BOOL sub_02029F34(const UnkStruct_02029C68 *param0); +void sub_02029F5C(UnkStruct_02029C68 *param0); +void sub_02029F84(UnkStruct_02029C68 *param0); +void sub_02029FAC(UnkStruct_02029C68 *param0, Pokemon *param1, UnkStruct_020298D8 *param2); +void sub_02029FD0(UnkStruct_02029C68 *param0, const UnkStruct_ov22_02255040 *param1, int param2); +void sub_0202A084(UnkStruct_02029C68 *param0, u8 param1); +void sub_0202A0A0(UnkStruct_02029C68 *param0, u16 param1); +void sub_0202A0CC(UnkStruct_02029C68 *param0, const UnkStruct_02029C68 *param1); +void sub_0202A0EC(UnkStruct_02029C68 *param0, const Strbuf *param1, int param2); +BOOL sub_0202A110(const UnkStruct_02029C68 *param0, int param1); +const UnkStruct_0202A138 *sub_0202A138(const UnkStruct_02029C68 *param0); +const UnkStruct_0202A150 *sub_0202A150(const UnkStruct_02029C68 *param0, int param1); +u16 sub_0202A184(const UnkStruct_02029C68 *param0); +void sub_0202A1A0(const UnkStruct_02029C68 *param0, Strbuf *param1); +u32 sub_0202A1C0(const UnkStruct_02029C68 *param0); +u8 sub_0202A1DC(const UnkStruct_02029C68 *param0); +u16 sub_0202A1F4(const UnkStruct_02029C68 *param0); +u8 sub_0202A200(const UnkStruct_02029C68 *param0); +BOOL sub_0202A218(const UnkStruct_02029C88 *param0); +void sub_0202A240(UnkStruct_02029C88 *param0); +void sub_0202A25C(UnkStruct_02029C88 *param0); +void sub_0202A284(UnkStruct_02029C88 *param0, Pokemon *param1, UnkStruct_020298D8 *param2); +void sub_0202A2A8(UnkStruct_02029C88 *param0, const UnkStruct_ov22_02255040 *param1, int param2); +void sub_0202A35C(UnkStruct_02029C88 *param0, u8 param1); +void sub_0202A378(UnkStruct_02029C88 *param0, u32 param1); +void sub_0202A390(UnkStruct_02029C88 *param0, const UnkStruct_02029C88 *param1); +void sub_0202A3B0(UnkStruct_02029C88 *param0, Pokemon *param1, s8 param2); +void sub_0202A3EC(UnkStruct_02029C88 *param0, u32 param1, u8 param2, u8 param3, u8 param4, s8 param5); +BOOL sub_0202A488(const UnkStruct_02029C88 *param0, int param1); +void sub_0202A4B4(UnkStruct_02029C88 *param0, const Strbuf *param1, int param2); +const UnkStruct_0202A138 *sub_0202A4D8(const UnkStruct_02029C88 *param0); +const UnkStruct_0202A150 *sub_0202A4F0(const UnkStruct_02029C88 *param0, int param1); +void sub_0202A524(const UnkStruct_02029C88 *param0, Strbuf *param1); +u32 sub_0202A544(const UnkStruct_02029C88 *param0); +void sub_0202A560(const UnkStruct_02029C88 *param0, Pokemon *param1); +u8 sub_0202A580(const UnkStruct_02029C88 *param0, int param1); +u8 sub_0202A5B8(const UnkStruct_02029C88 *param0); +u32 sub_0202A5D0(const UnkStruct_02029C88 *param0); +u16 sub_0202A5E8(const UnkStruct_0202A138 *param0); +void sub_0202A5EC(const UnkStruct_0202A138 *param0, Strbuf *param1); +u32 sub_0202A5FC(const UnkStruct_0202A138 *param0); +s8 sub_0202A604(const UnkStruct_0202A138 *param0); +u8 sub_0202A60C(const UnkStruct_0202A138 *param0); +u8 sub_0202A614(const UnkStruct_0202A138 *param0); +void sub_0202A61C(const UnkStruct_0202A138 *param0, Pokemon *param1); +u8 sub_0202A624(const UnkStruct_0202A150 *param0); +u8 sub_0202A628(const UnkStruct_0202A150 *param0); +u8 sub_0202A62C(const UnkStruct_0202A150 *param0); +s8 sub_0202A630(const UnkStruct_0202A150 *param0); +void sub_0202A6A8(u8 param0, int param1, UnkStruct_0202A750 *param2, const void **param3); +UnkStruct_0202A750 *sub_0202A750(SaveData *param0); +void sub_0202A75C(const UnkStruct_02029C68 *param0, UnkStruct_ov61_0222AE80 *param1); +void sub_0202A824(const UnkStruct_ov61_0222AE80 *param0, UnkStruct_02029C68 *param1); #endif // POKEPLATINUM_UNK_020298BC_H diff --git a/include/unk_0202ACE0.h b/include/unk_0202ACE0.h index 21e1b0ee28..5df7341add 100644 --- a/include/unk_0202ACE0.h +++ b/include/unk_0202ACE0.h @@ -1,34 +1,35 @@ #ifndef POKEPLATINUM_UNK_0202ACE0_H #define POKEPLATINUM_UNK_0202ACE0_H -#include "strbuf.h" +#include + #include "struct_decls/struct_0202B370_decl.h" -#include "savedata.h" -#include +#include "savedata.h" +#include "strbuf.h" int WiFiList_SaveSize(void); -void WiFiList_Init(UnkStruct_0202B370 * param0); -DWCUserData * sub_0202AD28(UnkStruct_0202B370 * param0); -u32 sub_0202AD2C(UnkStruct_0202B370 * param0, int param1, int param2); -void sub_0202AE2C(UnkStruct_0202B370 * param0, int param1, int param2, u32 param3); -DWCFriendData * sub_0202AED8(UnkStruct_0202B370 * param0, int param1); -u16 * sub_0202AEF0(UnkStruct_0202B370 * param0, int param1); -void sub_0202AF0C(UnkStruct_0202B370 * param0, int param1, Strbuf *param2); -u16 * sub_0202AF34(UnkStruct_0202B370 * param0, int param1); -void sub_0202AF50(UnkStruct_0202B370 * param0, int param1, Strbuf *param2); -BOOL sub_0202AF78(UnkStruct_0202B370 * param0, int param1); -int sub_0202AF94(UnkStruct_0202B370 * param0); -int sub_0202AFB4(UnkStruct_0202B370 * param0); -void sub_0202AFD4(UnkStruct_0202B370 * param0, int param1); -void sub_0202B0F8(UnkStruct_0202B370 * param0); -void sub_0202B13C(UnkStruct_0202B370 * param0, int param1); -void sub_0202B174(UnkStruct_0202B370 * param0, int param1, int param2, int param3, int param4); -void sub_0202B1D0(UnkStruct_0202B370 * param0, int param1, int param2); -void sub_0202B1F8(UnkStruct_0202B370 * param0, int param1, int param2); -void sub_0202B220(UnkStruct_0202B370 * param0, int param1, int param2); -void sub_0202B248(UnkStruct_0202B370 * param0, int param1, int param2); -void sub_0202B270(UnkStruct_0202B370 * param0, int param1, int param2); -UnkStruct_0202B370 * sub_0202B370(SaveData * param0); +void WiFiList_Init(UnkStruct_0202B370 *param0); +DWCUserData *sub_0202AD28(UnkStruct_0202B370 *param0); +u32 sub_0202AD2C(UnkStruct_0202B370 *param0, int param1, int param2); +void sub_0202AE2C(UnkStruct_0202B370 *param0, int param1, int param2, u32 param3); +DWCFriendData *sub_0202AED8(UnkStruct_0202B370 *param0, int param1); +u16 *sub_0202AEF0(UnkStruct_0202B370 *param0, int param1); +void sub_0202AF0C(UnkStruct_0202B370 *param0, int param1, Strbuf *param2); +u16 *sub_0202AF34(UnkStruct_0202B370 *param0, int param1); +void sub_0202AF50(UnkStruct_0202B370 *param0, int param1, Strbuf *param2); +BOOL sub_0202AF78(UnkStruct_0202B370 *param0, int param1); +int sub_0202AF94(UnkStruct_0202B370 *param0); +int sub_0202AFB4(UnkStruct_0202B370 *param0); +void sub_0202AFD4(UnkStruct_0202B370 *param0, int param1); +void sub_0202B0F8(UnkStruct_0202B370 *param0); +void sub_0202B13C(UnkStruct_0202B370 *param0, int param1); +void sub_0202B174(UnkStruct_0202B370 *param0, int param1, int param2, int param3, int param4); +void sub_0202B1D0(UnkStruct_0202B370 *param0, int param1, int param2); +void sub_0202B1F8(UnkStruct_0202B370 *param0, int param1, int param2); +void sub_0202B220(UnkStruct_0202B370 *param0, int param1, int param2); +void sub_0202B248(UnkStruct_0202B370 *param0, int param1, int param2); +void sub_0202B270(UnkStruct_0202B370 *param0, int param1, int param2); +UnkStruct_0202B370 *sub_0202B370(SaveData *param0); #endif // POKEPLATINUM_UNK_0202ACE0_H diff --git a/include/unk_0202B37C.h b/include/unk_0202B37C.h index 8f7e343d01..81fbc9375a 100644 --- a/include/unk_0202B37C.h +++ b/include/unk_0202B37C.h @@ -1,29 +1,30 @@ #ifndef POKEPLATINUM_UNK_0202B37C_H #define POKEPLATINUM_UNK_0202B37C_H -#include "strbuf.h" #include "struct_decls/struct_0202B4A0_decl.h" #include "struct_defs/struct_0202B510.h" + #include "savedata.h" +#include "strbuf.h" int RandomGroup_SaveSize(void); -void sub_0202B384(UnkStruct_0202B4A0 * param0, int param1, int param2); -void RandomGroup_Init(UnkStruct_0202B4A0 * param0); -void sub_0202B3D8(UnkStruct_0202B4A0 * param0, u32 param1); -u32 sub_0202B400(UnkStruct_0202B4A0 * param0, int param1); -void sub_0202B40C(UnkStruct_0202B4A0 * param0, int param1, u32 param2); -u32 sub_0202B428(UnkStruct_0202B4A0 * param0); -const u16 * sub_0202B42C(const UnkStruct_0202B4A0 * param0, int param1, int param2); -void sub_0202B444(UnkStruct_0202B4A0 * param0, int param1, int param2, Strbuf *param3); -void sub_0202B470(UnkStruct_0202B4A0 * param0, int param1, int param2); -int sub_0202B47C(const UnkStruct_0202B4A0 * param0, int param1); -int sub_0202B488(const UnkStruct_0202B4A0 * param0, int param1); -void sub_0202B494(UnkStruct_0202B4A0 * param0, int param1, int param2); -UnkStruct_0202B4A0 * sub_0202B4A0(SaveData * param0); -BOOL sub_0202B4AC(const UnkStruct_0202B4A0 * param0, int param1); -BOOL sub_0202B4C4(const UnkStruct_0202B4A0 * param0, int param1); -BOOL sub_0202B4D8(const UnkStruct_0202B4A0 * param0, const u16 * param1); -BOOL sub_0202B510(const UnkStruct_0202B510 * param0); -BOOL sub_0202B530(const UnkStruct_0202B510 * param0, const UnkStruct_0202B510 * param1); +void sub_0202B384(UnkStruct_0202B4A0 *param0, int param1, int param2); +void RandomGroup_Init(UnkStruct_0202B4A0 *param0); +void sub_0202B3D8(UnkStruct_0202B4A0 *param0, u32 param1); +u32 sub_0202B400(UnkStruct_0202B4A0 *param0, int param1); +void sub_0202B40C(UnkStruct_0202B4A0 *param0, int param1, u32 param2); +u32 sub_0202B428(UnkStruct_0202B4A0 *param0); +const u16 *sub_0202B42C(const UnkStruct_0202B4A0 *param0, int param1, int param2); +void sub_0202B444(UnkStruct_0202B4A0 *param0, int param1, int param2, Strbuf *param3); +void sub_0202B470(UnkStruct_0202B4A0 *param0, int param1, int param2); +int sub_0202B47C(const UnkStruct_0202B4A0 *param0, int param1); +int sub_0202B488(const UnkStruct_0202B4A0 *param0, int param1); +void sub_0202B494(UnkStruct_0202B4A0 *param0, int param1, int param2); +UnkStruct_0202B4A0 *sub_0202B4A0(SaveData *param0); +BOOL sub_0202B4AC(const UnkStruct_0202B4A0 *param0, int param1); +BOOL sub_0202B4C4(const UnkStruct_0202B4A0 *param0, int param1); +BOOL sub_0202B4D8(const UnkStruct_0202B4A0 *param0, const u16 *param1); +BOOL sub_0202B510(const UnkStruct_0202B510 *param0); +BOOL sub_0202B530(const UnkStruct_0202B510 *param0, const UnkStruct_0202B510 *param1); #endif // POKEPLATINUM_UNK_0202B37C_H diff --git a/include/unk_0202C7FC.h b/include/unk_0202C7FC.h index 7342278e76..12cb77490d 100644 --- a/include/unk_0202C7FC.h +++ b/include/unk_0202C7FC.h @@ -3,14 +3,15 @@ #include "struct_decls/struct_0202C834_decl.h" #include "struct_decls/struct_0202C844_decl.h" + #include "savedata.h" int TrainerCard_SaveSize(void); -void TrainerCard_Init(UnkStruct_0202C834 * param0); -UnkStruct_0202C834 * sub_0202C834(SaveData * param0); -u8 * sub_0202C840(UnkStruct_0202C834 * param0); -UnkStruct_0202C844 * sub_0202C844(UnkStruct_0202C834 * param0); -int sub_0202C848(const u8 param0, UnkStruct_0202C844 * param1); -void sub_0202C850(const u8 param0, const int param1, UnkStruct_0202C844 * param2); +void TrainerCard_Init(UnkStruct_0202C834 *param0); +UnkStruct_0202C834 *sub_0202C834(SaveData *param0); +u8 *sub_0202C840(UnkStruct_0202C834 *param0); +UnkStruct_0202C844 *sub_0202C844(UnkStruct_0202C834 *param0); +int sub_0202C848(const u8 param0, UnkStruct_0202C844 *param1); +void sub_0202C850(const u8 param0, const int param1, UnkStruct_0202C844 *param2); #endif // POKEPLATINUM_UNK_0202C7FC_H diff --git a/include/unk_0202C858.h b/include/unk_0202C858.h index 95b2485f99..3dc19dc7f7 100644 --- a/include/unk_0202C858.h +++ b/include/unk_0202C858.h @@ -2,18 +2,19 @@ #define POKEPLATINUM_UNK_0202C858_H #include "struct_decls/struct_0202C878_decl.h" + #include "savedata.h" int WiFiHistory_SaveSize(void); -void WiFiHistory_Init(UnkStruct_0202C878 * param0); -UnkStruct_0202C878 * sub_0202C878(SaveData * param0); -void sub_0202C88C(UnkStruct_0202C878 * param0, int param1, int param2); -int sub_0202C8C0(const UnkStruct_0202C878 * param0); -int sub_0202C8C4(const UnkStruct_0202C878 * param0); -int sub_0202C8C8(const UnkStruct_0202C878 * param0, int param1, int param2); -void sub_0202C918(UnkStruct_0202C878 * param0, int param1, int param2, int param3); -BOOL sub_0202C990(const UnkStruct_0202C878 * param0); -void sub_0202C994(UnkStruct_0202C878 * param0, BOOL param1); -void sub_0202C9A0(UnkStruct_0202C878 * param0); +void WiFiHistory_Init(UnkStruct_0202C878 *param0); +UnkStruct_0202C878 *sub_0202C878(SaveData *param0); +void sub_0202C88C(UnkStruct_0202C878 *param0, int param1, int param2); +int sub_0202C8C0(const UnkStruct_0202C878 *param0); +int sub_0202C8C4(const UnkStruct_0202C878 *param0); +int sub_0202C8C8(const UnkStruct_0202C878 *param0, int param1, int param2); +void sub_0202C918(UnkStruct_0202C878 *param0, int param1, int param2, int param3); +BOOL sub_0202C990(const UnkStruct_0202C878 *param0); +void sub_0202C994(UnkStruct_0202C878 *param0, BOOL param1); +void sub_0202C9A0(UnkStruct_0202C878 *param0); #endif // POKEPLATINUM_UNK_0202C858_H diff --git a/include/unk_0202C9F4.h b/include/unk_0202C9F4.h index f4bb21240d..cc68d5ce57 100644 --- a/include/unk_0202C9F4.h +++ b/include/unk_0202C9F4.h @@ -2,30 +2,31 @@ #define POKEPLATINUM_UNK_0202C9F4_H #include "struct_decls/struct_0202CA1C_decl.h" +#include "struct_decls/struct_0202CA88_decl.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0202CA64.h" -#include "struct_decls/struct_0202CA88_decl.h" + #include "savedata.h" int BallSeal_SaveSize(void); -void BallSeal_Init(UnkStruct_0202CA1C * param0); -void sub_0202CA10(const UnkStruct_0202CA28 * param0, UnkStruct_0202CA28 * param1); -UnkStruct_0202CA1C * sub_0202CA1C(SaveData * param0); -UnkStruct_0202CA28 * sub_0202CA28(UnkStruct_0202CA1C * param0, int param1); -void sub_0202CA40(UnkStruct_0202CA1C * param0, UnkStruct_0202CA28 * param1, int param2); -UnkStruct_0202CA64 * sub_0202CA64(UnkStruct_0202CA28 * param0, int param1); -u8 sub_0202CA7C(const UnkStruct_0202CA64 * param0); -u8 sub_0202CA80(const UnkStruct_0202CA64 * param0); -u8 sub_0202CA84(const UnkStruct_0202CA64 * param0); -UnkStruct_0202CA88 * sub_0202CA88(UnkStruct_0202CA1C * param0); -u8 sub_0202CA90(const UnkStruct_0202CA88 * param0, int param1); -BOOL sub_0202CA94(const UnkStruct_0202CA28 * param0, int param1); -int sub_0202CAB0(const UnkStruct_0202CA1C * param0, int param1); -void sub_0202CADC(UnkStruct_0202CA88 * param0, int param1, int param2); -BOOL sub_0202CAE0(UnkStruct_0202CA1C * param0, int param1, s16 param2); -BOOL sub_0202CB20(UnkStruct_0202CA1C * param0, int param1, s16 param2); -BOOL sub_0202CB70(UnkStruct_0202CA1C * param0, int param1, s16 param2); -int sub_0202CBA8(const UnkStruct_0202CA1C * param0); -int sub_0202CBC8(const UnkStruct_0202CA1C * param0, int param1); +void BallSeal_Init(UnkStruct_0202CA1C *param0); +void sub_0202CA10(const UnkStruct_0202CA28 *param0, UnkStruct_0202CA28 *param1); +UnkStruct_0202CA1C *sub_0202CA1C(SaveData *param0); +UnkStruct_0202CA28 *sub_0202CA28(UnkStruct_0202CA1C *param0, int param1); +void sub_0202CA40(UnkStruct_0202CA1C *param0, UnkStruct_0202CA28 *param1, int param2); +UnkStruct_0202CA64 *sub_0202CA64(UnkStruct_0202CA28 *param0, int param1); +u8 sub_0202CA7C(const UnkStruct_0202CA64 *param0); +u8 sub_0202CA80(const UnkStruct_0202CA64 *param0); +u8 sub_0202CA84(const UnkStruct_0202CA64 *param0); +UnkStruct_0202CA88 *sub_0202CA88(UnkStruct_0202CA1C *param0); +u8 sub_0202CA90(const UnkStruct_0202CA88 *param0, int param1); +BOOL sub_0202CA94(const UnkStruct_0202CA28 *param0, int param1); +int sub_0202CAB0(const UnkStruct_0202CA1C *param0, int param1); +void sub_0202CADC(UnkStruct_0202CA88 *param0, int param1, int param2); +BOOL sub_0202CAE0(UnkStruct_0202CA1C *param0, int param1, s16 param2); +BOOL sub_0202CB20(UnkStruct_0202CA1C *param0, int param1, s16 param2); +BOOL sub_0202CB70(UnkStruct_0202CA1C *param0, int param1, s16 param2); +int sub_0202CBA8(const UnkStruct_0202CA1C *param0); +int sub_0202CBC8(const UnkStruct_0202CA1C *param0, int param1); #endif // POKEPLATINUM_UNK_0202C9F4_H diff --git a/include/unk_0202CC64.h b/include/unk_0202CC64.h index b5b3d753b9..29b7633b45 100644 --- a/include/unk_0202CC64.h +++ b/include/unk_0202CC64.h @@ -2,17 +2,18 @@ #define POKEPLATINUM_UNK_0202CC64_H #include "struct_defs/chatot_cry.h" + #include "savedata.h" int ChatotCry_SaveSize(void); -void ChatotCry_Init(ChatotCry * param0); -ChatotCry * AllocateAndInitializeChatotCryData(int param0); -ChatotCry * GetChatotCryDataFromSave(SaveData * param0); -BOOL IsChatotCryDataValid(const ChatotCry * param0); -void ResetChatotCryDataStatus(ChatotCry * param0); -const void * GetChatotCryAudioBuffer(const ChatotCry * param0); -void ProcessChatotCryAudioData(s8 * param0, const s8 * param1); -void StoreProcessedAudioInChatotCryData(ChatotCry * param0, const s8 * param1); -void CopyChatotCryData(ChatotCry * param0, const ChatotCry * param1); +void ChatotCry_Init(ChatotCry *param0); +ChatotCry *AllocateAndInitializeChatotCryData(int param0); +ChatotCry *GetChatotCryDataFromSave(SaveData *param0); +BOOL IsChatotCryDataValid(const ChatotCry *param0); +void ResetChatotCryDataStatus(ChatotCry *param0); +const void *GetChatotCryAudioBuffer(const ChatotCry *param0); +void ProcessChatotCryAudioData(s8 *param0, const s8 *param1); +void StoreProcessedAudioInChatotCryData(ChatotCry *param0, const s8 *param1); +void CopyChatotCryData(ChatotCry *param0, const ChatotCry *param1); #endif // POKEPLATINUM_UNK_0202CC64_H diff --git a/include/unk_0202CD50.h b/include/unk_0202CD50.h index b4bc00d115..0c85afc523 100644 --- a/include/unk_0202CD50.h +++ b/include/unk_0202CD50.h @@ -3,18 +3,19 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0202CD88_decl.h" + #include "savedata.h" int GameRecord_SaveSize(void); -void GameRecord_Init(UnkStruct_0202CD88 * param0); -UnkStruct_0202CD88 * sub_0202CD88(SaveData * param0); -u32 sub_0202CE90(UnkStruct_0202CD88 * param0, int param1, u32 param2); -u32 sub_0202CED0(UnkStruct_0202CD88 * param0, int param1, u32 param2); -u32 sub_0202CF28(UnkStruct_0202CD88 * param0, int param1); -u32 sub_0202CF70(UnkStruct_0202CD88 * param0, int param1, u32 param2); -u32 sub_0202CFB8(UnkStruct_0202CD88 * param0, int param1); -void sub_0202CFEC(UnkStruct_0202CD88 * param0, int param1); -u32 sub_0202D034(UnkStruct_0202CD88 * param0); -void sub_0202D040(UnkStruct_0202CD88 * param0, const PokedexData * param1, u16 const param2); +void GameRecord_Init(UnkStruct_0202CD88 *param0); +UnkStruct_0202CD88 *sub_0202CD88(SaveData *param0); +u32 sub_0202CE90(UnkStruct_0202CD88 *param0, int param1, u32 param2); +u32 sub_0202CED0(UnkStruct_0202CD88 *param0, int param1, u32 param2); +u32 sub_0202CF28(UnkStruct_0202CD88 *param0, int param1); +u32 sub_0202CF70(UnkStruct_0202CD88 *param0, int param1, u32 param2); +u32 sub_0202CFB8(UnkStruct_0202CD88 *param0, int param1); +void sub_0202CFEC(UnkStruct_0202CD88 *param0, int param1); +u32 sub_0202D034(UnkStruct_0202CD88 *param0); +void sub_0202D040(UnkStruct_0202CD88 *param0, const PokedexData *param1, u16 const param2); #endif // POKEPLATINUM_UNK_0202CD50_H diff --git a/include/unk_0202D05C.h b/include/unk_0202D05C.h index aa5fd01709..e0a4317536 100644 --- a/include/unk_0202D05C.h +++ b/include/unk_0202D05C.h @@ -1,60 +1,62 @@ #ifndef POKEPLATINUM_UNK_0202D05C_H #define POKEPLATINUM_UNK_0202D05C_H -#include "struct_defs/sentence.h" +#include + #include "struct_decls/struct_0202D060_decl.h" #include "struct_decls/struct_0202D080_decl.h" -#include "struct_defs/struct_0202D314.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_decls/struct_0202D764_decl.h" +#include "struct_defs/sentence.h" +#include "struct_defs/struct_0202D314.h" #include "struct_defs/struct_02049A68.h" -#include "savedata.h" + #include "overlay090/struct_ov90_021D1750.h" #include "overlay096/struct_ov96_0223B450_sub1.h" #include "overlay096/struct_ov96_0223B450_sub2.h" #include "overlay104/struct_ov104_0223A348.h" #include "overlay104/struct_ov104_0223A348_sub2.h" -#include +#include "savedata.h" int sub_0202D05C(void); -void sub_0202D060(UnkStruct_0202D060 * param0); -void sub_0202D06C(UnkStruct_0202D750 * param0); -void sub_0202D080(UnkStruct_0202D080 * param0); -void sub_0202D0AC(UnkStruct_0202D764 * param0); -u32 sub_0202D0BC(UnkStruct_0202D060 * param0, int param1, void * param2); -void sub_0202D140(UnkStruct_0202D060 * param0, int param1, const void * param2); -void sub_0202D1E8(UnkStruct_0202D060 * param0, u8 param1, u16 param2, u16 param3); -BOOL sub_0202D214(UnkStruct_0202D060 * param0); -void sub_0202D21C(UnkStruct_0202D060 * param0, BOOL param1); -u16 sub_0202D230(UnkStruct_0202D750 * param0, u16 param1, int param2); -u8 sub_0202D288(UnkStruct_0202D750 * param0, int param1); -u8 sub_0202D2C0(UnkStruct_0202D750 * param0, int param1); -void sub_0202D2F0(UnkStruct_0202D750 * param0, int param1, UnkStruct_ov104_0223A348_sub2 * param2); -void sub_0202D314(UnkStruct_0202D750 * param0, int param1, UnkStruct_0202D314 * param2); -u16 sub_0202D334(UnkStruct_0202D750 * param0, UnkStruct_0202D060 * param1); -u16 sub_0202D39C(UnkStruct_0202D750 * param0); -u8 sub_0202D3A0(UnkStruct_0202D750 * param0); -u16 sub_0202D3B4(UnkStruct_0202D750 * param0, u16 param1, int param2); -u16 sub_0202D3FC(UnkStruct_0202D750 * param0, u16 param1, u16 param2); -BOOL sub_0202D414(UnkStruct_0202D750 * param0, u16 param1, int param2); -void sub_0202D470(UnkStruct_0202D750 * param0, u32 param1); -u32 sub_0202D474(UnkStruct_0202D750 * param0); -void sub_0202D478(SaveData * param0, int param1, Sentence * param2); -Sentence * sub_0202D498(SaveData * param0, int param1); -void sub_0202D4B0(UnkStruct_0202D764 * param0, u8 param1, u8 param2, RTCDate * param3); -void sub_0202D514(UnkStruct_0202D764 * param0); -BOOL sub_0202D558(UnkStruct_0202D764 * param0, u8 param1, u8 param2, RTCDate * param3); -BOOL sub_0202D5E8(UnkStruct_0202D764 * param0); -BOOL sub_0202D5F0(UnkStruct_0202D764 * param0); -void sub_0202D5F8(UnkStruct_0202D764 * param0, UnkStruct_ov96_0223B450_sub1 * param1, u8 param2, u8 param3); -void sub_0202D628(UnkStruct_0202D764 * param0, UnkStruct_02049A68 * param1); -void sub_0202D63C(UnkStruct_0202D764 * param0, UnkStruct_ov104_0223A348 * param1, const u8 param2); -void sub_0202D6DC(UnkStruct_0202D764 * param0, UnkStruct_ov96_0223B450_sub2 * param1, u8 param2, u8 param3); -void sub_0202D708(UnkStruct_0202D764 * param0, UnkStruct_02049A68 * param1); -UnkStruct_ov90_021D1750 * sub_0202D71C(UnkStruct_0202D764 *, int); -UnkStruct_0202D060 * sub_0202D740(SaveData * param0); -UnkStruct_0202D750 * sub_0202D750(SaveData * param0); -UnkStruct_0202D764 * sub_0202D764(SaveData * param0); +void sub_0202D060(UnkStruct_0202D060 *param0); +void sub_0202D06C(UnkStruct_0202D750 *param0); +void sub_0202D080(UnkStruct_0202D080 *param0); +void sub_0202D0AC(UnkStruct_0202D764 *param0); +u32 sub_0202D0BC(UnkStruct_0202D060 *param0, int param1, void *param2); +void sub_0202D140(UnkStruct_0202D060 *param0, int param1, const void *param2); +void sub_0202D1E8(UnkStruct_0202D060 *param0, u8 param1, u16 param2, u16 param3); +BOOL sub_0202D214(UnkStruct_0202D060 *param0); +void sub_0202D21C(UnkStruct_0202D060 *param0, BOOL param1); +u16 sub_0202D230(UnkStruct_0202D750 *param0, u16 param1, int param2); +u8 sub_0202D288(UnkStruct_0202D750 *param0, int param1); +u8 sub_0202D2C0(UnkStruct_0202D750 *param0, int param1); +void sub_0202D2F0(UnkStruct_0202D750 *param0, int param1, UnkStruct_ov104_0223A348_sub2 *param2); +void sub_0202D314(UnkStruct_0202D750 *param0, int param1, UnkStruct_0202D314 *param2); +u16 sub_0202D334(UnkStruct_0202D750 *param0, UnkStruct_0202D060 *param1); +u16 sub_0202D39C(UnkStruct_0202D750 *param0); +u8 sub_0202D3A0(UnkStruct_0202D750 *param0); +u16 sub_0202D3B4(UnkStruct_0202D750 *param0, u16 param1, int param2); +u16 sub_0202D3FC(UnkStruct_0202D750 *param0, u16 param1, u16 param2); +BOOL sub_0202D414(UnkStruct_0202D750 *param0, u16 param1, int param2); +void sub_0202D470(UnkStruct_0202D750 *param0, u32 param1); +u32 sub_0202D474(UnkStruct_0202D750 *param0); +void sub_0202D478(SaveData *param0, int param1, Sentence *param2); +Sentence *sub_0202D498(SaveData *param0, int param1); +void sub_0202D4B0(UnkStruct_0202D764 *param0, u8 param1, u8 param2, RTCDate *param3); +void sub_0202D514(UnkStruct_0202D764 *param0); +BOOL sub_0202D558(UnkStruct_0202D764 *param0, u8 param1, u8 param2, RTCDate *param3); +BOOL sub_0202D5E8(UnkStruct_0202D764 *param0); +BOOL sub_0202D5F0(UnkStruct_0202D764 *param0); +void sub_0202D5F8(UnkStruct_0202D764 *param0, UnkStruct_ov96_0223B450_sub1 *param1, u8 param2, u8 param3); +void sub_0202D628(UnkStruct_0202D764 *param0, UnkStruct_02049A68 *param1); +void sub_0202D63C(UnkStruct_0202D764 *param0, UnkStruct_ov104_0223A348 *param1, const u8 param2); +void sub_0202D6DC(UnkStruct_0202D764 *param0, UnkStruct_ov96_0223B450_sub2 *param1, u8 param2, u8 param3); +void sub_0202D708(UnkStruct_0202D764 *param0, UnkStruct_02049A68 *param1); +UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *, int); +UnkStruct_0202D060 *sub_0202D740(SaveData *param0); +UnkStruct_0202D750 *sub_0202D750(SaveData *param0); +UnkStruct_0202D764 *sub_0202D764(SaveData *param0); #endif // POKEPLATINUM_UNK_0202D05C_H diff --git a/include/unk_0202D778.h b/include/unk_0202D778.h index 4aa636922c..7df7802956 100644 --- a/include/unk_0202D778.h +++ b/include/unk_0202D778.h @@ -4,7 +4,7 @@ #include "savedata.h" int Ribbons_SaveSize(void); -void Ribbons_Init(u8 * param0); -u8 * sub_0202D79C(SaveData * param0); +void Ribbons_Init(u8 *param0); +u8 *sub_0202D79C(SaveData *param0); #endif // POKEPLATINUM_UNK_0202D778_H diff --git a/include/unk_0202D7A8.h b/include/unk_0202D7A8.h index 6ae28f8065..45cc2f000e 100644 --- a/include/unk_0202D7A8.h +++ b/include/unk_0202D7A8.h @@ -6,36 +6,37 @@ #include "struct_defs/struct_0202D84C.h" #include "struct_defs/struct_020698E4.h" #include "struct_defs/struct_0206C638.h" + #include "savedata.h" int SpecialEncounter_SaveSize(void); -void SpecialEncounter_Init(UnkStruct_0202D7B0 * param0); -void sub_0202D80C(UnkStruct_0202D7B0 * param0, const u32 param1); -u32 sub_0202D814(UnkStruct_0202D7B0 * param0, const u8 param1); -UnkStruct_020698E4 * sub_0202D830(UnkStruct_0202D7B0 * param0); -UnkStruct_0202D7B0 * sub_0202D834(SaveData * param0); -UnkStruct_0202D844 * sub_0202D840(UnkStruct_0202D7B0 * param0); -const int sub_0202D844(UnkStruct_0202D844 * param0); -void sub_0202D848(const u8 param0, UnkStruct_0202D844 * param1); -UnkStruct_0202D84C * sub_0202D84C(const u8 param0, UnkStruct_0202D844 * param1); -void sub_0202D854(SaveData * param0, const int param1); -void sub_0202D884(SaveData * param0); -u8 sub_0202D898(UnkStruct_0202D7B0 * param0); -void sub_0202D8A4(UnkStruct_0202D7B0 * param0, const int param1); -int sub_0202D8BC(UnkStruct_0202D7B0 * param0); -u8 sub_0202D8C4(UnkStruct_0202D7B0 * param0, const u8 param1); -void sub_0202D8DC(UnkStruct_0202D7B0 * param0, const u8 param1, const u8 param2); -u8 sub_0202D8F8(UnkStruct_0202D7B0 * param0, const u8 param1); -void sub_0202D914(UnkStruct_0206C638 ** param0); -UnkStruct_0206C638 * sub_0202D924(UnkStruct_0202D7B0 * param0, const u8 param1); -u32 sub_0202D93C(const UnkStruct_0206C638 * param0, const u8 param1); -void sub_0202D980(UnkStruct_0206C638 * param0, const u8 param1, const u32 param2); -u8 * sub_0202D9C4(UnkStruct_0202D7B0 * param0); -u8 * sub_0202D9CC(UnkStruct_0202D7B0 * param0); -BOOL sub_0202D9D8(UnkStruct_0202D7B0 * param0); -void sub_0202D9EC(UnkStruct_0202D7B0 * param0, const u8 param1); -u8 sub_0202DA04(UnkStruct_0202D7B0 * param0); -void sub_0202DA10(SaveData * param0, u16 * param1, u16 * param2); -void sub_0202DA24(SaveData * param0, const u16 param1); +void SpecialEncounter_Init(UnkStruct_0202D7B0 *param0); +void sub_0202D80C(UnkStruct_0202D7B0 *param0, const u32 param1); +u32 sub_0202D814(UnkStruct_0202D7B0 *param0, const u8 param1); +UnkStruct_020698E4 *sub_0202D830(UnkStruct_0202D7B0 *param0); +UnkStruct_0202D7B0 *sub_0202D834(SaveData *param0); +UnkStruct_0202D844 *sub_0202D840(UnkStruct_0202D7B0 *param0); +const int sub_0202D844(UnkStruct_0202D844 *param0); +void sub_0202D848(const u8 param0, UnkStruct_0202D844 *param1); +UnkStruct_0202D84C *sub_0202D84C(const u8 param0, UnkStruct_0202D844 *param1); +void sub_0202D854(SaveData *param0, const int param1); +void sub_0202D884(SaveData *param0); +u8 sub_0202D898(UnkStruct_0202D7B0 *param0); +void sub_0202D8A4(UnkStruct_0202D7B0 *param0, const int param1); +int sub_0202D8BC(UnkStruct_0202D7B0 *param0); +u8 sub_0202D8C4(UnkStruct_0202D7B0 *param0, const u8 param1); +void sub_0202D8DC(UnkStruct_0202D7B0 *param0, const u8 param1, const u8 param2); +u8 sub_0202D8F8(UnkStruct_0202D7B0 *param0, const u8 param1); +void sub_0202D914(UnkStruct_0206C638 **param0); +UnkStruct_0206C638 *sub_0202D924(UnkStruct_0202D7B0 *param0, const u8 param1); +u32 sub_0202D93C(const UnkStruct_0206C638 *param0, const u8 param1); +void sub_0202D980(UnkStruct_0206C638 *param0, const u8 param1, const u32 param2); +u8 *sub_0202D9C4(UnkStruct_0202D7B0 *param0); +u8 *sub_0202D9CC(UnkStruct_0202D7B0 *param0); +BOOL sub_0202D9D8(UnkStruct_0202D7B0 *param0); +void sub_0202D9EC(UnkStruct_0202D7B0 *param0, const u8 param1); +u8 sub_0202DA04(UnkStruct_0202D7B0 *param0); +void sub_0202DA10(SaveData *param0, u16 *param1, u16 *param2); +void sub_0202DA24(SaveData *param0, const u16 param1); #endif // POKEPLATINUM_UNK_0202D7A8_H diff --git a/include/unk_0202DA40.h b/include/unk_0202DA40.h index d6c2040d6b..1b8c199ff2 100644 --- a/include/unk_0202DA40.h +++ b/include/unk_0202DA40.h @@ -2,20 +2,21 @@ #define POKEPLATINUM_UNK_0202DA40_H #include "struct_decls/struct_0202DA40_decl.h" + #include "pokemon.h" #include "savedata.h" -UnkStruct_0202DA40 * sub_0202DA40(SaveData * param0); -int GlobalTrade_SaveSize(void); -void GlobalTrade_Init(UnkStruct_0202DA40 * param0); -int sub_0202DA60(UnkStruct_0202DA40 * param0); -void sub_0202DA68(UnkStruct_0202DA40 * param0, int param1); -void sub_0202DA70(UnkStruct_0202DA40 * param0, Pokemon * param1); -void sub_0202DA7C(UnkStruct_0202DA40 * param0, Pokemon * param1, int param2); -u32 sub_0202DA8C(UnkStruct_0202DA40 * param0); -void sub_0202DA94(UnkStruct_0202DA40 * param0, u32 param1); -u32 sub_0202DA9C(UnkStruct_0202DA40 * param0); -void sub_0202DAA4(UnkStruct_0202DA40 * param0, u32 param1); -int sub_0202DAAC(UnkStruct_0202DA40 * param0); +UnkStruct_0202DA40 *sub_0202DA40(SaveData *param0); +int GlobalTrade_SaveSize(void); +void GlobalTrade_Init(UnkStruct_0202DA40 *param0); +int sub_0202DA60(UnkStruct_0202DA40 *param0); +void sub_0202DA68(UnkStruct_0202DA40 *param0, int param1); +void sub_0202DA70(UnkStruct_0202DA40 *param0, Pokemon *param1); +void sub_0202DA7C(UnkStruct_0202DA40 *param0, Pokemon *param1, int param2); +u32 sub_0202DA8C(UnkStruct_0202DA40 *param0); +void sub_0202DA94(UnkStruct_0202DA40 *param0, u32 param1); +u32 sub_0202DA9C(UnkStruct_0202DA40 *param0); +void sub_0202DAA4(UnkStruct_0202DA40 *param0, u32 param1); +int sub_0202DAAC(UnkStruct_0202DA40 *param0); #endif // POKEPLATINUM_UNK_0202DA40_H diff --git a/include/unk_0202DAB4.h b/include/unk_0202DAB4.h index 56f1aec8d1..ff0e94c4a7 100644 --- a/include/unk_0202DAB4.h +++ b/include/unk_0202DAB4.h @@ -5,34 +5,35 @@ #include "struct_defs/struct_0202DBAC.h" #include "struct_defs/struct_0202DF40.h" #include "struct_defs/union_0204C4D0.h" + #include "savedata.h" int MysteryGift_SaveSize(void); -void MysteryGift_Init(MysteryGift * param0); -UnkStruct_0202DF40 * sub_0202DAD8(MysteryGift * param0, int param1); -UnkStruct_0202DBAC * sub_0202DB00(MysteryGift * param0, int param1); -BOOL sub_0202DB2C(MysteryGift * param0, const void * param1, int param2); -BOOL sub_0202DBAC(MysteryGift * param0, const void * param1); -BOOL sub_0202DC48(MysteryGift * param0, int param1); -BOOL sub_0202DC7C(MysteryGift * param0, int param1); -BOOL sub_0202DCB8(MysteryGift * param0, int param1); -BOOL sub_0202DCE0(MysteryGift * param0); -BOOL sub_0202DD08(MysteryGift * param0); -BOOL sub_0202DD30(const MysteryGift * param0, int param1); -BOOL sub_0202DD5C(const MysteryGift * param0, int param1); -BOOL sub_0202DD88(const MysteryGift * param0); -BOOL sub_0202DDA8(const MysteryGift * param0, int param1); -void sub_0202DDE8(const MysteryGift * param0, int param1); -BOOL sub_0202DE2C(MysteryGift * param0, int param1); -void sub_0202DE5C(MysteryGift * param0, int param1); -void sub_0202DE8C(MysteryGift * param0, int param1); -BOOL sub_0202DEC4(MysteryGift * param0); -void sub_0202DED4(MysteryGift * param0); -void sub_0202DEE4(SaveData * param0, int param1); -void sub_0202DF04(SaveData * param0, int param1); +void MysteryGift_Init(MysteryGift *param0); +UnkStruct_0202DF40 *sub_0202DAD8(MysteryGift *param0, int param1); +UnkStruct_0202DBAC *sub_0202DB00(MysteryGift *param0, int param1); +BOOL sub_0202DB2C(MysteryGift *param0, const void *param1, int param2); +BOOL sub_0202DBAC(MysteryGift *param0, const void *param1); +BOOL sub_0202DC48(MysteryGift *param0, int param1); +BOOL sub_0202DC7C(MysteryGift *param0, int param1); +BOOL sub_0202DCB8(MysteryGift *param0, int param1); +BOOL sub_0202DCE0(MysteryGift *param0); +BOOL sub_0202DD08(MysteryGift *param0); +BOOL sub_0202DD30(const MysteryGift *param0, int param1); +BOOL sub_0202DD5C(const MysteryGift *param0, int param1); +BOOL sub_0202DD88(const MysteryGift *param0); +BOOL sub_0202DDA8(const MysteryGift *param0, int param1); +void sub_0202DDE8(const MysteryGift *param0, int param1); +BOOL sub_0202DE2C(MysteryGift *param0, int param1); +void sub_0202DE5C(MysteryGift *param0, int param1); +void sub_0202DE8C(MysteryGift *param0, int param1); +BOOL sub_0202DEC4(MysteryGift *param0); +void sub_0202DED4(MysteryGift *param0); +void sub_0202DEE4(SaveData *param0, int param1); +void sub_0202DF04(SaveData *param0, int param1); int sub_0202DF18(void); int sub_0202DF40(int param0); -UnkUnion_0204C4D0 * sub_0202DF5C(int param0); +UnkUnion_0204C4D0 *sub_0202DF5C(int param0); void sub_0202DF78(int param0); #endif // POKEPLATINUM_UNK_0202DAB4_H diff --git a/include/unk_0202DF8C.h b/include/unk_0202DF8C.h index 0dd767bf36..251d165c8f 100644 --- a/include/unk_0202DF8C.h +++ b/include/unk_0202DF8C.h @@ -1,19 +1,20 @@ #ifndef POKEPLATINUM_UNK_0202DF8C_H #define POKEPLATINUM_UNK_0202DF8C_H -#include "struct_defs/struct_0202DF8C.h" +#include + #include "struct_decls/struct_party_decl.h" -#include "overlay087/struct_ov87_021D1640.h" +#include "struct_defs/struct_0202DF8C.h" -#include +#include "overlay087/struct_ov87_021D1640.h" int HallOfFame_SaveSize(void); -void HallOfFame_Init(HallOfFame * param0); -void sub_0202DFA8(HallOfFame * param0, const Party * param1, const RTCDate * param2); -u32 sub_0202E148(const HallOfFame * param0); -u32 sub_0202E174(const HallOfFame * param0, int param1); -u32 sub_0202E1A8(const HallOfFame * param0, int param1); -void sub_0202E1F4(const HallOfFame * param0, int param1, int param2, UnkStruct_ov87_021D1640 * param3); -void sub_0202E274(const HallOfFame * param0, int param1, RTCDate * param2); +void HallOfFame_Init(HallOfFame *param0); +void sub_0202DFA8(HallOfFame *param0, const Party *param1, const RTCDate *param2); +u32 sub_0202E148(const HallOfFame *param0); +u32 sub_0202E174(const HallOfFame *param0, int param1); +u32 sub_0202E1A8(const HallOfFame *param0, int param1); +void sub_0202E1F4(const HallOfFame *param0, int param1, int param2, UnkStruct_ov87_021D1640 *param3); +void sub_0202E274(const HallOfFame *param0, int param1, RTCDate *param2); #endif // POKEPLATINUM_UNK_0202DF8C_H diff --git a/include/unk_0202E2CC.h b/include/unk_0202E2CC.h index 6f5c464087..3641225610 100644 --- a/include/unk_0202E2CC.h +++ b/include/unk_0202E2CC.h @@ -16,38 +16,38 @@ #include "struct_defs/struct_0202E834.h" int TVBroadcast_SaveSize(void); -void TVBroadcast_Init(TVBroadcast * param0); -void sub_0202E2EC(TVBroadcast * param0); -void sub_0202E324(TVBroadcast * param0, int param1, int param2); -void sub_0202E35C(TVBroadcast * param0); -void sub_0202E374(TVBroadcast * param0, BOOL param1); -BOOL sub_0202E380(const TVBroadcast * param0); -void sub_0202E384(TVBroadcast * param0, int param1); -BOOL sub_0202E3C4(const TVBroadcast * param0, int param1); -int sub_0202E3DC(const TVBroadcast * param0); -BOOL sub_0202E43C(TVBroadcast * param0, int param1, int param2, const u8 * param3); -const u16 * sub_0202E4C8(const UnkStruct_0202E794 * param0); -int sub_0202E4CC(const UnkStruct_0202E794 * param0); -int sub_0202E4D0(const UnkStruct_0202E794 * param0); -UnkStruct_0202E4D4 * sub_0202E4D4(UnkStruct_0202E794 * param0); -UnkStruct_0202E4D4 * sub_0202E4D8(UnkStruct_0202E768 * param0); -int sub_0202E55C(const UnkStruct_0202E4D4 * param0); -void sub_0202E560(UnkStruct_0202E4D4 * param0); -void * sub_0202E574(UnkStruct_0202E4D4 * param0); -int sub_0202E614(const TVBroadcast * param0, int param1, int param2, BOOL param3, BOOL param4, u8 * param5); -BOOL sub_0202E6B0(TVBroadcast * param0, int param1, int param2); -UnkStruct_0202E768 * sub_0202E768(TVBroadcast * param0, int param1, int param2); -UnkStruct_0202E794 * sub_0202E794(TVBroadcast * param0, int param1, int param2); +void TVBroadcast_Init(TVBroadcast *param0); +void sub_0202E2EC(TVBroadcast *param0); +void sub_0202E324(TVBroadcast *param0, int param1, int param2); +void sub_0202E35C(TVBroadcast *param0); +void sub_0202E374(TVBroadcast *param0, BOOL param1); +BOOL sub_0202E380(const TVBroadcast *param0); +void sub_0202E384(TVBroadcast *param0, int param1); +BOOL sub_0202E3C4(const TVBroadcast *param0, int param1); +int sub_0202E3DC(const TVBroadcast *param0); +BOOL sub_0202E43C(TVBroadcast *param0, int param1, int param2, const u8 *param3); +const u16 *sub_0202E4C8(const UnkStruct_0202E794 *param0); +int sub_0202E4CC(const UnkStruct_0202E794 *param0); +int sub_0202E4D0(const UnkStruct_0202E794 *param0); +UnkStruct_0202E4D4 *sub_0202E4D4(UnkStruct_0202E794 *param0); +UnkStruct_0202E4D4 *sub_0202E4D8(UnkStruct_0202E768 *param0); +int sub_0202E55C(const UnkStruct_0202E4D4 *param0); +void sub_0202E560(UnkStruct_0202E4D4 *param0); +void *sub_0202E574(UnkStruct_0202E4D4 *param0); +int sub_0202E614(const TVBroadcast *param0, int param1, int param2, BOOL param3, BOOL param4, u8 *param5); +BOOL sub_0202E6B0(TVBroadcast *param0, int param1, int param2); +UnkStruct_0202E768 *sub_0202E768(TVBroadcast *param0, int param1, int param2); +UnkStruct_0202E794 *sub_0202E794(TVBroadcast *param0, int param1, int param2); BOOL sub_0202E7C0(int param0); int sub_0202E7D0(int param0); -UnkStruct_0202E7D8 * sub_0202E7D8(TVBroadcast * param0); -UnkStruct_0202E7E4 * sub_0202E7E4(TVBroadcast * param0); -UnkStruct_0202E7F0 * sub_0202E7F0(TVBroadcast * param0); -UnkStruct_0202E7FC * sub_0202E7FC(TVBroadcast * param0); -UnkStruct_0202E808 * sub_0202E808(TVBroadcast * param0); -UnkStruct_0202E810 * sub_0202E810(TVBroadcast * param0); -UnkStruct_0202E81C * sub_0202E81C(TVBroadcast * param0); -UnkStruct_0202E828 * sub_0202E828(TVBroadcast * param0); -UnkStruct_0202E834 * sub_0202E834(TVBroadcast * param0); +UnkStruct_0202E7D8 *sub_0202E7D8(TVBroadcast *param0); +UnkStruct_0202E7E4 *sub_0202E7E4(TVBroadcast *param0); +UnkStruct_0202E7F0 *sub_0202E7F0(TVBroadcast *param0); +UnkStruct_0202E7FC *sub_0202E7FC(TVBroadcast *param0); +UnkStruct_0202E808 *sub_0202E808(TVBroadcast *param0); +UnkStruct_0202E810 *sub_0202E810(TVBroadcast *param0); +UnkStruct_0202E81C *sub_0202E81C(TVBroadcast *param0); +UnkStruct_0202E828 *sub_0202E828(TVBroadcast *param0); +UnkStruct_0202E834 *sub_0202E834(TVBroadcast *param0); #endif // POKEPLATINUM_UNK_0202E2CC_H diff --git a/include/unk_0202E840.h b/include/unk_0202E840.h index bf6cb6a9a1..2a93f0c616 100644 --- a/include/unk_0202E840.h +++ b/include/unk_0202E840.h @@ -4,21 +4,22 @@ #include "struct_decls/struct_0202E858_decl.h" #include "struct_decls/struct_0202E8C0_decl.h" #include "struct_defs/struct_0202EE10.h" + #include "savedata.h" u8 sub_0202E840(int param0); u8 sub_0202E84C(int param0); -void sub_0202E858(UnkStruct_0202E858 * param0); -BOOL sub_0202E870(UnkStruct_0202E858 * param0); +void sub_0202E858(UnkStruct_0202E858 *param0); +BOOL sub_0202E870(UnkStruct_0202E858 *param0); int Rankings_SaveSize(void); -void Rankings_Init(UnkStruct_0202E8C0 * param0); -UnkStruct_0202E8C0 * sub_0202E8C0(SaveData * param0); -void sub_0202E8D4(UnkStruct_0202E8C0 * param0, int param1, u8 param2); +void Rankings_Init(UnkStruct_0202E8C0 *param0); +UnkStruct_0202E8C0 *sub_0202E8C0(SaveData *param0); +void sub_0202E8D4(UnkStruct_0202E8C0 *param0, int param1, u8 param2); int sub_0202E91C(void); -void * sub_0202E9FC(SaveData * param0, int param1); -void sub_0202ED0C(SaveData * param0, int param1, u8 param2, const void ** param3, int param4); -UnkStruct_0202EE10 * sub_0202ED8C(SaveData * param0, int param1, int param2); -UnkStruct_0202EE10 * sub_0202EE10(UnkStruct_0202E8C0 * param0, int param1, int param2); -void sub_0202EE8C(UnkStruct_0202EE10 * param0); +void *sub_0202E9FC(SaveData *param0, int param1); +void sub_0202ED0C(SaveData *param0, int param1, u8 param2, const void **param3, int param4); +UnkStruct_0202EE10 *sub_0202ED8C(SaveData *param0, int param1, int param2); +UnkStruct_0202EE10 *sub_0202EE10(UnkStruct_0202E8C0 *param0, int param1, int param2); +void sub_0202EE8C(UnkStruct_0202EE10 *param0); #endif // POKEPLATINUM_UNK_0202E840_H diff --git a/include/unk_0202EEC0.h b/include/unk_0202EEC0.h index 40d19ee8ad..33f1352af0 100644 --- a/include/unk_0202EEC0.h +++ b/include/unk_0202EEC0.h @@ -2,18 +2,19 @@ #define POKEPLATINUM_UNK_0202EEC0_H #include "struct_decls/struct_02024440_decl.h" + #include "pokemon.h" int PalParkTransfer_SaveSize(void); -void PalParkTransfer_Init(PalParkTransfer * param0); -void sub_0202EF04(PalParkTransfer * param0); -void sub_0202EFA4(PalParkTransfer * param0, BoxPokemon * param1, int param2); -void sub_0202EFB8(PalParkTransfer * param0, u32 param1); -void sub_0202F000(const PalParkTransfer * param0, int param1, Pokemon * param2); -int sub_0202F028(const PalParkTransfer * param0); -int sub_0202F050(const PalParkTransfer * param0, u32 param1); -BOOL sub_0202F088(const PalParkTransfer * param0); -BOOL sub_0202F0BC(const PalParkTransfer * param0); -BOOL sub_0202F0E0(const PalParkTransfer * param0); +void PalParkTransfer_Init(PalParkTransfer *param0); +void sub_0202EF04(PalParkTransfer *param0); +void sub_0202EFA4(PalParkTransfer *param0, BoxPokemon *param1, int param2); +void sub_0202EFB8(PalParkTransfer *param0, u32 param1); +void sub_0202F000(const PalParkTransfer *param0, int param1, Pokemon *param2); +int sub_0202F028(const PalParkTransfer *param0); +int sub_0202F050(const PalParkTransfer *param0, u32 param1); +BOOL sub_0202F088(const PalParkTransfer *param0); +BOOL sub_0202F0BC(const PalParkTransfer *param0); +BOOL sub_0202F0E0(const PalParkTransfer *param0); #endif // POKEPLATINUM_UNK_0202EEC0_H diff --git a/include/unk_0202F108.h b/include/unk_0202F108.h index dfd39c0c70..055be530c6 100644 --- a/include/unk_0202F108.h +++ b/include/unk_0202F108.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_UNK_0202F108_H #include "struct_defs/struct_0202F10C.h" + #include "savedata.h" int Contest_SaveSize(void); -void Contest_Init(UnkStruct_0202F10C * param0); -void sub_0202F134(SaveData * param0, int param1, int param2); -u16 sub_0202F160(SaveData * param0, int param1, int param2); +void Contest_Init(UnkStruct_0202F10C *param0); +void sub_0202F134(SaveData *param0, int param1, int param2); +u16 sub_0202F160(SaveData *param0, int param1, int param2); #endif // POKEPLATINUM_UNK_0202F108_H diff --git a/include/unk_0202F180.h b/include/unk_0202F180.h index de97269de2..061146320b 100644 --- a/include/unk_0202F180.h +++ b/include/unk_0202F180.h @@ -4,6 +4,6 @@ #include "pokemon.h" #include "savedata.h" -void sub_0202F180(SaveData * param0, const Pokemon * param1); +void sub_0202F180(SaveData *param0, const Pokemon *param1); #endif // POKEPLATINUM_UNK_0202F180_H diff --git a/include/unk_0202F1D4.h b/include/unk_0202F1D4.h index 21aa03ff06..53ed8d2a24 100644 --- a/include/unk_0202F1D4.h +++ b/include/unk_0202F1D4.h @@ -5,35 +5,37 @@ #include "struct_decls/struct_0202F298_decl.h" #include "struct_decls/struct_0202F41C_decl.h" #include "struct_decls/struct_02030A80_decl.h" -#include "savedata.h" + #include "overlay006/battle_params.h" +#include "savedata.h" + int BattleRecording_SaveSize(void); -void BattleRecording_Init(BattleRecording * param0); -void sub_0202F1F8(SaveData * param0, int param1, int * param2); +void BattleRecording_Init(BattleRecording *param0); +void sub_0202F1F8(SaveData *param0, int param1, int *param2); void sub_0202F22C(void); BOOL sub_0202F250(void); -BattleRecording * sub_0202F264(void); -void * sub_0202F27C(void); -BOOL sub_0202F298(SaveData * param0, int param1, int * param2, BattleParams * param3, int param4); -BOOL sub_0202F330(SaveData * param0, int param1, int * param2, int param3); -int sub_0202F3AC(SaveData * param0, BattleRecording * param1, int param2, u16 * param3); -int sub_0202F41C(SaveData * param0, int param1, int param2, int param3, u16 * param4, u16 * param5); -void sub_0202F4C0(int param0, int * param1, int * param2); -void sub_0202F858(void * param0, u32 param1, u32 param2); +BattleRecording *sub_0202F264(void); +void *sub_0202F27C(void); +BOOL sub_0202F298(SaveData *param0, int param1, int *param2, BattleParams *param3, int param4); +BOOL sub_0202F330(SaveData *param0, int param1, int *param2, int param3); +int sub_0202F3AC(SaveData *param0, BattleRecording *param1, int param2, u16 *param3); +int sub_0202F41C(SaveData *param0, int param1, int param2, int param3, u16 *param4, u16 *param5); +void sub_0202F4C0(int param0, int *param1, int *param2); +void sub_0202F858(void *param0, u32 param1, u32 param2); void sub_0202F868(int param0, int param1, u8 param2); u8 sub_0202F884(int param0, int param1); -void sub_0202F8AC(BattleParams * param0); +void sub_0202F8AC(BattleParams *param0); void sub_0202FAA8(int param0, u32 param1); BOOL sub_0202FAC0(void); -void sub_0202FAFC(BattleParams * param0, SaveData * param1); -UnkStruct_0202F41C * sub_0202FD88(int param0); -UnkStruct_02030A80 * sub_0202FDB8(int param0); -UnkStruct_02030A80 * sub_0202FDE8(void); -UnkStruct_0202F41C * sub_0202FE04(void); -void sub_0202FE20(UnkStruct_02030A80 * param0, UnkStruct_0202F41C * param1, UnkStruct_0202F298 * param2, BattleParams * param3, SaveData * param4); -u64 sub_0202FE98(UnkStruct_0202F41C * param0, int param1, int param2); -UnkStruct_0202F41C * sub_0202FF2C(int param0); -void sub_0202FF44(UnkStruct_0202F41C * param0); +void sub_0202FAFC(BattleParams *param0, SaveData *param1); +UnkStruct_0202F41C *sub_0202FD88(int param0); +UnkStruct_02030A80 *sub_0202FDB8(int param0); +UnkStruct_02030A80 *sub_0202FDE8(void); +UnkStruct_0202F41C *sub_0202FE04(void); +void sub_0202FE20(UnkStruct_02030A80 *param0, UnkStruct_0202F41C *param1, UnkStruct_0202F298 *param2, BattleParams *param3, SaveData *param4); +u64 sub_0202FE98(UnkStruct_0202F41C *param0, int param1, int param2); +UnkStruct_0202F41C *sub_0202FF2C(int param0); +void sub_0202FF44(UnkStruct_0202F41C *param0); #endif // POKEPLATINUM_UNK_0202F1D4_H diff --git a/include/unk_0202FF4C.h b/include/unk_0202FF4C.h index 4cdc1ec706..9254c9b63b 100644 --- a/include/unk_0202FF4C.h +++ b/include/unk_0202FF4C.h @@ -3,17 +3,18 @@ #include "struct_defs/struct_0202FF58.h" #include "struct_defs/struct_020300F4.h" + #include "savedata.h" -void sub_0202FF4C(UnkStruct_0202FF58 * param0); -UnkStruct_0202FF58 * sub_0202FF58(SaveData * param0); -BOOL sub_0202FF68(UnkStruct_0202FF58 * param0); -void sub_0202FF70(UnkStruct_0202FF58 * param0, BOOL param1); -void sub_0202FF84(UnkStruct_0202FF58 * param0, u8 param1, u8 param2, const void * param3); -u32 sub_02030030(UnkStruct_0202FF58 * param0, u8 param1, u8 param2, void * param3); -void sub_020300A4(UnkStruct_020300F4 * param0); -void sub_020300B0(UnkStruct_020300F4 * param0, u8 param1, u8 param2, const void * param3); -u32 sub_020300E0(UnkStruct_020300F4 * param0, u8 param1, u8 param2, void * param3); -UnkStruct_020300F4 * sub_020300F4(SaveData * param0); +void sub_0202FF4C(UnkStruct_0202FF58 *param0); +UnkStruct_0202FF58 *sub_0202FF58(SaveData *param0); +BOOL sub_0202FF68(UnkStruct_0202FF58 *param0); +void sub_0202FF70(UnkStruct_0202FF58 *param0, BOOL param1); +void sub_0202FF84(UnkStruct_0202FF58 *param0, u8 param1, u8 param2, const void *param3); +u32 sub_02030030(UnkStruct_0202FF58 *param0, u8 param1, u8 param2, void *param3); +void sub_020300A4(UnkStruct_020300F4 *param0); +void sub_020300B0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, const void *param3); +u32 sub_020300E0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, void *param3); +UnkStruct_020300F4 *sub_020300F4(SaveData *param0); #endif // POKEPLATINUM_UNK_0202FF4C_H diff --git a/include/unk_02030108.h b/include/unk_02030108.h index 39fb073a5a..2d3097e07b 100644 --- a/include/unk_02030108.h +++ b/include/unk_02030108.h @@ -3,20 +3,21 @@ #include "struct_decls/struct_02030114_decl.h" #include "struct_decls/struct_0203026C_decl.h" + #include "savedata.h" -void sub_02030108(UnkStruct_02030114 * param0); -UnkStruct_02030114 * sub_02030114(SaveData * param0); -BOOL sub_02030124(UnkStruct_02030114 * param0); -void sub_0203012C(UnkStruct_02030114 * param0, BOOL param1); -void sub_02030140(UnkStruct_02030114 * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_02030198(UnkStruct_02030114 * param0, u8 param1, u8 param2, u8 param3, void * param4); -u8 sub_020301E0(u8 param0, u8 * param1); -void sub_02030204(u8 param0, u8 * param1, u8 param2); -void sub_02030244(u8 * param0); -void sub_02030260(UnkStruct_0203026C * param0); -UnkStruct_0203026C * sub_0203026C(SaveData * param0); -void sub_02030280(UnkStruct_0203026C * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_020302B4(UnkStruct_0203026C * param0, u8 param1, u8 param2, u8 param3, void * param4); +void sub_02030108(UnkStruct_02030114 *param0); +UnkStruct_02030114 *sub_02030114(SaveData *param0); +BOOL sub_02030124(UnkStruct_02030114 *param0); +void sub_0203012C(UnkStruct_02030114 *param0, BOOL param1); +void sub_02030140(UnkStruct_02030114 *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_02030198(UnkStruct_02030114 *param0, u8 param1, u8 param2, u8 param3, void *param4); +u8 sub_020301E0(u8 param0, u8 *param1); +void sub_02030204(u8 param0, u8 *param1, u8 param2); +void sub_02030244(u8 *param0); +void sub_02030260(UnkStruct_0203026C *param0); +UnkStruct_0203026C *sub_0203026C(SaveData *param0); +void sub_02030280(UnkStruct_0203026C *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_020302B4(UnkStruct_0203026C *param0, u8 param1, u8 param2, u8 param3, void *param4); #endif // POKEPLATINUM_UNK_02030108_H diff --git a/include/unk_020302D0.h b/include/unk_020302D0.h index e696313fd1..5bd8cb37ae 100644 --- a/include/unk_020302D0.h +++ b/include/unk_020302D0.h @@ -3,17 +3,18 @@ #include "struct_decls/struct_020302DC_decl.h" #include "struct_decls/struct_0203041C_decl.h" + #include "savedata.h" -void sub_020302D0(UnkStruct_020302DC * param0); -UnkStruct_020302DC * sub_020302DC(SaveData * param0); -BOOL sub_020302EC(UnkStruct_020302DC * param0); -void sub_020302F4(UnkStruct_020302DC * param0, BOOL param1); -void sub_02030308(UnkStruct_020302DC * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_02030398(UnkStruct_020302DC * param0, u8 param1, u8 param2, u8 param3, void * param4); -void sub_02030410(UnkStruct_0203041C * param0); -UnkStruct_0203041C * sub_0203041C(SaveData * param0); -void sub_02030430(UnkStruct_0203041C * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_02030470(UnkStruct_0203041C * param0, u8 param1, u8 param2, u8 param3, void * param4); +void sub_020302D0(UnkStruct_020302DC *param0); +UnkStruct_020302DC *sub_020302DC(SaveData *param0); +BOOL sub_020302EC(UnkStruct_020302DC *param0); +void sub_020302F4(UnkStruct_020302DC *param0, BOOL param1); +void sub_02030308(UnkStruct_020302DC *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_02030398(UnkStruct_020302DC *param0, u8 param1, u8 param2, u8 param3, void *param4); +void sub_02030410(UnkStruct_0203041C *param0); +UnkStruct_0203041C *sub_0203041C(SaveData *param0); +void sub_02030430(UnkStruct_0203041C *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_02030470(UnkStruct_0203041C *param0, u8 param1, u8 param2, u8 param3, void *param4); #endif // POKEPLATINUM_UNK_020302D0_H diff --git a/include/unk_02030494.h b/include/unk_02030494.h index 42036b11b4..01b4edd417 100644 --- a/include/unk_02030494.h +++ b/include/unk_02030494.h @@ -3,17 +3,18 @@ #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_020305B8_decl.h" + #include "savedata.h" -void sub_02030494(UnkStruct_020304A0 * param0); -UnkStruct_020304A0 * sub_020304A0(SaveData * param0); -BOOL sub_020304B0(UnkStruct_020304A0 * param0); -void sub_020304B8(UnkStruct_020304A0 * param0, BOOL param1); -void sub_020304CC(UnkStruct_020304A0 * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_0203054C(UnkStruct_020304A0 * param0, u8 param1, u8 param2, u8 param3, void * param4); -void sub_020305AC(UnkStruct_020305B8 * param0); -UnkStruct_020305B8 * sub_020305B8(SaveData * param0); -void sub_020305CC(UnkStruct_020305B8 * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_02030600(UnkStruct_020305B8 * param0, u8 param1, u8 param2, u8 param3, void * param4); +void sub_02030494(UnkStruct_020304A0 *param0); +UnkStruct_020304A0 *sub_020304A0(SaveData *param0); +BOOL sub_020304B0(UnkStruct_020304A0 *param0); +void sub_020304B8(UnkStruct_020304A0 *param0, BOOL param1); +void sub_020304CC(UnkStruct_020304A0 *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_0203054C(UnkStruct_020304A0 *param0, u8 param1, u8 param2, u8 param3, void *param4); +void sub_020305AC(UnkStruct_020305B8 *param0); +UnkStruct_020305B8 *sub_020305B8(SaveData *param0); +void sub_020305CC(UnkStruct_020305B8 *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_02030600(UnkStruct_020305B8 *param0, u8 param1, u8 param2, u8 param3, void *param4); #endif // POKEPLATINUM_UNK_02030494_H diff --git a/include/unk_0203061C.h b/include/unk_0203061C.h index 1afc436a46..3fbc781baf 100644 --- a/include/unk_0203061C.h +++ b/include/unk_0203061C.h @@ -2,18 +2,19 @@ #define POKEPLATINUM_UNK_0203061C_H #include "struct_decls/struct_0203068C_decl.h" + #include "savedata.h" int Frontier_SaveSize(void); -void Frontier_Init(UnkStruct_0203068C * param0); -UnkStruct_0203068C * sub_0203068C(SaveData * param0); -u16 sub_02030698(UnkStruct_0203068C * param0, int param1, int param2); -u16 sub_020306E4(UnkStruct_0203068C * param0, int param1, int param2, u16 param3); -void sub_02030764(UnkStruct_0203068C * param0); -void sub_02030788(UnkStruct_0203068C * param0, int param1); -void sub_020307F0(UnkStruct_0203068C * param0, int param1, int param2); -u16 sub_02030804(UnkStruct_0203068C * param0, int param1, int param2, int param3); -u16 sub_02030824(UnkStruct_0203068C * param0, int param1, int param2, int param3); -u16 sub_02030848(UnkStruct_0203068C * param0, int param1, int param2, u16 param3); +void Frontier_Init(UnkStruct_0203068C *param0); +UnkStruct_0203068C *sub_0203068C(SaveData *param0); +u16 sub_02030698(UnkStruct_0203068C *param0, int param1, int param2); +u16 sub_020306E4(UnkStruct_0203068C *param0, int param1, int param2, u16 param3); +void sub_02030764(UnkStruct_0203068C *param0); +void sub_02030788(UnkStruct_0203068C *param0, int param1); +void sub_020307F0(UnkStruct_0203068C *param0, int param1, int param2); +u16 sub_02030804(UnkStruct_0203068C *param0, int param1, int param2, int param3); +u16 sub_02030824(UnkStruct_0203068C *param0, int param1, int param2, int param3); +u16 sub_02030848(UnkStruct_0203068C *param0, int param1, int param2, u16 param3); #endif // POKEPLATINUM_UNK_0203061C_H diff --git a/include/unk_02030880.h b/include/unk_02030880.h index 25425c7cd7..c2d750b039 100644 --- a/include/unk_02030880.h +++ b/include/unk_02030880.h @@ -2,13 +2,14 @@ #define POKEPLATINUM_UNK_02030880_H #include "struct_decls/struct_020308A0_decl.h" + #include "savedata.h" int Frontier_Extra_SaveSize(void); -void Frontier_Extra_Init(BattleFrontierStage * param0); -BattleFrontierStage * sub_020308A0(SaveData * param0, int param1, int * param2); -int sub_020308A8(SaveData * param0, BattleFrontierStage * param1); -u16 sub_020308BC(SaveData * param0, BattleFrontierStage * param1, int param2, int param3); -BOOL sub_020309A0(SaveData * param0, int param1, int param2, int param3, int param4, int param5, int * param6, int * param7); +void Frontier_Extra_Init(BattleFrontierStage *param0); +BattleFrontierStage *sub_020308A0(SaveData *param0, int param1, int *param2); +int sub_020308A8(SaveData *param0, BattleFrontierStage *param1); +u16 sub_020308BC(SaveData *param0, BattleFrontierStage *param1, int param2, int param3); +BOOL sub_020309A0(SaveData *param0, int param1, int param2, int param3, int param4, int param5, int *param6, int *param7); #endif // POKEPLATINUM_UNK_02030880_H diff --git a/include/unk_02030A80.h b/include/unk_02030A80.h index 98a0088efa..2e859bba30 100644 --- a/include/unk_02030A80.h +++ b/include/unk_02030A80.h @@ -1,23 +1,24 @@ #ifndef POKEPLATINUM_UNK_02030A80_H #define POKEPLATINUM_UNK_02030A80_H -#include "struct_defs/sentence.h" -#include "strbuf.h" #include "struct_decls/struct_02030A80_decl.h" +#include "struct_defs/sentence.h" + #include "savedata.h" +#include "strbuf.h" -UnkStruct_02030A80 * sub_02030A80(int param0); -void sub_02030A98(UnkStruct_02030A80 * param0); -void sub_02030AA0(UnkStruct_02030A80 * param0, SaveData * param1); -Strbuf* sub_02030B94(const UnkStruct_02030A80 * param0, int param1); -u32 sub_02030BAC(const UnkStruct_02030A80 * param0); -int sub_02030BBC(const UnkStruct_02030A80 * param0); -int sub_02030BCC(const UnkStruct_02030A80 * param0); -int sub_02030BEC(const UnkStruct_02030A80 * param0); -int sub_02030BFC(const UnkStruct_02030A80 * param0); -int sub_02030C08(const UnkStruct_02030A80 * param0); -Strbuf* sub_02030C28(const UnkStruct_02030A80 * param0, Sentence * param1, int param2); -int sub_02030CCC(const UnkStruct_02030A80 * param0); -int sub_02030CDC(const UnkStruct_02030A80 * param0); +UnkStruct_02030A80 *sub_02030A80(int param0); +void sub_02030A98(UnkStruct_02030A80 *param0); +void sub_02030AA0(UnkStruct_02030A80 *param0, SaveData *param1); +Strbuf *sub_02030B94(const UnkStruct_02030A80 *param0, int param1); +u32 sub_02030BAC(const UnkStruct_02030A80 *param0); +int sub_02030BBC(const UnkStruct_02030A80 *param0); +int sub_02030BCC(const UnkStruct_02030A80 *param0); +int sub_02030BEC(const UnkStruct_02030A80 *param0); +int sub_02030BFC(const UnkStruct_02030A80 *param0); +int sub_02030C08(const UnkStruct_02030A80 *param0); +Strbuf *sub_02030C28(const UnkStruct_02030A80 *param0, Sentence *param1, int param2); +int sub_02030CCC(const UnkStruct_02030A80 *param0); +int sub_02030CDC(const UnkStruct_02030A80 *param0); #endif // POKEPLATINUM_UNK_02030A80_H diff --git a/include/unk_02030CE8.h b/include/unk_02030CE8.h index 4ad71c9827..37694c97aa 100644 --- a/include/unk_02030CE8.h +++ b/include/unk_02030CE8.h @@ -2,18 +2,20 @@ #define POKEPLATINUM_UNK_02030CE8_H #include "struct_defs/struct_02030CEC.h" -#include "savedata.h" + #include "overlay096/struct_ov96_0223B574.h" +#include "savedata.h" + int Email_SaveSize(void); -void Email_Init(UnkStruct_02030CEC * param0); -void sub_02030D10(SaveData * param0); -BOOL sub_02030D20(SaveData * param0); -void sub_02030D38(SaveData * param0, const char * param1); -char * sub_02030D50(SaveData * param0); -void sub_02030D5C(SaveData * param0, int param1, u32 param2); -u32 sub_02030D98(SaveData * param0, int param1); -u32 sub_02030E48(SaveData * param0, UnkStruct_ov96_0223B574 * param1); -void sub_02030E78(SaveData * param0, UnkStruct_ov96_0223B574 * param1); +void Email_Init(UnkStruct_02030CEC *param0); +void sub_02030D10(SaveData *param0); +BOOL sub_02030D20(SaveData *param0); +void sub_02030D38(SaveData *param0, const char *param1); +char *sub_02030D50(SaveData *param0); +void sub_02030D5C(SaveData *param0, int param1, u32 param2); +u32 sub_02030D98(SaveData *param0, int param1); +u32 sub_02030E48(SaveData *param0, UnkStruct_ov96_0223B574 *param1); +void sub_02030E78(SaveData *param0, UnkStruct_ov96_0223B574 *param1); #endif // POKEPLATINUM_UNK_02030CE8_H diff --git a/include/unk_02030EA4.h b/include/unk_02030EA4.h index 3a76871871..e6ad8ddd4f 100644 --- a/include/unk_02030EA4.h +++ b/include/unk_02030EA4.h @@ -2,14 +2,15 @@ #define POKEPLATINUM_UNK_02030EA4_H #include "struct_decls/struct_02030EC4_decl.h" + #include "savedata.h" int WiFiQuestion_SaveSize(void); -void WiFiQuestion_Init(UnkStruct_02030EC4 * param0); -UnkStruct_02030EC4 * sub_02030EC4(SaveData * param0); -u32 sub_02030ED0(const UnkStruct_02030EC4 * param0); -u32 sub_02030ED4(const UnkStruct_02030EC4 * param0); -void sub_02030ED8(UnkStruct_02030EC4 * param0, u32 param1); -void sub_02030EDC(UnkStruct_02030EC4 * param0, u32 param1); +void WiFiQuestion_Init(UnkStruct_02030EC4 *param0); +UnkStruct_02030EC4 *sub_02030EC4(SaveData *param0); +u32 sub_02030ED0(const UnkStruct_02030EC4 *param0); +u32 sub_02030ED4(const UnkStruct_02030EC4 *param0); +void sub_02030ED8(UnkStruct_02030EC4 *param0, u32 param1); +void sub_02030EDC(UnkStruct_02030EC4 *param0, u32 param1); #endif // POKEPLATINUM_UNK_02030EA4_H diff --git a/include/unk_02030EE0.h b/include/unk_02030EE0.h index 09f42be7c4..6ab0ccfa4c 100644 --- a/include/unk_02030EE0.h +++ b/include/unk_02030EE0.h @@ -1,30 +1,30 @@ #ifndef POKEPLATINUM_UNK_02030EE0_H #define POKEPLATINUM_UNK_02030EE0_H +#include + #include "functypes/funcptr_020312B8.h" #include "functypes/funcptr_02031E6C.h" #include "functypes/funcptr_02031E9C.h" #include "functypes/funcptr_020320FC.h" #include "functypes/funcptr_02032110.h" -#include - -BOOL sub_02031220(int param0, const u8 * param1, u16 param2); -BOOL sub_020312B8(UnkFuncPtr_020312B8 param0, const u8 * param1, u16 param2); +BOOL sub_02031220(int param0, const u8 *param1, u16 param2); +BOOL sub_020312B8(UnkFuncPtr_020312B8 param0, const u8 *param1, u16 param2); BOOL sub_020314C0(void); void sub_020318D0(u32 param0); -void sub_020318DC(u16 * param0, u16 param1); +void sub_020318DC(u16 *param0, u16 param1); u16 sub_020318EC(void); int sub_02031934(void); int sub_02031948(void); BOOL sub_0203195C(void); u16 sub_02031B04(void); -BOOL sub_02031BC4(void * param0, BOOL param1); +BOOL sub_02031BC4(void *param0, BOOL param1); int sub_02031C50(void); BOOL sub_02031D04(int param0, u16 param1, u16 param2, u16 param3, u16 param4, BOOL param5); -BOOL sub_02031DD8(int param0, WMBssDesc * param1); +BOOL sub_02031DD8(int param0, WMBssDesc *param1); void sub_02031E6C(UnkFuncPtr_02031E6C param0, int param1); -BOOL sub_02031E9C(void * param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3); +BOOL sub_02031E9C(void *param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3); void sub_02031ECC(void); void sub_02031EF4(void); BOOL sub_02031F6C(void); @@ -34,7 +34,7 @@ BOOL sub_02031FBC(void); BOOL sub_02031FD8(void); BOOL sub_02031FF4(void); BOOL sub_02032010(void); -void sub_02032034(void * param0, int param1, int param2, int param3); +void sub_02032034(void *param0, int param1, int param2, int param3); BOOL sub_0203208C(BOOL param0); BOOL sub_020320C4(void); void sub_020320E8(void); diff --git a/include/unk_020322D8.h b/include/unk_020322D8.h index 2759aa6ab3..0551194bc5 100644 --- a/include/unk_020322D8.h +++ b/include/unk_020322D8.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_UNK_020322D8_H #define POKEPLATINUM_UNK_020322D8_H -#include "comm_ring.h" #include "struct_defs/struct_020322F8.h" #include "struct_defs/struct_0203233C.h" -BOOL CommQueue_IsEmpty(CommQueueMan * param0); -BOOL CommQueue_Write(CommQueueMan * param0, int param1, u8 * param2, int param3, BOOL param4, BOOL param5); -BOOL sub_02032574(CommQueueMan * param0, UnkStruct_0203233C * param1, BOOL param2); -void CommQueueMan_Init(CommQueueMan * param0, int param1, CommRing * param2); -void CommQueueMan_Reset(CommQueueMan * param0); -void CommQueueMan_Delete(CommQueueMan * param0); -BOOL CommQueue_CompareCmd(CommQueueMan * param0, int param1); +#include "comm_ring.h" + +BOOL CommQueue_IsEmpty(CommQueueMan *param0); +BOOL CommQueue_Write(CommQueueMan *param0, int param1, u8 *param2, int param3, BOOL param4, BOOL param5); +BOOL sub_02032574(CommQueueMan *param0, UnkStruct_0203233C *param1, BOOL param2); +void CommQueueMan_Init(CommQueueMan *param0, int param1, CommRing *param2); +void CommQueueMan_Reset(CommQueueMan *param0); +void CommQueueMan_Delete(CommQueueMan *param0); +BOOL CommQueue_CompareCmd(CommQueueMan *param0, int param1); #endif // POKEPLATINUM_UNK_020322D8_H diff --git a/include/unk_02032798.h b/include/unk_02032798.h index 7166d25cab..f502a6c3bb 100644 --- a/include/unk_02032798.h +++ b/include/unk_02032798.h @@ -3,12 +3,12 @@ #include "struct_defs/struct_02039A58.h" -void CommCmd_Init(const CommCmdTable * param0, int param1, void * param2); +void CommCmd_Init(const CommCmdTable *param0, int param1, void *param2); void sub_020327E0(void); -void CommCmd_Callback(int param0, int param1, int param2, void * param3); +void CommCmd_Callback(int param0, int param1, int param2, void *param3); int CommCmd_PacketSizeOf(int param0); BOOL sub_020328D0(int param0); -void * sub_0203290C(int param0, int param1, int param2); +void *sub_0203290C(int param0, int param1, int param2); int sub_02032944(void); int sub_0203294C(void); int CommPacketSizeOf_NetId(void); diff --git a/include/unk_02033200.h b/include/unk_02033200.h index f0205963ba..1110c01f15 100644 --- a/include/unk_02033200.h +++ b/include/unk_02033200.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_UNK_02033200_H #define POKEPLATINUM_UNK_02033200_H +#include + #include "struct_defs/sentence.h" -#include "trainer_info.h" #include "struct_defs/struct_0203330C.h" -#include +#include "trainer_info.h" -void CommServerClient_Init(TrainerInfo * param0, BOOL param1); +void CommServerClient_Init(TrainerInfo *param0, BOOL param1); BOOL sub_020332D0(void); void sub_02033478(void); BOOL sub_020334A4(void); @@ -26,7 +27,7 @@ void sub_02033884(void); int sub_02033898(int param0); int sub_020338EC(void); int sub_0203394C(void); -void sub_020339AC(int param0, TrainerInfo * param1); +void sub_020339AC(int param0, TrainerInfo *param1); BOOL sub_020339E8(u16 param0); void sub_02033A5C(void); void sub_02033D94(u16 param0); @@ -38,20 +39,20 @@ BOOL sub_02033E68(void); BOOL CommServerClient_CheckError(void); void sub_02033EA8(BOOL param0); void sub_02033ED4(BOOL param0); -WMBssDesc * sub_02033F3C(int param0); -UnkStruct_0203330C * sub_02033F6C(int param0); -TrainerInfo * sub_02033F9C(void); -TrainerInfo * sub_02033FB0(int param0); -void sub_02033FDC(u8 * param0, int param1); +WMBssDesc *sub_02033F3C(int param0); +UnkStruct_0203330C *sub_02033F6C(int param0); +TrainerInfo *sub_02033F9C(void); +TrainerInfo *sub_02033FB0(int param0); +void sub_02033FDC(u8 *param0, int param1); BOOL sub_0203406C(void); void sub_0203408C(void); -void sub_020340A8(Sentence * param0); -void sub_020340C4(void * param0); -void * sub_020340E8(void); +void sub_020340A8(Sentence *param0); +void sub_020340C4(void *param0); +void *sub_020340E8(void); void sub_020340FC(void); int sub_02034120(int param0); BOOL sub_02034148(void); -void sub_02034150(void * param0); -const void * sub_02034168(int param0); +void sub_02034150(void *param0); +const void *sub_02034168(int param0); #endif // POKEPLATINUM_UNK_02033200_H diff --git a/include/unk_020363E8.h b/include/unk_020363E8.h index b6317fca8e..d2b4cc2f17 100644 --- a/include/unk_020363E8.h +++ b/include/unk_020363E8.h @@ -4,22 +4,22 @@ void CommTool_Init(int param0); void CommTool_Delete(void); BOOL CommTool_IsInitialized(void); -void CommCmd_16(int param0, int param1, void * param2, void * param3); -void CommCmd_18(int param0, int param1, void * param2, void * param3); -void CommCmd_17(int param0, int param1, void * param2, void * param3); +void CommCmd_16(int param0, int param1, void *param2, void *param3); +void CommCmd_18(int param0, int param1, void *param2, void *param3); +void CommCmd_17(int param0, int param1, void *param2, void *param3); void CommTiming_StartSync(u8 param0); void sub_0203650C(void); BOOL CommTiming_IsSyncState(u8 param0); int sub_02036564(int param0); -void sub_02036574(int param0, int param1, void * param2, void * param3); +void sub_02036574(int param0, int param1, void *param2, void *param3); int sub_02036590(void); void sub_02036594(u8 param0, u8 param1); int CommList_Get(int param0, u8 param1); void CommList_Refresh(void); void sub_020365F4(void); -BOOL sub_02036614(int param0, const void * param1); -const void * sub_0203664C(int param0); -void sub_02036670(int param0, int param1, void * param2, void * param3); +BOOL sub_02036614(int param0, const void *param1); +const void *sub_0203664C(int param0); +void sub_02036670(int param0, int param1, void *param2, void *param3); int CommTool_TempDataSize(void); #endif // POKEPLATINUM_UNK_020363E8_H diff --git a/include/unk_020366A0.h b/include/unk_020366A0.h index 2bc97db1a3..d098379aa9 100644 --- a/include/unk_020366A0.h +++ b/include/unk_020366A0.h @@ -3,13 +3,14 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0202610C.h" -#include "savedata.h" + #include "overlay065/struct_ov65_0222F6EC.h" #include "enums.h" +#include "savedata.h" BOOL CommMan_IsInitialized(void); -void sub_02036794(SaveData * param0); +void sub_02036794(SaveData *param0); void sub_020367D0(void); void sub_020367F0(void); void sub_02036814(BOOL param0); @@ -18,14 +19,14 @@ BOOL sub_02036834(void); void sub_02036884(void); void sub_02036894(void); void sub_020368A4(void); -void CommMan_StartBattleServer(SaveData * param0, int param1, int param2, const BattleRegulation * param3, BOOL param4); -void CommMan_StartBattleClient(SaveData * param0, int param1, int param2, const BattleRegulation * param3, BOOL param4); +void CommMan_StartBattleServer(SaveData *param0, int param1, int param2, const BattleRegulation *param3, BOOL param4); +void CommMan_StartBattleClient(SaveData *param0, int param1, int param2, const BattleRegulation *param3, BOOL param4); void sub_02036948(int param0); void sub_02036964(void); void sub_02036978(void); void sub_02036994(BOOL param0); BOOL sub_0203699C(void); -void sub_020369EC(SaveData * param0); +void sub_020369EC(SaveData *param0); void sub_02036A38(int param0); int sub_02036A68(void); BOOL sub_02036AA0(void); @@ -36,8 +37,8 @@ void sub_02036B84(void); void sub_02036BA0(void); void sub_02036BC8(void); void sub_02036BD8(void); -void sub_02036BE8(SaveData * param0, int param1); -void sub_02036C1C(SaveData * param0, int param1); +void sub_02036BE8(SaveData *param0, int param1); +void sub_02036C1C(SaveData *param0, int param1); void sub_02036C50(void); void sub_0203781C(void); void sub_02037854(int param0); @@ -45,58 +46,58 @@ void sub_02037878(void); void sub_02037888(int param0); void sub_020378B8(void); void sub_020378C8(int param0); -void sub_02037A78(int param0, int param1, void * param2, void * param3); -void sub_02037AD8(int param0, int param1, void * param2, void * param3); +void sub_02037A78(int param0, int param1, void *param2, void *param3); +void sub_02037AD8(int param0, int param1, void *param2, void *param3); int sub_02037B54(void); void sub_02037B58(int param0); -void sub_02037BC0(SaveData * param0); +void sub_02037BC0(SaveData *param0); void sub_02037BFC(void); BOOL sub_02037C18(void); -void sub_02037D48(SaveData * param0); +void sub_02037D48(SaveData *param0); void sub_02037D84(void); u8 sub_02037DA0(void); BOOL sub_02037DB0(void); void sub_02037F94(int param0, int param1, int param2); int sub_020380A0(int param0); int sub_020380E4(); -void sub_02038240(int param0, int param1, void * param2, void * param3); +void sub_02038240(int param0, int param1, void *param2, void *param3); BOOL sub_02038284(void); BOOL sub_02038294(void); BOOL sub_020382C0(void); -UnkStruct_ov65_0222F6EC * sub_020382F8(void); +UnkStruct_ov65_0222F6EC *sub_020382F8(void); void sub_02038350(void); void sub_02038378(void); void sub_02038398(void); void sub_020383D4(void); BOOL sub_020383E8(void); -void sub_02038438(SaveData * param0); +void sub_02038438(SaveData *param0); void sub_0203848C(void); -void sub_020384C0(SaveData * param0); +void sub_020384C0(SaveData *param0); void sub_02038514(void); -void sub_02038548(SaveData * param0); +void sub_02038548(SaveData *param0); void sub_0203859C(void); BOOL sub_020385D0(void); -void * sub_0203871C(SaveData * param0, int param1); -void sub_0203878C(SaveData * param0, const void * param1); +void *sub_0203871C(SaveData *param0, int param1); +void sub_0203878C(SaveData *param0, const void *param1); void sub_020387E8(void); BOOL sub_02038804(void); BOOL sub_0203881C(void); void sub_0203883C(UnkEnum_ov66_02232F38 param0); void sub_0203888C(void); u32 sub_020388AC(void); -void * sub_020388E8(void); +void *sub_020388E8(void); void CommMan_SetErrorHandling(BOOL param0, BOOL param1); BOOL sub_02038938(void); int sub_0203895C(void); int sub_02038974(void); -void sub_0203898C(u8 * param0); -void sub_020389A0(u8 * param0); +void sub_0203898C(u8 *param0); +void sub_020389A0(u8 *param0); BOOL sub_020389B8(void); void sub_020389C4(u8 param0); u8 sub_020389D8(void); void sub_020389FC(int param0); void sub_02038A0C(void); -void sub_02038A1C(int param0, BGL * param1); +void sub_02038A1C(int param0, BGL *param1); void sub_02038A20(int param0); BOOL sub_02038AB8(void); BOOL Link_SetErrorState(int param0); diff --git a/include/unk_02038ED4.h b/include/unk_02038ED4.h index 691df2acf1..286a9975f2 100644 --- a/include/unk_02038ED4.h +++ b/include/unk_02038ED4.h @@ -3,7 +3,7 @@ #include "savedata.h" -void sub_02038ED4(int * param0); -int sub_02038EDC(SaveData * param0, int param1, int * param2); +void sub_02038ED4(int *param0); +int sub_02038EDC(SaveData *param0, int param1, int *param2); #endif // POKEPLATINUM_UNK_02038ED4_H diff --git a/include/unk_02038F8C.h b/include/unk_02038F8C.h index a29ea47a3c..30edc94836 100644 --- a/include/unk_02038F8C.h +++ b/include/unk_02038F8C.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_0202C878_decl.h" -void sub_02038F8C(UnkStruct_0202C878 * param0); -void sub_02038FDC(UnkStruct_0202C878 * param0, int param1, int param2, int param3); +void sub_02038F8C(UnkStruct_0202C878 *param0); +void sub_02038FDC(UnkStruct_0202C878 *param0, int param1, int param2, int param3); #endif // POKEPLATINUM_UNK_02038F8C_H diff --git a/include/unk_02038FFC.h b/include/unk_02038FFC.h index 84689a7039..1b268661fc 100644 --- a/include/unk_02038FFC.h +++ b/include/unk_02038FFC.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_UNK_02038FFC_H #include "struct_decls/struct_0202B370_decl.h" + #include "savedata.h" int sub_02038FFC(int param0); -void sub_02039034(UnkStruct_0202B370 * param0); -int sub_02039058(UnkStruct_0202B370 * param0); -BOOL sub_02039074(SaveData * param0); +void sub_02039034(UnkStruct_0202B370 *param0); +int sub_02039058(UnkStruct_0202B370 *param0); +BOOL sub_02039074(SaveData *param0); #endif // POKEPLATINUM_UNK_02038FFC_H diff --git a/include/unk_0203909C.h b/include/unk_0203909C.h index 77318af471..044eb6cb70 100644 --- a/include/unk_0203909C.h +++ b/include/unk_0203909C.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_UNK_0203909C_H #define POKEPLATINUM_UNK_0203909C_H -#include "savedata.h" - #include -int sub_0203909C(SaveData * param0, DWCFriendData * param1, int * param2); -int sub_02039140(SaveData * param0, u64 param1, int * param2); -BOOL sub_020391DC(SaveData * param0, int * param1, int param2); -void sub_02039298(SaveData * param0, int param1, int param2, int param3, int param4); -int sub_02039390(SaveData * param0, int param1); +#include "savedata.h" + +int sub_0203909C(SaveData *param0, DWCFriendData *param1, int *param2); +int sub_02039140(SaveData *param0, u64 param1, int *param2); +BOOL sub_020391DC(SaveData *param0, int *param1, int param2); +void sub_02039298(SaveData *param0, int param1, int param2, int param3, int param4); +int sub_02039390(SaveData *param0, int param1); #endif // POKEPLATINUM_UNK_0203909C_H diff --git a/include/unk_020393C8.h b/include/unk_020393C8.h index 78014511c9..1051d7a362 100644 --- a/include/unk_020393C8.h +++ b/include/unk_020393C8.h @@ -4,11 +4,11 @@ #include "struct_decls/struct_020393C8_decl.h" #include "struct_defs/struct_020E5EB4.h" -UnkStruct_020393C8 * sub_020393C8(u32 param0, u32 param1, int param2, int param3, BOOL param4, const UnkStruct_020E5EB4 * param5[], int param6); -void sub_02039434(UnkStruct_020393C8 * param0, int param1); -void sub_02039440(UnkStruct_020393C8 * param0); -void sub_02039474(UnkStruct_020393C8 * param0, BOOL param1, u32 param2); -void * sub_020394A8(u32 param0); +UnkStruct_020393C8 *sub_020393C8(u32 param0, u32 param1, int param2, int param3, BOOL param4, const UnkStruct_020E5EB4 *param5[], int param6); +void sub_02039434(UnkStruct_020393C8 *param0, int param1); +void sub_02039440(UnkStruct_020393C8 *param0); +void sub_02039474(UnkStruct_020393C8 *param0, BOOL param1, u32 param2); +void *sub_020394A8(u32 param0); void sub_02039720(void); void sub_02039734(void); void sub_02039750(int param0, int param1, BOOL param2, int param3); diff --git a/include/unk_02039A58.h b/include/unk_02039A58.h index 51d29f2025..b97b2ae20c 100644 --- a/include/unk_02039A58.h +++ b/include/unk_02039A58.h @@ -3,7 +3,7 @@ #include "struct_defs/struct_02039A58.h" -const CommCmdTable * sub_02039A58(void); +const CommCmdTable *sub_02039A58(void); int sub_02039A60(void); #endif // POKEPLATINUM_UNK_02039A58_H diff --git a/include/unk_02039C80.h b/include/unk_02039C80.h index a4436d89de..c7e9453f71 100644 --- a/include/unk_02039C80.h +++ b/include/unk_02039C80.h @@ -4,24 +4,24 @@ #include "struct_decls/struct_02039E30_decl.h" #include "struct_decls/struct_02039EBC_decl.h" -UnkStruct_02039E30 * sub_02039D6C(void); -UnkStruct_02039E30 * sub_02039D78(u32 param0); -void sub_02039D90(UnkStruct_02039E30 * param0, UnkStruct_02039E30 * param1); -void sub_02039DC0(const int param0, UnkStruct_02039E30 * param1); -void sub_02039DE4(UnkStruct_02039E30 * const param0); -u16 sub_02039DEC(int param0, const UnkStruct_02039E30 * param1); -int sub_02039E10(const UnkStruct_02039E30 * param0); -int sub_02039E20(const UnkStruct_02039E30 * param0); -u16 sub_02039E30(const UnkStruct_02039E30 * param0, int param1, int param2); -u16 sub_02039E68(const UnkStruct_02039E30 * param0, const int param1); -u8 sub_02039E88(const UnkStruct_02039E30 * param0); -int sub_02039E8C(const UnkStruct_02039E30 * param0, const int param1, const int param2, const int param3, const int param4); -UnkStruct_02039EBC * sub_02039EBC(const u32 param0); -void sub_02039EF0(UnkStruct_02039EBC * param0); -int sub_02039F04(const UnkStruct_02039EBC * param0, const u32 param1, const u32 param2); +UnkStruct_02039E30 *sub_02039D6C(void); +UnkStruct_02039E30 *sub_02039D78(u32 param0); +void sub_02039D90(UnkStruct_02039E30 *param0, UnkStruct_02039E30 *param1); +void sub_02039DC0(const int param0, UnkStruct_02039E30 *param1); +void sub_02039DE4(UnkStruct_02039E30 *const param0); +u16 sub_02039DEC(int param0, const UnkStruct_02039E30 *param1); +int sub_02039E10(const UnkStruct_02039E30 *param0); +int sub_02039E20(const UnkStruct_02039E30 *param0); +u16 sub_02039E30(const UnkStruct_02039E30 *param0, int param1, int param2); +u16 sub_02039E68(const UnkStruct_02039E30 *param0, const int param1); +u8 sub_02039E88(const UnkStruct_02039E30 *param0); +int sub_02039E8C(const UnkStruct_02039E30 *param0, const int param1, const int param2, const int param3, const int param4); +UnkStruct_02039EBC *sub_02039EBC(const u32 param0); +void sub_02039EF0(UnkStruct_02039EBC *param0); +int sub_02039F04(const UnkStruct_02039EBC *param0, const u32 param1, const u32 param2); int sub_02039F10(const int param0, const u16 param1, const u16 param2); -const u16 sub_02039F74(const int param0, const UnkStruct_02039E30 * param1); -void sub_02039F8C(UnkStruct_02039E30 * param0); -void sub_02039FE0(UnkStruct_02039E30 * param0); +const u16 sub_02039F74(const int param0, const UnkStruct_02039E30 *param1); +void sub_02039F8C(UnkStruct_02039E30 *param0); +void sub_02039FE0(UnkStruct_02039E30 *param0); #endif // POKEPLATINUM_UNK_02039C80_H diff --git a/include/unk_0203A7D8.h b/include/unk_0203A7D8.h index f564a84a8f..8bad84e8d7 100644 --- a/include/unk_0203A7D8.h +++ b/include/unk_0203A7D8.h @@ -1,16 +1,17 @@ #ifndef POKEPLATINUM_UNK_0203A7D8_H #define POKEPLATINUM_UNK_0203A7D8_H -#include "field/field_system_decl.h" #include "struct_defs/struct_02049FA8.h" +#include "field/field_system_decl.h" + int sub_0203A7EC(void); -void sub_0203A7F0(int param0, Location * param1); -void sub_0203A824(int param0, Location * param1); +void sub_0203A7F0(int param0, Location *param1); +void sub_0203A824(int param0, Location *param1); int sub_0203A858(int param0); int sub_0203A87C(int param0); int sub_0203A8A0(int param0, int param1, int param2); -void sub_0203A8E8(FieldSystem * fieldSystem, int param1); -BOOL sub_0203A920(FieldSystem * fieldSystem, int param1); +void sub_0203A8E8(FieldSystem *fieldSystem, int param1); +BOOL sub_0203A920(FieldSystem *fieldSystem, int param1); #endif // POKEPLATINUM_UNK_0203A7D8_H diff --git a/include/unk_0203A944.h b/include/unk_0203A944.h index 1b444d3de7..6f21c82233 100644 --- a/include/unk_0203A944.h +++ b/include/unk_0203A944.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -int FieldSystem_GetWeather(FieldSystem * fieldSystem, int param1); +int FieldSystem_GetWeather(FieldSystem *fieldSystem, int param1); #endif // POKEPLATINUM_UNK_0203A944_H diff --git a/include/unk_0203C954.h b/include/unk_0203C954.h index 3f112c293c..f282470d6c 100644 --- a/include/unk_0203C954.h +++ b/include/unk_0203C954.h @@ -1,15 +1,17 @@ #ifndef POKEPLATINUM_UNK_0203C954_H #define POKEPLATINUM_UNK_0203C954_H -#include "field/field_system_decl.h" #include "struct_decls/struct_02061AB4_decl.h" + +#include "field/field_system_decl.h" + #include "map_header_data.h" -void sub_0203C9D4(FieldSystem * fieldSystem, MapObject ** param1); -u8 sub_0203CA40(FieldSystem * fieldSystem, MapObject ** param1); -u16 sub_0203CA6C(FieldSystem * fieldSystem, const BgEvent * param1, int param2); -u16 sub_0203CB80(FieldSystem * fieldSystem, const BgEvent * param1, int param2); -u8 sub_0203CBE0(FieldSystem * fieldSystem, MapObject ** param1); -u16 sub_0203CC14(FieldSystem * fieldSystem, void * param1, int param2); +void sub_0203C9D4(FieldSystem *fieldSystem, MapObject **param1); +u8 sub_0203CA40(FieldSystem *fieldSystem, MapObject **param1); +u16 sub_0203CA6C(FieldSystem *fieldSystem, const BgEvent *param1, int param2); +u16 sub_0203CB80(FieldSystem *fieldSystem, const BgEvent *param1, int param2); +u8 sub_0203CBE0(FieldSystem *fieldSystem, MapObject **param1); +u16 sub_0203CC14(FieldSystem *fieldSystem, void *param1, int param2); #endif // POKEPLATINUM_UNK_0203C954_H diff --git a/include/unk_0203D178.h b/include/unk_0203D178.h index 32d258fa9b..ed8c699ee5 100644 --- a/include/unk_0203D178.h +++ b/include/unk_0203D178.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_UNK_0203D178_H #include "struct_defs/struct_02049FA8.h" + #include "savedata.h" -void sub_0203D178(Location * param0); -void sub_0203D190(Location * param0); -void sub_0203D1A8(SaveData * param0); +void sub_0203D178(Location *param0); +void sub_0203D190(Location *param0); +void sub_0203D1A8(SaveData *param0); #endif // POKEPLATINUM_UNK_0203D178_H diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h index bdbb89ad74..2fe5cac17f 100644 --- a/include/unk_0203D1B8.h +++ b/include/unk_0203D1B8.h @@ -1,95 +1,97 @@ #ifndef POKEPLATINUM_UNK_0203D1B8_H #define POKEPLATINUM_UNK_0203D1B8_H -#include "field/field_system_decl.h" +#include "struct_decls/struct_020508D4_decl.h" +#include "struct_decls/struct_02070950_decl.h" +#include "struct_decls/struct_0209747C_decl.h" +#include "struct_defs/choose_starter_data.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0203D8AC.h" #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_0203E234.h" #include "struct_defs/struct_0203E274.h" #include "struct_defs/struct_0203E348.h" #include "struct_defs/struct_02042434.h" -#include "struct_defs/choose_starter_data.h" -#include "struct_decls/struct_020508D4_decl.h" #include "struct_defs/struct_020684D0.h" -#include "struct_decls/struct_02070950_decl.h" #include "struct_defs/struct_02072014.h" -#include "pokemon.h" -#include "struct_decls/struct_0209747C_decl.h" #include "struct_defs/struct_02097728.h" #include "struct_defs/struct_02098C44.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_020997B8.h" -#include "savedata.h" + +#include "field/field_system_decl.h" #include "overlay006/battle_params.h" #include "overlay090/struct_ov90_021D0D80.h" -void sub_0203D1D4(FieldSystem * fieldSystem, BattleParams * param1); -void sub_0203D1E4(FieldSystem * fieldSystem, void * param1); -void * sub_0203D20C(FieldSystem * fieldSystem, UnkStruct_020684D0 * param1); -void * sub_0203D264(FieldSystem * fieldSystem, int param1); -u16 sub_0203D2C4(void * param0); -void sub_0203D2E4(FieldSystem * fieldSystem, void * param1); -void sub_0203D30C(FieldSystem * fieldSystem, void * param1); -void sub_0203D334(FieldSystem * fieldSystem, void * param1); -void * sub_0203D390(FieldSystem * fieldSystem, UnkStruct_02070950 * param1, u8 param2); -void * sub_0203D3C0(int param0, FieldSystem * fieldSystem); -void * sub_0203D3E4(int param0, FieldSystem * fieldSystem); -int sub_0203D408(void * param0); -void * sub_0203D410(int param0, FieldSystem * fieldSystem, int param2); -int sub_0203D438(void * param0); -int sub_0203D440(void * param0); -void * sub_0203D50C(TaskManager * param0, int param1); -void * sub_0203D578(int param0, FieldSystem * fieldSystem, int param2, int param3, int param4, int param5); -void * sub_0203D5C8(int param0, FieldSystem * fieldSystem, int param2); -void * sub_0203D644(FieldSystem * fieldSystem, int param1); -PokemonSummary * sub_0203D670(FieldSystem * fieldSystem, int param1, int param2); -void * sub_0203D6E4(int param0, FieldSystem * fieldSystem, u8 param2); -int sub_0203D750(void * param0); -void sub_0203D754(FieldSystem * fieldSystem, UnkStruct_02042434 * param1); -void sub_0203D80C(TaskManager * param0, u16 * param1, u16 * param2, u16 * param3); -void sub_0203D874(FieldSystem * fieldSystem, UnkStruct_0209747C * param1); -void sub_0203D884(FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1); -void * sub_0203D8AC(FieldSystem * fieldSystem); -void * sub_0203D8EC(FieldSystem * fieldSystem); -UnkStruct_02097728 * sub_0203D920(FieldSystem * fieldSystem, int param1, u8 param2, u8 param3, int param4); -UnkStruct_02097728 * sub_0203D94C(FieldSystem * fieldSystem, int param1, u8 param2, int param3); -UnkStruct_02097728 * sub_0203D984(FieldSystem * fieldSystem, Pokemon * param1, int param2); -UnkStruct_0203D9B8 * sub_0203D9B8(FieldSystem * fieldSystem, int param1); -void sub_0203D9D8(FieldSystem * fieldSystem, UnkStruct_ov90_021D0D80 * param1); -void sub_0203DAC0(TaskManager * param0, u16 * param1, SaveData * param2, u16 param3, u16 param4); -BOOL sub_0203DB10(FieldSystem * fieldSystem, void * param1); -BOOL sub_0203DB24(FieldSystem * fieldSystem, void * param1); -BOOL sub_0203DBF0(TaskManager * param0); -void sub_0203DDDC(TaskManager * param0); -void sub_0203DDFC(FieldSystem * fieldSystem); -void * sub_0203DE34(FieldSystem * fieldSystem); -void sub_0203DE78(FieldSystem * fieldSystem, SaveData * param1); -void sub_0203DE88(FieldSystem * fieldSystem, SaveData * param1); -void sub_0203DFE8(TaskManager * param0, int param1, int param2, int param3, int param4, const u16 * param5, u16 * param6); -void sub_0203E09C(FieldSystem * fieldSystem, TrainerCard * param1); -BOOL sub_0203E0AC(FieldSystem * fieldSystem, void * param1); -void sub_0203E0C0(FieldSystem * fieldSystem, ChooseStarterData * param1); -void sub_0203E0D0(FieldSystem * fieldSystem); -void sub_0203E0FC(FieldSystem * fieldSystem, int param1); -void * sub_0203E1AC(FieldSystem * fieldSystem, int param1, int param2); -void sub_0203E224(FieldSystem * fieldSystem); -void sub_0203E234(FieldSystem * fieldSystem, UnkStruct_0203E234 * param1); -void * sub_0203E244(FieldSystem * fieldSystem); -void sub_0203E274(FieldSystem * fieldSystem, UnkStruct_0203E274 * param1); -void sub_0203E284(FieldSystem * fieldSystem, UnkStruct_020997B8 * param1); -void sub_0203E2AC(FieldSystem * fieldSystem, void * param1); -void sub_0203E2D4(FieldSystem * fieldSystem, void * param1); -void sub_0203E2FC(FieldSystem * fieldSystem); -BOOL sub_0203E348(FieldSystem * fieldSystem, UnkStruct_0203E348 * param1); -void sub_0203E414(TaskManager * param0, int param1); -void sub_0203E518(TaskManager * param0); -void * sub_0203E53C(FieldSystem * fieldSystem, int param1, int param2); -void * sub_0203E564(FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3, int param4); -PartyManagementData * sub_0203E598(FieldSystem * fieldSystem, int param1, int param2); -void * sub_0203E608(FieldSystem * fieldSystem, int param1); -void * sub_0203E63C(int param0, FieldSystem * fieldSystem, u16 param2, u16 param3); -void sub_0203E6C0(FieldSystem * fieldSystem, int param1, int param2); -void sub_0203E704(FieldSystem * fieldSystem); -void sub_0203E714(FieldSystem * fieldSystem); +#include "pokemon.h" +#include "savedata.h" + +void sub_0203D1D4(FieldSystem *fieldSystem, BattleParams *param1); +void sub_0203D1E4(FieldSystem *fieldSystem, void *param1); +void *sub_0203D20C(FieldSystem *fieldSystem, UnkStruct_020684D0 *param1); +void *sub_0203D264(FieldSystem *fieldSystem, int param1); +u16 sub_0203D2C4(void *param0); +void sub_0203D2E4(FieldSystem *fieldSystem, void *param1); +void sub_0203D30C(FieldSystem *fieldSystem, void *param1); +void sub_0203D334(FieldSystem *fieldSystem, void *param1); +void *sub_0203D390(FieldSystem *fieldSystem, UnkStruct_02070950 *param1, u8 param2); +void *sub_0203D3C0(int param0, FieldSystem *fieldSystem); +void *sub_0203D3E4(int param0, FieldSystem *fieldSystem); +int sub_0203D408(void *param0); +void *sub_0203D410(int param0, FieldSystem *fieldSystem, int param2); +int sub_0203D438(void *param0); +int sub_0203D440(void *param0); +void *sub_0203D50C(TaskManager *param0, int param1); +void *sub_0203D578(int param0, FieldSystem *fieldSystem, int param2, int param3, int param4, int param5); +void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2); +void *sub_0203D644(FieldSystem *fieldSystem, int param1); +PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int param1, int param2); +void *sub_0203D6E4(int param0, FieldSystem *fieldSystem, u8 param2); +int sub_0203D750(void *param0); +void sub_0203D754(FieldSystem *fieldSystem, UnkStruct_02042434 *param1); +void sub_0203D80C(TaskManager *param0, u16 *param1, u16 *param2, u16 *param3); +void sub_0203D874(FieldSystem *fieldSystem, UnkStruct_0209747C *param1); +void sub_0203D884(FieldSystem *fieldSystem, UnkStruct_0203D8AC *param1); +void *sub_0203D8AC(FieldSystem *fieldSystem); +void *sub_0203D8EC(FieldSystem *fieldSystem); +UnkStruct_02097728 *sub_0203D920(FieldSystem *fieldSystem, int param1, u8 param2, u8 param3, int param4); +UnkStruct_02097728 *sub_0203D94C(FieldSystem *fieldSystem, int param1, u8 param2, int param3); +UnkStruct_02097728 *sub_0203D984(FieldSystem *fieldSystem, Pokemon *param1, int param2); +UnkStruct_0203D9B8 *sub_0203D9B8(FieldSystem *fieldSystem, int param1); +void sub_0203D9D8(FieldSystem *fieldSystem, UnkStruct_ov90_021D0D80 *param1); +void sub_0203DAC0(TaskManager *param0, u16 *param1, SaveData *param2, u16 param3, u16 param4); +BOOL sub_0203DB10(FieldSystem *fieldSystem, void *param1); +BOOL sub_0203DB24(FieldSystem *fieldSystem, void *param1); +BOOL sub_0203DBF0(TaskManager *param0); +void sub_0203DDDC(TaskManager *param0); +void sub_0203DDFC(FieldSystem *fieldSystem); +void *sub_0203DE34(FieldSystem *fieldSystem); +void sub_0203DE78(FieldSystem *fieldSystem, SaveData *param1); +void sub_0203DE88(FieldSystem *fieldSystem, SaveData *param1); +void sub_0203DFE8(TaskManager *param0, int param1, int param2, int param3, int param4, const u16 *param5, u16 *param6); +void sub_0203E09C(FieldSystem *fieldSystem, TrainerCard *param1); +BOOL sub_0203E0AC(FieldSystem *fieldSystem, void *param1); +void sub_0203E0C0(FieldSystem *fieldSystem, ChooseStarterData *param1); +void sub_0203E0D0(FieldSystem *fieldSystem); +void sub_0203E0FC(FieldSystem *fieldSystem, int param1); +void *sub_0203E1AC(FieldSystem *fieldSystem, int param1, int param2); +void sub_0203E224(FieldSystem *fieldSystem); +void sub_0203E234(FieldSystem *fieldSystem, UnkStruct_0203E234 *param1); +void *sub_0203E244(FieldSystem *fieldSystem); +void sub_0203E274(FieldSystem *fieldSystem, UnkStruct_0203E274 *param1); +void sub_0203E284(FieldSystem *fieldSystem, UnkStruct_020997B8 *param1); +void sub_0203E2AC(FieldSystem *fieldSystem, void *param1); +void sub_0203E2D4(FieldSystem *fieldSystem, void *param1); +void sub_0203E2FC(FieldSystem *fieldSystem); +BOOL sub_0203E348(FieldSystem *fieldSystem, UnkStruct_0203E348 *param1); +void sub_0203E414(TaskManager *param0, int param1); +void sub_0203E518(TaskManager *param0); +void *sub_0203E53C(FieldSystem *fieldSystem, int param1, int param2); +void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, int param4); +PartyManagementData *sub_0203E598(FieldSystem *fieldSystem, int param1, int param2); +void *sub_0203E608(FieldSystem *fieldSystem, int param1); +void *sub_0203E63C(int param0, FieldSystem *fieldSystem, u16 param2, u16 param3); +void sub_0203E6C0(FieldSystem *fieldSystem, int param1, int param2); +void sub_0203E704(FieldSystem *fieldSystem); +void sub_0203E714(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_0203D1B8_H diff --git a/include/unk_0203E880.h b/include/unk_0203E880.h index 625ef86b53..73e81009ec 100644 --- a/include/unk_0203E880.h +++ b/include/unk_0203E880.h @@ -1,43 +1,45 @@ #ifndef POKEPLATINUM_UNK_0203E880_H #define POKEPLATINUM_UNK_0203E880_H -#include "field/field_system_decl.h" -#include "field_script_context.h" #include "struct_decls/struct_0203EF60_decl.h" -#include "struct_defs/struct_0203F478.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" +#include "struct_defs/struct_0203F478.h" + +#include "field/field_system_decl.h" + +#include "field_script_context.h" -void sub_0203E880(FieldSystem * fieldSystem, u16 param1, MapObject * param2); -void sub_0203E8B0(FieldSystem * fieldSystem, MapObject * param1, int param2, int param3, int param4, int param5, int param6, int param7); -void sub_0203E8E0(TaskManager * param0, u16 param1, MapObject * param2, void * param3); -void sub_0203E918(TaskManager * param0, u16 param1, MapObject * param2); -ScriptContext * sub_0203EAB8(FieldSystem * fieldSystem, u16 param1); -void * sub_0203EF60(UnkStruct_0203EF60 * param0, u32 param1); -void * sub_0203F098(FieldSystem * fieldSystem, u32 param1); -void sub_0203F0C0(FieldSystem * fieldSystem); -u16 * FieldSystem_GetVarPointer(FieldSystem * fieldSystem, u16 param1); -u16 sub_0203F150(FieldSystem * fieldSystem, u16 param1); -u16 sub_0203F164(FieldSystem * fieldSystem, u16 param1); -BOOL sub_0203F188(FieldSystem * fieldSystem, u16 param1); -void sub_0203F19C(FieldSystem * fieldSystem, u16 param1); -void sub_0203F1B0(FieldSystem * fieldSystem, u16 param1); -void FieldSystem_ClearLocalFlags(FieldSystem * fieldSystem); -void sub_0203F1FC(FieldSystem * fieldSystem); -void sub_0203F21C(FieldSystem * fieldSystem, u16 param1, u16 param2, u16 param3, u16 param4); +void sub_0203E880(FieldSystem *fieldSystem, u16 param1, MapObject *param2); +void sub_0203E8B0(FieldSystem *fieldSystem, MapObject *param1, int param2, int param3, int param4, int param5, int param6, int param7); +void sub_0203E8E0(TaskManager *param0, u16 param1, MapObject *param2, void *param3); +void sub_0203E918(TaskManager *param0, u16 param1, MapObject *param2); +ScriptContext *sub_0203EAB8(FieldSystem *fieldSystem, u16 param1); +void *sub_0203EF60(UnkStruct_0203EF60 *param0, u32 param1); +void *sub_0203F098(FieldSystem *fieldSystem, u32 param1); +void sub_0203F0C0(FieldSystem *fieldSystem); +u16 *FieldSystem_GetVarPointer(FieldSystem *fieldSystem, u16 param1); +u16 sub_0203F150(FieldSystem *fieldSystem, u16 param1); +u16 sub_0203F164(FieldSystem *fieldSystem, u16 param1); +BOOL sub_0203F188(FieldSystem *fieldSystem, u16 param1); +void sub_0203F19C(FieldSystem *fieldSystem, u16 param1); +void sub_0203F1B0(FieldSystem *fieldSystem, u16 param1); +void FieldSystem_ClearLocalFlags(FieldSystem *fieldSystem); +void sub_0203F1FC(FieldSystem *fieldSystem); +void sub_0203F21C(FieldSystem *fieldSystem, u16 param1, u16 param2, u16 param3, u16 param4); u16 Script_GetTrainerID(u16 param0); BOOL sub_0203F278(u16 param0); BOOL Script_IsTrainerDoubleBattle(u16 param0); -BOOL Script_IsTrainerDefeated(FieldSystem * fieldSystem, u16 param1); -void sub_0203F2BC(FieldSystem * fieldSystem, u16 param1); -void sub_0203F2D8(FieldSystem * fieldSystem, u16 param1); +BOOL Script_IsTrainerDefeated(FieldSystem *fieldSystem, u16 param1); +void sub_0203F2BC(FieldSystem *fieldSystem, u16 param1); +void sub_0203F2D8(FieldSystem *fieldSystem, u16 param1); u16 sub_0203F2F4(u16 param0); u16 sub_0203F304(u16 param0); -void sub_0203F310(FieldSystem * fieldSystem); +void sub_0203F310(FieldSystem *fieldSystem); u8 sub_0203F3C8(u16 param0); -UnkStruct_0203F478 * sub_0203F478(FieldSystem * fieldSystem, int param1); -void FieldSystem_InitNewGameState(FieldSystem * fieldSystem); -void sub_0203F5A4(FieldSystem * fieldSystem, u16 param1); -BOOL sub_0203F5C0(FieldSystem * fieldSystem, u8 param1); +UnkStruct_0203F478 *sub_0203F478(FieldSystem *fieldSystem, int param1); +void FieldSystem_InitNewGameState(FieldSystem *fieldSystem); +void sub_0203F5A4(FieldSystem *fieldSystem, u16 param1); +BOOL sub_0203F5C0(FieldSystem *fieldSystem, u8 param1); #endif // POKEPLATINUM_UNK_0203E880_H diff --git a/include/unk_02046AD4.h b/include/unk_02046AD4.h index 5f4a8c6751..50a1df43b4 100644 --- a/include/unk_02046AD4.h +++ b/include/unk_02046AD4.h @@ -3,10 +3,10 @@ #include "field_script_context.h" -BOOL ScrCmd_147(ScriptContext * param0); -BOOL ScrCmd_148(ScriptContext * param0); -BOOL ScrCmd_149(ScriptContext * param0); -BOOL ScrCmd_14A(ScriptContext * param0); -BOOL ScrCmd_257(ScriptContext * param0); +BOOL ScrCmd_147(ScriptContext *param0); +BOOL ScrCmd_148(ScriptContext *param0); +BOOL ScrCmd_149(ScriptContext *param0); +BOOL ScrCmd_14A(ScriptContext *param0); +BOOL ScrCmd_257(ScriptContext *param0); #endif // POKEPLATINUM_UNK_02046AD4_H diff --git a/include/unk_02046C7C.h b/include/unk_02046C7C.h index e34c02761e..3a2d2bef16 100644 --- a/include/unk_02046C7C.h +++ b/include/unk_02046C7C.h @@ -3,38 +3,38 @@ #include "field_script_context.h" -BOOL ScrCmd_0F8(ScriptContext * param0); -BOOL ScrCmd_0F9(ScriptContext * param0); -BOOL ScrCmd_0FA(ScriptContext * param0); -BOOL ScrCmd_0FB(ScriptContext * param0); -BOOL ScrCmd_0FC(ScriptContext * param0); -BOOL ScrCmd_0FD(ScriptContext * param0); -BOOL ScrCmd_0FE(ScriptContext * param0); -BOOL ScrCmd_0FF(ScriptContext * param0); -BOOL ScrCmd_100(ScriptContext * param0); -BOOL ScrCmd_101(ScriptContext * param0); -BOOL ScrCmd_102(ScriptContext * param0); -BOOL ScrCmd_103(ScriptContext * param0); -BOOL ScrCmd_104(ScriptContext * param0); -BOOL ScrCmd_105(ScriptContext * param0); -BOOL ScrCmd_106(ScriptContext * param0); -BOOL ScrCmd_107(ScriptContext * param0); -BOOL ScrCmd_108(ScriptContext * param0); -BOOL ScrCmd_109(ScriptContext * param0); -BOOL ScrCmd_10A(ScriptContext * param0); -BOOL ScrCmd_10B(ScriptContext * param0); -BOOL ScrCmd_10C(ScriptContext * param0); -BOOL ScrCmd_110(ScriptContext * param0); -BOOL ScrCmd_10D(ScriptContext * param0); -BOOL ScrCmd_10E(ScriptContext * param0); -BOOL ScrCmd_10F(ScriptContext * param0); -BOOL ScrCmd_117(ScriptContext * param0); -BOOL ScrCmd_118(ScriptContext * param0); -BOOL ScrCmd_111(ScriptContext * param0); -BOOL ScrCmd_112(ScriptContext * param0); -BOOL ScrCmd_113(ScriptContext * param0); -BOOL ScrCmd_114(ScriptContext * param0); -BOOL ScrCmd_115(ScriptContext * param0); -BOOL ScrCmd_116(ScriptContext * param0); +BOOL ScrCmd_0F8(ScriptContext *param0); +BOOL ScrCmd_0F9(ScriptContext *param0); +BOOL ScrCmd_0FA(ScriptContext *param0); +BOOL ScrCmd_0FB(ScriptContext *param0); +BOOL ScrCmd_0FC(ScriptContext *param0); +BOOL ScrCmd_0FD(ScriptContext *param0); +BOOL ScrCmd_0FE(ScriptContext *param0); +BOOL ScrCmd_0FF(ScriptContext *param0); +BOOL ScrCmd_100(ScriptContext *param0); +BOOL ScrCmd_101(ScriptContext *param0); +BOOL ScrCmd_102(ScriptContext *param0); +BOOL ScrCmd_103(ScriptContext *param0); +BOOL ScrCmd_104(ScriptContext *param0); +BOOL ScrCmd_105(ScriptContext *param0); +BOOL ScrCmd_106(ScriptContext *param0); +BOOL ScrCmd_107(ScriptContext *param0); +BOOL ScrCmd_108(ScriptContext *param0); +BOOL ScrCmd_109(ScriptContext *param0); +BOOL ScrCmd_10A(ScriptContext *param0); +BOOL ScrCmd_10B(ScriptContext *param0); +BOOL ScrCmd_10C(ScriptContext *param0); +BOOL ScrCmd_110(ScriptContext *param0); +BOOL ScrCmd_10D(ScriptContext *param0); +BOOL ScrCmd_10E(ScriptContext *param0); +BOOL ScrCmd_10F(ScriptContext *param0); +BOOL ScrCmd_117(ScriptContext *param0); +BOOL ScrCmd_118(ScriptContext *param0); +BOOL ScrCmd_111(ScriptContext *param0); +BOOL ScrCmd_112(ScriptContext *param0); +BOOL ScrCmd_113(ScriptContext *param0); +BOOL ScrCmd_114(ScriptContext *param0); +BOOL ScrCmd_115(ScriptContext *param0); +BOOL ScrCmd_116(ScriptContext *param0); #endif // POKEPLATINUM_UNK_02046C7C_H diff --git a/include/unk_020474B8.h b/include/unk_020474B8.h index 8e1d7616ad..0a6f53ea11 100644 --- a/include/unk_020474B8.h +++ b/include/unk_020474B8.h @@ -3,51 +3,51 @@ #include "field_script_context.h" -BOOL ScrCmd_2EF(ScriptContext * param0); -BOOL ScrCmd_0CD(ScriptContext * param0); -BOOL ScrCmd_0CE(ScriptContext * param0); -BOOL ScrCmd_0CF(ScriptContext * param0); -BOOL ScrCmd_0D0(ScriptContext * param0); -BOOL ScrCmd_2FD(ScriptContext * param0); -BOOL ScrCmd_0D1(ScriptContext * param0); -BOOL ScrCmd_0D2(ScriptContext * param0); -BOOL ScrCmd_0D3(ScriptContext * param0); -BOOL ScrCmd_0D4(ScriptContext * param0); -BOOL ScrCmd_0D5(ScriptContext * param0); -BOOL ScrCmd_280(ScriptContext * param0); -BOOL ScrCmd_2F5(ScriptContext * param0); -BOOL ScrCmd_0D6(ScriptContext * param0); -BOOL ScrCmd_251(ScriptContext * param0); -BOOL ScrCmd_0D7(ScriptContext * param0); -BOOL ScrCmd_0D8(ScriptContext * param0); -BOOL ScrCmd_0D9(ScriptContext * param0); -BOOL ScrCmd_0DA(ScriptContext * param0); -BOOL ScrCmd_0DB(ScriptContext * param0); -BOOL ScrCmd_0DC(ScriptContext * param0); -BOOL ScrCmd_0DD(ScriptContext * param0); -BOOL ScrCmd_0DF(ScriptContext * param0); -BOOL ScrCmd_0E0(ScriptContext * param0); -BOOL ScrCmd_0E1(ScriptContext * param0); -BOOL ScrCmd_0E2(ScriptContext * param0); -BOOL ScrCmd_17B(ScriptContext * param0); -BOOL ScrCmd_17C(ScriptContext * param0); -BOOL ScrCmd_261(ScriptContext * param0); -BOOL ScrCmd_272(ScriptContext * param0); -BOOL ScrCmd_1CB(ScriptContext * param0); -BOOL ScrCmd_232(ScriptContext * param0); -BOOL ScrCmd_2B3(ScriptContext * param0); -BOOL ScrCmd_2F3(ScriptContext * param0); -BOOL ScrCmd_33C(ScriptContext * param0); -BOOL ScrCmd_33D(ScriptContext * param0); -BOOL ScrCmd_33E(ScriptContext * param0); -BOOL ScrCmd_33F(ScriptContext * param0); -BOOL ScrCmd_340(ScriptContext * param0); -BOOL ScrCmd_341(ScriptContext * param0); -BOOL ScrCmd_342(ScriptContext * param0); -BOOL ScrCmd_343(ScriptContext * param0); -BOOL ScrCmd_344(ScriptContext * param0); -BOOL ScrCmd_345(ScriptContext * param0); -BOOL ScrCmd_346(ScriptContext * param0); -BOOL ScrCmd_347(ScriptContext * param0); +BOOL ScrCmd_2EF(ScriptContext *param0); +BOOL ScrCmd_0CD(ScriptContext *param0); +BOOL ScrCmd_0CE(ScriptContext *param0); +BOOL ScrCmd_0CF(ScriptContext *param0); +BOOL ScrCmd_0D0(ScriptContext *param0); +BOOL ScrCmd_2FD(ScriptContext *param0); +BOOL ScrCmd_0D1(ScriptContext *param0); +BOOL ScrCmd_0D2(ScriptContext *param0); +BOOL ScrCmd_0D3(ScriptContext *param0); +BOOL ScrCmd_0D4(ScriptContext *param0); +BOOL ScrCmd_0D5(ScriptContext *param0); +BOOL ScrCmd_280(ScriptContext *param0); +BOOL ScrCmd_2F5(ScriptContext *param0); +BOOL ScrCmd_0D6(ScriptContext *param0); +BOOL ScrCmd_251(ScriptContext *param0); +BOOL ScrCmd_0D7(ScriptContext *param0); +BOOL ScrCmd_0D8(ScriptContext *param0); +BOOL ScrCmd_0D9(ScriptContext *param0); +BOOL ScrCmd_0DA(ScriptContext *param0); +BOOL ScrCmd_0DB(ScriptContext *param0); +BOOL ScrCmd_0DC(ScriptContext *param0); +BOOL ScrCmd_0DD(ScriptContext *param0); +BOOL ScrCmd_0DF(ScriptContext *param0); +BOOL ScrCmd_0E0(ScriptContext *param0); +BOOL ScrCmd_0E1(ScriptContext *param0); +BOOL ScrCmd_0E2(ScriptContext *param0); +BOOL ScrCmd_17B(ScriptContext *param0); +BOOL ScrCmd_17C(ScriptContext *param0); +BOOL ScrCmd_261(ScriptContext *param0); +BOOL ScrCmd_272(ScriptContext *param0); +BOOL ScrCmd_1CB(ScriptContext *param0); +BOOL ScrCmd_232(ScriptContext *param0); +BOOL ScrCmd_2B3(ScriptContext *param0); +BOOL ScrCmd_2F3(ScriptContext *param0); +BOOL ScrCmd_33C(ScriptContext *param0); +BOOL ScrCmd_33D(ScriptContext *param0); +BOOL ScrCmd_33E(ScriptContext *param0); +BOOL ScrCmd_33F(ScriptContext *param0); +BOOL ScrCmd_340(ScriptContext *param0); +BOOL ScrCmd_341(ScriptContext *param0); +BOOL ScrCmd_342(ScriptContext *param0); +BOOL ScrCmd_343(ScriptContext *param0); +BOOL ScrCmd_344(ScriptContext *param0); +BOOL ScrCmd_345(ScriptContext *param0); +BOOL ScrCmd_346(ScriptContext *param0); +BOOL ScrCmd_347(ScriptContext *param0); #endif // POKEPLATINUM_UNK_020474B8_H diff --git a/include/unk_020480A8.h b/include/unk_020480A8.h index 3a113f480e..c128a931a4 100644 --- a/include/unk_020480A8.h +++ b/include/unk_020480A8.h @@ -3,8 +3,8 @@ #include "field_script_context.h" -BOOL ScrCmd_24E(ScriptContext * param0); -BOOL ScrCmd_24F(ScriptContext * param0); -BOOL ScrCmd_250(ScriptContext * param0); +BOOL ScrCmd_24E(ScriptContext *param0); +BOOL ScrCmd_24F(ScriptContext *param0); +BOOL ScrCmd_250(ScriptContext *param0); #endif // POKEPLATINUM_UNK_020480A8_H diff --git a/include/unk_020482D4.h b/include/unk_020482D4.h index e545c161fd..c3c0b8017c 100644 --- a/include/unk_020482D4.h +++ b/include/unk_020482D4.h @@ -3,31 +3,31 @@ #include "field_script_context.h" -BOOL ScrCmd_2AE(ScriptContext * param0); -BOOL ScrCmd_050(ScriptContext * param0); -BOOL ScrCmd_051(ScriptContext * param0); -BOOL ScrCmd_052(ScriptContext * param0); -BOOL ScrCmd_053(ScriptContext * param0); -BOOL ScrCmd_054(ScriptContext * param0); -BOOL ScrCmd_055(ScriptContext * param0); -BOOL ScrCmd_056(ScriptContext * param0); -BOOL ScrCmd_057(ScriptContext * param0); -BOOL ScrCmd_058(ScriptContext * param0); -BOOL ScrCmd_PlayFanfare(ScriptContext * ctx); -BOOL ScrCmd_04A(ScriptContext * param0); -BOOL ScrCmd_04B(ScriptContext * param0); -BOOL ScrCmd_04C(ScriptContext * param0); -BOOL ScrCmd_04D(ScriptContext * param0); -BOOL ScrCmd_04E(ScriptContext * param0); -BOOL ScrCmd_04F(ScriptContext * param0); -BOOL ScrCmd_059(ScriptContext * param0); -BOOL ScrCmd_05A(ScriptContext * param0); -BOOL ScrCmd_05B(ScriptContext * param0); -BOOL ScrCmd_05C(ScriptContext * param0); -BOOL ScrCmd_05D(ScriptContext * param0); -BOOL ScrCmd_283(ScriptContext * param0); -BOOL ScrCmd_2F8(ScriptContext * param0); -BOOL ScrCmd_2F9(ScriptContext * param0); -BOOL ScrCmd_2FA(ScriptContext * param0); +BOOL ScrCmd_2AE(ScriptContext *param0); +BOOL ScrCmd_050(ScriptContext *param0); +BOOL ScrCmd_051(ScriptContext *param0); +BOOL ScrCmd_052(ScriptContext *param0); +BOOL ScrCmd_053(ScriptContext *param0); +BOOL ScrCmd_054(ScriptContext *param0); +BOOL ScrCmd_055(ScriptContext *param0); +BOOL ScrCmd_056(ScriptContext *param0); +BOOL ScrCmd_057(ScriptContext *param0); +BOOL ScrCmd_058(ScriptContext *param0); +BOOL ScrCmd_PlayFanfare(ScriptContext *ctx); +BOOL ScrCmd_04A(ScriptContext *param0); +BOOL ScrCmd_04B(ScriptContext *param0); +BOOL ScrCmd_04C(ScriptContext *param0); +BOOL ScrCmd_04D(ScriptContext *param0); +BOOL ScrCmd_04E(ScriptContext *param0); +BOOL ScrCmd_04F(ScriptContext *param0); +BOOL ScrCmd_059(ScriptContext *param0); +BOOL ScrCmd_05A(ScriptContext *param0); +BOOL ScrCmd_05B(ScriptContext *param0); +BOOL ScrCmd_05C(ScriptContext *param0); +BOOL ScrCmd_05D(ScriptContext *param0); +BOOL ScrCmd_283(ScriptContext *param0); +BOOL ScrCmd_2F8(ScriptContext *param0); +BOOL ScrCmd_2F9(ScriptContext *param0); +BOOL ScrCmd_2FA(ScriptContext *param0); #endif // POKEPLATINUM_UNK_020482D4_H diff --git a/include/unk_02048614.h b/include/unk_02048614.h index 393fd4c5bb..8488f9a7d7 100644 --- a/include/unk_02048614.h +++ b/include/unk_02048614.h @@ -3,25 +3,25 @@ #include "field_script_context.h" -BOOL ScrCmd_0B6(ScriptContext * param0); -BOOL ScrCmd_0B7(ScriptContext * param0); -BOOL ScrCmd_0B8(ScriptContext * param0); -BOOL ScrCmd_0B9(ScriptContext * param0); -BOOL ScrCmd_0E4(ScriptContext * param0); -BOOL ScrCmd_0E5(ScriptContext * param0); -BOOL ScrCmd_2A0(ScriptContext * param0); -BOOL ScrCmd_0E7(ScriptContext * param0); -BOOL ScrCmd_0E8(ScriptContext * param0); -BOOL ScrCmd_0E9(ScriptContext * param0); -BOOL ScrCmd_0EA(ScriptContext * param0); -BOOL ScrCmd_0EB(ScriptContext * param0); -BOOL ScrCmd_0EC(ScriptContext * param0); -BOOL ScrCmd_0ED(ScriptContext * param0); -BOOL ScrCmd_2BC(ScriptContext * param0); -BOOL ScrCmd_0EE(ScriptContext * param0); -BOOL ScrCmd_0EF(ScriptContext * param0); -BOOL ScrCmd_0F0(ScriptContext * param0); -BOOL ScrCmd_0F1(ScriptContext * param0); -BOOL ScrCmd_314(ScriptContext * param0); +BOOL ScrCmd_0B6(ScriptContext *param0); +BOOL ScrCmd_0B7(ScriptContext *param0); +BOOL ScrCmd_0B8(ScriptContext *param0); +BOOL ScrCmd_0B9(ScriptContext *param0); +BOOL ScrCmd_0E4(ScriptContext *param0); +BOOL ScrCmd_0E5(ScriptContext *param0); +BOOL ScrCmd_2A0(ScriptContext *param0); +BOOL ScrCmd_0E7(ScriptContext *param0); +BOOL ScrCmd_0E8(ScriptContext *param0); +BOOL ScrCmd_0E9(ScriptContext *param0); +BOOL ScrCmd_0EA(ScriptContext *param0); +BOOL ScrCmd_0EB(ScriptContext *param0); +BOOL ScrCmd_0EC(ScriptContext *param0); +BOOL ScrCmd_0ED(ScriptContext *param0); +BOOL ScrCmd_2BC(ScriptContext *param0); +BOOL ScrCmd_0EE(ScriptContext *param0); +BOOL ScrCmd_0EF(ScriptContext *param0); +BOOL ScrCmd_0F0(ScriptContext *param0); +BOOL ScrCmd_0F1(ScriptContext *param0); +BOOL ScrCmd_314(ScriptContext *param0); #endif // POKEPLATINUM_UNK_02048614_H diff --git a/include/unk_02048BD0.h b/include/unk_02048BD0.h index db072ef908..d4ba278890 100644 --- a/include/unk_02048BD0.h +++ b/include/unk_02048BD0.h @@ -3,6 +3,6 @@ #include "field_script_context.h" -BOOL ScrCmd_21D(ScriptContext * param0); +BOOL ScrCmd_21D(ScriptContext *param0); #endif // POKEPLATINUM_UNK_02048BD0_H diff --git a/include/unk_02048DD8.h b/include/unk_02048DD8.h index 4956e1b292..6a4b748bdb 100644 --- a/include/unk_02048DD8.h +++ b/include/unk_02048DD8.h @@ -3,16 +3,16 @@ #include "field_script_context.h" -BOOL ScrCmd_235(ScriptContext * param0); -BOOL ScrCmd_236(ScriptContext * param0); -BOOL ScrCmd_2B8(ScriptContext * param0); -BOOL ScrCmd_30B(ScriptContext * param0); -BOOL ScrCmd_30C(ScriptContext * param0); -BOOL ScrCmd_30D(ScriptContext * param0); -BOOL ScrCmd_237(ScriptContext * param0); -BOOL ScrCmd_238(ScriptContext * param0); -BOOL ScrCmd_27C(ScriptContext * param0); -BOOL ScrCmd_31B(ScriptContext * param0); -BOOL ScrCmd_329(ScriptContext * param0); +BOOL ScrCmd_235(ScriptContext *param0); +BOOL ScrCmd_236(ScriptContext *param0); +BOOL ScrCmd_2B8(ScriptContext *param0); +BOOL ScrCmd_30B(ScriptContext *param0); +BOOL ScrCmd_30C(ScriptContext *param0); +BOOL ScrCmd_30D(ScriptContext *param0); +BOOL ScrCmd_237(ScriptContext *param0); +BOOL ScrCmd_238(ScriptContext *param0); +BOOL ScrCmd_27C(ScriptContext *param0); +BOOL ScrCmd_31B(ScriptContext *param0); +BOOL ScrCmd_329(ScriptContext *param0); #endif // POKEPLATINUM_UNK_02048DD8_H diff --git a/include/unk_020494DC.h b/include/unk_020494DC.h index 6612a9df4d..6904d9750c 100644 --- a/include/unk_020494DC.h +++ b/include/unk_020494DC.h @@ -3,24 +3,24 @@ #include "field_script_context.h" -BOOL ScrCmd_1DB(ScriptContext * param0); -BOOL ScrCmd_1DA(ScriptContext * param0); -BOOL ScrCmd_1DC(ScriptContext * param0); -BOOL ScrCmd_1DD(ScriptContext * param0); -BOOL ScrCmd_1DE(ScriptContext * param0); -BOOL ScrCmd_1DF(ScriptContext * param0); -BOOL ScrCmd_1E0(ScriptContext * param0); -BOOL ScrCmd_1E1(ScriptContext * param0); -BOOL ScrCmd_1E2(ScriptContext * param0); -BOOL ScrCmd_1E3(ScriptContext * param0); -BOOL ScrCmd_1E4(ScriptContext * param0); -BOOL ScrCmd_294(ScriptContext * param0); -BOOL ScrCmd_295(ScriptContext * param0); -BOOL ScrCmd_296(ScriptContext * param0); -BOOL ScrCmd_297(ScriptContext * param0); -BOOL ScrCmd_298(ScriptContext * param0); -BOOL ScrCmd_299(ScriptContext * param0); -BOOL ScrCmd_29A(ScriptContext * param0); -BOOL ScrCmd_29B(ScriptContext * param0); +BOOL ScrCmd_1DB(ScriptContext *param0); +BOOL ScrCmd_1DA(ScriptContext *param0); +BOOL ScrCmd_1DC(ScriptContext *param0); +BOOL ScrCmd_1DD(ScriptContext *param0); +BOOL ScrCmd_1DE(ScriptContext *param0); +BOOL ScrCmd_1DF(ScriptContext *param0); +BOOL ScrCmd_1E0(ScriptContext *param0); +BOOL ScrCmd_1E1(ScriptContext *param0); +BOOL ScrCmd_1E2(ScriptContext *param0); +BOOL ScrCmd_1E3(ScriptContext *param0); +BOOL ScrCmd_1E4(ScriptContext *param0); +BOOL ScrCmd_294(ScriptContext *param0); +BOOL ScrCmd_295(ScriptContext *param0); +BOOL ScrCmd_296(ScriptContext *param0); +BOOL ScrCmd_297(ScriptContext *param0); +BOOL ScrCmd_298(ScriptContext *param0); +BOOL ScrCmd_299(ScriptContext *param0); +BOOL ScrCmd_29A(ScriptContext *param0); +BOOL ScrCmd_29B(ScriptContext *param0); #endif // POKEPLATINUM_UNK_020494DC_H diff --git a/include/unk_02049D08.h b/include/unk_02049D08.h index 20f8c55bc0..46ca6f5996 100644 --- a/include/unk_02049D08.h +++ b/include/unk_02049D08.h @@ -1,48 +1,50 @@ #ifndef POKEPLATINUM_UNK_02049D08_H #define POKEPLATINUM_UNK_02049D08_H -#include "journal.h" #include "struct_decls/struct_0202D060_decl.h" -#include "field/field_system_decl.h" -#include "struct_defs/struct_0204AFC4.h" #include "struct_decls/struct_020508D4_decl.h" +#include "struct_defs/struct_0204AFC4.h" + +#include "field/field_system_decl.h" + +#include "journal.h" #include "savedata.h" u16 sub_02049D08(u16 param0); -BOOL sub_02049EC4(u16 param0, SaveData * param1, u8 param2); +BOOL sub_02049EC4(u16 param0, SaveData *param1, u8 param2); void sub_02049F8C(void); -void sub_02049F98(UnkStruct_0202D060 * param0); -BOOL sub_02049FA0(UnkStruct_0202D060 * param0); -void sub_02049FA8(FieldSystem * fieldSystem); -void sub_02049FE8(FieldSystem * fieldSystem); -u16 sub_02049FF8(SaveData * param0, u16 param1); -void sub_0204A030(SaveData * param0, u8 param1); -u16 sub_0204A050(SaveData * param0); -u16 sub_0204A064(SaveData * param0); -u16 sub_0204A100(SaveData * param0); -void sub_0204A110(UnkStruct_0204AFC4 ** param0); -UnkStruct_0204AFC4 * sub_0204A124(SaveData * param0, u16 param1, u16 param2); -void sub_0204A32C(UnkStruct_0204AFC4 * param0); -void sub_0204A358(UnkStruct_0204AFC4 * param0, TaskManager * param1, void ** param2); -BOOL sub_0204A378(UnkStruct_0204AFC4 * param0, void ** param1, SaveData * param2); -int sub_0204A410(UnkStruct_0204AFC4 * param0, SaveData * param1); -void sub_0204A4C8(UnkStruct_0204AFC4 * param0, SaveData * param1); -u16 sub_0204A578(UnkStruct_0204AFC4 * param0); -BOOL sub_0204A57C(UnkStruct_0204AFC4 * param0); -void sub_0204A660(UnkStruct_0204AFC4 * param0, SaveData * param1); -void sub_0204A7A4(UnkStruct_0204AFC4 * param0, SaveData * param1, Journal * param2); -void sub_0204A8C8(UnkStruct_0204AFC4 * param0); -void sub_0204A97C(UnkStruct_0204AFC4 * param0); -u16 sub_0204A9E0(UnkStruct_0204AFC4 * param0, u16 param1); -u16 sub_0204A9F8(UnkStruct_0204AFC4 * param0); -u16 sub_0204A9FC(UnkStruct_0204AFC4 * param0); -u16 sub_0204AA04(UnkStruct_0204AFC4 * param0); -u16 sub_0204AA7C(UnkStruct_0204AFC4 * param0, SaveData * param1); -u16 sub_0204AABC(UnkStruct_0204AFC4 * param0, SaveData * param1, u8 param2); -u16 sub_0204AB68(UnkStruct_0204AFC4 * param0, SaveData * param1); -u16 sub_0204ABA0(UnkStruct_0204AFC4 * param0, SaveData * param1); -u16 sub_0204ABF4(UnkStruct_0204AFC4 * param0, SaveData * param1); +void sub_02049F98(UnkStruct_0202D060 *param0); +BOOL sub_02049FA0(UnkStruct_0202D060 *param0); +void sub_02049FA8(FieldSystem *fieldSystem); +void sub_02049FE8(FieldSystem *fieldSystem); +u16 sub_02049FF8(SaveData *param0, u16 param1); +void sub_0204A030(SaveData *param0, u8 param1); +u16 sub_0204A050(SaveData *param0); +u16 sub_0204A064(SaveData *param0); +u16 sub_0204A100(SaveData *param0); +void sub_0204A110(UnkStruct_0204AFC4 **param0); +UnkStruct_0204AFC4 *sub_0204A124(SaveData *param0, u16 param1, u16 param2); +void sub_0204A32C(UnkStruct_0204AFC4 *param0); +void sub_0204A358(UnkStruct_0204AFC4 *param0, TaskManager *param1, void **param2); +BOOL sub_0204A378(UnkStruct_0204AFC4 *param0, void **param1, SaveData *param2); +int sub_0204A410(UnkStruct_0204AFC4 *param0, SaveData *param1); +void sub_0204A4C8(UnkStruct_0204AFC4 *param0, SaveData *param1); +u16 sub_0204A578(UnkStruct_0204AFC4 *param0); +BOOL sub_0204A57C(UnkStruct_0204AFC4 *param0); +void sub_0204A660(UnkStruct_0204AFC4 *param0, SaveData *param1); +void sub_0204A7A4(UnkStruct_0204AFC4 *param0, SaveData *param1, Journal *param2); +void sub_0204A8C8(UnkStruct_0204AFC4 *param0); +void sub_0204A97C(UnkStruct_0204AFC4 *param0); +u16 sub_0204A9E0(UnkStruct_0204AFC4 *param0, u16 param1); +u16 sub_0204A9F8(UnkStruct_0204AFC4 *param0); +u16 sub_0204A9FC(UnkStruct_0204AFC4 *param0); +u16 sub_0204AA04(UnkStruct_0204AFC4 *param0); +u16 sub_0204AA7C(UnkStruct_0204AFC4 *param0, SaveData *param1); +u16 sub_0204AABC(UnkStruct_0204AFC4 *param0, SaveData *param1, u8 param2); +u16 sub_0204AB68(UnkStruct_0204AFC4 *param0, SaveData *param1); +u16 sub_0204ABA0(UnkStruct_0204AFC4 *param0, SaveData *param1); +u16 sub_0204ABF4(UnkStruct_0204AFC4 *param0, SaveData *param1); u8 sub_0204AE84(u16 param0); -u16 sub_0204AEC0(UnkStruct_0204AFC4 * param0); +u16 sub_0204AEC0(UnkStruct_0204AFC4 *param0); #endif // POKEPLATINUM_UNK_02049D08_H diff --git a/include/unk_0204AEE8.h b/include/unk_0204AEE8.h index f53320234c..faa7b5b01c 100644 --- a/include/unk_0204AEE8.h +++ b/include/unk_0204AEE8.h @@ -1,23 +1,25 @@ #ifndef POKEPLATINUM_UNK_0204AEE8_H #define POKEPLATINUM_UNK_0204AEE8_H -#include "string_template.h" -#include "field/field_system_decl.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204B404.h" -#include "savedata.h" + +#include "field/field_system_decl.h" #include "overlay104/struct_ov104_0223A348.h" -StringTemplate * sub_0204AEE8(SaveData * param0, u16 param1, u16 param2, u8 param3, u8 * param4); +#include "savedata.h" +#include "string_template.h" + +StringTemplate *sub_0204AEE8(SaveData *param0, u16 param1, u16 param2, u8 param3, u8 *param4); u16 sub_0204AF9C(u8 param0); -u16 sub_0204AFC4(FieldSystem * fieldSystem, const u16 * param1); -u16 sub_0204B020(FieldSystem * fieldSystem, const u16 * param1); -u16 sub_0204B044(FieldSystem * fieldSystem, const u16 * param1); -void sub_0204B060(UnkStruct_0204AFC4 * param0, SaveData * param1); -void sub_0204B0BC(UnkStruct_0204AFC4 * param0); -void sub_0204B0D4(UnkStruct_0204AFC4 * param0, u16 param1); -u16 sub_0204B0F0(UnkStruct_0204AFC4 * param0, u8 param1, u8 param2, int param3); -BOOL sub_0204B3B8(UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 * param1, u16 param2, int param3, u16 * param4, u16 * param5, UnkStruct_0204B404 * param6, int param7); -void sub_0204B404(UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 * param1, u16 param2, BOOL param3, const UnkStruct_0204B404 * param4, int param5); +u16 sub_0204AFC4(FieldSystem *fieldSystem, const u16 *param1); +u16 sub_0204B020(FieldSystem *fieldSystem, const u16 *param1); +u16 sub_0204B044(FieldSystem *fieldSystem, const u16 *param1); +void sub_0204B060(UnkStruct_0204AFC4 *param0, SaveData *param1); +void sub_0204B0BC(UnkStruct_0204AFC4 *param0); +void sub_0204B0D4(UnkStruct_0204AFC4 *param0, u16 param1); +u16 sub_0204B0F0(UnkStruct_0204AFC4 *param0, u8 param1, u8 param2, int param3); +BOOL sub_0204B3B8(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348 *param1, u16 param2, int param3, u16 *param4, u16 *param5, UnkStruct_0204B404 *param6, int param7); +void sub_0204B404(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348 *param1, u16 param2, BOOL param3, const UnkStruct_0204B404 *param4, int param5); #endif // POKEPLATINUM_UNK_0204AEE8_H diff --git a/include/unk_0204B64C.h b/include/unk_0204B64C.h index dd1faa1f59..7491f2baf4 100644 --- a/include/unk_0204B64C.h +++ b/include/unk_0204B64C.h @@ -3,14 +3,14 @@ #include "field_script_context.h" -BOOL ScrCmd_17D(ScriptContext * param0); -BOOL ScrCmd_17E(ScriptContext * param0); -BOOL ScrCmd_17F(ScriptContext * param0); -BOOL ScrCmd_180(ScriptContext * param0); -BOOL ScrCmd_181(ScriptContext * param0); -BOOL ScrCmd_182(ScriptContext * param0); -BOOL ScrCmd_183(ScriptContext * param0); -BOOL ScrCmd_184(ScriptContext * param0); -BOOL ScrCmd_185(ScriptContext * param0); +BOOL ScrCmd_17D(ScriptContext *param0); +BOOL ScrCmd_17E(ScriptContext *param0); +BOOL ScrCmd_17F(ScriptContext *param0); +BOOL ScrCmd_180(ScriptContext *param0); +BOOL ScrCmd_181(ScriptContext *param0); +BOOL ScrCmd_182(ScriptContext *param0); +BOOL ScrCmd_183(ScriptContext *param0); +BOOL ScrCmd_184(ScriptContext *param0); +BOOL ScrCmd_185(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204B64C_H diff --git a/include/unk_0204B830.h b/include/unk_0204B830.h index 930243835a..86e6d7e6be 100644 --- a/include/unk_0204B830.h +++ b/include/unk_0204B830.h @@ -3,6 +3,6 @@ #include "field_script_context.h" -BOOL ScrCmd_23E(ScriptContext * param0); +BOOL ScrCmd_23E(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204B830_H diff --git a/include/unk_0204C500.h b/include/unk_0204C500.h index ba4de68b01..6f8db0d795 100644 --- a/include/unk_0204C500.h +++ b/include/unk_0204C500.h @@ -3,9 +3,9 @@ #include "field_script_context.h" -BOOL ScrCmd_253(ScriptContext * param0); -BOOL ScrCmd_254(ScriptContext * param0); -BOOL ScrCmd_255(ScriptContext * param0); -BOOL ScrCmd_256(ScriptContext * param0); +BOOL ScrCmd_253(ScriptContext *param0); +BOOL ScrCmd_254(ScriptContext *param0); +BOOL ScrCmd_255(ScriptContext *param0); +BOOL ScrCmd_256(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204C500_H diff --git a/include/unk_0204C6C8.h b/include/unk_0204C6C8.h index d92a12fd4c..97412ad253 100644 --- a/include/unk_0204C6C8.h +++ b/include/unk_0204C6C8.h @@ -3,15 +3,15 @@ #include "field_script_context.h" -BOOL ScrCmd_075(ScriptContext * param0); -BOOL ScrCmd_076(ScriptContext * param0); -BOOL ScrCmd_077(ScriptContext * param0); -BOOL ScrCmd_078(ScriptContext * param0); -BOOL ScrCmd_079(ScriptContext * param0); -BOOL ScrCmd_07A(ScriptContext * param0); -BOOL ScrCmd_2A8(ScriptContext * param0); -BOOL ScrCmd_274(ScriptContext * param0); -BOOL ScrCmd_2A9(ScriptContext * param0); -BOOL ScrCmd_276(ScriptContext * param0); +BOOL ScrCmd_075(ScriptContext *param0); +BOOL ScrCmd_076(ScriptContext *param0); +BOOL ScrCmd_077(ScriptContext *param0); +BOOL ScrCmd_078(ScriptContext *param0); +BOOL ScrCmd_079(ScriptContext *param0); +BOOL ScrCmd_07A(ScriptContext *param0); +BOOL ScrCmd_2A8(ScriptContext *param0); +BOOL ScrCmd_274(ScriptContext *param0); +BOOL ScrCmd_2A9(ScriptContext *param0); +BOOL ScrCmd_276(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204C6C8_H diff --git a/include/unk_0204C8F0.h b/include/unk_0204C8F0.h index c6f5722d7b..11fd5b439c 100644 --- a/include/unk_0204C8F0.h +++ b/include/unk_0204C8F0.h @@ -3,13 +3,13 @@ #include "field_script_context.h" -BOOL ScrCmd_06F(ScriptContext * param0); -BOOL ScrCmd_070(ScriptContext * param0); -BOOL ScrCmd_1A3(ScriptContext * param0); -BOOL ScrCmd_071(ScriptContext * param0); -BOOL ScrCmd_1AB(ScriptContext * param0); -BOOL ScrCmd_072(ScriptContext * param0); -BOOL ScrCmd_073(ScriptContext * param0); -BOOL ScrCmd_074(ScriptContext * param0); +BOOL ScrCmd_06F(ScriptContext *param0); +BOOL ScrCmd_070(ScriptContext *param0); +BOOL ScrCmd_1A3(ScriptContext *param0); +BOOL ScrCmd_071(ScriptContext *param0); +BOOL ScrCmd_1AB(ScriptContext *param0); +BOOL ScrCmd_072(ScriptContext *param0); +BOOL ScrCmd_073(ScriptContext *param0); +BOOL ScrCmd_074(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204C8F0_H diff --git a/include/unk_0204CA84.h b/include/unk_0204CA84.h index deb99a2c80..e66729ec63 100644 --- a/include/unk_0204CA84.h +++ b/include/unk_0204CA84.h @@ -3,21 +3,21 @@ #include "field_script_context.h" -BOOL ScrCmd_16D(ScriptContext * param0); -BOOL ScrCmd_16E(ScriptContext * param0); -BOOL ScrCmd_1A8(ScriptContext * param0); -BOOL ScrCmd_1A9(ScriptContext * param0); -BOOL ScrCmd_1A4(ScriptContext * param0); -BOOL ScrCmd_1AA(ScriptContext * param0); -BOOL ScrCmd_1AE(ScriptContext * param0); -BOOL ScrCmd_1AF(ScriptContext * param0); -BOOL ScrCmd_1B0(ScriptContext * param0); -BOOL ScrCmd_1BC(ScriptContext * param0); -BOOL ScrCmd_1BE(ScriptContext * param0); -BOOL ScrCmd_1BF(ScriptContext * param0); -BOOL ScrCmd_1A5(ScriptContext * param0); -BOOL ScrCmd_1A6(ScriptContext * param0); -BOOL ScrCmd_1A7(ScriptContext * param0); -BOOL ScrCmd_1AD(ScriptContext * param0); +BOOL ScrCmd_16D(ScriptContext *param0); +BOOL ScrCmd_16E(ScriptContext *param0); +BOOL ScrCmd_1A8(ScriptContext *param0); +BOOL ScrCmd_1A9(ScriptContext *param0); +BOOL ScrCmd_1A4(ScriptContext *param0); +BOOL ScrCmd_1AA(ScriptContext *param0); +BOOL ScrCmd_1AE(ScriptContext *param0); +BOOL ScrCmd_1AF(ScriptContext *param0); +BOOL ScrCmd_1B0(ScriptContext *param0); +BOOL ScrCmd_1BC(ScriptContext *param0); +BOOL ScrCmd_1BE(ScriptContext *param0); +BOOL ScrCmd_1BF(ScriptContext *param0); +BOOL ScrCmd_1A5(ScriptContext *param0); +BOOL ScrCmd_1A6(ScriptContext *param0); +BOOL ScrCmd_1A7(ScriptContext *param0); +BOOL ScrCmd_1AD(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204CA84_H diff --git a/include/unk_0204CDDC.h b/include/unk_0204CDDC.h index d93b82ca3a..7f1c700f85 100644 --- a/include/unk_0204CDDC.h +++ b/include/unk_0204CDDC.h @@ -3,11 +3,11 @@ #include "field_script_context.h" -BOOL ScrCmd_215(ScriptContext * param0); -BOOL ScrCmd_216(ScriptContext * param0); -BOOL ScrCmd_217(ScriptContext * param0); -BOOL ScrCmd_2DF(ScriptContext * param0); -BOOL ScrCmd_2E0(ScriptContext * param0); -BOOL ScrCmd_2E1(ScriptContext * param0); +BOOL ScrCmd_215(ScriptContext *param0); +BOOL ScrCmd_216(ScriptContext *param0); +BOOL ScrCmd_217(ScriptContext *param0); +BOOL ScrCmd_2DF(ScriptContext *param0); +BOOL ScrCmd_2E0(ScriptContext *param0); +BOOL ScrCmd_2E1(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204CDDC_H diff --git a/include/unk_0204CFFC.h b/include/unk_0204CFFC.h index 5df0089122..df9f0fad22 100644 --- a/include/unk_0204CFFC.h +++ b/include/unk_0204CFFC.h @@ -3,46 +3,46 @@ #include "field_script_context.h" -BOOL ScrCmd_096(ScriptContext * param0); -BOOL ScrCmd_198(ScriptContext * param0); -BOOL ScrCmd_199(ScriptContext * param0); -BOOL ScrCmd_097(ScriptContext * param0); -BOOL ScrCmd_098(ScriptContext * param0); -BOOL ScrCmd_099(ScriptContext * param0); -BOOL ScrCmd_09A(ScriptContext * param0); -BOOL ScrCmd_1F7(ScriptContext * param0); -BOOL ScrCmd_1F6(ScriptContext * param0); -BOOL ScrCmd_278(ScriptContext * param0); -BOOL ScrCmd_212(ScriptContext * param0); -BOOL ScrCmd_213(ScriptContext * param0); -BOOL ScrCmd_1B9(ScriptContext * param0); -BOOL ScrCmd_1BA(ScriptContext * param0); -BOOL ScrCmd_1BB(ScriptContext * param0); -BOOL ScrCmd_281(ScriptContext * param0); -BOOL ScrCmd_247(ScriptContext * param0); -BOOL ScrCmd_248(ScriptContext * param0); -BOOL ScrCmd_177(ScriptContext * param0); -BOOL ScrCmd_19A(ScriptContext * param0); -BOOL ScrCmd_19B(ScriptContext * param0); -BOOL ScrCmd_19C(ScriptContext * param0); -BOOL ScrCmd_19D(ScriptContext * param0); -BOOL ScrCmd_119(ScriptContext * param0); -BOOL ScrCmd_11A(ScriptContext * param0); -BOOL ScrCmd_1C8(ScriptContext * param0); -BOOL ScrCmd_1C9(ScriptContext * param0); -BOOL ScrCmd_1CA(ScriptContext * param0); -BOOL ScrCmd_1EE(ScriptContext * param0); -BOOL ScrCmd_1F0(ScriptContext * param0); -BOOL ScrCmd_1C0(ScriptContext * param0); -BOOL ScrCmd_2CB(ScriptContext * param0); -BOOL ScrCmd_2DD(ScriptContext * param0); -BOOL ScrCmd_22E(ScriptContext * param0); -BOOL ScrCmd_22F(ScriptContext * param0); -BOOL ScrCmd_230(ScriptContext * param0); -BOOL ScrCmd_231(ScriptContext * param0); -BOOL ScrCmd_2B7(ScriptContext * param0); -int ScrCmd_0A0(ScriptContext * param0); -BOOL ScrCmd_31C(ScriptContext * param0); -BOOL ScrCmd_32F(ScriptContext * param0); +BOOL ScrCmd_096(ScriptContext *param0); +BOOL ScrCmd_198(ScriptContext *param0); +BOOL ScrCmd_199(ScriptContext *param0); +BOOL ScrCmd_097(ScriptContext *param0); +BOOL ScrCmd_098(ScriptContext *param0); +BOOL ScrCmd_099(ScriptContext *param0); +BOOL ScrCmd_09A(ScriptContext *param0); +BOOL ScrCmd_1F7(ScriptContext *param0); +BOOL ScrCmd_1F6(ScriptContext *param0); +BOOL ScrCmd_278(ScriptContext *param0); +BOOL ScrCmd_212(ScriptContext *param0); +BOOL ScrCmd_213(ScriptContext *param0); +BOOL ScrCmd_1B9(ScriptContext *param0); +BOOL ScrCmd_1BA(ScriptContext *param0); +BOOL ScrCmd_1BB(ScriptContext *param0); +BOOL ScrCmd_281(ScriptContext *param0); +BOOL ScrCmd_247(ScriptContext *param0); +BOOL ScrCmd_248(ScriptContext *param0); +BOOL ScrCmd_177(ScriptContext *param0); +BOOL ScrCmd_19A(ScriptContext *param0); +BOOL ScrCmd_19B(ScriptContext *param0); +BOOL ScrCmd_19C(ScriptContext *param0); +BOOL ScrCmd_19D(ScriptContext *param0); +BOOL ScrCmd_119(ScriptContext *param0); +BOOL ScrCmd_11A(ScriptContext *param0); +BOOL ScrCmd_1C8(ScriptContext *param0); +BOOL ScrCmd_1C9(ScriptContext *param0); +BOOL ScrCmd_1CA(ScriptContext *param0); +BOOL ScrCmd_1EE(ScriptContext *param0); +BOOL ScrCmd_1F0(ScriptContext *param0); +BOOL ScrCmd_1C0(ScriptContext *param0); +BOOL ScrCmd_2CB(ScriptContext *param0); +BOOL ScrCmd_2DD(ScriptContext *param0); +BOOL ScrCmd_22E(ScriptContext *param0); +BOOL ScrCmd_22F(ScriptContext *param0); +BOOL ScrCmd_230(ScriptContext *param0); +BOOL ScrCmd_231(ScriptContext *param0); +BOOL ScrCmd_2B7(ScriptContext *param0); +int ScrCmd_0A0(ScriptContext *param0); +BOOL ScrCmd_31C(ScriptContext *param0); +BOOL ScrCmd_32F(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204CFFC_H diff --git a/include/unk_0204E240.h b/include/unk_0204E240.h index 345b368f53..f80e096079 100644 --- a/include/unk_0204E240.h +++ b/include/unk_0204E240.h @@ -3,10 +3,10 @@ #include "field_script_context.h" -BOOL ScrCmd_1F1(ScriptContext * param0); -BOOL ScrCmd_1F4(ScriptContext * param0); -BOOL ScrCmd_1F5(ScriptContext * param0); -BOOL ScrCmd_1F2(ScriptContext * param0); -BOOL ScrCmd_1F3(ScriptContext * param0); +BOOL ScrCmd_1F1(ScriptContext *param0); +BOOL ScrCmd_1F4(ScriptContext *param0); +BOOL ScrCmd_1F5(ScriptContext *param0); +BOOL ScrCmd_1F2(ScriptContext *param0); +BOOL ScrCmd_1F3(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204E240_H diff --git a/include/unk_0204E378.h b/include/unk_0204E378.h index 5585089793..d9ae142414 100644 --- a/include/unk_0204E378.h +++ b/include/unk_0204E378.h @@ -3,6 +3,6 @@ #include "field_script_context.h" -BOOL ScrCmd_2A6(ScriptContext * param0); +BOOL ScrCmd_2A6(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204E378_H diff --git a/include/unk_0204E3CC.h b/include/unk_0204E3CC.h index c5d0d68b7a..d9cee75710 100644 --- a/include/unk_0204E3CC.h +++ b/include/unk_0204E3CC.h @@ -3,25 +3,25 @@ #include "field_script_context.h" -BOOL ScrCmd_157(ScriptContext * param0); -BOOL ScrCmd_158(ScriptContext * param0); -BOOL ScrCmd_159(ScriptContext * param0); -BOOL ScrCmd_15A(ScriptContext * param0); -BOOL ScrCmd_15B(ScriptContext * param0); -BOOL ScrCmd_15C(ScriptContext * param0); -BOOL ScrCmd_15E(ScriptContext * param0); -BOOL ScrCmd_15D(ScriptContext * param0); -BOOL ScrCmd_15F(ScriptContext * param0); -BOOL ScrCmd_160(ScriptContext * param0); -BOOL ScrCmd_161(ScriptContext * param0); -BOOL ScrCmd_162(ScriptContext * param0); -BOOL ScrCmd_163(ScriptContext * param0); -BOOL ScrCmd_164(ScriptContext * param0); -BOOL ScrCmd_165(ScriptContext * param0); -BOOL ScrCmd_166(ScriptContext * param0); -BOOL ScrCmd_167(ScriptContext * param0); -BOOL ScrCmd_1CF(ScriptContext * param0); -BOOL ScrCmd_1D0(ScriptContext * param0); -BOOL ScrCmd_1D1(ScriptContext * param0); +BOOL ScrCmd_157(ScriptContext *param0); +BOOL ScrCmd_158(ScriptContext *param0); +BOOL ScrCmd_159(ScriptContext *param0); +BOOL ScrCmd_15A(ScriptContext *param0); +BOOL ScrCmd_15B(ScriptContext *param0); +BOOL ScrCmd_15C(ScriptContext *param0); +BOOL ScrCmd_15E(ScriptContext *param0); +BOOL ScrCmd_15D(ScriptContext *param0); +BOOL ScrCmd_15F(ScriptContext *param0); +BOOL ScrCmd_160(ScriptContext *param0); +BOOL ScrCmd_161(ScriptContext *param0); +BOOL ScrCmd_162(ScriptContext *param0); +BOOL ScrCmd_163(ScriptContext *param0); +BOOL ScrCmd_164(ScriptContext *param0); +BOOL ScrCmd_165(ScriptContext *param0); +BOOL ScrCmd_166(ScriptContext *param0); +BOOL ScrCmd_167(ScriptContext *param0); +BOOL ScrCmd_1CF(ScriptContext *param0); +BOOL ScrCmd_1D0(ScriptContext *param0); +BOOL ScrCmd_1D1(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204E3CC_H diff --git a/include/unk_0204E75C.h b/include/unk_0204E75C.h index 90bc20bbb9..24aa1de925 100644 --- a/include/unk_0204E75C.h +++ b/include/unk_0204E75C.h @@ -3,14 +3,14 @@ #include "field_script_context.h" -BOOL ScrCmd_07B(ScriptContext * param0); -BOOL ScrCmd_07C(ScriptContext * param0); -BOOL ScrCmd_07D(ScriptContext * param0); -BOOL ScrCmd_07E(ScriptContext * param0); -BOOL ScrCmd_2FE(ScriptContext * param0); -BOOL ScrCmd_07F(ScriptContext * param0); -BOOL ScrCmd_GetItemPocket(ScriptContext * ctx); -BOOL ScrCmd_081(ScriptContext * param0); -BOOL ScrCmd_082(ScriptContext * param0); +BOOL ScrCmd_07B(ScriptContext *param0); +BOOL ScrCmd_07C(ScriptContext *param0); +BOOL ScrCmd_07D(ScriptContext *param0); +BOOL ScrCmd_07E(ScriptContext *param0); +BOOL ScrCmd_2FE(ScriptContext *param0); +BOOL ScrCmd_07F(ScriptContext *param0); +BOOL ScrCmd_GetItemPocket(ScriptContext *ctx); +BOOL ScrCmd_081(ScriptContext *param0); +BOOL ScrCmd_082(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204E75C_H diff --git a/include/unk_0204E974.h b/include/unk_0204E974.h index 1205b4dd8e..425e41d7a4 100644 --- a/include/unk_0204E974.h +++ b/include/unk_0204E974.h @@ -3,21 +3,21 @@ #include "field_script_context.h" -BOOL ScrCmd_083(ScriptContext * param0); -BOOL ScrCmd_084(ScriptContext * param0); -BOOL ScrCmd_085(ScriptContext * param0); -BOOL ScrCmd_086(ScriptContext * param0); -BOOL ScrCmd_087(ScriptContext * param0); -BOOL ScrCmd_088(ScriptContext * param0); -BOOL ScrCmd_089(ScriptContext * param0); -BOOL ScrCmd_08A(ScriptContext * param0); -BOOL ScrCmd_08B(ScriptContext * param0); -BOOL ScrCmd_08C(ScriptContext * param0); -BOOL ScrCmd_08D(ScriptContext * param0); -BOOL ScrCmd_08E(ScriptContext * param0); -BOOL ScrCmd_08F(ScriptContext * param0); -BOOL ScrCmd_090(ScriptContext * param0); -BOOL ScrCmd_091(ScriptContext * param0); -BOOL ScrCmd_092(ScriptContext * param0); +BOOL ScrCmd_083(ScriptContext *param0); +BOOL ScrCmd_084(ScriptContext *param0); +BOOL ScrCmd_085(ScriptContext *param0); +BOOL ScrCmd_086(ScriptContext *param0); +BOOL ScrCmd_087(ScriptContext *param0); +BOOL ScrCmd_088(ScriptContext *param0); +BOOL ScrCmd_089(ScriptContext *param0); +BOOL ScrCmd_08A(ScriptContext *param0); +BOOL ScrCmd_08B(ScriptContext *param0); +BOOL ScrCmd_08C(ScriptContext *param0); +BOOL ScrCmd_08D(ScriptContext *param0); +BOOL ScrCmd_08E(ScriptContext *param0); +BOOL ScrCmd_08F(ScriptContext *param0); +BOOL ScrCmd_090(ScriptContext *param0); +BOOL ScrCmd_091(ScriptContext *param0); +BOOL ScrCmd_092(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204E974_H diff --git a/include/unk_0204EDA4.h b/include/unk_0204EDA4.h index 5a24dd0dd9..737ff5c38a 100644 --- a/include/unk_0204EDA4.h +++ b/include/unk_0204EDA4.h @@ -3,15 +3,15 @@ #include "field_script_context.h" -BOOL ScrCmd_1C6(ScriptContext * param0); -BOOL ScrCmd_1C7(ScriptContext * param0); -BOOL ScrCmd_21E(ScriptContext * param0); -BOOL ScrCmd_21F(ScriptContext * param0); -BOOL ScrCmd_220(ScriptContext * param0); -BOOL ScrCmd_221(ScriptContext * param0); -BOOL ScrCmd_224(ScriptContext * param0); -BOOL ScrCmd_222(ScriptContext * param0); -BOOL ScrCmd_223(ScriptContext * param0); -BOOL ScrCmd_225(ScriptContext * param0); +BOOL ScrCmd_1C6(ScriptContext *param0); +BOOL ScrCmd_1C7(ScriptContext *param0); +BOOL ScrCmd_21E(ScriptContext *param0); +BOOL ScrCmd_21F(ScriptContext *param0); +BOOL ScrCmd_220(ScriptContext *param0); +BOOL ScrCmd_221(ScriptContext *param0); +BOOL ScrCmd_224(ScriptContext *param0); +BOOL ScrCmd_222(ScriptContext *param0); +BOOL ScrCmd_223(ScriptContext *param0); +BOOL ScrCmd_225(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204EDA4_H diff --git a/include/unk_0204F02C.h b/include/unk_0204F02C.h index 341097bc08..c0366b6741 100644 --- a/include/unk_0204F02C.h +++ b/include/unk_0204F02C.h @@ -3,9 +3,9 @@ #include "field_script_context.h" -BOOL ScrCmd_23F(ScriptContext * param0); -BOOL ScrCmd_240(ScriptContext * param0); -BOOL ScrCmd_241(ScriptContext * param0); -BOOL ScrCmd_242(ScriptContext * param0); +BOOL ScrCmd_23F(ScriptContext *param0); +BOOL ScrCmd_240(ScriptContext *param0); +BOOL ScrCmd_241(ScriptContext *param0); +BOOL ScrCmd_242(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204F02C_H diff --git a/include/unk_0204F04C.h b/include/unk_0204F04C.h index f5d3c972df..5a31131f1c 100644 --- a/include/unk_0204F04C.h +++ b/include/unk_0204F04C.h @@ -3,6 +3,6 @@ #include "field_script_context.h" -BOOL ScrCmd_2C5(ScriptContext * param0); +BOOL ScrCmd_2C5(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204F04C_H diff --git a/include/unk_0204F13C.h b/include/unk_0204F13C.h index a43495d46a..4b942f5db2 100644 --- a/include/unk_0204F13C.h +++ b/include/unk_0204F13C.h @@ -3,12 +3,12 @@ #include "field_script_context.h" -BOOL ScrCmd_2CC(ScriptContext * param0); -BOOL ScrCmd_2D1(ScriptContext * param0); -BOOL ScrCmd_2CF(ScriptContext * param0); -BOOL ScrCmd_324(ScriptContext * param0); -BOOL ScrCmd_325(ScriptContext * param0); -BOOL ScrCmd_326(ScriptContext * param0); -BOOL ScrCmd_32A(ScriptContext * param0); +BOOL ScrCmd_2CC(ScriptContext *param0); +BOOL ScrCmd_2D1(ScriptContext *param0); +BOOL ScrCmd_2CF(ScriptContext *param0); +BOOL ScrCmd_324(ScriptContext *param0); +BOOL ScrCmd_325(ScriptContext *param0); +BOOL ScrCmd_326(ScriptContext *param0); +BOOL ScrCmd_32A(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204F13C_H diff --git a/include/unk_0204FA34.h b/include/unk_0204FA34.h index 6c8c190514..f6260eae5c 100644 --- a/include/unk_0204FA34.h +++ b/include/unk_0204FA34.h @@ -2,9 +2,10 @@ #define POKEPLATINUM_UNK_0204FA34_H #include "struct_decls/struct_0203026C_decl.h" + #include "savedata.h" -void sub_0204FA34(int param0, int param1, void * param2, void * param3); -void sub_0204FA50(SaveData * param0, UnkStruct_0203026C * param1, u8 param2); +void sub_0204FA34(int param0, int param1, void *param2, void *param3); +void sub_0204FA50(SaveData *param0, UnkStruct_0203026C *param1, u8 param2); #endif // POKEPLATINUM_UNK_0204FA34_H diff --git a/include/unk_0204FAB4.h b/include/unk_0204FAB4.h index 7425bdc41a..77a8068d06 100644 --- a/include/unk_0204FAB4.h +++ b/include/unk_0204FAB4.h @@ -3,8 +3,8 @@ #include "field_script_context.h" -BOOL ScrCmd_2D2(ScriptContext * param0); -BOOL ScrCmd_2D5(ScriptContext * param0); -BOOL ScrCmd_2D3(ScriptContext * param0); +BOOL ScrCmd_2D2(ScriptContext *param0); +BOOL ScrCmd_2D5(ScriptContext *param0); +BOOL ScrCmd_2D3(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0204FAB4_H diff --git a/include/unk_0205001C.h b/include/unk_0205001C.h index 9b4d3dd0b9..4ef72facf0 100644 --- a/include/unk_0205001C.h +++ b/include/unk_0205001C.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_UNK_0205001C_H #define POKEPLATINUM_UNK_0205001C_H -void sub_0205001C(int param0, int param1, void * param2, void * param3); +void sub_0205001C(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_UNK_0205001C_H diff --git a/include/unk_0205003C.h b/include/unk_0205003C.h index ae09396c9a..237622cac8 100644 --- a/include/unk_0205003C.h +++ b/include/unk_0205003C.h @@ -3,8 +3,8 @@ #include "field_script_context.h" -BOOL ScrCmd_2D9(ScriptContext * param0); -BOOL ScrCmd_2DC(ScriptContext * param0); -BOOL ScrCmd_2DA(ScriptContext * param0); +BOOL ScrCmd_2D9(ScriptContext *param0); +BOOL ScrCmd_2DC(ScriptContext *param0); +BOOL ScrCmd_2DA(ScriptContext *param0); #endif // POKEPLATINUM_UNK_0205003C_H diff --git a/include/unk_02050548.h b/include/unk_02050548.h index f22826a30d..dc18e264fe 100644 --- a/include/unk_02050548.h +++ b/include/unk_02050548.h @@ -1,6 +1,6 @@ #ifndef POKEPLATINUM_UNK_02050548_H #define POKEPLATINUM_UNK_02050548_H -void sub_02050548(int param0, int param1, void * param2, void * param3); +void sub_02050548(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_UNK_02050548_H diff --git a/include/unk_02050568.h b/include/unk_02050568.h index 32d325a7ad..a15d83265d 100644 --- a/include/unk_02050568.h +++ b/include/unk_02050568.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void sub_02050568(FieldSystem * fieldSystem); +void sub_02050568(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_02050568_H diff --git a/include/unk_020508D4.h b/include/unk_020508D4.h index d3cd5671dd..aa21435d33 100644 --- a/include/unk_020508D4.h +++ b/include/unk_020508D4.h @@ -1,23 +1,25 @@ #ifndef POKEPLATINUM_UNK_020508D4_H #define POKEPLATINUM_UNK_020508D4_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" + +#include "field/field_system_decl.h" #include "functypes/funcptr_02050904.h" + #include "overlay_manager.h" -TaskManager * FieldTask_Set(FieldSystem * fieldSystem, FieldTask param1, void * param2); -void FieldTask_Change(TaskManager * param0, FieldTask param1, void * param2); -TaskManager * FieldTask_Start(TaskManager * param0, FieldTask param1, void * param2); -BOOL sub_02050958(FieldSystem * fieldSystem); -BOOL sub_020509A4(FieldSystem * fieldSystem); -BOOL sub_020509B4(FieldSystem * fieldSystem); -void sub_020509D4(FieldSystem * fieldSystem); -BOOL sub_020509DC(FieldSystem * fieldSystem); -void sub_02050A38(TaskManager * param0, const OverlayManagerTemplate * param1, void * param2); -FieldSystem * TaskManager_FieldSystem(TaskManager * param0); -void * TaskManager_Environment(TaskManager * param0); -int * FieldTask_GetState(TaskManager * param0); -u32 sub_02050A6C(TaskManager * param0); +TaskManager *FieldTask_Set(FieldSystem *fieldSystem, FieldTask param1, void *param2); +void FieldTask_Change(TaskManager *param0, FieldTask param1, void *param2); +TaskManager *FieldTask_Start(TaskManager *param0, FieldTask param1, void *param2); +BOOL sub_02050958(FieldSystem *fieldSystem); +BOOL sub_020509A4(FieldSystem *fieldSystem); +BOOL sub_020509B4(FieldSystem *fieldSystem); +void sub_020509D4(FieldSystem *fieldSystem); +BOOL sub_020509DC(FieldSystem *fieldSystem); +void sub_02050A38(TaskManager *param0, const OverlayManagerTemplate *param1, void *param2); +FieldSystem *TaskManager_FieldSystem(TaskManager *param0); +void *TaskManager_Environment(TaskManager *param0); +int *FieldTask_GetState(TaskManager *param0); +u32 sub_02050A6C(TaskManager *param0); #endif // POKEPLATINUM_UNK_020508D4_H diff --git a/include/unk_02050A74.h b/include/unk_02050A74.h index 1367ff178b..eefc5a36c0 100644 --- a/include/unk_02050A74.h +++ b/include/unk_02050A74.h @@ -1,25 +1,26 @@ #ifndef POKEPLATINUM_UNK_02050A74_H #define POKEPLATINUM_UNK_02050A74_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_party_decl.h" + +#include "field/field_system_decl.h" #include "overlay006/battle_params.h" -void sub_02050ABC(TaskManager * param0, BattleParams * param1); -void sub_02050E10(FieldSystem * fieldSystem, BattleParams * param1); -void sub_02050E78(FieldSystem * fieldSystem, TaskManager * param1, BattleParams * param2); -void sub_0205120C(TaskManager * param0, int * param1); -void sub_02051270(TaskManager * param0, u16 param1, u8 param2, int * param3, BOOL param4); -void sub_020512E4(TaskManager * param0, u16 param1, u8 param2, int * param3, BOOL param4); -void sub_02051450(FieldSystem * fieldSystem, BattleParams * param1); -void sub_02051480(TaskManager * param0, int param1, int param2, int * param3); -void sub_02051590(TaskManager * param0); -void sub_020515CC(TaskManager * param0, int param1, int param2, int param3, int param4, int * param5); -void sub_0205167C(TaskManager * param0, const u8 * param1, int param2); -void sub_020516F4(TaskManager * param0, int param1, int param2, int param3); -void sub_020517E8(FieldSystem * fieldSystem, const u8 * param1, int param2); -void sub_0205184C(FieldSystem * fieldSystem, const Party * param1, int param2); -void sub_02051ABC(TaskManager * param0, u16 param1, u8 param2, int * param3, BOOL param4); +void sub_02050ABC(TaskManager *param0, BattleParams *param1); +void sub_02050E10(FieldSystem *fieldSystem, BattleParams *param1); +void sub_02050E78(FieldSystem *fieldSystem, TaskManager *param1, BattleParams *param2); +void sub_0205120C(TaskManager *param0, int *param1); +void sub_02051270(TaskManager *param0, u16 param1, u8 param2, int *param3, BOOL param4); +void sub_020512E4(TaskManager *param0, u16 param1, u8 param2, int *param3, BOOL param4); +void sub_02051450(FieldSystem *fieldSystem, BattleParams *param1); +void sub_02051480(TaskManager *param0, int param1, int param2, int *param3); +void sub_02051590(TaskManager *param0); +void sub_020515CC(TaskManager *param0, int param1, int param2, int param3, int param4, int *param5); +void sub_0205167C(TaskManager *param0, const u8 *param1, int param2); +void sub_020516F4(TaskManager *param0, int param1, int param2, int param3); +void sub_020517E8(FieldSystem *fieldSystem, const u8 *param1, int param2); +void sub_0205184C(FieldSystem *fieldSystem, const Party *param1, int param2); +void sub_02051ABC(TaskManager *param0, u16 param1, u8 param2, int *param3, BOOL param4); #endif // POKEPLATINUM_UNK_02050A74_H diff --git a/include/unk_02051D8C.h b/include/unk_02051D8C.h index 64e9d30e08..b404c9753e 100644 --- a/include/unk_02051D8C.h +++ b/include/unk_02051D8C.h @@ -1,34 +1,36 @@ #ifndef POKEPLATINUM_UNK_02051D8C_H #define POKEPLATINUM_UNK_02051D8C_H -#include "trainer_info.h" -#include "journal.h" +#include "struct_decls/struct_party_decl.h" #include "struct_defs/chatot_cry.h" +#include "struct_defs/struct_0209C370.h" + #include "field/field_system_decl.h" -#include "pokemon.h" -#include "struct_decls/struct_party_decl.h" +#include "overlay006/battle_params.h" + #include "bag.h" -#include "struct_defs/struct_0209C370.h" +#include "journal.h" +#include "pokemon.h" #include "savedata.h" -#include "overlay006/battle_params.h" +#include "trainer_info.h" -BattleParams * sub_02051D8C(int param0, u32 param1); -BattleParams * sub_02051F24(int param0, int param1); -BattleParams * sub_02051F38(int param0, int param1); -BattleParams * sub_02051F4C(int param0, const FieldSystem * fieldSystem); -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 ChatotCry * param1, int param2); -void sub_020521B8(BattleParams * param0, const FieldSystem * fieldSystem, SaveData * param2, int param3, Journal * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6); -void sub_02052314(BattleParams * param0, const FieldSystem * fieldSystem); -void sub_02052348(BattleParams * param0, const FieldSystem * fieldSystem, int param2); -void sub_020524E4(BattleParams * param0, const FieldSystem * fieldSystem, const Party * param2, const u8 * param3); -void sub_020526CC(BattleParams * param0, const FieldSystem * fieldSystem, const u8 * param2); -void sub_020526E8(const BattleParams * param0, FieldSystem * fieldSystem); -void sub_02052754(const BattleParams * param0, FieldSystem * fieldSystem); -void sub_0205285C(BattleParams * param0); +BattleParams *sub_02051D8C(int param0, u32 param1); +BattleParams *sub_02051F24(int param0, int param1); +BattleParams *sub_02051F38(int param0, int param1); +BattleParams *sub_02051F4C(int param0, const FieldSystem *fieldSystem); +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 ChatotCry *param1, int param2); +void sub_020521B8(BattleParams *param0, const FieldSystem *fieldSystem, SaveData *param2, int param3, Journal *param4, UnkStruct_0207D99C *param5, UnkStruct_0209C370 *param6); +void sub_02052314(BattleParams *param0, const FieldSystem *fieldSystem); +void sub_02052348(BattleParams *param0, const FieldSystem *fieldSystem, int param2); +void sub_020524E4(BattleParams *param0, const FieldSystem *fieldSystem, const Party *param2, const u8 *param3); +void sub_020526CC(BattleParams *param0, const FieldSystem *fieldSystem, const u8 *param2); +void sub_020526E8(const BattleParams *param0, FieldSystem *fieldSystem); +void sub_02052754(const BattleParams *param0, FieldSystem *fieldSystem); +void sub_0205285C(BattleParams *param0); BOOL sub_02052868(u32 param0); BOOL sub_02052878(u32 param0); BOOL sub_02052888(u32 param0); diff --git a/include/unk_020528D0.h b/include/unk_020528D0.h index 52d39f84d1..70a132b495 100644 --- a/include/unk_020528D0.h +++ b/include/unk_020528D0.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_020508D4_decl.h" -BOOL sub_02052B2C(TaskManager * param0); -void sub_02052C5C(TaskManager * param0); +BOOL sub_02052B2C(TaskManager *param0); +void sub_02052C5C(TaskManager *param0); #endif // POKEPLATINUM_UNK_020528D0_H diff --git a/include/unk_02052C6C.h b/include/unk_02052C6C.h index db9807fd1b..35682a3a32 100644 --- a/include/unk_02052C6C.h +++ b/include/unk_02052C6C.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -void sub_02052E58(TaskManager * param0); +void sub_02052E58(TaskManager *param0); #endif // POKEPLATINUM_UNK_02052C6C_H diff --git a/include/unk_02054884.h b/include/unk_02054884.h index 8617234d0d..50e414ff76 100644 --- a/include/unk_02054884.h +++ b/include/unk_02054884.h @@ -1,23 +1,24 @@ #ifndef POKEPLATINUM_UNK_02054884_H #define POKEPLATINUM_UNK_02054884_H -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" + +#include "pokemon.h" #include "savedata.h" #define PARTY_SLOT_NONE 0xFF BOOL Pokemon_CanBattle(Pokemon *mon); -BOOL sub_020548B0(int param0, SaveData * param1, u16 param2, u8 param3, u16 param4, int param5, int param6); -BOOL sub_02054930(int param0, SaveData * param1, u16 param2, u8 param3, int param4, int param5); -void sub_02054988(Party * param0, int param1, int param2, u16 param3); +BOOL sub_020548B0(int param0, SaveData *param1, u16 param2, u8 param3, u16 param4, int param5, int param6); +BOOL sub_02054930(int param0, SaveData *param1, u16 param2, u8 param3, int param4, int param5); +void sub_02054988(Party *param0, int param1, int param2, u16 param3); int Party_HasMonWithMove(Party *party, u16 moveID); int Party_AliveMonsCount(const Party *party); -Pokemon * Party_FindFirstEligibleBattler(const Party *party); -Pokemon * Party_FindFirstHatchedMon(const Party *party); +Pokemon *Party_FindFirstEligibleBattler(const Party *party); +Pokemon *Party_FindFirstHatchedMon(const Party *party); BOOL Party_HasTwoAliveMons(const Party *party); void Party_GiveChampionRibbons(Party *party); -int sub_02054B04(Party * param0, u16 param1); -BOOL sub_02054B94(Pokemon * param0); +int sub_02054B04(Party *param0, u16 param1); +BOOL sub_02054B94(Pokemon *param0); #endif // POKEPLATINUM_UNK_02054884_H diff --git a/include/unk_02054BD0.h b/include/unk_02054BD0.h index b384f67f77..7b0e01eecd 100644 --- a/include/unk_02054BD0.h +++ b/include/unk_02054BD0.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_UNK_02054BD0_H #define POKEPLATINUM_UNK_02054BD0_H -#include "field/field_system_decl.h" #include "struct_decls/struct_02054C18_decl.h" -void sub_02054BD0(FieldSystem * fieldSystem, const u8 param1); -void sub_02054BF8(FieldSystem * fieldSystem); -u16 const * sub_02054C0C(const u32 param0, const UnkStruct_02054C18 * param1); +#include "field/field_system_decl.h" + +void sub_02054BD0(FieldSystem *fieldSystem, const u8 param1); +void sub_02054BF8(FieldSystem *fieldSystem); +u16 const *sub_02054C0C(const u32 param0, const UnkStruct_02054C18 *param1); #endif // POKEPLATINUM_UNK_02054BD0_H diff --git a/include/unk_02054D00.h b/include/unk_02054D00.h index 9d7f0cc59d..9419e3987d 100644 --- a/include/unk_02054D00.h +++ b/include/unk_02054D00.h @@ -1,25 +1,26 @@ #ifndef POKEPLATINUM_UNK_02054D00_H #define POKEPLATINUM_UNK_02054D00_H -#include "field/field_system_decl.h" +#include + #include "struct_decls/struct_02054F44_decl.h" #include "struct_defs/struct_02055130.h" -#include "overlay005/struct_ov5_021E1890_decl.h" -#include +#include "field/field_system_decl.h" +#include "overlay005/struct_ov5_021E1890_decl.h" -void sub_02054F44(const UnkStruct_02054F44 ** param0, int param1); -BOOL FieldSystem_CheckCollision(const FieldSystem * fieldSystem, const int param1, const int param2); -u8 sub_02054F94(const FieldSystem * fieldSystem, const int param1, const int param2); -const fx32 sub_02054FBC(const FieldSystem * fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4); -BOOL sub_02055024(const FieldSystem * fieldSystem, const VecFx32 * param1, const int param2, const int param3, s8 * param4); -BOOL sub_0205507C(FieldSystem * fieldSystem, const VecFx32 * param1, const int param2, const int param3, s8 * param4); -void sub_020550F4(const int param0, const int param1, const int param2, const int param3, const u32 param4, const u32 param5, UnkStruct_02055130 * param6); -BOOL sub_02055130(const UnkStruct_ov5_021E1890 * param0, const UnkStruct_02055130 * param1, const VecFx32 * param2); -BOOL sub_02055178(const FieldSystem * fieldSystem, const int param1, const UnkStruct_02055130 * param2, UnkStruct_ov5_021E1890 ** param3); -BOOL sub_02055208(const FieldSystem * fieldSystem, const int * param1, const u8 param2, const UnkStruct_02055130 * param3, UnkStruct_ov5_021E1890 ** param4, int * param5); -BOOL sub_020552B4(const FieldSystem * fieldSystem, const int param1, UnkStruct_ov5_021E1890 ** param2, int * param3); -BOOL sub_02055324(const FieldSystem * fieldSystem, const int * param1, const u8 param2, UnkStruct_ov5_021E1890 ** param3, int * param4); -void sub_020553A4(const int param0, const int param1, VecFx32 * param2); +void sub_02054F44(const UnkStruct_02054F44 **param0, int param1); +BOOL FieldSystem_CheckCollision(const FieldSystem *fieldSystem, const int param1, const int param2); +u8 sub_02054F94(const FieldSystem *fieldSystem, const int param1, const int param2); +const fx32 sub_02054FBC(const FieldSystem *fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 *param4); +BOOL sub_02055024(const FieldSystem *fieldSystem, const VecFx32 *param1, const int param2, const int param3, s8 *param4); +BOOL sub_0205507C(FieldSystem *fieldSystem, const VecFx32 *param1, const int param2, const int param3, s8 *param4); +void sub_020550F4(const int param0, const int param1, const int param2, const int param3, const u32 param4, const u32 param5, UnkStruct_02055130 *param6); +BOOL sub_02055130(const UnkStruct_ov5_021E1890 *param0, const UnkStruct_02055130 *param1, const VecFx32 *param2); +BOOL sub_02055178(const FieldSystem *fieldSystem, const int param1, const UnkStruct_02055130 *param2, UnkStruct_ov5_021E1890 **param3); +BOOL sub_02055208(const FieldSystem *fieldSystem, const int *param1, const u8 param2, const UnkStruct_02055130 *param3, UnkStruct_ov5_021E1890 **param4, int *param5); +BOOL sub_020552B4(const FieldSystem *fieldSystem, const int param1, UnkStruct_ov5_021E1890 **param2, int *param3); +BOOL sub_02055324(const FieldSystem *fieldSystem, const int *param1, const u8 param2, UnkStruct_ov5_021E1890 **param3, int *param4); +void sub_020553A4(const int param0, const int param1, VecFx32 *param2); #endif // POKEPLATINUM_UNK_02054D00_H diff --git a/include/unk_020553DC.h b/include/unk_020553DC.h index 4b244bf0c0..a30d9e5e46 100644 --- a/include/unk_020553DC.h +++ b/include/unk_020553DC.h @@ -4,15 +4,15 @@ #include "field/field_system_decl.h" void sub_020553DC(void); -void sub_020553F0(FieldSystem * fieldSystem, u16 param1); -u16 sub_02055404(FieldSystem * fieldSystem); -void Sound_ClearSpecialBGM(FieldSystem * fieldSystem); -u16 sub_02055428(FieldSystem * fieldSystem, int param1); -u16 sub_020554A4(FieldSystem * fieldSystem, int param1); -BOOL sub_02055554(FieldSystem * fieldSystem, u16 param1, int param2); +void sub_020553F0(FieldSystem *fieldSystem, u16 param1); +u16 sub_02055404(FieldSystem *fieldSystem); +void Sound_ClearSpecialBGM(FieldSystem *fieldSystem); +u16 sub_02055428(FieldSystem *fieldSystem, int param1); +u16 sub_020554A4(FieldSystem *fieldSystem, int param1); +BOOL sub_02055554(FieldSystem *fieldSystem, u16 param1, int param2); u16 sub_0205560C(int param0); -void Sound_TryFadeInBGM(FieldSystem * fieldSystem, int param1); -void Sound_PlayMapBGM(FieldSystem * fieldSystem, int param1); -void sub_020556A0(FieldSystem * fieldSystem, int param1); +void Sound_TryFadeInBGM(FieldSystem *fieldSystem, int param1); +void Sound_PlayMapBGM(FieldSystem *fieldSystem, int param1); +void sub_020556A0(FieldSystem *fieldSystem, int param1); #endif // POKEPLATINUM_UNK_020553DC_H diff --git a/include/unk_020556C4.h b/include/unk_020556C4.h index 3393c2955a..59dea1e387 100644 --- a/include/unk_020556C4.h +++ b/include/unk_020556C4.h @@ -3,8 +3,8 @@ #include "struct_defs/struct_020556C4.h" -void sub_020556C4(UnkStruct_020556C4 * param0); -void sub_020556E8(UnkStruct_020556C4 * param0, int param1, int param2); -void sub_02055740(UnkStruct_020556C4 * param0, int param1, int param2, int param3); +void sub_020556C4(UnkStruct_020556C4 *param0); +void sub_020556E8(UnkStruct_020556C4 *param0, int param1, int param2); +void sub_02055740(UnkStruct_020556C4 *param0, int param1, int param2, int param3); #endif // POKEPLATINUM_UNK_020556C4_H diff --git a/include/unk_0205578C.h b/include/unk_0205578C.h index e7fecd50fc..b0067b2d7d 100644 --- a/include/unk_0205578C.h +++ b/include/unk_0205578C.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -void sub_020557DC(TaskManager * param0, int param1, int param2); +void sub_020557DC(TaskManager *param0, int param1, int param2); #endif // POKEPLATINUM_UNK_0205578C_H diff --git a/include/unk_02055808.h b/include/unk_02055808.h index ac356cc14d..29ce9911fa 100644 --- a/include/unk_02055808.h +++ b/include/unk_02055808.h @@ -3,11 +3,11 @@ #include "struct_decls/struct_020508D4_decl.h" -void sub_02055820(TaskManager * param0); -void sub_02055868(TaskManager * param0); -void sub_020558AC(TaskManager * param0); -void sub_020558F0(TaskManager * param0); -void sub_02055974(TaskManager * param0); -void FieldTask_StartFadeIn(TaskManager * param0); +void sub_02055820(TaskManager *param0); +void sub_02055868(TaskManager *param0); +void sub_020558AC(TaskManager *param0); +void sub_020558F0(TaskManager *param0); +void sub_02055974(TaskManager *param0); +void FieldTask_StartFadeIn(TaskManager *param0); #endif // POKEPLATINUM_UNK_02055808_H diff --git a/include/unk_020559DC.h b/include/unk_020559DC.h index b366b4af09..8f6c17f61f 100644 --- a/include/unk_020559DC.h +++ b/include/unk_020559DC.h @@ -1,20 +1,20 @@ #ifndef POKEPLATINUM_UNK_020559DC_H #define POKEPLATINUM_UNK_020559DC_H -#include "field/field_system_decl.h" - #include -void sub_020559DC(FieldSystem * fieldSystem); -int sub_02055BA8(const FieldSystem * fieldSystem); -int sub_02055BB8(const FieldSystem * fieldSystem); -int sub_02055BC4(const FieldSystem * fieldSystem); -int sub_02055BD0(const FieldSystem * fieldSystem); -int sub_02055BDC(const FieldSystem * fieldSystem); -int sub_02055BE8(const FieldSystem * fieldSystem); -void sub_02055BF4(const FieldSystem * fieldSystem, RTCDate * param1, RTCTime * param2); -void sub_02055C10(const FieldSystem * fieldSystem, RTCDate * param1, RTCTime * param2); -void sub_02055C2C(const FieldSystem * fieldSystem); -BOOL sub_02055C40(FieldSystem * fieldSystem); +#include "field/field_system_decl.h" + +void sub_020559DC(FieldSystem *fieldSystem); +int sub_02055BA8(const FieldSystem *fieldSystem); +int sub_02055BB8(const FieldSystem *fieldSystem); +int sub_02055BC4(const FieldSystem *fieldSystem); +int sub_02055BD0(const FieldSystem *fieldSystem); +int sub_02055BDC(const FieldSystem *fieldSystem); +int sub_02055BE8(const FieldSystem *fieldSystem); +void sub_02055BF4(const FieldSystem *fieldSystem, RTCDate *param1, RTCTime *param2); +void sub_02055C10(const FieldSystem *fieldSystem, RTCDate *param1, RTCTime *param2); +void sub_02055C2C(const FieldSystem *fieldSystem); +BOOL sub_02055C40(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_020559DC_H diff --git a/include/unk_02055C50.h b/include/unk_02055C50.h index d74e7725c7..895fe3a4f7 100644 --- a/include/unk_02055C50.h +++ b/include/unk_02055C50.h @@ -1,26 +1,27 @@ #ifndef POKEPLATINUM_UNK_02055C50_H #define POKEPLATINUM_UNK_02055C50_H -#include "field/field_system_decl.h" #include "struct_decls/struct_02055CBC_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -UnkStruct_02055CBC * sub_02055C8C(FieldSystem * fieldSystem, int param1); -void sub_02055CBC(UnkStruct_02055CBC * param0); -void sub_02055CD4(FieldSystem * fieldSystem, int param1); -void sub_02055D94(FieldSystem * fieldSystem); -BOOL sub_02055E00(FieldSystem * fieldSystem, MapObject * param1); -void sub_02055E80(FieldSystem * fieldSystem, MapObject * param1, u16 param2); -void sub_02055EAC(FieldSystem * fieldSystem, MapObject * param1, u16 param2); -void sub_02055EE0(FieldSystem * fieldSystem, MapObject * param1); -int sub_02055F00(const FieldSystem * fieldSystem, const MapObject * param1); -int sub_02055F20(const FieldSystem * fieldSystem, const MapObject * param1); -u16 sub_02055F40(const FieldSystem * fieldSystem, const MapObject * param1); -u16 sub_02055F64(const FieldSystem * fieldSystem, const MapObject * param1); -int sub_02055F88(const FieldSystem * fieldSystem, const MapObject * param1); -int sub_02055FA8(const FieldSystem * fieldSystem, const MapObject * param1); -u32 sub_02055FC8(const FieldSystem * fieldSystem, const MapObject * param1); -void sub_020562AC(FieldSystem * fieldSystem); -void sub_020562D8(FieldSystem * fieldSystem); +#include "field/field_system_decl.h" + +UnkStruct_02055CBC *sub_02055C8C(FieldSystem *fieldSystem, int param1); +void sub_02055CBC(UnkStruct_02055CBC *param0); +void sub_02055CD4(FieldSystem *fieldSystem, int param1); +void sub_02055D94(FieldSystem *fieldSystem); +BOOL sub_02055E00(FieldSystem *fieldSystem, MapObject *param1); +void sub_02055E80(FieldSystem *fieldSystem, MapObject *param1, u16 param2); +void sub_02055EAC(FieldSystem *fieldSystem, MapObject *param1, u16 param2); +void sub_02055EE0(FieldSystem *fieldSystem, MapObject *param1); +int sub_02055F00(const FieldSystem *fieldSystem, const MapObject *param1); +int sub_02055F20(const FieldSystem *fieldSystem, const MapObject *param1); +u16 sub_02055F40(const FieldSystem *fieldSystem, const MapObject *param1); +u16 sub_02055F64(const FieldSystem *fieldSystem, const MapObject *param1); +int sub_02055F88(const FieldSystem *fieldSystem, const MapObject *param1); +int sub_02055FA8(const FieldSystem *fieldSystem, const MapObject *param1); +u32 sub_02055FC8(const FieldSystem *fieldSystem, const MapObject *param1); +void sub_020562AC(FieldSystem *fieldSystem); +void sub_020562D8(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_02055C50_H diff --git a/include/unk_020562F8.h b/include/unk_020562F8.h index 7322479a65..8cc6b09fdd 100644 --- a/include/unk_020562F8.h +++ b/include/unk_020562F8.h @@ -4,14 +4,14 @@ #include "field/field_system_decl.h" #include "overlay006/battle_params.h" -void sub_020562F8(FieldSystem * fieldSystem); -void sub_02056328(FieldSystem * fieldSystem); -BOOL sub_02056374(FieldSystem * fieldSystem, int param1, int param2); -BattleParams * sub_0205639C(FieldSystem * fieldSystem); -void sub_020563AC(FieldSystem * fieldSystem, BattleParams * param1); -int sub_020563BC(FieldSystem * fieldSystem); -int sub_020563D0(FieldSystem * fieldSystem); -int sub_020563E0(FieldSystem * fieldSystem); -int sub_020563F0(FieldSystem * fieldSystem); +void sub_020562F8(FieldSystem *fieldSystem); +void sub_02056328(FieldSystem *fieldSystem); +BOOL sub_02056374(FieldSystem *fieldSystem, int param1, int param2); +BattleParams *sub_0205639C(FieldSystem *fieldSystem); +void sub_020563AC(FieldSystem *fieldSystem, BattleParams *param1); +int sub_020563BC(FieldSystem *fieldSystem); +int sub_020563D0(FieldSystem *fieldSystem); +int sub_020563E0(FieldSystem *fieldSystem); +int sub_020563F0(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_020562F8_H diff --git a/include/unk_02056B30.h b/include/unk_02056B30.h index e95a3e2589..5e31d92377 100644 --- a/include/unk_02056B30.h +++ b/include/unk_02056B30.h @@ -1,11 +1,12 @@ #ifndef POKEPLATINUM_UNK_02056B30_H #define POKEPLATINUM_UNK_02056B30_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" -void sub_02056B30(TaskManager * param0, int param1, int param2, int param3, u16 param4, int param5, int param6, int param7); -void sub_02056BDC(FieldSystem * fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6); -void sub_02056C18(FieldSystem * fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5); +#include "field/field_system_decl.h" + +void sub_02056B30(TaskManager *param0, int param1, int param2, int param3, u16 param4, int param5, int param6, int param7); +void sub_02056BDC(FieldSystem *fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6); +void sub_02056C18(FieldSystem *fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5); #endif // POKEPLATINUM_UNK_02056B30_H diff --git a/include/unk_020573FC.h b/include/unk_020573FC.h index d0a160dd55..17d8edcf26 100644 --- a/include/unk_020573FC.h +++ b/include/unk_020573FC.h @@ -3,7 +3,7 @@ const u8 sub_020573FC(const int param0); const u8 sub_0205740C(const int param0); -const u8 * sub_0205741C(const int param0); +const u8 *sub_0205741C(const int param0); const u8 sub_0205742C(const int param0); const u8 sub_0205743C(const int param0); const u8 sub_0205744C(const int param0); diff --git a/include/unk_0205749C.h b/include/unk_0205749C.h index 2aa66f0e61..f45ab7d07e 100644 --- a/include/unk_0205749C.h +++ b/include/unk_0205749C.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -void sub_0205749C(TaskManager * param0, BOOL param1); +void sub_0205749C(TaskManager *param0, BOOL param1); #endif // POKEPLATINUM_UNK_0205749C_H diff --git a/include/unk_0205A0D8.h b/include/unk_0205A0D8.h index a76b995cad..2ce81515f8 100644 --- a/include/unk_0205A0D8.h +++ b/include/unk_0205A0D8.h @@ -4,11 +4,11 @@ #include "field/field_system_decl.h" #include "functypes/funcptr_0205AB10.h" -void sub_0205AB10(FieldSystem * fieldSystem, UnkFuncPtr_0205AB10 * param1); -void sub_0205B0C0(int param0, int param1, void * param2, void * param3); +void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1); +void sub_0205B0C0(int param0, int param1, void *param2, void *param3); int sub_0205B0E4(void); -u8 * sub_0205B0F4(int param0, void * param1, int param2); -void sub_0205B110(int param0, int param1, void * param2, void * param3); -void sub_0205B2D4(FieldSystem * fieldSystem); +u8 *sub_0205B0F4(int param0, void *param1, int param2); +void sub_0205B110(int param0, int param1, void *param2, void *param3); +void sub_0205B2D4(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_0205A0D8_H diff --git a/include/unk_0205B33C.h b/include/unk_0205B33C.h index 31c448438d..6c696e371a 100644 --- a/include/unk_0205B33C.h +++ b/include/unk_0205B33C.h @@ -1,52 +1,54 @@ #ifndef POKEPLATINUM_UNK_0205B33C_H #define POKEPLATINUM_UNK_0205B33C_H -#include "string_template.h" -#include "struct_defs/sentence.h" +#include + #include "struct_decls/struct_02014EC4_decl.h" -#include "sys_task_manager.h" -#include "trainer_info.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_0205B43C_decl.h" +#include "struct_defs/sentence.h" -#include +#include "field/field_system_decl.h" + +#include "string_template.h" +#include "sys_task_manager.h" +#include "trainer_info.h" -UnkStruct_0205B43C * sub_0205B33C(FieldSystem * fieldSystem); -void sub_0205B388(FieldSystem * fieldSystem); -void sub_0205B5BC(SysTask * param0, void * param1); -FieldSystem * sub_0205B770(UnkStruct_0205B43C * param0); -WMBssDesc * sub_0205B774(UnkStruct_0205B43C * param0, int param1); -int sub_0205B780(UnkStruct_0205B43C * param0, int param1); -int sub_0205B804(UnkStruct_0205B43C * param0, int param1, u16 param2); -u32 sub_0205B8D8(UnkStruct_0205B43C * param0); -u32 sub_0205B8DC(UnkStruct_0205B43C * param0); -u32 sub_0205B91C(UnkStruct_0205B43C * param0); -void sub_0205B930(UnkStruct_0205B43C * param0, int param1, u32 param2); -void sub_0205B988(int param0, int param1, void * param2, void * param3); -void sub_0205B98C(int param0, int param1, void * param2, void * param3); -void sub_0205B990(int param0, int param1, void * param2, void * param3); -void sub_0205B9AC(int param0, int param1, void * param2, void * param3); -void sub_0205B9C4(int param0, int param1, void * param2, void * param3); -void sub_0205B9E0(int param0, int param1, void * param2, void * param3); -int sub_0205B9E8(UnkStruct_0205B43C * param0); -int sub_0205B9EC(UnkStruct_0205B43C * param0, int param1); -void sub_0205BA08(int param0, int param1, void * param2, void * param3); -u8 * sub_0205BA5C(int param0, void * param1, int param2); -void sub_0205BA6C(int param0, int param1, void * param2, void * param3); -u16 sub_0205BA7C(UnkStruct_0205B43C * param0); +UnkStruct_0205B43C *sub_0205B33C(FieldSystem *fieldSystem); +void sub_0205B388(FieldSystem *fieldSystem); +void sub_0205B5BC(SysTask *param0, void *param1); +FieldSystem *sub_0205B770(UnkStruct_0205B43C *param0); +WMBssDesc *sub_0205B774(UnkStruct_0205B43C *param0, int param1); +int sub_0205B780(UnkStruct_0205B43C *param0, int param1); +int sub_0205B804(UnkStruct_0205B43C *param0, int param1, u16 param2); +u32 sub_0205B8D8(UnkStruct_0205B43C *param0); +u32 sub_0205B8DC(UnkStruct_0205B43C *param0); +u32 sub_0205B91C(UnkStruct_0205B43C *param0); +void sub_0205B930(UnkStruct_0205B43C *param0, int param1, u32 param2); +void sub_0205B988(int param0, int param1, void *param2, void *param3); +void sub_0205B98C(int param0, int param1, void *param2, void *param3); +void sub_0205B990(int param0, int param1, void *param2, void *param3); +void sub_0205B9AC(int param0, int param1, void *param2, void *param3); +void sub_0205B9C4(int param0, int param1, void *param2, void *param3); +void sub_0205B9E0(int param0, int param1, void *param2, void *param3); +int sub_0205B9E8(UnkStruct_0205B43C *param0); +int sub_0205B9EC(UnkStruct_0205B43C *param0, int param1); +void sub_0205BA08(int param0, int param1, void *param2, void *param3); +u8 *sub_0205BA5C(int param0, void *param1, int param2); +void sub_0205BA6C(int param0, int param1, void *param2, void *param3); +u16 sub_0205BA7C(UnkStruct_0205B43C *param0); void sub_0205BAAC(int param0); -int sub_0205BC50(StringTemplate * param0); -int sub_0205BCF4(UnkStruct_0205B43C * param0, int param1, int param2, StringTemplate * param3); +int sub_0205BC50(StringTemplate *param0); +int sub_0205BCF4(UnkStruct_0205B43C *param0, int param1, int param2, StringTemplate *param3); u8 sub_0205BE38(void); void sub_0205BEA8(int param0); -int sub_0205BF44(UnkStruct_0205B43C * param0, StringTemplate * param1); -void sub_0205C010(UnkStruct_0205B43C * param0, Sentence * param1); -Sentence * sub_0205C028(UnkStruct_0205B43C * param0); -void sub_0205C040(StringTemplate * param0, int param1, int param2, TrainerInfo * param3, UnkStruct_02014EC4 * param4); -void sub_0205C12C(Sentence * param0); -void sub_0205C154(UnkStruct_0205B43C * param0); -void * sub_0205C17C(UnkStruct_0205B43C * param0); -void sub_0205C1F0(UnkStruct_0205B43C * param0); -void sub_0205C214(UnkStruct_0205B43C * param0); +int sub_0205BF44(UnkStruct_0205B43C *param0, StringTemplate *param1); +void sub_0205C010(UnkStruct_0205B43C *param0, Sentence *param1); +Sentence *sub_0205C028(UnkStruct_0205B43C *param0); +void sub_0205C040(StringTemplate *param0, int param1, int param2, TrainerInfo *param3, UnkStruct_02014EC4 *param4); +void sub_0205C12C(Sentence *param0); +void sub_0205C154(UnkStruct_0205B43C *param0); +void *sub_0205C17C(UnkStruct_0205B43C *param0); +void sub_0205C1F0(UnkStruct_0205B43C *param0); +void sub_0205C214(UnkStruct_0205B43C *param0); #endif // POKEPLATINUM_UNK_0205B33C_H diff --git a/include/unk_0205C22C.h b/include/unk_0205C22C.h index c9516e03e6..0f1581d799 100644 --- a/include/unk_0205C22C.h +++ b/include/unk_0205C22C.h @@ -6,12 +6,12 @@ #include "struct_decls/struct_0205C95C_decl.h" #include "struct_decls/struct_02061830_decl.h" -UnkStruct_0205C22C * sub_0205C22C(UnkStruct_0205B43C * param0); -void sub_0205C2B0(UnkStruct_0205C22C * param0); -void sub_0205C2C8(UnkStruct_0205C22C * param0); -void sub_0205C2E0(UnkStruct_0205C22C * param0); -void sub_0205C820(MapObjectManager * param0, UnkStruct_0205C22C * param1); -UnkStruct_0205C95C * sub_0205C95C(int param0); -void sub_0205C970(UnkStruct_0205C95C * param0); +UnkStruct_0205C22C *sub_0205C22C(UnkStruct_0205B43C *param0); +void sub_0205C2B0(UnkStruct_0205C22C *param0); +void sub_0205C2C8(UnkStruct_0205C22C *param0); +void sub_0205C2E0(UnkStruct_0205C22C *param0); +void sub_0205C820(MapObjectManager *param0, UnkStruct_0205C22C *param1); +UnkStruct_0205C95C *sub_0205C95C(int param0); +void sub_0205C970(UnkStruct_0205C95C *param0); #endif // POKEPLATINUM_UNK_0205C22C_H diff --git a/include/unk_0205C980.h b/include/unk_0205C980.h index 087f92434e..18294333ec 100644 --- a/include/unk_0205C980.h +++ b/include/unk_0205C980.h @@ -3,10 +3,10 @@ #include "string_template.h" -void sub_0205C980(u32 param0, int param1, StringTemplate * param2); +void sub_0205C980(u32 param0, int param1, StringTemplate *param2); int sub_0205C9BC(u32 param0, int param1, u32 param2); int sub_0205CA0C(int param0, int param1); int sub_0205CA14(int param0, int param1, int param2); -u16 * sub_0205CA4C(int param0); +u16 *sub_0205CA4C(int param0); #endif // POKEPLATINUM_UNK_0205C980_H diff --git a/include/unk_0205CA94.h b/include/unk_0205CA94.h index 448c3e4e89..49743eff36 100644 --- a/include/unk_0205CA94.h +++ b/include/unk_0205CA94.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void sub_0205CFDC(FieldSystem * fieldSystem, int param1, BOOL * param2); +void sub_0205CFDC(FieldSystem *fieldSystem, int param1, BOOL *param2); #endif // POKEPLATINUM_UNK_0205CA94_H diff --git a/include/unk_0205D8CC.h b/include/unk_0205D8CC.h index b982eca8a8..52bb95b140 100644 --- a/include/unk_0205D8CC.h +++ b/include/unk_0205D8CC.h @@ -2,18 +2,19 @@ #define POKEPLATINUM_UNK_0205D8CC_H #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "game_options.h" #include "struct_defs/struct_0205AA50.h" +#include "game_options.h" +#include "strbuf.h" + void sub_0205D8CC(u32 param0, u32 param1); -void FieldMessage_AddWindow(BGL * param0, Window * param1, u32 param2); -void FieldMessage_DrawWindow(Window * param0, const Options * param1); -void sub_0205D988(Window * param0); -u8 FieldMessage_Print(Window * param0, Strbuf *param1, const Options * param2, u8 param3); -u8 sub_0205D9CC(Window * param0, Strbuf *param1, int param2, int param3, u8 param4, int param5); +void FieldMessage_AddWindow(BGL *param0, Window *param1, u32 param2); +void FieldMessage_DrawWindow(Window *param0, const Options *param1); +void sub_0205D988(Window *param0); +u8 FieldMessage_Print(Window *param0, Strbuf *param1, const Options *param2, u8 param3); +u8 sub_0205D9CC(Window *param0, Strbuf *param1, int param2, int param3, u8 param4, int param5); u8 FieldMessage_FinishedPrinting(u8 param0); -void sub_0205DA1C(BGL * param0, Window * param1, u16 param2, u16 param3); -void sub_0205DA80(Window * param0, u16 param1, u16 param2); +void sub_0205DA1C(BGL *param0, Window *param1, u16 param2, u16 param3); +void sub_0205DA80(Window *param0, u16 param1, u16 param2); #endif // POKEPLATINUM_UNK_0205D8CC_H diff --git a/include/unk_0205DFC4.h b/include/unk_0205DFC4.h index 55bafb5cc5..c5a32ffb50 100644 --- a/include/unk_0205DFC4.h +++ b/include/unk_0205DFC4.h @@ -3,16 +3,17 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" + #include "savedata.h" u16 sub_0205DFC4(u32 param0); u16 sub_0205E060(u16 param0); u16 sub_0205E078(u16 param0, u16 param1); u16 sub_0205E0E4(u16 param0, u16 param1); -u16 sub_0205E1B4(SaveData * param0); -BOOL HasAllLegendaryTitansInParty(SaveData * param0); -void sub_0205E318(TaskManager * param0, MapObject * param1, u16 param2, u16 param3, u16 param4, u16 param5); -void sub_0205E3F4(TaskManager * param0, MapObject * param1, u16 param2, u16 param3); +u16 sub_0205E1B4(SaveData *param0); +BOOL HasAllLegendaryTitansInParty(SaveData *param0); +void sub_0205E318(TaskManager *param0, MapObject *param1, u16 param2, u16 param3, u16 param4, u16 param5); +void sub_0205E3F4(TaskManager *param0, MapObject *param1, u16 param2, u16 param3); int sub_0205E430(u8 param0, u8 param1); int sub_0205E45C(u8 param0, u8 param1); int sub_0205E488(u8 param0, u8 param1); @@ -30,7 +31,7 @@ int sub_0205E658(u8 param0); int sub_0205E680(u8 param0); int sub_0205E6A8(u32 param0); u8 sub_0205E6B8(void); -u8 sub_0205E6D8(SaveData * param0); +u8 sub_0205E6D8(SaveData *param0); int sub_0205E700(u8 param0); int sub_0205E728(u8 param0); int sub_0205E750(u8 param0); diff --git a/include/unk_0205F180.h b/include/unk_0205F180.h index 2bebfb72eb..469cd37690 100644 --- a/include/unk_0205F180.h +++ b/include/unk_0205F180.h @@ -3,30 +3,31 @@ #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/struct_ov5_021E8F60_decl.h" -void PlayerAvatar_MoveControl(PlayerAvatar * playerAvatar, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4, BOOL param5); -int PlayerAvatar_CheckStartMove(PlayerAvatar * playerAvatar, int param1); -void sub_0205F490(PlayerAvatar * playerAvatar); -void sub_0205F56C(PlayerAvatar * playerAvatar); -int sub_0205F588(PlayerAvatar * playerAvatar); -void sub_0205F5E4(PlayerAvatar * playerAvatar, int param1); -u32 sub_02060B7C(PlayerAvatar * playerAvatar, MapObject * param1, int param2); -u32 sub_020611FC(PlayerAvatar * playerAvatar, MapObject * param1, int param2); -int sub_02061308(PlayerAvatar * playerAvatar, u16 param1, u16 param2); -int sub_020613AC(PlayerAvatar * playerAvatar); -int sub_020613FC(PlayerAvatar * playerAvatar, u16 param1); -int sub_0206140C(PlayerAvatar * playerAvatar); -int sub_02061434(PlayerAvatar * playerAvatar, int param1); -u32 sub_0206147C(PlayerAvatar * playerAvatar, u16 param1, u16 param2, int param3, int param4, int param5); -int sub_02061544(PlayerAvatar * playerAvatar); -void PlayerAvatar_SetAnimationCode(PlayerAvatar * playerAvatar, u32 param1, int param2); -u32 sub_0206156C(PlayerAvatar * playerAvatar, int param1); -void sub_0206157C(PlayerAvatar * playerAvatar, int param1, int * param2, int * param3); -void sub_020615AC(PlayerAvatar * playerAvatar, int * param1, int * param2); -void sub_02061674(PlayerAvatar * playerAvatar, int param1, int * param2, int * param3, int * param4); -u32 sub_020616F0(PlayerAvatar * playerAvatar, int param1); -u32 sub_02061760(PlayerAvatar * playerAvatar); -void sub_020617BC(PlayerAvatar * const playerAvatar, int * param1, int * param2, int * param3); +void PlayerAvatar_MoveControl(PlayerAvatar *playerAvatar, const UnkStruct_ov5_021E8F60 *param1, int param2, u16 param3, u16 param4, BOOL param5); +int PlayerAvatar_CheckStartMove(PlayerAvatar *playerAvatar, int param1); +void sub_0205F490(PlayerAvatar *playerAvatar); +void sub_0205F56C(PlayerAvatar *playerAvatar); +int sub_0205F588(PlayerAvatar *playerAvatar); +void sub_0205F5E4(PlayerAvatar *playerAvatar, int param1); +u32 sub_02060B7C(PlayerAvatar *playerAvatar, MapObject *param1, int param2); +u32 sub_020611FC(PlayerAvatar *playerAvatar, MapObject *param1, int param2); +int sub_02061308(PlayerAvatar *playerAvatar, u16 param1, u16 param2); +int sub_020613AC(PlayerAvatar *playerAvatar); +int sub_020613FC(PlayerAvatar *playerAvatar, u16 param1); +int sub_0206140C(PlayerAvatar *playerAvatar); +int sub_02061434(PlayerAvatar *playerAvatar, int param1); +u32 sub_0206147C(PlayerAvatar *playerAvatar, u16 param1, u16 param2, int param3, int param4, int param5); +int sub_02061544(PlayerAvatar *playerAvatar); +void PlayerAvatar_SetAnimationCode(PlayerAvatar *playerAvatar, u32 param1, int param2); +u32 sub_0206156C(PlayerAvatar *playerAvatar, int param1); +void sub_0206157C(PlayerAvatar *playerAvatar, int param1, int *param2, int *param3); +void sub_020615AC(PlayerAvatar *playerAvatar, int *param1, int *param2); +void sub_02061674(PlayerAvatar *playerAvatar, int param1, int *param2, int *param3, int *param4); +u32 sub_020616F0(PlayerAvatar *playerAvatar, int param1); +u32 sub_02061760(PlayerAvatar *playerAvatar); +void sub_020617BC(PlayerAvatar *const playerAvatar, int *param1, int *param2, int *param3); #endif // POKEPLATINUM_UNK_0205F180_H diff --git a/include/unk_0206450C.h b/include/unk_0206450C.h index 277cd20cce..2333855e85 100644 --- a/include/unk_0206450C.h +++ b/include/unk_0206450C.h @@ -3,61 +3,61 @@ #include "struct_decls/struct_02061AB4_decl.h" -void sub_0206453C(MapObject * param0); -void sub_02064548(MapObject * param0); -void sub_02064554(MapObject * param0); -void sub_02064560(MapObject * param0); -void sub_0206456C(MapObject * param0); -void sub_02064578(MapObject * param0); -void sub_02064584(MapObject * param0); -void sub_02064590(MapObject * param0); -void sub_0206459C(MapObject * param0); -void sub_020645A8(MapObject * param0); -void sub_020645B4(MapObject * param0); -void sub_020645C0(MapObject * param0); -void sub_02064624(MapObject * param0); -void sub_02064628(MapObject * param0); -void sub_02064638(MapObject * param0); -void sub_02064648(MapObject * param0); -void sub_02064658(MapObject * param0); -void sub_02064690(MapObject * param0); -void sub_02064918(MapObject * param0); -void sub_0206493C(MapObject * param0); -void sub_02064948(MapObject * param0); -void sub_02064954(MapObject * param0); -void sub_02064960(MapObject * param0); -void sub_02064990(MapObject * param0); -void sub_0206499C(MapObject * param0); -void sub_020649A8(MapObject * param0); -void sub_02064AF0(MapObject * param0); -void sub_02064AFC(MapObject * param0); -void sub_02064C28(MapObject * param0); -void sub_02064C48(MapObject * param0); -void sub_02064DC8(MapObject * param0); -void sub_02064DD8(MapObject * param0); -void sub_02064DE8(MapObject * param0); -void sub_02064DF8(MapObject * param0); -void sub_02064E08(MapObject * param0); -void sub_02064E18(MapObject * param0); -void sub_02064E28(MapObject * param0); -void sub_02064E38(MapObject * param0); -void sub_02064E48(MapObject * param0); -void sub_02064E58(MapObject * param0); -void sub_02064E68(MapObject * param0); -void sub_02064E78(MapObject * param0); -void sub_02064E88(MapObject * param0); -void sub_02064E98(MapObject * param0); -void sub_02064EA8(MapObject * param0); -void sub_02064EB8(MapObject * param0); -void sub_02064EC8(MapObject * param0); -void sub_0206505C(MapObject * param0); -void sub_0206506C(MapObject * param0); -void sub_0206507C(MapObject * param0); -void sub_0206508C(MapObject * param0); -void sub_0206509C(MapObject * param0); -void sub_020650AC(MapObject * param0); -void sub_020650BC(MapObject * param0); -void sub_020650CC(MapObject * param0); -void sub_020650DC(MapObject * param0); +void sub_0206453C(MapObject *param0); +void sub_02064548(MapObject *param0); +void sub_02064554(MapObject *param0); +void sub_02064560(MapObject *param0); +void sub_0206456C(MapObject *param0); +void sub_02064578(MapObject *param0); +void sub_02064584(MapObject *param0); +void sub_02064590(MapObject *param0); +void sub_0206459C(MapObject *param0); +void sub_020645A8(MapObject *param0); +void sub_020645B4(MapObject *param0); +void sub_020645C0(MapObject *param0); +void sub_02064624(MapObject *param0); +void sub_02064628(MapObject *param0); +void sub_02064638(MapObject *param0); +void sub_02064648(MapObject *param0); +void sub_02064658(MapObject *param0); +void sub_02064690(MapObject *param0); +void sub_02064918(MapObject *param0); +void sub_0206493C(MapObject *param0); +void sub_02064948(MapObject *param0); +void sub_02064954(MapObject *param0); +void sub_02064960(MapObject *param0); +void sub_02064990(MapObject *param0); +void sub_0206499C(MapObject *param0); +void sub_020649A8(MapObject *param0); +void sub_02064AF0(MapObject *param0); +void sub_02064AFC(MapObject *param0); +void sub_02064C28(MapObject *param0); +void sub_02064C48(MapObject *param0); +void sub_02064DC8(MapObject *param0); +void sub_02064DD8(MapObject *param0); +void sub_02064DE8(MapObject *param0); +void sub_02064DF8(MapObject *param0); +void sub_02064E08(MapObject *param0); +void sub_02064E18(MapObject *param0); +void sub_02064E28(MapObject *param0); +void sub_02064E38(MapObject *param0); +void sub_02064E48(MapObject *param0); +void sub_02064E58(MapObject *param0); +void sub_02064E68(MapObject *param0); +void sub_02064E78(MapObject *param0); +void sub_02064E88(MapObject *param0); +void sub_02064E98(MapObject *param0); +void sub_02064EA8(MapObject *param0); +void sub_02064EB8(MapObject *param0); +void sub_02064EC8(MapObject *param0); +void sub_0206505C(MapObject *param0); +void sub_0206506C(MapObject *param0); +void sub_0206507C(MapObject *param0); +void sub_0206508C(MapObject *param0); +void sub_0206509C(MapObject *param0); +void sub_020650AC(MapObject *param0); +void sub_020650BC(MapObject *param0); +void sub_020650CC(MapObject *param0); +void sub_020650DC(MapObject *param0); #endif // POKEPLATINUM_UNK_0206450C_H diff --git a/include/unk_020655F4.h b/include/unk_020655F4.h index fc408a7ce3..aada61e863 100644 --- a/include/unk_020655F4.h +++ b/include/unk_020655F4.h @@ -1,22 +1,24 @@ #ifndef POKEPLATINUM_UNK_020655F4_H #define POKEPLATINUM_UNK_020655F4_H -#include "sys_task_manager.h" #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay005/map_object_anim_cmd.h" -int LocalMapObj_IsAnimationSet(const MapObject * param0); -void LocalMapObj_SetAnimationCode(MapObject * param0, int param1); -void sub_02065668(MapObject * param0, int param1); -int LocalMapObj_CheckAnimationFinished(const MapObject * param0); -int sub_020656AC(MapObject * param0); -void sub_020656DC(MapObject * param0); -SysTask * MapObject_StartAnimation(MapObject * param0, const MapObjectAnimCmd * param1); -int MapObject_HasAnimationEnded(SysTask * param0); -void MapObject_FinishAnimation(SysTask * param0); +#include "sys_task_manager.h" + +int LocalMapObj_IsAnimationSet(const MapObject *param0); +void LocalMapObj_SetAnimationCode(MapObject *param0, int param1); +void sub_02065668(MapObject *param0, int param1); +int LocalMapObj_CheckAnimationFinished(const MapObject *param0); +int sub_020656AC(MapObject *param0); +void sub_020656DC(MapObject *param0); +SysTask *MapObject_StartAnimation(MapObject *param0, const MapObjectAnimCmd *param1); +int MapObject_HasAnimationEnded(SysTask *param0); +void MapObject_FinishAnimation(SysTask *param0); int sub_02065838(int param0, int param1); int sub_0206587C(int param0); -void sub_020658B4(MapObject * param0); -int sub_020658DC(MapObject * param0); +void sub_020658B4(MapObject *param0); +int sub_020658DC(MapObject *param0); #endif // POKEPLATINUM_UNK_020655F4_H diff --git a/include/unk_020673B8.h b/include/unk_020673B8.h index 2ccd359c1b..3887d2936c 100644 --- a/include/unk_020673B8.h +++ b/include/unk_020673B8.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_02061AB4_decl.h" -void sub_020673B8(MapObject * param0); -int sub_020673C0(MapObject * param0); +void sub_020673B8(MapObject *param0); +int sub_020673C0(MapObject *param0); #endif // POKEPLATINUM_UNK_020673B8_H diff --git a/include/unk_020677F4.h b/include/unk_020677F4.h index 5c67a210e3..497b08a3b1 100644 --- a/include/unk_020677F4.h +++ b/include/unk_020677F4.h @@ -5,16 +5,16 @@ #include "struct_decls/struct_02061AB4_decl.h" int sub_020677F4(int param0); -int sub_02067800(const MapObject * param0); -void sub_02067834(MapObject * param0); -void sub_02067840(MapObject * param0); -void sub_02067850(MapObject * param0); -void sub_0206786C(MapObject * param0); -void sub_02067870(MapObject * param0); -void sub_02067890(MapObject * param0); -void sub_02067950(MapObject * param0); -void sub_02067968(MapObject * param0); -void sub_02067998(MapObject * param0); -UnkStruct_020216E0 * sub_02067A58(MapObject * param0); +int sub_02067800(const MapObject *param0); +void sub_02067834(MapObject *param0); +void sub_02067840(MapObject *param0); +void sub_02067850(MapObject *param0); +void sub_0206786C(MapObject *param0); +void sub_02067870(MapObject *param0); +void sub_02067890(MapObject *param0); +void sub_02067950(MapObject *param0); +void sub_02067968(MapObject *param0); +void sub_02067998(MapObject *param0); +UnkStruct_020216E0 *sub_02067A58(MapObject *param0); #endif // POKEPLATINUM_UNK_020677F4_H diff --git a/include/unk_02067A84.h b/include/unk_02067A84.h index 1d6d510bec..2c6d1137d0 100644 --- a/include/unk_02067A84.h +++ b/include/unk_02067A84.h @@ -1,17 +1,19 @@ #ifndef POKEPLATINUM_UNK_02067A84_H #define POKEPLATINUM_UNK_02067A84_H -#include "sys_task_manager.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -int sub_02067A84(FieldSystem * fieldSystem, BOOL param1); -int sub_02067D58(const MapObject * param0, PlayerAvatar * playerAvatar, int param2, int param3); -int sub_02067F24(MapObject * param0); -int sub_02067F88(FieldSystem * fieldSystem, MapObject * param1); -SysTask * sub_02067FB8(FieldSystem * fieldSystem, MapObject * param1, PlayerAvatar * playerAvatar, int param3, int param4, int param5, int param6, int param7); -int sub_02067FD4(SysTask * param0); -void sub_02067FE8(SysTask * param0); +#include "field/field_system_decl.h" + +#include "sys_task_manager.h" + +int sub_02067A84(FieldSystem *fieldSystem, BOOL param1); +int sub_02067D58(const MapObject *param0, PlayerAvatar *playerAvatar, int param2, int param3); +int sub_02067F24(MapObject *param0); +int sub_02067F88(FieldSystem *fieldSystem, MapObject *param1); +SysTask *sub_02067FB8(FieldSystem *fieldSystem, MapObject *param1, PlayerAvatar *playerAvatar, int param3, int param4, int param5, int param6, int param7); +int sub_02067FD4(SysTask *param0); +void sub_02067FE8(SysTask *param0); #endif // POKEPLATINUM_UNK_02067A84_H diff --git a/include/unk_02068344.h b/include/unk_02068344.h index f999116c2a..a44d3e77fc 100644 --- a/include/unk_02068344.h +++ b/include/unk_02068344.h @@ -3,9 +3,9 @@ #include "field/field_system_decl.h" -void sub_02068344(FieldSystem * fieldSystem); -void sub_02068368(FieldSystem * fieldSystem); -BOOL sub_02068390(FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4); -BOOL sub_020683D8(FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, int param4); +void sub_02068344(FieldSystem *fieldSystem); +void sub_02068368(FieldSystem *fieldSystem); +BOOL sub_02068390(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4); +BOOL sub_020683D8(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, int param4); #endif // POKEPLATINUM_UNK_02068344_H diff --git a/include/unk_020683F4.h b/include/unk_020683F4.h index 5a43eb9428..c90484f930 100644 --- a/include/unk_020683F4.h +++ b/include/unk_020683F4.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_UNK_020683F4_H #define POKEPLATINUM_UNK_020683F4_H -#include "field/field_system_decl.h" #include "struct_defs/struct_020684D0.h" +#include "field/field_system_decl.h" + u32 sub_020683F4(u16 param0, u16 param1); -void sub_0206842C(FieldSystem * fieldSystem, UnkStruct_020684D0 * param1); -BOOL sub_02068B50(const UnkStruct_020684D0 * param0); -BOOL sub_02069238(FieldSystem * fieldSystem); +void sub_0206842C(FieldSystem *fieldSystem, UnkStruct_020684D0 *param1); +BOOL sub_02068B50(const UnkStruct_020684D0 *param0); +BOOL sub_02069238(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_020683F4_H diff --git a/include/unk_02069BE0.h b/include/unk_02069BE0.h index 3829cdbbe3..a9f77498e4 100644 --- a/include/unk_02069BE0.h +++ b/include/unk_02069BE0.h @@ -2,39 +2,40 @@ #define POKEPLATINUM_UNK_02069BE0_H #include "struct_decls/struct_02061AB4_decl.h" + #include "overlay101/struct_ov101_021D5D90_decl.h" -void sub_02069BE0(MapObject * param0); -void sub_02069C0C(MapObject * param0); -void sub_02069C44(MapObject * param0); -void sub_02069DF4(MapObject * param0); -void sub_02069E1C(MapObject * param0); -void sub_02069E4C(MapObject * param0); -void sub_02069E50(MapObject * param0); -MapObject * sub_02069EB8(MapObject * param0); -void sub_0206A104(MapObject * param0); -void sub_0206A110(MapObject * param0); -void sub_0206A11C(MapObject * param0); -void sub_0206A128(MapObject * param0); -void sub_0206A134(MapObject * param0); -void sub_0206A158(MapObject * param0); -void sub_0206A168(MapObject * param0); -void sub_0206A218(MapObject * param0, UnkStruct_ov101_021D5D90 * param1); -UnkStruct_ov101_021D5D90 * sub_0206A224(MapObject * param0); -void sub_0206A230(MapObject * param0); -void sub_0206A25C(MapObject * param0); -void sub_0206A268(MapObject * param0); -void sub_0206A274(MapObject * param0); -void sub_0206A280(MapObject * param0); -void sub_0206A28C(MapObject * param0); -void sub_0206A298(MapObject * param0); -void sub_0206A2A4(MapObject * param0); -void sub_0206A2B0(MapObject * param0); -void sub_0206A2BC(MapObject * param0); -void sub_0206A490(MapObject * param0); -void sub_0206A49C(MapObject * param0); -void sub_0206A4A8(MapObject * param0); -void sub_0206A4B4(MapObject * param0); -void sub_0206A4C0(MapObject * param0); +void sub_02069BE0(MapObject *param0); +void sub_02069C0C(MapObject *param0); +void sub_02069C44(MapObject *param0); +void sub_02069DF4(MapObject *param0); +void sub_02069E1C(MapObject *param0); +void sub_02069E4C(MapObject *param0); +void sub_02069E50(MapObject *param0); +MapObject *sub_02069EB8(MapObject *param0); +void sub_0206A104(MapObject *param0); +void sub_0206A110(MapObject *param0); +void sub_0206A11C(MapObject *param0); +void sub_0206A128(MapObject *param0); +void sub_0206A134(MapObject *param0); +void sub_0206A158(MapObject *param0); +void sub_0206A168(MapObject *param0); +void sub_0206A218(MapObject *param0, UnkStruct_ov101_021D5D90 *param1); +UnkStruct_ov101_021D5D90 *sub_0206A224(MapObject *param0); +void sub_0206A230(MapObject *param0); +void sub_0206A25C(MapObject *param0); +void sub_0206A268(MapObject *param0); +void sub_0206A274(MapObject *param0); +void sub_0206A280(MapObject *param0); +void sub_0206A28C(MapObject *param0); +void sub_0206A298(MapObject *param0); +void sub_0206A2A4(MapObject *param0); +void sub_0206A2B0(MapObject *param0); +void sub_0206A2BC(MapObject *param0); +void sub_0206A490(MapObject *param0); +void sub_0206A49C(MapObject *param0); +void sub_0206A4A8(MapObject *param0); +void sub_0206A4B4(MapObject *param0); +void sub_0206A4C0(MapObject *param0); #endif // POKEPLATINUM_UNK_02069BE0_H diff --git a/include/unk_0206A780.h b/include/unk_0206A780.h index 9de0c2d26d..60221f8cea 100644 --- a/include/unk_0206A780.h +++ b/include/unk_0206A780.h @@ -3,10 +3,10 @@ #include "struct_defs/struct_0206A844.h" -UnkStruct_0206A844 * sub_0206A780(int param0); -void sub_0206A844(UnkStruct_0206A844 * param0); -void sub_0206A870(UnkStruct_0206A844 * param0); -void sub_0206A8A0(UnkStruct_0206A844 * param0, s16 param1, s16 param2, s16 param3); -void sub_0206A8C4(UnkStruct_0206A844 * param0, u16 param1, BOOL param2); +UnkStruct_0206A844 *sub_0206A780(int param0); +void sub_0206A844(UnkStruct_0206A844 *param0); +void sub_0206A870(UnkStruct_0206A844 *param0); +void sub_0206A8A0(UnkStruct_0206A844 *param0, s16 param1, s16 param2, s16 param3); +void sub_0206A8C4(UnkStruct_0206A844 *param0, u16 param1, BOOL param2); #endif // POKEPLATINUM_UNK_0206A780_H diff --git a/include/unk_0206A8DC.h b/include/unk_0206A8DC.h index 9d536f4fbf..1a3a51997b 100644 --- a/include/unk_0206A8DC.h +++ b/include/unk_0206A8DC.h @@ -3,62 +3,62 @@ #include "vars_flags.h" -void sub_0206A92C(VarsFlags * param0); -BOOL sub_0206A938(VarsFlags * param0); -void sub_0206A944(VarsFlags * param0); -BOOL sub_0206A954(VarsFlags * param0); -void sub_0206A964(VarsFlags * param0); -void sub_0206A974(VarsFlags * param0); -BOOL sub_0206A984(VarsFlags * param0); -void sub_0206A994(VarsFlags * param0); -void sub_0206A9A4(VarsFlags * param0); -BOOL sub_0206A9B4(VarsFlags * param0); -void VsSeeker_SetUsedFlag(VarsFlags * param0); -void VsSeeker_ClearUsedFlag(VarsFlags * param0); -BOOL VsSeeker_GetUsedFlag(VarsFlags * param0); -void sub_0206A9F4(VarsFlags * param0); -void sub_0206AA04(VarsFlags * param0); -void sub_0206AA14(VarsFlags * param0); -void sub_0206AA20(VarsFlags * param0); -void sub_0206AA30(VarsFlags * param0); -void sub_0206AA40(VarsFlags * param0); -void sub_0206AA50(VarsFlags * param0, int param1); -BOOL sub_0206AAA8(VarsFlags * param0, int param1); -BOOL VsSeeker_HasUnlockedLevel(VarsFlags * param0, int param1); -u16 sub_0206AB68(VarsFlags * param0, int param1); -void sub_0206AD9C(VarsFlags * param0); -void CommClub_ResetAvailable(VarsFlags * param0); -BOOL CommClub_IsAvailable(VarsFlags * param0); -BOOL ContestHall_IsVisited(VarsFlags * param0); -BOOL sub_0206ADDC(VarsFlags * param0); -BOOL sub_0206ADEC(VarsFlags * param0); -BOOL sub_0206ADFC(VarsFlags * param0); -void sub_0206AE0C(VarsFlags * param0); -void sub_0206AE1C(VarsFlags * param0); -BOOL sub_0206AE2C(VarsFlags * param0); -void sub_0206AE3C(VarsFlags * param0); -void sub_0206AE4C(VarsFlags * param0); -BOOL sub_0206AE5C(VarsFlags * param0); -void sub_0206AE6C(VarsFlags * param0); -void sub_0206AE7C(VarsFlags * param0); -BOOL sub_0206AE8C(VarsFlags * param0); -void sub_0206AE9C(VarsFlags * param0); -BOOL sub_0206AEAC(VarsFlags * param0, int param1); -void sub_0206AEBC(VarsFlags * param0); -void sub_0206AECC(VarsFlags * param0); -BOOL Overworld_IsFlashActive(VarsFlags * param0); -void sub_0206AEEC(VarsFlags * param0); -void sub_0206AEFC(VarsFlags * param0); -BOOL Overworld_IsDefogActive(VarsFlags * param0); -BOOL sub_0206AF1C(VarsFlags * param0, int param1); -BOOL sub_0206AF2C(VarsFlags * param0, int param1); -BOOL sub_0206AF3C(VarsFlags * param0, int param1, u32 param2); -void sub_0206AF5C(VarsFlags * param0); -BOOL sub_0206AF6C(VarsFlags * param0, int param1, int param2); -void sub_0206AF90(VarsFlags * param0); -void sub_0206AFA0(VarsFlags * param0); -BOOL sub_0206AFB0(VarsFlags * param0, int param1, int param2); -BOOL sub_0206AFC0(VarsFlags * param0, int param1); -BOOL sub_0206AFD0(VarsFlags * param0); +void sub_0206A92C(VarsFlags *param0); +BOOL sub_0206A938(VarsFlags *param0); +void sub_0206A944(VarsFlags *param0); +BOOL sub_0206A954(VarsFlags *param0); +void sub_0206A964(VarsFlags *param0); +void sub_0206A974(VarsFlags *param0); +BOOL sub_0206A984(VarsFlags *param0); +void sub_0206A994(VarsFlags *param0); +void sub_0206A9A4(VarsFlags *param0); +BOOL sub_0206A9B4(VarsFlags *param0); +void VsSeeker_SetUsedFlag(VarsFlags *param0); +void VsSeeker_ClearUsedFlag(VarsFlags *param0); +BOOL VsSeeker_GetUsedFlag(VarsFlags *param0); +void sub_0206A9F4(VarsFlags *param0); +void sub_0206AA04(VarsFlags *param0); +void sub_0206AA14(VarsFlags *param0); +void sub_0206AA20(VarsFlags *param0); +void sub_0206AA30(VarsFlags *param0); +void sub_0206AA40(VarsFlags *param0); +void sub_0206AA50(VarsFlags *param0, int param1); +BOOL sub_0206AAA8(VarsFlags *param0, int param1); +BOOL VsSeeker_HasUnlockedLevel(VarsFlags *param0, int param1); +u16 sub_0206AB68(VarsFlags *param0, int param1); +void sub_0206AD9C(VarsFlags *param0); +void CommClub_ResetAvailable(VarsFlags *param0); +BOOL CommClub_IsAvailable(VarsFlags *param0); +BOOL ContestHall_IsVisited(VarsFlags *param0); +BOOL sub_0206ADDC(VarsFlags *param0); +BOOL sub_0206ADEC(VarsFlags *param0); +BOOL sub_0206ADFC(VarsFlags *param0); +void sub_0206AE0C(VarsFlags *param0); +void sub_0206AE1C(VarsFlags *param0); +BOOL sub_0206AE2C(VarsFlags *param0); +void sub_0206AE3C(VarsFlags *param0); +void sub_0206AE4C(VarsFlags *param0); +BOOL sub_0206AE5C(VarsFlags *param0); +void sub_0206AE6C(VarsFlags *param0); +void sub_0206AE7C(VarsFlags *param0); +BOOL sub_0206AE8C(VarsFlags *param0); +void sub_0206AE9C(VarsFlags *param0); +BOOL sub_0206AEAC(VarsFlags *param0, int param1); +void sub_0206AEBC(VarsFlags *param0); +void sub_0206AECC(VarsFlags *param0); +BOOL Overworld_IsFlashActive(VarsFlags *param0); +void sub_0206AEEC(VarsFlags *param0); +void sub_0206AEFC(VarsFlags *param0); +BOOL Overworld_IsDefogActive(VarsFlags *param0); +BOOL sub_0206AF1C(VarsFlags *param0, int param1); +BOOL sub_0206AF2C(VarsFlags *param0, int param1); +BOOL sub_0206AF3C(VarsFlags *param0, int param1, u32 param2); +void sub_0206AF5C(VarsFlags *param0); +BOOL sub_0206AF6C(VarsFlags *param0, int param1, int param2); +void sub_0206AF90(VarsFlags *param0); +void sub_0206AFA0(VarsFlags *param0); +BOOL sub_0206AFB0(VarsFlags *param0, int param1, int param2); +BOOL sub_0206AFC0(VarsFlags *param0, int param1); +BOOL sub_0206AFD0(VarsFlags *param0); #endif // POKEPLATINUM_UNK_0206A8DC_H diff --git a/include/unk_0206AFE0.h b/include/unk_0206AFE0.h index 4a33bb0c35..42add11853 100644 --- a/include/unk_0206AFE0.h +++ b/include/unk_0206AFE0.h @@ -1,79 +1,79 @@ #ifndef POKEPLATINUM_UNK_0206AFE0_H #define POKEPLATINUM_UNK_0206AFE0_H -#include "vars_flags.h" #include "savedata.h" +#include "vars_flags.h" -BOOL sub_0206B024(VarsFlags * param0, u16 param1); -u16 sub_0206B034(VarsFlags * param0); -BOOL sub_0206B044(VarsFlags * param0, u16 param1); -u16 sub_0206B054(VarsFlags * param0); -u16 sub_0206B064(VarsFlags * param0); -u16 sub_0206B08C(VarsFlags * param0); -u16 sub_0206B0B4(VarsFlags * param0); -BOOL sub_0206B0C4(VarsFlags * param0, u16 param1); -void VsSeeker_Reset(VarsFlags * param0); -u16 VsSeeker_GetBattery(VarsFlags * param0); -BOOL VsSeeker_SetBattery(VarsFlags * param0, u16 param1); -u16 VsSeeker_GetActiveStepCount(VarsFlags * param0); -BOOL VsSeeker_SetActiveStepCount(VarsFlags * param0, u16 param1); -void sub_0206B144(VarsFlags * param0, int param1); -BOOL sub_0206B16C(VarsFlags * param0, int param1); -void sub_0206B1B0(VarsFlags * param0, int param1); -void sub_0206B1D8(VarsFlags * param0, int param1); -BOOL sub_0206B1F0(VarsFlags * param0, int param1); -BOOL sub_0206B218(VarsFlags * param0); -u16 sub_0206B228(VarsFlags * param0); -BOOL sub_0206B238(VarsFlags * param0); -u16 sub_0206B260(VarsFlags * param0); -BOOL sub_0206B270(VarsFlags * param0, u16 param1); -void sub_0206B280(VarsFlags * param0, u32 param1); -u32 sub_0206B2A4(VarsFlags * param0); -void sub_0206B2C8(VarsFlags * param0); -void sub_0206B2E4(SaveData * param0, u16 param1); -u16 sub_0206B314(VarsFlags * param0); -BOOL sub_0206B324(VarsFlags * param0, u16 param1); -void sub_0206B334(SaveData * param0); -u16 sub_0206B354(VarsFlags * param0); -BOOL sub_0206B364(VarsFlags * param0, u16 param1); -u16 sub_0206B374(VarsFlags * param0); -BOOL sub_0206B384(VarsFlags * param0, u16 param1); -u16 sub_0206B394(VarsFlags * param0); -BOOL sub_0206B3A4(VarsFlags * param0, u16 param1); -BOOL sub_0206B3B4(VarsFlags * param0); -u16 sub_0206B3DC(VarsFlags * param0); -u16 sub_0206B3EC(VarsFlags * param0); -BOOL sub_0206B3FC(VarsFlags * param0, u16 param1); -u16 sub_0206B40C(VarsFlags * param0); -BOOL sub_0206B41C(VarsFlags * param0, u16 param1); -u16 sub_0206B42C(VarsFlags * param0); -BOOL sub_0206B43C(VarsFlags * param0, u16 param1); -u16 sub_0206B44C(VarsFlags * param0); -void sub_0206B45C(VarsFlags * param0, u16 param1); -void sub_0206B46C(VarsFlags * param0, u16 param1); -u16 sub_0206B47C(VarsFlags * param0); -void sub_0206B48C(VarsFlags * param0, u16 param1); -void sub_0206B514(SaveData * param0); -void sub_0206B558(VarsFlags * param0, u16 param1); -u16 sub_0206B588(VarsFlags * param0); -u16 sub_0206B598(VarsFlags * param0); -u16 sub_0206B5A8(VarsFlags * param0); -u16 sub_0206B5B8(VarsFlags * param0); -u16 sub_0206B5C8(VarsFlags * param0); -u16 sub_0206B5D8(VarsFlags * param0); -void sub_0206B5E8(VarsFlags * param0, u16 param1); -u16 sub_0206B5F8(VarsFlags * param0); -void sub_0206B608(VarsFlags * param0, u16 param1); -u16 sub_0206B618(VarsFlags * param0); -void sub_0206B628(VarsFlags * param0, u16 param1); -void sub_0206B638(VarsFlags * param0, u16 param1); -void sub_0206B648(VarsFlags * param0, u16 param1); -void sub_0206B658(VarsFlags * param0, u16 param1); -void sub_0206B668(VarsFlags * param0, u16 param1); -void sub_0206B678(VarsFlags * param0, u16 param1); -void sub_0206B688(VarsFlags * param0, u16 param1, u16 param2); -u16 sub_0206B6DC(VarsFlags * param0); -void sub_0206B6EC(VarsFlags * param0, u16 param1); -u16 sub_0206B6FC(VarsFlags * param0); +BOOL sub_0206B024(VarsFlags *param0, u16 param1); +u16 sub_0206B034(VarsFlags *param0); +BOOL sub_0206B044(VarsFlags *param0, u16 param1); +u16 sub_0206B054(VarsFlags *param0); +u16 sub_0206B064(VarsFlags *param0); +u16 sub_0206B08C(VarsFlags *param0); +u16 sub_0206B0B4(VarsFlags *param0); +BOOL sub_0206B0C4(VarsFlags *param0, u16 param1); +void VsSeeker_Reset(VarsFlags *param0); +u16 VsSeeker_GetBattery(VarsFlags *param0); +BOOL VsSeeker_SetBattery(VarsFlags *param0, u16 param1); +u16 VsSeeker_GetActiveStepCount(VarsFlags *param0); +BOOL VsSeeker_SetActiveStepCount(VarsFlags *param0, u16 param1); +void sub_0206B144(VarsFlags *param0, int param1); +BOOL sub_0206B16C(VarsFlags *param0, int param1); +void sub_0206B1B0(VarsFlags *param0, int param1); +void sub_0206B1D8(VarsFlags *param0, int param1); +BOOL sub_0206B1F0(VarsFlags *param0, int param1); +BOOL sub_0206B218(VarsFlags *param0); +u16 sub_0206B228(VarsFlags *param0); +BOOL sub_0206B238(VarsFlags *param0); +u16 sub_0206B260(VarsFlags *param0); +BOOL sub_0206B270(VarsFlags *param0, u16 param1); +void sub_0206B280(VarsFlags *param0, u32 param1); +u32 sub_0206B2A4(VarsFlags *param0); +void sub_0206B2C8(VarsFlags *param0); +void sub_0206B2E4(SaveData *param0, u16 param1); +u16 sub_0206B314(VarsFlags *param0); +BOOL sub_0206B324(VarsFlags *param0, u16 param1); +void sub_0206B334(SaveData *param0); +u16 sub_0206B354(VarsFlags *param0); +BOOL sub_0206B364(VarsFlags *param0, u16 param1); +u16 sub_0206B374(VarsFlags *param0); +BOOL sub_0206B384(VarsFlags *param0, u16 param1); +u16 sub_0206B394(VarsFlags *param0); +BOOL sub_0206B3A4(VarsFlags *param0, u16 param1); +BOOL sub_0206B3B4(VarsFlags *param0); +u16 sub_0206B3DC(VarsFlags *param0); +u16 sub_0206B3EC(VarsFlags *param0); +BOOL sub_0206B3FC(VarsFlags *param0, u16 param1); +u16 sub_0206B40C(VarsFlags *param0); +BOOL sub_0206B41C(VarsFlags *param0, u16 param1); +u16 sub_0206B42C(VarsFlags *param0); +BOOL sub_0206B43C(VarsFlags *param0, u16 param1); +u16 sub_0206B44C(VarsFlags *param0); +void sub_0206B45C(VarsFlags *param0, u16 param1); +void sub_0206B46C(VarsFlags *param0, u16 param1); +u16 sub_0206B47C(VarsFlags *param0); +void sub_0206B48C(VarsFlags *param0, u16 param1); +void sub_0206B514(SaveData *param0); +void sub_0206B558(VarsFlags *param0, u16 param1); +u16 sub_0206B588(VarsFlags *param0); +u16 sub_0206B598(VarsFlags *param0); +u16 sub_0206B5A8(VarsFlags *param0); +u16 sub_0206B5B8(VarsFlags *param0); +u16 sub_0206B5C8(VarsFlags *param0); +u16 sub_0206B5D8(VarsFlags *param0); +void sub_0206B5E8(VarsFlags *param0, u16 param1); +u16 sub_0206B5F8(VarsFlags *param0); +void sub_0206B608(VarsFlags *param0, u16 param1); +u16 sub_0206B618(VarsFlags *param0); +void sub_0206B628(VarsFlags *param0, u16 param1); +void sub_0206B638(VarsFlags *param0, u16 param1); +void sub_0206B648(VarsFlags *param0, u16 param1); +void sub_0206B658(VarsFlags *param0, u16 param1); +void sub_0206B668(VarsFlags *param0, u16 param1); +void sub_0206B678(VarsFlags *param0, u16 param1); +void sub_0206B688(VarsFlags *param0, u16 param1, u16 param2); +u16 sub_0206B6DC(VarsFlags *param0); +void sub_0206B6EC(VarsFlags *param0, u16 param1); +u16 sub_0206B6FC(VarsFlags *param0); #endif // POKEPLATINUM_UNK_0206AFE0_H diff --git a/include/unk_0206B70C.h b/include/unk_0206B70C.h index 55d4776cd9..99c005e213 100644 --- a/include/unk_0206B70C.h +++ b/include/unk_0206B70C.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_UNK_0206B70C_H #define POKEPLATINUM_UNK_0206B70C_H -#include "field/field_system_decl.h" #include "struct_defs/struct_0203D8AC.h" -void sub_0206B70C(FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1, int param2); +#include "field/field_system_decl.h" + +void sub_0206B70C(FieldSystem *fieldSystem, UnkStruct_0203D8AC *param1, int param2); #endif // POKEPLATINUM_UNK_0206B70C_H diff --git a/include/unk_0206B9D8.h b/include/unk_0206B9D8.h index 022d8df206..eee48f2b60 100644 --- a/include/unk_0206B9D8.h +++ b/include/unk_0206B9D8.h @@ -1,20 +1,22 @@ #ifndef POKEPLATINUM_UNK_0206B9D8_H #define POKEPLATINUM_UNK_0206B9D8_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" + +#include "field/field_system_decl.h" + #include "savedata.h" -void sub_0206BBFC(TaskManager * param0, void ** param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7); -void sub_0206BCE4(TaskManager * param0, u16 param1, u16 param2, u16 param3); -void sub_0206BD88(TaskManager * param0, u16 param1, u16 param2); -u16 sub_0206BDBC(SaveData * param0); -u16 sub_0206BF04(SaveData * param0); +void sub_0206BBFC(TaskManager *param0, void **param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7); +void sub_0206BCE4(TaskManager *param0, u16 param1, u16 param2, u16 param3); +void sub_0206BD88(TaskManager *param0, u16 param1, u16 param2); +u16 sub_0206BDBC(SaveData *param0); +u16 sub_0206BF04(SaveData *param0); u32 sub_0206BFF0(u32 param0); u32 sub_0206BFFC(u32 param0); -u32 sub_0206C008(SaveData * param0); -u32 sub_0206C02C(SaveData * param0); -u32 sub_0206C068(SaveData * param0); -BOOL sub_0206C0D0(FieldSystem * fieldSystem); +u32 sub_0206C008(SaveData *param0); +u32 sub_0206C02C(SaveData *param0); +u32 sub_0206C068(SaveData *param0); +BOOL sub_0206C0D0(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_0206B9D8_H diff --git a/include/unk_0206C0E8.h b/include/unk_0206C0E8.h index 8ae7de683c..e09b018d95 100644 --- a/include/unk_0206C0E8.h +++ b/include/unk_0206C0E8.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void sub_0206C0E8(FieldSystem * fieldSystem); +void sub_0206C0E8(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_0206C0E8_H diff --git a/include/unk_0206C2D0.h b/include/unk_0206C2D0.h index aa122eb768..73346baa41 100644 --- a/include/unk_0206C2D0.h +++ b/include/unk_0206C2D0.h @@ -3,6 +3,6 @@ #include "savedata.h" -void sub_0206C2D0(SaveData * param0, const s32 param1); +void sub_0206C2D0(SaveData *param0, const s32 param1); #endif // POKEPLATINUM_UNK_0206C2D0_H diff --git a/include/unk_0206C660.h b/include/unk_0206C660.h index 4401af0bf2..cd698b2012 100644 --- a/include/unk_0206C660.h +++ b/include/unk_0206C660.h @@ -2,8 +2,9 @@ #define POKEPLATINUM_UNK_0206C660_H #include "struct_decls/struct_020508D4_decl.h" + #include "overlay006/struct_ov6_02246204_decl.h" -void sub_0206C740(TaskManager * param0, UnkStruct_ov6_02246204 * param1, int param2, u32 param3); +void sub_0206C740(TaskManager *param0, UnkStruct_ov6_02246204 *param1, int param2, u32 param3); #endif // POKEPLATINUM_UNK_0206C660_H diff --git a/include/unk_0206C784.h b/include/unk_0206C784.h index 512a4c826d..40a0a05874 100644 --- a/include/unk_0206C784.h +++ b/include/unk_0206C784.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void sub_0206C784(FieldSystem * fieldSystem, const u8 param1, const u8 param2, const int param3, const int param4, const int param5); +void sub_0206C784(FieldSystem *fieldSystem, const u8 param1, const u8 param2, const int param3, const int param4, const int param5); #endif // POKEPLATINUM_UNK_0206C784_H diff --git a/include/unk_0206CCB0.h b/include/unk_0206CCB0.h index 106570998a..da5782025a 100644 --- a/include/unk_0206CCB0.h +++ b/include/unk_0206CCB0.h @@ -1,74 +1,76 @@ #ifndef POKEPLATINUM_UNK_0206CCB0_H #define POKEPLATINUM_UNK_0206CCB0_H -#include "string_template.h" #include "struct_decls/struct_0202440C_decl.h" -#include "trainer_info.h" -#include "field/field_system_decl.h" #include "struct_decls/struct_0206D140_decl.h" + +#include "field/field_system_decl.h" +#include "overlay006/struct_ov6_022465F4_decl.h" + #include "pokemon.h" #include "savedata.h" -#include "overlay006/struct_ov6_022465F4_decl.h" +#include "string_template.h" +#include "trainer_info.h" -int sub_0206CD00(int param0, FieldSystem * fieldSystem, StringTemplate * param2, UnkStruct_ov6_022465F4 * param3, u16 * param4); -BOOL sub_0206CD2C(int param0, FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param2); -void sub_0206CF14(TVBroadcast * param0, Pokemon * param1, int param2, int param3, int param4); -void sub_0206CF48(TVBroadcast * param0, Pokemon * param1, int param2); -void sub_0206CF9C(TVBroadcast * param0, int param1); -void sub_0206CFB4(TVBroadcast * param0, int param1); -void sub_0206CFCC(TVBroadcast * param0, int param1); -void sub_0206CFE4(TVBroadcast * param0, BOOL param1, u16 param2); -void sub_0206D000(TVBroadcast * param0); -void sub_0206D018(TVBroadcast * param0, Pokemon * param1); -void sub_0206D048(TVBroadcast * param0, Pokemon * param1); -void sub_0206D088(TVBroadcast * param0, u8 param1, const TrainerInfo * param2); -void sub_0206D0C8(TVBroadcast * param0, u16 param1); -void sub_0206D0F0(TVBroadcast * param0); -void sub_0206D104(TVBroadcast * param0); -void sub_0206D12C(TVBroadcast * param0); -UnkStruct_0206D140 * sub_0206D140(int param0); -void sub_0206D158(UnkStruct_0206D140 * param0); -void sub_0206D160(UnkStruct_0206D140 * param0, Pokemon * param1, int param2, int param3, u32 param4); -void sub_0206D1B8(FieldSystem * fieldSystem, const UnkStruct_0206D140 * param1, int param2); -void sub_0206D340(FieldSystem * fieldSystem, BOOL param1, u16 param2, Pokemon * param3); -void sub_0206D424(FieldSystem * fieldSystem); -void sub_0206D430(FieldSystem * fieldSystem); -void sub_0206D4AC(FieldSystem * fieldSystem, u16 param1); -void sub_0206D504(SaveData * param0, u16 param1, u8 param2); -void sub_0206D578(FieldSystem * fieldSystem, Pokemon * param1); -void sub_0206D60C(FieldSystem * fieldSystem, Pokemon * param1); -void sub_0206D6C8(FieldSystem * fieldSystem, int param1, int param2); -void sub_0206D720(FieldSystem * fieldSystem); -void sub_0206D7C4(FieldSystem * fieldSystem); -void sub_0206D90C(TVBroadcast * param0, Pokemon * param1, u16 param2); -void sub_0206D914(FieldSystem * fieldSystem, u16 param1, u8 param2, u16 param3); -void sub_0206D9B4(TVBroadcast * param0, Pokemon * param1, u8 param2); -void sub_0206DAB8(FieldSystem * fieldSystem, const TrainerInfo * param1); -void sub_0206DAD4(FieldSystem * fieldSystem, const TrainerInfo * param1); -void sub_0206DB20(FieldSystem * fieldSystem); -void sub_0206DB5C(FieldSystem * fieldSystem, u8 param1); -void sub_0206DBB0(SaveData * param0, u32 param1, Pokemon * param2, BOOL param3); -void sub_0206DC6C(FieldSystem * fieldSystem, u32 param1, Pokemon * param2); -void sub_0206DD38(FieldSystem * fieldSystem, u32 param1, u32 param2, u32 param3); -void sub_0206DDB8(SaveData * param0, Pokemon * param1, u32 param2); -void sub_0206DEEC(FieldSystem * fieldSystem, u16 param1, u16 param2); -void sub_0206DF60(FieldSystem * fieldSystem, u16 param1); -void sub_0206DFE0(SaveData * param0); -void sub_0206E060(SaveData * param0); -void sub_0206E0E0(FieldSystem * fieldSystem, u16 param1); -void sub_0206E174(FieldSystem * fieldSystem, u16 param1); -void sub_0206E264(FieldSystem * fieldSystem, u16 param1); -void sub_0206E2BC(FieldSystem * fieldSystem, u16 param1); -void sub_0206E398(FieldSystem * fieldSystem, u16 param1); -void sub_0206E414(FieldSystem * fieldSystem, u16 param1); -void sub_0206E448(FieldSystem * fieldSystem, u16 param1); -void sub_0206E4DC(FieldSystem * fieldSystem, u16 param1); -void sub_0206E5A0(FieldSystem * fieldSystem, u16 param1); -void sub_0206E668(FieldSystem * fieldSystem, u16 param1); -void sub_0206E6A8(FieldSystem * fieldSystem, u16 param1); -void sub_0206E6E8(FieldSystem * fieldSystem, u16 param1); -void sub_0206E728(FieldSystem * fieldSystem, u16 param1); -void sub_0206E768(FieldSystem * fieldSystem, u16 param1); -void sub_0206F2F0(SaveData * param0); +int sub_0206CD00(int param0, FieldSystem *fieldSystem, StringTemplate *param2, UnkStruct_ov6_022465F4 *param3, u16 *param4); +BOOL sub_0206CD2C(int param0, FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param2); +void sub_0206CF14(TVBroadcast *param0, Pokemon *param1, int param2, int param3, int param4); +void sub_0206CF48(TVBroadcast *param0, Pokemon *param1, int param2); +void sub_0206CF9C(TVBroadcast *param0, int param1); +void sub_0206CFB4(TVBroadcast *param0, int param1); +void sub_0206CFCC(TVBroadcast *param0, int param1); +void sub_0206CFE4(TVBroadcast *param0, BOOL param1, u16 param2); +void sub_0206D000(TVBroadcast *param0); +void sub_0206D018(TVBroadcast *param0, Pokemon *param1); +void sub_0206D048(TVBroadcast *param0, Pokemon *param1); +void sub_0206D088(TVBroadcast *param0, u8 param1, const TrainerInfo *param2); +void sub_0206D0C8(TVBroadcast *param0, u16 param1); +void sub_0206D0F0(TVBroadcast *param0); +void sub_0206D104(TVBroadcast *param0); +void sub_0206D12C(TVBroadcast *param0); +UnkStruct_0206D140 *sub_0206D140(int param0); +void sub_0206D158(UnkStruct_0206D140 *param0); +void sub_0206D160(UnkStruct_0206D140 *param0, Pokemon *param1, int param2, int param3, u32 param4); +void sub_0206D1B8(FieldSystem *fieldSystem, const UnkStruct_0206D140 *param1, int param2); +void sub_0206D340(FieldSystem *fieldSystem, BOOL param1, u16 param2, Pokemon *param3); +void sub_0206D424(FieldSystem *fieldSystem); +void sub_0206D430(FieldSystem *fieldSystem); +void sub_0206D4AC(FieldSystem *fieldSystem, u16 param1); +void sub_0206D504(SaveData *param0, u16 param1, u8 param2); +void sub_0206D578(FieldSystem *fieldSystem, Pokemon *param1); +void sub_0206D60C(FieldSystem *fieldSystem, Pokemon *param1); +void sub_0206D6C8(FieldSystem *fieldSystem, int param1, int param2); +void sub_0206D720(FieldSystem *fieldSystem); +void sub_0206D7C4(FieldSystem *fieldSystem); +void sub_0206D90C(TVBroadcast *param0, Pokemon *param1, u16 param2); +void sub_0206D914(FieldSystem *fieldSystem, u16 param1, u8 param2, u16 param3); +void sub_0206D9B4(TVBroadcast *param0, Pokemon *param1, u8 param2); +void sub_0206DAB8(FieldSystem *fieldSystem, const TrainerInfo *param1); +void sub_0206DAD4(FieldSystem *fieldSystem, const TrainerInfo *param1); +void sub_0206DB20(FieldSystem *fieldSystem); +void sub_0206DB5C(FieldSystem *fieldSystem, u8 param1); +void sub_0206DBB0(SaveData *param0, u32 param1, Pokemon *param2, BOOL param3); +void sub_0206DC6C(FieldSystem *fieldSystem, u32 param1, Pokemon *param2); +void sub_0206DD38(FieldSystem *fieldSystem, u32 param1, u32 param2, u32 param3); +void sub_0206DDB8(SaveData *param0, Pokemon *param1, u32 param2); +void sub_0206DEEC(FieldSystem *fieldSystem, u16 param1, u16 param2); +void sub_0206DF60(FieldSystem *fieldSystem, u16 param1); +void sub_0206DFE0(SaveData *param0); +void sub_0206E060(SaveData *param0); +void sub_0206E0E0(FieldSystem *fieldSystem, u16 param1); +void sub_0206E174(FieldSystem *fieldSystem, u16 param1); +void sub_0206E264(FieldSystem *fieldSystem, u16 param1); +void sub_0206E2BC(FieldSystem *fieldSystem, u16 param1); +void sub_0206E398(FieldSystem *fieldSystem, u16 param1); +void sub_0206E414(FieldSystem *fieldSystem, u16 param1); +void sub_0206E448(FieldSystem *fieldSystem, u16 param1); +void sub_0206E4DC(FieldSystem *fieldSystem, u16 param1); +void sub_0206E5A0(FieldSystem *fieldSystem, u16 param1); +void sub_0206E668(FieldSystem *fieldSystem, u16 param1); +void sub_0206E6A8(FieldSystem *fieldSystem, u16 param1); +void sub_0206E6E8(FieldSystem *fieldSystem, u16 param1); +void sub_0206E728(FieldSystem *fieldSystem, u16 param1); +void sub_0206E768(FieldSystem *fieldSystem, u16 param1); +void sub_0206F2F0(SaveData *param0); #endif // POKEPLATINUM_UNK_0206CCB0_H diff --git a/include/unk_0206F314.h b/include/unk_0206F314.h index b89c949aa0..c67bd29e80 100644 --- a/include/unk_0206F314.h +++ b/include/unk_0206F314.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -void sub_020703FC(TaskManager * param0, u16 param1); +void sub_020703FC(TaskManager *param0, u16 param1); #endif // POKEPLATINUM_UNK_0206F314_H diff --git a/include/unk_02070428.h b/include/unk_02070428.h index 85eeae3d3e..5ca458531f 100644 --- a/include/unk_02070428.h +++ b/include/unk_02070428.h @@ -3,13 +3,13 @@ #include "field/field_system_decl.h" -void sub_02070428(FieldSystem * fieldSystem, BOOL param1); -void FieldSystem_InitFlagsOnMapChange(FieldSystem * fieldSystem); -void FieldSystem_InitFlagsWarp(FieldSystem * fieldSystem); -void sub_0207056C(FieldSystem * fieldSystem); -void sub_02070588(FieldSystem * fieldSystem); -void sub_020705A4(FieldSystem * fieldSystem); -void sub_020705B4(FieldSystem * fieldSystem); -void sub_020705CC(FieldSystem * fieldSystem); +void sub_02070428(FieldSystem *fieldSystem, BOOL param1); +void FieldSystem_InitFlagsOnMapChange(FieldSystem *fieldSystem); +void FieldSystem_InitFlagsWarp(FieldSystem *fieldSystem); +void sub_0207056C(FieldSystem *fieldSystem); +void sub_02070588(FieldSystem *fieldSystem); +void sub_020705A4(FieldSystem *fieldSystem); +void sub_020705B4(FieldSystem *fieldSystem); +void sub_020705CC(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_02070428_H diff --git a/include/unk_0207064C.h b/include/unk_0207064C.h index a211a93cc4..cf7b1f5dcc 100644 --- a/include/unk_0207064C.h +++ b/include/unk_0207064C.h @@ -1,11 +1,13 @@ #ifndef POKEPLATINUM_UNK_0207064C_H #define POKEPLATINUM_UNK_0207064C_H -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" + +#include "field/field_system_decl.h" + #include "pokemon.h" -void * sub_0207064C(u32 param0, FieldSystem * fieldSystem, Pokemon * param2, u16 param3, s16 param4, s16 param5); -BOOL sub_02070680(TaskManager * param0); +void *sub_0207064C(u32 param0, FieldSystem *fieldSystem, Pokemon *param2, u16 param3, s16 param4, s16 param5); +BOOL sub_02070680(TaskManager *param0); #endif // POKEPLATINUM_UNK_0207064C_H diff --git a/include/unk_0207070C.h b/include/unk_0207070C.h index 9c05d78aa8..90d8bfc0d0 100644 --- a/include/unk_0207070C.h +++ b/include/unk_0207070C.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_UNK_0207070C_H #define POKEPLATINUM_UNK_0207070C_H -#include "field/field_system_decl.h" #include "struct_decls/struct_02070950_decl.h" +#include "field/field_system_decl.h" + u32 sub_0207070C(u16 param0, u16 param1); -void sub_02070728(FieldSystem * fieldSystem, UnkStruct_02070950 * param1); +void sub_02070728(FieldSystem *fieldSystem, UnkStruct_02070950 *param1); #endif // POKEPLATINUM_UNK_0207070C_H diff --git a/include/unk_020711C8.h b/include/unk_020711C8.h index c906f5d5ca..d98f449574 100644 --- a/include/unk_020711C8.h +++ b/include/unk_020711C8.h @@ -2,8 +2,9 @@ #define POKEPLATINUM_UNK_020711C8_H #include "struct_defs/struct_020711C8.h" + #include "savedata.h" -UnkStruct_020711C8 * sub_020711C8(const int param0, const u8 param1, SaveData * param2); +UnkStruct_020711C8 *sub_020711C8(const int param0, const u8 param1, SaveData *param2); #endif // POKEPLATINUM_UNK_020711C8_H diff --git a/include/unk_020711EC.h b/include/unk_020711EC.h index bbde6971ef..2a7cdb1baa 100644 --- a/include/unk_020711EC.h +++ b/include/unk_020711EC.h @@ -1,8 +1,11 @@ #ifndef POKEPLATINUM_UNK_020711EC_H #define POKEPLATINUM_UNK_020711EC_H +#include + #include "struct_decls/struct_020711EC_decl.h" #include "struct_defs/struct_02071330.h" + #include "functypes/funcptr_02071330.h" #include "functypes/funcptr_02071330_1.h" #include "functypes/funcptr_02071330_2.h" @@ -12,40 +15,38 @@ #include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include - -UnkStruct_020711EC * sub_020711EC(int param0, int param1); -void sub_0207120C(UnkStruct_020711EC * param0); -void sub_0207121C(UnkStruct_020711EC * param0); -UnkStruct_ov101_021D5D90 * sub_0207122C(UnkStruct_020711EC * param0, const UnkStruct_02071330 * param1, const VecFx32 * param2, int param3, const void * param4, int param5); -UnkStruct_ov101_021D5D90 * sub_02071330(UnkStruct_020711EC * param0, const UnkStruct_ov101_021D86B0 * param1, const VecFx32 * param2, int param3, const void * param4, int param5); -void sub_0207136C(UnkStruct_ov101_021D5D90 * param0); -void sub_020713A4(UnkStruct_020711EC * param0); -void sub_020713D0(UnkStruct_020711EC * param0); -int sub_020714F0(const UnkStruct_ov101_021D5D90 * param0); -void sub_02071518(UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330 param1); -int sub_02071520(UnkStruct_ov101_021D5D90 * param0); -void sub_02071534(UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330_2 param1); -void sub_0207153C(UnkStruct_ov101_021D5D90 * param0); -void sub_02071550(UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330_3 param1); -void sub_02071558(UnkStruct_ov101_021D5D90 * param0); -void sub_0207156C(UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330_1 param1); -void sub_02071574(UnkStruct_ov101_021D5D90 * param0); -void sub_02071588(UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330_4 param1); -void sub_02071590(UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330_5 param1); -void * sub_02071598(UnkStruct_ov101_021D5D90 * param0); -void sub_0207159C(UnkStruct_ov101_021D5D90 * param0, int param1); -int sub_020715B4(const UnkStruct_ov101_021D5D90 * param0); -const void * sub_020715BC(const UnkStruct_ov101_021D5D90 * param0); -void sub_020715C0(UnkStruct_ov101_021D5D90 * param0, int param1); -int sub_020715C4(const UnkStruct_ov101_021D5D90 * param0); -void sub_020715D4(UnkStruct_ov101_021D5D90 * param0, const VecFx32 * param1); -void sub_020715E4(UnkStruct_ov101_021D5D90 * param0, VecFx32 * param1); -int sub_020715F4(UnkStruct_ov101_021D5D90 * param0, void * param1); -void sub_020715F8(UnkStruct_ov101_021D5D90 * param0, void * param1); -void sub_020715FC(UnkStruct_ov101_021D5D90 * param0, void * param1); -void sub_02071600(UnkStruct_ov101_021D5D90 * param0, void * param1); -void sub_02071604(UnkStruct_ov101_021D5D90 * param0, void * param1); -void sub_02071608(UnkStruct_ov101_021D5D90 * param0, void * param1); +UnkStruct_020711EC *sub_020711EC(int param0, int param1); +void sub_0207120C(UnkStruct_020711EC *param0); +void sub_0207121C(UnkStruct_020711EC *param0); +UnkStruct_ov101_021D5D90 *sub_0207122C(UnkStruct_020711EC *param0, const UnkStruct_02071330 *param1, const VecFx32 *param2, int param3, const void *param4, int param5); +UnkStruct_ov101_021D5D90 *sub_02071330(UnkStruct_020711EC *param0, const UnkStruct_ov101_021D86B0 *param1, const VecFx32 *param2, int param3, const void *param4, int param5); +void sub_0207136C(UnkStruct_ov101_021D5D90 *param0); +void sub_020713A4(UnkStruct_020711EC *param0); +void sub_020713D0(UnkStruct_020711EC *param0); +int sub_020714F0(const UnkStruct_ov101_021D5D90 *param0); +void sub_02071518(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330 param1); +int sub_02071520(UnkStruct_ov101_021D5D90 *param0); +void sub_02071534(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330_2 param1); +void sub_0207153C(UnkStruct_ov101_021D5D90 *param0); +void sub_02071550(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330_3 param1); +void sub_02071558(UnkStruct_ov101_021D5D90 *param0); +void sub_0207156C(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330_1 param1); +void sub_02071574(UnkStruct_ov101_021D5D90 *param0); +void sub_02071588(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330_4 param1); +void sub_02071590(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330_5 param1); +void *sub_02071598(UnkStruct_ov101_021D5D90 *param0); +void sub_0207159C(UnkStruct_ov101_021D5D90 *param0, int param1); +int sub_020715B4(const UnkStruct_ov101_021D5D90 *param0); +const void *sub_020715BC(const UnkStruct_ov101_021D5D90 *param0); +void sub_020715C0(UnkStruct_ov101_021D5D90 *param0, int param1); +int sub_020715C4(const UnkStruct_ov101_021D5D90 *param0); +void sub_020715D4(UnkStruct_ov101_021D5D90 *param0, const VecFx32 *param1); +void sub_020715E4(UnkStruct_ov101_021D5D90 *param0, VecFx32 *param1); +int sub_020715F4(UnkStruct_ov101_021D5D90 *param0, void *param1); +void sub_020715F8(UnkStruct_ov101_021D5D90 *param0, void *param1); +void sub_020715FC(UnkStruct_ov101_021D5D90 *param0, void *param1); +void sub_02071600(UnkStruct_ov101_021D5D90 *param0, void *param1); +void sub_02071604(UnkStruct_ov101_021D5D90 *param0, void *param1); +void sub_02071608(UnkStruct_ov101_021D5D90 *param0, void *param1); #endif // POKEPLATINUM_UNK_020711EC_H diff --git a/include/unk_0207160C.h b/include/unk_0207160C.h index dcdd39d9a9..00dd8d3d55 100644 --- a/include/unk_0207160C.h +++ b/include/unk_0207160C.h @@ -3,9 +3,9 @@ #include "field/field_system_decl.h" -void sub_0207160C(FieldSystem * fieldSystem); -void sub_020716D4(FieldSystem * fieldSystem); -u8 sub_02071818(FieldSystem * fieldSystem); -void sub_0207183C(FieldSystem * fieldSystem); +void sub_0207160C(FieldSystem *fieldSystem); +void sub_020716D4(FieldSystem *fieldSystem); +u8 sub_02071818(FieldSystem *fieldSystem); +void sub_0207183C(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_0207160C_H diff --git a/include/unk_02071B10.h b/include/unk_02071B10.h index 2c0b22bef4..8b24b36728 100644 --- a/include/unk_02071B10.h +++ b/include/unk_02071B10.h @@ -3,14 +3,14 @@ #include "field/field_system_decl.h" -void sub_02071B10(FieldSystem * fieldSystem); -void sub_02071B30(FieldSystem * fieldSystem); -void sub_02071B6C(FieldSystem * fieldSystem, const u8 param1); -void sub_02071BD0(FieldSystem * fieldSystem); -void sub_02071BF8(FieldSystem * fieldSystem); -void sub_02071C18(FieldSystem * fieldSystem); -void sub_02071C34(FieldSystem * fieldSystem); -void sub_02071C5C(FieldSystem * fieldSystem); -BOOL sub_02071CB4(FieldSystem * fieldSystem, int param1); +void sub_02071B10(FieldSystem *fieldSystem); +void sub_02071B30(FieldSystem *fieldSystem); +void sub_02071B6C(FieldSystem *fieldSystem, const u8 param1); +void sub_02071BD0(FieldSystem *fieldSystem); +void sub_02071BF8(FieldSystem *fieldSystem); +void sub_02071C18(FieldSystem *fieldSystem); +void sub_02071C34(FieldSystem *fieldSystem); +void sub_02071C5C(FieldSystem *fieldSystem); +BOOL sub_02071CB4(FieldSystem *fieldSystem, int param1); #endif // POKEPLATINUM_UNK_02071B10_H diff --git a/include/unk_02071CD0.h b/include/unk_02071CD0.h index d98b816fae..50d8773e55 100644 --- a/include/unk_02071CD0.h +++ b/include/unk_02071CD0.h @@ -3,6 +3,6 @@ #include "field/field_system_decl.h" -void sub_02071CD0(FieldSystem * fieldSystem); +void sub_02071CD0(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_02071CD0_H diff --git a/include/unk_02071CFC.h b/include/unk_02071CFC.h index 11edbe1db9..97a64863e6 100644 --- a/include/unk_02071CFC.h +++ b/include/unk_02071CFC.h @@ -4,7 +4,7 @@ #include "message.h" #include "strbuf.h" -u32 sub_02071CFC(MessageLoader * param0, const int param1, Strbuf *param2); +u32 sub_02071CFC(MessageLoader *param0, const int param1, Strbuf *param2); void sub_02071D10(const int param0, const u32 param1, Strbuf *param2); #endif // POKEPLATINUM_UNK_02071CFC_H diff --git a/include/unk_02071D40.h b/include/unk_02071D40.h index fb3ee69dc6..513aa5245f 100644 --- a/include/unk_02071D40.h +++ b/include/unk_02071D40.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_UNK_02071D40_H #define POKEPLATINUM_UNK_02071D40_H -#include "field/field_system_decl.h" #include "struct_defs/struct_02072014.h" -void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 param3, FieldSystem * param4, TrainerCard * param5); -TrainerCard * sub_02071F04(const u16 param0); -void sub_02071F20(TrainerCard * param0); -u8 sub_02071F28(FieldSystem * fieldSystem); -void sub_020721D4(FieldSystem * fieldSystem, const TrainerCard * param1); -void sub_02072204(FieldSystem * fieldSystem); +#include "field/field_system_decl.h" + +void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 param3, FieldSystem *param4, TrainerCard *param5); +TrainerCard *sub_02071F04(const u16 param0); +void sub_02071F20(TrainerCard *param0); +u8 sub_02071F28(FieldSystem *fieldSystem); +void sub_020721D4(FieldSystem *fieldSystem, const TrainerCard *param1); +void sub_02072204(FieldSystem *fieldSystem); #endif // POKEPLATINUM_UNK_02071D40_H diff --git a/include/unk_020722AC.h b/include/unk_020722AC.h index 86f17cc2db..6b8e799c6c 100644 --- a/include/unk_020722AC.h +++ b/include/unk_020722AC.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_020508D4_decl.h" -void sub_020722AC(void * param0, int * param1); -void sub_020736D8(TaskManager * param0); +void sub_020722AC(void *param0, int *param1); +void sub_020736D8(TaskManager *param0); #endif // POKEPLATINUM_UNK_020722AC_H diff --git a/include/unk_02073700.h b/include/unk_02073700.h index 6d2c2fcb0b..73e239873a 100644 --- a/include/unk_02073700.h +++ b/include/unk_02073700.h @@ -1,9 +1,10 @@ #ifndef POKEPLATINUM_UNK_02073700_H #define POKEPLATINUM_UNK_02073700_H -#include "savedata.h" #include "overlay096/struct_ov96_0223B450_sub1.h" -void sub_02073700(SaveData * param0, int param1, UnkStruct_ov96_0223B450_sub1 * param2); +#include "savedata.h" + +void sub_02073700(SaveData *param0, int param1, UnkStruct_ov96_0223B450_sub1 *param2); #endif // POKEPLATINUM_UNK_02073700_H diff --git a/include/unk_02073838.h b/include/unk_02073838.h index 6d43e73192..24830ad097 100644 --- a/include/unk_02073838.h +++ b/include/unk_02073838.h @@ -1,51 +1,52 @@ #ifndef POKEPLATINUM_UNK_02073838_H #define POKEPLATINUM_UNK_02073838_H +#include +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" -#include "overlay005/struct_ov5_02201C58.h" -#include -#include +#include "overlay005/struct_ov5_02201C58.h" -void sub_02073838(UnkStruct_02073838 * param0); -void sub_02073848(UnkStruct_02073838 * param0, NNSG3dResFileHeader * param1, u32 param2); -void sub_0207389C(UnkStruct_02073838 * param0, u32 param1, NARC * param2, u32 param3, u32 param4, int param5); -void sub_020738C0(UnkStruct_02073838 * param0); -void sub_020738EC(UnkStruct_02073838 * param0); -void sub_0207390C(UnkStruct_02073838 * param0); -void sub_0207391C(UnkStruct_02073838 * param0); -void sub_0207395C(UnkStruct_02073838 * param0); -void sub_02073974(UnkStruct_02073974 * param0); -void sub_02073980(UnkStruct_02073974 * param0, void * param1, u32 param2); -void sub_02073994(UnkStruct_02073974 * param0, void * param1, u32 param2); -void sub_020739A8(UnkStruct_02073974 * param0, UnkStruct_02073974 * param1, u32 param2); -void sub_020739B4(UnkStruct_02073974 * param0, u32 param1, NARC * param2, u32 param3, u32 param4, int param5); -void sub_020739F0(UnkStruct_02073974 * param0); -void sub_02073A14(UnkStruct_02073974 * param0, const NNSG3dResMdl * param1, u32 param2); -void sub_02073A3C(UnkStruct_02073974 * param0, const UnkStruct_02073838 * param1, u32 param2); -void sub_02073A48(UnkStruct_02073974 * param0, const NNSG3dResMdl * param1, const NNSG3dResTex * param2); -void sub_02073A5C(UnkStruct_02073974 * param0, const UnkStruct_02073838 * param1); -void sub_02073A6C(UnkStruct_02073974 * param0, const UnkStruct_02073838 * param1, UnkStruct_02073974 * param2, u32 param3, u32 param4); -void sub_02073A90(UnkStruct_02073974 * param0); -void sub_02073AA8(UnkStruct_02073974 * param0); -BOOL sub_02073AC0(UnkStruct_02073974 * param0, fx32 param1, int param2); -void sub_02073B20(UnkStruct_02073974 * param0, fx32 param1); -fx32 sub_02073B24(const UnkStruct_02073974 * param0); -fx32 sub_02073B28(const UnkStruct_02073974 * param0); -BOOL sub_02073B40(const UnkStruct_02073974 * param0); -void sub_02073B50(UnkStruct_02073B50 * param0); -void sub_02073B5C(UnkStruct_02073B50 * param0, NNSG3dResMdl * param1); -void sub_02073B70(UnkStruct_02073B50 * param0, UnkStruct_02073838 * param1); -void sub_02073B7C(UnkStruct_02073B50 * param0, NNSG3dAnmObj * param1); -void sub_02073B84(UnkStruct_02073B50 * param0, UnkStruct_02073974 * param1); -void sub_02073B90(UnkStruct_02073B50 * param0, UnkStruct_02073838 * param1, UnkStruct_02073974 * param2); -void sub_02073BA4(UnkStruct_02073B50 * param0, const VecFx32 * param1, const VecFx32 * param2, const MtxFx33 * param3); -void sub_02073BB4(UnkStruct_02073B50 * param0, const VecFx32 * param1); -void sub_02073BC8(UnkStruct_02073B50 * param0, const VecFx32 * param1, const VecFx32 * param2, const UnkStruct_ov5_02201C58 * param3); -void sub_02073BF0(UnkStruct_02073B50 * param0, const VecFx32 * param1, const UnkStruct_ov5_02201C58 * param2); -void sub_02073C1C(UnkStruct_02073B50 * param0, const VecFx32 * param1, const VecFx32 * param2, const MtxFx33 * param3); +void sub_02073838(UnkStruct_02073838 *param0); +void sub_02073848(UnkStruct_02073838 *param0, NNSG3dResFileHeader *param1, u32 param2); +void sub_0207389C(UnkStruct_02073838 *param0, u32 param1, NARC *param2, u32 param3, u32 param4, int param5); +void sub_020738C0(UnkStruct_02073838 *param0); +void sub_020738EC(UnkStruct_02073838 *param0); +void sub_0207390C(UnkStruct_02073838 *param0); +void sub_0207391C(UnkStruct_02073838 *param0); +void sub_0207395C(UnkStruct_02073838 *param0); +void sub_02073974(UnkStruct_02073974 *param0); +void sub_02073980(UnkStruct_02073974 *param0, void *param1, u32 param2); +void sub_02073994(UnkStruct_02073974 *param0, void *param1, u32 param2); +void sub_020739A8(UnkStruct_02073974 *param0, UnkStruct_02073974 *param1, u32 param2); +void sub_020739B4(UnkStruct_02073974 *param0, u32 param1, NARC *param2, u32 param3, u32 param4, int param5); +void sub_020739F0(UnkStruct_02073974 *param0); +void sub_02073A14(UnkStruct_02073974 *param0, const NNSG3dResMdl *param1, u32 param2); +void sub_02073A3C(UnkStruct_02073974 *param0, const UnkStruct_02073838 *param1, u32 param2); +void sub_02073A48(UnkStruct_02073974 *param0, const NNSG3dResMdl *param1, const NNSG3dResTex *param2); +void sub_02073A5C(UnkStruct_02073974 *param0, const UnkStruct_02073838 *param1); +void sub_02073A6C(UnkStruct_02073974 *param0, const UnkStruct_02073838 *param1, UnkStruct_02073974 *param2, u32 param3, u32 param4); +void sub_02073A90(UnkStruct_02073974 *param0); +void sub_02073AA8(UnkStruct_02073974 *param0); +BOOL sub_02073AC0(UnkStruct_02073974 *param0, fx32 param1, int param2); +void sub_02073B20(UnkStruct_02073974 *param0, fx32 param1); +fx32 sub_02073B24(const UnkStruct_02073974 *param0); +fx32 sub_02073B28(const UnkStruct_02073974 *param0); +BOOL sub_02073B40(const UnkStruct_02073974 *param0); +void sub_02073B50(UnkStruct_02073B50 *param0); +void sub_02073B5C(UnkStruct_02073B50 *param0, NNSG3dResMdl *param1); +void sub_02073B70(UnkStruct_02073B50 *param0, UnkStruct_02073838 *param1); +void sub_02073B7C(UnkStruct_02073B50 *param0, NNSG3dAnmObj *param1); +void sub_02073B84(UnkStruct_02073B50 *param0, UnkStruct_02073974 *param1); +void sub_02073B90(UnkStruct_02073B50 *param0, UnkStruct_02073838 *param1, UnkStruct_02073974 *param2); +void sub_02073BA4(UnkStruct_02073B50 *param0, const VecFx32 *param1, const VecFx32 *param2, const MtxFx33 *param3); +void sub_02073BB4(UnkStruct_02073B50 *param0, const VecFx32 *param1); +void sub_02073BC8(UnkStruct_02073B50 *param0, const VecFx32 *param1, const VecFx32 *param2, const UnkStruct_ov5_02201C58 *param3); +void sub_02073BF0(UnkStruct_02073B50 *param0, const VecFx32 *param1, const UnkStruct_ov5_02201C58 *param2); +void sub_02073C1C(UnkStruct_02073B50 *param0, const VecFx32 *param1, const VecFx32 *param2, const MtxFx33 *param3); #endif // POKEPLATINUM_UNK_02073838_H diff --git a/include/unk_020797C8.h b/include/unk_020797C8.h index f7b0d67543..1989987799 100644 --- a/include/unk_020797C8.h +++ b/include/unk_020797C8.h @@ -1,33 +1,34 @@ #ifndef POKEPLATINUM_UNK_020797C8_H #define POKEPLATINUM_UNK_020797C8_H -#include "strbuf.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" -void PCBoxes_Init(PCBoxes * param0); +#include "pokemon.h" +#include "strbuf.h" + +void PCBoxes_Init(PCBoxes *param0); u32 PCBoxes_SaveSize(void); -BOOL sub_02079868(PCBoxes * param0, BoxPokemon * param1); -BOOL sub_020798A0(PCBoxes * param0, u32 param1, BoxPokemon * param2); -BOOL sub_02079914(PCBoxes * param0, u32 param1, u32 param2, BoxPokemon * param3); -void sub_02079968(PCBoxes * param0, u32 param1, u32 param2); -u32 sub_0207999C(const PCBoxes * param0); -u32 PCBoxes_FirstEmptyBox(const PCBoxes * param0); -BOOL sub_020799F0(const PCBoxes * param0, int * param1, int * param2); -u32 sub_02079A50(const PCBoxes * param0); -void sub_02079A94(PCBoxes * param0, u32 param1); -u32 sub_02079AA8(const PCBoxes * param0, u32 param1); -void sub_02079AC4(PCBoxes * param0, u32 param1, u32 param2); -void sub_02079AF4(const PCBoxes * param0, u32 param1, Strbuf *param2); -void sub_02079B24(PCBoxes * param0, u32 param1, const Strbuf *param2); -u32 sub_02079B54(const PCBoxes * param0, u32 param1); -u32 sub_02079B98(const PCBoxes * param0, u32 param1); -u32 sub_02079BEC(const PCBoxes * param0); -u32 sub_02079C08(const PCBoxes * param0, u32 param1, u32 param2, int param3, void * param4); -void sub_02079C50(PCBoxes * param0, u32 param1, u32 param2, int param3, void * param4); -BoxPokemon * sub_02079C9C(const PCBoxes * param0, u32 param1, u32 param2); -void sub_02079CD8(PCBoxes * param0, u32 param1); -BOOL sub_02079CFC(const PCBoxes * param0, u32 param1); -u32 sub_02079D20(const PCBoxes * param0); +BOOL sub_02079868(PCBoxes *param0, BoxPokemon *param1); +BOOL sub_020798A0(PCBoxes *param0, u32 param1, BoxPokemon *param2); +BOOL sub_02079914(PCBoxes *param0, u32 param1, u32 param2, BoxPokemon *param3); +void sub_02079968(PCBoxes *param0, u32 param1, u32 param2); +u32 sub_0207999C(const PCBoxes *param0); +u32 PCBoxes_FirstEmptyBox(const PCBoxes *param0); +BOOL sub_020799F0(const PCBoxes *param0, int *param1, int *param2); +u32 sub_02079A50(const PCBoxes *param0); +void sub_02079A94(PCBoxes *param0, u32 param1); +u32 sub_02079AA8(const PCBoxes *param0, u32 param1); +void sub_02079AC4(PCBoxes *param0, u32 param1, u32 param2); +void sub_02079AF4(const PCBoxes *param0, u32 param1, Strbuf *param2); +void sub_02079B24(PCBoxes *param0, u32 param1, const Strbuf *param2); +u32 sub_02079B54(const PCBoxes *param0, u32 param1); +u32 sub_02079B98(const PCBoxes *param0, u32 param1); +u32 sub_02079BEC(const PCBoxes *param0); +u32 sub_02079C08(const PCBoxes *param0, u32 param1, u32 param2, int param3, void *param4); +void sub_02079C50(PCBoxes *param0, u32 param1, u32 param2, int param3, void *param4); +BoxPokemon *sub_02079C9C(const PCBoxes *param0, u32 param1, u32 param2); +void sub_02079CD8(PCBoxes *param0, u32 param1); +BOOL sub_02079CFC(const PCBoxes *param0, u32 param1); +u32 sub_02079D20(const PCBoxes *param0); #endif // POKEPLATINUM_UNK_020797C8_H diff --git a/include/unk_0207A274.h b/include/unk_0207A274.h index 1adf3b14f4..014c3bd556 100644 --- a/include/unk_0207A274.h +++ b/include/unk_0207A274.h @@ -2,10 +2,11 @@ #define POKEPLATINUM_UNK_0207A274_H #include "struct_decls/pokedexdata_decl.h" + #include "savedata.h" -u32 sub_0207A274(SaveData * param0); -u32 sub_0207A280(const PokedexData * param0); +u32 sub_0207A274(SaveData *param0); +u32 sub_0207A280(const PokedexData *param0); u32 sub_0207A294(u32 param0, u32 param1); #endif // POKEPLATINUM_UNK_0207A274_H diff --git a/include/unk_0207A2A8.h b/include/unk_0207A2A8.h index b80b88b384..0a81399da4 100644 --- a/include/unk_0207A2A8.h +++ b/include/unk_0207A2A8.h @@ -1,15 +1,16 @@ #ifndef POKEPLATINUM_UNK_0207A2A8_H #define POKEPLATINUM_UNK_0207A2A8_H +#include "struct_decls/struct_02098700_decl.h" +#include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0202610C.h" + #include "pokemon.h" -#include "struct_decls/struct_party_decl.h" -#include "struct_decls/struct_02098700_decl.h" -HeightWeightData * sub_0207A2A8(int param0); -void sub_0207A2C0(HeightWeightData * param0); -BOOL sub_0207A2D0(const BattleRegulation * param0, Pokemon * param1, const HeightWeightData * param2); -int sub_0207A3AC(const BattleRegulation * param0, Party * param1, const HeightWeightData * param2, u8 * param3); -int sub_0207A594(const BattleRegulation * param0, Party * param1, const HeightWeightData * param2); +HeightWeightData *sub_0207A2A8(int param0); +void sub_0207A2C0(HeightWeightData *param0); +BOOL sub_0207A2D0(const BattleRegulation *param0, Pokemon *param1, const HeightWeightData *param2); +int sub_0207A3AC(const BattleRegulation *param0, Party *param1, const HeightWeightData *param2, u8 *param3); +int sub_0207A594(const BattleRegulation *param0, Party *param1, const HeightWeightData *param2); #endif // POKEPLATINUM_UNK_0207A2A8_H diff --git a/include/unk_0207A6DC.h b/include/unk_0207A6DC.h index d4b863349e..42e4e3823d 100644 --- a/include/unk_0207A6DC.h +++ b/include/unk_0207A6DC.h @@ -1,26 +1,26 @@ #ifndef POKEPLATINUM_UNK_0207A6DC_H #define POKEPLATINUM_UNK_0207A6DC_H -#include "struct_defs/struct_0207A778.h" #include "struct_decls/battle_system.h" +#include "struct_defs/struct_0207A778.h" -void sub_0207A6DC(void * param0); -void sub_0207A744(void * param0); -void sub_0207A81C(BattleSystem * param0, int param1, int param2, void * param3, u8 param4); -BOOL sub_0207A8F4(UnkStruct_0207A778 * param0, u32 param1); -BOOL sub_0207A960(UnkStruct_0207A778 * param0); -BOOL sub_0207A988(UnkStruct_0207A778 * param0); -BOOL sub_0207A9CC(UnkStruct_0207A778 * param0); -BOOL sub_0207A9F8(UnkStruct_0207A778 * param0); -BOOL sub_0207AA38(UnkStruct_0207A778 * param0); -BOOL sub_0207AA5C(UnkStruct_0207A778 * param0); -BOOL sub_0207AAA0(UnkStruct_0207A778 * param0); -BOOL sub_0207AAC8(UnkStruct_0207A778 * param0); -BOOL sub_0207AAFC(UnkStruct_0207A778 * param0); -BOOL sub_0207AB58(UnkStruct_0207A778 * param0); -BOOL sub_0207AB9C(UnkStruct_0207A778 * param0, int param1); -BOOL sub_0207ABD0(UnkStruct_0207A778 * param0, int param1, int param2); -BOOL sub_0207AC28(UnkStruct_0207A778 * param0, int param1); -BOOL sub_0207AC54(UnkStruct_0207A778 * param0, int param1, int param2); +void sub_0207A6DC(void *param0); +void sub_0207A744(void *param0); +void sub_0207A81C(BattleSystem *param0, int param1, int param2, void *param3, u8 param4); +BOOL sub_0207A8F4(UnkStruct_0207A778 *param0, u32 param1); +BOOL sub_0207A960(UnkStruct_0207A778 *param0); +BOOL sub_0207A988(UnkStruct_0207A778 *param0); +BOOL sub_0207A9CC(UnkStruct_0207A778 *param0); +BOOL sub_0207A9F8(UnkStruct_0207A778 *param0); +BOOL sub_0207AA38(UnkStruct_0207A778 *param0); +BOOL sub_0207AA5C(UnkStruct_0207A778 *param0); +BOOL sub_0207AAA0(UnkStruct_0207A778 *param0); +BOOL sub_0207AAC8(UnkStruct_0207A778 *param0); +BOOL sub_0207AAFC(UnkStruct_0207A778 *param0); +BOOL sub_0207AB58(UnkStruct_0207A778 *param0); +BOOL sub_0207AB9C(UnkStruct_0207A778 *param0, int param1); +BOOL sub_0207ABD0(UnkStruct_0207A778 *param0, int param1, int param2); +BOOL sub_0207AC28(UnkStruct_0207A778 *param0, int param1); +BOOL sub_0207AC54(UnkStruct_0207A778 *param0, int param1, int param2); #endif // POKEPLATINUM_UNK_0207A6DC_H diff --git a/include/unk_0207AE68.h b/include/unk_0207AE68.h index b90ad5a867..59d9614830 100644 --- a/include/unk_0207AE68.h +++ b/include/unk_0207AE68.h @@ -2,16 +2,17 @@ #define POKEPLATINUM_UNK_0207AE68_H #include "struct_decls/pokedexdata_decl.h" -#include "game_options.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "poketch_data.h" -#include "pokemon.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207AE68_decl.h" +#include "struct_decls/struct_party_decl.h" + #include "bag.h" +#include "game_options.h" +#include "pokemon.h" +#include "poketch_data.h" -UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, Options * param3, int param4, PokedexData * param5, Bag * param6, UnkStruct_0202CD88 * param7, PoketchData *poketchData, int param9, int param10, int param11); -BOOL sub_0207B0D0(UnkStruct_0207AE68 * param0); -void sub_0207B0E0(UnkStruct_0207AE68 * param0); +UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, PokedexData *param5, Bag *param6, UnkStruct_0202CD88 *param7, PoketchData *poketchData, int param9, int param10, int param11); +BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0); +void sub_0207B0E0(UnkStruct_0207AE68 *param0); #endif // POKEPLATINUM_UNK_0207AE68_H diff --git a/include/unk_0207C63C.h b/include/unk_0207C63C.h index da90e4e098..c2c4f159cf 100644 --- a/include/unk_0207C63C.h +++ b/include/unk_0207C63C.h @@ -7,13 +7,13 @@ void sub_0207C63C(void); void sub_0207C664(void); -GenericPointerData * sub_0207C690(int param0); +GenericPointerData *sub_0207C690(int param0); void sub_0207C6AC(void); void sub_0207C730(void); void sub_0207C770(void); -UnkStruct_0207C8C4 * sub_0207C894(UnkStruct_0207C894 * param0); -void sub_0207C8C4(UnkStruct_0207C8C4 * param0, int param1); -BOOL sub_0207C8E0(UnkStruct_0207C8C4 * param0); -void sub_0207C8F4(UnkStruct_0207C8C4 * param0); +UnkStruct_0207C8C4 *sub_0207C894(UnkStruct_0207C894 *param0); +void sub_0207C8C4(UnkStruct_0207C8C4 *param0, int param1); +BOOL sub_0207C8E0(UnkStruct_0207C8C4 *param0); +void sub_0207C8F4(UnkStruct_0207C8C4 *param0); #endif // POKEPLATINUM_UNK_0207C63C_H diff --git a/include/unk_0207C908.h b/include/unk_0207C908.h index 75f1686ed2..6f882f5cdd 100644 --- a/include/unk_0207C908.h +++ b/include/unk_0207C908.h @@ -1,34 +1,34 @@ #ifndef POKEPLATINUM_UNK_0207C908_H #define POKEPLATINUM_UNK_0207C908_H +#include + +#include "struct_decls/cell_actor_data.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/cell_actor_data.h" #include "struct_defs/sprite_template.h" -#include - u32 sub_0207C908(int param0); u32 sub_0207C920(void); u32 sub_0207C924(void); u32 sub_0207C928(void); u8 sub_0207C92C(int param0); u32 sub_0207C944(void); -void sub_0207C948(SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); -void sub_0207C97C(SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, u32 param3); -void sub_0207C9B0(PaletteData * param0, int param1, SpriteRenderer * param2, SpriteGfxHandler * param3, NNS_G2D_VRAM_TYPE param4, u32 param5); -void sub_0207C9EC(SpriteRenderer * param0, SpriteGfxHandler * param1, u32 param2, u32 param3); -void sub_0207CA34(SpriteGfxHandler * param0, u32 param1); -void sub_0207CA3C(SpriteGfxHandler * param0, u32 param1); -void sub_0207CA44(SpriteGfxHandler * param0, u32 param1, u32 param2); -CellActorData * sub_0207CA58(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, const SpriteTemplate * param3); -void sub_0207CA88(CellActorData * param0); +void sub_0207C948(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); +void sub_0207C97C(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3); +void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5); +void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3); +void sub_0207CA34(SpriteGfxHandler *param0, u32 param1); +void sub_0207CA3C(SpriteGfxHandler *param0, u32 param1); +void sub_0207CA44(SpriteGfxHandler *param0, u32 param1, u32 param2); +CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3); +void sub_0207CA88(CellActorData *param0); u32 sub_0207CA90(int param0); u8 sub_0207CAA8(int param0); u32 sub_0207CAC0(void); -void sub_0207CAC4(SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); -void sub_0207CAF8(SpriteGfxHandler * param0, u32 param1); -void sub_0207CB00(CellActorData * param0); +void sub_0207CAC4(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4); +void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1); +void sub_0207CB00(CellActorData *param0); #endif // POKEPLATINUM_UNK_0207C908_H diff --git a/include/unk_0207CB08.h b/include/unk_0207CB08.h index 271a6c9321..d3558c1112 100644 --- a/include/unk_0207CB08.h +++ b/include/unk_0207CB08.h @@ -1,25 +1,26 @@ #ifndef POKEPLATINUM_UNK_0207CB08_H #define POKEPLATINUM_UNK_0207CB08_H -#include "strbuf.h" #include "struct_decls/struct_0207CB08_decl.h" + #include "bag.h" #include "savedata.h" +#include "strbuf.h" -UnkStruct_0207CB08 * sub_0207CB08(u8 param0); +UnkStruct_0207CB08 *sub_0207CB08(u8 param0); u32 sub_0207CB20(void); -void sub_0207CB24(UnkStruct_0207CB08 * param0, u8 param1); -void sub_0207CB2C(UnkStruct_0207CB08 * param0, SaveData * param1, u8 param2, void * param3); -void sub_0207CB48(UnkStruct_0207CB08 * param0, BagItem * param1, u8 param2, u8 param3); -void sub_0207CB58(UnkStruct_0207CB08 * param0); -void sub_0207CB6C(UnkStruct_0207CB08 * param0, void * param1); -void sub_0207CB70(UnkStruct_0207CB08 * param0, u8 param1); -void sub_0207CB78(UnkStruct_0207CB08 * param0, u16 param1); -u16 sub_0207CB94(UnkStruct_0207CB08 * param0); -u16 sub_0207CB9C(UnkStruct_0207CB08 * param0); -u8 sub_0207CBA4(UnkStruct_0207CB08 * param0); -u8 sub_0207CBAC(UnkStruct_0207CB08 * param0); -BOOL sub_0207CC10(SaveData * param0, Strbuf *param1, u16 param2, u32 param3); -void sub_0207CD34(void * param0, Strbuf *param1, u16 param2, u32 param3, u32 param4); +void sub_0207CB24(UnkStruct_0207CB08 *param0, u8 param1); +void sub_0207CB2C(UnkStruct_0207CB08 *param0, SaveData *param1, u8 param2, void *param3); +void sub_0207CB48(UnkStruct_0207CB08 *param0, BagItem *param1, u8 param2, u8 param3); +void sub_0207CB58(UnkStruct_0207CB08 *param0); +void sub_0207CB6C(UnkStruct_0207CB08 *param0, void *param1); +void sub_0207CB70(UnkStruct_0207CB08 *param0, u8 param1); +void sub_0207CB78(UnkStruct_0207CB08 *param0, u16 param1); +u16 sub_0207CB94(UnkStruct_0207CB08 *param0); +u16 sub_0207CB9C(UnkStruct_0207CB08 *param0); +u8 sub_0207CBA4(UnkStruct_0207CB08 *param0); +u8 sub_0207CBAC(UnkStruct_0207CB08 *param0); +BOOL sub_0207CC10(SaveData *param0, Strbuf *param1, u16 param2, u32 param3); +void sub_0207CD34(void *param0, Strbuf *param1, u16 param2, u32 param3, u32 param4); #endif // POKEPLATINUM_UNK_0207CB08_H diff --git a/include/unk_0207DA28.h b/include/unk_0207DA28.h index d2ffb9a440..3eb9ce9e94 100644 --- a/include/unk_0207DA28.h +++ b/include/unk_0207DA28.h @@ -3,7 +3,7 @@ #include "struct_decls/struct_020508D4_decl.h" -void sub_0207DDC0(TaskManager * param0); -void sub_0207DDE0(TaskManager * param0, u16 * param1); +void sub_0207DDC0(TaskManager *param0); +void sub_0207DDE0(TaskManager *param0, u16 *param1); #endif // POKEPLATINUM_UNK_0207DA28_H diff --git a/include/unk_0207E060.h b/include/unk_0207E060.h index 4681991dd3..c93e49f27e 100644 --- a/include/unk_0207E060.h +++ b/include/unk_0207E060.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_UNK_0207E060_H #define POKEPLATINUM_UNK_0207E060_H -#include "trainer_info.h" #include "struct_decls/struct_0207E060_decl.h" -UnkStruct_0207E060 * sub_0207E060(const TrainerInfo * param0, u32 param1); -void sub_0207E0B0(UnkStruct_0207E060 * param0); +#include "trainer_info.h" + +UnkStruct_0207E060 *sub_0207E060(const TrainerInfo *param0, u32 param1); +void sub_0207E0B0(UnkStruct_0207E060 *param0); #endif // POKEPLATINUM_UNK_0207E060_H diff --git a/include/unk_0207E0B8.h b/include/unk_0207E0B8.h index 8fe21eb467..5c561e1e5c 100644 --- a/include/unk_0207E0B8.h +++ b/include/unk_0207E0B8.h @@ -3,23 +3,23 @@ #include "struct_defs/struct_0207F248.h" -void sub_0207EA74(GameWindowLayout * param0, int param1); -u8 sub_0207EF04(GameWindowLayout * param0, u8 param1); -u8 sub_0207EF14(GameWindowLayout * param0, u8 param1); -const u16 * sub_0207F248(GameWindowLayout * param0); -void sub_0207F8F8(GameWindowLayout * param0, u8 param1); -void sub_0207FD68(GameWindowLayout * param0, u8 param1); -u8 sub_02080354(GameWindowLayout * param0, u8 param1); -u8 sub_02080404(GameWindowLayout * param0, u8 param1); -u8 sub_02080488(GameWindowLayout * param0, u8 param1); +void sub_0207EA74(GameWindowLayout *param0, int param1); +u8 sub_0207EF04(GameWindowLayout *param0, u8 param1); +u8 sub_0207EF14(GameWindowLayout *param0, u8 param1); +const u16 *sub_0207F248(GameWindowLayout *param0); +void sub_0207F8F8(GameWindowLayout *param0, u8 param1); +void sub_0207FD68(GameWindowLayout *param0, u8 param1); +u8 sub_02080354(GameWindowLayout *param0, u8 param1); +u8 sub_02080404(GameWindowLayout *param0, u8 param1); +u8 sub_02080488(GameWindowLayout *param0, u8 param1); u8 sub_020805D0(u8 param0, u8 param1); u8 GetElementIndex(u16 param0); u32 sub_02081930(void); u32 sub_02081934(void); u32 sub_02081938(void); u32 sub_0208193C(void); -void LoadScreenDataFromNARC(u32 param0, u16 * param1, u16 * param2, u16 * param3); -void LoadOverlay118(GameWindowLayout * param0); -void UnloadOverlay118(GameWindowLayout * param0); +void LoadScreenDataFromNARC(u32 param0, u16 *param1, u16 *param2, u16 *param3); +void LoadOverlay118(GameWindowLayout *param0); +void UnloadOverlay118(GameWindowLayout *param0); #endif // POKEPLATINUM_UNK_0207E0B8_H diff --git a/include/unk_020819DC.h b/include/unk_020819DC.h index 289790be29..9bdd075d4d 100644 --- a/include/unk_020819DC.h +++ b/include/unk_020819DC.h @@ -1,37 +1,38 @@ #ifndef POKEPLATINUM_UNK_020819DC_H #define POKEPLATINUM_UNK_020819DC_H -#include "pokemon.h" #include "struct_defs/struct_0207F248.h" -void sub_02081A24(GameWindowLayout * param0); -void sub_02081B90(GameWindowLayout * param0); -void sub_02081BC0(GameWindowLayout * param0); -void sub_02081CAC(GameWindowLayout * param0, u16 param1, u8 param2); -void sub_02081CF4(GameWindowLayout * param0, const u8 * param1, u8 param2); -void sub_02081E08(GameWindowLayout * param0); -void sub_02081ED8(GameWindowLayout * param0, Pokemon * param1, u32 param2); -void sub_02081F2C(GameWindowLayout * param0, u8 param1); -void sub_02081FFC(GameWindowLayout * param0, u8 param1); -void sub_02082058(GameWindowLayout * param0, u8 param1); -void sub_02082098(GameWindowLayout * param0, u8 param1); -void sub_02082104(GameWindowLayout * param0, u8 param1); -void sub_020821F8(GameWindowLayout * param0, u8 param1); -void sub_020822BC(GameWindowLayout * param0, u8 param1); -void sub_020822F4(GameWindowLayout * param0, u8 param1); -void sub_0208232C(GameWindowLayout * param0, u8 param1); -void sub_020823C4(GameWindowLayout * param0, u8 param1); -void sub_0208245C(GameWindowLayout * param0, u8 param1); -void sub_020824C0(GameWindowLayout * param0, u8 param1); -void sub_02082508(GameWindowLayout * param0, u8 param1); -void sub_020825B4(GameWindowLayout * param0, u8 param1); -void sub_020826E0(GameWindowLayout * param0, u32 param1, u8 param2); -void sub_020826F4(GameWindowLayout * param0, u32 param1, u8 param2); -void sub_02082708(GameWindowLayout * param0, u32 param1, u8 param2); -void sub_0208274C(GameWindowLayout * param0); -void sub_020827EC(GameWindowLayout * param0); -void sub_020829DC(GameWindowLayout * param0); -void sub_02082B58(GameWindowLayout * param0); -void sub_02082C10(GameWindowLayout * param0); +#include "pokemon.h" + +void sub_02081A24(GameWindowLayout *param0); +void sub_02081B90(GameWindowLayout *param0); +void sub_02081BC0(GameWindowLayout *param0); +void sub_02081CAC(GameWindowLayout *param0, u16 param1, u8 param2); +void sub_02081CF4(GameWindowLayout *param0, const u8 *param1, u8 param2); +void sub_02081E08(GameWindowLayout *param0); +void sub_02081ED8(GameWindowLayout *param0, Pokemon *param1, u32 param2); +void sub_02081F2C(GameWindowLayout *param0, u8 param1); +void sub_02081FFC(GameWindowLayout *param0, u8 param1); +void sub_02082058(GameWindowLayout *param0, u8 param1); +void sub_02082098(GameWindowLayout *param0, u8 param1); +void sub_02082104(GameWindowLayout *param0, u8 param1); +void sub_020821F8(GameWindowLayout *param0, u8 param1); +void sub_020822BC(GameWindowLayout *param0, u8 param1); +void sub_020822F4(GameWindowLayout *param0, u8 param1); +void sub_0208232C(GameWindowLayout *param0, u8 param1); +void sub_020823C4(GameWindowLayout *param0, u8 param1); +void sub_0208245C(GameWindowLayout *param0, u8 param1); +void sub_020824C0(GameWindowLayout *param0, u8 param1); +void sub_02082508(GameWindowLayout *param0, u8 param1); +void sub_020825B4(GameWindowLayout *param0, u8 param1); +void sub_020826E0(GameWindowLayout *param0, u32 param1, u8 param2); +void sub_020826F4(GameWindowLayout *param0, u32 param1, u8 param2); +void sub_02082708(GameWindowLayout *param0, u32 param1, u8 param2); +void sub_0208274C(GameWindowLayout *param0); +void sub_020827EC(GameWindowLayout *param0); +void sub_020829DC(GameWindowLayout *param0); +void sub_02082B58(GameWindowLayout *param0); +void sub_02082C10(GameWindowLayout *param0); #endif // POKEPLATINUM_UNK_020819DC_H diff --git a/include/unk_02082C2C.h b/include/unk_02082C2C.h index 51a2903775..6dd6da9cbe 100644 --- a/include/unk_02082C2C.h +++ b/include/unk_02082C2C.h @@ -4,21 +4,21 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_defs/struct_0207F248.h" -void sub_02082C2C(GameWindowLayout * param0); -void sub_02082CEC(GameWindowLayout * param0, u8 param1, u16 param2, u16 param3, NARC * param4); -void sub_02082DA8(GameWindowLayout * param0, u8 param1); -void sub_02082E58(GameWindowLayout * param0); -void sub_02082FAC(GameWindowLayout * param0, u8 param1, u16 param2, u16 param3); -void sub_02082FF4(GameWindowLayout * param0); -void sub_02083014(GameWindowLayout * param0, u8 param1, u8 param2); -void sub_02083040(GameWindowLayout * param0, u8 param1, u16 param2); -void sub_02083080(GameWindowLayout * param0, u8 param1); -void sub_020830A0(GameWindowLayout * param0, u8 param1, s16 param2, s16 param3); -void sub_020830D4(GameWindowLayout * param0, u8 param1); -void sub_02083104(GameWindowLayout * param0, u8 param1); -void sub_020831B4(GameWindowLayout * param0); -void sub_0208327C(GameWindowLayout * param0, u8 param1, u8 param2); -void sub_020832E4(GameWindowLayout * param0, s16 param1, s16 param2); -void sub_02083334(GameWindowLayout * param0); +void sub_02082C2C(GameWindowLayout *param0); +void sub_02082CEC(GameWindowLayout *param0, u8 param1, u16 param2, u16 param3, NARC *param4); +void sub_02082DA8(GameWindowLayout *param0, u8 param1); +void sub_02082E58(GameWindowLayout *param0); +void sub_02082FAC(GameWindowLayout *param0, u8 param1, u16 param2, u16 param3); +void sub_02082FF4(GameWindowLayout *param0); +void sub_02083014(GameWindowLayout *param0, u8 param1, u8 param2); +void sub_02083040(GameWindowLayout *param0, u8 param1, u16 param2); +void sub_02083080(GameWindowLayout *param0, u8 param1); +void sub_020830A0(GameWindowLayout *param0, u8 param1, s16 param2, s16 param3); +void sub_020830D4(GameWindowLayout *param0, u8 param1); +void sub_02083104(GameWindowLayout *param0, u8 param1); +void sub_020831B4(GameWindowLayout *param0); +void sub_0208327C(GameWindowLayout *param0, u8 param1, u8 param2); +void sub_020832E4(GameWindowLayout *param0, s16 param1, s16 param2); +void sub_02083334(GameWindowLayout *param0); #endif // POKEPLATINUM_UNK_02082C2C_H diff --git a/include/unk_02083370.h b/include/unk_02083370.h index 4a8fe840d2..202571b63e 100644 --- a/include/unk_02083370.h +++ b/include/unk_02083370.h @@ -4,18 +4,18 @@ #include "struct_defs/struct_0207F248.h" u32 sub_02083370(u8 param0); -void sub_0208337C(GameWindowLayout * param0); -int sub_02083658(GameWindowLayout * param0); -int sub_020836A8(GameWindowLayout * param0); -int sub_020836E4(GameWindowLayout * param0); -int sub_020839BC(GameWindowLayout * param0); -int sub_02083A78(void * param0); -int sub_02083AA4(void * param0); -void sub_02083B88(GameWindowLayout * param0); -void sub_02083BD4(GameWindowLayout * param0); -BOOL sub_02083D1C(GameWindowLayout * param0); -int sub_020845A8(GameWindowLayout * param0); -int sub_02084780(GameWindowLayout * param0); -int sub_02084B34(GameWindowLayout * param0); +void sub_0208337C(GameWindowLayout *param0); +int sub_02083658(GameWindowLayout *param0); +int sub_020836A8(GameWindowLayout *param0); +int sub_020836E4(GameWindowLayout *param0); +int sub_020839BC(GameWindowLayout *param0); +int sub_02083A78(void *param0); +int sub_02083AA4(void *param0); +void sub_02083B88(GameWindowLayout *param0); +void sub_02083BD4(GameWindowLayout *param0); +BOOL sub_02083D1C(GameWindowLayout *param0); +int sub_020845A8(GameWindowLayout *param0); +int sub_02084780(GameWindowLayout *param0); +int sub_02084B34(GameWindowLayout *param0); #endif // POKEPLATINUM_UNK_02083370_H diff --git a/include/unk_02084B70.h b/include/unk_02084B70.h index b3fb1b0ead..58f339bca4 100644 --- a/include/unk_02084B70.h +++ b/include/unk_02084B70.h @@ -1,20 +1,21 @@ #ifndef POKEPLATINUM_UNK_02084B70_H #define POKEPLATINUM_UNK_02084B70_H -#include "pokemon.h" #include "struct_defs/struct_0207F248.h" -void sub_020852B8(GameWindowLayout * param0); -int sub_02085348(void * param0); +#include "pokemon.h" + +void sub_020852B8(GameWindowLayout *param0); +int sub_02085348(void *param0); BOOL sub_020857A8(u16 param0); -int sub_02085804(GameWindowLayout * param0); -int sub_02085EF4(GameWindowLayout * param0); -u8 sub_02086104(GameWindowLayout * param0, Pokemon * param1); -int sub_0208615C(GameWindowLayout * param0); -int sub_020862F8(GameWindowLayout * param0); -int sub_020863A0(GameWindowLayout * param0); -void sub_020866A0(GameWindowLayout * param0, u8 param1); -int sub_02086774(GameWindowLayout * param0); -void sub_020868B0(GameWindowLayout * param0); +int sub_02085804(GameWindowLayout *param0); +int sub_02085EF4(GameWindowLayout *param0); +u8 sub_02086104(GameWindowLayout *param0, Pokemon *param1); +int sub_0208615C(GameWindowLayout *param0); +int sub_020862F8(GameWindowLayout *param0); +int sub_020863A0(GameWindowLayout *param0); +void sub_020866A0(GameWindowLayout *param0, u8 param1); +int sub_02086774(GameWindowLayout *param0); +void sub_020868B0(GameWindowLayout *param0); #endif // POKEPLATINUM_UNK_02084B70_H diff --git a/include/unk_0208694C.h b/include/unk_0208694C.h index 7d6ec741c0..0edffb1550 100644 --- a/include/unk_0208694C.h +++ b/include/unk_0208694C.h @@ -1,10 +1,11 @@ #ifndef POKEPLATINUM_UNK_0208694C_H #define POKEPLATINUM_UNK_0208694C_H -#include "game_options.h" #include "struct_defs/struct_0208737C.h" -UnkStruct_0208737C * sub_0208712C(int param0, int param1, int param2, int param3, Options * param4); -void sub_0208716C(UnkStruct_0208737C * param0); +#include "game_options.h" + +UnkStruct_0208737C *sub_0208712C(int param0, int param1, int param2, int param3, Options *param4); +void sub_0208716C(UnkStruct_0208737C *param0); #endif // POKEPLATINUM_UNK_0208694C_H diff --git a/include/unk_020890F4.h b/include/unk_020890F4.h index df333ed8f1..b7129dc213 100644 --- a/include/unk_020890F4.h +++ b/include/unk_020890F4.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_UNK_020890F4_H #define POKEPLATINUM_UNK_020890F4_H -#include "game_options.h" #include "struct_defs/struct_02089438.h" -UnkStruct_02089438 * sub_020893B4(int param0, int param1, int param2[], Options * param3, u32 param4, u32 param5); -UnkStruct_02089438 * sub_02089400(int param0, int param1, int param2[], Options * param3, u32 param4, u32 param5); -UnkStruct_02089438 * sub_0208941C(int param0, int param1, int param2[], Options * param3, u32 param4, u32 param5, u32 param6, u32 param7); -void sub_02089438(UnkStruct_02089438 * param0); +#include "game_options.h" + +UnkStruct_02089438 *sub_020893B4(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5); +UnkStruct_02089438 *sub_02089400(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5); +UnkStruct_02089438 *sub_0208941C(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5, u32 param6, u32 param7); +void sub_02089438(UnkStruct_02089438 *param0); #endif // POKEPLATINUM_UNK_020890F4_H diff --git a/include/unk_02089604.h b/include/unk_02089604.h index d56baf7309..83a4bf067d 100644 --- a/include/unk_02089604.h +++ b/include/unk_02089604.h @@ -3,22 +3,22 @@ #include "struct_defs/struct_02089688.h" -void sub_02089604(UnkStruct_02089688 * param0, int param1); -void sub_02089688(UnkStruct_02089688 * param0); -void sub_02089808(UnkStruct_02089688 * param0, int param1); -BOOL sub_02089820(UnkStruct_02089688 * param0); -BOOL sub_020898DC(UnkStruct_02089688 * param0); -BOOL sub_02089938(UnkStruct_02089688 * param0); -BOOL sub_02089974(UnkStruct_02089688 * param0); -BOOL sub_02089BEC(UnkStruct_02089688 * param0); -void sub_02089C20(UnkStruct_02089688 * param0); -void sub_02089F80(UnkStruct_02089688 * param0); -void sub_02089FFC(UnkStruct_02089688 * param0); -void sub_0208A0B8(UnkStruct_02089688 * param0); -void sub_0208A180(u32 param0, u32 param1, void * param2); -void sub_0208A328(UnkStruct_02089688 * param0); -void sub_0208A384(UnkStruct_02089688 * param0); -int sub_0208A398(UnkStruct_02089688 * param0, int param1); -int sub_0208A3C0(UnkStruct_02089688 * param0, int param1); +void sub_02089604(UnkStruct_02089688 *param0, int param1); +void sub_02089688(UnkStruct_02089688 *param0); +void sub_02089808(UnkStruct_02089688 *param0, int param1); +BOOL sub_02089820(UnkStruct_02089688 *param0); +BOOL sub_020898DC(UnkStruct_02089688 *param0); +BOOL sub_02089938(UnkStruct_02089688 *param0); +BOOL sub_02089974(UnkStruct_02089688 *param0); +BOOL sub_02089BEC(UnkStruct_02089688 *param0); +void sub_02089C20(UnkStruct_02089688 *param0); +void sub_02089F80(UnkStruct_02089688 *param0); +void sub_02089FFC(UnkStruct_02089688 *param0); +void sub_0208A0B8(UnkStruct_02089688 *param0); +void sub_0208A180(u32 param0, u32 param1, void *param2); +void sub_0208A328(UnkStruct_02089688 *param0); +void sub_0208A384(UnkStruct_02089688 *param0); +int sub_0208A398(UnkStruct_02089688 *param0, int param1); +int sub_0208A3C0(UnkStruct_02089688 *param0, int param1); #endif // POKEPLATINUM_UNK_02089604_H diff --git a/include/unk_0208A3F4.h b/include/unk_0208A3F4.h index 8cf850d563..3d1357a940 100644 --- a/include/unk_0208A3F4.h +++ b/include/unk_0208A3F4.h @@ -5,28 +5,28 @@ #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02089688.h" -void sub_0208A3F4(UnkStruct_02089688 * param0); -void sub_0208A490(UnkStruct_02089688 * param0); -void sub_0208A6CC(UnkStruct_02089688 * param0); -void sub_0208A758(UnkStruct_02089688 * param0); -void sub_0208A8A0(UnkStruct_02089688 * param0); -void sub_0208A9BC(UnkStruct_02089688 * param0); -void sub_0208AAB4(UnkStruct_02089688 * param0, int param1, BOOL param2); -void sub_0208AAE4(UnkStruct_02089688 * param0, int param1); -void sub_0208AB2C(UnkStruct_02089688 * param0, int param1); -void sub_0208AB6C(UnkStruct_02089688 * param0, int param1, int param2); -void sub_0208ABB4(UnkStruct_02089688 * param0); -void sub_0208AC8C(UnkStruct_02089688 * param0); -int sub_0208AD98(int param0, BOOL param1); -void sub_0208ADA4(UnkStruct_02089688 * param0); -void sub_0208ADE4(UnkStruct_02089688 * param0, int param1); -void sub_0208AF44(UnkStruct_02089688 * param0); -void sub_0208AFCC(UnkStruct_02089688 * param0); -void sub_0208AFE8(UnkStruct_02089688 * param0); -void sub_0208B028(UnkStruct_02089688 * param0); -void sub_0208B064(UnkStruct_02089688 * param0); -void sub_0208B090(UnkStruct_02089688 * param0, int param1, int param2, int param3, int param4); -void sub_0208B1C4(BGL * param0, Window * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); -void sub_0208B230(Window * param0, int param1); +void sub_0208A3F4(UnkStruct_02089688 *param0); +void sub_0208A490(UnkStruct_02089688 *param0); +void sub_0208A6CC(UnkStruct_02089688 *param0); +void sub_0208A758(UnkStruct_02089688 *param0); +void sub_0208A8A0(UnkStruct_02089688 *param0); +void sub_0208A9BC(UnkStruct_02089688 *param0); +void sub_0208AAB4(UnkStruct_02089688 *param0, int param1, BOOL param2); +void sub_0208AAE4(UnkStruct_02089688 *param0, int param1); +void sub_0208AB2C(UnkStruct_02089688 *param0, int param1); +void sub_0208AB6C(UnkStruct_02089688 *param0, int param1, int param2); +void sub_0208ABB4(UnkStruct_02089688 *param0); +void sub_0208AC8C(UnkStruct_02089688 *param0); +int sub_0208AD98(int param0, BOOL param1); +void sub_0208ADA4(UnkStruct_02089688 *param0); +void sub_0208ADE4(UnkStruct_02089688 *param0, int param1); +void sub_0208AF44(UnkStruct_02089688 *param0); +void sub_0208AFCC(UnkStruct_02089688 *param0); +void sub_0208AFE8(UnkStruct_02089688 *param0); +void sub_0208B028(UnkStruct_02089688 *param0); +void sub_0208B064(UnkStruct_02089688 *param0); +void sub_0208B090(UnkStruct_02089688 *param0, int param1, int param2, int param3, int param4); +void sub_0208B1C4(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); +void sub_0208B230(Window *param0, int param1); #endif // POKEPLATINUM_UNK_0208A3F4_H diff --git a/include/unk_0208B284.h b/include/unk_0208B284.h index 6f591b25f0..77d16a5d91 100644 --- a/include/unk_0208B284.h +++ b/include/unk_0208B284.h @@ -7,17 +7,17 @@ #include "struct_defs/struct_0208B284.h" #include "struct_defs/struct_0208B878.h" -UnkStruct_0208B878 * sub_0208B284(UnkStruct_0208B284 param0, SpriteRenderer * param1, SpriteGfxHandler * param2, PaletteData * param3); -void sub_0208B63C(UnkStruct_0208B878 * param0, int param1); -BOOL sub_0208B878(UnkStruct_0208B878 * param0, int param1); -BOOL sub_0208B8B0(UnkStruct_0208B878 * param0, BOOL param1); -BOOL sub_0208B8B8(UnkStruct_0208B878 * param0, s16 param1, s16 param2); -BOOL sub_0208B8EC(UnkStruct_0208B878 * param0, s16 param1, s16 param2); -BOOL sub_0208B948(UnkStruct_0208B878 * param0, s16 param1, s16 param2); -BOOL sub_0208B988(UnkStruct_0208B878 * param0); -BOOL sub_0208B9E0(UnkStruct_0208B878 * param0, BOOL param1); -void sub_0208BA08(UnkStruct_0208B878 * param0, int param1, int param2); -void sub_0208BA30(UnkStruct_0208B878 * param0); -void sub_0208BA54(UnkStruct_0208B878 * param0); +UnkStruct_0208B878 *sub_0208B284(UnkStruct_0208B284 param0, SpriteRenderer *param1, SpriteGfxHandler *param2, PaletteData *param3); +void sub_0208B63C(UnkStruct_0208B878 *param0, int param1); +BOOL sub_0208B878(UnkStruct_0208B878 *param0, int param1); +BOOL sub_0208B8B0(UnkStruct_0208B878 *param0, BOOL param1); +BOOL sub_0208B8B8(UnkStruct_0208B878 *param0, s16 param1, s16 param2); +BOOL sub_0208B8EC(UnkStruct_0208B878 *param0, s16 param1, s16 param2); +BOOL sub_0208B948(UnkStruct_0208B878 *param0, s16 param1, s16 param2); +BOOL sub_0208B988(UnkStruct_0208B878 *param0); +BOOL sub_0208B9E0(UnkStruct_0208B878 *param0, BOOL param1); +void sub_0208BA08(UnkStruct_0208B878 *param0, int param1, int param2); +void sub_0208BA30(UnkStruct_0208B878 *param0); +void sub_0208BA54(UnkStruct_0208B878 *param0); #endif // POKEPLATINUM_UNK_0208B284_H diff --git a/include/unk_0208BA78.h b/include/unk_0208BA78.h index 0f37536370..633a5013ee 100644 --- a/include/unk_0208BA78.h +++ b/include/unk_0208BA78.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_UNK_0208BA78_H #define POKEPLATINUM_UNK_0208BA78_H -#include "overlay_manager.h" #include "struct_defs/struct_0208BA84.h" #include "struct_defs/struct_0208C06C.h" -UnkStruct_0208C06C * sub_0208BA78(OverlayManager * param0); -void sub_0208BA84(UnkStruct_0208BA84 * param0, BOOL param1, int param2); -const OverlayManagerTemplate * sub_0208BE5C(int param0); -BOOL sub_0208BE68(UnkStruct_0208C06C * param0); +#include "overlay_manager.h" + +UnkStruct_0208C06C *sub_0208BA78(OverlayManager *param0); +void sub_0208BA84(UnkStruct_0208BA84 *param0, BOOL param1, int param2); +const OverlayManagerTemplate *sub_0208BE5C(int param0); +BOOL sub_0208BE68(UnkStruct_0208C06C *param0); #endif // POKEPLATINUM_UNK_0208BA78_H diff --git a/include/unk_0208C010.h b/include/unk_0208C010.h index e2634cb74f..9efa88a177 100644 --- a/include/unk_0208C010.h +++ b/include/unk_0208C010.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_UNK_0208C010_H #define POKEPLATINUM_UNK_0208C010_H -#include "struct_defs/struct_0208C06C.h" #include "struct_decls/struct_020F3DCC_decl.h" +#include "struct_defs/struct_0208C06C.h" -const UnkStruct_020F3DCC * sub_0208C010(int param0); -const UnkStruct_020F3DCC * sub_0208C034(UnkStruct_0208C06C * param0, int param1); -void sub_0208C06C(UnkStruct_0208C06C * param0); +const UnkStruct_020F3DCC *sub_0208C010(int param0); +const UnkStruct_020F3DCC *sub_0208C034(UnkStruct_0208C06C *param0, int param1); +void sub_0208C06C(UnkStruct_0208C06C *param0); #endif // POKEPLATINUM_UNK_0208C010_H diff --git a/include/unk_0208C098.h b/include/unk_0208C098.h index cb02ce2507..856883838a 100644 --- a/include/unk_0208C098.h +++ b/include/unk_0208C098.h @@ -1,11 +1,11 @@ #ifndef POKEPLATINUM_UNK_0208C098_H #define POKEPLATINUM_UNK_0208C098_H +#include + #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include - enum BarColor { BARCOLOR_EMPTY = 0, BARCOLOR_RED, @@ -20,7 +20,7 @@ u32 sub_0208C0A4(u32 param0, u32 param1); /** * @brief Determine how many pixels are needed to represent a fractional value. - * + * * @param cur The current value; the fraction's numerator. * @param max The maximum value; the fraction's denominator. * @param maxPixels How many pixels would be used to display max / max. @@ -31,7 +31,7 @@ u8 App_PixelCount(u32 cur, u32 max, u8 maxPixels); /** * @brief Determine what color should be used for a value represented by a * visual bar, e.g. the health bar in battle. - * + * * @param cur The current value of the bar. * @param max The maximum value of the bar. * @return The color to be used for the bar's current value. @@ -40,7 +40,7 @@ u8 App_BarColor(u32 cur, u32 max); /** * @brief Determine the color of the health bar. - * + * * @param curHP The current HP value. * @param maxHP The maximum HP value. * @param barSize The size of the health bar, in pixels. @@ -48,8 +48,8 @@ u8 App_BarColor(u32 cur, u32 max); */ u8 HealthBar_Color(u16 curHP, u16 maxHP, u32 barSize); void sub_0208C120(u8 param0, u32 param1); -u8 sub_0208C15C(s16 * param0, u16 param1); -void sub_0208C210(BGL * param0, int param1, NARC * param2, int param3, int param4, int param5, int param6, u16 param7, u16 param8); -void * sub_0208C2F4(NARC * param0, int param1, int param2, NNSG2dScreenData ** param3, int param4); +u8 sub_0208C15C(s16 *param0, u16 param1); +void sub_0208C210(BGL *param0, int param1, NARC *param2, int param3, int param4, int param5, int param6, u16 param7, u16 param8); +void *sub_0208C2F4(NARC *param0, int param1, int param2, NNSG2dScreenData **param3, int param4); #endif // POKEPLATINUM_UNK_0208C098_H diff --git a/include/unk_0208EA44.h b/include/unk_0208EA44.h index 3ce5c00eaf..5efe27268b 100644 --- a/include/unk_0208EA44.h +++ b/include/unk_0208EA44.h @@ -1,40 +1,40 @@ #ifndef POKEPLATINUM_UNK_0208EA44_H #define POKEPLATINUM_UNK_0208EA44_H -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/pokemon_summary_app.h" +#include "struct_defs/struct_0205AA50.h" -void sub_0208EA44(PokemonSummaryApp * param0); -void sub_0208EAF4(PokemonSummaryApp * param0); -void sub_0208EB14(PokemonSummaryApp * param0); -void sub_0208EB64(PokemonSummaryApp * param0); -void sub_0208ECF4(PokemonSummaryApp * param0); -void sub_0208EDC4(PokemonSummaryApp * param0); -void sub_0208EE10(PokemonSummaryApp * param0, u8 param1); -void sub_0208EE3C(PokemonSummaryApp * param0); -void sub_0208EE9C(PokemonSummaryApp * param0); -void sub_0208EF58(PokemonSummaryApp * param0); -void sub_0208F16C(PokemonSummaryApp * param0); -void sub_0208F22C(PokemonSummaryApp * param0, u8 param1, u8 param2); -void sub_0208F294(PokemonSummaryApp * param0, u32 param1); -void sub_0208F2E8(PokemonSummaryApp * param0); -void sub_0208F310(PokemonSummaryApp * param0); -void sub_0208F34C(PokemonSummaryApp * param0); -void sub_0208F3B0(PokemonSummaryApp * param0); -void sub_0208F574(PokemonSummaryApp * param0); -void sub_0208F600(PokemonSummaryApp * param0); -void sub_0208F684(PokemonSummaryApp * param0); -void sub_0208F6A4(PokemonSummaryApp * param0); -void sub_0208F6DC(PokemonSummaryApp * param0, Window * param1); -void sub_0208F71C(PokemonSummaryApp * param0); -void sub_0208F7A4(PokemonSummaryApp * param0); -void sub_0208F844(PokemonSummaryApp * param0); -void sub_0208F964(PokemonSummaryApp * param0); -void sub_0208FA04(PokemonSummaryApp * param0); -void sub_0208FAA4(PokemonSummaryApp * param0); -void sub_0208FB00(PokemonSummaryApp * param0); -void sub_0208FB30(PokemonSummaryApp * param0); -void sub_0208FB54(PokemonSummaryApp * param0, u8 param1); -void sub_0208FCD4(PokemonSummaryApp * param0); +void sub_0208EA44(PokemonSummaryApp *param0); +void sub_0208EAF4(PokemonSummaryApp *param0); +void sub_0208EB14(PokemonSummaryApp *param0); +void sub_0208EB64(PokemonSummaryApp *param0); +void sub_0208ECF4(PokemonSummaryApp *param0); +void sub_0208EDC4(PokemonSummaryApp *param0); +void sub_0208EE10(PokemonSummaryApp *param0, u8 param1); +void sub_0208EE3C(PokemonSummaryApp *param0); +void sub_0208EE9C(PokemonSummaryApp *param0); +void sub_0208EF58(PokemonSummaryApp *param0); +void sub_0208F16C(PokemonSummaryApp *param0); +void sub_0208F22C(PokemonSummaryApp *param0, u8 param1, u8 param2); +void sub_0208F294(PokemonSummaryApp *param0, u32 param1); +void sub_0208F2E8(PokemonSummaryApp *param0); +void sub_0208F310(PokemonSummaryApp *param0); +void sub_0208F34C(PokemonSummaryApp *param0); +void sub_0208F3B0(PokemonSummaryApp *param0); +void sub_0208F574(PokemonSummaryApp *param0); +void sub_0208F600(PokemonSummaryApp *param0); +void sub_0208F684(PokemonSummaryApp *param0); +void sub_0208F6A4(PokemonSummaryApp *param0); +void sub_0208F6DC(PokemonSummaryApp *param0, Window *param1); +void sub_0208F71C(PokemonSummaryApp *param0); +void sub_0208F7A4(PokemonSummaryApp *param0); +void sub_0208F844(PokemonSummaryApp *param0); +void sub_0208F964(PokemonSummaryApp *param0); +void sub_0208FA04(PokemonSummaryApp *param0); +void sub_0208FAA4(PokemonSummaryApp *param0); +void sub_0208FB00(PokemonSummaryApp *param0); +void sub_0208FB30(PokemonSummaryApp *param0); +void sub_0208FB54(PokemonSummaryApp *param0, u8 param1); +void sub_0208FCD4(PokemonSummaryApp *param0); #endif // POKEPLATINUM_UNK_0208EA44_H diff --git a/include/unk_0208FCF8.h b/include/unk_0208FCF8.h index bf95ce65d2..b2e40d53a0 100644 --- a/include/unk_0208FCF8.h +++ b/include/unk_0208FCF8.h @@ -3,25 +3,25 @@ #include "struct_defs/pokemon_summary_app.h" -void sub_0208FCF8(PokemonSummaryApp * param0); -void sub_0208FD40(PokemonSummaryApp * param0); -void sub_0208FE34(PokemonSummaryApp * param0); -void sub_0208FE88(PokemonSummaryApp * param0); -void sub_0208FEA4(PokemonSummaryApp * param0); -void sub_0208FF3C(PokemonSummaryApp * param0); -void sub_0208FFE0(PokemonSummaryApp * param0); -void sub_02090064(PokemonSummaryApp * param0, u32 param1); -void sub_020904C4(PokemonSummaryApp * param0); -void sub_02090F84(PokemonSummaryApp * param0); -void sub_020910E4(PokemonSummaryApp * param0); -void sub_020912A4(PokemonSummaryApp * param0, u32 param1); -void sub_020913D8(PokemonSummaryApp * param0); -void sub_02091420(PokemonSummaryApp * param0); -void sub_0209145C(PokemonSummaryApp * param0); -void sub_02091474(PokemonSummaryApp * param0); -void sub_020914F8(PokemonSummaryApp * param0); -void sub_02091570(PokemonSummaryApp * param0, u32 param1); -void sub_020915F4(PokemonSummaryApp * param0); -void sub_02091610(PokemonSummaryApp * param0, u8 param1); +void sub_0208FCF8(PokemonSummaryApp *param0); +void sub_0208FD40(PokemonSummaryApp *param0); +void sub_0208FE34(PokemonSummaryApp *param0); +void sub_0208FE88(PokemonSummaryApp *param0); +void sub_0208FEA4(PokemonSummaryApp *param0); +void sub_0208FF3C(PokemonSummaryApp *param0); +void sub_0208FFE0(PokemonSummaryApp *param0); +void sub_02090064(PokemonSummaryApp *param0, u32 param1); +void sub_020904C4(PokemonSummaryApp *param0); +void sub_02090F84(PokemonSummaryApp *param0); +void sub_020910E4(PokemonSummaryApp *param0); +void sub_020912A4(PokemonSummaryApp *param0, u32 param1); +void sub_020913D8(PokemonSummaryApp *param0); +void sub_02091420(PokemonSummaryApp *param0); +void sub_0209145C(PokemonSummaryApp *param0); +void sub_02091474(PokemonSummaryApp *param0); +void sub_020914F8(PokemonSummaryApp *param0); +void sub_02091570(PokemonSummaryApp *param0, u32 param1); +void sub_020915F4(PokemonSummaryApp *param0); +void sub_02091610(PokemonSummaryApp *param0, u8 param1); #endif // POKEPLATINUM_UNK_0208FCF8_H diff --git a/include/unk_020916B4.h b/include/unk_020916B4.h index d8d96430e4..b03ab74775 100644 --- a/include/unk_020916B4.h +++ b/include/unk_020916B4.h @@ -3,14 +3,14 @@ #include "struct_defs/pokemon_summary_app.h" -void sub_020916B4(PokemonSummaryApp * param0); -void sub_02091750(PokemonSummaryApp * param0); -void sub_020917B0(PokemonSummaryApp * param0); -void sub_020917E0(PokemonSummaryApp * param0); -void sub_020919E8(PokemonSummaryApp * param0); -void sub_02091D50(PokemonSummaryApp * param0); -void sub_02091F8C(PokemonSummaryApp * param0); -void sub_02092028(PokemonSummaryApp * param0); -void sub_02092098(PokemonSummaryApp * param0); +void sub_020916B4(PokemonSummaryApp *param0); +void sub_02091750(PokemonSummaryApp *param0); +void sub_020917B0(PokemonSummaryApp *param0); +void sub_020917E0(PokemonSummaryApp *param0); +void sub_020919E8(PokemonSummaryApp *param0); +void sub_02091D50(PokemonSummaryApp *param0); +void sub_02091F8C(PokemonSummaryApp *param0); +void sub_02092028(PokemonSummaryApp *param0); +void sub_02092098(PokemonSummaryApp *param0); #endif // POKEPLATINUM_UNK_020916B4_H diff --git a/include/unk_020920C0.h b/include/unk_020920C0.h index 812a7eb807..b1e0c0ff5f 100644 --- a/include/unk_020920C0.h +++ b/include/unk_020920C0.h @@ -3,11 +3,11 @@ #include "struct_defs/pokemon_summary_app.h" -void sub_020920C0(PokemonSummaryApp * param0); -void sub_0209219C(PokemonSummaryApp * param0); -u8 sub_020921E4(PokemonSummaryApp * param0); -u8 sub_0209228C(PokemonSummaryApp * param0); -void sub_02092368(PokemonSummaryApp * param0, s16 * param1, s16 * param2); -u8 sub_020923A4(PokemonSummaryApp * param0, u8 param1); +void sub_020920C0(PokemonSummaryApp *param0); +void sub_0209219C(PokemonSummaryApp *param0); +u8 sub_020921E4(PokemonSummaryApp *param0); +u8 sub_0209228C(PokemonSummaryApp *param0); +void sub_02092368(PokemonSummaryApp *param0, s16 *param1, s16 *param2); +u8 sub_020923A4(PokemonSummaryApp *param0, u8 param1); #endif // POKEPLATINUM_UNK_020920C0_H diff --git a/include/unk_020923C0.h b/include/unk_020923C0.h index 58d09bd810..81beb7c400 100644 --- a/include/unk_020923C0.h +++ b/include/unk_020923C0.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_020923C0_H u32 sub_020923C0(u8 param0, u8 param1); -u32 sub_02092424(u8 * param0, u8 param1); +u32 sub_02092424(u8 *param0, u8 param1); u8 sub_02092444(u8 param0); u16 sub_02092464(u32 param0); diff --git a/include/unk_02092494.h b/include/unk_02092494.h index 9c2625f2ec..21fa12a76f 100644 --- a/include/unk_02092494.h +++ b/include/unk_02092494.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_UNK_02092494_H #define POKEPLATINUM_UNK_02092494_H -#include "trainer_info.h" -#include "pokemon.h" #include "struct_defs/struct_02090800.h" -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 UpdateBoxMonStatusAndTrainerInfo(BoxPokemon * boxMon, TrainerInfo * trainerInfo, int sel, int metLocation, int heapID); +#include "pokemon.h" +#include "trainer_info.h" + +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 UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int sel, int metLocation, int heapID); #endif // POKEPLATINUM_UNK_02092494_H diff --git a/include/unk_020933F8.h b/include/unk_020933F8.h index e6cb1757f5..6c0d806ac6 100644 --- a/include/unk_020933F8.h +++ b/include/unk_020933F8.h @@ -1,45 +1,46 @@ #ifndef POKEPLATINUM_UNK_020933F8_H #define POKEPLATINUM_UNK_020933F8_H -#include "string_template.h" -#include "journal.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_defs/struct_02093800.h" #include "struct_defs/struct_02095C48.h" + +#include "journal.h" #include "savedata.h" +#include "string_template.h" -void sub_020933F8(TaskManager * param0, UnkStruct_02095C48 * param1); -UnkStruct_02095C48 * sub_02093800(const UnkStruct_02093800 * param0); -void sub_02093AD4(UnkStruct_02095C48 * param0); -BOOL sub_020943B0(UnkStruct_02095C48 * param0); -BOOL sub_020944CC(UnkStruct_02095C48 * param0); -void sub_02094630(UnkStruct_02095C48 * param0, int param1, StringTemplate * param2, u32 param3); -void sub_02094648(UnkStruct_02095C48 * param0, int param1, StringTemplate * param2, u32 param3); -void sub_02094680(UnkStruct_02095C48 * param0, int param1, StringTemplate * param2, u32 param3); -void sub_020946A4(UnkStruct_02095C48 * param0, StringTemplate * param1, u32 param2); -void sub_020946CC(UnkStruct_02095C48 * param0, StringTemplate * param1, u32 param2); -void sub_020946F0(UnkStruct_02095C48 * param0, StringTemplate * param1, u32 param2); -void sub_02094720(UnkStruct_02095C48 * param0, StringTemplate * param1, u32 param2); -u32 sub_02094750(UnkStruct_02095C48 * param0); -void sub_02094754(UnkStruct_02095C48 * param0, u8 param1); -BOOL sub_0209476C(UnkStruct_02095C48 * param0, u8 param1); -int sub_02094790(UnkStruct_02095C48 * param0); -int sub_020947A4(UnkStruct_02095C48 * param0); -int sub_020947C8(UnkStruct_02095C48 * param0); -int sub_020947D8(UnkStruct_02095C48 * param0, int param1); -int sub_020947F0(UnkStruct_02095C48 * param0, int param1); -int sub_02094804(UnkStruct_02095C48 * param0); -void sub_02094828(UnkStruct_02095C48 * param0, u16 * param1, u16 * param2, u16 * param3, u16 * param4); -void sub_02094850(UnkStruct_02095C48 * param0); -void sub_02094860(UnkStruct_02095C48 * param0); -BOOL sub_02094868(UnkStruct_02095C48 * param0); -void sub_02094898(UnkStruct_02095C48 * param0, StringTemplate * param1, u32 param2, int param3); -u32 sub_02094904(UnkStruct_02095C48 * param0); -void sub_02094A58(UnkStruct_02095C48 * param0, int param1); -BOOL sub_02094B1C(UnkStruct_02095C48 * param0); -void sub_02094BB4(UnkStruct_02095C48 * param0, int * param1, int * param2, int * param3, int * param4, int * param5); -void sub_02094C44(UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, Journal * param3); -u16 sub_02094E98(UnkStruct_02095C48 * param0); -u16 sub_02094EA0(u32 param0, u32 * param1); +void sub_020933F8(TaskManager *param0, UnkStruct_02095C48 *param1); +UnkStruct_02095C48 *sub_02093800(const UnkStruct_02093800 *param0); +void sub_02093AD4(UnkStruct_02095C48 *param0); +BOOL sub_020943B0(UnkStruct_02095C48 *param0); +BOOL sub_020944CC(UnkStruct_02095C48 *param0); +void sub_02094630(UnkStruct_02095C48 *param0, int param1, StringTemplate *param2, u32 param3); +void sub_02094648(UnkStruct_02095C48 *param0, int param1, StringTemplate *param2, u32 param3); +void sub_02094680(UnkStruct_02095C48 *param0, int param1, StringTemplate *param2, u32 param3); +void sub_020946A4(UnkStruct_02095C48 *param0, StringTemplate *param1, u32 param2); +void sub_020946CC(UnkStruct_02095C48 *param0, StringTemplate *param1, u32 param2); +void sub_020946F0(UnkStruct_02095C48 *param0, StringTemplate *param1, u32 param2); +void sub_02094720(UnkStruct_02095C48 *param0, StringTemplate *param1, u32 param2); +u32 sub_02094750(UnkStruct_02095C48 *param0); +void sub_02094754(UnkStruct_02095C48 *param0, u8 param1); +BOOL sub_0209476C(UnkStruct_02095C48 *param0, u8 param1); +int sub_02094790(UnkStruct_02095C48 *param0); +int sub_020947A4(UnkStruct_02095C48 *param0); +int sub_020947C8(UnkStruct_02095C48 *param0); +int sub_020947D8(UnkStruct_02095C48 *param0, int param1); +int sub_020947F0(UnkStruct_02095C48 *param0, int param1); +int sub_02094804(UnkStruct_02095C48 *param0); +void sub_02094828(UnkStruct_02095C48 *param0, u16 *param1, u16 *param2, u16 *param3, u16 *param4); +void sub_02094850(UnkStruct_02095C48 *param0); +void sub_02094860(UnkStruct_02095C48 *param0); +BOOL sub_02094868(UnkStruct_02095C48 *param0); +void sub_02094898(UnkStruct_02095C48 *param0, StringTemplate *param1, u32 param2, int param3); +u32 sub_02094904(UnkStruct_02095C48 *param0); +void sub_02094A58(UnkStruct_02095C48 *param0, int param1); +BOOL sub_02094B1C(UnkStruct_02095C48 *param0); +void sub_02094BB4(UnkStruct_02095C48 *param0, int *param1, int *param2, int *param3, int *param4, int *param5); +void sub_02094C44(UnkStruct_02095C48 *param0, SaveData *param1, u32 param2, Journal *param3); +u16 sub_02094E98(UnkStruct_02095C48 *param0); +u16 sub_02094EA0(u32 param0, u32 *param1); #endif // POKEPLATINUM_UNK_020933F8_H diff --git a/include/unk_02094EDC.h b/include/unk_02094EDC.h index 1c248a86a8..b2e1118e27 100644 --- a/include/unk_02094EDC.h +++ b/include/unk_02094EDC.h @@ -1,33 +1,35 @@ #ifndef POKEPLATINUM_UNK_02094EDC_H #define POKEPLATINUM_UNK_02094EDC_H -#include "struct_decls/struct_02007768_decl.h" #include "struct_decls/sprite_decl.h" -#include "pokemon.h" +#include "struct_decls/struct_02007768_decl.h" #include "struct_defs/struct_02095C48.h" -#include "overlay006/struct_ov6_02248BE8.h" + #include "battle/struct_ov16_0223E0C8.h" +#include "overlay006/struct_ov6_02248BE8.h" + +#include "pokemon.h" -int sub_02094EDC(UnkStruct_02095C48 * param0); -void sub_02094F04(UnkStruct_02095C48 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7); -void sub_020951B0(UnkStruct_02095C48 * param0, int param1); -void sub_02095338(UnkStruct_02095C48 * param0); -void sub_02095380(const UnkStruct_ov6_02248BE8 * param0, Pokemon * param1, int param2); -Sprite * sub_02095484(UnkStruct_02007768 * param0, int param1, Pokemon * param2, int param3, UnkStruct_ov16_0223E0C8 * param4, int param5, int param6, int param7, int param8); -void sub_020954F0(UnkStruct_02095C48 * param0, int param1, int param2, int param3, int param4); +int sub_02094EDC(UnkStruct_02095C48 *param0); +void sub_02094F04(UnkStruct_02095C48 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7); +void sub_020951B0(UnkStruct_02095C48 *param0, int param1); +void sub_02095338(UnkStruct_02095C48 *param0); +void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int param2); +Sprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int param5, int param6, int param7, int param8); +void sub_020954F0(UnkStruct_02095C48 *param0, int param1, int param2, int param3, int param4); s8 sub_02095734(int param0); -void sub_02095750(int param0, u32 * param1, u32 * param2); +void sub_02095750(int param0, u32 *param1, u32 *param2); u32 sub_0209577C(int param0); -void sub_02095790(int param0, int param1, u32 * param2, u32 * param3); +void sub_02095790(int param0, int param1, u32 *param2, u32 *param3); u32 sub_02095848(int param0, int param1, int param2); u32 sub_02095888(int param0); u32 sub_020958B8(int param0); u32 sub_020958C4(int param0, int param1); int sub_020958FC(int param0); int sub_02095904(int param0); -BOOL sub_0209590C(UnkStruct_02095C48 * param0); -int sub_02095928(UnkStruct_02095C48 * param0, int param1); -int sub_0209598C(UnkStruct_02095C48 * param0, int param1); +BOOL sub_0209590C(UnkStruct_02095C48 *param0); +int sub_02095928(UnkStruct_02095C48 *param0, int param1); +int sub_0209598C(UnkStruct_02095C48 *param0, int param1); void sub_020959F4(int param0); void sub_02095A24(void); u32 sub_02095A3C(int param0, int param1); diff --git a/include/unk_02095AF0.h b/include/unk_02095AF0.h index d20f8c3095..4ba33ddb8a 100644 --- a/include/unk_02095AF0.h +++ b/include/unk_02095AF0.h @@ -5,10 +5,10 @@ #include "struct_defs/struct_02095C48.h" #include "struct_defs/struct_02095C60.h" -void sub_02095AF0(void * param0); -BOOL sub_02095B5C(UnkStruct_02095C48 * param0, int param1, const UnkStruct_02029C88 * param2); -BOOL sub_02095BEC(UnkStruct_02095C48 * param0, UnkStruct_02029C88 ** param1); -BOOL sub_02095C60(UnkStruct_02095C60 * param0, u32 param1); -BOOL sub_02095CA8(UnkStruct_02095C60 * param0, int param1); +void sub_02095AF0(void *param0); +BOOL sub_02095B5C(UnkStruct_02095C48 *param0, int param1, const UnkStruct_02029C88 *param2); +BOOL sub_02095BEC(UnkStruct_02095C48 *param0, UnkStruct_02029C88 **param1); +BOOL sub_02095C60(UnkStruct_02095C60 *param0, u32 param1); +BOOL sub_02095CA8(UnkStruct_02095C60 *param0, int param1); #endif // POKEPLATINUM_UNK_02095AF0_H diff --git a/include/unk_02095CD4.h b/include/unk_02095CD4.h index 6e7b82475a..83e6a9914c 100644 --- a/include/unk_02095CD4.h +++ b/include/unk_02095CD4.h @@ -1,18 +1,19 @@ #ifndef POKEPLATINUM_UNK_02095CD4_H #define POKEPLATINUM_UNK_02095CD4_H -#include "field/field_system_decl.h" #include "struct_decls/struct_02095E80_decl.h" -void sub_02095CD4(void * param0); -void sub_02095CFC(int param0, int param1, void * param2, void * param3); -void sub_02095D74(int param0, int param1, void * param2, void * param3); -void sub_02095D94(int param0, int param1, void * param2, void * param3); -void sub_02095DA4(int param0, int param1, void * param2, void * param3); -void sub_02095DA8(int param0, int param1, void * param2, void * param3); -void sub_02095DAC(int param0, int param1, void * param2, void * param3); -void sub_02095DB8(int param0, int param1, void * param2, void * param3); -void sub_02095DFC(int param0, int param1, void * param2, void * param3); -void sub_02095E60(FieldSystem * fieldSystem, UnkStruct_02095E80 * param1); +#include "field/field_system_decl.h" + +void sub_02095CD4(void *param0); +void sub_02095CFC(int param0, int param1, void *param2, void *param3); +void sub_02095D74(int param0, int param1, void *param2, void *param3); +void sub_02095D94(int param0, int param1, void *param2, void *param3); +void sub_02095DA4(int param0, int param1, void *param2, void *param3); +void sub_02095DA8(int param0, int param1, void *param2, void *param3); +void sub_02095DAC(int param0, int param1, void *param2, void *param3); +void sub_02095DB8(int param0, int param1, void *param2, void *param3); +void sub_02095DFC(int param0, int param1, void *param2, void *param3); +void sub_02095E60(FieldSystem *fieldSystem, UnkStruct_02095E80 *param1); #endif // POKEPLATINUM_UNK_02095CD4_H diff --git a/include/unk_02095E98.h b/include/unk_02095E98.h index 6a60f1a9ce..37c3466719 100644 --- a/include/unk_02095E98.h +++ b/include/unk_02095E98.h @@ -1,17 +1,17 @@ #ifndef POKEPLATINUM_UNK_02095E98_H #define POKEPLATINUM_UNK_02095E98_H -void sub_02095E98(void * param0); -void sub_02095EAC(int param0, int param1, void * param2, void * param3); -void sub_02095F40(int param0, int param1, void * param2, void * param3); -void sub_02095F68(int param0, int param1, void * param2, void * param3); -void sub_02095F9C(int param0, int param1, void * param2, void * param3); -void sub_02095FE4(int param0, int param1, void * param2, void * param3); -void sub_020960D4(int param0, int param1, void * param2, void * param3); -void sub_020960D8(int param0, int param1, void * param2, void * param3); -void sub_0209610C(int param0, int param1, void * param2, void * param3); -void sub_02096110(int param0, int param1, void * param2, void * param3); -void sub_02096114(int param0, int param1, void * param2, void * param3); -void sub_0209612C(int param0, int param1, void * param2, void * param3); +void sub_02095E98(void *param0); +void sub_02095EAC(int param0, int param1, void *param2, void *param3); +void sub_02095F40(int param0, int param1, void *param2, void *param3); +void sub_02095F68(int param0, int param1, void *param2, void *param3); +void sub_02095F9C(int param0, int param1, void *param2, void *param3); +void sub_02095FE4(int param0, int param1, void *param2, void *param3); +void sub_020960D4(int param0, int param1, void *param2, void *param3); +void sub_020960D8(int param0, int param1, void *param2, void *param3); +void sub_0209610C(int param0, int param1, void *param2, void *param3); +void sub_02096110(int param0, int param1, void *param2, void *param3); +void sub_02096114(int param0, int param1, void *param2, void *param3); +void sub_0209612C(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_UNK_02095E98_H diff --git a/include/unk_020961E8.h b/include/unk_020961E8.h index e18f1adb98..8e1d856d02 100644 --- a/include/unk_020961E8.h +++ b/include/unk_020961E8.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_UNK_020961E8_H #define POKEPLATINUM_UNK_020961E8_H -void sub_020961E8(void * param0); -void sub_0209621C(int param0, int param1, void * param2, void * param3); -void sub_02096264(int param0, int param1, void * param2, void * param3); -void sub_02096274(int param0, int param1, void * param2, void * param3); -void sub_02096360(int param0, int param1, void * param2, void * param3); -void sub_02096380(int param0, int param1, void * param2, void * param3); -void sub_02096384(int param0, int param1, void * param2, void * param3); -void sub_02096388(int param0, int param1, void * param2, void * param3); -void sub_020963A0(int param0, int param1, void * param2, void * param3); +void sub_020961E8(void *param0); +void sub_0209621C(int param0, int param1, void *param2, void *param3); +void sub_02096264(int param0, int param1, void *param2, void *param3); +void sub_02096274(int param0, int param1, void *param2, void *param3); +void sub_02096360(int param0, int param1, void *param2, void *param3); +void sub_02096380(int param0, int param1, void *param2, void *param3); +void sub_02096384(int param0, int param1, void *param2, void *param3); +void sub_02096388(int param0, int param1, void *param2, void *param3); +void sub_020963A0(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_UNK_020961E8_H diff --git a/include/unk_02096420.h b/include/unk_02096420.h index 1941437afa..42f43d0c6b 100644 --- a/include/unk_02096420.h +++ b/include/unk_02096420.h @@ -1,13 +1,14 @@ #ifndef POKEPLATINUM_UNK_02096420_H #define POKEPLATINUM_UNK_02096420_H -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -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 HealAllPokemonInParty(Party * party); +#include "pokemon.h" + +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 HealAllPokemonInParty(Party *party); #endif // POKEPLATINUM_UNK_02096420_H diff --git a/include/unk_020972FC.h b/include/unk_020972FC.h index 362f425593..ebf9fbb527 100644 --- a/include/unk_020972FC.h +++ b/include/unk_020972FC.h @@ -3,10 +3,10 @@ #include "struct_defs/struct_020972FC.h" -UnkStruct_020972FC * sub_020972FC(u8 param0); -void sub_02097320(UnkStruct_020972FC * param0, u16 param1, u16 param2); -void sub_0209733C(UnkStruct_020972FC * param0, u8 param1, u8 param2, u8 param3); -u8 sub_02097368(u32 * param0, u16 param1); -void sub_02097390(UnkStruct_020972FC * param0, u8 * param1, u8 * param2); +UnkStruct_020972FC *sub_020972FC(u8 param0); +void sub_02097320(UnkStruct_020972FC *param0, u16 param1, u16 param2); +void sub_0209733C(UnkStruct_020972FC *param0, u8 param1, u8 param2, u8 param3); +u8 sub_02097368(u32 *param0, u16 param1); +void sub_02097390(UnkStruct_020972FC *param0, u8 *param1, u8 *param2); #endif // POKEPLATINUM_UNK_020972FC_H diff --git a/include/unk_0209747C.h b/include/unk_0209747C.h index 367808bc06..419af6a73f 100644 --- a/include/unk_0209747C.h +++ b/include/unk_0209747C.h @@ -1,33 +1,34 @@ #ifndef POKEPLATINUM_UNK_0209747C_H #define POKEPLATINUM_UNK_0209747C_H -#include "struct_defs/sentence.h" -#include "struct_decls/struct_02014EC4_decl.h" #include "struct_decls/pokedexdata_decl.h" +#include "struct_decls/struct_02014EC4_decl.h" #include "struct_decls/struct_0209747C_decl.h" +#include "struct_defs/sentence.h" + #include "savedata.h" -UnkStruct_0209747C * sub_0209747C(u32 param0, u32 param1, SaveData * param2, u32 param3); -void sub_020974EC(UnkStruct_0209747C * param0); -void sub_020974F4(UnkStruct_0209747C * param0, u16 param1); -void sub_020974F8(UnkStruct_0209747C * param0, u16 param1, u16 param2); -void sub_02097500(UnkStruct_0209747C * param0, const Sentence * param1); -void sub_02097514(UnkStruct_0209747C * param0); -void sub_02097520(UnkStruct_0209747C * param0); -BOOL sub_02097528(const UnkStruct_0209747C * param0); -BOOL sub_0209752C(const UnkStruct_0209747C * param0); -u16 sub_02097530(const UnkStruct_0209747C * param0); -void sub_02097534(const UnkStruct_0209747C * param0, u16 * param1); -void sub_02097540(const UnkStruct_0209747C * param0, Sentence * param1); -u32 sub_02097550(const UnkStruct_0209747C * param0); -u32 sub_02097554(const UnkStruct_0209747C * param0); -int sub_02097558(const UnkStruct_0209747C * param0); -const PokedexData * sub_0209755C(const UnkStruct_0209747C * param0); -const UnkStruct_02014EC4 * sub_02097560(const UnkStruct_0209747C * param0); -BOOL sub_02097564(const UnkStruct_0209747C * param0); -BOOL sub_02097568(const UnkStruct_0209747C * param0); -void sub_0209756C(const UnkStruct_0209747C * param0, u16 * param1, Sentence * param2); -BOOL sub_020975A0(const UnkStruct_0209747C * param0, const u16 * param1, const Sentence * param2); -void sub_020975E4(UnkStruct_0209747C * param0, const u16 * param1, const Sentence * param2); +UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *param2, u32 param3); +void sub_020974EC(UnkStruct_0209747C *param0); +void sub_020974F4(UnkStruct_0209747C *param0, u16 param1); +void sub_020974F8(UnkStruct_0209747C *param0, u16 param1, u16 param2); +void sub_02097500(UnkStruct_0209747C *param0, const Sentence *param1); +void sub_02097514(UnkStruct_0209747C *param0); +void sub_02097520(UnkStruct_0209747C *param0); +BOOL sub_02097528(const UnkStruct_0209747C *param0); +BOOL sub_0209752C(const UnkStruct_0209747C *param0); +u16 sub_02097530(const UnkStruct_0209747C *param0); +void sub_02097534(const UnkStruct_0209747C *param0, u16 *param1); +void sub_02097540(const UnkStruct_0209747C *param0, Sentence *param1); +u32 sub_02097550(const UnkStruct_0209747C *param0); +u32 sub_02097554(const UnkStruct_0209747C *param0); +int sub_02097558(const UnkStruct_0209747C *param0); +const PokedexData *sub_0209755C(const UnkStruct_0209747C *param0); +const UnkStruct_02014EC4 *sub_02097560(const UnkStruct_0209747C *param0); +BOOL sub_02097564(const UnkStruct_0209747C *param0); +BOOL sub_02097568(const UnkStruct_0209747C *param0); +void sub_0209756C(const UnkStruct_0209747C *param0, u16 *param1, Sentence *param2); +BOOL sub_020975A0(const UnkStruct_0209747C *param0, const u16 *param1, const Sentence *param2); +void sub_020975E4(UnkStruct_0209747C *param0, const u16 *param1, const Sentence *param2); #endif // POKEPLATINUM_UNK_0209747C_H diff --git a/include/unk_02097624.h b/include/unk_02097624.h index aa214afaf8..2b477ac4cb 100644 --- a/include/unk_02097624.h +++ b/include/unk_02097624.h @@ -2,19 +2,20 @@ #define POKEPLATINUM_UNK_02097624_H #include "struct_decls/struct_02028430_decl.h" -#include "pokemon.h" #include "struct_defs/struct_02097728.h" + +#include "pokemon.h" #include "savedata.h" -UnkStruct_02097728 * sub_02097624(SaveData * param0, int param1, u8 param2, u8 param3, int param4); -UnkStruct_02097728 * sub_0209767C(SaveData * param0, int param1, u16 param2, int param3); -UnkStruct_02097728 * sub_020976BC(SaveData * param0, Pokemon * param1, int param2); -UnkStruct_02097728 * sub_020976F4(SaveData * param0, u8 param1, int param2); -BOOL sub_02097728(UnkStruct_02097728 * param0); -int sub_0209772C(UnkStruct_02097728 * param0, int param1, u8 param2); -int sub_02097750(UnkStruct_02097728 * param0, Pokemon * param1); -void sub_02097770(UnkStruct_02097728 * param0); -int sub_02097788(UnkStruct_02028430 * param0, Pokemon * param1, int param2); -int sub_020977E4(UnkStruct_02028430 * param0, u16 param1, Pokemon * param2, int param3); +UnkStruct_02097728 *sub_02097624(SaveData *param0, int param1, u8 param2, u8 param3, int param4); +UnkStruct_02097728 *sub_0209767C(SaveData *param0, int param1, u16 param2, int param3); +UnkStruct_02097728 *sub_020976BC(SaveData *param0, Pokemon *param1, int param2); +UnkStruct_02097728 *sub_020976F4(SaveData *param0, u8 param1, int param2); +BOOL sub_02097728(UnkStruct_02097728 *param0); +int sub_0209772C(UnkStruct_02097728 *param0, int param1, u8 param2); +int sub_02097750(UnkStruct_02097728 *param0, Pokemon *param1); +void sub_02097770(UnkStruct_02097728 *param0); +int sub_02097788(UnkStruct_02028430 *param0, Pokemon *param1, int param2); +int sub_020977E4(UnkStruct_02028430 *param0, u16 param1, Pokemon *param2, int param3); #endif // POKEPLATINUM_UNK_02097624_H diff --git a/include/unk_02097B18.h b/include/unk_02097B18.h index ced11831b1..dc49961a51 100644 --- a/include/unk_02097B18.h +++ b/include/unk_02097B18.h @@ -2,16 +2,17 @@ #define POKEPLATINUM_UNK_02097B18_H #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" #include "struct_defs/struct_02097F18.h" + +#include "pokemon.h" #include "savedata.h" -Pokemon * sub_02097F00(UnkStruct_02097F18 * param0, int param1); -u8 sub_02097F18(UnkStruct_02097F18 * param0); -void sub_02097F20(UnkStruct_02097F18 * param0, u8 param1); -u8 sub_02097F28(UnkStruct_02097F18 * param0); -void sub_02097F30(UnkStruct_02097F18 * param0, u8 param1); -void sub_020980DC(TaskManager * param0, SaveData * param1); +Pokemon *sub_02097F00(UnkStruct_02097F18 *param0, int param1); +u8 sub_02097F18(UnkStruct_02097F18 *param0); +void sub_02097F20(UnkStruct_02097F18 *param0, u8 param1); +u8 sub_02097F28(UnkStruct_02097F18 *param0); +void sub_02097F30(UnkStruct_02097F18 *param0, u8 param1); +void sub_020980DC(TaskManager *param0, SaveData *param1); int sub_02098140(u8 param0); int sub_02098164(u8 param0); int sub_02098188(u8 param0); diff --git a/include/unk_02098218.h b/include/unk_02098218.h index 54879eb956..a40a9cb310 100644 --- a/include/unk_02098218.h +++ b/include/unk_02098218.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -void sub_020985AC(TaskManager * param0, void * param1); +void sub_020985AC(TaskManager *param0, void *param1); #endif // POKEPLATINUM_UNK_02098218_H diff --git a/include/unk_020985E4.h b/include/unk_020985E4.h index ffac1758a8..5d913e2a41 100644 --- a/include/unk_020985E4.h +++ b/include/unk_020985E4.h @@ -2,9 +2,10 @@ #define POKEPLATINUM_UNK_020985E4_H #include "struct_decls/struct_020508D4_decl.h" + #include "savedata.h" -void sub_020985E4(TaskManager * param0, SaveData * param1); -BOOL sub_0209862C(TaskManager * param0); +void sub_020985E4(TaskManager *param0, SaveData *param1); +BOOL sub_0209862C(TaskManager *param0); #endif // POKEPLATINUM_UNK_020985E4_H diff --git a/include/unk_02098700.h b/include/unk_02098700.h index 505111637e..e1c0845f93 100644 --- a/include/unk_02098700.h +++ b/include/unk_02098700.h @@ -3,15 +3,15 @@ #include "struct_decls/struct_02098700_decl.h" -HeightWeightData * Pokedex_HeightWeightData(int param0); -void Pokedex_HeightWeightData_Free(HeightWeightData * param0); -void Pokedex_HeightWeightData_Load(HeightWeightData * param0, int param1, int param2); -void Pokedex_HeightWeightData_Release(HeightWeightData * param0); -int sub_02098808(const HeightWeightData * param0, int param1); -int Pokedex_HeightWeightData_Weight(const HeightWeightData * param0, int param1); -short sub_02098848(const HeightWeightData * param0, int param1); -short sub_02098868(const HeightWeightData * param0, int param1); -short sub_02098888(const HeightWeightData * param0, int param1); -short sub_020988A8(const HeightWeightData * param0, int param1); +HeightWeightData *Pokedex_HeightWeightData(int param0); +void Pokedex_HeightWeightData_Free(HeightWeightData *param0); +void Pokedex_HeightWeightData_Load(HeightWeightData *param0, int param1, int param2); +void Pokedex_HeightWeightData_Release(HeightWeightData *param0); +int sub_02098808(const HeightWeightData *param0, int param1); +int Pokedex_HeightWeightData_Weight(const HeightWeightData *param0, int param1); +short sub_02098848(const HeightWeightData *param0, int param1); +short sub_02098868(const HeightWeightData *param0, int param1); +short sub_02098888(const HeightWeightData *param0, int param1); +short sub_020988A8(const HeightWeightData *param0, int param1); #endif // POKEPLATINUM_UNK_02098700_H diff --git a/include/unk_020989DC.h b/include/unk_020989DC.h index 46c19304fb..7a27b169d1 100644 --- a/include/unk_020989DC.h +++ b/include/unk_020989DC.h @@ -3,14 +3,14 @@ #include "struct_defs/struct_0202A93C.h" #include "struct_defs/struct_0203D9B8.h" -#include "pokemon.h" -#include "savedata.h" #include "enums.h" +#include "pokemon.h" +#include "savedata.h" -UnkStruct_0203D9B8 * sub_020989DC(SaveData * param0, int param1); -void sub_02098AF0(UnkStruct_0203D9B8 * param0); -UnkEnum_02098EAC sub_02098EAC(Poffin * param0, u8 param1); -void sub_02098EF8(Poffin * param0, Pokemon * param1); +UnkStruct_0203D9B8 *sub_020989DC(SaveData *param0, int param1); +void sub_02098AF0(UnkStruct_0203D9B8 *param0); +UnkEnum_02098EAC sub_02098EAC(Poffin *param0, u8 param1); +void sub_02098EF8(Poffin *param0, Pokemon *param1); #endif // POKEPLATINUM_UNK_020989DC_H diff --git a/include/unk_02098FFC.h b/include/unk_02098FFC.h index f40d8da714..92d1467961 100644 --- a/include/unk_02098FFC.h +++ b/include/unk_02098FFC.h @@ -4,11 +4,11 @@ #include "struct_defs/struct_0209903C.h" #include "struct_defs/struct_0209916C.h" -UnkStruct_0209903C * sub_02098FFC(int param0, u16 param1, u16 param2, u16 param3, int param4); -void sub_0209903C(UnkStruct_0209903C * param0); -void sub_02099160(UnkStruct_0209903C * param0); -UnkStruct_0209916C * sub_0209916C(UnkStruct_0209903C * param0, int param1, u16 param2, u16 param3, u16 param4, u8 param5, u8 param6, int param7); -void sub_0209933C(UnkStruct_0209903C * param0, UnkStruct_0209916C * param1, int param2); -void sub_02099370(UnkStruct_0209903C * param0, UnkStruct_0209916C * param1); +UnkStruct_0209903C *sub_02098FFC(int param0, u16 param1, u16 param2, u16 param3, int param4); +void sub_0209903C(UnkStruct_0209903C *param0); +void sub_02099160(UnkStruct_0209903C *param0); +UnkStruct_0209916C *sub_0209916C(UnkStruct_0209903C *param0, int param1, u16 param2, u16 param3, u16 param4, u8 param5, u8 param6, int param7); +void sub_0209933C(UnkStruct_0209903C *param0, UnkStruct_0209916C *param1, int param2); +void sub_02099370(UnkStruct_0209903C *param0, UnkStruct_0209916C *param1); #endif // POKEPLATINUM_UNK_02098FFC_H diff --git a/include/unk_02099500.h b/include/unk_02099500.h index 3c2a9e1df1..c9ce90b9fd 100644 --- a/include/unk_02099500.h +++ b/include/unk_02099500.h @@ -1,8 +1,8 @@ #ifndef POKEPLATINUM_UNK_02099500_H #define POKEPLATINUM_UNK_02099500_H -void sub_02099510(int param0, int param1, void * param2, void * param3); -void CommFieldCmd_Init(void * param0); +void sub_02099510(int param0, int param1, void *param2, void *param3); +void CommFieldCmd_Init(void *param0); int sub_02099530(void); int sub_02099538(void); int sub_02099540(void); diff --git a/include/unk_02099550.h b/include/unk_02099550.h index 8807e96668..fd9e0e6c5b 100644 --- a/include/unk_02099550.h +++ b/include/unk_02099550.h @@ -7,7 +7,7 @@ void sub_02099550(void); void sub_02099560(void); void sub_02099570(void); void sub_02099580(void); -void sub_02099590(SaveData * param0, int param1); +void sub_02099590(SaveData *param0, int param1); void sub_020995B4(void); void sub_020995C4(void); diff --git a/include/unk_02099604.h b/include/unk_02099604.h index acbd596240..d8fa726df6 100644 --- a/include/unk_02099604.h +++ b/include/unk_02099604.h @@ -2,11 +2,12 @@ #define POKEPLATINUM_UNK_02099604_H #include "field/field_system_decl.h" -#include "savedata.h" #include "overlay082/struct_ov82_0223B164.h" -UnkStruct_ov82_0223B164 * sub_02099604(int param0, SaveData * param1, int param2); -UnkStruct_ov82_0223B164 * sub_02099674(FieldSystem * fieldSystem, int param1, int param2); -UnkStruct_ov82_0223B164 * sub_020996A0(FieldSystem * fieldSystem, int param1, BOOL param2); +#include "savedata.h" + +UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int param2); +UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int param2); +UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int param1, BOOL param2); #endif // POKEPLATINUM_UNK_02099604_H diff --git a/include/unk_020996D0.h b/include/unk_020996D0.h index b521fc2460..19e94aeed3 100644 --- a/include/unk_020996D0.h +++ b/include/unk_020996D0.h @@ -8,7 +8,7 @@ u32 sub_02099720(u32 param0); u32 sub_0209972C(u32 param0); u32 sub_02099748(u32 param0); u32 sub_02099764(u32 param0); -const u8 * sub_02099780(u32 param0); +const u8 *sub_02099780(u32 param0); u32 sub_0209979C(u32 param0); #endif // POKEPLATINUM_UNK_020996D0_H diff --git a/include/unk_020997B8.h b/include/unk_020997B8.h index 08d94c5512..f12a8298c6 100644 --- a/include/unk_020997B8.h +++ b/include/unk_020997B8.h @@ -1,12 +1,13 @@ #ifndef POKEPLATINUM_UNK_020997B8_H #define POKEPLATINUM_UNK_020997B8_H -#include "pokemon.h" #include "struct_defs/struct_020997B8.h" -UnkStruct_020997B8 * sub_020997B8(u32 param0); -void sub_020997D0(UnkStruct_020997B8 * param0); -u16 * sub_020997D8(Pokemon * param0, u32 param1); -BOOL sub_020998D8(u16 * param0); +#include "pokemon.h" + +UnkStruct_020997B8 *sub_020997B8(u32 param0); +void sub_020997D0(UnkStruct_020997B8 *param0); +u16 *sub_020997D8(Pokemon *param0, u32 param1); +BOOL sub_020998D8(u16 *param0); #endif // POKEPLATINUM_UNK_020997B8_H diff --git a/include/unk_020998EC.h b/include/unk_020998EC.h index 4290de3415..c30f4691e9 100644 --- a/include/unk_020998EC.h +++ b/include/unk_020998EC.h @@ -1,17 +1,18 @@ #ifndef POKEPLATINUM_UNK_020998EC_H #define POKEPLATINUM_UNK_020998EC_H -#include "strbuf.h" #include "struct_decls/struct_0209747C_decl.h" #include "struct_decls/struct_020998EC_decl.h" -UnkStruct_020998EC * sub_020998EC(u32 param0, const UnkStruct_0209747C * param1); -void sub_0209992C(UnkStruct_020998EC * param0); -u32 sub_02099CA0(const UnkStruct_020998EC * param0, u32 param1); -void sub_02099CA8(const UnkStruct_020998EC * param0, u32 param1, u32 param2, Strbuf *param3); -u16 sub_02099CC8(const UnkStruct_020998EC * param0, u32 param1, u32 param2); -u32 sub_02099CDC(const UnkStruct_020998EC * param0, u32 param1); -void sub_02099CEC(const UnkStruct_020998EC * param0, u32 param1, u32 param2, Strbuf *param3); -u16 sub_02099D14(const UnkStruct_020998EC * param0, u32 param1, u32 param2); +#include "strbuf.h" + +UnkStruct_020998EC *sub_020998EC(u32 param0, const UnkStruct_0209747C *param1); +void sub_0209992C(UnkStruct_020998EC *param0); +u32 sub_02099CA0(const UnkStruct_020998EC *param0, u32 param1); +void sub_02099CA8(const UnkStruct_020998EC *param0, u32 param1, u32 param2, Strbuf *param3); +u16 sub_02099CC8(const UnkStruct_020998EC *param0, u32 param1, u32 param2); +u32 sub_02099CDC(const UnkStruct_020998EC *param0, u32 param1); +void sub_02099CEC(const UnkStruct_020998EC *param0, u32 param1, u32 param2, Strbuf *param3); +u16 sub_02099D14(const UnkStruct_020998EC *param0, u32 param1, u32 param2); #endif // POKEPLATINUM_UNK_020998EC_H diff --git a/include/unk_02099D44.h b/include/unk_02099D44.h index 3136aae900..129fbc058e 100644 --- a/include/unk_02099D44.h +++ b/include/unk_02099D44.h @@ -2,9 +2,9 @@ #define POKEPLATINUM_UNK_02099D44_H void sub_02099D44(void); -void sub_02099D54(u32 param0, const void * param1, u32 param2); -BOOL sub_02099D7C(u32 param0, void * param1, u32 param2); -void sub_02099DA8(u32 param0, const void * param1, u32 param2); -BOOL sub_02099DD0(u32 param0, void * param1, u32 param2); +void sub_02099D54(u32 param0, const void *param1, u32 param2); +BOOL sub_02099D7C(u32 param0, void *param1, u32 param2); +void sub_02099DA8(u32 param0, const void *param1, u32 param2); +BOOL sub_02099DD0(u32 param0, void *param1, u32 param2); #endif // POKEPLATINUM_UNK_02099D44_H diff --git a/include/unk_0209AC14.h b/include/unk_0209AC14.h index 6d0cd6b27f..8dc51655ca 100644 --- a/include/unk_0209AC14.h +++ b/include/unk_0209AC14.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -BOOL sub_0209AC14(TaskManager * param0); +BOOL sub_0209AC14(TaskManager *param0); #endif // POKEPLATINUM_UNK_0209AC14_H diff --git a/include/unk_0209ACBC.h b/include/unk_0209ACBC.h index 3af3550576..3312b4b8b1 100644 --- a/include/unk_0209ACBC.h +++ b/include/unk_0209ACBC.h @@ -3,11 +3,11 @@ #include "struct_decls/struct_0209ACBC_decl.h" -UnkStruct_0209ACBC * sub_0209ACBC(u32 param0); -void sub_0209ACDC(UnkStruct_0209ACBC * param0); -u32 sub_0209ACE4(const UnkStruct_0209ACBC * param0); -void sub_0209ACE8(UnkStruct_0209ACBC * param0, u32 param1); -u32 sub_0209ACEC(const UnkStruct_0209ACBC * param0); -void sub_0209ACF0(UnkStruct_0209ACBC * param0, u32 param1); +UnkStruct_0209ACBC *sub_0209ACBC(u32 param0); +void sub_0209ACDC(UnkStruct_0209ACBC *param0); +u32 sub_0209ACE4(const UnkStruct_0209ACBC *param0); +void sub_0209ACE8(UnkStruct_0209ACBC *param0, u32 param1); +u32 sub_0209ACEC(const UnkStruct_0209ACBC *param0); +void sub_0209ACF0(UnkStruct_0209ACBC *param0, u32 param1); #endif // POKEPLATINUM_UNK_0209ACBC_H diff --git a/include/unk_0209ACF4.h b/include/unk_0209ACF4.h index c9f7ee7825..0b8b197e9a 100644 --- a/include/unk_0209ACF4.h +++ b/include/unk_0209ACF4.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -void sub_0209ACF4(TaskManager * param0); +void sub_0209ACF4(TaskManager *param0); #endif // POKEPLATINUM_UNK_0209ACF4_H diff --git a/include/unk_0209B344.h b/include/unk_0209B344.h index 1fef33481d..1a73807f32 100644 --- a/include/unk_0209B344.h +++ b/include/unk_0209B344.h @@ -3,6 +3,6 @@ #include "struct_decls/struct_020508D4_decl.h" -void sub_0209B344(TaskManager * param0, u16 * param1); +void sub_0209B344(TaskManager *param0, u16 *param1); #endif // POKEPLATINUM_UNK_0209B344_H diff --git a/include/unk_0209B6F8.h b/include/unk_0209B6F8.h index 5ef3be8e92..706ac9ccce 100644 --- a/include/unk_0209B6F8.h +++ b/include/unk_0209B6F8.h @@ -1,8 +1,8 @@ #ifndef POKEPLATINUM_UNK_0209B6F8_H #define POKEPLATINUM_UNK_0209B6F8_H -#include "overlay_manager.h" #include "struct_decls/struct_0209B75C_decl.h" + #include "functypes/funcptr_0209B988.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223C4CC_decl.h" @@ -10,17 +10,19 @@ #include "overlay104/struct_ov104_0223C688.h" #include "overlay104/struct_ov104_0223D3B0.h" -UnkStruct_ov104_02230BE4 * sub_0209B970(UnkStruct_0209B75C * param0); -UnkStruct_ov104_0223C4CC * sub_0209B974(UnkStruct_0209B75C * param0); -void * sub_0209B978(UnkStruct_0209B75C * param0); -void sub_0209B980(UnkStruct_0209B75C * param0, void * param1); -void sub_0209B988(UnkStruct_0209B75C * param0, const OverlayManagerTemplate * param1, void * param2, int param3, UnkFuncPtr_0209B988 param4); -void sub_0209B9B4(UnkStruct_0209B75C * param0); -void sub_0209B9BC(UnkStruct_0209B75C * param0, u16 param1, u16 param2); -UnkStruct_ov104_0223C688 * sub_0209B9CC(UnkStruct_0209B75C * param0); -UnkStruct_ov104_0223C634 * sub_0209B9D0(UnkStruct_0209B75C * param0); -UnkStruct_ov104_0223C634 * sub_0209B9D4(UnkStruct_0209B75C * param0, int param1); -UnkStruct_ov104_0223D3B0 * sub_0209B9E0(UnkStruct_0209B75C * param0); -void sub_0209B9EC(UnkStruct_0209B75C * param0); +#include "overlay_manager.h" + +UnkStruct_ov104_02230BE4 *sub_0209B970(UnkStruct_0209B75C *param0); +UnkStruct_ov104_0223C4CC *sub_0209B974(UnkStruct_0209B75C *param0); +void *sub_0209B978(UnkStruct_0209B75C *param0); +void sub_0209B980(UnkStruct_0209B75C *param0, void *param1); +void sub_0209B988(UnkStruct_0209B75C *param0, const OverlayManagerTemplate *param1, void *param2, int param3, UnkFuncPtr_0209B988 param4); +void sub_0209B9B4(UnkStruct_0209B75C *param0); +void sub_0209B9BC(UnkStruct_0209B75C *param0, u16 param1, u16 param2); +UnkStruct_ov104_0223C688 *sub_0209B9CC(UnkStruct_0209B75C *param0); +UnkStruct_ov104_0223C634 *sub_0209B9D0(UnkStruct_0209B75C *param0); +UnkStruct_ov104_0223C634 *sub_0209B9D4(UnkStruct_0209B75C *param0, int param1); +UnkStruct_ov104_0223D3B0 *sub_0209B9E0(UnkStruct_0209B75C *param0); +void sub_0209B9EC(UnkStruct_0209B75C *param0); #endif // POKEPLATINUM_UNK_0209B6F8_H diff --git a/include/unk_0209BA18.h b/include/unk_0209BA18.h index 957aa93d7a..3bbaca1207 100644 --- a/include/unk_0209BA18.h +++ b/include/unk_0209BA18.h @@ -4,6 +4,6 @@ #include "field/field_system_decl.h" #include "overlay104/struct_ov104_02230BE4.h" -UnkStruct_ov104_02230BE4 * sub_0209BA18(FieldSystem * fieldSystem, void * param1); +UnkStruct_ov104_02230BE4 *sub_0209BA18(FieldSystem *fieldSystem, void *param1); #endif // POKEPLATINUM_UNK_0209BA18_H diff --git a/include/unk_0209BA80.h b/include/unk_0209BA80.h index d85795c285..c9d2308f0f 100644 --- a/include/unk_0209BA80.h +++ b/include/unk_0209BA80.h @@ -4,12 +4,12 @@ #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0209BBA4.h" -void sub_0209BA80(void * param0); -BOOL sub_0209BB08(UnkStruct_0204AFC4 * param0); -BOOL sub_0209BBA4(UnkStruct_0209BBA4 * param0); -BOOL sub_0209BC1C(UnkStruct_0209BBA4 * param0, u16 param1); -BOOL sub_0209BC64(UnkStruct_0209BBA4 * param0, u16 param1, u16 param2); -BOOL sub_0209BD68(UnkStruct_0209BBA4 * param0, u16 param1); -BOOL sub_0209BDB0(UnkStruct_0209BBA4 * param0, u16 param1); +void sub_0209BA80(void *param0); +BOOL sub_0209BB08(UnkStruct_0204AFC4 *param0); +BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0); +BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1); +BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2); +BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1); +BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1); #endif // POKEPLATINUM_UNK_0209BA80_H diff --git a/include/unk_0209BDF8.h b/include/unk_0209BDF8.h index 09e0f95f18..cccc9450af 100644 --- a/include/unk_0209BDF8.h +++ b/include/unk_0209BDF8.h @@ -1,15 +1,15 @@ #ifndef POKEPLATINUM_UNK_0209BDF8_H #define POKEPLATINUM_UNK_0209BDF8_H -#include "struct_defs/struct_0209BDF8.h" #include "struct_decls/struct_0209C194_decl.h" +#include "struct_defs/struct_0209BDF8.h" -UnkStruct_0209BDF8 * sub_0209BDF8(UnkStruct_0209C194 * param0, u32 param1); -void sub_0209BE38(UnkStruct_0209BDF8 * param0); -void sub_0209BE50(UnkStruct_0209BDF8 * param0); -void sub_0209BE64(UnkStruct_0209BDF8 * param0); -BOOL sub_0209BEBC(UnkStruct_0209BDF8 * param0, u32 param1, const void * param2, u32 param3); +UnkStruct_0209BDF8 *sub_0209BDF8(UnkStruct_0209C194 *param0, u32 param1); +void sub_0209BE38(UnkStruct_0209BDF8 *param0); +void sub_0209BE50(UnkStruct_0209BDF8 *param0); +void sub_0209BE64(UnkStruct_0209BDF8 *param0); +BOOL sub_0209BEBC(UnkStruct_0209BDF8 *param0, u32 param1, const void *param2, u32 param3); int sub_0209C16C(void); -void * sub_0209C188(UnkStruct_0209BDF8 * param0, int param1); +void *sub_0209C188(UnkStruct_0209BDF8 *param0, int param1); #endif // POKEPLATINUM_UNK_0209BDF8_H diff --git a/include/unk_0209C194.h b/include/unk_0209C194.h index 3f80508cfc..55e4d62452 100644 --- a/include/unk_0209C194.h +++ b/include/unk_0209C194.h @@ -1,14 +1,15 @@ #ifndef POKEPLATINUM_UNK_0209C194_H #define POKEPLATINUM_UNK_0209C194_H -#include "field/field_system_decl.h" -#include "struct_defs/struct_0209C194_1.h" #include "struct_decls/struct_0209C194_decl.h" +#include "struct_defs/struct_0209C194_1.h" + +#include "field/field_system_decl.h" -UnkStruct_0209C194 * sub_0209C194(UnkStruct_0209C194_1 * param0, u32 param1); -void sub_0209C1D0(UnkStruct_0209C194 * param0); -BOOL sub_0209C1E8(UnkStruct_0209C194 * param0); -void * sub_0209C1EC(FieldSystem * fieldSystem); -BOOL sub_0209C238(void * param0); +UnkStruct_0209C194 *sub_0209C194(UnkStruct_0209C194_1 *param0, u32 param1); +void sub_0209C1D0(UnkStruct_0209C194 *param0); +BOOL sub_0209C1E8(UnkStruct_0209C194 *param0); +void *sub_0209C1EC(FieldSystem *fieldSystem); +BOOL sub_0209C238(void *param0); #endif // POKEPLATINUM_UNK_0209C194_H diff --git a/include/unk_0209C370.h b/include/unk_0209C370.h index b2e152b475..b652fe86af 100644 --- a/include/unk_0209C370.h +++ b/include/unk_0209C370.h @@ -3,7 +3,7 @@ #include "struct_defs/struct_0209C370.h" -UnkStruct_0209C370 * sub_0209C370(int param0); -void sub_0209C388(UnkStruct_0209C370 * param0); +UnkStruct_0209C370 *sub_0209C370(int param0); +void sub_0209C388(UnkStruct_0209C370 *param0); #endif // POKEPLATINUM_UNK_0209C370_H diff --git a/include/unk_0209C390.h b/include/unk_0209C390.h index 305c01bebe..1e9d8b6782 100644 --- a/include/unk_0209C390.h +++ b/include/unk_0209C390.h @@ -3,13 +3,13 @@ #include "overlay065/struct_ov65_02236744_decl.h" -void sub_0209C390(UnkStruct_ov65_02236744 * param0); +void sub_0209C390(UnkStruct_ov65_02236744 *param0); void sub_0209C3AC(void); int sub_0209C3C4(void); int sub_0209C3C8(void); int sub_0209C3CC(void); -void sub_0209C3D0(int param0, int param1, void * param2, void * param3); -void sub_0209C3E0(int param0, int param1, void * param2, void * param3); -void sub_0209C3F0(int param0, int param1, void * param2, void * param3); +void sub_0209C3D0(int param0, int param1, void *param2, void *param3); +void sub_0209C3E0(int param0, int param1, void *param2, void *param3); +void sub_0209C3F0(int param0, int param1, void *param2, void *param3); #endif // POKEPLATINUM_UNK_0209C390_H diff --git a/include/vars_flags.h b/include/vars_flags.h index b422146a94..25390ddd81 100644 --- a/include/vars_flags.h +++ b/include/vars_flags.h @@ -3,14 +3,14 @@ #include "savedata.h" -#define VARS_START 0x4000 -#define NUM_VARS 288 -#define NUM_FLAGS 2912 +#define VARS_START 0x4000 +#define NUM_VARS 288 +#define NUM_FLAGS 2912 -#define SPECIAL_VARS_START 0x8000 +#define SPECIAL_VARS_START 0x8000 -#define NUM_UNKNOWN_FLAGS 64 -#define UNKNOWN_FLAGS_START 0x4000 +#define NUM_UNKNOWN_FLAGS 64 +#define UNKNOWN_FLAGS_START 0x4000 typedef struct VarsFlags { u16 vars[NUM_VARS]; @@ -18,12 +18,12 @@ typedef struct VarsFlags { } VarsFlags; int VarsFlags_SaveSize(void); -void VarsFlags_Init(VarsFlags * varsFlags); -VarsFlags * SaveData_GetVarsFlags(SaveData * saveData); -BOOL VarsFlags_CheckFlag(VarsFlags * varsFlags, u16 flagID); -void VarsFlags_SetFlag(VarsFlags * varsFlags, u16 flagID); -void VarsFlags_ClearFlag(VarsFlags * varsFlags, u16 flagID); -u8 * VarsFlags_GetFlagChunk(VarsFlags * varsFlags, u16 flagID); -u16 * VarsFlags_GetVarAddress(VarsFlags * varsFlags, u16 varID); +void VarsFlags_Init(VarsFlags *varsFlags); +VarsFlags *SaveData_GetVarsFlags(SaveData *saveData); +BOOL VarsFlags_CheckFlag(VarsFlags *varsFlags, u16 flagID); +void VarsFlags_SetFlag(VarsFlags *varsFlags, u16 flagID); +void VarsFlags_ClearFlag(VarsFlags *varsFlags, u16 flagID); +u8 *VarsFlags_GetFlagChunk(VarsFlags *varsFlags, u16 flagID); +u16 *VarsFlags_GetVarAddress(VarsFlags *varsFlags, u16 varID); #endif // POKEPLATINUM_VARS_FLAGS_H diff --git a/src/ascii_util.c b/src/ascii_util.c index 57c5a4d78c..d37f545c46 100644 --- a/src/ascii_util.c +++ b/src/ascii_util.c @@ -1,11 +1,12 @@ +#include "ascii_util.h" + #include -#include #include +#include -#include "ascii_util.h" #include "constants/charcode.h" -int Ascii_Length (char *str) +int Ascii_Length(char *str) { int length = 0; @@ -16,7 +17,7 @@ int Ascii_Length (char *str) return length; } -char* Ascii_CopyToTerminator (char *src, char *dst, char terminator) +char *Ascii_CopyToTerminator(char *src, char *dst, char terminator) { for (int i = 0; i < MAX_STRING_COPY_LEN; i++) { dst[i] = src[i]; @@ -35,7 +36,7 @@ char* Ascii_CopyToTerminator (char *src, char *dst, char terminator) return NULL; } -int Ascii_ConvertToInt (char *str) +int Ascii_ConvertToInt(char *str) { int length = Ascii_Length(str); int i; @@ -61,7 +62,7 @@ int Ascii_ConvertToInt (char *str) return ret; } -void Ascii_SetResourceName (NNSG3dResName *resource, const char *src) +void Ascii_SetResourceName(NNSG3dResName *resource, const char *src) { u8 i; for (i = 0; i < NNS_G3D_RESNAME_VALSIZE; i++) { @@ -75,7 +76,7 @@ void Ascii_SetResourceName (NNSG3dResName *resource, const char *src) } } -BOOL IsFullWidthChar (charcode_t character) +BOOL IsFullWidthChar(charcode_t character) { return character < CHAR_EN_0; } diff --git a/src/bag.c b/src/bag.c index 097ed4a194..4153a94ea9 100644 --- a/src/bag.c +++ b/src/bag.c @@ -1,23 +1,24 @@ +#include "bag.h" + #include #include #include "constants/heap.h" #include "constants/items.h" -#include "consts/items.h" #include "constants/savedata/save_table.h" +#include "consts/items.h" + #include "struct_decls/struct_0207CB08_decl.h" -#include "savedata.h" #include "heap.h" +#include "item.h" #include "savedata.h" #include "unk_0207CB08.h" -#include "item.h" -#include "bag.h" -#define BAG_SLOT_INVALID ((u32)(-1)) +#define BAG_SLOT_INVALID ((u32)(-1)) -#define BAG_MAX_QUANTITY_ITEM 999 -#define BAG_MAX_QUANTITY_TMHM 99 +#define BAG_MAX_QUANTITY_ITEM 999 +#define BAG_MAX_QUANTITY_TMHM 99 static u32 Bag_GetPocketForItem(Bag *bag, u16 item, BagItem **outPocket, u32 *outMax, enum HeapId heapID); @@ -124,7 +125,7 @@ static BagItem *Bag_FindSlotToAddItem(Bag *bag, u16 item, u16 count, enum HeapId { BagItem *pocketItems; u32 pocketSize; - + u32 pocket = Bag_GetPocketForItem(bag, item, &pocketItems, &pocketSize, heapID); if (pocket == POCKET_TMHMS) { return Pocket_FindSlotToAddItem(pocketItems, pocketSize, item, count, BAG_MAX_QUANTITY_TMHM); @@ -322,7 +323,7 @@ void Pocket_Sort(BagItem *pocket, const u32 size) void *sub_0207D824(Bag *bag, const u8 *pockets, enum HeapId heapID) { - UnkStruct_0207CB08 * v0; + UnkStruct_0207CB08 *v0; int i; v0 = sub_0207CB08(heapID); @@ -407,9 +408,9 @@ Bag *SaveData_GetBag(SaveData *saveData) return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_BAG); } -UnkStruct_0207D99C * sub_0207D99C (u32 param0) +UnkStruct_0207D99C *sub_0207D99C(u32 param0) { - UnkStruct_0207D99C * v0; + UnkStruct_0207D99C *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0207D99C)); MI_CpuClear16(v0, sizeof(UnkStruct_0207D99C)); @@ -417,56 +418,56 @@ UnkStruct_0207D99C * sub_0207D99C (u32 param0) return v0; } -void sub_0207D9B4 (UnkStruct_0207D99C * param0, u32 param1, u8 * param2, u8 * param3) +void sub_0207D9B4(UnkStruct_0207D99C *param0, u32 param1, u8 *param2, u8 *param3) { *param2 = param0->unk_00.unk_08[param1]; *param3 = param0->unk_00.unk_00[param1]; } -u16 sub_0207D9C4 (UnkStruct_0207D99C * param0) +u16 sub_0207D9C4(UnkStruct_0207D99C *param0) { return param0->unk_00.unk_10; } -void sub_0207D9C8 (UnkStruct_0207D99C * param0, u32 param1, u8 param2, u8 param3) +void sub_0207D9C8(UnkStruct_0207D99C *param0, u32 param1, u8 param2, u8 param3) { param0->unk_00.unk_08[param1] = param2; param0->unk_00.unk_00[param1] = param3; } -void sub_0207D9D4 (UnkStruct_0207D99C * param0, u16 param1) +void sub_0207D9D4(UnkStruct_0207D99C *param0, u16 param1) { param0->unk_00.unk_10 = param1; } -void sub_0207D9D8 (UnkStruct_0207D99C * param0, u32 param1, u8 * param2, u8 * param3) +void sub_0207D9D8(UnkStruct_0207D99C *param0, u32 param1, u8 *param2, u8 *param3) { *param2 = param0->unk_14.unk_05[param1]; *param3 = param0->unk_14.unk_00[param1]; } -u16 sub_0207D9E4 (UnkStruct_0207D99C * param0) +u16 sub_0207D9E4(UnkStruct_0207D99C *param0) { return param0->unk_14.unk_0A; } -u16 sub_0207D9E8 (UnkStruct_0207D99C * param0) +u16 sub_0207D9E8(UnkStruct_0207D99C *param0) { return param0->unk_14.unk_0C; } -u16 sub_0207D9EC (UnkStruct_0207D99C * param0) +u16 sub_0207D9EC(UnkStruct_0207D99C *param0) { return param0->unk_14.unk_0E; } -void sub_0207D9F0 (UnkStruct_0207D99C * param0, u32 param1, u8 param2, u8 param3) +void sub_0207D9F0(UnkStruct_0207D99C *param0, u32 param1, u8 param2, u8 param3) { param0->unk_14.unk_05[param1] = param2; param0->unk_14.unk_00[param1] = param3; } -void sub_0207D9F8 (UnkStruct_0207D99C * param0) +void sub_0207D9F8(UnkStruct_0207D99C *param0) { u32 v0; @@ -477,13 +478,13 @@ void sub_0207D9F8 (UnkStruct_0207D99C * param0) sub_0207DA24(param0, 0); } -void Bag_SetLastItemUsed (UnkStruct_0207D99C * param0, u16 param1, u16 param2) +void Bag_SetLastItemUsed(UnkStruct_0207D99C *param0, u16 param1, u16 param2) { param0->unk_14.unk_0A = param1; param0->unk_14.unk_0C = param2; } -void sub_0207DA24 (UnkStruct_0207D99C * param0, u16 param1) +void sub_0207DA24(UnkStruct_0207D99C *param0, u16 param1) { param0->unk_14.unk_0E = param1; } diff --git a/src/battle/battle_controller.c b/src/battle/battle_controller.c index 382de1b769..7fce8abaef 100644 --- a/src/battle/battle_controller.c +++ b/src/battle/battle_controller.c @@ -1,50 +1,49 @@ +#include "battle/battle_controller.h" + +#include "nitro/types.h" #include #include -#include "consts/abilities.h" - #include "constants/battle.h" #include "constants/heap.h" #include "constants/items.h" #include "constants/moves.h" #include "constants/narc.h" #include "constants/pokemon.h" -#include "consts/sdat.h" +#include "constants/savedata/record.h" #include "constants/species.h" #include "constants/trainer.h" -#include "constants/savedata/record.h" +#include "consts/abilities.h" +#include "consts/sdat.h" -#include "nitro/types.h" #include "struct_decls/battle_system.h" #include "struct_defs/trainer_data.h" -#include "battle/common.h" #include "battle/ai_context.h" #include "battle/battle_context.h" -#include "battle/battle_controller.h" +#include "battle/battle_display.h" +#include "battle/battle_io.h" +#include "battle/battle_lib.h" #include "battle/battle_message.h" #include "battle/battle_script.h" +#include "battle/common.h" +#include "battle/ov16_0223B140.h" +#include "battle/ov16_0223DF00.h" #include "battle/scripts/sub_seq.naix" - -#include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_0224DDA8.h" +#include "battle/struct_ov16_0225BFFC_decl.h" -#include "unk_02005474.h" -#include "unk_0200F174.h" -#include "heap.h" -#include "trainer_info.h" +#include "bag.h" #include "communication_system.h" -#include "pokemon.h" +#include "flags.h" +#include "heap.h" +#include "item.h" #include "move_table.h" #include "party.h" -#include "item.h" -#include "bag.h" -#include "flags.h" -#include "battle/ov16_0223B140.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_lib.h" -#include "battle/battle_display.h" -#include "battle/battle_io.h" +#include "pokemon.h" +#include "trainer_info.h" +#include "unk_02005474.h" +#include "unk_0200F174.h" enum { STATE_PROCESSING = 0, @@ -52,7 +51,7 @@ enum { STATE_DONE }; -typedef void (*BattleControlFunc)(BattleSystem*, BattleContext*); +typedef void (*BattleControlFunc)(BattleSystem *, BattleContext *); static void BattleController_InitBattleMons(BattleSystem *battleSys, BattleContext *battleCtx); static void BattleController_StartEncounter(BattleSystem *battleSys, BattleContext *battleCtx); @@ -109,7 +108,7 @@ static BOOL BattleController_TriggerImmunityAbilities(BattleSystem *battleSys, B static BOOL BattleController_LoadQuickClawCheck(BattleSystem *battleSys, BattleContext *battleCtx); static int BattleController_CheckMoveHitAccuracy(BattleSystem *battleSys, BattleContext *battleCtx, int attacker, int defender, int move); static int BattleController_CheckMoveHitOverrides(BattleSystem *battleSys, BattleContext *battleCtx, int attacker, int defender, int move); -static BOOL BattleController_MoveStolen(BattleSystem *battleSys, BattleContext * battleCtx); +static BOOL BattleController_MoveStolen(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BattleController_ReplaceFainted(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BattleController_CheckBattleOver(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BattleController_MustSelectTarget(BattleSystem *battleSys, BattleContext *battleCtx, u8 battler, u32 battleType, int *range, int moveSlot, u32 *target); @@ -176,7 +175,7 @@ static const BattleControlFunc sBattleControlCommands[] = { BattleController_EndWait }; -void* BattleContext_New(BattleSystem *battleSys) +void *BattleContext_New(BattleSystem *battleSys) { BattleContext *battleContext = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleContext)); @@ -195,8 +194,8 @@ void* BattleContext_New(BattleSystem *battleSys) BOOL BattleController_Main(BattleSystem *battleSys, BattleContext *battleCtx) { if (battleCtx->battleEndFlag == FALSE - && BattleSystem_ResultMask(battleSys) - && (BattleSystem_ResultMask(battleSys) & BATTLE_RESULT_TRY_FLEE_WAIT) == FALSE) { + && BattleSystem_ResultMask(battleSys) + && (BattleSystem_ResultMask(battleSys) & BATTLE_RESULT_TRY_FLEE_WAIT) == FALSE) { battleCtx->command = BATTLE_CONTROL_RESULT; } @@ -307,7 +306,7 @@ enum { static inline BOOL SingleControllerForSide(BattleContext *battleCtx, int battler, int side) { - return (battler == side + 2 && battleCtx->curCommandState[side] != COMMAND_SELECTION_END); + return battler == side + 2 && battleCtx->curCommandState[side] != COMMAND_SELECTION_END; } static void BattleController_CommandSelectionInput(BattleSystem *battleSys, BattleContext *battleCtx) @@ -322,9 +321,9 @@ static void BattleController_CommandSelectionInput(BattleSystem *battleSys, Batt case COMMAND_SELECTION_INIT: // No need to reinitialize if the same controller acts for both battlers on a side. if ((battleType & BATTLE_TYPE_DOUBLES) - && (battleType & BATTLE_TYPE_2vs2) == FALSE - && (SingleControllerForSide(battleCtx, i, BATTLE_SIDE_PLAYER) - || SingleControllerForSide(battleCtx, i, BATTLE_SIDE_ENEMY))) { + && (battleType & BATTLE_TYPE_2vs2) == FALSE + && (SingleControllerForSide(battleCtx, i, BATTLE_SIDE_PLAYER) + || SingleControllerForSide(battleCtx, i, BATTLE_SIDE_ENEMY))) { break; } @@ -396,7 +395,7 @@ static void BattleController_CommandSelectionInput(BattleSystem *battleSys, Batt battleCtx->nextCommandState[i] = COMMAND_SELECTION_WAIT; battleCtx->battlerActions[i][BATTLE_ACTION_PICK_COMMAND] = BATTLE_CONTROL_SAFARI_BALL; break; - + case PLAYER_INPUT_SAFARI_BAIT: battleCtx->curCommandState[i] = COMMAND_SELECTION_CLEAR_TOUCH_SCREEN; battleCtx->nextCommandState[i] = COMMAND_SELECTION_WAIT; @@ -541,7 +540,7 @@ static void BattleController_CommandSelectionInput(BattleSystem *battleSys, Batt battleCtx->curCommandState[i] = COMMAND_SELECTION_WAIT; } break; - + case COMMAND_SELECTION_TARGET_SELECT: if (BattleContext_IOBufferVal(battleCtx, i) == PLAYER_INPUT_CANCEL) { battleCtx->curCommandState[i] = COMMAND_SELECTION_MOVE_SELECT_INIT; @@ -574,10 +573,10 @@ static void BattleController_CommandSelectionInput(BattleSystem *battleSys, Batt // Check the partner's selection in a double battle if ((BattleSystem_BattlerSlot(battleSys, i) == BATTLER_TYPE_PLAYER_SIDE_SLOT_2 || BattleSystem_BattlerSlot(battleSys, i) == BATTLER_TYPE_ENEMY_SIDE_SLOT_2) - && (battleType == BATTLE_TYPE_TRAINER_DOUBLES - || battleType == BATTLE_TYPE_LINK_DOUBLES - || battleType == BATTLE_TYPE_FRONTIER_DOUBLES - || (battleType == BATTLE_TYPE_TAG_DOUBLES && BattleSystem_BattlerSlot(battleSys, i) == BATTLER_TYPE_PLAYER_SIDE_SLOT_2))) { + && (battleType == BATTLE_TYPE_TRAINER_DOUBLES + || battleType == BATTLE_TYPE_LINK_DOUBLES + || battleType == BATTLE_TYPE_FRONTIER_DOUBLES + || (battleType == BATTLE_TYPE_TAG_DOUBLES && BattleSystem_BattlerSlot(battleSys, i) == BATTLER_TYPE_PLAYER_SIDE_SLOT_2))) { int partner = BattleSystem_Partner(battleSys, i); if (battleCtx->battlerActions[partner][BATTLE_ACTION_PICK_COMMAND] == BATTLE_CONTROL_PARTY) { @@ -644,8 +643,8 @@ static void BattleController_CommandSelectionInput(BattleSystem *battleSys, Batt } if ((battleType & BATTLE_TYPE_DOUBLES) - && (battleType & BATTLE_TYPE_2vs2) == FALSE - && (battleCtx->curCommandState[i] == COMMAND_SELECTION_WAIT)) { + && (battleType & BATTLE_TYPE_2vs2) == FALSE + && (battleCtx->curCommandState[i] == COMMAND_SELECTION_WAIT)) { battleCtx->curCommandState[BattleSystem_Partner(battleSys, i)] = COMMAND_SELECTION_WAIT; } break; @@ -680,7 +679,7 @@ static void BattleController_CommandSelectionInput(BattleSystem *battleSys, Batt msg.id = 608; // "{0} has no moves left!" msg.params[0] = BattleSystem_NicknameTag(battleCtx, i); BattleIO_SetAlertMessage(battleSys, i, msg); - + battleCtx->curCommandState[i] = COMMAND_SELECTION_ALERT_MESSAGE_WAIT; battleCtx->nextCommandState[i] = COMMAND_SELECTION_WAIT; break; @@ -755,7 +754,7 @@ static void BattleController_CalcTurnOrder(BattleSystem *battleSys, BattleContex // Items and switching are processed next. for (battler = 0; battler < maxBattlers; battler++) { if (battleCtx->battlerActions[battler][BATTLE_ACTION_SELECTED_COMMAND] == PLAYER_INPUT_ITEM - || battleCtx->battlerActions[battler][BATTLE_ACTION_SELECTED_COMMAND] == PLAYER_INPUT_PARTY) { + || battleCtx->battlerActions[battler][BATTLE_ACTION_SELECTED_COMMAND] == PLAYER_INPUT_PARTY) { battleCtx->battlerActionOrder[order] = battler; order++; } @@ -764,7 +763,7 @@ static void BattleController_CalcTurnOrder(BattleSystem *battleSys, BattleContex // Fight is always processed last. for (battler = 0; battler < maxBattlers; battler++) { if (battleCtx->battlerActions[battler][BATTLE_ACTION_SELECTED_COMMAND] != PLAYER_INPUT_ITEM - && battleCtx->battlerActions[battler][BATTLE_ACTION_SELECTED_COMMAND] != PLAYER_INPUT_PARTY) { + && battleCtx->battlerActions[battler][BATTLE_ACTION_SELECTED_COMMAND] != PLAYER_INPUT_PARTY) { battleCtx->battlerActionOrder[order] = battler; order++; } @@ -821,9 +820,9 @@ static void BattleController_CheckPreMoveActions(BattleSystem *battleSys, Battle battleCtx->turnStartCheckTemp++; if ((battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) == FALSE - && Battler_SelectedMove(battleCtx, battler) == MOVE_FOCUS_PUNCH - && Battler_CheckTruant(battleCtx, battler) == FALSE - && battleCtx->turnFlags[battler].struggling == FALSE) { + && Battler_SelectedMove(battleCtx, battler) == MOVE_FOCUS_PUNCH + && Battler_CheckTruant(battleCtx, battler) == FALSE + && battleCtx->turnFlags[battler].struggling == FALSE) { BattleIO_ClearMessageBox(battleSys); battleCtx->msgBattlerTemp = battler; @@ -842,7 +841,7 @@ static void BattleController_CheckPreMoveActions(BattleSystem *battleSys, Battle case PRE_MOVE_ACTION_STATE_CHECK_RAGE_FLAG: for (battler = 0; battler < maxBattlers; battler++) { if ((battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_RAGE) - && Battler_SelectedMove(battleCtx, battler) != MOVE_RAGE) { + && Battler_SelectedMove(battleCtx, battler) != MOVE_RAGE) { battleCtx->battleMons[battler].statusVolatile &= VOLATILE_CONDITION_RAGE; } } @@ -938,8 +937,8 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl do { // Explicit `== TRUE` is needed to match on these if (BattleController_AnyFainted(battleCtx, battleCtx->command, battleCtx->command, 1) == TRUE - || BattleController_AnyExpPayout(battleCtx, battleCtx->command, battleCtx->command) == TRUE - || BattleController_CheckBattleOver(battleSys, battleCtx) == TRUE) { + || BattleController_AnyExpPayout(battleCtx, battleCtx->command, battleCtx->command) == TRUE + || BattleController_CheckBattleOver(battleSys, battleCtx) == TRUE) { return; } @@ -949,7 +948,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl side = battleCtx->fieldConditionCheckTemp; if (battleCtx->sideConditionsMask[side] & SIDE_CONDITION_REFLECT - && --battleCtx->sideConditions[side].reflectTurns == 0) { + && --battleCtx->sideConditions[side].reflectTurns == 0) { battleCtx->sideConditionsMask[side] &= ~SIDE_CONDITION_REFLECT; battleCtx->msgMoveTemp = MOVE_REFLECT; @@ -972,7 +971,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl side = battleCtx->fieldConditionCheckTemp; if (battleCtx->sideConditionsMask[side] & SIDE_CONDITION_LIGHT_SCREEN - && --battleCtx->sideConditions[side].lightScreenTurns == 0) { + && --battleCtx->sideConditions[side].lightScreenTurns == 0) { battleCtx->sideConditionsMask[side] &= ~SIDE_CONDITION_LIGHT_SCREEN; battleCtx->msgMoveTemp = MOVE_LIGHT_SCREEN; @@ -995,7 +994,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl side = battleCtx->fieldConditionCheckTemp; if (battleCtx->sideConditionsMask[side] & SIDE_CONDITION_MIST - && --battleCtx->sideConditions[side].mistTurns == 0) { + && --battleCtx->sideConditions[side].mistTurns == 0) { battleCtx->sideConditionsMask[side] &= ~SIDE_CONDITION_MIST; battleCtx->msgMoveTemp = MOVE_MIST; @@ -1018,7 +1017,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl side = battleCtx->fieldConditionCheckTemp; if (battleCtx->sideConditionsMask[side] & SIDE_CONDITION_SAFEGUARD - && --battleCtx->sideConditions[side].safeguardTurns == 0) { + && --battleCtx->sideConditions[side].safeguardTurns == 0) { battleCtx->sideConditionsMask[side] &= ~SIDE_CONDITION_SAFEGUARD; battleCtx->msgBattlerTemp = battleCtx->sideConditions[side].safeguardUser; @@ -1087,8 +1086,8 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl side = battleCtx->monSpeedOrder[battleCtx->fieldConditionCheckTemp]; // actually a battler, but must reuse side var to match if (battleCtx->fieldConditions.wishTurns[side] - && --battleCtx->fieldConditions.wishTurns[side] == 0 - && battleCtx->battleMons[side].curHP) { + && --battleCtx->fieldConditions.wishTurns[side] == 0 + && battleCtx->battleMons[side].curHP) { battleCtx->msgBattlerTemp = side; battleCtx->msgBuffer.tags = TAG_NICKNAME; @@ -1140,7 +1139,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl if (battleCtx->fieldConditionsMask & FIELD_CONDITION_SANDSTORM_PERM) { battleCtx->msgBuffer.id = 805; // "The sandstorm rages." battleCtx->msgBuffer.tags = TAG_NONE; - + PrepareSubroutineSequence(battleCtx, subscript_weather_continues); } else { if (--battleCtx->fieldConditions.weatherTurns == 0) { @@ -1148,7 +1147,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl } else { battleCtx->msgBuffer.id = 805; // "The sandstorm rages." battleCtx->msgBuffer.tags = TAG_NONE; - + PrepareSubroutineSequence(battleCtx, subscript_weather_continues); } } @@ -1165,7 +1164,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl if (battleCtx->fieldConditionsMask & FIELD_CONDITION_SUNNY_PERM) { battleCtx->msgBuffer.id = 808; // "The sunlight is strong." battleCtx->msgBuffer.tags = TAG_NONE; - + PrepareSubroutineSequence(battleCtx, subscript_weather_continues); } else { if (--battleCtx->fieldConditions.weatherTurns == 0) { @@ -1173,7 +1172,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl } else { battleCtx->msgBuffer.id = 808; // "The sunlight is strong." battleCtx->msgBuffer.tags = TAG_NONE; - + PrepareSubroutineSequence(battleCtx, subscript_weather_continues); } } @@ -1190,7 +1189,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl if (battleCtx->fieldConditionsMask & FIELD_CONDITION_HAILING_PERM) { battleCtx->msgBuffer.id = 811; // "Hail continues to fall." battleCtx->msgBuffer.tags = TAG_NONE; - + PrepareSubroutineSequence(battleCtx, subscript_weather_continues); } else { if (--battleCtx->fieldConditions.weatherTurns == 0) { @@ -1198,7 +1197,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl } else { battleCtx->msgBuffer.id = 811; // "Hail continues to fall." battleCtx->msgBuffer.tags = TAG_NONE; - + PrepareSubroutineSequence(battleCtx, subscript_weather_continues); } } @@ -1214,7 +1213,7 @@ static void BattleController_CheckFieldConditions(BattleSystem *battleSys, Battl if (battleCtx->fieldConditionsMask & FIELD_CONDITION_DEEP_FOG) { battleCtx->msgBuffer.id = 813; // "The fog is deep..." battleCtx->msgBuffer.tags = TAG_NONE; - + PrepareSubroutineSequence(battleCtx, subscript_weather_continues); battleCtx->scriptTemp = BATTLE_ANIMATION_WEATHER_FOG; @@ -1293,8 +1292,8 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC // Explicit `== TRUE` is needed to match on these. if (BattleController_AnyFainted(battleCtx, battleCtx->command, battleCtx->command, 1) == TRUE - || BattleController_AnyExpPayout(battleCtx, battleCtx->command, battleCtx->command) == TRUE - || BattleController_CheckBattleOver(battleSys, battleCtx) == TRUE) { + || BattleController_AnyExpPayout(battleCtx, battleCtx->command, battleCtx->command) == TRUE + || BattleController_CheckBattleOver(battleSys, battleCtx) == TRUE) { return; } @@ -1310,8 +1309,8 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC switch (battleCtx->monConditionCheckState) { case MON_COND_CHECK_STATE_INGRAIN: if ((battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_INGRAIN) - && battleCtx->battleMons[battler].curHP != battleCtx->battleMons[battler].maxHP - && battleCtx->battleMons[battler].curHP) { + && battleCtx->battleMons[battler].curHP != battleCtx->battleMons[battler].maxHP + && battleCtx->battleMons[battler].curHP) { if (battleCtx->battleMons[battler].moveEffectsData.healBlockTurns) { battleCtx->msgBattlerTemp = battler; LOAD_SUBSEQ(subscript_cannot_heal); @@ -1331,8 +1330,8 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC case MON_COND_CHECK_STATE_AQUA_RING: if ((battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_AQUA_RING) - && battleCtx->battleMons[battler].curHP != battleCtx->battleMons[battler].maxHP - && battleCtx->battleMons[battler].curHP) { + && battleCtx->battleMons[battler].curHP != battleCtx->battleMons[battler].maxHP + && battleCtx->battleMons[battler].curHP) { if (battleCtx->battleMons[battler].moveEffectsData.healBlockTurns) { battleCtx->msgBattlerTemp = battler; LOAD_SUBSEQ(subscript_cannot_heal); @@ -1377,9 +1376,9 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC case MON_COND_CHECK_STATE_LEECH_SEED: if ((battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_LEECH_SEED) - && battleCtx->battleMons[battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_LEECH_SEED_RECIPIENT].curHP - && Battler_Ability(battleCtx, battler) != ABILITY_MAGIC_GUARD - && battleCtx->battleMons[battler].curHP) { + && battleCtx->battleMons[battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_LEECH_SEED_RECIPIENT].curHP + && Battler_Ability(battleCtx, battler) != ABILITY_MAGIC_GUARD + && battleCtx->battleMons[battler].curHP) { battleCtx->msgAttacker = battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_LEECH_SEED_RECIPIENT; battleCtx->msgDefender = battler; @@ -1425,7 +1424,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC case MON_COND_CHECK_STATE_BURN: if ((battleCtx->battleMons[battler].status & MON_CONDITION_BURN) && battleCtx->battleMons[battler].curHP) { battleCtx->msgBattlerTemp = battler; - + PrepareSubroutineSequence(battleCtx, subscript_burn_damage); state = STATE_BREAK_OUT; } @@ -1485,9 +1484,9 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC battleCtx->scriptTemp = BattleSystem_CountAbility(battleSys, battleCtx, 4, battler, ABILITY_BAD_DREAMS); if ((battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) - && Battler_Ability(battleCtx, battler) != ABILITY_MAGIC_GUARD - && battleCtx->battleMons[battler].curHP - && battleCtx->scriptTemp) { + && Battler_Ability(battleCtx, battler) != ABILITY_MAGIC_GUARD + && battleCtx->battleMons[battler].curHP + && battleCtx->scriptTemp) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * -1, 8); LOAD_SUBSEQ(subscript_bad_dreams); @@ -1507,8 +1506,8 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC u8 j; for (j = 0; j < maxBattlers; j++) { if ((battleCtx->battleMons[j].status & MON_CONDITION_SLEEP) - && battleCtx->battleMons[j].curHP - && Battler_Ability(battleCtx, j) != ABILITY_SOUNDPROOF) { + && battleCtx->battleMons[j].curHP + && Battler_Ability(battleCtx, j) != ABILITY_SOUNDPROOF) { battleCtx->msgBattlerTemp = j; PrepareSubroutineSequence(battleCtx, subscript_wake_up); break; @@ -1551,9 +1550,9 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC if (BattleContext_MoveFailed(battleCtx, battler)) { battleCtx->battleMons[battler].statusVolatile &= ~VOLATILE_CONDITION_THRASH; } else if ((battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_THRASH) == FALSE - && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION) == FALSE) { + && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION) == FALSE) { battleCtx->sideEffectMon = battler; - + PrepareSubroutineSequence(battleCtx, subscript_thrash_end); state = STATE_BREAK_OUT; } @@ -1625,7 +1624,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC case MON_COND_CHECK_STATE_CHARGE: if (battleCtx->battleMons[battler].moveEffectsData.chargedTurns - && --battleCtx->battleMons[battler].moveEffectsData.chargedTurns == 0) { + && --battleCtx->battleMons[battler].moveEffectsData.chargedTurns == 0) { battleCtx->battleMons[battler].moveEffectsMask &= ~MOVE_EFFECT_CHARGE; } @@ -1634,9 +1633,9 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC case MON_COND_CHECK_STATE_TAUNT: if (battleCtx->battleMons[battler].moveEffectsData.tauntedTurns - && --battleCtx->battleMons[battler].moveEffectsData.tauntedTurns == 0) { + && --battleCtx->battleMons[battler].moveEffectsData.tauntedTurns == 0) { battleCtx->msgBattlerTemp = battler; - + PrepareSubroutineSequence(battleCtx, subscript_taunt_end); state = STATE_BREAK_OUT; } @@ -1646,9 +1645,9 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC case MON_COND_CHECK_STATE_MAGNET_RISE: if (battleCtx->battleMons[battler].moveEffectsData.magnetRiseTurns - && --battleCtx->battleMons[battler].moveEffectsData.magnetRiseTurns == 0) { + && --battleCtx->battleMons[battler].moveEffectsData.magnetRiseTurns == 0) { battleCtx->msgBattlerTemp = battler; - + PrepareSubroutineSequence(battleCtx, subscript_magnet_rise_end); state = STATE_BREAK_OUT; } @@ -1658,9 +1657,9 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC case MON_COND_CHECK_STATE_HEAL_BLOCK: if (battleCtx->battleMons[battler].moveEffectsData.healBlockTurns - && --battleCtx->battleMons[battler].moveEffectsData.healBlockTurns == 0) { + && --battleCtx->battleMons[battler].moveEffectsData.healBlockTurns == 0) { battleCtx->msgBattlerTemp = battler; - + PrepareSubroutineSequence(battleCtx, subscript_heal_block_end); state = STATE_BREAK_OUT; } @@ -1670,9 +1669,9 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC case MON_COND_CHECK_STATE_EMBARGO: if (battleCtx->battleMons[battler].moveEffectsData.embargoTurns - && --battleCtx->battleMons[battler].moveEffectsData.embargoTurns == 0) { + && --battleCtx->battleMons[battler].moveEffectsData.embargoTurns == 0) { battleCtx->msgBattlerTemp = battler; - + PrepareSubroutineSequence(battleCtx, subscript_embargo_end); state = STATE_BREAK_OUT; } @@ -1700,7 +1699,7 @@ static void BattleController_CheckMonConditions(BattleSystem *battleSys, BattleC int nextSeq; if (BattleSystem_TriggerHeldItemOnStatus(battleSys, battleCtx, battler, &nextSeq) == TRUE) { battleCtx->msgBattlerTemp = battler; - + PrepareSubroutineSequence(battleCtx, nextSeq); state = STATE_BREAK_OUT; } @@ -1765,8 +1764,8 @@ static void BattleController_CheckSideConditions(BattleSystem *battleSys, Battle battleCtx->sideConditionCheckTemp++; if (battleCtx->fieldConditions.futureSightTurns[battler] - && --battleCtx->fieldConditions.futureSightTurns[battler] == FALSE - && battleCtx->battleMons[battler].curHP) { + && --battleCtx->fieldConditions.futureSightTurns[battler] == FALSE + && battleCtx->battleMons[battler].curHP) { battleCtx->sideConditionsMask[Battler_Side(battleSys, battler)] &= ~SIDE_CONDITION_FUTURE_SIGHT; battleCtx->msgBuffer.id = 475; @@ -1844,8 +1843,8 @@ static void BattleController_CheckSideConditions(BattleSystem *battleSys, Battle static void BattleController_TurnEnd(BattleSystem *battleSys, BattleContext *battleCtx) { if (BattleController_AnyExpPayout(battleCtx, battleCtx->command, battleCtx->command) == TRUE - || BattleController_CheckBattleOver(battleSys, battleCtx) == TRUE - || BattleController_ReplaceFainted(battleSys, battleCtx) == TRUE) { + || BattleController_CheckBattleOver(battleSys, battleCtx) == TRUE + || BattleController_ReplaceFainted(battleSys, battleCtx) == TRUE) { return; } @@ -1867,12 +1866,12 @@ static void BattleController_FightCommand(BattleSystem *battleSys, BattleContext battleCtx->moveTemp = MOVE_STRUGGLE; randomizeTarget = TRUE; } else if (ATTACKING_MON.moveEffectsData.encoredMove - && ATTACKING_MON.moveEffectsData.encoredMove == ATTACKING_MON.moves[ATTACKING_MON.moveEffectsData.encoredMoveSlot]) { + && ATTACKING_MON.moveEffectsData.encoredMove == ATTACKING_MON.moves[ATTACKING_MON.moveEffectsData.encoredMoveSlot]) { // Attacker is locked into one of its moves by Encore battleCtx->moveTemp = ATTACKING_MON.moveEffectsData.encoredMove; randomizeTarget = TRUE; } else if (ATTACKING_MON.moveEffectsData.encoredMove - && ATTACKING_MON.moveEffectsData.encoredMove != ATTACKING_MON.moves[ATTACKING_MON.moveEffectsData.encoredMoveSlot]) { + && ATTACKING_MON.moveEffectsData.encoredMove != ATTACKING_MON.moves[ATTACKING_MON.moveEffectsData.encoredMoveSlot]) { // Attacker is Encored, but does not actually know the move in the Encored slot. This can // happen if the attacker is Encored into something like Metronome. Note that this means // that if the attacker is Encored into a Metronome'd move that it knows, it will not be @@ -1921,7 +1920,7 @@ static void BattleController_ItemCommand(BattleSystem *battleSys, BattleContext case ITEM_TYPE_RECOVER_STATUS: if ((battleCtx->aiContext.usedItemCondition[battleCtx->attacker >> 1] & ITEM_RECOVER_CONFUSION) - && (battleCtx->aiContext.usedItemCondition[battleCtx->attacker >> 1] & ITEM_RECOVER_FULL)) { + && (battleCtx->aiContext.usedItemCondition[battleCtx->attacker >> 1] & ITEM_RECOVER_FULL)) { battleCtx->msgTemp = 6; } else { battleCtx->msgTemp = LowestBit(battleCtx->aiContext.usedItemCondition[battleCtx->attacker >> 1]); @@ -1957,7 +1956,7 @@ static void BattleController_ItemCommand(BattleSystem *battleSys, BattleContext case BATTLE_POCKET_POKE_BALLS: nextSeq = subscript_throw_pokeball; if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TRAINER) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_CATCH_TUTORIAL) == FALSE) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_CATCH_TUTORIAL) == FALSE) { Bag_TryRemoveItem(BattleSystem_Bag(battleSys), used->item, 1, HEAP_ID_BATTLE); Bag_SetLastItemUsed(BattleSystem_BagCursor(battleSys), used->item, used->pocket); } @@ -1991,7 +1990,7 @@ static void BattleController_FleeCommand(BattleSystem *battleSys, BattleContext battleCtx->attacker = battleCtx->battlerActionOrder[battleCtx->turnOrderCounter]; if (Battler_Side(battleSys, battleCtx->attacker) - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE) { if (ATTACKING_MON.statusVolatile & (VOLATILE_CONDITION_BIND | VOLATILE_CONDITION_MEAN_LOOK)) { LOAD_SUBSEQ(subscript_enemy_escape_failed); battleCtx->scriptCursor = 0; @@ -2097,15 +2096,15 @@ enum ObedienceCheckResult { /** * @brief Check if the attacking battler obeys its trainer. - * + * * If the obedience check is failed, then nextSeq will be populated with an * interjecting subroutine sequence that should be invoked instead of the * move that its trainer chose. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param[out] nextSeq A subroutine sequence to override the chosen move - * @return A value from enum ObedienceCheckResult describing the check result + * @return A value from enum ObedienceCheckResult describing the check result */ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContext *battleCtx, int *nextSeq) { @@ -2122,7 +2121,7 @@ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContex return OBEY_CHECK_SUCCESS; } if ((battleType & BATTLE_TYPE_AI) - && BattleSystem_BattlerSlot(battleSys, battleCtx->attacker) == BATTLER_TYPE_PLAYER_SIDE_SLOT_2) { + && BattleSystem_BattlerSlot(battleSys, battleCtx->attacker) == BATTLER_TYPE_PLAYER_SIDE_SLOT_2) { return OBEY_CHECK_SUCCESS; } if (BattleSystem_TrainerIsOT(battleSys, battleCtx) == TRUE) { @@ -2163,7 +2162,7 @@ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContex } if ((ATTACKING_MON.status & MON_CONDITION_SLEEP) - && (battleCtx->moveCur == MOVE_SNORE || battleCtx->moveCur == MOVE_SLEEP_TALK)) { + && (battleCtx->moveCur == MOVE_SNORE || battleCtx->moveCur == MOVE_SLEEP_TALK)) { *nextSeq = subscript_disobey_while_asleep; return OBEY_CHECK_DO_NOTHING; } @@ -2200,9 +2199,9 @@ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContex maxLevel = ATTACKING_MON.level - maxLevel; rand1 = BattleSystem_RandNext(battleSys) & 0xFF; if ((rand1 < maxLevel && (ATTACKING_MON.status & MON_CONDITION_ANY) == FALSE) - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_VITAL_SPIRIT - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_INSOMNIA - && (battleCtx->fieldConditionsMask & FIELD_CONDITION_UPROAR) == FALSE) { + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_VITAL_SPIRIT + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_INSOMNIA + && (battleCtx->fieldConditionsMask & FIELD_CONDITION_UPROAR) == FALSE) { *nextSeq = subscript_disobey_sleep; return OBEY_CHECK_DO_NOTHING; } @@ -2228,9 +2227,9 @@ static int BattleController_CheckObedience(BattleSystem *battleSys, BattleContex /** * @brief Determine the PP cost for a particular move (depending on its target(s)) * and decucts that amount from the used move. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return Always FALSE. */ static BOOL BattleController_DecrementPP(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2261,7 +2260,7 @@ static BOOL BattleController_DecrementPP(BattleSystem *battleSys, BattleContext default: if (battleCtx->attacker != battleCtx->defender - && Battler_Ability(battleCtx, battleCtx->defender) == ABILITY_PRESSURE) { + && Battler_Ability(battleCtx, battleCtx->defender) == ABILITY_PRESSURE) { ppCost++; } @@ -2286,11 +2285,11 @@ static BOOL BattleController_DecrementPP(BattleSystem *battleSys, BattleContext battleCtx->moveStatusFlags |= MOVE_STATUS_NO_PP; } } else if (ATTACKING_MON.ppCur[moveSlot] == 0 - && (battleCtx->battleStatusMask & SYSCTL_LAST_OF_MULTI_TURN) == FALSE - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED) == FALSE - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_THRASH) == FALSE - && MON_IS_UPROARING(battleCtx->attacker) == FALSE - && moveSlot < LEARNED_MOVES_MAX) { + && (battleCtx->battleStatusMask & SYSCTL_LAST_OF_MULTI_TURN) == FALSE + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED) == FALSE + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_THRASH) == FALSE + && MON_IS_UPROARING(battleCtx->attacker) == FALSE + && moveSlot < LEARNED_MOVES_MAX) { battleCtx->moveStatusFlags |= MOVE_STATUS_NO_PP; } @@ -2299,9 +2298,9 @@ static BOOL BattleController_DecrementPP(BattleSystem *battleSys, BattleContext /** * @brief Determine if the currently-used move still has a valid target. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if the move should now fail due to having no target; FALSE otherwise. */ static BOOL BattleController_HasNoTarget(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2319,18 +2318,18 @@ static BOOL BattleController_HasNoTarget(BattleSystem *battleSys, BattleContext // need this if-statement to match, even though it's a single assignment if (NO_CLOUD_NINE - && CURRENT_MOVE_DATA.effect == BATTLE_EFFECT_SKIP_CHARGE_TURN_IN_SUN - && (battleCtx->fieldConditionsMask & FIELD_CONDITION_SUNNY)) { + && CURRENT_MOVE_DATA.effect == BATTLE_EFFECT_SKIP_CHARGE_TURN_IN_SUN + && (battleCtx->fieldConditionsMask & FIELD_CONDITION_SUNNY)) { solarMove = TRUE; } // Don't alter the target for charge-turn moves that are just charging up this turn if (battleCtx->defender == BATTLER_NONE - && Move_IsMultiTurn(battleCtx, battleCtx->moveCur) == TRUE - && result == FALSE - && solarMove == FALSE - && Battler_HeldItemEffect(battleCtx, battleCtx->attacker) != HOLD_EFFECT_CHARGE_SKIP - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED) == FALSE) { + && Move_IsMultiTurn(battleCtx, battleCtx->moveCur) == TRUE + && result == FALSE + && solarMove == FALSE + && Battler_HeldItemEffect(battleCtx, battleCtx->attacker) != HOLD_EFFECT_CHARGE_SKIP + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED) == FALSE) { battleCtx->defender = battleCtx->attacker; } @@ -2340,12 +2339,12 @@ static BOOL BattleController_HasNoTarget(BattleSystem *battleSys, BattleContext /** * @brief Invoke the type-effectiveness chart to determine the current move's * effectiveness on its target. - * + * * Note: Levitate is included in the type-effectiveness chart as a functional * immunity to Ground-type attacks. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return Always 0. */ static int BattleController_CheckTypeChart(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2355,15 +2354,15 @@ static int BattleController_CheckTypeChart(BattleSystem *battleSys, BattleContex && CURRENT_MOVE_DATA.power && (battleCtx->battleStatusMask & SYSCTL_IGNORE_IMMUNITIES) == FALSE && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE) - || battleCtx->moveCur == MOVE_THUNDER_WAVE) { + || battleCtx->moveCur == MOVE_THUNDER_WAVE) { battleCtx->damage = BattleSystem_ApplyTypeChart(battleSys, - battleCtx, - battleCtx->moveCur, - battleCtx->moveType, - battleCtx->attacker, - battleCtx->defender, - battleCtx->damage, - &battleCtx->moveStatusFlags); + battleCtx, + battleCtx->moveCur, + battleCtx->moveType, + battleCtx->attacker, + battleCtx->defender, + battleCtx->damage, + &battleCtx->moveStatusFlags); if (battleCtx->moveStatusFlags & MOVE_STATUS_INEFFECTIVE) { battleCtx->moveFailFlags[battleCtx->attacker].noEffect = TRUE; @@ -2404,14 +2403,14 @@ enum { /** * @brief Determine if status should disrupt the attacker's current turn. - * + * * "Disruption" is defined as the attacker functionally wasting a turn, e.g., * continuing to sleep, or being fully paralyzed. Some status conditions have a * "partial disruption," where an interjecting subroutine will be run before * the attacker executes its move, e.g. confusion or infatuation. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if there is a disruption effect to apply or an interjecting * script to invoke before the attacker executes its move for turn. */ @@ -2430,8 +2429,8 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt case CHECK_STATUS_STATE_SLEEP: if (ATTACKING_MON.status & MON_CONDITION_SLEEP) { - if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_UPROAR) - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_SOUNDPROOF) { + if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_UPROAR) + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_SOUNDPROOF) { battleCtx->msgBattlerTemp = battleCtx->attacker; LOAD_SUBSEQ(subscript_wake_up); @@ -2480,7 +2479,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt if (ATTACKING_MON.status & MON_CONDITION_FREEZE) { if (BattleSystem_RandNext(battleSys) % 5 != 0) { if (moveEffect != BATTLE_EFFECT_THAW_AND_BURN_HIT - && moveEffect != BATTLE_EFFECT_RECOIL_BURN_HIT) { + && moveEffect != BATTLE_EFFECT_RECOIL_BURN_HIT) { LOAD_SUBSEQ(subscript_frozen); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_UPDATE_MOVE_BUFFERS; @@ -2489,7 +2488,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt } } else { battleCtx->msgBattlerTemp = battleCtx->attacker; - + LOAD_SUBSEQ(subscript_thaw_out); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2557,7 +2556,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt case CHECK_STATUS_STATE_TAUNT: if (ATTACKING_MON.moveEffectsData.tauntedTurns - && battleCtx->aiContext.moveTable[battleCtx->moveCur].power == 0) { + && battleCtx->aiContext.moveTable[battleCtx->moveCur].power == 0) { battleCtx->moveFailFlags[battleCtx->attacker].taunted = TRUE; LOAD_SUBSEQ(subscript_move_fail_taunted); @@ -2633,7 +2632,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt battleCtx->hpCalcTemp = CALC_SELF_HIT(MOVE_STRUGGLE, 40); battleCtx->hpCalcTemp = BattleSystem_CalcDamageVariance(battleSys, battleCtx, battleCtx->hpCalcTemp); battleCtx->hpCalcTemp *= -1; - + LOAD_SUBSEQ(subscript_hurt_self_in_confusion); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_LOOP_FAINTED; @@ -2652,7 +2651,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt case CHECK_STATUS_STATE_PARALYSIS: if ((ATTACKING_MON.status & MON_CONDITION_PARALYSIS) - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD) { + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD) { if (BattleSystem_RandNext(battleSys) % 4 == 0) { battleCtx->moveFailFlags[battleCtx->attacker].paralyzed = TRUE; @@ -2670,8 +2669,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt case CHECK_STATUS_STATE_ATTRACT: if (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_ATTRACT) { battleCtx->msgBattlerTemp = LowestBit( - (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_ATTRACT) >> VOLATILE_CONDITION_ATTRACT_SHIFT - ); + (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_ATTRACT) >> VOLATILE_CONDITION_ATTRACT_SHIFT); if (BattleSystem_RandNext(battleSys) & 1) { LOAD_SUBSEQ(subscript_infatuated); @@ -2700,7 +2698,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt ATTACKING_MON.statusVolatile -= (1 << VOLATILE_CONDITION_BIDE_SHIFT); if ((ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_BIDE) == FALSE - && battleCtx->storedDamage[battleCtx->attacker]) { + && battleCtx->storedDamage[battleCtx->attacker]) { battleCtx->damage = battleCtx->storedDamage[battleCtx->attacker] * 2; if (battleCtx->battleMons[battleCtx->lastHitByBattler[battleCtx->attacker]].curHP) { @@ -2729,7 +2727,7 @@ static BOOL BattleController_CheckStatusDisruption(BattleSystem *battleSys, Batt case CHECK_STATUS_STATE_SELF_THAW: if ((ATTACKING_MON.status & MON_CONDITION_FREEZE) - && (moveEffect == BATTLE_EFFECT_THAW_AND_BURN_HIT || moveEffect == BATTLE_EFFECT_RECOIL_BURN_HIT)) { + && (moveEffect == BATTLE_EFFECT_THAW_AND_BURN_HIT || moveEffect == BATTLE_EFFECT_RECOIL_BURN_HIT)) { LOAD_SUBSEQ(subscript_defrosted_by_move); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2767,17 +2765,17 @@ enum { /** * @brief Trigger any applicable immunity abilities. - * + * * Immunity abilities include (but are not limited to) those similar to: * - Volt Absorb * - Flash Fire * - Soundproof - * + * * Of note: Levitate is *not* checked here; it is checked as part of the type- * effectiveness chart. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if there is an interjecting subroutine to execute instead of * the rest of the user's move. */ @@ -2791,7 +2789,7 @@ static BOOL BattleController_TriggerImmunityAbilities(BattleSystem *battleSys, B int nextSeq = BattleSystem_TriggerImmunityAbility(battleCtx, battleCtx->attacker, battleCtx->defender); if ((nextSeq && (battleCtx->moveStatusFlags & MOVE_STATUS_DID_NOT_HIT) == FALSE) - || nextSeq == subscript_blocked_by_soundproof) { + || nextSeq == subscript_blocked_by_soundproof) { LOAD_SUBSEQ(nextSeq); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -2815,11 +2813,11 @@ static BOOL BattleController_TriggerImmunityAbilities(BattleSystem *battleSys, B /** * @brief Load the Quick Claw effect subroutine sequence. - * + * * Activation checks are all handled within the loaded subroutine sequence. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return Always TRUE. */ static BOOL BattleController_LoadQuickClawCheck(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2847,18 +2845,18 @@ static inline int CalcMoveType(BattleContext *battleCtx, int attacker, int move) /** * @brief Check if an attacker's specified move will hit a defender. - * + * * This is the basic Accuracy formula. It does NOT handle special cases such as: * - OHKO moves * - perfectly-accurate moves (e.g. Aerial Ace, Vital Throw) * - moves which become perfectly-accurate in certain weather conditions * - effects which override the standard accuracy formula (e.g. No Guard) - * + * * If the move is deemed to miss its target, then the move status flags will be * updated with MOVE_STATUS_MISSED. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param attacker The attacking battler * @param defender The defending battler * @param move The attacker's move @@ -2944,7 +2942,7 @@ static int BattleController_CheckMoveHitAccuracy(BattleSystem *battleSys, Battle } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_TANGLED_FEET) == TRUE - && (battleCtx->battleMons[defender].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { + && (battleCtx->battleMons[defender].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { hitRate = hitRate * 50 / 100; } @@ -2985,16 +2983,16 @@ static int BattleController_CheckMoveHitAccuracy(BattleSystem *battleSys, Battle /** * @brief Check if any effects will override an attacker's move hitting its * target. - * + * * This is where the following effects are checked: * - Protect * - Lock-On / Mind Reader * - No Guard * - Thunder / Blizzard (in rain / hail, respectively) * - Semi-invulnerability (Fly, Bounce, Dig, Dive, Shadow Force) - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param attacker The attacking battler * @param defender The defending battler * @param move The attacker's move @@ -3007,18 +3005,18 @@ static int BattleController_CheckMoveHitOverrides(BattleSystem *battleSys, Battl } if (battleCtx->turnFlags[defender].protecting - && (MOVE_DATA(move).flags & MOVE_FLAG_CAN_PROTECT) - && (move != MOVE_CURSE || Move_IsGhostCurse(battleCtx, move, attacker) == TRUE) // Ghost-Curse can be Protected - && (Move_IsMultiTurn(battleCtx, move) == FALSE || (battleCtx->battleStatusMask & SYSCTL_LAST_OF_MULTI_TURN))) { + && (MOVE_DATA(move).flags & MOVE_FLAG_CAN_PROTECT) + && (move != MOVE_CURSE || Move_IsGhostCurse(battleCtx, move, attacker) == TRUE) // Ghost-Curse can be Protected + && (Move_IsMultiTurn(battleCtx, move) == FALSE || (battleCtx->battleStatusMask & SYSCTL_LAST_OF_MULTI_TURN))) { Battler_UnlockMoveChoice(battleSys, battleCtx, attacker); battleCtx->moveStatusFlags |= MOVE_STATUS_PROTECTED; return 0; } if ((battleCtx->battleStatusMask & SYSCTL_NONSTANDARD_ACC_CHECK) == FALSE - && (MON_IS_LOCKED_ONTO(attacker, defender) - || Battler_Ability(battleCtx, attacker) == ABILITY_NO_GUARD - || Battler_Ability(battleCtx, defender) == ABILITY_NO_GUARD)) { + && (MON_IS_LOCKED_ONTO(attacker, defender) + || Battler_Ability(battleCtx, attacker) == ABILITY_NO_GUARD + || Battler_Ability(battleCtx, defender) == ABILITY_NO_GUARD)) { battleCtx->moveStatusFlags &= ~MOVE_STATUS_MISSED; return 0; } @@ -3034,11 +3032,11 @@ static int BattleController_CheckMoveHitOverrides(BattleSystem *battleSys, Battl } if ((battleCtx->moveStatusFlags & MOVE_STATUS_BYPASSED_ACCURACY) == FALSE - && CURRENT_MOVE_DATA.range != RANGE_OPPONENT_SIDE - && (((battleCtx->battleStatusMask & SYSCTL_HIT_DURING_FLY) == FALSE && (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_AIRBORNE)) - || ((battleCtx->battleStatusMask & SYSCTL_HIT_DURING_SHADOW_FORCE) == FALSE && (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_SHADOW_FORCE)) - || ((battleCtx->battleStatusMask & SYSCTL_HIT_DURING_DIG) == FALSE && (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_UNDERGROUND)) - || ((battleCtx->battleStatusMask & SYSCTL_HIT_DURING_DIVE) == FALSE && (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_UNDERWATER)))) { + && CURRENT_MOVE_DATA.range != RANGE_OPPONENT_SIDE + && (((battleCtx->battleStatusMask & SYSCTL_HIT_DURING_FLY) == FALSE && (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_AIRBORNE)) + || ((battleCtx->battleStatusMask & SYSCTL_HIT_DURING_SHADOW_FORCE) == FALSE && (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_SHADOW_FORCE)) + || ((battleCtx->battleStatusMask & SYSCTL_HIT_DURING_DIG) == FALSE && (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_UNDERGROUND)) + || ((battleCtx->battleStatusMask & SYSCTL_HIT_DURING_DIVE) == FALSE && (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_UNDERWATER)))) { battleCtx->moveStatusFlags |= MOVE_STATUS_SEMI_INVULNERABLE; } @@ -3047,14 +3045,14 @@ static int BattleController_CheckMoveHitOverrides(BattleSystem *battleSys, Battl /** * @brief Check if the attacker's move for the turn has been stolen. - * + * * A move can be stolen either by targeting a battler which used Magic Coat * or by using a move which can be affected by Snatch. If a move is stolen * in this way, then an interjecting subroutine will be loaded into the * sequence buffer for execution. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if the move should be stolen and its targets updated, FALSE * otherwise. */ @@ -3068,8 +3066,8 @@ static BOOL BattleController_MoveStolen(BattleSystem *battleSys, BattleContext * } if ((battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && DEFENDER_TURN_FLAGS.magicCoat - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_CAN_MAGIC_COAT)) { + && DEFENDER_TURN_FLAGS.magicCoat + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_CAN_MAGIC_COAT)) { DEFENDER_TURN_FLAGS.magicCoat = FALSE; battleCtx->moveProtect[battleCtx->attacker] = FALSE; @@ -3089,8 +3087,8 @@ static BOOL BattleController_MoveStolen(BattleSystem *battleSys, BattleContext * for (i = 0; i < maxBattlers; i++) { battler = battleCtx->monSpeedOrder[i]; if ((battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && battleCtx->turnFlags[battler].snatching - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_CAN_SNATCH)) { + && battleCtx->turnFlags[battler].snatching + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_CAN_SNATCH)) { battleCtx->msgBattlerTemp = battler; battleCtx->turnFlags[battler].snatching = FALSE; @@ -3182,7 +3180,7 @@ static void BattleController_BeforeMove(BattleSystem *battleSys, BattleContext * case BEFORE_MOVE_STATE_DECREMENT_PP: if ((battleCtx->multiHitCheckFlags & SYSCTL_SKIP_PP_DECREMENT) == FALSE - && BattleController_DecrementPP(battleSys, battleCtx) == TRUE) { + && BattleController_DecrementPP(battleSys, battleCtx) == TRUE) { return; } @@ -3197,7 +3195,7 @@ static void BattleController_BeforeMove(BattleSystem *battleSys, BattleContext * case BEFORE_MOVE_STATE_CHECK_STOLEN: if ((battleCtx->multiHitCheckFlags & SYSCTL_SKIP_STOLEN_CHECK) == FALSE - && BattleController_MoveStolen(battleSys, battleCtx) == 1) { + && BattleController_MoveStolen(battleSys, battleCtx) == 1) { return; } @@ -3216,7 +3214,7 @@ static void BattleController_BeforeMove(BattleSystem *battleSys, BattleContext * BattleSystem_LoadScript(battleCtx, 0, battleCtx->moveCur); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_TRY_MOVE; - + BattleSystem_UpdateLastResort(battleSys, battleCtx); } @@ -3255,8 +3253,8 @@ static void BattleController_TryMove(BattleSystem *battleSys, BattleContext *bat case TRY_MOVE_STATE_CHECK_MOVE_HITS: if ((battleCtx->multiHitCheckFlags & SYSCTL_SKIP_ACCURACY_CHECK) == FALSE - && battleCtx->defender != BATTLER_NONE - && BattleController_CheckMoveHitAccuracy(battleSys, battleCtx, battleCtx->attacker, battleCtx->defender, battleCtx->moveCur) == 1) { + && battleCtx->defender != BATTLER_NONE + && BattleController_CheckMoveHitAccuracy(battleSys, battleCtx, battleCtx->attacker, battleCtx->defender, battleCtx->moveCur) == 1) { return; } @@ -3264,8 +3262,8 @@ static void BattleController_TryMove(BattleSystem *battleSys, BattleContext *bat case TRY_MOVE_STATE_CHECK_MOVE_HIT_OVERRIDES: if ((battleCtx->multiHitCheckFlags & SYSCTL_SKIP_ACCURACY_OVERRIDES) == FALSE - && battleCtx->defender != BATTLER_NONE - && BattleController_CheckMoveHitOverrides(battleSys, battleCtx, battleCtx->attacker, battleCtx->defender, battleCtx->moveCur) == 1) { + && battleCtx->defender != BATTLER_NONE + && BattleController_CheckMoveHitOverrides(battleSys, battleCtx, battleCtx->attacker, battleCtx->defender, battleCtx->moveCur) == 1) { return; } @@ -3273,8 +3271,8 @@ static void BattleController_TryMove(BattleSystem *battleSys, BattleContext *bat case TRY_MOVE_STATE_CHECK_TYPE_CHART: if ((battleCtx->multiHitCheckFlags & SYSCTL_SKIP_TYPE_CHART_CHECK) == FALSE - && battleCtx->defender != BATTLER_NONE - && BattleController_CheckTypeChart(battleSys, battleCtx) == 1) { + && battleCtx->defender != BATTLER_NONE + && BattleController_CheckTypeChart(battleSys, battleCtx) == 1) { return; } @@ -3282,8 +3280,8 @@ static void BattleController_TryMove(BattleSystem *battleSys, BattleContext *bat case TRY_MOVE_STATE_TRIGGER_IMMUNITY_ABILITIES: if ((battleCtx->multiHitCheckFlags & SYSCTL_SKIP_IMMUNITY_TRIGGERS) == FALSE - && battleCtx->defender != BATTLER_NONE - && BattleController_TriggerImmunityAbilities(battleSys, battleCtx) == 1) { + && battleCtx->defender != BATTLER_NONE + && BattleController_TriggerImmunityAbilities(battleSys, battleCtx) == 1) { return; } @@ -3304,10 +3302,10 @@ static void BattleController_PrimaryEffect(BattleSystem *battleSys, BattleContex LOAD_SUBSEQ(nextSeq); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_MOVE_FAILED; - + return; } - + battleCtx->command = BATTLE_CONTROL_MOVE_FAILED; } @@ -3381,7 +3379,7 @@ static void BattleController_UpdateHP(BattleSystem *battleSys, BattleContext *ba } if (CURRENT_MOVE_DATA.effect == BATTLE_EFFECT_LEAVE_WITH_1_HP - && DEFENDING_MON.curHP + battleCtx->damage <= 0) { + && DEFENDING_MON.curHP + battleCtx->damage <= 0) { battleCtx->damage = (DEFENDING_MON.curHP - 1) * -1; } @@ -3396,7 +3394,7 @@ static void BattleController_UpdateHP(BattleSystem *battleSys, BattleContext *ba } if ((DEFENDER_TURN_FLAGS.enduring || DEFENDER_SELF_TURN_FLAGS.focusItemActivated) - && DEFENDING_MON.curHP + battleCtx->damage <= 0) { + && DEFENDING_MON.curHP + battleCtx->damage <= 0) { battleCtx->damage = (DEFENDING_MON.curHP - 1) * -1; if (DEFENDER_TURN_FLAGS.enduring) { @@ -3488,7 +3486,7 @@ static void BattleController_AfterMoveMessage(BattleSystem *battleSys, BattleCon battleCtx->afterMoveMessageState++; if (BattleSystem_TriggerSecondaryEffect(battleSys, battleCtx, &secondaryEffSeq) == TRUE - && (battleCtx->moveStatusFlags & MOVE_STATUS_DID_NOT_HIT) == FALSE) { + && (battleCtx->moveStatusFlags & MOVE_STATUS_DID_NOT_HIT) == FALSE) { LOAD_SUBSEQ(secondaryEffSeq); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -3498,7 +3496,7 @@ static void BattleController_AfterMoveMessage(BattleSystem *battleSys, BattleCon case ONE_HIT_FORM_CHANGE: battleCtx->afterMoveMessageState++; - + // Shaymin changes forms from Sky to Land whenever it is Frozen. LOAD_SUBSEQ(subscript_check_shaymin_form); battleCtx->commandNext = battleCtx->command; @@ -3520,7 +3518,7 @@ static void BattleController_AfterMoveMessage(BattleSystem *battleSys, BattleCon LOAD_SUBSEQ(abilitySeq); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; - + return; } @@ -3548,7 +3546,7 @@ static void BattleController_AfterMoveMessage(BattleSystem *battleSys, BattleCon battleCtx->afterMoveMessageState++; if (BattleSystem_TriggerSecondaryEffect(battleSys, battleCtx, &secondaryEffSeq) == TRUE - && (battleCtx->moveStatusFlags & MOVE_STATUS_DID_NOT_HIT) == FALSE) { + && (battleCtx->moveStatusFlags & MOVE_STATUS_DID_NOT_HIT) == FALSE) { LOAD_SUBSEQ(secondaryEffSeq); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -3558,7 +3556,7 @@ static void BattleController_AfterMoveMessage(BattleSystem *battleSys, BattleCon case MULTI_HIT_FORM_CHANGE: battleCtx->afterMoveMessageState++; - + // Shaymin changes forms from Sky to Land whenever it is Frozen. LOAD_SUBSEQ(subscript_check_shaymin_form); battleCtx->commandNext = battleCtx->command; @@ -3580,7 +3578,7 @@ static void BattleController_AfterMoveMessage(BattleSystem *battleSys, BattleCon LOAD_SUBSEQ(abilitySeq); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; - + return; } @@ -3644,7 +3642,7 @@ static void BattleController_AfterMoveEffects(BattleSystem *battleSys, BattleCon BOOL anyFlipped = FALSE; while (battleCtx->afterMoveEffectTemp < BattleSystem_MaxBattlers(battleSys)) { if ((battleCtx->battleMons[battleCtx->afterMoveEffectTemp].moveEffectsMask & MOVE_EFFECT_SEMI_INVULNERABLE) == FALSE - && (battleCtx->battleMons[battleCtx->afterMoveEffectTemp].moveEffectsTemp & MOVE_EFFECT_SEMI_INVULNERABLE)) { + && (battleCtx->battleMons[battleCtx->afterMoveEffectTemp].moveEffectsTemp & MOVE_EFFECT_SEMI_INVULNERABLE)) { battleCtx->battleMons[battleCtx->afterMoveEffectTemp].moveEffectsTemp &= ~MOVE_EFFECT_SEMI_INVULNERABLE; LOAD_SUBSEQ(subscript_vanish_off); @@ -3660,7 +3658,7 @@ static void BattleController_AfterMoveEffects(BattleSystem *battleSys, BattleCon return; } } - + battleCtx->afterMoveEffectState++; battleCtx->afterMoveEffectTemp = 0; @@ -3714,12 +3712,12 @@ static void BattleController_AfterMoveEffects(BattleSystem *battleSys, BattleCon battleCtx->afterMoveEffectState++; if (battleCtx->defender != BATTLER_NONE - && (DEFENDING_MON.status & MON_CONDITION_FREEZE) - && (battleCtx->moveStatusFlags & MOVE_STATUS_MULTI_HIT_DISRUPTED) == FALSE - && battleCtx->defender != battleCtx->attacker - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && DEFENDING_MON.curHP - && moveType == TYPE_FIRE) { + && (DEFENDING_MON.status & MON_CONDITION_FREEZE) + && (battleCtx->moveStatusFlags & MOVE_STATUS_MULTI_HIT_DISRUPTED) == FALSE + && battleCtx->defender != battleCtx->attacker + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && DEFENDING_MON.curHP + && moveType == TYPE_FIRE) { battleCtx->msgBattlerTemp = battleCtx->defender; LOAD_SUBSEQ(subscript_thaw_out); @@ -3780,8 +3778,8 @@ static void BattleController_LoopMultiHit(BattleSystem *battleSys, BattleContext { if (battleCtx->multiHitNumHits) { if (battleCtx->faintedMon == BATTLER_NONE - && (ATTACKING_MON.status & MON_CONDITION_SLEEP) == FALSE // e.g., Effect Spore - && (battleCtx->moveStatusFlags & MOVE_STATUS_MULTI_HIT_DISRUPTED) == FALSE) { + && (ATTACKING_MON.status & MON_CONDITION_SLEEP) == FALSE // e.g., Effect Spore + && (battleCtx->moveStatusFlags & MOVE_STATUS_MULTI_HIT_DISRUPTED) == FALSE) { if (--battleCtx->multiHitCounter) { battleCtx->multiHitLoop = TRUE; BattleSystem_SetupLoop(battleSys, battleCtx); @@ -3839,8 +3837,8 @@ static void BattleController_LoopSpreadMoves(BattleSystem *battleSys, BattleCont BattleController_UpdateFlagsWhenHit(battleSys, battleCtx); if (CURRENT_MOVE_DATA.range == RANGE_ADJACENT_OPPONENTS - && (battleCtx->battleStatusMask & SYSCTL_CHECK_LOOP_ONLY_ONCE) == FALSE - && battleCtx->battlerCounter < BattleSystem_MaxBattlers(battleSys)) { + && (battleCtx->battleStatusMask & SYSCTL_CHECK_LOOP_ONLY_ONCE) == FALSE + && battleCtx->battlerCounter < BattleSystem_MaxBattlers(battleSys)) { battleCtx->multiHitCheckFlags = SYSCTL_HIT_MULTIPLE_TARGETS; int maxBattlers = BattleSystem_MaxBattlers(battleSys); // unused, but must stay to match @@ -3854,7 +3852,7 @@ static void BattleController_LoopSpreadMoves(BattleSystem *battleSys, BattleCont // Loop back to the start of the move if battlers are on opposite sides if (((battlerType & BATTLER_THEM) && (Battler_Type(battlerData) & BATTLER_THEM) == FALSE) - || ((battlerType & BATTLER_THEM) == FALSE && (Battler_Type(battlerData) & BATTLER_THEM))) { + || ((battlerType & BATTLER_THEM) == FALSE && (Battler_Type(battlerData) & BATTLER_THEM))) { BattleSystem_SetupLoop(battleSys, battleCtx); battleCtx->defender = battler; battleCtx->command = BATTLE_CONTROL_BEFORE_MOVE; @@ -3865,16 +3863,16 @@ static void BattleController_LoopSpreadMoves(BattleSystem *battleSys, BattleCont BattleIO_ClearMessageBox(battleSys); } else if (CURRENT_MOVE_DATA.range == RANGE_ALL_ADJACENT - && (battleCtx->battleStatusMask & SYSCTL_CHECK_LOOP_ONLY_ONCE) == FALSE - && battleCtx->battlerCounter < BattleSystem_MaxBattlers(battleSys)) { + && (battleCtx->battleStatusMask & SYSCTL_CHECK_LOOP_ONLY_ONCE) == FALSE + && battleCtx->battlerCounter < BattleSystem_MaxBattlers(battleSys)) { battleCtx->multiHitCheckFlags = SYSCTL_HIT_MULTIPLE_TARGETS; int maxBattlers = BattleSystem_MaxBattlers(battleSys); // unused, but must stay to match. do { int battler = battleCtx->monSpeedOrder[battleCtx->battlerCounter++]; if ((battleCtx->battlersSwitchingMask & FlagIndex(battler)) == FALSE - && battleCtx->battleMons[battler].curHP - && battler != battleCtx->attacker) { + && battleCtx->battleMons[battler].curHP + && battler != battleCtx->attacker) { BattleSystem_SetupLoop(battleSys, battleCtx); battleCtx->defender = battler; battleCtx->command = BATTLE_CONTROL_BEFORE_MOVE; @@ -3921,13 +3919,13 @@ static void BattleController_UpdateMoveBuffers(BattleSystem *battleSys, BattleCo u8 itemEffect = Battler_HeldItemEffect(battleCtx, battleCtx->attacker); if ((battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) - || (battleCtx->battleStatusMask2 & SYSCTL_ATTACK_MESSAGE_SHOWN)) { + || (battleCtx->battleStatusMask2 & SYSCTL_ATTACK_MESSAGE_SHOWN)) { if (itemEffect == HOLD_EFFECT_CHOICE_ATK - || itemEffect == HOLD_EFFECT_CHOICE_SPEED - || itemEffect == HOLD_EFFECT_CHOICE_SPATK) { + || itemEffect == HOLD_EFFECT_CHOICE_SPEED + || itemEffect == HOLD_EFFECT_CHOICE_SPATK) { if (battleCtx->moveTemp != MOVE_STRUGGLE - && (battleCtx->moveTemp != MOVE_U_TURN || (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE) - && (battleCtx->moveTemp != MOVE_BATON_PASS || (battleCtx->battleStatusMask2 & SYSCTL_MOVE_SUCCEEDED) == FALSE)) { + && (battleCtx->moveTemp != MOVE_U_TURN || (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE) + && (battleCtx->moveTemp != MOVE_BATON_PASS || (battleCtx->battleStatusMask2 & SYSCTL_MOVE_SUCCEEDED) == FALSE)) { ATTACKING_MON.moveEffectsData.choiceLockedMove = battleCtx->moveTemp; } } else { @@ -3965,10 +3963,10 @@ static void BattleController_MoveEnd(BattleSystem *battleSys, BattleContext *bat { if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_NO_MOVES) == FALSE) { if (BattleSystem_RecoverStatusByAbility(battleSys, battleCtx, battleCtx->attacker, FALSE) == TRUE - || (battleCtx->defender != BATTLER_NONE - && BattleSystem_RecoverStatusByAbility(battleSys, battleCtx, battleCtx->defender, FALSE) == TRUE) - || BattleController_AnyExpPayout(battleCtx, battleCtx->command, battleCtx->command) == TRUE - || BattleController_CheckBattleOver(battleSys, battleCtx) == TRUE) { + || (battleCtx->defender != BATTLER_NONE + && BattleSystem_RecoverStatusByAbility(battleSys, battleCtx, battleCtx->defender, FALSE) == TRUE) + || BattleController_AnyExpPayout(battleCtx, battleCtx->command, battleCtx->command) == TRUE + || BattleController_CheckBattleOver(battleSys, battleCtx) == TRUE) { return; } @@ -4015,7 +4013,7 @@ static void BattleController_HandleResult(BattleSystem *battleSys, BattleContext if (BattleSystem_ResultMask(battleSys) & BATTLE_RESULT_TRY_FLEE) { battleCtx->command = BATTLE_CONTROL_FIGHT_END; } else if (BattleSystem_ResultMask(battleSys) == BATTLE_RESULT_LOSE - || BattleSystem_ResultMask(battleSys) == BATTLE_RESULT_DRAW) { + || BattleSystem_ResultMask(battleSys) == BATTLE_RESULT_DRAW) { LOAD_SUBSEQ(subscript_battle_lost); battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; battleCtx->commandNext = BATTLE_CONTROL_FIGHT_END; @@ -4064,9 +4062,9 @@ static void BattleController_EndWait(BattleSystem *battleSys, BattleContext *bat /** * @brief Try to replace any and all fainted battlers. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if an interjecting subroutine should be executed. */ static BOOL BattleController_ReplaceFainted(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4081,7 +4079,7 @@ static BOOL BattleController_ReplaceFainted(BattleSystem *battleSys, BattleConte battleCtx->battlerStatusFlags[i] &= ~BATTLER_STATUS_SWITCHING; if (((battleType & BATTLE_TYPE_DOUBLES) && (battleType & (BATTLE_TYPE_2vs2 | BATTLE_TYPE_TAG)) == FALSE) - || ((battleType & BATTLE_TYPE_TAG) && Battler_Side(battleSys, i) == FALSE)) { + || ((battleType & BATTLE_TYPE_TAG) && Battler_Side(battleSys, i) == FALSE)) { // If both of this side's mons have been defeated, replace slot 1 first. if (battleCtx->battleMons[i].curHP == 0 && battleCtx->battleMons[i ^ 2].curHP == 0 && (i & 2)) { continue; @@ -4099,8 +4097,8 @@ static BOOL BattleController_ReplaceFainted(BattleSystem *battleSys, BattleConte for (j = 0; j < Party_GetCurrentCount(party); j++) { Pokemon *pokemon = Party_GetPokemonBySlotIndex(party, j); if (Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != FALSE - && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG - && (curHP = Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL))) { + && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG + && (curHP = Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL))) { monsAlive++; if (battleCtx->selectedPartySlot[i ^ 2] != j) { totalHP += curHP; @@ -4127,7 +4125,7 @@ static BOOL BattleController_ReplaceFainted(BattleSystem *battleSys, BattleConte Pokemon *pokemon = Party_GetPokemonBySlotIndex(party, j); if (Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != FALSE - && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { curHP += Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL); } } @@ -4145,10 +4143,10 @@ static BOOL BattleController_ReplaceFainted(BattleSystem *battleSys, BattleConte if (battleCtx->command == BATTLE_CONTROL_EXEC_SCRIPT) { if ((battleType & BATTLE_TYPE_FORCED_SET_MODE) == FALSE - && BattleSystem_Ruleset(battleSys) == 0 // switch mode - && ((battleCtx->battlerStatusFlags[0] & BATTLER_STATUS_SWITCHING) == FALSE - || (battleCtx->battlerStatusFlags[1] & BATTLER_STATUS_SWITCHING) == FALSE) - && BattleSystem_AnyReplacementMons(battleSys, battleCtx, BATTLER_US)) { + && BattleSystem_Ruleset(battleSys) == 0 // switch mode + && ((battleCtx->battlerStatusFlags[0] & BATTLER_STATUS_SWITCHING) == FALSE + || (battleCtx->battlerStatusFlags[1] & BATTLER_STATUS_SWITCHING) == FALSE) + && BattleSystem_AnyReplacementMons(battleSys, battleCtx, BATTLER_US)) { // If the player is flagged as replacing a fainted mon, then inform the script // to skip ahead to showing the party list without prompt. if (battleCtx->battlerStatusFlags[0] & BATTLER_STATUS_SWITCHING) { @@ -4170,17 +4168,17 @@ static BOOL BattleController_ReplaceFainted(BattleSystem *battleSys, BattleConte /** * @brief Check if the battle is over. - * + * * Battle result flags will be updated as part of this routine according to the * final state. Additionally, victory music will be loaded according to the * defeated trainer's class. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if the battle is over (regardless of the result); FALSE if the * battle is still in-progress. */ -static BOOL BattleController_CheckBattleOver(BattleSystem * battleSys, BattleContext *battleCtx) +static BOOL BattleController_CheckBattleOver(BattleSystem *battleSys, BattleContext *battleCtx) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -4189,11 +4187,11 @@ static BOOL BattleController_CheckBattleOver(BattleSystem * battleSys, BattleCon for (i = 0; i < maxBattlers; i++) { if ((battleType == BATTLE_TYPE_TRAINER_WITH_AI_PARTNER || battleType == BATTLE_TYPE_AI_PARTNER) - && Battler_Side(battleSys, i) == BATTLER_US) { + && Battler_Side(battleSys, i) == BATTLER_US) { // If the player has no more usable Pokemon in a tag battle with an AI-controlled partner, // flag the battle as lost. if (BattleSystem_BattlerSlot(battleSys, i) == BATTLER_TYPE_PLAYER_SIDE_SLOT_1 - && battleCtx->battleMons[i].curHP == 0) { + && battleCtx->battleMons[i].curHP == 0) { int totalPartyHP = 0; Party *party = BattleSystem_Party(battleSys, i); BattlerData *battlerData = BattleSystem_BattlerData(battleSys, i); @@ -4201,7 +4199,7 @@ static BOOL BattleController_CheckBattleOver(BattleSystem * battleSys, BattleCon for (int j = 0; j < Party_GetCurrentCount(party); j++) { Pokemon *pokemon = Party_GetPokemonBySlotIndex(party, j); if (Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { totalPartyHP += Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL); } } @@ -4220,7 +4218,7 @@ static BOOL BattleController_CheckBattleOver(BattleSystem * battleSys, BattleCon for (int j = 0; j < Party_GetCurrentCount(party); j++) { Pokemon *pokemon = Party_GetPokemonBySlotIndex(party, j); if (Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { totalPartyHP += Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL); } } @@ -4228,7 +4226,7 @@ static BOOL BattleController_CheckBattleOver(BattleSystem * battleSys, BattleCon for (int j = 0; j < Party_GetCurrentCount(partnerParty); j++) { Pokemon *pokemon = Party_GetPokemonBySlotIndex(partnerParty, j); if (Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { totalPartyHP += Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL); } } @@ -4249,7 +4247,7 @@ static BOOL BattleController_CheckBattleOver(BattleSystem * battleSys, BattleCon for (int j = 0; j < Party_GetCurrentCount(party); j++) { Pokemon *pokemon = Party_GetPokemonBySlotIndex(party, j); if (Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { totalPartyHP += Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL); } } @@ -4267,55 +4265,55 @@ static BOOL BattleController_CheckBattleOver(BattleSystem * battleSys, BattleCon // Have to keep this ugly double-chain in order to match. Simplified: we win a trainer/frontier battle and it's not // a link battle. if ((battleResult == BATTLE_RESULT_WIN && (battleType & BATTLE_TYPE_TRAINER) && (battleType & BATTLE_TYPE_LINK) == FALSE) - || (battleResult == BATTLE_RESULT_WIN && (battleType & BATTLE_TYPE_FRONTIER) && (battleType & BATTLE_TYPE_LINK) == FALSE)) { + || (battleResult == BATTLE_RESULT_WIN && (battleType & BATTLE_TYPE_FRONTIER) && (battleType & BATTLE_TYPE_LINK) == FALSE)) { TrainerData *trainer = BattleSystem_TrainerData(battleSys, 1); switch (trainer->class) { - case TRAINER_CLASS_LEADER_ROARK: - case TRAINER_CLASS_LEADER_GARDENIA: - case TRAINER_CLASS_LEADER_WAKE: - case TRAINER_CLASS_LEADER_MAYLENE: - case TRAINER_CLASS_LEADER_FANTINA: - case TRAINER_CLASS_LEADER_CANDICE: - case TRAINER_CLASS_LEADER_BYRON: - case TRAINER_CLASS_LEADER_VOLKNER: - Sound_PlayBGM(SEQ_VICTORY_GYM_LEADER); - break; + case TRAINER_CLASS_LEADER_ROARK: + case TRAINER_CLASS_LEADER_GARDENIA: + case TRAINER_CLASS_LEADER_WAKE: + case TRAINER_CLASS_LEADER_MAYLENE: + case TRAINER_CLASS_LEADER_FANTINA: + case TRAINER_CLASS_LEADER_CANDICE: + case TRAINER_CLASS_LEADER_BYRON: + case TRAINER_CLASS_LEADER_VOLKNER: + Sound_PlayBGM(SEQ_VICTORY_GYM_LEADER); + break; - case TRAINER_CLASS_TOWER_TYCOON: - case TRAINER_CLASS_HALL_MATRON: - case TRAINER_CLASS_FACTORY_HEAD: - case TRAINER_CLASS_ARCADE_STAR: - case TRAINER_CLASS_CASTLE_VALET: - Sound_PlayBGM(SEQ_VICTORY_FRONTIER_BRAIN); - break; + case TRAINER_CLASS_TOWER_TYCOON: + case TRAINER_CLASS_HALL_MATRON: + case TRAINER_CLASS_FACTORY_HEAD: + case TRAINER_CLASS_ARCADE_STAR: + case TRAINER_CLASS_CASTLE_VALET: + Sound_PlayBGM(SEQ_VICTORY_FRONTIER_BRAIN); + break; - case TRAINER_CLASS_CHAMPION_CYNTHIA: - Sound_PlayBGM(SEQ_VICTORY_CHAMPION); - break; + case TRAINER_CLASS_CHAMPION_CYNTHIA: + Sound_PlayBGM(SEQ_VICTORY_CHAMPION); + break; - case TRAINER_CLASS_COMMANDER_MARS: - case TRAINER_CLASS_COMMANDER_JUPITER: - case TRAINER_CLASS_COMMANDER_SATURN: - case TRAINER_CLASS_GALACTIC_GRUNT_MALE: - case TRAINER_CLASS_GALACTIC_GRUNT_FEMALE: - Sound_PlayBGM(SEQ_VICTORY_GALACTIC_GRUNT); - break; + case TRAINER_CLASS_COMMANDER_MARS: + case TRAINER_CLASS_COMMANDER_JUPITER: + case TRAINER_CLASS_COMMANDER_SATURN: + case TRAINER_CLASS_GALACTIC_GRUNT_MALE: + case TRAINER_CLASS_GALACTIC_GRUNT_FEMALE: + Sound_PlayBGM(SEQ_VICTORY_GALACTIC_GRUNT); + break; - case TRAINER_CLASS_GALACTIC_BOSS: - Sound_PlayBGM(SEQ_VICTORY_CYRUS); - break; + case TRAINER_CLASS_GALACTIC_BOSS: + Sound_PlayBGM(SEQ_VICTORY_CYRUS); + break; - case TRAINER_CLASS_ELITE_FOUR_AARON: - case TRAINER_CLASS_ELITE_FOUR_BERTHA: - case TRAINER_CLASS_ELITE_FOUR_FLINT: - case TRAINER_CLASS_ELITE_FOUR_LUCIAN: - Sound_PlayBGM(SEQ_VICTORY_ELITE_FOUR); - break; + case TRAINER_CLASS_ELITE_FOUR_AARON: + case TRAINER_CLASS_ELITE_FOUR_BERTHA: + case TRAINER_CLASS_ELITE_FOUR_FLINT: + case TRAINER_CLASS_ELITE_FOUR_LUCIAN: + Sound_PlayBGM(SEQ_VICTORY_ELITE_FOUR); + break; - default: - Sound_PlayBGM(SEQ_VICTORY_TRAINER); - break; + default: + Sound_PlayBGM(SEQ_VICTORY_TRAINER); + break; } BattleSystem_SetRedHPSoundFlag(battleSys, 2); @@ -4331,9 +4329,9 @@ static BOOL BattleController_CheckBattleOver(BattleSystem * battleSys, BattleCon /** * @brief Determine if the battler must select its target according to the move * selected. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler choosing its move. * @param battleType * @param[out] range Outputs the range of the move being used. @@ -4344,7 +4342,7 @@ static BOOL BattleController_CheckBattleOver(BattleSystem * battleSys, BattleCon static BOOL BattleController_MustSelectTarget(BattleSystem *battleSys, BattleContext *battleCtx, u8 battler, u32 battleType, int *range, int moveSlot, u32 *target) { if (battleCtx->battleMons[battler].moves[moveSlot] == MOVE_CURSE - && Move_IsGhostCurse(battleCtx, battleCtx->battleMons[battler].moves[moveSlot], battler) == FALSE) { + && Move_IsGhostCurse(battleCtx, battleCtx->battleMons[battler].moves[moveSlot], battler) == FALSE) { *range = RANGE_USER; } else { *range = MOVE_DATA(battleCtx->battleMons[battler].moves[moveSlot]).range; @@ -4358,10 +4356,10 @@ static BOOL BattleController_MustSelectTarget(BattleSystem *battleSys, BattleCon return FALSE; } - + return TRUE; } - + if (*range & RANGE_MY_SIDE) { *target = battler; } else { @@ -4374,9 +4372,9 @@ static BOOL BattleController_MustSelectTarget(BattleSystem *battleSys, BattleCon /** * @brief Clear flags which dissipate at the end of the turn and any volatile * condition flags as requested. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ static void BattleController_ClearFlags(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -4395,18 +4393,18 @@ static void BattleController_ClearFlags(BattleSystem *battleSys, BattleContext * /** * @brief Check if there are any fainted battlers and load the appropriate * subroutine. - * + * * If a battler is fainted, then its command will be re-assigned so as to flag * it as functionally done for the turn. - * - * @param battleCtx + * + * @param battleCtx * @param nextCmd The next command to queue if a battler has fainted. * @param nextCmdNoFainted The next command to queue if no battler has fainted. * @param onlyFaint If TRUE, then standard FAINT_MON subroutine will be * loaded if any battler has fainted. If FALSE, then the * subroutine which checks for on-faint triggers will be * loaded instead (e.g., Destiny Bond, Grudge). - * @return TRUE if any battler has fainted; FALSE if none have fainted. + * @return TRUE if any battler has fainted; FALSE if none have fainted. */ static BOOL BattleController_AnyFainted(BattleContext *battleCtx, int nextCmd, int nextCmdNoFainted, BOOL onlyFaint) { @@ -4442,8 +4440,8 @@ static BOOL BattleController_AnyFainted(BattleContext *battleCtx, int nextCmd, i /** * @brief Check if any battlers should be paid experience points and load the * appropriate subroutine. - * - * @param battleCtx + * + * @param battleCtx * @param nextCmd The next command to queue if a battler has fainted. * @param nextCmdNoExp The next command to queue if no battler has fainted. * @return TRUE if the exp payout subroutine should be invoked; FALSE otherwise. @@ -4472,17 +4470,17 @@ static BOOL BattleController_AnyExpPayout(BattleContext *battleCtx, int nextCmd, /** * @brief Update any and all flags appropriate to being hit by a move. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ static void BattleController_UpdateFlagsWhenHit(BattleSystem *battleSys, BattleContext *battleCtx) { int moveType = CalcCurrentMoveType(battleCtx); if ((MOVE_DATA(battleCtx->moveTemp).flags & MOVE_FLAG_CAN_MIRROR_MOVE) - && (battleCtx->battleStatusMask & SYSCTL_REUSE_LAST_MOVE) == FALSE - && battleCtx->defender != BATTLER_NONE - && battleCtx->battleStatusMask2 & SYSCTL_ATTACK_MESSAGE_SHOWN) { + && (battleCtx->battleStatusMask & SYSCTL_REUSE_LAST_MOVE) == FALSE + && battleCtx->defender != BATTLER_NONE + && battleCtx->battleStatusMask2 & SYSCTL_ATTACK_MESSAGE_SHOWN) { battleCtx->moveCopied[battleCtx->defender] = battleCtx->moveTemp; battleCtx->moveCopiedHit[battleCtx->defender][battleCtx->attacker] = battleCtx->moveTemp; } @@ -4491,9 +4489,9 @@ static void BattleController_UpdateFlagsWhenHit(BattleSystem *battleSys, BattleC u8 itemEffect = Battler_HeldItemEffect(battleCtx, battleCtx->defender); if (((battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) || (battleCtx->battleStatusMask2 & SYSCTL_ATTACK_MESSAGE_SHOWN)) - && (itemEffect != HOLD_EFFECT_CHOICE_ATK - && itemEffect != HOLD_EFFECT_CHOICE_SPEED - && itemEffect != HOLD_EFFECT_CHOICE_SPATK)) { + && (itemEffect != HOLD_EFFECT_CHOICE_ATK + && itemEffect != HOLD_EFFECT_CHOICE_SPEED + && itemEffect != HOLD_EFFECT_CHOICE_SPATK)) { DEFENDING_MON.moveEffectsData.choiceLockedMove = MOVE_NONE; } @@ -4511,7 +4509,7 @@ static void BattleController_UpdateFlagsWhenHit(BattleSystem *battleSys, BattleC } if ((battleCtx->battleStatusMask2 & SYSCTL_MOVE_SUCCEEDED) - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE) { + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE) { switch (CURRENT_MOVE_DATA.range) { case RANGE_USER: case RANGE_USER_SIDE: @@ -4541,9 +4539,9 @@ static void BattleController_UpdateFlagsWhenHit(BattleSystem *battleSys, BattleC /** * @brief Load the Critical Hit message subroutine. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return Always TRUE. */ static BOOL BattleController_CriticalMessage(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4557,13 +4555,13 @@ static BOOL BattleController_CriticalMessage(BattleSystem *battleSys, BattleCont /** * @brief Load the follow-up message subroutine. - * + * * This subroutine is responsible for displaying messages such as the "But * nothing happened!" message for Splash, "It's a one-hit KO!" for OHKO moves, * and the effectiveness-messages that display after a move hits. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if the follow-up subroutine should be executed; FALSE otherwise. */ static BOOL BattleController_FollowupMessage(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4572,8 +4570,8 @@ static BOOL BattleController_FollowupMessage(BattleSystem *battleSys, BattleCont if (battleCtx->moveStatusFlags) { if (battleCtx->multiHitNumHits) { if (battleCtx->faintedMon != BATTLER_NONE - || battleCtx->multiHitCounter == 1 - || (battleCtx->moveStatusFlags & MOVE_STATUS_MULTI_HIT_DISRUPTED)) { + || battleCtx->multiHitCounter == 1 + || (battleCtx->moveStatusFlags & MOVE_STATUS_MULTI_HIT_DISRUPTED)) { result = TRUE; } } else { @@ -4592,9 +4590,9 @@ static BOOL BattleController_FollowupMessage(BattleSystem *battleSys, BattleCont /** * @brief Load the Rage Is Building subroutine sequence, if applicable. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if the subroutine was loaded for execution; FALSE otherwise. */ static BOOL BattleController_RageBuilding(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4605,11 +4603,11 @@ static BOOL BattleController_RageBuilding(BattleSystem *battleSys, BattleContext } if ((DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_RAGE) - && (battleCtx->moveStatusFlags & MOVE_STATUS_MULTI_HIT_DISRUPTED) == FALSE - && battleCtx->defender != battleCtx->attacker - && DEFENDING_MON.curHP - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && DEFENDING_MON.statBoosts[BATTLE_STAT_ATTACK] < 12) { + && (battleCtx->moveStatusFlags & MOVE_STATUS_MULTI_HIT_DISRUPTED) == FALSE + && battleCtx->defender != battleCtx->attacker + && DEFENDING_MON.curHP + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && DEFENDING_MON.statBoosts[BATTLE_STAT_ATTACK] < 12) { DEFENDING_MON.statBoosts[BATTLE_STAT_ATTACK]++; LOAD_SUBSEQ(subscript_rage_is_building); @@ -4624,9 +4622,9 @@ static BOOL BattleController_RageBuilding(BattleSystem *battleSys, BattleContext /** * @brief Check if an additional flinch effect should be applied due to King's * Rock. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if the flinch should be applied; FALSE otherwise. */ static BOOL BattleController_CheckExtraFlinch(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4636,12 +4634,12 @@ static BOOL BattleController_CheckExtraFlinch(BattleSystem *battleSys, BattleCon int itemPower = Battler_HeldItemPower(battleCtx, battleCtx->attacker, 0); if (battleCtx->defender != BATTLER_NONE - && itemEffect == HOLD_EFFECT_SOMETIMES_FLINCH - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && (BattleSystem_RandNext(battleSys) % 100) < itemPower - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_TRIGGERS_KINGS_ROCK) - && DEFENDING_MON.curHP) { + && itemEffect == HOLD_EFFECT_SOMETIMES_FLINCH + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && (BattleSystem_RandNext(battleSys) % 100) < itemPower + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_TRIGGERS_KINGS_ROCK) + && DEFENDING_MON.curHP) { battleCtx->sideEffectMon = battleCtx->defender; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_INDIRECT; @@ -4657,9 +4655,9 @@ static BOOL BattleController_CheckExtraFlinch(BattleSystem *battleSys, BattleCon /** * @brief Toggles the visibility of a semi-invulnerable battler off. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if a semi-invulnerable battler should be made visible; FALSE * otherwise. */ @@ -4668,7 +4666,7 @@ static BOOL BattleController_ToggleSemiInvulnMons(BattleSystem *battleSys, Battl BOOL result = FALSE; while (battleCtx->vanishedCheckTemp < BattleSystem_MaxBattlers(battleSys)) { if ((battleCtx->battleMons[battleCtx->vanishedCheckTemp].moveEffectsMask & MOVE_EFFECT_SEMI_INVULNERABLE) == FALSE - && (battleCtx->battleMons[battleCtx->vanishedCheckTemp].moveEffectsTemp & MOVE_EFFECT_SEMI_INVULNERABLE)) { + && (battleCtx->battleMons[battleCtx->vanishedCheckTemp].moveEffectsTemp & MOVE_EFFECT_SEMI_INVULNERABLE)) { battleCtx->battleMons[battleCtx->vanishedCheckTemp].moveEffectsTemp &= ~MOVE_EFFECT_SEMI_INVULNERABLE; LOAD_SUBSEQ(subscript_vanish_off); @@ -4704,14 +4702,14 @@ enum { /** * @brief Trigger effects which apply after a move hits its target. - * + * * This handles: * - turning off the Rage flag if the attacker did not use Rage again * - granting Shell Bell HP restoration * - deducting HP due to Life Orb - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if any interjecting subroutine must be executed; FALSE otherwise. */ static BOOL BattleController_TriggerAfterMoveHitEffects(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4737,13 +4735,13 @@ static BOOL BattleController_TriggerAfterMoveHitEffects(BattleSystem *battleSys, case AFTER_MOVE_HIT_STATE_SHELL_BELL: if (battleCtx->defender != BATTLER_NONE - && itemEffect == HOLD_EFFECT_HP_RESTORE_ON_DMG - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_MOVE_HIT) - && ATTACKER_SELF_TURN_FLAGS.shellBellDamageDealt - && battleCtx->attacker != battleCtx->defender - && ATTACKING_MON.curHP < ATTACKING_MON.maxHP - && ATTACKING_MON.curHP) { + && itemEffect == HOLD_EFFECT_HP_RESTORE_ON_DMG + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_MOVE_HIT) + && ATTACKER_SELF_TURN_FLAGS.shellBellDamageDealt + && battleCtx->attacker != battleCtx->defender + && ATTACKING_MON.curHP < ATTACKING_MON.maxHP + && ATTACKING_MON.curHP) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKER_SELF_TURN_FLAGS.shellBellDamageDealt * -1, itemPower); battleCtx->msgBattlerTemp = battleCtx->attacker; @@ -4759,11 +4757,11 @@ static BOOL BattleController_TriggerAfterMoveHitEffects(BattleSystem *battleSys, case AFTER_MOVE_HIT_STATE_LIFE_ORB: if (itemEffect == HOLD_EFFECT_HP_DRAIN_ON_ATK - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_MOVE_HIT) - && CURRENT_MOVE_DATA.class != CLASS_STATUS - && ATTACKING_MON.curHP) { + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_MOVE_HIT) + && CURRENT_MOVE_DATA.class != CLASS_STATUS + && ATTACKING_MON.curHP) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battleCtx->attacker].maxHP * -1, 10); battleCtx->msgBattlerTemp = battleCtx->attacker; @@ -4782,7 +4780,6 @@ static BOOL BattleController_TriggerAfterMoveHitEffects(BattleSystem *battleSys, battleCtx->afterMoveHitCheckTemp = 0; machineState = STATE_DONE; break; - } } while (machineState == STATE_PROCESSING); @@ -4792,9 +4789,9 @@ static BOOL BattleController_TriggerAfterMoveHitEffects(BattleSystem *battleSys, /** * @brief Initialize the battle AI with appropriate items from loaded trainer * data. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ static void BattleController_InitAI(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -4819,7 +4816,7 @@ static void BattleController_InitAI(BattleSystem *battleSys, BattleContext *batt battleCtx->aiScriptTemp = gTrainerAITable; } -static void BattleSystem_RecordCommand (BattleSystem *battleSys, BattleContext *battleCtx) +static void BattleSystem_RecordCommand(BattleSystem *battleSys, BattleContext *battleCtx) { int v0; int v1; diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index 6863b0362e..c402ee615b 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -1,48 +1,39 @@ -#include "enums.h" +#include "battle/battle_display.h" #include #include -#include "core_sys.h" -#include "assert.h" - #include "constants/heap.h" +#include "constants/species.h" +#include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "struct_decls/battle_system.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "battle/battle_context.h" -#include "battle/struct_ov16_0225BFFC_decl.h" -#include "battle/struct_ov16_02268A14_decl.h" -#include "battle/struct_ov16_0226D160_decl.h" - -#include "overlay012/const_ov12_0223B0DC.h" -#include "overlay012/const_ov12_0223B0A0.h" -#include "overlay012/const_ov12_0223B0B8.h" - -#include "struct_defs/sprite_animation_frame.h" -#include "functypes/funcptr_02007C34.h" #include "struct_defs/archived_sprite.h" +#include "struct_defs/battle_io.h" +#include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/trainer_data.h" -#include "overlay012/struct_ov12_02236030.h" -#include "overlay012/struct_ov12_02237728.h" -#include "overlay012/struct_ov12_02237F38.h" -#include "overlay012/struct_ov12_022380DC.h" -#include "overlay013/struct_ov13_0221FC20.h" -#include "overlay013/struct_ov13_022264F4.h" + +#include "battle/battle_context.h" +#include "battle/battle_io.h" +#include "battle/battle_lib.h" +#include "battle/battle_message.h" +#include "battle/healthbar.h" +#include "battle/ov16_0223B140.h" +#include "battle/ov16_0223DF00.h" +#include "battle/ov16_02264798.h" +#include "battle/ov16_0226871C.h" +#include "battle/party_gauge.h" #include "battle/struct_ov16_0224DDA8.h" +#include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_0225BFFC_t.h" #include "battle/struct_ov16_0225C168.h" #include "battle/struct_ov16_0225C17C.h" @@ -52,7 +43,6 @@ #include "battle/struct_ov16_0225C2C4.h" #include "battle/struct_ov16_0225C2D8.h" #include "battle/struct_ov16_0225C2EC.h" -#include "battle/battle_message.h" #include "battle/struct_ov16_0225C35C.h" #include "battle/struct_ov16_0225C370.h" #include "battle/struct_ov16_0225C384.h" @@ -66,7 +56,6 @@ #include "battle/struct_ov16_0225C454.h" #include "battle/struct_ov16_0225C468.h" #include "battle/struct_ov16_0225C65C.h" -#include "struct_defs/battle_io.h" #include "battle/struct_ov16_0225C9F0.h" #include "battle/struct_ov16_0225CA4C.h" #include "battle/struct_ov16_0225CA60.h" @@ -110,122 +99,129 @@ #include "battle/struct_ov16_02265BBC.h" #include "battle/struct_ov16_022664F8.h" #include "battle/struct_ov16_022674C4.h" +#include "battle/struct_ov16_02268A14_decl.h" #include "battle/struct_ov16_02269668.h" #include "battle/struct_ov16_0226AC98.h" #include "battle/struct_ov16_0226C378.h" +#include "battle/struct_ov16_0226D160_decl.h" +#include "battle/trainer_ai.h" +#include "functypes/funcptr_02007C34.h" +#include "overlay012/const_ov12_0223B0A0.h" +#include "overlay012/const_ov12_0223B0B8.h" +#include "overlay012/const_ov12_0223B0DC.h" +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02235E94.h" +#include "overlay012/ov12_02237EFC.h" +#include "overlay012/ov12_022380BC.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" +#include "overlay012/struct_ov12_02236030.h" +#include "overlay012/struct_ov12_02237728.h" +#include "overlay012/struct_ov12_02237F38.h" +#include "overlay012/struct_ov12_022380DC.h" +#include "overlay013/ov13_0221FC20.h" +#include "overlay013/ov13_022264F4.h" +#include "overlay013/struct_ov13_0221FC20.h" +#include "overlay013/struct_ov13_022264F4.h" +#include "assert.h" +#include "core_sys.h" +#include "enums.h" +#include "flags.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "move_table.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_0200762C.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_020131EC.h" #include "unk_0201567C.h" #include "unk_02015F84.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "trainer_info.h" -#include "constants/species.h" -#include "pokemon.h" -#include "move_table.h" -#include "party.h" -#include "item.h" -#include "flags.h" -#include "flags.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02235E94.h" -#include "overlay012/ov12_02237EFC.h" -#include "overlay012/ov12_022380BC.h" -#include "overlay013/ov13_0221FC20.h" -#include "overlay013/ov13_022264F4.h" -#include "battle/trainer_ai.h" -#include "battle/ov16_0223B140.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_lib.h" -#include "battle/battle_display.h" -#include "battle/ov16_02264798.h" -#include "battle/battle_io.h" -#include "battle/healthbar.h" -#include "battle/ov16_0226871C.h" -#include "battle/party_gauge.h" -static void ov16_0225E4E8(SysTask * param0, void * param1); -static void ov16_0225E894(SysTask * param0, void * param1); -static void ov16_0225EA80(SysTask * param0, void * param1); -static void ov16_0225F0C0(SysTask * param0, void * param1); -static void ov16_0225F764(SysTask * param0, void * param1); -static void ov16_0225FA00(SysTask * param0, void * param1); -static void ov16_0225FA70(SysTask * param0, void * param1); -static void ov16_0225FD5C(SysTask * param0, void * param1); -static void ov16_02260384(SysTask * param0, void * param1); -static void ov16_02260284(SysTask * param0, void * param1); +static void ov16_0225E4E8(SysTask *param0, void *param1); +static void ov16_0225E894(SysTask *param0, void *param1); +static void ov16_0225EA80(SysTask *param0, void *param1); +static void ov16_0225F0C0(SysTask *param0, void *param1); +static void ov16_0225F764(SysTask *param0, void *param1); +static void ov16_0225FA00(SysTask *param0, void *param1); +static void ov16_0225FA70(SysTask *param0, void *param1); +static void ov16_0225FD5C(SysTask *param0, void *param1); +static void ov16_02260384(SysTask *param0, void *param1); +static void ov16_02260284(SysTask *param0, void *param1); static void SlideHealthbarInTask(SysTask *task, void *data); static void SlideHealthbarOutTask(SysTask *task, void *data); -static void ov16_022604C8(SysTask * param0, void * param1); -static void ov16_02260AB4(SysTask * param0, void * param1); -static void ov16_02260AE4(SysTask * param0, void * param1); -static void ov16_02260B04(SysTask * param0, void * param1); -static void ov16_02260B84(SysTask * param0, void * param1); -static void ov16_02260BAC(SysTask * param0, void * param1); -static void ov16_02260C00(SysTask * param0, void * param1); -static void ov16_02260DB0(SysTask * param0, void * param1); -static void ov16_02260E78(SysTask * param0, void * param1); -static void ov16_02260E98(SysTask * param0, void * param1); -static void ov16_02260F14(SysTask * param0, void * param1); -static void ov16_022610A8(SysTask * param0, void * param1); -static void ov16_022610EC(SysTask * param0, void * param1); -static void ov16_0226110C(SysTask * param0, void * param1); -static void ov16_022611DC(SysTask * param0, void * param1); -static void ov16_02261D50(SysTask * param0, void * param1); -static void ov16_02261DA8(SysTask * param0, void * param1); -static void ov16_02261DE0(SysTask * param0, void * param1); -static void ov16_02261E8C(SysTask * param0, void * param1); -static void ov16_02262258(SysTask * param0, void * param1); -static void ov16_0226230C(SysTask * param0, void * param1); -static void ov16_0226232C(SysTask * param0, void * param1); -static void ov16_022623F0(SysTask * param0, void * param1); -static void ov16_0226262C(SysTask * param0, void * param1); -static void ov16_0226264C(SysTask * param0, void * param1); -static void ov16_0226266C(SysTask * param0, void * param1); -static void ov16_022626C0(SysTask * param0, void * param1); -static void ov16_0226292C(SysTask * param0, void * param1); -static void ov16_02262988(SysTask * param0, void * param1); -static void ov16_022629DC(SysTask * param0, void * param1); -static void ov16_02262A9C(SysTask * param0, void * param1); -static void ov16_02262D28(SysTask * param0, void * param1); -static void ov16_02262DC4(SysTask * param0, void * param1); -static void ov16_02262F30(SysTask * param0, void * param1); -static void WaitForBattleMessagePrint(SysTask * param0, void * param1); -static void ov16_02262FC0(SysTask * param0, void * param1); -static void ov16_02263014(SysTask * param0, void * param1); -static void ov16_022633A4(SysTask * param0, void * param1); -static void ov16_022634DC(SysTask * param0, void * param1); -static void ShowPartyGaugeTask(SysTask * param0, void * param1); -static void HidePartyGaugeTask(SysTask * param0, void * param1); -static void ov16_02263688(SysTask * param0, void * param1); -static void ov16_022636D4(SysTask * param0, void * param1); -static Sprite * ov16_02263B30(BattleSystem * param0, UnkStruct_02007768 * param1, ArchivedSprite * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame * param11, UnkFuncPtr_02007C34 * param12); -static void ov16_02263C1C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3F8 * param2, BattleMessage * param3); -static void ov16_02263CF0(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C40C * param2, BattleMessage * param3); -static void ov16_02263DD0(BattleSystem * param0, BattlerData * param1, BattleMessage * param2); -static void ov16_02263E7C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C430 * param2, BattleMessage * param3); -static void ov16_022641B4(BattleSystem * param0, BattlerData * param1, BattleMessage * param2); -static void ov16_02264270(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C9F0 * param2, BattleMessage * param3); -static void ov16_02264360(BattleSystem * param0, BattlerData * param1, BattleMessage * param2); -static CellActorData * ov16_022643B8(BattleSystem * param0, int param1, int param2, int param3, s16 param4, s16 param5); -static void ov16_02264408(BattleSystem * param0, BattlerData * param1, UnkStruct_ov12_0221FCDC * param2, UnkStruct_ov16_02265BBC * param3); -static void ov16_02264530(BattleSystem * param0, UnkStruct_ov16_02265BBC * param1, UnkStruct_ov12_022380DC * param2, int param3); -static void ov16_022645B8(u8 * param0, u8 * param1, int param2, int param3, u16 param4); -static BOOL ov16_02264650(UnkStruct_ov16_02264650_1 * param0, CellActorData * param1); -static void ov16_022646C8(SysTask * param0, void * param1); -static void ov16_02264730(BattleSystem * param0); -static void ov16_0226474C(BattleSystem * param0); -static u8 ov16_02264768(BattleSystem * param0, u8 param1, u8 param2); +static void ov16_022604C8(SysTask *param0, void *param1); +static void ov16_02260AB4(SysTask *param0, void *param1); +static void ov16_02260AE4(SysTask *param0, void *param1); +static void ov16_02260B04(SysTask *param0, void *param1); +static void ov16_02260B84(SysTask *param0, void *param1); +static void ov16_02260BAC(SysTask *param0, void *param1); +static void ov16_02260C00(SysTask *param0, void *param1); +static void ov16_02260DB0(SysTask *param0, void *param1); +static void ov16_02260E78(SysTask *param0, void *param1); +static void ov16_02260E98(SysTask *param0, void *param1); +static void ov16_02260F14(SysTask *param0, void *param1); +static void ov16_022610A8(SysTask *param0, void *param1); +static void ov16_022610EC(SysTask *param0, void *param1); +static void ov16_0226110C(SysTask *param0, void *param1); +static void ov16_022611DC(SysTask *param0, void *param1); +static void ov16_02261D50(SysTask *param0, void *param1); +static void ov16_02261DA8(SysTask *param0, void *param1); +static void ov16_02261DE0(SysTask *param0, void *param1); +static void ov16_02261E8C(SysTask *param0, void *param1); +static void ov16_02262258(SysTask *param0, void *param1); +static void ov16_0226230C(SysTask *param0, void *param1); +static void ov16_0226232C(SysTask *param0, void *param1); +static void ov16_022623F0(SysTask *param0, void *param1); +static void ov16_0226262C(SysTask *param0, void *param1); +static void ov16_0226264C(SysTask *param0, void *param1); +static void ov16_0226266C(SysTask *param0, void *param1); +static void ov16_022626C0(SysTask *param0, void *param1); +static void ov16_0226292C(SysTask *param0, void *param1); +static void ov16_02262988(SysTask *param0, void *param1); +static void ov16_022629DC(SysTask *param0, void *param1); +static void ov16_02262A9C(SysTask *param0, void *param1); +static void ov16_02262D28(SysTask *param0, void *param1); +static void ov16_02262DC4(SysTask *param0, void *param1); +static void ov16_02262F30(SysTask *param0, void *param1); +static void WaitForBattleMessagePrint(SysTask *param0, void *param1); +static void ov16_02262FC0(SysTask *param0, void *param1); +static void ov16_02263014(SysTask *param0, void *param1); +static void ov16_022633A4(SysTask *param0, void *param1); +static void ov16_022634DC(SysTask *param0, void *param1); +static void ShowPartyGaugeTask(SysTask *param0, void *param1); +static void HidePartyGaugeTask(SysTask *param0, void *param1); +static void ov16_02263688(SysTask *param0, void *param1); +static void ov16_022636D4(SysTask *param0, void *param1); +static Sprite *ov16_02263B30(BattleSystem *param0, UnkStruct_02007768 *param1, ArchivedSprite *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame *param11, UnkFuncPtr_02007C34 *param12); +static void ov16_02263C1C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3F8 *param2, BattleMessage *param3); +static void ov16_02263CF0(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C40C *param2, BattleMessage *param3); +static void ov16_02263DD0(BattleSystem *param0, BattlerData *param1, BattleMessage *param2); +static void ov16_02263E7C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C430 *param2, BattleMessage *param3); +static void ov16_022641B4(BattleSystem *param0, BattlerData *param1, BattleMessage *param2); +static void ov16_02264270(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C9F0 *param2, BattleMessage *param3); +static void ov16_02264360(BattleSystem *param0, BattlerData *param1, BattleMessage *param2); +static CellActorData *ov16_022643B8(BattleSystem *param0, int param1, int param2, int param3, s16 param4, s16 param5); +static void ov16_02264408(BattleSystem *param0, BattlerData *param1, UnkStruct_ov12_0221FCDC *param2, UnkStruct_ov16_02265BBC *param3); +static void ov16_02264530(BattleSystem *param0, UnkStruct_ov16_02265BBC *param1, UnkStruct_ov12_022380DC *param2, int param3); +static void ov16_022645B8(u8 *param0, u8 *param1, int param2, int param3, u16 param4); +static BOOL ov16_02264650(UnkStruct_ov16_02264650_1 *param0, CellActorData *param1); +static void ov16_022646C8(SysTask *param0, void *param1); +static void ov16_02264730(BattleSystem *param0); +static void ov16_0226474C(BattleSystem *param0); +static u8 ov16_02264768(BattleSystem *param0, u8 param1, u8 param2); static const u16 Unk_ov16_0226F1AE[] = { 0x0, @@ -247,9 +243,9 @@ static const u16 Unk_ov16_0226F1AE[] = { 0x151E }; -void ov16_0225CBB8 (BattleSystem * param0, BattlerData * param1) +void ov16_0225CBB8(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225CBB8 * v0; + UnkStruct_ov16_0225CBB8 *v0; v0 = (UnkStruct_ov16_0225CBB8 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225CBB8)); v0->unk_00 = param0; @@ -260,13 +256,13 @@ void ov16_0225CBB8 (BattleSystem * param0, BattlerData * param1) SysTask_Start(ov16_02263014, v0, 0); } -void ov16_0225CBDC (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C168 * param2) +void ov16_0225CBDC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C168 *param2) { int v0; ArchivedSprite v1; - UnkStruct_02007768 * v2; + UnkStruct_02007768 *v2; SpriteAnimationFrame v3[10]; - UnkStruct_ov16_0225E4E8 * v4; + UnkStruct_ov16_0225E4E8 *v4; int v5; u8 v6; s8 v7; @@ -345,10 +341,10 @@ void ov16_0225CBDC (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ sub_02005454(1); } -void ov16_0225CE1C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C17C * param2) +void ov16_0225CE1C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C17C *param2) { int v0; - UnkStruct_ov16_0225EA80 * v1; + UnkStruct_ov16_0225EA80 *v1; int v2; v2 = BattleSystem_BattleType(param0); @@ -395,11 +391,11 @@ void ov16_0225CE1C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(ov16_0225EA80, v1, 0); } -void ov16_0225CF70 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C17C * param2) +void ov16_0225CF70(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C17C *param2) { int v0; int v1; - UnkStruct_ov16_0225EA80 * v2; + UnkStruct_ov16_0225EA80 *v2; int v3; v3 = BattleSystem_BattleType(param0); @@ -454,10 +450,10 @@ void ov16_0225CF70 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(ov16_0225F0C0, v2, 0); } -void ov16_0225D118 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02264EF8 * param2) +void ov16_0225D118(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02264EF8 *param2) { int v0; - UnkStruct_ov16_0225F764 * v1; + UnkStruct_ov16_0225F764 *v1; v1 = (UnkStruct_ov16_0225F764 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225F764)); v1->unk_00 = param0; @@ -482,9 +478,9 @@ void ov16_0225D118 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(ov16_0225F764, v1, 0); } -void ov16_0225D1C4 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265050 * param2) +void ov16_0225D1C4(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265050 *param2) { - UnkStruct_ov16_0225D1C4 * v0; + UnkStruct_ov16_0225D1C4 *v0; v0 = (UnkStruct_ov16_0225D1C4 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D1C4)); @@ -501,10 +497,10 @@ void ov16_0225D1C4 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(ov16_0225FA00, v0, 0); } -void ov16_0225D228 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265124 * param2) +void ov16_0225D228(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265124 *param2) { int v0; - UnkStruct_ov16_02264650_1 * v1; + UnkStruct_ov16_02264650_1 *v1; int v2; v1 = (UnkStruct_ov16_02264650_1 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_02264650_1)); @@ -543,9 +539,9 @@ void ov16_0225D228 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(ov16_0225FA70, v1, 0); } -void ov16_0225D360 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265154 * param2) +void ov16_0225D360(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265154 *param2) { - UnkStruct_ov16_0225D360 * v0; + UnkStruct_ov16_0225D360 *v0; v0 = (UnkStruct_ov16_0225D360 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D360)); @@ -561,7 +557,7 @@ void ov16_0225D360 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ v0->unk_0C = 0; } else { { - TrainerData * v1; + TrainerData *v1; v1 = BattleSystem_TrainerData(param0, param1->battler); v0->unk_0B = 0; @@ -572,9 +568,9 @@ void ov16_0225D360 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(ov16_0225FD5C, v0, 0); } -void ov16_0225D3CC (BattleSystem * param0, BattlerData * param1) +void ov16_0225D3CC(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225D3CC * v0; + UnkStruct_ov16_0225D3CC *v0; v0 = (UnkStruct_ov16_0225D3CC *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D3CC)); @@ -593,12 +589,12 @@ void ov16_0225D3CC (BattleSystem * param0, BattlerData * param1) SysTask_Start(ov16_02260284, v0, 0); } -void ov16_0225D414 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022651A8 * param2) +void ov16_0225D414(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022651A8 *param2) { int v0; ArchivedSprite v1; - UnkStruct_02007768 * v2; - UnkStruct_ov16_02260384 * v3; + UnkStruct_02007768 *v2; + UnkStruct_ov16_02260384 *v3; u32 v4; v2 = ov16_0223E000(param0); @@ -650,7 +646,7 @@ void BattleDisplay_SlideHealthbarIn(BattleSystem *battleSys, BattlerData *battle void BattleDisplay_SlideHealthbarOut(BattleSystem *battleSys, BattlerData *battlerData) { - Healthbar * healthbar = &battlerData->healthbar; + Healthbar *healthbar = &battlerData->healthbar; MI_CpuClearFast(&healthbar->state, sizeof(u8)); healthbar->battleSys = battleSys; @@ -662,9 +658,9 @@ void BattleDisplay_SlideHealthbarOut(BattleSystem *battleSys, BattlerData *battl healthbar->unk_10 = SysTask_Start(SlideHealthbarOutTask, healthbar, 1000); } -void ov16_0225D5B8 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C260 * param2) +void ov16_0225D5B8(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C260 *param2) { - UnkStruct_ov16_0225D5B8 * v0; + UnkStruct_ov16_0225D5B8 *v0; int v1, v2; v0 = (UnkStruct_ov16_0225D5B8 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D5B8)); @@ -710,9 +706,9 @@ void ov16_0225D5B8 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(param1->unk_00.unk_00, v0, 0); } -void ov16_0225D698 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022656F0 * param2) +void ov16_0225D698(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022656F0 *param2) { - UnkStruct_ov16_0225D698 * v0; + UnkStruct_ov16_0225D698 *v0; int v1; v0 = (UnkStruct_ov16_0225D698 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D698)); @@ -736,9 +732,9 @@ void ov16_0225D698 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(param1->unk_00.unk_04, v0, 0); } -void ov16_0225D708 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C29C * param2) +void ov16_0225D708(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C29C *param2) { - UnkStruct_ov16_0225D708 * v0; + UnkStruct_ov16_0225D708 *v0; int v1, v2; u32 v3; u8 v4[6]; @@ -766,9 +762,9 @@ void ov16_0225D708 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(param1->unk_00.unk_08, v0, 0); } -void ov16_0225D794 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2B0 * param2) +void ov16_0225D794(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C2B0 *param2) { - UnkStruct_ov16_0225D794 * v0; + UnkStruct_ov16_0225D794 *v0; int v1, v2; v0 = (UnkStruct_ov16_0225D794 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D794)); @@ -798,9 +794,9 @@ void ov16_0225D794 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(param1->unk_00.unk_0C, v0, 0); } -void ov16_0225D840 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2C4 * param2) +void ov16_0225D840(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C2C4 *param2) { - UnkStruct_ov16_0225D840 * v0; + UnkStruct_ov16_0225D840 *v0; int v1, v2; v0 = (UnkStruct_ov16_0225D840 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D840)); @@ -826,9 +822,9 @@ void ov16_0225D840 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(param1->unk_00.unk_10, v0, 0); } -void ov16_0225D8AC (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2D8 * param2) +void ov16_0225D8AC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C2D8 *param2) { - UnkStruct_ov16_0225D8AC * v0; + UnkStruct_ov16_0225D8AC *v0; v0 = (UnkStruct_ov16_0225D8AC *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8AC)); @@ -852,10 +848,10 @@ typedef struct BattleMessageWaitTask { u8 msgIdx; } BattleMessageWaitTask; -void ov16_0225D8F0 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2EC * param2) +void ov16_0225D8F0(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C2EC *param2) { - BattleMessageWaitTask * v0; - MessageLoader * v1; + BattleMessageWaitTask *v0; + MessageLoader *v1; BattleMessage v2; v1 = ov16_0223E060(param0); @@ -887,9 +883,9 @@ void BattleDisplay_PrintMessage(BattleSystem *battleSys, BattlerData *battlerDat SysTask_Start(WaitForBattleMessagePrint, taskData, 0); } -void ov16_0225D9A8 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2) +void ov16_0225D9A8(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265BBC *param2) { - UnkStruct_ov16_0225D9A8 * v0; + UnkStruct_ov16_0225D9A8 *v0; v0 = (UnkStruct_ov16_0225D9A8 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D9A8)); @@ -914,9 +910,9 @@ void ov16_0225D9A8 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(ov16_022626C0, v0, 0); } -void ov16_0225DA44 (BattleSystem * param0, BattlerData * param1) +void ov16_0225DA44(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225DA44 * v0; + UnkStruct_ov16_0225DA44 *v0; v0 = (UnkStruct_ov16_0225DA44 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225DA44)); @@ -929,9 +925,9 @@ void ov16_0225DA44 (BattleSystem * param0, BattlerData * param1) SysTask_Start(ov16_0226292C, v0, 0); } -void ov16_0225DA74 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C35C * param2) +void ov16_0225DA74(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C35C *param2) { - Healthbar * v0; + Healthbar *v0; GF_ASSERT(param1->healthbar.mainActor != NULL); @@ -955,9 +951,9 @@ void ov16_0225DA74 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ v0->unk_10 = SysTask_Start(ov16_02262988, v0, 1000); } -void ov16_0225DB00 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C370 * param2) +void ov16_0225DB00(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C370 *param2) { - Healthbar * v0; + Healthbar *v0; GF_ASSERT(param1->healthbar.mainActor != NULL); @@ -980,9 +976,9 @@ void ov16_0225DB00 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov } } -void ov16_0225DB74 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C384 * param2) +void ov16_0225DB74(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C384 *param2) { - UnkStruct_ov16_0225DB74 * v0; + UnkStruct_ov16_0225DB74 *v0; int v1; v0 = (UnkStruct_ov16_0225DB74 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225DB74)); @@ -1017,7 +1013,7 @@ void ov16_0225DB74 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(ov16_02262A9C, v0, 0); } -void ov16_0225DC4C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C398 * param2) +void ov16_0225DC4C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C398 *param2) { int v0; @@ -1031,9 +1027,9 @@ void ov16_0225DC4C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ sub_02005728(param2->unk_04, v0); } -void ov16_0225DC7C (BattleSystem * param0, BattlerData * param1) +void ov16_0225DC7C(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225DC7C * v0; + UnkStruct_ov16_0225DC7C *v0; v0 = (UnkStruct_ov16_0225DC7C *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225DC7C)); @@ -1045,9 +1041,9 @@ void ov16_0225DC7C (BattleSystem * param0, BattlerData * param1) SysTask_Start(ov16_02262D28, v0, 0); } -void ov16_0225DCB0 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3BC * param2) +void ov16_0225DCB0(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3BC *param2) { - UnkStruct_ov16_0225DCB0 * v0; + UnkStruct_ov16_0225DCB0 *v0; int v1; v0 = (UnkStruct_ov16_0225DCB0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225DCB0)); @@ -1071,7 +1067,7 @@ void ov16_0225DCB0 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(ov16_02262DC4, v0, 0); } -void ov16_0225DD44 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3D0 * param2) +void ov16_0225DD44(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3D0 *param2) { GF_ASSERT(param1->healthbar.mainActor != NULL); @@ -1081,9 +1077,9 @@ void ov16_0225DD44 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ ClearCommand(param0, param1->battler, param2->unk_00); } -void ov16_0225DD7C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3E4 * param2) +void ov16_0225DD7C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3E4 *param2) { - BattleMessageWaitTask * v0; + BattleMessageWaitTask *v0; int v1; v1 = Battler_TrainerID(param0, param1->battler); @@ -1097,10 +1093,10 @@ void ov16_0225DD7C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(WaitForBattleMessagePrint, v0, 0); } -void ov16_0225DDD8 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3F8 * param2) +void ov16_0225DDD8(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3F8 *param2) { - BattleMessageWaitTask * v0; - MessageLoader * v1; + BattleMessageWaitTask *v0; + MessageLoader *v1; BattleMessage v2; ov16_02263C1C(param0, param1, param2, &v2); @@ -1116,10 +1112,10 @@ void ov16_0225DDD8 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(WaitForBattleMessagePrint, v0, 0); } -void ov16_0225DE30 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C40C * param2) +void ov16_0225DE30(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C40C *param2) { - BattleMessageWaitTask * v0; - MessageLoader * v1; + BattleMessageWaitTask *v0; + MessageLoader *v1; BattleMessage v2; ov16_02263CF0(param0, param1, param2, &v2); @@ -1135,10 +1131,10 @@ void ov16_0225DE30 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(WaitForBattleMessagePrint, v0, 0); } -void ov16_0225DE88 (BattleSystem * param0, BattlerData * param1) +void ov16_0225DE88(BattleSystem *param0, BattlerData *param1) { - BattleMessageWaitTask * v0; - MessageLoader * v1; + BattleMessageWaitTask *v0; + MessageLoader *v1; BattleMessage v2; ov16_02263DD0(param0, param1, &v2); @@ -1154,10 +1150,10 @@ void ov16_0225DE88 (BattleSystem * param0, BattlerData * param1) SysTask_Start(WaitForBattleMessagePrint, v0, 0); } -void ov16_0225DEDC (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C430 * param2) +void ov16_0225DEDC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C430 *param2) { - BattleMessageWaitTask * v0; - MessageLoader * v1; + BattleMessageWaitTask *v0; + MessageLoader *v1; BattleMessage v2; ov16_02263E7C(param0, param1, param2, &v2); @@ -1173,9 +1169,9 @@ void ov16_0225DEDC (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(WaitForBattleMessagePrint, v0, 0); } -void ov16_0225DF34 (BattleSystem * param0, BattlerData * param1) +void ov16_0225DF34(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225DF34 * v0; + UnkStruct_ov16_0225DF34 *v0; v0 = (UnkStruct_ov16_0225DF34 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225DF34)); @@ -1188,10 +1184,10 @@ void ov16_0225DF34 (BattleSystem * param0, BattlerData * param1) SysTask_Start(ov16_02262F30, v0, 0); } -void ov16_0225DF6C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C454 * param2) +void ov16_0225DF6C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C454 *param2) { - UnkStruct_ov16_0225DF6C * v0; - MessageLoader * v1; + UnkStruct_ov16_0225DF6C *v0; + MessageLoader *v1; if (param1->bootState == 0x0) { v1 = BattleSystem_MessageLoader(param0); @@ -1216,9 +1212,9 @@ void ov16_0225DF6C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ } } -void ov16_0225E008 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C468 * param2) +void ov16_0225E008(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C468 *param2) { - Healthbar * v0; + Healthbar *v0; v0 = ¶m1->healthbar; @@ -1244,9 +1240,9 @@ void ov16_0225E008 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ ClearCommand(v0->battleSys, v0->battler, v0->unk_4C); } -void ov16_0225E0BC (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C65C * param2) +void ov16_0225E0BC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C65C *param2) { - UnkStruct_ov16_0225E0BC * v0; + UnkStruct_ov16_0225E0BC *v0; v0 = (UnkStruct_ov16_0225E0BC *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225E0BC)); @@ -1260,9 +1256,9 @@ void ov16_0225E0BC (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(ov16_022633A4, v0, 0); } -void ov16_0225E0F4 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022664F8 * param2) +void ov16_0225E0F4(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022664F8 *param2) { - UnkStruct_ov16_0225E0F4 * v0; + UnkStruct_ov16_0225E0F4 *v0; v0 = (UnkStruct_ov16_0225E0F4 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225E0F4)); @@ -1352,9 +1348,9 @@ void BattleDisplay_HidePartyGauge(BattleSystem *battleSys, BattlerData *battlerD SysTask_Start(HidePartyGaugeTask, task, 0); } -void ov16_0225E23C (BattleSystem * param0, BattlerData * param1) +void ov16_0225E23C(BattleSystem *param0, BattlerData *param1) { - MessageLoader * v0; + MessageLoader *v0; BattleMessage v1; if (param1->bootState == 0x0) { @@ -1370,7 +1366,7 @@ void ov16_0225E23C (BattleSystem * param0, BattlerData * param1) ClearCommand(param0, param1->battler, 55); } -void ov16_0225E294 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2) +void ov16_0225E294(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265BBC *param2) { UnkStruct_ov12_022380DC v0; @@ -1379,9 +1375,9 @@ void ov16_0225E294 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ ClearCommand(param0, param1->battler, param2->unk_00); } -void ov16_0225E2C8 (BattleSystem * param0, BattlerData * param1) +void ov16_0225E2C8(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225E2C8 * v0; + UnkStruct_ov16_0225E2C8 *v0; v0 = (UnkStruct_ov16_0225E2C8 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225E2C8)); @@ -1395,9 +1391,9 @@ void ov16_0225E2C8 (BattleSystem * param0, BattlerData * param1) SysTask_Start(ov16_02263688, v0, 0); } -void ov16_0225E300 (BattleSystem * param0, BattlerData * param1) +void ov16_0225E300(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225E300 * v0; + UnkStruct_ov16_0225E300 *v0; v0 = (UnkStruct_ov16_0225E300 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225E300)); @@ -1411,10 +1407,10 @@ void ov16_0225E300 (BattleSystem * param0, BattlerData * param1) SysTask_Start(ov16_022636D4, v0, 0); } -void ov16_0225E338 (BattleSystem * param0, BattlerData * param1) +void ov16_0225E338(BattleSystem *param0, BattlerData *param1) { - BattleMessageWaitTask * v0; - MessageLoader * v1; + BattleMessageWaitTask *v0; + MessageLoader *v1; BattleMessage v2; ov16_022641B4(param0, param1, &v2); @@ -1430,10 +1426,10 @@ void ov16_0225E338 (BattleSystem * param0, BattlerData * param1) SysTask_Start(WaitForBattleMessagePrint, v0, 0); } -void ov16_0225E38C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C9F0 * param2) +void ov16_0225E38C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C9F0 *param2) { - BattleMessageWaitTask * v0; - MessageLoader * v1; + BattleMessageWaitTask *v0; + MessageLoader *v1; BattleMessage v2; ov16_02264270(param0, param1, param2, &v2); @@ -1449,10 +1445,10 @@ void ov16_0225E38C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(WaitForBattleMessagePrint, v0, 0); } -void ov16_0225E3E0 (BattleSystem * param0, BattlerData * param1) +void ov16_0225E3E0(BattleSystem *param0, BattlerData *param1) { - BattleMessageWaitTask * v0; - MessageLoader * v1; + BattleMessageWaitTask *v0; + MessageLoader *v1; BattleMessage v2; ov16_02264360(param0, param1, &v2); @@ -1468,7 +1464,7 @@ void ov16_0225E3E0 (BattleSystem * param0, BattlerData * param1) SysTask_Start(WaitForBattleMessagePrint, v0, 0); } -void ov16_0225E434 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2) +void ov16_0225E434(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_02265BBC *param2) { UnkStruct_ov12_022380DC v0; @@ -1477,7 +1473,7 @@ void ov16_0225E434 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ ClearCommand(param0, param1->battler, param2->unk_00); } -void ov16_0225E468 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225CA4C * param2) +void ov16_0225E468(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225CA4C *param2) { int v0; @@ -1502,16 +1498,16 @@ void ov16_0225E468 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ ClearCommand(param0, param1->battler, param2->unk_00); } -void ov16_0225E4C8 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225CA60 * param2) +void ov16_0225E4C8(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225CA60 *param2) { Sound_PlayBGM(param2->unk_02); ClearCommand(param0, param1->battler, param2->unk_00); } -static void ov16_0225E4E8 (SysTask * param0, void * param1) +static void ov16_0225E4E8(SysTask *param0, void *param1) { - UnkStruct_ov16_0225E4E8 * v0 = (UnkStruct_ov16_0225E4E8 *)param1; - UnkStruct_ov12_0221FCDC * v1 = ov16_0223E008(v0->unk_00); + UnkStruct_ov16_0225E4E8 *v0 = (UnkStruct_ov16_0225E4E8 *)param1; + UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); s16 v2, v3; switch (v0->unk_12) { @@ -1648,10 +1644,10 @@ static void ov16_0225E4E8 (SysTask * param0, void * param1) } } -static void ov16_0225E894 (SysTask * param0, void * param1) +static void ov16_0225E894(SysTask *param0, void *param1) { - UnkStruct_ov16_0225E4E8 * v0 = (UnkStruct_ov16_0225E4E8 *)param1; - UnkStruct_ov12_0221FCDC * v1 = ov16_0223E008(v0->unk_00); + UnkStruct_ov16_0225E4E8 *v0 = (UnkStruct_ov16_0225E4E8 *)param1; + UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); s16 v2, v3; switch (v0->unk_12) { @@ -1739,9 +1735,9 @@ const u8 Unk_ov16_0226F174[] = { 0x5 }; -static void ov16_0225EA80 (SysTask * param0, void * param1) +static void ov16_0225EA80(SysTask *param0, void *param1) { - UnkStruct_ov16_0225EA80 * v0 = (UnkStruct_ov16_0225EA80 *)param1; + UnkStruct_ov16_0225EA80 *v0 = (UnkStruct_ov16_0225EA80 *)param1; switch (v0->unk_83) { case 0: @@ -1758,7 +1754,7 @@ static void ov16_0225EA80 (SysTask * param0, void * param1) } } else { if ((BattleSystem_BattleStatus(v0->unk_00) & 0x20) == 0) { - if (((ov16_0223ED60(v0->unk_00) == 1) && (v0->unk_82 == 2))) { + if ((ov16_0223ED60(v0->unk_00) == 1) && (v0->unk_82 == 2)) { v0->unk_10 = ov12_02223764(v0->unk_00, 5); } else if (v0->unk_82 == 0) { v0->unk_10 = ov12_02223764(v0->unk_00, 5); @@ -1771,9 +1767,8 @@ static void ov16_0225EA80 (SysTask * param0, void * param1) v0->unk_83++; break; - case 1: - { - UnkStruct_ov12_02236030 v1 = {0}; + case 1: { + UnkStruct_ov12_02236030 v1 = { 0 }; v1.unk_00 = v0->unk_82; v1.unk_08 = BattleSystem_PartyPokemon(v0->unk_00, v0->unk_81, v0->unk_8C); @@ -1804,7 +1799,7 @@ static void ov16_0225EA80 (SysTask * param0, void * param1) } { - UnkStruct_02007768 * v2; + UnkStruct_02007768 *v2; SpriteAnimationFrame v3[10]; v2 = ov16_0223E000(v0->unk_00); @@ -1945,14 +1940,13 @@ static void ov16_0225EA80 (SysTask * param0, void * param1) } } -static void ov16_0225F0C0 (SysTask * param0, void * param1) +static void ov16_0225F0C0(SysTask *param0, void *param1) { - UnkStruct_ov16_0225EA80 * v0 = (UnkStruct_ov16_0225EA80 *)param1; - UnkStruct_ov12_0221FCDC * v1 = ov16_0223E008(v0->unk_00); + UnkStruct_ov16_0225EA80 *v0 = (UnkStruct_ov16_0225EA80 *)param1; + UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); switch (v0->unk_83) { - case 0: - { + case 0: { BallThrow v2; v2.type = Unk_ov16_0226F174[v0->unk_82]; @@ -1973,7 +1967,7 @@ static void ov16_0225F0C0 (SysTask * param0, void * param1) v0->unk_0C = ov12_02237728(&v2); } { - UnkStruct_02007768 * v3; + UnkStruct_02007768 *v3; SpriteAnimationFrame v4[10]; v3 = ov16_0223E000(v0->unk_00); @@ -1991,9 +1985,8 @@ static void ov16_0225F0C0 (SysTask * param0, void * param1) } v0->unk_83++; break; - case 1: - { - UnkStruct_ov12_02236030 v5 = {0}; + case 1: { + UnkStruct_ov12_02236030 v5 = { 0 }; v5.unk_00 = v0->unk_82; v5.unk_08 = BattleSystem_PartyPokemon(v0->unk_00, v0->unk_81, v0->unk_8C); @@ -2142,8 +2135,7 @@ static void ov16_0225F0C0 (SysTask * param0, void * param1) v0->unk_83 = 0xff; } break; - case 10: - { + case 10: { UnkStruct_ov12_022380DC v12; UnkStruct_ov16_02265BBC v13; @@ -2164,10 +2156,10 @@ static void ov16_0225F0C0 (SysTask * param0, void * param1) } } -static void ov16_0225F764 (SysTask * param0, void * param1) +static void ov16_0225F764(SysTask *param0, void *param1) { - UnkStruct_ov16_0225F764 * v0 = (UnkStruct_ov16_0225F764 *)param1; - UnkStruct_ov12_0221FCDC * v1 = ov16_0223E008(v0->unk_00); + UnkStruct_ov16_0225F764 *v0 = (UnkStruct_ov16_0225F764 *)param1; + UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); switch (v0->unk_6B) { case 0: @@ -2183,8 +2175,7 @@ static void ov16_0225F764 (SysTask * param0, void * param1) v0->unk_6B = 4; } break; - case 2: - { + case 2: { UnkStruct_ov12_022380DC v3; UnkStruct_ov16_02265BBC v4; @@ -2224,7 +2215,7 @@ static void ov16_0225F764 (SysTask * param0, void * param1) } else { { BallThrow v6; - int v7[] = {0, 1, 2, 3, 4, 5}; + int v7[] = { 0, 1, 2, 3, 4, 5 }; v6.type = v7[v0->unk_6A]; v6.heapID = 5; @@ -2290,9 +2281,9 @@ static void ov16_0225F764 (SysTask * param0, void * param1) } } -static void ov16_0225FA00 (SysTask * param0, void * param1) +static void ov16_0225FA00(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D1C4 * v0 = (UnkStruct_ov16_0225D1C4 *)param1; + UnkStruct_ov16_0225D1C4 *v0 = (UnkStruct_ov16_0225D1C4 *)param1; switch (v0->unk_0B) { case 0: @@ -2317,9 +2308,9 @@ static void ov16_0225FA00 (SysTask * param0, void * param1) } } -static void ov16_0225FA70 (SysTask * param0, void * param1) +static void ov16_0225FA70(SysTask *param0, void *param1) { - UnkStruct_ov16_02264650_1 * v0 = (UnkStruct_ov16_02264650_1 *)param1; + UnkStruct_ov16_02264650_1 *v0 = (UnkStruct_ov16_02264650_1 *)param1; s16 v1, v2, v3, v4; u32 v5; @@ -2446,92 +2437,92 @@ static void ov16_0225FA70 (SysTask * param0, void * param1) } } -static void ov16_0225FD5C (SysTask * param0, void * param1) +static void ov16_0225FD5C(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D360 * v0 = (UnkStruct_ov16_0225D360 *)param1; + UnkStruct_ov16_0225D360 *v0 = (UnkStruct_ov16_0225D360 *)param1; s16 v1, v2; int v3; u32 v4; s16 v5[][6][2] = { { - {0x0, 0x80}, - {0xFFFFFFFFFFFFFFDE, 0x4}, - {0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5}, - {0x32, 0xFFFFFFFFFFFFFFF4}, - {0x7FFF, 0x7FFF}, - {0x7FFF, 0x7FFF} + { 0x0, 0x80 }, + { 0xFFFFFFFFFFFFFFDE, 0x4 }, + { 0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5 }, + { 0x32, 0xFFFFFFFFFFFFFFF4 }, + { 0x7FFF, 0x7FFF }, + { 0x7FFF, 0x7FFF }, }, { - {0x0, 0x80}, - {0xFFFFFFFFFFFFFFDE, 0x4}, - {0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5}, - {0x32, 0xFFFFFFFFFFFFFFF4}, - {0x32, 0xFFFFFFFFFFFFFFF4}, - {0x7FFF, 0x7FFF} + { 0x0, 0x80 }, + { 0xFFFFFFFFFFFFFFDE, 0x4 }, + { 0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5 }, + { 0x32, 0xFFFFFFFFFFFFFFF4 }, + { 0x32, 0xFFFFFFFFFFFFFFF4 }, + { 0x7FFF, 0x7FFF }, }, { - {0x0, 0x80}, - {0xFFFFFFFFFFFFFFDE, 0x4}, - {0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5}, - {0x32, 0xFFFFFFFFFFFFFFF4}, - {0x7FFF, 0x7FFF}, - {0x7FFF, 0x7FFF} + { 0x0, 0x80 }, + { 0xFFFFFFFFFFFFFFDE, 0x4 }, + { 0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5 }, + { 0x32, 0xFFFFFFFFFFFFFFF4 }, + { 0x7FFF, 0x7FFF }, + { 0x7FFF, 0x7FFF }, }, { - {0x0, 0x80}, - {0xFFFFFFFFFFFFFFDF, 0xFFFFFFFFFFFFFFFA}, - {0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFEE}, - {0x32, 0xFFFFFFFFFFFFFFDC}, - {0x7FFF, 0x7FFF} + { 0x0, 0x80 }, + { 0xFFFFFFFFFFFFFFDF, 0xFFFFFFFFFFFFFFFA }, + { 0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFEE }, + { 0x32, 0xFFFFFFFFFFFFFFDC }, + { 0x7FFF, 0x7FFF }, }, { - {0x0, 0x80}, - {0xFFFFFFFFFFFFFFDF, 0xFFFFFFFFFFFFFFFE}, - {0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFEE}, - {0x32, 0xFFFFFFFFFFFFFFE4}, - {0x7FFF, 0x7FFF}, - {0x7FFF, 0x7FFF} + { 0x0, 0x80 }, + { 0xFFFFFFFFFFFFFFDF, 0xFFFFFFFFFFFFFFFE }, + { 0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFEE }, + { 0x32, 0xFFFFFFFFFFFFFFE4 }, + { 0x7FFF, 0x7FFF }, + { 0x7FFF, 0x7FFF }, }, { - {0x0, 0x80}, - {0xFFFFFFFFFFFFFFDE, 0x4}, - {0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5}, - {0x32, 0xFFFFFFFFFFFFFFF4}, - {0x7FFF, 0x7FFF}, - {0x7FFF, 0x7FFF} + { 0x0, 0x80 }, + { 0xFFFFFFFFFFFFFFDE, 0x4 }, + { 0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5 }, + { 0x32, 0xFFFFFFFFFFFFFFF4 }, + { 0x7FFF, 0x7FFF }, + { 0x7FFF, 0x7FFF }, }, { - {0x0, 0x80}, - {0xFFFFFFFFFFFFFFDE, 0x4}, - {0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5}, - {0x32, 0xFFFFFFFFFFFFFFF4}, - {0x7FFF, 0x7FFF}, - {0x7FFF, 0x7FFF} + { 0x0, 0x80 }, + { 0xFFFFFFFFFFFFFFDE, 0x4 }, + { 0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5 }, + { 0x32, 0xFFFFFFFFFFFFFFF4 }, + { 0x7FFF, 0x7FFF }, + { 0x7FFF, 0x7FFF }, }, { - {0x0, 0x80}, - {0xFFFFFFFFFFFFFFDE, 0x4}, - {0xFFFFFFFFFFFFFFE9, 0xFFFFFFFFFFFFFFFF}, - {0x32, 0xFFFFFFFFFFFFFFFE}, - {0x7FFF, 0x7FFF}, - {0x7FFF, 0x7FFF} + { 0x0, 0x80 }, + { 0xFFFFFFFFFFFFFFDE, 0x4 }, + { 0xFFFFFFFFFFFFFFE9, 0xFFFFFFFFFFFFFFFF }, + { 0x32, 0xFFFFFFFFFFFFFFFE }, + { 0x7FFF, 0x7FFF }, + { 0x7FFF, 0x7FFF }, }, { - {0x0, 0x80}, - {0xFFFFFFFFFFFFFFDE, 0x4}, - {0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5}, - {0x32, 0xFFFFFFFFFFFFFFF4}, - {0x32, 0xFFFFFFFFFFFFFFF4}, - {0x7FFF, 0x7FFF} + { 0x0, 0x80 }, + { 0xFFFFFFFFFFFFFFDE, 0x4 }, + { 0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5 }, + { 0x32, 0xFFFFFFFFFFFFFFF4 }, + { 0x32, 0xFFFFFFFFFFFFFFF4 }, + { 0x7FFF, 0x7FFF }, }, { - {0x0, 0x80}, - {0xFFFFFFFFFFFFFFDE, 0x4}, - {0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5}, - {0x32, 0xFFFFFFFFFFFFFFF4}, - {0x32, 0xFFFFFFFFFFFFFFF4}, - {0x7FFF, 0x7FFF} - } + { 0x0, 0x80 }, + { 0xFFFFFFFFFFFFFFDE, 0x4 }, + { 0xFFFFFFFFFFFFFFE4, 0xFFFFFFFFFFFFFFF5 }, + { 0x32, 0xFFFFFFFFFFFFFFF4 }, + { 0x32, 0xFFFFFFFFFFFFFFF4 }, + { 0x7FFF, 0x7FFF }, + }, }; v4 = BattleSystem_BattleType(v0->unk_00); @@ -2601,7 +2592,7 @@ static void ov16_0225FD5C (SysTask * param0, void * param1) if ((v4 & 0x2) && ((v4 & 0x8) == 0)) { { - BattlerData * v7; + BattlerData *v7; v7 = BattleSystem_BattlerData(v0->unk_00, BattleSystem_Partner(v0->unk_00, v0->unk_09)); @@ -2612,7 +2603,7 @@ static void ov16_0225FD5C (SysTask * param0, void * param1) } } else if (v1 >= (256 + 40)) { { - SpriteGfxHandler * v8; + SpriteGfxHandler *v8; v8 = ov16_0223E018(v0->unk_00); sub_0200D0F4(v0->unk_04->unk_18); @@ -2649,7 +2640,7 @@ static void ov16_0225FD5C (SysTask * param0, void * param1) if ((v4 & 0x2) && ((v4 & 0x8) == 0)) { { - BattlerData * v9; + BattlerData *v9; v9 = BattleSystem_BattlerData(v0->unk_00, BattleSystem_Partner(v0->unk_00, v0->unk_09)); @@ -2665,7 +2656,7 @@ static void ov16_0225FD5C (SysTask * param0, void * param1) if (v1 <= -40) { { - SpriteGfxHandler * v10; + SpriteGfxHandler *v10; v10 = ov16_0223E018(v0->unk_00); @@ -2730,9 +2721,9 @@ static void ov16_0225FD5C (SysTask * param0, void * param1) } } -static void ov16_02260284 (SysTask * param0, void * param1) +static void ov16_02260284(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D3CC * v0 = (UnkStruct_ov16_0225D3CC *)param1; + UnkStruct_ov16_0225D3CC *v0 = (UnkStruct_ov16_0225D3CC *)param1; s16 v1; s16 v2; @@ -2754,9 +2745,8 @@ static void ov16_02260284 (SysTask * param0, void * param1) } } break; - case 1: - { - SpriteGfxHandler * v3; + case 1: { + SpriteGfxHandler *v3; v3 = ov16_0223E018(v0->unk_00); sub_0200D0F4(v0->unk_04->unk_18); @@ -2774,9 +2764,9 @@ static void ov16_02260284 (SysTask * param0, void * param1) } } -static void ov16_02260384 (SysTask * param0, void * param1) +static void ov16_02260384(SysTask *param0, void *param1) { - UnkStruct_ov16_02260384 * v0 = (UnkStruct_ov16_02260384 *)param1; + UnkStruct_ov16_02260384 *v0 = (UnkStruct_ov16_02260384 *)param1; s16 v1, v2; switch (v0->unk_0A) { @@ -2817,9 +2807,9 @@ enum { /** * @brief Slide the healthbar in, then wait until it is done. - * - * @param task - * @param data + * + * @param task + * @param data */ static void SlideHealthbarInTask(SysTask *task, void *data) { @@ -2858,9 +2848,9 @@ enum { /** * @brief Wait until the healthbar has slid out. - * - * @param task - * @param data + * + * @param task + * @param data */ static void SlideHealthbarOutTask(SysTask *task, void *data) { @@ -2882,15 +2872,15 @@ static void SlideHealthbarOutTask(SysTask *task, void *data) } } -static void ov16_022604C8 (SysTask * param0, void * param1) +static void ov16_022604C8(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D5B8 * v0; - BGL * v1; - UnkStruct_ov16_02268A14 * v2; - BattlerData * v3; + UnkStruct_ov16_0225D5B8 *v0; + BGL *v1; + UnkStruct_ov16_02268A14 *v2; + BattlerData *v3; u32 v4; int v5; - Healthbar * v6; + Healthbar *v6; v0 = (UnkStruct_ov16_0225D5B8 *)param1; v1 = BattleSystem_BGL(v0->unk_00); @@ -2922,9 +2912,8 @@ static void ov16_022604C8 (SysTask * param0, void * param1) } v0->unk_0A++; - case 1: - { - MessageLoader * v9; + case 1: { + MessageLoader *v9; BattleMessage v10; v9 = BattleSystem_MessageLoader(v0->unk_00); @@ -2963,8 +2952,7 @@ static void ov16_022604C8 (SysTask * param0, void * param1) BattleMessage_Print(v0->unk_00, v9, &v10, 0); v0->unk_0A = 3; } - } - break; + } break; case 2: if (Message_Printing(v0->unk_35) == 0) { v0->unk_0A = 3; @@ -2981,8 +2969,8 @@ static void ov16_022604C8 (SysTask * param0, void * param1) { UnkStruct_ov16_02269668 v11; - NARC * v12; - NARC * v13; + NARC *v12; + NARC *v13; v12 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v13 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); @@ -3042,7 +3030,7 @@ static void ov16_022604C8 (SysTask * param0, void * param1) break; case 5: if (gCoreSys.pressedKeys & PAD_BUTTON_START) { - BattlerData * v14; + BattlerData *v14; int v15; for (v15 = 0; v15 < BattleSystem_MaxBattlers(v0->unk_00); v15++) { @@ -3067,10 +3055,9 @@ static void ov16_022604C8 (SysTask * param0, void * param1) v0->unk_0A = 7; } break; - case 2: - { - NARC * v16 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); - NARC * v17 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); + case 2: { + NARC *v16 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); + NARC *v17 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); ov16_02268C04(v16, v17, v2, 0, 0, NULL); ov16_0226BCCC(v2, 0); @@ -3079,12 +3066,10 @@ static void ov16_022604C8 (SysTask * param0, void * param1) ov16_022647D8(v3); NARC_dtor(v16); NARC_dtor(v17); - } - break; - case 3: - { - NARC * v18 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); - NARC * v19 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); + } break; + case 3: { + NARC *v18 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); + NARC *v19 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); ov16_02268C04(v18, v19, v2, 0, 0, NULL); ov16_0226BCCC(v2, 0); @@ -3093,14 +3078,12 @@ static void ov16_022604C8 (SysTask * param0, void * param1) ov16_022647D8(v3); NARC_dtor(v18); NARC_dtor(v19); - } - break; - case 4: - { - NARC * v20 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); - NARC * v21 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); + } break; + case 4: { + NARC *v20 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); + NARC *v21 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); - if ((ov16_0226D088(v2) == 1)) { + if (ov16_0226D088(v2) == 1) { ov16_0226846C(v6); v0->unk_0C = 0xff; } @@ -3108,8 +3091,7 @@ static void ov16_022604C8 (SysTask * param0, void * param1) ov16_02268C04(v20, v21, v2, 0, 0, NULL); NARC_dtor(v20); NARC_dtor(v21); - } - break; + } break; default: GF_ASSERT(0); break; @@ -3121,8 +3103,8 @@ static void ov16_022604C8 (SysTask * param0, void * param1) break; case 7: if (ov16_02269348(v2) == 1) { - NARC * v22 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); - NARC * v23 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); + NARC *v22 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); + NARC *v23 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); ov16_02268C04(v22, v23, v2, 0, 0, NULL); ov16_0226BCCC(v2, 0); @@ -3148,9 +3130,9 @@ static void ov16_022604C8 (SysTask * param0, void * param1) } } -static void ov16_02260AB4 (SysTask * param0, void * param1) +static void ov16_02260AB4(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D5B8 * v0 = (UnkStruct_ov16_0225D5B8 *)param1; + UnkStruct_ov16_0225D5B8 *v0 = (UnkStruct_ov16_0225D5B8 *)param1; int v1; v1 = TrainerAI_PickCommand(v0->unk_00, v0->unk_09); @@ -3162,9 +3144,9 @@ static void ov16_02260AB4 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_02260AE4 (SysTask * param0, void * param1) +static void ov16_02260AE4(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D5B8 * v0 = (UnkStruct_ov16_0225D5B8 *)param1; + UnkStruct_ov16_0225D5B8 *v0 = (UnkStruct_ov16_0225D5B8 *)param1; ClearCommand(v0->unk_00, v0->unk_09, v0->unk_08); Heap_FreeToHeap(param1); @@ -3172,24 +3154,24 @@ static void ov16_02260AE4 (SysTask * param0, void * param1) } static const u8 Unk_ov16_0226F194[][2] = { - {0xA, 0x28}, - {0xA, 0x23}, - {0xA, 0x1E}, - {0xA, 0x19}, - {0xA, 0x14}, - {0xA, 0xF}, - {0xA, 0xA}, - {0xF, 0xA}, - {0x14, 0xA}, - {0x19, 0xA}, - {0x1E, 0xA}, - {0x23, 0xA}, - {0x28, 0xA} + { 0xA, 0x28 }, + { 0xA, 0x23 }, + { 0xA, 0x1E }, + { 0xA, 0x19 }, + { 0xA, 0x14 }, + { 0xA, 0xF }, + { 0xA, 0xA }, + { 0xF, 0xA }, + { 0x14, 0xA }, + { 0x19, 0xA }, + { 0x1E, 0xA }, + { 0x23, 0xA }, + { 0x28, 0xA } }; -static void ov16_02260B04 (SysTask * param0, void * param1) +static void ov16_02260B04(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D5B8 * v0 = (UnkStruct_ov16_0225D5B8 *)param1; + UnkStruct_ov16_0225D5B8 *v0 = (UnkStruct_ov16_0225D5B8 *)param1; int v1; u16 v2; u8 v3; @@ -3211,9 +3193,9 @@ static void ov16_02260B04 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_02260B84 (SysTask * param0, void * param1) +static void ov16_02260B84(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D5B8 * v0 = (UnkStruct_ov16_0225D5B8 *)param1; + UnkStruct_ov16_0225D5B8 *v0 = (UnkStruct_ov16_0225D5B8 *)param1; ov16_022656D4(v0->unk_00, v0->unk_09, 4); ClearCommand(v0->unk_00, v0->unk_09, v0->unk_08); @@ -3222,9 +3204,9 @@ static void ov16_02260B84 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_02260BAC (SysTask * param0, void * param1) +static void ov16_02260BAC(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D5B8 * v0 = (UnkStruct_ov16_0225D5B8 *)param1; + UnkStruct_ov16_0225D5B8 *v0 = (UnkStruct_ov16_0225D5B8 *)param1; u8 v1; if (ov16_0223F530(v0->unk_00, v0->unk_09, &v1) == 1) { @@ -3242,14 +3224,14 @@ static void ov16_02260BAC (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_02260C00 (SysTask * param0, void * param1) +static void ov16_02260C00(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D698 * v0 = (UnkStruct_ov16_0225D698 *)param1; - BGL * v1 = BattleSystem_BGL(v0->unk_00); - UnkStruct_ov16_02268A14 * v2; + UnkStruct_ov16_0225D698 *v0 = (UnkStruct_ov16_0225D698 *)param1; + BGL *v1 = BattleSystem_BGL(v0->unk_00); + UnkStruct_ov16_02268A14 *v2; int v3; - Healthbar * v4; - BattlerData * v5; + Healthbar *v4; + BattlerData *v5; v2 = ov16_0223E02C(v0->unk_00); v5 = BattleSystem_BattlerData(v0->unk_00, v0->unk_1D); @@ -3268,7 +3250,7 @@ static void ov16_02260C00 (SysTask * param0, void * param1) } { - MessageLoader * v6; + MessageLoader *v6; BattleMessage v7; v6 = BattleSystem_MessageLoader(v0->unk_00); @@ -3284,8 +3266,8 @@ static void ov16_02260C00 (SysTask * param0, void * param1) { UnkStruct_ov16_02260C00 v8; int v9; - NARC * v10 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); - NARC * v11 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); + NARC *v10 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); + NARC *v11 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); for (v9 = 0; v9 < 4; v9++) { v8.unk_00[v9] = v0->unk_0C[v9]; @@ -3337,10 +3319,10 @@ static void ov16_02260C00 (SysTask * param0, void * param1) } } -static void ov16_02260DB0 (SysTask * param0, void * param1) +static void ov16_02260DB0(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D698 * v0 = (UnkStruct_ov16_0225D698 *)param1; - BattleContext * v1; + UnkStruct_ov16_0225D698 *v0 = (UnkStruct_ov16_0225D698 *)param1; + BattleContext *v1; int v2; u32 v3; @@ -3386,18 +3368,18 @@ static void ov16_02260DB0 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_02260E78 (SysTask * param0, void * param1) +static void ov16_02260E78(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D698 * v0 = (UnkStruct_ov16_0225D698 *)param1; + UnkStruct_ov16_0225D698 *v0 = (UnkStruct_ov16_0225D698 *)param1; ClearCommand(v0->unk_00, v0->unk_1D, v0->unk_1C); Heap_FreeToHeap(param1); SysTask_Done(param0); } -static void ov16_02260E98 (SysTask * param0, void * param1) +static void ov16_02260E98(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D698 * v0 = (UnkStruct_ov16_0225D698 *)param1; + UnkStruct_ov16_0225D698 *v0 = (UnkStruct_ov16_0225D698 *)param1; u8 v1; if (ov16_0223F530(v0->unk_00, v0->unk_1D, &v1) == 1) { @@ -3425,14 +3407,14 @@ static void ov16_02260E98 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_02260F14 (SysTask * param0, void * param1) +static void ov16_02260F14(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D708 * v0 = (UnkStruct_ov16_0225D708 *)param1; - BGL * v1 = BattleSystem_BGL(v0->unk_00); - UnkStruct_ov16_02268A14 * v2; + UnkStruct_ov16_0225D708 *v0 = (UnkStruct_ov16_0225D708 *)param1; + BGL *v1 = BattleSystem_BGL(v0->unk_00); + UnkStruct_ov16_02268A14 *v2; int v3; - Healthbar * v4; - BattlerData * v5; + Healthbar *v4; + BattlerData *v5; v5 = BattleSystem_BattlerData(v0->unk_00, v0->unk_0D); v2 = ov16_0223E02C(v0->unk_00); @@ -3453,8 +3435,8 @@ static void ov16_02260F14 (SysTask * param0, void * param1) { UnkStruct_ov16_02260F14 v6; int v7; - NARC * v8 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); - NARC * v9 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); + NARC *v8 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); + NARC *v9 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); for (v7 = 0; v7 < 4; v7++) { v6.unk_00[v7] = v0->unk_10[v7]; @@ -3525,10 +3507,10 @@ static void ov16_02260F14 (SysTask * param0, void * param1) } } -static void ov16_022610A8 (SysTask * param0, void * param1) +static void ov16_022610A8(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D708 * v0 = (UnkStruct_ov16_0225D708 *)param1; - BattleContext * v1; + UnkStruct_ov16_0225D708 *v0 = (UnkStruct_ov16_0225D708 *)param1; + BattleContext *v1; int v2; v1 = BattleSystem_Context(v0->unk_00); @@ -3543,9 +3525,9 @@ static void ov16_022610A8 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_022610EC (SysTask * param0, void * param1) +static void ov16_022610EC(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D708 * v0 = (UnkStruct_ov16_0225D708 *)param1; + UnkStruct_ov16_0225D708 *v0 = (UnkStruct_ov16_0225D708 *)param1; ClearCommand(v0->unk_00, v0->unk_0D, v0->unk_0C); @@ -3553,9 +3535,9 @@ static void ov16_022610EC (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_0226110C (SysTask * param0, void * param1) +static void ov16_0226110C(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D708 * v0 = (UnkStruct_ov16_0225D708 *)param1; + UnkStruct_ov16_0225D708 *v0 = (UnkStruct_ov16_0225D708 *)param1; u8 v1; if (ov16_0223F530(v0->unk_00, v0->unk_0D, &v1) == 1) { @@ -3603,10 +3585,10 @@ static void ov16_0226110C (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_022611DC (SysTask * param0, void * param1) +static void ov16_022611DC(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D794 * v0 = (UnkStruct_ov16_0225D794 *)param1; - PaletteData * v1; + UnkStruct_ov16_0225D794 *v0 = (UnkStruct_ov16_0225D794 *)param1; + PaletteData *v1; v1 = BattleSystem_PaletteSys(v0->unk_00); @@ -3667,13 +3649,12 @@ static void ov16_022611DC (SysTask * param0, void * param1) } } break; - case 4: - { + case 4: { int v2; int v3 = 0; int v4; - Party * v5 = BattleSystem_Party(v0->unk_00, v0->unk_0D); - Pokemon * v6; + Party *v5 = BattleSystem_Party(v0->unk_00, v0->unk_0D); + Pokemon *v6; if ((BattleSystem_BattleType(v0->unk_00) & 0x2) && ((BattleSystem_BattleType(v0->unk_00) & 0x8) == 0)) { v4 = v0->unk_0D & 1; @@ -3712,8 +3693,7 @@ static void ov16_022611DC (SysTask * param0, void * param1) ov13_0221FC20(v0->unk_08->unk_04); v0->unk_0E++; - } - break; + } break; case 5: if (v0->unk_08->unk_04->unk_36) { v0->unk_10 = v0->unk_08->unk_04->unk_32; @@ -3810,8 +3790,7 @@ static void ov16_022611DC (SysTask * param0, void * param1) } } break; - case 8: - { + case 8: { BattleItemUse v7; if (v0->unk_04->unk_1C == 0) { @@ -3834,11 +3813,9 @@ static void ov16_022611DC (SysTask * param0, void * param1) Heap_FreeToHeap(v0->unk_04); Heap_FreeToHeap(param1); SysTask_Done(param0); - } - break; - case 9: - { - MessageLoader * v8; + } break; + case 9: { + MessageLoader *v8; BattleMessage v9; v9.id = 1206; @@ -3850,8 +3827,7 @@ static void ov16_022611DC (SysTask * param0, void * param1) v0->unk_11 = BattleMessage_Print(v0->unk_00, v8, &v9, BattleSystem_TextSpeed(v0->unk_00)); v0->unk_17 = 30; v0->unk_0E++; - } - break; + } break; case 10: if (Message_Printing(v0->unk_11) == 0) { if (--v0->unk_17 == 0) { @@ -3859,8 +3835,7 @@ static void ov16_022611DC (SysTask * param0, void * param1) } } break; - case 11: - { + case 11: { UnkStruct_ov16_02265BBC v10; ov16_02266B78(v0->unk_00, NULL, &v10, 1, 9, v0->unk_0D, v0->unk_0D, NULL); @@ -3869,8 +3844,7 @@ static void ov16_022611DC (SysTask * param0, void * param1) v0->unk_0E++; break; case 17: - case 25: - { + case 25: { UnkStruct_ov16_02265BBC v11; int v12; @@ -3880,8 +3854,7 @@ static void ov16_022611DC (SysTask * param0, void * param1) } v0->unk_0E++; break; - case 13: - { + case 13: { UnkStruct_ov16_02265BBC v13; if (v0->unk_04->unk_1C == 55) { @@ -3896,11 +3869,9 @@ static void ov16_022611DC (SysTask * param0, void * param1) } v0->unk_0E++; - } - break; - case 15: - { - MessageLoader * v14; + } break; + case 15: { + MessageLoader *v14; BattleMessage v15; v15.id = 1203; @@ -3943,8 +3914,7 @@ static void ov16_022611DC (SysTask * param0, void * param1) v0->unk_0E++; break; case 19: - case 27: - { + case 27: { UnkStruct_ov16_02265BBC v16; int v17; @@ -3954,10 +3924,9 @@ static void ov16_022611DC (SysTask * param0, void * param1) } v0->unk_0E++; break; - case 21: - { - Healthbar * v18; - Pokemon * v19; + case 21: { + Healthbar *v18; + Pokemon *v19; int v20; int v21; @@ -3981,9 +3950,8 @@ static void ov16_022611DC (SysTask * param0, void * param1) } v0->unk_0E++; break; - case 22: - { - Healthbar * v22; + case 22: { + Healthbar *v22; int v23; v23 = v0->unk_08->unk_04->unk_11 * 2; @@ -3993,11 +3961,9 @@ static void ov16_022611DC (SysTask * param0, void * param1) Healthbar_DrawInfo(v22, NULL, HEALTHBAR_INFO_STATUS); v0->unk_0E++; } - } - break; - case 23: - { - MessageLoader * v24; + } break; + case 23: { + MessageLoader *v24; BattleMessage v25; int v26; @@ -4019,17 +3985,15 @@ static void ov16_022611DC (SysTask * param0, void * param1) v0->unk_17 = 30; v0->unk_0E++; - } - break; - case 29: - { - Healthbar * v27; + } break; + case 29: { + Healthbar *v27; int v28; - MessageLoader * v29; + MessageLoader *v29; BattleMessage v30; int v31; int v32 = 0; - Pokemon * v33; + Pokemon *v33; int v34; v28 = v0->unk_08->unk_04->unk_11 * 2; @@ -4142,9 +4106,9 @@ static void ov16_022611DC (SysTask * param0, void * param1) } } -static void ov16_02261D50 (SysTask * param0, void * param1) +static void ov16_02261D50(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D794 * v0 = (UnkStruct_ov16_0225D794 *)param1; + UnkStruct_ov16_0225D794 *v0 = (UnkStruct_ov16_0225D794 *)param1; BattleItemUse v1; v1.item = 1; @@ -4159,9 +4123,9 @@ static void ov16_02261D50 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_02261DA8 (SysTask * param0, void * param1) +static void ov16_02261DA8(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D794 * v0 = (UnkStruct_ov16_0225D794 *)param1; + UnkStruct_ov16_0225D794 *v0 = (UnkStruct_ov16_0225D794 *)param1; ClearCommand(v0->unk_00, v0->unk_0D, v0->unk_0C); @@ -4172,9 +4136,9 @@ static void ov16_02261DA8 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_02261DE0 (SysTask * param0, void * param1) +static void ov16_02261DE0(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D794 * v0 = (UnkStruct_ov16_0225D794 *)param1; + UnkStruct_ov16_0225D794 *v0 = (UnkStruct_ov16_0225D794 *)param1; BattleItemUse v1; u8 v2; @@ -4207,10 +4171,10 @@ static void ov16_02261DE0 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_02261E8C (SysTask * param0, void * param1) +static void ov16_02261E8C(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D840 * v0 = (UnkStruct_ov16_0225D840 *)param1; - PaletteData * v1; + UnkStruct_ov16_0225D840 *v0 = (UnkStruct_ov16_0225D840 *)param1; + PaletteData *v1; v1 = BattleSystem_PaletteSys(v0->unk_00); @@ -4218,7 +4182,7 @@ static void ov16_02261E8C (SysTask * param0, void * param1) case 0: { - Window * v2 = BattleSystem_Window(v0->unk_00, 0); + Window *v2 = BattleSystem_Window(v0->unk_00, 0); BGL_FillWindow(v2, 0xff); sub_0201ACCC(v2); @@ -4237,8 +4201,8 @@ static void ov16_02261E8C (SysTask * param0, void * param1) int v4 = 0; int v5; int v6, v7; - Party * v8; - Pokemon * v9, * v10; + Party *v8; + Pokemon *v9, *v10; ov16_0223B384(v0->unk_00); @@ -4361,12 +4325,12 @@ static void ov16_02261E8C (SysTask * param0, void * param1) } } -static void ov16_02262258 (SysTask * param0, void * param1) +static void ov16_02262258(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D840 * v0 = (UnkStruct_ov16_0225D840 *)param1; + UnkStruct_ov16_0225D840 *v0 = (UnkStruct_ov16_0225D840 *)param1; int v1; - Party * v2; - Pokemon * v3; + Party *v2; + Pokemon *v3; int v4, v5; u32 v6; @@ -4404,9 +4368,9 @@ static void ov16_02262258 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_0226230C (SysTask * param0, void * param1) +static void ov16_0226230C(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D840 * v0 = (UnkStruct_ov16_0225D840 *)param1; + UnkStruct_ov16_0225D840 *v0 = (UnkStruct_ov16_0225D840 *)param1; ClearCommand(v0->unk_00, v0->unk_09, v0->unk_08); @@ -4414,9 +4378,9 @@ static void ov16_0226230C (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_0226232C (SysTask * param0, void * param1) +static void ov16_0226232C(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D840 * v0 = (UnkStruct_ov16_0225D840 *)param1; + UnkStruct_ov16_0225D840 *v0 = (UnkStruct_ov16_0225D840 *)param1; u8 v1; if (ov16_0223F530(v0->unk_00, v0->unk_09, &v1) == 1) { @@ -4427,8 +4391,8 @@ static void ov16_0226232C (SysTask * param0, void * param1) ov16_02264730(v0->unk_00); } else { { - Party * v2; - Pokemon * v3; + Party *v2; + Pokemon *v3; int v4 = v1 - 1; v2 = BattleSystem_Party(v0->unk_00, v0->unk_09); @@ -4458,14 +4422,14 @@ static void ov16_0226232C (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_022623F0 (SysTask * param0, void * param1) +static void ov16_022623F0(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D8AC * v0 = param1; - BGL * v1 = BattleSystem_BGL(v0->unk_00); - UnkStruct_ov16_02268A14 * v2 = ov16_0223E02C(v0->unk_00); + UnkStruct_ov16_0225D8AC *v0 = param1; + BGL *v1 = BattleSystem_BGL(v0->unk_00); + UnkStruct_ov16_02268A14 *v2 = ov16_0223E02C(v0->unk_00); int v3; - Healthbar * v4; - BattlerData * v5; + Healthbar *v4; + BattlerData *v5; v5 = BattleSystem_BattlerData(v0->unk_00, v0->unk_0D); v3 = BattleSystem_Partner(v0->unk_00, v0->unk_0D); @@ -4484,8 +4448,8 @@ static void ov16_022623F0 (SysTask * param0, void * param1) if (v0->unk_10) { { - Window * v6; - MessageLoader * v7; + Window *v6; + MessageLoader *v7; BattleMessage v8; v7 = BattleSystem_MessageLoader(v0->unk_00); @@ -4507,8 +4471,8 @@ static void ov16_022623F0 (SysTask * param0, void * param1) case 1: if ((Message_Printing(v0->unk_1A) == 0) || (v0->unk_10 == NULL)) { { - NARC * v9 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); - NARC * v10 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); + NARC *v9 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); + NARC *v10 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); UnkStruct_ov16_022623F0 v11; ov16_02269218(v2); @@ -4555,8 +4519,8 @@ static void ov16_022623F0 (SysTask * param0, void * param1) case 3: if (ov16_02269348(v2) == 1) { { - NARC * v12 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); - NARC * v13 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); + NARC *v12 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); + NARC *v13 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); ov16_022675AC(v0->unk_04); ov16_022647D8(v5); @@ -4586,9 +4550,9 @@ static void ov16_022623F0 (SysTask * param0, void * param1) } } -static void ov16_0226262C (SysTask * param0, void * param1) +static void ov16_0226262C(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D8AC * v0 = (UnkStruct_ov16_0225D8AC *)param1; + UnkStruct_ov16_0225D8AC *v0 = (UnkStruct_ov16_0225D8AC *)param1; ClearCommand(v0->unk_00, v0->unk_0D, v0->unk_0C); @@ -4596,9 +4560,9 @@ static void ov16_0226262C (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_0226264C (SysTask * param0, void * param1) +static void ov16_0226264C(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D8AC * v0 = (UnkStruct_ov16_0225D8AC *)param1; + UnkStruct_ov16_0225D8AC *v0 = (UnkStruct_ov16_0225D8AC *)param1; ClearCommand(v0->unk_00, v0->unk_0D, v0->unk_0C); @@ -4606,9 +4570,9 @@ static void ov16_0226264C (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_0226266C (SysTask * param0, void * param1) +static void ov16_0226266C(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D8AC * v0 = (UnkStruct_ov16_0225D8AC *)param1; + UnkStruct_ov16_0225D8AC *v0 = (UnkStruct_ov16_0225D8AC *)param1; u8 v1; if (ov16_0223F530(v0->unk_00, v0->unk_0D, &v1) == 1) { @@ -4626,9 +4590,9 @@ static void ov16_0226266C (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_022626C0 (SysTask * param0, void * param1) +static void ov16_022626C0(SysTask *param0, void *param1) { - UnkStruct_ov16_0225D9A8 * v0 = (UnkStruct_ov16_0225D9A8 *)param1; + UnkStruct_ov16_0225D9A8 *v0 = (UnkStruct_ov16_0225D9A8 *)param1; switch (v0->unk_6A) { case 0: @@ -4644,8 +4608,7 @@ static void ov16_022626C0 (SysTask * param0, void * param1) v0->unk_6A = 4; } break; - case 2: - { + case 2: { UnkStruct_ov12_022380DC v2; UnkStruct_ov16_02265BBC v3; @@ -4695,8 +4658,7 @@ static void ov16_022626C0 (SysTask * param0, void * param1) v0->unk_6A = 10; } break; - case 8: - { + case 8: { UnkStruct_ov12_022380DC v5; UnkStruct_ov16_02265BBC v6; @@ -4729,9 +4691,9 @@ static void ov16_022626C0 (SysTask * param0, void * param1) } } -static void ov16_0226292C (SysTask * param0, void * param1) +static void ov16_0226292C(SysTask *param0, void *param1) { - UnkStruct_ov16_0225DA44 * v0 = (UnkStruct_ov16_0225DA44 *)param1; + UnkStruct_ov16_0225DA44 *v0 = (UnkStruct_ov16_0225DA44 *)param1; int v1; if (v0->unk_09 < 6) { @@ -4753,9 +4715,9 @@ static void ov16_0226292C (SysTask * param0, void * param1) } } -static void ov16_02262988 (SysTask * param0, void * param1) +static void ov16_02262988(SysTask *param0, void *param1) { - Healthbar * v0 = param1; + Healthbar *v0 = param1; int v1; switch (v0->state) { @@ -4777,9 +4739,9 @@ static void ov16_02262988 (SysTask * param0, void * param1) } } -static void ov16_022629DC (SysTask * param0, void * param1) +static void ov16_022629DC(SysTask *param0, void *param1) { - Healthbar * v0 = param1; + Healthbar *v0 = param1; int v1; switch (v0->state) { @@ -4820,10 +4782,10 @@ static void ov16_022629DC (SysTask * param0, void * param1) } } -static void ov16_02262A9C (SysTask * param0, void * param1) +static void ov16_02262A9C(SysTask *param0, void *param1) { - UnkStruct_ov16_0225DB74 * v0 = (UnkStruct_ov16_0225DB74 *)param1; - UnkStruct_ov12_0221FCDC * v1 = ov16_0223E008(v0->unk_00); + UnkStruct_ov16_0225DB74 *v0 = (UnkStruct_ov16_0225DB74 *)param1; + UnkStruct_ov12_0221FCDC *v1 = ov16_0223E008(v0->unk_00); int v2; int v3; @@ -4841,8 +4803,7 @@ static void ov16_02262A9C (SysTask * param0, void * param1) v0->unk_66 = 4; } break; - case 2: - { + case 2: { UnkStruct_ov12_022380DC v5; UnkStruct_ov16_02265BBC v6; @@ -4864,8 +4825,7 @@ static void ov16_02262A9C (SysTask * param0, void * param1) v0->unk_66++; } break; - case 4: - { + case 4: { int v7; if (v0->unk_67 == 2) { @@ -4942,11 +4902,11 @@ static void ov16_02262A9C (SysTask * param0, void * param1) } } -static void ov16_02262D28 (SysTask * param0, void * param1) +static void ov16_02262D28(SysTask *param0, void *param1) { - UnkStruct_ov16_0225DC7C * v0 = (UnkStruct_ov16_0225DC7C *)param1; - PaletteData * v1; - UnkStruct_02007768 * v2; + UnkStruct_ov16_0225DC7C *v0 = (UnkStruct_ov16_0225DC7C *)param1; + PaletteData *v1; + UnkStruct_02007768 *v2; v1 = BattleSystem_PaletteSys(v0->unk_00); v2 = ov16_0223E000(v0->unk_00); @@ -4971,10 +4931,10 @@ static void ov16_02262D28 (SysTask * param0, void * param1) } } -static void ov16_02262DC4 (SysTask * param0, void * param1) +static void ov16_02262DC4(SysTask *param0, void *param1) { - UnkStruct_ov16_0225DCB0 * v0; - UnkStruct_ov12_0221FCDC * v1; + UnkStruct_ov16_0225DCB0 *v0; + UnkStruct_ov12_0221FCDC *v1; v0 = (UnkStruct_ov16_0225DCB0 *)param1; v1 = ov16_0223E008(v0->unk_00); @@ -5006,8 +4966,7 @@ static void ov16_02262DC4 (SysTask * param0, void * param1) v0->unk_62 = 0xff; } break; - case 3: - { + case 3: { UnkStruct_ov12_022380DC v3; UnkStruct_ov16_02265BBC v4; @@ -5037,9 +4996,9 @@ static void ov16_02262DC4 (SysTask * param0, void * param1) } } -static void ov16_02262F30 (SysTask * param0, void * param1) +static void ov16_02262F30(SysTask *param0, void *param1) { - UnkStruct_ov16_0225DF34 * v0 = (UnkStruct_ov16_0225DF34 *)param1; + UnkStruct_ov16_0225DF34 *v0 = (UnkStruct_ov16_0225DF34 *)param1; switch (v0->unk_0A) { case 0: @@ -5073,9 +5032,9 @@ static void WaitForBattleMessagePrint(SysTask *task, void *data) } } -static void ov16_02262FC0 (SysTask * param0, void * param1) +static void ov16_02262FC0(SysTask *param0, void *param1) { - UnkStruct_ov16_0225DF6C * v0 = (UnkStruct_ov16_0225DF6C *)param1; + UnkStruct_ov16_0225DF6C *v0 = (UnkStruct_ov16_0225DF6C *)param1; switch (v0->unk_07) { case 0: @@ -5148,11 +5107,11 @@ static const int Unk_ov16_0226F1D0[] = { 0x7FFF }; -static void ov16_02263014 (SysTask * param0, void * param1) +static void ov16_02263014(SysTask *param0, void *param1) { - UnkStruct_ov16_0225CBB8 * v0 = (UnkStruct_ov16_0225CBB8 *)param1; - BGL * v1; - PaletteData * v2; + UnkStruct_ov16_0225CBB8 *v0 = (UnkStruct_ov16_0225CBB8 *)param1; + BGL *v1; + PaletteData *v2; int v3; int v4; @@ -5164,8 +5123,7 @@ static void ov16_02263014 (SysTask * param0, void * param1) v0->unk_15++; switch (v0->unk_14) { - case 0: - { + case 0: { UnkStruct_ov12_02237F38 v5; v0->unk_04 = ov12_02237EFC(5, NULL); @@ -5195,7 +5153,7 @@ static void ov16_02263014 (SysTask * param0, void * param1) if ((v0->unk_15 >= 10) && (v0->unk_16 < 16)) { u16 v6, v7; - u16 * v8; + u16 *v8; v0->unk_16++; @@ -5278,10 +5236,10 @@ static void ov16_02263014 (SysTask * param0, void * param1) } } -static void ov16_022633A4 (SysTask * param0, void * param1) +static void ov16_022633A4(SysTask *param0, void *param1) { - UnkStruct_ov16_0225E0BC * v0 = (UnkStruct_ov16_0225E0BC *)param1; - PaletteData * v1; + UnkStruct_ov16_0225E0BC *v0 = (UnkStruct_ov16_0225E0BC *)param1; + PaletteData *v1; v1 = BattleSystem_PaletteSys(v0->unk_00); @@ -5336,9 +5294,9 @@ static void ov16_022633A4 (SysTask * param0, void * param1) } } -static void ov16_022634DC (SysTask * param0, void * param1) +static void ov16_022634DC(SysTask *param0, void *param1) { - UnkStruct_ov16_0225E0F4 * v0 = (UnkStruct_ov16_0225E0F4 *)param1; + UnkStruct_ov16_0225E0F4 *v0 = (UnkStruct_ov16_0225E0F4 *)param1; int v1; switch (v0->unk_0A) { @@ -5370,9 +5328,9 @@ static void ov16_022634DC (SysTask * param0, void * param1) } } -static void ShowPartyGaugeTask (SysTask * param0, void * param1) +static void ShowPartyGaugeTask(SysTask *param0, void *param1) { - PartyGaugeTask * v0 = (PartyGaugeTask *)param1; + PartyGaugeTask *v0 = (PartyGaugeTask *)param1; enum PartyGaugeSide v1; enum ShowPartyGaugeType v2; @@ -5383,9 +5341,8 @@ static void ShowPartyGaugeTask (SysTask * param0, void * param1) } switch (v0->state) { - case 0: - { - PartyGauge * v3; + case 0: { + PartyGauge *v3; enum ShowPartyGaugeType v4; enum PartyGaugePosition v5; @@ -5426,11 +5383,11 @@ static void ShowPartyGaugeTask (SysTask * param0, void * param1) } } -static void HidePartyGaugeTask (SysTask * param0, void * param1) +static void HidePartyGaugeTask(SysTask *param0, void *param1) { - PartyGaugeTask * v0 = (PartyGaugeTask *)param1; + PartyGaugeTask *v0 = (PartyGaugeTask *)param1; enum PartyGaugeSide v1; - PartyGauge * v2; + PartyGauge *v2; enum HideArrowType v3; enum HidePartyGaugeType v4; @@ -5470,9 +5427,9 @@ static void HidePartyGaugeTask (SysTask * param0, void * param1) } } -static void ov16_02263688 (SysTask * param0, void * param1) +static void ov16_02263688(SysTask *param0, void *param1) { - UnkStruct_ov16_0225E2C8 * v0 = (UnkStruct_ov16_0225E2C8 *)param1; + UnkStruct_ov16_0225E2C8 *v0 = (UnkStruct_ov16_0225E2C8 *)param1; switch (v0->unk_0E) { case 0: @@ -5488,9 +5445,9 @@ static void ov16_02263688 (SysTask * param0, void * param1) } } -static void ov16_022636D4 (SysTask * param0, void * param1) +static void ov16_022636D4(SysTask *param0, void *param1) { - UnkStruct_ov16_0225E300 * v0 = (UnkStruct_ov16_0225E300 *)param1; + UnkStruct_ov16_0225E300 *v0 = (UnkStruct_ov16_0225E300 *)param1; GF_ASSERT(v0->unk_04->unk_88 != NULL); @@ -5509,7 +5466,7 @@ static void ov16_022636D4 (SysTask * param0, void * param1) SysTask_Done(param0); } -void ov16_02263730 (BattleSystem * param0, BattlerData * param1) +void ov16_02263730(BattleSystem *param0, BattlerData *param1) { u32 v0 = BattleSystem_BattleType(param0); u32 v1 = BattleSystem_BattleStatus(param0); @@ -5705,17 +5662,17 @@ void ov16_02263730 (BattleSystem * param0, BattlerData * param1) } } -u8 Battler_Type (BattlerData * param0) +u8 Battler_Type(BattlerData *param0) { return param0->battlerType; } -u8 Battler_BootState (BattlerData *battler) +u8 Battler_BootState(BattlerData *battler) { return battler->bootState; } -Sprite * ov16_02263AFC (BattlerData * param0) +Sprite *ov16_02263AFC(BattlerData *param0) { if (param0->unk_20) { return param0->unk_20; @@ -5724,22 +5681,22 @@ Sprite * ov16_02263AFC (BattlerData * param0) } } -Healthbar * ov16_02263B08 (BattlerData * param0) +Healthbar *ov16_02263B08(BattlerData *param0) { return ¶m0->healthbar; } -UnkStruct_ov16_0226C378 * ov16_02263B0C (BattlerData * param0) +UnkStruct_ov16_0226C378 *ov16_02263B0C(BattlerData *param0) { return ¶m0->unk_7B; } -void ov16_02263B10 (BattlerData * param0) +void ov16_02263B10(BattlerData *param0) { MI_CpuClear8(¶m0->unk_7B, sizeof(UnkStruct_ov16_0226C378)); } -void ov16_02263B20 (BattlerData * param0, int param1) +void ov16_02263B20(BattlerData *param0, int param1) { if (param0->unk_18 == NULL) { return; @@ -5748,10 +5705,10 @@ void ov16_02263B20 (BattlerData * param0, int param1) SpriteActor_EnableObject(param0->unk_18, param1); } -static Sprite * ov16_02263B30 (BattleSystem * param0, UnkStruct_02007768 * param1, ArchivedSprite * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame * param11, UnkFuncPtr_02007C34 * param12) +static Sprite *ov16_02263B30(BattleSystem *param0, UnkStruct_02007768 *param1, ArchivedSprite *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame *param11, UnkFuncPtr_02007C34 *param12) { - Sprite * v0; - u8 * v1 = ov16_0223F2B8(ov16_0223E0C8(param0), param10); + Sprite *v0; + u8 *v1 = ov16_0223F2B8(ov16_0223E0C8(param0), param10); int v2; int v3; @@ -5786,7 +5743,7 @@ static Sprite * ov16_02263B30 (BattleSystem * param0, UnkStruct_02007768 * param return v0; } -static void ov16_02263C1C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3F8 * param2, BattleMessage * param3) +static void ov16_02263C1C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3F8 *param2, BattleMessage *param3) { if (param1->battlerType & 0x1) { if (BattleSystem_BattleType(param0) & 0x4) { @@ -5823,7 +5780,7 @@ static void ov16_02263C1C (BattleSystem * param0, BattlerData * param1, UnkStruc } } -static void ov16_02263CF0 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C40C * param2, BattleMessage * param3) +static void ov16_02263CF0(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C40C *param2, BattleMessage *param3) { if (param1->battlerType & 0x1) { if ((BattleSystem_BattleType(param0) & 0x4) == 0) { @@ -5860,7 +5817,7 @@ static void ov16_02263CF0 (BattleSystem * param0, BattlerData * param1, UnkStruc } } -static void ov16_02263DD0 (BattleSystem * param0, BattlerData * param1, BattleMessage * param2) +static void ov16_02263DD0(BattleSystem *param0, BattlerData *param1, BattleMessage *param2) { u32 v0; int v1; @@ -5911,7 +5868,7 @@ static void ov16_02263DD0 (BattleSystem * param0, BattlerData * param1, BattleMe } } -static void ov16_02263E7C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C430 * param2, BattleMessage * param3) +static void ov16_02263E7C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C430 *param2, BattleMessage *param3) { u32 v0; int v1; @@ -6058,7 +6015,7 @@ static void ov16_02263E7C (BattleSystem * param0, BattlerData * param1, UnkStruc } } -static void ov16_022641B4 (BattleSystem * param0, BattlerData * param1, BattleMessage * param2) +static void ov16_022641B4(BattleSystem *param0, BattlerData *param1, BattleMessage *param2) { u32 v0; int v1; @@ -6116,7 +6073,7 @@ static void ov16_022641B4 (BattleSystem * param0, BattlerData * param1, BattleMe } } -static void ov16_02264270 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C9F0 * param2, BattleMessage * param3) +static void ov16_02264270(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C9F0 *param2, BattleMessage *param3) { int v0; int v1 = 0; @@ -6160,7 +6117,7 @@ static void ov16_02264270 (BattleSystem * param0, BattlerData * param1, UnkStruc } } -static void ov16_02264360 (BattleSystem * param0, BattlerData * param1, BattleMessage * param2) +static void ov16_02264360(BattleSystem *param0, BattlerData *param1, BattleMessage *param2) { param2->id = 956; param2->tags = 8; @@ -6178,12 +6135,12 @@ static void ov16_02264360 (BattleSystem * param0, BattlerData * param1, BattleMe BattleSystem_SetResultFlag(param0, 0x2 | 0x80 | 0x40); } -static CellActorData * ov16_022643B8 (BattleSystem * param0, int param1, int param2, int param3, s16 param4, s16 param5) +static CellActorData *ov16_022643B8(BattleSystem *param0, int param1, int param2, int param3, s16 param4, s16 param5) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - PaletteData * v2; - CellActorData * v3; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + PaletteData *v2; + CellActorData *v3; int v4; v0 = ov16_0223E010(param0); @@ -6201,7 +6158,7 @@ static CellActorData * ov16_022643B8 (BattleSystem * param0, int param1, int par return v3; } -static void ov16_02264408 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov12_0221FCDC * param2, UnkStruct_ov16_02265BBC * param3) +static void ov16_02264408(BattleSystem *param0, BattlerData *param1, UnkStruct_ov12_0221FCDC *param2, UnkStruct_ov16_02265BBC *param3) { UnkStruct_ov16_02264408 v0; int v1; @@ -6246,7 +6203,7 @@ static void ov16_02264408 (BattleSystem * param0, BattlerData * param1, UnkStruc ov12_0221FE30(param2, param3, v2, &v0); } -static void ov16_02264530 (BattleSystem * param0, UnkStruct_ov16_02265BBC * param1, UnkStruct_ov12_022380DC * param2, int param3) +static void ov16_02264530(BattleSystem *param0, UnkStruct_ov16_02265BBC *param1, UnkStruct_ov12_022380DC *param2, int param3) { int v0; @@ -6266,7 +6223,7 @@ static void ov16_02264530 (BattleSystem * param0, UnkStruct_ov16_02265BBC * para ov16_0223F8AC(param0, &(param2->unk_18[0])); } -static void ov16_022645B8 (u8 * param0, u8 * param1, int param2, int param3, u16 param4) +static void ov16_022645B8(u8 *param0, u8 *param1, int param2, int param3, u16 param4) { if (param2 == 0) { if ((MoveTable_LoadParam(param4, MOVEATTRIBUTE_FLAGS) & 0x40) == 0) { @@ -6309,9 +6266,9 @@ static void ov16_022645B8 (u8 * param0, u8 * param1, int param2, int param3, u16 } } -static BOOL ov16_02264650 (UnkStruct_ov16_02264650_1 * param0, CellActorData * param1) +static BOOL ov16_02264650(UnkStruct_ov16_02264650_1 *param0, CellActorData *param1) { - UnkStruct_ov16_02264650 * v0; + UnkStruct_ov16_02264650 *v0; int v1; BOOL v2 = 0; @@ -6345,9 +6302,9 @@ static BOOL ov16_02264650 (UnkStruct_ov16_02264650_1 * param0, CellActorData * p return v2; } -static void ov16_022646C8 (SysTask * param0, void * param1) +static void ov16_022646C8(SysTask *param0, void *param1) { - UnkStruct_ov16_02264650 * v0 = (UnkStruct_ov16_02264650 *)param1; + UnkStruct_ov16_02264650 *v0 = (UnkStruct_ov16_02264650 *)param1; switch (v0->unk_00) { case 0: @@ -6369,19 +6326,19 @@ static void ov16_022646C8 (SysTask * param0, void * param1) } } -static void ov16_02264730 (BattleSystem * param0) +static void ov16_02264730(BattleSystem *param0) { BattleSystem_SetStopRecording(param0, 1); Battle_RecordingStopped(param0, BattleSystem_Context(param0)); } -static void ov16_0226474C (BattleSystem * param0) +static void ov16_0226474C(BattleSystem *param0) { BattleSystem_SetStopRecording(param0, 2); Battle_RecordingStopped(param0, BattleSystem_Context(param0)); } -static u8 ov16_02264768 (BattleSystem * param0, u8 param1, u8 param2) +static u8 ov16_02264768(BattleSystem *param0, u8 param1, u8 param2) { if (BattleSystem_BattleType(param0) & 0x4) { if ((TrainerInfo_GameCode(BattleSystem_TrainerInfo(param0, param1)) == 0) && (param2 <= 1)) { diff --git a/src/battle/battle_io.c b/src/battle/battle_io.c index 9630777620..3c6f3c6f0f 100644 --- a/src/battle/battle_io.c +++ b/src/battle/battle_io.c @@ -1,21 +1,23 @@ +#include "constants/battle/battle_io.h" + #include #include -#include "consts/gender.h" - #include "constants/pokemon.h" #include "constants/species.h" -#include "constants/battle/battle_io.h" +#include "consts/gender.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/battle_system.h" -#include "battle/battle_context.h" - -#include "pokemon.h" -#include "constants/species.h" -#include "struct_defs/struct_0207A81C.h" +#include "struct_decls/struct_party_decl.h" +#include "struct_defs/battle_io.h" #include "struct_defs/battle_system.h" +#include "struct_defs/struct_0207A81C.h" + #include "battle/battle_context.h" +#include "battle/battle_io.h" +#include "battle/battle_lib.h" +#include "battle/battle_message.h" +#include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_0224DDA8.h" #include "battle/struct_ov16_0225BFFC_t.h" #include "battle/struct_ov16_0225C168.h" @@ -26,7 +28,6 @@ #include "battle/struct_ov16_0225C2C4.h" #include "battle/struct_ov16_0225C2D8.h" #include "battle/struct_ov16_0225C2EC.h" -#include "battle/battle_message.h" #include "battle/struct_ov16_0225C35C.h" #include "battle/struct_ov16_0225C370.h" #include "battle/struct_ov16_0225C384.h" @@ -41,7 +42,6 @@ #include "battle/struct_ov16_0225C468.h" #include "battle/struct_ov16_0225C65C.h" #include "battle/struct_ov16_0225C684.h" -#include "struct_defs/battle_io.h" #include "battle/struct_ov16_0225C988.h" #include "battle/struct_ov16_0225C9F0.h" #include "battle/struct_ov16_0225CA14.h" @@ -62,29 +62,26 @@ #include "battle/struct_ov16_02266A38.h" #include "battle/struct_ov16_02266ABC.h" -#include "unk_0202F1D4.h" #include "communication_system.h" -#include "pokemon.h" +#include "flags.h" #include "move_table.h" #include "party.h" -#include "flags.h" +#include "pokemon.h" +#include "unk_0202F1D4.h" #include "unk_0207A6DC.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_lib.h" -#include "battle/battle_io.h" -static void ov16_0226485C(BattleSystem * param0, int param1, int param2, void * param3, u8 param4); +static void ov16_0226485C(BattleSystem *param0, int param1, int param2, void *param3, u8 param4); static void SendMessage(BattleSystem *battleSys, int recipient, int message, void *body, u8 bodySize); static void PartyGaugeData_New(BattleSystem *battleSys, BattleContext *battleCtx, PartyGaugeData *partyGauge, int command, int battler); -static void ov16_0226485C (BattleSystem * param0, int param1, int param2, void * param3, u8 param4) +static void ov16_0226485C(BattleSystem *param0, int param1, int param2, void *param3, u8 param4) { int v0; UnkStruct_0207A81C v1; - u8 * v2; - u8 * v3; - u16 * v4; - u16 * v5; + u8 *v2; + u8 *v3; + u16 *v4; + u16 *v5; if (param1 == 1) { v3 = ov16_0223E074(param0); @@ -120,9 +117,9 @@ static void ov16_0226485C (BattleSystem * param0, int param1, int param2, void * } } -static BOOL ov16_022648F4 (BattleSystem * param0, void * param1) +static BOOL ov16_022648F4(BattleSystem *param0, void *param1) { - u8 * v0 = (u8 *)param1; + u8 *v0 = (u8 *)param1; u8 v1; u8 v2; int v3; @@ -171,12 +168,12 @@ static BOOL ov16_022648F4 (BattleSystem * param0, void * param1) return v5; } -void ov16_02264988 (BattleSystem * param0, int param1) +void ov16_02264988(BattleSystem *param0, int param1) { - u8 * v0; - u16 * v1; - u16 * v2; - u16 * v3; + u8 *v0; + u16 *v1; + u16 *v2; + u16 *v3; int v4; if (param1 == 1) { @@ -227,7 +224,7 @@ static void SendMessage(BattleSystem *battleSys, int recipient, int message, voi } } -void BattleIO_SetupBattleUI (BattleSystem * param0, int param1) +void BattleIO_SetupBattleUI(BattleSystem *param0, int param1) { UnkStruct_ov16_02264A8C v0; @@ -237,7 +234,7 @@ void BattleIO_SetupBattleUI (BattleSystem * param0, int param1) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_02264A8C)); } -void BattleIO_SetEncounter (BattleSystem * param0, int param1) +void BattleIO_SetEncounter(BattleSystem *param0, int param1) { UnkStruct_ov16_0225C168 v0; int v1; @@ -260,7 +257,7 @@ void BattleIO_SetEncounter (BattleSystem * param0, int param1) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_0225C168)); } -void BattleIO_ShowEncounter (BattleSystem * param0, int param1) +void BattleIO_ShowEncounter(BattleSystem *param0, int param1) { UnkStruct_ov16_0225C17C v0; int v1; @@ -288,7 +285,7 @@ void BattleIO_ShowEncounter (BattleSystem * param0, int param1) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_0225C17C)); } -void BattleIO_ShowPokemon (BattleSystem * param0, int param1, int param2, int param3) +void BattleIO_ShowPokemon(BattleSystem *param0, int param1, int param2, int param3) { UnkStruct_ov16_0225C17C v0; int v1; @@ -345,7 +342,7 @@ void BattleIO_ShowPokemon (BattleSystem * param0, int param1, int param2, int pa SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_0225C17C)); } -void BattleIO_ReturnPokemon (BattleSystem * param0, BattleContext * param1, int param2) +void BattleIO_ReturnPokemon(BattleSystem *param0, BattleContext *param1, int param2) { UnkStruct_ov16_02264EF8 v0; int v1; @@ -387,7 +384,7 @@ void BattleIO_ReturnPokemon (BattleSystem * param0, BattleContext * param1, int SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_02264EF8)); } -void ov16_02265050 (BattleSystem * param0, int param1, int param2) +void ov16_02265050(BattleSystem *param0, int param1, int param2) { UnkStruct_ov16_02265050 v0; int v1; @@ -412,13 +409,13 @@ void ov16_02265050 (BattleSystem * param0, int param1, int param2) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_02265050)); } -void BattleIO_DeletePokemon (BattleSystem * param0, int param1) +void BattleIO_DeletePokemon(BattleSystem *param0, int param1) { int v0 = 7; SendMessage(param0, 1, param1, &v0, 4); } -void BattleIO_SetTrainerEncounter (BattleSystem * param0, int param1) +void BattleIO_SetTrainerEncounter(BattleSystem *param0, int param1) { UnkStruct_ov16_02265124 v0; @@ -429,7 +426,7 @@ void BattleIO_SetTrainerEncounter (BattleSystem * param0, int param1) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_02265124)); } -void BattleIO_ThrowTrainerBall (BattleSystem * param0, int param1, int param2) +void BattleIO_ThrowTrainerBall(BattleSystem *param0, int param1, int param2) { UnkStruct_ov16_02265154 v0; @@ -440,14 +437,14 @@ void BattleIO_ThrowTrainerBall (BattleSystem * param0, int param1, int param2) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_02265154)); } -void BattleIO_SlideTrainerOut (BattleSystem * param0, int param1) +void BattleIO_SlideTrainerOut(BattleSystem *param0, int param1) { int v0 = 10; SendMessage(param0, 1, param1, &v0, 4); } -void BattleIO_SlideTrainerIn (BattleSystem * param0, int param1, int param2) +void BattleIO_SlideTrainerIn(BattleSystem *param0, int param1, int param2) { UnkStruct_ov16_022651A8 v0; @@ -475,7 +472,7 @@ void BattleIO_SlideHealthbarIn(BattleSystem *battleSys, BattleContext *battleCtx healthbar.status = Battler_StatusCondition(battleCtx, battler); if ((battleCtx->battleMons[battler].species == SPECIES_NIDORAN_F || battleCtx->battleMons[battler].species == SPECIES_NIDORAN_M) - && battleCtx->battleMons[battler].hasNickname == FALSE) { + && battleCtx->battleMons[battler].hasNickname == FALSE) { healthbar.gender = GENDER_NONE; // don't show the Gender marker for base-Nidoran forms } else { healthbar.gender = battleCtx->battleMons[battler].gender; @@ -496,7 +493,7 @@ void BattleIO_SlideHealthbarOut(BattleSystem *battleSys, int battler) SendMessage(battleSys, BTLIO_RECIPIENT_ENQUEUE, battler, &command, sizeof(int)); } -void BattleIO_SetCommandSelection (BattleSystem *battleSys, BattleContext *battleCtx, int battler, int partySlot) +void BattleIO_SetCommandSelection(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int partySlot) { UnkStruct_ov16_0225C260 v0; int v1; @@ -504,8 +501,8 @@ void BattleIO_SetCommandSelection (BattleSystem *battleSys, BattleContext *battl int v3, v4; int v5; int v6; - Party * v7; - Pokemon * v8; + Party *v7; + Pokemon *v8; u32 v9; int v10; @@ -560,7 +557,7 @@ void BattleIO_SetCommandSelection (BattleSystem *battleSys, BattleContext *battl } } - if (((v9 & (0x4 | 0x8)) == (0x4 | 0x8)) || ((v9 & 0x10)) || ((v9 == ((0x2 | 0x1) | 0x8 | 0x40))) || ((v9 == (((0x2 | 0x1) | 0x8 | 0x40) | 0x80)))) { + if (((v9 & (0x4 | 0x8)) == (0x4 | 0x8)) || (v9 & 0x10) || (v9 == ((0x2 | 0x1) | 0x8 | 0x40)) || (v9 == (((0x2 | 0x1) | 0x8 | 0x40) | 0x80))) { if (Battler_Side(battleSys, battler)) { v2 = BattleSystem_BattlerOfType(battleSys, 2); } else { @@ -663,12 +660,12 @@ void BattleIO_SetCommandSelection (BattleSystem *battleSys, BattleContext *battl SendMessage(battleSys, 1, battler, &v0, sizeof(UnkStruct_ov16_0225C260)); } -void ov16_022656D4 (BattleSystem * param0, int param1, int param2) +void ov16_022656D4(BattleSystem *param0, int param1, int param2) { SendMessage(param0, 0, param1, ¶m2, 4); } -void BattleIO_ShowMoveSelectScreen (BattleSystem *battleSys, BattleContext *battleCtx, int battler) +void BattleIO_ShowMoveSelectScreen(BattleSystem *battleSys, BattleContext *battleCtx, int battler) { BattleIO_ClearBuffer(BattleSystem_Context(battleSys), battler); @@ -687,12 +684,12 @@ void BattleIO_ShowMoveSelectScreen (BattleSystem *battleSys, BattleContext *batt SendMessage(battleSys, 1, battler, &v0, sizeof(UnkStruct_ov16_022656F0)); } -void ov16_02265790 (BattleSystem * param0, int param1, int param2) +void ov16_02265790(BattleSystem *param0, int param1, int param2) { SendMessage(param0, 0, param1, ¶m2, 4); } -void BattleIO_ShowTargetSelection (BattleSystem *battleSys, BattleContext *battleCtx, int range, int battler) +void BattleIO_ShowTargetSelection(BattleSystem *battleSys, BattleContext *battleCtx, int range, int battler) { UnkStruct_ov16_0225C29C v0; int v1; @@ -739,12 +736,12 @@ void BattleIO_ShowTargetSelection (BattleSystem *battleSys, BattleContext *battl SendMessage(battleSys, 1, battler, &v0, sizeof(UnkStruct_ov16_0225C29C)); } -void ov16_022658CC (BattleSystem * param0, int param1, int param2) +void ov16_022658CC(BattleSystem *param0, int param1, int param2) { SendMessage(param0, 0, param1, ¶m2, 4); } -void BattleIO_ShowBagScreen (BattleSystem *battleSys, BattleContext *battleCtx, int battler) +void BattleIO_ShowBagScreen(BattleSystem *battleSys, BattleContext *battleCtx, int battler) { UnkStruct_ov16_0225C2B0 v0; int v1, v2; @@ -817,12 +814,12 @@ void BattleIO_ShowBagScreen (BattleSystem *battleSys, BattleContext *battleCtx, SendMessage(battleSys, 1, battler, &v0, sizeof(UnkStruct_ov16_0225C2B0)); } -void ov16_02265A70 (BattleSystem * param0, int param1, BattleItemUse param2) +void ov16_02265A70(BattleSystem *param0, int param1, BattleItemUse param2) { SendMessage(param0, 0, param1, ¶m2, sizeof(BattleItemUse)); } -void BattleIO_ShowPartyScreen (BattleSystem *battleSys, BattleContext *battleCtx, int battler, int listMode, int canSwitch, int doubles) +void BattleIO_ShowPartyScreen(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int listMode, int canSwitch, int doubles) { UnkStruct_ov16_0225C2C4 v0; int v1, v2; @@ -847,12 +844,12 @@ void BattleIO_ShowPartyScreen (BattleSystem *battleSys, BattleContext *battleCtx SendMessage(battleSys, 1, battler, &v0, sizeof(UnkStruct_ov16_0225C2C4)); } -void ov16_02265B10 (BattleSystem * param0, int param1, int param2) +void ov16_02265B10(BattleSystem *param0, int param1, int param2) { SendMessage(param0, 0, param1, ¶m2, 4); } -void BattleIO_ShowYesNoScreen (BattleSystem *battleSys, BattleContext *battleCtx, int battler, int promptMsg, int yesnoType, int move, int nickname) +void BattleIO_ShowYesNoScreen(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int promptMsg, int yesnoType, int move, int nickname) { UnkStruct_ov16_0225C2D8 v0; @@ -867,7 +864,7 @@ void BattleIO_ShowYesNoScreen (BattleSystem *battleSys, BattleContext *battleCtx SendMessage(battleSys, 1, battler, &v0, sizeof(UnkStruct_ov16_0225C2D8)); } -void BattleIO_PrintAttackMessage (BattleSystem * param0, BattleContext * param1) +void BattleIO_PrintAttackMessage(BattleSystem *param0, BattleContext *param1) { UnkStruct_ov16_0225C2EC v0; @@ -884,7 +881,7 @@ void BattleIO_PrintMessage(BattleSystem *battleSys, BattleContext *battleCtx, Ba SendMessage(battleSys, BTLIO_RECIPIENT_ENQUEUE, battleCtx->attacker, battleMsg, sizeof(BattleMessage)); } -void BattleIO_PlayMoveAnimation (BattleSystem * param0, BattleContext * param1, u16 param2) +void BattleIO_PlayMoveAnimation(BattleSystem *param0, BattleContext *param1, u16 param2) { UnkStruct_ov16_02265BBC v0; @@ -892,7 +889,7 @@ void BattleIO_PlayMoveAnimation (BattleSystem * param0, BattleContext * param1, SendMessage(param0, 1, param1->attacker, &v0, sizeof(UnkStruct_ov16_02265BBC)); } -void BattleIO_PlayMoveAnimationA2D (BattleSystem * param0, BattleContext * param1, u16 param2, int param3, int param4) +void BattleIO_PlayMoveAnimationA2D(BattleSystem *param0, BattleContext *param1, u16 param2, int param3, int param4) { UnkStruct_ov16_02265BBC v0; @@ -900,16 +897,16 @@ void BattleIO_PlayMoveAnimationA2D (BattleSystem * param0, BattleContext * param SendMessage(param0, 1, param3, &v0, sizeof(UnkStruct_ov16_02265BBC)); } -void BattleIO_FlickerBattler (BattleSystem * param0, int param1, u32 param2) +void BattleIO_FlickerBattler(BattleSystem *param0, int param1, u32 param2) { int v0 = 23; SendMessage(param0, 1, param1, &v0, 4); } -void BattleIO_UpdateHPGauge (BattleSystem * param0, BattleContext * param1, int param2) +void BattleIO_UpdateHPGauge(BattleSystem *param0, BattleContext *param1, int param2) { UnkStruct_ov16_0225C35C v0; - Pokemon * v1; + Pokemon *v1; int v2; int v3; @@ -935,10 +932,10 @@ void BattleIO_UpdateHPGauge (BattleSystem * param0, BattleContext * param1, int SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_0225C35C)); } -void BattleIO_UpdateExpGauge (BattleSystem * param0, BattleContext * param1, int param2, int param3) +void BattleIO_UpdateExpGauge(BattleSystem *param0, BattleContext *param1, int param2, int param3) { UnkStruct_ov16_0225C370 v0; - Pokemon * v1; + Pokemon *v1; int v2; int v3; @@ -954,7 +951,7 @@ void BattleIO_UpdateExpGauge (BattleSystem * param0, BattleContext * param1, int SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_0225C370)); } -void BattleIO_PlayFaintingSequence (BattleSystem * param0, BattleContext * param1, int param2) +void BattleIO_PlayFaintingSequence(BattleSystem *param0, BattleContext *param1, int param2) { UnkStruct_ov16_0225C384 v0; int v1; @@ -990,7 +987,7 @@ void BattleIO_PlayFaintingSequence (BattleSystem * param0, BattleContext * param SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_0225C384)); } -void BattleIO_PlaySound (BattleSystem * param0, BattleContext * param1, int param2, int param3) +void BattleIO_PlaySound(BattleSystem *param0, BattleContext *param1, int param2, int param3) { UnkStruct_ov16_0225C398 v0; @@ -1000,14 +997,14 @@ void BattleIO_PlaySound (BattleSystem * param0, BattleContext * param1, int para SendMessage(param0, 1, param3, &v0, sizeof(UnkStruct_ov16_0225C398)); } -void BattleIO_FadeOut (BattleSystem * param0, BattleContext * param1) +void BattleIO_FadeOut(BattleSystem *param0, BattleContext *param1) { int v0 = 28; SendMessage(param0, 1, 0, &v0, 4); } -void BattleIO_ToggleVanish (BattleSystem * param0, int param1, int param2) +void BattleIO_ToggleVanish(BattleSystem *param0, int param1, int param2) { UnkStruct_ov16_0225C3BC v0; int v1; @@ -1033,7 +1030,7 @@ void BattleIO_ToggleVanish (BattleSystem * param0, int param1, int param2) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_0225C3BC)); } -void BattleIO_SetStatusIcon (BattleSystem * param0, int param1, int param2) +void BattleIO_SetStatusIcon(BattleSystem *param0, int param1, int param2) { UnkStruct_ov16_0225C3D0 v0; @@ -1043,7 +1040,7 @@ void BattleIO_SetStatusIcon (BattleSystem * param0, int param1, int param2) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_0225C3D0)); } -void BattleIO_TrainerMessage (BattleSystem * param0, int param1, int param2) +void BattleIO_TrainerMessage(BattleSystem *param0, int param1, int param2) { UnkStruct_ov16_0225C3E4 v0; @@ -1053,7 +1050,7 @@ void BattleIO_TrainerMessage (BattleSystem * param0, int param1, int param2) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_0225C3E4)); } -void BattleIO_PlayStatusEffect (BattleSystem * param0, BattleContext * param1, int param2, int param3) +void BattleIO_PlayStatusEffect(BattleSystem *param0, BattleContext *param1, int param2, int param3) { UnkStruct_ov16_02265BBC v0; @@ -1061,7 +1058,7 @@ void BattleIO_PlayStatusEffect (BattleSystem * param0, BattleContext * param1, i SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_02265BBC)); } -void BattleIO_PlayStatusEffectAToD (BattleSystem * param0, BattleContext * param1, int param2, int param3, int param4) +void BattleIO_PlayStatusEffectAToD(BattleSystem *param0, BattleContext *param1, int param2, int param3, int param4) { UnkStruct_ov16_02265BBC v0; @@ -1069,7 +1066,7 @@ void BattleIO_PlayStatusEffectAToD (BattleSystem * param0, BattleContext * param SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_02265BBC)); } -void BattleIO_PrintRecallMessage (BattleSystem * param0, BattleContext * param1, int param2, int param3) +void BattleIO_PrintRecallMessage(BattleSystem *param0, BattleContext *param1, int param2, int param3) { UnkStruct_ov16_0225C3F8 v0; @@ -1080,7 +1077,7 @@ void BattleIO_PrintRecallMessage (BattleSystem * param0, BattleContext * param1, SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_0225C3F8)); } -void BattleIO_PrintSendOutMessage (BattleSystem * param0, BattleContext * param1, int param2, int param3) +void BattleIO_PrintSendOutMessage(BattleSystem *param0, BattleContext *param1, int param2, int param3) { UnkStruct_ov16_0225C40C v0; @@ -1096,14 +1093,14 @@ void BattleIO_PrintSendOutMessage (BattleSystem * param0, BattleContext * param1 SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_0225C40C)); } -void BattleIO_PrintBattleStartMessage (BattleSystem * param0, BattleContext * param1, int param2) +void BattleIO_PrintBattleStartMessage(BattleSystem *param0, BattleContext *param1, int param2) { int v0 = 34; SendMessage(param0, 1, param2, &v0, 4); } -void BattleIO_PrintLeadMonMessage (BattleSystem * param0, BattleContext * param1, int param2) +void BattleIO_PrintLeadMonMessage(BattleSystem *param0, BattleContext *param1, int param2) { UnkStruct_ov16_0225C430 v0; int v1; @@ -1117,18 +1114,17 @@ void BattleIO_PrintLeadMonMessage (BattleSystem * param0, BattleContext * param1 SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_0225C430)); } -void BattleIO_PlayLevelUpAnimation (BattleSystem * param0, int param1) +void BattleIO_PlayLevelUpAnimation(BattleSystem *param0, int param1) { int v0 = 36; SendMessage(param0, 1, param1, &v0, 4); } -void BattleIO_SetAlertMessage (BattleSystem *battleSys, int battler, BattleMessage msg) +void BattleIO_SetAlertMessage(BattleSystem *battleSys, int battler, BattleMessage msg) { BattleIO_ClearBuffer(BattleSystem_Context(battleSys), battler); - UnkStruct_ov16_0225C454 v0; v0.unk_00 = 37; v0.unk_04 = msg; @@ -1136,7 +1132,7 @@ void BattleIO_SetAlertMessage (BattleSystem *battleSys, int battler, BattleMessa SendMessage(battleSys, 1, battler, &v0, sizeof(UnkStruct_ov16_0225C454)); } -void ov16_022661B0 (BattleSystem * param0, int param1) +void ov16_022661B0(BattleSystem *param0, int param1) { int v0; @@ -1144,10 +1140,10 @@ void ov16_022661B0 (BattleSystem * param0, int param1) SendMessage(param0, 0, param1, &v0, 4); } -void BattleIO_RefreshHPGauge (BattleSystem * param0, BattleContext * param1, int param2) +void BattleIO_RefreshHPGauge(BattleSystem *param0, BattleContext *param1, int param2) { UnkStruct_ov16_0225C468 v0; - Pokemon * v1; + Pokemon *v1; int v2; int v3; @@ -1176,7 +1172,7 @@ void BattleIO_RefreshHPGauge (BattleSystem * param0, BattleContext * param1, int SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_0225C468)); } -void BattleIO_UpdatePartyMon (BattleSystem * param0, BattleContext * param1, int param2) +void BattleIO_UpdatePartyMon(BattleSystem *param0, BattleContext *param1, int param2) { UnkStruct_ov16_022662FC v0; int v1; @@ -1221,19 +1217,19 @@ void BattleIO_UpdatePartyMon (BattleSystem * param0, BattleContext * param1, int SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_022662FC)); } -void ov16_02266460 (BattleSystem * param0, int param1) +void ov16_02266460(BattleSystem *param0, int param1) { int v0 = 40; SendMessage(param0, 1, param1, &v0, 4); } -void BattleIO_StopGaugeAnimation (BattleSystem *battleSys, int battler) +void BattleIO_StopGaugeAnimation(BattleSystem *battleSys, int battler) { int v0 = 41; SendMessage(battleSys, 1, battler, &v0, 4); } -void BattleIO_RefreshPartyStatus (BattleSystem * param0, BattleContext * param1, int param2, int param3) +void BattleIO_RefreshPartyStatus(BattleSystem *param0, BattleContext *param1, int param2, int param3) { UnkStruct_ov16_02266498 v0; @@ -1244,7 +1240,7 @@ void BattleIO_RefreshPartyStatus (BattleSystem * param0, BattleContext * param1, SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_02266498)); } -void BattleIO_ForgetMove (BattleSystem * param0, int param1, int param2, int param3) +void BattleIO_ForgetMove(BattleSystem *param0, int param1, int param2, int param3) { UnkStruct_ov16_0225C65C v0; @@ -1257,7 +1253,7 @@ void BattleIO_ForgetMove (BattleSystem * param0, int param1, int param2, int par SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_02266498)); } -void BattleIO_SetMosaic (BattleSystem * param0, int param1, int param2, int param3) +void BattleIO_SetMosaic(BattleSystem *param0, int param1, int param2, int param3) { UnkStruct_ov16_022664F8 v0; @@ -1268,7 +1264,7 @@ void BattleIO_SetMosaic (BattleSystem * param0, int param1, int param2, int para SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_022664F8)); } -void BattleIO_ChangeWeatherForm (BattleSystem * param0, int param1) +void BattleIO_ChangeWeatherForm(BattleSystem *param0, int param1) { UnkStruct_ov16_0225C684 v0; @@ -1289,13 +1285,13 @@ void BattleIO_ChangeWeatherForm (BattleSystem * param0, int param1) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_0225C684)); } -void BattleIO_UpdateBG (BattleSystem * param0, int param1) +void BattleIO_UpdateBG(BattleSystem *param0, int param1) { int v0 = 46; SendMessage(param0, 1, param1, &v0, 4); } -void BattleIO_ClearTouchScreen (BattleSystem *battleSys, int battler) +void BattleIO_ClearTouchScreen(BattleSystem *battleSys, int battler) { int v0 = 47; SendMessage(battleSys, 1, battler, &v0, 4); @@ -1341,7 +1337,7 @@ void BattleIO_FreePartyGaugeGraphics(BattleSystem *battleSys) SendMessage(battleSys, BTLIO_RECIPIENT_ENQUEUE, NULL, &command, sizeof(int)); } -void BattleIO_IncrementRecord (BattleSystem * param0, int param1, int param2, int param3) +void BattleIO_IncrementRecord(BattleSystem *param0, int param1, int param2, int param3) { UnkStruct_ov16_022666BC v0; @@ -1352,7 +1348,7 @@ void BattleIO_IncrementRecord (BattleSystem * param0, int param1, int param2, in SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_022666BC)); } -void BattleIO_LinkWaitMessage (BattleSystem *battleSys, int battler) +void BattleIO_LinkWaitMessage(BattleSystem *battleSys, int battler) { UnkStruct_ov16_0225C988 v0; u32 v1 = BattleSystem_BattleType(battleSys); @@ -1367,7 +1363,7 @@ void BattleIO_LinkWaitMessage (BattleSystem *battleSys, int battler) } } -void BattleIO_RestoreSprite (BattleSystem * param0, BattleContext * param1, int param2) +void BattleIO_RestoreSprite(BattleSystem *param0, BattleContext *param1, int param2) { int v0; UnkStruct_ov16_02265BBC v1; @@ -1391,25 +1387,25 @@ void BattleIO_RestoreSprite (BattleSystem * param0, BattleContext * param1, int SendMessage(param0, 1, param2, &v1, sizeof(UnkStruct_ov16_02265BBC)); } -void BattleIO_SpriteToOAM (BattleSystem * param0, int param1) +void BattleIO_SpriteToOAM(BattleSystem *param0, int param1) { int v0 = 57; SendMessage(param0, 1, param1, &v0, 4); } -void BattleIO_OAMToSprite (BattleSystem * param0, int param1) +void BattleIO_OAMToSprite(BattleSystem *param0, int param1) { int v0 = 58; SendMessage(param0, 1, param1, &v0, 4); } -void BattleIO_ResultMessage (BattleSystem * param0) +void BattleIO_ResultMessage(BattleSystem *param0) { int v0 = 59; SendMessage(param0, 1, 0, &v0, 4); } -void BattleIO_EscapeMessage (BattleSystem * param0, BattleContext * param1) +void BattleIO_EscapeMessage(BattleSystem *param0, BattleContext *param1) { UnkStruct_ov16_0225C9F0 v0; int v1; @@ -1433,7 +1429,7 @@ void BattleIO_EscapeMessage (BattleSystem * param0, BattleContext * param1) SendMessage(param0, 1, 0, &v0, sizeof(UnkStruct_ov16_0225C9F0)); } -void BattleIO_ForfeitMessage (BattleSystem * param0) +void BattleIO_ForfeitMessage(BattleSystem *param0) { UnkStruct_ov16_0225CA14 v0; u32 v1 = BattleSystem_BattleType(param0); @@ -1449,7 +1445,7 @@ void BattleIO_ForfeitMessage (BattleSystem * param0) SendMessage(param0, 1, 0, &v0, sizeof(UnkStruct_ov16_0225CA14)); } -void BattleIO_RefreshSprite (BattleSystem * param0, BattleContext * param1, int param2) +void BattleIO_RefreshSprite(BattleSystem *param0, BattleContext *param1, int param2) { int v0; UnkStruct_ov16_02265BBC v1; @@ -1473,7 +1469,7 @@ void BattleIO_RefreshSprite (BattleSystem * param0, BattleContext * param1, int SendMessage(param0, 1, param2, &v1, sizeof(UnkStruct_ov16_02265BBC)); } -void BattleIO_PlayMoveHitSoundEffect (BattleSystem * param0, BattleContext * param1, int param2) +void BattleIO_PlayMoveHitSoundEffect(BattleSystem *param0, BattleContext *param1, int param2) { UnkStruct_ov16_0225CA4C v0; @@ -1490,7 +1486,7 @@ void BattleIO_PlayMoveHitSoundEffect (BattleSystem * param0, BattleContext * par SendMessage(param0, 1, param2, &v0, sizeof(UnkStruct_ov16_0225CA4C)); } -void BattleIO_PlayMusic (BattleSystem * param0, int param1, int param2) +void BattleIO_PlayMusic(BattleSystem *param0, int param1, int param2) { UnkStruct_ov16_0225CA60 v0; @@ -1500,7 +1496,7 @@ void BattleIO_PlayMusic (BattleSystem * param0, int param1, int param2) SendMessage(param0, 1, param1, &v0, sizeof(UnkStruct_ov16_0225CA60)); } -void BattleIO_SubmitResult (BattleSystem * param0) +void BattleIO_SubmitResult(BattleSystem *param0) { UnkStruct_ov16_02266A38 v0; u32 v1 = BattleSystem_BattleType(param0); @@ -1517,13 +1513,13 @@ void BattleIO_SubmitResult (BattleSystem * param0) SendMessage(param0, 1, 0, &v0, sizeof(UnkStruct_ov16_02266A38)); } -void BattleIO_ClearMessageBox (BattleSystem * param0) +void BattleIO_ClearMessageBox(BattleSystem *param0) { int v0 = 66; SendMessage(param0, 1, 0, &v0, 4); } -void ClearCommand (BattleSystem * param0, int param1, int param2) +void ClearCommand(BattleSystem *param0, int param1, int param2) { UnkStruct_ov16_02266ABC v0; @@ -1533,9 +1529,9 @@ void ClearCommand (BattleSystem * param0, int param1, int param2) SendMessage(param0, 2, param1, &v0, sizeof(UnkStruct_ov16_02266ABC)); } -BOOL ov16_02266AE4 (BattleSystem * param0, void * param1) +BOOL ov16_02266AE4(BattleSystem *param0, void *param1) { - u8 * v0 = (u8 *)param1; + u8 *v0 = (u8 *)param1; u8 v1; u8 v2; int v3; @@ -1581,7 +1577,7 @@ BOOL ov16_02266AE4 (BattleSystem * param0, void * param1) return v5; } -void ov16_02266B78 (BattleSystem * param0, BattleContext * param1, UnkStruct_ov16_02265BBC * param2, int param3, int param4, int param5, int param6, u16 param7) +void ov16_02266B78(BattleSystem *param0, BattleContext *param1, UnkStruct_ov16_02265BBC *param2, int param3, int param4, int param5, int param6, u16 param7) { int v0; @@ -1662,13 +1658,13 @@ static void PartyGaugeData_New(BattleSystem *battleSys, BattleContext *battleCtx // must make declarations here to match int battler1, battler2; Party *party; - + if ((battleType & (BATTLE_TYPE_LINK | BATTLE_TYPE_2vs2)) == (BATTLE_TYPE_LINK | BATTLE_TYPE_2vs2) // 2vs2 link battle - || ((battleType & BATTLE_TYPE_TAG) && Battler_Side(battleSys, battler)) // either of the two opponents on the enemy side - || ((battleType == BATTLE_TYPE_TRAINER_WITH_AI_PARTNER) && Battler_Side(battleSys, battler)) // either of the two opponents on the enemy side - || battleType == BATTLE_TYPE_FRONTIER_WITH_AI_PARTNER) { // frontier, AI partner + || ((battleType & BATTLE_TYPE_TAG) && Battler_Side(battleSys, battler)) // either of the two opponents on the enemy side + || ((battleType == BATTLE_TYPE_TRAINER_WITH_AI_PARTNER) && Battler_Side(battleSys, battler)) // either of the two opponents on the enemy side + || battleType == BATTLE_TYPE_FRONTIER_WITH_AI_PARTNER) { // frontier, AI partner if (BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_PLAYER_SLOT_2 - || BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_ENEMY_SLOT_2) { + || BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_ENEMY_SLOT_2) { battler1 = battler; battler2 = BattleSystem_Partner(battleSys, battler); } else { diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index d4e55079a3..355c4ef319 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -1,22 +1,30 @@ +#include "battle/battle_io_command.h" + #include #include #include "constants/battle/battle_io.h" +#include "struct_decls/battle_system.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "struct_decls/battle_system.h" -#include "battle/struct_ov16_0225BFFC_decl.h" -#include "battle/struct_ov16_02268A14_decl.h" - #include "struct_defs/archived_sprite.h" +#include "struct_defs/battle_io.h" #include "struct_defs/struct_0205AA50.h" -#include "overlay012/struct_ov12_02237728.h" + +#include "battle/battle_display.h" +#include "battle/battle_io.h" +#include "battle/battle_message.h" +#include "battle/healthbar.h" +#include "battle/ov16_0223DF00.h" +#include "battle/ov16_02264798.h" +#include "battle/ov16_0226871C.h" +#include "battle/party_gauge.h" #include "battle/struct_ov16_0223C2C0.h" +#include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_0225BFFC_t.h" #include "battle/struct_ov16_0225C168.h" #include "battle/struct_ov16_0225C17C.h" @@ -26,7 +34,6 @@ #include "battle/struct_ov16_0225C2C4.h" #include "battle/struct_ov16_0225C2D8.h" #include "battle/struct_ov16_0225C2EC.h" -#include "battle/battle_message.h" #include "battle/struct_ov16_0225C35C.h" #include "battle/struct_ov16_0225C370.h" #include "battle/struct_ov16_0225C384.h" @@ -41,7 +48,6 @@ #include "battle/struct_ov16_0225C468.h" #include "battle/struct_ov16_0225C65C.h" #include "battle/struct_ov16_0225C684.h" -#include "struct_defs/battle_io.h" #include "battle/struct_ov16_0225C988.h" #include "battle/struct_ov16_0225C9F0.h" #include "battle/struct_ov16_0225CA14.h" @@ -61,107 +67,101 @@ #include "battle/struct_ov16_022666BC.h" #include "battle/struct_ov16_02266A38.h" #include "battle/struct_ov16_022674C4.h" +#include "battle/struct_ov16_02268A14_decl.h" +#include "overlay012/ov12_02235E94.h" +#include "overlay012/ov12_022380BC.h" +#include "overlay012/struct_ov12_02237728.h" +#include "flags.h" +#include "heap.h" #include "narc.h" +#include "party.h" +#include "pokemon.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_020131EC.h" -#include "heap.h" #include "unk_02018340.h" -#include "pokemon.h" -#include "party.h" -#include "flags.h" -#include "overlay012/ov12_02235E94.h" -#include "overlay012/ov12_022380BC.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_io_command.h" -#include "battle/battle_display.h" -#include "battle/ov16_02264798.h" -#include "battle/battle_io.h" -#include "battle/healthbar.h" -#include "battle/ov16_0226871C.h" -#include "battle/party_gauge.h" -typedef void (* UnkFuncPtr_ov16_0226F068)(BattleSystem *, BattlerData *); - -BattlerData * ov16_0225BFFC(BattleSystem * param0, UnkStruct_ov16_0223C2C0 * param1); -void ov16_0225C0DC(BattleSystem * param0, BattlerData * param1); -void ov16_0225C104(BattleSystem * param0, BattlerData * param1, int param2); -void ov16_0225C038(BattleSystem * param0, BattlerData * param1, int param2, int param3); -static void ov16_0225C138(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C13C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C168(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C17C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C190(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C1A4(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C1B8(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C1CC(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C1F0(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C204(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C218(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C228(BattleSystem * param0, BattlerData * param1); +typedef void (*UnkFuncPtr_ov16_0226F068)(BattleSystem *, BattlerData *); + +BattlerData *ov16_0225BFFC(BattleSystem *param0, UnkStruct_ov16_0223C2C0 *param1); +void ov16_0225C0DC(BattleSystem *param0, BattlerData *param1); +void ov16_0225C104(BattleSystem *param0, BattlerData *param1, int param2); +void ov16_0225C038(BattleSystem *param0, BattlerData *param1, int param2, int param3); +static void ov16_0225C138(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C13C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C168(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C17C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C190(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C1A4(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C1B8(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C1CC(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C1F0(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C204(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C218(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C228(BattleSystem *param0, BattlerData *param1); static void BtlIOCmd_SlideHealthbarIn(BattleSystem *battleSys, BattlerData *battlerData); static void BtlIOCmd_SlideHealthbarOut(BattleSystem *battleSys, BattlerData *battlerData); -static void ov16_0225C260(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C288(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C29C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C2B0(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C2C4(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C2D8(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C2EC(BattleSystem * param0, BattlerData * param1); +static void ov16_0225C260(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C288(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C29C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C2B0(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C2C4(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C2D8(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C2EC(BattleSystem *param0, BattlerData *param1); static void BtlIOCmd_PrintBattleMessage(BattleSystem *battleSys, BattlerData *battlerData); -static void ov16_0225C314(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C328(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C35C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C370(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C384(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C398(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C3AC(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C3BC(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C3D0(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C3E4(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C3F8(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C40C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C420(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C430(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C444(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C454(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C468(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C47C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C558(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C5B0(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C5E0(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C65C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C670(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C684(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C77C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C79C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C840(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C854(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C868(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C8A4(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C8E0(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C91C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C940(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C988(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C9AC(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C9C0(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C9D0(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C9E0(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C9F0(BattleSystem * param0, BattlerData * param1); -static void ov16_0225CA14(BattleSystem * param0, BattlerData * param1); -static void ov16_0225CA38(BattleSystem * param0, BattlerData * param1); -static void ov16_0225CA4C(BattleSystem * param0, BattlerData * param1); -static void ov16_0225CA60(BattleSystem * param0, BattlerData * param1); -static void ov16_0225CA74(BattleSystem * param0, BattlerData * param1); -static void ov16_0225CB80(BattleSystem * param0, BattlerData * param1); -static void ZeroDataBuffer(BattlerData * param0); +static void ov16_0225C314(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C328(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C35C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C370(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C384(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C398(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C3AC(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C3BC(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C3D0(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C3E4(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C3F8(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C40C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C420(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C430(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C444(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C454(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C468(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C47C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C558(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C5B0(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C5E0(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C65C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C670(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C684(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C77C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C79C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C840(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C854(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C868(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C8A4(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C8E0(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C91C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C940(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C988(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C9AC(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C9C0(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C9D0(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C9E0(BattleSystem *param0, BattlerData *param1); +static void ov16_0225C9F0(BattleSystem *param0, BattlerData *param1); +static void ov16_0225CA14(BattleSystem *param0, BattlerData *param1); +static void ov16_0225CA38(BattleSystem *param0, BattlerData *param1); +static void ov16_0225CA4C(BattleSystem *param0, BattlerData *param1); +static void ov16_0225CA60(BattleSystem *param0, BattlerData *param1); +static void ov16_0225CA74(BattleSystem *param0, BattlerData *param1); +static void ov16_0225CB80(BattleSystem *param0, BattlerData *param1); +static void ZeroDataBuffer(BattlerData *param0); extern const u8 Unk_ov16_0226F174[]; -BattlerData * ov16_0225BFFC (BattleSystem * param0, UnkStruct_ov16_0223C2C0 * param1) +BattlerData *ov16_0225BFFC(BattleSystem *param0, UnkStruct_ov16_0223C2C0 *param1) { - BattlerData * v0; + BattlerData *v0; int v1; v0 = Heap_AllocFromHeap(5, sizeof(BattlerData)); @@ -174,7 +174,7 @@ BattlerData * ov16_0225BFFC (BattleSystem * param0, UnkStruct_ov16_0223C2C0 * pa return v0; } -void ov16_0225C038 (BattleSystem * param0, BattlerData * param1, int param2, int param3) +void ov16_0225C038(BattleSystem *param0, BattlerData *param1, int param2, int param3) { BallThrow v0; s16 v1, v2; @@ -218,7 +218,7 @@ static const UnkFuncPtr_ov16_0226F068 Unk_ov16_0226F068[] = { ov16_0225C204, ov16_0225C218, ov16_0225C228, - [BTLIOCMD_SLIDE_HEALTHBAR_IN] = BtlIOCmd_SlideHealthbarIn, + [BTLIOCMD_SLIDE_HEALTHBAR_IN] = BtlIOCmd_SlideHealthbarIn, [BTLIOCMD_SLIDE_HEALTHBAR_OUT] = BtlIOCmd_SlideHealthbarOut, ov16_0225C260, ov16_0225C288, @@ -256,10 +256,10 @@ static const UnkFuncPtr_ov16_0226F068 Unk_ov16_0226F068[] = { ov16_0225C79C, [BTLIOCMD_SHOW_BATTLE_START_PARTY_GAUGE] = ov16_0225C840, [BTLIOCMD_HIDE_BATTLE_START_PARTY_GAUGE] = ov16_0225C854, - [BTLIOCMD_SHOW_PARTY_GAUGE] = ov16_0225C868, - [BTLIOCMD_HIDE_PARTY_GAUGE] = ov16_0225C8A4, - [BTLIOCMD_LOAD_PARTY_GAUGE_GRAPHICS] = ov16_0225C8E0, - [BTLIOCMD_FREE_PARTY_GAUGE_GRAPHICS] = ov16_0225C91C, + [BTLIOCMD_SHOW_PARTY_GAUGE] = ov16_0225C868, + [BTLIOCMD_HIDE_PARTY_GAUGE] = ov16_0225C8A4, + [BTLIOCMD_LOAD_PARTY_GAUGE_GRAPHICS] = ov16_0225C8E0, + [BTLIOCMD_FREE_PARTY_GAUGE_GRAPHICS] = ov16_0225C91C, ov16_0225C940, ov16_0225C988, ov16_0225C9AC, @@ -275,7 +275,7 @@ static const UnkFuncPtr_ov16_0226F068 Unk_ov16_0226F068[] = { ov16_0225CB80 }; -void ov16_0225C0DC (BattleSystem * param0, BattlerData * param1) +void ov16_0225C0DC(BattleSystem *param0, BattlerData *param1) { if (param1->data[0]) { param1->unk_1A4 = 0; @@ -283,7 +283,7 @@ void ov16_0225C0DC (BattleSystem * param0, BattlerData * param1) } } -void ov16_0225C104 (BattleSystem * param0, BattlerData * param1, int param2) +void ov16_0225C104(BattleSystem *param0, BattlerData *param1, int param2) { if (param2 != 2) { ov16_02267360(¶m1->healthbar); @@ -299,14 +299,14 @@ void ov16_0225C104 (BattleSystem * param0, BattlerData * param1, int param2) Heap_FreeToHeap(param1); } -static void ov16_0225C138 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C138(BattleSystem *param0, BattlerData *param1) { return; } -static void ov16_0225C13C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C13C(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_02264A8C * v0 = (UnkStruct_ov16_02264A8C *)¶m1->data[0]; + UnkStruct_ov16_02264A8C *v0 = (UnkStruct_ov16_02264A8C *)¶m1->data[0]; ov16_0223F4F4(param0, v0->unk_04); ov16_0225CBB8(param0, param1); @@ -314,78 +314,78 @@ static void ov16_0225C13C (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C168 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C168(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C168 * v0 = (UnkStruct_ov16_0225C168 *)¶m1->data[0]; + UnkStruct_ov16_0225C168 *v0 = (UnkStruct_ov16_0225C168 *)¶m1->data[0]; ov16_0225CBDC(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C17C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C17C(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C17C * v0 = (UnkStruct_ov16_0225C17C *)¶m1->data[0]; + UnkStruct_ov16_0225C17C *v0 = (UnkStruct_ov16_0225C17C *)¶m1->data[0]; ov16_0225CE1C(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C190 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C190(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C17C * v0 = (UnkStruct_ov16_0225C17C *)¶m1->data[0]; + UnkStruct_ov16_0225C17C *v0 = (UnkStruct_ov16_0225C17C *)¶m1->data[0]; ov16_0225CF70(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C1A4 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C1A4(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_02264EF8 * v0 = (UnkStruct_ov16_02264EF8 *)¶m1->data[0]; + UnkStruct_ov16_02264EF8 *v0 = (UnkStruct_ov16_02264EF8 *)¶m1->data[0]; ov16_0225D118(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C1B8 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C1B8(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_02265050 * v0 = (UnkStruct_ov16_02265050 *)¶m1->data[0]; + UnkStruct_ov16_02265050 *v0 = (UnkStruct_ov16_02265050 *)¶m1->data[0]; ov16_0225D1C4(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C1CC (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C1CC(BattleSystem *param0, BattlerData *param1) { sub_02007DC8(param1->unk_20); ClearCommand(param0, param1->battler, 7); ZeroDataBuffer(param1); } -static void ov16_0225C1F0 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C1F0(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_02265124 * v0 = (UnkStruct_ov16_02265124 *)¶m1->data[0]; + UnkStruct_ov16_02265124 *v0 = (UnkStruct_ov16_02265124 *)¶m1->data[0]; ov16_0225D228(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C204 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C204(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_02265154 * v0 = (UnkStruct_ov16_02265154 *)¶m1->data[0]; + UnkStruct_ov16_02265154 *v0 = (UnkStruct_ov16_02265154 *)¶m1->data[0]; ov16_0225D360(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C218 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C218(BattleSystem *param0, BattlerData *param1) { ov16_0225D3CC(param0, param1); ZeroDataBuffer(param1); } -static void ov16_0225C228 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C228(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_022651A8 * v0 = (UnkStruct_ov16_022651A8 *)¶m1->data[0]; + UnkStruct_ov16_022651A8 *v0 = (UnkStruct_ov16_022651A8 *)¶m1->data[0]; ov16_0225D414(param0, param1, v0); ZeroDataBuffer(param1); @@ -393,9 +393,9 @@ static void ov16_0225C228 (BattleSystem * param0, BattlerData * param1) /** * @brief Slide a healthbar in on the screen. - * - * @param battleSys - * @param battlerData + * + * @param battleSys + * @param battlerData */ static void BtlIOCmd_SlideHealthbarIn(BattleSystem *battleSys, BattlerData *battlerData) { @@ -407,9 +407,9 @@ static void BtlIOCmd_SlideHealthbarIn(BattleSystem *battleSys, BattlerData *batt /** * @brief Slide a healthbar out of the screen. - * - * @param battleSys - * @param battlerData + * + * @param battleSys + * @param battlerData */ static void BtlIOCmd_SlideHealthbarOut(BattleSystem *battleSys, BattlerData *battlerData) { @@ -417,58 +417,58 @@ static void BtlIOCmd_SlideHealthbarOut(BattleSystem *battleSys, BattlerData *bat ZeroDataBuffer(battlerData); } -static void ov16_0225C260 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C260(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C260 * v0 = (UnkStruct_ov16_0225C260 *)¶m1->data[0]; + UnkStruct_ov16_0225C260 *v0 = (UnkStruct_ov16_0225C260 *)¶m1->data[0]; ov16_0223F290(param0, v0->unk_29); ov16_0225D5B8(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C288 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C288(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_022656F0 * v0 = (UnkStruct_ov16_022656F0 *)¶m1->data[0]; + UnkStruct_ov16_022656F0 *v0 = (UnkStruct_ov16_022656F0 *)¶m1->data[0]; ov16_0225D698(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C29C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C29C(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C29C * v0 = (UnkStruct_ov16_0225C29C *)¶m1->data[0]; + UnkStruct_ov16_0225C29C *v0 = (UnkStruct_ov16_0225C29C *)¶m1->data[0]; ov16_0225D708(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C2B0 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C2B0(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C2B0 * v0 = (UnkStruct_ov16_0225C2B0 *)¶m1->data[0]; + UnkStruct_ov16_0225C2B0 *v0 = (UnkStruct_ov16_0225C2B0 *)¶m1->data[0]; ov16_0225D794(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C2C4 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C2C4(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C2C4 * v0 = (UnkStruct_ov16_0225C2C4 *)¶m1->data[0]; + UnkStruct_ov16_0225C2C4 *v0 = (UnkStruct_ov16_0225C2C4 *)¶m1->data[0]; ov16_0225D840(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C2D8 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C2D8(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C2D8 * v0 = (UnkStruct_ov16_0225C2D8 *)¶m1->data[0]; + UnkStruct_ov16_0225C2D8 *v0 = (UnkStruct_ov16_0225C2D8 *)¶m1->data[0]; ov16_0225D8AC(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C2EC (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C2EC(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C2EC * v0 = (UnkStruct_ov16_0225C2EC *)¶m1->data[0]; + UnkStruct_ov16_0225C2EC *v0 = (UnkStruct_ov16_0225C2EC *)¶m1->data[0]; ov16_0225D8F0(param0, param1, v0); ZeroDataBuffer(param1); @@ -476,9 +476,9 @@ static void ov16_0225C2EC (BattleSystem * param0, BattlerData * param1) /** * @brief Print a message to the screen. - * - * @param battleSys - * @param battlerData + * + * @param battleSys + * @param battlerData */ static void BtlIOCmd_PrintBattleMessage(BattleSystem *battleSys, BattlerData *battlerData) { @@ -488,15 +488,15 @@ static void BtlIOCmd_PrintBattleMessage(BattleSystem *battleSys, BattlerData *ba ZeroDataBuffer(battlerData); } -static void ov16_0225C314 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C314(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_02265BBC * v0 = (UnkStruct_ov16_02265BBC *)¶m1->data[0]; + UnkStruct_ov16_02265BBC *v0 = (UnkStruct_ov16_02265BBC *)¶m1->data[0]; ov16_0225D9A8(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C328 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C328(BattleSystem *param0, BattlerData *param1) { if (sub_020080C0(param1->unk_20, 6) == 1) { ClearCommand(param0, param1->battler, 23); @@ -507,125 +507,125 @@ static void ov16_0225C328 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C35C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C35C(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C35C * v0 = (UnkStruct_ov16_0225C35C *)¶m1->data[0]; + UnkStruct_ov16_0225C35C *v0 = (UnkStruct_ov16_0225C35C *)¶m1->data[0]; ov16_0225DA74(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C370 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C370(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C370 * v0 = (UnkStruct_ov16_0225C370 *)¶m1->data[0]; + UnkStruct_ov16_0225C370 *v0 = (UnkStruct_ov16_0225C370 *)¶m1->data[0]; ov16_0225DB00(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C384 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C384(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C384 * v0 = (UnkStruct_ov16_0225C384 *)¶m1->data[0]; + UnkStruct_ov16_0225C384 *v0 = (UnkStruct_ov16_0225C384 *)¶m1->data[0]; ov16_0225DB74(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C398 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C398(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C398 * v0 = (UnkStruct_ov16_0225C398 *)¶m1->data[0]; + UnkStruct_ov16_0225C398 *v0 = (UnkStruct_ov16_0225C398 *)¶m1->data[0]; ov16_0225DC4C(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C3AC (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C3AC(BattleSystem *param0, BattlerData *param1) { ov16_0225DC7C(param0, param1); ZeroDataBuffer(param1); } -static void ov16_0225C3BC (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C3BC(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C3BC * v0 = (UnkStruct_ov16_0225C3BC *)¶m1->data[0]; + UnkStruct_ov16_0225C3BC *v0 = (UnkStruct_ov16_0225C3BC *)¶m1->data[0]; ov16_0225DCB0(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C3D0 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C3D0(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C3D0 * v0 = (UnkStruct_ov16_0225C3D0 *)¶m1->data[0]; + UnkStruct_ov16_0225C3D0 *v0 = (UnkStruct_ov16_0225C3D0 *)¶m1->data[0]; ov16_0225DD44(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C3E4 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C3E4(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C3E4 * v0 = (UnkStruct_ov16_0225C3E4 *)¶m1->data[0]; + UnkStruct_ov16_0225C3E4 *v0 = (UnkStruct_ov16_0225C3E4 *)¶m1->data[0]; ov16_0225DD7C(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C3F8 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C3F8(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C3F8 * v0 = (UnkStruct_ov16_0225C3F8 *)¶m1->data[0]; + UnkStruct_ov16_0225C3F8 *v0 = (UnkStruct_ov16_0225C3F8 *)¶m1->data[0]; ov16_0225DDD8(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C40C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C40C(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C40C * v0 = (UnkStruct_ov16_0225C40C *)¶m1->data[0]; + UnkStruct_ov16_0225C40C *v0 = (UnkStruct_ov16_0225C40C *)¶m1->data[0]; ov16_0225DE30(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C420 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C420(BattleSystem *param0, BattlerData *param1) { ov16_0225DE88(param0, param1); ZeroDataBuffer(param1); } -static void ov16_0225C430 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C430(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C430 * v0 = (UnkStruct_ov16_0225C430 *)¶m1->data[0]; + UnkStruct_ov16_0225C430 *v0 = (UnkStruct_ov16_0225C430 *)¶m1->data[0]; ov16_0225DEDC(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C444 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C444(BattleSystem *param0, BattlerData *param1) { ov16_0225DF34(param0, param1); ZeroDataBuffer(param1); } -static void ov16_0225C454 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C454(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C454 * v0 = (UnkStruct_ov16_0225C454 *)¶m1->data[0]; + UnkStruct_ov16_0225C454 *v0 = (UnkStruct_ov16_0225C454 *)¶m1->data[0]; ov16_0225DF6C(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C468 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C468(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C468 * v0 = (UnkStruct_ov16_0225C468 *)¶m1->data[0]; + UnkStruct_ov16_0225C468 *v0 = (UnkStruct_ov16_0225C468 *)¶m1->data[0]; ov16_0225E008(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C47C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C47C(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_022662FC * v0 = (UnkStruct_ov16_022662FC *)¶m1->data[0]; + UnkStruct_ov16_022662FC *v0 = (UnkStruct_ov16_022662FC *)¶m1->data[0]; int v1; - Pokemon * v2; + Pokemon *v2; v2 = BattleSystem_PartyPokemon(param0, param1->battler, v0->unk_01_0); @@ -658,10 +658,10 @@ static void ov16_0225C47C (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C558 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C558(BattleSystem *param0, BattlerData *param1) { u32 v0; - UnkStruct_ov16_02268A14 * v1; + UnkStruct_ov16_02268A14 *v1; v0 = BattleSystem_BattleType(param0); v1 = ov16_0223E02C(param0); @@ -676,7 +676,7 @@ static void ov16_0225C558 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C5B0 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C5B0(BattleSystem *param0, BattlerData *param1) { ov16_022675AC(¶m1->healthbar); ov16_022647D8(param1); @@ -684,10 +684,10 @@ static void ov16_0225C5B0 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C5E0 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C5E0(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_02266498 * v0 = (UnkStruct_ov16_02266498 *)¶m1->data[0]; - Pokemon * v1; + UnkStruct_ov16_02266498 *v0 = (UnkStruct_ov16_02266498 *)¶m1->data[0]; + Pokemon *v1; int v2, v3, v4; u32 v5; @@ -712,27 +712,27 @@ static void ov16_0225C5E0 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C65C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C65C(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C65C * v0 = (UnkStruct_ov16_0225C65C *)¶m1->data[0]; + UnkStruct_ov16_0225C65C *v0 = (UnkStruct_ov16_0225C65C *)¶m1->data[0]; ov16_0225E0BC(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C670 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C670(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_022664F8 * v0 = (UnkStruct_ov16_022664F8 *)¶m1->data[0]; + UnkStruct_ov16_022664F8 *v0 = (UnkStruct_ov16_022664F8 *)¶m1->data[0]; ov16_0225E0F4(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C684 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C684(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C684 * v0 = (UnkStruct_ov16_0225C684 *)¶m1->data[0]; + UnkStruct_ov16_0225C684 *v0 = (UnkStruct_ov16_0225C684 *)¶m1->data[0]; ArchivedSprite v1; - ArchivedSprite * v2; + ArchivedSprite *v2; int v3; int v4; @@ -763,22 +763,22 @@ static void ov16_0225C684 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C77C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C77C(BattleSystem *param0, BattlerData *param1) { ov16_0223EF8C(param0); ClearCommand(param0, param1->battler, 46); ZeroDataBuffer(param1); } -static void ov16_0225C79C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C79C(BattleSystem *param0, BattlerData *param1) { if (param1->bootState == 0x0) { { - UnkStruct_ov16_02268A14 * v0; + UnkStruct_ov16_02268A14 *v0; int v1; - Healthbar * v2; - NARC * v3; - NARC * v4; + Healthbar *v2; + NARC *v3; + NARC *v4; v3 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); @@ -807,25 +807,25 @@ static void ov16_0225C79C (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C840 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C840(BattleSystem *param0, BattlerData *param1) { - PartyGaugeData * v0 = (PartyGaugeData *)¶m1->data[0]; + PartyGaugeData *v0 = (PartyGaugeData *)¶m1->data[0]; BattleDisplay_ShowBattleStartPartyGauge(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C854 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C854(BattleSystem *param0, BattlerData *param1) { - PartyGaugeData * v0 = (PartyGaugeData *)¶m1->data[0]; + PartyGaugeData *v0 = (PartyGaugeData *)¶m1->data[0]; BattleDisplay_HideBattleStartPartyGauge(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C868 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C868(BattleSystem *param0, BattlerData *param1) { - PartyGaugeData * v0 = (PartyGaugeData *)¶m1->data[0]; + PartyGaugeData *v0 = (PartyGaugeData *)¶m1->data[0]; if (Battler_Side(param0, param1->battler)) { BattleDisplay_ShowPartyGauge(param0, param1, v0); @@ -836,9 +836,9 @@ static void ov16_0225C868 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C8A4 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C8A4(BattleSystem *param0, BattlerData *param1) { - PartyGaugeData * v0 = (PartyGaugeData *)¶m1->data[0]; + PartyGaugeData *v0 = (PartyGaugeData *)¶m1->data[0]; if (Battler_Side(param0, param1->battler)) { BattleDisplay_HidePartyGauge(param0, param1, v0); @@ -849,11 +849,11 @@ static void ov16_0225C8A4 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C8E0 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C8E0(BattleSystem *param0, BattlerData *param1) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - PaletteData * v2; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + PaletteData *v2; v0 = ov16_0223E010(param0); v1 = ov16_0223E018(param0); @@ -864,9 +864,9 @@ static void ov16_0225C8E0 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C91C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C91C(BattleSystem *param0, BattlerData *param1) { - SpriteGfxHandler * v0; + SpriteGfxHandler *v0; v0 = ov16_0223E018(param0); @@ -875,9 +875,9 @@ static void ov16_0225C91C (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C940 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C940(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_022666BC * v0 = (UnkStruct_ov16_022666BC *)¶m1->data[0]; + UnkStruct_ov16_022666BC *v0 = (UnkStruct_ov16_022666BC *)¶m1->data[0]; if (v0->unk_01 == 0) { if (param1->bootState == 0x0) { @@ -893,88 +893,88 @@ static void ov16_0225C940 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C988 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C988(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C988 * v0 = (UnkStruct_ov16_0225C988 *)¶m1->data[0]; + UnkStruct_ov16_0225C988 *v0 = (UnkStruct_ov16_0225C988 *)¶m1->data[0]; ov16_0223F638(param0, v0->unk_02, v0->unk_04); ov16_0225E23C(param0, param1); ZeroDataBuffer(param1); } -static void ov16_0225C9AC (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C9AC(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_02265BBC * v0 = (UnkStruct_ov16_02265BBC *)¶m1->data[0]; + UnkStruct_ov16_02265BBC *v0 = (UnkStruct_ov16_02265BBC *)¶m1->data[0]; ov16_0225E294(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225C9C0 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C9C0(BattleSystem *param0, BattlerData *param1) { ov16_0225E2C8(param0, param1); ZeroDataBuffer(param1); } -static void ov16_0225C9D0 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C9D0(BattleSystem *param0, BattlerData *param1) { ov16_0225E300(param0, param1); ZeroDataBuffer(param1); } -static void ov16_0225C9E0 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C9E0(BattleSystem *param0, BattlerData *param1) { ov16_0225E338(param0, param1); ZeroDataBuffer(param1); } -static void ov16_0225C9F0 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225C9F0(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225C9F0 * v0 = (UnkStruct_ov16_0225C9F0 *)¶m1->data[0]; + UnkStruct_ov16_0225C9F0 *v0 = (UnkStruct_ov16_0225C9F0 *)¶m1->data[0]; ov16_0223F638(param0, v0->unk_02, v0->unk_04); ov16_0225E38C(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225CA14 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225CA14(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225CA14 * v0 = (UnkStruct_ov16_0225CA14 *)¶m1->data[0]; + UnkStruct_ov16_0225CA14 *v0 = (UnkStruct_ov16_0225CA14 *)¶m1->data[0]; ov16_0223F638(param0, v0->unk_02, v0->unk_04); ov16_0225E3E0(param0, param1); ZeroDataBuffer(param1); } -static void ov16_0225CA38 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225CA38(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_02265BBC * v0 = (UnkStruct_ov16_02265BBC *)¶m1->data[0]; + UnkStruct_ov16_02265BBC *v0 = (UnkStruct_ov16_02265BBC *)¶m1->data[0]; ov16_0225E434(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225CA4C (BattleSystem * param0, BattlerData * param1) +static void ov16_0225CA4C(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225CA4C * v0 = (UnkStruct_ov16_0225CA4C *)¶m1->data[0]; + UnkStruct_ov16_0225CA4C *v0 = (UnkStruct_ov16_0225CA4C *)¶m1->data[0]; ov16_0225E468(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225CA60 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225CA60(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_0225CA60 * v0 = (UnkStruct_ov16_0225CA60 *)¶m1->data[0]; + UnkStruct_ov16_0225CA60 *v0 = (UnkStruct_ov16_0225CA60 *)¶m1->data[0]; ov16_0225E4C8(param0, param1, v0); ZeroDataBuffer(param1); } -static void ov16_0225CA74 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225CA74(BattleSystem *param0, BattlerData *param1) { - UnkStruct_ov16_02266A38 * v0 = (UnkStruct_ov16_02266A38 *)¶m1->data[0]; - Party * v1; - Pokemon * v2; + UnkStruct_ov16_02266A38 *v0 = (UnkStruct_ov16_02266A38 *)¶m1->data[0]; + Party *v1; + Pokemon *v2; int v3; int v4; int v5 = 0; @@ -1015,9 +1015,9 @@ static void ov16_0225CA74 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225CB80 (BattleSystem * param0, BattlerData * param1) +static void ov16_0225CB80(BattleSystem *param0, BattlerData *param1) { - Window * v0 = BattleSystem_Window(param0, 0); + Window *v0 = BattleSystem_Window(param0, 0); BGL_FillWindow(v0, 0xff); sub_0201ACCC(v0); @@ -1026,7 +1026,7 @@ static void ov16_0225CB80 (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ZeroDataBuffer (BattlerData * param0) +static void ZeroDataBuffer(BattlerData *param0) { param0->data[0] = 0; } diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c index 516554f650..bd9a2ea8be 100644 --- a/src/battle/battle_lib.c +++ b/src/battle/battle_lib.c @@ -1,9 +1,8 @@ +#include "battle/battle_lib.h" + #include #include -#include "consts/abilities.h" -#include "consts/gender.h" - #include "constants/battle.h" #include "constants/flavor.h" #include "constants/heap.h" @@ -12,39 +11,40 @@ #include "constants/species.h" #include "constants/string.h" #include "constants/trainer.h" +#include "consts/abilities.h" +#include "consts/gender.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/battle_system.h" #include "struct_decls/struct_02098700_decl.h" +#include "struct_decls/struct_party_decl.h" #include "struct_defs/fraction.h" -#include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/battle_context.h" #include "battle/battle_controller.h" +#include "battle/battle_display.h" +#include "battle/battle_io.h" #include "battle/battle_message.h" #include "battle/battle_mon.h" #include "battle/common.h" +#include "battle/ov16_0223DF00.h" #include "battle/scripts/sub_seq.naix" +#include "battle/struct_ov16_0225BFFC_decl.h" -#include "unk_020021B0.h" -#include "narc.h" +#include "flags.h" #include "heap.h" +#include "item.h" +#include "move_table.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" #include "strbuf.h" +#include "trainer_data.h" #include "trainer_info.h" +#include "unk_020021B0.h" #include "unk_020366A0.h" -#include "pokemon.h" -#include "move_table.h" -#include "trainer_data.h" -#include "party.h" -#include "item.h" #include "unk_0208C098.h" #include "unk_02098700.h" #include "unk_02098988.h" -#include "flags.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_lib.h" -#include "battle/battle_display.h" -#include "battle/battle_io.h" static BOOL BasicTypeMulApplies(BattleContext *battleCtx, int attacker, int defender, int chartEntry); static int MapSideEffectToSubscript(BattleContext *battleCtx, enum SideEffectType type, u32 effect); @@ -224,7 +224,7 @@ BOOL BattleSystem_PopScript(BattleContext *battleCtx) battleCtx->scriptCursor = battleCtx->scriptStackCursor[battleCtx->scriptStackPointer]; return FALSE; } - + return TRUE; } @@ -393,16 +393,14 @@ int BattleMon_Get(BattleContext *battleCtx, int battler, enum BattleMonParam par case BATTLEMON_FRIENDSHIP: return battleMon->friendship; - case BATTLEMON_NICKNAME: - { - int i; - charcode_t *nickname = buf; + case BATTLEMON_NICKNAME: { + int i; + charcode_t *nickname = buf; - for (i = 0; i < MON_NAME_LEN + 1; i++) { - nickname[i] = battleMon->nickname[i]; - } + for (i = 0; i < MON_NAME_LEN + 1; i++) { + nickname[i] = battleMon->nickname[i]; } - break; + } break; case BATTLEMON_NICKNAME_STRBUF: Strbuf_CopyChars((Strbuf *)buf, battleMon->nickname); @@ -414,16 +412,14 @@ int BattleMon_Get(BattleContext *battleCtx, int battler, enum BattleMonParam par case BATTLEMON_MAX_HP: return battleMon->maxHP; - case BATTLEMON_OT_NAME: - { - int i; - charcode_t *OTName = buf; + case BATTLEMON_OT_NAME: { + int i; + charcode_t *OTName = buf; - for (i = 0; i < MON_NAME_LEN + 1; i++) { - OTName[i] = battleMon->OTName[i]; - } + for (i = 0; i < MON_NAME_LEN + 1; i++) { + OTName[i] = battleMon->OTName[i]; } - break; + } break; case BATTLEMON_EXP: return battleMon->exp; @@ -695,7 +691,7 @@ void BattleMon_Set(BattleContext *battleCtx, int battler, enum BattleMonParam pa case BATTLEMON_PP_UPS_4: mon->ppUps[paramID - BATTLEMON_PP_UPS_1] = *(u8 *)buf; break; - + case BATTLEMON_MAX_PP_1: case BATTLEMON_MAX_PP_2: case BATTLEMON_MAX_PP_3: @@ -710,7 +706,7 @@ void BattleMon_Set(BattleContext *battleCtx, int battler, enum BattleMonParam pa case BATTLEMON_FRIENDSHIP: mon->friendship = *(u8 *)buf; break; - + case BATTLEMON_NICKNAME: for (int i = 0; i < MON_NAME_LEN + 1; i++) { mon->nickname[i] = ((u16 *)buf)[i]; @@ -738,7 +734,7 @@ void BattleMon_Set(BattleContext *battleCtx, int battler, enum BattleMonParam pa case BATTLEMON_PERSONALITY: mon->personality = *(u32 *)buf; break; - + case BATTLEMON_STATUS: mon->status = *(u32 *)buf; break; @@ -1226,12 +1222,12 @@ u8 BattleSystem_CompareBattlerSpeed(BattleSystem *battleSys, BattleContext *batt if (NO_CLOUD_NINE) { if ((battler1Ability == ABILITY_SWIFT_SWIM && WEATHER_IS_RAIN) - || (battler1Ability == ABILITY_CHLOROPHYLL && WEATHER_IS_SUN)) { + || (battler1Ability == ABILITY_CHLOROPHYLL && WEATHER_IS_SUN)) { battler1Speed *= 2; } if ((battler2Ability == ABILITY_SWIFT_SWIM && WEATHER_IS_RAIN) - || (battler2Ability == ABILITY_CHLOROPHYLL && WEATHER_IS_SUN)) { + || (battler2Ability == ABILITY_CHLOROPHYLL && WEATHER_IS_SUN)) { battler2Speed *= 2; } } @@ -1249,7 +1245,7 @@ u8 BattleSystem_CompareBattlerSpeed(BattleSystem *battleSys, BattleContext *batt } if (battler1ItemEffect == HOLD_EFFECT_DITTO_SPEED_UP - && battleCtx->battleMons[battler1].species == SPECIES_DITTO) { + && battleCtx->battleMons[battler1].species == SPECIES_DITTO) { battler1Speed *= 2; } @@ -1260,13 +1256,13 @@ u8 BattleSystem_CompareBattlerSpeed(BattleSystem *battleSys, BattleContext *batt } if (battler1Ability == ABILITY_SLOW_START - && battleCtx->totalTurns - battleCtx->battleMons[battler1].moveEffectsData.slowStartTurnNumber < 5) { + && battleCtx->totalTurns - battleCtx->battleMons[battler1].moveEffectsData.slowStartTurnNumber < 5) { battler1Speed /= 2; } if (battler1Ability == ABILITY_UNBURDEN - && battleCtx->battleMons[battler1].moveEffectsData.canUnburden - && battleCtx->battleMons[battler1].heldItem == ITEM_NONE) { + && battleCtx->battleMons[battler1].moveEffectsData.canUnburden + && battleCtx->battleMons[battler1].heldItem == ITEM_NONE) { battler1Speed *= 2; } @@ -1315,7 +1311,7 @@ u8 BattleSystem_CompareBattlerSpeed(BattleSystem *battleSys, BattleContext *batt } if (battler2ItemEffect == HOLD_EFFECT_DITTO_SPEED_UP - && battleCtx->battleMons[battler2].species == SPECIES_DITTO) { + && battleCtx->battleMons[battler2].species == SPECIES_DITTO) { battler2Speed *= 2; } @@ -1326,13 +1322,13 @@ u8 BattleSystem_CompareBattlerSpeed(BattleSystem *battleSys, BattleContext *batt } if (battler2Ability == ABILITY_SLOW_START - && battleCtx->totalTurns - battleCtx->battleMons[battler2].moveEffectsData.slowStartTurnNumber < 5) { + && battleCtx->totalTurns - battleCtx->battleMons[battler2].moveEffectsData.slowStartTurnNumber < 5) { battler2Speed /= 2; } if (battler2Ability == ABILITY_UNBURDEN - && battleCtx->battleMons[battler2].moveEffectsData.canUnburden - && battleCtx->battleMons[battler2].heldItem == ITEM_NONE) { + && battleCtx->battleMons[battler2].moveEffectsData.canUnburden + && battleCtx->battleMons[battler2].heldItem == ITEM_NONE) { battler2Speed *= 2; } @@ -1464,8 +1460,8 @@ void BattleSystem_FlagBattlerExpGain(BattleSystem *battleSys, BattleContext *bat while (side <= 2) { if ((battleCtx->battlersSwitchingMask & FlagIndex(side)) == FALSE - && (battleCtx->battlersSwitchingMask & FlagIndex(battler)) == FALSE - && battleCtx->battleMons[battler].curHP) { + && (battleCtx->battlersSwitchingMask & FlagIndex(battler)) == FALSE + && battleCtx->battleMons[battler].curHP) { battleCtx->sideGetExpMask[(battler >> 1) & 1] |= FlagIndex(battleCtx->selectedPartySlot[side]); } @@ -1492,14 +1488,14 @@ BOOL BattleSystem_TriggerPrimaryEffect(BattleSystem *battleSys, BattleContext *b *effect = MapSideEffectToSubscript(battleCtx, 1, battleCtx->sideEffectDirectFlags); if (battleCtx->battleMons[battleCtx->sideEffectMon].curHP - && ((battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - // Brick Break's effect still applies even if the target is immune. - || ((battleCtx->sideEffectDirectFlags & MOVE_SIDE_EFFECT_BREAK_SCREENS) - && (battleCtx->moveStatusFlags & MOVE_STATUS_DID_NOT_AFFECT)) - // Various other moves can still apply their effect even if the target - // is semi-invulnerable. - || ((battleCtx->sideEffectDirectFlags & MOVE_SIDE_EFFECT_CHECK_HP) - && (battleCtx->moveStatusFlags & MOVE_STATUS_GENERAL_MISS)))) { + && ((battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE + // Brick Break's effect still applies even if the target is immune. + || ((battleCtx->sideEffectDirectFlags & MOVE_SIDE_EFFECT_BREAK_SCREENS) + && (battleCtx->moveStatusFlags & MOVE_STATUS_DID_NOT_AFFECT)) + // Various other moves can still apply their effect even if the target + // is semi-invulnerable. + || ((battleCtx->sideEffectDirectFlags & MOVE_SIDE_EFFECT_CHECK_HP) + && (battleCtx->moveStatusFlags & MOVE_STATUS_GENERAL_MISS)))) { result = TRUE; } @@ -1530,15 +1526,15 @@ BOOL BattleSystem_TriggerSecondaryEffect(BattleSystem *battleSys, BattleContext SetupSideEffect(battleCtx, effect, SIDE_EFFECT_TYPE_INDIRECT); if (Battler_SubstituteWasHit(battleCtx, battleCtx->sideEffectMon) == FALSE - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE) { + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE) { result = TRUE; } } else if (battleCtx->sideEffectIndirectFlags & MOVE_SIDE_EFFECT_CHECK_HP_AND_SUBSTITUTE) { SetupSideEffect(battleCtx, effect, SIDE_EFFECT_TYPE_INDIRECT); if (battleCtx->battleMons[battleCtx->sideEffectMon].curHP - && Battler_SubstituteWasHit(battleCtx, battleCtx->sideEffectMon) == FALSE - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE) { + && Battler_SubstituteWasHit(battleCtx, battleCtx->sideEffectMon) == FALSE + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE) { result = TRUE; } } else if (battleCtx->sideEffectIndirectFlags & MOVE_SIDE_EFFECT_CHECK_HP) { @@ -1579,8 +1575,8 @@ BOOL BattleSystem_TriggerSecondaryEffect(BattleSystem *battleSys, BattleContext SetupSideEffect(battleCtx, effect, SIDE_EFFECT_TYPE_INDIRECT); if (battleCtx->battleMons[battleCtx->sideEffectMon].curHP - && Battler_SubstituteWasHit(battleCtx, battleCtx->sideEffectMon) == FALSE - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE) { + && Battler_SubstituteWasHit(battleCtx, battleCtx->sideEffectMon) == FALSE + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE) { result = TRUE; } } @@ -1620,7 +1616,7 @@ int BattleSystem_Defender(BattleSystem *battleSys, BattleContext *battleCtx, int if (battleCtx->battleMons[battler].curHP != 0) { battlerData = BattleSystem_BattlerData(battleSys, battler); if (((attackerType & BATTLER_TYPE_SOLO_ENEMY) && (Battler_Type(battlerData) & BATTLER_TYPE_SOLO_ENEMY) == FALSE) - || ((attackerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) && (Battler_Type(battlerData) & BATTLER_TYPE_SOLO_ENEMY)) { + || ((attackerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE) && (Battler_Type(battlerData) & BATTLER_TYPE_SOLO_ENEMY)) { defender = battler; break; } @@ -1649,7 +1645,7 @@ int BattleSystem_Defender(BattleSystem *battleSys, BattleContext *battleCtx, int } } else if (range == RANGE_USER_OR_ALLY && randomize == TRUE) { // e.g., Acupressure if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) - && BattleSystem_RandNext(battleSys) % 2 == 0) { + && BattleSystem_RandNext(battleSys) % 2 == 0) { defender = BattleSystem_Partner(battleSys, attacker); if (battleCtx->battleMons[defender].curHP == 0) { defender = attacker; @@ -1662,9 +1658,9 @@ int BattleSystem_Defender(BattleSystem *battleSys, BattleContext *battleCtx, int } else if (range == RANGE_OPPONENT_SIDE) { // e.g., Spikes, Stealth Rock defender = BattleSystem_RandomOpponent(battleSys, battleCtx, attacker); } else if (range == RANGE_USER // e.g., Swords Dance - || range == RANGE_USER_SIDE // e.g., Light Screen, Reflect - || range == RANGE_SINGLE_TARGET_SPECIAL // e.g., Counter, Mirror Coat - || range == RANGE_FIELD) { // e.g., Sunny Day + || range == RANGE_USER_SIDE // e.g., Light Screen, Reflect + || range == RANGE_SINGLE_TARGET_SPECIAL // e.g., Counter, Mirror Coat + || range == RANGE_FIELD) { // e.g., Sunny Day defender = attacker; } else if (range == RANGE_ALLY) { // e.g., Helping Hand if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { @@ -1691,11 +1687,11 @@ int BattleSystem_Defender(BattleSystem *battleSys, BattleContext *battleCtx, int if (battleType & BATTLE_TYPE_DOUBLES) { if (battleCtx->sideConditions[enemySide].followMe - && battleCtx->battleMons[battleCtx->sideConditions[enemySide].followMeUser].curHP) { + && battleCtx->battleMons[battleCtx->sideConditions[enemySide].followMeUser].curHP) { // If Follow Me is active and the user is still alive, re-point all targets toward them defender = battleCtx->sideConditions[enemySide].followMeUser; } else if (battleCtx->battleMons[opponents[0]].curHP - && battleCtx->battleMons[opponents[1]].curHP) { + && battleCtx->battleMons[opponents[1]].curHP) { defender = opponents[BattleSystem_RandNext(battleSys) & 1]; } else if (battleCtx->battleMons[opponents[0]].curHP) { defender = opponents[0]; @@ -1711,7 +1707,7 @@ int BattleSystem_Defender(BattleSystem *battleSys, BattleContext *battleCtx, int int maxBattlers = BattleSystem_MaxBattlers(battleSys); if (battleCtx->sideConditions[enemySide].followMe - && battleCtx->battleMons[battleCtx->sideConditions[enemySide].followMeUser].curHP) { + && battleCtx->battleMons[battleCtx->sideConditions[enemySide].followMeUser].curHP) { // If Follow Me is active and the user is still alive, re-point all targets toward them defender = battleCtx->sideConditions[enemySide].followMeUser; } else if (battleCtx->battleMons[target].curHP) { @@ -1733,8 +1729,8 @@ void BattleSystem_CheckRedirectionAbilities(BattleSystem *battleSys, BattleConte int battler, moveType; // must declare these first to match if (battleCtx->defender == BATTLER_NONE - || Battler_Ability(battleCtx, attacker) == ABILITY_NORMALIZE - || Battler_Ability(battleCtx, attacker) == ABILITY_MOLD_BREAKER) { + || Battler_Ability(battleCtx, attacker) == ABILITY_NORMALIZE + || Battler_Ability(battleCtx, attacker) == ABILITY_MOLD_BREAKER) { return; } @@ -1750,15 +1746,15 @@ void BattleSystem_CheckRedirectionAbilities(BattleSystem *battleSys, BattleConte int maxBattlers = BattleSystem_MaxBattlers(battleSys); if (moveType == TYPE_ELECTRIC - && (MOVE_DATA(move).range == RANGE_SINGLE_TARGET || MOVE_DATA(move).range == RANGE_RANDOM_OPPONENT) - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE - && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_EXCEPT_ME, attacker, ABILITY_LIGHTNING_ROD)) { + && (MOVE_DATA(move).range == RANGE_SINGLE_TARGET || MOVE_DATA(move).range == RANGE_RANDOM_OPPONENT) + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE + && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_EXCEPT_ME, attacker, ABILITY_LIGHTNING_ROD)) { for (int i = 0; i < maxBattlers; i++) { battler = battleCtx->monSpeedOrder[i]; if (Battler_Ability(battleCtx, battler) == ABILITY_LIGHTNING_ROD - && battleCtx->battleMons[battler].curHP - && attacker != battler) { + && battleCtx->battleMons[battler].curHP + && attacker != battler) { break; } } @@ -1768,15 +1764,15 @@ void BattleSystem_CheckRedirectionAbilities(BattleSystem *battleSys, BattleConte battleCtx->defender = battler; } } else if (moveType == TYPE_WATER - && (MOVE_DATA(move).range == RANGE_SINGLE_TARGET || MOVE_DATA(move).range == RANGE_RANDOM_OPPONENT) - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE - && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_EXCEPT_ME, attacker, ABILITY_STORM_DRAIN)) { + && (MOVE_DATA(move).range == RANGE_SINGLE_TARGET || MOVE_DATA(move).range == RANGE_RANDOM_OPPONENT) + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE + && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_EXCEPT_ME, attacker, ABILITY_STORM_DRAIN)) { for (int i = 0; i < maxBattlers; i++) { battler = battleCtx->monSpeedOrder[i]; if (Battler_Ability(battleCtx, battler) == ABILITY_STORM_DRAIN - && battleCtx->battleMons[battler].curHP - && attacker != battler) { + && battleCtx->battleMons[battler].curHP + && attacker != battler) { break; } } @@ -1865,7 +1861,7 @@ enum { CHECK_TRMSG_ACTIVE_BATTLER_HALF_HP, CHECK_TRMSG_LAST_BATTLER, CHECK_TRMSG_LAST_BATTLER_HALF_HP, - + CHECK_TRMSG_END, }; @@ -1892,8 +1888,8 @@ BOOL BattleSystem_CheckTrainerMessage(BattleSystem *battleSys, BattleContext *ba switch (state) { case CHECK_TRMSG_FIRST_DAMAGE: if (battleCtx->battleMons[BATTLER_THEM].timesDamaged == 1 - && (battleCtx->battleStatusMask2 & SYSCTL_FIRST_DAMAGE_MSG_SHOWN) == FALSE - && TrainerData_HasMessageType(trID, TRMSG_FIRST_DAMAGE, HEAP_ID_BATTLE)) { + && (battleCtx->battleStatusMask2 & SYSCTL_FIRST_DAMAGE_MSG_SHOWN) == FALSE + && TrainerData_HasMessageType(trID, TRMSG_FIRST_DAMAGE, HEAP_ID_BATTLE)) { battleCtx->battleStatusMask2 |= SYSCTL_FIRST_DAMAGE_MSG_SHOWN; battleCtx->msgTemp = TRMSG_FIRST_DAMAGE; return TRUE; @@ -1904,8 +1900,8 @@ BOOL BattleSystem_CheckTrainerMessage(BattleSystem *battleSys, BattleContext *ba case CHECK_TRMSG_ACTIVE_BATTLER_HALF_HP: if ((battleCtx->battleMons[BATTLER_THEM].trainerMessageFlags & TRMSG_ACTIVE_BATTLER_HALF_HP_FLAG) == FALSE - && battleCtx->battleMons[BATTLER_THEM].curHP <= battleCtx->battleMons[BATTLER_THEM].maxHP / 2 - && TrainerData_HasMessageType(trID, TRMSG_ACTIVE_BATTLER_HALF_HP, HEAP_ID_BATTLE)) { + && battleCtx->battleMons[BATTLER_THEM].curHP <= battleCtx->battleMons[BATTLER_THEM].maxHP / 2 + && TrainerData_HasMessageType(trID, TRMSG_ACTIVE_BATTLER_HALF_HP, HEAP_ID_BATTLE)) { battleCtx->battleMons[BATTLER_THEM].trainerMessageFlags |= TRMSG_ACTIVE_BATTLER_HALF_HP_FLAG; battleCtx->msgTemp = TRMSG_ACTIVE_BATTLER_HALF_HP; return TRUE; @@ -1951,8 +1947,8 @@ BOOL BattleSystem_CheckTrainerMessage(BattleSystem *battleSys, BattleContext *ba } if (alive == 1 - && battleCtx->battleMons[BATTLER_THEM].curHP <= battleCtx->battleMons[BATTLER_THEM].maxHP / 2 - && TrainerData_HasMessageType(trID, TRMSG_LAST_BATTLER_HALF_HP, HEAP_ID_BATTLE)) { + && battleCtx->battleMons[BATTLER_THEM].curHP <= battleCtx->battleMons[BATTLER_THEM].maxHP / 2 + && TrainerData_HasMessageType(trID, TRMSG_LAST_BATTLER_HALF_HP, HEAP_ID_BATTLE)) { battleCtx->battleMons[BATTLER_THEM].trainerMessageFlags |= TRMSG_LAST_BATTLER_HALF_HP_FLAG; battleCtx->msgTemp = TRMSG_LAST_BATTLER_HALF_HP; return TRUE; @@ -2055,12 +2051,12 @@ void BattleSystem_UpdateAfterSwitch(BattleSystem *battleSys, BattleContext *batt // Clear any Mean Look or Lock On effects from other active battlers for (i = 0; i < maxBattlers; i++) { if ((battleCtx->battleMons[i].statusVolatile & VOLATILE_CONDITION_MEAN_LOOK) - && (battleCtx->battleMons[i].moveEffectsData.meanLookTarget == battler)) { + && (battleCtx->battleMons[i].moveEffectsData.meanLookTarget == battler)) { battleCtx->battleMons[i].statusVolatile &= ~VOLATILE_CONDITION_MEAN_LOOK; } if ((battleCtx->battleMons[i].moveEffectsMask & MOVE_EFFECT_LOCK_ON) - && (battleCtx->battleMons[i].moveEffectsData.lockOnTarget == battler)) { + && (battleCtx->battleMons[i].moveEffectsData.lockOnTarget == battler)) { battleCtx->battleMons[i].moveEffectsMask &= ~MOVE_EFFECT_LOCK_ON; battleCtx->battleMons[i].moveEffectsData.lockOnTarget = 0; } @@ -2076,7 +2072,7 @@ void BattleSystem_UpdateAfterSwitch(BattleSystem *battleSys, BattleContext *batt for (i = 0; i < maxBattlers; i++) { if ((battleCtx->battleMons[i].moveEffectsMask & MOVE_EFFECT_LOCK_ON) - && battleCtx->battleMons[i].moveEffectsData.lockOnTarget == battler) { + && battleCtx->battleMons[i].moveEffectsData.lockOnTarget == battler) { // When transferring Lock On due to Baton Pass, its effect timer is refreshed battleCtx->battleMons[i].moveEffectsMask &= ~MOVE_EFFECT_LOCK_ON; battleCtx->battleMons[i].moveEffectsMask |= MOVE_EFFECT_LOCK_ON_INITIAL_DURATION; @@ -2091,7 +2087,7 @@ void BattleSystem_UpdateAfterSwitch(BattleSystem *battleSys, BattleContext *batt } if ((battleCtx->battleMons[i].statusVolatile & VOLATILE_CONDITION_BIND) - && battleCtx->battleMons[i].moveEffectsData.bindTarget == battler) { + && battleCtx->battleMons[i].moveEffectsData.bindTarget == battler) { battleCtx->battleMons[i].statusVolatile &= ~VOLATILE_CONDITION_BIND; } } @@ -2167,7 +2163,7 @@ void BattleSystem_CleanupFaintedMon(BattleSystem *battleSys, BattleContext *batt // Negate Mean Look, Attract, and Bind flags for (i = 0; i < maxBattlers; i++) { if ((battleCtx->battleMons[i].statusVolatile & VOLATILE_CONDITION_MEAN_LOOK) - && battleCtx->battleMons[i].moveEffectsData.meanLookTarget == battler) { + && battleCtx->battleMons[i].moveEffectsData.meanLookTarget == battler) { battleCtx->battleMons[i].statusVolatile &= ~VOLATILE_CONDITION_MEAN_LOOK; } @@ -2176,7 +2172,7 @@ void BattleSystem_CleanupFaintedMon(BattleSystem *battleSys, BattleContext *batt } if ((battleCtx->battleMons[i].statusVolatile & VOLATILE_CONDITION_BIND) - && battleCtx->battleMons[i].moveEffectsData.bindTarget == battler) { + && battleCtx->battleMons[i].moveEffectsData.bindTarget == battler) { battleCtx->battleMons[i].statusVolatile &= ~VOLATILE_CONDITION_BIND; } } @@ -2237,12 +2233,12 @@ void BattleSystem_SetupNextTurn(BattleSystem *battleSys, BattleContext *battleCt } if ((battleCtx->battleMons[i].status & MON_CONDITION_SLEEP) - && (battleCtx->battleMons[i].statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED)) { + && (battleCtx->battleMons[i].statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED)) { Battler_UnlockMoveChoice(battleSys, battleCtx, i); } if ((battleCtx->battleMons[i].status & MON_CONDITION_SLEEP) - && (battleCtx->battleMons[i].statusVolatile & VOLATILE_CONDITION_THRASH)) { + && (battleCtx->battleMons[i].statusVolatile & VOLATILE_CONDITION_THRASH)) { battleCtx->battleMons[i].statusVolatile &= ~VOLATILE_CONDITION_THRASH; } } @@ -2257,58 +2253,58 @@ int BattleSystem_CheckInvalidMoves(BattleSystem *battleSys, BattleContext *battl for (int i = 0; i < LEARNED_MOVES_MAX; i++) { if (battleCtx->battleMons[battler].moves[i] == MOVE_NONE - && (opMask & CHECK_INVALID_NO_MOVE)) { + && (opMask & CHECK_INVALID_NO_MOVE)) { invalidMoves |= FlagIndex(i); } if (battleCtx->battleMons[battler].ppCur[i] == 0 - && (opMask & CHECK_INVALID_NO_PP)) { + && (opMask & CHECK_INVALID_NO_PP)) { invalidMoves |= FlagIndex(i); } if (battleCtx->battleMons[battler].moves[i] == battleCtx->battleMons[battler].moveEffectsData.disabledMove - && (opMask & CHECK_INVALID_DISABLED)) { + && (opMask & CHECK_INVALID_DISABLED)) { invalidMoves |= FlagIndex(i); } if (battleCtx->battleMons[battler].moves[i] == battleCtx->movePrevByBattler[battler] - && (opMask & CHECK_INVALID_TORMENTED) - && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_TORMENT)) { + && (opMask & CHECK_INVALID_TORMENTED) + && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_TORMENT)) { invalidMoves |= FlagIndex(i); } if (battleCtx->battleMons[battler].moveEffectsData.tauntedTurns - && (opMask & CHECK_INVALID_TAUNTED) - && MOVE_DATA(battleCtx->battleMons[battler].moves[i]).power == 0) { + && (opMask & CHECK_INVALID_TAUNTED) + && MOVE_DATA(battleCtx->battleMons[battler].moves[i]).power == 0) { invalidMoves |= FlagIndex(i); } if (Move_Imprisoned(battleSys, battleCtx, battler, battleCtx->battleMons[battler].moves[i]) - && (opMask & CHECK_INVALID_IMPRISONED)) { + && (opMask & CHECK_INVALID_IMPRISONED)) { invalidMoves |= FlagIndex(i); } if (Move_FailsInHighGravity(battleSys, battleCtx, battler, battleCtx->battleMons[battler].moves[i]) - && (opMask & CHECK_INVALID_GRAVITY)) { + && (opMask & CHECK_INVALID_GRAVITY)) { invalidMoves |= FlagIndex(i); } if (Move_HealBlocked(battleSys, battleCtx, battler, battleCtx->battleMons[battler].moves[i]) - && (opMask & CHECK_INVALID_HEAL_BLOCK)) { + && (opMask & CHECK_INVALID_HEAL_BLOCK)) { invalidMoves |= FlagIndex(i); } if (battleCtx->battleMons[battler].moveEffectsData.encoredMove - && battleCtx->battleMons[battler].moveEffectsData.encoredMove != battleCtx->battleMons[battler].moves[i]) { + && battleCtx->battleMons[battler].moveEffectsData.encoredMove != battleCtx->battleMons[battler].moves[i]) { invalidMoves |= FlagIndex(i); } if ((itemEffect == HOLD_EFFECT_CHOICE_ATK || itemEffect == HOLD_EFFECT_CHOICE_SPEED || itemEffect == HOLD_EFFECT_CHOICE_SPATK) - && (opMask & CHECK_INVALID_CHOICE_ITEM)) { + && (opMask & CHECK_INVALID_CHOICE_ITEM)) { if (Battler_SlotForMove(&battleCtx->battleMons[battler], battleCtx->battleMons[battler].moveEffectsData.choiceLockedMove) == LEARNED_MOVES_MAX) { battleCtx->battleMons[battler].moveEffectsData.choiceLockedMove = MOVE_NONE; } else if (battleCtx->battleMons[battler].moveEffectsData.choiceLockedMove - && battleCtx->battleMons[battler].moveEffectsData.choiceLockedMove != battleCtx->battleMons[battler].moves[i]) { + && battleCtx->battleMons[battler].moveEffectsData.choiceLockedMove != battleCtx->battleMons[battler].moves[i]) { invalidMoves |= FlagIndex(i); } } @@ -2389,12 +2385,13 @@ int Battler_SlotForMove(BattleMon *mon, u16 move) * @brief The type matchup table. This lists the matchups which are deemed to * have a Super Effective, Not Very Effective, or Immune result. The table can * be read as such: - * + * * attacking type, defending type, matchup multiplier - * + * * The matchup multiplier is assumed to be divided by 10 at a later stage for * any computations which make use of it (hence the values 5 and 20). */ +// clang-format off static const u8 sTypeMatchupMultipliers[][3] = { { TYPE_NORMAL, TYPE_ROCK, TYPE_MULTI_NOT_VERY_EFF }, { TYPE_NORMAL, TYPE_STEEL, TYPE_MULTI_NOT_VERY_EFF }, @@ -2505,22 +2502,23 @@ static const u8 sTypeMatchupMultipliers[][3] = { { TYPE_STEEL, TYPE_ROCK, TYPE_MULTI_SUPER_EFF }, { TYPE_STEEL, TYPE_STEEL, TYPE_MULTI_NOT_VERY_EFF }, - { 0xFE, 0xFE, TYPE_MULTI_IMMUNE }, + { 0xFE, 0xFE, TYPE_MULTI_IMMUNE }, // These values are separated from the remainder of the table to support // the Foresight effect, which removes these immunities from consideration. { TYPE_NORMAL, TYPE_GHOST, TYPE_MULTI_IMMUNE }, { TYPE_FIGHTING, TYPE_GHOST, TYPE_MULTI_IMMUNE }, - { 0xFF, 0xFF, TYPE_MULTI_IMMUNE }, + { 0xFF, 0xFF, TYPE_MULTI_IMMUNE }, }; +// clang-format on /** * @brief Check if the basic type multiplier applies. - * - * @param battleCtx - * @param attacker - * @param defender + * + * @param battleCtx + * @param attacker + * @param defender * @param chartEntry Index of the entry into the type-chart * @return TRUE if there are no active effects to override the given chart-entry, * FALSE if the chart-entry should be overriden @@ -2531,25 +2529,25 @@ static BOOL BasicTypeMulApplies(BattleContext *battleCtx, int attacker, int defe BOOL result = TRUE; if ((itemEffect == HOLD_EFFECT_SPEED_DOWN_GROUNDED || (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_INGRAIN)) - && sTypeMatchupMultipliers[chartEntry][1] == TYPE_FLYING - && sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_IMMUNE) { + && sTypeMatchupMultipliers[chartEntry][1] == TYPE_FLYING + && sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_IMMUNE) { result = FALSE; } if (battleCtx->turnFlags[defender].roosting - && sTypeMatchupMultipliers[chartEntry][1] == TYPE_FLYING) { + && sTypeMatchupMultipliers[chartEntry][1] == TYPE_FLYING) { result = FALSE; } if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_GRAVITY) - && sTypeMatchupMultipliers[chartEntry][1] == TYPE_FLYING - && sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_IMMUNE) { + && sTypeMatchupMultipliers[chartEntry][1] == TYPE_FLYING + && sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_IMMUNE) { result = FALSE; } if ((battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_MIRACLE_EYE) - && sTypeMatchupMultipliers[chartEntry][1] == TYPE_DARK - && sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_IMMUNE) { + && sTypeMatchupMultipliers[chartEntry][1] == TYPE_DARK + && sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_IMMUNE) { result = FALSE; } @@ -2597,13 +2595,13 @@ int BattleSystem_ApplyTypeChart(BattleSystem *battleSys, BattleContext *battleCt } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_LEVITATE) == TRUE - && moveType == TYPE_GROUND - && defenderItemEffect != HOLD_EFFECT_SPEED_DOWN_GROUNDED) { + && moveType == TYPE_GROUND + && defenderItemEffect != HOLD_EFFECT_SPEED_DOWN_GROUNDED) { *moveStatusMask |= MOVE_STATUS_LEVITATED; } else if (battleCtx->battleMons[defender].moveEffectsData.magnetRiseTurns - && (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_INGRAIN) == FALSE - && moveType == TYPE_GROUND - && defenderItemEffect != HOLD_EFFECT_SPEED_DOWN_GROUNDED) { + && (battleCtx->battleMons[defender].moveEffectsMask & MOVE_EFFECT_INGRAIN) == FALSE + && moveType == TYPE_GROUND + && defenderItemEffect != HOLD_EFFECT_SPEED_DOWN_GROUNDED) { *moveStatusMask |= MOVE_STATUS_MAGNET_RISE; } else { chartEntry = 0; @@ -2612,7 +2610,7 @@ int BattleSystem_ApplyTypeChart(BattleSystem *battleSys, BattleContext *battleCt if (sTypeMatchupMultipliers[chartEntry][0] == 0xFE) { // The Ghost-type immunities are listed separately and ignored as a batch if ((battleCtx->battleMons[defender].statusVolatile & VOLATILE_CONDITION_FORESIGHT) - || Battler_Ability(battleCtx, attacker) == ABILITY_SCRAPPY) { + || Battler_Ability(battleCtx, attacker) == ABILITY_SCRAPPY) { break; } else { chartEntry++; @@ -2622,7 +2620,7 @@ int BattleSystem_ApplyTypeChart(BattleSystem *battleSys, BattleContext *battleCt if (sTypeMatchupMultipliers[chartEntry][0] == moveType) { if (sTypeMatchupMultipliers[chartEntry][1] == BattleMon_Get(battleCtx, defender, BATTLEMON_TYPE_1, NULL) - && BasicTypeMulApplies(battleCtx, attacker, defender, chartEntry) == TRUE) { + && BasicTypeMulApplies(battleCtx, attacker, defender, chartEntry) == TRUE) { damage = ApplyTypeMultiplier(battleCtx, attacker, sTypeMatchupMultipliers[chartEntry][2], damage, movePower, moveStatusMask); if (sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_SUPER_EFF) { @@ -2631,8 +2629,8 @@ int BattleSystem_ApplyTypeChart(BattleSystem *battleSys, BattleContext *battleCt } if (sTypeMatchupMultipliers[chartEntry][1] == BattleMon_Get(battleCtx, defender, BATTLEMON_TYPE_2, NULL) - && BattleMon_Get(battleCtx, defender, BATTLEMON_TYPE_1, NULL) != BattleMon_Get(battleCtx, defender, BATTLEMON_TYPE_2, NULL) - && BasicTypeMulApplies(battleCtx, attacker, defender, chartEntry) == TRUE) { + && BattleMon_Get(battleCtx, defender, BATTLEMON_TYPE_1, NULL) != BattleMon_Get(battleCtx, defender, BATTLEMON_TYPE_2, NULL) + && BasicTypeMulApplies(battleCtx, attacker, defender, chartEntry) == TRUE) { damage = ApplyTypeMultiplier(battleCtx, attacker, sTypeMatchupMultipliers[chartEntry][2], damage, movePower, moveStatusMask); if (sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_SUPER_EFF) { @@ -2646,16 +2644,16 @@ int BattleSystem_ApplyTypeChart(BattleSystem *battleSys, BattleContext *battleCt } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_WONDER_GUARD) == TRUE - && MoveIsOnDamagingTurn(battleCtx, move) - && ((*moveStatusMask & MOVE_STATUS_SUPER_EFFECTIVE) == FALSE - || (*moveStatusMask & MOVE_STATUS_BASIC_EFFECTIVENESS) == MOVE_STATUS_BASIC_EFFECTIVENESS) - && movePower) { + && MoveIsOnDamagingTurn(battleCtx, move) + && ((*moveStatusMask & MOVE_STATUS_SUPER_EFFECTIVE) == FALSE + || (*moveStatusMask & MOVE_STATUS_BASIC_EFFECTIVENESS) == MOVE_STATUS_BASIC_EFFECTIVENESS) + && movePower) { *moveStatusMask |= MOVE_STATUS_WONDER_GUARD; } else if ((battleCtx->battleStatusMask & SYSCTL_IGNORE_TYPE_CHECKS) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_IGNORE_IMMUNITIES) == FALSE) { + && (battleCtx->battleStatusMask & SYSCTL_IGNORE_IMMUNITIES) == FALSE) { if ((*moveStatusMask & MOVE_STATUS_SUPER_EFFECTIVE) && movePower) { if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_FILTER) == TRUE - || Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_SOLID_ROCK) == TRUE) { + || Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_SOLID_ROCK) == TRUE) { damage = BattleSystem_Divide(damage * 3, 4); } @@ -2695,10 +2693,10 @@ void BattleSystem_CalcEffectiveness(BattleContext *battleCtx, int move, int inTy } if (attackerAbility != ABILITY_MOLD_BREAKER - && defenderAbility == ABILITY_LEVITATE - && moveType == TYPE_GROUND - && (battleCtx->fieldConditionsMask & FIELD_CONDITION_GRAVITY) == FALSE - && defenderItemEffect != HOLD_EFFECT_SPEED_DOWN_GROUNDED) { + && defenderAbility == ABILITY_LEVITATE + && moveType == TYPE_GROUND + && (battleCtx->fieldConditionsMask & FIELD_CONDITION_GRAVITY) == FALSE + && defenderItemEffect != HOLD_EFFECT_SPEED_DOWN_GROUNDED) { *moveStatusMask |= MOVE_STATUS_INEFFECTIVE; } else { chartEntry = 0; @@ -2715,13 +2713,13 @@ void BattleSystem_CalcEffectiveness(BattleContext *battleCtx, int move, int inTy if (sTypeMatchupMultipliers[chartEntry][0] == moveType) { if (sTypeMatchupMultipliers[chartEntry][1] == defenderType1 - && NoImmunityOverrides(battleCtx, defenderItemEffect, chartEntry) == TRUE) { + && NoImmunityOverrides(battleCtx, defenderItemEffect, chartEntry) == TRUE) { UpateMoveStatusForTypeMul(sTypeMatchupMultipliers[chartEntry][2], moveStatusMask); } if (sTypeMatchupMultipliers[chartEntry][1] == defenderType2 - && defenderType1 != defenderType2 - && NoImmunityOverrides(battleCtx, defenderItemEffect, chartEntry) == TRUE) { + && defenderType1 != defenderType2 + && NoImmunityOverrides(battleCtx, defenderItemEffect, chartEntry) == TRUE) { UpateMoveStatusForTypeMul(sTypeMatchupMultipliers[chartEntry][2], moveStatusMask); } } @@ -2731,10 +2729,10 @@ void BattleSystem_CalcEffectiveness(BattleContext *battleCtx, int move, int inTy } if (attackerAbility != ABILITY_MOLD_BREAKER - && defenderAbility == ABILITY_WONDER_GUARD - && MoveIsOnDamagingTurn(battleCtx, move) - && ((*moveStatusMask & MOVE_STATUS_SUPER_EFFECTIVE) == FALSE - || (*moveStatusMask & MOVE_STATUS_BASIC_EFFECTIVENESS) == MOVE_STATUS_BASIC_EFFECTIVENESS)) { + && defenderAbility == ABILITY_WONDER_GUARD + && MoveIsOnDamagingTurn(battleCtx, move) + && ((*moveStatusMask & MOVE_STATUS_SUPER_EFFECTIVE) == FALSE + || (*moveStatusMask & MOVE_STATUS_BASIC_EFFECTIVENESS) == MOVE_STATUS_BASIC_EFFECTIVENESS)) { *moveStatusMask |= MOVE_STATUS_INEFFECTIVE; } @@ -2743,28 +2741,28 @@ void BattleSystem_CalcEffectiveness(BattleContext *battleCtx, int move, int inTy /** * @brief Determines if there are no immunity-overriding effects in play. - * + * * This only checks for the basic immunity-overriding effects: Iron Ball * and Gravity for Ground-type attacks against Flying-type Pokemon. - * - * @param battleCtx - * @param itemEffect - * @param chartEntry - * @return TRUE if immunities should be respected, FALSE if not. + * + * @param battleCtx + * @param itemEffect + * @param chartEntry + * @return TRUE if immunities should be respected, FALSE if not. */ static BOOL NoImmunityOverrides(BattleContext *battleCtx, int itemEffect, int chartEntry) { BOOL result = TRUE; if (itemEffect == HOLD_EFFECT_SPEED_DOWN_GROUNDED - && sTypeMatchupMultipliers[chartEntry][1] == TYPE_FLYING - && sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_IMMUNE) { + && sTypeMatchupMultipliers[chartEntry][1] == TYPE_FLYING + && sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_IMMUNE) { result = FALSE; } if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_GRAVITY) - && sTypeMatchupMultipliers[chartEntry][1] == TYPE_FLYING - && sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_IMMUNE) { + && sTypeMatchupMultipliers[chartEntry][1] == TYPE_FLYING + && sTypeMatchupMultipliers[chartEntry][2] == TYPE_MULTI_IMMUNE) { result = FALSE; } @@ -2773,9 +2771,9 @@ static BOOL NoImmunityOverrides(BattleContext *battleCtx, int itemEffect, int ch /** * @brief Update the given move status mask according to a type multiplier. - * - * @param mul - * @param moveStatusMask + * + * @param mul + * @param moveStatusMask */ static void UpateMoveStatusForTypeMul(int mul, u32 *moveStatusMask) { @@ -2807,14 +2805,14 @@ static void UpateMoveStatusForTypeMul(int mul, u32 *moveStatusMask) BOOL BattleContext_MoveFailed(BattleContext *battleCtx, int battler) { if (battleCtx->moveFailFlags[battler].paralyzed - || battleCtx->moveFailFlags[battler].noEffect - || battleCtx->moveFailFlags[battler].imprisoned - || battleCtx->moveFailFlags[battler].infatuated - || battleCtx->moveFailFlags[battler].disabled - || battleCtx->moveFailFlags[battler].taunted - || battleCtx->moveFailFlags[battler].flinched - || battleCtx->moveFailFlags[battler].gravity - || battleCtx->moveFailFlags[battler].confused) { + || battleCtx->moveFailFlags[battler].noEffect + || battleCtx->moveFailFlags[battler].imprisoned + || battleCtx->moveFailFlags[battler].infatuated + || battleCtx->moveFailFlags[battler].disabled + || battleCtx->moveFailFlags[battler].taunted + || battleCtx->moveFailFlags[battler].flinched + || battleCtx->moveFailFlags[battler].gravity + || battleCtx->moveFailFlags[battler].confused) { return TRUE; } @@ -2825,7 +2823,7 @@ u8 BattleSystem_CountAliveBattlers(BattleSystem *battleSys, BattleContext *battl { u8 count = 0; int maxBattlers = BattleSystem_MaxBattlers(battleSys); - + // no clue why they used a switch statement for this, but changing it to an if-else doesn't match switch (sameSide) { case FALSE: @@ -2839,7 +2837,7 @@ u8 BattleSystem_CountAliveBattlers(BattleSystem *battleSys, BattleContext *battl case TRUE: for (int i = 0; i < maxBattlers; i++) { if (Battler_Side(battleSys, i) == Battler_Side(battleSys, defender) - && battleCtx->battleMons[i].curHP) { + && battleCtx->battleMons[i].curHP) { count++; } } @@ -2859,7 +2857,7 @@ u16 Battler_SelectedMove(BattleContext *battleCtx, int battler) u16 move = MOVE_NONE; if (battleCtx->battlerActions[battler][BATTLE_ACTION_SELECTED_COMMAND] == PLAYER_INPUT_FIGHT - && battleCtx->battlerActions[battler][BATTLE_ACTION_TEMP_VALUE]) { + && battleCtx->battlerActions[battler][BATTLE_ACTION_TEMP_VALUE]) { move = battleCtx->battleMons[battler].moves[battleCtx->battlerActions[battler][BATTLE_ACTION_TEMP_VALUE] - 1]; } @@ -2876,17 +2874,17 @@ int BattleSystem_CountAbility(BattleSystem *battleSys, BattleContext *battleCtx, case COUNT_ALL_BATTLERS_OUR_SIDE: for (i = 0; i < maxBattlers; i++) { if (Battler_Side(battleSys, i) == Battler_Side(battleSys, battler) - && Battler_Ability(battleCtx, i) == ability) { + && Battler_Ability(battleCtx, i) == ability) { result++; } } break; - + case COUNT_ALIVE_BATTLERS_OUR_SIDE: for (i = 0; i < maxBattlers; i++) { if (Battler_Side(battleSys, i) == Battler_Side(battleSys, battler) - && battleCtx->battleMons[i].curHP - && Battler_Ability(battleCtx, i) == ability) { + && battleCtx->battleMons[i].curHP + && Battler_Ability(battleCtx, i) == ability) { result++; } } @@ -2895,7 +2893,7 @@ int BattleSystem_CountAbility(BattleSystem *battleSys, BattleContext *battleCtx, case COUNT_ALL_BATTLERS_THEIR_SIDE: for (i = 0; i < maxBattlers; i++) { if (Battler_Side(battleSys, i) != Battler_Side(battleSys, battler) - && Battler_Ability(battleCtx, i) == ability) { + && Battler_Ability(battleCtx, i) == ability) { result++; } } @@ -2904,8 +2902,8 @@ int BattleSystem_CountAbility(BattleSystem *battleSys, BattleContext *battleCtx, case COUNT_ALIVE_BATTLERS_THEIR_SIDE: for (i = 0; i < maxBattlers; i++) { if (Battler_Side(battleSys, i) != Battler_Side(battleSys, battler) - && battleCtx->battleMons[i].curHP - && Battler_Ability(battleCtx, i) == ability) { + && battleCtx->battleMons[i].curHP + && Battler_Ability(battleCtx, i) == ability) { result++; } } @@ -2914,8 +2912,8 @@ int BattleSystem_CountAbility(BattleSystem *battleSys, BattleContext *battleCtx, case COUNT_ALIVE_BATTLERS_THEIR_SIDE_FLAG: for (i = 0; i < maxBattlers; i++) { if (Battler_Side(battleSys, i) != Battler_Side(battleSys, battler) - && battleCtx->battleMons[i].curHP - && Battler_Ability(battleCtx, i) == ability) { + && battleCtx->battleMons[i].curHP + && Battler_Ability(battleCtx, i) == ability) { result |= FlagIndex(i); } } @@ -2932,7 +2930,7 @@ int BattleSystem_CountAbility(BattleSystem *battleSys, BattleContext *battleCtx, case COUNT_ALL_BATTLERS_EXCEPT_ME: for (i = 0; i < maxBattlers; i++) { if (i != battler - && Battler_Ability(battleCtx, i) == ability) { + && Battler_Ability(battleCtx, i) == ability) { result++; } } @@ -2941,7 +2939,7 @@ int BattleSystem_CountAbility(BattleSystem *battleSys, BattleContext *battleCtx, case COUNT_ALL_BATTLERS_EXCEPT_ME_RETURN_BATTLER: for (i = 0; i < maxBattlers; i++) { if (i != battler - && Battler_Ability(battleCtx, i) == ability) { + && Battler_Ability(battleCtx, i) == ability) { result = i + 1; break; } @@ -2951,7 +2949,7 @@ int BattleSystem_CountAbility(BattleSystem *battleSys, BattleContext *battleCtx, case COUNT_ALIVE_BATTLERS: for (i = 0; i < maxBattlers; i++) { if (Battler_Ability(battleCtx, i) == ability - && battleCtx->battleMons[i].curHP) { + && battleCtx->battleMons[i].curHP) { result++; } } @@ -2960,8 +2958,8 @@ int BattleSystem_CountAbility(BattleSystem *battleSys, BattleContext *battleCtx, case COUNT_ALIVE_BATTLERS_EXCEPT_ME: for (i = 0; i < maxBattlers; i++) { if (i != battler - && Battler_Ability(battleCtx, i) == ability - && battleCtx->battleMons[i].curHP) { + && Battler_Ability(battleCtx, i) == ability + && battleCtx->battleMons[i].curHP) { result++; } } @@ -3017,7 +3015,7 @@ int BattleSystem_TypeMatchupMultiplier(u8 attackingType, u8 defendingType1, u8 d } if (sTypeMatchupMultipliers[i][1] == defendingType2 - && defendingType1 != defendingType2) { + && defendingType1 != defendingType2) { mul = mul * sTypeMatchupMultipliers[i][2] / 10; } } @@ -3032,12 +3030,12 @@ BOOL Move_IsInvoker(u16 move) { // declaring this as a single return didn't match if (move == MOVE_NONE - || move == MOVE_SLEEP_TALK - || move == MOVE_COPYCAT - || move == MOVE_ASSIST - || move == MOVE_ME_FIRST - || move == MOVE_MIRROR_MOVE - || move == MOVE_METRONOME) { + || move == MOVE_SLEEP_TALK + || move == MOVE_COPYCAT + || move == MOVE_ASSIST + || move == MOVE_ME_FIRST + || move == MOVE_MIRROR_MOVE + || move == MOVE_METRONOME) { return TRUE; } @@ -3055,8 +3053,8 @@ BOOL BattleSystem_CanStealItem(BattleSystem *battleSys, BattleContext *battleCtx int side = Battler_Side(battleSys, battler); if (battleCtx->battleMons[battler].heldItem - && (battleCtx->sideConditions[side].knockedOffItemsMask & FlagIndex(battleCtx->selectedPartySlot[battler])) == FALSE - && Item_IsMail(battleCtx->battleMons[battler].heldItem) == FALSE) { + && (battleCtx->sideConditions[side].knockedOffItemsMask & FlagIndex(battleCtx->selectedPartySlot[battler])) == FALSE + && Item_IsMail(battleCtx->battleMons[battler].heldItem) == FALSE) { result = TRUE; } @@ -3087,20 +3085,20 @@ BOOL BattleSystem_CanWhirlwind(BattleSystem *battleSys, BattleContext *battleCtx u8 Battler_Ability(BattleContext *battleCtx, int battler) { if ((battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_ABILITY_SUPPRESSED) - && battleCtx->battleMons[battler].ability != ABILITY_MULTITYPE) { + && battleCtx->battleMons[battler].ability != ABILITY_MULTITYPE) { return ABILITY_NONE; - } - + } + if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_GRAVITY) - && battleCtx->battleMons[battler].ability == ABILITY_LEVITATE) { + && battleCtx->battleMons[battler].ability == ABILITY_LEVITATE) { return ABILITY_NONE; - } - + } + if ((battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_INGRAIN) - && battleCtx->battleMons[battler].ability == ABILITY_LEVITATE) { + && battleCtx->battleMons[battler].ability == ABILITY_LEVITATE) { return ABILITY_NONE; } - + return battleCtx->battleMons[battler].ability; } @@ -3113,7 +3111,7 @@ BOOL Battler_IgnorableAbility(BattleContext *battleCtx, int attacker, int defend result = TRUE; } } else if (Battler_Ability(battleCtx, defender) == ability - && battleCtx->selfTurnFlags[attacker].moldBreakerActivated == FALSE) { + && battleCtx->selfTurnFlags[attacker].moldBreakerActivated == FALSE) { battleCtx->selfTurnFlags[attacker].moldBreakerActivated = TRUE; battleCtx->battleStatusMask |= SYSCTL_APPLY_MOLD_BREAKER; } @@ -3139,8 +3137,8 @@ BOOL BattleSystem_AnyReplacementMons(BattleSystem *battleSys, BattleContext *bat partySize = BattleSystem_PartyCount(battleSys, battler); if ((battleType & BATTLE_TYPE_2vs2) - || ((battleType & BATTLE_TYPE_TAG) - && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_THEM))) { + || ((battleType & BATTLE_TYPE_TAG) + && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_THEM))) { // have to copy these 4 identical assignments across each branch to match start = 0; end = partySize; @@ -3164,10 +3162,10 @@ BOOL BattleSystem_AnyReplacementMons(BattleSystem *battleSys, BattleContext *bat for (int i = start; i < end; i++) { pokemon = Party_GetPokemonBySlotIndex(party, i); if (Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL) - && Pokemon_GetValue(pokemon, MON_DATA_IS_EGG, NULL) == FALSE - && Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL) - && selectedSlot1 != i - && selectedSlot2 != i) { + && Pokemon_GetValue(pokemon, MON_DATA_IS_EGG, NULL) == FALSE + && Pokemon_GetValue(pokemon, MON_DATA_CURRENT_HP, NULL) + && selectedSlot1 != i + && selectedSlot2 != i) { aliveMons++; } } @@ -3191,8 +3189,8 @@ BOOL Battler_IsTrappedMsg(BattleSystem *battleSys, BattleContext *battleCtx, int itemEffect = Battler_HeldItemEffect(battleCtx, battler); if (itemEffect == HOLD_EFFECT_FLEE - || (battleType & BATTLE_TYPE_NO_EXPERIENCE) - || Battler_Ability(battleCtx, battler) == ABILITY_RUN_AWAY) { + || (battleType & BATTLE_TYPE_NO_EXPERIENCE) + || Battler_Ability(battleCtx, battler) == ABILITY_RUN_AWAY) { return FALSE; } @@ -3200,7 +3198,7 @@ BOOL Battler_IsTrappedMsg(BattleSystem *battleSys, BattleContext *battleCtx, int maxBattlers = BattleSystem_MaxBattlers(battleSys); if ((tmp = BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_EXCEPT_ME, battler, ABILITY_SHADOW_TAG)) - && Battler_Ability(battleCtx, battler) != ABILITY_SHADOW_TAG) { + && Battler_Ability(battleCtx, battler) != ABILITY_SHADOW_TAG) { if (msgOut == NULL) { return TRUE; } @@ -3215,8 +3213,8 @@ BOOL Battler_IsTrappedMsg(BattleSystem *battleSys, BattleContext *battleCtx, int if ((tmp = BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_THEIR_SIDE, battler, ABILITY_ARENA_TRAP))) { if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_GRAVITY) == FALSE && itemEffect != HOLD_EFFECT_SPEED_DOWN_GROUNDED) { if (Battler_Ability(battleCtx, battler) != ABILITY_LEVITATE - && battleCtx->battleMons[battler].moveEffectsData.magnetRiseTurns == 0 - && MON_IS_NOT_TYPE(battler, TYPE_FLYING)) { + && battleCtx->battleMons[battler].moveEffectsData.magnetRiseTurns == 0 + && MON_IS_NOT_TYPE(battler, TYPE_FLYING)) { if (msgOut == NULL) { return TRUE; } @@ -3241,7 +3239,7 @@ BOOL Battler_IsTrappedMsg(BattleSystem *battleSys, BattleContext *battleCtx, int } if ((tmp = BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_THEIR_SIDE, battler, ABILITY_MAGNET_PULL)) - && MON_HAS_TYPE(battler, TYPE_STEEL)) { + && MON_HAS_TYPE(battler, TYPE_STEEL)) { if (msgOut == NULL) { return TRUE; } @@ -3254,7 +3252,7 @@ BOOL Battler_IsTrappedMsg(BattleSystem *battleSys, BattleContext *battleCtx, int } if ((battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_TRAPPED) - || (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_INGRAIN)) { + || (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_INGRAIN)) { if (msgOut == NULL) { return TRUE; } @@ -3293,7 +3291,7 @@ BOOL Battler_CanEscape(BattleSystem *battleSys, BattleContext *battleCtx, int ba } if (result == FALSE) { - BattleIO_IncrementRecord(battleSys, battler, 0, (((70 + 1)) + 27)); + BattleIO_IncrementRecord(battleSys, battler, 0, ((70 + 1) + 27)); } battleCtx->runAttempts++; @@ -3302,12 +3300,12 @@ BOOL Battler_CanEscape(BattleSystem *battleSys, BattleContext *battleCtx, int ba return result; } -BOOL Battler_CheckTruant(BattleContext * battleCtx, int battler) +BOOL Battler_CheckTruant(BattleContext *battleCtx, int battler) { BOOL result = FALSE; if (Battler_Ability(battleCtx, battler) == ABILITY_TRUANT - && battleCtx->battleMons[battler].moveEffectsData.truant != (battleCtx->totalTurns & 1)) { + && battleCtx->battleMons[battler].moveEffectsData.truant != (battleCtx->totalTurns & 1)) { result = TRUE; } @@ -3326,7 +3324,7 @@ BOOL Move_Imprisoned(BattleSystem *battleSys, BattleContext *battleCtx, int batt for (i = 0; i < maxBattlers; i++) { if (side != Battler_Side(battleSys, i) - && (battleCtx->battleMons[i].moveEffectsMask & MOVE_EFFECT_IMPRISON)) { + && (battleCtx->battleMons[i].moveEffectsMask & MOVE_EFFECT_IMPRISON)) { for (j = 0; j < LEARNED_MOVES_MAX; j++) { if (move == battleCtx->battleMons[i].moves[j]) { break; @@ -3446,7 +3444,7 @@ BOOL Move_HealBlocked(BattleSystem *battleSys, BattleContext *battleCtx, int bat void BattleSystem_UpdateLastResort(BattleSystem *battleSys, BattleContext *battleCtx) { if (battleCtx->moveTemp == MOVE_LAST_RESORT - || ATTACKING_MON.moveEffectsData.lastResortCount == 4) { + || ATTACKING_MON.moveEffectsData.lastResortCount == 4) { return; } @@ -3501,25 +3499,25 @@ int BattleSystem_TriggerImmunityAbility(BattleContext *battleCtx, int attacker, } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_VOLT_ABSORB) == TRUE - && moveType == TYPE_ELECTRIC - && attacker != defender) { + && moveType == TYPE_ELECTRIC + && attacker != defender) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[defender].maxHP, 4); subscript = subscript_ability_restores_hp; } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_WATER_ABSORB) == TRUE - && moveType == TYPE_WATER - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE // do not proc on first turn of Dive - && CURRENT_MOVE_DATA.power) { + && moveType == TYPE_WATER + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE // do not proc on first turn of Dive + && CURRENT_MOVE_DATA.power) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[defender].maxHP, 4); subscript = subscript_ability_restores_hp; } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_FLASH_FIRE) == TRUE - && moveType == TYPE_FIRE - && (battleCtx->battleMons[defender].status & MON_CONDITION_FREEZE) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE - && (CURRENT_MOVE_DATA.power || battleCtx->moveCur == MOVE_WILL_O_WISP)) { + && moveType == TYPE_FIRE + && (battleCtx->battleMons[defender].status & MON_CONDITION_FREEZE) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE + && (CURRENT_MOVE_DATA.power || battleCtx->moveCur == MOVE_WILL_O_WISP)) { subscript = subscript_absorb_and_boost_fire_type_moves; } @@ -3533,15 +3531,15 @@ int BattleSystem_TriggerImmunityAbility(BattleContext *battleCtx, int attacker, } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_MOTOR_DRIVE) == TRUE - && moveType == TYPE_ELECTRIC - && attacker != defender) { + && moveType == TYPE_ELECTRIC + && attacker != defender) { subscript = subscript_absorb_and_speed_up_1_stage; } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_DRY_SKIN) == TRUE - && moveType == TYPE_WATER - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE - && CURRENT_MOVE_DATA.power) { + && moveType == TYPE_WATER + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE + && CURRENT_MOVE_DATA.power) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[defender].maxHP, 4); subscript = subscript_ability_restores_hp; } @@ -3557,8 +3555,8 @@ BOOL BattleSystem_TriggerTurnEndAbility(BattleSystem *battleSys, BattleContext * switch (Battler_Ability(battleCtx, battler)) { case ABILITY_SPEED_BOOST: if (battleCtx->battleMons[battler].curHP - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SPEED] < 12 - && battleCtx->battleMons[battler].moveEffectsData.fakeOutTurnNumber != battleCtx->totalTurns + 1) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SPEED] < 12 + && battleCtx->battleMons[battler].moveEffectsData.fakeOutTurnNumber != battleCtx->totalTurns + 1) { battleCtx->sideEffectParam = MOVE_SUBSCRIPT_PTR_SPEED_UP_1_STAGE; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_ABILITY; battleCtx->sideEffectMon = battler; @@ -3569,8 +3567,8 @@ BOOL BattleSystem_TriggerTurnEndAbility(BattleSystem *battleSys, BattleContext * case ABILITY_SHED_SKIN: if ((battleCtx->battleMons[battler].status & MON_CONDITION_ANY) - && battleCtx->battleMons[battler].curHP - && BattleSystem_RandNext(battleSys) % 10 < 3) { + && battleCtx->battleMons[battler].curHP + && BattleSystem_RandNext(battleSys) % 10 < 3) { if (battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) { battleCtx->msgTemp = MSGCOND_SLEEP; } else if (battleCtx->battleMons[battler].status & MON_CONDITION_ANY_POISON) { @@ -3723,11 +3721,11 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battleCtx->msgDefender = ChooseTraceTarget(battleSys, battleCtx, defender1, defender2); if (battleCtx->battleMons[battler].traceAnnounced == FALSE - && battleCtx->msgDefender != BATTLER_NONE - && battleCtx->battleMons[battler].curHP - && battleCtx->battleMons[battler].heldItem != ITEM_GRISEOUS_ORB - && battleCtx->battleMons[battleCtx->msgDefender].curHP - && Battler_Ability(battleCtx, battler) == ABILITY_TRACE) { + && battleCtx->msgDefender != BATTLER_NONE + && battleCtx->battleMons[battler].curHP + && battleCtx->battleMons[battler].heldItem != ITEM_GRISEOUS_ORB + && battleCtx->battleMons[battleCtx->msgDefender].curHP + && Battler_Ability(battleCtx, battler) == ABILITY_TRACE) { battleCtx->battleMons[battler].traceAnnounced = TRUE; battleCtx->msgBattlerTemp = battler; subscript = subscript_trace; @@ -3746,7 +3744,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battler = battleCtx->monSpeedOrder[i]; if (battleCtx->battleMons[battler].weatherAbilityAnnounced == FALSE - && battleCtx->battleMons[battler].curHP) { + && battleCtx->battleMons[battler].curHP) { switch (Battler_Ability(battleCtx, battler)) { case ABILITY_DRIZZLE: battleCtx->battleMons[battler].weatherAbilityAnnounced = TRUE; @@ -3802,8 +3800,8 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battler = battleCtx->monSpeedOrder[i]; if (battleCtx->battleMons[battler].intimidateAnnounced == FALSE - && battleCtx->battleMons[battler].curHP - && Battler_Ability(battleCtx, battler) == ABILITY_INTIMIDATE) { + && battleCtx->battleMons[battler].curHP + && Battler_Ability(battleCtx, battler) == ABILITY_INTIMIDATE) { battleCtx->battleMons[battler].intimidateAnnounced = TRUE; battleCtx->msgBattlerTemp = battler; subscript = subscript_intimidate; @@ -3822,21 +3820,21 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battler = battleCtx->monSpeedOrder[i]; if (battleCtx->battleMons[battler].downloadAnnounced == FALSE - && battleCtx->battleMons[battler].curHP - && Battler_Ability(battleCtx, battler) == ABILITY_DOWNLOAD) { + && battleCtx->battleMons[battler].curHP + && Battler_Ability(battleCtx, battler) == ABILITY_DOWNLOAD) { int j; // must declare here to match int sumDef = 0, sumSpDef = 0; for (j = 0; j < maxBattlers; j++) { if (Battler_Side(battleSys, battler) != Battler_Side(battleSys, j) - && (battleCtx->battleMons[j].statusVolatile & VOLATILE_CONDITION_SUBSTITUTE) == FALSE - && battleCtx->battleMons[j].curHP) { + && (battleCtx->battleMons[j].statusVolatile & VOLATILE_CONDITION_SUBSTITUTE) == FALSE + && battleCtx->battleMons[j].curHP) { sumDef += battleCtx->battleMons[j].defense * sStatStageBoosts[battleCtx->battleMons[j].statBoosts[BATTLE_STAT_DEFENSE]].numerator / sStatStageBoosts[battleCtx->battleMons[j].statBoosts[BATTLE_STAT_DEFENSE]].denominator; sumSpDef += battleCtx->battleMons[j].spDefense - * sStatStageBoosts[battleCtx->battleMons[j].statBoosts[BATTLE_STAT_SP_DEFENSE]].numerator - / sStatStageBoosts[battleCtx->battleMons[j].statBoosts[BATTLE_STAT_SP_DEFENSE]].denominator; + * sStatStageBoosts[battleCtx->battleMons[j].statBoosts[BATTLE_STAT_SP_DEFENSE]].numerator + / sStatStageBoosts[battleCtx->battleMons[j].statBoosts[BATTLE_STAT_SP_DEFENSE]].denominator; } } @@ -3868,8 +3866,8 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battler = battleCtx->monSpeedOrder[i]; if (battleCtx->battleMons[battler].anticipationAnnounced == FALSE - && battleCtx->battleMons[battler].curHP - && Battler_Ability(battleCtx, battler) == ABILITY_ANTICIPATION) { + && battleCtx->battleMons[battler].curHP + && Battler_Ability(battleCtx, battler) == ABILITY_ANTICIPATION) { int j, k; u16 move; u32 effectiveness; @@ -3886,10 +3884,10 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battleCtx->damage = BattleSystem_ApplyTypeChart(battleSys, battleCtx, move, NULL, j, battler, battleCtx->damage, &effectiveness); if ((effectiveness & MOVE_STATUS_INEFFECTIVE) == FALSE - && MoveCannotTriggerAnticipation(battleCtx, move) == FALSE - && ((effectiveness & MOVE_STATUS_SUPER_EFFECTIVE) - || (MOVE_DATA(move).effect == BATTLE_EFFECT_ONE_HIT_KO - && battleCtx->battleMons[battler].level <= battleCtx->battleMons[j].level))) { + && MoveCannotTriggerAnticipation(battleCtx, move) == FALSE + && ((effectiveness & MOVE_STATUS_SUPER_EFFECTIVE) + || (MOVE_DATA(move).effect == BATTLE_EFFECT_ONE_HIT_KO + && battleCtx->battleMons[battler].level <= battleCtx->battleMons[j].level))) { result = SWITCH_IN_CHECK_RESULT_BREAK; break; } @@ -3920,8 +3918,8 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battler = battleCtx->monSpeedOrder[i]; if (battleCtx->battleMons[battler].forewarnAnnounced == FALSE - && battleCtx->battleMons[battler].curHP - && Battler_Ability(battleCtx, battler) == ABILITY_FOREWARN) { + && battleCtx->battleMons[battler].curHP + && Battler_Ability(battleCtx, battler) == ABILITY_FOREWARN) { int j, k; u16 move; u32 movePower, maxPower; @@ -3933,7 +3931,7 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b for (j = 0; j < maxBattlers; j++) { if (Battler_Side(battleSys, battler) != Battler_Side(battleSys, j) - && battleCtx->battleMons[j].curHP) { + && battleCtx->battleMons[j].curHP) { sumEnemyHP += battleCtx->battleMons[j].curHP; for (k = 0; k < 4; k++) { @@ -4002,8 +4000,8 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battler = battleCtx->monSpeedOrder[i]; if (battleCtx->battleMons[battler].friskAnnounced == FALSE - && battleCtx->battleMons[battler].curHP - && Battler_Ability(battleCtx, battler) == ABILITY_FRISK) { + && battleCtx->battleMons[battler].curHP + && Battler_Ability(battleCtx, battler) == ABILITY_FRISK) { battleCtx->battleMons[battler].friskAnnounced = TRUE; if (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) { @@ -4013,17 +4011,17 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b }; if (battleCtx->battleMons[enemies[0]].curHP - && battleCtx->battleMons[enemies[0]].heldItem - && battleCtx->battleMons[enemies[1]].curHP - && battleCtx->battleMons[enemies[1]].heldItem) { + && battleCtx->battleMons[enemies[0]].heldItem + && battleCtx->battleMons[enemies[1]].curHP + && battleCtx->battleMons[enemies[1]].heldItem) { battleCtx->msgItemTemp = battleCtx->battleMons[enemies[BattleSystem_RandNext(battleSys) & 1]].heldItem; result = SWITCH_IN_CHECK_RESULT_BREAK; } else if (battleCtx->battleMons[enemies[0]].curHP - && battleCtx->battleMons[enemies[0]].heldItem) { + && battleCtx->battleMons[enemies[0]].heldItem) { battleCtx->msgItemTemp = battleCtx->battleMons[enemies[0]].heldItem; result = SWITCH_IN_CHECK_RESULT_BREAK; } else if (battleCtx->battleMons[enemies[1]].curHP - && battleCtx->battleMons[enemies[1]].heldItem) { + && battleCtx->battleMons[enemies[1]].heldItem) { battleCtx->msgItemTemp = battleCtx->battleMons[enemies[1]].heldItem; result = SWITCH_IN_CHECK_RESULT_BREAK; } @@ -4050,9 +4048,9 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battler = battleCtx->monSpeedOrder[i]; if (battleCtx->battleMons[battler].slowStartAnnounced == FALSE - && battleCtx->battleMons[battler].curHP - && Battler_Ability(battleCtx, battler) == ABILITY_SLOW_START - && battleCtx->totalTurns <= battleCtx->battleMons[battler].moveEffectsData.slowStartTurnNumber) { + && battleCtx->battleMons[battler].curHP + && Battler_Ability(battleCtx, battler) == ABILITY_SLOW_START + && battleCtx->totalTurns <= battleCtx->battleMons[battler].moveEffectsData.slowStartTurnNumber) { battleCtx->battleMons[battler].slowStartAnnounced = TRUE; battleCtx->msgBattlerTemp = battler; subscript = subscript_slow_start; @@ -4073,14 +4071,14 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battleCtx->switchInCheckState++; } break; - + case SWITCH_IN_CHECK_STATE_MOLD_BREAKER: for (i = 0; i < maxBattlers; i++) { battler = battleCtx->monSpeedOrder[i]; if (battleCtx->battleMons[battler].moldBreakerAnnounced == FALSE - && battleCtx->battleMons[battler].curHP - && Battler_Ability(battleCtx, battler) == ABILITY_MOLD_BREAKER) { + && battleCtx->battleMons[battler].curHP + && Battler_Ability(battleCtx, battler) == ABILITY_MOLD_BREAKER) { battleCtx->battleMons[battler].moldBreakerAnnounced = TRUE; battleCtx->msgBattlerTemp = battler; subscript = subscript_mold_breaker; @@ -4099,8 +4097,8 @@ int BattleSystem_TriggerEffectOnSwitch(BattleSystem *battleSys, BattleContext *b battler = battleCtx->monSpeedOrder[i]; if (battleCtx->battleMons[battler].pressureAnnounced == FALSE - && battleCtx->battleMons[battler].curHP - && Battler_Ability(battleCtx, battler) == ABILITY_PRESSURE) { + && battleCtx->battleMons[battler].curHP + && Battler_Ability(battleCtx, battler) == ABILITY_PRESSURE) { battleCtx->battleMons[battler].pressureAnnounced = TRUE; battleCtx->msgBattlerTemp = battler; subscript = subscript_pressure; @@ -4185,7 +4183,7 @@ int BattleSystem_RandomOpponent(BattleSystem *battleSys, BattleContext *battleCt if (battleType & BATTLE_TYPE_DOUBLES) { opponents[0] = BattleSystem_EnemyInSlot(battleSys, attacker, ENEMY_IN_SLOT_RIGHT); opponents[1] = BattleSystem_EnemyInSlot(battleSys, attacker, ENEMY_IN_SLOT_LEFT); - + int rnd = BattleSystem_RandNext(battleSys) & 1; chosen = opponents[rnd]; @@ -4215,13 +4213,13 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba switch (Battler_Ability(battleCtx, battleCtx->defender)) { case ABILITY_STATIC: if (ATTACKING_MON.curHP - && ATTACKING_MON.status == MON_CONDITION_NONE - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT) - && BattleSystem_RandNext(battleSys) % 10 < 3) { + && ATTACKING_MON.status == MON_CONDITION_NONE + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT) + && BattleSystem_RandNext(battleSys) % 10 < 3) { battleCtx->sideEffectType = SIDE_EFFECT_TYPE_ABILITY; battleCtx->sideEffectMon = battleCtx->attacker; battleCtx->msgBattlerTemp = battleCtx->defender; @@ -4243,13 +4241,13 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba } if (DEFENDING_MON.curHP - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && battleCtx->moveCur != MOVE_STRUGGLE - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && CURRENT_MOVE_DATA.power - && BattleMon_Get(battleCtx, battleCtx->defender, 27, NULL) != moveType - && BattleMon_Get(battleCtx, battleCtx->defender, 28, NULL) != moveType) { + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE + && battleCtx->moveCur != MOVE_STRUGGLE + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && CURRENT_MOVE_DATA.power + && BattleMon_Get(battleCtx, battleCtx->defender, 27, NULL) != moveType + && BattleMon_Get(battleCtx, battleCtx->defender, 28, NULL) != moveType) { *subscript = subscript_color_change; battleCtx->msgTemp = moveType; result = TRUE; @@ -4258,12 +4256,12 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba case ABILITY_ROUGH_SKIN: if (ATTACKING_MON.curHP - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT)) { + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT)) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, 8); battleCtx->msgBattlerTemp = battleCtx->attacker; @@ -4274,13 +4272,13 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba case ABILITY_EFFECT_SPORE: if (ATTACKING_MON.curHP - && ATTACKING_MON.status == MON_CONDITION_NONE - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT) - && BattleSystem_RandNext(battleSys) % 10 < 3) { + && ATTACKING_MON.status == MON_CONDITION_NONE + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT) + && BattleSystem_RandNext(battleSys) % 10 < 3) { switch (BattleSystem_RandNext(battleSys) % 3) { case 0: default: @@ -4304,13 +4302,13 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba case ABILITY_POISON_POINT: if (ATTACKING_MON.curHP - && ATTACKING_MON.status == MON_CONDITION_NONE - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT) - && BattleSystem_RandNext(battleSys) % 10 < 3) { + && ATTACKING_MON.status == MON_CONDITION_NONE + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT) + && BattleSystem_RandNext(battleSys) % 10 < 3) { battleCtx->sideEffectType = SIDE_EFFECT_TYPE_ABILITY; battleCtx->sideEffectMon = battleCtx->attacker; battleCtx->msgBattlerTemp = battleCtx->defender; @@ -4322,13 +4320,13 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba case ABILITY_FLAME_BODY: if (ATTACKING_MON.curHP - && ATTACKING_MON.status == MON_CONDITION_NONE - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT) - && BattleSystem_RandNext(battleSys) % 10 < 3) { + && ATTACKING_MON.status == MON_CONDITION_NONE + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT) + && BattleSystem_RandNext(battleSys) % 10 < 3) { battleCtx->sideEffectType = SIDE_EFFECT_TYPE_ABILITY; battleCtx->sideEffectMon = battleCtx->attacker; battleCtx->msgBattlerTemp = battleCtx->defender; @@ -4340,14 +4338,14 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba case ABILITY_CUTE_CHARM: if (ATTACKING_MON.curHP - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_ATTRACT) == FALSE - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT) - && DEFENDING_MON.curHP - && BattleSystem_RandNext(battleSys) % 10 < 3) { + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_ATTRACT) == FALSE + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_FIRST_OF_MULTI_TURN) == FALSE + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT) + && DEFENDING_MON.curHP + && BattleSystem_RandNext(battleSys) % 10 < 3) { battleCtx->sideEffectType = SIDE_EFFECT_TYPE_ABILITY; battleCtx->sideEffectMon = battleCtx->attacker; battleCtx->msgBattlerTemp = battleCtx->defender; @@ -4359,12 +4357,12 @@ BOOL BattleSystem_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *ba case ABILITY_AFTERMATH: if (battleCtx->defender == battleCtx->faintedMon - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD - && BattleSystem_CountAbility(battleSys, battleCtx, 8, 0, ABILITY_DAMP) == 0 - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && ATTACKING_MON.curHP - && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT)) { + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD + && BattleSystem_CountAbility(battleSys, battleCtx, 8, 0, ABILITY_DAMP) == 0 + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && ATTACKING_MON.curHP + && (battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) == FALSE + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT)) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, 4); battleCtx->msgBattlerTemp = battleCtx->attacker; @@ -4482,7 +4480,7 @@ BOOL Ability_ForbidsStatus(BattleContext *battleSys, int ability, int status) result = TRUE; } break; - + case ABILITY_MAGMA_ARMOR: if (status & MON_CONDITION_FREEZE) { result = TRUE; @@ -4499,15 +4497,15 @@ BOOL BattleSystem_SynchronizeStatus(BattleSystem *battleSys, BattleContext *batt int nextSeq = 0; if (battleCtx->defender != BATTLER_NONE - && Battler_Ability(battleCtx, battleCtx->defender) == ABILITY_SYNCHRONIZE - && battleCtx->defender == battleCtx->sideEffectMon - && (battleCtx->battleStatusMask & SYSCTL_TRY_SYNCHRONIZE_STATUS)) { + && Battler_Ability(battleCtx, battleCtx->defender) == ABILITY_SYNCHRONIZE + && battleCtx->defender == battleCtx->sideEffectMon + && (battleCtx->battleStatusMask & SYSCTL_TRY_SYNCHRONIZE_STATUS)) { battleCtx->msgBattlerTemp = battleCtx->defender; battleCtx->sideEffectMon = battleCtx->attacker; result = TRUE; } else if (Battler_Ability(battleCtx, battleCtx->attacker) == ABILITY_SYNCHRONIZE - && battleCtx->attacker == battleCtx->sideEffectMon - && (battleCtx->battleStatusMask & SYSCTL_TRY_SYNCHRONIZE_STATUS)) { + && battleCtx->attacker == battleCtx->sideEffectMon + && (battleCtx->battleStatusMask & SYSCTL_TRY_SYNCHRONIZE_STATUS)) { // This will try to synchronize a status applied from an ability or item held // by the defender, e.g. Static. battleCtx->msgBattlerTemp = battleCtx->attacker; @@ -4546,15 +4544,15 @@ BOOL BattleSystem_SynchronizeStatus(BattleSystem *battleSys, BattleContext *batt } if (battleCtx->defender != BATTLER_NONE - && Battler_HeldItemEffect(battleCtx, battleCtx->defender) == HOLD_EFFECT_RECIPROCATE_INFAT - && battleCtx->defender == battleCtx->sideEffectMon - && (DEFENDER_SELF_TURN_FLAGS.statusFlags & SELF_TURN_FLAG_INFATUATED)) { + && Battler_HeldItemEffect(battleCtx, battleCtx->defender) == HOLD_EFFECT_RECIPROCATE_INFAT + && battleCtx->defender == battleCtx->sideEffectMon + && (DEFENDER_SELF_TURN_FLAGS.statusFlags & SELF_TURN_FLAG_INFATUATED)) { battleCtx->msgBattlerTemp = battleCtx->defender; battleCtx->sideEffectMon = battleCtx->attacker; result = TRUE; } else if (Battler_HeldItemEffect(battleCtx, battleCtx->attacker) == HOLD_EFFECT_RECIPROCATE_INFAT - && battleCtx->attacker == battleCtx->sideEffectMon - && (ATTACKER_SELF_TURN_FLAGS.statusFlags & SELF_TURN_FLAG_INFATUATED)) { + && battleCtx->attacker == battleCtx->sideEffectMon + && (ATTACKER_SELF_TURN_FLAGS.statusFlags & SELF_TURN_FLAG_INFATUATED)) { // This should only happen if the defender triggered Cute Charm. battleCtx->msgBattlerTemp = battleCtx->attacker; battleCtx->sideEffectMon = battleCtx->defender; @@ -4663,7 +4661,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle case HOLD_EFFECT_STATUS_RESTORE: if ((battleCtx->battleMons[battler].status & MON_CONDITION_ANY) - || (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { + || (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { if (battleCtx->battleMons[battler].status & MON_CONDITION_PARALYSIS) { subscript = subscript_held_item_prz_restore; } @@ -4689,7 +4687,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle } if ((battleCtx->battleMons[battler].status & MON_CONDITION_ANY) - && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { + && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { subscript = subscript_held_item_multi_restore; } @@ -4771,14 +4769,14 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle result = TRUE; } break; - + case HOLD_EFFECT_PINCH_ATK_UP: if (Battler_Ability(battleCtx, battler) == ABILITY_GLUTTONY) { itemPower /= 2; } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_ATTACK] < 12) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_ATTACK; subscript = subscript_held_item_raise_stat; result = TRUE; @@ -4791,7 +4789,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_DEFENSE] < 12) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_DEFENSE; subscript = subscript_held_item_raise_stat; result = TRUE; @@ -4804,7 +4802,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SPEED] < 12) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SPEED] < 12) { battleCtx->msgTemp = BATTLE_STAT_SPEED; subscript = subscript_held_item_raise_stat; result = TRUE; @@ -4817,7 +4815,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_ATTACK] < 12) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_ATTACK; subscript = subscript_held_item_raise_stat; result = TRUE; @@ -4830,7 +4828,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_DEFENSE] < 12) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_DEFENSE; subscript = subscript_held_item_raise_stat; result = TRUE; @@ -4843,7 +4841,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_FOCUS_ENERGY) == FALSE) { + && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_FOCUS_ENERGY) == FALSE) { subscript = subscript_held_item_raise_crit; result = TRUE; } @@ -4887,7 +4885,7 @@ BOOL BattleSystem_TriggerHeldItem(BattleSystem *battleSys, BattleContext *battle } break; } - + case HOLD_EFFECT_HEAL_INFATUATION: if (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_ATTRACT) { battleCtx->msgTemp = MSGCOND_INFATUATION; @@ -4956,7 +4954,7 @@ BOOL BattleSystem_TriggerLeftovers(BattleSystem *battleSys, BattleContext *battl if (result == TRUE) { battleCtx->msgBattlerTemp = battler; battleCtx->msgItemTemp = Battler_HeldItem(battleCtx, battler); - + LOAD_SUBSEQ(subscript); battleCtx->commandNext = battleCtx->command; battleCtx->command = BATTLE_CONTROL_EXEC_SCRIPT; @@ -5053,7 +5051,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext case HOLD_EFFECT_STATUS_RESTORE: if ((battleCtx->battleMons[battler].status & MON_CONDITION_ANY) - || (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { + || (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { if (battleCtx->battleMons[battler].status & MON_CONDITION_PARALYSIS) { *subscript = subscript_held_item_prz_restore; } @@ -5079,7 +5077,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } if ((battleCtx->battleMons[battler].status & MON_CONDITION_ANY) - && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { + && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_CONFUSION)) { *subscript = subscript_held_item_multi_restore; } @@ -5100,7 +5098,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } break; } - + case HOLD_EFFECT_HEAL_INFATUATION: if (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_ATTRACT) { battleCtx->msgTemp = MSGCOND_INFATUATION; @@ -5201,7 +5199,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_ATTACK] < 12) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_ATTACK; *subscript = subscript_held_item_raise_stat; result = TRUE; @@ -5214,7 +5212,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_DEFENSE] < 12) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_DEFENSE; *subscript = subscript_held_item_raise_stat; result = TRUE; @@ -5227,7 +5225,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SPEED] < 12) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SPEED] < 12) { battleCtx->msgTemp = BATTLE_STAT_SPEED; *subscript = subscript_held_item_raise_stat; result = TRUE; @@ -5240,7 +5238,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_ATTACK] < 12) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_ATTACK] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_ATTACK; *subscript = subscript_held_item_raise_stat; result = TRUE; @@ -5253,7 +5251,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_DEFENSE] < 12) { + && battleCtx->battleMons[battler].statBoosts[BATTLE_STAT_SP_DEFENSE] < 12) { battleCtx->msgTemp = BATTLE_STAT_SP_DEFENSE; *subscript = subscript_held_item_raise_stat; result = TRUE; @@ -5266,7 +5264,7 @@ BOOL BattleSystem_TriggerHeldItemOnStatus(BattleSystem *battleSys, BattleContext } if (battleCtx->battleMons[battler].curHP <= battleCtx->battleMons[battler].maxHP / itemPower - && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_FOCUS_ENERGY) == FALSE) { + && (battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_FOCUS_ENERGY) == FALSE) { *subscript = subscript_held_item_raise_crit; result = TRUE; } @@ -5321,7 +5319,7 @@ BOOL BattleSystem_TriggerDetrimentalHeldItem(BattleSystem *battleSys, BattleCont subscript = subscript_badly_poison; result = TRUE; break; - + case HOLD_EFFECT_BRN_USER: battleCtx->sideEffectMon = battler; battleCtx->sideEffectType = SIDE_EFFECT_TYPE_HELD_ITEM; @@ -5388,12 +5386,12 @@ BOOL BattleSystem_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext *b switch (itemEffect) { case HOLD_EFFECT_DMG_USER_CONTACT_XFR: if (ATTACKING_MON.curHP - && ATTACKING_MON.heldItem == ITEM_NONE - && (battleCtx->sideConditions[side].knockedOffItemsMask & FlagIndex(battleCtx->selectedPartySlot[battleCtx->attacker])) == FALSE - && battleCtx->moveCur != MOVE_KNOCK_OFF - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT)) { + && ATTACKING_MON.heldItem == ITEM_NONE + && (battleCtx->sideConditions[side].knockedOffItemsMask & FlagIndex(battleCtx->selectedPartySlot[battleCtx->attacker])) == FALSE + && battleCtx->moveCur != MOVE_KNOCK_OFF + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT)) { *subscript = subscript_transfer_sticky_barb; result = TRUE; } @@ -5401,9 +5399,9 @@ BOOL BattleSystem_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext *b case HOLD_EFFECT_RECOIL_PHYSICAL: if (ATTACKING_MON.curHP - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD - && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE - && DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken) { + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD + && (battleCtx->battleStatusMask2 & SYSCTL_UTURN_ACTIVE) == FALSE + && DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, itemPower); *subscript = subscript_held_item_recoil_when_hit; result = TRUE; @@ -5412,8 +5410,8 @@ BOOL BattleSystem_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext *b case HOLD_EFFECT_RECOIL_SPECIAL: if (ATTACKING_MON.curHP - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD - && DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) { + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD + && DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, itemPower); *subscript = subscript_held_item_recoil_when_hit; result = TRUE; @@ -5501,17 +5499,17 @@ s32 Battler_ItemFlingPower(BattleContext *battleCtx, int battler) static inline BOOL BattlerIsGrounded(BattleContext *battleCtx, int battler) { - return ((Battler_Ability(battleCtx, battler) != ABILITY_LEVITATE - && battleCtx->battleMons[battler].moveEffectsData.magnetRiseTurns == 0 - && MON_IS_NOT_TYPE(battler, TYPE_FLYING)) - || Battler_HeldItemEffect(battleCtx, battler) == HOLD_EFFECT_SPEED_DOWN_GROUNDED - || (battleCtx->fieldConditionsMask & FIELD_CONDITION_GRAVITY)); + return (Battler_Ability(battleCtx, battler) != ABILITY_LEVITATE + && battleCtx->battleMons[battler].moveEffectsData.magnetRiseTurns == 0 + && MON_IS_NOT_TYPE(battler, TYPE_FLYING)) + || Battler_HeldItemEffect(battleCtx, battler) == HOLD_EFFECT_SPEED_DOWN_GROUNDED + || (battleCtx->fieldConditionsMask & FIELD_CONDITION_GRAVITY); } static inline int CountAbilityTheirSide(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int ability) { return BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_THEIR_SIDE, battler, ability); -} +} BOOL Battler_IsTrapped(BattleSystem *battleSys, BattleContext *battleCtx, int battler) { @@ -5522,12 +5520,12 @@ BOOL Battler_IsTrapped(BattleSystem *battleSys, BattleContext *battleCtx, int ba } if ((battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_TRAPPED) - || (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_INGRAIN)) { + || (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_INGRAIN)) { result = TRUE; } if ((Battler_Ability(battleCtx, battler) != ABILITY_SHADOW_TAG && CountAbilityTheirSide(battleSys, battleCtx, battler, ABILITY_SHADOW_TAG)) - || (MON_HAS_TYPE(battler, TYPE_STEEL) && CountAbilityTheirSide(battleSys, battleCtx, battler, ABILITY_MAGNET_PULL))) { + || (MON_HAS_TYPE(battler, TYPE_STEEL) && CountAbilityTheirSide(battleSys, battleCtx, battler, ABILITY_MAGNET_PULL))) { result = TRUE; } @@ -5669,7 +5667,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, } if ((ATTACKING_MON.status & MON_CONDITION_ANY) - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION)) { + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION)) { nextSeq = subscript_held_item_multi_restore; } } @@ -5840,7 +5838,7 @@ BOOL BattleSystem_PluckBerry(BattleSystem *battleSys, BattleContext *battleCtx, if (result == TRUE) { if (Battler_Ability(battleCtx, battleCtx->attacker) == ABILITY_KLUTZ - || (ATTACKING_MON.moveEffectsMask & MOVE_EFFECT_EMBARGO)) { + || (ATTACKING_MON.moveEffectsMask & MOVE_EFFECT_EMBARGO)) { battleCtx->scriptTemp = 0; } else { battleCtx->scriptTemp = nextSeq; @@ -5967,7 +5965,7 @@ BOOL BattleSystem_FlingItem(BattleSystem *battleSys, BattleContext *battleCtx, i } if ((DEFENDING_MON.status & MON_CONDITION_ANY) - && (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION)) { + && (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_CONFUSION)) { battleCtx->flingScript = subscript_held_item_multi_restore; } } @@ -6163,9 +6161,9 @@ void BattleSystem_UpdateMetronomeCount(BattleSystem *battleSys, BattleContext *b { if (Battler_HeldItemEffect(battleCtx, battleCtx->attacker) == HOLD_EFFECT_BOOST_REPEATED) { if ((ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_THRASH) == FALSE - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_UPROAR) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_LAST_OF_MULTI_TURN) == FALSE - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED) == FALSE) { + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_UPROAR) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_LAST_OF_MULTI_TURN) == FALSE + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED) == FALSE) { if (battleCtx->metronomeMove[battleCtx->attacker] == battleCtx->moveTemp) { if (ATTACKING_MON.moveEffectsData.metronomeTurns < 10) { ATTACKING_MON.moveEffectsData.metronomeTurns++; @@ -6184,13 +6182,13 @@ void BattleSystem_VerifyMetronomeCount(BattleSystem *battleSys, BattleContext *b { if (Battler_HeldItemEffect(battleCtx, battleCtx->attacker) == HOLD_EFFECT_BOOST_REPEATED) { if ((battleCtx->moveStatusFlags & MOVE_STATUS_NO_EFFECTS) - && battleCtx->metronomeMove[battleCtx->attacker] == battleCtx->moveTemp - && ATTACKING_MON.moveEffectsData.metronomeTurns - && ATTACKER_SELF_TURN_FLAGS.repeatedMoveCount == 0 - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_THRASH) == FALSE - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_UPROAR) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_LAST_OF_MULTI_TURN) == FALSE - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED) == FALSE) { + && battleCtx->metronomeMove[battleCtx->attacker] == battleCtx->moveTemp + && ATTACKING_MON.moveEffectsData.metronomeTurns + && ATTACKER_SELF_TURN_FLAGS.repeatedMoveCount == 0 + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_THRASH) == FALSE + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_UPROAR) == FALSE + && (battleCtx->battleStatusMask & SYSCTL_LAST_OF_MULTI_TURN) == FALSE + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED) == FALSE) { ATTACKING_MON.moveEffectsData.metronomeTurns--; } } else { @@ -6202,7 +6200,7 @@ enum PokemonCryMod Battler_CryModulation(BattleContext *battleCtx, int battler, { BOOL doubles; if (encounter == TRUE - && (battlerType == BATTLER_TYPE_PLAYER_SIDE_SLOT_1 || battlerType == BATTLER_TYPE_ENEMY_SIDE_SLOT_1)) { + && (battlerType == BATTLER_TYPE_PLAYER_SIDE_SLOT_1 || battlerType == BATTLER_TYPE_ENEMY_SIDE_SLOT_1)) { doubles = TRUE; } else { doubles = FALSE; @@ -6216,7 +6214,7 @@ enum PokemonCryMod Battler_CryModulation(BattleContext *battleCtx, int battler, int hpColor = HealthBar_Color(battleCtx->battleMons[battler].curHP, battleCtx->battleMons[battler].maxHP, (8 * 6)); if ((battleCtx->battleMons[battler].status & MON_CONDITION_ANY) - || (hpColor != BARCOLOR_MAX && hpColor != BARCOLOR_GREEN)) { + || (hpColor != BARCOLOR_MAX && hpColor != BARCOLOR_GREEN)) { cryMod = POKECRY_PINCH_NORMAL; } @@ -6228,9 +6226,9 @@ BOOL Battler_CanPickCommand(BattleContext *battleSys, int battler) BOOL result = TRUE; if ((battleSys->battleMons[battler].statusVolatile & VOLATILE_CONDITION_RECHARGING) - || (battleSys->battleMons[battler].statusVolatile & VOLATILE_CONDITION_THRASH) - || (battleSys->battleMons[battler].statusVolatile & VOLATILE_CONDITION_UPROAR) - || (battleSys->battleMons[battler].statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED)) { + || (battleSys->battleMons[battler].statusVolatile & VOLATILE_CONDITION_THRASH) + || (battleSys->battleMons[battler].statusVolatile & VOLATILE_CONDITION_UPROAR) + || (battleSys->battleMons[battler].statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED)) { result = FALSE; } @@ -6277,8 +6275,8 @@ BOOL BattleSystem_TrainerIsOT(BattleSystem *battleSys, BattleContext *battleCtx) const charcode_t *trName = TrainerInfo_Name(trInfo); if (trID == ATTACKING_MON.OTId - && trGender == ATTACKING_MON.OTGender - && GF_strncmp(trName, ATTACKING_MON.OTName, TRAINER_NAME_LEN) == 0) { + && trGender == ATTACKING_MON.OTGender + && GF_strncmp(trName, ATTACKING_MON.OTName, TRAINER_NAME_LEN) == 0) { return TRUE; } @@ -6296,8 +6294,8 @@ BOOL BattleSystem_PokemonIsOT(BattleSystem *battleSys, Pokemon *mon) Pokemon_GetValue(mon, MON_DATA_OTNAME, monOTName); if (trID == Pokemon_GetValue(mon, MON_DATA_OT_ID, NULL) - && trGender == Pokemon_GetValue(mon, MON_DATA_OT_GENDER, NULL) - && GF_strncmp(trName, monOTName, TRAINER_NAME_LEN) == 0) { + && trGender == Pokemon_GetValue(mon, MON_DATA_OT_GENDER, NULL) + && GF_strncmp(trName, monOTName, TRAINER_NAME_LEN) == 0) { return TRUE; } @@ -6314,12 +6312,12 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt battleCtx->msgBattlerTemp = battleCtx->monSpeedOrder[i]; if (battleCtx->battleMons[battleCtx->msgBattlerTemp].species == SPECIES_CASTFORM - && battleCtx->battleMons[battleCtx->msgBattlerTemp].curHP - && Battler_Ability(battleCtx, battleCtx->msgBattlerTemp) == ABILITY_FORECAST) { + && battleCtx->battleMons[battleCtx->msgBattlerTemp].curHP + && Battler_Ability(battleCtx, battleCtx->msgBattlerTemp) == ABILITY_FORECAST) { if (NO_CLOUD_NINE) { if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_CASTFORM) == FALSE - && battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 != TYPE_NORMAL - && battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 != TYPE_NORMAL) { + && battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 != TYPE_NORMAL + && battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 != TYPE_NORMAL) { battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 = TYPE_NORMAL; battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 = TYPE_NORMAL; battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 0; @@ -6327,8 +6325,8 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt result = TRUE; break; } else if (WEATHER_IS_SUN - && battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 != TYPE_FIRE - && battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 != TYPE_FIRE) { + && battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 != TYPE_FIRE + && battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 != TYPE_FIRE) { battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 = TYPE_FIRE; battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 = TYPE_FIRE; battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 1; @@ -6336,8 +6334,8 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt result = TRUE; break; } else if (WEATHER_IS_RAIN - && battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 != TYPE_WATER - && battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 != TYPE_WATER) { + && battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 != TYPE_WATER + && battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 != TYPE_WATER) { battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 = TYPE_WATER; battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 = TYPE_WATER; battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 2; @@ -6345,8 +6343,8 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt result = TRUE; break; } else if (WEATHER_IS_HAIL - && battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 != TYPE_ICE - && battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 != TYPE_ICE) { + && battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 != TYPE_ICE + && battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 != TYPE_ICE) { battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 = TYPE_ICE; battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 = TYPE_ICE; battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 3; @@ -6355,7 +6353,7 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt break; } } else if (battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 != TYPE_NORMAL - && battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 != TYPE_NORMAL) { + && battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 != TYPE_NORMAL) { battleCtx->battleMons[battleCtx->msgBattlerTemp].type1 = TYPE_NORMAL; battleCtx->battleMons[battleCtx->msgBattlerTemp].type2 = TYPE_NORMAL; battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 0; @@ -6366,10 +6364,10 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt } if (battleCtx->battleMons[battleCtx->msgBattlerTemp].species == SPECIES_CHERRIM - && battleCtx->battleMons[battleCtx->msgBattlerTemp].curHP) { + && battleCtx->battleMons[battleCtx->msgBattlerTemp].curHP) { if (NO_CLOUD_NINE) { if ((battleCtx->fieldConditionsMask & FIELD_CONDITION_CASTFORM) == FALSE - && battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum == 1) { + && battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum == 1) { battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum = 0; *subscript = subscript_form_change; result = TRUE; @@ -6399,8 +6397,8 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt } if (battleCtx->battleMons[battleCtx->msgBattlerTemp].species == SPECIES_ARCEUS - && battleCtx->battleMons[battleCtx->msgBattlerTemp].curHP - && Battler_Ability(battleCtx, battleCtx->msgBattlerTemp) == ABILITY_MULTITYPE) { + && battleCtx->battleMons[battleCtx->msgBattlerTemp].curHP + && Battler_Ability(battleCtx, battleCtx->msgBattlerTemp) == ABILITY_MULTITYPE) { arceusForm = Pokemon_GetArceusTypeOf(Item_LoadParam(battleCtx->battleMons[battleCtx->msgBattlerTemp].heldItem, ITEM_PARAM_HOLD_EFFECT, HEAP_ID_BATTLE)); if (battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum != arceusForm) { @@ -6412,11 +6410,11 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt } if (battleCtx->battleMons[battleCtx->msgBattlerTemp].species == SPECIES_GIRATINA - && battleCtx->battleMons[battleCtx->msgBattlerTemp].curHP - && battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum == 1 - && ((battleCtx->battleMons[battleCtx->msgBattlerTemp].statusVolatile & VOLATILE_CONDITION_TRANSFORM) - || ((BattleSystem_BattleStatus(battleSys) & BATTLE_STATUS_DISTORTION) == FALSE - && battleCtx->battleMons[battleCtx->msgBattlerTemp].heldItem != ITEM_GRISEOUS_ORB))) { + && battleCtx->battleMons[battleCtx->msgBattlerTemp].curHP + && battleCtx->battleMons[battleCtx->msgBattlerTemp].formNum == 1 + && ((battleCtx->battleMons[battleCtx->msgBattlerTemp].statusVolatile & VOLATILE_CONDITION_TRANSFORM) + || ((BattleSystem_BattleStatus(battleSys) & BATTLE_STATUS_DISTORTION) == FALSE + && battleCtx->battleMons[battleCtx->msgBattlerTemp].heldItem != ITEM_GRISEOUS_ORB))) { if (battleCtx->battleMons[battleCtx->msgBattlerTemp].statusVolatile & VOLATILE_CONDITION_TRANSFORM) { Pokemon *mon = Pokemon_New(HEAP_ID_BATTLE); @@ -6428,11 +6426,11 @@ BOOL BattleSystem_TriggerFormChange(BattleSystem *battleSys, BattleContext *batt } Pokemon_Copy(BattleSystem_PartyPokemon(battleSys, target, battleCtx->selectedPartySlot[target]), mon); - + // Don't copy the Griseous Orb int tmp = ITEM_NONE; Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &tmp); - + // Force Giratina-Altered form tmp = 0; Pokemon_SetValue(mon, MON_DATA_FORM, &tmp); @@ -6484,9 +6482,9 @@ void BattleSystem_SwitchSlots(BattleSystem *battleSys, BattleContext *battleCtx, u32 battleType = BattleSystem_BattleType(battleSys); if (((battleType & BATTLE_TYPE_DOUBLES) && (battleType & BATTLE_TYPE_2vs2_TAG) == FALSE) - || ((battleType & BATTLE_TYPE_TAG) && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_TYPE_SOLO_ENEMY) == FALSE)) { + || ((battleType & BATTLE_TYPE_TAG) && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_TYPE_SOLO_ENEMY) == FALSE)) { if (BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_TYPE_PLAYER_SIDE_SLOT_2 - || BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_TYPE_ENEMY_SIDE_SLOT_2) { + || BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_TYPE_ENEMY_SIDE_SLOT_2) { targetSlot = 1; } else { targetSlot = 0; @@ -6513,6 +6511,7 @@ typedef struct ItemEffectTypePair { u8 type; } ItemEffectTypePair; +// clang-format off static const ItemEffectTypePair sTypeBoostingItems[] = { { HOLD_EFFECT_STRENGTHEN_BUG, TYPE_BUG }, { HOLD_EFFECT_STRENGTHEN_STEEL, TYPE_STEEL }, @@ -6536,7 +6535,7 @@ static const ItemEffectTypePair sTypeBoostingItems[] = { { HOLD_EFFECT_ARCEUS_ELECTRIC, TYPE_ELECTRIC }, { HOLD_EFFECT_ARCEUS_GRASS, TYPE_GRASS }, { HOLD_EFFECT_ARCEUS_ICE, TYPE_ICE }, - { HOLD_EFFECT_ARCEUS_FIGHTING, TYPE_FIGHTING }, + { HOLD_EFFECT_ARCEUS_FIGHTING, TYPE_FIGHTING }, { HOLD_EFFECT_ARCEUS_POISON, TYPE_POISON }, { HOLD_EFFECT_ARCEUS_GROUND, TYPE_GROUND }, { HOLD_EFFECT_ARCEUS_FLYING, TYPE_FLYING }, @@ -6548,6 +6547,7 @@ static const ItemEffectTypePair sTypeBoostingItems[] = { { HOLD_EFFECT_ARCEUS_DARK, TYPE_DARK }, { HOLD_EFFECT_ARCEUS_STEEL, TYPE_STEEL } }; +// clang-format on static const Fraction sStatStageBoosts[] = { { 10, 40 }, // -6 @@ -6698,8 +6698,8 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, } if (attackerParams.ability == ABILITY_TECHNICIAN - && move != MOVE_STRUGGLE - && movePower <= 60) { + && move != MOVE_STRUGGLE + && movePower <= 60) { movePower = movePower * 15 / 10; } @@ -6709,15 +6709,15 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, attackStat = attackStat * 2; } if (attackerParams.ability == ABILITY_SLOW_START - && BattleContext_Get(battleSys, battleCtx, BATTLECTX_TOTAL_TURNS, NULL) - - BattleMon_Get(battleCtx, attacker, BATTLEMON_SLOW_START_TURN_NUMBER, NULL) - < 5) { + && BattleContext_Get(battleSys, battleCtx, BATTLECTX_TOTAL_TURNS, NULL) + - BattleMon_Get(battleCtx, attacker, BATTLEMON_SLOW_START_TURN_NUMBER, NULL) + < 5) { attackStat /= 2; } for (i = 0; i < NELEMS(sTypeBoostingItems); i++) { if (attackerParams.heldItemEffect == sTypeBoostingItems[i].itemEffect - && moveType == sTypeBoostingItems[i].type) { + && moveType == sTypeBoostingItems[i].type) { movePower = movePower * (100 + attackerParams.heldItemPower) / 100; break; } @@ -6730,62 +6730,62 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, spAttackStat = spAttackStat * 150 / 100; } if (attackerParams.heldItemEffect == HOLD_EFFECT_LATI_SPECIAL - && (battleType & BATTLE_TYPE_FRONTIER) == FALSE - && (attackerParams.species == SPECIES_LATIOS || attackerParams.species == SPECIES_LATIAS)) { + && (battleType & BATTLE_TYPE_FRONTIER) == FALSE + && (attackerParams.species == SPECIES_LATIOS || attackerParams.species == SPECIES_LATIAS)) { spAttackStat = spAttackStat * 150 / 100; } if (defenderParams.heldItemEffect == HOLD_EFFECT_LATI_SPECIAL - && (battleType & BATTLE_TYPE_FRONTIER) == FALSE - && (defenderParams.species == SPECIES_LATIOS || defenderParams.species == SPECIES_LATIAS)) { + && (battleType & BATTLE_TYPE_FRONTIER) == FALSE + && (defenderParams.species == SPECIES_LATIOS || defenderParams.species == SPECIES_LATIAS)) { spDefenseStat = spDefenseStat * 150 / 100; } if (attackerParams.heldItemEffect == HOLD_EFFECT_CLAMPERL_SPATK - && attackerParams.species == SPECIES_CLAMPERL) { + && attackerParams.species == SPECIES_CLAMPERL) { spAttackStat *= 2; } if (defenderParams.heldItemEffect == HOLD_EFFECT_CLAMPERL_SPDEF - && defenderParams.species == SPECIES_CLAMPERL) { + && defenderParams.species == SPECIES_CLAMPERL) { spDefenseStat *= 2; } if (attackerParams.heldItemEffect == HOLD_EFFECT_PIKA_SPATK_UP - && attackerParams.species == SPECIES_PIKACHU) { + && attackerParams.species == SPECIES_PIKACHU) { movePower *= 2; } if (defenderParams.heldItemEffect == HOLD_EFFECT_DITTO_DEF_UP - && defenderParams.species == SPECIES_DITTO) { + && defenderParams.species == SPECIES_DITTO) { defenseStat *= 2; } if (attackerParams.heldItemEffect == HOLD_EFFECT_CUBONE_ATK_UP - && (attackerParams.species == SPECIES_CUBONE || attackerParams.species == SPECIES_MAROWAK)) { + && (attackerParams.species == SPECIES_CUBONE || attackerParams.species == SPECIES_MAROWAK)) { attackStat *= 2; } if (attackerParams.heldItemEffect == HOLD_EFFECT_DIALGA_BOOST - && (moveType == TYPE_DRAGON || moveType == TYPE_STEEL) - && attackerParams.species == SPECIES_DIALGA) { + && (moveType == TYPE_DRAGON || moveType == TYPE_STEEL) + && attackerParams.species == SPECIES_DIALGA) { movePower = movePower * (100 + attackerParams.heldItemPower) / 100; } if (attackerParams.heldItemEffect == HOLD_EFFECT_PALKIA_BOOST - && (moveType == TYPE_DRAGON || moveType == TYPE_WATER) - && attackerParams.species == SPECIES_PALKIA) { + && (moveType == TYPE_DRAGON || moveType == TYPE_WATER) + && attackerParams.species == SPECIES_PALKIA) { movePower = movePower * (100 + attackerParams.heldItemPower) / 100; } if (attackerParams.heldItemEffect == HOLD_EFFECT_GIRATINA_BOOST - && (moveType == TYPE_DRAGON || moveType == TYPE_GHOST) - && (BattleMon_Get(battleCtx, attacker, BATTLEMON_VOLATILE_STATUS, NULL) & VOLATILE_CONDITION_TRANSFORM) == FALSE - && attackerParams.species == SPECIES_GIRATINA) { + && (moveType == TYPE_DRAGON || moveType == TYPE_GHOST) + && (BattleMon_Get(battleCtx, attacker, BATTLEMON_VOLATILE_STATUS, NULL) & VOLATILE_CONDITION_TRANSFORM) == FALSE + && attackerParams.species == SPECIES_GIRATINA) { movePower = movePower * (100 + attackerParams.heldItemPower) / 100; } if (attackerParams.heldItemEffect == HOLD_EFFECT_POWER_UP_PHYS - && moveClass == CLASS_PHYSICAL) { + && moveClass == CLASS_PHYSICAL) { movePower = movePower * (100 + attackerParams.heldItemPower) / 100; } if (attackerParams.heldItemEffect == HOLD_EFFECT_POWER_UP_SPEC - && moveClass == CLASS_SPECIAL) { + && moveClass == CLASS_SPECIAL) { movePower = movePower * (100 + attackerParams.heldItemPower) / 100; } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_THICK_FAT) == TRUE - && (moveType == TYPE_FIRE || moveType == TYPE_ICE)) { + && (moveType == TYPE_FIRE || moveType == TYPE_ICE)) { movePower /= 2; } @@ -6797,55 +6797,55 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, } if (Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_MARVEL_SCALE) == TRUE - && defenderParams.statusMask) { + && defenderParams.statusMask) { defenseStat = defenseStat * 150 / 100; } if (attackerParams.ability == ABILITY_PLUS - && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_OUR_SIDE, attacker, ABILITY_MINUS)) { + && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_OUR_SIDE, attacker, ABILITY_MINUS)) { spAttackStat = spAttackStat * 150 / 100; } if (attackerParams.ability == ABILITY_MINUS - && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_OUR_SIDE, attacker, ABILITY_PLUS)) { + && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_OUR_SIDE, attacker, ABILITY_PLUS)) { spAttackStat = spAttackStat * 150 / 100; } if (moveType == TYPE_ELECTRIC - && BattleSystem_AnyBattlersWithMoveEffect(battleSys, battleCtx, MOVE_EFFECT_MUD_SPORT)) { + && BattleSystem_AnyBattlersWithMoveEffect(battleSys, battleCtx, MOVE_EFFECT_MUD_SPORT)) { movePower /= 2; } if (moveType == TYPE_FIRE - && BattleSystem_AnyBattlersWithMoveEffect(battleSys, battleCtx, MOVE_EFFECT_WATER_SPORT)) { + && BattleSystem_AnyBattlersWithMoveEffect(battleSys, battleCtx, MOVE_EFFECT_WATER_SPORT)) { movePower /= 2; } if (moveType == TYPE_GRASS - && attackerParams.ability == ABILITY_OVERGROW - && attackerParams.curHP <= (attackerParams.maxHP / 3)) { + && attackerParams.ability == ABILITY_OVERGROW + && attackerParams.curHP <= (attackerParams.maxHP / 3)) { movePower = movePower * 150 / 100; } if (moveType == TYPE_FIRE - && attackerParams.ability == ABILITY_BLAZE - && attackerParams.curHP <= (attackerParams.maxHP / 3)) { + && attackerParams.ability == ABILITY_BLAZE + && attackerParams.curHP <= (attackerParams.maxHP / 3)) { movePower = movePower * 150 / 100; } if (moveType == TYPE_WATER - && attackerParams.ability == ABILITY_TORRENT - && attackerParams.curHP <= (attackerParams.maxHP / 3)) { + && attackerParams.ability == ABILITY_TORRENT + && attackerParams.curHP <= (attackerParams.maxHP / 3)) { movePower = movePower * 150 / 100; } if (moveType == TYPE_BUG - && attackerParams.ability == ABILITY_SWARM - && attackerParams.curHP <= (attackerParams.maxHP / 3)) { + && attackerParams.ability == ABILITY_SWARM + && attackerParams.curHP <= (attackerParams.maxHP / 3)) { movePower = movePower * 150 / 100; } if (moveType == TYPE_FIRE - && Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_HEATPROOF) == TRUE) { + && Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_HEATPROOF) == TRUE) { movePower /= 2; } if (moveType == TYPE_FIRE - && Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_DRY_SKIN) == TRUE) { + && Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_DRY_SKIN) == TRUE) { movePower = movePower * 125 / 100; } @@ -6901,15 +6901,15 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, spDefenseStage += 6; if (attackerParams.ability == ABILITY_RIVALRY - && attackerParams.gender == defenderParams.gender - && attackerParams.gender != GENDER_NONE - && defenderParams.gender != GENDER_NONE) { + && attackerParams.gender == defenderParams.gender + && attackerParams.gender != GENDER_NONE + && defenderParams.gender != GENDER_NONE) { movePower = movePower * 125 / 100; } if (attackerParams.ability == ABILITY_RIVALRY - && attackerParams.gender != defenderParams.gender - && attackerParams.gender != GENDER_NONE - && defenderParams.gender != GENDER_NONE) { + && attackerParams.gender != defenderParams.gender + && attackerParams.gender != GENDER_NONE + && defenderParams.gender != GENDER_NONE) { movePower = movePower * 75 / 100; } @@ -6926,18 +6926,18 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, } if ((fieldConditions & FIELD_CONDITION_SANDSTORM) - && (defenderParams.type1 == TYPE_ROCK || defenderParams.type2 == TYPE_ROCK)) { + && (defenderParams.type1 == TYPE_ROCK || defenderParams.type2 == TYPE_ROCK)) { spDefenseStat = spDefenseStat * 15 / 10; } if ((fieldConditions & FIELD_CONDITION_SUNNY) - && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_OUR_SIDE, attacker, ABILITY_FLOWER_GIFT)) { + && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_OUR_SIDE, attacker, ABILITY_FLOWER_GIFT)) { attackStat = attackStat * 15 / 10; } if ((fieldConditions & FIELD_CONDITION_SUNNY) - && Battler_Ability(battleCtx, attacker) != ABILITY_MOLD_BREAKER - && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_OUR_SIDE, defender, ABILITY_FLOWER_GIFT)) { + && Battler_Ability(battleCtx, attacker) != ABILITY_MOLD_BREAKER + && BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS_OUR_SIDE, defender, ABILITY_FLOWER_GIFT)) { spDefenseStat = spDefenseStat * 15 / 10; } } @@ -6982,10 +6982,10 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, } if ((sideConditions & SIDE_CONDITION_REFLECT) != FALSE - && criticalMul == 1 - && MOVE_DATA(move).effect != BATTLE_EFFECT_REMOVE_SCREENS) { + && criticalMul == 1 + && MOVE_DATA(move).effect != BATTLE_EFFECT_REMOVE_SCREENS) { if ((battleType & BATTLE_TYPE_DOUBLES) - && BattleSystem_CountAliveBattlers(battleSys, battleCtx, TRUE, defender) == 2) { + && BattleSystem_CountAliveBattlers(battleSys, battleCtx, TRUE, defender) == 2) { damage = damage * 2 / 3; } else { damage /= 2; @@ -7023,10 +7023,10 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, damage /= 50; if ((sideConditions & SIDE_CONDITION_LIGHT_SCREEN) != FALSE - && criticalMul == 1 - && MOVE_DATA(move).effect != BATTLE_EFFECT_REMOVE_SCREENS) { + && criticalMul == 1 + && MOVE_DATA(move).effect != BATTLE_EFFECT_REMOVE_SCREENS) { if ((battleType & BATTLE_TYPE_DOUBLES) - && BattleSystem_CountAliveBattlers(battleSys, battleCtx, TRUE, defender) == 2) { + && BattleSystem_CountAliveBattlers(battleSys, battleCtx, TRUE, defender) == 2) { damage = damage * 2 / 3; } else { damage /= 2; @@ -7035,13 +7035,13 @@ int BattleSystem_CalcMoveDamage(BattleSystem *battleSys, } if ((battleType & BATTLE_TYPE_DOUBLES) - && MOVE_DATA(move).range == RANGE_ADJACENT_OPPONENTS - && BattleSystem_CountAliveBattlers(battleSys, battleCtx, TRUE, defender) == 2) { + && MOVE_DATA(move).range == RANGE_ADJACENT_OPPONENTS + && BattleSystem_CountAliveBattlers(battleSys, battleCtx, TRUE, defender) == 2) { damage = damage * 3 / 4; } if ((battleType & BATTLE_TYPE_DOUBLES) - && MOVE_DATA(move).range == RANGE_ALL_ADJACENT - && BattleSystem_CountAliveBattlers(battleSys, battleCtx, FALSE, defender) >= 2) { + && MOVE_DATA(move).range == RANGE_ALL_ADJACENT + && BattleSystem_CountAliveBattlers(battleSys, battleCtx, FALSE, defender) >= 2) { damage = damage * 3 / 4; } @@ -7098,10 +7098,10 @@ int BattleSystem_CalcDamageVariance(BattleSystem *battleSys, BattleContext *batt // each value here is implicitly 1 / N static const u8 sCriticalStageRates[] = { 16, // neutral - 8, // +1 - 4, // +2 - 3, // +3 - 2, // +4 + 8, // +1 + 4, // +2 + 3, // +3 + 2, // +4 }; int BattleSystem_CalcCriticalMulti(BattleSystem *battleSys, BattleContext *battleCtx, int attacker, int defender, int criticalStage, u32 sideConditions) @@ -7123,21 +7123,21 @@ int BattleSystem_CalcCriticalMulti(BattleSystem *battleSys, BattleContext *battl defenderMoveEffects = battleCtx->battleMons[defender].moveEffectsMask; attackerAbility = battleCtx->battleMons[attacker].ability; effectiveCritStage = (((attackerVolStatus & VOLATILE_CONDITION_FOCUS_ENERGY) != FALSE) * 2) - + (itemEffect == HOLD_EFFECT_CRITRATE_UP) - + criticalStage - + (attackerAbility == ABILITY_SUPER_LUCK) - + (2 * (itemEffect == HOLD_EFFECT_CHANSEY_CRITRATE_UP && attackerSpecies == SPECIES_CHANSEY)) - + (2 * (itemEffect == HOLD_EFFECT_FARFETCHD_CRITRATE_UP && attackerSpecies == SPECIES_FARFETCHD)); + + (itemEffect == HOLD_EFFECT_CRITRATE_UP) + + criticalStage + + (attackerAbility == ABILITY_SUPER_LUCK) + + (2 * (itemEffect == HOLD_EFFECT_CHANSEY_CRITRATE_UP && attackerSpecies == SPECIES_CHANSEY)) + + (2 * (itemEffect == HOLD_EFFECT_FARFETCHD_CRITRATE_UP && attackerSpecies == SPECIES_FARFETCHD)); if (effectiveCritStage > 4) { effectiveCritStage = 4; } if (BattleSystem_RandNext(battleSys) % sCriticalStageRates[effectiveCritStage] == 0 - && Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_BATTLE_ARMOR) == FALSE - && Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_SHELL_ARMOR) == FALSE - && (sideConditions & SIDE_CONDITION_LUCKY_CHANT) == FALSE - && (defenderMoveEffects & MOVE_EFFECT_NO_CRITICAL) == FALSE) { + && Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_BATTLE_ARMOR) == FALSE + && Battler_IgnorableAbility(battleCtx, attacker, defender, ABILITY_SHELL_ARMOR) == FALSE + && (sideConditions & SIDE_CONDITION_LUCKY_CHANT) == FALSE + && (defenderMoveEffects & MOVE_EFFECT_NO_CRITICAL) == FALSE) { criticalMul = 2; } @@ -7148,8 +7148,8 @@ int BattleSystem_CalcCriticalMulti(BattleSystem *battleSys, BattleContext *battl return criticalMul; } -#define FORBIDDEN_BY_MIMIC_DELIM 0xFFFE -#define FORBIDDEN_BY_METRONOME_DELIM 0xFFFF +#define FORBIDDEN_BY_MIMIC_DELIM 0xFFFE +#define FORBIDDEN_BY_METRONOME_DELIM 0xFFFF static const u16 sCannotMetronomeMoves[] = { MOVE_METRONOME, @@ -7198,7 +7198,7 @@ BOOL Move_CanBeMetronomed(BattleSystem *battleSys, BattleContext *battleCtx, int int i = 0; if (Move_FailsInHighGravity(battleSys, battleCtx, battler, move) == TRUE - || Move_HealBlocked(battleSys, battleCtx, battler, move) == TRUE) { + || Move_HealBlocked(battleSys, battleCtx, battler, move) == TRUE) { return FALSE; } @@ -7321,7 +7321,7 @@ BOOL BattleSystem_ShouldShowStatusEffect(BattleContext *battleCtx, int battler, BOOL result = FALSE; if ((battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_SUBSTITUTE) - || (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_SEMI_INVULNERABLE)) { + || (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_SEMI_INVULNERABLE)) { for (int i = 0; i < NELEMS(sEffectsAlwaysShown); i++) { if (sEffectsAlwaysShown[i] == status) { result = TRUE; @@ -7345,11 +7345,11 @@ BOOL BattleSystem_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleCont int attackingSide = Battler_Side(battleSys, battleCtx->attacker); if (attackerItemEffect == HOLD_EFFECT_HP_RESTORE_ON_DMG - && (battleCtx->battleStatusMask & SYSCTL_MOVE_HIT) - && ATTACKER_SELF_TURN_FLAGS.shellBellDamageDealt - && battleCtx->attacker != battleCtx->defender - && ATTACKING_MON.curHP < ATTACKING_MON.maxHP - && ATTACKING_MON.curHP) { + && (battleCtx->battleStatusMask & SYSCTL_MOVE_HIT) + && ATTACKER_SELF_TURN_FLAGS.shellBellDamageDealt + && battleCtx->attacker != battleCtx->defender + && ATTACKING_MON.curHP < ATTACKING_MON.maxHP + && ATTACKING_MON.curHP) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKER_SELF_TURN_FLAGS.shellBellDamageDealt * -1, attackerItemPower); battleCtx->msgBattlerTemp = battleCtx->attacker; *subscript = subscript_restore_a_little_hp; @@ -7357,10 +7357,10 @@ BOOL BattleSystem_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleCont } if (attackerItemEffect == HOLD_EFFECT_HP_DRAIN_ON_ATK - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD - && (battleCtx->battleStatusMask & SYSCTL_MOVE_HIT) - && CURRENT_MOVE_DATA.class != CLASS_STATUS - && ATTACKING_MON.curHP) { + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD + && (battleCtx->battleStatusMask & SYSCTL_MOVE_HIT) + && CURRENT_MOVE_DATA.class != CLASS_STATUS + && ATTACKING_MON.curHP) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, 10); battleCtx->msgBattlerTemp = battleCtx->attacker; *subscript = subscript_lose_hp_from_item; @@ -7368,20 +7368,20 @@ BOOL BattleSystem_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleCont } if (defenderItemEffect == HOLD_EFFECT_RECOIL_PHYSICAL - && battleCtx->battleMons[battleCtx->attacker].curHP - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD - && DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken) { + && battleCtx->battleMons[battleCtx->attacker].curHP + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_MAGIC_GUARD + && DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken) { battleCtx->hpCalcTemp = BattleSystem_Divide(ATTACKING_MON.maxHP * -1, defenderItemPower); *subscript = subscript_held_item_recoil_when_hit; result = TRUE; } if (defenderItemEffect == HOLD_EFFECT_DMG_USER_CONTACT_XFR - && ATTACKING_MON.curHP - && ATTACKING_MON.heldItem == ITEM_NONE - && (battleCtx->sideConditions[attackingSide].knockedOffItemsMask & FlagIndex(battleCtx->selectedPartySlot[battleCtx->attacker])) == FALSE - && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) - && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT)) { + && ATTACKING_MON.curHP + && ATTACKING_MON.heldItem == ITEM_NONE + && (battleCtx->sideConditions[attackingSide].knockedOffItemsMask & FlagIndex(battleCtx->selectedPartySlot[battleCtx->attacker])) == FALSE + && (DEFENDER_SELF_TURN_FLAGS.physicalDamageTaken || DEFENDER_SELF_TURN_FLAGS.specialDamageTaken) + && (CURRENT_MOVE_DATA.flags & MOVE_FLAG_MAKES_CONTACT)) { *subscript = subscript_transfer_sticky_barb; result = TRUE; } @@ -7392,8 +7392,8 @@ BOOL BattleSystem_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleCont void BattleSystem_DecPPForPressure(BattleContext *battleCtx, int attacker, int defender) { if (defender != BATTLER_NONE - && Battler_Ability(battleCtx, defender) == ABILITY_PRESSURE - && battleCtx->battleMons[attacker].ppCur[battleCtx->moveSlot[attacker]]) { + && Battler_Ability(battleCtx, defender) == ABILITY_PRESSURE + && battleCtx->battleMons[attacker].ppCur[battleCtx->moveSlot[attacker]]) { battleCtx->battleMons[attacker].ppCur[battleCtx->moveSlot[attacker]]--; } } @@ -7425,37 +7425,37 @@ int BattleContext_Get(BattleSystem *battleSys, BattleContext *battleCtx, enum Ba case BATTLECTX_TOTAL_TURNS: return battleCtx->totalTurns; - + case BATTLECTX_LEVEL_UP_MONS: return battleCtx->levelUpMons; - + case BATTLECTX_SAFARI_ESCAPE_COUNT: return battleCtx->safariEscapeCount; - + case BATTLECTX_TOTAL_FAINTED_FOR: return battleCtx->totalFainted[battler]; - + case BATTLECTX_TOTAL_DAMAGE_FOR: return battleCtx->totalDamage[battler]; - + case BATTLECTX_ACTION_FOR: return battleCtx->battlerActions[battler][BATTLE_ACTION_PICK_COMMAND]; - + case BATTLECTX_AICTX_DEFENDER: return battleCtx->aiContext.defender; - + case BATTLECTX_SWITCHING_MASK: return battleCtx->battlersSwitchingMask; - + case BATTLECTX_AICTX_SELECTED_TARGET: return battleCtx->aiContext.selectedTarget[battler]; - + case BATTLECTX_ACTION_TEMP_FOR: return battleCtx->battlerActions[battler][BATTLE_ACTION_TEMP_VALUE]; - + case BATTLECTX_CONTROL_COMMAND: return battleCtx->command; - + case BATTLECTX_NEXT_CONTROL_COMMAND: return battleCtx->commandNext; } @@ -7504,11 +7504,11 @@ void BattleContext_Set(BattleSystem *battleSys, BattleContext *battleCtx, enum B /** * @brief Map the given side effect to an appropriate subscript. - * - * @param battleCtx + * + * @param battleCtx * @param type Type of side effect; see enum SideEffectType * @param effect Effect which should be mapped to a corresponding subscript - * @return int + * @return int */ static int MapSideEffectToSubscript(BattleContext *battleCtx, enum SideEffectType type, u32 effect) { @@ -7532,20 +7532,20 @@ static int MapSideEffectToSubscript(BattleContext *battleCtx, enum SideEffectTyp /** * @brief Apply the type multiplier to the given damage value and update the * move status mask. - * - * @param battleCtx - * @param attacker - * @param mul - * @param damage + * + * @param battleCtx + * @param attacker + * @param mul + * @param damage * @param update If TRUE, the move status mask will be updated - * @param[out] moveStatus + * @param[out] moveStatus * @return The resulting damage value after applying type effectiveness */ static int ApplyTypeMultiplier(BattleContext *battleCtx, int attacker, int mul, int damage, BOOL update, u32 *moveStatus) { if ((battleCtx->battleStatusMask & SYSCTL_IGNORE_TYPE_CHECKS) == FALSE - && (battleCtx->battleStatusMask & SYSCTL_IGNORE_IMMUNITIES) == FALSE - && damage) { + && (battleCtx->battleStatusMask & SYSCTL_IGNORE_IMMUNITIES) == FALSE + && damage) { damage = BattleSystem_Divide(damage * mul, 10); } @@ -7582,9 +7582,9 @@ static int ApplyTypeMultiplier(BattleContext *battleCtx, int attacker, int mul, /** * @brief Checks if a move is on its damaging turn. - * - * @param battleCtx - * @param move + * + * @param battleCtx + * @param move * @return TRUE if the move is on its damaging turn, FALSE otherwise */ static BOOL MoveIsOnDamagingTurn(BattleContext *battleCtx, int move) @@ -7609,11 +7609,11 @@ static BOOL MoveIsOnDamagingTurn(BattleContext *battleCtx, int move) /** * @brief Get the type of the battler (e.g. Normal, Fighting, etc.). - * + * * An additional layer of logic is applied to Arceus to account for Multitype. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler * @param paramID Either BATTLEMON_TYPE_1 or BATTLEMON_TYPE_2 * @return The battler's type */ @@ -7629,7 +7629,7 @@ static u8 Battler_MonType(BattleContext *battleCtx, int battler, enum BattleMonP } if (battleCtx->battleMons[battler].species == SPECIES_ARCEUS - && battleCtx->battleMons[battler].ability == ABILITY_MULTITYPE) { + && battleCtx->battleMons[battler].ability == ABILITY_MULTITYPE) { switch (BattleSystem_GetItemData(battleCtx, battleCtx->battleMons[battler].heldItem, ITEM_PARAM_HOLD_EFFECT)) { case HOLD_EFFECT_ARCEUS_FIRE: type = TYPE_FIRE; @@ -7706,9 +7706,9 @@ static u8 Battler_MonType(BattleContext *battleCtx, int battler, enum BattleMonP /** * @brief Clear the AI's knowledge of any moves for the given battler. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler */ static void BattleAI_ClearKnownMoves(BattleContext *battleCtx, u8 battler) { @@ -7719,9 +7719,9 @@ static void BattleAI_ClearKnownMoves(BattleContext *battleCtx, u8 battler) /** * @brief Clear the AI's knowledge of the given battler's ability. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler */ static void BattleAI_ClearKnownAbility(BattleContext *battleCtx, u8 battler) { @@ -7730,9 +7730,9 @@ static void BattleAI_ClearKnownAbility(BattleContext *battleCtx, u8 battler) /** * @brief Clear the AI's knowledge of the given battler's held item. - * - * @param battleCtx - * @param battler + * + * @param battleCtx + * @param battler */ static void BattleAI_ClearKnownItem(BattleContext *battleCtx, u8 battler) { @@ -7741,11 +7741,11 @@ static void BattleAI_ClearKnownItem(BattleContext *battleCtx, u8 battler) /** * @brief Choose the target for Trace. - * - * @param battleSys - * @param battleCtx - * @param defender1 - * @param defender2 + * + * @param battleSys + * @param battleCtx + * @param defender1 + * @param defender2 * @return Either of defender1 or defender2, if at least one has a Traceable * ability, or BATTLER_NONE, if there is no valid Trace target. */ @@ -7754,13 +7754,13 @@ static int ChooseTraceTarget(BattleSystem *battleSys, BattleContext *battleCtx, int trace = BATTLER_NONE; if (battleCtx->battleMons[defender1].ability != ABILITY_FORECAST - && battleCtx->battleMons[defender1].ability != ABILITY_TRACE - && battleCtx->battleMons[defender1].ability != ABILITY_MULTITYPE - && battleCtx->battleMons[defender1].curHP - && battleCtx->battleMons[defender2].curHP - && battleCtx->battleMons[defender2].ability != ABILITY_FORECAST - && battleCtx->battleMons[defender2].ability != ABILITY_TRACE - && battleCtx->battleMons[defender2].ability != ABILITY_MULTITYPE) { + && battleCtx->battleMons[defender1].ability != ABILITY_TRACE + && battleCtx->battleMons[defender1].ability != ABILITY_MULTITYPE + && battleCtx->battleMons[defender1].curHP + && battleCtx->battleMons[defender2].curHP + && battleCtx->battleMons[defender2].ability != ABILITY_FORECAST + && battleCtx->battleMons[defender2].ability != ABILITY_TRACE + && battleCtx->battleMons[defender2].ability != ABILITY_MULTITYPE) { // Both targets are eligible; choose randomly if (BattleSystem_RandNext(battleSys) & 1) { trace = defender2; @@ -7768,14 +7768,14 @@ static int ChooseTraceTarget(BattleSystem *battleSys, BattleContext *battleCtx, trace = defender1; } } else if (battleCtx->battleMons[defender1].ability != ABILITY_FORECAST - && battleCtx->battleMons[defender1].ability != ABILITY_TRACE - && battleCtx->battleMons[defender1].curHP - && battleCtx->battleMons[defender1].ability != ABILITY_MULTITYPE) { + && battleCtx->battleMons[defender1].ability != ABILITY_TRACE + && battleCtx->battleMons[defender1].curHP + && battleCtx->battleMons[defender1].ability != ABILITY_MULTITYPE) { trace = defender1; } else if (battleCtx->battleMons[defender2].ability != ABILITY_FORECAST - && battleCtx->battleMons[defender2].ability != ABILITY_TRACE - && battleCtx->battleMons[defender2].curHP - && battleCtx->battleMons[defender2].ability != ABILITY_MULTITYPE) { + && battleCtx->battleMons[defender2].ability != ABILITY_TRACE + && battleCtx->battleMons[defender2].curHP + && battleCtx->battleMons[defender2].ability != ABILITY_MULTITYPE) { trace = defender2; } @@ -7804,11 +7804,11 @@ static BOOL MoveCannotTriggerAnticipation(BattleContext *battleCtx, int move) /** * @brief Compute the type of a move which has variable typing. - * + * * This routine is functionally identical to Move_CalcVariableType. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param item The attacker's held item. Affects the typing of Natural Gift * and Judgment. * @param move The move being used. @@ -7881,11 +7881,11 @@ static int CalcMoveType(BattleSystem *battleSys, BattleContext *battleCtx, int i case MOVE_HIDDEN_POWER: type = ((battleCtx->battleMons[item].hpIV & 1) >> 0) - | ((battleCtx->battleMons[item].attackIV & 1) << 1) - | ((battleCtx->battleMons[item].defenseIV & 1) << 2) - | ((battleCtx->battleMons[item].speedIV & 1) << 3) - | ((battleCtx->battleMons[item].spAttackIV & 1) << 4) - | ((battleCtx->battleMons[item].spDefenseIV & 1) << 5); + | ((battleCtx->battleMons[item].attackIV & 1) << 1) + | ((battleCtx->battleMons[item].defenseIV & 1) << 2) + | ((battleCtx->battleMons[item].speedIV & 1) << 3) + | ((battleCtx->battleMons[item].spAttackIV & 1) << 4) + | ((battleCtx->battleMons[item].spDefenseIV & 1) << 5); type = (type * 15 / 63) + 1; if (type >= TYPE_MYSTERY) { @@ -7895,7 +7895,7 @@ static int CalcMoveType(BattleSystem *battleSys, BattleContext *battleCtx, int i case MOVE_WEATHER_BALL: if (NO_CLOUD_NINE - && battleCtx->fieldConditionsMask & FIELD_CONDITION_WEATHER) { + && battleCtx->fieldConditionsMask & FIELD_CONDITION_WEATHER) { if (WEATHER_IS_RAIN) { type = TYPE_WATER; } @@ -7944,7 +7944,7 @@ int BattleAI_PostKOSwitchIn(BattleSystem *battleSys, int battler) slot1 = battler; if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) - || (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2)) { + || (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2)) { slot2 = slot1; } else { slot2 = BattleSystem_Partner(battleSys, battler); @@ -7969,13 +7969,13 @@ int BattleAI_PostKOSwitchIn(BattleSystem *battleSys, int battler) monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL); if (monSpecies != SPECIES_NONE - && monSpecies != SPECIES_EGG - && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) - && (battlersDisregarded & FlagIndex(i)) == FALSE - && battleCtx->selectedPartySlot[slot1] != i - && battleCtx->selectedPartySlot[slot2] != i - && i != battleCtx->aiSwitchedPartySlot[slot1] - && i != battleCtx->aiSwitchedPartySlot[slot2]) { + && monSpecies != SPECIES_EGG + && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) + && (battlersDisregarded & FlagIndex(i)) == FALSE + && battleCtx->selectedPartySlot[slot1] != i + && battleCtx->selectedPartySlot[slot2] != i + && i != battleCtx->aiSwitchedPartySlot[slot1] + && i != battleCtx->aiSwitchedPartySlot[slot2]) { defenderType1 = BattleMon_Get(battleCtx, defender, BATTLEMON_TYPE_1, NULL); defenderType2 = BattleMon_Get(battleCtx, defender, BATTLEMON_TYPE_2, NULL); monType1 = Pokemon_GetValue(mon, MON_DATA_TYPE_1, NULL); @@ -8044,12 +8044,12 @@ int BattleAI_PostKOSwitchIn(BattleSystem *battleSys, int battler) monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL); if (monSpecies != SPECIES_NONE - && monSpecies != SPECIES_EGG - && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) - && battleCtx->selectedPartySlot[slot1] != i - && battleCtx->selectedPartySlot[slot2] != i - && i != battleCtx->aiSwitchedPartySlot[slot1] - && i != battleCtx->aiSwitchedPartySlot[slot2]) { + && monSpecies != SPECIES_EGG + && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) + && battleCtx->selectedPartySlot[slot1] != i + && battleCtx->selectedPartySlot[slot2] != i + && i != battleCtx->aiSwitchedPartySlot[slot1] + && i != battleCtx->aiSwitchedPartySlot[slot2]) { for (j = 0; j < LEARNED_MOVES_MAX; j++) { move = Pokemon_GetValue(mon, MON_DATA_MOVE1 + j, NULL); moveType = Move_CalcVariableType(battleSys, battleCtx, mon, move); @@ -8165,11 +8165,11 @@ int Move_CalcVariableType(BattleSystem *battleSys, BattleContext *battleCtx, Pok case MOVE_HIDDEN_POWER: type = ((Pokemon_GetValue(mon, MON_DATA_HP_IV, NULL) & 1) >> 0) - | ((Pokemon_GetValue(mon, MON_DATA_ATK_IV, NULL) & 1) << 1) - | ((Pokemon_GetValue(mon, MON_DATA_DEF_IV, NULL) & 1) << 2) - | ((Pokemon_GetValue(mon, MON_DATA_SPEED_IV, NULL) & 1) << 3) - | ((Pokemon_GetValue(mon, MON_DATA_SPATK_IV, NULL) & 1) << 4) - | ((Pokemon_GetValue(mon, MON_DATA_SPDEF_IV, NULL) & 1) << 5); + | ((Pokemon_GetValue(mon, MON_DATA_ATK_IV, NULL) & 1) << 1) + | ((Pokemon_GetValue(mon, MON_DATA_DEF_IV, NULL) & 1) << 2) + | ((Pokemon_GetValue(mon, MON_DATA_SPEED_IV, NULL) & 1) << 3) + | ((Pokemon_GetValue(mon, MON_DATA_SPATK_IV, NULL) & 1) << 4) + | ((Pokemon_GetValue(mon, MON_DATA_SPDEF_IV, NULL) & 1) << 5); type = (type * 15 / 63) + 1; if (type >= TYPE_MYSTERY) { diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index ad7cc019e1..32119a98c2 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -1,52 +1,56 @@ #include #include -#include "consts/abilities.h" -#include "consts/gender.h" - #include "constants/battle.h" #include "constants/heap.h" #include "constants/items.h" #include "constants/narc.h" #include "constants/pokemon.h" -#include "consts/sdat.h" #include "constants/species.h" #include "constants/trainer.h" +#include "consts/abilities.h" +#include "consts/gender.h" +#include "consts/sdat.h" +#include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" -#include "battle/struct_ov16_0225BFFC_decl.h" +#include "struct_defs/archived_sprite.h" +#include "struct_defs/battle_system.h" +#include "struct_defs/fraction.h" +#include "struct_defs/sprite_manager_allocation.h" +#include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" +#include "struct_defs/struct_020127E8.h" +#include "struct_defs/struct_0205AA50.h" +#include "struct_defs/struct_0208737C.h" +#include "struct_defs/trainer_data.h" -#include "struct_decls/battle_system.h" #include "battle/battle_context.h" +#include "battle/battle_controller.h" +#include "battle/battle_display.h" +#include "battle/battle_io.h" +#include "battle/battle_lib.h" #include "battle/battle_message.h" #include "battle/battle_mon.h" #include "battle/btlcmd.h" #include "battle/common.h" -#include "battle/battle_controller.h" +#include "battle/ov16_0223B140.h" +#include "battle/ov16_0223DF00.h" +#include "battle/ov16_02268520.h" #include "battle/scripts/sub_seq.naix" - -#include "constdata/const_020F2DAC.h" - -#include "struct_defs/archived_sprite.h" -#include "struct_defs/struct_0200D0F4.h" -#include "struct_defs/struct_020127E8.h" -#include "struct_defs/sprite_manager_allocation.h" -#include "struct_defs/struct_0205AA50.h" -#include "struct_defs/trainer_data.h" -#include "struct_defs/battle_system.h" -#include "struct_defs/struct_0208737C.h" -#include "struct_defs/fraction.h" -#include "overlay012/struct_ov12_02237728.h" +#include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_0225BFFC_t.h" +#include "overlay012/ov12_02235E94.h" +#include "overlay012/struct_ov12_02237728.h" +#include "overlay021/ov21_021E8D48.h" #include "overlay021/struct_ov21_021E8E0C.h" -#include "struct_defs/sprite_template.h" #include "core_sys.h" #include "flags.h" @@ -54,20 +58,21 @@ #include "item.h" #include "message.h" #include "move_table.h" +#include "overlay_manager.h" #include "party.h" #include "pokemon.h" +#include "pokemon_icon.h" #include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "touch_screen.h" #include "trainer_data.h" #include "trainer_info.h" - #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006224.h" -#include "overlay_manager.h" #include "unk_0200762C.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02012744.h" @@ -76,22 +81,14 @@ #include "unk_0201D670.h" #include "unk_0201E86C.h" #include "unk_020218BC.h" -#include "touch_screen.h" #include "unk_020797C8.h" -#include "pokemon_icon.h" #include "unk_0207A274.h" #include "unk_0208694C.h" #include "unk_0208C098.h" -#include "overlay012/ov12_02235E94.h" -#include "battle/ov16_0223B140.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_lib.h" -#include "battle/battle_display.h" -#include "battle/battle_io.h" -#include "battle/ov16_02268520.h" -#include "overlay021/ov21_021E8D48.h" -typedef BOOL (*BtlCmd)(BattleSystem*, BattleContext*); +#include "constdata/const_020F2DAC.h" + +typedef BOOL (*BtlCmd)(BattleSystem *, BattleContext *); typedef struct BattleMessageParams { int id; //< ID of the message in the battle text bank @@ -167,7 +164,7 @@ static BOOL BtlCmd_LockMoveChoice(BattleSystem *battleSys, BattleContext *battle static BOOL BtlCmd_UnlockMoveChoice(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_SetHealthbarStatus(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PrintTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx); -static BOOL BtlCmd_PayPrizeMoney(BattleSystem * param0, BattleContext * param1); +static BOOL BtlCmd_PayPrizeMoney(BattleSystem *param0, BattleContext *param1); static BOOL BtlCmd_PlayBattleAnimation(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PlayBattleAnimationOnMons(BattleSystem *battleSys, BattleContext *battleCtx); static BOOL BtlCmd_PlayBattleAnimationFromVar(BattleSystem *battleSys, BattleContext *battleCtx); @@ -327,7 +324,7 @@ static int BattleScript_Read(BattleContext *battleCtx); static void BattleScript_Iter(BattleContext *battleCtx, int i); static void BattleScript_Jump(BattleContext *battleCtx, int narc, int file); static void BattleScript_Call(BattleContext *battleCtx, int narc, int file); -static void* BattleScript_VarAddress(BattleSystem *battleSys, BattleContext *battleCtx, int var); +static void *BattleScript_VarAddress(BattleSystem *battleSys, BattleContext *battleCtx, int var); static int BattleScript_Battler(BattleSystem *battleSys, BattleContext *battleCtx, int battlerIn); static void BattleScript_CalcMoveDamage(BattleSystem *battleSys, BattleContext *battleCtx); @@ -347,11 +344,11 @@ static int BattleMessage_FlavorTag(BattleContext *battleCtx, int battlerIn); static int BattleMessage_TrainerClassTag(BattleSystem *battleSys, BattleContext *battleCtx, int battlerIn); static int BattleMessage_TrainerNameTag(BattleSystem *battleSys, BattleContext *battleCtx, int battlerIn); -static u32 BattleScript_CalcPrizeMoney(BattleSystem * param0, BattleContext * param1, int param2); +static u32 BattleScript_CalcPrizeMoney(BattleSystem *param0, BattleContext *param1, int param2); static void BattleScript_CalcEffortValues(Party *party, int slot, int species, int form); static int BattleScript_CalcCatchShakes(BattleSystem *battleSys, BattleContext *battleCtx); -static void BattleScript_LoadPartyLevelUpIcon(BattleSystem * param0, BattleScriptTaskData * param1, Pokemon * param2); -static void BattleScript_FreePartyLevelUpIcon(BattleSystem * param0, BattleScriptTaskData * param1); +static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScriptTaskData *param1, Pokemon *param2); +static void BattleScript_FreePartyLevelUpIcon(BattleSystem *param0, BattleScriptTaskData *param1); static void BattleScript_UpdateFriendship(BattleSystem *battleSys, BattleContext *battleCtx, int faintingBattler); static void BattleAI_SetAbility(BattleContext *battleCtx, u8 battler, u8 ability); static void BattleAI_SetHeldItem(BattleContext *battleCtx, u8 battler, u16 item); @@ -591,7 +588,7 @@ BOOL BattleScript_Exec(BattleSystem *battleSys, BattleContext *battleCtx) do { result = sBattleCommands[battleCtx->battleScript[battleCtx->scriptCursor]](battleSys, battleCtx); } while (battleCtx->battleProgressFlag == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE); + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_LINK) == FALSE); battleCtx->battleProgressFlag = FALSE; return result; @@ -599,9 +596,9 @@ BOOL BattleScript_Exec(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Setup the battle UI from our POV. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PlayEncounterAnimation(BattleSystem *battleSys, BattleContext *battleCtx) @@ -614,14 +611,14 @@ static BOOL BtlCmd_PlayEncounterAnimation(BattleSystem *battleSys, BattleContext /** * @brief Set a wild Pokemon as the battle encounter. - * + * * This also flags the encounter as seen in the Pokedex. - * + * * Inputs: * 1. the battler for whom the wild Pokemon will be set as the encounter - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_SetPokemonEncounter(BattleSystem *battleSys, BattleContext *battleCtx) @@ -661,14 +658,14 @@ static BOOL BtlCmd_SetPokemonEncounter(BattleSystem *battleSys, BattleContext *b /** * @brief Show a wild encounter. - * + * * This also marks eligible battlers for experience gain. - * + * * Inputs: * 1. the battler who will be shown - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PokemonSlideIn(BattleSystem *battleSys, BattleContext *battleCtx) @@ -767,14 +764,14 @@ static BOOL BtlCmd_PokemonSlideIn(BattleSystem *battleSys, BattleContext *battle /** * @brief Show a Pokemon. - * + * * This also marks eligible battlers for experience gain. - * + * * Inputs: * 1. the battler who will be shown - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PokemonSendOut(BattleSystem *battleSys, BattleContext *battleCtx) @@ -873,12 +870,12 @@ static BOOL BtlCmd_PokemonSendOut(BattleSystem *battleSys, BattleContext *battle /** * @brief Return a Pokemon to its Poke Ball. - * + * * Inputs: * 1. the battler who will be returned to its Poke Ball - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_RecallPokemon(BattleSystem *battleSys, BattleContext *battleCtx) @@ -911,8 +908,7 @@ static BOOL BtlCmd_RecallPokemon(BattleSystem *battleSys, BattleContext *battleC for (i = 0; i < maxBattlers; i++) { battlerData = BattleSystem_BattlerData(battleSys, i); - if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) && - (battleCtx->battlersSwitchingMask & FlagIndex(i)) == FALSE) { + if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) && (battleCtx->battlersSwitchingMask & FlagIndex(i)) == FALSE) { BattleIO_ReturnPokemon(battleSys, battleCtx, i); } } @@ -929,12 +925,12 @@ static BOOL BtlCmd_RecallPokemon(BattleSystem *battleSys, BattleContext *battleC /** * @brief Delete a Pokemon's sprite. - * + * * Inputs: * 1. the battler whose sprite will be deleted - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_DeletePokemon(BattleSystem *battleSys, BattleContext *battleCtx) @@ -951,12 +947,12 @@ static BOOL BtlCmd_DeletePokemon(BattleSystem *battleSys, BattleContext *battleC /** * @brief Set a trainer as the battle encounter. - * + * * Inputs: * 1. the battler for whom the trainer will be set as the encounter - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *battleCtx) @@ -982,8 +978,8 @@ static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *b } else { for (i = 0; i < maxBattlers; i++) { if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) - && i > 1) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) + && i > 1) { break; } @@ -1000,7 +996,7 @@ static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *b BattleIO_SetTrainerEncounter(battleSys, i); if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1015,8 +1011,8 @@ static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *b BattleIO_SetTrainerEncounter(battleSys, i); if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1029,16 +1025,16 @@ static BOOL BtlCmd_SetTrainerEncounter(BattleSystem *battleSys, BattleContext *b /** * @brief Play the ball-throw animation for a battler. - * + * * Inputs: * 1. the battler whose ball is to be thrown * 2. the type of ball that the battler will throw - * + * * Side effects: * - battleCtx->battleProgressFlag will be set to TRUE. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_ThrowPokeball(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1057,8 +1053,8 @@ static BOOL BtlCmd_ThrowPokeball(BattleSystem *battleSys, BattleContext *battleC case BTLSCR_ALL_BATTLERS: for (i = 0; i < maxBattlers; i++) { if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) - && i > 1) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) + && i > 1) { break; } @@ -1074,7 +1070,7 @@ static BOOL BtlCmd_ThrowPokeball(BattleSystem *battleSys, BattleContext *battleC BattleIO_ThrowTrainerBall(battleSys, i, ballTypeIn); if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1089,8 +1085,8 @@ static BOOL BtlCmd_ThrowPokeball(BattleSystem *battleSys, BattleContext *battleC BattleIO_ThrowTrainerBall(battleSys, i, ballTypeIn); if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1104,12 +1100,12 @@ static BOOL BtlCmd_ThrowPokeball(BattleSystem *battleSys, BattleContext *battleC /** * @brief Slide a trainer's sprite out of view. - * + * * Inputs: * 1. the battler whose sprite is to be moved - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1119,7 +1115,7 @@ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battl BattlerData *battlerData; BattleScript_Iter(battleCtx, 1); - + int battlerIn = BattleScript_Read(battleCtx); switch (battlerIn) { @@ -1127,8 +1123,8 @@ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battl case BTLSCR_ALL_BATTLERS: for (i = 0; i < maxBattlers; i++) { if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) - && i > 1) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) + && i > 1) { break; } @@ -1144,7 +1140,7 @@ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battl BattleIO_SlideTrainerOut(battleSys, i); if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1159,8 +1155,8 @@ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battl BattleIO_SlideTrainerOut(battleSys, i); if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_2vs2) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE - && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) == FALSE + && (BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES)) { break; } } @@ -1172,7 +1168,7 @@ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battl battlerData = BattleSystem_BattlerData(battleSys, i); if (battlerData->battlerType == BATTLER_TYPE_SOLO_PLAYER - || battlerData->battlerType == BATTLER_TYPE_PLAYER_SIDE_SLOT_1) { + || battlerData->battlerType == BATTLER_TYPE_PLAYER_SIDE_SLOT_1) { BattleIO_SlideTrainerOut(battleSys, i); break; } @@ -1184,7 +1180,7 @@ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battl battlerData = BattleSystem_BattlerData(battleSys, i); if (battlerData->battlerType == BATTLER_TYPE_SOLO_ENEMY - || battlerData->battlerType == BATTLER_TYPE_ENEMY_SIDE_SLOT_1) { + || battlerData->battlerType == BATTLER_TYPE_ENEMY_SIDE_SLOT_1) { BattleIO_SlideTrainerOut(battleSys, i); break; } @@ -1219,14 +1215,14 @@ static BOOL BtlCmd_TrainerSlideOut(BattleSystem *battleSys, BattleContext *battl /** * @brief Slide a trainer's sprite into view. - * + * * Inputs: * 1. the battler whose sprite is to be moved * 2. the position that the trainer should be moved into (i.e. the trainer's slot * on their side of the field) - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TrainerSlideIn(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1245,7 +1241,7 @@ static BOOL BtlCmd_TrainerSlideIn(BattleSystem *battleSys, BattleContext *battle case BTLSCR_ALL_BATTLERS: for (i = 0; i < maxBattlers; i++) { if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_DOUBLES) - && i > 1) { + && i > 1) { break; } @@ -1286,7 +1282,7 @@ static BOOL BtlCmd_TrainerSlideIn(BattleSystem *battleSys, BattleContext *battle battlerData = BattleSystem_BattlerData(battleSys, i); if (battlerData->battlerType == BATTLER_TYPE_SOLO_PLAYER - || battlerData->battlerType == BATTLER_TYPE_PLAYER_SIDE_SLOT_1) { + || battlerData->battlerType == BATTLER_TYPE_PLAYER_SIDE_SLOT_1) { BattleIO_SlideTrainerIn(battleSys, i, posIn); break; } @@ -1298,7 +1294,7 @@ static BOOL BtlCmd_TrainerSlideIn(BattleSystem *battleSys, BattleContext *battle battlerData = BattleSystem_BattlerData(battleSys, i); if (battlerData->battlerType == BATTLER_TYPE_SOLO_ENEMY - || battlerData->battlerType == BATTLER_TYPE_ENEMY_SIDE_SLOT_1) { + || battlerData->battlerType == BATTLER_TYPE_ENEMY_SIDE_SLOT_1) { BattleIO_SlideTrainerIn(battleSys, i, posIn); break; } @@ -1347,13 +1343,13 @@ static BOOL BtlCmd_BackgroundSlideIn(BattleSystem *battleSys, BattleContext *bat /** * @brief Slide the HP gauge in for a battler. - * + * * Inputs: * 1. the battler whose HP gauge should be moved - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_HealthbarSlideIn(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -1404,13 +1400,13 @@ static BOOL BtlCmd_HealthbarSlideIn(BattleSystem *battleSys, BattleContext *batt /** * @brief Slide the HP gauge in for all battlers on a given side, * delaying between them. - * + * * Inputs: * 1. the side whose battlers' HP gauge should be moved - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_HealthbarSlideInDelay(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -1463,13 +1459,13 @@ static BOOL BtlCmd_HealthbarSlideInDelay(BattleSystem *battleSys, BattleContext /** * @brief Slide the HP gauge out for a battler. - * + * * Inputs: * 1. the battler whose HP gauge should be moved - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_HealthbarSlideOut(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -1478,7 +1474,7 @@ static BOOL BtlCmd_HealthbarSlideOut(BattleSystem *battleSys, BattleContext *bat BattlerData *battlerData; BattleScript_Iter(battleCtx, 1); - + int battlerIn = BattleScript_Read(battleCtx); switch (battlerIn) { @@ -1493,7 +1489,7 @@ static BOOL BtlCmd_HealthbarSlideOut(BattleSystem *battleSys, BattleContext *bat battlerData = BattleSystem_BattlerData(battleSys, i); if ((battlerData->battlerType & BATTLER_TYPE_SOLO_ENEMY) == FALSE - && (battleCtx->battlersSwitchingMask & FlagIndex(i)) == FALSE) { + && (battleCtx->battlersSwitchingMask & FlagIndex(i)) == FALSE) { BattleIO_SlideHealthbarOut(battleSys, i); } } @@ -1520,18 +1516,18 @@ static BOOL BtlCmd_HealthbarSlideOut(BattleSystem *battleSys, BattleContext *bat /** * @brief Wait until the battle IO queue is empty. - * + * * This command ensures that all linked battlers are in sync with the present * state of the battle after a given action. CompareVarToValue any linked battler hangs in * this state for 1800 frames (~30 seconds), then the link status will be set * to an error state, forcing the battle to end. - * + * * Side effects: * - battleCtx->battleProgressFlag will be set to TRUE. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_Wait(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -1548,15 +1544,15 @@ static BOOL BtlCmd_Wait(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Calculate the damage for the current move and store the result in * the BattleContext struct. - * + * * Aside from the standard damage calc, this is where the following effects * have their damage amplification properties applied: * - Life Orb * - Metronome * - Me First - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ static void BattleScript_CalcMoveDamage(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -1570,15 +1566,15 @@ static void BattleScript_CalcMoveDamage(BattleSystem *battleSys, BattleContext * } battleCtx->damage = BattleSystem_CalcMoveDamage(battleSys, - battleCtx, - battleCtx->moveCur, - battleCtx->sideConditionsMask[Battler_Side(battleSys, battleCtx->defender)], - battleCtx->fieldConditionsMask, - battleCtx->movePower, - moveType, - battleCtx->attacker, - battleCtx->defender, - battleCtx->criticalMul); + battleCtx, + battleCtx->moveCur, + battleCtx->sideConditionsMask[Battler_Side(battleSys, battleCtx->defender)], + battleCtx->fieldConditionsMask, + battleCtx->movePower, + moveType, + battleCtx->attacker, + battleCtx->defender, + battleCtx->criticalMul); battleCtx->damage *= battleCtx->criticalMul; if (Battler_HeldItemEffect(battleCtx, battleCtx->attacker) == HOLD_EFFECT_HP_DRAIN_ON_ATK) { @@ -1606,13 +1602,13 @@ static void BattleScript_CalcMoveDamage(BattleSystem *battleSys, BattleContext * /** * @brief Calculate the damage for the current move, applying random variance * to the computed value. - * + * * Side effects: * - battleCtx->damage will have its value set to the final damage value to be * added to the target's HP. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CalcDamage(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1628,13 +1624,13 @@ static BOOL BtlCmd_CalcDamage(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Calculate the maximum damage for the current move. - * + * * Side effects: * - battleCtx->damage will have its value set to the final damage value to be * added to the target's HP. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CalcMaxDamage(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1649,13 +1645,13 @@ static BOOL BtlCmd_CalcMaxDamage(BattleSystem *battleSys, BattleContext *battleC /** * @brief Print the attack message, i.e., "Cloyster used Icicle Spear!" - * + * * Side effects: * - System control will be flagged to skip all future attack messages * - System control will be flagged that the attack message has been shown - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PrintAttackMessage(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1679,9 +1675,9 @@ static BOOL BtlCmd_PrintAttackMessage(BattleSystem *battleSys, BattleContext *ba * 1. The ID of the message to be shown in the battle text bank. * 2. A tag value specifying what varargs to expect and in what order. * .. varargs to the string formatter. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PrintMessage(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1690,7 +1686,7 @@ static BOOL BtlCmd_PrintMessage(BattleSystem *battleSys, BattleContext *battleCt BattleMessageParams msgParams; BattleMessageParams_Make(battleCtx, &msgParams); - + BattleMessage msg; BattleMessage_Make(battleSys, battleCtx, &msgParams, &msg); @@ -1701,7 +1697,7 @@ static BOOL BtlCmd_PrintMessage(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Print a global message. - * + * * This is for messages which do not pertain to any particular battler or side * of the battlefield, e.g., weather continuation messages ("Rain continues to * fall.", "The sandstorm rages.", etc.). @@ -1710,10 +1706,10 @@ static BOOL BtlCmd_PrintMessage(BattleSystem *battleSys, BattleContext *battleCt * 1. The ID of the message to be shown in the battle text bank. * 2. A tag value specifying what varargs to expect and in what order. * .. varargs to the string formatter. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_PrintGlobalMessage(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -1721,7 +1717,7 @@ static BOOL BtlCmd_PrintGlobalMessage(BattleSystem *battleSys, BattleContext *ba BattleMessageParams msgParams; BattleMessageParams_Make(battleCtx, &msgParams); - + BattleMessage msg; BattleMessage_Make(battleSys, battleCtx, &msgParams, &msg); @@ -1733,11 +1729,11 @@ static BOOL BtlCmd_PrintGlobalMessage(BattleSystem *battleSys, BattleContext *ba /** * @brief Print the prepared message. - * + * * This, specifically, prints the contents of battleCtx->msgBuffer. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PrintBufferedMessage(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1755,14 +1751,14 @@ static BOOL BtlCmd_PrintBufferedMessage(BattleSystem *battleSys, BattleContext * * 1. The ID of the message to be shown in the battle text bank. * 2. A tag value specifying what varargs to expect and in what order. * .. varargs to the string formatter. - * + * * Side effects: * - The contents of the prepared message are stored in battleCtx->msgBuffer. * This message can later be printed by invoking PrintBufferedMessage. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_BufferMessage(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -1783,10 +1779,10 @@ static BOOL BtlCmd_BufferMessage(BattleSystem *battleSys, BattleContext *battleC * 2. The ID of the message to be shown in the battle text bank. * 3. A tag value specifying what varargs to expect and in what order. * .. varargs to the string formatter. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_BufferLocalMessage(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -1808,14 +1804,14 @@ static BOOL BtlCmd_BufferLocalMessage(BattleSystem *battleSys, BattleContext *ba /** * @brief Play a move animation, if move animations are enabled. - * + * * Inputs: * 1. The location from which the animation is sourced. CompareVarToValue the input here is * BTLSCR_MSG_TEMP, then the move to load is picked from battleCtx->msgMoveTemp. * Otherwise, it is picked from battleCtx->moveCur. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PlayMoveAnimation(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1831,7 +1827,7 @@ static BOOL BtlCmd_PlayMoveAnimation(BattleSystem *battleSys, BattleContext *bat } if (((battleCtx->battleStatusMask & SYSCTL_PLAYED_MOVE_ANIMATION) == FALSE && BattleSystem_AnimationsOn(battleSys) == TRUE) - || move == MOVE_TRANSFORM) { + || move == MOVE_TRANSFORM) { battleCtx->battleStatusMask |= SYSCTL_PLAYED_MOVE_ANIMATION; BattleIO_PlayMoveAnimation(battleSys, battleCtx, move); } @@ -1846,16 +1842,16 @@ static BOOL BtlCmd_PlayMoveAnimation(BattleSystem *battleSys, BattleContext *bat /** * @brief Play a move animation from the given attacker toward the given defender, * if move animations are enabled. - * + * * Inputs: * 1. The location from which the animation is sourced. CompareVarToValue the input here is * BTLSCR_MSG_TEMP, then the move to load is picked from battleCtx->msgMoveTemp. * Otherwise, it is picked from battleCtx->moveCur. * 2. The attacker for the move animation. * 3. The defender for the move animation. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PlayMoveAnimationOnMons(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1876,7 +1872,7 @@ static BOOL BtlCmd_PlayMoveAnimationOnMons(BattleSystem *battleSys, BattleContex int defender = BattleScript_Battler(battleSys, battleCtx, inDefender); if (((battleCtx->battleStatusMask & SYSCTL_PLAYED_MOVE_ANIMATION) == FALSE && BattleSystem_AnimationsOn(battleSys) == TRUE) - || move == MOVE_TRANSFORM) { + || move == MOVE_TRANSFORM) { battleCtx->battleStatusMask |= SYSCTL_PLAYED_MOVE_ANIMATION; BattleIO_PlayMoveAnimationA2D(battleSys, battleCtx, move, attacker, defender); } @@ -1890,9 +1886,9 @@ static BOOL BtlCmd_PlayMoveAnimationOnMons(BattleSystem *battleSys, BattleContex /** * @brief Flicker a battler's sprite (e.g., when it is damaged). - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_FlickerMon(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1910,13 +1906,13 @@ static BOOL BtlCmd_FlickerMon(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Update the HP value for a battler according to damage stored in the * battle context. - * + * * Damage to be deducted from the battler's current HP is pulled from * battleCtx->hpCalcTemp. - * + * * Inputs: * 1. The battler whose HP value is to be updated. - * + * * Side effects: * - battleCtx->hitDamage is updated to be the damage taken, capped to the * battler's current HP. @@ -1924,9 +1920,9 @@ static BOOL BtlCmd_FlickerMon(BattleSystem *battleSys, BattleContext *battleCtx) * - the battler's current HP is adjusted to the new value after applying * the taken damage, capped to its maximum HP (in case the damage taken * results in healing, e.g. via Volt Absorb). - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_UpdateHealthBarValue(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1962,12 +1958,12 @@ static BOOL BtlCmd_UpdateHealthBarValue(BattleSystem *battleSys, BattleContext * /** * @brief Update the HP gauge for a battler with their new current HP. - * + * * Inputs: * 1. The battler whose HP gauge is to be updated. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_UpdateHealthBar(BattleSystem *battleSys, BattleContext *battleCtx) @@ -1983,19 +1979,19 @@ static BOOL BtlCmd_UpdateHealthBar(BattleSystem *battleSys, BattleContext *battl /** * @brief Flags the given battler as fainted. - * + * * Inputs: * 1. The battler which is to be fainted. - * + * * Side effects: * - battleCtx->faintedMon will be set to the input battler * - The system's flag for the fainted battler will be flipped on * - The total number of mons fainted for the battler's trainer will be * incremented * - The friendship of the Pokemon will be updated after fainting - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryFaintMon(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2017,16 +2013,16 @@ static BOOL BtlCmd_TryFaintMon(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Play the fainting sequence for a fainted battler. - * + * * Side effects: * - The system's flag for the fainted battler will be flipped off * - The system's flag for EXP payout on the fainted battler will be * flipped on * - The fainted battler will have their control state skipped to * MOVE_END - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PlayFaintAnimation(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2045,17 +2041,17 @@ static BOOL BtlCmd_PlayFaintAnimation(BattleSystem *battleSys, BattleContext *ba /** * @brief Wait a specified number of frames. - * + * * Non-Link battles can skip the wait with a button press. - * + * * Inputs: * 1. The number of frames to wait at this instruction - * + * * Side effects: * - battleCtx->battleProgressFlag will be set to TRUE. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_WaitButtonABTime(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2090,16 +2086,16 @@ static BOOL BtlCmd_WaitButtonABTime(BattleSystem *battleSys, BattleContext *batt /** * @brief Play a sound originating from a particular battler. - * + * * Inputs: * 1. The battler from which the sound originates. This is used for determining * from which of the DS's stereo speakers to pan the sound. Enemies will have * their sounds pan from the right, while allies will have their sounds pan from * the left. * 2. The SDAT ID to play. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PlaySound(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2115,15 +2111,15 @@ static BOOL BtlCmd_PlaySound(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Compare a given data-value from a variable to a target static value. - * + * * Inputs: * 1. The operation mode. See enum OpCode for possible values. * 2. The variable whose data should be retrieved for the comparison. * 3. The static value to compare against. * 4. The jump-ahead value if the comparison yields TRUE. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CompareVarToValue(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2193,16 +2189,16 @@ static BOOL BtlCmd_CompareVarToValue(BattleSystem *battleSys, BattleContext *bat /** * @brief Compare a given data-value from a battler to a target static value. - * + * * Inputs: * 1. The operation mode. See enum OpCode for possible values. * 2. The battler whose data should be retrieved for the comparison. * 3. The parameter to retrieve for the comparison. * 4. The static value to compare against. * 5. The jump-ahead value if the comparison yields TRUE. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CompareMonDataToValue(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2275,9 +2271,9 @@ static BOOL BtlCmd_CompareMonDataToValue(BattleSystem *battleSys, BattleContext /** * @brief Perform a screen fade at the end of a battle to transition out of * the battle UI. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_FadeOutBattle(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2290,13 +2286,13 @@ static BOOL BtlCmd_FadeOutBattle(BattleSystem *battleSys, BattleContext *battleC /** * @brief GoTo to a subroutine sequence, abandoning the current script. - * + * * Inputs: * 1. The subroutine sequence to jump to. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_GoToSubscript(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -2310,9 +2306,9 @@ static BOOL BtlCmd_GoToSubscript(BattleSystem *battleSys, BattleContext *battleC /** * @brief GoTo to the battle effect sequence for the current move. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_GoToEffectScript(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2326,14 +2322,14 @@ static BOOL BtlCmd_GoToEffectScript(BattleSystem *battleSys, BattleContext *batt /** * @brief GoTo to the move sequence for the chosen move. - * + * * This is specifically for moves which call other moves (e.g., Assist, Me * First, Metronome, Sleep Talk) by setting battleCtx->msgMoveTemp. - * + * * Inputs: * 1. A flag indicating if the target is set on input. In practice, this is * always FALSE in vanilla. - * + * * Side effects: * - The system control flag to skip the attack message is turned off. * - The system control flag signalling that the move's animation has played @@ -2341,10 +2337,10 @@ static BOOL BtlCmd_GoToEffectScript(BattleSystem *battleSys, BattleContext *batt * - battleCtx->moveCur is reassigned to battleCtx->msgMoveTemp. * - The defender is assigned for the move. * - The battler's chosen target is reassigned to the assigned defender. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_GoToMoveScript(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -2373,24 +2369,24 @@ static BOOL BtlCmd_GoToMoveScript(BattleSystem *battleSys, BattleContext *battle /** * @brief Check if a critical hit should occur. - * + * * CompareVarToValue the battle is either the catching tutorial or the player's first battle, * then this will always flag no critical hits. - * + * * Side effects: * - battleCtx->criticalMul is set to the multiplier to be applied to the total * move damage for a critical hit. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcCrit(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); if ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_CATCH_TUTORIAL) - || (BattleSystem_BattleStatus(battleSys) & BATTLE_STATUS_FIRST_BATTLE)) { + || (BattleSystem_BattleStatus(battleSys) & BATTLE_STATUS_FIRST_BATTLE)) { battleCtx->criticalMul = 1; } else { battleCtx->criticalMul = BattleSystem_CalcCriticalMulti(battleSys, @@ -2407,20 +2403,20 @@ static BOOL BtlCmd_CalcCrit(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Calculate the amount of experience to be given to each participating * battler. - * + * * Inputs: * 1. The jump distance if no experience is to be given. i.e., the defeated * battler is an ally, or the battle type explicitly forbids experience gain. - * + * * Side effects: * - battleCtx->gainedExp will be updated with the amount of experience to be * given to each participating battler. * - battleCtx->sharedExp will be updated with the amount of experience to be * given to each participating battler which was holding an Exp Share. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcExpGain(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -2540,14 +2536,14 @@ enum { /** * @brief Start the experience point allocation state machine. - * + * * The kicked-off state machine is responsible for controlling the flow of * events in the experience-gain UX. It will perform distribution, check for * level-up events, display new stats, and prompt the player if a new move is * to be learned. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_StartGetExpTask(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2567,12 +2563,12 @@ static BOOL BtlCmd_StartGetExpTask(BattleSystem *battleSys, BattleContext *battl /** * @brief Waits until the experience-distribution task has completed. - * + * * Side effects: * - battleCtx->battleProgressFlag will be set to TRUE. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_WaitGetExpTask(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2588,11 +2584,11 @@ static BOOL BtlCmd_WaitGetExpTask(BattleSystem *battleSys, BattleContext *battle /** * @brief Chomps an additional word out of the buffer. - * + * * Does nothing else. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_Dummy2A(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2605,12 +2601,12 @@ static BOOL BtlCmd_Dummy2A(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Show the party list. - * + * * This command explicitly does not allow the player to cancel switching; * it should be invoked only when a switch is _forced_ and cannot be undone. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_ShowParty(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2634,7 +2630,7 @@ static BOOL BtlCmd_ShowParty(BattleSystem *battleSys, BattleContext *battleCtx) // CompareVarToValue both battlers are done selecting replacements, wait for all other battlers int partner = BattleSystem_Partner(battleSys, battler); if ((switchingMask & FlagIndex(battler)) == FALSE - && (switchingMask & FlagIndex(partner)) == FALSE) { + && (switchingMask & FlagIndex(partner)) == FALSE) { switchingMask |= FlagIndex(battler); BattleIO_LinkWaitMessage(battleSys, battler); } @@ -2656,12 +2652,12 @@ static BOOL BtlCmd_ShowParty(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Wait for all battlers in the midst of selecting replacement battlers * to finish selecting their replacements. - * + * * Side effects: * - battleCtx->battleProgressFlag will be set to TRUE. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_WaitMonSelection(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2678,7 +2674,7 @@ static BOOL BtlCmd_WaitMonSelection(BattleSystem *battleSys, BattleContext *batt for (battler = 0; battler < maxBattlers; battler++) { if ((battleCtx->battlerStatusFlags[battler] & BATTLER_STATUS_SWITCHING) - && BattleContext_IOBufferVal(battleCtx, battler)) { + && BattleContext_IOBufferVal(battleCtx, battler)) { battleCtx->switchedPartySlot[battler] = battleCtx->ioBuffer[battler][0] - 1; totalSwitching--; @@ -2692,7 +2688,7 @@ static BOOL BtlCmd_WaitMonSelection(BattleSystem *battleSys, BattleContext *batt if (totalSwitching == 0) { for (battler = 0; battler < maxBattlers; battler++) { if ((battleCtx->battlerStatusFlags[battler] & BATTLER_STATUS_SWITCHING) - && BattleContext_IOBufferVal(battleCtx, battler)) { + && BattleContext_IOBufferVal(battleCtx, battler)) { BattleSystem_Record(battleSys, battler, battleCtx->ioBuffer[battler][0]); } } @@ -2707,10 +2703,10 @@ static BOOL BtlCmd_WaitMonSelection(BattleSystem *battleSys, BattleContext *batt /** * @brief SwitchAndUpdateMon a battler for another. - * + * * Inputs: * 1. The battler who is switching - * + * * Side effects: * - Flips the switching flag off for the battler status flags * - Flips the battler-specific flag off for the switching mask @@ -2718,10 +2714,10 @@ static BOOL BtlCmd_WaitMonSelection(BattleSystem *battleSys, BattleContext *batt * - Caches the enemy's current HP value in battleCtx->hpTemp * - Invokes InitBattleMon, SwitchSlots, and UpdateAfterSwitch; refer to the * docs for those routines for more detailed information - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_SwitchAndUpdateMon(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -2764,13 +2760,13 @@ static BOOL BtlCmd_SwitchAndUpdateMon(BattleSystem *battleSys, BattleContext *ba /** * @brief GoTo to the designated address if any battlers are switching. - * + * * Inputs: * 1. The jump distance - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_GoToIfAnySwitches(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -2793,16 +2789,16 @@ static BOOL BtlCmd_GoToIfAnySwitches(BattleSystem *battleSys, BattleContext *bat /** * @brief Start the Pokemon capture state machine. - * + * * The kicked-off state machine is responsible for controlling the flow of * events in the capture UX. It will calculate the capture rate, show the * correct number of shakes, etc. - * + * * Inputs: * 1. Whether or not the capture is in the Great Marsh. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_StartCatchMonTask(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2824,13 +2820,13 @@ static BOOL BtlCmd_StartCatchMonTask(BattleSystem *battleSys, BattleContext *bat /** * @brief Waits until the Pokemon capture task has completed. - * + * * Side effects: * - battleCtx->battleProgressFlag will be set to TRUE. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_WaitCatchMonTask(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -2846,7 +2842,7 @@ static BOOL BtlCmd_WaitCatchMonTask(BattleSystem *battleSys, BattleContext *batt /** * @brief Setup the initial state for a multi-hit move (e.g., Spike Cannon, * Twineedle, Triple Kick). - * + * * Inputs: * 1. The number of hits to apply to the move. CompareVarToValue this value is passed as 0, * then a number of hits will be generated from 2 through 5. CompareVarToValue the attacker @@ -2860,14 +2856,14 @@ static BOOL BtlCmd_WaitCatchMonTask(BattleSystem *battleSys, BattleContext *batt * - SYSCTL_SKIP_ACCURACY_CHECK -> do not check accuracy after the first hit * - SYSCTL_SKIP_ACCURACY_OVERRIDES -> same as SYSCTL_SKIP_ACCURACY_CHECK * - SYSCTL_SKIP_STOLEN_CHECK -> do not check for the move to be stolen after the first hit - * + * * In practice, there are two variants of flags submitted to this command call: * 1. Triple Kick, which omits the SYSCTL_SKIP_ACCURACY_CHECK flag * 2. All other multi-hit moves, which include the SYSCTL_SKIP_ACCURACY_CHECK flag - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_SetMultiHit(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -2900,14 +2896,14 @@ static BOOL BtlCmd_SetMultiHit(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Update the value of a variable using an operation applied to itself * and a static source value. - * + * * Inputs: * 1. The operation to apply; see enum OpCode for possible values. * 2. ID of the variable to target as a source operand and the destination. * 3. A static source value to use as the second operand. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_UpdateVar(BattleSystem *battleSys, BattleContext *battleCtx) @@ -2928,7 +2924,7 @@ static BOOL BtlCmd_UpdateVar(BattleSystem *battleSys, BattleContext *battleCtx) case OPCODE_ADD: *var += srcVal; break; - + case OPCODE_SUB: *var -= srcVal; break; @@ -2993,7 +2989,7 @@ static BOOL BtlCmd_UpdateVar(BattleSystem *battleSys, BattleContext *battleCtx) static inline BOOL AbilityBlocksSpecificStatReduction(BattleContext *battleCtx, int statOffset, int ability, int stat) { return Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battleCtx->sideEffectMon, ability) == TRUE - && BATTLE_STAT_ATTACK + statOffset == stat; + && BATTLE_STAT_ATTACK + statOffset == stat; } static inline void SetupNicknameStatMsg(BattleContext *battleCtx, int msgID, int statOffset) @@ -3025,19 +3021,19 @@ static inline void SetupNicknameAbilityNicknameAbilityMsg(BattleContext *battleC /** * @brief Try to change the stat stage for a target battler. - * + * * This handles all of the logic related to whether or not a stat stage change * can be applied given the target's ability, volatile condition (i.e., Mist or * Substitute), current stat stage, etc. - * + * * Inputs: * 1. How far ahead to jump if there is no change to the stage. * 2. How far ahead to jump if the change is blocked. * 3. How far ahead to jump if the change is blocked by Substitute. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -3081,7 +3077,7 @@ static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battl battleCtx->battleStatusMask |= SYSCTL_FAIL_STAT_STAGE_CHANGE; if (battleCtx->sideEffectType == SIDE_EFFECT_TYPE_INDIRECT - || battleCtx->sideEffectType == SIDE_EFFECT_TYPE_ABILITY) { + || battleCtx->sideEffectType == SIDE_EFFECT_TYPE_ABILITY) { BattleScript_Iter(battleCtx, jumpBlocked); } else { SetupNicknameStatMsg(battleCtx, 142, statOffset); // "{0}'s {1} won't go higher!" @@ -3117,7 +3113,7 @@ static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battl result = 1; } else if (Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battleCtx->sideEffectMon, ABILITY_CLEAR_BODY) == TRUE - || Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battleCtx->sideEffectMon, ABILITY_WHITE_SMOKE) == TRUE) { + || Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battleCtx->sideEffectMon, ABILITY_WHITE_SMOKE) == TRUE) { if (battleCtx->sideEffectType == SIDE_EFFECT_TYPE_ABILITY) { SetupNicknameAbilityNicknameAbilityMsg(battleCtx, 727); // "{0}'s {1} suppressed {2}'s {3}!" } else { @@ -3129,7 +3125,7 @@ static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battl result = 1; } else if (AbilityBlocksSpecificStatReduction(battleCtx, statOffset, ABILITY_KEEN_EYE, BATTLE_STAT_ACCURACY) - || AbilityBlocksSpecificStatReduction(battleCtx, statOffset, ABILITY_HYPER_CUTTER, BATTLE_STAT_ATTACK)) { + || AbilityBlocksSpecificStatReduction(battleCtx, statOffset, ABILITY_HYPER_CUTTER, BATTLE_STAT_ATTACK)) { if (battleCtx->sideEffectType == SIDE_EFFECT_TYPE_ABILITY) { SetupNicknameAbilityNicknameAbilityMsg(battleCtx, 727); // "{0}'s {1} suppressed {2}'s {3}!" } else { @@ -3141,7 +3137,7 @@ static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battl battleCtx->battleStatusMask |= SYSCTL_FAIL_STAT_STAGE_CHANGE; if (battleCtx->sideEffectType == SIDE_EFFECT_TYPE_INDIRECT - || battleCtx->sideEffectType == SIDE_EFFECT_TYPE_ABILITY) { + || battleCtx->sideEffectType == SIDE_EFFECT_TYPE_ABILITY) { BattleScript_Iter(battleCtx, jumpBlocked); return FALSE; @@ -3152,7 +3148,7 @@ static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battl return FALSE; } } else if (Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battleCtx->sideEffectMon, ABILITY_SHIELD_DUST) == TRUE - && battleCtx->sideEffectType == SIDE_EFFECT_TYPE_INDIRECT) { + && battleCtx->sideEffectType == SIDE_EFFECT_TYPE_INDIRECT) { result = 1; } else if (battleCtx->battleMons[battleCtx->sideEffectMon].statusVolatile & VOLATILE_CONDITION_SUBSTITUTE) { result = 2; @@ -3161,7 +3157,7 @@ static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battl battleCtx->battleStatusMask |= SYSCTL_FAIL_STAT_STAGE_CHANGE; if (battleCtx->sideEffectType == SIDE_EFFECT_TYPE_INDIRECT - || battleCtx->sideEffectType == SIDE_EFFECT_TYPE_ABILITY) { + || battleCtx->sideEffectType == SIDE_EFFECT_TYPE_ABILITY) { BattleScript_Iter(battleCtx, jumpBlocked); return FALSE; @@ -3213,17 +3209,17 @@ static BOOL BtlCmd_ChangeStatStage(BattleSystem *battleSys, BattleContext *battl /** * @brief Update the value of a battler's data field using an operation applied * to itself and a static source value. - * + * * Inputs: * 1. The operation to apply; see enum OpCode for possible values. * 2. ID of the battler to target as a source operand and the destination. * 3. ID of the battler's data field to target as a source operand and * the destination. * 4. A static source value to use as the second operand. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_UpdateMonData(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -3316,13 +3312,13 @@ static BOOL BtlCmd_UpdateMonData(BattleSystem *battleSys, BattleContext *battleC /** * @brief Clear a particular volatile status for a battler. - * + * * Inputs: * 1. The battler whose volatile status should be cleared. * 2. Bitmask of the volatile status condition(s) to be cleared. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_ClearVolatileStatus(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3339,12 +3335,12 @@ static BOOL BtlCmd_ClearVolatileStatus(BattleSystem *battleSys, BattleContext *b /** * @brief Toggle the "vanished" flag for a battler. - * + * * This flag controls whether or not the battler's sprite is visible, e.g., * during a multi-turn move like Bounce or Dig. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_ToggleVanish(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3361,20 +3357,20 @@ static BOOL BtlCmd_ToggleVanish(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Check the ability of a battler or set of battlers. - * + * * Inputs: * 1. Op-code which controls the behavior. See enum CheckHaveOp * 2. Input battler (or set of battlers) whose ability should be checked * 3. The ability to check for any battler to have (or not have) * 4. GoTo distance if a battler in the input set meets the criteria - * + * * Side effects: * - CompareVarToValue any battler matches the criteria, battleCtx->abilityMon will be set * to their identifier. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckAbility(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -3420,16 +3416,16 @@ static BOOL BtlCmd_CheckAbility(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Generate a random value in the specified range, inclusive on both * ends, and offseting the result by a static value. - * + * * Inputs: * 1. The maximum value R of the range [0, R] * 2. The value by which to offset the generated random value - * + * * Side effects: * - battleCtx->calcTemp will be set to the result value - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_Random(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3447,14 +3443,14 @@ static BOOL BtlCmd_Random(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Update the value of a variable using an operation applied to itself * and the value of another variable. - * + * * Inputs: * 1. The operation to apply; see enum OpCode for possible values. * 2. ID of the variable to target as a source operand and the destination. * 3. ID of the variable to use as the second operand. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_UpdateVarFromVar(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3541,16 +3537,16 @@ static BOOL BtlCmd_UpdateVarFromVar(BattleSystem *battleSys, BattleContext *batt /** * @brief Update the value of a battler's data field using an operation applied * to itself and the value of a variable. - * + * * Inputs: * 1. The operation to apply; see enum OpCode for possible values. * 2. ID of the battler to target as a source operand and the destination. * 3. ID of the battler's data field to target as a source operand and * the destination. * 4. ID of the variable to use as the second operand. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_UpdateMonDataFromVar(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3647,13 +3643,13 @@ static BOOL BtlCmd_UpdateMonDataFromVar(BattleSystem *battleSys, BattleContext * /** * @brief GoTo ahead a certain distance. - * + * * Inputs: * 1. The distance to jump forward in words. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_GoTo(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -3668,13 +3664,13 @@ static BOOL BtlCmd_GoTo(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Call a given subroutine sequence, returning to the current routine * point finished. - * + * * Inputs: * 1. ID of the subroutine sequence to call. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_Call(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -3689,13 +3685,13 @@ static BOOL BtlCmd_Call(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Call a given subroutine sequence from the value of a variable, * returning to the current routine point finished. - * + * * Inputs: * 1. Variable containing the ID of the subroutine sequence to call. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CallFromVar(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -3710,9 +3706,9 @@ static BOOL BtlCmd_CallFromVar(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Set the move to be copied by Mirror Move. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_SetMirrorMove(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3727,9 +3723,9 @@ static BOOL BtlCmd_SetMirrorMove(BattleSystem *battleSys, BattleContext *battleC } else if (battleType & BATTLE_TYPE_DOUBLES) { // In double battles, choose randomly. move = battleCtx->moveCopiedHit[battleCtx->attacker][0] - + battleCtx->moveCopiedHit[battleCtx->attacker][1] - + battleCtx->moveCopiedHit[battleCtx->attacker][2] - + battleCtx->moveCopiedHit[battleCtx->attacker][3]; + + battleCtx->moveCopiedHit[battleCtx->attacker][1] + + battleCtx->moveCopiedHit[battleCtx->attacker][2] + + battleCtx->moveCopiedHit[battleCtx->attacker][3]; if (move) { do { @@ -3761,9 +3757,9 @@ static BOOL BtlCmd_SetMirrorMove(BattleSystem *battleSys, BattleContext *battleC /** * @brief Reset all stat changes for all active battlers. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_ResetAllStatChanges(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3784,22 +3780,22 @@ static BOOL BtlCmd_ResetAllStatChanges(BattleSystem *battleSys, BattleContext *b /** * @brief Locks the given battler into their current move. - * + * * This is used by moves such as Thrash and Outrage to force the user to keep * using them over multiple turns. - * + * * Inputs: * 1. The battler whose move choice should be locked. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_LockMoveChoice(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); - + int battler = BattleScript_Battler(battleSys, battleCtx, inBattler); Battler_LockMoveChoice(battleSys, battleCtx, battler); @@ -3808,15 +3804,15 @@ static BOOL BtlCmd_LockMoveChoice(BattleSystem *battleSys, BattleContext *battle /** * @brief Unlocks the given battler's move choices. - * + * * This is invoked at the end of moves such as Thrash and Outrage to permit the * user to choose a different move after their effect ends. - * + * * Inputs: * 1. The battler whose move choice should be unlocked. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_UnlockMoveChoice(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3832,21 +3828,21 @@ static BOOL BtlCmd_UnlockMoveChoice(BattleSystem *battleSys, BattleContext *batt /** * @brief Set the status icon on a battler's HP gauge. - * + * * Inputs: * 1. The battler whose HP gauge should be updated. * 2. The status icon to apply to the HP gauge. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_SetHealthbarStatus(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); int status = BattleScript_Read(battleCtx); - + int battler = BattleScript_Battler(battleSys, battleCtx, inBattler); BattleIO_SetStatusIcon(battleSys, battler, status); @@ -3855,13 +3851,13 @@ static BOOL BtlCmd_SetHealthbarStatus(BattleSystem *battleSys, BattleContext *ba /** * @brief Shows a trainer message of a particular type. - * + * * Inputs: * 1. The battler whose trainer message should be shown. * 2. The type of trainer message to display. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PrintTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3929,12 +3925,12 @@ static u32 BattleScript_CalcPrizeMoney(BattleSystem *battleSys, BattleContext *b /** * @brief Payout the prize money for the battle (or deduct a penalty for losing). - * + * * Side effects: * - battleCtx->msgTemp will be updated with the amount of money paid out - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PayPrizeMoney(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3966,18 +3962,18 @@ static BOOL BtlCmd_PayPrizeMoney(BattleSystem *battleSys, BattleContext *battleC /** * @brief Play a status effect on the given battler. - * + * * This is responsible for playing the basic animations for status effects * like end-of-turn Burn and Poison damage, full-Paralysis, Sleep, etc. It also * handles animations for generic battle state updates, such as Substitute, * weather, transformations, etc. - * + * * Inputs: * 1. The battler on whom the animation should be centered. * 2. The effect to be played. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PlayBattleAnimation(BattleSystem *battleSys, BattleContext *battleCtx) @@ -3987,10 +3983,10 @@ static BOOL BtlCmd_PlayBattleAnimation(BattleSystem *battleSys, BattleContext *b int effect = BattleScript_Read(battleCtx); if (BattleSystem_AnimationsOn(battleSys) == TRUE - || effect == BATTLE_ANIMATION_SUB_OUT - || effect == BATTLE_ANIMATION_SUB_IN - || effect == BATTLE_ANIMATION_SUBSTITUTE_OUT - || effect == BATTLE_ANIMATION_SUBSTITUTE_IN) { + || effect == BATTLE_ANIMATION_SUB_OUT + || effect == BATTLE_ANIMATION_SUB_IN + || effect == BATTLE_ANIMATION_SUBSTITUTE_OUT + || effect == BATTLE_ANIMATION_SUBSTITUTE_IN) { int battler = BattleScript_Battler(battleSys, battleCtx, inBattler); if (BattleSystem_ShouldShowStatusEffect(battleCtx, battler, effect) == TRUE) { BattleIO_PlayStatusEffect(battleSys, battleCtx, battler, effect); @@ -4002,17 +3998,17 @@ static BOOL BtlCmd_PlayBattleAnimation(BattleSystem *battleSys, BattleContext *b /** * @brief Play a status effect on the given battler. - * + * * This is responsible for animations that have an attacker and a defender. * In vanilla Gen4, this only applies to the Leech Seed damage+drain effect. - * + * * Inputs: * 1. The attacker for the animation. * 2. The defender for the animation. * 3. The effect to be played. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PlayBattleAnimationOnMons(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4023,15 +4019,15 @@ static BOOL BtlCmd_PlayBattleAnimationOnMons(BattleSystem *battleSys, BattleCont int effect = BattleScript_Read(battleCtx); if (BattleSystem_AnimationsOn(battleSys) == TRUE - || effect == BATTLE_ANIMATION_SUB_OUT - || effect == BATTLE_ANIMATION_SUB_IN - || effect == BATTLE_ANIMATION_SUBSTITUTE_OUT - || effect == BATTLE_ANIMATION_SUBSTITUTE_IN) { + || effect == BATTLE_ANIMATION_SUB_OUT + || effect == BATTLE_ANIMATION_SUB_IN + || effect == BATTLE_ANIMATION_SUBSTITUTE_OUT + || effect == BATTLE_ANIMATION_SUBSTITUTE_IN) { int attacker = BattleScript_Battler(battleSys, battleCtx, inAttacker); int defender = BattleScript_Battler(battleSys, battleCtx, inDefender); if (BattleSystem_ShouldShowStatusEffect(battleCtx, attacker, effect) == TRUE - && BattleSystem_ShouldShowStatusEffect(battleCtx, defender, effect) == TRUE) { + && BattleSystem_ShouldShowStatusEffect(battleCtx, defender, effect) == TRUE) { BattleIO_PlayStatusEffectAToD(battleSys, battleCtx, attacker, defender, effect); } } @@ -4041,14 +4037,14 @@ static BOOL BtlCmd_PlayBattleAnimationOnMons(BattleSystem *battleSys, BattleCont /** * @brief Play a status effect from the value stored in a variable. - * + * * Inputs: * 1. The battler on whom the animation should be centered. * 2. The variable to consult for the effect to be played. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_PlayBattleAnimationFromVar(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -4064,7 +4060,7 @@ static BOOL BtlCmd_PlayBattleAnimationFromVar(BattleSystem *battleSys, BattleCon || var == BATTLE_ANIMATION_SUB_IN // bug: this should be *effect, not var || *effect == BATTLE_ANIMATION_SUBSTITUTE_OUT || *effect == BATTLE_ANIMATION_SUBSTITUTE_IN) - && BattleSystem_ShouldShowStatusEffect(battleCtx, battler, *effect) == TRUE) { + && BattleSystem_ShouldShowStatusEffect(battleCtx, battler, *effect) == TRUE) { BattleIO_PlayStatusEffect(battleSys, battleCtx, battler, *effect); } @@ -4073,13 +4069,13 @@ static BOOL BtlCmd_PlayBattleAnimationFromVar(BattleSystem *battleSys, BattleCon /** * @brief Print the message for recalling a Pokemon back to its ball. - * + * * Inputs: * 1. The battler to be recalled. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_PrintRecallMessage(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -4094,19 +4090,19 @@ static BOOL BtlCmd_PrintRecallMessage(BattleSystem *battleSys, BattleContext *ba /** * @brief Print the message for sending a Pokemon out mid-battle. - * + * * Inputs: * 1. The battler to be sent out. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_PrintSendOutMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); - + int battler = BattleScript_Battler(battleSys, battleCtx, inBattler); BattleIO_PrintSendOutMessage(battleSys, battleCtx, battler, battleCtx->selectedPartySlot[battler]); @@ -4116,19 +4112,19 @@ static BOOL BtlCmd_PrintSendOutMessage(BattleSystem *battleSys, BattleContext *b /** * @brief Print the message for starting an encounter (e.g., "A wild Rattata * appeared!" or "Youngster Joey wants to battle!") - * + * * Inputs: * 1. The battler appearing on the opposite side of the field. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_PrintEncounterMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); - + int battler = BattleScript_Battler(battleSys, battleCtx, inBattler); BattleIO_PrintBattleStartMessage(battleSys, battleCtx, battler); @@ -4137,19 +4133,19 @@ static BOOL BtlCmd_PrintEncounterMessage(BattleSystem *battleSys, BattleContext /** * @brief Print the message for sending out a leading Pokemon. - * + * * Inputs: * 1. The battler being sent out. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_PrintFirstSendOutMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); - + int battler = BattleScript_Battler(battleSys, battleCtx, inBattler); BattleIO_PrintLeadMonMessage(battleSys, battleCtx, battler); @@ -4158,19 +4154,19 @@ static BOOL BtlCmd_PrintFirstSendOutMessage(BattleSystem *battleSys, BattleConte /** * @brief Print the prepared message as a trainer message for the given battler. - * + * * Inputs: * 1. The battler for whom the message should be shown as a trainer message. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PrintBufferedTrainerMessage(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); - + int battler = BattleScript_Battler(battleSys, battleCtx, inBattler); BattleIO_TrainerMessage(battleSys, battler, battleCtx->msgTemp); @@ -4179,13 +4175,13 @@ static BOOL BtlCmd_PrintBufferedTrainerMessage(BattleSystem *battleSys, BattleCo /** * @brief Try to execute the Conversion effect. - * + * * Inputs: * 1. The jump-distance if the process fails for whatever reason. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_TryConversion(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -4257,15 +4253,15 @@ static BOOL BtlCmd_TryConversion(BattleSystem *battleSys, BattleContext *battleC /** * @brief Compare a given data-value from a variable to a target variable's value. - * + * * Inputs: * 1. The operation mode. See enum OpCode for possible values. * 3. The variable whose data will be used on the left-hand side of the comparison. * 3. The variable whose data will be used on the right-hand side of the comparison. * 4. The jump-ahead value if the comparison yields TRUE. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CompareVarToVar(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4336,16 +4332,16 @@ static BOOL BtlCmd_CompareVarToVar(BattleSystem *battleSys, BattleContext *battl /** * @brief Compare a given data-value from a battler to a target variable's value. - * + * * Inputs: * 1. The operation mode. See enum OpCode for possible values. * 2. The battler whose data should be retrieved for the left-hand side of the comparison. * 3. The parameter to use for the left-hand side of the comparison. * 4. The variable whose data will be used on the right-hand side of the comparison. * 5. The jump-ahead value if the comparison yields TRUE. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CompareMonDataToVar(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4366,7 +4362,7 @@ static BOOL BtlCmd_CompareMonDataToVar(BattleSystem *battleSys, BattleContext *b jump = 0; } break; - + case OPCODE_NEQ: if (lhs == *rhs) { jump = 0; @@ -4417,9 +4413,9 @@ static BOOL BtlCmd_CompareMonDataToVar(BattleSystem *battleSys, BattleContext *b /** * @brief Gives the money accrued from Pay Day to the player. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_AddPayDayMoney(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4438,12 +4434,12 @@ static BOOL BtlCmd_AddPayDayMoney(BattleSystem *battleSys, BattleContext *battle /** * @brief Try to set Light Screen for the user's side. - * + * * Inputs: * 1. The jump-distance if Light Screen is already set for the user's side. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryLightScreen(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4481,12 +4477,12 @@ static BOOL BtlCmd_TryLightScreen(BattleSystem *battleSys, BattleContext *battle /** * @brief Try to set Reflect for the user's side. - * + * * Inputs: * 1. The jump-distance if Reflect is already set for the user's side. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryReflect(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4524,12 +4520,12 @@ static BOOL BtlCmd_TryReflect(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to set Mist for the user's side. - * + * * Inputs: * 1. The jump-distance if Mist is already set for the user's side. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryMist(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4553,18 +4549,18 @@ static BOOL BtlCmd_TryMist(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to execute a one-hit KO move (e.g., Guillotine, Sheer Cold). - * + * * These moves do not follow the standard accuracy formula. CompareVarToValue the defender is * a higher level than the attacker, then the move will always fail to hit, even * if the attacker is under the effect of No Guard or Lock On. Accuracy for * these moves scales linearly from their base accuracy according to the * difference of the attacker and defender's levels. That is: - * + * * accuracy = baseAccuracy + (attackerLevel - defenderLevel) - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TryOHKOMove(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -4576,8 +4572,8 @@ static BOOL BtlCmd_TryOHKOMove(BattleSystem *battleSys, BattleContext *battleCtx battleCtx->moveStatusFlags |= MOVE_STATUS_STURDY; } else { if ((DEFENDING_MON.moveEffectsMask & MOVE_EFFECT_LOCK_ON) == FALSE - && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_NO_GUARD - && Battler_Ability(battleCtx, battleCtx->defender) != ABILITY_NO_GUARD) { + && Battler_Ability(battleCtx, battleCtx->attacker) != ABILITY_NO_GUARD + && Battler_Ability(battleCtx, battleCtx->defender) != ABILITY_NO_GUARD) { // Use the usual OHKO accuracy check: scale upwards with the difference between the attacker and // defender's levels. hit = CURRENT_MOVE_DATA.accuracy + (ATTACKING_MON.level - DEFENDING_MON.level); @@ -4589,10 +4585,10 @@ static BOOL BtlCmd_TryOHKOMove(BattleSystem *battleSys, BattleContext *battleCtx } } else { if (((DEFENDING_MON.moveEffectsData.lockOnTarget == battleCtx->attacker - && (DEFENDING_MON.moveEffectsMask & MOVE_EFFECT_LOCK_ON)) - || Battler_Ability(battleCtx, battleCtx->attacker) == ABILITY_NO_GUARD - || Battler_Ability(battleCtx, battleCtx->defender) == ABILITY_NO_GUARD) - && ATTACKING_MON.level >= DEFENDING_MON.level) { + && (DEFENDING_MON.moveEffectsMask & MOVE_EFFECT_LOCK_ON)) + || Battler_Ability(battleCtx, battleCtx->attacker) == ABILITY_NO_GUARD + || Battler_Ability(battleCtx, battleCtx->defender) == ABILITY_NO_GUARD) + && ATTACKING_MON.level >= DEFENDING_MON.level) { // Bypass the accuracy check: always hit. hit = TRUE; } else { @@ -4625,25 +4621,25 @@ static BOOL BtlCmd_TryOHKOMove(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief DivideVarByValue the value of a variable by another static value, storing the * result back into the source variable. - * + * * This operation will not permit quotients of 0. CompareVarToValue the variable's value is * positive, then the minimum permissible quotient will be 1. Likewise, a * negative value will permit a maximum quotient of -1. - * + * * Inputs: * 1. ID of the source variable for the dividend and where to store the result. * 2. Static value for the divisor. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_DivideVarByValue(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int srcVar = BattleScript_Read(battleCtx); int divBy = BattleScript_Read(battleCtx); - + int *var = BattleScript_VarAddress(battleSys, battleCtx, srcVar); *var = BattleSystem_Divide(*var, divBy); @@ -4653,20 +4649,20 @@ static BOOL BtlCmd_DivideVarByValue(BattleSystem *battleSys, BattleContext *batt /** * @brief DivideVarByValue the value of a variable by the value of another variable, * storing the result back into the former. - * + * * This operation will not permit quotients of 0. CompareVarToValue the variable's value is * positive, then the minimum permissible quotient will be 1. Likewise, a * negative value will permit a maximum quotient of -1. - * + * * Inputs: * 1. ID of the variable for the dividend and where to store the result. * 2. ID of the variable for the divisor. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ -static BOOL BtlCmd_DivideVarByVar (BattleSystem * battleSys, BattleContext * battleCtx) +static BOOL BtlCmd_DivideVarByVar(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int srcVar = BattleScript_Read(battleCtx); @@ -4693,20 +4689,20 @@ static BOOL BtlCmd_DivideVarByVar (BattleSystem * battleSys, BattleContext * bat /** * @brief Try to execute the Mimic effect. - * + * * This command will fail if any of the following are true: * - The move attempting to be Mimicked is not permitted (see Move_CanBeMimicked) * - The attacker has Transformed * - The defender is behind a Substitute * - The defender has yet to use a move * - The attacker knows the move that the defender last used - * + * * Inputs: * 1. Distance to jump ahead if the effect fails - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_TryMimic(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -4714,9 +4710,9 @@ static BOOL BtlCmd_TryMimic(BattleSystem *battleSys, BattleContext *battleCtx) int jumpOnFail = BattleScript_Read(battleCtx); if (Move_CanBeMimicked(DEFENDER_LAST_MOVE) == FALSE - || (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_TRANSFORM) - || (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_SUBSTITUTE) - || DEFENDER_LAST_MOVE == MOVE_NONE) { + || (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_TRANSFORM) + || (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_SUBSTITUTE) + || DEFENDER_LAST_MOVE == MOVE_NONE) { BattleScript_Iter(battleCtx, jumpOnFail); } else { int i, j = -1; @@ -4760,11 +4756,11 @@ static BOOL BtlCmd_TryMimic(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Pick a random move permitted by Metronome. - * + * * This command will skip over any moves already known by the attacker. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_Metronome(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4799,18 +4795,18 @@ static BOOL BtlCmd_Metronome(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to disable the defender's most recently used move. - * + * * This command will fail if any of the following are true: * - The defender already has another move disabled. * - The defender does not know the move attempting to be disabled. * - The defender does not have PP remaining for the move to be disabled. * - The defender has yet to use a move. - * + * * Inputs: * 1. Distance to jump ahead if the effect fails - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryDisable(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4822,9 +4818,9 @@ static BOOL BtlCmd_TryDisable(BattleSystem *battleSys, BattleContext *battleCtx) int moveSlot = Battler_SlotForMove(&DEFENDING_MON, DEFENDER_LAST_MOVE); if (DEFENDING_MON.moveEffectsData.disabledMove == MOVE_NONE - && moveSlot != LEARNED_MOVES_MAX - && DEFENDING_MON.ppCur[moveSlot] - && DEFENDER_LAST_MOVE) { + && moveSlot != LEARNED_MOVES_MAX + && DEFENDING_MON.ppCur[moveSlot] + && DEFENDER_LAST_MOVE) { battleCtx->msgMoveTemp = DEFENDER_LAST_MOVE; DEFENDING_MON.moveEffectsData.disabledMove = battleCtx->msgMoveTemp; DEFENDING_MON.moveEffectsData.disabledTurns = BattleSystem_RandNext(battleSys) % 4 + 3; // range: [3-6] @@ -4837,16 +4833,16 @@ static BOOL BtlCmd_TryDisable(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Execute the Counter effect. - * + * * This command will fail if any of the following are true: * - The attacker did not receive physical damage this turn * - The last battler to attack this one is their teammate - * - The last battler to attack this one is no longer active + * - The last battler to attack this one is no longer active * - Both opponents have fainted by other means - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_Counter(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -4857,8 +4853,8 @@ static BOOL BtlCmd_Counter(BattleSystem *battleSys, BattleContext *battleCtx) int defendingSide = Battler_Side(battleSys, lastAttacker); if (ATTACKER_TURN_FLAGS.physicalDamageTakenFrom[lastAttacker] - && attackingSide != defendingSide - && battleCtx->battleMons[lastAttacker].curHP) { + && attackingSide != defendingSide + && battleCtx->battleMons[lastAttacker].curHP) { battleCtx->damage = ATTACKER_TURN_FLAGS.physicalDamageTakenFrom[lastAttacker] * 2; if (battleCtx->sideConditions[defendingSide].followMe && FOLLOW_ME_MON(defendingSide).curHP) { @@ -4890,16 +4886,16 @@ static BOOL BtlCmd_Counter(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Execute the Mirror Coat effect. - * + * * This command will fail if any of the following are true: * - The attacker did not receive special damage this turn * - The last battler to attack this one is their teammate - * - The last battler to attack this one is no longer active + * - The last battler to attack this one is no longer active * - Both opponents have fainted by other means - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_MirrorCoat(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -4910,8 +4906,8 @@ static BOOL BtlCmd_MirrorCoat(BattleSystem *battleSys, BattleContext *battleCtx) int defendingSide = Battler_Side(battleSys, lastAttacker); if (ATTACKER_TURN_FLAGS.specialDamageTakenFrom[lastAttacker] - && attackingSide != defendingSide - && battleCtx->battleMons[lastAttacker].curHP) { + && attackingSide != defendingSide + && battleCtx->battleMons[lastAttacker].curHP) { battleCtx->damage = ATTACKER_TURN_FLAGS.specialDamageTakenFrom[lastAttacker] * 2; if (battleCtx->sideConditions[defendingSide].followMe && FOLLOW_ME_MON(defendingSide).curHP) { @@ -4943,19 +4939,19 @@ static BOOL BtlCmd_MirrorCoat(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to execute Encore on the defender's most recently used move. - * + * * This command will fail if any of the following are true: * - The defender already has another move encored. * - The defender does not know the move attempting to be encored. * - The move last used is one which cannot be encored. (see: Move_CanBeEncored) * - The defender does not have PP remaining for the move to be disabled. * - The defender has yet to use a move. - * + * * Inputs: * 1. Distance to jump ahead if the effect fails - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryEncore(BattleSystem *battleSys, BattleContext *battleCtx) @@ -4969,9 +4965,9 @@ static BOOL BtlCmd_TryEncore(BattleSystem *battleSys, BattleContext *battleCtx) } if (DEFENDING_MON.moveEffectsData.encoredMove == MOVE_NONE - && moveSlot != LEARNED_MOVES_MAX - && DEFENDING_MON.ppCur[moveSlot] - && DEFENDER_LAST_MOVE) { + && moveSlot != LEARNED_MOVES_MAX + && DEFENDING_MON.ppCur[moveSlot] + && DEFENDER_LAST_MOVE) { battleCtx->msgMoveTemp = DEFENDER_LAST_MOVE; DEFENDING_MON.moveEffectsData.encoredMove = battleCtx->msgMoveTemp; DEFENDING_MON.moveEffectsData.encoredMoveSlot = moveSlot; @@ -4986,17 +4982,17 @@ static BOOL BtlCmd_TryEncore(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Tries to execute the Conversion 2 effect. - * + * * Conversion 2 considers the type of the move that the user was last hit by, * then picks a random type which would resist that move and assigns the user * to be that type. - * + * * Inputs: * 1. The distance to jump if the effect fails to execute. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TryConversion2(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5009,10 +5005,10 @@ static BOOL BtlCmd_TryConversion2(BattleSystem *battleSys, BattleContext *battle } if (battleCtx->conversion2Move[battleCtx->attacker] - && battleCtx->conversion2Battler[battleCtx->attacker] != BATTLER_NONE) { + && battleCtx->conversion2Battler[battleCtx->attacker] != BATTLER_NONE) { // Fail to execute if the source move's owner is locked into the first turn of a multi-turn move if (Move_IsMultiTurn(battleCtx, battleCtx->conversion2Move[battleCtx->attacker]) - && (battleCtx->battleMons[battleCtx->conversion2Battler[battleCtx->attacker]].statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED)) { + && (battleCtx->battleMons[battleCtx->conversion2Battler[battleCtx->attacker]].statusVolatile & VOLATILE_CONDITION_MOVE_LOCKED)) { BattleScript_Iter(battleCtx, jumpOnFail); return FALSE; } @@ -5026,8 +5022,8 @@ static BOOL BtlCmd_TryConversion2(BattleSystem *battleSys, BattleContext *battle // Check if the accessed entry has an attacking type which matches the source move // and a defending type which results in a favorable matchup if (atkType == moveType - && typeMulti <= TYPE_MULTI_NOT_VERY_EFF - && MON_IS_NOT_TYPE(battleCtx->attacker, defType)) { + && typeMulti <= TYPE_MULTI_NOT_VERY_EFF + && MON_IS_NOT_TYPE(battleCtx->attacker, defType)) { ATTACKING_MON.type1 = defType; ATTACKING_MON.type2 = defType; battleCtx->msgTemp = defType; @@ -5039,8 +5035,8 @@ static BOOL BtlCmd_TryConversion2(BattleSystem *battleSys, BattleContext *battle i = 0; while (BattleSystem_TypeMatchup(battleSys, i, &atkType, &defType, &typeMulti) == TRUE) { if (atkType == moveType - && typeMulti <= TYPE_MULTI_NOT_VERY_EFF - && MON_IS_NOT_TYPE(battleCtx->attacker, defType)) { + && typeMulti <= TYPE_MULTI_NOT_VERY_EFF + && MON_IS_NOT_TYPE(battleCtx->attacker, defType)) { ATTACKING_MON.type1 = defType; ATTACKING_MON.type2 = defType; battleCtx->msgTemp = defType; @@ -5057,20 +5053,20 @@ static BOOL BtlCmd_TryConversion2(BattleSystem *battleSys, BattleContext *battle /** * @brief Try to execute the Sketch effect. - * + * * Sketch will attempt to teach the attacking battler the move which was most- * recently used by its target, overwriting Sketch's current move slot. The * following moves may not be Sketched: * - Struggle * - Sketch * - Chatter - * + * * Inputs: * 1. The distance to jump if the effect fails to execute. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TrySketch(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5081,17 +5077,17 @@ static BOOL BtlCmd_TrySketch(BattleSystem *battleSys, BattleContext *battleCtx) // Don't allow Sketch while Transformed or against any of Struggle, Chatter, or Sketch itself if ((ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_TRANSFORM) - || battleCtx->moveSketched[battleCtx->defender] == MOVE_STRUGGLE - || battleCtx->moveSketched[battleCtx->defender] == MOVE_SKETCH - || battleCtx->moveSketched[battleCtx->defender] == MOVE_CHATTER - || battleCtx->moveSketched[battleCtx->defender] == MOVE_NONE) { + || battleCtx->moveSketched[battleCtx->defender] == MOVE_STRUGGLE + || battleCtx->moveSketched[battleCtx->defender] == MOVE_SKETCH + || battleCtx->moveSketched[battleCtx->defender] == MOVE_CHATTER + || battleCtx->moveSketched[battleCtx->defender] == MOVE_NONE) { BattleScript_Iter(battleCtx, jumpOnFail); } else { int i; for (i = 0; i < LEARNED_MOVES_MAX; i++) { // Don't allow Sketching a move that we already know if (ATTACKING_MON.moves[i] != MOVE_SKETCH - && ATTACKING_MON.moves[i] == battleCtx->moveSketched[battleCtx->defender]) { + && ATTACKING_MON.moves[i] == battleCtx->moveSketched[battleCtx->defender]) { break; } @@ -5122,23 +5118,23 @@ static BOOL BtlCmd_TrySketch(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to execute the Sleep Talk effect. - * + * * Sleep Talk will try to invoke another move that the attacker knows, barring: * - other invoker-class moves (see Move_IsInvoker) * - Focus Punch * - Uproar * - Chatter * - Multi-turn moves - * + * * It will permit invocation of any other move, including those which have had * their PP wholly depleted. - * + * * Inputs: - * 1. The distance to jump if the effect fails to execute. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * 1. The distance to jump if the effect fails to execute. + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TrySleepTalk(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5151,10 +5147,10 @@ static BOOL BtlCmd_TrySleepTalk(BattleSystem *battleSys, BattleContext *battleCt // Check for invalid moves for the random selection for (i = 0; i < 4; i++) { if (Move_IsInvoker(ATTACKING_MON.moves[i]) - || ATTACKING_MON.moves[i] == MOVE_FOCUS_PUNCH - || ATTACKING_MON.moves[i] == MOVE_UPROAR - || ATTACKING_MON.moves[i] == MOVE_CHATTER - || Move_IsMultiTurn(battleCtx, ATTACKING_MON.moves[i])) { + || ATTACKING_MON.moves[i] == MOVE_FOCUS_PUNCH + || ATTACKING_MON.moves[i] == MOVE_UPROAR + || ATTACKING_MON.moves[i] == MOVE_CHATTER + || Move_IsMultiTurn(battleCtx, ATTACKING_MON.moves[i])) { invalidMovesMask |= FlagIndex(i); } } @@ -5175,21 +5171,21 @@ static BOOL BtlCmd_TrySleepTalk(BattleSystem *battleSys, BattleContext *battleCt } static const u8 sHPPixelsToFlailPower[][2] = { - { 1, 200 }, - { 5, 150 }, + { 1, 200 }, + { 5, 150 }, { 12, 100 }, - { 21, 80 }, - { 42, 40 }, - { 64, 20 }, + { 21, 80 }, + { 42, 40 }, + { 64, 20 }, }; /** * @brief Calculate the power for Flail-type moves according to the attacker's * current HP. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcFlailPower(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5209,19 +5205,19 @@ static BOOL BtlCmd_CalcFlailPower(BattleSystem *battleSys, BattleContext *battle /** * @brief Try to execute the Spite effect. - * + * * Spite deducts up to 4 PP from the move that its target last used. This * command can fail if any of the following are true: * - The target does not actually know the move that it last used * - The target has no remaining PP for the move that it last used * - The target has yet to use a move - * + * * Inputs: * 1. The distance to jump if the effect fails to execute. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TrySpite(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5253,15 +5249,15 @@ static BOOL BtlCmd_TrySpite(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to clear the status of each party Pokemon. - * + * * This command does not fail in the traditional sense; failure always occurs * silently, and will only occur for individual party Pokemon. CompareVarToValue the move using * this effect is Heal Bell, then it will fail for any party Pokemon with the * ability Soundproof. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TryPartyStatusRefresh(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5316,15 +5312,15 @@ static BOOL BtlCmd_TryPartyStatusRefresh(BattleSystem *battleSys, BattleContext /** * @brief Check if the target's held item can be stolen. - * + * * Inputs: * 1. The distance to jump if the effect fails to execute. * 2. The distance to jump if the effect fails to execute specifically due to * the ability Sticky Hold. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TryStealItem(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5370,17 +5366,17 @@ static const u16 sProtectSuccessRate[] = { /** * @brief Try to execute the Protect or Endure effects. - * + * * Inputs: * 1. The distance to jump if the effect fails to execute. - * + * * Side effects: * - The prepared message buffer is updated with data necessary to print the * message appropriate for the used move. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_TryProtection(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5388,8 +5384,8 @@ static BOOL BtlCmd_TryProtection(BattleSystem *battleSys, BattleContext *battleC int jumpOnFail = BattleScript_Read(battleCtx); if (battleCtx->moveProtect[battleCtx->attacker] != MOVE_PROTECT - && battleCtx->moveProtect[battleCtx->attacker] != MOVE_DETECT - && battleCtx->moveProtect[battleCtx->attacker] != MOVE_ENDURE) { + && battleCtx->moveProtect[battleCtx->attacker] != MOVE_DETECT + && battleCtx->moveProtect[battleCtx->attacker] != MOVE_ENDURE) { battleCtx->battleMons[battleCtx->attacker].moveEffectsData.protectSuccessTurns = 0; } @@ -5401,7 +5397,7 @@ static BOOL BtlCmd_TryProtection(BattleSystem *battleSys, BattleContext *battleC } if (sProtectSuccessRate[ATTACKING_MON.moveEffectsData.protectSuccessTurns] >= BattleSystem_RandNext(battleSys) - && moreBattlersThisTurn) { + && moreBattlersThisTurn) { if (CURRENT_MOVE_DATA.effect == BATTLE_EFFECT_PROTECT) { ATTACKER_TURN_FLAGS.protecting = TRUE; battleCtx->msgBuffer.id = 282; // "{0} protected itself!" @@ -5429,20 +5425,20 @@ static BOOL BtlCmd_TryProtection(BattleSystem *battleSys, BattleContext *battleC /** * @brief Try to execute the Substitute effect, failing if the battler using * Substitute has insufficient HP. - * + * * Inputs: * 1. The distance to jump if the effect fails to execute. - * + * * Side effects: * - battleCtx->hpCalcTemp will be updated to the amount of HP to deduct from * the battler using Substitute. * - The attacker will have its effects data updated with the calculated * Substitute HP. * - The attacker will be freed from all binding effects. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_TrySubstitute(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5463,15 +5459,15 @@ static BOOL BtlCmd_TrySubstitute(BattleSystem *battleSys, BattleContext *battleC /** * @brief Try to execute the Whirlwind effect. - * + * * This command does NOT check for any other effects which would prevent this * effect's execution, e.g. Suction Cups or Ingrain. - * + * * Inputs: * 1. The distance to jump if the effect fails to execute. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryWhirlwind(BattleSystem *battleSys, BattleContext *battleCtx) @@ -5491,7 +5487,7 @@ static BOOL BtlCmd_TryWhirlwind(BattleSystem *battleSys, BattleContext *battleCt defenderPartyCount = BattleSystem_PartyCount(battleSys, battleCtx->defender); if ((battleType & BATTLE_TYPE_2vs2) - || ((battleType & BATTLE_TYPE_TAG) && Battler_Side(battleSys, battleCtx->defender))) { + || ((battleType & BATTLE_TYPE_TAG) && Battler_Side(battleSys, battleCtx->defender))) { // There are two battlers out at one time, but only one of these belongs to each trainer. partyStart = 0; partyEnd = defenderPartyCount; @@ -5522,8 +5518,8 @@ static BOOL BtlCmd_TryWhirlwind(BattleSystem *battleSys, BattleContext *battleCt mon = Party_GetPokemonBySlotIndex(defenderParty, i); if (Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL) - && Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL) == FALSE - && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL)) { + && Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL) == FALSE + && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL)) { eligibleMons++; } } @@ -5541,8 +5537,8 @@ static BOOL BtlCmd_TryWhirlwind(BattleSystem *battleSys, BattleContext *battleCt mon = Party_GetPokemonBySlotIndex(defenderParty, i); } while (Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL) == SPECIES_NONE - || Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL) == TRUE - || Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) == 0); + || Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL) == TRUE + || Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) == 0); battleCtx->switchedPartySlot[battleCtx->defender] = i; } else { @@ -5556,15 +5552,14 @@ static BOOL BtlCmd_TryWhirlwind(BattleSystem *battleSys, BattleContext *battleCt return FALSE; } - /** * @brief Transform the attacker into its target. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_Transform(BattleSystem * battleSys, BattleContext * battleCtx) +static BOOL BtlCmd_Transform(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); @@ -5576,11 +5571,11 @@ static BOOL BtlCmd_Transform(BattleSystem * battleSys, BattleContext * battleCtx ATTACKING_MON.moveEffectsData.mimickedMoveSlot = 0; ATTACKING_MON.moveEffectsData.lastResortCount = 0; - u8* attackerData = (u8 *)&ATTACKING_MON; - u8* defenderData = (u8 *)&DEFENDING_MON; - + u8 *attackerData = (u8 *)&ATTACKING_MON; + u8 *defenderData = (u8 *)&DEFENDING_MON; + int i; // does not match if this is declared outside the individual loops' scopes - for (i = 0; i < XtOffset(BattleMon*, ability) + 1; i++) { + for (i = 0; i < XtOffset(BattleMon *, ability) + 1; i++) { attackerData[i] = defenderData[i]; } @@ -5611,15 +5606,15 @@ static BOOL BtlCmd_Transform(BattleSystem * battleSys, BattleContext * battleCtx /** * @brief Try to execute the Spikes effect. - * + * * CompareVarToValue the defending side already has 3 layers of Spikes, then this command * will fail. - * + * * Inputs: * 1. The distance to jump if the effect fails to execute. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TrySpikes(BattleSystem *battleSys, BattleContext *battleCtx) @@ -5641,23 +5636,23 @@ static BOOL BtlCmd_TrySpikes(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Check for the Spikes effect on the given battler. - * + * * Battlers suffering from the Spikes effect will take damage equal to a * percentage of their maximum HP, determined by the number of layers of Spikes * active on their side of the battlefield: * - 1 layer -> 1/8 max HP * - 2 layers -> 1/6 max HP * - 3 layers -> 1/4 max HP - * + * * This command will NOT check for an immunity to Spikes damage. - * + * * Inputs: * 1. The battler who should take Spikes damage. * 2. The distance to jump if there is no Spikes damage to take. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckSpikes(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5680,20 +5675,20 @@ static BOOL BtlCmd_CheckSpikes(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Try to execute the Perish Song effect. - * + * * This command will loop over all active battlers and attempt to apply Perish * Song to each of them, setting their "perish count" to 3 turns. It will not * reset the perish count for any of these active battlers, nor will it affect * any battler with Soundproof. - * + * * CompareVarToValue there are no active battlers which could be affected and do not have an * active perish count, then this command will fail. - * + * * Inputs: * 1. The distance to jump if the effect fails to execute. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryPerishSong(BattleSystem *battleSys, BattleContext *battleCtx) @@ -5707,8 +5702,8 @@ static BOOL BtlCmd_TryPerishSong(BattleSystem *battleSys, BattleContext *battleC int ineligibleBattlers = 0; for (int i = 0; i < maxBattlers; i++) { if ((battleCtx->battleMons[i].moveEffectsMask & MOVE_EFFECT_PERISH_SONG) - || battleCtx->battleMons[i].curHP == 0 - || Battler_IgnorableAbility(battleCtx, battleCtx->attacker, i, ABILITY_SOUNDPROOF) == TRUE) { + || battleCtx->battleMons[i].curHP == 0 + || Battler_IgnorableAbility(battleCtx, battleCtx->attacker, i, ABILITY_SOUNDPROOF) == TRUE) { ineligibleBattlers++; } else { battleCtx->battleMons[i].moveEffectsMask |= MOVE_EFFECT_PERISH_SONG; @@ -5726,22 +5721,22 @@ static BOOL BtlCmd_TryPerishSong(BattleSystem *battleSys, BattleContext *battleC /** * @brief Gets the next battler according to speed order and stores the result * into the specified variable. - * + * * The "next battler" is defined by battleCtx->battlerSpeedTemp, which stores * an index into the battleCtx->monSpeedOrder array. - * + * * Inputs: * 1. The destination variable. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_GetMonBySpeedOrder(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int dstVar = BattleScript_Read(battleCtx); - + u32 *var = BattleScript_VarAddress(battleSys, battleCtx, dstVar); *var = battleCtx->monSpeedOrder[battleCtx->battlerSpeedTemp]; @@ -5751,13 +5746,13 @@ static BOOL BtlCmd_GetMonBySpeedOrder(BattleSystem *battleSys, BattleContext *ba /** * @brief Checks if the value in a given variable is a valid battler ID and, if * so, jumps the specified distance. - * + * * Inputs: * 1. The source variable whose value should be checked. * 2. The distance to jump if the variable's value is a valid battler ID. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_GoToIfValidMon(BattleSystem *battleSys, BattleContext *battleCtx) @@ -5779,10 +5774,10 @@ static BOOL BtlCmd_GoToIfValidMon(BattleSystem *battleSys, BattleContext *battle /** * @brief Determines the appropriate end-of-turn weather effect to apply and * sets up state variables with the relevant data for that effect. - * + * * Inputs: * 1. The battler for whom to apply any end-of-turn weather effects. - * + * * Side effects: * - battleCtx->hpCalcTemp will be updated with the (signed) amount of HP to * add to an affected battler's current HP. @@ -5790,10 +5785,10 @@ static BOOL BtlCmd_GoToIfValidMon(BattleSystem *battleSys, BattleContext *battle * battleCtx->scriptTemp will be updated with an appropriate identifier. * - CompareVarToValue the effect to apply is due to Hydration, then battleCtx->msgTemp will * be updated with the condition to be restored. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_EndOfTurnWeatherEffect(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -5809,21 +5804,21 @@ static BOOL BtlCmd_EndOfTurnWeatherEffect(BattleSystem *battleSys, BattleContext if (NO_CLOUD_NINE) { if (WEATHER_IS_SAND - && type1 != TYPE_ROCK && type2 != TYPE_ROCK - && type1 != TYPE_STEEL && type2 != TYPE_STEEL - && type1 != TYPE_GROUND && type2 != TYPE_GROUND - && battleCtx->battleMons[battler].curHP - && Battler_Ability(battleCtx, battler) != ABILITY_SAND_VEIL - && (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_NO_WEATHER_DAMAGE) == FALSE) { + && type1 != TYPE_ROCK && type2 != TYPE_ROCK + && type1 != TYPE_STEEL && type2 != TYPE_STEEL + && type1 != TYPE_GROUND && type2 != TYPE_GROUND + && battleCtx->battleMons[battler].curHP + && Battler_Ability(battleCtx, battler) != ABILITY_SAND_VEIL + && (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_NO_WEATHER_DAMAGE) == FALSE) { battleCtx->msgMoveTemp = MOVE_SANDSTORM; battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * -1, 16); } if (WEATHER_IS_SUN - && battleCtx->battleMons[battler].curHP - && (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_NO_WEATHER_DAMAGE) == FALSE) { + && battleCtx->battleMons[battler].curHP + && (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_NO_WEATHER_DAMAGE) == FALSE) { if (Battler_Ability(battleCtx, battler) == ABILITY_DRY_SKIN - || Battler_Ability(battleCtx, battler) == ABILITY_SOLAR_POWER) { + || Battler_Ability(battleCtx, battler) == ABILITY_SOLAR_POWER) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * -1, 8); } @@ -5833,15 +5828,15 @@ static BOOL BtlCmd_EndOfTurnWeatherEffect(BattleSystem *battleSys, BattleContext } if (WEATHER_IS_HAIL - && battleCtx->battleMons[battler].curHP - && (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_NO_WEATHER_DAMAGE) == FALSE) { + && battleCtx->battleMons[battler].curHP + && (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_NO_WEATHER_DAMAGE) == FALSE) { if (Battler_Ability(battleCtx, battler) == ABILITY_ICE_BODY) { if (battleCtx->battleMons[battler].curHP < battleCtx->battleMons[battler].maxHP) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP, 16); } } else if (type1 != TYPE_ICE - && type2 != TYPE_ICE - && Battler_Ability(battleCtx, battler) != ABILITY_SNOW_CLOAK) { + && type2 != TYPE_ICE + && Battler_Ability(battleCtx, battler) != ABILITY_SNOW_CLOAK) { battleCtx->msgMoveTemp = MOVE_HAIL; battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP * -1, 16); } @@ -5849,20 +5844,20 @@ static BOOL BtlCmd_EndOfTurnWeatherEffect(BattleSystem *battleSys, BattleContext if (WEATHER_IS_RAIN) { if (battleCtx->battleMons[battler].curHP - && battleCtx->battleMons[battler].curHP < battleCtx->battleMons[battler].maxHP - && Battler_Ability(battleCtx, battler) == ABILITY_RAIN_DISH) { + && battleCtx->battleMons[battler].curHP < battleCtx->battleMons[battler].maxHP + && Battler_Ability(battleCtx, battler) == ABILITY_RAIN_DISH) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP, 16); } if (battleCtx->battleMons[battler].curHP - && battleCtx->battleMons[battler].curHP < battleCtx->battleMons[battler].maxHP - && Battler_Ability(battleCtx, battler) == ABILITY_DRY_SKIN) { + && battleCtx->battleMons[battler].curHP < battleCtx->battleMons[battler].maxHP + && Battler_Ability(battleCtx, battler) == ABILITY_DRY_SKIN) { battleCtx->hpCalcTemp = BattleSystem_Divide(battleCtx->battleMons[battler].maxHP, 8); } if (battleCtx->battleMons[battler].curHP - && (battleCtx->battleMons[battler].status & MON_CONDITION_ANY) - && Battler_Ability(battleCtx, battler) == ABILITY_HYDRATION) { + && (battleCtx->battleMons[battler].status & MON_CONDITION_ANY) + && Battler_Ability(battleCtx, battler) == ABILITY_HYDRATION) { if (battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) { battleCtx->msgTemp = MSGCOND_SLEEP; } else if (battleCtx->battleMons[battler].status & MON_CONDITION_ANY_POISON) { @@ -5885,14 +5880,14 @@ static BOOL BtlCmd_EndOfTurnWeatherEffect(BattleSystem *battleSys, BattleContext /** * @brief Calculate the base power for Rollout. - * + * * Compute the following: rolloutBasePower * 2^(pastRolloutTurns) - * + * * This command will also handle locking and unlocking the attacker's move * choice, as needed. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CalcRolloutPower(BattleSystem *battleSys, BattleContext *battleCtx) @@ -5927,11 +5922,11 @@ static BOOL BtlCmd_CalcRolloutPower(BattleSystem *battleSys, BattleContext *batt /** * @brief Calculate the base power for Fury Cutter. - * + * * Compute the following: furyCutterBasePower * 2^(min(pastFuryCutterTurns, 5)) - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CalcFuryCutterPower(BattleSystem *battleSys, BattleContext *battleCtx) @@ -5953,12 +5948,12 @@ static BOOL BtlCmd_CalcFuryCutterPower(BattleSystem *battleSys, BattleContext *b /** * @brief Try to inflict infatuation on the target. - * + * * Inputs: * 1. The distance to jump if infatuation cannot be inflicted. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryAttract(BattleSystem *battleSys, BattleContext *battleCtx) @@ -5967,9 +5962,9 @@ static BOOL BtlCmd_TryAttract(BattleSystem *battleSys, BattleContext *battleCtx) int jumpOnFail = BattleScript_Read(battleCtx); if (battleCtx->battleMons[battleCtx->msgBattlerTemp].gender == battleCtx->battleMons[battleCtx->sideEffectMon].gender - || battleCtx->battleMons[battleCtx->sideEffectMon].statusVolatile & VOLATILE_CONDITION_ATTRACT - || battleCtx->battleMons[battleCtx->msgBattlerTemp].gender == GENDER_NONE - || battleCtx->battleMons[battleCtx->sideEffectMon].gender == GENDER_NONE) { + || battleCtx->battleMons[battleCtx->sideEffectMon].statusVolatile & VOLATILE_CONDITION_ATTRACT + || battleCtx->battleMons[battleCtx->msgBattlerTemp].gender == GENDER_NONE + || battleCtx->battleMons[battleCtx->sideEffectMon].gender == GENDER_NONE) { BattleScript_Iter(battleCtx, jumpOnFail); } else { battleCtx->battleMons[battleCtx->sideEffectMon].statusVolatile |= FlagIndex(battleCtx->msgBattlerTemp) << VOLATILE_CONDITION_ATTRACT_SHIFT; @@ -5980,12 +5975,12 @@ static BOOL BtlCmd_TryAttract(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to apply Safeguard to the user's side of the field. - * + * * Inputs: * 1. The distance to jump if Safeguard is already active for the user's side. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TrySafeguard(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6011,17 +6006,17 @@ static BOOL BtlCmd_TrySafeguard(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Try to execute Present. - * + * * This command will roll for the function of Present (either a damaging move * or one that heals its target) and also for the base power, if it is determined * to be a damaging move. - * + * * Inputs: * 1. The distance to jump if Present is rolled to be a healing move. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_Present(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -6045,13 +6040,13 @@ static BOOL BtlCmd_Present(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Calculate the base power for Magnitude. - * + * * Side effects: * - battleCtx->magnitude will be updated to be the level of Magnitude, falling * within the range [4, 10]. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CalcMagnitudePower(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6091,14 +6086,14 @@ static BOOL BtlCmd_CalcMagnitudePower(BattleSystem *battleSys, BattleContext *ba /** * @brief Try to issue a battler replacement. - * + * * Inputs: * 1. The battler to be replaced. * 2. A flag requesting for the party list to be opened, if TRUE. * 3. The distance to jump if there are no possible replacement party members. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryReplaceFaintedMon(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6122,7 +6117,7 @@ static BOOL BtlCmd_TryReplaceFaintedMon(BattleSystem *battleSys, BattleContext * /** * @brief Frees the user from trapping effects and Leech Seed and removes the * effects of entry-hazards from the user's side of the field. - * + * * This command will not iterate the sequence pointer until all such effects * have been removed. Effects will always be removed in the following order: * 1. Trapping effects (Bind, Clamp, etc.) @@ -6130,9 +6125,9 @@ static BOOL BtlCmd_TryReplaceFaintedMon(BattleSystem *battleSys, BattleContext * * 3. Spikes * 4. Toxic Spikes * 5. Stealth Rock - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_RapidSpin(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6191,14 +6186,14 @@ static BOOL BtlCmd_RapidSpin(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Recover HP using a weather-based move. - * + * * - CompareVarToValue no weather is active, recovery is equal to 1/2 of the user's maximum HP. * - CompareVarToValue the weather is sun, recovery is equal to 2/3 of the user's maximum HP. * - CompareVarToValue any other weather is active, recovery is equal to 1/4 of the user's maximum HP. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_WeatherHPRecovery(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -6217,28 +6212,28 @@ static BOOL BtlCmd_WeatherHPRecovery(BattleSystem *battleSys, BattleContext *bat /** * @brief Calculate the base power and type of Hidden Power. - * + * * The base power of Hidden Power is calculated by the following formula: - * + * * (u + 2v + 4w + 8x + 16y + 32z) * 40 * ----------------------------------- + 30 * 63 - * + * * Where u, v, w, x, y, and z are the second-least-significant bits of the HP, * Attack, Defense, Speed, Special Attack, and Special Defense IVs, respectively. - * + * * The type of Hidden Power is calculated by the following formula: - * + * * (a + 2b + 4c + 8d + 16e + 32f) * 15 * ----------------------------------- * 63 - * + * * Where a, b, c, d, e, and f are the least-significant bits of the HP, Attack, * Defense, Speed, Special Attack, and Special Defense IVs, respectively. The * result is then mapped to a type using the standard definitions. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CalcHiddenPowerParams(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6246,18 +6241,18 @@ static BOOL BtlCmd_CalcHiddenPowerParams(BattleSystem *battleSys, BattleContext BattleScript_Iter(battleCtx, 1); battleCtx->movePower = ((ATTACKING_MON.hpIV & 2) >> 1) - | (ATTACKING_MON.attackIV & 2) - | ((ATTACKING_MON.defenseIV & 2) << 1) - | ((ATTACKING_MON.speedIV & 2) << 2) - | ((ATTACKING_MON.spAttackIV & 2) << 3) - | ((ATTACKING_MON.spDefenseIV & 2) << 4); + | (ATTACKING_MON.attackIV & 2) + | ((ATTACKING_MON.defenseIV & 2) << 1) + | ((ATTACKING_MON.speedIV & 2) << 2) + | ((ATTACKING_MON.spAttackIV & 2) << 3) + | ((ATTACKING_MON.spDefenseIV & 2) << 4); battleCtx->moveType = (ATTACKING_MON.hpIV & 1) - | ((ATTACKING_MON.attackIV & 1) << 1) - | ((ATTACKING_MON.defenseIV & 1) << 2) - | ((ATTACKING_MON.speedIV & 1) << 3) - | ((ATTACKING_MON.spAttackIV & 1) << 4) - | ((ATTACKING_MON.spDefenseIV & 1) << 5); + | ((ATTACKING_MON.attackIV & 1) << 1) + | ((ATTACKING_MON.defenseIV & 1) << 2) + | ((ATTACKING_MON.speedIV & 1) << 3) + | ((ATTACKING_MON.spAttackIV & 1) << 4) + | ((ATTACKING_MON.spDefenseIV & 1) << 5); battleCtx->movePower = battleCtx->movePower * 40 / 63 + 30; battleCtx->moveType = battleCtx->moveType * 15 / 63 + 1; @@ -6271,9 +6266,9 @@ static BOOL BtlCmd_CalcHiddenPowerParams(BattleSystem *battleSys, BattleContext /** * @brief Copies the target's stat stages and any Focus Energy state. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CopyStatStages(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6291,13 +6286,13 @@ static BOOL BtlCmd_CopyStatStages(BattleSystem *battleSys, BattleContext *battle /** * @brief Try to set up Future Sight. - * + * * Inputs: * 1. The distance to jump if there is already a Future Sight effect in-wait. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_TryFutureSight(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -6310,18 +6305,20 @@ static BOOL BtlCmd_TryFutureSight(BattleSystem *battleSys, BattleContext *battle battleCtx->fieldConditions.futureSightTurns[battleCtx->defender] = 3; battleCtx->fieldConditions.futureSightMove[battleCtx->defender] = battleCtx->moveCur; battleCtx->fieldConditions.futureSightAttacker[battleCtx->defender] = battleCtx->attacker; - + // Calculate the damage at the time of Future Sight setup. // Do not check for type effectiveness nor crits. int damage = BattleSystem_CalcMoveDamage(battleSys, - battleCtx, - battleCtx->moveCur, - battleCtx->sideConditionsMask[side], - battleCtx->fieldConditionsMask, - 0, 0, - battleCtx->attacker, - battleCtx->defender, - 1) * -1; + battleCtx, + battleCtx->moveCur, + battleCtx->sideConditionsMask[side], + battleCtx->fieldConditionsMask, + 0, + 0, + battleCtx->attacker, + battleCtx->defender, + 1) + * -1; battleCtx->fieldConditions.futureSightDamage[battleCtx->defender] = BattleSystem_CalcDamageVariance(battleSys, battleCtx, damage); if (ATTACKER_TURN_FLAGS.helpingHand) { @@ -6336,15 +6333,15 @@ static BOOL BtlCmd_TryFutureSight(BattleSystem *battleSys, BattleContext *battle /** * @brief Check if a move hits its target. - * + * * Inputs: * 1. The attacking battler * 2. The defending battler * 3. The source of the move * 4. The distance to jump if the move did not connect - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CheckMoveHit(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6369,13 +6366,13 @@ static BOOL BtlCmd_CheckMoveHit(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Check if the user can Teleport away. - * + * * Inputs: * 1. The distance to jump if the user is trapped for whatever reason. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TryTeleport(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -6392,17 +6389,17 @@ static BOOL BtlCmd_TryTeleport(BattleSystem *battleSys, BattleContext *battleCtx static inline BOOL BeatUpEligibleMon(BattleContext *battleCtx, Pokemon *mon) { return battleCtx->beatUpCounter == battleCtx->selectedPartySlot[battleCtx->attacker] - || (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG - && Pokemon_GetValue(mon, MON_DATA_STATUS_CONDITION, NULL) == MON_CONDITION_NONE); + || (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG + && Pokemon_GetValue(mon, MON_DATA_STATUS_CONDITION, NULL) == MON_CONDITION_NONE); } /** * @brief Calculate the damage for a single hit of Beat Up. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_BeatUp(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6484,13 +6481,13 @@ static BOOL BtlCmd_BeatUp(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Set up Follow Me for the attacking side. - * + * * Side effects: * 1. The followMe flag for the user's side will be set to TRUE. * 2. The followMeUser value for the user's side will be set to the user's ID. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_FollowMe(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6506,24 +6503,24 @@ static BOOL BtlCmd_FollowMe(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to set up Helping Hand on the user's side. - * + * * This command will fail if any of the following are true: * - The battle is not a double-battle * - The user's partner already moved this turn (including switching) * - The user's partner has fainted * - The user is already under the effect of Helping Hand from their partner - * + * * Inputs: * 1. The distance to jump if the effect fails to execute - * + * * Side effects: * - The Helping Hand flag for the user's partner will be flipped to TRUE - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ -static BOOL BtlCmd_TryHelpingHand (BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryHelpingHand(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -6532,10 +6529,10 @@ static BOOL BtlCmd_TryHelpingHand (BattleSystem *battleSys, BattleContext *battl if (battleType & BATTLE_TYPE_DOUBLES) { int partner = BattleScript_Battler(battleSys, battleCtx, BTLSCR_ATTACKER_PARTNER); if ((battleCtx->battlersSwitchingMask & FlagIndex(partner)) == FALSE - && battleCtx->battlerActions[partner][BATTLE_ACTION_PICK_COMMAND] != BATTLE_CONTROL_MOVE_END - && battleCtx->battleMons[partner].curHP - && ATTACKER_TURN_FLAGS.helpingHand == FALSE - && battleCtx->turnFlags[partner].helpingHand == FALSE) { + && battleCtx->battlerActions[partner][BATTLE_ACTION_PICK_COMMAND] != BATTLE_CONTROL_MOVE_END + && battleCtx->battleMons[partner].curHP + && ATTACKER_TURN_FLAGS.helpingHand == FALSE + && battleCtx->turnFlags[partner].helpingHand == FALSE) { battleCtx->msgBattlerTemp = partner; battleCtx->turnFlags[partner].helpingHand = TRUE; } else { @@ -6550,7 +6547,7 @@ static BOOL BtlCmd_TryHelpingHand (BattleSystem *battleSys, BattleContext *battl /** * @brief Check if the attacker and defender can swap their items. - * + * * This command will fail if any of the following are true: * - The attacker is an AI trainer outside of the Battle Frontier * - Either the attacker or defender have had their held items disabled by @@ -6559,21 +6556,21 @@ static BOOL BtlCmd_TryHelpingHand (BattleSystem *battleSys, BattleContext *battl * - Either the attacker or defender are holding Mail * - The defender has Sticky Hold, and the attacker does not have Mold * Breaker - * + * * Inputs: * 1. The distance to jump if the effect fails to execute * 2. The distance to jump if the defender has Sticky Hold - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TrySwapItems(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); int jumpStickyHold = BattleScript_Read(battleCtx); - + u32 battleType = BattleSystem_BattleType(battleSys); int attacking = Battler_Side(battleSys, battleCtx->attacker); int defending = Battler_Side(battleSys, battleCtx->defender); @@ -6581,11 +6578,11 @@ static BOOL BtlCmd_TrySwapItems(BattleSystem *battleSys, BattleContext *battleCt if (Battler_Side(battleSys, battleCtx->attacker) && (battleType & BATTLE_TYPE_RESTORE_ITEMS_AFTER) == FALSE) { BattleScript_Iter(battleCtx, jumpOnFail); } else if ((battleCtx->sideConditions[attacking].knockedOffItemsMask & FlagIndex(battleCtx->selectedPartySlot[battleCtx->attacker])) - || (battleCtx->sideConditions[defending].knockedOffItemsMask & FlagIndex(battleCtx->selectedPartySlot[battleCtx->defender]))) { + || (battleCtx->sideConditions[defending].knockedOffItemsMask & FlagIndex(battleCtx->selectedPartySlot[battleCtx->defender]))) { BattleScript_Iter(battleCtx, jumpOnFail); } else if ((ATTACKING_MON.heldItem == ITEM_NONE && DEFENDING_MON.heldItem == ITEM_NONE) - || BattleSystem_NotHoldingMail(battleCtx, battleCtx->attacker) == FALSE - || BattleSystem_NotHoldingMail(battleCtx, battleCtx->defender) == FALSE) { + || BattleSystem_NotHoldingMail(battleCtx, battleCtx->attacker) == FALSE + || BattleSystem_NotHoldingMail(battleCtx, battleCtx->defender) == FALSE) { BattleScript_Iter(battleCtx, jumpOnFail); } else if (Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battleCtx->defender, ABILITY_STICKY_HOLD) == TRUE) { BattleScript_Iter(battleCtx, jumpStickyHold); @@ -6596,16 +6593,16 @@ static BOOL BtlCmd_TrySwapItems(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Try to setup Wish on the user's side of the field. - * + * * Inputs: * 1. The distance to jump if Wish is already active on the user's side of * the field. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ -static BOOL BtlCmd_TryWish (BattleSystem *battleSys, BattleContext *battleCtx) +static BOOL BtlCmd_TryWish(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -6622,19 +6619,19 @@ static BOOL BtlCmd_TryWish (BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to execute Assist. - * + * * Assist will pick a random move from among those known by the attacking mon's * party members, only considering moves which are not of the invoker-class * and could be invoked by a Metronome effect. - * + * * Inputs: * 1. The distance to jump if there are no eligible moves - * + * * Side effects: * - battleCtx->msgMoveTemp will be set to the chosen move to invoke - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryAssist(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6656,10 +6653,10 @@ static BOOL BtlCmd_TryAssist(BattleSystem *battleSys, BattleContext *battleCtx) if (i == battleCtx->selectedPartySlot[battleCtx->attacker]) { continue; } - + mon = BattleSystem_PartyPokemon(battleSys, battleCtx->attacker, i); if (Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { for (j = 0; j < LEARNED_MOVES_MAX; j++) { move = Pokemon_GetValue(mon, MON_DATA_MOVE1 + j, NULL); if (Move_IsInvoker(move) == FALSE && Move_CanBeMetronomed(battleSys, battleCtx, battleCtx->attacker, move) == TRUE) { @@ -6681,14 +6678,14 @@ static BOOL BtlCmd_TryAssist(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to set the Magic Coat flag for the user. - * + * * The flag will not be set if the user is the last to move this turn. - * + * * Inputs: * 1. The distance to jump if there are no battlers moving after this one. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TrySetMagicCoat(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6714,10 +6711,10 @@ static BOOL BtlCmd_TrySetMagicCoat(BattleSystem *battleSys, BattleContext *battl /** * @brief Reflect the current move using Magic Coat. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_MagicCoat(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -6749,20 +6746,20 @@ static BOOL BtlCmd_MagicCoat(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Calculate the power multiplier to apply for Revenge. - * + * * The multiplier will be set to 2x if the attacker took damage from its target * this turn; otherwise, it will be set to 1x. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcRevengePowerMul(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); if ((ATTACKER_TURN_FLAGS.physicalDamageTakenFrom[battleCtx->defender] && (ATTACKER_TURN_FLAGS.physicalDamageAttackerMask & FlagIndex(battleCtx->defender))) - || (ATTACKER_TURN_FLAGS.specialDamageTakenFrom[battleCtx->defender]) && (ATTACKER_TURN_FLAGS.specialDamageAttackerMask & FlagIndex(battleCtx->defender))) { + || (ATTACKER_TURN_FLAGS.specialDamageTakenFrom[battleCtx->defender]) && (ATTACKER_TURN_FLAGS.specialDamageAttackerMask & FlagIndex(battleCtx->defender))) { battleCtx->powerMul = 20; } else { battleCtx->powerMul = 10; @@ -6773,13 +6770,13 @@ static BOOL BtlCmd_CalcRevengePowerMul(BattleSystem *battleSys, BattleContext *b /** * @brief Try to break Reflect and Light Screen on the defending side. - * + * * Inputs: * 1. The distance to jump if neither Reflect nor Light Screen are active on * the defending side. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryBreakScreens(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6789,7 +6786,7 @@ static BOOL BtlCmd_TryBreakScreens(BattleSystem *battleSys, BattleContext *battl int defending = Battler_Side(battleSys, battleCtx->defender); if ((battleCtx->sideConditionsMask[defending] & SIDE_CONDITION_REFLECT) - || (battleCtx->sideConditionsMask[defending] & SIDE_CONDITION_LIGHT_SCREEN)) { + || (battleCtx->sideConditionsMask[defending] & SIDE_CONDITION_LIGHT_SCREEN)) { battleCtx->sideConditionsMask[defending] &= ~SIDE_CONDITION_REFLECT; battleCtx->sideConditionsMask[defending] &= ~SIDE_CONDITION_LIGHT_SCREEN; battleCtx->sideConditions[defending].reflectTurns = 0; @@ -6803,12 +6800,12 @@ static BOOL BtlCmd_TryBreakScreens(BattleSystem *battleSys, BattleContext *battl /** * @brief Try to apply Yawn to the target. - * + * * Inputs: * 1. The distance to jump if the target is already under the effect of Yawn. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryYawn(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6827,18 +6824,18 @@ static BOOL BtlCmd_TryYawn(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to knock off the target's held item. - * + * * Inputs: * 1. The distance to jump if the defender does not have a held item. - * + * * Side effects: * - CompareVarToValue the target has a held item and does not have Sticky Hold, the mask * of knocked off items for the defending side will be updated to toggle the * flag for the target. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TryKnockOff(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -6870,11 +6867,11 @@ static BOOL BtlCmd_TryKnockOff(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Calculate the power of a move whose power scales with HP fall-off. - * + * * This includes moves like Water Spout and Eruption. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CalcHPFalloffPower(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6894,16 +6891,16 @@ static BOOL BtlCmd_CalcHPFalloffPower(BattleSystem *battleSys, BattleContext *ba /** * @brief Try to apply the Imprison effect. - * + * * This command will fail if the battler using Imprison does not know at least * one move that is also known by either of the defending battlers. - * + * * Inputs: * 1. The distance to jump if Imprison is already set or the Imprisoning battler * does not know a move that the defenders know. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryImprison(BattleSystem *battleSys, BattleContext *battleCtx) @@ -6936,8 +6933,8 @@ static BOOL BtlCmd_TryImprison(BattleSystem *battleSys, BattleContext *battleCtx for (i = 0; i < LEARNED_MOVES_MAX; i++) { for (j = 0; j < LEARNED_MOVES_MAX; j++) { if (ATTACKING_MON.moves[i] == battleCtx->battleMons[battler].moves[j] - && ATTACKING_MON.moves[i] - && battleCtx->battleMons[battler].moves[j]) { + && ATTACKING_MON.moves[i] + && battleCtx->battleMons[battler].moves[j]) { break; } } @@ -6965,15 +6962,15 @@ static BOOL BtlCmd_TryImprison(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Try to execute the Grudge effect on fainting. - * + * * Inputs: * 1. The distance to jump if the fainted mon did not use Grudge, if the * attacking mon is a teammate, if the attacking mon has also fainted, or if * the killing move was Struggle. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_TryGrudge(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -6982,9 +6979,9 @@ static BOOL BtlCmd_TryGrudge(BattleSystem *battleSys, BattleContext *battleCtx) int defending = Battler_Side(battleSys, battleCtx->defender); if ((FAINTED_MON.moveEffectsMask & MOVE_EFFECT_GRUDGE) - && Battler_Side(battleSys, battleCtx->attacker) != Battler_Side(battleSys, battleCtx->faintedMon) - && ATTACKING_MON.curHP - && battleCtx->moveTemp != MOVE_STRUGGLE) { + && Battler_Side(battleSys, battleCtx->attacker) != Battler_Side(battleSys, battleCtx->faintedMon) + && ATTACKING_MON.curHP + && battleCtx->moveTemp != MOVE_STRUGGLE) { int moveSlot = ATTACKER_MOVE_SLOT; ATTACKING_MON.ppCur[moveSlot] = 0; battleCtx->msgMoveTemp = ATTACKING_MON.moves[moveSlot]; @@ -6999,14 +6996,14 @@ static BOOL BtlCmd_TryGrudge(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to set the Snatch flag for the user. - * + * * The flag will not be set if the user is the last to move this turn. - * + * * Inputs: * 1. The distance to jump if there are no battlers moving after this one. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TrySnatch(BattleSystem *battleSys, BattleContext *battleCtx) @@ -7035,10 +7032,10 @@ static BOOL BtlCmd_TrySnatch(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Calculate the base power of a move which scales with the defender's * weight. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcWeightBasedPower(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7064,16 +7061,16 @@ static BOOL BtlCmd_CalcWeightBasedPower(BattleSystem *battleSys, BattleContext * /** * @brief Calculate the base power of Weather Ball. - * + * * This also sets the type of Weather Ball according to any active weather: * - Water-type in Rain * - Rock-type in Sand * - Fire-type in Sun * - Ice-type in Hail - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcWeatherBallParams(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7108,12 +7105,12 @@ static BOOL BtlCmd_CalcWeatherBallParams(BattleSystem *battleSys, BattleContext /** * @brief Try to execute Pursuit against a battler switching out via U-turn. - * + * * Inputs: * 1. The distance to jump if there is no Pursuit trigger. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryPursuit(BattleSystem *battleSys, BattleContext *battleCtx) @@ -7133,12 +7130,12 @@ static BOOL BtlCmd_TryPursuit(BattleSystem *battleSys, BattleContext *battleCtx) // Only consider battlers which would move after us and are not currently asleep, frozen, or Truant. for (i = 0; i < maxBattlers; i++) { if (battleCtx->battlerActions[i][BATTLE_ACTION_PICK_COMMAND] != BATTLE_CONTROL_MOVE_END - && battleCtx->battleMons[i].curHP - && (battleCtx->battleMons[i].status & (MON_CONDITION_SLEEP | MON_CONDITION_FREEZE)) == FALSE - && Battler_CheckTruant(battleCtx, i) == FALSE - && Battler_Side(battleSys, i) != Battler_Side(battleSys, battleCtx->switchedMon)) { + && battleCtx->battleMons[i].curHP + && (battleCtx->battleMons[i].status & (MON_CONDITION_SLEEP | MON_CONDITION_FREEZE)) == FALSE + && Battler_CheckTruant(battleCtx, i) == FALSE + && Battler_Side(battleSys, i) != Battler_Side(battleSys, battleCtx->switchedMon)) { if (battleCtx->battleMons[i].moveEffectsData.encoredMove - && battleCtx->battleMons[i].moveEffectsData.encoredMove == battleCtx->battleMons[i].moves[battleCtx->battleMons[i].moveEffectsData.encoredMoveSlot]) { + && battleCtx->battleMons[i].moveEffectsData.encoredMove == battleCtx->battleMons[i].moves[battleCtx->battleMons[i].moveEffectsData.encoredMoveSlot]) { move = battleCtx->battleMons[i].moveEffectsData.encoredMove; } else { move = Battler_SelectedMove(battleCtx, i); @@ -7148,12 +7145,12 @@ static BOOL BtlCmd_TryPursuit(BattleSystem *battleSys, BattleContext *battleCtx) moveSlot = Battler_SlotForMove(&battleCtx->battleMons[i], move); if (MOVE_DATA(move).effect == BATTLE_EFFECT_HIT_BEFORE_SWITCH - && battleCtx->battleMons[i].ppCur[moveSlot]) { + && battleCtx->battleMons[i].ppCur[moveSlot]) { battleCtx->battleMons[i].ppCur[moveSlot]--; // CompareVarToValue the switching battler has Pressure, apply it to the battler using Pursuit. if (Battler_Ability(battleCtx, battleCtx->switchedMon) == ABILITY_PRESSURE - && battleCtx->battleMons[i].ppCur[moveSlot]) { + && battleCtx->battleMons[i].ppCur[moveSlot]) { battleCtx->battleMons[i].ppCur[moveSlot]--; } @@ -7179,8 +7176,8 @@ static BOOL BtlCmd_TryPursuit(BattleSystem *battleSys, BattleContext *battleCtx) int power = Battler_HeldItemPower(battleCtx, battleCtx->attacker, 0); if (effect == HOLD_EFFECT_CHOICE_ATK - || effect == HOLD_EFFECT_CHOICE_SPEED - || effect == HOLD_EFFECT_CHOICE_SPATK) { + || effect == HOLD_EFFECT_CHOICE_SPEED + || effect == HOLD_EFFECT_CHOICE_SPATK) { ATTACKING_MON.moveEffectsData.choiceLockedMove = move; } } @@ -7190,9 +7187,9 @@ static BOOL BtlCmd_TryPursuit(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Check the type chart and apply any damage multipliers. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_ApplyTypeEffectiveness(BattleSystem *battleSys, BattleContext *battleCtx) @@ -7200,28 +7197,28 @@ static BOOL BtlCmd_ApplyTypeEffectiveness(BattleSystem *battleSys, BattleContext BattleScript_Iter(battleCtx, 1); battleCtx->damage = BattleSystem_ApplyTypeChart(battleSys, - battleCtx, - battleCtx->moveCur, - battleCtx->moveType, - battleCtx->attacker, - battleCtx->defender, - battleCtx->damage, - &battleCtx->moveStatusFlags); + battleCtx, + battleCtx->moveCur, + battleCtx->moveType, + battleCtx->attacker, + battleCtx->defender, + battleCtx->damage, + &battleCtx->moveStatusFlags); return FALSE; } /** * @brief Checks if the value in a given turn flag matches a static input value. - * + * * Inputs: * 1. The battler whose turn flags should be checked. * 2. The turn flag to check. * 3. The static value to compare against. * 4. The distance to jump if the turn flag value matches. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_IfTurnFlag(BattleSystem *battleSys, BattleContext *battleCtx) @@ -7254,7 +7251,7 @@ static BOOL BtlCmd_IfTurnFlag(BattleSystem *battleSys, BattleContext *battleCtx) result = TRUE; } break; - + case TURN_FLAG_HELPING_HAND: if (battleCtx->turnFlags[battler].helpingHand == compareTo) { result = TRUE; @@ -7289,15 +7286,15 @@ static BOOL BtlCmd_IfTurnFlag(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Set a battler's turn flag to a given static value. - * + * * Inputs: * 1. The battler whose turn flags should be modified. * 2. The turn flag to be set. * 3. The static value to set. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_SetTurnFlag(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7343,17 +7340,17 @@ static BOOL BtlCmd_SetTurnFlag(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Calculates the base power of Gyro Ball. - * + * * Gyro Ball has greater power if the attacker has lower speed than its target. * Specifically, it computes the following formula: - * + * * ( 25 * defenderSpeed ) * min( 150, ------------------ + 1 ) * ( attackerSpeed ) - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcGyroBallPower(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7369,21 +7366,21 @@ static BOOL BtlCmd_CalcGyroBallPower(BattleSystem *battleSys, BattleContext *bat /** * @brief Try to execute Metal Burst. - * + * * Inputs: * 1. The distance to jump if the attacker has not yet taken damage this turn, * or the last damage source is an ally. - * + * * Side effects: * - battleCtx->damage will be set to 1.5x the attacker's last damage taken. * - battleCtx->defender will be set to the last battler to deal damage to the * attacker, or to the defending side's Follow Me user (if one exists), or to * either's partner (if the former has fainted). * - CompareVarToValue there is no valid target, the "no target" subsequence will be executed. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TryMetalBurst(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7393,8 +7390,8 @@ static BOOL BtlCmd_TryMetalBurst(BattleSystem *battleSys, BattleContext *battleC int defending = Battler_Side(battleSys, ATTACKER_TURN_FLAGS.lastAttacker); if (ATTACKER_TURN_FLAGS.lastDamageTaken - && attacking != defending - && battleCtx->battleMons[ATTACKER_TURN_FLAGS.lastAttacker].curHP) { + && attacking != defending + && battleCtx->battleMons[ATTACKER_TURN_FLAGS.lastAttacker].curHP) { battleCtx->damage = ATTACKER_TURN_FLAGS.lastDamageTaken * 15 / 10; if (battleCtx->sideConditions[defending].followMe && FOLLOW_ME_MON(defending).curHP) { @@ -7422,12 +7419,12 @@ static BOOL BtlCmd_TryMetalBurst(BattleSystem *battleSys, BattleContext *battleC /** * @brief Calculates the power for Payback. - * + * * Payback has doubled power if the user moves after the target, if the target * switches out, or if the opponent uses an item. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CalcPaybackPower(BattleSystem *battleSys, BattleContext *battleCtx) @@ -7453,17 +7450,17 @@ static const u8 sCurrentPPScaledPower[] = { /** * @brief Calculates the base power of Trump Card. - * + * * Trump Card's base power scales according to its remaining PP. * - 0: 200 * - 1: 80 * - 2: 60 * - 3: 50 - * - 4+: 40 - * - * @param battleSys - * @param battleCtx - * @return FALSE + * - 4+: 40 + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcTrumpCardPower(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7481,17 +7478,17 @@ static BOOL BtlCmd_CalcTrumpCardPower(BattleSystem *battleSys, BattleContext *ba /** * @brief Calculates the base power of Wring Out. - * + * * Wring Out's base power scales according to the defender's remaining HP. * Specifically, it computes the following formula: - * + * * 120 * currentHP * 1 + --------------- * maxHP - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcWringOutPower(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7504,18 +7501,18 @@ static BOOL BtlCmd_CalcWringOutPower(BattleSystem *battleSys, BattleContext *bat /** * @brief Try to execute Me First. - * + * * Inputs: * 1. The distance to jump if the defender has already taken their turn, if the * defender is struggling, if the move to be stolen cannot be copied by Me First, * or if the move to be stolen has no base power. - * + * * Side effects: * - The Me First flag will be set on the attacker's move effects. * - battleCtx->msgMoveTemp will be set to the stolen move. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryMeFirst(BattleSystem *battleSys, BattleContext *battleCtx) @@ -7525,16 +7522,16 @@ static BOOL BtlCmd_TryMeFirst(BattleSystem *battleSys, BattleContext *battleCtx) u16 move; if (DEFENDING_MON.moveEffectsData.encoredMove - && DEFENDING_MON.moveEffectsData.encoredMove == DEFENDING_MON.moves[DEFENDING_MON.moveEffectsData.encoredMoveSlot]) { + && DEFENDING_MON.moveEffectsData.encoredMove == DEFENDING_MON.moves[DEFENDING_MON.moveEffectsData.encoredMoveSlot]) { move = DEFENDING_MON.moveEffectsData.encoredMove; } else { move = Battler_SelectedMove(battleCtx, battleCtx->defender); } if (DEFENDER_ACTION[BATTLE_ACTION_PICK_COMMAND] != BATTLE_CONTROL_MOVE_END - && DEFENDER_TURN_FLAGS.struggling == FALSE - && Move_MeFirstCanCopy(battleCtx, move) == TRUE - && MOVE_DATA(move).power) { + && DEFENDER_TURN_FLAGS.struggling == FALSE + && Move_MeFirstCanCopy(battleCtx, move) == TRUE + && MOVE_DATA(move).power) { ATTACKING_MON.moveEffectsData.meFirst = TRUE; ATTACKING_MON.moveEffectsData.meFirstTurnNumber = battleCtx->meFirstTurnOrder; battleCtx->msgMoveTemp = move; @@ -7547,18 +7544,18 @@ static BOOL BtlCmd_TryMeFirst(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to execute Copycat. - * + * * Inputs: * 1. The distace to jump if the move to be copied is invoker-class, if a move * has yet to be used this turn, or if the move to be copied cannot be invoked * by Metronome. - * + * * Side effects: * - battleCtx->msgMoveTemp will be set to the most-recently used move. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_TryCopycat(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7566,8 +7563,8 @@ static BOOL BtlCmd_TryCopycat(BattleSystem *battleSys, BattleContext *battleCtx) int jumpOnFail = BattleScript_Read(battleCtx); if (Move_IsInvoker(battleCtx->movePrev) == FALSE - && battleCtx->movePrev - && Move_CanBeMetronomed(battleSys, battleCtx, battleCtx->attacker, battleCtx->movePrev) == TRUE) { + && battleCtx->movePrev + && Move_CanBeMetronomed(battleSys, battleCtx, battleCtx->attacker, battleCtx->movePrev) == TRUE) { battleCtx->msgMoveTemp = battleCtx->movePrev; } else { BattleScript_Iter(battleCtx, jumpOnFail); @@ -7578,13 +7575,13 @@ static BOOL BtlCmd_TryCopycat(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Calculate the base power for Punishment. - * + * * Punishment's base power scales according to the sum of stat boosts that the * target has accrued. Stat reductions are not considered. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcPunishmentPower(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7608,13 +7605,13 @@ static BOOL BtlCmd_CalcPunishmentPower(BattleSystem *battleSys, BattleContext *b /** * @brief Try to execute Sucker Punch. - * + * * Inputs: * 1. The distance to jump if the target has already taken their turn, or if * the target's chosen move has no power. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TrySuckerPunch(BattleSystem *battleSys, BattleContext *battleCtx) @@ -7624,14 +7621,14 @@ static BOOL BtlCmd_TrySuckerPunch(BattleSystem *battleSys, BattleContext *battle int move; if (DEFENDING_MON.moveEffectsData.encoredMove - && DEFENDING_MON.moveEffectsData.encoredMove == DEFENDING_MON.moves[DEFENDING_MON.moveEffectsData.encoredMoveSlot]) { + && DEFENDING_MON.moveEffectsData.encoredMove == DEFENDING_MON.moves[DEFENDING_MON.moveEffectsData.encoredMoveSlot]) { move = DEFENDING_MON.moveEffectsData.encoredMove; } else { move = Battler_SelectedMove(battleCtx, battleCtx->defender); } if (DEFENDER_ACTION[BATTLE_ACTION_PICK_COMMAND] == BATTLE_CONTROL_MOVE_END - || (MOVE_DATA(move).power == 0 && DEFENDER_TURN_FLAGS.struggling == FALSE)) { + || (MOVE_DATA(move).power == 0 && DEFENDER_TURN_FLAGS.struggling == FALSE)) { BattleScript_Iter(battleCtx, jumpOnFail); } @@ -7641,16 +7638,16 @@ static BOOL BtlCmd_TrySuckerPunch(BattleSystem *battleSys, BattleContext *battle /** * @brief Check the side conditions for a particular side of the battle, or * clear them. - * + * * Inputs: * 1. The battler for whom the side conditions should be checked/cleared. * 2. The op code for this command (see: enum CheckSideConditionOp). * 3. The specific side condition to check/modify (see: enum SideCondition). * 4. The distance to jump if a check operation is not fulfilled. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckSideCondition(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7742,12 +7739,12 @@ static BOOL BtlCmd_CheckSideCondition(BattleSystem *battleSys, BattleContext *ba /** * @brief Check if the current move's target is Protecting itself. - * + * * Inputs: * 1. The distance to jump if the target is not Protecting itself. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryFeint(BattleSystem *battleSys, BattleContext *battleCtx) @@ -7765,14 +7762,14 @@ static BOOL BtlCmd_TryFeint(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Check if the defending battler can be given a non-volatile status * condition from the attacker. - * + * * Inputs: * 1. The distance to jump if the defender is already statused, if the defender * is behind a Substitute, or if the attacker does not have a status condition. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckCanShareStatus(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7780,8 +7777,8 @@ static BOOL BtlCmd_CheckCanShareStatus(BattleSystem *battleSys, BattleContext *b int jumpOnFail = BattleScript_Read(battleCtx); if (DEFENDING_MON.status - || (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_SUBSTITUTE) - || ATTACKING_MON.status == MON_CONDITION_NONE) { + || (DEFENDING_MON.statusVolatile & VOLATILE_CONDITION_SUBSTITUTE) + || ATTACKING_MON.status == MON_CONDITION_NONE) { BattleScript_Iter(battleCtx, jumpOnFail); } @@ -7790,13 +7787,13 @@ static BOOL BtlCmd_CheckCanShareStatus(BattleSystem *battleSys, BattleContext *b /** * @brief Try to execute Last Resort. - * + * * Inputs: * 1. The distance to jump if the battler has yet to use all of its other * known moves, or if it ONLY knows Last Resort. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryLastResort(BattleSystem *battleSys, BattleContext *battleCtx) @@ -7806,7 +7803,7 @@ static BOOL BtlCmd_TryLastResort(BattleSystem *battleSys, BattleContext *battleC int numMoves = Battler_CountMoves(battleSys, battleCtx, battleCtx->attacker); if (ATTACKING_MON.moveEffectsData.lastResortCount < numMoves - 1 - || numMoves < 2) { + || numMoves < 2) { BattleScript_Iter(battleCtx, jumpOnFail); } @@ -7815,16 +7812,16 @@ static BOOL BtlCmd_TryLastResort(BattleSystem *battleSys, BattleContext *battleC /** * @brief Try to execute the Toxic Spikes effect. - * + * * Inputs: * 1. The distance to jump if there are already 2 layers of Toxic Spikes on * the targeted side of the field. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_TryToxicSpikes(BattleSystem * battleSys, BattleContext * battleCtx) +static BOOL BtlCmd_TryToxicSpikes(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int jumpOnFail = BattleScript_Read(battleCtx); @@ -7843,11 +7840,11 @@ static BOOL BtlCmd_TryToxicSpikes(BattleSystem * battleSys, BattleContext * batt /** * @brief Check for the Toxic Spikes entry effect. - * + * * Inputs: * 1. The battler who is switching in and should be subject to Toxic Spikes. * 2. The distance to jump if there are no layers of Toxic Spikes. - * + * * Side effects: * - battleCtx->calcTemp will be set to the number of layers of Toxic Spikes on * the switched-in battler's side of the field. CompareVarToValue the switched-in battler has @@ -7856,12 +7853,12 @@ static BOOL BtlCmd_TryToxicSpikes(BattleSystem * battleSys, BattleContext * batt * - battleCtx->sideEffectMon will be set to the switched-in battler. * - CompareVarToValue the switched-in battler has the Poison type, then Toxic Spikes will be * cleared from its side of the field. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ -static BOOL BtlCmd_CheckToxicSpikes(BattleSystem * battleSys, BattleContext * battleCtx) +static BOOL BtlCmd_CheckToxicSpikes(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); @@ -7890,20 +7887,20 @@ static BOOL BtlCmd_CheckToxicSpikes(BattleSystem * battleSys, BattleContext * ba /** * @brief Check the ability of a battler or set of battlers, accounting for * effects which ignore that ability. - * + * * Inputs: * 1. Op-code which controls the behavior. See enum CheckHaveOp * 2. Input battler (or set of battlers) whose ability should be checked * 3. The ability to check for any battler to have (or not have) * 4. GoTo distance if a battler in the input set meets the criteria - * + * * Side effects: * - CompareVarToValue any battler matches the criteria, battleCtx->abilityMon will be set * to their identifier. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckIgnorableAbility(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -7922,13 +7919,13 @@ static BOOL BtlCmd_CheckIgnorableAbility(BattleSystem *battleSys, BattleContext if (op == CHECK_HAVE) { if (Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battler, ability) == TRUE - && battleCtx->battleMons[battler].curHP) { + && battleCtx->battleMons[battler].curHP) { BattleScript_Iter(battleCtx, jump); battleCtx->abilityMon = battler; break; } } else if (Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battler, ability) == FALSE - || battleCtx->battleMons[battler].curHP == 0) { + || battleCtx->battleMons[battler].curHP == 0) { BattleScript_Iter(battleCtx, jump); battleCtx->abilityMon = battler; break; @@ -7939,12 +7936,12 @@ static BOOL BtlCmd_CheckIgnorableAbility(BattleSystem *battleSys, BattleContext if (op == CHECK_HAVE) { if (Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battler, ability) == TRUE - && battleCtx->battleMons[battler].curHP) { + && battleCtx->battleMons[battler].curHP) { BattleScript_Iter(battleCtx, jump); battleCtx->abilityMon = battler; } } else if (Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battler, ability) == FALSE - || battleCtx->battleMons[battler].curHP == 0) { + || battleCtx->battleMons[battler].curHP == 0) { BattleScript_Iter(battleCtx, jump); battleCtx->abilityMon = battler; } @@ -7956,14 +7953,14 @@ static BOOL BtlCmd_CheckIgnorableAbility(BattleSystem *battleSys, BattleContext /** * @brief GoTo forward a certain distance if two battlers are on the same * side of the field. - * + * * Inputs: * 1. The first battler. * 2. The second battler. * 3. The distance to jump if the two battlers are teammates. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_IfSameSide(BattleSystem *battleSys, BattleContext *battleCtx) @@ -7987,31 +7984,31 @@ static BOOL BtlCmd_IfSameSide(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Generates an end-of-battle item, if applicable. - * + * * This command encompasses two abilities: Pickup and Honey Gather. - * + * * Pickup has a 10% chance to generate a semi-random item pulled from a table * of eligible values. The generated item has a 98% chance to be a "common" * item, and a 2% chance to be a "rare" item. The exact items which can be * generated vary using a sliding window on table of all possible entries; the * window used shifts forward 1 entry for every 10 levels that the Pokemon has * (1-10, 11-20, etc.). - * + * * 9 slots are viewed for the common items window, and 2 slots are viewed for * the rare items window. Items in the rare window have an equal chance of * being generated (1% each). Items in the common window have a sliding * probability: * 1: 30% * 2 - 7: 10% each - * 8, 9: 4% each - * + * 8, 9: 4% each + * * Honey Gather has a 5% chance to generate Honey at the end of the battle, * scaling upwards by 5% for every 10 levels that the Pokemon has (5% for * levels 1-10, 10% for levels 11-20, etc., capping at 50%). - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_GenerateEndOfBattleItem(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8030,10 +8027,10 @@ static BOOL BtlCmd_GenerateEndOfBattleItem(BattleSystem *battleSys, BattleContex ability = Pokemon_GetValue(mon, MON_DATA_ABILITY, NULL); if (ability == ABILITY_PICKUP - && species != SPECIES_NONE - && species != SPECIES_EGG - && item == ITEM_NONE - && BattleSystem_RandNext(battleSys) % 10 == 0) { + && species != SPECIES_NONE + && species != SPECIES_EGG + && item == ITEM_NONE + && BattleSystem_RandNext(battleSys) % 10 == 0) { rnd = BattleSystem_RandNext(battleSys) % 100; // determine what offset of the sliding table to start from @@ -8048,8 +8045,8 @@ static BOOL BtlCmd_GenerateEndOfBattleItem(BattleSystem *battleSys, BattleContex if (sCommonPickupRate[j] > rnd) { Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &sCommonPickupItems[level + j]); break; - } - + } + if (rnd >= 98 && rnd <= 99) { Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &sRarePickupItems[level + (99 - rnd)]); break; @@ -8058,9 +8055,9 @@ static BOOL BtlCmd_GenerateEndOfBattleItem(BattleSystem *battleSys, BattleContex } if (ability == ABILITY_HONEY_GATHER - && species != SPECIES_NONE - && species != SPECIES_EGG - && item == ITEM_NONE) { + && species != SPECIES_NONE + && species != SPECIES_EGG + && item == ITEM_NONE) { j = 0; max = 10; level = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL); @@ -8086,9 +8083,9 @@ static BOOL BtlCmd_GenerateEndOfBattleItem(BattleSystem *battleSys, BattleContex /** * @brief Set the Trick Room activation flag for the attacker. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TrickRoom(BattleSystem *battleSys, BattleContext *battleCtx) @@ -8102,13 +8099,13 @@ static BOOL BtlCmd_TrickRoom(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief GoTo ahead if a given battler has already moved this turn. - * + * * Inputs: * 1. The battler to check. * 2. The distance to jump if the battler has already moved this turn. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_IfMovedThisTurn(BattleSystem *battleSys, BattleContext *battleCtx) @@ -8128,17 +8125,17 @@ static BOOL BtlCmd_IfMovedThisTurn(BattleSystem *battleSys, BattleContext *battl /** * @brief GoTo ahead if a given battler has (or does not have) an item with the * given hold effect. - * + * * Inputs: * 1. Opcode. See enum CheckHaveOp. * 2. The battler whose held item is to be checked. * 3. The effect to check for. * 4. The distance to jump if the battler has (or does not have) an item with * the given hold effect. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckItemHoldEffect(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8164,14 +8161,14 @@ static BOOL BtlCmd_CheckItemHoldEffect(BattleSystem *battleSys, BattleContext *b /** * @brief Get a battler's held item and store its effect into the * specified variable. - * + * * Inputs: * 1. The battler whose item is to be accessed. * 2. The variable in which to store the item effect. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_GetItemHoldEffect(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8191,14 +8188,14 @@ static BOOL BtlCmd_GetItemHoldEffect(BattleSystem *battleSys, BattleContext *bat /** * @brief Get a battler's held item and store its effect power into the * specified variable. - * + * * Inputs: * 1. The battler whose item is to be accessed. * 2. The variable in which to store the item effect power. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_GetItemEffectParam(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8220,14 +8217,14 @@ static BOOL BtlCmd_GetItemEffectParam(BattleSystem *battleSys, BattleContext *ba /** * @brief Try to change the battler's type to one according to the battle * terrain. - * + * * Inputs: * 1. The distance to jump ahead if the user is already of the terrain's * corresponding type, or if the user is Arceus. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_TryCamouflage(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8260,13 +8257,13 @@ static BOOL BtlCmd_TryCamouflage(BattleSystem *battleSys, BattleContext *battleC /** * @brief Get the move which corresponding to this battle's terrain. - * + * * Side effects: * - battleCtx->msgMoveTemp will be set to the terrain's corresponding move. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_GetTerrainMove(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8287,14 +8284,14 @@ static BOOL BtlCmd_GetTerrainMove(BattleSystem *battleSys, BattleContext *battle /** * @brief Get the secondary effect corresponding to this battle's terrain. - * + * * Side effects: * - battleCtx->sideEffectIndirectFlags will be set to the terrain's * corresponding secondary effect flags. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_GetTerrainSecondaryEffect(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8312,14 +8309,14 @@ static BOOL BtlCmd_GetTerrainSecondaryEffect(BattleSystem *battleSys, BattleCont /** * @brief Calculate the type and base power of Natural Gift. - * + * * Inputs: * 1. The distance to jump if the attacker's item cannot be used with Natural * Gift. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CalcNaturalGiftParams(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8339,15 +8336,15 @@ static BOOL BtlCmd_CalcNaturalGiftParams(BattleSystem *battleSys, BattleContext /** * @brief Try to Pluck the defender's berry and grant its effect to the attacker. - * + * * Inputs: * 1. The distance to jump if the defender has Sticky Hold. * 2. The distance to jump if the defender's berry does not have a Pluckable * effect, or if the defender used their Custap Berry this turn. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TryPluck(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8356,10 +8353,10 @@ static BOOL BtlCmd_TryPluck(BattleSystem *battleSys, BattleContext *battleCtx) int jumpNoEffect = BattleScript_Read(battleCtx); if (DEFENDING_MON.heldItem - && Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battleCtx->defender, ABILITY_STICKY_HOLD) == TRUE) { + && Battler_IgnorableAbility(battleCtx, battleCtx->attacker, battleCtx->defender, ABILITY_STICKY_HOLD) == TRUE) { BattleScript_Iter(battleCtx, jumpStickyHold); } else if ((DEFENDING_MON.heldItem && DEFENDING_MON.moveEffectsData.custapBerry) - || BattleSystem_PluckBerry(battleSys, battleCtx, battleCtx->defender) != TRUE) { + || BattleSystem_PluckBerry(battleSys, battleCtx, battleCtx->defender) != TRUE) { BattleScript_Iter(battleCtx, jumpNoEffect); } @@ -8368,14 +8365,14 @@ static BOOL BtlCmd_TryPluck(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to Fling the attacker's item and enact its effect on the defender. - * + * * Inputs: * 1. The distance to jump if the attacker's item does not have a Flingable * effect. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TryFling(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8391,13 +8388,13 @@ static BOOL BtlCmd_TryFling(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Show a Yes/No option-select on the bottom screen. - * + * * Inputs: * 1. The type of Yes/No option-select to be shown. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_YesNoMenu(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8411,18 +8408,18 @@ static BOOL BtlCmd_YesNoMenu(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Wait for a result from a displayed Yes/No option-select. - * + * * This command will NOT modify the sequence cursor until an input is made. - * + * * Inputs: * 1. The distance to jump if the player selected Yes. * 2. The distance to jump if the player selected No. - * + * * Side effects: * - battleCtx->battleProgressFlag will be set to TRUE. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_WaitYesNoResult(BattleSystem *battleSys, BattleContext *battleCtx) @@ -8449,16 +8446,16 @@ static BOOL BtlCmd_WaitYesNoResult(BattleSystem *battleSys, BattleContext *battl /** * @brief Show the Party menu on the bottom screen. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_ChoosePokemonMenu(BattleSystem *battleSys, BattleContext *battleCtx) { BattleSystem_MaxBattlers(battleSys); // must stay to match BattleScript_Iter(battleCtx, 1); - + BattleIO_ShowPartyScreen(battleSys, battleCtx, BATTLER_US, 0, 0, 6); battleCtx->switchedMon = BATTLER_US; @@ -8467,19 +8464,19 @@ static BOOL BtlCmd_ChoosePokemonMenu(BattleSystem *battleSys, BattleContext *bat /** * @brief Wait for a result from a displayed Party menu. - * + * * This command will NOT modify the sequence cursor until an input is made. - * + * * Inputs: * 1. The distance to jump if the player selected Cancel. - * + * * Side effects: * - battleCtx->switchedPartySlot will be updated to reflect the chosen * party slot for a switch. * - battleCtx->battleProgressFlag will be set to TRUE. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_WaitPokemonMenuResult(BattleSystem *battleSys, BattleContext *battleCtx) @@ -8504,10 +8501,10 @@ static BOOL BtlCmd_WaitPokemonMenuResult(BattleSystem *battleSys, BattleContext /** * @brief Submit the battle result flag to other Wi-fi battlers, if this is * a Wi-fi battle. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_SetLinkBattleResult(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8522,17 +8519,17 @@ static BOOL BtlCmd_SetLinkBattleResult(BattleSystem *battleSys, BattleContext *b /** * @brief Check for Stealth Rock on a battler's side of the field. - * + * * Inputs: * 1. The battler for whom Stealth Rock should be checked. * 2. The distance to jump if there is no effect to apply. - * + * * Side effects: * - battleCtx->hpCalcTemp will be set to the HP deduction to apply to the * input battler from Stealth Rock. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CheckStealthRock(BattleSystem *battleSys, BattleContext *battleCtx) @@ -8547,7 +8544,7 @@ static BOOL BtlCmd_CheckStealthRock(BattleSystem *battleSys, BattleContext *batt int type2 = BattleMon_Get(battleCtx, battler, BATTLEMON_TYPE_2, NULL); if ((battleCtx->sideConditionsMask[side] & SIDE_CONDITION_STEALTH_ROCK) - && battleCtx->battleMons[battler].curHP) { + && battleCtx->battleMons[battler].curHP) { switch (BattleSystem_TypeMatchupMultiplier(TYPE_ROCK, type1, type2)) { case TYPE_MULTI_QUADRUPLE_DAMAGE: battleCtx->hpCalcTemp = 2; @@ -8588,13 +8585,13 @@ static BOOL BtlCmd_CheckStealthRock(BattleSystem *battleSys, BattleContext *batt /** * @brief Check if a secondary effect should activate. - * + * * Inputs: * 1. The distance to jump ahead if the secondary effect should NOT activate. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckEffectActivation(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8611,7 +8608,7 @@ static BOOL BtlCmd_CheckEffectActivation(BattleSystem *battleSys, BattleContext GF_ASSERT(effectChance != 0); if (BattleSystem_RandNext(battleSys) % 100 < effectChance - && battleCtx->battleMons[battleCtx->sideEffectMon].curHP) { + && battleCtx->battleMons[battleCtx->sideEffectMon].curHP) { return FALSE; } @@ -8622,13 +8619,13 @@ static BOOL BtlCmd_CheckEffectActivation(BattleSystem *battleSys, BattleContext /** * @brief Check if Chatter's secondary effect should activate based on Chatot's * sound data. - * + * * Inputs: * 1. The distance to jump ahead if the secondary effect should NOT activate. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckChatterActivation(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8636,8 +8633,8 @@ static BOOL BtlCmd_CheckChatterActivation(BattleSystem *battleSys, BattleContext int jumpNoEffect = BattleScript_Read(battleCtx); if (ATTACKING_MON.species == SPECIES_CHATOT - && DEFENDING_MON.curHP - && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_TRANSFORM) == FALSE) { + && DEFENDING_MON.curHP + && (ATTACKING_MON.statusVolatile & VOLATILE_CONDITION_TRANSFORM) == FALSE) { int chatter; if ((BattleSystem_BattleStatus(battleSys) & BATTLE_STATUS_RECORDING) == FALSE) { chatter = Sound_Chatter(BattleSystem_ChatotVoice(battleSys, battleCtx->attacker)); @@ -8673,15 +8670,15 @@ static BOOL BtlCmd_CheckChatterActivation(BattleSystem *battleSys, BattleContext /** * @brief Gets a parameter from the current move's data table entry. - * + * * Inputs: * 1. The parameter to be retrieved from the current move. - * + * * Side effects: * - battleCtx->calcTemp will be set to the value of the requested parameter. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_GetCurrentMoveData(BattleSystem *battleSys, BattleContext *battleCtx) @@ -8696,14 +8693,14 @@ static BOOL BtlCmd_GetCurrentMoveData(BattleSystem *battleSys, BattleContext *ba /** * @brief Sets the mosaic effect on a battler's sprite. - * + * * Inputs: * 1. The battler on which to apply the effect. * 2. The target distortion level to be applied. * 3. The time to wait between individual distortion levels. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_SetMosaic(BattleSystem *battleSys, BattleContext *battleCtx) @@ -8721,13 +8718,13 @@ static BOOL BtlCmd_SetMosaic(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Signals that a form change should occur due to the field's weather. - * + * * Inputs: * 1. The battler whose form should be changed. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_ChangeForm(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8742,15 +8739,15 @@ static BOOL BtlCmd_ChangeForm(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Issue a signal to shift all terrain graphics into the BG. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_SetBattleBackground(BattleSystem *battleSys, BattleContext *battleCtx) { BattleScript_Iter(battleCtx, 1); - + BattleIO_UpdateBG(battleSys, BATTLER_US); return FALSE; @@ -8758,12 +8755,12 @@ static BOOL BtlCmd_SetBattleBackground(BattleSystem *battleSys, BattleContext *b /** * @brief Use an item from the bag for a battler. - * + * * Inputs: * 1. Which battler is using the item. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_UseBagItem(BattleSystem *battleSys, BattleContext *battleCtx) @@ -8779,13 +8776,13 @@ static BOOL BtlCmd_UseBagItem(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Try to escape the battle from the given slot. - * + * * Inputs: * 1. The battler trying to escape * 2. The distance to jump if escape fails - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryEscape(BattleSystem *battleSys, BattleContext *battleCtx) @@ -8805,13 +8802,13 @@ static BOOL BtlCmd_TryEscape(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Show the start-of-battle party gauge. - * + * * Inputs: * 1. The battler whose party gauge should be shown. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8826,13 +8823,13 @@ static BOOL BtlCmd_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattleCont /** * @brief Hide the start-of-battle party gauge. - * + * * Inputs: * 1. The battler whose party gauge should be hidden. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_HideBattleStartPartyGauge(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8847,13 +8844,13 @@ static BOOL BtlCmd_HideBattleStartPartyGauge(BattleSystem *battleSys, BattleCont /** * @brief Show the mid-battle party gauge. - * + * * Inputs: * 1. The battler whose party gauge should be shown. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_ShowPartyGauge(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8868,13 +8865,13 @@ static BOOL BtlCmd_ShowPartyGauge(BattleSystem *battleSys, BattleContext *battle /** * @brief Hide the mid-battle party gauge. - * + * * Inputs: * 1. The battler whose party gauge should be hidden. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_HidePartyGauge(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8889,10 +8886,10 @@ static BOOL BtlCmd_HidePartyGauge(BattleSystem *battleSys, BattleContext *battle /** * @brief Show the party gauge graphics resources. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_LoadPartyGaugeGraphics(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8904,10 +8901,10 @@ static BOOL BtlCmd_LoadPartyGaugeGraphics(BattleSystem *battleSys, BattleContext /** * @brief Hide the party gauge graphics resources. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_FreePartyGaugeGraphics(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8933,13 +8930,13 @@ static BOOL BtlCmd_IncrementGameStat(BattleSystem *battleSys, BattleContext *bat /** * @brief Restore a given battler's sprite, e.g., one that has been hidden * behind a Substitute. - * + * * Inputs: * 1. The battler to be restored. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_RestoreSprite(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8954,17 +8951,17 @@ static BOOL BtlCmd_RestoreSprite(BattleSystem *battleSys, BattleContext *battleC /** * @brief Triggers any abilities when a move hits its target. - * + * * Inputs: * 1. The distance to jump if there are no effects to trigger. - * + * * Side effects: * - battleCtx->scriptTemp will be set to the subroutine sequence to execute * for any triggered effect. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -8980,12 +8977,12 @@ static BOOL BtlCmd_TriggerAbilityOnHit(BattleSystem *battleSys, BattleContext *b /** * @brief Convert a sprite into OAM form. - * + * * This is used at the start of the battle for moving sprites across the screen, * fading them in/out, etc. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_SpriteToOAM(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9025,12 +9022,12 @@ static BOOL BtlCmd_SpriteToOAM(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Convert back from OAM to a sprite. - * + * * This is used at the start of the battle for moving sprites across the screen, * fading them in/out, etc. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_OAMToSprite(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9070,14 +9067,14 @@ static BOOL BtlCmd_OAMToSprite(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief GoTo ahead a certain distance if the battler is out of Pokemon. - * + * * Inputs: * 1. The battler to be checked * 2. The distance to jump if the battler is out of Pokemon - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckBlackOut(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9098,7 +9095,7 @@ static BOOL BtlCmd_CheckBlackOut(BattleSystem *battleSys, BattleContext *battleC battler = BattleScript_Battler(battleSys, battleCtx, inBattler); if ((battleType & BATTLE_TYPE_2vs2) - || ((battleType & BATTLE_TYPE_TAG) && Battler_Side(battleSys, battler))) { + || ((battleType & BATTLE_TYPE_TAG) && Battler_Side(battleSys, battler))) { Party *party1 = BattleSystem_Party(battleSys, battler); Party *party2 = BattleSystem_Party(battleSys, BattleSystem_Partner(battleSys, battler)); battlerData = BattleSystem_BattlerData(battleSys, battler); @@ -9107,7 +9104,7 @@ static BOOL BtlCmd_CheckBlackOut(BattleSystem *battleSys, BattleContext *battleC mon = Party_GetPokemonBySlotIndex(party1, i); if (Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { aliveMons += Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL); } } @@ -9115,13 +9112,13 @@ static BOOL BtlCmd_CheckBlackOut(BattleSystem *battleSys, BattleContext *battleC // Don't consider the second slot if we have a partner // first condition here does not match as an AND of NEQs, must be a NOT of an OR of EQs if (!(battleType == BATTLE_TYPE_TRAINER_WITH_AI_PARTNER || battleType == BATTLE_TYPE_AI_PARTNER) - || Battler_Side(battleSys, battler) != BATTLER_US - || BattleSystem_BattlerSlot(battleSys, battler) != BATTLER_PLAYER_SLOT_2) { + || Battler_Side(battleSys, battler) != BATTLER_US + || BattleSystem_BattlerSlot(battleSys, battler) != BATTLER_PLAYER_SLOT_2) { for (i = 0; i < Party_GetCurrentCount(party2); i++) { mon = Party_GetPokemonBySlotIndex(party2, i); if (Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { aliveMons += Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL); } } @@ -9138,7 +9135,7 @@ static BOOL BtlCmd_CheckBlackOut(BattleSystem *battleSys, BattleContext *battleC mon = Party_GetPokemonBySlotIndex(party, i); if (Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { aliveMons += Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL); } } @@ -9153,17 +9150,17 @@ static BOOL BtlCmd_CheckBlackOut(BattleSystem *battleSys, BattleContext *battleC /** * @brief Boost a random stat by 2 stages. - * + * * Inputs: * 1. The distance to jump if there are no valid stats to boost. - * + * * Side effects: * - battleCtx->sideEffectDirectFlags will be set to the random stat to be * boosted. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_BoostRandomStatBy2(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9194,16 +9191,16 @@ static BOOL BtlCmd_BoostRandomStatBy2(BattleSystem *battleSys, BattleContext *ba /** * @brief Remove a battler's held item. - * + * * Inputs: * 1. The battler whose item should be removed. - * + * * Side effects: * - battleCtx->recycleItem will be updated to the battler's old held item. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_RemoveItem(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9221,16 +9218,16 @@ static BOOL BtlCmd_RemoveItem(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Check for an item in the Recycle buffer. - * + * * Inputs: * 1. The distance to jump if there is no item in the Recycle buffer. - * + * * Side effects: * - battleCtx->msgItemTemp will be set to the item from the Recycle buffer. * - battleCtx->recycleItem will be cleared for the attacker. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryRecycle(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9250,13 +9247,13 @@ static BOOL BtlCmd_TryRecycle(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Triggers any held items when a move hits its target. - * + * * Inputs: * 1. The distance to jump if there are no items to be triggered. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9272,10 +9269,10 @@ static BOOL BtlCmd_TriggerHeldItemOnHit(BattleSystem *battleSys, BattleContext * /** * @brief Display the result message for a battle. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_PrintBattleResultMessage(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9287,10 +9284,10 @@ static BOOL BtlCmd_PrintBattleResultMessage(BattleSystem *battleSys, BattleConte /** * @brief Display the message for escaping a battle. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_PrintEscapeMessage(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9302,10 +9299,10 @@ static BOOL BtlCmd_PrintEscapeMessage(BattleSystem *battleSys, BattleContext *ba /** * @brief Display the message for forfeiting a battle. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_PrintForfeitMessage(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9317,19 +9314,19 @@ static BOOL BtlCmd_PrintForfeitMessage(BattleSystem *battleSys, BattleContext *b /** * @brief Check if a battler should be left with 1 HP after a move hits. - * + * * Inputs: * 1. The battler to be checked. - * + * * Side effects: * - CompareVarToValue the battler should endure the hit, battleCtx->hpCalcTemp will be updated * with the correct amount of damage to leave them at 1 HP, and * battleCtx->moveStatusFlags will be updated with the MOVE_STATUS_ENDURED_ITEM * flag. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckHoldOnWith1HP(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9343,12 +9340,12 @@ static BOOL BtlCmd_CheckHoldOnWith1HP(BattleSystem *battleSys, BattleContext *ba int itemPower = Battler_HeldItemPower(battleCtx, battler, ITEM_POWER_CHECK_ALL); if (itemEffect == HOLD_EFFECT_MAYBE_ENDURE - && BattleSystem_RandNext(battleSys) % 100 < itemPower) { + && BattleSystem_RandNext(battleSys) % 100 < itemPower) { endure = TRUE; } if (itemEffect == HOLD_EFFECT_ENDURE - && battleCtx->battleMons[battler].curHP == battleCtx->battleMons[battler].maxHP) { + && battleCtx->battleMons[battler].curHP == battleCtx->battleMons[battler].maxHP) { endure = TRUE; } @@ -9362,14 +9359,14 @@ static BOOL BtlCmd_CheckHoldOnWith1HP(BattleSystem *battleSys, BattleContext *ba /** * @brief Try to restore the battler's status on switch-out. - * + * * Inputs: * 1. The battler whose status should be restored. * 2. The distance to jump if the battler has fainted, or the battler has no * ability which would restore its status on switch-out. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TryRestoreStatusOnSwitch(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9385,7 +9382,7 @@ static BOOL BtlCmd_TryRestoreStatusOnSwitch(BattleSystem *battleSys, BattleConte int status = Pokemon_GetValue(mon, MON_DATA_STATUS_CONDITION, NULL); if (battleCtx->battleMons[battler].ability != ABILITY_NATURAL_CURE - && Ability_ForbidsStatus(battleCtx, ability, status) == FALSE) { + && Ability_ForbidsStatus(battleCtx, ability, status) == FALSE) { BattleScript_Iter(battleCtx, jumpNoStatusRestore); } } else { @@ -9397,13 +9394,13 @@ static BOOL BtlCmd_TryRestoreStatusOnSwitch(BattleSystem *battleSys, BattleConte /** * @brief Check if a battler has an active Substitute. - * + * * Inputs: * 1. The battler to be checked * 2. The distance to jump if Substitute is not active - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CheckSubstitute(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9414,7 +9411,7 @@ static BOOL BtlCmd_CheckSubstitute(BattleSystem *battleSys, BattleContext *battl int battler = BattleScript_Battler(battleSys, battleCtx, inBattler); if ((battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_SUBSTITUTE) - || (battleCtx->selfTurnFlags[battler].statusFlags & SELF_TURN_FLAG_SUBSTITUTE_HIT)) { + || (battleCtx->selfTurnFlags[battler].statusFlags & SELF_TURN_FLAG_SUBSTITUTE_HIT)) { BattleScript_Iter(battleCtx, jumpSubActive); } @@ -9423,10 +9420,10 @@ static BOOL BtlCmd_CheckSubstitute(BattleSystem *battleSys, BattleContext *battl /** * @brief GoTo ahead a certain distance if a weather-negation effect is active. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_CheckIgnoreWeather(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9434,7 +9431,7 @@ static BOOL BtlCmd_CheckIgnoreWeather(BattleSystem *battleSys, BattleContext *ba int jumpIfActive = BattleScript_Read(battleCtx); if (BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_CLOUD_NINE) - || BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_AIR_LOCK)) { + || BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALIVE_BATTLERS, 0, ABILITY_AIR_LOCK)) { BattleScript_Iter(battleCtx, jumpIfActive); } @@ -9443,12 +9440,12 @@ static BOOL BtlCmd_CheckIgnoreWeather(BattleSystem *battleSys, BattleContext *ba /** * @brief Set the target of the next move to be a random opponent. - * + * * Inputs: * 1. The battler used to determine who is an opponent. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_SetRandomTarget(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9464,12 +9461,12 @@ static BOOL BtlCmd_SetRandomTarget(BattleSystem *battleSys, BattleContext *battl /** * @brief Triggers any held items when a pivot move hits its target. - * + * * Inputs: * 1. The distance to jump if there are no items to be triggered. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9487,12 +9484,12 @@ static BOOL BtlCmd_TriggerHeldItemOnPivotMove(BattleSystem *battleSys, BattleCon /** * @brief Refresh a battler's sprite according to new parameters, e.g., during * a mid-battle form change. - * + * * Inputs: * 1. The battler whose sprite should be refreshed. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_RefreshSprite(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9508,13 +9505,13 @@ static BOOL BtlCmd_RefreshSprite(BattleSystem *battleSys, BattleContext *battleC /** * @brief Play the "move hit" sound effect. - * + * * Inputs: * 1. The battler who should hear the effect. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_PlayMoveHitSound(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9529,13 +9526,13 @@ static BOOL BtlCmd_PlayMoveHitSound(BattleSystem *battleSys, BattleContext *batt /** * @brief Play a given music track. - * + * * Inputs: * 1. The battler who should hear the music. * 2. The track to be played. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_PlayBGM(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9543,7 +9540,7 @@ static BOOL BtlCmd_PlayBGM(BattleSystem *battleSys, BattleContext *battleCtx) BattleScript_Iter(battleCtx, 1); int inBattler = BattleScript_Read(battleCtx); int bgmID = BattleScript_Read(battleCtx); - + int battler = BattleScript_Battler(battleSys, battleCtx, inBattler); BattleIO_PlayMusic(battleSys, battler, bgmID); @@ -9552,13 +9549,13 @@ static BOOL BtlCmd_PlayBGM(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Check if the Safari Zone game should continue. - * + * * Inputs: * 1. The distance to jump if the Safari Zone game is not yet over - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_CheckSafariGameDone(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9566,7 +9563,7 @@ static BOOL BtlCmd_CheckSafariGameDone(BattleSystem *battleSys, BattleContext *b int jumpNotOver = BattleScript_Read(battleCtx); if ((BattleSystem_PartyCount(battleSys, BATTLER_US) != MAX_PARTY_SIZE || PCBoxes_FirstEmptyBox(battleSys->pcBoxes) != 18) - && battleSys->safariBalls) { + && battleSys->safariBalls) { BattleScript_Iter(battleCtx, jumpNotOver); } @@ -9575,16 +9572,16 @@ static BOOL BtlCmd_CheckSafariGameDone(BattleSystem *battleSys, BattleContext *b /** * @brief Wait a certain number of frames, disabling the skip functionality. - * + * * Inputs: * 1. The number of frames to wait. - * + * * Side effects: * - battleCtx->battleProgressFlag will be set to TRUE. - * - * @param battleSys - * @param battleCtx - * @return BOOL + * + * @param battleSys + * @param battleCtx + * @return BOOL */ static BOOL BtlCmd_WaitTime(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9593,7 +9590,7 @@ static BOOL BtlCmd_WaitTime(BattleSystem *battleSys, BattleContext *battleCtx) int inc; if ((battleSys->battleType & BATTLE_TYPE_LINK) - && (battleSys->battleStatusMask & BATTLE_STATUS_RECORDING) == FALSE) { + && (battleSys->battleStatusMask & BATTLE_STATUS_RECORDING) == FALSE) { inc = 2; } else { inc = 1; @@ -9612,13 +9609,13 @@ static BOOL BtlCmd_WaitTime(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Check if the current move is of the given type. - * + * * Inputs: * 1. The type to check for. * 2. The distance to jump if the current move is of the given type. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_CheckCurMoveIsType(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9637,14 +9634,14 @@ static BOOL BtlCmd_CheckCurMoveIsType(BattleSystem *battleSys, BattleContext *ba /** * @brief Loads a data value from the personal NARC for the given species, using * a form specified in a variable. - * + * * Inputs: * 1. The target species. * 2. A variable which contains the form to be loaded. * 3. The target data value from the personal NARC. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_LoadArchivedMonData(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9663,12 +9660,12 @@ static BOOL BtlCmd_LoadArchivedMonData(BattleSystem *battleSys, BattleContext *b /** * @brief Reload a Pokemon, refreshing all of its underlying data, e.g., stats, * ability, etc. - * + * * Inputs: * 1. The battler which should be reloaded. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return FALSE */ static BOOL BtlCmd_RefreshMonData(BattleSystem *battleSys, BattleContext *battleCtx) @@ -9684,13 +9681,13 @@ static BOOL BtlCmd_RefreshMonData(BattleSystem *battleSys, BattleContext *battle /** * @brief End the sequence. - * + * * Side effects: * battleCtx->battleProgressFlag will be set to TRUE. - * - * @param battleSys - * @param battleCtx - * @return FALSE + * + * @param battleSys + * @param battleCtx + * @return FALSE */ static BOOL BtlCmd_End(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -9700,8 +9697,8 @@ static BOOL BtlCmd_End(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Read a 4-byte chunk from the loaded script and increment the cursor. - * - * @param battleCtx + * + * @param battleCtx * @return The read 4-byte chunk. */ static int BattleScript_Read(BattleContext *battleCtx) @@ -9714,8 +9711,8 @@ static int BattleScript_Read(BattleContext *battleCtx) /** * @brief Increment the script cursor by a specified amount. - * - * @param battleCtx + * + * @param battleCtx * @param i Increment value */ static void BattleScript_Iter(BattleContext *battleCtx, int i) @@ -9725,11 +9722,11 @@ static void BattleScript_Iter(BattleContext *battleCtx, int i) /** * @brief Load a script into the script buffer. - * + * * This will perform a full jump to the accompanying script, abandoning the * current execution. - * - * @param battleCtx + * + * @param battleCtx * @param narc Which NARC to open for the script * @param file Which file in the NARC to load */ @@ -9741,8 +9738,8 @@ static void BattleScript_Jump(BattleContext *battleCtx, int narc, int file) /** * @brief Load a script into the script buffer, returning to the current * execution once finished with the newly-loaded script. - * - * @param battleCtx + * + * @param battleCtx * @param narc Which NARC to open for the script * @param file Which file in the NARC to load */ @@ -9753,13 +9750,13 @@ static void BattleScript_Call(BattleContext *battleCtx, int narc, int file) /** * @brief Get a pointer to the requested variable. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param var The requested variable. See enum BattleScriptVars. * @return Memory address of the requested variable. */ -static void* BattleScript_VarAddress(BattleSystem *battleSys, BattleContext *battleCtx, int var) +static void *BattleScript_VarAddress(BattleSystem *battleSys, BattleContext *battleCtx, int var) { switch (var) { case BTLVAR_BATTLE_TYPE: @@ -9914,9 +9911,9 @@ typedef struct PokemonStats { /** * @brief System task-state machine for controlling the UX flow for a battler * gaining Exp. Points. - * - * @param task - * @param inData + * + * @param task + * @param inData */ static void BattleScript_GetExpTask(SysTask *task, void *inData) { @@ -9952,8 +9949,8 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) if (slot == BattleSystem_PartyCount(data->battleSys, expBattler)) { data->seqNum = SEQ_GET_EXP_DONE; } else if ((battleType & BATTLE_TYPE_DOUBLES) - && (battleType & BATTLE_TYPE_AI) == FALSE - && data->battleCtx->selectedPartySlot[2] == slot) { + && (battleType & BATTLE_TYPE_AI) == FALSE + && data->battleCtx->selectedPartySlot[2] == slot) { expBattler = 2; } @@ -9964,10 +9961,11 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) // Declare victory if all wild mons have been defeated if ((battleType & BATTLE_TYPE_TRAINER) == FALSE - && data->battleCtx->battleMons[BATTLER_ENEMY_SLOT_1].curHP - + data->battleCtx->battleMons[BATTLER_ENEMY_SLOT_2].curHP == 0 - && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) - && data->battleCtx->expJinglePlayed == FALSE) { + && data->battleCtx->battleMons[BATTLER_ENEMY_SLOT_1].curHP + + data->battleCtx->battleMons[BATTLER_ENEMY_SLOT_2].curHP + == 0 + && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) + && data->battleCtx->expJinglePlayed == FALSE) { Sound_PlayBGM(SEQ_VICTORY_WILD_POKEMON); data->battleCtx->expJinglePlayed = TRUE; BattleSystem_SetRedHPSoundFlag(data->battleSys, 2); // turn off @@ -10013,9 +10011,9 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) Pokemon_SetValue(mon, MON_DATA_EXP, &newExp); BattleScript_CalcEffortValues(BattleSystem_Party(data->battleSys, expBattler), - slot, - data->battleCtx->battleMons[data->battleCtx->faintedMon].species, - data->battleCtx->battleMons[data->battleCtx->faintedMon].formNum); + slot, + data->battleCtx->battleMons[data->battleCtx->faintedMon].species, + data->battleCtx->battleMons[data->battleCtx->faintedMon].formNum); } if (totalExp) { @@ -10154,7 +10152,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) } case SEQ_GET_EXP_LEVEL_UP_SUMMARY_PRINT_DIFF: { - int statTags[STAT_MAX] = {8, 1, 2, 4, 5, 3}; + int statTags[STAT_MAX] = { 8, 1, 2, 4, 5, 3 }; int statParams[STAT_MAX] = { MON_DATA_MAX_HP, MON_DATA_ATK, @@ -10186,7 +10184,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) } case SEQ_GET_EXP_LEVEL_UP_SUMMARY_PRINT_TRUE: { - int statTags[STAT_MAX] = {8, 1, 2, 4, 5, 3}; // unused, but must be kept to match + int statTags[STAT_MAX] = { 8, 1, 2, 4, 5, 3 }; // unused, but must be kept to match int statParams[STAT_MAX] = { MON_DATA_MAX_HP, MON_DATA_ATK, @@ -10211,7 +10209,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) data->seqNum = SEQ_GET_EXP_LEVEL_UP_SUMMARY_PRINT_TRUE_WAIT; break; } - + case SEQ_GET_EXP_LEVEL_UP_SUMMARY_PRINT_DIFF_WAIT: case SEQ_GET_EXP_LEVEL_UP_SUMMARY_PRINT_TRUE_WAIT: if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y)) || TouchScreen_Tapped()) { @@ -10220,7 +10218,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) } break; - case SEQ_GET_EXP_LEVEL_UP_CLEAR:{ + case SEQ_GET_EXP_LEVEL_UP_CLEAR: { Window *window = BattleSystem_Window(data->battleSys, 1); Window_Clear(window, 0); @@ -10383,7 +10381,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) data->tmpData[GET_EXP_MSG_INDEX] = BattleMessage_Print(data->battleSys, msgLoader, &msg, BattleSystem_TextSpeed(data->battleSys)); data->seqNum++; break; - + case SEQ_GET_EXP_FORGOT_HOW_TO_USE: msg.id = 1190; // "{0} forgot how to use {1}." msg.tags = TAG_NICKNAME_MOVE; @@ -10399,14 +10397,14 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) data->tmpData[GET_EXP_MSG_INDEX] = BattleMessage_Print(data->battleSys, msgLoader, &msg, BattleSystem_TextSpeed(data->battleSys)); data->seqNum++; break; - + case SEQ_GET_EXP_LEARNED_MOVE: msg.id = 1192; // "{0} learned {1}!" msg.tags = TAG_NICKNAME_MOVE; msg.params[0] = expBattler | (slot << 8); msg.params[1] = data->tmpData[4]; data->tmpData[GET_EXP_MSG_INDEX] = BattleMessage_Print(data->battleSys, msgLoader, &msg, BattleSystem_TextSpeed(data->battleSys)); - + i = 0; Pokemon_SetValue(mon, MON_DATA_MOVE1_PP_UPS + data->tmpData[GET_EXP_MOVE_SLOT], &i); Pokemon_SetMoveSlot(mon, data->tmpData[GET_EXP_MOVE], data->tmpData[GET_EXP_MOVE_SLOT]); @@ -10446,7 +10444,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData) * @brief Compute the effort-value payout for a given party member, considering * that they participating in the defeat of an opponent with the given species * and form. - * + * * @param party The Party struct * @param slot Slot in the party deserving EV payout * @param species The species of the defeated foe @@ -10552,15 +10550,15 @@ static void BattleScript_CalcEffortValues(Party *party, int slot, int species, i PokemonPersonalData_Free(personal); } -static void BattleScript_CatchMonTask (SysTask * param0, void * param1) +static void BattleScript_CatchMonTask(SysTask *param0, void *param1) { int v0; int v1; - BattleScriptTaskData * v2 = param1; - Pokemon * v3; - PaletteData * v4; - UnkStruct_02007768 * v5; - MessageLoader * v6; + BattleScriptTaskData *v2 = param1; + Pokemon *v3; + PaletteData *v4; + UnkStruct_02007768 *v5; + MessageLoader *v6; v6 = BattleSystem_MessageLoader(v2->battleSys); v4 = BattleSystem_PaletteSys(v2->battleSys); @@ -10606,7 +10604,7 @@ static void BattleScript_CatchMonTask (SysTask * param0, void * param1) } } else { { - BattlerData * v8; + BattlerData *v8; v8 = BattleSystem_BattlerData(v2->battleSys, 0); @@ -10804,9 +10802,8 @@ static void BattleScript_CatchMonTask (SysTask * param0, void * param1) } } break; - case 14: - { - Sprite * v13; + case 14: { + Sprite *v13; v13 = ov21_021E8E00(v2->tmpPtr[0]); sub_02008274(v13, 0, 4); @@ -10815,8 +10812,7 @@ static void BattleScript_CatchMonTask (SysTask * param0, void * param1) sub_02007DEC(v13, 0, 128); v2->seqNum = 15; } - } - break; + } break; case 15: ov21_021E8DD0(v2->tmpPtr[0]); sub_0201EEB8(v2->tmpPtr[1]); @@ -10855,15 +10851,13 @@ static void BattleScript_CatchMonTask (SysTask * param0, void * param1) } } break; - case 18: - { + case 18: { int v15; v15 = v1 | (v2->battleCtx->selectedPartySlot[v1]); BattleIO_ShowYesNoScreen(v2->battleSys, v2->battleCtx, 0, 868, 5, NULL, v15); v2->seqNum++; - } - break; + } break; case 19: if (BattleContext_IOBufferVal(v2->battleCtx, 0)) { if (BattleContext_IOBufferVal(v2->battleCtx, 0) == 0xff) { @@ -10879,7 +10873,7 @@ static void BattleScript_CatchMonTask (SysTask * param0, void * param1) case 20: if (sub_0200384C(v4) == 0) { { - UnkStruct_0208737C * v16; + UnkStruct_0208737C *v16; sub_0200F344(0, 0x0); sub_0200F344(1, 0x0); @@ -10904,7 +10898,7 @@ static void BattleScript_CatchMonTask (SysTask * param0, void * param1) { int v17; - BattlerData * v18; + BattlerData *v18; for (v17 = 0; v17 < BattleSystem_MaxBattlers(v2->battleSys); v17++) { v18 = BattleSystem_BattlerData(v2->battleSys, v17); @@ -10924,7 +10918,7 @@ static void BattleScript_CatchMonTask (SysTask * param0, void * param1) case 21: if (OverlayManager_Exec(v2->tmpPtr[0])) { { - UnkStruct_0208737C * v19; + UnkStruct_0208737C *v19; int v20; v19 = v2->tmpPtr[1]; @@ -10948,7 +10942,7 @@ static void BattleScript_CatchMonTask (SysTask * param0, void * param1) if (sub_0200384C(v4) == 0) { { BattleMessage v21; - Party * v22; + Party *v22; int v23; v22 = BattleSystem_Party(v2->battleSys, 0); @@ -10970,7 +10964,7 @@ static void BattleScript_CatchMonTask (SysTask * param0, void * param1) v2->seqNum = 32; } else { { - PCBoxes * v24; + PCBoxes *v24; u32 v25; u32 v26; int v27; @@ -11124,7 +11118,7 @@ static void BattleScript_CatchMonTask (SysTask * param0, void * param1) static const u8 sBasicBallMod[] = { 20, // ITEM_ULTRA_BALL - 15, // ITEM_GREAT_BALL + 15, // ITEM_GREAT_BALL 10, // ITEM_POKE_BALL 15, // ITEM_SAFARI_BALL }; @@ -11148,13 +11142,13 @@ static const struct Fraction sSafariCatchRate[] = { /** * @brief Computes the number of times that a Poke Ball will "shake" when * attempting to capture a wild Pokemon. - * + * * This is, effectively, the capture formula. It performs all computations which * factor into whether a given Pokemon will be caught or not, including the wild * Pokemon's species, the type of ball being used, and Safari Zone mechanics. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return The number of times that a Poke Ball will shake during a capture * attempt. 4 shakes is defined as a successful capture. */ @@ -11180,7 +11174,7 @@ static int BattleScript_CalcCatchShakes(BattleSystem *battleSys, BattleContext * switch (battleCtx->msgItemTemp) { case ITEM_NET_BALL: if (type1 == TYPE_WATER || type2 == TYPE_WATER - || type1 == TYPE_BUG || type2 == TYPE_BUG) { + || type1 == TYPE_BUG || type2 == TYPE_BUG) { ballMod = 30; } break; @@ -11216,8 +11210,8 @@ static int BattleScript_CalcCatchShakes(BattleSystem *battleSys, BattleContext * case ITEM_DUSK_BALL: if (BattleSystem_Time(battleSys) == TIME_NIGHT - || BattleSystem_Time(battleSys) == TIME_MIDNIGHT - || BattleSystem_Terrain(battleSys) == TERRAIN_CAVE) { + || BattleSystem_Time(battleSys) == TIME_MIDNIGHT + || BattleSystem_Terrain(battleSys) == TERRAIN_CAVE) { ballMod = 35; } break; @@ -11233,8 +11227,8 @@ static int BattleScript_CalcCatchShakes(BattleSystem *battleSys, BattleContext * } u32 catchRate = (speciesMod * ballMod / 10) - * (battleCtx->battleMons[battleCtx->defender].maxHP * 3 - battleCtx->battleMons[battleCtx->defender].curHP * 2) - / (battleCtx->battleMons[battleCtx->defender].maxHP * 3); + * (battleCtx->battleMons[battleCtx->defender].maxHP * 3 - battleCtx->battleMons[battleCtx->defender].curHP * 2) + / (battleCtx->battleMons[battleCtx->defender].maxHP * 3); if (battleCtx->battleMons[battleCtx->defender].status & (MON_CONDITION_SLEEP | MON_CONDITION_FREEZE)) { catchRate *= 2; @@ -11270,18 +11264,17 @@ static int BattleScript_CalcCatchShakes(BattleSystem *battleSys, BattleContext * } } - return shakes; } /** * @brief Get a true battler ID from the requested battler value. - * + * * Input values should fall in the range of * BTLSCR_ATTACKER >= battlerIn >= BTLSCR_SWITCHED_MON_AFTER. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battlerIn The requested battler * @return ID of the requested battler */ @@ -11369,7 +11362,7 @@ static int BattleScript_Battler(BattleSystem *battleSys, BattleContext *battleCt for (battlerOut = 0; battlerOut < maxBattlers; battlerOut++) { battlerData = BattleSystem_BattlerData(battleSys, battlerOut); if (battlerData->battlerType == BATTLER_TYPE_PLAYER_SIDE_SLOT_1 - || battlerData->battlerType == BATTLER_TYPE_SOLO_PLAYER) { + || battlerData->battlerType == BATTLER_TYPE_SOLO_PLAYER) { break; } } @@ -11398,14 +11391,13 @@ static int BattleScript_Battler(BattleSystem *battleSys, BattleContext *battleCt case BTLSCR_MSG_DEFENDER: battlerOut = battleCtx->msgDefender; break; - - case BTLSCR_ATTACKER_PARTNER: - { + + case BTLSCR_ATTACKER_PARTNER: { // must re-declare to match int battlers = BattleSystem_MaxBattlers(battleSys); for (battlerOut = 0; battlerOut < battlers; battlerOut++) { if (battlerOut != battleCtx->attacker - && Battler_Side(battleSys, battlerOut) == Battler_Side(battleSys, battleCtx->attacker)) { + && Battler_Side(battleSys, battlerOut) == Battler_Side(battleSys, battleCtx->attacker)) { break; } } @@ -11417,13 +11409,12 @@ static int BattleScript_Battler(BattleSystem *battleSys, BattleContext *battleCt break; } - case BTLSCR_DEFENDER_PARTNER: - { + case BTLSCR_DEFENDER_PARTNER: { // must re-declare to match int battlers = BattleSystem_MaxBattlers(battleSys); for (battlerOut = 0; battlerOut < battlers; battlerOut++) { if (battlerOut != battleCtx->defender - && Battler_Side(battleSys, battlerOut) == Battler_Side(battleSys, battleCtx->defender)) { + && Battler_Side(battleSys, battlerOut) == Battler_Side(battleSys, battleCtx->defender)) { break; } } @@ -11470,13 +11461,13 @@ static int BattleScript_Battler(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Populate a BattleMessageParams struct from input values from the * script buffer. - * + * * As a side effect, the script cursor head will be iterated forward by 2 + N, * where N is the number of data values as defined by the tag value read from * the script buffer. - * - * @param battleCtx - * @param[out] msgParams + * + * @param battleCtx + * @param[out] msgParams */ static void BattleMessageParams_Make(BattleContext *battleCtx, BattleMessageParams *msgParams) { @@ -11577,11 +11568,11 @@ static void BattleMessageParams_Make(BattleContext *battleCtx, BattleMessagePara /** * @brief Populate a BattleMessage struct from the input BattleMessageParams struct. - * - * @param battleSys - * @param battleCtx - * @param msgParams - * @param[out] msg + * + * @param battleSys + * @param battleCtx + * @param msgParams + * @param[out] msg */ static void BattleMessage_Make(BattleSystem *battleSys, BattleContext *battleCtx, BattleMessageParams *msgParams, BattleMessage *msg) { @@ -11784,7 +11775,7 @@ static void BattleMessage_Make(BattleSystem *battleSys, BattleContext *battleCtx msg->params[1] = BattleMessage_AbilityTag(battleSys, battleCtx, msgParams->params[1]); msg->params[2] = BattleMessage_StatTag(battleCtx, msgParams->params[2]); break; - + case TAG_NICKNAME_ABILITY_TYPE: msg->params[0] = BattleMessage_NameTag(battleSys, battleCtx, msgParams->params[0]); msg->params[1] = BattleMessage_AbilityTag(battleSys, battleCtx, msgParams->params[1]); @@ -11930,9 +11921,9 @@ static void BattleMessage_Make(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Build a name tag mask. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battlerIn The battler whose name will be applied to the tag mask * @return The constructed tag mask */ @@ -11952,8 +11943,8 @@ static int BattleMessage_NameTag(BattleSystem *battleSys, BattleContext *battleC /** * @brief Tag the move for a battler. - * - * @param battleCtx + * + * @param battleCtx * @param battlerIn The battler whose move will be applied to the tag * @return The tagged move */ @@ -11978,8 +11969,8 @@ static int BattleMessage_MoveTag(BattleContext *battleCtx, int battlerIn) /** * @brief Tag the held item for a battler. - * - * @param battleCtx + * + * @param battleCtx * @param battlerIn The battler whose held item will be applied to the tag * @return The tagged held item */ @@ -12015,8 +12006,8 @@ static int BattleMessage_ItemTag(BattleContext *battleCtx, int battlerIn) /** * @brief Tag a number. - * - * @param battleCtx + * + * @param battleCtx * @param battlerIn Battler input; only BTLSCR_MSG_TEMP will produce a non-zero result * @return The tagged number */ @@ -12032,8 +12023,8 @@ static int BattleMessage_NumTag(BattleContext *battleCtx, int battlerIn) /** * @brief Tag a type. - * - * @param battleCtx + * + * @param battleCtx * @param battlerIn Battler input; only BTLSCR_MSG_TEMP will produce a non-Normal result * @return The tagged type */ @@ -12049,9 +12040,9 @@ static int BattleMessage_TypeTag(BattleContext *battleCtx, int battlerIn) /** * @brief Tag the ability for a battler. - * + * * @param battleSys - * @param battleCtx + * @param battleCtx * @param battlerIn The battler whose ability will be applied to the tag * @return The tagged ability */ @@ -12071,8 +12062,8 @@ static int BattleMessage_AbilityTag(BattleSystem *battleSys, BattleContext *batt /** * @brief Tag a stat-name value. - * - * @param battleCtx + * + * @param battleCtx * @param battlerIn Battler input; only BTLSCR_MSG_TEMP will produce a non-HP result * @return The tagged stat-name */ @@ -12088,8 +12079,8 @@ static int BattleMessage_StatTag(BattleContext *battleCtx, int battlerIn) /** * @brief Tag a status-name value. - * - * @param battleCtx + * + * @param battleCtx * @param battlerIn Battler input; only BTLSCR_MSG_TEMP will produce a non-empty result * @return The tagged status-name */ @@ -12105,12 +12096,12 @@ static int BattleMessage_StatusTag(BattleContext *battleCtx, int battlerIn) /** * @brief Build a name tag mask. - * + * * This is, strangely, identical to BattleMessage_NameTag, save for not supporting * switched mons. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battlerIn The battler whose name will be applied to the tag mask * @return The constructed tag mask */ @@ -12125,8 +12116,8 @@ static int BattleMessage_PokeTag(BattleSystem *battleSys, BattleContext *battleC /** * @brief Tag a poffin-name value. - * - * @param battleCtx + * + * @param battleCtx * @param battlerIn Battler input; only BTLSCR_MSG_TEMP will produce a non-empty result * @return The tagged poffin-name */ @@ -12142,8 +12133,8 @@ static int BattleMessage_PoffinTag(BattleContext *battleCtx, int battlerIn) /** * @brief Tag a flavor-name value. - * - * @param battleCtx + * + * @param battleCtx * @param battlerIn Battler input; only BTLSCR_MSG_TEMP will produce a non-empty result * @return The tagged flavor-name */ @@ -12159,9 +12150,9 @@ static int BattleMessage_FlavorTag(BattleContext *battleCtx, int battlerIn) /** * @brief Tag a trainer class value. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battlerIn * @return The tagged trainer class value. */ @@ -12172,9 +12163,9 @@ static int BattleMessage_TrainerClassTag(BattleSystem *battleSys, BattleContext /** * @brief Tag a trainer name. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battlerIn * @return The tagged trainer name. */ @@ -12191,7 +12182,7 @@ static const SpriteTemplate Unk_ov16_0226E6C4 = { 0xC8, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x4E35, 0x4E30, 0x4E2D, 0x4E2D, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x4E35, 0x4E30, 0x4E2D, 0x4E2D, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -12204,21 +12195,21 @@ static const SpriteTemplate Unk_ov16_0226E6F8 = { 0x64, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x4E36, 0x4E31, 0x4E2E, 0x4E2E, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x4E36, 0x4E31, 0x4E2E, 0x4E2E, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; -static void BattleScript_LoadPartyLevelUpIcon (BattleSystem * param0, BattleScriptTaskData * param1, Pokemon * param2) +static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScriptTaskData *param1, Pokemon *param2) { SpriteTemplate v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; - PaletteData * v3; - MessageLoader * v4; - StringTemplate * v5; - Strbuf* v6, * v7; - BGL * v8; + SpriteRenderer *v1; + SpriteGfxHandler *v2; + PaletteData *v3; + MessageLoader *v4; + StringTemplate *v5; + Strbuf *v6, *v7; + BGL *v8; Window v9; int v10; SpriteManagerAllocation v11; @@ -12298,9 +12289,9 @@ static void BattleScript_LoadPartyLevelUpIcon (BattleSystem * param0, BattleScri BGL_DeleteWindow(&v9); } -static void BattleScript_FreePartyLevelUpIcon (BattleSystem * param0, BattleScriptTaskData * param1) +static void BattleScript_FreePartyLevelUpIcon(BattleSystem *param0, BattleScriptTaskData *param1) { - SpriteGfxHandler * v0; + SpriteGfxHandler *v0; v0 = ov16_0223E018(param0); @@ -12321,13 +12312,13 @@ static void BattleScript_FreePartyLevelUpIcon (BattleSystem * param0, BattleScri /** * @brief Update friendship value for a fainting battler. - * + * * The highest-level battler is chosen to determine how much friendship to * deduct. - * - * @param battleSys - * @param battleCtx - * @param faintingBattler + * + * @param battleSys + * @param battleCtx + * @param faintingBattler */ static void BattleScript_UpdateFriendship(BattleSystem *battleSys, BattleContext *battleCtx, int faintingBattler) { @@ -12362,10 +12353,10 @@ static void BattleScript_UpdateFriendship(BattleSystem *battleSys, BattleContext /** * @brief Notify the AI context of a battler's ability after it is announced * in any fashion. - * - * @param battleCtx - * @param battler - * @param ability + * + * @param battleCtx + * @param battler + * @param ability */ static void BattleAI_SetAbility(BattleContext *battleCtx, u8 battler, u8 ability) { @@ -12375,13 +12366,12 @@ static void BattleAI_SetAbility(BattleContext *battleCtx, u8 battler, u8 ability /** * @brief Notify the AI context of a battler's held item after it is announced * in any fashion. - * - * @param battleCtx - * @param battler - * @param item + * + * @param battleCtx + * @param battler + * @param item */ static void BattleAI_SetHeldItem(BattleContext *battleCtx, u8 battler, u16 item) { battleCtx->aiContext.battlerHeldItems[battler] = item; } - diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index 13ca3e54bf..49097bb603 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -1,65 +1,60 @@ -#include -#include +#include "battle/healthbar.h" +#include #include - -#include "assert.h" +#include #include "constants/font.h" #include "constants/heap.h" -#include "gmm/message_bank_battle_strings.h" - #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "pokemon.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0205AA50.h" + +#include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_022674C4.h" -#include "struct_defs/sprite_template.h" +#include "gmm/message_bank_battle_strings.h" -#include "unk_02002F38.h" -#include "narc.h" +#include "assert.h" +#include "heap.h" #include "message.h" +#include "narc.h" +#include "pokemon.h" +#include "strbuf.h" #include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02002F38.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" -#include "sys_task.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "pokemon.h" #include "unk_0208C098.h" -#include "battle/ov16_0223DF00.h" -#include "battle/healthbar.h" -#define HEALTHBAR_SCROLL_SPEED 24 +#define HEALTHBAR_SCROLL_SPEED 24 #define HEALTHBAR_SCROLL_OUT_OFFSET 160 -#define HEALTHBAR_X_OFFSET_SOLO_PLAYER 192 -#define HEALTHBAR_Y_OFFSET_SOLO_PLAYER 116 -#define HEALTHBAR_X_OFFSET_SOLO_ENEMY 58 -#define HEALTHBAR_Y_OFFSET_SOLO_ENEMY 36 -#define HEALTHBAR_X_OFFSET_PLAYER_SLOT_1 HEALTHBAR_X_OFFSET_SOLO_PLAYER -#define HEALTHBAR_Y_OFFSET_PLAYER_SLOT_1 HEALTHBAR_Y_OFFSET_SOLO_PLAYER - 13 -#define HEALTHBAR_X_OFFSET_PLAYER_SLOT_2 HEALTHBAR_X_OFFSET_SOLO_PLAYER + 6 -#define HEALTHBAR_Y_OFFSET_PLAYER_SLOT_2 HEALTHBAR_Y_OFFSET_SOLO_PLAYER + 16 -#define HEALTHBAR_X_OFFSET_ENEMY_SLOT_1 HEALTHBAR_X_OFFSET_SOLO_ENEMY + 6 -#define HEALTHBAR_Y_OFFSET_ENEMY_SLOT_1 HEALTHBAR_Y_OFFSET_SOLO_ENEMY - 20 -#define HEALTHBAR_X_OFFSET_ENEMY_SLOT_2 HEALTHBAR_X_OFFSET_SOLO_ENEMY -#define HEALTHBAR_Y_OFFSET_ENEMY_SLOT_2 HEALTHBAR_Y_OFFSET_SOLO_ENEMY + 9 - -#define HEALTHBAR_WINDOW_BLOCK_SIZE 32 +#define HEALTHBAR_X_OFFSET_SOLO_PLAYER 192 +#define HEALTHBAR_Y_OFFSET_SOLO_PLAYER 116 +#define HEALTHBAR_X_OFFSET_SOLO_ENEMY 58 +#define HEALTHBAR_Y_OFFSET_SOLO_ENEMY 36 +#define HEALTHBAR_X_OFFSET_PLAYER_SLOT_1 HEALTHBAR_X_OFFSET_SOLO_PLAYER +#define HEALTHBAR_Y_OFFSET_PLAYER_SLOT_1 HEALTHBAR_Y_OFFSET_SOLO_PLAYER - 13 +#define HEALTHBAR_X_OFFSET_PLAYER_SLOT_2 HEALTHBAR_X_OFFSET_SOLO_PLAYER + 6 +#define HEALTHBAR_Y_OFFSET_PLAYER_SLOT_2 HEALTHBAR_Y_OFFSET_SOLO_PLAYER + 16 +#define HEALTHBAR_X_OFFSET_ENEMY_SLOT_1 HEALTHBAR_X_OFFSET_SOLO_ENEMY + 6 +#define HEALTHBAR_Y_OFFSET_ENEMY_SLOT_1 HEALTHBAR_Y_OFFSET_SOLO_ENEMY - 20 +#define HEALTHBAR_X_OFFSET_ENEMY_SLOT_2 HEALTHBAR_X_OFFSET_SOLO_ENEMY +#define HEALTHBAR_Y_OFFSET_ENEMY_SLOT_2 HEALTHBAR_Y_OFFSET_SOLO_ENEMY + 9 + +#define HEALTHBAR_WINDOW_BLOCK_SIZE 32 #define HEALTHBAR_NAME_BLOCK_COUNT_X 8 #define HEALTHBAR_NAME_BLOCK_COUNT_Y 2 @@ -68,9 +63,8 @@ #define HEALTHBAR_NAME_BACKGROUND_COLOR 0xF #define HEALTHBAR_NAME_FONT_COLOR MAKE_FONT_COLOR(14, 2, HEALTHBAR_NAME_BACKGROUND_COLOR) -#define VRAM_TRANSFER_DST(vram, transferTable, index_0, index_1, imgProxy) (\ - (void *)((u32)vram + transferTable[index_0][index_1].pos + imgProxy->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN])\ -) +#define VRAM_TRANSFER_DST(vram, transferTable, index_0, index_1, imgProxy) ( \ + (void *)((u32)vram + transferTable[index_0][index_1].pos + imgProxy->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN])) #define S32_MIN -2147483648 @@ -80,266 +74,266 @@ typedef struct VRAMTransfer { } VRAMTransfer; typedef struct { - Healthbar * unk_00; - u8 * unk_04; + Healthbar *unk_00; + u8 *unk_04; u8 unk_08; u8 unk_09; s8 unk_0A; } UnkStruct_ov16_0226834C; static s32 Healthbar_DrawGauge(Healthbar *healthbar, enum HealthbarGaugeType gaugeType); -static s32 UpdateGauge(s32 max, s32 cur, s32 diff, s32 * temp, u8 size, u16 fillOffset); -static u8 ov16_02268194(s32 param0, s32 param1, s32 param2, s32 * param3, u8 * param4, u8 param5); +static s32 UpdateGauge(s32 max, s32 cur, s32 diff, s32 *temp, u8 size, u16 fillOffset); +static u8 ov16_02268194(s32 param0, s32 param1, s32 param2, s32 *param3, u8 *param4, u8 param5); static u32 CalcGaugeFill(s32 param0, s32 param1, s32 param2, u8 param3); -static const u8 * ov16_02268250(int param0); -static void DrawGauge(Healthbar * param0, u8 param1); -static void Healthbar_DrawBattlerName(Healthbar * param0); -static void Healthbar_DrawLevelText(Healthbar * param0); -static void Healthbar_DrawLevelNumber(Healthbar * param0); -static void Healthbar_DrawCurrentHP(Healthbar * param0, u32 param1); -static void Healthbar_DrawMaxHP(Healthbar * param0); -static void Healthbar_DrawCaughtIcon(Healthbar * param0); -static void Healthbar_DrawStatusIcon(Healthbar * param0, int param1); -static void Healthbar_DrawBallCount(Healthbar * param0, u32 param1); -static void Healthbar_DrawBallsLeftMessage(Healthbar * param0, u32 param1); -static void ov16_02266FE4(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, PaletteData * param3, int param4); -static void ov16_02267244(Healthbar * param0); -static void ov16_0226728C(Healthbar * param0); -static const SpriteTemplate* Healthbar_SpriteTemplate(u8 type); -static const SpriteTemplate * ov16_02268314(u8 param0); +static const u8 *ov16_02268250(int param0); +static void DrawGauge(Healthbar *param0, u8 param1); +static void Healthbar_DrawBattlerName(Healthbar *param0); +static void Healthbar_DrawLevelText(Healthbar *param0); +static void Healthbar_DrawLevelNumber(Healthbar *param0); +static void Healthbar_DrawCurrentHP(Healthbar *param0, u32 param1); +static void Healthbar_DrawMaxHP(Healthbar *param0); +static void Healthbar_DrawCaughtIcon(Healthbar *param0); +static void Healthbar_DrawStatusIcon(Healthbar *param0, int param1); +static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1); +static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1); +static void ov16_02266FE4(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, PaletteData *param3, int param4); +static void ov16_02267244(Healthbar *param0); +static void ov16_0226728C(Healthbar *param0); +static const SpriteTemplate *Healthbar_SpriteTemplate(u8 type); +static const SpriteTemplate *ov16_02268314(u8 param0); static void ScrollHealthbarTask(SysTask *task, void *data); -static void ov16_02268380(SysTask * param0, void * param1); -void ov16_02268470(Healthbar * param0); -void ov16_02268498(Healthbar * param0); -static void ov16_022684BC(SysTask * param0, void * param1); -static void Healthbar_EnableArrow(Healthbar * param0, int param1); +static void ov16_02268380(SysTask *param0, void *param1); +void ov16_02268470(Healthbar *param0); +void ov16_02268498(Healthbar *param0); +static void ov16_022684BC(SysTask *param0, void *param1); +static void Healthbar_EnableArrow(Healthbar *param0, int param1); __attribute__((aligned(4))) static const s8 sArrowOffsetX[] = { - [HEALTHBAR_TYPE_PLAYER_SOLO] = 72, - [HEALTHBAR_TYPE_ENEMY_SOLO] = 0, + [HEALTHBAR_TYPE_PLAYER_SOLO] = 72, + [HEALTHBAR_TYPE_ENEMY_SOLO] = 0, [HEALTHBAR_TYPE_PLAYER_SLOT_1] = 72, - [HEALTHBAR_TYPE_ENEMY_SLOT_1] = 0, + [HEALTHBAR_TYPE_ENEMY_SLOT_1] = 0, [HEALTHBAR_TYPE_PLAYER_SLOT_2] = 72, - [HEALTHBAR_TYPE_ENEMY_SLOT_2] = 0, + [HEALTHBAR_TYPE_ENEMY_SLOT_2] = 0, }; static const VRAMTransfer sBattlerNameVRAMTransfer[][4] = { [HEALTHBAR_TYPE_PLAYER_SOLO] = { - {19 * HEALTHBAR_WINDOW_BLOCK_SIZE, 5 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {27 * HEALTHBAR_WINDOW_BLOCK_SIZE, 5 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 3 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 3 * HEALTHBAR_WINDOW_BLOCK_SIZE}, + { 19 * HEALTHBAR_WINDOW_BLOCK_SIZE, 5 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 27 * HEALTHBAR_WINDOW_BLOCK_SIZE, 5 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 3 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 3 * HEALTHBAR_WINDOW_BLOCK_SIZE }, }, [HEALTHBAR_TYPE_ENEMY_SOLO] = { - {17 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {25 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE}, + { 17 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 25 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE }, }, [HEALTHBAR_TYPE_PLAYER_SLOT_1] = { - {18 * HEALTHBAR_WINDOW_BLOCK_SIZE, 6 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {26 * HEALTHBAR_WINDOW_BLOCK_SIZE, 6 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 2 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 2 * HEALTHBAR_WINDOW_BLOCK_SIZE}, + { 18 * HEALTHBAR_WINDOW_BLOCK_SIZE, 6 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 26 * HEALTHBAR_WINDOW_BLOCK_SIZE, 6 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 2 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 2 * HEALTHBAR_WINDOW_BLOCK_SIZE }, }, [HEALTHBAR_TYPE_ENEMY_SLOT_1] = { - {17 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {25 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE}, + { 17 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 25 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE }, }, [HEALTHBAR_TYPE_PLAYER_SLOT_2] = { - {18 * HEALTHBAR_WINDOW_BLOCK_SIZE, 6 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {26 * HEALTHBAR_WINDOW_BLOCK_SIZE, 6 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 2 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 2 * HEALTHBAR_WINDOW_BLOCK_SIZE}, + { 18 * HEALTHBAR_WINDOW_BLOCK_SIZE, 6 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 26 * HEALTHBAR_WINDOW_BLOCK_SIZE, 6 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 2 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 2 * HEALTHBAR_WINDOW_BLOCK_SIZE }, }, [HEALTHBAR_TYPE_ENEMY_SLOT_2] = { - {17 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {25 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - {88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE}, - } + { 17 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 25 * HEALTHBAR_WINDOW_BLOCK_SIZE, 7 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 80 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + { 88 * HEALTHBAR_WINDOW_BLOCK_SIZE, 1 * HEALTHBAR_WINDOW_BLOCK_SIZE }, + }, }; static const VRAMTransfer Unk_ov16_0226F47C[][2] = { { - {0xA60, 0x40}, - {0xB60, 0x40} + { 0xA60, 0x40 }, + { 0xB60, 0x40 }, }, { - {0xA20, 0x40}, - {0xB20, 0x40} + { 0xA20, 0x40 }, + { 0xB20, 0x40 }, }, { - {0xA40, 0x40}, - {0xB40, 0x40} + { 0xA40, 0x40 }, + { 0xB40, 0x40 }, }, { - {0xA20, 0x40}, - {0xB20, 0x40} + { 0xA20, 0x40 }, + { 0xB20, 0x40 }, }, { - {0xA40, 0x40}, - {0xB40, 0x40} + { 0xA40, 0x40 }, + { 0xB40, 0x40 }, }, { - {0xA20, 0x40}, - {0xB20, 0x40} - } + { 0xA20, 0x40 }, + { 0xB20, 0x40 }, + }, }; static const VRAMTransfer Unk_ov16_0226F3EC[][2] = { { - {0xAA0, 0x60}, - {0xBA0, 0x60} + { 0xAA0, 0x60 }, + { 0xBA0, 0x60 }, }, { - {0xA60, 0x60}, - {0xB60, 0x60} + { 0xA60, 0x60 }, + { 0xB60, 0x60 }, }, { - {0xA80, 0x60}, - {0xB80, 0x60} + { 0xA80, 0x60 }, + { 0xB80, 0x60 }, }, { - {0xA60, 0x60}, - {0xB60, 0x60} + { 0xA60, 0x60 }, + { 0xB60, 0x60 }, }, { - {0xA80, 0x60}, - {0xB80, 0x60} + { 0xA80, 0x60 }, + { 0xB80, 0x60 }, }, { - {0xA60, 0x60}, - {0xB60, 0x60} - } + { 0xA60, 0x60 }, + { 0xB60, 0x60 }, + }, }; static const VRAMTransfer Unk_ov16_0226F41C[][2] = { { - {0x0, 0x0}, - {0xD00, 0x60} + { 0x0, 0x0 }, + { 0xD00, 0x60 }, }, { - {0x620, 0x60}, - {0x0, 0x0} + { 0x620, 0x60 }, + { 0x0, 0x0 }, }, { - {0x0, 0x0}, - {0xC00, 0x60} + { 0x0, 0x0 }, + { 0xC00, 0x60 }, }, { - {0x620, 0x60}, - {0x0, 0x0} + { 0x620, 0x60 }, + { 0x0, 0x0 }, }, { - {0x0, 0x0}, - {0xC00, 0x60} + { 0x0, 0x0 }, + { 0xC00, 0x60 }, }, { - {0x620, 0x60}, - {0x0, 0x0} - } + { 0x620, 0x60 }, + { 0x0, 0x0 }, + }, }; static const VRAMTransfer Unk_ov16_0226F3BC[] = { - {0xD80, 0x60}, - {0x6A0, 0x60}, - {0xC80, 0x60}, - {0x6A0, 0x60}, - {0xC80, 0x60}, - {0x6A0, 0x60} + { 0xD80, 0x60 }, + { 0x6A0, 0x60 }, + { 0xC80, 0x60 }, + { 0x6A0, 0x60 }, + { 0xC80, 0x60 }, + { 0x6A0, 0x60 }, }; static const VRAMTransfer Unk_ov16_0226F44C[][2] = { { - {0x4E0, 0x0}, - {0xC20, 0xC0} + { 0x4E0, 0x0 }, + { 0xC20, 0xC0 }, }, { - {0x4E0, 0x20}, - {0xC00, 0xA0} + { 0x4E0, 0x20 }, + { 0xC00, 0xA0 }, }, { - {0x4E0, 0x0}, - {0xC00, 0xC0} + { 0x4E0, 0x0 }, + { 0xC00, 0xC0 }, }, { - {0x4E0, 0x20}, - {0xC00, 0xA0} + { 0x4E0, 0x20 }, + { 0xC00, 0xA0 }, }, { - {0x4E0, 0x0}, - {0xC00, 0xC0} + { 0x4E0, 0x0 }, + { 0xC00, 0xC0 }, }, { - {0x4E0, 0x20}, - {0xC00, 0xA0} - } + { 0x4E0, 0x20 }, + { 0xC00, 0xA0 }, + }, }; static const VRAMTransfer Unk_ov16_0226F38C[] = { - {0x460, 0x20}, - {0x420, 0x20}, - {0x440, 0x20}, - {0x420, 0x20}, - {0x440, 0x20}, - {0x420, 0x20} + { 0x460, 0x20 }, + { 0x420, 0x20 }, + { 0x440, 0x20 }, + { 0x420, 0x20 }, + { 0x440, 0x20 }, + { 0x420, 0x20 }, }; static const VRAMTransfer Unk_ov16_0226F35C[] = { - {0x480, 0x60}, - {0x440, 0x60}, - {0x460, 0x60}, - {0x440, 0x60}, - {0x460, 0x60}, - {0x440, 0x60} + { 0x480, 0x60 }, + { 0x440, 0x60 }, + { 0x460, 0x60 }, + { 0x440, 0x60 }, + { 0x460, 0x60 }, + { 0x440, 0x60 }, }; static const VRAMTransfer Unk_ov16_0226F33C[4] = { - {0x240, 0xC0}, - {0x340, 0xC0}, - {0xA00, 0xE0}, - {0xB00, 0xE0} + { 0x240, 0xC0 }, + { 0x340, 0xC0 }, + { 0xA00, 0xE0 }, + { 0xB00, 0xE0 }, }; static const VRAMTransfer Unk_ov16_0226F34C[4] = { - {0x440, 0xC0}, - {0x540, 0xC0}, - {0xC00, 0xE0}, - {0xD00, 0xE0} + { 0x440, 0xC0 }, + { 0x540, 0xC0 }, + { 0xC00, 0xE0 }, + { 0xD00, 0xE0 }, }; static const VRAMTransfer Unk_ov16_0226F374[] = { - {0x0, 0x0}, - {0x0, 0x0}, - {0x4C0, 0x40}, - {0x0, 0x0}, - {0x4C0, 0x40}, - {0x0, 0x0} + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0x4C0, 0x40 }, + { 0x0, 0x0 }, + { 0x4C0, 0x40 }, + { 0x0, 0x0 }, }; static const VRAMTransfer Unk_ov16_0226F3A4[] = { - {0x0, 0x0}, - {0x0, 0x0}, - {0xCC0, 0x20}, - {0x0, 0x0}, - {0xCC0, 0x20}, - {0x0, 0x0} + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0xCC0, 0x20 }, + { 0x0, 0x0 }, + { 0xCC0, 0x20 }, + { 0x0, 0x0 }, }; static const VRAMTransfer Unk_ov16_0226F3D4[] = { - {0x0, 0x0}, - {0x0, 0x0}, - {0xC60, 0x20}, - {0x0, 0x0}, - {0xC60, 0x20}, - {0x0, 0x0} + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0xC60, 0x20 }, + { 0x0, 0x0 }, + { 0xC60, 0x20 }, + { 0x0, 0x0 }, }; -#define HEALTHBAR_MAIN_PALETTE_NCLR 71 -#define HEALTHBAR_SAFARI_PALETTE_NCLR 81 +#define HEALTHBAR_MAIN_PALETTE_NCLR 71 +#define HEALTHBAR_SAFARI_PALETTE_NCLR 81 #define HEALTHBAR_MAIN_PALETTE_RESID 20006 #define HEALTHBAR_EFFECTS_PALETTE_RESID 20007 @@ -498,7 +492,14 @@ static const SpriteTemplate Unk_ov16_0226F514 = { 17, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB9, 0x4E26, 0xB8, 0xB7, 0xFFFFFFFF, 0xFFFFFFFF}, + { + 0xB9, + 0x4E26, + 0xB8, + 0xB7, + 0xFFFFFFFF, + 0xFFFFFFFF, + }, 0x0, 0x0 }; @@ -540,9 +541,9 @@ void Healthbar_LoadResources(SpriteRenderer *renderer, SpriteGfxHandler *gfxHand } } -static void ov16_02266FE4 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, PaletteData * param3, int param4) +static void ov16_02266FE4(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, PaletteData *param3, int param4) { - const SpriteTemplate * v0; + const SpriteTemplate *v0; v0 = ov16_02268314(param4); @@ -554,10 +555,10 @@ static void ov16_02266FE4 (SpriteRenderer * param0, SpriteGfxHandler * param1, N } } -CellActorData * ov16_02267060 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2) +CellActorData *ov16_02267060(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2) { - const SpriteTemplate * v0; - CellActorData * v1; + const SpriteTemplate *v0; + CellActorData *v1; v0 = Healthbar_SpriteTemplate(param2); v1 = SpriteActor_LoadResources(param0, param1, v0); @@ -686,7 +687,7 @@ void Healthbar_DrawInfo(Healthbar *healthbar, u32 hp, u32 flags) } } -void ov16_02267220 (Healthbar * param0) +void ov16_02267220(Healthbar *param0) { if (param0->unk_50 != NULL) { SysTask_Done(param0->unk_50); @@ -701,7 +702,7 @@ void ov16_02267220 (Healthbar * param0) param0->mainActor = NULL; } -static void ov16_02267244 (Healthbar * param0) +static void ov16_02267244(Healthbar *param0) { if (param0->arrowActor == NULL) { return; @@ -711,11 +712,11 @@ static void ov16_02267244 (Healthbar * param0) param0->arrowActor = NULL; } -void ov16_02267258 (Healthbar * param0) +void ov16_02267258(Healthbar *param0) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - const SpriteTemplate * v2; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + const SpriteTemplate *v2; v2 = Healthbar_SpriteTemplate(param0->type); v0 = ov16_0223E010(param0->battleSys); @@ -726,11 +727,11 @@ void ov16_02267258 (Healthbar * param0) SpriteGfxHandler_UnloadAnimObjById(v1, v2->resources[3]); } -static void ov16_0226728C (Healthbar * param0) +static void ov16_0226728C(Healthbar *param0) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - const SpriteTemplate * v2; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + const SpriteTemplate *v2; v2 = ov16_02268314(param0->type); @@ -746,13 +747,13 @@ static void ov16_0226728C (Healthbar * param0) SpriteGfxHandler_UnloadAnimObjById(v1, v2->resources[3]); } -void ov16_022672C4 (Healthbar * param0) +void ov16_022672C4(Healthbar *param0) { - const SpriteTemplate * v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; - PaletteData * v3; - NARC * v4; + const SpriteTemplate *v0; + SpriteRenderer *v1; + SpriteGfxHandler *v2; + PaletteData *v3; + NARC *v4; v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); v1 = ov16_0223E010(param0->battleSys); @@ -772,7 +773,7 @@ void ov16_022672C4 (Healthbar * param0) NARC_dtor(v4); } -void ov16_02267360 (Healthbar * param0) +void ov16_02267360(Healthbar *param0) { ov16_02267220(param0); ov16_02267258(param0); @@ -780,11 +781,11 @@ void ov16_02267360 (Healthbar * param0) ov16_0226728C(param0); } -void ov16_0226737C (Healthbar * param0) +void ov16_0226737C(Healthbar *param0) { - const u8 * v0; - NNSG2dImageProxy * v1; - void * v2; + const u8 *v0; + NNSG2dImageProxy *v1; + void *v2; switch (param0->type) { case 2: @@ -847,7 +848,7 @@ void Healthbar_CalcHP(Healthbar *healthbar, int damage) } } -s32 ov16_022674F8 (Healthbar * param0) +s32 ov16_022674F8(Healthbar *param0) { s32 v0; @@ -863,7 +864,7 @@ s32 ov16_022674F8 (Healthbar * param0) return v0; } -void Healthbar_CalcExp (Healthbar * param0, int param1) +void Healthbar_CalcExp(Healthbar *param0, int param1) { param0->expTemp = -2147483648; @@ -886,7 +887,7 @@ void Healthbar_CalcExp (Healthbar * param0, int param1) } } -s32 ov16_02267560 (Healthbar * param0) +s32 ov16_02267560(Healthbar *param0) { s32 v0; @@ -899,7 +900,7 @@ s32 ov16_02267560 (Healthbar * param0) return v0; } -void ov16_0226757C (Healthbar * param0) +void ov16_0226757C(Healthbar *param0) { if (param0->arrowActor != NULL) { sub_02021CC8(param0->arrowActor->unk_00, 1); @@ -911,7 +912,7 @@ void ov16_0226757C (Healthbar * param0) } } -void ov16_022675AC (Healthbar * param0) +void ov16_022675AC(Healthbar *param0) { if (param0->arrowActor != NULL) { sub_02021CC8(param0->arrowActor->unk_00, 0); @@ -922,7 +923,7 @@ void ov16_022675AC (Healthbar * param0) ov16_02268498(param0); } -void ov16_022675D8 (Healthbar * param0, int param1) +void ov16_022675D8(Healthbar *param0, int param1) { if (param0->mainActor == NULL) { return; @@ -937,9 +938,9 @@ void ov16_022675D8 (Healthbar * param0, int param1) /** * @brief Enable the extended arrow-graphic used by the healthbar for Pokemon battlers. - * - * @param battleSys - * @param enable + * + * @param battleSys + * @param enable */ static void Healthbar_EnableArrow(Healthbar *battleSys, BOOL enable) { @@ -949,7 +950,7 @@ static void Healthbar_EnableArrow(Healthbar *battleSys, BOOL enable) // Safari battles don't get an arrow. if ((BattleSystem_BattleType(battleSys->battleSys) & (BATTLE_TYPE_SAFARI | BATTLE_TYPE_PAL_PARK)) - && enable == TRUE) { + && enable == TRUE) { return; } @@ -1012,9 +1013,9 @@ void Healthbar_Scroll(Healthbar *healthbar, enum HealthbarScrollDirection direct /** * @brief Scroll the healthbar in or out by the configured scroll-speed value. - * - * @param task - * @param data + * + * @param task + * @param data */ static void ScrollHealthbarTask(SysTask *task, void *data) { @@ -1085,8 +1086,8 @@ static void ScrollHealthbarTask(SysTask *task, void *data) /** * @brief Draw the battler's name onto the healthbar. - * - * @param healthbar + * + * @param healthbar */ static void Healthbar_DrawBattlerName(Healthbar *healthbar) { @@ -1113,11 +1114,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar) StringTemplate_SetNickname(strFormatter, 0, boxMon); StringTemplate_Format(strFormatter, nickname, template); - BGL_AddFramelessWindow(bgl, &window, - HEALTHBAR_NAME_BLOCK_COUNT_X, - HEALTHBAR_NAME_BLOCK_COUNT_Y, - HEALTHBAR_NAME_WINDOW_OFFSET, - HEALTHBAR_NAME_BACKGROUND_COLOR); + BGL_AddFramelessWindow(bgl, &window, HEALTHBAR_NAME_BLOCK_COUNT_X, HEALTHBAR_NAME_BLOCK_COUNT_Y, HEALTHBAR_NAME_WINDOW_OFFSET, HEALTHBAR_NAME_BACKGROUND_COLOR); PrintStringWithColorAndMargins(&window, FONT_SYSTEM, nickname, 0, 0, 0xFF, HEALTHBAR_NAME_FONT_COLOR, 0, 0, NULL); buf = window.unk_0C; @@ -1147,11 +1144,11 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar) Strbuf_Free(template); } -static void Healthbar_DrawLevelText (Healthbar * param0) +static void Healthbar_DrawLevelText(Healthbar *param0) { - NNSG2dImageProxy * v0; - const u8 * v1; - const u8 * v2; + NNSG2dImageProxy *v0; + const u8 *v1; + const u8 *v2; int v3, v4; if (param0->unk_49 == 0) { @@ -1169,7 +1166,7 @@ static void Healthbar_DrawLevelText (Healthbar * param0) v2 = ov16_02268250(v4); { - void * v5; + void *v5; v5 = G2_GetOBJCharPtr(); v0 = SpriteActor_ImageProxy(param0->mainActor->unk_00); @@ -1179,10 +1176,10 @@ static void Healthbar_DrawLevelText (Healthbar * param0) } } -static void Healthbar_DrawLevelNumber (Healthbar * param0) +static void Healthbar_DrawLevelNumber(Healthbar *param0) { - u8 * v0, * v1; - NNSG2dImageProxy * v2; + u8 *v0, *v1; + NNSG2dImageProxy *v2; int v3, v4, v5, v6; v3 = 3 * 0x20; @@ -1193,8 +1190,8 @@ static void Healthbar_DrawLevelNumber (Healthbar * param0) sub_0200C67C(ov16_0223E054(param0->battleSys), param0->unk_48, 3, 0, v0); { - void * v7; - u8 * v8, * v9; + void *v7; + u8 *v8, *v9; v7 = G2_GetOBJCharPtr(); v2 = SpriteActor_ImageProxy(param0->mainActor->unk_00); @@ -1225,10 +1222,10 @@ static void Healthbar_DrawLevelNumber (Healthbar * param0) Heap_FreeToHeap(v1); } -static void Healthbar_DrawCurrentHP (Healthbar * param0, u32 param1) +static void Healthbar_DrawCurrentHP(Healthbar *param0, u32 param1) { - u8 * v0; - NNSG2dImageProxy * v1; + u8 *v0; + NNSG2dImageProxy *v1; v0 = Heap_AllocFromHeap(5, 3 * 0x20); @@ -1236,8 +1233,8 @@ static void Healthbar_DrawCurrentHP (Healthbar * param0, u32 param1) sub_0200C67C(ov16_0223E04C(param0->battleSys), param1, 3, 1, v0); { - void * v2; - u8 * v3; + void *v2; + u8 *v3; v2 = G2_GetOBJCharPtr(); v1 = SpriteActor_ImageProxy(param0->mainActor->unk_00); @@ -1250,10 +1247,10 @@ static void Healthbar_DrawCurrentHP (Healthbar * param0, u32 param1) Heap_FreeToHeap(v0); } -static void Healthbar_DrawMaxHP (Healthbar * param0) +static void Healthbar_DrawMaxHP(Healthbar *param0) { - u8 * v0; - NNSG2dImageProxy * v1; + u8 *v0; + NNSG2dImageProxy *v1; v0 = Heap_AllocFromHeap(5, 3 * 0x20); @@ -1261,8 +1258,8 @@ static void Healthbar_DrawMaxHP (Healthbar * param0) sub_0200C67C(ov16_0223E04C(param0->battleSys), param0->maxHP, 3, 0, v0); { - void * v2; - u8 * v3; + void *v2; + u8 *v3; v2 = G2_GetOBJCharPtr(); v1 = SpriteActor_ImageProxy(param0->mainActor->unk_00); @@ -1274,10 +1271,10 @@ static void Healthbar_DrawMaxHP (Healthbar * param0) Heap_FreeToHeap(v0); } -static void Healthbar_DrawCaughtIcon (Healthbar * param0) +static void Healthbar_DrawCaughtIcon(Healthbar *param0) { - NNSG2dImageProxy * v0; - const u8 * v1; + NNSG2dImageProxy *v0; + const u8 *v1; if (param0->unk_4B == 1) { v1 = ov16_02268250(59); @@ -1286,7 +1283,7 @@ static void Healthbar_DrawCaughtIcon (Healthbar * param0) } { - void * v2; + void *v2; v2 = G2_GetOBJCharPtr(); v0 = SpriteActor_ImageProxy(param0->mainActor->unk_00); @@ -1295,15 +1292,15 @@ static void Healthbar_DrawCaughtIcon (Healthbar * param0) } } -static void Healthbar_DrawStatusIcon (Healthbar * param0, int param1) +static void Healthbar_DrawStatusIcon(Healthbar *param0, int param1) { - NNSG2dImageProxy * v0; - const u8 * v1; + NNSG2dImageProxy *v0; + const u8 *v1; v1 = ov16_02268250(param1); { - void * v2; + void *v2; v2 = G2_GetOBJCharPtr(); v0 = SpriteActor_ImageProxy(param0->mainActor->unk_00); @@ -1312,14 +1309,14 @@ static void Healthbar_DrawStatusIcon (Healthbar * param0, int param1) } } -static void Healthbar_DrawBallCount (Healthbar * param0, u32 param1) +static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1) { - BGL * v0; - u8 * v1; - NNSG2dImageProxy * v2; + BGL *v0; + u8 *v1; + NNSG2dImageProxy *v2; Window v3; - MessageLoader * v4; - Strbuf* v5; + MessageLoader *v4; + Strbuf *v5; v0 = BattleSystem_BGL(param0->battleSys); v4 = BattleSystem_MessageLoader(param0->battleSys); @@ -1331,13 +1328,13 @@ static void Healthbar_DrawBallCount (Healthbar * param0, u32 param1) } BGL_AddFramelessWindow(v0, &v3, 13, 2, 0, 0xf); - PrintStringWithColorAndMargins(&v3, 0, v5, 0, 0, 0xff, ((u32)(((0xe & 0xff) << 16) | ((2 & 0xff) << 8) | (((0xf & 0xff) << 0)))), 0, 0, NULL); + PrintStringWithColorAndMargins(&v3, 0, v5, 0, 0, 0xff, ((u32)(((0xe & 0xff) << 16) | ((2 & 0xff) << 8) | ((0xf & 0xff) << 0))), 0, 0, NULL); v1 = v3.unk_0C; { - void * v6; - u8 * v7, * v8; + void *v6; + u8 *v7, *v8; v6 = G2_GetOBJCharPtr(); v2 = SpriteActor_ImageProxy(param0->mainActor->unk_00); @@ -1355,15 +1352,15 @@ static void Healthbar_DrawBallCount (Healthbar * param0, u32 param1) Strbuf_Free(v5); } -static void Healthbar_DrawBallsLeftMessage (Healthbar * param0, u32 param1) +static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1) { - BGL * v0; - u8 * v1; - NNSG2dImageProxy * v2; + BGL *v0; + u8 *v1; + NNSG2dImageProxy *v2; Window v3; - MessageLoader * v4; - Strbuf* v5, * v6; - StringTemplate * v7; + MessageLoader *v4; + Strbuf *v5, *v6; + StringTemplate *v7; v0 = BattleSystem_BGL(param0->battleSys); v4 = BattleSystem_MessageLoader(param0->battleSys); @@ -1379,13 +1376,13 @@ static void Healthbar_DrawBallsLeftMessage (Healthbar * param0, u32 param1) StringTemplate_SetNumber(v7, 0, param0->unk_27, 2, 1, 1); StringTemplate_Format(v7, v5, v6); BGL_AddFramelessWindow(v0, &v3, 13, 2, 0, 0xf); - PrintStringWithColorAndMargins(&v3, 0, v5, 0, 0, 0xff, ((u32)(((0xe & 0xff) << 16) | ((2 & 0xff) << 8) | (((0xf & 0xff) << 0)))), 0, 0, NULL); + PrintStringWithColorAndMargins(&v3, 0, v5, 0, 0, 0xff, ((u32)(((0xe & 0xff) << 16) | ((2 & 0xff) << 8) | ((0xf & 0xff) << 0))), 0, 0, NULL); v1 = v3.unk_0C; { - void * v8; - u8 * v9, * v10; + void *v8; + u8 *v9, *v10; v8 = G2_GetOBJCharPtr(); v2 = SpriteActor_ImageProxy(param0->mainActor->unk_00); @@ -1436,16 +1433,16 @@ static s32 Healthbar_DrawGauge(Healthbar *healthbar, enum HealthbarGaugeType gau return result; } -static void DrawGauge (Healthbar * param0, u8 param1) +static void DrawGauge(Healthbar *param0, u8 param1) { u8 v0; u8 v1[12]; u8 v2, v3; u8 v4; u8 v5; - const u8 * v6; - void * v7; - NNSG2dImageProxy * v8; + const u8 *v6; + void *v7; + NNSG2dImageProxy *v8; int v9; v7 = G2_GetOBJCharPtr(); @@ -1508,7 +1505,7 @@ static void DrawGauge (Healthbar * param0, u8 param1) } } -static s32 UpdateGauge (s32 max, s32 cur, s32 diff, s32 * temp, u8 size, u16 fillOffset) +static s32 UpdateGauge(s32 max, s32 cur, s32 diff, s32 *temp, u8 size, u16 fillOffset) { s32 updated, final, ratio; @@ -1585,7 +1582,7 @@ static s32 UpdateGauge (s32 max, s32 cur, s32 diff, s32 * temp, u8 size, u16 fil return final; } -static u8 ov16_02268194 (s32 param0, s32 param1, s32 param2, s32 * param3, u8 * param4, u8 param5) +static u8 ov16_02268194(s32 param0, s32 param1, s32 param2, s32 *param3, u8 *param4, u8 param5) { int v0; u32 v1; @@ -1635,7 +1632,7 @@ static u8 ov16_02268194 (s32 param0, s32 param1, s32 param2, s32 * param3, u8 * /** * @brief Calculate the number of pixels that will need to be filled to account * for a change in the current value of a gauge. - * + * * @param curVal Current value of the gauge * @param diff Change to be applied to the current value * @param maxVal Max value of the gauge @@ -1659,7 +1656,7 @@ static u32 CalcGaugeFill(s32 curVal, s32 diff, s32 maxVal, u8 gaugeSize) return abs(curPixels - newPixels); } -static const u8 * ov16_02268250 (int param0) +static const u8 *ov16_02268250(int param0) { return &Unk_ov16_0226F6AC[param0 * 0x20]; } @@ -1701,12 +1698,12 @@ u8 Healthbar_Type(int battlerType, u32 battleType) /** * @brief Grab the sprite template that applies to a given healthbar type. - * + * * @param type The healthbar type. See enum HealthbarType for accepted values. * @return Address of the SpriteTemplate struct which applies to this * healthbar type. */ -static const SpriteTemplate* Healthbar_SpriteTemplate(u8 type) +static const SpriteTemplate *Healthbar_SpriteTemplate(u8 type) { switch (type) { case HEALTHBAR_TYPE_PLAYER_SOLO: @@ -1737,9 +1734,9 @@ static const SpriteTemplate* Healthbar_SpriteTemplate(u8 type) } } -static const SpriteTemplate * ov16_02268314 (u8 param0) +static const SpriteTemplate *ov16_02268314(u8 param0) { - const SpriteTemplate * v0; + const SpriteTemplate *v0; switch (param0) { case 0: @@ -1761,9 +1758,9 @@ static const SpriteTemplate * ov16_02268314 (u8 param0) return v0; } -void ov16_0226834C (Healthbar * param0, u8 * param1) +void ov16_0226834C(Healthbar *param0, u8 *param1) { - UnkStruct_ov16_0226834C * v0; + UnkStruct_ov16_0226834C *v0; *param1 = 0; @@ -1776,12 +1773,12 @@ void ov16_0226834C (Healthbar * param0, u8 * param1) SysTask_Start(ov16_02268380, v0, 1000); } -static void ov16_02268380 (SysTask * param0, void * param1) +static void ov16_02268380(SysTask *param0, void *param1) { - UnkStruct_ov16_0226834C * v0 = param1; - SpriteGfxHandler * v1; + UnkStruct_ov16_0226834C *v0 = param1; + SpriteGfxHandler *v1; int v2; - PaletteData * v3; + PaletteData *v3; v1 = ov16_0223E018(v0->unk_00->battleSys); v3 = BattleSystem_PaletteSys(v0->unk_00->battleSys); @@ -1825,17 +1822,17 @@ static void ov16_02268380 (SysTask * param0, void * param1) } } -void ov16_02268468 (Healthbar * param0) +void ov16_02268468(Healthbar *param0) { return; } -void ov16_0226846C (Healthbar * param0) +void ov16_0226846C(Healthbar *param0) { return; } -void ov16_02268470 (Healthbar * param0) +void ov16_02268470(Healthbar *param0) { if (param0->unk_50 != NULL) { return; @@ -1845,7 +1842,7 @@ void ov16_02268470 (Healthbar * param0) param0->unk_50 = SysTask_Start(ov16_022684BC, param0, 1010); } -void ov16_02268498 (Healthbar * param0) +void ov16_02268498(Healthbar *param0) { if (param0->unk_50 != NULL) { SysTask_Done(param0->unk_50); @@ -1856,9 +1853,9 @@ void ov16_02268498 (Healthbar * param0) Healthbar_OffsetPositionXY(param0, 0, 0); } -static void ov16_022684BC (SysTask * param0, void * param1) +static void ov16_022684BC(SysTask *param0, void *param1) { - Healthbar * v0 = param1; + Healthbar *v0 = param1; int v1; v0->unk_54 += 20; diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 8dd5b0df1c..b495ce416d 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -1,99 +1,98 @@ +#include "battle/ov16_0223B140.h" + +#include #include -#include #include -#include +#include #include "constants/battle.h" +#include "struct_decls/battle_system.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "struct_decls/battle_system.h" #include "struct_decls/struct_0207AE68_decl.h" -#include "battle/battle_context.h" -#include "battle/struct_ov16_0225BFFC_decl.h" - #include "struct_defs/archived_sprite.h" -#include "pokemon.h" -#include "struct_defs/struct_0207A778.h" #include "struct_defs/battle_system.h" +#include "struct_defs/struct_0207A778.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" -#include "overlay006/battle_params.h" -#include "overlay010/struct_ov10_0221F800.h" + +#include "battle/battle_context.h" +#include "battle/battle_controller.h" +#include "battle/battle_display.h" +#include "battle/battle_io.h" +#include "battle/battle_io_command.h" +#include "battle/battle_lib.h" +#include "battle/ov16_0223DF00.h" +#include "battle/ov16_02268520.h" +#include "battle/ov16_0226871C.h" +#include "battle/ov16_0226E148.h" #include "battle/struct_ov16_0223C2C0.h" +#include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_022674C4.h" +#include "overlay006/battle_params.h" +#include "overlay010/ov10_0221F800.h" +#include "overlay010/struct_ov10_0221F800.h" +#include "overlay011/ov11_0221F840.h" +#include "overlay012/ov12_0221FC20.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bag.h" +#include "communication_system.h" +#include "flags.h" +#include "game_options.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "game_overlay.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02014000.h" #include "unk_0201567C.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_020241F0.h" #include "unk_02024220.h" -#include "trainer_info.h" #include "unk_0202631C.h" -#include "game_options.h" #include "unk_0202CD50.h" #include "unk_0202F1D4.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_02038F8C.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "party.h" #include "unk_0207A6DC.h" #include "unk_0207AE68.h" -#include "bag.h" #include "unk_0208C098.h" -#include "flags.h" -#include "overlay010/ov10_0221F800.h" -#include "overlay011/ov11_0221F840.h" -#include "overlay012/ov12_0221FC20.h" -#include "battle/ov16_0223B140.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_controller.h" -#include "battle/battle_lib.h" -#include "battle/battle_io_command.h" -#include "battle/battle_display.h" -#include "battle/battle_io.h" -#include "battle/ov16_02268520.h" -#include "battle/ov16_0226871C.h" -#include "battle/ov16_0226E148.h" FS_EXTERN_OVERLAY(overlay10); FS_EXTERN_OVERLAY(overlay11); @@ -104,41 +103,41 @@ FS_EXTERN_OVERLAY(overlay21); static const u32 BattleServerVersion = 0x140; -void ov16_0223B384(BattleSystem * param0); -void ov16_0223B3E4(BattleSystem * param0); -void ov16_0223B430(BattleSystem * param0); -void ov16_0223B53C(BattleSystem * param0); -void ov16_0223B578(BattleSystem * param0); +void ov16_0223B384(BattleSystem *param0); +void ov16_0223B3E4(BattleSystem *param0); +void ov16_0223B430(BattleSystem *param0); +void ov16_0223B53C(BattleSystem *param0); +void ov16_0223B578(BattleSystem *param0); void BattleSystem_LoadFightOverlay(BattleSystem *battleSys, int flags); -static void ov16_0223B790(OverlayManager * param0); -static int ov16_0223BBD0(OverlayManager * param0); -static void ov16_0223BCB4(OverlayManager * param0); -static BOOL ov16_0223D800(OverlayManager * param0); -static BOOL ov16_0223D944(OverlayManager * param0); -static BOOL ov16_0223D98C(OverlayManager * param0); -static BOOL ov16_0223DAD4(OverlayManager * param0); -static BOOL ov16_0223DB1C(OverlayManager * param0); -static BOOL ov16_0223DD10(OverlayManager * param0); -static void ov16_0223D10C(OverlayManager * param0, BattleParams * param1); -static BOOL ov16_0223D354(OverlayManager * param0); -static void ov16_0223D7B4(OverlayManager * param0); -static void ov16_0223C004(BattleSystem * param0, BGL * param1); -static void ov16_0223C210(BattleSystem * param0); -static void ov16_0223C288(BGL * param0); -static void ov16_0223C2BC(BattleSystem * param0); -static void ov16_0223C2C0(BattleSystem * param0, BattleParams * param1); +static void ov16_0223B790(OverlayManager *param0); +static int ov16_0223BBD0(OverlayManager *param0); +static void ov16_0223BCB4(OverlayManager *param0); +static BOOL ov16_0223D800(OverlayManager *param0); +static BOOL ov16_0223D944(OverlayManager *param0); +static BOOL ov16_0223D98C(OverlayManager *param0); +static BOOL ov16_0223DAD4(OverlayManager *param0); +static BOOL ov16_0223DB1C(OverlayManager *param0); +static BOOL ov16_0223DD10(OverlayManager *param0); +static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1); +static BOOL ov16_0223D354(OverlayManager *param0); +static void ov16_0223D7B4(OverlayManager *param0); +static void ov16_0223C004(BattleSystem *param0, BGL *param1); +static void ov16_0223C210(BattleSystem *param0); +static void ov16_0223C288(BGL *param0); +static void ov16_0223C2BC(BattleSystem *param0); +static void ov16_0223C2C0(BattleSystem *param0, BattleParams *param1); static void ov16_0223CE28(void); -static void ov16_0223CE68(void * param0); -static void ov16_0223CF1C(void * param0); -static void ov16_0223CF48(SysTask * param0, void * param1); -static void ov16_0223CF8C(SysTask * param0, void * param1); -static GenericPointerData * ov16_0223CD7C(void); -static void ov16_0223CE20(GenericPointerData * param0); +static void ov16_0223CE68(void *param0); +static void ov16_0223CF1C(void *param0); +static void ov16_0223CF48(SysTask *param0, void *param1); +static void ov16_0223CF8C(SysTask *param0, void *param1); +static GenericPointerData *ov16_0223CD7C(void); +static void ov16_0223CE20(GenericPointerData *param0); static void ov16_0223CD9C(void); -static void ov16_0223DD4C(BattleSystem * param0); -static void ov16_0223D0C4(SysTask * param0, void * param1); +static void ov16_0223DD4C(BattleSystem *param0); +static void ov16_0223D0C4(SysTask *param0, void *param1); static BOOL ov16_0223CD3C(u16 param0); -static void ov16_0223DD90(BattleSystem * param0, BattleParams * param1); +static void ov16_0223DD90(BattleSystem *param0, BattleParams *param1); static void ov16_0223DECC(void); static const UnkStruct_ov104_0224133C Unk_ov16_0226E2E4 = { @@ -169,9 +168,9 @@ const UnkStruct_ov104_02241308 Unk_ov16_0226E2B0 = { 0x8 }; -BOOL Battle_Main (OverlayManager * param0, int * param1) +BOOL Battle_Main(OverlayManager *param0, int *param1) { - BattleParams * v0 = OverlayManager_Args(param0); + BattleParams *v0 = OverlayManager_Args(param0); switch (*param1) { case 0: @@ -261,12 +260,11 @@ BOOL Battle_Main (OverlayManager * param0, int * param1) case 12: *param1 = 15; break; - case 13: - { + case 13: { int v1; int v2; int v3; - Pokemon * v4; + Pokemon *v4; v2 = ov16_0223ECC4(v0, &v1, &v3); @@ -278,19 +276,16 @@ BOOL Battle_Main (OverlayManager * param0, int * param1) } else { *param1 = 15; } - } - break; - case 14: - { - UnkStruct_0207AE68 * v5 = (UnkStruct_0207AE68 *)v0->unk_170; + } break; + case 14: { + UnkStruct_0207AE68 *v5 = (UnkStruct_0207AE68 *)v0->unk_170; if (sub_0207B0D0(v5) == 1) { sub_0207B0E0(v5); Heap_Destroy(73); *param1 = 13; } - } - break; + } break; case 15: return 1; } @@ -298,7 +293,7 @@ BOOL Battle_Main (OverlayManager * param0, int * param1) return 0; } -void ov16_0223B384 (BattleSystem * param0) +void ov16_0223B384(BattleSystem *param0) { ov16_02268A14(param0->unk_198); ov16_022687A0(param0->unk_04); @@ -317,7 +312,7 @@ void ov16_0223B384 (BattleSystem * param0) Overlay_LoadByID(FS_OVERLAY_ID(overlay13), 2); } -void ov16_0223B3E4 (BattleSystem * param0) +void ov16_0223B3E4(BattleSystem *param0) { SetMainCallback(NULL, NULL); ov16_02268A14(param0->unk_198); @@ -332,10 +327,10 @@ void ov16_0223B3E4 (BattleSystem * param0) sub_02002C60(2); } -void ov16_0223B430 (BattleSystem * param0) +void ov16_0223B430(BattleSystem *param0) { - NARC * v0; - NARC * v1; + NARC *v0; + NARC *v1; Overlay_UnloadByID(FS_OVERLAY_ID(overlay13)); @@ -371,7 +366,7 @@ void ov16_0223B430 (BattleSystem * param0) sub_0200964C(sub_0200C738(param0->unk_90), 0, ((192 + 80) << FX32_SHIFT)); } -void ov16_0223B53C (BattleSystem * param0) +void ov16_0223B53C(BattleSystem *param0) { BGL_DeleteWindow(¶m0->windows[0]); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); @@ -382,7 +377,7 @@ void ov16_0223B53C (BattleSystem * param0) ov16_0223F3EC(param0); } -void ov16_0223B578 (BattleSystem * param0) +void ov16_0223B578(BattleSystem *param0) { { param0->unk_23FB_0 = 1; @@ -403,7 +398,7 @@ void ov16_0223B578 (BattleSystem * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -418,7 +413,7 @@ void ov16_0223B578 (BattleSystem * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -433,7 +428,7 @@ void ov16_0223B578 (BattleSystem * param0) 3, 0, 0, - 0 + 0, }, }; @@ -483,7 +478,7 @@ void ov16_0223B578 (BattleSystem * param0) ov16_0223DD4C(param0); } -void BattleSystem_LoadFightOverlay (BattleSystem *battleSys, int flags) +void BattleSystem_LoadFightOverlay(BattleSystem *battleSys, int flags) { GF_ASSERT(battleSys->overlayFlags != flags); @@ -499,35 +494,35 @@ void BattleSystem_LoadFightOverlay (BattleSystem *battleSys, int flags) } static const int Unk_ov16_0226E44C[][3] = { - {0x7b51, GX_RGB(30, 17, 0), GX_RGB(0, 16, 23)}, - {0x7b51, GX_RGB(30, 17, 0), GX_RGB(0, 16, 23)}, - {0x7b51, GX_RGB(30, 17, 0), GX_RGB(0, 16, 23)}, - {GX_RGB(11, 21, 5), GX_RGB(11, 21, 5), GX_RGB(11, 21, 5)}, - {0x7b51, GX_RGB(30, 17, 0), GX_RGB(0, 16, 23)}, - {GX_RGB(31, 26, 31), GX_RGB(31, 26, 22), GX_RGB(24, 22, 22)}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {GX_RGB(5, 5, 7), GX_RGB(5, 5, 7), GX_RGB(5, 5, 7)}, - {GX_RGB(5, 5, 7), GX_RGB(5, 5, 7), GX_RGB(5, 5, 7)}, - {GX_RGB(5, 5, 7), GX_RGB(5, 5, 7), GX_RGB(5, 5, 7)}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, - {0x7fff, 0x7fff, 0x7fff}, + { 0x7b51, GX_RGB(30, 17, 0), GX_RGB(0, 16, 23) }, + { 0x7b51, GX_RGB(30, 17, 0), GX_RGB(0, 16, 23) }, + { 0x7b51, GX_RGB(30, 17, 0), GX_RGB(0, 16, 23) }, + { GX_RGB(11, 21, 5), GX_RGB(11, 21, 5), GX_RGB(11, 21, 5) }, + { 0x7b51, GX_RGB(30, 17, 0), GX_RGB(0, 16, 23) }, + { GX_RGB(31, 26, 31), GX_RGB(31, 26, 22), GX_RGB(24, 22, 22) }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { GX_RGB(5, 5, 7), GX_RGB(5, 5, 7), GX_RGB(5, 5, 7) }, + { GX_RGB(5, 5, 7), GX_RGB(5, 5, 7), GX_RGB(5, 5, 7) }, + { GX_RGB(5, 5, 7), GX_RGB(5, 5, 7), GX_RGB(5, 5, 7) }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, + { 0x7fff, 0x7fff, 0x7fff }, }; -static void ov16_0223B790 (OverlayManager * param0) +static void ov16_0223B790(OverlayManager *param0) { - BattleSystem * v0 = OverlayManager_Data(param0); - BattleParams * v1 = OverlayManager_Args(param0); + BattleSystem *v0 = OverlayManager_Data(param0); + BattleParams *v1 = OverlayManager_Args(param0); ArchivedSprite v2; int v3; RTCDate v4; @@ -566,8 +561,8 @@ static void ov16_0223B790 (OverlayManager * param0) sub_0201DBEC(64, 5); { - NARC * v6 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); - NARC * v7 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); + NARC *v6 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); + NARC *v7 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); v0->unk_198 = ov16_022687C8(v6, v7, v0, ov16_0223E1B4(v0, ov16_0223F6E4(v0)), v0->unk_1BC); @@ -596,8 +591,8 @@ static void ov16_0223B790 (OverlayManager * param0) ov16_02268A88(v0->unk_198); { - NARC * v8; - NARC * v9; + NARC *v8; + NARC *v9; v8 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v9 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); @@ -664,9 +659,9 @@ static void ov16_0223B790 (OverlayManager * param0) } } -static int ov16_0223BBD0 (OverlayManager * param0) +static int ov16_0223BBD0(OverlayManager *param0) { - BattleSystem * v0 = OverlayManager_Data(param0); + BattleSystem *v0 = OverlayManager_Data(param0); int v1; if ((v0->battleType & 0x4) && ((v0->battleStatusMask & 0x10) == 0)) { @@ -704,10 +699,10 @@ static int ov16_0223BBD0 (OverlayManager * param0) return v0->unk_23FA; } -static void ov16_0223BCB4 (OverlayManager * param0) +static void ov16_0223BCB4(OverlayManager *param0) { - BattleSystem * v0 = OverlayManager_Data(param0); - BattleParams * v1 = OverlayManager_Args(param0); + BattleSystem *v0 = OverlayManager_Data(param0); + BattleParams *v1 = OverlayManager_Args(param0); int v2; v1->unk_174 = v0->unk_2448; @@ -826,7 +821,7 @@ static void ov16_0223BCB4 (OverlayManager * param0) } } -static void ov16_0223C004 (BattleSystem * param0, BGL * param1) +static void ov16_0223C004(BattleSystem *param0, BGL *param1) { GXLayers_DisableEngineALayers(); sub_0200F338(0); @@ -843,7 +838,7 @@ static void ov16_0223C004 (BattleSystem * param0, BGL * param1) GX_VRAM_SUB_OBJ_16_I, GX_VRAM_SUB_OBJEXTPLTT_NONE, GX_VRAM_TEX_01_BC, - GX_VRAM_TEXPLTT_01_FG + GX_VRAM_TEXPLTT_01_FG, }; GXLayers_SetBanks(&v0); @@ -859,7 +854,7 @@ static void ov16_0223C004 (BattleSystem * param0, BGL * param1) GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, - GX_BG0_AS_3D + GX_BG0_AS_3D, }; sub_02018368(&v1); @@ -884,7 +879,7 @@ static void ov16_0223C004 (BattleSystem * param0, BGL * param1) 0, 0, 0, - 0 + 0, }, { 0, @@ -899,7 +894,7 @@ static void ov16_0223C004 (BattleSystem * param0, BGL * param1) 1, 0, 0, - 0 + 0, }, { 0, @@ -914,7 +909,7 @@ static void ov16_0223C004 (BattleSystem * param0, BGL * param1) 3, 0, 0, - 0 + 0, }, }; @@ -959,13 +954,13 @@ static void ov16_0223C004 (BattleSystem * param0, BGL * param1) SetMainCallback(ov16_0223CE68, param0); } -static void ov16_0223C210 (BattleSystem * param0) +static void ov16_0223C210(BattleSystem *param0) { int v0; int v1; int v2; - BattleContext * v3; - Pokemon * v4; + BattleContext *v3; + Pokemon *v4; v0 = BattleSystem_Terrain(param0); @@ -983,7 +978,7 @@ static void ov16_0223C210 (BattleSystem * param0) ov16_0223DECC(); } -static void ov16_0223C288 (BGL * param0) +static void ov16_0223C288(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); @@ -994,82 +989,82 @@ static void ov16_0223C288 (BGL * param0) ov16_022687A0(param0); } -static void ov16_0223C2BC (BattleSystem * param0) +static void ov16_0223C2BC(BattleSystem *param0) { int v0; } static const u8 Unk_ov16_0226E25C[] = { - {0x0}, - {0x1} + { 0x0 }, + { 0x1 }, }; static const u8 Unk_ov16_0226E260[][2] = { { - {0x0}, - {0x1} + { 0x0 }, + { 0x1 }, }, { - {0x1}, - {0x0} - } + { 0x1 }, + { 0x0 }, + }, }; static const u8 Unk_ov16_0226E560[] = { - {0x2}, - {0x3}, - {0x4}, - {0x5} + { 0x2 }, + { 0x3 }, + { 0x4 }, + { 0x5 }, }; static const u8 Unk_ov16_0226E264[][4] = { { - {0x2}, - {0x3}, - {0x4}, - {0x5} + { 0x2 }, + { 0x3 }, + { 0x4 }, + { 0x5 }, }, { - {0x3}, - {0x2}, - {0x5}, - {0x4} - } + { 0x3 }, + { 0x2 }, + { 0x5 }, + { 0x4 }, + }, }; static const u8 Unk_ov16_0226E28C[][4] = { { - {0x2}, - {0x5}, - {0x4}, - {0x3} + { 0x2 }, + { 0x5 }, + { 0x4 }, + { 0x3 }, }, { - {0x3}, - {0x4}, - {0x5}, - {0x2} + { 0x3 }, + { 0x4 }, + { 0x5 }, + { 0x2 }, }, { - {0x2}, - {0x5}, - {0x4}, - {0x3} + { 0x2 }, + { 0x5 }, + { 0x4 }, + { 0x3 }, }, { - {0x3}, - {0x4}, - {0x5}, - {0x2} - } + { 0x3 }, + { 0x4 }, + { 0x5 }, + { 0x2 }, + }, }; -static void ov16_0223C2C0 (BattleSystem * param0, BattleParams * param1) +static void ov16_0223C2C0(BattleSystem *param0, BattleParams *param1) { int v0, v1; UnkStruct_ov16_0223C2C0 v2; - Pokemon * v3; - Pokemon * v4; + Pokemon *v3; + Pokemon *v4; param0->battleType = param1->battleType; @@ -1409,7 +1404,7 @@ static void ov16_0223C2C0 (BattleSystem * param0, BattleParams * param1) } } -static BOOL ov16_0223CD3C (u16 param0) +static BOOL ov16_0223CD3C(u16 param0) { switch (param0) { case 62: @@ -1432,15 +1427,15 @@ static BOOL ov16_0223CD3C (u16 param0) return 0; } -static GenericPointerData * ov16_0223CD7C (void) +static GenericPointerData *ov16_0223CD7C(void) { - GenericPointerData * v0; + GenericPointerData *v0; v0 = sub_02024220(5, 0, 2, 0, 2, ov16_0223CD9C); return v0; } -static void ov16_0223CD9C (void) +static void ov16_0223CD9C(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -1455,12 +1450,12 @@ static void ov16_0223CD9C (void) G3_ViewPort(0, 0, 255, 191); } -static void ov16_0223CE20 (GenericPointerData * param0) +static void ov16_0223CE20(GenericPointerData *param0) { sub_020242C4(param0); } -static void ov16_0223CE28 (void) +static void ov16_0223CE28(void) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -1478,9 +1473,9 @@ static void ov16_0223CE28 (void) sub_02014000(); } -static void ov16_0223CE68 (void * param0) +static void ov16_0223CE68(void *param0) { - BattleSystem * v0 = param0; + BattleSystem *v0 = param0; if (v0->unk_23FB_0) { v0->unk_23FB_0 = 0; @@ -1537,9 +1532,9 @@ static void ov16_0223CE68 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov16_0223CF1C (void * param0) +static void ov16_0223CF1C(void *param0) { - UnkStruct_0207A778 * v0 = param0; + UnkStruct_0207A778 *v0 = param0; sub_02003694(v0->unk_0C); sub_0201DCAC(); @@ -1548,9 +1543,9 @@ static void ov16_0223CF1C (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov16_0223CF48 (SysTask * param0, void * param1) +static void ov16_0223CF48(SysTask *param0, void *param1) { - BattleSystem * v0 = param1; + BattleSystem *v0 = param1; sub_02038A1C(5, v0->unk_04); @@ -1566,11 +1561,11 @@ static void ov16_0223CF48 (SysTask * param0, void * param1) } } -static void ov16_0223CF8C (SysTask * param0, void * param1) +static void ov16_0223CF8C(SysTask *param0, void *param1) { - BattleSystem * v0 = param1; - BattlerData * v1; - Healthbar * v2; + BattleSystem *v0 = param1; + BattlerData *v1; + Healthbar *v2; int v3; int v4; int v5; @@ -1631,9 +1626,9 @@ static void ov16_0223CF8C (SysTask * param0, void * param1) } } -static void ov16_0223D0C4 (SysTask * param0, void * param1) +static void ov16_0223D0C4(SysTask *param0, void *param1) { - BattleSystem * v0 = param1; + BattleSystem *v0 = param1; v0->unk_2434 += 3; sub_02019184(v0->unk_04, 1, 3, v0->unk_2434); @@ -1643,16 +1638,16 @@ static void ov16_0223D0C4 (SysTask * param0, void * param1) } } -static void NitroStaticInit (void) +static void NitroStaticInit(void) { if (!sub_020389B8()) { Overlay_LoadByID(FS_OVERLAY_ID(overlay21), 2); } } -static void ov16_0223D10C (OverlayManager * param0, BattleParams * param1) +static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1) { - UnkStruct_0207A778 * v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_0207A778), 5); + UnkStruct_0207A778 *v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_0207A778), 5); v0->unk_00 = param1; v0->unk_1020 = 0; @@ -1743,8 +1738,8 @@ static void ov16_0223D10C (OverlayManager * param0, BattleParams * param1) sub_0200E060(v0->unk_08, 0, 1, 10); { - MessageLoader * v5; - Strbuf* v6; + MessageLoader *v5; + Strbuf *v6; v5 = MessageLoader_Init(1, 26, 368, 5); v6 = Strbuf_Init(0x100, 5); @@ -1764,9 +1759,9 @@ static void ov16_0223D10C (OverlayManager * param0, BattleParams * param1) ov16_0223DECC(); } -static BOOL ov16_0223D354 (OverlayManager * param0) +static BOOL ov16_0223D354(OverlayManager *param0) { - UnkStruct_0207A778 * v0 = OverlayManager_Data(param0); + UnkStruct_0207A778 *v0 = OverlayManager_Data(param0); BOOL v1; sub_02038A1C(5, v0->unk_04); @@ -1991,9 +1986,9 @@ static BOOL ov16_0223D354 (OverlayManager * param0) return v1; } -static void ov16_0223D7B4 (OverlayManager * param0) +static void ov16_0223D7B4(OverlayManager *param0) { - UnkStruct_0207A778 * v0 = OverlayManager_Data(param0); + UnkStruct_0207A778 *v0 = OverlayManager_Data(param0); SetMainCallback(NULL, NULL); sub_0200F344(0, 0x0); @@ -2006,10 +2001,10 @@ static void ov16_0223D7B4 (OverlayManager * param0) Heap_FreeToHeap(v0); } -static BOOL ov16_0223D800 (OverlayManager * param0) +static BOOL ov16_0223D800(OverlayManager *param0) { - BattleSystem * v0 = OverlayManager_NewData(param0, sizeof(BattleSystem), 5); - BattleParams * v1 = OverlayManager_Args(param0); + BattleSystem *v0 = OverlayManager_NewData(param0, sizeof(BattleSystem), 5); + BattleParams *v1 = OverlayManager_Args(param0); u8 v2; MI_CpuClearFast(v0, sizeof(BattleSystem)); @@ -2062,10 +2057,10 @@ static BOOL ov16_0223D800 (OverlayManager * param0) return 1; } -static BOOL ov16_0223D944 (OverlayManager * param0) +static BOOL ov16_0223D944(OverlayManager *param0) { int v0; - BattleSystem * v1 = OverlayManager_Data(param0); + BattleSystem *v1 = OverlayManager_Data(param0); if (v1->unk_1C0->unk_2B) { for (v0 = 0; v0 < 4; v0++) { @@ -2081,10 +2076,10 @@ static BOOL ov16_0223D944 (OverlayManager * param0) return 0; } -static BOOL ov16_0223D98C (OverlayManager * param0) +static BOOL ov16_0223D98C(OverlayManager *param0) { - BattleSystem * v0 = OverlayManager_Data(param0); - BattleParams * v1 = OverlayManager_Args(param0); + BattleSystem *v0 = OverlayManager_Data(param0); + BattleParams *v1 = OverlayManager_Args(param0); u8 v2; int v3; @@ -2122,10 +2117,10 @@ static BOOL ov16_0223D98C (OverlayManager * param0) return 1; } -static BOOL ov16_0223DAD4 (OverlayManager * param0) +static BOOL ov16_0223DAD4(OverlayManager *param0) { int v0; - BattleSystem * v1 = OverlayManager_Data(param0); + BattleSystem *v1 = OverlayManager_Data(param0); if (v1->unk_1C0->unk_2B) { for (v0 = 0; v0 < 4; v0++) { @@ -2141,16 +2136,16 @@ static BOOL ov16_0223DAD4 (OverlayManager * param0) return 0; } -static BOOL ov16_0223DB1C (OverlayManager * param0) +static BOOL ov16_0223DB1C(OverlayManager *param0) { - BattleParams * v0 = OverlayManager_Args(param0); - UnkStruct_ov10_0221F800 * v1; + BattleParams *v0 = OverlayManager_Args(param0); + UnkStruct_ov10_0221F800 *v1; u8 v2; int v3; if (((v0->battleType & BATTLE_TYPE_LINK) == 0) - || (v0->unk_164 & 0x10) - || (v0->battleType & BATTLE_TYPE_FRONTIER)) { + || (v0->unk_164 & 0x10) + || (v0->battleType & BATTLE_TYPE_FRONTIER)) { return 0; } @@ -2225,11 +2220,11 @@ static BOOL ov16_0223DB1C (OverlayManager * param0) return 1; } -static BOOL ov16_0223DD10 (OverlayManager * param0) +static BOOL ov16_0223DD10(OverlayManager *param0) { int v0; - BattleParams * v1 = OverlayManager_Args(param0); - UnkStruct_ov10_0221F800 * v2 = v1->unk_170; + BattleParams *v1 = OverlayManager_Args(param0); + UnkStruct_ov10_0221F800 *v2 = v1->unk_170; if (v2->unk_2B) { for (v0 = 0; v0 < 4; v0++) { @@ -2245,7 +2240,7 @@ static BOOL ov16_0223DD10 (OverlayManager * param0) return 0; } -static void ov16_0223DD4C (BattleSystem * param0) +static void ov16_0223DD4C(BattleSystem *param0) { if ((param0->battleType & (0x4 | 0x400)) || (param0->battleStatusMask & 0x10)) { sub_02002AE4(1); @@ -2258,7 +2253,7 @@ static void ov16_0223DD4C (BattleSystem * param0) } } -static void ov16_0223DD90 (BattleSystem * param0, BattleParams * param1) +static void ov16_0223DD90(BattleSystem *param0, BattleParams *param1) { int v0, v1, v2; int v3, v4; @@ -2319,7 +2314,7 @@ static void ov16_0223DD90 (BattleSystem * param0, BattleParams * param1) } } -static void ov16_0223DECC (void) +static void ov16_0223DECC(void) { sub_02039734(); diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index b4b4c704fc..5223b306c3 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -1,267 +1,262 @@ -#include "enums.h" +#include "battle/ov16_0223DF00.h" #include #include -#include "consts/battle.h" - -#include "battle/common.h" #include "constants/battle.h" +#include "constants/game_options.h" #include "constants/heap.h" #include "constants/items.h" -#include "constants/game_options.h" +#include "consts/battle.h" +#include "struct_decls/battle_system.h" +#include "struct_decls/pokedexdata_decl.h" +#include "struct_decls/pokemon_animation_sys_decl.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" -#include "message.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "struct_decls/pokedexdata_decl.h" -#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" -#include "struct_decls/battle_system.h" -#include "bag.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "battle/battle_context.h" -#include "battle/struct_ov16_0225BFFC_decl.h" -#include "battle/struct_ov16_02268A14_decl.h" -#include "battle/struct_ov16_0226D160_decl.h" - +#include "struct_defs/battle_system.h" +#include "struct_defs/chatot_cry.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0201D738.h" #include "struct_defs/struct_0205AA50.h" -#include "pokemon.h" #include "struct_defs/trainer_data.h" -#include "struct_defs/battle_system.h" -#include "overlay006/battle_params.h" -#include "battle/struct_ov16_0223E0C8.h" + +#include "battle/battle_context.h" +#include "battle/battle_display.h" +#include "battle/battle_lib.h" #include "battle/battle_message.h" +#include "battle/common.h" +#include "battle/healthbar.h" +#include "battle/ov16_02268520.h" +#include "battle/ov16_0226871C.h" +#include "battle/ov16_0226E148.h" +#include "battle/struct_ov16_0223E0C8.h" +#include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_022674C4.h" #include "battle/struct_ov16_02268520.h" +#include "battle/struct_ov16_02268A14_decl.h" +#include "battle/struct_ov16_0226D160_decl.h" +#include "overlay006/battle_params.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" +#include "bag.h" +#include "enums.h" +#include "flags.h" +#include "game_options.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "party.h" +#include "pokemon.h" +#include "poketch_data.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_data.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "message.h" -#include "string_template.h" #include "unk_0200F174.h" #include "unk_02014A84.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "trainer_info.h" #include "unk_0202631C.h" -#include "game_options.h" #include "unk_0202CD50.h" #include "unk_0202F1D4.h" -#include "poketch_data.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "trainer_data.h" -#include "party.h" -#include "item.h" -#include "flags.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_lib.h" -#include "battle/battle_display.h" -#include "battle/healthbar.h" -#include "battle/ov16_02268520.h" -#include "battle/ov16_0226871C.h" -#include "battle/ov16_0226E148.h" -BGL * BattleSystem_BGL(BattleSystem * param0); -u32 BattleSystem_BattleType(BattleSystem * param0); -BattleContext * BattleSystem_Context(BattleSystem * param0); -BattlerData * BattleSystem_BattlerData(BattleSystem * param0, int param1); -int BattleSystem_MaxBattlers(BattleSystem * param0); -Party * BattleSystem_Party(BattleSystem * param0, int param1); +BGL *BattleSystem_BGL(BattleSystem *param0); +u32 BattleSystem_BattleType(BattleSystem *param0); +BattleContext *BattleSystem_Context(BattleSystem *param0); +BattlerData *BattleSystem_BattlerData(BattleSystem *param0, int param1); +int BattleSystem_MaxBattlers(BattleSystem *param0); +Party *BattleSystem_Party(BattleSystem *param0, int param1); int BattleSystem_PartyCount(BattleSystem *battleSys, int battler); -Pokemon* BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); -UnkStruct_02007768 * ov16_0223E000(BattleSystem * param0); -UnkStruct_ov12_0221FCDC * ov16_0223E008(BattleSystem * param0); -SpriteRenderer * ov16_0223E010(BattleSystem * param0); -SpriteGfxHandler * ov16_0223E018(BattleSystem * param0); -UnkStruct_ov16_02268520 * ov16_0223E020(BattleSystem * param0, int param1); -UnkStruct_ov16_02268A14 * ov16_0223E02C(BattleSystem * param0); -UnkStruct_0200C440 * ov16_0223E04C(BattleSystem * param0); -UnkStruct_0200C440 * ov16_0223E054(BattleSystem * param0); -MessageLoader * BattleSystem_MessageLoader(BattleSystem * param0); -MessageLoader * ov16_0223E060(BattleSystem * param0); -PaletteData * BattleSystem_PaletteSys(BattleSystem * param0); -PokedexData * ov16_0223E068(BattleSystem * param0); -u8 * ov16_0223E06C(BattleSystem * param0); -u8 * ov16_0223E074(BattleSystem * param0); -u16 * ov16_0223E080(BattleSystem * param0); -u16 * ov16_0223E08C(BattleSystem * param0); -u16 * ov16_0223E098(BattleSystem * param0); -u16 * ov16_0223E0A4(BattleSystem * param0); -u16 * ov16_0223E0B0(BattleSystem * param0); -u16 * ov16_0223E0BC(BattleSystem * param0); -UnkStruct_ov16_0223E0C8 * ov16_0223E0C8(BattleSystem * param0); -StringTemplate * BattleSystem_StringTemplate(BattleSystem * param0); -Strbuf* ov16_0223E0D4(BattleSystem * param0); -u16 Battler_TrainerID(BattleSystem * param0, int param1); -TrainerData * BattleSystem_TrainerData(BattleSystem * param0, int param1); -TrainerInfo* BattleSystem_TrainerInfo(BattleSystem *battleSys, int battler); -Bag * BattleSystem_Bag(BattleSystem * param0); -UnkStruct_0207D99C * BattleSystem_BagCursor(BattleSystem * param0); -u32 ov16_0223E1B4(BattleSystem * param0, int param1); +Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot); +UnkStruct_02007768 *ov16_0223E000(BattleSystem *param0); +UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *param0); +SpriteRenderer *ov16_0223E010(BattleSystem *param0); +SpriteGfxHandler *ov16_0223E018(BattleSystem *param0); +UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *param0, int param1); +UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *param0); +UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *param0); +UnkStruct_0200C440 *ov16_0223E054(BattleSystem *param0); +MessageLoader *BattleSystem_MessageLoader(BattleSystem *param0); +MessageLoader *ov16_0223E060(BattleSystem *param0); +PaletteData *BattleSystem_PaletteSys(BattleSystem *param0); +PokedexData *ov16_0223E068(BattleSystem *param0); +u8 *ov16_0223E06C(BattleSystem *param0); +u8 *ov16_0223E074(BattleSystem *param0); +u16 *ov16_0223E080(BattleSystem *param0); +u16 *ov16_0223E08C(BattleSystem *param0); +u16 *ov16_0223E098(BattleSystem *param0); +u16 *ov16_0223E0A4(BattleSystem *param0); +u16 *ov16_0223E0B0(BattleSystem *param0); +u16 *ov16_0223E0BC(BattleSystem *param0); +UnkStruct_ov16_0223E0C8 *ov16_0223E0C8(BattleSystem *param0); +StringTemplate *BattleSystem_StringTemplate(BattleSystem *param0); +Strbuf *ov16_0223E0D4(BattleSystem *param0); +u16 Battler_TrainerID(BattleSystem *param0, int param1); +TrainerData *BattleSystem_TrainerData(BattleSystem *param0, int param1); +TrainerInfo *BattleSystem_TrainerInfo(BattleSystem *battleSys, int battler); +Bag *BattleSystem_Bag(BattleSystem *param0); +UnkStruct_0207D99C *BattleSystem_BagCursor(BattleSystem *param0); +u32 ov16_0223E1B4(BattleSystem *param0, int param1); int BattleSystem_BattlerOfType(BattleSystem *battleSys, int type); u8 BattleSystem_BattlerSlot(BattleSystem *battleSys, int battler); -u8 Battler_Side(BattleSystem * param0, int param1); -void * ov16_0223E220(BattleSystem * param0); -PCBoxes * ov16_0223E228(BattleSystem * param0); +u8 Battler_Side(BattleSystem *param0, int param1); +void *ov16_0223E220(BattleSystem *param0); +PCBoxes *ov16_0223E228(BattleSystem *param0); enum Terrain BattleSystem_Terrain(BattleSystem *battleSys); -int ov16_0223E240(BattleSystem * param0); -int BattleSystem_MapHeader(BattleSystem * param0); +int ov16_0223E240(BattleSystem *param0); +int BattleSystem_MapHeader(BattleSystem *param0); int BattleSystem_Partner(BattleSystem *battleSys, int battler); int BattleSystem_EnemyInSlot(BattleSystem *battleSys, int attacker, int slot); BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot, int moveSlot, int item); -u32 ov16_0223EBEC(BattleSystem * param0); +u32 ov16_0223EBEC(BattleSystem *param0); enum Time BattleSystem_Time(BattleSystem *battleSys); -int ov16_0223EC04(BattleSystem * param0); -u8 ov16_0223EC58(BattleSystem * param0, int param1, u8 param2); -u16 ov16_0223ECC4(BattleParams * param0, int * param1, int * param2); -u8 ov16_0223ED60(BattleSystem * param0); -u8 ov16_0223ED6C(BattleSystem * param0); -int BattleSystem_NumSafariBalls(BattleSystem * param0); -void BattleSystem_SetSafariBalls(BattleSystem * param0, int param1); -Options * ov16_0223EDA4(BattleSystem * param0); +int ov16_0223EC04(BattleSystem *param0); +u8 ov16_0223EC58(BattleSystem *param0, int param1, u8 param2); +u16 ov16_0223ECC4(BattleParams *param0, int *param1, int *param2); +u8 ov16_0223ED60(BattleSystem *param0); +u8 ov16_0223ED6C(BattleSystem *param0); +int BattleSystem_NumSafariBalls(BattleSystem *param0); +void BattleSystem_SetSafariBalls(BattleSystem *param0, int param1); +Options *ov16_0223EDA4(BattleSystem *param0); BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys); -int ov16_0223EDE0(BattleSystem * param0); -u8 BattleSystem_TextSpeed(BattleSystem * param0); -int BattleSystem_Ruleset(BattleSystem * param0); -PokemonAnimationSys * ov16_0223EE28(BattleSystem * param0); -ChatotCry * 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); -void ov16_0223EF68(BattleSystem * param0, Pokemon * param1); -void ov16_0223EF8C(BattleSystem * param0); -u8 * ov16_0223F1E8(BattleSystem * param0); -u16 * ov16_0223F1F0(BattleSystem * param0); -int ov16_0223F1F8(BattleSystem * param0); -u16 * ov16_0223F204(BattleSystem * param0); -u16 * ov16_0223F210(BattleSystem * param0); -int BattleSystem_FieldWeather(BattleSystem * param0); -u8 ov16_0223F228(BattleSystem * param0); -void ov16_0223F234(BattleSystem * param0, u8 param1); -int ov16_0223F240(BattleSystem * param0); -void ov16_0223F24C(BattleSystem * param0, int param1); -void ov16_0223F268(BattleSystem * param0); +int ov16_0223EDE0(BattleSystem *param0); +u8 BattleSystem_TextSpeed(BattleSystem *param0); +int BattleSystem_Ruleset(BattleSystem *param0); +PokemonAnimationSys *ov16_0223EE28(BattleSystem *param0); +ChatotCry *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); +void ov16_0223EF68(BattleSystem *param0, Pokemon *param1); +void ov16_0223EF8C(BattleSystem *param0); +u8 *ov16_0223F1E8(BattleSystem *param0); +u16 *ov16_0223F1F0(BattleSystem *param0); +int ov16_0223F1F8(BattleSystem *param0); +u16 *ov16_0223F204(BattleSystem *param0); +u16 *ov16_0223F210(BattleSystem *param0); +int BattleSystem_FieldWeather(BattleSystem *param0); +u8 ov16_0223F228(BattleSystem *param0); +void ov16_0223F234(BattleSystem *param0, u8 param1); +int ov16_0223F240(BattleSystem *param0); +void ov16_0223F24C(BattleSystem *param0, int param1); +void ov16_0223F268(BattleSystem *param0); void BattleSystem_SetCommandSelectionFlags(BattleSystem *battleSys, int flags); -void ov16_0223F290(BattleSystem * param0, int param1); -void * Battle_WaitDial(BattleSystem * param0); -void Battle_SetWaitDial(BattleSystem * param0, void * param1); -u8 * ov16_0223F2B8(UnkStruct_ov16_0223E0C8 * param0, int param1); -void ov16_0223F2CC(UnkStruct_ov16_0223E0C8 * param0, int param1, int param2); -void ov16_0223F2E4(UnkStruct_ov16_0223E0C8 * param0, int param1, int param2); -void ov16_0223F2FC(UnkStruct_ov16_0223E0C8 * param0, int param1, int param2); -void ov16_0223F314(BattleSystem * param0, int param1); -void ov16_0223F320(BattleSystem * param0, u8 * param1); -void ov16_0223F32C(BattleSystem * param0, u8 * param1); -void ov16_0223F338(BattleSystem * param0, u8 param1); -void ov16_0223F344(BattleSystem * param0, u8 param1); -void ov16_0223F350(BattleSystem * param0, u8 param1); -void ov16_0223F36C(BattleSystem * param0); -void ov16_0223F3BC(BattleSystem * param0); -void ov16_0223F3EC(BattleSystem * param0); -void ov16_0223F414(BattleSystem * param0); -u8 BattleSystem_ResultMask(BattleSystem * param0); -void BattleSystem_SetResultFlag(BattleSystem * param0, u8 param1); -u8 ov16_0223F450(BattleSystem * param0); -void BattleSystem_SetRedHPSoundFlag(BattleSystem * param0, u8 param1); -u8 ov16_0223F47C(BattleSystem * param0); -void ov16_0223F48C(BattleSystem * param0, u8 param1); -void ov16_0223F4B0(BattleSystem * param0, int param1); -u16 BattleSystem_RandNext(BattleSystem * param0); -u32 ov16_0223F4E8(BattleSystem * param0); -void ov16_0223F4F4(BattleSystem * param0, u32 param1); -void BattleSystem_Record(BattleSystem * param0, int param1, u8 param2); -BOOL ov16_0223F530(BattleSystem * param0, int param1, u8 * param2); -u8 ov16_0223F58C(BattleSystem * param0, u8 * param1); -void ov16_0223F638(BattleSystem * param0, u16 param1, u8 * param2); -u16 ov16_0223F6E4(BattleSystem * param0); -int ov16_0223F6F0(BattleSystem * param0, u16 param1); -u16 BattleSystem_TrainerItems(BattleSystem * param0, int param1, int param2); -u32 BattleSystem_RecordingStopped(BattleSystem * param0); +void ov16_0223F290(BattleSystem *param0, int param1); +void *Battle_WaitDial(BattleSystem *param0); +void Battle_SetWaitDial(BattleSystem *param0, void *param1); +u8 *ov16_0223F2B8(UnkStruct_ov16_0223E0C8 *param0, int param1); +void ov16_0223F2CC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); +void ov16_0223F2E4(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); +void ov16_0223F2FC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2); +void ov16_0223F314(BattleSystem *param0, int param1); +void ov16_0223F320(BattleSystem *param0, u8 *param1); +void ov16_0223F32C(BattleSystem *param0, u8 *param1); +void ov16_0223F338(BattleSystem *param0, u8 param1); +void ov16_0223F344(BattleSystem *param0, u8 param1); +void ov16_0223F350(BattleSystem *param0, u8 param1); +void ov16_0223F36C(BattleSystem *param0); +void ov16_0223F3BC(BattleSystem *param0); +void ov16_0223F3EC(BattleSystem *param0); +void ov16_0223F414(BattleSystem *param0); +u8 BattleSystem_ResultMask(BattleSystem *param0); +void BattleSystem_SetResultFlag(BattleSystem *param0, u8 param1); +u8 ov16_0223F450(BattleSystem *param0); +void BattleSystem_SetRedHPSoundFlag(BattleSystem *param0, u8 param1); +u8 ov16_0223F47C(BattleSystem *param0); +void ov16_0223F48C(BattleSystem *param0, u8 param1); +void ov16_0223F4B0(BattleSystem *param0, int param1); +u16 BattleSystem_RandNext(BattleSystem *param0); +u32 ov16_0223F4E8(BattleSystem *param0); +void ov16_0223F4F4(BattleSystem *param0, u32 param1); +void BattleSystem_Record(BattleSystem *param0, int param1, u8 param2); +BOOL ov16_0223F530(BattleSystem *param0, int param1, u8 *param2); +u8 ov16_0223F58C(BattleSystem *param0, u8 *param1); +void ov16_0223F638(BattleSystem *param0, u16 param1, u8 *param2); +u16 ov16_0223F6E4(BattleSystem *param0); +int ov16_0223F6F0(BattleSystem *param0, u16 param1); +u16 BattleSystem_TrainerItems(BattleSystem *param0, int param1, int param2); +u32 BattleSystem_RecordingStopped(BattleSystem *param0); void BattleSystem_SetStopRecording(BattleSystem *battleSys, int flag); -BOOL ov16_0223F7A4(BattleSystem * param0); -void BattleSystem_ShowStopPlaybackButton(BattleSystem * param0); -u8 BattleSystem_RecordedChatter(BattleSystem * param0, int param1); -void ov16_0223F858(BattleSystem * param0, u8 * param1); -void ov16_0223F87C(BattleSystem * param0, u8 * param1); -void ov16_0223F8AC(BattleSystem * param0, Sprite ** param1); -void BattleSystem_SetGaugePriority(BattleSystem * param0, int param1); +BOOL ov16_0223F7A4(BattleSystem *param0); +void BattleSystem_ShowStopPlaybackButton(BattleSystem *param0); +u8 BattleSystem_RecordedChatter(BattleSystem *param0, int param1); +void ov16_0223F858(BattleSystem *param0, u8 *param1); +void ov16_0223F87C(BattleSystem *param0, u8 *param1); +void ov16_0223F8AC(BattleSystem *param0, Sprite **param1); +void BattleSystem_SetGaugePriority(BattleSystem *param0, int param1); u32 BattleSystem_CalcMoneyPenalty(Party *party, TrainerInfo *trainerInfo); -void BattleSystem_DexFlagSeen(BattleSystem * param0, int param1); -void ov16_0223F9A0(BattleSystem * param0, int param1); +void BattleSystem_DexFlagSeen(BattleSystem *param0, int param1); +void ov16_0223F9A0(BattleSystem *param0, int param1); BOOL BattleSystem_CaughtSpecies(BattleSystem *battleSys, int species); void Battle_SetDefaultBlend(void); -u8 ov16_0223F9FC(BattleSystem * param0, int param1, int param2, int param3, int param4); -u8 BattleMessage_PrintToWindow(BattleSystem * param0, Window * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8); +u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int param4); +u8 BattleMessage_PrintToWindow(BattleSystem *param0, Window *param1, MessageLoader *param2, BattleMessage *param3, int param4, int param5, int param6, int param7, int param8); static void BattleMessage_CheckSide(BattleSystem *battleSys, BattleMessage *battleMsg); static void BattleMessage_FillFormatBuffers(BattleSystem *battleSys, BattleMessage *battleMsg); static void BattleMessage_Format(BattleSystem *battleSys, MessageLoader *msgLoader, BattleMessage *battleMsg); -static BOOL BattleMessage_Callback(UnkStruct_0201D738 * param0, u16 param1); -static void BattleMessage_Nickname(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_MoveName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_ItemName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_Number(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_NumberDigits(BattleSystem * param0, u32 param1, int param2, int param3); -static void BattleMessage_TypeName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_AbilityName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_StatName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_StatusName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_PokemonName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_PoffinName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_FlavorName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_TrainerClassName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_TrainerName(BattleSystem * param0, u32 param1, int param2); -static void BattleMessage_PCBoxName(BattleSystem * param0, u32 param1, int param2); -static u8 ov16_0223F6D4(u8 * param0, u8 * param1, u16 * param2); - -BGL * BattleSystem_BGL (BattleSystem * param0) +static BOOL BattleMessage_Callback(UnkStruct_0201D738 *param0, u16 param1); +static void BattleMessage_Nickname(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_MoveName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_ItemName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_Number(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_NumberDigits(BattleSystem *param0, u32 param1, int param2, int param3); +static void BattleMessage_TypeName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_AbilityName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_StatName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_StatusName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_PokemonName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_PoffinName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_FlavorName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_TrainerClassName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_TrainerName(BattleSystem *param0, u32 param1, int param2); +static void BattleMessage_PCBoxName(BattleSystem *param0, u32 param1, int param2); +static u8 ov16_0223F6D4(u8 *param0, u8 *param1, u16 *param2); + +BGL *BattleSystem_BGL(BattleSystem *param0) { return param0->unk_04; } -Window* BattleSystem_Window(BattleSystem *battleSys, int idx) +Window *BattleSystem_Window(BattleSystem *battleSys, int idx) { return &battleSys->windows[idx]; } -u32 BattleSystem_BattleType (BattleSystem *battleSys) +u32 BattleSystem_BattleType(BattleSystem *battleSys) { return battleSys->battleType; } -BattleContext * BattleSystem_Context (BattleSystem *battleSys) +BattleContext *BattleSystem_Context(BattleSystem *battleSys) { return battleSys->battleCtx; } -BattlerData * BattleSystem_BattlerData (BattleSystem *battleSys, int battler) +BattlerData *BattleSystem_BattlerData(BattleSystem *battleSys, int battler) { return battleSys->battlers[battler]; } -int BattleSystem_MaxBattlers (BattleSystem *battleSys) +int BattleSystem_MaxBattlers(BattleSystem *battleSys) { return battleSys->maxBattlers; } -Party * BattleSystem_Party (BattleSystem * param0, int param1) +Party *BattleSystem_Party(BattleSystem *param0, int param1) { if ((param0->battleType & 0x8) || ((param0->battleType & 0x10) && (BattleSystem_BattlerSlot(param0, param1) & 0x1))) { return param0->parties[param1]; @@ -275,8 +270,8 @@ Party * BattleSystem_Party (BattleSystem * param0, int param1) int BattleSystem_PartyCount(BattleSystem *battleSys, int battler) { if ((battleSys->battleType & BATTLE_TYPE_2vs2) - || ((battleSys->battleType & BATTLE_TYPE_TAG) - && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_THEM))) { + || ((battleSys->battleType & BATTLE_TYPE_TAG) + && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_THEM))) { return Party_GetCurrentCount(battleSys->parties[battler]); } else if (battleSys->battleType & BATTLE_TYPE_DOUBLES) { return Party_GetCurrentCount(battleSys->parties[battler & 1]); @@ -285,13 +280,13 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler) } } -Pokemon* BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot) +Pokemon *BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot) { if ((battleSys->battleType & BATTLE_TYPE_2vs2) - || ((battleSys->battleType & BATTLE_TYPE_TAG) && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_ENEMY_SLOT_1))) { + || ((battleSys->battleType & BATTLE_TYPE_TAG) && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_ENEMY_SLOT_1))) { return Party_GetPokemonBySlotIndex(battleSys->parties[battler], slot); } - + if (battleSys->battleType & BATTLE_TYPE_DOUBLES) { return Party_GetPokemonBySlotIndex(battleSys->parties[battler & 1], slot); } @@ -299,127 +294,127 @@ Pokemon* BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slo return Party_GetPokemonBySlotIndex(battleSys->parties[battler], slot); } -UnkStruct_02007768 * ov16_0223E000 (BattleSystem * param0) +UnkStruct_02007768 *ov16_0223E000(BattleSystem *param0) { return param0->unk_88; } -UnkStruct_ov12_0221FCDC * ov16_0223E008 (BattleSystem * param0) +UnkStruct_ov12_0221FCDC *ov16_0223E008(BattleSystem *param0) { return param0->unk_8C; } -SpriteRenderer * ov16_0223E010 (BattleSystem * param0) +SpriteRenderer *ov16_0223E010(BattleSystem *param0) { return param0->unk_90; } -SpriteGfxHandler * ov16_0223E018 (BattleSystem * param0) +SpriteGfxHandler *ov16_0223E018(BattleSystem *param0) { return param0->unk_94; } -UnkStruct_ov16_02268520 * ov16_0223E020 (BattleSystem * param0, int param1) +UnkStruct_ov16_02268520 *ov16_0223E020(BattleSystem *param0, int param1) { return ¶m0->unk_17C[param1]; } -UnkStruct_ov16_02268A14 * ov16_0223E02C (BattleSystem * param0) +UnkStruct_ov16_02268A14 *ov16_0223E02C(BattleSystem *param0) { return param0->unk_198; } -PartyGauge * ov16_0223E034 (BattleSystem * param0, enum PartyGaugeSide param1) +PartyGauge *ov16_0223E034(BattleSystem *param0, enum PartyGaugeSide param1) { return param0->unk_19C[param1]; } -void ov16_0223E040 (BattleSystem * param0, enum PartyGaugeSide param1, PartyGauge * param2) +void ov16_0223E040(BattleSystem *param0, enum PartyGaugeSide param1, PartyGauge *param2) { param0->unk_19C[param1] = param2; } -UnkStruct_0200C440 * ov16_0223E04C (BattleSystem * param0) +UnkStruct_0200C440 *ov16_0223E04C(BattleSystem *param0) { return param0->unk_1A4; } -UnkStruct_0200C440 * ov16_0223E054 (BattleSystem * param0) +UnkStruct_0200C440 *ov16_0223E054(BattleSystem *param0) { return param0->unk_1A8; } -MessageLoader * BattleSystem_MessageLoader (BattleSystem * param0) +MessageLoader *BattleSystem_MessageLoader(BattleSystem *param0) { return param0->unk_0C; } -MessageLoader * ov16_0223E060 (BattleSystem * param0) +MessageLoader *ov16_0223E060(BattleSystem *param0) { return param0->unk_10; } -PaletteData * BattleSystem_PaletteSys (BattleSystem * param0) +PaletteData *BattleSystem_PaletteSys(BattleSystem *param0) { return param0->unk_28; } -PokedexData * ov16_0223E068 (BattleSystem * param0) +PokedexData *ov16_0223E068(BattleSystem *param0) { return param0->pokedex; } -u8 * ov16_0223E06C (BattleSystem * param0) +u8 *ov16_0223E06C(BattleSystem *param0) { return ¶m0->unk_224[0]; } -u8 * ov16_0223E074 (BattleSystem * param0) +u8 *ov16_0223E074(BattleSystem *param0) { return ¶m0->unk_1224[0]; } -u16 * ov16_0223E080 (BattleSystem * param0) +u16 *ov16_0223E080(BattleSystem *param0) { return ¶m0->unk_23E4; } -u16 * ov16_0223E08C (BattleSystem * param0) +u16 *ov16_0223E08C(BattleSystem *param0) { return ¶m0->unk_23E6; } -u16 * ov16_0223E098 (BattleSystem * param0) +u16 *ov16_0223E098(BattleSystem *param0) { return ¶m0->unk_23E8; } -u16 * ov16_0223E0A4 (BattleSystem * param0) +u16 *ov16_0223E0A4(BattleSystem *param0) { return ¶m0->unk_23EA; } -u16 * ov16_0223E0B0 (BattleSystem * param0) +u16 *ov16_0223E0B0(BattleSystem *param0) { return ¶m0->unk_23EC; } -u16 * ov16_0223E0BC (BattleSystem * param0) +u16 *ov16_0223E0BC(BattleSystem *param0) { return ¶m0->unk_23EE; } -UnkStruct_ov16_0223E0C8 * ov16_0223E0C8 (BattleSystem * param0) +UnkStruct_ov16_0223E0C8 *ov16_0223E0C8(BattleSystem *param0) { return ¶m0->unk_1CC[0]; } -StringTemplate * BattleSystem_StringTemplate (BattleSystem * param0) +StringTemplate *BattleSystem_StringTemplate(BattleSystem *param0) { return param0->strFormatter; } -Strbuf* ov16_0223E0D4 (BattleSystem * param0) +Strbuf *ov16_0223E0D4(BattleSystem *param0) { return param0->msgBuffer; } @@ -427,10 +422,10 @@ Strbuf* ov16_0223E0D4 (BattleSystem * param0) u16 Battler_TrainerID(BattleSystem *battleSys, int battler) { if ((battleSys->battleType & BATTLE_TYPE_2vs2) - || ((battleSys->battleType & BATTLE_TYPE_TAG) && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_THEM))) { + || ((battleSys->battleType & BATTLE_TYPE_TAG) && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_THEM))) { return battleSys->trainerIDs[battler]; } - + if (battleSys->battleType & BATTLE_TYPE_DOUBLES) { return battleSys->trainerIDs[battler & 1]; } @@ -438,7 +433,7 @@ u16 Battler_TrainerID(BattleSystem *battleSys, int battler) return battleSys->trainerIDs[battler]; } -TrainerData * BattleSystem_TrainerData (BattleSystem * param0, int param1) +TrainerData *BattleSystem_TrainerData(BattleSystem *param0, int param1) { if ((param0->battleType & 0x8) || ((param0->battleType & 0x10) && (BattleSystem_BattlerSlot(param0, param1) & 0x1))) { return ¶m0->trainers[param1]; @@ -449,32 +444,32 @@ TrainerData * BattleSystem_TrainerData (BattleSystem * param0, int param1) } } -TrainerInfo* BattleSystem_TrainerInfo(BattleSystem *battleSys, int battler) +TrainerInfo *BattleSystem_TrainerInfo(BattleSystem *battleSys, int battler) { if ((battleSys->battleType & BATTLE_TYPE_2vs2) - || ((battleSys->battleType & BATTLE_TYPE_TAG) - && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_TYPE_SOLO_ENEMY))) { + || ((battleSys->battleType & BATTLE_TYPE_TAG) + && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_TYPE_SOLO_ENEMY))) { return battleSys->trainerInfo[battler]; } - + if (battleSys->battleType & BATTLE_TYPE_DOUBLES) { return battleSys->trainerInfo[battler & 1]; } - + return battleSys->trainerInfo[battler]; } -Bag * BattleSystem_Bag (BattleSystem * param0) +Bag *BattleSystem_Bag(BattleSystem *param0) { return param0->unk_58; } -UnkStruct_0207D99C * BattleSystem_BagCursor (BattleSystem * param0) +UnkStruct_0207D99C *BattleSystem_BagCursor(BattleSystem *param0) { return param0->unk_5C; } -u32 ov16_0223E1B4 (BattleSystem * param0, int param1) +u32 ov16_0223E1B4(BattleSystem *param0, int param1) { return TrainerInfo_Gender(param0->trainerInfo[param1]); } @@ -492,22 +487,22 @@ int BattleSystem_BattlerOfType(BattleSystem *battleSys, int type) return i; } -u8 BattleSystem_BattlerSlot (BattleSystem *battleSys, int battler) +u8 BattleSystem_BattlerSlot(BattleSystem *battleSys, int battler) { return Battler_Type(battleSys->battlers[battler]); } -u8 Battler_Side (BattleSystem * param0, int param1) +u8 Battler_Side(BattleSystem *param0, int param1) { return Battler_Type(param0->battlers[param1]) & 1; } -void * ov16_0223E220 (BattleSystem * param0) +void *ov16_0223E220(BattleSystem *param0) { return param0->unk_1AC; } -PCBoxes * ov16_0223E228 (BattleSystem * param0) +PCBoxes *ov16_0223E228(BattleSystem *param0) { return param0->pcBoxes; } @@ -521,17 +516,17 @@ enum Terrain BattleSystem_Terrain(BattleSystem *battleSys) return battleSys->terrain; } -int ov16_0223E240 (BattleSystem * param0) +int ov16_0223E240(BattleSystem *param0) { return param0->unk_2400; } -int BattleSystem_MapHeader (BattleSystem * param0) +int BattleSystem_MapHeader(BattleSystem *param0) { return param0->unk_2404; } -int BattleSystem_Partner (BattleSystem *battleSys, int battler) +int BattleSystem_Partner(BattleSystem *battleSys, int battler) { int i; int maxBattlers = BattleSystem_MaxBattlers(battleSys); @@ -563,8 +558,8 @@ int BattleSystem_EnemyInSlot(BattleSystem *battleSys, int attacker, int slot) int battler; for (battler = 0; battler < maxBattlers; battler++) { if (battler != attacker - && (BattleSystem_BattlerSlot(battleSys, battler) & 2) == slot - && Battler_Side(battleSys, battler) != Battler_Side(battleSys, attacker)) { + && (BattleSystem_BattlerSlot(battleSys, battler) & 2) == slot + && Battler_Side(battleSys, battler) != Battler_Side(battleSys, attacker)) { break; } } @@ -583,8 +578,8 @@ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot int targetSlot; if (BattleSystem_BattleType(battleSys) == BATTLE_TYPE_TRAINER_DOUBLES - || ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) - && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_THEM) == FALSE)) { + || ((BattleSystem_BattleType(battleSys) & BATTLE_TYPE_TAG) + && (BattleSystem_BattlerSlot(battleSys, battler) & BATTLER_THEM) == FALSE)) { targetSlot = BattleContext_Get(battleSys, battleCtx, BATTLECTX_SELECTED_PARTY_SLOT, BattleSystem_Partner(battleSys, battler)); if (targetSlot == partySlot) { battler = BattleSystem_Partner(battleSys, battler); @@ -681,7 +676,7 @@ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot } if (Item_LoadParam(item, ITEM_PARAM_HEAL_CONFUSION, HEAP_ID_BATTLE) - && (selectedSlot == partySlot || targetSlot == partySlot)) { + && (selectedSlot == partySlot || targetSlot == partySlot)) { param = BattleMon_Get(battleCtx, battler, BATTLEMON_VOLATILE_STATUS, NULL); if (param & VOLATILE_CONDITION_CONFUSION) { param &= ~VOLATILE_CONDITION_CONFUSION; @@ -691,7 +686,7 @@ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot } if (Item_LoadParam(item, ITEM_PARAM_HEAL_ATTRACT, HEAP_ID_BATTLE) - && (selectedSlot == partySlot || targetSlot == partySlot)) { + && (selectedSlot == partySlot || targetSlot == partySlot)) { param = BattleMon_Get(battleCtx, battler, BATTLEMON_VOLATILE_STATUS, NULL); if (param & VOLATILE_CONDITION_ATTRACT) { param &= ~VOLATILE_CONDITION_ATTRACT; @@ -713,49 +708,49 @@ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot } if (Item_LoadParam(item, ITEM_PARAM_ATK_STAGES, HEAP_ID_BATTLE) - && (selectedSlot == partySlot || targetSlot == partySlot) - && BattleMon_Get(battleCtx, battler, BATTLEMON_ATTACK_STAGE, NULL) < 12) { + && (selectedSlot == partySlot || targetSlot == partySlot) + && BattleMon_Get(battleCtx, battler, BATTLEMON_ATTACK_STAGE, NULL) < 12) { Battler_AddVal(battleCtx, battler, BATTLEMON_ATTACK_STAGE, 1); result = TRUE; } if (Item_LoadParam(item, ITEM_PARAM_DEF_STAGES, HEAP_ID_BATTLE) - && (selectedSlot == partySlot || targetSlot == partySlot) - && BattleMon_Get(battleCtx, battler, BATTLEMON_DEFENSE_STAGE, NULL) < 12) { + && (selectedSlot == partySlot || targetSlot == partySlot) + && BattleMon_Get(battleCtx, battler, BATTLEMON_DEFENSE_STAGE, NULL) < 12) { Battler_AddVal(battleCtx, battler, BATTLEMON_DEFENSE_STAGE, 1); result = TRUE; } if (Item_LoadParam(item, ITEM_PARAM_SPATK_STAGES, HEAP_ID_BATTLE) - && (selectedSlot == partySlot || targetSlot == partySlot) - && BattleMon_Get(battleCtx, battler, BATTLEMON_SP_ATTACK_STAGE, NULL) < 12) { + && (selectedSlot == partySlot || targetSlot == partySlot) + && BattleMon_Get(battleCtx, battler, BATTLEMON_SP_ATTACK_STAGE, NULL) < 12) { Battler_AddVal(battleCtx, battler, BATTLEMON_SP_ATTACK_STAGE, 1); result = TRUE; } if (Item_LoadParam(item, ITEM_PARAM_SPDEF_STAGES, HEAP_ID_BATTLE) - && (selectedSlot == partySlot || targetSlot == partySlot) - && BattleMon_Get(battleCtx, battler, BATTLEMON_SP_DEFENSE_STAGE, NULL) < 12) { + && (selectedSlot == partySlot || targetSlot == partySlot) + && BattleMon_Get(battleCtx, battler, BATTLEMON_SP_DEFENSE_STAGE, NULL) < 12) { Battler_AddVal(battleCtx, battler, BATTLEMON_SP_DEFENSE_STAGE, 1); result = TRUE; } if (Item_LoadParam(item, ITEM_PARAM_SPEED_STAGES, HEAP_ID_BATTLE) - && (selectedSlot == partySlot || targetSlot == partySlot) - && BattleMon_Get(battleCtx, battler, BATTLEMON_SPEED_STAGE, NULL) < 12) { + && (selectedSlot == partySlot || targetSlot == partySlot) + && BattleMon_Get(battleCtx, battler, BATTLEMON_SPEED_STAGE, NULL) < 12) { Battler_AddVal(battleCtx, battler, BATTLEMON_SPEED_STAGE, 1); result = TRUE; } if (Item_LoadParam(item, ITEM_PARAM_ACC_STAGES, HEAP_ID_BATTLE) - && (selectedSlot == partySlot || targetSlot == partySlot) - && BattleMon_Get(battleCtx, battler, BATTLEMON_ACCURACY_STAGE, NULL) < 12) { + && (selectedSlot == partySlot || targetSlot == partySlot) + && BattleMon_Get(battleCtx, battler, BATTLEMON_ACCURACY_STAGE, NULL) < 12) { Battler_AddVal(battleCtx, battler, BATTLEMON_ACCURACY_STAGE, 1); result = TRUE; } if (Item_LoadParam(item, ITEM_PARAM_CRIT_STAGES, HEAP_ID_BATTLE) - && (selectedSlot == partySlot || targetSlot == partySlot)) { + && (selectedSlot == partySlot || targetSlot == partySlot)) { param = BattleMon_Get(battleCtx, battler, BATTLEMON_VOLATILE_STATUS, NULL); if ((param & VOLATILE_CONDITION_FOCUS_ENERGY) == FALSE) { @@ -773,8 +768,8 @@ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot // Don't permit restoring PP on copied moves if ((selectedSlot == partySlot || targetSlot == partySlot) - && (BattleMon_Get(battleCtx, battler, BATTLEMON_VOLATILE_STATUS, NULL) & VOLATILE_CONDITION_TRANSFORM) == FALSE - && (BattleMon_Get(battleCtx, battler, BATTLEMON_MIMICKED_MOVE_SLOT, NULL) & FlagIndex(moveSlot)) == FALSE) { + && (BattleMon_Get(battleCtx, battler, BATTLEMON_VOLATILE_STATUS, NULL) & VOLATILE_CONDITION_TRANSFORM) == FALSE + && (BattleMon_Get(battleCtx, battler, BATTLEMON_MIMICKED_MOVE_SLOT, NULL) & FlagIndex(moveSlot)) == FALSE) { Battler_AddVal(battleCtx, battler, BATTLEMON_CUR_PP_1 + moveSlot, param); } @@ -790,8 +785,8 @@ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot Pokemon_IncreaseValue(mon, MON_DATA_MOVE1_CUR_PP + moveSlot, param); if ((selectedSlot == partySlot || targetSlot == partySlot) - && (BattleMon_Get(battleCtx, battler, BATTLEMON_VOLATILE_STATUS, NULL) & VOLATILE_CONDITION_TRANSFORM) == FALSE - && (BattleMon_Get(battleCtx, battler, BATTLEMON_MIMICKED_MOVE_SLOT, NULL) & FlagIndex(moveSlot)) == FALSE) { + && (BattleMon_Get(battleCtx, battler, BATTLEMON_VOLATILE_STATUS, NULL) & VOLATILE_CONDITION_TRANSFORM) == FALSE + && (BattleMon_Get(battleCtx, battler, BATTLEMON_MIMICKED_MOVE_SLOT, NULL) & FlagIndex(moveSlot)) == FALSE) { Battler_AddVal(battleCtx, battler, BATTLEMON_CUR_PP_1 + moveSlot, param); } @@ -854,21 +849,21 @@ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot } if (Item_LoadParam(item, ITEM_PARAM_GIVE_FRIENDSHIP_LOW, HEAP_ID_BATTLE) - && Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL) < 100 - && result == TRUE) { + && Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL) < 100 + && result == TRUE) { friendship = Item_LoadParam(item, ITEM_PARAM_FRIENDSHIP_LOW, HEAP_ID_BATTLE); } if (Item_LoadParam(item, ITEM_PARAM_GIVE_FRIENDSHIP_MED, HEAP_ID_BATTLE) - && Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL) >= 100 - && Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL) < 200 - && result == TRUE) { + && Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL) >= 100 + && Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL) < 200 + && result == TRUE) { friendship = Item_LoadParam(item, ITEM_PARAM_FRIENDSHIP_MED, HEAP_ID_BATTLE); } if (Item_LoadParam(item, ITEM_PARAM_GIVE_FRIENDSHIP_HIGH, HEAP_ID_BATTLE) - && Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL) >= 200 - && result == TRUE) { + && Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL) >= 200 + && result == TRUE) { friendship = Item_LoadParam(item, ITEM_PARAM_FRIENDSHIP_HIGH, HEAP_ID_BATTLE); } @@ -897,7 +892,7 @@ BOOL BattleSystem_UseBagItem(BattleSystem *battleSys, int battler, int partySlot return result; } -u32 BattleSystem_BattleStatus (BattleSystem *battleSys) +u32 BattleSystem_BattleStatus(BattleSystem *battleSys) { return battleSys->battleStatusMask; } @@ -907,7 +902,7 @@ enum Time BattleSystem_Time(BattleSystem *battleSys) return battleSys->time; } -int ov16_0223EC04 (BattleSystem * param0) +int ov16_0223EC04(BattleSystem *param0) { int v0; @@ -940,11 +935,11 @@ int ov16_0223EC04 (BattleSystem * param0) return v0; } -u8 ov16_0223EC58 (BattleSystem * param0, int param1, u8 param2) +u8 ov16_0223EC58(BattleSystem *param0, int param1, u8 param2) { u16 v0; - if (((BattleSystem_BattlerSlot(param0, param1) == 4) && ((param0->battleType & 0x8) == 0))) { + if ((BattleSystem_BattlerSlot(param0, param1) == 4) && ((param0->battleType & 0x8) == 0)) { if (param0->battleType & 0x4) { if ((param2 & FlagIndex(BattleSystem_Partner(param0, param1))) == 0) { return 1; @@ -963,9 +958,9 @@ u8 ov16_0223EC58 (BattleSystem * param0, int param1, u8 param2) return 0; } -u16 ov16_0223ECC4 (BattleParams * param0, int * param1, int * param2) +u16 ov16_0223ECC4(BattleParams *param0, int *param1, int *param2) { - Pokemon * v0; + Pokemon *v0; u16 v1; v1 = 0; @@ -994,28 +989,28 @@ u16 ov16_0223ECC4 (BattleParams * param0, int * param1, int * param2) return v1; } -u8 ov16_0223ED60 (BattleSystem * param0) +u8 ov16_0223ED60(BattleSystem *param0) { return param0->unk_23F8; } -u8 ov16_0223ED6C (BattleSystem * param0) +u8 ov16_0223ED6C(BattleSystem *param0) { GF_ASSERT(param0->battleCtx != NULL); return BattleContext_Get(param0, param0->battleCtx, 5, NULL); } -int BattleSystem_NumSafariBalls (BattleSystem * param0) +int BattleSystem_NumSafariBalls(BattleSystem *param0) { return param0->safariBalls; } -void BattleSystem_SetSafariBalls (BattleSystem * param0, int param1) +void BattleSystem_SetSafariBalls(BattleSystem *param0, int param1) { param0->safariBalls = param1; } -Options * ov16_0223EDA4 (BattleSystem * param0) +Options *ov16_0223EDA4(BattleSystem *param0) { return param0->unk_1B0; } @@ -1023,19 +1018,19 @@ Options * ov16_0223EDA4 (BattleSystem * param0) BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys) { if ((battleSys->battleType & BATTLE_TYPE_LINK) - && (battleSys->battleStatusMask & BATTLE_STATUS_RECORDING) == FALSE) { + && (battleSys->battleStatusMask & BATTLE_STATUS_RECORDING) == FALSE) { return TRUE; } return Options_BattleScene(battleSys->unk_1B0) == OPTIONS_BATTLE_SCENE_ON; } -int ov16_0223EDE0 (BattleSystem * param0) +int ov16_0223EDE0(BattleSystem *param0) { return Options_Frame(param0->unk_1B0); } -u8 BattleSystem_TextSpeed (BattleSystem * param0) +u8 BattleSystem_TextSpeed(BattleSystem *param0) { if ((param0->battleType & 0x4) && ((param0->battleStatusMask & 0x10) == 0)) { return 1; @@ -1044,17 +1039,17 @@ u8 BattleSystem_TextSpeed (BattleSystem * param0) return Options_TextFrameDelay(param0->unk_1B0); } -int BattleSystem_Ruleset (BattleSystem * param0) +int BattleSystem_Ruleset(BattleSystem *param0) { return Options_BattleStyle(param0->unk_1B0); } -PokemonAnimationSys * ov16_0223EE28 (BattleSystem * param0) +PokemonAnimationSys *ov16_0223EE28(BattleSystem *param0) { return param0->unk_1C4; } -ChatotCry * BattleSystem_ChatotVoice (BattleSystem * param0, int param1) +ChatotCry *BattleSystem_ChatotVoice(BattleSystem *param0, int param1) { if ((param0->battleType & 0x8) || ((param0->battleType & 0x10) && (BattleSystem_BattlerSlot(param0, param1) & 0x1))) { return param0->unk_78[param1]; @@ -1065,10 +1060,10 @@ ChatotCry * BattleSystem_ChatotVoice (BattleSystem * param0, int param1) } } -void ov16_0223EE70 (BattleSystem * param0) +void ov16_0223EE70(BattleSystem *param0) { int v0, v1; - Pokemon * v2; + Pokemon *v2; u16 v3; if (param0->battleType & (0x4 | 0x80 | 0x20 | 0x200)) { @@ -1114,28 +1109,28 @@ void ov16_0223EE70 (BattleSystem * param0) } } -void ov16_0223EF2C (BattleSystem * param0, int param1, int param2) +void ov16_0223EF2C(BattleSystem *param0, int param1, int param2) { param0->unk_2414[param1] |= FlagIndex(param2); } -void ov16_0223EF48 (BattleSystem * param0, Pokemon * param1) +void ov16_0223EF48(BattleSystem *param0, Pokemon *param1) { if (param0->poketchData) { PoketchData_PokemonHistoryEnqueue(param0->poketchData, Pokemon_GetBoxPokemon(param1)); } } -void ov16_0223EF68 (BattleSystem * param0, Pokemon * param1) +void ov16_0223EF68(BattleSystem *param0, Pokemon *param1) { sub_0206D160(param0->unk_9C, param1, param0->resultMask, param0->unk_241E, 5); } -void ov16_0223EF8C (BattleSystem * param0) +void ov16_0223EF8C(BattleSystem *param0) { - NNSG2dImageProxy * v0; + NNSG2dImageProxy *v0; int v1, v2, v3, v4, v5, v6; - u8 * v7; + u8 *v7; param0->unk_21C = Heap_AllocFromHeap(5, 0x10000); param0->unk_220 = Heap_AllocFromHeap(5, 0x200); @@ -1215,27 +1210,27 @@ void ov16_0223EF8C (BattleSystem * param0) ov16_02268700(¶m0->unk_17C[1]); } -u8 * ov16_0223F1E8 (BattleSystem * param0) +u8 *ov16_0223F1E8(BattleSystem *param0) { return param0->unk_21C; } -u16 * ov16_0223F1F0 (BattleSystem * param0) +u16 *ov16_0223F1F0(BattleSystem *param0) { return param0->unk_220; } -int ov16_0223F1F8 (BattleSystem * param0) +int ov16_0223F1F8(BattleSystem *param0) { return param0->unk_2424; } -u16 * ov16_0223F204 (BattleSystem * param0) +u16 *ov16_0223F204(BattleSystem *param0) { return ¶m0->unk_2224[0]; } -u16 * ov16_0223F210 (BattleSystem * param0) +u16 *ov16_0223F210(BattleSystem *param0) { return ¶m0->unk_2304[0]; } @@ -1245,22 +1240,22 @@ int BattleSystem_FieldWeather(BattleSystem *battleSys) return battleSys->fieldWeather; } -u8 ov16_0223F228 (BattleSystem * param0) +u8 ov16_0223F228(BattleSystem *param0) { return param0->unk_241D; } -void ov16_0223F234 (BattleSystem * param0, u8 param1) +void ov16_0223F234(BattleSystem *param0, u8 param1) { param0->unk_241D = param1; } -int ov16_0223F240 (BattleSystem * param0) +int ov16_0223F240(BattleSystem *param0) { return param0->unk_242C; } -void ov16_0223F24C (BattleSystem * param0, int param1) +void ov16_0223F24C(BattleSystem *param0, int param1) { if (param0->battleStatusMask & 0x10) { return; @@ -1269,7 +1264,7 @@ void ov16_0223F24C (BattleSystem * param0, int param1) sub_0202CF28(param0->unk_218, param1); } -void ov16_0223F268 (BattleSystem * param0) +void ov16_0223F268(BattleSystem *param0) { if (param0->battleStatusMask & 0x10) { return; @@ -1278,94 +1273,94 @@ void ov16_0223F268 (BattleSystem * param0) sub_0202CFEC(param0->unk_218, 22); } -void BattleSystem_SetCommandSelectionFlags (BattleSystem *battleSys, int flags) +void BattleSystem_SetCommandSelectionFlags(BattleSystem *battleSys, int flags) { battleSys->commandSelectionFlags = flags; } -void ov16_0223F290 (BattleSystem * param0, int param1) +void ov16_0223F290(BattleSystem *param0, int param1) { param0->unk_2440 = param1; } -void * Battle_WaitDial (BattleSystem * param0) +void *Battle_WaitDial(BattleSystem *param0) { return param0->unk_1B8; } -void Battle_SetWaitDial (BattleSystem * param0, void * param1) +void Battle_SetWaitDial(BattleSystem *param0, void *param1) { param0->unk_1B8 = param1; } -UnkStruct_ov16_0223E0C8 * ov16_0223F2AC (BattleSystem * param0, int param1) +UnkStruct_ov16_0223E0C8 *ov16_0223F2AC(BattleSystem *param0, int param1) { return ¶m0->unk_1CC[param1]; } -u8 * ov16_0223F2B8 (UnkStruct_ov16_0223E0C8 * param0, int param1) +u8 *ov16_0223F2B8(UnkStruct_ov16_0223E0C8 *param0, int param1) { GF_ASSERT(param1 < 4); return param0[param1].unk_00; } -void ov16_0223F2CC (UnkStruct_ov16_0223E0C8 * param0, int param1, int param2) +void ov16_0223F2CC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2) { GF_ASSERT(param1 < 4); param0[param1].unk_04 = param2; } -void ov16_0223F2E4 (UnkStruct_ov16_0223E0C8 * param0, int param1, int param2) +void ov16_0223F2E4(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2) { GF_ASSERT(param1 < 4); param0[param1].unk_08 = param2; } -void ov16_0223F2FC (UnkStruct_ov16_0223E0C8 * param0, int param1, int param2) +void ov16_0223F2FC(UnkStruct_ov16_0223E0C8 *param0, int param1, int param2) { GF_ASSERT(param1 < 4); param0[param1].unk_0C = param2; } -void ov16_0223F314 (BattleSystem * param0, int param1) +void ov16_0223F314(BattleSystem *param0, int param1) { param0->unk_23F9 = param1; } -void ov16_0223F320 (BattleSystem * param0, u8 * param1) +void ov16_0223F320(BattleSystem *param0, u8 *param1) { param0->unk_23F0 = param1; } -void ov16_0223F32C (BattleSystem * param0, u8 * param1) +void ov16_0223F32C(BattleSystem *param0, u8 *param1) { param0->unk_23F4 = param1; } -void ov16_0223F338 (BattleSystem * param0, u8 param1) +void ov16_0223F338(BattleSystem *param0, u8 param1) { param0->unk_23F0[0] = param1; } -void ov16_0223F344 (BattleSystem * param0, u8 param1) +void ov16_0223F344(BattleSystem *param0, u8 param1) { param0->unk_23F4[0] = param1; } -void ov16_0223F350 (BattleSystem * param0, u8 param1) +void ov16_0223F350(BattleSystem *param0, u8 param1) { param0->unk_23FA = param1; } -void * ov16_0223F35C (BattleSystem * param0, int param1) +void *ov16_0223F35C(BattleSystem *param0, int param1) { return ov16_02263B08(param0->battlers[param1]); } -void ov16_0223F36C (BattleSystem * param0) +void ov16_0223F36C(BattleSystem *param0) { int v0; - Healthbar * v1; + Healthbar *v1; for (v0 = 0; v0 < param0->maxBattlers; v0++) { v1 = ov16_02263B08(param0->battlers[v0]); @@ -1378,10 +1373,10 @@ void ov16_0223F36C (BattleSystem * param0) } } -void ov16_0223F3BC (BattleSystem * param0) +void ov16_0223F3BC(BattleSystem *param0) { int v0; - Healthbar * v1; + Healthbar *v1; for (v0 = 0; v0 < param0->maxBattlers; v0++) { v1 = ov16_02263B08(param0->battlers[v0]); @@ -1392,10 +1387,10 @@ void ov16_0223F3BC (BattleSystem * param0) } } -void ov16_0223F3EC (BattleSystem * param0) +void ov16_0223F3EC(BattleSystem *param0) { int v0; - Healthbar * v1; + Healthbar *v1; for (v0 = 0; v0 < param0->maxBattlers; v0++) { v1 = ov16_02263B08(param0->battlers[v0]); @@ -1403,10 +1398,10 @@ void ov16_0223F3EC (BattleSystem * param0) } } -void ov16_0223F414 (BattleSystem * param0) +void ov16_0223F414(BattleSystem *param0) { int v0; - Healthbar * v1; + Healthbar *v1; for (v0 = 0; v0 < param0->maxBattlers; v0++) { v1 = ov16_02263B08(param0->battlers[v0]); @@ -1414,59 +1409,59 @@ void ov16_0223F414 (BattleSystem * param0) } } -u8 BattleSystem_ResultMask (BattleSystem * param0) +u8 BattleSystem_ResultMask(BattleSystem *param0) { return param0->resultMask; } -void BattleSystem_SetResultFlag (BattleSystem * param0, u8 param1) +void BattleSystem_SetResultFlag(BattleSystem *param0, u8 param1) { param0->resultMask = param1; } -u8 ov16_0223F450 (BattleSystem * param0) +u8 ov16_0223F450(BattleSystem *param0) { return param0->unk_23FB_3; } -void BattleSystem_SetRedHPSoundFlag (BattleSystem * param0, u8 param1) +void BattleSystem_SetRedHPSoundFlag(BattleSystem *param0, u8 param1) { param0->unk_23FB_3 = param1; } -u8 ov16_0223F47C (BattleSystem * param0) +u8 ov16_0223F47C(BattleSystem *param0) { return param0->unk_23FB_5; } -void ov16_0223F48C (BattleSystem * param0, u8 param1) +void ov16_0223F48C(BattleSystem *param0, u8 param1) { GF_ASSERT(param1 < 15); param0->unk_23FB_5 = param1; } -void ov16_0223F4B0 (BattleSystem * param0, int param1) +void ov16_0223F4B0(BattleSystem *param0, int param1) { param0->unk_2438 = param1; } -u16 BattleSystem_RandNext (BattleSystem * param0) +u16 BattleSystem_RandNext(BattleSystem *param0) { param0->unk_2444 = param0->unk_2444 * 1103515245L + 24691; return (u16)(param0->unk_2444 / 65536L); } -u32 ov16_0223F4E8 (BattleSystem * param0) +u32 ov16_0223F4E8(BattleSystem *param0) { return param0->unk_2448; } -void ov16_0223F4F4 (BattleSystem * param0, u32 param1) +void ov16_0223F4F4(BattleSystem *param0, u32 param1) { param0->unk_2448 = param1; } -void BattleSystem_Record (BattleSystem * param0, int param1, u8 param2) +void BattleSystem_Record(BattleSystem *param0, int param1, u8 param2) { if (((param0->battleStatusMask & 0x10) == 0) && (param0->unk_245C[param1] < 0x400)) { sub_0202F868(param1, param0->unk_245C[param1], param2); @@ -1474,7 +1469,7 @@ void BattleSystem_Record (BattleSystem * param0, int param1, u8 param2) } } -BOOL ov16_0223F530 (BattleSystem * param0, int param1, u8 * param2) +BOOL ov16_0223F530(BattleSystem *param0, int param1, u8 *param2) { BOOL v0; @@ -1491,7 +1486,7 @@ BOOL ov16_0223F530 (BattleSystem * param0, int param1, u8 * param2) return v0; } -u8 ov16_0223F58C (BattleSystem * param0, u8 * param1) +u8 ov16_0223F58C(BattleSystem *param0, u8 *param1) { u8 v0, v1; u8 v2 = 0; @@ -1513,7 +1508,7 @@ u8 ov16_0223F58C (BattleSystem * param0, u8 * param1) return v2; } -void ov16_0223F638 (BattleSystem * param0, u16 param1, u8 * param2) +void ov16_0223F638(BattleSystem *param0, u16 param1, u8 *param2) { int v0; u8 v1; @@ -1540,33 +1535,33 @@ void ov16_0223F638 (BattleSystem * param0, u16 param1, u8 * param2) } } -static u8 ov16_0223F6D4 (u8 * param0, u8 * param1, u16 * param2) +static u8 ov16_0223F6D4(u8 *param0, u8 *param1, u16 *param2) { param2[0]--; return param0[param1[0]++]; } -u16 ov16_0223F6E4 (BattleSystem * param0) +u16 ov16_0223F6E4(BattleSystem *param0) { return param0->unk_2442; } -int ov16_0223F6F0 (BattleSystem * param0, u16 param1) +int ov16_0223F6F0(BattleSystem *param0, u16 param1) { return param0->unk_2464[param1]; } -u16 BattleSystem_TrainerItems (BattleSystem * param0, int param1, int param2) +u16 BattleSystem_TrainerItems(BattleSystem *param0, int param1, int param2) { return param0->trainers[param1].items[param2]; } -u32 BattleSystem_RecordingStopped (BattleSystem * param0) +u32 BattleSystem_RecordingStopped(BattleSystem *param0) { return param0->unk_2474_0; } -void BattleSystem_SetStopRecording (BattleSystem *battleSys, int flag) +void BattleSystem_SetStopRecording(BattleSystem *battleSys, int flag) { if (((battleSys->battleStatusMask & BATTLE_STATUS_RECORDING) == FALSE) || (battleSys->unk_2474_0) || (BattleContext_Get(battleSys, battleSys->battleCtx, 13, 0) == 43) || (BattleContext_Get(battleSys, battleSys->battleCtx, 14, 0) == 43)) { return; @@ -1583,7 +1578,7 @@ void BattleSystem_SetStopRecording (BattleSystem *battleSys, int flag) return; } -BOOL ov16_0223F7A4 (BattleSystem * param0) +BOOL ov16_0223F7A4(BattleSystem *param0) { if (((param0->battleStatusMask & 0x10) == 0) || (param0->unk_2474_0) || (BattleContext_Get(param0, param0->battleCtx, 13, 0) == 43) || (BattleContext_Get(param0, param0->battleCtx, 14, 0) == 43)) { return 0; @@ -1592,17 +1587,17 @@ BOOL ov16_0223F7A4 (BattleSystem * param0) return 1; } -void BattleSystem_ShowStopPlaybackButton (BattleSystem *battleSys) +void BattleSystem_ShowStopPlaybackButton(BattleSystem *battleSys) { if ((battleSys->battleStatusMask & BATTLE_STATUS_RECORDING) == FALSE - || battleSys->playbackStopButton) { + || battleSys->playbackStopButton) { return; } battleSys->playbackStopButton = ov16_0226E148(battleSys); } -u8 BattleSystem_RecordedChatter (BattleSystem * param0, int param1) +u8 BattleSystem_RecordedChatter(BattleSystem *param0, int param1) { if ((param0->battleType & 0x8) || ((param0->battleType & 0x10) && (BattleSystem_BattlerSlot(param0, param1) & 0x1))) { return param0->unk_247C[param1]; @@ -1613,7 +1608,7 @@ u8 BattleSystem_RecordedChatter (BattleSystem * param0, int param1) } } -void ov16_0223F858 (BattleSystem * param0, u8 * param1) +void ov16_0223F858(BattleSystem *param0, u8 *param1) { int v0; @@ -1622,7 +1617,7 @@ void ov16_0223F858 (BattleSystem * param0, u8 * param1) } } -void ov16_0223F87C (BattleSystem * param0, u8 * param1) +void ov16_0223F87C(BattleSystem *param0, u8 *param1) { int v0; @@ -1635,7 +1630,7 @@ void ov16_0223F87C (BattleSystem * param0, u8 * param1) } } -void ov16_0223F8AC (BattleSystem * param0, Sprite ** param1) +void ov16_0223F8AC(BattleSystem *param0, Sprite **param1) { int v0; @@ -1648,10 +1643,10 @@ void ov16_0223F8AC (BattleSystem * param0, Sprite ** param1) } } -void BattleSystem_SetGaugePriority (BattleSystem * param0, int param1) +void BattleSystem_SetGaugePriority(BattleSystem *param0, int param1) { int v0; - Healthbar * v1; + Healthbar *v1; for (v0 = 0; v0 < param0->maxBattlers; v0++) { v1 = ov16_02263B08(param0->battlers[v0]); @@ -1662,7 +1657,15 @@ void BattleSystem_SetGaugePriority (BattleSystem * param0, int param1) u32 BattleSystem_CalcMoneyPenalty(Party *party, TrainerInfo *trainerInfo) { static const u8 badgeMul[] = { - 2, 4, 6, 9, 12, 16, 20, 25, 30, + 2, + 4, + 6, + 9, + 12, + 16, + 20, + 25, + 30, }; u8 badges = TrainerInfo_BadgeCount(trainerInfo); @@ -1676,10 +1679,10 @@ u32 BattleSystem_CalcMoneyPenalty(Party *party, TrainerInfo *trainerInfo) return penalty; } -void BattleSystem_DexFlagSeen (BattleSystem * param0, int param1) +void BattleSystem_DexFlagSeen(BattleSystem *param0, int param1) { int v0; - Pokemon * v1; + Pokemon *v1; int v2; v0 = Battler_Type(param0->battlers[param1]); @@ -1697,7 +1700,7 @@ void BattleSystem_DexFlagSeen (BattleSystem * param0, int param1) } } -void ov16_0223F9A0 (BattleSystem * param0, int param1) +void ov16_0223F9A0(BattleSystem *param0, int param1) { int v0; @@ -1706,7 +1709,7 @@ void ov16_0223F9A0 (BattleSystem * param0, int param1) if ((param0->battleType & (0x4 | 0x80)) == 0) { if (v0 & 0x1) { { - Pokemon * v1; + Pokemon *v1; int v2; v2 = BattleContext_Get(param0, param0->battleCtx, 2, param1); @@ -1723,20 +1726,20 @@ BOOL BattleSystem_CaughtSpecies(BattleSystem *battleSys, int species) return Pokedex_CaughtSpecies(battleSys->pokedex, species); } -void Battle_SetDefaultBlend (void) +void Battle_SetDefaultBlend(void) { G2_BlendNone(); } -u8 ov16_0223F9FC (BattleSystem * param0, int param1, int param2, int param3, int param4) +u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int param4) { - Window * v0 = BattleSystem_Window(param0, 0); + Window *v0 = BattleSystem_Window(param0, 0); int v1; if (param0->battleType & 0x80) { if (param1 == 10000) { { - Strbuf* v2; + Strbuf *v2; if (param3 == 100) { v2 = sub_02014B34(¶m0->trainers[param2].winMsg, 5); @@ -1750,8 +1753,8 @@ u8 ov16_0223F9FC (BattleSystem * param0, int param1, int param2, int param3, int } } else { { - MessageLoader * v3; - Strbuf* v4; + MessageLoader *v3; + Strbuf *v4; int v5; u32 v6; int v7; @@ -1806,7 +1809,7 @@ u8 BattleMessage_Print(BattleSystem *battleSys, MessageLoader *msgLoader, Battle return PrintStringSimple(textWindow, 1, battleSys->msgBuffer, 0, 0, renderDelay, BattleMessage_Callback); } -u8 BattleMessage_PrintToWindow (BattleSystem * param0, Window * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8) +u8 BattleMessage_PrintToWindow(BattleSystem *param0, Window *param1, MessageLoader *param2, BattleMessage *param3, int param4, int param5, int param6, int param7, int param8) { int v0; @@ -1830,12 +1833,12 @@ u8 BattleMessage_PrintToWindow (BattleSystem * param0, Window * param1, MessageL /** * @brief Check what side of the battle the incoming message applies to, and update * the message's bank ID as appropriate. - * + * * This routine is responsible for shifting the message ID for messages that have * separate entries for the player, an enemy trainer, and a wild Pokemon. - * - * @param battleSys - * @param battleMsg + * + * @param battleSys + * @param battleMsg */ static void BattleMessage_CheckSide(BattleSystem *battleSys, BattleMessage *battleMsg) { @@ -1992,9 +1995,9 @@ static void BattleMessage_CheckSide(BattleSystem *battleSys, BattleMessage *batt /** * @brief Fill formatting buffers with data from the battle message parameters, according * to the message's tag. - * - * @param battleSys - * @param battleMsg + * + * @param battleSys + * @param battleMsg */ static void BattleMessage_FillFormatBuffers(BattleSystem *battleSys, BattleMessage *battleMsg) { @@ -2334,30 +2337,30 @@ static void BattleMessage_FillFormatBuffers(BattleSystem *battleSys, BattleMessa } } -static void BattleMessage_Nickname (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_Nickname(BattleSystem *param0, u32 param1, int param2) { - Pokemon * v0; + Pokemon *v0; v0 = BattleSystem_PartyPokemon(param0, param2 & 0xff, (param2 & 0xff00) >> 8); StringTemplate_SetNickname(param0->strFormatter, param1, &v0->box); } -static void BattleMessage_MoveName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_MoveName(BattleSystem *param0, u32 param1, int param2) { StringTemplate_SetMoveName(param0->strFormatter, param1, param2); } -static void BattleMessage_ItemName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_ItemName(BattleSystem *param0, u32 param1, int param2) { StringTemplate_SetItemName(param0->strFormatter, param1, param2); } -static void BattleMessage_Number (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_Number(BattleSystem *param0, u32 param1, int param2) { StringTemplate_SetNumber(param0->strFormatter, param1, param2, 5, 0, 1); } -static void BattleMessage_NumberDigits (BattleSystem * param0, u32 param1, int param2, int param3) +static void BattleMessage_NumberDigits(BattleSystem *param0, u32 param1, int param2, int param3) { if (param3) { StringTemplate_SetNumber(param0->strFormatter, param1, param2, param3, 1, 1); @@ -2366,71 +2369,71 @@ static void BattleMessage_NumberDigits (BattleSystem * param0, u32 param1, int p } } -static void BattleMessage_TypeName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_TypeName(BattleSystem *param0, u32 param1, int param2) { StringTemplate_SetPokemonTypeName(param0->strFormatter, param1, param2); } -static void BattleMessage_AbilityName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_AbilityName(BattleSystem *param0, u32 param1, int param2) { StringTemplate_SetAbilityName(param0->strFormatter, param1, param2); } -static void BattleMessage_StatName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_StatName(BattleSystem *param0, u32 param1, int param2) { StringTemplate_SetPokemonStatName(param0->strFormatter, param1, param2); } -static void BattleMessage_StatusName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_StatusName(BattleSystem *param0, u32 param1, int param2) { StringTemplate_SetStatusConditionName(param0->strFormatter, param1, param2); } -static void BattleMessage_PokemonName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_PokemonName(BattleSystem *param0, u32 param1, int param2) { - Pokemon * v0; + Pokemon *v0; v0 = BattleSystem_PartyPokemon(param0, param2 & 0xff, (param2 & 0xff00) >> 8); StringTemplate_SetSpeciesName(param0->strFormatter, param1, &v0->box); } -static void BattleMessage_PoffinName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_PoffinName(BattleSystem *param0, u32 param1, int param2) { return; } -static void BattleMessage_FlavorName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_FlavorName(BattleSystem *param0, u32 param1, int param2) { StringTemplate_SetFlavorName(param0->strFormatter, param1, param2); } -static void BattleMessage_TrainerClassName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_TrainerClassName(BattleSystem *param0, u32 param1, int param2) { - TrainerData * v0; + TrainerData *v0; v0 = BattleSystem_TrainerData(param0, param2); StringTemplate_SetTrainerClassNameBattle(param0->strFormatter, param1, v0); } -static void BattleMessage_TrainerName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_TrainerName(BattleSystem *param0, u32 param1, int param2) { - TrainerData * v0; + TrainerData *v0; v0 = BattleSystem_TrainerData(param0, param2); StringTemplate_SetTrainerNameBattle(param0->strFormatter, param1, v0); } -static void BattleMessage_PCBoxName (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_PCBoxName(BattleSystem *param0, u32 param1, int param2) { StringTemplate_SetPCBoxName(param0->strFormatter, param1, param0->pcBoxes, param2); } /** * @brief Load the requested message and format it into a string to be printed to the screen. - * - * @param battleSys - * @param msgLoader - * @param battleMsg + * + * @param battleSys + * @param msgLoader + * @param battleMsg */ static void BattleMessage_Format(BattleSystem *battleSys, MessageLoader *msgLoader, BattleMessage *battleMsg) { @@ -2439,7 +2442,7 @@ static void BattleMessage_Format(BattleSystem *battleSys, MessageLoader *msgLoad Strbuf_Free(strbuf); } -static BOOL BattleMessage_Callback (UnkStruct_0201D738 * param0, u16 param1) +static BOOL BattleMessage_Callback(UnkStruct_0201D738 *param0, u16 param1) { BOOL v0; diff --git a/src/battle/ov16_02264798.c b/src/battle/ov16_02264798.c index 95bf2c8b2e..0c24dd3bbf 100644 --- a/src/battle/ov16_02264798.c +++ b/src/battle/ov16_02264798.c @@ -1,21 +1,22 @@ +#include "battle/ov16_02264798.h" + #include #include -#include "sys_task_manager.h" #include "struct_decls/battle_system.h" -#include "battle/struct_ov16_0225BFFC_decl.h" +#include "battle/ov16_0223DF00.h" +#include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_0225BFFC_t.h" -#include "unk_0200762C.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_0200762C.h" #include "unk_0201D15C.h" -#include "battle/ov16_0223DF00.h" -#include "battle/ov16_02264798.h" -static void ov16_02264800(SysTask * param0, void * param1); +static void ov16_02264800(SysTask *param0, void *param1); -void ov16_02264798 (BattlerData * param0, BattleSystem * param1) +void ov16_02264798(BattlerData *param0, BattleSystem *param1) { if (param0->unk_194 != NULL) { return; @@ -29,7 +30,7 @@ void ov16_02264798 (BattlerData * param0, BattleSystem * param1) param0->unk_194 = SysTask_Start(ov16_02264800, param0, 1010); } -void ov16_022647D8 (BattlerData * param0) +void ov16_022647D8(BattlerData *param0) { if (param0->unk_194 == NULL) { return; @@ -43,9 +44,9 @@ void ov16_022647D8 (BattlerData * param0) sub_02007DEC(param0->unk_20, 4, 0); } -static void ov16_02264800 (SysTask * param0, void * param1) +static void ov16_02264800(SysTask *param0, void *param1) { - BattlerData * v0 = param1; + BattlerData *v0 = param1; int v1; v0->unk_198 += 20; diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c index 77509cd8c3..9b07eb95f8 100644 --- a/src/battle/ov16_02268520.c +++ b/src/battle/ov16_02268520.c @@ -1,20 +1,21 @@ +#include "battle/ov16_02268520.h" + #include #include +#include "struct_decls/battle_system.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/battle_system.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" + +#include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_02268520.h" -#include "struct_defs/sprite_template.h" -#include "unk_02002F38.h" #include "narc.h" +#include "unk_02002F38.h" #include "unk_0200C6E4.h" -#include "battle/ov16_0223DF00.h" -#include "battle/ov16_02268520.h" static const SpriteTemplate Unk_ov16_022700CC[] = { { @@ -25,9 +26,16 @@ static const SpriteTemplate Unk_ov16_022700CC[] = { 0x3E8, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x4E2D, 0x4E29, 0x4E25, 0x4E25, 0xFFFFFFFF, 0xFFFFFFFF}, + { + 0x4E2D, + 0x4E29, + 0x4E25, + 0x4E25, + 0xFFFFFFFF, + 0xFFFFFFFF, + }, 0x3, - 0x0 + 0x0, }, { 0xFFFFFFFFFFFFFFB0, @@ -37,10 +45,17 @@ static const SpriteTemplate Unk_ov16_022700CC[] = { 0x3E8, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x4E2E, 0x4E29, 0x4E26, 0x4E26, 0xFFFFFFFF, 0xFFFFFFFF}, + { + 0x4E2E, + 0x4E29, + 0x4E26, + 0x4E26, + 0xFFFFFFFF, + 0xFFFFFFFF, + }, 0x3, - 0x0 - } + 0x0, + }, }; __attribute__((aligned(4))) static const u16 Unk_ov16_0227009C[] = { @@ -67,7 +82,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov16_0227009C[] = { 0xA9, 0xAB, 0xAD, - 0xAF + 0xAF, }; __attribute__((aligned(4))) static const u16 Unk_ov16_0227006C[] = { @@ -94,7 +109,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov16_0227006C[] = { 0xAA, 0xAC, 0xAE, - 0xB0 + 0xB0, }; __attribute__((aligned(4))) static const u16 Unk_ov16_02270134[][3] = { @@ -169,17 +184,17 @@ __attribute__((aligned(4))) static const u16 Unk_ov16_02270134[][3] = { 0x42, 0x43, 0x44, - 0x45 + 0x45, }; -void ov16_02268520 (UnkStruct_ov16_02268520 * param0) +void ov16_02268520(UnkStruct_ov16_02268520 *param0) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - const SpriteTemplate * v2; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + const SpriteTemplate *v2; int v3, v4, v5, v6, v7, v8; int v9; - NARC * v10; + NARC *v10; v10 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); v0 = ov16_0223E010(param0->unk_04); @@ -211,11 +226,11 @@ void ov16_02268520 (UnkStruct_ov16_02268520 * param0) NARC_dtor(v10); } -void ov16_0226862C (UnkStruct_ov16_02268520 * param0) +void ov16_0226862C(UnkStruct_ov16_02268520 *param0) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - const SpriteTemplate * v2; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + const SpriteTemplate *v2; v0 = ov16_0223E010(param0->unk_04); v1 = ov16_0223E018(param0->unk_04); @@ -225,7 +240,7 @@ void ov16_0226862C (UnkStruct_ov16_02268520 * param0) SpriteActor_UpdateObject(param0->unk_00->unk_00); } -void ov16_02268660 (UnkStruct_ov16_02268520 * param0) +void ov16_02268660(UnkStruct_ov16_02268520 *param0) { if (param0->unk_00 == NULL) { return; @@ -235,9 +250,9 @@ void ov16_02268660 (UnkStruct_ov16_02268520 * param0) param0->unk_00 = NULL; } -void ov16_02268674 (UnkStruct_ov16_02268520 * param0) +void ov16_02268674(UnkStruct_ov16_02268520 *param0) { - SpriteGfxHandler * v0; + SpriteGfxHandler *v0; int v1, v2, v3; v0 = ov16_0223E018(param0->unk_04); @@ -258,7 +273,7 @@ void ov16_02268674 (UnkStruct_ov16_02268520 * param0) SpriteGfxHandler_UnloadAnimObjById(v0, v3); } -void ov16_022686BC (UnkStruct_ov16_02268520 * param0, int param1) +void ov16_022686BC(UnkStruct_ov16_02268520 *param0, int param1) { if (param0->unk_00 == NULL) { return; @@ -267,7 +282,7 @@ void ov16_022686BC (UnkStruct_ov16_02268520 * param0, int param1) SpriteActor_EnableObject(param0->unk_00, param1); } -void ov16_022686CC (UnkStruct_ov16_02268520 * param0, BattleSystem * param1, u16 param2, int param3) +void ov16_022686CC(UnkStruct_ov16_02268520 *param0, BattleSystem *param1, u16 param2, int param3) { MI_CpuClearFast(param0, sizeof(UnkStruct_ov16_02268520)); @@ -284,7 +299,7 @@ void ov16_022686CC (UnkStruct_ov16_02268520 * param0, BattleSystem * param1, u16 ov16_0226862C(param0); } -void ov16_02268700 (UnkStruct_ov16_02268520 * param0) +void ov16_02268700(UnkStruct_ov16_02268520 *param0) { ov16_02268660(param0); ov16_02268674(param0); diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 79b60e7aa3..c13c957f7c 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -1,77 +1,74 @@ +#include "battle/ov16_0226871C.h" + #include #include -#include "inlines.h" -#include "assert.h" -#include "core_sys.h" -#include "enums.h" - +#include "struct_decls/battle_system.h" +#include "struct_decls/font_oam.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02012B20_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "pokemon.h" -#include "struct_decls/battle_system.h" -#include "battle/struct_ov16_0226DC24_decl.h" -#include "battle/struct_ov16_0226DEEC_decl.h" - +#include "struct_defs/sprite_manager_allocation.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "sys_task_manager.h" -#include "struct_defs/sprite_manager_allocation.h" -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0209C370.h" + +#include "battle/battle_display.h" +#include "battle/ov16_0223DF00.h" +#include "battle/ov16_0226DB7C.h" +#include "battle/ov16_0226DE44.h" #include "battle/struct_ov16_02260C00.h" #include "battle/struct_ov16_02260F14.h" #include "battle/struct_ov16_022623F0.h" #include "battle/struct_ov16_02269668.h" #include "battle/struct_ov16_0226AC98.h" #include "battle/struct_ov16_0226C378.h" +#include "battle/struct_ov16_0226DC24_decl.h" +#include "battle/struct_ov16_0226DEEC_decl.h" +#include "overlay011/ov11_0221F800.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "struct_defs/sprite_template.h" +#include "assert.h" +#include "core_sys.h" +#include "enums.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "message_util.h" +#include "move_table.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_02012744.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "pokemon.h" -#include "move_table.h" -#include "pokemon_icon.h" #include "unk_0207C908.h" #include "unk_0208C098.h" -#include "overlay011/ov11_0221F800.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_display.h" -#include "battle/ov16_0226871C.h" -#include "battle/ov16_0226DB7C.h" -#include "battle/ov16_0226DE44.h" typedef struct { - UnkStruct_ov16_02268A14 * unk_00; - SysTask * unk_04; + UnkStruct_ov16_02268A14 *unk_00; + SysTask *unk_04; s16 unk_08; s16 unk_0A; s16 unk_0C; @@ -103,10 +100,10 @@ typedef struct { } UnkStruct_ov16_0226A3F4; typedef struct { - SysTask * unk_00; - u8 * unk_04; - void * unk_08; - u8 * unk_0C; + SysTask *unk_00; + u8 *unk_04; + void *unk_08; + u8 *unk_0C; UnkStruct_ov16_0226A3F4 unk_10; u16 unk_1C; } UnkStruct_ov16_02268A14_sub3_sub1; @@ -122,8 +119,8 @@ typedef struct { int unk_00; } unk_04_val2; struct { - const s16 * unk_00; - const UnkStruct_ov16_022702F4 * unk_04; + const s16 *unk_00; + const UnkStruct_ov16_022702F4 *unk_04; int unk_08; u8 unk_0C; u8 unk_0D; @@ -133,10 +130,10 @@ typedef struct { UnkStruct_ov16_02270294 unk_11; } unk_04_val3; struct { - UnkStruct_ov16_02268A14_sub3_sub1 * unk_00[4]; - UnkStruct_ov16_02268A14_sub3_sub1 * unk_10; - NNSG2dCharacterData * unk_14; - void * unk_18; + UnkStruct_ov16_02268A14_sub3_sub1 *unk_00[4]; + UnkStruct_ov16_02268A14_sub3_sub1 *unk_10; + NNSG2dCharacterData *unk_14; + void *unk_18; int unk_1C; } unk_04_val4; s16 unk_04_val5[2]; @@ -152,13 +149,13 @@ typedef struct { } UnkStruct_ov16_02268A14_sub4; typedef struct { - const UnkStruct_ov16_022702F4 * unk_00; + const UnkStruct_ov16_022702F4 *unk_00; u8 unk_04; s8 unk_05; } UnkStruct_ov16_02268A14_sub1; typedef struct { - FontOAM * unk_00; + FontOAM *unk_00; SpriteManagerAllocation unk_04; u16 unk_10; } UnkStruct_ov16_0226A98C; @@ -196,37 +193,37 @@ typedef struct { typedef struct { UnkStruct_ov16_0226AC98 unk_00; - u16 * unk_18[4]; + u16 *unk_18[4]; UnkStruct_ov16_0226AEA0 unk_28[4]; UnkStruct_ov16_0226AEA0 unk_78[4]; UnkStruct_ov16_0226AEA0 unk_C8[4]; } UnkStruct_ov16_0226ABD4; typedef struct UnkStruct_ov16_02268A14_t { - BattleSystem * unk_00; - UnkStruct_0209C370 * unk_04; - SysTask * unk_08; - SysTask * unk_0C; - SysTask * unk_10; + BattleSystem *unk_00; + UnkStruct_0209C370 *unk_04; + SysTask *unk_08; + SysTask *unk_0C; + SysTask *unk_10; UnkStruct_ov16_02268A14_sub1 unk_14; UnkStruct_ov16_02268A14_sub2 unk_1A; - u16 * unk_3C[7]; - u16 * unk_58; - u16 * unk_5C; - u16 * unk_60; - SysTask * unk_64; + u16 *unk_3C[7]; + u16 *unk_58; + u16 *unk_5C; + u16 *unk_60; + SysTask *unk_64; UnkStruct_ov16_0226ABD4 unk_68[4]; - UnkStruct_02012744 * unk_4C8; + UnkStruct_02012744 *unk_4C8; UnkStruct_ov16_0226A98C unk_4CC[13]; - UnkStruct_02012B20 * unk_5B8; - CellActorData * unk_5BC[6]; - CellActorData * unk_5D4[6]; - CellActorData * unk_5EC[4]; - CellActorData * unk_5FC[4]; - CellActorData * unk_60C[4]; - SysTask * unk_61C[4]; + UnkStruct_02012B20 *unk_5B8; + CellActorData *unk_5BC[6]; + CellActorData *unk_5D4[6]; + CellActorData *unk_5EC[4]; + CellActorData *unk_5FC[4]; + CellActorData *unk_60C[4]; + SysTask *unk_61C[4]; UnkStruct_ov16_02268FCC unk_62C[6]; - SysTask * unk_664; + SysTask *unk_664; u8 unk_668; u8 unk_669; u8 unk_66A; @@ -239,18 +236,18 @@ typedef struct UnkStruct_ov16_02268A14_t { s16 unk_672; u8 unk_674; s16 unk_676; - SysTask * unk_678; + SysTask *unk_678; UnkStruct_ov16_02268A14_sub3 unk_67C; UnkStruct_ov16_02268A14_sub4 unk_6A0; s32 unk_6AC; s32 unk_6B0; s32 unk_6B4; - UnkStruct_ov16_0226DC24 * unk_6B8; + UnkStruct_ov16_0226DC24 *unk_6B8; UnkStruct_ov16_0226CB10 unk_6BC; u8 unk_6C0; u8 unk_6C1; struct { - UnkStruct_ov16_0226DEEC * unk_00; + UnkStruct_ov16_0226DEEC *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; @@ -278,102 +275,102 @@ typedef struct { }; u16 unk_0C_val2[4]; }; - const TouchScreenRect * unk_14; - const int * unk_18; - const u8 * unk_1C; - int (* unk_20)(UnkStruct_ov16_02268A14 * param0, int param1); - void (* unk_24)(UnkStruct_ov16_02268A14 * param0, int param1); - void (* unk_28)(UnkStruct_ov16_02268A14 * param0, int param1, int param2); - int (* unk_2C)(UnkStruct_ov16_02268A14 * param0, int param1, int param2); + const TouchScreenRect *unk_14; + const int *unk_18; + const u8 *unk_1C; + int (*unk_20)(UnkStruct_ov16_02268A14 *param0, int param1); + void (*unk_24)(UnkStruct_ov16_02268A14 *param0, int param1); + void (*unk_28)(UnkStruct_ov16_02268A14 *param0, int param1, int param2); + int (*unk_2C)(UnkStruct_ov16_02268A14 *param0, int param1, int param2); } UnkStruct_ov16_02270670; -static void * ov16_0226871C(void); -static void ov16_02269654(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_02269668(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_022698A8(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_022698BC(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_02269924(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_02269938(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_02269E94(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static int ov16_0226A318(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static int ov16_0226A3F4(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_022699AC(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_0226AF0C(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226AFF4(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226B028(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226B2BC(SysTaskFunc param0, UnkStruct_ov16_02268A14 * param1); -static void ov16_0226B2F0(UnkStruct_ov16_02268A14 * param0); -static int ov16_0226A4A4(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static int ov16_0226A634(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static int ov16_0226A528(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_02269C7C(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_02269D14(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_02269DB0(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_02269F68(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_0226A04C(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_0226A12C(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_0226B06C(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_0226B088(UnkStruct_ov16_02268A14 * param0, int param1); -static void ov16_0226B0DC(UnkStruct_ov16_02268A14 * param0, int param1); +static void *ov16_0226871C(void); +static void ov16_02269654(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_02269668(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_022698A8(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_022698BC(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_02269924(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_02269938(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static int ov16_0226A318(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static int ov16_0226A3F4(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_0226AF0C(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226AFF4(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226B028(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226B2BC(SysTaskFunc param0, UnkStruct_ov16_02268A14 *param1); +static void ov16_0226B2F0(UnkStruct_ov16_02268A14 *param0); +static int ov16_0226A4A4(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static int ov16_0226A634(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static int ov16_0226A528(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_02269C7C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_02269D14(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_02269DB0(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_02269F68(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_0226A04C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_0226B06C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_0226B088(UnkStruct_ov16_02268A14 *param0, int param1); +static void ov16_0226B0DC(UnkStruct_ov16_02268A14 *param0, int param1); static int ov16_0226A934(u8 param0); -static void ov16_02268F00(UnkStruct_ov16_02268A14 * param0); -void ov16_02269168(UnkStruct_ov16_02268A14 * param0, u8 param1[], u8 param2[]); -void ov16_022691BC(UnkStruct_ov16_02268A14 * param0); -void ov16_02269218(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226BC50(SysTask * param0, void * param1); +static void ov16_02268F00(UnkStruct_ov16_02268A14 *param0); +void ov16_02269168(UnkStruct_ov16_02268A14 *param0, u8 param1[], u8 param2[]); +void ov16_022691BC(UnkStruct_ov16_02268A14 *param0); +void ov16_02269218(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226BC50(SysTask *param0, void *param1); static void ov16_0226B198(void); -static void ov16_0226BCBC(SysTask * param0, void * param1); -static void ov16_0226B1C4(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_0226B1E8(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226B390(SysTask * param0, void * param1); -static void ov16_0226B4E0(SysTask * param0, void * param1); -static void ov16_0226B780(SysTask * param0, void * param1); -static void ov16_0226B264(UnkStruct_ov16_02268A14 * param0, int param1, u8 * param2, int param3); -static void ov16_0226B20C(UnkStruct_ov16_02268A14 * param0, u8 * param1, int param2); -static void ov16_0226B318(UnkStruct_ov16_02268A14 * param0, int param1); -void ov16_0226947C(UnkStruct_ov16_02268A14 * param0, int param1, int param2); -static void ov16_022694A8(SysTask * param0, void * param1); -static void ov16_0226B314(UnkStruct_ov16_02268A14 * param0, int param1); -static void ov16_0226A98C(UnkStruct_ov16_02268A14 * param0, UnkStruct_ov16_0226A98C * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 * param10); -static void ov16_0226AAC0(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226A698(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226A718(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226A768(UnkStruct_ov16_02268A14 * param0); -static CellActorData * ov16_0226A7A4(UnkStruct_ov16_02268A14 * param0, Pokemon * param1, int param2, int param3, int param4, int param5); -static void ov16_0226A928(SysTask * param0, void * param1); -static void ov16_0226B988(SysTask * param0, void * param1); -static void ov16_0226BA88(SysTask * param0, void * param1); -static void ov16_0226BB94(void * param0); +static void ov16_0226BCBC(SysTask *param0, void *param1); +static void ov16_0226B1C4(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_0226B1E8(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226B390(SysTask *param0, void *param1); +static void ov16_0226B4E0(SysTask *param0, void *param1); +static void ov16_0226B780(SysTask *param0, void *param1); +static void ov16_0226B264(UnkStruct_ov16_02268A14 *param0, int param1, u8 *param2, int param3); +static void ov16_0226B20C(UnkStruct_ov16_02268A14 *param0, u8 *param1, int param2); +static void ov16_0226B318(UnkStruct_ov16_02268A14 *param0, int param1); +void ov16_0226947C(UnkStruct_ov16_02268A14 *param0, int param1, int param2); +static void ov16_022694A8(SysTask *param0, void *param1); +static void ov16_0226B314(UnkStruct_ov16_02268A14 *param0, int param1); +static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10); +static void ov16_0226AAC0(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226A698(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226A718(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226A768(UnkStruct_ov16_02268A14 *param0); +static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *param1, int param2, int param3, int param4, int param5); +static void ov16_0226A928(SysTask *param0, void *param1); +static void ov16_0226B988(SysTask *param0, void *param1); +static void ov16_0226BA88(SysTask *param0, void *param1); +static void ov16_0226BB94(void *param0); static u32 ov16_0226B924(int param0, int param1); -void ov16_0226BCCC(UnkStruct_ov16_02268A14 * param0, int param1); -BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226BCE4(SysTask * param0, void * param1); -static void ov16_02268FCC(SysTask * param0, void * param1); -static int ov16_0226BE48(UnkStruct_ov16_02268A14 * param0); -static int ov16_0226BEC0(UnkStruct_ov16_02268A14 * param0, int param1); -static int ov16_0226C1F8(UnkStruct_ov16_02268A14 * param0, int param1); -static int ov16_0226C3C8(UnkStruct_ov16_02268A14 * param0, int param1); -static int ov16_0226CA14(UnkStruct_ov16_02268A14 * param0, int param1); -static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 * param0, int param1, int param2, const u8 * param3); -static void ov16_0226C0A0(UnkStruct_ov16_02268A14 * param0, int param1); -static void ov16_0226C378(UnkStruct_ov16_02268A14 * param0, int param1); -static void ov16_0226C9B8(UnkStruct_ov16_02268A14 * param0, int param1); -static void ov16_0226B31C(UnkStruct_ov16_02268A14 * param0, const s16 * param1, const UnkStruct_ov16_022702F4 * param2, int param3, int param4); -static UnkStruct_ov16_0226ABD4 * ov16_0226ABD4(UnkStruct_ov16_02268A14 * param0, int param1); -static void ov16_0226ABE8(UnkStruct_ov16_02268A14 * param0); -static void ov16_0226A95C(const Strbuf *param0, int param1, int * param2, int * param3); -static void ov16_0226AEA0(UnkStruct_ov16_02268A14 * param0, const Strbuf *param1, int param2, UnkStruct_ov16_0226AEA0 * param3, u32 param4); -static void ov16_0226AAF8(UnkStruct_ov16_02268A14 * param0); -static int ov16_0226C100(UnkStruct_ov16_02268A14 * param0, int param1); -static void ov16_0226BD74(SysTask * param0, void * param1); -static int ov16_0226CD18(UnkStruct_ov16_02268A14 * param0); -static int ov16_0226CD84(UnkStruct_ov16_02268A14 * param0); -static int ov16_0226CDDC(UnkStruct_ov16_02268A14 * param0); -static int ov16_0226CE34(UnkStruct_ov16_02268A14 * param0); -static void inline_ov16_0226B314(SysTaskFunc param0, UnkStruct_ov16_02268A14 * param1); -static void inline_ov16_0226B318_1(SysTask * param0, void * param1); -static void inline_ov16_0226B318_1_sub(UnkStruct_ov16_02268A14 * param0); -static void inline_ov16_0226B314_1(SysTask * param0, void * param1); +void ov16_0226BCCC(UnkStruct_ov16_02268A14 *param0, int param1); +BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226BCE4(SysTask *param0, void *param1); +static void ov16_02268FCC(SysTask *param0, void *param1); +static int ov16_0226BE48(UnkStruct_ov16_02268A14 *param0); +static int ov16_0226BEC0(UnkStruct_ov16_02268A14 *param0, int param1); +static int ov16_0226C1F8(UnkStruct_ov16_02268A14 *param0, int param1); +static int ov16_0226C3C8(UnkStruct_ov16_02268A14 *param0, int param1); +static int ov16_0226CA14(UnkStruct_ov16_02268A14 *param0, int param1); +static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2, const u8 *param3); +static void ov16_0226C0A0(UnkStruct_ov16_02268A14 *param0, int param1); +static void ov16_0226C378(UnkStruct_ov16_02268A14 *param0, int param1); +static void ov16_0226C9B8(UnkStruct_ov16_02268A14 *param0, int param1); +static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, const UnkStruct_ov16_022702F4 *param2, int param3, int param4); +static UnkStruct_ov16_0226ABD4 *ov16_0226ABD4(UnkStruct_ov16_02268A14 *param0, int param1); +static void ov16_0226ABE8(UnkStruct_ov16_02268A14 *param0); +static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *param3); +static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, int param2, UnkStruct_ov16_0226AEA0 *param3, u32 param4); +static void ov16_0226AAF8(UnkStruct_ov16_02268A14 *param0); +static int ov16_0226C100(UnkStruct_ov16_02268A14 *param0, int param1); +static void ov16_0226BD74(SysTask *param0, void *param1); +static int ov16_0226CD18(UnkStruct_ov16_02268A14 *param0); +static int ov16_0226CD84(UnkStruct_ov16_02268A14 *param0); +static int ov16_0226CDDC(UnkStruct_ov16_02268A14 *param0); +static int ov16_0226CE34(UnkStruct_ov16_02268A14 *param0); +static void inline_ov16_0226B314(SysTaskFunc param0, UnkStruct_ov16_02268A14 *param1); +static void inline_ov16_0226B318_1(SysTask *param0, void *param1); +static void inline_ov16_0226B318_1_sub(UnkStruct_ov16_02268A14 *param0); +static void inline_ov16_0226B314_1(SysTask *param0, void *param1); __attribute__((aligned(4))) static const u16 Unk_ov16_02270264[] = { 0x31, @@ -386,54 +383,54 @@ __attribute__((aligned(4))) static const u16 Unk_ov16_02270264[] = { }; __attribute__((aligned(4))) static const u16 Unk_ov16_022702B4[][2] = { - {0x20, 0x3E}, - {0xA0, 0x3E}, - {0x20, 0x7E}, - {0xA0, 0x7E} + { 0x20, 0x3E }, + { 0xA0, 0x3E }, + { 0x20, 0x7E }, + { 0xA0, 0x7E } }; __attribute__((aligned(4))) static const u16 Unk_ov16_02270284[][2] = { - {0x3B, 0x3E}, - {0xBB, 0x3E}, - {0x3B, 0x7E}, - {0xBB, 0x7E} + { 0x3B, 0x3E }, + { 0xBB, 0x3E }, + { 0x3B, 0x7E }, + { 0xBB, 0x7E } }; __attribute__((aligned(4))) static const u16 Unk_ov16_022702D4[][2] = { - {0x4C, 0x3E}, - {0xCC, 0x3E}, - {0x4C, 0x7E}, - {0xCC, 0x7E} + { 0x4C, 0x3E }, + { 0xCC, 0x3E }, + { 0x4C, 0x7E }, + { 0xCC, 0x7E } }; __attribute__((aligned(4))) static const u16 Unk_ov16_02270328[][2] = { - {0x3C, 0x74}, - {0xC4, 0x20}, - {0xC4, 0x74}, - {0x3C, 0x20}, - {0x80, 0xB2} + { 0x3C, 0x74 }, + { 0xC4, 0x20 }, + { 0xC4, 0x74 }, + { 0x3C, 0x20 }, + { 0x80, 0xB2 } }; __attribute__((aligned(4))) static const u16 Unk_ov16_02270304[][2] = { - {0x3C, 0x74}, - {0xC4, 0x38}, - {0xC4, 0x74}, - {0x3C, 0x38} + { 0x3C, 0x74 }, + { 0xC4, 0x38 }, + { 0xC4, 0x74 }, + { 0x3C, 0x38 } }; static const UnkStruct_ov97_0222DB78 Unk_ov16_02270540[] = { - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0} + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov16_02270350[] = { - {0x18, 0x90, 0x0, 0xFF}, - {0x90, 0xC0, 0x0, 0x50}, - {0x90, 0xC0, 0xB0, 0xFF}, - {0x98, 0xC0, 0x58, 0xA8}, - {0xFF, 0x0, 0x0, 0x0} + { 0x18, 0x90, 0x0, 0xFF }, + { 0x90, 0xC0, 0x0, 0x50 }, + { 0x90, 0xC0, 0xB0, 0xFF }, + { 0x98, 0xC0, 0x58, 0xA8 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const int Unk_ov16_022702A4[NELEMS(Unk_ov16_02270350) - 1] = { @@ -451,19 +448,19 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_02270A08[NELEMS(Unk_ov16_02 }; __attribute__((aligned(4))) static const u8 Unk_ov16_022701EC[2][3] = { - {0x0, 0x0, 0x0}, - {0x1, 0x3, 0x2} + { 0x0, 0x0, 0x0 }, + { 0x1, 0x3, 0x2 } }; static const TouchScreenRect Unk_ov16_02270214[] = { - {0x18, 0x90, 0x0, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x18, 0x90, 0x0, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov16_02270258[] = { - {0x28, 0x80, 0x18, 0xE8}, - {0x98, 0xC0, 0x58, 0xA8}, - {0xFF, 0x0, 0x0, 0x0} + { 0x28, 0x80, 0x18, 0xE8 }, + { 0x98, 0xC0, 0x58, 0xA8 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const int Unk_ov16_022702E4[NELEMS(Unk_ov16_02270350) - 1] = { @@ -477,17 +474,17 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_02270A04[NELEMS(Unk_ov16_02 }; __attribute__((aligned(4))) static const u8 Unk_ov16_022701CC[2][1] = { - {0x0}, - {0x1} + { 0x0 }, + { 0x1 } }; static const TouchScreenRect Unk_ov16_0227038C[] = { - {0x98, 0xC0, 0x8, 0xF8}, - {0x18, 0x50, 0x0, 0x80}, - {0x18, 0x50, 0x80, 0xFF}, - {0x58, 0x90, 0x0, 0x80}, - {0x58, 0x90, 0x80, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x98, 0xC0, 0x8, 0xF8 }, + { 0x18, 0x50, 0x0, 0x80 }, + { 0x18, 0x50, 0x80, 0xFF }, + { 0x58, 0x90, 0x0, 0x80 }, + { 0x58, 0x90, 0x80, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const int Unk_ov16_02270364[NELEMS(Unk_ov16_0227038C) - 1] = { @@ -507,15 +504,15 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_02270A14[NELEMS(Unk_ov16_02 }; __attribute__((aligned(4))) static const u8 Unk_ov16_022701E4[3][2] = { - {0x1, 0x2}, - {0x3, 0x4}, - {0x0, 0x0} + { 0x1, 0x2 }, + { 0x3, 0x4 }, + { 0x0, 0x0 } }; static const TouchScreenRect Unk_ov16_0227024C[] = { - {0x28, 0x60, 0x8, 0xF8}, - {0x70, 0xA8, 0x8, 0xF8}, - {0xFF, 0x0, 0x0, 0x0} + { 0x28, 0x60, 0x8, 0xF8 }, + { 0x70, 0xA8, 0x8, 0xF8 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const int Unk_ov16_02270224[NELEMS(Unk_ov16_0227024C) - 1] = { @@ -529,17 +526,17 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_02270A00[NELEMS(Unk_ov16_02 }; __attribute__((aligned(4))) static const u8 Unk_ov16_022701C8[2][1] = { - {0x0}, - {0x1} + { 0x0 }, + { 0x1 } }; static const TouchScreenRect Unk_ov16_022703BC[] = { - {0x58, 0x90, 0x0, 0x78}, - {0x8, 0x50, 0x88, 0xFF}, - {0x58, 0x90, 0x88, 0xFF}, - {0x8, 0x50, 0x0, 0x78}, - {0x98, 0xC0, 0x8, 0xF8}, - {0xFF, 0x0, 0x0, 0x0} + { 0x58, 0x90, 0x0, 0x78 }, + { 0x8, 0x50, 0x88, 0xFF }, + { 0x58, 0x90, 0x88, 0xFF }, + { 0x8, 0x50, 0x0, 0x78 }, + { 0x98, 0xC0, 0x8, 0xF8 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const int Unk_ov16_02270314[NELEMS(Unk_ov16_022703BC) - 1] = { @@ -559,14 +556,14 @@ __attribute__((aligned(4))) static const u8 Unk_ov16_02270A0C[NELEMS(Unk_ov16_02 }; __attribute__((aligned(4))) static const u8 Unk_ov16_022701DC[3][2] = { - {0x3, 0x1}, - {0x0, 0x2}, - {0x4, 0x4} + { 0x3, 0x1 }, + { 0x0, 0x2 }, + { 0x4, 0x4 } }; static const TouchScreenRect Unk_ov16_02270204[] = { - {0x98, 0xC0, 0x0, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x98, 0xC0, 0x0, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const int Unk_ov16_022701D8[NELEMS(Unk_ov16_02270204) - 1] = { @@ -581,250 +578,440 @@ static const UnkStruct_ov16_02270670 Unk_ov16_02270670[] = { { 0x1C, 0xF2, - {0xFFFF, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { + 0xFFFF, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x1, + 0x3, + 0x0, + }, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL }, { 0x1C, 0xF2, - {0x1, 0x2, 0x0, 0xFFFF}, - {0x2, 0x3, 0x3, 0x0}, + { + 0x1, + 0x2, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x3, + 0x3, + 0x0, + }, Unk_ov16_02270350, Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, ov16_0226C0A0, ov16_02269654, - ov16_0226A318 + ov16_0226A318, }, { 0x1C, 0xF2, - {0x1, 0x2, 0x0, 0xFFFF}, - {0x2, 0x3, 0x3, 0x0}, + { + 0x1, + 0x2, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x3, + 0x3, + 0x0, + }, Unk_ov16_02270350, Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, ov16_0226C0A0, ov16_02269654, - ov16_0226A318 + ov16_0226A318, }, { 0x1C, 0xF2, - {0x1, 0x2, 0x0, 0xFFFF}, - {0x2, 0x3, 0x3, 0x0}, + { + 0x1, + 0x2, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x3, + 0x3, + 0x0, + }, Unk_ov16_02270350, Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, ov16_0226C0A0, ov16_02269668, - ov16_0226A318 + ov16_0226A318, }, { 0x1C, 0xF2, - {0x1, 0x2, 0x0, 0xFFFF}, - {0x2, 0x3, 0x3, 0x0}, + { + 0x1, + 0x2, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x3, + 0x3, + 0x0, + }, Unk_ov16_02270350, Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, ov16_0226C0A0, ov16_02269668, - ov16_0226A318 + ov16_0226A318, }, { 0x1C, 0xF2, - {0x1, 0x2, 0x0, 0xFFFF}, - {0x2, 0x3, 0x3, 0x0}, + { + 0x1, + 0x2, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x3, + 0x3, + 0x0, + }, Unk_ov16_02270214, Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, ov16_0226C0A0, ov16_022698A8, - ov16_0226A318 + ov16_0226A318, }, { 0x1C, 0xF2, - {0x1, 0x2, 0x0, 0xFFFF}, - {0x2, 0x3, 0x3, 0x0}, + { + 0x1, + 0x2, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x3, + 0x3, + 0x0, + }, Unk_ov16_02270214, Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, ov16_0226C0A0, ov16_022698BC, - ov16_0226A318 + ov16_0226A318, }, { 0x1C, 0xF2, - {0x1, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { + 0x1, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x1, + 0x3, + 0x0, + }, Unk_ov16_02270350, Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, ov16_0226C0A0, ov16_02269654, - ov16_0226A318 + ov16_0226A318, }, { 0x1C, 0xF2, - {0x1, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { + 0x1, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x1, + 0x3, + 0x0, + }, Unk_ov16_02270350, Unk_ov16_022702A4, Unk_ov16_02270A08, ov16_0226BEC0, ov16_0226C0A0, ov16_02269668, - ov16_0226A318 + ov16_0226A318, }, { 0x1C, 0xF2, - {0x1, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x3, 0x3, 0x0}, + { + 0x1, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x3, + 0x3, + 0x0, + }, Unk_ov16_02270258, Unk_ov16_022702E4, Unk_ov16_02270A04, ov16_0226C100, NULL, ov16_02269924, - ov16_0226A318 + ov16_0226A318, }, { 0x1C, 0xF2, - {0x1, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x3, 0x3, 0x0}, + { + 0x1, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x3, + 0x3, + 0x0, + }, Unk_ov16_02270258, Unk_ov16_022702E4, Unk_ov16_02270A04, ov16_0226C100, NULL, ov16_02269938, - ov16_0226A318 + ov16_0226A318, }, { 0x1C, 0xF2, - {0x3, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { + 0x3, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x1, + 0x3, + 0x0, + }, Unk_ov16_0227038C, Unk_ov16_02270364, Unk_ov16_02270A14, ov16_0226C1F8, ov16_0226C378, ov16_022699AC, - ov16_0226A3F4 + ov16_0226A3F4, }, { 0x1C, 0xF2, - {0x4, 0x5, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { + 0x4, + 0x5, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x1, + 0x3, + 0x0, + }, Unk_ov16_022703BC, Unk_ov16_02270314, Unk_ov16_02270A0C, ov16_0226C3C8, ov16_0226C9B8, ov16_0226A12C, - ov16_0226A528 + ov16_0226A528, }, { 0x1C, 0xF2, - {0x6, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { + 0x6, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x1, + 0x3, + 0x0, + }, Unk_ov16_0227024C, Unk_ov16_02270224, Unk_ov16_02270A00, ov16_0226CA14, NULL, ov16_02269C7C, - ov16_0226A4A4 + ov16_0226A4A4, }, { 0x1C, 0xF2, - {0x6, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { + 0x6, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x1, + 0x3, + 0x0, + }, Unk_ov16_0227024C, Unk_ov16_02270224, Unk_ov16_02270A00, ov16_0226CA14, NULL, ov16_02269D14, - ov16_0226A4A4 + ov16_0226A4A4, }, { 0x1C, 0xF2, - {0x6, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { + 0x6, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x1, + 0x3, + 0x0, + }, Unk_ov16_0227024C, Unk_ov16_02270224, Unk_ov16_02270A00, ov16_0226CA14, NULL, ov16_02269DB0, - ov16_0226A4A4 + ov16_0226A4A4, }, { 0x1C, 0xF2, - {0x6, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { + 0x6, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x1, + 0x3, + 0x0, + }, Unk_ov16_0227024C, Unk_ov16_02270224, Unk_ov16_02270A00, ov16_0226CA14, NULL, ov16_02269F68, - ov16_0226A4A4 + ov16_0226A4A4, }, { 0x1C, 0xF2, - {0x6, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { + 0x6, + 0xFFFF, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x1, + 0x3, + 0x0, + }, Unk_ov16_0227024C, Unk_ov16_02270224, Unk_ov16_02270A00, ov16_0226CA14, NULL, ov16_0226A04C, - ov16_0226A4A4 + ov16_0226A4A4, }, { 0x1C, 0xF2, - {0x6, 0x4, 0x0, 0xFFFF}, - {0x2, 0x3, 0x3, 0x0}, + { + 0x6, + 0x4, + 0x0, + 0xFFFF, + }, + { + 0x2, + 0x3, + 0x3, + 0x0, + }, Unk_ov16_02270204, Unk_ov16_022701D8, Unk_ov16_022701C4, NULL, NULL, ov16_02269E94, - ov16_0226A634 - } + ov16_0226A634, + }, }; static const SpriteTemplate Unk_ov16_02270414 = { @@ -835,7 +1022,7 @@ static const SpriteTemplate Unk_ov16_02270414 = { 0xA, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x4E37, 0x4E37, 0x4E2F, 0x4E2F, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x4E37, 0x4E37, 0x4E2F, 0x4E2F, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -848,7 +1035,7 @@ static const SpriteTemplate Unk_ov16_02270448 = { 0xB, 0x1, NNS_G2D_VRAM_TYPE_2DSUB, - {0x4E38, 0x4E37, 0x4E30, 0x4E30, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x4E38, 0x4E37, 0x4E30, 0x4E30, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -861,7 +1048,7 @@ static const SpriteTemplate Unk_ov16_0227047C = { 0x64, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x4E39, 0x4E34, 0x4E31, 0x4E31, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x4E39, 0x4E34, 0x4E31, 0x4E31, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -874,39 +1061,39 @@ static const SpriteTemplate Unk_ov16_022704B0 = { 0x64, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x4E45, 0x4E36, 0x4E35, 0x4E35, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x4E45, 0x4E36, 0x4E35, 0x4E35, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; __attribute__((aligned(4))) static const s16 Unk_ov16_022703A4[][3] = { - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180} + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 } }; __attribute__((aligned(4))) static const UnkStruct_ov16_022702F4 Unk_ov16_022702F4[] = { - {0x4, 0xF, 0x2, 0x1D}, - {0x11, 0x17, 0x0, 0x9}, - {0x11, 0x17, 0x16, 0x1F}, - {0x12, 0x17, 0xB, 0x14} + { 0x4, 0xF, 0x2, 0x1D }, + { 0x11, 0x17, 0x0, 0x9 }, + { 0x11, 0x17, 0x16, 0x1F }, + { 0x12, 0x17, 0xB, 0x14 } }; __attribute__((aligned(4))) static const s16 Unk_ov16_022703F4[][3] = { - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180} + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 } }; __attribute__((aligned(4))) static const UnkStruct_ov16_022702F4 Unk_ov16_02270378[] = { - {0x2, 0x9, 0x0, 0xF}, - {0x2, 0x9, 0x10, 0x1F}, - {0xA, 0x11, 0x0, 0xF}, - {0xA, 0x11, 0x10, 0x1F}, - {0x12, 0x17, 0x1, 0x1E} + { 0x2, 0x9, 0x0, 0xF }, + { 0x2, 0x9, 0x10, 0x1F }, + { 0xA, 0x11, 0x0, 0xF }, + { 0xA, 0x11, 0x10, 0x1F }, + { 0x12, 0x17, 0x1, 0x1E } }; __attribute__((aligned(4))) static const s16 Unk_ov16_0227022C[] = { @@ -917,26 +1104,26 @@ __attribute__((aligned(4))) static const s16 Unk_ov16_0227022C[] = { }; __attribute__((aligned(4))) static const UnkStruct_ov16_022702F4 Unk_ov16_02270274[] = { - {0x3, 0x9, 0x0, 0xF}, - {0x3, 0x9, 0x10, 0x1F}, - {0xB, 0x11, 0x0, 0xF}, - {0xB, 0x11, 0x10, 0x1F} + { 0x3, 0x9, 0x0, 0xF }, + { 0x3, 0x9, 0x10, 0x1F }, + { 0xB, 0x11, 0x0, 0xF }, + { 0xB, 0x11, 0x10, 0x1F } }; __attribute__((aligned(4))) static const s16 Unk_ov16_022703D4[][3] = { - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180} + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 } }; __attribute__((aligned(4))) static const UnkStruct_ov16_022702F4 Unk_ov16_0227033C[] = { - {0xA, 0x11, 0x0, 0xE}, - {0x0, 0x9, 0x11, 0x1F}, - {0xA, 0x11, 0x11, 0x1F}, - {0x0, 0x9, 0x0, 0xE}, - {0x12, 0x17, 0x1, 0x1E} + { 0xA, 0x11, 0x0, 0xE }, + { 0x0, 0x9, 0x11, 0x1F }, + { 0xA, 0x11, 0x11, 0x1F }, + { 0x0, 0x9, 0x0, 0xE }, + { 0x12, 0x17, 0x1, 0x1E } }; __attribute__((aligned(4))) static const s16 Unk_ov16_022701FC[] = { @@ -947,20 +1134,20 @@ __attribute__((aligned(4))) static const s16 Unk_ov16_022701FC[] = { }; __attribute__((aligned(4))) static const UnkStruct_ov16_022702F4 Unk_ov16_022702C4[] = { - {0xB, 0x11, 0x0, 0xE}, - {0x1, 0x9, 0x11, 0x1F}, - {0xB, 0x11, 0x11, 0x1F}, - {0x1, 0x9, 0x0, 0xE} + { 0xB, 0x11, 0x0, 0xE }, + { 0x1, 0x9, 0x11, 0x1F }, + { 0xB, 0x11, 0x11, 0x1F }, + { 0x1, 0x9, 0x0, 0xE } }; __attribute__((aligned(4))) static const s16 Unk_ov16_02270240[][3] = { - {0x0, 0x5, 0xA}, - {0x0, 0xC0, 0x180} + { 0x0, 0x5, 0xA }, + { 0x0, 0xC0, 0x180 } }; __attribute__((aligned(4))) static const UnkStruct_ov16_022702F4 Unk_ov16_0227021C[] = { - {0xD, 0x14, 0x0, 0x1F}, - {0x4, 0xB, 0x0, 0x1F} + { 0xD, 0x14, 0x0, 0x1F }, + { 0x4, 0xB, 0x0, 0x1F } }; __attribute__((aligned(4))) static const s16 Unk_ov16_022701F4[3] = { @@ -970,63 +1157,63 @@ __attribute__((aligned(4))) static const s16 Unk_ov16_022701F4[3] = { }; __attribute__((aligned(4))) static const UnkStruct_ov16_022702F4 Unk_ov16_022701D0[] = { - {0x12, 0x17, 0x0, 0x1F} + { 0x12, 0x17, 0x0, 0x1F } }; static const UnkStruct_ov16_02270294 Unk_ov16_02270294[] = { - {0x80, 0x4C}, - {0x28, 0xA4}, - {0xD8, 0xA4}, - {0x80, 0xA8} + { 0x80, 0x4C }, + { 0x28, 0xA4 }, + { 0xD8, 0xA4 }, + { 0x80, 0xA8 } }; __attribute__((aligned(4))) static const int Unk_ov16_022705B0[][4] = { - {0x1, 0x1, 0x1, 0x1}, - {0x0, 0x1, 0x0, 0x1}, - {0x0, 0x1, 0x1, 0x1}, - {0x1, 0x1, 0x1, 0x1}, - {0x1, 0x0, 0x0, 0x0}, - {0x1, 0x0, 0x1, 0x0}, - {0x0, 0x0, 0x1, 0x0}, - {0x1, 0x1, 0x0, 0x1}, - {0x0, 0x1, 0x1, 0x1}, - {0x1, 0x1, 0x0, 0x1}, - {0x1, 0x0, 0x1, 0x0}, - {0x0, 0x1, 0x0, 0x1} + { 0x1, 0x1, 0x1, 0x1 }, + { 0x0, 0x1, 0x0, 0x1 }, + { 0x0, 0x1, 0x1, 0x1 }, + { 0x1, 0x1, 0x1, 0x1 }, + { 0x1, 0x0, 0x0, 0x0 }, + { 0x1, 0x0, 0x1, 0x0 }, + { 0x0, 0x0, 0x1, 0x0 }, + { 0x1, 0x1, 0x0, 0x1 }, + { 0x0, 0x1, 0x1, 0x1 }, + { 0x1, 0x1, 0x0, 0x1 }, + { 0x1, 0x0, 0x1, 0x0 }, + { 0x0, 0x1, 0x0, 0x1 } }; static const struct { u16 unk_00; u16 unk_02; } Unk_ov16_022704E4[] = { - {0xF3, 0x10B}, - {0xF4, 0x10C}, - {0xF5, 0x10D}, - {0xF6, 0x10E}, - {0xF7, 0x10F}, - {0xF8, 0x110}, - {0xF9, 0x111}, - {0xFA, 0x112}, - {0xFB, 0x113}, - {0xFC, 0x114}, - {0xFD, 0x115}, - {0xFE, 0x116}, - {0xFF, 0x117}, - {0x100, 0x118}, - {0x101, 0x119}, - {0x102, 0x11A}, - {0x103, 0x11B}, - {0x11C, 0x11D}, - {0xFFFF, 0xFFFF}, - {0xFFFF, 0xFFFF}, - {0xFFFF, 0xFFFF}, - {0xFFFF, 0xFFFF}, - {0xFFFF, 0xFFFF} + { 0xF3, 0x10B }, + { 0xF4, 0x10C }, + { 0xF5, 0x10D }, + { 0xF6, 0x10E }, + { 0xF7, 0x10F }, + { 0xF8, 0x110 }, + { 0xF9, 0x111 }, + { 0xFA, 0x112 }, + { 0xFB, 0x113 }, + { 0xFC, 0x114 }, + { 0xFD, 0x115 }, + { 0xFE, 0x116 }, + { 0xFF, 0x117 }, + { 0x100, 0x118 }, + { 0x101, 0x119 }, + { 0x102, 0x11A }, + { 0x103, 0x11B }, + { 0x11C, 0x11D }, + { 0xFFFF, 0xFFFF }, + { 0xFFFF, 0xFFFF }, + { 0xFFFF, 0xFFFF }, + { 0xFFFF, 0xFFFF }, + { 0xFFFF, 0xFFFF } }; -static void * ov16_0226871C (void) +static void *ov16_0226871C(void) { - UnkStruct_ov16_02268A14 * v0; + UnkStruct_ov16_02268A14 *v0; v0 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_02268A14)); MI_CpuClear8(v0, sizeof(UnkStruct_ov16_02268A14)); @@ -1035,7 +1222,7 @@ static void * ov16_0226871C (void) return v0; } -void ov16_02268744 (BGL * param0) +void ov16_02268744(BGL *param0) { int v0; @@ -1047,7 +1234,7 @@ void ov16_02268744 (BGL * param0) } } -void ov16_022687A0 (BGL * param0) +void ov16_022687A0(BGL *param0) { int v0; @@ -1057,10 +1244,10 @@ void ov16_022687A0 (BGL * param0) } } -void * ov16_022687C8 (NARC * param0, NARC * param1, BattleSystem * param2, int param3, UnkStruct_0209C370 * param4) +void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, UnkStruct_0209C370 *param4) { - UnkStruct_ov16_02268A14 * v0; - PaletteData * v1; + UnkStruct_ov16_02268A14 *v0; + PaletteData *v1; int v2; v0 = ov16_0226871C(); @@ -1086,8 +1273,8 @@ void * ov16_022687C8 (NARC * param0, NARC * param1, BattleSystem * param2, int p v0->unk_678 = SysTask_Start(ov16_0226BCE4, v0, 1310); { - NNSG2dScreenData * v3; - void * v4; + NNSG2dScreenData *v3; + void *v4; int v5; int v6; @@ -1108,7 +1295,7 @@ void * ov16_022687C8 (NARC * param0, NARC * param1, BattleSystem * param2, int p } { - u16 * v7; + u16 *v7; int v8; v8 = (BattleSystem_BattleType(param2) & 0x80) ? 340 : 242; @@ -1143,8 +1330,8 @@ void * ov16_022687C8 (NARC * param0, NARC * param1, BattleSystem * param2, int p } { - NNSG2dPaletteData * v13; - void * v14; + NNSG2dPaletteData *v13; + void *v14; int v15; v0->unk_5C = Heap_AllocFromHeap(5, 0x40); @@ -1179,7 +1366,7 @@ void * ov16_022687C8 (NARC * param0, NARC * param1, BattleSystem * param2, int p return v0; } -void ov16_02268A14 (UnkStruct_ov16_02268A14 * param0) +void ov16_02268A14(UnkStruct_ov16_02268A14 *param0) { int v0; @@ -1206,12 +1393,12 @@ void ov16_02268A14 (UnkStruct_ov16_02268A14 * param0) Heap_FreeToHeap(param0); } -void ov16_02268A88 (UnkStruct_ov16_02268A14 * param0) +void ov16_02268A88(UnkStruct_ov16_02268A14 *param0) { - BGL * v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; - PaletteData * v3; + BGL *v0; + SpriteRenderer *v1; + SpriteGfxHandler *v2; + PaletteData *v3; int v4; v1 = ov16_0223E010(param0->unk_00); @@ -1244,11 +1431,11 @@ void ov16_02268A88 (UnkStruct_ov16_02268A14 * param0) } } -void ov16_02268B8C (UnkStruct_ov16_02268A14 * param0) +void ov16_02268B8C(UnkStruct_ov16_02268A14 *param0) { int v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; + SpriteRenderer *v1; + SpriteGfxHandler *v2; v1 = ov16_0223E010(param0->unk_00); v2 = ov16_0223E018(param0->unk_00); @@ -1266,13 +1453,13 @@ void ov16_02268B8C (UnkStruct_ov16_02268A14 * param0) } } -void ov16_02268C04 (NARC * param0, NARC * param1, UnkStruct_ov16_02268A14 * param2, int param3, int param4, void * param5) +void ov16_02268C04(NARC *param0, NARC *param1, UnkStruct_ov16_02268A14 *param2, int param3, int param4, void *param5) { - const UnkStruct_ov16_02270670 * v0, * v1; + const UnkStruct_ov16_02270670 *v0, *v1; int v2; - BGL * v3; - SpriteRenderer * v4; - SpriteGfxHandler * v5; + BGL *v3; + SpriteRenderer *v4; + SpriteGfxHandler *v5; if (param5 != NULL) { MI_CpuCopy8(param5, ¶m2->unk_1A, sizeof(UnkStruct_ov16_02268A14_sub2)); @@ -1335,11 +1522,11 @@ void ov16_02268C04 (NARC * param0, NARC * param1, UnkStruct_ov16_02268A14 * para SysTask_ExecuteAfterVBlank(ov16_0226BC50, param2, 10); } -void ov16_02268D40 (NARC * param0, UnkStruct_ov16_02268A14 * param1) +void ov16_02268D40(NARC *param0, UnkStruct_ov16_02268A14 *param1) { int v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; + SpriteRenderer *v1; + SpriteGfxHandler *v2; GF_ASSERT(param1->unk_5BC[0] == NULL && param1->unk_5D4[0] == NULL); @@ -1369,7 +1556,7 @@ void ov16_02268D40 (NARC * param0, UnkStruct_ov16_02268A14 * param1) param1->unk_08 = SysTask_Start(ov16_02268FCC, param1, 1300); { - PaletteData * v3; + PaletteData *v3; v3 = BattleSystem_PaletteSys(param1->unk_00); ov16_0226DB7C(v1, v2, v3, 5, 20411, 20035, 20405, 20394); @@ -1377,11 +1564,11 @@ void ov16_02268D40 (NARC * param0, UnkStruct_ov16_02268A14 * param1) } } -static void ov16_02268F00 (UnkStruct_ov16_02268A14 * param0) +static void ov16_02268F00(UnkStruct_ov16_02268A14 *param0) { int v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; + SpriteRenderer *v1; + SpriteGfxHandler *v2; GF_ASSERT(param0->unk_5BC[0] != NULL && param0->unk_5D4[0] != NULL); @@ -1411,11 +1598,11 @@ static void ov16_02268F00 (UnkStruct_ov16_02268A14 * param0) ov16_0226DCA8(param0->unk_6B8); } -static void ov16_02268FCC (SysTask * param0, void * param1) +static void ov16_02268FCC(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; + UnkStruct_ov16_02268A14 *v0 = param1; int v1; - UnkStruct_ov16_02268FCC * v2; + UnkStruct_ov16_02268FCC *v2; for (v1 = 0; v1 < 6; v1++) { v2 = &v0->unk_62C[v1]; @@ -1497,7 +1684,7 @@ static void ov16_02268FCC (SysTask * param0, void * param1) } } -void ov16_0226914C (UnkStruct_ov16_02268A14 * param0, const u8 * param1) +void ov16_0226914C(UnkStruct_ov16_02268A14 *param0, const u8 *param1) { int v0; @@ -1506,7 +1693,7 @@ void ov16_0226914C (UnkStruct_ov16_02268A14 * param0, const u8 * param1) } } -void ov16_02269168 (UnkStruct_ov16_02268A14 * param0, u8 param1[], u8 param2[]) +void ov16_02269168(UnkStruct_ov16_02268A14 *param0, u8 param1[], u8 param2[]) { int v0, v1; @@ -1523,7 +1710,7 @@ void ov16_02269168 (UnkStruct_ov16_02268A14 * param0, u8 param1[], u8 param2[]) } } -void ov16_022691BC (UnkStruct_ov16_02268A14 * param0) +void ov16_022691BC(UnkStruct_ov16_02268A14 *param0) { int v0; @@ -1540,7 +1727,7 @@ void ov16_022691BC (UnkStruct_ov16_02268A14 * param0) } } -void ov16_02269218 (UnkStruct_ov16_02268A14 * param0) +void ov16_02269218(UnkStruct_ov16_02268A14 *param0) { int v0; @@ -1552,10 +1739,10 @@ void ov16_02269218 (UnkStruct_ov16_02268A14 * param0) } } -int ov16_0226925C (UnkStruct_ov16_02268A14 * param0) +int ov16_0226925C(UnkStruct_ov16_02268A14 *param0) { int v0, v1, v2, v3; - const UnkStruct_ov16_02270670 * v4; + const UnkStruct_ov16_02270670 *v4; int v5 = 0; GF_ASSERT(param0->unk_66B != -1); @@ -1609,7 +1796,7 @@ int ov16_0226925C (UnkStruct_ov16_02268A14 * param0) return v0; } -BOOL ov16_02269348 (UnkStruct_ov16_02268A14 * param0) +BOOL ov16_02269348(UnkStruct_ov16_02268A14 *param0) { if ((param0->unk_0C == NULL) && (param0->unk_10 == NULL) && (ov16_0226BCD0(param0) == 1)) { return 1; @@ -1618,7 +1805,7 @@ BOOL ov16_02269348 (UnkStruct_ov16_02268A14 * param0) return 0; } -int ov16_02269368 (int param0, int param1) +int ov16_02269368(int param0, int param1) { switch (param0) { case 0x0: @@ -1648,7 +1835,7 @@ int ov16_02269368 (int param0, int param1) } } -void ov16_0226940C (UnkStruct_ov16_02268A14 * param0) +void ov16_0226940C(UnkStruct_ov16_02268A14 *param0) { int v0; @@ -1665,7 +1852,7 @@ void ov16_0226940C (UnkStruct_ov16_02268A14 * param0) G2S_SetWnd0Position(v0, 0, 255, 192); } -void ov16_0226947C (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +void ov16_0226947C(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { if (param0->unk_6AC == param2 * 0x100) { return; @@ -1677,11 +1864,11 @@ void ov16_0226947C (UnkStruct_ov16_02268A14 * param0, int param1, int param2) SysTask_Start(ov16_022694A8, param0, 1200); } -static void ov16_022694A8 (SysTask * param0, void * param1) +static void ov16_022694A8(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; + UnkStruct_ov16_02268A14 *v0 = param1; int v1 = 0; - BGL * v2; + BGL *v2; v2 = BattleSystem_BGL(v0->unk_00); v0->unk_6AC += v0->unk_6B0; @@ -1704,10 +1891,10 @@ static void ov16_022694A8 (SysTask * param0, void * param1) } } -static void ov16_02269550 (UnkStruct_ov16_02268A14 * param0, int param1) +static void ov16_02269550(UnkStruct_ov16_02268A14 *param0, int param1) { BOOL v0; - UnkStruct_ov16_0226B988 * v1; + UnkStruct_ov16_0226B988 *v1; param0->unk_66E = 1; @@ -1715,7 +1902,7 @@ static void ov16_02269550 (UnkStruct_ov16_02268A14 * param0, int param1) G2S_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3, 1); G2S_SetWnd1InsidePlane(GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3, 1); G2S_SetWnd0Position(0, 0, 255, (18 * 8)); - G2S_SetWnd1Position(0, ((18 * 8)), 255, 192); + G2S_SetWnd1Position(0, (18 * 8), 255, 192); GXS_SetVisibleWnd(GX_WNDMASK_W0 | GX_WNDMASK_W1); v1 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0226B988)); @@ -1737,7 +1924,7 @@ static void ov16_02269550 (UnkStruct_ov16_02268A14 * param0, int param1) v1->unk_04 = SysTask_ExecuteOnVBlank(ov16_0226BA88, v1, 10); } -static void ov16_02269654 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_02269654(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { int v0; @@ -1747,12 +1934,12 @@ static void ov16_02269654 (UnkStruct_ov16_02268A14 * param0, int param1, int par ov16_02269550(param0, v0); } -static void ov16_02269668 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_02269668(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - Strbuf* v0, * v1, * v2, * v3; - MessageLoader * v4; + Strbuf *v0, *v1, *v2, *v3; + MessageLoader *v4; int v5; - UnkStruct_ov16_02269668 * v6; + UnkStruct_ov16_02269668 *v6; v6 = ¶m0->unk_1A.val1; v5 = v6->unk_00; @@ -1796,8 +1983,8 @@ static void ov16_02269668 (UnkStruct_ov16_02268A14 * param0, int param1, int par Strbuf_Free(v3); if ((BattleSystem_BattleType(param0->unk_00) & (0x20 | 0x200)) == 0) { - Pokemon * v7; - CellActorData * v8; + Pokemon *v7; + CellActorData *v8; int v9, v10; v7 = BattleSystem_PartyPokemon(param0->unk_00, v6->unk_01, v6->unk_02); @@ -1816,7 +2003,7 @@ static void ov16_02269668 (UnkStruct_ov16_02268A14 * param0, int param1, int par } } -static void ov16_022698A8 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_022698A8(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { int v0; @@ -1826,7 +2013,7 @@ static void ov16_022698A8 (UnkStruct_ov16_02268A14 * param0, int param1, int par ov16_02269550(param0, v0); } -static void ov16_022698BC (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_022698BC(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { int v0; @@ -1835,7 +2022,7 @@ static void ov16_022698BC (UnkStruct_ov16_02268A14 * param0, int param1, int par ov16_02269668(param0, param1, param2); { - BGL * v1; + BGL *v1; v1 = BattleSystem_BGL(param0->unk_00); @@ -1848,7 +2035,7 @@ static void ov16_022698BC (UnkStruct_ov16_02268A14 * param0, int param1, int par sub_020129D0(param0->unk_4CC[3].unk_00, 0); } -static void ov16_02269924 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_02269924(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { int v0; @@ -1858,7 +2045,7 @@ static void ov16_02269924 (UnkStruct_ov16_02268A14 * param0, int param1, int par ov16_02269550(param0, v0); } -static void ov16_02269938 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_02269938(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { int v0; @@ -1867,7 +2054,7 @@ static void ov16_02269938 (UnkStruct_ov16_02268A14 * param0, int param1, int par ov16_02269668(param0, param1, param2); { - BGL * v1; + BGL *v1; v1 = BattleSystem_BGL(param0->unk_00); @@ -1880,12 +2067,12 @@ static void ov16_02269938 (UnkStruct_ov16_02268A14 * param0, int param1, int par sub_020129D0(param0->unk_4CC[2].unk_00, 0); } -static void ov16_022699AC (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_022699AC(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - UnkStruct_ov16_02260C00 * v0; + UnkStruct_ov16_02260C00 *v0; int v1; - MessageLoader * v2; - UnkStruct_ov16_0226ABD4 * v3; + MessageLoader *v2; + UnkStruct_ov16_0226ABD4 *v3; u32 v4; v0 = ¶m0->unk_1A.val2; @@ -1914,7 +2101,7 @@ static void ov16_022699AC (UnkStruct_ov16_02268A14 * param0, int param1, int par } { - Strbuf* v5; + Strbuf *v5; v5 = MessageLoader_GetNewStrbuf(v2, 929); ov16_0226A98C(param0, ¶m0->unk_4CC[4], v5, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 178, 1, NULL); @@ -1936,7 +2123,7 @@ static void ov16_022699AC (UnkStruct_ov16_02268A14 * param0, int param1, int par } { - BGL * v7; + BGL *v7; v7 = BattleSystem_BGL(param0->unk_00); @@ -1966,10 +2153,10 @@ static void ov16_022699AC (UnkStruct_ov16_02268A14 * param0, int param1, int par } } -static void ov16_02269C7C (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_02269C7C(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - MessageLoader * v0; - Strbuf* v1, * v2; + MessageLoader *v0; + Strbuf *v1, *v2; v0 = BattleSystem_MessageLoader(param0->unk_00); v1 = MessageLoader_GetNewStrbuf(v0, 940); @@ -1982,10 +2169,10 @@ static void ov16_02269C7C (UnkStruct_ov16_02268A14 * param0, int param1, int par Strbuf_Free(v2); } -static void ov16_02269D14 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_02269D14(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - MessageLoader * v0; - Strbuf* v1, * v2; + MessageLoader *v0; + Strbuf *v1, *v2; v0 = BattleSystem_MessageLoader(param0->unk_00); v1 = MessageLoader_GetNewStrbuf(v0, 1181); @@ -1998,12 +2185,12 @@ static void ov16_02269D14 (UnkStruct_ov16_02268A14 * param0, int param1, int par Strbuf_Free(v2); } -static void ov16_02269DB0 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_02269DB0(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - MessageLoader * v0; - Strbuf* v1, * v2, * v3, * v4; - StringTemplate * v5; - UnkStruct_ov16_022623F0 * v6; + MessageLoader *v0; + Strbuf *v1, *v2, *v3, *v4; + StringTemplate *v5; + UnkStruct_ov16_022623F0 *v6; v6 = ¶m0->unk_1A.val4; v0 = BattleSystem_MessageLoader(param0->unk_00); @@ -2026,10 +2213,10 @@ static void ov16_02269DB0 (UnkStruct_ov16_02268A14 * param0, int param1, int par Strbuf_Free(v4); } -static void ov16_02269E94 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_BGALL), 31, 0); @@ -2037,9 +2224,9 @@ static void ov16_02269E94 (UnkStruct_ov16_02268A14 * param0, int param1, int par v1 = MessageLoader_GetNewStrbuf(v0, 1260); { - BGL * v2; - NNSG2dScreenData * v3; - void * v4; + BGL *v2; + NNSG2dScreenData *v3; + void *v4; v4 = sub_02006F6C(7, 46, 1, &v3, 5); MI_CpuCopy32(v3->rawData, param0->unk_3C[6], 0x800); @@ -2051,7 +2238,7 @@ static void ov16_02269E94 (UnkStruct_ov16_02268A14 * param0, int param1, int par } { - BGL * v5 = BattleSystem_BGL(param0->unk_00); + BGL *v5 = BattleSystem_BGL(param0->unk_00); MI_CpuClear32(param0->unk_3C[4], 0x800); sub_02019574(v5, 5, param0->unk_3C[4], 0x800); @@ -2062,12 +2249,12 @@ static void ov16_02269E94 (UnkStruct_ov16_02268A14 * param0, int param1, int par Strbuf_Free(v1); } -static void ov16_02269F68 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_02269F68(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - MessageLoader * v0; - Strbuf* v1, * v2, * v3, * v4; - StringTemplate * v5; - UnkStruct_ov16_022623F0 * v6; + MessageLoader *v0; + Strbuf *v1, *v2, *v3, *v4; + StringTemplate *v5; + UnkStruct_ov16_022623F0 *v6; v6 = ¶m0->unk_1A.val4; v0 = BattleSystem_MessageLoader(param0->unk_00); @@ -2090,12 +2277,12 @@ static void ov16_02269F68 (UnkStruct_ov16_02268A14 * param0, int param1, int par Strbuf_Free(v4); } -static void ov16_0226A04C (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_0226A04C(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - MessageLoader * v0; - Strbuf* v1, * v2, * v3, * v4; - StringTemplate * v5; - UnkStruct_ov16_022623F0 * v6; + MessageLoader *v0; + Strbuf *v1, *v2, *v3, *v4; + StringTemplate *v5; + UnkStruct_ov16_022623F0 *v6; v6 = ¶m0->unk_1A.val4; v0 = BattleSystem_MessageLoader(param0->unk_00); @@ -2118,16 +2305,16 @@ static void ov16_0226A04C (UnkStruct_ov16_02268A14 * param0, int param1, int par Strbuf_Free(v4); } -static void ov16_0226A12C (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - UnkStruct_ov16_02260F14 * v0; + UnkStruct_ov16_02260F14 *v0; int v1; - MessageLoader * v2; + MessageLoader *v2; u8 v3[4]; - Strbuf* v4, * v5; - Pokemon * v6; - BoxPokemon * v7; - StringTemplate * v8; + Strbuf *v4, *v5; + Pokemon *v6; + BoxPokemon *v7; + StringTemplate *v8; u32 v9; u8 v10[6]; u8 v11[6]; @@ -2196,15 +2383,15 @@ static void ov16_0226A12C (UnkStruct_ov16_02268A14 * param0, int param1, int par Strbuf_Free(v4); { - Strbuf* v13; + Strbuf *v13; v13 = MessageLoader_GetNewStrbuf(v2, 930); - ov16_0226A98C(param0, ¶m0->unk_4CC[4], v13, 2, (((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0)))), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL); + ov16_0226A98C(param0, ¶m0->unk_4CC[4], v13, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, Unk_ov16_02270328[4][0], Unk_ov16_02270328[4][1], 1, NULL); Strbuf_Free(v13); } } -static int ov16_0226A318 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static int ov16_0226A318(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { int v0, v1, v2; @@ -2258,14 +2445,14 @@ static int ov16_0226A318 (UnkStruct_ov16_02268A14 * param0, int param1, int para return param1; } -static int ov16_0226A3F4 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static int ov16_0226A3F4(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - UnkStruct_ov16_02260C00 * v0; + UnkStruct_ov16_02260C00 *v0; u32 v1[2]; u32 v2; - const UnkStruct_ov16_0226A3F4 * v3[2]; - const s16 * v4; - const UnkStruct_ov16_022702F4 * v5; + const UnkStruct_ov16_0226A3F4 *v3[2]; + const s16 *v4; + const UnkStruct_ov16_022702F4 *v5; if (param1 == 0xffffffff) { return param1; @@ -2310,7 +2497,7 @@ static int ov16_0226A3F4 (UnkStruct_ov16_02268A14 * param0, int param1, int para return param1; } -static int ov16_0226A4A4 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static int ov16_0226A4A4(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { int v0; @@ -2346,9 +2533,9 @@ static int ov16_0226A4A4 (UnkStruct_ov16_02268A14 * param0, int param1, int para return param1; } -static int ov16_0226A528 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static int ov16_0226A528(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { - UnkStruct_ov16_02260F14 * v0; + UnkStruct_ov16_02260F14 *v0; u8 v1[4]; v0 = ¶m0->unk_1A.val3; @@ -2395,7 +2582,7 @@ static int ov16_0226A528 (UnkStruct_ov16_02268A14 * param0, int param1, int para } { - BGL * v2; + BGL *v2; v2 = BattleSystem_BGL(param0->unk_00); sub_02019EE0(v2, 5, (0x6000 / 0x20 - 1)); @@ -2410,7 +2597,7 @@ static int ov16_0226A528 (UnkStruct_ov16_02268A14 * param0, int param1, int para return param1; } -static int ov16_0226A634 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static int ov16_0226A634(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { switch (param1) { case 0xffffffff: @@ -2434,12 +2621,12 @@ static int ov16_0226A634 (UnkStruct_ov16_02268A14 * param0, int param1, int para return param1; } -static void ov16_0226A698 (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226A698(UnkStruct_ov16_02268A14 *param0) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; + SpriteRenderer *v0; + SpriteGfxHandler *v1; int v2, v3, v4; - PaletteData * v5; + PaletteData *v5; v0 = ov16_0223E010(param0->unk_00); v1 = ov16_0223E018(param0->unk_00); @@ -2450,9 +2637,9 @@ static void ov16_0226A698 (UnkStruct_ov16_02268A14 * param0) sub_0200CE3C(v0, v1, 19, PokeIcon32KAnimationFileIndex(), 0, 20021); } -static void ov16_0226A718 (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226A718(UnkStruct_ov16_02268A14 *param0) { - SpriteGfxHandler * v0; + SpriteGfxHandler *v0; v0 = ov16_0223E018(param0->unk_00); @@ -2464,7 +2651,7 @@ static void ov16_0226A718 (UnkStruct_ov16_02268A14 * param0) SpriteGfxHandler_UnloadPlttObjById(v0, 20022); } -static void ov16_0226A768 (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226A768(UnkStruct_ov16_02268A14 *param0) { int v0; @@ -2481,13 +2668,13 @@ static void ov16_0226A768 (UnkStruct_ov16_02268A14 * param0) } } -static CellActorData * ov16_0226A7A4 (UnkStruct_ov16_02268A14 * param0, Pokemon * param1, int param2, int param3, int param4, int param5) +static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *param1, int param2, int param3, int param4, int param5) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; + SpriteRenderer *v0; + SpriteGfxHandler *v1; u32 v2; SpriteTemplate v3; - CellActorData * v4; + CellActorData *v4; int v5; if (param2 >= 2) { @@ -2565,13 +2752,13 @@ static CellActorData * ov16_0226A7A4 (UnkStruct_ov16_02268A14 * param0, Pokemon return v4; } -static void ov16_0226A928 (SysTask * param0, void * param1) +static void ov16_0226A928(SysTask *param0, void *param1) { - CellActorData * v0 = param1; + CellActorData *v0 = param1; sub_0200D330(v0); } -static int ov16_0226A934 (u8 param0) +static int ov16_0226A934(u8 param0) { int v0; @@ -2594,7 +2781,7 @@ static int ov16_0226A934 (u8 param0) return v0; } -static void ov16_0226A95C (const Strbuf *param0, int param1, int * param2, int * param3) +static void ov16_0226A95C(const Strbuf *param0, int param1, int *param2, int *param3) { int v0, v1; @@ -2609,15 +2796,15 @@ static void ov16_0226A95C (const Strbuf *param0, int param1, int * param2, int * *param3 = v1; } -static void ov16_0226A98C (UnkStruct_ov16_02268A14 * param0, UnkStruct_ov16_0226A98C * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 * param10) +static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A98C *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov16_0226AEA0 *param10) { UnkStruct_020127E8 v0; Window v1; SpriteManagerAllocation v2; int v3; - FontOAM * v4; - BGL * v5; - SpriteGfxHandler * v6; + FontOAM *v4; + BGL *v5; + SpriteGfxHandler *v6; int v7, v8; GF_ASSERT(param1->unk_00 == NULL); @@ -2676,7 +2863,7 @@ static void ov16_0226A98C (UnkStruct_ov16_02268A14 * param0, UnkStruct_ov16_0226 param1->unk_10 = v7; } -static void ov16_0226AAC0 (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226AAC0(UnkStruct_ov16_02268A14 *param0) { int v0; @@ -2689,12 +2876,12 @@ static void ov16_0226AAC0 (UnkStruct_ov16_02268A14 * param0) } } -static void ov16_0226AAF8 (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226AAF8(UnkStruct_ov16_02268A14 *param0) { u8 v0[4], v1[4]; int v2, v3; - u16 * v4, * v5; - BGL * v6; + u16 *v4, *v5; + BGL *v6; v6 = BattleSystem_BGL(param0->unk_00); v4 = sub_02019FE4(v6, 5); @@ -2750,7 +2937,7 @@ static void ov16_0226AAF8 (UnkStruct_ov16_02268A14 * param0) } } -static UnkStruct_ov16_0226ABD4 * ov16_0226ABD4 (UnkStruct_ov16_02268A14 * param0, int param1) +static UnkStruct_ov16_0226ABD4 *ov16_0226ABD4(UnkStruct_ov16_02268A14 *param0, int param1) { if (param1 >= 2) { param1 -= 2; @@ -2759,7 +2946,7 @@ static UnkStruct_ov16_0226ABD4 * ov16_0226ABD4 (UnkStruct_ov16_02268A14 * param0 return ¶m0->unk_68[param1]; } -static void ov16_0226ABE8 (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226ABE8(UnkStruct_ov16_02268A14 *param0) { int v0, v1; @@ -2782,19 +2969,19 @@ static void ov16_0226ABE8 (UnkStruct_ov16_02268A14 * param0) } } -void ov16_0226AC98 (UnkStruct_ov16_02268A14 * param0, int param1, const UnkStruct_ov16_0226AC98 * param2) +void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const UnkStruct_ov16_0226AC98 *param2) { - UnkStruct_ov16_0226ABD4 * v0; - void * v1; - NNSG2dCharacterData * v2; + UnkStruct_ov16_0226ABD4 *v0; + void *v1; + NNSG2dCharacterData *v2; int v3, v4, v5; - Strbuf* v6; - Strbuf* v7; - Strbuf* v8; - Strbuf* v9; - StringTemplate * v10; + Strbuf *v6; + Strbuf *v7; + Strbuf *v8; + Strbuf *v9; + StringTemplate *v10; u32 v11; - MessageLoader * v12; + MessageLoader *v12; v12 = BattleSystem_MessageLoader(param0->unk_00); v0 = ov16_0226ABD4(param0, param1); @@ -2842,7 +3029,7 @@ void ov16_0226AC98 (UnkStruct_ov16_02268A14 * param0, int param1, const UnkStruc v0->unk_00 = *param2; } -static void ov16_0226AEA0 (UnkStruct_ov16_02268A14 * param0, const Strbuf *param1, int param2, UnkStruct_ov16_0226AEA0 * param3, u32 param4) +static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1, int param2, UnkStruct_ov16_0226AEA0 *param3, u32 param4) { int v0, v1; @@ -2860,16 +3047,16 @@ static void ov16_0226AEA0 (UnkStruct_ov16_02268A14 * param0, const Strbuf *param PrintStringWithColorAndMargins(¶m3->unk_00, param2, param1, 0, 0, 0xff, param4, 0, 0, NULL); } -static void ov16_0226AF0C (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226AF0C(UnkStruct_ov16_02268A14 *param0) { int v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; + SpriteRenderer *v1; + SpriteGfxHandler *v2; SpriteTemplate v3; - UnkStruct_ov16_02260C00 * v4; + UnkStruct_ov16_02260C00 *v4; int v5; int v6; - UnkStruct_ov16_0226ABD4 * v7; + UnkStruct_ov16_0226ABD4 *v7; v4 = ¶m0->unk_1A.val2; v1 = ov16_0223E010(param0->unk_00); @@ -2891,8 +3078,8 @@ static void ov16_0226AF0C (UnkStruct_ov16_02268A14 * param0) sub_0200D500(param0->unk_5EC[v0], v3.x, v3.y, ((192 + 80) << FX32_SHIFT)); { - void * v8; - NNSG2dImageProxy * v9; + void *v8; + NNSG2dImageProxy *v9; v8 = G2S_GetOBJCharPtr(); v9 = SpriteActor_ImageProxy(param0->unk_5EC[v0]->unk_00); @@ -2903,11 +3090,11 @@ static void ov16_0226AF0C (UnkStruct_ov16_02268A14 * param0) } } -static void ov16_0226AFF4 (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226AFF4(UnkStruct_ov16_02268A14 *param0) { int v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; + SpriteRenderer *v1; + SpriteGfxHandler *v2; v1 = ov16_0223E010(param0->unk_00); v2 = ov16_0223E018(param0->unk_00); @@ -2920,11 +3107,11 @@ static void ov16_0226AFF4 (UnkStruct_ov16_02268A14 * param0) } } -static void ov16_0226B028 (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226B028(UnkStruct_ov16_02268A14 *param0) { int v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; + SpriteRenderer *v1; + SpriteGfxHandler *v2; v1 = ov16_0223E010(param0->unk_00); v2 = ov16_0223E018(param0->unk_00); @@ -2938,14 +3125,14 @@ static void ov16_0226B028 (UnkStruct_ov16_02268A14 * param0) } } -static void ov16_0226B06C (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_0226B06C(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { ov11_0221F81C(BattleSystem_PaletteSys(param0->unk_00), param1, 5, 1, 8 + param2); } -static void ov16_0226B088 (UnkStruct_ov16_02268A14 * param0, int param1) +static void ov16_0226B088(UnkStruct_ov16_02268A14 *param0, int param1) { - PaletteData * v0; + PaletteData *v0; int v1; v0 = BattleSystem_PaletteSys(param0->unk_00); @@ -2956,12 +3143,12 @@ static void ov16_0226B088 (UnkStruct_ov16_02268A14 * param0, int param1) } } -static void ov16_0226B0DC (UnkStruct_ov16_02268A14 * param0, int param1) +static void ov16_0226B0DC(UnkStruct_ov16_02268A14 *param0, int param1) { - PaletteData * v0; + PaletteData *v0; int v1; - const u8 v2[] = {6, 0xc, 0xd, 5}; - BGL * v3; + const u8 v2[] = { 6, 0xc, 0xd, 5 }; + BGL *v3; v3 = BattleSystem_BGL(param0->unk_00); v0 = BattleSystem_PaletteSys(param0->unk_00); @@ -2974,7 +3161,7 @@ static void ov16_0226B0DC (UnkStruct_ov16_02268A14 * param0, int param1) sub_0201C3C0(v3, 5); } -static void ov16_0226B198 (void) +static void ov16_0226B198(void) { int i; @@ -2987,7 +3174,7 @@ static void ov16_0226B198 (void) } } -static void ov16_0226B1C4 (UnkStruct_ov16_02268A14 * param0, int param1, int param2) +static void ov16_0226B1C4(UnkStruct_ov16_02268A14 *param0, int param1, int param2) { if (param1 == 1) { ov16_0226B1E8(param0); @@ -2998,7 +3185,7 @@ static void ov16_0226B1C4 (UnkStruct_ov16_02268A14 * param0, int param1, int par } } -static void ov16_0226B1E8 (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226B1E8(UnkStruct_ov16_02268A14 *param0) { ov16_0226AFF4(param0); ov16_0226B028(param0); @@ -3007,9 +3194,9 @@ static void ov16_0226B1E8 (UnkStruct_ov16_02268A14 * param0) ov16_0226A768(param0); } -static void ov16_0226B20C (UnkStruct_ov16_02268A14 * param0, u8 * param1, int param2) +static void ov16_0226B20C(UnkStruct_ov16_02268A14 *param0, u8 *param1, int param2) { - UnkStruct_ov16_02260F14 * v0; + UnkStruct_ov16_02260F14 *v0; int v1; u8 v2[6]; int v3; @@ -3028,9 +3215,9 @@ static void ov16_0226B20C (UnkStruct_ov16_02268A14 * param0, u8 * param1, int pa } } -static void ov16_0226B264 (UnkStruct_ov16_02268A14 * param0, int param1, u8 * param2, int param3) +static void ov16_0226B264(UnkStruct_ov16_02268A14 *param0, int param1, u8 *param2, int param3) { - UnkStruct_ov16_02260F14 * v0; + UnkStruct_ov16_02260F14 *v0; int v1; v0 = ¶m0->unk_1A.val3; @@ -3055,7 +3242,7 @@ static void ov16_0226B264 (UnkStruct_ov16_02268A14 * param0, int param1, u8 * pa } } -static void ov16_0226B2BC (SysTaskFunc param0, UnkStruct_ov16_02268A14 * param1) +static void ov16_0226B2BC(SysTaskFunc param0, UnkStruct_ov16_02268A14 *param1) { GF_ASSERT(param1->unk_0C == NULL); @@ -3063,7 +3250,7 @@ static void ov16_0226B2BC (SysTaskFunc param0, UnkStruct_ov16_02268A14 * param1) param1->unk_0C = SysTask_Start(param0, param1, 1300); } -static void ov16_0226B2F0 (UnkStruct_ov16_02268A14 * param0) +static void ov16_0226B2F0(UnkStruct_ov16_02268A14 *param0) { if (param0->unk_0C != NULL) { SysTask_Done(param0->unk_0C); @@ -3072,7 +3259,7 @@ static void ov16_0226B2F0 (UnkStruct_ov16_02268A14 * param0) } } -static void inline_ov16_0226B314 (SysTaskFunc param0, UnkStruct_ov16_02268A14 * param1) +static void inline_ov16_0226B314(SysTaskFunc param0, UnkStruct_ov16_02268A14 *param1) { GF_ASSERT(param1->unk_10 == NULL); @@ -3080,7 +3267,7 @@ static void inline_ov16_0226B314 (SysTaskFunc param0, UnkStruct_ov16_02268A14 * param1->unk_10 = SysTask_Start(param0, param1, 1320); } -static void inline_ov16_0226B318_1_sub (UnkStruct_ov16_02268A14 * param0) +static void inline_ov16_0226B318_1_sub(UnkStruct_ov16_02268A14 *param0) { if (param0->unk_10 != NULL) { SysTask_Done(param0->unk_10); @@ -3089,7 +3276,7 @@ static void inline_ov16_0226B318_1_sub (UnkStruct_ov16_02268A14 * param0) } } -static void ov16_0226B314 (UnkStruct_ov16_02268A14 * param0, int param1) +static void ov16_0226B314(UnkStruct_ov16_02268A14 *param0, int param1) { return; @@ -3097,7 +3284,7 @@ static void ov16_0226B314 (UnkStruct_ov16_02268A14 * param0, int param1) param0->unk_6A0.unk_00 = param1; } -static void ov16_0226B318 (UnkStruct_ov16_02268A14 * param0, int param1) +static void ov16_0226B318(UnkStruct_ov16_02268A14 *param0, int param1) { return; @@ -3109,12 +3296,12 @@ static void ov16_0226B318 (UnkStruct_ov16_02268A14 * param0, int param1) param0->unk_6A0.unk_09 = param1; } -static void inline_ov16_0226B318_1 (SysTask * param0, void * param1) +static void inline_ov16_0226B318_1(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; - UnkStruct_ov16_02268A14_sub4 * v1; - BGL * v2; - PaletteData * v3; + UnkStruct_ov16_02268A14 *v0 = param1; + UnkStruct_ov16_02268A14_sub4 *v1; + BGL *v2; + PaletteData *v3; int v4, v5; v1 = &v0->unk_6A0; @@ -3151,12 +3338,12 @@ static void inline_ov16_0226B318_1 (SysTask * param0, void * param1) } } -static void inline_ov16_0226B314_1 (SysTask * param0, void * param1) +static void inline_ov16_0226B314_1(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; - UnkStruct_ov16_02268A14_sub4 * v1; - BGL * v2; - PaletteData * v3; + UnkStruct_ov16_02268A14 *v0 = param1; + UnkStruct_ov16_02268A14_sub4 *v1; + BGL *v2; + PaletteData *v3; int v4, v5; u8 v6[4]; @@ -3199,12 +3386,12 @@ static void inline_ov16_0226B314_1 (SysTask * param0, void * param1) } } -static void ov16_0226B31C (UnkStruct_ov16_02268A14 * param0, const s16 * param1, const UnkStruct_ov16_022702F4 * param2, int param3, int param4) +static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, const UnkStruct_ov16_022702F4 *param2, int param3, int param4) { int v0, v1; - BGL * v2; - u16 * v3, * v4; - u16 * v5, * v6; + BGL *v2; + u16 *v3, *v4; + u16 *v5, *v6; int v7; v2 = BattleSystem_BGL(param0->unk_00); @@ -3224,10 +3411,10 @@ static void ov16_0226B31C (UnkStruct_ov16_02268A14 * param0, const s16 * param1, sub_0201C3C0(v2, 4); } -static void ov16_0226B390 (SysTask * param0, void * param1) +static void ov16_0226B390(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; - BGL * v1; + UnkStruct_ov16_02268A14 *v0 = param1; + BGL *v1; int v2, v3; v1 = BattleSystem_BGL(v0->unk_00); @@ -3276,14 +3463,14 @@ static void ov16_0226B390 (SysTask * param0, void * param1) } } -static void ov16_0226B4E0 (SysTask * param0, void * param1) +static void ov16_0226B4E0(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; - BGL * v1; + UnkStruct_ov16_02268A14 *v0 = param1; + BGL *v1; int v2, v3; int v4, v5, v6; int v7, v8, v9; - UnkStruct_ov16_02260C00 * v10; + UnkStruct_ov16_02260C00 *v10; v1 = BattleSystem_BGL(v0->unk_00); v10 = &v0->unk_1A.val2; @@ -3404,10 +3591,10 @@ static void ov16_0226B4E0 (SysTask * param0, void * param1) } } -static void ov16_0226B780 (SysTask * param0, void * param1) +static void ov16_0226B780(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; - BGL * v1; + UnkStruct_ov16_02268A14 *v0 = param1; + BGL *v1; int v2, v3; u8 v4[4]; int v5; @@ -3479,7 +3666,7 @@ static void ov16_0226B780 (SysTask * param0, void * param1) } } -static u32 ov16_0226B924 (int param0, int param1) +static u32 ov16_0226B924(int param0, int param1) { if (param0 == 0) { return (u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((0 & 0xff) << 0)); @@ -3513,10 +3700,10 @@ static u32 ov16_0226B924 (int param0, int param1) return (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)); } -static void ov16_0226B988 (SysTask * param0, void * param1) +static void ov16_0226B988(SysTask *param0, void *param1) { - UnkStruct_ov16_0226B988 * v0 = param1; - BGL * v1; + UnkStruct_ov16_0226B988 *v0 = param1; + BGL *v1; v1 = BattleSystem_BGL(v0->unk_00->unk_00); @@ -3529,7 +3716,7 @@ static void ov16_0226B988 (SysTask * param0, void * param1) if ((v0->unk_08 >= 0) || (v0->unk_0A <= 0)) { v0->unk_08 = 0; - v0->unk_0A = ((18 * 8)); + v0->unk_0A = (18 * 8); v0->unk_0C = 0 / 100; v0->unk_0E = 0 / 100; v0->unk_13++; @@ -3560,10 +3747,10 @@ static void ov16_0226B988 (SysTask * param0, void * param1) } } -static void ov16_0226BA88 (SysTask * param0, void * param1) +static void ov16_0226BA88(SysTask *param0, void *param1) { - UnkStruct_ov16_0226B988 * v0 = param1; - BGL * v1; + UnkStruct_ov16_0226B988 *v0 = param1; + BGL *v1; s32 v2, v3, v4; v1 = BattleSystem_BGL(v0->unk_00->unk_00); @@ -3594,7 +3781,7 @@ static void ov16_0226BA88 (SysTask * param0, void * param1) sub_02019184(v1, 4, 3, 0); sub_02019184(v1, 5, 3, 0); - v3 = ((18 * 8)) + (v0->unk_0A) / 100; + v3 = (18 * 8) + (v0->unk_0A) / 100; if (v2 < 0) { v2 = 0; @@ -3618,26 +3805,26 @@ static void ov16_0226BA88 (SysTask * param0, void * param1) G2S_SetWnd0Position(v2, 0, 0, (18 * 8)); } - G2S_SetWnd1Position(0, ((18 * 8)), 255, v3); + G2S_SetWnd1Position(0, (18 * 8), 255, v3); v0->unk_10 = v0->unk_0E; } -static void ov16_0226BB94 (void * param0) +static void ov16_0226BB94(void *param0) { - UnkStruct_ov16_0226B988 * v0 = param0; + UnkStruct_ov16_0226B988 *v0 = param0; s32 v1, v2; v1 = GX_GetVCount(); - if (v1 == ((18 * 8))) { - BGL * v3 = BattleSystem_BGL(v0->unk_00->unk_00); + if (v1 == (18 * 8)) { + BGL *v3 = BattleSystem_BGL(v0->unk_00->unk_00); sub_02019184(v3, 4, 0, 0); sub_02019184(v3, 4, 3, v0->unk_10); sub_02019184(v3, 5, 0, 0); sub_02019184(v3, 5, 3, v0->unk_10); } else if (v1 > 192) { - BGL * v4 = BattleSystem_BGL(v0->unk_00->unk_00); + BGL *v4 = BattleSystem_BGL(v0->unk_00->unk_00); if (v0->unk_12 == 4) { v2 = 255 - v0->unk_0C; @@ -3664,10 +3851,10 @@ static void ov16_0226BB94 (void * param0) } } -static void ov16_0226BC50 (SysTask * param0, void * param1) +static void ov16_0226BC50(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; - const UnkStruct_ov16_02270670 * v1; + UnkStruct_ov16_02268A14 *v0 = param1; + const UnkStruct_ov16_02270670 *v1; int v2; v1 = &Unk_ov16_02270670[v0->unk_66B]; @@ -3687,20 +3874,20 @@ static void ov16_0226BC50 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov16_0226BCBC (SysTask * param0, void * param1) +static void ov16_0226BCBC(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; + UnkStruct_ov16_02268A14 *v0 = param1; ov16_0226B198(); SysTask_Done(param0); } -void ov16_0226BCCC (UnkStruct_ov16_02268A14 * param0, int param1) +void ov16_0226BCCC(UnkStruct_ov16_02268A14 *param0, int param1) { return; } -BOOL ov16_0226BCD0 (UnkStruct_ov16_02268A14 * param0) +BOOL ov16_0226BCD0(UnkStruct_ov16_02268A14 *param0) { if (param0->unk_664 == NULL) { return 1; @@ -3709,12 +3896,12 @@ BOOL ov16_0226BCD0 (UnkStruct_ov16_02268A14 * param0) return 0; } -static void ov16_0226BCE4 (SysTask * param0, void * param1) +static void ov16_0226BCE4(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; + UnkStruct_ov16_02268A14 *v0 = param1; int v1; u16 v2; - PaletteData * v3; + PaletteData *v3; s16 v4; v3 = BattleSystem_PaletteSys(v0->unk_00); @@ -3742,11 +3929,11 @@ static void ov16_0226BCE4 (SysTask * param0, void * param1) } } -static void ov16_0226BD74 (SysTask * param0, void * param1) +static void ov16_0226BD74(SysTask *param0, void *param1) { - UnkStruct_ov16_02268A14 * v0 = param1; - PaletteData * v1; - u16 * v2; + UnkStruct_ov16_02268A14 *v0 = param1; + PaletteData *v1; + u16 *v2; int v3; int v4, v5; @@ -3786,10 +3973,10 @@ static void ov16_0226BD74 (SysTask * param0, void * param1) } } -static int ov16_0226BE48 (UnkStruct_ov16_02268A14 * param0) +static int ov16_0226BE48(UnkStruct_ov16_02268A14 *param0) { - UnkStruct_ov16_0226CB10 * v0; - const UnkStruct_ov16_02270670 * v1; + UnkStruct_ov16_0226CB10 *v0; + const UnkStruct_ov16_02270670 *v1; v0 = ¶m0->unk_6BC; v1 = &Unk_ov16_02270670[param0->unk_66B]; @@ -3815,13 +4002,13 @@ static int ov16_0226BE48 (UnkStruct_ov16_02268A14 * param0) return v1->unk_20(param0, 0); } -static int ov16_0226BEC0 (UnkStruct_ov16_02268A14 * param0, int param1) +static int ov16_0226BEC0(UnkStruct_ov16_02268A14 *param0, int param1) { - UnkStruct_ov16_0226CB10 * v0; + UnkStruct_ov16_0226CB10 *v0; u32 v1; - const UnkStruct_ov16_02270670 * v2; + const UnkStruct_ov16_02270670 *v2; int v3, v4, v5; - UnkStruct_ov16_0226C378 * v6; + UnkStruct_ov16_0226C378 *v6; v0 = ¶m0->unk_6BC; v2 = &Unk_ov16_02270670[param0->unk_66B]; @@ -3890,9 +4077,9 @@ static int ov16_0226BEC0 (UnkStruct_ov16_02268A14 * param0, int param1) return 0xffffffff; } -static void ov16_0226C0A0 (UnkStruct_ov16_02268A14 * param0, int param1) +static void ov16_0226C0A0(UnkStruct_ov16_02268A14 *param0, int param1) { - UnkStruct_ov16_0226C378 * v0; + UnkStruct_ov16_0226C378 *v0; int v1, v2, v3; v1 = BattleSystem_BattlerOfType(param0->unk_00, param0->unk_66A); @@ -3913,11 +4100,11 @@ static void ov16_0226C0A0 (UnkStruct_ov16_02268A14 * param0, int param1) } } -static int ov16_0226C100 (UnkStruct_ov16_02268A14 * param0, int param1) +static int ov16_0226C100(UnkStruct_ov16_02268A14 *param0, int param1) { - UnkStruct_ov16_0226CB10 * v0; + UnkStruct_ov16_0226CB10 *v0; u32 v1; - const UnkStruct_ov16_02270670 * v2; + const UnkStruct_ov16_02270670 *v2; int v3, v4; v0 = ¶m0->unk_6BC; @@ -3950,15 +4137,15 @@ static int ov16_0226C100 (UnkStruct_ov16_02268A14 * param0, int param1) return 0xffffffff; } -static int ov16_0226C1F8 (UnkStruct_ov16_02268A14 * param0, int param1) +static int ov16_0226C1F8(UnkStruct_ov16_02268A14 *param0, int param1) { - UnkStruct_ov16_0226CB10 * v0; + UnkStruct_ov16_0226CB10 *v0; u32 v1; - const UnkStruct_ov16_02270670 * v2; + const UnkStruct_ov16_02270670 *v2; int v3, v4; u8 v5[3][2]; - UnkStruct_ov16_02260C00 * v6; - UnkStruct_ov16_0226C378 * v7; + UnkStruct_ov16_02260C00 *v6; + UnkStruct_ov16_0226C378 *v7; v7 = ov16_02263B0C(BattleSystem_BattlerData(param0->unk_00, BattleSystem_BattlerOfType(param0->unk_00, param0->unk_66A))); v0 = ¶m0->unk_6BC; @@ -4008,9 +4195,9 @@ static int ov16_0226C1F8 (UnkStruct_ov16_02268A14 * param0, int param1) return 0xffffffff; } -static void ov16_0226C378 (UnkStruct_ov16_02268A14 * param0, int param1) +static void ov16_0226C378(UnkStruct_ov16_02268A14 *param0, int param1) { - UnkStruct_ov16_0226C378 * v0; + UnkStruct_ov16_0226C378 *v0; int v1, v2, v3; if (param1 == 0) { @@ -4031,11 +4218,11 @@ static void ov16_0226C378 (UnkStruct_ov16_02268A14 * param0, int param1) } } -static int ov16_0226C3C8 (UnkStruct_ov16_02268A14 * param0, int param1) +static int ov16_0226C3C8(UnkStruct_ov16_02268A14 *param0, int param1) { - UnkStruct_ov16_0226CB10 * v0; + UnkStruct_ov16_0226CB10 *v0; u32 v1; - const UnkStruct_ov16_02270670 * v2; + const UnkStruct_ov16_02270670 *v2; int v3, v4; int v5 = 0; u8 v6[4], v7[4]; @@ -4046,7 +4233,7 @@ static int ov16_0226C3C8 (UnkStruct_ov16_02268A14 * param0, int param1) int v23, v24, v25, v26; int v27, v28; int v29; - UnkStruct_ov16_0226C378 * v30; + UnkStruct_ov16_0226C378 *v30; v30 = ov16_02263B0C(BattleSystem_BattlerData(param0->unk_00, BattleSystem_BattlerOfType(param0->unk_00, param0->unk_66A))); v0 = ¶m0->unk_6BC; @@ -4288,9 +4475,9 @@ static int ov16_0226C3C8 (UnkStruct_ov16_02268A14 * param0, int param1) return 0xffffffff; } -static void ov16_0226C9B8 (UnkStruct_ov16_02268A14 * param0, int param1) +static void ov16_0226C9B8(UnkStruct_ov16_02268A14 *param0, int param1) { - UnkStruct_ov16_0226C378 * v0; + UnkStruct_ov16_0226C378 *v0; int v1, v2, v3; if (param1 == 4) { @@ -4314,11 +4501,11 @@ static void ov16_0226C9B8 (UnkStruct_ov16_02268A14 * param0, int param1) } } -static int ov16_0226CA14 (UnkStruct_ov16_02268A14 * param0, int param1) +static int ov16_0226CA14(UnkStruct_ov16_02268A14 *param0, int param1) { - UnkStruct_ov16_0226CB10 * v0; + UnkStruct_ov16_0226CB10 *v0; u32 v1; - const UnkStruct_ov16_02270670 * v2; + const UnkStruct_ov16_02270670 *v2; int v3, v4; v0 = ¶m0->unk_6BC; @@ -4350,7 +4537,7 @@ static int ov16_0226CA14 (UnkStruct_ov16_02268A14 * param0, int param1) return 0xffffffff; } -static u32 ov16_0226CB10 (UnkStruct_ov16_0226CB10 * param0, int param1, int param2, const u8 * param3) +static u32 ov16_0226CB10(UnkStruct_ov16_0226CB10 *param0, int param1, int param2, const u8 *param3) { int v0, v1; u32 v2; @@ -4473,26 +4660,26 @@ static u32 ov16_0226CB10 (UnkStruct_ov16_0226CB10 * param0, int param1, int para return v2; } -int ov16_0226CD08 (UnkStruct_ov16_02268A14 * param0) +int ov16_0226CD08(UnkStruct_ov16_02268A14 *param0) { return param0->unk_6C0; } -void ov16_0226CD10 (UnkStruct_ov16_02268A14 * param0, int param1) +void ov16_0226CD10(UnkStruct_ov16_02268A14 *param0, int param1) { param0->unk_6C0 = param1; } -static int(*const Unk_ov16_0227020C[])(UnkStruct_ov16_02268A14 *) = { +static int (*const Unk_ov16_0227020C[])(UnkStruct_ov16_02268A14 *) = { ov16_0226CD84, ov16_0226CDDC }; -static int ov16_0226CD18 (UnkStruct_ov16_02268A14 * param0) +static int ov16_0226CD18(UnkStruct_ov16_02268A14 *param0) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - PaletteData * v2; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + PaletteData *v2; int v3; v0 = ov16_0223E010(param0->unk_00); @@ -4516,7 +4703,7 @@ static int ov16_0226CD18 (UnkStruct_ov16_02268A14 * param0) return v3; } -static int ov16_0226CD84 (UnkStruct_ov16_02268A14 * param0) +static int ov16_0226CD84(UnkStruct_ov16_02268A14 *param0) { switch (param0->unk_6C4.unk_05) { case 0: @@ -4536,7 +4723,7 @@ static int ov16_0226CD84 (UnkStruct_ov16_02268A14 * param0) return 0xffffffff; } -static int ov16_0226CDDC (UnkStruct_ov16_02268A14 * param0) +static int ov16_0226CDDC(UnkStruct_ov16_02268A14 *param0) { switch (param0->unk_6C4.unk_05) { case 0: @@ -4555,7 +4742,7 @@ static int ov16_0226CDDC (UnkStruct_ov16_02268A14 * param0) return 0xffffffff; } -static int ov16_0226CE34 (UnkStruct_ov16_02268A14 * param0) +static int ov16_0226CE34(UnkStruct_ov16_02268A14 *param0) { switch (param0->unk_6C4.unk_05) { case 0: @@ -4582,10 +4769,10 @@ static int ov16_0226CE34 (UnkStruct_ov16_02268A14 * param0) return 0xffffffff; } -void ov16_0226CEB0 (UnkStruct_ov16_02268A14 * param0, int param1) +void ov16_0226CEB0(UnkStruct_ov16_02268A14 *param0, int param1) { - BGL * v0 = BattleSystem_BGL(param0->unk_00); - PaletteData * v1 = BattleSystem_PaletteSys(param0->unk_00); + BGL *v0 = BattleSystem_BGL(param0->unk_00); + PaletteData *v1 = BattleSystem_PaletteSys(param0->unk_00); GF_ASSERT(param0->unk_66B == 18); @@ -4614,13 +4801,13 @@ void ov16_0226CEB0 (UnkStruct_ov16_02268A14 * param0, int param1) } { - Strbuf* v8; - MessageLoader * v9 = BattleSystem_MessageLoader(param0->unk_00); + Strbuf *v8; + MessageLoader *v9 = BattleSystem_MessageLoader(param0->unk_00); int v10; const u16 v11[][2] = { - {1261, 1262}, - {1263, 1264}, - {1265, 1266}, + { 1261, 1262 }, + { 1263, 1264 }, + { 1265, 1266 }, }; for (v10 = 0; v10 < 2; v10++) { @@ -4637,7 +4824,7 @@ void ov16_0226CEB0 (UnkStruct_ov16_02268A14 * param0, int param1) } } -u8 ov16_0226D088 (UnkStruct_ov16_02268A14 * param0) +u8 ov16_0226D088(UnkStruct_ov16_02268A14 *param0) { return param0->unk_6C1; } diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c index 66d6fe9801..74a94be84c 100644 --- a/src/battle/ov16_0226DB7C.c +++ b/src/battle/ov16_0226DB7C.c @@ -1,3 +1,5 @@ +#include "battle/ov16_0226DB7C.h" + #include #include @@ -5,29 +7,27 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" - -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" +#include "heap.h" #include "narc.h" -#include "unk_0200C6E4.h" #include "sys_task.h" -#include "heap.h" -#include "battle/ov16_0226DB7C.h" +#include "sys_task_manager.h" +#include "unk_0200C6E4.h" typedef struct UnkStruct_ov16_0226DC24_t { - CellActorData * unk_00[5]; - SysTask * unk_14; + CellActorData *unk_00[5]; + SysTask *unk_14; } UnkStruct_ov16_0226DC24; -static void ov16_0226DE10(SysTask * param0, void * param1); -void ov16_0226DB7C(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); -void ov16_0226DBFC(SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov16_0226DC24 * ov16_0226DC24(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov16_0226DCA8(UnkStruct_ov16_0226DC24 * param0); -void ov16_0226DD7C(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4); -void ov16_0226DDE8(UnkStruct_ov16_0226DC24 * param0); +static void ov16_0226DE10(SysTask *param0, void *param1); +void ov16_0226DB7C(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7); +void ov16_0226DBFC(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); +UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0); +void ov16_0226DD7C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4); +void ov16_0226DDE8(UnkStruct_ov16_0226DC24 *param0); static const SpriteTemplate Unk_ov16_02270AA4 = { 0x0, @@ -37,14 +37,14 @@ static const SpriteTemplate Unk_ov16_02270AA4 = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x0, 0x0, 0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x0, 0x0, 0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF }, 0x0, 0x0 }; -void ov16_0226DB7C (SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7) +void ov16_0226DB7C(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param3); @@ -55,7 +55,7 @@ void ov16_0226DB7C (SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteD NARC_dtor(v0); } -void ov16_0226DBFC (SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4) +void ov16_0226DBFC(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4) { SpriteGfxHandler_UnloadCharObjById(param0, param1); SpriteGfxHandler_UnloadPlttObjById(param0, param2); @@ -63,9 +63,9 @@ void ov16_0226DBFC (SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param SpriteGfxHandler_UnloadAnimObjById(param0, param4); } -UnkStruct_ov16_0226DC24 * ov16_0226DC24 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { - UnkStruct_ov16_0226DC24 * v0; + UnkStruct_ov16_0226DC24 *v0; SpriteTemplate v1; int v2; @@ -89,7 +89,7 @@ UnkStruct_ov16_0226DC24 * ov16_0226DC24 (SpriteRenderer * param0, SpriteGfxHandl return v0; } -void ov16_0226DCA8 (UnkStruct_ov16_0226DC24 * param0) +void ov16_0226DCA8(UnkStruct_ov16_0226DC24 *param0) { int v0; @@ -101,7 +101,7 @@ void ov16_0226DCA8 (UnkStruct_ov16_0226DC24 * param0) Heap_FreeToHeap(param0); } -void ov16_0226DCCC (UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9) +void ov16_0226DCCC(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9) { int v0; @@ -120,29 +120,29 @@ void ov16_0226DCCC (UnkStruct_ov16_0226DC24 * param0, int param1, int param2, in } } -void ov16_0226DD54 (UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) +void ov16_0226DD54(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { ov16_0226DCCC(param0, param1, param2, param3, param4, param5, param6, param7, param8, (192 << FX32_SHIFT)); } -void ov16_0226DD7C (UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4) +void ov16_0226DD7C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4) { ov16_0226DD54(param0, param1, param3, param2, param3, param1, param4, param2, param4); } -void ov16_0226DD9C (UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4, fx32 param5) +void ov16_0226DD9C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, int param4, fx32 param5) { ov16_0226DCCC(param0, param1, param3, param2, param3, param1, param4, param2, param4, param5); } -void ov16_0226DDC0 (UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, fx32 param4) +void ov16_0226DDC0(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, fx32 param4) { sub_0200D500(param0->unk_00[4], param1, param2, param4); sub_0200D364(param0->unk_00[4], param3); SpriteActor_EnableObject(param0->unk_00[4], 1); } -void ov16_0226DDE8 (UnkStruct_ov16_0226DC24 * param0) +void ov16_0226DDE8(UnkStruct_ov16_0226DC24 *param0) { int v0; @@ -151,14 +151,14 @@ void ov16_0226DDE8 (UnkStruct_ov16_0226DC24 * param0) } } -void ov16_0226DE04 (UnkStruct_ov16_0226DC24 * param0) +void ov16_0226DE04(UnkStruct_ov16_0226DC24 *param0) { SpriteActor_EnableObject(param0->unk_00[4], 0); } -static void ov16_0226DE10 (SysTask * param0, void * param1) +static void ov16_0226DE10(SysTask *param0, void *param1) { - UnkStruct_ov16_0226DC24 * v0 = param1; + UnkStruct_ov16_0226DC24 *v0 = param1; int v1; if (sub_0200D408(v0->unk_00[0]) == 0) { diff --git a/src/battle/ov16_0226DE44.c b/src/battle/ov16_0226DE44.c index 6f22ad46a1..58f3d4aad3 100644 --- a/src/battle/ov16_0226DE44.c +++ b/src/battle/ov16_0226DE44.c @@ -1,3 +1,5 @@ +#include "battle/ov16_0226DE44.h" + #include #include @@ -5,21 +7,19 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" - -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" +#include "heap.h" #include "narc.h" -#include "unk_0200C6E4.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_0200C6E4.h" #include "unk_0201D15C.h" -#include "battle/ov16_0226DE44.h" typedef struct UnkStruct_ov16_0226DEEC_t { - CellActorData * unk_00; - SysTask * unk_04; + CellActorData *unk_00; + SysTask *unk_04; int unk_08; int unk_0C; int unk_10; @@ -32,14 +32,14 @@ typedef struct UnkStruct_ov16_0226DEEC_t { u8 unk_1E; } UnkStruct_ov16_0226DEEC; -void ov16_0226DE44(SpriteRenderer * param0, SpriteGfxHandler * param1, u32 param2, PaletteData * param3, u32 param4, u32 param5, u32 param6, u32 param7); -void ov16_0226DEC4(SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov16_0226DEEC * ov16_0226DEEC(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov16_0226DF68(UnkStruct_ov16_0226DEEC * param0); -void ov16_0226DFB0(UnkStruct_ov16_0226DEEC * param0, int param1, int param2); -void ov16_0226DFBC(UnkStruct_ov16_0226DEEC * param0); -static void ov16_0226DFD8(SysTask * param0, void * param1); -static void ov16_0226E13C(UnkStruct_ov16_0226DEEC * param0); +void ov16_0226DE44(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7); +void ov16_0226DEC4(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); +UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void ov16_0226DF68(UnkStruct_ov16_0226DEEC *param0); +void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2); +void ov16_0226DFBC(UnkStruct_ov16_0226DEEC *param0); +static void ov16_0226DFD8(SysTask *param0, void *param1); +static void ov16_0226E13C(UnkStruct_ov16_0226DEEC *param0); static const SpriteTemplate Unk_ov16_02270AD8 = { 0x0, @@ -49,14 +49,14 @@ static const SpriteTemplate Unk_ov16_02270AD8 = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x0, 0x0, 0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x0, 0x0, 0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF }, 0x0, 0x0 }; -void ov16_0226DE44 (SpriteRenderer * param0, SpriteGfxHandler * param1, u32 param2, PaletteData * param3, u32 param4, u32 param5, u32 param6, u32 param7) +void ov16_0226DE44(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, PaletteData *param3, u32 param4, u32 param5, u32 param6, u32 param7) { - NARC * v0 = NARC_ctor(NARC_INDEX_GRAPHIC__EV_POKESELECT, param2); + NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__EV_POKESELECT, param2); SpriteRenderer_LoadPalette(param3, 3, param0, param1, v0, 11, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param5); SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, v0, 10, 0, NNS_G2D_VRAM_TYPE_2DSUB, param4); @@ -65,7 +65,7 @@ void ov16_0226DE44 (SpriteRenderer * param0, SpriteGfxHandler * param1, u32 para NARC_dtor(v0); } -void ov16_0226DEC4 (SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4) +void ov16_0226DEC4(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4) { SpriteGfxHandler_UnloadCharObjById(param0, param1); SpriteGfxHandler_UnloadPlttObjById(param0, param2); @@ -73,9 +73,9 @@ void ov16_0226DEC4 (SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param SpriteGfxHandler_UnloadAnimObjById(param0, param4); } -UnkStruct_ov16_0226DEEC * ov16_0226DEEC (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { - UnkStruct_ov16_0226DEEC * v0; + UnkStruct_ov16_0226DEEC *v0; SpriteTemplate v1; v1 = Unk_ov16_02270AD8; @@ -99,14 +99,14 @@ UnkStruct_ov16_0226DEEC * ov16_0226DEEC (SpriteRenderer * param0, SpriteGfxHandl return v0; } -void ov16_0226DF68 (UnkStruct_ov16_0226DEEC * param0) +void ov16_0226DF68(UnkStruct_ov16_0226DEEC *param0) { sub_0200D0F4(param0->unk_00); SysTask_Done(param0->unk_04); Heap_FreeToHeap(param0); } -void ov16_0226DF80 (UnkStruct_ov16_0226DEEC * param0, int param1, int param2, fx32 param3) +void ov16_0226DF80(UnkStruct_ov16_0226DEEC *param0, int param1, int param2, fx32 param3) { ov16_0226E13C(param0); @@ -118,30 +118,30 @@ void ov16_0226DF80 (UnkStruct_ov16_0226DEEC * param0, int param1, int param2, fx SpriteActor_EnableObject(param0->unk_00, 1); } -void ov16_0226DFB0 (UnkStruct_ov16_0226DEEC * param0, int param1, int param2) +void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2) { ov16_0226DF80(param0, param1, param2, (192 << FX32_SHIFT)); } -void ov16_0226DFBC (UnkStruct_ov16_0226DEEC * param0) +void ov16_0226DFBC(UnkStruct_ov16_0226DEEC *param0) { SpriteActor_EnableObject(param0->unk_00, 0); ov16_0226E13C(param0); } -void ov16_0226DFD0 (UnkStruct_ov16_0226DEEC * param0, int param1) +void ov16_0226DFD0(UnkStruct_ov16_0226DEEC *param0, int param1) { param0->unk_18 = param1; } -BOOL ov16_0226DFD4 (UnkStruct_ov16_0226DEEC * param0) +BOOL ov16_0226DFD4(UnkStruct_ov16_0226DEEC *param0) { return param0->unk_1B; } -static void ov16_0226DFD8 (SysTask * param0, void * param1) +static void ov16_0226DFD8(SysTask *param0, void *param1) { - UnkStruct_ov16_0226DEEC * v0 = param1; + UnkStruct_ov16_0226DEEC *v0 = param1; if (v0->unk_1B == 1) { v0->unk_1B = 0; @@ -220,7 +220,7 @@ static void ov16_0226DFD8 (SysTask * param0, void * param1) sub_0200D330(v0->unk_00); } -static void ov16_0226E13C (UnkStruct_ov16_0226DEEC * param0) +static void ov16_0226E13C(UnkStruct_ov16_0226DEEC *param0) { param0->unk_10 = 0; param0->unk_1C = 0; diff --git a/src/battle/ov16_0226E148.c b/src/battle/ov16_0226E148.c index bd2747529e..df664833b1 100644 --- a/src/battle/ov16_0226E148.c +++ b/src/battle/ov16_0226E148.c @@ -1,31 +1,33 @@ +#include "battle/ov16_0226E148.h" + #include #include -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/struct_02006C24_decl.h" + +#include "battle/ov16_0223DF00.h" +#include "battle/ov16_0226871C.h" #include "battle/struct_ov16_02268A14_decl.h" -#include "unk_02005474.h" +#include "heap.h" #include "narc.h" #include "sys_task.h" -#include "heap.h" #include "sys_task_manager.h" -#include "battle/ov16_0223DF00.h" -#include "battle/ov16_0226871C.h" -#include "battle/ov16_0226E148.h" +#include "unk_02005474.h" typedef struct { - BattleSystem * unk_00; + BattleSystem *unk_00; s16 unk_04; s16 unk_06; } UnkStruct_ov16_0226E148; -static void ov16_0226E188(SysTask * param0, void * param1); +static void ov16_0226E188(SysTask *param0, void *param1); -SysTask * ov16_0226E148 (BattleSystem * param0) +SysTask *ov16_0226E148(BattleSystem *param0) { - UnkStruct_ov16_0226E148 * v0; - SysTask * v1; + UnkStruct_ov16_0226E148 *v0; + SysTask *v1; v0 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0226E148)); MI_CpuClear8(v0, sizeof(UnkStruct_ov16_0226E148)); @@ -36,9 +38,9 @@ SysTask * ov16_0226E148 (BattleSystem * param0) return v1; } -void ov16_0226E174 (SysTask * param0) +void ov16_0226E174(SysTask *param0) { - UnkStruct_ov16_0226E148 * v0; + UnkStruct_ov16_0226E148 *v0; v0 = SysTask_GetParam(param0); @@ -46,10 +48,10 @@ void ov16_0226E174 (SysTask * param0) SysTask_Done(param0); } -static void ov16_0226E188 (SysTask * param0, void * param1) +static void ov16_0226E188(SysTask *param0, void *param1) { - UnkStruct_ov16_0226E148 * v0 = param1; - UnkStruct_ov16_02268A14 * v1; + UnkStruct_ov16_0226E148 *v0 = param1; + UnkStruct_ov16_02268A14 *v1; v1 = ov16_0223E02C(v0->unk_00); @@ -58,7 +60,7 @@ static void ov16_0226E188 (SysTask * param0, void * param1) GF_ASSERT(v1 != NULL); { - NARC * v2, * v3; + NARC *v2, *v3; v2 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG, 5); v3 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 5); diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c index 5a73b59708..230a85c4be 100644 --- a/src/battle/party_gauge.c +++ b/src/battle/party_gauge.c @@ -1,10 +1,8 @@ -#include "enums.h" +#include "battle/party_gauge.h" #include #include -#include "assert.h" - #include "constants/heap.h" #include "constants/palette.h" #include "consts/sdat.h" @@ -13,20 +11,21 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/battle_io.h" -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" -#include "unk_02005474.h" +#include "battle/ov16_0223DF00.h" + +#include "assert.h" +#include "enums.h" +#include "heap.h" #include "narc.h" -#include "unk_0200C6E4.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" +#include "unk_0200C6E4.h" #include "unk_020218BC.h" -#include "battle/ov16_0223DF00.h" -#include "battle/party_gauge.h" typedef struct { CellActorData *cells; @@ -89,7 +88,7 @@ static void HidePokeballsStartOfBattleTask(SysTask *task, void *data); static void HidePokeballsMidBattleTask(SysTask *task, void *data); static int PokeballsAnimationFrame(enum PartyGaugeBallStatus status, enum PartyGaugeSide side); static int FlippedAnimationFrame(int frame); -static PartyGauge* NewPartyGauge(void); +static PartyGauge *NewPartyGauge(void); static void FreePartyGauge(PartyGauge *partyGauge); // TODO: enum? @@ -138,72 +137,72 @@ static const SpriteTemplate sPokeballTemplate = { .transferToVRAM = FALSE, }; -#define ARROW_TASK_PRIORITY 500 -#define POKEBALL_TASK_PRIORITY (ARROW_TASK_PRIORITY + 1) +#define ARROW_TASK_PRIORITY 500 +#define POKEBALL_TASK_PRIORITY (ARROW_TASK_PRIORITY + 1) -#define SCREEN_EDGE_RIGHT 256 -#define SCREEN_EDGE_LEFT 0 +#define SCREEN_EDGE_RIGHT 256 +#define SCREEN_EDGE_LEFT 0 -#define ARROW_X_START_OURS (SCREEN_EDGE_RIGHT + 96) // 96 pixels off-screem -#define ARROW_X_START_THEIRS (SCREEN_EDGE_LEFT - 96) // 96 pixels off-screen -#define ARROW_X_END_OURS (SCREEN_EDGE_RIGHT - 32) -#define ARROW_X_END_THEIRS (SCREEN_EDGE_LEFT + 32) -#define ARROW_Y_POS_OURS 120 -#define ARROW_Y_POS_THEIRS 56 +#define ARROW_X_START_OURS (SCREEN_EDGE_RIGHT + 96) // 96 pixels off-screem +#define ARROW_X_START_THEIRS (SCREEN_EDGE_LEFT - 96) // 96 pixels off-screen +#define ARROW_X_END_OURS (SCREEN_EDGE_RIGHT - 32) +#define ARROW_X_END_THEIRS (SCREEN_EDGE_LEFT + 32) +#define ARROW_Y_POS_OURS 120 +#define ARROW_Y_POS_THEIRS 56 #define POKEBALL_X_START_OURS (SCREEN_EDGE_RIGHT + 20) -#define POKEBALL_X_START_THEIRS (SCREEN_EDGE_LEFT - 20) +#define POKEBALL_X_START_THEIRS (SCREEN_EDGE_LEFT - 20) #define POKEBALL_X_END_OURS (SCREEN_EDGE_RIGHT - 128 + 34) -#define POKEBALL_X_END_THEIRS (SCREEN_EDGE_LEFT + 128 - 34) +#define POKEBALL_X_END_THEIRS (SCREEN_EDGE_LEFT + 128 - 34) #define POKEBALL_Y_POS_OURS (ARROW_Y_POS_OURS - 6) #define POKEBALL_Y_POS_THEIRS (ARROW_Y_POS_THEIRS - 6) -#define POKEBALL_SPACING 16 -#define POKEBALL_OVERFLOW_SPACING 15 -#define POKEBALL_OVERFLOW_LEN 6 +#define POKEBALL_SPACING 16 +#define POKEBALL_OVERFLOW_SPACING 15 +#define POKEBALL_OVERFLOW_LEN 6 -#define ARROW_IN_SPEED (18 << 8) -#define ARROW_OUT_SPEED (4 << 8) -#define ARROW_FADE_SPEED (1 << 8) +#define ARROW_IN_SPEED (18 << 8) +#define ARROW_OUT_SPEED (4 << 8) +#define ARROW_FADE_SPEED (1 << 8) -#define POKEBALL_IN_SPEED (18 << 8) -#define POKEBALL_IN_SPEED_SLOW (6 << 8) -#define POKEBALL_OUT_SPEED (12 << 8) +#define POKEBALL_IN_SPEED (18 << 8) +#define POKEBALL_IN_SPEED_SLOW (6 << 8) +#define POKEBALL_OUT_SPEED (12 << 8) -#define POKEBALL_SLOT_SHOW_DELAY 3 -#define POKEBALL_FLAT_SHOW_DELAY 5 +#define POKEBALL_SLOT_SHOW_DELAY 3 +#define POKEBALL_FLAT_SHOW_DELAY 5 -#define HIGH_LOW_Y_POS_DIFF 36 +#define HIGH_LOW_Y_POS_DIFF 36 __attribute__((aligned(4))) static const u16 sArrowYPosOurs[] = { - [PARTY_GAUGE_POSITION_HIGH] = ARROW_Y_POS_OURS - HIGH_LOW_Y_POS_DIFF, + [PARTY_GAUGE_POSITION_HIGH] = ARROW_Y_POS_OURS - HIGH_LOW_Y_POS_DIFF, [PARTY_GAUGE_POSITION_MIDDLE] = ARROW_Y_POS_OURS, - [PARTY_GAUGE_POSITION_LOW] = ARROW_Y_POS_OURS + [PARTY_GAUGE_POSITION_LOW] = ARROW_Y_POS_OURS }; __attribute__((aligned(4))) static const u16 sArrowYPosTheirs[] = { - [PARTY_GAUGE_POSITION_HIGH] = ARROW_Y_POS_THEIRS - HIGH_LOW_Y_POS_DIFF, + [PARTY_GAUGE_POSITION_HIGH] = ARROW_Y_POS_THEIRS - HIGH_LOW_Y_POS_DIFF, [PARTY_GAUGE_POSITION_MIDDLE] = ARROW_Y_POS_THEIRS, - [PARTY_GAUGE_POSITION_LOW] = ARROW_Y_POS_THEIRS + [PARTY_GAUGE_POSITION_LOW] = ARROW_Y_POS_THEIRS }; __attribute__((aligned(4))) static const u16 sPokeballYPosOurs[] = { - [PARTY_GAUGE_POSITION_HIGH] = POKEBALL_Y_POS_OURS - HIGH_LOW_Y_POS_DIFF, + [PARTY_GAUGE_POSITION_HIGH] = POKEBALL_Y_POS_OURS - HIGH_LOW_Y_POS_DIFF, [PARTY_GAUGE_POSITION_MIDDLE] = POKEBALL_Y_POS_OURS, - [PARTY_GAUGE_POSITION_LOW] = POKEBALL_Y_POS_OURS + [PARTY_GAUGE_POSITION_LOW] = POKEBALL_Y_POS_OURS }; __attribute__((aligned(4))) static const u16 sPokeballYPosTheirs[] = { - [PARTY_GAUGE_POSITION_HIGH] = POKEBALL_Y_POS_THEIRS - HIGH_LOW_Y_POS_DIFF, + [PARTY_GAUGE_POSITION_HIGH] = POKEBALL_Y_POS_THEIRS - HIGH_LOW_Y_POS_DIFF, [PARTY_GAUGE_POSITION_MIDDLE] = POKEBALL_Y_POS_THEIRS, - [PARTY_GAUGE_POSITION_LOW] = POKEBALL_Y_POS_THEIRS + [PARTY_GAUGE_POSITION_LOW] = POKEBALL_Y_POS_THEIRS }; // TODO: naix? -#define PARTY_GAUGE_NCLR 110 -#define PARTY_GAUGE_NCGR_BIN 340 -#define PARTY_GAUGE_NCER_BIN 341 -#define PARTY_GAUGE_NANR_BIN 342 +#define PARTY_GAUGE_NCLR 110 +#define PARTY_GAUGE_NCGR_BIN 340 +#define PARTY_GAUGE_NCER_BIN 341 +#define PARTY_GAUGE_NANR_BIN 342 void PartyGauge_LoadGraphics(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, PaletteData *palette) { @@ -225,7 +224,7 @@ void PartyGauge_FreeGraphics(SpriteGfxHandler *gfxHandler) SpriteGfxHandler_UnloadAnimObjById(gfxHandler, PARTY_GAUGE_ANIM_RES_ID); } -static PartyGauge* NewPartyGauge() +static PartyGauge *NewPartyGauge() { PartyGauge *gauge = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PartyGauge)); MI_CpuClear8(gauge, sizeof(PartyGauge)); @@ -238,7 +237,7 @@ static void FreePartyGauge(PartyGauge *gauge) Heap_FreeToHeap(gauge); } -PartyGauge* PartyGauge_Show(u8 ballStatus[], enum PartyGaugeSide side, enum ShowPartyGaugeType showType, enum PartyGaugePosition pos, SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler) +PartyGauge *PartyGauge_Show(u8 ballStatus[], enum PartyGaugeSide side, enum ShowPartyGaugeType showType, enum PartyGaugePosition pos, SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler) { PartyGauge *gauge = NewPartyGauge(); ShowArrow(&gauge->arrow, side, pos, renderer, gfxHandler); @@ -348,7 +347,7 @@ static void ShowArrowTask(SysTask *task, void *data) s16 x, y; SpriteActor_GetSpritePositionXY(arrow->cells, &x, &y); - arrow->x = x << 8; + arrow->x = x << 8; arrow->state++; // fall-through case SHOW_ARROW_DRAW: @@ -414,8 +413,7 @@ static void HideArrowTask(SysTask *task, void *data) SpriteActor_SetOAMMode(arrow->cells, GX_OAM_MODE_XLU); arrow->alpha = 16 << 8; - G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, - (arrow->alpha >> 8), 16 - (arrow->alpha >> 8)); + G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, (arrow->alpha >> 8), 16 - (arrow->alpha >> 8)); arrow->state++; // fall-through case HIDE_ARROW_DELAY: @@ -512,7 +510,7 @@ static void ShowPokeballs(PartyGaugePokeballs *pokeballs, s8 *numBalls, enum Par static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data) { - PartyGaugePokeballs * pokeballs = data; + PartyGaugePokeballs *pokeballs = data; switch (pokeballs->state) { case SHOW_POKEBALLS_INIT: @@ -606,7 +604,7 @@ static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data) SpriteActor_UpdateObject(pokeballs->cells->unk_00); break; - + default: SpriteActor_SetAnimFrame(pokeballs->cells->unk_00, 0); SysTask_Done(task); @@ -691,7 +689,7 @@ enum { static void HidePokeballsStartOfBattleTask(SysTask *task, void *data) { - PartyGaugePokeballs * pokeballs = data; + PartyGaugePokeballs *pokeballs = data; if (*(pokeballs->arrowAlpha) == 0) { pokeballs->state = HIDE_POKEBALLS_BREAK; @@ -774,10 +772,10 @@ static int PokeballsAnimationFrame(enum PartyGaugeBallStatus status, enum PartyG case BALL_STATUS_NO_MON: default: return PGANM_POKEBALL_EMPTY_SLOT; - + case BALL_STATUS_MON_ALIVE: return (side == PARTY_GAUGE_OURS) ? PGANM_POKEBALL_HEALTHY_OURS : PGANM_POKEBALL_HEALTHY_THEIRS; - + case BALL_STATUS_MON_FAINTED: return (side == PARTY_GAUGE_OURS) ? PGANM_POKEBALL_FAINTED_OURS : PGANM_POKEBALL_FAINTED_THEIRS; diff --git a/src/battle/trainer_ai/trainer_ai.c b/src/battle/trainer_ai/trainer_ai.c index 48334af425..4c2c2d8fe0 100644 --- a/src/battle/trainer_ai/trainer_ai.c +++ b/src/battle/trainer_ai/trainer_ai.c @@ -1,64 +1,64 @@ +#include "constants/battle/trainer_ai.h" + #include #include -#include "pch/global_pch.h" -#include "assert.h" - -#include "consts/abilities.h" #include "constants/battle.h" #include "constants/items.h" #include "constants/species.h" -#include "constants/battle/trainer_ai.h" +#include "consts/abilities.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/battle_system.h" +#include "struct_decls/struct_party_decl.h" #include "struct_defs/battle_system.h" -#include "battle/common.h" #include "battle/ai_context.h" #include "battle/battle_context.h" #include "battle/battle_controller.h" -#include "battle/trainer_ai.h" #include "battle/battle_lib.h" +#include "battle/common.h" +#include "battle/ov16_0223DF00.h" +#include "battle/trainer_ai.h" +#include "pch/global_pch.h" +#include "assert.h" #include "flags.h" -#include "pokemon.h" #include "party.h" -#include "battle/ov16_0223DF00.h" +#include "pokemon.h" static const u16 sRiskyMoves[] = { - BATTLE_EFFECT_HALVE_DEFENSE, - BATTLE_EFFECT_RECOVER_DAMAGE_SLEEP, - BATTLE_EFFECT_CHARGE_TURN_HIGH_CRIT, - BATTLE_EFFECT_CHARGE_TURN_HIGH_CRIT_FLINCH, - BATTLE_EFFECT_RECHARGE_AFTER, - BATTLE_EFFECT_CHARGE_TURN_DEF_UP, - BATTLE_EFFECT_SKIP_CHARGE_TURN_IN_SUN, - BATTLE_EFFECT_SPIT_UP, - BATTLE_EFFECT_HIT_LAST_WHIFF_IF_HIT, - BATTLE_EFFECT_LOWER_OWN_ATK_AND_DEF, - BATTLE_EFFECT_DECREASE_POWER_WITH_LESS_USER_HP, - BATTLE_EFFECT_HIT_FIRST_IF_TARGET_ATTACKING, - BATTLE_EFFECT_RECOIL_HALF, - 0xFFFF + BATTLE_EFFECT_HALVE_DEFENSE, + BATTLE_EFFECT_RECOVER_DAMAGE_SLEEP, + BATTLE_EFFECT_CHARGE_TURN_HIGH_CRIT, + BATTLE_EFFECT_CHARGE_TURN_HIGH_CRIT_FLINCH, + BATTLE_EFFECT_RECHARGE_AFTER, + BATTLE_EFFECT_CHARGE_TURN_DEF_UP, + BATTLE_EFFECT_SKIP_CHARGE_TURN_IN_SUN, + BATTLE_EFFECT_SPIT_UP, + BATTLE_EFFECT_HIT_LAST_WHIFF_IF_HIT, + BATTLE_EFFECT_LOWER_OWN_ATK_AND_DEF, + BATTLE_EFFECT_DECREASE_POWER_WITH_LESS_USER_HP, + BATTLE_EFFECT_HIT_FIRST_IF_TARGET_ATTACKING, + BATTLE_EFFECT_RECOIL_HALF, + 0xFFFF }; static const u16 sAltPowerCalcMoves[] = { - BATTLE_EFFECT_RANDOM_POWER_BASED_ON_IVS, - BATTLE_EFFECT_POWER_BASED_ON_LOW_SPEED, - BATTLE_EFFECT_NATURAL_GIFT, - BATTLE_EFFECT_JUDGEMENT, - BATTLE_EFFECT_40_DAMAGE_FLAT, - BATTLE_EFFECT_LEVEL_DAMAGE_FLAT, - BATTLE_EFFECT_RANDOM_DAMAGE_1_TO_150_LEVEL, - BATTLE_EFFECT_POWER_BASED_ON_FRIENDSHIP, - BATTLE_EFFECT_POWER_BASED_ON_LOW_FRIENDSHIP, - BATTLE_EFFECT_10_DAMAGE_FLAT, - BATTLE_EFFECT_INCREASE_POWER_WITH_WEIGHT, - 0xFFFF + BATTLE_EFFECT_RANDOM_POWER_BASED_ON_IVS, + BATTLE_EFFECT_POWER_BASED_ON_LOW_SPEED, + BATTLE_EFFECT_NATURAL_GIFT, + BATTLE_EFFECT_JUDGEMENT, + BATTLE_EFFECT_40_DAMAGE_FLAT, + BATTLE_EFFECT_LEVEL_DAMAGE_FLAT, + BATTLE_EFFECT_RANDOM_DAMAGE_1_TO_150_LEVEL, + BATTLE_EFFECT_POWER_BASED_ON_FRIENDSHIP, + BATTLE_EFFECT_POWER_BASED_ON_LOW_FRIENDSHIP, + BATTLE_EFFECT_10_DAMAGE_FLAT, + BATTLE_EFFECT_INCREASE_POWER_WITH_WEIGHT, + 0xFFFF }; -typedef void (*AICommandFunc)(BattleSystem*, BattleContext*); +typedef void (*AICommandFunc)(BattleSystem *, BattleContext *); enum AIEvalStep { AI_EVAL_STEP_INIT, @@ -321,8 +321,8 @@ void TrainerAI_Init(BattleSystem *battleSys, BattleContext *battleCtx, u8 battle u8 invalidMoves; // explicit memset - u8 *adrs = (u8*)&AI_CONTEXT; - for (i = 0; i < XtOffset(AIContext*, battlerMoves); i++) { + u8 *adrs = (u8 *)&AI_CONTEXT; + for (i = 0; i < XtOffset(AIContext *, battlerMoves); i++) { adrs[i] = 0; } @@ -384,9 +384,9 @@ u8 TrainerAI_Main(BattleSystem *battleSys, u8 battler) /** * @brief Main action-choice routine for single battles. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return The action that the AI picked for its turn. See enum AIActionChoice. */ static u8 TrainerAI_MainSingles(BattleSystem *battleSys, BattleContext *battleCtx) @@ -425,7 +425,7 @@ static u8 TrainerAI_MainSingles(BattleSystem *battleSys, BattleContext *battleCt maxScoreMoveSlots[0] = AI_ENEMY_ATTACK_1; for (i = 1; i < LEARNED_MOVES_MAX; i++) { - if (battleCtx->battleMons[AI_CONTEXT.attacker].moves[i]) { // Attacker has a move in this slot + if (battleCtx->battleMons[AI_CONTEXT.attacker].moves[i]) { // Attacker has a move in this slot // Append to the list of max-score moves if equal score to the current max if (maxScoreMoves[0] == AI_CONTEXT.moveScore[i]) { maxScoreMoves[numMaxScoreMoves] = AI_CONTEXT.moveScore[i]; @@ -450,9 +450,9 @@ static u8 TrainerAI_MainSingles(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Main action-choice routine for double battles. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return The action that the AI picked for its turn. See enum AIActionChoice. */ static u8 TrainerAI_MainDoubles(BattleSystem *battleSys, BattleContext *battleCtx) @@ -566,7 +566,7 @@ static u8 TrainerAI_MainDoubles(BattleSystem *battleSys, BattleContext *battleCt // Override targets as needed if (AI_CONTEXT.moveTable[move].range == RANGE_USER_OR_ALLY - && Battler_Side(battleSys, AI_CONTEXT.selectedTarget[AI_CONTEXT.attacker]) == 0) { + && Battler_Side(battleSys, AI_CONTEXT.selectedTarget[AI_CONTEXT.attacker]) == 0) { AI_CONTEXT.selectedTarget[AI_CONTEXT.attacker] = AI_CONTEXT.attacker; } @@ -579,12 +579,12 @@ static u8 TrainerAI_MainDoubles(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Evaluation loop for scoring each move available to the AI. - * + * * This does NOT score the potential choices of using an item or switching * a Pokemon for turn. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ static void TrainerAI_EvalMoves(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -614,7 +614,7 @@ static void TrainerAI_EvalMoves(BattleSystem *battleSys, BattleContext *battleCt // If we haven't gone through all the moves, loop back to INIT state and evaluate the next move AI_CONTEXT.moveSlot++; if (AI_CONTEXT.moveSlot < LEARNED_MOVES_MAX - && (AI_CONTEXT.stateFlags & AI_STATUS_FLAG_BREAK) == FALSE) { + && (AI_CONTEXT.stateFlags & AI_STATUS_FLAG_BREAK) == FALSE) { AI_CONTEXT.evalStep = AI_EVAL_STEP_INIT; } else { AI_CONTEXT.evalStep++; @@ -1006,7 +1006,7 @@ static void AICmd_IfAttackerHasDamagingMoves(BattleSystem *battleSys, BattleCont int i; for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (battleCtx->battleMons[AI_CONTEXT.attacker].moves[i] != MOVE_NONE - && MOVE_DATA(battleCtx->battleMons[AI_CONTEXT.attacker].moves[i]).power) { + && MOVE_DATA(battleCtx->battleMons[AI_CONTEXT.attacker].moves[i]).power) { break; } } @@ -1024,7 +1024,7 @@ static void AICmd_IfAttackerHasNoDamagingMoves(BattleSystem *battleSys, BattleCo int i; for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (battleCtx->battleMons[AI_CONTEXT.attacker].moves[i] != MOVE_NONE - && MOVE_DATA(battleCtx->battleMons[AI_CONTEXT.attacker].moves[i]).power) { + && MOVE_DATA(battleCtx->battleMons[AI_CONTEXT.attacker].moves[i]).power) { break; } } @@ -1077,7 +1077,7 @@ static void AICmd_LoadTypeFrom(BattleSystem *battleSys, BattleContext *battleCtx partner = BattleSystem_Partner(battleSys, AI_CONTEXT.defender); AI_CONTEXT.calcTemp = BattleMon_Get(battleCtx, partner, BATTLEMON_TYPE_1, NULL); break; - + case LOAD_ATTACKER_PARTNER_TYPE_2: partner = BattleSystem_Partner(battleSys, AI_CONTEXT.attacker); AI_CONTEXT.calcTemp = BattleMon_Get(battleCtx, partner, BATTLEMON_TYPE_2, NULL); @@ -1139,7 +1139,7 @@ static void AICmd_FlagMoveDamageScore(BattleSystem *battleSys, BattleContext *ba } if (sAltPowerCalcMoves[altPowerIdx] != 0xFFFF - || (MOVE_DATA(AI_CONTEXT.move).power > 1 && sRiskyMoves[riskyIdx] == 0xFFFF)) { + || (MOVE_DATA(AI_CONTEXT.move).power > 1 && sRiskyMoves[riskyIdx] == 0xFFFF)) { for (i = 0; i < STAT_MAX; i++) { ivs[i] = BattleMon_Get(battleCtx, AI_CONTEXT.attacker, BATTLEMON_HP_IV + i, NULL); } @@ -1252,10 +1252,10 @@ static void AICmd_CountAlivePartyBattlers(BattleSystem *battleSys, BattleContext Pokemon *mon = Party_GetPokemonBySlotIndex(party, i); if (i != battlerSlot - && i != partnerSlot - && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && i != partnerSlot + && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { AI_CONTEXT.calcTemp++; } } @@ -1289,8 +1289,8 @@ static void AICmd_LoadBattlerAbility(BattleSystem *battleSys, BattleContext *bat } else { // If the opponent has an ability that traps us, we should already know about it (because it self-announces) if (battleCtx->battleMons[battler].ability == ABILITY_SHADOW_TAG - || battleCtx->battleMons[battler].ability == ABILITY_MAGNET_PULL - || battleCtx->battleMons[battler].ability == ABILITY_ARENA_TRAP) { + || battleCtx->battleMons[battler].ability == ABILITY_MAGNET_PULL + || battleCtx->battleMons[battler].ability == ABILITY_ARENA_TRAP) { AI_CONTEXT.calcTemp = battleCtx->battleMons[battler].ability; } else { // Try to guess the opponent's ability (flip a coin) @@ -1334,8 +1334,8 @@ static void AICmd_CheckBattlerAbility(BattleSystem *battleSys, BattleContext *ba } else { // If the opponent has an ability that traps us, we should already know about it (because it self-announces) if (battleCtx->battleMons[battler].ability == ABILITY_SHADOW_TAG - || battleCtx->battleMons[battler].ability == ABILITY_MAGNET_PULL - || battleCtx->battleMons[battler].ability == ABILITY_ARENA_TRAP) { + || battleCtx->battleMons[battler].ability == ABILITY_MAGNET_PULL + || battleCtx->battleMons[battler].ability == ABILITY_ARENA_TRAP) { tmpAbility = battleCtx->battleMons[battler].ability; } else { // Try to guess the opponent's ability (flip a coin) @@ -1347,7 +1347,7 @@ static void AICmd_CheckBattlerAbility(BattleSystem *battleSys, BattleContext *ba // prefer ability 1 for the final check if (ability1 != expected && ability2 != expected) { tmpAbility = ability1; - // Otherwise, pretend that we don't know about it + // Otherwise, pretend that we don't know about it } else { tmpAbility = ABILITY_NONE; } @@ -1474,10 +1474,10 @@ static void AICmd_IfPartyMemberStatus(BattleSystem *battleSys, BattleContext *ba Pokemon *mon = Party_GetPokemonBySlotIndex(party, i); if (i != slot1 && i != slot2 - && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG - && (Pokemon_GetValue(mon, MON_DATA_STATUS_CONDITION, NULL) & statusMask)) { + && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG + && (Pokemon_GetValue(mon, MON_DATA_STATUS_CONDITION, NULL) & statusMask)) { AIScript_Iter(battleCtx, jump); return; } @@ -1507,10 +1507,10 @@ static void AICmd_IfPartyMemberNotStatus(BattleSystem *battleSys, BattleContext Pokemon *mon = Party_GetPokemonBySlotIndex(party, i); if (i != slot1 && i != slot2 - && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG - && (Pokemon_GetValue(mon, MON_DATA_STATUS_CONDITION, NULL) & statusMask) == FALSE) { + && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG + && (Pokemon_GetValue(mon, MON_DATA_STATUS_CONDITION, NULL) & statusMask) == FALSE) { AIScript_Iter(battleCtx, jump); return; } @@ -1657,7 +1657,7 @@ static void AICmd_IfCurrentMoveKills(BattleSystem *battleSys, BattleContext *bat } if (sAltPowerCalcMoves[altPowerIdx] != 0xFFFF - || (MOVE_DATA(AI_CONTEXT.move).power > 1 && sRiskyMoves[riskyIdx] == 0xFFFF)) { + || (MOVE_DATA(AI_CONTEXT.move).power > 1 && sRiskyMoves[riskyIdx] == 0xFFFF)) { u8 ivs[STAT_MAX]; for (int stat = STAT_HP; stat < STAT_MAX; stat++) { ivs[stat] = BattleMon_Get(battleCtx, AI_CONTEXT.attacker, BATTLEMON_HP_IV + stat, NULL); @@ -1708,7 +1708,7 @@ static void AICmd_IfCurrentMoveDoesNotKill(BattleSystem *battleSys, BattleContex } if (sAltPowerCalcMoves[altPowerIdx] != 0xFFFF - || (MOVE_DATA(AI_CONTEXT.move).power > 1 && sRiskyMoves[riskyIdx] == 0xFFFF)) { + || (MOVE_DATA(AI_CONTEXT.move).power > 1 && sRiskyMoves[riskyIdx] == 0xFFFF)) { u8 ivs[STAT_MAX]; for (int stat = STAT_HP; stat < STAT_MAX; stat++) { ivs[stat] = BattleMon_Get(battleCtx, AI_CONTEXT.attacker, BATTLEMON_HP_IV + stat, NULL); @@ -1856,7 +1856,7 @@ static void AICmd_IfMoveEffectKnown(BattleSystem *battleSys, BattleContext *batt case AI_BATTLER_ATTACKER: for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (battleCtx->battleMons[battler].moves[i] - && MOVE_DATA(battleCtx->battleMons[battler].moves[i]).effect == effect) { + && MOVE_DATA(battleCtx->battleMons[battler].moves[i]).effect == effect) { break; } } @@ -1869,7 +1869,7 @@ static void AICmd_IfMoveEffectKnown(BattleSystem *battleSys, BattleContext *batt case AI_BATTLER_DEFENDER: for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (AI_CONTEXT.battlerMoves[battler][i] - && MOVE_DATA(AI_CONTEXT.battlerMoves[battler][i]).effect == effect) { + && MOVE_DATA(AI_CONTEXT.battlerMoves[battler][i]).effect == effect) { break; } } @@ -1898,7 +1898,7 @@ static void AICmd_IfMoveEffectNotKnown(BattleSystem *battleSys, BattleContext *b case AI_BATTLER_ATTACKER: for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (battleCtx->battleMons[battler].moves[i] - && MOVE_DATA(battleCtx->battleMons[battler].moves[i]).effect == effect) { + && MOVE_DATA(battleCtx->battleMons[battler].moves[i]).effect == effect) { break; } } @@ -1911,7 +1911,7 @@ static void AICmd_IfMoveEffectNotKnown(BattleSystem *battleSys, BattleContext *b case AI_BATTLER_DEFENDER: for (i = 0; i < LEARNED_MOVES_MAX; i++) { if (AI_CONTEXT.battlerMoves[battler][i] - && MOVE_DATA(AI_CONTEXT.battlerMoves[battler][i]).effect == effect) { + && MOVE_DATA(AI_CONTEXT.battlerMoves[battler][i]).effect == effect) { break; } } @@ -2083,7 +2083,7 @@ static void AICmd_IfAnyPartyMemberIsWounded(BattleSystem *battleSys, BattleConte Pokemon *mon = BattleSystem_PartyPokemon(battleSys, battler, i); if (i != battleCtx->selectedPartySlot[battler] - && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL)) { + && Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL)) { AIScript_Iter(battleCtx, jump); break; } @@ -2249,8 +2249,8 @@ static void AICmd_IfPartyMemberDealsMoreDamage(BattleSystem *battleSys, BattleCo partyMon = BattleSystem_PartyPokemon(battleSys, battler, i); if (Pokemon_GetValue(partyMon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(partyMon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(partyMon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(partyMon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(partyMon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { for (j = 0; j < LEARNED_MOVES_MAX; j++) { partyMonMoves[j] = Pokemon_GetValue(partyMon, MON_DATA_MOVE1 + j, NULL); } @@ -2426,8 +2426,8 @@ static void AICmd_IfBattlerHasEqualStat(BattleSystem *battleSys, BattleContext * /** * @brief Get the values for a given stat for the AI battler and another given battler. - * - * @param battleCtx + * + * @param battleCtx * @param battler The other battler whose stats will be retrieved. * @param buf1 Buffer to hold the stat-value for the AI battler. * @param buf2 Buffer to hold the stat-value for the given other battler. @@ -2497,7 +2497,7 @@ static void AICmd_CheckIfHighestDamageWithPartner(BattleSystem *battleSys, Battl } if (sAltPowerCalcMoves[k] != 0xFFFF - || (MOVE_DATA(AI_CONTEXT.move).power > 1 && sRiskyMoves[j] == 0xFFFF)) { + || (MOVE_DATA(AI_CONTEXT.move).power > 1 && sRiskyMoves[j] == 0xFFFF)) { battler = AI_CONTEXT.attacker; for (j = 0; j < MAX_BATTLERS_PER_SIDE; j++) { @@ -2649,8 +2649,8 @@ static void AICmd_LoadProtectChain(BattleSystem *battleSys, BattleContext *battl u8 battler = AIScript_Battler(battleCtx, inBattler); if (battleCtx->moveProtect[battler] != MOVE_PROTECT - && battleCtx->moveProtect[battler] != MOVE_DETECT - && battleCtx->moveProtect[battler] != MOVE_ENDURE) { + && battleCtx->moveProtect[battler] != MOVE_DETECT + && battleCtx->moveProtect[battler] != MOVE_ENDURE) { AI_CONTEXT.calcTemp = 0; } else { AI_CONTEXT.calcTemp = battleCtx->battleMons[battler].moveEffectsData.protectSuccessTurns; @@ -2769,9 +2769,9 @@ static void AICmd_LoadAbility(BattleSystem *battleSys, BattleContext *battleCtx) /** * @brief Push an address for the AI script onto the cursor stack. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param offset Distance to jump ahead after pushing the cursor. */ static void AIScript_PushCursor(BattleSystem *battleSys, BattleContext *battleCtx, int offset) @@ -2784,9 +2784,9 @@ static void AIScript_PushCursor(BattleSystem *battleSys, BattleContext *battleCt /** * @brief Pop the top element of the cursor stack into the cursor. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @return TRUE if the cursor stack had an element to be popped; FALSE * if it was empty. */ @@ -2804,9 +2804,9 @@ static BOOL AIScript_PopCursor(BattleSystem *battleSys, BattleContext *battleCtx /** * @brief Record the last move used by an active battler, if it is not * already known. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx */ static void TrainerAI_RecordLastMove(BattleSystem *battleSys, BattleContext *battleCtx) { @@ -2825,8 +2825,8 @@ static void TrainerAI_RecordLastMove(BattleSystem *battleSys, BattleContext *bat /** * @brief Read a word from the AI script at the current cursor position, * then increment the cursor. - * - * @param battleCtx + * + * @param battleCtx * @return Current word for the AI script under the cursor. */ static int AIScript_Read(BattleContext *battleCtx) @@ -2840,8 +2840,8 @@ static int AIScript_Read(BattleContext *battleCtx) /** * @brief Read a word from the AI script at the current cursor position * offset by a specified value, then increment the cursor. - * - * @param battleCtx + * + * @param battleCtx * @return Current word for the AI script under the cursor + an offset. */ static int AIScript_ReadOffset(BattleContext *battleCtx, int ofs) @@ -2851,8 +2851,8 @@ static int AIScript_ReadOffset(BattleContext *battleCtx, int ofs) /** * @brief Increment the cursor for the AI script by a fixed amount. - * - * @param battleCtx + * + * @param battleCtx * @param i Amount by which to increment the script cursor. */ static void AIScript_Iter(BattleContext *battleCtx, int i) @@ -2863,8 +2863,8 @@ static void AIScript_Iter(BattleContext *battleCtx, int i) /** * @brief Determine the true battler ID for an input battler value as * recognized by the AI script. - * - * @param battleCtx + * + * @param battleCtx * @param inBattler The input battler value. * @return True battler ID for the input battler value. */ @@ -2889,9 +2889,9 @@ static u8 AIScript_Battler(BattleContext *battleCtx, u8 inBattler) /** * @brief Calculate the damage that will be done by all of an attacker's moves. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param attacker The attacker's battler ID. * @param moves The attacker's moveset. * @param damageVals Out-param for all damage values as computed by the routine. @@ -2931,7 +2931,7 @@ static s32 TrainerAI_CalcAllDamage(BattleSystem *battleSys, BattleContext *battl } if (sAltPowerCalcMoves[altPowerScanIdx] != 0xFFFF - || (moves[i] != MOVE_NONE && sRiskyMoves[riskyScanIdx] == 0xFFFF && MOVE_DATA(moves[i]).power > 1)) { + || (moves[i] != MOVE_NONE && sRiskyMoves[riskyScanIdx] == 0xFFFF && MOVE_DATA(moves[i]).power > 1)) { if (varyDamage == TRUE) { damageRoll = AI_CONTEXT.moveDamageRolls[i]; } else { @@ -2958,12 +2958,12 @@ static s32 TrainerAI_CalcAllDamage(BattleSystem *battleSys, BattleContext *battl /** * @brief Damage calculation routine visible to the AI. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param move The move being used * @param heldItem The attacker's held item. - * @param ivs The attacker's IVs. Used for Hidden Power calculation. + * @param ivs The attacker's IVs. Used for Hidden Power calculation. * @param attacker The attacker's ID. * @param ability The attacker's ability. * @param embargoTurns Number of turns that the attacker is still under Embargo. @@ -3078,17 +3078,17 @@ static s32 TrainerAI_CalcDamage(BattleSystem *battleSys, BattleContext *battleCt case MOVE_HIDDEN_POWER: power = ((ivs[STAT_HP] & 2) >> 1) - | ((ivs[STAT_ATTACK] & 2) >> 0) - | ((ivs[STAT_DEFENSE] & 2) << 1) - | ((ivs[STAT_SPEED] & 2) << 2) - | ((ivs[STAT_SPECIAL_ATTACK] & 2) << 3) - | ((ivs[STAT_SPECIAL_DEFENSE] & 2) << 4); + | ((ivs[STAT_ATTACK] & 2) >> 0) + | ((ivs[STAT_DEFENSE] & 2) << 1) + | ((ivs[STAT_SPEED] & 2) << 2) + | ((ivs[STAT_SPECIAL_ATTACK] & 2) << 3) + | ((ivs[STAT_SPECIAL_DEFENSE] & 2) << 4); type = ((ivs[STAT_HP] & 1) >> 0) - | ((ivs[STAT_ATTACK] & 1) << 1) - | ((ivs[STAT_DEFENSE] & 1) << 2) - | ((ivs[STAT_SPEED] & 1) << 3) - | ((ivs[STAT_SPECIAL_ATTACK] & 1) << 4) - | ((ivs[STAT_SPECIAL_DEFENSE] & 1) << 5); + | ((ivs[STAT_ATTACK] & 1) << 1) + | ((ivs[STAT_DEFENSE] & 1) << 2) + | ((ivs[STAT_SPEED] & 1) << 3) + | ((ivs[STAT_SPECIAL_ATTACK] & 1) << 4) + | ((ivs[STAT_SPECIAL_DEFENSE] & 1) << 5); power = power * 40 / 63 + 30; type = (type * 15 / 63) + 1; @@ -3186,27 +3186,27 @@ static s32 TrainerAI_CalcDamage(BattleSystem *battleSys, BattleContext *battleCt if (damage == 0) { damage = BattleSystem_CalcMoveDamage(battleSys, - battleCtx, - move, - battleCtx->sideConditionsMask[defendingSide], - battleCtx->fieldConditionsMask, - power, - type, - attacker, - AI_CONTEXT.defender, - 1); - } else { - battleCtx->battleStatusMask |= SYSCTL_IGNORE_TYPE_CHECKS; - } - - damage = BattleSystem_ApplyTypeChart(battleSys, battleCtx, move, + battleCtx->sideConditionsMask[defendingSide], + battleCtx->fieldConditionsMask, + power, type, attacker, AI_CONTEXT.defender, - damage, - &effectivenessFlags); + 1); + } else { + battleCtx->battleStatusMask |= SYSCTL_IGNORE_TYPE_CHECKS; + } + + damage = BattleSystem_ApplyTypeChart(battleSys, + battleCtx, + move, + type, + attacker, + AI_CONTEXT.defender, + damage, + &effectivenessFlags); battleCtx->battleStatusMask &= ~SYSCTL_IGNORE_TYPE_CHECKS; if (effectivenessFlags & MOVE_STATUS_IMMUNE) { @@ -3223,9 +3223,9 @@ static s32 TrainerAI_CalcDamage(BattleSystem *battleSys, BattleContext *battleCt * computed according to the usual routines (i.e., Natural Gift, Judgment, * Hidden Power, and Weather Ball). Moves without a variable typing will be * returned as TYPE_NORMAL. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The battler using the move. * @param move The move being used. * @return The type of the move. @@ -3313,11 +3313,11 @@ static int TrainerAI_MoveType(BattleSystem *battleSys, BattleContext *battleCtx, case MOVE_HIDDEN_POWER: result = ((battleCtx->battleMons[battler].hpIV & 1) >> 0) - | ((battleCtx->battleMons[battler].attackIV & 1) << 1) - | ((battleCtx->battleMons[battler].defenseIV & 1) << 2) - | ((battleCtx->battleMons[battler].speedIV & 1) << 3) - | ((battleCtx->battleMons[battler].spAttackIV & 1) << 4) - | ((battleCtx->battleMons[battler].spDefenseIV & 1) << 5); + | ((battleCtx->battleMons[battler].attackIV & 1) << 1) + | ((battleCtx->battleMons[battler].defenseIV & 1) << 2) + | ((battleCtx->battleMons[battler].speedIV & 1) << 3) + | ((battleCtx->battleMons[battler].spAttackIV & 1) << 4) + | ((battleCtx->battleMons[battler].spDefenseIV & 1) << 5); result = (result * 15 / 63) + 1; if (result >= TYPE_MYSTERY) { @@ -3357,19 +3357,19 @@ static int TrainerAI_MoveType(BattleSystem *battleSys, BattleContext *battleCtx, * @brief Check if Perish Song is active on a battler and the battler should * faint at the end of the turn. If so, treat the next switch as post-KO switch * AI. - * + * * This routine is bugged; it functionally does nothing. The Perish Song turn * count decrements at the end of the turn, so the AI never sees that it WILL * die to Perish Song. - * - * @param battleCtx + * + * @param battleCtx * @param battler The AI's battler. * @return TRUE if the AI has a switch to make, FALSE otherwise. */ static BOOL AI_PerishSongKO(BattleContext *battleCtx, int battler) { if ((battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_PERISH_SONG) - && battleCtx->battleMons[battler].moveEffectsData.perishSongTurns == 0) { + && battleCtx->battleMons[battler].moveEffectsData.perishSongTurns == 0) { battleCtx->aiSwitchedPartySlot[battler] = 6; return TRUE; } @@ -3381,11 +3381,11 @@ static BOOL AI_PerishSongKO(BattleContext *battleCtx, int battler) * @brief Check if an AI's battler cannot damage the opponent's Pokemon due to * Wonder Guard. If so, check for any living party member that can deal damage * to that Pokemon, and switch to that mon 66% of the time. - * + * * This routine does NOT apply to double-battles. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The AI's battler. * @return TRUE if the AI has a switch to make, FALSE otherwise. */ @@ -3422,9 +3422,9 @@ static BOOL AI_CannotDamageWonderGuard(BattleSystem *battleSys, BattleContext *b mon = BattleSystem_PartyPokemon(battleSys, battler, i); if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG - && i != battleCtx->selectedPartySlot[battler]) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG + && i != battleCtx->selectedPartySlot[battler]) { for (j = 0; j < LEARNED_MOVES_MAX; j++) { move = Pokemon_GetValue(mon, MON_DATA_MOVE1 + j, NULL); moveType = Move_CalcVariableType(battleSys, battleCtx, mon, move); @@ -3458,9 +3458,9 @@ static BOOL AI_CannotDamageWonderGuard(BattleSystem *battleSys, BattleContext *b /** * @brief Check if an AI's battler only has moves which do not deal damage to either * of the opponent's Pokemon. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The AI's battler. * @return TRUE if the AI has a switch to make, FALSE otherwise. */ @@ -3538,12 +3538,12 @@ static BOOL AI_OnlyIneffectiveMoves(BattleSystem *battleSys, BattleContext *batt mon = BattleSystem_PartyPokemon(battleSys, battler, i); if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG - && i != battleCtx->selectedPartySlot[aiSlot1] - && i != battleCtx->selectedPartySlot[aiSlot2] - && i != battleCtx->aiSwitchedPartySlot[aiSlot1] - && i != battleCtx->aiSwitchedPartySlot[aiSlot2]) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG + && i != battleCtx->selectedPartySlot[aiSlot1] + && i != battleCtx->selectedPartySlot[aiSlot2] + && i != battleCtx->aiSwitchedPartySlot[aiSlot1] + && i != battleCtx->aiSwitchedPartySlot[aiSlot2]) { for (j = 0; j < LEARNED_MOVES_MAX; j++) { move = Pokemon_GetValue(mon, MON_DATA_MOVE1 + j, NULL); type = Move_CalcVariableType(battleSys, battleCtx, mon, move); @@ -3597,12 +3597,12 @@ static BOOL AI_OnlyIneffectiveMoves(BattleSystem *battleSys, BattleContext *batt mon = BattleSystem_PartyPokemon(battleSys, battler, i); if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG - && i != battleCtx->selectedPartySlot[aiSlot1] - && i != battleCtx->selectedPartySlot[aiSlot2] - && i != battleCtx->aiSwitchedPartySlot[aiSlot1] - && i != battleCtx->aiSwitchedPartySlot[aiSlot2]) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG + && i != battleCtx->selectedPartySlot[aiSlot1] + && i != battleCtx->selectedPartySlot[aiSlot2] + && i != battleCtx->aiSwitchedPartySlot[aiSlot1] + && i != battleCtx->aiSwitchedPartySlot[aiSlot2]) { for (j = 0; j < LEARNED_MOVES_MAX; j++) { move = Pokemon_GetValue(mon, MON_DATA_MOVE1 + j, NULL); type = Move_CalcVariableType(battleSys, battleCtx, mon, move); @@ -3654,9 +3654,9 @@ static BOOL AI_OnlyIneffectiveMoves(BattleSystem *battleSys, BattleContext *batt /** * @brief Check if an AI's battler has a super-effective move against either of the * opponent's Pokemon. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The AI's battler. * @param flag If TRUE, will always return TRUE if the AI's battler has a super- * effective move. If FALSE, returns TRUE 90% of the time for either @@ -3733,15 +3733,15 @@ static BOOL AI_HasSuperEffectiveMove(BattleSystem *battleSys, BattleContext *bat * @brief Check if the AI's party has a Pokemon on the bench which has an "absorbing" * ability for the move which was last used on it (specifically, Volt Absorb, Water * Absorb, and Flash Fire). - * + * * This routine will skip its checks roughly 33% of the time if the AI's battler has * a super-effective move. It will also skip its checks if the AI's active battler * is the one with the absorbing ability. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The AI's battler. - * @return BOOL + * @return BOOL */ static BOOL AI_HasAbsorbAbilityInParty(BattleSystem *battleSys, BattleContext *battleCtx, int battler) { @@ -3800,12 +3800,12 @@ static BOOL AI_HasAbsorbAbilityInParty(BattleSystem *battleSys, BattleContext *b mon = BattleSystem_PartyPokemon(battleSys, battler, i); if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG - && i != battleCtx->selectedPartySlot[aiSlot1] - && i != battleCtx->selectedPartySlot[aiSlot2] - && i != battleCtx->aiSwitchedPartySlot[aiSlot1] - && i != battleCtx->aiSwitchedPartySlot[aiSlot2]) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG + && i != battleCtx->selectedPartySlot[aiSlot1] + && i != battleCtx->selectedPartySlot[aiSlot2] + && i != battleCtx->aiSwitchedPartySlot[aiSlot1] + && i != battleCtx->aiSwitchedPartySlot[aiSlot2]) { ability = Pokemon_GetValue(mon, MON_DATA_ABILITY, NULL); // Switch to a matching Pokemon 50% of the time. @@ -3822,9 +3822,9 @@ static BOOL AI_HasAbsorbAbilityInParty(BattleSystem *battleSys, BattleContext *b /** * @brief Check if the AI has a party member with a super-effective move, constrained * to mons with a certain effectiveness matchup against the move that last hit us. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The AI's battler. * @param checkEffectiveness The desired effectiveness mask against the last move. * @param rand Random odds to switch, if conditions are met. @@ -3863,12 +3863,12 @@ static BOOL AI_HasPartyMemberWithSuperEffectiveMove(BattleSystem *battleSys, Bat mon = BattleSystem_PartyPokemon(battleSys, battler, i); if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG - && i != battleCtx->selectedPartySlot[aiSlot1] - && i != battleCtx->selectedPartySlot[aiSlot2] - && i != battleCtx->aiSwitchedPartySlot[aiSlot1] - && i != battleCtx->aiSwitchedPartySlot[aiSlot2]) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG + && i != battleCtx->selectedPartySlot[aiSlot1] + && i != battleCtx->selectedPartySlot[aiSlot2] + && i != battleCtx->aiSwitchedPartySlot[aiSlot1] + && i != battleCtx->aiSwitchedPartySlot[aiSlot2]) { effectiveness = 0; moveType = TrainerAI_MoveType(battleSys, battleCtx, battleCtx->moveHitBattler[battler], battleCtx->moveHit[battler]); @@ -3914,9 +3914,9 @@ static BOOL AI_HasPartyMemberWithSuperEffectiveMove(BattleSystem *battleSys, Bat /** * @brief Check if the AI's battler is asleep and has Natural Cure + an eligible switch. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The AI's battler. * @return TRUE if the AI should switch, FALSE otherwise. */ @@ -3924,8 +3924,8 @@ static BOOL AI_IsAsleepWithNaturalCure(BattleSystem *battleSys, BattleContext *b { // Don't switch if we aren't asleep, don't have Natural Cure, or are below 50% HP. if ((battleCtx->battleMons[battler].status & MON_CONDITION_SLEEP) == FALSE - || Battler_Ability(battleCtx, battler) != ABILITY_NATURAL_CURE - || battleCtx->battleMons[battler].curHP < (battleCtx->battleMons[battler].maxHP / 2)) { + || Battler_Ability(battleCtx, battler) != ABILITY_NATURAL_CURE + || battleCtx->battleMons[battler].curHP < (battleCtx->battleMons[battler].maxHP / 2)) { return FALSE; } @@ -3968,9 +3968,9 @@ static BOOL AI_IsAsleepWithNaturalCure(BattleSystem *battleSys, BattleContext *b * @brief Check if the AI's current battler is heavily stat-boosted (that is, * if the sum of its total positive stat stage changes is greater than or * equal to 4.) - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler The AI's current battler. * @return TRUE if the AI has a high number of positive stat stages; * FALSE otherwise. @@ -3991,11 +3991,11 @@ static BOOL AI_IsHeavilyStatBoosted(BattleSystem *battleSys, BattleContext *batt /** * @brief Check if the AI should switch for turn. - * - * @param battleSys - * @param battleCtx + * + * @param battleSys + * @param battleCtx * @param battler TRUE if the battler - * @return BOOL + * @return BOOL */ static BOOL TrainerAI_ShouldSwitch(BattleSystem *battleSys, BattleContext *battleCtx, int battler) { @@ -4010,11 +4010,11 @@ static BOOL TrainerAI_ShouldSwitch(BattleSystem *battleSys, BattleContext *battl // Shadow Tag if it also has Shadow Tag, Arena Trap if it is a Flying-type, or always able to switch // if it is holding a Shed Shell. if ((battleCtx->battleMons[battler].statusVolatile & VOLATILE_CONDITION_TRAPPED) - || (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_INGRAIN) - || BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALL_BATTLERS_THEIR_SIDE, battler, ABILITY_SHADOW_TAG) - || BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALL_BATTLERS_THEIR_SIDE, battler, ABILITY_ARENA_TRAP) - || (BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALL_BATTLERS_EXCEPT_ME, battler, ABILITY_MAGNET_PULL) - && MON_HAS_TYPE(battler, TYPE_STEEL))) { + || (battleCtx->battleMons[battler].moveEffectsMask & MOVE_EFFECT_INGRAIN) + || BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALL_BATTLERS_THEIR_SIDE, battler, ABILITY_SHADOW_TAG) + || BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALL_BATTLERS_THEIR_SIDE, battler, ABILITY_ARENA_TRAP) + || (BattleSystem_CountAbility(battleSys, battleCtx, COUNT_ALL_BATTLERS_EXCEPT_ME, battler, ABILITY_MAGNET_PULL) + && MON_HAS_TYPE(battler, TYPE_STEEL))) { return FALSE; } @@ -4033,12 +4033,12 @@ static BOOL TrainerAI_ShouldSwitch(BattleSystem *battleSys, BattleContext *battl mon = BattleSystem_PartyPokemon(battleSys, battler, i); if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG - && i != battleCtx->selectedPartySlot[aiSlot1] - && i != battleCtx->selectedPartySlot[aiSlot2] - && i != battleCtx->aiSwitchedPartySlot[aiSlot1] - && i != battleCtx->aiSwitchedPartySlot[aiSlot2]) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG + && i != battleCtx->selectedPartySlot[aiSlot1] + && i != battleCtx->selectedPartySlot[aiSlot2] + && i != battleCtx->aiSwitchedPartySlot[aiSlot1] + && i != battleCtx->aiSwitchedPartySlot[aiSlot2]) { alivePartyMons++; } } @@ -4123,10 +4123,10 @@ int TrainerAI_PickCommand(BattleSystem *battleSys, int battler) mon = BattleSystem_PartyPokemon(battleSys, battler, i); if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && i != battleCtx->selectedPartySlot[battler1] - && i != battleCtx->selectedPartySlot[battler2] - && i != battleCtx->aiSwitchedPartySlot[battler1] - && i != battleCtx->aiSwitchedPartySlot[battler2]) { + && i != battleCtx->selectedPartySlot[battler1] + && i != battleCtx->selectedPartySlot[battler2] + && i != battleCtx->aiSwitchedPartySlot[battler1] + && i != battleCtx->aiSwitchedPartySlot[battler2]) { break; } } @@ -4149,15 +4149,15 @@ int TrainerAI_PickCommand(BattleSystem *battleSys, int battler) /** * @brief Determine if the AI should use an item on its active battler. - * + * * Several buffers will be filled, if an item should be used: * 1. The item type (e.g., Full Restore, Potion, etc.) * 2. Any parameters for the item, e.g. what status condition it heals * 3. What item number is used - * + * * The trainer's pocket of items will also be updated appropriately. - * - * @param battleSys + * + * @param battleSys * @param battler The AI's battler. * @return TRUE if an item should be used, FALSE if not. */ @@ -4178,7 +4178,7 @@ static BOOL TrainerAI_ShouldUseItem(BattleSystem *battleSys, int battler) // Don't let the AI partners ever use items in battle against trainers. if ((battleSys->battleType & BATTLE_TYPE_TRAINER_WITH_AI_PARTNER) == BATTLE_TYPE_TRAINER_WITH_AI_PARTNER - && BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_TYPE_PLAYER_SIDE_SLOT_2) { + && BattleSystem_BattlerSlot(battleSys, battler) == BATTLER_TYPE_PLAYER_SIDE_SLOT_2) { return result; } @@ -4192,8 +4192,8 @@ static BOOL TrainerAI_ShouldUseItem(BattleSystem *battleSys, int battler) mon = Party_GetPokemonBySlotIndex(party, i); if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) != 0 - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE - && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_NONE + && Pokemon_GetValue(mon, MON_DATA_SPECIES_EGG, NULL) != SPECIES_EGG) { aliveMons++; } } @@ -4208,7 +4208,7 @@ static BOOL TrainerAI_ShouldUseItem(BattleSystem *battleSys, int battler) if (item == ITEM_FULL_RESTORE) { if (battleCtx->battleMons[battler].curHP < (battleCtx->battleMons[battler].maxHP / 4) - && battleCtx->battleMons[battler].curHP) { + && battleCtx->battleMons[battler].curHP) { AI_CONTEXT.usedItemType[battler >> 1] = ITEM_TYPE_FULL_RESTORE; result = TRUE; } @@ -4219,8 +4219,8 @@ static BOOL TrainerAI_ShouldUseItem(BattleSystem *battleSys, int battler) // value of the item would be used. if (hpRestore) { if (battleCtx->battleMons[battler].curHP - && (battleCtx->battleMons[battler].curHP < (battleCtx->battleMons[battler].maxHP / 4) - || (battleCtx->battleMons[battler].maxHP - battleCtx->battleMons[battler].curHP) > hpRestore)) { + && (battleCtx->battleMons[battler].curHP < (battleCtx->battleMons[battler].maxHP / 4) + || (battleCtx->battleMons[battler].maxHP - battleCtx->battleMons[battler].curHP) > hpRestore)) { AI_CONTEXT.usedItemType[battler >> 1] = ITEM_TYPE_RECOVER_HP; result = TRUE; } @@ -4233,7 +4233,7 @@ static BOOL TrainerAI_ShouldUseItem(BattleSystem *battleSys, int battler) } } else if (BattleSystem_GetItemData(battleCtx, item, ITEM_PARAM_HEAL_POISON)) { if ((battleCtx->battleMons[battler].status & MON_CONDITION_POISON) - || (battleCtx->battleMons[battler].status & MON_CONDITION_TOXIC)) { + || (battleCtx->battleMons[battler].status & MON_CONDITION_TOXIC)) { AI_CONTEXT.usedItemCondition[battler >> 1] |= FlagIndex(4); AI_CONTEXT.usedItemType[battler >> 1] = ITEM_TYPE_RECOVER_STATUS; result = TRUE; @@ -4262,7 +4262,7 @@ static BOOL TrainerAI_ShouldUseItem(BattleSystem *battleSys, int battler) AI_CONTEXT.usedItemType[battler >> 1] = ITEM_TYPE_RECOVER_STATUS; result = TRUE; } - // Don't try to use any of these until after the first turn that a mon is in play. + // Don't try to use any of these until after the first turn that a mon is in play. } else if ((battleCtx->battleMons[battler].moveEffectsData.fakeOutTurnNumber - battleCtx->totalTurns) >= 0) { if (BattleSystem_GetItemData(battleCtx, item, ITEM_PARAM_ATK_STAGES)) { AI_CONTEXT.usedItemCondition[battler >> 1] = BATTLE_STAT_ATTACK; @@ -4289,7 +4289,7 @@ static BOOL TrainerAI_ShouldUseItem(BattleSystem *battleSys, int battler) AI_CONTEXT.usedItemType[battler >> 1] = ITEM_TYPE_STAT_BOOSTER; result = TRUE; } else if (BattleSystem_GetItemData(battleCtx, item, ITEM_PARAM_GUARD_SPEC) - && (battleCtx->sideConditionsMask[1] & SIDE_CONDITION_MIST) == FALSE) { + && (battleCtx->sideConditionsMask[1] & SIDE_CONDITION_MIST) == FALSE) { AI_CONTEXT.usedItemType[battler >> 1] = ITEM_TYPE_GUARD_SPEC; result = TRUE; } diff --git a/src/berry_data.c b/src/berry_data.c index 3e1f6beb9f..a62a4cc023 100644 --- a/src/berry_data.c +++ b/src/berry_data.c @@ -1,11 +1,12 @@ +#include "berry_data.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "narc.h" #include "message.h" -#include "berry_data.h" +#include "narc.h" #include "strbuf.h" typedef struct BerryData { @@ -22,32 +23,32 @@ typedef struct BerryData { u8 smoothness; } BerryData; -NARC * BerryData_NARC_ctor (u32 heapID) +NARC *BerryData_NARC_ctor(u32 heapID) { return NARC_ctor(NARC_INDEX_ITEMTOOL__ITEMDATA__NUTS_DATA, heapID); } -BerryData * sub_020973A8 (NARC * param0, u32 param1, u32 param2) +BerryData *sub_020973A8(NARC *param0, u32 param1, u32 param2) { return NARC_AllocAndReadWholeMember(param0, 0 + param1, param2); } -void BerryData_NARC_dtor (NARC * narc) +void BerryData_NARC_dtor(NARC *narc) { NARC_dtor(narc); } -BerryData * BerryData_LoadDataByNarcMemberIndex (u32 index, u32 heapID) +BerryData *BerryData_LoadDataByNarcMemberIndex(u32 index, u32 heapID) { return NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_ITEMTOOL__ITEMDATA__NUTS_DATA, 0 + index, heapID); } -BerryData * BerryData_LoadDataByItemID (u32 itemID, u32 heapID) +BerryData *BerryData_LoadDataByItemID(u32 itemID, u32 heapID) { return BerryData_LoadDataByNarcMemberIndex(itemID - 149, heapID); } -u32 BerryData_GetAttribute (BerryData * berryData, u32 attributeID) +u32 BerryData_GetAttribute(BerryData *berryData, u32 attributeID) { switch (attributeID) { case 0: @@ -77,10 +78,10 @@ u32 BerryData_GetAttribute (BerryData * berryData, u32 attributeID) return 0; } -Strbuf* BerryData_AllocAndGetName (u16 index, u32 heapID) +Strbuf *BerryData_AllocAndGetName(u16 index, u32 heapID) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; v0 = MessageLoader_Init(1, 26, 424, heapID); v1 = MessageLoader_GetNewStrbuf(v0, index); @@ -89,10 +90,10 @@ Strbuf* BerryData_AllocAndGetName (u16 index, u32 heapID) return v1; } -Strbuf* BerryData_AllocAndGetDescription (u16 index, u16 heapID) +Strbuf *BerryData_AllocAndGetDescription(u16 index, u16 heapID) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; v0 = MessageLoader_Init(1, 26, 423, heapID); v1 = MessageLoader_GetNewStrbuf(v0, index); diff --git a/src/camera.c b/src/camera.c index 776b700c04..0cf44ee5c5 100644 --- a/src/camera.c +++ b/src/camera.c @@ -1,16 +1,17 @@ +#include "camera.h" + #include -#include #include +#include #include "overlay115/camera_angle.h" #include "heap.h" #include "unk_0201E190.h" -#include "camera.h" -#define CAMERA_DEFAULT_ASPECT_RATIO (FX32_ONE * 4 / 3) -#define CAMERA_DEFAULT_NEAR_CLIP (FX32_ONE * 150) -#define CAMERA_DEFAULT_FAR_CLIP (FX32_ONE * 900) +#define CAMERA_DEFAULT_ASPECT_RATIO (FX32_ONE * 4 / 3) +#define CAMERA_DEFAULT_NEAR_CLIP (FX32_ONE * 150) +#define CAMERA_DEFAULT_FAR_CLIP (FX32_ONE * 900) GXBufferMode gBufferMode = GX_BUFFERMODE_W; @@ -224,7 +225,7 @@ void Camera_ComputeViewMatrixWithRoll(void) VecFx32 cameraPos = sActiveCamera->lookAt.position; VecFx32 cameraUp = sActiveCamera->lookAt.up; - const VecFx32 * targetPos = sActiveCamera->targetPos; + const VecFx32 *targetPos = sActiveCamera->targetPos; fx16 cosPitch = FX_CosIdx(sActiveCamera->angle.x); fx16 sinYaw = FX_SinIdx(sActiveCamera->angle.y); fx16 cosYaw = FX_CosIdx(sActiveCamera->angle.y); @@ -320,9 +321,9 @@ void Camera_InitWithTargetAndPosition(const VecFx32 *target, const VecFx32 *posi camera->distance = VEC_Mag(&distanceVector); // ROM doesn't match without these - VecFx32 unused0 = {0, 0, 0}; - VecFx32 unused1 = {0, 0, 0}; - VecFx32 v = {0, 0, 0}; + VecFx32 unused0 = { 0, 0, 0 }; + VecFx32 unused1 = { 0, 0, 0 }; + VecFx32 v = { 0, 0, 0 }; VecFx32 unit; unit.x = 0; @@ -360,12 +361,11 @@ void Camera_ComputeProjectionMatrix(const u8 projection, Camera *camera) { if (projection == CAMERA_PROJECTION_PERSPECTIVE) { NNS_G3dGlbPerspective( - camera->perspective.sinFovY, - camera->perspective.cosFovY, - camera->perspective.aspectRatio, - camera->perspective.nearClip, - camera->perspective.farClip - ); + camera->perspective.sinFovY, + camera->perspective.cosFovY, + camera->perspective.aspectRatio, + camera->perspective.nearClip, + camera->perspective.farClip); camera->projection = CAMERA_PROJECTION_PERSPECTIVE; gBufferMode = GX_BUFFERMODE_Z; diff --git a/src/charcode.c b/src/charcode.c index fc2843d2ad..a0998f1b61 100644 --- a/src/charcode.c +++ b/src/charcode.c @@ -2,7 +2,7 @@ #include "charcode.h" -#define FORMAT_ARG_TYPE_MASK 0xFF00 +#define FORMAT_ARG_TYPE_MASK 0xFF00 charcode_t *CharCode_SkipFormatArg(const charcode_t *cstr) { @@ -28,8 +28,8 @@ BOOL CharCode_IsFormatArg(const charcode_t *cstr) u32 type = CharCode_FormatArgType(cstr); if ((type & FORMAT_ARG_TYPE_MASK) == 0x100 - || (type & FORMAT_ARG_TYPE_MASK) == 0x600 - || (type & FORMAT_ARG_TYPE_MASK) == 0x500) { + || (type & FORMAT_ARG_TYPE_MASK) == 0x600 + || (type & FORMAT_ARG_TYPE_MASK) == 0x500) { return TRUE; } @@ -47,4 +47,3 @@ u32 CharCode_FormatArgParam(const charcode_t *cstr, u32 paramIdx) return cstr[paramIdx]; } - diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index f0963986bb..763c14232a 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -1,34 +1,31 @@ +#include "choose_starter/choose_starter_app.h" + #include -#include #include +#include #include "constants/heap.h" -#include "constants/species.h" #include "constants/narc.h" +#include "constants/species.h" -#include "core_sys.h" - +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02015064_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02015214_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" - #include "struct_defs/archived_sprite.h" -#include "struct_defs/struct_0200C738.h" #include "struct_defs/choose_starter_data.h" +#include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay021/struct_ov21_021E7F40.h" #include "overlay022/struct_ov22_022550D4.h" @@ -41,25 +38,32 @@ #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02015064.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201C970.h" #include "unk_0201D670.h" @@ -67,61 +71,55 @@ #include "unk_0201E3D8.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" -#include "game_options.h" -#include "pokemon.h" -#include "choose_starter/choose_starter_app.h" #define NUM_STARTER_OPTIONS 3 #define STARTER_OPTION_0 SPECIES_TURTWIG #define STARTER_OPTION_1 SPECIES_CHIMCHAR #define STARTER_OPTION_2 SPECIES_PIPLUP -#define OAM_MAIN_START 0 -#define OAM_MAIN_END 128 -#define OAM_SUB_START 0 -#define OAM_SUB_END 128 +#define OAM_MAIN_START 0 +#define OAM_MAIN_END 128 +#define OAM_SUB_START 0 +#define OAM_SUB_END 128 -#define OAM_AFFINE_MAIN_START 0 -#define OAM_AFFINE_MAIN_END 32 -#define OAM_AFFINE_SUB_START 0 -#define OAM_AFFINE_SUB_END 32 +#define OAM_AFFINE_MAIN_START 0 +#define OAM_AFFINE_MAIN_END 32 +#define OAM_AFFINE_SUB_START 0 +#define OAM_AFFINE_SUB_END 32 -#define OAM_NUM_BYTES 32 +#define OAM_NUM_BYTES 32 #define OAM_VRAM_TRANSFER_MAIN_SIZE (0x14000) #define OAM_VRAM_TRANSFER_SUB_SIZE (0x4000) -#define COLOR_BLACK GX_RGB(4, 4, 4) -#define COLOR_TRANSPARENT GX_RGB(31, 31, 16) +#define COLOR_BLACK GX_RGB(4, 4, 4) +#define COLOR_TRANSPARENT GX_RGB(31, 31, 16) -#define TRANSPARENT_DEPTH 0x7FFF -#define TRANSPARENT_POLYGON_ID 63 +#define TRANSPARENT_DEPTH 0x7FFF +#define TRANSPARENT_POLYGON_ID 63 // Coordinates for the camera viewport of the rendered 3D scene -#define VIEWPORT_LOWER_LEFT_X 0 -#define VIEWPORT_LOWER_LEFT_Y 0 -#define VIEWPORT_UPPER_RIGHT_X 255 -#define VIEWPORT_UPPER_RIGHT_Y 191 - -#define TEXT_POS_X 4 -#define TEXT_POS_Y 19 -#define TEXT_COLUMNS 23 -#define TEXT_ROWS 4 - -#define FRAME_PALETTE_INDEX 2 -#define FRAME_TEXT_START 512 -#define FRAME_TEXT_PALETTE_INDEX 0 - -#define POKEMON_SPRITE_CHAR_SIZE 0x8000 -#define POKEMON_SPRITE_PLTT_SIZE 0x80 -#define POKEMON_SPRITE_POS_X 128 -#define POKEMON_SPRITE_POS_Y 96 -#define POKEMON_SPRITE_POS_Z 1023 -#define POKEMON_SPRITE_POLYGON_ID 0 +#define VIEWPORT_LOWER_LEFT_X 0 +#define VIEWPORT_LOWER_LEFT_Y 0 +#define VIEWPORT_UPPER_RIGHT_X 255 +#define VIEWPORT_UPPER_RIGHT_Y 191 + +#define TEXT_POS_X 4 +#define TEXT_POS_Y 19 +#define TEXT_COLUMNS 23 +#define TEXT_ROWS 4 + +#define FRAME_PALETTE_INDEX 2 +#define FRAME_TEXT_START 512 +#define FRAME_TEXT_PALETTE_INDEX 0 + +#define POKEMON_SPRITE_CHAR_SIZE 0x8000 +#define POKEMON_SPRITE_PLTT_SIZE 0x80 +#define POKEMON_SPRITE_POS_X 128 +#define POKEMON_SPRITE_POS_Y 96 +#define POKEMON_SPRITE_POS_Z 1023 +#define POKEMON_SPRITE_POLYGON_ID 0 enum CursorPosition { CURSOR_POSITION_LEFT = 0, @@ -131,13 +129,13 @@ enum CursorPosition { typedef struct ChooseStarter3DGraphics { NNSG3dRenderObj unk_00; - void * unk_54; - NNSG3dResMdlSet * unk_58; - NNSG3dResMdl * unk_5C; - NNSG3dResTex * unk_60; - void * unk_64; - void * unk_68; - NNSG3dAnmObj * unk_6C; + void *unk_54; + NNSG3dResMdlSet *unk_58; + NNSG3dResMdl *unk_5C; + NNSG3dResTex *unk_60; + void *unk_64; + void *unk_68; + NNSG3dAnmObj *unk_6C; fx32 unk_70; BOOL unk_74; VecFx32 unk_78; @@ -158,11 +156,11 @@ typedef struct ChooseStarterCameraMovement { ChooseStarterMovement unk_00; ChooseStarterMovement unk_10; ChooseStarterMovement unk_20; - Camera * camera; - VecFx32 * unk_34; + Camera *camera; + VecFx32 *unk_34; s32 unk_38; BOOL unk_3C; - SysTask * unk_40; + SysTask *unk_40; } ChooseStarterCameraMovement; typedef struct ChooseStarterRotation { @@ -173,10 +171,10 @@ typedef struct ChooseStarterRotation { } ChooseStarterRotation; typedef struct ChooseStarterCursor { - GraphicElementData * unk_00; - UnkStruct_02009DC8 * unk_04[6]; + GraphicElementData *unk_00; + UnkStruct_02009DC8 *unk_04[6]; VecFx32 unk_1C; - SysTask * unk_28; + SysTask *unk_28; ChooseStarterRotation unk_2C; } ChooseStarterCursor; @@ -189,21 +187,21 @@ typedef struct StarterPreviewAnimation { } StarterPreviewAnimation; typedef struct StarterPreviewWindow { - UnkStruct_02015128 * unk_00; - UnkStruct_020151A4 * unk_04; - UnkStruct_02015214 * unk_08; - void * unk_0C; - void * unk_10; - NNSG2dCharacterData * unk_14; - NNSG2dPaletteData * unk_18; + UnkStruct_02015128 *unk_00; + UnkStruct_020151A4 *unk_04; + UnkStruct_02015214 *unk_08; + void *unk_0C; + void *unk_10; + NNSG2dCharacterData *unk_14; + NNSG2dPaletteData *unk_18; StarterPreviewAnimation unk_1C; - SysTask * unk_54; + SysTask *unk_54; } StarterPreviewWindow; typedef struct StarterPreviewGraphics { - Sprite * unk_00; + Sprite *unk_00; StarterPreviewAnimation unk_04; - SysTask * unk_3C; + SysTask *unk_3C; } StarterPreviewGraphics; typedef struct ChooseStarterApp { @@ -216,25 +214,25 @@ typedef struct ChooseStarterApp { int unk_58[3][3]; int unk_7C[3][2]; BGL *bgl; - Window * messageWindow; - Window * unk_9C[3]; + Window *messageWindow; + Window *unk_9C[3]; int unk_A8; - Strbuf* unk_AC; + Strbuf *unk_AC; UnkStruct_ov61_0222C884 unk_B0; - UIControlData * unk_B8; + UIControlData *unk_B8; UnkStruct_0200C738 unk_BC; - GraphicElementManager * unk_248; - UnkStruct_02009714 * unk_24C[6]; + GraphicElementManager *unk_248; + UnkStruct_02009714 *unk_24C[6]; UnkStruct_02007768 *spriteManager; Sprite *sprites[NUM_STARTER_OPTIONS]; StarterPreviewGraphics unk_274; NNSFndAllocator unk_2B4; ChooseStarter3DGraphics unk_2C4[6]; - Camera * camera; + Camera *camera; VecFx32 unk_64C; ChooseStarterCursor unk_658; GXRgb edgeMarkings[8]; - UnkStruct_02015064 * spriteDisplay; + UnkStruct_02015064 *spriteDisplay; StarterPreviewWindow unk_6A8; int messageFrame; u32 unk_704; @@ -243,13 +241,13 @@ typedef struct ChooseStarterApp { } ChooseStarterApp; static void ChooseStarterAppMainCallback(void *data); -static void StartFadeIn(ChooseStarterApp * param0); -static void StartFadeOut(ChooseStarterApp * param0); -static BOOL IsFadeDone(ChooseStarterApp * param0); +static void StartFadeIn(ChooseStarterApp *param0); +static void StartFadeOut(ChooseStarterApp *param0); +static BOOL IsFadeDone(ChooseStarterApp *param0); static u16 GetSelectedSpecies(u16 cursorPosition); -static BOOL IsSelectionMade(ChooseStarterApp * param0, int param1); -static void UpdateGraphics(ChooseStarterApp * param0, int param1); -static void DrawScene(ChooseStarterApp * param0); +static BOOL IsSelectionMade(ChooseStarterApp *param0, int param1); +static void UpdateGraphics(ChooseStarterApp *param0, int param1); +static void DrawScene(ChooseStarterApp *param0); static void SetupDrawing(ChooseStarterApp *app, enum HeapId heapID); static void ov78_021D10DC(void); static void SetupVRAMBank(void); @@ -257,83 +255,83 @@ static void SetupOAM(enum HeapId heapID); static void Setup3D(ChooseStarterApp *app); static void ov78_021D1218(void); static void SetupBGL(BGL *bgl, enum HeapId heapID); -static void ov78_021D12EC(BGL * param0); +static void ov78_021D12EC(BGL *param0); static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID); -static void ov78_021D13A0(ChooseStarterApp * param0); -static u8 ov78_021D1FB4(Window * param0, int param1, int param2, int param3, u32 param4, u32 param5); -static u8 ov78_021D201C(Window * param0, int param1, int param2, int param3, u32 param4, u32 param5, Strbuf **param6); -static void ov78_021D2090(ChooseStarterApp * param0); -static void MakeSubplaneWindow(ChooseStarterApp * param0, int param1); -static void ov78_021D2884(ChooseStarterApp * param0); -static void ov78_021D28A8(Window * param0, int param1, int param2, int param3, u32 param4); -static void ov78_021D2904(ChooseStarterApp * param0); -static void MakeConfirmationWindow(ChooseStarterApp * param0, int param1); +static void ov78_021D13A0(ChooseStarterApp *param0); +static u8 ov78_021D1FB4(Window *param0, int param1, int param2, int param3, u32 param4, u32 param5); +static u8 ov78_021D201C(Window *param0, int param1, int param2, int param3, u32 param4, u32 param5, Strbuf **param6); +static void ov78_021D2090(ChooseStarterApp *param0); +static void MakeSubplaneWindow(ChooseStarterApp *param0, int param1); +static void ov78_021D2884(ChooseStarterApp *param0); +static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, u32 param4); +static void ov78_021D2904(ChooseStarterApp *param0); +static void MakeConfirmationWindow(ChooseStarterApp *param0, int param1); static void MakeSprite(ChooseStarterApp *app, enum HeapId heapID); -static void ov78_021D14BC(ChooseStarterApp * param0); +static void ov78_021D14BC(ChooseStarterApp *param0); static void MakeSpriteDisplay(ChooseStarterApp *app, enum HeapId heapID); -static void ov78_021D1518(ChooseStarterApp * param0); -static void MakeCellActors(ChooseStarterApp * param0, int param1); -static void ov78_021D1594(ChooseStarterApp * param0); -static void MakeCamera(ChooseStarterApp * param0, int param1); -static void ov78_021D1B3C(Camera * camera, VecFx32 * param1); -static void ov78_021D1B90(ChooseStarterApp * param0); -static void Make3DObjects(ChooseStarterApp * param0, int param1); -static void ov78_021D1908(ChooseStarterApp * param0); -static void ov78_021D192C(ChooseStarterApp * param0); -static void MakeCursorOAM(ChooseStarterApp * param0, ChooseStarterCursor * param1, int param2); -static void ov78_021D2290(ChooseStarterApp * param0, ChooseStarterCursor * param1); -static void AttachCursorCellActor(ChooseStarterApp * param0, ChooseStarterCursor * param1, int param2); -static void ov78_021D2350(ChooseStarterCursor * param0); -static void ov78_021D2430(ChooseStarterCursor * param0, BOOL param1); -static void ov78_021D243C(ChooseStarterCursor * param0, int param1, int param2); -static void MakeSelectionMatrix(ChooseStarterApp * param0); -static void SetSelectionMatrixObjects(ChooseStarterApp * param0); -static void ov78_021D1CA8(ChooseStarterApp * param0, int param1); -static void ov78_021D1DF0(ChooseStarterApp * param0); -static void ov78_021D1E28(ChooseStarterApp * param0); -static void ov78_021D1E44(ChooseStarterApp * param0, int param1); +static void ov78_021D1518(ChooseStarterApp *param0); +static void MakeCellActors(ChooseStarterApp *param0, int param1); +static void ov78_021D1594(ChooseStarterApp *param0); +static void MakeCamera(ChooseStarterApp *param0, int param1); +static void ov78_021D1B3C(Camera *camera, VecFx32 *param1); +static void ov78_021D1B90(ChooseStarterApp *param0); +static void Make3DObjects(ChooseStarterApp *param0, int param1); +static void ov78_021D1908(ChooseStarterApp *param0); +static void ov78_021D192C(ChooseStarterApp *param0); +static void MakeCursorOAM(ChooseStarterApp *param0, ChooseStarterCursor *param1, int param2); +static void ov78_021D2290(ChooseStarterApp *param0, ChooseStarterCursor *param1); +static void AttachCursorCellActor(ChooseStarterApp *param0, ChooseStarterCursor *param1, int param2); +static void ov78_021D2350(ChooseStarterCursor *param0); +static void ov78_021D2430(ChooseStarterCursor *param0, BOOL param1); +static void ov78_021D243C(ChooseStarterCursor *param0, int param1, int param2); +static void MakeSelectionMatrix(ChooseStarterApp *param0); +static void SetSelectionMatrixObjects(ChooseStarterApp *param0); +static void ov78_021D1CA8(ChooseStarterApp *param0, int param1); +static void ov78_021D1DF0(ChooseStarterApp *param0); +static void ov78_021D1E28(ChooseStarterApp *param0); +static void ov78_021D1E44(ChooseStarterApp *param0, int param1); static void MakePokemonSprite(Sprite **sprite, ChooseStarterApp *app, int species); -static void ov78_021D15CC(ChooseStarter3DGraphics * param0, int param1, int param2, int param3, NNSFndAllocator * param4); -static void ov78_021D1604(ChooseStarter3DGraphics * param0, int param1, int param2); -static void ov78_021D16D8(ChooseStarter3DGraphics * param0, NNSFndAllocator * param1); -static void ov78_021D1708(ChooseStarter3DGraphics * param0); -static void ov78_021D17A4(ChooseStarter3DGraphics * param0, BOOL param1); -static void ov78_021D17A8(ChooseStarter3DGraphics * param0, fx32 param1, fx32 param2, fx32 param3); -static void ov78_021D17B4(ChooseStarter3DGraphics * param0, fx32 param1, fx32 param2, fx32 param3); -static void ov78_021D17CC(ChooseStarter3DGraphics * param0, u16 param1, u16 param2, u16 param3); -static BOOL ov78_021D17E4(ChooseStarter3DGraphics * param0); -static void ov78_021D180C(ChooseStarter3DGraphics * param0); -static void ov78_021D182C(ChooseStarter3DGraphics * param0, fx32 param1); -static void ov78_021D1630(ChooseStarter3DGraphics * param0, int param1, int param2); -static void ov78_021D1694(ChooseStarter3DGraphics * param0, int param1, int param2, NNSFndAllocator * param3); -static void MakePreviewWindow(StarterPreviewWindow * param0, ChooseStarterApp * param1, int param2); -static void ov78_021D24E4(StarterPreviewWindow * param0); -static void ov78_021D2508(StarterPreviewWindow * param0, BOOL param1); -static void ov78_021D2514(StarterPreviewWindow * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, int param7); -static void ov78_021D256C(StarterPreviewWindow * param0); -static void ov78_021D25A0(SysTask * param0, void * param1); -static BOOL ov78_021D2608(StarterPreviewWindow * param0); -static void ov78_021D2618(ChooseStarterApp * param0); -static void ov78_021D2688(ChooseStarterApp * param0); -static BOOL ov78_021D26A4(ChooseStarterApp * param0); -static void ov78_021D26B4(StarterPreviewGraphics * param0, Sprite * param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, int param8); -static void ov78_021D270C(StarterPreviewGraphics * param0); -static void ov78_021D2740(SysTask * param0, void * param1); -static void ov78_021D1C58(ChooseStarterApp * param0); -static void ov78_021D1C98(ChooseStarterApp * param0, int param1); -static int ov78_021D1CA4(ChooseStarterApp * param0); -static void ov78_021D2108(ChooseStarterMovement * param0, s32 param1, s32 param2, s32 param3); -static BOOL ov78_021D2114(ChooseStarterMovement * param0, s32 param1); -static void ov78_021D235C(ChooseStarterRotation * param0, fx32 param1, int param2); -static void ov78_021D2368(ChooseStarterRotation * param0); -static void ov78_021D213C(ChooseStarterCameraMovement * param0, Camera * camera, VecFx32 * param2); -static void ov78_021D219C(SysTask * param0, void * param1); -static BOOL ov78_021D2200(ChooseStarterCameraMovement * param0); -static void StartCursorMovement(ChooseStarterCursor * param0); -static void ov78_021D23E8(SysTask * param0, void * param1); -static void ov78_021D241C(ChooseStarterCursor * param0); - -BOOL ChooseStarter_Init (OverlayManager * param0, int * param1) +static void ov78_021D15CC(ChooseStarter3DGraphics *param0, int param1, int param2, int param3, NNSFndAllocator *param4); +static void ov78_021D1604(ChooseStarter3DGraphics *param0, int param1, int param2); +static void ov78_021D16D8(ChooseStarter3DGraphics *param0, NNSFndAllocator *param1); +static void ov78_021D1708(ChooseStarter3DGraphics *param0); +static void ov78_021D17A4(ChooseStarter3DGraphics *param0, BOOL param1); +static void ov78_021D17A8(ChooseStarter3DGraphics *param0, fx32 param1, fx32 param2, fx32 param3); +static void ov78_021D17B4(ChooseStarter3DGraphics *param0, fx32 param1, fx32 param2, fx32 param3); +static void ov78_021D17CC(ChooseStarter3DGraphics *param0, u16 param1, u16 param2, u16 param3); +static BOOL ov78_021D17E4(ChooseStarter3DGraphics *param0); +static void ov78_021D180C(ChooseStarter3DGraphics *param0); +static void ov78_021D182C(ChooseStarter3DGraphics *param0, fx32 param1); +static void ov78_021D1630(ChooseStarter3DGraphics *param0, int param1, int param2); +static void ov78_021D1694(ChooseStarter3DGraphics *param0, int param1, int param2, NNSFndAllocator *param3); +static void MakePreviewWindow(StarterPreviewWindow *param0, ChooseStarterApp *param1, int param2); +static void ov78_021D24E4(StarterPreviewWindow *param0); +static void ov78_021D2508(StarterPreviewWindow *param0, BOOL param1); +static void ov78_021D2514(StarterPreviewWindow *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, int param7); +static void ov78_021D256C(StarterPreviewWindow *param0); +static void ov78_021D25A0(SysTask *param0, void *param1); +static BOOL ov78_021D2608(StarterPreviewWindow *param0); +static void ov78_021D2618(ChooseStarterApp *param0); +static void ov78_021D2688(ChooseStarterApp *param0); +static BOOL ov78_021D26A4(ChooseStarterApp *param0); +static void ov78_021D26B4(StarterPreviewGraphics *param0, Sprite *param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, int param8); +static void ov78_021D270C(StarterPreviewGraphics *param0); +static void ov78_021D2740(SysTask *param0, void *param1); +static void ov78_021D1C58(ChooseStarterApp *param0); +static void ov78_021D1C98(ChooseStarterApp *param0, int param1); +static int ov78_021D1CA4(ChooseStarterApp *param0); +static void ov78_021D2108(ChooseStarterMovement *param0, s32 param1, s32 param2, s32 param3); +static BOOL ov78_021D2114(ChooseStarterMovement *param0, s32 param1); +static void ov78_021D235C(ChooseStarterRotation *param0, fx32 param1, int param2); +static void ov78_021D2368(ChooseStarterRotation *param0); +static void ov78_021D213C(ChooseStarterCameraMovement *param0, Camera *camera, VecFx32 *param2); +static void ov78_021D219C(SysTask *param0, void *param1); +static BOOL ov78_021D2200(ChooseStarterCameraMovement *param0); +static void StartCursorMovement(ChooseStarterCursor *param0); +static void ov78_021D23E8(SysTask *param0, void *param1); +static void ov78_021D241C(ChooseStarterCursor *param0); + +BOOL ChooseStarter_Init(OverlayManager *param0, int *param1) { Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_CHOOSE_STARTER_APP, HEAP_SIZE_CHOOSE_STARTER_APP); @@ -368,7 +366,7 @@ BOOL ChooseStarter_Init (OverlayManager * param0, int * param1) bglHeader.unk_0C = GX_BG0_AS_3D; sub_02018368(&bglHeader); - SetupBGL(app->bgl , HEAP_ID_CHOOSE_STARTER_APP); + SetupBGL(app->bgl, HEAP_ID_CHOOSE_STARTER_APP); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); @@ -401,7 +399,7 @@ enum { CHOOSE_STARTER_MAIN_WAIT_FADE_OUT, }; -BOOL ChooseStarter_Main (OverlayManager * ovyManager, int * state) +BOOL ChooseStarter_Main(OverlayManager *ovyManager, int *state) { ChooseStarterApp *app = OverlayManager_Data(ovyManager); BOOL selectionMade; @@ -450,10 +448,10 @@ BOOL ChooseStarter_Main (OverlayManager * ovyManager, int * state) return FALSE; } -BOOL ChooseStarter_Exit (OverlayManager * param0, int * param1) +BOOL ChooseStarter_Exit(OverlayManager *param0, int *param1) { - ChooseStarterApp * v0 = OverlayManager_Data(param0); - ChooseStarterData * v1 = OverlayManager_Args(param0); + ChooseStarterApp *v0 = OverlayManager_Data(param0); + ChooseStarterData *v1 = OverlayManager_Args(param0); BOOL v2; SetMainCallback(NULL, NULL); @@ -497,17 +495,17 @@ static void ChooseStarterAppMainCallback(void *data) sub_0201DCAC(); } -static void StartFadeIn (ChooseStarterApp * param0) +static void StartFadeIn(ChooseStarterApp *param0) { sub_0200F174(0, 1, 1, 0x0, 6, 1, 47); } -static void StartFadeOut (ChooseStarterApp * param0) +static void StartFadeOut(ChooseStarterApp *param0) { sub_0200F174(0, 0, 0, 0x0, 6, 1, 47); } -static BOOL IsFadeDone (ChooseStarterApp * param0) +static BOOL IsFadeDone(ChooseStarterApp *param0) { return ScreenWipe_Done(); } @@ -519,7 +517,7 @@ static void SetupDrawing(ChooseStarterApp *app, enum HeapId heap) Setup3D(app); } -static void ov78_021D10DC (void) +static void ov78_021D10DC(void) { sub_0200A878(); sub_0201E958(); @@ -550,11 +548,7 @@ static void SetupOAM(enum HeapId heapID) { NNS_G2dInitOamManagerModule(); - sub_0200A784(OAM_MAIN_START, OAM_MAIN_END, - OAM_AFFINE_MAIN_START, OAM_AFFINE_MAIN_END, - OAM_SUB_START, OAM_SUB_END, - OAM_AFFINE_SUB_START, OAM_AFFINE_SUB_END, - heapID); + sub_0200A784(OAM_MAIN_START, OAM_MAIN_END, OAM_AFFINE_MAIN_START, OAM_AFFINE_MAIN_END, OAM_SUB_START, OAM_SUB_END, OAM_AFFINE_SUB_START, OAM_AFFINE_SUB_END, heapID); UnkStruct_ov22_022559F8 v0 = { OAM_NUM_BYTES, @@ -595,7 +589,7 @@ static void Setup3D(ChooseStarterApp *app) NNS_GfdInitFrmPlttVramManager(0x4000, TRUE); } -static void ov78_021D1218 (void) +static void ov78_021D1218(void) { NNS_GfdResetFrmTexVramState(); NNS_GfdResetFrmPlttVramState(); @@ -672,7 +666,7 @@ static void SetupBGL(BGL *bgl, enum HeapId heapID) } } -static void ov78_021D12EC (BGL * param0) +static void ov78_021D12EC(BGL *param0) { sub_02019044(param0, 1); sub_02019044(param0, 2); @@ -684,13 +678,7 @@ static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID) app->messageWindow = sub_0201A778(heapID, 1); Window_Init(app->messageWindow); - BGL_AddWindow(app->bgl, app->messageWindow, BGL_FRAME_MAIN_1, - TEXT_POS_X, - TEXT_POS_Y, - TEXT_COLUMNS, - TEXT_ROWS, - FRAME_PALETTE_INDEX, - TEXT_WINDOW_SIZE + 1); + BGL_AddWindow(app->bgl, app->messageWindow, BGL_FRAME_MAIN_1, TEXT_POS_X, TEXT_POS_Y, TEXT_COLUMNS, TEXT_ROWS, FRAME_PALETTE_INDEX, TEXT_WINDOW_SIZE + 1); BGL_FillWindow(app->messageWindow, 15); sub_0200DD0C(app->bgl, BGL_FRAME_MAIN_1, FRAME_TEXT_START, FRAME_TEXT_PALETTE_INDEX, app->messageFrame, heapID); @@ -698,7 +686,7 @@ static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID) sub_0200E060(app->messageWindow, 0, FRAME_TEXT_START, FRAME_TEXT_PALETTE_INDEX); } -static void ov78_021D13A0 (ChooseStarterApp * param0) +static void ov78_021D13A0(ChooseStarterApp *param0) { BGL_DeleteWindow(param0->messageWindow); Heap_FreeToHeap(param0->messageWindow); @@ -739,7 +727,7 @@ static void MakePokemonSprite(Sprite **sprite, ChooseStarterApp *app, int specie NULL); } -static void ov78_021D14BC (ChooseStarterApp * param0) +static void ov78_021D14BC(ChooseStarterApp *param0) { int v0; @@ -752,7 +740,7 @@ static void ov78_021D14BC (ChooseStarterApp * param0) sub_02007B6C(param0->spriteManager); } -static void MakeSpriteDisplay (ChooseStarterApp * param0, enum HeapId param1) +static void MakeSpriteDisplay(ChooseStarterApp *param0, enum HeapId param1) { UnkStruct_ov22_022550D4 v0 = { 1, 1, 1, 0 @@ -762,12 +750,12 @@ static void MakeSpriteDisplay (ChooseStarterApp * param0, enum HeapId param1) param0->spriteDisplay = sub_02015064(&v0); } -static void ov78_021D1518 (ChooseStarterApp * param0) +static void ov78_021D1518(ChooseStarterApp *param0) { sub_020150A8(param0->spriteDisplay); } -static void MakeCellActors (ChooseStarterApp * param0, int param1) +static void MakeCellActors(ChooseStarterApp *param0, int param1) { param0->unk_248 = sub_020095C4(2, ¶m0->unk_BC, param1); param0->unk_24C[0] = sub_02009714(2, 0, param1); @@ -779,7 +767,7 @@ static void MakeCellActors (ChooseStarterApp * param0, int param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov78_021D1594 (ChooseStarterApp * param0) +static void ov78_021D1594(ChooseStarterApp *param0) { sub_02021964(param0->unk_248); sub_02009754(param0->unk_24C[0]); @@ -788,7 +776,7 @@ static void ov78_021D1594 (ChooseStarterApp * param0) sub_02009754(param0->unk_24C[3]); } -static void ov78_021D15CC (ChooseStarter3DGraphics * param0, int param1, int param2, int param3, NNSFndAllocator * param4) +static void ov78_021D15CC(ChooseStarter3DGraphics *param0, int param1, int param2, int param3, NNSFndAllocator *param4) { memset(param0, 0, sizeof(ChooseStarter3DGraphics)); @@ -797,7 +785,7 @@ static void ov78_021D15CC (ChooseStarter3DGraphics * param0, int param1, int par ov78_021D17B4(param0, FX32_ONE, FX32_ONE, FX32_ONE); } -static void ov78_021D1604 (ChooseStarter3DGraphics * param0, int param1, int param2) +static void ov78_021D1604(ChooseStarter3DGraphics *param0, int param1, int param2) { memset(param0, 0, sizeof(ChooseStarter3DGraphics)); @@ -805,7 +793,7 @@ static void ov78_021D1604 (ChooseStarter3DGraphics * param0, int param1, int par ov78_021D17B4(param0, FX32_ONE, FX32_ONE, FX32_ONE); } -static void ov78_021D1630 (ChooseStarter3DGraphics * param0, int param1, int param2) +static void ov78_021D1630(ChooseStarter3DGraphics *param0, int param1, int param2) { param0->unk_54 = sub_02006FE8(82, param1, 0, param2, 0); param0->unk_58 = NNS_G3dGetMdlSet(param0->unk_54); @@ -818,7 +806,7 @@ static void ov78_021D1630 (ChooseStarter3DGraphics * param0, int param1, int par NNS_G3dRenderObjInit(¶m0->unk_00, param0->unk_5C); } -static void ov78_021D1694 (ChooseStarter3DGraphics * param0, int param1, int param2, NNSFndAllocator * param3) +static void ov78_021D1694(ChooseStarter3DGraphics *param0, int param1, int param2, NNSFndAllocator *param3) { param0->unk_64 = sub_02006FE8(82, param1, 0, param2, 0); param0->unk_68 = NNS_G3dGetAnmByIdx(param0->unk_64, 0); @@ -828,7 +816,7 @@ static void ov78_021D1694 (ChooseStarter3DGraphics * param0, int param1, int par NNS_G3dRenderObjAddAnmObj(¶m0->unk_00, param0->unk_6C); } -static void ov78_021D16D8 (ChooseStarter3DGraphics * param0, NNSFndAllocator * param1) +static void ov78_021D16D8(ChooseStarter3DGraphics *param0, NNSFndAllocator *param1) { if (param0->unk_54) { Heap_FreeToHeap(param0->unk_54); @@ -842,7 +830,7 @@ static void ov78_021D16D8 (ChooseStarter3DGraphics * param0, NNSFndAllocator * p memset(param0, 0, sizeof(ChooseStarter3DGraphics)); } -static void ov78_021D1708 (ChooseStarter3DGraphics * param0) +static void ov78_021D1708(ChooseStarter3DGraphics *param0) { MtxFx33 v0; MtxFx33 v1; @@ -860,33 +848,33 @@ static void ov78_021D1708 (ChooseStarter3DGraphics * param0) } } -static void ov78_021D17A4 (ChooseStarter3DGraphics * param0, BOOL param1) +static void ov78_021D17A4(ChooseStarter3DGraphics *param0, BOOL param1) { param0->unk_74 = param1; } -static void ov78_021D17A8 (ChooseStarter3DGraphics * param0, fx32 param1, fx32 param2, fx32 param3) +static void ov78_021D17A8(ChooseStarter3DGraphics *param0, fx32 param1, fx32 param2, fx32 param3) { param0->unk_78.x = param1; param0->unk_78.y = param2; param0->unk_78.z = param3; } -static void ov78_021D17B4 (ChooseStarter3DGraphics * param0, fx32 param1, fx32 param2, fx32 param3) +static void ov78_021D17B4(ChooseStarter3DGraphics *param0, fx32 param1, fx32 param2, fx32 param3) { param0->unk_84.x = param1; param0->unk_84.y = param2; param0->unk_84.z = param3; } -static void ov78_021D17CC (ChooseStarter3DGraphics * param0, u16 param1, u16 param2, u16 param3) +static void ov78_021D17CC(ChooseStarter3DGraphics *param0, u16 param1, u16 param2, u16 param3) { param0->unk_90 = param1; param0->unk_92 = param2; param0->unk_94 = param3; } -static BOOL ov78_021D17E4 (ChooseStarter3DGraphics * param0) +static BOOL ov78_021D17E4(ChooseStarter3DGraphics *param0) { fx32 v0 = NNS_G3dAnmObjGetNumFrame(param0->unk_6C); BOOL v1; @@ -904,7 +892,7 @@ static BOOL ov78_021D17E4 (ChooseStarter3DGraphics * param0) return v1; } -static void ov78_021D180C (ChooseStarter3DGraphics * param0) +static void ov78_021D180C(ChooseStarter3DGraphics *param0) { fx32 v0 = NNS_G3dAnmObjGetNumFrame(param0->unk_6C); @@ -912,13 +900,13 @@ static void ov78_021D180C (ChooseStarter3DGraphics * param0) NNS_G3dAnmObjSetFrame(param0->unk_6C, param0->unk_70); } -static void ov78_021D182C (ChooseStarter3DGraphics * param0, fx32 param1) +static void ov78_021D182C(ChooseStarter3DGraphics *param0, fx32 param1) { param0->unk_70 = param1; NNS_G3dAnmObjSetFrame(param0->unk_6C, param1); } -static void Make3DObjects (ChooseStarterApp * param0, int param1) +static void Make3DObjects(ChooseStarterApp *param0, int param1) { int v0; @@ -938,10 +926,10 @@ static void Make3DObjects (ChooseStarterApp * param0, int param1) ov78_021D17A8(¶m0->unk_2C4[5], 0, (-28 * FX32_ONE), (40 * FX32_ONE)); ov78_021D17B4(¶m0->unk_2C4[5], (FX32_CONST(3.50f)), (FX32_ONE), (FX32_CONST(3.50f))); - ov78_021D17CC(¶m0->unk_2C4[5], (((0 * 0xffff) / 360)), (((180 * 0xffff) / 360)), (((0 * 0xffff) / 360))); + ov78_021D17CC(¶m0->unk_2C4[5], ((0 * 0xffff) / 360), ((180 * 0xffff) / 360), ((0 * 0xffff) / 360)); } -static void ov78_021D1908 (ChooseStarterApp * param0) +static void ov78_021D1908(ChooseStarterApp *param0) { int v0; @@ -950,7 +938,7 @@ static void ov78_021D1908 (ChooseStarterApp * param0) } } -static void ov78_021D192C (ChooseStarterApp * param0) +static void ov78_021D192C(ChooseStarterApp *param0) { int v0; @@ -964,7 +952,7 @@ static void ov78_021D192C (ChooseStarterApp * param0) } } -static BOOL IsSelectionMade (ChooseStarterApp * param0, int param1) +static BOOL IsSelectionMade(ChooseStarterApp *param0, int param1) { if (param0->unk_08 == 1) { return 0; @@ -997,7 +985,7 @@ static BOOL IsSelectionMade (ChooseStarterApp * param0, int param1) return 0; } -static void UpdateGraphics (ChooseStarterApp * param0, int param1) +static void UpdateGraphics(ChooseStarterApp *param0, int param1) { switch (ov78_021D1CA4(param0)) { case 0: @@ -1039,7 +1027,7 @@ static void UpdateGraphics (ChooseStarterApp * param0, int param1) } } -static void DrawScene (ChooseStarterApp * param0) +static void DrawScene(ChooseStarterApp *param0) { sub_020241B4(); @@ -1067,13 +1055,13 @@ static void DrawScene (ChooseStarterApp * param0) sub_020219F8(param0->unk_248); } -static void MakeCamera (ChooseStarterApp * param0, int param1) +static void MakeCamera(ChooseStarterApp *param0, int param1) { param0->camera = Camera_Alloc(param1); ov78_021D1B3C(param0->camera, ¶m0->unk_64C); } -static void ov78_021D1B3C (Camera * camera, VecFx32 * param1) +static void ov78_021D1B3C(Camera *camera, VecFx32 *param1) { CameraAngle v0; VecFx32 v1; @@ -1082,11 +1070,11 @@ static void ov78_021D1B3C (Camera * camera, VecFx32 * param1) param1->y = 0; param1->z = 0; - v0.x = (((-30 * 0xffff) / 360)); - v0.y = (((0 * 0xffff) / 360)); - v0.z = (((0 * 0xffff) / 360)); + v0.x = ((-30 * 0xffff) / 360); + v0.y = ((0 * 0xffff) / 360); + v0.z = ((0 * 0xffff) / 360); - Camera_InitWithTarget(param1, (300 << FX32_SHIFT), &v0, (((22 * 0xffff) / 360)), 0, 1, camera); + Camera_InitWithTarget(param1, (300 << FX32_SHIFT), &v0, ((22 * 0xffff) / 360), 0, 1, camera); v1.x = 0; v1.y = FX32_ONE; @@ -1096,12 +1084,12 @@ static void ov78_021D1B3C (Camera * camera, VecFx32 * param1) Camera_SetAsActive(camera); } -static void ov78_021D1B90 (ChooseStarterApp * param0) +static void ov78_021D1B90(ChooseStarterApp *param0) { Camera_Delete(param0->camera); } -static void MakeSelectionMatrix (ChooseStarterApp * param0) +static void MakeSelectionMatrix(ChooseStarterApp *param0) { int v0; @@ -1143,7 +1131,7 @@ static void MakeSelectionMatrix (ChooseStarterApp * param0) } } -static void SetSelectionMatrixObjects (ChooseStarterApp * param0) +static void SetSelectionMatrixObjects(ChooseStarterApp *param0) { int v0; @@ -1152,7 +1140,7 @@ static void SetSelectionMatrixObjects (ChooseStarterApp * param0) } } -static void ov78_021D1C58 (ChooseStarterApp * param0) +static void ov78_021D1C58(ChooseStarterApp *param0) { if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { if (param0->cursorPosition - 1 >= 0) { @@ -1169,18 +1157,18 @@ static void ov78_021D1C58 (ChooseStarterApp * param0) } } -static void ov78_021D1C98 (ChooseStarterApp * param0, int param1) +static void ov78_021D1C98(ChooseStarterApp *param0, int param1) { param0->unk_00 += param1; param0->unk_04 = 0; } -static int ov78_021D1CA4 (ChooseStarterApp * param0) +static int ov78_021D1CA4(ChooseStarterApp *param0) { return param0->unk_00; } -static void ov78_021D1CA8 (ChooseStarterApp * param0, int param1) +static void ov78_021D1CA8(ChooseStarterApp *param0, int param1) { switch (param0->unk_04) { case 0: @@ -1234,7 +1222,7 @@ static void ov78_021D1CA8 (ChooseStarterApp * param0, int param1) } } -static void ov78_021D1DF0 (ChooseStarterApp * param0) +static void ov78_021D1DF0(ChooseStarterApp *param0) { int v0; @@ -1247,12 +1235,12 @@ static void ov78_021D1DF0 (ChooseStarterApp * param0) } } -static void ov78_021D1E28 (ChooseStarterApp * param0) +static void ov78_021D1E28(ChooseStarterApp *param0) { ov78_021D243C(¶m0->unk_658, param0->unk_7C[param0->cursorPosition][0], param0->unk_7C[param0->cursorPosition][1]); } -static void ov78_021D1E44 (ChooseStarterApp * param0, int param1) +static void ov78_021D1E44(ChooseStarterApp *param0, int param1) { u32 v0; @@ -1308,10 +1296,10 @@ static void ov78_021D1E44 (ChooseStarterApp * param0, int param1) } } -static u8 ov78_021D1FB4 (Window * param0, int param1, int param2, int param3, u32 param4, u32 param5) +static u8 ov78_021D1FB4(Window *param0, int param1, int param2, int param3, u32 param4, u32 param5) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; u8 v2; v0 = MessageLoader_Init(0, 26, param2, param1); @@ -1328,9 +1316,9 @@ static u8 ov78_021D1FB4 (Window * param0, int param1, int param2, int param3, u3 return v2; } -static u8 ov78_021D201C (Window * param0, int param1, int param2, int param3, u32 param4, u32 param5, Strbuf **param6) +static u8 ov78_021D201C(Window *param0, int param1, int param2, int param3, u32 param4, u32 param5, Strbuf **param6) { - MessageLoader * v0; + MessageLoader *v0; u8 v1; GF_ASSERT((*param6) == NULL); @@ -1348,13 +1336,13 @@ static u8 ov78_021D201C (Window * param0, int param1, int param2, int param3, u3 return v1; } -static void ov78_021D2090 (ChooseStarterApp * param0) +static void ov78_021D2090(ChooseStarterApp *param0) { Strbuf_Free(param0->unk_AC); param0->unk_AC = NULL; } -static void MakeConfirmationWindow (ChooseStarterApp * param0, int param1) +static void MakeConfirmationWindow(ChooseStarterApp *param0, int param1) { param0->unk_B0.unk_00 = 1; param0->unk_B0.unk_01 = 23; @@ -1368,7 +1356,7 @@ static void MakeConfirmationWindow (ChooseStarterApp * param0, int param1) sub_02002E7C(0, 3 * 32, param1); } -static void ov78_021D2108 (ChooseStarterMovement * param0, s32 param1, s32 param2, s32 param3) +static void ov78_021D2108(ChooseStarterMovement *param0, s32 param1, s32 param2, s32 param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -1376,7 +1364,7 @@ static void ov78_021D2108 (ChooseStarterMovement * param0, s32 param1, s32 param param0->unk_0C = param3; } -static BOOL ov78_021D2114 (ChooseStarterMovement * param0, s32 param1) +static BOOL ov78_021D2114(ChooseStarterMovement *param0, s32 param1) { s32 v0; BOOL v1; @@ -1399,11 +1387,11 @@ static BOOL ov78_021D2114 (ChooseStarterMovement * param0, s32 param1) return v1; } -static void ov78_021D213C (ChooseStarterCameraMovement * param0, Camera * camera, VecFx32 * param2) +static void ov78_021D213C(ChooseStarterCameraMovement *param0, Camera *camera, VecFx32 *param2) { GF_ASSERT(param0->unk_40 == NULL); - ov78_021D2108(¶m0->unk_00, (((-30 * 0xffff) / 360)), (((-50 * 0xffff) / 360)), 6); + ov78_021D2108(¶m0->unk_00, ((-30 * 0xffff) / 360), ((-50 * 0xffff) / 360), 6); ov78_021D2108(¶m0->unk_10, (300 << FX32_SHIFT), (200 << FX32_SHIFT), 6); ov78_021D2108(¶m0->unk_20, 0, (36 * FX32_ONE), 6); @@ -1415,9 +1403,9 @@ static void ov78_021D213C (ChooseStarterCameraMovement * param0, Camera * camera SysTask_Start(ov78_021D219C, param0, 0); } -static void ov78_021D219C (SysTask * param0, void * param1) +static void ov78_021D219C(SysTask *param0, void *param1) { - ChooseStarterCameraMovement * v0 = param1; + ChooseStarterCameraMovement *v0 = param1; BOOL v1; CameraAngle v2; @@ -1426,8 +1414,8 @@ static void ov78_021D219C (SysTask * param0, void * param1) ov78_021D2114(&v0->unk_20, v0->unk_38); v2.x = v0->unk_00.unk_00; - v2.y = (((0 * 0xffff) / 360)); - v2.z = (((0 * 0xffff) / 360)); + v2.y = ((0 * 0xffff) / 360); + v2.z = ((0 * 0xffff) / 360); Camera_SetAngleAroundTarget(&v2, v0->camera); Camera_SetDistance(v0->unk_10.unk_00, v0->camera); @@ -1442,12 +1430,12 @@ static void ov78_021D219C (SysTask * param0, void * param1) } } -static BOOL ov78_021D2200 (ChooseStarterCameraMovement * param0) +static BOOL ov78_021D2200(ChooseStarterCameraMovement *param0) { return param0->unk_3C; } -static void MakeCursorOAM (ChooseStarterApp * param0, ChooseStarterCursor * param1, int param2) +static void MakeCursorOAM(ChooseStarterApp *param0, ChooseStarterCursor *param1, int param2) { param1->unk_04[0] = sub_0200985C(param0->unk_24C[0], 82, 10, 0, 10, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -1463,7 +1451,7 @@ static void MakeCursorOAM (ChooseStarterApp * param0, ChooseStarterCursor * para param1->unk_04[3] = sub_02009918(param0->unk_24C[3], 82, 13, 0, 13, 3, param2); } -static void ov78_021D2290 (ChooseStarterApp * param0, ChooseStarterCursor * param1) +static void ov78_021D2290(ChooseStarterApp *param0, ChooseStarterCursor *param1) { sub_0200A4E4(param1->unk_04[0]); sub_0200A6DC(param1->unk_04[1]); @@ -1474,7 +1462,7 @@ static void ov78_021D2290 (ChooseStarterApp * param0, ChooseStarterCursor * para sub_02009D68(param0->unk_24C[3], param1->unk_04[3]); } -static void AttachCursorCellActor (ChooseStarterApp * param0, ChooseStarterCursor * param1, int param2) +static void AttachCursorCellActor(ChooseStarterApp *param0, ChooseStarterCursor *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; @@ -1497,12 +1485,12 @@ static void AttachCursorCellActor (ChooseStarterApp * param0, ChooseStarterCurso param1->unk_1C.y = 0; } -static void ov78_021D2350 (ChooseStarterCursor * param0) +static void ov78_021D2350(ChooseStarterCursor *param0) { sub_02021BD4(param0->unk_00); } -static void ov78_021D235C (ChooseStarterRotation * param0, fx32 param1, int param2) +static void ov78_021D235C(ChooseStarterRotation *param0, fx32 param1, int param2) { param0->unk_00 = 0; param0->unk_04 = param1; @@ -1510,7 +1498,7 @@ static void ov78_021D235C (ChooseStarterRotation * param0, fx32 param1, int para param0->unk_0C = 0; } -static void ov78_021D2368 (ChooseStarterRotation * param0) +static void ov78_021D2368(ChooseStarterRotation *param0) { u16 v0; int v1; @@ -1523,7 +1511,7 @@ static void ov78_021D2368 (ChooseStarterRotation * param0) param0->unk_0C = (param0->unk_0C + 1) % param0->unk_08; } -static void StartCursorMovement (ChooseStarterCursor * param0) +static void StartCursorMovement(ChooseStarterCursor *param0) { GF_ASSERT(param0->unk_28 == NULL); @@ -1531,9 +1519,9 @@ static void StartCursorMovement (ChooseStarterCursor * param0) param0->unk_28 = SysTask_Start(ov78_021D23E8, param0, 0); } -static void ov78_021D23E8 (SysTask * param0, void * param1) +static void ov78_021D23E8(SysTask *param0, void *param1) { - ChooseStarterCursor * v0 = param1; + ChooseStarterCursor *v0 = param1; VecFx32 v1; ov78_021D2368(&v0->unk_2C); @@ -1544,7 +1532,7 @@ static void ov78_021D23E8 (SysTask * param0, void * param1) sub_02021C50(v0->unk_00, &v1); } -static void ov78_021D241C (ChooseStarterCursor * param0) +static void ov78_021D241C(ChooseStarterCursor *param0) { if (param0->unk_28) { SysTask_Done(param0->unk_28); @@ -1552,18 +1540,18 @@ static void ov78_021D241C (ChooseStarterCursor * param0) } } -static void ov78_021D2430 (ChooseStarterCursor * param0, BOOL param1) +static void ov78_021D2430(ChooseStarterCursor *param0, BOOL param1) { sub_02021CAC(param0->unk_00, param1); } -static void ov78_021D243C (ChooseStarterCursor * param0, int param1, int param2) +static void ov78_021D243C(ChooseStarterCursor *param0, int param1, int param2) { param0->unk_1C.x = param1 << FX32_SHIFT; param0->unk_1C.y = param2 << FX32_SHIFT; } -static void MakePreviewWindow (StarterPreviewWindow * param0, ChooseStarterApp * param1, int param2) +static void MakePreviewWindow(StarterPreviewWindow *param0, ChooseStarterApp *param1, int param2) { UnkStruct_ov22_022557A0 v0; UnkStruct_ov22_02255800 v1; @@ -1599,7 +1587,7 @@ static void MakePreviewWindow (StarterPreviewWindow * param0, ChooseStarterApp * sub_02015268(param0->unk_08, 128 / 2, 128 / 2); } -static void ov78_021D24E4 (StarterPreviewWindow * param0) +static void ov78_021D24E4(StarterPreviewWindow *param0) { sub_02015238(param0->unk_08); sub_02015164(param0->unk_00); @@ -1608,12 +1596,12 @@ static void ov78_021D24E4 (StarterPreviewWindow * param0) Heap_FreeToHeap(param0->unk_10); } -static void ov78_021D2508 (StarterPreviewWindow * param0, BOOL param1) +static void ov78_021D2508(StarterPreviewWindow *param0, BOOL param1) { sub_02015240(param0->unk_08, param1); } -static void ov78_021D2514 (StarterPreviewWindow * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, int param7) +static void ov78_021D2514(StarterPreviewWindow *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, int param7) { GF_ASSERT(param0->unk_54 == NULL); @@ -1626,7 +1614,7 @@ static void ov78_021D2514 (StarterPreviewWindow * param0, fx32 param1, fx32 para param0->unk_54 = SysTask_Start(ov78_021D25A0, param0, 0); } -static void ov78_021D256C (StarterPreviewWindow * param0) +static void ov78_021D256C(StarterPreviewWindow *param0) { GF_ASSERT(param0->unk_54 == NULL); @@ -1639,9 +1627,9 @@ static void ov78_021D256C (StarterPreviewWindow * param0) param0->unk_54 = SysTask_Start(ov78_021D25A0, param0, 0); } -static void ov78_021D25A0 (SysTask * param0, void * param1) +static void ov78_021D25A0(SysTask *param0, void *param1) { - StarterPreviewWindow * v0 = param1; + StarterPreviewWindow *v0 = param1; BOOL v1; fx32 v2, v3; @@ -1664,7 +1652,7 @@ static void ov78_021D25A0 (SysTask * param0, void * param1) v0->unk_1C.unk_30 += v0->unk_1C.unk_34; } -static BOOL ov78_021D2608 (StarterPreviewWindow * param0) +static BOOL ov78_021D2608(StarterPreviewWindow *param0) { if (param0->unk_54) { return 0; @@ -1673,7 +1661,7 @@ static BOOL ov78_021D2608 (StarterPreviewWindow * param0) return 1; } -static void ov78_021D2618 (ChooseStarterApp * param0) +static void ov78_021D2618(ChooseStarterApp *param0) { fx32 v0, v1; @@ -1684,18 +1672,18 @@ static void ov78_021D2618 (ChooseStarterApp * param0) ov78_021D26B4(¶m0->unk_274, param0->sprites[param0->cursorPosition], v0, 128 << FX32_SHIFT, v1, 96 << FX32_SHIFT, (FX32_CONST(0.40f)), (FX32_CONST(1.0f)), 6); } -static void ov78_021D2688 (ChooseStarterApp * param0) +static void ov78_021D2688(ChooseStarterApp *param0) { ov78_021D256C(¶m0->unk_6A8); ov78_021D270C(¶m0->unk_274); } -static BOOL ov78_021D26A4 (ChooseStarterApp * param0) +static BOOL ov78_021D26A4(ChooseStarterApp *param0) { return ov78_021D2608(¶m0->unk_6A8); } -static void ov78_021D26B4 (StarterPreviewGraphics * param0, Sprite * param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, int param8) +static void ov78_021D26B4(StarterPreviewGraphics *param0, Sprite *param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, int param8) { GF_ASSERT(param0->unk_3C == NULL); @@ -1709,7 +1697,7 @@ static void ov78_021D26B4 (StarterPreviewGraphics * param0, Sprite * param1, fx3 param0->unk_3C = SysTask_Start(ov78_021D2740, param0, 0); } -static void ov78_021D270C (StarterPreviewGraphics * param0) +static void ov78_021D270C(StarterPreviewGraphics *param0) { GF_ASSERT(param0->unk_3C == NULL); @@ -1722,9 +1710,9 @@ static void ov78_021D270C (StarterPreviewGraphics * param0) param0->unk_3C = SysTask_Start(ov78_021D2740, param0, 0); } -static void ov78_021D2740 (SysTask * param0, void * param1) +static void ov78_021D2740(SysTask *param0, void *param1) { - StarterPreviewGraphics * v0 = param1; + StarterPreviewGraphics *v0 = param1; BOOL v1; u32 v2; @@ -1748,7 +1736,7 @@ static void ov78_021D2740 (SysTask * param0, void * param1) v0->unk_04.unk_30 += v0->unk_04.unk_34; } -static void MakeSubplaneWindow (ChooseStarterApp * param0, int param1) +static void MakeSubplaneWindow(ChooseStarterApp *param0, int param1) { int v0; int v1, v2; @@ -1779,7 +1767,7 @@ static void MakeSubplaneWindow (ChooseStarterApp * param0, int param1) } } -static void ov78_021D2884 (ChooseStarterApp * param0) +static void ov78_021D2884(ChooseStarterApp *param0) { int v0; @@ -1789,10 +1777,10 @@ static void ov78_021D2884 (ChooseStarterApp * param0) } } -static void ov78_021D28A8 (Window * param0, int param1, int param2, int param3, u32 param4) +static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, u32 param4) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; v0 = MessageLoader_Init(0, 26, param2, param1); GF_ASSERT(v0); @@ -1804,7 +1792,7 @@ static void ov78_021D28A8 (Window * param0, int param1, int param2, int param3, MessageLoader_Free(v0); } -static void ov78_021D2904 (ChooseStarterApp * param0) +static void ov78_021D2904(ChooseStarterApp *param0) { sub_0201ACF4(param0->unk_9C[param0->unk_A8]); } @@ -1828,4 +1816,3 @@ static u16 GetSelectedSpecies(u16 cursorPosition) return SPECIES_NONE; } - diff --git a/src/coins.c b/src/coins.c index 2f8ee90759..c636499298 100644 --- a/src/coins.c +++ b/src/coins.c @@ -1,25 +1,25 @@ +#include "coins.h" + #include #include -#include "coins.h" - -void Coins_Init (u16 * coins) +void Coins_Init(u16 *coins) { *coins = 0; } -void Coins_SetValue (u16 * coins, u32 value) +void Coins_SetValue(u16 *coins, u32 value) { GF_ASSERT(value <= MAX_COINS); *coins = value; } -u32 Coins_GetValue (const u16 * coins) +u32 Coins_GetValue(const u16 *coins) { return *coins; } -BOOL Coins_Add (u16 * coins, u32 amount) +BOOL Coins_Add(u16 *coins, u32 amount) { if (*coins >= MAX_COINS) { return FALSE; @@ -34,7 +34,7 @@ BOOL Coins_Add (u16 * coins, u32 amount) return TRUE; } -BOOL Coins_CanAddAmount (const u16 * coins, u32 amount) +BOOL Coins_CanAddAmount(const u16 *coins, u32 amount) { if (amount + (u32)*coins <= MAX_COINS) { return TRUE; @@ -43,7 +43,7 @@ BOOL Coins_CanAddAmount (const u16 * coins, u32 amount) } } -BOOL Coins_Subtract (u16 * coins, u32 amount) +BOOL Coins_Subtract(u16 *coins, u32 amount) { if (*coins < amount) { return FALSE; diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c index 83bc20c43c..9af6a86440 100644 --- a/src/comm_player_manager.c +++ b/src/comm_player_manager.c @@ -1,41 +1,21 @@ +#include "comm_player_manager.h" + #include -#include #include #include +#include -#include "core_sys.h" +#include "constants/communication/comm_packets.h" +#include "constants/heap.h" -#include "sys_task_manager.h" -#include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay023/struct_ov23_02249978_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02057B48.h" #include "struct_defs/struct_020590C4.h" -#include "sys_task.h" -#include "heap.h" -#include "constants/heap.h" -#include "trainer_info.h" -#include "unk_0202854C.h" -#include "unk_0202CD50.h" -#include "communication_information.h" -#include "communication_system.h" -#include "unk_020366A0.h" -#include "map_header_data.h" -#include "field_system.h" -#include "unk_02054D00.h" -#include "comm_player_manager.h" -#include "player_avatar.h" -#include "unk_0205F180.h" -#include "map_object.h" -#include "map_object_move.h" -#include "unk_020655F4.h" -#include "unk_0206CCB0.h" +#include "field/field_system.h" #include "overlay005/ov5_021F55CC.h" #include "overlay023/ov23_0223E140.h" #include "overlay023/ov23_02241F74.h" @@ -44,29 +24,48 @@ #include "overlay023/ov23_022499E4.h" #include "overlay023/ov23_0224A1D0.h" #include "overlay023/ov23_0224B05C.h" +#include "overlay023/struct_ov23_02249978_decl.h" -#include "constants/communication/comm_packets.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_system.h" +#include "heap.h" +#include "map_header_data.h" +#include "map_object.h" +#include "map_object_move.h" +#include "player_avatar.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" +#include "unk_0202854C.h" +#include "unk_0202CD50.h" +#include "unk_020366A0.h" +#include "unk_02054D00.h" +#include "unk_0205F180.h" +#include "unk_020655F4.h" +#include "unk_0206CCB0.h" static int sub_020581CC(int param0, int param1); static BOOL CommPlayer_MoveBlow(int param0, int param1); static BOOL CommPlayer_BlowAnimation(int param0, int param1, int param2, int param3); -static void CommPlayer_SendDataTask(void * param0); -static void sub_02057C2C(void * param0); +static void CommPlayer_SendDataTask(void *param0); +static void sub_02057C2C(void *param0); static void CommPlayer_Add(u8 param0); -static void CommPlayer_Move(SysTask * param0, void * param1); -static void Task_CommPlayerManagerRun(SysTask * param0, void * param1); -static void sub_02057EF8(void * param0); +static void CommPlayer_Move(SysTask *param0, void *param1); +static void Task_CommPlayerManagerRun(SysTask *param0, void *param1); +static void sub_02057EF8(void *param0); static void CommPlayer_MoveClient(int param0); static void sub_020591A8(void); -static CommPlayerManager * sCommPlayerManager = NULL; +static CommPlayerManager *sCommPlayerManager = NULL; -CommPlayerManager * CommPlayerMan_Get (void) +CommPlayerManager *CommPlayerMan_Get(void) { return sCommPlayerManager; } -BOOL CommPlayerMan_Init (void * dest, FieldSystem * fieldSystem, BOOL isUnderground) +BOOL CommPlayerMan_Init(void *dest, FieldSystem *fieldSystem, BOOL isUnderground) { if (sCommPlayerManager != NULL) { return FALSE; @@ -113,7 +112,7 @@ BOOL CommPlayerMan_Init (void * dest, FieldSystem * fieldSystem, BOOL isUndergro return TRUE; } -void CommPlayerMan_Reset (void) +void CommPlayerMan_Reset(void) { if (sCommPlayerManager == NULL) { return; @@ -132,7 +131,7 @@ void CommPlayerMan_Reset (void) } } -void CommPlayerMan_Restart (void) +void CommPlayerMan_Restart(void) { if (sCommPlayerManager == NULL) { return; @@ -145,7 +144,7 @@ void CommPlayerMan_Restart (void) CommPlayer_SendPos(TRUE); } -void CommPlayerMan_Delete (BOOL deletePlayerData) +void CommPlayerMan_Delete(BOOL deletePlayerData) { int netId, netJd; @@ -177,7 +176,7 @@ void CommPlayerMan_Delete (BOOL deletePlayerData) } } -void CommPlayerMan_Reinit (void) +void CommPlayerMan_Reinit(void) { for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) { if (sCommPlayerManager->isUnderground) { @@ -225,7 +224,7 @@ void CommPlayerMan_Reinit (void) } } -void CommPlayerMan_Stop (void) +void CommPlayerMan_Stop(void) { if (sCommPlayerManager->task) { Task_CommPlayerManagerRun(NULL, NULL); @@ -235,7 +234,7 @@ void CommPlayerMan_Stop (void) sCommPlayerManager->task = NULL; } -void CommPlayer_InitPersonal (void) +void CommPlayer_InitPersonal(void) { sCommPlayerManager->playerAvatar[CommSys_CurNetId()] = sCommPlayerManager->fieldSystem->playerAvatar; sCommPlayerManager->isActive[CommSys_CurNetId()] = TRUE; @@ -247,7 +246,7 @@ void CommPlayer_InitPersonal (void) sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].dir = PlayerAvatar_GetDir(sCommPlayerManager->fieldSystem->playerAvatar); } -void CommPlayer_CopyPersonal (int netJd) +void CommPlayer_CopyPersonal(int netJd) { int netId; @@ -255,7 +254,7 @@ void CommPlayer_CopyPersonal (int netJd) netId = CommSys_CurNetId(); sCommPlayerManager->playerAvatar[netId] = sCommPlayerManager->fieldSystem->playerAvatar; - sCommPlayerManager->isActive[netId] =TRUE; + sCommPlayerManager->isActive[netId] = TRUE; sCommPlayerManager->playerLocation[netId].x = sCommPlayerManager->playerLocation[netJd].x; sCommPlayerManager->playerLocation[netId].z = sCommPlayerManager->playerLocation[netJd].z; sCommPlayerManager->playerLocation[netId].dir = sCommPlayerManager->playerLocation[netJd].dir; @@ -272,7 +271,7 @@ void CommPlayer_CopyPersonal (int netJd) sCommPlayerManager->unk_14A[netJd].unk_20 = 0xff; } -void CommPlayer_SendXZPos (BOOL param0, int x, int z) +void CommPlayer_SendXZPos(BOOL param0, int x, int z) { u8 data[5 + 1]; int dir = PlayerAvatar_GetDir(sCommPlayerManager->fieldSystem->playerAvatar); @@ -291,7 +290,7 @@ void CommPlayer_SendXZPos (BOOL param0, int x, int z) sCommPlayerManager->sendAllPos = TRUE; } -void CommPlayer_SendPos (BOOL param0) +void CommPlayer_SendPos(BOOL param0) { int x = Player_GetXPos(sCommPlayerManager->fieldSystem->playerAvatar); int z = Player_GetZPos(sCommPlayerManager->fieldSystem->playerAvatar); @@ -299,7 +298,7 @@ void CommPlayer_SendPos (BOOL param0) CommPlayer_SendXZPos(param0, x, z); } -void CommPlayer_SendPosServer (BOOL param0) +void CommPlayer_SendPosServer(BOOL param0) { int x = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].x; int z = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].z; @@ -307,7 +306,7 @@ void CommPlayer_SendPosServer (BOOL param0) CommPlayer_SendXZPos(param0, x, z); } -static void CommPlayer_SendPosNetId (int netId, const CommPlayerLocation * playerLocation) +static void CommPlayer_SendPosNetId(int netId, const CommPlayerLocation *playerLocation) { u8 data[COMM_PACKET_SIZE_POS_NETID + 1]; int x = playerLocation->x, z = playerLocation->z; @@ -339,7 +338,7 @@ static void CommPlayer_SendPosNetId (int netId, const CommPlayerLocation * playe CommSys_SendDataServer(23, data, 0); } -void CommPlayer_SendDataTask (void * data) +void CommPlayer_SendDataTask(void *data) { int v0 = PlayerAvatar_MoveState(sCommPlayerManager->fieldSystem->playerAvatar); int moveState = Player_MoveState(sCommPlayerManager->fieldSystem->playerAvatar); @@ -356,11 +355,11 @@ void CommPlayer_SendDataTask (void * data) } } -static void sub_02057C2C (void * data) +static void sub_02057C2C(void *data) { for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) { if (sCommPlayerManager->isActive[netId]) { - CommPlayerLocation * location = &sCommPlayerManager->playerLocationServer[netId]; + CommPlayerLocation *location = &sCommPlayerManager->playerLocationServer[netId]; if (sCommPlayerManager->movementChanged[netId] || sCommPlayerManager->sendAllPos) { sCommPlayerManager->movementChanged[netId] = 0; @@ -372,14 +371,14 @@ static void sub_02057C2C (void * data) sCommPlayerManager->sendAllPos = FALSE; } -u32 CommPlayer_Size (void) +u32 CommPlayer_Size(void) { return sizeof(CommPlayerManager); } -static void CommPlayer_Add (u8 netId) +static void CommPlayer_Add(u8 netId) { - PlayerAvatar * playerAvatar; + PlayerAvatar *playerAvatar; if (sCommPlayerManager->playerAvatar[netId] != NULL) { return; @@ -389,17 +388,17 @@ static void CommPlayer_Add (u8 netId) return; } - TrainerInfo * trainerInfo = CommInfo_TrainerInfo(netId); + TrainerInfo *trainerInfo = CommInfo_TrainerInfo(netId); if (trainerInfo) { if (!sCommPlayerManager->isUnderground && netId != CommSys_CurNetId()) { - MapObject * obj = MapObjMan_LocalMapObjByIndex(sCommPlayerManager->fieldSystem->mapObjMan, 0xff + netId + 1); + MapObject *obj = MapObjMan_LocalMapObjByIndex(sCommPlayerManager->fieldSystem->mapObjMan, 0xff + netId + 1); if (obj != NULL) { MapObject_Delete(obj); } } - + int version = 0; if (0 == TrainerInfo_GameCode(trainerInfo)) { @@ -407,7 +406,7 @@ static void CommPlayer_Add (u8 netId) } playerAvatar = PlayerAvatar_Init(sCommPlayerManager->fieldSystem->mapObjMan, sCommPlayerManager->playerLocation[netId].x, sCommPlayerManager->playerLocation[netId].z, sCommPlayerManager->playerLocation[netId].dir, 0x0, TrainerInfo_Gender(trainerInfo), version, NULL); - + GF_ASSERT(playerAvatar != NULL); sCommPlayerManager->playerAvatar[netId] = playerAvatar; @@ -429,7 +428,7 @@ static void CommPlayer_Add (u8 netId) } } -void CommPlayer_Destroy (u8 netId, BOOL param1, BOOL param2) +void CommPlayer_Destroy(u8 netId, BOOL param1, BOOL param2) { if (sCommPlayerManager == NULL) { return; @@ -468,7 +467,7 @@ void CommPlayer_Destroy (u8 netId, BOOL param1, BOOL param2) } } -static void CommPlayer_SendMoveSpeed () +static void CommPlayer_SendMoveSpeed() { u8 moveSpeed = 2; @@ -479,7 +478,7 @@ static void CommPlayer_SendMoveSpeed () CommSys_SetSendSpeed(moveSpeed); } -static void Task_CommPlayerManagerRun (SysTask * task, void * data) +static void Task_CommPlayerManagerRun(SysTask *task, void *data) { if (CommSys_IsInitialized()) { CommPlayer_SendMoveSpeed(); @@ -509,7 +508,7 @@ static void Task_CommPlayerManagerRun (SysTask * task, void * data) } } -static void sub_02057EF8 (void * param0) +static void sub_02057EF8(void *param0) { for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) { if (!CommSys_IsPlayerConnected(netId)) { @@ -531,14 +530,14 @@ static void sub_02057EF8 (void * param0) ov23_022436F0(netId); ov23_02241648(netId); } - + u8 netId_u8 = netId; CommPlayer_RecvDelete(0, 1, &netId_u8, sCommPlayerManager->fieldSystem); - } + } } } -BOOL sub_02057FAC (void) +BOOL sub_02057FAC(void) { if (sCommPlayerManager != NULL) { return sCommPlayerManager->unk_2BC; @@ -547,7 +546,7 @@ BOOL sub_02057FAC (void) return FALSE; } -void sub_02057FC4 (BOOL param0) +void sub_02057FC4(BOOL param0) { if (sCommPlayerManager != NULL) { if (sCommPlayerManager->unk_2BC != param0) { @@ -558,7 +557,7 @@ void sub_02057FC4 (BOOL param0) } } -static void sub_02057FF0 (BOOL param0) +static void sub_02057FF0(BOOL param0) { if (sCommPlayerManager != NULL) { if (sCommPlayerManager->unk_2BC != param0) { @@ -568,9 +567,9 @@ static void sub_02057FF0 (BOOL param0) } } -void sub_02058018 (int netId, int param1, void * param2, void * param3) +void sub_02058018(int netId, int param1, void *param2, void *param3) { - u8 * buffer = (u8 *)param2; + u8 *buffer = (u8 *)param2; if (sCommPlayerManager) { GF_ASSERT(param1 == 1); @@ -581,7 +580,7 @@ void sub_02058018 (int netId, int param1, void * param2, void * param3) } } -void sub_0205805C (FieldSystem * fieldSystem, BOOL param1) +void sub_0205805C(FieldSystem *fieldSystem, BOOL param1) { if (sCommPlayerManager == NULL) { return; @@ -607,31 +606,31 @@ void sub_0205805C (FieldSystem * fieldSystem, BOOL param1) } } -static int CommPlayer_Direction (u16 unused, u16 keys) +static int CommPlayer_Direction(u16 unused, u16 keys) { - if ((keys & PAD_KEY_LEFT)) { + if (keys & PAD_KEY_LEFT) { return 2; } - if ((keys & PAD_KEY_RIGHT)) { + if (keys & PAD_KEY_RIGHT) { return 3; } - if ((keys & PAD_KEY_UP)) { + if (keys & PAD_KEY_UP) { return 0; } - if ((keys & PAD_KEY_DOWN)) { + if (keys & PAD_KEY_DOWN) { return 1; } return -1; } -BOOL CommPlayer_CheckNPCCollision (int x, int z) +BOOL CommPlayer_CheckNPCCollision(int x, int z) { int npcCnt, i; - const ObjectEvent * npcList; + const ObjectEvent *npcList; npcCnt = MapHeaderData_GetNumObjectEvents(sCommPlayerManager->fieldSystem); npcList = MapHeaderData_GetObjectEvents(sCommPlayerManager->fieldSystem); @@ -645,7 +644,7 @@ BOOL CommPlayer_CheckNPCCollision (int x, int z) return 0; } -static BOOL CommPlayer_CheckCollision (int x, int z, int netIdTarget) +static BOOL CommPlayer_CheckCollision(int x, int z, int netIdTarget) { if ((x != 0xffff) && (z != 0xffff)) { for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) { @@ -672,7 +671,7 @@ static BOOL CommPlayer_CheckCollision (int x, int z, int netIdTarget) return FieldSystem_CheckCollision(sCommPlayerManager->fieldSystem, x, z); } -static int sub_020581CC (int param0, int param1) +static int sub_020581CC(int param0, int param1) { if (param0 < 5) { return 8; @@ -683,20 +682,20 @@ static int sub_020581CC (int param0, int param1) return 2; } -static int sub_020581E0 (int param0) +static int sub_020581E0(int param0) { - int v0[5] = {2, 4, 8, 16, 2}; + int v0[5] = { 2, 4, 8, 16, 2 }; GF_ASSERT(param0 < 5); return v0[param0]; } -static void CommPlayer_Move (SysTask * param0, void * param1) +static void CommPlayer_Move(SysTask *param0, void *param1) { u16 keys; int dir, x, z, netId, v6; - CommPlayerLocation * playerLocation; - UnkStruct_ov23_02249978 * v8 = NULL; + CommPlayerLocation *playerLocation; + UnkStruct_ov23_02249978 *v8 = NULL; for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) { if (sCommPlayerManager->isActive[netId] && sCommPlayerManager->unk_E2[netId] && sCommPlayerManager->unk_EA[netId]) { @@ -814,10 +813,10 @@ static void CommPlayer_Move (SysTask * param0, void * param1) } } -void CommPlayer_RecvLocation (int netId, int param1, void * src, void * param3) +void CommPlayer_RecvLocation(int netId, int param1, void *src, void *param3) { - u8 * buffer = (u8 *)src; - CommPlayerLocation * playerLocation; + u8 *buffer = (u8 *)src; + CommPlayerLocation *playerLocation; if (sCommPlayerManager == NULL) { return; @@ -854,9 +853,9 @@ void CommPlayer_RecvLocation (int netId, int param1, void * src, void * param3) } } -void CommPlayer_RecvDelete (int unused0, int unused2, void * src, void * param3) +void CommPlayer_RecvDelete(int unused0, int unused2, void *src, void *param3) { - u8 * buffer = (u8 *)src; + u8 *buffer = (u8 *)src; u8 netId = buffer[0]; if (sCommPlayerManager == NULL) { @@ -879,15 +878,15 @@ void CommPlayer_RecvDelete (int unused0, int unused2, void * src, void * param3) CommInfo_InitPlayer(netId); } -int CommPacketSizeOf_RecvLocation (void) +int CommPacketSizeOf_RecvLocation(void) { return COMM_PACKET_SIZE_LOCATION; } -void CommPlayer_RecvLocationAndInit (int netId, int size, void * src, void * unused) +void CommPlayer_RecvLocationAndInit(int netId, int size, void *src, void *unused) { - u8 * buffer = (u8 *)src; - CommPlayerLocation * playerLocation; + u8 *buffer = (u8 *)src; + CommPlayerLocation *playerLocation; int netJd; netJd = buffer[0] & 0xf; @@ -920,9 +919,9 @@ void CommPlayer_RecvLocationAndInit (int netId, int size, void * src, void * unu CommPlayer_Add(netJd); } -static void sub_02058644 (int netId) +static void sub_02058644(int netId) { - UndergroundData * underground = sub_020298B0(FieldSystem_SaveData(sCommPlayerManager->fieldSystem)); + UndergroundData *underground = sub_020298B0(FieldSystem_SaveData(sCommPlayerManager->fieldSystem)); SaveData_SecretBaseRecord(FieldSystem_SaveData(sCommPlayerManager->fieldSystem)); if (sCommPlayerManager->isUnderground) { @@ -936,9 +935,9 @@ static void sub_02058644 (int netId) } } -static BOOL CommPlayer_BlowAnimation (int netId, int param1, int param2, int animSpeed) +static BOOL CommPlayer_BlowAnimation(int netId, int param1, int param2, int animSpeed) { - MapObject * obj; + MapObject *obj; u8 walkAnimationCode[] = { 0x14, 0x15, 0x16, 0x17, 0x10, 0x11, 0x12, 0x13, 0xc, 0xd, 0xe, 0xf }; @@ -980,11 +979,11 @@ static BOOL CommPlayer_BlowAnimation (int netId, int param1, int param2, int ani return TRUE; } -static void CommPlayer_MoveClient (int netId) +static void CommPlayer_MoveClient(int netId) { u16 pad = 0; - CommPlayerLocation * playerLocation; - PlayerAvatar * playerAvatar; + CommPlayerLocation *playerLocation; + PlayerAvatar *playerAvatar; int moveSpeed; playerLocation = &sCommPlayerManager->playerLocation[netId]; @@ -1034,7 +1033,6 @@ static void CommPlayer_MoveClient (int netId) } if (abs(dx) + abs(dy) > 2) { - } if (CommPlayer_BlowAnimation(netId, pad, pad, playerLocation->moveSpeed)) { @@ -1114,10 +1112,10 @@ static void CommPlayer_MoveClient (int netId) } } -static BOOL CommPlayer_MoveBlow (int netId, int param1) +static BOOL CommPlayer_MoveBlow(int netId, int param1) { int x, z; - CommPlayerLocation * playerLocation; + CommPlayerLocation *playerLocation; if (sCommPlayerManager->unk_10A[netId] == 0) { return 0; @@ -1172,9 +1170,9 @@ static BOOL CommPlayer_MoveBlow (int netId, int param1) return 1; } -void sub_02058B0C (int netId, int param1, BOOL param2) +void sub_02058B0C(int netId, int param1, BOOL param2) { - CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[netId]; + CommPlayerLocation *playerLocation = &sCommPlayerManager->playerLocationServer[netId]; playerLocation->dir = CommPlayer_GetOppositeDir(param1); sCommPlayerManager->unk_112[netId] = param1; @@ -1190,19 +1188,19 @@ void sub_02058B0C (int netId, int param1, BOOL param2) sCommPlayerManager->movementChanged[netId] = 1; } -void sub_02058B7C (int netId) +void sub_02058B7C(int netId) { sCommPlayerManager->unk_10A[netId] = 0; } -void sub_02058B94 (int netId) +void sub_02058B94(int netId) { sCommPlayerManager->unk_10A[netId] = 0xff; } -void CommPlayer_StartBlowAnimation (int netId, int param1, BOOL param2) +void CommPlayer_StartBlowAnimation(int netId, int param1, BOOL param2) { - MapObject * obj; + MapObject *obj; if (sCommPlayerManager->playerAvatar[netId] == NULL) { return; @@ -1216,9 +1214,9 @@ void CommPlayer_StartBlowAnimation (int netId, int param1, BOOL param2) sCommPlayerManager->blowDir[netId] = param1; } -void CommPlayer_StopBlowAnimation (int netId) +void CommPlayer_StopBlowAnimation(int netId) { - MapObject * obj; + MapObject *obj; if (sCommPlayerManager->playerAvatar[netId] == NULL) { return; @@ -1235,12 +1233,12 @@ void CommPlayer_StopBlowAnimation (int netId) } } -int CommPacketSizeOf_RecvLocationAndInit (void) +int CommPacketSizeOf_RecvLocationAndInit(void) { return COMM_PACKET_SIZE_POS_NETID; } -BOOL sub_02058C40 (void) +BOOL sub_02058C40(void) { if (CommSys_IsAlone()) { return TRUE; @@ -1261,12 +1259,12 @@ BOOL sub_02058C40 (void) return TRUE; } -BOOL CommPlayer_IsActive (int netId) +BOOL CommPlayer_IsActive(int netId) { return sCommPlayerManager->isActive[netId]; } -int CommPlayer_XPos (int netId) +int CommPlayer_XPos(int netId) { if (!sCommPlayerManager) { return 0xffff; @@ -1279,7 +1277,7 @@ int CommPlayer_XPos (int netId) return sCommPlayerManager->playerLocation[netId].x; } -int CommPlayer_ZPos (int netId) +int CommPlayer_ZPos(int netId) { if (!sCommPlayerManager) { return 0xffff; @@ -1292,7 +1290,7 @@ int CommPlayer_ZPos (int netId) return sCommPlayerManager->playerLocation[netId].z; } -int sub_02058D48 (int netId) +int sub_02058D48(int netId) { if (!sCommPlayerManager) { return 0xffff; @@ -1301,7 +1299,7 @@ int sub_02058D48 (int netId) return sCommPlayerManager->playerLocation[netId].x; } -int sub_02058D68 (int netId) +int sub_02058D68(int netId) { if (!sCommPlayerManager) { return 0xffff; @@ -1310,7 +1308,7 @@ int sub_02058D68 (int netId) return sCommPlayerManager->playerLocation[netId].z; } -int sub_02058D88 (int netId) +int sub_02058D88(int netId) { if (CommPlayer_XPos(netId) == 0xffff) { return 0xffff; @@ -1319,7 +1317,7 @@ int sub_02058D88 (int netId) return sCommPlayerManager->playerLocation[netId].x + MapObject_GetDxFromDir(sCommPlayerManager->playerLocation[netId].dir); } -int sub_02058DC0 (int netId) +int sub_02058DC0(int netId) { if (CommPlayer_ZPos(netId) == 0xffff) { return 0xffff; @@ -1328,7 +1326,7 @@ int sub_02058DC0 (int netId) return sCommPlayerManager->playerLocation[netId].z + MapObject_GetDyFromDir(sCommPlayerManager->playerLocation[netId].dir); } -int CommPlayer_GetXServer (int netId) +int CommPlayer_GetXServer(int netId) { if (!sCommPlayerManager) { return 0xffff; @@ -1341,7 +1339,7 @@ int CommPlayer_GetXServer (int netId) return sCommPlayerManager->playerLocationServer[netId].x; } -int CommPlayer_GetZServer (int netId) +int CommPlayer_GetZServer(int netId) { if (!sCommPlayerManager) { return 0xffff; @@ -1354,7 +1352,7 @@ int CommPlayer_GetZServer (int netId) return sCommPlayerManager->playerLocationServer[netId].z; } -int sub_02058EA0 (int netId) +int sub_02058EA0(int netId) { if (!sCommPlayerManager) { return 0xffff; @@ -1363,7 +1361,7 @@ int sub_02058EA0 (int netId) return sCommPlayerManager->playerLocationServer[netId].x; } -int sub_02058EC0 (int netId) +int sub_02058EC0(int netId) { if (!sCommPlayerManager) { return 0xffff; @@ -1372,7 +1370,7 @@ int sub_02058EC0 (int netId) return sCommPlayerManager->playerLocationServer[netId].z; } -int CommPlayer_AddXServer (int netId) +int CommPlayer_AddXServer(int netId) { if (CommPlayer_GetXServer(netId) == 0xffff) { return 0xffff; @@ -1381,7 +1379,7 @@ int CommPlayer_AddXServer (int netId) return sCommPlayerManager->playerLocationServer[netId].x + MapObject_GetDxFromDir(sCommPlayerManager->playerLocationServer[netId].dir); } -int CommPlayer_AddZServer (int netId) +int CommPlayer_AddZServer(int netId) { if (CommPlayer_GetZServer(netId) == 0xffff) { return 0xffff; @@ -1390,7 +1388,7 @@ int CommPlayer_AddZServer (int netId) return sCommPlayerManager->playerLocationServer[netId].z + MapObject_GetDyFromDir(sCommPlayerManager->playerLocationServer[netId].dir); } -int CommPlayer_Dir (int netId) +int CommPlayer_Dir(int netId) { if (!sub_02058C40() || !sCommPlayerManager->isActive[netId]) { return -1; @@ -1399,7 +1397,7 @@ int CommPlayer_Dir (int netId) return sCommPlayerManager->playerLocation[netId].dir; } -int CommPlayer_DirServer (int netId) +int CommPlayer_DirServer(int netId) { if (!sub_02058C40() || !sCommPlayerManager->isActive[netId]) { return -1; @@ -1408,7 +1406,7 @@ int CommPlayer_DirServer (int netId) return sCommPlayerManager->playerLocationServer[netId].dir; } -void CommPlayer_LookTowardsServer (int netIdTarget, int netIdSet) +void CommPlayer_LookTowardsServer(int netIdTarget, int netIdSet) { int dir = CommPlayer_GetOppositeDir(sCommPlayerManager->playerLocationServer[netIdTarget].dir); @@ -1416,13 +1414,13 @@ void CommPlayer_LookTowardsServer (int netIdTarget, int netIdSet) sCommPlayerManager->movementChanged[netIdSet] = TRUE; } -void CommPlayer_LookTowards (int netIdTarget, int netIdSet) +void CommPlayer_LookTowards(int netIdTarget, int netIdSet) { int dir = CommPlayer_GetOppositeDir(sCommPlayerManager->playerLocation[netIdTarget].dir); sCommPlayerManager->playerLocation[netIdSet].dir = dir; } -int sub_0205900C (int xPos, int yPos) +int sub_0205900C(int xPos, int yPos) { int netId, x, y; @@ -1446,7 +1444,7 @@ int sub_0205900C (int xPos, int yPos) return 0xff; } -void sub_02059058 (int netId, BOOL param1) +void sub_02059058(int netId, BOOL param1) { if (sCommPlayerManager->unk_E2[netId] != param1) { sCommPlayerManager->unk_E2[netId] = param1; @@ -1456,7 +1454,7 @@ void sub_02059058 (int netId, BOOL param1) } } -BOOL sub_02059094 (int netId) +BOOL sub_02059094(int netId) { if (sCommPlayerManager->unk_2C2) { return 0; @@ -1469,22 +1467,22 @@ BOOL sub_02059094 (int netId) return sCommPlayerManager->unk_E2[netId]; } -BOOL sub_020590C4 (void) +BOOL sub_020590C4(void) { UnkStruct_020590C4 batleGrid1v1[] = { - {4, 7}, - {11, 7} + { 4, 7 }, + { 11, 7 } }; UnkStruct_020590C4 battleGrid2v2[] = { - {4, 6}, - {11, 6}, - {4, 8}, - {11, 8} + { 4, 6 }, + { 11, 6 }, + { 4, 8 }, + { 11, 8 } }; int connectedPlayers = CommType_MaxPlayers(sub_0203895C()); int netId, netJd, playerCnt = 0, v6[4], v7; int v8 = 0; - UnkStruct_020590C4 * v9; + UnkStruct_020590C4 *v9; if (connectedPlayers == 2) { v9 = batleGrid1v1; @@ -1515,9 +1513,9 @@ BOOL sub_020590C4 (void) return v8; } -void sub_02059180 (int netId, int unused1, void * src, void * unused3) +void sub_02059180(int netId, int unused1, void *src, void *unused3) { - u8 * buffer = src; + u8 *buffer = src; if (buffer[0] == 3) { sCommPlayerManager->unk_F2[netId] = 0; @@ -1527,22 +1525,22 @@ void sub_02059180 (int netId, int unused1, void * src, void * unused3) } static UnkStruct_020590C4 Unk_02100B6C[] = { - {0x4, 0x7}, - {0xB, 0x7} + { 0x4, 0x7 }, + { 0xB, 0x7 } }; static UnkStruct_020590C4 Unk_02100B74[] = { - {0x4, 0x6}, - {0xB, 0x6}, - {0x4, 0x8}, - {0xB, 0x8} + { 0x4, 0x6 }, + { 0xB, 0x6 }, + { 0x4, 0x8 }, + { 0xB, 0x8 } }; -static void sub_020591A8 (void) +static void sub_020591A8(void) { int connectedPlayers = CommType_MaxPlayers(sub_0203895C()); int netJd = 0; - UnkStruct_020590C4 * v6; + UnkStruct_020590C4 *v6; u8 netId; if (connectedPlayers == 2) { @@ -1565,7 +1563,7 @@ static void sub_020591A8 (void) } } -void CommPlayer_SetBattleDir (void) +void CommPlayer_SetBattleDir(void) { int netId = CommSys_CurNetId(); int code; @@ -1582,7 +1580,7 @@ void CommPlayer_SetBattleDir (void) CommPlayerMan_ForceDir(); } -BOOL sub_0205928C (void) +BOOL sub_0205928C(void) { int connectedPlayers = CommType_MaxPlayers(sub_0203895C()); int netId = 0, dir; @@ -1594,7 +1592,7 @@ BOOL sub_0205928C (void) } for (netId = 0; netId < connectedPlayers; netId++) { - CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[netId]; + CommPlayerLocation *playerLocation = &sCommPlayerManager->playerLocationServer[netId]; dir = CommPlayer_GetOppositeDir(playerLocation->dir); playerLocation->x += MapObject_GetDxFromDir(dir); @@ -1608,7 +1606,7 @@ BOOL sub_0205928C (void) return 1; } -int CommPlayer_GetOppositeDir (int dir) +int CommPlayer_GetOppositeDir(int dir) { if (dir == 0) { return 1; @@ -1624,52 +1622,52 @@ int CommPlayer_GetOppositeDir (int dir) return 2; } -void sub_02059354 (int netId, int param1) +void sub_02059354(int netId, int param1) { sCommPlayerManager->unk_11A[netId] = param1; sCommPlayerManager->moveTimerServer[netId] = 15; } -void sub_02059378 (int netId) +void sub_02059378(int netId) { sCommPlayerManager->unk_11A[netId] = 0; } -void sub_02059390 (int netId, int param1) +void sub_02059390(int netId, int param1) { sCommPlayerManager->unk_122[netId] = param1; sCommPlayerManager->moveTimerServer[netId] = 15; } -void sub_020593B4 (int netId) +void sub_020593B4(int netId) { sCommPlayerManager->unk_122[netId] = 0; } -int CommPlayer_GetMovementTimer (int netId) +int CommPlayer_GetMovementTimer(int netId) { return sCommPlayerManager->moveTimer[netId]; } -int CommPlayer_GetMovementTimerServer (int netId) +int CommPlayer_GetMovementTimerServer(int netId) { return sCommPlayerManager->moveTimerServer[netId]; } -void CommPlayer_SetDir (int dir) +void CommPlayer_SetDir(int dir) { Player_SetDir(sCommPlayerManager->fieldSystem->playerAvatar, dir); sCommPlayerManager->playerLocation[CommSys_CurNetId()].dir = dir; CommPlayer_SendPos(FALSE); } -void CommPlayer_SetDirClient (int netId, int dir) +void CommPlayer_SetDirClient(int netId, int dir) { sCommPlayerManager->playerLocation[netId].dir = dir; Player_SetDir(sCommPlayerManager->playerAvatar[netId], dir); } -int CommPlayer_DirClient (int netId) +int CommPlayer_DirClient(int netId) { if (!sCommPlayerManager->playerAvatar[netId]) { return -1; @@ -1678,7 +1676,7 @@ int CommPlayer_DirClient (int netId) return PlayerAvatar_GetDir(sCommPlayerManager->playerAvatar[netId]); } -void sub_02059464 (int param0) +void sub_02059464(int param0) { if (0 != param0) { sCommPlayerManager->unk_00 |= param0; @@ -1688,7 +1686,7 @@ void sub_02059464 (int param0) sCommPlayerManager->unk_2BC = 0; } -void sub_0205948C (int param0) +void sub_0205948C(int param0) { if (0 != param0) { sCommPlayerManager->unk_00 &= ~(param0); @@ -1710,24 +1708,24 @@ void sub_0205948C (int param0) } } -void sub_020594EC (void) +void sub_020594EC(void) { sCommPlayerManager->unk_00 = 0; } -void sub_020594FC (void) +void sub_020594FC(void) { sub_0203D128(); sCommPlayerManager->unk_2BC = 0; } -void sub_02059514 (void) +void sub_02059514(void) { sub_0203D140(); sub_02057FC4(1); } -void sub_02059524 (void) +void sub_02059524(void) { if (sCommPlayerManager->unk_2BF == 0) { if (!sCommPlayerManager->isUnderground) { @@ -1742,7 +1740,7 @@ void sub_02059524 (void) } } -void sub_02059570 (void) +void sub_02059570(void) { if (sCommPlayerManager->unk_2BF == 0) { if (sCommPlayerManager->isUnderground) { @@ -1753,10 +1751,10 @@ void sub_02059570 (void) } } -void CommPlayerMan_ForcePos (void) +void CommPlayerMan_ForcePos(void) { int netId, x, z, dir; - MapObject * obj; + MapObject *obj; if (!sCommPlayerManager) { return; @@ -1782,12 +1780,12 @@ void CommPlayerMan_ForcePos (void) } } -void CommPlayerMan_ForceDir (void) +void CommPlayerMan_ForceDir(void) { sCommPlayerManager->forceDirTimer = 8; } -void sub_02059638 (BOOL param0) +void sub_02059638(BOOL param0) { sCommPlayerManager->unk_2C3 = param0; } diff --git a/src/comm_ring.c b/src/comm_ring.c index 96aa98a456..7dff8a7aff 100644 --- a/src/comm_ring.c +++ b/src/comm_ring.c @@ -1,13 +1,14 @@ +#include "comm_ring.h" + #include #include -#include "comm_ring.h" #include "communication_system.h" -static int CommRing_Index(CommRing * ring, int index); -static int CommRing_RemainingSizeBackup(CommRing * ring); +static int CommRing_Index(CommRing *ring, int index); +static int CommRing_RemainingSizeBackup(CommRing *ring); -void CommRing_Init (CommRing * ring, u8 * buffer, int size) +void CommRing_Init(CommRing *ring, u8 *buffer, int size) { ring->buffer = buffer; ring->size = size; @@ -16,7 +17,7 @@ void CommRing_Init (CommRing * ring, u8 * buffer, int size) ring->backupEndIndex = 0; } -void CommRring_Write (CommRing * ring, u8 * buffer, int size, int unused) +void CommRring_Write(CommRing *ring, u8 *buffer, int size, int unused) { int i; @@ -35,7 +36,7 @@ void CommRring_Write (CommRing * ring, u8 * buffer, int size, int unused) ring->backupEndIndex = CommRing_Index(ring, i); } -int CommRing_Read (CommRing * ring, u8 * buffer, int size) +int CommRing_Read(CommRing *ring, u8 *buffer, int size) { int index = CommRing_Peek(ring, buffer, size); ring->startIndex = CommRing_Index(ring, ring->startIndex + index); @@ -43,7 +44,7 @@ int CommRing_Read (CommRing * ring, u8 * buffer, int size) return index; } -u8 CommRing_ReadByte (CommRing * ring) +u8 CommRing_ReadByte(CommRing *ring) { u8 buff; @@ -51,8 +52,8 @@ u8 CommRing_ReadByte (CommRing * ring) return buff; } -//Reading but doesn't incriment the index -int CommRing_Peek (CommRing * ring, u8 * buffer, int size) +// Reading but doesn't incriment the index +int CommRing_Peek(CommRing *ring, u8 *buffer, int size) { int j = 0; @@ -67,7 +68,7 @@ int CommRing_Peek (CommRing * ring, u8 * buffer, int size) return j; } -int CommRing_DataSize (CommRing * ring) +int CommRing_DataSize(CommRing *ring) { if (ring->startIndex > ring->endIndex) { return ring->size + ring->endIndex - ring->startIndex; @@ -76,12 +77,12 @@ int CommRing_DataSize (CommRing * ring) return ring->endIndex - ring->startIndex; } -int CommRing_RemainingSize (CommRing * ring) +int CommRing_RemainingSize(CommRing *ring) { return ring->size - CommRing_DataSize(ring); } -static int CommRing_RemainingSizeBackup (CommRing * ring) +static int CommRing_RemainingSizeBackup(CommRing *ring) { if (ring->startIndex > ring->backupEndIndex) { return ring->startIndex - ring->backupEndIndex; @@ -90,12 +91,12 @@ static int CommRing_RemainingSizeBackup (CommRing * ring) return ring->size - (ring->backupEndIndex - ring->startIndex); } -int CommRing_Index (CommRing * ring, int index) +int CommRing_Index(CommRing *ring, int index) { return index % ring->size; } -void CommRing_UpdateEndPos (CommRing * ring) +void CommRing_UpdateEndPos(CommRing *ring) { ring->endIndex = ring->backupEndIndex; } diff --git a/src/communication_information.c b/src/communication_information.c index bd3c07b008..729d0526d1 100644 --- a/src/communication_information.c +++ b/src/communication_information.c @@ -1,27 +1,27 @@ +#include "communication_information.h" + +#include #include #include -#include -#include "trainer_info.h" +#include "constants/heap.h" + #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_0202B4A0_decl.h" #include "struct_decls/struct_0202C878_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0202610C.h" +#include "communication_system.h" #include "heap.h" -#include "constants/heap.h" -#include "unk_02025E08.h" +#include "savedata.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0202602C.h" #include "unk_0202854C.h" #include "unk_0202ACE0.h" #include "unk_0202B37C.h" #include "unk_0202C858.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_0203909C.h" typedef struct CommPlayerInfo { @@ -51,11 +51,11 @@ enum InfoState { }; typedef struct CommunicationInformation { - TrainerInfo * personalTrainerInfo; - const BattleRegulation * regulation; - SaveData * saveData; + TrainerInfo *personalTrainerInfo; + const BattleRegulation *regulation; + SaveData *saveData; CommPlayerInfo playerInfo[MAX_CONNECTED_PLAYERS]; - TrainerInfo * trainerInfo[MAX_CONNECTED_PLAYERS]; + TrainerInfo *trainerInfo[MAX_CONNECTED_PLAYERS]; CommPlayerRecord playerRecord[MAX_CONNECTED_PLAYERS]; u8 infoState[MAX_CONNECTED_PLAYERS]; u8 dataFinishedReading; @@ -63,12 +63,12 @@ typedef struct CommunicationInformation { u8 curNetId; } CommunicationInformation; -static CommunicationInformation * sCommInfo; +static CommunicationInformation *sCommInfo; -void CommInfo_Init (SaveData * saveData, const BattleRegulation * regulation) +void CommInfo_Init(SaveData *saveData, const BattleRegulation *regulation) { int netId; - TrainerInfo * trainerInfo = SaveData_GetTrainerInfo(saveData); + TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(saveData); if (sCommInfo) { return; @@ -91,7 +91,7 @@ void CommInfo_Init (SaveData * saveData, const BattleRegulation * regulation) TrainerInfo_Copy(trainerInfo, sCommInfo->trainerInfo[0]); } -void CommInfo_Delete (void) +void CommInfo_Delete(void) { int netId; @@ -108,19 +108,19 @@ void CommInfo_Delete (void) } } -BOOL CommInfo_IsInitialized (void) +BOOL CommInfo_IsInitialized(void) { return sCommInfo != NULL; } -void CommInfo_SendBattleRegulation (void) +void CommInfo_SendBattleRegulation(void) { u16 netId = CommSys_CurNetId(); - TrainerInfo * trainerInfo; - const u16 * v2; - UnkStruct_0202B4A0 * v3 = sub_0202B4A0(sCommInfo->saveData); - UnkStruct_0202B370 * v4 = sub_0202B370(sCommInfo->saveData); - UnkStruct_0202C878 * v5 = sub_0202C878(sCommInfo->saveData); + TrainerInfo *trainerInfo; + const u16 *v2; + UnkStruct_0202B4A0 *v3 = sub_0202B4A0(sCommInfo->saveData); + UnkStruct_0202B370 *v4 = sub_0202B370(sCommInfo->saveData); + UnkStruct_0202C878 *v5 = sub_0202C878(sCommInfo->saveData); if (sCommInfo->personalTrainerInfo) { trainerInfo = sCommInfo->personalTrainerInfo; @@ -150,12 +150,12 @@ void CommInfo_SendBattleRegulation (void) CommSys_SendData(3, &sCommInfo->playerInfo[netId], sizeof(CommPlayerInfo)); } -int CommPlayerInfo_Size (void) +int CommPlayerInfo_Size(void) { return sizeof(CommPlayerInfo); } -void CommunicatitonInformaion_FinishReading (int param0, int param1, void * param2, void * param3) +void CommunicatitonInformaion_FinishReading(int param0, int param1, void *param2, void *param3) { if (sCommInfo) { sCommInfo->dataFinishedReading = TRUE; @@ -164,14 +164,14 @@ void CommunicatitonInformaion_FinishReading (int param0, int param1, void * para } } -BOOL CommInfo_IsDataFinishedReading (void) +BOOL CommInfo_IsDataFinishedReading(void) { return sCommInfo->dataFinishedReading; } -void CommInfo_RecvPlayerDataArray (int netId, int param1, void * src, void * unused) +void CommInfo_RecvPlayerDataArray(int netId, int param1, void *src, void *unused) { - CommPlayerInfo * playerInfo = (CommPlayerInfo *)src; + CommPlayerInfo *playerInfo = (CommPlayerInfo *)src; if (!sCommInfo) { return; @@ -197,7 +197,7 @@ void CommInfo_RecvPlayerDataArray (int netId, int param1, void * src, void * unu } } -void CommInfo_RecvPlayerData (int netId, int param1, void * src, void * param3) +void CommInfo_RecvPlayerData(int netId, int param1, void *src, void *param3) { if (!sCommInfo) { return; @@ -215,7 +215,7 @@ void CommInfo_RecvPlayerData (int netId, int param1, void * src, void * param3) } } -BOOL CommInfo_ServerSendArray (void) +BOOL CommInfo_ServerSendArray(void) { int netId; @@ -244,43 +244,43 @@ BOOL CommInfo_ServerSendArray (void) return FALSE; } -BOOL CommInfo_IsReceivingData (void) +BOOL CommInfo_IsReceivingData(void) { return sCommInfo->dataRecvFlag; } -void CommInfo_InitPlayer (int netId) +void CommInfo_InitPlayer(int netId) { TrainerInfo_Init(sCommInfo->trainerInfo[netId]); sCommInfo->infoState[netId] = INFO_STATE_EMPTY; } -BOOL sub_02032DC4 (int netId) +BOOL sub_02032DC4(int netId) { return sCommInfo->infoState[netId] == INFO_STATE_BEGIN_RECIEVE; } -BOOL sub_02032DE0 (int netId) +BOOL sub_02032DE0(int netId) { return sCommInfo->infoState[netId] == INFO_STATE_RECIEVE || sCommInfo->infoState[netId] == INFO_STATE_BEGIN_RECIEVE; } -BOOL sub_02032E00 (int netId) +BOOL sub_02032E00(int netId) { return sCommInfo->infoState[netId] == INFO_STATE_RECIEVE; } -void sub_02032E1C (int netId) +void sub_02032E1C(int netId) { sCommInfo->infoState[netId] = INFO_STATE_RECIEVE; } -void CommInfo_SetReceiveEnd (int netId) +void CommInfo_SetReceiveEnd(int netId) { sCommInfo->infoState[netId] = INFO_STATE_END_RECIEVE; } -int CommInfo_NewNetworkId (void) +int CommInfo_NewNetworkId(void) { int netId; @@ -293,7 +293,7 @@ int CommInfo_NewNetworkId (void) return 0xff; } -int CommInfo_CountReceived (void) +int CommInfo_CountReceived(void) { int netId; int cnt = 0; @@ -310,7 +310,7 @@ int CommInfo_CountReceived (void) return cnt; } -BOOL sub_02032E90 (void) +BOOL sub_02032E90(void) { int netId; BOOL ret = FALSE; @@ -321,9 +321,9 @@ BOOL sub_02032E90 (void) } for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) { - if (!CommSys_IsPlayerConnected(netId) - && !(netId == 0 && CommSys_IsAlone()) - && sCommInfo->infoState[netId] != 0) { + if (!CommSys_IsPlayerConnected(netId) + && !(netId == 0 && CommSys_IsAlone()) + && sCommInfo->infoState[netId] != 0) { CommInfo_InitPlayer(netId); ret = TRUE; } @@ -333,7 +333,7 @@ BOOL sub_02032E90 (void) return ret; } -TrainerInfo * CommInfo_TrainerInfo (int netId) +TrainerInfo *CommInfo_TrainerInfo(int netId) { if (!sCommInfo) { return NULL; @@ -349,7 +349,7 @@ TrainerInfo * CommInfo_TrainerInfo (int netId) return NULL; } -DWCFriendData * CommInfo_DWCFriendData (int netId) +DWCFriendData *CommInfo_DWCFriendData(int netId) { if (sCommInfo->infoState[netId] != INFO_STATE_EMPTY) { return &sCommInfo->playerInfo[netId].friendData; @@ -358,12 +358,12 @@ DWCFriendData * CommInfo_DWCFriendData (int netId) return NULL; } -int sub_02032F40 (int param0) +int sub_02032F40(int param0) { return sub_02039390(sCommInfo->saveData, param0); } -u16 * sub_02032F54 (int netId) +u16 *sub_02032F54(int netId) { if (sCommInfo->infoState[netId] != 0) { return sCommInfo->playerInfo[netId].unk_4C; @@ -372,7 +372,7 @@ u16 * sub_02032F54 (int netId) return NULL; } -int CommInfo_PlayerCountry (int netId) +int CommInfo_PlayerCountry(int netId) { if (sCommInfo->infoState[netId] != 0) { return sCommInfo->playerInfo[netId].country; @@ -381,7 +381,7 @@ int CommInfo_PlayerCountry (int netId) return 0; } -int CommInfo_PlayerRegion (int netId) +int CommInfo_PlayerRegion(int netId) { if (sCommInfo->infoState[netId] != 0) { return sCommInfo->playerInfo[netId].region; @@ -390,7 +390,7 @@ int CommInfo_PlayerRegion (int netId) return 0; } -int sub_02032FC0 (int param0) +int sub_02032FC0(int param0) { if (sCommInfo->infoState[param0] != 0) { return sCommInfo->playerInfo[param0].unk_65; @@ -399,7 +399,7 @@ int sub_02032FC0 (int param0) return 0; } -BOOL CommInfo_CheckBattleRegulation (void) +BOOL CommInfo_CheckBattleRegulation(void) { int netId, i; @@ -418,7 +418,7 @@ BOOL CommInfo_CheckBattleRegulation (void) return TRUE; } -static void CommInfo_UpdatePlayerRecord (int param0, int val) +static void CommInfo_UpdatePlayerRecord(int param0, int val) { int netId; int v1, v2; @@ -452,13 +452,13 @@ static void CommInfo_UpdatePlayerRecord (int param0, int val) } } -void CommInfo_SavePlayerRecord (SaveData * saveData) +void CommInfo_SavePlayerRecord(SaveData *saveData) { - UnkStruct_0202B370 * v0 = sub_0202B370(saveData); + UnkStruct_0202B370 *v0 = sub_0202B370(saveData); int netId, v2, v3; for (netId = 0; netId < CommSys_ConnectedCount(); netId++) { - DWCFriendData * friendData = CommInfo_DWCFriendData(netId); + DWCFriendData *friendData = CommInfo_DWCFriendData(netId); if (friendData == NULL) { continue; @@ -483,7 +483,7 @@ void CommInfo_SavePlayerRecord (SaveData * saveData) } } -void sub_020331B4 (SaveData * saveData, int param1) +void sub_020331B4(SaveData *saveData, int param1) { if (param1 == 1) { CommInfo_UpdatePlayerRecord(0, 1); @@ -494,13 +494,13 @@ void sub_020331B4 (SaveData * saveData, int param1) CommInfo_SavePlayerRecord(saveData); } -void CommInfo_SetTradeResult (SaveData * saveData, int val) +void CommInfo_SetTradeResult(SaveData *saveData, int val) { CommInfo_UpdatePlayerRecord(2, val); CommInfo_SavePlayerRecord(saveData); } -void CommInfo_SetPersonalTrainerInfo (TrainerInfo * trainerInfo) +void CommInfo_SetPersonalTrainerInfo(TrainerInfo *trainerInfo) { sCommInfo->personalTrainerInfo = trainerInfo; } diff --git a/src/communication_system.c b/src/communication_system.c index 8e711d4a83..40d3aad594 100644 --- a/src/communication_system.c +++ b/src/communication_system.c @@ -1,30 +1,31 @@ +#include "communication_system.h" + +#include #include #include -#include - -#include "core_sys.h" -#include "sys_task_manager.h" +#include "constants/heap.h" #include "struct_defs/struct_020322D8.h" #include "struct_defs/struct_020322F8.h" #include "struct_defs/struct_0203233C.h" -#include "sys_task.h" -#include "rtc.h" +#include "overlay004/ov4_021D0D80.h" + +#include "comm_ring.h" +#include "communication_information.h" +#include "core_sys.h" #include "heap.h" -#include "constants/heap.h" +#include "rtc.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02030EE0.h" -#include "comm_ring.h" #include "unk_020322D8.h" #include "unk_0203266C.h" #include "unk_02032798.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" -#include "overlay004/ov4_021D0D80.h" enum { TRANSMISSION_TYPE_SERVER_CLIENT, @@ -34,19 +35,19 @@ enum { }; typedef struct { - u8 * unk_00; - UnkStruct_020322D8 * unk_04; - UnkStruct_020322D8 * unk_08; + u8 *unk_00; + UnkStruct_020322D8 *unk_04; + UnkStruct_020322D8 *unk_08; u16 unk_0C; u8 unk_0E; u8 unk_0F_0 : 1; u8 unk_0F_1 : 1; - u8 : 6; + u8 : 6; } UnkStruct_020322D8_t; typedef struct { int unk_00; - u8 * unk_04; + u8 *unk_04; u16 unk_08; u8 unk_0A; } CommRecvPackage; @@ -56,16 +57,16 @@ typedef struct { u8 sendBufferServer[2][192]; u8 sendBufferCommRing[264]; u8 sendBufferCommRingServer[384]; - u8 * unk_488; - u8 * recvBufferRingServer; - u8 * recvBufferRing; - u8 * tempBuffer; + u8 *unk_488; + u8 *recvBufferRingServer; + u8 *recvBufferRing; + u8 *tempBuffer; CommRing sendRing; CommRing recvRing; CommRing unk_4B0[8]; CommRing sendRingServer; CommRing sendRingClient[8]; - SysTask * unk_57C; + SysTask *unk_57C; CommQueueMan commQueueManSend; CommQueueMan commQueueManSendServer; CommRecvPackage commRecvServer[8]; @@ -111,34 +112,34 @@ typedef struct { } CommunicationSystem; static void sub_0203463C(void); -static void sub_0203498C(SysTask * param0, void * param1); +static void sub_0203498C(SysTask *param0, void *param1); static void sub_02034B50(void); static void CommSys_UpdateServerClient(void); static void sub_02034F68(void); static void sub_02035394(BOOL param0); static void sub_020353B0(BOOL param0); -static void sub_020350A4(u16 param0, u16 * param1, u16 param2); -static void sub_02035200(u16 param0, u16 * param1, u16 param2); +static void sub_020350A4(u16 param0, u16 *param1, u16 param2); +static void sub_02035200(u16 param0, u16 *param1, u16 param2); static BOOL CommSys_CheckRecvLimit(void); static void sub_02035534(void); static void sub_020353CC(void); static void CommSys_RecvData(void); static void CommSys_RecvDataServer(void); -static BOOL sub_020357F0(u8 * param0); -static void sub_020358C0(u8 * param0); -static BOOL sub_020356A0(u8 * param0, int param1); -static BOOL sub_02035730(u8 * param0); +static BOOL sub_020357F0(u8 *param0); +static void sub_020358C0(u8 *param0); +static BOOL sub_020356A0(u8 *param0, int param1); +static BOOL sub_02035730(u8 *param0); static void CommSys_Transmission(void); static BOOL sub_0203594C(void); static u32 Unk_021C07C8 = 0; -static CommunicationSystem * sCommunicationSystem = NULL; +static CommunicationSystem *sCommunicationSystem = NULL; static volatile u8 Unk_021C07C5 = 0; static volatile u8 Unk_02100A1C = 4; static volatile u8 Unk_02100A1D = 4; static u8 Unk_021C07C4 = 0; -static BOOL CommSys_Init (BOOL shouldAlloc, int maxPacketSize) +static BOOL CommSys_Init(BOOL shouldAlloc, int maxPacketSize) { int i; BOOL reinit = FALSE; @@ -205,7 +206,7 @@ static BOOL CommSys_Init (BOOL shouldAlloc, int maxPacketSize) return TRUE; } -static void CommSys_ClearData (void) +static void CommSys_ClearData(void) { int netId, size; int maxMachines = CommLocal_MaxMachines(sub_0203895C()) + 1; @@ -276,7 +277,7 @@ static void CommSys_ClearData (void) sCommunicationSystem->unk_6B0 = 0; } -static void sub_0203463C (void) +static void sub_0203463C(void) { sCommunicationSystem->unk_6A7 = 0; sCommunicationSystem->unk_6A8 = 0; @@ -288,12 +289,12 @@ static void sub_0203463C (void) Unk_02100A1D = 4; } -static void sub_02034670 (void) +static void sub_02034670(void) { CommSys_ClearData(); } -static void CommSys_ClearServerRecvData (int netId) +static void CommSys_ClearServerRecvData(int netId) { sCommunicationSystem->unk_68F[netId] = 0; sCommunicationSystem->unk_697[netId] = 1; @@ -313,7 +314,7 @@ static void CommSys_ClearServerRecvData (int netId) sCommunicationSystem->commRecvServer[netId].unk_00 = 0; } -static void sub_02034734 (void) +static void sub_02034734(void) { int netId; @@ -326,12 +327,12 @@ static void sub_02034734 (void) } } -static void sub_02034770 (int param0) +static void sub_02034770(int param0) { CommSys_ClearServerRecvData(param0); } -BOOL CommSys_InitServer (BOOL param0, BOOL param1, int param2, BOOL param3) +BOOL CommSys_InitServer(BOOL param0, BOOL param1, int param2, BOOL param3) { BOOL ret = 1; @@ -344,7 +345,7 @@ BOOL CommSys_InitServer (BOOL param0, BOOL param1, int param2, BOOL param3) return ret; } -BOOL CommSys_InitClient (BOOL param0, BOOL param1, int param2) +BOOL CommSys_InitClient(BOOL param0, BOOL param1, int param2) { BOOL v0 = 1; @@ -358,7 +359,7 @@ BOOL CommSys_InitClient (BOOL param0, BOOL param1, int param2) return v0; } -static void CommSys_UpdateTransitionType (void) +static void CommSys_UpdateTransitionType(void) { BOOL changed = FALSE; @@ -389,7 +390,7 @@ static void CommSys_UpdateTransitionType (void) CommSys_Transmission(); } -static void CommSys_SwitchTransitionType (int type) +static void CommSys_SwitchTransitionType(int type) { if ((sCommunicationSystem->transmissionType == TRANSMISSION_TYPE_SERVER_CLIENT) && (type == TRANSMISSION_TYPE_PARALLEL)) { sCommunicationSystem->transmissionType = TRANSMISSION_TYPE_SWITCH_TO_PARALLEL; @@ -402,17 +403,17 @@ static void CommSys_SwitchTransitionType (int type) } } -void CommSys_SwitchTransitionTypeToParallel (void) +void CommSys_SwitchTransitionTypeToParallel(void) { CommSys_SwitchTransitionType(TRANSMISSION_TYPE_PARALLEL); } -void CommSys_SwitchTransitionTypeToServerClient (void) +void CommSys_SwitchTransitionTypeToServerClient(void) { CommSys_SwitchTransitionType(TRANSMISSION_TYPE_SERVER_CLIENT); } -static int CommSys_TransmissionType (void) +static int CommSys_TransmissionType(void) { if (sCommunicationSystem->transmissionType == TRANSMISSION_TYPE_SWITCH_TO_SERVER_CLIENT) { return TRANSMISSION_TYPE_PARALLEL; @@ -425,7 +426,7 @@ static int CommSys_TransmissionType (void) return sCommunicationSystem->transmissionType; } -BOOL CommSys_TransitionTypeIsParallel (void) +BOOL CommSys_TransitionTypeIsParallel(void) { if (TRANSMISSION_TYPE_PARALLEL == CommSys_TransmissionType()) { return TRUE; @@ -434,7 +435,7 @@ BOOL CommSys_TransitionTypeIsParallel (void) return FALSE; } -void CommSys_Delete (void) +void CommSys_Delete(void) { BOOL v0 = 0; @@ -470,12 +471,12 @@ void CommSys_Delete (void) } } -BOOL sub_02034984 (u16 param0) +BOOL sub_02034984(u16 param0) { return sub_020339E8(param0); } -static void sub_0203498C (SysTask * param0, void * param1) +static void sub_0203498C(SysTask *param0, void *param1) { if (Unk_021C07C5) { sub_020353CC(); @@ -488,7 +489,7 @@ static void sub_0203498C (SysTask * param0, void * param1) } } -static void sub_020349C4 (void) +static void sub_020349C4(void) { if (!sub_0203406C()) { return; @@ -505,7 +506,7 @@ static void sub_020349C4 (void) } } -BOOL CommSys_Update (void) +BOOL CommSys_Update(void) { sub_02036C50(); @@ -553,7 +554,7 @@ BOOL CommSys_Update (void) return TRUE; } -void CommSys_Reset (void) +void CommSys_Reset(void) { BOOL v0 = Unk_021C07C5; @@ -566,7 +567,7 @@ void CommSys_Reset (void) Unk_021C07C5 = v0; } -void CommSys_ResetDS (void) +void CommSys_ResetDS(void) { BOOL v0 = Unk_021C07C5; @@ -580,7 +581,7 @@ void CommSys_ResetDS (void) Unk_021C07C5 = v0; } -void CommSys_ResetBattleClient (void) +void CommSys_ResetBattleClient(void) { BOOL v0 = Unk_021C07C5; @@ -594,7 +595,7 @@ void CommSys_ResetBattleClient (void) Unk_021C07C5 = v0; } -static void sub_02034B50 (void) +static void sub_02034B50(void) { if (sub_0203272C(sub_0203895C())) { if (sCommunicationSystem->wifiConnected) { @@ -684,7 +685,7 @@ static void sub_02034B50 (void) } } -static BOOL sub_02034CF8 (int param0) +static BOOL sub_02034CF8(int param0) { int v0; int v1; @@ -718,7 +719,7 @@ static BOOL sub_02034CF8 (int param0) return 1; } -static void CommSys_UpdateServerClient (void) +static void CommSys_UpdateServerClient(void) { int v0; int v1 = 0; @@ -772,7 +773,7 @@ static void CommSys_UpdateServerClient (void) } } -static BOOL CommSys_CheckRecvLimit (void) +static BOOL CommSys_CheckRecvLimit(void) { int v0; int v1 = CommLocal_MaxMachines(sub_0203895C()) + 1; @@ -788,7 +789,7 @@ static BOOL CommSys_CheckRecvLimit (void) return 1; } -static void sub_02034F68 (void) +static void sub_02034F68(void) { int v0; int v1 = CommLocal_MaxMachines(sub_0203895C()) + 1; @@ -851,14 +852,14 @@ static void sub_02034F68 (void) } } -void sub_0203509C (u16 param0, u16 * param1, u16 param2) +void sub_0203509C(u16 param0, u16 *param1, u16 param2) { sub_020350A4(param0, param1, param2); } -static void sub_020350A4 (u16 param0, u16 * param1, u16 param2) +static void sub_020350A4(u16 param0, u16 *param1, u16 param2) { - u8 * v0 = (u8 *)param1; + u8 *v0 = (u8 *)param1; int v1; int v2 = param2; @@ -926,14 +927,14 @@ static void sub_020350A4 (u16 param0, u16 * param1, u16 param2) } } -void sub_020351F8 (u16 param0, u16 * buffer, u16 param2) +void sub_020351F8(u16 param0, u16 *buffer, u16 param2) { sub_02035200(param0, buffer, param2); } -static void sub_02035200 (u16 param0, u16 * _buffer, u16 param2) +static void sub_02035200(u16 param0, u16 *_buffer, u16 param2) { - u8 * buffer = (u8 *)_buffer; + u8 *buffer = (u8 *)_buffer; int v1; sCommunicationSystem->unk_664[param0]--; @@ -970,9 +971,9 @@ static void sub_02035200 (u16 param0, u16 * _buffer, u16 param2) } } -void sub_020352C0 (u16 param0, u16 * param1, u16 param2) +void sub_020352C0(u16 param0, u16 *param1, u16 param2) { - u8 * buffer = (u8 *)param1; + u8 *buffer = (u8 *)param1; int v1; sCommunicationSystem->unk_664[param0]--; @@ -1014,7 +1015,7 @@ void sub_020352C0 (u16 param0, u16 * param1, u16 param2) } } -static void sub_02035394 (BOOL param0) +static void sub_02035394(BOOL param0) { if (param0) { Unk_02100A1D++; @@ -1023,7 +1024,7 @@ static void sub_02035394 (BOOL param0) } } -static void sub_020353B0 (BOOL param0) +static void sub_020353B0(BOOL param0) { if (param0) { Unk_02100A1C++; @@ -1032,10 +1033,10 @@ static void sub_020353B0 (BOOL param0) } } -static void sub_020353CC (void) +static void sub_020353CC(void) { u16 v0; - u8 * v1; + u8 *v1; int v2; if (!sCommunicationSystem) { @@ -1093,7 +1094,7 @@ static void sub_020353CC (void) } } -static void sub_02035534 (void) +static void sub_02035534(void) { u16 v0 = 0; @@ -1154,22 +1155,22 @@ static void sub_02035534 (void) sCommunicationSystem->sendHeldKeys += v0; } -void sub_02035664 (void) +void sub_02035664(void) { sCommunicationSystem->unk_658 = 1; } -void sub_02035678 (void) +void sub_02035678(void) { sCommunicationSystem->unk_658 = 2; } -void sub_0203568C (void) +void sub_0203568C(void) { sCommunicationSystem->unk_658 = 0; } -static BOOL sub_020356A0 (u8 * param0, int param1) +static BOOL sub_020356A0(u8 *param0, int param1) { int v0; u8 v1[2]; @@ -1195,12 +1196,12 @@ static BOOL sub_020356A0 (u8 * param0, int param1) return 1; } -void sub_0203572C (void) +void sub_0203572C(void) { return; } -static BOOL sub_02035730 (u8 * param0) +static BOOL sub_02035730(u8 *param0) { int v0, v1; @@ -1234,7 +1235,7 @@ static BOOL sub_02035730 (u8 * param0) return 0; } -static BOOL sub_020357F0 (u8 * param0) +static BOOL sub_020357F0(u8 *param0) { int v0; int v1 = sub_02036128(sub_0203895C()); @@ -1278,7 +1279,7 @@ static BOOL sub_020357F0 (u8 * param0) return 1; } -static void sub_020358C0 (u8 * param0) +static void sub_020358C0(u8 *param0) { int v0; @@ -1313,12 +1314,12 @@ static void sub_020358C0 (u8 * param0) } } -void sub_02035938 (u8 param0) +void sub_02035938(u8 param0) { sCommunicationSystem->unk_6B4 = param0; } -static BOOL sub_0203594C (void) +static BOOL sub_0203594C(void) { if (sCommunicationSystem->unk_6B4 == 0) { return 0; @@ -1331,7 +1332,7 @@ static BOOL sub_0203594C (void) return 0; } -BOOL CommSys_SendDataHuge (int cmd, const void * param1, int param2) +BOOL CommSys_SendDataHuge(int cmd, const void *param1, int param2) { if (!CommSys_IsPlayerConnected(CommSys_CurNetId()) && !CommSys_IsAlone()) { return 0; @@ -1348,7 +1349,7 @@ BOOL CommSys_SendDataHuge (int cmd, const void * param1, int param2) return 0; } -BOOL CommSys_SendData (int cmd, const void * param1, int param2) +BOOL CommSys_SendData(int cmd, const void *param1, int param2) { if (!CommSys_IsPlayerConnected(CommSys_CurNetId()) && !CommSys_IsAlone()) { return 0; @@ -1365,7 +1366,7 @@ BOOL CommSys_SendData (int cmd, const void * param1, int param2) return 0; } -BOOL sub_02035A3C (int cmd, const void * param1, int param2) +BOOL sub_02035A3C(int cmd, const void *param1, int param2) { if (CommSys_CurNetId() != 0) { GF_ASSERT(FALSE); @@ -1391,7 +1392,7 @@ BOOL sub_02035A3C (int cmd, const void * param1, int param2) return 0; } -BOOL CommSys_SendDataServer (int cmd, const void * param1, int param2) +BOOL CommSys_SendDataServer(int cmd, const void *param1, int param2) { if (CommSys_CurNetId() != 0) { sub_020363BC(); @@ -1418,17 +1419,17 @@ BOOL CommSys_SendDataServer (int cmd, const void * param1, int param2) return 0; } -BOOL sub_02035B48 (int cmd, const void * param1) +BOOL sub_02035B48(int cmd, const void *param1) { return CommSys_SendDataServer(cmd, param1, 0); } -int CommSys_SendRingRemainingSize (void) +int CommSys_SendRingRemainingSize(void) { return CommRing_RemainingSize(&sCommunicationSystem->sendRing); } -static void CommSys_EndCallback (int netId, int command, int param2, void * param3, CommRecvPackage * param4) +static void CommSys_EndCallback(int netId, int command, int param2, void *param3, CommRecvPackage *param4) { CommCmd_Callback(netId, command, param2, param3); param4->unk_0A = 0xee; @@ -1437,7 +1438,7 @@ static void CommSys_EndCallback (int netId, int command, int param2, void * para param4->unk_00 = 0; } -static void CommSys_RecvDataSingle (CommRing * ring, int netId, u8 * buffer, CommRecvPackage * param3) +static void CommSys_RecvDataSingle(CommRing *ring, int netId, u8 *buffer, CommRecvPackage *param3) { int size; u8 cmd; @@ -1519,7 +1520,7 @@ static void CommSys_RecvDataSingle (CommRing * ring, int netId, u8 * buffer, Com } } -static void CommSys_RecvData (void) +static void CommSys_RecvData(void) { int v0 = 0; int v1; @@ -1541,7 +1542,7 @@ static void CommSys_RecvData (void) } } -static void CommSys_RecvDataServer (void) +static void CommSys_RecvDataServer(void) { int v0; int v1; @@ -1567,7 +1568,7 @@ static void CommSys_RecvDataServer (void) } } -BOOL CommSys_IsPlayerConnected (u16 param0) +BOOL CommSys_IsPlayerConnected(u16 param0) { if (!sCommunicationSystem) { return 0; @@ -1608,7 +1609,7 @@ BOOL CommSys_IsPlayerConnected (u16 param0) return 0; } -int CommSys_ConnectedCount (void) +int CommSys_ConnectedCount(void) { int v0 = 0, i; @@ -1621,7 +1622,7 @@ int CommSys_ConnectedCount (void) return v0; } -BOOL CommSys_IsInitialized (void) +BOOL CommSys_IsInitialized(void) { if (sCommunicationSystem) { if (CommLocal_IsWifiGroup(sub_0203895C())) { @@ -1632,17 +1633,17 @@ BOOL CommSys_IsInitialized (void) return CommServerClient_IsInitialized(); } -void CommSys_SetSendSpeed (u8 param0) +void CommSys_SetSendSpeed(u8 param0) { sCommunicationSystem->sendSpeed = param0; } -u8 CommSys_RecvSpeed (int param0) +u8 CommSys_RecvSpeed(int param0) { return sCommunicationSystem->recvSpeed[param0]; } -u16 sub_02035E84 (int param0) +u16 sub_02035E84(int param0) { int v0; @@ -1656,21 +1657,21 @@ u16 sub_02035E84 (int param0) return v0; } -void CommSys_EnableSendMovementData (void) +void CommSys_EnableSendMovementData(void) { if (sCommunicationSystem) { sCommunicationSystem->sendHeldKeys |= 0x8000; } } -void CommSys_DisableSendMovementData (void) +void CommSys_DisableSendMovementData(void) { if (sCommunicationSystem) { sCommunicationSystem->sendHeldKeys = 0; } } -BOOL CommSys_IsSendingMovementData (void) +BOOL CommSys_IsSendingMovementData(void) { if (sCommunicationSystem) { return sCommunicationSystem->sendHeldKeys & 0x8000; @@ -1679,7 +1680,7 @@ BOOL CommSys_IsSendingMovementData (void) return 1; } -BOOL CommSys_WriteToQueueServer (int cmd, const void * param1, int param2) +BOOL CommSys_WriteToQueueServer(int cmd, const void *param1, int param2) { if (CommSys_TransmissionType() == 1) { return CommQueue_Write(&sCommunicationSystem->commQueueManSend, cmd, (u8 *)param1, param2, 1, 0); @@ -1688,12 +1689,12 @@ BOOL CommSys_WriteToQueueServer (int cmd, const void * param1, int param2) } } -BOOL CommSys_WriteToQueue (int cmd, const void * param1, int param2) +BOOL CommSys_WriteToQueue(int cmd, const void *param1, int param2) { return CommQueue_Write(&sCommunicationSystem->commQueueManSend, cmd, (u8 *)param1, param2, 0, 0); } -static void CommSys_Transmission (void) +static void CommSys_Transmission(void) { BOOL v0 = 0; @@ -1722,9 +1723,9 @@ static void CommSys_Transmission (void) } } -void sub_02036008 (int param0, int param1, void * param2, void * param3) +void sub_02036008(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; int v1; if (CommSys_CurNetId() != 0) { @@ -1735,9 +1736,9 @@ void sub_02036008 (int param0, int param1, void * param2, void * param3) sCommunicationSystem->unk_6A4 = v0[0]; } -void sub_02036030 (int param0, int param1, void * param2, void * param3) +void sub_02036030(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; int v1; if (CommSys_CurNetId() == 0) { @@ -1748,9 +1749,9 @@ void sub_02036030 (int param0, int param1, void * param2, void * param3) sCommunicationSystem->transmissionState = 3; } -void sub_02036058 (int param0, int param1, void * param2, void * param3) +void sub_02036058(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; int v1; if (CommSys_CurNetId() != 0) { @@ -1763,7 +1764,7 @@ void sub_02036058 (int param0, int param1, void * param2, void * param3) } } -u16 CommSys_CurNetId (void) +u16 CommSys_CurNetId(void) { if (sCommunicationSystem) { if (CommLocal_IsWifiGroup(sub_0203895C())) { @@ -1782,22 +1783,22 @@ u16 CommSys_CurNetId (void) return 0; } -BOOL CommSys_SendDataFixedSize (int cmd, const void * data) +BOOL CommSys_SendDataFixedSize(int cmd, const void *data) { return CommSys_SendData(cmd, data, 0); } -BOOL Link_Message (int cmd) +BOOL Link_Message(int cmd) { return CommSys_SendData(cmd, NULL, 0); } -BOOL sub_020360E8 (void) +BOOL sub_020360E8(void) { return CommServerClient_IsClientConnecting(); } -BOOL CommSys_CheckError (void) +BOOL CommSys_CheckError(void) { if (CommSys_IsAlone()) { return FALSE; @@ -1813,7 +1814,7 @@ BOOL CommSys_CheckError (void) return CommServerClient_CheckError(); } -u16 sub_02036128 (u16 param0) +u16 sub_02036128(u16 param0) { if (CommLocal_MaxMachines(param0) >= 5) { return 12; @@ -1826,24 +1827,24 @@ u16 sub_02036128 (u16 param0) return 38; } -int CommType_MaxPlayers (int param0) +int CommType_MaxPlayers(int param0) { return CommLocal_MaxMachines(param0) + 1; } -int CommType_MinPlayers (int param0) +int CommType_MinPlayers(int param0) { return sub_02032698(param0) + 1; } -void CommSys_SetAlone (BOOL param0) +void CommSys_SetAlone(BOOL param0) { if (sCommunicationSystem) { sCommunicationSystem->unk_6AE = param0; } } -BOOL CommSys_IsAlone (void) +BOOL CommSys_IsAlone(void) { if (sCommunicationSystem) { return sCommunicationSystem->unk_6AE; @@ -1852,7 +1853,7 @@ BOOL CommSys_IsAlone (void) return FALSE; } -void sub_0203619C (int param0, int param1, void * param2, void * param3) +void sub_0203619C(int param0, int param1, void *param2, void *param3) { u8 v0; @@ -1865,7 +1866,7 @@ void sub_0203619C (int param0, int param1, void * param2, void * param3) sub_0203408C(); } -void CommSys_Seed (MATHRandContext32 * rand) +void CommSys_Seed(MATHRandContext32 *rand) { u64 seed = 0; RTCDate date; @@ -1876,44 +1877,44 @@ void CommSys_Seed (MATHRandContext32 * rand) MATH_InitRand32(rand, seed); } -BOOL sub_02036254 (int param0) +BOOL sub_02036254(int param0) { return CommQueue_CompareCmd(&sCommunicationSystem->commQueueManSendServer, param0); } -BOOL sub_0203626C (int param0) +BOOL sub_0203626C(int param0) { return CommQueue_CompareCmd(&sCommunicationSystem->commQueueManSend, param0); } -BOOL sub_02036284 (void) +BOOL sub_02036284(void) { return CommQueue_IsEmpty(&sCommunicationSystem->commQueueManSendServer); } -BOOL sub_0203629C (void) +BOOL sub_0203629C(void) { return CommQueue_IsEmpty(&sCommunicationSystem->commQueueManSend); } -void CommSys_SetWifiConnected (BOOL param0) +void CommSys_SetWifiConnected(BOOL param0) { sCommunicationSystem->wifiConnected = param0; } -BOOL CommSys_WifiConnected (void) +BOOL CommSys_WifiConnected(void) { return sCommunicationSystem->wifiConnected; } -void sub_020362DC (int param0, int param1) +void sub_020362DC(int param0, int param1) { if (sCommunicationSystem) { sCommunicationSystem->unk_69F[param1] = param0; } } -int sub_020362F4 (int networkId) +int sub_020362F4(int networkId) { if (sCommunicationSystem) { if (sCommunicationSystem->unk_69F[networkId] != 0xff) { @@ -1924,7 +1925,7 @@ int sub_020362F4 (int networkId) return networkId; } -BOOL sub_02036314 (void) +BOOL sub_02036314(void) { if (!CommLocal_IsWifiGroup(sub_0203895C())) { return 0; @@ -1933,7 +1934,7 @@ BOOL sub_02036314 (void) return ov4_021D254C(); } -void sub_0203632C (BOOL param0) +void sub_0203632C(BOOL param0) { int v0; @@ -1954,7 +1955,7 @@ void sub_0203632C (BOOL param0) } } -void sub_02036378 (BOOL param0) +void sub_02036378(BOOL param0) { sub_0203632C(param0); @@ -1967,7 +1968,7 @@ void sub_02036378 (BOOL param0) } } -BOOL sub_020363A0 (void) +BOOL sub_020363A0(void) { if (sCommunicationSystem->unk_6A9) { return 1; @@ -1976,12 +1977,12 @@ BOOL sub_020363A0 (void) return 0; } -void sub_020363BC (void) +void sub_020363BC(void) { sCommunicationSystem->unk_6B1 = 1; } -void CommSys_StartShutdown (void) +void CommSys_StartShutdown(void) { if (sCommunicationSystem) { sCommunicationSystem->shuttingDown = 1; diff --git a/src/dw_warp/dw_warp.c b/src/dw_warp/dw_warp.c index dacf9e59e7..d2bafc294d 100644 --- a/src/dw_warp/dw_warp.c +++ b/src/dw_warp/dw_warp.c @@ -1,43 +1,43 @@ +#include "dw_warp/dw_warp.h" + #include #include -#include "core_sys.h" +#include "consts/sdat.h" #include "struct_decls/struct_02006C24_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017248.h" #include "struct_defs/struct_02017294.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" + #include "overlay115/camera_angle.h" -#include "unk_02002328.h" -#include "unk_02005474.h" -#include "overlay_manager.h" +#include "camera.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" +#include "overlay_manager.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02002328.h" +#include "unk_02005474.h" #include "unk_0200F174.h" #include "unk_020170BC.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_0202419C.h" #include "unk_02024220.h" -#include "dw_warp/dw_warp.h" - -#include "consts/sdat.h" #define DWARP_SND_EFFECT_DELAY 15 -#define DWARP_ANM_DURATION 85 +#define DWARP_ANM_DURATION 85 typedef struct DistortionWorldWarp { - GenericPointerData * p3DCallback; - Camera * camera; - SysTask * task; + GenericPointerData *p3DCallback; + Camera *camera; + SysTask *task; int frameCnt; int soundEffectCnt; UnkStruct_02017294 animationObj; @@ -52,20 +52,20 @@ typedef struct DistortionWorldWarp { NNSFndAllocator allocator; } DistortionWorldWarp; -static void DWWarp_Update(SysTask * task, void * data); -static void DWWarp_VBlankIntr(void * data); +static void DWWarp_Update(SysTask *task, void *data); +static void DWWarp_VBlankIntr(void *data); static void DWWarp_VramSetBank(void); -static void DWWarp_InitCamera(DistortionWorldWarp * warp); -static void DWWarp_DeleteCamera(DistortionWorldWarp * warp); -static void DWWarp_InitModel(DistortionWorldWarp * warp); -static void DWWarp_DeleteModel(DistortionWorldWarp * warp); -static void Model3D_Update(DistortionWorldWarp * warp); -static GenericPointerData * DWWarp_Init3D(int heapId); +static void DWWarp_InitCamera(DistortionWorldWarp *warp); +static void DWWarp_DeleteCamera(DistortionWorldWarp *warp); +static void DWWarp_InitModel(DistortionWorldWarp *warp); +static void DWWarp_DeleteModel(DistortionWorldWarp *warp); +static void Model3D_Update(DistortionWorldWarp *warp); +static GenericPointerData *DWWarp_Init3D(int heapId); static void DWWarp_Setup3D(void); -static void DWWarp_Exit3D(GenericPointerData * param0); -static void DWWarp_CameraMove(DistortionWorldWarp * warp); +static void DWWarp_Exit3D(GenericPointerData *param0); +static void DWWarp_CameraMove(DistortionWorldWarp *warp); -BOOL DWWarp_Init (OverlayManager * ovy, int * state) +BOOL DWWarp_Init(OverlayManager *ovy, int *state) { SetMainCallback(NULL, NULL); DisableHBlank(); @@ -81,7 +81,7 @@ BOOL DWWarp_Init (OverlayManager * ovy, int * state) Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_DISTORTION_WORLD_WARP, HEAP_SIZE_DISTORTION_WORLD_WARP); - DistortionWorldWarp* dww = OverlayManager_NewData(ovy, sizeof(DistortionWorldWarp), HEAP_ID_DISTORTION_WORLD_WARP); + DistortionWorldWarp *dww = OverlayManager_NewData(ovy, sizeof(DistortionWorldWarp), HEAP_ID_DISTORTION_WORLD_WARP); MI_CpuClear8(dww, sizeof(DistortionWorldWarp)); dww->p3DCallback = DWWarp_Init3D(HEAP_ID_DISTORTION_WORLD_WARP); @@ -115,9 +115,9 @@ enum { DWARP_SEQ_WAIT }; -BOOL DWWarp_Main (OverlayManager * ovy, int * state) +BOOL DWWarp_Main(OverlayManager *ovy, int *state) { - DistortionWorldWarp * warp = OverlayManager_Data(ovy); + DistortionWorldWarp *warp = OverlayManager_Data(ovy); switch (*state) { case DWARP_SEQ_SCREENWIPE: @@ -127,7 +127,7 @@ BOOL DWWarp_Main (OverlayManager * ovy, int * state) break; case DWARP_SEQ_LOOP: if (warp->soundEffectCnt == DWARP_SND_EFFECT_DELAY) { - Sound_PlayEffect( SEQ_SE_PL_SYUWA2 ); + Sound_PlayEffect(SEQ_SE_PL_SYUWA2); } warp->soundEffectCnt++; @@ -153,9 +153,9 @@ BOOL DWWarp_Main (OverlayManager * ovy, int * state) return FALSE; } -BOOL DWWarp_Exit (OverlayManager * ovy, int * state) +BOOL DWWarp_Exit(OverlayManager *ovy, int *state) { - DistortionWorldWarp * warp = OverlayManager_Data(ovy); + DistortionWorldWarp *warp = OverlayManager_Data(ovy); SysTask_Done(warp->task); @@ -175,21 +175,21 @@ BOOL DWWarp_Exit (OverlayManager * ovy, int * state) return TRUE; } -static void DWWarp_Update (SysTask * task, void * data) +static void DWWarp_Update(SysTask *task, void *data) { - DistortionWorldWarp * dw = data; + DistortionWorldWarp *dw = data; Model3D_Update(dw); G3_RequestSwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_W); } -static void DWWarp_VBlankIntr (void * data) +static void DWWarp_VBlankIntr(void *data) { - DistortionWorldWarp * dw = data; + DistortionWorldWarp *dw = data; OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void DWWarp_VramSetBank (void) +static void DWWarp_VramSetBank(void) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -215,21 +215,21 @@ static void DWWarp_VramSetBank (void) MI_CpuClear32((void *)HW_DB_OBJ_VRAM, HW_DB_OBJ_VRAM_SIZE); } -static void DWWarp_InitCamera (DistortionWorldWarp * warp) +static void DWWarp_InitCamera(DistortionWorldWarp *warp) { static const CameraAngle DWW_CameraAngle = { 0x10000 - 0x1c7d, 0, 0, }; - VecFx32 target = {0, 0, 0}; + VecFx32 target = { 0, 0, 0 }; warp->camera = Camera_Alloc(HEAP_ID_DISTORTION_WORLD_WARP); - Camera_InitWithTarget(&target, (160 << FX32_SHIFT), &DWW_CameraAngle, (((22 * 0xffff) / 360)), 0, 0, warp->camera); + Camera_InitWithTarget(&target, (160 << FX32_SHIFT), &DWW_CameraAngle, ((22 * 0xffff) / 360), 0, 0, warp->camera); Camera_SetClipping(0, (FX32_ONE * 300), warp->camera); - CameraAngle angle = {0, 0, 0, 0}; + CameraAngle angle = { 0, 0, 0, 0 }; angle = Camera_GetAngle(warp->camera); angle.x = (0x10000 - 0x3fef); @@ -239,16 +239,16 @@ static void DWWarp_InitCamera (DistortionWorldWarp * warp) Camera_SetAsActive(warp->camera); } -static void DWWarp_DeleteCamera (DistortionWorldWarp * warp) +static void DWWarp_DeleteCamera(DistortionWorldWarp *warp) { Camera_Delete(warp->camera); } -static void DWWarp_InitModel (DistortionWorldWarp * warp) +static void DWWarp_InitModel(DistortionWorldWarp *warp) { Heap_FndInitAllocatorForExpHeap(&warp->allocator, HEAP_ID_DISTORTION_WORLD_WARP, 4); - NARC * narc = NARC_ctor(NARC_INDEX_DEMO__TITLE__TITLEDEMO, HEAP_ID_DISTORTION_WORLD_WARP); + NARC *narc = NARC_ctor(NARC_INDEX_DEMO__TITLE__TITLEDEMO, HEAP_ID_DISTORTION_WORLD_WARP); sub_020170D8(&warp->animationModel, narc, 16, HEAP_ID_DISTORTION_WORLD_WARP); @@ -277,14 +277,14 @@ static void DWWarp_InitModel (DistortionWorldWarp * warp) warp->cameraPerspective = 60 << 8; } -static void DWWarp_DeleteModel (DistortionWorldWarp * warp) +static void DWWarp_DeleteModel(DistortionWorldWarp *warp) { sub_02017110(&warp->animationModel); sub_020171A0(&warp->animationAnimation, &warp->allocator); sub_020171A0(&warp->animationAnimation2, &warp->allocator); } -static void Model3D_Update (DistortionWorldWarp * warp) +static void Model3D_Update(DistortionWorldWarp *warp) { VecFx32 scaleVec, transVec; MtxFx33 rot33; @@ -321,12 +321,12 @@ static void Model3D_Update (DistortionWorldWarp * warp) NNS_G3dGePopMtx(1); } -static GenericPointerData * DWWarp_Init3D (int param0) +static GenericPointerData *DWWarp_Init3D(int param0) { return sub_02024220(param0, 0, 2, 0, 2, DWWarp_Setup3D); } -static void DWWarp_Setup3D (void) +static void DWWarp_Setup3D(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -342,15 +342,15 @@ static void DWWarp_Setup3D (void) G3_ViewPort(0, 0, 255, 191); } -static void DWWarp_Exit3D (GenericPointerData * param0) +static void DWWarp_Exit3D(GenericPointerData *param0) { sub_020242C4(param0); } -static void DWWarp_CameraMove (DistortionWorldWarp * warp) +static void DWWarp_CameraMove(DistortionWorldWarp *warp) { - VecFx32 v0 = {0, 0, 0}; - CameraAngle v1 = {0, 0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; + CameraAngle v1 = { 0, 0, 0, 0 }; int v2; Camera_AdjustFOV(-(warp->cameraPerspective >> 8), warp->camera); diff --git a/src/enc_effects.c b/src/enc_effects.c index 27836750f2..9f04eaf1ef 100644 --- a/src/enc_effects.c +++ b/src/enc_effects.c @@ -1,24 +1,24 @@ +#include "enc_effects.h" + #include #include #include "constants/battle.h" #include "constants/pokemon.h" -#include "consts/sdat.h" #include "constants/species.h" #include "constants/trainer.h" +#include "consts/sdat.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" +#include "overlay005/encounter_effect.h" #include "overlay006/battle_params.h" -#include "enc_effects.h" -#include "unk_02054884.h" #include "pokemon.h" -#include "overlay005/encounter_effect.h" +#include "unk_02054884.h" // This needs to be moved to a constants file somewhere -#define ZONE_ID_PAL_PARK 251 +#define ZONE_ID_PAL_PARK 251 typedef struct { u16 cutInEffect; @@ -57,7 +57,7 @@ enum EncEffectsPairID { ENCEFF_GALACTIC_GRUNT, ENCEFF_GALACTIC_CMDR, ENCEFF_GALACTIC_CYRUS, - + ENCEFF_FRONTIER, ENCEFF_LINK_BATTLE, ENCEFF_DOUBLE_BATTLE, @@ -71,6 +71,7 @@ enum EncEffectsPairID { ENCEFF_MAX, }; +// clang-format off static const EncEffectsPair sEncEffectsTable[35] = { [ENCEFF_LEADER_ROARK] = {ENCEFF_CUTIN_LEADER_ROARK, SEQ_BATTLE_GYM_LEADER}, [ENCEFF_LEADER_GARDENIA] = {ENCEFF_CUTIN_LEADER_GARDENIA, SEQ_BATTLE_GYM_LEADER}, @@ -108,6 +109,7 @@ static const EncEffectsPair sEncEffectsTable[35] = { [ENCEFF_NORMAL_TRAINER] = {ENCEFF_CUTIN_USE_LOCAL, SEQ_BATTLE_TRAINER}, [ENCEFF_NORMAL_WILD] = {ENCEFF_CUTIN_USE_LOCAL, SEQ_BATTLE_WILD_POKEMON} }; +// clang-format on static u32 EncEffects_GetEffectPair(const BattleParams *battleParams); static u32 EncEffects_CutInEffectForPair(u32 effectPairID, const BattleParams *battleParams); @@ -118,11 +120,11 @@ static u32 EncEffects_WildPokemonEffect(Party *wildParty, int mapHeaderID); inline BOOL EncEffects_Galactic(u32 effect) { return (effect == ENCEFF_GALACTIC_GRUNT) - || (effect == ENCEFF_GALACTIC_CMDR) - || (effect == ENCEFF_GALACTIC_CYRUS); + || (effect == ENCEFF_GALACTIC_CMDR) + || (effect == ENCEFF_GALACTIC_CYRUS); } -static u32 EncEffects_GetEffectPair (const BattleParams *battleParams) +static u32 EncEffects_GetEffectPair(const BattleParams *battleParams) { u32 battleType = battleParams->battleType; @@ -177,7 +179,7 @@ static u32 EncEffects_GetEffectPair (const BattleParams *battleParams) return pokemonEffect; } -static u32 EncEffects_CutInEffectForPair (u32 effectPairID, const BattleParams *battleParams) +static u32 EncEffects_CutInEffectForPair(u32 effectPairID, const BattleParams *battleParams) { GF_ASSERT(effectPairID < ENCEFF_MAX); @@ -186,101 +188,101 @@ static u32 EncEffects_CutInEffectForPair (u32 effectPairID, const BattleParams * if (sEncEffectsTable[effectPairID].cutInEffect == ENCEFF_CUTIN_USE_LOCAL) { return CutInEffects_ForBattle(battleParams); } - + return sEncEffectsTable[effectPairID].cutInEffect; } -static u32 EncEffects_BGMForPair (u32 effectPairID, const BattleParams *battleParams) +static u32 EncEffects_BGMForPair(u32 effectPairID, const BattleParams *battleParams) { GF_ASSERT(effectPairID < ENCEFF_MAX); return sEncEffectsTable[effectPairID].sdatBGMusic; } -u32 EncEffects_CutInEffect (const BattleParams *battleParams) +u32 EncEffects_CutInEffect(const BattleParams *battleParams) { return EncEffects_CutInEffectForPair(EncEffects_GetEffectPair(battleParams), battleParams); } -u32 EncEffects_BGM (const BattleParams *battleParams) +u32 EncEffects_BGM(const BattleParams *battleParams) { return EncEffects_BGMForPair(EncEffects_GetEffectPair(battleParams), battleParams); } -static u32 EncEffects_TrainerClassEffect (u32 trainerClass) +static u32 EncEffects_TrainerClassEffect(u32 trainerClass) { u32 result = ENCEFF_NORMAL_TRAINER; switch (trainerClass) { - case TRAINER_CLASS_LEADER_ROARK: - result = ENCEFF_LEADER_ROARK; - break; - case TRAINER_CLASS_LEADER_GARDENIA: - result = ENCEFF_LEADER_GARDENIA; - break; - case TRAINER_CLASS_LEADER_WAKE: - result = ENCEFF_LEADER_WAKE; - break; - case TRAINER_CLASS_LEADER_MAYLENE: - result = ENCEFF_LEADER_MAYLENE; - break; - case TRAINER_CLASS_LEADER_FANTINA: - result = ENCEFF_LEADER_FANTINA; - break; - case TRAINER_CLASS_LEADER_CANDICE: - result = ENCEFF_LEADER_CANDICE; - break; - case TRAINER_CLASS_LEADER_BYRON: - result = ENCEFF_LEADER_BYRON; - break; - case TRAINER_CLASS_LEADER_VOLKNER: - result = ENCEFF_LEADER_VOLKNER; - break; - case TRAINER_CLASS_ELITE_FOUR_AARON: - result = ENCEFF_ELITE_FOUR_AARON; - break; - case TRAINER_CLASS_ELITE_FOUR_BERTHA: - result = ENCEFF_ELITE_FOUR_BERTHA; - break; - case TRAINER_CLASS_ELITE_FOUR_FLINT: - result = ENCEFF_ELITE_FOUR_FLINT; - break; - case TRAINER_CLASS_ELITE_FOUR_LUCIAN: - result = ENCEFF_ELITE_FOUR_LUCIAN; - break; - case TRAINER_CLASS_CHAMPION_CYNTHIA: - result = ENCEFF_CHAMPION_CYNTHIA; - break; - case TRAINER_CLASS_RIVAL: - result = ENCEFF_RIVAL; - break; - case TRAINER_CLASS_GALACTIC_BOSS: - result = ENCEFF_GALACTIC_CYRUS; - break; - case TRAINER_CLASS_COMMANDER_MARS: - case TRAINER_CLASS_COMMANDER_JUPITER: - case TRAINER_CLASS_COMMANDER_SATURN: - result = ENCEFF_GALACTIC_CMDR; - break; - case TRAINER_CLASS_GALACTIC_GRUNT_MALE: - case TRAINER_CLASS_GALACTIC_GRUNT_FEMALE: - result = ENCEFF_GALACTIC_GRUNT; - break; - case TRAINER_CLASS_TOWER_TYCOON: - case TRAINER_CLASS_HALL_MATRON: - case TRAINER_CLASS_FACTORY_HEAD: - case TRAINER_CLASS_ARCADE_STAR: - case TRAINER_CLASS_CASTLE_VALET: - result = ENCEFF_FRONTIER_BRAIN; - break; - default: - break; + case TRAINER_CLASS_LEADER_ROARK: + result = ENCEFF_LEADER_ROARK; + break; + case TRAINER_CLASS_LEADER_GARDENIA: + result = ENCEFF_LEADER_GARDENIA; + break; + case TRAINER_CLASS_LEADER_WAKE: + result = ENCEFF_LEADER_WAKE; + break; + case TRAINER_CLASS_LEADER_MAYLENE: + result = ENCEFF_LEADER_MAYLENE; + break; + case TRAINER_CLASS_LEADER_FANTINA: + result = ENCEFF_LEADER_FANTINA; + break; + case TRAINER_CLASS_LEADER_CANDICE: + result = ENCEFF_LEADER_CANDICE; + break; + case TRAINER_CLASS_LEADER_BYRON: + result = ENCEFF_LEADER_BYRON; + break; + case TRAINER_CLASS_LEADER_VOLKNER: + result = ENCEFF_LEADER_VOLKNER; + break; + case TRAINER_CLASS_ELITE_FOUR_AARON: + result = ENCEFF_ELITE_FOUR_AARON; + break; + case TRAINER_CLASS_ELITE_FOUR_BERTHA: + result = ENCEFF_ELITE_FOUR_BERTHA; + break; + case TRAINER_CLASS_ELITE_FOUR_FLINT: + result = ENCEFF_ELITE_FOUR_FLINT; + break; + case TRAINER_CLASS_ELITE_FOUR_LUCIAN: + result = ENCEFF_ELITE_FOUR_LUCIAN; + break; + case TRAINER_CLASS_CHAMPION_CYNTHIA: + result = ENCEFF_CHAMPION_CYNTHIA; + break; + case TRAINER_CLASS_RIVAL: + result = ENCEFF_RIVAL; + break; + case TRAINER_CLASS_GALACTIC_BOSS: + result = ENCEFF_GALACTIC_CYRUS; + break; + case TRAINER_CLASS_COMMANDER_MARS: + case TRAINER_CLASS_COMMANDER_JUPITER: + case TRAINER_CLASS_COMMANDER_SATURN: + result = ENCEFF_GALACTIC_CMDR; + break; + case TRAINER_CLASS_GALACTIC_GRUNT_MALE: + case TRAINER_CLASS_GALACTIC_GRUNT_FEMALE: + result = ENCEFF_GALACTIC_GRUNT; + break; + case TRAINER_CLASS_TOWER_TYCOON: + case TRAINER_CLASS_HALL_MATRON: + case TRAINER_CLASS_FACTORY_HEAD: + case TRAINER_CLASS_ARCADE_STAR: + case TRAINER_CLASS_CASTLE_VALET: + result = ENCEFF_FRONTIER_BRAIN; + break; + default: + break; } return result; } -static u32 EncEffects_WildPokemonEffect (Party *wildParty, int mapHeaderID) +static u32 EncEffects_WildPokemonEffect(Party *wildParty, int mapHeaderID) { u32 result = ENCEFF_NORMAL_WILD; @@ -288,51 +290,51 @@ static u32 EncEffects_WildPokemonEffect (Party *wildParty, int mapHeaderID) u32 wildSpecies = Pokemon_GetValue(wildPokemon, MON_DATA_SPECIES, NULL); switch (wildSpecies) { - case SPECIES_SHAYMIN: - result = ENCEFF_SHAYMIN; - break; - case SPECIES_CRESSELIA: - result = ENCEFF_CRESSELIA; - break; - case SPECIES_GIRATINA: - result = ENCEFF_GIRATINA; - break; - case SPECIES_REGISTEEL: - case SPECIES_REGICE: - case SPECIES_REGIROCK: - if (mapHeaderID != ZONE_ID_PAL_PARK) { - result = ENCEFF_REGI_TRIO; - } - break; - case SPECIES_REGIGIGAS: - case SPECIES_HEATRAN: - case SPECIES_DARKRAI: - case SPECIES_ROTOM: - result = ENCEFF_MINOR_LEGENDARIES; - break; - case SPECIES_MESPRIT: - result = ENCEFF_MESPRIT; - break; - case SPECIES_UXIE: - case SPECIES_AZELF: - result = ENCEFF_UXIE_AZELF; - break; - case SPECIES_DIALGA: - case SPECIES_PALKIA: - result = ENCEFF_DIALGA_PALKIA; - break; - case SPECIES_ARCEUS: - result = ENCEFF_ARCEUS; - break; - case SPECIES_MOLTRES: - case SPECIES_ARTICUNO: - case SPECIES_ZAPDOS: - if (mapHeaderID != ZONE_ID_PAL_PARK) { - result = ENCEFF_KANTO_BIRDS; - } - break; - default: - break; + case SPECIES_SHAYMIN: + result = ENCEFF_SHAYMIN; + break; + case SPECIES_CRESSELIA: + result = ENCEFF_CRESSELIA; + break; + case SPECIES_GIRATINA: + result = ENCEFF_GIRATINA; + break; + case SPECIES_REGISTEEL: + case SPECIES_REGICE: + case SPECIES_REGIROCK: + if (mapHeaderID != ZONE_ID_PAL_PARK) { + result = ENCEFF_REGI_TRIO; + } + break; + case SPECIES_REGIGIGAS: + case SPECIES_HEATRAN: + case SPECIES_DARKRAI: + case SPECIES_ROTOM: + result = ENCEFF_MINOR_LEGENDARIES; + break; + case SPECIES_MESPRIT: + result = ENCEFF_MESPRIT; + break; + case SPECIES_UXIE: + case SPECIES_AZELF: + result = ENCEFF_UXIE_AZELF; + break; + case SPECIES_DIALGA: + case SPECIES_PALKIA: + result = ENCEFF_DIALGA_PALKIA; + break; + case SPECIES_ARCEUS: + result = ENCEFF_ARCEUS; + break; + case SPECIES_MOLTRES: + case SPECIES_ARTICUNO: + case SPECIES_ZAPDOS: + if (mapHeaderID != ZONE_ID_PAL_PARK) { + result = ENCEFF_KANTO_BIRDS; + } + break; + default: + break; } return result; diff --git a/src/error_handling.c b/src/error_handling.c index 8e9cee6a79..f0e9423568 100644 --- a/src/error_handling.c +++ b/src/error_handling.c @@ -1,13 +1,14 @@ +#include "error_handling.h" + #include #include -#include "error_handling.h" -#include "unk_020366A0.h" #include "error_message_reset.h" +#include "unk_020366A0.h" void ErrorHandling_AssertFail(void); -void ErrorHandling_AssertFail (void) +void ErrorHandling_AssertFail(void) { if (CommMan_IsInitialized() && (OS_GetProcMode() != OS_PROCMODE_IRQ)) { ErrorMessageReset_PrintErrorAndReset(); diff --git a/src/error_message_reset.c b/src/error_message_reset.c index 2f721113bb..e6583cdede 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -1,34 +1,32 @@ +#include "error_message_reset.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_02017E74.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "communication_system.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" #include "unk_02000C88.h" #include "unk_02002B7C.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "error_message_reset.h" static const UnkStruct_02099F80 sErrorMessageBanksConfig = { GX_VRAM_BG_256_AB, @@ -79,24 +77,24 @@ static const UnkStruct_ov61_0222C884 sErrorMessageWindowTemplate = { static const HeapParam sErrorMessageHeapParams[] = { { .size = 0x20000, - .arena = OS_ARENA_MAIN - } + .arena = OS_ARENA_MAIN, + }, }; static BOOL sErrorMessagePrinterLock; -static void VBlankIntr (void) +static void VBlankIntr(void) { OS_SetIrqCheckFlag(OS_IE_V_BLANK); MI_WaitDma(GX_DEFAULT_DMAID); } -void ErrorMessageReset_PrintErrorAndReset (void) +void ErrorMessageReset_PrintErrorAndReset(void) { - BGL * bgConfig; + BGL *bgConfig; Window window; - MessageLoader * errorMsgData; - Strbuf* errorString; + MessageLoader *errorMsgData; + Strbuf *errorString; int v4; int v5 = 0; diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c index fb8145b580..8c04e10605 100644 --- a/src/field_comm_manager.c +++ b/src/field_comm_manager.c @@ -1,39 +1,41 @@ +#include "field_comm_manager.h" + #include #include -#include "sys_task_manager.h" -#include "trainer_info.h" +#include "constants/heap.h" + #include "struct_decls/struct_02029894_decl.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" +#include "struct_defs/struct_0205964C.h" +#include "struct_defs/struct_02072014.h" #include "field/field_system.h" -#include "struct_defs/struct_0205964C.h" #include "functypes/funcptr_020598EC.h" -#include "struct_defs/struct_02072014.h" +#include "overlay007/communication_club.h" +#include "overlay023/ov23_02241F74.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "field_system.h" +#include "heap.h" +#include "party.h" +#include "savedata.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_0200F174.h" -#include "heap.h" -#include "constants/heap.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" -#include "field_system.h" #include "unk_0203E880.h" #include "unk_02050A74.h" -#include "comm_player_manager.h" -#include "field_comm_manager.h" #include "unk_0205A0D8.h" #include "unk_02071D40.h" -#include "party.h" #include "unk_02099500.h" -#include "overlay007/communication_club.h" -#include "overlay023/ov23_02241F74.h" -static void FieldCommMan_RunTask(SysTask * param0, void * param1); +static void FieldCommMan_RunTask(SysTask *param0, void *param1); static void FieldCommMan_SetTask(FieldCommTask param0, int param1); static void Task_StartBattleServer(void); static void Task_ServerWait(void); @@ -61,19 +63,19 @@ static void sub_0205A018(void); static void Task_EndBattle(void); static void sub_0205A058(void); -static FieldCommunicationManager * sFieldCommMan = NULL; +static FieldCommunicationManager *sFieldCommMan = NULL; -FieldCommunicationManager * FieldCommMan_Get (void) +FieldCommunicationManager *FieldCommMan_Get(void) { return sFieldCommMan; } -static void sub_02059658 (void) +static void sub_02059658(void) { return; } -void FieldCommMan_Init (FieldSystem * fieldSystem) +void FieldCommMan_Init(FieldSystem *fieldSystem) { if (sFieldCommMan != NULL) { return; @@ -93,7 +95,7 @@ void FieldCommMan_Init (FieldSystem * fieldSystem) CommSys_Seed(&sFieldCommMan->unk_1C); } -void FieldCommMan_Delete (void) +void FieldCommMan_Delete(void) { int i; @@ -117,7 +119,7 @@ void FieldCommMan_Delete (void) sFieldCommMan = NULL; } -void FieldCommMan_StartBattleServer (FieldSystem * fieldSystem, int param1, int param2) +void FieldCommMan_StartBattleServer(FieldSystem *fieldSystem, int param1, int param2) { if (CommSys_IsInitialized()) { return; @@ -128,7 +130,7 @@ void FieldCommMan_StartBattleServer (FieldSystem * fieldSystem, int param1, int FieldCommMan_SetTask(Task_StartBattleServer, 0); } -void FieldCommMan_StartBattleClient (FieldSystem * fieldSystem, int param1, int param2) +void FieldCommMan_StartBattleClient(FieldSystem *fieldSystem, int param1, int param2) { if (CommSys_IsInitialized()) { return; @@ -139,18 +141,18 @@ void FieldCommMan_StartBattleClient (FieldSystem * fieldSystem, int param1, int FieldCommMan_SetTask(Task_StartBattleClient, 0); } -void FieldCommMan_ConnectBattleClient (int param0) +void FieldCommMan_ConnectBattleClient(int param0) { sFieldCommMan->unk_3E = param0; FieldCommMan_SetTask(Task_ConnectBattleClient, 0); } -void FieldCommMan_ReconnectBattleClient (void) +void FieldCommMan_ReconnectBattleClient(void) { FieldCommMan_SetTask(sub_02059E80, 0); } -void FieldCommMan_EnterBattleRoom (FieldSystem * fieldSystem) +void FieldCommMan_EnterBattleRoom(FieldSystem *fieldSystem) { sub_0200F3B0(0, 0x0); sub_0200F3B0(1, 0x0); @@ -186,7 +188,7 @@ void FieldCommMan_EnterBattleRoom (FieldSystem * fieldSystem) FieldCommMan_SetTask(FieldCommTask_StartCopyTrainerCard, 0); } -void FieldCommMan_EndBattle (void) +void FieldCommMan_EndBattle(void) { if (sFieldCommMan == NULL) { return; @@ -196,7 +198,7 @@ void FieldCommMan_EndBattle (void) FieldCommMan_SetTask(Task_EndBattle, 5); } -void sub_020598A0 (void) +void sub_020598A0(void) { if (sFieldCommMan == NULL) { return; @@ -206,7 +208,7 @@ void sub_020598A0 (void) FieldCommMan_SetTask(sub_0205A018, 5); } -void FieldCommMan_RunTask (SysTask * task, void * param1) +void FieldCommMan_RunTask(SysTask *task, void *param1) { if (sFieldCommMan == NULL) { SysTask_Done(task); @@ -221,13 +223,13 @@ void FieldCommMan_RunTask (SysTask * task, void * param1) } } -static void FieldCommMan_SetTask (FieldCommTask task, int time) +static void FieldCommMan_SetTask(FieldCommTask task, int time) { sFieldCommMan->task = task; sFieldCommMan->timer = time; } -static void Task_StartBattleServer (void) +static void Task_StartBattleServer(void) { if (!CommSys_IsPlayerConnected(CommSys_CurNetId())) { return; @@ -239,12 +241,12 @@ static void Task_StartBattleServer (void) FieldCommMan_SetTask(Task_ServerWait, 0); } -static void Task_ServerWait (void) +static void Task_ServerWait(void) { return; } -static void Task_StartBattleClient (void) +static void Task_StartBattleClient(void) { if (!sub_020334A4()) { return; @@ -254,18 +256,18 @@ static void Task_StartBattleClient (void) FieldCommMan_SetTask(Task_ClientWait, 0); } -static void Task_ClientWait (void) +static void Task_ClientWait(void) { return; } -static void Task_ConnectBattleClient (void) +static void Task_ConnectBattleClient(void) { sub_02036948(sFieldCommMan->unk_3E); FieldCommMan_SetTask(sub_02059964, 0); } -static void sub_02059964 (void) +static void sub_02059964(void) { if (!sub_0203699C()) { return; @@ -275,14 +277,14 @@ static void sub_02059964 (void) FieldCommMan_SetTask(sub_02059980, 0); } -static void sub_02059980 (void) +static void sub_02059980(void) { return; } -static void sub_02059984 (void) +static void sub_02059984(void) { - void * v0; + void *v0; if (CommTiming_IsSyncState(98)) { v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size()); @@ -302,7 +304,7 @@ static void sub_02059984 (void) } } -static void sub_020599E4 (void) +static void sub_020599E4(void) { if (CommSys_CurNetId() == 0) { CommInfo_ServerSendArray(); @@ -318,7 +320,7 @@ static void sub_020599E4 (void) } } -static void sub_02059A3C (void) +static void sub_02059A3C(void) { if (sFieldCommMan->timer != 0) { sFieldCommMan->timer--; @@ -331,7 +333,7 @@ static void sub_02059A3C (void) } } -static void sub_02059A70 (void) +static void sub_02059A70(void) { if (sFieldCommMan->timer != 0) { sFieldCommMan->timer--; @@ -351,9 +353,9 @@ static void sub_02059A70 (void) FieldCommMan_SetTask(sub_02059A3C, 20); } -static void sub_02059AB4 (void) +static void sub_02059AB4(void) { - void * v0; + void *v0; if (CommTiming_IsSyncState(98)) { v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size()); @@ -372,7 +374,7 @@ static void sub_02059AB4 (void) } } -static void sub_02059B10 (void) +static void sub_02059B10(void) { if (CommSys_CurNetId() == 0) { CommInfo_ServerSendArray(); @@ -394,7 +396,7 @@ static void sub_02059B10 (void) } } -static void sub_02059B74 (void) +static void sub_02059B74(void) { int v0, v1; @@ -418,7 +420,7 @@ static void sub_02059B74 (void) sub_02038A1C(4, sFieldCommMan->fieldSystem->unk_08); } -static void sub_02059BF4 (void) +static void sub_02059BF4(void) { if (!sub_020590C4()) { sFieldCommMan->unk_43 = 0; @@ -434,7 +436,7 @@ static void sub_02059BF4 (void) sub_02059B74(); } -static void sub_02059C2C (BOOL param0, const Party * party) +static void sub_02059C2C(BOOL param0, const Party *party) { if (party) { sFieldCommMan->party = Party_New(11); @@ -453,12 +455,12 @@ static void sub_02059C2C (BOOL param0, const Party * party) } } -static void sub_02059C7C (void) +static void sub_02059C7C(void) { FieldCommMan_SetTask(sub_02059BF4, 0); } -static void sub_02059C8C (void) +static void sub_02059C8C(void) { if (sub_020363A0() || (0 != CommPlayer_GetMovementTimer(CommSys_CurNetId()))) { return; @@ -474,7 +476,7 @@ static void sub_02059C8C (void) FieldCommMan_SetTask(sub_02059C7C, 0); } -static void sub_02059CD8 (void) +static void sub_02059CD8(void) { if (sFieldCommMan->unk_43) { FieldCommMan_SetTask(sub_02059C8C, 5); @@ -488,16 +490,16 @@ static void sub_02059CD8 (void) sub_02059B74(); } -void sub_02059D0C (int param0, int param1, void * param2, void * param3) +void sub_02059D0C(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; if (v0[0] == CommSys_CurNetId()) { sFieldCommMan->unk_43 = 1; } } -BOOL sub_02059D2C (void) +BOOL sub_02059D2C(void) { if (sFieldCommMan) { if ((sFieldCommMan->task == sub_02059CD8) || (sFieldCommMan->task == sub_02059BF4)) { @@ -508,7 +510,7 @@ BOOL sub_02059D2C (void) return 0; } -static void sub_02059D58 (void) +static void sub_02059D58(void) { BOOL v0 = 1; int v1; @@ -544,7 +546,7 @@ static void sub_02059D58 (void) FieldCommMan_Delete(); } -static void sub_02059DC8 (void) +static void sub_02059DC8(void) { if (CommSys_TransitionTypeIsParallel()) { if (sFieldCommMan->timer != 0) { @@ -561,7 +563,7 @@ static void sub_02059DC8 (void) } } -static void sub_02059E0C (void) +static void sub_02059E0C(void) { if (sFieldCommMan->timer != 0) { sFieldCommMan->timer--; @@ -572,7 +574,7 @@ static void sub_02059E0C (void) FieldCommMan_SetTask(sub_02059DC8, 120); } -static void sub_02059E34 (void) +static void sub_02059E34(void) { BOOL v0 = 1; @@ -581,7 +583,7 @@ static void sub_02059E34 (void) } } -static void sub_02059E50 (void) +static void sub_02059E50(void) { BOOL v0 = 1; @@ -595,13 +597,13 @@ static void sub_02059E50 (void) FieldCommMan_SetTask(sub_02059E34, 0); } -static void sub_02059E80 (void) +static void sub_02059E80(void) { sub_02036964(); FieldCommMan_SetTask(sub_02059E94, 2); } -static void sub_02059E94 (void) +static void sub_02059E94(void) { if (!sub_02033E30()) { return; @@ -610,18 +612,18 @@ static void sub_02059E94 (void) FieldCommMan_SetTask(sub_02059964, 10); } -void sub_02059EAC (int param0, int param1, void * param2, void * param3) +void sub_02059EAC(int param0, int param1, void *param2, void *param3) { sFieldCommMan->unk_10[param0] = 1; } -u8 * sub_02059EBC (int param0, void * param1, int param2) +u8 *sub_02059EBC(int param0, void *param1, int param2) { GF_ASSERT(param0 < 4); return (u8 *)sFieldCommMan->trainerCard[param0]; } -static void FieldCommTask_StartCopyTrainerCard (void) +static void FieldCommTask_StartCopyTrainerCard(void) { int v0, v1 = CommSys_CurNetId(); @@ -631,7 +633,7 @@ static void FieldCommTask_StartCopyTrainerCard (void) } } -static void FieldCommTask_CopyTrainerCard (void) +static void FieldCommTask_CopyTrainerCard(void) { int v0; @@ -645,7 +647,7 @@ static void FieldCommTask_CopyTrainerCard (void) FieldCommMan_SetTask(sub_02059FB8, 0); } -static void sub_02059F4C (void) +static void sub_02059F4C(void) { if (!CommSys_TransitionTypeIsParallel()) { if (sFieldCommMan->timer != 0) { @@ -662,7 +664,7 @@ static void sub_02059F4C (void) } } -static void sub_02059F90 (void) +static void sub_02059F90(void) { if (sFieldCommMan->timer != 0) { sFieldCommMan->timer--; @@ -673,14 +675,14 @@ static void sub_02059F90 (void) FieldCommMan_SetTask(sub_02059F4C, 120); } -static void sub_02059FB8 (void) +static void sub_02059FB8(void) { if (CommTiming_IsSyncState(97)) { FieldCommMan_SetTask(sub_02059F90, 2); } } -static void sub_02059FD4 (void) +static void sub_02059FD4(void) { if (sFieldCommMan->timer != 0) { sFieldCommMan->timer--; @@ -696,7 +698,7 @@ static void sub_02059FD4 (void) } } -static void sub_0205A018 (void) +static void sub_0205A018(void) { if (CommTiming_IsSyncState(91)) { CommMan_SetErrorHandling(0, 0); @@ -705,13 +707,13 @@ static void sub_0205A018 (void) } } -static void Task_EndBattle (void) +static void Task_EndBattle(void) { CommPlayerMan_Delete(1); FieldCommMan_SetTask(sub_0205A058, 5); } -static void sub_0205A058 (void) +static void sub_0205A058(void) { if (sFieldCommMan->timer != 0) { sFieldCommMan->timer--; @@ -722,7 +724,7 @@ static void sub_0205A058 (void) FieldCommMan_SetTask(FieldCommMan_Delete, 0); } -UnkStruct_02029894 * sub_0205A080 (SaveData * param0) +UnkStruct_02029894 *sub_0205A080(SaveData *param0) { if (!sFieldCommMan || !sFieldCommMan->unk_41) { return NULL; @@ -731,14 +733,14 @@ UnkStruct_02029894 * sub_0205A080 (SaveData * param0) return ov23_02242E10(param0); } -void sub_0205A0A0 (void) +void sub_0205A0A0(void) { if (sFieldCommMan && sFieldCommMan->unk_41) { ov23_02242C78(); } } -void sub_0205A0BC (void) +void sub_0205A0BC(void) { if (sFieldCommMan && sFieldCommMan->unk_41) { ov23_02242CB4(); diff --git a/src/field_map_change.c b/src/field_map_change.c index c1b2626162..3dc408b480 100644 --- a/src/field_map_change.c +++ b/src/field_map_change.c @@ -1,56 +1,67 @@ +#include "field_map_change.h" + #include #include -#include "inlines.h" -#include "core_sys.h" +#include "constants/overworld_weather.h" +#include "consts/map.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" -#include "sys_task_manager.h" -#include "strbuf.h" #include "struct_decls/struct_0203A790_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "overlay005/struct_ov5_021D432C_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02049FA8.h" -#include "functypes/funcptr_02050904.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0205EC34.h" #include "struct_defs/struct_020EC3A8.h" + +#include "field/field_system.h" +#include "functypes/funcptr_02050904.h" +#include "overlay005/ov5_021DD6FC.h" +#include "overlay005/ov5_021E135C.h" +#include "overlay005/ov5_021E1D20.h" +#include "overlay005/struct_ov5_021D432C_decl.h" +#include "overlay006/ov6_02243258.h" +#include "overlay006/ov6_02247100.h" +#include "overlay023/ov23_02248F1C.h" +#include "overlay023/ov23_022499E4.h" +#include "overlay023/ov23_0224B05C.h" #include "overlay061/struct_ov61_0222C884.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_overworld_state.h" +#include "field_system.h" +#include "game_overlay.h" +#include "heap.h" +#include "inlines.h" +#include "journal.h" +#include "map_header.h" +#include "map_header_data.h" +#include "map_object.h" +#include "message.h" +#include "player_avatar.h" +#include "pokeradar.h" +#include "savedata.h" +#include "savedata_misc.h" +#include "strbuf.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "game_overlay.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "strbuf.h" -#include "savedata.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "savedata_misc.h" #include "unk_02027F50.h" #include "unk_0202854C.h" -#include "journal.h" -#include "communication_system.h" #include "unk_02039C80.h" -#include "map_header.h" -#include "map_header_data.h" -#include "field_overworld_state.h" #include "unk_0203A7D8.h" #include "unk_0203A944.h" -#include "field_system.h" #include "unk_0203D1B8.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_020508D4.h" -#include "field_map_change.h" #include "unk_02054BD0.h" #include "unk_02054D00.h" #include "unk_020553DC.h" @@ -60,30 +71,17 @@ #include "unk_0205C22C.h" #include "unk_0205CA94.h" #include "unk_0205D8CC.h" -#include "player_avatar.h" -#include "map_object.h" -#include "pokeradar.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_02070428.h" -#include "overlay005/ov5_021DD6FC.h" -#include "overlay005/ov5_021E135C.h" -#include "overlay005/ov5_021E1D20.h" -#include "overlay006/ov6_02243258.h" -#include "overlay006/ov6_02247100.h" -#include "overlay023/ov23_02248F1C.h" -#include "overlay023/ov23_022499E4.h" -#include "overlay023/ov23_0224B05C.h" - -#include "consts/map.h" -#include "constants/overworld_weather.h" +#include "vars_flags.h" FS_EXTERN_OVERLAY(overlay23); typedef struct { int unk_00; Location unk_04; - UnkStruct_ov5_021D432C * unk_18; + UnkStruct_ov5_021D432C *unk_18; } UnkStruct_02053900; typedef struct { @@ -93,9 +91,9 @@ typedef struct { typedef struct { int unk_00; - SysTask * unk_04; + SysTask *unk_04; Location unk_08; - UnkStruct_ov5_021D432C * unk_1C; + UnkStruct_ov5_021D432C *unk_1C; } UnkStruct_02053AB4; typedef struct { @@ -106,7 +104,7 @@ typedef struct { typedef struct { int unk_00; int unk_04; - SysTask * unk_08; + SysTask *unk_08; Location unk_0C; } UnkStruct_02053CD4; @@ -125,11 +123,11 @@ typedef struct { int unk_14; BOOL unk_18; u16 unk_1C; - void * unk_20; + void *unk_20; Window unk_24; - Strbuf* unk_34; + Strbuf *unk_34; u8 unk_38; - UIControlData * unk_3C; + UIControlData *unk_3C; } UnkStruct_02053FAC; typedef struct { @@ -138,35 +136,35 @@ typedef struct { Location unk_08; } UnkStruct_02054538; -static BOOL FieldTask_ChangeMap(TaskManager * taskMan); -static BOOL FieldTask_LoadNewGameSpawn(TaskManager * taskMan); -static void FieldMapChange_SetNewLocation(FieldSystem * fieldSystem, const Location * param1); -static void sub_020533CC(FieldSystem * fieldSystem); -static void sub_02053468(FieldSystem * fieldSystem); -static void FieldMapChange_CreatePlayerObject(FieldSystem * fieldSystem); -static void sub_02053374(FieldSystem * fieldSystem); -static void sub_020534BC(FieldSystem * fieldSystem); -static BOOL sub_02053B44(TaskManager * taskMan); -static void sub_02053BD4(TaskManager * taskMan); -static BOOL sub_02053BE4(TaskManager * taskMan); -static void sub_02053C10(TaskManager * taskMan); -static BOOL sub_02053C28(TaskManager * taskMan); -static void sub_02053C70(TaskManager * taskMan); -static BOOL sub_02053CB4(TaskManager * taskMan); -static BOOL sub_02053D0C(TaskManager * taskMan); -static void sub_02053DB4(TaskManager * taskMan); -static BOOL sub_02053DC4(TaskManager * taskMan); -static void sub_02053DF0(TaskManager * taskMan); -static BOOL sub_02053E08(TaskManager * taskMan); -static void sub_02053E5C(TaskManager * taskMan); -static BOOL sub_0205444C(TaskManager * taskMan, int param1); +static BOOL FieldTask_ChangeMap(TaskManager *taskMan); +static BOOL FieldTask_LoadNewGameSpawn(TaskManager *taskMan); +static void FieldMapChange_SetNewLocation(FieldSystem *fieldSystem, const Location *param1); +static void sub_020533CC(FieldSystem *fieldSystem); +static void sub_02053468(FieldSystem *fieldSystem); +static void FieldMapChange_CreatePlayerObject(FieldSystem *fieldSystem); +static void sub_02053374(FieldSystem *fieldSystem); +static void sub_020534BC(FieldSystem *fieldSystem); +static BOOL sub_02053B44(TaskManager *taskMan); +static void sub_02053BD4(TaskManager *taskMan); +static BOOL sub_02053BE4(TaskManager *taskMan); +static void sub_02053C10(TaskManager *taskMan); +static BOOL sub_02053C28(TaskManager *taskMan); +static void sub_02053C70(TaskManager *taskMan); +static BOOL sub_02053CB4(TaskManager *taskMan); +static BOOL sub_02053D0C(TaskManager *taskMan); +static void sub_02053DB4(TaskManager *taskMan); +static BOOL sub_02053DC4(TaskManager *taskMan); +static void sub_02053DF0(TaskManager *taskMan); +static BOOL sub_02053E08(TaskManager *taskMan); +static void sub_02053E5C(TaskManager *taskMan); +static BOOL sub_0205444C(TaskManager *taskMan, int param1); static const UnkStruct_020EC3A8 Unk_020EC3A8[] = { - {0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0xC4000}, - {0x2, 0x1, 0x1, 0x1, 0x1, 0x0, 0x10, 0xC4000}, - {0x3, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0xC4000}, - {0x4, 0x1, 0x1, 0x0, 0x1, 0x1, 0x1, 0xC4000}, - {0x1, 0x1, 0x1, 0x0, 0x1, 0x1, 0x1, 0xA0000} + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0xC4000 }, + { 0x2, 0x1, 0x1, 0x1, 0x1, 0x0, 0x10, 0xC4000 }, + { 0x3, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0xC4000 }, + { 0x4, 0x1, 0x1, 0x0, 0x1, 0x1, 0x1, 0xC4000 }, + { 0x1, 0x1, 0x1, 0x0, 0x1, 0x1, 0x1, 0xA0000 } }; static const UnkStruct_ov61_0222C884 Unk_020EC3A0 = { @@ -179,7 +177,7 @@ static const UnkStruct_ov61_0222C884 Unk_020EC3A0 = { 0x21F }; -static void sub_020530C8 (FieldSystem * fieldSystem) +static void sub_020530C8(FieldSystem *fieldSystem) { BOOL inBattleTower; @@ -206,10 +204,10 @@ static void sub_020530C8 (FieldSystem * fieldSystem) } } -static void FieldMapChange_SetNewLocation (FieldSystem * fieldSystem, const Location * nextLocation) +static void FieldMapChange_SetNewLocation(FieldSystem *fieldSystem, const Location *nextLocation) { - FieldOverworldState * fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); - Location * location = FieldOverworldState_GetPrevLocation(fieldState); + FieldOverworldState *fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); + Location *location = FieldOverworldState_GetPrevLocation(fieldState); if (nextLocation != NULL) { *location = *fieldSystem->location; @@ -219,13 +217,13 @@ static void FieldMapChange_SetNewLocation (FieldSystem * fieldSystem, const Loca MapHeaderData_Load(fieldSystem, fieldSystem->location->mapId); if (fieldSystem->location->unk_04 != -1) { - const WarpEvent * v2 = MapHeaderData_GetWarpEventByIndex(fieldSystem, fieldSystem->location->unk_04); + const WarpEvent *v2 = MapHeaderData_GetWarpEventByIndex(fieldSystem, fieldSystem->location->unk_04); fieldSystem->location->x = v2->x; fieldSystem->location->z = v2->z; if (v2->destWarpID == 0x100) { - Location * v3, * entrance; + Location *v3, *entrance; v3 = sub_0203A730(fieldState); entrance = FieldOverworldState_GetEntranceLocation(fieldState); @@ -234,16 +232,16 @@ static void FieldMapChange_SetNewLocation (FieldSystem * fieldSystem, const Loca } } -void sub_020531A0 (FieldSystem * fieldSystem) +void sub_020531A0(FieldSystem *fieldSystem) { GF_ASSERT(fieldSystem->unk_70 < 5); gCoreSys.unk_65 = fieldSystem->unk_74->unk_00_12; } -void FieldMapChange_UpdateGameData (FieldSystem * fieldSystem, BOOL noWarp) +void FieldMapChange_UpdateGameData(FieldSystem *fieldSystem, BOOL noWarp) { int mapId = fieldSystem->location->mapId; - FieldOverworldState * fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); + FieldOverworldState *fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); Sound_ClearSpecialBGM(fieldSystem); FieldSystem_ClearLocalFlags(fieldSystem); @@ -263,8 +261,8 @@ void FieldMapChange_UpdateGameData (FieldSystem * fieldSystem, BOOL noWarp) if (!noWarp) { sub_02027F50(sub_02027860(fieldSystem->saveData)); } - - VarsFlags * varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); + + VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); u16 weather = FieldSystem_GetWeather(fieldSystem, mapId); if ((weather == OVERWORLD_WEATHER_FOG && Overworld_IsDefogActive(varsFlags) == TRUE) || (weather == OVERWORLD_WEATHER_DARK_FLASH && Overworld_IsFlashActive(varsFlags) == TRUE)) { @@ -296,10 +294,10 @@ void FieldMapChange_UpdateGameData (FieldSystem * fieldSystem, BOOL noWarp) fieldSystem->unk_78.unk_02 = 0; } -void FieldMapChange_UpdateGameDataDistortionWorld (FieldSystem * fieldSystem, BOOL param1) +void FieldMapChange_UpdateGameDataDistortionWorld(FieldSystem *fieldSystem, BOOL param1) { int mapId = fieldSystem->location->mapId; - FieldOverworldState * fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); + FieldOverworldState *fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); Sound_ClearSpecialBGM(fieldSystem); FieldSystem_ClearLocalFlags(fieldSystem); @@ -332,11 +330,11 @@ void FieldMapChange_UpdateGameDataDistortionWorld (FieldSystem * fieldSystem, BO fieldSystem->unk_78.unk_02 = 0; } -static void FieldMapChange_CreateObjects (FieldSystem * fieldSystem) +static void FieldMapChange_CreateObjects(FieldSystem *fieldSystem) { int gender; - FieldOverworldState * fieldState; - PlayerData * playerData; + FieldOverworldState *fieldState; + PlayerData *playerData; fieldSystem->mapObjMan = MapObjectMan_New(fieldSystem, 64, 5); @@ -350,20 +348,20 @@ static void FieldMapChange_CreateObjects (FieldSystem * fieldSystem) MapObjectMan_StopAllMovement(fieldSystem->mapObjMan); } -static void FieldMapChange_DeleteObjects (FieldSystem * fieldSystem) +static void FieldMapChange_DeleteObjects(FieldSystem *fieldSystem) { Player_Delete(fieldSystem->playerAvatar); MapObjectMan_DeleteAll(fieldSystem->mapObjMan); MapObjectMan_Delete(fieldSystem->mapObjMan); } -static void FieldMapChange_LoadObjects (FieldSystem * fieldSystem) +static void FieldMapChange_LoadObjects(FieldSystem *fieldSystem) { fieldSystem->mapObjMan = MapObjectMan_New(fieldSystem, 64, 5); FieldSystem_LoadObjects(fieldSystem); - FieldOverworldState * fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); - PlayerData * playerData = FieldOverworldState_GetPlayerData(fieldState); + FieldOverworldState *fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); + PlayerData *playerData = FieldOverworldState_GetPlayerData(fieldState); int v2 = TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData)); fieldSystem->playerAvatar = sub_0205E820(fieldSystem->mapObjMan, playerData, v2); @@ -371,14 +369,14 @@ static void FieldMapChange_LoadObjects (FieldSystem * fieldSystem) MapObjectMan_StopAllMovement(fieldSystem->mapObjMan); } -static void sub_020533CC (FieldSystem * fieldSystem) +static void sub_020533CC(FieldSystem *fieldSystem) { sub_020530C8(fieldSystem); GF_ASSERT(fieldSystem->unk_5C == NULL); sub_02039DC0(fieldSystem->location->mapId, fieldSystem->unk_2C); if (sub_0206B1F0(SaveData_GetVarsFlags(fieldSystem->saveData), 3)) { - sub_02039FE0(fieldSystem->unk_2C); //reveal Seabreak Path if Oak's Letter has been used + sub_02039FE0(fieldSystem->unk_2C); // reveal Seabreak Path if Oak's Letter has been used } if (!sub_0206B1F0(SaveData_GetVarsFlags(fieldSystem->saveData), 2)) { @@ -398,7 +396,7 @@ static void sub_020533CC (FieldSystem * fieldSystem) } } -static void sub_02053468 (FieldSystem * fieldSystem) +static void sub_02053468(FieldSystem *fieldSystem) { GF_ASSERT(fieldSystem->unk_5C != NULL); @@ -412,50 +410,50 @@ static void sub_02053468 (FieldSystem * fieldSystem) fieldSystem->unk_74 = NULL; } -void sub_02053494 (FieldSystem * fieldSystem) +void sub_02053494(FieldSystem *fieldSystem) { if (fieldSystem->unk_9C != NULL) { - void * v0; + void *v0; v0 = sub_0202BC58(fieldSystem->location->mapId, 11); sub_0202B758(fieldSystem->unk_9C, v0, 0); } } -static void sub_020534BC (FieldSystem * fieldSystem) +static void sub_020534BC(FieldSystem *fieldSystem) { if (fieldSystem->unk_9C != NULL) { - FieldOverworldState * v0 = SaveData_GetFieldOverworldState(fieldSystem->saveData); - Location * location = sub_0203A730(v0); - void * v2 = sub_0202BC58(location->mapId, 11); + FieldOverworldState *v0 = SaveData_GetFieldOverworldState(fieldSystem->saveData); + Location *location = sub_0203A730(v0); + void *v2 = sub_0202BC58(location->mapId, 11); sub_0202B758(fieldSystem->unk_9C, v2, 0); } } -static void Location_SetToPlayerLocation (Location * location, const FieldSystem * fieldSystem) +static void Location_SetToPlayerLocation(Location *location, const FieldSystem *fieldSystem) { Location_Set(location, fieldSystem->location->mapId, -1, Player_GetXPos(fieldSystem->playerAvatar), Player_GetZPos(fieldSystem->playerAvatar), 1); } -static BOOL FieldSystem_IsSaveInUnionRoom (const FieldSystem * fieldSystem) +static BOOL FieldSystem_IsSaveInUnionRoom(const FieldSystem *fieldSystem) { return MapHeader_IsPokemonCenter2F(fieldSystem->location->mapId) - && fieldSystem->location->x == 7 - && fieldSystem->location->z == 6; + && fieldSystem->location->x == 7 + && fieldSystem->location->z == 6; } -static void FieldSystem_SetLocationToUnionRoomExit (FieldSystem * fieldSystem) +static void FieldSystem_SetLocationToUnionRoomExit(FieldSystem *fieldSystem) { - Location * v0 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); - VarsFlags * varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); + Location *v0 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); Location_Set(v0, fieldSystem->location->mapId, -1, 8, 2, 1); } -static BOOL FieldTask_LoadNewGameSpawn (TaskManager * taskMan) +static BOOL FieldTask_LoadNewGameSpawn(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - int * state = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + int *state = FieldTask_GetState(taskMan); switch (*state) { case 0: @@ -476,18 +474,18 @@ static BOOL FieldTask_LoadNewGameSpawn (TaskManager * taskMan) return FALSE; } -void FieldSystem_SetLoadNewGameSpawnTask (FieldSystem * fieldSystem) +void FieldSystem_SetLoadNewGameSpawnTask(FieldSystem *fieldSystem) { fieldSystem->unk_70 = 0; FieldSystem_InitNewGameState(fieldSystem); FieldTask_Set(fieldSystem, FieldTask_LoadNewGameSpawn, NULL); } -static BOOL FieldTask_LoadSavedGameMap (TaskManager * taskMan) +static BOOL FieldTask_LoadSavedGameMap(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - VarsFlags * varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); - int * state = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); + int *state = FieldTask_GetState(taskMan); switch (*state) { case 0: @@ -502,7 +500,7 @@ static BOOL FieldTask_LoadSavedGameMap (TaskManager * taskMan) fieldSystem->unk_9C = Journal_GetSavedPage(SaveData_GetJournal(fieldSystem->saveData), inline_020535E8(varsFlags)); if (CommClub_IsAvailable(varsFlags)) { - FieldOverworldState * fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); + FieldOverworldState *fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); if (FieldSystem_IsSaveInUnionRoom(fieldSystem)) { FieldSystem_SetLocationToUnionRoomExit(fieldSystem); @@ -540,18 +538,18 @@ static BOOL FieldTask_LoadSavedGameMap (TaskManager * taskMan) return FALSE; } -void FieldSystem_SetLoadSavedGameMapTask (FieldSystem * fieldSystem) +void FieldSystem_SetLoadSavedGameMapTask(FieldSystem *fieldSystem) { fieldSystem->unk_70 = 0; FieldTask_Set(fieldSystem, FieldTask_LoadSavedGameMap, NULL); } -static BOOL FieldTask_LoadMapFromError (TaskManager * taskMan) +static BOOL FieldTask_LoadMapFromError(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053718 * v1 = TaskManager_Environment(taskMan); - VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); - int * state = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053718 *v1 = TaskManager_Environment(taskMan); + VarsFlags *v2 = SaveData_GetVarsFlags(fieldSystem->saveData); + int *state = FieldTask_GetState(taskMan); switch (*state) { case 0: @@ -593,13 +591,13 @@ static BOOL FieldTask_LoadMapFromError (TaskManager * taskMan) return 0; } -void FieldSystem_StartLoadMapFromErrorTask (FieldSystem * fieldSystem) +void FieldSystem_StartLoadMapFromErrorTask(FieldSystem *fieldSystem) { - UnkStruct_02053718 * v1; + UnkStruct_02053718 *v1; if (!MapHeader_IsUnionRoom(fieldSystem->location->mapId)) { if (FieldSystem_IsSaveInUnionRoom(fieldSystem)) { - VarsFlags * varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); FieldSystem_SetLocationToUnionRoomExit(fieldSystem); sub_0206AD9C(varsFlags); @@ -617,11 +615,11 @@ void FieldSystem_StartLoadMapFromErrorTask (FieldSystem * fieldSystem) FieldTask_Set(fieldSystem, FieldTask_LoadMapFromError, v1); } -static BOOL FieldTask_ChangeMap (TaskManager * taskMan) +static BOOL FieldTask_ChangeMap(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053900 * v1 = TaskManager_Environment(taskMan); - Location * location = &v1->unk_04; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053900 *v1 = TaskManager_Environment(taskMan); + Location *location = &v1->unk_04; switch (v1->unk_00) { case 0: @@ -651,9 +649,9 @@ static BOOL FieldTask_ChangeMap (TaskManager * taskMan) return FALSE; } -void FieldSystem_StartChangeMapTask (TaskManager * taskMan, const Location * nextLocation) +void FieldSystem_StartChangeMapTask(TaskManager *taskMan, const Location *nextLocation) { - UnkStruct_02053900 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053900)); + UnkStruct_02053900 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053900)); v0->unk_00 = 0; v0->unk_04 = *nextLocation; @@ -661,10 +659,10 @@ void FieldSystem_StartChangeMapTask (TaskManager * taskMan, const Location * nex FieldTask_Start(taskMan, FieldTask_ChangeMap, v0); } -static BOOL FieldTask_ChangeMapSub (TaskManager * taskMan) +static BOOL FieldTask_ChangeMapSub(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053A80 * v2 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053A80 *v2 = TaskManager_Environment(taskMan); switch (v2->unk_00) { case 0: @@ -688,10 +686,10 @@ static BOOL FieldTask_ChangeMapSub (TaskManager * taskMan) return 0; } -void sub_020539A0 (TaskManager * taskMan, const Location * param1) +void sub_020539A0(TaskManager *taskMan, const Location *param1) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053A80 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053A80)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053A80 *v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053A80)); if (sub_0203CD4C(fieldSystem)) { GF_ASSERT(FALSE); @@ -704,7 +702,7 @@ void sub_020539A0 (TaskManager * taskMan, const Location * param1) FieldTask_Start(taskMan, FieldTask_ChangeMapSub, v1); } -void sub_020539E8 (TaskManager * taskMan, int param1, int param2, int param3, int param4, int param5) +void sub_020539E8(TaskManager *taskMan, int param1, int param2, int param3, int param4, int param5) { Location location; @@ -712,11 +710,11 @@ void sub_020539E8 (TaskManager * taskMan, int param1, int param2, int param3, in sub_020539A0(taskMan, &location); } -static BOOL FieldTask_ChangeMapFull (TaskManager * taskMan) +static BOOL FieldTask_ChangeMapFull(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053A80 * v1 = TaskManager_Environment(taskMan); - Location * v2 = &v1->unk_04; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053A80 *v1 = TaskManager_Environment(taskMan); + Location *v2 = &v1->unk_04; switch (v1->unk_00) { case 0: @@ -745,9 +743,9 @@ static BOOL FieldTask_ChangeMapFull (TaskManager * taskMan) return 0; } -void sub_02053A80 (TaskManager * taskMan, int mapId, int param2, int x, int z, int param5) +void sub_02053A80(TaskManager *taskMan, int mapId, int param2, int x, int z, int param5) { - UnkStruct_02053A80 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053A80)); + UnkStruct_02053A80 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053A80)); v0->unk_00 = 0; @@ -755,13 +753,13 @@ void sub_02053A80 (TaskManager * taskMan, int mapId, int param2, int x, int z, i FieldTask_Start(taskMan, FieldTask_ChangeMapFull, v0); } -void sub_02053AB4 (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4, int param5) +void sub_02053AB4(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, int param5) { Location location; Location_Set(&location, param1, param2, param3, param4, param5); - UnkStruct_02053AB4 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053AB4)); + UnkStruct_02053AB4 *v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053AB4)); v1->unk_00 = 0; v1->unk_04 = NULL; @@ -770,13 +768,13 @@ void sub_02053AB4 (FieldSystem * fieldSystem, int param1, int param2, int param3 FieldTask_Set(fieldSystem, sub_02053B44, v1); } -void sub_02053AFC (TaskManager * taskMan, int param1, int param2, int param3, int param4, int param5) +void sub_02053AFC(TaskManager *taskMan, int param1, int param2, int param3, int param4, int param5) { Location location; Location_Set(&location, param1, param2, param3, param4, param5); - UnkStruct_02053AB4 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053AB4)); + UnkStruct_02053AB4 *v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053AB4)); v1->unk_00 = 0; v1->unk_04 = NULL; @@ -785,11 +783,11 @@ void sub_02053AFC (TaskManager * taskMan, int param1, int param2, int param3, in FieldTask_Change(taskMan, sub_02053B44, v1); } -static BOOL sub_02053B44 (TaskManager * taskMan) +static BOOL sub_02053B44(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053AB4 * v1 = TaskManager_Environment(taskMan); - Location * v2 = &v1->unk_08; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053AB4 *v1 = TaskManager_Environment(taskMan); + Location *v2 = &v1->unk_08; switch (v1->unk_00) { case 0: @@ -820,14 +818,14 @@ static BOOL sub_02053B44 (TaskManager * taskMan) return 0; } -static void sub_02053BD4 (TaskManager * taskMan) +static void sub_02053BD4(TaskManager *taskMan) { FieldTask_Start(taskMan, sub_02053BE4, NULL); } -static BOOL sub_02053BE4 (TaskManager * taskMan) +static BOOL sub_02053BE4(TaskManager *taskMan) { - int * state = FieldTask_GetState(taskMan); + int *state = FieldTask_GetState(taskMan); switch (*state) { case 0: @@ -841,16 +839,16 @@ static BOOL sub_02053BE4 (TaskManager * taskMan) return FALSE; } -static void sub_02053C10 (TaskManager * taskMan) +static void sub_02053C10(TaskManager *taskMan) { - UnkStruct_02053AB4 * v0 = TaskManager_Environment(taskMan); + UnkStruct_02053AB4 *v0 = TaskManager_Environment(taskMan); FieldTask_Start(taskMan, sub_02053C28, v0); } -static BOOL sub_02053C28 (TaskManager * taskMan) +static BOOL sub_02053C28(TaskManager *taskMan) { - int * v0 = FieldTask_GetState(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + int *v0 = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); switch (*v0) { case 0: @@ -869,10 +867,10 @@ static BOOL sub_02053C28 (TaskManager * taskMan) return 0; } -static void sub_02053C70 (TaskManager * taskMan) +static void sub_02053C70(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053AB4 * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053AB4 *v1 = TaskManager_Environment(taskMan); if (!sub_0203CD4C(fieldSystem)) { GF_ASSERT(FALSE); @@ -883,9 +881,9 @@ static void sub_02053C70 (TaskManager * taskMan) FieldTask_Start(taskMan, sub_02053CB4, v1); } -static BOOL sub_02053CB4 (TaskManager * taskMan) +static BOOL sub_02053CB4(TaskManager *taskMan) { - UnkStruct_02053AB4 * v0 = TaskManager_Environment(taskMan); + UnkStruct_02053AB4 *v0 = TaskManager_Environment(taskMan); if (ov6_02245CF0(v0->unk_04) == 1) { ov6_02245CFC(v0->unk_04); @@ -895,9 +893,9 @@ static BOOL sub_02053CB4 (TaskManager * taskMan) return 0; } -void sub_02053CD4 (TaskManager * taskMan, const Location * param1, u32 param2) +void sub_02053CD4(TaskManager *taskMan, const Location *param1, u32 param2) { - UnkStruct_02053CD4 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053CD4)); + UnkStruct_02053CD4 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053CD4)); v0->unk_00 = 0; v0->unk_04 = param2; @@ -907,11 +905,11 @@ void sub_02053CD4 (TaskManager * taskMan, const Location * param1, u32 param2) FieldTask_Change(taskMan, sub_02053D0C, v0); } -static BOOL sub_02053D0C (TaskManager * taskMan) +static BOOL sub_02053D0C(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053CD4 * v1 = TaskManager_Environment(taskMan); - Location * v2 = &v1->unk_0C; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053CD4 *v1 = TaskManager_Environment(taskMan); + Location *v2 = &v1->unk_0C; switch (v1->unk_00) { case 0: @@ -950,14 +948,14 @@ static BOOL sub_02053D0C (TaskManager * taskMan) return 0; } -static void sub_02053DB4 (TaskManager * taskMan) +static void sub_02053DB4(TaskManager *taskMan) { FieldTask_Start(taskMan, sub_02053DC4, NULL); } -static BOOL sub_02053DC4 (TaskManager * taskMan) +static BOOL sub_02053DC4(TaskManager *taskMan) { - int * v0 = FieldTask_GetState(taskMan); + int *v0 = FieldTask_GetState(taskMan); switch (*v0) { case 0: @@ -971,17 +969,17 @@ static BOOL sub_02053DC4 (TaskManager * taskMan) return 0; } -static void sub_02053DF0 (TaskManager * taskMan) +static void sub_02053DF0(TaskManager *taskMan) { - UnkStruct_02053CD4 * v0 = TaskManager_Environment(taskMan); + UnkStruct_02053CD4 *v0 = TaskManager_Environment(taskMan); FieldTask_Start(taskMan, sub_02053E08, v0); } -static BOOL sub_02053E08 (TaskManager * taskMan) +static BOOL sub_02053E08(TaskManager *taskMan) { - int * v0 = FieldTask_GetState(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053CD4 * v2 = TaskManager_Environment(taskMan); + int *v0 = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053CD4 *v2 = TaskManager_Environment(taskMan); switch (*v0) { case 0: @@ -1000,10 +998,10 @@ static BOOL sub_02053E08 (TaskManager * taskMan) return 0; } -static void sub_02053E5C (TaskManager * taskMan) +static void sub_02053E5C(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053CD4 * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053CD4 *v1 = TaskManager_Environment(taskMan); if (!sub_0203CD4C(fieldSystem)) { GF_ASSERT(FALSE); @@ -1011,16 +1009,16 @@ static void sub_02053E5C (TaskManager * taskMan) } { - void * v2 = ov6_022472C8(fieldSystem, 4, v1->unk_04); + void *v2 = ov6_022472C8(fieldSystem, 4, v1->unk_04); FieldTask_Start(taskMan, ov6_022472E8, v2); } } -static BOOL sub_02053E98 (TaskManager * taskMan) +static BOOL sub_02053E98(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053E98 * v1 = TaskManager_Environment(taskMan); - Location * v2 = &v1->unk_08; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053E98 *v1 = TaskManager_Environment(taskMan); + Location *v2 = &v1->unk_08; switch (v1->unk_00) { case 0: @@ -1065,10 +1063,10 @@ static BOOL sub_02053E98 (TaskManager * taskMan) return 0; } -void sub_02053F58 (FieldSystem * fieldSystem, int param1, int param2) +void sub_02053F58(FieldSystem *fieldSystem, int param1, int param2) { Location v0; - UnkStruct_02053E98 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053E98)); + UnkStruct_02053E98 *v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053E98)); MI_CpuClear8(v1, sizeof(UnkStruct_02053E98)); @@ -1077,10 +1075,10 @@ void sub_02053F58 (FieldSystem * fieldSystem, int param1, int param2) FieldTask_Set(fieldSystem, sub_02053E98, v1); } -void * sub_02053FAC (FieldSystem * fieldSystem) +void *sub_02053FAC(FieldSystem *fieldSystem) { - UnkStruct_02053FAC * v0; - Location * v1 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + UnkStruct_02053FAC *v0; + Location *v1 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053FAC)); v0->unk_00 = 0; @@ -1128,9 +1126,9 @@ void * sub_02053FAC (FieldSystem * fieldSystem) return v0; } -void sub_02054064 (FieldSystem * fieldSystem) +void sub_02054064(FieldSystem *fieldSystem) { - UnkStruct_02053FAC * v0 = sub_02053FAC(fieldSystem); + UnkStruct_02053FAC *v0 = sub_02053FAC(fieldSystem); if (v0 == NULL) { return; @@ -1139,14 +1137,14 @@ void sub_02054064 (FieldSystem * fieldSystem) FieldTask_Set(fieldSystem, sub_02054428(fieldSystem), v0); } -BOOL sub_02054084 (TaskManager * taskMan) +BOOL sub_02054084(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053FAC * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053FAC *v1 = TaskManager_Environment(taskMan); switch (v1->unk_00) { case 0: - MessageLoader * v2 = MessageLoader_Init(1, 26, 221, 11); + MessageLoader *v2 = MessageLoader_Init(1, 26, 221, 11); v1->unk_34 = MessageLoader_GetNewStrbuf(v2, 124); MessageLoader_Free(v2); @@ -1258,10 +1256,10 @@ BOOL sub_02054084 (TaskManager * taskMan) return 0; } -BOOL sub_0205430C (TaskManager * taskMan) +BOOL sub_0205430C(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053FAC * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053FAC *v1 = TaskManager_Environment(taskMan); int v2 = 0; switch (v1->unk_00) { @@ -1319,7 +1317,7 @@ BOOL sub_0205430C (TaskManager * taskMan) return 0; } -FieldTask sub_02054428 (const FieldSystem * fieldSystem) +FieldTask sub_02054428(const FieldSystem *fieldSystem) { if (fieldSystem->unk_70 == 0) { return sub_02054084; @@ -1331,10 +1329,10 @@ FieldTask sub_02054428 (const FieldSystem * fieldSystem) } } -static BOOL sub_0205444C (TaskManager * taskMan, int param1) +static BOOL sub_0205444C(TaskManager *taskMan, int param1) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053FAC * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053FAC *v1 = TaskManager_Environment(taskMan); BOOL v2 = 0; switch (v1->unk_04) { @@ -1354,10 +1352,10 @@ static BOOL sub_0205444C (TaskManager * taskMan, int param1) return v2; } -static BOOL sub_02054494 (TaskManager * taskMan) +static BOOL sub_02054494(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053A80 * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053A80 *v1 = TaskManager_Environment(taskMan); switch (v1->unk_00) { case 0: @@ -1378,10 +1376,10 @@ static BOOL sub_02054494 (TaskManager * taskMan) return 0; } -void sub_020544F0 (TaskManager * taskMan, const Location * param1) +void sub_020544F0(TaskManager *taskMan, const Location *param1) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053A80 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053A80)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053A80 *v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053A80)); if (sub_0203CD4C(fieldSystem)) { GF_ASSERT(FALSE); @@ -1394,12 +1392,12 @@ void sub_020544F0 (TaskManager * taskMan, const Location * param1) FieldTask_Start(taskMan, sub_02054494, v1); } -static BOOL sub_02054538 (TaskManager * taskMan) +static BOOL sub_02054538(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02054538 * v1 = TaskManager_Environment(taskMan); - int * v2 = FieldTask_GetState(taskMan); - Location * v3 = &v1->unk_08; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02054538 *v1 = TaskManager_Environment(taskMan); + int *v2 = FieldTask_GetState(taskMan); + Location *v3 = &v1->unk_08; switch (*v2) { case 0: @@ -1438,10 +1436,10 @@ static BOOL sub_02054538 (TaskManager * taskMan) return 0; } -void sub_020545EC (FieldSystem * fieldSystem) +void sub_020545EC(FieldSystem *fieldSystem) { - Location * v0 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); - UnkStruct_02054538 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02054538)); + Location *v0 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + UnkStruct_02054538 *v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02054538)); MI_CpuClear8(v1, sizeof(UnkStruct_02054538)); @@ -1454,12 +1452,12 @@ void sub_020545EC (FieldSystem * fieldSystem) fieldSystem->unk_7C = NULL; } -static BOOL sub_02054648 (TaskManager * taskMan) +static BOOL sub_02054648(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02054538 * v1 = TaskManager_Environment(taskMan); - int * state = FieldTask_GetState(taskMan); - Location * v3 = &v1->unk_08; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02054538 *v1 = TaskManager_Environment(taskMan); + int *state = FieldTask_GetState(taskMan); + Location *v3 = &v1->unk_08; switch (*state) { case 0: @@ -1502,11 +1500,11 @@ static BOOL sub_02054648 (TaskManager * taskMan) return FALSE; } -void sub_02054708 (TaskManager * taskMan) +void sub_02054708(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - Location * v1 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); - UnkStruct_02054538 * v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02054538)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + Location *v1 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + UnkStruct_02054538 *v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02054538)); MI_CpuClear8(v2, sizeof(UnkStruct_02054538)); Location_SetToPlayerLocation(v1, fieldSystem); @@ -1520,11 +1518,11 @@ void sub_02054708 (TaskManager * taskMan) FieldTask_Start(taskMan, sub_02054648, v2); } -static BOOL sub_02054778 (TaskManager * taskMan) +static BOOL sub_02054778(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02053900 * v1 = TaskManager_Environment(taskMan); - Location * v2 = &v1->unk_04; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02053900 *v1 = TaskManager_Environment(taskMan); + Location *v2 = &v1->unk_04; switch (v1->unk_00) { case 0: @@ -1554,17 +1552,17 @@ static BOOL sub_02054778 (TaskManager * taskMan) return 0; } -void sub_02054800 (TaskManager * taskMan, int param1, int param2, int param3, int param4, int param5) +void sub_02054800(TaskManager *taskMan, int param1, int param2, int param3, int param4, int param5) { Location v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - Location * v2 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + Location *v2 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); Location_SetToPlayerLocation(v2, fieldSystem); fieldSystem->unk_70 = 3; - UnkStruct_02053900 * v3 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053900)); + UnkStruct_02053900 *v3 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02053900)); Location_Set(&v0, param1, param2, param3, param4, param5); @@ -1574,10 +1572,10 @@ void sub_02054800 (TaskManager * taskMan, int param1, int param2, int param3, in FieldTask_Start(taskMan, sub_02054778, v3); } -void sub_02054864 (TaskManager * taskMan) +void sub_02054864(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - Location * v1 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + Location *v1 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); fieldSystem->unk_70 = 0; FieldSystem_StartChangeMapTask(fieldSystem->unk_10, v1); diff --git a/src/field_menu.c b/src/field_menu.c index 9a421369bd..a4e90302af 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -1,29 +1,21 @@ +#include "field_menu.h" + #include #include +#include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_decls/struct_0207CB08_decl.h" #include "struct_decls/struct_0209747C_decl.h" - -#include "constdata/const_020EA02C.h" -#include "constdata/const_020F1E88.h" - -#include "struct_defs/struct_0200D0F4.h" +#include "struct_decls/struct_party_decl.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/sentence.h" -#include "functypes/funcptr_0203B7C0.h" -#include "functypes/funcptr_0203BC5C.h" -#include "field/field_system.h" +#include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0203D8AC.h" -#include "functypes/funcptr_02050904.h" #include "struct_defs/struct_02068630.h" #include "struct_defs/struct_020708E0.h" #include "struct_defs/struct_020709CC.h" @@ -31,55 +23,65 @@ #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02097728.h" #include "struct_defs/struct_02098C44.h" -#include "struct_defs/pokemon_summary.h" + +#include "field/field_system.h" +#include "functypes/funcptr_0203B7C0.h" +#include "functypes/funcptr_0203BC5C.h" +#include "functypes/funcptr_02050904.h" +#include "gmm/message_bank_unk_0367.h" +#include "overlay005/ov5_021D0D80.h" +#include "overlay005/ov5_021D2F14.h" +#include "overlay005/ov5_021E1D20.h" #include "overlay021/struct_ov21_021D0D80.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_02241308.h" +#include "bag.h" +#include "field_overworld_state.h" +#include "field_system.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "journal.h" +#include "map_header.h" +#include "map_object.h" +#include "message.h" +#include "narc.h" +#include "party.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "poketch_data.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "narc.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02014A84.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "savedata.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" #include "unk_02028124.h" -#include "journal.h" #include "unk_0202CD50.h" #include "unk_0202D778.h" #include "unk_02033200.h" #include "unk_020366A0.h" -#include "map_header.h" -#include "field_overworld_state.h" -#include "field_menu.h" -#include "field_system.h" #include "unk_0203D1B8.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_020553DC.h" #include "unk_020559DC.h" #include "unk_020562F8.h" -#include "poketch_data.h" #include "unk_0205B33C.h" #include "unk_0205C22C.h" -#include "player_avatar.h" #include "unk_0205F180.h" -#include "map_object.h" #include "unk_020683F4.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" @@ -87,23 +89,17 @@ #include "unk_0207064C.h" #include "unk_0207070C.h" #include "unk_02071D40.h" -#include "pokemon.h" -#include "party.h" #include "unk_0207A274.h" #include "unk_0207AE68.h" #include "unk_0207CB08.h" -#include "item.h" -#include "bag.h" -#include "pokemon_summary_app.h" #include "unk_020972FC.h" #include "unk_0209747C.h" #include "unk_02097624.h" #include "unk_020989DC.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay005/ov5_021D2F14.h" -#include "overlay005/ov5_021E1D20.h" +#include "vars_flags.h" -#include "gmm/message_bank_unk_0367.h" +#include "constdata/const_020EA02C.h" +#include "constdata/const_020F1E88.h" typedef enum FieldMenuPos { MENU_POS_POKEDEX, @@ -137,99 +133,95 @@ typedef struct { } UnkStruct_0203C1C8; typedef struct { - void * unk_00; + void *unk_00; u16 unk_04; } SaveMenu; -static FieldMenu * FieldMenu_Alloc(void); -static u32 sub_0203ABD0(FieldSystem * fieldSystem); -static u32 sub_0203AC24(FieldSystem * fieldSystem); -static u32 sub_0203AC28(FieldSystem * fieldSystem); -static u32 sub_0203AC2C(FieldSystem * fieldSystem); -static u32 sub_0203AC34(FieldSystem * fieldSystem); -static u32 sub_0203AC3C(FieldSystem * fieldSystem); -static void sub_0203B318(FieldMenu * menu, u8 * param1, u32 param2, u8 param3); -static void sub_0203B4E8(FieldMenu * menu); -static void sub_0203B520(FieldMenu * menu); -static void sub_0203B558(GraphicElementData * graphicElement, u32 param1); -static void sub_0203B588(GraphicElementData * graphicElement, u16 param1, u16 param2); -static void sub_0203B5B4(FieldMenu * menu, u16 param1, u16 param2); -static void sub_0203B5E8(GraphicElementData * graphicElement); -static BOOL sub_0203AC44(TaskManager * taskMan); -static void sub_0203ADFC(TaskManager * taskMan); -static BOOL FieldMenu_Select(TaskManager * taskMan); -static u32 FieldMenu_MakeList(FieldMenu * menu, u8 * param1); -static void FieldMenu_Close(FieldMenu * menu); -static void sub_0203B2EC(FieldMenu * menu, FieldSystem * param1); -static void sub_0203B094(TaskManager * taskMan); -static void sub_0203B200(TaskManager * taskMan); -static void FieldMenu_ApplicationStart(TaskManager * taskMan); -static void FieldMenu_ApplicationRun(TaskManager * taskMan); -static BOOL FieldMenu_SelectPokedex(TaskManager * taskMan); -static BOOL FieldMenu_Pokedex(TaskManager * taskMan); -static BOOL FieldMenu_PokedexEnd(TaskManager * taskMan); -static BOOL FieldMenu_SelectTrainerCard(TaskManager * taskMan); -static BOOL FieldMenu_TrainerCard(TaskManager * taskMan); -static BOOL sub_0203BF00(TaskManager * taskMan); -static BOOL FieldMenu_SelectOptions(TaskManager * taskMan); -static BOOL FieldMenu_Options(TaskManager * taskMan); -static BOOL sub_0203C050(TaskManager * taskMan); -static BOOL FieldMenu_SelectChat(TaskManager * taskMan); -static BOOL sub_0203C0A0(TaskManager * taskMan); -static BOOL sub_0203C0F8(TaskManager * taskMan); -static BOOL FieldMenu_SelectPokemon(TaskManager * taskMan); -static BOOL sub_0203B78C(TaskManager * taskMan); -static BOOL FieldMenu_SelectBag(TaskManager * taskMan); -static BOOL FieldMenu_Bag(TaskManager * taskMan); -static BOOL sub_0203BC5C(TaskManager * taskMan); -static BOOL FieldMenu_SelectSave(TaskManager * taskMan); -static void FieldMenu_SaveWait(TaskManager * taskMan); -static void FieldMenu_Save(TaskManager * taskMan); -static BOOL sub_0203C1C8(TaskManager * taskMan); -static void sub_0203C2D8(TaskManager * taskMan, u16 param1); -static BOOL sub_0203C390(TaskManager * taskMan); -BOOL sub_0203C434(TaskManager * taskMan); -static void FieldMenu_EvolveInit(TaskManager * taskMan); -static void FieldMenu_Evolve(TaskManager * taskMan); -static BOOL FieldMenu_SelectRetire(TaskManager * taskMan); +static FieldMenu *FieldMenu_Alloc(void); +static u32 sub_0203ABD0(FieldSystem *fieldSystem); +static u32 sub_0203AC24(FieldSystem *fieldSystem); +static u32 sub_0203AC28(FieldSystem *fieldSystem); +static u32 sub_0203AC2C(FieldSystem *fieldSystem); +static u32 sub_0203AC34(FieldSystem *fieldSystem); +static u32 sub_0203AC3C(FieldSystem *fieldSystem); +static void sub_0203B318(FieldMenu *menu, u8 *param1, u32 param2, u8 param3); +static void sub_0203B4E8(FieldMenu *menu); +static void sub_0203B520(FieldMenu *menu); +static void sub_0203B558(GraphicElementData *graphicElement, u32 param1); +static void sub_0203B588(GraphicElementData *graphicElement, u16 param1, u16 param2); +static void sub_0203B5B4(FieldMenu *menu, u16 param1, u16 param2); +static void sub_0203B5E8(GraphicElementData *graphicElement); +static BOOL sub_0203AC44(TaskManager *taskMan); +static void sub_0203ADFC(TaskManager *taskMan); +static BOOL FieldMenu_Select(TaskManager *taskMan); +static u32 FieldMenu_MakeList(FieldMenu *menu, u8 *param1); +static void FieldMenu_Close(FieldMenu *menu); +static void sub_0203B2EC(FieldMenu *menu, FieldSystem *param1); +static void sub_0203B094(TaskManager *taskMan); +static void sub_0203B200(TaskManager *taskMan); +static void FieldMenu_ApplicationStart(TaskManager *taskMan); +static void FieldMenu_ApplicationRun(TaskManager *taskMan); +static BOOL FieldMenu_SelectPokedex(TaskManager *taskMan); +static BOOL FieldMenu_Pokedex(TaskManager *taskMan); +static BOOL FieldMenu_PokedexEnd(TaskManager *taskMan); +static BOOL FieldMenu_SelectTrainerCard(TaskManager *taskMan); +static BOOL FieldMenu_TrainerCard(TaskManager *taskMan); +static BOOL sub_0203BF00(TaskManager *taskMan); +static BOOL FieldMenu_SelectOptions(TaskManager *taskMan); +static BOOL FieldMenu_Options(TaskManager *taskMan); +static BOOL sub_0203C050(TaskManager *taskMan); +static BOOL FieldMenu_SelectChat(TaskManager *taskMan); +static BOOL sub_0203C0A0(TaskManager *taskMan); +static BOOL sub_0203C0F8(TaskManager *taskMan); +static BOOL FieldMenu_SelectPokemon(TaskManager *taskMan); +static BOOL sub_0203B78C(TaskManager *taskMan); +static BOOL FieldMenu_SelectBag(TaskManager *taskMan); +static BOOL FieldMenu_Bag(TaskManager *taskMan); +static BOOL sub_0203BC5C(TaskManager *taskMan); +static BOOL FieldMenu_SelectSave(TaskManager *taskMan); +static void FieldMenu_SaveWait(TaskManager *taskMan); +static void FieldMenu_Save(TaskManager *taskMan); +static BOOL sub_0203C1C8(TaskManager *taskMan); +static void sub_0203C2D8(TaskManager *taskMan, u16 param1); +static BOOL sub_0203C390(TaskManager *taskMan); +BOOL sub_0203C434(TaskManager *taskMan); +static void FieldMenu_EvolveInit(TaskManager *taskMan); +static void FieldMenu_Evolve(TaskManager *taskMan); +static BOOL FieldMenu_SelectRetire(TaskManager *taskMan); static const u32 Unk_020EA05C[][2] = { - {pl_msg_00000367_00000, (u32)FieldMenu_SelectPokedex}, - {pl_msg_00000367_00001, (u32)FieldMenu_SelectPokemon}, - {pl_msg_00000367_00002, (u32)FieldMenu_SelectBag}, - {pl_msg_00000367_00003, (u32)FieldMenu_SelectTrainerCard}, - {pl_msg_00000367_00004, (u32)FieldMenu_SelectSave}, - {pl_msg_00000367_00005, (u32)FieldMenu_SelectOptions}, - {pl_msg_00000367_00006, (u32)0xfffffffe}, //Exit - {pl_msg_00000367_00007, (u32)FieldMenu_SelectChat}, - {pl_msg_00000367_00008, (u32)FieldMenu_SelectRetire} + { pl_msg_00000367_00000, (u32)FieldMenu_SelectPokedex }, + { pl_msg_00000367_00001, (u32)FieldMenu_SelectPokemon }, + { pl_msg_00000367_00002, (u32)FieldMenu_SelectBag }, + { pl_msg_00000367_00003, (u32)FieldMenu_SelectTrainerCard }, + { pl_msg_00000367_00004, (u32)FieldMenu_SelectSave }, + { pl_msg_00000367_00005, (u32)FieldMenu_SelectOptions }, + { pl_msg_00000367_00006, (u32)0xfffffffe }, // Exit + { pl_msg_00000367_00007, (u32)FieldMenu_SelectChat }, + { pl_msg_00000367_00008, (u32)FieldMenu_SelectRetire } }; static const SpriteTemplate Unk_020EA0A4[] = { - { - 0xCC, + { 0xCC, 0x14, 0x0, 0x0, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x34D8, 0x34D8, 0x34D8, 0x34D8, 0x0, 0x0}, + { 0x34D8, 0x34D8, 0x34D8, 0x34D8, 0x0, 0x0 }, 0x0, - 0x0 - }, - { - 0xAE, + 0x0 }, + { 0xAE, 0x14, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x34D9, 0x34D8, 0x34D9, 0x34D9, 0x0, 0x0}, + { 0x34D9, 0x34D8, 0x34D9, 0x34D9, 0x0, 0x0 }, 0x0, - 0x0 - } + 0x0 } }; static const u8 Unk_020EA020[] = { @@ -262,7 +254,7 @@ static const u8 Unk_020EA01C[] = { 0x8 }; -BOOL sub_0203A9C8 (FieldSystem * fieldSystem) +BOOL sub_0203A9C8(FieldSystem *fieldSystem) { if (MapHeader_GetMapLabelTextID(fieldSystem->location->mapId) == 0) { return FALSE; @@ -271,9 +263,9 @@ BOOL sub_0203A9C8 (FieldSystem * fieldSystem) return TRUE; } -void FieldMenu_Init (FieldSystem * fieldSystem) +void FieldMenu_Init(FieldSystem *fieldSystem) { - FieldMenu * menu = FieldMenu_Alloc(); + FieldMenu *menu = FieldMenu_Alloc(); if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) { menu->unk_224 = sub_0203AC24(fieldSystem); @@ -294,9 +286,9 @@ void FieldMenu_Init (FieldSystem * fieldSystem) FieldTask_Set(fieldSystem, sub_0203AC44, menu); } -void sub_0203AA78 (FieldSystem * fieldSystem) +void sub_0203AA78(FieldSystem *fieldSystem) { - FieldMenu * menu = FieldMenu_Alloc(); + FieldMenu *menu = FieldMenu_Alloc(); menu->unk_224 = sub_0203AC34(fieldSystem); menu->unk_228 = 1; @@ -308,9 +300,9 @@ void sub_0203AA78 (FieldSystem * fieldSystem) FieldTask_Set(fieldSystem, sub_0203AC44, menu); } -void sub_0203AABC (FieldSystem * fieldSystem) +void sub_0203AABC(FieldSystem *fieldSystem) { - FieldMenu * menu = FieldMenu_Alloc(); + FieldMenu *menu = FieldMenu_Alloc(); menu->unk_224 = sub_0203AC3C(fieldSystem); menu->unk_228 = 0; @@ -322,9 +314,9 @@ void sub_0203AABC (FieldSystem * fieldSystem) FieldTask_Set(fieldSystem, sub_0203AC44, menu); } -void sub_0203AB00 (FieldSystem * fieldSystem) +void sub_0203AB00(FieldSystem *fieldSystem) { - FieldMenu * menu; + FieldMenu *menu; Sound_PlayEffect(1533); menu = FieldMenu_Alloc(); @@ -349,9 +341,9 @@ void sub_0203AB00 (FieldSystem * fieldSystem) FieldTask_Change(fieldSystem->unk_10, sub_0203AC44, menu); } -static FieldMenu * FieldMenu_Alloc (void) +static FieldMenu *FieldMenu_Alloc(void) { - FieldMenu * menu; + FieldMenu *menu; menu = Heap_AllocFromHeap(11, sizeof(FieldMenu)); @@ -362,7 +354,7 @@ static FieldMenu * FieldMenu_Alloc (void) return menu; } -static u32 sub_0203ABD0 (FieldSystem * fieldSystem) +static u32 sub_0203ABD0(FieldSystem *fieldSystem) { u32 v0 = 0; @@ -389,35 +381,35 @@ static u32 sub_0203ABD0 (FieldSystem * fieldSystem) return v0; } -static u32 sub_0203AC24 (FieldSystem * fieldSystem) +static u32 sub_0203AC24(FieldSystem *fieldSystem) { return 0x10 | 0x80; } -static u32 sub_0203AC28 (FieldSystem * fieldSystem) +static u32 sub_0203AC28(FieldSystem *fieldSystem) { return 0x10 | 0x80 | 0x4; } -static u32 sub_0203AC2C (FieldSystem * fieldSystem) +static u32 sub_0203AC2C(FieldSystem *fieldSystem) { return 0x1 | 0x4 | 0x10 | 0x80 | 0x100; } -static u32 sub_0203AC34 (FieldSystem * fieldSystem) +static u32 sub_0203AC34(FieldSystem *fieldSystem) { return 0x10 | 0x100; } -static u32 sub_0203AC3C (FieldSystem * fieldSystem) +static u32 sub_0203AC3C(FieldSystem *fieldSystem) { return 0x10 | 0x1 | 0x80 | 0x100; } -static BOOL sub_0203AC44 (TaskManager * taskMan) +static BOOL sub_0203AC44(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -519,11 +511,11 @@ static BOOL sub_0203AC44 (TaskManager * taskMan) return FALSE; } -static void sub_0203ADFC (TaskManager * taskMan) +static void sub_0203ADFC(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; - MessageLoader * v2; + FieldSystem *fieldSystem; + FieldMenu *menu; + MessageLoader *v2; UnkStruct_02081CF4 v3; u32 v4, v5; @@ -542,9 +534,9 @@ static void sub_0203ADFC (TaskManager * taskMan) for (v4 = 0; v4 < v5; v4++) { if (menu->unk_30[v4] == 3) { - StringTemplate * v6; - Strbuf* v7; - Strbuf* v8; + StringTemplate *v6; + Strbuf *v7; + Strbuf *v8; v6 = StringTemplate_Default(11); v7 = Strbuf_Init(8, 11); @@ -590,7 +582,7 @@ static void sub_0203ADFC (TaskManager * taskMan) sub_0203B318(menu, menu->unk_30, v5, TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData))); } -static u32 FieldMenu_MakeList (FieldMenu * menu, u8 * ret) +static u32 FieldMenu_MakeList(FieldMenu *menu, u8 *ret) { u32 v0 = 0; @@ -642,7 +634,7 @@ static u32 FieldMenu_MakeList (FieldMenu * menu, u8 * ret) return v0; } -static void FieldMenu_Close (FieldMenu * menu) +static void FieldMenu_Close(FieldMenu *menu) { sub_0203B4E8(menu); sub_02001BC4(menu->unk_20, NULL); @@ -651,14 +643,14 @@ static void FieldMenu_Close (FieldMenu * menu) menu->unk_20 = NULL; } -static void sub_0203B094 (TaskManager * taskMan) +static void sub_0203B094(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; - MessageLoader * v2; - StringTemplate * v3; - Strbuf* v4; - Strbuf* v5; + FieldSystem *fieldSystem; + FieldMenu *menu; + MessageLoader *v2; + StringTemplate *v3; + Strbuf *v4; + Strbuf *v5; u8 v6; fieldSystem = TaskManager_FieldSystem(taskMan); @@ -672,7 +664,7 @@ static void sub_0203B094 (TaskManager * taskMan) return; } - BGL_AddWindow(fieldSystem->unk_08, &menu->unk_10, 3, 1, 1, 12, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)))); + BGL_AddWindow(fieldSystem->unk_08, &menu->unk_10, 3, 1, 1, 12, 4, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4))); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 1, 11); Window_Show(&menu->unk_10, 1, 1024 - (18 + 12) - 9, 11); BGL_FillWindow(&menu->unk_10, 15); @@ -693,7 +685,7 @@ static void sub_0203B094 (TaskManager * taskMan) v5 = MessageLoader_GetNewStrbuf(v2, 11); if (v6 == 0) { - u16 * v7 = sub_0203A784(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + u16 *v7 = sub_0203A784(SaveData_GetFieldOverworldState(fieldSystem->saveData)); StringTemplate_SetNumber(v3, 0, *v7, 2, 0, 1); } else { @@ -712,10 +704,10 @@ static void sub_0203B094 (TaskManager * taskMan) sub_0201A9A4(&menu->unk_10); } -static void sub_0203B200 (TaskManager * taskMan) +static void sub_0203B200(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -728,10 +720,10 @@ static void sub_0203B200 (TaskManager * taskMan) BGL_DeleteWindow(&menu->unk_10); } -static BOOL FieldMenu_Select (TaskManager * taskMan) +static BOOL FieldMenu_Select(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; u16 v2; fieldSystem = TaskManager_FieldSystem(taskMan); @@ -768,7 +760,7 @@ static BOOL FieldMenu_Select (TaskManager * taskMan) return TRUE; } -static void sub_0203B2EC (FieldMenu * menu, FieldSystem * fieldSystem) +static void sub_0203B2EC(FieldMenu *menu, FieldSystem *fieldSystem) { if (CommServerClient_IsInitialized()) { if (menu->unk_228) { @@ -780,13 +772,13 @@ static void sub_0203B2EC (FieldMenu * menu, FieldSystem * fieldSystem) } } -static void sub_0203B318 (FieldMenu * menu, u8 * param1, u32 param2, u8 param3) +static void sub_0203B318(FieldMenu *menu, u8 *param1, u32 param2, u8 param3) { UnkStruct_ov104_02241308 v0 = { 8, 1, 2, 2, 0, 0 }; u32 i; - NARC * v2; + NARC *v2; ov5_021D3190(&menu->unk_38, &v0, (7 + 1), 11); @@ -820,7 +812,7 @@ static void sub_0203B318 (FieldMenu * menu, u8 * param1, u32 param2, u8 param3) menu->unk_200[1 + i] = ov5_021D3584(&menu->unk_38, &v3); { - VecFx32 v4 = {FX32_ONE, FX32_ONE, FX32_ONE}; + VecFx32 v4 = { FX32_ONE, FX32_ONE, FX32_ONE }; sub_02021C80(menu->unk_200[1 + i]->unk_00, &v4, 1); } } @@ -833,7 +825,7 @@ static void sub_0203B318 (FieldMenu * menu, u8 * param1, u32 param2, u8 param3) NARC_dtor(v2); } -static void sub_0203B4E8 (FieldMenu * menu) +static void sub_0203B4E8(FieldMenu *menu) { u16 v0; @@ -844,7 +836,7 @@ static void sub_0203B4E8 (FieldMenu * menu) ov5_021D375C(&menu->unk_38); } -static void sub_0203B520 (FieldMenu * menu) +static void sub_0203B520(FieldMenu *menu) { u16 v0; @@ -853,7 +845,7 @@ static void sub_0203B520 (FieldMenu * menu) } } -static void sub_0203B558 (GraphicElementData * graphicElement, u32 param1) +static void sub_0203B558(GraphicElementData *graphicElement, u32 param1) { VecFx32 vec; @@ -863,7 +855,7 @@ static void sub_0203B558 (GraphicElementData * graphicElement, u32 param1) sub_02021C50(graphicElement, &vec); } -static void sub_0203B588 (GraphicElementData * graphicElement, u16 param1, u16 param2) +static void sub_0203B588(GraphicElementData *graphicElement, u16 param1, u16 param2) { u32 v0 = sub_02021E24(graphicElement); @@ -871,13 +863,13 @@ static void sub_0203B588 (GraphicElementData * graphicElement, u16 param1, u16 p sub_02021EC4(graphicElement, param2); } -static void sub_0203B5B4 (FieldMenu * menu, u16 param1, u16 param2) +static void sub_0203B5B4(FieldMenu *menu, u16 param1, u16 param2) { sub_0203B588(menu->unk_200[1 + param1]->unk_00, 0, 0); sub_0203B588(menu->unk_200[1 + param2]->unk_00, 1, 1); } -static void sub_0203B5E8 (GraphicElementData * graphicElement) +static void sub_0203B5E8(GraphicElementData *graphicElement) { if ((sub_02021E24(graphicElement) % 3) != 1) { return; @@ -888,10 +880,10 @@ static void sub_0203B5E8 (GraphicElementData * graphicElement) } } -static void FieldMenu_ApplicationStart (TaskManager * taskMan) +static void FieldMenu_ApplicationStart(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; if (ScreenWipe_Done() == 0) { return; @@ -908,10 +900,10 @@ static void FieldMenu_ApplicationStart (TaskManager * taskMan) menu->state = FIELD_MENU_STATE_APP_RUN; } -static void FieldMenu_ApplicationRun (TaskManager * taskMan) +static void FieldMenu_ApplicationRun(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -923,15 +915,15 @@ static void FieldMenu_ApplicationRun (TaskManager * taskMan) menu->unk_22C(taskMan); } -void sub_0203B674 (FieldMenu * menu, void * param1) +void sub_0203B674(FieldMenu *menu, void *param1) { menu->unk_22C = param1; menu->state = FIELD_MENU_STATE_APP_RUN; } -static BOOL FieldMenu_SelectPokedex (TaskManager * taskMan) +static BOOL FieldMenu_SelectPokedex(TaskManager *taskMan) { - FieldMenu * menu; + FieldMenu *menu; menu = TaskManager_Environment(taskMan); @@ -943,14 +935,14 @@ static BOOL FieldMenu_SelectPokedex (TaskManager * taskMan) return TRUE; } -static BOOL FieldMenu_Pokedex (TaskManager * taskMan) +static BOOL FieldMenu_Pokedex(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; - UnkStruct_ov21_021D0D80 * v2; - PokedexData * v3; - TrainerInfo * v4; - VarsFlags * v5; + FieldSystem *fieldSystem; + FieldMenu *menu; + UnkStruct_ov21_021D0D80 *v2; + PokedexData *v3; + TrainerInfo *v4; + VarsFlags *v5; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -976,10 +968,10 @@ static BOOL FieldMenu_Pokedex (TaskManager * taskMan) return 0; } -static BOOL FieldMenu_PokedexEnd (TaskManager * taskMan) +static BOOL FieldMenu_PokedexEnd(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -995,9 +987,9 @@ static BOOL FieldMenu_PokedexEnd (TaskManager * taskMan) return 0; } -static BOOL FieldMenu_SelectPokemon (TaskManager * taskMan) +static BOOL FieldMenu_SelectPokemon(TaskManager *taskMan) { - FieldMenu * menu; + FieldMenu *menu; menu = TaskManager_Environment(taskMan); @@ -1009,10 +1001,10 @@ static BOOL FieldMenu_SelectPokemon (TaskManager * taskMan) return TRUE; } -static BOOL sub_0203B78C (TaskManager * taskMan) +static BOOL sub_0203B78C(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1023,11 +1015,11 @@ static BOOL sub_0203B78C (TaskManager * taskMan) return 0; } -BOOL sub_0203B7C0 (TaskManager * taskMan) +BOOL sub_0203B7C0(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; - PartyManagementData * partyMan; + FieldSystem *fieldSystem; + FieldMenu *menu; + PartyManagementData *partyMan; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1037,9 +1029,8 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) Heap_FreeToHeap(menu->unk_25C); switch (partyMan->unk_23) { - case 1: - { - PokemonSummary * v3 = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); + case 1: { + PokemonSummary *v3 = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); v3->monData = Party_GetFromSavedata(fieldSystem->saveData); v3->options = SaveData_Options(fieldSystem->saveData); @@ -1059,11 +1050,9 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) menu->unk_25C = v3; sub_0203B674(menu, sub_0203C1C8); - } - break; - case 4: - { - PokemonSummary * v4 = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); + } break; + case 4: { + PokemonSummary *v4 = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); v4->monData = Party_GetFromSavedata(fieldSystem->saveData); v4->options = SaveData_Options(fieldSystem->saveData); @@ -1081,7 +1070,7 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) sub_0203D334(fieldSystem, v4); { - UnkStruct_0203C1C8 * v5 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203C1C8)); + UnkStruct_0203C1C8 *v5 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203C1C8)); v5->unk_00 = partyMan->unk_24; v5->unk_02 = 0; @@ -1090,11 +1079,9 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) menu->unk_25C = v4; sub_0203B674(menu, sub_0203C1C8); - } - break; - case 5: - { - PokemonSummary * v6 = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); + } break; + case 5: { + PokemonSummary *v6 = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); v6->monData = Party_GetFromSavedata(fieldSystem->saveData); v6->options = SaveData_Options(fieldSystem->saveData); @@ -1112,7 +1099,7 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) sub_0203D334(fieldSystem, v6); { - UnkStruct_0203C1C8 * v7 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203C1C8)); + UnkStruct_0203C1C8 *v7 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203C1C8)); v7->unk_00 = 0; v7->unk_02 = (u16)partyMan->unk_34; @@ -1121,11 +1108,9 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) menu->unk_25C = v6; sub_0203B674(menu, sub_0203C1C8); - } - break; - case 6: - { - UnkStruct_02097728 * v8; + } break; + case 6: { + UnkStruct_02097728 *v8; v8 = sub_0203D920(fieldSystem, 2, partyMan->unk_22, Item_MailNumber(partyMan->unk_24), 11); menu->unk_25C = v8; @@ -1139,12 +1124,10 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) } sub_0203B674(menu, sub_0203C558); - } - break; - case 7: - { - UnkStruct_02097728 * v9; - Pokemon * v10; + } break; + case 7: { + UnkStruct_02097728 *v9; + Pokemon *v10; v10 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), partyMan->unk_22); v9 = sub_0203D984(fieldSystem, v10, 11); @@ -1153,13 +1136,11 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) menu->unk_260 = sub_0203C540(partyMan->unk_24, 2, partyMan->unk_22); sub_0203B674(menu, sub_0203C558); - } - break; - case 3: - { - Bag * v11; - void * v12; - u32 * v13; + } break; + case 3: { + Bag *v11; + void *v12; + u32 *v13; v13 = (u32 *)Heap_AllocFromHeap(11, 4); *v13 = partyMan->unk_22; @@ -1175,9 +1156,8 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) sub_0203D1E4(fieldSystem, menu->unk_25C); sub_0203B674(menu, sub_0203BC5C); break; - case 8: - { - UnkStruct_0203C7B8 * v14 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203C7B8)); + case 8: { + UnkStruct_0203C7B8 *v14 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203C7B8)); v14->unk_02 = partyMan->unk_24; v14->unk_01 = 3; @@ -1187,11 +1167,9 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) menu->unk_25C = v14; menu->state = FIELD_MENU_STATE_EVOLVE_INIT; - } - break; - case 9: - { - UnkStruct_0203C7B8 * v15 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203C7B8)); + } break; + case 9: { + UnkStruct_0203C7B8 *v15 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203C7B8)); v15->unk_02 = MapHeader_GetMapEvolutionMethod(fieldSystem->location->mapId); v15->unk_01 = 0; @@ -1200,8 +1178,7 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) v15->unk_08 = partyMan->unk_3C; menu->unk_25C = v15; menu->state = FIELD_MENU_STATE_EVOLVE_INIT; - } - break; + } break; case 16: case 11: case 12: @@ -1214,8 +1191,7 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) case 20: case 21: case 22: - case 23: - { + case 23: { UnkFuncPtr_0203B7C0 v16; UnkStruct_020709CC v17; @@ -1225,8 +1201,7 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) v16 = (UnkFuncPtr_0203B7C0)sub_0207070C(0, v17.unk_06); v16(&v17, &menu->unk_24C); - } - break; + } break; case 10: menu->unk_25C = sub_0203D20C(fieldSystem, &menu->unk_230); sub_0203B674(menu, sub_0203BC5C); @@ -1256,9 +1231,9 @@ BOOL sub_0203B7C0 (TaskManager * taskMan) return 0; } -static BOOL FieldMenu_SelectBag (TaskManager * taskMan) +static BOOL FieldMenu_SelectBag(TaskManager *taskMan) { - FieldMenu * menu; + FieldMenu *menu; menu = TaskManager_Environment(taskMan); @@ -1270,10 +1245,10 @@ static BOOL FieldMenu_SelectBag (TaskManager * taskMan) return TRUE; } -static BOOL FieldMenu_Bag (TaskManager * taskMan) +static BOOL FieldMenu_Bag(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1287,11 +1262,11 @@ static BOOL FieldMenu_Bag (TaskManager * taskMan) return 0; } -static BOOL sub_0203BC5C (TaskManager * taskMan) +static BOOL sub_0203BC5C(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; - UnkStruct_0207CB08 * v2; + FieldSystem *fieldSystem; + FieldMenu *menu; + UnkStruct_0207CB08 *v2; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1301,8 +1276,7 @@ static BOOL sub_0203BC5C (TaskManager * taskMan) Heap_FreeToHeap(menu->unk_25C); switch (sub_0207CB9C(v2)) { - case 0: - { + case 0: { UnkFuncPtr_0203BC5C v3; UnkStruct_02068630 v4; s32 v5; @@ -1313,14 +1287,12 @@ static BOOL sub_0203BC5C (TaskManager * taskMan) v5 = Item_LoadParam(v4.unk_04, 6, 11); v3 = (UnkFuncPtr_0203BC5C)sub_020683F4(0, v5); v3(&v4, &menu->unk_230); - } - break; + } break; case 1: sub_0203C2D8(taskMan, sub_0207CB94(v2)); break; - case 2: - { - PartyManagementData * v6; + case 2: { + PartyManagementData *v6; v6 = Heap_AllocFromHeap(11, sizeof(PartyManagementData)); memset(v6, 0, sizeof(PartyManagementData)); @@ -1338,12 +1310,10 @@ static BOOL sub_0203BC5C (TaskManager * taskMan) sub_0203CD84(fieldSystem, &Unk_020F1E88, v6); menu->unk_25C = v6; sub_0203B674(menu, sub_0203B7C0); - } - break; - case 4: - { - Party * v7; - Pokemon * v8; + } break; + case 4: { + Party *v7; + Pokemon *v8; u32 v9; u16 v10; @@ -1355,15 +1325,15 @@ static BOOL sub_0203BC5C (TaskManager * taskMan) Heap_FreeToHeap(menu->unk_260); if ((Item_IsMail(v10) == 1) && (Pokemon_GetValue(v8, MON_DATA_HELD_ITEM, NULL) == 0)) { - UnkStruct_02097728 * v11; - UnkStruct_0203C540 * v12; + UnkStruct_02097728 *v11; + UnkStruct_0203C540 *v12; v11 = sub_0203D920(fieldSystem, 2, v9, Item_MailNumber(v10), 11); menu->unk_25C = v11; menu->unk_260 = sub_0203C540(v10, 0, (u8)v9); sub_0203B674(menu, sub_0203C558); } else { - PartyManagementData * v13; + PartyManagementData *v13; v13 = Heap_AllocFromHeap(11, sizeof(PartyManagementData)); memset(v13, 0, sizeof(PartyManagementData)); @@ -1388,8 +1358,7 @@ static BOOL sub_0203BC5C (TaskManager * taskMan) menu->unk_25C = v13; sub_0203B674(menu, sub_0203B7C0); } - } - break; + } break; case 5: default: sub_020509D4(fieldSystem); @@ -1401,9 +1370,9 @@ static BOOL sub_0203BC5C (TaskManager * taskMan) return 0; } -static BOOL FieldMenu_SelectTrainerCard (TaskManager * taskMan) +static BOOL FieldMenu_SelectTrainerCard(TaskManager *taskMan) { - FieldMenu * menu; + FieldMenu *menu; menu = TaskManager_Environment(taskMan); @@ -1415,10 +1384,10 @@ static BOOL FieldMenu_SelectTrainerCard (TaskManager * taskMan) return TRUE; } -static BOOL FieldMenu_TrainerCard (TaskManager * taskMan) +static BOOL FieldMenu_TrainerCard(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1432,10 +1401,10 @@ static BOOL FieldMenu_TrainerCard (TaskManager * taskMan) return 0; } -static BOOL sub_0203BF00 (TaskManager * taskMan) +static BOOL sub_0203BF00(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1449,9 +1418,9 @@ static BOOL sub_0203BF00 (TaskManager * taskMan) return 0; } -static BOOL FieldMenu_SelectSave (TaskManager * taskMan) +static BOOL FieldMenu_SelectSave(TaskManager *taskMan) { - FieldMenu * menu = TaskManager_Environment(taskMan); + FieldMenu *menu = TaskManager_Environment(taskMan); FieldMenu_Close(menu); Window_Clear(&menu->unk_00, 1); @@ -1464,11 +1433,11 @@ static BOOL FieldMenu_SelectSave (TaskManager * taskMan) return TRUE; } -static void FieldMenu_Save (TaskManager * taskMan) +static void FieldMenu_Save(TaskManager *taskMan) { - FieldMenu * menu = TaskManager_Environment(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - SaveMenu * saveMenu; + FieldMenu *menu = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + SaveMenu *saveMenu; if (SaveData_OverwriteCheck(fieldSystem->saveData)) { sub_0203E8E0(taskMan, 2034, NULL, NULL); @@ -1483,11 +1452,11 @@ static void FieldMenu_Save (TaskManager * taskMan) menu->state = FIELD_MENU_STATE_SAVE_WAIT; } -static void FieldMenu_SaveWait (TaskManager * taskMan) +static void FieldMenu_SaveWait(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - FieldMenu * menu = TaskManager_Environment(taskMan); - SaveMenu * saveMenu = menu->unk_25C; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + FieldMenu *menu = TaskManager_Environment(taskMan); + SaveMenu *saveMenu = menu->unk_25C; if (SaveData_OverwriteCheck(fieldSystem->saveData)) { menu->state = FIELD_MENU_STATE_INIT; @@ -1502,9 +1471,9 @@ static void FieldMenu_SaveWait (TaskManager * taskMan) } } -static BOOL FieldMenu_SelectOptions (TaskManager * taskMan) +static BOOL FieldMenu_SelectOptions(TaskManager *taskMan) { - FieldMenu * menu; + FieldMenu *menu; menu = TaskManager_Environment(taskMan); @@ -1516,10 +1485,10 @@ static BOOL FieldMenu_SelectOptions (TaskManager * taskMan) return TRUE; } -static BOOL FieldMenu_Options (TaskManager * taskMan) +static BOOL FieldMenu_Options(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1530,10 +1499,10 @@ static BOOL FieldMenu_Options (TaskManager * taskMan) return FALSE; } -static BOOL sub_0203C050 (TaskManager * taskMan) +static BOOL sub_0203C050(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1546,9 +1515,9 @@ static BOOL sub_0203C050 (TaskManager * taskMan) return 0; } -static BOOL FieldMenu_SelectChat (TaskManager * taskMan) +static BOOL FieldMenu_SelectChat(TaskManager *taskMan) { - FieldMenu * menu; + FieldMenu *menu; menu = TaskManager_Environment(taskMan); @@ -1560,10 +1529,10 @@ static BOOL FieldMenu_SelectChat (TaskManager * taskMan) return 1; } -static BOOL sub_0203C0A0 (TaskManager * taskMan) +static BOOL sub_0203C0A0(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; Sentence v2; fieldSystem = TaskManager_FieldSystem(taskMan); @@ -1580,11 +1549,11 @@ static BOOL sub_0203C0A0 (TaskManager * taskMan) return 0; } -static BOOL sub_0203C0F8 (TaskManager * taskMan) +static BOOL sub_0203C0F8(TaskManager *taskMan) { Sentence sentence; - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1609,10 +1578,10 @@ static BOOL sub_0203C0F8 (TaskManager * taskMan) return 0; } -static BOOL FieldMenu_SelectRetire (TaskManager * taskMan) +static BOOL FieldMenu_SelectRetire(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1633,11 +1602,11 @@ static BOOL FieldMenu_SelectRetire (TaskManager * taskMan) return 0; } -static BOOL sub_0203C1C8 (TaskManager * taskMan) +static BOOL sub_0203C1C8(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; - PokemonSummary * v2; + FieldSystem *fieldSystem; + FieldMenu *menu; + PokemonSummary *v2; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1647,10 +1616,9 @@ static BOOL sub_0203C1C8 (TaskManager * taskMan) Heap_FreeToHeap(menu->unk_25C); switch (v2->mode) { - case 2: - { - PartyManagementData * v3; - UnkStruct_0203C1C8 * v4; + case 2: { + PartyManagementData *v3; + UnkStruct_0203C1C8 *v4; v3 = Heap_AllocFromHeap(11, sizeof(PartyManagementData)); v4 = (UnkStruct_0203C1C8 *)menu->unk_260; @@ -1682,8 +1650,7 @@ static BOOL sub_0203C1C8 (TaskManager * taskMan) Heap_FreeToHeap(menu->unk_260); menu->unk_25C = v3; sub_0203B674(menu, sub_0203B7C0); - } - break; + } break; default: menu->unk_25C = sub_0203D390(fieldSystem, &menu->unk_24C, v2->pos); sub_0203B674(menu, sub_0203B7C0); @@ -1694,11 +1661,11 @@ static BOOL sub_0203C1C8 (TaskManager * taskMan) return 0; } -static void sub_0203C2D8 (TaskManager * taskMan, u16 param1) +static void sub_0203C2D8(TaskManager *taskMan, u16 param1) { - FieldSystem * fieldSystem; - FieldMenu * menu; - Bag * v2; + FieldSystem *fieldSystem; + FieldMenu *menu; + Bag *v2; u8 v3; u8 v4, v5, v6; @@ -1726,10 +1693,10 @@ static void sub_0203C2D8 (TaskManager * taskMan, u16 param1) sub_0203B674(menu, sub_0203C390); } -static BOOL sub_0203C390 (TaskManager * taskMan) +static BOOL sub_0203C390(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; u8 v2, v3; fieldSystem = TaskManager_FieldSystem(taskMan); @@ -1745,10 +1712,10 @@ static BOOL sub_0203C390 (TaskManager * taskMan) return 0; } -BOOL sub_0203C3F4 (TaskManager * taskMan) +BOOL sub_0203C3F4(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1760,11 +1727,11 @@ BOOL sub_0203C3F4 (TaskManager * taskMan) return 0; } -BOOL sub_0203C434 (TaskManager * taskMan) +BOOL sub_0203C434(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; - UnkStruct_0203D8AC * v2; + FieldSystem *fieldSystem; + FieldMenu *menu; + UnkStruct_0203D8AC *v2; u32 v3; fieldSystem = TaskManager_FieldSystem(taskMan); @@ -1780,9 +1747,9 @@ BOOL sub_0203C434 (TaskManager * taskMan) menu->unk_25C = sub_0203D390(fieldSystem, &menu->unk_24C, v3); sub_0203B674(menu, sub_0203B7C0); } else { - Pokemon * v4; - void * v5; - void * v6; + Pokemon *v4; + void *v5; + void *v6; v4 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), v3); v5 = sub_0207064C(11, fieldSystem, v4, v2->unk_1C, v2->unk_14 * 32 + 16, v2->unk_18 * 32 + 16); @@ -1800,10 +1767,10 @@ BOOL sub_0203C434 (TaskManager * taskMan) return 0; } -BOOL sub_0203C50C (TaskManager * taskMan) +BOOL sub_0203C50C(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1814,11 +1781,11 @@ BOOL sub_0203C50C (TaskManager * taskMan) return 0; } -static void sub_0203C668(FieldSystem * fieldSystem, FieldMenu * param1, u8 param2); +static void sub_0203C668(FieldSystem *fieldSystem, FieldMenu *param1, u8 param2); -void * sub_0203C540 (u16 fieldSystem, u8 param1, u8 param2) +void *sub_0203C540(u16 fieldSystem, u8 param1, u8 param2) { - UnkStruct_0203C540 * v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203C540)); + UnkStruct_0203C540 *v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203C540)); v0->unk_00 = fieldSystem; v0->unk_02 = param2; @@ -1827,11 +1794,11 @@ void * sub_0203C540 (u16 fieldSystem, u8 param1, u8 param2) return (void *)v0; } -BOOL sub_0203C558 (TaskManager * taskMan) +BOOL sub_0203C558(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; - UnkStruct_0203C540 * v2; + FieldSystem *fieldSystem; + FieldMenu *menu; + UnkStruct_0203C540 *v2; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1872,10 +1839,10 @@ BOOL sub_0203C558 (TaskManager * taskMan) return 0; } -static void sub_0203C668 (FieldSystem * fieldSystem, FieldMenu * param1, u8 param2) +static void sub_0203C668(FieldSystem *fieldSystem, FieldMenu *param1, u8 param2) { - UnkStruct_0203C540 * v0; - PartyManagementData * partyMan; + UnkStruct_0203C540 *v0; + PartyManagementData *partyMan; v0 = param1->unk_260; partyMan = Heap_AllocFromHeap(11, sizeof(PartyManagementData)); @@ -1900,10 +1867,10 @@ static void sub_0203C668 (FieldSystem * fieldSystem, FieldMenu * param1, u8 para sub_0203B674(param1, sub_0203B7C0); } -BOOL sub_0203C710 (TaskManager * taskMan) +BOOL sub_0203C710(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1916,10 +1883,10 @@ BOOL sub_0203C710 (TaskManager * taskMan) return 0; } -BOOL sub_0203C750 (TaskManager * taskMan) +BOOL sub_0203C750(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1930,10 +1897,10 @@ BOOL sub_0203C750 (TaskManager * taskMan) return 0; } -BOOL sub_0203C784 (TaskManager * taskMan) +BOOL sub_0203C784(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1944,14 +1911,14 @@ BOOL sub_0203C784 (TaskManager * taskMan) return 0; } -static void FieldMenu_EvolveInit (TaskManager * taskMan) +static void FieldMenu_EvolveInit(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; - UnkStruct_0203C7B8 * v2; - Party * v3; - Pokemon * v4; - UnkStruct_0207AE68 * v5; + FieldSystem *fieldSystem; + FieldMenu *menu; + UnkStruct_0203C7B8 *v2; + Party *v3; + Pokemon *v4; + UnkStruct_0207AE68 *v5; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); @@ -1970,7 +1937,7 @@ static void FieldMenu_EvolveInit (TaskManager * taskMan) } { - u32 * v6 = Heap_AllocFromHeap(11, 4); + u32 *v6 = Heap_AllocFromHeap(11, 4); *v6 = v2->unk_00; menu->unk_260 = v6; @@ -1982,10 +1949,10 @@ static void FieldMenu_EvolveInit (TaskManager * taskMan) menu->state = FIELD_MENU_STATE_EVOLVE; } -static void FieldMenu_Evolve (TaskManager * taskMan) +static void FieldMenu_Evolve(TaskManager *taskMan) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(taskMan); menu = TaskManager_Environment(taskMan); diff --git a/src/field_overworld_state.c b/src/field_overworld_state.c index d8c5791161..e36df690c8 100644 --- a/src/field_overworld_state.c +++ b/src/field_overworld_state.c @@ -1,20 +1,20 @@ +#include "field_overworld_state.h" + #include #include -#include "savedata.h" - -#include "field/field_system.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_020556C4.h" #include "struct_defs/struct_0205EC34.h" #include "struct_defs/struct_02061D3C.h" +#include "field/field_system.h" + +#include "map_object.h" +#include "player_avatar.h" #include "savedata.h" -#include "field_overworld_state.h" #include "unk_0203A7D8.h" #include "unk_020556C4.h" -#include "player_avatar.h" -#include "map_object.h" typedef struct UnkStruct_0203A790_t { Location unk_00; @@ -39,22 +39,22 @@ typedef struct UnkStruct_0203A79C_t { MapObjectSave unk_00[64]; } FieldOverworldSave; -int FieldOverworldState_Size (void) +int FieldOverworldState_Size(void) { return sizeof(FieldOverworldState); } -int FieldOverworldSave_Size (void) +int FieldOverworldSave_Size(void) { return sizeof(FieldOverworldSave); } -void FieldOverworldSave_Init (FieldOverworldSave * fieldState) +void FieldOverworldSave_Init(FieldOverworldSave *fieldState) { MI_CpuClear32(fieldState, sizeof(FieldOverworldSave)); } -void FieldOverworldState_Init (FieldOverworldState * fieldState) +void FieldOverworldState_Init(FieldOverworldState *fieldState) { memset(fieldState, 0, sizeof(FieldOverworldState)); @@ -64,117 +64,117 @@ void FieldOverworldState_Init (FieldOverworldState * fieldState) fieldState->warpId = sub_0203A7EC(); } -Location * sub_0203A720 (FieldOverworldState * fieldState) +Location *sub_0203A720(FieldOverworldState *fieldState) { return &fieldState->unk_00; } -Location * FieldOverworldState_GetEntranceLocation (FieldOverworldState * fieldState) +Location *FieldOverworldState_GetEntranceLocation(FieldOverworldState *fieldState) { return &fieldState->entrance; } -Location * FieldOverworldState_GetPrevLocation (FieldOverworldState * fieldState) +Location *FieldOverworldState_GetPrevLocation(FieldOverworldState *fieldState) { return &fieldState->previous; } -Location * sub_0203A72C (FieldOverworldState * fieldState) +Location *sub_0203A72C(FieldOverworldState *fieldState) { return &fieldState->unk_50; } -Location * sub_0203A730 (FieldOverworldState * fieldState) +Location *sub_0203A730(FieldOverworldState *fieldState) { return &fieldState->unk_3C; } -void sub_0203A734 (FieldOverworldState * fieldState, Location * param1) +void sub_0203A734(FieldOverworldState *fieldState, Location *param1) { fieldState->unk_3C = *param1; return; } -u16 * sub_0203A748 (FieldOverworldState * fieldState) +u16 *sub_0203A748(FieldOverworldState *fieldState) { return &fieldState->unk_64; } -u16 FieldOverworldState_GetWeather (const FieldOverworldState * fieldState) +u16 FieldOverworldState_GetWeather(const FieldOverworldState *fieldState) { return fieldState->weather; } -void FieldOverworldState_SetWeather (FieldOverworldState * fieldState, u16 weather) +void FieldOverworldState_SetWeather(FieldOverworldState *fieldState, u16 weather) { fieldState->weather = weather; } -u16 FieldOverworldState_GetWarpId (const FieldOverworldState * fieldState) +u16 FieldOverworldState_GetWarpId(const FieldOverworldState *fieldState) { return fieldState->warpId; } -void FieldOverworldState_SetWarpId (FieldOverworldState * fieldState, u16 warpId) +void FieldOverworldState_SetWarpId(FieldOverworldState *fieldState, u16 warpId) { fieldState->warpId = warpId; } -UnkStruct_020556C4 * sub_0203A76C (FieldOverworldState * fieldState) +UnkStruct_020556C4 *sub_0203A76C(FieldOverworldState *fieldState) { return &fieldState->unk_6C; } -int FieldOverworldState_GetCameraType (const FieldOverworldState * fieldState) +int FieldOverworldState_GetCameraType(const FieldOverworldState *fieldState) { return fieldState->cameraType; } -void FieldOverworldState_SetCameraType (FieldOverworldState * fieldState, int param1) +void FieldOverworldState_SetCameraType(FieldOverworldState *fieldState, int param1) { fieldState->cameraType = param1; } -PlayerData * FieldOverworldState_GetPlayerData (FieldOverworldState * fieldState) +PlayerData *FieldOverworldState_GetPlayerData(FieldOverworldState *fieldState) { return &fieldState->playerData; } -u16 * sub_0203A784 (FieldOverworldState * fieldState) +u16 *sub_0203A784(FieldOverworldState *fieldState) { return &fieldState->unk_98; } -u16 * sub_0203A788 (FieldOverworldState * fieldState) +u16 *sub_0203A788(FieldOverworldState *fieldState) { return &fieldState->unk_96; } -u16 * sub_0203A78C (FieldOverworldState * fieldState) +u16 *sub_0203A78C(FieldOverworldState *fieldState) { return &fieldState->unk_94; } -FieldOverworldState * SaveData_GetFieldOverworldState (SaveData * saveData) +FieldOverworldState *SaveData_GetFieldOverworldState(SaveData *saveData) { - FieldOverworldState * fieldState = SaveData_SaveTable(saveData, 6); + FieldOverworldState *fieldState = SaveData_SaveTable(saveData, 6); return fieldState; } -FieldOverworldSave * SaveData_GetFieldOverworldSave (SaveData * saveData) +FieldOverworldSave *SaveData_GetFieldOverworldSave(SaveData *saveData) { - FieldOverworldSave * fieldSave = SaveData_SaveTable(saveData, 11); + FieldOverworldSave *fieldSave = SaveData_SaveTable(saveData, 11); return fieldSave; } -void FieldSystem_SaveObjects (FieldSystem * fieldSystem) +void FieldSystem_SaveObjects(FieldSystem *fieldSystem) { - MapObjectSave * mapObjSave = ((FieldOverworldSave *)SaveData_GetFieldOverworldSave(fieldSystem->saveData))->unk_00; + MapObjectSave *mapObjSave = ((FieldOverworldSave *)SaveData_GetFieldOverworldSave(fieldSystem->saveData))->unk_00; MapObjectMan_SaveAll(fieldSystem, fieldSystem->mapObjMan, mapObjSave, 64); } -void FieldSystem_LoadObjects (FieldSystem * fieldSystem) +void FieldSystem_LoadObjects(FieldSystem *fieldSystem) { - MapObjectSave * mapObjSave = ((FieldOverworldSave *)SaveData_GetFieldOverworldSave(fieldSystem->saveData))->unk_00; + MapObjectSave *mapObjSave = ((FieldOverworldSave *)SaveData_GetFieldOverworldSave(fieldSystem->saveData))->unk_00; MapObjectMan_LoadAllObjects(fieldSystem->mapObjMan, mapObjSave, 64); } diff --git a/src/field_script_context.c b/src/field_script_context.c index 241f8da422..da300ab97b 100644 --- a/src/field_script_context.c +++ b/src/field_script_context.c @@ -1,15 +1,15 @@ +#include "field_script_context.h" + #include #include -#include "field_script_context.h" - enum { SCRIPT_STATE_STOPPED, SCRIPT_STATE_RUNNING, SCRIPT_STATE_WAITING, }; -void ScriptContext_Init (ScriptContext * ctx, const ScrCmdFunc * cmdTable, u32 cmdTableSize) +void ScriptContext_Init(ScriptContext *ctx, const ScrCmdFunc *cmdTable, u32 cmdTableSize) { ctx->state = SCRIPT_STATE_STOPPED; ctx->scriptPtr = NULL; @@ -30,7 +30,7 @@ void ScriptContext_Init (ScriptContext * ctx, const ScrCmdFunc * cmdTable, u32 c ctx->taskManager = NULL; } -BOOL ScriptContext_Start (ScriptContext * ctx, const u8 * ptr) +BOOL ScriptContext_Start(ScriptContext *ctx, const u8 *ptr) { ctx->scriptPtr = ptr; ctx->state = SCRIPT_STATE_RUNNING; @@ -38,24 +38,24 @@ BOOL ScriptContext_Start (ScriptContext * ctx, const u8 * ptr) return TRUE; } -void ScriptContext_Pause (ScriptContext * ctx, ShouldResumeScriptFunc shouldResume) +void ScriptContext_Pause(ScriptContext *ctx, ShouldResumeScriptFunc shouldResume) { ctx->state = SCRIPT_STATE_WAITING; ctx->shouldResume = shouldResume; } -void ScriptContext_Stop (ScriptContext * ctx) +void ScriptContext_Stop(ScriptContext *ctx) { ctx->state = SCRIPT_STATE_STOPPED; ctx->scriptPtr = NULL; } -void ScriptContext_SetTaskManager (ScriptContext * ctx, TaskManager * taskManager) +void ScriptContext_SetTaskManager(ScriptContext *ctx, TaskManager *taskManager) { ctx->taskManager = taskManager; } -BOOL ScriptContext_Run (ScriptContext * ctx) +BOOL ScriptContext_Run(ScriptContext *ctx) { if (ctx->state == SCRIPT_STATE_STOPPED) { return FALSE; @@ -97,7 +97,7 @@ BOOL ScriptContext_Run (ScriptContext * ctx) return TRUE; } -static BOOL ScriptContext_Push (ScriptContext * ctx, const u8 * ptr) +static BOOL ScriptContext_Push(ScriptContext *ctx, const u8 *ptr) { if (ctx->stackPointer + 1 >= (int)NELEMS(ctx->stack)) { return TRUE; @@ -109,7 +109,7 @@ static BOOL ScriptContext_Push (ScriptContext * ctx, const u8 * ptr) return FALSE; } -static const u8 * ScriptContext_Pop (ScriptContext * ctx) +static const u8 *ScriptContext_Pop(ScriptContext *ctx) { if (ctx->stackPointer == 0) { return NULL; @@ -118,23 +118,23 @@ static const u8 * ScriptContext_Pop (ScriptContext * ctx) return ctx->stack[--ctx->stackPointer]; } -void ScriptContext_Jump (ScriptContext * ctx, const u8 * ptr) +void ScriptContext_Jump(ScriptContext *ctx, const u8 *ptr) { ctx->scriptPtr = ptr; } -void ScriptContext_Call (ScriptContext * ctx, const u8 * ptr) +void ScriptContext_Call(ScriptContext *ctx, const u8 *ptr) { ScriptContext_Push(ctx, ctx->scriptPtr); ctx->scriptPtr = ptr; } -void ScriptContext_Return (ScriptContext * ctx) +void ScriptContext_Return(ScriptContext *ctx) { ctx->scriptPtr = ScriptContext_Pop(ctx); } -u16 ScriptContext_ReadHalfWord (ScriptContext * ctx) +u16 ScriptContext_ReadHalfWord(ScriptContext *ctx) { u16 value = ScriptContext_ReadByte(ctx); value += ScriptContext_ReadByte(ctx) << 8; @@ -142,7 +142,7 @@ u16 ScriptContext_ReadHalfWord (ScriptContext * ctx) return value; } -u32 ScriptContext_ReadWord (ScriptContext * ctx) +u32 ScriptContext_ReadWord(ScriptContext *ctx) { u8 byte0 = ScriptContext_ReadByte(ctx); u8 byte1 = ScriptContext_ReadByte(ctx); diff --git a/src/field_system.c b/src/field_system.c index 117c337bd3..8311efa64e 100644 --- a/src/field_system.c +++ b/src/field_system.c @@ -1,63 +1,62 @@ +#include "field/field_system.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02018340_decl.h" -#include "field/field_system_sub1_decl.h" -#include "savedata.h" -#include "overlay025/poketch_system.h" +#include "struct_defs/struct_0203CC84.h" +#include "field/field_system_sub1_decl.h" +#include "field/field_system_sub2_t.h" #include "overlay005/const_ov5_021F89B0.h" +#include "overlay005/field_control.h" +#include "overlay005/ov5_021DD6FC.h" +#include "overlay005/ov5_021DFB54.h" +#include "overlay005/ov5_021E1B08.h" +#include "overlay005/ov5_021EA714.h" +#include "overlay025/poketch_system.h" #include "overlay077/const_ov77_021D742C.h" -#include "struct_defs/struct_0203CC84.h" -#include "field/field_system.h" -#include "field/field_system_sub2_t.h" - -#include "unk_02000C88.h" -#include "game_overlay.h" -#include "overlay_manager.h" -#include "heap.h" +#include "bag.h" +#include "comm_player_manager.h" #include "communication_system.h" -#include "unk_02039C80.h" -#include "map_header_data.h" +#include "core_sys.h" +#include "field_map_change.h" #include "field_overworld_state.h" #include "field_system.h" +#include "game_overlay.h" +#include "heap.h" +#include "map_header_data.h" +#include "overlay_manager.h" +#include "pokeradar.h" +#include "savedata.h" +#include "unk_02000C88.h" +#include "unk_02039C80.h" #include "unk_020508D4.h" -#include "field_map_change.h" -#include "comm_player_manager.h" #include "unk_0205F180.h" -#include "pokeradar.h" -#include "bag.h" #include "unk_0209ACBC.h" #include "unk_0209C370.h" -#include "overlay005/field_control.h" -#include "overlay005/ov5_021DD6FC.h" -#include "overlay005/ov5_021DFB54.h" -#include "overlay005/ov5_021E1B08.h" -#include "overlay005/ov5_021EA714.h" FS_EXTERN_OVERLAY(overlay5); FS_EXTERN_OVERLAY(overlay77); typedef struct FieldSystem_sub1_t { - OverlayManager * unk_00; - OverlayManager * unk_04; + OverlayManager *unk_00; + OverlayManager *unk_04; BOOL unk_08; BOOL unk_0C; }; -static FieldSystem * FieldSystem_Init(OverlayManager * param0); -static BOOL FieldSystem_Run(FieldSystem * fieldSystem); -static void sub_0203CE6C(OverlayManager * param0); -static void FieldSystem_Control(FieldSystem * fieldSystem); +static FieldSystem *FieldSystem_Init(OverlayManager *param0); +static BOOL FieldSystem_Run(FieldSystem *fieldSystem); +static void sub_0203CE6C(OverlayManager *param0); +static void FieldSystem_Control(FieldSystem *fieldSystem); -static FieldSystem * sFieldSystem; +static FieldSystem *sFieldSystem; -static int FieldSystem_InitContinue (OverlayManager * overlayMan, int * param1) +static int FieldSystem_InitContinue(OverlayManager *overlayMan, int *param1) { - UnkStruct_0203CC84 * v0 = OverlayManager_Args(overlayMan); + UnkStruct_0203CC84 *v0 = OverlayManager_Args(overlayMan); sFieldSystem = FieldSystem_Init(overlayMan); @@ -71,16 +70,16 @@ static int FieldSystem_InitContinue (OverlayManager * overlayMan, int * param1) return 1; } -static int FieldSystem_InitNewGame (OverlayManager * overlayMan, int * param1) +static int FieldSystem_InitNewGame(OverlayManager *overlayMan, int *param1) { sFieldSystem = FieldSystem_Init(overlayMan); FieldSystem_SetLoadNewGameSpawnTask(sFieldSystem); return 1; } -static int FieldSystem_Main (OverlayManager * overlayMan, int * param1) +static int FieldSystem_Main(OverlayManager *overlayMan, int *param1) { - FieldSystem * fieldSystem = OverlayManager_Data(overlayMan); + FieldSystem *fieldSystem = OverlayManager_Data(overlayMan); if (FieldSystem_Run(fieldSystem)) { return 1; @@ -89,7 +88,7 @@ static int FieldSystem_Main (OverlayManager * overlayMan, int * param1) } } -static int FieldSystem_Exit (OverlayManager * overlayMan, int * param1) +static int FieldSystem_Exit(OverlayManager *overlayMan, int *param1) { sub_0203CE6C(overlayMan); sub_02000EC4(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D742C); @@ -110,7 +109,7 @@ const OverlayManagerTemplate gFieldSystemContinueTemplate = { 0xffffffff }; -void sub_0203CD00 (FieldSystem * fieldSystem) +void sub_0203CD00(FieldSystem *fieldSystem) { GF_ASSERT(fieldSystem->unk_00->unk_04 == NULL); GF_ASSERT(fieldSystem->unk_00->unk_00 == NULL); @@ -121,17 +120,17 @@ void sub_0203CD00 (FieldSystem * fieldSystem) fieldSystem->unk_00->unk_00 = OverlayManager_New(&gFieldMapTemplate, fieldSystem, 11); } -void sub_0203CD44 (FieldSystem * fieldSystem) +void sub_0203CD44(FieldSystem *fieldSystem) { fieldSystem->unk_68 = 0; } -BOOL sub_0203CD4C (FieldSystem * fieldSystem) +BOOL sub_0203CD4C(FieldSystem *fieldSystem) { return fieldSystem->unk_00->unk_00 != NULL; } -BOOL sub_0203CD5C (FieldSystem * fieldSystem) +BOOL sub_0203CD5C(FieldSystem *fieldSystem) { if ((fieldSystem->unk_00->unk_00 != NULL) && fieldSystem->unk_68) { return 1; @@ -140,22 +139,22 @@ BOOL sub_0203CD5C (FieldSystem * fieldSystem) } } -BOOL sub_0203CD74 (FieldSystem * fieldSystem) +BOOL sub_0203CD74(FieldSystem *fieldSystem) { return fieldSystem->unk_00->unk_04 != NULL; } -void sub_0203CD84 (FieldSystem * fieldSystem, const OverlayManagerTemplate * param1, void * param2) +void sub_0203CD84(FieldSystem *fieldSystem, const OverlayManagerTemplate *param1, void *param2) { GF_ASSERT(fieldSystem->unk_00->unk_04 == NULL); sub_0203CD44(fieldSystem); fieldSystem->unk_00->unk_04 = OverlayManager_New(param1, param2, 11); } -static FieldSystem * FieldSystem_Init (OverlayManager * overlayMan) +static FieldSystem *FieldSystem_Init(OverlayManager *overlayMan) { - UnkStruct_0203CC84 * v0; - FieldSystem * fieldSystem; + UnkStruct_0203CC84 *v0; + FieldSystem *fieldSystem; Heap_Create(3, 11, 0x1c000); Heap_Create(3, 32, 0x4000); @@ -190,9 +189,9 @@ static FieldSystem * FieldSystem_Init (OverlayManager * overlayMan) return fieldSystem; } -static void sub_0203CE6C (OverlayManager * overlayMan) +static void sub_0203CE6C(OverlayManager *overlayMan) { - FieldSystem * fieldSystem = OverlayManager_Data(overlayMan); + FieldSystem *fieldSystem = OverlayManager_Data(overlayMan); sub_02039DE4(fieldSystem->unk_2C); MapHeaderData_Free(fieldSystem); @@ -208,7 +207,7 @@ static void sub_0203CE6C (OverlayManager * overlayMan) Heap_Destroy(32); } -static void sub_0203CECC (OverlayManager ** overlayMan) +static void sub_0203CECC(OverlayManager **overlayMan) { if (*overlayMan) { if (OverlayManager_Exec(*overlayMan)) { @@ -218,7 +217,7 @@ static void sub_0203CECC (OverlayManager ** overlayMan) } } -BOOL FieldSystem_Run (FieldSystem * fieldSystem) +BOOL FieldSystem_Run(FieldSystem *fieldSystem) { BOOL v0; @@ -246,7 +245,7 @@ BOOL FieldSystem_Run (FieldSystem * fieldSystem) return 0; } -void FieldSystem_Control (FieldSystem * fieldSystem) +void FieldSystem_Control(FieldSystem *fieldSystem) { int v0; FieldInput v1; @@ -272,7 +271,6 @@ void FieldSystem_Control (FieldSystem * fieldSystem) if (v2) { if (sub_02058C40()) { if (FieldInput_Process_Underground(&v1, fieldSystem) == 1) { - } } } @@ -295,7 +293,7 @@ void FieldSystem_Control (FieldSystem * fieldSystem) case 2: if (v2) { if (FieldInput_Process_UnionRoom(&v1, fieldSystem) == 1) { - + } else { PlayerAvatar_MoveControl(fieldSystem->playerAvatar, fieldSystem->unk_28, -1, v1.pressedKeys, v1.heldKeys, 0); } @@ -355,19 +353,19 @@ void FieldSystem_Control (FieldSystem * fieldSystem) } } -void sub_0203D128 (void) +void sub_0203D128(void) { sFieldSystem->unk_00->unk_08 = 1; CommSys_DisableSendMovementData(); } -void sub_0203D140 (void) +void sub_0203D140(void) { sFieldSystem->unk_00->unk_08 = 0; CommSys_EnableSendMovementData(); } -struct PoketchSystem * FieldSystem_GetPoketchSystem (void) +struct PoketchSystem *FieldSystem_GetPoketchSystem(void) { if (sFieldSystem->unk_04 == NULL) { return NULL; @@ -376,13 +374,13 @@ struct PoketchSystem * FieldSystem_GetPoketchSystem (void) return sFieldSystem->unk_04->poketchSys; } -BGL * sub_0203D170 (void * param0) +BGL *sub_0203D170(void *param0) { - FieldSystem * v0 = (FieldSystem *)param0; + FieldSystem *v0 = (FieldSystem *)param0; return v0->unk_08; } -SaveData * FieldSystem_SaveData (void * param0) +SaveData *FieldSystem_SaveData(void *param0) { return ((FieldSystem *)param0)->saveData; } diff --git a/src/game_options.c b/src/game_options.c index d63256ad1b..03bc570aff 100644 --- a/src/game_options.c +++ b/src/game_options.c @@ -1,14 +1,14 @@ +#include "game_options.h" + #include #include #include "core_sys.h" -#include "savedata.h" #include "heap.h" +#include "savedata.h" #include "unk_02025E08.h" -#include "game_options.h" -#include "core_sys.h" -Options* Options_New (u32 heapID) +Options *Options_New(u32 heapID) { Options *options = Heap_AllocFromHeap(heapID, sizeof(Options)); Options_Init(options); @@ -16,12 +16,12 @@ Options* Options_New (u32 heapID) return options; } -void Options_Copy (const Options *src, Options *dest) +void Options_Copy(const Options *src, Options *dest) { MI_CpuCopy8(src, dest, sizeof(Options)); } -void Options_Init (Options *options) +void Options_Init(Options *options) { MI_CpuFill8(options, 0, sizeof(Options)); @@ -33,9 +33,9 @@ void Options_Init (Options *options) options->frame = OPTIONS_FRAME_1; } -void Options_SetSystemButtonMode (SaveData *saveData, enum OptionsButtonMode mode) +void Options_SetSystemButtonMode(SaveData *saveData, enum OptionsButtonMode mode) { - if (saveData != NULL) { + if (saveData != NULL) { mode = Options_ButtonMode(SaveData_Options(saveData)); } @@ -53,17 +53,17 @@ void Options_SetSystemButtonMode (SaveData *saveData, enum OptionsButtonMode mod } } -int Options_TextSpeed (const Options *options) +int Options_TextSpeed(const Options *options) { return options->textSpeed; } -void Options_SetTextSpeed (Options *options, enum OptionsTextSpeed speed) +void Options_SetTextSpeed(Options *options, enum OptionsTextSpeed speed) { options->textSpeed = speed; } -u8 Options_TextFrameDelay (const Options *options) +u8 Options_TextFrameDelay(const Options *options) { int speed = Options_TextSpeed(options); @@ -76,52 +76,52 @@ u8 Options_TextFrameDelay (const Options *options) } } -int Options_SoundMode (const Options *options) +int Options_SoundMode(const Options *options) { return options->soundMode; } -void Options_SetSoundMode (Options *options, enum OptionsSoundMode mode) +void Options_SetSoundMode(Options *options, enum OptionsSoundMode mode) { options->soundMode = mode; } -int Options_BattleScene (const Options *options) +int Options_BattleScene(const Options *options) { return options->battleScene; } -void Options_SetBattleScene (Options *options, enum OptionsBattleScene scene) +void Options_SetBattleScene(Options *options, enum OptionsBattleScene scene) { options->battleScene = scene; } -int Options_BattleStyle (const Options *options) +int Options_BattleStyle(const Options *options) { return options->battleStyle; } -void Options_SetBattleStyle (Options *options, enum OptionsBattleStyle style) +void Options_SetBattleStyle(Options *options, enum OptionsBattleStyle style) { options->battleStyle = style; } -int Options_ButtonMode (const Options *options) +int Options_ButtonMode(const Options *options) { return options->buttonMode; } -void Options_SetButtonMode (Options *options, enum OptionsButtonMode mode) +void Options_SetButtonMode(Options *options, enum OptionsButtonMode mode) { options->buttonMode = mode; } -int Options_Frame (const Options *options) +int Options_Frame(const Options *options) { return options->frame; } -void Options_SetFrame (Options *options, enum OptionsFrame frame) +void Options_SetFrame(Options *options, enum OptionsFrame frame) { options->frame = frame; } diff --git a/src/game_overlay.c b/src/game_overlay.c index f017253911..8321142e1e 100644 --- a/src/game_overlay.c +++ b/src/game_overlay.c @@ -1,8 +1,8 @@ +#include "game_overlay.h" + #include #include -#include "game_overlay.h" - typedef enum PMiOverlayRegion { OVERLAY_REGION_MAIN, OVERLAY_REGION_ITCM, @@ -21,10 +21,10 @@ typedef struct { PMiLoadedOverlay unk_80[8]; } UnkStruct_021BF370; -static void FreeOverlayAllocation(PMiLoadedOverlay * param0); +static void FreeOverlayAllocation(PMiLoadedOverlay *param0); static BOOL CanOverlayBeLoaded(const FSOverlayID param0); -static PMiLoadedOverlay * GetLoadedOverlaysInRegion(int param0); -static BOOL GetOverlayRamBounds(const FSOverlayID param0, u32 * param1, u32 * param2); +static PMiLoadedOverlay *GetLoadedOverlaysInRegion(int param0); +static BOOL GetOverlayRamBounds(const FSOverlayID param0, u32 *param1, u32 *param2); static BOOL LoadOverlayNormal(MIProcessor param0, FSOverlayID param1); static BOOL LoadOverlayNoInit(MIProcessor param0, FSOverlayID param1); static BOOL LoadOverlayNoInitAsync(MIProcessor param0, FSOverlayID param1); @@ -34,7 +34,7 @@ BOOL Overlay_LoadByID(const FSOverlayID param0, int param1); static UnkStruct_021BF370 Unk_021BF370; -static void FreeOverlayAllocation (PMiLoadedOverlay * param0) +static void FreeOverlayAllocation(PMiLoadedOverlay *param0) { GF_ASSERT(param0->isActive == 1); GF_ASSERT(FS_UnloadOverlay(MI_PROCESSOR_ARM9, param0->id) == TRUE); @@ -42,9 +42,9 @@ static void FreeOverlayAllocation (PMiLoadedOverlay * param0) param0->isActive = 0; } -void Overlay_UnloadByID (const FSOverlayID overlayID) +void Overlay_UnloadByID(const FSOverlayID overlayID) { - PMiLoadedOverlay * table; + PMiLoadedOverlay *table; int i; table = GetLoadedOverlaysInRegion(Overlay_GetLoadDestination(overlayID)); @@ -57,7 +57,7 @@ void Overlay_UnloadByID (const FSOverlayID overlayID) } } -int Overlay_GetLoadDestination (const FSOverlayID overlayID) +int Overlay_GetLoadDestination(const FSOverlayID overlayID) { FSOverlayInfo info; u32 v2; @@ -74,12 +74,12 @@ int Overlay_GetLoadDestination (const FSOverlayID overlayID) return OVERLAY_REGION_MAIN; } -BOOL Overlay_LoadByID (const FSOverlayID overlayID, int loadType) +BOOL Overlay_LoadByID(const FSOverlayID overlayID, int loadType) { BOOL result; u32 dmaBak = FS_DMA_NOT_USE; int overlayRegion; - PMiLoadedOverlay * loadedOverlays; + PMiLoadedOverlay *loadedOverlays; int i; if (!CanOverlayBeLoaded(overlayID)) { @@ -134,10 +134,10 @@ BOOL Overlay_LoadByID (const FSOverlayID overlayID, int loadType) return 1; } -static BOOL CanOverlayBeLoaded (const FSOverlayID param0) +static BOOL CanOverlayBeLoaded(const FSOverlayID param0) { u32 myStart, myEnd, theirStart, theirEnd; - PMiLoadedOverlay * loadedOverlay; + PMiLoadedOverlay *loadedOverlay; int i; if (!GetOverlayRamBounds(param0, &myStart, &myEnd)) { @@ -158,9 +158,9 @@ static BOOL CanOverlayBeLoaded (const FSOverlayID param0) return TRUE; } -static PMiLoadedOverlay * GetLoadedOverlaysInRegion (int region) +static PMiLoadedOverlay *GetLoadedOverlaysInRegion(int region) { - PMiLoadedOverlay * ret; + PMiLoadedOverlay *ret; switch (region) { case OVERLAY_REGION_MAIN: @@ -178,7 +178,7 @@ static PMiLoadedOverlay * GetLoadedOverlaysInRegion (int region) return ret; } -static BOOL GetOverlayRamBounds (const FSOverlayID overlayID, u32 * start, u32 * end) +static BOOL GetOverlayRamBounds(const FSOverlayID overlayID, u32 *start, u32 *end) { FSOverlayInfo info; @@ -193,12 +193,12 @@ static BOOL GetOverlayRamBounds (const FSOverlayID overlayID, u32 * start, u32 * return TRUE; } -static BOOL LoadOverlayNormal (MIProcessor proc, FSOverlayID overlayID) +static BOOL LoadOverlayNormal(MIProcessor proc, FSOverlayID overlayID) { return FS_LoadOverlay(proc, overlayID); } -static BOOL LoadOverlayNoInit (MIProcessor proc, FSOverlayID overlayID) +static BOOL LoadOverlayNoInit(MIProcessor proc, FSOverlayID overlayID) { FSOverlayInfo info; @@ -214,7 +214,7 @@ static BOOL LoadOverlayNoInit (MIProcessor proc, FSOverlayID overlayID) return TRUE; } -static BOOL LoadOverlayNoInitAsync (MIProcessor proc, FSOverlayID overlayID) +static BOOL LoadOverlayNoInitAsync(MIProcessor proc, FSOverlayID overlayID) { FSFile file; FSOverlayInfo info; diff --git a/src/gx_layers.c b/src/gx_layers.c index fae08c1d34..b902253d85 100644 --- a/src/gx_layers.c +++ b/src/gx_layers.c @@ -1,17 +1,17 @@ +#include "gx_layers.h" + #include -#include #include - -#include "core_sys.h" +#include #include "struct_defs/struct_02099F80.h" -#include "gx_layers.h" +#include "core_sys.h" static int sEngineALayers; static int sEngineBLayers; -void GXLayers_SetBanks (const UnkStruct_02099F80 * banks) +void GXLayers_SetBanks(const UnkStruct_02099F80 *banks) { GX_ResetBankForBG(); GX_ResetBankForBGExtPltt(); @@ -36,12 +36,12 @@ void GXLayers_SetBanks (const UnkStruct_02099F80 * banks) GX_SetBankForTexPltt(banks->unk_24); } -void GXLayers_DisableEngineALayers (void) +void GXLayers_DisableEngineALayers(void) { sEngineALayers = 0; } -void GXLayers_EngineAToggleLayers (u8 layerMask, u8 enable) +void GXLayers_EngineAToggleLayers(u8 layerMask, u8 enable) { if (enable == 1) { if (sEngineALayers & layerMask) { @@ -57,18 +57,18 @@ void GXLayers_EngineAToggleLayers (u8 layerMask, u8 enable) GX_SetVisiblePlane(sEngineALayers); } -void GXLayers_EngineASetLayers (int layers) +void GXLayers_EngineASetLayers(int layers) { sEngineALayers = layers; GX_SetVisiblePlane(sEngineALayers); } -void GXLayers_DisableEngineBLayers (void) +void GXLayers_DisableEngineBLayers(void) { sEngineBLayers = 0; } -void GXLayers_EngineBToggleLayers (u8 layerMask, u8 enable) +void GXLayers_EngineBToggleLayers(u8 layerMask, u8 enable) { if (enable == 1) { if (sEngineBLayers & layerMask) { @@ -84,19 +84,19 @@ void GXLayers_EngineBToggleLayers (u8 layerMask, u8 enable) GXS_SetVisiblePlane(sEngineBLayers); } -void GXLayers_EngineBSetLayers (int layers) +void GXLayers_EngineBSetLayers(int layers) { sEngineBLayers = layers; GXS_SetVisiblePlane(sEngineBLayers); } -void GXLayers_TurnBothDispOn (void) +void GXLayers_TurnBothDispOn(void) { GX_DispOn(); GXS_DispOn(); } -void GXLayers_SwapDisplay (void) +void GXLayers_SwapDisplay(void) { if (gCoreSys.unk_65 == 0) { GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); @@ -105,7 +105,7 @@ void GXLayers_SwapDisplay (void) } } -int GXLayers_EngineAGetLayers (void) +int GXLayers_EngineAGetLayers(void) { return sEngineALayers; } diff --git a/src/heap.c b/src/heap.c index ff9386dfc7..607ba8351a 100644 --- a/src/heap.c +++ b/src/heap.c @@ -1,18 +1,19 @@ +#include "heap.h" + #include #include #include "struct_defs/struct_02017E74.h" -#include "heap.h" -#include "unk_020366A0.h" #include "error_message_reset.h" +#include "unk_020366A0.h" typedef struct { - NNSFndHeapHandle * heapHandles; - NNSFndHeapHandle * parentHeapHandles; - void ** subHeapRawPtrs; - u16 * numMemBlocks; - u8 * heapIdxs; + NNSFndHeapHandle *heapHandles; + NNSFndHeapHandle *parentHeapHandles; + void **subHeapRawPtrs; + u16 *numMemBlocks; + u8 *heapIdxs; u16 totalNumHeaps; u16 nTemplates; u16 maxHeaps; @@ -27,13 +28,13 @@ typedef struct { static int FindFirstAvailableHeapHandle(void); static BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment); -static void * AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, u32 heapID); +static void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, u32 heapID); static HeapInfo sHeapInfo = { 0 }; -void Heap_InitSystem (const HeapParam * templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_size) +void Heap_InitSystem(const HeapParam *templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_size) { - void * ptr; + void *ptr; u32 unk_size, i; unk_size = nTemplates + 24; @@ -93,7 +94,7 @@ void Heap_InitSystem (const HeapParam * templates, u32 nTemplates, u32 totalNumH } } -static int FindFirstAvailableHeapHandle (void) +static int FindFirstAvailableHeapHandle(void) { int i; @@ -106,17 +107,17 @@ static int FindFirstAvailableHeapHandle (void) return -1; } -BOOL Heap_Create (u32 parent, u32 child, u32 size) +BOOL Heap_Create(u32 parent, u32 child, u32 size) { return CreateHeapInternal(parent, child, size, 4); } -BOOL Heap_CreateAtEnd (u32 parent, u32 child, u32 size) +BOOL Heap_CreateAtEnd(u32 parent, u32 child, u32 size) { return CreateHeapInternal(parent, child, size, -4); } -static BOOL CreateHeapInternal (u32 parent, u32 child, u32 size, s32 alignment) +static BOOL CreateHeapInternal(u32 parent, u32 child, u32 size, s32 alignment) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); @@ -124,7 +125,7 @@ static BOOL CreateHeapInternal (u32 parent, u32 child, u32 size, s32 alignment) NNSFndHeapHandle parentHeap = sHeapInfo.heapHandles[sHeapInfo.heapIdxs[parent]]; if (parentHeap != NNS_FND_HEAP_INVALID_HANDLE) { - void * newHeapAddr = NNS_FndAllocFromExpHeapEx(parentHeap, size, alignment); + void *newHeapAddr = NNS_FndAllocFromExpHeapEx(parentHeap, size, alignment); if (newHeapAddr != NULL) { int i = FindFirstAvailableHeapHandle(); @@ -157,7 +158,7 @@ static BOOL CreateHeapInternal (u32 parent, u32 child, u32 size, s32 alignment) return FALSE; } -void Heap_Destroy (u32 heapID) +void Heap_Destroy(u32 heapID) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); @@ -167,7 +168,7 @@ void Heap_Destroy (u32 heapID) if (handle != NNS_FND_HEAP_INVALID_HANDLE) { NNSFndHeapHandle parentHeap; - void * childRaw; + void *childRaw; NNS_FndDestroyExpHeap(handle); @@ -189,9 +190,9 @@ void Heap_Destroy (u32 heapID) } } -static void * AllocFromHeapInternal (NNSFndHeapHandle heap, u32 size, s32 alignment, u32 heapID) +static void *AllocFromHeapInternal(NNSFndHeapHandle heap, u32 size, s32 alignment, u32 heapID) { - void * ptr; + void *ptr; OSIntrMode intr_mode; GF_ASSERT(heap != NNS_FND_HEAP_INVALID_HANDLE); @@ -209,16 +210,16 @@ static void * AllocFromHeapInternal (NNSFndHeapHandle heap, u32 size, s32 alignm return ptr; } -static void AllocFail (void) +static void AllocFail(void) { if (CommMan_IsInitialized()) { ErrorMessageReset_PrintErrorAndReset(); } } -void * Heap_AllocFromHeap (u32 heapID, u32 size) +void *Heap_AllocFromHeap(u32 heapID, u32 size) { - void * ptr = NULL; + void *ptr = NULL; if (heapID < sHeapInfo.totalNumHeaps) { u8 index = sHeapInfo.heapIdxs[heapID]; @@ -235,9 +236,9 @@ void * Heap_AllocFromHeap (u32 heapID, u32 size) return ptr; } -void * Heap_AllocFromHeapAtEnd (u32 heapID, u32 size) +void *Heap_AllocFromHeapAtEnd(u32 heapID, u32 size) { - void * ptr = NULL; + void *ptr = NULL; if (heapID < sHeapInfo.totalNumHeaps) { u8 index = sHeapInfo.heapIdxs[heapID]; @@ -254,7 +255,7 @@ void * Heap_AllocFromHeapAtEnd (u32 heapID, u32 size) return ptr; } -void Heap_FreeToHeap (void * ptr) +void Heap_FreeToHeap(void *ptr) { (u8 *)ptr -= sizeof(MemoryBlock); u32 heapID = ((MemoryBlock *)ptr)->heapID; @@ -285,7 +286,7 @@ void Heap_FreeToHeap (void * ptr) } } -void Heap_FreeToHeapExplicit (u32 heapID, void * ptr) +void Heap_FreeToHeapExplicit(u32 heapID, void *ptr) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); @@ -310,7 +311,7 @@ void Heap_FreeToHeapExplicit (u32 heapID, void * ptr) } } -u32 Heap_FndGetTotalFreeSizeForExpHeap (u32 heapID) +u32 Heap_FndGetTotalFreeSizeForExpHeap(u32 heapID) { if (heapID < sHeapInfo.totalNumHeaps) { u8 index = sHeapInfo.heapIdxs[heapID]; @@ -322,7 +323,7 @@ u32 Heap_FndGetTotalFreeSizeForExpHeap (u32 heapID) return 0; } -void Heap_FndInitAllocatorForExpHeap (NNSFndAllocator * pAllocator, u32 heapID, int alignment) +void Heap_FndInitAllocatorForExpHeap(NNSFndAllocator *pAllocator, u32 heapID, int alignment) { if (heapID < sHeapInfo.totalNumHeaps) { u8 index = sHeapInfo.heapIdxs[heapID]; @@ -333,7 +334,7 @@ void Heap_FndInitAllocatorForExpHeap (NNSFndAllocator * pAllocator, u32 heapID, } } -void Heap_ReallocFromHeap (void * ptr, u32 newSize) +void Heap_ReallocFromHeap(void *ptr, u32 newSize) { GF_ASSERT(OS_GetProcMode() != OS_PROCMODE_IRQ); @@ -351,7 +352,7 @@ void Heap_ReallocFromHeap (void * ptr, u32 newSize) } } -BOOL GF_heap_c_dummy_return_true (u32 heapID) +BOOL GF_heap_c_dummy_return_true(u32 heapID) #pragma unused(heapID) { return 1; diff --git a/src/item.c b/src/item.c index 5d25837666..edcc5a96c9 100644 --- a/src/item.c +++ b/src/item.c @@ -1,3 +1,5 @@ +#include "item.h" + #include #include @@ -5,9 +7,7 @@ #include "constants/moves.h" #include "bag.h" - #include "heap.h" -#include "item.h" #include "message.h" #include "narc.h" #include "strbuf.h" @@ -19,662 +19,662 @@ typedef struct { u16 gen3ID; } ItemArchiveIDs; -static s32 ItemPartyParam_Get(ItemPartyParam * partyParam, enum ItemDataParam attributeID); +static s32 ItemPartyParam_Get(ItemPartyParam *partyParam, enum ItemDataParam attributeID); const ItemArchiveIDs sItemArchiveIDs[] = { - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x1, 0x2, 0x3, 0x1 }, - { 0x2, 0x4, 0x5, 0x2 }, - { 0x3, 0x6, 0x7, 0x3 }, - { 0x4, 0x8, 0x9, 0x4 }, - { 0x5, 0xA, 0xB, 0x5 }, - { 0x6, 0xC, 0xD, 0x6 }, - { 0x7, 0xE, 0xF, 0x7 }, - { 0x8, 0x10, 0x11, 0x8 }, - { 0x9, 0x12, 0x13, 0x9 }, - { 0xA, 0x14, 0x13, 0xA }, - { 0xB, 0x15, 0x16, 0xB }, - { 0xC, 0x17, 0x16, 0xC }, - { 0xD, 0x297, 0x298, 0x0 }, - { 0xE, 0x299, 0x29A, 0x0 }, - { 0xF, 0x29B, 0x29C, 0x0 }, - { 0x10, 0x29D, 0x29E, 0x0 }, - { 0x11, 0x18, 0x19, 0xD }, - { 0x12, 0x1A, 0x1B, 0xE }, - { 0x13, 0x1E, 0x1C, 0xF }, - { 0x14, 0x1E, 0x1D, 0x10 }, - { 0x15, 0x1E, 0x1F, 0x11 }, - { 0x16, 0x1E, 0x20, 0x12 }, - { 0x17, 0x21, 0x22, 0x13 }, - { 0x18, 0x21, 0x23, 0x14 }, - { 0x19, 0x18, 0x24, 0x15 }, - { 0x1A, 0x18, 0x25, 0x16 }, - { 0x1B, 0x26, 0x27, 0x17 }, - { 0x1C, 0x28, 0x2A, 0x18 }, - { 0x1D, 0x29, 0x2A, 0x19 }, - { 0x1E, 0x2B, 0x2C, 0x1A }, - { 0x1F, 0x2D, 0x2E, 0x1B }, - { 0x20, 0x2F, 0x30, 0x1C }, - { 0x21, 0x31, 0x32, 0x1D }, - { 0x22, 0x33, 0x34, 0x1E }, - { 0x23, 0x35, 0x36, 0x1F }, - { 0x24, 0x33, 0x37, 0x20 }, - { 0x25, 0x38, 0x39, 0x21 }, - { 0x26, 0x3A, 0x3B, 0x22 }, - { 0x27, 0x3A, 0x3C, 0x23 }, - { 0x28, 0x3A, 0x3D, 0x24 }, - { 0x29, 0x3A, 0x3E, 0x25 }, - { 0x2A, 0x3F, 0x40, 0x26 }, - { 0x2B, 0x47, 0x48, 0x2C }, - { 0x2C, 0x49, 0x4A, 0x2D }, - { 0x2D, 0x53, 0x54, 0x3F }, - { 0x2E, 0x55, 0x56, 0x40 }, - { 0x2F, 0x55, 0x57, 0x41 }, - { 0x30, 0x55, 0x58, 0x42 }, - { 0x31, 0x55, 0x59, 0x43 }, - { 0x32, 0x5A, 0x5B, 0x44 }, - { 0x33, 0x5C, 0x5D, 0x45 }, - { 0x34, 0x55, 0x5E, 0x46 }, - { 0x35, 0x5F, 0x60, 0x47 }, - { 0x36, 0x1D2, 0x1D3, 0x0 }, - { 0x37, 0x64, 0x61, 0x49 }, - { 0x38, 0x64, 0x62, 0x4A }, - { 0x39, 0x64, 0x63, 0x4B }, - { 0x3A, 0x64, 0x65, 0x4C }, - { 0x3B, 0x64, 0x66, 0x4D }, - { 0x3C, 0x64, 0x67, 0x4E }, - { 0x3D, 0x64, 0x68, 0x4F }, - { 0x3E, 0x64, 0x1D5, 0x0 }, - { 0x3F, 0x69, 0x6A, 0x50 }, - { 0x40, 0x6B, 0x6C, 0x51 }, - { 0x41, 0x41, 0x42, 0x27 }, - { 0x42, 0x41, 0x43, 0x28 }, - { 0x43, 0x41, 0x44, 0x29 }, - { 0x44, 0x41, 0x45, 0x2A }, - { 0x45, 0x41, 0x46, 0x2B }, - { 0x46, 0x33, 0x4B, 0x2E }, - { 0x47, 0x4C, 0x4D, 0x2F }, - { 0x48, 0x4E, 0x4F, 0x30 }, - { 0x49, 0x4E, 0x50, 0x31 }, - { 0x4A, 0x4E, 0x51, 0x32 }, - { 0x4B, 0x4E, 0x52, 0x33 }, - { 0x4C, 0x6D, 0x6E, 0x53 }, - { 0x4D, 0x6D, 0x6F, 0x54 }, - { 0x4E, 0x70, 0x71, 0x55 }, - { 0x4F, 0x6D, 0x72, 0x56 }, - { 0x50, 0x73, 0x74, 0x5D }, - { 0x51, 0x75, 0x76, 0x5E }, - { 0x52, 0x77, 0x78, 0x5F }, - { 0x53, 0x79, 0x7A, 0x60 }, - { 0x54, 0x7B, 0x7C, 0x61 }, - { 0x55, 0x7D, 0x7E, 0x62 }, - { 0x56, 0x7F, 0x81, 0x67 }, - { 0x57, 0x80, 0x81, 0x68 }, - { 0x58, 0x82, 0x83, 0x6A }, - { 0x59, 0x84, 0x83, 0x6B }, - { 0x5A, 0x85, 0x86, 0x6C }, - { 0x5B, 0x87, 0x86, 0x6D }, - { 0x5C, 0x88, 0x89, 0x6E }, - { 0x5D, 0x8A, 0x8B, 0x6F }, - { 0x5E, 0x1D6, 0x1D7, 0x0 }, - { 0x5F, 0x1D8, 0x1D9, 0x0 }, - { 0x60, 0x1DA, 0x1DB, 0x0 }, - { 0x61, 0x1DC, 0x1DD, 0x0 }, - { 0x62, 0x1DE, 0x1DF, 0x0 }, - { 0x63, 0x188, 0x189, 0x11E }, - { 0x64, 0x18A, 0x189, 0x11F }, - { 0x65, 0x1AF, 0x1B0, 0x165 }, - { 0x66, 0x1B1, 0x1B0, 0x166 }, - { 0x67, 0x1A9, 0x1AA, 0x162 }, - { 0x68, 0x269, 0x26A, 0x0 }, - { 0x69, 0x267, 0x268, 0x0 }, - { 0x6A, 0x151, 0x152, 0x0 }, - { 0x6B, 0x1E0, 0x1E1, 0x0 }, - { 0x6C, 0x1E2, 0x1E3, 0x0 }, - { 0x6D, 0x1E4, 0x1E5, 0x0 }, - { 0x6E, 0x1E6, 0x1E7, 0x0 }, - { 0x6F, 0x1E8, 0x1E9, 0x0 }, - { 0x70, 0x2BB, 0x2BC, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x0, 0x2C3, 0x2C4, 0x0 }, - { 0x71, 0x288, 0x289, 0x0 }, - { 0x72, 0x286, 0x287, 0x0 }, - { 0x73, 0x8C, 0x8D, 0x0 }, - { 0x74, 0x8E, 0x8F, 0x0 }, - { 0x75, 0x90, 0x91, 0x0 }, - { 0x76, 0x92, 0x93, 0x0 }, - { 0x77, 0x94, 0x95, 0x0 }, - { 0x78, 0x96, 0x97, 0x0 }, - { 0x79, 0x98, 0x99, 0x0 }, - { 0x7A, 0x9A, 0x9B, 0x0 }, - { 0x7B, 0x9C, 0x9D, 0x0 }, - { 0x7C, 0x9E, 0x9F, 0x0 }, - { 0x7D, 0xA0, 0xA1, 0x0 }, - { 0x7E, 0xA2, 0xA3, 0x0 }, - { 0x7F, 0xA4, 0xA5, 0x85 }, - { 0x80, 0xA6, 0xA7, 0x86 }, - { 0x81, 0xA8, 0xA9, 0x87 }, - { 0x82, 0xAA, 0xAB, 0x88 }, - { 0x83, 0xAC, 0xAD, 0x89 }, - { 0x84, 0xAE, 0xAF, 0x8A }, - { 0x85, 0xB0, 0xB1, 0x8B }, - { 0x86, 0xB2, 0xB3, 0x8C }, - { 0x87, 0xB4, 0xB5, 0x8D }, - { 0x88, 0xB6, 0xB7, 0x8E }, - { 0x89, 0xB8, 0xB9, 0x8F }, - { 0x8A, 0xBA, 0xBB, 0x90 }, - { 0x8B, 0xBC, 0xBD, 0x91 }, - { 0x8C, 0xBE, 0xBF, 0x92 }, - { 0x8D, 0xC0, 0xC1, 0x93 }, - { 0x8E, 0xC2, 0xC3, 0x94 }, - { 0x8F, 0xC4, 0xC5, 0x95 }, - { 0x90, 0xC6, 0xC7, 0x96 }, - { 0x91, 0xC8, 0xC9, 0x97 }, - { 0x92, 0xCA, 0xCB, 0x98 }, - { 0x93, 0xCC, 0xCD, 0x99 }, - { 0x94, 0xCE, 0xCF, 0x9A }, - { 0x95, 0xD0, 0xD1, 0x9B }, - { 0x96, 0xD2, 0xD3, 0x9C }, - { 0x97, 0xD4, 0xD5, 0x9D }, - { 0x98, 0xD6, 0xD7, 0x9E }, - { 0x99, 0xD8, 0xD9, 0x9F }, - { 0x9A, 0xDA, 0xDB, 0xA0 }, - { 0x9B, 0xDC, 0xDD, 0xA1 }, - { 0x9C, 0xDE, 0xDF, 0xA2 }, - { 0x9D, 0xE0, 0xE1, 0xA3 }, - { 0x9E, 0xE2, 0xE3, 0xA4 }, - { 0x9F, 0xE4, 0xE5, 0xA5 }, - { 0xA0, 0xE6, 0xE7, 0xA6 }, - { 0xA1, 0xE8, 0xE9, 0xA7 }, - { 0xA2, 0x22A, 0x22B, 0x0 }, - { 0xA3, 0x22C, 0x22D, 0x0 }, - { 0xA4, 0x22E, 0x22F, 0x0 }, - { 0xA5, 0x230, 0x231, 0x0 }, - { 0xA6, 0x232, 0x233, 0x0 }, - { 0xA7, 0x234, 0x235, 0x0 }, - { 0xA8, 0x236, 0x237, 0x0 }, - { 0xA9, 0x238, 0x239, 0x0 }, - { 0xAA, 0x23A, 0x23B, 0x0 }, - { 0xAB, 0x23C, 0x23D, 0x0 }, - { 0xAC, 0x23E, 0x23F, 0x0 }, - { 0xAD, 0x240, 0x241, 0x0 }, - { 0xAE, 0x242, 0x243, 0x0 }, - { 0xAF, 0x244, 0x245, 0x0 }, - { 0xB0, 0x246, 0x247, 0x0 }, - { 0xB1, 0x248, 0x249, 0x0 }, - { 0xB2, 0x24A, 0x24B, 0x0 }, - { 0xB3, 0xEA, 0xEB, 0xA8 }, - { 0xB4, 0xEC, 0xED, 0xA9 }, - { 0xB5, 0xEE, 0xEF, 0xAA }, - { 0xB6, 0xF0, 0xF1, 0xAB }, - { 0xB7, 0xF2, 0xF3, 0xAC }, - { 0xB8, 0xF4, 0xF5, 0xAD }, - { 0xB9, 0xF6, 0xF7, 0xAE }, - { 0xBA, 0xF8, 0xF9, 0xAF }, - { 0xBB, 0x24C, 0x24D, 0x0 }, - { 0xBC, 0x24E, 0x24F, 0x0 }, - { 0xBD, 0x250, 0x251, 0x0 }, - { 0xBE, 0x252, 0x253, 0x0 }, - { 0xBF, 0xFA, 0xFB, 0xB3 }, - { 0xC0, 0xFC, 0xFD, 0xB4 }, - { 0xC1, 0xFE, 0xFF, 0xB5 }, - { 0xC2, 0x100, 0x101, 0xB6 }, - { 0xC3, 0x102, 0x103, 0xB7 }, - { 0xC4, 0x104, 0x105, 0xB8 }, - { 0xC5, 0xFC, 0x106, 0xB9 }, - { 0xC6, 0x107, 0x108, 0xBA }, - { 0xC7, 0x109, 0x10A, 0xBB }, - { 0xC8, 0x10B, 0x10C, 0xBC }, - { 0xC9, 0x10D, 0x10E, 0xBD }, - { 0xCA, 0x10F, 0x110, 0xBE }, - { 0xCB, 0x111, 0x112, 0xBF }, - { 0xCC, 0x113, 0x114, 0xC0 }, - { 0xCD, 0x115, 0x116, 0xC1 }, - { 0xCE, 0x117, 0x118, 0xC2 }, - { 0xCF, 0x119, 0x11A, 0xC3 }, - { 0xD0, 0x11B, 0x11C, 0xC4 }, - { 0xD1, 0x11D, 0x11E, 0xC5 }, - { 0xD2, 0x11F, 0x120, 0xC6 }, - { 0xD3, 0x121, 0x122, 0xC7 }, - { 0xD4, 0x123, 0x124, 0xC8 }, - { 0xD5, 0x125, 0x126, 0xC9 }, - { 0xD6, 0x127, 0x128, 0xCA }, - { 0xD7, 0x129, 0x12A, 0xCB }, - { 0xD8, 0x12B, 0x12C, 0xCC }, - { 0xD9, 0x12D, 0x12E, 0xCD }, - { 0xDA, 0x12F, 0x130, 0xCE }, - { 0xDB, 0x131, 0x130, 0xCF }, - { 0xDC, 0x132, 0x133, 0xD0 }, - { 0xDD, 0x134, 0x135, 0xD1 }, - { 0xDE, 0x136, 0x137, 0xD2 }, - { 0xDF, 0x138, 0x139, 0xD3 }, - { 0xE0, 0x13A, 0x13B, 0xD4 }, - { 0xE1, 0x13C, 0x13D, 0xD5 }, - { 0xE2, 0x13E, 0x13F, 0xD6 }, - { 0xE3, 0x140, 0x141, 0xD7 }, - { 0xE4, 0x142, 0x143, 0xD8 }, - { 0xE5, 0x144, 0x145, 0xD9 }, - { 0xE6, 0x146, 0x147, 0xDA }, - { 0xE7, 0x148, 0x4D, 0xDB }, - { 0xE8, 0x149, 0x14A, 0xDC }, - { 0xE9, 0x14B, 0x14C, 0xDD }, - { 0xEA, 0x14D, 0x14E, 0xDE }, - { 0xEB, 0x14F, 0x150, 0xDF }, - { 0xEC, 0x151, 0x152, 0xE0 }, - { 0xED, 0x153, 0x154, 0xE1 }, - { 0xEE, 0x155, 0x156, 0xFE }, - { 0xEF, 0x155, 0x157, 0xFF }, - { 0xF0, 0x155, 0x158, 0x100 }, - { 0xF1, 0x155, 0x159, 0x101 }, - { 0xF2, 0x155, 0x15A, 0x102 }, - { 0xF3, 0x1EA, 0x1EB, 0x0 }, - { 0xF4, 0x1EC, 0x1ED, 0x0 }, - { 0xF5, 0x1EE, 0x1EF, 0x0 }, - { 0xF6, 0x1F0, 0x1F1, 0x0 }, - { 0xF7, 0x263, 0x264, 0x0 }, - { 0xF8, 0x1F2, 0x1F3, 0x0 }, - { 0xF9, 0x1F4, 0x1F5, 0x0 }, - { 0xFA, 0x1F6, 0x1F7, 0x0 }, - { 0xFB, 0x1F8, 0x1F9, 0x0 }, - { 0xFC, 0x14F, 0x292, 0x0 }, - { 0xFD, 0x293, 0x294, 0x0 }, - { 0xFE, 0x1FA, 0x1FB, 0x0 }, - { 0xFF, 0x1FC, 0x1FD, 0x0 }, - { 0x100, 0x265, 0x266, 0x0 }, - { 0x101, 0x28A, 0x28B, 0x0 }, - { 0x102, 0x28E, 0x28F, 0x0 }, - { 0x103, 0x1FE, 0x1FF, 0x0 }, - { 0x104, 0x27C, 0x27D, 0x0 }, - { 0x105, 0x27E, 0x27F, 0x0 }, - { 0x106, 0x280, 0x281, 0x0 }, - { 0x107, 0x282, 0x283, 0x0 }, - { 0x108, 0x28C, 0x28D, 0x0 }, - { 0x109, 0x200, 0x201, 0x0 }, - { 0x10A, 0x202, 0x203, 0x0 }, - { 0x10B, 0x2AB, 0x2AC, 0x0 }, - { 0x10C, 0x2B3, 0x2B4, 0x0 }, - { 0x10D, 0x2B5, 0x2B6, 0x0 }, - { 0x10E, 0x2AD, 0x2AE, 0x0 }, - { 0x10F, 0x2AF, 0x2B0, 0x0 }, - { 0x110, 0x2B1, 0x2B2, 0x0 }, - { 0x111, 0x204, 0x205, 0x0 }, - { 0x112, 0x206, 0x207, 0x0 }, - { 0x113, 0x208, 0x209, 0x0 }, - { 0x114, 0x26B, 0x26C, 0x0 }, - { 0x115, 0x26B, 0x26D, 0x0 }, - { 0x116, 0x26B, 0x26E, 0x0 }, - { 0x117, 0x26B, 0x26F, 0x0 }, - { 0x118, 0x26B, 0x270, 0x0 }, - { 0x119, 0x26B, 0x271, 0x0 }, - { 0x11A, 0x26B, 0x272, 0x0 }, - { 0x11B, 0x26B, 0x273, 0x0 }, - { 0x11C, 0x26B, 0x274, 0x0 }, - { 0x11D, 0x26B, 0x275, 0x0 }, - { 0x11E, 0x26B, 0x276, 0x0 }, - { 0x11F, 0x26B, 0x277, 0x0 }, - { 0x120, 0x26B, 0x278, 0x0 }, - { 0x121, 0x26B, 0x279, 0x0 }, - { 0x122, 0x26B, 0x27A, 0x0 }, - { 0x123, 0x26B, 0x27B, 0x0 }, - { 0x124, 0x20A, 0x20B, 0x0 }, - { 0x125, 0x20C, 0x20D, 0x0 }, - { 0x126, 0x20E, 0x20F, 0x0 }, - { 0x127, 0x210, 0x211, 0x0 }, - { 0x128, 0x212, 0x213, 0x0 }, - { 0x129, 0x214, 0x215, 0x0 }, - { 0x12A, 0x216, 0x217, 0x0 }, - { 0x12B, 0x2B7, 0x2B8, 0x0 }, - { 0x12C, 0x218, 0x219, 0x0 }, - { 0x12D, 0x21A, 0x21B, 0x0 }, - { 0x12E, 0x21C, 0x21D, 0x0 }, - { 0x12F, 0x21E, 0x21F, 0x0 }, - { 0x130, 0x220, 0x221, 0x0 }, - { 0x131, 0x222, 0x223, 0x0 }, - { 0x132, 0x18D, 0x18E, 0x121 }, - { 0x133, 0x18D, 0x18F, 0x122 }, - { 0x134, 0x18D, 0x190, 0x123 }, - { 0x135, 0x18D, 0x191, 0x124 }, - { 0x136, 0x18D, 0x192, 0x125 }, - { 0x137, 0x18D, 0x193, 0x126 }, - { 0x138, 0x18D, 0x194, 0x127 }, - { 0x139, 0x18D, 0x18E, 0x128 }, - { 0x13A, 0x18D, 0x195, 0x129 }, - { 0x13B, 0x18D, 0x192, 0x12A }, - { 0x13C, 0x18D, 0x196, 0x12B }, - { 0x13D, 0x18D, 0x197, 0x12C }, - { 0x13E, 0x18D, 0x194, 0x12D }, - { 0x13F, 0x18D, 0x194, 0x12E }, - { 0x140, 0x18D, 0x192, 0x12F }, - { 0x141, 0x18D, 0x191, 0x130 }, - { 0x142, 0x18D, 0x192, 0x131 }, - { 0x143, 0x18D, 0x190, 0x132 }, - { 0x144, 0x18D, 0x195, 0x133 }, - { 0x145, 0x18D, 0x192, 0x134 }, - { 0x146, 0x18D, 0x192, 0x135 }, - { 0x147, 0x18D, 0x195, 0x136 }, - { 0x148, 0x18D, 0x198, 0x137 }, - { 0x149, 0x18D, 0x199, 0x138 }, - { 0x14A, 0x18D, 0x199, 0x139 }, - { 0x14B, 0x18D, 0x19A, 0x13A }, - { 0x14C, 0x18D, 0x192, 0x13B }, - { 0x14D, 0x18D, 0x19A, 0x13C }, - { 0x14E, 0x18D, 0x191, 0x13D }, - { 0x14F, 0x18D, 0x19B, 0x13E }, - { 0x150, 0x18D, 0x18E, 0x13F }, - { 0x151, 0x18D, 0x192, 0x140 }, - { 0x152, 0x18D, 0x191, 0x141 }, - { 0x153, 0x18D, 0x199, 0x142 }, - { 0x154, 0x18D, 0x196, 0x143 }, - { 0x155, 0x18D, 0x193, 0x144 }, - { 0x156, 0x18D, 0x19C, 0x145 }, - { 0x157, 0x18D, 0x196, 0x146 }, - { 0x158, 0x18D, 0x19C, 0x147 }, - { 0x159, 0x18D, 0x19D, 0x148 }, - { 0x15A, 0x18D, 0x197, 0x149 }, - { 0x15B, 0x18D, 0x192, 0x14A }, - { 0x15C, 0x18D, 0x192, 0x14B }, - { 0x15D, 0x18D, 0x191, 0x14C }, - { 0x15E, 0x18D, 0x192, 0x14D }, - { 0x15F, 0x18D, 0x197, 0x14E }, - { 0x160, 0x18D, 0x198, 0x14F }, - { 0x161, 0x18D, 0x191, 0x150 }, - { 0x162, 0x18D, 0x197, 0x151 }, - { 0x163, 0x18D, 0x196, 0x152 }, - { 0x164, 0x18D, 0x19D, 0x0 }, - { 0x165, 0x18D, 0x18E, 0x0 }, - { 0x166, 0x18D, 0x195, 0x0 }, - { 0x167, 0x18D, 0x192, 0x0 }, - { 0x168, 0x18D, 0x190, 0x0 }, - { 0x169, 0x18D, 0x197, 0x0 }, - { 0x16A, 0x18D, 0x199, 0x0 }, - { 0x16B, 0x18D, 0x192, 0x0 }, - { 0x16C, 0x18D, 0x18F, 0x0 }, - { 0x16D, 0x18D, 0x18E, 0x0 }, - { 0x16E, 0x18D, 0x196, 0x0 }, - { 0x16F, 0x18D, 0x262, 0x0 }, - { 0x170, 0x18D, 0x197, 0x0 }, - { 0x171, 0x18D, 0x192, 0x0 }, - { 0x172, 0x18D, 0x19B, 0x0 }, - { 0x173, 0x18D, 0x197, 0x0 }, - { 0x174, 0x18D, 0x192, 0x0 }, - { 0x175, 0x18D, 0x192, 0x0 }, - { 0x176, 0x18D, 0x19C, 0x0 }, - { 0x177, 0x18D, 0x192, 0x0 }, - { 0x178, 0x18D, 0x19C, 0x0 }, - { 0x179, 0x18D, 0x194, 0x0 }, - { 0x17A, 0x18D, 0x199, 0x0 }, - { 0x17B, 0x18D, 0x198, 0x0 }, - { 0x17C, 0x18D, 0x192, 0x0 }, - { 0x17D, 0x18D, 0x19C, 0x0 }, - { 0x17E, 0x18D, 0x192, 0x0 }, - { 0x17F, 0x18D, 0x192, 0x0 }, - { 0x180, 0x18D, 0x197, 0x0 }, - { 0x181, 0x18D, 0x19C, 0x0 }, - { 0x182, 0x18D, 0x262, 0x0 }, - { 0x183, 0x18D, 0x192, 0x0 }, - { 0x184, 0x18D, 0x192, 0x0 }, - { 0x185, 0x18D, 0x193, 0x0 }, - { 0x186, 0x18D, 0x191, 0x0 }, - { 0x187, 0x18D, 0x195, 0x0 }, - { 0x188, 0x18D, 0x192, 0x0 }, - { 0x189, 0x18D, 0x19D, 0x0 }, - { 0x18A, 0x18D, 0x262, 0x0 }, - { 0x18B, 0x18D, 0x192, 0x0 }, - { 0x18C, 0x18D, 0x198, 0x0 }, - { 0x18D, 0x18D, 0x191, 0x0 }, - { 0x18E, 0x19E, 0x192, 0x153 }, - { 0x18F, 0x19E, 0x19D, 0x154 }, - { 0x190, 0x19E, 0x190, 0x155 }, - { 0x191, 0x19E, 0x192, 0x156 }, - { 0x192, 0x19E, 0x190, 0x157 }, - { 0x193, 0x19E, 0x18E, 0x158 }, - { 0x194, 0x19E, 0x190, 0x159 }, - { 0x195, 0x19E, 0x192, 0x15A }, - { 0x196, 0x224, 0x225, 0x0 }, - { 0x197, 0x226, 0x227, 0x0 }, - { 0x198, 0x228, 0x229, 0x0 }, - { 0x199, 0x2B9, 0x2BA, 0x0 }, - { 0x19A, 0x2A9, 0x2AA, 0x0 }, - { 0x19B, 0x25E, 0x25F, 0x0 }, - { 0x19C, 0x29F, 0x2A0, 0x0 }, - { 0x19D, 0x2A3, 0x2A4, 0x0 }, - { 0x19E, 0x2A1, 0x2A2, 0x0 }, - { 0x19F, 0x295, 0x296, 0x0 }, - { 0x1A0, 0x284, 0x285, 0x0 }, - { 0x1A1, 0x25C, 0x25D, 0x0 }, - { 0x1A2, 0x290, 0x291, 0x0 }, - { 0x1A3, 0x2A7, 0x2A8, 0x0 }, - { 0x1A4, 0x1B7, 0x1B8, 0x169 }, - { 0x1A5, 0x1B9, 0x1BA, 0x16A }, - { 0x1A6, 0x15D, 0x15E, 0x104 }, - { 0x1A7, 0x161, 0x162, 0x106 }, - { 0x1A8, 0x163, 0x164, 0x107 }, - { 0x1A9, 0x165, 0x166, 0x108 }, - { 0x1AA, 0x16B, 0x16C, 0x0 }, - { 0x1AB, 0x175, 0x176, 0x0 }, - { 0x1AC, 0x1B5, 0x1B6, 0x168 }, - { 0x1AD, 0x1AD, 0x1AE, 0x0 }, - { 0x1AE, 0x177, 0x40, 0x0 }, - { 0x1AF, 0x25A, 0x25B, 0x0 }, - { 0x1B0, 0x260, 0x261, 0x0 }, - { 0x1B1, 0x2A5, 0x2A6, 0x0 }, - { 0x1B2, 0x167, 0x168, 0x109 }, - { 0x1B3, 0x169, 0x16A, 0x10A }, - { 0x1B4, 0x254, 0x255, 0x0 }, - { 0x1B5, 0x19F, 0x1A0, 0x15D }, - { 0x1B6, 0x1A1, 0x1A2, 0x0 }, - { 0x1B7, 0x1A3, 0x1A4, 0x0 }, - { 0x1B8, 0x1A5, 0x1A6, 0x0 }, - { 0x1B9, 0x256, 0x257, 0x11D }, - { 0x1BA, 0x258, 0x259, 0x0 }, - { 0x1BB, 0x2BD, 0x2BE, 0x0 }, - { 0x1BC, 0x2BF, 0x2C0, 0x0 }, - { 0x1BD, 0x2C1, 0x2C2, 0x15F } + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x1, 0x2, 0x3, 0x1 }, + { 0x2, 0x4, 0x5, 0x2 }, + { 0x3, 0x6, 0x7, 0x3 }, + { 0x4, 0x8, 0x9, 0x4 }, + { 0x5, 0xA, 0xB, 0x5 }, + { 0x6, 0xC, 0xD, 0x6 }, + { 0x7, 0xE, 0xF, 0x7 }, + { 0x8, 0x10, 0x11, 0x8 }, + { 0x9, 0x12, 0x13, 0x9 }, + { 0xA, 0x14, 0x13, 0xA }, + { 0xB, 0x15, 0x16, 0xB }, + { 0xC, 0x17, 0x16, 0xC }, + { 0xD, 0x297, 0x298, 0x0 }, + { 0xE, 0x299, 0x29A, 0x0 }, + { 0xF, 0x29B, 0x29C, 0x0 }, + { 0x10, 0x29D, 0x29E, 0x0 }, + { 0x11, 0x18, 0x19, 0xD }, + { 0x12, 0x1A, 0x1B, 0xE }, + { 0x13, 0x1E, 0x1C, 0xF }, + { 0x14, 0x1E, 0x1D, 0x10 }, + { 0x15, 0x1E, 0x1F, 0x11 }, + { 0x16, 0x1E, 0x20, 0x12 }, + { 0x17, 0x21, 0x22, 0x13 }, + { 0x18, 0x21, 0x23, 0x14 }, + { 0x19, 0x18, 0x24, 0x15 }, + { 0x1A, 0x18, 0x25, 0x16 }, + { 0x1B, 0x26, 0x27, 0x17 }, + { 0x1C, 0x28, 0x2A, 0x18 }, + { 0x1D, 0x29, 0x2A, 0x19 }, + { 0x1E, 0x2B, 0x2C, 0x1A }, + { 0x1F, 0x2D, 0x2E, 0x1B }, + { 0x20, 0x2F, 0x30, 0x1C }, + { 0x21, 0x31, 0x32, 0x1D }, + { 0x22, 0x33, 0x34, 0x1E }, + { 0x23, 0x35, 0x36, 0x1F }, + { 0x24, 0x33, 0x37, 0x20 }, + { 0x25, 0x38, 0x39, 0x21 }, + { 0x26, 0x3A, 0x3B, 0x22 }, + { 0x27, 0x3A, 0x3C, 0x23 }, + { 0x28, 0x3A, 0x3D, 0x24 }, + { 0x29, 0x3A, 0x3E, 0x25 }, + { 0x2A, 0x3F, 0x40, 0x26 }, + { 0x2B, 0x47, 0x48, 0x2C }, + { 0x2C, 0x49, 0x4A, 0x2D }, + { 0x2D, 0x53, 0x54, 0x3F }, + { 0x2E, 0x55, 0x56, 0x40 }, + { 0x2F, 0x55, 0x57, 0x41 }, + { 0x30, 0x55, 0x58, 0x42 }, + { 0x31, 0x55, 0x59, 0x43 }, + { 0x32, 0x5A, 0x5B, 0x44 }, + { 0x33, 0x5C, 0x5D, 0x45 }, + { 0x34, 0x55, 0x5E, 0x46 }, + { 0x35, 0x5F, 0x60, 0x47 }, + { 0x36, 0x1D2, 0x1D3, 0x0 }, + { 0x37, 0x64, 0x61, 0x49 }, + { 0x38, 0x64, 0x62, 0x4A }, + { 0x39, 0x64, 0x63, 0x4B }, + { 0x3A, 0x64, 0x65, 0x4C }, + { 0x3B, 0x64, 0x66, 0x4D }, + { 0x3C, 0x64, 0x67, 0x4E }, + { 0x3D, 0x64, 0x68, 0x4F }, + { 0x3E, 0x64, 0x1D5, 0x0 }, + { 0x3F, 0x69, 0x6A, 0x50 }, + { 0x40, 0x6B, 0x6C, 0x51 }, + { 0x41, 0x41, 0x42, 0x27 }, + { 0x42, 0x41, 0x43, 0x28 }, + { 0x43, 0x41, 0x44, 0x29 }, + { 0x44, 0x41, 0x45, 0x2A }, + { 0x45, 0x41, 0x46, 0x2B }, + { 0x46, 0x33, 0x4B, 0x2E }, + { 0x47, 0x4C, 0x4D, 0x2F }, + { 0x48, 0x4E, 0x4F, 0x30 }, + { 0x49, 0x4E, 0x50, 0x31 }, + { 0x4A, 0x4E, 0x51, 0x32 }, + { 0x4B, 0x4E, 0x52, 0x33 }, + { 0x4C, 0x6D, 0x6E, 0x53 }, + { 0x4D, 0x6D, 0x6F, 0x54 }, + { 0x4E, 0x70, 0x71, 0x55 }, + { 0x4F, 0x6D, 0x72, 0x56 }, + { 0x50, 0x73, 0x74, 0x5D }, + { 0x51, 0x75, 0x76, 0x5E }, + { 0x52, 0x77, 0x78, 0x5F }, + { 0x53, 0x79, 0x7A, 0x60 }, + { 0x54, 0x7B, 0x7C, 0x61 }, + { 0x55, 0x7D, 0x7E, 0x62 }, + { 0x56, 0x7F, 0x81, 0x67 }, + { 0x57, 0x80, 0x81, 0x68 }, + { 0x58, 0x82, 0x83, 0x6A }, + { 0x59, 0x84, 0x83, 0x6B }, + { 0x5A, 0x85, 0x86, 0x6C }, + { 0x5B, 0x87, 0x86, 0x6D }, + { 0x5C, 0x88, 0x89, 0x6E }, + { 0x5D, 0x8A, 0x8B, 0x6F }, + { 0x5E, 0x1D6, 0x1D7, 0x0 }, + { 0x5F, 0x1D8, 0x1D9, 0x0 }, + { 0x60, 0x1DA, 0x1DB, 0x0 }, + { 0x61, 0x1DC, 0x1DD, 0x0 }, + { 0x62, 0x1DE, 0x1DF, 0x0 }, + { 0x63, 0x188, 0x189, 0x11E }, + { 0x64, 0x18A, 0x189, 0x11F }, + { 0x65, 0x1AF, 0x1B0, 0x165 }, + { 0x66, 0x1B1, 0x1B0, 0x166 }, + { 0x67, 0x1A9, 0x1AA, 0x162 }, + { 0x68, 0x269, 0x26A, 0x0 }, + { 0x69, 0x267, 0x268, 0x0 }, + { 0x6A, 0x151, 0x152, 0x0 }, + { 0x6B, 0x1E0, 0x1E1, 0x0 }, + { 0x6C, 0x1E2, 0x1E3, 0x0 }, + { 0x6D, 0x1E4, 0x1E5, 0x0 }, + { 0x6E, 0x1E6, 0x1E7, 0x0 }, + { 0x6F, 0x1E8, 0x1E9, 0x0 }, + { 0x70, 0x2BB, 0x2BC, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x0, 0x2C3, 0x2C4, 0x0 }, + { 0x71, 0x288, 0x289, 0x0 }, + { 0x72, 0x286, 0x287, 0x0 }, + { 0x73, 0x8C, 0x8D, 0x0 }, + { 0x74, 0x8E, 0x8F, 0x0 }, + { 0x75, 0x90, 0x91, 0x0 }, + { 0x76, 0x92, 0x93, 0x0 }, + { 0x77, 0x94, 0x95, 0x0 }, + { 0x78, 0x96, 0x97, 0x0 }, + { 0x79, 0x98, 0x99, 0x0 }, + { 0x7A, 0x9A, 0x9B, 0x0 }, + { 0x7B, 0x9C, 0x9D, 0x0 }, + { 0x7C, 0x9E, 0x9F, 0x0 }, + { 0x7D, 0xA0, 0xA1, 0x0 }, + { 0x7E, 0xA2, 0xA3, 0x0 }, + { 0x7F, 0xA4, 0xA5, 0x85 }, + { 0x80, 0xA6, 0xA7, 0x86 }, + { 0x81, 0xA8, 0xA9, 0x87 }, + { 0x82, 0xAA, 0xAB, 0x88 }, + { 0x83, 0xAC, 0xAD, 0x89 }, + { 0x84, 0xAE, 0xAF, 0x8A }, + { 0x85, 0xB0, 0xB1, 0x8B }, + { 0x86, 0xB2, 0xB3, 0x8C }, + { 0x87, 0xB4, 0xB5, 0x8D }, + { 0x88, 0xB6, 0xB7, 0x8E }, + { 0x89, 0xB8, 0xB9, 0x8F }, + { 0x8A, 0xBA, 0xBB, 0x90 }, + { 0x8B, 0xBC, 0xBD, 0x91 }, + { 0x8C, 0xBE, 0xBF, 0x92 }, + { 0x8D, 0xC0, 0xC1, 0x93 }, + { 0x8E, 0xC2, 0xC3, 0x94 }, + { 0x8F, 0xC4, 0xC5, 0x95 }, + { 0x90, 0xC6, 0xC7, 0x96 }, + { 0x91, 0xC8, 0xC9, 0x97 }, + { 0x92, 0xCA, 0xCB, 0x98 }, + { 0x93, 0xCC, 0xCD, 0x99 }, + { 0x94, 0xCE, 0xCF, 0x9A }, + { 0x95, 0xD0, 0xD1, 0x9B }, + { 0x96, 0xD2, 0xD3, 0x9C }, + { 0x97, 0xD4, 0xD5, 0x9D }, + { 0x98, 0xD6, 0xD7, 0x9E }, + { 0x99, 0xD8, 0xD9, 0x9F }, + { 0x9A, 0xDA, 0xDB, 0xA0 }, + { 0x9B, 0xDC, 0xDD, 0xA1 }, + { 0x9C, 0xDE, 0xDF, 0xA2 }, + { 0x9D, 0xE0, 0xE1, 0xA3 }, + { 0x9E, 0xE2, 0xE3, 0xA4 }, + { 0x9F, 0xE4, 0xE5, 0xA5 }, + { 0xA0, 0xE6, 0xE7, 0xA6 }, + { 0xA1, 0xE8, 0xE9, 0xA7 }, + { 0xA2, 0x22A, 0x22B, 0x0 }, + { 0xA3, 0x22C, 0x22D, 0x0 }, + { 0xA4, 0x22E, 0x22F, 0x0 }, + { 0xA5, 0x230, 0x231, 0x0 }, + { 0xA6, 0x232, 0x233, 0x0 }, + { 0xA7, 0x234, 0x235, 0x0 }, + { 0xA8, 0x236, 0x237, 0x0 }, + { 0xA9, 0x238, 0x239, 0x0 }, + { 0xAA, 0x23A, 0x23B, 0x0 }, + { 0xAB, 0x23C, 0x23D, 0x0 }, + { 0xAC, 0x23E, 0x23F, 0x0 }, + { 0xAD, 0x240, 0x241, 0x0 }, + { 0xAE, 0x242, 0x243, 0x0 }, + { 0xAF, 0x244, 0x245, 0x0 }, + { 0xB0, 0x246, 0x247, 0x0 }, + { 0xB1, 0x248, 0x249, 0x0 }, + { 0xB2, 0x24A, 0x24B, 0x0 }, + { 0xB3, 0xEA, 0xEB, 0xA8 }, + { 0xB4, 0xEC, 0xED, 0xA9 }, + { 0xB5, 0xEE, 0xEF, 0xAA }, + { 0xB6, 0xF0, 0xF1, 0xAB }, + { 0xB7, 0xF2, 0xF3, 0xAC }, + { 0xB8, 0xF4, 0xF5, 0xAD }, + { 0xB9, 0xF6, 0xF7, 0xAE }, + { 0xBA, 0xF8, 0xF9, 0xAF }, + { 0xBB, 0x24C, 0x24D, 0x0 }, + { 0xBC, 0x24E, 0x24F, 0x0 }, + { 0xBD, 0x250, 0x251, 0x0 }, + { 0xBE, 0x252, 0x253, 0x0 }, + { 0xBF, 0xFA, 0xFB, 0xB3 }, + { 0xC0, 0xFC, 0xFD, 0xB4 }, + { 0xC1, 0xFE, 0xFF, 0xB5 }, + { 0xC2, 0x100, 0x101, 0xB6 }, + { 0xC3, 0x102, 0x103, 0xB7 }, + { 0xC4, 0x104, 0x105, 0xB8 }, + { 0xC5, 0xFC, 0x106, 0xB9 }, + { 0xC6, 0x107, 0x108, 0xBA }, + { 0xC7, 0x109, 0x10A, 0xBB }, + { 0xC8, 0x10B, 0x10C, 0xBC }, + { 0xC9, 0x10D, 0x10E, 0xBD }, + { 0xCA, 0x10F, 0x110, 0xBE }, + { 0xCB, 0x111, 0x112, 0xBF }, + { 0xCC, 0x113, 0x114, 0xC0 }, + { 0xCD, 0x115, 0x116, 0xC1 }, + { 0xCE, 0x117, 0x118, 0xC2 }, + { 0xCF, 0x119, 0x11A, 0xC3 }, + { 0xD0, 0x11B, 0x11C, 0xC4 }, + { 0xD1, 0x11D, 0x11E, 0xC5 }, + { 0xD2, 0x11F, 0x120, 0xC6 }, + { 0xD3, 0x121, 0x122, 0xC7 }, + { 0xD4, 0x123, 0x124, 0xC8 }, + { 0xD5, 0x125, 0x126, 0xC9 }, + { 0xD6, 0x127, 0x128, 0xCA }, + { 0xD7, 0x129, 0x12A, 0xCB }, + { 0xD8, 0x12B, 0x12C, 0xCC }, + { 0xD9, 0x12D, 0x12E, 0xCD }, + { 0xDA, 0x12F, 0x130, 0xCE }, + { 0xDB, 0x131, 0x130, 0xCF }, + { 0xDC, 0x132, 0x133, 0xD0 }, + { 0xDD, 0x134, 0x135, 0xD1 }, + { 0xDE, 0x136, 0x137, 0xD2 }, + { 0xDF, 0x138, 0x139, 0xD3 }, + { 0xE0, 0x13A, 0x13B, 0xD4 }, + { 0xE1, 0x13C, 0x13D, 0xD5 }, + { 0xE2, 0x13E, 0x13F, 0xD6 }, + { 0xE3, 0x140, 0x141, 0xD7 }, + { 0xE4, 0x142, 0x143, 0xD8 }, + { 0xE5, 0x144, 0x145, 0xD9 }, + { 0xE6, 0x146, 0x147, 0xDA }, + { 0xE7, 0x148, 0x4D, 0xDB }, + { 0xE8, 0x149, 0x14A, 0xDC }, + { 0xE9, 0x14B, 0x14C, 0xDD }, + { 0xEA, 0x14D, 0x14E, 0xDE }, + { 0xEB, 0x14F, 0x150, 0xDF }, + { 0xEC, 0x151, 0x152, 0xE0 }, + { 0xED, 0x153, 0x154, 0xE1 }, + { 0xEE, 0x155, 0x156, 0xFE }, + { 0xEF, 0x155, 0x157, 0xFF }, + { 0xF0, 0x155, 0x158, 0x100 }, + { 0xF1, 0x155, 0x159, 0x101 }, + { 0xF2, 0x155, 0x15A, 0x102 }, + { 0xF3, 0x1EA, 0x1EB, 0x0 }, + { 0xF4, 0x1EC, 0x1ED, 0x0 }, + { 0xF5, 0x1EE, 0x1EF, 0x0 }, + { 0xF6, 0x1F0, 0x1F1, 0x0 }, + { 0xF7, 0x263, 0x264, 0x0 }, + { 0xF8, 0x1F2, 0x1F3, 0x0 }, + { 0xF9, 0x1F4, 0x1F5, 0x0 }, + { 0xFA, 0x1F6, 0x1F7, 0x0 }, + { 0xFB, 0x1F8, 0x1F9, 0x0 }, + { 0xFC, 0x14F, 0x292, 0x0 }, + { 0xFD, 0x293, 0x294, 0x0 }, + { 0xFE, 0x1FA, 0x1FB, 0x0 }, + { 0xFF, 0x1FC, 0x1FD, 0x0 }, + { 0x100, 0x265, 0x266, 0x0 }, + { 0x101, 0x28A, 0x28B, 0x0 }, + { 0x102, 0x28E, 0x28F, 0x0 }, + { 0x103, 0x1FE, 0x1FF, 0x0 }, + { 0x104, 0x27C, 0x27D, 0x0 }, + { 0x105, 0x27E, 0x27F, 0x0 }, + { 0x106, 0x280, 0x281, 0x0 }, + { 0x107, 0x282, 0x283, 0x0 }, + { 0x108, 0x28C, 0x28D, 0x0 }, + { 0x109, 0x200, 0x201, 0x0 }, + { 0x10A, 0x202, 0x203, 0x0 }, + { 0x10B, 0x2AB, 0x2AC, 0x0 }, + { 0x10C, 0x2B3, 0x2B4, 0x0 }, + { 0x10D, 0x2B5, 0x2B6, 0x0 }, + { 0x10E, 0x2AD, 0x2AE, 0x0 }, + { 0x10F, 0x2AF, 0x2B0, 0x0 }, + { 0x110, 0x2B1, 0x2B2, 0x0 }, + { 0x111, 0x204, 0x205, 0x0 }, + { 0x112, 0x206, 0x207, 0x0 }, + { 0x113, 0x208, 0x209, 0x0 }, + { 0x114, 0x26B, 0x26C, 0x0 }, + { 0x115, 0x26B, 0x26D, 0x0 }, + { 0x116, 0x26B, 0x26E, 0x0 }, + { 0x117, 0x26B, 0x26F, 0x0 }, + { 0x118, 0x26B, 0x270, 0x0 }, + { 0x119, 0x26B, 0x271, 0x0 }, + { 0x11A, 0x26B, 0x272, 0x0 }, + { 0x11B, 0x26B, 0x273, 0x0 }, + { 0x11C, 0x26B, 0x274, 0x0 }, + { 0x11D, 0x26B, 0x275, 0x0 }, + { 0x11E, 0x26B, 0x276, 0x0 }, + { 0x11F, 0x26B, 0x277, 0x0 }, + { 0x120, 0x26B, 0x278, 0x0 }, + { 0x121, 0x26B, 0x279, 0x0 }, + { 0x122, 0x26B, 0x27A, 0x0 }, + { 0x123, 0x26B, 0x27B, 0x0 }, + { 0x124, 0x20A, 0x20B, 0x0 }, + { 0x125, 0x20C, 0x20D, 0x0 }, + { 0x126, 0x20E, 0x20F, 0x0 }, + { 0x127, 0x210, 0x211, 0x0 }, + { 0x128, 0x212, 0x213, 0x0 }, + { 0x129, 0x214, 0x215, 0x0 }, + { 0x12A, 0x216, 0x217, 0x0 }, + { 0x12B, 0x2B7, 0x2B8, 0x0 }, + { 0x12C, 0x218, 0x219, 0x0 }, + { 0x12D, 0x21A, 0x21B, 0x0 }, + { 0x12E, 0x21C, 0x21D, 0x0 }, + { 0x12F, 0x21E, 0x21F, 0x0 }, + { 0x130, 0x220, 0x221, 0x0 }, + { 0x131, 0x222, 0x223, 0x0 }, + { 0x132, 0x18D, 0x18E, 0x121 }, + { 0x133, 0x18D, 0x18F, 0x122 }, + { 0x134, 0x18D, 0x190, 0x123 }, + { 0x135, 0x18D, 0x191, 0x124 }, + { 0x136, 0x18D, 0x192, 0x125 }, + { 0x137, 0x18D, 0x193, 0x126 }, + { 0x138, 0x18D, 0x194, 0x127 }, + { 0x139, 0x18D, 0x18E, 0x128 }, + { 0x13A, 0x18D, 0x195, 0x129 }, + { 0x13B, 0x18D, 0x192, 0x12A }, + { 0x13C, 0x18D, 0x196, 0x12B }, + { 0x13D, 0x18D, 0x197, 0x12C }, + { 0x13E, 0x18D, 0x194, 0x12D }, + { 0x13F, 0x18D, 0x194, 0x12E }, + { 0x140, 0x18D, 0x192, 0x12F }, + { 0x141, 0x18D, 0x191, 0x130 }, + { 0x142, 0x18D, 0x192, 0x131 }, + { 0x143, 0x18D, 0x190, 0x132 }, + { 0x144, 0x18D, 0x195, 0x133 }, + { 0x145, 0x18D, 0x192, 0x134 }, + { 0x146, 0x18D, 0x192, 0x135 }, + { 0x147, 0x18D, 0x195, 0x136 }, + { 0x148, 0x18D, 0x198, 0x137 }, + { 0x149, 0x18D, 0x199, 0x138 }, + { 0x14A, 0x18D, 0x199, 0x139 }, + { 0x14B, 0x18D, 0x19A, 0x13A }, + { 0x14C, 0x18D, 0x192, 0x13B }, + { 0x14D, 0x18D, 0x19A, 0x13C }, + { 0x14E, 0x18D, 0x191, 0x13D }, + { 0x14F, 0x18D, 0x19B, 0x13E }, + { 0x150, 0x18D, 0x18E, 0x13F }, + { 0x151, 0x18D, 0x192, 0x140 }, + { 0x152, 0x18D, 0x191, 0x141 }, + { 0x153, 0x18D, 0x199, 0x142 }, + { 0x154, 0x18D, 0x196, 0x143 }, + { 0x155, 0x18D, 0x193, 0x144 }, + { 0x156, 0x18D, 0x19C, 0x145 }, + { 0x157, 0x18D, 0x196, 0x146 }, + { 0x158, 0x18D, 0x19C, 0x147 }, + { 0x159, 0x18D, 0x19D, 0x148 }, + { 0x15A, 0x18D, 0x197, 0x149 }, + { 0x15B, 0x18D, 0x192, 0x14A }, + { 0x15C, 0x18D, 0x192, 0x14B }, + { 0x15D, 0x18D, 0x191, 0x14C }, + { 0x15E, 0x18D, 0x192, 0x14D }, + { 0x15F, 0x18D, 0x197, 0x14E }, + { 0x160, 0x18D, 0x198, 0x14F }, + { 0x161, 0x18D, 0x191, 0x150 }, + { 0x162, 0x18D, 0x197, 0x151 }, + { 0x163, 0x18D, 0x196, 0x152 }, + { 0x164, 0x18D, 0x19D, 0x0 }, + { 0x165, 0x18D, 0x18E, 0x0 }, + { 0x166, 0x18D, 0x195, 0x0 }, + { 0x167, 0x18D, 0x192, 0x0 }, + { 0x168, 0x18D, 0x190, 0x0 }, + { 0x169, 0x18D, 0x197, 0x0 }, + { 0x16A, 0x18D, 0x199, 0x0 }, + { 0x16B, 0x18D, 0x192, 0x0 }, + { 0x16C, 0x18D, 0x18F, 0x0 }, + { 0x16D, 0x18D, 0x18E, 0x0 }, + { 0x16E, 0x18D, 0x196, 0x0 }, + { 0x16F, 0x18D, 0x262, 0x0 }, + { 0x170, 0x18D, 0x197, 0x0 }, + { 0x171, 0x18D, 0x192, 0x0 }, + { 0x172, 0x18D, 0x19B, 0x0 }, + { 0x173, 0x18D, 0x197, 0x0 }, + { 0x174, 0x18D, 0x192, 0x0 }, + { 0x175, 0x18D, 0x192, 0x0 }, + { 0x176, 0x18D, 0x19C, 0x0 }, + { 0x177, 0x18D, 0x192, 0x0 }, + { 0x178, 0x18D, 0x19C, 0x0 }, + { 0x179, 0x18D, 0x194, 0x0 }, + { 0x17A, 0x18D, 0x199, 0x0 }, + { 0x17B, 0x18D, 0x198, 0x0 }, + { 0x17C, 0x18D, 0x192, 0x0 }, + { 0x17D, 0x18D, 0x19C, 0x0 }, + { 0x17E, 0x18D, 0x192, 0x0 }, + { 0x17F, 0x18D, 0x192, 0x0 }, + { 0x180, 0x18D, 0x197, 0x0 }, + { 0x181, 0x18D, 0x19C, 0x0 }, + { 0x182, 0x18D, 0x262, 0x0 }, + { 0x183, 0x18D, 0x192, 0x0 }, + { 0x184, 0x18D, 0x192, 0x0 }, + { 0x185, 0x18D, 0x193, 0x0 }, + { 0x186, 0x18D, 0x191, 0x0 }, + { 0x187, 0x18D, 0x195, 0x0 }, + { 0x188, 0x18D, 0x192, 0x0 }, + { 0x189, 0x18D, 0x19D, 0x0 }, + { 0x18A, 0x18D, 0x262, 0x0 }, + { 0x18B, 0x18D, 0x192, 0x0 }, + { 0x18C, 0x18D, 0x198, 0x0 }, + { 0x18D, 0x18D, 0x191, 0x0 }, + { 0x18E, 0x19E, 0x192, 0x153 }, + { 0x18F, 0x19E, 0x19D, 0x154 }, + { 0x190, 0x19E, 0x190, 0x155 }, + { 0x191, 0x19E, 0x192, 0x156 }, + { 0x192, 0x19E, 0x190, 0x157 }, + { 0x193, 0x19E, 0x18E, 0x158 }, + { 0x194, 0x19E, 0x190, 0x159 }, + { 0x195, 0x19E, 0x192, 0x15A }, + { 0x196, 0x224, 0x225, 0x0 }, + { 0x197, 0x226, 0x227, 0x0 }, + { 0x198, 0x228, 0x229, 0x0 }, + { 0x199, 0x2B9, 0x2BA, 0x0 }, + { 0x19A, 0x2A9, 0x2AA, 0x0 }, + { 0x19B, 0x25E, 0x25F, 0x0 }, + { 0x19C, 0x29F, 0x2A0, 0x0 }, + { 0x19D, 0x2A3, 0x2A4, 0x0 }, + { 0x19E, 0x2A1, 0x2A2, 0x0 }, + { 0x19F, 0x295, 0x296, 0x0 }, + { 0x1A0, 0x284, 0x285, 0x0 }, + { 0x1A1, 0x25C, 0x25D, 0x0 }, + { 0x1A2, 0x290, 0x291, 0x0 }, + { 0x1A3, 0x2A7, 0x2A8, 0x0 }, + { 0x1A4, 0x1B7, 0x1B8, 0x169 }, + { 0x1A5, 0x1B9, 0x1BA, 0x16A }, + { 0x1A6, 0x15D, 0x15E, 0x104 }, + { 0x1A7, 0x161, 0x162, 0x106 }, + { 0x1A8, 0x163, 0x164, 0x107 }, + { 0x1A9, 0x165, 0x166, 0x108 }, + { 0x1AA, 0x16B, 0x16C, 0x0 }, + { 0x1AB, 0x175, 0x176, 0x0 }, + { 0x1AC, 0x1B5, 0x1B6, 0x168 }, + { 0x1AD, 0x1AD, 0x1AE, 0x0 }, + { 0x1AE, 0x177, 0x40, 0x0 }, + { 0x1AF, 0x25A, 0x25B, 0x0 }, + { 0x1B0, 0x260, 0x261, 0x0 }, + { 0x1B1, 0x2A5, 0x2A6, 0x0 }, + { 0x1B2, 0x167, 0x168, 0x109 }, + { 0x1B3, 0x169, 0x16A, 0x10A }, + { 0x1B4, 0x254, 0x255, 0x0 }, + { 0x1B5, 0x19F, 0x1A0, 0x15D }, + { 0x1B6, 0x1A1, 0x1A2, 0x0 }, + { 0x1B7, 0x1A3, 0x1A4, 0x0 }, + { 0x1B8, 0x1A5, 0x1A6, 0x0 }, + { 0x1B9, 0x256, 0x257, 0x11D }, + { 0x1BA, 0x258, 0x259, 0x0 }, + { 0x1BB, 0x2BD, 0x2BE, 0x0 }, + { 0x1BC, 0x2BF, 0x2C0, 0x0 }, + { 0x1BD, 0x2C1, 0x2C2, 0x15F } }; static const u16 sTMHMMoves[] = { - MOVE_FOCUS_PUNCH, // TM01 - MOVE_DRAGON_CLAW, // TM02 - MOVE_WATER_PULSE, // TM03 - MOVE_CALM_MIND, // TM04 - MOVE_ROAR, // TM05 - MOVE_TOXIC, // TM06 - MOVE_HAIL, // TM07 - MOVE_BULK_UP, // TM08 - MOVE_BULLET_SEED, // TM09 - MOVE_HIDDEN_POWER, // TM10 - MOVE_SUNNY_DAY, // TM11 - MOVE_TAUNT, // TM12 - MOVE_ICE_BEAM, // TM13 - MOVE_BLIZZARD, // TM14 - MOVE_HYPER_BEAM, // TM15 - MOVE_LIGHT_SCREEN, // TM16 - MOVE_PROTECT, // TM17 - MOVE_RAIN_DANCE, // TM18 - MOVE_GIGA_DRAIN, // TM19 - MOVE_SAFEGUARD, // TM20 - MOVE_FRUSTRATION, // TM21 - MOVE_SOLAR_BEAM, // TM22 - MOVE_IRON_TAIL, // TM23 - MOVE_THUNDERBOLT, // TM24 - MOVE_THUNDER, // TM25 - MOVE_EARTHQUAKE, // TM26 - MOVE_RETURN, // TM27 - MOVE_DIG, // TM28 - MOVE_PSYCHIC, // TM29 - MOVE_SHADOW_BALL, // TM30 - MOVE_BRICK_BREAK, // TM31 - MOVE_DOUBLE_TEAM, // TM32 - MOVE_REFLECT, // TM33 - MOVE_SHOCK_WAVE, // TM34 - MOVE_FLAMETHROWER, // TM35 - MOVE_SLUDGE_BOMB, // TM36 - MOVE_SANDSTORM, // TM37 - MOVE_FIRE_BLAST, // TM38 - MOVE_ROCK_TOMB, // TM39 - MOVE_AERIAL_ACE, // TM40 - MOVE_TORMENT, // TM41 - MOVE_FACADE, // TM42 - MOVE_SECRET_POWER, // TM43 - MOVE_REST, // TM44 - MOVE_ATTRACT, // TM45 - MOVE_THIEF, // TM46 - MOVE_STEEL_WING, // TM47 - MOVE_SKILL_SWAP, // TM48 - MOVE_SNATCH, // TM49 - MOVE_OVERHEAT, // TM50 - MOVE_ROOST, // TM51 - MOVE_FOCUS_BLAST, // TM52 - MOVE_ENERGY_BALL, // TM53 - MOVE_FALSE_SWIPE, // TM54 - MOVE_BRINE, // TM55 - MOVE_FLING, // TM56 - MOVE_CHARGE_BEAM, // TM57 - MOVE_ENDURE, // TM58 - MOVE_DRAGON_PULSE, // TM59 - MOVE_DRAIN_PUNCH, // TM60 - MOVE_WILL_O_WISP, // TM61 - MOVE_SILVER_WIND, // TM62 - MOVE_EMBARGO, // TM63 - MOVE_EXPLOSION, // TM64 - MOVE_SHADOW_CLAW, // TM65 - MOVE_PAYBACK, // TM66 - MOVE_RECYCLE, // TM67 - MOVE_GIGA_IMPACT, // TM68 - MOVE_ROCK_POLISH, // TM69 - MOVE_FLASH, // TM70 - MOVE_STONE_EDGE, // TM71 - MOVE_AVALANCHE, // TM72 - MOVE_THUNDER_WAVE, // TM73 - MOVE_GYRO_BALL, // TM74 - MOVE_SWORDS_DANCE, // TM75 - MOVE_STEALTH_ROCK, // TM76 - MOVE_PSYCH_UP, // TM77 - MOVE_CAPTIVATE, // TM78 - MOVE_DARK_PULSE, // TM79 - MOVE_ROCK_SLIDE, // TM80 - MOVE_X_SCISSOR, // TM81 - MOVE_SLEEP_TALK, // TM82 - MOVE_NATURAL_GIFT, // TM83 - MOVE_POISON_JAB, // TM84 - MOVE_DREAM_EATER, // TM85 - MOVE_GRASS_KNOT, // TM86 - MOVE_SWAGGER, // TM87 - MOVE_PLUCK, // TM88 - MOVE_U_TURN, // TM89 - MOVE_SUBSTITUTE, // TM90 - MOVE_FLASH_CANNON, // TM91 - MOVE_TRICK_ROOM, // TM92 - MOVE_CUT, // HM01 - MOVE_FLY, // HM02 - MOVE_SURF, // HM03 - MOVE_STRENGTH, // HM04 - MOVE_DEFOG, // HM05 - MOVE_ROCK_SMASH, // HM06 - MOVE_WATERFALL, // HM07 - MOVE_ROCK_CLIMB, // HM08 + MOVE_FOCUS_PUNCH, // TM01 + MOVE_DRAGON_CLAW, // TM02 + MOVE_WATER_PULSE, // TM03 + MOVE_CALM_MIND, // TM04 + MOVE_ROAR, // TM05 + MOVE_TOXIC, // TM06 + MOVE_HAIL, // TM07 + MOVE_BULK_UP, // TM08 + MOVE_BULLET_SEED, // TM09 + MOVE_HIDDEN_POWER, // TM10 + MOVE_SUNNY_DAY, // TM11 + MOVE_TAUNT, // TM12 + MOVE_ICE_BEAM, // TM13 + MOVE_BLIZZARD, // TM14 + MOVE_HYPER_BEAM, // TM15 + MOVE_LIGHT_SCREEN, // TM16 + MOVE_PROTECT, // TM17 + MOVE_RAIN_DANCE, // TM18 + MOVE_GIGA_DRAIN, // TM19 + MOVE_SAFEGUARD, // TM20 + MOVE_FRUSTRATION, // TM21 + MOVE_SOLAR_BEAM, // TM22 + MOVE_IRON_TAIL, // TM23 + MOVE_THUNDERBOLT, // TM24 + MOVE_THUNDER, // TM25 + MOVE_EARTHQUAKE, // TM26 + MOVE_RETURN, // TM27 + MOVE_DIG, // TM28 + MOVE_PSYCHIC, // TM29 + MOVE_SHADOW_BALL, // TM30 + MOVE_BRICK_BREAK, // TM31 + MOVE_DOUBLE_TEAM, // TM32 + MOVE_REFLECT, // TM33 + MOVE_SHOCK_WAVE, // TM34 + MOVE_FLAMETHROWER, // TM35 + MOVE_SLUDGE_BOMB, // TM36 + MOVE_SANDSTORM, // TM37 + MOVE_FIRE_BLAST, // TM38 + MOVE_ROCK_TOMB, // TM39 + MOVE_AERIAL_ACE, // TM40 + MOVE_TORMENT, // TM41 + MOVE_FACADE, // TM42 + MOVE_SECRET_POWER, // TM43 + MOVE_REST, // TM44 + MOVE_ATTRACT, // TM45 + MOVE_THIEF, // TM46 + MOVE_STEEL_WING, // TM47 + MOVE_SKILL_SWAP, // TM48 + MOVE_SNATCH, // TM49 + MOVE_OVERHEAT, // TM50 + MOVE_ROOST, // TM51 + MOVE_FOCUS_BLAST, // TM52 + MOVE_ENERGY_BALL, // TM53 + MOVE_FALSE_SWIPE, // TM54 + MOVE_BRINE, // TM55 + MOVE_FLING, // TM56 + MOVE_CHARGE_BEAM, // TM57 + MOVE_ENDURE, // TM58 + MOVE_DRAGON_PULSE, // TM59 + MOVE_DRAIN_PUNCH, // TM60 + MOVE_WILL_O_WISP, // TM61 + MOVE_SILVER_WIND, // TM62 + MOVE_EMBARGO, // TM63 + MOVE_EXPLOSION, // TM64 + MOVE_SHADOW_CLAW, // TM65 + MOVE_PAYBACK, // TM66 + MOVE_RECYCLE, // TM67 + MOVE_GIGA_IMPACT, // TM68 + MOVE_ROCK_POLISH, // TM69 + MOVE_FLASH, // TM70 + MOVE_STONE_EDGE, // TM71 + MOVE_AVALANCHE, // TM72 + MOVE_THUNDER_WAVE, // TM73 + MOVE_GYRO_BALL, // TM74 + MOVE_SWORDS_DANCE, // TM75 + MOVE_STEALTH_ROCK, // TM76 + MOVE_PSYCH_UP, // TM77 + MOVE_CAPTIVATE, // TM78 + MOVE_DARK_PULSE, // TM79 + MOVE_ROCK_SLIDE, // TM80 + MOVE_X_SCISSOR, // TM81 + MOVE_SLEEP_TALK, // TM82 + MOVE_NATURAL_GIFT, // TM83 + MOVE_POISON_JAB, // TM84 + MOVE_DREAM_EATER, // TM85 + MOVE_GRASS_KNOT, // TM86 + MOVE_SWAGGER, // TM87 + MOVE_PLUCK, // TM88 + MOVE_U_TURN, // TM89 + MOVE_SUBSTITUTE, // TM90 + MOVE_FLASH_CANNON, // TM91 + MOVE_TRICK_ROOM, // TM92 + MOVE_CUT, // HM01 + MOVE_FLY, // HM02 + MOVE_SURF, // HM03 + MOVE_STRENGTH, // HM04 + MOVE_DEFOG, // HM05 + MOVE_ROCK_SMASH, // HM06 + MOVE_WATERFALL, // HM07 + MOVE_ROCK_CLIMB, // HM08 }; const u16 sMailItemIDs[] = { - ITEM_GRASS_MAIL, - ITEM_FLAME_MAIL, - ITEM_BUBBLE_MAIL, - ITEM_BLOOM_MAIL, - ITEM_TUNNEL_MAIL, - ITEM_STEEL_MAIL, - ITEM_HEART_MAIL, - ITEM_SNOW_MAIL, - ITEM_SPACE_MAIL, - ITEM_AIR_MAIL, - ITEM_MOSAIC_MAIL, - ITEM_BRICK_MAIL + ITEM_GRASS_MAIL, + ITEM_FLAME_MAIL, + ITEM_BUBBLE_MAIL, + ITEM_BLOOM_MAIL, + ITEM_TUNNEL_MAIL, + ITEM_STEEL_MAIL, + ITEM_HEART_MAIL, + ITEM_SNOW_MAIL, + ITEM_SPACE_MAIL, + ITEM_AIR_MAIL, + ITEM_MOSAIC_MAIL, + ITEM_BRICK_MAIL }; const u16 sBerryItemIDs[] = { - ITEM_CHERI_BERRY, - ITEM_CHESTO_BERRY, - ITEM_PECHA_BERRY, - ITEM_RAWST_BERRY, - ITEM_ASPEAR_BERRY, - ITEM_LEPPA_BERRY, - ITEM_ORAN_BERRY, - ITEM_PERSIM_BERRY, - ITEM_LUM_BERRY, - ITEM_SITRUS_BERRY, - ITEM_FIGY_BERRY, - ITEM_WIKI_BERRY, - ITEM_MAGO_BERRY, - ITEM_AGUAV_BERRY, - ITEM_IAPAPA_BERRY, - ITEM_RAZZ_BERRY, - ITEM_BLUK_BERRY, - ITEM_NANAB_BERRY, - ITEM_WEPEAR_BERRY, - ITEM_PINAP_BERRY, - ITEM_POMEG_BERRY, - ITEM_KELPSY_BERRY, - ITEM_QUALOT_BERRY, - ITEM_HONDEW_BERRY, - ITEM_GREPA_BERRY, - ITEM_TAMATO_BERRY, - ITEM_CORNN_BERRY, - ITEM_MAGOST_BERRY, - ITEM_RABUTA_BERRY, - ITEM_NOMEL_BERRY, - ITEM_SPELON_BERRY, - ITEM_PAMTRE_BERRY, - ITEM_WATMEL_BERRY, - ITEM_DURIN_BERRY, - ITEM_BELUE_BERRY, - ITEM_OCCA_BERRY, - ITEM_PASSHO_BERRY, - ITEM_WACAN_BERRY, - ITEM_RINDO_BERRY, - ITEM_YACHE_BERRY, - ITEM_CHOPLE_BERRY, - ITEM_KEBIA_BERRY, - ITEM_SHUCA_BERRY, - ITEM_COBA_BERRY, - ITEM_PAYAPA_BERRY, - ITEM_TANGA_BERRY, - ITEM_CHARTI_BERRY, - ITEM_KASIB_BERRY, - ITEM_HABAN_BERRY, - ITEM_COLBUR_BERRY, - ITEM_BABIRI_BERRY, - ITEM_CHILAN_BERRY, - ITEM_LIECHI_BERRY, - ITEM_GANLON_BERRY, - ITEM_SALAC_BERRY, - ITEM_PETAYA_BERRY, - ITEM_APICOT_BERRY, - ITEM_LANSAT_BERRY, - ITEM_STARF_BERRY, - ITEM_ENIGMA_BERRY, - ITEM_MICLE_BERRY, - ITEM_CUSTAP_BERRY, - ITEM_JABOCA_BERRY, - ITEM_ROWAP_BERRY + ITEM_CHERI_BERRY, + ITEM_CHESTO_BERRY, + ITEM_PECHA_BERRY, + ITEM_RAWST_BERRY, + ITEM_ASPEAR_BERRY, + ITEM_LEPPA_BERRY, + ITEM_ORAN_BERRY, + ITEM_PERSIM_BERRY, + ITEM_LUM_BERRY, + ITEM_SITRUS_BERRY, + ITEM_FIGY_BERRY, + ITEM_WIKI_BERRY, + ITEM_MAGO_BERRY, + ITEM_AGUAV_BERRY, + ITEM_IAPAPA_BERRY, + ITEM_RAZZ_BERRY, + ITEM_BLUK_BERRY, + ITEM_NANAB_BERRY, + ITEM_WEPEAR_BERRY, + ITEM_PINAP_BERRY, + ITEM_POMEG_BERRY, + ITEM_KELPSY_BERRY, + ITEM_QUALOT_BERRY, + ITEM_HONDEW_BERRY, + ITEM_GREPA_BERRY, + ITEM_TAMATO_BERRY, + ITEM_CORNN_BERRY, + ITEM_MAGOST_BERRY, + ITEM_RABUTA_BERRY, + ITEM_NOMEL_BERRY, + ITEM_SPELON_BERRY, + ITEM_PAMTRE_BERRY, + ITEM_WATMEL_BERRY, + ITEM_DURIN_BERRY, + ITEM_BELUE_BERRY, + ITEM_OCCA_BERRY, + ITEM_PASSHO_BERRY, + ITEM_WACAN_BERRY, + ITEM_RINDO_BERRY, + ITEM_YACHE_BERRY, + ITEM_CHOPLE_BERRY, + ITEM_KEBIA_BERRY, + ITEM_SHUCA_BERRY, + ITEM_COBA_BERRY, + ITEM_PAYAPA_BERRY, + ITEM_TANGA_BERRY, + ITEM_CHARTI_BERRY, + ITEM_KASIB_BERRY, + ITEM_HABAN_BERRY, + ITEM_COLBUR_BERRY, + ITEM_BABIRI_BERRY, + ITEM_CHILAN_BERRY, + ITEM_LIECHI_BERRY, + ITEM_GANLON_BERRY, + ITEM_SALAC_BERRY, + ITEM_PETAYA_BERRY, + ITEM_APICOT_BERRY, + ITEM_LANSAT_BERRY, + ITEM_STARF_BERRY, + ITEM_ENIGMA_BERRY, + ITEM_MICLE_BERRY, + ITEM_CUSTAP_BERRY, + ITEM_JABOCA_BERRY, + ITEM_ROWAP_BERRY }; void Item_MoveInPocket(void *pocket, u16 srcSlot, u16 dstSlot) @@ -687,16 +687,16 @@ void Item_MoveInPocket(void *pocket, u16 srcSlot, u16 dstSlot) BagItem item = items[srcSlot]; s16 i; // must be here to match if (dstSlot > srcSlot) { - // Moving the item down in the pocket list + // Moving the item down in the pocket list dstSlot -= 1; - // Bubble all the other items upward + // Bubble all the other items upward for (i = (s16)srcSlot; i < (s16)dstSlot; i++) { items[i] = items[i + 1]; } } else { - // Moving the item up in the pocket list - // Sift all the other items downward + // Moving the item up in the pocket list + // Sift all the other items downward for (i = (s16)srcSlot; i > (s16)dstSlot; i--) { items[i] = items[i - 1]; } @@ -756,17 +756,17 @@ u16 Item_FromGBAID(u16 gbaID) return ITEM_NONE; } -u16 Item_IconNCERFile (void) +u16 Item_IconNCERFile(void) { return 1; } -u16 Item_IconNANRFile (void) +u16 Item_IconNANRFile(void) { return 0; } -void* Item_Load(u16 item, enum ItemFileType type, u32 heapID) +void *Item_Load(u16 item, enum ItemFileType type, u32 heapID) { if (item > NUM_ITEMS) { item = ITEM_NONE; @@ -854,7 +854,7 @@ s32 Item_Get(ItemData *itemData, enum ItemDataParam param) return 0; } -static s32 ItemPartyParam_Get(ItemPartyParam * partyParam, enum ItemDataParam attributeID) +static s32 ItemPartyParam_Get(ItemPartyParam *partyParam, enum ItemDataParam attributeID) { switch (attributeID) { case ITEM_PARAM_HEAL_SLEEP: @@ -1033,7 +1033,7 @@ u8 Item_BerryNumber(u16 item) u16 Item_ForBerryNumber(u8 berry) { - if (berry >= NUM_BERRIES) { + if (berry >= NUM_BERRIES) { return ITEM_RETURN_ID; } @@ -1042,19 +1042,19 @@ u16 Item_ForBerryNumber(u8 berry) u8 Item_IsHerbalMedicine(u16 item) { - return item == ITEM_ENERGYPOWDER - || item == ITEM_ENERGY_ROOT - || item == ITEM_HEAL_POWDER - || item == ITEM_REVIVAL_HERB; + return item == ITEM_ENERGYPOWDER + || item == ITEM_ENERGY_ROOT + || item == ITEM_HEAL_POWDER + || item == ITEM_REVIVAL_HERB; } -void* ItemTable_Load(int heapID) +void *ItemTable_Load(int heapID) { int maxItem = Item_FileID(NUM_ITEMS, ITEM_FILE_TYPE_DATA); return NARC_AllocAndReadFromMemberByIndexPair(NARC_INDEX_ITEMTOOL__ITEMDATA__PL_ITEM_DATA, 0, heapID, 0, sizeof(ItemData) * maxItem); } -ItemData* ItemTable_Index(ItemData *itemTable, u16 index) +ItemData *ItemTable_Index(ItemData *itemTable, u16 index) { return (ItemData *)((u8 *)itemTable + index * sizeof(ItemData)); } diff --git a/src/journal.c b/src/journal.c index 16a4ea8428..9054a8a2ae 100644 --- a/src/journal.c +++ b/src/journal.c @@ -1,22 +1,20 @@ +#include "journal.h" + #include #include -#include "trainer_info.h" -#include "savedata.h" - #include "struct_defs/struct_0202BC58.h" #include "struct_defs/struct_0202BCC8.h" #include "struct_defs/struct_0202BE38.h" #include "struct_defs/struct_0202BF4C.h" #include "struct_defs/struct_0202BFCC.h" -#include "rtc.h" #include "heap.h" +#include "map_header.h" +#include "play_time.h" +#include "rtc.h" #include "savedata.h" #include "trainer_info.h" -#include "journal.h" -#include "play_time.h" -#include "map_header.h" typedef struct Journal_t { UnkStruct_0202BC58 unk_00; @@ -37,106 +35,106 @@ typedef struct { u16 unk_06; } UnkStruct_020E5B50; -static void sub_0202B7A0(Journal * param0, UnkStruct_0202BC58 * param1); -static void sub_0202B7E0(Journal * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202B880(Journal * param0, UnkStruct_0202BE38 * param1); -static void sub_0202B88C(Journal * param0, UnkStruct_0202BF4C * param1); -static void sub_0202B898(Journal * param0, UnkStruct_0202BFCC * param1); -static u32 * sub_0202B91C(u32 * param0); -static u8 * sub_0202B954(Journal * param0); -static void sub_0202B994(u32 * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202B9D0(u32 * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202B9F0(u32 * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202BA48(u32 * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202BAB0(u32 * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202BAF8(u32 * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202BB40(u32 * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202BB88(u8 * param0, UnkStruct_0202BFCC * param1); -static void sub_0202BBC4(u8 * param0, UnkStruct_0202BFCC * param1); -static void sub_0202BBE0(u8 * param0, UnkStruct_0202BFCC * param1); -static void sub_0202BC14(Journal * param0, UnkStruct_0202BFCC * param1); -static void sub_0202BC48(u8 * param0, UnkStruct_0202BFCC * param1); -static void sub_0202BF94(const u16 * param0, u16 * param1, u32 param2); -static void sub_0202C2FC(Journal * param0, UnkStruct_0202BC58 * param1); -static void sub_0202C304(Journal * param0, UnkStruct_0202BCC8 * param1); -static void sub_0202C3B8(Journal * param0, UnkStruct_0202BE38 * param1); -static void sub_0202C3C4(Journal * param0, UnkStruct_0202BF4C * param1); -static void sub_0202C3D0(Journal * param0, UnkStruct_0202BFCC * param1); -static void sub_0202C474(u32 param0, UnkStruct_0202BCC8 * param1); -static void sub_0202C47C(u32 param0, UnkStruct_0202BCC8 * param1); -static void sub_0202C494(u32 param0, UnkStruct_0202BCC8 * param1); -static void sub_0202C4A0(u32 param0, UnkStruct_0202BCC8 * param1); -static void sub_0202C4AC(u32 param0, UnkStruct_0202BCC8 * param1); -static void sub_0202C4B8(u8 * param0, UnkStruct_0202BFCC * param1); -static void sub_0202C528(u8 * param0, UnkStruct_0202BFCC * param1); -static void sub_0202C54C(u8 * param0, UnkStruct_0202BFCC * param1); -static void sub_0202C5A4(u8 * param0, UnkStruct_0202BFCC * param1); -static void sub_0202C5AC(u8 * param0, UnkStruct_0202BFCC * param1); -static u8 sub_0202C6CC(TrainerInfo * param0, u32 param1); +static void sub_0202B7A0(Journal *param0, UnkStruct_0202BC58 *param1); +static void sub_0202B7E0(Journal *param0, UnkStruct_0202BCC8 *param1); +static void sub_0202B880(Journal *param0, UnkStruct_0202BE38 *param1); +static void sub_0202B88C(Journal *param0, UnkStruct_0202BF4C *param1); +static void sub_0202B898(Journal *param0, UnkStruct_0202BFCC *param1); +static u32 *sub_0202B91C(u32 *param0); +static u8 *sub_0202B954(Journal *param0); +static void sub_0202B994(u32 *param0, UnkStruct_0202BCC8 *param1); +static void sub_0202B9D0(u32 *param0, UnkStruct_0202BCC8 *param1); +static void sub_0202B9F0(u32 *param0, UnkStruct_0202BCC8 *param1); +static void sub_0202BA48(u32 *param0, UnkStruct_0202BCC8 *param1); +static void sub_0202BAB0(u32 *param0, UnkStruct_0202BCC8 *param1); +static void sub_0202BAF8(u32 *param0, UnkStruct_0202BCC8 *param1); +static void sub_0202BB40(u32 *param0, UnkStruct_0202BCC8 *param1); +static void sub_0202BB88(u8 *param0, UnkStruct_0202BFCC *param1); +static void sub_0202BBC4(u8 *param0, UnkStruct_0202BFCC *param1); +static void sub_0202BBE0(u8 *param0, UnkStruct_0202BFCC *param1); +static void sub_0202BC14(Journal *param0, UnkStruct_0202BFCC *param1); +static void sub_0202BC48(u8 *param0, UnkStruct_0202BFCC *param1); +static void sub_0202BF94(const u16 *param0, u16 *param1, u32 param2); +static void sub_0202C2FC(Journal *param0, UnkStruct_0202BC58 *param1); +static void sub_0202C304(Journal *param0, UnkStruct_0202BCC8 *param1); +static void sub_0202C3B8(Journal *param0, UnkStruct_0202BE38 *param1); +static void sub_0202C3C4(Journal *param0, UnkStruct_0202BF4C *param1); +static void sub_0202C3D0(Journal *param0, UnkStruct_0202BFCC *param1); +static void sub_0202C474(u32 param0, UnkStruct_0202BCC8 *param1); +static void sub_0202C47C(u32 param0, UnkStruct_0202BCC8 *param1); +static void sub_0202C494(u32 param0, UnkStruct_0202BCC8 *param1); +static void sub_0202C4A0(u32 param0, UnkStruct_0202BCC8 *param1); +static void sub_0202C4AC(u32 param0, UnkStruct_0202BCC8 *param1); +static void sub_0202C4B8(u8 *param0, UnkStruct_0202BFCC *param1); +static void sub_0202C528(u8 *param0, UnkStruct_0202BFCC *param1); +static void sub_0202C54C(u8 *param0, UnkStruct_0202BFCC *param1); +static void sub_0202C5A4(u8 *param0, UnkStruct_0202BFCC *param1); +static void sub_0202C5AC(u8 *param0, UnkStruct_0202BFCC *param1); +static u8 sub_0202C6CC(TrainerInfo *param0, u32 param1); static u8 sub_0202C78C(u32 param0); static const UnkStruct_020E5B90 Unk_020E5B90[] = { - {0x5A, 0x1}, - {0x5B, 0x0}, - {0x5C, 0x1}, - {0x5D, 0x1}, - {0x5E, 0x0}, - {0x5F, 0x1}, - {0x60, 0x1}, - {0x61, 0x1}, - {0x62, 0x1}, - {0x63, 0x0}, - {0x64, 0x1}, - {0x65, 0x0}, - {0x66, 0x1}, - {0x47, 0x0}, - {0x67, 0x0}, - {0x40, 0x0}, - {0x68, 0x0}, - {0x69, 0x1}, - {0x50, 0x1}, - {0x6A, 0x0}, - {0x6B, 0x1}, - {0x6C, 0x0}, - {0x6D, 0x0}, - {0x6E, 0x0}, - {0x2F, 0x0}, - {0x31, 0x0}, - {0x46, 0x0} + { 0x5A, 0x1 }, + { 0x5B, 0x0 }, + { 0x5C, 0x1 }, + { 0x5D, 0x1 }, + { 0x5E, 0x0 }, + { 0x5F, 0x1 }, + { 0x60, 0x1 }, + { 0x61, 0x1 }, + { 0x62, 0x1 }, + { 0x63, 0x0 }, + { 0x64, 0x1 }, + { 0x65, 0x0 }, + { 0x66, 0x1 }, + { 0x47, 0x0 }, + { 0x67, 0x0 }, + { 0x40, 0x0 }, + { 0x68, 0x0 }, + { 0x69, 0x1 }, + { 0x50, 0x1 }, + { 0x6A, 0x0 }, + { 0x6B, 0x1 }, + { 0x6C, 0x0 }, + { 0x6D, 0x0 }, + { 0x6E, 0x0 }, + { 0x2F, 0x0 }, + { 0x31, 0x0 }, + { 0x46, 0x0 } }; static const UnkStruct_020E5B50 Unk_020E5B50[] = { - {0xF6, 0x2F, 0x0}, - {0x13B, 0x43, 0x1}, - {0x13C, 0x7A, 0x3}, - {0x13D, 0x85, 0x2}, - {0x13E, 0x58, 0x4}, - {0x13F, 0xA7, 0x6}, - {0xFA, 0x23, 0x5}, - {0x140, 0x9A, 0x7} + { 0xF6, 0x2F, 0x0 }, + { 0x13B, 0x43, 0x1 }, + { 0x13C, 0x7A, 0x3 }, + { 0x13D, 0x85, 0x2 }, + { 0x13E, 0x58, 0x4 }, + { 0x13F, 0xA7, 0x6 }, + { 0xFA, 0x23, 0x5 }, + { 0x140, 0x9A, 0x7 } }; -int Journal_SaveSize (void) +int Journal_SaveSize(void) { return sizeof(Journal) * 10; } -static void sub_0202B60C (Journal * param0) +static void sub_0202B60C(Journal *param0) { memset(param0, 0, sizeof(Journal)); } -void Journal_Init (Journal * param0) +void Journal_Init(Journal *param0) { memset(param0, 0, sizeof(Journal) * 10); } -Journal * SaveData_GetJournal (SaveData * param0) +Journal *SaveData_GetJournal(SaveData *param0) { return SaveData_SaveTable(param0, 18); } -Journal * Journal_GetSavedPage (Journal * param0, BOOL param1) +Journal *Journal_GetSavedPage(Journal *param0, BOOL param1) { RTCDate v0; s32 v1; @@ -158,7 +156,7 @@ Journal * Journal_GetSavedPage (Journal * param0, BOOL param1) return ¶m0[0]; } -BOOL Journal_CheckOpenOnContinue (Journal * param0, BOOL param1) +BOOL Journal_CheckOpenOnContinue(Journal *param0, BOOL param1) { RTCDate v0; RTCDate v1; @@ -194,7 +192,7 @@ BOOL Journal_CheckOpenOnContinue (Journal * param0, BOOL param1) return 0; } -void sub_0202B758 (Journal * param0, void * param1, u8 param2) +void sub_0202B758(Journal *param0, void *param1, u8 param2) { if (param0 != NULL) { switch (param2) { @@ -219,7 +217,7 @@ void sub_0202B758 (Journal * param0, void * param1, u8 param2) Heap_FreeToHeap(param1); } -static void sub_0202B7A0 (Journal * param0, UnkStruct_0202BC58 * param1) +static void sub_0202B7A0(Journal *param0, UnkStruct_0202BC58 *param1) { if ((param0->unk_00.unk_00_0 == param1->unk_00_0) && (param0->unk_00.unk_00_7 == param1->unk_00_7) && (param0->unk_00.unk_00_14 == param1->unk_00_14) && (param0->unk_00.unk_00_11 == param1->unk_00_11)) { return; @@ -228,7 +226,7 @@ static void sub_0202B7A0 (Journal * param0, UnkStruct_0202BC58 * param1) param0->unk_00 = *param1; } -static void sub_0202B7E0 (Journal * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202B7E0(Journal *param0, UnkStruct_0202BCC8 *param1) { switch (param1->unk_00) { case 1: @@ -287,19 +285,19 @@ static void sub_0202B7E0 (Journal * param0, UnkStruct_0202BCC8 * param1) } } -static void sub_0202B880 (Journal * param0, UnkStruct_0202BE38 * param1) +static void sub_0202B880(Journal *param0, UnkStruct_0202BE38 *param1) { param0->unk_14 = *param1; } -static void sub_0202B88C (Journal * param0, UnkStruct_0202BF4C * param1) +static void sub_0202B88C(Journal *param0, UnkStruct_0202BF4C *param1) { param0->unk_18 = *param1; } -static void sub_0202B898 (Journal * param0, UnkStruct_0202BFCC * param1) +static void sub_0202B898(Journal *param0, UnkStruct_0202BFCC *param1) { - u8 * v0 = sub_0202B954(param0); + u8 *v0 = sub_0202B954(param0); switch (param1->unk_00) { case 1: @@ -344,7 +342,7 @@ static void sub_0202B898 (Journal * param0, UnkStruct_0202BFCC * param1) } } -static u32 * sub_0202B91C (u32 * param0) +static u32 *sub_0202B91C(u32 *param0) { u32 v0; @@ -363,7 +361,7 @@ static u32 * sub_0202B91C (u32 * param0) return ¶m0[v0]; } -static u8 * sub_0202B954 (Journal * param0) +static u8 *sub_0202B954(Journal *param0) { u32 v0; @@ -382,9 +380,9 @@ static u8 * sub_0202B954 (Journal * param0) return ¶m0->unk_1C[v0][0]; } -static void sub_0202B994 (u32 * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202B994(u32 *param0, UnkStruct_0202BCC8 *param1) { - u32 * v0; + u32 *v0; u32 v1; for (v1 = 0; v1 < 4; v1++) { @@ -403,15 +401,15 @@ static void sub_0202B994 (u32 * param0, UnkStruct_0202BCC8 * param1) *v0 = (param1->unk_00 & 0x3f); } -static void sub_0202B9D0 (u32 * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202B9D0(u32 *param0, UnkStruct_0202BCC8 *param1) { - u32 * v0 = sub_0202B91C(param0); + u32 *v0 = sub_0202B91C(param0); *v0 = (param1->unk_02 << 16) | ((param1->unk_04 & 0x3ff) << 6) | (param1->unk_00 & 0x3f); } -static void sub_0202B9F0 (u32 * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202B9F0(u32 *param0, UnkStruct_0202BCC8 *param1) { - u32 * v0; + u32 *v0; u16 v1; u16 v2; @@ -434,9 +432,9 @@ static void sub_0202B9F0 (u32 * param0, UnkStruct_0202BCC8 * param1) *v0 = (param1->unk_02 << 16) | ((param1->unk_04 & 0x3ff) << 6) | (param1->unk_00 & 0x3f); } -static void sub_0202BA48 (u32 * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202BA48(u32 *param0, UnkStruct_0202BCC8 *param1) { - u32 * v0; + u32 *v0; u16 v1; u16 v2; @@ -458,9 +456,9 @@ static void sub_0202BA48 (u32 * param0, UnkStruct_0202BCC8 * param1) *v0 = (param1->unk_02 << 16) | ((param1->unk_04 & 0x3ff) << 6) | (param1->unk_00 & 0x3f); } -static void sub_0202BAB0 (u32 * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202BAB0(u32 *param0, UnkStruct_0202BCC8 *param1) { - u32 * v0; + u32 *v0; u32 v1; for (v1 = 0; v1 < 4; v1++) { @@ -479,9 +477,9 @@ static void sub_0202BAB0 (u32 * param0, UnkStruct_0202BCC8 * param1) *v0 = (param1->unk_02 << 16) | (param1->unk_00 & 0x3f); } -static void sub_0202BAF8 (u32 * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202BAF8(u32 *param0, UnkStruct_0202BCC8 *param1) { - u32 * v0; + u32 *v0; u32 v1; for (v1 = 0; v1 < 4; v1++) { @@ -500,9 +498,9 @@ static void sub_0202BAF8 (u32 * param0, UnkStruct_0202BCC8 * param1) *v0 = (param1->unk_06 << 16) | (param1->unk_00 & 0x3f); } -static void sub_0202BB40 (u32 * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202BB40(u32 *param0, UnkStruct_0202BCC8 *param1) { - u32 * v0; + u32 *v0; u32 v1; for (v1 = 0; v1 < 4; v1++) { @@ -521,7 +519,7 @@ static void sub_0202BB40 (u32 * param0, UnkStruct_0202BCC8 * param1) *v0 = (param1->unk_02 << 16) | (param1->unk_00 & 0x3f); } -static void sub_0202BB88 (u8 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202BB88(u8 *param0, UnkStruct_0202BFCC *param1) { param0[0] = param1->unk_00; param0[1] = (param1->unk_01_0 << 2) | (param1->unk_01_4 << 1) | (param1->unk_01_5); @@ -529,7 +527,7 @@ static void sub_0202BB88 (u8 * param0, UnkStruct_0202BFCC * param1) sub_0202BF94(param1->unk_12, (u16 *)¶m0[18], 8); } -static void sub_0202BBC4 (u8 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202BBC4(u8 *param0, UnkStruct_0202BFCC *param1) { param0[0] = param1->unk_00; param0[1] = param1->unk_01_4; @@ -537,7 +535,7 @@ static void sub_0202BBC4 (u8 * param0, UnkStruct_0202BFCC * param1) sub_0202BF94(param1->unk_02, (u16 *)¶m0[2], 8); } -static void sub_0202BBE0 (u8 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202BBE0(u8 *param0, UnkStruct_0202BFCC *param1) { param0[0] = param1->unk_00; param0[1] = (param1->unk_01_4 << 2) | (param1->unk_01_6); @@ -546,10 +544,10 @@ static void sub_0202BBE0 (u8 * param0, UnkStruct_0202BFCC * param1) sub_0202BF94(param1->unk_22, (u16 *)¶m0[18], 12); } -static void sub_0202BC14 (Journal * param0, UnkStruct_0202BFCC * param1) +static void sub_0202BC14(Journal *param0, UnkStruct_0202BFCC *param1) { u32 v0; - u8 * v1; + u8 *v1; for (v0 = 0; v0 < 2; v0++) { if (param0->unk_1C[v0][0] == 0) { @@ -567,15 +565,15 @@ static void sub_0202BC14 (Journal * param0, UnkStruct_0202BFCC * param1) v1[0] = param1->unk_00; } -static void sub_0202BC48 (u8 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202BC48(u8 *param0, UnkStruct_0202BFCC *param1) { param0[0] = param1->unk_00; param0[1] = param1->unk_01_0; } -void * sub_0202BC58 (u16 param0, u32 param1) +void *sub_0202BC58(u16 param0, u32 param1) { - UnkStruct_0202BC58 * v0; + UnkStruct_0202BC58 *v0; RTCDate v1; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0202BC58)); @@ -590,81 +588,81 @@ void * sub_0202BC58 (u16 param0, u32 param1) return v0; } -static UnkStruct_0202BCC8 * sub_0202BCC8 (u32 param0) +static UnkStruct_0202BCC8 *sub_0202BCC8(u32 param0) { - UnkStruct_0202BCC8 * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0202BCC8)); + UnkStruct_0202BCC8 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0202BCC8)); memset(v0, 0, sizeof(UnkStruct_0202BCC8)); return v0; } -void * sub_0202BCE4 (u32 param0) +void *sub_0202BCE4(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 1; return v0; } -void * sub_0202BCF0 (u32 param0) +void *sub_0202BCF0(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 2; return v0; } -void * sub_0202BCFC (u32 param0) +void *sub_0202BCFC(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 3; return v0; } -void * sub_0202BD08 (u32 param0) +void *sub_0202BD08(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 4; return v0; } -void * sub_0202BD14 (u32 param0) +void *sub_0202BD14(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 5; return v0; } -void * sub_0202BD20 (u32 param0) +void *sub_0202BD20(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 6; return v0; } -void * sub_0202BD2C (u32 param0) +void *sub_0202BD2C(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 7; return v0; } -void * sub_0202BD38 (u32 param0) +void *sub_0202BD38(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 8; return v0; } -void * sub_0202BD44 (u16 param0, u32 param1) +void *sub_0202BD44(u16 param0, u32 param1) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param1); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param1); v0->unk_00 = 9; v0->unk_02 = param0; @@ -672,9 +670,9 @@ void * sub_0202BD44 (u16 param0, u32 param1) return v0; } -void * sub_0202BD58 (u16 param0, u16 param1, u32 param2) +void *sub_0202BD58(u16 param0, u16 param1, u32 param2) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param2); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param2); v0->unk_00 = 10; v0->unk_02 = param0; @@ -683,9 +681,9 @@ void * sub_0202BD58 (u16 param0, u16 param1, u32 param2) return v0; } -void * sub_0202BD70 (u16 param0, u32 param1) +void *sub_0202BD70(u16 param0, u32 param1) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param1); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param1); v0->unk_00 = 11; v0->unk_04 = param0; @@ -693,9 +691,9 @@ void * sub_0202BD70 (u16 param0, u32 param1) return v0; } -void * sub_0202BD84 (u16 param0, u32 param1) +void *sub_0202BD84(u16 param0, u32 param1) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param1); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param1); v0->unk_00 = 12; v0->unk_04 = param0; @@ -703,9 +701,9 @@ void * sub_0202BD84 (u16 param0, u32 param1) return v0; } -void * sub_0202BD98 (u16 param0, u32 param1) +void *sub_0202BD98(u16 param0, u32 param1) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param1); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param1); v0->unk_00 = 13; v0->unk_02 = param0; @@ -713,9 +711,9 @@ void * sub_0202BD98 (u16 param0, u32 param1) return v0; } -void * sub_0202BDAC (u16 param0, u32 param1) +void *sub_0202BDAC(u16 param0, u32 param1) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param1); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param1); v0->unk_00 = 14; v0->unk_02 = param0; @@ -723,9 +721,9 @@ void * sub_0202BDAC (u16 param0, u32 param1) return v0; } -void * sub_0202BDC0 (u16 param0, u32 param1) +void *sub_0202BDC0(u16 param0, u32 param1) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param1); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param1); v0->unk_00 = 15; v0->unk_02 = param0; @@ -733,25 +731,25 @@ void * sub_0202BDC0 (u16 param0, u32 param1) return v0; } -void * sub_0202BDD4 (u32 param0) +void *sub_0202BDD4(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 16; return v0; } -void * sub_0202BDE0 (u32 param0) +void *sub_0202BDE0(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 17; return v0; } -void * sub_0202BDEC (u16 param0, u32 param1) +void *sub_0202BDEC(u16 param0, u32 param1) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param1); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param1); v0->unk_00 = 18; v0->unk_06 = param0; @@ -759,9 +757,9 @@ void * sub_0202BDEC (u16 param0, u32 param1) return v0; } -void * sub_0202BE00 (u8 param0, u16 param1, u32 param2) +void *sub_0202BE00(u8 param0, u16 param1, u32 param2) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param2); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param2); v0->unk_00 = 19 + param0; v0->unk_02 = param1; @@ -769,41 +767,41 @@ void * sub_0202BE00 (u8 param0, u16 param1, u32 param2) return v0; } -void * sub_0202BE14 (u32 param0) +void *sub_0202BE14(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 34; return v0; } -void * sub_0202BE20 (u32 param0) +void *sub_0202BE20(u32 param0) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = 35; return v0; } -void * sub_0202BE2C (u32 param0, u32 param1) +void *sub_0202BE2C(u32 param0, u32 param1) { - UnkStruct_0202BCC8 * v0 = sub_0202BCC8(param0); + UnkStruct_0202BCC8 *v0 = sub_0202BCC8(param0); v0->unk_00 = param1; return v0; } -static UnkStruct_0202BE38 * sub_0202BE38 (u32 param0) +static UnkStruct_0202BE38 *sub_0202BE38(u32 param0) { - UnkStruct_0202BE38 * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0202BE38)); + UnkStruct_0202BE38 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0202BE38)); memset(v0, 0, sizeof(UnkStruct_0202BE38)); return v0; } -void * sub_0202BE4C (const PlayTime *playTime, u16 param1, u8 param2, u8 param3, u32 param4) +void *sub_0202BE4C(const PlayTime *playTime, u16 param1, u8 param2, u8 param3, u32 param4) { - UnkStruct_0202BE38 * v0; + UnkStruct_0202BE38 *v0; u8 v1; v0 = sub_0202BE38(param4); @@ -826,9 +824,9 @@ void * sub_0202BE4C (const PlayTime *playTime, u16 param1, u8 param2, u8 param3, return v0; } -void * sub_0202BECC (const PlayTime *playTime, u16 param1, u8 param2, u8 param3, u32 param4) +void *sub_0202BECC(const PlayTime *playTime, u16 param1, u8 param2, u8 param3, u32 param4) { - UnkStruct_0202BE38 * v0; + UnkStruct_0202BE38 *v0; u8 v1; v0 = sub_0202BE38(param4); @@ -851,9 +849,9 @@ void * sub_0202BECC (const PlayTime *playTime, u16 param1, u8 param2, u8 param3, return v0; } -void * sub_0202BF4C (u16 param0, u16 param1, u32 param2) +void *sub_0202BF4C(u16 param0, u16 param1, u32 param2) { - UnkStruct_0202BF4C * v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_0202BF4C)); + UnkStruct_0202BF4C *v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_0202BF4C)); v0->unk_00_0 = 1; v0->unk_02 = param0; @@ -862,15 +860,15 @@ void * sub_0202BF4C (u16 param0, u16 param1, u32 param2) return v0; } -static UnkStruct_0202BFCC * sub_0202BF7C (u32 param0) +static UnkStruct_0202BFCC *sub_0202BF7C(u32 param0) { - UnkStruct_0202BFCC * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0202BFCC)); + UnkStruct_0202BFCC *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0202BFCC)); memset(v0, 0, sizeof(UnkStruct_0202BFCC)); return v0; } -static void sub_0202BF94 (const u16 * param0, u16 * param1, u32 param2) +static void sub_0202BF94(const u16 *param0, u16 *param1, u32 param2) { u32 v0; @@ -887,9 +885,9 @@ static void sub_0202BF94 (const u16 * param0, u16 * param1, u32 param2) } } -void * sub_0202BFCC (u16 * param0, u8 param1, u8 param2, u32 param3) +void *sub_0202BFCC(u16 *param0, u8 param1, u8 param2, u32 param3) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param3); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param3); v0->unk_00 = 1; v0->unk_01_0 = param2; @@ -899,9 +897,9 @@ void * sub_0202BFCC (u16 * param0, u8 param1, u8 param2, u32 param3) return v0; } -void * sub_0202C00C (u16 * param0, u8 param1, u8 param2, u32 param3) +void *sub_0202C00C(u16 *param0, u8 param1, u8 param2, u32 param3) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param3); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param3); v0->unk_00 = 2; v0->unk_01_0 = param2; @@ -911,9 +909,9 @@ void * sub_0202C00C (u16 * param0, u8 param1, u8 param2, u32 param3) return v0; } -void * sub_0202C04C (u16 * param0, u16 * param1, u8 param2, u8 param3, u8 param4, u32 param5) +void *sub_0202C04C(u16 *param0, u16 *param1, u8 param2, u8 param3, u8 param4, u32 param5) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param5); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param5); v0->unk_00 = 3; v0->unk_01_0 = param4; @@ -926,9 +924,9 @@ void * sub_0202C04C (u16 * param0, u16 * param1, u8 param2, u8 param3, u8 param4 return v0; } -void * sub_0202C0AC (u16 * param0, u8 param1, u8 param2, u32 param3) +void *sub_0202C0AC(u16 *param0, u8 param1, u8 param2, u32 param3) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param3); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param3); v0->unk_00 = 4; v0->unk_01_0 = param2; @@ -938,9 +936,9 @@ void * sub_0202C0AC (u16 * param0, u8 param1, u8 param2, u32 param3) return v0; } -void * sub_0202C0EC (u16 * param0, u8 param1, u32 param2) +void *sub_0202C0EC(u16 *param0, u8 param1, u32 param2) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param2); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param2); v0->unk_00 = 6; v0->unk_01_4 = param1; @@ -949,9 +947,9 @@ void * sub_0202C0EC (u16 * param0, u8 param1, u32 param2) return v0; } -void * sub_0202C11C (u16 * param0, u8 param1, u16 * param2, u8 param3, u32 param4) +void *sub_0202C11C(u16 *param0, u8 param1, u16 *param2, u8 param3, u32 param4) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param4); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param4); v0->unk_00 = 7; v0->unk_01_4 = param1; @@ -963,17 +961,17 @@ void * sub_0202C11C (u16 * param0, u8 param1, u16 * param2, u8 param3, u32 param return v0; } -void * sub_0202C168 (u32 param0) +void *sub_0202C168(u32 param0) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param0); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param0); v0->unk_00 = 8; return v0; } -void * sub_0202C174 (u16 * param0, u8 param1, u8 param2, u32 param3) +void *sub_0202C174(u16 *param0, u8 param1, u8 param2, u32 param3) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param3); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param3); v0->unk_00 = 11; v0->unk_01_0 = param2; @@ -983,17 +981,17 @@ void * sub_0202C174 (u16 * param0, u8 param1, u8 param2, u32 param3) return v0; } -void * sub_0202C1B4 (u32 param0) +void *sub_0202C1B4(u32 param0) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param0); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param0); v0->unk_00 = 12; return v0; } -void * sub_0202C1C0 (u8 param0, u32 param1) +void *sub_0202C1C0(u8 param0, u32 param1) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param1); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param1); v0->unk_00 = 13; v0->unk_01_0 = param0; @@ -1001,17 +999,17 @@ void * sub_0202C1C0 (u8 param0, u32 param1) return v0; } -void * sub_0202C1E0 (u32 param0) +void *sub_0202C1E0(u32 param0) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param0); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param0); v0->unk_00 = 14; return v0; } -void * sub_0202C1EC (u16 * param0, u8 param1, u16 * param2, u8 param3, u32 param4) +void *sub_0202C1EC(u16 *param0, u8 param1, u16 *param2, u8 param3, u32 param4) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param4); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param4); v0->unk_00 = 15; v0->unk_01_4 = param1; @@ -1023,25 +1021,25 @@ void * sub_0202C1EC (u16 * param0, u8 param1, u16 * param2, u8 param3, u32 param return v0; } -void * sub_0202C238 (u32 param0) +void *sub_0202C238(u32 param0) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param0); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param0); v0->unk_00 = 16; return v0; } -void * sub_0202C244 (u32 param0, u32 param1) +void *sub_0202C244(u32 param0, u32 param1) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param0); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param0); v0->unk_00 = param1; return v0; } -void * sub_0202C250 (const u16 * param0, u8 param1, u32 param2, u32 param3) +void *sub_0202C250(const u16 *param0, u8 param1, u32 param2, u32 param3) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param2); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param2); v0->unk_00 = param3; v0->unk_01_4 = param1; @@ -1050,9 +1048,9 @@ void * sub_0202C250 (const u16 * param0, u8 param1, u32 param2, u32 param3) return v0; } -void * sub_0202C280 (int param0, u32 param1, u32 param2) +void *sub_0202C280(int param0, u32 param1, u32 param2) { - UnkStruct_0202BFCC * v0 = sub_0202BF7C(param1); + UnkStruct_0202BFCC *v0 = sub_0202BF7C(param1); v0->unk_00 = param2; v0->unk_01_0 = param0; @@ -1060,7 +1058,7 @@ void * sub_0202C280 (int param0, u32 param1, u32 param2) return v0; } -void sub_0202C2A4 (Journal * param0, void * param1, u8 param2, u8 param3) +void sub_0202C2A4(Journal *param0, void *param1, u8 param2, u8 param3) { switch (param2) { case 0: @@ -1081,12 +1079,12 @@ void sub_0202C2A4 (Journal * param0, void * param1, u8 param2, u8 param3) } } -static void sub_0202C2FC (Journal * param0, UnkStruct_0202BC58 * param1) +static void sub_0202C2FC(Journal *param0, UnkStruct_0202BC58 *param1) { *param1 = param0->unk_00; } -static void sub_0202C304 (Journal * param0, UnkStruct_0202BCC8 * param1) +static void sub_0202C304(Journal *param0, UnkStruct_0202BCC8 *param1) { u32 v0; @@ -1147,17 +1145,17 @@ static void sub_0202C304 (Journal * param0, UnkStruct_0202BCC8 * param1) } } -static void sub_0202C3B8 (Journal * param0, UnkStruct_0202BE38 * param1) +static void sub_0202C3B8(Journal *param0, UnkStruct_0202BE38 *param1) { *param1 = param0->unk_14; } -static void sub_0202C3C4 (Journal * param0, UnkStruct_0202BF4C * param1) +static void sub_0202C3C4(Journal *param0, UnkStruct_0202BF4C *param1) { *param1 = param0->unk_18; } -static void sub_0202C3D0 (Journal * param0, UnkStruct_0202BFCC * param1) +static void sub_0202C3D0(Journal *param0, UnkStruct_0202BFCC *param1) { u32 v0; @@ -1208,37 +1206,37 @@ static void sub_0202C3D0 (Journal * param0, UnkStruct_0202BFCC * param1) } } -static void sub_0202C474 (u32 param0, UnkStruct_0202BCC8 * param1) +static void sub_0202C474(u32 param0, UnkStruct_0202BCC8 *param1) { param1->unk_00 = (param0 & 0x3f); } -static void sub_0202C47C (u32 param0, UnkStruct_0202BCC8 * param1) +static void sub_0202C47C(u32 param0, UnkStruct_0202BCC8 *param1) { param1->unk_00 = (param0 & 0x3f); param1->unk_04 = (param0 >> 6) & 0x3ff; param1->unk_02 = (param0 >> 16) & 0xffff; } -static void sub_0202C494 (u32 param0, UnkStruct_0202BCC8 * param1) +static void sub_0202C494(u32 param0, UnkStruct_0202BCC8 *param1) { param1->unk_00 = (param0 & 0x3f); param1->unk_02 = (param0 >> 16) & 0xffff; } -static void sub_0202C4A0 (u32 param0, UnkStruct_0202BCC8 * param1) +static void sub_0202C4A0(u32 param0, UnkStruct_0202BCC8 *param1) { param1->unk_00 = (param0 & 0x3f); param1->unk_06 = (param0 >> 16) & 0xffff; } -static void sub_0202C4AC (u32 param0, UnkStruct_0202BCC8 * param1) +static void sub_0202C4AC(u32 param0, UnkStruct_0202BCC8 *param1) { param1->unk_00 = (param0 & 0x3f); param1->unk_02 = (param0 >> 16) & 0xffff; } -static void sub_0202C4B8 (u8 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202C4B8(u8 *param0, UnkStruct_0202BFCC *param1) { param1->unk_00 = param0[0]; param1->unk_01_0 = (param0[1] >> 2) & 0x1f; @@ -1249,7 +1247,7 @@ static void sub_0202C4B8 (u8 * param0, UnkStruct_0202BFCC * param1) sub_0202BF94((u16 *)¶m0[18], param1->unk_12, 8); } -static void sub_0202C528 (u8 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202C528(u8 *param0, UnkStruct_0202BFCC *param1) { param1->unk_00 = param0[0]; param1->unk_01_4 = param0[1]; @@ -1257,7 +1255,7 @@ static void sub_0202C528 (u8 * param0, UnkStruct_0202BFCC * param1) sub_0202BF94((u16 *)¶m0[2], param1->unk_02, 8); } -static void sub_0202C54C (u8 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202C54C(u8 *param0, UnkStruct_0202BFCC *param1) { param1->unk_00 = param0[0]; param1->unk_01_4 = (param0[1] >> 2) & 1; @@ -1267,20 +1265,20 @@ static void sub_0202C54C (u8 * param0, UnkStruct_0202BFCC * param1) sub_0202BF94((u16 *)¶m0[18], param1->unk_22, 12); } -static void sub_0202C5A4 (u8 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202C5A4(u8 *param0, UnkStruct_0202BFCC *param1) { param1->unk_00 = param0[0]; } -static void sub_0202C5AC (u8 * param0, UnkStruct_0202BFCC * param1) +static void sub_0202C5AC(u8 *param0, UnkStruct_0202BFCC *param1) { param1->unk_00 = param0[0]; param1->unk_01_0 = param0[1]; } -void sub_0202C5C4 (TrainerInfo * param0, Journal * param1, u32 param2, u32 param3, u32 param4) +void sub_0202C5C4(TrainerInfo *param0, Journal *param1, u32 param2, u32 param3, u32 param4) { - void * v0; + void *v0; u32 v1; v0 = NULL; @@ -1322,7 +1320,7 @@ void sub_0202C5C4 (TrainerInfo * param0, Journal * param1, u32 param2, u32 param } } -u32 sub_0202C6A4 (u32 param0) +u32 sub_0202C6A4(u32 param0) { u32 v0; @@ -1337,7 +1335,7 @@ u32 sub_0202C6A4 (u32 param0) return 0; } -static u8 sub_0202C6CC (TrainerInfo * param0, u32 param1) +static u8 sub_0202C6CC(TrainerInfo *param0, u32 param1) { u8 v0; @@ -1354,15 +1352,15 @@ static u8 sub_0202C6CC (TrainerInfo * param0, u32 param1) return 0xff; } -void sub_0202C704 (Journal * param0, u32 param1, u32 param2) +void sub_0202C704(Journal *param0, u32 param1, u32 param2) { - void * v0 = sub_0202BD98((u16)param1, param2); + void *v0 = sub_0202BD98((u16)param1, param2); sub_0202B758(param0, v0, 1); } -void sub_0202C720 (Journal * param0, u16 param1, u16 param2, u32 param3) +void sub_0202C720(Journal *param0, u16 param1, u16 param2, u32 param3) { - void * v0; + void *v0; u8 v1; v1 = sub_0202C78C(param2); @@ -1382,7 +1380,7 @@ void sub_0202C720 (Journal * param0, u16 param1, u16 param2, u32 param3) } } -static u8 sub_0202C78C (u32 param0) +static u8 sub_0202C78C(u32 param0) { u8 v0; diff --git a/src/library_tv/library_tv.c b/src/library_tv/library_tv.c index 022194bdf9..03120b6344 100644 --- a/src/library_tv/library_tv.c +++ b/src/library_tv/library_tv.c @@ -1,55 +1,55 @@ +#include "library_tv/library_tv.h" + #include #include -#include "message.h" -#include "struct_decls/struct_02018340_decl.h" +#include "constants/narc.h" +#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02002B7C.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" #include "overlay_manager.h" +#include "unk_02002B7C.h" #include "unk_02006E3C.h" -#include "message.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" - -#include "library_tv/library_tv.h" -#include "constants/narc.h" #define LIBRARY_TV_DURATION 90 + 150 typedef struct LibraryTV { int heapID; - BGL * bgl; - MessageLoader * msgLdr; + BGL *bgl; + MessageLoader *msgLdr; int tvState; Window tvWindow; int scanLinePos; int waitTiming; } LibraryTV; -extern void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate * param1); -static void LibraryTV_VBlank(void * data); -static void LibraryTV_SetVramBank(LibraryTV * ltv); -static void LibraryTV_ReleaseVramBank(LibraryTV * ltv); -static void LibraryTV_SetMsgLdr(LibraryTV * ltv); -static void LibraryTV_ReleaseMsgLdr(LibraryTV * ltv); -static void LibraryTV_UpdateScanLines(LibraryTV * ltv); +extern void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); +static void LibraryTV_VBlank(void *data); +static void LibraryTV_SetVramBank(LibraryTV *ltv); +static void LibraryTV_ReleaseVramBank(LibraryTV *ltv); +static void LibraryTV_SetMsgLdr(LibraryTV *ltv); +static void LibraryTV_ReleaseMsgLdr(LibraryTV *ltv); +static void LibraryTV_UpdateScanLines(LibraryTV *ltv); -BOOL LibraryTV_Init (OverlayManager * ovy, int * state) +BOOL LibraryTV_Init(OverlayManager *ovy, int *state) { int heapID = HEAP_ID_LIBRARY_TV; Heap_Create(HEAP_ID_APPLICATION, heapID, HEAP_SIZE_LIBRARY_TV); - LibraryTV * ltv = OverlayManager_NewData(ovy, sizeof(LibraryTV), heapID); + LibraryTV *ltv = OverlayManager_NewData(ovy, sizeof(LibraryTV), heapID); memset(ltv, 0, sizeof(LibraryTV)); ltv->heapID = heapID; @@ -67,9 +67,9 @@ enum { STATE_EXIT }; -BOOL LibraryTV_Main (OverlayManager * ovy, int * state) +BOOL LibraryTV_Main(OverlayManager *ovy, int *state) { - LibraryTV * ltv = OverlayManager_Data(ovy); + LibraryTV *ltv = OverlayManager_Data(ovy); BOOL result = FALSE; switch (*state) { @@ -150,9 +150,9 @@ BOOL LibraryTV_Main (OverlayManager * ovy, int * state) return result; } -BOOL LibraryTV_Exit (OverlayManager * ovy, int * state) +BOOL LibraryTV_Exit(OverlayManager *ovy, int *state) { - LibraryTV * ltv = OverlayManager_Data(ovy); + LibraryTV *ltv = OverlayManager_Data(ovy); int heapID = ltv->heapID; OverlayManager_FreeData(ovy); @@ -161,14 +161,14 @@ BOOL LibraryTV_Exit (OverlayManager * ovy, int * state) return TRUE; } -static void LibraryTV_VBlank (void * data) +static void LibraryTV_VBlank(void *data) { - LibraryTV * ltv = data; + LibraryTV *ltv = data; sub_0201C2B8(ltv->bgl); } -static void LibraryTV_SetVramBank (LibraryTV * ltv) +static void LibraryTV_SetVramBank(LibraryTV *ltv) { UnkStruct_02099F80 vramBank = { GX_VRAM_BG_256_AB, @@ -197,18 +197,13 @@ static void LibraryTV_SetVramBank (LibraryTV * ltv) sub_02018368(&bgData); int frame, charSetID, screenID; - UnkStruct_ov97_0222DB78 bgHeader0 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, - GX_BG_SCRBASE_0x0000, GX_BG_CHARBASE_0x18000, - GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; + UnkStruct_ov97_0222DB78 bgHeader0 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0000, GX_BG_CHARBASE_0x18000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; frame = 2; sub_020183C4(ltv->bgl, frame, &bgHeader0, 0); sub_02019690(frame, 32, 0, ltv->heapID); sub_02019EBC(ltv->bgl, frame); - - UnkStruct_ov97_0222DB78 bgHeader1 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, - GX_BG_SCRBASE_0x0800, GX_BG_CHARBASE_0x14000, - GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; + UnkStruct_ov97_0222DB78 bgHeader1 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0800, GX_BG_CHARBASE_0x14000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; frame = 0; charSetID = 1; screenID = 4; @@ -216,10 +211,7 @@ static void LibraryTV_SetVramBank (LibraryTV * ltv) sub_02006E3C(NARC_INDEX_DEMO__INTRO__INTRO_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); sub_02006E60(NARC_INDEX_DEMO__INTRO__INTRO_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); - - UnkStruct_ov97_0222DB78 bgHeader2 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, - GX_BG_SCRBASE_0x1000, GX_BG_CHARBASE_0x10000, - GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; + UnkStruct_ov97_0222DB78 bgHeader2 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x1000, GX_BG_CHARBASE_0x10000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; frame = 1; charSetID = 2; screenID = 5; @@ -227,10 +219,7 @@ static void LibraryTV_SetVramBank (LibraryTV * ltv) sub_02006E3C(NARC_INDEX_DEMO__INTRO__INTRO_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); sub_02006E60(NARC_INDEX_DEMO__INTRO__INTRO_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID); - - UnkStruct_ov97_0222DB78 bgHeader3 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_256, - GX_BG_SCRBASE_0x1800, GX_BG_CHARBASE_0x20000, - GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; + UnkStruct_ov97_0222DB78 bgHeader3 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_256, GX_BG_SCRBASE_0x1800, GX_BG_CHARBASE_0x20000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE }; frame = 3; charSetID = 2; screenID = 4; @@ -246,7 +235,7 @@ static void LibraryTV_SetVramBank (LibraryTV * ltv) G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, (GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3), 0x4, 0xc); } -static void LibraryTV_ReleaseVramBank (LibraryTV * ltv) +static void LibraryTV_ReleaseVramBank(LibraryTV *ltv) { sub_02019120(0, 0); sub_02019120(1, 0); @@ -267,19 +256,19 @@ static void LibraryTV_ReleaseVramBank (LibraryTV * ltv) Heap_FreeToHeap(ltv->bgl); } -static void LibraryTV_SetMsgLdr (LibraryTV * ltv) +static void LibraryTV_SetMsgLdr(LibraryTV *ltv) { ltv->msgLdr = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, 26, 607, ltv->heapID); sub_0201D710(); ltv->tvState = 0; } -static void LibraryTV_ReleaseMsgLdr (LibraryTV * ltv) +static void LibraryTV_ReleaseMsgLdr(LibraryTV *ltv) { MessageLoader_Free(ltv->msgLdr); } -static void LibraryTV_UpdateScanLines (LibraryTV * ltv) +static void LibraryTV_UpdateScanLines(LibraryTV *ltv) { ltv->scanLinePos += 0x4; sub_02019184(ltv->bgl, 1, 3, ltv->scanLinePos >> 4); diff --git a/src/main.c b/src/main.c index 971dbc175a..f05f40e352 100644 --- a/src/main.c +++ b/src/main.c @@ -1,35 +1,33 @@ -#include #include +#include #include -#include "core_sys.h" -#include "assert.h" - +#include "struct_defs/struct_0203CC84.h" -#include "overlay077/const_ov77_021D742C.h" #include "overlay057/const_ov57_021D0F70.h" +#include "overlay077/const_ov77_021D742C.h" -#include "struct_defs/struct_0203CC84.h" - +#include "assert.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_overlay.h" +#include "overlay_manager.h" +#include "rtc.h" +#include "savedata.h" +#include "sys_task_manager.h" #include "unk_02000C88.h" #include "unk_02002B7C.h" #include "unk_02003B60.h" -#include "game_overlay.h" -#include "overlay_manager.h" #include "unk_0200A9DC.h" #include "unk_0200F174.h" -#include "rtc.h" #include "unk_02017428.h" #include "unk_02017728.h" -#include "sys_task_manager.h" #include "unk_0201D15C.h" #include "unk_0201E3D8.h" #include "unk_02022844.h" #include "unk_0202419C.h" -#include "savedata.h" #include "unk_02025E08.h" #include "unk_0202CC64.h" -#include "communication_system.h" #include "unk_020366A0.h" #include "unk_02038FFC.h" #include "unk_02039814.h" @@ -43,9 +41,9 @@ FS_EXTERN_OVERLAY(overlay77); typedef struct { FSOverlayID unk_00; - OverlayManager * unk_04; + OverlayManager *unk_04; FSOverlayID unk_08; - const OverlayManagerTemplate * unk_0C; + const OverlayManagerTemplate *unk_0C; UnkStruct_0203CC84 unk_10; } UnkStruct_02101D28; @@ -64,7 +62,7 @@ static PMBackLightSwitch sSavedBacklightState; BOOL gIgnoreCartridgeForWake; extern const OverlayManagerTemplate Unk_ov77_021D788C; -void NitroMain (void) +void NitroMain(void) { sub_0201789C(); InitGraphics(); @@ -164,7 +162,7 @@ void NitroMain (void) } } -static void sub_02000E3C (void) +static void sub_02000E3C(void) { Unk_02101D28.unk_00 = 0xffffffff; Unk_02101D28.unk_04 = NULL; @@ -172,7 +170,7 @@ static void sub_02000E3C (void) Unk_02101D28.unk_0C = NULL; } -static void sub_02000E54 (void) +static void sub_02000E54(void) { BOOL v0; @@ -203,7 +201,7 @@ static void sub_02000E54 (void) } } -void sub_02000EC4 (FSOverlayID param0, const OverlayManagerTemplate * param1) +void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1) { GF_ASSERT(Unk_02101D28.unk_0C == NULL); @@ -211,7 +209,7 @@ void sub_02000EC4 (FSOverlayID param0, const OverlayManagerTemplate * param1) Unk_02101D28.unk_0C = param1; } -static void WaitFrame (void) +static void WaitFrame(void) { CommSys_Update(); @@ -225,7 +223,7 @@ static void WaitFrame (void) } } -static void sub_02000F10 (int param0) +static void sub_02000F10(int param0) { if (sub_02038AB8()) { if (CARD_TryWaitBackupAsync() == TRUE) { @@ -236,7 +234,7 @@ static void sub_02000F10 (int param0) WaitFrame(); } -static void CheckHeapCanary (void) +static void CheckHeapCanary(void) { int v0 = sub_020389D8(); @@ -253,7 +251,7 @@ static void CheckHeapCanary (void) } } -static void SoftReset (int param0) +static void SoftReset(int param0) { sub_0200F344(0, 0x7fff); sub_0200F344(1, 0x7fff); @@ -268,7 +266,7 @@ static void SoftReset (int param0) } } -static void HeapCanaryFailed (int param0, int param1) +static void HeapCanaryFailed(int param0, int param1) { int elapsed; BOOL v1; @@ -315,7 +313,7 @@ static void HeapCanaryFailed (int param0, int param1) SoftReset(param0); } -void InitRNG (void) +void InitRNG(void) { RTCDate v0; RTCTime v1; @@ -329,7 +327,7 @@ void InitRNG (void) LCRNG_SetSeed(v2); } -void HandleConsoleFold (void) +void HandleConsoleFold(void) { PMBackLightSwitch top, bottom; PMWakeUpTrigger trigger; diff --git a/src/map_header.c b/src/map_header.c index a9f0b3669a..a592516b00 100644 --- a/src/map_header.c +++ b/src/map_header.c @@ -1,10 +1,11 @@ +#include "map_header.h" + #include #include -#include "map_header.h" #include "data/map_headers.h" -u32 MapHeader_IDBoundsCheck (u32 headerID) +u32 MapHeader_IDBoundsCheck(u32 headerID) { if (headerID >= NELEMS(sMapHeaders)) { GF_ASSERT(0); @@ -14,19 +15,19 @@ u32 MapHeader_IDBoundsCheck (u32 headerID) return headerID; } -const u16 sub_0203A038 (u32 headerID) +const u16 sub_0203A038(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].unk_00; } -const u16 sub_0203A04C (u32 headerID) +const u16 sub_0203A04C(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].unk_01; } -const u16 MapHeader_GetMapMatrixID (u32 headerID) +const u16 MapHeader_GetMapMatrixID(u32 headerID) { u16 mapMatrixID; @@ -42,109 +43,109 @@ const u16 MapHeader_GetMapMatrixID (u32 headerID) return mapMatrixID; } -u32 MapHeader_GetMsgArchiveID (u32 headerID) +u32 MapHeader_GetMsgArchiveID(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].msgArchiveID; } -u32 MapHeader_GetScriptsArchiveID (u32 headerID) +u32 MapHeader_GetScriptsArchiveID(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].scriptsArchiveID; } -u32 MapHeader_GetMapScriptArchiveID (u32 headerID) +u32 MapHeader_GetMapScriptArchiveID(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].mapScriptArchiveID; } -u16 MapHeader_GetDayMusicID (u32 headerID) +u16 MapHeader_GetDayMusicID(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].dayMusicID; } -u16 MapHeader_GetNightMusicID (u32 headerID) +u16 MapHeader_GetNightMusicID(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].nightMusicID; } -BOOL MapHeader_HasWildEncounters (u32 headerID) +BOOL MapHeader_HasWildEncounters(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].wildEncountersArchiveID != 65535; } -u32 MapHeader_GetWildEncountersArchiveID (u32 headerID) +u32 MapHeader_GetWildEncountersArchiveID(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].wildEncountersArchiveID; } -u32 MapHeader_GetEventsArchiveID (u32 headerID) +u32 MapHeader_GetEventsArchiveID(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].eventsArchiveID; } -u32 MapHeader_GetMapLabelTextID (u32 headerID) +u32 MapHeader_GetMapLabelTextID(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].mapLabelTextID; } -u8 MapHeader_GetMapLabelWindowID (u32 headerID) +u8 MapHeader_GetMapLabelWindowID(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].mapLabelWindowID; } -u32 MapHeader_GetWeatherType (u32 headerID) +u32 MapHeader_GetWeatherType(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].weather; } -u32 MapHeader_GetCameraType (u32 headerID) +u32 MapHeader_GetCameraType(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].cameraType; } -u32 MapHeader_GetBattleBG (u32 headerID) +u32 MapHeader_GetBattleBG(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].battleBG; } -BOOL MapHeader_IsEscapeRopeAllowed (u32 headerID) +BOOL MapHeader_IsEscapeRopeAllowed(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].isEscapeRopeAllowed; } -BOOL MapHeader_IsFlyAllowed (u32 headerID) +BOOL MapHeader_IsFlyAllowed(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].isFlyAllowed; } -BOOL MapHeader_IsBikeAllowed (u32 headerID) +BOOL MapHeader_IsBikeAllowed(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].isBikeAllowed; } -u32 MapHeader_GetMapType (u32 headerID) +u32 MapHeader_GetMapType(u32 headerID) { headerID = MapHeader_IDBoundsCheck(headerID); return sMapHeaders[headerID].mapType; } -BOOL MapHeader_IsTeleportAllowed (u32 headerID) +BOOL MapHeader_IsTeleportAllowed(u32 headerID) { if (MapHeader_IsFlyAllowed(headerID) == 0) { return FALSE; @@ -153,32 +154,32 @@ BOOL MapHeader_IsTeleportAllowed (u32 headerID) return MapHeader_GetMapType(headerID) != 1; } -BOOL MapHeader_IsOnMainMatrix (u32 headerID) +BOOL MapHeader_IsOnMainMatrix(u32 headerID) { return MapHeader_GetMapMatrixID(headerID) == 0; } -BOOL MapHeader_IsPokemonCenter (u32 headerID) +BOOL MapHeader_IsPokemonCenter(u32 headerID) { return MapHeader_GetMapType(headerID) == 5; } -BOOL MapHeader_IsCave (u32 headerID) +BOOL MapHeader_IsCave(u32 headerID) { return MapHeader_GetMapType(headerID) == 3; } -BOOL sub_0203A288 (u32 headerID) +BOOL sub_0203A288(u32 headerID) { return (MapHeader_GetMapType(headerID) == 4) || (MapHeader_GetMapType(headerID) == 5); } -BOOL MapHeader_IsOutdoors (u32 headerID) +BOOL MapHeader_IsOutdoors(u32 headerID) { return (MapHeader_GetMapType(headerID) == 1) || (MapHeader_GetMapType(headerID) == 2); } -BOOL sub_0203A2C8 (u32 headerID) +BOOL sub_0203A2C8(u32 headerID) { if (MapHeader_IsPokemonCenter(headerID)) { return TRUE; @@ -187,27 +188,27 @@ BOOL sub_0203A2C8 (u32 headerID) return FALSE; } -BOOL MapHeader_IsUnionRoom (const u32 headerID) +BOOL MapHeader_IsUnionRoom(const u32 headerID) { return headerID == 466; } -BOOL MapHeader_HasFeebasTiles (const u32 headerID) +BOOL MapHeader_HasFeebasTiles(const u32 headerID) { return headerID == 219; } -BOOL MapHeader_IsTrophyGarden (const u32 headerID) +BOOL MapHeader_IsTrophyGarden(const u32 headerID) { return headerID == 287; } -BOOL MapHeader_IsAmitySquare (const u32 headerID) +BOOL MapHeader_IsAmitySquare(const u32 headerID) { return headerID == 253; } -BOOL MapHeader_IsAzureFluteAllowed (const u32 headerID) +BOOL MapHeader_IsAzureFluteAllowed(const u32 headerID) { if ((headerID == 220) || (headerID == 584) || (headerID == 585)) { return TRUE; @@ -216,7 +217,7 @@ BOOL MapHeader_IsAzureFluteAllowed (const u32 headerID) return FALSE; } -BOOL MapHeader_IsPokemonCenter2F (const u32 headerID) +BOOL MapHeader_IsPokemonCenter2F(const u32 headerID) { static const u16 v0[] = { 0x1A5, @@ -249,7 +250,7 @@ BOOL MapHeader_IsPokemonCenter2F (const u32 headerID) return 0; } -u32 MapHeader_GetMapEvolutionMethod (u32 headerID) +u32 MapHeader_GetMapEvolutionMethod(u32 headerID) { static const u16 v0[] = { 0x181, diff --git a/src/map_header_data.c b/src/map_header_data.c index d422fdb54d..a6d8f02869 100644 --- a/src/map_header_data.c +++ b/src/map_header_data.c @@ -1,34 +1,35 @@ +#include "map_header_data.h" + #include #include +#include "constants/heap.h" + #include "field/field_system.h" #include "overlay006/struct_ov6_02242634.h" -#include "narc.h" #include "heap.h" #include "map_header.h" -#include "map_header_data.h" #include "map_object.h" +#include "narc.h" -#include "constants/heap.h" - -static void MapHeaderData_LoadEvents(MapHeaderData * data, int headerID); -static void MapHeaderData_ParseEvents(MapHeaderData * data); -static void MapHeaderData_LoadScripts(MapHeaderData * data, int headerID); +static void MapHeaderData_LoadEvents(MapHeaderData *data, int headerID); +static void MapHeaderData_ParseEvents(MapHeaderData *data); +static void MapHeaderData_LoadScripts(MapHeaderData *data, int headerID); -void MapHeaderData_Init (FieldSystem * fieldSystem, enum HeapId heapID) +void MapHeaderData_Init(FieldSystem *fieldSystem, enum HeapId heapID) { GF_ASSERT(fieldSystem->mapHeaderData == NULL); fieldSystem->mapHeaderData = Heap_AllocFromHeap(heapID, sizeof(MapHeaderData)); } -void MapHeaderData_Free (FieldSystem * fieldSystem) +void MapHeaderData_Free(FieldSystem *fieldSystem) { GF_ASSERT(fieldSystem->mapHeaderData != NULL); Heap_FreeToHeap(fieldSystem->mapHeaderData); } -void MapHeaderData_Load (FieldSystem * fieldSystem, int headerID) +void MapHeaderData_Load(FieldSystem *fieldSystem, int headerID) { GF_ASSERT(fieldSystem->mapHeaderData != NULL); @@ -38,14 +39,14 @@ void MapHeaderData_Load (FieldSystem * fieldSystem, int headerID) MapHeaderData_LoadScripts(fieldSystem->mapHeaderData, headerID); } -static void MapHeaderData_LoadEvents (MapHeaderData * data, int headerID) +static void MapHeaderData_LoadEvents(MapHeaderData *data, int headerID) { int eventsID = MapHeader_GetEventsArchiveID(headerID); GF_ASSERT(NARC_GetMemberSizeByIndexPair(NARC_INDEX_FIELDDATA__EVENTDATA__ZONE_EVENT, eventsID) < sizeof(data->tmpEventsBuf)); NARC_ReadWholeMemberByIndexPair(data->tmpEventsBuf, NARC_INDEX_FIELDDATA__EVENTDATA__ZONE_EVENT, eventsID); } -void sub_0203A418 (FieldSystem * fieldSystem) +void sub_0203A418(FieldSystem *fieldSystem) { int numObjectEvents = fieldSystem->mapHeaderData->numObjectEvents; @@ -56,24 +57,24 @@ void sub_0203A418 (FieldSystem * fieldSystem) } } -const BgEvent * MapHeaderData_GetBgEvents (const FieldSystem * fieldSystem) +const BgEvent *MapHeaderData_GetBgEvents(const FieldSystem *fieldSystem) { return fieldSystem->mapHeaderData->bgEvents; } -int MapHeaderData_GetNumBgEvents (const FieldSystem * fieldSystem) +int MapHeaderData_GetNumBgEvents(const FieldSystem *fieldSystem) { return fieldSystem->mapHeaderData->numBgEvents; } -const WarpEvent * MapHeaderData_GetWarpEventByIndex (const FieldSystem * fieldSystem, int index) +const WarpEvent *MapHeaderData_GetWarpEventByIndex(const FieldSystem *fieldSystem, int index) { return (index >= fieldSystem->mapHeaderData->numWarpEvents) - ? NULL - : &fieldSystem->mapHeaderData->warpEvents[index]; + ? NULL + : &fieldSystem->mapHeaderData->warpEvents[index]; } -int MapHeaderData_GetIndexOfWarpEventAtPos (const FieldSystem * fieldSystem, int x, int z) +int MapHeaderData_GetIndexOfWarpEventAtPos(const FieldSystem *fieldSystem, int x, int z) { for (int i = 0; i < fieldSystem->mapHeaderData->numWarpEvents; i++) { if (fieldSystem->mapHeaderData->warpEvents[i].x == x @@ -85,30 +86,30 @@ int MapHeaderData_GetIndexOfWarpEventAtPos (const FieldSystem * fieldSystem, int return -1; } -int MapHeaderData_GetNumCoordEvents (const FieldSystem * fieldSystem) +int MapHeaderData_GetNumCoordEvents(const FieldSystem *fieldSystem) { return fieldSystem->mapHeaderData->numCoordEvents; } -const CoordEvent * MapHeaderData_GetCoordEvents (const FieldSystem * fieldSystem) +const CoordEvent *MapHeaderData_GetCoordEvents(const FieldSystem *fieldSystem) { return fieldSystem->mapHeaderData->coordEvents; } -u32 MapHeaderData_GetNumObjectEvents (const FieldSystem * fieldSystem) +u32 MapHeaderData_GetNumObjectEvents(const FieldSystem *fieldSystem) { return fieldSystem->mapHeaderData->numObjectEvents; } -const ObjectEvent * MapHeaderData_GetObjectEvents (const FieldSystem * fieldSystem) +const ObjectEvent *MapHeaderData_GetObjectEvents(const FieldSystem *fieldSystem) { return fieldSystem->mapHeaderData->objectEvents; } -BOOL MapHeaderData_SetObjectEventPos (FieldSystem * fieldSystem, int localID, u16 x, u16 z) +BOOL MapHeaderData_SetObjectEventPos(FieldSystem *fieldSystem, int localID, u16 x, u16 z) { int i; - ObjectEvent * objectEvent = fieldSystem->mapHeaderData->objectEvents; + ObjectEvent *objectEvent = fieldSystem->mapHeaderData->objectEvents; u32 numObjectEvents = fieldSystem->mapHeaderData->numObjectEvents; for (i = 0; i < numObjectEvents; i++) { @@ -123,10 +124,10 @@ BOOL MapHeaderData_SetObjectEventPos (FieldSystem * fieldSystem, int localID, u1 return FALSE; } -BOOL MapHeaderData_SetObjectEventDir (FieldSystem * fieldSystem, int localID, int dir) +BOOL MapHeaderData_SetObjectEventDir(FieldSystem *fieldSystem, int localID, int dir) { int i; - ObjectEvent * objectEvent = fieldSystem->mapHeaderData->objectEvents; + ObjectEvent *objectEvent = fieldSystem->mapHeaderData->objectEvents; u32 numObjectEvents = fieldSystem->mapHeaderData->numObjectEvents; for (i = 0; i < numObjectEvents; i++) { @@ -140,10 +141,10 @@ BOOL MapHeaderData_SetObjectEventDir (FieldSystem * fieldSystem, int localID, in return FALSE; } -BOOL MapHeaderData_SetObjectEventMovementType (FieldSystem * fieldSystem, int localID, int movementType) +BOOL MapHeaderData_SetObjectEventMovementType(FieldSystem *fieldSystem, int localID, int movementType) { int i; - ObjectEvent * objectEvent = fieldSystem->mapHeaderData->objectEvents; + ObjectEvent *objectEvent = fieldSystem->mapHeaderData->objectEvents; u32 numObjectEvents = fieldSystem->mapHeaderData->numObjectEvents; for (i = 0; i < numObjectEvents; i++) { @@ -157,31 +158,31 @@ BOOL MapHeaderData_SetObjectEventMovementType (FieldSystem * fieldSystem, int lo return FALSE; } -BOOL MapHeaderData_SetWarpEventPos (FieldSystem * fieldSystem, u16 index, u16 x, u16 z) +BOOL MapHeaderData_SetWarpEventPos(FieldSystem *fieldSystem, u16 index, u16 x, u16 z) { - WarpEvent * warpEvent = fieldSystem->mapHeaderData->warpEvents; + WarpEvent *warpEvent = fieldSystem->mapHeaderData->warpEvents; warpEvent[index].x = x; warpEvent[index].z = z; return TRUE; } -BOOL MapHeaderData_SetWarpEventDestHeaderID (FieldSystem * fieldSystem, u16 index, u16 destHeaderID) +BOOL MapHeaderData_SetWarpEventDestHeaderID(FieldSystem *fieldSystem, u16 index, u16 destHeaderID) { - WarpEvent * warpEvents = fieldSystem->mapHeaderData->warpEvents; + WarpEvent *warpEvents = fieldSystem->mapHeaderData->warpEvents; warpEvents[index].destHeaderID = destHeaderID; return TRUE; } -BOOL MapHeaderData_SetWarpEventDestWarpID (FieldSystem * fieldSystem, u16 index, u16 destWarpID) +BOOL MapHeaderData_SetWarpEventDestWarpID(FieldSystem *fieldSystem, u16 index, u16 destWarpID) { - WarpEvent * warpEvents = fieldSystem->mapHeaderData->warpEvents; + WarpEvent *warpEvents = fieldSystem->mapHeaderData->warpEvents; warpEvents[index].destWarpID = destWarpID; return TRUE; } -BOOL MapHeaderData_SetBgEventPos (FieldSystem * fieldSystem, u16 index, u16 x, u16 z) +BOOL MapHeaderData_SetBgEventPos(FieldSystem *fieldSystem, u16 index, u16 x, u16 z) { - BgEvent * bgEvent = MapHeaderData_GetBgEvents(fieldSystem); + BgEvent *bgEvent = MapHeaderData_GetBgEvents(fieldSystem); bgEvent += index; bgEvent->x = x; @@ -190,9 +191,9 @@ BOOL MapHeaderData_SetBgEventPos (FieldSystem * fieldSystem, u16 index, u16 x, u return TRUE; } -static void MapHeaderData_ParseEvents (MapHeaderData * data) +static void MapHeaderData_ParseEvents(MapHeaderData *data) { - const u8 * events = (const u8 *)data->tmpEventsBuf; + const u8 *events = (const u8 *)data->tmpEventsBuf; // bgEvents { @@ -243,23 +244,23 @@ static void MapHeaderData_ParseEvents (MapHeaderData * data) } } -void MapHeaderData_LoadWildEncounters (UnkStruct_ov6_02242634 * data, int headerID) +void MapHeaderData_LoadWildEncounters(UnkStruct_ov6_02242634 *data, int headerID) { memset(data, 0, sizeof(UnkStruct_ov6_02242634)); if (MapHeader_HasWildEncounters(headerID)) { int narcIndex = (GAME_VERSION == DIAMOND || GAME_VERSION == PLATINUM) - ? NARC_INDEX_FIELDDATA__ENCOUNTDATA__PL_ENC_DATA - : NARC_INDEX_FIELDDATA__ENCOUNTDATA__P_ENC_DATA; + ? NARC_INDEX_FIELDDATA__ENCOUNTDATA__PL_ENC_DATA + : NARC_INDEX_FIELDDATA__ENCOUNTDATA__P_ENC_DATA; NARC_ReadWholeMemberByIndexPair(data, narcIndex, MapHeader_GetWildEncountersArchiveID(headerID)); } } -const UnkStruct_ov6_02242634 * MapHeaderData_GetWildEncounters (const FieldSystem * fieldSystem) +const UnkStruct_ov6_02242634 *MapHeaderData_GetWildEncounters(const FieldSystem *fieldSystem) { return &fieldSystem->mapHeaderData->wildEncounters; } -static void MapHeaderData_LoadScripts (MapHeaderData * data, int headerID) +static void MapHeaderData_LoadScripts(MapHeaderData *data, int headerID) { int mapScriptID = MapHeader_GetMapScriptArchiveID(headerID); @@ -269,15 +270,15 @@ static void MapHeaderData_LoadScripts (MapHeaderData * data, int headerID) NARC_ReadWholeMemberByIndexPair(data->scripts, NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ, mapScriptID); } -const u8 * MapHeaderData_GetScripts (const FieldSystem * fieldSystem) +const u8 *MapHeaderData_GetScripts(const FieldSystem *fieldSystem) { GF_ASSERT(fieldSystem->mapHeaderData != NULL); return (const u8 *)&fieldSystem->mapHeaderData->scripts; } -BOOL MapHeaderData_IsAnyObjectEventAtPos (const FieldSystem * fieldSystem, u16 x, u16 z) +BOOL MapHeaderData_IsAnyObjectEventAtPos(const FieldSystem *fieldSystem, u16 x, u16 z) { - const MapHeaderData * data = fieldSystem->mapHeaderData; + const MapHeaderData *data = fieldSystem->mapHeaderData; for (u32 i = 0; i < data->numObjectEvents; i++) { if (data->objectEvents[i].x == x && data->objectEvents[i].z == z) { diff --git a/src/map_object.c b/src/map_object.c index 1a0af19eb5..a2459cc267 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -1,39 +1,40 @@ +#include "map_object.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02061830_sub1_decl.h" - -#include "overlay005/const_ov5_021FB97C.h" -#include "overlay005/const_ov5_021FB470.h" -#include "constdata/const_020EE3A8.h" +#include "struct_defs/struct_02061D3C.h" +#include "struct_defs/struct_020EDF0C.h" #include "field/field_system.h" -#include "struct_defs/struct_02061D3C.h" #include "functypes/funcptr_020EDF0C.h" -#include "struct_defs/struct_020EDF0C.h" #include "functypes/funcptr_020EDF0C_1.h" #include "functypes/funcptr_020EDF0C_2.h" -#include "overlay005/struct_ov5_021ED0A4.h" +#include "overlay005/const_ov5_021FB470.h" +#include "overlay005/const_ov5_021FB97C.h" #include "overlay005/funcptr_ov5_021FB0F0.h" -#include "overlay005/struct_ov5_021FB0F0.h" #include "overlay005/funcptr_ov5_021FB0F0_1.h" #include "overlay005/funcptr_ov5_021FB0F0_2.h" #include "overlay005/funcptr_ov5_021FB0F0_3.h" #include "overlay005/funcptr_ov5_021FB0F0_4.h" +#include "overlay005/ov5_021ECC20.h" +#include "overlay005/ov5_021ECE40.h" +#include "overlay005/struct_ov5_021ED0A4.h" +#include "overlay005/struct_ov5_021FB0F0.h" #include "overlay005/struct_ov5_021FB97C.h" -#include "sys_task.h" #include "heap.h" -#include "unk_0203E880.h" #include "map_header_data.h" -#include "map_object.h" #include "map_object_move.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_0203E880.h" #include "unk_020655F4.h" #include "unk_020677F4.h" -#include "overlay005/ov5_021ECC20.h" -#include "overlay005/ov5_021ECE40.h" + +#include "constdata/const_020EE3A8.h" typedef struct MapObjectMan { u32 unk_00; @@ -41,11 +42,11 @@ typedef struct MapObjectMan { int objectCnt; int unk_0C; int unk_10; - NARC * unk_14; + NARC *unk_14; UnkStruct_ov5_021ED0A4 unk_18; - UnkStruct_02061830_sub1 * unk_120; - MapObject * unk_124; - FieldSystem * fieldSystem; + UnkStruct_02061830_sub1 *unk_120; + MapObject *unk_124; + FieldSystem *fieldSystem; } MapObjectManager; typedef struct UnkStruct_02061AB4_t { @@ -86,8 +87,8 @@ typedef struct UnkStruct_02061AB4_t { int unk_A8; u16 unk_AC; u16 unk_AE; - SysTask * unk_B0; - const MapObjectManager * mapObjMan; + SysTask *unk_B0; + const MapObjectManager *mapObjMan; UnkFuncPtr_020EDF0C unk_B8; UnkFuncPtr_020EDF0C_1 unk_BC; UnkFuncPtr_020EDF0C_2 unk_C0; @@ -106,63 +107,63 @@ typedef struct { int unk_00; int unk_04; int unk_08; - const MapObjectManager * unk_0C; - ObjectEvent * unk_10; + const MapObjectManager *unk_0C; + ObjectEvent *unk_10; } UnkStruct_020620C4; -static MapObjectManager * MapObjectMan_Alloc(int param0); -static void MapObject_Save(FieldSystem * fieldSystem, MapObject * param1, MapObjectSave * param2); -static void MapObject_LoadSave(MapObject * mapObj, MapObjectSave * param1); -static void sub_02061FA8(const MapObjectManager * param0, MapObject * param1); -static void sub_02061FF0(MapObject * mapObj); -static void sub_02062010(MapObject * mapObj); -static void sub_020620C4(UnkStruct_020620C4 * param0); -static MapObject * sub_02062120(const MapObjectManager * param0); -static MapObject * sub_02062154(const MapObjectManager * param0, int param1, int param2); -static void MapObjectMan_AddMoveTask(const MapObjectManager * param0, MapObject * param1); -static void sub_020621E8(MapObject * param0, const ObjectEvent * param1, FieldSystem * fieldSystem); -static void sub_020622B8(MapObject * param0, const ObjectEvent * param1); -static void sub_0206234C(MapObject * param0, const MapObjectManager * param1); -static void sub_0206239C(MapObject * param0); -static void sub_020623D4(MapObject * param0); -static void sub_0206243C(MapObject * param0); -static int sub_0206244C(const MapObject * param0, int param1, int param2, const ObjectEvent * param3); -static MapObject * sub_020624CC(const MapObjectManager * param0, int param1, int param2); -static void sub_02062604(MapObject * param0); -static void sub_02062618(MapObject * param0); -static void sub_02062628(MapObject * param0); -static int sub_0206262C(FieldSystem * fieldSystem, int param1); -static void sub_02062648(MapObject * param0); -static void sub_02062660(MapObject * param0); -static void sub_02062670(MapObject * param0); -static void sub_020626D0(MapObject * param0, const ObjectEvent * param1, int param2); -static void sub_02062714(MapObject * param0, int param1, const ObjectEvent * param2); -static void MapObjectTask_Move(SysTask * param0, void * param1); -static void MapObjectTask_Draw(MapObject * param0); -static MapObjectManager * MapObjectMan_Deconst(const MapObjectManager * param0); -static void MapObjectMan_IncObjectCount(MapObjectManager * param0); -static void MapObjectMan_DecObjectCount(MapObjectManager * param0); -static MapObject * sub_02062870(const MapObjectManager * param0); -static MapObjectManager * sub_02062A48(const MapObject * param0); -static const ObjectEvent * sub_020631A4(int param0, int param1, const ObjectEvent * param2); -static int sub_020631D8(const ObjectEvent * param0); -static int sub_020631F4(const ObjectEvent * param0); - -static const UnkStruct_020EDF0C * sub_0206320C(u32 param0); -static UnkFuncPtr_020EDF0C sub_02063224(const UnkStruct_020EDF0C * param0); -static UnkFuncPtr_020EDF0C_1 sub_02063228(const UnkStruct_020EDF0C * param0); -static UnkFuncPtr_020EDF0C_2 sub_0206322C(const UnkStruct_020EDF0C * param0); -static UnkFuncPtr_ov5_021FB0F0_3 sub_0206323C(const UnkStruct_ov5_021FB0F0 * param0); -static UnkFuncPtr_ov5_021FB0F0_4 sub_02063240(const UnkStruct_ov5_021FB0F0 * param0); - -static UnkFuncPtr_ov5_021FB0F0 sub_02063230(const UnkStruct_ov5_021FB0F0 * param0); -static UnkFuncPtr_ov5_021FB0F0_1 sub_02063234(const UnkStruct_ov5_021FB0F0 * param0); -static UnkFuncPtr_ov5_021FB0F0_2 sub_02063238(const UnkStruct_ov5_021FB0F0 * param0); -static const UnkStruct_ov5_021FB0F0 * sub_02063244(u32 param0); - -MapObjectManager * MapObjectMan_New (FieldSystem * fieldSystem, int maxObjs, int param2) -{ - MapObjectManager * mapObjMan = MapObjectMan_Alloc(maxObjs); +static MapObjectManager *MapObjectMan_Alloc(int param0); +static void MapObject_Save(FieldSystem *fieldSystem, MapObject *param1, MapObjectSave *param2); +static void MapObject_LoadSave(MapObject *mapObj, MapObjectSave *param1); +static void sub_02061FA8(const MapObjectManager *param0, MapObject *param1); +static void sub_02061FF0(MapObject *mapObj); +static void sub_02062010(MapObject *mapObj); +static void sub_020620C4(UnkStruct_020620C4 *param0); +static MapObject *sub_02062120(const MapObjectManager *param0); +static MapObject *sub_02062154(const MapObjectManager *param0, int param1, int param2); +static void MapObjectMan_AddMoveTask(const MapObjectManager *param0, MapObject *param1); +static void sub_020621E8(MapObject *param0, const ObjectEvent *param1, FieldSystem *fieldSystem); +static void sub_020622B8(MapObject *param0, const ObjectEvent *param1); +static void sub_0206234C(MapObject *param0, const MapObjectManager *param1); +static void sub_0206239C(MapObject *param0); +static void sub_020623D4(MapObject *param0); +static void sub_0206243C(MapObject *param0); +static int sub_0206244C(const MapObject *param0, int param1, int param2, const ObjectEvent *param3); +static MapObject *sub_020624CC(const MapObjectManager *param0, int param1, int param2); +static void sub_02062604(MapObject *param0); +static void sub_02062618(MapObject *param0); +static void sub_02062628(MapObject *param0); +static int sub_0206262C(FieldSystem *fieldSystem, int param1); +static void sub_02062648(MapObject *param0); +static void sub_02062660(MapObject *param0); +static void sub_02062670(MapObject *param0); +static void sub_020626D0(MapObject *param0, const ObjectEvent *param1, int param2); +static void sub_02062714(MapObject *param0, int param1, const ObjectEvent *param2); +static void MapObjectTask_Move(SysTask *param0, void *param1); +static void MapObjectTask_Draw(MapObject *param0); +static MapObjectManager *MapObjectMan_Deconst(const MapObjectManager *param0); +static void MapObjectMan_IncObjectCount(MapObjectManager *param0); +static void MapObjectMan_DecObjectCount(MapObjectManager *param0); +static MapObject *sub_02062870(const MapObjectManager *param0); +static MapObjectManager *sub_02062A48(const MapObject *param0); +static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *param2); +static int sub_020631D8(const ObjectEvent *param0); +static int sub_020631F4(const ObjectEvent *param0); + +static const UnkStruct_020EDF0C *sub_0206320C(u32 param0); +static UnkFuncPtr_020EDF0C sub_02063224(const UnkStruct_020EDF0C *param0); +static UnkFuncPtr_020EDF0C_1 sub_02063228(const UnkStruct_020EDF0C *param0); +static UnkFuncPtr_020EDF0C_2 sub_0206322C(const UnkStruct_020EDF0C *param0); +static UnkFuncPtr_ov5_021FB0F0_3 sub_0206323C(const UnkStruct_ov5_021FB0F0 *param0); +static UnkFuncPtr_ov5_021FB0F0_4 sub_02063240(const UnkStruct_ov5_021FB0F0 *param0); + +static UnkFuncPtr_ov5_021FB0F0 sub_02063230(const UnkStruct_ov5_021FB0F0 *param0); +static UnkFuncPtr_ov5_021FB0F0_1 sub_02063234(const UnkStruct_ov5_021FB0F0 *param0); +static UnkFuncPtr_ov5_021FB0F0_2 sub_02063238(const UnkStruct_ov5_021FB0F0 *param0); +static const UnkStruct_ov5_021FB0F0 *sub_02063244(u32 param0); + +MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int param2) +{ + MapObjectManager *mapObjMan = MapObjectMan_Alloc(maxObjs); MapObjectMan_SetFieldSystem(mapObjMan, fieldSystem); MapObjectMan_SetMaxObjects(mapObjMan, maxObjs); sub_02062854(mapObjMan, param2); @@ -170,16 +171,16 @@ MapObjectManager * MapObjectMan_New (FieldSystem * fieldSystem, int maxObjs, int return mapObjMan; } -void MapObjectMan_Delete (MapObjectManager * mapObjMan) +void MapObjectMan_Delete(MapObjectManager *mapObjMan) { Heap_FreeToHeapExplicit(11, sub_02062878(mapObjMan)); Heap_FreeToHeapExplicit(11, mapObjMan); } -void sub_0206184C (MapObjectManager * mapObjMan, int param1, int param2, int param3, const ObjectEvent * param4) +void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *param4) { int v0, v1 = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject * mapObj = sub_02062878(mapObjMan); + MapObject *mapObj = sub_02062878(mapObjMan); while (v1) { if (sub_02062CF8(mapObj) == 1) { @@ -207,11 +208,11 @@ void sub_0206184C (MapObjectManager * mapObjMan, int param1, int param2, int par ov5_021EDA38(mapObjMan, sub_0206285C(mapObjMan)); } -static MapObjectManager * MapObjectMan_Alloc (int maxObjs) +static MapObjectManager *MapObjectMan_Alloc(int maxObjs) { int size; - MapObject * mapObj; - MapObjectManager * mapObjMan; + MapObject *mapObj; + MapObjectManager *mapObjMan; mapObjMan = Heap_AllocFromHeap(11, (sizeof(MapObjectManager))); @@ -229,11 +230,11 @@ static MapObjectManager * MapObjectMan_Alloc (int maxObjs) return mapObjMan; } -MapObject * MapObjectMan_AddMapObjectFromHeader (const MapObjectManager * mapObjMan, const ObjectEvent * param1, int param2) +MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *param1, int param2) { - MapObject * mapObj; + MapObject *mapObj; ObjectEvent v1 = *param1; - ObjectEvent * v2 = &v1; + ObjectEvent *v2 = &v1; int v3 = sub_020630F4(v2); @@ -272,10 +273,10 @@ MapObject * MapObjectMan_AddMapObjectFromHeader (const MapObjectManager * mapObj return mapObj; } -MapObject * MapObjectMan_AddMapObject (const MapObjectManager * mapObjMan, int x, int z, int param3, int param4, int param5, int param6) +MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, int z, int param3, int param4, int param5, int param6) { ObjectEvent objectEvent; - MapObject * mapObj; + MapObject *mapObj; sub_020630F0(&objectEvent, 0); sub_020630F8(&objectEvent, param4); @@ -298,14 +299,14 @@ MapObject * MapObjectMan_AddMapObject (const MapObjectManager * mapObjMan, int x return mapObj; } -MapObject * sub_02061A74 (const MapObjectManager * mapObjMan, int param1, int param2, int param3, const ObjectEvent * param4) +MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *param4) { - MapObject * mapObj = NULL; - const ObjectEvent * v1 = sub_020631A4(param1, param2, param4); + MapObject *mapObj = NULL; + const ObjectEvent *v1 = sub_020631A4(param1, param2, param4); if (v1 != NULL) { int v2 = sub_02063114(v1); - FieldSystem * fieldSystem = MapObjectMan_FieldSystem(mapObjMan); + FieldSystem *fieldSystem = MapObjectMan_FieldSystem(mapObjMan); if (sub_0203F188(fieldSystem, v2) == 0) { mapObj = MapObjectMan_AddMapObjectFromHeader(mapObjMan, v1, param3); @@ -315,7 +316,7 @@ MapObject * sub_02061A74 (const MapObjectManager * mapObjMan, int param1, int pa return mapObj; } -void sub_02061AB4 (MapObject * mapObj, int param1) +void sub_02061AB4(MapObject *mapObj, int param1) { sub_0206291C(mapObj, param1); sub_02062604(mapObj); @@ -323,7 +324,7 @@ void sub_02061AB4 (MapObject * mapObj, int param1) sub_02062670(mapObj); } -void sub_02061AD4 (MapObject * mapObj, int param1) +void sub_02061AD4(MapObject *mapObj, int param1) { if (sub_02062DFC(mapObj) == 1) { sub_02061B48(mapObj); @@ -332,9 +333,9 @@ void sub_02061AD4 (MapObject * mapObj, int param1) sub_02061AB4(mapObj, param1); } -void MapObject_Delete (MapObject * mapObj) +void MapObject_Delete(MapObject *mapObj) { - const MapObjectManager * mapObjMan; + const MapObjectManager *mapObjMan; mapObjMan = MapObject_MapObjectManager(mapObj); @@ -348,16 +349,16 @@ void MapObject_Delete (MapObject * mapObj) sub_0206243C(mapObj); } -void sub_02061B28 (MapObject * mapObj) +void sub_02061B28(MapObject *mapObj) { int v0 = sub_02062958(mapObj); sub_0203F19C(MapObject_FieldSystem(mapObj), v0); MapObject_Delete(mapObj); } -void sub_02061B48 (MapObject * mapObj) +void sub_02061B48(MapObject *mapObj) { - const MapObjectManager * mapObjMan = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); if (MapObjectMan_IsDrawInitialized(mapObjMan) == 1) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_14)) { @@ -375,10 +376,10 @@ void sub_02061B48 (MapObject * mapObj) sub_02062B9C(mapObj, sub_020633FC); } -void MapObjectMan_DeleteAll (MapObjectManager * mapObjMan) +void MapObjectMan_DeleteAll(MapObjectManager *mapObjMan) { int v0, v1; - MapObject * mapObj; + MapObject *mapObj; v0 = 0; v1 = MapObjectMan_GetMaxObjects(mapObjMan); @@ -394,12 +395,12 @@ void MapObjectMan_DeleteAll (MapObjectManager * mapObjMan) } while (v0 < v1); } -void sub_02061BF0 (MapObjectManager * mapObjMan) +void sub_02061BF0(MapObjectManager *mapObjMan) { GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == 1); int v0, maxObjects; - MapObject * mapObj; + MapObject *mapObj; v0 = 0; maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); @@ -418,13 +419,13 @@ void sub_02061BF0 (MapObjectManager * mapObjMan) } while (v0 < maxObjects); } -void sub_02061C48 (MapObjectManager * mapObjMan) +void sub_02061C48(MapObjectManager *mapObjMan) { GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == 1); int v0 = 0; int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject * mapObj = sub_02062878(mapObjMan); + MapObject *mapObj = sub_02062878(mapObjMan); do { if (sub_02062CF8(mapObj) == 1) { @@ -443,14 +444,15 @@ void sub_02061C48 (MapObjectManager * mapObjMan) } while (v0 < maxObjects); } -void MapObjectMan_SaveAll (FieldSystem * fieldSystem, const MapObjectManager * param1, MapObjectSave * mapObjSave, int param3) +void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *param1, MapObjectSave *mapObjSave, int param3) { int v0 = 0; - MapObject * mapObj; + MapObject *mapObj; while (sub_020625B0(param1, &mapObj, &v0, (1 << 0))) { MapObject_Save(fieldSystem, mapObj, mapObjSave); - mapObjSave++; param3--; + mapObjSave++; + param3--; GF_ASSERT(param3 > 0); } @@ -459,13 +461,13 @@ void MapObjectMan_SaveAll (FieldSystem * fieldSystem, const MapObjectManager * p } } -void MapObjectMan_LoadAllObjects (const MapObjectManager * mapObjMan, MapObjectSave * mapObjSave, int size) +void MapObjectMan_LoadAllObjects(const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int size) { int v0 = 0; - MapObject * mapObj; + MapObject *mapObj; while (size) { - if ((mapObjSave->unk_00 & (1 << 0))) { + if (mapObjSave->unk_00 & (1 << 0)) { mapObj = sub_02062120(mapObjMan); GF_ASSERT(mapObj != NULL); @@ -478,7 +480,7 @@ void MapObjectMan_LoadAllObjects (const MapObjectManager * mapObjMan, MapObjectS } } -static void MapObject_Save (FieldSystem * fieldSystem, MapObject * mapObj, MapObjectSave * mapObjSave) +static void MapObject_Save(FieldSystem *fieldSystem, MapObject *mapObj, MapObjectSave *mapObjSave) { mapObjSave->unk_00 = sub_020628B8(mapObj); mapObjSave->unk_04 = sub_020628EC(mapObj); @@ -527,7 +529,7 @@ static void MapObject_Save (FieldSystem * fieldSystem, MapObject * mapObj, MapOb memcpy(mapObjSave->unk_40, sub_02062AA0(mapObj), 16); } -static void MapObject_LoadSave (MapObject * mapObj, MapObjectSave * mapObjSave) +static void MapObject_LoadSave(MapObject *mapObj, MapObjectSave *mapObjSave) { sub_020628B4(mapObj, mapObjSave->unk_00); sub_020628E8(mapObj, mapObjSave->unk_04); @@ -553,7 +555,7 @@ static void MapObject_LoadSave (MapObject * mapObj, MapObjectSave * mapObjSave) MapObject_SetY(mapObj, mapObjSave->unk_28); MapObject_SetZ(mapObj, mapObjSave->unk_2A); - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; v0.y = mapObjSave->unk_2C; MapObject_SetPosVec(mapObj, &v0); @@ -562,7 +564,7 @@ static void MapObject_LoadSave (MapObject * mapObj, MapObjectSave * mapObjSave) memcpy(sub_02062AA0(mapObj), mapObjSave->unk_40, 16); } -static void sub_02061FA8 (const MapObjectManager * mapObjMan, MapObject * mapObj) +static void sub_02061FA8(const MapObjectManager *mapObjMan, MapObject *mapObj) { sub_02061FF0(mapObj); sub_02062010(mapObj); @@ -575,14 +577,14 @@ static void sub_02061FA8 (const MapObjectManager * mapObjMan, MapObject * mapObj MapObjectMan_IncObjectCount(MapObjectMan_Deconst(mapObjMan)); } -static void sub_02061FF0 (MapObject * mapObj) +static void sub_02061FF0(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_0 | MAP_OBJ_STATUS_START_MOVEMENT); MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT | MAP_OBJ_STATUS_HIDE | MAP_OBJ_STATUS_14 | MAP_OBJ_STATUS_16 | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_18 | MAP_OBJ_STATUS_19 | MAP_OBJ_STATUS_21 | MAP_OBJ_STATUS_22 | MAP_OBJ_STATUS_23); sub_02062618(mapObj); } -static void sub_02062010 (MapObject * mapObj) +static void sub_02062010(MapObject *mapObj) { int v0; VecFx32 v1; @@ -590,24 +592,24 @@ static void sub_02062010 (MapObject * mapObj) MapObject_PosVectorOut(mapObj, &v1); v0 = MapObject_GetXPos(mapObj); - v1.x = (((v0) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)); + v1.x = (((v0) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetXPosPrev(mapObj, v0); v0 = MapObject_GetYPos(mapObj); MapObject_SetYPosPrev(mapObj, v0); v0 = MapObject_GetZPos(mapObj); - v1.z = (((v0) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)); + v1.z = (((v0) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetZPosPrev(mapObj, v0); MapObject_SetPosVec(mapObj, &v1); } -void sub_02062068 (const MapObjectManager * mapObjMan, int param1, int param2, const ObjectEvent * param3) +void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *param3) { int v0; - ObjectEvent * v1; - UnkStruct_020620C4 * v2; + ObjectEvent *v1; + UnkStruct_020620C4 *v2; GF_ASSERT(param2); @@ -629,11 +631,11 @@ void sub_02062068 (const MapObjectManager * mapObjMan, int param1, int param2, c sub_020620C4(v2); } -static void sub_020620C4 (UnkStruct_020620C4 * param0) +static void sub_020620C4(UnkStruct_020620C4 *param0) { - MapObject * mapObj; - FieldSystem * fieldSystem; - const ObjectEvent * v2; + MapObject *mapObj; + FieldSystem *fieldSystem; + const ObjectEvent *v2; fieldSystem = MapObjectMan_FieldSystem(param0->unk_0C); v2 = param0->unk_10; @@ -652,10 +654,10 @@ static void sub_020620C4 (UnkStruct_020620C4 * param0) Heap_FreeToHeapExplicit(11, param0); } -static MapObject * sub_02062120 (const MapObjectManager * mapObjMan) +static MapObject *sub_02062120(const MapObjectManager *mapObjMan) { int v0, v1; - MapObject * mapObj; + MapObject *mapObj; v0 = 0; v1 = MapObjectMan_GetMaxObjects(mapObjMan); @@ -673,10 +675,10 @@ static MapObject * sub_02062120 (const MapObjectManager * mapObjMan) return NULL; } -static MapObject * sub_02062154 (const MapObjectManager * mapObjMan, int param1, int param2) +static MapObject *sub_02062154(const MapObjectManager *mapObjMan, int param1, int param2) { int v0 = 0; - MapObject * v1; + MapObject *v1; while (sub_020625B0(mapObjMan, &v1, &v0, (1 << 0)) == 1) { if (sub_02062E94(v1) == 1) { @@ -691,10 +693,10 @@ static MapObject * sub_02062154 (const MapObjectManager * mapObjMan, int param1, return NULL; } -static void MapObjectMan_AddMoveTask (const MapObjectManager * mapObjMan, MapObject * mapObj) +static void MapObjectMan_AddMoveTask(const MapObjectManager *mapObjMan, MapObject *mapObj) { int v0, code; - SysTask * task; + SysTask *task; v0 = sub_02062858(mapObjMan); code = MapObject_GetMoveCode(mapObj); @@ -709,7 +711,7 @@ static void MapObjectMan_AddMoveTask (const MapObjectManager * mapObjMan, MapObj sub_02062A1C(mapObj, task); } -static void sub_020621E8 (MapObject * mapObj, const ObjectEvent * objectEvent, FieldSystem * fieldSystem) +static void sub_020621E8(MapObject *mapObj, const ObjectEvent *objectEvent, FieldSystem *fieldSystem) { MapObject_SetId(mapObj, sub_020630F4(objectEvent)); sub_0206291C(mapObj, sub_0206262C(fieldSystem, sub_020630FC(objectEvent))); @@ -726,13 +728,13 @@ static void sub_020621E8 (MapObject * mapObj, const ObjectEvent * objectEvent, F sub_020622B8(mapObj, objectEvent); } -static void sub_020622B8 (MapObject * mapObj, const ObjectEvent * objectEvent) +static void sub_020622B8(MapObject *mapObj, const ObjectEvent *objectEvent) { int v0; VecFx32 v1; v0 = sub_02063190(objectEvent); - v1.x = (((v0) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)); + v1.x = (((v0) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetXInitial(mapObj, v0); MapObject_SetXPosPrev(mapObj, v0); @@ -747,7 +749,7 @@ static void sub_020622B8 (MapObject * mapObj, const ObjectEvent * objectEvent) MapObject_SetY(mapObj, v0); v0 = sub_020631A0(objectEvent); - v1.z = (((v0) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)); + v1.z = (((v0) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetZInitial(mapObj, v0); MapObject_SetZPosPrev(mapObj, v0); @@ -755,7 +757,7 @@ static void sub_020622B8 (MapObject * mapObj, const ObjectEvent * objectEvent) MapObject_SetPosVec(mapObj, &v1); } -static void sub_0206234C (MapObject * mapObj, const MapObjectManager * param1) +static void sub_0206234C(MapObject *mapObj, const MapObjectManager *param1) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_0 | MAP_OBJ_STATUS_12 | MAP_OBJ_STATUS_11); @@ -769,9 +771,9 @@ static void sub_0206234C (MapObject * mapObj, const MapObjectManager * param1) sub_020656DC(mapObj); } -static void sub_0206239C (MapObject * mapObj) +static void sub_0206239C(MapObject *mapObj) { - const UnkStruct_020EDF0C * v0; + const UnkStruct_020EDF0C *v0; v0 = sub_0206320C(MapObject_GetMoveCode(mapObj)); @@ -780,9 +782,9 @@ static void sub_0206239C (MapObject * mapObj) sub_02062B20(mapObj, sub_0206322C(v0)); } -static void sub_020623D4 (MapObject * mapObj) +static void sub_020623D4(MapObject *mapObj) { - const UnkStruct_ov5_021FB0F0 * v0; + const UnkStruct_ov5_021FB0F0 *v0; u32 v1 = sub_02062920(mapObj); if (v1 == 0x2000) { @@ -798,12 +800,12 @@ static void sub_020623D4 (MapObject * mapObj) sub_02062B9C(mapObj, sub_02063240(v0)); } -static void sub_0206243C (MapObject * mapObj) +static void sub_0206243C(MapObject *mapObj) { memset(mapObj, 0, (sizeof(MapObject))); } -static int sub_0206244C (const MapObject * mapObj, int param1, int param2, const ObjectEvent * param3) +static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const ObjectEvent *param3) { int v0; int v1; @@ -838,10 +840,10 @@ static int sub_0206244C (const MapObject * mapObj, int param1, int param2, const return 0; } -static MapObject * sub_020624CC (const MapObjectManager * mapObjMan, int param1, int param2) +static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, int param2) { int v0 = 0; - MapObject * v1; + MapObject *v1; while (sub_020625B0(mapObjMan, &v1, &v0, (1 << 0)) == 1) { if ((MapObject_Id(v1) == param1) && (sub_02062918(v1) == param2)) { @@ -852,10 +854,10 @@ static MapObject * sub_020624CC (const MapObjectManager * mapObjMan, int param1, return NULL; } -MapObject * MapObjMan_LocalMapObjByIndex (const MapObjectManager * mapObjMan, int param1) +MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int param1) { int v0; - MapObject * v1; + MapObject *v1; GF_ASSERT(mapObjMan != NULL); @@ -878,10 +880,10 @@ MapObject * MapObjMan_LocalMapObjByIndex (const MapObjectManager * mapObjMan, in return NULL; } -MapObject * sub_02062570 (const MapObjectManager * mapObjMan, int param1) +MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1) { int v0; - MapObject * v1; + MapObject *v1; v0 = MapObjectMan_GetMaxObjects(mapObjMan); v1 = sub_02062870(mapObjMan); @@ -900,10 +902,10 @@ MapObject * sub_02062570 (const MapObjectManager * mapObjMan, int param1) return NULL; } -int sub_020625B0 (const MapObjectManager * mapObjMan, MapObject ** param1, int * param2, u32 param3) +int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **param1, int *param2, u32 param3) { int v0; - MapObject * v1; + MapObject *v1; v0 = MapObjectMan_GetMaxObjects(mapObjMan); @@ -928,23 +930,23 @@ int sub_020625B0 (const MapObjectManager * mapObjMan, MapObject ** param1, int * return 0; } -static void sub_02062604 (MapObject * mapObj) +static void sub_02062604(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); sub_02062618(mapObj); } -static void sub_02062618 (MapObject * mapObj) +static void sub_02062618(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, (1 << 15) | (1 << 20) | (1 << 26) | (1 << 24)); } -static void sub_02062628 (MapObject * mapObj) +static void sub_02062628(MapObject *mapObj) { (void)0; } -static int sub_0206262C (FieldSystem * fieldSystem, int param1) +static int sub_0206262C(FieldSystem *fieldSystem, int param1) { if ((param1 >= 0x65) && (param1 <= 0x74)) { param1 -= 0x65; @@ -954,22 +956,22 @@ static int sub_0206262C (FieldSystem * fieldSystem, int param1) return param1; } -static void sub_02062648 (MapObject * mapObj) +static void sub_02062648(MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, (1 << 12))) { sub_020642F8(mapObj); } } -static void sub_02062660 (MapObject * mapObj) +static void sub_02062660(MapObject *mapObj) { sub_0206239C(mapObj); MapObject_InitMove(mapObj); } -static void sub_02062670 (MapObject * mapObj) +static void sub_02062670(MapObject *mapObj) { - const MapObjectManager * v0 = MapObject_MapObjectManager(mapObj); + const MapObjectManager *v0 = MapObject_MapObjectManager(mapObj); if (MapObjectMan_IsDrawInitialized(v0) == 0) { return; @@ -986,7 +988,7 @@ static void sub_02062670 (MapObject * mapObj) } } -int sub_020626B4 (const MapObject * mapObj) +int sub_020626B4(const MapObject *mapObj) { u16 v0 = (u16)MapObject_GetEventID(mapObj); @@ -997,7 +999,7 @@ int sub_020626B4 (const MapObject * mapObj) return 0; } -static void sub_020626D0 (MapObject * mapObj, const ObjectEvent * param1, int param2) +static void sub_020626D0(MapObject *mapObj, const ObjectEvent *param1, int param2) { GF_ASSERT(sub_02062E94(mapObj) == 1); @@ -1007,7 +1009,7 @@ static void sub_020626D0 (MapObject * mapObj, const ObjectEvent * param1, int pa sub_02062954(mapObj, sub_02063114(param1)); } -static void sub_02062714 (MapObject * mapObj, int param1, const ObjectEvent * param2) +static void sub_02062714(MapObject *mapObj, int param1, const ObjectEvent *param2) { GF_ASSERT(sub_020631D8(param2) == 1); @@ -1017,7 +1019,7 @@ static void sub_02062714 (MapObject * mapObj, int param1, const ObjectEvent * pa sub_02062914(mapObj, param1); } -int sub_02062758 (const MapObject * mapObj, int param1) +int sub_02062758(const MapObject *mapObj, int param1) { int v0; @@ -1027,7 +1029,7 @@ int sub_02062758 (const MapObject * mapObj, int param1) return v0; } -int sub_02062764 (const MapObject * mapObj, int param1, int param2) +int sub_02062764(const MapObject *mapObj, int param1, int param2) { if (MapObject_GetStateFlag(mapObj, (1 << 0)) == 0) { return 0; @@ -1050,7 +1052,7 @@ int sub_02062764 (const MapObject * mapObj, int param1, int param2) return 1; } -int sub_020627B4 (const MapObject * mapObj, int param1, int param2, int param3) +int sub_020627B4(const MapObject *mapObj, int param1, int param2, int param3) { if (MapObject_GetStateFlag(mapObj, (1 << 0)) == 0) { return 0; @@ -1067,9 +1069,9 @@ int sub_020627B4 (const MapObject * mapObj, int param1, int param2, int param3) return sub_02062764(mapObj, param2, param3); } -static void MapObjectTask_Move (SysTask * task, void * _mapObject) +static void MapObjectTask_Move(SysTask *task, void *_mapObject) { - MapObject * mapObj = (MapObject *)_mapObject; + MapObject *mapObj = (MapObject *)_mapObject; MapObject_Move(mapObj); @@ -1080,206 +1082,206 @@ static void MapObjectTask_Move (SysTask * task, void * _mapObject) MapObjectTask_Draw(mapObj); } -static void MapObjectTask_Draw (MapObject * mapObj) +static void MapObjectTask_Draw(MapObject *mapObj) { - const MapObjectManager * mapObjMan = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); if (MapObjectMan_IsDrawInitialized(mapObjMan) == TRUE) { MapObject_Draw(mapObj); } } -static MapObjectManager * MapObjectMan_Deconst (const MapObjectManager * mapObjMan) +static MapObjectManager *MapObjectMan_Deconst(const MapObjectManager *mapObjMan) { - return (MapObjectManager * )mapObjMan; + return (MapObjectManager *)mapObjMan; } -void MapObjectMan_SetMaxObjects (MapObjectManager * mapObjMan, int maxObjs) +void MapObjectMan_SetMaxObjects(MapObjectManager *mapObjMan, int maxObjs) { mapObjMan->maxObjects = maxObjs; } -int MapObjectMan_GetMaxObjects (const MapObjectManager * mapObjMan) +int MapObjectMan_GetMaxObjects(const MapObjectManager *mapObjMan) { return mapObjMan->maxObjects; } -static void MapObjectMan_IncObjectCount (MapObjectManager * mapObjMan) +static void MapObjectMan_IncObjectCount(MapObjectManager *mapObjMan) { mapObjMan->objectCnt++; } -static void MapObjectMan_DecObjectCount (MapObjectManager * mapObjMan) +static void MapObjectMan_DecObjectCount(MapObjectManager *mapObjMan) { mapObjMan->objectCnt--; } -void sub_02062838 (MapObjectManager * mapObjMan, u32 param1) +void sub_02062838(MapObjectManager *mapObjMan, u32 param1) { mapObjMan->unk_00 |= param1; } -void sub_02062840 (MapObjectManager * mapObjMan, u32 param1) +void sub_02062840(MapObjectManager *mapObjMan, u32 param1) { mapObjMan->unk_00 &= ~param1; } -u32 sub_0206284C (const MapObjectManager * mapObjMan, u32 param1) +u32 sub_0206284C(const MapObjectManager *mapObjMan, u32 param1) { - return(mapObjMan->unk_00 & param1); + return mapObjMan->unk_00 & param1; } -void sub_02062854 (MapObjectManager * mapObjMan, int param1) +void sub_02062854(MapObjectManager *mapObjMan, int param1) { mapObjMan->unk_0C = param1; } -int sub_02062858 (const MapObjectManager * mapObjMan) +int sub_02062858(const MapObjectManager *mapObjMan) { return mapObjMan->unk_0C; } -UnkStruct_ov5_021ED0A4 * sub_0206285C (const MapObjectManager * mapObjMan) +UnkStruct_ov5_021ED0A4 *sub_0206285C(const MapObjectManager *mapObjMan) { return &(((MapObjectManager *)mapObjMan)->unk_18); } -void sub_02062860 (MapObjectManager * mapObjMan, MapObject * param1) +void sub_02062860(MapObjectManager *mapObjMan, MapObject *param1) { mapObjMan->unk_124 = param1; } -const MapObject * sub_02062868 (const MapObjectManager * mapObjMan) +const MapObject *sub_02062868(const MapObjectManager *mapObjMan) { return mapObjMan->unk_124; } -static MapObject * sub_02062870 (const MapObjectManager * mapObjMan) +static MapObject *sub_02062870(const MapObjectManager *mapObjMan) { return mapObjMan->unk_124; } -MapObject * sub_02062878 (const MapObjectManager * mapObjMan) +MapObject *sub_02062878(const MapObjectManager *mapObjMan) { return mapObjMan->unk_124; } -void sub_02062880 (const MapObject ** mapObj) +void sub_02062880(const MapObject **mapObj) { (*mapObj)++; } -void MapObjectMan_SetFieldSystem (MapObjectManager * mapObjMan, FieldSystem * fieldSystem) +void MapObjectMan_SetFieldSystem(MapObjectManager *mapObjMan, FieldSystem *fieldSystem) { mapObjMan->fieldSystem = fieldSystem; } -FieldSystem * MapObjectMan_FieldSystem (const MapObjectManager * mapObjMan) +FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *mapObjMan) { return mapObjMan->fieldSystem; } -void sub_0206289C (MapObjectManager * mapObjMan, NARC * param1) +void sub_0206289C(MapObjectManager *mapObjMan, NARC *param1) { mapObjMan->unk_14 = param1; } -NARC * sub_020628A0 (const MapObjectManager * mapObjMan) +NARC *sub_020628A0(const MapObjectManager *mapObjMan) { GF_ASSERT(mapObjMan->unk_14 != NULL); return ((MapObjectManager *)mapObjMan)->unk_14; } -void sub_020628B4 (MapObject * mapObj, u32 param1) +void sub_020628B4(MapObject *mapObj, u32 param1) { mapObj->unk_00 = param1; } -u32 sub_020628B8 (const MapObject * mapObj) +u32 sub_020628B8(const MapObject *mapObj) { return mapObj->unk_00; } -void MapObject_SetStatusFlagOn (MapObject * mapObj, u32 param1) +void MapObject_SetStatusFlagOn(MapObject *mapObj, u32 param1) { mapObj->unk_00 |= param1; } -void MapObject_SetStatusFlagOff (MapObject * mapObj, u32 param1) +void MapObject_SetStatusFlagOff(MapObject *mapObj, u32 param1) { mapObj->unk_00 &= ~param1; } -u32 MapObject_CheckStatus (const MapObject * mapObj, u32 param1) +u32 MapObject_CheckStatus(const MapObject *mapObj, u32 param1) { return mapObj->unk_00 & param1; } -u32 MapObject_GetStateFlag (const MapObject * mapObj, u32 param1) +u32 MapObject_GetStateFlag(const MapObject *mapObj, u32 param1) { - if ((mapObj->unk_00 & param1)) { + if (mapObj->unk_00 & param1) { return 1; } return 0; } -void sub_020628E8 (MapObject * mapObj, u32 param1) +void sub_020628E8(MapObject *mapObj, u32 param1) { mapObj->unk_04 = param1; } -u32 sub_020628EC (const MapObject * mapObj) +u32 sub_020628EC(const MapObject *mapObj) { return mapObj->unk_04; } -void sub_020628F0 (MapObject * mapObj, u32 param1) +void sub_020628F0(MapObject *mapObj, u32 param1) { mapObj->unk_04 |= param1; } -void sub_020628F8 (MapObject * mapObj, u32 param1) +void sub_020628F8(MapObject *mapObj, u32 param1) { mapObj->unk_04 &= ~param1; } -u32 sub_02062904 (const MapObject * mapObj, u32 param1) +u32 sub_02062904(const MapObject *mapObj, u32 param1) { - return(mapObj->unk_04 & param1); + return mapObj->unk_04 & param1; } -void MapObject_SetId (MapObject * mapObj, u32 param1) +void MapObject_SetId(MapObject *mapObj, u32 param1) { mapObj->unk_08 = param1; } -u32 MapObject_Id (const MapObject * mapObj) +u32 MapObject_Id(const MapObject *mapObj) { return mapObj->unk_08; } -void sub_02062914 (MapObject * mapObj, int param1) +void sub_02062914(MapObject *mapObj, int param1) { mapObj->unk_0C = param1; } -int sub_02062918 (const MapObject * mapObj) +int sub_02062918(const MapObject *mapObj) { return mapObj->unk_0C; } -void sub_0206291C (MapObject * mapObj, u32 param1) +void sub_0206291C(MapObject *mapObj, u32 param1) { mapObj->unk_10 = param1; } -u32 sub_02062920 (const MapObject * mapObj) +u32 sub_02062920(const MapObject *mapObj) { return mapObj->unk_10; } -u32 sub_02062924 (const MapObject * mapObj) +u32 sub_02062924(const MapObject *mapObj) { u32 v0 = sub_02062920(mapObj); @@ -1290,63 +1292,63 @@ u32 sub_02062924 (const MapObject * mapObj) return v0; } -void sub_02062944 (MapObject * mapObj, u32 param1) +void sub_02062944(MapObject *mapObj, u32 param1) { mapObj->unk_14 = param1; } -u32 MapObject_GetMoveCode (const MapObject * mapObj) +u32 MapObject_GetMoveCode(const MapObject *mapObj) { return mapObj->unk_14; } -void sub_0206294C (MapObject * mapObj, u32 param1) +void sub_0206294C(MapObject *mapObj, u32 param1) { mapObj->eventType = param1; } -u32 MapObject_GetEventType(const MapObject * mapObj) +u32 MapObject_GetEventType(const MapObject *mapObj) { return mapObj->eventType; } -void sub_02062954 (MapObject * mapObj, u32 param1) +void sub_02062954(MapObject *mapObj, u32 param1) { mapObj->unk_1C = param1; } -u32 sub_02062958 (const MapObject * mapObj) +u32 sub_02062958(const MapObject *mapObj) { return mapObj->unk_1C; } -void sub_0206295C (MapObject * mapObj, u32 param1) +void sub_0206295C(MapObject *mapObj, u32 param1) { mapObj->unk_20 = param1; } -u32 MapObject_GetEventID (const MapObject * mapObj) +u32 MapObject_GetEventID(const MapObject *mapObj) { return mapObj->unk_20; } -void sub_02062964 (MapObject * mapObj, int param1) +void sub_02062964(MapObject *mapObj, int param1) { mapObj->unk_24 = param1; } -u32 sub_02062968 (const MapObject * mapObj) +u32 sub_02062968(const MapObject *mapObj) { return mapObj->unk_24; } -void sub_0206296C (MapObject * mapObj, int param1) +void sub_0206296C(MapObject *mapObj, int param1) { mapObj->unk_30 = mapObj->unk_28; mapObj->unk_28 = param1; } -void MapObject_SetDir (MapObject * mapObj, int param1) +void MapObject_SetDir(MapObject *mapObj, int param1) { if (MapObject_CheckStatus(mapObj, (1 << 7)) == 0) { mapObj->unk_30 = mapObj->unk_28; @@ -1354,34 +1356,34 @@ void MapObject_SetDir (MapObject * mapObj, int param1) } } -int MapObject_Dir (const MapObject * mapObj) +int MapObject_Dir(const MapObject *mapObj) { return mapObj->unk_28; } -int sub_02062990 (const MapObject * mapObj) +int sub_02062990(const MapObject *mapObj) { return mapObj->unk_30; } -void sub_02062994 (MapObject * mapObj, int param1) +void sub_02062994(MapObject *mapObj, int param1) { mapObj->unk_34 = mapObj->unk_2C; mapObj->unk_2C = param1; } -int MapObject_GetMoveDir (const MapObject * mapObj) +int MapObject_GetMoveDir(const MapObject *mapObj) { return mapObj->unk_2C; } -void sub_020629A0 (MapObject * mapObj, int param1) +void sub_020629A0(MapObject *mapObj, int param1) { MapObject_SetDir(mapObj, param1); sub_02062994(mapObj, param1); } -void sub_020629B4 (MapObject * mapObj, int param1, int param2) +void sub_020629B4(MapObject *mapObj, int param1, int param2) { switch (param2) { case 0: @@ -1398,7 +1400,7 @@ void sub_020629B4 (MapObject * mapObj, int param1, int param2) } } -int sub_020629D8 (const MapObject * mapObj, int param1) +int sub_020629D8(const MapObject *mapObj, int param1) { switch (param1) { case 0: @@ -1413,69 +1415,69 @@ int sub_020629D8 (const MapObject * mapObj, int param1) return 0; } -void sub_020629FC (MapObject * mapObj, int param1) +void sub_020629FC(MapObject *mapObj, int param1) { mapObj->unk_44 = param1; } -int MapObject_MaxXOffset (const MapObject * mapObj) +int MapObject_MaxXOffset(const MapObject *mapObj) { return mapObj->unk_44; } -void sub_02062A04 (MapObject * mapObj, int param1) +void sub_02062A04(MapObject *mapObj, int param1) { mapObj->unk_48 = param1; } -int MapObject_MaxZOffset (const MapObject * mapObj) +int MapObject_MaxZOffset(const MapObject *mapObj) { return mapObj->unk_48; } -void sub_02062A0C (MapObject * mapObj, u32 param1) +void sub_02062A0C(MapObject *mapObj, u32 param1) { mapObj->unk_A0 = param1; } -u32 sub_02062A14 (const MapObject * mapObj) +u32 sub_02062A14(const MapObject *mapObj) { return mapObj->unk_A0; } -void sub_02062A1C (MapObject * mapObj, SysTask * param1) +void sub_02062A1C(MapObject *mapObj, SysTask *param1) { mapObj->unk_B0 = param1; } -SysTask * sub_02062A24 (const MapObject * mapObj) +SysTask *sub_02062A24(const MapObject *mapObj) { return mapObj->unk_B0; } -void sub_02062A2C (const MapObject * mapObj) +void sub_02062A2C(const MapObject *mapObj) { SysTask_Done(sub_02062A24(mapObj)); } -void MapObject_SetMapObjectManager (MapObject * mapObj, const MapObjectManager * mapObjMan) +void MapObject_SetMapObjectManager(MapObject *mapObj, const MapObjectManager *mapObjMan) { mapObj->mapObjMan = mapObjMan; } -const MapObjectManager * MapObject_MapObjectManager (const MapObject * mapObj) +const MapObjectManager *MapObject_MapObjectManager(const MapObject *mapObj) { return mapObj->mapObjMan; } -static MapObjectManager * sub_02062A48 (const MapObject * mapObj) +static MapObjectManager *sub_02062A48(const MapObject *mapObj) { return MapObjectMan_Deconst(mapObj->mapObjMan); } -void * sub_02062A54 (MapObject * mapObj, int param1) +void *sub_02062A54(MapObject *mapObj, int param1) { - void * v0; + void *v0; GF_ASSERT(param1 <= 16); @@ -1485,14 +1487,14 @@ void * sub_02062A54 (MapObject * mapObj, int param1) return v0; } -void * sub_02062A78 (MapObject * mapObj) +void *sub_02062A78(MapObject *mapObj) { return mapObj->unk_D8; } -void * sub_02062A7C (MapObject * mapObj, int param1) +void *sub_02062A7C(MapObject *mapObj, int param1) { - u8 * v0; + u8 *v0; GF_ASSERT(param1 <= 16); @@ -1502,14 +1504,14 @@ void * sub_02062A7C (MapObject * mapObj, int param1) return v0; } -void * sub_02062AA0 (MapObject * mapObj) +void *sub_02062AA0(MapObject *mapObj) { return mapObj->unk_E8; } -void * sub_02062AA4 (MapObject * mapObj, int param1) +void *sub_02062AA4(MapObject *mapObj, int param1) { - u8 * v0; + u8 *v0; GF_ASSERT(param1 <= 16); @@ -1519,14 +1521,14 @@ void * sub_02062AA4 (MapObject * mapObj, int param1) return v0; } -void * sub_02062AC8 (MapObject * mapObj) +void *sub_02062AC8(MapObject *mapObj) { return mapObj->unk_F8; } -void * sub_02062ACC (MapObject * mapObj, int param1) +void *sub_02062ACC(MapObject *mapObj, int param1) { - u8 * v0; + u8 *v0; GF_ASSERT(param1 <= 32); @@ -1536,175 +1538,175 @@ void * sub_02062ACC (MapObject * mapObj, int param1) return v0; } -void * sub_02062AF0 (MapObject * mapObj) +void *sub_02062AF0(MapObject *mapObj) { return mapObj->unk_108; } -void sub_02062AF8 (MapObject * mapObj, UnkFuncPtr_020EDF0C param1) +void sub_02062AF8(MapObject *mapObj, UnkFuncPtr_020EDF0C param1) { mapObj->unk_B8 = param1; } -void sub_02062B00 (MapObject * mapObj) +void sub_02062B00(MapObject *mapObj) { mapObj->unk_B8(mapObj); } -void sub_02062B0C (MapObject * mapObj, UnkFuncPtr_020EDF0C_1 param1) +void sub_02062B0C(MapObject *mapObj, UnkFuncPtr_020EDF0C_1 param1) { mapObj->unk_BC = param1; } -void sub_02062B14 (MapObject * mapObj) +void sub_02062B14(MapObject *mapObj) { mapObj->unk_BC(mapObj); } -void sub_02062B20 (MapObject * mapObj, UnkFuncPtr_020EDF0C_2 param1) +void sub_02062B20(MapObject *mapObj, UnkFuncPtr_020EDF0C_2 param1) { mapObj->unk_C0 = param1; } -void sub_02062B28 (MapObject * mapObj) +void sub_02062B28(MapObject *mapObj) { mapObj->unk_C0(mapObj); } -void sub_02062B34 (MapObject * mapObj) +void sub_02062B34(MapObject *mapObj) { - const UnkStruct_020EDF0C * v0 = sub_0206320C(MapObject_GetMoveCode(mapObj)); + const UnkStruct_020EDF0C *v0 = sub_0206320C(MapObject_GetMoveCode(mapObj)); v0->unk_10(mapObj); } -void sub_02062B4C (MapObject * mapObj, UnkFuncPtr_ov5_021FB0F0 param1) +void sub_02062B4C(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0 param1) { mapObj->unk_C4 = param1; } -void sub_02062B54 (MapObject * mapObj) +void sub_02062B54(MapObject *mapObj) { mapObj->unk_C4(mapObj); } -void sub_02062B60 (MapObject * mapObj, UnkFuncPtr_ov5_021FB0F0_1 param1) +void sub_02062B60(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_1 param1) { mapObj->unk_C8 = param1; } -void sub_02062B68 (MapObject * mapObj) +void sub_02062B68(MapObject *mapObj) { mapObj->unk_C8(mapObj); } -void sub_02062B74 (MapObject * mapObj, UnkFuncPtr_ov5_021FB0F0_2 param1) +void sub_02062B74(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_2 param1) { mapObj->unk_CC = param1; } -void sub_02062B7C (MapObject * mapObj) +void sub_02062B7C(MapObject *mapObj) { mapObj->unk_CC(mapObj); } -void sub_02062B88 (MapObject * mapObj, UnkFuncPtr_ov5_021FB0F0_3 param1) +void sub_02062B88(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_3 param1) { mapObj->unk_D0 = param1; } -void sub_02062B90 (MapObject * mapObj) +void sub_02062B90(MapObject *mapObj) { mapObj->unk_D0(mapObj); } -void sub_02062B9C (MapObject * mapObj, UnkFuncPtr_ov5_021FB0F0_4 param1) +void sub_02062B9C(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_4 param1) { mapObj->unk_D4 = param1; } -void sub_02062BA4 (MapObject * mapObj) +void sub_02062BA4(MapObject *mapObj) { mapObj->unk_D4(mapObj); } -void MapObject_SetAnimationCode (MapObject * mapObj, int param1) +void MapObject_SetAnimationCode(MapObject *mapObj, int param1) { mapObj->animationCode = param1; } -int MapObject_AnimationCode (const MapObject * mapObj) +int MapObject_AnimationCode(const MapObject *mapObj) { return mapObj->animationCode; } -void sub_02062BC0 (MapObject * mapObj, int param1) +void sub_02062BC0(MapObject *mapObj, int param1) { mapObj->unk_A8 = param1; } -void sub_02062BC8 (MapObject * mapObj) +void sub_02062BC8(MapObject *mapObj) { mapObj->unk_A8++; } -int sub_02062BD8 (const MapObject * mapObj) +int sub_02062BD8(const MapObject *mapObj) { return mapObj->unk_A8; } -void sub_02062BE0 (MapObject * mapObj, u32 param1) +void sub_02062BE0(MapObject *mapObj, u32 param1) { mapObj->unk_AC = param1; } -u32 sub_02062BE8 (const MapObject * mapObj) +u32 sub_02062BE8(const MapObject *mapObj) { return mapObj->unk_AC; } -void sub_02062BF0 (MapObject * mapObj, u32 param1) +void sub_02062BF0(MapObject *mapObj, u32 param1) { mapObj->unk_AE = param1; } -u32 sub_02062BF8 (const MapObject * mapObj) +u32 sub_02062BF8(const MapObject *mapObj) { return mapObj->unk_AE; } -FieldSystem * MapObject_FieldSystem (const MapObject * mapObj) +FieldSystem *MapObject_FieldSystem(const MapObject *mapObj) { - MapObjectManager * v0; + MapObjectManager *v0; v0 = sub_02062A48(mapObj); return MapObjectMan_FieldSystem(v0); } -int sub_02062C0C (const MapObject * mapObj) +int sub_02062C0C(const MapObject *mapObj) { return sub_02062858(MapObject_MapObjectManager(mapObj)); } -int sub_02062C18 (const MapObject * mapObj) +int sub_02062C18(const MapObject *mapObj) { GF_ASSERT(sub_02062E94(mapObj) == 1); return sub_02062958(mapObj); } -void MapObjectMan_StopAllMovement (MapObjectManager * mapObjMan) +void MapObjectMan_StopAllMovement(MapObjectManager *mapObjMan) { sub_02062838(mapObjMan, (1 << 1) | (1 << 2)); } -void sub_02062C3C (MapObjectManager * mapObjMan) +void sub_02062C3C(MapObjectManager *mapObjMan) { sub_02062840(mapObjMan, (1 << 1) | (1 << 2)); } -void MapObjectMan_PauseAllMovement (MapObjectManager * mapObjMan) +void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan) { int v0 = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject * v1 = sub_02062878(mapObjMan); + MapObject *v1 = sub_02062878(mapObjMan); do { if (sub_02062CF8(v1)) { @@ -1716,10 +1718,10 @@ void MapObjectMan_PauseAllMovement (MapObjectManager * mapObjMan) } while (v0); } -void MapObjectMan_UnpauseAllMovement (MapObjectManager * mapObjMan) +void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan) { int v0 = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject * v1 = sub_02062878(mapObjMan); + MapObject *v1 = sub_02062878(mapObjMan); do { if (sub_02062CF8(v1)) { @@ -1731,7 +1733,7 @@ void MapObjectMan_UnpauseAllMovement (MapObjectManager * mapObjMan) } while (v0); } -int MapObjectMan_IsDrawInitialized (const MapObjectManager * mapObjMan) +int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan) { if (sub_0206284C(mapObjMan, (1 << 0))) { return 1; @@ -1740,14 +1742,14 @@ int MapObjectMan_IsDrawInitialized (const MapObjectManager * mapObjMan) return 0; } -u32 sub_02062CBC (const MapObject * mapObj, u32 param1) +u32 sub_02062CBC(const MapObject *mapObj, u32 param1) { - const MapObjectManager * v0 = MapObject_MapObjectManager(mapObj); + const MapObjectManager *v0 = MapObject_MapObjectManager(mapObj); return sub_0206284C(v0, param1); } -void sub_02062CCC (MapObjectManager * mapObjMan, int param1) +void sub_02062CCC(MapObjectManager *mapObjMan, int param1) { if (param1 == 0) { sub_02062838(mapObjMan, (1 << 3)); @@ -1756,7 +1758,7 @@ void sub_02062CCC (MapObjectManager * mapObjMan, int param1) } } -int sub_02062CE4 (const MapObjectManager * mapObjMan) +int sub_02062CE4(const MapObjectManager *mapObjMan) { if (sub_0206284C(mapObjMan, (1 << 3))) { return 0; @@ -1765,17 +1767,17 @@ int sub_02062CE4 (const MapObjectManager * mapObjMan) return 1; } -int sub_02062CF8 (const MapObject * mapObj) +int sub_02062CF8(const MapObject *mapObj) { return MapObject_GetStateFlag(mapObj, (1 << 0)); } -void sub_02062D04 (MapObject * mapObj) +void sub_02062D04(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, (1 << 1)); } -void sub_02062D10 (MapObject * mapObj) +void sub_02062D10(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, (1 << 1)); } @@ -1785,32 +1787,32 @@ int MapObject_IsMoving(const MapObject *mapObj) return MapObject_GetStateFlag(mapObj, (1 << 1)); } -void sub_02062D28 (MapObject * mapObj) +void sub_02062D28(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, (1 << 2)); } -void sub_02062D34 (MapObject * mapObj) +void sub_02062D34(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, (1 << 3)); } -void sub_02062D40 (MapObject * mapObj) +void sub_02062D40(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, (1 << 14)); } -int sub_02062D4C (const MapObject * mapObj) +int sub_02062D4C(const MapObject *mapObj) { return MapObject_GetStateFlag(mapObj, (1 << 14)); } -int sub_02062D58 (const MapObject * mapObj) +int sub_02062D58(const MapObject *mapObj) { return MapObject_GetStateFlag(mapObj, (1 << 9)); } -void MapObject_SetHidden (MapObject * mapObj, int param1) +void MapObject_SetHidden(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE); @@ -1819,7 +1821,7 @@ void MapObject_SetHidden (MapObject * mapObj, int param1) } } -void sub_02062D80 (MapObject * mapObj, int param1) +void sub_02062D80(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOff(mapObj, (1 << 18)); @@ -1828,7 +1830,7 @@ void sub_02062D80 (MapObject * mapObj, int param1) } } -int sub_02062D9C (MapObject * mapObj) +int sub_02062D9C(MapObject *mapObj) { if (MapObject_GetStateFlag(mapObj, (1 << 19)) == 1) { return 0; @@ -1837,7 +1839,7 @@ int sub_02062D9C (MapObject * mapObj) return 1; } -void sub_02062DB4 (MapObject * mapObj, int param1) +void sub_02062DB4(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(mapObj, (1 << 19)); @@ -1846,17 +1848,17 @@ void sub_02062DB4 (MapObject * mapObj, int param1) } } -void sub_02062DD0 (MapObject * mapObj) +void sub_02062DD0(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, (1 << 6)); } -void sub_02062DDC (MapObject * mapObj) +void sub_02062DDC(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, (1 << 6)); } -int MapObject_IsMovementPaused (const MapObject * mapObj) +int MapObject_IsMovementPaused(const MapObject *mapObj) { if (MapObject_GetStateFlag(mapObj, (1 << 6)) == 1) { return 1; @@ -1865,9 +1867,9 @@ int MapObject_IsMovementPaused (const MapObject * mapObj) return 0; } -int sub_02062DFC (const MapObject * mapObj) +int sub_02062DFC(const MapObject *mapObj) { - const MapObjectManager * v0; + const MapObjectManager *v0; v0 = MapObject_MapObjectManager(mapObj); @@ -1882,7 +1884,7 @@ int sub_02062DFC (const MapObject * mapObj) return 1; } -void sub_02062E28 (MapObject * mapObj, int param1) +void sub_02062E28(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(mapObj, (1 << 23)); @@ -1891,7 +1893,7 @@ void sub_02062E28 (MapObject * mapObj, int param1) } } -int sub_02062E44 (const MapObject * mapObj) +int sub_02062E44(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, (1 << 23))) { return 1; @@ -1900,7 +1902,7 @@ int sub_02062E44 (const MapObject * mapObj) return 0; } -void sub_02062E5C (MapObject * mapObj, int param1) +void sub_02062E5C(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(mapObj, (1 << 10)); @@ -1909,7 +1911,7 @@ void sub_02062E5C (MapObject * mapObj, int param1) } } -void sub_02062E78 (MapObject * mapObj, int param1) +void sub_02062E78(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(mapObj, (1 << 25)); @@ -1918,7 +1920,7 @@ void sub_02062E78 (MapObject * mapObj, int param1) } } -int sub_02062E94 (const MapObject * mapObj) +int sub_02062E94(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, (1 << 25))) { return 1; @@ -1927,7 +1929,7 @@ int sub_02062E94 (const MapObject * mapObj) return 0; } -void sub_02062EAC (MapObject * mapObj, int param1) +void sub_02062EAC(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(mapObj, (1 << 26)); @@ -1936,7 +1938,7 @@ void sub_02062EAC (MapObject * mapObj, int param1) } } -int sub_02062EC8 (const MapObject * mapObj) +int sub_02062EC8(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, (1 << 26))) { return 1; @@ -1945,7 +1947,7 @@ int sub_02062EC8 (const MapObject * mapObj) return 0; } -void sub_02062EE0 (MapObject * mapObj, int param1) +void sub_02062EE0(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(mapObj, (1 << 27)); @@ -1954,7 +1956,7 @@ void sub_02062EE0 (MapObject * mapObj, int param1) } } -int sub_02062EFC (const MapObject * mapObj) +int sub_02062EFC(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, (1 << 27))) { return 1; @@ -1963,7 +1965,7 @@ int sub_02062EFC (const MapObject * mapObj) return 0; } -void sub_02062F14 (MapObject * mapObj, int param1) +void sub_02062F14(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(mapObj, (1 << 28)); @@ -1972,7 +1974,7 @@ void sub_02062F14 (MapObject * mapObj, int param1) } } -int sub_02062F30 (const MapObject * mapObj) +int sub_02062F30(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, (1 << 28))) { return 1; @@ -1981,7 +1983,7 @@ int sub_02062F30 (const MapObject * mapObj) return 0; } -void sub_02062F48 (MapObject * mapObj, int param1) +void sub_02062F48(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(mapObj, (1 << 24)); @@ -1990,7 +1992,7 @@ void sub_02062F48 (MapObject * mapObj, int param1) } } -int sub_02062F64 (const MapObject * mapObj) +int sub_02062F64(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, (1 << 24))) { return 1; @@ -1999,7 +2001,7 @@ int sub_02062F64 (const MapObject * mapObj) return 0; } -int sub_02062F7C (const MapObject * mapObj) +int sub_02062F7C(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, (1 << 4))) { return 1; @@ -2008,7 +2010,7 @@ int sub_02062F7C (const MapObject * mapObj) return 0; } -void sub_02062F90 (MapObject * mapObj, int param1) +void sub_02062F90(MapObject *mapObj, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(mapObj, (1 << 29)); @@ -2017,7 +2019,7 @@ void sub_02062F90 (MapObject * mapObj, int param1) } } -int sub_02062FAC (const MapObject * mapObj) +int sub_02062FAC(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, (1 << 29))) { return 1; @@ -2026,7 +2028,7 @@ int sub_02062FAC (const MapObject * mapObj) return 0; } -void sub_02062FC4 (MapObject * mapObj, int param1) +void sub_02062FC4(MapObject *mapObj, int param1) { if (param1 == 1) { sub_020628F0(mapObj, (1 << 2)); @@ -2035,7 +2037,7 @@ void sub_02062FC4 (MapObject * mapObj, int param1) } } -int sub_02062FDC (const MapObject * mapObj) +int sub_02062FDC(const MapObject *mapObj) { if (sub_02062904(mapObj, (1 << 2))) { return 1; @@ -2044,167 +2046,167 @@ int sub_02062FDC (const MapObject * mapObj) return 0; } -int MapObject_XInitial (const MapObject * mapObj) +int MapObject_XInitial(const MapObject *mapObj) { return mapObj->xInit; } -void MapObject_SetXInitial (MapObject * mapObj, int x) +void MapObject_SetXInitial(MapObject *mapObj, int x) { mapObj->xInit = x; } -int MapObject_YInitial (const MapObject * mapObj) +int MapObject_YInitial(const MapObject *mapObj) { return mapObj->yInit; } -void MapObject_SetYInitial (MapObject * mapObj, int y) +void MapObject_SetYInitial(MapObject *mapObj, int y) { mapObj->yInit = y; } -int MapObject_ZInitial (const MapObject * mapObj) +int MapObject_ZInitial(const MapObject *mapObj) { return mapObj->zInit; } -void MapObject_SetZInitial (MapObject * mapObj, int z) +void MapObject_SetZInitial(MapObject *mapObj, int z) { mapObj->zInit = z; } -int MapObject_XPosPrev (const MapObject * mapObj) +int MapObject_XPosPrev(const MapObject *mapObj) { return mapObj->xPrev; } -void MapObject_SetXPosPrev (MapObject * mapObj, int x) +void MapObject_SetXPosPrev(MapObject *mapObj, int x) { mapObj->xPrev = x; } -int MapObject_YPosPrev (const MapObject * mapObj) +int MapObject_YPosPrev(const MapObject *mapObj) { return mapObj->yPrev; } -void MapObject_SetYPosPrev (MapObject * mapObj, int y) +void MapObject_SetYPosPrev(MapObject *mapObj, int y) { mapObj->yPrev = y; } -int MapObject_ZPosPrev (const MapObject * mapObj) +int MapObject_ZPosPrev(const MapObject *mapObj) { return mapObj->zPrev; } -void MapObject_SetZPosPrev (MapObject * mapObj, int z) +void MapObject_SetZPosPrev(MapObject *mapObj, int z) { mapObj->zPrev = z; } -int MapObject_GetXPos (const MapObject * mapObj) +int MapObject_GetXPos(const MapObject *mapObj) { return mapObj->x; } -void MapObject_SetX (MapObject * mapObj, int x) +void MapObject_SetX(MapObject *mapObj, int x) { mapObj->x = x; } -void MapObject_AddX (MapObject * mapObj, int dx) +void MapObject_AddX(MapObject *mapObj, int dx) { mapObj->x += dx; } -int MapObject_GetYPos (const MapObject * mapObj) +int MapObject_GetYPos(const MapObject *mapObj) { return mapObj->y; } -void MapObject_SetY (MapObject * mapObj, int y) +void MapObject_SetY(MapObject *mapObj, int y) { mapObj->y = y; } -void MapObject_AddY (MapObject * mapObj, int dy) +void MapObject_AddY(MapObject *mapObj, int dy) { mapObj->y += dy; } -int MapObject_GetZPos (const MapObject * mapObj) +int MapObject_GetZPos(const MapObject *mapObj) { return mapObj->z; } -void MapObject_SetZ (MapObject * mapObj, int z) +void MapObject_SetZ(MapObject *mapObj, int z) { mapObj->z = z; } -void MapObject_AddZ (MapObject * mapObj, int dz) +void MapObject_AddZ(MapObject *mapObj, int dz) { mapObj->z += dz; } -void MapObject_PosVectorOut (const MapObject * mapObj, VecFx32 * vec) +void MapObject_PosVectorOut(const MapObject *mapObj, VecFx32 *vec) { *vec = mapObj->posVec; } -void MapObject_SetPosVec (MapObject * mapObj, const VecFx32 * vec) +void MapObject_SetPosVec(MapObject *mapObj, const VecFx32 *vec) { mapObj->posVec = *vec; } -const VecFx32 * MapObject_PosVector (const MapObject * mapObj) +const VecFx32 *MapObject_PosVector(const MapObject *mapObj) { return &mapObj->posVec; } -fx32 sub_02063074 (const MapObject * mapObj) +fx32 sub_02063074(const MapObject *mapObj) { return mapObj->posVec.y; } -void sub_02063078 (const MapObject * mapObj, VecFx32 * vec) +void sub_02063078(const MapObject *mapObj, VecFx32 *vec) { *vec = mapObj->unk_7C; } -void sub_02063088 (MapObject * mapObj, const VecFx32 * vec) +void sub_02063088(MapObject *mapObj, const VecFx32 *vec) { mapObj->unk_7C = *vec; } -VecFx32 * sub_02063098 (MapObject * mapObj) +VecFx32 *sub_02063098(MapObject *mapObj) { return &mapObj->unk_7C; } -void sub_0206309C (const MapObject * mapObj, VecFx32 * vec) +void sub_0206309C(const MapObject *mapObj, VecFx32 *vec) { *vec = mapObj->unk_88; } -void sub_020630AC (MapObject * mapObj, const VecFx32 * vec) +void sub_020630AC(MapObject *mapObj, const VecFx32 *vec) { mapObj->unk_88 = *vec; } -void sub_020630BC (const MapObject * mapObj, VecFx32 * vec) +void sub_020630BC(const MapObject *mapObj, VecFx32 *vec) { *vec = mapObj->unk_94; } -void sub_020630CC (MapObject * mapObj, const VecFx32 * vec) +void sub_020630CC(MapObject *mapObj, const VecFx32 *vec) { mapObj->unk_94 = *vec; } -int sub_020630DC (const MapObject * mapObj) +int sub_020630DC(const MapObject *mapObj) { fx32 v0 = sub_02063074(mapObj); int v1 = (((v0) >> 3) / FX32_ONE); @@ -2212,77 +2214,77 @@ int sub_020630DC (const MapObject * mapObj) return v1; } -void sub_020630F0 (ObjectEvent * objectEvent, int param1) +void sub_020630F0(ObjectEvent *objectEvent, int param1) { objectEvent->localID = param1; } -int sub_020630F4 (const ObjectEvent * objectEvent) +int sub_020630F4(const ObjectEvent *objectEvent) { return objectEvent->localID; } -void sub_020630F8 (ObjectEvent * objectEvent, int param1) +void sub_020630F8(ObjectEvent *objectEvent, int param1) { objectEvent->graphicsID = param1; } -int sub_020630FC (const ObjectEvent * objectEvent) +int sub_020630FC(const ObjectEvent *objectEvent) { return objectEvent->graphicsID; } -void sub_02063100 (ObjectEvent * objectEvent, int param1) +void sub_02063100(ObjectEvent *objectEvent, int param1) { objectEvent->movementType = param1; } -int sub_02063104 (const ObjectEvent * objectEvent) +int sub_02063104(const ObjectEvent *objectEvent) { return objectEvent->movementType; } -void sub_02063108 (ObjectEvent * objectEvent, int param1) +void sub_02063108(ObjectEvent *objectEvent, int param1) { objectEvent->trainerType = param1; } -int sub_0206310C (const ObjectEvent * objectEvent) +int sub_0206310C(const ObjectEvent *objectEvent) { return objectEvent->trainerType; } -void sub_02063110 (ObjectEvent * objectEvent, int param1) +void sub_02063110(ObjectEvent *objectEvent, int param1) { objectEvent->flag = param1; } -int sub_02063114 (const ObjectEvent * objectEvent) +int sub_02063114(const ObjectEvent *objectEvent) { return objectEvent->flag; } -void sub_02063118 (ObjectEvent * objectEvent, int param1) +void sub_02063118(ObjectEvent *objectEvent, int param1) { objectEvent->script = param1; } -int sub_0206311C (const ObjectEvent * objectEvent) +int sub_0206311C(const ObjectEvent *objectEvent) { return objectEvent->script; } -void sub_02063120 (ObjectEvent * objectEvent, int param1) +void sub_02063120(ObjectEvent *objectEvent, int param1) { objectEvent->dir = param1; } -int sub_02063124 (const ObjectEvent * objectEvent) +int sub_02063124(const ObjectEvent *objectEvent) { return objectEvent->dir; } -void sub_0206312C (ObjectEvent * objectEvent, int param1, int param2) +void sub_0206312C(ObjectEvent *objectEvent, int param1, int param2) { switch (param2) { case 0: @@ -2294,11 +2296,12 @@ void sub_0206312C (ObjectEvent * objectEvent, int param1, int param2) case 2: objectEvent->data[2] = param1; break; - default: GF_ASSERT(FALSE); + default: + GF_ASSERT(FALSE); } } -int sub_02063150 (const ObjectEvent * objectEvent, int param1) +int sub_02063150(const ObjectEvent *objectEvent, int param1) { switch (param1) { case 0: @@ -2313,57 +2316,57 @@ int sub_02063150 (const ObjectEvent * objectEvent, int param1) return 0; } -void sub_02063174 (ObjectEvent * objectEvent, int param1) +void sub_02063174(ObjectEvent *objectEvent, int param1) { objectEvent->movementRangeX = param1; } -int sub_02063178 (const ObjectEvent * objectEvent) +int sub_02063178(const ObjectEvent *objectEvent) { return objectEvent->movementRangeX; } -void sub_02063180 (ObjectEvent * objectEvent, int param1) +void sub_02063180(ObjectEvent *objectEvent, int param1) { objectEvent->movementRangeZ = param1; } -int sub_02063184 (const ObjectEvent * objectEvent) +int sub_02063184(const ObjectEvent *objectEvent) { return objectEvent->movementRangeZ; } -void ObjectEvent_SetXPos (ObjectEvent * objectEvent, int param1) +void ObjectEvent_SetXPos(ObjectEvent *objectEvent, int param1) { objectEvent->x = param1; } -int sub_02063190 (const ObjectEvent * objectEvent) +int sub_02063190(const ObjectEvent *objectEvent) { return objectEvent->x; } -void sub_02063194 (ObjectEvent * objectEvent, int param1) +void sub_02063194(ObjectEvent *objectEvent, int param1) { objectEvent->y = param1; } -int sub_02063198 (const ObjectEvent * objectEvent) +int sub_02063198(const ObjectEvent *objectEvent) { return objectEvent->y; } -void ObjectEvent_SetZPos (ObjectEvent * objectEvent, int param1) +void ObjectEvent_SetZPos(ObjectEvent *objectEvent, int param1) { objectEvent->z = param1; } -int sub_020631A0 (const ObjectEvent * objectEvent) +int sub_020631A0(const ObjectEvent *objectEvent) { return objectEvent->z; } -static const ObjectEvent * sub_020631A4 (int param0, int param1, const ObjectEvent * param2) +static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *param2) { int v0 = 0; @@ -2380,7 +2383,7 @@ static const ObjectEvent * sub_020631A4 (int param0, int param1, const ObjectEve return NULL; } -static int sub_020631D8 (const ObjectEvent * objectEvent) +static int sub_020631D8(const ObjectEvent *objectEvent) { u16 v0 = (u16)sub_0206311C(objectEvent); @@ -2391,61 +2394,61 @@ static int sub_020631D8 (const ObjectEvent * objectEvent) return 0; } -static int sub_020631F4 (const ObjectEvent * objectEvent) +static int sub_020631F4(const ObjectEvent *objectEvent) { GF_ASSERT(sub_020631D8(objectEvent) == 1); return sub_02063114(objectEvent); } -static const UnkStruct_020EDF0C * sub_0206320C (u32 param0) +static const UnkStruct_020EDF0C *sub_0206320C(u32 param0) { GF_ASSERT(param0 < 0x44); return Unk_020EE3A8[param0]; } -static UnkFuncPtr_020EDF0C sub_02063224 (const UnkStruct_020EDF0C * param0) +static UnkFuncPtr_020EDF0C sub_02063224(const UnkStruct_020EDF0C *param0) { return param0->unk_04; } -static UnkFuncPtr_020EDF0C_1 sub_02063228 (const UnkStruct_020EDF0C * param0) +static UnkFuncPtr_020EDF0C_1 sub_02063228(const UnkStruct_020EDF0C *param0) { return param0->unk_08; } -static UnkFuncPtr_020EDF0C_2 sub_0206322C (const UnkStruct_020EDF0C * param0) +static UnkFuncPtr_020EDF0C_2 sub_0206322C(const UnkStruct_020EDF0C *param0) { return param0->unk_0C; } -static UnkFuncPtr_ov5_021FB0F0 sub_02063230 (const UnkStruct_ov5_021FB0F0 * param0) +static UnkFuncPtr_ov5_021FB0F0 sub_02063230(const UnkStruct_ov5_021FB0F0 *param0) { return param0->unk_00; } -static UnkFuncPtr_ov5_021FB0F0_1 sub_02063234 (const UnkStruct_ov5_021FB0F0 * param0) +static UnkFuncPtr_ov5_021FB0F0_1 sub_02063234(const UnkStruct_ov5_021FB0F0 *param0) { return param0->unk_04; } -static UnkFuncPtr_ov5_021FB0F0_2 sub_02063238 (const UnkStruct_ov5_021FB0F0 * param0) +static UnkFuncPtr_ov5_021FB0F0_2 sub_02063238(const UnkStruct_ov5_021FB0F0 *param0) { return param0->unk_08; } -static UnkFuncPtr_ov5_021FB0F0_3 sub_0206323C (const UnkStruct_ov5_021FB0F0 * param0) +static UnkFuncPtr_ov5_021FB0F0_3 sub_0206323C(const UnkStruct_ov5_021FB0F0 *param0) { return param0->unk_0C; } -static UnkFuncPtr_ov5_021FB0F0_4 sub_02063240 (const UnkStruct_ov5_021FB0F0 * param0) +static UnkFuncPtr_ov5_021FB0F0_4 sub_02063240(const UnkStruct_ov5_021FB0F0 *param0) { return param0->unk_10; } -static const UnkStruct_ov5_021FB0F0 * sub_02063244 (u32 param0) +static const UnkStruct_ov5_021FB0F0 *sub_02063244(u32 param0) { - const UnkStruct_ov5_021FB97C * v0 = Unk_ov5_021FB97C; + const UnkStruct_ov5_021FB97C *v0 = Unk_ov5_021FB97C; do { if (v0->unk_00 == param0) { @@ -2459,10 +2462,10 @@ static const UnkStruct_ov5_021FB0F0 * sub_02063244 (u32 param0) return NULL; } -MapObject * sub_0206326C (const MapObjectManager * param0, int param1, int param2, int param3) +MapObject *sub_0206326C(const MapObjectManager *param0, int param1, int param2, int param3) { int v0; - MapObject * v1; + MapObject *v1; v0 = MapObjectMan_GetMaxObjects(param0); v1 = sub_02062878(param0); @@ -2487,7 +2490,7 @@ MapObject * sub_0206326C (const MapObjectManager * param0, int param1, int param return NULL; } -void sub_020632D4 (MapObject * mapObj, const VecFx32 * param1, int param2) +void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) { int v0, v1, v2; @@ -2510,17 +2513,17 @@ void sub_020632D4 (MapObject * mapObj, const VecFx32 * param1, int param2) MapObject_SetStatusFlagOff(mapObj, (1 << 1) | (1 << 3)); } -void MapObject_SetPosDir (MapObject * mapObj, int param1, int param2, int param3, int param4) +void MapObject_SetPosDir(MapObject *mapObj, int param1, int param2, int param3, int param4) { VecFx32 v0; - v0.x = (((param1) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)); + v0.x = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetX(mapObj, param1); v0.y = (((param2) << 3) * FX32_ONE) + 0; MapObject_SetY(mapObj, param2); - v0.z = (((param3) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)); + v0.z = (((param3) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetZ(mapObj, param3); MapObject_SetPosVec(mapObj, &v0); @@ -2534,7 +2537,7 @@ void MapObject_SetPosDir (MapObject * mapObj, int param1, int param2, int param3 sub_020656DC(mapObj); } -void MapObject_SetMoveCode (MapObject * mapObj, u32 param1) +void MapObject_SetMoveCode(MapObject *mapObj, u32 param1) { sub_02062B28(mapObj); sub_02062944(mapObj, param1); @@ -2542,7 +2545,7 @@ void MapObject_SetMoveCode (MapObject * mapObj, u32 param1) MapObject_InitMove(mapObj); } -void sub_020633C8 (MapObject * mapObj, int param1) +void sub_020633C8(MapObject *mapObj, int param1) { MapObject_SetId(mapObj, param1); @@ -2550,42 +2553,42 @@ void sub_020633C8 (MapObject * mapObj, int param1) sub_02062618(mapObj); } -void sub_020633E0 (MapObject * mapObj) +void sub_020633E0(MapObject *mapObj) { return; } -void sub_020633E4 (MapObject * mapObj) +void sub_020633E4(MapObject *mapObj) { return; } -void sub_020633E8 (MapObject * mapObj) +void sub_020633E8(MapObject *mapObj) { return; } -void sub_020633EC (MapObject * mapObj) +void sub_020633EC(MapObject *mapObj) { return; } -void sub_020633F0 (MapObject * mapObj) +void sub_020633F0(MapObject *mapObj) { return; } -void sub_020633F4 (MapObject * mapObj) +void sub_020633F4(MapObject *mapObj) { return; } -void sub_020633F8 (MapObject * mapObj) +void sub_020633F8(MapObject *mapObj) { return; } -void sub_020633FC (MapObject * mapObj) +void sub_020633FC(MapObject *mapObj) { return; } diff --git a/src/map_object_move.c b/src/map_object_move.c index 832e9749db..29c4d4a64e 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -1,3 +1,5 @@ +#include "map_object_move.h" + #include #include @@ -5,14 +7,6 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "field/field_system.h" -#include "overlay005/struct_ov5_021ECD10.h" - -#include "unk_02054D00.h" -#include "unk_0205DAC8.h" -#include "map_object.h" -#include "map_object_move.h" -#include "unk_020655F4.h" -#include "unk_020673B8.h" #include "overlay005/ov5_021ECC20.h" #include "overlay005/ov5_021F134C.h" #include "overlay005/ov5_021F17B8.h" @@ -24,51 +18,58 @@ #include "overlay005/ov5_021F348C.h" #include "overlay005/ov5_021F37A8.h" #include "overlay005/ov5_021F3A50.h" +#include "overlay005/struct_ov5_021ECD10.h" + +#include "map_object.h" +#include "unk_02054D00.h" +#include "unk_0205DAC8.h" +#include "unk_020655F4.h" +#include "unk_020673B8.h" -static int sub_02063478(const MapObject * mapObj); -static void sub_020634DC(MapObject * mapObj); -static void sub_020634F4(MapObject * mapObj); -static void sub_02063518(MapObject * mapObj); -static void sub_0206353C(MapObject * mapObj); -static void MapObject_EndMove(MapObject * mapObj); -static void sub_020635AC(MapObject * mapObj); -static void sub_0206363C(MapObject * mapObj); -static void sub_020636F0(MapObject * mapObj); -static void sub_0206375C(MapObject * mapObj); -static void sub_020637D4(MapObject * mapObj); -static void sub_02063864(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063964(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_0206397C(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063994(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063A30(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063A64(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063A70(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063A78(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063B20(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063BB4(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C00(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C18(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C30(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C48(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C60(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063C94(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063CC8(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063CFC(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063D30(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063DA8(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063DDC(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); -static void sub_02063E14(MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3); - -static BOOL(*const Unk_020EE76C[4])(u8); -static BOOL(*const Unk_020EE77C[4])(u8); - -void MapObject_InitMove (MapObject * mapObj) +static int sub_02063478(const MapObject *mapObj); +static void sub_020634DC(MapObject *mapObj); +static void sub_020634F4(MapObject *mapObj); +static void sub_02063518(MapObject *mapObj); +static void sub_0206353C(MapObject *mapObj); +static void MapObject_EndMove(MapObject *mapObj); +static void sub_020635AC(MapObject *mapObj); +static void sub_0206363C(MapObject *mapObj); +static void sub_020636F0(MapObject *mapObj); +static void sub_0206375C(MapObject *mapObj); +static void sub_020637D4(MapObject *mapObj); +static void sub_02063864(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063964(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_0206397C(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063994(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A64(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A70(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A78(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063B20(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063BB4(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C00(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C18(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C48(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C60(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C94(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063CC8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063CFC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063D30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063DA8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063DDC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063E14(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); + +static BOOL (*const Unk_020EE76C[4])(u8); +static BOOL (*const Unk_020EE77C[4])(u8); + +void MapObject_InitMove(MapObject *mapObj) { sub_02062B00(mapObj); sub_020673B8(mapObj); } -void MapObject_Move (MapObject * mapObj) +void MapObject_Move(MapObject *mapObj) { if (sub_02062CBC(mapObj, (1 << 1))) { return; @@ -88,7 +89,7 @@ void MapObject_Move (MapObject * mapObj) MapObject_EndMove(mapObj); } -static BOOL sub_02063478 (const MapObject * mapObj) +static BOOL sub_02063478(const MapObject *mapObj) { if (MapObject_IsMoving(mapObj) == 1) { return TRUE; @@ -113,14 +114,14 @@ static BOOL sub_02063478 (const MapObject * mapObj) return TRUE; } -static void sub_020634DC (MapObject * mapObj) +static void sub_020634DC(MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_12)) { sub_020642F8(mapObj); } } -static void sub_020634F4 (MapObject * mapObj) +static void sub_020634F4(MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_11)) { if (sub_02064390(mapObj) == 1) { @@ -129,7 +130,7 @@ static void sub_020634F4 (MapObject * mapObj) } } -static void sub_02063518 (MapObject * mapObj) +static void sub_02063518(MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_START_MOVEMENT)) { sub_020635AC(mapObj); @@ -138,7 +139,7 @@ static void sub_02063518 (MapObject * mapObj) MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); } -static void sub_0206353C (MapObject * mapObj) +static void sub_0206353C(MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_16)) { sub_020636F0(mapObj); @@ -149,7 +150,7 @@ static void sub_0206353C (MapObject * mapObj) MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); } -static void MapObject_EndMove (MapObject * mapObj) +static void MapObject_EndMove(MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_17)) { sub_020637D4(mapObj); @@ -160,14 +161,14 @@ static void MapObject_EndMove (MapObject * mapObj) MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17); } -static void sub_020635AC (MapObject * mapObj) +static void sub_020635AC(MapObject *mapObj) { sub_02064390(mapObj); if (sub_02062DFC(mapObj) == 1) { u8 v0 = sub_02062BE8(mapObj); u8 v1 = sub_02062BF8(mapObj); - const UnkStruct_ov5_021ECD10 * v2 = ov5_021ECD04(mapObj); + const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); sub_02063DDC(mapObj, v0, v1, v2); sub_02063964(mapObj, v0, v1, v2); @@ -180,14 +181,14 @@ static void sub_020635AC (MapObject * mapObj) } } -static void sub_0206363C (MapObject * mapObj) +static void sub_0206363C(MapObject *mapObj) { sub_02064390(mapObj); if (sub_02062DFC(mapObj) == 1) { u8 v0 = sub_02062BE8(mapObj); u8 v1 = sub_02062BF8(mapObj); - const UnkStruct_ov5_021ECD10 * v2 = ov5_021ECD04(mapObj); + const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); sub_02063DDC(mapObj, v0, v1, v2); sub_0206397C(mapObj, v0, v1, v2); @@ -204,14 +205,14 @@ static void sub_0206363C (MapObject * mapObj) } } -static void sub_020636F0 (MapObject * mapObj) +static void sub_020636F0(MapObject *mapObj) { sub_02064390(mapObj); if (sub_02062DFC(mapObj) == 1) { u8 v0 = sub_02062BE8(mapObj); u8 v1 = sub_02062BF8(mapObj); - const UnkStruct_ov5_021ECD10 * v2 = ov5_021ECD04(mapObj); + const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); sub_02063DDC(mapObj, v0, v1, v2); sub_02063A78(mapObj, v0, v1, v2); @@ -221,14 +222,14 @@ static void sub_020636F0 (MapObject * mapObj) } } -static void sub_0206375C (MapObject * mapObj) +static void sub_0206375C(MapObject *mapObj) { sub_02064390(mapObj); if (sub_02062DFC(mapObj) == 1) { u8 v0 = sub_02062BE8(mapObj); u8 v1 = sub_02062BF8(mapObj); - const UnkStruct_ov5_021ECD10 * v2 = ov5_021ECD04(mapObj); + const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); sub_02063864(mapObj, v0, v1, v2); sub_02063C94(mapObj, v0, v1, v2); @@ -239,14 +240,14 @@ static void sub_0206375C (MapObject * mapObj) } } -static void sub_020637D4 (MapObject * mapObj) +static void sub_020637D4(MapObject *mapObj) { sub_02064390(mapObj); if (sub_02062DFC(mapObj) == 1) { u8 v0 = sub_02062BE8(mapObj); u8 v1 = sub_02062BF8(mapObj); - const UnkStruct_ov5_021ECD10 * v2 = ov5_021ECD04(mapObj); + const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); sub_02063864(mapObj, v0, v1, v2); sub_02063C94(mapObj, v0, v1, v2); @@ -259,64 +260,64 @@ static void sub_020637D4 (MapObject * mapObj) } } -static void sub_02063864 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063864(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_02062EFC(mapObj) == 0) { if ((sub_0205DCF0(param1) == 1) || (sub_0205DD0C(param1) == 1)) { - VecFx32 v0 = {0, ((FX32_ONE * -14)), 0}; + VecFx32 v0 = { 0, (FX32_ONE * -14), 0 }; sub_020630CC(mapObj, &v0); return; } if ((sub_0205DCE0(param1) == 1) || (sub_0205DCFC(param1) == 1)) { - VecFx32 v1 = {0, ((FX32_ONE * -12)), 0}; + VecFx32 v1 = { 0, (FX32_ONE * -12), 0 }; sub_020630CC(mapObj, &v1); return; } if (sub_0205DD5C(param1) == 1) { - VecFx32 v2 = {0, ((FX32_ONE * -16)), 0}; + VecFx32 v2 = { 0, (FX32_ONE * -16), 0 }; sub_020630CC(mapObj, &v2); return; } if (sub_0205DD50(param1) == 1) { - VecFx32 v3 = {0, ((FX32_ONE * -14)), 0}; + VecFx32 v3 = { 0, (FX32_ONE * -14), 0 }; sub_020630CC(mapObj, &v3); return; } if (sub_0205DD44(param1) == 1) { - VecFx32 v4 = {0, ((FX32_ONE * -12)), 0}; + VecFx32 v4 = { 0, (FX32_ONE * -12), 0 }; sub_020630CC(mapObj, &v4); return; } } - VecFx32 v5 = {0, 0, 0}; + VecFx32 v5 = { 0, 0, 0 }; sub_020630CC(mapObj, &v5); } -static void sub_02063964 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063964(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DAC8(param1) == 1) { ov5_021F2EA4(mapObj, 0); } } -static void sub_0206397C (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_0206397C(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DAC8(param1) == 1) { ov5_021F2EA4(mapObj, 1); } } -static void sub_02063994 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063994(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (param3->unk_04_6 == 0) { return; @@ -350,7 +351,7 @@ static void sub_02063994 (MapObject * mapObj, u8 param1, u8 param2, const UnkStr } } -static void sub_02063A30 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063A30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DB78(param1) == 1) { if (sub_02062EC8(mapObj) == 0) { @@ -362,19 +363,19 @@ static void sub_02063A30 (MapObject * mapObj, u8 param1, u8 param2, const UnkStr } } -static void sub_02063A64 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063A64(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { sub_02062EAC(mapObj, 0); } -static void sub_02063A70 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063A70(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { sub_02063A78(mapObj, param1, param2, param3); } -static void sub_02063A78 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063A78(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { - const MapObjectManager * mapObjMan = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); if (sub_02062CE4(mapObjMan) == 0) { return; @@ -394,9 +395,9 @@ static void sub_02063A78 (MapObject * mapObj, u8 param1, u8 param2, const UnkStr } } -static void sub_02063B20 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063B20(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { - const MapObjectManager * mapObjMan = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); if (sub_02062CE4(mapObjMan) == 0) { return; @@ -413,7 +414,7 @@ static void sub_02063B20 (MapObject * mapObj, u8 param1, u8 param2, const UnkStr } } -static void sub_02063BB4 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063BB4(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if ((sub_0206406C(mapObj, param1) == 1) || (sub_0205DB78(param1) == 1) || (sub_0205DC5C(param1) == 1) || (sub_0205DCE0(param1) == 1) || (sub_0205DCFC(param1) == 1) || (MapObject_IsOnSnow(mapObj, param1) == 1)) { return; @@ -422,63 +423,63 @@ static void sub_02063BB4 (MapObject * mapObj, u8 param1, u8 param2, const UnkStr ov5_021F3638(mapObj); } -static void sub_02063C00 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C00(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DAD4(param1) == 1) { ov5_021F3844(mapObj, 0); } } -static void sub_02063C18 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C18(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DAD4(param1) == 1) { ov5_021F3844(mapObj, 1); } } -static void sub_02063C30 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DCFC(param1) == 1) { ov5_021F3AEC(mapObj, 0); } } -static void sub_02063C48 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C48(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DCFC(param1) == 1) { ov5_021F3AEC(mapObj, 1); } } -static void sub_02063C60 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C60(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DE5C(param2) == 1) { ov5_021F2AE4(mapObj, MapObject_XPosPrev(mapObj), MapObject_YPosPrev(mapObj), MapObject_ZPosPrev(mapObj)); } } -static void sub_02063C94 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063C94(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DE5C(param1) == 1) { ov5_021F2AE4(mapObj, MapObject_GetXPos(mapObj), MapObject_GetYPos(mapObj), MapObject_GetZPos(mapObj)); } } -static void sub_02063CC8 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063CC8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DCE0(param2) == 1) { ov5_021F2C38(mapObj, MapObject_XPosPrev(mapObj), MapObject_YPosPrev(mapObj), MapObject_ZPosPrev(mapObj)); } } -static void sub_02063CFC (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063CFC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DCE0(param1) == 1) { ov5_021F2C38(mapObj, MapObject_GetXPos(mapObj), MapObject_GetYPos(mapObj), MapObject_GetZPos(mapObj)); } } -static void sub_02063D30 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063D30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (param3->unk_04_10 == 0) { return; @@ -515,7 +516,7 @@ static void sub_02063D30 (MapObject * mapObj, u8 param1, u8 param2, const UnkStr } } -static void sub_02063DA8 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063DA8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if ((param3->unk_04_10 == 0) || (sub_02062F64(mapObj) == 0)) { return; @@ -528,7 +529,7 @@ static void sub_02063DA8 (MapObject * mapObj, u8 param1, u8 param2, const UnkStr } } -static void sub_02063DDC (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063DDC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { if (sub_0205DEF0(param1) == 1) { sub_02062F14(mapObj, 1); @@ -539,12 +540,12 @@ static void sub_02063DDC (MapObject * mapObj, u8 param1, u8 param2, const UnkStr } } -static void sub_02063E14 (MapObject * mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3) +static void sub_02063E14(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) { return; } -u32 sub_02063E18 (const MapObject * mapObj, const VecFx32 * param1, int param2, int param3, int param4, int param5) +u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int param3, int param4, int param5) { u32 v0; @@ -555,7 +556,7 @@ u32 sub_02063E18 (const MapObject * mapObj, const VecFx32 * param1, int param2, } s8 v1; - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); if (sub_02055024(fieldSystem, param1, param2, param4, &v1) == 1) { v0 |= (1 << 1); @@ -576,7 +577,7 @@ u32 sub_02063E18 (const MapObject * mapObj, const VecFx32 * param1, int param2, return v0; } -u32 sub_02063E94 (const MapObject * mapObj, int param1, int param2, int param3, int param4) +u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, int param4) { VecFx32 v0; @@ -584,7 +585,7 @@ u32 sub_02063E94 (const MapObject * mapObj, int param1, int param2, int param3, return sub_02063E18(mapObj, &v0, param1, param2, param3, param4); } -u32 sub_02063EBC (const MapObject * mapObj, int param1) +u32 sub_02063EBC(const MapObject *mapObj, int param1) { int x, y, z; @@ -595,11 +596,11 @@ u32 sub_02063EBC (const MapObject * mapObj, int param1) return sub_02063E94(mapObj, x, y, z, param1); } -int sub_02063F00 (const MapObject * mapObj, int param1, int param2, int param3) +int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) { int v0, v1, v2; - const MapObjectManager * mapObjMan; - const MapObject * v4; + const MapObjectManager *mapObjMan; + const MapObject *v4; mapObjMan = MapObject_MapObjectManager(mapObj); v4 = sub_02062868(mapObjMan); @@ -651,7 +652,7 @@ int sub_02063F00 (const MapObject * mapObj, int param1, int param2, int param3) return 0; } -int sub_02063FAC (const MapObject * mapObj, int param1, int param2, int param3) +int sub_02063FAC(const MapObject *mapObj, int param1, int param2, int param3) { int v0, v1, v2, v3; @@ -682,10 +683,10 @@ int sub_02063FAC (const MapObject * mapObj, int param1, int param2, int param3) return 0; } -int sub_02064004 (const MapObject * mapObj, int param1, int param2, int param3) +int sub_02064004(const MapObject *mapObj, int param1, int param2, int param3) { if (sub_02062FDC(mapObj) == 0) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); u8 v1 = sub_02062BE8(mapObj); u8 v2 = sub_02054F94(fieldSystem, param1, param2); @@ -701,21 +702,21 @@ int sub_02064004 (const MapObject * mapObj, int param1, int param2, int param3) return 0; } -static BOOL(*const Unk_020EE76C[4])(u8) = { +static BOOL (*const Unk_020EE76C[4])(u8) = { sub_0205DDCC, sub_0205DDF0, sub_0205DE14, sub_0205DE38 }; -static BOOL(*const Unk_020EE77C[4])(u8) = { +static BOOL (*const Unk_020EE77C[4])(u8) = { sub_0205DDF0, sub_0205DDCC, sub_0205DE38, sub_0205DE14 }; -int sub_0206406C (MapObject * mapObj, u32 param1) +int sub_0206406C(MapObject *mapObj, u32 param1) { if (sub_0205DF10(param1)) { if (sub_02062F30(mapObj) == 0) { @@ -728,7 +729,7 @@ int sub_0206406C (MapObject * mapObj, u32 param1) return 0; } -int sub_020640A0 (MapObject * mapObj, u32 param1) +int sub_020640A0(MapObject *mapObj, u32 param1) { if (sub_0205DF34(param1)) { if (sub_02062F30(mapObj) == 0) { @@ -741,7 +742,7 @@ int sub_020640A0 (MapObject * mapObj, u32 param1) return 0; } -int MapObject_IsOnSnow (MapObject * mapObj, u32 param1) +int MapObject_IsOnSnow(MapObject *mapObj, u32 param1) { if (sub_0205DF58(param1)) { if (sub_02062F30(mapObj) == 0) { @@ -754,7 +755,7 @@ int MapObject_IsOnSnow (MapObject * mapObj, u32 param1) return 0; } -int sub_02064108 (MapObject * mapObj, u32 param1) +int sub_02064108(MapObject *mapObj, u32 param1) { if (sub_0205DF58(param1)) { if (sub_02062F30(mapObj) == 0) { @@ -767,7 +768,7 @@ int sub_02064108 (MapObject * mapObj, u32 param1) return 0; } -int sub_0206413C (MapObject * mapObj, u32 param1) +int sub_0206413C(MapObject *mapObj, u32 param1) { if (sub_02062F30(mapObj) == 1) { if (sub_0205DEFC(param1) == 1) { @@ -778,7 +779,7 @@ int sub_0206413C (MapObject * mapObj, u32 param1) return 0; } -int sub_0206415C (MapObject * mapObj, u32 param1) +int sub_0206415C(MapObject *mapObj, u32 param1) { if (sub_02062F30(mapObj) == 1) { if (sub_0205DF64(param1) == 1) { @@ -789,7 +790,7 @@ int sub_0206415C (MapObject * mapObj, u32 param1) return 0; } -int sub_0206417C (MapObject * mapObj, u32 param1) +int sub_0206417C(MapObject *mapObj, u32 param1) { if (sub_02062F30(mapObj) == 1) { if (sub_0205DF78(param1) == 1) { @@ -821,17 +822,17 @@ static const int sMapObjectDyDir[] = { 0x0 }; -int MapObject_GetDxFromDir (int param0) +int MapObject_GetDxFromDir(int param0) { return sMapObjectDxDir[param0]; } -int MapObject_GetDyFromDir (int param0) +int MapObject_GetDyFromDir(int param0) { return sMapObjectDyDir[param0]; } -void sub_020641B4 (MapObject * mapObj, int param1) +void sub_020641B4(MapObject *mapObj, int param1) { MapObject_SetXPosPrev(mapObj, MapObject_GetXPos(mapObj)); MapObject_SetYPosPrev(mapObj, MapObject_GetYPos(mapObj)); @@ -842,24 +843,24 @@ void sub_020641B4 (MapObject * mapObj, int param1) MapObject_AddZ(mapObj, MapObject_GetDyFromDir(param1)); } -void sub_02064208 (MapObject * mapObj) +void sub_02064208(MapObject *mapObj) { MapObject_SetXPosPrev(mapObj, MapObject_GetXPos(mapObj)); MapObject_SetYPosPrev(mapObj, MapObject_GetYPos(mapObj)); MapObject_SetZPosPrev(mapObj, MapObject_GetZPos(mapObj)); } -u32 sub_02064238 (MapObject * mapObj, int param1) +u32 sub_02064238(MapObject *mapObj, int param1) { int v0 = MapObject_GetXPos(mapObj) + MapObject_GetDxFromDir(param1); int v1 = MapObject_GetZPos(mapObj) + MapObject_GetDyFromDir(param1); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); u8 v3 = sub_02054F94(fieldSystem, v0, v1); return v3; } -void MapObject_AddVecToPos (MapObject * mapObj, const VecFx32 * vec) +void MapObject_AddVecToPos(MapObject *mapObj, const VecFx32 *vec) { VecFx32 pos; @@ -872,8 +873,8 @@ void MapObject_AddVecToPos (MapObject * mapObj, const VecFx32 * vec) MapObject_SetPosVec(mapObj, &pos); } -//TODO: This could really use a better name -void MapObject_StepDirection (MapObject * mapObj, int dir, fx32 param2) +// TODO: This could really use a better name +void MapObject_StepDirection(MapObject *mapObj, int dir, fx32 param2) { VecFx32 pos; @@ -897,7 +898,7 @@ void MapObject_StepDirection (MapObject * mapObj, int dir, fx32 param2) MapObject_SetPosVec(mapObj, &pos); } -int sub_020642F8 (MapObject * mapObj) +int sub_020642F8(MapObject *mapObj) { VecFx32 pos, v1; @@ -910,7 +911,7 @@ int sub_020642F8 (MapObject * mapObj) } int v2 = sub_02062FAC(mapObj); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v4 = sub_020644D0(fieldSystem, &v1, v2); if (v4 == 1) { @@ -926,7 +927,7 @@ int sub_020642F8 (MapObject * mapObj) return v4; } -int sub_02064390 (MapObject * mapObj) +int sub_02064390(MapObject *mapObj) { u8 v0 = sub_0205DF98(); u8 v1 = v0; @@ -934,7 +935,7 @@ int sub_02064390 (MapObject * mapObj) if (sub_02062FDC(mapObj) == 0) { int v2 = MapObject_XPosPrev(mapObj); int z = MapObject_ZPosPrev(mapObj); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); v0 = sub_02054F94(fieldSystem, v2, z); v2 = MapObject_GetXPos(mapObj); @@ -954,7 +955,7 @@ int sub_02064390 (MapObject * mapObj) return 1; } -void VecFx32_StepDirection (int dir, VecFx32 * vec, fx32 val) +void VecFx32_StepDirection(int dir, VecFx32 *vec, fx32 val) { switch (dir) { case DIR_NORTH: @@ -972,13 +973,13 @@ void VecFx32_StepDirection (int dir, VecFx32 * vec, fx32 val) } } -void sub_02064450 (int param0, int param1, VecFx32 * param2) +void sub_02064450(int param0, int param1, VecFx32 *param2) { param2->x = (((param0) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); param2->z = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); } -void sub_02064464 (MapObject * mapObj) +void sub_02064464(MapObject *mapObj) { int v0 = MapObject_GetMoveCode(mapObj); @@ -994,12 +995,12 @@ static const int Unk_020EE79C[] = { DIR_WEST }; -int Direction_GetOpposite (int dir) +int Direction_GetOpposite(int dir) { return Unk_020EE79C[dir]; } -int sub_02064488 (int param0, int param1, int param2, int param3) +int sub_02064488(int param0, int param1, int param2, int param3) { if (param0 > param2) { return DIR_WEST; @@ -1016,7 +1017,7 @@ int sub_02064488 (int param0, int param1, int param2, int param3) return DIR_SOUTH; } -int sub_020644A4 (FieldSystem * fieldSystem, VecFx32 * param1) +int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *param1) { fx32 v0; u8 v1; @@ -1031,7 +1032,7 @@ int sub_020644A4 (FieldSystem * fieldSystem, VecFx32 * param1) return 1; } -int sub_020644D0 (FieldSystem * fieldSystem, VecFx32 * param1, int param2) +int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2) { fx32 v0; u8 v1; diff --git a/src/message.c b/src/message.c index c7560aa839..41aacca1e2 100644 --- a/src/message.c +++ b/src/message.c @@ -1,17 +1,18 @@ +#include "message.h" + #include #include -#include "text/pl_msg.naix" - #include "struct_decls/struct_02006C24_decl.h" +#include "text/pl_msg.naix" + #include "heap.h" -#include "message.h" #include "narc.h" #include "strbuf.h" #define KEY_START 596947 -#define KEY_INC 18749 +#define KEY_INC 18749 static void MemCopyEntry(charcode_t *dst, const charcode_t *src, const MessageBankEntry *entry); @@ -40,12 +41,12 @@ static inline void DecodeString(charcode_t *str, u32 len, u32 entryID, u16 seed) } } -static inline u8* EntryOffsetAddress(const MessageBank *bank, u32 bankIndex) +static inline u8 *EntryOffsetAddress(const MessageBank *bank, u32 bankIndex) { return (u8 *)bank + bankIndex; } -MessageBank* MessageBank_Load(u32 narcID, u32 bankID, u32 heapID) +MessageBank *MessageBank_Load(u32 narcID, u32 bankID, u32 heapID) { return NARC_AllocAndReadWholeMemberByIndexPair(narcID, bankID, heapID); } @@ -121,7 +122,7 @@ void MessageBank_GetStrbuf(const MessageBank *bank, u32 entryID, Strbuf *strbuf) Strbuf_Clear(strbuf); } -Strbuf* MessageBank_GetNewStrbuf(const MessageBank *bank, u32 entryID, u32 heapID) +Strbuf *MessageBank_GetNewStrbuf(const MessageBank *bank, u32 entryID, u32 heapID) { if (entryID < bank->count) { MessageBankEntry entry = bank->entries[entryID]; @@ -187,7 +188,7 @@ void MessageBank_GetStrbufFromHandle(NARC *narc, u32 bankID, u32 entryID, u32 he Strbuf_Clear(strbuf); } -Strbuf* MessageBank_GetNewStrbufFromNARC (u32 narcID, u32 bankID, u32 entryID, u32 heapID) +Strbuf *MessageBank_GetNewStrbufFromNARC(u32 narcID, u32 bankID, u32 entryID, u32 heapID) { NARC *narc = NARC_ctor(narcID, heapID); @@ -202,7 +203,7 @@ Strbuf* MessageBank_GetNewStrbufFromNARC (u32 narcID, u32 bankID, u32 entryID, u return strbuf; } -Strbuf* MessageBank_GetNewStrbufFromHandle(NARC *narc, u32 bankID, u32 entryID, u32 heapID) +Strbuf *MessageBank_GetNewStrbufFromHandle(NARC *narc, u32 bankID, u32 entryID, u32 heapID) { MessageBank bank; NARC_ReadFromMember(narc, bankID, 0, sizeof(MessageBank), &bank); @@ -247,7 +248,7 @@ u32 MessageBank_NARCEntryCount(u32 narcID, u32 bankID) return bank.count; } -MessageLoader* MessageLoader_Init(enum MessageLoaderType type, u32 narcID, u32 bankID, u32 heapID) +MessageLoader *MessageLoader_Init(enum MessageLoaderType type, u32 narcID, u32 bankID, u32 heapID) { MessageLoader *loader = Heap_AllocFromHeapAtEnd(heapID, sizeof(MessageLoader)); @@ -300,7 +301,7 @@ void MessageLoader_GetStrbuf(const MessageLoader *loader, u32 entryID, Strbuf *s } } -Strbuf* MessageLoader_GetNewStrbuf(const MessageLoader *loader, u32 entryID) +Strbuf *MessageLoader_GetNewStrbuf(const MessageLoader *loader, u32 entryID) { switch (loader->type) { case MESSAGE_LOADER_BANK_HANDLE: diff --git a/src/message_util.c b/src/message_util.c index 9b94e8d738..3cd6369cf9 100644 --- a/src/message_util.c +++ b/src/message_util.c @@ -1,18 +1,18 @@ +#include "message_util.h" + #include #include -#include "message.h" -#include "strbuf.h" - -#include "message.h" -#include "message_util.h" -#include "string_template.h" -#include "strbuf.h" #include "constants/heap.h" #include "constants/narc.h" + #include "text/pl_msg.naix" -Strbuf* MessageUtil_ExpandedStrbuf (StringTemplate *template, MessageLoader *loader, u32 entryID, u32 heapID) +#include "message.h" +#include "strbuf.h" +#include "string_template.h" + +Strbuf *MessageUtil_ExpandedStrbuf(StringTemplate *template, MessageLoader *loader, u32 entryID, u32 heapID) { Strbuf *ret = NULL; Strbuf *buf = Strbuf_Init(EXPANDED_STRING_SIZE, HEAP_ID_SYSTEM); @@ -32,7 +32,7 @@ Strbuf* MessageUtil_ExpandedStrbuf (StringTemplate *template, MessageLoader *loa return ret; } -Strbuf* MessageUtil_MoveName (u32 moveID, u32 heapID) +Strbuf *MessageUtil_MoveName(u32 moveID, u32 heapID) { MessageLoader *loader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_move_names, heapID); @@ -50,7 +50,7 @@ Strbuf* MessageUtil_MoveName (u32 moveID, u32 heapID) return NULL; } -Strbuf* MessageUtil_SpeciesName (u32 species, u32 heapID) +Strbuf *MessageUtil_SpeciesName(u32 species, u32 heapID) { MessageLoader *loader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, message_bank_species_names, heapID); diff --git a/src/move_table.c b/src/move_table.c index eaf38faacb..33bc77364c 100644 --- a/src/move_table.c +++ b/src/move_table.c @@ -1,9 +1,10 @@ +#include "move_table.h" + #include #include #include "constants/moves.h" -#include "move_table.h" #include "narc.h" static void LoadMoveEntry(int move, MoveTable *entry); diff --git a/src/narc.c b/src/narc.c index b9347f1e46..2399da8479 100644 --- a/src/narc.c +++ b/src/narc.c @@ -1,212 +1,215 @@ +#include "narc.h" + #include #include -#include "narc.h" #include "heap.h" // Mapping of NARC indices to filesystem paths. +// clang-format off static const char* sNarcPaths[] = { - [NARC_INDEX_BATTLE__SKILL__WAZA_SEQ] = { "battle/skill/waza_seq.narc" }, - [NARC_INDEX_BATTLE__SKILL__SUB_SEQ] = { "battle/skill/sub_seq.narc" }, - [NARC_INDEX_POKETOOL__PERSONAL__PL_PERSONAL] = { "poketool/personal/pl_personal.narc" }, - [NARC_INDEX_POKETOOL__PERSONAL__PL_GROWTBL] = { "poketool/personal/pl_growtbl.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__PL_POKEGRA] = { "poketool/pokegra/pl_pokegra.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__HEIGHT] = { "poketool/pokegra/height.narc" }, - [NARC_INDEX_POKETOOL__TRGRA__TRBGRA] = { "poketool/trgra/trbgra.narc" }, - [NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG] = { "battle/graphic/pl_batt_bg.narc" }, - [NARC_INDEX_WAZAEFFECT__WE] = { "wazaeffect/we.arc" }, - [NARC_INDEX_POKETOOL__WAZA__PL_WAZA_TBL] = { "poketool/waza/pl_waza_tbl.narc" }, - [NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ] = { "fielddata/script/scr_seq.narc" }, - [NARC_INDEX_MSGDATA__SCENARIO__SCR_MSG] = { "msgdata/scenario/scr_msg.narc" }, - [NARC_INDEX_GRAPHIC__POKETCH] = { "graphic/poketch.narc" }, - [NARC_INDEX_GRAPHIC__PL_BAG_GRA] = { "graphic/pl_bag_gra.narc" }, - [NARC_INDEX_GRAPHIC__PL_FONT] = { "graphic/pl_font.narc" }, - [NARC_INDEX_ITEMTOOL__ITEMDATA__PL_ITEM_DATA] = { "itemtool/itemdata/pl_item_data.narc" }, - [NARC_INDEX_ITEMTOOL__ITEMDATA__ITEM_ICON] = { "itemtool/itemdata/item_icon.narc" }, - [NARC_INDEX_GRAPHIC__TMAP_GRA] = { "graphic/tmap_gra.narc" }, - [NARC_INDEX_GRAPHIC__BOX] = { "graphic/box.narc" }, - [NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON] = { "poketool/icongra/pl_poke_icon.narc" }, - [NARC_INDEX_GRAPHIC__PL_PLIST_GRA] = { "graphic/pl_plist_gra.narc" }, - [NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECHAR] = { "wazaeffect/effectclact/wechar.narc" }, - [NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WEPLTT] = { "wazaeffect/effectclact/wepltt.narc" }, - [NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELL] = { "wazaeffect/effectclact/wecell.narc" }, - [NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELLANM] = { "wazaeffect/effectclact/wecellanm.narc" }, - [NARC_INDEX_GRAPHIC__IMAGECLIP] = { "graphic/imageclip.narc" }, - [NARC_INDEX_MSGDATA__PL_MSG] = { "msgdata/pl_msg.narc" }, - [NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ] = { "battle/graphic/pl_batt_obj.narc" }, - [NARC_INDEX_DATA__UNDERG_RADAR] = { "data/underg_radar.narc" }, - [NARC_INDEX_WAZAEFFECT__EFFECTDATA__WAZA_PARTICLE] = { "wazaeffect/effectdata/waza_particle.narc" }, - [NARC_INDEX_BATTLE__SKILL__BE_SEQ] = { "battle/skill/be_seq.narc" }, - [NARC_INDEX_DATA__NAMEIN] = { "data/namein.narc" }, - [NARC_INDEX_FIELDDATA__EVENTDATA__ZONE_EVENT] = { "fielddata/eventdata/zone_event.narc" }, - [NARC_INDEX_POKETOOL__PERSONAL__WOTBL] = { "poketool/personal/wotbl.narc" }, - [NARC_INDEX_POKETOOL__PERSONAL__EVO] = { "poketool/personal/evo.narc" }, - [NARC_INDEX_GRAPHIC__FONTOAM] = { "graphic/fontoam.narc" }, - [NARC_INDEX_GRAPHIC__FIELD_BOARD] = { "graphic/field_board.narc" }, - [NARC_INDEX_FIELDDATA__ENCOUNTDATA__D_ENC_DATA] = { "fielddata/encountdata/d_enc_data.narc" }, - [NARC_INDEX_GRAPHIC__PL_WINFRAME] = { "graphic/pl_winframe.narc" }, - [NARC_INDEX_GRAPHIC__PL_PST_GRA] = { "graphic/pl_pst_gra.narc" }, - [NARC_INDEX_FIELDDATA__BUILD_MODEL__BUILD_MODEL] = { "fielddata/build_model/build_model.narc" }, - [NARC_INDEX_FIELDDATA__MAPMATRIX__MAP_MATRIX] = { "fielddata/mapmatrix/map_matrix.narc" }, - [NARC_INDEX_FIELDDATA__AREADATA__AREA_DATA] = { "fielddata/areadata/area_data.narc" }, - [NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREA_BUILD] = { "fielddata/areadata/area_build_model/area_build.narc" }, - [NARC_INDEX_FIELDDATA__AREADATA__AREA_MAP_TEX__MAP_TEX_SET] = { "fielddata/areadata/area_map_tex/map_tex_set.narc" }, - [NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG] = { "contest/graphic/contest_bg.narc" }, - [NARC_INDEX_CONTEST__GRAPHIC__CONTEST_OBJ] = { "contest/graphic/contest_obj.narc" }, - [NARC_INDEX_DATA__UGEFFECT_OBJ_GRAPHIC] = { "data/ugeffect_obj_graphic.narc" }, - [NARC_INDEX_DEMO__TITLE__TITLEDEMO] = { "demo/title/titledemo.narc" }, - [NARC_INDEX_FIELDDATA__AREADATA__AREA_MOVE_MODEL__MOVE_MODEL_LIST] = { "fielddata/areadata/area_move_model/move_model_list.narc" }, - [NARC_INDEX_DATA__UG_TRAP] = { "data/ug_trap.narc" }, - [NARC_INDEX_GRAPHIC__TRAINER_CASE] = { "graphic/trainer_case.narc" }, - [NARC_INDEX_DATA__UG_FOSSIL] = { "data/ug_fossil.narc" }, - [NARC_INDEX_GRAPHIC__NTAG_GRA] = { "graphic/ntag_gra.narc" }, - [NARC_INDEX_DATA__TRADELIST] = { "data/tradelist.narc" }, - [NARC_INDEX_DATA__UG_PARTS] = { "data/ug_parts.narc" }, - [NARC_INDEX_GRAPHIC__OPENING] = { "graphic/opening.narc" }, - [NARC_INDEX_POKETOOL__TRAINER__TRDATA] = { "poketool/trainer/trdata.narc" }, - [NARC_INDEX_POKETOOL__TRAINER__TRPOKE] = { "poketool/trainer/trpoke.narc" }, - [NARC_INDEX_POKETOOL__TRMSG__TRTBL] = { "poketool/trmsg/trtbl.narc" }, - [NARC_INDEX_POKETOOL__TRGRA__TRFGRA] = { "poketool/trgra/trfgra.narc" }, - [NARC_INDEX_PARTICLEDATA__PARTICLEDATA] = { "particledata/particledata.narc" }, - [NARC_INDEX_GRAPHIC__SHOP_GRA] = { "graphic/shop_gra.narc" }, - [NARC_INDEX_WAZAEFFECT__WE_SUB] = { "wazaeffect/we_sub.narc" }, - [NARC_INDEX_DATA__UG_ANIM] = { "data/ug_anim.narc" }, - [NARC_INDEX_DATA__WEATHER_SYS] = { "data/weather_sys.narc" }, - [NARC_INDEX_GRAPHIC__MENU_GRA] = { "graphic/menu_gra.narc" }, - [NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA] = { "fielddata/land_data/land_data.narc" }, - [NARC_INDEX_ITEMTOOL__ITEMDATA__NUTS_DATA] = { "itemtool/itemdata/nuts_data.narc" }, - [NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN] = { "resource/eng/zukan/zukan.narc" }, - [NARC_INDEX_POKETOOL__POKEFOOT__POKEFOOT] = { "poketool/pokefoot/pokefoot.narc" }, - [NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREABM_TEXSET] = { "fielddata/areadata/area_build_model/areabm_texset.narc" }, - [NARC_INDEX_BATTLE__GRAPHIC__PL_B_PLIST_GRA] = { "battle/graphic/pl_b_plist_gra.narc" }, - [NARC_INDEX_GRAPHIC__CONFIG_GRA] = { "graphic/config_gra.narc" }, - [NARC_INDEX_GRAPHIC__UNIONROOM] = { "graphic/unionroom.narc" }, - [NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_DATA] = { "application/zukanlist/zkn_data/zukan_data.narc" }, - [NARC_INDEX_GRAPHIC__PMSI] = { "graphic/pmsi.narc" }, - [NARC_INDEX_BATTLE__GRAPHIC__B_BAG_GRA] = { "battle/graphic/b_bag_gra.narc" }, - [NARC_INDEX_GRAPHIC__OEKAKI] = { "graphic/oekaki.narc" }, - [NARC_INDEX_GRAPHIC__MAIL_GRA] = { "graphic/mail_gra.narc" }, - [NARC_INDEX_GRAPHIC__F_NOTE_GRA] = { "graphic/f_note_gra.narc" }, - [NARC_INDEX_DATA__MMODEL__MMODEL] = { "data/mmodel/mmodel.narc" }, - [NARC_INDEX_GRAPHIC__EV_POKESELECT] = { "graphic/ev_pokeselect.narc" }, - [NARC_INDEX_GRAPHIC__PORU_GRA] = { "graphic/poru_gra.narc" }, - [NARC_INDEX_GRAPHIC__TOUCH_SUBWINDOW] = { "graphic/touch_subwindow.narc" }, - [NARC_INDEX_GRAPHIC__FLD_COMACT] = { "graphic/fld_comact.narc" }, - [NARC_INDEX_GRAPHIC__RECORD] = { "graphic/record.narc" }, - [NARC_INDEX_GRAPHIC__PORUDEMO] = { "graphic/porudemo.narc" }, - [NARC_INDEX_GRAPHIC__PORUACT] = { "graphic/poruact.narc" }, - [NARC_INDEX_GRAPHIC__PL_WIFINOTE] = { "graphic/pl_wifinote.narc" }, - [NARC_INDEX_CONTEST__DATA__CONTEST_DATA] = { "contest/data/contest_data.narc" }, - [NARC_INDEX_APPLICATION__CUSTOM_BALL__DATA__CB_DATA] = { "application/custom_ball/data/cb_data.narc" }, - [NARC_INDEX_DATA__WIFIP2PMATCH] = { "data/wifip2pmatch.narc" }, - [NARC_INDEX_GRAPHIC__DEMO_TRADE] = { "graphic/demo_trade.narc" }, - [NARC_INDEX_POKEANIME__PL_POKE_ANM] = { "pokeanime/pl_poke_anm.narc" }, - [NARC_INDEX_GRAPHIC__MYSIGN] = { "graphic/mysign.narc" }, - [NARC_INDEX_FIELDDATA__MM_LIST__MOVE_MODEL_LIST] = { "fielddata/mm_list/move_model_list.narc" }, - [NARC_INDEX_DATA__FIELD_CUTIN] = { "data/field_cutin.narc" }, - [NARC_INDEX_DATA__DEMO_CLIMAX] = { "data/demo_climax.narc" }, - [NARC_INDEX_WAZAEFFECT__EFFECTDATA__BALL_PARTICLE] = { "wazaeffect/effectdata/ball_particle.narc" }, - [NARC_INDEX_WAZAEFFECT__PT_DEBUG__DEBUG_PARTICLE] = { "wazaeffect/pt_debug/debug_particle.narc" }, - [NARC_INDEX_GRAPHIC__DENDOU_PC] = { "graphic/dendou_pc.narc" }, - [NARC_INDEX_APPLICATION__WIFI_EARTH__WIFI_EARTH_PLACE] = { "application/wifi_earth/wifi_earth_place.narc" }, - [NARC_INDEX_BATTLE__TR_AI__TR_AI_SEQ] = { "battle/tr_ai/tr_ai_seq.narc" }, - [NARC_INDEX_GRAPHIC__WORLDTRADE] = { "graphic/worldtrade.narc" }, - [NARC_INDEX_GRAPHIC__DENDOU_DEMO] = { "graphic/dendou_demo.narc" }, - [NARC_INDEX_ARC__ENCDATA_EX] = { "arc/encdata_ex.narc" }, - [NARC_INDEX_DATA__MMODEL__FLDEFF] = { "data/mmodel/fldeff.narc" }, - [NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA] = { "battle/graphic/vs_demo_gra.narc" }, - [NARC_INDEX_POKETOOL__PL_POKEZUKAN] = { "poketool/pl_pokezukan.narc" }, - [NARC_INDEX_ARC__BM_ANIME] = { "arc/bm_anime.narc" }, - [NARC_INDEX_ARC__BM_ANIME_LIST] = { "arc/bm_anime_list.narc" }, - [NARC_INDEX_GRAPHIC__FIELD_ENCOUNTEFFECT] = { "graphic/field_encounteffect.narc" }, - [NARC_INDEX_GRAPHIC__WAZA_OSHIE_GRA] = { "graphic/waza_oshie_gra.narc" }, - [NARC_INDEX_POKETOOL__POKEANM__PL_POKEANM] = { "poketool/pokeanm/pl_pokeanm.narc" }, - [NARC_INDEX_FIELDDATA__POKEMON_TRADE__FLD_TRADE] = { "fielddata/pokemon_trade/fld_trade.narc" }, - [NARC_INDEX_GRAPHIC__MYSTERY] = { "graphic/mystery.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__PL_OTHERPOKE] = { "poketool/pokegra/pl_otherpoke.narc" }, - [NARC_INDEX_DEMO__EGG__DATA__EGG_DATA] = { "demo/egg/data/egg_data.narc" }, - [NARC_INDEX_DEMO__EGG__DATA__PARTICLE__EGG_DEMO_PARTICLE] = { "demo/egg/data/particle/egg_demo_particle.narc" }, - [NARC_INDEX_ARC__SHIP_DEMO] = { "arc/ship_demo.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__HEIGHT_O] = { "poketool/pokegra/height_o.narc" }, - [NARC_INDEX_GRAPHIC__NUTMIXER] = { "graphic/nutmixer.narc" }, - [NARC_INDEX_GRAPHIC__BTOWER] = { "graphic/btower.narc" }, - [NARC_INDEX_DEMO__SHINKA__DATA__PARTICLE__SHINKA_DEMO_PARTICLE] = { "demo/shinka/data/particle/shinka_demo_particle.narc" }, - [NARC_INDEX_DEMO__INTRO__INTRO] = { "demo/intro/intro.narc" }, - [NARC_INDEX_ARC__TV] = { "arc/tv.narc" }, - [NARC_INDEX_GRAPHIC__ENDING] = { "graphic/ending.narc" }, - [NARC_INDEX_DEMO__TITLE__OP_DEMO] = { "demo/title/op_demo.narc" }, - [NARC_INDEX_APPLICATION__WIFI_EARTH__WIFI_EARTH] = { "application/wifi_earth/wifi_earth.narc" }, - [NARC_INDEX_GRAPHIC__RANKING] = { "graphic/ranking.narc" }, - [NARC_INDEX_ARC__PPARK] = { "arc/ppark.narc" }, - [NARC_INDEX_DEMO__SYOUJYOU__SYOUJYOU] = { "demo/syoujyou/syoujyou.narc" }, - [NARC_INDEX_DATA__SLOT] = { "data/slot.narc" }, - [NARC_INDEX_BATTLE__B_TOWER__BTDTR] = { "battle/b_tower/btdtr.narc" }, - [NARC_INDEX_BATTLE__B_TOWER__BTDPM] = { "battle/b_tower/btdpm.narc" }, - [NARC_INDEX_DEMO__INTRO__INTRO_TV] = { "demo/intro/intro_tv.narc" }, - [NARC_INDEX_POKETOOL__TRMSG__TRTBLOFS] = { "poketool/trmsg/trtblofs.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__POKE_YOFS] = { "poketool/pokegra/poke_yofs.narc" }, - [NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_ENC_DIAMOND] = { "application/zukanlist/zkn_data/zukan_enc_diamond.narc" }, - [NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_ENC_PEARL] = { "application/zukanlist/zkn_data/zukan_enc_pearl.narc" }, - [NARC_INDEX_GRAPHIC__HIDEN_EFFECT] = { "graphic/hiden_effect.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__POKE_SHADOW] = { "poketool/pokegra/poke_shadow.narc" }, - [NARC_INDEX_FIELDDATA__ENCOUNTDATA__P_ENC_DATA] = { "fielddata/encountdata/p_enc_data.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__POKE_SHADOW_OFX] = { "poketool/pokegra/poke_shadow_ofx.narc" }, - [NARC_INDEX_POKETOOL__SHINZUKAN] = { "poketool/shinzukan.narc" }, - [NARC_INDEX_GRAPHIC__WIFI2DCHAR] = { "graphic/wifi2dchar.narc" }, - [NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA] = { "poketool/poke_edit/pl_poke_data.narc" }, - [NARC_INDEX_DEBUG__CB_EDIT__D_TEST] = { "debug/cb_edit/d_test.narc" }, - [NARC_INDEX_FRONTIER__SCRIPT__FR_SCRIPT] = { "frontier/script/fr_script.narc" }, - [NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG] = { "resource/eng/frontier_graphic/frontier_bg.narc" }, - [NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_OBJ] = { "resource/eng/frontier_graphic/frontier_obj.narc" }, - [NARC_INDEX_APPLICATION__CUSTOM_BALL__EDIT__PL_CB_DATA] = { "application/custom_ball/edit/pl_cb_data.narc" }, - [NARC_INDEX_GRAPHIC__WIFI_UNIONOBJ] = { "graphic/wifi_unionobj.narc" }, - [NARC_INDEX_DATA__GURU2] = { "data/guru2.narc" }, - [NARC_INDEX_DATA__FLDTANIME] = { "data/fldtanime.narc" }, - [NARC_INDEX_ARC__SHIP_DEMO_PL] = { "arc/ship_demo_pl.narc" }, - [NARC_INDEX_PARTICLEDATA__PL_FRONTIER__FRONTIER_PARTICLE] = { "particledata/pl_frontier/frontier_particle.narc" }, - [NARC_INDEX_GRAPHIC__BUCKET] = { "graphic/bucket.narc" }, - [NARC_INDEX_ARC__CODEIN_GRA] = { "arc/codein_gra.narc" }, - [NARC_INDEX_ARC__AREA_WIN_GRA] = { "arc/area_win_gra.narc" }, - [NARC_INDEX_FIELDDATA__ENCOUNTDATA__PL_ENC_DATA] = { "fielddata/encountdata/pl_enc_data.narc" }, - [NARC_INDEX_RESOURCE__ENG__BATT_REC__BATT_REC_GRA] = { "resource/eng/batt_rec/batt_rec_gra.narc" }, - [NARC_INDEX_GRAPHIC__WORLDTIMER] = { "graphic/worldtimer.narc" }, - [NARC_INDEX_ARC__MANENE] = { "arc/manene.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__POKEGRA] = { "poketool/pokegra/pokegra.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__OTHERPOKE] = { "poketool/pokegra/otherpoke.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__DP_HEIGHT] = { "poketool/pokegra/dp_height.narc" }, - [NARC_INDEX_POKETOOL__POKEGRA__DP_HEIGHT_O] = { "poketool/pokegra/dp_height_o.narc" }, - [NARC_INDEX_GRAPHIC__LOBBY_NEWS] = { "graphic/lobby_news.narc" }, - [NARC_INDEX_ARC__EMAIL_GRA] = { "arc/email_gra.narc" }, - [NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL] = { "resource/eng/wifi_lobby_minigame/wlmngm_tool.narc" }, - [NARC_INDEX_ARC__DEMO_TENGAN_GRA] = { "arc/demo_tengan_gra.narc" }, - [NARC_INDEX_APPLICATION__BALLOON__GRAPHIC__BALLOON_GRA] = { "application/balloon/graphic/balloon_gra.narc" }, - [NARC_INDEX_APPLICATION__WIFI_LOBBY__MAP_CONV__WFLBY_MAP] = { "application/wifi_lobby/map_conv/wflby_map.narc" }, - [NARC_INDEX_GRAPHIC__WIFI_LOBBY] = { "graphic/wifi_lobby.narc" }, - [NARC_INDEX_DATA__AREALIGHT] = { "data/arealight.narc" }, - [NARC_INDEX_DATA__UGROUNDEFFECT] = { "data/ugroundeffect.narc" }, - [NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR] = { "battle/b_pl_tower/pl_btdtr.narc" }, - [NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDPM] = { "battle/b_pl_tower/pl_btdpm.narc" }, - [NARC_INDEX_BATTLE__B_PL_STAGE__PL_BSDPM] = { "battle/b_pl_stage/pl_bsdpm.narc" }, - [NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC] = { "fielddata/tornworld/tw_arc.narc" }, - [NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC_ATTR] = { "fielddata/tornworld/tw_arc_attr.narc" }, - [NARC_INDEX_DATA__TW_ARC_ETC] = { "data/tw_arc_etc.narc" }, - [NARC_INDEX_RESOURCE__ENG__SCRATCH__SCRATCH] = { "resource/eng/scratch/scratch.narc" }, - [NARC_INDEX_PARTICLEDATA__PL_POKELIST__POKELIST_PARTICLE] = { "particledata/pl_pokelist/pokelist_particle.narc" }, - [NARC_INDEX_GRAPHIC__WIFI_LOBBY_OTHER] = { "graphic/wifi_lobby_other.narc" }, - [NARC_INDEX_GRAPHIC__FOOTPRINT_BOARD] = { "graphic/footprint_board.narc" }, - [NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_ENC_PLATINUM] = { "application/zukanlist/zkn_data/zukan_enc_platinum.narc" }, - [NARC_INDEX_APPLICATION__BUCKET__BALLSLOW_DATA] = { "application/bucket/ballslow_data.narc" }, - [NARC_INDEX_PARTICLEDATA__PL_ETC__PL_ETC_PARTICLE] = { "particledata/pl_etc/pl_etc_particle.narc" }, - [NARC_INDEX_RESOURCE__ENG__PMS_AIKOTOBA__PMS_AIKOTOBA] = { "resource/eng/pms_aikotoba/pms_aikotoba.narc" }, - [NARC_INDEX_GRAPHIC__UNIONOBJ2D_ONLYFRONT] = { "graphic/unionobj2d_onlyfront.narc" }, - [NARC_INDEX_GRAPHIC__LIBRARY_TV] = { "graphic/library_tv.narc" }, - [NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_DATA_GIRA] = { "application/zukanlist/zkn_data/zukan_data_gira.narc" }, + [NARC_INDEX_BATTLE__SKILL__WAZA_SEQ] = "battle/skill/waza_seq.narc", + [NARC_INDEX_BATTLE__SKILL__SUB_SEQ] = "battle/skill/sub_seq.narc", + [NARC_INDEX_POKETOOL__PERSONAL__PL_PERSONAL] = "poketool/personal/pl_personal.narc", + [NARC_INDEX_POKETOOL__PERSONAL__PL_GROWTBL] = "poketool/personal/pl_growtbl.narc", + [NARC_INDEX_POKETOOL__POKEGRA__PL_POKEGRA] = "poketool/pokegra/pl_pokegra.narc", + [NARC_INDEX_POKETOOL__POKEGRA__HEIGHT] = "poketool/pokegra/height.narc", + [NARC_INDEX_POKETOOL__TRGRA__TRBGRA] = "poketool/trgra/trbgra.narc", + [NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_BG] = "battle/graphic/pl_batt_bg.narc", + [NARC_INDEX_WAZAEFFECT__WE] = "wazaeffect/we.arc", + [NARC_INDEX_POKETOOL__WAZA__PL_WAZA_TBL] = "poketool/waza/pl_waza_tbl.narc", + [NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ] = "fielddata/script/scr_seq.narc", + [NARC_INDEX_MSGDATA__SCENARIO__SCR_MSG] = "msgdata/scenario/scr_msg.narc", + [NARC_INDEX_GRAPHIC__POKETCH] = "graphic/poketch.narc", + [NARC_INDEX_GRAPHIC__PL_BAG_GRA] = "graphic/pl_bag_gra.narc", + [NARC_INDEX_GRAPHIC__PL_FONT] = "graphic/pl_font.narc", + [NARC_INDEX_ITEMTOOL__ITEMDATA__PL_ITEM_DATA] = "itemtool/itemdata/pl_item_data.narc", + [NARC_INDEX_ITEMTOOL__ITEMDATA__ITEM_ICON] = "itemtool/itemdata/item_icon.narc", + [NARC_INDEX_GRAPHIC__TMAP_GRA] = "graphic/tmap_gra.narc", + [NARC_INDEX_GRAPHIC__BOX] = "graphic/box.narc", + [NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON] = "poketool/icongra/pl_poke_icon.narc", + [NARC_INDEX_GRAPHIC__PL_PLIST_GRA] = "graphic/pl_plist_gra.narc", + [NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECHAR] = "wazaeffect/effectclact/wechar.narc", + [NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WEPLTT] = "wazaeffect/effectclact/wepltt.narc", + [NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELL] = "wazaeffect/effectclact/wecell.narc", + [NARC_INDEX_WAZAEFFECT__EFFECTCLACT__WECELLANM] = "wazaeffect/effectclact/wecellanm.narc", + [NARC_INDEX_GRAPHIC__IMAGECLIP] = "graphic/imageclip.narc", + [NARC_INDEX_MSGDATA__PL_MSG] = "msgdata/pl_msg.narc", + [NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ] = "battle/graphic/pl_batt_obj.narc", + [NARC_INDEX_DATA__UNDERG_RADAR] = "data/underg_radar.narc", + [NARC_INDEX_WAZAEFFECT__EFFECTDATA__WAZA_PARTICLE] = "wazaeffect/effectdata/waza_particle.narc", + [NARC_INDEX_BATTLE__SKILL__BE_SEQ] = "battle/skill/be_seq.narc", + [NARC_INDEX_DATA__NAMEIN] = "data/namein.narc", + [NARC_INDEX_FIELDDATA__EVENTDATA__ZONE_EVENT] = "fielddata/eventdata/zone_event.narc", + [NARC_INDEX_POKETOOL__PERSONAL__WOTBL] = "poketool/personal/wotbl.narc", + [NARC_INDEX_POKETOOL__PERSONAL__EVO] = "poketool/personal/evo.narc", + [NARC_INDEX_GRAPHIC__FONTOAM] = "graphic/fontoam.narc", + [NARC_INDEX_GRAPHIC__FIELD_BOARD] = "graphic/field_board.narc", + [NARC_INDEX_FIELDDATA__ENCOUNTDATA__D_ENC_DATA] = "fielddata/encountdata/d_enc_data.narc", + [NARC_INDEX_GRAPHIC__PL_WINFRAME] = "graphic/pl_winframe.narc", + [NARC_INDEX_GRAPHIC__PL_PST_GRA] = "graphic/pl_pst_gra.narc", + [NARC_INDEX_FIELDDATA__BUILD_MODEL__BUILD_MODEL] = "fielddata/build_model/build_model.narc", + [NARC_INDEX_FIELDDATA__MAPMATRIX__MAP_MATRIX] = "fielddata/mapmatrix/map_matrix.narc", + [NARC_INDEX_FIELDDATA__AREADATA__AREA_DATA] = "fielddata/areadata/area_data.narc", + [NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREA_BUILD] = "fielddata/areadata/area_build_model/area_build.narc", + [NARC_INDEX_FIELDDATA__AREADATA__AREA_MAP_TEX__MAP_TEX_SET] = "fielddata/areadata/area_map_tex/map_tex_set.narc", + [NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG] = "contest/graphic/contest_bg.narc", + [NARC_INDEX_CONTEST__GRAPHIC__CONTEST_OBJ] = "contest/graphic/contest_obj.narc", + [NARC_INDEX_DATA__UGEFFECT_OBJ_GRAPHIC] = "data/ugeffect_obj_graphic.narc", + [NARC_INDEX_DEMO__TITLE__TITLEDEMO] = "demo/title/titledemo.narc", + [NARC_INDEX_FIELDDATA__AREADATA__AREA_MOVE_MODEL__MOVE_MODEL_LIST] = "fielddata/areadata/area_move_model/move_model_list.narc", + [NARC_INDEX_DATA__UG_TRAP] = "data/ug_trap.narc", + [NARC_INDEX_GRAPHIC__TRAINER_CASE] = "graphic/trainer_case.narc", + [NARC_INDEX_DATA__UG_FOSSIL] = "data/ug_fossil.narc", + [NARC_INDEX_GRAPHIC__NTAG_GRA] = "graphic/ntag_gra.narc", + [NARC_INDEX_DATA__TRADELIST] = "data/tradelist.narc", + [NARC_INDEX_DATA__UG_PARTS] = "data/ug_parts.narc", + [NARC_INDEX_GRAPHIC__OPENING] = "graphic/opening.narc", + [NARC_INDEX_POKETOOL__TRAINER__TRDATA] = "poketool/trainer/trdata.narc", + [NARC_INDEX_POKETOOL__TRAINER__TRPOKE] = "poketool/trainer/trpoke.narc", + [NARC_INDEX_POKETOOL__TRMSG__TRTBL] = "poketool/trmsg/trtbl.narc", + [NARC_INDEX_POKETOOL__TRGRA__TRFGRA] = "poketool/trgra/trfgra.narc", + [NARC_INDEX_PARTICLEDATA__PARTICLEDATA] = "particledata/particledata.narc", + [NARC_INDEX_GRAPHIC__SHOP_GRA] = "graphic/shop_gra.narc", + [NARC_INDEX_WAZAEFFECT__WE_SUB] = "wazaeffect/we_sub.narc", + [NARC_INDEX_DATA__UG_ANIM] = "data/ug_anim.narc", + [NARC_INDEX_DATA__WEATHER_SYS] = "data/weather_sys.narc", + [NARC_INDEX_GRAPHIC__MENU_GRA] = "graphic/menu_gra.narc", + [NARC_INDEX_FIELDDATA__LAND_DATA__LAND_DATA] = "fielddata/land_data/land_data.narc", + [NARC_INDEX_ITEMTOOL__ITEMDATA__NUTS_DATA] = "itemtool/itemdata/nuts_data.narc", + [NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN] = "resource/eng/zukan/zukan.narc", + [NARC_INDEX_POKETOOL__POKEFOOT__POKEFOOT] = "poketool/pokefoot/pokefoot.narc", + [NARC_INDEX_FIELDDATA__AREADATA__AREA_BUILD_MODEL__AREABM_TEXSET] = "fielddata/areadata/area_build_model/areabm_texset.narc", + [NARC_INDEX_BATTLE__GRAPHIC__PL_B_PLIST_GRA] = "battle/graphic/pl_b_plist_gra.narc", + [NARC_INDEX_GRAPHIC__CONFIG_GRA] = "graphic/config_gra.narc", + [NARC_INDEX_GRAPHIC__UNIONROOM] = "graphic/unionroom.narc", + [NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_DATA] = "application/zukanlist/zkn_data/zukan_data.narc", + [NARC_INDEX_GRAPHIC__PMSI] = "graphic/pmsi.narc", + [NARC_INDEX_BATTLE__GRAPHIC__B_BAG_GRA] = "battle/graphic/b_bag_gra.narc", + [NARC_INDEX_GRAPHIC__OEKAKI] = "graphic/oekaki.narc", + [NARC_INDEX_GRAPHIC__MAIL_GRA] = "graphic/mail_gra.narc", + [NARC_INDEX_GRAPHIC__F_NOTE_GRA] = "graphic/f_note_gra.narc", + [NARC_INDEX_DATA__MMODEL__MMODEL] = "data/mmodel/mmodel.narc", + [NARC_INDEX_GRAPHIC__EV_POKESELECT] = "graphic/ev_pokeselect.narc", + [NARC_INDEX_GRAPHIC__PORU_GRA] = "graphic/poru_gra.narc", + [NARC_INDEX_GRAPHIC__TOUCH_SUBWINDOW] = "graphic/touch_subwindow.narc", + [NARC_INDEX_GRAPHIC__FLD_COMACT] = "graphic/fld_comact.narc", + [NARC_INDEX_GRAPHIC__RECORD] = "graphic/record.narc", + [NARC_INDEX_GRAPHIC__PORUDEMO] = "graphic/porudemo.narc", + [NARC_INDEX_GRAPHIC__PORUACT] = "graphic/poruact.narc", + [NARC_INDEX_GRAPHIC__PL_WIFINOTE] = "graphic/pl_wifinote.narc", + [NARC_INDEX_CONTEST__DATA__CONTEST_DATA] = "contest/data/contest_data.narc", + [NARC_INDEX_APPLICATION__CUSTOM_BALL__DATA__CB_DATA] = "application/custom_ball/data/cb_data.narc", + [NARC_INDEX_DATA__WIFIP2PMATCH] = "data/wifip2pmatch.narc", + [NARC_INDEX_GRAPHIC__DEMO_TRADE] = "graphic/demo_trade.narc", + [NARC_INDEX_POKEANIME__PL_POKE_ANM] = "pokeanime/pl_poke_anm.narc", + [NARC_INDEX_GRAPHIC__MYSIGN] = "graphic/mysign.narc", + [NARC_INDEX_FIELDDATA__MM_LIST__MOVE_MODEL_LIST] = "fielddata/mm_list/move_model_list.narc", + [NARC_INDEX_DATA__FIELD_CUTIN] = "data/field_cutin.narc", + [NARC_INDEX_DATA__DEMO_CLIMAX] = "data/demo_climax.narc", + [NARC_INDEX_WAZAEFFECT__EFFECTDATA__BALL_PARTICLE] = "wazaeffect/effectdata/ball_particle.narc", + [NARC_INDEX_WAZAEFFECT__PT_DEBUG__DEBUG_PARTICLE] = "wazaeffect/pt_debug/debug_particle.narc", + [NARC_INDEX_GRAPHIC__DENDOU_PC] = "graphic/dendou_pc.narc", + [NARC_INDEX_APPLICATION__WIFI_EARTH__WIFI_EARTH_PLACE] = "application/wifi_earth/wifi_earth_place.narc", + [NARC_INDEX_BATTLE__TR_AI__TR_AI_SEQ] = "battle/tr_ai/tr_ai_seq.narc", + [NARC_INDEX_GRAPHIC__WORLDTRADE] = "graphic/worldtrade.narc", + [NARC_INDEX_GRAPHIC__DENDOU_DEMO] = "graphic/dendou_demo.narc", + [NARC_INDEX_ARC__ENCDATA_EX] = "arc/encdata_ex.narc", + [NARC_INDEX_DATA__MMODEL__FLDEFF] = "data/mmodel/fldeff.narc", + [NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA] = "battle/graphic/vs_demo_gra.narc", + [NARC_INDEX_POKETOOL__PL_POKEZUKAN] = "poketool/pl_pokezukan.narc", + [NARC_INDEX_ARC__BM_ANIME] = "arc/bm_anime.narc", + [NARC_INDEX_ARC__BM_ANIME_LIST] = "arc/bm_anime_list.narc", + [NARC_INDEX_GRAPHIC__FIELD_ENCOUNTEFFECT] = "graphic/field_encounteffect.narc", + [NARC_INDEX_GRAPHIC__WAZA_OSHIE_GRA] = "graphic/waza_oshie_gra.narc", + [NARC_INDEX_POKETOOL__POKEANM__PL_POKEANM] = "poketool/pokeanm/pl_pokeanm.narc", + [NARC_INDEX_FIELDDATA__POKEMON_TRADE__FLD_TRADE] = "fielddata/pokemon_trade/fld_trade.narc", + [NARC_INDEX_GRAPHIC__MYSTERY] = "graphic/mystery.narc", + [NARC_INDEX_POKETOOL__POKEGRA__PL_OTHERPOKE] = "poketool/pokegra/pl_otherpoke.narc", + [NARC_INDEX_DEMO__EGG__DATA__EGG_DATA] = "demo/egg/data/egg_data.narc", + [NARC_INDEX_DEMO__EGG__DATA__PARTICLE__EGG_DEMO_PARTICLE] = "demo/egg/data/particle/egg_demo_particle.narc", + [NARC_INDEX_ARC__SHIP_DEMO] = "arc/ship_demo.narc", + [NARC_INDEX_POKETOOL__POKEGRA__HEIGHT_O] = "poketool/pokegra/height_o.narc", + [NARC_INDEX_GRAPHIC__NUTMIXER] = "graphic/nutmixer.narc", + [NARC_INDEX_GRAPHIC__BTOWER] = "graphic/btower.narc", + [NARC_INDEX_DEMO__SHINKA__DATA__PARTICLE__SHINKA_DEMO_PARTICLE] = "demo/shinka/data/particle/shinka_demo_particle.narc", + [NARC_INDEX_DEMO__INTRO__INTRO] = "demo/intro/intro.narc", + [NARC_INDEX_ARC__TV] = "arc/tv.narc", + [NARC_INDEX_GRAPHIC__ENDING] = "graphic/ending.narc", + [NARC_INDEX_DEMO__TITLE__OP_DEMO] = "demo/title/op_demo.narc", + [NARC_INDEX_APPLICATION__WIFI_EARTH__WIFI_EARTH] = "application/wifi_earth/wifi_earth.narc", + [NARC_INDEX_GRAPHIC__RANKING] = "graphic/ranking.narc", + [NARC_INDEX_ARC__PPARK] = "arc/ppark.narc", + [NARC_INDEX_DEMO__SYOUJYOU__SYOUJYOU] = "demo/syoujyou/syoujyou.narc", + [NARC_INDEX_DATA__SLOT] = "data/slot.narc", + [NARC_INDEX_BATTLE__B_TOWER__BTDTR] = "battle/b_tower/btdtr.narc", + [NARC_INDEX_BATTLE__B_TOWER__BTDPM] = "battle/b_tower/btdpm.narc", + [NARC_INDEX_DEMO__INTRO__INTRO_TV] = "demo/intro/intro_tv.narc", + [NARC_INDEX_POKETOOL__TRMSG__TRTBLOFS] = "poketool/trmsg/trtblofs.narc", + [NARC_INDEX_POKETOOL__POKEGRA__POKE_YOFS] = "poketool/pokegra/poke_yofs.narc", + [NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_ENC_DIAMOND] = "application/zukanlist/zkn_data/zukan_enc_diamond.narc", + [NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_ENC_PEARL] = "application/zukanlist/zkn_data/zukan_enc_pearl.narc", + [NARC_INDEX_GRAPHIC__HIDEN_EFFECT] = "graphic/hiden_effect.narc", + [NARC_INDEX_POKETOOL__POKEGRA__POKE_SHADOW] = "poketool/pokegra/poke_shadow.narc", + [NARC_INDEX_FIELDDATA__ENCOUNTDATA__P_ENC_DATA] = "fielddata/encountdata/p_enc_data.narc", + [NARC_INDEX_POKETOOL__POKEGRA__POKE_SHADOW_OFX] = "poketool/pokegra/poke_shadow_ofx.narc", + [NARC_INDEX_POKETOOL__SHINZUKAN] = "poketool/shinzukan.narc", + [NARC_INDEX_GRAPHIC__WIFI2DCHAR] = "graphic/wifi2dchar.narc", + [NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA] = "poketool/poke_edit/pl_poke_data.narc", + [NARC_INDEX_DEBUG__CB_EDIT__D_TEST] = "debug/cb_edit/d_test.narc", + [NARC_INDEX_FRONTIER__SCRIPT__FR_SCRIPT] = "frontier/script/fr_script.narc", + [NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG] = "resource/eng/frontier_graphic/frontier_bg.narc", + [NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_OBJ] = "resource/eng/frontier_graphic/frontier_obj.narc", + [NARC_INDEX_APPLICATION__CUSTOM_BALL__EDIT__PL_CB_DATA] = "application/custom_ball/edit/pl_cb_data.narc", + [NARC_INDEX_GRAPHIC__WIFI_UNIONOBJ] = "graphic/wifi_unionobj.narc", + [NARC_INDEX_DATA__GURU2] = "data/guru2.narc", + [NARC_INDEX_DATA__FLDTANIME] = "data/fldtanime.narc", + [NARC_INDEX_ARC__SHIP_DEMO_PL] = "arc/ship_demo_pl.narc", + [NARC_INDEX_PARTICLEDATA__PL_FRONTIER__FRONTIER_PARTICLE] = "particledata/pl_frontier/frontier_particle.narc", + [NARC_INDEX_GRAPHIC__BUCKET] = "graphic/bucket.narc", + [NARC_INDEX_ARC__CODEIN_GRA] = "arc/codein_gra.narc", + [NARC_INDEX_ARC__AREA_WIN_GRA] = "arc/area_win_gra.narc", + [NARC_INDEX_FIELDDATA__ENCOUNTDATA__PL_ENC_DATA] = "fielddata/encountdata/pl_enc_data.narc", + [NARC_INDEX_RESOURCE__ENG__BATT_REC__BATT_REC_GRA] = "resource/eng/batt_rec/batt_rec_gra.narc", + [NARC_INDEX_GRAPHIC__WORLDTIMER] = "graphic/worldtimer.narc", + [NARC_INDEX_ARC__MANENE] = "arc/manene.narc", + [NARC_INDEX_POKETOOL__POKEGRA__POKEGRA] = "poketool/pokegra/pokegra.narc", + [NARC_INDEX_POKETOOL__POKEGRA__OTHERPOKE] = "poketool/pokegra/otherpoke.narc", + [NARC_INDEX_POKETOOL__POKEGRA__DP_HEIGHT] = "poketool/pokegra/dp_height.narc", + [NARC_INDEX_POKETOOL__POKEGRA__DP_HEIGHT_O] = "poketool/pokegra/dp_height_o.narc", + [NARC_INDEX_GRAPHIC__LOBBY_NEWS] = "graphic/lobby_news.narc", + [NARC_INDEX_ARC__EMAIL_GRA] = "arc/email_gra.narc", + [NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL] = "resource/eng/wifi_lobby_minigame/wlmngm_tool.narc", + [NARC_INDEX_ARC__DEMO_TENGAN_GRA] = "arc/demo_tengan_gra.narc", + [NARC_INDEX_APPLICATION__BALLOON__GRAPHIC__BALLOON_GRA] = "application/balloon/graphic/balloon_gra.narc", + [NARC_INDEX_APPLICATION__WIFI_LOBBY__MAP_CONV__WFLBY_MAP] = "application/wifi_lobby/map_conv/wflby_map.narc", + [NARC_INDEX_GRAPHIC__WIFI_LOBBY] = "graphic/wifi_lobby.narc", + [NARC_INDEX_DATA__AREALIGHT] = "data/arealight.narc", + [NARC_INDEX_DATA__UGROUNDEFFECT] = "data/ugroundeffect.narc", + [NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR] = "battle/b_pl_tower/pl_btdtr.narc", + [NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDPM] = "battle/b_pl_tower/pl_btdpm.narc", + [NARC_INDEX_BATTLE__B_PL_STAGE__PL_BSDPM] = "battle/b_pl_stage/pl_bsdpm.narc", + [NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC] = "fielddata/tornworld/tw_arc.narc", + [NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC_ATTR] = "fielddata/tornworld/tw_arc_attr.narc", + [NARC_INDEX_DATA__TW_ARC_ETC] = "data/tw_arc_etc.narc", + [NARC_INDEX_RESOURCE__ENG__SCRATCH__SCRATCH] = "resource/eng/scratch/scratch.narc", + [NARC_INDEX_PARTICLEDATA__PL_POKELIST__POKELIST_PARTICLE] = "particledata/pl_pokelist/pokelist_particle.narc", + [NARC_INDEX_GRAPHIC__WIFI_LOBBY_OTHER] = "graphic/wifi_lobby_other.narc", + [NARC_INDEX_GRAPHIC__FOOTPRINT_BOARD] = "graphic/footprint_board.narc", + [NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_ENC_PLATINUM] = "application/zukanlist/zkn_data/zukan_enc_platinum.narc", + [NARC_INDEX_APPLICATION__BUCKET__BALLSLOW_DATA] = "application/bucket/ballslow_data.narc", + [NARC_INDEX_PARTICLEDATA__PL_ETC__PL_ETC_PARTICLE] = "particledata/pl_etc/pl_etc_particle.narc", + [NARC_INDEX_RESOURCE__ENG__PMS_AIKOTOBA__PMS_AIKOTOBA] = "resource/eng/pms_aikotoba/pms_aikotoba.narc", + [NARC_INDEX_GRAPHIC__UNIONOBJ2D_ONLYFRONT] = "graphic/unionobj2d_onlyfront.narc", + [NARC_INDEX_GRAPHIC__LIBRARY_TV] = "graphic/library_tv.narc", + [NARC_INDEX_APPLICATION__ZUKANLIST__ZKN_DATA__ZUKAN_DATA_GIRA] = "application/zukanlist/zkn_data/zukan_data_gira.narc", }; +// clang-format on -static void ReadFromNarcMemberByPathAndIndex(void * dest, const char * path, int memberIndex, int offset, int bytesToRead); -static void * AllocAndReadFromNarcMemberByPathAndIndex(const char * path, int memberIndex, int heapID, int offset, int bytesToRead, BOOL allocAtEnd); +static void ReadFromNarcMemberByPathAndIndex(void *dest, const char *path, int memberIndex, int offset, int bytesToRead); +static void *AllocAndReadFromNarcMemberByPathAndIndex(const char *path, int memberIndex, int heapID, int offset, int bytesToRead, BOOL allocAtEnd); -static void ReadFromNarcMemberByPathAndIndex (void * dest, const char * path, int memberIndex, int offset, int bytesToRead) +static void ReadFromNarcMemberByPathAndIndex(void *dest, const char *path, int memberIndex, int offset, int bytesToRead) { FSFile file; u32 btafStart = 0; @@ -254,7 +257,7 @@ static void ReadFromNarcMemberByPathAndIndex (void * dest, const char * path, in FS_CloseFile(&file); } -static void * AllocAndReadFromNarcMemberByPathAndIndex (const char * path, int memberIndex, int heapID, int offset, int bytesToRead, BOOL allocAtEnd) +static void *AllocAndReadFromNarcMemberByPathAndIndex(const char *path, int memberIndex, int heapID, int offset, int bytesToRead, BOOL allocAtEnd) { FSFile file; u32 btafStart = 0; @@ -263,7 +266,7 @@ static void * AllocAndReadFromNarcMemberByPathAndIndex (const char * path, int m u32 chunkSize = 0; u32 fileStart = 0; u32 fileEnd = 0; - void * dest; + void *dest; u16 fileCount = 0; FS_InitFile(&file); @@ -311,37 +314,37 @@ static void * AllocAndReadFromNarcMemberByPathAndIndex (const char * path, int m return dest; } -void NARC_ReadWholeMemberByIndexPair (void * dest, int narcIndex, int memberIndex) +void NARC_ReadWholeMemberByIndexPair(void *dest, int narcIndex, int memberIndex) { ReadFromNarcMemberByPathAndIndex(dest, sNarcPaths[narcIndex], memberIndex, 0, 0); } -void * NARC_AllocAndReadWholeMemberByIndexPair (int narcIndex, int memberIndex, int heapID) +void *NARC_AllocAndReadWholeMemberByIndexPair(int narcIndex, int memberIndex, int heapID) { return AllocAndReadFromNarcMemberByPathAndIndex(sNarcPaths[narcIndex], memberIndex, heapID, 0, 0, FALSE); } -void * NARC_AllocAtEndAndReadWholeMemberByIndexPair (int narcIndex, int memberIndex, int heapID) +void *NARC_AllocAtEndAndReadWholeMemberByIndexPair(int narcIndex, int memberIndex, int heapID) { return AllocAndReadFromNarcMemberByPathAndIndex(sNarcPaths[narcIndex], memberIndex, heapID, 0, 0, TRUE); } -void NARC_ReadFromMemberByIndexPair (void * dest, int narcIndex, int memberIndex, int offset, int bytesToRead) +void NARC_ReadFromMemberByIndexPair(void *dest, int narcIndex, int memberIndex, int offset, int bytesToRead) { ReadFromNarcMemberByPathAndIndex(dest, sNarcPaths[narcIndex], memberIndex, offset, bytesToRead); } -void * NARC_AllocAndReadFromMemberByIndexPair (int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead) +void *NARC_AllocAndReadFromMemberByIndexPair(int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead) { return AllocAndReadFromNarcMemberByPathAndIndex(sNarcPaths[narcIndex], memberIndex, heapID, offset, bytesToRead, FALSE); } -void * NARC_AllocAtEndAndReadFromMemberByIndexPair (int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead) +void *NARC_AllocAtEndAndReadFromMemberByIndexPair(int narcIndex, int memberIndex, int heapID, int offset, int bytesToRead) { return AllocAndReadFromNarcMemberByPathAndIndex(sNarcPaths[narcIndex], memberIndex, heapID, offset, bytesToRead, TRUE); } -u32 NARC_GetMemberSizeByIndexPair (int narcIndex, int memberIndex) +u32 NARC_GetMemberSizeByIndexPair(int narcIndex, int memberIndex) { FSFile file; u32 chunkSize = 0; @@ -380,18 +383,18 @@ u32 NARC_GetMemberSizeByIndexPair (int narcIndex, int memberIndex) chunkSize = fileEnd - fileStart; GF_ASSERT(chunkSize != 0); - // Bug: file is never closed! + // Bug: file is never closed! return chunkSize; } -NARC * NARC_ctor (u32 narcIndex, u32 heapID) +NARC *NARC_ctor(u32 narcIndex, u32 heapID) { - NARC * narc = Heap_AllocFromHeap(heapID, sizeof(NARC)); + NARC *narc = Heap_AllocFromHeap(heapID, sizeof(NARC)); if (narc) { u32 btnfStart; - u32 chunkSize; + u32 chunkSize; narc->unk_AC = 0; @@ -414,17 +417,17 @@ NARC * NARC_ctor (u32 narcIndex, u32 heapID) return narc; } -void NARC_dtor (NARC * param0) +void NARC_dtor(NARC *param0) { FS_CloseFile(&(param0->unk_00)); Heap_FreeToHeap(param0); } -void * NARC_AllocAndReadWholeMember (NARC * narc, u32 memberIndex, u32 heapID) +void *NARC_AllocAndReadWholeMember(NARC *narc, u32 memberIndex, u32 heapID) { u32 fileStart; - u32 fileEnd; - void * dest; + u32 fileEnd; + void *dest; GF_ASSERT(narc->unk_B4 > memberIndex); @@ -442,10 +445,10 @@ void * NARC_AllocAndReadWholeMember (NARC * narc, u32 memberIndex, u32 heapID) return dest; } -void NARC_ReadWholeMember (NARC * narc, u32 memberIndex, void * dest) +void NARC_ReadWholeMember(NARC *narc, u32 memberIndex, void *dest) { u32 fileStart; - u32 fileEnd; + u32 fileEnd; GF_ASSERT(narc->unk_B4 > memberIndex); @@ -456,10 +459,10 @@ void NARC_ReadWholeMember (NARC * narc, u32 memberIndex, void * dest) FS_ReadFile(&(narc->unk_00), dest, fileEnd - fileStart); } -u32 NARC_GetMemberSize (NARC * narc, u32 memberIndex) +u32 NARC_GetMemberSize(NARC *narc, u32 memberIndex) { u32 fileStart; - u32 fileEnd; + u32 fileEnd; GF_ASSERT(narc->unk_B4 > memberIndex); @@ -470,7 +473,7 @@ u32 NARC_GetMemberSize (NARC * narc, u32 memberIndex) return fileEnd - fileStart; } -void NARC_ReadFromMember (NARC * narc, u32 memberIndex, u32 offset, u32 bytesToRead, void * dest) +void NARC_ReadFromMember(NARC *narc, u32 memberIndex, u32 offset, u32 bytesToRead, void *dest) { u32 fileStart; @@ -482,17 +485,17 @@ void NARC_ReadFromMember (NARC * narc, u32 memberIndex, u32 offset, u32 bytesToR FS_ReadFile(&(narc->unk_00), dest, bytesToRead); } -void NARC_ReadFile (NARC * narc, u32 bytesToRead, void * dest) +void NARC_ReadFile(NARC *narc, u32 bytesToRead, void *dest) { FS_ReadFile(&(narc->unk_00), dest, bytesToRead); } -void sub_02006E28 (NARC * param0, u32 param1) +void sub_02006E28(NARC *param0, u32 param1) { FS_SeekFile(&(param0->unk_00), param1, FS_SEEK_CUR); } -u16 NARC_GetFileCount (NARC * narc) +u16 NARC_GetFileCount(NARC *narc) { return narc->unk_B4; } diff --git a/src/overlay001/ov1_021D0D80.c b/src/overlay001/ov1_021D0D80.c index 45f7f80401..f99db899d7 100644 --- a/src/overlay001/ov1_021D0D80.c +++ b/src/overlay001/ov1_021D0D80.c @@ -1,15 +1,15 @@ #include -#include #include +#include void include_unk_ov1_021D0DA0(void); -void include_unk_ov1_021D0DA0 (void) +void include_unk_ov1_021D0DA0(void) { static int unk_ov1_021D0DA0 = 0; } -static void NitroStaticInit (void) +static void NitroStaticInit(void) { static int v0 = 0; v0++; diff --git a/src/overlay004/ov4_021D0D80.c b/src/overlay004/ov4_021D0D80.c index e4c21c6866..598d3128a6 100644 --- a/src/overlay004/ov4_021D0D80.c +++ b/src/overlay004/ov4_021D0D80.c @@ -1,50 +1,50 @@ +#include "overlay004/ov4_021D0D80.h" + +#include #include +#include #include #include -#include -#include - -#include "savedata.h" #include "overlay004/funcptr_ov4_021D1104.h" #include "overlay004/funcptr_ov4_021D1120.h" #include "overlay004/funcptr_ov4_021D113C.h" #include "overlay004/funcptr_ov4_021D1150.h" +#include "overlay004/ov4_021D2808.h" +#include "communication_system.h" #include "heap.h" +#include "savedata.h" #include "unk_0202ACE0.h" #include "unk_0203061C.h" #include "unk_0203266C.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay004/ov4_021D2808.h" typedef struct { u8 unk_00[256]; - DWCFriendData * unk_100; + DWCFriendData *unk_100; DWCFriendsMatchControl unk_104; - DWCUserData * unk_F08; + DWCUserData *unk_F08; DWCInetControl unk_F0C; - SaveData * unk_F6C; - void * unk_F70; - void * unk_F74[4]; - void * unk_F84; + SaveData *unk_F6C; + void *unk_F70; + void *unk_F74[4]; + void *unk_F84; NNSFndHeapHandle unk_F88; - void * unk_F8C; + void *unk_F8C; NNSFndHeapHandle unk_F90; u32 unk_F94; UnkFuncPtr_ov4_021D1104 unk_F98; UnkFuncPtr_ov4_021D1104 unk_F9C; UnkFuncPtr_ov4_021D1120 unk_FA0; - void * unk_FA4; + void *unk_FA4; UnkFuncPtr_ov4_021D1150 unk_FA8; - void * unk_FAC; + void *unk_FAC; UnkFuncPtr_ov4_021D113C unk_FB0; - void (* unk_FB4)(int param0); + void (*unk_FB4)(int param0); u8 unk_FB8[128]; u8 unk_1038[32]; - void * unk_1058; + void *unk_1058; int unk_105C; u32 unk_1060; int unk_1064; @@ -78,16 +78,16 @@ typedef struct { u8 unk_10DA; } UnkStruct_ov4_0221A400; -static void ov4_021D1650(DWCError param0, int param1, void * param2); -static void ov4_021D171C(DWCError param0, BOOL param1, void * param2); -static void ov4_021D1740(int param0, u8 param1, const char * param2, void * param3); -static void ov4_021D1744(int param0, int param1, void * param2); -static void ov4_021D17A0(int param0, void * param1); -static void ov4_021D1898(DWCError param0, BOOL param1, void * param2); +static void ov4_021D1650(DWCError param0, int param1, void *param2); +static void ov4_021D171C(DWCError param0, BOOL param1, void *param2); +static void ov4_021D1740(int param0, u8 param1, const char *param2, void *param3); +static void ov4_021D1744(int param0, int param1, void *param2); +static void ov4_021D17A0(int param0, void *param1); +static void ov4_021D1898(DWCError param0, BOOL param1, void *param2); static void ov4_021D18F4(int param0, u8 param1); -static void ov4_021D1950(u8 param0, u8 * param1, int param2); -static void ov4_021D1A20(DWCError param0, BOOL param1, BOOL param2, u8 param3, int param4, void * param5); -static int ov4_021D18F0(int param0, void * param1); +static void ov4_021D1950(u8 param0, u8 *param1, int param2); +static void ov4_021D1A20(DWCError param0, BOOL param1, BOOL param2, u8 param3, int param4, void *param5); +static int ov4_021D18F0(int param0, void *param1); static int ov4_021D1D1C(void); static void ov4_021D16E8(u8 param0); static BOOL ov4_021D1C5C(void); @@ -95,15 +95,15 @@ static void ov4_021D2700(int param0); static void ov4_021D27CC(void); static void ov4_021D2748(int param0); static void ov4_021D21B4(void); -static void ov4_021D23A4(DWCError param0, BOOL param1, BOOL param2, BOOL param3, int param4, void * param5); -static void ov4_021D2488(DWCError param0, BOOL param1, BOOL param2, BOOL param3, int param4, void * param5); -static void ov4_021D24AC(int param0, void * param1); +static void ov4_021D23A4(DWCError param0, BOOL param1, BOOL param2, BOOL param3, int param4, void *param5); +static void ov4_021D2488(DWCError param0, BOOL param1, BOOL param2, BOOL param3, int param4, void *param5); +static void ov4_021D24AC(int param0, void *param1); -static UnkStruct_ov4_0221A400 * Unk_ov4_0221A400 = NULL; +static UnkStruct_ov4_0221A400 *Unk_ov4_0221A400 = NULL; -int ov4_021D0D80 (SaveData * param0, int param1, int param2, int param3) +int ov4_021D0D80(SaveData *param0, int param1, int param2, int param3) { - void * v0; + void *v0; GF_ASSERT(Unk_ov4_0221A400 == NULL); @@ -169,7 +169,7 @@ int ov4_021D0D80 (SaveData * param0, int param1, int param2, int param3) return 0; } -void ov4_021D0F68 () +void ov4_021D0F68() { if (Unk_ov4_0221A400) { ov4_021D27CC(); @@ -191,21 +191,19 @@ void ov4_021D0F68 () DWC_ClearError(); } -int ov4_021D0FEC () +int ov4_021D0FEC() { switch (Unk_ov4_0221A400->unk_1064) { - case 0: - { + case 0: { DWC_SetMemFunc(ov4_021D1AA0, ov4_021D1B04); DWC_InitInetEx(&Unk_ov4_0221A400->unk_F0C, 2, 1, 20); - DWC_SetAuthServer((DWC_CONNECTINET_AUTH_RELEASE)); + DWC_SetAuthServer(DWC_CONNECTINET_AUTH_RELEASE); DWC_ConnectInetAsync(); Unk_ov4_0221A400->unk_1064 = 1; Unk_ov4_0221A400->unk_1084 = 0; } - case 1: - { + case 1: { if (DWC_CheckInet()) { if (DWC_GetInetStatus() == DWC_CONNECTINET_STATE_CONNECTED) { Unk_ov4_0221A400->unk_1064 = 2; @@ -217,8 +215,7 @@ int ov4_021D0FEC () break; } } - case 2: - { + case 2: { int v0 = ov4_021D1B5C(); if (v0 != 0) { @@ -240,30 +237,30 @@ int ov4_021D0FEC () break; case 4: DWC_ProcessFriendsMatch(); - return (DWC_ERROR_NUM)+7; + return (DWC_ERROR_NUM) + 7; } return ov4_021D1B5C(); } -void ov4_021D1104 (UnkFuncPtr_ov4_021D1104 param0, UnkFuncPtr_ov4_021D1104 param1) +void ov4_021D1104(UnkFuncPtr_ov4_021D1104 param0, UnkFuncPtr_ov4_021D1104 param1) { Unk_ov4_0221A400->unk_F98 = param0; Unk_ov4_0221A400->unk_F9C = param1; } -void ov4_021D1120 (UnkFuncPtr_ov4_021D1120 param0, void * param1) +void ov4_021D1120(UnkFuncPtr_ov4_021D1120 param0, void *param1) { Unk_ov4_0221A400->unk_FA0 = param0; Unk_ov4_0221A400->unk_FA4 = param1; } -void ov4_021D113C (UnkFuncPtr_ov4_021D113C param0) +void ov4_021D113C(UnkFuncPtr_ov4_021D113C param0) { Unk_ov4_0221A400->unk_FB0 = param0; } -void ov4_021D1150 (UnkFuncPtr_ov4_021D1150 param0, void * param1) +void ov4_021D1150(UnkFuncPtr_ov4_021D1150 param0, void *param1) { Unk_ov4_0221A400->unk_FA8 = param0; Unk_ov4_0221A400->unk_FAC = param1; @@ -271,7 +268,7 @@ void ov4_021D1150 (UnkFuncPtr_ov4_021D1150 param0, void * param1) const static char Unk_ov4_02215870[] = "%s = \'%s\'"; -int ov4_021D116C (u8 * param0, int param1, BOOL param2, u32 param3) +int ov4_021D116C(u8 *param0, int param1, BOOL param2, u32 param3) { GF_ASSERT(Unk_ov4_0221A400 != NULL); @@ -283,7 +280,7 @@ int ov4_021D116C (u8 * param0, int param1, BOOL param2, u32 param3) { int v0; - DWCMatchOptMinComplete v1 = {1, 2, {0, 0}, 0}; + DWCMatchOptMinComplete v1 = { 1, 2, { 0, 0 }, 0 }; v1.timeout = param3 * 1000; v0 = DWC_SetMatchingOption(DWC_MATCH_OPTION_MIN_COMPLETE, &v1, sizeof(v1)); @@ -319,7 +316,7 @@ int ov4_021D116C (u8 * param0, int param1, BOOL param2, u32 param3) return 1; } -static void ov4_021D12B4 () +static void ov4_021D12B4() { if (Unk_ov4_0221A400->unk_1064 == 10) { Unk_ov4_0221A400->unk_1064 = 11; @@ -328,7 +325,7 @@ static void ov4_021D12B4 () } } -int ov4_021D12D4 (int param0) +int ov4_021D12D4(int param0) { switch (Unk_ov4_0221A400->unk_1064) { case 5: @@ -358,8 +355,7 @@ int ov4_021D12D4 (int param0) ov4_021D12B4(); } break; - case 7: - { + case 7: { if (!sub_0203272C(sub_0203895C())) { ov4_021D1E74(Unk_ov4_0221A400->unk_1078); } @@ -372,23 +368,22 @@ int ov4_021D12D4 (int param0) Unk_ov4_0221A400->unk_1064 = 8; return DWC_ERROR_NUM; - } - break; + } break; case 9: Unk_ov4_0221A400->unk_1064 = 4; Unk_ov4_0221A400->unk_106C = 0; Unk_ov4_0221A400->unk_108C = -1; - return (DWC_ERROR_NUM)+1; + return (DWC_ERROR_NUM) + 1; case 11: Unk_ov4_0221A400->unk_1064 = 4; Unk_ov4_0221A400->unk_106C = 0; Unk_ov4_0221A400->unk_108C = -1; - return (DWC_ERROR_NUM)+2; + return (DWC_ERROR_NUM) + 2; case 12: return ov4_021D1B5C(); case 16: if (Unk_ov4_0221A400->unk_1084 == 0) { - DWC_CloseAllConnectionsHard( ); + DWC_CloseAllConnectionsHard(); Unk_ov4_0221A400->unk_1064 = 17; break; } @@ -399,12 +394,12 @@ int ov4_021D12D4 (int param0) return ov4_021D1D1C(); } -BOOL ov4_021D1404 () +BOOL ov4_021D1404() { return (Unk_ov4_0221A400->unk_106C == 0) && ov4_021D1C5C(); } -int ov4_021D142C (void * param0, int param1) +int ov4_021D142C(void *param0, int param1) { if (!(param1 < 256)) { return 0; @@ -433,7 +428,7 @@ int ov4_021D142C (void * param0, int param1) } } -int ov4_021D14D4 (void * param0, int param1) +int ov4_021D14D4(void *param0, int param1) { if (!(param1 < 256)) { return 0; @@ -466,7 +461,7 @@ int ov4_021D14D4 (void * param0, int param1) return 1; } -int ov4_021D1590 (void * param0, int param1) +int ov4_021D1590(void *param0, int param1) { u16 v0; @@ -501,12 +496,12 @@ int ov4_021D1590 (void * param0, int param1) return 1; } -static void ov4_021D1650 (DWCError param0, int param1, void * param2) +static void ov4_021D1650(DWCError param0, int param1, void *param2) { BOOL v0; - if (DWC_CheckDirtyFlag((Unk_ov4_0221A400->unk_F08))) { - DWCUserData * v1 = NULL; + if (DWC_CheckDirtyFlag(Unk_ov4_0221A400->unk_F08)) { + DWCUserData *v1 = NULL; DWC_ClearDirtyFlag(Unk_ov4_0221A400->unk_F08); Unk_ov4_0221A400->unk_10DA = 1; @@ -526,16 +521,16 @@ static void ov4_021D1650 (DWCError param0, int param1, void * param2) } } -static void ov4_021D16E8 (u8 param0) +static void ov4_021D16E8(u8 param0) { if (Unk_ov4_0221A400->unk_109C) { - DWC_CloseAllConnectionsHard( ); + DWC_CloseAllConnectionsHard(); Unk_ov4_0221A400->unk_108C = -1; Unk_ov4_0221A400->unk_1064 = 18; } } -static void ov4_021D171C (DWCError param0, BOOL param1, void * param2) +static void ov4_021D171C(DWCError param0, BOOL param1, void *param2) { #pragma unused(param2) if (param0 == DWC_ERROR_NONE) { @@ -549,13 +544,13 @@ static void ov4_021D171C (DWCError param0, BOOL param1, void * param2) } } -static void ov4_021D1740 (int param0, u8 param1, const char * param2, void * param3) +static void ov4_021D1740(int param0, u8 param1, const char *param2, void *param3) { #pragma unused(param3) return; } -static void ov4_021D1744 (int param0, int param1, void * param2) +static void ov4_021D1744(int param0, int param1, void *param2) { #pragma unused(param2) @@ -565,18 +560,18 @@ static void ov4_021D1744 (int param0, int param1, void * param2) sub_020307F0(sub_0203068C(Unk_ov4_0221A400->unk_F6C), param0, param1); } -static void ov4_021D17A0 (int param0, void * param1) +static void ov4_021D17A0(int param0, void *param1) { #pragma unused(param1) return; } -static void ov4_021D17A4 (void) +static void ov4_021D17A4(void) { MI_CpuClear8(Unk_ov4_0221A400->unk_10A0, sizeof(Unk_ov4_0221A400->unk_10A0)); } -static void ov4_021D17C0 (void) +static void ov4_021D17C0(void) { int v0; @@ -600,7 +595,7 @@ static void ov4_021D17C0 (void) ov4_021D17A4(); } -static void ov4_021D1854 (int param0) +static void ov4_021D1854(int param0) { int v0, v1; @@ -615,7 +610,7 @@ static void ov4_021D1854 (int param0) ov4_021D17C0(); } -static void ov4_021D1898 (DWCError param0, BOOL param1, void * param2) +static void ov4_021D1898(DWCError param0, BOOL param1, void *param2) { #pragma unused(param2) @@ -634,20 +629,20 @@ static void ov4_021D1898 (DWCError param0, BOOL param1, void * param2) } } -static int ov4_021D18F0 (int param0, void * param1) +static int ov4_021D18F0(int param0, void *param1) { -#pragma unused(param0,param1) +#pragma unused(param0, param1) return 1; } -static void ov4_021D18F4 (int param0, u8 param1) +static void ov4_021D18F4(int param0, u8 param1) { #pragma unused(param0) Unk_ov4_0221A400->unk_106C = 0; Unk_ov4_0221A400->unk_10A0[param1] = 0; } -static void ov4_021D1918 (u32 param0) +static void ov4_021D1918(u32 param0) { if (!sub_0203272C(sub_0203895C())) { if (param0 & 0x100) { @@ -658,9 +653,9 @@ static void ov4_021D1918 (u32 param0) } } -static void ov4_021D1950 (u8 param0, u8 * param1, int param2) +static void ov4_021D1950(u8 param0, u8 *param1, int param2) { -#pragma unused( param0, param1, param2 ) +#pragma unused(param0, param1, param2) u32 v0; v0 = (param1[3] << 24) | (param1[2] << 16) | (param1[1] << 8) | param1[0]; @@ -680,7 +675,7 @@ static void ov4_021D1950 (u8 param0, u8 * param1, int param2) } { - u16 * v1 = (u16 *)ov4_021D1AA0(NULL, param2 - 4, 4); + u16 *v1 = (u16 *)ov4_021D1AA0(NULL, param2 - 4, 4); if (v1 == NULL) { return; @@ -702,7 +697,7 @@ static void ov4_021D1950 (u8 param0, u8 * param1, int param2) } } -static void ov4_021D1A20 (DWCError param0, BOOL param1, BOOL param2, u8 param3, int param4, void * param5) +static void ov4_021D1A20(DWCError param0, BOOL param1, BOOL param2, u8 param3, int param4, void *param5) { #pragma unused(param5, param4) @@ -711,7 +706,7 @@ static void ov4_021D1A20 (DWCError param0, BOOL param1, BOOL param2, u8 param3, Unk_ov4_0221A400->unk_1094 = 0; if (param0 == DWC_ERROR_NONE) { - if (((Unk_ov4_0221A400->unk_10D9 == 1) && (DWC_GetNumConnectionHost() == 1))) { + if ((Unk_ov4_0221A400->unk_10D9 == 1) && (DWC_GetNumConnectionHost() == 1)) { if (Unk_ov4_0221A400->unk_1064 == 6) { (void)0; } else { @@ -737,10 +732,10 @@ static void ov4_021D1A20 (DWCError param0, BOOL param1, BOOL param2, u8 param3, } } -void * ov4_021D1AA0 (DWCAllocType param0, u32 param1, int param2) +void *ov4_021D1AA0(DWCAllocType param0, u32 param1, int param2) { -#pragma unused( param0 ) - void * v0; +#pragma unused(param0) + void *v0; OSIntrMode v1; v1 = OS_DisableInterrupts(); @@ -764,9 +759,9 @@ void * ov4_021D1AA0 (DWCAllocType param0, u32 param1, int param2) return v0; } -void ov4_021D1B04 (DWCAllocType param0, void * param1, u32 param2) +void ov4_021D1B04(DWCAllocType param0, void *param1, u32 param2) { -#pragma unused( param0, param2 ) +#pragma unused(param0, param2) OSIntrMode v0; u16 v1; @@ -791,7 +786,7 @@ void ov4_021D1B04 (DWCAllocType param0, void * param1, u32 param2) OS_RestoreInterrupts(v0); } -int ov4_021D1B5C (void) +int ov4_021D1B5C(void) { int v0; DWCErrorType v1; @@ -831,12 +826,12 @@ int ov4_021D1B5C (void) case 18: case 16: case 17: - DWC_ShutdownFriendsMatch( ); + DWC_ShutdownFriendsMatch(); case 0: case 1: case 2: if (sub_0203895C() != 33) { - DWC_CleanupInet( ); + DWC_CleanupInet(); } } @@ -860,7 +855,7 @@ int ov4_021D1B5C (void) } if (Unk_ov4_0221A400->unk_10D2) { - v3 = ((DWC_ERROR_NUM)+6); + v3 = ((DWC_ERROR_NUM) + 6); } if (v2 != 0) { @@ -870,7 +865,7 @@ int ov4_021D1B5C (void) return v3; } -static BOOL ov4_021D1C5C (void) +static BOOL ov4_021D1C5C(void) { int v0; BOOL v1 = 0; @@ -892,7 +887,7 @@ static BOOL ov4_021D1C5C (void) return v1; } -static BOOL ov4_021D1CAC (int param0) +static BOOL ov4_021D1CAC(int param0) { if ((Unk_ov4_0221A400->unk_106C == 0) && ov4_021D1C5C() && (0xfffe & DWC_GetAIDBitmap())) { Unk_ov4_0221A400->unk_106C = 1; @@ -908,7 +903,7 @@ static BOOL ov4_021D1CAC (int param0) return 0; } -static int ov4_021D1D1C (void) +static int ov4_021D1D1C(void) { int v0, v1; @@ -940,11 +935,11 @@ static int ov4_021D1D1C (void) return v1; } - return (DWC_ERROR_NUM)+3; + return (DWC_ERROR_NUM) + 3; } if (Unk_ov4_0221A400->unk_1064 == 17) { - return (DWC_ERROR_NUM)+4; + return (DWC_ERROR_NUM) + 4; } if ((Unk_ov4_0221A400->unk_1064 == 7) || (Unk_ov4_0221A400->unk_1064 == 8)) { @@ -961,7 +956,7 @@ static int ov4_021D1D1C (void) return ov4_021D1B5C(); } -int ov4_021D1E30 () +int ov4_021D1E30() { if (Unk_ov4_0221A400) { if ((Unk_ov4_0221A400->unk_1064 == 7) || (Unk_ov4_0221A400->unk_1064 == 8) || (Unk_ov4_0221A400->unk_1064 == 16)) { @@ -972,12 +967,12 @@ int ov4_021D1E30 () return -1; } -static void ov4_021D1E60 () +static void ov4_021D1E60() { Unk_ov4_0221A400->unk_1084 = 0; } -void ov4_021D1E74 (int param0) +void ov4_021D1E74(int param0) { int v0; int v1 = 1; @@ -1025,7 +1020,7 @@ void ov4_021D1E74 (int param0) } } -void ov4_021D1F18 (void) +void ov4_021D1F18(void) { ov4_021D2F08(); @@ -1035,7 +1030,7 @@ void ov4_021D1F18 (void) } } -int ov4_021D1F3C (int param0, int param1) +int ov4_021D1F3C(int param0, int param1) { int v0 = param0 / 100; int v1 = param0 / 1000; @@ -1156,7 +1151,7 @@ int ov4_021D1F3C (int param0, int param1) return -1; } -int ov4_021D20B0 (int param0) +int ov4_021D20B0(int param0) { if (param0 == 0) { switch (Unk_ov4_0221A400->unk_1064) { @@ -1187,7 +1182,7 @@ int ov4_021D20B0 (int param0) return 0; } -int ov4_021D2134 () +int ov4_021D2134() { if ((Unk_ov4_0221A400->unk_1064 == 17) || (Unk_ov4_0221A400->unk_1064 == 18) || (Unk_ov4_0221A400->unk_1064 == 4)) { Unk_ov4_0221A400->unk_1064 = 4; @@ -1199,14 +1194,14 @@ int ov4_021D2134 () return 0; } -void ov4_021D2170 (void (* func)(int)) +void ov4_021D2170(void (*func)(int)) { if (Unk_ov4_0221A400) { Unk_ov4_0221A400->unk_FB4 = func; } } -void ov4_021D2184 (void) +void ov4_021D2184(void) { DWC_ShutdownFriendsMatch(); DWC_CleanupInet(); @@ -1215,13 +1210,13 @@ void ov4_021D2184 (void) ov4_021D0F68(); } -void ov4_021D2198 (void * param0, int param1) +void ov4_021D2198(void *param0, int param1) { Unk_ov4_0221A400->unk_1058 = param0; Unk_ov4_0221A400->unk_105C = param1; } -static void ov4_021D21B4 (void) +static void ov4_021D21B4(void) { int v0; @@ -1245,17 +1240,17 @@ static void ov4_021D21B4 (void) } } -BOOL ov4_021D222C (const void * param0, int param1) +BOOL ov4_021D222C(const void *param0, int param1) { return DWC_SetOwnStatusData(param0, param1); } -u8 ov4_021D2234 (int param0) +u8 ov4_021D2234(int param0) { return Unk_ov4_0221A400->unk_1038[param0]; } -int ov4_021D2248 (int param0, int param1, BOOL param2) +int ov4_021D2248(int param0, int param1, BOOL param2) { int v0, v1 = param1; @@ -1317,7 +1312,7 @@ int ov4_021D2248 (int param0, int param1, BOOL param2) return 0; } -int ov4_021D2388 () +int ov4_021D2388() { if (Unk_ov4_0221A400) { return Unk_ov4_0221A400->unk_1088; @@ -1326,7 +1321,7 @@ int ov4_021D2388 () return -1; } -static void ov4_021D23A4 (DWCError param0, BOOL param1, BOOL param2, BOOL param3, int param4, void * param5) +static void ov4_021D23A4(DWCError param0, BOOL param1, BOOL param2, BOOL param3, int param4, void *param5) { #pragma unused(param3, param5) BOOL v0 = 0; @@ -1380,7 +1375,7 @@ static void ov4_021D23A4 (DWCError param0, BOOL param1, BOOL param2, BOOL param3 } } -static void ov4_021D2488 (DWCError param0, BOOL param1, BOOL param2, BOOL param3, int param4, void * param5) +static void ov4_021D2488(DWCError param0, BOOL param1, BOOL param2, BOOL param3, int param4, void *param5) { #pragma unused(param5) Unk_ov4_0221A400->unk_1094 = 0; @@ -1408,7 +1403,7 @@ static void ov4_021D2488 (DWCError param0, BOOL param1, BOOL param2, BOOL param3 } } -static void ov4_021D24AC (int param0, void * param1) +static void ov4_021D24AC(int param0, void *param1) { #pragma unused(param1) @@ -1425,13 +1420,13 @@ static void ov4_021D24AC (int param0, void * param1) } } -void ov4_021D24D8 () +void ov4_021D24D8() { int v0; if (!DWC_CheckHasProfile(Unk_ov4_0221A400->unk_F08)) { DWCFriendData v1; - u32 * v2; + u32 *v2; DWC_CreateExchangeToken(Unk_ov4_0221A400->unk_F08, &v1); v2 = (u32 *)&v1; @@ -1443,7 +1438,7 @@ void ov4_021D24D8 () for (v0 = 0; v0 < 32; v0++) { int v4 = DWC_GetFriendDataType(&(Unk_ov4_0221A400->unk_100[v0])); - u32 * v5 = (u32 *)(&Unk_ov4_0221A400->unk_100[v0]); + u32 *v5 = (u32 *)(&Unk_ov4_0221A400->unk_100[v0]); switch (v4) { case DWC_FRIENDDATA_LOGIN_ID: @@ -1463,12 +1458,12 @@ void ov4_021D24D8 () } } -BOOL ov4_021D2544 (void) +BOOL ov4_021D2544(void) { return ov4_021D2F7C(); } -BOOL ov4_021D254C (void) +BOOL ov4_021D254C(void) { if (Unk_ov4_0221A400) { return Unk_ov4_0221A400->unk_1090; @@ -1477,7 +1472,7 @@ BOOL ov4_021D254C (void) return 0; } -BOOL ov4_021D2568 (void) +BOOL ov4_021D2568(void) { if (Unk_ov4_0221A400) { return Unk_ov4_0221A400->unk_108C; @@ -1486,12 +1481,12 @@ BOOL ov4_021D2568 (void) return 0; } -void ov4_021D2584 (BOOL param0) +void ov4_021D2584(BOOL param0) { Unk_ov4_0221A400->unk_1090 = param0; } -static void sendPacket () +static void sendPacket() { int v0; @@ -1504,17 +1499,17 @@ static void sendPacket () } } -void ov4_021D2598 (BOOL param0) +void ov4_021D2598(BOOL param0) { Unk_ov4_0221A400->unk_10CA = param0; } -static void ov4_021D25AC (void * param0) +static void ov4_021D25AC(void *param0) { Unk_ov4_0221A400->unk_10D4 = 2; } -int ov4_021D25C0 (void) +int ov4_021D25C0(void) { if (Unk_ov4_0221A400->unk_10D4 == 0) { Unk_ov4_0221A400->unk_10D4 = 1; @@ -1524,17 +1519,17 @@ int ov4_021D25C0 (void) return Unk_ov4_0221A400->unk_10D4 == 2; } -void ov4_021D25FC (void) +void ov4_021D25FC(void) { Unk_ov4_0221A400->unk_10D4 = 0; } -int ov4_021D2610 (void) +int ov4_021D2610(void) { return DWC_GetNumConnectionHost(); } -void ov4_021D2618 (BOOL param0, int param1) +void ov4_021D2618(BOOL param0, int param1) { if (param0) { Unk_ov4_0221A400->unk_107C = 11; @@ -1562,12 +1557,12 @@ void ov4_021D2618 (BOOL param0, int param1) } } -void ov4_021D26EC (BOOL param0) +void ov4_021D26EC(BOOL param0) { Unk_ov4_0221A400->unk_10D9 = param0; } -void ov4_021D2700 (int param0) +void ov4_021D2700(int param0) { if (Unk_ov4_0221A400->unk_F74[param0] != NULL) { if (Unk_ov4_0221A400->unk_10D5[param0] == 1) { @@ -1580,7 +1575,7 @@ void ov4_021D2700 (int param0) } } -void ov4_021D2748 (int param0) +void ov4_021D2748(int param0) { ov4_021D2700(param0); @@ -1597,7 +1592,7 @@ void ov4_021D2748 (int param0) } } -void ov4_021D27CC (void) +void ov4_021D27CC(void) { int v0; @@ -1606,12 +1601,12 @@ void ov4_021D27CC (void) } } -u8 ov4_021D27E0 (void) +u8 ov4_021D27E0(void) { return Unk_ov4_0221A400->unk_10DA; } -void ov4_021D27F4 (void) +void ov4_021D27F4(void) { Unk_ov4_0221A400->unk_10DA = 0; } diff --git a/src/overlay004/ov4_021D2808.c b/src/overlay004/ov4_021D2808.c index b878b4fa6a..5e0bc18640 100644 --- a/src/overlay004/ov4_021D2808.c +++ b/src/overlay004/ov4_021D2808.c @@ -1,22 +1,24 @@ +#include "overlay004/ov4_021D2808.h" + +#include #include #include #include -#include + +#include "overlay004/ov4_021D0D80.h" #include "heap.h" #include "unk_0203266C.h" #include "unk_020366A0.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay004/ov4_021D2808.h" typedef struct { u8 unk_00[2176]; - void * unk_880; - u8 * unk_884; - u8 * unk_888; + void *unk_880; + u8 *unk_884; + u8 *unk_888; u8 unk_88C[2176]; u8 unk_110C[2176]; - void (* unk_198C)(void); + void (*unk_198C)(void); VCTSession unk_1990[3]; BOOL unk_19D8[4]; int unk_19E8; @@ -24,7 +26,7 @@ typedef struct { int unk_19F0; int unk_19F4; struct NNSSndStrm unk_19F8; - VCTSession * unk_1A54; + VCTSession *unk_1A54; u8 unk_1A58; u8 unk_1A59; u16 unk_1A5A; @@ -39,13 +41,13 @@ typedef struct { } UnkStruct_ov4_0221A408; static void ov4_021D2E8C(void); -static void ov4_021D2B04(VCTSession * param0); +static void ov4_021D2B04(VCTSession *param0); -static UnkStruct_ov4_0221A408 * Unk_ov4_0221A408 = NULL; +static UnkStruct_ov4_0221A408 *Unk_ov4_0221A408 = NULL; static OSTick Unk_ov4_0221A40C; static int Unk_ov4_0221A404 = 0; -static void ov4_021D2808 (void) +static void ov4_021D2808(void) { MIC_Init(); PM_Init(); @@ -101,20 +103,20 @@ static void ov4_021D2808 (void) VCT_EnableEchoCancel(1); } -static void ov4_021D28B0 (MICResult param0, void * param1) +static void ov4_021D28B0(MICResult param0, void *param1) { #pragma unused(param0, param1) return; } -static void ov4_021D28B4 (NNSSndStrmCallbackStatus param0, int param1, void * param2[], u32 param3, NNSSndStrmFormat param4, void * param5) +static void ov4_021D28B4(NNSSndStrmCallbackStatus param0, int param1, void *param2[], u32 param3, NNSSndStrmFormat param4, void *param5) { #pragma unused(param4) OSTick v0; - const void * v1; + const void *v1; u32 v2; - u8 * v3; + u8 *v3; u32 v4; v3 = (u8 *)param5; @@ -159,10 +161,10 @@ static void ov4_021D28B4 (NNSSndStrmCallbackStatus param0, int param1, void * pa return; } -static int ov4_021D2974 (u8 param0) +static int ov4_021D2974(u8 param0) { BOOL v0; - VCTSession * v1; + VCTSession *v1; if (Unk_ov4_0221A408->unk_1A54 == NULL) { v1 = VCT_CreateSession(param0); @@ -188,7 +190,7 @@ static int ov4_021D2974 (u8 param0) return 1; } -static int ov4_021D29C8 (u8 param0) +static int ov4_021D29C8(u8 param0) { BOOL v0; @@ -211,7 +213,7 @@ static int ov4_021D29C8 (u8 param0) return 0; } -static void ov4_021D2A10 (u8 param0, VCTEvent param1, VCTSession * param2, void * param3) +static void ov4_021D2A10(u8 param0, VCTEvent param1, VCTSession *param2, void *param3) { #pragma unused(param0, param3) @@ -230,7 +232,7 @@ static void ov4_021D2A10 (u8 param0, VCTEvent param1, VCTSession * param2, void } } -static void ov4_021D2A38 (u8 param0, VCTEvent param1, VCTSession * param2, void * param3) +static void ov4_021D2A38(u8 param0, VCTEvent param1, VCTSession *param2, void *param3) { #pragma unused(param0, param3) @@ -294,14 +296,14 @@ static void ov4_021D2A38 (u8 param0, VCTEvent param1, VCTSession * param2, void } } -static void ov4_021D2B04 (VCTSession * param0) +static void ov4_021D2B04(VCTSession *param0) { VCT_StopStreaming(param0); VCT_DeleteSession(param0); Unk_ov4_0221A408->unk_1A54 = NULL; } -void ov4_021D2B28 (void) +void ov4_021D2B28(void) { OSTick v0; @@ -342,8 +344,7 @@ void ov4_021D2B28 (void) if (Unk_ov4_0221A408->unk_19E8 != VCT_MODE_CONFERENCE) { switch (Unk_ov4_0221A408->unk_19EC) { - case 0: - { + case 0: { if (ov4_021D1E30() == 0) { if (ov4_021D2974(1)) { Unk_ov4_0221A408->unk_19EC = 1; @@ -369,7 +370,7 @@ void ov4_021D2B28 (void) } } -BOOL ov4_021D2C70 (int param0, void * param1, int param2) +BOOL ov4_021D2C70(int param0, void *param1, int param2) { if (Unk_ov4_0221A408 == NULL) { return 0; @@ -382,22 +383,22 @@ BOOL ov4_021D2C70 (int param0, void * param1, int param2) return 0; } -static void ov4_021D2C98 (void ** param0, void ** param1, int param2, int param3) +static void ov4_021D2C98(void **param0, void **param1, int param2, int param3) { *param0 = Heap_AllocFromHeap(param3, param2 + 32); MI_CpuClear8(*param0, param2 + 32); - *param1 = (UnkStruct_ov4_0221A408 *)(((u32) * param0 + 31) / 32 * 32); + *param1 = (UnkStruct_ov4_0221A408 *)(((u32)*param0 + 31) / 32 * 32); } -void ov4_021D2CC0 (int param0, int param1, int param2) +void ov4_021D2CC0(int param0, int param1, int param2) { - u8 v0[3] = {13, 13, 13}; + u8 v0[3] = { 13, 13, 13 }; u32 v1; BOOL v2; int v3; if (Unk_ov4_0221A408 == NULL) { - void * v4 = NULL; + void *v4 = NULL; ov4_021D2C98(&v4, (void **)&Unk_ov4_0221A408, sizeof(UnkStruct_ov4_0221A408), param0); Unk_ov4_0221A408->unk_880 = v4; @@ -445,7 +446,7 @@ void ov4_021D2CC0 (int param0, int param1, int param2) v5.numSession = param2; v5.aid = DWC_GetMyAID(); - GF_ASSERT((v5.aid != -1)); + GF_ASSERT(v5.aid != -1); if (Unk_ov4_0221A408->unk_19E8 == VCT_MODE_CONFERENCE) { v5.callback = ov4_021D2A10; @@ -471,12 +472,12 @@ void ov4_021D2CC0 (int param0, int param1, int param2) return; } -static void ov4_021D2E8C (void) +static void ov4_021D2E8C(void) { NNS_SndStrmStart(&Unk_ov4_0221A408->unk_19F8); } -void ov4_021D2EA4 (void) +void ov4_021D2EA4(void) { int v0; @@ -504,14 +505,14 @@ void ov4_021D2EA4 (void) return; } -void ov4_021D2EF4 (void (* func)()) +void ov4_021D2EF4(void (*func)()) { Unk_ov4_0221A408->unk_198C = func; } -void ov4_021D2F08 (void) +void ov4_021D2F08(void) { - void (* v0)(void); + void (*v0)(void); if (Unk_ov4_0221A408 != NULL) { v0 = Unk_ov4_0221A408->unk_198C; @@ -532,7 +533,7 @@ void ov4_021D2F08 (void) } } -BOOL ov4_021D2F7C (void) +BOOL ov4_021D2F7C(void) { if (Unk_ov4_0221A408) { VCTVADInfo v0; @@ -547,17 +548,17 @@ BOOL ov4_021D2F7C (void) return 0; } -void ov4_021D2FA4 (void) +void ov4_021D2FA4(void) { Unk_ov4_0221A408->unk_19F0 = 1; } -void ov4_021D2FB8 (void) +void ov4_021D2FB8(void) { Unk_ov4_0221A408->unk_19F0 = 0; } -BOOL ov4_021D2FCC (int param0, int param1) +BOOL ov4_021D2FCC(int param0, int param1) { int v0, v1; diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c index a9531654ce..77585d0bf5 100644 --- a/src/overlay005/encounter_effect.c +++ b/src/overlay005/encounter_effect.c @@ -1,24 +1,27 @@ +#include "overlay005/encounter_effect.h" + +#include "nitro/fx/fx.h" #include #include #include "constants/battle.h" - #include "constants/heap.h" -#include "nitro/fx/fx.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "pokemon.h" +#include "struct_defs/struct_0205AA50.h" +#include "struct_defs/struct_02099F80.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_0205AA50.h" -#include "struct_defs/struct_02099F80.h" #include "overlay005/encounter_effect.h" -#include "overlay005/linear_interpolation_task_s32.h" +#include "overlay005/encounter_effect_core.h" +#include "overlay005/hblank_system.h" #include "overlay005/linear_interpolation_task_fx32.h" +#include "overlay005/linear_interpolation_task_s32.h" +#include "overlay005/ov5_021D0D80.h" #include "overlay005/quadratic_interpolation_task_fx32.h" #include "overlay005/struct_ov5_021DDF24.h" #include "overlay005/struct_ov5_021DE47C.h" @@ -29,28 +32,24 @@ #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "camera.h" +#include "enc_effects.h" +#include "gx_layers.h" +#include "heap.h" +#include "narc.h" +#include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_0200679C.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "sys_task.h" #include "unk_02014000.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_020218BC.h" #include "unk_02054884.h" -#include "pokemon.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay005/encounter_effect.h" -#include "overlay005/encounter_effect_core.h" -#include "overlay005/hblank_system.h" -#include "enc_effects.h" enum ScreenFlashState { SCREENFLASH_STATE_INIT_OTHER_SCREEN_FADE = 0, @@ -94,7 +93,6 @@ typedef struct UnkStruct_ov5_02202120 { u32 unk_14; } UnkStruct_ov5_02202120; - static void ov5_021DE89C(Window *param0, s32 param1, s32 param2, s32 param3, s32 param4, u8 param5); static void ov5_021DEB04(Window *param0, u16 param1, u16 param2, u8 param3); static void BrightnessFadeTask_SetBrightness(SysTask *task, void *param); @@ -175,14 +173,14 @@ static const u8 Unk_ov5_021F9988[8] = { }; static const u16 Unk_ov5_021F9A2C[8][2] = { - {0x0, 0x17}, - {0x2D, 0x16}, - {0x2D, 0x44}, - {0x5A, 0x43}, - {0x5B, 0x71}, - {0x87, 0x70}, - {0x87, 0x9E}, - {0xB4, 0x9D} + { 0x0, 0x17 }, + { 0x2D, 0x16 }, + { 0x2D, 0x44 }, + { 0x5A, 0x43 }, + { 0x5B, 0x71 }, + { 0x87, 0x70 }, + { 0x87, 0x9E }, + { 0xB4, 0x9D } }; static UnkStruct_ov5_02202120 *Unk_ov5_02202120 = NULL; @@ -382,8 +380,8 @@ BOOL QuadraticInterpolationTaskFX32_Update(QuadraticInterpolationTaskFX32 *task) void BrightnessFadeTask_ApplyBrightnessToScreen(enum Screen screen, int brightness) { - screen == SCREEN_TOP - ? GX_SetMasterBrightness(brightness) + screen == SCREEN_TOP + ? GX_SetMasterBrightness(brightness) : GXS_SetMasterBrightness(brightness); } @@ -723,7 +721,7 @@ void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4, void *v0; NNSG2dScreenData *v1; - sub_02007130(param0, param3, 0, param4 *32, param5 *32, 4); + sub_02007130(param0, param3, 0, param4 * 32, param5 * 32, 4); sub_020070E8(param0, param2, param6, param7, 0, 0, 0, 4); v0 = sub_020071D0(param0, param1, 0, &v1, 4); @@ -820,7 +818,7 @@ GraphicElementData *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_0 VecFx32 VecFx32_FromXYZ(fx32 x, fx32 y, fx32 z) { - return (VecFx32){ x, y, z }; + return (VecFx32) { x, y, z }; } static void ov5_021DE67C(GraphicElementData *param0, void *param1, u32 param2) @@ -1025,9 +1023,9 @@ BOOL ov5_021DE988(UnkStruct_ov5_021DE928 *param0) param0->unk_C8 = param0->unk_C7; v0 = Unk_ov5_021F9988[param0->unk_C4 % 8]; - v0 = (32 / 2) + (v0 *32); - v1 = -16 - ((param0->unk_C4 / 8) *32); - v2 = (192 + -16) - ((param0->unk_C4 / 8) *32); + v0 = (32 / 2) + (v0 * 32); + v1 = -16 - ((param0->unk_C4 / 8) * 32); + v2 = (192 + -16) - ((param0->unk_C4 / 8) * 32); ov5_021DE7A4(param0->unk_04[param0->unk_C4], v0, v0, v1, v2, param0->unk_C6, param0->unk_00, 32, 32, param0->unk_C9); param0->unk_C4++; @@ -1113,8 +1111,8 @@ static void ov5_021DEB04(Window *param0, u16 param1, u16 param2, u8 param3) for (v5 = 0; v5 < 96; v5++) { v6 = 95 - v5; - v0 = FX_Mul(v7, v6 *FX32_ONE) >> FX32_SHIFT; - v1 = FX_Mul(v8, v6 *FX32_ONE) >> FX32_SHIFT; + v0 = FX_Mul(v7, v6 * FX32_ONE) >> FX32_SHIFT; + v1 = FX_Mul(v8, v6 * FX32_ONE) >> FX32_SHIFT; v3 = 128 + v0; v4 = 128 + v1; v0 = 128 - v0; @@ -1168,7 +1166,7 @@ void ov5_021DEC38(UnkStruct_ov5_021DEC18 *param0, u8 param1, Window *param2, u8 int v0; for (v0 = 0; v0 < 8; v0++) { - ov5_021DEAA0(param0->unk_00[v0], param1, ((Unk_ov5_021F9A2C[v0][0] *0xffff) / 360), ((Unk_ov5_021F9A2C[v0][1] *0xffff) / 360), param2, param3); + ov5_021DEAA0(param0->unk_00[v0], param1, ((Unk_ov5_021F9A2C[v0][0] * 0xffff) / 360), ((Unk_ov5_021F9A2C[v0][1] * 0xffff) / 360), param2, param3); } param0->unk_20 = 1; @@ -1232,7 +1230,7 @@ void ov5_021DED20(EncounterEffect *param0, UnkStruct_ov5_021DED04 *param1, u32 p for (v0 = 0; v0 < 192; v0++) { v1 = v0 % param3; - v2 = v1 *param4; + v2 = v1 * param4; v2 = v2 / param3; if (((v0 / param3) % 2) == 0) { @@ -1320,9 +1318,9 @@ u32 CutInEffects_ForBattle(const BattleParams *param0) if (param0->battleType & BATTLE_TYPE_TRAINER) { v2 = 1; - // Implicitly, this must be a wild battle + // Implicitly, this must be a wild battle } else if ((param0->battleType & BATTLE_TYPE_SPECIAL_WILD) - || (param0->battleType == BATTLE_TYPE_SINGLES)) { + || (param0->battleType == BATTLE_TYPE_SINGLES)) { v2 = 0; } else { GF_ASSERT(0); @@ -1347,13 +1345,13 @@ u32 CutInEffects_ForBattle(const BattleParams *param0) case 11: case 9: case 24: - v1 = 0 *2; + v1 = 0 * 2; break; case 7: - v1 = 1 *2; + v1 = 1 * 2; break; case 5: - v1 = 2 *2; + v1 = 2 * 2; break; } @@ -1361,7 +1359,7 @@ u32 CutInEffects_ForBattle(const BattleParams *param0) v1++; } - return (v2 *6) + v1; + return (v2 * 6) + v1; } static void ov5_021DEF74(SysTask *param0, void *param1) @@ -1450,7 +1448,7 @@ void ov5_021DF0CC(NARC *param0, u32 param1) sub_02014788(Unk_ov5_02202120->unk_08, 1); v1 = sub_02014784(Unk_ov5_02202120->unk_08); - Camera_SetClipping(FX32_ONE, FX32_ONE *900, v1); + Camera_SetClipping(FX32_ONE, FX32_ONE * 900, v1); v0 = sub_0200723C(param0, param1, 0, 4, 0); sub_020144CC(Unk_ov5_02202120->unk_08, v0, 0 | 0, 0); @@ -1459,7 +1457,7 @@ void ov5_021DF0CC(NARC *param0, u32 param1) void ov5_021DF17C(u32 param0) { int v0; - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; GF_ASSERT(Unk_ov5_02202120); GF_ASSERT(Unk_ov5_02202120->unk_08); @@ -1534,8 +1532,8 @@ static void ov5_021DF28C(SysTask *param0, void *param1) sub_02014000(); { - VecFx32 v1 = {0}; - VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE}; + VecFx32 v1 = { 0 }; + VecFx32 v2 = { FX32_ONE, FX32_ONE, FX32_ONE }; MtxFx33 v3; MTX_Identity33(&v3); diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c index 316e5cfa3a..be99b663c0 100644 --- a/src/overlay005/encounter_effect_core.c +++ b/src/overlay005/encounter_effect_core.c @@ -1,22 +1,21 @@ +#include "overlay005/encounter_effect_core.h" + #include #include #include "constants/heap.h" #include "constants/trainer.h" -#include "message.h" -#include "sys_task_manager.h" + #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "overlay005/encounter_effect.h" -#include "overlay005/field_motion_blur.h" +#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_0205AA50.h" #include "overlay005/encounter_effect.h" -#include "overlay005/linear_interpolation_task_s32.h" +#include "overlay005/field_motion_blur.h" +#include "overlay005/hblank_system.h" #include "overlay005/linear_interpolation_task_fx32.h" +#include "overlay005/linear_interpolation_task_s32.h" #include "overlay005/quadratic_interpolation_task_fx32.h" #include "overlay005/struct_ov5_021DE47C.h" #include "overlay005/struct_ov5_021DE5A4.h" @@ -24,70 +23,67 @@ #include "overlay005/struct_ov5_021E52A8_sub2.h" #include "overlay115/camera_angle.h" -#include "unk_02006E3C.h" -#include "unk_0200A9DC.h" +#include "camera.h" +#include "gx_layers.h" +#include "heap.h" #include "message.h" +#include "screen_scroll_manager.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" +#include "unk_02006E3C.h" +#include "unk_0200A9DC.h" #include "unk_0200F174.h" -#include "screen_scroll_manager.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "overlay005/encounter_effect.h" -#include "overlay005/field_motion_blur.h" -#include "overlay005/encounter_effect_core.h" -#include "overlay005/hblank_system.h" // EncounterEffect_Grass_HigherLevel -#define GRASS_HIGHER_LEVEL_PIXELS_PER_SLICE 2 -#define GRASS_HIGHER_LEVEL_INTERPOLATION_FRAMES 6 -#define GRASS_HIGHER_LEVEL_SLICE_START_X_1 0 -#define GRASS_HIGHER_LEVEL_SLICE_END_X_1 (FX32_ONE * -3) -#define GRASS_HIGHER_LEVEL_SLICE_START_SPEED_1 (FX32_ONE * -12) -#define GRASS_HIGHER_LEVEL_CAMERA_OFFSET_1 (FX32_ONE * 50) -#define GRASS_HIGHER_LEVEL_CAMERA_SPEED_1 (FX32_ONE * 30) -#define GRASS_HIGHER_LEVEL_SLICE_START_X_2 (FX32_ONE * -3) -#define GRASS_HIGHER_LEVEL_SLICE_END_X_2 (FX32_ONE * 255) -#define GRASS_HIGHER_LEVEL_SLICE_START_SPEED_2 (FX32_ONE * 30) -#define GRASS_HIGHER_LEVEL_CAMERA_OFFSET_2 (FX32_ONE * -50) -#define GRASS_HIGHER_LEVEL_CAMERA_SPEED_2 (FX32_ONE * -255) +#define GRASS_HIGHER_LEVEL_PIXELS_PER_SLICE 2 +#define GRASS_HIGHER_LEVEL_INTERPOLATION_FRAMES 6 +#define GRASS_HIGHER_LEVEL_SLICE_START_X_1 0 +#define GRASS_HIGHER_LEVEL_SLICE_END_X_1 (FX32_ONE * -3) +#define GRASS_HIGHER_LEVEL_SLICE_START_SPEED_1 (FX32_ONE * -12) +#define GRASS_HIGHER_LEVEL_CAMERA_OFFSET_1 (FX32_ONE * 50) +#define GRASS_HIGHER_LEVEL_CAMERA_SPEED_1 (FX32_ONE * 30) +#define GRASS_HIGHER_LEVEL_SLICE_START_X_2 (FX32_ONE * -3) +#define GRASS_HIGHER_LEVEL_SLICE_END_X_2 (FX32_ONE * 255) +#define GRASS_HIGHER_LEVEL_SLICE_START_SPEED_2 (FX32_ONE * 30) +#define GRASS_HIGHER_LEVEL_CAMERA_OFFSET_2 (FX32_ONE * -50) +#define GRASS_HIGHER_LEVEL_CAMERA_SPEED_2 (FX32_ONE * -255) // EncounterEffect_Grass_LowerLevel -#define GRASS_LOWER_LEVEL_PIXELS_PER_SLICE 5 -#define GRASS_LOWER_LEVEL_INTERPOLATION_FRAMES 6 -#define GRASS_LOWER_LEVEL_SLICE_START_X_1 0 -#define GRASS_LOWER_LEVEL_SLICE_END_X_1 (FX32_ONE * -2) -#define GRASS_LOWER_LEVEL_SLICE_START_SPEED_1 (FX32_ONE * -12) -#define GRASS_LOWER_LEVEL_CAMERA_OFFSET_1 (FX32_ONE * 50) -#define GRASS_LOWER_LEVEL_CAMERA_SPEED_1 (FX32_ONE * 30) -#define GRASS_LOWER_LEVEL_SLICE_START_X_2 (FX32_ONE * -2) -#define GRASS_LOWER_LEVEL_SLICE_END_X_2 (FX32_ONE * 255) -#define GRASS_LOWER_LEVEL_SLICE_START_SPEED_2 (FX32_ONE * 30) -#define GRASS_LOWER_LEVEL_CAMERA_OFFSET_2 (FX32_ONE * -30) -#define GRASS_LOWER_LEVEL_CAMERA_SPEED_2 (FX32_ONE * -100) +#define GRASS_LOWER_LEVEL_PIXELS_PER_SLICE 5 +#define GRASS_LOWER_LEVEL_INTERPOLATION_FRAMES 6 +#define GRASS_LOWER_LEVEL_SLICE_START_X_1 0 +#define GRASS_LOWER_LEVEL_SLICE_END_X_1 (FX32_ONE * -2) +#define GRASS_LOWER_LEVEL_SLICE_START_SPEED_1 (FX32_ONE * -12) +#define GRASS_LOWER_LEVEL_CAMERA_OFFSET_1 (FX32_ONE * 50) +#define GRASS_LOWER_LEVEL_CAMERA_SPEED_1 (FX32_ONE * 30) +#define GRASS_LOWER_LEVEL_SLICE_START_X_2 (FX32_ONE * -2) +#define GRASS_LOWER_LEVEL_SLICE_END_X_2 (FX32_ONE * 255) +#define GRASS_LOWER_LEVEL_SLICE_START_SPEED_2 (FX32_ONE * 30) +#define GRASS_LOWER_LEVEL_CAMERA_OFFSET_2 (FX32_ONE * -30) +#define GRASS_LOWER_LEVEL_CAMERA_SPEED_2 (FX32_ONE * -100) // EncounterEffect_Cave_LowerLevel -#define CAVE_LOWER_LEVEL_INTERPOLATION_FRAMES 12 -#define CAVE_LOWER_LEVEL_CAMERA_OFFSET (FX32_ONE * -400) -#define CAVE_LOWER_LEVEL_CAMERA_SPEED (FX32_ONE * -2) +#define CAVE_LOWER_LEVEL_INTERPOLATION_FRAMES 12 +#define CAVE_LOWER_LEVEL_CAMERA_OFFSET (FX32_ONE * -400) +#define CAVE_LOWER_LEVEL_CAMERA_SPEED (FX32_ONE * -2) // EncounterEffect_Cave_HigherLevel -#define CAVE_HIGHER_LEVEL_INTERPOLATION_FRAMES 12 -#define CAVE_HIGHER_LEVEL_CAMERA_OFFSET (FX32_ONE * -800) -#define CAVE_HIGHER_LEVEL_CAMERA_SPEED (FX32_ONE * -5) +#define CAVE_HIGHER_LEVEL_INTERPOLATION_FRAMES 12 +#define CAVE_HIGHER_LEVEL_CAMERA_OFFSET (FX32_ONE * -800) +#define CAVE_HIGHER_LEVEL_CAMERA_SPEED (FX32_ONE * -5) typedef struct GrassEncounterEffect { - Camera * camera; + Camera *camera; QuadraticInterpolationTaskFX32 camDistanceTask; - ScreenSliceEffect * screenSliceEfx; + ScreenSliceEffect *screenSliceEfx; } GrassEncounterEffect; typedef struct ScreenShakeEffect { @@ -102,11 +98,11 @@ typedef struct WaterEncounterEffect { } WaterEncounterEffect; typedef struct CaveEncounterEffect { - Camera * camera; + Camera *camera; QuadraticInterpolationTaskFX32 camInterpolation; } CaveEncounterEffect; -static SysTask * ScreenShakeEffect_CreateDMATransferTask(ScreenShakeEffect *screenShake); +static SysTask *ScreenShakeEffect_CreateDMATransferTask(ScreenShakeEffect *screenShake); static void ScreenShakeEffect_DMATransfer(SysTask *task, void *param); static void ScreenShakeEffect_Init(ScreenShakeEffect *screenShake, enum HeapId heapID); static void ScreenShakeEffect_Finish(ScreenShakeEffect *screenShake); @@ -137,23 +133,21 @@ void EncounterEffect_Grass_HigherLevel(SysTask *task, void *param) encEffect->effectComplete = 0; encEffect->state++; EncounterEffect_ScreenSlice( - encEffect, - grassEffect->screenSliceEfx, - GRASS_HIGHER_LEVEL_PIXELS_PER_SLICE, - GRASS_HIGHER_LEVEL_INTERPOLATION_FRAMES + 1, - GRASS_HIGHER_LEVEL_SLICE_START_X_1, - GRASS_HIGHER_LEVEL_SLICE_END_X_1, - GRASS_HIGHER_LEVEL_SLICE_START_SPEED_1 - ); + encEffect, + grassEffect->screenSliceEfx, + GRASS_HIGHER_LEVEL_PIXELS_PER_SLICE, + GRASS_HIGHER_LEVEL_INTERPOLATION_FRAMES + 1, + GRASS_HIGHER_LEVEL_SLICE_START_X_1, + GRASS_HIGHER_LEVEL_SLICE_END_X_1, + GRASS_HIGHER_LEVEL_SLICE_START_SPEED_1); grassEffect->camera = encEffect->fieldSystem->camera; distance = Camera_GetDistance(grassEffect->camera); QuadraticInterpolationTaskFX32_Init( - &grassEffect->camDistanceTask, - distance, - distance + GRASS_HIGHER_LEVEL_CAMERA_OFFSET_1, - GRASS_HIGHER_LEVEL_CAMERA_SPEED_1, - GRASS_HIGHER_LEVEL_INTERPOLATION_FRAMES - ); + &grassEffect->camDistanceTask, + distance, + distance + GRASS_HIGHER_LEVEL_CAMERA_OFFSET_1, + GRASS_HIGHER_LEVEL_CAMERA_SPEED_1, + GRASS_HIGHER_LEVEL_INTERPOLATION_FRAMES); } break; case 3: @@ -163,23 +157,21 @@ void EncounterEffect_Grass_HigherLevel(SysTask *task, void *param) if (done == TRUE) { encEffect->state++; ScreenSliceEffect_Modify( - encEffect, - grassEffect->screenSliceEfx, - GRASS_HIGHER_LEVEL_PIXELS_PER_SLICE, - GRASS_HIGHER_LEVEL_INTERPOLATION_FRAMES, - GRASS_HIGHER_LEVEL_SLICE_START_X_2, - GRASS_HIGHER_LEVEL_SLICE_END_X_2, - GRASS_HIGHER_LEVEL_SLICE_START_SPEED_2 - ); + encEffect, + grassEffect->screenSliceEfx, + GRASS_HIGHER_LEVEL_PIXELS_PER_SLICE, + GRASS_HIGHER_LEVEL_INTERPOLATION_FRAMES, + GRASS_HIGHER_LEVEL_SLICE_START_X_2, + GRASS_HIGHER_LEVEL_SLICE_END_X_2, + GRASS_HIGHER_LEVEL_SLICE_START_SPEED_2); grassEffect->camera = encEffect->fieldSystem->camera; distance = Camera_GetDistance(grassEffect->camera); QuadraticInterpolationTaskFX32_Init( - &grassEffect->camDistanceTask, - distance, - distance + GRASS_HIGHER_LEVEL_CAMERA_OFFSET_2, - GRASS_HIGHER_LEVEL_CAMERA_SPEED_2, - GRASS_HIGHER_LEVEL_INTERPOLATION_FRAMES - ); + &grassEffect->camDistanceTask, + distance, + distance + GRASS_HIGHER_LEVEL_CAMERA_OFFSET_2, + GRASS_HIGHER_LEVEL_CAMERA_SPEED_2, + GRASS_HIGHER_LEVEL_INTERPOLATION_FRAMES); } break; case 4: @@ -234,23 +226,21 @@ void EncounterEffect_Grass_LowerLevel(SysTask *task, void *param) encEffect->effectComplete = FALSE; encEffect->state++; EncounterEffect_ScreenSlice( - encEffect, - grassEffect->screenSliceEfx, - GRASS_LOWER_LEVEL_PIXELS_PER_SLICE, - GRASS_LOWER_LEVEL_INTERPOLATION_FRAMES + 1, - GRASS_LOWER_LEVEL_SLICE_START_X_1, - GRASS_LOWER_LEVEL_SLICE_END_X_1, - GRASS_LOWER_LEVEL_SLICE_START_SPEED_1 - ); + encEffect, + grassEffect->screenSliceEfx, + GRASS_LOWER_LEVEL_PIXELS_PER_SLICE, + GRASS_LOWER_LEVEL_INTERPOLATION_FRAMES + 1, + GRASS_LOWER_LEVEL_SLICE_START_X_1, + GRASS_LOWER_LEVEL_SLICE_END_X_1, + GRASS_LOWER_LEVEL_SLICE_START_SPEED_1); grassEffect->camera = encEffect->fieldSystem->camera; distance = Camera_GetDistance(grassEffect->camera); QuadraticInterpolationTaskFX32_Init( - &grassEffect->camDistanceTask, - distance, - distance + GRASS_LOWER_LEVEL_CAMERA_OFFSET_1, - GRASS_LOWER_LEVEL_CAMERA_SPEED_1, - GRASS_LOWER_LEVEL_INTERPOLATION_FRAMES - ); + &grassEffect->camDistanceTask, + distance, + distance + GRASS_LOWER_LEVEL_CAMERA_OFFSET_1, + GRASS_LOWER_LEVEL_CAMERA_SPEED_1, + GRASS_LOWER_LEVEL_INTERPOLATION_FRAMES); } break; case 3: @@ -260,23 +250,21 @@ void EncounterEffect_Grass_LowerLevel(SysTask *task, void *param) if (done == TRUE) { encEffect->state++; ScreenSliceEffect_Modify( - encEffect, - grassEffect->screenSliceEfx, - GRASS_LOWER_LEVEL_PIXELS_PER_SLICE, - GRASS_LOWER_LEVEL_INTERPOLATION_FRAMES, - GRASS_LOWER_LEVEL_SLICE_START_X_2, - GRASS_LOWER_LEVEL_SLICE_END_X_2, - GRASS_LOWER_LEVEL_SLICE_START_SPEED_2 - ); + encEffect, + grassEffect->screenSliceEfx, + GRASS_LOWER_LEVEL_PIXELS_PER_SLICE, + GRASS_LOWER_LEVEL_INTERPOLATION_FRAMES, + GRASS_LOWER_LEVEL_SLICE_START_X_2, + GRASS_LOWER_LEVEL_SLICE_END_X_2, + GRASS_LOWER_LEVEL_SLICE_START_SPEED_2); grassEffect->camera = encEffect->fieldSystem->camera; distance = Camera_GetDistance(grassEffect->camera); QuadraticInterpolationTaskFX32_Init( - &grassEffect->camDistanceTask, - distance, - distance + GRASS_LOWER_LEVEL_CAMERA_OFFSET_2, - GRASS_LOWER_LEVEL_CAMERA_SPEED_2, - GRASS_LOWER_LEVEL_INTERPOLATION_FRAMES - ); + &grassEffect->camDistanceTask, + distance, + distance + GRASS_LOWER_LEVEL_CAMERA_OFFSET_2, + GRASS_LOWER_LEVEL_CAMERA_SPEED_2, + GRASS_LOWER_LEVEL_INTERPOLATION_FRAMES); } break; case 4: @@ -505,12 +493,11 @@ void EncounterEffect_Cave_LowerLevel(SysTask *task, void *param) distance = Camera_GetDistance(caveEffect->camera); QuadraticInterpolationTaskFX32_Init( - &caveEffect->camInterpolation, - distance, - distance + CAVE_LOWER_LEVEL_CAMERA_OFFSET, - CAVE_LOWER_LEVEL_CAMERA_SPEED, - CAVE_LOWER_LEVEL_INTERPOLATION_FRAMES - ); + &caveEffect->camInterpolation, + distance, + distance + CAVE_LOWER_LEVEL_CAMERA_OFFSET, + CAVE_LOWER_LEVEL_CAMERA_SPEED, + CAVE_LOWER_LEVEL_INTERPOLATION_FRAMES); encEffect->state++; break; case 4: @@ -564,12 +551,11 @@ void EncounterEffect_Cave_HigherLevel(SysTask *task, void *param) distance = Camera_GetDistance(caveEffect->camera); QuadraticInterpolationTaskFX32_Init( - &caveEffect->camInterpolation, - distance, - distance + CAVE_HIGHER_LEVEL_CAMERA_OFFSET, - CAVE_HIGHER_LEVEL_CAMERA_SPEED, - CAVE_HIGHER_LEVEL_INTERPOLATION_FRAMES - ); + &caveEffect->camInterpolation, + distance, + distance + CAVE_HIGHER_LEVEL_CAMERA_OFFSET, + CAVE_HIGHER_LEVEL_CAMERA_SPEED, + CAVE_HIGHER_LEVEL_INTERPOLATION_FRAMES); encEffect->state++; break; case 4: @@ -597,11 +583,11 @@ typedef struct TrainerGrassEncounterEffect { QuadraticInterpolationTaskFX32 pokeballScale; LinearInterpolationTaskS32 pokeballRotation; QuadraticInterpolationTaskFX32 unk_2C; - ScreenSliceEffect * screenSliceEfx; + ScreenSliceEffect *screenSliceEfx; UnkStruct_ov5_021DE47C unk_48; UnkStruct_ov5_021DE5A4 unk_1E8; - GraphicElementData * pokeballSprites[2]; - Camera * camera; + GraphicElementData *pokeballSprites[2]; + Camera *camera; QuadraticInterpolationTaskFX32 unk_228; s32 unk_240; } TrainerGrassEncounterEffect; @@ -609,11 +595,11 @@ typedef struct TrainerGrassEncounterEffect { typedef struct { LinearInterpolationTaskFX32 unk_00; LinearInterpolationTaskS32 unk_14; - ScreenSplitEffect * unk_28; + ScreenSplitEffect *unk_28; UnkStruct_ov5_021DE47C unk_2C; UnkStruct_ov5_021DE5A4 unk_1CC; - GraphicElementData * unk_200[2]; - Camera * camera; + GraphicElementData *unk_200[2]; + Camera *camera; QuadraticInterpolationTaskFX32 unk_20C; s32 unk_224; } UnkStruct_ov5_021E2EB0; @@ -626,8 +612,8 @@ typedef struct { BOOL unk_4C; UnkStruct_ov5_021DE47C unk_50; UnkStruct_ov5_021DE5A4 unk_1F0; - GraphicElementData * unk_224[2]; - Camera * camera; + GraphicElementData *unk_224[2]; + Camera *camera; QuadraticInterpolationTaskFX32 unk_230; s32 unk_248; } UnkStruct_ov5_021E31A4; @@ -635,15 +621,15 @@ typedef struct { typedef struct { UnkStruct_ov5_021DE47C unk_00; UnkStruct_ov5_021DE5A4 unk_1A0; - GraphicElementData * unk_1D4[3]; + GraphicElementData *unk_1D4[3]; LinearInterpolationTaskS32 unk_1E0[3]; LinearInterpolationTaskS32 unk_21C[3]; - UnkStruct_ov5_021DE6BC * unk_258[3]; + UnkStruct_ov5_021DE6BC *unk_258[3]; BOOL unk_264[3]; - Window * unk_270; + Window *unk_270; ScreenShakeEffect unk_274; BOOL unk_280; - Camera * camera; + Camera *camera; QuadraticInterpolationTaskFX32 unk_288; s32 unk_2A0; } UnkStruct_ov5_021E3560; @@ -655,8 +641,8 @@ typedef struct { LinearInterpolationTaskS32 unk_48; UnkStruct_ov5_021DE47C unk_5C; UnkStruct_ov5_021DE5A4 unk_1FC; - GraphicElementData * unk_230; - Camera * camera; + GraphicElementData *unk_230; + Camera *camera; QuadraticInterpolationTaskFX32 unk_238; s32 unk_250; } UnkStruct_ov5_021E3AD0; @@ -664,13 +650,13 @@ typedef struct { typedef struct { UnkStruct_ov5_021DE47C unk_00; UnkStruct_ov5_021DE5A4 unk_1A0; - GraphicElementData * unk_1D4[3]; + GraphicElementData *unk_1D4[3]; LinearInterpolationTaskS32 unk_1E0[3]; LinearInterpolationTaskS32 unk_21C[3]; BOOL unk_258[3]; - Window * unk_264; - UnkStruct_ov5_021DE928 * unk_268; - Camera * camera; + Window *unk_264; + UnkStruct_ov5_021DE928 *unk_268; + Camera *camera; QuadraticInterpolationTaskFX32 unk_270; s16 unk_288; } UnkStruct_ov5_021E3D8C; @@ -684,7 +670,7 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param) int i; VecFx32 v5; u16 v6; - + switch (encEffect->state) { case 0: encEffect->param = Heap_AllocFromHeap(4, sizeof(TrainerGrassEncounterEffect)); @@ -727,10 +713,9 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param) QuadraticInterpolationTaskFX32_Init(&trainerEffect->pokeballScale, (FX32_CONST(0.01f)), (FX32_CONST(1.0f)), 2, 10); v5 = VecFx32_FromXYZ( - trainerEffect->pokeballScale.currentValue, - trainerEffect->pokeballScale.currentValue, - trainerEffect->pokeballScale.currentValue - ); + trainerEffect->pokeballScale.currentValue, + trainerEffect->pokeballScale.currentValue, + trainerEffect->pokeballScale.currentValue); for (i = 0; i < 2; i++) { sub_02021CAC( @@ -840,10 +825,10 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param) } } -void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1) +void EncounterEffect_Trainer_Grass_HigherLevel(SysTask *param0, void *param1) { EncounterEffect *encEffect = param1; - UnkStruct_ov5_021E2EB0 * v1 = encEffect->param; + UnkStruct_ov5_021E2EB0 *v1 = encEffect->param; BOOL v2; fx32 v3; @@ -984,10 +969,10 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1) } } -void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1) +void EncounterEffect_Trainer_Water_LowerLevel(SysTask *param0, void *param1) { - EncounterEffect * v0 = param1; - UnkStruct_ov5_021E31A4 * v1 = v0->param; + EncounterEffect *v0 = param1; + UnkStruct_ov5_021E31A4 *v1 = v0->param; BOOL v2; BOOL v3; fx32 v4; @@ -1156,10 +1141,10 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1) } } -void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1) +void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1) { - EncounterEffect * v0 = param1; - UnkStruct_ov5_021E3560 * v1 = v0->param; + EncounterEffect *v0 = param1; + UnkStruct_ov5_021E3560 *v1 = v0->param; BOOL v2; int v3; VecFx32 v4; @@ -1341,7 +1326,7 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1) for (v3 = 0; v3 < 3; v3++) { if (v1->unk_264[v3] == 1) { - const VecFx32 * v7; + const VecFx32 *v7; VecFx32 v8; v2 = ov5_021DE71C(v1->unk_258[v3]); @@ -1369,10 +1354,10 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1) } } -void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1) +void EncounterEffect_Trainer_Cave_LowerLevel(SysTask *param0, void *param1) { - EncounterEffect * v0 = param1; - UnkStruct_ov5_021E3AD0 * v1 = v0->param; + EncounterEffect *v0 = param1; + UnkStruct_ov5_021E3AD0 *v1 = v0->param; BOOL v2; fx32 v3; VecFx32 v4; @@ -1494,10 +1479,10 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1) } } -void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1) +void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1) { - EncounterEffect * v0 = param1; - UnkStruct_ov5_021E3D8C * v1 = v0->param; + EncounterEffect *v0 = param1; + UnkStruct_ov5_021E3D8C *v1 = v0->param; VecFx32 v2; BOOL v3; int v4; @@ -1684,7 +1669,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1) for (v4 = 0; v4 < 3; v4++) { if (v1->unk_258[v4] == 1) { - const VecFx32 * v7; + const VecFx32 *v7; VecFx32 v8; v3 = LinearInterpolationTaskS32_Update(&v1->unk_1E0[v4]); @@ -1712,21 +1697,21 @@ typedef struct { QuadraticInterpolationTaskFX32 unk_14; UnkStruct_ov5_021DE47C unk_2C; UnkStruct_ov5_021DE5A4 unk_1CC; - GraphicElementData * unk_200; + GraphicElementData *unk_200; s32 unk_204; } UnkStruct_ov5_021E4260; typedef struct { UnkStruct_ov5_021DE47C unk_00; UnkStruct_ov5_021DE5A4 unk_1A0; - GraphicElementData * unk_1D4[4]; + GraphicElementData *unk_1D4[4]; QuadraticInterpolationTaskFX32 unk_1E4[2]; } UnkStruct_ov5_021E44C0; -void EncounterEffect_Frontier (SysTask * param0, void * param1) +void EncounterEffect_Frontier(SysTask *param0, void *param1) { - EncounterEffect * v0 = param1; - UnkStruct_ov5_021E4260 * v1 = v0->param; + EncounterEffect *v0 = param1; + UnkStruct_ov5_021E4260 *v1 = v0->param; BOOL v2; switch (v0->state) { @@ -1836,10 +1821,10 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1) } } -void EncounterEffect_Double (SysTask * param0, void * param1) +void EncounterEffect_Double(SysTask *param0, void *param1) { - EncounterEffect * v0 = param1; - UnkStruct_ov5_021E44C0 * v1 = v0->param; + EncounterEffect *v0 = param1; + UnkStruct_ov5_021E44C0 *v1 = v0->param; BOOL v2; int v3; VecFx32 v4; @@ -1956,25 +1941,18 @@ void EncounterEffect_Double (SysTask * param0, void * param1) } static const s32 Unk_ov5_021F9E94[6][8] = { - { - FX32_CONST(260), FX32_CONST(128), -FX32_CONST(30), FX32_CONST(0), FX32_CONST(100), FX32_CONST(20), 4, 0xffff * 2 - }, { - FX32_CONST(-16), FX32_CONST(128), FX32_CONST(30), FX32_CONST(160), FX32_CONST(100), -FX32_CONST(20), 3, 0xffff * 1 - }, { - FX32_CONST(0), FX32_CONST(128), FX32_CONST(30), FX32_CONST(-16), FX32_CONST(100), FX32_CONST(20), 4, -0xffff * 3 - }, { - FX32_CONST(140), FX32_CONST(128), -FX32_CONST(10), FX32_CONST(160), FX32_CONST(100), -FX32_CONST(20), 2, -0xffff * 2 - }, { - FX32_CONST(260), FX32_CONST(128), -FX32_CONST(30), FX32_CONST(80), FX32_CONST(100), FX32_CONST(1), 3, -0xffff * 3 - }, { - FX32_CONST(0), FX32_CONST(128), FX32_CONST(30), FX32_CONST(160), FX32_CONST(100), -FX32_CONST(20), 3, 0xffff * 1 - }, + { FX32_CONST(260), FX32_CONST(128), -FX32_CONST(30), FX32_CONST(0), FX32_CONST(100), FX32_CONST(20), 4, 0xffff * 2 }, + { FX32_CONST(-16), FX32_CONST(128), FX32_CONST(30), FX32_CONST(160), FX32_CONST(100), -FX32_CONST(20), 3, 0xffff * 1 }, + { FX32_CONST(0), FX32_CONST(128), FX32_CONST(30), FX32_CONST(-16), FX32_CONST(100), FX32_CONST(20), 4, -0xffff * 3 }, + { FX32_CONST(140), FX32_CONST(128), -FX32_CONST(10), FX32_CONST(160), FX32_CONST(100), -FX32_CONST(20), 2, -0xffff * 2 }, + { FX32_CONST(260), FX32_CONST(128), -FX32_CONST(30), FX32_CONST(80), FX32_CONST(100), FX32_CONST(1), 3, -0xffff * 3 }, + { FX32_CONST(0), FX32_CONST(128), FX32_CONST(30), FX32_CONST(160), FX32_CONST(100), -FX32_CONST(20), 3, 0xffff * 1 }, }; typedef struct { UnkStruct_ov5_021DE47C unk_00; UnkStruct_ov5_021DE5A4 unk_1A0; - GraphicElementData * unk_1D4[6]; + GraphicElementData *unk_1D4[6]; QuadraticInterpolationTaskFX32 unk_1EC[6]; QuadraticInterpolationTaskFX32 unk_27C[6]; QuadraticInterpolationTaskFX32 unk_30C[6]; @@ -1985,21 +1963,21 @@ typedef struct { } UnkStruct_ov5_021E4738; typedef struct { - Window * unk_00; - UnkStruct_ov5_021DEC18 * unk_04; + Window *unk_00; + UnkStruct_ov5_021DEC18 *unk_04; UnkStruct_ov5_021DE47C unk_08; UnkStruct_ov5_021DE5A4 unk_1A8; - GraphicElementData * unk_1DC; + GraphicElementData *unk_1DC; LinearInterpolationTaskS32 unk_1E0; LinearInterpolationTaskS32 unk_1F4; LinearInterpolationTaskS32 unk_208; s32 unk_21C; } UnkStruct_ov5_021E4B3C; -void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1) +void EncounterEffect_GalacticGrunt(SysTask *param0, void *param1) { - EncounterEffect * v0 = param1; - UnkStruct_ov5_021E4738 * v1 = v0->param; + EncounterEffect *v0 = param1; + UnkStruct_ov5_021E4738 *v1 = v0->param; BOOL v2; int v3; VecFx32 v4; @@ -2145,10 +2123,10 @@ void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1) } } -void EncounterEffect_GalacticBoss (SysTask * param0, void * param1) +void EncounterEffect_GalacticBoss(SysTask *param0, void *param1) { - EncounterEffect * v0 = param1; - UnkStruct_ov5_021E4B3C * v1 = v0->param; + EncounterEffect *v0 = param1; + UnkStruct_ov5_021E4B3C *v1 = v0->param; BOOL v2; switch (v0->state) { @@ -2283,115 +2261,115 @@ typedef struct LegendaryEncounterCameraParam { static const LegendaryEncounterCameraParam sLegendaryEncounterCameraParams[16] = { { - .distance = 0x29AEC1, - .angleX = 0xD602, - .angleY = 0x0, - .fov = 0x5C1, + .distance = 0x29AEC1, + .angleX = 0xD602, + .angleY = 0x0, + .fov = 0x5C1, .frameDelay = 4, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xcf02, - .angleY = 0xff00, - .fov = 0x601, + .distance = 0x29AEC1, + .angleX = 0xcf02, + .angleY = 0xff00, + .fov = 0x601, .frameDelay = 4, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xe602, - .angleY = 0x1000, - .fov = 0x691, + .distance = 0x29AEC1, + .angleX = 0xe602, + .angleY = 0x1000, + .fov = 0x691, .frameDelay = 4, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xD602, - .angleY = 0xa00, - .fov = 0x711, + .distance = 0x29AEC1, + .angleX = 0xD602, + .angleY = 0xa00, + .fov = 0x711, .frameDelay = 3, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xe102, - .angleY = 0xf000, - .fov = 0x780, + .distance = 0x29AEC1, + .angleX = 0xe102, + .angleY = 0xf000, + .fov = 0x780, .frameDelay = 3, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xc602, - .angleY = 0x0, - .fov = 0x751, + .distance = 0x29AEC1, + .angleX = 0xc602, + .angleY = 0x0, + .fov = 0x751, .frameDelay = 3, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xe002, - .angleY = 0xf000, - .fov = 0x800, + .distance = 0x29AEC1, + .angleX = 0xe002, + .angleY = 0xf000, + .fov = 0x800, .frameDelay = 3, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xD602, - .angleY = 0, - .fov = 0x802, + .distance = 0x29AEC1, + .angleX = 0xD602, + .angleY = 0, + .fov = 0x802, .frameDelay = 3, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xD002, - .angleY = 0x1000, - .fov = 0x800, + .distance = 0x29AEC1, + .angleX = 0xD002, + .angleY = 0x1000, + .fov = 0x800, .frameDelay = 3, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xD902, - .angleY = 0xf500, - .fov = 0x751, + .distance = 0x29AEC1, + .angleX = 0xD902, + .angleY = 0xf500, + .fov = 0x751, .frameDelay = 3, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xD002, - .angleY = 0xa00, - .fov = 0x4C1, + .distance = 0x29AEC1, + .angleX = 0xD002, + .angleY = 0xa00, + .fov = 0x4C1, .frameDelay = 2, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xe002, - .angleY = 0xf000, - .fov = 0x3C1, + .distance = 0x29AEC1, + .angleX = 0xe002, + .angleY = 0xf000, + .fov = 0x3C1, .frameDelay = 2, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xD002, - .angleY = 0xf000, - .fov = 0x650, + .distance = 0x29AEC1, + .angleX = 0xD002, + .angleY = 0xf000, + .fov = 0x650, .frameDelay = 1, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xe002, - .angleY = 0xa000, - .fov = 0x241, + .distance = 0x29AEC1, + .angleX = 0xe002, + .angleY = 0xa000, + .fov = 0x241, .frameDelay = 1, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xe1a2, - .angleY = 0x500, - .fov = 0x500, + .distance = 0x29AEC1, + .angleX = 0xe1a2, + .angleY = 0x500, + .fov = 0x500, .frameDelay = 1, - }, + }, { - .distance = 0x29AEC1, - .angleX = 0xD602, - .angleY = 0, - .fov = 0x241, + .distance = 0x29AEC1, + .angleX = 0xD602, + .angleY = 0, + .fov = 0x241, .frameDelay = 1, }, }; @@ -2404,7 +2382,7 @@ typedef struct MythicalEncounterEffect { } MythicalEncounterEffect; typedef struct LegendaryEncounterEffect { - FieldMotionBlur * motionBlur; + FieldMotionBlur *motionBlur; Camera *unused; LinearInterpolationTaskS32 fovInterpolation; QuadraticInterpolationTaskFX32 distanceInterpolation; @@ -2415,12 +2393,12 @@ static void EncounterEffect_SetLegendaryEncounterCamera(FieldSystem *fieldSystem { Camera_SetFOV(param->fov, fieldSystem->camera); Camera_SetDistance(param->distance, fieldSystem->camera); - + CameraAngle angle; angle.x = param->angleX; angle.y = param->angleY; angle.z = 0; - + Camera_SetAngleAroundTarget(&angle, fieldSystem->camera); } @@ -2506,7 +2484,7 @@ void EncounterEffect_Mythical(SysTask *task, void *param) } } -void EncounterEffect_Legendary(SysTask *task, void * param) +void EncounterEffect_Legendary(SysTask *task, void *param) { EncounterEffect *encEffect = param; LegendaryEncounterEffect *legendaryEffect = encEffect->param; @@ -2629,116 +2607,116 @@ typedef struct GymLeaderEncounterParam { static const GymLeaderEncounterParam sGymLeaderEncounterParams[8] = { { - .endX = 214 * FX32_ONE, - .trainerID = 246, - .trainerClass = TRAINER_CLASS_LEADER_ROARK, - .unk_0A = 1, - .unk_0C = 55, - .unk_0D = 56, - .unk_0E = 57, - .unk_0F = 58, - .unk_10 = 15, - .unk_11 = 16, - .unk_12 = 17, - .padding = 0, - }, + .endX = 214 * FX32_ONE, + .trainerID = 246, + .trainerClass = TRAINER_CLASS_LEADER_ROARK, + .unk_0A = 1, + .unk_0C = 55, + .unk_0D = 56, + .unk_0E = 57, + .unk_0F = 58, + .unk_10 = 15, + .unk_11 = 16, + .unk_12 = 17, + .padding = 0, + }, { - .endX = 214 * FX32_ONE, - .trainerID = 315, - .trainerClass = TRAINER_CLASS_LEADER_GARDENIA, - .unk_0A = 1, - .unk_0C = 59, - .unk_0D = 60, - .unk_0E = 61, - .unk_0F = 62, - .unk_10 = 18, - .unk_11 = 19, - .unk_12 = 20, - .padding = 0, - }, + .endX = 214 * FX32_ONE, + .trainerID = 315, + .trainerClass = TRAINER_CLASS_LEADER_GARDENIA, + .unk_0A = 1, + .unk_0C = 59, + .unk_0D = 60, + .unk_0E = 61, + .unk_0F = 62, + .unk_10 = 18, + .unk_11 = 19, + .unk_12 = 20, + .padding = 0, + }, { - .endX = 214 * FX32_ONE, - .trainerID = 316, - .trainerClass = TRAINER_CLASS_LEADER_WAKE, - .unk_0A = 0, - .unk_0C = 63, - .unk_0D = 64, - .unk_0E = 65, - .unk_0F = 66, - .unk_10 = 21, - .unk_11 = 22, - .unk_12 = 23, - .padding = 0, - }, + .endX = 214 * FX32_ONE, + .trainerID = 316, + .trainerClass = TRAINER_CLASS_LEADER_WAKE, + .unk_0A = 0, + .unk_0C = 63, + .unk_0D = 64, + .unk_0E = 65, + .unk_0F = 66, + .unk_10 = 21, + .unk_11 = 22, + .unk_12 = 23, + .padding = 0, + }, { - .endX = 214 * FX32_ONE, - .trainerID = 317, - .trainerClass = TRAINER_CLASS_LEADER_MAYLENE, - .unk_0A = 1, - .unk_0C = 67, - .unk_0D = 68, - .unk_0E = 69, - .unk_0F = 70, - .unk_10 = 24, - .unk_11 = 25, - .unk_12 = 26, - .padding = 0, - }, + .endX = 214 * FX32_ONE, + .trainerID = 317, + .trainerClass = TRAINER_CLASS_LEADER_MAYLENE, + .unk_0A = 1, + .unk_0C = 67, + .unk_0D = 68, + .unk_0E = 69, + .unk_0F = 70, + .unk_10 = 24, + .unk_11 = 25, + .unk_12 = 26, + .padding = 0, + }, { - .endX = 214 * FX32_ONE, - .trainerID = 318, - .trainerClass = TRAINER_CLASS_LEADER_FANTINA, - .unk_0A = 1, - .unk_0C = 71, - .unk_0D = 72, - .unk_0E = 73, - .unk_0F = 74, - .unk_10 = 27, - .unk_11 = 28, - .unk_12 = 29, - .padding = 0, - }, + .endX = 214 * FX32_ONE, + .trainerID = 318, + .trainerClass = TRAINER_CLASS_LEADER_FANTINA, + .unk_0A = 1, + .unk_0C = 71, + .unk_0D = 72, + .unk_0E = 73, + .unk_0F = 74, + .unk_10 = 27, + .unk_11 = 28, + .unk_12 = 29, + .padding = 0, + }, { - .endX = 214 * FX32_ONE, - .trainerID = 319, - .trainerClass = TRAINER_CLASS_LEADER_CANDICE, - .unk_0A = 1, - .unk_0C = 75, - .unk_0D = 76, - .unk_0E = 77, - .unk_0F = 78, - .unk_10 = 30, - .unk_11 = 31, - .unk_12 = 32, - .padding = 0, - }, + .endX = 214 * FX32_ONE, + .trainerID = 319, + .trainerClass = TRAINER_CLASS_LEADER_CANDICE, + .unk_0A = 1, + .unk_0C = 75, + .unk_0D = 76, + .unk_0E = 77, + .unk_0F = 78, + .unk_10 = 30, + .unk_11 = 31, + .unk_12 = 32, + .padding = 0, + }, { - .endX = 214 * FX32_ONE, - .trainerID = 250, - .trainerClass = TRAINER_CLASS_LEADER_BYRON, - .unk_0A = 1, - .unk_0C = 79, - .unk_0D = 80, - .unk_0E = 81, - .unk_0F = 82, - .unk_10 = 33, - .unk_11 = 34, - .unk_12 = 35, - .padding = 0, - }, + .endX = 214 * FX32_ONE, + .trainerID = 250, + .trainerClass = TRAINER_CLASS_LEADER_BYRON, + .unk_0A = 1, + .unk_0C = 79, + .unk_0D = 80, + .unk_0E = 81, + .unk_0F = 82, + .unk_10 = 33, + .unk_11 = 34, + .unk_12 = 35, + .padding = 0, + }, { - .endX = 214 * FX32_ONE, - .trainerID = 320, - .trainerClass = TRAINER_CLASS_LEADER_VOLKNER, - .unk_0A = 1, - .unk_0C = 83, - .unk_0D = 84, - .unk_0E = 85, - .unk_0F = 86, - .unk_10 = 36, - .unk_11 = 37, - .unk_12 = 38, - .padding = 0, + .endX = 214 * FX32_ONE, + .trainerID = 320, + .trainerClass = TRAINER_CLASS_LEADER_VOLKNER, + .unk_0A = 1, + .unk_0C = 83, + .unk_0D = 84, + .unk_0E = 85, + .unk_0F = 86, + .unk_10 = 36, + .unk_11 = 37, + .unk_12 = 38, + .padding = 0, }, }; @@ -2752,46 +2730,46 @@ typedef struct EliterFourChampionEncounterParam { static const EliterFourChampionEncounterParam sEliteFourChampionEncounterParams[5] = { { - .unk_00 = 87, - .unk_02 = 39, - .facePanFrames = 32, - .trainerClass = TRAINER_CLASS_ELITE_FOUR_AARON, - .trainerID = 261 - }, + .unk_00 = 87, + .unk_02 = 39, + .facePanFrames = 32, + .trainerClass = TRAINER_CLASS_ELITE_FOUR_AARON, + .trainerID = 261, + }, { - .unk_00 = 91, - .unk_02 = 43, - .facePanFrames = 32, - .trainerClass = TRAINER_CLASS_ELITE_FOUR_BERTHA, - .trainerID = 262 - }, + .unk_00 = 91, + .unk_02 = 43, + .facePanFrames = 32, + .trainerClass = TRAINER_CLASS_ELITE_FOUR_BERTHA, + .trainerID = 262, + }, { - .unk_00 = 95, - .unk_02 = 44, - .facePanFrames = 32, - .trainerClass = TRAINER_CLASS_ELITE_FOUR_FLINT, - .trainerID = 263 - }, + .unk_00 = 95, + .unk_02 = 44, + .facePanFrames = 32, + .trainerClass = TRAINER_CLASS_ELITE_FOUR_FLINT, + .trainerID = 263, + }, { - .unk_00 = 99, - .unk_02 = 45, - .facePanFrames = 32, - .trainerClass = TRAINER_CLASS_ELITE_FOUR_LUCIAN, - .trainerID = 264 - }, + .unk_00 = 99, + .unk_02 = 45, + .facePanFrames = 32, + .trainerClass = TRAINER_CLASS_ELITE_FOUR_LUCIAN, + .trainerID = 264, + }, { - .unk_00 = 103, - .unk_02 = 46, - .facePanFrames = 9, - .trainerClass = TRAINER_CLASS_CHAMPION_CYNTHIA, - .trainerID = 267 + .unk_00 = 103, + .unk_02 = 46, + .facePanFrames = 9, + .trainerClass = TRAINER_CLASS_CHAMPION_CYNTHIA, + .trainerID = 267, }, }; typedef struct { s16 unk_00; s16 unk_02; - GraphicElementData * unk_04[4]; + GraphicElementData *unk_04[4]; LinearInterpolationTaskFX32 unk_14[4]; } UnkStruct_ov5_021E5128; @@ -2799,10 +2777,10 @@ typedef struct { QuadraticInterpolationTaskFX32 unk_00; LinearInterpolationTaskS32 unk_18; LinearInterpolationTaskFX32 unk_2C; - UnkStruct_ov5_021DED04 * unk_40; + UnkStruct_ov5_021DED04 *unk_40; UnkStruct_ov5_021DE47C unk_44; UnkStruct_ov5_021DE5A4 unk_1E4[2]; - GraphicElementData * unk_24C; + GraphicElementData *unk_24C; UnkStruct_ov5_021E5128 unk_250; UnkStruct_ov5_021E52A8_sub1 unk_2B4; UnkStruct_ov5_021E52A8_sub2 unk_2BC; @@ -2819,7 +2797,7 @@ typedef struct { LinearInterpolationTaskS32 unk_48; UnkStruct_ov5_021DE47C unk_5C; UnkStruct_ov5_021DE5A4 unk_1FC[4]; - GraphicElementData * unk_2CC[4]; + GraphicElementData *unk_2CC[4]; VecFx32 unk_2DC; VecFx32 unk_2E8; UnkStruct_ov5_021E5128 unk_2F4; @@ -2829,7 +2807,7 @@ typedef struct { s32 unk_370; } UnkStruct_ov5_021E5890; -static void ov5_021E5128 (UnkStruct_ov5_021E5128 * param0, UnkStruct_ov5_021DE47C * param1, UnkStruct_ov5_021DE5A4 * param2, fx32 param3, fx32 param4, u32 param5) +static void ov5_021E5128(UnkStruct_ov5_021E5128 *param0, UnkStruct_ov5_021DE47C *param1, UnkStruct_ov5_021DE5A4 *param2, fx32 param3, fx32 param4, u32 param5) { int v0; @@ -2852,7 +2830,7 @@ static void ov5_021E5128 (UnkStruct_ov5_021E5128 * param0, UnkStruct_ov5_021DE47 } } -static void ov5_021E519C (UnkStruct_ov5_021E5128 * param0) +static void ov5_021E519C(UnkStruct_ov5_021E5128 *param0) { int v0; @@ -2861,7 +2839,7 @@ static void ov5_021E519C (UnkStruct_ov5_021E5128 * param0) } } -static BOOL ov5_021E51B4 (UnkStruct_ov5_021E5128 * param0) +static BOOL ov5_021E51B4(UnkStruct_ov5_021E5128 *param0) { int v0; BOOL v1; @@ -2896,10 +2874,10 @@ static BOOL ov5_021E51B4 (UnkStruct_ov5_021E5128 * param0) static Strbuf *EncounterEffect_GetGymLeaderName(u32 trainerClass, u32 heapID) { - StringTemplate * template; - MessageLoader * messageLoader; - Strbuf* result; - Strbuf* message; + StringTemplate *template; + MessageLoader *messageLoader; + Strbuf *result; + Strbuf *message; messageLoader = MessageLoader_Init(1, 26, 359, heapID); template = StringTemplate_Default(heapID); @@ -2917,14 +2895,14 @@ static Strbuf *EncounterEffect_GetGymLeaderName(u32 trainerClass, u32 heapID) static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId heapID, const GymLeaderEncounterParam *param) { - UnkStruct_ov5_021E52A8 * v0 = encEffect->param; + UnkStruct_ov5_021E52A8 *v0 = encEffect->param; BOOL v1; - const VecFx32 * v2; + const VecFx32 *v2; VecFx32 v3; VecFx32 v4; int v5; int v6; - Strbuf* v7; + Strbuf *v7; switch (encEffect->state) { case 0: @@ -3235,13 +3213,13 @@ static u32 FieldSystem_GetTrainerGender(FieldSystem *fieldSystem) static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum HeapId heapID, const EliterFourChampionEncounterParam *param) { - UnkStruct_ov5_021E5890 * v0 = encEffect->param; + UnkStruct_ov5_021E5890 *v0 = encEffect->param; BOOL v1, v2; VecFx32 v3; VecFx32 v4; int v5; fx32 v6; - UnkStruct_ov5_021DE5A4 * v7; + UnkStruct_ov5_021DE5A4 *v7; int v8; switch (encEffect->state) { @@ -3365,7 +3343,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H sub_02021CAC(v0->unk_2CC[3], 1); { - Strbuf* v9; + Strbuf *v9; sub_02007130(encEffect->narc, 11, 0, 2 * 0x20, 0x20, heapID); diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c index 4e6e6dd8d0..7150dc9244 100644 --- a/src/overlay005/field_control.c +++ b/src/overlay005/field_control.c @@ -1,76 +1,75 @@ +#include "overlay005/field_control.h" + #include #include -#include "inlines.h" +#include "constants/player_avatar.h" +#include "consts/sdat.h" -#include "trainer_info.h" #include "struct_decls/struct_02026310_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_0203A790_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_02049FA8.h" +#include "overlay005/ov5_021DFB54.h" +#include "overlay005/ov5_021E1154.h" +#include "overlay005/ov5_021E622C.h" +#include "overlay005/ov5_021EA714.h" +#include "overlay005/ov5_021EF4BC.h" +#include "overlay005/ov5_021EFB0C.h" +#include "overlay005/ov5_021F8370.h" #include "overlay005/struct_ov5_021D219C.h" +#include "overlay005/vs_seeker.h" +#include "overlay006/ov6_02240C9C.h" +#include "overlay006/ov6_02246BF4.h" +#include "overlay008/ov8_02249960.h" +#include "overlay009/ov9_02249960.h" +#include "overlay023/ov23_02241F74.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_comm_manager.h" +#include "field_map_change.h" +#include "field_menu.h" +#include "field_overworld_state.h" +#include "inlines.h" +#include "map_header.h" +#include "map_header_data.h" +#include "map_object.h" +#include "party.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "pokeradar.h" +#include "trainer_info.h" #include "unk_02005474.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_020261E4.h" #include "unk_0202CD50.h" #include "unk_02030EE0.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "map_header.h" -#include "map_header_data.h" -#include "field_overworld_state.h" -#include "field_menu.h" #include "unk_0203C954.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_02050A74.h" -#include "field_map_change.h" #include "unk_02054884.h" #include "unk_02054D00.h" #include "unk_020562F8.h" #include "unk_02056B30.h" -#include "comm_player_manager.h" -#include "field_comm_manager.h" #include "unk_0205A0D8.h" #include "unk_0205B33C.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" -#include "constants/player_avatar.h" #include "unk_0205F180.h" -#include "map_object.h" #include "unk_02067A84.h" #include "unk_020683F4.h" -#include "pokeradar.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_02071B10.h" -#include "pokemon.h" -#include "party.h" -#include "core_sys.h" -#include "consts/sdat.h" -#include "overlay005/field_control.h" -#include "overlay005/vs_seeker.h" -#include "overlay005/ov5_021DFB54.h" -#include "overlay005/ov5_021E1154.h" -#include "overlay005/ov5_021E622C.h" -#include "overlay005/ov5_021EA714.h" -#include "overlay005/ov5_021EF4BC.h" -#include "overlay005/ov5_021EFB0C.h" -#include "overlay005/ov5_021F8370.h" -#include "overlay006/ov6_02240C9C.h" -#include "overlay006/ov6_02246BF4.h" -#include "overlay008/ov8_02249960.h" -#include "overlay009/ov9_02249960.h" -#include "overlay023/ov23_02241F74.h" +#include "vars_flags.h" static BOOL Field_CheckMapTransition(FieldSystem *fieldSystem, const FieldInput *input); static u16 Field_TileBehaviorToScript(FieldSystem *fieldSystem, u8 behavior); @@ -97,7 +96,7 @@ static void Field_TrySetMapConnection(FieldSystem *fieldSystem); static BOOL Field_DistortionInteract(FieldSystem *fieldSystem, MapObject **object); static int Field_CheckTrainerInfo(void); -static void FieldInput_Clear (FieldInput *input) +static void FieldInput_Clear(FieldInput *input) { input->interact = FALSE; input->endMovement = FALSE; @@ -115,7 +114,7 @@ static void FieldInput_Clear (FieldInput *input) input->transitionDir = DIR_NONE; } -void FieldInput_Update (FieldInput *input, FieldSystem *fieldSystem, u16 pressedKeys, u16 heldKeys) +void FieldInput_Update(FieldInput *input, FieldSystem *fieldSystem, u16 pressedKeys, u16 heldKeys) { FieldInput_Clear(input); @@ -162,8 +161,8 @@ void FieldInput_Update (FieldInput *input, FieldSystem *fieldSystem, u16 pressed if (playerDir == DIR_NORTH && heldKeys & PAD_KEY_UP || playerDir == DIR_SOUTH && heldKeys & PAD_KEY_DOWN - || playerDir == DIR_WEST && heldKeys & PAD_KEY_LEFT - || playerDir == DIR_EAST && heldKeys & PAD_KEY_RIGHT) { + || playerDir == DIR_WEST && heldKeys & PAD_KEY_LEFT + || playerDir == DIR_EAST && heldKeys & PAD_KEY_RIGHT) { input->transitionDir = playerDir; } else { @@ -173,7 +172,7 @@ void FieldInput_Update (FieldInput *input, FieldSystem *fieldSystem, u16 pressed input->playerDir = sub_02061308(fieldSystem->playerAvatar, pressedKeys, heldKeys); } -BOOL FieldInput_Process (const FieldInput *input, FieldSystem *fieldSystem) +BOOL FieldInput_Process(const FieldInput *input, FieldSystem *fieldSystem) { if (input->dummy5 == FALSE && sub_0203F5C0(fieldSystem, 1) == TRUE) { return TRUE; @@ -189,7 +188,7 @@ BOOL FieldInput_Process (const FieldInput *input, FieldSystem *fieldSystem) if (sub_02067A84(fieldSystem, hasTwoAliveMons) == TRUE || (sub_02071CB4(fieldSystem, 2) == TRUE - && ov8_0224C51C(fieldSystem) == TRUE)) { + && ov8_0224C51C(fieldSystem) == TRUE)) { sub_0205F56C(fieldSystem->playerAvatar); MapObjectMan_PauseAllMovement(fieldSystem->mapObjMan); @@ -339,7 +338,7 @@ BOOL FieldInput_Process (const FieldInput *input, FieldSystem *fieldSystem) return FALSE; } -static BOOL Field_CheckSign (FieldSystem *fieldSystem) +static BOOL Field_CheckSign(FieldSystem *fieldSystem) { MapObject *object; @@ -349,7 +348,7 @@ static BOOL Field_CheckSign (FieldSystem *fieldSystem) } int event = sub_0203CB80(fieldSystem, MapHeaderData_GetBgEvents(fieldSystem), MapHeaderData_GetNumBgEvents(fieldSystem)); - + if (event != 0xffff) { sub_0203E880(fieldSystem, event, NULL); return TRUE; @@ -358,7 +357,7 @@ static BOOL Field_CheckSign (FieldSystem *fieldSystem) return FALSE; } -BOOL FieldInput_Process_Underground (FieldInput *input, FieldSystem *fieldSystem) +BOOL FieldInput_Process_Underground(FieldInput *input, FieldSystem *fieldSystem) { if (input->dummy5 == FALSE && sub_0203F5C0(fieldSystem, 1) == TRUE) { return TRUE; @@ -387,7 +386,7 @@ BOOL FieldInput_Process_Underground (FieldInput *input, FieldSystem *fieldSystem return FALSE; } -BOOL FieldInput_Process_Colosseum (FieldInput *input, FieldSystem *fieldSystem) +BOOL FieldInput_Process_Colosseum(FieldInput *input, FieldSystem *fieldSystem) { if (input->mapTransition && input->transitionDir == DIR_SOUTH @@ -428,7 +427,7 @@ BOOL FieldInput_Process_Colosseum (FieldInput *input, FieldSystem *fieldSystem) return FALSE; } -static int Field_CheckTrainerInfo (void) +static int Field_CheckTrainerInfo(void) { // C99-style declaration doesn't match int netId; @@ -445,7 +444,7 @@ static int Field_CheckTrainerInfo (void) return ret >= 1; } -BOOL FieldInput_Process_UnionRoom (const FieldInput *input, FieldSystem *fieldSystem) +BOOL FieldInput_Process_UnionRoom(const FieldInput *input, FieldSystem *fieldSystem) { if (sub_020318EC() & 0xfe) { if (Field_CheckTrainerInfo() && CommSys_ConnectedCount() > 1) { @@ -487,7 +486,7 @@ BOOL FieldInput_Process_UnionRoom (const FieldInput *input, FieldSystem *fieldSy return FALSE; } -int FieldInput_Process_BattleTower (const FieldInput *input, FieldSystem *fieldSystem) +int FieldInput_Process_BattleTower(const FieldInput *input, FieldSystem *fieldSystem) { if (input->dummy5 == FALSE && sub_0203F5C0(fieldSystem, 1) == TRUE) { return TRUE; @@ -500,7 +499,7 @@ int FieldInput_Process_BattleTower (const FieldInput *input, FieldSystem *fieldS if (sub_0205F588(fieldSystem->playerAvatar) == TRUE) { sub_0205F5E4(fieldSystem->playerAvatar, PlayerAvatar_GetDir(fieldSystem->playerAvatar)); } - + if (MapObject_GetEventType(object) != 0x9) { sub_0203E880(fieldSystem, MapObject_GetEventID(object), object); } else { @@ -511,7 +510,7 @@ int FieldInput_Process_BattleTower (const FieldInput *input, FieldSystem *fieldS } int v2 = sub_0203CA6C(fieldSystem, MapHeaderData_GetBgEvents(fieldSystem), MapHeaderData_GetNumBgEvents(fieldSystem)); - + if (v2 != 0xffff) { sub_0203E880(fieldSystem, v2, NULL); return TRUE; @@ -542,7 +541,7 @@ int FieldInput_Process_BattleTower (const FieldInput *input, FieldSystem *fieldS return FALSE; } -static BOOL Field_CheckWildEncounter (FieldSystem *fieldSystem) +static BOOL Field_CheckWildEncounter(FieldSystem *fieldSystem) { int playerX, playerZ; @@ -560,7 +559,7 @@ static BOOL Field_CheckWildEncounter (FieldSystem *fieldSystem) return MapHeader_HasWildEncounters(fieldSystem->location->mapId) && ov6_02240D5C(fieldSystem) == TRUE; } -static BOOL Field_CheckMapTransition (FieldSystem *fieldSystem, const FieldInput *input) +static BOOL Field_CheckMapTransition(FieldSystem *fieldSystem, const FieldInput *input) { if (input->transitionDir == DIR_NONE) { return FALSE; @@ -635,8 +634,8 @@ static BOOL Field_CheckMapTransition (FieldSystem *fieldSystem, const FieldInput } else if (sub_0205DC50(tileBehavior)) { transitionType = 3; } else if (sub_0205DAF8(tileBehavior) || sub_0205DB28(tileBehavior) - || sub_0205DB04(tileBehavior) || sub_0205DB34(tileBehavior) - || sub_0205DB1C(tileBehavior) || sub_0205DB4C(tileBehavior)) { + || sub_0205DB04(tileBehavior) || sub_0205DB34(tileBehavior) + || sub_0205DB1C(tileBehavior) || sub_0205DB4C(tileBehavior)) { sub_02056C18(fieldSystem, nextMap.mapId, nextMap.unk_04, 0, 0, input->transitionDir); return TRUE; } else { @@ -649,7 +648,7 @@ static BOOL Field_CheckMapTransition (FieldSystem *fieldSystem, const FieldInput return TRUE; } -u16 Field_TileBehaviorToScript (FieldSystem *fieldSystem, u8 behavior) +u16 Field_TileBehaviorToScript(FieldSystem *fieldSystem, u8 behavior) { int playerDir = PlayerAvatar_GetDir(fieldSystem->playerAvatar); @@ -695,11 +694,11 @@ u16 Field_TileBehaviorToScript (FieldSystem *fieldSystem, u8 behavior) } } } - + return 0xffff; } -static BOOL Field_ProcessStep (FieldSystem *fieldSystem) +static BOOL Field_ProcessStep(FieldSystem *fieldSystem) { if (sub_02071CB4(fieldSystem, 3) == TRUE && ov8_0224AAA8(fieldSystem)) { return TRUE; @@ -766,10 +765,10 @@ static BOOL Field_ProcessStep (FieldSystem *fieldSystem) return FALSE; } -static BOOL Field_CheckCoordEvent (FieldSystem *fieldSystem) +static BOOL Field_CheckCoordEvent(FieldSystem *fieldSystem) { u16 event = sub_0203CC14(fieldSystem, MapHeaderData_GetCoordEvents(fieldSystem), MapHeaderData_GetNumCoordEvents(fieldSystem)); - + if (event != 0xffff) { sub_0203E880(fieldSystem, event, NULL); return TRUE; @@ -778,7 +777,7 @@ static BOOL Field_CheckCoordEvent (FieldSystem *fieldSystem) return FALSE; } -static BOOL Field_CheckTransition (FieldSystem *fieldSystem, const int playerX, const int playerZ, const u8 curTileBehavior) +static BOOL Field_CheckTransition(FieldSystem *fieldSystem, const int playerX, const int playerZ, const u8 curTileBehavior) { Location nextMap; @@ -825,7 +824,7 @@ static BOOL Field_CheckTransition (FieldSystem *fieldSystem, const int playerX, return FALSE; } -static BOOL Field_UpdateDaycare (FieldSystem *fieldSystem) +static BOOL Field_UpdateDaycare(FieldSystem *fieldSystem) { Party *party = Party_GetFromSavedata(fieldSystem->saveData); UnkStruct_02026310 *v1 = sub_02026310(fieldSystem->saveData); @@ -843,24 +842,24 @@ static BOOL Field_UpdateDaycare (FieldSystem *fieldSystem) return FALSE; } -static BOOL Field_UpdateVsSeeker (FieldSystem *fieldSystem) +static BOOL Field_UpdateVsSeeker(FieldSystem *fieldSystem) { VsSeeker_UpdateStepCount(fieldSystem); return FALSE; } -static BOOL Field_UpdatePokeRadar (FieldSystem *fieldSystem) +static BOOL Field_UpdatePokeRadar(FieldSystem *fieldSystem) { RadarChargeStep(fieldSystem); return FALSE; } -static BOOL Field_UpdateRepel (FieldSystem *fieldSystem) +static BOOL Field_UpdateRepel(FieldSystem *fieldSystem) { return ov6_02246BF4(fieldSystem->saveData, fieldSystem); } -static BOOL Field_UpdateFriendship (FieldSystem *fieldSystem) +static BOOL Field_UpdateFriendship(FieldSystem *fieldSystem) { VarsFlags *vars; BOOL ret = FALSE; @@ -880,7 +879,7 @@ static BOOL Field_UpdateFriendship (FieldSystem *fieldSystem) return ret; } -static void Field_CalculateFriendship (FieldSystem *fieldSystem) +static void Field_CalculateFriendship(FieldSystem *fieldSystem) { // C99-style declarations don't match int i, partyCount; @@ -895,7 +894,7 @@ static void Field_CalculateFriendship (FieldSystem *fieldSystem) } } -static BOOL Field_UpdatePoison (FieldSystem *fieldSystem) +static BOOL Field_UpdatePoison(FieldSystem *fieldSystem) { Party *party = Party_GetFromSavedata(fieldSystem->saveData); u16 *poisonSteps = sub_0203A78C(SaveData_GetFieldOverworldState(fieldSystem->saveData)); @@ -922,7 +921,7 @@ static BOOL Field_UpdatePoison (FieldSystem *fieldSystem) return FALSE; } -static BOOL Field_UpdateSafari (FieldSystem *fieldSystem) +static BOOL Field_UpdateSafari(FieldSystem *fieldSystem) { if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)) == FALSE) { return FALSE; @@ -946,19 +945,19 @@ static BOOL Field_UpdateSafari (FieldSystem *fieldSystem) return FALSE; } -static void Field_GetPlayerPos (const FieldSystem *fieldSystem, int *playerX, int *playerZ) +static void Field_GetPlayerPos(const FieldSystem *fieldSystem, int *playerX, int *playerZ) { *playerX = Player_GetXPos(fieldSystem->playerAvatar); *playerZ = Player_GetZPos(fieldSystem->playerAvatar); } -static void Field_Step (const FieldSystem *fieldSystem, int *playerX, int *playerZ) +static void Field_Step(const FieldSystem *fieldSystem, int *playerX, int *playerZ) { int playerDir = PlayerAvatar_GetDir(fieldSystem->playerAvatar); Field_StepInDirection(fieldSystem, playerDir, playerX, playerZ); } -static void Field_StepInDirection (const FieldSystem *fieldSystem, int playerDir, int *playerX, int *playerZ) +static void Field_StepInDirection(const FieldSystem *fieldSystem, int playerDir, int *playerX, int *playerZ) { Field_GetPlayerPos(fieldSystem, playerX, playerZ); @@ -980,21 +979,21 @@ static void Field_StepInDirection (const FieldSystem *fieldSystem, int playerDir } } -static u8 Field_CurrentTileBehavior (const FieldSystem *fieldSystem) +static u8 Field_CurrentTileBehavior(const FieldSystem *fieldSystem) { int playerX, playerZ; Field_GetPlayerPos(fieldSystem, &playerX, &playerZ); return sub_02054F94(fieldSystem, playerX, playerZ); } -static u8 Field_NextTileBehavior (const FieldSystem *fieldSystem) +static u8 Field_NextTileBehavior(const FieldSystem *fieldSystem) { int playerX, playerZ; Field_Step(fieldSystem, &playerX, &playerZ); return sub_02054F94(fieldSystem, playerX, playerZ); } -static BOOL Field_MapConnection (const FieldSystem *fieldSystem, int playerX, int playerZ, Location *nextMap) +static BOOL Field_MapConnection(const FieldSystem *fieldSystem, int playerX, int playerZ, Location *nextMap) { const WarpEvent *v0; int v1; @@ -1024,7 +1023,7 @@ static BOOL Field_MapConnection (const FieldSystem *fieldSystem, int playerX, in return TRUE; } -static void Field_SetMapConnection (FieldSystem *fieldSystem, const int playerX, const int playerZ, const int playerDir) +static void Field_SetMapConnection(FieldSystem *fieldSystem, const int playerX, const int playerZ, const int playerDir) { FieldOverworldState *v0 = SaveData_GetFieldOverworldState(fieldSystem->saveData); Location *nextMap = sub_0203A72C(v0); @@ -1042,7 +1041,7 @@ static void Field_SetMapConnection (FieldSystem *fieldSystem, const int playerX, nextMap->unk_04 = -1; } -static void Field_TrySetMapConnection (FieldSystem *fieldSystem) +static void Field_TrySetMapConnection(FieldSystem *fieldSystem) { int playerX, playerZ; Field_GetPlayerPos(fieldSystem, &playerX, &playerZ); @@ -1065,7 +1064,7 @@ static void Field_TrySetMapConnection (FieldSystem *fieldSystem) } } -static BOOL Field_DistortionInteract (FieldSystem *fieldSystem, MapObject **object) +static BOOL Field_DistortionInteract(FieldSystem *fieldSystem, MapObject **object) { int objectIndex = 0; int playerX, playerY, playerZ, objectX, objectY, objectZ; diff --git a/src/overlay005/field_motion_blur.c b/src/overlay005/field_motion_blur.c index 02beaa61ec..dcd8fc2599 100644 --- a/src/overlay005/field_motion_blur.c +++ b/src/overlay005/field_motion_blur.c @@ -1,12 +1,14 @@ +#include "overlay005/field_motion_blur.h" + #include #include #include "constants/heap.h" -#include "heap.h" -#include "gx_layers.h" #include "overlay005/motion_blur.h" -#include "overlay005/field_motion_blur.h" + +#include "gx_layers.h" +#include "heap.h" FieldMotionBlur *FieldMotionBlur_Start(int coeffA, int coeffB) { diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index c869c34fb0..854baddab1 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -1,94 +1,92 @@ #include #include -#include "inlines.h" -#include "core_sys.h" - #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02020C44_decl.h" #include "struct_decls/struct_02027860_decl.h" #include "struct_decls/struct_0203A790_decl.h" -#include "field/field_system_sub2_decl.h" -#include "overlay005/struct_ov5_021D1A68_decl.h" +#include "struct_defs/struct_020556C4.h" +#include "struct_defs/struct_02099F80.h" +#include "field/field_system.h" +#include "field/field_system_sub2_decl.h" +#include "field/field_system_sub2_t.h" #include "overlay005/const_ov5_021F89B0.h" #include "overlay005/const_ov5_021FF6B8.h" #include "overlay005/const_ov5_021FF744.h" #include "overlay005/const_ov5_021FF7D0.h" - -#include "field/field_system.h" -#include "field/field_system_sub2_t.h" -#include "struct_defs/struct_020556C4.h" -#include "struct_defs/struct_02099F80.h" +#include "overlay005/hblank_system.h" +#include "overlay005/ov5_021D0D80.h" +#include "overlay005/ov5_021D1A94.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021D521C.h" +#include "overlay005/ov5_021D57BC.h" +#include "overlay005/ov5_021D5878.h" +#include "overlay005/ov5_021D5B40.h" +#include "overlay005/ov5_021D5BC0.h" +#include "overlay005/ov5_021D5CB0.h" +#include "overlay005/ov5_021D5EB8.h" +#include "overlay005/ov5_021DD6FC.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021E1B08.h" +#include "overlay005/ov5_021E779C.h" +#include "overlay005/ov5_021EA714.h" +#include "overlay005/ov5_021ECC20.h" +#include "overlay005/ov5_021ECE40.h" +#include "overlay005/ov5_021EE75C.h" +#include "overlay005/ov5_021EF250.h" +#include "overlay005/ov5_021EF4BC.h" +#include "overlay005/ov5_021EF75C.h" +#include "overlay005/ov5_021EFB0C.h" +#include "overlay005/ov5_021F0824.h" +#include "overlay005/ov5_021F10E8.h" +#include "overlay005/struct_ov5_021D1A68_decl.h" #include "overlay005/struct_ov5_021D5894.h" #include "overlay005/struct_ov5_021ED0A4.h" +#include "overlay009/ov9_02249960.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "camera.h" +#include "comm_player_manager.h" +#include "core_sys.h" +#include "field_map_change.h" +#include "field_overworld_state.h" +#include "field_system.h" #include "game_overlay.h" -#include "overlay_manager.h" +#include "gx_layers.h" +#include "heap.h" +#include "inlines.h" +#include "map_header.h" +#include "map_header_data.h" +#include "map_object.h" #include "narc.h" +#include "overlay_manager.h" +#include "player_avatar.h" +#include "pokeradar.h" +#include "savedata_misc.h" #include "unk_0200A784.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201C970.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_02020AEC.h" #include "unk_0202419C.h" -#include "savedata_misc.h" #include "unk_02027F50.h" #include "unk_02039C80.h" -#include "map_header.h" -#include "map_header_data.h" -#include "field_overworld_state.h" -#include "field_system.h" #include "unk_0203E880.h" #include "unk_020508D4.h" -#include "field_map_change.h" #include "unk_020553DC.h" #include "unk_020556C4.h" #include "unk_020559DC.h" #include "unk_02055C50.h" -#include "comm_player_manager.h" #include "unk_0205D8CC.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_02068344.h" -#include "pokeradar.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay005/ov5_021D1A94.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021D521C.h" -#include "overlay005/ov5_021D57BC.h" -#include "overlay005/ov5_021D5878.h" -#include "overlay005/ov5_021D5B40.h" -#include "overlay005/ov5_021D5BC0.h" -#include "overlay005/ov5_021D5CB0.h" -#include "overlay005/ov5_021D5EB8.h" -#include "overlay005/ov5_021DD6FC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021E1B08.h" -#include "overlay005/ov5_021E779C.h" -#include "overlay005/ov5_021EA714.h" -#include "overlay005/ov5_021ECC20.h" -#include "overlay005/ov5_021ECE40.h" -#include "overlay005/ov5_021EE75C.h" -#include "overlay005/ov5_021EF250.h" -#include "overlay005/hblank_system.h" -#include "overlay005/ov5_021EF4BC.h" -#include "overlay005/ov5_021EF75C.h" -#include "overlay005/ov5_021EFB0C.h" -#include "overlay005/ov5_021F0824.h" -#include "overlay005/ov5_021F10E8.h" -#include "overlay009/ov9_02249960.h" FS_EXTERN_OVERLAY(overlay6); FS_EXTERN_OVERLAY(overlay7); @@ -100,47 +98,46 @@ struct UnkStruct_ov5_021D1A68_t { int unk_02[24]; }; -static void ov5_021D1444(BGL * bgl); -static void ov5_021D1524(BGL * bgl); +static void ov5_021D1444(BGL *bgl); +static void ov5_021D1524(BGL *bgl); static void ov5_021D154C(void); static void ov5_021D1570(void); -static void ov5_021D1578(UnkStruct_ov5_021D5894 * param0); -static void ov5_021D15F4(FieldSystem * fieldSystem); -static void ov5_021D173C(FieldSystem * fieldSystem); +static void ov5_021D1578(UnkStruct_ov5_021D5894 *param0); +static void ov5_021D15F4(FieldSystem *fieldSystem); +static void ov5_021D173C(FieldSystem *fieldSystem); static void ov5_021D1414(void); static void ov5_021D15B4(void); static void ov5_021D15E8(void); -static void ov5_021D1790(FieldSystem * fieldSystem); -static void ov5_021D17EC(FieldSystem * fieldSystem); -static void ov5_021D1878(FieldSystem * fieldSystem); -static void ov5_021D1968(FieldSystem * fieldSystem); -static BOOL FieldMap_Init(OverlayManager * overlayMan, int * param1); -static BOOL FieldMap_Main(OverlayManager * overlayMan, int * param1); -static BOOL FieldMap_Exit(OverlayManager * overlayMan, int * param1); -static BOOL FieldMap_ChangeZone(FieldSystem * fieldSystem); -static void ov5_021D134C(FieldSystem * fieldSystem, u8 param1); -static BOOL ov5_021D119C(FieldSystem * fieldSystem); -static void ov5_021D0D80(void * param0); -static void ov5_021D13B4(FieldSystem * fieldSystem); -static int ov5_021D1178(FieldSystem * fieldSystem); -static BOOL FieldMap_InDistortionWorld(FieldSystem * fieldSystem); -static UnkStruct_ov5_021D1A68 * ov5_021D1A14(int param0, int param1); -static const int * ov5_021D1A68(const UnkStruct_ov5_021D1A68 * param0); -static const int ov5_021D1A6C(const UnkStruct_ov5_021D1A68 * param0); -static void ov5_021D1A70(UnkStruct_ov5_021D1A68 * param0); - - -static inline void inline_ov5_021D0D80 (FieldSystem * fieldSystem) -{ - UnkStruct_ov5_021ED0A4 * v0 = sub_0206285C(fieldSystem->mapObjMan); - UnkStruct_02020C44 * v1 = ov5_021EDC8C(v0); +static void ov5_021D1790(FieldSystem *fieldSystem); +static void ov5_021D17EC(FieldSystem *fieldSystem); +static void ov5_021D1878(FieldSystem *fieldSystem); +static void ov5_021D1968(FieldSystem *fieldSystem); +static BOOL FieldMap_Init(OverlayManager *overlayMan, int *param1); +static BOOL FieldMap_Main(OverlayManager *overlayMan, int *param1); +static BOOL FieldMap_Exit(OverlayManager *overlayMan, int *param1); +static BOOL FieldMap_ChangeZone(FieldSystem *fieldSystem); +static void ov5_021D134C(FieldSystem *fieldSystem, u8 param1); +static BOOL ov5_021D119C(FieldSystem *fieldSystem); +static void ov5_021D0D80(void *param0); +static void ov5_021D13B4(FieldSystem *fieldSystem); +static int ov5_021D1178(FieldSystem *fieldSystem); +static BOOL FieldMap_InDistortionWorld(FieldSystem *fieldSystem); +static UnkStruct_ov5_021D1A68 *ov5_021D1A14(int param0, int param1); +static const int *ov5_021D1A68(const UnkStruct_ov5_021D1A68 *param0); +static const int ov5_021D1A6C(const UnkStruct_ov5_021D1A68 *param0); +static void ov5_021D1A70(UnkStruct_ov5_021D1A68 *param0); + +static inline void inline_ov5_021D0D80(FieldSystem *fieldSystem) +{ + UnkStruct_ov5_021ED0A4 *v0 = sub_0206285C(fieldSystem->mapObjMan); + UnkStruct_02020C44 *v1 = ov5_021EDC8C(v0); sub_02020D68(v1); } -static void ov5_021D0D80 (void * param0) +static void ov5_021D0D80(void *param0) { - FieldSystem * fieldSystem = param0; + FieldSystem *fieldSystem = param0; sub_0201C2B8(fieldSystem->unk_08); sub_0201DCAC(); @@ -149,9 +146,9 @@ static void ov5_021D0D80 (void * param0) inline_ov5_021D0D80(fieldSystem); } -static BOOL FieldMap_Init (OverlayManager * overlayMan, int * param1) +static BOOL FieldMap_Init(OverlayManager *overlayMan, int *param1) { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; BOOL ret = FALSE; fieldSystem = OverlayManager_Args(overlayMan); @@ -245,9 +242,9 @@ static BOOL FieldMap_Init (OverlayManager * overlayMan, int * param1) return ret; } -static BOOL FieldMap_Main (OverlayManager * overlayMan, int * param1) +static BOOL FieldMap_Main(OverlayManager *overlayMan, int *param1) { - FieldSystem * fieldSystem = OverlayManager_Args(overlayMan); + FieldSystem *fieldSystem = OverlayManager_Args(overlayMan); if (ov5_021D119C(fieldSystem)) { sub_02055D94(fieldSystem); @@ -266,9 +263,9 @@ static BOOL FieldMap_Main (OverlayManager * overlayMan, int * param1) } } -static BOOL FieldMap_Exit (OverlayManager * overlayMan, int * param1) +static BOOL FieldMap_Exit(OverlayManager *overlayMan, int *param1) { - FieldSystem * fieldSystem = OverlayManager_Args(overlayMan); + FieldSystem *fieldSystem = OverlayManager_Args(overlayMan); ov5_021E8188(fieldSystem, fieldSystem->unk_28); switch (*param1) { @@ -369,9 +366,9 @@ const OverlayManagerTemplate gFieldMapTemplate = { 0xffffffff }; -static int ov5_021D1178 (FieldSystem * fieldSystem) +static int ov5_021D1178(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); + UnkStruct_02027860 *v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); int v1 = sub_02027F80(v0); if (v1 == 0) { @@ -385,7 +382,7 @@ static int ov5_021D1178 (FieldSystem * fieldSystem) return 0; } -static BOOL ov5_021D119C (FieldSystem * fieldSystem) +static BOOL ov5_021D119C(FieldSystem *fieldSystem) { int x, y; @@ -401,12 +398,12 @@ static BOOL ov5_021D119C (FieldSystem * fieldSystem) } } -static BOOL FieldMap_ChangeZone (FieldSystem * fieldSystem) +static BOOL FieldMap_ChangeZone(FieldSystem *fieldSystem) { u32 v0; u32 v1; int v2, v3; - FieldOverworldState * v4; + FieldOverworldState *v4; if (FieldMap_InDistortionWorld(fieldSystem) == 1) { return 0; @@ -431,7 +428,7 @@ static BOOL FieldMap_ChangeZone (FieldSystem * fieldSystem) { int v5 = MapHeaderData_GetNumObjectEvents(fieldSystem); - const ObjectEvent * v6 = MapHeaderData_GetObjectEvents(fieldSystem); + const ObjectEvent *v6 = MapHeaderData_GetObjectEvents(fieldSystem); sub_0206184C(fieldSystem->mapObjMan, v1, v0, v5, v6); } @@ -467,10 +464,10 @@ static BOOL FieldMap_ChangeZone (FieldSystem * fieldSystem) return TRUE; } -void ov5_021D12D0 (FieldSystem * fieldSystem, u32 param1) +void ov5_021D12D0(FieldSystem *fieldSystem, u32 param1) { u32 v0; - FieldOverworldState * v1; + FieldOverworldState *v1; v0 = fieldSystem->location->mapId; v1 = SaveData_GetFieldOverworldState(fieldSystem->saveData); @@ -484,7 +481,7 @@ void ov5_021D12D0 (FieldSystem * fieldSystem, u32 param1) { int v2 = MapHeaderData_GetNumObjectEvents(fieldSystem); - const ObjectEvent * v3 = MapHeaderData_GetObjectEvents(fieldSystem); + const ObjectEvent *v3 = MapHeaderData_GetObjectEvents(fieldSystem); sub_0206184C(fieldSystem->mapObjMan, v0, param1, v2, v3); } @@ -499,7 +496,7 @@ void ov5_021D12D0 (FieldSystem * fieldSystem, u32 param1) } } -static void ov5_021D134C (FieldSystem * fieldSystem, u8 param1) +static void ov5_021D134C(FieldSystem *fieldSystem, u8 param1) { if (sub_020509A4(fieldSystem) == 0) { sub_020559DC(fieldSystem); @@ -529,9 +526,9 @@ static void ov5_021D134C (FieldSystem * fieldSystem, u8 param1) } } -static void ov5_021D13B4 (FieldSystem * fieldSystem) +static void ov5_021D13B4(FieldSystem *fieldSystem) { - UnkStruct_020556C4 * v0; + UnkStruct_020556C4 *v0; int v1, v2, v3; if (MapHeader_IsOnMainMatrix(fieldSystem->location->mapId) == 0) { @@ -546,7 +543,7 @@ static void ov5_021D13B4 (FieldSystem * fieldSystem) sub_02055740(v0, v1, v2, v3); } -static void ov5_021D1414 (void) +static void ov5_021D1414(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_C, @@ -564,17 +561,17 @@ static void ov5_021D1414 (void) GXLayers_SetBanks(&v0); } -void ov5_021D1434 (BGL * bgl) +void ov5_021D1434(BGL *bgl) { ov5_021D1444(bgl); } -void ov5_021D143C (BGL * bgl) +void ov5_021D143C(BGL *bgl) { ov5_021D1524(bgl); } -static void ov5_021D1444 (BGL * bgl) +static void ov5_021D1444(BGL *bgl) { { UnkStruct_ov84_0223BA5C v0 = { @@ -660,7 +657,7 @@ static void ov5_021D1444 (BGL * bgl) } } -static void ov5_021D1524 (BGL * bgl) +static void ov5_021D1524(BGL *bgl) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 0); sub_02019044(bgl, 1); @@ -668,18 +665,18 @@ static void ov5_021D1524 (BGL * bgl) sub_02019044(bgl, 3); } -static void ov5_021D154C (void) +static void ov5_021D154C(void) { NNS_G2dInitOamManagerModule(); sub_0200A784(0, 124, 0, 31, 0, 124, 0, 31, 4); } -static void ov5_021D1570 (void) +static void ov5_021D1570(void) { sub_0200A878(); } -static void ov5_021D1578 (UnkStruct_ov5_021D5894 * param0) +static void ov5_021D1578(UnkStruct_ov5_021D5894 *param0) { ov5_021D5ADC(param0, GX_POLYGONMODE_MODULATE, 0); ov5_021D5AF0(param0, GX_CULL_BACK, 0); @@ -688,7 +685,7 @@ static void ov5_021D1578 (UnkStruct_ov5_021D5894 * param0) ov5_021D58A8(param0, 1 << 22); } -void ov5_021D15B4 (void) +void ov5_021D15B4(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -703,13 +700,13 @@ void ov5_021D15B4 (void) sub_0201F8E4(); } -void ov5_021D15E8 (void) +void ov5_021D15E8(void) { sub_0201E958(); sub_0201F8B4(); } -static void ov5_021D15F4 (FieldSystem * fieldSystem) +static void ov5_021D15F4(FieldSystem *fieldSystem) { MtxFx44 v0, v1; @@ -735,7 +732,7 @@ static void ov5_021D15F4 (FieldSystem * fieldSystem) ov5_021E1A6C(fieldSystem->unk_A4, fieldSystem->unk_30); { - const MtxFx44 * v2; + const MtxFx44 *v2; v2 = NNS_G3dGlbGetProjectionMtx(); v0 = *v2; @@ -762,7 +759,7 @@ static void ov5_021D15F4 (FieldSystem * fieldSystem) G3_RequestSwapBuffers(GX_SORTMODE_AUTO, gBufferMode); } -void ov5_021D16F4 (FieldSystem * fieldSystem, BOOL param1) +void ov5_021D16F4(FieldSystem *fieldSystem, BOOL param1) { if (param1 == 1) { fieldSystem->unk_C0 |= 4; @@ -771,7 +768,7 @@ void ov5_021D16F4 (FieldSystem * fieldSystem, BOOL param1) } } -void ov5_021D1718 (FieldSystem * fieldSystem, BOOL param1) +void ov5_021D1718(FieldSystem *fieldSystem, BOOL param1) { if (param1 == 1) { fieldSystem->unk_C0 |= 1; @@ -780,12 +777,12 @@ void ov5_021D1718 (FieldSystem * fieldSystem, BOOL param1) } } -static void ov5_021D173C (FieldSystem * fieldSystem) +static void ov5_021D173C(FieldSystem *fieldSystem) { fieldSystem->unk_C0 = (8 | 1 | 2 | 4); } -void ov5_021D1744 (const u8 param0) +void ov5_021D1744(const u8 param0) { if (param0 == 1) { sub_0200F174( @@ -798,7 +795,7 @@ void ov5_021D1744 (const u8 param0) } } -static void ov5_021D1790 (FieldSystem * fieldSystem) +static void ov5_021D1790(FieldSystem *fieldSystem) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); G3_SwapBuffers(GX_SORTMODE_AUTO, gBufferMode); @@ -819,7 +816,7 @@ static void ov5_021D1790 (FieldSystem * fieldSystem) } } -static void ov5_021D17EC (FieldSystem * fieldSystem) +static void ov5_021D17EC(FieldSystem *fieldSystem) { fieldSystem->unk_28 = ov5_021E9084(fieldSystem->unk_2C, fieldSystem->unk_30, fieldSystem->unk_50, fieldSystem->unk_60); @@ -842,7 +839,7 @@ static void ov5_021D17EC (FieldSystem * fieldSystem) ov5_021E9150(fieldSystem->unk_28, fieldSystem->location->x, fieldSystem->location->z); } -static void ov5_021D1878 (FieldSystem * fieldSystem) +static void ov5_021D1878(FieldSystem *fieldSystem) { fieldSystem->unk_40 = ov5_021DF440(fieldSystem, 34, 4); @@ -863,7 +860,7 @@ static void ov5_021D1878 (FieldSystem * fieldSystem) } { - const u32 * v1; + const u32 *v1; if (fieldSystem->unk_70 == 1) { v1 = Unk_ov5_021FF7D0; @@ -891,7 +888,7 @@ static void ov5_021D1878 (FieldSystem * fieldSystem) FieldEffect_InitRenderObject(fieldSystem->unk_40); { - UnkStruct_02027860 * v3 = sub_02027860(FieldSystem_SaveData(fieldSystem)); + UnkStruct_02027860 *v3 = sub_02027860(FieldSystem_SaveData(fieldSystem)); int v4 = sub_02027F80(v3); PlayerAvatar_InitDraw(fieldSystem->playerAvatar, v4); @@ -905,7 +902,7 @@ static void ov5_021D1878 (FieldSystem * fieldSystem) fieldSystem->unk_04->unk_18 = sub_02055C8C(fieldSystem, 4); } -static void ov5_021D1968 (FieldSystem * fieldSystem) +static void ov5_021D1968(FieldSystem *fieldSystem) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_TurnBothDispOn(); @@ -936,11 +933,11 @@ static void ov5_021D1968 (FieldSystem * fieldSystem) SetMainCallback(ov5_021D0D80, fieldSystem); } -static UnkStruct_ov5_021D1A68 * ov5_021D1A14 (int fieldSystem, int param1) +static UnkStruct_ov5_021D1A68 *ov5_021D1A14(int fieldSystem, int param1) { int v0; - u16 * v1; - UnkStruct_ov5_021D1A68 * v2; + u16 *v1; + UnkStruct_ov5_021D1A68 *v2; v2 = Heap_AllocFromHeap(fieldSystem, sizeof(UnkStruct_ov5_021D1A68)); v1 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__MM_LIST__MOVE_MODEL_LIST, param1, fieldSystem); @@ -962,24 +959,24 @@ static UnkStruct_ov5_021D1A68 * ov5_021D1A14 (int fieldSystem, int param1) return v2; } -static const int * ov5_021D1A68 (const UnkStruct_ov5_021D1A68 * param0) +static const int *ov5_021D1A68(const UnkStruct_ov5_021D1A68 *param0) { return param0->unk_02; } -static const int ov5_021D1A6C (const UnkStruct_ov5_021D1A68 * param0) +static const int ov5_021D1A6C(const UnkStruct_ov5_021D1A68 *param0) { return param0->unk_00; } -static void ov5_021D1A70 (UnkStruct_ov5_021D1A68 * param0) +static void ov5_021D1A70(UnkStruct_ov5_021D1A68 *param0) { Heap_FreeToHeap(param0); } -static BOOL FieldMap_InDistortionWorld (FieldSystem * fieldSystem) +static BOOL FieldMap_InDistortionWorld(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); + UnkStruct_02027860 *v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); int v1 = sub_02027F80(v0); if (v1 == 9) { diff --git a/src/overlay005/hblank_system.c b/src/overlay005/hblank_system.c index 1704d11146..233be8b959 100644 --- a/src/overlay005/hblank_system.c +++ b/src/overlay005/hblank_system.c @@ -1,9 +1,10 @@ +#include "overlay005/hblank_system.h" + #include #include -#include "unk_02017728.h" #include "heap.h" -#include "overlay005/hblank_system.h" +#include "unk_02017728.h" static void HBlankSystem_Init(HBlankSystem *hBlankSystem); static void HBlankTask_Init(HBlankTask *task); @@ -11,7 +12,7 @@ static void HBlankSystem_HBlankCallback(void *param); static void HBlankTask_DummyCallback(HBlankTask *task, void *param); static HBlankTask *HBlankSystem_GetAvailableTask(HBlankSystem *hBlankSystem); -HBlankSystem * HBlankSystem_New(enum HeapId heapID) +HBlankSystem *HBlankSystem_New(enum HeapId heapID) { HBlankSystem *hBlankSystem = Heap_AllocFromHeap(heapID, sizeof(HBlankSystem)); HBlankSystem_Init(hBlankSystem); diff --git a/src/overlay005/motion_blur.c b/src/overlay005/motion_blur.c index 5a1c32768b..d6b256b2a2 100644 --- a/src/overlay005/motion_blur.c +++ b/src/overlay005/motion_blur.c @@ -1,10 +1,11 @@ +#include "overlay005/motion_blur.h" + #include #include -#include "unk_0200679C.h" #include "sys_task.h" #include "sys_task_manager.h" -#include "overlay005/motion_blur.h" +#include "unk_0200679C.h" #define MOTION_BLUR_INIT_BLEND_COEFF_A 16 #define MOTION_BLUR_INIT_BLEND_COEFF_B 0 @@ -62,14 +63,13 @@ static void MotionBlur_SetCapture(SysTask *task, void *param) if (motionBlur->initialized) { GX_SetCapture( - motionBlur->params.captureSize, - motionBlur->params.captureMode, - motionBlur->params.captureSourceA, - motionBlur->params.captureSourceB, - motionBlur->params.captureDestination, - motionBlur->params.blendCoeffA, - motionBlur->params.blendCoeffB - ); + motionBlur->params.captureSize, + motionBlur->params.captureMode, + motionBlur->params.captureSourceA, + motionBlur->params.captureSourceB, + motionBlur->params.captureDestination, + motionBlur->params.blendCoeffA, + motionBlur->params.blendCoeffB); } } @@ -120,12 +120,11 @@ static void MotionBlur_Init(MotionBlurParams *params) } GX_SetCapture( - params->captureSize, - params->captureMode, - params->captureSourceA, - params->captureSourceB, - params->captureDestination, + params->captureSize, + params->captureMode, + params->captureSourceA, + params->captureSourceB, + params->captureDestination, MOTION_BLUR_INIT_BLEND_COEFF_A, - MOTION_BLUR_INIT_BLEND_COEFF_B - ); + MOTION_BLUR_INIT_BLEND_COEFF_B); } diff --git a/src/overlay005/ov5_021D1A94.c b/src/overlay005/ov5_021D1A94.c index bdf5b809ba..f85b0e324c 100644 --- a/src/overlay005/ov5_021D1A94.c +++ b/src/overlay005/ov5_021D1A94.c @@ -1,38 +1,38 @@ +#include "overlay005/ov5_021D1A94.h" + #include #include -#include "overlay005/struct_ov5_021D1A94_decl.h" -#include "overlay005/struct_ov5_021D1BEC_decl.h" - #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay005/struct_ov5_021D1A94_decl.h" +#include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay006/struct_ov6_0223E6EC.h" -#include "sys_task.h" +#include "field_system.h" #include "heap.h" +#include "sys_task.h" #include "sys_task_manager.h" -#include "field_system.h" -#include "overlay005/ov5_021D1A94.h" struct UnkStruct_ov5_021D1A94_t { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; int unk_04; int unk_08; - UnkStruct_ov5_021D1BEC * unk_0C; - SysTaskManager * unk_10; + UnkStruct_ov5_021D1BEC *unk_0C; + SysTaskManager *unk_10; }; struct UnkStruct_ov5_021D1BEC_t { - UnkStruct_ov5_021D1A94 * unk_00; - SysTask * unk_04; - SysTask * unk_08; - const UnkStruct_ov6_0223E6EC * unk_0C; - void * unk_10; + UnkStruct_ov5_021D1A94 *unk_00; + SysTask *unk_04; + SysTask *unk_08; + const UnkStruct_ov6_0223E6EC *unk_0C; + void *unk_10; }; -UnkStruct_ov5_021D1A94 * ov5_021D1A94 (FieldSystem * fieldSystem, int param1, int param2) +UnkStruct_ov5_021D1A94 *ov5_021D1A94(FieldSystem *fieldSystem, int param1, int param2) { - UnkStruct_ov5_021D1A94 * v0; + UnkStruct_ov5_021D1A94 *v0; u32 v1; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021D1A94)); @@ -52,7 +52,7 @@ UnkStruct_ov5_021D1A94 * ov5_021D1A94 (FieldSystem * fieldSystem, int param1, in return v0; } -void ov5_021D1AE4 (UnkStruct_ov5_021D1A94 * param0) +void ov5_021D1AE4(UnkStruct_ov5_021D1A94 *param0) { int v0; @@ -65,14 +65,14 @@ void ov5_021D1AE4 (UnkStruct_ov5_021D1A94 * param0) Heap_FreeToHeap(param0); } -void ov5_021D1B18 (UnkStruct_ov5_021D1A94 * param0) +void ov5_021D1B18(UnkStruct_ov5_021D1A94 *param0) { SysTaskManager_ExecuteTasks(param0->unk_10); } -static void ov5_021D1B24 (SysTask * param0, void * param1) +static void ov5_021D1B24(SysTask *param0, void *param1) { - UnkStruct_ov5_021D1BEC * v0 = param1; + UnkStruct_ov5_021D1BEC *v0 = param1; if (sub_0203CD5C(v0->unk_00->fieldSystem)) { if (v0->unk_0C->unk_10) { @@ -81,9 +81,9 @@ static void ov5_021D1B24 (SysTask * param0, void * param1) } } -static void ov5_021D1B48 (SysTask * param0, void * param1) +static void ov5_021D1B48(SysTask *param0, void *param1) { - UnkStruct_ov5_021D1BEC * v0 = param1; + UnkStruct_ov5_021D1BEC *v0 = param1; if (sub_0203CD5C(v0->unk_00->fieldSystem)) { if (v0->unk_0C->unk_14) { @@ -92,10 +92,10 @@ static void ov5_021D1B48 (SysTask * param0, void * param1) } } -UnkStruct_ov5_021D1BEC * ov5_021D1B6C (UnkStruct_ov5_021D1A94 * param0, const UnkStruct_ov6_0223E6EC * param1) +UnkStruct_ov5_021D1BEC *ov5_021D1B6C(UnkStruct_ov5_021D1A94 *param0, const UnkStruct_ov6_0223E6EC *param1) { int v0; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; for (v1 = param0->unk_0C, v0 = 0; v0 < param0->unk_08; v1++, v0++) { if (v1->unk_04 == NULL) { @@ -123,7 +123,7 @@ UnkStruct_ov5_021D1BEC * ov5_021D1B6C (UnkStruct_ov5_021D1A94 * param0, const Un return NULL; } -void ov5_021D1BEC (UnkStruct_ov5_021D1BEC * param0) +void ov5_021D1BEC(UnkStruct_ov5_021D1BEC *param0) { if (param0->unk_04 == NULL) { return; @@ -143,7 +143,7 @@ void ov5_021D1BEC (UnkStruct_ov5_021D1BEC * param0) MI_CpuClear32(param0, sizeof(UnkStruct_ov5_021D1BEC)); } -void * ov5_021D1C2C (UnkStruct_ov5_021D1BEC * param0) +void *ov5_021D1C2C(UnkStruct_ov5_021D1BEC *param0) { return param0->unk_10; } diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c index 5fffef0a87..130170fd92 100644 --- a/src/overlay005/ov5_021D2F14.c +++ b/src/overlay005/ov5_021D2F14.c @@ -1,3 +1,5 @@ +#include "overlay005/ov5_021D2F14.h" + #include #include @@ -5,35 +7,34 @@ #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02009F38_decl.h" #include "struct_decls/struct_02022550_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_02009508.h" #include "struct_defs/struct_02009CFC.h" #include "struct_defs/struct_0200D0F4.h" + #include "overlay005/struct_ov5_021D30A8.h" #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay019/struct_ov19_021DA864.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay115/struct_ov115_02261520.h" +#include "heap.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_020218BC.h" -#include "overlay005/ov5_021D2F14.h" -static BOOL ov5_021D3478(UnkStruct_02009CFC * param0, UnkStruct_02009DC8 * param1); -static void ov5_021D34AC(UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int param3, int param4, int param5); -static void ov5_021D3518(UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4, int param5); +static BOOL ov5_021D3478(UnkStruct_02009CFC *param0, UnkStruct_02009DC8 *param1); +static void ov5_021D34AC(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4, int param5); +static void ov5_021D3518(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4, int param5); -void ov5_021D2F14 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F2EC * param1, u32 param2, u32 param3) +void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const UnkStruct_ov7_0224F2EC *param1, u32 param2, u32 param3) { - UnkStruct_02009F38 * v0; - UnkStruct_02009F38 * v1; - void * v2; + UnkStruct_02009F38 *v0; + UnkStruct_02009F38 *v1; + void *v2; u32 v3; u32 v4; @@ -84,7 +85,7 @@ void ov5_021D2F14 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F2EC Heap_FreeToHeap(v2); } -void ov5_021D30A8 (UnkStruct_ov5_021D30A8 * param0) +void ov5_021D30A8(UnkStruct_ov5_021D30A8 *param0) { u32 v0; @@ -99,11 +100,11 @@ void ov5_021D30A8 (UnkStruct_ov5_021D30A8 * param0) } } -GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1) +GraphicElementData *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const UnkStruct_ov7_0224F358 *param1) { UnkStruct_ov115_02261520 v0; - GraphicElementData * v1; - VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE}; + GraphicElementData *v1; + VecFx32 v2 = { FX32_ONE, FX32_ONE, FX32_ONE }; VecFx32 v3; v3.x = param1->unk_04 * FX32_ONE; @@ -128,11 +129,11 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr return v1; } -void ov5_021D3190 (UnkStruct_ov5_021D30A8 * param0, UnkStruct_ov104_02241308 * param1, u32 param2, u32 param3) +void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, UnkStruct_ov104_02241308 *param1, u32 param2, u32 param3) { - UnkStruct_02009F38 * v0; - UnkStruct_02009F38 * v1; - void * v2; + UnkStruct_02009F38 *v0; + UnkStruct_02009F38 *v1; + void *v2; u32 v3; u32 v4, v5; @@ -164,9 +165,9 @@ void ov5_021D3190 (UnkStruct_ov5_021D30A8 * param0, UnkStruct_ov104_02241308 * p } } -void ov5_021D3270 (UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int param3, int param4, int param5, int param6) +void ov5_021D3270(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; int v1; if (sub_02009D34(param0->unk_194[1], param6) == 0) { @@ -188,9 +189,9 @@ void ov5_021D3270 (UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int GF_ASSERT(0); } -void ov5_021D32E8 (UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4, int param5, int param6) +void ov5_021D32E8(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; int v1; if (sub_02009D34(param0->unk_194[1], param6) == 0) { @@ -212,29 +213,29 @@ void ov5_021D32E8 (UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, i GF_ASSERT(0); } -void ov5_021D3360 (UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int param3, int param4) +void ov5_021D3360(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4) { ov5_021D34AC(param0, param1, param2, param3, 2, param4); } -void ov5_021D3374 (UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4) +void ov5_021D3374(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4) { ov5_021D3518(param0, param1, param2, param3, 2, param4); } -void ov5_021D3388 (UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int param3, int param4) +void ov5_021D3388(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4) { ov5_021D34AC(param0, param1, param2, param3, 3, param4); } -void ov5_021D339C (UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4) +void ov5_021D339C(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4) { ov5_021D3518(param0, param1, param2, param3, 3, param4); } -void ov5_021D33B0 (UnkStruct_ov5_021D30A8 * param0, int param1, int param2, BOOL param3, int param4, int param5) +void ov5_021D33B0(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, BOOL param3, int param4, int param5) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; if (sub_02009D34(param0->unk_194[0], param5) == 0) { GF_ASSERT(0); @@ -252,9 +253,9 @@ void ov5_021D33B0 (UnkStruct_ov5_021D30A8 * param0, int param1, int param2, BOOL GF_ASSERT(0); } -void ov5_021D3414 (UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5) +void ov5_021D3414(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; if (sub_02009D34(param0->unk_194[0], param5) == 0) { GF_ASSERT(0); @@ -273,7 +274,7 @@ void ov5_021D3414 (UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, B GF_ASSERT(0); } -static BOOL ov5_021D3478 (UnkStruct_02009CFC * param0, UnkStruct_02009DC8 * param1) +static BOOL ov5_021D3478(UnkStruct_02009CFC *param0, UnkStruct_02009DC8 *param1) { int v0; @@ -291,9 +292,9 @@ static BOOL ov5_021D3478 (UnkStruct_02009CFC * param0, UnkStruct_02009DC8 * para return 0; } -static void ov5_021D34AC (UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int param3, int param4, int param5) +static void ov5_021D34AC(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int param3, int param4, int param5) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; int v1; if (sub_02009D34(param0->unk_194[param4], param5) == 0) { @@ -312,9 +313,9 @@ static void ov5_021D34AC (UnkStruct_ov5_021D30A8 * param0, int param1, int param GF_ASSERT(0); } -static void ov5_021D3518 (UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4, int param5) +static void ov5_021D3518(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4, int param5) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; int v1; if (sub_02009D34(param0->unk_194[param4], param5) == 0) { @@ -334,11 +335,11 @@ static void ov5_021D3518 (UnkStruct_ov5_021D30A8 * param0, NARC * param1, int pa GF_ASSERT(0); } -CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTemplate * param1) +CellActorData *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate *param1) { int v0; int v1; - CellActorData * v2 = NULL; + CellActorData *v2 = NULL; UnkStruct_ov115_02261520 v3; int v4[6]; @@ -398,7 +399,7 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl return v2; } -void ov5_021D375C (UnkStruct_ov5_021D30A8 * param0) +void ov5_021D375C(UnkStruct_ov5_021D30A8 *param0) { u32 v0; diff --git a/src/overlay005/ov5_021D37AC.c b/src/overlay005/ov5_021D37AC.c index 177a072cc4..b61c4730e5 100644 --- a/src/overlay005/ov5_021D37AC.c +++ b/src/overlay005/ov5_021D37AC.c @@ -1,27 +1,28 @@ +#include "overlay005/ov5_021D37AC.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "unk_02005474.h" -#include "narc.h" #include "heap.h" -#include "overlay005/ov5_021D37AC.h" +#include "narc.h" +#include "unk_02005474.h" typedef struct { BOOL unk_00; - NNSG3dRenderObj * unk_04; - UnkStruct_ov5_021D3CE4 * unk_08; + NNSG3dRenderObj *unk_04; + UnkStruct_ov5_021D3CE4 *unk_08; int unk_0C; } UnkStruct_ov5_021D37AC; typedef struct UnkStruct_ov5_021D3CE4_t { - NNSG3dAnmObj * unk_00; + NNSG3dAnmObj *unk_00; int unk_04; int unk_08; int unk_0C; BOOL unk_10; - void * unk_14; + void *unk_14; int unk_18; int unk_1C; BOOL unk_20; @@ -40,19 +41,19 @@ typedef struct UnkStruct_ov5_021D3CAC_t { NNSFndAllocator unk_00; UnkStruct_ov5_021D3CE4 unk_10[16]; UnkStruct_ov5_021D37AC unk_290[2]; - NARC * unk_2B0; - NARC * unk_2B4; + NARC *unk_2B0; + NARC *unk_2B4; } UnkStruct_ov5_021D3CAC; typedef struct { - UnkStruct_ov5_021D3CE4 * unk_00[4]; + UnkStruct_ov5_021D3CE4 *unk_00[4]; int unk_10; } UnkStruct_ov5_021D3FD0_sub1; typedef struct UnkStruct_ov5_021D3FD0_t { UnkStruct_ov5_021D3FD0_sub1 unk_00; - NNSG3dRenderObj * unk_14[6]; - UnkStruct_ov5_021D3CE4 * unk_2C; + NNSG3dRenderObj *unk_14[6]; + UnkStruct_ov5_021D3CE4 *unk_2C; int unk_30; u8 unk_34; } UnkStruct_ov5_021D3FD0; @@ -61,7 +62,7 @@ typedef struct UnkStruct_ov5_021D41B4_t { UnkStruct_ov5_021D3FD0 unk_00[16]; } UnkStruct_ov5_021D41B4; -static BOOL ov5_021D37AC (UnkStruct_ov5_021D37AC * param0, NNSG3dRenderObj * param1, UnkStruct_ov5_021D3CE4 * param2, const u8 param3) +static BOOL ov5_021D37AC(UnkStruct_ov5_021D37AC *param0, NNSG3dRenderObj *param1, UnkStruct_ov5_021D3CE4 *param2, const u8 param3) { int v0; @@ -88,10 +89,10 @@ static BOOL ov5_021D37AC (UnkStruct_ov5_021D37AC * param0, NNSG3dRenderObj * par return 1; } -static void * ov5_021D380C (NARC * param0, const u32 param1, NNSG3dResMdl * param2, NNSG3dAnmObj ** param3, NNSG3dResTex * param4, NNSFndAllocator * param5) +static void *ov5_021D380C(NARC *param0, const u32 param1, NNSG3dResMdl *param2, NNSG3dAnmObj **param3, NNSG3dResTex *param4, NNSFndAllocator *param5) { - void * v0; - void * v1 = NULL; + void *v0; + void *v1 = NULL; GF_ASSERT(param1 != 0xffffffff); v1 = NARC_AllocAndReadWholeMember(param0, param1, 4); @@ -109,7 +110,7 @@ static void * ov5_021D380C (NARC * param0, const u32 param1, NNSG3dResMdl * para } } -static const BOOL ov5_021D3868 (NNSG3dRenderObj * param0, NNSG3dAnmObj * param1) +static const BOOL ov5_021D3868(NNSG3dRenderObj *param0, NNSG3dAnmObj *param1) { if (param1 == NULL) { return 0; @@ -123,7 +124,7 @@ static const BOOL ov5_021D3868 (NNSG3dRenderObj * param0, NNSG3dAnmObj * param1) return 1; } -static void ov5_021D3884 (UnkStruct_ov5_021D37AC * param0) +static void ov5_021D3884(UnkStruct_ov5_021D37AC *param0) { int v0; @@ -140,10 +141,10 @@ static void ov5_021D3884 (UnkStruct_ov5_021D37AC * param0) } } -UnkStruct_ov5_021D3CAC * ov5_021D38B8 (void) +UnkStruct_ov5_021D3CAC *ov5_021D38B8(void) { int v0; - UnkStruct_ov5_021D3CAC * v1; + UnkStruct_ov5_021D3CAC *v1; v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D3CAC)); @@ -175,7 +176,7 @@ UnkStruct_ov5_021D3CAC * ov5_021D38B8 (void) return v1; } -static NNSG3dAnmObj * ov5_021D3938 (UnkStruct_ov5_021D3CE4 * param0) +static NNSG3dAnmObj *ov5_021D3938(UnkStruct_ov5_021D3CE4 *param0) { if (param0 == NULL) { return NULL; @@ -184,7 +185,7 @@ static NNSG3dAnmObj * ov5_021D3938 (UnkStruct_ov5_021D3CE4 * param0) return param0->unk_00; } -static BOOL ov5_021D3944 (const u8 param0) +static BOOL ov5_021D3944(const u8 param0) { if ((param0 & 0x1) == 0x1) { return 1; @@ -193,7 +194,7 @@ static BOOL ov5_021D3944 (const u8 param0) } } -static BOOL ov5_021D3954 (const u8 param0) +static BOOL ov5_021D3954(const u8 param0) { if (((param0 >> 1) & 0x1) == 0x1) { return 1; @@ -202,15 +203,15 @@ static BOOL ov5_021D3954 (const u8 param0) } } -static int ov5_021D3964 (const UnkStruct_ov5_021D3CE4 * param0) +static int ov5_021D3964(const UnkStruct_ov5_021D3CE4 *param0) { - GF_ASSERT((param0->unk_04 == 1)); + GF_ASSERT(param0->unk_04 == 1); return param0->unk_1C; } -UnkStruct_ov5_021D3CE4 * ov5_021D3978 (const int param0, const int param1, const int param2, const int param3, const BOOL param4, const BOOL param5, const BOOL param6, NNSG3dResMdl * param7, NNSG3dResTex * param8, UnkStruct_ov5_021D3CAC * param9) +UnkStruct_ov5_021D3CE4 *ov5_021D3978(const int param0, const int param1, const int param2, const int param3, const BOOL param4, const BOOL param5, const BOOL param6, NNSG3dResMdl *param7, NNSG3dResTex *param8, UnkStruct_ov5_021D3CAC *param9) { - UnkStruct_ov5_021D3CE4 * v0; + UnkStruct_ov5_021D3CE4 *v0; int v1; int v2; UnkStruct_ov5_021D3A50 v3; @@ -258,7 +259,7 @@ UnkStruct_ov5_021D3CE4 * ov5_021D3978 (const int param0, const int param1, const return NULL; } -void ov5_021D3A50 (const int param0, NNSG3dResMdl * param1, NNSG3dResTex * param2, UnkStruct_ov5_021D3CAC * param3) +void ov5_021D3A50(const int param0, NNSG3dResMdl *param1, NNSG3dResTex *param2, UnkStruct_ov5_021D3CAC *param3) { int v0; int v1; @@ -305,11 +306,11 @@ void ov5_021D3A50 (const int param0, NNSG3dResMdl * param1, NNSG3dResTex * param } } - GF_ASSERT((v2 != 16)); + GF_ASSERT(v2 != 16); } } -BOOL ov5_021D3B24 (const int param0, const int param1, const BOOL param2, NNSG3dRenderObj * param3, UnkStruct_ov5_021D3CAC * param4) +BOOL ov5_021D3B24(const int param0, const int param1, const BOOL param2, NNSG3dRenderObj *param3, UnkStruct_ov5_021D3CAC *param4) { int v0; int v1; @@ -357,7 +358,7 @@ BOOL ov5_021D3B24 (const int param0, const int param1, const BOOL param2, NNSG3d return 0; } -BOOL ov5_021D3BE4 (const int param0, NNSG3dRenderObj * param1, UnkStruct_ov5_021D3CAC * param2) +BOOL ov5_021D3BE4(const int param0, NNSG3dRenderObj *param1, UnkStruct_ov5_021D3CAC *param2) { int v0; int v1; @@ -409,7 +410,7 @@ BOOL ov5_021D3BE4 (const int param0, NNSG3dRenderObj * param1, UnkStruct_ov5_021 return v4; } -void ov5_021D3CAC (UnkStruct_ov5_021D3CAC * param0) +void ov5_021D3CAC(UnkStruct_ov5_021D3CAC *param0) { int v0; @@ -431,7 +432,7 @@ void ov5_021D3CAC (UnkStruct_ov5_021D3CAC * param0) } } -void ov5_021D3CE4 (UnkStruct_ov5_021D3CE4 * param0, UnkStruct_ov5_021D3CAC * param1) +void ov5_021D3CE4(UnkStruct_ov5_021D3CE4 *param0, UnkStruct_ov5_021D3CAC *param1) { if (param1 == NULL) { return; @@ -451,7 +452,7 @@ void ov5_021D3CE4 (UnkStruct_ov5_021D3CE4 * param0, UnkStruct_ov5_021D3CAC * par } } -void ov5_021D3D18 (UnkStruct_ov5_021D3CAC * param0, NNSG3dRenderObj * param1, const int param2, const int param3) +void ov5_021D3D18(UnkStruct_ov5_021D3CAC *param0, NNSG3dRenderObj *param1, const int param2, const int param3) { u8 v0; int v1; @@ -473,7 +474,7 @@ void ov5_021D3D18 (UnkStruct_ov5_021D3CAC * param0, NNSG3dRenderObj * param1, co } } -void ov5_021D3D7C (UnkStruct_ov5_021D3CAC * param0) +void ov5_021D3D7C(UnkStruct_ov5_021D3CAC *param0) { if (param0 == NULL) { return; @@ -486,9 +487,9 @@ void ov5_021D3D7C (UnkStruct_ov5_021D3CAC * param0) param0 = NULL; } -UnkStruct_ov5_021D3CE4 * ov5_021D3DA0 (const int param0, UnkStruct_ov5_021D3CAC * param1) +UnkStruct_ov5_021D3CE4 *ov5_021D3DA0(const int param0, UnkStruct_ov5_021D3CAC *param1) { - UnkStruct_ov5_021D3CE4 * v0; + UnkStruct_ov5_021D3CE4 *v0; int v1; GF_ASSERT(param0 != 0); @@ -506,9 +507,9 @@ UnkStruct_ov5_021D3CE4 * ov5_021D3DA0 (const int param0, UnkStruct_ov5_021D3CAC return v0; } -UnkStruct_ov5_021D3CE4 * ov5_021D3DE4 (const int param0, const int param1, UnkStruct_ov5_021D3CAC * param2) +UnkStruct_ov5_021D3CE4 *ov5_021D3DE4(const int param0, const int param1, UnkStruct_ov5_021D3CAC *param2) { - UnkStruct_ov5_021D3CE4 * v0; + UnkStruct_ov5_021D3CE4 *v0; int v1; int v2; UnkStruct_ov5_021D3A50 v3; @@ -532,17 +533,17 @@ UnkStruct_ov5_021D3CE4 * ov5_021D3DE4 (const int param0, const int param1, UnkSt return v0; } -void ov5_021D3E40 (UnkStruct_ov5_021D3CE4 * param0, const BOOL param1) +void ov5_021D3E40(UnkStruct_ov5_021D3CE4 *param0, const BOOL param1) { param0->unk_10 = param1; } -void ov5_021D3E44 (UnkStruct_ov5_021D3CE4 * param0) +void ov5_021D3E44(UnkStruct_ov5_021D3CE4 *param0) { param0->unk_1C = 1; } -BOOL ov5_021D3E4C (UnkStruct_ov5_021D3CE4 * param0) +BOOL ov5_021D3E4C(UnkStruct_ov5_021D3CE4 *param0) { BOOL v0; @@ -563,7 +564,7 @@ BOOL ov5_021D3E4C (UnkStruct_ov5_021D3CE4 * param0) return v0; } -void ov5_021D3E7C (UnkStruct_ov5_021D3CE4 * param0) +void ov5_021D3E7C(UnkStruct_ov5_021D3CE4 *param0) { if (!param0->unk_20) { param0->unk_00->frame = 0; @@ -572,7 +573,7 @@ void ov5_021D3E7C (UnkStruct_ov5_021D3CE4 * param0) } } -void ov5_021D3E9C (UnkStruct_ov5_021D3CE4 * param0) +void ov5_021D3E9C(UnkStruct_ov5_021D3CE4 *param0) { if (!param0->unk_20) { param0->unk_00->frame = NNS_G3dAnmObjGetNumFrame(param0->unk_00) - (FX32_ONE); @@ -581,7 +582,7 @@ void ov5_021D3E9C (UnkStruct_ov5_021D3CE4 * param0) } } -void ov5_021D3EBC (UnkStruct_ov5_021D3CE4 * param0) +void ov5_021D3EBC(UnkStruct_ov5_021D3CE4 *param0) { if (!param0->unk_20) { param0->unk_00->frame += (FX32_ONE); @@ -598,25 +599,25 @@ void ov5_021D3EBC (UnkStruct_ov5_021D3CE4 * param0) } } -void ov5_021D3F04 (UnkStruct_ov5_021D3CE4 * param0, const BOOL param1) +void ov5_021D3F04(UnkStruct_ov5_021D3CE4 *param0, const BOOL param1) { param0->unk_20 = param1; } -void ov5_021D3F08 (UnkStruct_ov5_021D3CE4 * param0, const int param1) +void ov5_021D3F08(UnkStruct_ov5_021D3CE4 *param0, const int param1) { param0->unk_18 = param1; } -void ov5_021D3F0C (UnkStruct_ov5_021D3CE4 * param0, const int param1) +void ov5_021D3F0C(UnkStruct_ov5_021D3CE4 *param0, const int param1) { param0->unk_24 = param1; } -void ov5_021D3F10 (UnkStruct_ov5_021D3CAC * param0) +void ov5_021D3F10(UnkStruct_ov5_021D3CAC *param0) { int v0; - UnkStruct_ov5_021D3CE4 * v1; + UnkStruct_ov5_021D3CE4 *v1; if (param0 == NULL) { return; @@ -647,7 +648,7 @@ void ov5_021D3F10 (UnkStruct_ov5_021D3CAC * param0) ov5_021D3884(param0->unk_290); } -BOOL ov5_021D3F70 (const UnkStruct_ov5_021D3CE4 * param0) +BOOL ov5_021D3F70(const UnkStruct_ov5_021D3CE4 *param0) { int v0; @@ -660,12 +661,12 @@ BOOL ov5_021D3F70 (const UnkStruct_ov5_021D3CE4 * param0) } } -u16 ov5_021D3F84 (UnkStruct_ov5_021D3CAC * param0) +u16 ov5_021D3F84(UnkStruct_ov5_021D3CAC *param0) { return NARC_GetFileCount(param0->unk_2B4); } -const u8 ov5_021D3F94 (UnkStruct_ov5_021D3CAC * param0, const int param1) +const u8 ov5_021D3F94(UnkStruct_ov5_021D3CAC *param0, const int param1) { u8 v0; UnkStruct_ov5_021D3A50 v1; @@ -685,11 +686,11 @@ const u8 ov5_021D3F94 (UnkStruct_ov5_021D3CAC * param0, const int param1) return v0; } -static UnkStruct_ov5_021D3FD0 * ov5_021D3FD0 (UnkStruct_ov5_021D41B4 * param0, const u8 param1) +static UnkStruct_ov5_021D3FD0 *ov5_021D3FD0(UnkStruct_ov5_021D41B4 *param0, const u8 param1) { u8 v0; u8 v1; - UnkStruct_ov5_021D3FD0 * v2; + UnkStruct_ov5_021D3FD0 *v2; v2 = NULL; GF_ASSERT(param1 != 0); @@ -711,7 +712,7 @@ static UnkStruct_ov5_021D3FD0 * ov5_021D3FD0 (UnkStruct_ov5_021D41B4 * param0, c return &(param0->unk_00[v1]); } -static void ov5_021D4020 (UnkStruct_ov5_021D3FD0 * param0) +static void ov5_021D4020(UnkStruct_ov5_021D3FD0 *param0) { u8 v0; @@ -724,10 +725,10 @@ static void ov5_021D4020 (UnkStruct_ov5_021D3FD0 * param0) } } -static UnkStruct_ov5_021D3FD0 * ov5_021D4040 (UnkStruct_ov5_021D41B4 * param0, const int param1) +static UnkStruct_ov5_021D3FD0 *ov5_021D4040(UnkStruct_ov5_021D41B4 *param0, const int param1) { int v0; - UnkStruct_ov5_021D3FD0 * v1; + UnkStruct_ov5_021D3FD0 *v1; v1 = NULL; @@ -741,7 +742,7 @@ static UnkStruct_ov5_021D3FD0 * ov5_021D4040 (UnkStruct_ov5_021D41B4 * param0, c return v1; } -static void ov5_021D4068 (NNSG3dRenderObj * param0, const int param1, UnkStruct_ov5_021D3FD0 * param2) +static void ov5_021D4068(NNSG3dRenderObj *param0, const int param1, UnkStruct_ov5_021D3FD0 *param2) { GF_ASSERT(param1 <= 4); @@ -752,18 +753,18 @@ static void ov5_021D4068 (NNSG3dRenderObj * param0, const int param1, UnkStruct_ param2->unk_00.unk_10 = param1; } -static void ov5_021D4084 (UnkStruct_ov5_021D3FD0 * param0, const int param1, UnkStruct_ov5_021D3CE4 * param2) +static void ov5_021D4084(UnkStruct_ov5_021D3FD0 *param0, const int param1, UnkStruct_ov5_021D3CE4 *param2) { GF_ASSERT(param1 < param0->unk_00.unk_10); param0->unk_00.unk_00[param1] = param2; } -static UnkStruct_ov5_021D3CE4 * ov5_021D409C (UnkStruct_ov5_021D3FD0 * param0, const int param1) +static UnkStruct_ov5_021D3CE4 *ov5_021D409C(UnkStruct_ov5_021D3FD0 *param0, const int param1) { u8 v0; - UnkStruct_ov5_021D3CE4 * v1; - NNSG3dAnmObj * v2; - NNSG3dAnmObj * v3; + UnkStruct_ov5_021D3CE4 *v1; + NNSG3dAnmObj *v2; + NNSG3dAnmObj *v3; GF_ASSERT(param1 < param0->unk_00.unk_10); @@ -783,9 +784,9 @@ static UnkStruct_ov5_021D3CE4 * ov5_021D409C (UnkStruct_ov5_021D3FD0 * param0, c return v1; } -static void ov5_021D40F0 (const int param0, NNSG3dResMdl * param1, NNSG3dResTex * param2, const int param3, const int param4, const BOOL param5, UnkStruct_ov5_021D3CAC * param6, UnkStruct_ov5_021D3FD0 * param7) +static void ov5_021D40F0(const int param0, NNSG3dResMdl *param1, NNSG3dResTex *param2, const int param3, const int param4, const BOOL param5, UnkStruct_ov5_021D3CAC *param6, UnkStruct_ov5_021D3FD0 *param7) { - UnkStruct_ov5_021D3CE4 * v0; + UnkStruct_ov5_021D3CE4 *v0; int v1; for (v1 = 0; v1 < param3; v1++) { @@ -795,10 +796,10 @@ static void ov5_021D40F0 (const int param0, NNSG3dResMdl * param1, NNSG3dResTex } } -static void ov5_021D414C (UnkStruct_ov5_021D3CAC * param0, UnkStruct_ov5_021D3FD0 * param1) +static void ov5_021D414C(UnkStruct_ov5_021D3CAC *param0, UnkStruct_ov5_021D3FD0 *param1) { int v0; - NNSG3dAnmObj * v1; + NNSG3dAnmObj *v1; v1 = ov5_021D3938(param1->unk_2C); @@ -810,7 +811,7 @@ static void ov5_021D414C (UnkStruct_ov5_021D3CAC * param0, UnkStruct_ov5_021D3FD for (v0 = 0; v0 < param1->unk_00.unk_10; v0++) { { - UnkStruct_ov5_021D3CE4 * v2; + UnkStruct_ov5_021D3CE4 *v2; v2 = param1->unk_00.unk_00[v0]; ov5_021D3CE4(v2, param0); @@ -820,11 +821,11 @@ static void ov5_021D414C (UnkStruct_ov5_021D3CAC * param0, UnkStruct_ov5_021D3FD } } -UnkStruct_ov5_021D41B4 * ov5_021D4194 (void) +UnkStruct_ov5_021D41B4 *ov5_021D4194(void) { int v0; int v1; - UnkStruct_ov5_021D41B4 * v2; + UnkStruct_ov5_021D41B4 *v2; v1 = sizeof(UnkStruct_ov5_021D41B4); v2 = Heap_AllocFromHeap(4, v1); @@ -834,21 +835,21 @@ UnkStruct_ov5_021D41B4 * ov5_021D4194 (void) return v2; } -void ov5_021D41B4 (UnkStruct_ov5_021D41B4 ** param0) +void ov5_021D41B4(UnkStruct_ov5_021D41B4 **param0) { if ((*param0) == NULL) { return; } - Heap_FreeToHeap((*param0)); + Heap_FreeToHeap(*param0); (*param0) = NULL; } -void ov5_021D41C8 (UnkStruct_ov5_021D3CAC * param0, UnkStruct_ov5_021D41B4 * const param1, const int param2, const int param3, NNSG3dRenderObj * param4, NNSG3dResMdl * param5, NNSG3dResTex * param6, const int param7, const u8 param8, const BOOL param9) +void ov5_021D41C8(UnkStruct_ov5_021D3CAC *param0, UnkStruct_ov5_021D41B4 *const param1, const int param2, const int param3, NNSG3dRenderObj *param4, NNSG3dResMdl *param5, NNSG3dResTex *param6, const int param7, const u8 param8, const BOOL param9) { int v0; u8 v1; - UnkStruct_ov5_021D3FD0 * v2 = NULL; + UnkStruct_ov5_021D3FD0 *v2 = NULL; v2 = ov5_021D3FD0(param1, param2); @@ -870,23 +871,23 @@ void ov5_021D41C8 (UnkStruct_ov5_021D3CAC * param0, UnkStruct_ov5_021D41B4 * con v2->unk_30 = param3; } -void ov5_021D4220 (UnkStruct_ov5_021D41B4 * const param0, const int param1, const u8 param2, NNSG3dRenderObj * param3) +void ov5_021D4220(UnkStruct_ov5_021D41B4 *const param0, const int param1, const u8 param2, NNSG3dRenderObj *param3) { - UnkStruct_ov5_021D3FD0 * v0; + UnkStruct_ov5_021D3FD0 *v0; GF_ASSERT(param2 < 6); v0 = ov5_021D4040(param0, param1); - GF_ASSERT((v0->unk_14[param2] == NULL)); + GF_ASSERT(v0->unk_14[param2] == NULL); v0->unk_14[param2] = param3; } -void ov5_021D4250 (UnkStruct_ov5_021D41B4 * const param0, const int param1, const int param2) +void ov5_021D4250(UnkStruct_ov5_021D41B4 *const param0, const int param1, const int param2) { - UnkStruct_ov5_021D3FD0 * v0; - UnkStruct_ov5_021D3CE4 * v1; + UnkStruct_ov5_021D3FD0 *v0; + UnkStruct_ov5_021D3CE4 *v1; - GF_ASSERT((param1 != 0)); + GF_ASSERT(param1 != 0); v0 = ov5_021D4040(param0, param1); v1 = ov5_021D409C(v0, param2); @@ -894,10 +895,10 @@ void ov5_021D4250 (UnkStruct_ov5_021D41B4 * const param0, const int param1, cons ov5_021D3E40(v1, 0); } -void ov5_021D4278 (UnkStruct_ov5_021D41B4 * const param0, const int param1, const int param2, const int param3) +void ov5_021D4278(UnkStruct_ov5_021D41B4 *const param0, const int param1, const int param2, const int param3) { - UnkStruct_ov5_021D3FD0 * v0; - UnkStruct_ov5_021D3CE4 * v1; + UnkStruct_ov5_021D3FD0 *v0; + UnkStruct_ov5_021D3CE4 *v1; GF_ASSERT(param1 != 0); @@ -911,9 +912,9 @@ void ov5_021D4278 (UnkStruct_ov5_021D41B4 * const param0, const int param1, cons ov5_021D3E40(v1, 0); } -void ov5_021D42B0 (UnkStruct_ov5_021D3CAC * param0, UnkStruct_ov5_021D41B4 * param1, const int param2) +void ov5_021D42B0(UnkStruct_ov5_021D3CAC *param0, UnkStruct_ov5_021D41B4 *param1, const int param2) { - UnkStruct_ov5_021D3FD0 * v0; + UnkStruct_ov5_021D3FD0 *v0; GF_ASSERT(param2 != 0); v0 = ov5_021D4040(param1, param2); @@ -922,10 +923,10 @@ void ov5_021D42B0 (UnkStruct_ov5_021D3CAC * param0, UnkStruct_ov5_021D41B4 * par ov5_021D4020(v0); } -UnkStruct_ov5_021D3CE4 * ov5_021D42D8 (UnkStruct_ov5_021D41B4 * const param0, const int param1) +UnkStruct_ov5_021D3CE4 *ov5_021D42D8(UnkStruct_ov5_021D41B4 *const param0, const int param1) { - UnkStruct_ov5_021D3FD0 * v0; - UnkStruct_ov5_021D3CE4 * v1; + UnkStruct_ov5_021D3FD0 *v0; + UnkStruct_ov5_021D3CE4 *v1; GF_ASSERT(param1 != 0); @@ -935,12 +936,12 @@ UnkStruct_ov5_021D3CE4 * ov5_021D42D8 (UnkStruct_ov5_021D41B4 * const param0, co return v1; } -const BOOL ov5_021D42F0 (UnkStruct_ov5_021D41B4 * const param0, const int param1) +const BOOL ov5_021D42F0(UnkStruct_ov5_021D41B4 *const param0, const int param1) { - UnkStruct_ov5_021D3CE4 * v0; + UnkStruct_ov5_021D3CE4 *v0; v0 = ov5_021D42D8(param0, param1); - GF_ASSERT((v0 != NULL)); + GF_ASSERT(v0 != NULL); if (ov5_021D3F70(v0)) { return 1; @@ -949,9 +950,9 @@ const BOOL ov5_021D42F0 (UnkStruct_ov5_021D41B4 * const param0, const int param1 } } -const int ov5_021D4310 (UnkStruct_ov5_021D41B4 * const param0, const int param1) +const int ov5_021D4310(UnkStruct_ov5_021D41B4 *const param0, const int param1) { - UnkStruct_ov5_021D3FD0 * v0; + UnkStruct_ov5_021D3FD0 *v0; v0 = ov5_021D4040(param0, param1); return v0->unk_30; diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c index 79f45f0088..f8c0642681 100644 --- a/src/overlay005/ov5_021D431C.c +++ b/src/overlay005/ov5_021D431C.c @@ -1,29 +1,30 @@ +#include "overlay005/ov5_021D431C.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021D3CE4_decl.h" -#include "overlay005/struct_ov5_021E1890_decl.h" +#include "struct_defs/struct_02055130.h" #include "field/field_system.h" -#include "struct_defs/struct_02055130.h" +#include "overlay005/ov5_021D0D80.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021EF75C.h" +#include "overlay005/struct_ov5_021D3CE4_decl.h" +#include "overlay005/struct_ov5_021E1890_decl.h" +#include "camera.h" +#include "heap.h" +#include "map_object.h" +#include "player_avatar.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "heap.h" -#include "camera.h" #include "unk_020508D4.h" #include "unk_02054D00.h" #include "unk_02056B30.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_020655F4.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021D431C.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021EF75C.h" typedef struct UnkStruct_ov5_021D432C_t { int unk_00; @@ -44,13 +45,13 @@ typedef struct UnkStruct_ov5_021D4E00_t { u16 unk_0C; } UnkStruct_ov5_021D4E00; -static void ov5_021D4798(Camera * camera, u8 * param1); -static void ov5_021D47DC(Camera * camera, u8 * param1); +static void ov5_021D4798(Camera *camera, u8 *param1); +static void ov5_021D47DC(Camera *camera, u8 *param1); static u8 ov5_021D481C(const int param0); -UnkStruct_ov5_021D432C * ov5_021D431C (void) +UnkStruct_ov5_021D432C *ov5_021D431C(void) { - UnkStruct_ov5_021D432C * v0; + UnkStruct_ov5_021D432C *v0; v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021D432C)); v0->unk_00 = 0; @@ -58,26 +59,25 @@ UnkStruct_ov5_021D432C * ov5_021D431C (void) return v0; } -void ov5_021D432C (UnkStruct_ov5_021D432C * param0) +void ov5_021D432C(UnkStruct_ov5_021D432C *param0) { Heap_FreeToHeap(param0); } -void ov5_021D4334 (const int param0, const int param1, UnkStruct_ov5_021D432C * param2) +void ov5_021D4334(const int param0, const int param1, UnkStruct_ov5_021D432C *param2) { param2->unk_14 = param0; param2->unk_18 = param1; } -BOOL ov5_021D433C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) +BOOL ov5_021D433C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1) { - MapObject * v0; + MapObject *v0; switch (param1->unk_00) { - case 0: - { + case 0: { BOOL v1; - UnkStruct_ov5_021E1890 * v2; + UnkStruct_ov5_021E1890 *v2; UnkStruct_02055130 v3; int v4; int v5[] = { @@ -115,7 +115,7 @@ BOOL ov5_021D433C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) if (v1) { u8 v6; u8 v7; - NNSG3dResTex * v8; + NNSG3dResTex *v8; v7 = ov5_021D3F94(fieldSystem->unk_50, v4); param1->unk_1E = v7; @@ -127,10 +127,8 @@ BOOL ov5_021D433C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) return 1; } (param1->unk_00)++; - } - break; - case 1: - { + } break; + case 1: { int v9; int v10; int v11; @@ -163,8 +161,7 @@ BOOL ov5_021D433C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) } (param1->unk_00)++; break; - case 2: - { + case 2: { BOOL v12; v12 = ov5_021D42F0(fieldSystem->unk_54, 1); @@ -172,8 +169,7 @@ BOOL ov5_021D433C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) if (v12) { (param1->unk_00)++; } - } - break; + } break; case 3: v0 = Player_MapObject(fieldSystem->playerAvatar); LocalMapObj_SetAnimationCode(v0, 0xc); @@ -214,8 +210,7 @@ BOOL ov5_021D433C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) (param1->unk_00)++; } break; - case 5: - { + case 5: { BOOL v16; v16 = ov5_021D42F0(fieldSystem->unk_54, 1); @@ -224,8 +219,7 @@ BOOL ov5_021D433C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) ov5_021D42B0(fieldSystem->unk_50, fieldSystem->unk_54, 1); return 1; } - } - break; + } break; } if (param1->unk_20) { @@ -235,15 +229,14 @@ BOOL ov5_021D433C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) return 0; } -BOOL ov5_021D453C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) +BOOL ov5_021D453C(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1) { - MapObject * v0; + MapObject *v0; switch (param1->unk_00) { - case 0: - { + case 0: { BOOL v1; - UnkStruct_ov5_021E1890 * v2; + UnkStruct_ov5_021E1890 *v2; UnkStruct_02055130 v3; int v4; int v5[] = { @@ -279,7 +272,7 @@ BOOL ov5_021D453C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) if (v1) { u8 v6; u8 v7; - NNSG3dResTex * v8; + NNSG3dResTex *v8; v7 = ov5_021D3F94(fieldSystem->unk_50, v4); param1->unk_1E = v7; @@ -301,8 +294,7 @@ BOOL ov5_021D453C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) } (param1->unk_00)++; - } - break; + } break; case 1: sub_02056B30(fieldSystem->unk_10, 0, 9, 1, 0x0, 6, 1, 11); { @@ -338,8 +330,7 @@ BOOL ov5_021D453C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) (param1->unk_00)++; break; - case 2: - { + case 2: { BOOL v12; v12 = ov5_021D42F0(fieldSystem->unk_54, 1); @@ -349,8 +340,7 @@ BOOL ov5_021D453C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) MapObject_SetHidden(v0, 0); (param1->unk_00)++; } - } - break; + } break; case 3: v0 = Player_MapObject(fieldSystem->playerAvatar); LocalMapObj_SetAnimationCode(v0, 0xd); @@ -391,8 +381,7 @@ BOOL ov5_021D453C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) (param1->unk_00)++; } break; - case 5: - { + case 5: { BOOL v16; v16 = ov5_021D42F0(fieldSystem->unk_54, 1); @@ -401,8 +390,7 @@ BOOL ov5_021D453C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) ov5_021D42B0(fieldSystem->unk_50, fieldSystem->unk_54, 1); return 1; } - } - break; + } break; case 6: if (ScreenWipe_Done()) { return 1; @@ -417,7 +405,7 @@ BOOL ov5_021D453C (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1) return 0; } -static void ov5_021D4798 (Camera * camera, u8 * param1) +static void ov5_021D4798(Camera *camera, u8 *param1) { u8 v0; u16 v1; @@ -447,7 +435,7 @@ static void ov5_021D4798 (Camera * camera, u8 * param1) } } -static void ov5_021D47DC (Camera * camera, u8 * param1) +static void ov5_021D47DC(Camera *camera, u8 *param1) { u8 v0; u16 v1; @@ -477,7 +465,7 @@ static void ov5_021D47DC (Camera * camera, u8 * param1) } } -static u8 ov5_021D481C (const int param0) +static u8 ov5_021D481C(const int param0) { if (param0 == 442) { return 2; @@ -490,18 +478,17 @@ static u8 ov5_021D481C (const int param0) return 0; } -BOOL ov5_021D4858 (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, const u8 param2) +BOOL ov5_021D4858(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1, const u8 param2) { - MapObject * v0; + MapObject *v0; switch (param1->unk_00) { - case 0: - { + case 0: { BOOL v1; - UnkStruct_ov5_021E1890 * v2; + UnkStruct_ov5_021E1890 *v2; UnkStruct_02055130 v3; int v4; - int v5[] = {130, 131, 425, 426}; + int v5[] = { 130, 131, 425, 426 }; if (param2 == 2) { sub_020550F4(param1->unk_14, param1->unk_18, -1, 0, 2, 1, &v3); @@ -514,7 +501,7 @@ BOOL ov5_021D4858 (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, c if (v1) { u8 v6; - NNSG3dResTex * v7; + NNSG3dResTex *v7; v7 = ov5_021EFAA0(fieldSystem->unk_30); ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 2, v4, ov5_021E18BC(v2), ov5_021E18C0(v2), v7, 1, 1, 1); @@ -532,8 +519,7 @@ BOOL ov5_021D4858 (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, c } (param1->unk_00)++; - } - break; + } break; case 1: ov5_021D1744(1); ov5_021D4278(fieldSystem->unk_54, 2, 0, 1557); @@ -588,8 +574,7 @@ BOOL ov5_021D4858 (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, c (param1->unk_00)++; } break; - case 5: - { + case 5: { BOOL v10; v10 = ov5_021D42F0(fieldSystem->unk_54, 2); @@ -599,25 +584,23 @@ BOOL ov5_021D4858 (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, c sub_020057A4(1557, 0); return 1; } - } - break; + } break; } return 0; } -BOOL ov5_021D4A24 (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, const u8 param2) +BOOL ov5_021D4A24(FieldSystem *fieldSystem, UnkStruct_ov5_021D432C *param1, const u8 param2) { - MapObject * v0; + MapObject *v0; switch (param1->unk_00) { - case 0: - { + case 0: { BOOL v1; - UnkStruct_ov5_021E1890 * v2; + UnkStruct_ov5_021E1890 *v2; UnkStruct_02055130 v3; int v4; - int v5[] = {130, 131, 425, 426}; + int v5[] = { 130, 131, 425, 426 }; if (param2 == 2) { sub_020550F4(param1->unk_14, param1->unk_18, -1, 0, 2, 1, &v3); @@ -630,7 +613,7 @@ BOOL ov5_021D4A24 (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, c if (v1) { u8 v6; - NNSG3dResTex * v7; + NNSG3dResTex *v7; v7 = ov5_021EFAA0(fieldSystem->unk_30); ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, 2, v4, ov5_021E18BC(v2), ov5_021E18C0(v2), v7, 1, 1, 0); @@ -648,8 +631,7 @@ BOOL ov5_021D4A24 (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, c } (param1->unk_00)++; - } - break; + } break; case 1: ov5_021D4278(fieldSystem->unk_54, 2, 0, 1557); v0 = Player_MapObject(fieldSystem->playerAvatar); @@ -688,8 +670,7 @@ BOOL ov5_021D4A24 (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, c (param1->unk_00)++; } break; - case 4: - { + case 4: { BOOL v9; v9 = ov5_021D42F0(fieldSystem->unk_54, 2); @@ -700,18 +681,17 @@ BOOL ov5_021D4A24 (FieldSystem * fieldSystem, UnkStruct_ov5_021D432C * param1, c sub_020057A4(1557, 0); return 1; } - } - break; + } break; } return 0; } -static BOOL ov5_021D4BC8 (TaskManager * param0) +static BOOL ov5_021D4BC8(TaskManager *param0) { BOOL v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - u8 * v2 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + u8 *v2 = TaskManager_Environment(param0); v0 = ov5_021D42F0(fieldSystem->unk_54, *v2); @@ -723,10 +703,10 @@ static BOOL ov5_021D4BC8 (TaskManager * param0) return 0; } -void ov5_021D4BF4 (FieldSystem * fieldSystem, const int param1, const int param2, const u8 param3) +void ov5_021D4BF4(FieldSystem *fieldSystem, const int param1, const int param2, const u8 param3) { BOOL v0; - UnkStruct_ov5_021E1890 * v1; + UnkStruct_ov5_021E1890 *v1; UnkStruct_02055130 v2; int v3; int v4[] = { @@ -758,7 +738,7 @@ void ov5_021D4BF4 (FieldSystem * fieldSystem, const int param1, const int param2 if (v0) { u8 v5; u8 v6; - NNSG3dResTex * v7; + NNSG3dResTex *v7; v6 = ov5_021D3F94(fieldSystem->unk_50, v3); v7 = ov5_021EFAA0(fieldSystem->unk_30); @@ -769,7 +749,7 @@ void ov5_021D4BF4 (FieldSystem * fieldSystem, const int param1, const int param2 } } -void ov5_021D4C88 (FieldSystem * fieldSystem, const u8 param1) +void ov5_021D4C88(FieldSystem *fieldSystem, const u8 param1) { int v0; int v1; @@ -799,7 +779,7 @@ void ov5_021D4C88 (FieldSystem * fieldSystem, const u8 param1) ov5_021D4278(fieldSystem->unk_54, param1, v2, v1); } -void ov5_021D4CEC (FieldSystem * fieldSystem, const u8 param1) +void ov5_021D4CEC(FieldSystem *fieldSystem, const u8 param1) { int v0; int v1; @@ -829,26 +809,26 @@ void ov5_021D4CEC (FieldSystem * fieldSystem, const u8 param1) ov5_021D4278(fieldSystem->unk_54, param1, v2, v1); } -void ov5_021D4D48 (FieldSystem * fieldSystem, const u8 param1) +void ov5_021D4D48(FieldSystem *fieldSystem, const u8 param1) { - u8 * v0 = Heap_AllocFromHeapAtEnd(4, sizeof(u8)); + u8 *v0 = Heap_AllocFromHeapAtEnd(4, sizeof(u8)); *v0 = param1; FieldTask_Start(fieldSystem->unk_10, ov5_021D4BC8, v0); } -void ov5_021D4D68 (FieldSystem * fieldSystem, const u8 param1) +void ov5_021D4D68(FieldSystem *fieldSystem, const u8 param1) { ov5_021D42B0(fieldSystem->unk_50, fieldSystem->unk_54, param1); } -void ov5_021D4D78 (const int param0, const int param1, const int param2, FieldSystem * fieldSystem) +void ov5_021D4D78(const int param0, const int param1, const int param2, FieldSystem *fieldSystem) { BOOL v0; - UnkStruct_ov5_021E1890 * v1; + UnkStruct_ov5_021E1890 *v1; UnkStruct_02055130 v2; int v3; - int v4[] = {303, 304}; + int v4[] = { 303, 304 }; sub_020550F4(param0, param1, 0, -1, 1, 3, &v2); @@ -856,14 +836,14 @@ void ov5_021D4D78 (const int param0, const int param1, const int param2, FieldSy GF_ASSERT(v0); { - NNSG3dRenderObj * v5; + NNSG3dRenderObj *v5; v5 = ov5_021E18BC(v1); v0 = ov5_021D3B24(v3, param2, 1, v5, fieldSystem->unk_50); GF_ASSERT(v0); } { - UnkStruct_ov5_021D3CE4 * v6; + UnkStruct_ov5_021D3CE4 *v6; v6 = ov5_021D3DE4(v3, param2, fieldSystem->unk_50); @@ -873,9 +853,9 @@ void ov5_021D4D78 (const int param0, const int param1, const int param2, FieldSy } } -UnkStruct_ov5_021D4E00 * ov5_021D4E00 (void) +UnkStruct_ov5_021D4E00 *ov5_021D4E00(void) { - UnkStruct_ov5_021D4E00 * v0; + UnkStruct_ov5_021D4E00 *v0; v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021D4E00)); v0->unk_00 = 0; @@ -883,11 +863,11 @@ UnkStruct_ov5_021D4E00 * ov5_021D4E00 (void) return v0; } -BOOL ov5_021D4E10 (TaskManager * param0) +BOOL ov5_021D4E10(TaskManager *param0) { - MapObject * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov5_021D4E00 * v2 = TaskManager_Environment(param0); + MapObject *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov5_021D4E00 *v2 = TaskManager_Environment(param0); switch (v2->unk_00) { case 0: @@ -941,15 +921,14 @@ BOOL ov5_021D4E10 (TaskManager * param0) return 0; } -BOOL ov5_021D4F14 (TaskManager * param0) +BOOL ov5_021D4F14(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov5_021D4E00 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov5_021D4E00 *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { - case 0: - { - MapObject * v2; + case 0: { + MapObject *v2; v2 = Player_MapObject(fieldSystem->playerAvatar); @@ -963,8 +942,7 @@ BOOL ov5_021D4F14 (TaskManager * param0) v1->unk_08 = 1; (v1->unk_00)++; - } - break; + } break; case 1: if (ScreenWipe_Done()) { Heap_FreeToHeap(v1); @@ -980,14 +958,13 @@ BOOL ov5_021D4F14 (TaskManager * param0) return 0; } -BOOL ov5_021D4FA0 (TaskManager * param0) +BOOL ov5_021D4FA0(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov5_021D4E00 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov5_021D4E00 *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { - case 0: - { + case 0: { v1->unk_08 = 0; v1->unk_04 = 0; @@ -996,8 +973,7 @@ BOOL ov5_021D4FA0 (TaskManager * param0) v1->unk_08 = 1; (v1->unk_00)++; - } - break; + } break; case 1: if (ScreenWipe_Done()) { Heap_FreeToHeap(v1); @@ -1013,15 +989,14 @@ BOOL ov5_021D4FA0 (TaskManager * param0) return 0; } -BOOL ov5_021D5020 (TaskManager * param0) +BOOL ov5_021D5020(TaskManager *param0) { - MapObject * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov5_021D4E00 * v2 = TaskManager_Environment(param0); + MapObject *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov5_021D4E00 *v2 = TaskManager_Environment(param0); switch (v2->unk_00) { - case 0: - { + case 0: { u8 v3; u8 v4; @@ -1063,8 +1038,7 @@ BOOL ov5_021D5020 (TaskManager * param0) sub_02056B30(param0, 0, v4, 1, 0x0, 6, 1, 11); v2->unk_08 = 1; - } - break; + } break; case 1: v0 = Player_MapObject(fieldSystem->playerAvatar); MapObject_SetHidden(v0, 0); @@ -1094,15 +1068,14 @@ BOOL ov5_021D5020 (TaskManager * param0) return 0; } -BOOL ov5_021D5150 (TaskManager * param0) +BOOL ov5_021D5150(TaskManager *param0) { - MapObject * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov5_021D4E00 * v2 = TaskManager_Environment(param0); + MapObject *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov5_021D4E00 *v2 = TaskManager_Environment(param0); switch (v2->unk_00) { - case 0: - { + case 0: { u8 v3; u8 v4; @@ -1118,8 +1091,7 @@ BOOL ov5_021D5150 (TaskManager * param0) } sub_02056B30(param0, 0, 1, 1, 0x0, 6, 1, 11); - } - break; + } break; case 1: v0 = Player_MapObject(fieldSystem->playerAvatar); MapObject_SetHidden(v0, 0); diff --git a/src/overlay005/ov5_021D521C.c b/src/overlay005/ov5_021D521C.c index c3c9f2128a..ef5bb4e641 100644 --- a/src/overlay005/ov5_021D521C.c +++ b/src/overlay005/ov5_021D521C.c @@ -1,34 +1,35 @@ +#include "overlay005/ov5_021D521C.h" + #include #include +#include "overlay005/ov5_021D5878.h" #include "overlay005/struct_ov5_021D52F4.h" #include "overlay005/struct_ov5_021D5894.h" -#include "unk_02006E3C.h" -#include "rtc.h" -#include "heap.h" #include "ascii_util.h" -#include "overlay005/ov5_021D521C.h" -#include "overlay005/ov5_021D5878.h" +#include "heap.h" +#include "rtc.h" +#include "unk_02006E3C.h" typedef struct UnkStruct_ov5_021D538C_t { u32 unk_00; - UnkStruct_ov5_021D52F4 * unk_04; + UnkStruct_ov5_021D52F4 *unk_04; int unk_08; - UnkStruct_ov5_021D5894 * unk_0C; + UnkStruct_ov5_021D5894 *unk_0C; BOOL unk_10; } UnkStruct_ov5_021D538C; -static void ov5_021D538C(UnkStruct_ov5_021D538C * param0); -static u32 ov5_021D53D4(u32 param0, UnkStruct_ov5_021D52F4 ** param1); -static void ov5_021D555C(UnkStruct_ov5_021D52F4 ** param0); -static char * ov5_021D5570(char * param0, GXRgb * param1, VecFx16 * param2); -static char * ov5_021D5660(char * param0, GXRgb * param1); +static void ov5_021D538C(UnkStruct_ov5_021D538C *param0); +static u32 ov5_021D53D4(u32 param0, UnkStruct_ov5_021D52F4 **param1); +static void ov5_021D555C(UnkStruct_ov5_021D52F4 **param0); +static char *ov5_021D5570(char *param0, GXRgb *param1, VecFx16 *param2); +static char *ov5_021D5660(char *param0, GXRgb *param1); -UnkStruct_ov5_021D538C * ov5_021D521C (UnkStruct_ov5_021D5894 * param0, const u8 param1) +UnkStruct_ov5_021D538C *ov5_021D521C(UnkStruct_ov5_021D5894 *param0, const u8 param1) { int v0; - UnkStruct_ov5_021D538C * v1; + UnkStruct_ov5_021D538C *v1; int v2; GF_ASSERT(param1 < 4); @@ -54,7 +55,7 @@ UnkStruct_ov5_021D538C * ov5_021D521C (UnkStruct_ov5_021D5894 * param0, const u8 return v1; } -void ov5_021D5278 (UnkStruct_ov5_021D538C ** param0) +void ov5_021D5278(UnkStruct_ov5_021D538C **param0) { GF_ASSERT(param0); @@ -64,7 +65,7 @@ void ov5_021D5278 (UnkStruct_ov5_021D538C ** param0) *param0 = NULL; } -void ov5_021D5298 (UnkStruct_ov5_021D538C * param0) +void ov5_021D5298(UnkStruct_ov5_021D538C *param0) { u32 v0; int v1; @@ -99,7 +100,7 @@ void ov5_021D5298 (UnkStruct_ov5_021D538C * param0) } } -void ov5_021D52F4 (const UnkStruct_ov5_021D52F4 * param0, UnkStruct_ov5_021D5894 * param1) +void ov5_021D52F4(const UnkStruct_ov5_021D52F4 *param0, UnkStruct_ov5_021D5894 *param1) { int v0; @@ -121,13 +122,13 @@ void ov5_021D52F4 (const UnkStruct_ov5_021D52F4 * param0, UnkStruct_ov5_021D5894 ov5_021D5AC8(param1, param0->unk_2E, 1); } -static void ov5_021D538C (UnkStruct_ov5_021D538C * param0) +static void ov5_021D538C(UnkStruct_ov5_021D538C *param0) { - UnkStruct_ov5_021D52F4 * v0 = ¶m0->unk_04[param0->unk_08]; + UnkStruct_ov5_021D52F4 *v0 = ¶m0->unk_04[param0->unk_08]; ov5_021D52F4(v0, param0->unk_0C); } -void ov5_021D53A4 (NNSG3dResMdl * param0) +void ov5_021D53A4(NNSG3dResMdl *param0) { NNS_G3dMdlUseGlbDiff(param0); NNS_G3dMdlUseGlbAmb(param0); @@ -135,16 +136,16 @@ void ov5_021D53A4 (NNSG3dResMdl * param0) NNS_G3dMdlUseGlbEmi(param0); } -static u32 ov5_021D53D4 (u32 param0, UnkStruct_ov5_021D52F4 ** param1) +static u32 ov5_021D53D4(u32 param0, UnkStruct_ov5_021D52F4 **param1) { int v0, v1; int v2; - void * v3; - void * v4; + void *v3; + void *v4; char v5[256]; - char * v6; + char *v6; char v7[256]; - UnkStruct_ov5_021D52F4 * v8; + UnkStruct_ov5_021D52F4 *v8; v4 = sub_02006FE8(176, param0, 0, 4, 0); v3 = v4; @@ -200,17 +201,17 @@ static u32 ov5_021D53D4 (u32 param0, UnkStruct_ov5_021D52F4 ** param1) return v2; } -static void ov5_021D555C (UnkStruct_ov5_021D52F4 ** param0) +static void ov5_021D555C(UnkStruct_ov5_021D52F4 **param0) { Heap_FreeToHeapExplicit(4, *param0); *param0 = NULL; } -static char * ov5_021D5570 (char * param0, GXRgb * param1, VecFx16 * param2) +static char *ov5_021D5570(char *param0, GXRgb *param1, VecFx16 *param2) { char v0[256]; char v1[256]; - char * v2; + char *v2; u32 v3; int v4; u16 v5[3]; @@ -269,11 +270,11 @@ static char * ov5_021D5570 (char * param0, GXRgb * param1, VecFx16 * param2) return param0; } -static char * ov5_021D5660 (char * param0, GXRgb * param1) +static char *ov5_021D5660(char *param0, GXRgb *param1) { char v0[256]; char v1[256]; - char * v2; + char *v2; int v3; u16 v4[3]; diff --git a/src/overlay005/ov5_021D56BC.c b/src/overlay005/ov5_021D56BC.c index e67a19b1a3..1c699cba8f 100644 --- a/src/overlay005/ov5_021D56BC.c +++ b/src/overlay005/ov5_021D56BC.c @@ -1,10 +1,11 @@ +#include "overlay005/ov5_021D56BC.h" + #include #include #include "overlay005/struct_ov5_021D57B4.h" #include "heap.h" -#include "overlay005/ov5_021D56BC.h" typedef struct { u16 unk_00; @@ -12,13 +13,13 @@ typedef struct { } UnkStruct_ov5_021D5778_sub1; typedef struct UnkStruct_ov5_021D5778_t { - UnkStruct_ov5_021D5778_sub1 * unk_00; - UnkStruct_ov5_021D57B4 * unk_04; + UnkStruct_ov5_021D5778_sub1 *unk_00; + UnkStruct_ov5_021D57B4 *unk_04; } UnkStruct_ov5_021D5778; -UnkStruct_ov5_021D5778 * ov5_021D56BC (void) +UnkStruct_ov5_021D5778 *ov5_021D56BC(void) { - UnkStruct_ov5_021D5778 * v0; + UnkStruct_ov5_021D5778 *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5778)); GF_ASSERT(v0 != NULL); @@ -26,7 +27,7 @@ UnkStruct_ov5_021D5778 * ov5_021D56BC (void) return v0; } -void ov5_021D56D4 (const char * param0, UnkStruct_ov5_021D5778 * param1) +void ov5_021D56D4(const char *param0, UnkStruct_ov5_021D5778 *param1) { FSFile v0; u16 v1; @@ -66,25 +67,25 @@ void ov5_021D56D4 (const char * param0, UnkStruct_ov5_021D5778 * param1) } } -void ov5_021D5778 (UnkStruct_ov5_021D5778 * param0) +void ov5_021D5778(UnkStruct_ov5_021D5778 *param0) { Heap_FreeToHeap(param0->unk_04); Heap_FreeToHeap(param0->unk_00); Heap_FreeToHeap(param0); } -void ov5_021D5790 (const int param0, const UnkStruct_ov5_021D5778 * param1, u16 * param2) +void ov5_021D5790(const int param0, const UnkStruct_ov5_021D5778 *param1, u16 *param2) { *param2 = param1->unk_00[param0].unk_00; } -void ov5_021D579C (const int param0, const UnkStruct_ov5_021D5778 * param1, u16 * param2, u16 * param3) +void ov5_021D579C(const int param0, const UnkStruct_ov5_021D5778 *param1, u16 *param2, u16 *param3) { *param2 = param1->unk_00[param0].unk_00; *param3 = param1->unk_00[param0].unk_02; } -UnkStruct_ov5_021D57B4 const * ov5_021D57B4 (const u16 param0, const UnkStruct_ov5_021D5778 * param1) +UnkStruct_ov5_021D57B4 const *ov5_021D57B4(const u16 param0, const UnkStruct_ov5_021D5778 *param1) { return ¶m1->unk_04[param0]; } diff --git a/src/overlay005/ov5_021D57BC.c b/src/overlay005/ov5_021D57BC.c index e6782747de..951976f694 100644 --- a/src/overlay005/ov5_021D57BC.c +++ b/src/overlay005/ov5_021D57BC.c @@ -1,8 +1,9 @@ +#include "overlay005/ov5_021D57BC.h" + #include #include #include "heap.h" -#include "overlay005/ov5_021D57BC.h" typedef struct UnkStruct_ov5_021D57D8_t { BOOL unk_00; @@ -14,9 +15,9 @@ typedef struct UnkStruct_ov5_021D57D8_t { char unk_18[32]; } UnkStruct_ov5_021D57D8; -UnkStruct_ov5_021D57D8 * ov5_021D57BC (void) +UnkStruct_ov5_021D57D8 *ov5_021D57BC(void) { - UnkStruct_ov5_021D57D8 * v0; + UnkStruct_ov5_021D57D8 *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D57D8)); MI_CpuClear32(v0, sizeof(UnkStruct_ov5_021D57D8)); @@ -24,33 +25,33 @@ UnkStruct_ov5_021D57D8 * ov5_021D57BC (void) return v0; } -void ov5_021D57D8 (UnkStruct_ov5_021D57D8 ** param0) +void ov5_021D57D8(UnkStruct_ov5_021D57D8 **param0) { Heap_FreeToHeapExplicit(4, *param0); *param0 = NULL; } -BOOL ov5_021D57EC (UnkStruct_ov5_021D57D8 * param0) +BOOL ov5_021D57EC(UnkStruct_ov5_021D57D8 *param0) { return param0->unk_00; } -int ov5_021D57F0 (UnkStruct_ov5_021D57D8 * param0) +int ov5_021D57F0(UnkStruct_ov5_021D57D8 *param0) { return param0->unk_08; } -int ov5_021D57F4 (UnkStruct_ov5_021D57D8 * param0) +int ov5_021D57F4(UnkStruct_ov5_021D57D8 *param0) { return param0->unk_0C; } -GXRgb ov5_021D57F8 (UnkStruct_ov5_021D57D8 * param0) +GXRgb ov5_021D57F8(UnkStruct_ov5_021D57D8 *param0) { return param0->unk_10; } -void ov5_021D57FC (UnkStruct_ov5_021D57D8 * param0, int param1, BOOL param2, int param3, int param4, int param5) +void ov5_021D57FC(UnkStruct_ov5_021D57D8 *param0, int param1, BOOL param2, int param3, int param4, int param5) { if (param1 & 1) { param0->unk_00 = param2; @@ -71,7 +72,7 @@ void ov5_021D57FC (UnkStruct_ov5_021D57D8 * param0, int param1, BOOL param2, int G3X_SetFog(param0->unk_00, param0->unk_04, param0->unk_08, param0->unk_0C); } -void ov5_021D5834 (UnkStruct_ov5_021D57D8 * param0, int param1, GXRgb param2, int param3) +void ov5_021D5834(UnkStruct_ov5_021D57D8 *param0, int param1, GXRgb param2, int param3) { if (param1 & (1 << 4)) { param0->unk_10 = param2; @@ -84,7 +85,7 @@ void ov5_021D5834 (UnkStruct_ov5_021D57D8 * param0, int param1, GXRgb param2, in G3X_SetFogColor(param0->unk_10, param0->unk_14); } -void ov5_021D585C (UnkStruct_ov5_021D57D8 * param0, const char * param1) +void ov5_021D585C(UnkStruct_ov5_021D57D8 *param0, const char *param1) { MI_CpuCopy32(param1, param0->unk_18, 32); G3X_SetFogTable((u32 *)param0->unk_18); diff --git a/src/overlay005/ov5_021D5878.c b/src/overlay005/ov5_021D5878.c index 382a53921d..b38183952e 100644 --- a/src/overlay005/ov5_021D5878.c +++ b/src/overlay005/ov5_021D5878.c @@ -1,14 +1,15 @@ +#include "overlay005/ov5_021D5878.h" + #include #include #include "overlay005/struct_ov5_021D5894.h" #include "heap.h" -#include "overlay005/ov5_021D5878.h" -UnkStruct_ov5_021D5894 * ov5_021D5878 (void) +UnkStruct_ov5_021D5894 *ov5_021D5878(void) { - UnkStruct_ov5_021D5894 * v0; + UnkStruct_ov5_021D5894 *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5894)); MI_CpuClear32(v0, sizeof(UnkStruct_ov5_021D5894)); @@ -16,13 +17,13 @@ UnkStruct_ov5_021D5894 * ov5_021D5878 (void) return v0; } -void ov5_021D5894 (UnkStruct_ov5_021D5894 ** param0) +void ov5_021D5894(UnkStruct_ov5_021D5894 **param0) { Heap_FreeToHeapExplicit(4, *param0); *param0 = NULL; } -void ov5_021D58A8 (UnkStruct_ov5_021D5894 * param0, int param1) +void ov5_021D58A8(UnkStruct_ov5_021D5894 *param0, int param1) { int v0; @@ -51,7 +52,7 @@ void ov5_021D58A8 (UnkStruct_ov5_021D5894 * param0, int param1) } } -void ov5_021D5948 (UnkStruct_ov5_021D5894 * param0, NNSG3dResMdl * param1, int param2) +void ov5_021D5948(UnkStruct_ov5_021D5894 *param0, NNSG3dResMdl *param1, int param2) { int v0; @@ -112,7 +113,7 @@ void ov5_021D5948 (UnkStruct_ov5_021D5894 * param0, NNSG3dResMdl * param1, int p } } -void ov5_021D5A50 (UnkStruct_ov5_021D5894 * param0, int param1, fx16 param2, fx16 param3, fx16 param4) +void ov5_021D5A50(UnkStruct_ov5_021D5894 *param0, int param1, fx16 param2, fx16 param3, fx16 param4) { param0->unk_00[param1].x = param2; param0->unk_00[param1].y = param3; @@ -121,13 +122,13 @@ void ov5_021D5A50 (UnkStruct_ov5_021D5894 * param0, int param1, fx16 param2, fx1 NNS_G3dGlbLightVector(param1, param0->unk_00[param1].x, param0->unk_00[param1].y, param0->unk_00[param1].z); } -void ov5_021D5A78 (UnkStruct_ov5_021D5894 * param0, int param1, GXRgb param2) +void ov5_021D5A78(UnkStruct_ov5_021D5894 *param0, int param1, GXRgb param2) { param0->unk_18[param1] = param2; NNS_G3dGlbLightColor(param1, param0->unk_18[param1]); } -void ov5_021D5A8C (UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2, BOOL param3) +void ov5_021D5A8C(UnkStruct_ov5_021D5894 *param0, GXRgb param1, BOOL param2, BOOL param3) { param0->unk_20 = param1; param0->unk_28 = param2; @@ -137,7 +138,7 @@ void ov5_021D5A8C (UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2, B } } -void ov5_021D5AA0 (UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2) +void ov5_021D5AA0(UnkStruct_ov5_021D5894 *param0, GXRgb param1, BOOL param2) { param0->unk_22 = param1; @@ -146,7 +147,7 @@ void ov5_021D5AA0 (UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2) } } -void ov5_021D5AB4 (UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2, BOOL param3) +void ov5_021D5AB4(UnkStruct_ov5_021D5894 *param0, GXRgb param1, BOOL param2, BOOL param3) { param0->unk_24 = param1; param0->unk_2C = param2; @@ -156,7 +157,7 @@ void ov5_021D5AB4 (UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2, B } } -void ov5_021D5AC8 (UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2) +void ov5_021D5AC8(UnkStruct_ov5_021D5894 *param0, GXRgb param1, BOOL param2) { param0->unk_26 = param1; @@ -165,7 +166,7 @@ void ov5_021D5AC8 (UnkStruct_ov5_021D5894 * param0, GXRgb param1, BOOL param2) } } -void ov5_021D5ADC (UnkStruct_ov5_021D5894 * param0, GXPolygonMode param1, BOOL param2) +void ov5_021D5ADC(UnkStruct_ov5_021D5894 *param0, GXPolygonMode param1, BOOL param2) { param0->unk_34 = param1; @@ -174,7 +175,7 @@ void ov5_021D5ADC (UnkStruct_ov5_021D5894 * param0, GXPolygonMode param1, BOOL p } } -void ov5_021D5AF0 (UnkStruct_ov5_021D5894 * param0, GXCull param1, BOOL param2) +void ov5_021D5AF0(UnkStruct_ov5_021D5894 *param0, GXCull param1, BOOL param2) { param0->unk_38 = param1; @@ -183,7 +184,7 @@ void ov5_021D5AF0 (UnkStruct_ov5_021D5894 * param0, GXCull param1, BOOL param2) } } -void ov5_021D5B04 (UnkStruct_ov5_021D5894 * param0, int param1, BOOL param2) +void ov5_021D5B04(UnkStruct_ov5_021D5894 *param0, int param1, BOOL param2) { param0->unk_40 = param1; @@ -192,7 +193,7 @@ void ov5_021D5B04 (UnkStruct_ov5_021D5894 * param0, int param1, BOOL param2) } } -void ov5_021D5B18 (UnkStruct_ov5_021D5894 * param0, int param1, BOOL param2, BOOL param3) +void ov5_021D5B18(UnkStruct_ov5_021D5894 *param0, int param1, BOOL param2, BOOL param3) { if (param2 == 1) { if (param0->unk_44 & param1) { diff --git a/src/overlay005/ov5_021D5B40.c b/src/overlay005/ov5_021D5B40.c index e381a53c67..75d4dc1f75 100644 --- a/src/overlay005/ov5_021D5B40.c +++ b/src/overlay005/ov5_021D5B40.c @@ -1,3 +1,5 @@ +#include "overlay005/ov5_021D5B40.h" + #include #include @@ -5,7 +7,6 @@ #include "overlay115/camera_angle.h" #include "camera.h" -#include "overlay005/ov5_021D5B40.h" typedef struct { fx32 unk_00; @@ -19,192 +20,158 @@ typedef struct { static const UnkStruct_ov5_021F8AE4 Unk_ov5_021F8AE4[] = { { 0x29aec1, - { - -0x29fe, 0, 0 - }, + { -0x29fe, 0, 0 }, 0, 0x5c1, FX32_ONE * 150, - FX32_ONE * 900 + FX32_ONE * 900, }, { 0x29aec1, - { - -0x309e, 0, 0 - }, + { -0x309e, 0, 0 }, 0, 0x5c1, FX32_ONE * 150, - FX32_ONE * 900 + FX32_ONE * 900, }, { 0x20374c, - { - -0x26de, 0, 0 - }, + { -0x26de, 0, 0 }, 0, 0x770, FX32_ONE * 150, - FX32_ONE * 900 + FX32_ONE * 900, }, { 0x29aec1, - { - -0x29fe, 0, 0 - }, + { -0x29fe, 0, 0 }, 0, 0x5c1, FX32_ONE * 150, - FX32_ONE * 900 + FX32_ONE * 900, }, { 0x61b89b, - { - -0x239e, 0, 0 - }, + { -0x239e, 0, 0 }, 1, 0x281, FX32_ONE * 150, - FX32_ONE * 1735 + FX32_ONE * 1735, }, { 0x13c805, - { - -0x29fd, 0, 0 - }, + { -0x29fd, 0, 0 }, 0, 0xc01, FX32_ONE * 10, - FX32_ONE * 1008 + FX32_ONE * 1008, }, { 0x3628df, - { - -0x33fd, 0, 0 - }, + { -0x33fd, 0, 0 }, 0, 0x481, FX32_ONE * 115, - FX32_ONE * 1221 + FX32_ONE * 1221, }, { 0x29aec1, - { - -0x29fd, 0, 0 - }, + { -0x29fd, 0, 0 }, 0, 0x5c1, FX32_ONE * 153, - FX32_ONE * 1031 + FX32_ONE * 1031, }, { 0x296ec1, - { - -0x321d, 0, 0 - }, + { -0x321d, 0, 0 }, 0, 0x701, FX32_ONE * 150, - FX32_ONE * 1034 + FX32_ONE * 1034, }, { 0x1659ac, - { - -0x1cdd, 0, 0 - }, + { -0x1cdd, 0, 0 }, 0, 0xab0, FX32_ONE * 150, - FX32_ONE * 900 + FX32_ONE * 900, }, { 0x4b25b1, - { - -0x2b3d, 0, 0 - }, + { -0x2b3d, 0, 0 }, 0, 0x341, FX32_ONE * 150, - FX32_ONE * 1746 + FX32_ONE * 1746, }, { 0x2a3d55, - { - -0x291d, 0, 0 - }, + { -0x291d, 0, 0 }, 0, 0x5c1, FX32_ONE * 230, - FX32_ONE * 1127 + FX32_ONE * 1127, }, { 0x23e93f, - { - -0x2cfd, 0, 0 - }, + { -0x2cfd, 0, 0 }, 0, 0x6c1, FX32_ONE * 150, - FX32_ONE * 900 + FX32_ONE * 900, }, { 0x20374c, - { - -0x21fd, 0, 0 - }, + { -0x21fd, 0, 0 }, 0, 0x770, FX32_ONE * 150, - FX32_ONE * 900 + FX32_ONE * 900, }, { 0xa9765, - { - -0x37bc, 0, 0 - }, + { -0x37bc, 0, 0 }, 0, 0x1501, FX32_ONE * 10, - FX32_ONE * 1008 + FX32_ONE * 1008, }, { 0x28dedf, - { - -0x26de, 0, 0 - }, + { -0x26de, 0, 0 }, 0, 0x5f0, FX32_ONE * 150, - FX32_ONE * 900 + FX32_ONE * 900, }, { 0x14aec0, - { - -(0x10000 - 0xd602), 0, 0 - }, + { -(0x10000 - 0xd602), 0, 0 }, 0, 0xb01, FX32_ONE * 150, - FX32_ONE * 900 + FX32_ONE * 900, }, }; -void ov5_021D5B40 (const VecFx32 * param0, FieldSystem * fieldSystem, const int param2, const BOOL param3) +void ov5_021D5B40(const VecFx32 *param0, FieldSystem *fieldSystem, const int param2, const BOOL param3) { - const VecFx32 * v0 = param0; - const UnkStruct_ov5_021F8AE4 * v1 = &Unk_ov5_021F8AE4[param2]; + const VecFx32 *v0 = param0; + const UnkStruct_ov5_021F8AE4 *v1 = &Unk_ov5_021F8AE4[param2]; GF_ASSERT(param2 < NELEMS(Unk_ov5_021F8AE4)); @@ -219,7 +186,7 @@ void ov5_021D5B40 (const VecFx32 * param0, FieldSystem * fieldSystem, const int } } -void ov5_021D5BA8 (FieldSystem * fieldSystem) +void ov5_021D5BA8(FieldSystem *fieldSystem) { Camera_ClearActive(); Camera_DeleteHistory(fieldSystem->camera); diff --git a/src/overlay005/ov5_021D5BC0.c b/src/overlay005/ov5_021D5BC0.c index 0740311f8c..4b50c20001 100644 --- a/src/overlay005/ov5_021D5BC0.c +++ b/src/overlay005/ov5_021D5BC0.c @@ -1,42 +1,44 @@ +#include "overlay005/ov5_021D5BC0.h" + #include #include #include "field/field_system.h" - -#include "game_overlay.h" -#include "field_comm_manager.h" -#include "overlay005/ov5_021D5BC0.h" #include "overlay005/ov5_021EA714.h" #include "overlay056/ov56_022561C0.h" +#include "field_comm_manager.h" +#include "game_overlay.h" + FS_EXTERN_OVERLAY(overlay56); typedef struct { - void (* unk_00)(FieldSystem *); - BOOL (* unk_04)(FieldSystem *); - void (* unk_08)(FieldSystem *); - BOOL (* unk_0C)(FieldSystem *); + // clang-format off + void (*unk_00)(FieldSystem *); + BOOL(*unk_04)(FieldSystem *); + void (*unk_08)(FieldSystem *); + BOOL(*unk_0C)(FieldSystem *); + // clang-format on } UnkStruct_ov5_021F8C7C; - -static void ov5_021D5C4C(FieldSystem * fieldSystem); -static void ov5_021D5C54(FieldSystem * fieldSystem); -static void ov5_021D5C5C(FieldSystem * fieldSystem); -static void ov5_021D5C78(FieldSystem * fieldSystem); -static void ov5_021D5C80(FieldSystem * fieldSystem); -static void ov5_021D5C88(FieldSystem * fieldSystem); -static BOOL ov5_021D5CA0(FieldSystem * fieldSystem); -static BOOL ov5_021D5CAC(FieldSystem * fieldSystem); -static BOOL ov5_021D5CA8(FieldSystem * fieldSystem); +static void ov5_021D5C4C(FieldSystem *fieldSystem); +static void ov5_021D5C54(FieldSystem *fieldSystem); +static void ov5_021D5C5C(FieldSystem *fieldSystem); +static void ov5_021D5C78(FieldSystem *fieldSystem); +static void ov5_021D5C80(FieldSystem *fieldSystem); +static void ov5_021D5C88(FieldSystem *fieldSystem); +static BOOL ov5_021D5CA0(FieldSystem *fieldSystem); +static BOOL ov5_021D5CAC(FieldSystem *fieldSystem); +static BOOL ov5_021D5CA8(FieldSystem *fieldSystem); static const UnkStruct_ov5_021F8C7C Unk_ov5_021F8C7C[] = { - {ov5_021D5C4C, NULL, ov5_021D5C78, ov5_021D5CA0}, - {ov5_021D5C54, NULL, ov5_021D5C80, ov5_021D5CAC}, - {ov5_021D5C5C, NULL, ov5_021D5C88, ov5_021D5CA8}, - {ov5_021EA830, NULL, ov5_021EA848, ov5_021EA854} + { ov5_021D5C4C, NULL, ov5_021D5C78, ov5_021D5CA0 }, + { ov5_021D5C54, NULL, ov5_021D5C80, ov5_021D5CAC }, + { ov5_021D5C5C, NULL, ov5_021D5C88, ov5_021D5CA8 }, + { ov5_021EA830, NULL, ov5_021EA848, ov5_021EA854 } }; -static int ov5_021D5BC0 (FieldSystem * fieldSystem) +static int ov5_021D5BC0(FieldSystem *fieldSystem) { int v0 = fieldSystem->unk_18; @@ -46,14 +48,15 @@ static int ov5_021D5BC0 (FieldSystem * fieldSystem) return v0 - 1; } -void ov5_021D5BD8 (FieldSystem * fieldSystem) +void ov5_021D5BD8(FieldSystem *fieldSystem) { Unk_ov5_021F8C7C[ov5_021D5BC0(fieldSystem)].unk_00(fieldSystem); } -BOOL ov5_021D5BF4 (FieldSystem * fieldSystem) +BOOL ov5_021D5BF4(FieldSystem *fieldSystem) { - BOOL (* v0)(FieldSystem *); + BOOL(*v0) + (FieldSystem *); v0 = Unk_ov5_021F8C7C[ov5_021D5BC0(fieldSystem)].unk_04; if (v0 == NULL) { @@ -63,59 +66,59 @@ BOOL ov5_021D5BF4 (FieldSystem * fieldSystem) return v0(fieldSystem); } -void ov5_021D5C14 (FieldSystem * fieldSystem) +void ov5_021D5C14(FieldSystem *fieldSystem) { Unk_ov5_021F8C7C[ov5_021D5BC0(fieldSystem)].unk_08(fieldSystem); } -BOOL ov5_021D5C30 (FieldSystem * fieldSystem) +BOOL ov5_021D5C30(FieldSystem *fieldSystem) { return Unk_ov5_021F8C7C[ov5_021D5BC0(fieldSystem)].unk_0C(fieldSystem); } -static void ov5_021D5C4C (FieldSystem * fieldSystem) +static void ov5_021D5C4C(FieldSystem *fieldSystem) { ov5_021EA728(fieldSystem); } -static void ov5_021D5C54 (FieldSystem * fieldSystem) +static void ov5_021D5C54(FieldSystem *fieldSystem) { sub_0205A0BC(); } -static void ov5_021D5C5C (FieldSystem * fieldSystem) +static void ov5_021D5C5C(FieldSystem *fieldSystem) { Overlay_LoadByID(FS_OVERLAY_ID(overlay56), 2); fieldSystem->unk_84 = ov56_02256410(fieldSystem); } -static void ov5_021D5C78 (FieldSystem * fieldSystem) +static void ov5_021D5C78(FieldSystem *fieldSystem) { ov5_021EA790(fieldSystem); } -static void ov5_021D5C80 (FieldSystem * fieldSystem) +static void ov5_021D5C80(FieldSystem *fieldSystem) { sub_0205A0A0(); } -static void ov5_021D5C88 (FieldSystem * fieldSystem) +static void ov5_021D5C88(FieldSystem *fieldSystem) { ov56_02256468(fieldSystem->unk_84); Overlay_UnloadByID(FS_OVERLAY_ID(overlay56)); } -static BOOL ov5_021D5CA0 (FieldSystem * fieldSystem) +static BOOL ov5_021D5CA0(FieldSystem *fieldSystem) { return ov5_021EA7CC(fieldSystem); } -static BOOL ov5_021D5CA8 (FieldSystem * fieldSystem) +static BOOL ov5_021D5CA8(FieldSystem *fieldSystem) { return 1; } -static BOOL ov5_021D5CAC (FieldSystem * fieldSystem) +static BOOL ov5_021D5CAC(FieldSystem *fieldSystem) { return 1; } diff --git a/src/overlay005/ov5_021D5CB0.c b/src/overlay005/ov5_021D5CB0.c index dec295252b..23b6396bc7 100644 --- a/src/overlay005/ov5_021D5CB0.c +++ b/src/overlay005/ov5_021D5CB0.c @@ -1,13 +1,14 @@ +#include "overlay005/ov5_021D5CB0.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "narc.h" #include "heap.h" +#include "narc.h" #include "unk_0201DBEC.h" #include "unk_0201DD00.h" -#include "overlay005/ov5_021D5CB0.h" typedef struct { char unk_00[16]; @@ -15,11 +16,11 @@ typedef struct { } UnkStruct_ov5_021D5DEC_sub1; typedef struct { - u8 * unk_00; + u8 *unk_00; int unk_04; - NNSG3dResTex * unk_08; - void * unk_0C; - UnkStruct_ov5_021D5DEC_sub1 * unk_10; + NNSG3dResTex *unk_08; + void *unk_0C; + UnkStruct_ov5_021D5DEC_sub1 *unk_10; u16 unk_14; u16 unk_16; } UnkStruct_ov5_021D5DEC; @@ -30,17 +31,17 @@ typedef struct { } UnkStruct_ov5_021D5CE4; typedef struct UnkStruct_ov5_021D5CB0_t { - void * unk_00; - UnkStruct_ov5_021D5CE4 * unk_04; + void *unk_00; + UnkStruct_ov5_021D5CE4 *unk_04; UnkStruct_ov5_021D5DEC unk_08[16]; } UnkStruct_ov5_021D5CB0; -static int ov5_021D5D30(UnkStruct_ov5_021D5CB0 * param0, NNSG3dResTex * param1, int param2, NARC * param3); +static int ov5_021D5D30(UnkStruct_ov5_021D5CB0 *param0, NNSG3dResTex *param1, int param2, NARC *param3); -UnkStruct_ov5_021D5CB0 * ov5_021D5CB0 (void) +UnkStruct_ov5_021D5CB0 *ov5_021D5CB0(void) { int v0; - UnkStruct_ov5_021D5CB0 * v1 = NULL; + UnkStruct_ov5_021D5CB0 *v1 = NULL; v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5CB0)); @@ -58,10 +59,10 @@ UnkStruct_ov5_021D5CB0 * ov5_021D5CB0 (void) return v1; } -int ov5_021D5CE4 (UnkStruct_ov5_021D5CB0 * param0, NNSG3dResTex * param1) +int ov5_021D5CE4(UnkStruct_ov5_021D5CB0 *param0, NNSG3dResTex *param1) { int v0, v1 = 0; - NARC * v2; + NARC *v2; v2 = NARC_ctor(NARC_INDEX_DATA__FLDTANIME, 4); @@ -79,7 +80,7 @@ int ov5_021D5CE4 (UnkStruct_ov5_021D5CB0 * param0, NNSG3dResTex * param1) return v1; } -static int ov5_021D5D30 (UnkStruct_ov5_021D5CB0 * param0, NNSG3dResTex * param1, int param2, NARC * param3) +static int ov5_021D5D30(UnkStruct_ov5_021D5CB0 *param0, NNSG3dResTex *param1, int param2, NARC *param3) { int v0, v1; char v2[40]; @@ -113,7 +114,7 @@ static int ov5_021D5D30 (UnkStruct_ov5_021D5CB0 * param0, NNSG3dResTex * param1, return v0; } -void ov5_021D5DEC (UnkStruct_ov5_021D5CB0 * param0) +void ov5_021D5DEC(UnkStruct_ov5_021D5CB0 *param0) { int v0; @@ -122,7 +123,7 @@ void ov5_021D5DEC (UnkStruct_ov5_021D5CB0 * param0) } for (v0 = 0; v0 < 16; v0++) { - UnkStruct_ov5_021D5DEC * v1 = ¶m0->unk_08[v0]; + UnkStruct_ov5_021D5DEC *v1 = ¶m0->unk_08[v0]; if (v1->unk_0C == NULL) { continue; @@ -147,7 +148,7 @@ void ov5_021D5DEC (UnkStruct_ov5_021D5CB0 * param0) } } -void ov5_021D5E5C (UnkStruct_ov5_021D5CB0 * param0, int param1) +void ov5_021D5E5C(UnkStruct_ov5_021D5CB0 *param0, int param1) { if (param0 == NULL) { return; @@ -165,7 +166,7 @@ void ov5_021D5E5C (UnkStruct_ov5_021D5CB0 * param0, int param1) param0->unk_08[param1].unk_16 = 0; } -void ov5_021D5E8C (UnkStruct_ov5_021D5CB0 * param0) +void ov5_021D5E8C(UnkStruct_ov5_021D5CB0 *param0) { int v0; @@ -180,7 +181,7 @@ void ov5_021D5E8C (UnkStruct_ov5_021D5CB0 * param0) Heap_FreeToHeap(param0->unk_00); } -void ov5_021D5EAC (UnkStruct_ov5_021D5CB0 * param0) +void ov5_021D5EAC(UnkStruct_ov5_021D5CB0 *param0) { if (param0 != NULL) { Heap_FreeToHeap(param0); diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c index 0e8b2494a7..2c66968951 100644 --- a/src/overlay005/ov5_021D5EB8.c +++ b/src/overlay005/ov5_021D5EB8.c @@ -1,51 +1,51 @@ +#include "overlay005/ov5_021D5EB8.h" + #include #include -#include "enums.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02009F38_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay005/struct_ov5_021D57D8_decl.h" - #include "struct_defs/struct_020095C4.h" + #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay005/hblank_system.h" +#include "overlay005/ov5_021D57BC.h" +#include "overlay005/struct_ov5_021D57D8_decl.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay115/struct_ov115_02261520.h" -#include "unk_02005474.h" +#include "buffer_manager.h" +#include "camera.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "sys_task.h" -#include "buffer_manager.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201E190.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_020218BC.h" #include "unk_0202309C.h" -#include "overlay005/ov5_021D57BC.h" -#include "overlay005/ov5_021D5EB8.h" -#include "overlay005/hblank_system.h" typedef struct UnkStruct_ov5_021D5EF8_t { - UnkStruct_ov5_021D6594 * unk_00; + UnkStruct_ov5_021D6594 *unk_00; int unk_04; int unk_08; int unk_0C; int unk_10; - SysTask * unk_14; + SysTask *unk_14; } UnkStruct_ov5_021D5EF8; typedef struct { @@ -55,38 +55,38 @@ typedef struct { } UnkStruct_ov5_021F8D90; typedef struct { - UnkStruct_02009DC8 * unk_00[4]; + UnkStruct_02009DC8 *unk_00[4]; UnkStruct_ov115_02261520 unk_10; UnkStruct_ov19_021DA864 unk_40; } UnkStruct_ov5_021D6690; typedef struct { - char * unk_00; - char * unk_04; - char * unk_08; - NNSG2dScreenData * unk_0C; - NNSG2dCharacterData * unk_10; - NNSG2dPaletteData * unk_14; + char *unk_00; + char *unk_04; + char *unk_08; + NNSG2dScreenData *unk_0C; + NNSG2dCharacterData *unk_10; + NNSG2dPaletteData *unk_14; } UnkStruct_ov5_021D6D84; typedef struct UnkStruct_ov5_021D6FA8_tag { - UnkStruct_ov5_021D6594 * unk_00; - GraphicElementData * unk_04; - void * unk_08; + UnkStruct_ov5_021D6594 *unk_00; + GraphicElementData *unk_04; + void *unk_08; s32 unk_0C[10]; - struct UnkStruct_ov5_021D6FA8_tag * unk_34; - struct UnkStruct_ov5_021D6FA8_tag * unk_38; + struct UnkStruct_ov5_021D6FA8_tag *unk_34; + struct UnkStruct_ov5_021D6FA8_tag *unk_38; } UnkStruct_ov5_021D6FA8; typedef struct { - UnkStruct_ov5_021D6594 * unk_00; - void * unk_04; - const UnkStruct_ov5_021D6690 * unk_08; + UnkStruct_ov5_021D6594 *unk_00; + void *unk_04; + const UnkStruct_ov5_021D6690 *unk_08; UnkStruct_ov5_021D6FA8 unk_0C; UnkStruct_ov5_021D6FA8 unk_48[48]; - SysTask * unk_B88; + SysTask *unk_B88; VecFx32 unk_B8C; - void * unk_B98; + void *unk_B98; BOOL unk_B9C; u16 unk_BA0; u16 unk_BA2; @@ -94,43 +94,43 @@ typedef struct { u16 unk_BA6; } UnkStruct_ov5_021DB4B8; -typedef void (* UnkFuncPtr_ov5_021D69B8)(SysTask *, void *); +typedef void (*UnkFuncPtr_ov5_021D69B8)(SysTask *, void *); typedef struct { u16 unk_00; u16 unk_02; int unk_04; - UnkStruct_ov5_021DB4B8 * unk_08; - UnkStruct_ov5_021D6690 * unk_0C; + UnkStruct_ov5_021DB4B8 *unk_08; + UnkStruct_ov5_021D6690 *unk_0C; u16 unk_10; u16 unk_12; - SysTask * unk_14; + SysTask *unk_14; UnkFuncPtr_ov5_021D69B8 unk_18; } UnkStruct_ov5_021D69B8; -typedef void (* UnkFuncPtr_ov5_021D6FF0)(UnkStruct_ov5_021D6FA8 *); +typedef void (*UnkFuncPtr_ov5_021D6FF0)(UnkStruct_ov5_021D6FA8 *); typedef struct { - UnkStruct_02009714 * unk_00[4]; - UnkStruct_02009F38 * unk_10; + UnkStruct_02009714 *unk_00[4]; + UnkStruct_02009F38 *unk_10; NNSG2dRendererInstance unk_14; NNSG2dRenderSurface unk_C0; - GraphicElementManager * unk_130; - SysTask * unk_134; + GraphicElementManager *unk_130; + SysTask *unk_134; } UnkStruct_ov5_021D61D0; typedef struct UnkStruct_ov5_021D6594_t { - UnkStruct_ov5_021D69B8 * unk_00; - const UnkStruct_ov5_021F8D90 * unk_04; + UnkStruct_ov5_021D69B8 *unk_00; + const UnkStruct_ov5_021F8D90 *unk_04; UnkStruct_ov5_021D61D0 unk_08; - FieldSystem * fieldSystem; - NARC * unk_144; + FieldSystem *fieldSystem; + NARC *unk_144; } UnkStruct_ov5_021D6594; -typedef void (* UnkFuncPtr_ov5_021D7210)(UnkStruct_ov5_021DB4B8 *, int); +typedef void (*UnkFuncPtr_ov5_021D7210)(UnkStruct_ov5_021DB4B8 *, int); typedef struct { - UnkStruct_ov5_021DB4B8 * unk_00; + UnkStruct_ov5_021DB4B8 *unk_00; s16 unk_04; s16 unk_06; s16 unk_08; @@ -143,7 +143,7 @@ typedef struct { UnkFuncPtr_ov5_021D7210 unk_18; } UnkStruct_ov5_021D7210; -typedef void (* UnkFuncPtr_ov5_021D7210_1)(UnkStruct_ov5_021DB4B8 *, int); +typedef void (*UnkFuncPtr_ov5_021D7210_1)(UnkStruct_ov5_021DB4B8 *, int); typedef struct { int unk_00; @@ -162,7 +162,7 @@ typedef struct { } UnkStruct_ov5_021D6538; typedef struct { - UnkStruct_ov5_021D57D8 * unk_00; + UnkStruct_ov5_021D57D8 *unk_00; UnkStruct_ov5_021D64FC unk_04; UnkStruct_ov5_021D64FC unk_18; UnkStruct_ov5_021D64FC unk_2C; @@ -171,7 +171,7 @@ typedef struct { } UnkStruct_ov5_021D7308; typedef struct { - UnkStruct_ov5_021D57D8 * unk_00; + UnkStruct_ov5_021D57D8 *unk_00; char unk_04[32]; s32 unk_24; s32 unk_28; @@ -225,10 +225,10 @@ typedef struct { s16 unk_00; s16 unk_02; UnkStruct_ov5_021D6538 unk_04; - HBlankSystem * unk_14; - HBlankTask * unk_18; - BufferManager * bufferManagers[2]; - SysTask * unk_24; + HBlankSystem *unk_14; + HBlankTask *unk_18; + BufferManager *bufferManagers[2]; + SysTask *unk_24; u32 unk_28; u16 unk_2C[4][192]; } UnkStruct_ov5_021DB614; @@ -237,149 +237,149 @@ typedef struct { UnkStruct_ov5_021DB614 unk_00; } UnkStruct_ov5_021DB04C; -static void ov5_021D5FE4(SysTask * param0, void * param1); -static void ov5_021D60B4(SysTask * param0, void * param1); +static void ov5_021D5FE4(SysTask *param0, void *param1); +static void ov5_021D60B4(SysTask *param0, void *param1); static int ov5_021D6178(int param0, int param1); -static void ov5_021DB4B8(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021DB4E4(UnkStruct_ov5_021DB4B8 * param0); +static void ov5_021DB4B8(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021DB4E4(UnkStruct_ov5_021DB4B8 *param0); static void ov5_021D64E4(int param0, int param1); -static void ov5_021D64FC(UnkStruct_ov5_021D64FC * param0, int param1, int param2, int param3); -static BOOL ov5_021D650C(UnkStruct_ov5_021D64FC * param0); -static void ov5_021D6538(UnkStruct_ov5_021D6538 * param0, fx32 param1, fx32 param2, int param3); -static BOOL ov5_021D6548(UnkStruct_ov5_021D6538 * param0); -static void ov5_021D6594(UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2); -static void ov5_021D6A2C(UnkStruct_ov5_021D6594 * param0, int param1); -static void ov5_021D6690(UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2); -static UnkStruct_02009DC8 * ov5_021D65C0(UnkStruct_02009F38 * param0, int param1, int param2, UnkStruct_02009714 * param3, NARC * param4, u32 param5); -static void ov5_021D61D0(UnkStruct_ov5_021D61D0 * param0); -static void ov5_021D6290(UnkStruct_02009F38 * param0, int param1, int param2); -static void ov5_021D62BC(UnkStruct_ov5_021D61D0 * param0); -static void ov5_021D6284(SysTask * param0, void * param1); -static void ov5_021D630C(GraphicElementData * param0, VecFx32 * param1); -static void ov5_021D6FA8(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021D6FD8(UnkStruct_ov5_021D6FA8 * param0); -static UnkStruct_ov5_021D6FA8 * ov5_021D6F00(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021D6F4C(UnkStruct_ov19_021DA864 * param0, UnkStruct_ov5_021D6594 * param1, UnkStruct_ov5_021D6690 * param2, int param3, int param4); -static BOOL ov5_021D6A48(UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B8 * param1); -static void ov5_021D6FF0(UnkStruct_ov5_021D6FA8 * param0, UnkFuncPtr_ov5_021D6FF0 param1); -static void ov5_021D700C(UnkStruct_ov5_021DB4B8 * param0); -static VecFx32 ov5_021D7010(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021D7028(fx32 * param0, fx32 * param1, UnkStruct_ov5_021DB4B8 * param2); -static void ov5_021D717C(UnkStruct_ov5_021DB4B8 * param0, int * param1, int * param2); -static void ov5_021D71B4(UnkStruct_ov5_021DB4B8 * param0, fx32 * param1, fx32 * param2); -static void ov5_021D6EC8(UnkStruct_ov5_021D6FA8 * param0, int param1); -static void ov5_021D6EF0(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021D7210(UnkStruct_ov5_021D7210 * param0, UnkStruct_ov5_021DB4B8 * param1, s32 param2, s32 param3, s32 param4, s32 param5, s32 param6, s32 param7, s32 param8, UnkFuncPtr_ov5_021D7210_1 param9); -static void ov5_021D7238(UnkStruct_ov5_021D7210 * param0, s32 param1, s32 param2, s32 param3, s32 param4); -static int ov5_021D7244(UnkStruct_ov5_021D7210 * param0); -static void ov5_021D7308(UnkStruct_ov5_021D7308 * param0, UnkStruct_ov5_021D7480 * param1, UnkStruct_ov5_021D57D8 * param2, int param3, int param4, GXRgb param5, int param6, u32 param7); -static int ov5_021D735C(UnkStruct_ov5_021D7308 * param0, UnkStruct_ov5_021D7480 * param1, u32 param2); -static void ov5_021D7384(UnkStruct_ov5_021D57D8 * param0, int param1, int param2, GXRgb param3); -static void ov5_021D73B0(UnkStruct_ov5_021D7308 * param0, UnkStruct_ov5_021D57D8 * param1, int param2, int param3, GXRgb param4, int param5); -static BOOL ov5_021D7434(UnkStruct_ov5_021D7308 * param0); -static void ov5_021D7480(UnkStruct_ov5_021D7480 * param0); -static void ov5_021D749C(UnkStruct_ov5_021D7480 * param0, int param1, BOOL param2); -static int ov5_021D74B8(UnkStruct_ov5_021D7480 * param0); -static int ov5_021D74F4(UnkStruct_ov5_021D7480 * param0); -static void ov5_021D74D4(UnkStruct_ov5_021D7480 * param0); -static void ov5_021D7534(UnkStruct_ov5_021D7480 * param0); -static void ov5_021D7568(UnkStruct_ov5_021DB4B8 * param0, UnkFuncPtr_ov5_021D7210_1 param1, int param2, int param3, int param4, UnkFuncPtr_ov5_021D6FF0 param5); -static UnkStruct_ov5_021D6FA8 * ov5_021D75E4(UnkStruct_ov5_021DB4B8 * param0); -static BOOL ov5_021D66D0(UnkStruct_ov5_021D6594 * param0, int param1); -static BOOL ov5_021D6730(UnkStruct_ov5_021D6594 * param0, int param1); -static BOOL ov5_021D676C(UnkStruct_ov5_021D6594 * param0, int param1, int param2, u32 param3); -static void ov5_021D6868(UnkStruct_ov5_021D6594 * param0, int param1, u32 param2); -static void ov5_021D6890(UnkStruct_ov5_021D6594 * param0, int param1); -static void ov5_021D68B8(UnkStruct_ov5_021D6594 * param0, int param1); -static void ov5_021D69B8(UnkStruct_ov5_021D69B8 * param0); -static void ov5_021D6A84(SysTask * param0, void * param1); -static BOOL ov5_021D6B60(UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B8 * param1); -static BOOL ov5_021D6BC4(UnkStruct_ov5_021D69B8 * param0); -static void ov5_021D6BFC(UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2); -static void ov5_021D6C30(UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2); -static void ov5_021D6C64(UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2); -static void ov5_021D6CA0(UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2); -static void ov5_021D6CDC(UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B8 * param1); -static void ov5_021D6D34(UnkStruct_ov5_021DB4B8 * param0); -static void ov5_021D6D64(UnkStruct_ov5_021DB4B8 * param0); -static void ov5_021D6D84(UnkStruct_ov5_021D6594 * param0, int param1); -static void ov5_021D6DCC(UnkStruct_ov5_021D6594 * param0, int param1); -static void ov5_021D6E20(UnkStruct_ov5_021D6594 * param0, int param1); -static void ov5_021D7604(SysTask * param0, void * param1); -static void ov5_021D7658(SysTask * param0, void * param1); -static void ov5_021D79F0(SysTask * param0, void * param1); -static void ov5_021D7E54(SysTask * param0, void * param1); -static void ov5_021D823C(SysTask * param0, void * param1); -static void ov5_021D84D4(SysTask * param0, void * param1); -static void ov5_021D8638(SysTask * param0, void * param1); -static void ov5_021D879C(SysTask * param0, void * param1); -static void ov5_021D8948(SysTask * param0, void * param1); -static void ov5_021D8D08(SysTask * param0, void * param1); -static void ov5_021D8FF8(SysTask * param0, void * param1); -static void ov5_021D9464(SysTask * param0, void * param1); -static void ov5_021D97E8(SysTask * param0, void * param1); -static void ov5_021D9FF8(SysTask * param0, void * param1); -static void ov5_021D9F0C(SysTask * param0, void * param1); -static void ov5_021DA244(SysTask * param0, void * param1); -static void ov5_021DA748(SysTask * param0, void * param1); -static void ov5_021DA8A0(SysTask * param0, void * param1); -static void ov5_021DAB78(SysTask * param0, void * param1); -static void ov5_021DAC68(SysTask * param0, void * param1); -static void ov5_021DAD38(SysTask * param0, void * param1); -static void ov5_021DAEC0(SysTask * param0, void * param1); -static void ov5_021DB04C(SysTask * param0, void * param1); -static void ov5_021DB144(SysTask * param0, void * param1); -static void ov5_021DB3A8(SysTask * param0, void * param1); -static void ov5_021DB3C4(SysTask * param0, void * param1); -static void ov5_021DB3E0(SysTask * param0, void * param1); -static void ov5_021DB40C(SysTask * param0, void * param1); -static void ov5_021DB438(SysTask * param0, void * param1); -static void ov5_021DB460(SysTask * param0, void * param1); -static void ov5_021DB48C(SysTask * param0, void * param1); -static void ov5_021D78A4(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021D7C40(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021D8098(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021D8B88(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021D92C4(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021D9690(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021DA0A8(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021DA5A0(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021DA9DC(UnkStruct_ov5_021DB4B8 * param0, int param1); -static void ov5_021D7960(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021D7E20(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021D81BC(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021D8C90(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021D93DC(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021D97C0(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021DA1A8(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021DA6BC(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021DAADC(UnkStruct_ov5_021D6FA8 * param0); -static void ov5_021D9984(UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1); -static BOOL ov5_021D9A0C(UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1); -static void ov5_021D9A58(UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1); -static void ov5_021D9AEC(UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1); -static void ov5_021D9B28(UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1); -static BOOL ov5_021D9B68(UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1); -static void ov5_021D9BC0(UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1); -static void ov5_021D9BEC(UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1); -static void ov5_021D9C20(SysTask * param0, void * param1, u32 param2, u32 param3, u32 param4, u32 param5); -static void ov5_021D9DFC(UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D84D4 * param1, u32 param2, u32 param3, GXRgb param4, u32 param5, u32 param6); -static void ov5_021DB614(UnkStruct_ov5_021DB614 * param0, HBlankSystem * param1); -static void ov5_021DB690(UnkStruct_ov5_021DB614 * param0); -static void ov5_021DB6E0(UnkStruct_ov5_021DB614 * param0, fx32 param1, fx32 param2, int param3, int param4, int param5); -static BOOL ov5_021DB700(UnkStruct_ov5_021DB614 * param0); -static void ov5_021DB72C(HBlankTask * param0, void * param1); -static void ov5_021DB78C(SysTask * param0, void * param1); -static void ov5_021DB7A4(UnkStruct_ov5_021DB614 * param0); -static void ov5_021DB7B8(SysTask * param0, void * param1); -static void ov5_021DB7F8(SysTask * param0, void * param1); -static void ov5_021DB500(UnkStruct_ov5_021DB614 * param0); -static void ov5_021DB7CC(UnkStruct_ov5_021DB614 * param0); -static void ov5_021DB588(fx32 param0, int param1, int param2, int param3, int * param4, int * param5); - -UnkStruct_ov5_021D5EF8 * ov5_021D5EB8 (FieldSystem * fieldSystem) -{ - UnkStruct_ov5_021D5EF8 * v0; +static void ov5_021D64FC(UnkStruct_ov5_021D64FC *param0, int param1, int param2, int param3); +static BOOL ov5_021D650C(UnkStruct_ov5_021D64FC *param0); +static void ov5_021D6538(UnkStruct_ov5_021D6538 *param0, fx32 param1, fx32 param2, int param3); +static BOOL ov5_021D6548(UnkStruct_ov5_021D6538 *param0); +static void ov5_021D6594(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2); +static void ov5_021D6A2C(UnkStruct_ov5_021D6594 *param0, int param1); +static void ov5_021D6690(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2); +static UnkStruct_02009DC8 *ov5_021D65C0(UnkStruct_02009F38 *param0, int param1, int param2, UnkStruct_02009714 *param3, NARC *param4, u32 param5); +static void ov5_021D61D0(UnkStruct_ov5_021D61D0 *param0); +static void ov5_021D6290(UnkStruct_02009F38 *param0, int param1, int param2); +static void ov5_021D62BC(UnkStruct_ov5_021D61D0 *param0); +static void ov5_021D6284(SysTask *param0, void *param1); +static void ov5_021D630C(GraphicElementData *param0, VecFx32 *param1); +static void ov5_021D6FA8(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021D6FD8(UnkStruct_ov5_021D6FA8 *param0); +static UnkStruct_ov5_021D6FA8 *ov5_021D6F00(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021D6F4C(UnkStruct_ov19_021DA864 *param0, UnkStruct_ov5_021D6594 *param1, UnkStruct_ov5_021D6690 *param2, int param3, int param4); +static BOOL ov5_021D6A48(UnkStruct_ov5_021D6594 *param0, UnkStruct_ov5_021D69B8 *param1); +static void ov5_021D6FF0(UnkStruct_ov5_021D6FA8 *param0, UnkFuncPtr_ov5_021D6FF0 param1); +static void ov5_021D700C(UnkStruct_ov5_021DB4B8 *param0); +static VecFx32 ov5_021D7010(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021D7028(fx32 *param0, fx32 *param1, UnkStruct_ov5_021DB4B8 *param2); +static void ov5_021D717C(UnkStruct_ov5_021DB4B8 *param0, int *param1, int *param2); +static void ov5_021D71B4(UnkStruct_ov5_021DB4B8 *param0, fx32 *param1, fx32 *param2); +static void ov5_021D6EC8(UnkStruct_ov5_021D6FA8 *param0, int param1); +static void ov5_021D6EF0(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021D7210(UnkStruct_ov5_021D7210 *param0, UnkStruct_ov5_021DB4B8 *param1, s32 param2, s32 param3, s32 param4, s32 param5, s32 param6, s32 param7, s32 param8, UnkFuncPtr_ov5_021D7210_1 param9); +static void ov5_021D7238(UnkStruct_ov5_021D7210 *param0, s32 param1, s32 param2, s32 param3, s32 param4); +static int ov5_021D7244(UnkStruct_ov5_021D7210 *param0); +static void ov5_021D7308(UnkStruct_ov5_021D7308 *param0, UnkStruct_ov5_021D7480 *param1, UnkStruct_ov5_021D57D8 *param2, int param3, int param4, GXRgb param5, int param6, u32 param7); +static int ov5_021D735C(UnkStruct_ov5_021D7308 *param0, UnkStruct_ov5_021D7480 *param1, u32 param2); +static void ov5_021D7384(UnkStruct_ov5_021D57D8 *param0, int param1, int param2, GXRgb param3); +static void ov5_021D73B0(UnkStruct_ov5_021D7308 *param0, UnkStruct_ov5_021D57D8 *param1, int param2, int param3, GXRgb param4, int param5); +static BOOL ov5_021D7434(UnkStruct_ov5_021D7308 *param0); +static void ov5_021D7480(UnkStruct_ov5_021D7480 *param0); +static void ov5_021D749C(UnkStruct_ov5_021D7480 *param0, int param1, BOOL param2); +static int ov5_021D74B8(UnkStruct_ov5_021D7480 *param0); +static int ov5_021D74F4(UnkStruct_ov5_021D7480 *param0); +static void ov5_021D74D4(UnkStruct_ov5_021D7480 *param0); +static void ov5_021D7534(UnkStruct_ov5_021D7480 *param0); +static void ov5_021D7568(UnkStruct_ov5_021DB4B8 *param0, UnkFuncPtr_ov5_021D7210_1 param1, int param2, int param3, int param4, UnkFuncPtr_ov5_021D6FF0 param5); +static UnkStruct_ov5_021D6FA8 *ov5_021D75E4(UnkStruct_ov5_021DB4B8 *param0); +static BOOL ov5_021D66D0(UnkStruct_ov5_021D6594 *param0, int param1); +static BOOL ov5_021D6730(UnkStruct_ov5_021D6594 *param0, int param1); +static BOOL ov5_021D676C(UnkStruct_ov5_021D6594 *param0, int param1, int param2, u32 param3); +static void ov5_021D6868(UnkStruct_ov5_021D6594 *param0, int param1, u32 param2); +static void ov5_021D6890(UnkStruct_ov5_021D6594 *param0, int param1); +static void ov5_021D68B8(UnkStruct_ov5_021D6594 *param0, int param1); +static void ov5_021D69B8(UnkStruct_ov5_021D69B8 *param0); +static void ov5_021D6A84(SysTask *param0, void *param1); +static BOOL ov5_021D6B60(UnkStruct_ov5_021D6594 *param0, UnkStruct_ov5_021D69B8 *param1); +static BOOL ov5_021D6BC4(UnkStruct_ov5_021D69B8 *param0); +static void ov5_021D6BFC(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2); +static void ov5_021D6C30(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2); +static void ov5_021D6C64(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2); +static void ov5_021D6CA0(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2); +static void ov5_021D6CDC(UnkStruct_ov5_021D6594 *param0, UnkStruct_ov5_021D69B8 *param1); +static void ov5_021D6D34(UnkStruct_ov5_021DB4B8 *param0); +static void ov5_021D6D64(UnkStruct_ov5_021DB4B8 *param0); +static void ov5_021D6D84(UnkStruct_ov5_021D6594 *param0, int param1); +static void ov5_021D6DCC(UnkStruct_ov5_021D6594 *param0, int param1); +static void ov5_021D6E20(UnkStruct_ov5_021D6594 *param0, int param1); +static void ov5_021D7604(SysTask *param0, void *param1); +static void ov5_021D7658(SysTask *param0, void *param1); +static void ov5_021D79F0(SysTask *param0, void *param1); +static void ov5_021D7E54(SysTask *param0, void *param1); +static void ov5_021D823C(SysTask *param0, void *param1); +static void ov5_021D84D4(SysTask *param0, void *param1); +static void ov5_021D8638(SysTask *param0, void *param1); +static void ov5_021D879C(SysTask *param0, void *param1); +static void ov5_021D8948(SysTask *param0, void *param1); +static void ov5_021D8D08(SysTask *param0, void *param1); +static void ov5_021D8FF8(SysTask *param0, void *param1); +static void ov5_021D9464(SysTask *param0, void *param1); +static void ov5_021D97E8(SysTask *param0, void *param1); +static void ov5_021D9FF8(SysTask *param0, void *param1); +static void ov5_021D9F0C(SysTask *param0, void *param1); +static void ov5_021DA244(SysTask *param0, void *param1); +static void ov5_021DA748(SysTask *param0, void *param1); +static void ov5_021DA8A0(SysTask *param0, void *param1); +static void ov5_021DAB78(SysTask *param0, void *param1); +static void ov5_021DAC68(SysTask *param0, void *param1); +static void ov5_021DAD38(SysTask *param0, void *param1); +static void ov5_021DAEC0(SysTask *param0, void *param1); +static void ov5_021DB04C(SysTask *param0, void *param1); +static void ov5_021DB144(SysTask *param0, void *param1); +static void ov5_021DB3A8(SysTask *param0, void *param1); +static void ov5_021DB3C4(SysTask *param0, void *param1); +static void ov5_021DB3E0(SysTask *param0, void *param1); +static void ov5_021DB40C(SysTask *param0, void *param1); +static void ov5_021DB438(SysTask *param0, void *param1); +static void ov5_021DB460(SysTask *param0, void *param1); +static void ov5_021DB48C(SysTask *param0, void *param1); +static void ov5_021D78A4(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021D7C40(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021D8098(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021D8B88(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021D92C4(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021D9690(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021DA0A8(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021DA5A0(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021DA9DC(UnkStruct_ov5_021DB4B8 *param0, int param1); +static void ov5_021D7960(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021D7E20(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021D81BC(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021D8C90(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021D93DC(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021D97C0(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021DA1A8(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021DA6BC(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021DAADC(UnkStruct_ov5_021D6FA8 *param0); +static void ov5_021D9984(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1); +static BOOL ov5_021D9A0C(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1); +static void ov5_021D9A58(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1); +static void ov5_021D9AEC(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1); +static void ov5_021D9B28(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1); +static BOOL ov5_021D9B68(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1); +static void ov5_021D9BC0(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1); +static void ov5_021D9BEC(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1); +static void ov5_021D9C20(SysTask *param0, void *param1, u32 param2, u32 param3, u32 param4, u32 param5); +static void ov5_021D9DFC(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D84D4 *param1, u32 param2, u32 param3, GXRgb param4, u32 param5, u32 param6); +static void ov5_021DB614(UnkStruct_ov5_021DB614 *param0, HBlankSystem *param1); +static void ov5_021DB690(UnkStruct_ov5_021DB614 *param0); +static void ov5_021DB6E0(UnkStruct_ov5_021DB614 *param0, fx32 param1, fx32 param2, int param3, int param4, int param5); +static BOOL ov5_021DB700(UnkStruct_ov5_021DB614 *param0); +static void ov5_021DB72C(HBlankTask *param0, void *param1); +static void ov5_021DB78C(SysTask *param0, void *param1); +static void ov5_021DB7A4(UnkStruct_ov5_021DB614 *param0); +static void ov5_021DB7B8(SysTask *param0, void *param1); +static void ov5_021DB7F8(SysTask *param0, void *param1); +static void ov5_021DB500(UnkStruct_ov5_021DB614 *param0); +static void ov5_021DB7CC(UnkStruct_ov5_021DB614 *param0); +static void ov5_021DB588(fx32 param0, int param1, int param2, int param3, int *param4, int *param5); + +UnkStruct_ov5_021D5EF8 *ov5_021D5EB8(FieldSystem *fieldSystem) +{ + UnkStruct_ov5_021D5EF8 *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D5EF8)); memset(v0, 0, sizeof(UnkStruct_ov5_021D5EF8)); @@ -396,7 +396,7 @@ UnkStruct_ov5_021D5EF8 * ov5_021D5EB8 (FieldSystem * fieldSystem) return v0; } -void ov5_021D5EF8 (UnkStruct_ov5_021D5EF8 * param0) +void ov5_021D5EF8(UnkStruct_ov5_021D5EF8 *param0) { if (param0->unk_14) { SysTask_Done(param0->unk_14); @@ -409,7 +409,7 @@ void ov5_021D5EF8 (UnkStruct_ov5_021D5EF8 * param0) param0 = NULL; } -void ov5_021D5F24 (UnkStruct_ov5_021D5EF8 * param0, int param1) +void ov5_021D5F24(UnkStruct_ov5_021D5EF8 *param0, int param1) { BOOL v0; @@ -432,7 +432,7 @@ void ov5_021D5F24 (UnkStruct_ov5_021D5EF8 * param0, int param1) param0->unk_04 = param1; } -BOOL ov5_021D5F7C (UnkStruct_ov5_021D5EF8 * param0, int param1) +BOOL ov5_021D5F7C(UnkStruct_ov5_021D5EF8 *param0, int param1) { int v0; @@ -463,14 +463,14 @@ BOOL ov5_021D5F7C (UnkStruct_ov5_021D5EF8 * param0, int param1) return 1; } -u32 ov5_021D5FE0 (UnkStruct_ov5_021D5EF8 * param0) +u32 ov5_021D5FE0(UnkStruct_ov5_021D5EF8 *param0) { return param0->unk_04; } -static void ov5_021D5FE4 (SysTask * param0, void * param1) +static void ov5_021D5FE4(SysTask *param0, void *param1) { - UnkStruct_ov5_021D5EF8 * v0 = param1; + UnkStruct_ov5_021D5EF8 *v0 = param1; BOOL v1; switch (v0->unk_0C) { @@ -524,9 +524,9 @@ static void ov5_021D5FE4 (SysTask * param0, void * param1) } } -static void ov5_021D60B4 (SysTask * param0, void * param1) +static void ov5_021D60B4(SysTask *param0, void *param1) { - UnkStruct_ov5_021D5EF8 * v0 = param1; + UnkStruct_ov5_021D5EF8 *v0 = param1; BOOL v1; switch (v0->unk_0C) { @@ -576,7 +576,7 @@ static void ov5_021D60B4 (SysTask * param0, void * param1) } } -static int ov5_021D6178 (int param0, int param1) +static int ov5_021D6178(int param0, int param1) { int v0 = 0; @@ -725,54 +725,54 @@ static u8 Unk_ov5_02201D38[64] = { }; static const UnkStruct_ov5_021F8D90 Unk_ov5_021F8D90[11] = { - {0x15, 0x24, 0x26}, - {0x25, 0x24, 0x26}, - {0x9, 0x8, 0xA}, - {0x2A, 0x2C, 0x2B}, - {0x1E, 0x1D, 0x1F}, - {0x2E, 0x2D, 0x2F}, - {0x33, 0x2D, 0x2F}, - {0x34, 0x35, 0x36}, - {0x31, 0x30, 0x32}, - {0x37, 0x38, 0x39}, - {0x3A, 0x3B, 0x3C} + { 0x15, 0x24, 0x26 }, + { 0x25, 0x24, 0x26 }, + { 0x9, 0x8, 0xA }, + { 0x2A, 0x2C, 0x2B }, + { 0x1E, 0x1D, 0x1F }, + { 0x2E, 0x2D, 0x2F }, + { 0x33, 0x2D, 0x2F }, + { 0x34, 0x35, 0x36 }, + { 0x31, 0x30, 0x32 }, + { 0x37, 0x38, 0x39 }, + { 0x3A, 0x3B, 0x3C } }; static UnkStruct_ov5_021D69B8 Unk_ov5_02201D78[31] = { - {0xffff, 0xffff, sizeof(u32), NULL, NULL, 0x0, 0x0, NULL, ov5_021D7604}, - {0xffff, 0x5, sizeof(UnkStruct_ov5_021DAC68), NULL, NULL, 0x0, 0x0, NULL, ov5_021DAC68}, - {0x0, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D7658}, - {0x5, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D9FF8}, - {0x5, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D9F0C}, - {0x3, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D79F0}, - {0x1, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D7E54}, - {0x9, 0x0, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D8FF8}, - {0xffff, 0x6, sizeof(UnkStruct_ov5_021D879C), NULL, NULL, 0x0, 0x0, NULL, ov5_021D879C}, - {0x6, 0x3, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021DA244}, - {0x2, 0x1, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D8D08}, - {0x4, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D9464}, - {0x7, 0xffff, sizeof(UnkStruct_ov5_021DA8A0), NULL, NULL, 0x0, 0x0, NULL, ov5_021DA8A0}, - {0xffff, 0x8, sizeof(UnkStruct_ov5_021D879C), NULL, NULL, 0x0, 0x0, NULL, ov5_021DAB78}, - {0xffff, 0x6, sizeof(UnkStruct_ov5_021D879C), NULL, NULL, 0x0, 0x0, NULL, ov5_021DAEC0}, - {0xffff, 0x6, sizeof(UnkStruct_ov5_021D879C), NULL, NULL, 0x0, 0x0, NULL, ov5_021DAD38}, - {0xffff, 0x7, sizeof(UnkStruct_ov5_021DB04C), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB04C}, - {0xffff, 0x4, (sizeof(int) * 10), NULL, NULL, 0x0, 0x0, NULL, ov5_021DA748}, - {0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021D84D4}, - {0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021D8638}, - {0xffff, 0x2, (sizeof(int) * 10), NULL, NULL, 0x0, 0x0, NULL, ov5_021D97E8}, - {0x1, 0x0, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D823C}, - {0x2, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D8948}, - {0xffff, 0x9, sizeof(UnkStruct_ov5_021DB144), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB144}, - {0xffff, 0xA, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB3A8}, - {0xffff, 0xA, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB3C4}, - {0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB3E0}, - {0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB40C}, - {0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB438}, - {0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB460}, - {0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB48C} + { 0xffff, 0xffff, sizeof(u32), NULL, NULL, 0x0, 0x0, NULL, ov5_021D7604 }, + { 0xffff, 0x5, sizeof(UnkStruct_ov5_021DAC68), NULL, NULL, 0x0, 0x0, NULL, ov5_021DAC68 }, + { 0x0, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D7658 }, + { 0x5, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D9FF8 }, + { 0x5, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D9F0C }, + { 0x3, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D79F0 }, + { 0x1, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D7E54 }, + { 0x9, 0x0, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D8FF8 }, + { 0xffff, 0x6, sizeof(UnkStruct_ov5_021D879C), NULL, NULL, 0x0, 0x0, NULL, ov5_021D879C }, + { 0x6, 0x3, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021DA244 }, + { 0x2, 0x1, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D8D08 }, + { 0x4, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D9464 }, + { 0x7, 0xffff, sizeof(UnkStruct_ov5_021DA8A0), NULL, NULL, 0x0, 0x0, NULL, ov5_021DA8A0 }, + { 0xffff, 0x8, sizeof(UnkStruct_ov5_021D879C), NULL, NULL, 0x0, 0x0, NULL, ov5_021DAB78 }, + { 0xffff, 0x6, sizeof(UnkStruct_ov5_021D879C), NULL, NULL, 0x0, 0x0, NULL, ov5_021DAEC0 }, + { 0xffff, 0x6, sizeof(UnkStruct_ov5_021D879C), NULL, NULL, 0x0, 0x0, NULL, ov5_021DAD38 }, + { 0xffff, 0x7, sizeof(UnkStruct_ov5_021DB04C), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB04C }, + { 0xffff, 0x4, (sizeof(int) * 10), NULL, NULL, 0x0, 0x0, NULL, ov5_021DA748 }, + { 0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021D84D4 }, + { 0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021D8638 }, + { 0xffff, 0x2, (sizeof(int) * 10), NULL, NULL, 0x0, 0x0, NULL, ov5_021D97E8 }, + { 0x1, 0x0, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D823C }, + { 0x2, 0xffff, sizeof(UnkStruct_ov5_021D9984), NULL, NULL, 0x0, 0x0, NULL, ov5_021D8948 }, + { 0xffff, 0x9, sizeof(UnkStruct_ov5_021DB144), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB144 }, + { 0xffff, 0xA, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB3A8 }, + { 0xffff, 0xA, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB3C4 }, + { 0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB3E0 }, + { 0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB40C }, + { 0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB438 }, + { 0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB460 }, + { 0xffff, 0xffff, sizeof(UnkStruct_ov5_021D84D4), NULL, NULL, 0x0, 0x0, NULL, ov5_021DB48C } }; -static void ov5_021D61D0 (UnkStruct_ov5_021D61D0 * param0) +static void ov5_021D61D0(UnkStruct_ov5_021D61D0 *param0) { NNSG2dViewRect v0; int v1; @@ -811,16 +811,16 @@ static void ov5_021D61D0 (UnkStruct_ov5_021D61D0 * param0) } } -static void ov5_021D6284 (SysTask * param0, void * param1) +static void ov5_021D6284(SysTask *param0, void *param1) { - UnkStruct_ov5_021D61D0 * v0 = param1; + UnkStruct_ov5_021D61D0 *v0 = param1; sub_020219F8(v0->unk_130); } -static void ov5_021D6290 (UnkStruct_02009F38 * param0, int param1, int param2) +static void ov5_021D6290(UnkStruct_02009F38 *param0, int param1, int param2) { - UnkStruct_02009F38 * v0; - void * v1; + UnkStruct_02009F38 *v0; + void *v1; v0 = sub_02009F38(param0, param1); v1 = sub_02006FE8(65, param2, 0, 4, 1); @@ -829,10 +829,10 @@ static void ov5_021D6290 (UnkStruct_02009F38 * param0, int param1, int param2) Heap_FreeToHeap(v1); } -static void ov5_021D62BC (UnkStruct_ov5_021D61D0 * param0) +static void ov5_021D62BC(UnkStruct_ov5_021D61D0 *param0) { int v0; - UnkStruct_02009F38 * v1; + UnkStruct_02009F38 *v1; for (v0 = 0; v0 < 4; v0++) { v1 = sub_02009F38(param0->unk_10, v0); @@ -851,7 +851,7 @@ static void ov5_021D62BC (UnkStruct_ov5_021D61D0 * param0) param0->unk_134 = NULL; } -static void ov5_021D630C (GraphicElementData * param0, VecFx32 * param1) +static void ov5_021D630C(GraphicElementData *param0, VecFx32 *param1) { if (param1->x > ((255 << FX32_SHIFT) + 64 * FX32_ONE)) { param1->x %= ((255 << FX32_SHIFT) + 64 * FX32_ONE); @@ -872,9 +872,9 @@ static void ov5_021D630C (GraphicElementData * param0, VecFx32 * param1) sub_02021C50(param0, param1); } -UnkStruct_ov5_021D6594 * ov5_021D6364 (FieldSystem * fieldSystem) +UnkStruct_ov5_021D6594 *ov5_021D6364(FieldSystem *fieldSystem) { - UnkStruct_ov5_021D6594 * v0; + UnkStruct_ov5_021D6594 *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021D6594)); v0->fieldSystem = fieldSystem; @@ -888,7 +888,7 @@ UnkStruct_ov5_021D6594 * ov5_021D6364 (FieldSystem * fieldSystem) return v0; } -void ov5_021D63A4 (UnkStruct_ov5_021D6594 ** param0) +void ov5_021D63A4(UnkStruct_ov5_021D6594 **param0) { int v0; @@ -911,7 +911,7 @@ void ov5_021D63A4 (UnkStruct_ov5_021D6594 ** param0) } } -BOOL ov5_021D6418 (UnkStruct_ov5_021D6594 * param0, int param1, int param2) +BOOL ov5_021D6418(UnkStruct_ov5_021D6594 *param0, int param1, int param2) { BOOL v0 = 1; @@ -958,9 +958,9 @@ BOOL ov5_021D6418 (UnkStruct_ov5_021D6594 * param0, int param1, int param2) return v0; } -int ov5_021D64D0 (UnkStruct_ov5_021D6594 * param0, int param1) +int ov5_021D64D0(UnkStruct_ov5_021D6594 *param0, int param1) { - UnkStruct_ov5_021D69B8 * v0; + UnkStruct_ov5_021D69B8 *v0; if (param1 >= 31) { return 0; @@ -971,12 +971,12 @@ int ov5_021D64D0 (UnkStruct_ov5_021D6594 * param0, int param1) return v0->unk_10; } -static void ov5_021D64E4 (int param0, int param1) +static void ov5_021D64E4(int param0, int param1) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BD, param0, param1); } -static void ov5_021D64FC (UnkStruct_ov5_021D64FC * param0, int param1, int param2, int param3) +static void ov5_021D64FC(UnkStruct_ov5_021D64FC *param0, int param1, int param2, int param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -985,7 +985,7 @@ static void ov5_021D64FC (UnkStruct_ov5_021D64FC * param0, int param1, int param param0->unk_0C = 0; } -static BOOL ov5_021D650C (UnkStruct_ov5_021D64FC * param0) +static BOOL ov5_021D650C(UnkStruct_ov5_021D64FC *param0) { int v0; @@ -1003,7 +1003,7 @@ static BOOL ov5_021D650C (UnkStruct_ov5_021D64FC * param0) return 1; } -static void ov5_021D6538 (UnkStruct_ov5_021D6538 * param0, fx32 param1, fx32 param2, int param3) +static void ov5_021D6538(UnkStruct_ov5_021D6538 *param0, fx32 param1, fx32 param2, int param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -1012,7 +1012,7 @@ static void ov5_021D6538 (UnkStruct_ov5_021D6538 * param0, fx32 param1, fx32 par param0->unk_0C = 0; } -static BOOL ov5_021D6548 (UnkStruct_ov5_021D6538 * param0) +static BOOL ov5_021D6548(UnkStruct_ov5_021D6538 *param0) { fx32 v0; @@ -1030,7 +1030,7 @@ static BOOL ov5_021D6548 (UnkStruct_ov5_021D6538 * param0) return 1; } -static void ov5_021D6594 (UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2) +static void ov5_021D6594(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2) { ov5_021D6BFC(param0, param1, param2); ov5_021D6C30(param0, param1, param2); @@ -1038,10 +1038,10 @@ static void ov5_021D6594 (UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct ov5_021D6CA0(param0, param1, param2); } -static UnkStruct_02009DC8 * ov5_021D65C0 (UnkStruct_02009F38 * param0, int param1, int param2, UnkStruct_02009714 * param3, NARC * param4, u32 param5) +static UnkStruct_02009DC8 *ov5_021D65C0(UnkStruct_02009F38 *param0, int param1, int param2, UnkStruct_02009714 *param3, NARC *param4, u32 param5) { - UnkStruct_02009F38 * v0; - UnkStruct_02009DC8 * v1; + UnkStruct_02009F38 *v0; + UnkStruct_02009DC8 *v1; int v2; BOOL v3; int v4; @@ -1073,7 +1073,7 @@ static UnkStruct_02009DC8 * ov5_021D65C0 (UnkStruct_02009F38 * param0, int param return v1; } -static void ov5_021D6690 (UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2) +static void ov5_021D6690(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2) { int v0; @@ -1094,9 +1094,9 @@ static void ov5_021D6690 (UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct } } -static BOOL ov5_021D66D0 (UnkStruct_ov5_021D6594 * param0, int param1) +static BOOL ov5_021D66D0(UnkStruct_ov5_021D6594 *param0, int param1) { - UnkStruct_ov5_021D69B8 * v0 = param0->unk_00 + param1; + UnkStruct_ov5_021D69B8 *v0 = param0->unk_00 + param1; BOOL v1; if (v0->unk_08 == NULL) { @@ -1128,9 +1128,9 @@ static BOOL ov5_021D66D0 (UnkStruct_ov5_021D6594 * param0, int param1) return 1; } -static BOOL ov5_021D6730 (UnkStruct_ov5_021D6594 * param0, int param1) +static BOOL ov5_021D6730(UnkStruct_ov5_021D6594 *param0, int param1) { - UnkStruct_ov5_021D69B8 * v0 = param0->unk_00 + param1; + UnkStruct_ov5_021D69B8 *v0 = param0->unk_00 + param1; if (v0->unk_08) { return 1; @@ -1147,9 +1147,9 @@ static BOOL ov5_021D6730 (UnkStruct_ov5_021D6594 * param0, int param1) return 1; } -static BOOL ov5_021D676C (UnkStruct_ov5_021D6594 * param0, int param1, int param2, u32 param3) +static BOOL ov5_021D676C(UnkStruct_ov5_021D6594 *param0, int param1, int param2, u32 param3) { - UnkStruct_ov5_021D69B8 * v0 = param0->unk_00 + param1; + UnkStruct_ov5_021D69B8 *v0 = param0->unk_00 + param1; if (v0->unk_00 != 0xffff) { if (v0->unk_0C == NULL) { @@ -1197,9 +1197,9 @@ static BOOL ov5_021D676C (UnkStruct_ov5_021D6594 * param0, int param1, int param return 1; } -static void ov5_021D6868 (UnkStruct_ov5_021D6594 * param0, int param1, u32 param2) +static void ov5_021D6868(UnkStruct_ov5_021D6594 *param0, int param1, u32 param2) { - UnkStruct_ov5_021D69B8 * v0 = param0->unk_00 + param1; + UnkStruct_ov5_021D69B8 *v0 = param0->unk_00 + param1; if (v0->unk_10 == 3) { v0->unk_08->unk_BA6 = 5; @@ -1207,9 +1207,9 @@ static void ov5_021D6868 (UnkStruct_ov5_021D6594 * param0, int param1, u32 param } } -static void ov5_021D6890 (UnkStruct_ov5_021D6594 * param0, int param1) +static void ov5_021D6890(UnkStruct_ov5_021D6594 *param0, int param1) { - UnkStruct_ov5_021D69B8 * v0 = param0->unk_00 + param1; + UnkStruct_ov5_021D69B8 *v0 = param0->unk_00 + param1; if (ov5_021D64D0(param0, param1) == 3) { v0->unk_08->unk_BA2 = 5; @@ -1217,9 +1217,9 @@ static void ov5_021D6890 (UnkStruct_ov5_021D6594 * param0, int param1) } } -static void ov5_021D68B8 (UnkStruct_ov5_021D6594 * param0, int param1) +static void ov5_021D68B8(UnkStruct_ov5_021D6594 *param0, int param1) { - UnkStruct_ov5_021D69B8 * v0 = param0->unk_00 + param1; + UnkStruct_ov5_021D69B8 *v0 = param0->unk_00 + param1; if (v0->unk_02 != 0xffff) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); @@ -1273,7 +1273,7 @@ static void ov5_021D68B8 (UnkStruct_ov5_021D6594 * param0, int param1) ov5_021D57FC(param0->fieldSystem->unk_48, 1, 0, 0, 0, 0); } -static void ov5_021D69B8 (UnkStruct_ov5_021D69B8 * param0) +static void ov5_021D69B8(UnkStruct_ov5_021D69B8 *param0) { if (param0->unk_02 != 0xffff) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); @@ -1297,14 +1297,14 @@ static void ov5_021D69B8 (UnkStruct_ov5_021D69B8 * param0) } } -static void ov5_021D6A2C (UnkStruct_ov5_021D6594 * param0, int param1) +static void ov5_021D6A2C(UnkStruct_ov5_021D6594 *param0, int param1) { ov5_021D6D84(param0, param1); ov5_021D6DCC(param0, param1); ov5_021D6E20(param0, param1); } -static BOOL ov5_021D6A48 (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B8 * param1) +static BOOL ov5_021D6A48(UnkStruct_ov5_021D6594 *param0, UnkStruct_ov5_021D69B8 *param1) { BOOL v0; @@ -1324,10 +1324,10 @@ static BOOL ov5_021D6A48 (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B return 1; } -static void ov5_021D6A84 (SysTask * param0, void * param1) +static void ov5_021D6A84(SysTask *param0, void *param1) { - UnkStruct_ov5_021D69B8 * v0 = param1; - UnkStruct_ov5_021D6594 * v1 = v0->unk_08->unk_00; + UnkStruct_ov5_021D69B8 *v0 = param1; + UnkStruct_ov5_021D6594 *v1 = v0->unk_08->unk_00; BOOL v2; switch (v0->unk_12) { @@ -1380,7 +1380,7 @@ static void ov5_021D6A84 (SysTask * param0, void * param1) } } -static BOOL ov5_021D6B60 (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B8 * param1) +static BOOL ov5_021D6B60(UnkStruct_ov5_021D6594 *param0, UnkStruct_ov5_021D69B8 *param1) { if (param1->unk_08) { return 1; @@ -1405,7 +1405,7 @@ static BOOL ov5_021D6B60 (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B return 1; } -static BOOL ov5_021D6BC4 (UnkStruct_ov5_021D69B8 * param0) +static BOOL ov5_021D6BC4(UnkStruct_ov5_021D69B8 *param0) { if (param0->unk_00 != 0xffff) { if (param0->unk_0C) { @@ -1424,21 +1424,21 @@ static BOOL ov5_021D6BC4 (UnkStruct_ov5_021D69B8 * param0) return 1; } -static void ov5_021D6BFC (UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2) +static void ov5_021D6BFC(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2) { if (param1 != 0xffff) { param2->unk_00[2] = ov5_021D65C0(param0->unk_08.unk_10, 2, param1, param0->unk_08.unk_00[2], param0->unk_144, 0); } } -static void ov5_021D6C30 (UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2) +static void ov5_021D6C30(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2) { if (param1 != 0xffff) { param2->unk_00[3] = ov5_021D65C0(param0->unk_08.unk_10, 3, param1, param0->unk_08.unk_00[3], param0->unk_144, 0); } } -static void ov5_021D6C64 (UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2) +static void ov5_021D6C64(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2) { if (param1 != 0xffff) { param2->unk_00[0] = ov5_021D65C0(param0->unk_08.unk_10, 0, param1, param0->unk_08.unk_00[0], param0->unk_144, 1); @@ -1448,7 +1448,7 @@ static void ov5_021D6C64 (UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct } } -static void ov5_021D6CA0 (UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct_ov5_021D6690 * param2) +static void ov5_021D6CA0(UnkStruct_ov5_021D6594 *param0, int param1, UnkStruct_ov5_021D6690 *param2) { if (param1 != 0xffff) { param2->unk_00[1] = ov5_021D65C0(param0->unk_08.unk_10, 1, param1, param0->unk_08.unk_00[1], param0->unk_144, 1); @@ -1458,7 +1458,7 @@ static void ov5_021D6CA0 (UnkStruct_ov5_021D6594 * param0, int param1, UnkStruct } } -static void ov5_021D6CDC (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B8 * param1) +static void ov5_021D6CDC(UnkStruct_ov5_021D6594 *param0, UnkStruct_ov5_021D69B8 *param1) { if (param1->unk_00 != 0xffff) { ov5_021D6F4C(¶m1->unk_0C->unk_40, param0, param1->unk_0C, 0, 1); @@ -1472,7 +1472,7 @@ static void ov5_021D6CDC (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B } } -static void ov5_021D6D34 (UnkStruct_ov5_021DB4B8 * param0) +static void ov5_021D6D34(UnkStruct_ov5_021DB4B8 *param0) { int v0; @@ -1483,7 +1483,7 @@ static void ov5_021D6D34 (UnkStruct_ov5_021DB4B8 * param0) } } -static void ov5_021D6D64 (UnkStruct_ov5_021DB4B8 * param0) +static void ov5_021D6D64(UnkStruct_ov5_021DB4B8 *param0) { int v0; @@ -1495,7 +1495,7 @@ static void ov5_021D6D64 (UnkStruct_ov5_021DB4B8 * param0) } } -static void ov5_021D6D84 (UnkStruct_ov5_021D6594 * param0, int param1) +static void ov5_021D6D84(UnkStruct_ov5_021D6594 *param0, int param1) { UnkStruct_ov5_021D6D84 v0; @@ -1511,7 +1511,7 @@ static void ov5_021D6D84 (UnkStruct_ov5_021D6594 * param0, int param1) } } -static void ov5_021D6DCC (UnkStruct_ov5_021D6594 * param0, int param1) +static void ov5_021D6DCC(UnkStruct_ov5_021D6594 *param0, int param1) { UnkStruct_ov5_021D6D84 v0; @@ -1527,7 +1527,7 @@ static void ov5_021D6DCC (UnkStruct_ov5_021D6594 * param0, int param1) } } -static void ov5_021D6E20 (UnkStruct_ov5_021D6594 * param0, int param1) +static void ov5_021D6E20(UnkStruct_ov5_021D6594 *param0, int param1) { UnkStruct_ov5_021D6D84 v0; @@ -1549,7 +1549,7 @@ static void ov5_021D6E20 (UnkStruct_ov5_021D6594 * param0, int param1) } } -static void ov5_021D6EC8 (UnkStruct_ov5_021D6FA8 * param0, int param1) +static void ov5_021D6EC8(UnkStruct_ov5_021D6FA8 *param0, int param1) { GF_ASSERT(param0->unk_08 == NULL); GF_ASSERT(param1 > 0); @@ -1558,16 +1558,16 @@ static void ov5_021D6EC8 (UnkStruct_ov5_021D6FA8 * param0, int param1) param0->unk_08 = param0->unk_0C; } -static void ov5_021D6EF0 (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021D6EF0(UnkStruct_ov5_021D6FA8 *param0) { param0->unk_08 = NULL; memset(param0->unk_0C, 0, (sizeof(s32) * 10)); } -static UnkStruct_ov5_021D6FA8 * ov5_021D6F00 (UnkStruct_ov5_021DB4B8 * param0, int param1) +static UnkStruct_ov5_021D6FA8 *ov5_021D6F00(UnkStruct_ov5_021DB4B8 *param0, int param1) { - UnkStruct_ov5_021D6FA8 * v0; - UnkStruct_ov5_021D6594 * v1 = (UnkStruct_ov5_021D6594 *)param0->unk_00; + UnkStruct_ov5_021D6FA8 *v0; + UnkStruct_ov5_021D6594 *v1 = (UnkStruct_ov5_021D6594 *)param0->unk_00; v0 = ov5_021D75E4(param0); @@ -1594,7 +1594,7 @@ static UnkStruct_ov5_021D6FA8 * ov5_021D6F00 (UnkStruct_ov5_021DB4B8 * param0, i return v0; } -static void ov5_021D6F4C (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov5_021D6594 * param1, UnkStruct_ov5_021D6690 * param2, int param3, int param4) +static void ov5_021D6F4C(UnkStruct_ov19_021DA864 *param0, UnkStruct_ov5_021D6594 *param1, UnkStruct_ov5_021D6690 *param2, int param3, int param4) { int v0[4]; int v1; @@ -1606,9 +1606,9 @@ static void ov5_021D6F4C (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov5_021D65 sub_020093B4(param0, v0[0], v0[1], v0[2], v0[3], 0xffffffff, 0xffffffff, param3, param4, param1->unk_08.unk_00[0], param1->unk_08.unk_00[1], param1->unk_08.unk_00[2], param1->unk_08.unk_00[3], NULL, NULL); } -static void ov5_021D6FA8 (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021D6FA8(UnkStruct_ov5_021D6FA8 *param0) { - GraphicElementData * v0; + GraphicElementData *v0; param0->unk_38->unk_34 = param0->unk_34; param0->unk_34->unk_38 = param0->unk_38; @@ -1622,10 +1622,10 @@ static void ov5_021D6FA8 (UnkStruct_ov5_021D6FA8 * param0) param0->unk_04 = v0; } -static void ov5_021D6FD8 (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021D6FD8(UnkStruct_ov5_021D6FA8 *param0) { - UnkStruct_ov5_021D6FA8 * v0; - UnkStruct_ov5_021D6FA8 * v1; + UnkStruct_ov5_021D6FA8 *v0; + UnkStruct_ov5_021D6FA8 *v1; v0 = param0->unk_34; @@ -1636,10 +1636,10 @@ static void ov5_021D6FD8 (UnkStruct_ov5_021D6FA8 * param0) } } -static void ov5_021D6FF0 (UnkStruct_ov5_021D6FA8 * param0, UnkFuncPtr_ov5_021D6FF0 param1) +static void ov5_021D6FF0(UnkStruct_ov5_021D6FA8 *param0, UnkFuncPtr_ov5_021D6FF0 param1) { - UnkStruct_ov5_021D6FA8 * v0; - UnkStruct_ov5_021D6FA8 * v1; + UnkStruct_ov5_021D6FA8 *v0; + UnkStruct_ov5_021D6FA8 *v1; v0 = param0->unk_34; v1 = v0->unk_34; @@ -1652,18 +1652,18 @@ static void ov5_021D6FF0 (UnkStruct_ov5_021D6FA8 * param0, UnkFuncPtr_ov5_021D6F } } -static void ov5_021D700C (UnkStruct_ov5_021DB4B8 * param0) +static void ov5_021D700C(UnkStruct_ov5_021DB4B8 *param0) { return; } -static VecFx32 ov5_021D7010 (UnkStruct_ov5_021D6FA8 * param0) +static VecFx32 ov5_021D7010(UnkStruct_ov5_021D6FA8 *param0) { - const VecFx32 * v0 = sub_02021D28(param0->unk_04); + const VecFx32 *v0 = sub_02021D28(param0->unk_04); return *v0; } -static void ov5_021D7028 (fx32 * param0, fx32 * param1, UnkStruct_ov5_021DB4B8 * param2) +static void ov5_021D7028(fx32 *param0, fx32 *param1, UnkStruct_ov5_021DB4B8 *param2) { VecFx32 v0; fx32 v1, v2; @@ -1720,7 +1720,7 @@ static void ov5_021D7028 (fx32 * param0, fx32 * param1, UnkStruct_ov5_021DB4B8 * *param1 = v2; } -static void ov5_021D717C (UnkStruct_ov5_021DB4B8 * param0, int * param1, int * param2) +static void ov5_021D717C(UnkStruct_ov5_021DB4B8 *param0, int *param1, int *param2) { fx32 v0, v1; @@ -1743,9 +1743,9 @@ static void ov5_021D717C (UnkStruct_ov5_021DB4B8 * param0, int * param1, int * p } } -static void ov5_021D71B4 (UnkStruct_ov5_021DB4B8 * param0, fx32 * param1, fx32 * param2) +static void ov5_021D71B4(UnkStruct_ov5_021DB4B8 *param0, fx32 *param1, fx32 *param2) { - UnkStruct_ov5_021D6FA8 * v0; + UnkStruct_ov5_021D6FA8 *v0; fx32 v1, v2; VecFx32 v3; @@ -1773,7 +1773,7 @@ static void ov5_021D71B4 (UnkStruct_ov5_021DB4B8 * param0, fx32 * param1, fx32 * } } -static void ov5_021D7210 (UnkStruct_ov5_021D7210 * param0, UnkStruct_ov5_021DB4B8 * param1, s32 param2, s32 param3, s32 param4, s32 param5, s32 param6, s32 param7, s32 param8, UnkFuncPtr_ov5_021D7210_1 param9) +static void ov5_021D7210(UnkStruct_ov5_021D7210 *param0, UnkStruct_ov5_021DB4B8 *param1, s32 param2, s32 param3, s32 param4, s32 param5, s32 param6, s32 param7, s32 param8, UnkFuncPtr_ov5_021D7210_1 param9) { param0->unk_00 = param1; param0->unk_04 = param2; @@ -1788,7 +1788,7 @@ static void ov5_021D7210 (UnkStruct_ov5_021D7210 * param0, UnkStruct_ov5_021DB4B param0->unk_18 = param9; } -static void ov5_021D7238 (UnkStruct_ov5_021D7210 * param0, s32 param1, s32 param2, s32 param3, s32 param4) +static void ov5_021D7238(UnkStruct_ov5_021D7210 *param0, s32 param1, s32 param2, s32 param3, s32 param4) { param0->unk_0C = param1; param0->unk_0E = param2; @@ -1796,7 +1796,7 @@ static void ov5_021D7238 (UnkStruct_ov5_021D7210 * param0, s32 param1, s32 param param0->unk_14 = param4; } -static int ov5_021D7244 (UnkStruct_ov5_021D7210 * param0) +static int ov5_021D7244(UnkStruct_ov5_021D7210 *param0) { int v0; int v1 = 0; @@ -1854,7 +1854,7 @@ static int ov5_021D7244 (UnkStruct_ov5_021D7210 * param0) return v1; } -static void ov5_021D7308 (UnkStruct_ov5_021D7308 * param0, UnkStruct_ov5_021D7480 * param1, UnkStruct_ov5_021D57D8 * param2, int param3, int param4, GXRgb param5, int param6, u32 param7) +static void ov5_021D7308(UnkStruct_ov5_021D7308 *param0, UnkStruct_ov5_021D7480 *param1, UnkStruct_ov5_021D57D8 *param2, int param3, int param4, GXRgb param5, int param6, u32 param7) { param1->unk_00 = param2; @@ -1869,7 +1869,7 @@ static void ov5_021D7308 (UnkStruct_ov5_021D7308 * param0, UnkStruct_ov5_021D748 } } -static int ov5_021D735C (UnkStruct_ov5_021D7308 * param0, UnkStruct_ov5_021D7480 * param1, u32 param2) +static int ov5_021D735C(UnkStruct_ov5_021D7308 *param0, UnkStruct_ov5_021D7480 *param1, u32 param2) { BOOL v0; int v1 = 1; @@ -1889,13 +1889,13 @@ static int ov5_021D735C (UnkStruct_ov5_021D7308 * param0, UnkStruct_ov5_021D7480 return v1; } -static void ov5_021D7384 (UnkStruct_ov5_021D57D8 * param0, int param1, int param2, GXRgb param3) +static void ov5_021D7384(UnkStruct_ov5_021D57D8 *param0, int param1, int param2, GXRgb param3) { ov5_021D57FC(param0, 0xffffffff, 1, GX_FOGBLEND_COLOR_ALPHA, param1, param2); ov5_021D5834(param0, 0xffffffff, param3, 31); } -static void ov5_021D73B0 (UnkStruct_ov5_021D7308 * param0, UnkStruct_ov5_021D57D8 * param1, int param2, int param3, GXRgb param4, int param5) +static void ov5_021D73B0(UnkStruct_ov5_021D7308 *param0, UnkStruct_ov5_021D57D8 *param1, int param2, int param3, GXRgb param4, int param5) { int v0; int v1; @@ -1914,7 +1914,7 @@ static void ov5_021D73B0 (UnkStruct_ov5_021D7308 * param0, UnkStruct_ov5_021D57D ov5_021D64FC(¶m0->unk_54, v0, param2, param5); } -static BOOL ov5_021D7434 (UnkStruct_ov5_021D7308 * param0) +static BOOL ov5_021D7434(UnkStruct_ov5_021D7308 *param0) { BOOL v0; @@ -1929,7 +1929,7 @@ static BOOL ov5_021D7434 (UnkStruct_ov5_021D7308 * param0) return v0; } -static void ov5_021D7480 (UnkStruct_ov5_021D7480 * param0) +static void ov5_021D7480(UnkStruct_ov5_021D7480 *param0) { int v0; @@ -1940,7 +1940,7 @@ static void ov5_021D7480 (UnkStruct_ov5_021D7480 * param0) ov5_021D585C(param0->unk_00, param0->unk_04); } -static void ov5_021D749C (UnkStruct_ov5_021D7480 * param0, int param1, BOOL param2) +static void ov5_021D749C(UnkStruct_ov5_021D7480 *param0, int param1, BOOL param2) { param0->unk_24 = 127; param0->unk_28 = 0; @@ -1953,7 +1953,7 @@ static void ov5_021D749C (UnkStruct_ov5_021D7480 * param0, int param1, BOOL para } } -static int ov5_021D74B8 (UnkStruct_ov5_021D7480 * param0) +static int ov5_021D74B8(UnkStruct_ov5_021D7480 *param0) { int v0; @@ -1966,7 +1966,7 @@ static int ov5_021D74B8 (UnkStruct_ov5_021D7480 * param0) return v0; } -static void ov5_021D74D4 (UnkStruct_ov5_021D7480 * param0) +static void ov5_021D74D4(UnkStruct_ov5_021D7480 *param0) { int v0; int v1; @@ -1980,7 +1980,7 @@ static void ov5_021D74D4 (UnkStruct_ov5_021D7480 * param0) ov5_021D585C(param0->unk_00, param0->unk_04); } -static int ov5_021D74F4 (UnkStruct_ov5_021D7480 * param0) +static int ov5_021D74F4(UnkStruct_ov5_021D7480 *param0) { int v0 = 0; @@ -2007,7 +2007,7 @@ static int ov5_021D74F4 (UnkStruct_ov5_021D7480 * param0) return v0; } -static void ov5_021D7534 (UnkStruct_ov5_021D7480 * param0) +static void ov5_021D7534(UnkStruct_ov5_021D7480 *param0) { int v0; int v1; @@ -2030,12 +2030,12 @@ static void ov5_021D7534 (UnkStruct_ov5_021D7480 * param0) } } -static void ov5_021D7568 (UnkStruct_ov5_021DB4B8 * param0, UnkFuncPtr_ov5_021D7210_1 param1, int param2, int param3, int param4, UnkFuncPtr_ov5_021D6FF0 param5) +static void ov5_021D7568(UnkStruct_ov5_021DB4B8 *param0, UnkFuncPtr_ov5_021D7210_1 param1, int param2, int param3, int param4, UnkFuncPtr_ov5_021D6FF0 param5) { int v0, v1; int v2; - UnkStruct_ov5_021D6FA8 * v3; - UnkStruct_ov5_021D6FA8 * v4; + UnkStruct_ov5_021D6FA8 *v3; + UnkStruct_ov5_021D6FA8 *v4; param1(param0, param2); @@ -2067,7 +2067,7 @@ static void ov5_021D7568 (UnkStruct_ov5_021DB4B8 * param0, UnkFuncPtr_ov5_021D72 } } -static UnkStruct_ov5_021D6FA8 * ov5_021D75E4 (UnkStruct_ov5_021DB4B8 * param0) +static UnkStruct_ov5_021D6FA8 *ov5_021D75E4(UnkStruct_ov5_021DB4B8 *param0) { int v0; @@ -2080,9 +2080,9 @@ static UnkStruct_ov5_021D6FA8 * ov5_021D75E4 (UnkStruct_ov5_021DB4B8 * param0) return NULL; } -static void ov5_021D7604 (SysTask * param0, void * param1) +static void ov5_021D7604(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; switch (v0->unk_BA2) { case 0: @@ -2102,22 +2102,20 @@ static void ov5_021D7604 (SysTask * param0, void * param1) case 4: v0->unk_BA2 = 5; break; - case 5: - { - UnkStruct_ov5_021D69B8 * v1 = v0->unk_04; + case 5: { + UnkStruct_ov5_021D69B8 *v1 = v0->unk_04; ov5_021D69B8(v1); - } - break; + } break; default: break; } } -static void ov5_021D7658 (SysTask * param0, void * param1) +static void ov5_021D7658(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; - UnkStruct_ov5_021D9984 * v2; + UnkStruct_ov5_021D9984 *v2; int v3; int v4; @@ -2204,7 +2202,7 @@ static void ov5_021D7658 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v5 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v5 = v0->unk_04; ov5_021D69B8(v5); } break; @@ -2219,12 +2217,12 @@ static void ov5_021D7658 (SysTask * param0, void * param1) } } -static void ov5_021D78A4 (UnkStruct_ov5_021DB4B8 * param0, int param1) +static void ov5_021D78A4(UnkStruct_ov5_021DB4B8 *param0, int param1) { int v0; - UnkStruct_ov5_021D6FA8 * v1; + UnkStruct_ov5_021D6FA8 *v1; int v2; - s32 * v3; + s32 *v3; int v4; VecFx32 v5; u32 v6; @@ -2269,11 +2267,11 @@ static void ov5_021D78A4 (UnkStruct_ov5_021DB4B8 * param0, int param1) } } -static void ov5_021D7960 (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021D7960(UnkStruct_ov5_021D6FA8 *param0) { int v0; - UnkStruct_ov5_021D6FA8 * v1 = param0; - s32 * v2 = (s32 *)v1->unk_08; + UnkStruct_ov5_021D6FA8 *v1 = param0; + s32 *v2 = (s32 *)v1->unk_08; VecFx32 v3; v3 = ov5_021D7010(v1); @@ -2308,12 +2306,12 @@ static void ov5_021D7960 (UnkStruct_ov5_021D6FA8 * param0) } } -static void ov5_021D79F0 (SysTask * param0, void * param1) +static void ov5_021D79F0(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; int v2; - UnkStruct_ov5_021D9984 * v3 = (UnkStruct_ov5_021D9984 *)v0->unk_B98; + UnkStruct_ov5_021D9984 *v3 = (UnkStruct_ov5_021D9984 *)v0->unk_B98; int v4; int v5; @@ -2400,7 +2398,7 @@ static void ov5_021D79F0 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v6 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v6 = v0->unk_04; ov5_021D69B8(v6); } break; @@ -2415,13 +2413,13 @@ static void ov5_021D79F0 (SysTask * param0, void * param1) } } -static void ov5_021D7C40 (UnkStruct_ov5_021DB4B8 * param0, int param1) +static void ov5_021D7C40(UnkStruct_ov5_021DB4B8 *param0, int param1) { int v0; int v1; - UnkStruct_ov5_021D6FA8 * v2; - UnkStruct_ov5_021D9984 * v3; - s32 * v4; + UnkStruct_ov5_021D6FA8 *v2; + UnkStruct_ov5_021D9984 *v3; + s32 *v4; int v5; VecFx32 v6; @@ -2460,8 +2458,8 @@ static void ov5_021D7C40 (UnkStruct_ov5_021DB4B8 * param0, int param1) v4[2] = 4 + (MTRNG_Next() % 2); v4[3] = 1 + (MTRNG_Next() % 2); - v4[0] = (s32) & v3->unk_B4[1]; - v4[7] = (s32) & v3->unk_B4[2]; + v4[0] = (s32)&v3->unk_B4[1]; + v4[7] = (s32)&v3->unk_B4[2]; v6.x = (-32 + (MTRNG_Next() % 414)) << FX32_SHIFT; @@ -2475,14 +2473,14 @@ static void ov5_021D7C40 (UnkStruct_ov5_021DB4B8 * param0, int param1) } } -static void ov5_021D7D54 (UnkStruct_ov5_021D6FA8 * param0, s32 * param1) +static void ov5_021D7D54(UnkStruct_ov5_021D6FA8 *param0, s32 *param1) { VecFx32 v0; - s32 * v1; + s32 *v1; v0 = ov5_021D7010(param0); - if (((param1[5] & 0xffff) >= param1[2])) { + if ((param1[5] & 0xffff) >= param1[2]) { v0.x += param1[1] << FX32_SHIFT; param1[4]++; @@ -2500,7 +2498,7 @@ static void ov5_021D7D54 (UnkStruct_ov5_021D6FA8 * param0, s32 * param1) } } - if (((param1[5] >> 16) >= param1[3])) { + if ((param1[5] >> 16) >= param1[3]) { v0.y += FX32_ONE; param1[5] &= 0xffff; } @@ -2521,11 +2519,11 @@ static void ov5_021D7D54 (UnkStruct_ov5_021D6FA8 * param0, s32 * param1) } } -static void ov5_021D7E20 (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021D7E20(UnkStruct_ov5_021D6FA8 *param0) { - UnkStruct_ov5_021D6FA8 * v0 = (UnkStruct_ov5_021D6FA8 *)param0; - s32 * v1 = (s32 *)v0->unk_08; - s32 * v2 = (s32 *)v1[7]; + UnkStruct_ov5_021D6FA8 *v0 = (UnkStruct_ov5_021D6FA8 *)param0; + s32 *v1 = (s32 *)v0->unk_08; + s32 *v2 = (s32 *)v1[7]; switch (v1[8]) { case 0: @@ -2546,11 +2544,11 @@ static void ov5_021D7E20 (UnkStruct_ov5_021D6FA8 * param0) ov5_021D7D54(v0, v1); } -static void ov5_021D7E54 (SysTask * param0, void * param1) +static void ov5_021D7E54(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; - UnkStruct_ov5_021D9984 * v2; + UnkStruct_ov5_021D9984 *v2; int v3; int v4; @@ -2633,7 +2631,7 @@ static void ov5_021D7E54 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v5 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v5 = v0->unk_04; ov5_021D69B8(v5); } break; @@ -2648,15 +2646,15 @@ static void ov5_021D7E54 (SysTask * param0, void * param1) } } -static void ov5_021D8098 (UnkStruct_ov5_021DB4B8 * param0, int param1) +static void ov5_021D8098(UnkStruct_ov5_021DB4B8 *param0, int param1) { int v0; - UnkStruct_ov5_021D6FA8 * v1; + UnkStruct_ov5_021D6FA8 *v1; int v2; - UnkStruct_ov5_021D9984 * v3; - s32 * v4; - int v5[4] = {16, 32, 16, 10}; - int v6[4] = {2, 2, 2, 2}; + UnkStruct_ov5_021D9984 *v3; + s32 *v4; + int v5[4] = { 16, 32, 16, 10 }; + int v6[4] = { 2, 2, 2, 2 }; int v7; v3 = (UnkStruct_ov5_021D9984 *)param0->unk_B98; @@ -2702,10 +2700,10 @@ static void ov5_021D8098 (UnkStruct_ov5_021DB4B8 * param0, int param1) } } -static void ov5_021D81BC (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021D81BC(UnkStruct_ov5_021D6FA8 *param0) { - UnkStruct_ov5_021D6FA8 * v0 = (UnkStruct_ov5_021D6FA8 *)param0; - s32 * v1 = (s32 *)v0->unk_08; + UnkStruct_ov5_021D6FA8 *v0 = (UnkStruct_ov5_021D6FA8 *)param0; + s32 *v1 = (s32 *)v0->unk_08; VecFx32 v2 = ov5_021D7010(v0); switch (v1[3]) { @@ -2734,11 +2732,11 @@ static void ov5_021D81BC (UnkStruct_ov5_021D6FA8 * param0) } } -static void ov5_021D823C (SysTask * param0, void * param1) +static void ov5_021D823C(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; - UnkStruct_ov5_021D9984 * v2; + UnkStruct_ov5_021D9984 *v2; int v3; int v4; @@ -2834,7 +2832,7 @@ static void ov5_021D823C (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v5 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v5 = v0->unk_04; ov5_021D69B8(v5); } break; @@ -2852,11 +2850,11 @@ static void ov5_021D823C (SysTask * param0, void * param1) } } -static void ov5_021D84D4 (SysTask * param0, void * param1) +static void ov5_021D84D4(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; - UnkStruct_ov5_021D84D4 * v2; + UnkStruct_ov5_021D84D4 *v2; int v3; v2 = (UnkStruct_ov5_021D84D4 *)v0->unk_B98; @@ -2874,7 +2872,7 @@ static void ov5_021D84D4 (SysTask * param0, void * param1) } else { v3 = ov5_021D735C(&v2->unk_30, &v2->unk_00, v0->unk_BA4); - if ((v3 == 1)) { + if (v3 == 1) { v0->unk_BA2 = 3; } } @@ -2908,7 +2906,7 @@ static void ov5_021D84D4 (SysTask * param0, void * param1) v3 = 1; } - if ((v3 == 1)) { + if (v3 == 1) { v0->unk_BA2 = 5; } } @@ -2919,7 +2917,7 @@ static void ov5_021D84D4 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); } break; @@ -2928,11 +2926,11 @@ static void ov5_021D84D4 (SysTask * param0, void * param1) } } -static void ov5_021D8638 (SysTask * param0, void * param1) +static void ov5_021D8638(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; - UnkStruct_ov5_021D84D4 * v2; + UnkStruct_ov5_021D84D4 *v2; int v3; v2 = (UnkStruct_ov5_021D84D4 *)v0->unk_B98; @@ -2949,7 +2947,7 @@ static void ov5_021D8638 (SysTask * param0, void * param1) } else { v3 = ov5_021D735C(&v2->unk_30, &v2->unk_00, v0->unk_BA4); - if ((v3 == 1)) { + if (v3 == 1) { v0->unk_BA2 = 3; } } @@ -2983,7 +2981,7 @@ static void ov5_021D8638 (SysTask * param0, void * param1) v3 = 1; } - if ((v3 == 1)) { + if (v3 == 1) { v0->unk_BA2 = 5; } } @@ -2994,7 +2992,7 @@ static void ov5_021D8638 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); } break; @@ -3003,10 +3001,10 @@ static void ov5_021D8638 (SysTask * param0, void * param1) } } -static void ov5_021D879C (SysTask * param0, void * param1) +static void ov5_021D879C(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D879C * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D879C *v1; int v2; BOOL v3; @@ -3074,7 +3072,7 @@ static void ov5_021D879C (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); } @@ -3084,11 +3082,11 @@ static void ov5_021D879C (SysTask * param0, void * param1) } } -static void ov5_021D8948 (SysTask * param0, void * param1) +static void ov5_021D8948(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; - UnkStruct_ov5_021D9984 * v2; + UnkStruct_ov5_021D9984 *v2; int v3; int v4; @@ -3170,7 +3168,7 @@ static void ov5_021D8948 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v5 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v5 = v0->unk_04; ov5_021D69B8(v5); } break; @@ -3185,17 +3183,17 @@ static void ov5_021D8948 (SysTask * param0, void * param1) } } -static void ov5_021D8B88 (UnkStruct_ov5_021DB4B8 * param0, int param1) +static void ov5_021D8B88(UnkStruct_ov5_021DB4B8 *param0, int param1) { int v0; - UnkStruct_ov5_021D6FA8 * v1; + UnkStruct_ov5_021D6FA8 *v1; int v2; int v3; - UnkStruct_ov5_021D9984 * v4; - s32 * v5; + UnkStruct_ov5_021D9984 *v4; + s32 *v5; int v6; - static const int v7[8] = {-3, -5, -5, -4, -5, -6, -10, -6}; - static const int v8[8] = {2, 2, 2, 4, 4, 2, 2, 2}; + static const int v7[8] = { -3, -5, -5, -4, -5, -6, -10, -6 }; + static const int v8[8] = { 2, 2, 2, 4, 4, 2, 2, 2 }; v4 = (UnkStruct_ov5_021D9984 *)param0->unk_B98; v4->unk_B4[1] = (v4->unk_B4[1] + 1) % (40 * 8); @@ -3243,10 +3241,10 @@ static void ov5_021D8B88 (UnkStruct_ov5_021DB4B8 * param0, int param1) } } -static void ov5_021D8C90 (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021D8C90(UnkStruct_ov5_021D6FA8 *param0) { - UnkStruct_ov5_021D6FA8 * v0 = (UnkStruct_ov5_021D6FA8 *)param0; - s32 * v1 = (s32 *)v0->unk_08; + UnkStruct_ov5_021D6FA8 *v0 = (UnkStruct_ov5_021D6FA8 *)param0; + s32 *v1 = (s32 *)v0->unk_08; VecFx32 v2 = ov5_021D7010(v0); switch (v1[3]) { @@ -3270,17 +3268,17 @@ static void ov5_021D8C90 (UnkStruct_ov5_021D6FA8 * param0) } } -static void ov5_021D8D08 (SysTask * param0, void * param1) +static void ov5_021D8D08(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; int v2; int v3, v4; - UnkStruct_ov5_021D9984 * v5; + UnkStruct_ov5_021D9984 *v5; int v6; int v7; - static const int v8[8] = {-3, -5, -5, -3, -5, -6, -10, -6}; - static const int v9[8] = {2, 2, 2, 4, 4, 2, 2, 2}; + static const int v8[8] = { -3, -5, -5, -3, -5, -6, -10, -6 }; + static const int v9[8] = { 2, 2, 2, 4, 4, 2, 2, 2 }; v5 = (UnkStruct_ov5_021D9984 *)v0->unk_B98; @@ -3377,7 +3375,7 @@ static void ov5_021D8D08 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v10 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v10 = v0->unk_04; ov5_021D69B8(v10); } break; @@ -3395,13 +3393,13 @@ static void ov5_021D8D08 (SysTask * param0, void * param1) } } -static void ov5_021D8FF8 (SysTask * param0, void * param1) +static void ov5_021D8FF8(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; int v2; int v3, v4; - UnkStruct_ov5_021D9984 * v5; + UnkStruct_ov5_021D9984 *v5; int v6; int v7; @@ -3498,7 +3496,7 @@ static void ov5_021D8FF8 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v8 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v8 = v0->unk_04; ov5_021D69B8(v8); } break; @@ -3514,13 +3512,13 @@ static void ov5_021D8FF8 (SysTask * param0, void * param1) } } -static void ov5_021D92C4 (UnkStruct_ov5_021DB4B8 * param0, int param1) +static void ov5_021D92C4(UnkStruct_ov5_021DB4B8 *param0, int param1) { int v0; - UnkStruct_ov5_021D6FA8 * v1; + UnkStruct_ov5_021D6FA8 *v1; int v2; - UnkStruct_ov5_021D9984 * v3; - s32 * v4; + UnkStruct_ov5_021D9984 *v3; + s32 *v4; int v5; v3 = (UnkStruct_ov5_021D9984 *)param0->unk_B98; @@ -3572,10 +3570,10 @@ static void ov5_021D92C4 (UnkStruct_ov5_021DB4B8 * param0, int param1) } } -static void ov5_021D93DC (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021D93DC(UnkStruct_ov5_021D6FA8 *param0) { - UnkStruct_ov5_021D6FA8 * v0 = (UnkStruct_ov5_021D6FA8 *)param0; - s32 * v1 = (s32 *)v0->unk_08; + UnkStruct_ov5_021D6FA8 *v0 = (UnkStruct_ov5_021D6FA8 *)param0; + s32 *v1 = (s32 *)v0->unk_08; VecFx32 v2 = ov5_021D7010(v0); switch (v1[3]) { @@ -3603,11 +3601,11 @@ static void ov5_021D93DC (UnkStruct_ov5_021D6FA8 * param0) } } -static void ov5_021D9464 (SysTask * param0, void * param1) +static void ov5_021D9464(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; - UnkStruct_ov5_021D9984 * v2; + UnkStruct_ov5_021D9984 *v2; int v3; int v4; @@ -3683,7 +3681,7 @@ static void ov5_021D9464 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v5 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v5 = v0->unk_04; ov5_021D69B8(v5); } break; @@ -3698,16 +3696,16 @@ static void ov5_021D9464 (SysTask * param0, void * param1) } } -static void ov5_021D9690 (UnkStruct_ov5_021DB4B8 * param0, int param1) +static void ov5_021D9690(UnkStruct_ov5_021DB4B8 *param0, int param1) { int v0; - UnkStruct_ov5_021D6FA8 * v1; + UnkStruct_ov5_021D6FA8 *v1; int v2; int v3; int v4; int v5; VecFx32 v6; - s32 * v7; + s32 *v7; for (v0 = 0; v0 < param1; v0++) { v1 = ov5_021D6F00(param0, sizeof(s32) * 8); @@ -3769,11 +3767,11 @@ static void ov5_021D9690 (UnkStruct_ov5_021DB4B8 * param0, int param1) } } -static void ov5_021D97C0 (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021D97C0(UnkStruct_ov5_021D6FA8 *param0) { - UnkStruct_ov5_021D6FA8 * v0 = (UnkStruct_ov5_021D6FA8 *)param0; + UnkStruct_ov5_021D6FA8 *v0 = (UnkStruct_ov5_021D6FA8 *)param0; int v1; - s32 * v2 = (s32 *)v0->unk_08; + s32 *v2 = (s32 *)v0->unk_08; VecFx32 v3 = ov5_021D7010(v0); v2[0]++; @@ -3792,11 +3790,11 @@ static void ov5_021D97C0 (UnkStruct_ov5_021D6FA8 * param0) } } -static void ov5_021D97E8 (SysTask * param0, void * param1) +static void ov5_021D97E8(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; - s32 * v2; + s32 *v2; v2 = (s32 *)v0->unk_B98; @@ -3886,18 +3884,16 @@ static void ov5_021D97E8 (SysTask * param0, void * param1) } } break; - case 5: - { - UnkStruct_ov5_021D69B8 * v3 = v0->unk_04; + case 5: { + UnkStruct_ov5_021D69B8 *v3 = v0->unk_04; ov5_021D69B8(v3); - } - break; + } break; default: break; } } -static void ov5_021D9984 (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1) +static void ov5_021D9984(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1) { ov5_021D7210(¶m1->unk_00, param0, 1, 15, 10, 0, -3, 2, 1, ov5_021DA0A8); ov5_021D7308(¶m1->unk_4C, ¶m1->unk_1C, param0->unk_00->fieldSystem->unk_48, 3, 0x6F6F, GX_RGB(26, 26, 26), 1, param0->unk_BA4); @@ -3909,7 +3905,7 @@ static void ov5_021D9984 (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D998 ov5_021DB4B8(param0, 1595); } -static BOOL ov5_021D9A0C (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1) +static BOOL ov5_021D9A0C(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1) { int v0; int v1; @@ -3929,7 +3925,7 @@ static BOOL ov5_021D9A0C (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D998 return 0; } -static void ov5_021D9A58 (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1) +static void ov5_021D9A58(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1) { ov5_021D7210(¶m1->unk_00, param0, 10, 0, 10, 0, -3, 2, 1, ov5_021DA0A8); @@ -3946,7 +3942,7 @@ static void ov5_021D9A58 (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D998 ov5_021DB4B8(param0, 1595); } -static void ov5_021D9AEC (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1) +static void ov5_021D9AEC(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1) { param1->unk_B4[2] = (param1->unk_B4[2] + 1) % (60 * 5); @@ -3956,7 +3952,7 @@ static void ov5_021D9AEC (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D998 } } -static void ov5_021D9B28 (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1) +static void ov5_021D9B28(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1) { ov5_021D7238(¶m1->unk_00, 0, 15, 3, -3); @@ -3968,7 +3964,7 @@ static void ov5_021D9B28 (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D998 ov5_021DB4E4(param0); } -static BOOL ov5_021D9B68 (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1) +static BOOL ov5_021D9B68(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1) { int v0; int v1; @@ -3994,19 +3990,19 @@ static BOOL ov5_021D9B68 (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D998 return 0; } -static void ov5_021D9BC0 (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1) +static void ov5_021D9BC0(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1) { if (param0->unk_BA4 != 0) { ov5_021D57FC(param1->unk_1C.unk_00, 1, 0, 0, 0, 0); } { - UnkStruct_ov5_021D69B8 * v0 = param0->unk_04; + UnkStruct_ov5_021D69B8 *v0 = param0->unk_04; ov5_021D69B8(v0); } } -static void ov5_021D9BEC (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D9984 * param1) +static void ov5_021D9BEC(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D9984 *param1) { if ((param0->unk_BA2 != 5) && (param0->unk_BA2 != 0)) { ov5_021D6FF0(¶m0->unk_0C, ov5_021DA1A8); @@ -4015,11 +4011,11 @@ static void ov5_021D9BEC (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D998 } } -static void ov5_021D9C20 (SysTask * param0, void * param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov5_021D9C20(SysTask *param0, void *param1, u32 param2, u32 param3, u32 param4, u32 param5) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; - UnkStruct_ov5_021D84D4 * v2; + UnkStruct_ov5_021D84D4 *v2; int v3; v2 = (UnkStruct_ov5_021D84D4 *)v0->unk_B98; @@ -4092,7 +4088,7 @@ static void ov5_021D9C20 (SysTask * param0, void * param1, u32 param2, u32 param } { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); } break; @@ -4101,7 +4097,7 @@ static void ov5_021D9C20 (SysTask * param0, void * param1, u32 param2, u32 param } } -static void ov5_021D9DFC (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D84D4 * param1, u32 param2, u32 param3, GXRgb param4, u32 param5, u32 param6) +static void ov5_021D9DFC(UnkStruct_ov5_021DB4B8 *param0, UnkStruct_ov5_021D84D4 *param1, u32 param2, u32 param3, GXRgb param4, u32 param5, u32 param6) { int v0; int v1; @@ -4114,7 +4110,7 @@ static void ov5_021D9DFC (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D84D case 1: v1 = ov5_021D735C(¶m1->unk_30, ¶m1->unk_00, param0->unk_BA4); - if ((v1 == 1)) { + if (v1 == 1) { param0->unk_BA2 = 3; } break; @@ -4143,7 +4139,7 @@ static void ov5_021D9DFC (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D84D v1 = 1; } - if ((v1 == 1)) { + if (v1 == 1) { param0->unk_BA2 = 5; } break; @@ -4153,7 +4149,7 @@ static void ov5_021D9DFC (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D84D } { - UnkStruct_ov5_021D69B8 * v2 = param0->unk_04; + UnkStruct_ov5_021D69B8 *v2 = param0->unk_04; ov5_021D69B8(v2); } break; @@ -4162,10 +4158,10 @@ static void ov5_021D9DFC (UnkStruct_ov5_021DB4B8 * param0, UnkStruct_ov5_021D84D } } -static void ov5_021D9F0C (SysTask * param0, void * param1) +static void ov5_021D9F0C(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D9984 * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D9984 *v1; v1 = (UnkStruct_ov5_021D9984 *)v0->unk_B98; @@ -4214,10 +4210,10 @@ static void ov5_021D9F0C (SysTask * param0, void * param1) ov5_021D9BEC(v0, v1); } -static void ov5_021D9FF8 (SysTask * param0, void * param1) +static void ov5_021D9FF8(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D9984 * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D9984 *v1; v1 = (UnkStruct_ov5_021D9984 *)v0->unk_B98; @@ -4258,16 +4254,16 @@ static void ov5_021D9FF8 (SysTask * param0, void * param1) ov5_021D9BEC(v0, v1); } -static void ov5_021DA0A8 (UnkStruct_ov5_021DB4B8 * param0, int param1) +static void ov5_021DA0A8(UnkStruct_ov5_021DB4B8 *param0, int param1) { int v0; - UnkStruct_ov5_021D6FA8 * v1; + UnkStruct_ov5_021D6FA8 *v1; int v2; - s32 * v3; - UnkStruct_ov5_021D9984 * v4; + s32 *v3; + UnkStruct_ov5_021D9984 *v4; int v5; int v6; - static const int v7[5] = {1, 1, 2, 1, 3}; + static const int v7[5] = { 1, 1, 2, 1, 3 }; u32 v8; v4 = (UnkStruct_ov5_021D9984 *)param0->unk_B98; @@ -4309,11 +4305,11 @@ static void ov5_021DA0A8 (UnkStruct_ov5_021DB4B8 * param0, int param1) } } -static void ov5_021DA1A8 (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021DA1A8(UnkStruct_ov5_021D6FA8 *param0) { int v0; - UnkStruct_ov5_021D6FA8 * v1 = (UnkStruct_ov5_021D6FA8 *)param0; - s32 * v2 = (s32 *)v1->unk_08; + UnkStruct_ov5_021D6FA8 *v1 = (UnkStruct_ov5_021D6FA8 *)param0; + s32 *v2 = (s32 *)v1->unk_08; VecFx32 v3 = ov5_021D7010(v1); switch (v2[3]) { @@ -4345,14 +4341,14 @@ static void ov5_021DA1A8 (UnkStruct_ov5_021D6FA8 * param0) } } -static void ov5_021DA244 (SysTask * param0, void * param1) +static void ov5_021DA244(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; int v2; int v3, v4; short v5, v6; - UnkStruct_ov5_021D9984 * v7; + UnkStruct_ov5_021D9984 *v7; int v8; int v9; @@ -4450,7 +4446,7 @@ static void ov5_021DA244 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v10 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v10 = v0->unk_04; ov5_021D69B8(v10); } break; @@ -4496,14 +4492,14 @@ static void ov5_021DA244 (SysTask * param0, void * param1) } } -static void ov5_021DA5A0 (UnkStruct_ov5_021DB4B8 * param0, int param1) +static void ov5_021DA5A0(UnkStruct_ov5_021DB4B8 *param0, int param1) { int v0; int v1; - UnkStruct_ov5_021D6FA8 * v2; - UnkStruct_ov5_021D9984 * v3; + UnkStruct_ov5_021D6FA8 *v2; + UnkStruct_ov5_021D9984 *v3; int v4; - s32 * v5; + s32 *v5; v3 = param0->unk_B98; @@ -4535,8 +4531,8 @@ static void ov5_021DA5A0 (UnkStruct_ov5_021DB4B8 * param0, int param1) } v5[3] = 1 + (MTRNG_Next() % 1); - v5[0] = (s32) & v3->unk_B4[1]; - v5[6] = (s32) & v3->unk_B4[5]; + v5[0] = (s32)&v3->unk_B4[1]; + v5[6] = (s32)&v3->unk_B4[5]; v5[7] = 10 + (MTRNG_Next() % 20); { @@ -4559,14 +4555,14 @@ static void ov5_021DA5A0 (UnkStruct_ov5_021DB4B8 * param0, int param1) } } -static void ov5_021DA6BC (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021DA6BC(UnkStruct_ov5_021D6FA8 *param0) { - UnkStruct_ov5_021D6FA8 * v0 = (UnkStruct_ov5_021D6FA8 *)param0; - s32 * v1 = (s32 *)v0->unk_08; + UnkStruct_ov5_021D6FA8 *v0 = (UnkStruct_ov5_021D6FA8 *)param0; + s32 *v1 = (s32 *)v0->unk_08; VecFx32 v2 = ov5_021D7010(v0); BOOL v3 = 0; - if ((v1[5] >= v1[3])) { + if (v1[5] >= v1[3]) { v2.y += FX32_ONE; v1[5] = 0; @@ -4595,10 +4591,10 @@ static void ov5_021DA6BC (UnkStruct_ov5_021D6FA8 * param0) } } -static void ov5_021DA748 (SysTask * param0, void * param1) +static void ov5_021DA748(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - s32 * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + s32 *v1; int v2; int v3; @@ -4674,22 +4670,20 @@ static void ov5_021DA748 (SysTask * param0, void * param1) case 4: v0->unk_BA2 = 5; break; - case 5: - { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + case 5: { + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); - } - break; + } break; default: break; } } -static void ov5_021DA8A0 (SysTask * param0, void * param1) +static void ov5_021DA8A0(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; int v1; - UnkStruct_ov5_021DA8A0 * v2; + UnkStruct_ov5_021DA8A0 *v2; int v3; v2 = (UnkStruct_ov5_021DA8A0 *)v0->unk_B98; @@ -4731,12 +4725,10 @@ static void ov5_021DA8A0 (SysTask * param0, void * param1) } } break; - case 5: - { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + case 5: { + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); - } - break; + } break; default: break; } @@ -4748,11 +4740,11 @@ static void ov5_021DA8A0 (SysTask * param0, void * param1) } } -static void ov5_021DA9DC (UnkStruct_ov5_021DB4B8 * param0, int param1) +static void ov5_021DA9DC(UnkStruct_ov5_021DB4B8 *param0, int param1) { int v0; - UnkStruct_ov5_021D6FA8 * v1; - s32 * v2; + UnkStruct_ov5_021D6FA8 *v1; + s32 *v2; int v3; int v4; VecFx32 v5; @@ -4803,10 +4795,10 @@ static void ov5_021DA9DC (UnkStruct_ov5_021DB4B8 * param0, int param1) } } -static void ov5_021DAADC (UnkStruct_ov5_021D6FA8 * param0) +static void ov5_021DAADC(UnkStruct_ov5_021D6FA8 *param0) { - UnkStruct_ov5_021D6FA8 * v0 = (UnkStruct_ov5_021D6FA8 *)param0; - s32 * v1 = (s32 *)v0->unk_08; + UnkStruct_ov5_021D6FA8 *v0 = (UnkStruct_ov5_021D6FA8 *)param0; + s32 *v1 = (s32 *)v0->unk_08; VecFx32 v2 = ov5_021D7010(v0); v1[2] += v1[1]; @@ -4839,10 +4831,10 @@ static void ov5_021DAADC (UnkStruct_ov5_021D6FA8 * param0) } } -static void ov5_021DAB78 (SysTask * param0, void * param1) +static void ov5_021DAB78(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D879C * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D879C *v1; BOOL v2; BOOL v3; @@ -4890,21 +4882,19 @@ static void ov5_021DAB78 (SysTask * param0, void * param1) v0->unk_BA2 = 5; } break; - case 5: - { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + case 5: { + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); - } - break; + } break; default: break; } } -static void ov5_021DAC68 (SysTask * param0, void * param1) +static void ov5_021DAC68(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021DAC68 * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DAC68 *v1; BOOL v2; v1 = (UnkStruct_ov5_021DAC68 *)v0->unk_B98; @@ -4943,21 +4933,19 @@ static void ov5_021DAC68 (SysTask * param0, void * param1) v0->unk_BA2 = 5; } break; - case 5: - { - UnkStruct_ov5_021D69B8 * v3 = v0->unk_04; + case 5: { + UnkStruct_ov5_021D69B8 *v3 = v0->unk_04; ov5_021D69B8(v3); - } - break; + } break; default: break; } } -static void ov5_021DAD38 (SysTask * param0, void * param1) +static void ov5_021DAD38(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D879C * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D879C *v1; int v2; BOOL v3; @@ -5023,7 +5011,7 @@ static void ov5_021DAD38 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); } break; @@ -5032,10 +5020,10 @@ static void ov5_021DAD38 (SysTask * param0, void * param1) } } -static void ov5_021DAEC0 (SysTask * param0, void * param1) +static void ov5_021DAEC0(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D879C * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D879C *v1; int v2; BOOL v3; @@ -5100,7 +5088,7 @@ static void ov5_021DAEC0 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); } break; @@ -5109,12 +5097,12 @@ static void ov5_021DAEC0 (SysTask * param0, void * param1) } } -static void ov5_021DB04C (SysTask * param0, void * param1) +static void ov5_021DB04C(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021DB04C * v1; - UnkStruct_ov5_021D6594 * v2 = v0->unk_00; - FieldSystem * fieldSystem = v2->fieldSystem; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB04C *v1; + UnkStruct_ov5_021D6594 *v2 = v0->unk_00; + FieldSystem *fieldSystem = v2->fieldSystem; v1 = (UnkStruct_ov5_021DB04C *)v0->unk_B98; @@ -5152,7 +5140,7 @@ static void ov5_021DB04C (SysTask * param0, void * param1) case 5: ov5_021DB690(&v1->unk_00); { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); } break; @@ -5161,10 +5149,10 @@ static void ov5_021DB04C (SysTask * param0, void * param1) } } -static void ov5_021DB144 (SysTask * param0, void * param1) +static void ov5_021DB144(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021DB144 * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021DB144 *v1; BOOL v2; BOOL v3; @@ -5235,7 +5223,7 @@ static void ov5_021DB144 (SysTask * param0, void * param1) } { - UnkStruct_ov5_021D69B8 * v4 = v0->unk_04; + UnkStruct_ov5_021D69B8 *v4 = v0->unk_04; ov5_021D69B8(v4); } break; @@ -5270,67 +5258,67 @@ static void ov5_021DB144 (SysTask * param0, void * param1) } } -static void ov5_021DB3A8 (SysTask * param0, void * param1) +static void ov5_021DB3A8(SysTask *param0, void *param1) { ov5_021D9C20(param0, param1, 4, 4, (10 * 128), (2 * 128)); } -static void ov5_021DB3C4 (SysTask * param0, void * param1) +static void ov5_021DB3C4(SysTask *param0, void *param1) { ov5_021D9C20(param0, param1, 6, 1, (8 * 128), (2 * 128)); } -static void ov5_021DB3E0 (SysTask * param0, void * param1) +static void ov5_021DB3E0(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D84D4 * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D84D4 *v1; v1 = (UnkStruct_ov5_021D84D4 *)v0->unk_B98; ov5_021D9DFC(v0, v1, 3, 26095, (GX_RGB(2, 2, 6)), 0, 0); } -static void ov5_021DB40C (SysTask * param0, void * param1) +static void ov5_021DB40C(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D84D4 * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D84D4 *v1; v1 = (UnkStruct_ov5_021D84D4 *)v0->unk_B98; ov5_021D9DFC(v0, v1, 2, 26415, (GX_RGB(13, 25, 30)), 0, 0); } -static void ov5_021DB438 (SysTask * param0, void * param1) +static void ov5_021DB438(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D84D4 * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D84D4 *v1; v1 = (UnkStruct_ov5_021D84D4 *)v0->unk_B98; ov5_021D9DFC(v0, v1, 2, 26415, (GX_RGB(20, 0, 0)), 0, 0); } -static void ov5_021DB460 (SysTask * param0, void * param1) +static void ov5_021DB460(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D84D4 * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D84D4 *v1; v1 = (UnkStruct_ov5_021D84D4 *)v0->unk_B98; ov5_021D9DFC(v0, v1, 2, 26415, (GX_RGB(0, 0, 20)), 0, 0); } -static void ov5_021DB48C (SysTask * param0, void * param1) +static void ov5_021DB48C(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB4B8 * v0 = (UnkStruct_ov5_021DB4B8 *)param1; - UnkStruct_ov5_021D84D4 * v1; + UnkStruct_ov5_021DB4B8 *v0 = (UnkStruct_ov5_021DB4B8 *)param1; + UnkStruct_ov5_021D84D4 *v1; v1 = (UnkStruct_ov5_021D84D4 *)v0->unk_B98; ov5_021D9DFC(v0, v1, 1, 19311, (GX_RGB(1, 1, 1)), 0, 0); } -static void ov5_021DB4B8 (UnkStruct_ov5_021DB4B8 * param0, int param1) +static void ov5_021DB4B8(UnkStruct_ov5_021DB4B8 *param0, int param1) { GF_ASSERT(param0->unk_B9C == 0); param0->unk_B9C = 1; @@ -5339,19 +5327,19 @@ static void ov5_021DB4B8 (UnkStruct_ov5_021DB4B8 * param0, int param1) Sound_PlayEffect(param1); } -static void ov5_021DB4E4 (UnkStruct_ov5_021DB4B8 * param0) +static void ov5_021DB4E4(UnkStruct_ov5_021DB4B8 *param0) { sub_020057A4(param0->unk_BA0, 0); param0->unk_B9C = 0; } -static void ov5_021DB500 (UnkStruct_ov5_021DB614 * param0) +static void ov5_021DB500(UnkStruct_ov5_021DB614 *param0) { int v0; int v1; int v2; - u16 * v3; - u16 * v4; + u16 *v3; + u16 *v4; v3 = BufferManager_GetWriteBuffer(param0->bufferManagers[0]); v4 = BufferManager_GetWriteBuffer(param0->bufferManagers[1]); @@ -5373,7 +5361,7 @@ static void ov5_021DB500 (UnkStruct_ov5_021DB614 * param0) } } -static void ov5_021DB588 (fx32 param0, int param1, int param2, int param3, int * param4, int * param5) +static void ov5_021DB588(fx32 param0, int param1, int param2, int param3, int *param4, int *param5) { fx32 v0; fx32 v1; @@ -5408,7 +5396,7 @@ static void ov5_021DB588 (fx32 param0, int param1, int param2, int param3, int * } } -static void ov5_021DB614 (UnkStruct_ov5_021DB614 * param0, HBlankSystem * param1) +static void ov5_021DB614(UnkStruct_ov5_021DB614 *param0, HBlankSystem *param1) { int v0; @@ -5428,7 +5416,7 @@ static void ov5_021DB614 (UnkStruct_ov5_021DB614 * param0, HBlankSystem * param1 param0->unk_28 = 0; } -static void ov5_021DB690 (UnkStruct_ov5_021DB614 * param0) +static void ov5_021DB690(UnkStruct_ov5_021DB614 *param0) { int v0 = GX_GetVisibleWnd(); @@ -5442,7 +5430,7 @@ static void ov5_021DB690 (UnkStruct_ov5_021DB614 * param0) memset(param0, 0, sizeof(UnkStruct_ov5_021DB614)); } -static void ov5_021DB6E0 (UnkStruct_ov5_021DB614 * param0, fx32 param1, fx32 param2, int param3, int param4, int param5) +static void ov5_021DB6E0(UnkStruct_ov5_021DB614 *param0, fx32 param1, fx32 param2, int param3, int param4, int param5) { ov5_021D6538(¶m0->unk_04, param1, param2, param5); @@ -5453,7 +5441,7 @@ static void ov5_021DB6E0 (UnkStruct_ov5_021DB614 * param0, fx32 param1, fx32 par ov5_021DB500(param0); } -static BOOL ov5_021DB700 (UnkStruct_ov5_021DB614 * param0) +static BOOL ov5_021DB700(UnkStruct_ov5_021DB614 *param0) { BOOL v0; @@ -5473,10 +5461,10 @@ static BOOL ov5_021DB700 (UnkStruct_ov5_021DB614 * param0) return v0; } -static void ov5_021DB72C (HBlankTask * param0, void * param1) +static void ov5_021DB72C(HBlankTask *param0, void *param1) { - UnkStruct_ov5_021DB614 * v0 = param1; - const u16 * v1[2]; + UnkStruct_ov5_021DB614 *v0 = param1; + const u16 *v1[2]; int v2; int v3; @@ -5499,9 +5487,9 @@ static void ov5_021DB72C (HBlankTask * param0, void * param1) } } -static void ov5_021DB78C (SysTask * param0, void * param1) +static void ov5_021DB78C(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB614 * v0 = param1; + UnkStruct_ov5_021DB614 *v0 = param1; int v1; for (v1 = 0; v1 < 2; v1++) { @@ -5509,21 +5497,21 @@ static void ov5_021DB78C (SysTask * param0, void * param1) } } -static void ov5_021DB7A4 (UnkStruct_ov5_021DB614 * param0) +static void ov5_021DB7A4(UnkStruct_ov5_021DB614 *param0) { SysTask_ExecuteAfterVBlank(ov5_021DB7B8, param0, 128); } -static void ov5_021DB7B8 (SysTask * param0, void * param1) +static void ov5_021DB7B8(SysTask *param0, void *param1) { ov5_021DB690(param1); SysTask_Done(param0); } -static void ov5_021DB7CC (UnkStruct_ov5_021DB614 * param0) +static void ov5_021DB7CC(UnkStruct_ov5_021DB614 *param0) { - const u16 * v0; - u16 * v1; + const u16 *v0; + u16 *v1; int v2; for (v2 = 0; v2 < 2; v2++) { @@ -5534,9 +5522,9 @@ static void ov5_021DB7CC (UnkStruct_ov5_021DB614 * param0) } } -static void ov5_021DB7F8 (SysTask * param0, void * param1) +static void ov5_021DB7F8(SysTask *param0, void *param1) { - UnkStruct_ov5_021DB614 * v0 = param1; + UnkStruct_ov5_021DB614 *v0 = param1; GXWndPlane v1 = G2_GetWndOutsidePlane(); int v2 = GX_GetVisibleWnd(); diff --git a/src/overlay005/ov5_021DC018.c b/src/overlay005/ov5_021DC018.c index 51cde17788..1d199af319 100644 --- a/src/overlay005/ov5_021DC018.c +++ b/src/overlay005/ov5_021DC018.c @@ -1,49 +1,47 @@ +#include "overlay005/ov5_021DC018.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "overlay005/struct_ov5_021DC1A4_decl.h" - #include "struct_defs/struct_02013A04_t.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" + +#include "field/field_system.h" +#include "overlay005/struct_ov5_021DC1A4_decl.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "coins.h" +#include "core_sys.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "coins.h" #include "unk_0202D05C.h" -#include "overlay005/ov5_021DC018.h" struct UnkStruct_ov5_021DC1A4_t { - FieldSystem * fieldSystem; - SysTask * unk_04; + FieldSystem *fieldSystem; + SysTask *unk_04; Window unk_08; - Window * unk_18; - Strbuf* unk_1C[28]; - MessageLoader * unk_8C; - StringTemplate * unk_90; + Window *unk_18; + Strbuf *unk_1C[28]; + MessageLoader *unk_8C; + StringTemplate *unk_90; u8 unk_94; u8 unk_95; u8 unk_96; @@ -56,15 +54,15 @@ struct UnkStruct_ov5_021DC1A4_t { u8 unk_99; u8 unk_9A; u8 unk_9B; - u16 * unk_9C; - u16 * unk_A0; - u16 * unk_A4; - u16 * unk_A8; + u16 *unk_9C; + u16 *unk_A0; + u16 *unk_A4; + u16 *unk_A8; UnkStruct_02081CF4 unk_AC; - UIControlData * unk_B8; + UIControlData *unk_B8; ResourceMetadata unk_BC[28]; UnkStruct_ov84_02240FA8 unk_19C; - BmpList * unk_1BC; + BmpList *unk_1BC; u16 unk_1C0; u16 unk_1C2; ResourceMetadata unk_1C4[28]; @@ -72,38 +70,38 @@ struct UnkStruct_ov5_021DC1A4_t { u16 unk_2DC; }; -static void ov5_021DC018(FieldSystem * fieldSystem, UnkStruct_ov5_021DC1A4 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringTemplate * param7, Window * param8, MessageLoader * param9); -UnkStruct_ov5_021DC1A4 * ov5_021DC150(FieldSystem * fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8); -void ov5_021DC1A4(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2); -void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 * param0); -void ov5_021DCD94(UnkStruct_ov5_021DC1A4 * param0, u8 param1); -static void ov5_021DCE64(UnkStruct_ov5_021DC1A4 * param0, u8 param1, u8 param2); -static void ov5_021DC290(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2); -static u32 ov5_021DC300(UnkStruct_ov5_021DC1A4 * param0); -static void ov5_021DC33C(UnkStruct_ov5_021DC1A4 * param0); -static void ov5_021DC3B0(SysTask * param0, void * param1); -UnkStruct_ov5_021DC1A4 * ov5_021DC48C(FieldSystem * fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8); -void ov5_021DC4B0(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2, u32 param3); -void ov5_021DC4B8(UnkStruct_ov5_021DC1A4 * param0); -void ov5_021DC528(UnkStruct_ov5_021DC1A4 * param0, u16 param1); -static void ov5_021DC530(UnkStruct_ov5_021DC1A4 * param0, u32 param1); -static void ov5_021DC708(UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2, u32 param3); -static u32 ov5_021DC7A8(UnkStruct_ov5_021DC1A4 * param0); -static void ov5_021DC7E4(UnkStruct_ov5_021DC1A4 * param0); -static void ov5_021DC8F4(BmpList * param0, u32 param1, u8 param2); -static void ov5_021DC918(BmpList * param0, u32 param1, u8 param2); -static void ov5_021DC95C(SysTask * param0, void * param1); -static void ov5_021DCA28(UnkStruct_ov5_021DC1A4 * param0); -static void ov5_021DCA90(UnkStruct_ov5_021DC1A4 * param0, u16 param1, u32 param2); -static void ov5_021DCAF4(UnkStruct_ov5_021DC1A4 * param0); -static void ov5_021DCC64(SysTask * param0, void * param1); -void ov5_021DCB24(FieldSystem * fieldSystem, u8 param1, u8 param2, u16 * param3, StringTemplate * param4, u16 param5); -static void ov5_021DCC00(UnkStruct_ov5_021DC1A4 * param0, u16 param1, u8 param2, u8 param3); +static void ov5_021DC018(FieldSystem *fieldSystem, UnkStruct_ov5_021DC1A4 *param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 *param6, StringTemplate *param7, Window *param8, MessageLoader *param9); +UnkStruct_ov5_021DC1A4 *ov5_021DC150(FieldSystem *fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, Window *param7, MessageLoader *param8); +void ov5_021DC1A4(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2); +void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 *param0); +void ov5_021DCD94(UnkStruct_ov5_021DC1A4 *param0, u8 param1); +static void ov5_021DCE64(UnkStruct_ov5_021DC1A4 *param0, u8 param1, u8 param2); +static void ov5_021DC290(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2); +static u32 ov5_021DC300(UnkStruct_ov5_021DC1A4 *param0); +static void ov5_021DC33C(UnkStruct_ov5_021DC1A4 *param0); +static void ov5_021DC3B0(SysTask *param0, void *param1); +UnkStruct_ov5_021DC1A4 *ov5_021DC48C(FieldSystem *fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, Window *param7, MessageLoader *param8); +void ov5_021DC4B0(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2, u32 param3); +void ov5_021DC4B8(UnkStruct_ov5_021DC1A4 *param0); +void ov5_021DC528(UnkStruct_ov5_021DC1A4 *param0, u16 param1); +static void ov5_021DC530(UnkStruct_ov5_021DC1A4 *param0, u32 param1); +static void ov5_021DC708(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2, u32 param3); +static u32 ov5_021DC7A8(UnkStruct_ov5_021DC1A4 *param0); +static void ov5_021DC7E4(UnkStruct_ov5_021DC1A4 *param0); +static void ov5_021DC8F4(BmpList *param0, u32 param1, u8 param2); +static void ov5_021DC918(BmpList *param0, u32 param1, u8 param2); +static void ov5_021DC95C(SysTask *param0, void *param1); +static void ov5_021DCA28(UnkStruct_ov5_021DC1A4 *param0); +static void ov5_021DCA90(UnkStruct_ov5_021DC1A4 *param0, u16 param1, u32 param2); +static void ov5_021DCAF4(UnkStruct_ov5_021DC1A4 *param0); +static void ov5_021DCC64(SysTask *param0, void *param1); +void ov5_021DCB24(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 *param3, StringTemplate *param4, u16 param5); +static void ov5_021DCC00(UnkStruct_ov5_021DC1A4 *param0, u16 param1, u8 param2, u8 param3); u16 ov5_021DCCC8(int param0); -UnkStruct_ov5_021DC1A4 * ov5_021DD250(FieldSystem * fieldSystem, u8 param1, u8 param2, u16 * param3, StringTemplate * param4, u8 param5, u8 param6, u8 param7, u8 param8); -void ov5_021DD3A8(UnkStruct_ov5_021DC1A4 * param0); +UnkStruct_ov5_021DC1A4 *ov5_021DD250(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 *param3, StringTemplate *param4, u8 param5, u8 param6, u8 param7, u8 param8); +void ov5_021DD3A8(UnkStruct_ov5_021DC1A4 *param0); -static void ov5_021DC018 (FieldSystem * fieldSystem, UnkStruct_ov5_021DC1A4 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringTemplate * param7, Window * param8, MessageLoader * param9) +static void ov5_021DC018(FieldSystem *fieldSystem, UnkStruct_ov5_021DC1A4 *param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 *param6, StringTemplate *param7, Window *param8, MessageLoader *param9) { int v0; @@ -154,9 +152,9 @@ static void ov5_021DC018 (FieldSystem * fieldSystem, UnkStruct_ov5_021DC1A4 * pa return; } -UnkStruct_ov5_021DC1A4 * ov5_021DC150 (FieldSystem * fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8) +UnkStruct_ov5_021DC1A4 *ov5_021DC150(FieldSystem *fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, Window *param7, MessageLoader *param8) { - UnkStruct_ov5_021DC1A4 * v0; + UnkStruct_ov5_021DC1A4 *v0; int v1; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DC1A4)); @@ -171,13 +169,13 @@ UnkStruct_ov5_021DC1A4 * ov5_021DC150 (FieldSystem * fieldSystem, u8 param1, u8 return v0; } -void ov5_021DC1A4 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2) +void ov5_021DC1A4(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2) { ov5_021DC290(param0, param1, param2); return; } -void ov5_021DC1AC (UnkStruct_ov5_021DC1A4 * param0) +void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 *param0) { u32 v0; @@ -209,13 +207,13 @@ void ov5_021DC1AC (UnkStruct_ov5_021DC1A4 * param0) return; } -static void ov5_021DC290 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2) +static void ov5_021DC290(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2) { int v0; - void * v1; + void *v1; { - Strbuf* v2 = Strbuf_Init((40 * 2), 4); + Strbuf *v2 = Strbuf_Init((40 * 2), 4); MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); @@ -229,7 +227,7 @@ static void ov5_021DC290 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param return; } -static u32 ov5_021DC300 (UnkStruct_ov5_021DC1A4 * param0) +static u32 ov5_021DC300(UnkStruct_ov5_021DC1A4 *param0) { int v0; u32 v1, v2; @@ -252,7 +250,7 @@ static u32 ov5_021DC300 (UnkStruct_ov5_021DC1A4 * param0) return v2 + 12; } -static void ov5_021DC33C (UnkStruct_ov5_021DC1A4 * param0) +static void ov5_021DC33C(UnkStruct_ov5_021DC1A4 *param0) { param0->unk_AC.unk_00 = param0->unk_BC; param0->unk_AC.unk_04 = ¶m0->unk_08; @@ -271,10 +269,10 @@ static void ov5_021DC33C (UnkStruct_ov5_021DC1A4 * param0) return; } -static void ov5_021DC3B0 (SysTask * param0, void * param1) +static void ov5_021DC3B0(SysTask *param0, void *param1) { u32 v0; - UnkStruct_ov5_021DC1A4 * v1; + UnkStruct_ov5_021DC1A4 *v1; v1 = (UnkStruct_ov5_021DC1A4 *)param1; @@ -307,7 +305,7 @@ static void ov5_021DC3B0 (SysTask * param0, void * param1) return; } -void ov5_021DC424 (UnkStruct_ov5_021DC1A4 * param0) +void ov5_021DC424(UnkStruct_ov5_021DC1A4 *param0) { int v0; @@ -330,18 +328,18 @@ void ov5_021DC424 (UnkStruct_ov5_021DC1A4 * param0) return; } -UnkStruct_ov5_021DC1A4 * ov5_021DC48C (FieldSystem * fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8) +UnkStruct_ov5_021DC1A4 *ov5_021DC48C(FieldSystem *fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, Window *param7, MessageLoader *param8) { return ov5_021DC150(fieldSystem, param1, param2, param3, param4, param5, param6, param7, param8); } -void ov5_021DC4B0 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2, u32 param3) +void ov5_021DC4B0(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2, u32 param3) { ov5_021DC708(param0, param1, param2, param3); return; } -void ov5_021DC4B8 (UnkStruct_ov5_021DC1A4 * param0) +void ov5_021DC4B8(UnkStruct_ov5_021DC1A4 *param0) { u32 v0; @@ -369,7 +367,7 @@ void ov5_021DC4B8 (UnkStruct_ov5_021DC1A4 * param0) return; } -void ov5_021DC528 (UnkStruct_ov5_021DC1A4 * param0, u16 param1) +void ov5_021DC528(UnkStruct_ov5_021DC1A4 *param0, u16 param1) { u32 v0; @@ -379,7 +377,7 @@ void ov5_021DC528 (UnkStruct_ov5_021DC1A4 * param0, u16 param1) return; } -static void ov5_021DC530 (UnkStruct_ov5_021DC1A4 * param0, u32 param1) +static void ov5_021DC530(UnkStruct_ov5_021DC1A4 *param0, u32 param1) { if (param0->unk_9B > 8) { BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_98, param0->unk_99, param1, 8 * 2, 13, ((1 + (10 * 4)) + (10 * 2))); @@ -399,7 +397,7 @@ static void ov5_021DC530 (UnkStruct_ov5_021DC1A4 * param0, u32 param1) return; } -void ov5_021DC600 (UnkStruct_ov5_021DC1A4 * param0, u16 * param1, u16 * param2) +void ov5_021DC600(UnkStruct_ov5_021DC1A4 *param0, u16 *param1, u16 *param2) { u32 v0; @@ -433,13 +431,13 @@ void ov5_021DC600 (UnkStruct_ov5_021DC1A4 * param0, u16 * param1, u16 * param2) return; } -static void ov5_021DC708 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param2, u32 param3) +static void ov5_021DC708(UnkStruct_ov5_021DC1A4 *param0, u32 param1, u32 param2, u32 param3) { int v0; - void * v1; + void *v1; { - Strbuf* v2 = Strbuf_Init((40 * 2), 4); + Strbuf *v2 = Strbuf_Init((40 * 2), 4); MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); @@ -459,7 +457,7 @@ static void ov5_021DC708 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param return; } -static u32 ov5_021DC7A8 (UnkStruct_ov5_021DC1A4 * param0) +static u32 ov5_021DC7A8(UnkStruct_ov5_021DC1A4 *param0) { int v0; u32 v1, v2; @@ -482,7 +480,7 @@ static u32 ov5_021DC7A8 (UnkStruct_ov5_021DC1A4 * param0) return v2 + 12; } -static void ov5_021DC7E4 (UnkStruct_ov5_021DC1A4 * param0) +static void ov5_021DC7E4(UnkStruct_ov5_021DC1A4 *param0) { param0->unk_19C.unk_00 = param0->unk_1C4; param0->unk_19C.unk_04 = ov5_021DC918; @@ -507,7 +505,7 @@ static void ov5_021DC7E4 (UnkStruct_ov5_021DC1A4 * param0) return; } -static void ov5_021DC8F4 (BmpList * param0, u32 param1, u8 param2) +static void ov5_021DC8F4(BmpList *param0, u32 param1, u8 param2) { if (param1 == 0xfffffffd) { sub_0200147C(param0, 3, 15, 4); @@ -516,12 +514,12 @@ static void ov5_021DC8F4 (BmpList * param0, u32 param1, u8 param2) } } -static void ov5_021DC918 (BmpList * param0, u32 param1, u8 param2) +static void ov5_021DC918(BmpList *param0, u32 param1, u8 param2) { u32 v0, v1; u16 v2 = 0; u16 v3 = 0; - UnkStruct_ov5_021DC1A4 * v4 = (UnkStruct_ov5_021DC1A4 *)sub_02001504(param0, 19); + UnkStruct_ov5_021DC1A4 *v4 = (UnkStruct_ov5_021DC1A4 *)sub_02001504(param0, 19); sub_020014DC(param0, &v2, &v3); @@ -533,11 +531,11 @@ static void ov5_021DC918 (BmpList * param0, u32 param1, u8 param2) return; } -static void ov5_021DC95C (SysTask * param0, void * param1) +static void ov5_021DC95C(SysTask *param0, void *param1) { u16 v0; u32 v1; - UnkStruct_ov5_021DC1A4 * v2; + UnkStruct_ov5_021DC1A4 *v2; v2 = (UnkStruct_ov5_021DC1A4 *)param1; @@ -583,7 +581,7 @@ static void ov5_021DC95C (SysTask * param0, void * param1) return; } -static void ov5_021DCA28 (UnkStruct_ov5_021DC1A4 * param0) +static void ov5_021DCA28(UnkStruct_ov5_021DC1A4 *param0) { int v0; @@ -606,10 +604,10 @@ static void ov5_021DCA28 (UnkStruct_ov5_021DC1A4 * param0) return; } -static void ov5_021DCA90 (UnkStruct_ov5_021DC1A4 * param0, u16 param1, u32 param2) +static void ov5_021DCA90(UnkStruct_ov5_021DC1A4 *param0, u16 param1, u32 param2) { - Strbuf* v0 = Strbuf_Init((40 * 2), 4); - Strbuf* v1 = Strbuf_Init((40 * 2), 4); + Strbuf *v0 = Strbuf_Init((40 * 2), 4); + Strbuf *v1 = Strbuf_Init((40 * 2), 4); BGL_FillWindow(param0->unk_18, 15); MessageLoader_GetStrbuf(param0->unk_8C, param1, v0); @@ -621,7 +619,7 @@ static void ov5_021DCA90 (UnkStruct_ov5_021DC1A4 * param0, u16 param1, u32 param return; } -static void ov5_021DCAF4 (UnkStruct_ov5_021DC1A4 * param0) +static void ov5_021DCAF4(UnkStruct_ov5_021DC1A4 *param0) { sub_020014D0(param0->unk_1BC, ¶m0->unk_1C2); @@ -632,11 +630,11 @@ static void ov5_021DCAF4 (UnkStruct_ov5_021DC1A4 * param0) return; } -void ov5_021DCB24 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 * param3, StringTemplate * param4, u16 param5) +void ov5_021DCB24(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 *param3, StringTemplate *param4, u16 param5) { u8 v0; u32 v1, v2; - UnkStruct_ov5_021DC1A4 * v3; + UnkStruct_ov5_021DC1A4 *v3; v3 = ov5_021DC150(fieldSystem, param1, param2, 0, 0, param3, param4, NULL, NULL); v1 = 8 * sub_02002DF8(0, 0); @@ -662,10 +660,10 @@ void ov5_021DCB24 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 * param3 return; } -static void ov5_021DCC00 (UnkStruct_ov5_021DC1A4 * param0, u16 param1, u8 param2, u8 param3) +static void ov5_021DCC00(UnkStruct_ov5_021DC1A4 *param0, u16 param1, u8 param2, u8 param3) { - Strbuf* v0 = Strbuf_Init((40 * 2), 4); - Strbuf* v1 = Strbuf_Init((40 * 2), 4); + Strbuf *v0 = Strbuf_Init((40 * 2), 4); + Strbuf *v1 = Strbuf_Init((40 * 2), 4); MessageLoader_GetStrbuf(param0->unk_8C, param1, v0); StringTemplate_Format(param0->unk_90, v1, v0); @@ -676,10 +674,10 @@ static void ov5_021DCC00 (UnkStruct_ov5_021DC1A4 * param0, u16 param1, u8 param2 return; } -static void ov5_021DCC64 (SysTask * param0, void * param1) +static void ov5_021DCC64(SysTask *param0, void *param1) { int v0; - UnkStruct_ov5_021DC1A4 * v1; + UnkStruct_ov5_021DC1A4 *v1; v1 = (UnkStruct_ov5_021DC1A4 *)param1; @@ -702,7 +700,7 @@ static void ov5_021DCC64 (SysTask * param0, void * param1) return; } -u16 ov5_021DCCC8 (int param0) +u16 ov5_021DCCC8(int param0) { u16 v0; @@ -768,7 +766,7 @@ u16 ov5_021DCCC8 (int param0) return v0; } -void ov5_021DCD94 (UnkStruct_ov5_021DC1A4 * param0, u8 param1) +void ov5_021DCD94(UnkStruct_ov5_021DC1A4 *param0, u8 param1) { u32 v0; u8 v1; @@ -799,7 +797,7 @@ void ov5_021DCD94 (UnkStruct_ov5_021DC1A4 * param0, u8 param1) return; } -static void ov5_021DCE64 (UnkStruct_ov5_021DC1A4 * param0, u8 param1, u8 param2) +static void ov5_021DCE64(UnkStruct_ov5_021DC1A4 *param0, u8 param1, u8 param2) { param0->unk_AC.unk_00 = param0->unk_BC; param0->unk_AC.unk_04 = ¶m0->unk_08; @@ -812,9 +810,9 @@ static void ov5_021DCE64 (UnkStruct_ov5_021DC1A4 * param0, u8 param1, u8 param2) return; } -Window * ov5_021DCEB0 (FieldSystem * fieldSystem, u8 param1, u8 param2) +Window *ov5_021DCEB0(FieldSystem *fieldSystem, u8 param1, u8 param2) { - Window * v0 = sub_0201A778(4, 1); + Window *v0 = sub_0201A778(4, 1); BGL_AddWindow(fieldSystem->unk_08, v0, 3, param1, param2, 10, 4, 13, 1); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); @@ -822,8 +820,8 @@ Window * ov5_021DCEB0 (FieldSystem * fieldSystem, u8 param1, u8 param2) BGL_FillWindow(v0, 15); { - MessageLoader * v1; - Strbuf* v2; + MessageLoader *v1; + Strbuf *v2; v1 = MessageLoader_Init(0, 26, 543, 4); v2 = MessageLoader_GetNewStrbuf(v1, 18); @@ -838,18 +836,18 @@ Window * ov5_021DCEB0 (FieldSystem * fieldSystem, u8 param1, u8 param2) return v0; } -void ov5_021DCF58 (Window * param0) +void ov5_021DCF58(Window *param0) { Window_Clear(param0, 0); sub_0201A928(param0, 1); } -void ov5_021DCF6C (FieldSystem * fieldSystem, Window * param1) +void ov5_021DCF6C(FieldSystem *fieldSystem, Window *param1) { - MessageLoader * v0; - StringTemplate * v1; - Strbuf* v2; - Strbuf* v3; + MessageLoader *v0; + StringTemplate *v1; + Strbuf *v2; + Strbuf *v3; u32 v4; u32 v5; @@ -874,9 +872,9 @@ void ov5_021DCF6C (FieldSystem * fieldSystem, Window * param1) sub_0201A9A4(param1); } -Window * ov5_021DD020 (FieldSystem * fieldSystem, u8 param1, u8 param2) +Window *ov5_021DD020(FieldSystem *fieldSystem, u8 param1, u8 param2) { - Window * v0 = sub_0201A778(4, 1); + Window *v0 = sub_0201A778(4, 1); BGL_AddWindow(fieldSystem->unk_08, v0, 3, param1, param2, 10, 2, 13, (1 + (10 * 4))); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); @@ -887,18 +885,18 @@ Window * ov5_021DD020 (FieldSystem * fieldSystem, u8 param1, u8 param2) return v0; } -void ov5_021DD084 (Window * param0) +void ov5_021DD084(Window *param0) { Window_Clear(param0, 0); sub_0201A928(param0, 1); } -void ov5_021DD098 (FieldSystem * fieldSystem, Window * param1) +void ov5_021DD098(FieldSystem *fieldSystem, Window *param1) { - MessageLoader * v0; - StringTemplate * v1; - Strbuf* v2; - Strbuf* v3; + MessageLoader *v0; + StringTemplate *v1; + Strbuf *v2; + Strbuf *v3; u32 v4; u32 v5; @@ -923,9 +921,9 @@ void ov5_021DD098 (FieldSystem * fieldSystem, Window * param1) sub_0201A9A4(param1); } -Window * ov5_021DD140 (FieldSystem * fieldSystem, u8 param1, u8 param2) +Window *ov5_021DD140(FieldSystem *fieldSystem, u8 param1, u8 param2) { - Window * v0 = sub_0201A778(4, 1); + Window *v0 = sub_0201A778(4, 1); BGL_AddWindow(fieldSystem->unk_08, v0, 3, param1, param2, 10, 2, 13, (1 + (10 * 4))); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); @@ -936,12 +934,12 @@ Window * ov5_021DD140 (FieldSystem * fieldSystem, u8 param1, u8 param2) return v0; } -void ov5_021DD1A4 (FieldSystem * fieldSystem, Window * param1) +void ov5_021DD1A4(FieldSystem *fieldSystem, Window *param1) { - MessageLoader * v0; - StringTemplate * v1; - Strbuf* v2; - Strbuf* v3; + MessageLoader *v0; + StringTemplate *v1; + Strbuf *v2; + Strbuf *v3; u16 v4; u32 v5; @@ -966,9 +964,9 @@ void ov5_021DD1A4 (FieldSystem * fieldSystem, Window * param1) sub_0201A9A4(param1); } -UnkStruct_ov5_021DC1A4 * ov5_021DD250 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 * param3, StringTemplate * param4, u8 param5, u8 param6, u8 param7, u8 param8) +UnkStruct_ov5_021DC1A4 *ov5_021DD250(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 *param3, StringTemplate *param4, u8 param5, u8 param6, u8 param7, u8 param8) { - UnkStruct_ov5_021DC1A4 * v0; + UnkStruct_ov5_021DC1A4 *v0; v0 = ov5_021DC150(fieldSystem, param1, param2, 0, 0, param3, param4, NULL, NULL); @@ -999,7 +997,7 @@ UnkStruct_ov5_021DC1A4 * ov5_021DD250 (FieldSystem * fieldSystem, u8 param1, u8 return v0; } -void ov5_021DD3A8 (UnkStruct_ov5_021DC1A4 * param0) +void ov5_021DD3A8(UnkStruct_ov5_021DC1A4 *param0) { int v0; @@ -1018,12 +1016,12 @@ void ov5_021DD3A8 (UnkStruct_ov5_021DC1A4 * param0) return; } -void ov5_021DD3F4 (UnkStruct_ov5_021DC1A4 * param0, BOOL param1) +void ov5_021DD3F4(UnkStruct_ov5_021DC1A4 *param0, BOOL param1) { param0->unk_97_6 = param1; } -void ov5_021DD410 (UnkStruct_ov5_021DC1A4 * param0, BOOL param1) +void ov5_021DD410(UnkStruct_ov5_021DC1A4 *param0, BOOL param1) { param0->unk_97_7 = param1; } diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index 86c539bb5d..641578deb0 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -1,53 +1,52 @@ +#include "overlay005/ov5_021DD42C.h" + #include #include -#include "message.h" -#include "strbuf.h" - #include "struct_defs/sentence.h" -#include "field/field_system.h" -#include "field_script_context.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system.h" #include "overlay005/struct_ov5_021DD42C.h" +#include "field_script_context.h" +#include "game_options.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" #include "unk_02014A84.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0203E880.h" #include "unk_0205D8CC.h" -#include "overlay005/ov5_021DD42C.h" typedef struct { - Strbuf* unk_00; - Strbuf* unk_04; - StringTemplate * unk_08; - Window * unk_0C; - u8 * unk_10; - u8 * unk_14; + Strbuf *unk_00; + Strbuf *unk_04; + StringTemplate *unk_08; + Window *unk_0C; + u8 *unk_10; + u8 *unk_14; } UnkStruct_ov5_021DD648; -static u8 ov5_021DD574(ScriptContext * param0); -static void ov5_021DD588(FieldSystem * fieldSystem, UnkStruct_ov5_021DD648 * param1); -static void ov5_021DD5D0(FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov5_021DD648 * param2); -static void ov5_021DD610(FieldSystem * fieldSystem, UnkStruct_ov5_021DD648 * param1); -static void ov5_021DD648(UnkStruct_ov5_021DD648 * param0, const MessageLoader * param1, u32 param2); -static void ov5_021DD664(UnkStruct_ov5_021DD648 * param0, u16 param1, u16 param2, u16 param3, u16 param4); -static void ov5_021DD6B4(UnkStruct_ov5_021DD648 * param0, int param1, int param2, int param3, int param4); -static void ov5_021DD6DC(UnkStruct_ov5_021DD648 * param0, int param1); +static u8 ov5_021DD574(ScriptContext *param0); +static void ov5_021DD588(FieldSystem *fieldSystem, UnkStruct_ov5_021DD648 *param1); +static void ov5_021DD5D0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov5_021DD648 *param2); +static void ov5_021DD610(FieldSystem *fieldSystem, UnkStruct_ov5_021DD648 *param1); +static void ov5_021DD648(UnkStruct_ov5_021DD648 *param0, const MessageLoader *param1, u32 param2); +static void ov5_021DD664(UnkStruct_ov5_021DD648 *param0, u16 param1, u16 param2, u16 param3, u16 param4); +static void ov5_021DD6B4(UnkStruct_ov5_021DD648 *param0, int param1, int param2, int param3, int param4); +static void ov5_021DD6DC(UnkStruct_ov5_021DD648 *param0, int param1); -void ov5_021DD42C (UnkStruct_ov5_021DD42C * param0, ScriptContext * param1) +void ov5_021DD42C(UnkStruct_ov5_021DD42C *param0, ScriptContext *param1) { param0->unk_00 = ov5_021DD574(param1); param0->unk_01 = 0; param0->unk_02 = 1; } -void ov5_021DD444 (ScriptContext * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C * param4) +void ov5_021DD444(ScriptContext *param0, const MessageLoader *param1, u16 param2, u8 param3, UnkStruct_ov5_021DD42C *param4) { UnkStruct_ov5_021DD648 v0; u8 v1; @@ -71,7 +70,7 @@ void ov5_021DD444 (ScriptContext * param0, const MessageLoader * param1, u16 par ov5_021DD6B4(&v0, v3, v1, param3, v2); } -void ov5_021DD498 (ScriptContext * param0, const MessageLoader * param1, int param2) +void ov5_021DD498(ScriptContext *param0, const MessageLoader *param1, int param2) { UnkStruct_ov5_021DD648 v0; @@ -81,7 +80,7 @@ void ov5_021DD498 (ScriptContext * param0, const MessageLoader * param1, int par ov5_021DD6DC(&v0, 1); } -void ov5_021DD4CC (ScriptContext * param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5) +void ov5_021DD4CC(ScriptContext *param0, u16 param1, u16 param2, u16 param3, s16 param4, u8 param5) { UnkStruct_ov5_021DD648 v0; Sentence v1; @@ -97,7 +96,7 @@ void ov5_021DD4CC (ScriptContext * param0, u16 param1, u16 param2, u16 param3, s } } -void ov5_021DD530 (ScriptContext * param0, StringTemplate * param1, u8 param2, u8 param3) +void ov5_021DD530(ScriptContext *param0, StringTemplate *param1, u8 param2, u8 param3) { UnkStruct_ov5_021DD648 v0; @@ -107,12 +106,12 @@ void ov5_021DD530 (ScriptContext * param0, StringTemplate * param1, u8 param2, u ov5_021DD6B4(&v0, 1, ov5_021DD574(param0), param3, 0); } -static u8 ov5_021DD574 (ScriptContext * param0) +static u8 ov5_021DD574(ScriptContext *param0) { return Options_TextFrameDelay(SaveData_Options(param0->fieldSystem->saveData)); } -static void ov5_021DD588 (FieldSystem * fieldSystem, UnkStruct_ov5_021DD648 * param1) +static void ov5_021DD588(FieldSystem *fieldSystem, UnkStruct_ov5_021DD648 *param1) { param1->unk_00 = *((Strbuf **)(sub_0203F098(fieldSystem, 16))); param1->unk_04 = *((Strbuf **)(sub_0203F098(fieldSystem, 17))); @@ -122,7 +121,7 @@ static void ov5_021DD588 (FieldSystem * fieldSystem, UnkStruct_ov5_021DD648 * pa param1->unk_14 = sub_0203F098(fieldSystem, 3); } -static void ov5_021DD5D0 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov5_021DD648 * param2) +static void ov5_021DD5D0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov5_021DD648 *param2) { param2->unk_00 = *((Strbuf **)(sub_0203F098(fieldSystem, 16))); param2->unk_04 = *((Strbuf **)(sub_0203F098(fieldSystem, 17))); @@ -132,7 +131,7 @@ static void ov5_021DD5D0 (FieldSystem * fieldSystem, StringTemplate * param1, Un param2->unk_14 = sub_0203F098(fieldSystem, 3); } -static void ov5_021DD610 (FieldSystem * fieldSystem, UnkStruct_ov5_021DD648 * param1) +static void ov5_021DD610(FieldSystem *fieldSystem, UnkStruct_ov5_021DD648 *param1) { if (*(param1->unk_10) == 0) { FieldMessage_AddWindow(fieldSystem->unk_08, param1->unk_0C, 3); @@ -143,16 +142,16 @@ static void ov5_021DD610 (FieldSystem * fieldSystem, UnkStruct_ov5_021DD648 * pa BGL_FillWindow(param1->unk_0C, 15); } -static void ov5_021DD648 (UnkStruct_ov5_021DD648 * param0, const MessageLoader * param1, u32 param2) +static void ov5_021DD648(UnkStruct_ov5_021DD648 *param0, const MessageLoader *param1, u32 param2) { MessageLoader_GetStrbuf(param1, param2, param0->unk_04); StringTemplate_Format(param0->unk_08, param0->unk_00, param0->unk_04); } -static void ov5_021DD664 (UnkStruct_ov5_021DD648 * param0, u16 param1, u16 param2, u16 param3, u16 param4) +static void ov5_021DD664(UnkStruct_ov5_021DD648 *param0, u16 param1, u16 param2, u16 param3, u16 param4) { Sentence v0; - Strbuf* v1; + Strbuf *v1; sub_02014A84(&v0); sub_02014CE0(&v0, param1, param2); @@ -165,12 +164,12 @@ static void ov5_021DD664 (UnkStruct_ov5_021DD648 * param0, u16 param1, u16 param Strbuf_Free(v1); } -static void ov5_021DD6B4 (UnkStruct_ov5_021DD648 * param0, int param1, int param2, int param3, int param4) +static void ov5_021DD6B4(UnkStruct_ov5_021DD648 *param0, int param1, int param2, int param3, int param4) { *(param0->unk_14) = sub_0205D9CC(param0->unk_0C, param0->unk_00, param1, param2, param3, param4); } -static void ov5_021DD6DC (UnkStruct_ov5_021DD648 * param0, int param1) +static void ov5_021DD6DC(UnkStruct_ov5_021DD648 *param0, int param1) { *(param0->unk_14) = PrintStringSimple(param0->unk_0C, param1, param0->unk_00, 0, 0, 0, NULL); } diff --git a/src/overlay005/ov5_021DD6FC.c b/src/overlay005/ov5_021DD6FC.c index 5e87bb50ea..bbce08e2b3 100644 --- a/src/overlay005/ov5_021DD6FC.c +++ b/src/overlay005/ov5_021DD6FC.c @@ -1,69 +1,68 @@ +#include "overlay005/ov5_021DD6FC.h" + #include #include -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" +#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_0205AA50.h" -#include "unk_02006E3C.h" +#include "heap.h" +#include "map_header.h" #include "message.h" +#include "strbuf.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "map_header.h" #include "unk_02071CFC.h" -#include "overlay005/ov5_021DD6FC.h" typedef struct UnkStruct_ov5_021DD9C8_t { BOOL unk_00; u8 unk_04; - SysTask * unk_08; + SysTask *unk_08; int unk_0C; u16 unk_10; BOOL unk_14; int unk_18; - BGL * unk_1C; + BGL *unk_1C; Window unk_20; u8 unk_30; u8 unk_31; - NNSG2dCharacterData * unk_34; - void * unk_38; - MessageLoader * unk_3C; - Strbuf* unk_40; + NNSG2dCharacterData *unk_34; + void *unk_38; + MessageLoader *unk_3C; + Strbuf *unk_40; } UnkStruct_ov5_021DD9C8; -static void ov5_021DD718(UnkStruct_ov5_021DD9C8 * param0); -static void ov5_021DD744(UnkStruct_ov5_021DD9C8 * param0, u8 param1, u16 param2, u8 param3, u8 param4); -static void ov5_021DD880(UnkStruct_ov5_021DD9C8 * param0); -static void ov5_021DD894(UnkStruct_ov5_021DD9C8 * param0, BGL * param1); -static void ov5_021DD8A4(SysTask * param0, void * param1); -static void ov5_021DD7A0(UnkStruct_ov5_021DD9C8 * param0, const int param1); -static void ov5_021DD980(UnkStruct_ov5_021DD9C8 * param0); -static void ov5_021DD954(UnkStruct_ov5_021DD9C8 * param0, const Strbuf *param1); +static void ov5_021DD718(UnkStruct_ov5_021DD9C8 *param0); +static void ov5_021DD744(UnkStruct_ov5_021DD9C8 *param0, u8 param1, u16 param2, u8 param3, u8 param4); +static void ov5_021DD880(UnkStruct_ov5_021DD9C8 *param0); +static void ov5_021DD894(UnkStruct_ov5_021DD9C8 *param0, BGL *param1); +static void ov5_021DD8A4(SysTask *param0, void *param1); +static void ov5_021DD7A0(UnkStruct_ov5_021DD9C8 *param0, const int param1); +static void ov5_021DD980(UnkStruct_ov5_021DD9C8 *param0); +static void ov5_021DD954(UnkStruct_ov5_021DD9C8 *param0, const Strbuf *param1); -static void ov5_021DD6FC (void * param0, u16 param1, u16 param2) +static void ov5_021DD6FC(void *param0, u16 param1, u16 param2) { DC_FlushRange((void *)param0, param1 * 32); GX_LoadBGPltt((const void *)param0, param2 * 32, param1 * 32); } -static void ov5_021DD718 (UnkStruct_ov5_021DD9C8 * param0) +static void ov5_021DD718(UnkStruct_ov5_021DD9C8 *param0) { BGL_AddWindow(param0->unk_1C, ¶m0->unk_20, 3, 0, 0, 32, 5, 7, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (32 * 5))); } -static void ov5_021DD744 (UnkStruct_ov5_021DD9C8 * param0, u8 param1, u16 param2, u8 param3, u8 param4) +static void ov5_021DD744(UnkStruct_ov5_021DD9C8 *param0, u8 param1, u16 param2, u8 param3, u8 param4) { - void * v0; + void *v0; u32 v1; - NNSG2dPaletteData * v2; + NNSG2dPaletteData *v2; u8 v3; v3 = param0->unk_31 * 2; @@ -76,7 +75,7 @@ static void ov5_021DD744 (UnkStruct_ov5_021DD9C8 * param0, u8 param1, u16 param2 Heap_FreeToHeap(v0); } -static void ov5_021DD7A0 (UnkStruct_ov5_021DD9C8 * param0, const int param1) +static void ov5_021DD7A0(UnkStruct_ov5_021DD9C8 *param0, const int param1) { int v0; int v1; @@ -130,7 +129,7 @@ static void ov5_021DD7A0 (UnkStruct_ov5_021DD9C8 * param0, const int param1) } } -static void ov5_021DD880 (UnkStruct_ov5_021DD9C8 * param0) +static void ov5_021DD880(UnkStruct_ov5_021DD9C8 *param0) { param0->unk_00 = 0; param0->unk_04 = 0; @@ -142,17 +141,17 @@ static void ov5_021DD880 (UnkStruct_ov5_021DD9C8 * param0) param0->unk_1C = NULL; } -static void ov5_021DD894 (UnkStruct_ov5_021DD9C8 * param0, BGL * param1) +static void ov5_021DD894(UnkStruct_ov5_021DD9C8 *param0, BGL *param1) { ov5_021DD880(param0); param0->unk_1C = param1; } -static void ov5_021DD8A4 (SysTask * param0, void * param1) +static void ov5_021DD8A4(SysTask *param0, void *param1) { u16 v0[22]; u32 v1; - UnkStruct_ov5_021DD9C8 * v2 = (UnkStruct_ov5_021DD9C8 *)(param1); + UnkStruct_ov5_021DD9C8 *v2 = (UnkStruct_ov5_021DD9C8 *)(param1); switch (v2->unk_04) { case 1: @@ -210,7 +209,7 @@ static void ov5_021DD8A4 (SysTask * param0, void * param1) } } -static void ov5_021DD954 (UnkStruct_ov5_021DD9C8 * param0, const Strbuf *param1) +static void ov5_021DD954(UnkStruct_ov5_021DD9C8 *param0, const Strbuf *param1) { u32 v0; @@ -218,15 +217,15 @@ static void ov5_021DD954 (UnkStruct_ov5_021DD9C8 * param0, const Strbuf *param1) sub_0201D78C(¶m0->unk_20, 0, param1, param0->unk_30, (8 * 2), 0, v0, NULL); } -static void ov5_021DD980 (UnkStruct_ov5_021DD9C8 * param0) +static void ov5_021DD980(UnkStruct_ov5_021DD9C8 *param0) { param0->unk_04 = 2; param0->unk_10 = 0; } -UnkStruct_ov5_021DD9C8 * ov5_021DD98C (BGL * param0) +UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BGL *param0) { - UnkStruct_ov5_021DD9C8 * v0; + UnkStruct_ov5_021DD9C8 *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DD9C8)); v0->unk_40 = Strbuf_Init(22, 4); @@ -238,7 +237,7 @@ UnkStruct_ov5_021DD9C8 * ov5_021DD98C (BGL * param0) return v0; } -void ov5_021DD9C8 (UnkStruct_ov5_021DD9C8 * param0) +void ov5_021DD9C8(UnkStruct_ov5_021DD9C8 *param0) { MessageLoader_Free(param0->unk_3C); BGL_DeleteWindow(¶m0->unk_20); @@ -248,7 +247,7 @@ void ov5_021DD9C8 (UnkStruct_ov5_021DD9C8 * param0) param0 = NULL; } -void ov5_021DD9E8 (UnkStruct_ov5_021DD9C8 * param0, const int param1, const int param2) +void ov5_021DD9E8(UnkStruct_ov5_021DD9C8 *param0, const int param1, const int param2) { u16 v0[22]; u32 v1; @@ -289,7 +288,7 @@ void ov5_021DD9E8 (UnkStruct_ov5_021DD9C8 * param0, const int param1, const int } } -void ov5_021DDA78 (UnkStruct_ov5_021DD9C8 * param0) +void ov5_021DDA78(UnkStruct_ov5_021DD9C8 *param0) { if (param0->unk_08 != NULL) { SysTask_Done(param0->unk_08); @@ -299,12 +298,12 @@ void ov5_021DDA78 (UnkStruct_ov5_021DD9C8 * param0) sub_02019184(param0->unk_1C, 3, 3, 0); { - BGL * v0 = param0->unk_1C; + BGL *v0 = param0->unk_1C; ov5_021DD894(param0, v0); } } -void ov5_021DDAA4 (FieldSystem * fieldSystem) +void ov5_021DDAA4(FieldSystem *fieldSystem) { int v0; int v1; diff --git a/src/overlay005/ov5_021DDAE4.c b/src/overlay005/ov5_021DDAE4.c index 04b6cfc58e..4ba052f49a 100644 --- a/src/overlay005/ov5_021DDAE4.c +++ b/src/overlay005/ov5_021DDAE4.c @@ -1,3 +1,5 @@ +#include "overlay005/ov5_021DDAE4.h" + #include #include @@ -5,16 +7,15 @@ #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay024/ov24_02253CE0.h" +#include "overlay025/poketch_system.h" #include "game_overlay.h" +#include "heap.h" +#include "poketch_data.h" #include "unk_0200A784.h" #include "unk_0200A9DC.h" -#include "heap.h" #include "unk_020508D4.h" -#include "poketch_data.h" -#include "overlay005/ov5_021DDAE4.h" -#include "overlay024/ov24_02253CE0.h" -#include "overlay025/poketch_system.h" FS_EXTERN_OVERLAY(overlay24); FS_EXTERN_OVERLAY(overlay25); @@ -23,10 +24,10 @@ typedef struct { int unk_00; } UnkStruct_ov5_021DDBC8; -static BOOL ov5_021DDAE4 (TaskManager * param0) +static BOOL ov5_021DDAE4(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov5_021DDBC8 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov5_021DDBC8 *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { case 0: @@ -65,9 +66,9 @@ static BOOL ov5_021DDAE4 (TaskManager * param0) return 0; } -void ov5_021DDBC8 (TaskManager * param0) +void ov5_021DDBC8(TaskManager *param0) { - UnkStruct_ov5_021DDBC8 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov5_021DDBC8)); + UnkStruct_ov5_021DDBC8 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov5_021DDBC8)); v0->unk_00 = 0; FieldTask_Start(param0, ov5_021DDAE4, v0); diff --git a/src/overlay005/ov5_021DF440.c b/src/overlay005/ov5_021DF440.c index 598b4148a0..65d11f018f 100644 --- a/src/overlay005/ov5_021DF440.c +++ b/src/overlay005/ov5_021DF440.c @@ -1,42 +1,42 @@ +#include "overlay005/ov5_021DF440.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02020C44_decl.h" #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02022BD8_2_decl.h" #include "struct_decls/struct_02022BD8_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "struct_decls/struct_020711EC_decl.h" -#include "overlay005/struct_ov5_021F06D8_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "overlay005/const_ov5_021FF85C.h" - #include "struct_defs/struct_020217F4.h" #include "struct_defs/struct_02024184.h" -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" + +#include "field/field_system.h" +#include "overlay005/const_ov5_021FF85C.h" +#include "overlay005/ov5_021D521C.h" +#include "overlay005/ov5_021F067C.h" #include "overlay005/struct_ov5_021DF7F8.h" #include "overlay005/struct_ov5_021DF84C.h" #include "overlay005/struct_ov5_021EDDAC.h" +#include "overlay005/struct_ov5_021F06D8_decl.h" #include "overlay005/struct_ov5_021FF85C.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" +#include "heap.h" +#include "map_object.h" #include "narc.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" #include "unk_02020AEC.h" #include "unk_0202298C.h" #include "unk_0202414C.h" -#include "map_object.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021D521C.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F067C.h" typedef struct UnkStruct_ov5_021DF6AC_t UnkStruct_ov5_021DF6AC; typedef struct UnkStruct_ov5_021DF8FC_t UnkStruct_ov5_021DF8FC; @@ -47,16 +47,16 @@ typedef struct UnkStruct_ov5_021DF47C_t { u32 unk_04; u32 unk_08; u32 unk_0C; - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF6AC * unk_14; - NARC * unk_18; - UnkStruct_020711EC * unk_1C; - UnkStruct_ov5_021DF8FC * unk_20; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF6AC *unk_14; + NARC *unk_18; + UnkStruct_020711EC *unk_1C; + UnkStruct_ov5_021DF8FC *unk_20; } UnkStruct_ov5_021DF47C; typedef struct UnkStruct_ov5_021DF6AC_t { u32 unk_00; - void * unk_04; + void *unk_04; } UnkStruct_ov5_021DF6AC; typedef struct UnkStruct_ov5_021DF8FC_t { @@ -65,55 +65,55 @@ typedef struct UnkStruct_ov5_021DF8FC_t { u16 unk_06; u16 unk_08; u16 unk_0A; - UnkStruct_02020C44 * unk_0C; - UnkStruct_ov5_021F06D8 * unk_10; - UnkStruct_ov5_021F06D8 * unk_14; - UnkStruct_02022BD8 * unk_18; - UnkStruct_ov5_021DF8C8 * unk_1C; - UnkStruct_ov5_021DF84C * unk_20; + UnkStruct_02020C44 *unk_0C; + UnkStruct_ov5_021F06D8 *unk_10; + UnkStruct_ov5_021F06D8 *unk_14; + UnkStruct_02022BD8 *unk_18; + UnkStruct_ov5_021DF8C8 *unk_1C; + UnkStruct_ov5_021DF84C *unk_20; } UnkStruct_ov5_021DF8FC; typedef struct UnkStruct_ov5_021DF8C8_t { u32 unk_00; - UnkStruct_ov5_021DF84C * unk_04; + UnkStruct_ov5_021DF84C *unk_04; }; typedef struct { u32 unk_00; u32 unk_04; - UnkStruct_02022BD8 * unk_08; + UnkStruct_02022BD8 *unk_08; } UnkStruct_ov5_021DFA88; -static u32 ov5_021DF584(const UnkStruct_ov5_021DF47C * param0); -static void ov5_021DF588(UnkStruct_ov5_021DF47C * param0); -static void ov5_021DF59C(UnkStruct_ov5_021DF47C * param0); -static void ov5_021DF5E8(UnkStruct_ov5_021DF47C * param0); -static void ov5_021DF600(UnkStruct_ov5_021DF47C * param0, u32 param1); -static void ov5_021DF628(UnkStruct_ov5_021DF47C * param0, UnkStruct_ov5_021DF6AC * param1); -static void ov5_021DF644(UnkStruct_ov5_021DF47C * param0); -static UnkStruct_ov5_021DF6AC * ov5_021DF66C(UnkStruct_ov5_021DF47C * param0); -static UnkStruct_ov5_021DF6AC * ov5_021DF694(UnkStruct_ov5_021DF47C * param0, u32 param1); -static void ov5_021DF6AC(UnkStruct_ov5_021DF6AC * param0); -static void ov5_021DF6B8(UnkStruct_ov5_021DF6AC * param0, u32 param1, void * param2); -static int ov5_021DF6C0(const UnkStruct_ov5_021DF6AC * param0); -static const UnkStruct_ov5_021FF85C * ov5_021DF6D0(u32 param0); -static void ov5_021DF6F8(UnkStruct_ov5_021DF47C * param0); -static void ov5_021DF708(UnkStruct_ov5_021DF47C * param0); -static void ov5_021DF71C(UnkStruct_ov5_021DF47C * param0); -static void ov5_021DF754(UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -static void ov5_021DF7C4(UnkStruct_ov5_021DF47C * param0); -static void ov5_021DF8C8(UnkStruct_ov5_021DF47C * param0, UnkStruct_ov5_021DF8FC * param1, u32 param2); -static void ov5_021DF8FC(UnkStruct_ov5_021DF8FC * param0); -static UnkStruct_ov5_021DF84C * ov5_021DF9B4(UnkStruct_ov5_021DF8FC * param0, u32 param1); -static void ov5_021DF910(UnkStruct_ov5_021DF8FC * param0, u32 param1); -static UnkStruct_ov5_021DF84C * ov5_021DF930(UnkStruct_ov5_021DF8FC * param0, u32 param1, void * param2, UnkStruct_02024184 * param3, void * param4, UnkStruct_02022BD8_2 * param5, const UnkStruct_020217F4 * param6); -static void ov5_021DFA88(UnkStruct_ov5_021DF47C * param0, u32 param1, UnkStruct_02022BD8 * param2); -static void ov5_021DFAC0(SysTask * param0, void * param1); -static void ov5_021DFADC(SysTask * param0, void * param1); - -UnkStruct_ov5_021DF47C * ov5_021DF440 (FieldSystem * fieldSystem, u32 param1, u32 param2) -{ - UnkStruct_ov5_021DF47C * v0; +static u32 ov5_021DF584(const UnkStruct_ov5_021DF47C *param0); +static void ov5_021DF588(UnkStruct_ov5_021DF47C *param0); +static void ov5_021DF59C(UnkStruct_ov5_021DF47C *param0); +static void ov5_021DF5E8(UnkStruct_ov5_021DF47C *param0); +static void ov5_021DF600(UnkStruct_ov5_021DF47C *param0, u32 param1); +static void ov5_021DF628(UnkStruct_ov5_021DF47C *param0, UnkStruct_ov5_021DF6AC *param1); +static void ov5_021DF644(UnkStruct_ov5_021DF47C *param0); +static UnkStruct_ov5_021DF6AC *ov5_021DF66C(UnkStruct_ov5_021DF47C *param0); +static UnkStruct_ov5_021DF6AC *ov5_021DF694(UnkStruct_ov5_021DF47C *param0, u32 param1); +static void ov5_021DF6AC(UnkStruct_ov5_021DF6AC *param0); +static void ov5_021DF6B8(UnkStruct_ov5_021DF6AC *param0, u32 param1, void *param2); +static int ov5_021DF6C0(const UnkStruct_ov5_021DF6AC *param0); +static const UnkStruct_ov5_021FF85C *ov5_021DF6D0(u32 param0); +static void ov5_021DF6F8(UnkStruct_ov5_021DF47C *param0); +static void ov5_021DF708(UnkStruct_ov5_021DF47C *param0); +static void ov5_021DF71C(UnkStruct_ov5_021DF47C *param0); +static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +static void ov5_021DF7C4(UnkStruct_ov5_021DF47C *param0); +static void ov5_021DF8C8(UnkStruct_ov5_021DF47C *param0, UnkStruct_ov5_021DF8FC *param1, u32 param2); +static void ov5_021DF8FC(UnkStruct_ov5_021DF8FC *param0); +static UnkStruct_ov5_021DF84C *ov5_021DF9B4(UnkStruct_ov5_021DF8FC *param0, u32 param1); +static void ov5_021DF910(UnkStruct_ov5_021DF8FC *param0, u32 param1); +static UnkStruct_ov5_021DF84C *ov5_021DF930(UnkStruct_ov5_021DF8FC *param0, u32 param1, void *param2, UnkStruct_02024184 *param3, void *param4, UnkStruct_02022BD8_2 *param5, const UnkStruct_020217F4 *param6); +static void ov5_021DFA88(UnkStruct_ov5_021DF47C *param0, u32 param1, UnkStruct_02022BD8 *param2); +static void ov5_021DFAC0(SysTask *param0, void *param1); +static void ov5_021DFADC(SysTask *param0, void *param1); + +UnkStruct_ov5_021DF47C *ov5_021DF440(FieldSystem *fieldSystem, u32 param1, u32 param2) +{ + UnkStruct_ov5_021DF47C *v0; v0 = Heap_AllocFromHeap(param2, (sizeof(UnkStruct_ov5_021DF47C))); memset(v0, 0, (sizeof(UnkStruct_ov5_021DF47C))); @@ -129,18 +129,18 @@ UnkStruct_ov5_021DF47C * ov5_021DF440 (FieldSystem * fieldSystem, u32 param1, u3 return v0; } -void ov5_021DF47C (UnkStruct_ov5_021DF47C * param0, u32 param1) +void ov5_021DF47C(UnkStruct_ov5_021DF47C *param0, u32 param1) { param0->unk_08 = param1; ov5_021DF6F8(param0); } -void ov5_021DF488 (UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +void ov5_021DF488(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { ov5_021DF754(param0, param1, param2, param3, param4, param5, param6, param7, param8); } -void ov5_021DF4A8 (UnkStruct_ov5_021DF47C * param0, u32 param1) +void ov5_021DF4A8(UnkStruct_ov5_021DF47C *param0, u32 param1) { if (ov5_021DF694(param0, param1) != NULL) { GF_ASSERT(FALSE); @@ -150,7 +150,7 @@ void ov5_021DF4A8 (UnkStruct_ov5_021DF47C * param0, u32 param1) ov5_021DF600(param0, param1); } -void ov5_021DF4C8 (UnkStruct_ov5_021DF47C * param0, const u32 * param1) +void ov5_021DF4C8(UnkStruct_ov5_021DF47C *param0, const u32 *param1) { while ((*param1) != 34) { ov5_021DF4A8(param0, (*param1)); @@ -158,7 +158,7 @@ void ov5_021DF4C8 (UnkStruct_ov5_021DF47C * param0, const u32 * param1) } } -int ov5_021DF4E4 (UnkStruct_ov5_021DF47C * param0, u32 param1) +int ov5_021DF4E4(UnkStruct_ov5_021DF47C *param0, u32 param1) { if (ov5_021DF694(param0, param1) == NULL) { return 0; @@ -167,12 +167,12 @@ int ov5_021DF4E4 (UnkStruct_ov5_021DF47C * param0, u32 param1) return 1; } -void ov5_021DF4F8 (UnkStruct_ov5_021DF47C * param0) +void ov5_021DF4F8(UnkStruct_ov5_021DF47C *param0) { ov5_021DF71C(param0); } -void ov5_021DF500 (UnkStruct_ov5_021DF47C * param0) +void ov5_021DF500(UnkStruct_ov5_021DF47C *param0) { ov5_021DF708(param0); ov5_021DF644(param0); @@ -182,9 +182,9 @@ void ov5_021DF500 (UnkStruct_ov5_021DF47C * param0) Heap_FreeToHeap(param0); } -void * ov5_021DF528 (const UnkStruct_ov5_021DF47C * param0, u32 param1, int param2) +void *ov5_021DF528(const UnkStruct_ov5_021DF47C *param0, u32 param1, int param2) { - void * v0; + void *v0; if (param2 == 0) { v0 = Heap_AllocFromHeap(param0->unk_00, param1); @@ -195,22 +195,22 @@ void * ov5_021DF528 (const UnkStruct_ov5_021DF47C * param0, u32 param1, int para return v0; } -void * ov5_021DF53C (const UnkStruct_ov5_021DF47C * param0, u32 param1, int param2, u32 param3) +void *ov5_021DF53C(const UnkStruct_ov5_021DF47C *param0, u32 param1, int param2, u32 param3) { - void * v0 = ov5_021DF528(param0, param1, param2); + void *v0 = ov5_021DF528(param0, param1, param2); memset(v0, param3, param1); return v0; } -void ov5_021DF554 (void * param0) +void ov5_021DF554(void *param0) { Heap_FreeToHeap(param0); } -void * ov5_021DF55C (UnkStruct_ov5_021DF47C * param0, u32 param1) +void *ov5_021DF55C(UnkStruct_ov5_021DF47C *param0, u32 param1) { - UnkStruct_ov5_021DF6AC * v0 = ov5_021DF694(param0, param1); + UnkStruct_ov5_021DF6AC *v0 = ov5_021DF694(param0, param1); if (v0 == NULL) { GF_ASSERT(0); @@ -220,69 +220,70 @@ void * ov5_021DF55C (UnkStruct_ov5_021DF47C * param0, u32 param1) return v0->unk_04; } -FieldSystem * ov5_021DF574 (const UnkStruct_ov5_021DF47C * param0) +FieldSystem *ov5_021DF574(const UnkStruct_ov5_021DF47C *param0) { return param0->fieldSystem; } -UnkStruct_ov5_021DF47C * ov5_021DF578 (const MapObject * param0) +UnkStruct_ov5_021DF47C *ov5_021DF578(const MapObject *param0) { - FieldSystem * fieldSystem = MapObject_FieldSystem(param0); + FieldSystem *fieldSystem = MapObject_FieldSystem(param0); return (UnkStruct_ov5_021DF47C *)fieldSystem->unk_40; } -static u32 ov5_021DF584 (const UnkStruct_ov5_021DF47C * param0) +static u32 ov5_021DF584(const UnkStruct_ov5_021DF47C *param0) { return param0->unk_00; } -static void ov5_021DF588 (UnkStruct_ov5_021DF47C * param0) +static void ov5_021DF588(UnkStruct_ov5_021DF47C *param0) { param0->unk_18 = NARC_ctor(NARC_INDEX_DATA__MMODEL__FLDEFF, ov5_021DF584(param0)); } -static void ov5_021DF59C (UnkStruct_ov5_021DF47C * param0) +static void ov5_021DF59C(UnkStruct_ov5_021DF47C *param0) { NARC_dtor(param0->unk_18); } -u32 ov5_021DF5A8 (UnkStruct_ov5_021DF47C * param0, u32 param1) +u32 ov5_021DF5A8(UnkStruct_ov5_021DF47C *param0, u32 param1) { u32 v0 = NARC_GetMemberSize(param0->unk_18, param1); return v0; } -void ov5_021DF5B4 (UnkStruct_ov5_021DF47C * param0, u32 param1, void * param2) +void ov5_021DF5B4(UnkStruct_ov5_021DF47C *param0, u32 param1, void *param2) { NARC_ReadWholeMember(param0->unk_18, param1, param2); } -void * ov5_021DF5C0 (UnkStruct_ov5_021DF47C * param0, u32 param1, int param2) +void *ov5_021DF5C0(UnkStruct_ov5_021DF47C *param0, u32 param1, int param2) { u32 v0 = NARC_GetMemberSize(param0->unk_18, param1); - void * v1 = ov5_021DF528(param0, v0, param2); + void *v1 = ov5_021DF528(param0, v0, param2); NARC_ReadWholeMember(param0->unk_18, param1, v1); return v1; } -static void ov5_021DF5E8 (UnkStruct_ov5_021DF47C * param0) +static void ov5_021DF5E8(UnkStruct_ov5_021DF47C *param0) { u32 v0 = param0->unk_04; - UnkStruct_ov5_021DF6AC * v1 = param0->unk_14; + UnkStruct_ov5_021DF6AC *v1 = param0->unk_14; while (v0) { ov5_021DF6AC(v1); - v1++; v0--; + v1++; + v0--; } } -static void ov5_021DF600 (UnkStruct_ov5_021DF47C * param0, u32 param1) +static void ov5_021DF600(UnkStruct_ov5_021DF47C *param0, u32 param1) { - const UnkStruct_ov5_021FF85C * v0 = ov5_021DF6D0(param1); - void * v1; - UnkStruct_ov5_021DF6AC * v2; + const UnkStruct_ov5_021FF85C *v0 = ov5_021DF6D0(param1); + void *v1; + UnkStruct_ov5_021DF6AC *v2; v1 = v0->unk_04(param0); v2 = ov5_021DF66C(param0); @@ -290,74 +291,77 @@ static void ov5_021DF600 (UnkStruct_ov5_021DF47C * param0, u32 param1) ov5_021DF6B8(v2, param1, v1); } -static void ov5_021DF628 (UnkStruct_ov5_021DF47C * param0, UnkStruct_ov5_021DF6AC * param1) +static void ov5_021DF628(UnkStruct_ov5_021DF47C *param0, UnkStruct_ov5_021DF6AC *param1) { - const UnkStruct_ov5_021FF85C * v0 = ov5_021DF6D0(param1->unk_00); + const UnkStruct_ov5_021FF85C *v0 = ov5_021DF6D0(param1->unk_00); v0->unk_08(param1->unk_04); ov5_021DF6AC(param1); } -static void ov5_021DF644 (UnkStruct_ov5_021DF47C * param0) +static void ov5_021DF644(UnkStruct_ov5_021DF47C *param0) { u32 v0 = param0->unk_04; - UnkStruct_ov5_021DF6AC * v1 = param0->unk_14; + UnkStruct_ov5_021DF6AC *v1 = param0->unk_14; while (v0) { if (ov5_021DF6C0(v1) == 0) { ov5_021DF628(param0, v1); } - v1++; v0--; + v1++; + v0--; } } -static UnkStruct_ov5_021DF6AC * ov5_021DF66C (UnkStruct_ov5_021DF47C * param0) +static UnkStruct_ov5_021DF6AC *ov5_021DF66C(UnkStruct_ov5_021DF47C *param0) { u32 v0 = param0->unk_04; - UnkStruct_ov5_021DF6AC * v1 = param0->unk_14; + UnkStruct_ov5_021DF6AC *v1 = param0->unk_14; while (v0) { if (ov5_021DF6C0(v1) == 1) { return v1; } - v1++; v0--; + v1++; + v0--; } GF_ASSERT(FALSE); return NULL; } -static UnkStruct_ov5_021DF6AC * ov5_021DF694 (UnkStruct_ov5_021DF47C * param0, u32 param1) +static UnkStruct_ov5_021DF6AC *ov5_021DF694(UnkStruct_ov5_021DF47C *param0, u32 param1) { u32 v0 = param0->unk_04; - UnkStruct_ov5_021DF6AC * v1 = param0->unk_14; + UnkStruct_ov5_021DF6AC *v1 = param0->unk_14; while (v0) { if (v1->unk_00 == param1) { return v1; } - v1++; v0--; + v1++; + v0--; } return NULL; } -static void ov5_021DF6AC (UnkStruct_ov5_021DF6AC * param0) +static void ov5_021DF6AC(UnkStruct_ov5_021DF6AC *param0) { param0->unk_00 = 34; param0->unk_04 = NULL; } -static void ov5_021DF6B8 (UnkStruct_ov5_021DF6AC * param0, u32 param1, void * param2) +static void ov5_021DF6B8(UnkStruct_ov5_021DF6AC *param0, u32 param1, void *param2) { param0->unk_00 = param1; param0->unk_04 = param2; } -static int ov5_021DF6C0 (const UnkStruct_ov5_021DF6AC * param0) +static int ov5_021DF6C0(const UnkStruct_ov5_021DF6AC *param0) { if (param0->unk_00 == 34) { return 1; @@ -366,9 +370,9 @@ static int ov5_021DF6C0 (const UnkStruct_ov5_021DF6AC * param0) return 0; } -static const UnkStruct_ov5_021FF85C * ov5_021DF6D0 (u32 param0) +static const UnkStruct_ov5_021FF85C *ov5_021DF6D0(u32 param0) { - const UnkStruct_ov5_021FF85C * v0 = Unk_ov5_021FF85C; + const UnkStruct_ov5_021FF85C *v0 = Unk_ov5_021FF85C; while (v0->unk_00 != 34) { if (v0->unk_00 == param0) { @@ -382,12 +386,12 @@ static const UnkStruct_ov5_021FF85C * ov5_021DF6D0 (u32 param0) return NULL; } -static void ov5_021DF6F8 (UnkStruct_ov5_021DF47C * param0) +static void ov5_021DF6F8(UnkStruct_ov5_021DF47C *param0) { param0->unk_1C = sub_020711EC(param0->unk_00, param0->unk_08); } -static void ov5_021DF708 (UnkStruct_ov5_021DF47C * param0) +static void ov5_021DF708(UnkStruct_ov5_021DF47C *param0) { if (param0->unk_1C != NULL) { sub_0207121C(param0->unk_1C); @@ -395,17 +399,17 @@ static void ov5_021DF708 (UnkStruct_ov5_021DF47C * param0) } } -static void ov5_021DF71C (UnkStruct_ov5_021DF47C * param0) +static void ov5_021DF71C(UnkStruct_ov5_021DF47C *param0) { if (param0->unk_1C != NULL) { sub_020713D0(param0->unk_1C); } } -UnkStruct_ov101_021D5D90 * ov5_021DF72C (const UnkStruct_ov5_021DF47C * param0, const UnkStruct_ov101_021D86B0 * param1, const VecFx32 * param2, int param3, const void * param4, int param5) +UnkStruct_ov101_021D5D90 *ov5_021DF72C(const UnkStruct_ov5_021DF47C *param0, const UnkStruct_ov101_021D86B0 *param1, const VecFx32 *param2, int param3, const void *param4, int param5) { - UnkStruct_ov101_021D5D90 * v0; - UnkStruct_020711EC * v1; + UnkStruct_ov101_021D5D90 *v0; + UnkStruct_020711EC *v1; v1 = param0->unk_1C; v0 = sub_02071330(v1, param1, param2, param3, param4, param5); @@ -415,14 +419,14 @@ UnkStruct_ov101_021D5D90 * ov5_021DF72C (const UnkStruct_ov5_021DF47C * param0, return v0; } -void ov5_021DF74C (UnkStruct_ov101_021D5D90 * param0) +void ov5_021DF74C(UnkStruct_ov101_021D5D90 *param0) { sub_0207136C(param0); } -static void ov5_021DF754 (UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +static void ov5_021DF754(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { - UnkStruct_ov5_021DF8FC * v0; + UnkStruct_ov5_021DF8FC *v0; UnkStruct_ov5_021EDDAC v1; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021DF8FC)), 0, 0); @@ -444,9 +448,9 @@ static void ov5_021DF754 (UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param v0->unk_0C = sub_02020C44(&v1); } -static void ov5_021DF7C4 (UnkStruct_ov5_021DF47C * param0) +static void ov5_021DF7C4(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021DF8FC * v0 = param0->unk_20; + UnkStruct_ov5_021DF8FC *v0 = param0->unk_20; if (v0 != NULL) { sub_02020CCC(v0->unk_0C); @@ -460,12 +464,12 @@ static void ov5_021DF7C4 (UnkStruct_ov5_021DF47C * param0) } } -UnkStruct_020216E0 * ov5_021DF7F8 (UnkStruct_ov5_021DF47C * param0, const UnkStruct_ov5_021DF84C * param1, const VecFx32 * param2) +UnkStruct_020216E0 *ov5_021DF7F8(UnkStruct_ov5_021DF47C *param0, const UnkStruct_ov5_021DF84C *param1, const VecFx32 *param2) { UnkStruct_ov5_021DF7F8 v0; - UnkStruct_020216E0 * v1; - UnkStruct_02020C44 * v2; - VecFx32 v3 = {FX32_ONE, FX32_ONE, FX32_ONE}; + UnkStruct_020216E0 *v1; + UnkStruct_02020C44 *v2; + VecFx32 v3 = { FX32_ONE, FX32_ONE, FX32_ONE }; v2 = param0->unk_20->unk_0C; @@ -485,21 +489,21 @@ UnkStruct_020216E0 * ov5_021DF7F8 (UnkStruct_ov5_021DF47C * param0, const UnkStr return v1; } -UnkStruct_020216E0 * ov5_021DF84C (UnkStruct_ov5_021DF47C * param0, u32 param1, const VecFx32 * param2) +UnkStruct_020216E0 *ov5_021DF84C(UnkStruct_ov5_021DF47C *param0, u32 param1, const VecFx32 *param2) { - UnkStruct_ov5_021DF84C * v0; + UnkStruct_ov5_021DF84C *v0; v0 = ov5_021DF9B4(param0->unk_20, param1); return ov5_021DF7F8(param0, v0, param2); } -UnkStruct_ov5_021DF84C * ov5_021DF864 (UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2, u32 param3, u32 param4, int param5, const UnkStruct_020217F4 * param6) +UnkStruct_ov5_021DF84C *ov5_021DF864(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3, u32 param4, int param5, const UnkStruct_020217F4 *param6) { - void * v0, * v1, * v2; + void *v0, *v1, *v2; UnkStruct_02024184 v3; - UnkStruct_02022BD8_2 * v4; - UnkStruct_ov5_021DF84C * v5; - UnkStruct_ov5_021DF8FC * v6; + UnkStruct_02022BD8_2 *v4; + UnkStruct_ov5_021DF84C *v5; + UnkStruct_ov5_021DF8FC *v6; v6 = param0->unk_20; v0 = ov5_021F075C(v6->unk_10, param2); @@ -521,10 +525,10 @@ UnkStruct_ov5_021DF84C * ov5_021DF864 (UnkStruct_ov5_021DF47C * param0, u32 para return v5; } -static void ov5_021DF8C8 (UnkStruct_ov5_021DF47C * param0, UnkStruct_ov5_021DF8FC * param1, u32 param2) +static void ov5_021DF8C8(UnkStruct_ov5_021DF47C *param0, UnkStruct_ov5_021DF8FC *param1, u32 param2) { - UnkStruct_ov5_021DF84C * v0; - UnkStruct_ov5_021DF8C8 * v1; + UnkStruct_ov5_021DF84C *v0; + UnkStruct_ov5_021DF8C8 *v1; v0 = ov5_021DF528(param0, sizeof(UnkStruct_ov5_021DF84C) * param2, 0); param1->unk_20 = v0; @@ -541,37 +545,39 @@ static void ov5_021DF8C8 (UnkStruct_ov5_021DF47C * param0, UnkStruct_ov5_021DF8F } while (param2); } -static void ov5_021DF8FC (UnkStruct_ov5_021DF8FC * param0) +static void ov5_021DF8FC(UnkStruct_ov5_021DF8FC *param0) { ov5_021DF554(param0->unk_1C); ov5_021DF554(param0->unk_20); } -static void ov5_021DF910 (UnkStruct_ov5_021DF8FC * param0, u32 param1) +static void ov5_021DF910(UnkStruct_ov5_021DF8FC *param0, u32 param1) { u32 v0 = param0->unk_04; - UnkStruct_ov5_021DF8C8 * v1 = param0->unk_1C; + UnkStruct_ov5_021DF8C8 *v1 = param0->unk_1C; do { if (v1->unk_00 == param1) { - v1->unk_00 = 17; return; + v1->unk_00 = 17; + return; } - v1++; v0--; + v1++; + v0--; } while (v0); GF_ASSERT(FALSE); } -static UnkStruct_ov5_021DF84C * ov5_021DF930 (UnkStruct_ov5_021DF8FC * param0, u32 param1, void * param2, UnkStruct_02024184 * param3, void * param4, UnkStruct_02022BD8_2 * param5, const UnkStruct_020217F4 * param6) +static UnkStruct_ov5_021DF84C *ov5_021DF930(UnkStruct_ov5_021DF8FC *param0, u32 param1, void *param2, UnkStruct_02024184 *param3, void *param4, UnkStruct_02022BD8_2 *param5, const UnkStruct_020217F4 *param6) { - UnkStruct_ov5_021DF84C * v0; + UnkStruct_ov5_021DF84C *v0; v0 = NULL; { u32 v1 = param0->unk_04; - UnkStruct_ov5_021DF8C8 * v2 = param0->unk_1C; + UnkStruct_ov5_021DF8C8 *v2 = param0->unk_1C; do { if (v2->unk_00 == param1) { @@ -614,10 +620,10 @@ static UnkStruct_ov5_021DF84C * ov5_021DF930 (UnkStruct_ov5_021DF8FC * param0, u return v0; } -static UnkStruct_ov5_021DF84C * ov5_021DF9B4 (UnkStruct_ov5_021DF8FC * param0, u32 param1) +static UnkStruct_ov5_021DF84C *ov5_021DF9B4(UnkStruct_ov5_021DF8FC *param0, u32 param1) { u32 v0 = param0->unk_04; - UnkStruct_ov5_021DF8C8 * v1 = param0->unk_1C; + UnkStruct_ov5_021DF8C8 *v1 = param0->unk_1C; do { if (v1->unk_00 == param1) { @@ -632,64 +638,64 @@ static UnkStruct_ov5_021DF84C * ov5_021DF9B4 (UnkStruct_ov5_021DF8FC * param0, u return NULL; } -void ov5_021DF9D4 (UnkStruct_ov5_021DF47C * param0, u32 param1) +void ov5_021DF9D4(UnkStruct_ov5_021DF47C *param0, u32 param1) { - UnkStruct_ov5_021DF8FC * v0 = param0->unk_20; + UnkStruct_ov5_021DF8FC *v0 = param0->unk_20; ov5_021DF910(v0, param1); } -void ov5_021DF9E0 (UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2) +void ov5_021DF9E0(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2) { - UnkStruct_ov5_021DF8FC * v0 = param0->unk_20; + UnkStruct_ov5_021DF8FC *v0 = param0->unk_20; ov5_021F0784(v0->unk_10, param1, param0->unk_18, param2, 0); } -void * ov5_021DF9FC (UnkStruct_ov5_021DF47C * param0, u32 param1) +void *ov5_021DF9FC(UnkStruct_ov5_021DF47C *param0, u32 param1) { - UnkStruct_ov5_021DF8FC * v0 = param0->unk_20; - void * v1 = ov5_021F075C(v0->unk_10, param1); + UnkStruct_ov5_021DF8FC *v0 = param0->unk_20; + void *v1 = ov5_021F075C(v0->unk_10, param1); return v1; } -void ov5_021DFA08 (UnkStruct_ov5_021DF47C * param0, u32 param1) +void ov5_021DFA08(UnkStruct_ov5_021DF47C *param0, u32 param1) { - UnkStruct_ov5_021DF8FC * v0 = param0->unk_20; + UnkStruct_ov5_021DF8FC *v0 = param0->unk_20; ov5_021F0740(v0->unk_10, param1); } -void ov5_021DFA14 (UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2) +void ov5_021DFA14(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2) { - UnkStruct_ov5_021DF8FC * v0 = param0->unk_20; + UnkStruct_ov5_021DF8FC *v0 = param0->unk_20; ov5_021F0784(v0->unk_14, param1, param0->unk_18, param2, 0); } -void ov5_021DFA30 (UnkStruct_ov5_021DF47C * param0, u32 param1) +void ov5_021DFA30(UnkStruct_ov5_021DF47C *param0, u32 param1) { - UnkStruct_ov5_021DF8FC * v0 = param0->unk_20; + UnkStruct_ov5_021DF8FC *v0 = param0->unk_20; ov5_021F0740(v0->unk_14, param1); } -void ov5_021DFA3C (UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2, u32 param3) +void ov5_021DFA3C(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2, u32 param3) { - UnkStruct_ov5_021DF8FC * v0 = param0->unk_20; - void * v1 = ov5_021DF5C0(param0, param2, 1); - UnkStruct_02022BD8_2 * v2 = sub_02022C9C(v0->unk_18, v1, param1, param3, ov5_021DF584(param0)); + UnkStruct_ov5_021DF8FC *v0 = param0->unk_20; + void *v1 = ov5_021DF5C0(param0, param2, 1); + UnkStruct_02022BD8_2 *v2 = sub_02022C9C(v0->unk_18, v1, param1, param3, ov5_021DF584(param0)); GF_ASSERT(v2 != NULL); ov5_021DFA88(param0, param1, v0->unk_18); } -void ov5_021DFA7C (UnkStruct_ov5_021DF47C * param0, u32 param1) +void ov5_021DFA7C(UnkStruct_ov5_021DF47C *param0, u32 param1) { - UnkStruct_ov5_021DF8FC * v0 = param0->unk_20; + UnkStruct_ov5_021DF8FC *v0 = param0->unk_20; sub_02022D38(v0->unk_18, param1); } -static void ov5_021DFA88 (UnkStruct_ov5_021DF47C * param0, u32 param1, UnkStruct_02022BD8 * param2) +static void ov5_021DFA88(UnkStruct_ov5_021DF47C *param0, u32 param1, UnkStruct_02022BD8 *param2) { - UnkStruct_ov5_021DFA88 * v0 = ov5_021DF528(param0, (sizeof(UnkStruct_ov5_021DFA88)), 1); + UnkStruct_ov5_021DFA88 *v0 = ov5_021DF528(param0, (sizeof(UnkStruct_ov5_021DFA88)), 1); v0->unk_00 = 1; v0->unk_04 = param1; @@ -699,18 +705,18 @@ static void ov5_021DFA88 (UnkStruct_ov5_021DF47C * param0, u32 param1, UnkStruct SysTask_ExecuteAfterVBlank(ov5_021DFADC, v0, 0xff); } -static void ov5_021DFAC0 (SysTask * param0, void * param1) +static void ov5_021DFAC0(SysTask *param0, void *param1) { - UnkStruct_ov5_021DFA88 * v0 = param1; + UnkStruct_ov5_021DFA88 *v0 = param1; sub_02022E38(v0->unk_08, v0->unk_04); v0->unk_00 = 1; SysTask_Done(param0); } -static void ov5_021DFADC (SysTask * param0, void * param1) +static void ov5_021DFADC(SysTask *param0, void *param1) { - UnkStruct_ov5_021DFA88 * v0 = param1; + UnkStruct_ov5_021DFA88 *v0 = param1; if (v0->unk_00 == 1) { sub_02022EA0(v0->unk_08, v0->unk_04); @@ -719,18 +725,18 @@ static void ov5_021DFADC (SysTask * param0, void * param1) } } -void ov5_021DFB00 (UnkStruct_ov5_021DF47C * param0, UnkStruct_02073838 * param1, u32 param2, u32 param3, int param4) +void ov5_021DFB00(UnkStruct_ov5_021DF47C *param0, UnkStruct_02073838 *param1, u32 param2, u32 param3, int param4) { sub_0207389C(param1, param2, param0->unk_18, param3, param0->unk_00, param4); sub_020738EC(param1); } -void ov5_021DFB24 (UnkStruct_ov5_021DF47C * param0, UnkStruct_02073974 * param1, u32 param2, u32 param3, u32 param4) +void ov5_021DFB24(UnkStruct_ov5_021DF47C *param0, UnkStruct_02073974 *param1, u32 param2, u32 param3, u32 param4) { sub_020739B4(param1, param2, param0->unk_18, param3, param0->unk_00, param4); } -void ov5_021DFB40 (UnkStruct_ov5_021DF47C * param0, UnkStruct_02073974 * param1, const UnkStruct_02073838 * param2, UnkStruct_02073974 * param3, u32 param4) +void ov5_021DFB40(UnkStruct_ov5_021DF47C *param0, UnkStruct_02073974 *param1, const UnkStruct_02073838 *param2, UnkStruct_02073974 *param3, u32 param4) { sub_02073A6C(param1, param2, param3, param4, param0->unk_00); } diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index d6fae81bac..0391e8fa53 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -1,64 +1,64 @@ +#include "overlay005/ov5_021DFB54.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "pokemon.h" -#include "overlay005/struct_ov5_021D1BEC_decl.h" -#include "overlay009/struct_ov9_0224F6EC_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" #include "field/field_system.h" #include "overlay005/map_object_anim_cmd.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/ov5_021EB1A0.h" +#include "overlay005/ov5_021ECE40.h" +#include "overlay005/ov5_021F25C0.h" +#include "overlay005/ov5_021F2850.h" +#include "overlay005/ov5_021F8560.h" +#include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay006/battle_params.h" +#include "overlay006/ov6_02240C9C.h" +#include "overlay006/ov6_02243258.h" +#include "overlay006/ov6_02248050.h" +#include "overlay009/ov9_02249960.h" +#include "overlay009/struct_ov9_0224F6EC_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" -#include "unk_02005474.h" -#include "sys_task.h" +#include "core_sys.h" #include "heap.h" +#include "map_object.h" +#include "map_object_move.h" +#include "party.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "sys_task.h" #include "sys_task_manager.h" +#include "unk_02005474.h" #include "unk_0202CD50.h" #include "unk_020508D4.h" #include "unk_02050A74.h" #include "unk_020553DC.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" #include "unk_0205F180.h" -#include "map_object.h" -#include "map_object_move.h" #include "unk_020655F4.h" #include "unk_02071B10.h" -#include "party.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021DFB54.h" -#include "overlay005/ov5_021EB1A0.h" -#include "overlay005/ov5_021ECE40.h" -#include "overlay005/ov5_021F25C0.h" -#include "overlay005/ov5_021F2850.h" -#include "overlay005/ov5_021F8560.h" -#include "overlay006/ov6_02240C9C.h" -#include "overlay006/ov6_02243258.h" -#include "overlay006/ov6_02248050.h" -#include "overlay009/ov9_02249960.h" typedef struct { u32 unk_00; int unk_04; - Pokemon * unk_08; - SysTask * unk_0C; + Pokemon *unk_08; + SysTask *unk_0C; } UnkStruct_ov5_021E1050; typedef struct { int unk_00; int unk_04; - FieldSystem * fieldSystem; - PlayerAvatar * playerAvatar; - MapObject * unk_10; - UnkStruct_ov9_0224F6EC * unk_14; + FieldSystem *fieldSystem; + PlayerAvatar *playerAvatar; + MapObject *unk_10; + UnkStruct_ov9_0224F6EC *unk_14; } UnkStruct_ov5_021DFF88; typedef struct { @@ -66,31 +66,31 @@ typedef struct { int unk_04; int unk_08; UnkStruct_ov5_021E1050 unk_0C; - FieldSystem * fieldSystem; - PlayerAvatar * playerAvatar; - MapObject * unk_24; - UnkStruct_ov101_021D5D90 * unk_28; + FieldSystem *fieldSystem; + PlayerAvatar *playerAvatar; + MapObject *unk_24; + UnkStruct_ov101_021D5D90 *unk_28; } UnkStruct_ov5_021E00B0; typedef struct { int unk_00; int unk_04; - FieldSystem * fieldSystem; - PlayerAvatar * playerAvatar; - MapObject * unk_10; - UnkStruct_ov101_021D5D90 * unk_14; + FieldSystem *fieldSystem; + PlayerAvatar *playerAvatar; + MapObject *unk_10; + UnkStruct_ov101_021D5D90 *unk_14; } UnkStruct_ov5_021E0390; typedef struct { int unk_00; int unk_04; int unk_08; - FieldSystem * fieldSystem; - PlayerAvatar * playerAvatar; - MapObject * unk_14; - UnkStruct_ov101_021D5D90 * unk_18; + FieldSystem *fieldSystem; + PlayerAvatar *playerAvatar; + MapObject *unk_14; + UnkStruct_ov101_021D5D90 *unk_18; UnkStruct_ov5_021E1050 unk_1C; - UnkStruct_ov5_021D1BEC * unk_2C; + UnkStruct_ov5_021D1BEC *unk_2C; } UnkStruct_ov5_021F9B54; typedef struct { @@ -103,88 +103,88 @@ typedef struct { fx32 unk_18; VecFx32 unk_1C; VecFx32 unk_28; - FieldSystem * fieldSystem; - PlayerAvatar * playerAvatar; - MapObject * unk_3C; + FieldSystem *fieldSystem; + PlayerAvatar *playerAvatar; + MapObject *unk_3C; UnkStruct_ov5_021E1050 unk_40; - UnkStruct_ov5_021D1BEC * unk_50; + UnkStruct_ov5_021D1BEC *unk_50; } UnkStruct_ov5_021F9B10; typedef struct { int unk_00; int unk_04; - FieldSystem * fieldSystem; - PlayerAvatar * playerAvatar; + FieldSystem *fieldSystem; + PlayerAvatar *playerAvatar; } UnkStruct_ov5_021E0534; typedef struct { - FieldSystem * fieldSystem; - PlayerAvatar * playerAvatar; - MapObject * unk_08; + FieldSystem *fieldSystem; + PlayerAvatar *playerAvatar; + MapObject *unk_08; int unk_0C; int unk_10; - SysTask * unk_14; + SysTask *unk_14; } UnkStruct_ov5_021E0DE0; typedef struct { int unk_00; int unk_04; - FieldSystem * fieldSystem; - PlayerAvatar * playerAvatar; + FieldSystem *fieldSystem; + PlayerAvatar *playerAvatar; } UnkStruct_ov5_021E0FF0; -static int ov5_021DFE68(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3); -static int ov5_021DFEF4(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3); -static int ov5_021DFF1C(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3); -static void ov5_021DFF88(int param0, FieldSystem * param1, PlayerAvatar * playerAvatar, MapObject * param3); -static BOOL ov5_021DFFBC(TaskManager * param0); -static void ov5_021E00B0(FieldSystem * fieldSystem, int param1, const UnkStruct_ov5_021E1050 * param2); -static BOOL ov5_021E0160(TaskManager * param0); -static int ov5_021E032C(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3); -static void ov5_021E0390(int param0, FieldSystem * param1, PlayerAvatar * playerAvatar); -static BOOL ov5_021E03C8(TaskManager * param0); -static int ov5_021E04A8(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3); -static int ov5_021E04EC(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3); -static void ov5_021E0534(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar); -static BOOL ov5_021E0560(TaskManager * param0); -static int ov5_021E067C(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2); -static int ov5_021E06A8(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar); -static void ov5_021E06F8(FieldSystem * fieldSystem, int param1, const UnkStruct_ov5_021E1050 * param2); -static BOOL ov5_021E07A0(TaskManager * param0); -static UnkStruct_ov5_021F9B10 * ov5_021E0948(FieldSystem * fieldSystem, int param1, const UnkStruct_ov5_021E1050 * param2); -static BOOL ov5_021E09D4(TaskManager * param0); -static SysTask * ov5_021E0F54(FieldSystem * fieldSystem, u32 param1); -static void ov5_021E0FC0(SysTask * param0); -static void ov5_021E0FF0(SysTask * param0, void * param1); -static void ov5_021E1028(FieldSystem * fieldSystem, Pokemon * param1, UnkStruct_ov5_021E1050 * param2); -static void ov5_021E103C(FieldSystem * fieldSystem, UnkStruct_ov5_021E1050 * param1); -static int ov5_021E1050(UnkStruct_ov5_021E1050 * param0); -static void PlayerAvatar_Redraw(PlayerAvatar * playerAvatar, int param1); -static void ov5_021E10C0(void * param0, const UnkStruct_020216E0 * param1); -static MapObject * ov5_021E10D4(PlayerAvatar * playerAvatar, int param1); -static void * ov5_021E1110(int param0); -static void ov5_021E1134(void * param0); -static Pokemon * ov5_021E1140(FieldSystem * fieldSystem, int param1); -static void ov5_021E0DE0(FieldSystem * fieldSystem); -static BOOL ov5_021E0E10(TaskManager * param0); - -static void(*const sPlayerAvatarRequestStateTbl[10])(PlayerAvatar *); -int(*const Unk_ov5_021F9B54[])(UnkStruct_ov5_021F9B54 *); -int(*const Unk_ov5_021F9B10[])(UnkStruct_ov5_021F9B10 *); -int(*const Unk_ov5_021F9AFC[])(UnkStruct_ov5_021F9B10 *); - -void PlayerAvatar_SetRequestStateBit (PlayerAvatar * playerAvatar, u32 bit) +static int ov5_021DFE68(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3); +static int ov5_021DFEF4(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3); +static int ov5_021DFF1C(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3); +static void ov5_021DFF88(int param0, FieldSystem *param1, PlayerAvatar *playerAvatar, MapObject *param3); +static BOOL ov5_021DFFBC(TaskManager *param0); +static void ov5_021E00B0(FieldSystem *fieldSystem, int param1, const UnkStruct_ov5_021E1050 *param2); +static BOOL ov5_021E0160(TaskManager *param0); +static int ov5_021E032C(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3); +static void ov5_021E0390(int param0, FieldSystem *param1, PlayerAvatar *playerAvatar); +static BOOL ov5_021E03C8(TaskManager *param0); +static int ov5_021E04A8(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3); +static int ov5_021E04EC(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3); +static void ov5_021E0534(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar); +static BOOL ov5_021E0560(TaskManager *param0); +static int ov5_021E067C(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2); +static int ov5_021E06A8(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar); +static void ov5_021E06F8(FieldSystem *fieldSystem, int param1, const UnkStruct_ov5_021E1050 *param2); +static BOOL ov5_021E07A0(TaskManager *param0); +static UnkStruct_ov5_021F9B10 *ov5_021E0948(FieldSystem *fieldSystem, int param1, const UnkStruct_ov5_021E1050 *param2); +static BOOL ov5_021E09D4(TaskManager *param0); +static SysTask *ov5_021E0F54(FieldSystem *fieldSystem, u32 param1); +static void ov5_021E0FC0(SysTask *param0); +static void ov5_021E0FF0(SysTask *param0, void *param1); +static void ov5_021E1028(FieldSystem *fieldSystem, Pokemon *param1, UnkStruct_ov5_021E1050 *param2); +static void ov5_021E103C(FieldSystem *fieldSystem, UnkStruct_ov5_021E1050 *param1); +static int ov5_021E1050(UnkStruct_ov5_021E1050 *param0); +static void PlayerAvatar_Redraw(PlayerAvatar *playerAvatar, int param1); +static void ov5_021E10C0(void *param0, const UnkStruct_020216E0 *param1); +static MapObject *ov5_021E10D4(PlayerAvatar *playerAvatar, int param1); +static void *ov5_021E1110(int param0); +static void ov5_021E1134(void *param0); +static Pokemon *ov5_021E1140(FieldSystem *fieldSystem, int param1); +static void ov5_021E0DE0(FieldSystem *fieldSystem); +static BOOL ov5_021E0E10(TaskManager *param0); + +static void (*const sPlayerAvatarRequestStateTbl[10])(PlayerAvatar *); +int (*const Unk_ov5_021F9B54[])(UnkStruct_ov5_021F9B54 *); +int (*const Unk_ov5_021F9B10[])(UnkStruct_ov5_021F9B10 *); +int (*const Unk_ov5_021F9AFC[])(UnkStruct_ov5_021F9B10 *); + +void PlayerAvatar_SetRequestStateBit(PlayerAvatar *playerAvatar, u32 bit) { PlayerAvatar_TurnOnRequestStateBit(playerAvatar, bit); } -void PlayerAvatar_RequestChangeState (PlayerAvatar * playerAvatar) +void PlayerAvatar_RequestChangeState(PlayerAvatar *playerAvatar) { u32 state = 0; u32 flag = PlayerAvatar_RequestStateFlag(playerAvatar); do { - if ((flag & 0x1)) { + if (flag & 0x1) { sPlayerAvatarRequestStateTbl[state](playerAvatar); } @@ -194,7 +194,7 @@ void PlayerAvatar_RequestChangeState (PlayerAvatar * playerAvatar) PlayerAvatar_SetRequestStateFlag(playerAvatar, 0); } -static void PlayerAvatar_RequestStateWalking (PlayerAvatar * playerAvatar) +static void PlayerAvatar_RequestStateWalking(PlayerAvatar *playerAvatar) { int v0; int v1 = 0x0; @@ -202,8 +202,8 @@ static void PlayerAvatar_RequestStateWalking (PlayerAvatar * playerAvatar) if (PlayerAvatar_MapDistortionState(playerAvatar) != AVATAR_DISTORTION_STATE_NONE) { v1 = 0x18; } else { - MapObject * mapObj = Player_MapObject(playerAvatar); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + MapObject *mapObj = Player_MapObject(playerAvatar); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); if (sub_02071CB4(fieldSystem, 2) == 1) { v1 = 0x1c; @@ -217,7 +217,7 @@ static void PlayerAvatar_RequestStateWalking (PlayerAvatar * playerAvatar) PlayerAvatar_ClearSpeed(playerAvatar); { - UnkStruct_ov101_021D5D90 * v4 = sub_0205EC04(playerAvatar); + UnkStruct_ov101_021D5D90 *v4 = sub_0205EC04(playerAvatar); if (v4 != NULL) { ov5_021DF74C(v4); @@ -227,7 +227,7 @@ static void PlayerAvatar_RequestStateWalking (PlayerAvatar * playerAvatar) } } -static void PlayerAvatar_RequestStateCycle (PlayerAvatar * playerAvatar) +static void PlayerAvatar_RequestStateCycle(PlayerAvatar *playerAvatar) { int v0 = Player_MoveStateFromGender(PLAYER_STATE_CYCLING, PlayerAvatar_Gender(playerAvatar)); PlayerAvatar_Redraw(playerAvatar, v0); @@ -236,7 +236,7 @@ static void PlayerAvatar_RequestStateCycle (PlayerAvatar * playerAvatar) PlayerAvatar_ClearSpeed(playerAvatar); { - UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(playerAvatar); + UnkStruct_ov101_021D5D90 *v1 = sub_0205EC04(playerAvatar); if (v1 != NULL) { ov5_021DF74C(v1); @@ -248,13 +248,13 @@ static void PlayerAvatar_RequestStateCycle (PlayerAvatar * playerAvatar) Sound_PlayEffect(1560); } -static void PlayerAvatar_RequestStateSurf (PlayerAvatar * playerAvatar) +static void PlayerAvatar_RequestStateSurf(PlayerAvatar *playerAvatar) { int v0, v1; - MapObject * mapObj = Player_MapObject(playerAvatar); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + MapObject *mapObj = Player_MapObject(playerAvatar); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); enum AvatarDistortionState distortionState = PlayerAvatar_MapDistortionState(playerAvatar); - UnkStruct_ov101_021D5D90 * v5 = sub_0205EC04(playerAvatar); + UnkStruct_ov101_021D5D90 *v5 = sub_0205EC04(playerAvatar); if (v5 != NULL) { ov5_021DF74C(v5); @@ -285,12 +285,12 @@ static void PlayerAvatar_RequestStateSurf (PlayerAvatar * playerAvatar) PlayerAvatar_ClearSpeed(playerAvatar); } -static void ov5_021DFCE4 (PlayerAvatar * playerAvatar) +static void ov5_021DFCE4(PlayerAvatar *playerAvatar) { sub_0205EF6C(playerAvatar, 1); } -static void ov5_021DFCF0 (PlayerAvatar * playerAvatar) +static void ov5_021DFCF0(PlayerAvatar *playerAvatar) { int v0; @@ -298,7 +298,7 @@ static void ov5_021DFCF0 (PlayerAvatar * playerAvatar) PlayerAvatar_Redraw(playerAvatar, v0); } -static void ov5_021DFD0C (PlayerAvatar * playerAvatar) +static void ov5_021DFD0C(PlayerAvatar *playerAvatar) { int v0; @@ -306,7 +306,7 @@ static void ov5_021DFD0C (PlayerAvatar * playerAvatar) PlayerAvatar_Redraw(playerAvatar, v0); } -static void PlayerAvatar_RequestStatePoketch (PlayerAvatar * playerAvatar) +static void PlayerAvatar_RequestStatePoketch(PlayerAvatar *playerAvatar) { int v0; int v1 = 0x14; @@ -314,8 +314,8 @@ static void PlayerAvatar_RequestStatePoketch (PlayerAvatar * playerAvatar) if (PlayerAvatar_MapDistortionState(playerAvatar) != AVATAR_DISTORTION_STATE_NONE) { v1 = 0x1b; } else { - MapObject * mapObj = Player_MapObject(playerAvatar); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + MapObject *mapObj = Player_MapObject(playerAvatar); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); if (sub_02071CB4(fieldSystem, 2) == 1) { v1 = 0x1e; @@ -326,7 +326,7 @@ static void PlayerAvatar_RequestStatePoketch (PlayerAvatar * playerAvatar) PlayerAvatar_Redraw(playerAvatar, v0); } -static void PlayerAvatar_RequestStateSave (PlayerAvatar * playerAvatar) +static void PlayerAvatar_RequestStateSave(PlayerAvatar *playerAvatar) { int v0; int v1 = 0x15; @@ -334,8 +334,8 @@ static void PlayerAvatar_RequestStateSave (PlayerAvatar * playerAvatar) if (PlayerAvatar_MapDistortionState(playerAvatar) != AVATAR_DISTORTION_STATE_NONE) { v1 = 0x1a; } else { - MapObject * mapObj = Player_MapObject(playerAvatar); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + MapObject *mapObj = Player_MapObject(playerAvatar); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); if (sub_02071CB4(fieldSystem, 2) == 1) { v1 = 0x1d; @@ -346,7 +346,7 @@ static void PlayerAvatar_RequestStateSave (PlayerAvatar * playerAvatar) PlayerAvatar_Redraw(playerAvatar, v0); } -static void ov5_021DFDA8 (PlayerAvatar * playerAvatar) +static void ov5_021DFDA8(PlayerAvatar *playerAvatar) { int v0; @@ -354,7 +354,7 @@ static void ov5_021DFDA8 (PlayerAvatar * playerAvatar) PlayerAvatar_Redraw(playerAvatar, v0); } -static void ov5_021DFDC4 (PlayerAvatar * playerAvatar) +static void ov5_021DFDC4(PlayerAvatar *playerAvatar) { int v0; @@ -362,7 +362,7 @@ static void ov5_021DFDC4 (PlayerAvatar * playerAvatar) PlayerAvatar_Redraw(playerAvatar, v0); } -static void(*const sPlayerAvatarRequestStateTbl[10])(PlayerAvatar *) = { +static void (*const sPlayerAvatarRequestStateTbl[10])(PlayerAvatar *) = { PlayerAvatar_RequestStateWalking, PlayerAvatar_RequestStateCycle, PlayerAvatar_RequestStateSurf, @@ -375,10 +375,10 @@ static void(*const sPlayerAvatarRequestStateTbl[10])(PlayerAvatar *) = { ov5_021DFDC4 }; -int ov5_021DFDE0 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int dir, int param3) +int ov5_021DFDE0(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int dir, int param3) { { - MapObject * v0; + MapObject *v0; GF_ASSERT(playerAvatar != NULL); v0 = Player_MapObject(playerAvatar); @@ -412,23 +412,23 @@ int ov5_021DFDE0 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int di return 0; } -static int ov5_021DFE68 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3) +static int ov5_021DFE68(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3) { int v0 = sub_02061434(playerAvatar, param2); - if ((param3 & 1 << 2)) { + if (param3 & 1 << 2) { if (ov9_0224A59C(fieldSystem, param2) == 1) { return 1; } } - if ((param3 & 1 << 0)) { + if (param3 & 1 << 0) { if (ov5_021DFF1C(fieldSystem, playerAvatar, param2, v0) == 1) { return 1; } } - if ((param3 & 1 << 1)) { + if (param3 & 1 << 1) { if (ov5_021E04A8(fieldSystem, playerAvatar, param2, v0) == 1) { return 1; } @@ -445,7 +445,7 @@ static int ov5_021DFE68 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, return 0; } -static int ov5_021DFEF4 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3) +static int ov5_021DFEF4(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3) { int v0 = sub_02061434(playerAvatar, param2); @@ -456,14 +456,14 @@ static int ov5_021DFEF4 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, return 0; } -static int ov5_021DFF1C (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3) +static int ov5_021DFF1C(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3) { if (param3 != 1) { return 0; } { - MapObject * mapObj = ov5_021E10D4(playerAvatar, param2); + MapObject *mapObj = ov5_021E10D4(playerAvatar, param2); if (mapObj == NULL) { return 0; @@ -498,9 +498,9 @@ static int ov5_021DFF1C (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, } } -static void ov5_021DFF88 (int param0, FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, MapObject * param3) +static void ov5_021DFF88(int param0, FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, MapObject *param3) { - UnkStruct_ov5_021DFF88 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021DFF88))); + UnkStruct_ov5_021DFF88 *v0 = ov5_021E1110(sizeof(UnkStruct_ov5_021DFF88)); v0->unk_04 = param0; v0->fieldSystem = fieldSystem; @@ -511,11 +511,11 @@ static void ov5_021DFF88 (int param0, FieldSystem * fieldSystem, PlayerAvatar * sub_0202CF28(sub_0202CD88(fieldSystem->saveData), (1 + 54)); } -static BOOL ov5_021DFFBC (TaskManager * param0) +static BOOL ov5_021DFFBC(TaskManager *param0) { - UnkStruct_ov5_021DFF88 * v0 = TaskManager_Environment(param0); - MapObject * v1 = Player_MapObject(v0->playerAvatar); - MapObject * v2 = v0->unk_10; + UnkStruct_ov5_021DFF88 *v0 = TaskManager_Environment(param0); + MapObject *v1 = Player_MapObject(v0->playerAvatar); + MapObject *v2 = v0->unk_10; switch (v0->unk_00) { case 0: @@ -576,9 +576,9 @@ static BOOL ov5_021DFFBC (TaskManager * param0) return 0; } -static void ov5_021E00B0 (FieldSystem * fieldSystem, int param1, const UnkStruct_ov5_021E1050 * param2) +static void ov5_021E00B0(FieldSystem *fieldSystem, int param1, const UnkStruct_ov5_021E1050 *param2) { - UnkStruct_ov5_021E00B0 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E00B0))); + UnkStruct_ov5_021E00B0 *v0 = ov5_021E1110(sizeof(UnkStruct_ov5_021E00B0)); v0->unk_04 = param1; v0->fieldSystem = fieldSystem; @@ -589,19 +589,19 @@ static void ov5_021E00B0 (FieldSystem * fieldSystem, int param1, const UnkStruct FieldTask_Start(fieldSystem->unk_10, ov5_021E0160, v0); } -void ov5_021E00EC (TaskManager * taskMan, int param1, int param2) +void ov5_021E00EC(TaskManager *taskMan, int param1, int param2) { UnkStruct_ov5_021E1050 v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - Pokemon * v2 = ov5_021E1140(fieldSystem, param2); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + Pokemon *v2 = ov5_021E1140(fieldSystem, param2); ov5_021E1028(fieldSystem, v2, &v0); ov5_021E00B0(fieldSystem, param1, &v0); } -int ov5_021E0118 (PlayerAvatar * playerAvatar, u32 param1, u32 param2) +int ov5_021E0118(PlayerAvatar *playerAvatar, u32 param1, u32 param2) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); if (sub_0205DB58(param2) == 1) { if ((sub_0205DEFC(param1) == 1) || (sub_0205DEF0(param1) == 1)) { @@ -616,9 +616,9 @@ int ov5_021E0118 (PlayerAvatar * playerAvatar, u32 param1, u32 param2) return 0; } -static BOOL ov5_021E0160 (TaskManager * taskMan) +static BOOL ov5_021E0160(TaskManager *taskMan) { - UnkStruct_ov5_021E00B0 * v0 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021E00B0 *v0 = TaskManager_Environment(taskMan); switch (v0->unk_00) { case 0: @@ -639,15 +639,14 @@ static BOOL ov5_021E0160 (TaskManager * taskMan) v0->unk_00++; } break; - case 2: - { + case 2: { if (PlayerAvatar_MapDistortionState(v0->playerAvatar) == AVATAR_DISTORTION_STATE_NONE) { int v1 = Player_GetXPos(v0->playerAvatar) + MapObject_GetDxFromDir(v0->unk_04); int v2 = Player_GetZPos(v0->playerAvatar) + MapObject_GetDyFromDir(v0->unk_04); v0->unk_28 = ov5_021F261C(v0->unk_24, v1, v2, v0->unk_04, 0); } else { int v3 = MapObject_GetXPos(v0->unk_24); - int v4 = ((MapObject_GetYPos(v0->unk_24) / 2)); + int v4 = (MapObject_GetYPos(v0->unk_24) / 2); int v5 = MapObject_GetZPos(v0->unk_24); enum AvatarDistortionState distortionState = PlayerAvatar_MapDistortionState(v0->playerAvatar); @@ -704,7 +703,7 @@ static BOOL ov5_021E0160 (TaskManager * taskMan) return 0; } -static int ov5_021E032C (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3) +static int ov5_021E032C(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3) { if ((param3 != 1) || (PlayerAvatar_GetPlayerState(playerAvatar) != 0x2)) { return 0; @@ -712,7 +711,7 @@ static int ov5_021E032C (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, { u32 v0; - MapObject * v1 = Player_MapObject(playerAvatar); + MapObject *v1 = Player_MapObject(playerAvatar); if (PlayerAvatar_DistortionGravityChanged(playerAvatar) == FALSE) { v0 = sub_02060B7C(playerAvatar, v1, param2); @@ -735,9 +734,9 @@ static int ov5_021E032C (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, return 1; } -static void ov5_021E0390 (int param0, FieldSystem * fieldSystem, PlayerAvatar * param2) +static void ov5_021E0390(int param0, FieldSystem *fieldSystem, PlayerAvatar *param2) { - UnkStruct_ov5_021E0390 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0390))); + UnkStruct_ov5_021E0390 *v0 = ov5_021E1110(sizeof(UnkStruct_ov5_021E0390)); v0->unk_04 = param0; v0->fieldSystem = fieldSystem; @@ -748,9 +747,9 @@ static void ov5_021E0390 (int param0, FieldSystem * fieldSystem, PlayerAvatar * FieldTask_Set(fieldSystem, ov5_021E03C8, v0); } -static BOOL ov5_021E03C8 (TaskManager * param0) +static BOOL ov5_021E03C8(TaskManager *param0) { - UnkStruct_ov5_021E0390 * v0 = TaskManager_Environment(param0); + UnkStruct_ov5_021E0390 *v0 = TaskManager_Environment(param0); switch (v0->unk_00) { case 0: @@ -798,7 +797,7 @@ static BOOL ov5_021E03C8 (TaskManager * param0) return 0; } -static int ov5_021E04A8 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3) +static int ov5_021E04A8(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3) { if ((param2 != 1) || (param3 != 1) || (PlayerAvatar_GetPlayerState(playerAvatar) != 0x2)) { return 0; @@ -816,14 +815,14 @@ static int ov5_021E04A8 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, return 1; } -static int ov5_021E04EC (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3) +static int ov5_021E04EC(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2, int param3) { if (PlayerAvatar_IsNotInDeepSwamp(playerAvatar) == 1) { return 0; } { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); u8 v1 = sub_02062BE8(v0); if ((sub_0205DCF0(v1) != 1) && (sub_0205DD0C(v1) != 1)) { @@ -835,9 +834,9 @@ static int ov5_021E04EC (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, return 1; } -static void ov5_021E0534 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar) +static void ov5_021E0534(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar) { - UnkStruct_ov5_021E0534 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0534))); + UnkStruct_ov5_021E0534 *v0 = ov5_021E1110(sizeof(UnkStruct_ov5_021E0534)); v0->fieldSystem = fieldSystem; v0->playerAvatar = playerAvatar; @@ -846,10 +845,10 @@ static void ov5_021E0534 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar sub_0202CF28(sub_0202CD88(fieldSystem->saveData), (1 + 55)); } -static BOOL ov5_021E0560 (TaskManager * param0) +static BOOL ov5_021E0560(TaskManager *param0) { - UnkStruct_ov5_021E0534 * v0 = TaskManager_Environment(param0); - MapObject * v1 = Player_MapObject(v0->playerAvatar); + UnkStruct_ov5_021E0534 *v0 = TaskManager_Environment(param0); + MapObject *v1 = Player_MapObject(v0->playerAvatar); switch (v0->unk_00) { case 0: @@ -870,8 +869,7 @@ static BOOL ov5_021E0560 (TaskManager * param0) } v0->unk_00++; - case 2: - { + case 2: { int v2 = PlayerAvatar_GetDir(v0->playerAvatar); u32 v3, v4 = gCoreSys.pressedKeys, v5 = gCoreSys.heldKeys; int v6 = sub_02061308(v0->playerAvatar, v4, v5); @@ -887,8 +885,8 @@ static BOOL ov5_021E0560 (TaskManager * param0) u8 v7 = sub_02062BE8(v1); if (sub_0205DD0C(v7) == 1) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - BattleParams * v9; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + BattleParams *v9; if (ov6_022413E4(fieldSystem, &v9) == 1) { PlayerAvatar_SetInDeepSwamp(v0->playerAvatar, 1); @@ -908,16 +906,15 @@ static BOOL ov5_021E0560 (TaskManager * param0) v3 = sub_02065838(v6, v3); PlayerAvatar_SetAnimationCode(v0->playerAvatar, v3, 1); - } - break; + } break; } return 0; } -static int ov5_021E067C (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2) +static int ov5_021E067C(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); if (LocalMapObj_IsAnimationSet(v0) == 0) { return 0; @@ -930,7 +927,7 @@ static int ov5_021E067C (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, return 0; } -static int ov5_021E06A8 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar) +static int ov5_021E06A8(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar) { if (PlayerAvatar_Speed(playerAvatar) < 1) { return 0; @@ -938,7 +935,7 @@ static int ov5_021E06A8 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar) { int v0 = PlayerAvatar_GetMoveDir(playerAvatar); - MapObject * v1 = ov5_021E10D4(playerAvatar, v0); + MapObject *v1 = ov5_021E10D4(playerAvatar, v0); if (v1 == NULL) { return 0; @@ -960,9 +957,9 @@ static int ov5_021E06A8 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar) return 0; } -static void ov5_021E06F8 (FieldSystem * fieldSystem, int param1, const UnkStruct_ov5_021E1050 * param2) +static void ov5_021E06F8(FieldSystem *fieldSystem, int param1, const UnkStruct_ov5_021E1050 *param2) { - UnkStruct_ov5_021F9B54 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021F9B54))); + UnkStruct_ov5_021F9B54 *v0 = ov5_021E1110(sizeof(UnkStruct_ov5_021F9B54)); v0->unk_04 = param1; v0->fieldSystem = fieldSystem; @@ -973,17 +970,17 @@ static void ov5_021E06F8 (FieldSystem * fieldSystem, int param1, const UnkStruct FieldTask_Start(fieldSystem->unk_10, ov5_021E07A0, v0); } -void ov5_021E0734 (TaskManager * param0, int param1, int param2) +void ov5_021E0734(TaskManager *param0, int param1, int param2) { UnkStruct_ov5_021E1050 v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - Pokemon * v2 = ov5_021E1140(fieldSystem, param2); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + Pokemon *v2 = ov5_021E1140(fieldSystem, param2); ov5_021E1028(fieldSystem, v2, &v0); ov5_021E06F8(fieldSystem, param1, &v0); } -int ov5_021E0760 (u32 param0, int param1) +int ov5_021E0760(u32 param0, int param1) { switch (param1) { case 0: @@ -1003,10 +1000,10 @@ int ov5_021E0760 (u32 param0, int param1) return 0; } -static BOOL ov5_021E07A0 (TaskManager * param0) +static BOOL ov5_021E07A0(TaskManager *param0) { int v0; - UnkStruct_ov5_021F9B54 * v1 = TaskManager_Environment(param0); + UnkStruct_ov5_021F9B54 *v1 = TaskManager_Environment(param0); do { v0 = Unk_ov5_021F9B54[v1->unk_00](v1); @@ -1019,24 +1016,24 @@ static BOOL ov5_021E07A0 (TaskManager * param0) return (BOOL)v0; } -static int ov5_021E07CC (UnkStruct_ov5_021F9B54 * param0) +static int ov5_021E07CC(UnkStruct_ov5_021F9B54 *param0) { ov5_021E103C(param0->fieldSystem, ¶m0->unk_1C); param0->unk_00++; - return(0); + return 0; } -static int ov5_021E07E4 (UnkStruct_ov5_021F9B54 * param0) +static int ov5_021E07E4(UnkStruct_ov5_021F9B54 *param0) { if (ov5_021E1050(¶m0->unk_1C) == 1) { param0->unk_00++; } - return(0); + return 0; } -static int ov5_021E07FC (UnkStruct_ov5_021F9B54 * param0) +static int ov5_021E07FC(UnkStruct_ov5_021F9B54 *param0) { int v0 = Player_GetXPos(param0->playerAvatar) + MapObject_GetDxFromDir(param0->unk_04); int v1 = Player_GetZPos(param0->playerAvatar) + MapObject_GetDyFromDir(param0->unk_04); @@ -1047,10 +1044,10 @@ static int ov5_021E07FC (UnkStruct_ov5_021F9B54 * param0) Sound_PlayEffect(1575); param0->unk_00++; - return(0); + return 0; } -static int ov5_021E0850 (UnkStruct_ov5_021F9B54 * param0) +static int ov5_021E0850(UnkStruct_ov5_021F9B54 *param0) { if (LocalMapObj_IsAnimationSet(param0->unk_14) == 1) { int v0 = sub_02065838(param0->unk_04, 0x34); @@ -1059,20 +1056,20 @@ static int ov5_021E0850 (UnkStruct_ov5_021F9B54 * param0) param0->unk_00++; } - return(0); + return 0; } -static int ov5_021E0878 (UnkStruct_ov5_021F9B54 * param0) +static int ov5_021E0878(UnkStruct_ov5_021F9B54 *param0) { if (LocalMapObj_CheckAnimationFinished(param0->unk_14) == 1) { param0->unk_00++; ov5_021F2974(param0->unk_18, 1); } - return(0); + return 0; } -static int ov5_021E0898 (UnkStruct_ov5_021F9B54 * param0) +static int ov5_021E0898(UnkStruct_ov5_021F9B54 *param0) { if (LocalMapObj_IsAnimationSet(param0->unk_14) == 1) { int v0 = sub_02065838(param0->unk_04, 0x10); @@ -1081,13 +1078,13 @@ static int ov5_021E0898 (UnkStruct_ov5_021F9B54 * param0) param0->unk_00++; } - return(0); + return 0; } -static int ov5_021E08C0 (UnkStruct_ov5_021F9B54 * param0) +static int ov5_021E08C0(UnkStruct_ov5_021F9B54 *param0) { if (LocalMapObj_CheckAnimationFinished(param0->unk_14) == 0) { - return(0); + return 0; } { @@ -1096,7 +1093,7 @@ static int ov5_021E08C0 (UnkStruct_ov5_021F9B54 * param0) if (ov5_021E0760(v1, v0) == 1) { param0->unk_00 = 5; - return(1 + 1); + return 1 + 1; } } @@ -1112,21 +1109,21 @@ static int ov5_021E08C0 (UnkStruct_ov5_021F9B54 * param0) ov6_02248940(param0->unk_2C); param0->unk_2C = NULL; - return(0); + return 0; } -static int ov5_021E0924 (UnkStruct_ov5_021F9B54 * param0) +static int ov5_021E0924(UnkStruct_ov5_021F9B54 *param0) { if (LocalMapObj_CheckAnimationFinished(param0->unk_14) == 0) { - return(0); + return 0; } sub_020656AC(param0->unk_14); ov5_021DF74C(param0->unk_18); - return(1); + return 1; } -static int(*const Unk_ov5_021F9B54[])(UnkStruct_ov5_021F9B54 *) = { +static int (*const Unk_ov5_021F9B54[])(UnkStruct_ov5_021F9B54 *) = { ov5_021E07CC, ov5_021E07E4, ov5_021E07FC, @@ -1137,9 +1134,9 @@ static int(*const Unk_ov5_021F9B54[])(UnkStruct_ov5_021F9B54 *) = { ov5_021E0924 }; -static UnkStruct_ov5_021F9B10 * ov5_021E0948 (FieldSystem * fieldSystem, int param1, const UnkStruct_ov5_021E1050 * param2) +static UnkStruct_ov5_021F9B10 *ov5_021E0948(FieldSystem *fieldSystem, int param1, const UnkStruct_ov5_021E1050 *param2) { - UnkStruct_ov5_021F9B10 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021F9B10))); + UnkStruct_ov5_021F9B10 *v0 = ov5_021E1110(sizeof(UnkStruct_ov5_021F9B10)); v0->unk_04 = param1; v0->fieldSystem = fieldSystem; @@ -1153,30 +1150,30 @@ static UnkStruct_ov5_021F9B10 * ov5_021E0948 (FieldSystem * fieldSystem, int par return v0; } -void ov5_021E097C (FieldSystem * fieldSystem, int param1) +void ov5_021E097C(FieldSystem *fieldSystem, int param1) { - UnkStruct_ov5_021F9B10 * v0 = ov5_021E0948(fieldSystem, param1, NULL); + UnkStruct_ov5_021F9B10 *v0 = ov5_021E0948(fieldSystem, param1, NULL); FieldTask_Set(fieldSystem, ov5_021E09D4, v0); } -void ov5_021E0998 (TaskManager * param0, int param1, int param2) +void ov5_021E0998(TaskManager *param0, int param1, int param2) { UnkStruct_ov5_021E1050 v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - Pokemon * v2 = ov5_021E1140(fieldSystem, param2); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + Pokemon *v2 = ov5_021E1140(fieldSystem, param2); ov5_021E1028(fieldSystem, v2, &v0); { - UnkStruct_ov5_021F9B10 * v3 = ov5_021E0948(fieldSystem, param1, &v0); + UnkStruct_ov5_021F9B10 *v3 = ov5_021E0948(fieldSystem, param1, &v0); FieldTask_Start(param0, ov5_021E09D4, v3); } } -static BOOL ov5_021E09D4 (TaskManager * param0) +static BOOL ov5_021E09D4(TaskManager *param0) { int v0; - UnkStruct_ov5_021F9B10 * v1 = TaskManager_Environment(param0); + UnkStruct_ov5_021F9B10 *v1 = TaskManager_Environment(param0); do { if (v1->unk_04 == 0) { @@ -1194,29 +1191,29 @@ static BOOL ov5_021E09D4 (TaskManager * param0) return 0; } -static int ov5_021E0A1C (UnkStruct_ov5_021F9B10 * param0) +static int ov5_021E0A1C(UnkStruct_ov5_021F9B10 *param0) { if (param0->unk_40.unk_00 == 1) { ov5_021E103C(param0->fieldSystem, ¶m0->unk_40); param0->unk_00++; - return(0); + return 0; } param0->unk_00 = 2; - return(1); + return 1; } -static int ov5_021E0A44 (UnkStruct_ov5_021F9B10 * param0) +static int ov5_021E0A44(UnkStruct_ov5_021F9B10 *param0) { if (ov5_021E1050(¶m0->unk_40) == 1) { Sound_PlayEffect(1613); param0->unk_00++; } - return(0); + return 0; } -static int ov5_021E0A68 (UnkStruct_ov5_021F9B10 * param0) +static int ov5_021E0A68(UnkStruct_ov5_021F9B10 *param0) { int v0, v1; VecFx32 v2, v3; @@ -1246,10 +1243,10 @@ static int ov5_021E0A68 (UnkStruct_ov5_021F9B10 * param0) param0->unk_50 = ov6_022485F4(param0->fieldSystem); param0->unk_00++; - return(0); + return 0; } -static int ov5_021E0B24 (UnkStruct_ov5_021F9B10 * param0) +static int ov5_021E0B24(UnkStruct_ov5_021F9B10 *param0) { VecFx32 v0; @@ -1270,10 +1267,10 @@ static int ov5_021E0B24 (UnkStruct_ov5_021F9B10 * param0) param0->unk_00++; } - return(0); + return 0; } -static int ov5_021E0B64 (UnkStruct_ov5_021F9B10 * param0) +static int ov5_021E0B64(UnkStruct_ov5_021F9B10 *param0) { VecFx32 v0; @@ -1296,7 +1293,7 @@ static int ov5_021E0B64 (UnkStruct_ov5_021F9B10 * param0) param0->unk_08++; if (param0->unk_08 < 64) { - return(0); + return 0; } GF_ASSERT(v0.z == param0->unk_28.z); @@ -1308,10 +1305,10 @@ static int ov5_021E0B64 (UnkStruct_ov5_021F9B10 * param0) sub_02064208(param0->unk_3C); ov6_02248608(param0->unk_50); - return(1); + return 1; } -static int(*const Unk_ov5_021F9B10[])(UnkStruct_ov5_021F9B10 *) = { +static int (*const Unk_ov5_021F9B10[])(UnkStruct_ov5_021F9B10 *) = { ov5_021E0A1C, ov5_021E0A44, ov5_021E0A68, @@ -1319,29 +1316,29 @@ static int(*const Unk_ov5_021F9B10[])(UnkStruct_ov5_021F9B10 *) = { ov5_021E0B64 }; -static int ov5_021E0BEC (UnkStruct_ov5_021F9B10 * param0) +static int ov5_021E0BEC(UnkStruct_ov5_021F9B10 *param0) { if (param0->unk_40.unk_00 == 1) { ov5_021E103C(param0->fieldSystem, ¶m0->unk_40); param0->unk_00++; - return(0); + return 0; } param0->unk_00 = 2; - return(1 + 1); + return 1 + 1; } -static int ov5_021E0C10 (UnkStruct_ov5_021F9B10 * param0) +static int ov5_021E0C10(UnkStruct_ov5_021F9B10 *param0) { if (ov5_021E1050(¶m0->unk_40) == 1) { Sound_PlayEffect(1613); param0->unk_00++; } - return(0); + return 0; } -static int ov5_021E0C34 (UnkStruct_ov5_021F9B10 * param0) +static int ov5_021E0C34(UnkStruct_ov5_021F9B10 *param0) { int v0, v1; VecFx32 v2, v3; @@ -1372,10 +1369,10 @@ static int ov5_021E0C34 (UnkStruct_ov5_021F9B10 * param0) param0->unk_50 = ov6_022485F4(param0->fieldSystem); param0->unk_00++; - return(0); + return 0; } -static int ov5_021E0CF4 (UnkStruct_ov5_021F9B10 * param0) +static int ov5_021E0CF4(UnkStruct_ov5_021F9B10 *param0) { VecFx32 v0; @@ -1398,10 +1395,10 @@ static int ov5_021E0CF4 (UnkStruct_ov5_021F9B10 * param0) param0->unk_00++; } - return(0); + return 0; } -static int ov5_021E0D40 (UnkStruct_ov5_021F9B10 * param0) +static int ov5_021E0D40(UnkStruct_ov5_021F9B10 *param0) { VecFx32 v0; @@ -1426,7 +1423,7 @@ static int ov5_021E0D40 (UnkStruct_ov5_021F9B10 * param0) param0->unk_08++; if (param0->unk_08 < 64) { - return(0); + return 0; } GF_ASSERT(v0.z == param0->unk_28.z); @@ -1439,10 +1436,10 @@ static int ov5_021E0D40 (UnkStruct_ov5_021F9B10 * param0) ov6_02248608(param0->unk_50); - return(1); + return 1; } -static int(*const Unk_ov5_021F9AFC[])(UnkStruct_ov5_021F9B10 *) = { +static int (*const Unk_ov5_021F9AFC[])(UnkStruct_ov5_021F9B10 *) = { ov5_021E0BEC, ov5_021E0C10, ov5_021E0C34, @@ -1451,71 +1448,71 @@ static int(*const Unk_ov5_021F9AFC[])(UnkStruct_ov5_021F9B10 *) = { }; static const MapObjectAnimCmd Unk_ov5_021F9B9C[] = { - {0x1, 0x1}, - {0x3C, 0x2}, - {0x2, 0x1}, - {0x3C, 0x2}, - {0x0, 0x1}, - {0x3C, 0x2}, - {0x3, 0x1}, - {0x3C, 0x2}, - {0x1, 0x1}, - {0x3C, 0x1}, - {0x2, 0x1}, - {0x3C, 0x1}, - {0x0, 0x1}, - {0x3C, 0x1}, - {0x3, 0x1}, - {0x3C, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x0, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x0, 0x1}, - {0x3, 0x1}, - {0xfe, 0x0} + { 0x1, 0x1 }, + { 0x3C, 0x2 }, + { 0x2, 0x1 }, + { 0x3C, 0x2 }, + { 0x0, 0x1 }, + { 0x3C, 0x2 }, + { 0x3, 0x1 }, + { 0x3C, 0x2 }, + { 0x1, 0x1 }, + { 0x3C, 0x1 }, + { 0x2, 0x1 }, + { 0x3C, 0x1 }, + { 0x0, 0x1 }, + { 0x3C, 0x1 }, + { 0x3, 0x1 }, + { 0x3C, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x0, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x0, 0x1 }, + { 0x3, 0x1 }, + { 0xfe, 0x0 } }; static const MapObjectAnimCmd Unk_ov5_021F9C00[] = { - {0x1, 0x1}, - {0x2, 0x1}, - {0x0, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x0, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x3C, 0x1}, - {0x2, 0x1}, - {0x3C, 0x1}, - {0x0, 0x1}, - {0x3C, 0x1}, - {0x3, 0x1}, - {0x3C, 0x1}, - {0x1, 0x1}, - {0x3C, 0x2}, - {0x2, 0x1}, - {0x3C, 0x3}, - {0x0, 0x1}, - {0x3C, 0x4}, - {0x3, 0x1}, - {0x3C, 0x5}, - {0x1, 0x1}, - {0xfe, 0x0} + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x0, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x0, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x3C, 0x1 }, + { 0x2, 0x1 }, + { 0x3C, 0x1 }, + { 0x0, 0x1 }, + { 0x3C, 0x1 }, + { 0x3, 0x1 }, + { 0x3C, 0x1 }, + { 0x1, 0x1 }, + { 0x3C, 0x2 }, + { 0x2, 0x1 }, + { 0x3C, 0x3 }, + { 0x0, 0x1 }, + { 0x3C, 0x4 }, + { 0x3, 0x1 }, + { 0x3C, 0x5 }, + { 0x1, 0x1 }, + { 0xfe, 0x0 } }; -void ov5_021E0DD4 (TaskManager * param0) +void ov5_021E0DD4(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); ov5_021E0DE0(fieldSystem); } -static void ov5_021E0DE0 (FieldSystem * fieldSystem) +static void ov5_021E0DE0(FieldSystem *fieldSystem) { - UnkStruct_ov5_021E0DE0 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0DE0))); + UnkStruct_ov5_021E0DE0 *v0 = ov5_021E1110(sizeof(UnkStruct_ov5_021E0DE0)); v0->fieldSystem = fieldSystem; v0->playerAvatar = fieldSystem->playerAvatar; @@ -1525,9 +1522,9 @@ static void ov5_021E0DE0 (FieldSystem * fieldSystem) FieldTask_Start(fieldSystem->unk_10, ov5_021E0E10, v0); } -static BOOL ov5_021E0E10 (TaskManager * param0) +static BOOL ov5_021E0E10(TaskManager *param0) { - UnkStruct_ov5_021E0DE0 * v0 = TaskManager_Environment(param0); + UnkStruct_ov5_021E0DE0 *v0 = TaskManager_Environment(param0); switch (v0->unk_0C) { case 0: @@ -1557,9 +1554,9 @@ static BOOL ov5_021E0E10 (TaskManager * param0) return 0; } -void ov5_021E0E94 (PlayerAvatar * playerAvatar) +void ov5_021E0E94(PlayerAvatar *playerAvatar) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); if (sub_02062DFC(v0) == 0) { return; @@ -1590,9 +1587,9 @@ void ov5_021E0E94 (PlayerAvatar * playerAvatar) } } -void ov5_021E0EEC (PlayerAvatar * playerAvatar) +void ov5_021E0EEC(PlayerAvatar *playerAvatar) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); if (sub_02062DFC(v0) == 0) { return; @@ -1623,9 +1620,9 @@ void ov5_021E0EEC (PlayerAvatar * playerAvatar) } } -static SysTask * ov5_021E0F54 (FieldSystem * fieldSystem, u32 param1) +static SysTask *ov5_021E0F54(FieldSystem *fieldSystem, u32 param1) { - PlayerAvatar * playerAvatar = fieldSystem->playerAvatar; + PlayerAvatar *playerAvatar = fieldSystem->playerAvatar; int v1 = PlayerAvatar_GetPlayerState(playerAvatar); if (v1 != 0x0) { @@ -1633,9 +1630,9 @@ static SysTask * ov5_021E0F54 (FieldSystem * fieldSystem, u32 param1) } { - SysTask * v2; - MapObject * v3 = Player_MapObject(playerAvatar); - UnkStruct_ov5_021E0FF0 * v4 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov5_021E0FF0))); + SysTask *v2; + MapObject *v3 = Player_MapObject(playerAvatar); + UnkStruct_ov5_021E0FF0 *v4 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov5_021E0FF0))); v4->unk_00 = 0; v4->fieldSystem = fieldSystem; @@ -1653,15 +1650,15 @@ static SysTask * ov5_021E0F54 (FieldSystem * fieldSystem, u32 param1) } } -static void ov5_021E0FC0 (SysTask * param0) +static void ov5_021E0FC0(SysTask *param0) { if (param0 == NULL) { return; } { - UnkStruct_ov5_021E0FF0 * v0 = SysTask_GetParam(param0); - PlayerAvatar * playerAvatar = v0->playerAvatar; + UnkStruct_ov5_021E0FF0 *v0 = SysTask_GetParam(param0); + PlayerAvatar *playerAvatar = v0->playerAvatar; int v2 = Player_MoveStateFromGender(0x0, PlayerAvatar_Gender(playerAvatar)); PlayerAvatar_RequestStateWalking(playerAvatar); @@ -1670,47 +1667,47 @@ static void ov5_021E0FC0 (SysTask * param0) } } -static void ov5_021E0FF0 (SysTask * param0, void * param1) +static void ov5_021E0FF0(SysTask *param0, void *param1) { - UnkStruct_ov5_021E0FF0 * v0 = param1; - MapObject * v1 = Player_MapObject(v0->playerAvatar); + UnkStruct_ov5_021E0FF0 *v0 = param1; + MapObject *v1 = Player_MapObject(v0->playerAvatar); sub_02062B68(v1); } -SysTask * ov5_021E1000 (FieldSystem * fieldSystem) +SysTask *ov5_021E1000(FieldSystem *fieldSystem) { return ov5_021E0F54(fieldSystem, (1 << 7)); } -void ov5_021E100C (SysTask * param0) +void ov5_021E100C(SysTask *param0) { ov5_021E0FC0(param0); } -SysTask * FieldSystem_StartVsSeekerTask (FieldSystem * fieldSystem) +SysTask *FieldSystem_StartVsSeekerTask(FieldSystem *fieldSystem) { return ov5_021E0F54(fieldSystem, (1 << 9)); } -void FieldSystem_EndVsSeekerTask (SysTask * param0) +void FieldSystem_EndVsSeekerTask(SysTask *param0) { ov5_021E0FC0(param0); } -static void ov5_021E1028 (FieldSystem * fieldSystem, Pokemon * param1, UnkStruct_ov5_021E1050 * param2) +static void ov5_021E1028(FieldSystem *fieldSystem, Pokemon *param1, UnkStruct_ov5_021E1050 *param2) { param2->unk_00 = 1; param2->unk_08 = param1; param2->unk_04 = PlayerAvatar_Gender(fieldSystem->playerAvatar); } -static void ov5_021E103C (FieldSystem * fieldSystem, UnkStruct_ov5_021E1050 * param1) +static void ov5_021E103C(FieldSystem *fieldSystem, UnkStruct_ov5_021E1050 *param1) { param1->unk_0C = ov6_02243F88(fieldSystem, 0, param1->unk_08, param1->unk_04); } -static int ov5_021E1050 (UnkStruct_ov5_021E1050 * param0) +static int ov5_021E1050(UnkStruct_ov5_021E1050 *param0) { if (ov6_02243FBC(param0->unk_0C) == 1) { ov6_02243FC8(param0->unk_0C); @@ -1720,15 +1717,15 @@ static int ov5_021E1050 (UnkStruct_ov5_021E1050 * param0) return 0; } -static void PlayerAvatar_Redraw (PlayerAvatar * playerAvatar, int param1) +static void PlayerAvatar_Redraw(PlayerAvatar *playerAvatar, int param1) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); if (PlayerAvatar_MapDistortionState(playerAvatar) == AVATAR_DISTORTION_STATE_NONE) { ov5_021EE3FC(v0, param1, NULL, NULL); } else { int v1; - FieldSystem * fieldSystem; - UnkStruct_020216E0 * v3; + FieldSystem *fieldSystem; + UnkStruct_020216E0 *v3; fieldSystem = MapObject_FieldSystem(v0); v1 = ov9_0224A520(fieldSystem, v0); @@ -1740,28 +1737,28 @@ static void PlayerAvatar_Redraw (PlayerAvatar * playerAvatar, int param1) } } -static void ov5_021E10C0 (void * param0, const UnkStruct_020216E0 * param1) +static void ov5_021E10C0(void *param0, const UnkStruct_020216E0 *param1) { - PlayerAvatar * playerAvatar = param0; - MapObject * v1 = Player_MapObject(playerAvatar); - FieldSystem * fieldSystem = MapObject_FieldSystem(v1); + PlayerAvatar *playerAvatar = param0; + MapObject *v1 = Player_MapObject(playerAvatar); + FieldSystem *fieldSystem = MapObject_FieldSystem(v1); ov9_0224A564(fieldSystem, param1); } -static MapObject * ov5_021E10D4 (PlayerAvatar * playerAvatar, int param1) +static MapObject *ov5_021E10D4(PlayerAvatar *playerAvatar, int param1) { int v0 = Player_GetXPos(playerAvatar) + MapObject_GetDxFromDir(param1); int v1 = Player_GetZPos(playerAvatar) + MapObject_GetDyFromDir(param1); - const MapObjectManager * v2 = MapObject_MapObjectManager(Player_MapObject(playerAvatar)); - MapObject * v3 = sub_0206326C(v2, v0, v1, 0); + const MapObjectManager *v2 = MapObject_MapObjectManager(Player_MapObject(playerAvatar)); + MapObject *v3 = sub_0206326C(v2, v0, v1, 0); return v3; } -static void * ov5_021E1110 (int param0) +static void *ov5_021E1110(int param0) { - void * v0 = Heap_AllocFromHeapAtEnd(4, param0); + void *v0 = Heap_AllocFromHeapAtEnd(4, param0); GF_ASSERT(v0 != NULL); memset(v0, 0, param0); @@ -1769,13 +1766,13 @@ static void * ov5_021E1110 (int param0) return v0; } -static void ov5_021E1134 (void * param0) +static void ov5_021E1134(void *param0) { Heap_FreeToHeapExplicit(4, param0); } -static Pokemon * ov5_021E1140 (FieldSystem * fieldSystem, int param1) +static Pokemon *ov5_021E1140(FieldSystem *fieldSystem, int param1) { - Pokemon * v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), param1); + Pokemon *v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), param1); return v0; } diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c index ec64541790..bf93673073 100644 --- a/src/overlay005/ov5_021E1154.c +++ b/src/overlay005/ov5_021E1154.c @@ -1,3 +1,5 @@ +#include "overlay005/ov5_021E1154.h" + #include #include @@ -7,33 +9,32 @@ #include "field/field_system.h" -#include "unk_02005474.h" #include "heap.h" +#include "map_object.h" +#include "player_avatar.h" +#include "unk_02005474.h" #include "unk_020508D4.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" #include "unk_0205F180.h" -#include "map_object.h" #include "unk_020655F4.h" -#include "overlay005/ov5_021E1154.h" typedef struct { int unk_00; int unk_04; int unk_08; - FieldSystem * fieldSystem; - PlayerAvatar * playerAvatar; - MapObject * unk_14; + FieldSystem *fieldSystem; + PlayerAvatar *playerAvatar; + MapObject *unk_14; } UnkStruct_ov5_021E11B0; -static void ov5_021E11B0(FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2); -static BOOL ov5_021E120C(TaskManager * param0); -static void * ov5_021E132C(int param0); -static void ov5_021E1350(void * param0); +static void ov5_021E11B0(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2); +static BOOL ov5_021E120C(TaskManager *param0); +static void *ov5_021E132C(int param0); +static void ov5_021E1350(void *param0); -int ov5_021E1154 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2) +int ov5_021E1154(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); u8 v1 = sub_02062BE8(v0); int v2; @@ -53,9 +54,9 @@ int ov5_021E1154 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int pa return 1; } -static void ov5_021E11B0 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2) +static void ov5_021E11B0(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2) { - UnkStruct_ov5_021E11B0 * v0 = ov5_021E132C((sizeof(UnkStruct_ov5_021E11B0))); + UnkStruct_ov5_021E11B0 *v0 = ov5_021E132C(sizeof(UnkStruct_ov5_021E11B0)); v0->fieldSystem = fieldSystem; v0->playerAvatar = playerAvatar; @@ -65,7 +66,7 @@ static void ov5_021E11B0 (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar FieldTask_Set(fieldSystem, ov5_021E120C, v0); } -static int ov5_021E11E0 (int param0) +static int ov5_021E11E0(int param0) { switch (param0) { case 0: @@ -81,10 +82,10 @@ static int ov5_021E11E0 (int param0) return 0; } -static BOOL ov5_021E120C (TaskManager * param0) +static BOOL ov5_021E120C(TaskManager *param0) { - UnkStruct_ov5_021E11B0 * v0 = TaskManager_Environment(param0); - MapObject * v1 = Player_MapObject(v0->playerAvatar); + UnkStruct_ov5_021E11B0 *v0 = TaskManager_Environment(param0); + MapObject *v1 = Player_MapObject(v0->playerAvatar); u8 v2 = sub_02062BE8(v1); switch (v0->unk_08) { @@ -151,9 +152,9 @@ static BOOL ov5_021E120C (TaskManager * param0) return 0; } -static void * ov5_021E132C (int param0) +static void *ov5_021E132C(int param0) { - void * v0 = Heap_AllocFromHeapAtEnd(4, param0); + void *v0 = Heap_AllocFromHeapAtEnd(4, param0); GF_ASSERT(v0 != NULL); memset(v0, 0, param0); @@ -161,7 +162,7 @@ static void * ov5_021E132C (int param0) return v0; } -static void ov5_021E1350 (void * param0) +static void ov5_021E1350(void *param0) { Heap_FreeToHeapExplicit(4, param0); } diff --git a/src/overlay005/ov5_021E135C.c b/src/overlay005/ov5_021E135C.c index 2fed9cb027..3f183c29df 100644 --- a/src/overlay005/ov5_021E135C.c +++ b/src/overlay005/ov5_021E135C.c @@ -1,31 +1,31 @@ -#include +#include "overlay005/ov5_021E135C.h" -#include +#include #include +#include -#include "sys_task_manager.h" #include "struct_decls/struct_02061AB4_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021ECC20.h" -#include "unk_02005474.h" -#include "sys_task.h" -#include "unk_0200F174.h" #include "heap.h" -#include "player_avatar.h" #include "map_object.h" -#include "overlay005/ov5_021E135C.h" -#include "overlay005/ov5_021ECC20.h" +#include "player_avatar.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" +#include "unk_0200F174.h" typedef struct { - FieldSystem * fieldSystem; - BOOL * unk_04; + FieldSystem *fieldSystem; + BOOL *unk_04; int unk_08; int unk_0C; int unk_10; } UnkStruct_ov5_021E135C; -static void ov5_021E135C (UnkStruct_ov5_021E135C * param0) +static void ov5_021E135C(UnkStruct_ov5_021E135C *param0) { switch (param0->unk_10) { case 0: @@ -45,10 +45,10 @@ static void ov5_021E135C (UnkStruct_ov5_021E135C * param0) Player_SetDir(param0->fieldSystem->playerAvatar, param0->unk_10); } -static void ov5_021E139C (SysTask * param0, void * param1) +static void ov5_021E139C(SysTask *param0, void *param1) { - UnkStruct_ov5_021E135C * v0 = param1; - MapObject * v1 = Player_MapObject(v0->fieldSystem->playerAvatar); + UnkStruct_ov5_021E135C *v0 = param1; + MapObject *v1 = Player_MapObject(v0->fieldSystem->playerAvatar); VecFx32 v2; switch (v0->unk_08) { @@ -78,16 +78,15 @@ static void ov5_021E139C (SysTask * param0, void * param1) } } -static void ov5_021E1470 (SysTask * param0, void * param1) +static void ov5_021E1470(SysTask *param0, void *param1) { - UnkStruct_ov5_021E135C * v0 = param1; - MapObject * v1 = Player_MapObject(v0->fieldSystem->playerAvatar); + UnkStruct_ov5_021E135C *v0 = param1; + MapObject *v1 = Player_MapObject(v0->fieldSystem->playerAvatar); VecFx32 v2; int v3; switch (v0->unk_08) { - case 0: - { + case 0: { sub_02062DDC(v1); sub_0206309C(v1, &v2); v3 = (20 - v0->unk_0C); @@ -128,9 +127,9 @@ static void ov5_021E1470 (SysTask * param0, void * param1) } } -void ov5_021E15A8 (FieldSystem * fieldSystem, BOOL param1, BOOL * param2) +void ov5_021E15A8(FieldSystem *fieldSystem, BOOL param1, BOOL *param2) { - UnkStruct_ov5_021E135C * v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021E135C)); + UnkStruct_ov5_021E135C *v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021E135C)); MI_CpuClear8(v0, sizeof(UnkStruct_ov5_021E135C)); diff --git a/src/overlay005/ov5_021E15F4.c b/src/overlay005/ov5_021E15F4.c index f2341865f6..742bfaec84 100644 --- a/src/overlay005/ov5_021E15F4.c +++ b/src/overlay005/ov5_021E15F4.c @@ -1,27 +1,28 @@ +#include "overlay005/ov5_021E15F4.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" + +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021D56BC.h" +#include "overlay005/ov5_021D5878.h" +#include "overlay005/ov5_021EF75C.h" #include "overlay005/struct_ov5_021D3CAC_decl.h" #include "overlay005/struct_ov5_021D5778_decl.h" -#include "overlay005/struct_ov5_021EF76C_decl.h" - #include "overlay005/struct_ov5_021D57B4.h" #include "overlay005/struct_ov5_021D5894.h" +#include "overlay005/struct_ov5_021EF76C_decl.h" -#include "narc.h" #include "heap.h" +#include "narc.h" #include "unk_0201C970.h" #include "unk_0201CED8.h" #include "unk_0201E190.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021D56BC.h" -#include "overlay005/ov5_021D5878.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021EF75C.h" -static void ov5_021E1904(const int param0, UnkStruct_ov5_021EF76C * const param1, NNSG3dRenderObj * param2, NNSG3dResMdl ** param3); -static void ov5_021E1944(const NNSG3dResMdl * param0, VecFx32 * param1, MtxFx33 * param2, VecFx32 * param3, const UnkStruct_ov5_021D5778 * param4, const int param5); +static void ov5_021E1904(const int param0, UnkStruct_ov5_021EF76C *const param1, NNSG3dRenderObj *param2, NNSG3dResMdl **param3); +static void ov5_021E1944(const NNSG3dResMdl *param0, VecFx32 *param1, MtxFx33 *param2, VecFx32 *param3, const UnkStruct_ov5_021D5778 *param4, const int param5); typedef struct { int unk_00; @@ -37,7 +38,7 @@ typedef struct UnkStruct_ov5_021E1890_t { BOOL unk_08; BOOL unk_0C; NNSG3dRenderObj unk_10; - NNSG3dResMdl * unk_64; + NNSG3dResMdl *unk_64; VecFx32 unk_68; VecFx32 unk_74; VecFx32 unk_80; @@ -47,9 +48,9 @@ typedef struct UnkStruct_ov5_021E1608_t { UnkStruct_ov5_021E1890 unk_00[32]; } UnkStruct_ov5_021E1608; -UnkStruct_ov5_021E1608 * ov5_021E15F4 (const u8 param0) +UnkStruct_ov5_021E1608 *ov5_021E15F4(const u8 param0) { - UnkStruct_ov5_021E1608 * v0; + UnkStruct_ov5_021E1608 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021E1608)); ov5_021E1610(v0); @@ -57,18 +58,18 @@ UnkStruct_ov5_021E1608 * ov5_021E15F4 (const u8 param0) return v0; } -void ov5_021E1608 (UnkStruct_ov5_021E1608 * param0) +void ov5_021E1608(UnkStruct_ov5_021E1608 *param0) { Heap_FreeToHeap(param0); param0 = NULL; } -void ov5_021E1610 (UnkStruct_ov5_021E1608 * param0) +void ov5_021E1610(UnkStruct_ov5_021E1608 *param0) { u8 v0; for (v0 = 0; v0 < 32; v0++) { - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; param0->unk_00[v0].unk_00 = 0; param0->unk_00[v0].unk_04 = 0; @@ -81,12 +82,12 @@ void ov5_021E1610 (UnkStruct_ov5_021E1608 * param0) } } -void ov5_021E1674 (const int param0, UnkStruct_ov5_021E1608 * param1) +void ov5_021E1674(const int param0, UnkStruct_ov5_021E1608 *param1) { GF_ASSERT(param0 < 32); { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; param1->unk_00[param0].unk_00 = 0; param1->unk_00[param0].unk_04 = 0; @@ -99,9 +100,9 @@ void ov5_021E1674 (const int param0, UnkStruct_ov5_021E1608 * param1) } } -void ov5_021E16CC (NARC * param0, const int param1, UnkStruct_ov5_021EF76C * const param2, UnkStruct_ov5_021E1608 * param3, UnkStruct_ov5_021D3CAC * param4) +void ov5_021E16CC(NARC *param0, const int param1, UnkStruct_ov5_021EF76C *const param2, UnkStruct_ov5_021E1608 *param3, UnkStruct_ov5_021D3CAC *param4) { - UnkStruct_ov5_021E16CC * v0 = NULL; + UnkStruct_ov5_021E16CC *v0 = NULL; u32 v1; int v2; @@ -114,7 +115,7 @@ void ov5_021E16CC (NARC * param0, const int param1, UnkStruct_ov5_021EF76C * con } for (v2 = 0; v2 < 32; v2++) { - UnkStruct_ov5_021E1890 * v3; + UnkStruct_ov5_021E1890 *v3; v3 = &(param3->unk_00[v2]); @@ -136,7 +137,7 @@ void ov5_021E16CC (NARC * param0, const int param1, UnkStruct_ov5_021EF76C * con ov5_021D3BE4(v3->unk_00, &(v3->unk_10), param4); } } else { - VecFx32 v4 = {0, 0, 0}; + VecFx32 v4 = { 0, 0, 0 }; v3->unk_00 = 0; v3->unk_04 = 0; @@ -152,7 +153,7 @@ void ov5_021E16CC (NARC * param0, const int param1, UnkStruct_ov5_021EF76C * con } } -void ov5_021E17CC (const VecFx32 * param0, const UnkStruct_ov5_021EF76C * param1, const BOOL param2, UnkStruct_ov5_021D5894 * const param3, UnkStruct_ov5_021E1608 * param4) +void ov5_021E17CC(const VecFx32 *param0, const UnkStruct_ov5_021EF76C *param1, const BOOL param2, UnkStruct_ov5_021D5894 *const param3, UnkStruct_ov5_021E1608 *param4) { int v0; VecFx32 v1; @@ -169,7 +170,7 @@ void ov5_021E17CC (const VecFx32 * param0, const UnkStruct_ov5_021EF76C * param1 }; for (v0 = 0; v0 < 32; v0++) { - UnkStruct_ov5_021E1890 * v3; + UnkStruct_ov5_021E1890 *v3; v3 = &(param4->unk_00[v0]); @@ -184,7 +185,7 @@ void ov5_021E17CC (const VecFx32 * param0, const UnkStruct_ov5_021EF76C * param1 v1.z += param0->z; if (sub_0201CED8(v3->unk_64, &(v1), &v2, &(v3->unk_80))) { - const UnkStruct_ov5_021D5778 * v4; + const UnkStruct_ov5_021D5778 *v4; u16 v5; v4 = ov5_021EFAB4(param1); @@ -205,49 +206,49 @@ void ov5_021E17CC (const VecFx32 * param0, const UnkStruct_ov5_021EF76C * param1 } } -VecFx32 * ov5_021E1890 (UnkStruct_ov5_021E1890 * param0) +VecFx32 *ov5_021E1890(UnkStruct_ov5_021E1890 *param0) { return ¶m0->unk_74; } -VecFx32 ov5_021E1894 (const UnkStruct_ov5_021E1890 * param0) +VecFx32 ov5_021E1894(const UnkStruct_ov5_021E1890 *param0) { return param0->unk_68; } -void ov5_021E18A4 (UnkStruct_ov5_021E1890 * param0, const VecFx32 * param1) +void ov5_021E18A4(UnkStruct_ov5_021E1890 *param0, const VecFx32 *param1) { param0->unk_68 = (*param1); } -void ov5_021E18B4 (UnkStruct_ov5_021E1890 * param0, const BOOL param1) +void ov5_021E18B4(UnkStruct_ov5_021E1890 *param0, const BOOL param1) { param0->unk_08 = param1; } -int ov5_021E18B8 (const UnkStruct_ov5_021E1890 * param0) +int ov5_021E18B8(const UnkStruct_ov5_021E1890 *param0) { return param0->unk_00; } -NNSG3dRenderObj * ov5_021E18BC (const UnkStruct_ov5_021E1890 * param0) +NNSG3dRenderObj *ov5_021E18BC(const UnkStruct_ov5_021E1890 *param0) { return (NNSG3dRenderObj *)(&(param0->unk_10)); } -NNSG3dResMdl * ov5_021E18C0 (const UnkStruct_ov5_021E1890 * param0) +NNSG3dResMdl *ov5_021E18C0(const UnkStruct_ov5_021E1890 *param0) { return param0->unk_64; } -UnkStruct_ov5_021E1890 * ov5_021E18C4 (UnkStruct_ov5_021E1608 * param0, const u8 param1) +UnkStruct_ov5_021E1890 *ov5_021E18C4(UnkStruct_ov5_021E1608 *param0, const u8 param1) { return ¶m0->unk_00[param1]; } -UnkStruct_ov5_021E1890 * ov5_021E18CC (UnkStruct_ov5_021E1608 * param0, const int param1) +UnkStruct_ov5_021E1890 *ov5_021E18CC(UnkStruct_ov5_021E1608 *param0, const int param1) { - UnkStruct_ov5_021E1890 * v0; + UnkStruct_ov5_021E1890 *v0; int v1; for (v1 = 0; v1 < 32; v1++) { @@ -261,9 +262,9 @@ UnkStruct_ov5_021E1890 * ov5_021E18CC (UnkStruct_ov5_021E1608 * param0, const in return NULL; } -UnkStruct_ov5_021E1890 * ov5_021E18E0 (UnkStruct_ov5_021E1608 * param0, const int param1) +UnkStruct_ov5_021E1890 *ov5_021E18E0(UnkStruct_ov5_021E1608 *param0, const int param1) { - UnkStruct_ov5_021E1890 * v0; + UnkStruct_ov5_021E1890 *v0; GF_ASSERT(param1 < 32); v0 = ¶m0->unk_00[param1]; @@ -272,22 +273,22 @@ UnkStruct_ov5_021E1890 * ov5_021E18E0 (UnkStruct_ov5_021E1608 * param0, const in return v0; } -static void ov5_021E1904 (const int param0, UnkStruct_ov5_021EF76C * const param1, NNSG3dRenderObj * param2, NNSG3dResMdl ** param3) +static void ov5_021E1904(const int param0, UnkStruct_ov5_021EF76C *const param1, NNSG3dRenderObj *param2, NNSG3dResMdl **param3) { - NNSG3dResFileHeader ** v0 = ov5_021EF9E8(param0, param1); + NNSG3dResFileHeader **v0 = ov5_021EF9E8(param0, param1); *param3 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*v0), 0); NNS_G3dRenderObjInit(param2, *param3); } -static void ov5_021E1944 (const NNSG3dResMdl * param0, VecFx32 * param1, MtxFx33 * param2, VecFx32 * param3, const UnkStruct_ov5_021D5778 * param4, const int param5) +static void ov5_021E1944(const NNSG3dResMdl *param0, VecFx32 *param1, MtxFx33 *param2, VecFx32 *param3, const UnkStruct_ov5_021D5778 *param4, const int param5) { u8 v0; u16 v1; u16 v2; u8 v3; BOOL v4; - UnkStruct_ov5_021D57B4 const * v5; + UnkStruct_ov5_021D57B4 const *v5; NNS_G3dGlbSetBaseTrans(param1); NNS_G3dGlbSetBaseRot(param2); @@ -312,13 +313,13 @@ static void ov5_021E1944 (const NNSG3dResMdl * param0, VecFx32 * param1, MtxFx33 } } -u8 ov5_021E19CC (UnkStruct_ov5_021E1608 * param0, UnkStruct_ov5_021EF76C * const param1, const int param2, const VecFx32 * param3, const VecFx32 * param4, UnkStruct_ov5_021D3CAC * param5) +u8 ov5_021E19CC(UnkStruct_ov5_021E1608 *param0, UnkStruct_ov5_021EF76C *const param1, const int param2, const VecFx32 *param3, const VecFx32 *param4, UnkStruct_ov5_021D3CAC *param5) { u8 v0; - VecFx32 v1 = {FX32_ONE, FX32_ONE, FX32_ONE}; + VecFx32 v1 = { FX32_ONE, FX32_ONE, FX32_ONE }; for (v0 = 0; v0 < 32; v0++) { - UnkStruct_ov5_021E1890 * v2; + UnkStruct_ov5_021E1890 *v2; v2 = &(param0->unk_00[v0]); @@ -347,7 +348,7 @@ u8 ov5_021E19CC (UnkStruct_ov5_021E1608 * param0, UnkStruct_ov5_021EF76C * const return 32; } -void ov5_021E1A6C (UnkStruct_ov5_021E1608 * param0, UnkStruct_ov5_021EF76C * const param1) +void ov5_021E1A6C(UnkStruct_ov5_021E1608 *param0, UnkStruct_ov5_021EF76C *const param1) { u8 v0; MtxFx33 v1 = { @@ -363,7 +364,7 @@ void ov5_021E1A6C (UnkStruct_ov5_021E1608 * param0, UnkStruct_ov5_021EF76C * con }; for (v0 = 0; v0 < 32; v0++) { - UnkStruct_ov5_021E1890 * v2; + UnkStruct_ov5_021E1890 *v2; v2 = &(param0->unk_00[v0]); @@ -373,7 +374,7 @@ void ov5_021E1A6C (UnkStruct_ov5_021E1608 * param0, UnkStruct_ov5_021EF76C * con } { - const UnkStruct_ov5_021D5778 * v3; + const UnkStruct_ov5_021D5778 *v3; u16 v4; v3 = ov5_021EFAB4(param1); diff --git a/src/overlay005/ov5_021E1B08.c b/src/overlay005/ov5_021E1B08.c index da091ef0bf..726fda18a4 100644 --- a/src/overlay005/ov5_021E1B08.c +++ b/src/overlay005/ov5_021E1B08.c @@ -1,15 +1,16 @@ +#include "overlay005/ov5_021E1B08.h" + #include #include -#include "overlay005/struct_ov5_021E1B20_decl.h" +#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" -#include "struct_defs/struct_0205AA50.h" +#include "overlay005/struct_ov5_021E1B20_decl.h" #include "heap.h" #include "unk_02018340.h" #include "unk_0205D8CC.h" -#include "overlay005/ov5_021E1B08.h" struct UnkStruct_ov5_021E1B20_t { Window unk_00; @@ -19,20 +20,20 @@ struct UnkStruct_ov5_021E1B20_t { u8 unk_13_7 : 1; }; -static void ov5_021E1BE0(FieldSystem * fieldSystem); -static void ov5_021E1C1C(FieldSystem * fieldSystem); -static BOOL ov5_021E1C70(FieldSystem * fieldSystem); -static BOOL ov5_021E1CB0(FieldSystem * fieldSystem); +static void ov5_021E1BE0(FieldSystem *fieldSystem); +static void ov5_021E1C1C(FieldSystem *fieldSystem); +static BOOL ov5_021E1C70(FieldSystem *fieldSystem); +static BOOL ov5_021E1CB0(FieldSystem *fieldSystem); -void * ov5_021E1B08 (u32 param0) +void *ov5_021E1B08(u32 param0) { - void * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021E1B20)); + void *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021E1B20)); memset(v0, 0, sizeof(UnkStruct_ov5_021E1B20)); return v0; } -void ov5_021E1B20 (UnkStruct_ov5_021E1B20 * param0) +void ov5_021E1B20(UnkStruct_ov5_021E1B20 *param0) { if (param0->unk_13_7 != 0) { BGL_DeleteWindow(¶m0->unk_00); @@ -41,28 +42,28 @@ void ov5_021E1B20 (UnkStruct_ov5_021E1B20 * param0) Heap_FreeToHeap(param0); } -void ov5_021E1B38 (UnkStruct_ov5_021E1B20 * param0, u16 param1, u16 param2) +void ov5_021E1B38(UnkStruct_ov5_021E1B20 *param0, u16 param1, u16 param2) { param0->unk_12 = param1; param0->unk_10 = param2; } -void ov5_021E1B40 (UnkStruct_ov5_021E1B20 * param0, u8 param1) +void ov5_021E1B40(UnkStruct_ov5_021E1B20 *param0, u8 param1) { param0->unk_13_0 = param1; } -Window * ov5_021E1B50 (UnkStruct_ov5_021E1B20 * param0) +Window *ov5_021E1B50(UnkStruct_ov5_021E1B20 *param0) { return ¶m0->unk_00; } -u8 ov5_021E1B54 (UnkStruct_ov5_021E1B20 * param0) +u8 ov5_021E1B54(UnkStruct_ov5_021E1B20 *param0) { return param0->unk_12; } -BOOL ov5_021E1B58 (UnkStruct_ov5_021E1B20 * param0) +BOOL ov5_021E1B58(UnkStruct_ov5_021E1B20 *param0) { if (param0->unk_13_0 == 0) { return 1; @@ -71,9 +72,9 @@ BOOL ov5_021E1B58 (UnkStruct_ov5_021E1B20 * param0) return 0; } -void ov5_021E1B68 (FieldSystem * fieldSystem) +void ov5_021E1B68(FieldSystem *fieldSystem) { - UnkStruct_ov5_021E1B20 * v0 = fieldSystem->unk_64; + UnkStruct_ov5_021E1B20 *v0 = fieldSystem->unk_64; switch (v0->unk_13_0) { case 0: @@ -99,13 +100,13 @@ void ov5_021E1B68 (FieldSystem * fieldSystem) } } -void ov5_021E1BCC (FieldSystem * fieldSystem, u8 param1) +void ov5_021E1BCC(FieldSystem *fieldSystem, u8 param1) { ov5_021E1B40(fieldSystem->unk_64, param1); ov5_021E1B68(fieldSystem); } -static void ov5_021E1BE0 (FieldSystem * fieldSystem) +static void ov5_021E1BE0(FieldSystem *fieldSystem) { sub_02019184(fieldSystem->unk_08, 3, 3, -48); @@ -117,7 +118,7 @@ static void ov5_021E1BE0 (FieldSystem * fieldSystem) sub_0205DA80(&fieldSystem->unk_64->unk_00, fieldSystem->unk_64->unk_12, fieldSystem->unk_64->unk_10); } -static void ov5_021E1C1C (FieldSystem * fieldSystem) +static void ov5_021E1C1C(FieldSystem *fieldSystem) { if (fieldSystem->unk_64->unk_13_7 == 0) { return; @@ -131,7 +132,7 @@ static void ov5_021E1C1C (FieldSystem * fieldSystem) fieldSystem->unk_64->unk_13_7 = 0; } -static BOOL ov5_021E1C70 (FieldSystem * fieldSystem) +static BOOL ov5_021E1C70(FieldSystem *fieldSystem) { int v0 = sub_020192F8(fieldSystem->unk_08, 3); @@ -148,7 +149,7 @@ static BOOL ov5_021E1C70 (FieldSystem * fieldSystem) return 0; } -static BOOL ov5_021E1CB0 (FieldSystem * fieldSystem) +static BOOL ov5_021E1CB0(FieldSystem *fieldSystem) { int v0 = sub_020192F8(fieldSystem->unk_08, 3); diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index dee2fc2837..42a757fdcf 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -1,60 +1,57 @@ +#include "overlay005/ov5_021E1D20.h" + #include #include -#include "message.h" -#include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "savedata.h" -#include "overlay005/struct_ov5_021E1FF4_decl.h" - -#include "field/field_system.h" +#include "struct_decls/struct_02018340_decl.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_0205AA50.h" -#include "unk_02002B7C.h" +#include "field/field_system.h" +#include "overlay005/ov5_021EA714.h" +#include "overlay005/struct_ov5_021E1FF4_decl.h" + +#include "field_overworld_state.h" +#include "heap.h" +#include "map_header.h" #include "message.h" #include "message_util.h" +#include "play_time.h" +#include "player_avatar.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" +#include "trainer_info.h" +#include "unk_02002B7C.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "savedata.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" -#include "play_time.h" #include "unk_020366A0.h" -#include "map_header.h" -#include "field_overworld_state.h" -#include "player_avatar.h" -#include "overlay005/ov5_021E1D20.h" -#include "overlay005/ov5_021EA714.h" typedef struct { int unk_00; int unk_04; - TrainerInfo * unk_08; + TrainerInfo *unk_08; PlayTime *playTime; } UnkStruct_ov5_021E1D20; struct UnkStruct_ov5_021E1FF4_t { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; int unk_04; u8 unk_08; - BGL * unk_0C; - Window * unk_10; - StringTemplate * unk_14; - MessageLoader * unk_18; + BGL *unk_0C; + Window *unk_10; + StringTemplate *unk_14; + MessageLoader *unk_18; UnkStruct_ov5_021E1D20 unk_1C; int unk_2C; int unk_30; }; -static void ov5_021E2028(FieldSystem * fieldSystem); +static void ov5_021E2028(FieldSystem *fieldSystem); static const int Unk_ov5_021F9CCC[] = { 0x0, @@ -71,11 +68,11 @@ static const int Unk_ov5_021F9CBC[] = { 0x8 }; -static void ov5_021E1D20 (UnkStruct_ov5_021E1D20 * param0, const FieldSystem * fieldSystem) +static void ov5_021E1D20(UnkStruct_ov5_021E1D20 *param0, const FieldSystem *fieldSystem) { - SaveData * v0 = fieldSystem->saveData; - Location * location = sub_0203A720(SaveData_GetFieldOverworldState(v0)); - PokedexData * v2 = SaveData_Pokedex(v0); + SaveData *v0 = fieldSystem->saveData; + Location *location = sub_0203A720(SaveData_GetFieldOverworldState(v0)); + PokedexData *v2 = SaveData_Pokedex(v0); param0->unk_04 = MapHeader_GetMapLabelTextID(location->mapId); @@ -89,7 +86,7 @@ static void ov5_021E1D20 (UnkStruct_ov5_021E1D20 * param0, const FieldSystem * f param0->playTime = SaveData_GetPlayTime(v0); } -static void ov5_021E1D6C (StringTemplate * strTemplate, const UnkStruct_ov5_021E1D20 * param1) +static void ov5_021E1D6C(StringTemplate *strTemplate, const UnkStruct_ov5_021E1D20 *param1) { int v0, v1, v2; @@ -126,7 +123,7 @@ static void ov5_021E1D6C (StringTemplate * strTemplate, const UnkStruct_ov5_021E StringTemplate_SetNumber(strTemplate, 5, PlayTime_GetMinutes(param1->playTime), 2, 2, 1); } -static int ov5_021E1E10 (const UnkStruct_ov5_021E1D20 * param0) +static int ov5_021E1E10(const UnkStruct_ov5_021E1D20 *param0) { if (param0->unk_00 != 0) { return 10; @@ -135,9 +132,9 @@ static int ov5_021E1E10 (const UnkStruct_ov5_021E1D20 * param0) } } -static void ov5_021E1E20 (const UnkStruct_ov5_021E1FF4 * param0) +static void ov5_021E1E20(const UnkStruct_ov5_021E1FF4 *param0) { - Strbuf* v0; + Strbuf *v0; int v1, v2; int v3; int v4; @@ -168,7 +165,7 @@ static void ov5_021E1E20 (const UnkStruct_ov5_021E1FF4 * param0) } } -void ov5_021E1F04 (UnkStruct_ov5_021E1FF4 * param0) +void ov5_021E1F04(UnkStruct_ov5_021E1FF4 *param0) { param0->unk_10 = Heap_AllocFromHeap(param0->unk_04, sizeof(Window)); @@ -180,16 +177,16 @@ void ov5_021E1F04 (UnkStruct_ov5_021E1FF4 * param0) Window_Show(param0->unk_10, 0, 985, 11); } -void ov5_021E1F7C (UnkStruct_ov5_021E1FF4 * param0) +void ov5_021E1F7C(UnkStruct_ov5_021E1FF4 *param0) { Window_Clear(param0->unk_10, 0); BGL_DeleteWindow(param0->unk_10); Heap_FreeToHeap(param0->unk_10); } -UnkStruct_ov5_021E1FF4 * ov5_021E1F98 (FieldSystem * fieldSystem, int param1, u8 param2) +UnkStruct_ov5_021E1FF4 *ov5_021E1F98(FieldSystem *fieldSystem, int param1, u8 param2) { - UnkStruct_ov5_021E1FF4 * v0; + UnkStruct_ov5_021E1FF4 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021E1FF4)); @@ -209,14 +206,14 @@ UnkStruct_ov5_021E1FF4 * ov5_021E1F98 (FieldSystem * fieldSystem, int param1, u8 return v0; } -void ov5_021E1FF4 (UnkStruct_ov5_021E1FF4 * param0) +void ov5_021E1FF4(UnkStruct_ov5_021E1FF4 *param0) { MessageLoader_Free(param0->unk_18); StringTemplate_Free(param0->unk_14); Heap_FreeToHeap(param0); } -BOOL ov5_021E200C (FieldSystem * fieldSystem) +BOOL ov5_021E200C(FieldSystem *fieldSystem) { ov5_021E2028(fieldSystem); @@ -227,7 +224,7 @@ BOOL ov5_021E200C (FieldSystem * fieldSystem) } } -static void ov5_021E2028 (FieldSystem * fieldSystem) +static void ov5_021E2028(FieldSystem *fieldSystem) { FieldSystem_SaveObjects(fieldSystem); ov5_021EA714(fieldSystem, 4, 0); @@ -238,7 +235,7 @@ static void ov5_021E2028 (FieldSystem * fieldSystem) fieldSystem->location->unk_10 = PlayerAvatar_GetDir(fieldSystem->playerAvatar); } -void ov5_021E2064 (FieldSystem * fieldSystem) +void ov5_021E2064(FieldSystem *fieldSystem) { if (fieldSystem == NULL) { GF_ASSERT(0); diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index 7e931f9862..24c95f2f1c 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -1,38 +1,37 @@ +#include "overlay005/ov5_021E622C.h" + #include #include -#include "strbuf.h" -#include "trainer_info.h" +#include "constants/species.h" + #include "struct_decls/struct_02026218_decl.h" #include "struct_decls/struct_02026224_decl.h" #include "struct_decls/struct_02026310_decl.h" -#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" +#include "struct_defs/chatot_cry.h" #include "field/field_system.h" +#include "heap.h" +#include "item.h" #include "message.h" #include "message_util.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" +#include "trainer_info.h" #include "unk_02017038.h" -#include "heap.h" #include "unk_0201D15C.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_020261E4.h" #include "unk_0202CC64.h" #include "unk_0202CD50.h" #include "unk_020559DC.h" -#include "constants/species.h" -#include "pokemon.h" -#include "party.h" -#include "item.h" #include "unk_02092494.h" -#include "overlay005/ov5_021E622C.h" const u16 Unk_ov5_021F9FA2[] = { (1) + 20000, @@ -1955,31 +1954,31 @@ typedef struct { u16 unk_94[16]; } UnkStruct_ov5_021E6948; -void ov5_021E6DE8(Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4); -void sub_020262C0(UnkStruct_02026224 * param0); -static u8 ov5_021E70FC(UnkStruct_02026310 * param0); -static int ov5_021E6F6C(Party * param0); -static u8 ov5_021E6FF0(BoxPokemon ** param0); -void ov5_021E6B40(UnkStruct_02026310 * param0); -int ov5_021E6630(UnkStruct_02026310 * param0, u8 param1, StringTemplate * param2); -u8 ov5_021E6640(UnkStruct_02026310 * param0, int param1, StringTemplate * param2); -u16 ov5_021E73A0(Party * param0, int param1, StringTemplate * param2); -u8 ov5_021E73C8(UnkStruct_02026310 * param0); -void ov5_021E72BC(UnkStruct_02026310 * param0, StringTemplate * param1); -static void ov5_021E62C4(Party * param0, int param1, UnkStruct_02026218 * param2, SaveData * param3); -static int ov5_021E7110(FieldSystem * fieldSystem); - -static BoxPokemon * ov5_021E622C (UnkStruct_02026310 * param0, int param1) +void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 param3, u8 param4); +void sub_020262C0(UnkStruct_02026224 *param0); +static u8 ov5_021E70FC(UnkStruct_02026310 *param0); +static int ov5_021E6F6C(Party *param0); +static u8 ov5_021E6FF0(BoxPokemon **param0); +void ov5_021E6B40(UnkStruct_02026310 *param0); +int ov5_021E6630(UnkStruct_02026310 *param0, u8 param1, StringTemplate *param2); +u8 ov5_021E6640(UnkStruct_02026310 *param0, int param1, StringTemplate *param2); +u16 ov5_021E73A0(Party *param0, int param1, StringTemplate *param2); +u8 ov5_021E73C8(UnkStruct_02026310 *param0); +void ov5_021E72BC(UnkStruct_02026310 *param0, StringTemplate *param1); +static void ov5_021E62C4(Party *param0, int param1, UnkStruct_02026218 *param2, SaveData *param3); +static int ov5_021E7110(FieldSystem *fieldSystem); + +static BoxPokemon *ov5_021E622C(UnkStruct_02026310 *param0, int param1) { return sub_02026220(sub_02026218(param0, param1)); } -static UnkStruct_02026310 * Unk_ov5_02202124; +static UnkStruct_02026310 *Unk_ov5_02202124; -u8 ov5_021E6238 (UnkStruct_02026310 * param0) +u8 ov5_021E6238(UnkStruct_02026310 *param0) { u8 v0, v1; - BoxPokemon * v2; + BoxPokemon *v2; v0 = 0; @@ -1994,10 +1993,10 @@ u8 ov5_021E6238 (UnkStruct_02026310 * param0) return v0; } -int ov5_021E6270 (UnkStruct_02026310 * param0) +int ov5_021E6270(UnkStruct_02026310 *param0) { u8 v0; - BoxPokemon * v1; + BoxPokemon *v1; Unk_ov5_02202124 = param0; @@ -2012,21 +2011,21 @@ int ov5_021E6270 (UnkStruct_02026310 * param0) return -1; } -static int ov5_021E62B0 (BoxPokemon * param0) +static int ov5_021E62B0(BoxPokemon *param0) { int v0 = BoxPokemon_GetValue(param0, MON_DATA_HELD_ITEM, NULL); return Item_IsMail(v0); } -static void ov5_021E62C4 (Party * param0, int param1, UnkStruct_02026218 * param2, SaveData * param3) +static void ov5_021E62C4(Party *param0, int param1, UnkStruct_02026218 *param2, SaveData *param3) { int v0; - Pokemon * v1 = Party_GetPokemonBySlotIndex(param0, param1); - const u16 * v2; + Pokemon *v1 = Party_GetPokemonBySlotIndex(param0, param1); + const u16 *v2; u16 v3[10 + 1]; - UnkStruct_02026224 * v4 = sub_02026224(param2); - BoxPokemon * v5 = sub_02026220(param2); - TrainerInfo * v6 = SaveData_GetTrainerInfo(param3); + UnkStruct_02026224 *v4 = sub_02026224(param2); + BoxPokemon *v5 = sub_02026220(param2); + TrainerInfo *v6 = SaveData_GetTrainerInfo(param3); v2 = TrainerInfo_Name(v6); Pokemon_GetValue(v1, MON_DATA_NICKNAME, v3); @@ -2041,25 +2040,25 @@ static void ov5_021E62C4 (Party * param0, int param1, UnkStruct_02026218 * param Party_RemovePokemonBySlotIndex(param0, param1); if (Party_HasSpecies(param0, 441) == 0) { - ChatotCry * v7 = GetChatotCryDataFromSave(param3); + ChatotCry *v7 = GetChatotCryDataFromSave(param3); ResetChatotCryDataStatus(v7); } } -void ov5_021E6358 (Party * param0, int param1, UnkStruct_02026310 * param2, SaveData * param3) +void ov5_021E6358(Party *param0, int param1, UnkStruct_02026310 *param2, SaveData *param3) { int v0; - UnkStruct_0202CD88 * v1 = sub_0202CD88(param3); + UnkStruct_0202CD88 *v1 = sub_0202CD88(param3); sub_0202CF28(v1, 1 + 39); v0 = ov5_021E6270(param2); ov5_021E62C4(param0, param1, sub_02026218(param2, v0), param3); } -static void ov5_021E638C (UnkStruct_02026310 * param0) +static void ov5_021E638C(UnkStruct_02026310 *param0) { - UnkStruct_02026218 * v0, * v1; - BoxPokemon * v2, * v3; + UnkStruct_02026218 *v0, *v1; + BoxPokemon *v2, *v3; v0 = sub_02026218(param0, 0); v1 = sub_02026218(param0, 1); @@ -2074,7 +2073,7 @@ static void ov5_021E638C (UnkStruct_02026310 * param0) } } -static void ov5_021E63E0 (Pokemon * param0) +static void ov5_021E63E0(Pokemon *param0) { int v0, v1 = 0, v2; u16 v3; @@ -2097,11 +2096,11 @@ static void ov5_021E63E0 (Pokemon * param0) Pokemon_CalcLevelAndStats(param0); } -static int ov5_021E6444 (Party * param0, UnkStruct_02026218 * param1, StringTemplate * param2) +static int ov5_021E6444(Party *param0, UnkStruct_02026218 *param1, StringTemplate *param2) { - Pokemon * v0 = Pokemon_New(4); - BoxPokemon * v1 = sub_02026220(param1); - UnkStruct_02026224 * v2 = sub_02026224(param1); + Pokemon *v0 = Pokemon_New(4); + BoxPokemon *v1 = sub_02026220(param1); + UnkStruct_02026224 *v2 = sub_02026224(param1); u32 v3; u16 v4; @@ -2128,10 +2127,10 @@ static int ov5_021E6444 (Party * param0, UnkStruct_02026218 * param1, StringTemp return v4; } -u16 ov5_021E64F8 (Party * param0, StringTemplate * param1, UnkStruct_02026310 * param2, u8 param3) +u16 ov5_021E64F8(Party *param0, StringTemplate *param1, UnkStruct_02026310 *param2, u8 param3) { u16 v0; - UnkStruct_02026218 * v1 = sub_02026218(param2, param3); + UnkStruct_02026218 *v1 = sub_02026218(param2, param3); v0 = ov5_021E6444(param0, v1, param1); ov5_021E638C(param2); @@ -2139,10 +2138,10 @@ u16 ov5_021E64F8 (Party * param0, StringTemplate * param1, UnkStruct_02026310 * return v0; } -int ov5_021E6520 (BoxPokemon * param0, u32 param1) +int ov5_021E6520(BoxPokemon *param0, u32 param1) { - Pokemon * v0 = Pokemon_New(4); - BoxPokemon * v1 = Pokemon_GetBoxPokemon(v0); + Pokemon *v0 = Pokemon_New(4); + BoxPokemon *v1 = Pokemon_GetBoxPokemon(v0); int v2; u32 v3; @@ -2158,10 +2157,10 @@ int ov5_021E6520 (BoxPokemon * param0, u32 param1) return v2; } -int ov5_021E6568 (UnkStruct_02026218 * param0) +int ov5_021E6568(UnkStruct_02026218 *param0) { u8 v0, v1; - BoxPokemon * v2; + BoxPokemon *v2; v2 = sub_02026220(param0); v0 = BoxPokemon_GetLevel(v2); @@ -2170,10 +2169,10 @@ int ov5_021E6568 (UnkStruct_02026218 * param0) return v1 - v0; } -int ov5_021E6590 (UnkStruct_02026218 * param0) +int ov5_021E6590(UnkStruct_02026218 *param0) { u8 v0; - BoxPokemon * v1; + BoxPokemon *v1; v1 = sub_02026220(param0); v0 = ov5_021E6520(v1, sub_02026228(param0)); @@ -2181,12 +2180,12 @@ int ov5_021E6590 (UnkStruct_02026218 * param0) return v0; } -u8 ov5_021E65B0 (UnkStruct_02026218 * param0, StringTemplate * param1) +u8 ov5_021E65B0(UnkStruct_02026218 *param0, StringTemplate *param1) { int v0; - Strbuf* v1; + Strbuf *v1; u16 v2[10 + 1]; - BoxPokemon * v3 = sub_02026220(param0); + BoxPokemon *v3 = sub_02026220(param0); v0 = ov5_021E6568(param0); @@ -2196,10 +2195,10 @@ u8 ov5_021E65B0 (UnkStruct_02026218 * param0, StringTemplate * param1) return v0; } -int ov5_021E65EC (UnkStruct_02026218 * param0, StringTemplate * param1) +int ov5_021E65EC(UnkStruct_02026218 *param0, StringTemplate *param1) { u16 v0; - BoxPokemon * v1 = sub_02026220(param0); + BoxPokemon *v1 = sub_02026220(param0); v0 = ov5_021E6568(param0); StringTemplate_SetNickname(param1, 0, v1); @@ -2210,18 +2209,18 @@ int ov5_021E65EC (UnkStruct_02026218 * param0, StringTemplate * param1) return v0; } -int ov5_021E6630 (UnkStruct_02026310 * param0, u8 param1, StringTemplate * param2) +int ov5_021E6630(UnkStruct_02026310 *param0, u8 param1, StringTemplate *param2) { - UnkStruct_02026218 * v0; + UnkStruct_02026218 *v0; v0 = sub_02026218(param0, param1); return ov5_021E65EC(v0, param2); } -u8 ov5_021E6640 (UnkStruct_02026310 * param0, int param1, StringTemplate * param2) +u8 ov5_021E6640(UnkStruct_02026310 *param0, int param1, StringTemplate *param2) { - UnkStruct_02026218 * v0 = sub_02026218(param0, param1); - BoxPokemon * v1 = sub_02026220(v0); + UnkStruct_02026218 *v0 = sub_02026218(param0, param1); + BoxPokemon *v1 = sub_02026220(v0); if (BoxPokemon_GetValue(v1, MON_DATA_SPECIES, NULL)) { return ov5_021E65B0(v0, param2); @@ -2230,17 +2229,17 @@ u8 ov5_021E6640 (UnkStruct_02026310 * param0, int param1, StringTemplate * param return 0; } -static void ov5_021E6668 (UnkStruct_02026310 * param0, BoxPokemon * param1[]) +static void ov5_021E6668(UnkStruct_02026310 *param0, BoxPokemon *param1[]) { param1[0] = ov5_021E622C(param0, 0); param1[1] = ov5_021E622C(param0, 1); } -static int ov5_021E6684 (UnkStruct_02026310 * param0) +static int ov5_021E6684(UnkStruct_02026310 *param0) { int v0; int v1[2], v2 = -1, v3; - BoxPokemon * v4[2]; + BoxPokemon *v4[2]; ov5_021E6668(param0, v4); @@ -2276,7 +2275,7 @@ static int ov5_021E6684 (UnkStruct_02026310 * param0) return v2; } -void ov5_021E6720 (UnkStruct_02026310 * param0) +void ov5_021E6720(UnkStruct_02026310 *param0) { u32 v0 = 0, v1; int v2, v3; @@ -2285,7 +2284,7 @@ void ov5_021E6720 (UnkStruct_02026310 * param0) if ((v2 = ov5_021E6684(param0)) < 0) { sub_02026270(param0, MTRNG_Next()); } else { - BoxPokemon * v5 = ov5_021E622C(param0, v2); + BoxPokemon *v5 = ov5_021E622C(param0, v2); v0 = BoxPokemon_GetValue(v5, MON_DATA_PERSONALITY, NULL); v3 = Pokemon_GetNatureOf(v0); @@ -2306,7 +2305,7 @@ void ov5_021E6720 (UnkStruct_02026310 * param0) } } -static void ov5_021E6778 (u8 * param0, u8 param1) +static void ov5_021E6778(u8 *param0, u8 param1) { int v0, v1; u8 v2[6]; @@ -2326,7 +2325,7 @@ static void ov5_021E6778 (u8 * param0, u8 param1) } } -static void ov5_021E67B0 (Pokemon * param0, UnkStruct_02026310 * param1) +static void ov5_021E67B0(Pokemon *param0, UnkStruct_02026310 *param1) { u8 v0[3], v1, v2[6], v3[3], v4; @@ -2344,7 +2343,7 @@ static void ov5_021E67B0 (Pokemon * param0, UnkStruct_02026310 * param1) } for (v1 = 0; v1 < 3; v1++) { - BoxPokemon * v5 = ov5_021E622C(param1, v3[v1]); + BoxPokemon *v5 = ov5_021E622C(param1, v3[v1]); switch (v0[v1]) { case 0: @@ -2375,7 +2374,7 @@ static void ov5_021E67B0 (Pokemon * param0, UnkStruct_02026310 * param1) } } -static u8 ov5_021E68D8 (Pokemon * param0, u16 * param1) +static u8 ov5_021E68D8(Pokemon *param0, u16 *param1) { u16 v0, v1, v2, v3; @@ -2402,10 +2401,10 @@ static u8 ov5_021E68D8 (Pokemon * param0, u16 * param1) return v2; } -static void ov5_021E6948 (Pokemon * param0, BoxPokemon * param1, BoxPokemon * param2) +static void ov5_021E6948(Pokemon *param0, BoxPokemon *param1, BoxPokemon *param2) { u16 v0, v1, v2, v3, v4, v5, v6; - UnkStruct_ov5_021E6948 * v7 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E6948)); + UnkStruct_ov5_021E6948 *v7 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E6948)); v2 = 0; @@ -2483,28 +2482,28 @@ static void ov5_021E6948 (Pokemon * param0, BoxPokemon * param1, BoxPokemon * pa Heap_FreeToHeap(v7); } -void ov5_021E6B40 (UnkStruct_02026310 * param0) +void ov5_021E6B40(UnkStruct_02026310 *param0) { sub_02026270(param0, 0); sub_02026278(param0, 0); } static const u16 Unk_ov5_021F9F6C[9][3] = { - {0x168, 0xFF, 0xCA}, - {0x12A, 0xFE, 0xB7}, - {0x1B7, 0x13A, 0x7A}, - {0x1B6, 0x13B, 0xB9}, - {0x1BE, 0x13C, 0x8F}, - {0x1CA, 0x13D, 0xE2}, - {0x196, 0x13E, 0x13B}, - {0x1B8, 0x13F, 0x71}, - {0x1B1, 0x140, 0x166} + { 0x168, 0xFF, 0xCA }, + { 0x12A, 0xFE, 0xB7 }, + { 0x1B7, 0x13A, 0x7A }, + { 0x1B6, 0x13B, 0xB9 }, + { 0x1BE, 0x13C, 0x8F }, + { 0x1CA, 0x13D, 0xE2 }, + { 0x196, 0x13E, 0x13B }, + { 0x1B8, 0x13F, 0x71 }, + { 0x1B1, 0x140, 0x166 } }; -static u16 ov5_021E6B54 (u16 param0, UnkStruct_02026310 * param1) +static u16 ov5_021E6B54(u16 param0, UnkStruct_02026310 *param1) { u16 v0, v1, v2, v3; - BoxPokemon * v4[2]; + BoxPokemon *v4[2]; ov5_021E6668(param1, v4); @@ -2529,10 +2528,10 @@ static u16 ov5_021E6B54 (u16 param0, UnkStruct_02026310 * param1) return param0; } -static void ov5_021E6BD0 (Pokemon * param0, UnkStruct_02026310 * param1) +static void ov5_021E6BD0(Pokemon *param0, UnkStruct_02026310 *param1) { int v0, v1; - BoxPokemon * v2[2]; + BoxPokemon *v2[2]; ov5_021E6668(param1, v2); @@ -2546,10 +2545,10 @@ static void ov5_021E6BD0 (Pokemon * param0, UnkStruct_02026310 * param1) } } -static u16 ov5_021E6C20 (UnkStruct_02026310 * param0, u8 param1[]) +static u16 ov5_021E6C20(UnkStruct_02026310 *param0, u8 param1[]) { u16 v0[2], v1, v2, v3, v4, v5; - BoxPokemon * v6[2]; + BoxPokemon *v6[2]; ov5_021E6668(param0, v6); @@ -2597,12 +2596,12 @@ static u16 ov5_021E6C20 (UnkStruct_02026310 * param0, u8 param1[]) return v4; } -void ov5_021E6CF0 (Pokemon * param0, u16 param1, u8 param2, TrainerInfo * param3, int param4, int param5) +void ov5_021E6CF0(Pokemon *param0, u16 param1, u8 param2, TrainerInfo *param3, int param4, int param5) { u8 v0, v1, v2; u16 v3; u8 v4 = PokemonPersonalData_GetSpeciesValue(param1, 19); - Strbuf* v5; + Strbuf *v5; Pokemon_InitWith(param0, param1, 1, 32, 0, 0, 0, 0); @@ -2627,7 +2626,7 @@ void ov5_021E6CF0 (Pokemon * param0, u16 param1, u8 param2, TrainerInfo * param3 if (param4 == 4) { u32 v6 = TrainerInfo_ID(param3); u32 v7 = TrainerInfo_Gender(param3); - Strbuf* v8 = TrainerInfo_NameNewStrbuf(param3, 32); + Strbuf *v8 = TrainerInfo_NameNewStrbuf(param3, 32); Pokemon_SetValue(param0, 145, v8); Pokemon_SetValue(param0, 7, &v6); @@ -2638,12 +2637,12 @@ void ov5_021E6CF0 (Pokemon * param0, u16 param1, u8 param2, TrainerInfo * param3 sub_0209304C(param0, param3, param4, param5, 0); } -void ov5_021E6DE8 (Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4) +void ov5_021E6DE8(Pokemon *param0, u16 param1, UnkStruct_02026310 *param2, u32 param3, u8 param4) { u8 v0; u16 v1; u32 v2; - Strbuf* v3; + Strbuf *v3; u8 v4 = PokemonPersonalData_GetSpeciesValue(param1, 19); v2 = sub_02026248(param2); @@ -2680,18 +2679,18 @@ void ov5_021E6DE8 (Pokemon * param0, u16 param1, UnkStruct_02026310 * param2, u3 Strbuf_Free(v3); } -void ov5_021E6EA8 (UnkStruct_02026310 * param0, Party * param1, TrainerInfo * param2) +void ov5_021E6EA8(UnkStruct_02026310 *param0, Party *param1, TrainerInfo *param2) { u16 v0; u8 v1[2], v2; - Pokemon * v3 = Pokemon_New(4); + Pokemon *v3 = Pokemon_New(4); v0 = ov5_021E6C20(param0, v1); v0 = ov5_021E6B54(v0, param0); { u32 v4 = TrainerInfo_ID(param2); - BoxPokemon * v5 = ov5_021E622C(param0, v1[0]); + BoxPokemon *v5 = ov5_021E622C(param0, v1[0]); u8 v6 = BoxPokemon_GetValue(v5, MON_DATA_FORM, NULL); ov5_021E6DE8(v3, v0, param0, v4, v6); @@ -2714,7 +2713,7 @@ void ov5_021E6EA8 (UnkStruct_02026310 * param0, Party * param1, TrainerInfo * pa Heap_FreeToHeap(v3); } -static int ov5_021E6F6C (Party * param0) +static int ov5_021E6F6C(Party *param0) { u8 v0; u8 v1; @@ -2735,7 +2734,7 @@ static int ov5_021E6F6C (Party * param0) return 1; } -static u8 ov5_021E6FC0 (u16 * param0, u16 * param1) +static u8 ov5_021E6FC0(u16 *param0, u16 *param1) { int v0, v1; @@ -2750,7 +2749,7 @@ static u8 ov5_021E6FC0 (u16 * param0, u16 * param1) return 0; } -static u8 ov5_021E6FF0 (BoxPokemon ** param0) +static u8 ov5_021E6FF0(BoxPokemon **param0) { u16 v0[2][2], v1[2]; u32 v2[2], v3[2], v4, v5; @@ -2809,9 +2808,9 @@ static u8 ov5_021E6FF0 (BoxPokemon ** param0) return 0; } -static u8 ov5_021E70FC (UnkStruct_02026310 * param0) +static u8 ov5_021E70FC(UnkStruct_02026310 *param0) { - BoxPokemon * v0[2]; + BoxPokemon *v0[2]; ov5_021E6668(param0, v0); return ov5_021E6FF0(v0); @@ -2832,7 +2831,7 @@ static const u16 Unk_ov5_021F9F54[] = { 0x4BE }; -static int ov5_021E7110 (FieldSystem * fieldSystem) +static int ov5_021E7110(FieldSystem *fieldSystem) { int v0 = sub_02055BB8(fieldSystem) * 100 + sub_02055BC4(fieldSystem); int v1; @@ -2850,12 +2849,12 @@ static int ov5_021E7110 (FieldSystem * fieldSystem) return 255; } -BOOL ov5_021E7154 (UnkStruct_02026310 * param0, Party * param1, FieldSystem * fieldSystem) +BOOL ov5_021E7154(UnkStruct_02026310 *param0, Party *param1, FieldSystem *fieldSystem) { u32 v0, v1, v2, v3, v4; u32 v5 = 0, v6; int v7; - BoxPokemon * v8[2]; + BoxPokemon *v8[2]; ov5_021E6668(param0, v8); @@ -2888,7 +2887,7 @@ BOOL ov5_021E7154 (UnkStruct_02026310 * param0, Party * param1, FieldSystem * fi v7 = ov5_021E6F6C(param1); for (v0 = 0; v0 < Party_GetCurrentCount(param1); v0++) { - Pokemon * v9 = Party_GetPokemonBySlotIndex(param1, v0); + Pokemon *v9 = Party_GetPokemonBySlotIndex(param1, v0); if (Pokemon_GetValue(v9, MON_DATA_IS_EGG, NULL)) { if (Pokemon_GetValue(v9, MON_DATA_IS_DATA_INVALID, NULL)) { @@ -2915,10 +2914,10 @@ BOOL ov5_021E7154 (UnkStruct_02026310 * param0, Party * param1, FieldSystem * fi return 0; } -Pokemon * ov5_021E7278 (Party * param0) +Pokemon *ov5_021E7278(Party *param0) { int v0; - Pokemon * v1; + Pokemon *v1; int v2 = Party_GetCurrentCount(param0); for (v0 = 0; v0 < v2; v0++) { @@ -2933,9 +2932,9 @@ Pokemon * ov5_021E7278 (Party * param0) return NULL; } -void ov5_021E72BC (UnkStruct_02026310 * param0, StringTemplate * param1) +void ov5_021E72BC(UnkStruct_02026310 *param0, StringTemplate *param1) { - BoxPokemon * v0[2]; + BoxPokemon *v0[2]; u16 v1[10 + 1]; ov5_021E6668(param0, v0); @@ -2950,10 +2949,10 @@ void ov5_021E72BC (UnkStruct_02026310 * param0, StringTemplate * param1) } } -void ov5_021E7308 (UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 param3, u8 param4, StringTemplate * param5) +void ov5_021E7308(UnkStruct_02026310 *param0, u32 param1, u32 param2, u32 param3, u8 param4, StringTemplate *param5) { - UnkStruct_02026218 * v0; - BoxPokemon * v1; + UnkStruct_02026218 *v0; + BoxPokemon *v1; u8 v2, v3; u16 v4; @@ -2977,15 +2976,15 @@ void ov5_021E7308 (UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 para StringTemplate_SetGenderMarker(param5, param3, v3); } -u16 ov5_021E73A0 (Party * param0, int param1, StringTemplate * param2) +u16 ov5_021E73A0(Party *param0, int param1, StringTemplate *param2) { - Pokemon * v0 = Party_GetPokemonBySlotIndex(param0, param1); + Pokemon *v0 = Party_GetPokemonBySlotIndex(param0, param1); StringTemplate_SetNickname(param2, 0, Pokemon_GetBoxPokemon(v0)); return Pokemon_GetValue(v0, MON_DATA_SPECIES, NULL); } -u8 ov5_021E73C8 (UnkStruct_02026310 * param0) +u8 ov5_021E73C8(UnkStruct_02026310 *param0) { u8 v0; @@ -3000,7 +2999,7 @@ u8 ov5_021E73C8 (UnkStruct_02026310 * param0) return 0; } -u8 ov5_021E73F0 (u32 param0) +u8 ov5_021E73F0(u32 param0) { switch (param0) { case 0: @@ -3016,7 +3015,7 @@ u8 ov5_021E73F0 (u32 param0) return 0; } -extern u32 ov5_021E7420 (UnkStruct_02026310 * param0) +extern u32 ov5_021E7420(UnkStruct_02026310 *param0) { u8 v0, v1; @@ -3026,7 +3025,7 @@ extern u32 ov5_021E7420 (UnkStruct_02026310 * param0) return v1; } -static void ov5_021E742C (Pokemon * param0, int param1) +static void ov5_021E742C(Pokemon *param0, int param1) { u16 v0; u16 v1[4]; @@ -3034,8 +3033,8 @@ static void ov5_021E742C (Pokemon * param0, int param1) u32 v3, v4; u8 v5[6], v6; u8 v7, v8, v9, v10, v11, v12, v13, v14; - Strbuf* v15 = Strbuf_Init(7 + 1, param1); - Pokemon * v16 = Pokemon_New(param1); + Strbuf *v15 = Strbuf_Init(7 + 1, param1); + Pokemon *v16 = Pokemon_New(param1); v0 = Pokemon_GetValue(param0, MON_DATA_SPECIES, NULL); @@ -3127,7 +3126,7 @@ static void ov5_021E742C (Pokemon * param0, int param1) Heap_FreeToHeap(v16); } -void ov5_021E771C (Pokemon * param0, int param1) +void ov5_021E771C(Pokemon *param0, int param1) { u8 v0, v1; u8 v2, v3; @@ -3152,7 +3151,7 @@ void ov5_021E771C (Pokemon * param0, int param1) Pokemon_CalcLevelAndStats(param0); } -u32 ov5_021E7790 (BoxPokemon ** param0) +u32 ov5_021E7790(BoxPokemon **param0) { return ov5_021E73F0(ov5_021E6FF0(param0)); } diff --git a/src/overlay005/ov5_021E779C.c b/src/overlay005/ov5_021E779C.c index 0e530a0e8d..ac39afb0c3 100644 --- a/src/overlay005/ov5_021E779C.c +++ b/src/overlay005/ov5_021E779C.c @@ -1,32 +1,33 @@ +#include "overlay005/ov5_021E779C.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02039E30_decl.h" + +#include "field/field_system.h" +#include "overlay005/funcptr_ov5_021E9630.h" +#include "overlay005/ov5_021D521C.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021EEAC8.h" +#include "overlay005/ov5_021EEF34.h" +#include "overlay005/ov5_021EF75C.h" #include "overlay005/struct_ov5_021D3CAC_decl.h" +#include "overlay005/struct_ov5_021D5894.h" #include "overlay005/struct_ov5_021E1608_decl.h" #include "overlay005/struct_ov5_021EEB48_decl.h" #include "overlay005/struct_ov5_021EF13C_decl.h" #include "overlay005/struct_ov5_021EF76C_decl.h" -#include "field/field_system.h" -#include "overlay005/struct_ov5_021D5894.h" -#include "overlay005/funcptr_ov5_021E9630.h" - +#include "heap.h" #include "narc.h" #include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_0201C970.h" -#include "sys_task_manager.h" #include "unk_020366A0.h" #include "unk_02039C80.h" -#include "overlay005/ov5_021D521C.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021E779C.h" -#include "overlay005/ov5_021EEAC8.h" -#include "overlay005/ov5_021EEF34.h" -#include "overlay005/ov5_021EF75C.h" typedef struct { int unk_00; @@ -36,18 +37,18 @@ typedef struct { typedef struct { u16 unk_00[1024]; NNSG3dRenderObj unk_800; - NNSG3dResFileHeader * unk_854; - u8 * unk_858; - UnkStruct_ov5_021EF13C * unk_85C; + NNSG3dResFileHeader *unk_854; + u8 *unk_858; + UnkStruct_ov5_021EF13C *unk_85C; int unk_860; BOOL unk_864; - UnkStruct_ov5_021E1608 * unk_868; + UnkStruct_ov5_021E1608 *unk_868; } UnkStruct_ov5_021E79A8; typedef struct { - UnkStruct_ov5_021E79A8 * unk_00[2]; - SysTask * unk_08; - SysTask * unk_0C; + UnkStruct_ov5_021E79A8 *unk_00[2]; + SysTask *unk_08; + SysTask *unk_0C; UnkStruct_ov5_021E80BC unk_10; int unk_18[2]; u8 unk_20[2]; @@ -55,8 +56,8 @@ typedef struct { BOOL unk_24; } UnkStruct_ov5_021E7814; -typedef void (* UnkFuncPtr_ov5_021FAE98)(UnkStruct_ov5_021E8F60 *, const int, const int, const int, const int, const int); -typedef void (* UnkFuncPtr_ov5_021FAE98_1)(const u8, UnkStruct_ov5_021EF76C * const, const UnkStruct_02039E30 *, const int, const int, UnkStruct_ov5_021E8F60 *, UnkStruct_ov5_021E7814 *); +typedef void (*UnkFuncPtr_ov5_021FAE98)(UnkStruct_ov5_021E8F60 *, const int, const int, const int, const int, const int); +typedef void (*UnkFuncPtr_ov5_021FAE98_1)(const u8, UnkStruct_ov5_021EF76C *const, const UnkStruct_02039E30 *, const int, const int, UnkStruct_ov5_021E8F60 *, UnkStruct_ov5_021E7814 *); typedef struct UnkStruct_ov5_021FAE98_t { UnkFuncPtr_ov5_021FAE98 unk_00; @@ -70,7 +71,7 @@ typedef struct { } UnkStruct_ov5_021E8F60_sub1; typedef struct { - UnkStruct_ov5_021E79A8 * unk_00[2]; + UnkStruct_ov5_021E79A8 *unk_00[2]; BOOL unk_08; u8 unk_0C; int unk_10[2]; @@ -79,20 +80,20 @@ typedef struct { typedef struct { VecFx32 unk_00; - VecFx32 const * unk_0C; - fx32 const * unk_10; - fx32 const * unk_14; + VecFx32 const *unk_0C; + fx32 const *unk_10; + fx32 const *unk_14; BOOL unk_18; u8 unk_1C; BOOL unk_20; } UnkStruct_ov5_021EA174; typedef struct UnkStruct_ov5_021E8F60_t { - UnkStruct_ov5_021EEB48 * unk_00; + UnkStruct_ov5_021EEB48 *unk_00; UnkStruct_ov5_021E8F60_sub1 unk_04[2]; UnkStruct_ov5_021E8C8C unk_5C; BOOL unk_74[4]; - UnkStruct_ov5_021E79A8 * unk_84[4]; + UnkStruct_ov5_021E79A8 *unk_84[4]; u8 unk_94; u8 unk_95; u8 unk_96; @@ -102,17 +103,17 @@ typedef struct UnkStruct_ov5_021E8F60_t { u8 unk_A1; BOOL unk_A4; int unk_A8; - UnkStruct_ov5_021EF76C * unk_AC; - UnkStruct_02039E30 * unk_B0; + UnkStruct_ov5_021EF76C *unk_AC; + UnkStruct_02039E30 *unk_B0; int unk_B4; int unk_B8; int unk_BC; UnkStruct_ov5_021EA174 unk_C0; - UnkStruct_ov5_021D3CAC * unk_E4; - UnkStruct_ov5_021FAE98 const * unk_E8; - NARC * unk_EC; + UnkStruct_ov5_021D3CAC *unk_E4; + UnkStruct_ov5_021FAE98 const *unk_E8; + NARC *unk_EC; UnkFuncPtr_ov5_021E9630 unk_F0; - void * unk_F4; + void *unk_F4; int unk_F8; int unk_FC; int unk_100; @@ -129,55 +130,55 @@ typedef struct { } UnkStruct_ov5_021E7BAC; typedef struct { - NARC * unk_00; + NARC *unk_00; int unk_04; - NNSG3dRenderObj * unk_08; - NNSG3dResFileHeader ** unk_0C; - NNSG3dResTex * unk_10; + NNSG3dRenderObj *unk_08; + NNSG3dResFileHeader **unk_0C; + NNSG3dResTex *unk_10; u8 unk_14; - BOOL * unk_18; + BOOL *unk_18; BOOL unk_1C; - int * unk_20; + int *unk_20; u32 unk_24; } UnkStruct_ov5_021E9640; -static SysTask * ov5_021E976C(NARC * param0, const int param1, NNSG3dRenderObj * param2, NNSG3dResFileHeader ** param3, NNSG3dResTex * param4, BOOL * param5, int * param6); -static NNSG3dResMdl * ov5_021E97AC(NARC * param0, const int param1, NNSG3dRenderObj * param2, NNSG3dResFileHeader ** param3, NNSG3dResTex * param4); -static void ov5_021E9640(SysTask * param0); -static void ov5_021E8F60(UnkStruct_ov5_021E8F60 * param0); -static void ov5_021E8E28(UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, const int param3, const int param4, const int param5); -static void ov5_021E8ECC(UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, const int param3, const int param4, const int param5); -static void ov5_021E79A8(UnkStruct_ov5_021E8F60 * param0); -static void ov5_021E7AC4(UnkStruct_ov5_021E8F60 * param0); -static void ov5_021E77E4(UnkStruct_ov5_021E8F60 * param0, const u8 param1); -static BOOL ov5_021E80D0(UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, const u8 param3, const u8 param4, const u8 param5, const u8 param6); -static void ov5_021E7BAC(NARC * param0, const int param1, UnkStruct_ov5_021E7BAC * param2); -static void ov5_021E7C00(const u8 param0, UnkStruct_ov5_021EF76C * const param1, const UnkStruct_02039E30 * param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 * param5, UnkStruct_ov5_021E7814 * param6); -static void ov5_021E7CD4(const u8 param0, UnkStruct_ov5_021EF76C * const param1, const UnkStruct_02039E30 * param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 * param5, UnkStruct_ov5_021E7814 * param6); -static void ov5_021E7E28(const int param0, const u8 param1, UnkStruct_ov5_021EF76C * const param2, const UnkStruct_02039E30 * param3, const int param4, const int param5, const BOOL param6, const UnkStruct_ov5_021E8F60 * param7); -static void ov5_021E7F1C(const int param0, const u8 param1, UnkStruct_ov5_021EF76C * const param2, const UnkStruct_02039E30 * param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 * param7); -static void ov5_021E7FF0(const int param0, const u8 param1, UnkStruct_ov5_021EF76C * const param2, const UnkStruct_02039E30 * param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 * param7); -static void ov5_021E86A0(const int param0, const u8 param1, UnkStruct_ov5_021E8F60 * param2); -static void ov5_021E8668(const u8 param0, const u8 param1, const u8 param2, const u8 param3, UnkStruct_ov5_021E8F60 * param4); -static void ov5_021E8614(const u8 param0, UnkStruct_ov5_021E8F60 * param1); -static void ov5_021E89D0(const u8 param0, const UnkStruct_ov5_021E8F60 * param1, UnkStruct_ov5_021D5894 * const param2); -static BOOL ov5_021E8C58(const u8 param0, const UnkStruct_ov5_021E8F60 * param1, u8 * param2); -static BOOL ov5_021E8C8C(UnkStruct_ov5_021E8F60 * param0); -static BOOL ov5_021E8DAC(const UnkStruct_ov5_021E8F60 * param0); -static void ov5_021E8DBC(UnkStruct_ov5_021E8F60 * param0); -static void ov5_021E8DD4(const u8 param0, UnkStruct_ov5_021E8F60 * param1); +static SysTask *ov5_021E976C(NARC *param0, const int param1, NNSG3dRenderObj *param2, NNSG3dResFileHeader **param3, NNSG3dResTex *param4, BOOL *param5, int *param6); +static NNSG3dResMdl *ov5_021E97AC(NARC *param0, const int param1, NNSG3dRenderObj *param2, NNSG3dResFileHeader **param3, NNSG3dResTex *param4); +static void ov5_021E9640(SysTask *param0); +static void ov5_021E8F60(UnkStruct_ov5_021E8F60 *param0); +static void ov5_021E8E28(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, const int param3, const int param4, const int param5); +static void ov5_021E8ECC(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, const int param3, const int param4, const int param5); +static void ov5_021E79A8(UnkStruct_ov5_021E8F60 *param0); +static void ov5_021E7AC4(UnkStruct_ov5_021E8F60 *param0); +static void ov5_021E77E4(UnkStruct_ov5_021E8F60 *param0, const u8 param1); +static BOOL ov5_021E80D0(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, const u8 param3, const u8 param4, const u8 param5, const u8 param6); +static void ov5_021E7BAC(NARC *param0, const int param1, UnkStruct_ov5_021E7BAC *param2); +static void ov5_021E7C00(const u8 param0, UnkStruct_ov5_021EF76C *const param1, const UnkStruct_02039E30 *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6); +static void ov5_021E7CD4(const u8 param0, UnkStruct_ov5_021EF76C *const param1, const UnkStruct_02039E30 *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6); +static void ov5_021E7E28(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const UnkStruct_02039E30 *param3, const int param4, const int param5, const BOOL param6, const UnkStruct_ov5_021E8F60 *param7); +static void ov5_021E7F1C(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const UnkStruct_02039E30 *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7); +static void ov5_021E7FF0(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const UnkStruct_02039E30 *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7); +static void ov5_021E86A0(const int param0, const u8 param1, UnkStruct_ov5_021E8F60 *param2); +static void ov5_021E8668(const u8 param0, const u8 param1, const u8 param2, const u8 param3, UnkStruct_ov5_021E8F60 *param4); +static void ov5_021E8614(const u8 param0, UnkStruct_ov5_021E8F60 *param1); +static void ov5_021E89D0(const u8 param0, const UnkStruct_ov5_021E8F60 *param1, UnkStruct_ov5_021D5894 *const param2); +static BOOL ov5_021E8C58(const u8 param0, const UnkStruct_ov5_021E8F60 *param1, u8 *param2); +static BOOL ov5_021E8C8C(UnkStruct_ov5_021E8F60 *param0); +static BOOL ov5_021E8DAC(const UnkStruct_ov5_021E8F60 *param0); +static void ov5_021E8DBC(UnkStruct_ov5_021E8F60 *param0); +static void ov5_021E8DD4(const u8 param0, UnkStruct_ov5_021E8F60 *param1); static u8 ov5_021E8AF0(const u8 param0); static u32 ov5_021E8B1C(const u8 param0, const int param1, const int param2, const int param3); static u8 ov5_021E8B84(const u8 param0, const int param1); -static void ov5_021E8BC0(const u8 param0, const int param1, u8 * param2); -static void ov5_021E8558(const int param0, const int param1, const u8 param2, const u8 param3, const u8 param4, UnkStruct_ov5_021E8F60 * param5); +static void ov5_021E8BC0(const u8 param0, const int param1, u8 *param2); +static void ov5_021E8558(const int param0, const int param1, const u8 param2, const u8 param3, const u8 param4, UnkStruct_ov5_021E8F60 *param5); static int ov5_021E8ABC(const int param0, const int param1, const int param2, const int param3, const int param4); -static void ov5_021E8D50(UnkStruct_ov5_021E8F60 * param0); -static void ov5_021E8F90(const int param0, const int param1, const int param2, const int param3, UnkStruct_ov5_021E8F60 * param4); -static void ov5_021E901C(const int param0, const int param1, const UnkStruct_02039E30 * param2, VecFx32 * param3); -static void ov5_021E9A14(UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, const int param3, const int param4, const int param5); -static void ov5_021E9B70(const int param0, const u8 param1, const UnkStruct_ov5_021EF76C * param2, const UnkStruct_02039E30 * param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 * param7); -static void ov5_021E9C40(const u8 param0, const UnkStruct_ov5_021E8F60 * param1, const UnkStruct_ov5_021D5894 * param2); +static void ov5_021E8D50(UnkStruct_ov5_021E8F60 *param0); +static void ov5_021E8F90(const int param0, const int param1, const int param2, const int param3, UnkStruct_ov5_021E8F60 *param4); +static void ov5_021E901C(const int param0, const int param1, const UnkStruct_02039E30 *param2, VecFx32 *param3); +static void ov5_021E9A14(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, const int param3, const int param4, const int param5); +static void ov5_021E9B70(const int param0, const u8 param1, const UnkStruct_ov5_021EF76C *param2, const UnkStruct_02039E30 *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7); +static void ov5_021E9C40(const u8 param0, const UnkStruct_ov5_021E8F60 *param1, const UnkStruct_ov5_021D5894 *param2); static const UnkStruct_ov5_021FAE98 Unk_ov5_021FAE98 = { ov5_021E8E28, @@ -189,7 +190,7 @@ static const UnkStruct_ov5_021FAE98 Unk_ov5_021FAE90 = { ov5_021E7CD4 }; -static BOOL ov5_021E779C (const int param0, const int param1, const int param2) +static BOOL ov5_021E779C(const int param0, const int param1, const int param2) { if (param0 % param2 != param1 % param2) { return 0; @@ -198,7 +199,7 @@ static BOOL ov5_021E779C (const int param0, const int param1, const int param2) } } -static BOOL ov5_021E77C0 (const int param0, const int param1, const int param2) +static BOOL ov5_021E77C0(const int param0, const int param1, const int param2) { if (param0 / param2 != param1 / param2) { return 0; @@ -207,7 +208,7 @@ static BOOL ov5_021E77C0 (const int param0, const int param1, const int param2) } } -static void ov5_021E77E4 (UnkStruct_ov5_021E8F60 * param0, const u8 param1) +static void ov5_021E77E4(UnkStruct_ov5_021E8F60 *param0, const u8 param1) { u8 v0; u8 v1; @@ -223,7 +224,7 @@ static void ov5_021E77E4 (UnkStruct_ov5_021E8F60 * param0, const u8 param1) param0->unk_04[param1].unk_00.unk_24 = 1; } -static void ov5_021E7814 (UnkStruct_ov5_021E7814 * param0) +static void ov5_021E7814(UnkStruct_ov5_021E7814 *param0) { if (param0->unk_10.unk_00 != 0) { ov5_021E9640(param0->unk_08); @@ -237,7 +238,7 @@ static void ov5_021E7814 (UnkStruct_ov5_021E7814 * param0) param0->unk_10.unk_04 = 0; } -static void ov5_021E7838 (const int param0, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6, const int param7, int * param8) +static void ov5_021E7838(const int param0, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6, const int param7, int *param8) { int v0; u8 v1; @@ -346,12 +347,12 @@ static void ov5_021E7838 (const int param0, const int param1, const int param2, } } -static void ov5_021E79A8 (UnkStruct_ov5_021E8F60 * param0) +static void ov5_021E79A8(UnkStruct_ov5_021E8F60 *param0) { u8 v0; for (v0 = 0; v0 < 4; v0++) { - UnkStruct_ov5_021E79A8 * v1 = NULL; + UnkStruct_ov5_021E79A8 *v1 = NULL; v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E79A8)); param0->unk_84[v0] = v1; @@ -371,12 +372,12 @@ static void ov5_021E79A8 (UnkStruct_ov5_021E8F60 * param0) } } -void ov5_021E7A54 (UnkStruct_ov5_021E8F60 * param0) +void ov5_021E7A54(UnkStruct_ov5_021E8F60 *param0) { u8 v0; for (v0 = 0; v0 < 4; v0++) { - UnkStruct_ov5_021E79A8 * v1 = NULL; + UnkStruct_ov5_021E79A8 *v1 = NULL; v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E79A8)); @@ -393,12 +394,12 @@ void ov5_021E7A54 (UnkStruct_ov5_021E8F60 * param0) } } -static void ov5_021E7AC4 (UnkStruct_ov5_021E8F60 * param0) +static void ov5_021E7AC4(UnkStruct_ov5_021E8F60 *param0) { u8 v0; for (v0 = 0; v0 < 4; v0++) { - UnkStruct_ov5_021E79A8 * v1 = NULL; + UnkStruct_ov5_021E79A8 *v1 = NULL; v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E79A8)); @@ -417,7 +418,7 @@ static void ov5_021E7AC4 (UnkStruct_ov5_021E8F60 * param0) } } -static void ov5_021E7B4C (UnkStruct_ov5_021E8F60 * param0) +static void ov5_021E7B4C(UnkStruct_ov5_021E8F60 *param0) { u8 v0; @@ -433,10 +434,10 @@ static void ov5_021E7B4C (UnkStruct_ov5_021E8F60 * param0) } } -static void ov5_021E7BAC (NARC * param0, const int param1, UnkStruct_ov5_021E7BAC * param2) +static void ov5_021E7BAC(NARC *param0, const int param1, UnkStruct_ov5_021E7BAC *param2) { - void * v0; - int * v1; + void *v0; + int *v1; int v2 = sizeof(int) * 4; if (param0 != NULL) { @@ -463,7 +464,7 @@ static void ov5_021E7BAC (NARC * param0, const int param1, UnkStruct_ov5_021E7BA Heap_FreeToHeap(v0); } -static void ov5_021E7C00 (const u8 param0, UnkStruct_ov5_021EF76C * const param1, const UnkStruct_02039E30 * param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 * param5, UnkStruct_ov5_021E7814 * param6) +static void ov5_021E7C00(const u8 param0, UnkStruct_ov5_021EF76C *const param1, const UnkStruct_02039E30 *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6) { int v0; u8 v1; @@ -485,7 +486,7 @@ static void ov5_021E7C00 (const u8 param0, UnkStruct_ov5_021EF76C * const param1 ov5_021E7BAC(param5->unk_EC, v2, &v3); { - void * v4; + void *v4; v4 = &(param6->unk_00[param0]->unk_00[0]); NARC_ReadFile(param5->unk_EC, v3.unk_00, v4); @@ -506,7 +507,7 @@ static void ov5_021E7C00 (const u8 param0, UnkStruct_ov5_021EF76C * const param1 } } -static void ov5_021E7CD4 (const u8 param0, UnkStruct_ov5_021EF76C * const param1, const UnkStruct_02039E30 * param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 * param5, UnkStruct_ov5_021E7814 * param6) +static void ov5_021E7CD4(const u8 param0, UnkStruct_ov5_021EF76C *const param1, const UnkStruct_02039E30 *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6) { int v0; u8 v1; @@ -542,7 +543,7 @@ static void ov5_021E7CD4 (const u8 param0, UnkStruct_ov5_021EF76C * const param1 } } -static void ov5_021E7D98 (const u8 param0, const UnkStruct_ov5_021EF76C * param1, const UnkStruct_02039E30 * param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 * param5, UnkStruct_ov5_021E7814 * param6) +static void ov5_021E7D98(const u8 param0, const UnkStruct_ov5_021EF76C *param1, const UnkStruct_02039E30 *param2, const int param3, const int param4, UnkStruct_ov5_021E8F60 *param5, UnkStruct_ov5_021E7814 *param6) { int v0; u8 v1; @@ -572,10 +573,10 @@ static void ov5_021E7D98 (const u8 param0, const UnkStruct_ov5_021EF76C * param1 } } -static void ov5_021E7E28 (const int param0, const u8 param1, UnkStruct_ov5_021EF76C * const param2, const UnkStruct_02039E30 * param3, const int param4, const int param5, const BOOL param6, const UnkStruct_ov5_021E8F60 * param7) +static void ov5_021E7E28(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const UnkStruct_02039E30 *param3, const int param4, const int param5, const BOOL param6, const UnkStruct_ov5_021E8F60 *param7) { int v0; - NNSG3dResMdl * v1; + NNSG3dResMdl *v1; UnkStruct_ov5_021E7BAC v2; if ((param0 < 0) || (param0 >= param4 * param5)) { @@ -591,7 +592,7 @@ static void ov5_021E7E28 (const int param0, const u8 param1, UnkStruct_ov5_021EF ov5_021E7BAC(param7->unk_EC, v0, &v2); { - void * v3; + void *v3; v3 = &(param7->unk_84[param1]->unk_00[0]); NARC_ReadFile(param7->unk_EC, v2.unk_00, v3); @@ -622,11 +623,11 @@ static void ov5_021E7E28 (const int param0, const u8 param1, UnkStruct_ov5_021EF } } -static void ov5_021E7F1C (const int param0, const u8 param1, UnkStruct_ov5_021EF76C * const param2, const UnkStruct_02039E30 * param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 * param7) +static void ov5_021E7F1C(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const UnkStruct_02039E30 *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7) { int v0; UnkStruct_ov5_021E7BAC v1; - NNSG3dResMdl * v2; + NNSG3dResMdl *v2; if ((param0 < 0) || (param0 >= param4 * param5)) { return; @@ -662,7 +663,7 @@ static void ov5_021E7F1C (const int param0, const u8 param1, UnkStruct_ov5_021EF param7->unk_84[param1]->unk_860 = param0; } -static void ov5_021E7FF0 (const int param0, const u8 param1, UnkStruct_ov5_021EF76C * const param2, const UnkStruct_02039E30 * param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 * param7) +static void ov5_021E7FF0(const int param0, const u8 param1, UnkStruct_ov5_021EF76C *const param2, const UnkStruct_02039E30 *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7) { int v0; UnkStruct_ov5_021E7BAC v1; @@ -680,7 +681,7 @@ static void ov5_021E7FF0 (const int param0, const u8 param1, UnkStruct_ov5_021EF ov5_021E7BAC(param7->unk_EC, v0, &v1); { - void * v2; + void *v2; v2 = &(param7->unk_84[param1]->unk_00[0]); NARC_ReadFile(param7->unk_EC, v1.unk_00, v2); @@ -703,7 +704,7 @@ static void ov5_021E7FF0 (const int param0, const u8 param1, UnkStruct_ov5_021EF } } -static BOOL ov5_021E80BC (const UnkStruct_ov5_021E80BC * param0) +static BOOL ov5_021E80BC(const UnkStruct_ov5_021E80BC *param0) { if ((param0->unk_00 == 0) && (param0->unk_04 == 0)) { return 1; @@ -712,9 +713,9 @@ static BOOL ov5_021E80BC (const UnkStruct_ov5_021E80BC * param0) } } -static BOOL ov5_021E80D0 (UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, const u8 param3, const u8 param4, const u8 param5, const u8 param6) +static BOOL ov5_021E80D0(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, const u8 param3, const u8 param4, const u8 param5, const u8 param6) { - GF_ASSERT((param0->unk_04[param5].unk_28 == 0)); + GF_ASSERT(param0->unk_04[param5].unk_28 == 0); param0->unk_04[param5].unk_28 = 1; param0->unk_04[param5].unk_2C = param6; @@ -739,11 +740,11 @@ static BOOL ov5_021E80D0 (UnkStruct_ov5_021E8F60 * param0, const int param1, con return 1; } -void ov5_021E8188 (FieldSystem * fieldSystem, UnkStruct_ov5_021E8F60 * param1) +void ov5_021E8188(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1) { u8 v0; - UnkStruct_ov5_021E7814 * v1; - UnkStruct_ov5_021EA174 * v2; + UnkStruct_ov5_021E7814 *v1; + UnkStruct_ov5_021EA174 *v2; v1 = ¶m1->unk_04[param1->unk_96].unk_00; v2 = ¶m1->unk_C0; @@ -848,8 +849,8 @@ void ov5_021E8188 (FieldSystem * fieldSystem, UnkStruct_ov5_021E8F60 * param1) } if (v1->unk_00[v1->unk_22 - 1]->unk_864 == 1) { - NNSG3dResMdlSet * v5 = NNS_G3dGetMdlSet(v1->unk_00[v1->unk_22 - 1]->unk_854); - NNSG3dResMdl * v6 = NNS_G3dGetMdlByIdx(v5, 0); + NNSG3dResMdlSet *v5 = NNS_G3dGetMdlSet(v1->unk_00[v1->unk_22 - 1]->unk_854); + NNSG3dResMdl *v6 = NNS_G3dGetMdlByIdx(v5, 0); if (ov5_021EFAC0(param1->unk_AC) == 1) { ov5_021D53A4(v6); @@ -906,13 +907,13 @@ void ov5_021E8188 (FieldSystem * fieldSystem, UnkStruct_ov5_021E8F60 * param1) } } -static void ov5_021E8558 (const int param0, const int param1, const u8 param2, const u8 param3, const u8 param4, UnkStruct_ov5_021E8F60 * param5) +static void ov5_021E8558(const int param0, const int param1, const u8 param2, const u8 param3, const u8 param4, UnkStruct_ov5_021E8F60 *param5) { int v0; u8 v1; BOOL v2; - GF_ASSERT((param5->unk_5C.unk_08 != 1)); + GF_ASSERT(param5->unk_5C.unk_08 != 1); if (ov5_021E8C58(param4, param5, &v1) == 1) { ov5_021E77E4(param5, v1); @@ -938,11 +939,11 @@ static void ov5_021E8558 (const int param0, const int param1, const u8 param2, c } else { v2 = ov5_021E80D0(param5, param0, param1, param2, param3, param5->unk_95, param4); - GF_ASSERT((v2 == 1)); + GF_ASSERT(v2 == 1); } } -static void ov5_021E8614 (const u8 param0, UnkStruct_ov5_021E8F60 * param1) +static void ov5_021E8614(const u8 param0, UnkStruct_ov5_021E8F60 *param1) { param1->unk_84[param0]->unk_864 = 0; ov5_021EF1DC(param1->unk_84[param0]->unk_85C); @@ -957,9 +958,9 @@ static void ov5_021E8614 (const u8 param0, UnkStruct_ov5_021E8F60 * param1) param1->unk_74[param0] = 1; } -static void ov5_021E8668 (const u8 param0, const u8 param1, const u8 param2, const u8 param3, UnkStruct_ov5_021E8F60 * param4) +static void ov5_021E8668(const u8 param0, const u8 param1, const u8 param2, const u8 param3, UnkStruct_ov5_021E8F60 *param4) { - UnkStruct_ov5_021E79A8 * v0[2]; + UnkStruct_ov5_021E79A8 *v0[2]; ov5_021E8614(param0, param4); ov5_021E8614(param1, param4); @@ -974,7 +975,7 @@ static void ov5_021E8668 (const u8 param0, const u8 param1, const u8 param2, con param4->unk_84[param3] = v0[1]; } -static void ov5_021E86A0 (const int param0, const u8 param1, UnkStruct_ov5_021E8F60 * param2) +static void ov5_021E86A0(const int param0, const u8 param1, UnkStruct_ov5_021E8F60 *param2) { u8 v0, v1; int v2, v3; @@ -1136,9 +1137,9 @@ static void ov5_021E86A0 (const int param0, const u8 param1, UnkStruct_ov5_021E8 } } -static void ov5_021E89D0 (const u8 param0, const UnkStruct_ov5_021E8F60 * param1, UnkStruct_ov5_021D5894 * const param2) +static void ov5_021E89D0(const u8 param0, const UnkStruct_ov5_021E8F60 *param1, UnkStruct_ov5_021D5894 *const param2) { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; ov5_021E901C(param1->unk_84[param0]->unk_860, param1->unk_B4, param1->unk_B0, &v0); @@ -1147,8 +1148,8 @@ static void ov5_021E89D0 (const u8 param0, const UnkStruct_ov5_021E8F60 * param1 v0.z += param1->unk_10C.z; if (param1->unk_84[param0]->unk_864 == 1) { - VecFx32 v1 = {FX32_ONE, FX32_ONE, FX32_ONE}; - MtxFx33 v2 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + VecFx32 v1 = { FX32_ONE, FX32_ONE, FX32_ONE }; + MtxFx33 v2 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; sub_0201CA74(&(param1->unk_84[param0]->unk_800), &v0, &v2, &v1); } @@ -1160,7 +1161,7 @@ static void ov5_021E89D0 (const u8 param0, const UnkStruct_ov5_021E8F60 * param1 } } -static int ov5_021E8A98 (const u32 param0, const int param1, const int param2) +static int ov5_021E8A98(const u32 param0, const int param1, const int param2) { u32 v0, v1; u32 v2, v3; @@ -1175,7 +1176,7 @@ static int ov5_021E8A98 (const u32 param0, const int param1, const int param2) return v4; } -static int ov5_021E8ABC (const int param0, const int param1, const int param2, const int param3, const int param4) +static int ov5_021E8ABC(const int param0, const int param1, const int param2, const int param3, const int param4) { int v0; @@ -1183,7 +1184,7 @@ static int ov5_021E8ABC (const int param0, const int param1, const int param2, c return v0; } -static u32 ov5_021E8ACC (const u32 param0, const int param1, const int param2) +static u32 ov5_021E8ACC(const u32 param0, const int param1, const int param2) { u32 v0, v1; u32 v2, v3; @@ -1198,7 +1199,7 @@ static u32 ov5_021E8ACC (const u32 param0, const int param1, const int param2) return v4; } -static u8 ov5_021E8AF0 (const u8 param0) +static u8 ov5_021E8AF0(const u8 param0) { if (param0 == 0) { return 3; @@ -1215,7 +1216,7 @@ static u8 ov5_021E8AF0 (const u8 param0) return 0; } -static u32 ov5_021E8B1C (const u8 param0, const int param1, const int param2, const int param3) +static u32 ov5_021E8B1C(const u8 param0, const int param1, const int param2, const int param3) { u32 v0; u32 v1; @@ -1266,7 +1267,7 @@ static u32 ov5_021E8B1C (const u8 param0, const int param1, const int param2, co return v0; } -static u8 ov5_021E8B84 (const u8 param0, const int param1) +static u8 ov5_021E8B84(const u8 param0, const int param1) { u8 v0; @@ -1288,7 +1289,7 @@ static u8 ov5_021E8B84 (const u8 param0, const int param1) return v0; } -static void ov5_021E8BC0 (const u8 param0, const int param1, u8 * param2) +static void ov5_021E8BC0(const u8 param0, const int param1, u8 *param2) { u8 v0; u8 v1; @@ -1318,7 +1319,7 @@ static void ov5_021E8BC0 (const u8 param0, const int param1, u8 * param2) (*param2) = v1; } -static u8 ov5_021E8C24 (const u8 param0) +static u8 ov5_021E8C24(const u8 param0) { switch (param0) { case 4: @@ -1335,7 +1336,7 @@ static u8 ov5_021E8C24 (const u8 param0) } } -static BOOL ov5_021E8C58 (const u8 param0, const UnkStruct_ov5_021E8F60 * param1, u8 * param2) +static BOOL ov5_021E8C58(const u8 param0, const UnkStruct_ov5_021E8F60 *param1, u8 *param2) { int v0; @@ -1351,9 +1352,9 @@ static BOOL ov5_021E8C58 (const u8 param0, const UnkStruct_ov5_021E8F60 * param1 return 0; } -static BOOL ov5_021E8C8C (UnkStruct_ov5_021E8F60 * param0) +static BOOL ov5_021E8C8C(UnkStruct_ov5_021E8F60 *param0) { - UnkStruct_ov5_021E8C8C * v0 = ¶m0->unk_5C; + UnkStruct_ov5_021E8C8C *v0 = ¶m0->unk_5C; if (param0->unk_04[param0->unk_95].unk_28 != 0) { GF_ASSERT(FALSE); @@ -1377,11 +1378,11 @@ static BOOL ov5_021E8C8C (UnkStruct_ov5_021E8F60 * param0) return 1; } -static void ov5_021E8D50 (UnkStruct_ov5_021E8F60 * param0) +static void ov5_021E8D50(UnkStruct_ov5_021E8F60 *param0) { int v0; BOOL v1; - UnkStruct_ov5_021E8C8C * v2 = ¶m0->unk_5C; + UnkStruct_ov5_021E8C8C *v2 = ¶m0->unk_5C; if (param0->unk_94 >= 2) { GF_ASSERT(FALSE); @@ -1389,7 +1390,7 @@ static void ov5_021E8D50 (UnkStruct_ov5_021E8F60 * param0) v1 = ov5_021E8C8C(param0); - GF_ASSERT((v1 == 1)); + GF_ASSERT(v1 == 1); v2->unk_00[0]->unk_860 = v2->unk_10[0]; v2->unk_00[1]->unk_860 = v2->unk_10[1]; @@ -1398,12 +1399,12 @@ static void ov5_021E8D50 (UnkStruct_ov5_021E8F60 * param0) param0->unk_95 = (param0->unk_95 + 1) % 2; } -static BOOL ov5_021E8DAC (const UnkStruct_ov5_021E8F60 * param0) +static BOOL ov5_021E8DAC(const UnkStruct_ov5_021E8F60 *param0) { return param0->unk_04[param0->unk_96].unk_00.unk_24; } -static void ov5_021E8DBC (UnkStruct_ov5_021E8F60 * param0) +static void ov5_021E8DBC(UnkStruct_ov5_021E8F60 *param0) { u8 v0; @@ -1412,7 +1413,7 @@ static void ov5_021E8DBC (UnkStruct_ov5_021E8F60 * param0) } } -static void ov5_021E8DD4 (const u8 param0, UnkStruct_ov5_021E8F60 * param1) +static void ov5_021E8DD4(const u8 param0, UnkStruct_ov5_021E8F60 *param1) { switch (param0) { case 4: @@ -1434,7 +1435,7 @@ static void ov5_021E8DD4 (const u8 param0, UnkStruct_ov5_021E8F60 * param1) } } -static void ov5_021E8E28 (UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, const int param3, const int param4, const int param5) +static void ov5_021E8E28(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, const int param3, const int param4, const int param5) { u8 v0; int v1[4]; @@ -1450,7 +1451,7 @@ static void ov5_021E8E28 (UnkStruct_ov5_021E8F60 * param0, const int param1, con } } -static void ov5_021E8ECC (UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, const int param3, const int param4, const int param5) +static void ov5_021E8ECC(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, const int param3, const int param4, const int param5) { u8 v0; int v1[4]; @@ -1464,7 +1465,7 @@ static void ov5_021E8ECC (UnkStruct_ov5_021E8F60 * param0, const int param1, con } } -static void ov5_021E8F60 (UnkStruct_ov5_021E8F60 * param0) +static void ov5_021E8F60(UnkStruct_ov5_021E8F60 *param0) { int v0; @@ -1480,7 +1481,7 @@ static void ov5_021E8F60 (UnkStruct_ov5_021E8F60 * param0) ov5_021E8DBC(param0); } -static void ov5_021E8F90 (const int param0, const int param1, const int param2, const int param3, UnkStruct_ov5_021E8F60 * param4) +static void ov5_021E8F90(const int param0, const int param1, const int param2, const int param3, UnkStruct_ov5_021E8F60 *param4) { int v0 = param0, v1 = param1; @@ -1504,7 +1505,7 @@ static void ov5_021E8F90 (const int param0, const int param1, const int param2, param4->unk_98 = ov5_021E8ACC(param4->unk_9C, param4->unk_B4, param4->unk_BC); } -static void ov5_021E901C (const int param0, const int param1, const UnkStruct_02039E30 * param2, VecFx32 * param3) +static void ov5_021E901C(const int param0, const int param1, const UnkStruct_02039E30 *param2, VecFx32 *param3) { u16 v0; u16 v1; @@ -1534,9 +1535,9 @@ static void ov5_021E901C (const int param0, const int param1, const UnkStruct_02 param3->z += v1 * 32 * 16 * FX32_ONE; } -UnkStruct_ov5_021E8F60 * ov5_021E9084 (UnkStruct_02039E30 * param0, UnkStruct_ov5_021EF76C * param1, UnkStruct_ov5_021D3CAC * param2, const int param3) +UnkStruct_ov5_021E8F60 *ov5_021E9084(UnkStruct_02039E30 *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_ov5_021D3CAC *param2, const int param3) { - UnkStruct_ov5_021E8F60 * v0; + UnkStruct_ov5_021E8F60 *v0; BOOL v1; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E8F60)); @@ -1571,13 +1572,13 @@ UnkStruct_ov5_021E8F60 * ov5_021E9084 (UnkStruct_02039E30 * param0, UnkStruct_ov return v0; } -void ov5_021E9150 (UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2) +void ov5_021E9150(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2) { param0->unk_E8->unk_00(param0, param1, param2, param0->unk_100, param0->unk_108, param0->unk_BC); ov5_021E8F90(param1, param2, param0->unk_100, param0->unk_108, param0); } -void ov5_021E9190 (const u8 param0, UnkStruct_ov5_021E8F60 * param1) +void ov5_021E9190(const u8 param0, UnkStruct_ov5_021E8F60 *param1) { int v0; u32 v1; @@ -1597,7 +1598,7 @@ void ov5_021E9190 (const u8 param0, UnkStruct_ov5_021E8F60 * param1) } } -void ov5_021E91FC (const UnkStruct_ov5_021E8F60 * param0, UnkStruct_ov5_021D5894 * const param1) +void ov5_021E91FC(const UnkStruct_ov5_021E8F60 *param0, UnkStruct_ov5_021D5894 *const param1) { u8 v0; @@ -1608,13 +1609,13 @@ void ov5_021E91FC (const UnkStruct_ov5_021E8F60 * param0, UnkStruct_ov5_021D5894 } } -void ov5_021E9230 (fx32 param0, fx32 param1, int * param2, int * param3) +void ov5_021E9230(fx32 param0, fx32 param1, int *param2, int *param3) { *param2 = param0 / (16 * FX32_ONE); *param3 = param1 / (16 * FX32_ONE); } -void ov5_021E924C (UnkStruct_ov5_021E8F60 * param0) +void ov5_021E924C(UnkStruct_ov5_021E8F60 *param0) { u8 v0; @@ -1645,14 +1646,14 @@ void ov5_021E924C (UnkStruct_ov5_021E8F60 * param0) param0->unk_C0.unk_20 = 0; } -void ov5_021E92E4 (UnkStruct_ov5_021E8F60 * param0) +void ov5_021E92E4(UnkStruct_ov5_021E8F60 *param0) { NARC_dtor(param0->unk_EC); ov5_021EEB48(param0->unk_00); Heap_FreeToHeap((void *)param0); } -BOOL ov5_021E9300 (const UnkStruct_ov5_021E8F60 * param0) +BOOL ov5_021E9300(const UnkStruct_ov5_021E8F60 *param0) { if ((param0->unk_A4 == 1) && (param0->unk_94 == 0)) { return 1; @@ -1661,28 +1662,28 @@ BOOL ov5_021E9300 (const UnkStruct_ov5_021E8F60 * param0) } } -void ov5_021E931C (VecFx32 const * param0, UnkStruct_ov5_021E8F60 * param1) +void ov5_021E931C(VecFx32 const *param0, UnkStruct_ov5_021E8F60 *param1) { param1->unk_C0.unk_00 = *param0; param1->unk_C0.unk_0C = param0; } -void ov5_021E9338 (UnkStruct_ov5_021E8F60 * param0) +void ov5_021E9338(UnkStruct_ov5_021E8F60 *param0) { param0->unk_C0.unk_0C = NULL; } -void ov5_021E9340 (const u8 param0, const UnkStruct_ov5_021E8F60 * param1, UnkStruct_ov5_021E1608 ** param2) +void ov5_021E9340(const u8 param0, const UnkStruct_ov5_021E8F60 *param1, UnkStruct_ov5_021E1608 **param2) { *param2 = param1->unk_84[param0]->unk_868; } -u8 ov5_021E9354 (const UnkStruct_ov5_021E8F60 * param0) +u8 ov5_021E9354(const UnkStruct_ov5_021E8F60 *param0) { return param0->unk_A0; } -u8 ov5_021E935C (const u32 param0, const int param1) +u8 ov5_021E935C(const u32 param0, const int param1) { u8 v0; int v1, v2; @@ -1709,7 +1710,7 @@ u8 ov5_021E935C (const u32 param0, const int param1) return v0; } -u8 ov5_021E9390 (const int param0, const u8 param1, const UnkStruct_ov5_021E8F60 * param2) +u8 ov5_021E9390(const int param0, const u8 param1, const UnkStruct_ov5_021E8F60 *param2) { u8 v0; @@ -1771,13 +1772,13 @@ u8 ov5_021E9390 (const int param0, const u8 param1, const UnkStruct_ov5_021E8F60 return v0; } -int ov5_021E9560 (const UnkStruct_ov5_021E8F60 * param0, const u8 param1) +int ov5_021E9560(const UnkStruct_ov5_021E8F60 *param0, const u8 param1) { GF_ASSERT(param1 < 4); return param0->unk_84[param1]->unk_860; } -BOOL ov5_021E9580 (const UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, u8 * param3) +BOOL ov5_021E9580(const UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, u8 *param3) { int v0, v1; u32 v2, v3; @@ -1815,37 +1816,37 @@ BOOL ov5_021E9580 (const UnkStruct_ov5_021E8F60 * param0, const int param1, cons } } -const UnkStruct_ov5_021EF13C * ov5_021E9610 (const UnkStruct_ov5_021E8F60 * param0, const u8 param1) +const UnkStruct_ov5_021EF13C *ov5_021E9610(const UnkStruct_ov5_021E8F60 *param0, const u8 param1) { return param0->unk_84[param1]->unk_85C; } -u16 const * ov5_021E9624 (const UnkStruct_ov5_021E8F60 * param0, const u8 param1) +u16 const *ov5_021E9624(const UnkStruct_ov5_021E8F60 *param0, const u8 param1) { return param0->unk_84[param1]->unk_00; } -void ov5_021E9630 (UnkStruct_ov5_021E8F60 * param0, UnkFuncPtr_ov5_021E9630 param1, void * param2) +void ov5_021E9630(UnkStruct_ov5_021E8F60 *param0, UnkFuncPtr_ov5_021E9630 param1, void *param2) { param0->unk_F0 = param1; param0->unk_F4 = param2; } -static void ov5_021E9640 (SysTask * param0) +static void ov5_021E9640(SysTask *param0) { - UnkStruct_ov5_021E9640 * v0; + UnkStruct_ov5_021E9640 *v0; v0 = (UnkStruct_ov5_021E9640 *)SysTask_GetParam(param0); v0->unk_1C = 1; } -static void ov5_021E964C (SysTask * param0, void * param1) +static void ov5_021E964C(SysTask *param0, void *param1) { int v0; - UnkStruct_ov5_021E9640 * v1; + UnkStruct_ov5_021E9640 *v1; BOOL v2; int v3; - void * v4; + void *v4; v1 = (UnkStruct_ov5_021E9640 *)param1; @@ -1869,8 +1870,7 @@ static void ov5_021E964C (SysTask * param0, void * param1) NARC_ReadFile(v1->unk_00, v3, v4); v1->unk_24 += v3; break; - case 1: - { + case 1: { int v5; v3 = v1->unk_04 - v1->unk_24; @@ -1890,8 +1890,7 @@ static void ov5_021E964C (SysTask * param0, void * param1) } else { v1->unk_24 += v3; } - } - break; + } break; case 2: if (v1->unk_10 != NULL) { if (sub_0201CA5C(v1->unk_10) == 1) { @@ -1903,10 +1902,9 @@ static void ov5_021E964C (SysTask * param0, void * param1) v1->unk_14 = 3; break; - case 3: - { - NNSG3dResMdlSet * v6 = NNS_G3dGetMdlSet(*v1->unk_0C); - NNSG3dResMdl * v7; + case 3: { + NNSG3dResMdlSet *v6 = NNS_G3dGetMdlSet(*v1->unk_0C); + NNSG3dResMdl *v7; GF_ASSERT(v6->dict.numEntry == 1); @@ -1926,10 +1924,10 @@ static void ov5_021E964C (SysTask * param0, void * param1) } } -SysTask * ov5_021E976C (NARC * param0, const int param1, NNSG3dRenderObj * param2, NNSG3dResFileHeader ** param3, NNSG3dResTex * param4, BOOL * param5, int * param6) +SysTask *ov5_021E976C(NARC *param0, const int param1, NNSG3dRenderObj *param2, NNSG3dResFileHeader **param3, NNSG3dResTex *param4, BOOL *param5, int *param6) { - SysTask * v0; - UnkStruct_ov5_021E9640 * v1; + SysTask *v0; + UnkStruct_ov5_021E9640 *v1; v1 = (UnkStruct_ov5_021E9640 *)Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021E9640)); @@ -1948,10 +1946,10 @@ SysTask * ov5_021E976C (NARC * param0, const int param1, NNSG3dRenderObj * param return v0; } -NNSG3dResMdl * ov5_021E97AC (NARC * param0, const int param1, NNSG3dRenderObj * param2, NNSG3dResFileHeader ** param3, NNSG3dResTex * param4) +NNSG3dResMdl *ov5_021E97AC(NARC *param0, const int param1, NNSG3dRenderObj *param2, NNSG3dResFileHeader **param3, NNSG3dResTex *param4) { BOOL v0; - NNSG3dResMdl * v1; + NNSG3dResMdl *v1; NARC_ReadFile(param0, param1, *(param3)); @@ -1967,7 +1965,7 @@ NNSG3dResMdl * ov5_021E97AC (NARC * param0, const int param1, NNSG3dRenderObj * { u8 v2; u16 v3; - NNSG3dResMdlSet * v4 = NNS_G3dGetMdlSet(*param3); + NNSG3dResMdlSet *v4 = NNS_G3dGetMdlSet(*param3); GF_ASSERT(v4->dict.numEntry == 1); v1 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*param3), 0); @@ -1979,14 +1977,14 @@ NNSG3dResMdl * ov5_021E97AC (NARC * param0, const int param1, NNSG3dRenderObj * return v1; } -NARC * ov5_021E9828 (UnkStruct_ov5_021E8F60 * param0) +NARC *ov5_021E9828(UnkStruct_ov5_021E8F60 *param0) { return param0->unk_EC; } -UnkStruct_ov5_021E8F60 * ov5_021E9830 (UnkStruct_02039E30 * param0, UnkStruct_ov5_021EF76C * param1, NARC * param2) +UnkStruct_ov5_021E8F60 *ov5_021E9830(UnkStruct_02039E30 *param0, UnkStruct_ov5_021EF76C *param1, NARC *param2) { - UnkStruct_ov5_021E8F60 * v0; + UnkStruct_ov5_021E8F60 *v0; BOOL v1; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021E8F60)); @@ -2015,7 +2013,7 @@ UnkStruct_ov5_021E8F60 * ov5_021E9830 (UnkStruct_02039E30 * param0, UnkStruct_ov return v0; } -void ov5_021E98C8 (UnkStruct_ov5_021E8F60 * param0, UnkStruct_02039E30 * param1, UnkStruct_ov5_021EF76C * param2, NARC * param3) +void ov5_021E98C8(UnkStruct_ov5_021E8F60 *param0, UnkStruct_02039E30 *param1, UnkStruct_ov5_021EF76C *param2, NARC *param3) { BOOL v0; @@ -2037,7 +2035,7 @@ void ov5_021E98C8 (UnkStruct_ov5_021E8F60 * param0, UnkStruct_02039E30 * param1, } } -void ov5_021E9938 (UnkStruct_ov5_021E8F60 * param0) +void ov5_021E9938(UnkStruct_ov5_021E8F60 *param0) { u8 v0; @@ -2057,7 +2055,7 @@ void ov5_021E9938 (UnkStruct_ov5_021E8F60 * param0) param0->unk_C0.unk_20 = 0; } -void ov5_021E9998 (UnkStruct_ov5_021E8F60 * param0) +void ov5_021E9998(UnkStruct_ov5_021E8F60 *param0) { u8 v0; @@ -2069,19 +2067,19 @@ void ov5_021E9998 (UnkStruct_ov5_021E8F60 * param0) } } -void ov5_021E99C4 (UnkStruct_ov5_021E8F60 * param0) +void ov5_021E99C4(UnkStruct_ov5_021E8F60 *param0) { ov5_021EEB48(param0->unk_00); Heap_FreeToHeap((void *)param0); } -void ov5_021E99D8 (UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2) +void ov5_021E99D8(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2) { ov5_021E9A14(param0, param1, param2, param0->unk_100, param0->unk_108, param0->unk_BC); ov5_021E8F90(param1, param2, param0->unk_100, param0->unk_108, param0); } -static void ov5_021E9A14 (UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, const int param3, const int param4, const int param5) +static void ov5_021E9A14(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, const int param3, const int param4, const int param5) { u8 v0; int v1[4]; @@ -2095,7 +2093,7 @@ static void ov5_021E9A14 (UnkStruct_ov5_021E8F60 * param0, const int param1, con } } -void ov5_021E9AAC (UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, int * param3) +void ov5_021E9AAC(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, int *param3) { int v0; @@ -2107,18 +2105,18 @@ void ov5_021E9AAC (UnkStruct_ov5_021E8F60 * param0, const int param1, const int } } -void ov5_021E9B10 (UnkStruct_ov5_021E8F60 * param0, int param1, int param2) +void ov5_021E9B10(UnkStruct_ov5_021E8F60 *param0, int param1, int param2) { param0->unk_84[param1]->unk_85C = NULL; ov5_021E9B70(param2, param1, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, ov5_021EFAC0(param0->unk_AC), param0); param0->unk_84[param1]->unk_864 = 0; } -static void ov5_021E9B70 (const int param0, const u8 param1, const UnkStruct_ov5_021EF76C * param2, const UnkStruct_02039E30 * param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 * param7) +static void ov5_021E9B70(const int param0, const u8 param1, const UnkStruct_ov5_021EF76C *param2, const UnkStruct_02039E30 *param3, const int param4, const int param5, const BOOL param6, UnkStruct_ov5_021E8F60 *param7) { int v0, v1; UnkStruct_ov5_021E7BAC v2; - NNSG3dResMdl * v3; + NNSG3dResMdl *v3; if ((param0 < 0) || (param0 >= param4 * param5)) { return; @@ -2141,7 +2139,7 @@ static void ov5_021E9B70 (const int param0, const u8 param1, const UnkStruct_ov5 param7->unk_84[param1]->unk_860 = param0; } -void ov5_021E9C0C (const UnkStruct_ov5_021E8F60 * param0, const UnkStruct_ov5_021D5894 * param1) +void ov5_021E9C0C(const UnkStruct_ov5_021E8F60 *param0, const UnkStruct_ov5_021D5894 *param1) { int v0; @@ -2152,11 +2150,11 @@ void ov5_021E9C0C (const UnkStruct_ov5_021E8F60 * param0, const UnkStruct_ov5_02 } } -static void ov5_021E9C40 (const u8 param0, const UnkStruct_ov5_021E8F60 * param1, const UnkStruct_ov5_021D5894 * param2) +static void ov5_021E9C40(const u8 param0, const UnkStruct_ov5_021E8F60 *param1, const UnkStruct_ov5_021D5894 *param2) { - VecFx32 v0 = {0, 0, 0}; - VecFx32 v1 = {FX32_ONE, FX32_ONE, FX32_ONE}; - MtxFx33 v2 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + VecFx32 v0 = { 0, 0, 0 }; + VecFx32 v1 = { FX32_ONE, FX32_ONE, FX32_ONE }; + MtxFx33 v2 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; ov5_021E901C(param1->unk_84[param0]->unk_860, param1->unk_B4, param1->unk_B0, &v0); @@ -2169,7 +2167,7 @@ static void ov5_021E9C40 (const u8 param0, const UnkStruct_ov5_021E8F60 * param1 } } -void ov5_021E9CD8 (UnkStruct_ov5_021E8F60 * param0) +void ov5_021E9CD8(UnkStruct_ov5_021E8F60 *param0) { int v0; @@ -2190,7 +2188,7 @@ void ov5_021E9CD8 (UnkStruct_ov5_021E8F60 * param0) } } -void ov5_021E9D3C (UnkStruct_02039E30 * param0, UnkStruct_ov5_021EF76C * param1, UnkStruct_ov5_021E8F60 * param2, UnkStruct_ov5_021E8F60 * param3, const int param4, const int param5) +void ov5_021E9D3C(UnkStruct_02039E30 *param0, UnkStruct_ov5_021EF76C *param1, UnkStruct_ov5_021E8F60 *param2, UnkStruct_ov5_021E8F60 *param3, const int param4, const int param5) { int v0; int v1[4]; @@ -2247,7 +2245,7 @@ void ov5_021E9D3C (UnkStruct_02039E30 * param0, UnkStruct_ov5_021EF76C * param1, } } -void ov5_021E9F98 (UnkStruct_ov5_021E8F60 * param0, UnkStruct_ov5_021E8F60 * param1) +void ov5_021E9F98(UnkStruct_ov5_021E8F60 *param0, UnkStruct_ov5_021E8F60 *param1) { int v0; int v1[4]; @@ -2292,11 +2290,11 @@ void ov5_021E9F98 (UnkStruct_ov5_021E8F60 * param0, UnkStruct_ov5_021E8F60 * par param0->unk_A8 = param1->unk_A8; } -void ov5_021EA174 (FieldSystem * fieldSystem, UnkStruct_ov5_021E8F60 * param1) +void ov5_021EA174(FieldSystem *fieldSystem, UnkStruct_ov5_021E8F60 *param1) { u8 v0; - UnkStruct_ov5_021E7814 * v1; - UnkStruct_ov5_021EA174 * v2; + UnkStruct_ov5_021E7814 *v1; + UnkStruct_ov5_021EA174 *v2; v1 = ¶m1->unk_04[param1->unk_96].unk_00; v2 = ¶m1->unk_C0; @@ -2401,8 +2399,8 @@ void ov5_021EA174 (FieldSystem * fieldSystem, UnkStruct_ov5_021E8F60 * param1) } if (v1->unk_00[v1->unk_22 - 1]->unk_864 == 1) { - NNSG3dResMdlSet * v5 = NNS_G3dGetMdlSet(v1->unk_00[v1->unk_22 - 1]->unk_854); - NNSG3dResMdl * v6 = NNS_G3dGetMdlByIdx(v5, 0); + NNSG3dResMdlSet *v5 = NNS_G3dGetMdlSet(v1->unk_00[v1->unk_22 - 1]->unk_854); + NNSG3dResMdl *v6 = NNS_G3dGetMdlByIdx(v5, 0); if (ov5_021EFAC0(param1->unk_AC) == 1) { ov5_021D53A4(v6); @@ -2457,7 +2455,7 @@ void ov5_021EA174 (FieldSystem * fieldSystem, UnkStruct_ov5_021E8F60 * param1) } } -void ov5_021EA540 (UnkStruct_ov5_021E8F60 * param0, UnkStruct_02039E30 * param1, UnkStruct_ov5_021EF76C * param2) +void ov5_021EA540(UnkStruct_ov5_021E8F60 *param0, UnkStruct_02039E30 *param1, UnkStruct_ov5_021EF76C *param2) { param0->unk_AC = param2; param0->unk_B0 = param1; @@ -2471,7 +2469,7 @@ void ov5_021EA540 (UnkStruct_ov5_021E8F60 * param0, UnkStruct_02039E30 * param1, param0->unk_A8 = 2; } -void ov5_021EA58C (UnkStruct_ov5_021E8F60 * param0, const int param1, const int param2, int * param3) +void ov5_021EA58C(UnkStruct_ov5_021E8F60 *param0, const int param1, const int param2, int *param3) { int v0; @@ -2482,7 +2480,7 @@ void ov5_021EA58C (UnkStruct_ov5_021E8F60 * param0, const int param1, const int } } -void ov5_021EA5E0 (UnkStruct_ov5_021E8F60 * param0, int param1, int param2) +void ov5_021EA5E0(UnkStruct_ov5_021E8F60 *param0, int param1, int param2) { param0->unk_84[param1]->unk_864 = 0; ov5_021EEB84(param1, param0->unk_00, (void **)&(param0->unk_84[param1]->unk_854)); @@ -2495,7 +2493,7 @@ void ov5_021EA5E0 (UnkStruct_ov5_021E8F60 * param0, int param1, int param2) ov5_021E7E28(param2, param1, param0->unk_AC, param0->unk_B0, param0->unk_B4, param0->unk_B8, ov5_021EFAC0(param0->unk_AC), param0); } -void ov5_021EA678 (UnkStruct_ov5_021E8F60 * param0, int param1, int param2, int param3) +void ov5_021EA678(UnkStruct_ov5_021E8F60 *param0, int param1, int param2, int param3) { param0->unk_100 = param1; param0->unk_104 = param2; @@ -2505,42 +2503,42 @@ void ov5_021EA678 (UnkStruct_ov5_021E8F60 * param0, int param1, int param2, int param0->unk_10C.z = param3 * 16 * FX32_ONE; } -void ov5_021EA6A4 (UnkStruct_ov5_021E8F60 * param0, int param1) +void ov5_021EA6A4(UnkStruct_ov5_021E8F60 *param0, int param1) { param0->unk_F8 = param1; } -int ov5_021EA6AC (const UnkStruct_ov5_021E8F60 * param0) +int ov5_021EA6AC(const UnkStruct_ov5_021E8F60 *param0) { return param0->unk_100; } -int ov5_021EA6B4 (const UnkStruct_ov5_021E8F60 * param0) +int ov5_021EA6B4(const UnkStruct_ov5_021E8F60 *param0) { return param0->unk_108; } -void ov5_021EA6BC (const UnkStruct_ov5_021E8F60 * param0, VecFx32 * param1) +void ov5_021EA6BC(const UnkStruct_ov5_021E8F60 *param0, VecFx32 *param1) { *param1 = param0->unk_10C; } -void ov5_021EA6D0 (UnkStruct_ov5_021E8F60 * param0, int param1) +void ov5_021EA6D0(UnkStruct_ov5_021E8F60 *param0, int param1) { param0->unk_FC = param1; } -void ov5_021EA6D8 (UnkStruct_ov5_021E8F60 * param0, UnkStruct_02039E30 * param1) +void ov5_021EA6D8(UnkStruct_ov5_021E8F60 *param0, UnkStruct_02039E30 *param1) { param0->unk_B0 = param1; } -void ov5_021EA6E0 (UnkStruct_ov5_021E8F60 * param0, int param1, BOOL param2) +void ov5_021EA6E0(UnkStruct_ov5_021E8F60 *param0, int param1, BOOL param2) { param0->unk_84[param1]->unk_864 = param2; } -void ov5_021EA6F4 (UnkStruct_ov5_021E8F60 * param0, int param1, int param2) +void ov5_021EA6F4(UnkStruct_ov5_021E8F60 *param0, int param1, int param2) { ov5_021E8F90(param1, param2, param0->unk_100, param0->unk_108, param0); } diff --git a/src/overlay005/ov5_021EA714.c b/src/overlay005/ov5_021EA714.c index 510e8bea1c..37d19c482d 100644 --- a/src/overlay005/ov5_021EA714.c +++ b/src/overlay005/ov5_021EA714.c @@ -1,33 +1,33 @@ +#include "overlay005/ov5_021EA714.h" + #include #include #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay024/ov24_02253CE0.h" +#include "overlay025/poketch_system.h" #include "game_overlay.h" -#include "unk_0200A784.h" -#include "vars_flags.h" #include "poketch_data.h" +#include "unk_0200A784.h" #include "unk_0206A8DC.h" -#include "overlay005/ov5_021EA714.h" -#include "overlay024/ov24_02253CE0.h" -#include "overlay025/poketch_system.h" +#include "vars_flags.h" FS_EXTERN_OVERLAY(overlay24); FS_EXTERN_OVERLAY(overlay25); -void ov5_021EA714 (FieldSystem * fieldSystem, int param1, u32 param2) +void ov5_021EA714(FieldSystem *fieldSystem, int param1, u32 param2) { if ((fieldSystem->unk_04 != NULL) && (fieldSystem->unk_04->poketchSys != NULL)) { PoketchSystem_SendEvent(fieldSystem->unk_04->poketchSys, param1, param2); } } - -void ov5_021EA728 (FieldSystem * fieldSystem) +void ov5_021EA728(FieldSystem *fieldSystem) { PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); - VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v1 = SaveData_GetVarsFlags(fieldSystem->saveData); if (PoketchData_IsEnabled(poketchData) && (sub_0206AE2C(v1) == 0)) { @@ -39,10 +39,10 @@ void ov5_021EA728 (FieldSystem * fieldSystem) } } -void ov5_021EA790 (FieldSystem * fieldSystem) +void ov5_021EA790(FieldSystem *fieldSystem) { PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); - VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v1 = SaveData_GetVarsFlags(fieldSystem->saveData); if (PoketchData_IsEnabled(poketchData) && (sub_0206AE2C(v1) == 0)) { @@ -52,10 +52,10 @@ void ov5_021EA790 (FieldSystem * fieldSystem) } } -u8 ov5_021EA7CC (FieldSystem * fieldSystem) +u8 ov5_021EA7CC(FieldSystem *fieldSystem) { PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); - VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v1 = SaveData_GetVarsFlags(fieldSystem->saveData); if (PoketchData_IsEnabled(poketchData) && (sub_0206AE2C(v1) == 0)) { @@ -74,18 +74,18 @@ u8 ov5_021EA7CC (FieldSystem * fieldSystem) return 0; } -void ov5_021EA830 (FieldSystem * fieldSystem) +void ov5_021EA830(FieldSystem *fieldSystem) { Overlay_LoadByID(FS_OVERLAY_ID(overlay24), 2); ov24_02253CE0(fieldSystem->unk_08); } -void ov5_021EA848 (FieldSystem * fieldSystem) +void ov5_021EA848(FieldSystem *fieldSystem) { ov24_02253DA4(fieldSystem->unk_08); } -BOOL ov5_021EA854 (FieldSystem * fieldSystem) +BOOL ov5_021EA854(FieldSystem *fieldSystem) { if (ov24_02253DB4(fieldSystem->unk_08)) { Overlay_UnloadByID(FS_OVERLAY_ID(overlay24)); diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index 1973e14e6f..5189345b3b 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -1,60 +1,58 @@ +#include "overlay005/ov5_021EA874.h" + #include #include #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "savedata.h" - #include "struct_defs/struct_02013A04_t.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bag.h" +#include "communication_information.h" +#include "communication_system.h" +#include "field_system.h" +#include "game_options.h" +#include "heap.h" +#include "message.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02005474.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_0202ACE0.h" #include "unk_0203061C.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_0203909C.h" -#include "field_system.h" #include "unk_020508D4.h" #include "unk_0205D8CC.h" -#include "bag.h" -#include "overlay005/ov5_021EA874.h" typedef struct { - ResourceMetadata * unk_00; - BmpList * unk_04; - Strbuf* unk_08; - Strbuf* unk_0C; + ResourceMetadata *unk_00; + BmpList *unk_04; + Strbuf *unk_08; + Strbuf *unk_0C; Window unk_10; Window unk_20; - FieldSystem * fieldSystem; - SaveData * unk_34; - StringTemplate * unk_38; - MessageLoader * unk_3C; + FieldSystem *fieldSystem; + SaveData *unk_34; + StringTemplate *unk_38; + MessageLoader *unk_3C; int unk_40; - UIControlData * unk_44; + UIControlData *unk_44; int unk_48; int unk_4C[8]; int unk_6C[8]; @@ -62,15 +60,15 @@ typedef struct { int unk_90; } UnkStruct_ov5_021EAE78; -static void ov5_021EAE78(UnkStruct_ov5_021EAE78 * param0, int param1); -static void ov5_021EAF1C(UnkStruct_ov5_021EAE78 * param0); -static void ov5_021EAF90(BmpList * param0, u32 param1, u8 param2); +static void ov5_021EAE78(UnkStruct_ov5_021EAE78 *param0, int param1); +static void ov5_021EAF1C(UnkStruct_ov5_021EAE78 *param0); +static void ov5_021EAF90(BmpList *param0, u32 param1, u8 param2); -static BOOL ov5_021EA874 (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EA874(UnkStruct_ov5_021EAE78 *param0) { int v0, v1 = 0; - DWCFriendData * v2 = sub_0202AED8(sub_0202B370(param0->unk_34), 0); - DWCFriendData * v3; + DWCFriendData *v2 = sub_0202AED8(sub_0202B370(param0->unk_34), 0); + DWCFriendData *v3; if (0 == sub_020391DC(param0->unk_34, param0->unk_4C, 4)) { return 1; @@ -85,10 +83,10 @@ static BOOL ov5_021EA874 (UnkStruct_ov5_021EAE78 * param0) return 0; } -static BOOL ov5_021EA8F0 (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EA8F0(UnkStruct_ov5_021EAE78 *param0) { int v0; - TrainerInfo * v1; + TrainerInfo *v1; param0->unk_8C = -1; @@ -113,7 +111,7 @@ static BOOL ov5_021EA8F0 (UnkStruct_ov5_021EAE78 * param0) } { - UnkStruct_0202B370 * v2 = sub_0202B370(param0->unk_34); + UnkStruct_0202B370 *v2 = sub_0202B370(param0->unk_34); for (v0 = 0; v0 < 32; v0++) { if (!sub_0202AF78(v2, v0)) { @@ -136,7 +134,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov5_021FAF00 = { 0x21F }; -static BOOL ov5_021EA9BC (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EA9BC(UnkStruct_ov5_021EAE78 *param0) { if (Message_Printing(param0->unk_40) == 0) { param0->unk_44 = sub_02002100(param0->fieldSystem->unk_08, &Unk_ov5_021FAF00, 1024 - (18 + 12) - 9, 11, 4); @@ -146,17 +144,17 @@ static BOOL ov5_021EA9BC (UnkStruct_ov5_021EAE78 * param0) return 0; } -static BOOL ov5_021EA9F8 (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EA9F8(UnkStruct_ov5_021EAE78 *param0) { - DWCFriendData * v0; - Strbuf* v1; + DWCFriendData *v0; + Strbuf *v1; int v2; int v3 = sub_02002114(param0->unk_44, 4); if (v3 == 0xffffffff) { return 0; } else if (v3 == 0) { - UnkStruct_0202B370 * v4 = sub_0202B370(param0->unk_34); + UnkStruct_0202B370 *v4 = sub_0202B370(param0->unk_34); for (v2 = 0; v2 < 32; v2++) { if (!sub_0202AF78(v4, v2)) { @@ -176,7 +174,7 @@ static BOOL ov5_021EA9F8 (UnkStruct_ov5_021EAE78 * param0) return 0; } -static BOOL ov5_021EAA6C (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EAA6C(UnkStruct_ov5_021EAE78 *param0) { if (Message_Printing(param0->unk_40) == 0) { param0->unk_44 = sub_02002100(param0->fieldSystem->unk_08, &Unk_ov5_021FAF00, 1024 - (18 + 12) - 9, 11, 4); @@ -186,11 +184,11 @@ static BOOL ov5_021EAA6C (UnkStruct_ov5_021EAE78 * param0) return 0; } -static BOOL ov5_021EAAA8 (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EAAA8(UnkStruct_ov5_021EAE78 *param0) { - TrainerInfo * v0; - DWCFriendData * v1; - Strbuf* v2; + TrainerInfo *v0; + DWCFriendData *v1; + Strbuf *v2; int v3; int v4 = sub_02002114(param0->unk_44, 4); @@ -208,7 +206,7 @@ static BOOL ov5_021EAAA8 (UnkStruct_ov5_021EAE78 * param0) return 0; } -static BOOL ov5_021EAAEC (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EAAEC(UnkStruct_ov5_021EAE78 *param0) { if (Message_Printing(param0->unk_40) == 0) { param0->unk_44 = sub_02002100(param0->fieldSystem->unk_08, &Unk_ov5_021FAF00, 1024 - (18 + 12) - 9, 11, 4); @@ -218,11 +216,11 @@ static BOOL ov5_021EAAEC (UnkStruct_ov5_021EAE78 * param0) return 0; } -static BOOL ov5_021EAB28 (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EAB28(UnkStruct_ov5_021EAE78 *param0) { - TrainerInfo * v0; - DWCFriendData * v1; - Strbuf* v2; + TrainerInfo *v0; + DWCFriendData *v1; + Strbuf *v2; int v3; int v4 = sub_02002114(param0->unk_44, 4); @@ -260,9 +258,9 @@ static const UnkStruct_ov84_02240FA8 Unk_ov5_021FAF08 = { NULL }; -static BOOL ov5_021EAB58 (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EAB58(UnkStruct_ov5_021EAE78 *param0) { - UnkStruct_0202B370 * v0 = sub_0202B370(param0->unk_34); + UnkStruct_0202B370 *v0 = sub_0202B370(param0->unk_34); UnkStruct_ov84_02240FA8 v1; int v2 = sub_0202AF94(v0); int v3 = 5; @@ -273,7 +271,7 @@ static BOOL ov5_021EAB58 (UnkStruct_ov5_021EAE78 * param0) Window_Show(¶m0->unk_20, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v4; + MessageLoader *v4; int v5 = 0; for (v5 = 0; v5 < 32; v5++) { @@ -302,9 +300,9 @@ static BOOL ov5_021EAB58 (UnkStruct_ov5_021EAE78 * param0) return 0; } -static BOOL ov5_021EAC44 (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EAC44(UnkStruct_ov5_021EAE78 *param0) { - TrainerInfo * v0; + TrainerInfo *v0; int v1; v1 = sub_02001288(param0->unk_04); @@ -324,8 +322,8 @@ static BOOL ov5_021EAC44 (UnkStruct_ov5_021EAE78 * param0) param0->unk_90 = v1; { - UnkStruct_0202B370 * v2 = sub_0202B370(param0->unk_34); - TrainerInfo * v3 = TrainerInfo_New(4); + UnkStruct_0202B370 *v2 = sub_0202B370(param0->unk_34); + TrainerInfo *v3 = TrainerInfo_New(4); TrainerInfo_SetName(v3, sub_0202AEF0(v2, v1)); StringTemplate_SetPlayerName(param0->unk_38, 0, v3); @@ -345,7 +343,7 @@ static BOOL ov5_021EAC44 (UnkStruct_ov5_021EAE78 * param0) return 0; } -static BOOL ov5_021EACFC (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EACFC(UnkStruct_ov5_021EAE78 *param0) { if (Message_Printing(param0->unk_40) == 0) { param0->unk_44 = sub_02002100(param0->fieldSystem->unk_08, &Unk_ov5_021FAF00, 1024 - (18 + 12) - 9, 11, 4); @@ -355,12 +353,12 @@ static BOOL ov5_021EACFC (UnkStruct_ov5_021EAE78 * param0) return 0; } -static BOOL ov5_021EAD38 (UnkStruct_ov5_021EAE78 * param0) +static BOOL ov5_021EAD38(UnkStruct_ov5_021EAE78 *param0) { - UnkStruct_0202B370 * v0 = sub_0202B370(param0->unk_34); - TrainerInfo * v1; - DWCFriendData * v2; - Strbuf* v3; + UnkStruct_0202B370 *v0 = sub_0202B370(param0->unk_34); + TrainerInfo *v1; + DWCFriendData *v2; + Strbuf *v3; int v4 = sub_02002114(param0->unk_44, 4); if (v4 == 0xffffffff) { @@ -380,10 +378,10 @@ static BOOL ov5_021EAD38 (UnkStruct_ov5_021EAE78 * param0) return 0; } -static BOOL ov5_021EADB4 (TaskManager * param0) +static BOOL ov5_021EADB4(TaskManager *param0) { - UnkStruct_ov5_021EAE78 * v0 = TaskManager_Environment(param0); - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov5_021EAE78 *v0 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); switch (v0->unk_48) { case 0: @@ -436,7 +434,7 @@ static BOOL ov5_021EADB4 (TaskManager * param0) return 0; } -static void ov5_021EAE78 (UnkStruct_ov5_021EAE78 * param0, int param1) +static void ov5_021EAE78(UnkStruct_ov5_021EAE78 *param0, int param1) { if (BGL_WindowAdded(¶m0->unk_10)) { BGL_DeleteWindow(¶m0->unk_10); @@ -450,7 +448,7 @@ static void ov5_021EAE78 (UnkStruct_ov5_021EAE78 * param0, int param1) param0->unk_40 = FieldMessage_Print(¶m0->unk_10, param0->unk_0C, SaveData_Options(param0->fieldSystem->saveData), 1); } -static void ov5_021EAEE0 (UnkStruct_ov5_021EAE78 * param0) +static void ov5_021EAEE0(UnkStruct_ov5_021EAE78 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_ov5_021EAE78)); @@ -460,7 +458,7 @@ static void ov5_021EAEE0 (UnkStruct_ov5_021EAE78 * param0) param0->unk_08 = Strbuf_Init(110, 4); } -static void ov5_021EAF1C (UnkStruct_ov5_021EAE78 * param0) +static void ov5_021EAF1C(UnkStruct_ov5_021EAE78 *param0) { MessageLoader_Free(param0->unk_3C); StringTemplate_Free(param0->unk_38); @@ -472,10 +470,10 @@ static void ov5_021EAF1C (UnkStruct_ov5_021EAE78 * param0) } } -void ov5_021EAF50 (FieldSystem * fieldSystem) +void ov5_021EAF50(FieldSystem *fieldSystem) { - UnkStruct_ov5_021EAE78 * v0; - TaskManager * v1 = fieldSystem->unk_10; + UnkStruct_ov5_021EAE78 *v0; + TaskManager *v1 = fieldSystem->unk_10; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov5_021EAE78)); ov5_021EAEE0(v0); @@ -491,7 +489,7 @@ void ov5_021EAF50 (FieldSystem * fieldSystem) } } -static void ov5_021EAF90 (BmpList * param0, u32 param1, u8 param2) +static void ov5_021EAF90(BmpList *param0, u32 param1, u8 param2) { if (param2 == 0) { Sound_PlayEffect(1500); diff --git a/src/overlay005/ov5_021EAFA4.c b/src/overlay005/ov5_021EAFA4.c index 8a0908f58e..7bd5937552 100644 --- a/src/overlay005/ov5_021EAFA4.c +++ b/src/overlay005/ov5_021EAFA4.c @@ -1,11 +1,12 @@ +#include "overlay005/ov5_021EAFA4.h" + #include #include #include "overlay115/camera_angle.h" -#include "heap.h" #include "camera.h" -#include "overlay005/ov5_021EAFA4.h" +#include "heap.h" typedef struct UnkStruct_ov5_021EB0E0_t { u16 unk_00; @@ -14,11 +15,11 @@ typedef struct UnkStruct_ov5_021EB0E0_t { VecFx32 unk_10; fx32 unk_1C; MtxFx43 unk_20; - Camera * camera; + Camera *camera; VecFx32 unk_54; } UnkStruct_ov5_021EB0E0; -VecFx32 ov5_021EAFA4 (const u16 param0, const u16 param1, const UnkStruct_ov5_021EB0E0 * param2) +VecFx32 ov5_021EAFA4(const u16 param0, const u16 param1, const UnkStruct_ov5_021EB0E0 *param2) { s8 v0, v1; VecFx32 v2; @@ -32,7 +33,7 @@ VecFx32 ov5_021EAFA4 (const u16 param0, const u16 param1, const UnkStruct_ov5_02 { MtxFx43 v8; VecFx32 v9; - VecFx32 v10 = {0, 0, -FX32_ONE}; + VecFx32 v10 = { 0, 0, -FX32_ONE }; if (param1 < 96) { v4 = 96 - param1; @@ -78,9 +79,9 @@ VecFx32 ov5_021EAFA4 (const u16 param0, const u16 param1, const UnkStruct_ov5_02 } } -UnkStruct_ov5_021EB0E0 * ov5_021EB0C8 (Camera * const param0) +UnkStruct_ov5_021EB0E0 *ov5_021EB0C8(Camera *const param0) { - UnkStruct_ov5_021EB0E0 * v0; + UnkStruct_ov5_021EB0E0 *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EB0E0)); ov5_021EB0E0(v0, param0); @@ -88,7 +89,7 @@ UnkStruct_ov5_021EB0E0 * ov5_021EB0C8 (Camera * const param0) return v0; } -void ov5_021EB0E0 (UnkStruct_ov5_021EB0E0 * param0, Camera * const param1) +void ov5_021EB0E0(UnkStruct_ov5_021EB0E0 *param0, Camera *const param1) { CameraAngle v0; @@ -104,7 +105,7 @@ void ov5_021EB0E0 (UnkStruct_ov5_021EB0E0 * param0, Camera * const param1) param0->unk_02 = FX_AtanIdx(v1); } { - VecFx32 v2 = {0, FX32_ONE, 0}; + VecFx32 v2 = { 0, FX32_ONE, 0 }; VecFx32 v3, v4; v3 = Camera_GetPosition(param1); @@ -120,7 +121,7 @@ void ov5_021EB0E0 (UnkStruct_ov5_021EB0E0 * param0, Camera * const param1) param0->camera = param1; } -void ov5_021EB184 (UnkStruct_ov5_021EB0E0 ** param0) +void ov5_021EB184(UnkStruct_ov5_021EB0E0 **param0) { if ((*param0) == NULL) { return; @@ -128,6 +129,6 @@ void ov5_021EB184 (UnkStruct_ov5_021EB0E0 ** param0) GF_ASSERT((*param0) != NULL); - Heap_FreeToHeap((*param0)); + Heap_FreeToHeap(*param0); (*param0) = NULL; } diff --git a/src/overlay005/ov5_021EB1A0.c b/src/overlay005/ov5_021EB1A0.c index 2633ddd7fb..6f06a89a14 100644 --- a/src/overlay005/ov5_021EB1A0.c +++ b/src/overlay005/ov5_021EB1A0.c @@ -1,32 +1,32 @@ +#include "overlay005/ov5_021EB1A0.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay005/const_ov5_021FB51C.h" - -#include "overlay005/struct_ov5_021EC700.h" -#include "overlay005/struct_ov5_021ECD10.h" -#include "overlay005/struct_ov5_021ED01C.h" - -#include "unk_0201D15C.h" -#include "unk_02020AEC.h" -#include "map_object.h" #include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021EB1A0.h" #include "overlay005/ov5_021ECA70.h" #include "overlay005/ov5_021ECC20.h" #include "overlay005/ov5_021ECE40.h" #include "overlay005/ov5_021F10E8.h" #include "overlay005/ov5_021F23D0.h" +#include "overlay005/struct_ov5_021EC700.h" +#include "overlay005/struct_ov5_021ECD10.h" +#include "overlay005/struct_ov5_021ED01C.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" + +#include "map_object.h" +#include "unk_0201D15C.h" +#include "unk_02020AEC.h" typedef struct { s16 unk_00; s8 unk_02; s8 unk_03; - UnkStruct_020216E0 * unk_04; + UnkStruct_020216E0 *unk_04; UnkStruct_ov5_021ED01C unk_08; } UnkStruct_ov5_021EB2EC; @@ -35,7 +35,7 @@ typedef struct { s8 unk_01; s8 unk_02; s8 unk_03; - UnkStruct_020216E0 * unk_04; + UnkStruct_020216E0 *unk_04; UnkStruct_ov5_021ED01C unk_08; } UnkStruct_ov5_021EB7F8; @@ -45,19 +45,19 @@ typedef struct { s8 unk_02; u8 unk_03_0 : 1; u8 unk_03_1 : 7; - UnkStruct_020216E0 * unk_04; + UnkStruct_020216E0 *unk_04; UnkStruct_ov5_021ED01C unk_08; } UnkStruct_ov5_021EBA0C; typedef struct { - UnkStruct_ov101_021D5D90 * unk_00; + UnkStruct_ov101_021D5D90 *unk_00; } UnkStruct_ov5_021EC760; typedef struct { s16 unk_00; s8 unk_02; s8 unk_03; - UnkStruct_020216E0 * unk_04; + UnkStruct_020216E0 *unk_04; UnkStruct_ov5_021ED01C unk_08; u32 unk_10; } UnkStruct_ov5_021EC804; @@ -65,43 +65,43 @@ typedef struct { typedef struct { int unk_00; fx32 unk_04; - UnkStruct_020216E0 * unk_08; + UnkStruct_020216E0 *unk_08; UnkStruct_ov5_021ED01C unk_0C; } UnkStruct_ov5_021EC938; -void ov5_021EB2EC(MapObject * mapObj); -void ov5_021EB314(MapObject * mapObj); -void ov5_021EB328(MapObject * mapObj); -void ov5_021EB354(MapObject * mapObj); -void ov5_021EB398(MapObject * mapObj); -void ov5_021EB40C(MapObject * mapObj); -static void ov5_021EB478(MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB4AC(MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB4E8(MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB524(MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB560(MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB59C(MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EB620(MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3); -static void ov5_021EC068(MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3); -static void ov5_021EC0E4(MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3); -void ov5_021EC734(MapObject * mapObj); -void ov5_021EC75C(MapObject * mapObj); -void ov5_021EC760(MapObject * mapObj); -void ov5_021EC778(MapObject * mapObj); -void ov5_021EC790(MapObject * mapObj); -static void ov5_021EC638(UnkStruct_020216E0 * param0, int param1); -static void ov5_021EC668(UnkStruct_020216E0 * param0); -static void ov5_021EC674(UnkStruct_020216E0 * param0, int param1, int param2); -static void ov5_021EC69C(UnkStruct_020216E0 * param0, int param1); -static void ov5_021EC6C0(MapObject * mapObj, UnkStruct_020216E0 * param1); -static void ov5_021EC374(MapObject * mapObj, UnkStruct_020216E0 * param1, int param2); - -void(*const Unk_ov5_021FF3D4[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int); -void(*const Unk_ov5_021FF420[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int); -void(*const Unk_ov5_021FF3F8[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); -static void(*const Unk_ov5_021FF448[11])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); - -UnkStruct_020216E0 * ov5_021EB1A0 (MapObject * mapObj) +void ov5_021EB2EC(MapObject *mapObj); +void ov5_021EB314(MapObject *mapObj); +void ov5_021EB328(MapObject *mapObj); +void ov5_021EB354(MapObject *mapObj); +void ov5_021EB398(MapObject *mapObj); +void ov5_021EB40C(MapObject *mapObj); +static void ov5_021EB478(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3); +static void ov5_021EB4AC(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3); +static void ov5_021EB4E8(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3); +static void ov5_021EB524(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3); +static void ov5_021EB560(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3); +static void ov5_021EB59C(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3); +static void ov5_021EB620(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3); +static void ov5_021EC068(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3); +static void ov5_021EC0E4(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3); +void ov5_021EC734(MapObject *mapObj); +void ov5_021EC75C(MapObject *mapObj); +void ov5_021EC760(MapObject *mapObj); +void ov5_021EC778(MapObject *mapObj); +void ov5_021EC790(MapObject *mapObj); +static void ov5_021EC638(UnkStruct_020216E0 *param0, int param1); +static void ov5_021EC668(UnkStruct_020216E0 *param0); +static void ov5_021EC674(UnkStruct_020216E0 *param0, int param1, int param2); +static void ov5_021EC69C(UnkStruct_020216E0 *param0, int param1); +static void ov5_021EC6C0(MapObject *mapObj, UnkStruct_020216E0 *param1); +static void ov5_021EC374(MapObject *mapObj, UnkStruct_020216E0 *param1, int param2); + +void (*const Unk_ov5_021FF3D4[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int); +void (*const Unk_ov5_021FF420[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int); +void (*const Unk_ov5_021FF3F8[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); +static void (*const Unk_ov5_021FF448[11])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); + +UnkStruct_020216E0 *ov5_021EB1A0(MapObject *mapObj) { int v0 = sub_02062920(mapObj); @@ -137,45 +137,39 @@ UnkStruct_020216E0 * ov5_021EB1A0 (MapObject * mapObj) case 0x110: case 0x111: case 0x112: - case 0x113: - { - UnkStruct_ov5_021EBA0C * v1; + case 0x113: { + UnkStruct_ov5_021EBA0C *v1; v1 = sub_02062AF0(mapObj); return v1->unk_04; } - case 0xc3: - { - UnkStruct_ov5_021EB7F8 * v2; + case 0xc3: { + UnkStruct_ov5_021EB7F8 *v2; v2 = sub_02062AF0(mapObj); return v2->unk_04; } case 0x97: case 0x98: - case 0x99: - { + case 0x99: { return ov5_021ECB80(mapObj); } - case 0x108: - { - UnkStruct_ov5_021EC804 * v3; + case 0x108: { + UnkStruct_ov5_021EC804 *v3; v3 = sub_02062AF0(mapObj); return v3->unk_04; } - case 0x64: - { + case 0x64: { return NULL; } - default: - { - const UnkStruct_ov5_021ECD10 * v4; + default: { + const UnkStruct_ov5_021ECD10 *v4; v4 = ov5_021ECD04(mapObj); if (v4->unk_04_0 == 1) { - UnkStruct_ov5_021EB2EC * v5; + UnkStruct_ov5_021EB2EC *v5; v5 = sub_02062AF0(mapObj); return v5->unk_04; @@ -186,9 +180,9 @@ UnkStruct_020216E0 * ov5_021EB1A0 (MapObject * mapObj) return NULL; } -void ov5_021EB2EC (MapObject * mapObj) +void ov5_021EB2EC(MapObject *mapObj) { - UnkStruct_ov5_021EB2EC * v0; + UnkStruct_ov5_021EB2EC *v0; v0 = sub_02062ACC(mapObj, (sizeof(UnkStruct_ov5_021EB2EC))); v0->unk_02 = -1; @@ -200,17 +194,17 @@ void ov5_021EB2EC (MapObject * mapObj) } } -void ov5_021EB314 (MapObject * mapObj) +void ov5_021EB314(MapObject *mapObj) { - UnkStruct_ov5_021EB2EC * v0; + UnkStruct_ov5_021EB2EC *v0; v0 = sub_02062AF0(mapObj); ov5_021ECFA4(mapObj, &v0->unk_04); } -void ov5_021EB328 (MapObject * mapObj) +void ov5_021EB328(MapObject *mapObj) { - UnkStruct_ov5_021EB2EC * v0; + UnkStruct_ov5_021EB2EC *v0; v0 = sub_02062AF0(mapObj); @@ -222,10 +216,10 @@ void ov5_021EB328 (MapObject * mapObj) MapObject_SetStatusFlagOn(mapObj, (1 << 21)); } -void ov5_021EB354 (MapObject * mapObj) +void ov5_021EB354(MapObject *mapObj) { int v0; - UnkStruct_ov5_021EB2EC * v1; + UnkStruct_ov5_021EB2EC *v1; v1 = sub_02062AF0(mapObj); @@ -245,11 +239,11 @@ void ov5_021EB354 (MapObject * mapObj) } } -void ov5_021EB398 (MapObject * mapObj) +void ov5_021EB398(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EB2EC * v2 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v3 = v2->unk_04; + UnkStruct_ov5_021EB2EC *v2 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v3 = v2->unk_04; v2 = sub_02062AF0(mapObj); @@ -274,11 +268,11 @@ void ov5_021EB398 (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -void ov5_021EB40C (MapObject * mapObj) +void ov5_021EB40C(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EB2EC * v2; - UnkStruct_020216E0 * v3; + UnkStruct_ov5_021EB2EC *v2; + UnkStruct_020216E0 *v3; v2 = sub_02062AF0(mapObj); @@ -296,11 +290,11 @@ void ov5_021EB40C (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -void ov5_021EB438 (MapObject * mapObj) +void ov5_021EB438(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EB2EC * v2; - UnkStruct_020216E0 * v3; + UnkStruct_ov5_021EB2EC *v2; + UnkStruct_020216E0 *v3; v2 = sub_02062AF0(mapObj); @@ -322,7 +316,7 @@ void ov5_021EB438 (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -static void ov5_021EB478 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB478(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -336,7 +330,7 @@ static void ov5_021EB478 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021368(param1, 0); } -static void ov5_021EB4AC (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB4AC(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -350,7 +344,7 @@ static void ov5_021EB4AC (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EB4E8 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB4E8(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -364,7 +358,7 @@ static void ov5_021EB4E8 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EB524 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB524(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -378,7 +372,7 @@ static void ov5_021EB524 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EB560 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB560(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -392,7 +386,7 @@ static void ov5_021EB560 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EB59C (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB59C(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -427,7 +421,7 @@ static void ov5_021EB59C (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EB620 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB620(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -459,7 +453,7 @@ static void ov5_021EB620 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EB69C (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB69C(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3) { if (param3 != param2->unk_02) { int v0 = ov5_021EDF18(param3); @@ -495,24 +489,25 @@ static void ov5_021EB69C (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void(*const Unk_ov5_021FF3D4[])( - MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = { - ov5_021EB478, - ov5_021EB4AC, - ov5_021EB4AC, - ov5_021EB4E8, - ov5_021EB524, - ov5_021EB560, - ov5_021EB59C, - ov5_021EB620, - ov5_021EB69C -}; +static void (*const Unk_ov5_021FF3D4[])( + MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) + = { + ov5_021EB478, + ov5_021EB4AC, + ov5_021EB4AC, + ov5_021EB4E8, + ov5_021EB524, + ov5_021EB560, + ov5_021EB59C, + ov5_021EB620, + ov5_021EB69C + }; -void ov5_021EB720 (MapObject * mapObj) +void ov5_021EB720(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EB2EC * v2 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v3 = v2->unk_04; + UnkStruct_ov5_021EB2EC *v2 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v3 = v2->unk_04; v2 = sub_02062AF0(mapObj); @@ -538,7 +533,7 @@ void ov5_021EB720 (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -static void ov5_021EB794 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB794(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3) { if ((param3 != param2->unk_02) || (param2->unk_03 == 0x9)) { int v0 = ov5_021EDF18(param3); @@ -552,7 +547,7 @@ static void ov5_021EB794 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021368(param1, 0); } -static void ov5_021EB7D0 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3) +static void ov5_021EB7D0(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EB2EC *param2, int param3) { if (param2->unk_03 != 0x9) { sub_02021344(param1, 4); @@ -562,7 +557,7 @@ static void ov5_021EB7D0 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021368(param1, (FX32_ONE)); } -static void(*const Unk_ov5_021FF420[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = { +static void (*const Unk_ov5_021FF420[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = { ov5_021EB794, ov5_021EB4AC, ov5_021EB4AC, @@ -575,9 +570,9 @@ static void(*const Unk_ov5_021FF420[])(MapObject *, UnkStruct_020216E0 *, UnkStr ov5_021EB7D0 }; -void ov5_021EB7F8 (MapObject * mapObj) +void ov5_021EB7F8(MapObject *mapObj) { - UnkStruct_ov5_021EB7F8 * v0; + UnkStruct_ov5_021EB7F8 *v0; v0 = sub_02062ACC(mapObj, (sizeof(UnkStruct_ov5_021EB7F8))); @@ -591,17 +586,17 @@ void ov5_021EB7F8 (MapObject * mapObj) } } -void ov5_021EB834 (MapObject * mapObj) +void ov5_021EB834(MapObject *mapObj) { - UnkStruct_ov5_021EB7F8 * v0; + UnkStruct_ov5_021EB7F8 *v0; v0 = sub_02062AF0(mapObj); ov5_021ECFA4(mapObj, &v0->unk_04); } -void ov5_021EB848 (MapObject * mapObj) +void ov5_021EB848(MapObject *mapObj) { - UnkStruct_ov5_021EB7F8 * v0; + UnkStruct_ov5_021EB7F8 *v0; v0 = sub_02062AF0(mapObj); @@ -613,10 +608,10 @@ void ov5_021EB848 (MapObject * mapObj) MapObject_SetStatusFlagOn(mapObj, (1 << 21)); } -void ov5_021EB874 (MapObject * mapObj) +void ov5_021EB874(MapObject *mapObj) { int v0; - UnkStruct_ov5_021EB7F8 * v1; + UnkStruct_ov5_021EB7F8 *v1; v1 = sub_02062AF0(mapObj); @@ -635,11 +630,11 @@ void ov5_021EB874 (MapObject * mapObj) } } -void ov5_021EB8B8 (MapObject * mapObj) +void ov5_021EB8B8(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EB7F8 * v2 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v3 = v2->unk_04; + UnkStruct_ov5_021EB7F8 *v2 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v3 = v2->unk_04; v2 = sub_02062AF0(mapObj); @@ -674,11 +669,11 @@ void ov5_021EB8B8 (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -void ov5_021EB944 (MapObject * mapObj) +void ov5_021EB944(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EB2EC * v2 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v3 = v2->unk_04; + UnkStruct_ov5_021EB2EC *v2 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v3 = v2->unk_04; v2 = sub_02062AF0(mapObj); @@ -694,8 +689,7 @@ void ov5_021EB944 (MapObject * mapObj) v1 = sub_02062A14(mapObj); switch (v1) { - case 0x0: - { + case 0x0: { int v4; if ((v0 == 0) || (v0 == 1)) { @@ -711,10 +705,8 @@ void ov5_021EB944 (MapObject * mapObj) } sub_02021368(v3, 0); - } - break; - default: - { + } break; + default: { int v5; fx32 v6 = 0; @@ -730,8 +722,7 @@ void ov5_021EB944 (MapObject * mapObj) } sub_02021368(v3, (FX32_ONE)); - } - break; + } break; } v2->unk_02 = v0; @@ -741,9 +732,9 @@ void ov5_021EB944 (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -void ov5_021EBA0C (MapObject * mapObj) +void ov5_021EBA0C(MapObject *mapObj) { - UnkStruct_ov5_021EBA0C * v0; + UnkStruct_ov5_021EBA0C *v0; v0 = sub_02062ACC(mapObj, (sizeof(UnkStruct_ov5_021EBA0C))); v0->unk_00 = -1; @@ -755,10 +746,10 @@ void ov5_021EBA0C (MapObject * mapObj) } } -void ov5_021EBA34 (MapObject * mapObj) +void ov5_021EBA34(MapObject *mapObj) { - UnkStruct_ov5_021EBA0C * v0; - VecFx32 v1 = {0, 0, 0}; + UnkStruct_ov5_021EBA0C *v0; + VecFx32 v1 = { 0, 0, 0 }; v0 = sub_02062AF0(mapObj); @@ -766,9 +757,9 @@ void ov5_021EBA34 (MapObject * mapObj) sub_02063088(mapObj, &v1); } -void ov5_021EBA60 (MapObject * mapObj) +void ov5_021EBA60(MapObject *mapObj) { - UnkStruct_ov5_021EBA0C * v0; + UnkStruct_ov5_021EBA0C *v0; v0 = sub_02062AF0(mapObj); @@ -780,10 +771,10 @@ void ov5_021EBA60 (MapObject * mapObj) MapObject_SetStatusFlagOn(mapObj, (1 << 21)); } -void ov5_021EBA8C (MapObject * mapObj) +void ov5_021EBA8C(MapObject *mapObj) { int v0; - UnkStruct_ov5_021EBA0C * v1; + UnkStruct_ov5_021EBA0C *v1; v1 = sub_02062AF0(mapObj); @@ -802,11 +793,11 @@ void ov5_021EBA8C (MapObject * mapObj) } } -void ov5_021EBAD0 (MapObject * mapObj) +void ov5_021EBAD0(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v3 = v2->unk_04; + UnkStruct_ov5_021EBA0C *v2 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v3 = v2->unk_04; v2 = sub_02062AF0(mapObj); @@ -821,7 +812,7 @@ void ov5_021EBAD0 (MapObject * mapObj) v0 = MapObject_Dir(mapObj); v1 = sub_02062A14(mapObj); - GF_ASSERT(v1 < (((0x8 + 1)) + 1)); + GF_ASSERT(v1 < ((0x8 + 1) + 1)); Unk_ov5_021FF3F8[v1](mapObj, v3, v2, v0); v2->unk_00 = v0; @@ -831,7 +822,7 @@ void ov5_021EBAD0 (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -static void ov5_021EBB44 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBB44(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); @@ -839,7 +830,7 @@ static void ov5_021EBB44 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021344(param1, v0); sub_020213A4(param1, 0); param2->unk_03_0 = 0; - } else if (param2->unk_02 == ((0x8 + 1))) { + } else if (param2->unk_02 == (0x8 + 1)) { param2->unk_03_0 = 1; } else if (param2->unk_03_0 == 1) { ov5_021EC69C(param1, ov5_021EDF18(param3)); @@ -849,7 +840,7 @@ static void ov5_021EBB44 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EBBB4 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBBB4(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { int v0; @@ -857,7 +848,7 @@ static void ov5_021EBBB4 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt v0 = ov5_021EDF18(param3); sub_02021344(param1, v0); sub_020213A4(param1, 0); - } else if (param2->unk_02 == ((0x8 + 1))) { + } else if (param2->unk_02 == (0x8 + 1)) { param2->unk_03_0 = 1; return; } else if (param2->unk_03_0 == 1) { @@ -870,7 +861,7 @@ static void ov5_021EBBB4 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EBC28 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBC28(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { int v0; @@ -878,7 +869,7 @@ static void ov5_021EBC28 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt v0 = ov5_021EDF18(param3); sub_02021344(param1, v0); sub_020213A4(param1, 0); - } else if (param2->unk_02 == ((0x8 + 1))) { + } else if (param2->unk_02 == (0x8 + 1)) { ov5_021EC69C(param1, ov5_021EDF18(param3)); } @@ -887,14 +878,14 @@ static void ov5_021EBC28 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EBC7C (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBC7C(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); sub_02021344(param1, v0); sub_020213A4(param1, 0); - } else if (param2->unk_02 == ((0x8 + 1))) { + } else if (param2->unk_02 == (0x8 + 1)) { ov5_021EC69C(param1, ov5_021EDF18(param3)); } @@ -903,14 +894,14 @@ static void ov5_021EBC7C (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EBCD0 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBCD0(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); sub_02021344(param1, v0); sub_020213A4(param1, 0); - } else if (param2->unk_02 == ((0x8 + 1))) { + } else if (param2->unk_02 == (0x8 + 1)) { ov5_021EC69C(param1, ov5_021EDF18(param3)); } @@ -919,7 +910,7 @@ static void ov5_021EBCD0 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EBD24 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBD24(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); @@ -927,7 +918,7 @@ static void ov5_021EBD24 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021344(param1, v0); sub_020213A4(param1, 0); param2->unk_01 = 0; - } else if (param2->unk_02 == ((0x8 + 1))) { + } else if (param2->unk_02 == (0x8 + 1)) { ov5_021EC69C(param1, ov5_021EDF18(param3)); } @@ -955,7 +946,7 @@ static void ov5_021EBD24 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EBDC4 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBDC4(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); @@ -963,7 +954,7 @@ static void ov5_021EBDC4 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021344(param1, v0); sub_020213A4(param1, 0); param2->unk_01 = 0; - } else if (param2->unk_02 == ((0x8 + 1))) { + } else if (param2->unk_02 == (0x8 + 1)) { ov5_021EC69C(param1, ov5_021EDF18(param3)); } @@ -988,7 +979,7 @@ static void ov5_021EBDC4 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EBE5C (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBE5C(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { if (param3 != param2->unk_00) { int v0 = ov5_021EDF18(param3); @@ -996,7 +987,7 @@ static void ov5_021EBE5C (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021344(param1, v0); sub_020213A4(param1, 0); param2->unk_01 = 0; - } else if (param2->unk_02 == ((0x8 + 1))) { + } else if (param2->unk_02 == (0x8 + 1)) { ov5_021EC69C(param1, ov5_021EDF18(param3)); } @@ -1025,7 +1016,7 @@ static void ov5_021EBE5C (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EBEFC (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBEFC(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { int v0; @@ -1033,7 +1024,7 @@ static void ov5_021EBEFC (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt v0 = ov5_021EDF24(param3); sub_02021344(param1, v0); sub_020213A4(param1, 0); - } else if (param2->unk_02 != ((0x8 + 1))) { + } else if (param2->unk_02 != (0x8 + 1)) { ov5_021EC674( param1, ov5_021EDF24(param3), 4); } @@ -1043,25 +1034,26 @@ static void ov5_021EBEFC (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void(*const Unk_ov5_021FF3F8[])( - MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = { - ov5_021EBB44, - ov5_021EBBB4, - ov5_021EBBB4, - ov5_021EBC28, - ov5_021EBC7C, - ov5_021EBCD0, - ov5_021EBD24, - ov5_021EBDC4, - ov5_021EBE5C, - ov5_021EBEFC -}; +static void (*const Unk_ov5_021FF3F8[])( + MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) + = { + ov5_021EBB44, + ov5_021EBBB4, + ov5_021EBBB4, + ov5_021EBC28, + ov5_021EBC7C, + ov5_021EBCD0, + ov5_021EBD24, + ov5_021EBDC4, + ov5_021EBE5C, + ov5_021EBEFC + }; -void ov5_021EBF50 (MapObject * mapObj) +void ov5_021EBF50(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v3 = v2->unk_04; + UnkStruct_ov5_021EBA0C *v2 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v3 = v2->unk_04; v2 = sub_02062AF0(mapObj); @@ -1091,9 +1083,9 @@ void ov5_021EBF50 (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -static void ov5_021EBFDC (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EBFDC(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { - int v0[4] = {6, 7, 8, 9}; + int v0[4] = { 6, 7, 8, 9 }; int v1 = v0[param3]; if (param3 != param2->unk_00) { @@ -1111,7 +1103,7 @@ static void ov5_021EBFDC (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EC068 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC068(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { int v0; @@ -1120,7 +1112,7 @@ static void ov5_021EC068 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt if ((param3 != param2->unk_00) || (param2->unk_02 != 0x0)) { sub_02021344(param1, v0); sub_020213A4(param1, 0); - } else if (param2->unk_02 != ((0x8 + 1))) { + } else if (param2->unk_02 != (0x8 + 1)) { sub_02021344(param1, v0); sub_020213A4(param1, 0); } else if (sub_02021358(param1) != v0) { @@ -1133,7 +1125,7 @@ static void ov5_021EC068 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void ov5_021EC0E4 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC0E4(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { int v0; @@ -1155,22 +1147,23 @@ static void ov5_021EC0E4 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt } } -static void(*const Unk_ov5_021FF448[11])( - MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = { - ov5_021EBFDC, - ov5_021EBBB4, - ov5_021EBBB4, - ov5_021EBC28, - ov5_021EBC7C, - ov5_021EBCD0, - ov5_021EBD24, - ov5_021EBDC4, - ov5_021EBE5C, - ov5_021EC068, - ov5_021EC0E4 -}; +static void (*const Unk_ov5_021FF448[11])( + MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) + = { + ov5_021EBFDC, + ov5_021EBBB4, + ov5_021EBBB4, + ov5_021EBC28, + ov5_021EBC7C, + ov5_021EBCD0, + ov5_021EBD24, + ov5_021EBDC4, + ov5_021EBE5C, + ov5_021EC068, + ov5_021EC0E4 + }; -void(*const Unk_ov5_021FF31C[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); +void (*const Unk_ov5_021FF31C[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int); static const int Unk_ov5_021FF34C[] = { 0x0, @@ -1179,11 +1172,11 @@ static const int Unk_ov5_021FF34C[] = { 0x3 }; -void ov5_021EC15C (MapObject * mapObj) +void ov5_021EC15C(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v3 = v2->unk_04; + UnkStruct_ov5_021EBA0C *v2 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v3 = v2->unk_04; v2 = sub_02062AF0(mapObj); @@ -1206,7 +1199,7 @@ void ov5_021EC15C (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -static void ov5_021EC1D8 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC1D8(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { fx32 v0; @@ -1226,7 +1219,7 @@ static void ov5_021EC1D8 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021368(param1, 0); } -static void ov5_021EC228 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC228(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { fx32 v0; @@ -1238,7 +1231,7 @@ static void ov5_021EC228 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021368(param1, (FX32_ONE)); } -static void ov5_021EC260 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC260(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { fx32 v0; @@ -1262,14 +1255,16 @@ static void ov5_021EC260 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt v0 += (FX32_ONE); if (v0 >= (FX32_ONE * 15)) { - param2->unk_03_1++; param2->unk_01 = 0; + param2->unk_03_1++; + param2->unk_01 = 0; } break; case 2: param2->unk_01++; if (param2->unk_01 >= 30) { - param2->unk_01 = 0; param2->unk_03_1 = 0; + param2->unk_01 = 0; + param2->unk_03_1 = 0; } } @@ -1277,7 +1272,7 @@ static void ov5_021EC260 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021368(param1, 0); } -static void ov5_021EC324 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3) +static void ov5_021EC324(MapObject *mapObj, UnkStruct_020216E0 *param1, UnkStruct_ov5_021EBA0C *param2, int param3) { fx32 v0; @@ -1296,10 +1291,10 @@ static void ov5_021EC324 (MapObject * mapObj, UnkStruct_020216E0 * param1, UnkSt sub_02021368(param1, 0); } -static void ov5_021EC374 (MapObject * mapObj, UnkStruct_020216E0 * param1, int param2) +static void ov5_021EC374(MapObject *mapObj, UnkStruct_020216E0 *param1, int param2) { - VecFx32 v0 = {0, 0, 0}; - int v1 = ((sub_02021394(param1) / FX32_ONE)); + VecFx32 v0 = { 0, 0, 0 }; + int v1 = (sub_02021394(param1) / FX32_ONE); switch (param2) { case 0: @@ -1328,18 +1323,18 @@ static void ov5_021EC374 (MapObject * mapObj, UnkStruct_020216E0 * param1, int p sub_02063088(mapObj, &v0); } -static void(*const Unk_ov5_021FF31C[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = { +static void (*const Unk_ov5_021FF31C[])(MapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = { ov5_021EC1D8, ov5_021EC228, ov5_021EC260, ov5_021EC324 }; -void ov5_021EC3F0 (MapObject * mapObj) +void ov5_021EC3F0(MapObject *mapObj) { int v0; - UnkStruct_ov5_021EBA0C * v1 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v2 = v1->unk_04; + UnkStruct_ov5_021EBA0C *v1 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v2 = v1->unk_04; v1 = sub_02062AF0(mapObj); @@ -1368,11 +1363,11 @@ void ov5_021EC3F0 (MapObject * mapObj) ov5_021EC6C0(mapObj, v2); } -void ov5_021EC454 (MapObject * mapObj) +void ov5_021EC454(MapObject *mapObj) { int v0; - UnkStruct_ov5_021EBA0C * v1 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v2 = v1->unk_04; + UnkStruct_ov5_021EBA0C *v1 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v2 = v1->unk_04; v1 = sub_02062AF0(mapObj); @@ -1400,11 +1395,11 @@ void ov5_021EC454 (MapObject * mapObj) ov5_021EC6C0(mapObj, v2); } -void ov5_021EC4BC (MapObject * mapObj) +void ov5_021EC4BC(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v3 = v2->unk_04; + UnkStruct_ov5_021EBA0C *v2 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v3 = v2->unk_04; v2 = sub_02062AF0(mapObj); @@ -1444,11 +1439,11 @@ void ov5_021EC4BC (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -void ov5_021EC554 (MapObject * mapObj) +void ov5_021EC554(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v3 = v2->unk_04; + UnkStruct_ov5_021EBA0C *v2 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v3 = v2->unk_04; v2 = sub_02062AF0(mapObj); @@ -1476,11 +1471,11 @@ void ov5_021EC554 (MapObject * mapObj) v2->unk_02 = sub_02062A14(mapObj); } -void ov5_021EC5C0 (MapObject * mapObj) +void ov5_021EC5C0(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(mapObj); - UnkStruct_020216E0 * v3 = v2->unk_04; + UnkStruct_ov5_021EBA0C *v2 = sub_02062AF0(mapObj); + UnkStruct_020216E0 *v3 = v2->unk_04; v2 = sub_02062AF0(mapObj); @@ -1514,7 +1509,7 @@ void ov5_021EC5C0 (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -static void ov5_021EC638 (UnkStruct_020216E0 * param0, int param1) +static void ov5_021EC638(UnkStruct_020216E0 *param0, int param1) { fx32 v0, v1; @@ -1528,12 +1523,12 @@ static void ov5_021EC638 (UnkStruct_020216E0 * param0, int param1) sub_02021368(param0, 0); } -static void ov5_021EC668 (UnkStruct_020216E0 * param0) +static void ov5_021EC668(UnkStruct_020216E0 *param0) { ov5_021EC638(param0, 8); } -static void ov5_021EC674 (UnkStruct_020216E0 * param0, int param1, int param2) +static void ov5_021EC674(UnkStruct_020216E0 *param0, int param1, int param2) { fx32 v0; @@ -1544,7 +1539,7 @@ static void ov5_021EC674 (UnkStruct_020216E0 * param0, int param1, int param2) sub_020213A4(param0, v0); } -static void ov5_021EC69C (UnkStruct_020216E0 * param0, int param1) +static void ov5_021EC69C(UnkStruct_020216E0 *param0, int param1) { fx32 v0; @@ -1555,7 +1550,7 @@ static void ov5_021EC69C (UnkStruct_020216E0 * param0, int param1) sub_020213A4(param0, v0); } -static void ov5_021EC6C0 (MapObject * mapObj, UnkStruct_020216E0 * param1) +static void ov5_021EC6C0(MapObject *mapObj, UnkStruct_020216E0 *param1) { int v0 = 1; @@ -1572,9 +1567,9 @@ static void ov5_021EC6C0 (MapObject * mapObj, UnkStruct_020216E0 * param1) sub_02021320(param1, v0); } -static void ov5_021EC700 (u32 param0, VecFx32 * param1) +static void ov5_021EC700(u32 param0, VecFx32 *param1) { - const UnkStruct_ov5_021EC700 * v0 = Unk_ov5_021FB51C; + const UnkStruct_ov5_021EC700 *v0 = Unk_ov5_021FB51C; while (v0->unk_00 != 0xffff) { if (v0->unk_00 == param0) { @@ -1588,24 +1583,24 @@ static void ov5_021EC700 (u32 param0, VecFx32 * param1) GF_ASSERT(0); } -void ov5_021EC734 (MapObject * mapObj) +void ov5_021EC734(MapObject *mapObj) { VecFx32 v0; - UnkStruct_ov5_021EC760 * v1; + UnkStruct_ov5_021EC760 *v1; v1 = sub_02062ACC(mapObj, (sizeof(UnkStruct_ov5_021EC760))); ov5_021EC700(sub_02062924(mapObj), &v0); v1->unk_00 = ov5_021F121C(mapObj, &v0); } -void ov5_021EC75C (MapObject * mapObj) +void ov5_021EC75C(MapObject *mapObj) { return; } -void ov5_021EC760 (MapObject * mapObj) +void ov5_021EC760(MapObject *mapObj) { - UnkStruct_ov5_021EC760 * v0; + UnkStruct_ov5_021EC760 *v0; v0 = sub_02062AF0(mapObj); @@ -1615,9 +1610,9 @@ void ov5_021EC760 (MapObject * mapObj) } } -void ov5_021EC778 (MapObject * mapObj) +void ov5_021EC778(MapObject *mapObj) { - UnkStruct_ov5_021EC760 * v0; + UnkStruct_ov5_021EC760 *v0; v0 = sub_02062AF0(mapObj); @@ -1627,54 +1622,54 @@ void ov5_021EC778 (MapObject * mapObj) } } -void ov5_021EC790 (MapObject * mapObj) +void ov5_021EC790(MapObject *mapObj) { VecFx32 v0; - UnkStruct_ov5_021EC760 * v1; + UnkStruct_ov5_021EC760 *v1; v1 = sub_02062AF0(mapObj); ov5_021EC700(sub_02062924(mapObj), &v0); v1->unk_00 = ov5_021F121C(mapObj, &v0); } -void ov5_021EC7B8 (MapObject * mapObj) +void ov5_021EC7B8(MapObject *mapObj) { - UnkStruct_ov5_021EC760 * v0; + UnkStruct_ov5_021EC760 *v0; v0 = sub_02062ACC(mapObj, (sizeof(UnkStruct_ov5_021EC760))); v0->unk_00 = ov5_021F2438(mapObj); } -void ov5_021EC7D0 (MapObject * mapObj) +void ov5_021EC7D0(MapObject *mapObj) { - UnkStruct_ov5_021EC760 * v0; + UnkStruct_ov5_021EC760 *v0; v0 = sub_02062AF0(mapObj); GF_ASSERT(v0->unk_00 == NULL); v0->unk_00 = ov5_021F2438(mapObj); } -void ov5_021EC7F0 (MapObject * mapObj) +void ov5_021EC7F0(MapObject *mapObj) { - UnkStruct_ov5_021EC760 * v0; + UnkStruct_ov5_021EC760 *v0; v0 = sub_02062AF0(mapObj); ov5_021F247C(v0->unk_00); v0->unk_00 = NULL; } -static void ov5_021EC804 (UnkStruct_020216E0 * param0, void * param1) +static void ov5_021EC804(UnkStruct_020216E0 *param0, void *param1) { - UnkStruct_ov5_021EC804 * v0 = param1; - NNSG3dResMdl * v1 = sub_020213F4(param0); + UnkStruct_ov5_021EC804 *v0 = param1; + NNSG3dResMdl *v1 = sub_020213F4(param0); NNS_G3dMdlUseMdlAlpha(v1); NNS_G3dMdlSetMdlAlphaAll(v1, v0->unk_10); } -void ov5_021EC824 (MapObject * mapObj) +void ov5_021EC824(MapObject *mapObj) { - UnkStruct_ov5_021EC804 * v0; + UnkStruct_ov5_021EC804 *v0; v0 = sub_02062ACC(mapObj, (sizeof(UnkStruct_ov5_021EC804))); v0->unk_02 = -1; @@ -1687,17 +1682,17 @@ void ov5_021EC824 (MapObject * mapObj) } } -void ov5_021EC858 (MapObject * mapObj) +void ov5_021EC858(MapObject *mapObj) { - UnkStruct_ov5_021EC804 * v0; + UnkStruct_ov5_021EC804 *v0; v0 = sub_02062AF0(mapObj); ov5_021ECFA4(mapObj, &v0->unk_04); } -void ov5_021EC86C (MapObject * mapObj) +void ov5_021EC86C(MapObject *mapObj) { - UnkStruct_ov5_021EC804 * v0; + UnkStruct_ov5_021EC804 *v0; v0 = sub_02062AF0(mapObj); @@ -1709,10 +1704,10 @@ void ov5_021EC86C (MapObject * mapObj) MapObject_SetStatusFlagOn(mapObj, (1 << 21)); } -void ov5_021EC898 (MapObject * mapObj) +void ov5_021EC898(MapObject *mapObj) { int v0; - UnkStruct_ov5_021EB2EC * v1; + UnkStruct_ov5_021EB2EC *v1; v1 = sub_02062AF0(mapObj); @@ -1732,11 +1727,11 @@ void ov5_021EC898 (MapObject * mapObj) } } -void ov5_021EC8EC (MapObject * mapObj) +void ov5_021EC8EC(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EC804 * v2; - UnkStruct_020216E0 * v3; + UnkStruct_ov5_021EC804 *v2; + UnkStruct_020216E0 *v3; v2 = sub_02062AF0(mapObj); @@ -1762,9 +1757,9 @@ void ov5_021EC8EC (MapObject * mapObj) ov5_021EC6C0(mapObj, v3); } -void ov5_021EC938 (MapObject * mapObj) +void ov5_021EC938(MapObject *mapObj) { - UnkStruct_ov5_021EC938 * v0; + UnkStruct_ov5_021EC938 *v0; v0 = sub_02062ACC(mapObj, (sizeof(UnkStruct_ov5_021EC938))); ov5_021ECF04(mapObj, &v0->unk_08); @@ -1774,17 +1769,17 @@ void ov5_021EC938 (MapObject * mapObj) } } -void ov5_021EC95C (MapObject * mapObj) +void ov5_021EC95C(MapObject *mapObj) { - UnkStruct_ov5_021EC938 * v0; + UnkStruct_ov5_021EC938 *v0; v0 = sub_02062AF0(mapObj); ov5_021ECFA4(mapObj, &v0->unk_08); } -void ov5_021EC970 (MapObject * mapObj) +void ov5_021EC970(MapObject *mapObj) { - UnkStruct_ov5_021EC938 * v0; + UnkStruct_ov5_021EC938 *v0; v0 = sub_02062AF0(mapObj); @@ -1796,10 +1791,10 @@ void ov5_021EC970 (MapObject * mapObj) MapObject_SetStatusFlagOn(mapObj, (1 << 21)); } -void ov5_021EC9A0 (MapObject * mapObj) +void ov5_021EC9A0(MapObject *mapObj) { int v0; - UnkStruct_ov5_021EC938 * v1; + UnkStruct_ov5_021EC938 *v1; v1 = sub_02062AF0(mapObj); @@ -1818,11 +1813,11 @@ void ov5_021EC9A0 (MapObject * mapObj) } } -void ov5_021EC9E8 (MapObject * mapObj) +void ov5_021EC9E8(MapObject *mapObj) { int v0, v1; - UnkStruct_ov5_021EC938 * v2; - UnkStruct_020216E0 * v3; + UnkStruct_ov5_021EC938 *v2; + UnkStruct_020216E0 *v3; v2 = sub_02062AF0(mapObj); diff --git a/src/overlay005/ov5_021ECA70.c b/src/overlay005/ov5_021ECA70.c index 64e1664b62..f6f62968c1 100644 --- a/src/overlay005/ov5_021ECA70.c +++ b/src/overlay005/ov5_021ECA70.c @@ -1,28 +1,29 @@ +#include "overlay005/ov5_021ECA70.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021ECB8C_decl.h" +#include "overlay005/ov5_021ECE40.h" +#include "overlay005/struct_ov5_021ECB8C_decl.h" #include "overlay005/struct_ov5_021ED01C.h" -#include "unk_02020AEC.h" #include "map_object.h" -#include "overlay005/ov5_021ECA70.h" -#include "overlay005/ov5_021ECE40.h" +#include "unk_02020AEC.h" typedef struct UnkStruct_ov5_021ECB8C_t { - UnkStruct_020216E0 * unk_00; + UnkStruct_020216E0 *unk_00; UnkStruct_ov5_021ED01C unk_04; }; -static void ov5_021ECB90(MapObject * param0); -static void ov5_021ECBA4(MapObject * param0); -static void ov5_021ECBCC(MapObject * param0, UnkStruct_020216E0 * param1); -static void ov5_021ECC0C(MapObject * param0); +static void ov5_021ECB90(MapObject *param0); +static void ov5_021ECBA4(MapObject *param0); +static void ov5_021ECBCC(MapObject *param0, UnkStruct_020216E0 *param1); +static void ov5_021ECC0C(MapObject *param0); -void ov5_021ECA70 (MapObject * param0) +void ov5_021ECA70(MapObject *param0) { VecFx32 v0; @@ -35,10 +36,10 @@ void ov5_021ECA70 (MapObject * param0) sub_020630AC(param0, &v0); } -void ov5_021ECA90 (MapObject * param0) +void ov5_021ECA90(MapObject *param0) { - UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0); - UnkStruct_020216E0 * v1 = v0->unk_00; + UnkStruct_ov5_021ECB8C *v0 = sub_02062AF0(param0); + UnkStruct_020216E0 *v1 = v0->unk_00; if (ov5_021EDD94(param0) == 1) { return; @@ -52,14 +53,14 @@ void ov5_021ECA90 (MapObject * param0) sub_02021368(v1, FX32_ONE); } -void ov5_021ECABC (MapObject * param0) +void ov5_021ECABC(MapObject *param0) { ov5_021ECC0C(param0); } -void ov5_021ECAC4 (MapObject * param0) +void ov5_021ECAC4(MapObject *param0) { - UnkStruct_ov5_021ECB8C * v0; + UnkStruct_ov5_021ECB8C *v0; v0 = sub_02062AF0(param0); @@ -71,9 +72,9 @@ void ov5_021ECAC4 (MapObject * param0) MapObject_SetStatusFlagOn(param0, (1 << 21)); } -void ov5_021ECAF0 (MapObject * param0) +void ov5_021ECAF0(MapObject *param0) { - UnkStruct_ov5_021ECB8C * v0; + UnkStruct_ov5_021ECB8C *v0; v0 = sub_02062AF0(param0); @@ -92,7 +93,7 @@ void ov5_021ECAF0 (MapObject * param0) } } -void ov5_021ECB34 (MapObject * param0) +void ov5_021ECB34(MapObject *param0) { VecFx32 v0; @@ -105,10 +106,10 @@ void ov5_021ECB34 (MapObject * param0) sub_020630AC(param0, &v0); } -void ov5_021ECB58 (MapObject * param0) +void ov5_021ECB58(MapObject *param0) { - UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0); - UnkStruct_020216E0 * v1 = v0->unk_00; + UnkStruct_ov5_021ECB8C *v0 = sub_02062AF0(param0); + UnkStruct_020216E0 *v1 = v0->unk_00; if (ov5_021EDD94(param0) == 1) { return; @@ -121,42 +122,42 @@ void ov5_021ECB58 (MapObject * param0) ov5_021ECBA4(param0); } -void ov5_021ECB78 (MapObject * param0) +void ov5_021ECB78(MapObject *param0) { ov5_021ECC0C(param0); } -UnkStruct_020216E0 * ov5_021ECB80 (MapObject * param0) +UnkStruct_020216E0 *ov5_021ECB80(MapObject *param0) { - UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0); + UnkStruct_ov5_021ECB8C *v0 = sub_02062AF0(param0); return ov5_021ECB8C(v0); } -UnkStruct_020216E0 * ov5_021ECB8C (UnkStruct_ov5_021ECB8C * param0) +UnkStruct_020216E0 *ov5_021ECB8C(UnkStruct_ov5_021ECB8C *param0) { return param0->unk_00; } -static void ov5_021ECB90 (MapObject * param0) +static void ov5_021ECB90(MapObject *param0) { - UnkStruct_ov5_021ECB8C * v0; + UnkStruct_ov5_021ECB8C *v0; v0 = sub_02062ACC(param0, (sizeof(UnkStruct_ov5_021ECB8C))); ov5_021ECF04(param0, &v0->unk_00); } -static void ov5_021ECBA4 (MapObject * param0) +static void ov5_021ECBA4(MapObject *param0) { - UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0); - UnkStruct_020216E0 * v1 = v0->unk_00; + UnkStruct_ov5_021ECB8C *v0 = sub_02062AF0(param0); + UnkStruct_020216E0 *v1 = v0->unk_00; ov5_021EDEB4(param0, v1); sub_02021368(v1, (FX32_ONE)); ov5_021ECBCC(param0, v1); } -static void ov5_021ECBCC (MapObject * param0, UnkStruct_020216E0 * param1) +static void ov5_021ECBCC(MapObject *param0, UnkStruct_020216E0 *param1) { int v0 = 1; @@ -173,9 +174,9 @@ static void ov5_021ECBCC (MapObject * param0, UnkStruct_020216E0 * param1) sub_02021320(param1, v0); } -static void ov5_021ECC0C (MapObject * param0) +static void ov5_021ECC0C(MapObject *param0) { - UnkStruct_ov5_021ECB8C * v0; + UnkStruct_ov5_021ECB8C *v0; v0 = sub_02062AF0(param0); ov5_021ECFA4(param0, &v0->unk_00); diff --git a/src/overlay005/ov5_021ECC20.c b/src/overlay005/ov5_021ECC20.c index 1904d51495..d24ea3fe75 100644 --- a/src/overlay005/ov5_021ECC20.c +++ b/src/overlay005/ov5_021ECC20.c @@ -1,3 +1,5 @@ +#include "overlay005/ov5_021ECC20.h" + #include #include @@ -6,24 +8,22 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "overlay005/const_ov5_021FC194.h" - +#include "overlay005/ov5_021ECE40.h" #include "overlay005/struct_ov5_021ECD10.h" #include "overlay005/struct_ov5_021ED0A4.h" -#include "narc.h" #include "heap.h" #include "map_object.h" -#include "overlay005/ov5_021ECC20.h" -#include "overlay005/ov5_021ECE40.h" +#include "narc.h" -static void ov5_021ECCA4(MapObjectManager * param0); -static void ov5_021ECCBC(MapObjectManager * param0); -static const UnkStruct_ov5_021ECD10 * ov5_021ECD10(int param0); +static void ov5_021ECCA4(MapObjectManager *param0); +static void ov5_021ECCBC(MapObjectManager *param0); +static const UnkStruct_ov5_021ECD10 *ov5_021ECD10(int param0); -void ov5_021ECC20 (MapObjectManager * param0, int param1, int param2, const int * param3, int param4) +void ov5_021ECC20(MapObjectManager *param0, int param1, int param2, const int *param3, int param4) { int v0, v1; - UnkStruct_ov5_021ED0A4 * v2; + UnkStruct_ov5_021ED0A4 *v2; GF_ASSERT(sub_0206284C(param0, (1 << 0)) == 0); @@ -37,7 +37,7 @@ void ov5_021ECC20 (MapObjectManager * param0, int param1, int param2, const int sub_02062838(param0, (1 << 0)); } -void ov5_021ECC78 (MapObjectManager * param0) +void ov5_021ECC78(MapObjectManager *param0) { int v0; @@ -50,21 +50,21 @@ void ov5_021ECC78 (MapObjectManager * param0) ov5_021ECCBC(param0); } -static void ov5_021ECCA4 (MapObjectManager * param0) +static void ov5_021ECCA4(MapObjectManager *param0) { - NARC * v0 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, 4); + NARC *v0 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, 4); sub_0206289C(param0, v0); } -static void ov5_021ECCBC (MapObjectManager * param0) +static void ov5_021ECCBC(MapObjectManager *param0) { - NARC * v0 = sub_020628A0(param0); + NARC *v0 = sub_020628A0(param0); NARC_dtor(v0); } -void MapObject_Draw (MapObject * param0) +void MapObject_Draw(MapObject *param0) { - const MapObjectManager * v0 = MapObject_MapObjectManager(param0); + const MapObjectManager *v0 = MapObject_MapObjectManager(param0); if (sub_0206284C(v0, (1 << 2))) { return; @@ -79,17 +79,17 @@ void MapObject_Draw (MapObject * param0) } } -const UnkStruct_ov5_021ECD10 * ov5_021ECD04 (const MapObject * param0) +const UnkStruct_ov5_021ECD10 *ov5_021ECD04(const MapObject *param0) { int v0 = sub_02062920(param0); - const UnkStruct_ov5_021ECD10 * v1 = ov5_021ECD10(v0); + const UnkStruct_ov5_021ECD10 *v1 = ov5_021ECD10(v0); return v1; } -static const UnkStruct_ov5_021ECD10 * ov5_021ECD10 (int param0) +static const UnkStruct_ov5_021ECD10 *ov5_021ECD10(int param0) { - const UnkStruct_ov5_021ECD10 * v0 = Unk_ov5_021FC194; + const UnkStruct_ov5_021ECD10 *v0 = Unk_ov5_021FC194; do { if (v0->unk_00 == param0) { @@ -103,7 +103,7 @@ static const UnkStruct_ov5_021ECD10 * ov5_021ECD10 (int param0) return NULL; } -int ov5_021ECD38 (const MapObject * param0) +int ov5_021ECD38(const MapObject *param0) { if (MapObject_IsMovementPaused(param0) == 1) { if (sub_02062F7C(param0) == 0) { @@ -118,10 +118,10 @@ int ov5_021ECD38 (const MapObject * param0) return 0; } -void * ov5_021ECD68 (const MapObjectManager * param0, u32 param1, int param2) +void *ov5_021ECD68(const MapObjectManager *param0, u32 param1, int param2) { - void * v0; - NARC * v1 = sub_020628A0(param0); + void *v0; + NARC *v1 = sub_020628A0(param0); u32 v2 = NARC_GetMemberSize(v1, param1); if (param2 == 1) { @@ -135,7 +135,7 @@ void * ov5_021ECD68 (const MapObjectManager * param0, u32 param1, int param2) return v0; } -void ov5_021ECDA0 (const MapObject * param0, VecFx32 * param1) +void ov5_021ECDA0(const MapObject *param0, VecFx32 *param1) { VecFx32 v0, v1, v2, v3; @@ -149,7 +149,7 @@ void ov5_021ECDA0 (const MapObject * param0, VecFx32 * param1) param1->z = v0.z + v1.z + v2.z + v3.z; } -void ov5_021ECDFC (MapObject * param0, int param1) +void ov5_021ECDFC(MapObject *param0, int param1) { MapObject_SetDir(param0, param1); @@ -158,28 +158,28 @@ void ov5_021ECDFC (MapObject * param0, int param1) } } -void ov5_021ECE18 (MapObject * param0) +void ov5_021ECE18(MapObject *param0) { MapObject_SetHidden(param0, 1); MapObject_SetStatusFlagOn(param0, (1 << 20)); } -void ov5_021ECE30 (MapObject * param0) +void ov5_021ECE30(MapObject *param0) { return; } -void ov5_021ECE34 (MapObject * param0) +void ov5_021ECE34(MapObject *param0) { return; } -void ov5_021ECE38 (MapObject * param0) +void ov5_021ECE38(MapObject *param0) { return; } -void ov5_021ECE3C (MapObject * param0) +void ov5_021ECE3C(MapObject *param0) { return; } diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c index c8f4817fb1..30a17c1841 100644 --- a/src/overlay005/ov5_021ECE40.c +++ b/src/overlay005/ov5_021ECE40.c @@ -1,10 +1,9 @@ -#include "enums.h" +#include "overlay005/ov5_021ECE40.h" #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02020C44_decl.h" #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_0202298C_decl.h" @@ -12,19 +11,23 @@ #include "struct_decls/struct_02022BD8_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021F06D8_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" +#include "struct_defs/struct_020217F4.h" +#include "struct_defs/struct_02024184.h" -#include "overlay005/const_ov5_021FD77C.h" +#include "overlay005/const_ov5_021FAF40.h" +#include "overlay005/const_ov5_021FAF48.h" #include "overlay005/const_ov5_021FAF50.h" -#include "overlay005/const_ov5_021FB5BC.h" #include "overlay005/const_ov5_021FB484.h" -#include "overlay005/const_ov5_021FAF48.h" +#include "overlay005/const_ov5_021FB5BC.h" #include "overlay005/const_ov5_021FC9B4.h" -#include "overlay005/const_ov5_021FAF40.h" - -#include "struct_defs/struct_020217F4.h" -#include "struct_defs/struct_02024184.h" +#include "overlay005/const_ov5_021FD77C.h" +#include "overlay005/funcptr_ov5_021EE454.h" +#include "overlay005/ov5_021D521C.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/ov5_021EB1A0.h" +#include "overlay005/ov5_021ECC20.h" +#include "overlay005/ov5_021F067C.h" +#include "overlay005/ov5_021F17B8.h" #include "overlay005/struct_ov5_021DF7F8.h" #include "overlay005/struct_ov5_021DF84C.h" #include "overlay005/struct_ov5_021ECD10.h" @@ -38,25 +41,21 @@ #include "overlay005/struct_ov5_021EDFBC.h" #include "overlay005/struct_ov5_021EE134.h" #include "overlay005/struct_ov5_021EE294.h" -#include "overlay005/funcptr_ov5_021EE454.h" +#include "overlay005/struct_ov5_021F06D8_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" -#include "sys_task.h" +#include "enums.h" #include "heap.h" +#include "map_object.h" +#include "map_object_move.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02020AEC.h" #include "unk_0202298C.h" #include "unk_0202414C.h" #include "unk_0205DAC8.h" -#include "map_object.h" -#include "map_object_move.h" #include "unk_020677F4.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021D521C.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021EB1A0.h" -#include "overlay005/ov5_021ECC20.h" -#include "overlay005/ov5_021ECE40.h" -#include "overlay005/ov5_021F067C.h" -#include "overlay005/ov5_021F17B8.h" typedef enum { UnkEnum_ov5_021ED334_00 = 0, @@ -67,121 +66,121 @@ typedef enum { typedef struct { int unk_00; s16 unk_04; - void * unk_08; - void * unk_0C; - void * unk_10; + void *unk_08; + void *unk_0C; + void *unk_10; UnkStruct_02024184 unk_14; - UnkStruct_020216E0 * unk_24; + UnkStruct_020216E0 *unk_24; UnkStruct_ov5_021DF84C unk_28; - MapObject * unk_50; - UnkStruct_ov101_021D5D90 * unk_54; - void * unk_58; + MapObject *unk_50; + UnkStruct_ov101_021D5D90 *unk_54; + void *unk_58; UnkFuncPtr_ov5_021EE454 unk_5C; } UnkStruct_ov5_021EE698; -static void ov5_021ED094(const MapObject * param0); -static void ov5_021ED0A4(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED0F0(UnkStruct_ov5_021ED0A4 * param0); -static UnkStruct_ov5_021DF84C * ov5_021ED110(UnkStruct_ov5_021ED0A4 * param0, u32 param1); -static void ov5_021ED184(UnkStruct_ov5_021ED0A4 * param0, u32 param1); -static void ov5_021ED1A4(UnkStruct_ov5_021ED0A4 * param0); -static int ov5_021ED1C8(const MapObjectManager * param0, const MapObject * param1, int param2); -static void ov5_021ED224(UnkStruct_ov5_021ED0A4 * param0, int param1, int param2, int param3, int param4, int param5, int param6); -static void ov5_021ED2AC(UnkStruct_ov5_021ED0A4 * param0); -static const UnkStruct_ov5_021ED2D0 * ov5_021ED2D0(int param0, int param1, const UnkStruct_ov5_021ED2D0 * param2); -static int ov5_021ED2E8(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_ov5_021F06D8 * param1, int param2, int param3, const UnkStruct_ov5_021ED2D0 * param4); -static UnkEnum_ov5_021ED334 ov5_021ED334(UnkStruct_ov5_021ED0A4 * param0, int param1, int param2, const UnkStruct_ov5_021ED2D0 * param3); -static UnkEnum_ov5_021ED334 ov5_021ED390(UnkStruct_ov5_021ED0A4 * param0, int param1); -static UnkEnum_ov5_021ED334 ov5_021ED3A4(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED3B8(UnkStruct_ov5_021ED0A4 * param0, const int * param1); -static void ov5_021ED3DC(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED40C(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED43C(UnkStruct_ov5_021ED0A4 * param0, const int * param1); -static void ov5_021ED460(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED490(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED4C0(UnkStruct_ov5_021ED0A4 * param0, const int * param1); -static void ov5_021ED4E4(UnkStruct_ov5_021ED0A4 * param0, const int * param1, const int * param2, const int * param3); -static void ov5_021ED504(int * param0, int param1, int param2); -static int ov5_021ED50C(int * param0, int param1, int param2, int param3); -static int ov5_021ED528(int * param0, int param1, int param2); -static int ov5_021ED53C(int * param0, int param1, int param2, int param3); -static void ov5_021ED558(UnkStruct_ov5_021ED0A4 * param0); -static void ov5_021ED56C(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021ED598(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED5B4(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021ED5E8(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED610(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED63C(MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1); -static void ov5_021ED694(UnkStruct_ov5_021ED0A4 * param0); -static void ov5_021ED6A8(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021ED6D4(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED6F0(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED74C(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED778(MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1); -static void ov5_021ED7D0(UnkStruct_ov5_021ED0A4 * param0); -static void ov5_021ED7E4(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021ED810(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021ED82C(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED858(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED88C(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED8B8(MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1); -static int ov5_021ED924(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021ED94C(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021ED974(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021ED99C(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED9C4(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED9DC(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021ED9F4(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021EDA0C(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021EDA54(const MapObjectManager * param0, int param1, const MapObject * param2); -static int ov5_021EDAB4(const MapObjectManager * param0, int param1, const MapObject * param2); -static int ov5_021EDB3C(const MapObjectManager * param0, int param1, const MapObject * param2); -static int * ov5_021EDCB8(UnkStruct_ov5_021ED0A4 * param0); -static int * ov5_021EDCBC(UnkStruct_ov5_021ED0A4 * param0); -static int * ov5_021EDCC0(UnkStruct_ov5_021ED0A4 * param0); -static void ov5_021EDCC4(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021EDCC8(const UnkStruct_ov5_021ED0A4 * param0); -static void ov5_021EDCCC(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021EDCD0(const UnkStruct_ov5_021ED0A4 * param0); -static void ov5_021EDCD4(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021EDCD8(const UnkStruct_ov5_021ED0A4 * param0); -static void ov5_021EDCDC(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021EDCE0(const UnkStruct_ov5_021ED0A4 * param0); -static void ov5_021EDCE4(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021EDCE8(const UnkStruct_ov5_021ED0A4 * param0); -static void ov5_021EDCEC(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021EDCF0(const UnkStruct_ov5_021ED0A4 * param0); -static void * ov5_021EDCF4(UnkStruct_ov5_021ED0A4 * param0, u32 param1, int param2); -static const UnkStruct_ov5_021EDD04 * ov5_021EDD04(int param0); +static void ov5_021ED094(const MapObject *param0); +static void ov5_021ED0A4(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED0F0(UnkStruct_ov5_021ED0A4 *param0); +static UnkStruct_ov5_021DF84C *ov5_021ED110(UnkStruct_ov5_021ED0A4 *param0, u32 param1); +static void ov5_021ED184(UnkStruct_ov5_021ED0A4 *param0, u32 param1); +static void ov5_021ED1A4(UnkStruct_ov5_021ED0A4 *param0); +static int ov5_021ED1C8(const MapObjectManager *param0, const MapObject *param1, int param2); +static void ov5_021ED224(UnkStruct_ov5_021ED0A4 *param0, int param1, int param2, int param3, int param4, int param5, int param6); +static void ov5_021ED2AC(UnkStruct_ov5_021ED0A4 *param0); +static const UnkStruct_ov5_021ED2D0 *ov5_021ED2D0(int param0, int param1, const UnkStruct_ov5_021ED2D0 *param2); +static int ov5_021ED2E8(UnkStruct_ov5_021ED0A4 *param0, UnkStruct_ov5_021F06D8 *param1, int param2, int param3, const UnkStruct_ov5_021ED2D0 *param4); +static UnkEnum_ov5_021ED334 ov5_021ED334(UnkStruct_ov5_021ED0A4 *param0, int param1, int param2, const UnkStruct_ov5_021ED2D0 *param3); +static UnkEnum_ov5_021ED334 ov5_021ED390(UnkStruct_ov5_021ED0A4 *param0, int param1); +static UnkEnum_ov5_021ED334 ov5_021ED3A4(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED3B8(UnkStruct_ov5_021ED0A4 *param0, const int *param1); +static void ov5_021ED3DC(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED40C(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED43C(UnkStruct_ov5_021ED0A4 *param0, const int *param1); +static void ov5_021ED460(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED490(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED4C0(UnkStruct_ov5_021ED0A4 *param0, const int *param1); +static void ov5_021ED4E4(UnkStruct_ov5_021ED0A4 *param0, const int *param1, const int *param2, const int *param3); +static void ov5_021ED504(int *param0, int param1, int param2); +static int ov5_021ED50C(int *param0, int param1, int param2, int param3); +static int ov5_021ED528(int *param0, int param1, int param2); +static int ov5_021ED53C(int *param0, int param1, int param2, int param3); +static void ov5_021ED558(UnkStruct_ov5_021ED0A4 *param0); +static void ov5_021ED56C(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021ED598(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED5B4(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021ED5E8(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED610(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED63C(MapObjectManager *param0, UnkStruct_ov5_021ED0A4 *param1); +static void ov5_021ED694(UnkStruct_ov5_021ED0A4 *param0); +static void ov5_021ED6A8(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021ED6D4(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED6F0(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED74C(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED778(MapObjectManager *param0, UnkStruct_ov5_021ED0A4 *param1); +static void ov5_021ED7D0(UnkStruct_ov5_021ED0A4 *param0); +static void ov5_021ED7E4(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021ED810(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021ED82C(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED858(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED88C(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED8B8(MapObjectManager *param0, UnkStruct_ov5_021ED0A4 *param1); +static int ov5_021ED924(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021ED94C(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021ED974(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021ED99C(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED9C4(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED9DC(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021ED9F4(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021EDA0C(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021EDA54(const MapObjectManager *param0, int param1, const MapObject *param2); +static int ov5_021EDAB4(const MapObjectManager *param0, int param1, const MapObject *param2); +static int ov5_021EDB3C(const MapObjectManager *param0, int param1, const MapObject *param2); +static int *ov5_021EDCB8(UnkStruct_ov5_021ED0A4 *param0); +static int *ov5_021EDCBC(UnkStruct_ov5_021ED0A4 *param0); +static int *ov5_021EDCC0(UnkStruct_ov5_021ED0A4 *param0); +static void ov5_021EDCC4(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021EDCC8(const UnkStruct_ov5_021ED0A4 *param0); +static void ov5_021EDCCC(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021EDCD0(const UnkStruct_ov5_021ED0A4 *param0); +static void ov5_021EDCD4(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021EDCD8(const UnkStruct_ov5_021ED0A4 *param0); +static void ov5_021EDCDC(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021EDCE0(const UnkStruct_ov5_021ED0A4 *param0); +static void ov5_021EDCE4(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021EDCE8(const UnkStruct_ov5_021ED0A4 *param0); +static void ov5_021EDCEC(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021EDCF0(const UnkStruct_ov5_021ED0A4 *param0); +static void *ov5_021EDCF4(UnkStruct_ov5_021ED0A4 *param0, u32 param1, int param2); +static const UnkStruct_ov5_021EDD04 *ov5_021EDD04(int param0); static int ov5_021EDD2C(int param0); static int ov5_021EDD38(int param0); -static const UnkStruct_020217F4 * ov5_021EDD44(int param0); +static const UnkStruct_020217F4 *ov5_021EDD44(int param0); static u32 ov5_021EDD50(int param0); -static void ov5_021EDDAC(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021EDDD4(UnkStruct_02020C44 * param0); -static UnkStruct_020216E0 * ov5_021EDDDC(UnkStruct_02020C44 * param0, const UnkStruct_ov5_021DF84C * param1, const VecFx32 * param2, u32 param3); -static void ov5_021EDE3C(UnkStruct_ov5_021ED0A4 * param0, u32 param1, UnkStruct_ov5_021DF84C * param2); -static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8(const MapObject * param0); -static int ov5_021EDF3C(UnkStruct_ov5_021ED0A4 * param0, int param1, u32 param2, int param3); -static void ov5_021EDFBC(UnkStruct_ov5_021ED0A4 * param0, int param1); -static int ov5_021EDFF0(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021EE030(SysTask * param0, void * param1); -static void ov5_021EE0E8(UnkStruct_ov5_021ED0A4 * param0, int param1, void * param2, int param3); -static void ov5_021EE134(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021EE170(UnkStruct_ov5_021ED0A4 * param0, int param1); -static void ov5_021EE1AC(SysTask * param0, void * param1); -static void ov5_021EE1E8(SysTask * param0, void * param1); -static void ov5_021EE228(UnkStruct_ov5_021ED0A4 * param0, MapObject * param1, UnkStruct_020216E0 ** param2, int param3); -static void ov5_021EE264(UnkStruct_ov5_021ED0A4 * param0, const MapObject * param1); -static void ov5_021EE2C4(SysTask * param0, void * param1); -static void ov5_021EE294(UnkStruct_ov5_021ED0A4 * param0); -static void ov5_021EE2D0(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_ov5_021EE294 * param1); -static void ov5_021EE320(UnkStruct_ov5_021ED0A4 * param0, int param1, int param2); -static void ov5_021EE3C4(UnkStruct_ov5_021ED0A4 * param0); -static UnkStruct_020216E0 * ov5_021EE454(MapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3); -static void ov5_021EE698(SysTask * param0, void * param1); - -void ov5_021ECE40 (UnkStruct_ov5_021ED0A4 * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5, const int * param6, int param7) +static void ov5_021EDDAC(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021EDDD4(UnkStruct_02020C44 *param0); +static UnkStruct_020216E0 *ov5_021EDDDC(UnkStruct_02020C44 *param0, const UnkStruct_ov5_021DF84C *param1, const VecFx32 *param2, u32 param3); +static void ov5_021EDE3C(UnkStruct_ov5_021ED0A4 *param0, u32 param1, UnkStruct_ov5_021DF84C *param2); +static UnkStruct_ov5_021ED0A4 *ov5_021EDEA8(const MapObject *param0); +static int ov5_021EDF3C(UnkStruct_ov5_021ED0A4 *param0, int param1, u32 param2, int param3); +static void ov5_021EDFBC(UnkStruct_ov5_021ED0A4 *param0, int param1); +static int ov5_021EDFF0(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021EE030(SysTask *param0, void *param1); +static void ov5_021EE0E8(UnkStruct_ov5_021ED0A4 *param0, int param1, void *param2, int param3); +static void ov5_021EE134(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021EE170(UnkStruct_ov5_021ED0A4 *param0, int param1); +static void ov5_021EE1AC(SysTask *param0, void *param1); +static void ov5_021EE1E8(SysTask *param0, void *param1); +static void ov5_021EE228(UnkStruct_ov5_021ED0A4 *param0, MapObject *param1, UnkStruct_020216E0 **param2, int param3); +static void ov5_021EE264(UnkStruct_ov5_021ED0A4 *param0, const MapObject *param1); +static void ov5_021EE2C4(SysTask *param0, void *param1); +static void ov5_021EE294(UnkStruct_ov5_021ED0A4 *param0); +static void ov5_021EE2D0(UnkStruct_ov5_021ED0A4 *param0, UnkStruct_ov5_021EE294 *param1); +static void ov5_021EE320(UnkStruct_ov5_021ED0A4 *param0, int param1, int param2); +static void ov5_021EE3C4(UnkStruct_ov5_021ED0A4 *param0); +static UnkStruct_020216E0 *ov5_021EE454(MapObject *param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void *param3); +static void ov5_021EE698(SysTask *param0, void *param1); + +void ov5_021ECE40(UnkStruct_ov5_021ED0A4 *param0, const MapObjectManager *param1, int param2, int param3, int param4, int param5, const int *param6, int param7) { param0->unk_104 = param1; @@ -192,7 +191,7 @@ void ov5_021ECE40 (UnkStruct_ov5_021ED0A4 * param0, const MapObjectManager * par ov5_021ED4E4(param0, param6, Unk_ov5_021FAF50, Unk_ov5_021FAF48); } -void ov5_021ECE94 (UnkStruct_ov5_021ED0A4 * param0) +void ov5_021ECE94(UnkStruct_ov5_021ED0A4 *param0) { ov5_021EE3C4(param0); ov5_021ED0F0(param0); @@ -200,10 +199,10 @@ void ov5_021ECE94 (UnkStruct_ov5_021ED0A4 * param0) ov5_021ED2AC(param0); } -int ov5_021ECEB4 (MapObject * param0, UnkStruct_020216E0 ** param1, int param2) +int ov5_021ECEB4(MapObject *param0, UnkStruct_020216E0 **param1, int param2) { int v0; - UnkStruct_ov5_021ED0A4 * v1; + UnkStruct_ov5_021ED0A4 *v1; *param1 = NULL; @@ -224,7 +223,7 @@ int ov5_021ECEB4 (MapObject * param0, UnkStruct_020216E0 ** param1, int param2) return v0; } -int ov5_021ECF04 (MapObject * param0, UnkStruct_020216E0 ** param1) +int ov5_021ECF04(MapObject *param0, UnkStruct_020216E0 **param1) { int v0 = sub_02062920(param0); int v1 = ov5_021ECEB4(param0, param1, v0); @@ -232,13 +231,13 @@ int ov5_021ECF04 (MapObject * param0, UnkStruct_020216E0 ** param1) return v1; } -UnkStruct_020216E0 * ov5_021ECF1C (MapObject * param0, int param1) +UnkStruct_020216E0 *ov5_021ECF1C(MapObject *param0, int param1) { VecFx32 v0; - UnkStruct_02020C44 * v1; - UnkStruct_020216E0 * v2; - UnkStruct_ov5_021DF84C * v3; - UnkStruct_ov5_021ED0A4 * v4; + UnkStruct_02020C44 *v1; + UnkStruct_020216E0 *v2; + UnkStruct_ov5_021DF84C *v3; + UnkStruct_ov5_021ED0A4 *v4; v4 = ov5_021EDEA8(param0); v1 = ov5_021EDC8C(v4); @@ -256,7 +255,7 @@ UnkStruct_020216E0 * ov5_021ECF1C (MapObject * param0, int param1) return v2; } -void ov5_021ECF70 (const MapObject * param0, UnkStruct_020216E0 ** param1, int param2) +void ov5_021ECF70(const MapObject *param0, UnkStruct_020216E0 **param1, int param2) { int v0; @@ -270,7 +269,7 @@ void ov5_021ECF70 (const MapObject * param0, UnkStruct_020216E0 ** param1, int p } } -void ov5_021ECFA4 (const MapObject * param0, UnkStruct_020216E0 ** param1) +void ov5_021ECFA4(const MapObject *param0, UnkStruct_020216E0 **param1) { ov5_021ED094(param0); @@ -285,7 +284,7 @@ void ov5_021ECFA4 (const MapObject * param0, UnkStruct_020216E0 ** param1) } } -void ov5_021ECFD8 (const MapObject * param0, UnkStruct_020216E0 ** param1, int param2) +void ov5_021ECFD8(const MapObject *param0, UnkStruct_020216E0 **param1, int param2) { int v0; @@ -305,23 +304,23 @@ void ov5_021ECFD8 (const MapObject * param0, UnkStruct_020216E0 ** param1, int p } } -void ov5_021ED01C (UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1) +void ov5_021ED01C(UnkStruct_020216E0 *param0, UnkStruct_ov5_021ED01C *param1) { param1->unk_00 = sub_02021334(param0); param1->unk_02 = sub_02021358(param0); param1->unk_04 = sub_02021394(param0); } -void ov5_021ED03C (UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1) +void ov5_021ED03C(UnkStruct_020216E0 *param0, UnkStruct_ov5_021ED01C *param1) { sub_02021320(param0, param1->unk_00); sub_02021344(param0, param1->unk_02); sub_02021380(param0, param1->unk_04); } -void ov5_021ED060 (MapObject * param0, UnkStruct_020216E0 ** param1, int param2) +void ov5_021ED060(MapObject *param0, UnkStruct_020216E0 **param1, int param2) { - UnkStruct_ov5_021ED0A4 * v0 = ov5_021EDEA8(param0); + UnkStruct_ov5_021ED0A4 *v0 = ov5_021EDEA8(param0); if (ov5_021ED3A4(v0, param2) == UnkEnum_ov5_021ED334_00) { *param1 = ov5_021ECF1C(param0, param2); @@ -330,18 +329,18 @@ void ov5_021ED060 (MapObject * param0, UnkStruct_020216E0 ** param1, int param2) } } -static void ov5_021ED094 (const MapObject * param0) +static void ov5_021ED094(const MapObject *param0) { - UnkStruct_ov5_021ED0A4 * v0 = ov5_021EDEA8(param0); + UnkStruct_ov5_021ED0A4 *v0 = ov5_021EDEA8(param0); ov5_021EE264(v0, param0); } -static void ov5_021ED0A4 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED0A4(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0, v1; - UnkStruct_ov5_021DF84C * v2; - UnkStruct_ov5_021ED110 * v3; + UnkStruct_ov5_021DF84C *v2; + UnkStruct_ov5_021ED110 *v3; v0 = sizeof(UnkStruct_ov5_021DF84C) * param1; v2 = Heap_AllocFromHeap(4, v0); @@ -366,7 +365,7 @@ static void ov5_021ED0A4 (UnkStruct_ov5_021ED0A4 * param0, int param1) } while (param1); } -static void ov5_021ED0F0 (UnkStruct_ov5_021ED0A4 * param0) +static void ov5_021ED0F0(UnkStruct_ov5_021ED0A4 *param0) { ov5_021ED1A4(param0); @@ -374,10 +373,10 @@ static void ov5_021ED0F0 (UnkStruct_ov5_021ED0A4 * param0) Heap_FreeToHeapExplicit(4, param0->unk_F4); } -static UnkStruct_ov5_021DF84C * ov5_021ED110 (UnkStruct_ov5_021ED0A4 * param0, u32 param1) +static UnkStruct_ov5_021DF84C *ov5_021ED110(UnkStruct_ov5_021ED0A4 *param0, u32 param1) { int v0; - UnkStruct_ov5_021ED110 * v1; + UnkStruct_ov5_021ED110 *v1; v1 = param0->unk_F4; v0 = param0->unk_04; @@ -408,11 +407,11 @@ static UnkStruct_ov5_021DF84C * ov5_021ED110 (UnkStruct_ov5_021ED0A4 * param0, u return NULL; } -int ov5_021ED150 (const MapObjectManager * param0, u32 param1, UnkStruct_ov5_021DF84C * param2) +int ov5_021ED150(const MapObjectManager *param0, u32 param1, UnkStruct_ov5_021DF84C *param2) { int v0; - const UnkStruct_ov5_021ED0A4 * v1; - UnkStruct_ov5_021ED110 * v2; + const UnkStruct_ov5_021ED0A4 *v1; + UnkStruct_ov5_021ED110 *v2; v1 = sub_0206285C(param0); v2 = v1->unk_F4; @@ -431,10 +430,10 @@ int ov5_021ED150 (const MapObjectManager * param0, u32 param1, UnkStruct_ov5_021 return 0; } -static void ov5_021ED184 (UnkStruct_ov5_021ED0A4 * param0, u32 param1) +static void ov5_021ED184(UnkStruct_ov5_021ED0A4 *param0, u32 param1) { int v0; - UnkStruct_ov5_021ED110 * v1; + UnkStruct_ov5_021ED110 *v1; v1 = param0->unk_F4; v0 = param0->unk_04; @@ -451,10 +450,10 @@ static void ov5_021ED184 (UnkStruct_ov5_021ED0A4 * param0, u32 param1) } while (v0); } -static void ov5_021ED1A4 (UnkStruct_ov5_021ED0A4 * param0) +static void ov5_021ED1A4(UnkStruct_ov5_021ED0A4 *param0) { int v0; - UnkStruct_ov5_021ED110 * v1; + UnkStruct_ov5_021ED110 *v1; v1 = param0->unk_F4; v0 = param0->unk_04; @@ -469,10 +468,10 @@ static void ov5_021ED1A4 (UnkStruct_ov5_021ED0A4 * param0) } while (v0); } -static int ov5_021ED1C8 (const MapObjectManager * param0, const MapObject * param1, int param2) +static int ov5_021ED1C8(const MapObjectManager *param0, const MapObject *param1, int param2) { int v0, v1; - const MapObject * v2; + const MapObject *v2; v0 = MapObjectMan_GetMaxObjects(param0); v2 = sub_02062868(param0); @@ -499,7 +498,7 @@ static int ov5_021ED1C8 (const MapObjectManager * param0, const MapObject * para return 0; } -static void ov5_021ED224 (UnkStruct_ov5_021ED0A4 * param0, int param1, int param2, int param3, int param4, int param5, int param6) +static void ov5_021ED224(UnkStruct_ov5_021ED0A4 *param0, int param1, int param2, int param3, int param4, int param5, int param6) { { param0->unk_F8 = ov5_021F067C(4, 64, 0x1000 * param1, param1); @@ -516,7 +515,7 @@ static void ov5_021ED224 (UnkStruct_ov5_021ED0A4 * param0, int param1, int param } { - UnkStruct_02022BD8 * v0; + UnkStruct_02022BD8 *v0; v0 = sub_02022BD8(param5, 4); @@ -527,14 +526,14 @@ static void ov5_021ED224 (UnkStruct_ov5_021ED0A4 * param0, int param1, int param } } -static void ov5_021ED2AC (UnkStruct_ov5_021ED0A4 * param0) +static void ov5_021ED2AC(UnkStruct_ov5_021ED0A4 *param0) { ov5_021F06D8(param0->unk_F8); ov5_021F06D8(param0->unk_FC); sub_02022C1C(ov5_021EDCB0(param0)); } -static const UnkStruct_ov5_021ED2D0 * ov5_021ED2D0 (int param0, int param1, const UnkStruct_ov5_021ED2D0 * param2) +static const UnkStruct_ov5_021ED2D0 *ov5_021ED2D0(int param0, int param1, const UnkStruct_ov5_021ED2D0 *param2) { do { if (param2->unk_00 == param0) { @@ -547,9 +546,9 @@ static const UnkStruct_ov5_021ED2D0 * ov5_021ED2D0 (int param0, int param1, cons return NULL; } -static int ov5_021ED2E8 (UnkStruct_ov5_021ED0A4 * param0, UnkStruct_ov5_021F06D8 * param1, int param2, int param3, const UnkStruct_ov5_021ED2D0 * param4) +static int ov5_021ED2E8(UnkStruct_ov5_021ED0A4 *param0, UnkStruct_ov5_021F06D8 *param1, int param2, int param3, const UnkStruct_ov5_021ED2D0 *param4) { - const UnkStruct_ov5_021ED2D0 * v0; + const UnkStruct_ov5_021ED2D0 *v0; if (ov5_021F0770(param1, param2) == 1) { return 0; @@ -559,16 +558,16 @@ static int ov5_021ED2E8 (UnkStruct_ov5_021ED0A4 * param0, UnkStruct_ov5_021F06D8 GF_ASSERT(v0 != NULL); { - NARC * v1 = sub_020628A0(param0->unk_104); + NARC *v1 = sub_020628A0(param0->unk_104); ov5_021F0784(param1, param2, v1, v0->unk_04, 0); } return 1; } -static UnkEnum_ov5_021ED334 ov5_021ED334 (UnkStruct_ov5_021ED0A4 * param0, int param1, int param2, const UnkStruct_ov5_021ED2D0 * param3) +static UnkEnum_ov5_021ED334 ov5_021ED334(UnkStruct_ov5_021ED0A4 *param0, int param1, int param2, const UnkStruct_ov5_021ED2D0 *param3) { - UnkStruct_02022BD8 * v0 = param0->unk_F0; + UnkStruct_02022BD8 *v0 = param0->unk_F0; if (sub_02022C40(v0, param2) == 0) { return UnkEnum_ov5_021ED334_00; @@ -579,8 +578,8 @@ static UnkEnum_ov5_021ED334 ov5_021ED334 (UnkStruct_ov5_021ED0A4 * param0, int p } { - UnkStruct_02022BD8_2 * v1; - const UnkStruct_ov5_021ED2D0 * v2 = ov5_021ED2D0(param2, 0xffff, param3); + UnkStruct_02022BD8_2 *v1; + const UnkStruct_ov5_021ED2D0 *v2 = ov5_021ED2D0(param2, 0xffff, param3); if (v2 == NULL) { return UnkEnum_ov5_021ED334_02; @@ -594,17 +593,17 @@ static UnkEnum_ov5_021ED334 ov5_021ED334 (UnkStruct_ov5_021ED0A4 * param0, int p } } -static UnkEnum_ov5_021ED334 ov5_021ED390 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static UnkEnum_ov5_021ED334 ov5_021ED390(UnkStruct_ov5_021ED0A4 *param0, int param1) { return ov5_021ED334(param0, 0, param1, Unk_ov5_021FC9B4); } -static UnkEnum_ov5_021ED334 ov5_021ED3A4 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static UnkEnum_ov5_021ED334 ov5_021ED3A4(UnkStruct_ov5_021ED0A4 *param0, int param1) { return ov5_021ED334(param0, 1, param1, Unk_ov5_021FC9B4); } -static void ov5_021ED3B8 (UnkStruct_ov5_021ED0A4 * param0, const int * param1) +static void ov5_021ED3B8(UnkStruct_ov5_021ED0A4 *param0, const int *param1) { while ((*param1) != 0xffff) { ov5_021ED390(param0, (*param1)); @@ -612,9 +611,9 @@ static void ov5_021ED3B8 (UnkStruct_ov5_021ED0A4 * param0, const int * param1) } } -static void ov5_021ED3DC (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED3DC(UnkStruct_ov5_021ED0A4 *param0, int param1) { - UnkStruct_0202298C * v0; + UnkStruct_0202298C *v0; v0 = ov5_021EDC98(param0); @@ -622,9 +621,9 @@ static void ov5_021ED3DC (UnkStruct_ov5_021ED0A4 * param0, int param1) ov5_021ED56C(param0, param1); } -static void ov5_021ED40C (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED40C(UnkStruct_ov5_021ED0A4 *param0, int param1) { - UnkStruct_0202298C * v0; + UnkStruct_0202298C *v0; v0 = ov5_021EDC98(param0); @@ -632,7 +631,7 @@ static void ov5_021ED40C (UnkStruct_ov5_021ED0A4 * param0, int param1) ov5_021ED5B4(param0, param1); } -static void ov5_021ED43C (UnkStruct_ov5_021ED0A4 * param0, const int * param1) +static void ov5_021ED43C(UnkStruct_ov5_021ED0A4 *param0, const int *param1) { while ((*param1) != 0xffff) { ov5_021ED3DC(param0, (*param1)); @@ -640,9 +639,9 @@ static void ov5_021ED43C (UnkStruct_ov5_021ED0A4 * param0, const int * param1) } } -static void ov5_021ED460 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED460(UnkStruct_ov5_021ED0A4 *param0, int param1) { - UnkStruct_0202298C * v0; + UnkStruct_0202298C *v0; v0 = ov5_021EDCA0(param0); @@ -650,9 +649,9 @@ static void ov5_021ED460 (UnkStruct_ov5_021ED0A4 * param0, int param1) ov5_021ED6A8(param0, param1); } -static void ov5_021ED490 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED490(UnkStruct_ov5_021ED0A4 *param0, int param1) { - UnkStruct_0202298C * v0; + UnkStruct_0202298C *v0; v0 = ov5_021EDCA0(param0); @@ -660,7 +659,7 @@ static void ov5_021ED490 (UnkStruct_ov5_021ED0A4 * param0, int param1) ov5_021ED6F0(param0, param1); } -static void ov5_021ED4C0 (UnkStruct_ov5_021ED0A4 * param0, const int * param1) +static void ov5_021ED4C0(UnkStruct_ov5_021ED0A4 *param0, const int *param1) { while ((*param1) != 0xffff) { ov5_021ED460(param0, (*param1)); @@ -668,14 +667,14 @@ static void ov5_021ED4C0 (UnkStruct_ov5_021ED0A4 * param0, const int * param1) } } -static void ov5_021ED4E4 (UnkStruct_ov5_021ED0A4 * param0, const int * param1, const int * param2, const int * param3) +static void ov5_021ED4E4(UnkStruct_ov5_021ED0A4 *param0, const int *param1, const int *param2, const int *param3) { ov5_021ED3B8(param0, param1); ov5_021ED43C(param0, param2); ov5_021ED4C0(param0, param3); } -static void ov5_021ED504 (int * param0, int param1, int param2) +static void ov5_021ED504(int *param0, int param1, int param2) { do { *param0 = param1; @@ -684,7 +683,7 @@ static void ov5_021ED504 (int * param0, int param1, int param2) } while (param2); } -static int ov5_021ED50C (int * param0, int param1, int param2, int param3) +static int ov5_021ED50C(int *param0, int param1, int param2, int param3) { do { if ((*param0) == param2) { @@ -699,7 +698,7 @@ static int ov5_021ED50C (int * param0, int param1, int param2, int param3) return 0; } -static int ov5_021ED528 (int * param0, int param1, int param2) +static int ov5_021ED528(int *param0, int param1, int param2) { do { if ((*param0) == param1) { @@ -713,7 +712,7 @@ static int ov5_021ED528 (int * param0, int param1, int param2) return 0; } -static int ov5_021ED53C (int * param0, int param1, int param2, int param3) +static int ov5_021ED53C(int *param0, int param1, int param2, int param3) { do { if ((*param0) == param1) { @@ -728,18 +727,18 @@ static int ov5_021ED53C (int * param0, int param1, int param2, int param3) return 0; } -static void ov5_021ED558 (UnkStruct_ov5_021ED0A4 * param0) +static void ov5_021ED558(UnkStruct_ov5_021ED0A4 *param0) { - int * v0; + int *v0; v0 = ov5_021EDCBC(param0); ov5_021ED504(v0, 0xffff, 8); } -static void ov5_021ED56C (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED56C(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0, v1; - int * v2; + int *v2; v0 = ov5_021EDCC8(param0); v2 = ov5_021EDCBC(param0); @@ -748,10 +747,10 @@ static void ov5_021ED56C (UnkStruct_ov5_021ED0A4 * param0, int param1) GF_ASSERT(v1 != 0); } -static int ov5_021ED598 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021ED598(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0; - int * v1; + int *v1; v0 = ov5_021EDCC8(param0); v1 = ov5_021EDCBC(param0); @@ -759,10 +758,10 @@ static int ov5_021ED598 (UnkStruct_ov5_021ED0A4 * param0, int param1) return ov5_021ED528(v1, param1, v0); } -static void ov5_021ED5B4 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED5B4(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0, v1; - int * v2; + int *v2; v2 = ov5_021EDCBC(param0); v2 = &v2[ov5_021EDCC8(param0)]; @@ -772,10 +771,10 @@ static void ov5_021ED5B4 (UnkStruct_ov5_021ED0A4 * param0, int param1) GF_ASSERT(v0 != 0); } -static int ov5_021ED5E8 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021ED5E8(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0; - int * v1; + int *v1; v1 = ov5_021EDCBC(param0); v1 = &v1[ov5_021EDCC8(param0)]; @@ -784,10 +783,10 @@ static int ov5_021ED5E8 (UnkStruct_ov5_021ED0A4 * param0, int param1) return ov5_021ED528(v1, param1, v0); } -static void ov5_021ED610 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED610(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0; - int * v1; + int *v1; v1 = ov5_021EDCBC(param0); v1 = &v1[ov5_021EDCC8(param0)]; @@ -796,11 +795,11 @@ static void ov5_021ED610 (UnkStruct_ov5_021ED0A4 * param0, int param1) ov5_021ED53C(v1, param1, 0xffff, v0); } -static void ov5_021ED63C (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1) +static void ov5_021ED63C(MapObjectManager *param0, UnkStruct_ov5_021ED0A4 *param1) { int v0; - int * v1; - UnkStruct_0202298C * v2; + int *v1; + UnkStruct_0202298C *v2; v2 = ov5_021EDC98(param1); v1 = ov5_021EDCBC(param1); @@ -820,18 +819,18 @@ static void ov5_021ED63C (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * pa } while (v0); } -static void ov5_021ED694 (UnkStruct_ov5_021ED0A4 * param0) +static void ov5_021ED694(UnkStruct_ov5_021ED0A4 *param0) { - int * v0; + int *v0; v0 = ov5_021EDCC0(param0); ov5_021ED504(v0, 0xffff, 8); } -static void ov5_021ED6A8 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED6A8(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0, v1; - int * v2; + int *v2; v0 = ov5_021EDCD8(param0); v2 = ov5_021EDCC0(param0); @@ -840,10 +839,10 @@ static void ov5_021ED6A8 (UnkStruct_ov5_021ED0A4 * param0, int param1) GF_ASSERT(v1 != 0); } -static int ov5_021ED6D4 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021ED6D4(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0; - int * v1; + int *v1; v0 = ov5_021EDCD8(param0); v1 = ov5_021EDCC0(param0); @@ -851,10 +850,10 @@ static int ov5_021ED6D4 (UnkStruct_ov5_021ED0A4 * param0, int param1) return ov5_021ED528(v1, param1, v0); } -static void ov5_021ED6F0 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED6F0(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0, v1; - int * v2; + int *v2; v2 = ov5_021EDCC0(param0); v2 = &v2[ov5_021EDCD8(param0)]; @@ -864,10 +863,10 @@ static void ov5_021ED6F0 (UnkStruct_ov5_021ED0A4 * param0, int param1) GF_ASSERT(v0 != 0); } -static int ov5_021ED724 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021ED724(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0; - int * v1; + int *v1; v1 = ov5_021EDCC0(param0); v1 = &v1[ov5_021EDCD8(param0)]; @@ -876,10 +875,10 @@ static int ov5_021ED724 (UnkStruct_ov5_021ED0A4 * param0, int param1) return ov5_021ED528(v1, param1, v0); } -static void ov5_021ED74C (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED74C(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0; - int * v1; + int *v1; v1 = ov5_021EDCC0(param0); v1 = &v1[ov5_021EDCD8(param0)]; @@ -888,11 +887,11 @@ static void ov5_021ED74C (UnkStruct_ov5_021ED0A4 * param0, int param1) ov5_021ED53C(v1, param1, 0xffff, v0); } -static void ov5_021ED778 (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1) +static void ov5_021ED778(MapObjectManager *param0, UnkStruct_ov5_021ED0A4 *param1) { int v0; - int * v1; - UnkStruct_0202298C * v2; + int *v1; + UnkStruct_0202298C *v2; v2 = ov5_021EDCA0(param1); v1 = ov5_021EDCC0(param1); @@ -912,18 +911,18 @@ static void ov5_021ED778 (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * pa } while (v0); } -static void ov5_021ED7D0 (UnkStruct_ov5_021ED0A4 * param0) +static void ov5_021ED7D0(UnkStruct_ov5_021ED0A4 *param0) { - int * v0; + int *v0; v0 = ov5_021EDCB8(param0); ov5_021ED504(v0, 0xffff, 32); } -static void ov5_021ED7E4 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED7E4(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0, v1; - int * v2; + int *v2; v0 = ov5_021EDCE8(param0); v2 = ov5_021EDCB8(param0); @@ -931,17 +930,17 @@ static void ov5_021ED7E4 (UnkStruct_ov5_021ED0A4 * param0, int param1) GF_ASSERT(v1 != 0); } -static int ov5_021ED810 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021ED810(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0; - int * v1; + int *v1; v0 = ov5_021EDCE8(param0); v1 = ov5_021EDCB8(param0); return ov5_021ED528(v1, param1, v0); } -static int ov5_021ED82C (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021ED82C(UnkStruct_ov5_021ED0A4 *param0, int param1) { if (ov5_021ED810(param0, param1) == 1) { return 1; @@ -954,10 +953,10 @@ static int ov5_021ED82C (UnkStruct_ov5_021ED0A4 * param0, int param1) return ov5_021EDFF0(param0, param1); } -static void ov5_021ED858 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED858(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0, v1; - int * v2; + int *v2; v2 = ov5_021EDCB8(param0); v2 = &v2[ov5_021EDCE8(param0)]; @@ -967,10 +966,10 @@ static void ov5_021ED858 (UnkStruct_ov5_021ED0A4 * param0, int param1) GF_ASSERT(v0 != 0); } -static void ov5_021ED88C (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED88C(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0; - int * v1; + int *v1; v1 = ov5_021EDCB8(param0); v1 = &v1[ov5_021EDCE8(param0)]; @@ -979,11 +978,11 @@ static void ov5_021ED88C (UnkStruct_ov5_021ED0A4 * param0, int param1) ov5_021ED53C(v1, param1, 0xffff, v0); } -static void ov5_021ED8B8 (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1) +static void ov5_021ED8B8(MapObjectManager *param0, UnkStruct_ov5_021ED0A4 *param1) { int v0, v1; - int * v2; - UnkStruct_02022BD8 * v3; + int *v2; + UnkStruct_02022BD8 *v3; v3 = ov5_021EDCB0(param1); v2 = ov5_021EDCB8(param1); @@ -1008,10 +1007,10 @@ static void ov5_021ED8B8 (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * pa } while (v0); } -static int ov5_021ED924 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021ED924(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0; - int * v1; + int *v1; v1 = ov5_021EDCB8(param0); v1 = &v1[ov5_021EDCE8(param0)]; @@ -1020,7 +1019,7 @@ static int ov5_021ED924 (UnkStruct_ov5_021ED0A4 * param0, int param1) return ov5_021ED528(v1, param1, v0); } -static int ov5_021ED94C (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021ED94C(UnkStruct_ov5_021ED0A4 *param0, int param1) { if (ov5_021ED810(param0, param1) == 1) { return 0; @@ -1033,7 +1032,7 @@ static int ov5_021ED94C (UnkStruct_ov5_021ED0A4 * param0, int param1) return 2; } -static int ov5_021ED974 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021ED974(UnkStruct_ov5_021ED0A4 *param0, int param1) { if (ov5_021ED598(param0, param1) == 1) { return 0; @@ -1046,7 +1045,7 @@ static int ov5_021ED974 (UnkStruct_ov5_021ED0A4 * param0, int param1) return 2; } -static int ov5_021ED99C (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021ED99C(UnkStruct_ov5_021ED0A4 *param0, int param1) { if (ov5_021ED6D4(param0, param1) == 1) { return 0; @@ -1059,7 +1058,7 @@ static int ov5_021ED99C (UnkStruct_ov5_021ED0A4 * param0, int param1) return 2; } -static void ov5_021ED9C4 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED9C4(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0 = ov5_021ED82C(param0, param1); @@ -1068,21 +1067,21 @@ static void ov5_021ED9C4 (UnkStruct_ov5_021ED0A4 * param0, int param1) } } -static void ov5_021ED9DC (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED9DC(UnkStruct_ov5_021ED0A4 *param0, int param1) { if (ov5_021ED974(param0, param1) == 2) { ov5_021ED40C(param0, param1); } } -static void ov5_021ED9F4 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021ED9F4(UnkStruct_ov5_021ED0A4 *param0, int param1) { if (ov5_021ED99C(param0, param1) == 2) { ov5_021ED490(param0, param1); } } -static void ov5_021EDA0C (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EDA0C(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0; @@ -1094,17 +1093,17 @@ static void ov5_021EDA0C (UnkStruct_ov5_021ED0A4 * param0, int param1) ov5_021ED9C4(param0, param1); } -void ov5_021EDA38 (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1) +void ov5_021EDA38(MapObjectManager *param0, UnkStruct_ov5_021ED0A4 *param1) { ov5_021ED63C(param0, param1); ov5_021ED778(param0, param1); ov5_021ED8B8(param0, param1); } -static int ov5_021EDA54 (const MapObjectManager * param0, int param1, const MapObject * param2) +static int ov5_021EDA54(const MapObjectManager *param0, int param1, const MapObject *param2) { int v0 = 0, v1; - MapObject * v2 = NULL; + MapObject *v2 = NULL; while (sub_020625B0(param0, &v2, &v0, (1 << 0)) == 1) { if ((param2 != NULL) && (param2 == v2)) { @@ -1125,10 +1124,10 @@ static int ov5_021EDA54 (const MapObjectManager * param0, int param1, const MapO return 0; } -static int ov5_021EDAB4 (const MapObjectManager * param0, int param1, const MapObject * param2) +static int ov5_021EDAB4(const MapObjectManager *param0, int param1, const MapObject *param2) { int v0, v1 = 0; - MapObject * v2 = NULL; + MapObject *v2 = NULL; while (sub_020625B0(param0, &v2, &v1, (1 << 0)) == 1) { if ((param2 != NULL) && (param2 == v2)) { @@ -1142,7 +1141,7 @@ static int ov5_021EDAB4 (const MapObjectManager * param0, int param1, const MapO } { - const UnkStruct_ov5_021ECD10 * v3 = ov5_021ECD04(v2); + const UnkStruct_ov5_021ECD10 *v3 = ov5_021ECD04(v2); if (v3->unk_04_0 != 1) { continue; @@ -1163,10 +1162,10 @@ static int ov5_021EDAB4 (const MapObjectManager * param0, int param1, const MapO return 0; } -static int ov5_021EDB3C (const MapObjectManager * param0, int param1, const MapObject * param2) +static int ov5_021EDB3C(const MapObjectManager *param0, int param1, const MapObject *param2) { int v0, v1 = 0; - MapObject * v2 = NULL; + MapObject *v2 = NULL; while (sub_020625B0(param0, &v2, &v1, (1 << 0)) == 1) { if ((param2 != NULL) && (v2 == param2)) { @@ -1178,7 +1177,7 @@ static int ov5_021EDB3C (const MapObjectManager * param0, int param1, const MapO } { - const UnkStruct_ov5_021ECD10 * v3 = ov5_021ECD04(v2); + const UnkStruct_ov5_021ECD10 *v3 = ov5_021ECD04(v2); if (v3->unk_04_0 != 1) { continue; @@ -1201,10 +1200,10 @@ static int ov5_021EDB3C (const MapObjectManager * param0, int param1, const MapO return 0; } -void ov5_021EDBC4 (const MapObjectManager * param0, int param1, MapObject * param2) +void ov5_021EDBC4(const MapObjectManager *param0, int param1, MapObject *param2) { int v0; - UnkStruct_ov5_021ED0A4 * v1 = sub_0206285C(param0); + UnkStruct_ov5_021ED0A4 *v1 = sub_0206285C(param0); v0 = ov5_021EDD2C(param1); @@ -1226,7 +1225,7 @@ void ov5_021EDBC4 (const MapObjectManager * param0, int param1, MapObject * para if (ov5_021ED94C(v1, param1) == 1) { if (ov5_021EDA54(param0, param1, param2) == 0) { - UnkStruct_02022BD8 * v2 = ov5_021EDCB0(v1); + UnkStruct_02022BD8 *v2 = ov5_021EDCB0(v1); sub_02022D38(v2, param1); ov5_021ED88C(v1, param1); @@ -1236,124 +1235,124 @@ void ov5_021EDBC4 (const MapObjectManager * param0, int param1, MapObject * para } } -void ov5_021EDC84 (UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02020C44 * param1) +void ov5_021EDC84(UnkStruct_ov5_021ED0A4 *param0, UnkStruct_02020C44 *param1) { param0->unk_E0 = param1; } -UnkStruct_02020C44 * ov5_021EDC8C (UnkStruct_ov5_021ED0A4 * param0) +UnkStruct_02020C44 *ov5_021EDC8C(UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_E0; } -void ov5_021EDC94 (UnkStruct_ov5_021ED0A4 * param0, int param1) +void ov5_021EDC94(UnkStruct_ov5_021ED0A4 *param0, int param1) { param0->unk_04 = param1; } -UnkStruct_0202298C * ov5_021EDC98 (const UnkStruct_ov5_021ED0A4 * param0) +UnkStruct_0202298C *ov5_021EDC98(const UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_E8; } -UnkStruct_0202298C * ov5_021EDCA0 (const UnkStruct_ov5_021ED0A4 * param0) +UnkStruct_0202298C *ov5_021EDCA0(const UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_EC; } -void ov5_021EDCA8 (UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02022BD8 * param1) +void ov5_021EDCA8(UnkStruct_ov5_021ED0A4 *param0, UnkStruct_02022BD8 *param1) { param0->unk_F0 = param1; } -UnkStruct_02022BD8 * ov5_021EDCB0 (const UnkStruct_ov5_021ED0A4 * param0) +UnkStruct_02022BD8 *ov5_021EDCB0(const UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_F0; } -static int * ov5_021EDCB8 (UnkStruct_ov5_021ED0A4 * param0) +static int *ov5_021EDCB8(UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_60; } -static int * ov5_021EDCBC (UnkStruct_ov5_021ED0A4 * param0) +static int *ov5_021EDCBC(UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_20; } -static int * ov5_021EDCC0 (UnkStruct_ov5_021ED0A4 * param0) +static int *ov5_021EDCC0(UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_40; } -static void ov5_021EDCC4 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EDCC4(UnkStruct_ov5_021ED0A4 *param0, int param1) { param0->unk_08 = param1; } -static int ov5_021EDCC8 (const UnkStruct_ov5_021ED0A4 * param0) +static int ov5_021EDCC8(const UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_08; } -static void ov5_021EDCCC (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EDCCC(UnkStruct_ov5_021ED0A4 *param0, int param1) { param0->unk_0C = param1; } -static int ov5_021EDCD0 (const UnkStruct_ov5_021ED0A4 * param0) +static int ov5_021EDCD0(const UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_0C; } -static void ov5_021EDCD4 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EDCD4(UnkStruct_ov5_021ED0A4 *param0, int param1) { param0->unk_10 = param1; } -static int ov5_021EDCD8 (const UnkStruct_ov5_021ED0A4 * param0) +static int ov5_021EDCD8(const UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_10; } -static void ov5_021EDCDC (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EDCDC(UnkStruct_ov5_021ED0A4 *param0, int param1) { param0->unk_14 = param1; } -static int ov5_021EDCE0 (const UnkStruct_ov5_021ED0A4 * param0) +static int ov5_021EDCE0(const UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_14; } -static void ov5_021EDCE4 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EDCE4(UnkStruct_ov5_021ED0A4 *param0, int param1) { param0->unk_18 = param1; } -static int ov5_021EDCE8 (const UnkStruct_ov5_021ED0A4 * param0) +static int ov5_021EDCE8(const UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_18; } -static void ov5_021EDCEC (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EDCEC(UnkStruct_ov5_021ED0A4 *param0, int param1) { param0->unk_1C = param1; } -static int ov5_021EDCF0 (const UnkStruct_ov5_021ED0A4 * param0) +static int ov5_021EDCF0(const UnkStruct_ov5_021ED0A4 *param0) { return param0->unk_1C; } -static void * ov5_021EDCF4 (UnkStruct_ov5_021ED0A4 * param0, u32 param1, int param2) +static void *ov5_021EDCF4(UnkStruct_ov5_021ED0A4 *param0, u32 param1, int param2) { return ov5_021ECD68(param0->unk_104, param1, param2); } -static const UnkStruct_ov5_021EDD04 * ov5_021EDD04 (int param0) +static const UnkStruct_ov5_021EDD04 *ov5_021EDD04(int param0) { - const UnkStruct_ov5_021EDD04 * v0 = Unk_ov5_021FD77C; + const UnkStruct_ov5_021EDD04 *v0 = Unk_ov5_021FD77C; do { if (v0->unk_00 == param0) { @@ -1367,34 +1366,34 @@ static const UnkStruct_ov5_021EDD04 * ov5_021EDD04 (int param0) return NULL; } -static int ov5_021EDD2C (int param0) +static int ov5_021EDD2C(int param0) { - const UnkStruct_ov5_021EDD04 * v0; + const UnkStruct_ov5_021EDD04 *v0; v0 = ov5_021EDD04(param0); return v0->unk_04; } -static int ov5_021EDD38 (int param0) +static int ov5_021EDD38(int param0) { - const UnkStruct_ov5_021EDD04 * v0; + const UnkStruct_ov5_021EDD04 *v0; v0 = ov5_021EDD04(param0); return v0->unk_06; } -static const UnkStruct_020217F4 * ov5_021EDD44 (int param0) +static const UnkStruct_020217F4 *ov5_021EDD44(int param0) { - const UnkStruct_ov5_021EDD04 * v0; + const UnkStruct_ov5_021EDD04 *v0; v0 = ov5_021EDD04(param0); return v0->unk_08; } -static u32 ov5_021EDD50 (int param0) +static u32 ov5_021EDD50(int param0) { int v0 = ov5_021EDD2C(param0); - const int * v1 = Unk_ov5_021FAF40; + const int *v1 = Unk_ov5_021FAF40; do { if (*v1 == v0) { @@ -1405,7 +1404,7 @@ static u32 ov5_021EDD50 (int param0) return 1; } -void ov5_021EDD78 (MapObject * param0, int param1) +void ov5_021EDD78(MapObject *param0, int param1) { if (param1 == 1) { MapObject_SetStatusFlagOn(param0, (1 << 22)); @@ -1414,7 +1413,7 @@ void ov5_021EDD78 (MapObject * param0, int param1) } } -int ov5_021EDD94 (MapObject * param0) +int ov5_021EDD94(MapObject *param0) { if (MapObject_CheckStatus(param0, (1 << 22))) { return 1; @@ -1423,10 +1422,10 @@ int ov5_021EDD94 (MapObject * param0) return 0; } -static void ov5_021EDDAC (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EDDAC(UnkStruct_ov5_021ED0A4 *param0, int param1) { UnkStruct_ov5_021EDDAC v0; - UnkStruct_02020C44 * v1; + UnkStruct_02020C44 *v1; v0.unk_00 = param1; v0.unk_04 = 4; @@ -1436,17 +1435,17 @@ static void ov5_021EDDAC (UnkStruct_ov5_021ED0A4 * param0, int param1) ov5_021EDC94(param0, param1); } -static void ov5_021EDDD4 (UnkStruct_02020C44 * param0) +static void ov5_021EDDD4(UnkStruct_02020C44 *param0) { sub_02020CCC(param0); } -static UnkStruct_020216E0 * ov5_021EDDDC (UnkStruct_02020C44 * param0, const UnkStruct_ov5_021DF84C * param1, const VecFx32 * param2, u32 param3) +static UnkStruct_020216E0 *ov5_021EDDDC(UnkStruct_02020C44 *param0, const UnkStruct_ov5_021DF84C *param1, const VecFx32 *param2, u32 param3) { int v0; UnkStruct_ov5_021DF7F8 v1; - UnkStruct_020216E0 * v2; - VecFx32 v3 = {FX32_ONE, FX32_ONE, FX32_ONE}; + UnkStruct_020216E0 *v2; + VecFx32 v3 = { FX32_ONE, FX32_ONE, FX32_ONE }; v1.unk_00 = param0; v1.unk_04 = param1; @@ -1466,25 +1465,25 @@ static UnkStruct_020216E0 * ov5_021EDDDC (UnkStruct_02020C44 * param0, const Unk return v2; } -static void ov5_021EDE3C (UnkStruct_ov5_021ED0A4 * param0, u32 param1, UnkStruct_ov5_021DF84C * param2) +static void ov5_021EDE3C(UnkStruct_ov5_021ED0A4 *param0, u32 param1, UnkStruct_ov5_021DF84C *param2) { { int v0 = ov5_021EDD2C(param1); - void * v1 = ov5_021F075C(param0->unk_F8, v0); + void *v1 = ov5_021F075C(param0->unk_F8, v0); param2->unk_00 = v1; } { int v2 = ov5_021EDD38(param1); - void * v3 = ov5_021F075C(param0->unk_FC, v2); + void *v3 = ov5_021F075C(param0->unk_FC, v2); sub_02024184(v3, ¶m2->unk_0C); } { - UnkStruct_02022BD8 * v4 = ov5_021EDCB0(param0); - UnkStruct_02022BD8_2 * v5 = sub_02022D98(v4, param1); + UnkStruct_02022BD8 *v4 = ov5_021EDCB0(param0); + UnkStruct_02022BD8_2 *v5 = sub_02022D98(v4, param1); param2->unk_04 = sub_02022DF4(v5); @@ -1500,15 +1499,15 @@ static void ov5_021EDE3C (UnkStruct_ov5_021ED0A4 * param0, u32 param1, UnkStruct } } -static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8 (const MapObject * param0) +static UnkStruct_ov5_021ED0A4 *ov5_021EDEA8(const MapObject *param0) { - const MapObjectManager * v0; + const MapObjectManager *v0; v0 = MapObject_MapObjectManager(param0); return (UnkStruct_ov5_021ED0A4 *)sub_0206285C(v0); } -BOOL ov5_021EDEB4 (MapObject * param0, UnkStruct_020216E0 * param1) +BOOL ov5_021EDEB4(MapObject *param0, UnkStruct_020216E0 *param1) { BOOL v0; VecFx32 v1; @@ -1524,7 +1523,7 @@ BOOL ov5_021EDEB4 (MapObject * param0, UnkStruct_020216E0 * param1) return 0; } -void ov5_021EDED8 (MapObject * param0, UnkStruct_020216E0 * param1) +void ov5_021EDED8(MapObject *param0, UnkStruct_020216E0 *param1) { int v0 = 1; @@ -1541,34 +1540,34 @@ void ov5_021EDED8 (MapObject * param0, UnkStruct_020216E0 * param1) sub_02021320(param1, v0); } -static const int Unk_ov5_021FF4C0[] = {0, 1, 2, 3}; +static const int Unk_ov5_021FF4C0[] = { 0, 1, 2, 3 }; -int ov5_021EDF18 (int param0) +int ov5_021EDF18(int param0) { return Unk_ov5_021FF4C0[param0]; } -static const int Unk_ov5_021FF4D0[] = {4, 5, 6, 7}; +static const int Unk_ov5_021FF4D0[] = { 4, 5, 6, 7 }; -int ov5_021EDF24 (int param0) +int ov5_021EDF24(int param0) { return Unk_ov5_021FF4D0[param0]; } -static const int Unk_ov5_021FF4E0[] = {4, 5, 4, 5}; +static const int Unk_ov5_021FF4E0[] = { 4, 5, 4, 5 }; -int ov5_021EDF30 (int param0) +int ov5_021EDF30(int param0) { return Unk_ov5_021FF4E0[param0]; } -static int ov5_021EDF3C (UnkStruct_ov5_021ED0A4 * param0, int param1, u32 param2, int param3) +static int ov5_021EDF3C(UnkStruct_ov5_021ED0A4 *param0, int param1, u32 param2, int param3) { - UnkStruct_ov5_021EDF3C * v0 = param0->unk_100; + UnkStruct_ov5_021EDF3C *v0 = param0->unk_100; if ((v0->unk_04 >= v0->unk_02) || (sub_02020D50(param0->unk_E0) == 1)) { int v1 = 0; - UnkStruct_ov5_021EDFBC * v2 = v0->unk_0C; + UnkStruct_ov5_021EDFBC *v2 = v0->unk_0C; while (v1 < v0->unk_00) { if (v2->unk_0C == NULL) { @@ -1588,7 +1587,7 @@ static int ov5_021EDF3C (UnkStruct_ov5_021ED0A4 * param0, int param1, u32 param2 } { - void * v3 = ov5_021EDCF4(param0, param2, 0); + void *v3 = ov5_021EDCF4(param0, param2, 0); ov5_021EE0E8(param0, param1, v3, param3); v0->unk_04++; @@ -1596,11 +1595,11 @@ static int ov5_021EDF3C (UnkStruct_ov5_021ED0A4 * param0, int param1, u32 param2 } } -static void ov5_021EDFBC (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EDFBC(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0 = 0; - UnkStruct_ov5_021EDF3C * v1 = param0->unk_100; - UnkStruct_ov5_021EDFBC * v2 = v1->unk_0C; + UnkStruct_ov5_021EDF3C *v1 = param0->unk_100; + UnkStruct_ov5_021EDFBC *v2 = v1->unk_0C; while (v0 < v1->unk_00) { if ((v2->unk_04 == param1) && (v2->unk_0C != NULL)) { @@ -1613,11 +1612,11 @@ static void ov5_021EDFBC (UnkStruct_ov5_021ED0A4 * param0, int param1) } } -static int ov5_021EDFF0 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static int ov5_021EDFF0(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0 = 0; - UnkStruct_ov5_021EDF3C * v1 = param0->unk_100; - UnkStruct_ov5_021EDFBC * v2 = v1->unk_0C; + UnkStruct_ov5_021EDF3C *v1 = param0->unk_100; + UnkStruct_ov5_021EDFBC *v2 = v1->unk_0C; while (v0 < v1->unk_00) { if ((v2->unk_04 == param1) && (v2->unk_0C != NULL)) { @@ -1635,12 +1634,12 @@ static int ov5_021EDFF0 (UnkStruct_ov5_021ED0A4 * param0, int param1) return 0; } -static void ov5_021EE030 (SysTask * param0, void * param1) +static void ov5_021EE030(SysTask *param0, void *param1) { int v0 = 0; - UnkStruct_ov5_021ED0A4 * v1 = param1; - UnkStruct_ov5_021EDF3C * v2 = v1->unk_100; - UnkStruct_ov5_021EDFBC * v3 = v2->unk_0C; + UnkStruct_ov5_021ED0A4 *v1 = param1; + UnkStruct_ov5_021EDF3C *v2 = v1->unk_100; + UnkStruct_ov5_021EDFBC *v3 = v2->unk_0C; { if (sub_02020D50(v1->unk_E0) == 1) { @@ -1650,7 +1649,7 @@ static void ov5_021EE030 (SysTask * param0, void * param1) while ((v2->unk_04 < v2->unk_02) && v0 < v2->unk_00) { if (v3->unk_0C != NULL) { - void * v4 = ov5_021EDCF4(v1, v3->unk_00, 0); + void *v4 = ov5_021EDCF4(v1, v3->unk_00, 0); ov5_021EE0E8(v1, v3->unk_04, v4, v3->unk_08); v3->unk_0C = NULL; @@ -1682,9 +1681,9 @@ static void ov5_021EE030 (SysTask * param0, void * param1) v2->unk_04 = 0; } -static void ov5_021EE0E8 (UnkStruct_ov5_021ED0A4 * param0, int param1, void * param2, int param3) +static void ov5_021EE0E8(UnkStruct_ov5_021ED0A4 *param0, int param1, void *param2, int param3) { - UnkStruct_02022BD8_2 * v0 = sub_02022C9C(param0->unk_F0, param2, param1, 1, 4); + UnkStruct_02022BD8_2 *v0 = sub_02022C9C(param0->unk_F0, param2, param1, 1, 4); GF_ASSERT(v0 != NULL); ov5_021EE134(param0, param1); @@ -1696,11 +1695,11 @@ static void ov5_021EE0E8 (UnkStruct_ov5_021ED0A4 * param0, int param1, void * pa } } -static void ov5_021EE134 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EE134(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0 = 0; - UnkStruct_ov5_021EDF3C * v1 = param0->unk_100; - UnkStruct_ov5_021EE134 * v2 = v1->unk_10; + UnkStruct_ov5_021EDF3C *v1 = param0->unk_100; + UnkStruct_ov5_021EE134 *v2 = v1->unk_10; v1->unk_06 = 1; @@ -1721,11 +1720,11 @@ static void ov5_021EE134 (UnkStruct_ov5_021ED0A4 * param0, int param1) GF_ASSERT(FALSE); } -static void ov5_021EE170 (UnkStruct_ov5_021ED0A4 * param0, int param1) +static void ov5_021EE170(UnkStruct_ov5_021ED0A4 *param0, int param1) { int v0 = 0; - UnkStruct_ov5_021EDF3C * v1 = param0->unk_100; - UnkStruct_ov5_021EE134 * v2 = v1->unk_10; + UnkStruct_ov5_021EDF3C *v1 = param0->unk_100; + UnkStruct_ov5_021EE134 *v2 = v1->unk_10; v1->unk_06 = 1; @@ -1743,10 +1742,10 @@ static void ov5_021EE170 (UnkStruct_ov5_021ED0A4 * param0, int param1) v1->unk_06 = 0; } -static void ov5_021EE1AC (SysTask * param0, void * param1) +static void ov5_021EE1AC(SysTask *param0, void *param1) { - UnkStruct_ov5_021ED0A4 * v0 = param1; - UnkStruct_ov5_021EDF3C * v1 = v0->unk_100; + UnkStruct_ov5_021ED0A4 *v0 = param1; + UnkStruct_ov5_021EDF3C *v1 = v0->unk_100; if (v1->unk_06 == 1) { return; @@ -1754,7 +1753,7 @@ static void ov5_021EE1AC (SysTask * param0, void * param1) { int v2 = 0; - UnkStruct_ov5_021EE134 * v3 = v1->unk_10; + UnkStruct_ov5_021EE134 *v3 = v1->unk_10; while (v2 < v1->unk_00) { if ((v3->unk_00 == 0) && (v3->unk_08 != NULL)) { @@ -1768,12 +1767,12 @@ static void ov5_021EE1AC (SysTask * param0, void * param1) } } -static void ov5_021EE1E8 (SysTask * param0, void * param1) +static void ov5_021EE1E8(SysTask *param0, void *param1) { int v0 = 0; - UnkStruct_ov5_021ED0A4 * v1 = param1; - UnkStruct_ov5_021EDF3C * v2 = v1->unk_100; - UnkStruct_ov5_021EE134 * v3 = v2->unk_10; + UnkStruct_ov5_021ED0A4 *v1 = param1; + UnkStruct_ov5_021EDF3C *v2 = v1->unk_100; + UnkStruct_ov5_021EE134 *v3 = v2->unk_10; v2->unk_06 = 1; @@ -1791,11 +1790,11 @@ static void ov5_021EE1E8 (SysTask * param0, void * param1) v2->unk_06 = 0; } -static void ov5_021EE228 (UnkStruct_ov5_021ED0A4 * param0, MapObject * param1, UnkStruct_020216E0 ** param2, int param3) +static void ov5_021EE228(UnkStruct_ov5_021ED0A4 *param0, MapObject *param1, UnkStruct_020216E0 **param2, int param3) { int v0 = 0; - UnkStruct_ov5_021EDF3C * v1 = param0->unk_100; - UnkStruct_ov5_021EE294 * v2 = v1->unk_08; + UnkStruct_ov5_021EDF3C *v1 = param0->unk_100; + UnkStruct_ov5_021EE294 *v2 = v1->unk_08; while (v0 < v1->unk_00) { if (v2->unk_04 == NULL) { @@ -1815,11 +1814,11 @@ static void ov5_021EE228 (UnkStruct_ov5_021ED0A4 * param0, MapObject * param1, U GF_ASSERT(FALSE); } -static void ov5_021EE264 (UnkStruct_ov5_021ED0A4 * param0, const MapObject * param1) +static void ov5_021EE264(UnkStruct_ov5_021ED0A4 *param0, const MapObject *param1) { int v0 = 0; - UnkStruct_ov5_021EDF3C * v1 = param0->unk_100; - UnkStruct_ov5_021EE294 * v2 = v1->unk_08; + UnkStruct_ov5_021EDF3C *v1 = param0->unk_100; + UnkStruct_ov5_021EE294 *v2 = v1->unk_08; while (v0 < v1->unk_00) { if (v2->unk_04 == param1) { @@ -1834,11 +1833,11 @@ static void ov5_021EE264 (UnkStruct_ov5_021ED0A4 * param0, const MapObject * par } } -static void ov5_021EE294 (UnkStruct_ov5_021ED0A4 * param0) +static void ov5_021EE294(UnkStruct_ov5_021ED0A4 *param0) { int v0 = 0; - UnkStruct_ov5_021EDF3C * v1 = param0->unk_100; - UnkStruct_ov5_021EE294 * v2 = v1->unk_08; + UnkStruct_ov5_021EDF3C *v1 = param0->unk_100; + UnkStruct_ov5_021EE294 *v2 = v1->unk_08; while (v0 < v1->unk_00) { if (v2->unk_04 != NULL) { @@ -1850,13 +1849,13 @@ static void ov5_021EE294 (UnkStruct_ov5_021ED0A4 * param0) } } -static void ov5_021EE2C4 (SysTask * param0, void * param1) +static void ov5_021EE2C4(SysTask *param0, void *param1) { - UnkStruct_ov5_021ED0A4 * v0 = param1; + UnkStruct_ov5_021ED0A4 *v0 = param1; ov5_021EE294(v0); } -static void ov5_021EE2D0 (UnkStruct_ov5_021ED0A4 * param0, UnkStruct_ov5_021EE294 * param1) +static void ov5_021EE2D0(UnkStruct_ov5_021ED0A4 *param0, UnkStruct_ov5_021EE294 *param1) { if (ov5_021ED94C(param0, param1->unk_00) != 2) { *(param1->unk_08) = ov5_021ECF1C(param1->unk_04, param1->unk_00); @@ -1875,10 +1874,10 @@ static void ov5_021EE2D0 (UnkStruct_ov5_021ED0A4 * param0, UnkStruct_ov5_021EE29 } } -static void ov5_021EE320 (UnkStruct_ov5_021ED0A4 * param0, int param1, int param2) +static void ov5_021EE320(UnkStruct_ov5_021ED0A4 *param0, int param1, int param2) { u32 v0, v1, v2, v3, v4; - UnkStruct_ov5_021EDF3C * v5; + UnkStruct_ov5_021EDF3C *v5; v4 = (sizeof(UnkStruct_ov5_021EE294)) * param1; v3 = (sizeof(UnkStruct_ov5_021EDFBC)) * param1; @@ -1910,9 +1909,9 @@ static void ov5_021EE320 (UnkStruct_ov5_021ED0A4 * param0, int param1, int param v5->unk_24 = SysTask_ExecuteAfterVBlank(ov5_021EE1E8, param0, 0xff); } -static void ov5_021EE3C4 (UnkStruct_ov5_021ED0A4 * param0) +static void ov5_021EE3C4(UnkStruct_ov5_021ED0A4 *param0) { - UnkStruct_ov5_021EDF3C * v0 = param0->unk_100; + UnkStruct_ov5_021EDF3C *v0 = param0->unk_100; v0->unk_06 = 1; @@ -1925,11 +1924,11 @@ static void ov5_021EE3C4 (UnkStruct_ov5_021ED0A4 * param0) param0->unk_100 = NULL; } -UnkStruct_020216E0 * ov5_021EE3FC (MapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3) +UnkStruct_020216E0 *ov5_021EE3FC(MapObject *param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void *param3) { if ((ov5_021EDD94(param0) == 1) || (ov5_021EB1A0(param0) == NULL)) { int v0 = sub_02062920(param0); - const MapObjectManager * v1 = MapObject_MapObjectManager(param0); + const MapObjectManager *v1 = MapObject_MapObjectManager(param0); sub_02061B48(param0); ov5_021EDBC4(v1, v0, param0); @@ -1940,17 +1939,17 @@ UnkStruct_020216E0 * ov5_021EE3FC (MapObject * param0, int param1, UnkFuncPtr_ov return ov5_021EE454(param0, param1, param2, param3); } -static UnkStruct_020216E0 * ov5_021EE454 (MapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3) +static UnkStruct_020216E0 *ov5_021EE454(MapObject *param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void *param3) { VecFx32 v0; int v1, v2, v3, v4; - UnkStruct_02022BD8_2 * v5; - UnkStruct_020216E0 * v6; - const UnkStruct_ov5_021ED2D0 * v7; - UnkStruct_ov5_021ED0A4 * v8 = ov5_021EDEA8(param0); - UnkStruct_02020C44 * v9 = ov5_021EDC8C(v8); - UnkStruct_020216E0 * v10 = ov5_021EB1A0(param0); - UnkStruct_ov5_021EE698 * v11 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EE698)); + UnkStruct_02022BD8_2 *v5; + UnkStruct_020216E0 *v6; + const UnkStruct_ov5_021ED2D0 *v7; + UnkStruct_ov5_021ED0A4 *v8 = ov5_021EDEA8(param0); + UnkStruct_02020C44 *v9 = ov5_021EDC8C(v8); + UnkStruct_020216E0 *v10 = ov5_021EB1A0(param0); + UnkStruct_ov5_021EE698 *v11 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EE698)); memset(v11, 0, sizeof(UnkStruct_ov5_021EE698)); @@ -1969,7 +1968,8 @@ static UnkStruct_020216E0 * ov5_021EE454 (MapObject * param0, int param1, UnkFun break; } - v7++; v1++; + v7++; + v1++; } while (v7->unk_00 != 0xffff); GF_ASSERT(v7->unk_00 != 0xffff); @@ -1986,7 +1986,8 @@ static UnkStruct_020216E0 * ov5_021EE454 (MapObject * param0, int param1, UnkFun break; } - v7++; v1++; + v7++; + v1++; } while (v7->unk_00 != 0xffff); GF_ASSERT(v7->unk_00 != 0xffff); @@ -2004,7 +2005,8 @@ static UnkStruct_020216E0 * ov5_021EE454 (MapObject * param0, int param1, UnkFun break; } - v7++; v1++; + v7++; + v1++; } while (v7->unk_00 != 0xffff); GF_ASSERT(v7->unk_00 != 0xffff); @@ -2014,7 +2016,7 @@ static UnkStruct_020216E0 * ov5_021EE454 (MapObject * param0, int param1, UnkFun sub_02021284(&v11->unk_28, v11->unk_08, NNS_G3dGetTex(v11->unk_10), ov5_021EDD44(v2), &v11->unk_14); { - const VecFx32 * v8 = sub_020212C0(v10); + const VecFx32 *v8 = sub_020212C0(v10); v0 = *v8; v11->unk_24 = ov5_021EDDDC(v9, &v11->unk_28, &v0, ov5_021EDD50(v2)); @@ -2056,7 +2058,7 @@ static UnkStruct_020216E0 * ov5_021EE454 (MapObject * param0, int param1, UnkFun { int v16 = sub_02062858(v8->unk_104); - SysTask * v17 = SysTask_ExecuteAfterVBlank(ov5_021EE698, v11, 0xff); + SysTask *v17 = SysTask_ExecuteAfterVBlank(ov5_021EE698, v11, 0xff); GF_ASSERT(v17 != NULL); ov5_021EE698(v17, v11); @@ -2072,10 +2074,10 @@ static UnkStruct_020216E0 * ov5_021EE454 (MapObject * param0, int param1, UnkFun return v6; } -static void ov5_021EE698 (SysTask * param0, void * param1) +static void ov5_021EE698(SysTask *param0, void *param1) { - UnkStruct_ov5_021EE698 * v0 = param1; - MapObject * v1 = v0->unk_50; + UnkStruct_ov5_021EE698 *v0 = param1; + MapObject *v1 = v0->unk_50; switch (v0->unk_04) { case 0: diff --git a/src/overlay005/ov5_021EE75C.c b/src/overlay005/ov5_021EE75C.c index cad1b67fb1..bbeb6370ca 100644 --- a/src/overlay005/ov5_021EE75C.c +++ b/src/overlay005/ov5_021EE75C.c @@ -1,43 +1,43 @@ +#include "overlay005/ov5_021EE75C.h" + #include #include -#include "overlay005/struct_ov5_021D1BEC_decl.h" - #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay005/ov5_021D1A94.h" +#include "overlay005/ov5_021D431C.h" +#include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay006/struct_ov6_0223E6EC.h" +#include "player_avatar.h" #include "unk_02054D00.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" -#include "overlay005/ov5_021D1A94.h" -#include "overlay005/ov5_021D431C.h" -#include "overlay005/ov5_021EE75C.h" typedef struct { int unk_00; int unk_04; } UnkStruct_ov5_021EE75C; -static void ov5_021EE75C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021EE75C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov5_021EE75C * v0 = (UnkStruct_ov5_021EE75C *)param2; + UnkStruct_ov5_021EE75C *v0 = (UnkStruct_ov5_021EE75C *)param2; v0->unk_00 = 0; v0->unk_04 = 0; } -static void ov5_021EE764 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021EE764(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { return; } -static void ov5_021EE768 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021EE768(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { u8 v0; int v1, v2; u8 v3; - UnkStruct_ov5_021EE75C * v4 = (UnkStruct_ov5_021EE75C *)param2; + UnkStruct_ov5_021EE75C *v4 = (UnkStruct_ov5_021EE75C *)param2; v1 = Player_GetXPos(fieldSystem->playerAvatar); v2 = Player_GetZPos(fieldSystem->playerAvatar); @@ -71,7 +71,7 @@ static const UnkStruct_ov6_0223E6EC Unk_ov5_021FF4F0 = { NULL }; -void ov5_021EE7C0 (FieldSystem * fieldSystem) +void ov5_021EE7C0(FieldSystem *fieldSystem) { ov5_021D1B6C(fieldSystem->unk_04->unk_04, &Unk_ov5_021FF4F0); } diff --git a/src/overlay005/ov5_021EE7D4.c b/src/overlay005/ov5_021EE7D4.c index d222065ab7..ad30ef3a1c 100644 --- a/src/overlay005/ov5_021EE7D4.c +++ b/src/overlay005/ov5_021EE7D4.c @@ -1,20 +1,20 @@ +#include "overlay005/ov5_021EE7D4.h" + #include #include -#include "pokemon.h" #include "struct_decls/struct_02098700_decl.h" #include "field/field_system.h" +#include "party.h" +#include "pokemon.h" #include "string_template.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_0206AFE0.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "party.h" #include "unk_02098700.h" -#include "overlay005/ov5_021EE7D4.h" +#include "vars_flags.h" typedef struct { u16 unk_00; @@ -24,25 +24,25 @@ typedef struct { } UnkStruct_ov5_021FF508; static const UnkStruct_ov5_021FF508 Unk_ov5_021FF508[] = { - {0x122, 0x1, 0x0, 0x0}, - {0x12C, 0x1, 0xA, 0x0}, - {0x190, 0x2, 0x6E, 0x0}, - {0x1F4, 0x4, 0x136, 0x0}, - {0x258, 0x14, 0x2C6, 0x0}, - {0x2BC, 0x32, 0xA96, 0x0}, - {0x320, 0x64, 0x1E1E, 0x0}, - {0x384, 0x96, 0x452E, 0x0}, - {0x3E8, 0x96, 0x7FC6, 0x0}, - {0x44C, 0x64, 0xBA5E, 0x0}, - {0x4B0, 0x32, 0xE16E, 0x0}, - {0x514, 0x14, 0xF4F6, 0x0}, - {0x578, 0x5, 0xFCC6, 0x0}, - {0x5DC, 0x2, 0xFEBA, 0x0}, - {0x640, 0x1, 0xFF82, 0x0}, - {0x6A4, 0x1, 0xFFE6, 0x0} + { 0x122, 0x1, 0x0, 0x0 }, + { 0x12C, 0x1, 0xA, 0x0 }, + { 0x190, 0x2, 0x6E, 0x0 }, + { 0x1F4, 0x4, 0x136, 0x0 }, + { 0x258, 0x14, 0x2C6, 0x0 }, + { 0x2BC, 0x32, 0xA96, 0x0 }, + { 0x320, 0x64, 0x1E1E, 0x0 }, + { 0x384, 0x96, 0x452E, 0x0 }, + { 0x3E8, 0x96, 0x7FC6, 0x0 }, + { 0x44C, 0x64, 0xBA5E, 0x0 }, + { 0x4B0, 0x32, 0xE16E, 0x0 }, + { 0x514, 0x14, 0xF4F6, 0x0 }, + { 0x578, 0x5, 0xFCC6, 0x0 }, + { 0x5DC, 0x2, 0xFEBA, 0x0 }, + { 0x640, 0x1, 0xFF82, 0x0 }, + { 0x6A4, 0x1, 0xFFE6, 0x0 } }; -static int ov5_021EE7D4 (Pokemon * param0) +static int ov5_021EE7D4(Pokemon *param0) { u16 v0; u16 v1, v2, v3; @@ -62,7 +62,7 @@ static int ov5_021EE7D4 (Pokemon * param0) return v7 * 256 + v8; } -static u8 ov5_021EE880 (u16 param0) +static u8 ov5_021EE880(u16 param0) { u8 v0; @@ -75,13 +75,13 @@ static u8 ov5_021EE880 (u16 param0) return v0; } -static u32 ov5_021EE8A8 (u16 param0, u16 param1) +static u32 ov5_021EE8A8(u16 param0, u16 param1) { u64 v0, v1, v2; u32 v3; u64 v4; u8 v5; - HeightWeightData * v6; + HeightWeightData *v6; v6 = Pokedex_HeightWeightData(4); Pokedex_HeightWeightData_Load(v6, 0, 4); @@ -99,9 +99,9 @@ static u32 ov5_021EE8A8 (u16 param0, u16 param1) return v3 * v4 / 10; } -u8 ov5_021EE920 (FieldSystem * fieldSystem, u16 param1) +u8 ov5_021EE920(FieldSystem *fieldSystem, u16 param1) { - Pokemon * v0; + Pokemon *v0; vu16 v1, v2; u16 v3; u32 v4; @@ -131,9 +131,9 @@ u8 ov5_021EE920 (FieldSystem * fieldSystem, u16 param1) } } -void ov5_021EE9BC (FieldSystem * fieldSystem, u16 param1) +void ov5_021EE9BC(FieldSystem *fieldSystem, u16 param1) { - Pokemon * v0; + Pokemon *v0; vu16 v1; v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), param1); @@ -142,10 +142,10 @@ void ov5_021EE9BC (FieldSystem * fieldSystem, u16 param1) sub_0206B0C4(SaveData_GetVarsFlags(fieldSystem->saveData), v1); } -static void ov5_021EE9E8 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3, vu16 param4) +static void ov5_021EE9E8(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, vu16 param4) { u32 v0; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); v0 = ov5_021EE8A8(param3, param4); @@ -158,7 +158,7 @@ static void ov5_021EE9E8 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 p StringTemplate_SetNumber(*v1, param2, v0 % 10, 1, 0, 1); } -void ov5_021EEA54 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3) +void ov5_021EEA54(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3) { vu16 v0; @@ -166,9 +166,9 @@ void ov5_021EEA54 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3) ov5_021EE9E8(fieldSystem, param1, param2, param3, v0); } -void ov5_021EEA84 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3) +void ov5_021EEA84(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3) { - Pokemon * v0; + Pokemon *v0; u16 v1; vu16 v2; diff --git a/src/overlay005/ov5_021EEAC8.c b/src/overlay005/ov5_021EEAC8.c index 8acaa4b04d..df69af435b 100644 --- a/src/overlay005/ov5_021EEAC8.c +++ b/src/overlay005/ov5_021EEAC8.c @@ -1,25 +1,26 @@ +#include "overlay005/ov5_021EEAC8.h" + #include #include #include "heap.h" -#include "overlay005/ov5_021EEAC8.h" typedef struct UnkStruct_ov5_021EEB48_t { u16 unk_00; u16 unk_02; - void * unk_04[4]; - void * unk_14[4]; + void *unk_04[4]; + void *unk_14[4]; } UnkStruct_ov5_021EEB48; -static void ov5_021EEB9C(const u8 param0, const int param1, const int param2, UnkStruct_ov5_021EEB48 * param3); +static void ov5_021EEB9C(const u8 param0, const int param1, const int param2, UnkStruct_ov5_021EEB48 *param3); static u8 Unk_ov5_02202128[4][0xf000]; -UnkStruct_ov5_021EEB48 * ov5_021EEAC8 (const BOOL param0) +UnkStruct_ov5_021EEB48 *ov5_021EEAC8(const BOOL param0) { u8 v0; int v1; - UnkStruct_ov5_021EEB48 * v2; + UnkStruct_ov5_021EEB48 *v2; v2 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EEB48)); memset(v2, 0, sizeof(UnkStruct_ov5_021EEB48)); @@ -56,7 +57,7 @@ UnkStruct_ov5_021EEB48 * ov5_021EEAC8 (const BOOL param0) return v2; } -void ov5_021EEB48 (UnkStruct_ov5_021EEB48 * param0) +void ov5_021EEB48(UnkStruct_ov5_021EEB48 *param0) { int v0; @@ -80,26 +81,26 @@ void ov5_021EEB48 (UnkStruct_ov5_021EEB48 * param0) param0 = NULL; } -void ov5_021EEB84 (const u8 param0, const UnkStruct_ov5_021EEB48 * param1, void ** param2) +void ov5_021EEB84(const u8 param0, const UnkStruct_ov5_021EEB48 *param1, void **param2) { *param2 = param1->unk_04[param0]; } -void ov5_021EEB90 (const u8 param0, const UnkStruct_ov5_021EEB48 * param1, void ** param2) +void ov5_021EEB90(const u8 param0, const UnkStruct_ov5_021EEB48 *param1, void **param2) { *param2 = param1->unk_14[param0]; } -static void ov5_021EEB9C (const u8 param0, const int param1, const int param2, UnkStruct_ov5_021EEB48 * param3) +static void ov5_021EEB9C(const u8 param0, const int param1, const int param2, UnkStruct_ov5_021EEB48 *param3) { MI_CpuClear8(param3->unk_04[param0], param1); MI_CpuClear8(param3->unk_14[param0], param2); } -UnkStruct_ov5_021EEB48 * ov5_021EEBC0 (const BOOL param0) +UnkStruct_ov5_021EEB48 *ov5_021EEBC0(const BOOL param0) { u32 v0; - UnkStruct_ov5_021EEB48 * v1; + UnkStruct_ov5_021EEB48 *v1; v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EEB48)); memset(v1, 0, sizeof(UnkStruct_ov5_021EEB48)); @@ -124,7 +125,7 @@ UnkStruct_ov5_021EEB48 * ov5_021EEBC0 (const BOOL param0) return v1; } -void ov5_021EEC24 (UnkStruct_ov5_021EEB48 * param0, UnkStruct_ov5_021EEB48 * param1) +void ov5_021EEC24(UnkStruct_ov5_021EEB48 *param0, UnkStruct_ov5_021EEB48 *param1) { int v0; UnkStruct_ov5_021EEB48 v1; diff --git a/src/overlay005/ov5_021EEC68.c b/src/overlay005/ov5_021EEC68.c index 30c4774a07..fff4c38489 100644 --- a/src/overlay005/ov5_021EEC68.c +++ b/src/overlay005/ov5_021EEC68.c @@ -1,3 +1,5 @@ +#include "overlay005/ov5_021EEC68.h" + #include #include @@ -7,13 +9,12 @@ #include "overlay005/struct_ov5_021EF13C.h" #include "unk_0201E190.h" -#include "overlay005/ov5_021EEC68.h" -static BOOL ov5_021EED38(const UnkStruct_ov5_021EED38 * param0, const u16 param1, const fx32 param2, u16 * param3); +static BOOL ov5_021EED38(const UnkStruct_ov5_021EED38 *param0, const u16 param1, const fx32 param2, u16 *param3); -static BOOL ov5_021EEC68 (const UnkStruct_ov5_021EEC68 * param0, const UnkStruct_ov5_021EEC68 * param1, const UnkStruct_ov5_021EEC68 * param2) +static BOOL ov5_021EEC68(const UnkStruct_ov5_021EEC68 *param0, const UnkStruct_ov5_021EEC68 *param1, const UnkStruct_ov5_021EEC68 *param2) { - const fx32 * v0, * v1, * v2, * v3; + const fx32 *v0, *v1, *v2, *v3; if (param0->unk_00 <= param1->unk_00) { v0 = ¶m0->unk_00; @@ -38,23 +39,23 @@ static BOOL ov5_021EEC68 (const UnkStruct_ov5_021EEC68 * param0, const UnkStruct return 0; } -static void ov5_021EECB8 (const UnkStruct_ov5_021EF13C * param0, u16 param1, UnkStruct_ov5_021EEC68 * param2) +static void ov5_021EECB8(const UnkStruct_ov5_021EF13C *param0, u16 param1, UnkStruct_ov5_021EEC68 *param2) { param2[0] = param0->unk_10[param0->unk_00[param1].unk_00]; param2[1] = param0->unk_10[param0->unk_00[param1].unk_02]; } -static void ov5_021EECE8 (const UnkStruct_ov5_021EF13C * param0, u16 param1, VecFx32 * param2) +static void ov5_021EECE8(const UnkStruct_ov5_021EF13C *param0, u16 param1, VecFx32 *param2) { *param2 = param0->unk_14[param0->unk_00[param1].unk_04]; } -static void ov5_021EED08 (const UnkStruct_ov5_021EF13C * param0, u16 param1, fx32 * param2) +static void ov5_021EED08(const UnkStruct_ov5_021EF13C *param0, u16 param1, fx32 *param2) { *param2 = param0->unk_04[param0->unk_00[param1].unk_06]; } -static void ov5_021EED20 (UnkStruct_ov5_021EED20 * param0) +static void ov5_021EED20(UnkStruct_ov5_021EED20 *param0) { int v0; @@ -65,7 +66,7 @@ static void ov5_021EED20 (UnkStruct_ov5_021EED20 * param0) } } -static BOOL ov5_021EED38 (const UnkStruct_ov5_021EED38 * param0, const u16 param1, const fx32 param2, u16 * param3) +static BOOL ov5_021EED38(const UnkStruct_ov5_021EED38 *param0, const u16 param1, const fx32 param2, u16 *param3) { int v0, v1; u32 v2; @@ -107,7 +108,7 @@ static BOOL ov5_021EED38 (const UnkStruct_ov5_021EED38 * param0, const u16 param return 0; } -BOOL ov5_021EED9C (const fx32 param0, const fx32 param1, const fx32 param2, const UnkStruct_ov5_021EF13C * param3, fx32 * param4) +BOOL ov5_021EED9C(const fx32 param0, const fx32 param1, const fx32 param2, const UnkStruct_ov5_021EF13C *param3, fx32 *param4) { UnkStruct_ov5_021EEC68 v0[2]; UnkStruct_ov5_021EEC68 v1; @@ -124,7 +125,7 @@ BOOL ov5_021EED9C (const fx32 param0, const fx32 param1, const fx32 param2, cons u16 v19; u16 v20; u16 v21; - const UnkStruct_ov5_021EED38 * v22; + const UnkStruct_ov5_021EED38 *v22; if (param3->unk_18 == 0) { return 0; diff --git a/src/overlay005/ov5_021EEF34.c b/src/overlay005/ov5_021EEF34.c index 94fe500223..df2ce64624 100644 --- a/src/overlay005/ov5_021EEF34.c +++ b/src/overlay005/ov5_021EEF34.c @@ -1,3 +1,5 @@ +#include "overlay005/ov5_021EEF34.h" + #include #include @@ -8,11 +10,10 @@ #include "overlay005/struct_ov5_021EF13C.h" #include "overlay005/struct_ov5_021EF13C_sub1.h" +#include "heap.h" #include "narc.h" #include "sys_task.h" -#include "heap.h" #include "sys_task_manager.h" -#include "overlay005/ov5_021EEF34.h" typedef struct { int unk_00; @@ -29,24 +30,24 @@ typedef struct { UnkStruct_ov5_021EEF98 unk_B0; BOOL unk_C8; u8 unk_CC; - u8 * unk_D0; - UnkStruct_ov5_021EF13C * unk_D4; + u8 *unk_D0; + UnkStruct_ov5_021EF13C *unk_D4; BOOL unk_D8; - int * unk_DC; - NARC * unk_E0; + int *unk_DC; + NARC *unk_E0; int unk_E4; - int * unk_E8; + int *unk_E8; } UnkStruct_ov5_021EF05C; -static void ov5_021EEF98(const UnkStruct_ov5_021EEF98 * param0, UnkStruct_ov5_021EF13C * param1, void ** param2); -static void ov5_021EEFF8(NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2); -static void ov5_021EF008(NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2); -static void ov5_021EF01C(NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2); -static void ov5_021EF02C(NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2); -static void ov5_021EF03C(NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2); -static void ov5_021EF04C(NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2); +static void ov5_021EEF98(const UnkStruct_ov5_021EEF98 *param0, UnkStruct_ov5_021EF13C *param1, void **param2); +static void ov5_021EEFF8(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2); +static void ov5_021EF008(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2); +static void ov5_021EF01C(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2); +static void ov5_021EF02C(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2); +static void ov5_021EF03C(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2); +static void ov5_021EF04C(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2); -static void ov5_021EEF34 (NARC * param0, UnkStruct_ov5_021EEF98 * param1) +static void ov5_021EEF34(NARC *param0, UnkStruct_ov5_021EEF98 *param1) { u16 v0[4]; @@ -61,9 +62,9 @@ static void ov5_021EEF34 (NARC * param0, UnkStruct_ov5_021EEF98 * param1) NARC_ReadFile(param0, 2, ¶m1->unk_14); } -static void ov5_021EEF98 (const UnkStruct_ov5_021EEF98 * param0, UnkStruct_ov5_021EF13C * param1, void ** param2) +static void ov5_021EEF98(const UnkStruct_ov5_021EEF98 *param0, UnkStruct_ov5_021EF13C *param1, void **param2) { - void * v0; + void *v0; int v1; u8 v2; @@ -96,40 +97,40 @@ static void ov5_021EEF98 (const UnkStruct_ov5_021EEF98 * param0, UnkStruct_ov5_0 GF_ASSERT(v1 <= 0x9000); } -static void ov5_021EEFF8 (NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2) +static void ov5_021EEFF8(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2) { NARC_ReadFile(param0, sizeof(UnkStruct_ov5_021EEC68) * param2->unk_00, param1->unk_10); } -static void ov5_021EF008 (NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2) +static void ov5_021EF008(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2) { NARC_ReadFile(param0, sizeof(VecFx32) * param2->unk_04, param1->unk_14); } -static void ov5_021EF01C (NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2) +static void ov5_021EF01C(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2) { NARC_ReadFile(param0, sizeof(fx32) * param2->unk_08, param1->unk_04); } -static void ov5_021EF02C (NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2) +static void ov5_021EF02C(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2) { NARC_ReadFile(param0, sizeof(UnkStruct_ov5_021EF13C_sub1) * param2->unk_0C, param1->unk_00); } -static void ov5_021EF03C (NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2) +static void ov5_021EF03C(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2) { NARC_ReadFile(param0, sizeof(UnkStruct_ov5_021EED38) * param2->unk_10, param1->unk_08); } -static void ov5_021EF04C (NARC * param0, UnkStruct_ov5_021EF13C * param1, const UnkStruct_ov5_021EEF98 * param2) +static void ov5_021EF04C(NARC *param0, UnkStruct_ov5_021EF13C *param1, const UnkStruct_ov5_021EEF98 *param2) { NARC_ReadFile(param0, sizeof(u16) * param2->unk_14, param1->unk_0C); } -static void ov5_021EF05C (SysTask * param0, void * param1) +static void ov5_021EF05C(SysTask *param0, void *param1) { BOOL v0; - UnkStruct_ov5_021EF05C * v1; + UnkStruct_ov5_021EF05C *v1; v1 = (UnkStruct_ov5_021EF05C *)param1; @@ -174,9 +175,9 @@ static void ov5_021EF05C (SysTask * param0, void * param1) } } -UnkStruct_ov5_021EF13C * ov5_021EF13C (void) +UnkStruct_ov5_021EF13C *ov5_021EF13C(void) { - UnkStruct_ov5_021EF13C * v0; + UnkStruct_ov5_021EF13C *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EF13C)); @@ -192,11 +193,11 @@ UnkStruct_ov5_021EF13C * ov5_021EF13C (void) return v0; } -void ov5_021EF158 (NARC * param0, const int param1, UnkStruct_ov5_021EF13C * param2, u8 * param3) +void ov5_021EF158(NARC *param0, const int param1, UnkStruct_ov5_021EF13C *param2, u8 *param3) { if (1) { char v0[256]; - UnkStruct_ov5_021EEF98 * v1; + UnkStruct_ov5_021EEF98 *v1; v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EEF98)); @@ -244,7 +245,7 @@ void ov5_021EF158 (NARC * param0, const int param1, UnkStruct_ov5_021EF13C * par } } -void ov5_021EF1D0 (UnkStruct_ov5_021EF13C * param0) +void ov5_021EF1D0(UnkStruct_ov5_021EF13C *param0) { if (param0 == NULL) { return; @@ -254,7 +255,7 @@ void ov5_021EF1D0 (UnkStruct_ov5_021EF13C * param0) param0 = NULL; } -void ov5_021EF1DC (UnkStruct_ov5_021EF13C * param0) +void ov5_021EF1DC(UnkStruct_ov5_021EF13C *param0) { if (param0 == NULL) { return; @@ -268,10 +269,10 @@ void ov5_021EF1DC (UnkStruct_ov5_021EF13C * param0) param0->unk_0C = NULL; } -SysTask * ov5_021EF1F0 (NARC * param0, const int param1, UnkStruct_ov5_021EF13C * param2, int * param3, u8 ** param4, int * param5) +SysTask *ov5_021EF1F0(NARC *param0, const int param1, UnkStruct_ov5_021EF13C *param2, int *param3, u8 **param4, int *param5) { - SysTask * v0; - UnkStruct_ov5_021EF05C * v1; + SysTask *v0; + UnkStruct_ov5_021EF05C *v1; v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov5_021EF05C)); @@ -294,15 +295,15 @@ SysTask * ov5_021EF1F0 (NARC * param0, const int param1, UnkStruct_ov5_021EF13C return v0; } -void ov5_021EF23C (SysTask * param0) +void ov5_021EF23C(SysTask *param0) { - UnkStruct_ov5_021EF05C * v0; + UnkStruct_ov5_021EF05C *v0; v0 = (UnkStruct_ov5_021EF05C *)SysTask_GetParam(param0); v0->unk_D8 = 1; } -void ov5_021EF248 (UnkStruct_ov5_021EF13C * param0) +void ov5_021EF248(UnkStruct_ov5_021EF13C *param0) { param0->unk_18 = 0; } diff --git a/src/overlay005/ov5_021EF250.c b/src/overlay005/ov5_021EF250.c index 45be4966f9..19fd65fe51 100644 --- a/src/overlay005/ov5_021EF250.c +++ b/src/overlay005/ov5_021EF250.c @@ -1,8 +1,9 @@ +#include "overlay005/ov5_021EF250.h" + #include #include #include "heap.h" -#include "overlay005/ov5_021EF250.h" typedef struct { int unk_00; @@ -15,12 +16,12 @@ typedef struct { typedef struct UnkStruct_ov5_021EF300_t { int unk_00; - UnkStruct_ov5_021EF250 * unk_04; + UnkStruct_ov5_021EF250 *unk_04; } UnkStruct_ov5_021EF300; -static BOOL ov5_021EF250(const int param0, const int param1, const UnkStruct_ov5_021EF250 * param2); +static BOOL ov5_021EF250(const int param0, const int param1, const UnkStruct_ov5_021EF250 *param2); -static BOOL ov5_021EF250 (const int param0, const int param1, const UnkStruct_ov5_021EF250 * param2) +static BOOL ov5_021EF250(const int param0, const int param1, const UnkStruct_ov5_021EF250 *param2) { if (param2->unk_14 == 0) { return 0; @@ -40,10 +41,10 @@ static BOOL ov5_021EF250 (const int param0, const int param1, const UnkStruct_ov return 0; } -UnkStruct_ov5_021EF300 * ov5_021EF28C (const u8 param0, const u8 param1) +UnkStruct_ov5_021EF300 *ov5_021EF28C(const u8 param0, const u8 param1) { u8 v0; - UnkStruct_ov5_021EF300 * v1; + UnkStruct_ov5_021EF300 *v1; v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov5_021EF300)); @@ -57,7 +58,7 @@ UnkStruct_ov5_021EF300 * ov5_021EF28C (const u8 param0, const u8 param1) return v1; } -void ov5_021EF2CC (const u8 param0, const int param1, const int param2, const int param3, const int param4, const fx32 param5, UnkStruct_ov5_021EF300 * param6) +void ov5_021EF2CC(const u8 param0, const int param1, const int param2, const int param3, const int param4, const fx32 param5, UnkStruct_ov5_021EF300 *param6) { param6->unk_04[param0].unk_00 = param1; param6->unk_04[param0].unk_04 = param2; @@ -67,19 +68,19 @@ void ov5_021EF2CC (const u8 param0, const int param1, const int param2, const in param6->unk_04[param0].unk_14 = 1; } -void ov5_021EF300 (UnkStruct_ov5_021EF300 * param0) +void ov5_021EF300(UnkStruct_ov5_021EF300 *param0) { Heap_FreeToHeap(param0->unk_04); Heap_FreeToHeap(param0); } -BOOL ov5_021EF314 (const int param0, const int param1, const UnkStruct_ov5_021EF300 * param2, u8 * param3) +BOOL ov5_021EF314(const int param0, const int param1, const UnkStruct_ov5_021EF300 *param2, u8 *param3) { u8 v0; BOOL v1; - UnkStruct_ov5_021EF250 * v2; + UnkStruct_ov5_021EF250 *v2; - GF_ASSERT((param3 != NULL)); + GF_ASSERT(param3 != NULL); for (v0 = 0; v0 < param2->unk_00; v0++) { v2 = ¶m2->unk_04[v0]; @@ -93,16 +94,16 @@ BOOL ov5_021EF314 (const int param0, const int param1, const UnkStruct_ov5_021EF return 0; } -fx32 ov5_021EF35C (const u8 param0, const UnkStruct_ov5_021EF300 * param1) +fx32 ov5_021EF35C(const u8 param0, const UnkStruct_ov5_021EF300 *param1) { - GF_ASSERT((param0 < param1->unk_00)); - GF_ASSERT((param1->unk_04[param0].unk_14)); + GF_ASSERT(param0 < param1->unk_00); + GF_ASSERT(param1->unk_04[param0].unk_14); return param1->unk_04[param0].unk_10; } -void ov5_021EF388 (const u8 param0, const fx32 param1, UnkStruct_ov5_021EF300 * param2) +void ov5_021EF388(const u8 param0, const fx32 param1, UnkStruct_ov5_021EF300 *param2) { - GF_ASSERT((param0 < param2->unk_00)); + GF_ASSERT(param0 < param2->unk_00); param2->unk_04[param0].unk_10 = param1; } diff --git a/src/overlay005/ov5_021EF4BC.c b/src/overlay005/ov5_021EF4BC.c index 99ba340fde..feacd7321a 100644 --- a/src/overlay005/ov5_021EF4BC.c +++ b/src/overlay005/ov5_021EF4BC.c @@ -1,14 +1,15 @@ +#include "overlay005/ov5_021EF4BC.h" + #include #include -#include "sys_task_manager.h" +#include "overlay005/hblank_system.h" -#include "unk_02005474.h" -#include "sys_task.h" #include "buffer_manager.h" #include "heap.h" -#include "overlay005/hblank_system.h" -#include "overlay005/ov5_021EF4BC.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" typedef struct UnkStruct_ov5_021EF4F8_t { u32 unk_00; @@ -16,28 +17,28 @@ typedef struct UnkStruct_ov5_021EF4F8_t { int unk_08; u16 unk_0C[192]; u16 unk_18C[192]; - BufferManager * bufferManager; - HBlankSystem * unk_310; - HBlankTask * unk_314; + BufferManager *bufferManager; + HBlankSystem *unk_310; + HBlankTask *unk_314; BOOL unk_318; - SysTask * unk_31C; - SysTask * unk_320; - SysTask * unk_324; + SysTask *unk_31C; + SysTask *unk_320; + SysTask *unk_324; } UnkStruct_ov5_021EF4F8; -static void ov5_021EF5A8(SysTask * param0, void * param1); -static void ov5_021EF6B0(SysTask * param0, void * param1); -static void ov5_021EF6E4(SysTask * param0, void * param1); -static void ov5_021EF634(UnkStruct_ov5_021EF4F8 * param0); -static void ov5_021EF66C(u16 * param0, int param1, int param2); -static void ov5_021EF6C0(HBlankTask * param0, void * param1); -static void ov5_021EF6CC(UnkStruct_ov5_021EF4F8 * param0); -static void ov5_021EF6F0(UnkStruct_ov5_021EF4F8 * param0); -static void ov5_021EF710(UnkStruct_ov5_021EF4F8 * param0); - -UnkStruct_ov5_021EF4F8 * ov5_021EF4BC (u32 param0, HBlankSystem * param1) +static void ov5_021EF5A8(SysTask *param0, void *param1); +static void ov5_021EF6B0(SysTask *param0, void *param1); +static void ov5_021EF6E4(SysTask *param0, void *param1); +static void ov5_021EF634(UnkStruct_ov5_021EF4F8 *param0); +static void ov5_021EF66C(u16 *param0, int param1, int param2); +static void ov5_021EF6C0(HBlankTask *param0, void *param1); +static void ov5_021EF6CC(UnkStruct_ov5_021EF4F8 *param0); +static void ov5_021EF6F0(UnkStruct_ov5_021EF4F8 *param0); +static void ov5_021EF710(UnkStruct_ov5_021EF4F8 *param0); + +UnkStruct_ov5_021EF4F8 *ov5_021EF4BC(u32 param0, HBlankSystem *param1) { - UnkStruct_ov5_021EF4F8 * v0; + UnkStruct_ov5_021EF4F8 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov5_021EF4F8)); memset(v0, 0, sizeof(UnkStruct_ov5_021EF4F8)); @@ -49,7 +50,7 @@ UnkStruct_ov5_021EF4F8 * ov5_021EF4BC (u32 param0, HBlankSystem * param1) return v0; } -void ov5_021EF4F8 (UnkStruct_ov5_021EF4F8 * param0) +void ov5_021EF4F8(UnkStruct_ov5_021EF4F8 *param0) { if (param0->unk_00 == 1) { ov5_021EF710(param0); @@ -59,7 +60,7 @@ void ov5_021EF4F8 (UnkStruct_ov5_021EF4F8 * param0) Heap_FreeToHeap(param0); } -void ov5_021EF518 (UnkStruct_ov5_021EF4F8 * param0) +void ov5_021EF518(UnkStruct_ov5_021EF4F8 *param0) { GF_ASSERT(param0->unk_00 == 0); @@ -77,10 +78,10 @@ void ov5_021EF518 (UnkStruct_ov5_021EF4F8 * param0) Sound_PlayEffect(1552); } -static void ov5_021EF5A8 (SysTask * param0, void * param1) +static void ov5_021EF5A8(SysTask *param0, void *param1) { - UnkStruct_ov5_021EF4F8 * v0 = param1; - u16 * v1; + UnkStruct_ov5_021EF4F8 *v0 = param1; + u16 *v1; switch (v0->unk_08) { case 0: @@ -115,9 +116,9 @@ static void ov5_021EF5A8 (SysTask * param0, void * param1) } } -static void ov5_021EF634 (UnkStruct_ov5_021EF4F8 * param0) +static void ov5_021EF634(UnkStruct_ov5_021EF4F8 *param0) { - const u16 * v0; + const u16 *v0; int v1; v1 = GX_GetVCount(); @@ -136,7 +137,7 @@ static void ov5_021EF634 (UnkStruct_ov5_021EF4F8 * param0) } } -static void ov5_021EF66C (u16 * param0, int param1, int param2) +static void ov5_021EF66C(u16 *param0, int param1, int param2) { int v0; int v1; @@ -158,21 +159,21 @@ static void ov5_021EF66C (u16 * param0, int param1, int param2) } } -static void ov5_021EF6B0 (SysTask * param0, void * param1) +static void ov5_021EF6B0(SysTask *param0, void *param1) { - UnkStruct_ov5_021EF4F8 * v0 = param1; + UnkStruct_ov5_021EF4F8 *v0 = param1; v0->unk_318 = 0; G3X_SetHOffset(0); } -static void ov5_021EF6C0 (HBlankTask * param0, void * param1) +static void ov5_021EF6C0(HBlankTask *param0, void *param1) { - UnkStruct_ov5_021EF4F8 * v0 = param1; + UnkStruct_ov5_021EF4F8 *v0 = param1; ov5_021EF6CC(v0); } -static void ov5_021EF6CC (UnkStruct_ov5_021EF4F8 * param0) +static void ov5_021EF6CC(UnkStruct_ov5_021EF4F8 *param0) { if (param0->unk_00 == 1) { if (param0->unk_318 == 1) { @@ -181,13 +182,13 @@ static void ov5_021EF6CC (UnkStruct_ov5_021EF4F8 * param0) } } -static void ov5_021EF6E4 (SysTask * param0, void * param1) +static void ov5_021EF6E4(SysTask *param0, void *param1) { - UnkStruct_ov5_021EF4F8 * v0 = param1; + UnkStruct_ov5_021EF4F8 *v0 = param1; ov5_021EF6F0(v0); } -static void ov5_021EF6F0 (UnkStruct_ov5_021EF4F8 * param0) +static void ov5_021EF6F0(UnkStruct_ov5_021EF4F8 *param0) { if (param0->unk_00 == 1) { BufferManager_SwapBuffers(param0->bufferManager); @@ -195,7 +196,7 @@ static void ov5_021EF6F0 (UnkStruct_ov5_021EF4F8 * param0) } } -static void ov5_021EF710 (UnkStruct_ov5_021EF4F8 * param0) +static void ov5_021EF710(UnkStruct_ov5_021EF4F8 *param0) { HBlankTask_Delete(param0->unk_314); param0->unk_314 = NULL; diff --git a/src/overlay005/ov5_021EF75C.c b/src/overlay005/ov5_021EF75C.c index a082c28c17..03c76377e3 100644 --- a/src/overlay005/ov5_021EF75C.c +++ b/src/overlay005/ov5_021EF75C.c @@ -1,20 +1,22 @@ +#include "overlay005/ov5_021EF75C.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" + +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021D56BC.h" #include "overlay005/struct_ov5_021D3CAC_decl.h" #include "overlay005/struct_ov5_021D5778_decl.h" -#include "narc.h" #include "heap.h" +#include "narc.h" #include "unk_0201C970.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021D56BC.h" -#include "overlay005/ov5_021EF75C.h" typedef struct { int unk_00; - UnkStruct_ov5_021D3CAC * unk_04; + UnkStruct_ov5_021D3CAC *unk_04; u16 unk_08; int unk_0C; } UnkStruct_ov5_021EF7A0; @@ -28,15 +30,15 @@ typedef struct { typedef struct UnkStruct_ov5_021EF76C_t { int unk_00; - NNSG3dResFileHeader * unk_04[768]; - void * unk_C04; - void * unk_C08; - NNSG3dResTex * unk_C0C; - NNSG3dResTex * unk_C10; - UnkStruct_ov5_021D5778 * unk_C14; + NNSG3dResFileHeader *unk_04[768]; + void *unk_C04; + void *unk_C08; + NNSG3dResTex *unk_C0C; + NNSG3dResTex *unk_C10; + UnkStruct_ov5_021D5778 *unk_C14; UnkStruct_ov5_021EF76C_sub1 unk_C18; - UnkStruct_ov5_021EF7A0 * unk_C20; - u16 * unk_C24; + UnkStruct_ov5_021EF7A0 *unk_C20; + u16 *unk_C24; } UnkStruct_ov5_021EF76C; static const GXRgb Unk_ov5_021FF588[8] = { @@ -61,9 +63,9 @@ static const GXRgb Unk_ov5_021FF598[8] = { GX_RGB(4, 4, 4) }; -static void ov5_021EF75C (void * param0, NNSG3dResTex * param1) +static void ov5_021EF75C(void *param0, NNSG3dResTex *param1) { - u8 * v0; + u8 *v0; u32 v1; v0 = (u8 *)param1 + param1->texInfo.ofsTex; @@ -72,9 +74,9 @@ static void ov5_021EF75C (void * param0, NNSG3dResTex * param1) Heap_ReallocFromHeap(param0, v1); } -UnkStruct_ov5_021EF76C * ov5_021EF76C (const int param0, UnkStruct_ov5_021D3CAC * param1) +UnkStruct_ov5_021EF76C *ov5_021EF76C(const int param0, UnkStruct_ov5_021D3CAC *param1) { - UnkStruct_ov5_021EF76C * v0; + UnkStruct_ov5_021EF76C *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EF76C)); @@ -86,10 +88,10 @@ UnkStruct_ov5_021EF76C * ov5_021EF76C (const int param0, UnkStruct_ov5_021D3CAC return v0; } -void ov5_021EF7A0 (UnkStruct_ov5_021EF76C * param0) +void ov5_021EF7A0(UnkStruct_ov5_021EF76C *param0) { - NARC * v0; - UnkStruct_ov5_021EF7A0 * v1 = param0->unk_C20; + NARC *v0; + UnkStruct_ov5_021EF7A0 *v1 = param0->unk_C20; NARC_ReadWholeMemberByIndexPair(¶m0->unk_C18, NARC_INDEX_FIELDDATA__AREADATA__AREA_DATA, v1->unk_00); @@ -153,7 +155,7 @@ void ov5_021EF7A0 (UnkStruct_ov5_021EF76C * param0) param0->unk_04[v6] = NARC_AllocAndReadWholeMember(v0, v6, 4); { - NNSG3dResMdl * v8; + NNSG3dResMdl *v8; if (v6 < v7) { v8 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(param0->unk_04[v6]), 0); @@ -172,7 +174,7 @@ void ov5_021EF7A0 (UnkStruct_ov5_021EF76C * param0) if (param0->unk_04[0] == NULL) { BOOL v10; - NNSG3dResTex * v11; + NNSG3dResTex *v11; param0->unk_04[0] = NARC_AllocAndReadWholeMember(v0, 0, 4); @@ -209,9 +211,9 @@ void ov5_021EF7A0 (UnkStruct_ov5_021EF76C * param0) param0->unk_C20 = NULL; } -NNSG3dResFileHeader ** ov5_021EF9E8 (const int param0, UnkStruct_ov5_021EF76C * const param1) +NNSG3dResFileHeader **ov5_021EF9E8(const int param0, UnkStruct_ov5_021EF76C *const param1) { - GF_ASSERT((param1 != NULL)); + GF_ASSERT(param1 != NULL); if (param1->unk_04[param0] == NULL) { GF_ASSERT(param1->unk_04[0] != NULL); @@ -222,7 +224,7 @@ NNSG3dResFileHeader ** ov5_021EF9E8 (const int param0, UnkStruct_ov5_021EF76C * return &(param1->unk_04[param0]); } -void ov5_021EFA10 (UnkStruct_ov5_021EF76C ** param0) +void ov5_021EFA10(UnkStruct_ov5_021EF76C **param0) { int v0; @@ -243,29 +245,29 @@ void ov5_021EFA10 (UnkStruct_ov5_021EF76C ** param0) Heap_FreeToHeap((*param0)->unk_C08); (*param0)->unk_C08 = NULL; - Heap_FreeToHeap((*param0)); + Heap_FreeToHeap(*param0); (*param0) = NULL; } -NNSG3dResTex * ov5_021EFA8C (const UnkStruct_ov5_021EF76C * param0) +NNSG3dResTex *ov5_021EFA8C(const UnkStruct_ov5_021EF76C *param0) { - GF_ASSERT((param0 != NULL)); + GF_ASSERT(param0 != NULL); return param0->unk_C0C; } -NNSG3dResTex * ov5_021EFAA0 (const UnkStruct_ov5_021EF76C * param0) +NNSG3dResTex *ov5_021EFAA0(const UnkStruct_ov5_021EF76C *param0) { - GF_ASSERT((param0 != NULL)); + GF_ASSERT(param0 != NULL); return param0->unk_C10; } -const UnkStruct_ov5_021D5778 * ov5_021EFAB4 (const UnkStruct_ov5_021EF76C * param0) +const UnkStruct_ov5_021D5778 *ov5_021EFAB4(const UnkStruct_ov5_021EF76C *param0) { return param0->unk_C14; } -BOOL ov5_021EFAC0 (const UnkStruct_ov5_021EF76C * param0) +BOOL ov5_021EFAC0(const UnkStruct_ov5_021EF76C *param0) { if ((param0->unk_C18.unk_06 == 0) || (param0->unk_C18.unk_06 == 3)) { return 1; @@ -274,7 +276,7 @@ BOOL ov5_021EFAC0 (const UnkStruct_ov5_021EF76C * param0) } } -u8 ov5_021EFAD8 (const UnkStruct_ov5_021EF76C * param0) +u8 ov5_021EFAD8(const UnkStruct_ov5_021EF76C *param0) { u8 v0; @@ -282,7 +284,7 @@ u8 ov5_021EFAD8 (const UnkStruct_ov5_021EF76C * param0) return v0; } -int ov5_021EFAE8 (const UnkStruct_ov5_021EF76C * param0, const int param1) +int ov5_021EFAE8(const UnkStruct_ov5_021EF76C *param0, const int param1) { int v0; @@ -290,7 +292,7 @@ int ov5_021EFAE8 (const UnkStruct_ov5_021EF76C * param0, const int param1) return v0; } -BOOL ov5_021EFAF8 (const UnkStruct_ov5_021EF76C * param0, const int param1) +BOOL ov5_021EFAF8(const UnkStruct_ov5_021EF76C *param0, const int param1) { if (param0->unk_04[param1] == NULL) { return 0; diff --git a/src/overlay005/ov5_021EFB0C.c b/src/overlay005/ov5_021EFB0C.c index 33b0ef5623..b2655ea3b0 100644 --- a/src/overlay005/ov5_021EFB0C.c +++ b/src/overlay005/ov5_021EFB0C.c @@ -1,29 +1,28 @@ +#include "overlay005/ov5_021EFB0C.h" + #include #include -#include "inlines.h" - -#include "trainer_info.h" -#include "overlay005/struct_ov5_021E1608_decl.h" -#include "overlay005/struct_ov5_021E1890_decl.h" - #include "struct_defs/struct_0202D844.h" #include "struct_defs/struct_0202D84C.h" -#include "field/field_system.h" #include "struct_defs/struct_02055130.h" -#include "narc.h" +#include "field/field_system.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021E779C.h" +#include "overlay005/struct_ov5_021E1608_decl.h" +#include "overlay005/struct_ov5_021E1890_decl.h" + #include "heap.h" -#include "unk_02025E08.h" +#include "inlines.h" +#include "narc.h" +#include "player_avatar.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0202D7A8.h" #include "unk_02039C80.h" #include "unk_02054D00.h" -#include "player_avatar.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021E779C.h" -#include "overlay005/ov5_021EFB0C.h" typedef struct { u8 unk_00; @@ -35,13 +34,13 @@ typedef struct UnkStruct_ov5_021EFB30_t { int unk_6C[21]; } UnkStruct_ov5_021EFB30; -static void ov5_021EFCF8(const BOOL param0, u8 * param1); -static void ov5_021EFD58(u8 * param0); -static void ov5_021EFE7C(FieldSystem * fieldSystem, UnkStruct_ov5_021E1608 * param1, const int param2); +static void ov5_021EFCF8(const BOOL param0, u8 *param1); +static void ov5_021EFD58(u8 *param0); +static void ov5_021EFE7C(FieldSystem *fieldSystem, UnkStruct_ov5_021E1608 *param1, const int param2); static u8 ov5_021EFF10(const int param0); static const int ov5_021EFDAC(const u8 param0); static const int ov5_021EFDC0(const u8 param0); -static const BOOL ov5_021EFE58(const int param0, u8 * param1); +static const BOOL ov5_021EFE58(const int param0, u8 *param1); static const BOOL ov5_021EFF34(const int param0); static BOOL ov5_021EFF4C(const u32 param0, const u8 param1); @@ -81,10 +80,10 @@ static const int dummy[] = { 0x7 }; -UnkStruct_ov5_021EFB30 * ov5_021EFB0C (void) +UnkStruct_ov5_021EFB30 *ov5_021EFB0C(void) { u8 v0; - UnkStruct_ov5_021EFB30 * v1; + UnkStruct_ov5_021EFB30 *v1; v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021EFB30)); @@ -96,13 +95,13 @@ UnkStruct_ov5_021EFB30 * ov5_021EFB0C (void) return v1; } -void ov5_021EFB30 (UnkStruct_ov5_021EFB30 ** param0) +void ov5_021EFB30(UnkStruct_ov5_021EFB30 **param0) { Heap_FreeToHeap(*param0); *param0 = NULL; } -BOOL ov5_021EFB40 (FieldSystem * fieldSystem, int * param1) +BOOL ov5_021EFB40(FieldSystem *fieldSystem, int *param1) { UnkStruct_02055130 v0; int v1, v2; @@ -125,11 +124,11 @@ BOOL ov5_021EFB40 (FieldSystem * fieldSystem, int * param1) return v3; } -u16 ov5_021EFB94 (FieldSystem * fieldSystem) +u16 ov5_021EFB94(FieldSystem *fieldSystem) { u8 v0; - UnkStruct_0202D844 * v1; - UnkStruct_0202D84C * v2; + UnkStruct_0202D844 *v1; + UnkStruct_0202D84C *v2; v0 = ov5_021EFF10(fieldSystem->location->mapId); GF_ASSERT(v0 != 21); @@ -148,11 +147,11 @@ u16 ov5_021EFB94 (FieldSystem * fieldSystem) } } -void ov5_021EFBDC (FieldSystem * fieldSystem) +void ov5_021EFBDC(FieldSystem *fieldSystem) { u8 v0; - UnkStruct_0202D844 * v1; - UnkStruct_0202D84C * v2; + UnkStruct_0202D844 *v1; + UnkStruct_0202D84C *v2; BOOL v3; v0 = ov5_021EFF10(fieldSystem->location->mapId); @@ -164,7 +163,7 @@ void ov5_021EFBDC (FieldSystem * fieldSystem) v2->unk_00 = (24 * 60); { - TrainerInfo * v4 = SaveData_GetTrainerInfo(fieldSystem->saveData); + TrainerInfo *v4 = SaveData_GetTrainerInfo(fieldSystem->saveData); v3 = ov5_021EFF4C(TrainerInfo_ID(v4), v0); } @@ -195,7 +194,7 @@ void ov5_021EFBDC (FieldSystem * fieldSystem) sub_0202D848(v0, v1); } -void ov5_021EFC90 (FieldSystem * fieldSystem) +void ov5_021EFC90(FieldSystem *fieldSystem) { u8 v0; @@ -204,9 +203,9 @@ void ov5_021EFC90 (FieldSystem * fieldSystem) if (fieldSystem->unk_A8->unk_00[v0].unk_04) { u8 v1; - UnkStruct_ov5_021E1890 * v2; - UnkStruct_ov5_021E1608 * v3; - NNSG3dRenderObj * v4; + UnkStruct_ov5_021E1890 *v2; + UnkStruct_ov5_021E1608 *v3; + NNSG3dRenderObj *v4; v1 = ov5_021E9354(fieldSystem->unk_28); @@ -223,7 +222,7 @@ void ov5_021EFC90 (FieldSystem * fieldSystem) } } -static void ov5_021EFCF8 (const BOOL param0, u8 * param1) +static void ov5_021EFCF8(const BOOL param0, u8 *param1) { int v0; @@ -250,7 +249,7 @@ static void ov5_021EFCF8 (const BOOL param0, u8 * param1) } } -static void ov5_021EFD58 (u8 * param0) +static void ov5_021EFD58(u8 *param0) { int v0; @@ -271,7 +270,7 @@ static void ov5_021EFD58 (u8 * param0) } } -static const int ov5_021EFDAC (const u8 param0) +static const int ov5_021EFDAC(const u8 param0) { int v0; @@ -286,7 +285,7 @@ static const int ov5_021EFDAC (const u8 param0) return v0; } -static const int ov5_021EFDC0 (const u8 param0) +static const int ov5_021EFDC0(const u8 param0) { int v0; int v1; @@ -338,7 +337,7 @@ static const int ov5_021EFDC0 (const u8 param0) return v0; } -static const BOOL ov5_021EFE58 (const int param0, u8 * param1) +static const BOOL ov5_021EFE58(const int param0, u8 *param1) { u8 v0; BOOL v1; @@ -358,7 +357,7 @@ static const BOOL ov5_021EFE58 (const int param0, u8 * param1) return v1; } -static void ov5_021EFE7C (FieldSystem * fieldSystem, UnkStruct_ov5_021E1608 * param1, const int param2) +static void ov5_021EFE7C(FieldSystem *fieldSystem, UnkStruct_ov5_021E1608 *param1, const int param2) { u16 v0; u8 v1; @@ -367,9 +366,9 @@ static void ov5_021EFE7C (FieldSystem * fieldSystem, UnkStruct_ov5_021E1608 * pa v1 = ov5_021EFF10(v0); if (v1 != 21) { - UnkStruct_0202D844 * v2; - UnkStruct_0202D84C * v3; - UnkStruct_ov5_021E1890 * v4; + UnkStruct_0202D844 *v2; + UnkStruct_0202D84C *v3; + UnkStruct_ov5_021E1890 *v4; v2 = sub_0202D840(sub_0202D834(fieldSystem->saveData)); v3 = sub_0202D84C(v1, v2); @@ -387,7 +386,7 @@ static void ov5_021EFE7C (FieldSystem * fieldSystem, UnkStruct_ov5_021E1608 * pa v4 = ov5_021E18CC(param1, 26); if (v4 != NULL) { - NNSG3dRenderObj * v7; + NNSG3dRenderObj *v7; v7 = ov5_021E18BC(v4); @@ -402,7 +401,7 @@ static void ov5_021EFE7C (FieldSystem * fieldSystem, UnkStruct_ov5_021E1608 * pa } } -static u8 ov5_021EFF10 (const int param0) +static u8 ov5_021EFF10(const int param0) { u8 v0; @@ -415,7 +414,7 @@ static u8 ov5_021EFF10 (const int param0) return v0; } -static const BOOL ov5_021EFF34 (const int param0) +static const BOOL ov5_021EFF34(const int param0) { if ((0 < param0) && (param0 <= (18 * 60))) { return 1; @@ -424,7 +423,7 @@ static const BOOL ov5_021EFF34 (const int param0) } } -static BOOL ov5_021EFF4C (const u32 param0, const u8 param1) +static BOOL ov5_021EFF4C(const u32 param0, const u8 param1) { u8 v0, v1; u8 v2[4]; @@ -460,7 +459,7 @@ static BOOL ov5_021EFF4C (const u32 param0, const u8 param1) return 0; } -int ov5_021EFFE4 (FieldSystem * fieldSystem) +int ov5_021EFFE4(FieldSystem *fieldSystem) { u8 v0; @@ -468,10 +467,10 @@ int ov5_021EFFE4 (FieldSystem * fieldSystem) GF_ASSERT(v0 != 21); { - int * v1; + int *v1; int v2; - UnkStruct_0202D844 * v3; - UnkStruct_0202D84C * v4; + UnkStruct_0202D844 *v3; + UnkStruct_0202D84C *v4; v3 = sub_0202D840(sub_0202D834(fieldSystem->saveData)); v4 = sub_0202D84C(v0, v3); @@ -489,9 +488,9 @@ int ov5_021EFFE4 (FieldSystem * fieldSystem) } } -void ov5_021F0030 (void * param0, const int param1, UnkStruct_ov5_021E1608 * const param2) +void ov5_021F0030(void *param0, const int param1, UnkStruct_ov5_021E1608 *const param2) { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; u8 v1; if (param1 < 0) { @@ -502,10 +501,10 @@ void ov5_021F0030 (void * param0, const int param1, UnkStruct_ov5_021E1608 * con ov5_021EFE7C(fieldSystem, param2, param1); } -void ov5_021F0040 (FieldSystem * fieldSystem) +void ov5_021F0040(FieldSystem *fieldSystem) { - UnkStruct_0202D844 * v0; - UnkStruct_0202D84C * v1; + UnkStruct_0202D844 *v0; + UnkStruct_0202D84C *v1; u8 v2; v2 = ov5_021EFF10(fieldSystem->location->mapId); diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c index 50b858a772..242e72b660 100644 --- a/src/overlay005/ov5_021F007C.c +++ b/src/overlay005/ov5_021F007C.c @@ -1,29 +1,30 @@ +#include "overlay005/ov5_021F007C.h" + #include #include #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "overlay005/struct_ov5_021D1BEC_decl.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay005/ov5_021D1A94.h" +#include "overlay005/ov5_021D5EB8.h" +#include "overlay005/struct_ov5_021D1BEC_decl.h" +#include "overlay006/ov6_02240C9C.h" #include "overlay006/struct_ov6_0223E6EC.h" +#include "gx_layers.h" +#include "heap.h" +#include "map_header.h" +#include "player_avatar.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "heap.h" #include "unk_02018340.h" -#include "gx_layers.h" -#include "map_header.h" #include "unk_0203E880.h" #include "unk_020508D4.h" #include "unk_02054D00.h" -#include "player_avatar.h" -#include "overlay005/ov5_021D1A94.h" -#include "overlay005/ov5_021D5EB8.h" -#include "overlay005/ov5_021F007C.h" -#include "overlay006/ov6_02240C9C.h" typedef struct { int unk_00; @@ -39,28 +40,28 @@ typedef struct { } UnkStruct_ov5_021F013C; typedef struct { - void * unk_00; - NNSG2dPaletteData * unk_04; + void *unk_00; + NNSG2dPaletteData *unk_04; u16 unk_08[16]; UnkStruct_ov5_021F02B8 unk_28; BOOL unk_3C; } UnkStruct_ov5_021F007C; typedef struct UnkStruct_ov5_021F0468_t { - UnkStruct_ov5_021D1BEC * unk_00; + UnkStruct_ov5_021D1BEC *unk_00; BOOL unk_04; BOOL unk_08; u16 unk_0C; s16 unk_0E; } UnkStruct_ov5_021F0468; -static void ov5_021F0260(BGL * param0); -static void ov5_021F02B8(UnkStruct_ov5_021F02B8 * param0, int param1, int param2, int param3); -static BOOL ov5_021F02C8(UnkStruct_ov5_021F02B8 * param0); +static void ov5_021F0260(BGL *param0); +static void ov5_021F02B8(UnkStruct_ov5_021F02B8 *param0, int param1, int param2, int param3); +static BOOL ov5_021F02C8(UnkStruct_ov5_021F02B8 *param0); -static void ov5_021F007C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021F007C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov5_021F007C * v0 = param2; + UnkStruct_ov5_021F007C *v0 = param2; v0->unk_00 = sub_02006F88(65, 55, &v0->unk_04, 4); v0->unk_3C = 0; @@ -72,9 +73,9 @@ static void ov5_021F007C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy Sound_PlayEffect(1608); } -static void ov5_021F00BC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021F00BC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov5_021F007C * v0 = param2; + UnkStruct_ov5_021F007C *v0 = param2; v0->unk_00 = sub_02006F88(65, 55, &v0->unk_04, 4); v0->unk_3C = 0; @@ -84,16 +85,16 @@ static void ov5_021F00BC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy v0->unk_3C = 0; } -static void ov5_021F00E4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021F00E4(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov5_021F007C * v0 = param2; + UnkStruct_ov5_021F007C *v0 = param2; Heap_FreeToHeap(v0->unk_00); } -static void ov5_021F00F0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021F00F0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { BOOL v0; - UnkStruct_ov5_021F007C * v1 = param2; + UnkStruct_ov5_021F007C *v1 = param2; if (v1->unk_3C == 1) { return; @@ -109,9 +110,9 @@ static void ov5_021F00F0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy sub_0201972C(2, v1->unk_08, 32, 6 * 32); } -static void ov5_021F013C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021F013C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov5_021F013C * v0 = param2; + UnkStruct_ov5_021F013C *v0 = param2; ov5_021F0260(fieldSystem->unk_08); ov5_021F02B8(&v0->unk_00, 0, 10, 19); @@ -125,9 +126,9 @@ static void ov5_021F013C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy Sound_PlayEffect(1608); } -static void ov5_021F0188 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021F0188(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov5_021F013C * v0 = param2; + UnkStruct_ov5_021F013C *v0 = param2; ov5_021F0260(fieldSystem->unk_08); ov5_021F02B8(&v0->unk_00, 10, 0, 15); @@ -137,15 +138,15 @@ static void ov5_021F0188 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy G2_SetBlendAlpha((GX_PLANEMASK_BG2), GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BD, 10, 16 - 10); } -static void ov5_021F01BC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021F01BC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { return; } -static void ov5_021F01C0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021F01C0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { BOOL v0; - UnkStruct_ov5_021F013C * v1 = param2; + UnkStruct_ov5_021F013C *v1 = param2; if (v1->unk_14 == 1) { return; @@ -160,12 +161,12 @@ static void ov5_021F01C0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy G2_ChangeBlendAlpha(v1->unk_00.unk_00, 16 - v1->unk_00.unk_00); } -static void ov5_021F01EC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov5_021F01EC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { return; } -UnkStruct_ov5_021D1BEC * ov5_021F01F0 (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov5_021F01F0(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -175,13 +176,13 @@ UnkStruct_ov5_021D1BEC * ov5_021F01F0 (FieldSystem * fieldSystem) ov5_021F01C0, ov5_021F01EC }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -UnkStruct_ov5_021D1BEC * ov5_021F0204 (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov5_021F0204(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -191,24 +192,24 @@ UnkStruct_ov5_021D1BEC * ov5_021F0204 (FieldSystem * fieldSystem) ov5_021F01C0, ov5_021F01EC }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -void ov5_021F0218 (UnkStruct_ov5_021D1BEC * param0) +void ov5_021F0218(UnkStruct_ov5_021D1BEC *param0) { ov5_021D1BEC(param0); } -BOOL ov5_021F0220 (UnkStruct_ov5_021D1BEC * param0) +BOOL ov5_021F0220(UnkStruct_ov5_021D1BEC *param0) { - UnkStruct_ov5_021F013C * v0 = ov5_021D1C2C(param0); + UnkStruct_ov5_021F013C *v0 = ov5_021D1C2C(param0); return v0->unk_14; } -UnkStruct_ov5_021D1BEC * ov5_021F022C (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov5_021F022C(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -218,13 +219,13 @@ UnkStruct_ov5_021D1BEC * ov5_021F022C (FieldSystem * fieldSystem) ov5_021F00F0, ov5_021F01EC }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -UnkStruct_ov5_021D1BEC * ov5_021F0240 (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov5_021F0240(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -234,22 +235,22 @@ UnkStruct_ov5_021D1BEC * ov5_021F0240 (FieldSystem * fieldSystem) ov5_021F00F0, ov5_021F01EC }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -BOOL ov5_021F0254 (UnkStruct_ov5_021D1BEC * param0) +BOOL ov5_021F0254(UnkStruct_ov5_021D1BEC *param0) { - UnkStruct_ov5_021F007C * v0 = ov5_021D1C2C(param0); + UnkStruct_ov5_021F007C *v0 = ov5_021D1C2C(param0); return v0->unk_3C; } -static void ov5_021F0260 (BGL * param0) +static void ov5_021F0260(BGL *param0) { GXRgb v0 = (GX_RGB(31, 10, 23)); - u8 * v1; + u8 *v1; sub_0201972C(2, &v0, sizeof(short), (6 * 32) + 2); @@ -261,7 +262,7 @@ static void ov5_021F0260 (BGL * param0) sub_02019EE0(param0, 2, (6 << 12) | 1); } -static void ov5_021F02B8 (UnkStruct_ov5_021F02B8 * param0, int param1, int param2, int param3) +static void ov5_021F02B8(UnkStruct_ov5_021F02B8 *param0, int param1, int param2, int param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -270,7 +271,7 @@ static void ov5_021F02B8 (UnkStruct_ov5_021F02B8 * param0, int param1, int param param0->unk_0C = 0; } -static BOOL ov5_021F02C8 (UnkStruct_ov5_021F02B8 * param0) +static BOOL ov5_021F02C8(UnkStruct_ov5_021F02B8 *param0) { int v0; @@ -288,17 +289,17 @@ static BOOL ov5_021F02C8 (UnkStruct_ov5_021F02B8 * param0) return 1; } -static void ov5_021F02F4 (FieldSystem * fieldSystem) +static void ov5_021F02F4(FieldSystem *fieldSystem) { sub_0201975C(2, 0); } -static void ov5_021F0300 (FieldSystem * fieldSystem) +static void ov5_021F0300(FieldSystem *fieldSystem) { sub_0201975C(2, 0x7fff); } -static void ov5_021F0310 (FieldSystem * fieldSystem) +static void ov5_021F0310(FieldSystem *fieldSystem) { u16 v0 = 0x7fff; @@ -314,7 +315,7 @@ static void ov5_021F0310 (FieldSystem * fieldSystem) ov5_021F02F4(fieldSystem); } -static void ov5_021F0374 (FieldSystem * fieldSystem) +static void ov5_021F0374(FieldSystem *fieldSystem) { u16 v0 = 0x7fff; @@ -330,7 +331,7 @@ static void ov5_021F0374 (FieldSystem * fieldSystem) ov5_021F02F4(fieldSystem); } -static BOOL ov5_021F03D8 (FieldSystem * fieldSystem) +static BOOL ov5_021F03D8(FieldSystem *fieldSystem) { static const u32 v0[] = { 23, @@ -353,7 +354,7 @@ static BOOL ov5_021F03D8 (FieldSystem * fieldSystem) return 0; } -static BOOL ov5_021F0408 (FieldSystem * fieldSystem) +static BOOL ov5_021F0408(FieldSystem *fieldSystem) { static const u32 v0[1] = { 8, @@ -376,7 +377,7 @@ static BOOL ov5_021F0408 (FieldSystem * fieldSystem) return 0; } -static BOOL ov5_021F0438 (FieldSystem * fieldSystem) +static BOOL ov5_021F0438(FieldSystem *fieldSystem) { static const u32 v0[18] = { 2, @@ -416,7 +417,7 @@ static BOOL ov5_021F0438 (FieldSystem * fieldSystem) return 1; } -static void ov5_021F0468 (UnkStruct_ov5_021F0468 * param0) +static void ov5_021F0468(UnkStruct_ov5_021F0468 *param0) { if (param0->unk_00) { ov5_021F0218(param0->unk_00); @@ -426,15 +427,15 @@ static void ov5_021F0468 (UnkStruct_ov5_021F0468 * param0) Heap_FreeToHeap(param0); } -u32 ov5_021F0484 (void) +u32 ov5_021F0484(void) { return sizeof(UnkStruct_ov5_021F0468); } -BOOL ov5_021F0488 (TaskManager * param0) +BOOL ov5_021F0488(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov5_021F0468 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov5_021F0468 *v1 = TaskManager_Environment(param0); BOOL v2; switch (v1->unk_0C) { @@ -532,8 +533,7 @@ BOOL ov5_021F0488 (TaskManager * param0) v1->unk_0C = 8; } break; - case 6: - { + case 6: { BOOL v6; ov5_021F0468(v1); @@ -544,8 +544,7 @@ BOOL ov5_021F0488 (TaskManager * param0) v6 = ov6_022411C8(fieldSystem, param0); GF_ASSERT(v6); - } - break; + } break; case 7: v1->unk_0E--; diff --git a/src/overlay005/ov5_021F067C.c b/src/overlay005/ov5_021F067C.c index 4b91e1a774..30133f2565 100644 --- a/src/overlay005/ov5_021F067C.c +++ b/src/overlay005/ov5_021F067C.c @@ -1,11 +1,12 @@ +#include "overlay005/ov5_021F067C.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "narc.h" #include "heap.h" -#include "overlay005/ov5_021F067C.h" +#include "narc.h" typedef struct UnkStruct_ov5_021F0814_t UnkStruct_ov5_021F0814; @@ -15,25 +16,25 @@ typedef struct UnkStruct_ov5_021F06D8_t { u32 unk_08; u32 unk_0C; u32 unk_10; - UnkStruct_ov5_021F0814 * unk_14; + UnkStruct_ov5_021F0814 *unk_14; } UnkStruct_ov5_021F06D8; typedef struct UnkStruct_ov5_021F0814_t { - void * unk_00; + void *unk_00; u32 unk_04; } UnkStruct_ov5_021F0814; -static void * ov5_021F07B4(UnkStruct_ov5_021F06D8 * param0, u32 param1, int param2); -static void ov5_021F07D4(void * param0); -static UnkStruct_ov5_021F0814 * ov5_021F07DC(UnkStruct_ov5_021F06D8 * param0, u32 param1); -static UnkStruct_ov5_021F0814 * ov5_021F07FC(UnkStruct_ov5_021F06D8 * param0); -static void ov5_021F0814(UnkStruct_ov5_021F0814 * param0, u32 param1, void * param2); -static void ov5_021F081C(UnkStruct_ov5_021F0814 * param0); +static void *ov5_021F07B4(UnkStruct_ov5_021F06D8 *param0, u32 param1, int param2); +static void ov5_021F07D4(void *param0); +static UnkStruct_ov5_021F0814 *ov5_021F07DC(UnkStruct_ov5_021F06D8 *param0, u32 param1); +static UnkStruct_ov5_021F0814 *ov5_021F07FC(UnkStruct_ov5_021F06D8 *param0); +static void ov5_021F0814(UnkStruct_ov5_021F0814 *param0, u32 param1, void *param2); +static void ov5_021F081C(UnkStruct_ov5_021F0814 *param0); -UnkStruct_ov5_021F06D8 * ov5_021F067C (u32 param0, u32 param1, u32 param2, u32 param3) +UnkStruct_ov5_021F06D8 *ov5_021F067C(u32 param0, u32 param1, u32 param2, u32 param3) { u32 v0, v1; - UnkStruct_ov5_021F06D8 * v2; + UnkStruct_ov5_021F06D8 *v2; v0 = (sizeof(UnkStruct_ov5_021F0814)) * param3; v1 = param2 + v0 + (sizeof(UnkStruct_ov5_021F06D8)); @@ -60,18 +61,19 @@ UnkStruct_ov5_021F06D8 * ov5_021F067C (u32 param0, u32 param1, u32 param2, u32 p return v2; } -void ov5_021F06D8 (UnkStruct_ov5_021F06D8 * param0) +void ov5_021F06D8(UnkStruct_ov5_021F06D8 *param0) { { u32 v0 = param0->unk_08; - UnkStruct_ov5_021F0814 * v1 = param0->unk_14; + UnkStruct_ov5_021F0814 *v1 = param0->unk_14; while (v0) { if (v1->unk_00 != NULL) { ov5_021F0740(param0, v1->unk_04); } - v0--; v1++; + v0--; + v1++; } } @@ -83,23 +85,23 @@ void ov5_021F06D8 (UnkStruct_ov5_021F06D8 * param0) } } -void * ov5_021F070C (UnkStruct_ov5_021F06D8 * param0, u32 param1, u32 param2, int param3) +void *ov5_021F070C(UnkStruct_ov5_021F06D8 *param0, u32 param1, u32 param2, int param3) { - UnkStruct_ov5_021F0814 * v0 = ov5_021F07FC(param0); + UnkStruct_ov5_021F0814 *v0 = ov5_021F07FC(param0); GF_ASSERT(v0 != NULL); { - void * v1 = ov5_021F07B4(param0, param2, param3); + void *v1 = ov5_021F07B4(param0, param2, param3); ov5_021F0814(v0, param1, v1); return v1; } } -void ov5_021F0740 (UnkStruct_ov5_021F06D8 * param0, u32 param1) +void ov5_021F0740(UnkStruct_ov5_021F06D8 *param0, u32 param1) { - UnkStruct_ov5_021F0814 * v0 = ov5_021F07DC(param0, param1); + UnkStruct_ov5_021F0814 *v0 = ov5_021F07DC(param0, param1); GF_ASSERT(v0 != NULL); @@ -107,17 +109,17 @@ void ov5_021F0740 (UnkStruct_ov5_021F06D8 * param0, u32 param1) ov5_021F081C(v0); } -void * ov5_021F075C (UnkStruct_ov5_021F06D8 * param0, u32 param1) +void *ov5_021F075C(UnkStruct_ov5_021F06D8 *param0, u32 param1) { - UnkStruct_ov5_021F0814 * v0 = ov5_021F07DC(param0, param1); + UnkStruct_ov5_021F0814 *v0 = ov5_021F07DC(param0, param1); GF_ASSERT(v0 != NULL); return v0->unk_00; } -int ov5_021F0770 (UnkStruct_ov5_021F06D8 * param0, u32 param1) +int ov5_021F0770(UnkStruct_ov5_021F06D8 *param0, u32 param1) { - UnkStruct_ov5_021F0814 * v0 = ov5_021F07DC(param0, param1); + UnkStruct_ov5_021F0814 *v0 = ov5_021F07DC(param0, param1); if (v0 != NULL) { return 1; @@ -126,18 +128,18 @@ int ov5_021F0770 (UnkStruct_ov5_021F06D8 * param0, u32 param1) return 0; } -void * ov5_021F0784 (UnkStruct_ov5_021F06D8 * param0, u32 param1, NARC * param2, u32 param3, int param4) +void *ov5_021F0784(UnkStruct_ov5_021F06D8 *param0, u32 param1, NARC *param2, u32 param3, int param4) { u32 v0 = NARC_GetMemberSize(param2, param3); - void * v1 = ov5_021F070C(param0, param1, v0, param4); + void *v1 = ov5_021F070C(param0, param1, v0, param4); NARC_ReadWholeMember(param2, param3, v1); return v1; } -static void * ov5_021F07B4 (UnkStruct_ov5_021F06D8 * param0, u32 param1, int param2) +static void *ov5_021F07B4(UnkStruct_ov5_021F06D8 *param0, u32 param1, int param2) { - void * v0; + void *v0; if (param2 == 0) { v0 = Heap_AllocFromHeap(param0->unk_04, param1); @@ -149,50 +151,52 @@ static void * ov5_021F07B4 (UnkStruct_ov5_021F06D8 * param0, u32 param1, int par return v0; } -static void ov5_021F07D4 (void * param0) +static void ov5_021F07D4(void *param0) { Heap_FreeToHeap(param0); } -static UnkStruct_ov5_021F0814 * ov5_021F07DC (UnkStruct_ov5_021F06D8 * param0, u32 param1) +static UnkStruct_ov5_021F0814 *ov5_021F07DC(UnkStruct_ov5_021F06D8 *param0, u32 param1) { u32 v0 = param0->unk_08; - UnkStruct_ov5_021F0814 * v1 = param0->unk_14; + UnkStruct_ov5_021F0814 *v1 = param0->unk_14; while (v0) { if ((v1->unk_00 != NULL) && (v1->unk_04 == param1)) { return v1; } - v1++; v0--; + v1++; + v0--; } return NULL; } -static UnkStruct_ov5_021F0814 * ov5_021F07FC (UnkStruct_ov5_021F06D8 * param0) +static UnkStruct_ov5_021F0814 *ov5_021F07FC(UnkStruct_ov5_021F06D8 *param0) { u32 v0 = param0->unk_08; - UnkStruct_ov5_021F0814 * v1 = param0->unk_14; + UnkStruct_ov5_021F0814 *v1 = param0->unk_14; while (v0) { if (v1->unk_00 == NULL) { return v1; } - v1++; v0--; + v1++; + v0--; } return NULL; } -static void ov5_021F0814 (UnkStruct_ov5_021F0814 * param0, u32 param1, void * param2) +static void ov5_021F0814(UnkStruct_ov5_021F0814 *param0, u32 param1, void *param2) { param0->unk_00 = param2; param0->unk_04 = param1; } -static void ov5_021F081C (UnkStruct_ov5_021F0814 * param0) +static void ov5_021F081C(UnkStruct_ov5_021F0814 *param0) { param0->unk_00 = NULL; param0->unk_04 = 0; diff --git a/src/overlay005/ov5_021F0824.c b/src/overlay005/ov5_021F0824.c index 09176397c8..51e61cdc36 100644 --- a/src/overlay005/ov5_021F0824.c +++ b/src/overlay005/ov5_021F0824.c @@ -1,23 +1,24 @@ +#include "overlay005/ov5_021F0824.h" + #include #include #include "struct_decls/struct_02029894_decl.h" #include "field/field_system.h" - -#include "unk_0202854C.h" -#include "unk_020573FC.h" -#include "field_comm_manager.h" #include "overlay005/ov5_021E15F4.h" #include "overlay005/ov5_021EF75C.h" -#include "overlay005/ov5_021F0824.h" #include "overlay023/ov23_02241F74.h" -void ov5_021F0824 (FieldSystem * fieldSystem) +#include "field_comm_manager.h" +#include "unk_0202854C.h" +#include "unk_020573FC.h" + +void ov5_021F0824(FieldSystem *fieldSystem) { int v0; int v1; - UnkStruct_02029894 * v2; + UnkStruct_02029894 *v2; int v3, v4; int v5, v6; int v7, v8; diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index 61cfa8a178..0a225b4fbe 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -1,55 +1,53 @@ +#include "overlay005/ov5_021F08CC.h" + #include #include -#include "core_sys.h" - -#include "message.h" -#include "strbuf.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "pokemon.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" +#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" -#include "struct_defs/struct_0205AA50.h" +#include "overlay005/ov5_021DFB54.h" +#include "overlay005/ov5_021F5A10.h" #include "overlay006/battle_params.h" +#include "overlay006/ov6_02240C9C.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" -#include "unk_02005474.h" +#include "core_sys.h" +#include "heap.h" +#include "map_object.h" #include "message.h" +#include "party.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D15C.h" -#include "strbuf.h" #include "unk_02025E08.h" #include "unk_0202CD50.h" #include "unk_020508D4.h" #include "unk_02050A74.h" #include "unk_02051D8C.h" #include "unk_0205D8CC.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_020655F4.h" #include "unk_0206CCB0.h" #include "unk_020711EC.h" -#include "party.h" -#include "overlay005/ov5_021DFB54.h" -#include "overlay005/ov5_021F08CC.h" -#include "overlay005/ov5_021F5A10.h" -#include "overlay006/ov6_02240C9C.h" typedef struct { int unk_00; u32 unk_04; BOOL unk_08; int unk_0C; - BattleParams * unk_10; - SysTask * unk_14; + BattleParams *unk_10; + SysTask *unk_14; } UnkStruct_ov5_021F08CC; typedef struct { @@ -61,33 +59,33 @@ typedef struct { int unk_14; int unk_18; int unk_1C; - FieldSystem * fieldSystem; - UnkStruct_ov101_021D5D90 * unk_24; + FieldSystem *fieldSystem; + UnkStruct_ov101_021D5D90 *unk_24; u8 unk_28; - Strbuf* unk_2C; - Strbuf* unk_30; - StringTemplate * unk_34; + Strbuf *unk_2C; + Strbuf *unk_30; + StringTemplate *unk_34; Window window; - MessageLoader * unk_48; + MessageLoader *unk_48; } UnkStruct_ov5_021F0D6C; -static void ov5_021F0A04(SysTask * param0, void * param1); -static void * ov5_021F0D1C(u32 param0); +static void ov5_021F0A04(SysTask *param0, void *param1); +static void *ov5_021F0D1C(u32 param0); static int ov5_021F0D40(void); static int ov5_021F0D54(void); -static void ov5_021F0D6C(UnkStruct_ov5_021F0D6C * param0); -static void ov5_021F0DA4(UnkStruct_ov5_021F0D6C * param0); -static void ov5_021F0DC4(UnkStruct_ov5_021F0D6C * param0); -static void ov5_021F0DE8(UnkStruct_ov5_021F0D6C * param0, u32 param1); -static int ov5_021F0E24(UnkStruct_ov5_021F0D6C * param0); +static void ov5_021F0D6C(UnkStruct_ov5_021F0D6C *param0); +static void ov5_021F0DA4(UnkStruct_ov5_021F0D6C *param0); +static void ov5_021F0DC4(UnkStruct_ov5_021F0D6C *param0); +static void ov5_021F0DE8(UnkStruct_ov5_021F0D6C *param0, u32 param1); +static int ov5_021F0E24(UnkStruct_ov5_021F0D6C *param0); static u16 ov5_021F0E58(int param0); -int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, MapObject *); +int (*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, MapObject *); const int Unk_ov5_021FFA00[]; -void * ov5_021F08CC (FieldSystem * fieldSystem, u32 param1, int param2) +void *ov5_021F08CC(FieldSystem *fieldSystem, u32 param1, int param2) { - UnkStruct_ov5_021F08CC * v0 = Heap_AllocFromHeapAtEnd(param1, sizeof(UnkStruct_ov5_021F08CC)); + UnkStruct_ov5_021F08CC *v0 = Heap_AllocFromHeapAtEnd(param1, sizeof(UnkStruct_ov5_021F08CC)); memset(v0, 0, sizeof(UnkStruct_ov5_021F08CC)); @@ -97,10 +95,10 @@ void * ov5_021F08CC (FieldSystem * fieldSystem, u32 param1, int param2) return v0; } -BOOL ov5_021F08F8 (TaskManager * taskMan) +BOOL ov5_021F08F8(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov5_021F08CC * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov5_021F08CC *v1 = TaskManager_Environment(taskMan); switch (v1->unk_00) { case 0: @@ -118,12 +116,12 @@ BOOL ov5_021F08F8 (TaskManager * taskMan) if (v2 == 1) { { - Pokemon * v3 = Party_GetPokemonBySlotIndex(v1->unk_10->parties[1], 0); + Pokemon *v3 = Party_GetPokemonBySlotIndex(v1->unk_10->parties[1], 0); sub_0206D340(fieldSystem, 1, v1->unk_04, v3); } { - UnkStruct_0202CD88 * v4 = sub_0202CD88(fieldSystem->saveData); + UnkStruct_0202CD88 *v4 = sub_0202CD88(fieldSystem->saveData); sub_0202CF28(v4, (1 + 9)); } @@ -148,10 +146,10 @@ BOOL ov5_021F08F8 (TaskManager * taskMan) return 0; } -SysTask * ov5_021F09B4 (FieldSystem * fieldSystem, int param1, BOOL param2) +SysTask *ov5_021F09B4(FieldSystem *fieldSystem, int param1, BOOL param2) { - SysTask * task; - UnkStruct_ov5_021F0D6C * v1 = ov5_021F0D1C(sizeof(UnkStruct_ov5_021F0D6C)); + SysTask *task; + UnkStruct_ov5_021F0D6C *v1 = ov5_021F0D1C(sizeof(UnkStruct_ov5_021F0D6C)); v1->fieldSystem = fieldSystem; v1->unk_1C = param1; @@ -162,38 +160,38 @@ SysTask * ov5_021F09B4 (FieldSystem * fieldSystem, int param1, BOOL param2) return task; } -int ov5_021F09D8 (SysTask * task) +int ov5_021F09D8(SysTask *task) { - UnkStruct_ov5_021F0D6C * v0 = SysTask_GetParam(task); + UnkStruct_ov5_021F0D6C *v0 = SysTask_GetParam(task); return v0->unk_04; } -int ov5_021F09E4 (SysTask * task) +int ov5_021F09E4(SysTask *task) { - UnkStruct_ov5_021F0D6C * v0 = SysTask_GetParam(task); + UnkStruct_ov5_021F0D6C *v0 = SysTask_GetParam(task); return v0->unk_08; } -void ov5_021F09F0 (SysTask * task) +void ov5_021F09F0(SysTask *task) { - UnkStruct_ov5_021F0D6C * v0 = SysTask_GetParam(task); + UnkStruct_ov5_021F0D6C *v0 = SysTask_GetParam(task); Heap_FreeToHeap(v0); SysTask_Done(task); } -static void ov5_021F0A04 (SysTask * task, void * param1) +static void ov5_021F0A04(SysTask *task, void *param1) { - UnkStruct_ov5_021F0D6C * v0 = param1; - PlayerAvatar * playerAvatar = v0->fieldSystem->playerAvatar; - MapObject * v2 = Player_MapObject(playerAvatar); + UnkStruct_ov5_021F0D6C *v0 = param1; + PlayerAvatar *playerAvatar = v0->fieldSystem->playerAvatar; + MapObject *v2 = Player_MapObject(playerAvatar); while (Unk_ov5_021FFA0C[v0->unk_0C](v0, playerAvatar, v2)) { (void)0; } } -static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0A30(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { ov5_021F0D6C(param0); sub_02062DDC(param2); @@ -202,7 +200,7 @@ static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0A48(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { if (LocalMapObj_IsAnimationSet(param2) == 1) { sub_020656AC(param2); @@ -215,7 +213,7 @@ static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 0; } -static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0A80(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { param0->unk_10++; @@ -237,7 +235,7 @@ static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0AB8(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { param0->unk_14 = ((LCRNG_Next() % 4) + 1) * 30; param0->unk_18 = Unk_ov5_021FFA00[param0->unk_1C]; @@ -246,7 +244,7 @@ static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0AEC(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { param0->unk_14--; @@ -267,7 +265,7 @@ static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0B30(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { param0->unk_18--; @@ -285,7 +283,7 @@ static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 0; } -static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0B5C(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { ov5_021F5C58(param0->unk_24); sub_02062A0C(param2, 0x3); @@ -296,7 +294,7 @@ static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 0; } -static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0B7C(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { param0->unk_10++; @@ -314,7 +312,7 @@ static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 0; } -static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0BB0(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { if (ov5_021F0E24(param0) == 0) { return 0; @@ -324,7 +322,7 @@ static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0BC8(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { param0->unk_08 = 1; param0->unk_0C = 15; @@ -332,7 +330,7 @@ static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0BD4(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { sub_02062A0C(param2, 0x0); ov5_021F0DE8(param0, 56); @@ -343,7 +341,7 @@ static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0BF4(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { sub_02062A0C(param2, 0x0); ov5_021F0DE8(param0, 55); @@ -352,8 +350,8 @@ static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA param0->unk_0C = 14; { - UnkStruct_0202CD88 * v0 = sub_0202CD88(param0->fieldSystem->saveData); - sub_0202CF28(v0, (((70 + 1)) + 29)); + UnkStruct_0202CD88 *v0 = sub_0202CD88(param0->fieldSystem->saveData); + sub_0202CF28(v0, ((70 + 1) + 29)); } sub_0206D340(param0->fieldSystem, 0, ov5_021F0E58(param0->unk_1C), NULL); @@ -361,7 +359,7 @@ static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0C34(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { param0->unk_10 = 30 * 4; param0->unk_0C = 13; @@ -369,7 +367,7 @@ static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0C40(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { param0->unk_10--; @@ -391,7 +389,7 @@ static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 0; } -static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0C84(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { param0->unk_10++; @@ -410,7 +408,7 @@ static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0CB0(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { if (param0->unk_24 != NULL) { ov5_021F5C58(param0->unk_24); @@ -432,7 +430,7 @@ static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 1; } -static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0CEC(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { param0->unk_10++; @@ -443,7 +441,7 @@ static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 0; } -static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerAvatar, MapObject * param2) +static int ov5_021F0D00(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { if (param0->unk_24 != NULL) { sub_0207136C(param0->unk_24); @@ -454,7 +452,7 @@ static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * playerA return 0; } -static int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, MapObject *) = { +static int (*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, MapObject *) = { ov5_021F0A30, ov5_021F0A48, ov5_021F0A80, @@ -475,9 +473,9 @@ static int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, ov5_021F0D00 }; -static void * ov5_021F0D1C (u32 param0) +static void *ov5_021F0D1C(u32 param0) { - void * v0 = Heap_AllocFromHeapAtEnd(4, param0); + void *v0 = Heap_AllocFromHeapAtEnd(4, param0); GF_ASSERT(v0 != NULL); memset(v0, 0, param0); @@ -485,25 +483,25 @@ static void * ov5_021F0D1C (u32 param0) return v0; } -static int ov5_021F0D40 (void) +static int ov5_021F0D40(void) { - if ((gCoreSys.pressedKeys & PAD_BUTTON_A)) { + if (gCoreSys.pressedKeys & PAD_BUTTON_A) { return 1; } return 0; } -static int ov5_021F0D54 (void) +static int ov5_021F0D54(void) { - if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { + if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 1; } return 0; } -static void ov5_021F0D6C (UnkStruct_ov5_021F0D6C * param0) +static void ov5_021F0D6C(UnkStruct_ov5_021F0D6C *param0) { param0->unk_48 = MessageLoader_Init(1, 26, 213, 4); param0->unk_2C = Strbuf_Init(0x400, 4); @@ -511,7 +509,7 @@ static void ov5_021F0D6C (UnkStruct_ov5_021F0D6C * param0) param0->unk_34 = StringTemplate_New(8, 64, 4); } -static void ov5_021F0DA4 (UnkStruct_ov5_021F0D6C * param0) +static void ov5_021F0DA4(UnkStruct_ov5_021F0D6C *param0) { StringTemplate_Free(param0->unk_34); Strbuf_Free(param0->unk_2C); @@ -519,20 +517,20 @@ static void ov5_021F0DA4 (UnkStruct_ov5_021F0D6C * param0) MessageLoader_Free(param0->unk_48); } -static void ov5_021F0DC4 (UnkStruct_ov5_021F0D6C * param0) +static void ov5_021F0DC4(UnkStruct_ov5_021F0D6C *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; FieldMessage_AddWindow(fieldSystem->unk_08, ¶m0->window, 3); FieldMessage_DrawWindow(¶m0->window, SaveData_Options(fieldSystem->saveData)); } -static void ov5_021F0DE8 (UnkStruct_ov5_021F0D6C * param0, u32 param1) +static void ov5_021F0DE8(UnkStruct_ov5_021F0D6C *param0, u32 param1) { ov5_021F0DC4(param0); { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; MessageLoader_GetStrbuf(param0->unk_48, param1, param0->unk_30); StringTemplate_Format(param0->unk_34, param0->unk_2C, param0->unk_30); @@ -541,7 +539,7 @@ static void ov5_021F0DE8 (UnkStruct_ov5_021F0D6C * param0, u32 param1) } } -static int ov5_021F0E24 (UnkStruct_ov5_021F0D6C * param0) +static int ov5_021F0E24(UnkStruct_ov5_021F0D6C *param0) { if ((FieldMessage_FinishedPrinting(param0->unk_28) == 1) && (ov5_021F0D54() == 1)) { sub_0200E084(¶m0->window, 0); @@ -552,7 +550,7 @@ static int ov5_021F0E24 (UnkStruct_ov5_021F0D6C * param0) return 0; } -static u16 ov5_021F0E58 (int param0) +static u16 ov5_021F0E58(int param0) { switch (param0) { default: diff --git a/src/overlay005/ov5_021F0E84.c b/src/overlay005/ov5_021F0E84.c index 67ed231abf..724e2d2c40 100644 --- a/src/overlay005/ov5_021F0E84.c +++ b/src/overlay005/ov5_021F0E84.c @@ -1,8 +1,9 @@ +#include "overlay005/ov5_021F0E84.h" + #include -#include #include +#include -#include "overlay005/ov5_021F0E84.h" #include "constants/species.h" typedef struct { @@ -11,508 +12,508 @@ typedef struct { } UnkStruct_ov5_021FFA54; static const UnkStruct_ov5_021FFA54 Unk_ov5_021FFA54[NATIONAL_DEX_COUNT + 1] = { - {0x0, 0x0}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x5, 0x0}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x5, 0x0}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x3, 0x0}, - {0x3, 0x0}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x3, 0x0}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x5, 0x1}, - {0x5, 0x1}, - {0x1, 0x1}, - {0x5, 0x1}, - {0x1, 0x0}, - {0x1, 0x0}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x4, 0x0}, - {0x4, 0x0}, - {0x2, 0x0}, - {0x2, 0x0}, - {0x1, 0x0}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x4, 0x1}, - {0x5, 0x1}, - {0x5, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x4, 0x0}, - {0x4, 0x0}, - {0x3, 0x0}, - {0x3, 0x0}, - {0x4, 0x0}, - {0x2, 0x0}, - {0x3, 0x0}, - {0x3, 0x0}, - {0x3, 0x1}, - {0x2, 0x0}, - {0x3, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x0}, - {0x2, 0x0}, - {0x1, 0x0}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x3, 0x0}, - {0x3, 0x0}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x0}, - {0x2, 0x0}, - {0x1, 0x0}, - {0x2, 0x0}, - {0x5, 0x1}, - {0x5, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x0}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x4, 0x0}, - {0x3, 0x0}, - {0x1, 0x0}, - {0x4, 0x0}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x5, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x5, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x0}, - {0x2, 0x0}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x3, 0x1}, - {0x3, 0x1}, - {0x3, 0x0}, - {0x4, 0x0}, - {0x2, 0x0}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x5, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x0}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x0}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x4, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x3, 0x1}, - {0x4, 0x1}, - {0x3, 0x0}, - {0x5, 0x0}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x5, 0x0}, - {0x5, 0x0}, - {0x4, 0x0}, - {0x4, 0x1}, - {0x2, 0x0}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x0}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x4, 0x0}, - {0x4, 0x0}, - {0x1, 0x1}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x5, 0x0}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x2, 0x0}, - {0x2, 0x1}, - {0x3, 0x1}, - {0x3, 0x1}, - {0x2, 0x0}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x5, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x5, 0x0}, - {0x3, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x5, 0x0}, - {0x1, 0x1}, - {0x5, 0x0}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x4, 0x1}, - {0x4, 0x1}, - {0x5, 0x1}, - {0x2, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x0}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x5, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x4, 0x1}, - {0x4, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x5, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x4, 0x0}, - {0x4, 0x0}, - {0x3, 0x0}, - {0x3, 0x0}, - {0x1, 0x0}, - {0x2, 0x0}, - {0x4, 0x1}, - {0x4, 0x1}, - {0x4, 0x1}, - {0x1, 0x0}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x4, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x3, 0x0}, - {0x5, 0x0}, - {0x5, 0x0}, - {0x1, 0x0}, - {0x4, 0x0}, - {0x2, 0x1}, - {0x3, 0x1}, - {0x5, 0x1}, - {0x5, 0x1}, - {0x5, 0x1}, - {0x5, 0x1}, - {0x5, 0x0}, - {0x2, 0x1}, - {0x4, 0x0}, - {0x2, 0x0}, - {0x1, 0x0}, - {0x1, 0x1}, - {0x3, 0x0}, - {0x3, 0x1}, - {0x3, 0x0}, - {0x3, 0x1}, - {0x2, 0x1}, - {0x1, 0x0}, - {0x3, 0x1}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x2, 0x0}, - {0x1, 0x0}, - {0x2, 0x0}, - {0x2, 0x0}, - {0x1, 0x0}, - {0x2, 0x0}, - {0x1, 0x0}, - {0x4, 0x0}, - {0x1, 0x0}, - {0x1, 0x1}, - {0x5, 0x1}, - {0x2, 0x1}, - {0x5, 0x1}, - {0x5, 0x1}, - {0x2, 0x1}, - {0x5, 0x1}, - {0x5, 0x1}, - {0x5, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x0}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x1, 0x0}, - {0x1, 0x0}, - {0x2, 0x1}, - {0x1, 0x0}, - {0x1, 0x0}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x3, 0x0}, - {0x3, 0x0}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x3, 0x0}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x3, 0x1}, - {0x3, 0x1}, - {0x5, 0x0}, - {0x5, 0x0}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x4, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x2, 0x1}, - {0x3, 0x1}, - {0x3, 0x1}, - {0x3, 0x1}, - {0x3, 0x1}, - {0x4, 0x0}, - {0x1, 0x0}, - {0x2, 0x0}, - {0x1, 0x0}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x5, 0x0}, - {0x4, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x4, 0x1}, - {0x5, 0x1}, - {0x2, 0x1}, - {0x5, 0x1}, - {0x3, 0x0}, - {0x1, 0x0}, - {0x2, 0x0}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x2, 0x1}, - {0x5, 0x1}, - {0x2, 0x1}, - {0x2, 0x0}, - {0x1, 0x0}, - {0x1, 0x0}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x2, 0x1} + { 0x0, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x5, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x5, 0x0 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x3, 0x0 }, + { 0x3, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x3, 0x0 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x5, 0x1 }, + { 0x5, 0x1 }, + { 0x1, 0x1 }, + { 0x5, 0x1 }, + { 0x1, 0x0 }, + { 0x1, 0x0 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x4, 0x0 }, + { 0x4, 0x0 }, + { 0x2, 0x0 }, + { 0x2, 0x0 }, + { 0x1, 0x0 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x4, 0x1 }, + { 0x5, 0x1 }, + { 0x5, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x0 }, + { 0x4, 0x0 }, + { 0x3, 0x0 }, + { 0x3, 0x0 }, + { 0x4, 0x0 }, + { 0x2, 0x0 }, + { 0x3, 0x0 }, + { 0x3, 0x0 }, + { 0x3, 0x1 }, + { 0x2, 0x0 }, + { 0x3, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x0 }, + { 0x2, 0x0 }, + { 0x1, 0x0 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x3, 0x0 }, + { 0x3, 0x0 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x0 }, + { 0x2, 0x0 }, + { 0x1, 0x0 }, + { 0x2, 0x0 }, + { 0x5, 0x1 }, + { 0x5, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x0 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x0 }, + { 0x3, 0x0 }, + { 0x1, 0x0 }, + { 0x4, 0x0 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x5, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x5, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x0 }, + { 0x2, 0x0 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x3, 0x1 }, + { 0x3, 0x1 }, + { 0x3, 0x0 }, + { 0x4, 0x0 }, + { 0x2, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x5, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x4, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x3, 0x1 }, + { 0x4, 0x1 }, + { 0x3, 0x0 }, + { 0x5, 0x0 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x5, 0x0 }, + { 0x5, 0x0 }, + { 0x4, 0x0 }, + { 0x4, 0x1 }, + { 0x2, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x0 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x0 }, + { 0x4, 0x0 }, + { 0x1, 0x1 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x5, 0x0 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x0 }, + { 0x2, 0x1 }, + { 0x3, 0x1 }, + { 0x3, 0x1 }, + { 0x2, 0x0 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x5, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x5, 0x0 }, + { 0x3, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x5, 0x0 }, + { 0x1, 0x1 }, + { 0x5, 0x0 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x4, 0x1 }, + { 0x4, 0x1 }, + { 0x5, 0x1 }, + { 0x2, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x0 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x5, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x4, 0x1 }, + { 0x4, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x5, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x4, 0x0 }, + { 0x4, 0x0 }, + { 0x3, 0x0 }, + { 0x3, 0x0 }, + { 0x1, 0x0 }, + { 0x2, 0x0 }, + { 0x4, 0x1 }, + { 0x4, 0x1 }, + { 0x4, 0x1 }, + { 0x1, 0x0 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x4, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x3, 0x0 }, + { 0x5, 0x0 }, + { 0x5, 0x0 }, + { 0x1, 0x0 }, + { 0x4, 0x0 }, + { 0x2, 0x1 }, + { 0x3, 0x1 }, + { 0x5, 0x1 }, + { 0x5, 0x1 }, + { 0x5, 0x1 }, + { 0x5, 0x1 }, + { 0x5, 0x0 }, + { 0x2, 0x1 }, + { 0x4, 0x0 }, + { 0x2, 0x0 }, + { 0x1, 0x0 }, + { 0x1, 0x1 }, + { 0x3, 0x0 }, + { 0x3, 0x1 }, + { 0x3, 0x0 }, + { 0x3, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x0 }, + { 0x3, 0x1 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x0 }, + { 0x1, 0x0 }, + { 0x2, 0x0 }, + { 0x2, 0x0 }, + { 0x1, 0x0 }, + { 0x2, 0x0 }, + { 0x1, 0x0 }, + { 0x4, 0x0 }, + { 0x1, 0x0 }, + { 0x1, 0x1 }, + { 0x5, 0x1 }, + { 0x2, 0x1 }, + { 0x5, 0x1 }, + { 0x5, 0x1 }, + { 0x2, 0x1 }, + { 0x5, 0x1 }, + { 0x5, 0x1 }, + { 0x5, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x0 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x0 }, + { 0x1, 0x0 }, + { 0x2, 0x1 }, + { 0x1, 0x0 }, + { 0x1, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x3, 0x0 }, + { 0x3, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x3, 0x0 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x3, 0x1 }, + { 0x3, 0x1 }, + { 0x5, 0x0 }, + { 0x5, 0x0 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x4, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x2, 0x1 }, + { 0x3, 0x1 }, + { 0x3, 0x1 }, + { 0x3, 0x1 }, + { 0x3, 0x1 }, + { 0x4, 0x0 }, + { 0x1, 0x0 }, + { 0x2, 0x0 }, + { 0x1, 0x0 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x5, 0x0 }, + { 0x4, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x4, 0x1 }, + { 0x5, 0x1 }, + { 0x2, 0x1 }, + { 0x5, 0x1 }, + { 0x3, 0x0 }, + { 0x1, 0x0 }, + { 0x2, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x1 }, + { 0x5, 0x1 }, + { 0x2, 0x1 }, + { 0x2, 0x0 }, + { 0x1, 0x0 }, + { 0x1, 0x0 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 } }; -u16 ov5_021F0E84 (u16 param0) +u16 ov5_021F0E84(u16 param0) { return Unk_ov5_021FFA54[param0].unk_00; } -u16 ov5_021F0E90 (u16 param0, u16 param1) +u16 ov5_021F0E90(u16 param0, u16 param1) { if ((param0 == 487) && (param1 == 1)) { return 0; diff --git a/src/overlay005/ov5_021F0EB0.c b/src/overlay005/ov5_021F0EB0.c index 81f37a5836..7fdd378795 100644 --- a/src/overlay005/ov5_021F0EB0.c +++ b/src/overlay005/ov5_021F0EB0.c @@ -1,14 +1,14 @@ +#include "overlay005/ov5_021F0EB0.h" + #include #include - #include "field/field_system.h" -#include "sys_task.h" +#include "camera.h" #include "heap.h" +#include "sys_task.h" #include "sys_task_manager.h" -#include "camera.h" -#include "overlay005/ov5_021F0EB0.h" typedef struct { u32 unk_00; @@ -22,22 +22,22 @@ typedef struct { fx32 unk_20; u32 unk_24; fx32 unk_28; - FieldSystem * fieldSystem; - Camera * camera; + FieldSystem *fieldSystem; + Camera *camera; } UnkStruct_ov5_021F0FB8; -static void ov5_021F0F2C(SysTask * param0, void * param1); -static void ov5_021F0FB8(UnkStruct_ov5_021F0FB8 * param0); -static void ov5_021F0FC8(UnkStruct_ov5_021F0FB8 * param0); -static void ov5_021F0FE0(UnkStruct_ov5_021F0FB8 * param0); -static int ov5_021F0FF8(UnkStruct_ov5_021F0FB8 * param0); +static void ov5_021F0F2C(SysTask *param0, void *param1); +static void ov5_021F0FB8(UnkStruct_ov5_021F0FB8 *param0); +static void ov5_021F0FC8(UnkStruct_ov5_021F0FB8 *param0); +static void ov5_021F0FE0(UnkStruct_ov5_021F0FB8 *param0); +static int ov5_021F0FF8(UnkStruct_ov5_021F0FB8 *param0); -static void(*const Unk_ov5_0220020C[4])(UnkStruct_ov5_021F0FB8 *); +static void (*const Unk_ov5_0220020C[4])(UnkStruct_ov5_021F0FB8 *); -SysTask * ov5_021F0EB0 (FieldSystem * fieldSystem, u32 param1) +SysTask *ov5_021F0EB0(FieldSystem *fieldSystem, u32 param1) { - SysTask * v0; - UnkStruct_ov5_021F0FB8 * v1 = Heap_AllocFromHeapAtEnd(param1, (sizeof(UnkStruct_ov5_021F0FB8))); + SysTask *v0; + UnkStruct_ov5_021F0FB8 *v1 = Heap_AllocFromHeapAtEnd(param1, (sizeof(UnkStruct_ov5_021F0FB8))); memset(v1, 0, (sizeof(UnkStruct_ov5_021F0FB8))); @@ -52,23 +52,23 @@ SysTask * ov5_021F0EB0 (FieldSystem * fieldSystem, u32 param1) return v0; } -BOOL ov5_021F0EF0 (SysTask * param0) +BOOL ov5_021F0EF0(SysTask *param0) { - UnkStruct_ov5_021F0FB8 * v0 = SysTask_GetParam(param0); + UnkStruct_ov5_021F0FB8 *v0 = SysTask_GetParam(param0); return v0->unk_08; } -void ov5_021F0EFC (SysTask * param0) +void ov5_021F0EFC(SysTask *param0) { - UnkStruct_ov5_021F0FB8 * v0 = SysTask_GetParam(param0); + UnkStruct_ov5_021F0FB8 *v0 = SysTask_GetParam(param0); Heap_FreeToHeap(v0); SysTask_Done(param0); } -void ov5_021F0F10 (SysTask * param0, int param1, fx32 param2, u32 param3) +void ov5_021F0F10(SysTask *param0, int param1, fx32 param2, u32 param3) { - UnkStruct_ov5_021F0FB8 * v0 = SysTask_GetParam(param0); + UnkStruct_ov5_021F0FB8 *v0 = SysTask_GetParam(param0); v0->unk_04 = 0; v0->unk_08 = 0; @@ -78,18 +78,18 @@ void ov5_021F0F10 (SysTask * param0, int param1, fx32 param2, u32 param3) v0->unk_24 = 0; } -static void ov5_021F0F2C (SysTask * param0, void * param1) +static void ov5_021F0F2C(SysTask *param0, void *param1) { - UnkStruct_ov5_021F0FB8 * v0 = param1; + UnkStruct_ov5_021F0FB8 *v0 = param1; Unk_ov5_0220020C[v0->unk_0C](v0); } -static void ov5_021F0F40 (UnkStruct_ov5_021F0FB8 * param0) +static void ov5_021F0F40(UnkStruct_ov5_021F0FB8 *param0) { param0->unk_08 = 1; } -static void ov5_021F0F48 (UnkStruct_ov5_021F0FB8 * param0) +static void ov5_021F0F48(UnkStruct_ov5_021F0FB8 *param0) { switch (param0->unk_04) { case 0: @@ -105,7 +105,7 @@ static void ov5_021F0F48 (UnkStruct_ov5_021F0FB8 * param0) } } -static void ov5_021F0F80 (UnkStruct_ov5_021F0FB8 * param0) +static void ov5_021F0F80(UnkStruct_ov5_021F0FB8 *param0) { switch (param0->unk_04) { case 0: @@ -121,12 +121,12 @@ static void ov5_021F0F80 (UnkStruct_ov5_021F0FB8 * param0) } } -static void ov5_021F0FB8 (UnkStruct_ov5_021F0FB8 * param0) +static void ov5_021F0FB8(UnkStruct_ov5_021F0FB8 *param0) { Camera_SetDistance(param0->unk_20, param0->camera); } -static void ov5_021F0FC8 (UnkStruct_ov5_021F0FB8 * param0) +static void ov5_021F0FC8(UnkStruct_ov5_021F0FB8 *param0) { fx32 v0 = param0->unk_1C; @@ -134,7 +134,7 @@ static void ov5_021F0FC8 (UnkStruct_ov5_021F0FB8 * param0) param0->unk_18 = param0->unk_20 + param0->unk_14; } -static void ov5_021F0FE0 (UnkStruct_ov5_021F0FB8 * param0) +static void ov5_021F0FE0(UnkStruct_ov5_021F0FB8 *param0) { fx32 v0 = param0->unk_1C; fx32 v1 = param0->unk_10 - param0->unk_20; @@ -143,7 +143,7 @@ static void ov5_021F0FE0 (UnkStruct_ov5_021F0FB8 * param0) param0->unk_18 = param0->unk_10; } -static int ov5_021F0FF8 (UnkStruct_ov5_021F0FB8 * param0) +static int ov5_021F0FF8(UnkStruct_ov5_021F0FB8 *param0) { param0->unk_20 += param0->unk_28; param0->unk_24++; @@ -157,6 +157,8 @@ static int ov5_021F0FF8 (UnkStruct_ov5_021F0FB8 * param0) return 0; } -static void(*const Unk_ov5_0220020C[4])(UnkStruct_ov5_021F0FB8 *) = { - ov5_021F0F40, ov5_021F0F48, ov5_021F0F80, +static void (*const Unk_ov5_0220020C[4])(UnkStruct_ov5_021F0FB8 *) = { + ov5_021F0F40, + ov5_021F0F48, + ov5_021F0F80, }; diff --git a/src/overlay005/ov5_021F101C.c b/src/overlay005/ov5_021F101C.c index 87b811a831..a3d48fd983 100644 --- a/src/overlay005/ov5_021F101C.c +++ b/src/overlay005/ov5_021F101C.c @@ -1,39 +1,39 @@ +#include "overlay005/ov5_021F101C.h" + #include #include -#include "sys_task_manager.h" #include "struct_decls/struct_020508D4_decl.h" -#include "overlay005/struct_ov5_021F0468_decl.h" +#include "struct_defs/struct_020711C8.h" #include "field/field_system.h" -#include "struct_defs/struct_020711C8.h" +#include "overlay005/ov5_021F007C.h" +#include "overlay005/struct_ov5_021F0468_decl.h" +#include "overlay006/ov6_02243258.h" #include "heap.h" -#include "unk_020508D4.h" #include "player_avatar.h" -#include "overlay005/ov5_021F007C.h" -#include "overlay005/ov5_021F101C.h" -#include "overlay006/ov6_02243258.h" +#include "sys_task_manager.h" +#include "unk_020508D4.h" typedef struct { - SysTask * unk_00; - UnkStruct_ov5_021F0468 * unk_04; + SysTask *unk_00; + UnkStruct_ov5_021F0468 *unk_04; } UnkStruct_ov5_021F101C; -BOOL ov5_021F101C (TaskManager * param0) +BOOL ov5_021F101C(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_020711C8 * v1 = TaskManager_Environment(param0); - int * v2 = FieldTask_GetState(param0); - UnkStruct_ov5_021F101C * v3 = v1->unk_04; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_020711C8 *v1 = TaskManager_Environment(param0); + int *v2 = FieldTask_GetState(param0); + UnkStruct_ov5_021F101C *v3 = v1->unk_04; switch (*v2) { case 0: v1->unk_04 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov5_021F101C)); (*v2)++; break; - case 1: - { + case 1: { int v4 = ov5_021F0484(); v3->unk_04 = Heap_AllocFromHeapAtEnd(11, v4); @@ -41,8 +41,7 @@ BOOL ov5_021F101C (TaskManager * param0) } (*v2)++; break; - case 2: - { + case 2: { int v5 = PlayerAvatar_Gender(fieldSystem->playerAvatar); v3->unk_00 = ov6_02243F88(fieldSystem, 0, v1->unk_00, v5); } diff --git a/src/overlay005/ov5_021F10E8.c b/src/overlay005/ov5_021F10E8.c index 22fbe8ffb3..5f1093f4db 100644 --- a/src/overlay005/ov5_021F10E8.c +++ b/src/overlay005/ov5_021F10E8.c @@ -1,19 +1,20 @@ +#include "overlay005/ov5_021F10E8.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "map_object.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F10E8.h" typedef struct { u32 unk_00; @@ -22,15 +23,15 @@ typedef struct { } UnkStruct_021F1118; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; u32 unk_04; - UnkStruct_021F1118 * unk_08; + UnkStruct_021F1118 *unk_08; } UnkStruct_021F114C; typedef struct { u32 unk_00; - UnkStruct_ov5_021DF47C * unk_04; - const MapObject * unk_08; + UnkStruct_ov5_021DF47C *unk_04; + const MapObject *unk_08; } UnkStruct_021F121C; typedef struct { @@ -38,7 +39,7 @@ typedef struct { int unk_04; int unk_08; VecFx32 unk_0C; - UnkStruct_02073B50 * unk_18; + UnkStruct_02073B50 *unk_18; UnkStruct_021F121C unk_1C; } UnkStruct_021F1258; @@ -47,28 +48,28 @@ typedef struct { u32 unk_04; } UnkStruct_ov5_02200230; -static void ov5_021F1118(UnkStruct_021F1118 * param0, u32 param1, u32 param2, UnkStruct_ov5_021DF47C * param3); -static void ov5_021F113C(UnkStruct_021F1118 * param0); -static void ov5_021F114C(UnkStruct_021F114C * param0); -static UnkStruct_021F1118 * ov5_021F1174(UnkStruct_021F114C * param0, u32 param1); +static void ov5_021F1118(UnkStruct_021F1118 *param0, u32 param1, u32 param2, UnkStruct_ov5_021DF47C *param3); +static void ov5_021F113C(UnkStruct_021F1118 *param0); +static void ov5_021F114C(UnkStruct_021F114C *param0); +static UnkStruct_021F1118 *ov5_021F1174(UnkStruct_021F114C *param0, u32 param1); static const UnkStruct_ov101_021D86B0 Unk_ov5_0220021C; static const UnkStruct_ov5_02200230 Unk_ov5_02200230[] = { - {0x5B, 0x45}, - {0x5C, 0x46}, - {0x5D, 0x47}, - {0x5E, 0x48}, - {0x5f, 0x49}, - {0x60, 0x4A}, - {0xB7, 0x4F}, - {0xD1, 0x6E}, - {0x106, 0x95} + { 0x5B, 0x45 }, + { 0x5C, 0x46 }, + { 0x5D, 0x47 }, + { 0x5E, 0x48 }, + { 0x5f, 0x49 }, + { 0x60, 0x4A }, + { 0xB7, 0x4F }, + { 0xD1, 0x6E }, + { 0x106, 0x95 } }; -void * ov5_021F10E8 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F10E8(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_021F114C * v0; + UnkStruct_021F114C *v0; v0 = ov5_021DF53C(param0, sizeof(UnkStruct_021F114C), 0, 0); v0->unk_00 = param0; @@ -76,9 +77,9 @@ void * ov5_021F10E8 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F10FC (void * param0) +void ov5_021F10FC(void *param0) { - UnkStruct_021F114C * v0 = param0; + UnkStruct_021F114C *v0 = param0; ov5_021F114C(v0); @@ -89,7 +90,7 @@ void ov5_021F10FC (void * param0) ov5_021DF554(v0); } -static void ov5_021F1118 (UnkStruct_021F1118 * param0, u32 param1, u32 param2, UnkStruct_ov5_021DF47C * param3) +static void ov5_021F1118(UnkStruct_021F1118 *param0, u32 param1, u32 param2, UnkStruct_ov5_021DF47C *param3) { param0->unk_00 = param1; @@ -97,46 +98,48 @@ static void ov5_021F1118 (UnkStruct_021F1118 * param0, u32 param1, u32 param2, U sub_02073B70(¶m0->unk_18, ¶m0->unk_04); } -static void ov5_021F113C (UnkStruct_021F1118 * param0) +static void ov5_021F113C(UnkStruct_021F1118 *param0) { param0->unk_00 = 0xffff; sub_0207395C(¶m0->unk_04); } -static void ov5_021F114C (UnkStruct_021F114C * param0) +static void ov5_021F114C(UnkStruct_021F114C *param0) { u32 v0 = 0, v1 = param0->unk_04; - UnkStruct_021F1118 * v2 = param0->unk_08; + UnkStruct_021F1118 *v2 = param0->unk_08; while (v0 < v1) { if (v2->unk_00 != 0xffff) { ov5_021F113C(v2); } - v2++; v0++; + v2++; + v0++; } } -static UnkStruct_021F1118 * ov5_021F1174 (UnkStruct_021F114C * param0, u32 param1) +static UnkStruct_021F1118 *ov5_021F1174(UnkStruct_021F114C *param0, u32 param1) { u32 v0 = param0->unk_04; - UnkStruct_021F1118 * v1 = param0->unk_08; + UnkStruct_021F1118 *v1 = param0->unk_08; do { if (v1->unk_00 == param1) { return v1; } - v1++; v0--; + v1++; + v0--; } while (v0); return NULL; } -void ov5_021F1188 (UnkStruct_ov5_021DF47C * param0, u32 param1) +void ov5_021F1188(UnkStruct_ov5_021DF47C *param0, u32 param1) { - UnkStruct_021F1118 * v0; - UnkStruct_021F114C * v1 = ov5_021DF55C(param0, 29); + UnkStruct_021F1118 *v0; + UnkStruct_021F114C *v1 = ov5_021DF55C(param0, 29); GF_ASSERT(param1); @@ -145,14 +148,16 @@ void ov5_021F1188 (UnkStruct_ov5_021DF47C * param0, u32 param1) v1->unk_08 = v0; do { - v0->unk_00 = 0xffff; v0++; param1--; + v0->unk_00 = 0xffff; + v0++; + param1--; } while (param1); } -void ov5_021F11C0 (UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2) +void ov5_021F11C0(UnkStruct_ov5_021DF47C *param0, u32 param1, u32 param2) { - UnkStruct_021F1118 * v0; - UnkStruct_021F114C * v1 = ov5_021DF55C(param0, 29); + UnkStruct_021F1118 *v0; + UnkStruct_021F114C *v1 = ov5_021DF55C(param0, 29); v0 = ov5_021F1174(v1, param1); @@ -163,27 +168,28 @@ void ov5_021F11C0 (UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2) v0 = ov5_021F1174(v1, 0xffff); if (v0 == NULL) { - GF_ASSERT(0); return; + GF_ASSERT(0); + return; } ov5_021F1118(v0, param1, param2, param0); } -UnkStruct_02073B50 * ov5_021F11FC (UnkStruct_ov5_021DF47C * param0, u32 param1) +UnkStruct_02073B50 *ov5_021F11FC(UnkStruct_ov5_021DF47C *param0, u32 param1) { - UnkStruct_021F114C * v0 = ov5_021DF55C(param0, 29); - UnkStruct_021F1118 * v1 = ov5_021F1174(v0, param1); + UnkStruct_021F114C *v0 = ov5_021DF55C(param0, 29); + UnkStruct_021F1118 *v1 = ov5_021F1174(v0, param1); GF_ASSERT(v1 != NULL); return &v1->unk_18; } -UnkStruct_ov101_021D5D90 * ov5_021F121C (const MapObject * param0, const VecFx32 * param1) +UnkStruct_ov101_021D5D90 *ov5_021F121C(const MapObject *param0, const VecFx32 *param1) { int v0; - UnkStruct_ov101_021D5D90 * v1; + UnkStruct_ov101_021D5D90 *v1; UnkStruct_021F121C v2; - UnkStruct_ov5_021DF47C * v3 = ov5_021DF578(param0); + UnkStruct_ov5_021DF47C *v3 = ov5_021DF578(param0); v2.unk_00 = sub_02062920(param0); v2.unk_04 = v3; @@ -195,10 +201,10 @@ UnkStruct_ov101_021D5D90 * ov5_021F121C (const MapObject * param0, const VecFx32 return v1; } -static int ov5_021F1258 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F1258(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F1258 * v0 = param1; - const UnkStruct_021F121C * v1; + UnkStruct_021F1258 *v0 = param1; + const UnkStruct_021F121C *v1; v1 = sub_020715BC(param0); @@ -216,15 +222,15 @@ static int ov5_021F1258 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F12A8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F12A8(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F12AC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F12AC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F1258 * v0 = param1; - const MapObject * v1 = v0->unk_1C.unk_08; + UnkStruct_021F1258 *v0 = param1; + const MapObject *v1 = v0->unk_1C.unk_08; if (sub_02062764(v1, v0->unk_04, v0->unk_08) == 0) { ov5_021DF74C(param0); @@ -245,9 +251,9 @@ static void ov5_021F12AC (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F1310 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1310(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F1258 * v0 = param1; + UnkStruct_021F1258 *v0 = param1; VecFx32 v1; sub_020715E4(param0, &v1); @@ -262,15 +268,16 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_0220021C = { ov5_021F1310 }; -void FieldEffect_InitRenderObject (UnkStruct_ov5_021DF47C * param0) +void FieldEffect_InitRenderObject(UnkStruct_ov5_021DF47C *param0) { - const UnkStruct_ov5_02200230 * v0 = Unk_ov5_02200230; + const UnkStruct_ov5_02200230 *v0 = Unk_ov5_02200230; u32 v1 = NELEMS(Unk_ov5_02200230); ov5_021F1188(param0, v1); do { ov5_021F11C0(param0, v0->unk_00, v0->unk_04); - v0++; v1--; + v0++; + v1--; } while (v1); } diff --git a/src/overlay005/ov5_021F134C.c b/src/overlay005/ov5_021F134C.c index f590c4d217..3b788859ab 100644 --- a/src/overlay005/ov5_021F134C.c +++ b/src/overlay005/ov5_021F134C.c @@ -1,23 +1,24 @@ +#include "overlay005/ov5_021F134C.h" + #include #include -#include "sys_task_manager.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "sys_task.h" -#include "rtc.h" #include "map_object.h" +#include "rtc.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F134C.h" typedef struct { int unk_00; @@ -26,16 +27,16 @@ typedef struct { int unk_0C; fx32 unk_10; VecFx32 unk_14; - UnkStruct_ov5_021DF47C * unk_20; - SysTask * unk_24; + UnkStruct_ov5_021DF47C *unk_20; + SysTask *unk_24; UnkStruct_02073838 unk_28[3]; UnkStruct_02073B50 unk_64[3]; } UnkStruct_ov5_021F1388; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_ov5_021F1388 * unk_04; - MapObject * unk_08; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_ov5_021F1388 *unk_04; + MapObject *unk_08; } UnkStruct_ov5_021F1570; typedef struct { @@ -47,16 +48,16 @@ typedef struct { UnkStruct_ov5_021F1570 unk_14; } UnkStruct_ov5_021F15B4; -static void ov5_021F1388(UnkStruct_ov5_021F1388 * param0); -static void ov5_021F13AC(UnkStruct_ov5_021F1388 * param0); -static void ov5_021F13B8(UnkStruct_ov5_021F1388 * param0, VecFx32 * param1); +static void ov5_021F1388(UnkStruct_ov5_021F1388 *param0); +static void ov5_021F13AC(UnkStruct_ov5_021F1388 *param0); +static void ov5_021F13B8(UnkStruct_ov5_021F1388 *param0, VecFx32 *param1); static int ov5_021F13C8(int param0); -static void ov5_021F13D4(UnkStruct_ov5_021F1388 * param0, int param1); -static void ov5_021F1400(fx32 * param0, fx32 param1, fx32 param2); -static void ov5_021F1424(SysTask * param0, void * param1); -static void ov5_021F14FC(UnkStruct_ov5_021F1388 * param0); -static void ov5_021F153C(UnkStruct_ov5_021F1388 * param0); -static void ov5_021F1554(UnkStruct_ov5_021F1388 * param0, int param1); +static void ov5_021F13D4(UnkStruct_ov5_021F1388 *param0, int param1); +static void ov5_021F1400(fx32 *param0, fx32 param1, fx32 param2); +static void ov5_021F1424(SysTask *param0, void *param1); +static void ov5_021F14FC(UnkStruct_ov5_021F1388 *param0); +static void ov5_021F153C(UnkStruct_ov5_021F1388 *param0); +static void ov5_021F1554(UnkStruct_ov5_021F1388 *param0, int param1); static const UnkStruct_ov101_021D86B0 Unk_ov5_022002AC; static const UnkStruct_ov101_021D86B0 Unk_ov5_02200298; @@ -64,9 +65,9 @@ const VecFx32 Unk_ov5_022002E4[]; const fx32 Unk_ov5_02200284[]; static const int Unk_ov5_02200278[3]; -void * ov5_021F134C (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F134C(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F1388 * v0; + UnkStruct_ov5_021F1388 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F1388)), 0, 0); v0->unk_20 = param0; @@ -77,46 +78,46 @@ void * ov5_021F134C (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F1370 (void * param0) +void ov5_021F1370(void *param0) { - UnkStruct_ov5_021F1388 * v0 = param0; + UnkStruct_ov5_021F1388 *v0 = param0; ov5_021F13AC(v0); ov5_021F153C(v0); ov5_021DF554(v0); } -static void ov5_021F1388 (UnkStruct_ov5_021F1388 * param0) +static void ov5_021F1388(UnkStruct_ov5_021F1388 *param0) { - FieldSystem * fieldSystem = ov5_021DF574(param0->unk_20); + FieldSystem *fieldSystem = ov5_021DF574(param0->unk_20); int v1 = sub_02062858(fieldSystem->mapObjMan) - 1; - SysTask * v2 = SysTask_Start(ov5_021F1424, param0, v1); + SysTask *v2 = SysTask_Start(ov5_021F1424, param0, v1); param0->unk_24 = v2; } -static void ov5_021F13AC (UnkStruct_ov5_021F1388 * param0) +static void ov5_021F13AC(UnkStruct_ov5_021F1388 *param0) { SysTask_Done(param0->unk_24); } -static void ov5_021F13B8 (UnkStruct_ov5_021F1388 * param0, VecFx32 * param1) +static void ov5_021F13B8(UnkStruct_ov5_021F1388 *param0, VecFx32 *param1) { *param1 = param0->unk_14; } -static int ov5_021F13C8 (int param0) +static int ov5_021F13C8(int param0) { - return(param0 / FX32_ONE); + return param0 / FX32_ONE; } -static void ov5_021F13D4 (UnkStruct_ov5_021F1388 * param0, int param1) +static void ov5_021F13D4(UnkStruct_ov5_021F1388 *param0, int param1) { param0->unk_10 = Unk_ov5_02200284[param0->unk_04]; param0->unk_14 = Unk_ov5_022002E4[param0->unk_04]; } -static void ov5_021F1400 (fx32 * param0, fx32 param1, fx32 param2) +static void ov5_021F1400(fx32 *param0, fx32 param1, fx32 param2) { if ((*param0) < param1) { (*param0) += param2; @@ -133,10 +134,10 @@ static void ov5_021F1400 (fx32 * param0, fx32 param1, fx32 param2) } } -static void ov5_021F1424 (SysTask * param0, void * param1) +static void ov5_021F1424(SysTask *param0, void *param1) { int v0; - UnkStruct_ov5_021F1388 * v1 = param1; + UnkStruct_ov5_021F1388 *v1 = param1; v0 = GetTimeOfDay(); @@ -153,8 +154,7 @@ static void ov5_021F1424 (SysTask * param0, void * param1) } v1->unk_00++; - case 2: - { + case 2: { fx32 v2 = Unk_ov5_02200284[v0]; VecFx32 v3 = Unk_ov5_022002E4[v0]; @@ -168,12 +168,11 @@ static void ov5_021F1424 (SysTask * param0, void * param1) v1->unk_04 = v0; v1->unk_00 = 1; } - } - break; + } break; } } -static void ov5_021F14FC (UnkStruct_ov5_021F1388 * param0) +static void ov5_021F14FC(UnkStruct_ov5_021F1388 *param0) { int v0; @@ -183,7 +182,7 @@ static void ov5_021F14FC (UnkStruct_ov5_021F1388 * param0) } } -static void ov5_021F153C (UnkStruct_ov5_021F1388 * param0) +static void ov5_021F153C(UnkStruct_ov5_021F1388 *param0) { int v0; @@ -192,17 +191,17 @@ static void ov5_021F153C (UnkStruct_ov5_021F1388 * param0) } } -static void ov5_021F1554 (UnkStruct_ov5_021F1388 * param0, int param1) +static void ov5_021F1554(UnkStruct_ov5_021F1388 *param0, int param1) { NNS_G3dMdlUseMdlAlpha(param0->unk_28[0].unk_0C); NNS_G3dMdlSetMdlAlphaAll(param0->unk_28[0].unk_0C, param1); } -void ov5_021F1570 (MapObject * param0) +void ov5_021F1570(MapObject *param0) { int v0, v1; UnkStruct_ov5_021F1570 v2; - UnkStruct_ov5_021DF47C * v3; + UnkStruct_ov5_021DF47C *v3; VecFx32 v4; v3 = ov5_021DF578(param0); @@ -219,10 +218,10 @@ void ov5_021F1570 (MapObject * param0) ov5_021DF72C(v3, &Unk_ov5_022002AC, &v4, v0, &v2, v1); } -static int ov5_021F15B4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F15B4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F15B4 * v0; - const UnkStruct_ov5_021F1570 * v1; + UnkStruct_ov5_021F15B4 *v0; + const UnkStruct_ov5_021F1570 *v1; v0 = param1; v1 = sub_020715BC(param0); @@ -241,15 +240,15 @@ static int ov5_021F15B4 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F1600 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1600(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F1604 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1604(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F15B4 * v0; - MapObject * v1; + UnkStruct_ov5_021F15B4 *v0; + MapObject *v1; v0 = param1; v1 = v0->unk_14.unk_08; @@ -279,14 +278,14 @@ static void ov5_021F1604 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F1670 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1670(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F15B4 * v0 = param1; + UnkStruct_ov5_021F15B4 *v0 = param1; if (v0->unk_0C == 0) { VecFx32 v1, v2; - MtxFx33 v3 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; - UnkStruct_02073B50 * v4 = &v0->unk_14.unk_04->unk_64[0]; + MtxFx33 v3 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; + UnkStruct_02073B50 *v4 = &v0->unk_14.unk_04->unk_64[0]; ov5_021F13B8(v0->unk_14.unk_04, &v2); sub_020715E4(param0, &v1); @@ -307,11 +306,11 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_022002AC = { ov5_021F1670 }; -UnkStruct_ov101_021D5D90 * ov5_021F16D4 (MapObject * param0, int param1) +UnkStruct_ov101_021D5D90 *ov5_021F16D4(MapObject *param0, int param1) { int v0; UnkStruct_ov5_021F1570 v1; - UnkStruct_ov5_021DF47C * v2; + UnkStruct_ov5_021DF47C *v2; VecFx32 v3; v2 = ov5_021DF578(param0); @@ -326,10 +325,10 @@ UnkStruct_ov101_021D5D90 * ov5_021F16D4 (MapObject * param0, int param1) return ov5_021DF72C(v2, &Unk_ov5_02200298, &v3, param1, &v1, v0); } -static void ov5_021F1718 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1718(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F15B4 * v0; - MapObject * v1; + UnkStruct_ov5_021F15B4 *v0; + MapObject *v1; v0 = param1; v1 = v0->unk_14.unk_08; @@ -354,9 +353,9 @@ static void ov5_021F1718 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F176C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F176C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F15B4 * v0; + UnkStruct_ov5_021F15B4 *v0; v0 = param1; @@ -367,7 +366,7 @@ static void ov5_021F176C (UnkStruct_ov101_021D5D90 * param0, void * param1) { int v1 = sub_020715B4(param0); VecFx32 v2; - UnkStruct_02073B50 * v3 = &v0->unk_14.unk_04->unk_64[v1]; + UnkStruct_02073B50 *v3 = &v0->unk_14.unk_04->unk_64[v1]; sub_020715E4(param0, &v2); v2.x += (FX32_ONE * -1) / 2; @@ -386,11 +385,11 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200298 = { }; static const VecFx32 Unk_ov5_022002E4[] = { - {FX32_ONE, FX32_ONE, FX32_ONE}, - {FX32_ONE + (FX32_ONE / 4), FX32_ONE, FX32_ONE + (FX32_ONE / 4)}, - {FX32_ONE + (FX32_ONE / 4), FX32_ONE, FX32_ONE}, - {FX32_ONE + (FX32_ONE / 8), FX32_ONE, FX32_ONE}, - {FX32_ONE - (FX32_ONE / 8), FX32_ONE, FX32_ONE - (FX32_ONE / 8)} + { FX32_ONE, FX32_ONE, FX32_ONE }, + { FX32_ONE + (FX32_ONE / 4), FX32_ONE, FX32_ONE + (FX32_ONE / 4) }, + { FX32_ONE + (FX32_ONE / 4), FX32_ONE, FX32_ONE }, + { FX32_ONE + (FX32_ONE / 8), FX32_ONE, FX32_ONE }, + { FX32_ONE - (FX32_ONE / 8), FX32_ONE, FX32_ONE - (FX32_ONE / 8) } }; static const fx32 Unk_ov5_02200284[] = { diff --git a/src/overlay005/ov5_021F17B8.c b/src/overlay005/ov5_021F17B8.c index f48f7bfa9e..8bdf6d5214 100644 --- a/src/overlay005/ov5_021F17B8.c +++ b/src/overlay005/ov5_021F17B8.c @@ -1,35 +1,36 @@ +#include "overlay005/ov5_021F17B8.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/ov5_021EB1A0.h" +#include "overlay005/ov5_021ECE40.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay005/struct_ov5_021DF84C.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_02020AEC.h" #include "map_object.h" #include "map_object_move.h" +#include "unk_02020AEC.h" #include "unk_020677F4.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021EB1A0.h" -#include "overlay005/ov5_021ECE40.h" -#include "overlay005/ov5_021F17B8.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; } UnkStruct_ov5_021F17E4; typedef struct { - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_ov5_021F17E4 * unk_08; - MapObject * unk_0C; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_ov5_021F17E4 *unk_08; + MapObject *unk_0C; } UnkStruct_ov5_021F1800; typedef struct { @@ -39,38 +40,38 @@ typedef struct { int unk_0C; int unk_10; UnkStruct_ov5_021F1800 unk_14; - UnkStruct_020216E0 * unk_24; + UnkStruct_020216E0 *unk_24; VecFx32 unk_28; fx32 unk_34; } UnkStruct_ov5_021F1A24; typedef struct { - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_ov5_021F17E4 * unk_08; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_ov5_021F17E4 *unk_08; UnkStruct_ov5_021DF84C unk_0C; - const UnkStruct_020216E0 * unk_34; + const UnkStruct_020216E0 *unk_34; } UnkStruct_ov5_021F1BEC; typedef struct { int unk_00; UnkStruct_ov5_021F1BEC unk_04; - UnkStruct_020216E0 * unk_3C; + UnkStruct_020216E0 *unk_3C; VecFx32 unk_40; fx32 unk_4C; VecFx32 unk_50; } UnkStruct_ov5_021F1AD8; -static void ov5_021F17E4(UnkStruct_ov5_021F17E4 * param0); -static void ov5_021F17F4(UnkStruct_ov5_021F17E4 * param0); -static void ov5_021F1A24(UnkStruct_ov5_021F1A24 * param0, MapObject * param1, VecFx32 * param2); -static void ov5_021F1A8C(UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F1A24 * param1); +static void ov5_021F17E4(UnkStruct_ov5_021F17E4 *param0); +static void ov5_021F17F4(UnkStruct_ov5_021F17E4 *param0); +static void ov5_021F1A24(UnkStruct_ov5_021F1A24 *param0, MapObject *param1, VecFx32 *param2); +static void ov5_021F1A8C(UnkStruct_ov101_021D5D90 *param0, UnkStruct_ov5_021F1A24 *param1); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200338; -void * ov5_021F17B8 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F17B8(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F17E4 * v0; + UnkStruct_ov5_021F17E4 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F17E4)), 0, 0); v0->unk_00 = param0; @@ -79,30 +80,30 @@ void * ov5_021F17B8 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F17D4 (void * param0) +void ov5_021F17D4(void *param0) { - UnkStruct_ov5_021F17E4 * v0 = param0; + UnkStruct_ov5_021F17E4 *v0 = param0; ov5_021F17F4(v0); ov5_021DF554(v0); } -static void ov5_021F17E4 (UnkStruct_ov5_021F17E4 * param0) +static void ov5_021F17E4(UnkStruct_ov5_021F17E4 *param0) { ov5_021DF9E0(param0->unk_00, 2, 20); } -static void ov5_021F17F4 (UnkStruct_ov5_021F17E4 * param0) +static void ov5_021F17F4(UnkStruct_ov5_021F17E4 *param0) { ov5_021DFA08(param0->unk_00, 2); } -void ov5_021F1800 (MapObject * param0, int param1) +void ov5_021F1800(MapObject *param0, int param1) { int v0; VecFx32 v1; UnkStruct_ov5_021F1800 v2; - UnkStruct_ov101_021D5D90 * v3; + UnkStruct_ov101_021D5D90 *v3; v2.fieldSystem = MapObject_FieldSystem(param0); v2.unk_04 = ov5_021DF578(param0); @@ -115,11 +116,11 @@ void ov5_021F1800 (MapObject * param0, int param1) v3 = ov5_021DF72C(v2.unk_04, &Unk_ov5_02200338, &v1, param1, &v2, v0); } -static int ov5_021F184C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F184C(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F1A24 * v1; - const UnkStruct_ov5_021F1800 * v2; + UnkStruct_ov5_021F1A24 *v1; + const UnkStruct_ov5_021F1800 *v2; v1 = param1; v2 = sub_020715BC(param0); @@ -150,9 +151,9 @@ static int ov5_021F184C (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F18D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F18D0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F1A24 * v0; + UnkStruct_ov5_021F1A24 *v0; v0 = param1; @@ -161,11 +162,11 @@ static void ov5_021F18D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F18E0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F18E0(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov5_021F1A24 * v1; - MapObject * v2; + UnkStruct_ov5_021F1A24 *v1; + MapObject *v2; v1 = param1; v2 = v1->unk_14.unk_0C; @@ -204,10 +205,10 @@ static void ov5_021F18E0 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F1978 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1978(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F1A24 * v0 = param1; - MapObject * v1 = v0->unk_14.unk_0C; + UnkStruct_ov5_021F1A24 *v0 = param1; + MapObject *v1 = v0->unk_14.unk_0C; { int v2 = sub_02062920(v1); @@ -242,7 +243,7 @@ static void ov5_021F1978 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_020212D0(v0->unk_24, &v0->unk_28); { - UnkStruct_020216E0 * v4 = ov5_021EB1A0(v0->unk_14.unk_0C); + UnkStruct_020216E0 *v4 = ov5_021EB1A0(v0->unk_14.unk_0C); sub_02021344(v0->unk_24, sub_02021358(v4)); sub_02021380(v0->unk_24, sub_02021394(v4)); @@ -257,7 +258,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200338 = { ov5_021F1978 }; -static void ov5_021F1A24 (UnkStruct_ov5_021F1A24 * param0, MapObject * param1, VecFx32 * param2) +static void ov5_021F1A24(UnkStruct_ov5_021F1A24 *param0, MapObject *param1, VecFx32 *param2) { int v0; fx32 v1, v2; @@ -285,15 +286,15 @@ static void ov5_021F1A24 (UnkStruct_ov5_021F1A24 * param0, MapObject * param1, V } } -static void ov5_021F1A8C (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F1A24 * param1) +static void ov5_021F1A8C(UnkStruct_ov101_021D5D90 *param0, UnkStruct_ov5_021F1A24 *param1) { int v0; - void * v1; + void *v1; VecFx32 v2; UnkStruct_ov5_021DF84C v3; { - const MapObjectManager * v4 = MapObject_MapObjectManager(param1->unk_14.unk_0C); + const MapObjectManager *v4 = MapObject_MapObjectManager(param1->unk_14.unk_0C); if (ov5_021ED150(v4, param1->unk_08, &v3) == 0) { return; @@ -315,10 +316,10 @@ static void ov5_021F1A8C (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F1 static const UnkStruct_ov101_021D86B0 Unk_ov5_0220034C; -static void ov5_021F1AD8 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F1AD8 * param1) +static void ov5_021F1AD8(UnkStruct_ov101_021D5D90 *param0, UnkStruct_ov5_021F1AD8 *param1) { int v0; - void * v1; + void *v1; VecFx32 v2; UnkStruct_ov5_021DF84C v3 = param1->unk_04.unk_0C; @@ -329,7 +330,7 @@ static void ov5_021F1AD8 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F1 param1->unk_3C = ov5_021DF7F8(param1->unk_04.unk_04, &v3, &v2); { - const UnkStruct_020216E0 * v4 = param1->unk_04.unk_34; + const UnkStruct_020216E0 *v4 = param1->unk_04.unk_34; sub_02021344(param1->unk_3C, sub_02021358(v4)); sub_020213A4(param1->unk_3C, sub_020213D4(v4)); @@ -339,7 +340,7 @@ static void ov5_021F1AD8 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F1 } } -static void ov5_021F1B4C (UnkStruct_ov5_021F1AD8 * param0, VecFx32 * param1) +static void ov5_021F1B4C(UnkStruct_ov5_021F1AD8 *param0, VecFx32 *param1) { int v0; VecFx32 v1; @@ -361,9 +362,9 @@ static void ov5_021F1B4C (UnkStruct_ov5_021F1AD8 * param0, VecFx32 * param1) } } -UnkStruct_ov101_021D5D90 * ov5_021F1BA4 (UnkStruct_ov5_021DF47C * param0, const UnkStruct_ov5_021DF84C * param1, const UnkStruct_020216E0 * param2, const VecFx32 * param3, int param4, int param5) +UnkStruct_ov101_021D5D90 *ov5_021F1BA4(UnkStruct_ov5_021DF47C *param0, const UnkStruct_ov5_021DF84C *param1, const UnkStruct_020216E0 *param2, const VecFx32 *param3, int param4, int param5) { - UnkStruct_ov101_021D5D90 * v0; + UnkStruct_ov101_021D5D90 *v0; UnkStruct_ov5_021F1BEC v1; v1.fieldSystem = ov5_021DF574(param0); @@ -376,11 +377,11 @@ UnkStruct_ov101_021D5D90 * ov5_021F1BA4 (UnkStruct_ov5_021DF47C * param0, const return v0; } -static int ov5_021F1BEC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F1BEC(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F1AD8 * v1; - const UnkStruct_ov5_021F1BEC * v2; + UnkStruct_ov5_021F1AD8 *v1; + const UnkStruct_ov5_021F1BEC *v2; v1 = param1; v2 = sub_020715BC(param0); @@ -406,17 +407,17 @@ static int ov5_021F1BEC (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F1C54 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1C54(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F1AD8 * v0; + UnkStruct_ov5_021F1AD8 *v0; v0 = param1; sub_020211FC(v0->unk_3C); } -static void ov5_021F1C60 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1C60(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F1AD8 * v0 = param1; + UnkStruct_ov5_021F1AD8 *v0 = param1; v0->unk_40.x += v0->unk_4C; @@ -436,9 +437,9 @@ static void ov5_021F1C60 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F1CA4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1CA4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F1AD8 * v0 = param1; + UnkStruct_ov5_021F1AD8 *v0 = param1; { VecFx32 v1; diff --git a/src/overlay005/ov5_021F1CC8.c b/src/overlay005/ov5_021F1CC8.c index e5b0387b2a..0d9242bff3 100644 --- a/src/overlay005/ov5_021F1CC8.c +++ b/src/overlay005/ov5_021F1CC8.c @@ -1,23 +1,24 @@ +#include "overlay005/ov5_021F1CC8.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "map_object.h" #include "map_object_move.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F1CC8.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04[10]; UnkStruct_02073838 unk_CC[10]; UnkStruct_02073B50 unk_194[10]; @@ -26,8 +27,8 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_02073838 * unk_04; - UnkStruct_02073B50 * unk_08; + UnkStruct_02073838 *unk_04; + UnkStruct_02073B50 *unk_08; } UnkStruct_021F1FB8; typedef struct { @@ -36,24 +37,24 @@ typedef struct { int unk_08; int unk_0C; int unk_10; - UnkStruct_02073838 * unk_14; - UnkStruct_02073B50 * unk_18; + UnkStruct_02073838 *unk_14; + UnkStruct_02073B50 *unk_18; } UnkStruct_021F1FE4; -static void ov5_021F1CF8(UnkStruct_021F1CF8 * param0); -static void ov5_021F1D80(UnkStruct_021F1CF8 * param0); -static UnkStruct_02073B50 * ov5_021F1DA4(UnkStruct_021F1CF8 * param0, int param1, int param2, int param3); -static UnkStruct_02073838 * ov5_021F1E24(UnkStruct_021F1CF8 * param0, int param1, int param2, int param3); -static UnkStruct_ov101_021D5D90 * ov5_021F1ECC(const MapObject * param0, int param1); +static void ov5_021F1CF8(UnkStruct_021F1CF8 *param0); +static void ov5_021F1D80(UnkStruct_021F1CF8 *param0); +static UnkStruct_02073B50 *ov5_021F1DA4(UnkStruct_021F1CF8 *param0, int param1, int param2, int param3); +static UnkStruct_02073838 *ov5_021F1E24(UnkStruct_021F1CF8 *param0, int param1, int param2, int param3); +static UnkStruct_ov101_021D5D90 *ov5_021F1ECC(const MapObject *param0, int param1); static const u32 Unk_ov5_0220039C[10]; static const u32 Unk_ov5_02200374[10]; static const int Unk_ov5_022003C4[4][4]; static const UnkStruct_ov101_021D86B0 Unk_ov5_02200360; -void * ov5_021F1CC8 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F1CC8(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_021F1CF8 * v0; + UnkStruct_021F1CF8 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_021F1CF8)), 0, 0); v0->unk_00 = param0; @@ -62,15 +63,15 @@ void * ov5_021F1CC8 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F1CE8 (void * param0) +void ov5_021F1CE8(void *param0) { - UnkStruct_021F1CF8 * v0 = param0; + UnkStruct_021F1CF8 *v0 = param0; ov5_021F1D80(v0); ov5_021DF554(v0); } -static void ov5_021F1CF8 (UnkStruct_021F1CF8 * param0) +static void ov5_021F1CF8(UnkStruct_021F1CF8 *param0) { u32 v0, v1; @@ -85,7 +86,7 @@ static void ov5_021F1CF8 (UnkStruct_021F1CF8 * param0) } } -static void ov5_021F1D80 (UnkStruct_021F1CF8 * param0) +static void ov5_021F1D80(UnkStruct_021F1CF8 *param0) { int v0; @@ -95,10 +96,10 @@ static void ov5_021F1D80 (UnkStruct_021F1CF8 * param0) } } -static UnkStruct_02073B50 * ov5_021F1DA4 (UnkStruct_021F1CF8 * param0, int param1, int param2, int param3) +static UnkStruct_02073B50 *ov5_021F1DA4(UnkStruct_021F1CF8 *param0, int param1, int param2, int param3) { int v0; - UnkStruct_02073B50 * v1 = NULL; + UnkStruct_02073B50 *v1 = NULL; switch (param1) { case 0: @@ -124,10 +125,10 @@ static UnkStruct_02073B50 * ov5_021F1DA4 (UnkStruct_021F1CF8 * param0, int param return v1; } -static UnkStruct_02073838 * ov5_021F1E24 (UnkStruct_021F1CF8 * param0, int param1, int param2, int param3) +static UnkStruct_02073838 *ov5_021F1E24(UnkStruct_021F1CF8 *param0, int param1, int param2, int param3) { int v0 = 0; - UnkStruct_02073838 * v1 = NULL; + UnkStruct_02073838 *v1 = NULL; switch (param1) { case 0: @@ -153,40 +154,40 @@ static UnkStruct_02073838 * ov5_021F1E24 (UnkStruct_021F1CF8 * param0, int param return v1; } -UnkStruct_ov101_021D5D90 * ov5_021F1E8C (const MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F1E8C(const MapObject *param0) { return ov5_021F1ECC(param0, 0); } -UnkStruct_ov101_021D5D90 * ov5_021F1E98 (const MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F1E98(const MapObject *param0) { return ov5_021F1ECC(param0, 1); } -UnkStruct_ov101_021D5D90 * ov5_021F1EA4 (const MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F1EA4(const MapObject *param0) { return ov5_021F1ECC(param0, 2); } -UnkStruct_ov101_021D5D90 * ov5_021F1EB0 (const MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F1EB0(const MapObject *param0) { return ov5_021F1ECC(param0, 3); } -UnkStruct_ov101_021D5D90 * ov5_021F1EBC (const MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F1EBC(const MapObject *param0) { return ov5_021F1ECC(param0, 4); } -UnkStruct_ov101_021D5D90 * ov5_021F1EC8 (const MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F1EC8(const MapObject *param0) { return NULL; } -static UnkStruct_ov101_021D5D90 * ov5_021F1ECC (const MapObject * param0, int param1) +static UnkStruct_ov101_021D5D90 *ov5_021F1ECC(const MapObject *param0, int param1) { VecFx32 v0; - UnkStruct_ov101_021D5D90 * v1; + UnkStruct_ov101_021D5D90 *v1; UnkStruct_021F1FB8 v2; int v3 = MapObject_XPosPrev(param0); int v4 = MapObject_ZPosPrev(param0); @@ -194,8 +195,8 @@ static UnkStruct_ov101_021D5D90 * ov5_021F1ECC (const MapObject * param0, int pa int v6 = MapObject_Dir(param0); int v7 = sub_02062990(param0); int v8 = sub_02062758(param0, 2); - UnkStruct_ov5_021DF47C * v9 = ov5_021DF578(param0); - UnkStruct_021F1CF8 * v10 = ov5_021DF55C(v9, 11); + UnkStruct_ov5_021DF47C *v9 = ov5_021DF578(param0); + UnkStruct_021F1CF8 *v10 = ov5_021DF55C(v9, 11); v2.unk_00 = param1; v2.unk_08 = ov5_021F1DA4(v10, param1, v6, v7); @@ -233,11 +234,11 @@ static UnkStruct_ov101_021D5D90 * ov5_021F1ECC (const MapObject * param0, int pa return v1; } -static int ov5_021F1FB8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F1FB8(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_021F1FE4 * v1; - const UnkStruct_021F1FB8 * v2; + UnkStruct_021F1FE4 *v1; + const UnkStruct_021F1FB8 *v2; v1 = param1; v1->unk_10 = sub_020715B4(param0); @@ -251,14 +252,14 @@ static int ov5_021F1FB8 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F1FE0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1FE0(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F1FE4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F1FE4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F1FE4 * v0; + UnkStruct_021F1FE4 *v0; v0 = param1; @@ -280,9 +281,9 @@ static void ov5_021F1FE4 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F2014 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2014(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F1FE4 * v0 = param1; + UnkStruct_021F1FE4 *v0 = param1; if (v0->unk_08 == 0) { VecFx32 v1; @@ -323,10 +324,10 @@ static const u32 Unk_ov5_02200374[10] = { }; static const int Unk_ov5_022003C4[4][4] = { - {0x4, 0x4, 0x7, 0x6}, - {0x4, 0x4, 0x9, 0x8}, - {0x8, 0x6, 0x5, 0x5}, - {0x9, 0x7, 0x5, 0x5} + { 0x4, 0x4, 0x7, 0x6 }, + { 0x4, 0x4, 0x9, 0x8 }, + { 0x8, 0x6, 0x5, 0x5 }, + { 0x9, 0x7, 0x5, 0x5 } }; static const UnkStruct_ov101_021D86B0 Unk_ov5_02200360 = { diff --git a/src/overlay005/ov5_021F204C.c b/src/overlay005/ov5_021F204C.c index 52a676736c..a7be3ebc77 100644 --- a/src/overlay005/ov5_021F204C.c +++ b/src/overlay005/ov5_021F204C.c @@ -1,35 +1,36 @@ +#include "overlay005/ov5_021F204C.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_020217F4.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/ov5_021ECC20.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" +#include "map_object.h" #include "unk_02020AEC.h" #include "unk_02055C50.h" -#include "map_object.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021ECC20.h" -#include "overlay005/ov5_021F204C.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073B50 unk_04[3]; UnkStruct_02073838 unk_100[3]; } UnkStruct_ov5_021F2078; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_ov5_021F2078 * unk_04; - MapObject * unk_08; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_ov5_021F2078 *unk_04; + MapObject *unk_08; } UnkStruct_ov5_021F20D4; typedef struct { @@ -43,13 +44,13 @@ typedef struct { typedef struct { int unk_00; int unk_04; - UnkStruct_ov5_021DF47C * unk_08; + UnkStruct_ov5_021DF47C *unk_08; } UnkStruct_ov5_021F2204; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_ov5_021F2204 * unk_04; - MapObject * unk_08; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_ov5_021F2204 *unk_04; + MapObject *unk_08; } UnkStruct_ov5_021F22BC; typedef struct { @@ -57,26 +58,26 @@ typedef struct { int unk_04; int unk_08; UnkStruct_ov5_021F22BC unk_0C; - UnkStruct_020216E0 * unk_18; + UnkStruct_020216E0 *unk_18; } UnkStruct_ov5_021F2304; -static void ov5_021F2078(UnkStruct_ov5_021F2078 * param0); -static void ov5_021F20B8(UnkStruct_ov5_021F2078 * param0); -static void ov5_021F2204(UnkStruct_ov5_021F2204 * param0); -static void ov5_021F220C(UnkStruct_ov5_021F2204 * param0); -static void ov5_021F221C(UnkStruct_ov5_021F2204 * param0); -static void ov5_021F226C(UnkStruct_ov5_021F2204 * param0); -static void ov5_021F229C(UnkStruct_ov5_021F2204 * param0); -static void ov5_021F22AC(UnkStruct_ov5_021F2204 * param0); +static void ov5_021F2078(UnkStruct_ov5_021F2078 *param0); +static void ov5_021F20B8(UnkStruct_ov5_021F2078 *param0); +static void ov5_021F2204(UnkStruct_ov5_021F2204 *param0); +static void ov5_021F220C(UnkStruct_ov5_021F2204 *param0); +static void ov5_021F221C(UnkStruct_ov5_021F2204 *param0); +static void ov5_021F226C(UnkStruct_ov5_021F2204 *param0); +static void ov5_021F229C(UnkStruct_ov5_021F2204 *param0); +static void ov5_021F22AC(UnkStruct_ov5_021F2204 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200438; static const UnkStruct_ov101_021D86B0 Unk_ov5_02200410; static const u32 Unk_ov5_02200404[3]; const UnkStruct_020217F4 Unk_ov5_0220044C[]; -void * ov5_021F204C (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F204C(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F2078 * v0; + UnkStruct_ov5_021F2078 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F2078)), 0, 0); v0->unk_00 = param0; @@ -85,15 +86,15 @@ void * ov5_021F204C (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F2068 (void * param0) +void ov5_021F2068(void *param0) { - UnkStruct_ov5_021F2078 * v0 = param0; + UnkStruct_ov5_021F2078 *v0 = param0; ov5_021F20B8(v0); ov5_021DF554(v0); } -static void ov5_021F2078 (UnkStruct_ov5_021F2078 * param0) +static void ov5_021F2078(UnkStruct_ov5_021F2078 *param0) { int v0 = 0; @@ -105,7 +106,7 @@ static void ov5_021F2078 (UnkStruct_ov5_021F2078 * param0) } while (v0 < (2 + 1)); } -static void ov5_021F20B8 (UnkStruct_ov5_021F2078 * param0) +static void ov5_021F20B8(UnkStruct_ov5_021F2078 *param0) { int v0 = 0; @@ -115,11 +116,11 @@ static void ov5_021F20B8 (UnkStruct_ov5_021F2078 * param0) } while (v0 < (2 + 1)); } -void ov5_021F20D4 (MapObject * param0) +void ov5_021F20D4(MapObject *param0) { int v0, v1; UnkStruct_ov5_021F20D4 v2; - UnkStruct_ov5_021DF47C * v3; + UnkStruct_ov5_021DF47C *v3; VecFx32 v4; v3 = ov5_021DF578(param0); @@ -136,10 +137,10 @@ void ov5_021F20D4 (MapObject * param0) ov5_021DF72C(v3, &Unk_ov5_02200438, &v4, v0, &v2, v1); } -static int ov5_021F2118 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F2118(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2118 * v0; - const UnkStruct_ov5_021F20D4 * v1; + UnkStruct_ov5_021F2118 *v0; + const UnkStruct_ov5_021F20D4 *v1; v0 = param1; v1 = sub_020715BC(param0); @@ -151,15 +152,15 @@ static int ov5_021F2118 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F2144 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2144(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F2148 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2148(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2118 * v0; - MapObject * v1; + UnkStruct_ov5_021F2118 *v0; + MapObject *v1; v0 = param1; v1 = v0->unk_10.unk_08; @@ -188,9 +189,9 @@ static void ov5_021F2148 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F21B8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F21B8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2118 * v0 = param1; + UnkStruct_ov5_021F2118 *v0 = param1; if (v0->unk_08 != 1) { VecFx32 v1; @@ -209,9 +210,9 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200438 = { ov5_021F21B8 }; -void * ov5_021F21E0 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F21E0(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F2204 * v0; + UnkStruct_ov5_021F2204 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F2204)), 0, 0); v0->unk_08 = param0; @@ -219,26 +220,26 @@ void * ov5_021F21E0 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F21F4 (void * param0) +void ov5_021F21F4(void *param0) { - UnkStruct_ov5_021F2204 * v0 = param0; + UnkStruct_ov5_021F2204 *v0 = param0; ov5_021F226C(v0); ov5_021DF554(v0); } -static void ov5_021F2204 (UnkStruct_ov5_021F2204 * param0) +static void ov5_021F2204(UnkStruct_ov5_021F2204 *param0) { param0->unk_00++; } -static void ov5_021F220C (UnkStruct_ov5_021F2204 * param0) +static void ov5_021F220C(UnkStruct_ov5_021F2204 *param0) { param0->unk_00--; GF_ASSERT(param0->unk_00 >= 0); } -static void ov5_021F221C (UnkStruct_ov5_021F2204 * param0) +static void ov5_021F221C(UnkStruct_ov5_021F2204 *param0) { if (param0->unk_04 == 0) { param0->unk_04 = 1; @@ -249,7 +250,7 @@ static void ov5_021F221C (UnkStruct_ov5_021F2204 * param0) } } -static void ov5_021F226C (UnkStruct_ov5_021F2204 * param0) +static void ov5_021F226C(UnkStruct_ov5_021F2204 *param0) { if (param0->unk_04 == 1) { param0->unk_04 = 0; @@ -261,26 +262,26 @@ static void ov5_021F226C (UnkStruct_ov5_021F2204 * param0) } } -static void ov5_021F229C (UnkStruct_ov5_021F2204 * param0) +static void ov5_021F229C(UnkStruct_ov5_021F2204 *param0) { if (param0->unk_00 == 0) { ov5_021F221C(param0); } } -static void ov5_021F22AC (UnkStruct_ov5_021F2204 * param0) +static void ov5_021F22AC(UnkStruct_ov5_021F2204 *param0) { if (param0->unk_00 == 0) { ov5_021F226C(param0); } } -UnkStruct_ov101_021D5D90 * ov5_021F22BC (MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F22BC(MapObject *param0) { VecFx32 v0; - UnkStruct_ov5_021DF47C * v1; + UnkStruct_ov5_021DF47C *v1; UnkStruct_ov5_021F22BC v2; - UnkStruct_ov101_021D5D90 * v3; + UnkStruct_ov101_021D5D90 *v3; v1 = ov5_021DF578(param0); ov5_021ECDA0(param0, &v0); @@ -293,11 +294,11 @@ UnkStruct_ov101_021D5D90 * ov5_021F22BC (MapObject * param0) return v3; } -static int ov5_021F2304 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F2304(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F2304 * v1; - const UnkStruct_ov5_021F22BC * v2; + UnkStruct_ov5_021F2304 *v1; + const UnkStruct_ov5_021F22BC *v2; v1 = param1; v2 = sub_020715BC(param0); @@ -312,9 +313,9 @@ static int ov5_021F2304 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F2344 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2344(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2304 * v0; + UnkStruct_ov5_021F2304 *v0; v0 = param1; @@ -323,10 +324,10 @@ static void ov5_021F2344 (UnkStruct_ov101_021D5D90 * param0, void * param1) ov5_021F22AC(v0->unk_0C.unk_04); } -static void ov5_021F235C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F235C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - fx32 v0[5] = {0x1000, 0x1000, 0x2000, 0x2000, 0x1000}; - UnkStruct_ov5_021F2304 * v1 = param1; + fx32 v0[5] = { 0x1000, 0x1000, 0x2000, 0x2000, 0x1000 }; + UnkStruct_ov5_021F2304 *v1 = param1; if (v1->unk_08 == 1) { v1->unk_08 = 0; @@ -347,10 +348,10 @@ static void ov5_021F235C (UnkStruct_ov101_021D5D90 * param0, void * param1) v1->unk_08 = 1; } -static void ov5_021F23B8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F23B8(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F2304 * v1; + UnkStruct_ov5_021F2304 *v1; v1 = param1; @@ -373,6 +374,6 @@ static const u32 Unk_ov5_02200404[3] = { }; static const UnkStruct_020217F4 Unk_ov5_0220044C[] = { - {0x0, 0x9, 0x1}, - {0x0, 0x0, 0x2} + { 0x0, 0x9, 0x1 }, + { 0x0, 0x0, 0x2 } }; diff --git a/src/overlay005/ov5_021F23D0.c b/src/overlay005/ov5_021F23D0.c index 8942348cbb..b86e08a9b6 100644 --- a/src/overlay005/ov5_021F23D0.c +++ b/src/overlay005/ov5_021F23D0.c @@ -1,31 +1,32 @@ +#include "overlay005/ov5_021F23D0.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "map_object.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F23D0.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073974 unk_18; } UnkStruct_ov5_021F23FC; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_ov5_021F23FC * unk_04; - MapObject * unk_08; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_ov5_021F23FC *unk_04; + MapObject *unk_08; } UnkStruct_ov5_021F2438; typedef struct { @@ -38,14 +39,14 @@ typedef struct { UnkStruct_02073B50 unk_40; } UnkStruct_ov5_021F247C; -static void ov5_021F23FC(UnkStruct_ov5_021F23FC * param0); -static void ov5_021F2424(UnkStruct_ov5_021F23FC * param0); +static void ov5_021F23FC(UnkStruct_ov5_021F23FC *param0); +static void ov5_021F2424(UnkStruct_ov5_021F23FC *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200464; -void * ov5_021F23D0 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F23D0(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F23FC * v0; + UnkStruct_ov5_021F23FC *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F23FC)), 0, 0); v0->unk_00 = param0; @@ -54,31 +55,31 @@ void * ov5_021F23D0 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F23EC (void * param0) +void ov5_021F23EC(void *param0) { - UnkStruct_ov5_021F23FC * v0 = param0; + UnkStruct_ov5_021F23FC *v0 = param0; ov5_021F2424(v0); ov5_021DF554(v0); } -static void ov5_021F23FC (UnkStruct_ov5_021F23FC * param0) +static void ov5_021F23FC(UnkStruct_ov5_021F23FC *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 78, 0); ov5_021DFB24(param0->unk_00, ¶m0->unk_18, 0, 165, 0); } -static void ov5_021F2424 (UnkStruct_ov5_021F23FC * param0) +static void ov5_021F2424(UnkStruct_ov5_021F23FC *param0) { sub_0207395C(¶m0->unk_04); sub_02073AA8(¶m0->unk_18); } -UnkStruct_ov101_021D5D90 * ov5_021F2438 (MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F2438(MapObject *param0) { - UnkStruct_ov101_021D5D90 * v0; - UnkStruct_ov5_021DF47C * v1; - UnkStruct_ov5_021F23FC * v2; + UnkStruct_ov101_021D5D90 *v0; + UnkStruct_ov5_021DF47C *v1; + UnkStruct_ov5_021F23FC *v2; UnkStruct_ov5_021F2438 v3; v1 = ov5_021DF578(param0); @@ -89,7 +90,7 @@ UnkStruct_ov101_021D5D90 * ov5_021F2438 (MapObject * param0) v3.unk_08 = param0; { - VecFx32 v4 = {0, 0, 0}; + VecFx32 v4 = { 0, 0, 0 }; int v5 = sub_02062758(param0, 2); v0 = ov5_021DF72C(v1, &Unk_ov5_02200464, &v4, 0, &v3, v5); @@ -98,17 +99,17 @@ UnkStruct_ov101_021D5D90 * ov5_021F2438 (MapObject * param0) return v0; } -void ov5_021F247C (UnkStruct_ov101_021D5D90 * param0) +void ov5_021F247C(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov5_021F247C * v0 = sub_02071598(param0); + UnkStruct_ov5_021F247C *v0 = sub_02071598(param0); v0->unk_0C = 1; } -static int ov5_021F2488 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F2488(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F247C * v0; - const UnkStruct_ov5_021F2438 * v1; + UnkStruct_ov5_021F247C *v0; + const UnkStruct_ov5_021F2438 *v1; v0 = param1; v1 = sub_020715BC(param0); @@ -123,7 +124,7 @@ static int ov5_021F2488 (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v2, v3; - MapObject * v4 = v0->unk_10.unk_08; + MapObject *v4 = v0->unk_10.unk_08; MapObject_PosVectorOut(v4, &v2); sub_02063078(v4, &v3); @@ -138,16 +139,16 @@ static int ov5_021F2488 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F2510 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2510(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F247C * v0 = param1; + UnkStruct_ov5_021F247C *v0 = param1; sub_02073AA8(&v0->unk_1C); } -static void ov5_021F251C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F251C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F247C * v0 = param1; - MapObject * v1 = v0->unk_10.unk_08; + UnkStruct_ov5_021F247C *v0 = param1; + MapObject *v1 = v0->unk_10.unk_08; if (v0->unk_0C == 0) { if (sub_02062764(v1, v0->unk_04, v0->unk_08) == 0) { @@ -177,10 +178,10 @@ static void ov5_021F251C (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F25A4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F25A4(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F247C * v1 = param1; + UnkStruct_ov5_021F247C *v1 = param1; sub_020715E4(param0, &v0); sub_02073BB4(&v1->unk_40, &v0); diff --git a/src/overlay005/ov5_021F25C0.c b/src/overlay005/ov5_021F25C0.c index b1f9804d03..7f0b257432 100644 --- a/src/overlay005/ov5_021F25C0.c +++ b/src/overlay005/ov5_021F25C0.c @@ -1,34 +1,35 @@ +#include "overlay005/ov5_021F25C0.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_0201E190.h" #include "map_object.h" #include "map_object_move.h" +#include "unk_0201E190.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F25C0.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073B50 unk_18; } UnkStruct_ov5_021F25EC; typedef struct { int unk_00; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_ov5_021F25EC * unk_08; - MapObject * unk_0C; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_ov5_021F25EC *unk_08; + MapObject *unk_0C; } UnkStruct_ov5_021F26A8; typedef struct { @@ -44,14 +45,14 @@ typedef struct { UnkStruct_ov5_021F26A8 unk_24; } UnkStruct_ov5_021F26F0; -static void ov5_021F25EC(UnkStruct_ov5_021F25EC * param0); -static void ov5_021F2610(UnkStruct_ov5_021F25EC * param0); +static void ov5_021F25EC(UnkStruct_ov5_021F25EC *param0); +static void ov5_021F2610(UnkStruct_ov5_021F25EC *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200490; -void * ov5_021F25C0 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F25C0(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F25EC * v0; + UnkStruct_ov5_021F25EC *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F25EC)), 0, 0); v0->unk_00 = param0; @@ -60,29 +61,29 @@ void * ov5_021F25C0 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F25DC (void * param0) +void ov5_021F25DC(void *param0) { - UnkStruct_ov5_021F25EC * v0 = param0; + UnkStruct_ov5_021F25EC *v0 = param0; ov5_021F2610(v0); ov5_021DF554(v0); } -static void ov5_021F25EC (UnkStruct_ov5_021F25EC * param0) +static void ov5_021F25EC(UnkStruct_ov5_021F25EC *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 81, 0); sub_02073B70(¶m0->unk_18, ¶m0->unk_04); } -static void ov5_021F2610 (UnkStruct_ov5_021F25EC * param0) +static void ov5_021F2610(UnkStruct_ov5_021F25EC *param0) { sub_0207395C(¶m0->unk_04); } -UnkStruct_ov101_021D5D90 * ov5_021F261C (MapObject * param0, int param1, int param2, int param3, int param4) +UnkStruct_ov101_021D5D90 *ov5_021F261C(MapObject *param0, int param1, int param2, int param3, int param4) { UnkStruct_ov5_021F26A8 v0; - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; v0.unk_00 = param3; v0.unk_04 = ov5_021DF578(param0); @@ -90,13 +91,13 @@ UnkStruct_ov101_021D5D90 * ov5_021F261C (MapObject * param0, int param1, int par v0.unk_0C = param0; if (param4 == 0) { - FieldSystem * fieldSystem = MapObject_FieldSystem(param0); + FieldSystem *fieldSystem = MapObject_FieldSystem(param0); - v1.x = (((param1) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)); - v1.z = (((param2) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)); + v1.x = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + v1.z = (((param2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); sub_020644A4(fieldSystem, &v1); } else { - VecFx32 v3 = {0, (FX32_ONE * 7), (FX32_ONE * 4)}; + VecFx32 v3 = { 0, (FX32_ONE * 7), (FX32_ONE * 4) }; MapObject_PosVectorOut(param0, &v1); sub_020630AC(param0, &v3); @@ -108,11 +109,11 @@ UnkStruct_ov101_021D5D90 * ov5_021F261C (MapObject * param0, int param1, int par } } -static int ov5_021F26A8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F26A8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F26F0 * v0 = param1; - const UnkStruct_ov5_021F26A8 * v1 = sub_020715BC(param0); - MapObject * v2 = v1->unk_0C; + UnkStruct_ov5_021F26F0 *v0 = param1; + const UnkStruct_ov5_021F26A8 *v1 = sub_020715BC(param0); + MapObject *v2 = v1->unk_0C; v0->unk_24 = *v1; v0->unk_0C = MapObject_Id(v2); @@ -125,19 +126,19 @@ static int ov5_021F26A8 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F26F0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F26F0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F26F0 * v0 = param1; - MapObject * v1 = v0->unk_24.unk_0C; - VecFx32 v2 = {0, 0, 0}; + UnkStruct_ov5_021F26F0 *v0 = param1; + MapObject *v1 = v0->unk_24.unk_0C; + VecFx32 v2 = { 0, 0, 0 }; sub_020630AC(v1, &v2); } -static void ov5_021F2708 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2708(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F26F0 * v0 = param1; - MapObject * v1 = v0->unk_24.unk_0C; + UnkStruct_ov5_021F26F0 *v0 = param1; + MapObject *v1 = v0->unk_24.unk_0C; if (sub_02062764(v1, v0->unk_0C, v0->unk_10) == 0) { ov5_021DF74C(param0); @@ -189,9 +190,9 @@ static void ov5_021F2708 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F27B4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F27B4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F26F0 * v0 = param1; + UnkStruct_ov5_021F26F0 *v0 = param1; if ((v0->unk_00 == 1) || (v0->unk_08 == -1)) { return; @@ -202,8 +203,8 @@ static void ov5_021F27B4 (UnkStruct_ov101_021D5D90 * param0, void * param1) { u32 v1 = 0; MtxFx33 v2; - VecFx32 v3, v4 = {FX32_ONE, FX32_ONE, FX32_ONE}; - UnkStruct_02073B50 * v5 = &v0->unk_24.unk_08->unk_18; + VecFx32 v3, v4 = { FX32_ONE, FX32_ONE, FX32_ONE }; + UnkStruct_02073B50 *v5 = &v0->unk_24.unk_08->unk_18; switch (v0->unk_08) { case 0: @@ -225,9 +226,9 @@ static void ov5_021F27B4 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -void ov5_021F2838 (UnkStruct_ov101_021D5D90 * param0, int param1) +void ov5_021F2838(UnkStruct_ov101_021D5D90 *param0, int param1) { - UnkStruct_ov5_021F26F0 * v0 = sub_02071598(param0); + UnkStruct_ov5_021F26F0 *v0 = sub_02071598(param0); v0->unk_18 = param1; v0->unk_1C = FX32_ONE; diff --git a/src/overlay005/ov5_021F2850.c b/src/overlay005/ov5_021F2850.c index c6639b37ea..4b85b30c40 100644 --- a/src/overlay005/ov5_021F2850.c +++ b/src/overlay005/ov5_021F2850.c @@ -1,40 +1,41 @@ +#include "overlay005/ov5_021F2850.h" + #include #include -#include "sys_task_manager.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_0201E190.h" #include "map_object.h" #include "map_object_move.h" +#include "sys_task_manager.h" +#include "unk_0201E190.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F2850.h" typedef struct { int unk_00; int unk_04; int unk_08; - SysTask * unk_0C; - UnkStruct_ov5_021DF47C * unk_10; + SysTask *unk_0C; + UnkStruct_ov5_021DF47C *unk_10; UnkStruct_02073838 unk_14; UnkStruct_02073B50 unk_28; } UnkStruct_ov5_021F2874; typedef struct { int unk_00; - UnkStruct_ov5_021DF47C * unk_04; - FieldSystem * fieldSystem; - UnkStruct_ov5_021F2874 * unk_0C; - MapObject * unk_10; + UnkStruct_ov5_021DF47C *unk_04; + FieldSystem *fieldSystem; + UnkStruct_ov5_021F2874 *unk_0C; + MapObject *unk_10; } UnkStruct_ov5_021F28F4; typedef struct { @@ -45,18 +46,18 @@ typedef struct { UnkStruct_ov5_021F28F4 unk_10; } UnkStruct_ov5_021F2974; -static void ov5_021F2874(UnkStruct_ov5_021F2874 * param0); -static void ov5_021F287C(UnkStruct_ov5_021F2874 * param0); -static void ov5_021F288C(UnkStruct_ov5_021F2874 * param0); -static void ov5_021F28C0(UnkStruct_ov5_021F2874 * param0); -static void ov5_021F28D4(UnkStruct_ov5_021F2874 * param0); -static void ov5_021F28E4(UnkStruct_ov5_021F2874 * param0); +static void ov5_021F2874(UnkStruct_ov5_021F2874 *param0); +static void ov5_021F287C(UnkStruct_ov5_021F2874 *param0); +static void ov5_021F288C(UnkStruct_ov5_021F2874 *param0); +static void ov5_021F28C0(UnkStruct_ov5_021F2874 *param0); +static void ov5_021F28D4(UnkStruct_ov5_021F2874 *param0); +static void ov5_021F28E4(UnkStruct_ov5_021F2874 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_022004B0; -void * ov5_021F2850 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F2850(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F2874 * v0; + UnkStruct_ov5_021F2874 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F2874)), 0, 0); v0->unk_10 = param0; @@ -64,27 +65,27 @@ void * ov5_021F2850 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F2864 (void * param0) +void ov5_021F2864(void *param0) { - UnkStruct_ov5_021F2874 * v0 = param0; + UnkStruct_ov5_021F2874 *v0 = param0; ov5_021F28C0(v0); ov5_021DF554(v0); } -static void ov5_021F2874 (UnkStruct_ov5_021F2874 * param0) +static void ov5_021F2874(UnkStruct_ov5_021F2874 *param0) { param0->unk_00++; } -static void ov5_021F287C (UnkStruct_ov5_021F2874 * param0) +static void ov5_021F287C(UnkStruct_ov5_021F2874 *param0) { param0->unk_00--; GF_ASSERT(param0->unk_00 >= 0); } -static void ov5_021F288C (UnkStruct_ov5_021F2874 * param0) +static void ov5_021F288C(UnkStruct_ov5_021F2874 *param0) { if (param0->unk_04 == 0) { ov5_021DFB00(param0->unk_10, ¶m0->unk_14, 0, 82, 1); @@ -93,7 +94,7 @@ static void ov5_021F288C (UnkStruct_ov5_021F2874 * param0) } } -static void ov5_021F28C0 (UnkStruct_ov5_021F2874 * param0) +static void ov5_021F28C0(UnkStruct_ov5_021F2874 *param0) { if (param0->unk_04 == 1) { param0->unk_04 = 0; @@ -101,27 +102,27 @@ static void ov5_021F28C0 (UnkStruct_ov5_021F2874 * param0) } } -static void ov5_021F28D4 (UnkStruct_ov5_021F2874 * param0) +static void ov5_021F28D4(UnkStruct_ov5_021F2874 *param0) { if (param0->unk_00 == 0) { ov5_021F288C(param0); } } -static void ov5_021F28E4 (UnkStruct_ov5_021F2874 * param0) +static void ov5_021F28E4(UnkStruct_ov5_021F2874 *param0) { if (param0->unk_00 == 0) { ov5_021F28C0(param0); } } -UnkStruct_ov101_021D5D90 * ov5_021F28F4 (MapObject * param0, int param1, int param2, int param3, int param4) +UnkStruct_ov101_021D5D90 *ov5_021F28F4(MapObject *param0, int param1, int param2, int param3, int param4) { int v0; - UnkStruct_ov101_021D5D90 * v1; + UnkStruct_ov101_021D5D90 *v1; UnkStruct_ov5_021F28F4 v2; - VecFx32 v3 = {0, 0, 0}; - UnkStruct_ov5_021DF47C * v4 = ov5_021DF578(param0); + VecFx32 v3 = { 0, 0, 0 }; + UnkStruct_ov5_021DF47C *v4 = ov5_021DF578(param0); v2.unk_00 = param3; v2.unk_04 = v4; @@ -130,8 +131,8 @@ UnkStruct_ov101_021D5D90 * ov5_021F28F4 (MapObject * param0, int param1, int par v2.unk_10 = param0; if (param4 == 0) { - v3.x = (((param1) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)); - v3.z = (((param2) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)); + v3.x = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + v3.z = (((param2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); sub_020644A4(v2.fieldSystem, &v3); } else { MapObject_PosVectorOut(param0, &v3); @@ -143,16 +144,16 @@ UnkStruct_ov101_021D5D90 * ov5_021F28F4 (MapObject * param0, int param1, int par return v1; } -void ov5_021F2974 (UnkStruct_ov101_021D5D90 * param0, int param1) +void ov5_021F2974(UnkStruct_ov101_021D5D90 *param0, int param1) { - UnkStruct_ov5_021F2974 * v0 = sub_02071598(param0); + UnkStruct_ov5_021F2974 *v0 = sub_02071598(param0); v0->unk_0C = param1; } -static int ov5_021F2980 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F2980(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2974 * v0 = param1; - const UnkStruct_ov5_021F28F4 * v1 = sub_020715BC(param0); + UnkStruct_ov5_021F2974 *v0 = param1; + const UnkStruct_ov5_021F28F4 *v1 = sub_020715BC(param0); v0->unk_10 = *v1; v0->unk_04 = v1->unk_00; @@ -164,25 +165,25 @@ static int ov5_021F2980 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F29BC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F29BC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2974 * v0 = param1; + UnkStruct_ov5_021F2974 *v0 = param1; ov5_021F287C(v0->unk_10.unk_0C); ov5_021F28E4(v0->unk_10.unk_0C); } -static void ov5_021F29D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F29D0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2974 * v0 = param1; - MapObject * v1 = v0->unk_10.unk_10; + UnkStruct_ov5_021F2974 *v0 = param1; + MapObject *v1 = v0->unk_10.unk_10; if (v0->unk_0C == 0) { return; } { - VecFx32 v2 = {0, 0, 0}; + VecFx32 v2 = { 0, 0, 0 }; sub_020630AC(v1, &v2); } @@ -195,9 +196,9 @@ static void ov5_021F29D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F2A04 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2A04(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2974 * v0; + UnkStruct_ov5_021F2974 *v0; v0 = param1; @@ -212,8 +213,8 @@ static void ov5_021F2A04 (UnkStruct_ov101_021D5D90 * param0, void * param1) { u32 v1 = 0; MtxFx33 v2; - VecFx32 v3, v4 = {FX32_ONE, FX32_ONE, FX32_ONE}; - UnkStruct_02073B50 * v5 = &v0->unk_10.unk_0C->unk_28; + VecFx32 v3, v4 = { FX32_ONE, FX32_ONE, FX32_ONE }; + UnkStruct_02073B50 *v5 = &v0->unk_10.unk_0C->unk_28; switch (v0->unk_04) { case 0: diff --git a/src/overlay005/ov5_021F2A7C.c b/src/overlay005/ov5_021F2A7C.c index c8782bb145..e5145476a1 100644 --- a/src/overlay005/ov5_021F2A7C.c +++ b/src/overlay005/ov5_021F2A7C.c @@ -1,31 +1,32 @@ +#include "overlay005/ov5_021F2A7C.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "map_object.h" #include "map_object_move.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F2A7C.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073974 unk_18; } UnkStruct_ov5_021F2AA8; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_ov5_021F2AA8 * unk_04; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_ov5_021F2AA8 *unk_04; } UnkStruct_ov5_021F2AE4; typedef struct { @@ -34,14 +35,14 @@ typedef struct { UnkStruct_ov5_021F2AE4 unk_78; } UnkStruct_ov5_021F2B48; -static void ov5_021F2AA8(UnkStruct_ov5_021F2AA8 * param0); -static void ov5_021F2AD0(UnkStruct_ov5_021F2AA8 * param0); +static void ov5_021F2AA8(UnkStruct_ov5_021F2AA8 *param0); +static void ov5_021F2AD0(UnkStruct_ov5_021F2AA8 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_022004C4; -void * ov5_021F2A7C (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F2A7C(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F2AA8 * v0; + UnkStruct_ov5_021F2AA8 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F2AA8)), 0, 0); v0->unk_00 = param0; @@ -50,27 +51,27 @@ void * ov5_021F2A7C (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F2A98 (void * param0) +void ov5_021F2A98(void *param0) { - UnkStruct_ov5_021F2AA8 * v0 = param0; + UnkStruct_ov5_021F2AA8 *v0 = param0; ov5_021F2AD0(v0); ov5_021DF554(v0); } -static void ov5_021F2AA8 (UnkStruct_ov5_021F2AA8 * param0) +static void ov5_021F2AA8(UnkStruct_ov5_021F2AA8 *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 15, 0); ov5_021DFB24(param0->unk_00, ¶m0->unk_18, 0, 160, 0); } -static void ov5_021F2AD0 (UnkStruct_ov5_021F2AA8 * param0) +static void ov5_021F2AD0(UnkStruct_ov5_021F2AA8 *param0) { sub_0207395C(¶m0->unk_04); sub_02073AA8(¶m0->unk_18); } -void ov5_021F2AE4 (MapObject * param0, int param1, int param2, int param3) +void ov5_021F2AE4(MapObject *param0, int param1, int param2, int param3) { int v0, v1; UnkStruct_ov5_021F2AE4 v2; @@ -90,10 +91,10 @@ void ov5_021F2AE4 (MapObject * param0, int param1, int param2, int param3) ov5_021DF72C(v2.unk_00, &Unk_ov5_022004C4, &v3, v1, &v2, v0); } -static int ov5_021F2B48 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F2B48(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2B48 * v0 = param1; - const UnkStruct_ov5_021F2AE4 * v1 = sub_020715BC(param0); + UnkStruct_ov5_021F2B48 *v0 = param1; + const UnkStruct_ov5_021F2AE4 *v1 = sub_020715BC(param0); v0->unk_78 = *v1; @@ -103,16 +104,16 @@ static int ov5_021F2B48 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F2B80 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2B80(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2B48 * v0 = param1; + UnkStruct_ov5_021F2B48 *v0 = param1; sub_02073AA8(&v0->unk_00); } -static void ov5_021F2B8C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2B8C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2B48 * v0 = param1; + UnkStruct_ov5_021F2B48 *v0 = param1; if (sub_02073B40(&v0->unk_00) == 1) { ov5_021DF74C(param0); @@ -122,10 +123,10 @@ static void ov5_021F2B8C (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02073AC0(&v0->unk_00, FX32_ONE, 0); } -static void ov5_021F2BB4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2BB4(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F2B48 * v1 = param1; + UnkStruct_ov5_021F2B48 *v1 = param1; sub_020715E4(param0, &v0); sub_02073BB4(&v1->unk_24, &v0); diff --git a/src/overlay005/ov5_021F2BD0.c b/src/overlay005/ov5_021F2BD0.c index c7ed145d6c..3b33b057c8 100644 --- a/src/overlay005/ov5_021F2BD0.c +++ b/src/overlay005/ov5_021F2BD0.c @@ -1,31 +1,32 @@ +#include "overlay005/ov5_021F2BD0.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "map_object.h" #include "map_object_move.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F2BD0.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073974 unk_18; } UnkStruct_ov5_021F2BFC; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_ov5_021F2BFC * unk_04; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_ov5_021F2BFC *unk_04; } UnkStruct_ov5_021F2C38; typedef struct { @@ -34,14 +35,14 @@ typedef struct { UnkStruct_ov5_021F2C38 unk_78; } UnkStruct_ov5_021F2C98; -static void ov5_021F2BFC(UnkStruct_ov5_021F2BFC * param0); -static void ov5_021F2C24(UnkStruct_ov5_021F2BFC * param0); +static void ov5_021F2BFC(UnkStruct_ov5_021F2BFC *param0); +static void ov5_021F2C24(UnkStruct_ov5_021F2BFC *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_022004D8; -void * ov5_021F2BD0 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F2BD0(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F2BFC * v0; + UnkStruct_ov5_021F2BFC *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F2BFC)), 0, 0); v0->unk_00 = param0; @@ -50,27 +51,27 @@ void * ov5_021F2BD0 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F2BEC (void * param0) +void ov5_021F2BEC(void *param0) { - UnkStruct_ov5_021F2BFC * v0 = param0; + UnkStruct_ov5_021F2BFC *v0 = param0; ov5_021F2C24(v0); ov5_021DF554(v0); } -static void ov5_021F2BFC (UnkStruct_ov5_021F2BFC * param0) +static void ov5_021F2BFC(UnkStruct_ov5_021F2BFC *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 16, 0); ov5_021DFB24(param0->unk_00, ¶m0->unk_18, 0, 161, 0); } -static void ov5_021F2C24 (UnkStruct_ov5_021F2BFC * param0) +static void ov5_021F2C24(UnkStruct_ov5_021F2BFC *param0) { sub_0207395C(¶m0->unk_04); sub_02073AA8(¶m0->unk_18); } -void ov5_021F2C38 (MapObject * param0, int param1, int param2, int param3) +void ov5_021F2C38(MapObject *param0, int param1, int param2, int param3) { int v0, v1; UnkStruct_ov5_021F2C38 v2; @@ -90,10 +91,10 @@ void ov5_021F2C38 (MapObject * param0, int param1, int param2, int param3) ov5_021DF72C(v2.unk_00, &Unk_ov5_022004D8, &v3, v1, &v2, v0); } -static int ov5_021F2C98 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F2C98(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2C98 * v0 = param1; - const UnkStruct_ov5_021F2C38 * v1 = sub_020715BC(param0); + UnkStruct_ov5_021F2C98 *v0 = param1; + const UnkStruct_ov5_021F2C38 *v1 = sub_020715BC(param0); v0->unk_78 = *v1; @@ -103,15 +104,15 @@ static int ov5_021F2C98 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F2CD0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2CD0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2C98 * v0 = param1; + UnkStruct_ov5_021F2C98 *v0 = param1; sub_02073AA8(&v0->unk_00); } -static void ov5_021F2CDC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2CDC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F2C98 * v0 = param1; + UnkStruct_ov5_021F2C98 *v0 = param1; if (sub_02073B40(&v0->unk_00) == 1) { ov5_021DF74C(param0); @@ -121,10 +122,10 @@ static void ov5_021F2CDC (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02073AC0(&v0->unk_00, FX32_ONE, 0); } -static void ov5_021F2D04 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2D04(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F2C98 * v1 = param1; + UnkStruct_ov5_021F2C98 *v1 = param1; sub_020715E4(param0, &v0); sub_02073BB4(&v1->unk_24, &v0); diff --git a/src/overlay005/ov5_021F2D20.c b/src/overlay005/ov5_021F2D20.c index 7d1ac4a60e..3e5c5c160d 100644 --- a/src/overlay005/ov5_021F2D20.c +++ b/src/overlay005/ov5_021F2D20.c @@ -1,34 +1,35 @@ +#include "overlay005/ov5_021F2D20.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_020217F4.h" + #include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_02020AEC.h" #include "map_object.h" #include "map_object_move.h" +#include "unk_02020AEC.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F2D20.h" typedef struct UnkStruct_ov5_021F2D20_t { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; } UnkStruct_ov5_021F2D20; typedef struct { int unk_00; int unk_04; int unk_08; - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_10; - UnkStruct_ov5_021F2D20 * unk_14; - MapObject * unk_18; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_10; + UnkStruct_ov5_021F2D20 *unk_14; + MapObject *unk_18; } UnkStruct_021F2EA4; typedef struct { @@ -39,30 +40,30 @@ typedef struct { int unk_10; int unk_14; UnkStruct_021F2EA4 unk_18; - UnkStruct_020216E0 * unk_34; + UnkStruct_020216E0 *unk_34; } UnkStruct_021F2FA0; typedef struct { int unk_00; int unk_04; - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_0C; - UnkStruct_ov5_021F2D20 * unk_10; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_0C; + UnkStruct_ov5_021F2D20 *unk_10; } UnkStruct_021F30C4; typedef struct { int unk_00; int unk_04; UnkStruct_021F30C4 unk_08; - UnkStruct_020216E0 * unk_1C; + UnkStruct_020216E0 *unk_1C; } UnkStruct_021F30FC; typedef struct { int unk_00; int unk_04; - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_0C; - UnkStruct_ov5_021F2D20 * unk_10; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_0C; + UnkStruct_ov5_021F2D20 *unk_10; } UnkStruct_021F3154; typedef struct { @@ -71,13 +72,13 @@ typedef struct { int unk_08; int unk_0C; UnkStruct_021F3154 unk_10; - UnkStruct_020216E0 * unk_24; + UnkStruct_020216E0 *unk_24; } UnkStruct_021F31A8; void include_unk_ov5_02200500(void); -static void ov5_021F2D4C(UnkStruct_ov5_021F2D20 * param0); -static void ov5_021F2E2C(UnkStruct_ov5_021F2D20 * param0); +static void ov5_021F2D4C(UnkStruct_ov5_021F2D20 *param0); +static void ov5_021F2E2C(UnkStruct_ov5_021F2D20 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_022004EC; const UnkStruct_020217F4 Unk_ov5_02200540[]; @@ -85,9 +86,9 @@ const UnkStruct_020217F4 Unk_ov5_02200558[]; const UnkStruct_020217F4 Unk_ov5_02200528[]; const UnkStruct_020217F4 Unk_ov5_02200570[]; -void * ov5_021F2D20 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F2D20(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F2D20 * v0; + UnkStruct_ov5_021F2D20 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F2D20)), 0, 0); v0->unk_00 = param0; @@ -96,15 +97,15 @@ void * ov5_021F2D20 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F2D3C (void * param0) +void ov5_021F2D3C(void *param0) { - UnkStruct_ov5_021F2D20 * v0 = param0; + UnkStruct_ov5_021F2D20 *v0 = param0; ov5_021F2E2C(v0); ov5_021DF554(v0); } -static void ov5_021F2D4C (UnkStruct_ov5_021F2D20 * param0) +static void ov5_021F2D4C(UnkStruct_ov5_021F2D20 *param0) { ov5_021DF9E0(param0->unk_00, 0, 83); ov5_021DF9E0(param0->unk_00, 5, 84); @@ -125,7 +126,7 @@ static void ov5_021F2D4C (UnkStruct_ov5_021F2D20 * param0) ov5_021DF864(param0->unk_00, 7, 5, 5, 6, 0, Unk_ov5_02200570); } -static void ov5_021F2E2C (UnkStruct_ov5_021F2D20 * param0) +static void ov5_021F2E2C(UnkStruct_ov5_021F2D20 *param0) { ov5_021DFA08(param0->unk_00, 0); ov5_021DFA08(param0->unk_00, 5); @@ -147,13 +148,13 @@ static void ov5_021F2E2C (UnkStruct_ov5_021F2D20 * param0) ov5_021DF9D4(param0->unk_00, 7); } -void ov5_021F2EA4 (MapObject * param0, int param1) +void ov5_021F2EA4(MapObject *param0, int param1) { int v0; VecFx32 v1; UnkStruct_021F2EA4 v2; - UnkStruct_ov5_021DF47C * v3; - UnkStruct_ov101_021D5D90 * v4; + UnkStruct_ov5_021DF47C *v3; + UnkStruct_ov101_021D5D90 *v4; v3 = ov5_021DF578(param0); @@ -171,12 +172,12 @@ void ov5_021F2EA4 (MapObject * param0, int param1) v4 = ov5_021DF72C(v3, &Unk_ov5_022004EC, &v1, param1, &v2, v0); } -static int ov5_021F2F0C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F2F0C(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0, v1; VecFx32 v2; - UnkStruct_021F2FA0 * v3; - const UnkStruct_021F2EA4 * v4; + UnkStruct_021F2FA0 *v3; + const UnkStruct_021F2EA4 *v4; v3 = param1; v4 = sub_020715BC(param0); @@ -191,8 +192,8 @@ static int ov5_021F2F0C (UnkStruct_ov101_021D5D90 * param0, void * param1) v2.y = sub_02063074(v3->unk_18.unk_18); v3->unk_14 = sub_020644A4(v3->unk_18.fieldSystem, &v2); - v2.x += ((((16 * FX32_ONE) >> 1))); - v2.z += ((((16 * FX32_ONE) >> 1)) + (FX32_ONE * 6) + (FX32_ONE * 4)); + v2.x += ((16 * FX32_ONE) >> 1); + v2.z += (((16 * FX32_ONE) >> 1) + (FX32_ONE * 6) + (FX32_ONE * 4)); sub_020715D4(param0, &v2); @@ -205,19 +206,19 @@ static int ov5_021F2F0C (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F2FA0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2FA0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F2FA0 * v0; + UnkStruct_021F2FA0 *v0; v0 = param1; sub_020211FC(v0->unk_34); } -static void ov5_021F2FAC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F2FAC(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_021F2FA0 * v1; - MapObject * v2; + UnkStruct_021F2FA0 *v1; + MapObject *v2; v1 = param1; v2 = v1->unk_18.unk_18; @@ -277,11 +278,11 @@ static void ov5_021F2FAC (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F308C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F308C(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_021F2FA0 * v1; - MapObject * v2; + UnkStruct_021F2FA0 *v1; + MapObject *v2; v1 = param1; v2 = v1->unk_18.unk_18; @@ -304,22 +305,22 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_022004EC = { }; static const UnkStruct_020217F4 Unk_ov5_02200540[] = { - {0x0, 0xC, 0x0}, - {0x0, 0x0, 0x2} + { 0x0, 0xC, 0x0 }, + { 0x0, 0x0, 0x2 } }; static const UnkStruct_ov101_021D86B0 Unk_ov5_02200500; -void include_unk_ov5_02200500 (void) +void include_unk_ov5_02200500(void) { int dummy = Unk_ov5_02200500.unk_00; } -static int ov5_021F30C4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F30C4(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_021F30FC * v1; - const UnkStruct_021F30C4 * v2; + UnkStruct_021F30FC *v1; + const UnkStruct_021F30C4 *v2; v1 = param1; v2 = sub_020715BC(param0); @@ -331,18 +332,18 @@ static int ov5_021F30C4 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F30FC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F30FC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F30FC * v0; + UnkStruct_021F30FC *v0; v0 = param1; sub_020211FC(v0->unk_1C); } -static void ov5_021F3108 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3108(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_021F30FC * v1; + UnkStruct_021F30FC *v1; v1 = param1; @@ -361,10 +362,10 @@ static void ov5_021F3108 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F313C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F313C(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_021F30FC * v1; + UnkStruct_021F30FC *v1; v1 = param1; sub_020715E4(param0, &v0); @@ -382,26 +383,26 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200500 = { static const UnkStruct_ov101_021D86B0 Unk_ov5_02200514; static const UnkStruct_020217F4 Unk_ov5_02200558[] = { - {0x0, 0x28, 0x1}, - {0x0, 0x0, 0x2} + { 0x0, 0x28, 0x1 }, + { 0x0, 0x0, 0x2 } }; static const UnkStruct_020217F4 Unk_ov5_02200528[] = { - {0x0, 0x18, 0x1}, - {0x0, 0x0, 0x2} + { 0x0, 0x18, 0x1 }, + { 0x0, 0x0, 0x2 } }; static const UnkStruct_020217F4 Unk_ov5_02200570[] = { - {0x0, 0x28, 0x1}, - {0x0, 0x0, 0x2} + { 0x0, 0x28, 0x1 }, + { 0x0, 0x0, 0x2 } }; -UnkStruct_ov101_021D5D90 * ov5_021F3154 (FieldSystem * fieldSystem, int param1, int param2, int param3) +UnkStruct_ov101_021D5D90 *ov5_021F3154(FieldSystem *fieldSystem, int param1, int param2, int param3) { VecFx32 v0; UnkStruct_021F3154 v1; - UnkStruct_ov5_021DF47C * v2; - UnkStruct_ov101_021D5D90 * v3; + UnkStruct_ov5_021DF47C *v2; + UnkStruct_ov101_021D5D90 *v3; v2 = fieldSystem->unk_40; @@ -411,36 +412,36 @@ UnkStruct_ov101_021D5D90 * ov5_021F3154 (FieldSystem * fieldSystem, int param1, v1.fieldSystem = fieldSystem; v1.unk_10 = ov5_021DF55C(v2, 19); - v0.x = (((param1) << 4) * FX32_ONE) + ((((16 * FX32_ONE) >> 1))); + v0.x = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); v0.y = 0; - v0.z = (((param2) << 4) * FX32_ONE) + (((((16 * FX32_ONE) >> 1)) + (FX32_ONE * 6) + (FX32_ONE * 4)) / 2); + v0.z = (((param2) << 4) * FX32_ONE) + ((((16 * FX32_ONE) >> 1) + (FX32_ONE * 6) + (FX32_ONE * 4)) / 2); v3 = ov5_021DF72C(v2, &Unk_ov5_02200514, &v0, param3, &v1, 0xff); return v3; } -int ov5_021F31A8 (UnkStruct_ov101_021D5D90 * param0) +int ov5_021F31A8(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_021F31A8 * v0; + UnkStruct_021F31A8 *v0; v0 = sub_02071598(param0); return v0->unk_04; } -static int ov5_021F31B4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F31B4(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; VecFx32 v1; - UnkStruct_021F31A8 * v2; - const UnkStruct_021F3154 * v3; + UnkStruct_021F31A8 *v2; + const UnkStruct_021F3154 *v3; v2 = param1; v3 = sub_020715BC(param0); v2->unk_10 = *v3; v2->unk_0C = sub_020715B4(param0); - v1.x = (((v2->unk_10.unk_00) << 4) * FX32_ONE) + ((((16 * FX32_ONE) >> 1))); - v1.z = (((v2->unk_10.unk_04) << 4) * FX32_ONE) + (((((16 * FX32_ONE) >> 1)) + (FX32_ONE * 6) + (FX32_ONE * 4)) / 2); + v1.x = (((v2->unk_10.unk_00) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + v1.z = (((v2->unk_10.unk_04) << 4) * FX32_ONE) + ((((16 * FX32_ONE) >> 1) + (FX32_ONE * 6) + (FX32_ONE * 4)) / 2); v1.y = 0; sub_020644A4(v2->unk_10.fieldSystem, &v1); @@ -464,18 +465,18 @@ static int ov5_021F31B4 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F3238 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3238(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F31A8 * v0; + UnkStruct_021F31A8 *v0; v0 = param1; sub_020211FC(v0->unk_24); } -static void ov5_021F3244 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3244(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_021F31A8 * v1; + UnkStruct_021F31A8 *v1; v1 = param1; @@ -491,10 +492,10 @@ static void ov5_021F3244 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F326C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F326C(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_021F31A8 * v1; + UnkStruct_021F31A8 *v1; v1 = param1; diff --git a/src/overlay005/ov5_021F3284.c b/src/overlay005/ov5_021F3284.c index ea5f83e680..da63ca222c 100644 --- a/src/overlay005/ov5_021F3284.c +++ b/src/overlay005/ov5_021F3284.c @@ -1,30 +1,31 @@ +#include "overlay005/ov5_021F3284.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_020217F4.h" + #include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_02020AEC.h" #include "map_object.h" +#include "unk_02020AEC.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F3284.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; } UnkStruct_ov5_021F32B0; typedef struct { - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_ov5_021F32B0 * unk_08; - MapObject * unk_0C; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_ov5_021F32B0 *unk_08; + MapObject *unk_0C; } UnkStruct_ov5_021F331C; typedef struct { @@ -34,18 +35,18 @@ typedef struct { int unk_0C; int unk_10; UnkStruct_ov5_021F331C unk_14; - UnkStruct_020216E0 * unk_24; + UnkStruct_020216E0 *unk_24; } UnkStruct_ov5_021F336C; -static void ov5_021F32B0(UnkStruct_ov5_021F32B0 * param0); -static void ov5_021F32F4(UnkStruct_ov5_021F32B0 * param0); +static void ov5_021F32B0(UnkStruct_ov5_021F32B0 *param0); +static void ov5_021F32F4(UnkStruct_ov5_021F32B0 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200588; const UnkStruct_020217F4 Unk_ov5_0220059C[]; -void * ov5_021F3284 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F3284(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F32B0 * v0; + UnkStruct_ov5_021F32B0 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F32B0)), 0, 0); v0->unk_00 = param0; @@ -54,15 +55,15 @@ void * ov5_021F3284 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F32A0 (void * param0) +void ov5_021F32A0(void *param0) { - UnkStruct_ov5_021F32B0 * v0 = param0; + UnkStruct_ov5_021F32B0 *v0 = param0; ov5_021F32F4(v0); ov5_021DF554(v0); } -static void ov5_021F32B0 (UnkStruct_ov5_021F32B0 * param0) +static void ov5_021F32B0(UnkStruct_ov5_021F32B0 *param0) { ov5_021DF9E0(param0->unk_00, 3, 86); ov5_021DFA14(param0->unk_00, 2, 174); @@ -70,7 +71,7 @@ static void ov5_021F32B0 (UnkStruct_ov5_021F32B0 * param0) ov5_021DF864(param0->unk_00, 3, 3, 2, 2, 0, Unk_ov5_0220059C); } -static void ov5_021F32F4 (UnkStruct_ov5_021F32B0 * param0) +static void ov5_021F32F4(UnkStruct_ov5_021F32B0 *param0) { ov5_021DFA08(param0->unk_00, 3); ov5_021DFA30(param0->unk_00, 2); @@ -78,11 +79,11 @@ static void ov5_021F32F4 (UnkStruct_ov5_021F32B0 * param0) ov5_021DF9D4(param0->unk_00, 3); } -void ov5_021F331C (MapObject * param0, int param1) +void ov5_021F331C(MapObject *param0, int param1) { UnkStruct_ov5_021F331C v0; - UnkStruct_ov5_021DF47C * v1; - UnkStruct_ov101_021D5D90 * v2; + UnkStruct_ov5_021DF47C *v1; + UnkStruct_ov101_021D5D90 *v2; v1 = ov5_021DF578(param0); @@ -92,18 +93,18 @@ void ov5_021F331C (MapObject * param0, int param1) v0.unk_0C = param0; { - VecFx32 v3 = {0, 0, 0}; + VecFx32 v3 = { 0, 0, 0 }; int v4 = sub_02062758(param0, 2); v2 = ov5_021DF72C(v1, &Unk_ov5_02200588, &v3, param1, &v0, v4); } } -static int ov5_021F336C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F336C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - VecFx32 v0 = {0, 0, 0}; - UnkStruct_ov5_021F336C * v1; - const UnkStruct_ov5_021F331C * v2; + VecFx32 v0 = { 0, 0, 0 }; + UnkStruct_ov5_021F336C *v1; + const UnkStruct_ov5_021F331C *v2; v1 = param1; v2 = sub_020715BC(param0); @@ -119,19 +120,19 @@ static int ov5_021F336C (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F33C4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F33C4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F336C * v0; + UnkStruct_ov5_021F336C *v0; v0 = param1; sub_020211FC(v0->unk_24); } -static void ov5_021F33D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F33D0(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0, v1; - UnkStruct_ov5_021F336C * v2; - MapObject * v3; + UnkStruct_ov5_021F336C *v2; + MapObject *v3; v2 = param1; v3 = v2->unk_14.unk_0C; @@ -167,11 +168,11 @@ static void ov5_021F33D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F3448 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3448(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F336C * v1; - MapObject * v2; + UnkStruct_ov5_021F336C *v1; + MapObject *v2; v1 = param1; v2 = v1->unk_14.unk_0C; @@ -196,6 +197,6 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200588 = { }; static const UnkStruct_020217F4 Unk_ov5_0220059C[] = { - {0x0, 0xC, 0x1}, - {0x0, 0x0, 0x2} + { 0x0, 0xC, 0x1 }, + { 0x0, 0x0, 0x2 } }; diff --git a/src/overlay005/ov5_021F348C.c b/src/overlay005/ov5_021F348C.c index 3fa364276f..c081135079 100644 --- a/src/overlay005/ov5_021F348C.c +++ b/src/overlay005/ov5_021F348C.c @@ -1,32 +1,33 @@ +#include "overlay005/ov5_021F348C.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_020217F4.h" + #include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_02020AEC.h" #include "map_object.h" #include "map_object_move.h" +#include "unk_02020AEC.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F348C.h" typedef struct { u32 unk_00; - UnkStruct_ov5_021DF47C * unk_04; + UnkStruct_ov5_021DF47C *unk_04; } UnkStruct_ov5_021F34D0; typedef struct { - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_ov5_021F34D0 * unk_08; - MapObject * unk_0C; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_ov5_021F34D0 *unk_08; + MapObject *unk_0C; } UnkStruct_ov5_021F35E8; typedef struct { @@ -35,19 +36,19 @@ typedef struct { int unk_08; int unk_0C; UnkStruct_ov5_021F35E8 unk_10; - UnkStruct_020216E0 * unk_20; + UnkStruct_020216E0 *unk_20; } UnkStruct_ov5_021F36F4; -static void ov5_021F34D0(UnkStruct_ov5_021F34D0 * param0); -static void ov5_021F3518(UnkStruct_ov5_021F34D0 * param0); -static void ov5_021F358C(UnkStruct_ov5_021F34D0 * param0); +static void ov5_021F34D0(UnkStruct_ov5_021F34D0 *param0); +static void ov5_021F3518(UnkStruct_ov5_021F34D0 *param0); +static void ov5_021F358C(UnkStruct_ov5_021F34D0 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_022005C4; const UnkStruct_020217F4 Unk_ov5_022005D8[]; -void * ov5_021F348C (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F348C(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F34D0 * v0; + UnkStruct_ov5_021F34D0 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F34D0)), 0, 0); v0->unk_04 = param0; @@ -56,17 +57,17 @@ void * ov5_021F348C (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F34A8 (void * param0) +void ov5_021F34A8(void *param0) { - UnkStruct_ov5_021F34D0 * v0 = param0; + UnkStruct_ov5_021F34D0 *v0 = param0; ov5_021F358C(v0); ov5_021DF554(v0); } -void ov5_021F34B8 (UnkStruct_ov5_021DF47C * param0) +void ov5_021F34B8(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F34D0 * v0; + UnkStruct_ov5_021F34D0 *v0; v0 = ov5_021DF55C(param0, 23); @@ -76,7 +77,7 @@ void ov5_021F34B8 (UnkStruct_ov5_021DF47C * param0) } } -static void ov5_021F34D0 (UnkStruct_ov5_021F34D0 * param0) +static void ov5_021F34D0(UnkStruct_ov5_021F34D0 *param0) { ov5_021DF9E0(param0->unk_04, 6, 88); ov5_021DFA14(param0->unk_04, 6, 175); @@ -84,7 +85,7 @@ static void ov5_021F34D0 (UnkStruct_ov5_021F34D0 * param0) ov5_021DF864(param0->unk_04, 8, 6, 6, 7, 0, Unk_ov5_022005D8); } -static void ov5_021F3518 (UnkStruct_ov5_021F34D0 * param0) +static void ov5_021F3518(UnkStruct_ov5_021F34D0 *param0) { ov5_021DF9E0(param0->unk_04, 12, 159); ov5_021DF9E0(param0->unk_04, 13, 157); @@ -95,7 +96,7 @@ static void ov5_021F3518 (UnkStruct_ov5_021F34D0 * param0) ov5_021DF864(param0->unk_04, 16, 14, 6, 7, 0, Unk_ov5_022005D8); } -static void ov5_021F358C (UnkStruct_ov5_021F34D0 * param0) +static void ov5_021F358C(UnkStruct_ov5_021F34D0 *param0) { ov5_021DFA08(param0->unk_04, 6); ov5_021DFA30(param0->unk_04, 6); @@ -112,7 +113,7 @@ static void ov5_021F358C (UnkStruct_ov5_021F34D0 * param0) } } -static void ov5_021F35E8 (UnkStruct_ov5_021DF47C * param0, MapObject * param1, UnkStruct_ov5_021F35E8 * param2, VecFx32 * param3, int * param4) +static void ov5_021F35E8(UnkStruct_ov5_021DF47C *param0, MapObject *param1, UnkStruct_ov5_021F35E8 *param2, VecFx32 *param3, int *param4) { param2->fieldSystem = MapObject_FieldSystem(param1); param2->unk_04 = param0; @@ -125,48 +126,48 @@ static void ov5_021F35E8 (UnkStruct_ov5_021DF47C * param0, MapObject * param1, U *param4 = sub_02062758(param1, 2); } -void ov5_021F3638 (MapObject * param0) +void ov5_021F3638(MapObject *param0) { int v0; - UnkStruct_ov5_021DF47C * v1; - UnkStruct_ov101_021D5D90 * v2; + UnkStruct_ov5_021DF47C *v1; + UnkStruct_ov101_021D5D90 *v2; VecFx32 v3; UnkStruct_ov5_021F35E8 v4; v1 = ov5_021DF578(param0); ov5_021F35E8(v1, param0, &v4, &v3, &v0); - v3.z += ((FX32_ONE * 8)); + v3.z += (FX32_ONE * 8); v2 = ov5_021DF72C(v1, &Unk_ov5_022005C4, &v3, 0, &v4, v0); } -void ov5_021F3678 (MapObject * param0, int param1) +void ov5_021F3678(MapObject *param0, int param1) { int v0; - UnkStruct_ov5_021DF47C * v1; - UnkStruct_ov101_021D5D90 * v2; + UnkStruct_ov5_021DF47C *v1; + UnkStruct_ov101_021D5D90 *v2; VecFx32 v3; UnkStruct_ov5_021F35E8 v4; VecFx32 v5[4] = { { 0, 0, - (FX32_ONE * 8) + (FX32_ONE * 8), }, { (FX32_ONE * 11), (FX32_ONE * 14), - (FX32_ONE * 17) + (FX32_ONE * 17), }, { (FX32_ONE * -11), (FX32_ONE * 14), - (FX32_ONE * 17) + (FX32_ONE * 17), }, { 0, (FX32_ONE * 32), - (FX32_ONE * 8) - } + (FX32_ONE * 8), + }, }; v1 = ov5_021DF578(param0); @@ -181,12 +182,12 @@ void ov5_021F3678 (MapObject * param0, int param1) v2 = ov5_021DF72C(v1, &Unk_ov5_022005C4, &v3, param1, &v4, v0); } -static int ov5_021F36F4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F36F4(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; VecFx32 v1; - UnkStruct_ov5_021F36F4 * v2; - const UnkStruct_ov5_021F35E8 * v3; + UnkStruct_ov5_021F36F4 *v2; + const UnkStruct_ov5_021F35E8 *v3; v2 = param1; v3 = sub_020715BC(param0); @@ -198,7 +199,7 @@ static int ov5_021F36F4 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_020715E4(param0, &v1); { - u32 v4[4] = {8, 14, 15, 16}; + u32 v4[4] = { 8, 14, 15, 16 }; int v5 = sub_020715B4(param0); v2->unk_20 = ov5_021DF84C(v2->unk_10.unk_04, v4[v5], &v1); @@ -207,19 +208,19 @@ static int ov5_021F36F4 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F3754 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3754(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F36F4 * v0; + UnkStruct_ov5_021F36F4 *v0; v0 = param1; sub_020211FC(v0->unk_20); } -static void ov5_021F3760 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3760(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov5_021F36F4 * v1; - MapObject * v2; + UnkStruct_ov5_021F36F4 *v1; + MapObject *v2; v1 = param1; v2 = v1->unk_10.unk_0C; @@ -237,11 +238,11 @@ static void ov5_021F3760 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F3790 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3790(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0, v1; - UnkStruct_ov5_021F36F4 * v2; - MapObject * v3; + UnkStruct_ov5_021F36F4 *v2; + MapObject *v3; v2 = param1; v3 = v2->unk_10.unk_0C; @@ -259,6 +260,6 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_022005C4 = { }; static const UnkStruct_020217F4 Unk_ov5_022005D8[] = { - {0x0, 0x9, 0x1}, - {0x0, 0x0, 0x2} + { 0x0, 0x9, 0x1 }, + { 0x0, 0x0, 0x2 } }; diff --git a/src/overlay005/ov5_021F37A8.c b/src/overlay005/ov5_021F37A8.c index cd96155d55..2f89362a1d 100644 --- a/src/overlay005/ov5_021F37A8.c +++ b/src/overlay005/ov5_021F37A8.c @@ -1,34 +1,35 @@ +#include "overlay005/ov5_021F37A8.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_020217F4.h" + #include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_02020AEC.h" #include "map_object.h" #include "map_object_move.h" +#include "unk_02020AEC.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F37A8.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; } UnkStruct_ov5_021F37D4; typedef struct { int unk_00; int unk_04; int unk_08; - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_10; - UnkStruct_ov5_021F37D4 * unk_14; - MapObject * unk_18; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_10; + UnkStruct_ov5_021F37D4 *unk_14; + MapObject *unk_18; } UnkStruct_ov5_021F3844; typedef struct { @@ -39,18 +40,18 @@ typedef struct { int unk_10; int unk_14; UnkStruct_ov5_021F3844 unk_18; - UnkStruct_020216E0 * unk_34; + UnkStruct_020216E0 *unk_34; } UnkStruct_ov5_021F38AC; -static void ov5_021F37D4(UnkStruct_ov5_021F37D4 * param0); -static void ov5_021F381C(UnkStruct_ov5_021F37D4 * param0); +static void ov5_021F37D4(UnkStruct_ov5_021F37D4 *param0); +static void ov5_021F381C(UnkStruct_ov5_021F37D4 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200620; const UnkStruct_020217F4 Unk_ov5_02200634[]; -void * ov5_021F37A8 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F37A8(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F37D4 * v0; + UnkStruct_ov5_021F37D4 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F37D4)), 0, 0); v0->unk_00 = param0; @@ -59,15 +60,15 @@ void * ov5_021F37A8 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F37C4 (void * param0) +void ov5_021F37C4(void *param0) { - UnkStruct_ov5_021F37D4 * v0 = param0; + UnkStruct_ov5_021F37D4 *v0 = param0; ov5_021F381C(v0); ov5_021DF554(v0); } -static void ov5_021F37D4 (UnkStruct_ov5_021F37D4 * param0) +static void ov5_021F37D4(UnkStruct_ov5_021F37D4 *param0) { ov5_021DF9E0(param0->unk_00, 7, 89); ov5_021DFA14(param0->unk_00, 7, 176); @@ -75,7 +76,7 @@ static void ov5_021F37D4 (UnkStruct_ov5_021F37D4 * param0) ov5_021DF864(param0->unk_00, 9, 7, 7, 8, 0, Unk_ov5_02200634); } -static void ov5_021F381C (UnkStruct_ov5_021F37D4 * param0) +static void ov5_021F381C(UnkStruct_ov5_021F37D4 *param0) { ov5_021DFA08(param0->unk_00, 7); ov5_021DFA30(param0->unk_00, 7); @@ -83,13 +84,13 @@ static void ov5_021F381C (UnkStruct_ov5_021F37D4 * param0) ov5_021DF9D4(param0->unk_00, 9); } -void ov5_021F3844 (MapObject * param0, int param1) +void ov5_021F3844(MapObject *param0, int param1) { int v0; VecFx32 v1; UnkStruct_ov5_021F3844 v2; - UnkStruct_ov5_021DF47C * v3; - UnkStruct_ov101_021D5D90 * v4; + UnkStruct_ov5_021DF47C *v3; + UnkStruct_ov101_021D5D90 *v4; v3 = ov5_021DF578(param0); @@ -107,12 +108,12 @@ void ov5_021F3844 (MapObject * param0, int param1) v4 = ov5_021DF72C(v3, &Unk_ov5_02200620, &v1, param1, &v2, v0); } -static int ov5_021F38AC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F38AC(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0, v1; VecFx32 v2; - UnkStruct_ov5_021F38AC * v3; - const UnkStruct_ov5_021F3844 * v4; + UnkStruct_ov5_021F38AC *v3; + const UnkStruct_ov5_021F3844 *v4; v3 = param1; v4 = sub_020715BC(param0); @@ -128,8 +129,8 @@ static int ov5_021F38AC (UnkStruct_ov101_021D5D90 * param0, void * param1) v3->unk_14 = sub_020644A4(v3->unk_18.fieldSystem, &v2); - v2.x += ((((16 * FX32_ONE) >> 1))); - v2.z += ((((16 * FX32_ONE) >> 1)) + (FX32_ONE * 6) + (FX32_ONE * 4)); + v2.x += ((16 * FX32_ONE) >> 1); + v2.z += (((16 * FX32_ONE) >> 1) + (FX32_ONE * 6) + (FX32_ONE * 4)); sub_020715D4(param0, &v2); v3->unk_34 = ov5_021DF84C(v3->unk_18.unk_10, 9, &v2); @@ -141,19 +142,19 @@ static int ov5_021F38AC (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F3940 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3940(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F38AC * v0; + UnkStruct_ov5_021F38AC *v0; v0 = param1; sub_020211FC(v0->unk_34); } -static void ov5_021F394C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F394C(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov5_021F38AC * v1; - MapObject * v2; + UnkStruct_ov5_021F38AC *v1; + MapObject *v2; v1 = param1; v2 = v1->unk_18.unk_18; @@ -183,7 +184,7 @@ static void ov5_021F394C (UnkStruct_ov101_021D5D90 * param0, void * param1) switch (v1->unk_00) { case 0: sub_02021368(v1->unk_34, FX32_ONE); - v0 = ((sub_020213D4(v1->unk_34) / FX32_ONE)); + v0 = (sub_020213D4(v1->unk_34) / FX32_ONE); if (v0 >= 12) { v1->unk_00 = 1; @@ -193,8 +194,7 @@ static void ov5_021F394C (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02021380(v1->unk_34, (FX32_ONE * 12)); sub_02021368(v1->unk_34, 0); v1->unk_00 = 2; - case 2: - { + case 2: { int v5 = MapObject_GetXPos(v2); int v6 = MapObject_GetZPos(v2); @@ -202,16 +202,15 @@ static void ov5_021F394C (UnkStruct_ov101_021D5D90 * param0, void * param1) ov5_021DF74C(param0); return; } - } - break; + } break; } } -static void ov5_021F3A18 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3A18(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F38AC * v1; - MapObject * v2; + UnkStruct_ov5_021F38AC *v1; + MapObject *v2; v1 = param1; v2 = v1->unk_18.unk_18; @@ -234,6 +233,6 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200620 = { }; static const UnkStruct_020217F4 Unk_ov5_02200634[] = { - {0x0, 0xC, 0x0}, - {0x0, 0x0, 0x2} + { 0x0, 0xC, 0x0 }, + { 0x0, 0x0, 0x2 } }; diff --git a/src/overlay005/ov5_021F3A50.c b/src/overlay005/ov5_021F3A50.c index 26174fe56b..906c829ca4 100644 --- a/src/overlay005/ov5_021F3A50.c +++ b/src/overlay005/ov5_021F3A50.c @@ -1,34 +1,35 @@ +#include "overlay005/ov5_021F3A50.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_020217F4.h" + #include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_02020AEC.h" #include "map_object.h" #include "map_object_move.h" +#include "unk_02020AEC.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F3A50.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; } UnkStruct_ov5_021F3A7C; typedef struct { int unk_00; int unk_04; int unk_08; - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_10; - UnkStruct_ov5_021F3A7C * unk_14; - MapObject * unk_18; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_10; + UnkStruct_ov5_021F3A7C *unk_14; + MapObject *unk_18; } UnkStruct_ov5_021F3AEC; typedef struct { @@ -39,18 +40,18 @@ typedef struct { int unk_10; int unk_14; UnkStruct_ov5_021F3AEC unk_18; - UnkStruct_020216E0 * unk_34; + UnkStruct_020216E0 *unk_34; } UnkStruct_ov5_021F3B54; -static void ov5_021F3A7C(UnkStruct_ov5_021F3A7C * param0); -static void ov5_021F3AC4(UnkStruct_ov5_021F3A7C * param0); +static void ov5_021F3A7C(UnkStruct_ov5_021F3A7C *param0); +static void ov5_021F3AC4(UnkStruct_ov5_021F3A7C *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_0220064C; const UnkStruct_020217F4 Unk_ov5_02200660[]; -void * ov5_021F3A50 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F3A50(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F3A7C * v0; + UnkStruct_ov5_021F3A7C *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F3A7C)), 0, 0); v0->unk_00 = param0; @@ -59,15 +60,15 @@ void * ov5_021F3A50 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F3A6C (void * param0) +void ov5_021F3A6C(void *param0) { - UnkStruct_ov5_021F3A7C * v0 = param0; + UnkStruct_ov5_021F3A7C *v0 = param0; ov5_021F3AC4(v0); ov5_021DF554(v0); } -static void ov5_021F3A7C (UnkStruct_ov5_021F3A7C * param0) +static void ov5_021F3A7C(UnkStruct_ov5_021F3A7C *param0) { ov5_021DF9E0(param0->unk_00, 8, 90); ov5_021DFA14(param0->unk_00, 8, 177); @@ -75,7 +76,7 @@ static void ov5_021F3A7C (UnkStruct_ov5_021F3A7C * param0) ov5_021DF864(param0->unk_00, 10, 8, 8, 9, 0, Unk_ov5_02200660); } -static void ov5_021F3AC4 (UnkStruct_ov5_021F3A7C * param0) +static void ov5_021F3AC4(UnkStruct_ov5_021F3A7C *param0) { ov5_021DFA08(param0->unk_00, 8); ov5_021DFA30(param0->unk_00, 8); @@ -83,13 +84,13 @@ static void ov5_021F3AC4 (UnkStruct_ov5_021F3A7C * param0) ov5_021DF9D4(param0->unk_00, 10); } -void ov5_021F3AEC (MapObject * param0, int param1) +void ov5_021F3AEC(MapObject *param0, int param1) { int v0; VecFx32 v1; UnkStruct_ov5_021F3AEC v2; - UnkStruct_ov5_021DF47C * v3; - UnkStruct_ov101_021D5D90 * v4; + UnkStruct_ov5_021DF47C *v3; + UnkStruct_ov101_021D5D90 *v4; v3 = ov5_021DF578(param0); @@ -107,12 +108,12 @@ void ov5_021F3AEC (MapObject * param0, int param1) v4 = ov5_021DF72C(v3, &Unk_ov5_0220064C, &v1, param1, &v2, v0); } -static int ov5_021F3B54 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F3B54(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0, v1; VecFx32 v2; - UnkStruct_ov5_021F3B54 * v3; - const UnkStruct_ov5_021F3AEC * v4; + UnkStruct_ov5_021F3B54 *v3; + const UnkStruct_ov5_021F3AEC *v4; v3 = param1; v4 = sub_020715BC(param0); @@ -127,9 +128,9 @@ static int ov5_021F3B54 (UnkStruct_ov101_021D5D90 * param0, void * param1) v2.y = sub_02063074(v3->unk_18.unk_18); v3->unk_14 = sub_020644A4(v3->unk_18.fieldSystem, &v2); - v2.x += ((((16 * FX32_ONE) >> 1)) - (FX32_ONE / 2)); + v2.x += (((16 * FX32_ONE) >> 1) - (FX32_ONE / 2)); v2.y += (-(FX32_ONE * 8)); - v2.z += ((((16 * FX32_ONE) >> 1)) + (FX32_ONE * 6) - (FX32_ONE * 1)); + v2.z += (((16 * FX32_ONE) >> 1) + (FX32_ONE * 6) - (FX32_ONE * 1)); sub_020715D4(param0, &v2); @@ -142,19 +143,19 @@ static int ov5_021F3B54 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F3BF4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3BF4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F3B54 * v0; + UnkStruct_ov5_021F3B54 *v0; v0 = param1; sub_020211FC(v0->unk_34); } -static void ov5_021F3C00 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3C00(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov5_021F3B54 * v1; - MapObject * v2; + UnkStruct_ov5_021F3B54 *v1; + MapObject *v2; v1 = param1; v2 = v1->unk_18.unk_18; @@ -184,7 +185,7 @@ static void ov5_021F3C00 (UnkStruct_ov101_021D5D90 * param0, void * param1) switch (v1->unk_00) { case 0: sub_02021368(v1->unk_34, FX32_ONE); - v0 = ((sub_020213D4(v1->unk_34) / FX32_ONE)); + v0 = (sub_020213D4(v1->unk_34) / FX32_ONE); if (v0 >= 2) { v1->unk_00 = 1; @@ -194,8 +195,7 @@ static void ov5_021F3C00 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02021380(v1->unk_34, (FX32_ONE * 2)); sub_02021368(v1->unk_34, 0); v1->unk_00 = 2; - case 2: - { + case 2: { int v5 = MapObject_GetXPos(v2); int v6 = MapObject_GetZPos(v2); @@ -203,16 +203,15 @@ static void ov5_021F3C00 (UnkStruct_ov101_021D5D90 * param0, void * param1) ov5_021DF74C(param0); return; } - } - break; + } break; } } -static void ov5_021F3CCC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3CCC(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F3B54 * v1; - MapObject * v2; + UnkStruct_ov5_021F3B54 *v1; + MapObject *v2; v1 = param1; v2 = v1->unk_18.unk_18; @@ -235,6 +234,6 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_0220064C = { }; static const UnkStruct_020217F4 Unk_ov5_02200660[] = { - {0x0, 0x2, 0x0}, - {0x0, 0x0, 0x2} + { 0x0, 0x2, 0x0 }, + { 0x0, 0x0, 0x2 } }; diff --git a/src/overlay005/ov5_021F3D00.c b/src/overlay005/ov5_021F3D00.c index c75e9d2c1d..6a815f4b23 100644 --- a/src/overlay005/ov5_021F3D00.c +++ b/src/overlay005/ov5_021F3D00.c @@ -1,13 +1,16 @@ +#include "overlay005/ov5_021F3D00.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "map_object.h" @@ -15,21 +18,19 @@ #include "unk_02069BE0.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F3D00.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04[4]; UnkStruct_02073B50 unk_54[4]; } UnkStruct_ov5_021F3D2C; typedef struct { int unk_00; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_ov5_021F3D2C * unk_08; - MapObject * unk_0C; - UnkStruct_02073B50 * unk_10; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_ov5_021F3D2C *unk_08; + MapObject *unk_0C; + UnkStruct_02073B50 *unk_10; } UnkStruct_ov5_021F3D90; typedef struct { @@ -40,16 +41,16 @@ typedef struct { UnkStruct_ov5_021F3D90 unk_10; } UnkStruct_ov5_021F3E00; -static void ov5_021F3D2C(UnkStruct_ov5_021F3D2C * param0); -static void ov5_021F3D6C(UnkStruct_ov5_021F3D2C * param0); -static UnkStruct_02073B50 * ov5_021F3D84(UnkStruct_ov5_021F3D2C * param0, int param1); +static void ov5_021F3D2C(UnkStruct_ov5_021F3D2C *param0); +static void ov5_021F3D6C(UnkStruct_ov5_021F3D2C *param0); +static UnkStruct_02073B50 *ov5_021F3D84(UnkStruct_ov5_021F3D2C *param0, int param1); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200688; static const u32 Unk_ov5_02200678[4]; -void * ov5_021F3D00 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F3D00(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F3D2C * v0; + UnkStruct_ov5_021F3D2C *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F3D2C)), 0, 0); v0->unk_00 = param0; @@ -58,15 +59,15 @@ void * ov5_021F3D00 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F3D1C (void * param0) +void ov5_021F3D1C(void *param0) { - UnkStruct_ov5_021F3D2C * v0 = param0; + UnkStruct_ov5_021F3D2C *v0 = param0; ov5_021F3D6C(v0); ov5_021DF554(v0); } -static void ov5_021F3D2C (UnkStruct_ov5_021F3D2C * param0) +static void ov5_021F3D2C(UnkStruct_ov5_021F3D2C *param0) { int v0; @@ -76,7 +77,7 @@ static void ov5_021F3D2C (UnkStruct_ov5_021F3D2C * param0) } } -static void ov5_021F3D6C (UnkStruct_ov5_021F3D2C * param0) +static void ov5_021F3D6C(UnkStruct_ov5_021F3D2C *param0) { int v0; @@ -85,22 +86,22 @@ static void ov5_021F3D6C (UnkStruct_ov5_021F3D2C * param0) } } -static UnkStruct_02073B50 * ov5_021F3D84 (UnkStruct_ov5_021F3D2C * param0, int param1) +static UnkStruct_02073B50 *ov5_021F3D84(UnkStruct_ov5_021F3D2C *param0, int param1) { return ¶m0->unk_54[param1]; } -UnkStruct_ov101_021D5D90 * ov5_021F3D90 (MapObject * param0, int param1) +UnkStruct_ov101_021D5D90 *ov5_021F3D90(MapObject *param0, int param1) { VecFx32 v0; - UnkStruct_ov101_021D5D90 * v1; + UnkStruct_ov101_021D5D90 *v1; UnkStruct_ov5_021F3D90 v2; - UnkStruct_ov5_021DF47C * v3; + UnkStruct_ov5_021DF47C *v3; v3 = ov5_021DF578(param0); { - FieldSystem * fieldSystem = ov5_021DF574(v3); + FieldSystem *fieldSystem = ov5_021DF574(v3); int v5 = MapObject_GetXPos(param0); int v6 = MapObject_GetZPos(param0); @@ -124,11 +125,11 @@ UnkStruct_ov101_021D5D90 * ov5_021F3D90 (MapObject * param0, int param1) return v1; } -static int ov5_021F3E00 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F3E00(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F3E00 * v0 = param1; - const UnkStruct_ov5_021F3D90 * v1 = sub_020715BC(param0); - MapObject * v2 = v1->unk_0C; + UnkStruct_ov5_021F3E00 *v0 = param1; + const UnkStruct_ov5_021F3D90 *v1 = sub_020715BC(param0); + MapObject *v2 = v1->unk_0C; v0->unk_10 = *v1; v0->unk_08 = MapObject_Id(v2); @@ -137,24 +138,24 @@ static int ov5_021F3E00 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F3E30 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3E30(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F3E00 * v0 = param1; - MapObject * v1 = v0->unk_10.unk_0C; + UnkStruct_ov5_021F3E00 *v0 = param1; + MapObject *v1 = v0->unk_10.unk_0C; if (sub_02062764(v1, v0->unk_08, v0->unk_0C) == 1) { sub_0206A218(v1, NULL); } } -static void ov5_021F3E50 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3E50(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F3E00 * v0 = param1; + UnkStruct_ov5_021F3E00 *v0 = param1; } -static void ov5_021F3E54 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3E54(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F3E00 * v0 = param1; + UnkStruct_ov5_021F3E00 *v0 = param1; if (v0->unk_04 == 1) { return; diff --git a/src/overlay005/ov5_021F3E74.c b/src/overlay005/ov5_021F3E74.c index 1fe8942a5a..ec40275777 100644 --- a/src/overlay005/ov5_021F3E74.c +++ b/src/overlay005/ov5_021F3E74.c @@ -1,31 +1,32 @@ +#include "overlay005/ov5_021F3E74.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_020217F4.h" + #include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_02020AEC.h" #include "map_object.h" #include "map_object_move.h" +#include "unk_02020AEC.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F3E74.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; } UnkStruct_ov5_021F3EA0; typedef struct { - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_ov5_021F3EA0 * unk_08; - MapObject * unk_0C; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_ov5_021F3EA0 *unk_08; + MapObject *unk_0C; } UnkStruct_ov5_021F3F10; typedef struct { @@ -34,18 +35,18 @@ typedef struct { int unk_08; int unk_0C; UnkStruct_ov5_021F3F10 unk_10; - UnkStruct_020216E0 * unk_20; + UnkStruct_020216E0 *unk_20; } UnkStruct_ov5_021F3FB8; -static void ov5_021F3EA0(UnkStruct_ov5_021F3EA0 * param0); -static void ov5_021F3EE8(UnkStruct_ov5_021F3EA0 * param0); +static void ov5_021F3EA0(UnkStruct_ov5_021F3EA0 *param0); +static void ov5_021F3EE8(UnkStruct_ov5_021F3EA0 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_0220069C; const UnkStruct_020217F4 Unk_ov5_022006B0[]; -void * ov5_021F3E74 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F3E74(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F3EA0 * v0; + UnkStruct_ov5_021F3EA0 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F3EA0)), 0, 0); v0->unk_00 = param0; @@ -54,15 +55,15 @@ void * ov5_021F3E74 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F3E90 (void * param0) +void ov5_021F3E90(void *param0) { - UnkStruct_ov5_021F3EA0 * v0 = param0; + UnkStruct_ov5_021F3EA0 *v0 = param0; ov5_021F3EE8(v0); ov5_021DF554(v0); } -static void ov5_021F3EA0 (UnkStruct_ov5_021F3EA0 * param0) +static void ov5_021F3EA0(UnkStruct_ov5_021F3EA0 *param0) { ov5_021DF9E0(param0->unk_00, 9, 107); ov5_021DFA14(param0->unk_00, 9, 180); @@ -71,7 +72,7 @@ static void ov5_021F3EA0 (UnkStruct_ov5_021F3EA0 * param0) ov5_021DF864(param0->unk_00, 11, 9, 9, 10, 0, Unk_ov5_022006B0); } -static void ov5_021F3EE8 (UnkStruct_ov5_021F3EA0 * param0) +static void ov5_021F3EE8(UnkStruct_ov5_021F3EA0 *param0) { ov5_021DFA08(param0->unk_00, 9); ov5_021DFA30(param0->unk_00, 9); @@ -79,11 +80,11 @@ static void ov5_021F3EE8 (UnkStruct_ov5_021F3EA0 * param0) ov5_021DF9D4(param0->unk_00, 11); } -void ov5_021F3F10 (MapObject * param0) +void ov5_021F3F10(MapObject *param0) { UnkStruct_ov5_021F3F10 v0; - UnkStruct_ov5_021DF47C * v1; - UnkStruct_ov101_021D5D90 * v2; + UnkStruct_ov5_021DF47C *v1; + UnkStruct_ov101_021D5D90 *v2; VecFx32 v3; int v4; @@ -101,11 +102,11 @@ void ov5_021F3F10 (MapObject * param0) v2 = ov5_021DF72C(v1, &Unk_ov5_0220069C, &v3, 0, &v0, v4); } -static int ov5_021F3F74 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F3F74(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F3FB8 * v1; - const UnkStruct_ov5_021F3F10 * v2; + UnkStruct_ov5_021F3FB8 *v1; + const UnkStruct_ov5_021F3F10 *v2; v1 = param1; v2 = sub_020715BC(param0); @@ -121,19 +122,19 @@ static int ov5_021F3F74 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F3FB8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3FB8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F3FB8 * v0; + UnkStruct_ov5_021F3FB8 *v0; v0 = param1; sub_020211FC(v0->unk_20); } -static void ov5_021F3FC4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3FC4(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov5_021F3FB8 * v1; - MapObject * v2; + UnkStruct_ov5_021F3FB8 *v1; + MapObject *v2; v1 = param1; v2 = v1->unk_10.unk_0C; @@ -151,17 +152,17 @@ static void ov5_021F3FC4 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F3FF4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F3FF4(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0, v1; - UnkStruct_ov5_021F3FB8 * v2; - MapObject * v3; + UnkStruct_ov5_021F3FB8 *v2; + MapObject *v3; v2 = param1; v3 = v2->unk_10.unk_0C; sub_020715E4(param0, &v0); - v0.z += ((FX32_ONE * 8)); + v0.z += (FX32_ONE * 8); sub_020212A8(v2->unk_20, &v0); } @@ -174,6 +175,6 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_0220069C = { }; static const UnkStruct_020217F4 Unk_ov5_022006B0[] = { - {0x0, 0x7, 0x1}, - {0x0, 0x0, 0x2} + { 0x0, 0x7, 0x1 }, + { 0x0, 0x0, 0x2 } }; diff --git a/src/overlay005/ov5_021F4018.c b/src/overlay005/ov5_021F4018.c index 2e4d359375..507ad1b66d 100644 --- a/src/overlay005/ov5_021F4018.c +++ b/src/overlay005/ov5_021F4018.c @@ -1,32 +1,33 @@ +#include "overlay005/ov5_021F4018.h" + #include #include -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "map_object_move.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F4018.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073974 unk_18; UnkStruct_02073974 unk_3C; - UnkStruct_ov101_021D5D90 * unk_60[8]; + UnkStruct_ov101_021D5D90 *unk_60[8]; } UnkStruct_021F416C; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_021F416C * unk_04; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_021F416C *unk_04; } UnkStruct_021F41F0; typedef struct { @@ -36,14 +37,14 @@ typedef struct { UnkStruct_021F41F0 unk_7C; } UnkStruct_021F4234; -static void ov5_021F4044(UnkStruct_021F416C * param0); -static void ov5_021F407C(UnkStruct_021F416C * param0); +static void ov5_021F4044(UnkStruct_021F416C *param0); +static void ov5_021F407C(UnkStruct_021F416C *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_022006C8; -void * ov5_021F4018 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F4018(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_021F416C * v0; + UnkStruct_021F416C *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_021F416C)), 0, 0); v0->unk_00 = param0; @@ -52,35 +53,35 @@ void * ov5_021F4018 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F4034 (void * param0) +void ov5_021F4034(void *param0) { - UnkStruct_021F416C * v0 = param0; + UnkStruct_021F416C *v0 = param0; ov5_021F407C(v0); ov5_021DF554(v0); } -static void ov5_021F4044 (UnkStruct_021F416C * param0) +static void ov5_021F4044(UnkStruct_021F416C *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 111, 0); ov5_021DFB24(param0->unk_00, ¶m0->unk_18, 0, 166, 0); ov5_021DFB24(param0->unk_00, ¶m0->unk_3C, 0, 167, 0); } -static void ov5_021F407C (UnkStruct_021F416C * param0) +static void ov5_021F407C(UnkStruct_021F416C *param0) { sub_0207395C(¶m0->unk_04); sub_02073AA8(¶m0->unk_18); sub_02073AA8(¶m0->unk_3C); } -void ov5_021F4098 (FieldSystem * fieldSystem, int param1) +void ov5_021F4098(FieldSystem *fieldSystem, int param1) { int v0, v1; - VecFx32 v2 = {0, 0, 0}; - UnkStruct_ov5_021DF47C * v3; - UnkStruct_021F416C * v4; - UnkStruct_ov101_021D5D90 ** v5; + VecFx32 v2 = { 0, 0, 0 }; + UnkStruct_ov5_021DF47C *v3; + UnkStruct_021F416C *v4; + UnkStruct_ov101_021D5D90 **v5; UnkStruct_021F41F0 v6; v3 = fieldSystem->unk_40; @@ -121,13 +122,13 @@ void ov5_021F4098 (FieldSystem * fieldSystem, int param1) } } -void ov5_021F416C (FieldSystem * fieldSystem, int param1) +void ov5_021F416C(FieldSystem *fieldSystem, int param1) { int v0, v1; - UnkStruct_ov5_021DF47C * v2; - UnkStruct_021F416C * v3; - UnkStruct_ov101_021D5D90 ** v4; - UnkStruct_021F4234 * v5; + UnkStruct_ov5_021DF47C *v2; + UnkStruct_021F416C *v3; + UnkStruct_ov101_021D5D90 **v4; + UnkStruct_021F4234 *v5; v2 = fieldSystem->unk_40; GF_ASSERT(ov5_021DF4E4(v2, 30) == 1); @@ -153,10 +154,10 @@ void ov5_021F416C (FieldSystem * fieldSystem, int param1) } } -static int ov5_021F41F0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F41F0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F4234 * v0 = param1; - const UnkStruct_021F41F0 * v1 = sub_020715BC(param0); + UnkStruct_021F4234 *v0 = param1; + const UnkStruct_021F41F0 *v1 = sub_020715BC(param0); v0->unk_7C = *v1; @@ -166,16 +167,16 @@ static int ov5_021F41F0 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F4234 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4234(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F4234 * v0 = param1; + UnkStruct_021F4234 *v0 = param1; sub_02073AA8(&v0->unk_04); } -static void ov5_021F4240 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4240(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0 = 1; - UnkStruct_021F4234 * v1 = param1; + UnkStruct_021F4234 *v1 = param1; if (v1->unk_00 == 1) { if (sub_02073B40(&v1->unk_04) == 1) { @@ -189,10 +190,10 @@ static void ov5_021F4240 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02073AC0(&v1->unk_04, FX32_ONE, v0); } -static void ov5_021F4270 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4270(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_021F4234 * v1 = param1; + UnkStruct_021F4234 *v1 = param1; sub_020715E4(param0, &v0); sub_02073BB4(&v1->unk_28, &v0); diff --git a/src/overlay005/ov5_021F428C.c b/src/overlay005/ov5_021F428C.c index 9dca27ac5b..de8c1dff36 100644 --- a/src/overlay005/ov5_021F428C.c +++ b/src/overlay005/ov5_021F428C.c @@ -1,30 +1,31 @@ +#include "overlay005/ov5_021F428C.h" + #include #include -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "heap.h" #include "map_object_move.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F428C.h" typedef struct { int unk_00; int unk_04; - UnkStruct_ov5_021DF47C * unk_08; + UnkStruct_ov5_021DF47C *unk_08; UnkStruct_02073838 unk_0C[3]; UnkStruct_02073974 unk_48[12]; - UnkStruct_ov101_021D5D90 ** unk_1F8; - UnkStruct_ov101_021D5D90 ** unk_1FC; + UnkStruct_ov101_021D5D90 **unk_1F8; + UnkStruct_ov101_021D5D90 **unk_1FC; } UnkStruct_ov5_021F431C; typedef struct { @@ -33,8 +34,8 @@ typedef struct { s16 unk_02; s16 unk_04; fx32 unk_08; - UnkStruct_ov5_021F431C * unk_0C; - FieldSystem * fieldSystem; + UnkStruct_ov5_021F431C *unk_0C; + FieldSystem *fieldSystem; } UnkStruct_ov5_021F440C; typedef struct { @@ -62,13 +63,13 @@ typedef struct { s16 unk_08; UnkStruct_02073B50 unk_0C; UnkStruct_ov5_021F440C unk_60; - UnkStruct_ov5_021F45F8 * unk_74; + UnkStruct_ov5_021F45F8 *unk_74; } UnkStruct_ov5_021F44A4; -static void ov5_021F431C(UnkStruct_ov5_021F431C * param0); -static void ov5_021F4370(UnkStruct_ov5_021F431C * param0); -static UnkStruct_ov101_021D5D90 ** ov5_021F439C(FieldSystem * fieldSystem, int param1, int param2, fx32 param3, int param4, UnkStruct_ov5_021F440C * param5); -static void ov5_021F440C(UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F4698 * param1); +static void ov5_021F431C(UnkStruct_ov5_021F431C *param0); +static void ov5_021F4370(UnkStruct_ov5_021F431C *param0); +static UnkStruct_ov101_021D5D90 **ov5_021F439C(FieldSystem *fieldSystem, int param1, int param2, fx32 param3, int param4, UnkStruct_ov5_021F440C *param5); +static void ov5_021F440C(UnkStruct_ov101_021D5D90 *param0, UnkStruct_ov5_021F4698 *param1); static const UnkStruct_ov101_021D86B0 Unk_ov5_0220070C; static const UnkStruct_ov101_021D86B0 Unk_ov5_022006F8; @@ -76,9 +77,9 @@ static const u32 Unk_ov5_022006DC[3]; static const u32 Unk_ov5_02200720[12]; static const u32 Unk_ov5_022006E8[4]; -void * ov5_021F428C (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F428C(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F431C * v0; + UnkStruct_ov5_021F431C *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F431C)), 0, 0); v0->unk_08 = param0; @@ -87,9 +88,9 @@ void * ov5_021F428C (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F42A8 (void * param0) +void ov5_021F42A8(void *param0) { - UnkStruct_ov5_021F431C * v0 = param0; + UnkStruct_ov5_021F431C *v0 = param0; if (v0->unk_1F8 != NULL) { Heap_FreeToHeap(v0->unk_1F8); @@ -103,11 +104,11 @@ void ov5_021F42A8 (void * param0) ov5_021DF554(v0); } -void ov5_021F42D8 (UnkStruct_ov5_021DF47C * param0, int param1, int param2) +void ov5_021F42D8(UnkStruct_ov5_021DF47C *param0, int param1, int param2) { int v0; - UnkStruct_ov101_021D5D90 * v1; - UnkStruct_ov5_021F431C * v2; + UnkStruct_ov101_021D5D90 *v1; + UnkStruct_ov5_021F431C *v2; v2 = ov5_021DF55C(param0, 31); @@ -125,7 +126,7 @@ void ov5_021F42D8 (UnkStruct_ov5_021DF47C * param0, int param1, int param2) } } -static void ov5_021F431C (UnkStruct_ov5_021F431C * param0) +static void ov5_021F431C(UnkStruct_ov5_021F431C *param0) { int v0; @@ -138,7 +139,7 @@ static void ov5_021F431C (UnkStruct_ov5_021F431C * param0) } } -static void ov5_021F4370 (UnkStruct_ov5_021F431C * param0) +static void ov5_021F4370(UnkStruct_ov5_021F431C *param0) { int v0; @@ -151,12 +152,12 @@ static void ov5_021F4370 (UnkStruct_ov5_021F431C * param0) } } -static UnkStruct_ov101_021D5D90 ** ov5_021F439C (FieldSystem * fieldSystem, int param1, int param2, fx32 param3, int param4, UnkStruct_ov5_021F440C * param5) +static UnkStruct_ov101_021D5D90 **ov5_021F439C(FieldSystem *fieldSystem, int param1, int param2, fx32 param3, int param4, UnkStruct_ov5_021F440C *param5) { int v0, v1; - UnkStruct_ov5_021DF47C * v2; - UnkStruct_ov5_021F431C * v3; - UnkStruct_ov101_021D5D90 ** v4; + UnkStruct_ov5_021DF47C *v2; + UnkStruct_ov5_021F431C *v3; + UnkStruct_ov101_021D5D90 **v4; v2 = fieldSystem->unk_40; v3 = ov5_021DF55C(v2, 31); @@ -187,10 +188,10 @@ static UnkStruct_ov101_021D5D90 ** ov5_021F439C (FieldSystem * fieldSystem, int return NULL; } -static void ov5_021F440C (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F4698 * param1) +static void ov5_021F440C(UnkStruct_ov101_021D5D90 *param0, UnkStruct_ov5_021F4698 *param1) { VecFx32 v0; - const UnkStruct_ov5_021F440C * v1 = sub_020715BC(param0); + const UnkStruct_ov5_021F440C *v1 = sub_020715BC(param0); param1->unk_84 = *v1; param1->unk_02 = v1->unk_02; @@ -201,15 +202,15 @@ static void ov5_021F440C (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F4 sub_02064450(param1->unk_02, param1->unk_04, &v0); sub_020644A4(param1->unk_84.fieldSystem, &v0); - v0.y += ((FX32_ONE * 6)) + param1->unk_84.unk_08; + v0.y += (FX32_ONE * 6) + param1->unk_84.unk_08; sub_020715D4(param0, &v0); } -UnkStruct_ov101_021D5D90 * ov5_021F4474 (FieldSystem * fieldSystem, int param1, int param2, fx32 param3) +UnkStruct_ov101_021D5D90 *ov5_021F4474(FieldSystem *fieldSystem, int param1, int param2, fx32 param3) { - UnkStruct_ov5_021DF47C * v0; - UnkStruct_ov101_021D5D90 ** v1; + UnkStruct_ov5_021DF47C *v0; + UnkStruct_ov101_021D5D90 **v1; UnkStruct_ov5_021F440C v2; v0 = fieldSystem->unk_40; @@ -219,11 +220,11 @@ UnkStruct_ov101_021D5D90 * ov5_021F4474 (FieldSystem * fieldSystem, int param1, return *v1; } -void ov5_021F44A4 (UnkStruct_ov101_021D5D90 * param0) +void ov5_021F44A4(UnkStruct_ov101_021D5D90 *param0) { int v0; - UnkStruct_ov5_021F431C * v1; - UnkStruct_ov5_021F44A4 * v2; + UnkStruct_ov5_021F431C *v1; + UnkStruct_ov5_021F44A4 *v2; v2 = sub_02071598(param0); v1 = v2->unk_60.unk_0C; @@ -241,9 +242,9 @@ void ov5_021F44A4 (UnkStruct_ov101_021D5D90 * param0) } } -BOOL ov5_021F453C (UnkStruct_ov101_021D5D90 * param0) +BOOL ov5_021F453C(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov5_021F44A4 * v0; + UnkStruct_ov5_021F44A4 *v0; v0 = sub_02071598(param0); GF_ASSERT(v0->unk_74 != NULL); @@ -255,11 +256,11 @@ BOOL ov5_021F453C (UnkStruct_ov101_021D5D90 * param0) return 0; } -static int ov5_021F4560 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F4560(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F44A4 * v1 = param1; - const UnkStruct_ov5_021F440C * v2 = sub_020715BC(param0); + UnkStruct_ov5_021F44A4 *v1 = param1; + const UnkStruct_ov5_021F440C *v2 = sub_020715BC(param0); v1->unk_60 = *v2; v1->unk_04 = v2->unk_02; @@ -269,7 +270,7 @@ static int ov5_021F4560 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02064450(v1->unk_04, v1->unk_06, &v0); sub_020644A4(v1->unk_60.fieldSystem, &v0); - v0.y += ((FX32_ONE * 6)) + v1->unk_60.unk_08; + v0.y += (FX32_ONE * 6) + v1->unk_60.unk_08; sub_020715D4(param0, &v0); sub_02073B70(&v1->unk_0C, &v1->unk_60.unk_0C->unk_0C[1]); @@ -277,9 +278,9 @@ static int ov5_021F4560 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F45D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F45D0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F44A4 * v0 = param1; + UnkStruct_ov5_021F44A4 *v0 = param1; if (v0->unk_74 != NULL) { int v1; @@ -292,17 +293,16 @@ static void ov5_021F45D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F45F8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F45F8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F44A4 * v0 = param1; + UnkStruct_ov5_021F44A4 *v0 = param1; switch (v0->unk_00) { case 0: break; - case 1: - { + case 1: { int v1; - UnkStruct_ov5_021F45F8 * v2; + UnkStruct_ov5_021F45F8 *v2; GF_ASSERT(v0->unk_74 != NULL); v2 = v0->unk_74; @@ -316,15 +316,14 @@ static void ov5_021F45F8 (UnkStruct_ov101_021D5D90 * param0, void * param1) if (v2->unk_00 == ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3))) { v0->unk_00 = 0; } - } - break; + } break; } } -static void ov5_021F464C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F464C(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F44A4 * v1 = param1; + UnkStruct_ov5_021F44A4 *v1 = param1; sub_020715E4(param0, &v0); sub_02073BB4(&v1->unk_0C, &v0); @@ -338,10 +337,10 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_0220070C = { ov5_021F464C }; -UnkStruct_ov101_021D5D90 * ov5_021F4668 (FieldSystem * fieldSystem, int param1, int param2, fx32 param3) +UnkStruct_ov101_021D5D90 *ov5_021F4668(FieldSystem *fieldSystem, int param1, int param2, fx32 param3) { - UnkStruct_ov5_021DF47C * v0; - UnkStruct_ov101_021D5D90 ** v1; + UnkStruct_ov5_021DF47C *v0; + UnkStruct_ov101_021D5D90 **v1; UnkStruct_ov5_021F440C v2; v0 = fieldSystem->unk_40; @@ -351,11 +350,11 @@ UnkStruct_ov101_021D5D90 * ov5_021F4668 (FieldSystem * fieldSystem, int param1, return *v1; } -void ov5_021F4698 (UnkStruct_ov101_021D5D90 * param0, int param1, BOOL param2) +void ov5_021F4698(UnkStruct_ov101_021D5D90 *param0, int param1, BOOL param2) { - UnkStruct_02073974 * v0; - UnkStruct_ov5_021F431C * v1; - UnkStruct_ov5_021F4698 * v2; + UnkStruct_02073974 *v0; + UnkStruct_ov5_021F431C *v1; + UnkStruct_ov5_021F4698 *v2; v2 = sub_02071598(param0); v1 = v2->unk_84.unk_0C; @@ -380,27 +379,27 @@ void ov5_021F4698 (UnkStruct_ov101_021D5D90 * param0, int param1, BOOL param2) sub_02073B90(&v2->unk_30, &v1->unk_0C[2], &v2->unk_0C); } -void ov5_021F4714 (UnkStruct_ov101_021D5D90 * param0, fx32 param1) +void ov5_021F4714(UnkStruct_ov101_021D5D90 *param0, fx32 param1) { - UnkStruct_02073974 * v0; - UnkStruct_ov5_021F431C * v1; - UnkStruct_ov5_021F4698 * v2; + UnkStruct_02073974 *v0; + UnkStruct_ov5_021F431C *v1; + UnkStruct_ov5_021F4698 *v2; v2 = sub_02071598(param0); v2->unk_08 = param1; } -BOOL ov5_021F4720 (UnkStruct_ov101_021D5D90 * param0) +BOOL ov5_021F4720(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov5_021F4698 * v0; + UnkStruct_ov5_021F4698 *v0; v0 = sub_02071598(param0); return v0->unk_00_7; } -static int ov5_021F4730 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F4730(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F4698 * v0 = param1; + UnkStruct_ov5_021F4698 *v0 = param1; ov5_021F440C(param0, v0); sub_02073B70(&v0->unk_30, &v0->unk_84.unk_0C->unk_0C[2]); @@ -408,18 +407,18 @@ static int ov5_021F4730 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F474C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F474C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F4698 * v0 = param1; + UnkStruct_ov5_021F4698 *v0 = param1; if (v0->unk_00_6) { sub_02073AA8(&v0->unk_0C); } } -static void ov5_021F4760 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4760(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F4698 * v0 = param1; + UnkStruct_ov5_021F4698 *v0 = param1; switch (v0->unk_00_0) { case 0: @@ -433,10 +432,10 @@ static void ov5_021F4760 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F4794 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4794(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F4698 * v1 = param1; + UnkStruct_ov5_021F4698 *v1 = param1; sub_020715E4(param0, &v0); sub_02073BB4(&v1->unk_30, &v0); diff --git a/src/overlay005/ov5_021F47B0.c b/src/overlay005/ov5_021F47B0.c index 3d2bb36a3a..b391b032d6 100644 --- a/src/overlay005/ov5_021F47B0.c +++ b/src/overlay005/ov5_021F47B0.c @@ -1,14 +1,17 @@ +#include "overlay005/ov5_021F47B0.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay005/struct_ov5_02201C58.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "heap.h" @@ -16,20 +19,18 @@ #include "map_object_move.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F47B0.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04[9]; UnkStruct_02073974 unk_B8[1]; } UnkStruct_021F47DC; typedef struct { int unk_00; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_021F47DC * unk_08; - const MapObject * unk_0C; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_021F47DC *unk_08; + const MapObject *unk_0C; } UnkStruct_ov5_021F4840; typedef struct { @@ -42,23 +43,23 @@ typedef struct { UnkStruct_ov5_02201C58 unk_1C; UnkStruct_ov5_021F4840 unk_24; UnkStruct_02073B50 unk_34; - UnkStruct_02073974 * unk_88; + UnkStruct_02073974 *unk_88; } UnkStruct_021F487C; typedef struct { int unk_00; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_021F47DC * unk_08; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_021F47DC *unk_08; UnkStruct_02073B50 unk_0C; } UnkStruct_021F4D50; -static void ov5_021F47DC(UnkStruct_021F47DC * param0); -static void ov5_021F4820(UnkStruct_021F47DC * param0); -static void ov5_021F49D0(UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1); -static void ov5_021F4A24(UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1); -static void ov5_021F4A80(u16 * param0, s16 param1); -static int ov5_021F4AB4(const MapObject * param0, int param1, VecFx32 * param2); -static void ov5_021F4B6C(int param0, int param1, const VecFx32 * param2, const VecFx32 * param3, VecFx32 * param4, VecFx32 * param5); +static void ov5_021F47DC(UnkStruct_021F47DC *param0); +static void ov5_021F4820(UnkStruct_021F47DC *param0); +static void ov5_021F49D0(UnkStruct_ov101_021D5D90 *param0, UnkStruct_021F487C *param1); +static void ov5_021F4A24(UnkStruct_ov101_021D5D90 *param0, UnkStruct_021F487C *param1); +static void ov5_021F4A80(u16 *param0, s16 param1); +static int ov5_021F4AB4(const MapObject *param0, int param1, VecFx32 *param2); +static void ov5_021F4B6C(int param0, int param1, const VecFx32 *param2, const VecFx32 *param3, VecFx32 *param4, VecFx32 *param5); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200754; static const UnkStruct_ov101_021D86B0 Unk_ov5_02200768; @@ -68,9 +69,9 @@ static const UnkStruct_ov5_02201C58 Unk_ov5_0220077C[4]; static const VecFx32 Unk_ov5_022007C0[4][6]; static const VecFx32 Unk_ov5_022008E0[4][6]; -void * ov5_021F47B0 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F47B0(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_021F47DC * v0; + UnkStruct_021F47DC *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_021F47DC)), 0, 0); v0->unk_00 = param0; @@ -79,15 +80,15 @@ void * ov5_021F47B0 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F47CC (void * param0) +void ov5_021F47CC(void *param0) { - UnkStruct_021F47DC * v0 = param0; + UnkStruct_021F47DC *v0 = param0; ov5_021F4820(v0); ov5_021DF554(v0); } -static void ov5_021F47DC (UnkStruct_021F47DC * param0) +static void ov5_021F47DC(UnkStruct_021F47DC *param0) { int v0; @@ -102,7 +103,7 @@ static void ov5_021F47DC (UnkStruct_021F47DC * param0) } } -static void ov5_021F4820 (UnkStruct_021F47DC * param0) +static void ov5_021F4820(UnkStruct_021F47DC *param0) { int v0; @@ -115,10 +116,10 @@ static void ov5_021F4820 (UnkStruct_021F47DC * param0) } } -UnkStruct_ov101_021D5D90 * ov5_021F4840 (UnkStruct_ov5_021DF47C * param0, const MapObject * param1, int param2, int param3) +UnkStruct_ov101_021D5D90 *ov5_021F4840(UnkStruct_ov5_021DF47C *param0, const MapObject *param1, int param2, int param3) { int v0; - UnkStruct_ov101_021D5D90 * v1; + UnkStruct_ov101_021D5D90 *v1; UnkStruct_ov5_021F4840 v2; v2.unk_00 = param2; @@ -132,10 +133,10 @@ UnkStruct_ov101_021D5D90 * ov5_021F4840 (UnkStruct_ov5_021DF47C * param0, const return v1; } -static int ov5_021F487C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F487C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F487C * v0 = param1; - const UnkStruct_ov5_021F4840 * v1 = sub_020715BC(param0); + UnkStruct_021F487C *v0 = param1; + const UnkStruct_ov5_021F4840 *v1 = sub_020715BC(param0); v0->unk_24 = *v1; v0->unk_00 = MapObject_Dir(v1->unk_0C); @@ -149,21 +150,21 @@ static int ov5_021F487C (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F48F0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F48F0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F487C * v0 = param1; + UnkStruct_021F487C *v0 = param1; sub_02073A90(v0->unk_88); Heap_FreeToHeap(v0->unk_88); } -static void ov5_021F4908 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4908(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; VecFx32 v1, v2; - const VecFx32 * v3; - UnkStruct_021F487C * v4 = param1; - const MapObject * v5 = v4->unk_24.unk_0C; + const VecFx32 *v3; + UnkStruct_021F487C *v4 = param1; + const MapObject *v5 = v4->unk_24.unk_0C; int v6 = MapObject_Dir(v5); MapObject_PosVectorOut(v5, &v2); @@ -183,9 +184,9 @@ static void ov5_021F4908 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02073AC0(v4->unk_88, FX32_ONE, 1); } -static void ov5_021F4974 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4974(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F487C * v0 = param1; + UnkStruct_021F487C *v0 = param1; if (v0->unk_02 == 0) { UnkStruct_ov5_02201C58 v1; @@ -194,8 +195,8 @@ static void ov5_021F4974 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_020715E4(param0, &v2); v2.x += 0; - v2.y += ((FX32_ONE * 16)); - v2.z += ((FX32_ONE * 0)); + v2.y += (FX32_ONE * 16); + v2.z += (FX32_ONE * 0); v1 = v0->unk_1C; @@ -215,10 +216,10 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200754 = { ov5_021F4974 }; -static void ov5_021F49D0 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1) +static void ov5_021F49D0(UnkStruct_ov101_021D5D90 *param0, UnkStruct_021F487C *param1) { VecFx32 v0; - const MapObject * v1 = param1->unk_24.unk_0C; + const MapObject *v1 = param1->unk_24.unk_0C; param1->unk_1C = Unk_ov5_0220077C[param1->unk_00]; MapObject_PosVectorOut(param1->unk_24.unk_0C, &v0); @@ -230,10 +231,10 @@ static void ov5_021F49D0 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C sub_020715D4(param0, &v0); } -static void ov5_021F4A24 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1) +static void ov5_021F4A24(UnkStruct_ov101_021D5D90 *param0, UnkStruct_021F487C *param1) { VecFx32 v0; - const MapObject * v1 = param1->unk_24.unk_0C; + const MapObject *v1 = param1->unk_24.unk_0C; param1->unk_10 = Unk_ov5_022007C0[param1->unk_00][param1->unk_01]; param1->unk_04 = Unk_ov5_022008E0[param1->unk_00][param1->unk_01]; @@ -241,7 +242,7 @@ static void ov5_021F4A24 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C ov5_021F49D0(param0, param1); } -static void ov5_021F4A80 (u16 * param0, s16 param1) +static void ov5_021F4A80(u16 *param0, s16 param1) { (*param0) += param1; @@ -254,7 +255,7 @@ static void ov5_021F4A80 (u16 * param0, s16 param1) } } -static int ov5_021F4AB4 (const MapObject * param0, int param1, VecFx32 * param2) +static int ov5_021F4AB4(const MapObject *param0, int param1, VecFx32 *param2) { u32 v0; VecFx32 v1; @@ -277,7 +278,7 @@ static int ov5_021F4AB4 (const MapObject * param0, int param1, VecFx32 * param2) if ((v0 != 0) && (v0 != (1 << 0))) { if (v0 == (1 << 2)) { - MapObject * v7; + MapObject *v7; v7 = sub_0206326C(MapObject_MapObjectManager(param0), v4, v6, 1); GF_ASSERT(v7 != NULL); @@ -294,11 +295,11 @@ static int ov5_021F4AB4 (const MapObject * param0, int param1, VecFx32 * param2) return v2; } -static void ov5_021F4B6C (int param0, int param1, const VecFx32 * param2, const VecFx32 * param3, VecFx32 * param4, VecFx32 * param5) +static void ov5_021F4B6C(int param0, int param1, const VecFx32 *param2, const VecFx32 *param3, VecFx32 *param4, VecFx32 *param5) { fx32 v0; int v1, v2, v3; - const VecFx32 * v4, * v5; + const VecFx32 *v4, *v5; switch (param0) { case 0: @@ -366,27 +367,27 @@ static void ov5_021F4B6C (int param0, int param1, const VecFx32 * param2, const param5->z += ((v4->z - param5->z) / 10) * v3; } -UnkStruct_ov101_021D5D90 * ov5_021F4CEC (UnkStruct_ov5_021DF47C * param0, int param1, int param2, int param3) +UnkStruct_ov101_021D5D90 *ov5_021F4CEC(UnkStruct_ov5_021DF47C *param0, int param1, int param2, int param3) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {0, 0, 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { 0, 0, 0 }; GF_ASSERT(param3 < 8); sub_02064450(param1, param2, &v1); sub_020644A4(ov5_021DF574(param0), &v1); - v1.x += ((FX32_ONE * 0)); - v1.y += ((FX32_ONE * -3)); - v1.z += ((FX32_ONE * -4)); + v1.x += (FX32_ONE * 0); + v1.y += (FX32_ONE * -3); + v1.z += (FX32_ONE * -4); v0 = ov5_021DF72C(param0, &Unk_ov5_02200768, &v1, param3, param0, 0); return v0; } -static int ov5_021F4D50 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F4D50(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F4D50 * v0 = param1; + UnkStruct_021F4D50 *v0 = param1; v0->unk_00 = sub_020715B4(param0); v0->unk_04 = (UnkStruct_ov5_021DF47C *)sub_020715BC(param0); @@ -396,20 +397,20 @@ static int ov5_021F4D50 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F4D88 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4D88(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F4D8C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4D8C(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F4D90 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4D90(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_021F4D50 * v1 = param1; + UnkStruct_021F4D50 *v1 = param1; sub_020715E4(param0, &v0); sub_02073BB4(&v1->unk_0C, &v0); @@ -440,78 +441,78 @@ static const u32 Unk_ov5_02200750[1] = { }; static const UnkStruct_ov5_02201C58 Unk_ov5_0220077C[4] = { - {0x10E, 0xB4, 0x0}, - {0x5A, 0xB4, 0xB4}, - {0x0, 0x10E, 0x10E}, - {0x0, 0x5A, 0x5A} + { 0x10E, 0xB4, 0x0 }, + { 0x5A, 0xB4, 0xB4 }, + { 0x0, 0x10E, 0x10E }, + { 0x0, 0x5A, 0x5A } }; static const VecFx32 Unk_ov5_022007C0[4][6] = { { - {0xC00, 0x100, 0x1000}, - {0x1000, 0x500, 0x1000}, - {0x1000, 0x800, 0x1000}, - {0x1000, 0xC00, 0x1000}, - {0x1000, 0x1000, 0x1000}, - {0x1000, 0x1400, 0x1000} + { 0xC00, 0x100, 0x1000 }, + { 0x1000, 0x500, 0x1000 }, + { 0x1000, 0x800, 0x1000 }, + { 0x1000, 0xC00, 0x1000 }, + { 0x1000, 0x1000, 0x1000 }, + { 0x1000, 0x1400, 0x1000 }, }, { - {0xC00, 0x100, 0x1000}, - {0x1000, 0x500, 0x1000}, - {0x1000, 0x800, 0x1000}, - {0x1000, 0xC00, 0x1000}, - {0x1000, 0x1000, 0x1000}, - {0x1000, 0x1400, 0x1000} + { 0xC00, 0x100, 0x1000 }, + { 0x1000, 0x500, 0x1000 }, + { 0x1000, 0x800, 0x1000 }, + { 0x1000, 0xC00, 0x1000 }, + { 0x1000, 0x1000, 0x1000 }, + { 0x1000, 0x1400, 0x1000 }, }, { - {0x1000, 0x200, 0x1000}, - {0x1000, 0x600, 0x1000}, - {0x1000, 0xA00, 0x1000}, - {0x1000, 0xE00, 0x1000}, - {0x1000, 0x1200, 0x1000}, - {0x1000, 0x1400, 0x1000} + { 0x1000, 0x200, 0x1000 }, + { 0x1000, 0x600, 0x1000 }, + { 0x1000, 0xA00, 0x1000 }, + { 0x1000, 0xE00, 0x1000 }, + { 0x1000, 0x1200, 0x1000 }, + { 0x1000, 0x1400, 0x1000 }, }, { - {0x1000, 0x200, 0x1000}, - {0x1000, 0x600, 0x1000}, - {0x1000, 0xA00, 0x1000}, - {0x1000, 0xE00, 0x1000}, - {0x1000, 0x1200, 0x1000}, - {0x1000, 0x1400, 0x1000} - } + { 0x1000, 0x200, 0x1000 }, + { 0x1000, 0x600, 0x1000 }, + { 0x1000, 0xA00, 0x1000 }, + { 0x1000, 0xE00, 0x1000 }, + { 0x1000, 0x1200, 0x1000 }, + { 0x1000, 0x1400, 0x1000 }, + }, }; static const VecFx32 Unk_ov5_022008E0[4][6] = { { - {(FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -15)}, - {(FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -31)}, - {(FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -47)}, - {(FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -63)}, - {(FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -79)}, - {(FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -95)} + { (FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -15) }, + { (FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -31) }, + { (FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -47) }, + { (FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -63) }, + { (FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -79) }, + { (FX32_ONE * 0), (FX32_ONE * -15), (FX32_ONE * -95) }, }, { - {(FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 13)}, - {(FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 27)}, - {(FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 44)}, - {(FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 60)}, - {(FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 78)}, - {(FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 93)} + { (FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 13) }, + { (FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 27) }, + { (FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 44) }, + { (FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 60) }, + { (FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 78) }, + { (FX32_ONE * 0), (FX32_ONE * 0), (FX32_ONE * 93) }, }, { - {(FX32_ONE * -13), (FX32_ONE * 0), (FX32_ONE * 6)}, - {(FX32_ONE * -29), (FX32_ONE * 0), (FX32_ONE * 9)}, - {(FX32_ONE * -45), (FX32_ONE * 0), (FX32_ONE * 10)}, - {(FX32_ONE * -61), (FX32_ONE * 0), (FX32_ONE * 10)}, - {(FX32_ONE * -78), (FX32_ONE * 0), (FX32_ONE * 10)}, - {(FX32_ONE * -85), (FX32_ONE * 0), (FX32_ONE * 10)} + { (FX32_ONE * -13), (FX32_ONE * 0), (FX32_ONE * 6) }, + { (FX32_ONE * -29), (FX32_ONE * 0), (FX32_ONE * 9) }, + { (FX32_ONE * -45), (FX32_ONE * 0), (FX32_ONE * 10) }, + { (FX32_ONE * -61), (FX32_ONE * 0), (FX32_ONE * 10) }, + { (FX32_ONE * -78), (FX32_ONE * 0), (FX32_ONE * 10) }, + { (FX32_ONE * -85), (FX32_ONE * 0), (FX32_ONE * 10) }, }, { - {(FX32_ONE * 13), (FX32_ONE * 0), (FX32_ONE * 6)}, - {(FX32_ONE * 29), (FX32_ONE * 0), (FX32_ONE * 9)}, - {(FX32_ONE * 45), (FX32_ONE * 0), (FX32_ONE * 10)}, - {(FX32_ONE * 61), (FX32_ONE * 0), (FX32_ONE * 10)}, - {(FX32_ONE * 78), (FX32_ONE * 0), (FX32_ONE * 10)}, - {(FX32_ONE * 85), (FX32_ONE * 0), (FX32_ONE * 10)} - } + { (FX32_ONE * 13), (FX32_ONE * 0), (FX32_ONE * 6) }, + { (FX32_ONE * 29), (FX32_ONE * 0), (FX32_ONE * 9) }, + { (FX32_ONE * 45), (FX32_ONE * 0), (FX32_ONE * 10) }, + { (FX32_ONE * 61), (FX32_ONE * 0), (FX32_ONE * 10) }, + { (FX32_ONE * 78), (FX32_ONE * 0), (FX32_ONE * 10) }, + { (FX32_ONE * 85), (FX32_ONE * 0), (FX32_ONE * 10) }, + }, }; diff --git a/src/overlay005/ov5_021F4DAC.c b/src/overlay005/ov5_021F4DAC.c index 54ca96bebe..16fe8d46ed 100644 --- a/src/overlay005/ov5_021F4DAC.c +++ b/src/overlay005/ov5_021F4DAC.c @@ -1,27 +1,28 @@ +#include "overlay005/ov5_021F4DAC.h" + #include #include -#include "overlay005/struct_ov5_021DF47C_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" -#include "unk_02073838.h" #include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F4DAC.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" + +#include "unk_02073838.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073B50 unk_18; } UnkStruct_ov5_021F4DD8; -static void ov5_021F4DD8(UnkStruct_ov5_021F4DD8 * param0); -static void ov5_021F4DFC(UnkStruct_ov5_021F4DD8 * param0); +static void ov5_021F4DD8(UnkStruct_ov5_021F4DD8 *param0); +static void ov5_021F4DFC(UnkStruct_ov5_021F4DD8 *param0); -void * ov5_021F4DAC (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F4DAC(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F4DD8 * v0; + UnkStruct_ov5_021F4DD8 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F4DD8)), 0, 0); v0->unk_00 = param0; @@ -31,21 +32,21 @@ void * ov5_021F4DAC (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F4DC8 (void * param0) +void ov5_021F4DC8(void *param0) { - UnkStruct_ov5_021F4DD8 * v0 = param0; + UnkStruct_ov5_021F4DD8 *v0 = param0; ov5_021F4DFC(v0); ov5_021DF554(v0); } -static void ov5_021F4DD8 (UnkStruct_ov5_021F4DD8 * param0) +static void ov5_021F4DD8(UnkStruct_ov5_021F4DD8 *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 17, 0); sub_02073B70(¶m0->unk_18, ¶m0->unk_04); } -static void ov5_021F4DFC (UnkStruct_ov5_021F4DD8 * param0) +static void ov5_021F4DFC(UnkStruct_ov5_021F4DD8 *param0) { sub_0207395C(¶m0->unk_04); } diff --git a/src/overlay005/ov5_021F4E08.c b/src/overlay005/ov5_021F4E08.c index 098c2ef0a7..4a3a4c93e2 100644 --- a/src/overlay005/ov5_021F4E08.c +++ b/src/overlay005/ov5_021F4E08.c @@ -1,21 +1,22 @@ +#include "overlay005/ov5_021F4E08.h" + #include #include -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F4E08.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04[33]; UnkStruct_02073B50 unk_298[33]; } UnkStruct_ov5_021F4E38; @@ -23,9 +24,9 @@ typedef struct { typedef struct { int unk_00; int unk_04; - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_0C; - UnkStruct_ov5_021F4E38 * unk_10; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_0C; + UnkStruct_ov5_021F4E38 *unk_10; } UnkStruct_ov5_021F4EAC; typedef struct { @@ -39,14 +40,14 @@ typedef struct { UnkStruct_ov5_021F4EAC unk_6C; } UnkStruct_ov5_021F4F18; -static void ov5_021F4E38(UnkStruct_ov5_021F4E38 * param0); -static void ov5_021F4E94(UnkStruct_ov5_021F4E38 * param0); +static void ov5_021F4E38(UnkStruct_ov5_021F4E38 *param0); +static void ov5_021F4E94(UnkStruct_ov5_021F4E38 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200A0C; -void * ov5_021F4E08 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F4E08(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F4E38 * v0; + UnkStruct_ov5_021F4E38 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F4E38)), 0, 0); v0->unk_00 = param0; @@ -56,15 +57,15 @@ void * ov5_021F4E08 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F4E28 (void * param0) +void ov5_021F4E28(void *param0) { - UnkStruct_ov5_021F4E38 * v0 = param0; + UnkStruct_ov5_021F4E38 *v0 = param0; ov5_021F4E94(v0); ov5_021DF554(v0); } -static void ov5_021F4E38 (UnkStruct_ov5_021F4E38 * param0) +static void ov5_021F4E38(UnkStruct_ov5_021F4E38 *param0) { int v0; @@ -77,7 +78,7 @@ static void ov5_021F4E38 (UnkStruct_ov5_021F4E38 * param0) sub_02073B70(¶m0->unk_298[v0], ¶m0->unk_04[v0]); } -static void ov5_021F4E94 (UnkStruct_ov5_021F4E38 * param0) +static void ov5_021F4E94(UnkStruct_ov5_021F4E38 *param0) { int v0; @@ -86,14 +87,14 @@ static void ov5_021F4E94 (UnkStruct_ov5_021F4E38 * param0) } } -UnkStruct_ov101_021D5D90 * ov5_021F4EAC (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4) +UnkStruct_ov101_021D5D90 *ov5_021F4EAC(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4) { int v0, v1; UnkStruct_ov5_021F4EAC v2; - UnkStruct_ov5_021DF47C * v3; + UnkStruct_ov5_021DF47C *v3; VecFx32 v4; - UnkStruct_ov101_021D5D90 * v5; - UnkStruct_ov5_021F4F18 * v6; + UnkStruct_ov101_021D5D90 *v5; + UnkStruct_ov5_021F4F18 *v6; v3 = fieldSystem->unk_40; @@ -120,10 +121,10 @@ UnkStruct_ov101_021D5D90 * ov5_021F4EAC (FieldSystem * fieldSystem, int param1, return v5; } -UnkStruct_ov101_021D5D90 * ov5_021F4F18 (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4) +UnkStruct_ov101_021D5D90 *ov5_021F4F18(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4) { - UnkStruct_ov5_021F4F18 * v0; - UnkStruct_ov101_021D5D90 * v1 = ov5_021F4EAC(fieldSystem, param1, param2, param3, param4); + UnkStruct_ov5_021F4F18 *v0; + UnkStruct_ov101_021D5D90 *v1 = ov5_021F4EAC(fieldSystem, param1, param2, param3, param4); if (v1) { v0 = sub_02071598(v1); @@ -134,10 +135,10 @@ UnkStruct_ov101_021D5D90 * ov5_021F4F18 (FieldSystem * fieldSystem, int param1, return v1; } -static int ov5_021F4F44 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F4F44(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F4F18 * v0; - const UnkStruct_ov5_021F4EAC * v1; + UnkStruct_ov5_021F4F18 *v0; + const UnkStruct_ov5_021F4EAC *v1; VecFx32 v2; v0 = param1; @@ -154,14 +155,14 @@ static int ov5_021F4F44 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F4F88 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4F88(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F4F8C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4F8C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F4F18 * v0; + UnkStruct_ov5_021F4F18 *v0; v0 = param1; @@ -170,17 +171,17 @@ static void ov5_021F4F8C (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F4FB8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F4FB8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F4F18 * v0; + UnkStruct_ov5_021F4F18 *v0; v0 = param1; { VecFx32 v1; - VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE}; - MtxFx33 v3 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; - UnkStruct_02073B50 * v4 = &v0->unk_6C.unk_10->unk_298[v0->unk_54]; + VecFx32 v2 = { FX32_ONE, FX32_ONE, FX32_ONE }; + MtxFx33 v3 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; + UnkStruct_02073B50 *v4 = &v0->unk_6C.unk_10->unk_298[v0->unk_54]; sub_020715E4(param0, &v1); diff --git a/src/overlay005/ov5_021F5060.c b/src/overlay005/ov5_021F5060.c index a6d8a51150..c13c15e97b 100644 --- a/src/overlay005/ov5_021F5060.c +++ b/src/overlay005/ov5_021F5060.c @@ -1,27 +1,28 @@ +#include "overlay005/ov5_021F5060.h" + #include #include -#include "overlay005/struct_ov5_021DF47C_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" -#include "unk_02073838.h" #include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F5060.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" + +#include "unk_02073838.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073B50 unk_18; } UnkStruct_021F508C; -static void ov5_021F508C(UnkStruct_021F508C * param0); -static void ov5_021F50B0(UnkStruct_021F508C * param0); +static void ov5_021F508C(UnkStruct_021F508C *param0); +static void ov5_021F50B0(UnkStruct_021F508C *param0); -void * ov5_021F5060 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F5060(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_021F508C * v0; + UnkStruct_021F508C *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_021F508C)), 0, 0); v0->unk_00 = param0; @@ -31,21 +32,21 @@ void * ov5_021F5060 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F507C (void * param0) +void ov5_021F507C(void *param0) { - UnkStruct_021F508C * v0 = param0; + UnkStruct_021F508C *v0 = param0; ov5_021F50B0(v0); ov5_021DF554(v0); } -static void ov5_021F508C (UnkStruct_021F508C * param0) +static void ov5_021F508C(UnkStruct_021F508C *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 21, 0); sub_02073B70(¶m0->unk_18, ¶m0->unk_04); } -static void ov5_021F50B0 (UnkStruct_021F508C * param0) +static void ov5_021F50B0(UnkStruct_021F508C *param0) { sub_0207395C(¶m0->unk_04); } diff --git a/src/overlay005/ov5_021F50BC.c b/src/overlay005/ov5_021F50BC.c index cc7e2a0826..2942b637db 100644 --- a/src/overlay005/ov5_021F50BC.c +++ b/src/overlay005/ov5_021F50BC.c @@ -1,34 +1,35 @@ +#include "overlay005/ov5_021F50BC.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_0201E190.h" #include "map_object.h" +#include "unk_0201E190.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F50BC.h" typedef struct { int unk_00; int unk_04; - UnkStruct_ov5_021DF47C * unk_08; + UnkStruct_ov5_021DF47C *unk_08; UnkStruct_02073838 unk_0C; UnkStruct_02073B50 unk_20; - MapObject * unk_74; + MapObject *unk_74; } UnkStruct_021F50E8; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_021F50E8 * unk_04; - MapObject * unk_08; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_021F50E8 *unk_04; + MapObject *unk_08; } UnkStruct_ov5_021F511C; typedef struct { @@ -43,14 +44,14 @@ typedef struct { UnkStruct_ov5_021F511C unk_30; } UnkStruct_ov5_021F5158; -static void ov5_021F50E8(UnkStruct_021F50E8 * param0); -static void ov5_021F5110(UnkStruct_021F50E8 * param0); +static void ov5_021F50E8(UnkStruct_021F50E8 *param0); +static void ov5_021F5110(UnkStruct_021F50E8 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200A50; -void * ov5_021F50BC (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F50BC(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_021F50E8 * v0; + UnkStruct_021F50E8 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_021F50E8)), 0, 0); v0->unk_08 = param0; @@ -59,32 +60,32 @@ void * ov5_021F50BC (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F50D8 (void * param0) +void ov5_021F50D8(void *param0) { - UnkStruct_021F50E8 * v0 = param0; + UnkStruct_021F50E8 *v0 = param0; ov5_021F5110(v0); ov5_021DF554(v0); } -static void ov5_021F50E8 (UnkStruct_021F50E8 * param0) +static void ov5_021F50E8(UnkStruct_021F50E8 *param0) { ov5_021DFB00(param0->unk_08, ¶m0->unk_0C, 0, 22, 0); sub_02073B70(¶m0->unk_20, ¶m0->unk_0C); } -static void ov5_021F5110 (UnkStruct_021F50E8 * param0) +static void ov5_021F5110(UnkStruct_021F50E8 *param0) { sub_0207395C(¶m0->unk_0C); } -UnkStruct_ov101_021D5D90 * ov5_021F511C (MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F511C(MapObject *param0) { int v0, v1; UnkStruct_ov5_021F511C v2; - UnkStruct_ov5_021DF47C * v3; + UnkStruct_ov5_021DF47C *v3; VecFx32 v4; - UnkStruct_ov101_021D5D90 * v5; + UnkStruct_ov101_021D5D90 *v5; v3 = ov5_021DF578(param0); @@ -100,10 +101,10 @@ UnkStruct_ov101_021D5D90 * ov5_021F511C (MapObject * param0) return v5; } -static int ov5_021F5158 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F5158(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F5158 * v0; - const UnkStruct_ov5_021F511C * v1; + UnkStruct_ov5_021F5158 *v0; + const UnkStruct_ov5_021F511C *v1; VecFx32 v2; v0 = param1; @@ -112,7 +113,7 @@ static int ov5_021F5158 (UnkStruct_ov101_021D5D90 * param0, void * param1) v0->unk_30 = *v1; v0->unk_08 = MapObject_Id(v0->unk_30.unk_08); v0->unk_0C = sub_02062918(v0->unk_30.unk_08); - v0->unk_24.y = ((FX32_ONE * 6)); + v0->unk_24.y = (FX32_ONE * 6); MapObject_PosVectorOut(v0->unk_30.unk_08, &v2); sub_020715D4(param0, &v2); @@ -120,15 +121,15 @@ static int ov5_021F5158 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F51A0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F51A0(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F51A4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F51A4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F5158 * v0; - MapObject * v1; + UnkStruct_ov5_021F5158 *v0; + MapObject *v1; VecFx32 v2; v0 = param1; @@ -139,7 +140,7 @@ static void ov5_021F51A4 (UnkStruct_ov101_021D5D90 * param0, void * param1) switch (v0->unk_00) { case 0: MapObject_PosVectorOut(v1, &v2); - v2.z += ((FX32_ONE * -10)); + v2.z += (FX32_ONE * -10); sub_020715D4(param0, &v2); break; case 1: @@ -154,23 +155,23 @@ static void ov5_021F51A4 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F5204 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5204(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F5158 * v0; + UnkStruct_ov5_021F5158 *v0; v0 = param1; { - VecFx32 v1, v2 = {FX32_ONE, FX32_ONE, FX32_ONE}; - MtxFx33 v3 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + VecFx32 v1, v2 = { FX32_ONE, FX32_ONE, FX32_ONE }; + MtxFx33 v3 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; sub_020715E4(param0, &v1); - v1.y += ((FX32_ONE * 25)); + v1.y += (FX32_ONE * 25); v1.z += -(FX32_ONE * 5); { - const MtxFx43 * v4 = NNS_G3dGlbGetInvCameraMtx(); + const MtxFx43 *v4 = NNS_G3dGlbGetInvCameraMtx(); MtxFx33 v5; sub_0201E2E0(&v3, 90, 0, 0); diff --git a/src/overlay005/ov5_021F5284.c b/src/overlay005/ov5_021F5284.c index b20116b4eb..4d674099fe 100644 --- a/src/overlay005/ov5_021F5284.c +++ b/src/overlay005/ov5_021F5284.c @@ -1,34 +1,35 @@ +#include "overlay005/ov5_021F5284.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_0201E190.h" #include "map_object.h" +#include "unk_0201E190.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F5284.h" typedef struct { int unk_00; int unk_04; - UnkStruct_ov5_021DF47C * unk_08; + UnkStruct_ov5_021DF47C *unk_08; UnkStruct_02073838 unk_0C; UnkStruct_02073B50 unk_20; - MapObject * unk_74; + MapObject *unk_74; } UnkStruct_021F52B0; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_021F52B0 * unk_04; - MapObject * unk_08; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_021F52B0 *unk_04; + MapObject *unk_08; } UnkStruct_021F52E4; typedef struct { @@ -43,14 +44,14 @@ typedef struct { UnkStruct_021F52E4 unk_30; } UnkStruct_021F5320; -static void ov5_021F52B0(UnkStruct_021F52B0 * param0); -static void ov5_021F52D8(UnkStruct_021F52B0 * param0); +static void ov5_021F52B0(UnkStruct_021F52B0 *param0); +static void ov5_021F52D8(UnkStruct_021F52B0 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200A94; -void * ov5_021F5284 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F5284(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_021F52B0 * v0; + UnkStruct_021F52B0 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_021F52B0)), 0, 0); v0->unk_08 = param0; @@ -60,33 +61,33 @@ void * ov5_021F5284 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F52A0 (void * param0) +void ov5_021F52A0(void *param0) { - UnkStruct_021F52B0 * v0 = param0; + UnkStruct_021F52B0 *v0 = param0; ov5_021F52D8(v0); ov5_021DF554(v0); } -static void ov5_021F52B0 (UnkStruct_021F52B0 * param0) +static void ov5_021F52B0(UnkStruct_021F52B0 *param0) { ov5_021DFB00(param0->unk_08, ¶m0->unk_0C, 0, 23, 0); sub_02073B70(¶m0->unk_20, ¶m0->unk_0C); } -static void ov5_021F52D8 (UnkStruct_021F52B0 * param0) +static void ov5_021F52D8(UnkStruct_021F52B0 *param0) { sub_0207395C(¶m0->unk_0C); } -UnkStruct_ov101_021D5D90 * ov5_021F52E4 (MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F52E4(MapObject *param0) { int v0, v1; UnkStruct_021F52E4 v2; - UnkStruct_ov5_021DF47C * v3; + UnkStruct_ov5_021DF47C *v3; VecFx32 v4; - UnkStruct_ov101_021D5D90 * v5; - UnkStruct_021F5320 * v6; + UnkStruct_ov101_021D5D90 *v5; + UnkStruct_021F5320 *v6; v3 = ov5_021DF578(param0); @@ -102,10 +103,10 @@ UnkStruct_ov101_021D5D90 * ov5_021F52E4 (MapObject * param0) return v5; } -static int ov5_021F5320 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F5320(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F5320 * v0; - const UnkStruct_021F52E4 * v1; + UnkStruct_021F5320 *v0; + const UnkStruct_021F52E4 *v1; VecFx32 v2; v0 = param1; @@ -114,7 +115,7 @@ static int ov5_021F5320 (UnkStruct_ov101_021D5D90 * param0, void * param1) v0->unk_30 = *v1; v0->unk_08 = MapObject_Id(v0->unk_30.unk_08); v0->unk_0C = sub_02062918(v0->unk_30.unk_08); - v0->unk_24.y = ((FX32_ONE * 6)); + v0->unk_24.y = (FX32_ONE * 6); MapObject_PosVectorOut(v0->unk_30.unk_08, &v2); sub_020715D4(param0, &v2); @@ -122,15 +123,15 @@ static int ov5_021F5320 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F5368 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5368(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F536C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F536C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F5320 * v0; - MapObject * v1; + UnkStruct_021F5320 *v0; + MapObject *v1; VecFx32 v2; v0 = param1; @@ -139,28 +140,28 @@ static void ov5_021F536C (UnkStruct_ov101_021D5D90 * param0, void * param1) GF_ASSERT(sub_02062764(v1, v0->unk_08, v0->unk_0C) != 0); MapObject_PosVectorOut(v1, &v2); - v2.z += ((FX32_ONE * -10)); + v2.z += (FX32_ONE * -10); sub_020715D4(param0, &v2); } -static void ov5_021F53A8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F53A8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F5320 * v0; + UnkStruct_021F5320 *v0; v0 = param1; { VecFx32 v1; - VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE}; - MtxFx33 v3 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + VecFx32 v2 = { FX32_ONE, FX32_ONE, FX32_ONE }; + MtxFx33 v3 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; sub_020715E4(param0, &v1); - v1.y += ((FX32_ONE * 25)); + v1.y += (FX32_ONE * 25); v1.z += -(FX32_ONE * 5); { - const MtxFx43 * v4 = NNS_G3dGlbGetInvCameraMtx(); + const MtxFx43 *v4 = NNS_G3dGlbGetInvCameraMtx(); MtxFx33 v5; sub_0201E2E0(&v3, 90, 0, 0); diff --git a/src/overlay005/ov5_021F5428.c b/src/overlay005/ov5_021F5428.c index 2bebb5fa55..dbe0f22a93 100644 --- a/src/overlay005/ov5_021F5428.c +++ b/src/overlay005/ov5_021F5428.c @@ -1,34 +1,35 @@ +#include "overlay005/ov5_021F5428.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_0201E190.h" #include "map_object.h" +#include "unk_0201E190.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F5428.h" typedef struct { int unk_00; int unk_04; - UnkStruct_ov5_021DF47C * unk_08; + UnkStruct_ov5_021DF47C *unk_08; UnkStruct_02073838 unk_0C; UnkStruct_02073B50 unk_20; - MapObject * unk_74; + MapObject *unk_74; } UnkStruct_ov5_021F5454; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_ov5_021F5454 * unk_04; - MapObject * unk_08; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_ov5_021F5454 *unk_04; + MapObject *unk_08; } UnkStruct_ov5_021F5488; typedef struct { @@ -44,14 +45,14 @@ typedef struct { UnkStruct_ov5_021F5488 unk_34; } UnkStruct_ov5_021F54C4; -static void ov5_021F5454(UnkStruct_ov5_021F5454 * param0); -static void ov5_021F547C(UnkStruct_ov5_021F5454 * param0); +static void ov5_021F5454(UnkStruct_ov5_021F5454 *param0); +static void ov5_021F547C(UnkStruct_ov5_021F5454 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200AD8; -void * ov5_021F5428 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F5428(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F5454 * v0; + UnkStruct_ov5_021F5454 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F5454)), 0, 0); v0->unk_08 = param0; @@ -60,33 +61,33 @@ void * ov5_021F5428 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F5444 (void * param0) +void ov5_021F5444(void *param0) { - UnkStruct_ov5_021F5454 * v0 = param0; + UnkStruct_ov5_021F5454 *v0 = param0; ov5_021F547C(v0); ov5_021DF554(v0); } -static void ov5_021F5454 (UnkStruct_ov5_021F5454 * param0) +static void ov5_021F5454(UnkStruct_ov5_021F5454 *param0) { ov5_021DFB00(param0->unk_08, ¶m0->unk_0C, 0, 24, 0); sub_02073B70(¶m0->unk_20, ¶m0->unk_0C); } -static void ov5_021F547C (UnkStruct_ov5_021F5454 * param0) +static void ov5_021F547C(UnkStruct_ov5_021F5454 *param0) { sub_0207395C(¶m0->unk_0C); } -UnkStruct_ov101_021D5D90 * ov5_021F5488 (MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F5488(MapObject *param0) { int v0, v1; UnkStruct_ov5_021F5488 v2; - UnkStruct_ov5_021DF47C * v3; + UnkStruct_ov5_021DF47C *v3; VecFx32 v4; - UnkStruct_ov101_021D5D90 * v5; - UnkStruct_ov5_021F54C4 * v6; + UnkStruct_ov101_021D5D90 *v5; + UnkStruct_ov5_021F54C4 *v6; v3 = ov5_021DF578(param0); @@ -102,10 +103,10 @@ UnkStruct_ov101_021D5D90 * ov5_021F5488 (MapObject * param0) return v5; } -static int ov5_021F54C4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F54C4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F54C4 * v0; - const UnkStruct_ov5_021F5488 * v1; + UnkStruct_ov5_021F54C4 *v0; + const UnkStruct_ov5_021F5488 *v1; VecFx32 v2; v0 = param1; @@ -114,7 +115,7 @@ static int ov5_021F54C4 (UnkStruct_ov101_021D5D90 * param0, void * param1) v0->unk_34 = *v1; v0->unk_08 = MapObject_Id(v0->unk_34.unk_08); v0->unk_0C = sub_02062918(v0->unk_34.unk_08); - v0->unk_24.y = ((FX32_ONE * 6)); + v0->unk_24.y = (FX32_ONE * 6); MapObject_PosVectorOut(v0->unk_34.unk_08, &v2); sub_020715D4(param0, &v2); @@ -124,15 +125,15 @@ static int ov5_021F54C4 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F5510 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5510(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F5514 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5514(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F54C4 * v0; - MapObject * v1; + UnkStruct_ov5_021F54C4 *v0; + MapObject *v1; VecFx32 v2; v0 = param1; @@ -147,28 +148,28 @@ static void ov5_021F5514 (UnkStruct_ov101_021D5D90 * param0, void * param1) v1 = v0->unk_34.unk_08; MapObject_PosVectorOut(v1, &v2); - v2.z += ((FX32_ONE * -10)); + v2.z += (FX32_ONE * -10); sub_020715D4(param0, &v2); } -static void ov5_021F554C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F554C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F54C4 * v0; + UnkStruct_ov5_021F54C4 *v0; v0 = param1; { VecFx32 v1; - VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE}; - MtxFx33 v3 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + VecFx32 v2 = { FX32_ONE, FX32_ONE, FX32_ONE }; + MtxFx33 v3 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; sub_020715E4(param0, &v1); - v1.y += ((FX32_ONE * 25)); + v1.y += (FX32_ONE * 25); v1.z += -(FX32_ONE * 5); { - const MtxFx43 * v4 = NNS_G3dGlbGetInvCameraMtx(); + const MtxFx43 *v4 = NNS_G3dGlbGetInvCameraMtx(); MtxFx33 v5; sub_0201E2E0(&v3, 90, 0, 0); diff --git a/src/overlay005/ov5_021F55CC.c b/src/overlay005/ov5_021F55CC.c index 0872e1a9d0..b397ecf84e 100644 --- a/src/overlay005/ov5_021F55CC.c +++ b/src/overlay005/ov5_021F55CC.c @@ -1,31 +1,32 @@ +#include "overlay005/ov5_021F55CC.h" + #include #include -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "unk_02005474.h" #include "unk_0201E190.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F55CC.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073974 unk_18; } UnkStruct_ov5_021F55F8; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_ov5_021F55F8 * unk_04; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_ov5_021F55F8 *unk_04; } UnkStruct_ov5_021F5634; typedef struct { @@ -34,14 +35,14 @@ typedef struct { UnkStruct_ov5_021F5634 unk_78; } UnkStruct_ov5_021F5684; -static void ov5_021F55F8(UnkStruct_ov5_021F55F8 * param0); -static void ov5_021F5620(UnkStruct_ov5_021F55F8 * param0); +static void ov5_021F55F8(UnkStruct_ov5_021F55F8 *param0); +static void ov5_021F5620(UnkStruct_ov5_021F55F8 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200B1C; -void * ov5_021F55CC (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F55CC(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F55F8 * v0; + UnkStruct_ov5_021F55F8 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F55F8)), 0, 0); v0->unk_00 = param0; @@ -50,27 +51,27 @@ void * ov5_021F55CC (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F55E8 (void * param0) +void ov5_021F55E8(void *param0) { - UnkStruct_ov5_021F55F8 * v0 = param0; + UnkStruct_ov5_021F55F8 *v0 = param0; ov5_021F5620(v0); ov5_021DF554(v0); } -static void ov5_021F55F8 (UnkStruct_ov5_021F55F8 * param0) +static void ov5_021F55F8(UnkStruct_ov5_021F55F8 *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 58, 0); ov5_021DFB24(param0->unk_00, ¶m0->unk_18, 0, 162, 0); } -static void ov5_021F5620 (UnkStruct_ov5_021F55F8 * param0) +static void ov5_021F5620(UnkStruct_ov5_021F55F8 *param0) { sub_0207395C(¶m0->unk_04); sub_02073AA8(¶m0->unk_18); } -void ov5_021F5634 (FieldSystem * fieldSystem, int param1, int param2, int param3) +void ov5_021F5634(FieldSystem *fieldSystem, int param1, int param2, int param3) { int v0, v1; UnkStruct_ov5_021F5634 v2; @@ -89,10 +90,10 @@ void ov5_021F5634 (FieldSystem * fieldSystem, int param1, int param2, int param3 Sound_PlayEffect(1545); } -static int ov5_021F5684 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F5684(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F5684 * v0 = param1; - const UnkStruct_ov5_021F5634 * v1 = sub_020715BC(param0); + UnkStruct_ov5_021F5684 *v0 = param1; + const UnkStruct_ov5_021F5634 *v1 = sub_020715BC(param0); v0->unk_78 = *v1; @@ -102,15 +103,15 @@ static int ov5_021F5684 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F56BC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F56BC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F5684 * v0 = param1; + UnkStruct_ov5_021F5684 *v0 = param1; sub_02073AA8(&v0->unk_00); } -static void ov5_021F56C8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F56C8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F5684 * v0 = param1; + UnkStruct_ov5_021F5684 *v0 = param1; if (sub_02073B40(&v0->unk_00) == 1) { ov5_021DF74C(param0); @@ -120,14 +121,14 @@ static void ov5_021F56C8 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02073AC0(&v0->unk_00, FX32_ONE, 0); } -static void ov5_021F56F0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F56F0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F5684 * v0 = param1; + UnkStruct_ov5_021F5684 *v0 = param1; { - VecFx32 v1, v2 = {FX32_ONE, FX32_ONE, FX32_ONE}; - MtxFx33 v3 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; - const MtxFx43 * v4 = NNS_G3dGlbGetInvCameraMtx(); + VecFx32 v1, v2 = { FX32_ONE, FX32_ONE, FX32_ONE }; + MtxFx33 v3 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; + const MtxFx43 *v4 = NNS_G3dGlbGetInvCameraMtx(); MtxFx33 v5; sub_0201E2E0(&v3, 90, 0, 0); diff --git a/src/overlay005/ov5_021F575C.c b/src/overlay005/ov5_021F575C.c index 82ee00e7e6..55548b71cf 100644 --- a/src/overlay005/ov5_021F575C.c +++ b/src/overlay005/ov5_021F575C.c @@ -1,30 +1,31 @@ +#include "overlay005/ov5_021F575C.h" + #include #include -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F575C.h" typedef struct { int unk_00; - UnkStruct_ov5_021DF47C * unk_04; + UnkStruct_ov5_021DF47C *unk_04; UnkStruct_02073838 unk_08; UnkStruct_02073974 unk_1C; } UnkStruct_021F5788; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_021F5788 * unk_04; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_021F5788 *unk_04; } UnkStruct_ov5_021F57C8; typedef struct { @@ -33,14 +34,14 @@ typedef struct { UnkStruct_ov5_021F57C8 unk_78; } UnkStruct_ov5_021F580C; -static void ov5_021F5788(UnkStruct_021F5788 * param0); -static void ov5_021F57B4(UnkStruct_021F5788 * param0); +static void ov5_021F5788(UnkStruct_021F5788 *param0); +static void ov5_021F57B4(UnkStruct_021F5788 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200B54; -void * ov5_021F575C (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F575C(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_021F5788 * v0; + UnkStruct_021F5788 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_021F5788)), 0, 0); v0->unk_04 = param0; @@ -49,27 +50,27 @@ void * ov5_021F575C (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F5778 (void * param0) +void ov5_021F5778(void *param0) { - UnkStruct_021F5788 * v0 = param0; + UnkStruct_021F5788 *v0 = param0; ov5_021F57B4(v0); ov5_021DF554(v0); } -static void ov5_021F5788 (UnkStruct_021F5788 * param0) +static void ov5_021F5788(UnkStruct_021F5788 *param0) { ov5_021DFB00(param0->unk_04, ¶m0->unk_08, 0, 92, 0); ov5_021DFB24(param0->unk_04, ¶m0->unk_1C, 0, 164, 0); } -static void ov5_021F57B4 (UnkStruct_021F5788 * param0) +static void ov5_021F57B4(UnkStruct_021F5788 *param0) { sub_0207395C(¶m0->unk_08); sub_02073AA8(¶m0->unk_1C); } -void ov5_021F57C8 (FieldSystem * fieldSystem, int param1, int param2) +void ov5_021F57C8(FieldSystem *fieldSystem, int param1, int param2) { int v0, v1; UnkStruct_ov5_021F57C8 v2; @@ -86,10 +87,10 @@ void ov5_021F57C8 (FieldSystem * fieldSystem, int param1, int param2) ov5_021DF72C(v2.unk_00, &Unk_ov5_02200B54, &v3, v1, &v2, 0xff); } -static int ov5_021F580C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F580C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F580C * v0 = param1; - const UnkStruct_ov5_021F57C8 * v1 = sub_020715BC(param0); + UnkStruct_ov5_021F580C *v0 = param1; + const UnkStruct_ov5_021F57C8 *v1 = sub_020715BC(param0); v0->unk_78 = *v1; @@ -99,15 +100,15 @@ static int ov5_021F580C (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F5844 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5844(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F580C * v0 = param1; + UnkStruct_ov5_021F580C *v0 = param1; sub_02073AA8(&v0->unk_00); } -static void ov5_021F5850 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5850(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F580C * v0 = param1; + UnkStruct_ov5_021F580C *v0 = param1; if (sub_02073B40(&v0->unk_00) == 1) { ov5_021DF74C(param0); @@ -117,10 +118,10 @@ static void ov5_021F5850 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02073AC0(&v0->unk_00, FX32_ONE, 0); } -static void ov5_021F5878 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5878(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F580C * v1 = param1; + UnkStruct_ov5_021F580C *v1 = param1; sub_020715E4(param0, &v0); sub_02073BB4(&v1->unk_24, &v0); diff --git a/src/overlay005/ov5_021F5894.c b/src/overlay005/ov5_021F5894.c index 775ff80c6f..a950ab3ab1 100644 --- a/src/overlay005/ov5_021F5894.c +++ b/src/overlay005/ov5_021F5894.c @@ -1,30 +1,31 @@ +#include "overlay005/ov5_021F5894.h" + #include #include #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "map_object.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F5894.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073974 unk_18; } UnkStruct_021F58C0; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_021F58C0 * unk_04; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_021F58C0 *unk_04; } UnkStruct_021F58FC; typedef struct { @@ -33,14 +34,14 @@ typedef struct { UnkStruct_021F58FC unk_78; } UnkStruct_021F5988; -static void ov5_021F58C0(UnkStruct_021F58C0 * param0); -static void ov5_021F58E8(UnkStruct_021F58C0 * param0); +static void ov5_021F58C0(UnkStruct_021F58C0 *param0); +static void ov5_021F58E8(UnkStruct_021F58C0 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200B68; -void * ov5_021F5894 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F5894(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_021F58C0 * v0; + UnkStruct_021F58C0 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_021F58C0)), 0, 0); v0->unk_00 = param0; @@ -49,27 +50,27 @@ void * ov5_021F5894 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F58B0 (void * param0) +void ov5_021F58B0(void *param0) { - UnkStruct_021F58C0 * v0 = param0; + UnkStruct_021F58C0 *v0 = param0; ov5_021F58E8(v0); ov5_021DF554(v0); } -static void ov5_021F58C0 (UnkStruct_021F58C0 * param0) +static void ov5_021F58C0(UnkStruct_021F58C0 *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 91, 0); ov5_021DFB24(param0->unk_00, ¶m0->unk_18, 0, 163, 0); } -static void ov5_021F58E8 (UnkStruct_021F58C0 * param0) +static void ov5_021F58E8(UnkStruct_021F58C0 *param0) { sub_0207395C(¶m0->unk_04); sub_02073AA8(¶m0->unk_18); } -void ov5_021F58FC (MapObject * param0, int param1, int param2, int param3) +void ov5_021F58FC(MapObject *param0, int param1, int param2, int param3) { int v0, v1, v2; UnkStruct_021F58FC v3; @@ -103,10 +104,10 @@ void ov5_021F58FC (MapObject * param0, int param1, int param2, int param3) ov5_021DF72C(v3.unk_00, &Unk_ov5_02200B68, &v4, v1, &v3, v0); } -static int ov5_021F5988 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F5988(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F5988 * v0 = param1; - const UnkStruct_021F58FC * v1 = sub_020715BC(param0); + UnkStruct_021F5988 *v0 = param1; + const UnkStruct_021F58FC *v1 = sub_020715BC(param0); v0->unk_78 = *v1; @@ -116,16 +117,16 @@ static int ov5_021F5988 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F59C0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F59C0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F5988 * v0 = param1; + UnkStruct_021F5988 *v0 = param1; sub_02073AA8(&v0->unk_00); } -static void ov5_021F59CC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F59CC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F5988 * v0 = param1; + UnkStruct_021F5988 *v0 = param1; if (sub_02073B40(&v0->unk_00) == 1) { ov5_021DF74C(param0); @@ -135,10 +136,10 @@ static void ov5_021F59CC (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02073AC0(&v0->unk_00, FX32_ONE, 0); } -static void ov5_021F59F4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F59F4(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_021F5988 * v1 = param1; + UnkStruct_021F5988 *v1 = param1; sub_020715E4(param0, &v0); sub_02073BB4(&v1->unk_24, &v0); diff --git a/src/overlay005/ov5_021F5A10.c b/src/overlay005/ov5_021F5A10.c index 6166f09b64..7620ff6453 100644 --- a/src/overlay005/ov5_021F5A10.c +++ b/src/overlay005/ov5_021F5A10.c @@ -1,22 +1,23 @@ +#include "overlay005/ov5_021F5A10.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_020217F4.h" + #include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/ov5_021ECC20.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" +#include "map_object.h" #include "unk_02005474.h" #include "unk_02020AEC.h" -#include "map_object.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021ECC20.h" -#include "overlay005/ov5_021F5A10.h" void include_unk_ov5_02200B98(void); @@ -27,14 +28,14 @@ typedef struct { u8 unk_05; u8 unk_06; u8 unk_07; - UnkStruct_ov5_021DF47C * unk_08; + UnkStruct_ov5_021DF47C *unk_08; } UnkStruct_ov5_021F5A34; typedef struct { int unk_00; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_ov5_021F5A34 * unk_08; - MapObject * unk_0C; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_ov5_021F5A34 *unk_08; + MapObject *unk_0C; } UnkStruct_ov5_021F5D8C; typedef struct { @@ -47,35 +48,35 @@ typedef struct { VecFx32 unk_18; VecFx32 unk_24; UnkStruct_ov5_021F5D8C unk_30; - UnkStruct_020216E0 * unk_40; + UnkStruct_020216E0 *unk_40; } UnkStruct_ov5_021F5C4C; -static void ov5_021F5A34(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5A40(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5A58(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5A64(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5A7C(UnkStruct_ov5_021F5A34 * param0, int param1); -static void ov5_021F5A90(UnkStruct_ov5_021F5A34 * param0, int param1); -static void ov5_021F5AB4(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5B00(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5B50(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5B80(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5BB0(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5BC0(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5BD0(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5BE0(UnkStruct_ov5_021F5A34 * param0); -static void ov5_021F5BF0(UnkStruct_ov5_021F5A34 * param0, int param1); -static void ov5_021F5C04(UnkStruct_ov5_021F5A34 * param0, int param1); -static UnkStruct_020216E0 * ov5_021F5C18(UnkStruct_ov5_021DF47C * param0, int param1, VecFx32 * param2, u32 param3); +static void ov5_021F5A34(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5A40(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5A58(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5A64(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5A7C(UnkStruct_ov5_021F5A34 *param0, int param1); +static void ov5_021F5A90(UnkStruct_ov5_021F5A34 *param0, int param1); +static void ov5_021F5AB4(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5B00(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5B50(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5B80(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5BB0(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5BC0(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5BD0(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5BE0(UnkStruct_ov5_021F5A34 *param0); +static void ov5_021F5BF0(UnkStruct_ov5_021F5A34 *param0, int param1); +static void ov5_021F5C04(UnkStruct_ov5_021F5A34 *param0, int param1); +static UnkStruct_020216E0 *ov5_021F5C18(UnkStruct_ov5_021DF47C *param0, int param1, VecFx32 *param2, u32 param3); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200B98; static const UnkStruct_ov101_021D86B0 Unk_ov5_02200B84; static const UnkStruct_ov101_021D86B0 Unk_ov5_02200BAC; const UnkStruct_020217F4 Unk_ov5_02200BC0[]; -void * ov5_021F5A10 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F5A10(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F5A34 * v0; + UnkStruct_ov5_021F5A34 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F5A34)), 0, 0); v0->unk_08 = param0; @@ -83,37 +84,37 @@ void * ov5_021F5A10 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F5A24 (void * param0) +void ov5_021F5A24(void *param0) { - UnkStruct_ov5_021F5A34 * v0 = param0; + UnkStruct_ov5_021F5A34 *v0 = param0; ov5_021F5B50(v0); ov5_021DF554(v0); } -static void ov5_021F5A34 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5A34(UnkStruct_ov5_021F5A34 *param0) { param0->unk_00++; } -static void ov5_021F5A40 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5A40(UnkStruct_ov5_021F5A34 *param0) { param0->unk_00--; GF_ASSERT(param0->unk_00 >= 0); } -static void ov5_021F5A58 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5A58(UnkStruct_ov5_021F5A34 *param0) { param0->unk_02++; } -static void ov5_021F5A64 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5A64(UnkStruct_ov5_021F5A34 *param0) { param0->unk_02--; GF_ASSERT(param0->unk_02 >= 0); } -static void ov5_021F5A7C (UnkStruct_ov5_021F5A34 * param0, int param1) +static void ov5_021F5A7C(UnkStruct_ov5_021F5A34 *param0, int param1) { if (param1 == 0) { ov5_021F5A34(param0); @@ -122,7 +123,7 @@ static void ov5_021F5A7C (UnkStruct_ov5_021F5A34 * param0, int param1) } } -static void ov5_021F5A90 (UnkStruct_ov5_021F5A34 * param0, int param1) +static void ov5_021F5A90(UnkStruct_ov5_021F5A34 *param0, int param1) { if (param1 == 0) { ov5_021F5A40(param0); @@ -131,14 +132,14 @@ static void ov5_021F5A90 (UnkStruct_ov5_021F5A34 * param0, int param1) } } -void ov5_021F5AA4 (FieldSystem * fieldSystem, BOOL param1) +void ov5_021F5AA4(FieldSystem *fieldSystem, BOOL param1) { - UnkStruct_ov5_021F5A34 * v0 = ov5_021DF55C(fieldSystem->unk_40, 20); + UnkStruct_ov5_021F5A34 *v0 = ov5_021DF55C(fieldSystem->unk_40, 20); v0->unk_06 = (u8)param1; } -static void ov5_021F5AB4 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5AB4(UnkStruct_ov5_021F5A34 *param0) { if (param0->unk_04 == 0) { param0->unk_04 = 1; @@ -149,7 +150,7 @@ static void ov5_021F5AB4 (UnkStruct_ov5_021F5A34 * param0) } } -static void ov5_021F5B00 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5B00(UnkStruct_ov5_021F5A34 *param0) { if (param0->unk_05 == 0) { param0->unk_05 = 1; @@ -160,7 +161,7 @@ static void ov5_021F5B00 (UnkStruct_ov5_021F5A34 * param0) } } -static void ov5_021F5B50 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5B50(UnkStruct_ov5_021F5A34 *param0) { if (param0->unk_04 == 1) { param0->unk_04 = 0; @@ -172,7 +173,7 @@ static void ov5_021F5B50 (UnkStruct_ov5_021F5A34 * param0) } } -static void ov5_021F5B80 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5B80(UnkStruct_ov5_021F5A34 *param0) { if (param0->unk_05 == 1) { param0->unk_05 = 0; @@ -184,35 +185,35 @@ static void ov5_021F5B80 (UnkStruct_ov5_021F5A34 * param0) } } -static void ov5_021F5BB0 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5BB0(UnkStruct_ov5_021F5A34 *param0) { if (param0->unk_00 == 0) { ov5_021F5AB4(param0); } } -static void ov5_021F5BC0 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5BC0(UnkStruct_ov5_021F5A34 *param0) { if (param0->unk_02 == 0) { ov5_021F5B00(param0); } } -static void ov5_021F5BD0 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5BD0(UnkStruct_ov5_021F5A34 *param0) { if (param0->unk_00 == 0) { ov5_021F5B50(param0); } } -static void ov5_021F5BE0 (UnkStruct_ov5_021F5A34 * param0) +static void ov5_021F5BE0(UnkStruct_ov5_021F5A34 *param0) { if (param0->unk_02 == 0) { ov5_021F5B80(param0); } } -static void ov5_021F5BF0 (UnkStruct_ov5_021F5A34 * param0, int param1) +static void ov5_021F5BF0(UnkStruct_ov5_021F5A34 *param0, int param1) { if (param1 == 0) { ov5_021F5BB0(param0); @@ -221,7 +222,7 @@ static void ov5_021F5BF0 (UnkStruct_ov5_021F5A34 * param0, int param1) } } -static void ov5_021F5C04 (UnkStruct_ov5_021F5A34 * param0, int param1) +static void ov5_021F5C04(UnkStruct_ov5_021F5A34 *param0, int param1) { if (param1 == 0) { ov5_021F5BD0(param0); @@ -230,30 +231,30 @@ static void ov5_021F5C04 (UnkStruct_ov5_021F5A34 * param0, int param1) } } -static UnkStruct_020216E0 * ov5_021F5C18 (UnkStruct_ov5_021DF47C * param0, int param1, VecFx32 * param2, u32 param3) +static UnkStruct_020216E0 *ov5_021F5C18(UnkStruct_ov5_021DF47C *param0, int param1, VecFx32 *param2, u32 param3) { - int v0[2] = {1, 12}; - UnkStruct_020216E0 * v1 = ov5_021DF84C(param0, v0[param1], param2); + int v0[2] = { 1, 12 }; + UnkStruct_020216E0 *v1 = ov5_021DF84C(param0, v0[param1], param2); if (param3 == 1) { - NNSG3dResMdl * v2 = sub_020213F4(v1); + NNSG3dResMdl *v2 = sub_020213F4(v1); NNS_G3dMdlSetMdlFogEnableFlagAll(v2, 0); } return v1; } -int ov5_021F5C4C (UnkStruct_ov101_021D5D90 * param0) +int ov5_021F5C4C(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov5_021F5C4C * v0; + UnkStruct_ov5_021F5C4C *v0; v0 = sub_02071598(param0); return v0->unk_14; } -void ov5_021F5C58 (UnkStruct_ov101_021D5D90 * param0) +void ov5_021F5C58(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov5_021F5C4C * v0 = sub_02071598(param0); + UnkStruct_ov5_021F5C4C *v0 = sub_02071598(param0); v0->unk_10 = 1; @@ -262,17 +263,17 @@ void ov5_021F5C58 (UnkStruct_ov101_021D5D90 * param0) } } -static int ov5_021F5C70 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F5C70(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F5C4C * v1; - const UnkStruct_ov5_021F5D8C * v2; + UnkStruct_ov5_021F5C4C *v1; + const UnkStruct_ov5_021F5D8C *v2; v1 = param1; v2 = sub_020715BC(param0); v1->unk_30 = *v2; - v1->unk_24.y = ((FX32_ONE * 6)); + v1->unk_24.y = (FX32_ONE * 6); ov5_021F5BF0(v1->unk_30.unk_08, v1->unk_30.unk_00); @@ -287,10 +288,10 @@ static int ov5_021F5C70 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F5CD4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5CD4(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F5C4C * v1 = param1; + UnkStruct_ov5_021F5C4C *v1 = param1; sub_020715E4(param0, &v0); @@ -321,9 +322,9 @@ static void ov5_021F5CD4 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_020715D4(param0, &v0); } -static void ov5_021F5D38 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5D38(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F5C4C * v0; + UnkStruct_ov5_021F5C4C *v0; v0 = param1; @@ -333,10 +334,10 @@ static void ov5_021F5D38 (UnkStruct_ov101_021D5D90 * param0, void * param1) ov5_021F5C04(v0->unk_30.unk_08, v0->unk_30.unk_00); } -static void ov5_021F5D54 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5D54(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F5C4C * v1; + UnkStruct_ov5_021F5C4C *v1; v1 = param1; @@ -353,14 +354,14 @@ static void ov5_021F5D54 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_020212A8(v1->unk_40, &v0); } -UnkStruct_ov101_021D5D90 * ov5_021F5D8C (MapObject * param0, int param1, int param2, int param3) +UnkStruct_ov101_021D5D90 *ov5_021F5D8C(MapObject *param0, int param1, int param2, int param3) { int v0; UnkStruct_ov5_021F5D8C v1; - UnkStruct_ov5_021DF47C * v2; + UnkStruct_ov5_021DF47C *v2; VecFx32 v3; - UnkStruct_ov101_021D5D90 * v4; - const UnkStruct_ov101_021D86B0 * v5; + UnkStruct_ov101_021D5D90 *v4; + const UnkStruct_ov101_021D86B0 *v5; v2 = ov5_021DF578(param0); @@ -382,11 +383,11 @@ UnkStruct_ov101_021D5D90 * ov5_021F5D8C (MapObject * param0, int param1, int par return v4; } -static int ov5_021F5DE4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F5DE4(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F5C4C * v1; - const UnkStruct_ov5_021F5D8C * v2; + UnkStruct_ov5_021F5C4C *v1; + const UnkStruct_ov5_021F5D8C *v2; v1 = param1; v2 = sub_020715BC(param0); @@ -394,7 +395,7 @@ static int ov5_021F5DE4 (UnkStruct_ov101_021D5D90 * param0, void * param1) v1->unk_30 = *v2; v1->unk_08 = MapObject_Id(v1->unk_30.unk_0C); v1->unk_0C = sub_02062918(v1->unk_30.unk_0C); - v1->unk_24.y = ((FX32_ONE * 6)); + v1->unk_24.y = (FX32_ONE * 6); ov5_021F5BF0(v1->unk_30.unk_08, v1->unk_30.unk_00); @@ -409,10 +410,10 @@ static int ov5_021F5DE4 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F5E58 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5E58(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F5C4C * v0; - MapObject * v1; + UnkStruct_ov5_021F5C4C *v0; + MapObject *v1; VecFx32 v2; v0 = param1; @@ -421,8 +422,8 @@ static void ov5_021F5E58 (UnkStruct_ov101_021D5D90 * param0, void * param1) GF_ASSERT(sub_02062764(v1, v0->unk_08, v0->unk_0C) != 0); ov5_021ECDA0(v1, &v2); - v2.y += ((FX32_ONE * 32)); - v2.z += ((FX32_ONE * 1)); + v2.y += (FX32_ONE * 32); + v2.z += (FX32_ONE * 1); switch (v0->unk_00) { case 0: @@ -451,11 +452,11 @@ static void ov5_021F5E58 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_020715D4(param0, &v2); } -static int ov5_021F5EE0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F5EE0(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov5_021F5C4C * v1; - const UnkStruct_ov5_021F5D8C * v2; + UnkStruct_ov5_021F5C4C *v1; + const UnkStruct_ov5_021F5D8C *v2; v1 = param1; v2 = sub_020715BC(param0); @@ -463,7 +464,7 @@ static int ov5_021F5EE0 (UnkStruct_ov101_021D5D90 * param0, void * param1) v1->unk_30 = *v2; v1->unk_08 = MapObject_Id(v1->unk_30.unk_0C); v1->unk_0C = sub_02062918(v1->unk_30.unk_0C); - v1->unk_24.y = ((FX32_ONE * 6)); + v1->unk_24.y = (FX32_ONE * 6); v1->unk_10 = 1; ov5_021F5BF0(v1->unk_30.unk_08, v1->unk_30.unk_00); @@ -472,10 +473,10 @@ static int ov5_021F5EE0 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F5F24 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F5F24(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F5C4C * v0; - MapObject * v1; + UnkStruct_ov5_021F5C4C *v0; + MapObject *v1; VecFx32 v2; v0 = param1; @@ -484,8 +485,8 @@ static void ov5_021F5F24 (UnkStruct_ov101_021D5D90 * param0, void * param1) GF_ASSERT(sub_02062764(v1, v0->unk_08, v0->unk_0C) != 0); ov5_021ECDA0(v1, &v2); - v2.y += ((FX32_ONE * 32)); - v2.z += ((FX32_ONE * 1)); + v2.y += (FX32_ONE * 32); + v2.z += (FX32_ONE * 1); switch (v0->unk_00) { case 0: @@ -557,11 +558,11 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200BAC = { }; static const UnkStruct_020217F4 Unk_ov5_02200BC0[] = { - {0x0, 0x1, 0x0}, - {0x0, 0x0, 0x2} + { 0x0, 0x1, 0x0 }, + { 0x0, 0x0, 0x2 } }; -void include_unk_ov5_02200B98 (void) +void include_unk_ov5_02200B98(void) { int dummy = Unk_ov5_02200B98.unk_00; } diff --git a/src/overlay005/ov5_021F600C.c b/src/overlay005/ov5_021F600C.c index b800edd8a0..82235535e7 100644 --- a/src/overlay005/ov5_021F600C.c +++ b/src/overlay005/ov5_021F600C.c @@ -1,30 +1,31 @@ +#include "overlay005/ov5_021F600C.h" + #include #include #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_020217F4.h" + #include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_02020AEC.h" #include "map_object.h" +#include "unk_02020AEC.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F600C.h" typedef struct UnkStruct_ov5_021F600C_t { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; } UnkStruct_ov5_021F600C; typedef struct { - FieldSystem * fieldSystem; - UnkStruct_ov5_021DF47C * unk_04; - UnkStruct_ov5_021F600C * unk_08; - MapObject * unk_0C; + FieldSystem *fieldSystem; + UnkStruct_ov5_021DF47C *unk_04; + UnkStruct_ov5_021F600C *unk_08; + MapObject *unk_0C; } UnkStruct_ov5_021F6094; typedef struct { @@ -33,18 +34,18 @@ typedef struct { int unk_08; int unk_0C; UnkStruct_ov5_021F6094 unk_10; - UnkStruct_020216E0 * unk_20; + UnkStruct_020216E0 *unk_20; } UnkStruct_ov5_021F6134; -static void ov5_021F6038(UnkStruct_ov5_021F600C * param0); -static void ov5_021F6074(UnkStruct_ov5_021F600C * param0); +static void ov5_021F6038(UnkStruct_ov5_021F600C *param0); +static void ov5_021F6074(UnkStruct_ov5_021F600C *param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200BD8; const UnkStruct_020217F4 Unk_ov5_02200BEC[]; -void * ov5_021F600C (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F600C(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F600C * v0; + UnkStruct_ov5_021F600C *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F600C)), 0, 0); v0->unk_00 = param0; @@ -53,33 +54,33 @@ void * ov5_021F600C (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F6028 (void * param0) +void ov5_021F6028(void *param0) { - UnkStruct_ov5_021F600C * v0 = param0; + UnkStruct_ov5_021F600C *v0 = param0; ov5_021F6074(v0); ov5_021DF554(v0); } -static void ov5_021F6038 (UnkStruct_ov5_021F600C * param0) +static void ov5_021F6038(UnkStruct_ov5_021F600C *param0) { ov5_021DF9E0(param0->unk_00, 4, 87); ov5_021DFA3C(param0->unk_00, 3, 6, 1); ov5_021DF864(param0->unk_00, 4, 4, 0, 3, 0, Unk_ov5_02200BEC); } -static void ov5_021F6074 (UnkStruct_ov5_021F600C * param0) +static void ov5_021F6074(UnkStruct_ov5_021F600C *param0) { ov5_021DFA08(param0->unk_00, 4); ov5_021DFA7C(param0->unk_00, 3); ov5_021DF9D4(param0->unk_00, 4); } -UnkStruct_ov101_021D5D90 * ov5_021F6094 (MapObject * param0) +UnkStruct_ov101_021D5D90 *ov5_021F6094(MapObject *param0) { UnkStruct_ov5_021F6094 v0; - UnkStruct_ov5_021DF47C * v1; - UnkStruct_ov101_021D5D90 * v2; + UnkStruct_ov5_021DF47C *v1; + UnkStruct_ov101_021D5D90 *v2; v1 = ov5_021DF578(param0); @@ -89,7 +90,7 @@ UnkStruct_ov101_021D5D90 * ov5_021F6094 (MapObject * param0) v0.unk_0C = param0; { - VecFx32 v3 = {0, 0, 0}; + VecFx32 v3 = { 0, 0, 0 }; int v4 = sub_02062758(param0, 2); v2 = ov5_021DF72C(v1, &Unk_ov5_02200BD8, &v3, 0, &v0, v4); @@ -98,11 +99,11 @@ UnkStruct_ov101_021D5D90 * ov5_021F6094 (MapObject * param0) return v2; } -static int ov5_021F60E4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F60E4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - VecFx32 v0 = {0, 0, 0}; - UnkStruct_ov5_021F6134 * v1; - const UnkStruct_ov5_021F6094 * v2; + VecFx32 v0 = { 0, 0, 0 }; + UnkStruct_ov5_021F6134 *v1; + const UnkStruct_ov5_021F6094 *v2; v1 = param1; v2 = sub_020715BC(param0); @@ -117,18 +118,18 @@ static int ov5_021F60E4 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F6134 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F6134(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F6134 * v0; + UnkStruct_ov5_021F6134 *v0; v0 = param1; sub_020211FC(v0->unk_20); } -static void ov5_021F6140 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F6140(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F6134 * v0; - MapObject * v1; + UnkStruct_ov5_021F6134 *v0; + MapObject *v1; v0 = param1; v1 = v0->unk_10.unk_0C; @@ -139,11 +140,11 @@ static void ov5_021F6140 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F615C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F615C(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0, v1; - UnkStruct_ov5_021F6134 * v2; - MapObject * v3; + UnkStruct_ov5_021F6134 *v2; + MapObject *v3; v2 = param1; v3 = v2->unk_10.unk_0C; @@ -173,6 +174,6 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200BD8 = { }; static const UnkStruct_020217F4 Unk_ov5_02200BEC[] = { - {0x0, 0x1, 0x1}, - {0x0, 0x0, 0x2} + { 0x0, 0x1, 0x1 }, + { 0x0, 0x0, 0x2 } }; diff --git a/src/overlay005/ov5_021F61BC.c b/src/overlay005/ov5_021F61BC.c index 35a5483f5a..5d2b3aa290 100644 --- a/src/overlay005/ov5_021F61BC.c +++ b/src/overlay005/ov5_021F61BC.c @@ -1,35 +1,36 @@ +#include "overlay005/ov5_021F61BC.h" + #include #include #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_0201E190.h" -#include "unk_0205DAC8.h" -#include "player_avatar.h" #include "map_object.h" #include "map_object_move.h" +#include "player_avatar.h" +#include "unk_0201E190.h" +#include "unk_0205DAC8.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F61BC.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073B50 unk_18; } UnkStruct_021F61E8; typedef struct { - UnkStruct_ov5_021DF47C * unk_00; - UnkStruct_021F61E8 * unk_04; - PlayerAvatar * playerAvatar; + UnkStruct_ov5_021DF47C *unk_00; + UnkStruct_021F61E8 *unk_04; + PlayerAvatar *playerAvatar; } UnkStruct_021F6218; typedef struct { @@ -45,16 +46,16 @@ typedef struct { UnkStruct_021F6218 unk_24; } UnkStruct_021F6264; -static void ov5_021F61E8(UnkStruct_021F61E8 * param0); -static void ov5_021F620C(UnkStruct_021F61E8 * param0); +static void ov5_021F61E8(UnkStruct_021F61E8 *param0); +static void ov5_021F620C(UnkStruct_021F61E8 *param0); static int ov5_021F6414(u8 param0); static const UnkStruct_ov101_021D86B0 Unk_ov5_02200C10; static const VecFx32 Unk_ov5_02200C24[4][2]; -void * ov5_021F61BC (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F61BC(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_021F61E8 * v0; + UnkStruct_021F61E8 *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_021F61E8)), 0, 0); v0->unk_00 = param0; @@ -64,32 +65,32 @@ void * ov5_021F61BC (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F61D8 (void * param0) +void ov5_021F61D8(void *param0) { - UnkStruct_021F61E8 * v0 = param0; + UnkStruct_021F61E8 *v0 = param0; ov5_021F620C(v0); ov5_021DF554(v0); } -static void ov5_021F61E8 (UnkStruct_021F61E8 * param0) +static void ov5_021F61E8(UnkStruct_021F61E8 *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 80, 0); sub_02073B70(¶m0->unk_18, ¶m0->unk_04); } -static void ov5_021F620C (UnkStruct_021F61E8 * param0) +static void ov5_021F620C(UnkStruct_021F61E8 *param0) { sub_0207395C(¶m0->unk_04); } -void ov5_021F6218 (PlayerAvatar * playerAvatar) +void ov5_021F6218(PlayerAvatar *playerAvatar) { int v0 = 0, v1; UnkStruct_021F6218 v2; - UnkStruct_ov5_021DF47C * v3; - MapObject * v4; - VecFx32 v5 = {0, 0, 0}; + UnkStruct_ov5_021DF47C *v3; + MapObject *v4; + VecFx32 v5 = { 0, 0, 0 }; v4 = Player_MapObject(playerAvatar); v3 = ov5_021DF578(v4); @@ -102,11 +103,11 @@ void ov5_021F6218 (PlayerAvatar * playerAvatar) ov5_021DF72C(v3, &Unk_ov5_02200C10, &v5, v0, &v2, v1); } -static int ov5_021F6264 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F6264(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F6264 * v0; - MapObject * v1; - const UnkStruct_021F6218 * v2; + UnkStruct_021F6264 *v0; + MapObject *v1; + const UnkStruct_021F6218 *v2; v0 = param1; v2 = sub_020715BC(param0); @@ -120,17 +121,17 @@ static int ov5_021F6264 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F629C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F629C(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov5_021F62A0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F62A0(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_021F6264 * v1 = param1; - PlayerAvatar * playerAvatar = v1->unk_24.playerAvatar; - MapObject * v3 = Player_MapObject(playerAvatar); + UnkStruct_021F6264 *v1 = param1; + PlayerAvatar *playerAvatar = v1->unk_24.playerAvatar; + MapObject *v3 = Player_MapObject(playerAvatar); if (sub_02062764(v3, v1->unk_14, v1->unk_18) == 0) { ov5_021DF74C(param0); @@ -177,9 +178,9 @@ static void ov5_021F62A0 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F636C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F636C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_021F6264 * v0 = param1; + UnkStruct_021F6264 *v0 = param1; if ((v0->unk_00 == 1) || (v0->unk_04 == -1)) { return; @@ -188,9 +189,9 @@ static void ov5_021F636C (UnkStruct_ov101_021D5D90 * param0, void * param1) { u32 v1 = 0; MtxFx33 v2; - VecFx32 v3, v4 = {FX32_ONE, FX32_ONE, FX32_ONE}; - UnkStruct_02073B50 * v5 = &v0->unk_24.unk_04->unk_18; - const VecFx32 * v6 = &Unk_ov5_02200C24[v0->unk_04][v0->unk_20]; + VecFx32 v3, v4 = { FX32_ONE, FX32_ONE, FX32_ONE }; + UnkStruct_02073B50 *v5 = &v0->unk_24.unk_04->unk_18; + const VecFx32 *v6 = &Unk_ov5_02200C24[v0->unk_04][v0->unk_20]; switch (v0->unk_04) { case 0: @@ -217,25 +218,25 @@ static void ov5_021F636C (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static int ov5_021F6414 (u8 param0) +static int ov5_021F6414(u8 param0) { if (sub_0205DB10(param0)) { - return(0); + return 0; } if (sub_0205DB1C(param0)) { - return(1); + return 1; } if (sub_0205DB04(param0)) { - return(2); + return 2; } if (sub_0205DAF8(param0)) { - return(3); + return 3; } - return(-1); + return -1; } static const UnkStruct_ov101_021D86B0 Unk_ov5_02200C10 = { @@ -248,19 +249,19 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200C10 = { static const VecFx32 Unk_ov5_02200C24[4][2] = { { - {0x0, 0x0, 0x0}, - {0x0, 0x0, -(FX32_ONE * 2)} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, -(FX32_ONE * 2) }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, (FX32_ONE * 2)} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, (FX32_ONE * 2) }, }, { - {0x0, 0x0, 0x0}, - {-(FX32_ONE * 2), 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { -(FX32_ONE * 2), 0x0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {(FX32_ONE * 2), 0x0, 0x0} - } + { 0x0, 0x0, 0x0 }, + { (FX32_ONE * 2), 0x0, 0x0 }, + }, }; diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index df5f43bfc3..206f1299e0 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -1,62 +1,59 @@ +#include "overlay005/ov5_021F6454.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_0200112C_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020216E0_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020308A0_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "overlay005/struct_ov5_021F6704_decl.h" - #include "struct_defs/struct_02013A04_t.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021EB1A0.h" +#include "overlay005/ov5_021ECE40.h" +#include "overlay005/struct_ov5_021F6704_decl.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bag.h" +#include "field_script_context.h" +#include "heap.h" +#include "inlines.h" +#include "map_object.h" +#include "message.h" +#include "party.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "savedata_misc.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_0200112C.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_02020AEC.h" -#include "strbuf.h" #include "unk_0202631C.h" -#include "savedata_misc.h" #include "unk_0202C858.h" #include "unk_0202CD50.h" #include "unk_02030880.h" #include "unk_02038F8C.h" -#include "field_script_context.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_0205DFC4.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_020677F4.h" #include "unk_0206AFE0.h" -#include "pokemon.h" -#include "party.h" -#include "bag.h" -#include "overlay005/ov5_021EB1A0.h" -#include "overlay005/ov5_021ECE40.h" -#include "overlay005/ov5_021F6454.h" +#include "vars_flags.h" typedef struct { s16 unk_00; @@ -64,13 +61,13 @@ typedef struct { } UnkStruct_ov5_02200C90; struct UnkStruct_ov5_021F6704_t { - FieldSystem * fieldSystem; - SysTask * unk_04; + FieldSystem *fieldSystem; + SysTask *unk_04; Window unk_08; - Window * unk_18; - Strbuf* unk_1C[120]; - MessageLoader * unk_1FC; - StringTemplate * unk_200; + Window *unk_18; + Strbuf *unk_1C[120]; + MessageLoader *unk_1FC; + StringTemplate *unk_200; u8 unk_204; u8 unk_205; u8 unk_206; @@ -81,12 +78,12 @@ struct UnkStruct_ov5_021F6704_t { u8 unk_209; u8 unk_20A; u8 unk_20B; - u16 * unk_20C; - u16 * unk_210; - u16 * unk_214; - u16 * unk_218; + u16 *unk_20C; + u16 *unk_210; + u16 *unk_214; + u16 *unk_218; UnkStruct_ov84_02240FA8 unk_21C; - BmpList * unk_23C; + BmpList *unk_23C; u16 unk_240; u16 unk_242; ResourceMetadata unk_244[120]; @@ -94,26 +91,26 @@ struct UnkStruct_ov5_021F6704_t { u16 unk_6F4; }; -static u16 * ov5_021F65FC(int param0, int param1, int * param2); -BOOL ScrCmd_2DE(ScriptContext * ctx); -static BOOL ov5_021F65D4(ScriptContext * ctx); -static void ov5_021F70CC(Pokemon * param0, int * param1, int * param2); -BOOL ScrCmd_300(ScriptContext * ctx); -BOOL ScrCmd_301(ScriptContext * ctx); -BOOL ScrCmd_30F(ScriptContext * ctx); -BOOL ScrCmd_2EE(ScriptContext * ctx); -BOOL ScrCmd_2F1(ScriptContext * ctx); -static void ov5_021F661C(UnkStruct_ov5_021F6704 * param0, MessageLoader * param1); -static void ov5_021F6624(FieldSystem * fieldSystem, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringTemplate * param7, Window * param8, MessageLoader * param9, u16 * param10, u16 * param11); -UnkStruct_ov5_021F6704 * ov5_021F6704(FieldSystem * fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8, u16 * param9, u16 * param10); -void ov5_021F6760(UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param2, u32 param3); -static void ov5_021F6768(UnkStruct_ov5_021F6704 * param0); -static void ov5_021F6830(UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param2, u32 param3); -static void ov5_021F68BC(UnkStruct_ov5_021F6704 * param0); -static void ov5_021F69CC(BmpList * param0, u32 param1, u8 param2); -static void ov5_021F69F0(BmpList * param0, u32 param1, u8 param2); -static void ov5_021F6A34(SysTask * param0, void * param1); -static void ov5_021F6AD4(UnkStruct_ov5_021F6704 * param0); +static u16 *ov5_021F65FC(int param0, int param1, int *param2); +BOOL ScrCmd_2DE(ScriptContext *ctx); +static BOOL ov5_021F65D4(ScriptContext *ctx); +static void ov5_021F70CC(Pokemon *param0, int *param1, int *param2); +BOOL ScrCmd_300(ScriptContext *ctx); +BOOL ScrCmd_301(ScriptContext *ctx); +BOOL ScrCmd_30F(ScriptContext *ctx); +BOOL ScrCmd_2EE(ScriptContext *ctx); +BOOL ScrCmd_2F1(ScriptContext *ctx); +static void ov5_021F661C(UnkStruct_ov5_021F6704 *param0, MessageLoader *param1); +static void ov5_021F6624(FieldSystem *fieldSystem, UnkStruct_ov5_021F6704 *param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 *param6, StringTemplate *param7, Window *param8, MessageLoader *param9, u16 *param10, u16 *param11); +UnkStruct_ov5_021F6704 *ov5_021F6704(FieldSystem *fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, Window *param7, MessageLoader *param8, u16 *param9, u16 *param10); +void ov5_021F6760(UnkStruct_ov5_021F6704 *param0, u32 param1, u32 param2, u32 param3); +static void ov5_021F6768(UnkStruct_ov5_021F6704 *param0); +static void ov5_021F6830(UnkStruct_ov5_021F6704 *param0, u32 param1, u32 param2, u32 param3); +static void ov5_021F68BC(UnkStruct_ov5_021F6704 *param0); +static void ov5_021F69CC(BmpList *param0, u32 param1, u8 param2); +static void ov5_021F69F0(BmpList *param0, u32 param1, u8 param2); +static void ov5_021F6A34(SysTask *param0, void *param1); +static void ov5_021F6AD4(UnkStruct_ov5_021F6704 *param0); static u16 Unk_ov5_0220210C[] = { 0x12, @@ -127,18 +124,18 @@ static u16 Unk_ov5_0220210C[] = { 0x1A }; -BOOL ScrCmd_2DE (ScriptContext * ctx) +BOOL ScrCmd_2DE(ScriptContext *ctx) { int v0; - BattleFrontierStage * v1; + BattleFrontierStage *v1; u16 v2; - u16 * v3; + u16 *v3; int v4, v5; - MessageLoader * v6; - MessageLoader * v7; - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021F6704 * v9; - StringTemplate ** v10 = sub_0203F098(fieldSystem, 15); + MessageLoader *v6; + MessageLoader *v7; + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021F6704 *v9; + StringTemplate **v10 = sub_0203F098(fieldSystem, 15); u16 v11 = ScriptContext_GetVar(ctx); u16 v12 = ScriptContext_GetVar(ctx); u16 v13 = ScriptContext_ReadHalfWord(ctx); @@ -185,10 +182,10 @@ BOOL ScrCmd_2DE (ScriptContext * ctx) return 1; } -static BOOL ov5_021F65D4 (ScriptContext * ctx) +static BOOL ov5_021F65D4(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); if (*v1 == 0xeeee) { return 0; @@ -197,10 +194,10 @@ static BOOL ov5_021F65D4 (ScriptContext * ctx) return 1; } -static u16 * ov5_021F65FC (int param0, int param1, int * param2) +static u16 *ov5_021F65FC(int param0, int param1, int *param2) { u32 v0; - u16 * v1; + u16 *v1; v1 = sub_02007068(75, param1, 0, param0, 0, &v0); *param2 = v0 / (sizeof(u16)); @@ -208,13 +205,13 @@ static u16 * ov5_021F65FC (int param0, int param1, int * param2) return v1; } -static void ov5_021F661C (UnkStruct_ov5_021F6704 * param0, MessageLoader * param1) +static void ov5_021F661C(UnkStruct_ov5_021F6704 *param0, MessageLoader *param1) { param0->unk_1FC = param1; return; } -static void ov5_021F6624 (FieldSystem * fieldSystem, UnkStruct_ov5_021F6704 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringTemplate * param7, Window * param8, MessageLoader * param9, u16 * param10, u16 * param11) +static void ov5_021F6624(FieldSystem *fieldSystem, UnkStruct_ov5_021F6704 *param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 *param6, StringTemplate *param7, Window *param8, MessageLoader *param9, u16 *param10, u16 *param11) { int v0; @@ -251,9 +248,9 @@ static void ov5_021F6624 (FieldSystem * fieldSystem, UnkStruct_ov5_021F6704 * pa return; } -UnkStruct_ov5_021F6704 * ov5_021F6704 (FieldSystem * fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8, u16 * param9, u16 * param10) +UnkStruct_ov5_021F6704 *ov5_021F6704(FieldSystem *fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, Window *param7, MessageLoader *param8, u16 *param9, u16 *param10) { - UnkStruct_ov5_021F6704 * v0; + UnkStruct_ov5_021F6704 *v0; int v1; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021F6704)); @@ -268,13 +265,13 @@ UnkStruct_ov5_021F6704 * ov5_021F6704 (FieldSystem * fieldSystem, u8 param1, u8 return v0; } -void ov5_021F6760 (UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param2, u32 param3) +void ov5_021F6760(UnkStruct_ov5_021F6704 *param0, u32 param1, u32 param2, u32 param3) { ov5_021F6830(param0, param1, param2, param3); return; } -static void ov5_021F6768 (UnkStruct_ov5_021F6704 * param0) +static void ov5_021F6768(UnkStruct_ov5_021F6704 *param0) { if (param0->unk_20B > 8) { BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_208, param0->unk_209, 11, 8 * 2, 13, 1); @@ -292,13 +289,13 @@ static void ov5_021F6768 (UnkStruct_ov5_021F6704 * param0) return; } -static void ov5_021F6830 (UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param2, u32 param3) +static void ov5_021F6830(UnkStruct_ov5_021F6704 *param0, u32 param1, u32 param2, u32 param3) { int v0; - void * v1; + void *v1; { - Strbuf* v2 = Strbuf_Init((40 * 2), 4); + Strbuf *v2 = Strbuf_Init((40 * 2), 4); MessageLoader_GetStrbuf(param0->unk_1FC, param1, v2); StringTemplate_Format(param0->unk_200, param0->unk_1C[param0->unk_20B], v2); @@ -318,7 +315,7 @@ static void ov5_021F6830 (UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param return; } -static void ov5_021F68BC (UnkStruct_ov5_021F6704 * param0) +static void ov5_021F68BC(UnkStruct_ov5_021F6704 *param0) { param0->unk_21C.unk_00 = param0->unk_244; param0->unk_21C.unk_04 = ov5_021F69F0; @@ -343,7 +340,7 @@ static void ov5_021F68BC (UnkStruct_ov5_021F6704 * param0) return; } -static void ov5_021F69CC (BmpList * param0, u32 param1, u8 param2) +static void ov5_021F69CC(BmpList *param0, u32 param1, u8 param2) { if (param1 == 0xfffffffd) { sub_0200147C(param0, 3, 15, 4); @@ -352,12 +349,12 @@ static void ov5_021F69CC (BmpList * param0, u32 param1, u8 param2) } } -static void ov5_021F69F0 (BmpList * param0, u32 param1, u8 param2) +static void ov5_021F69F0(BmpList *param0, u32 param1, u8 param2) { u32 v0, v1; u16 v2 = 0; u16 v3 = 0; - UnkStruct_ov5_021F6704 * v4 = (UnkStruct_ov5_021F6704 *)sub_02001504(param0, 19); + UnkStruct_ov5_021F6704 *v4 = (UnkStruct_ov5_021F6704 *)sub_02001504(param0, 19); sub_020014DC(param0, &v2, &v3); @@ -369,11 +366,11 @@ static void ov5_021F69F0 (BmpList * param0, u32 param1, u8 param2) return; } -static void ov5_021F6A34 (SysTask * param0, void * param1) +static void ov5_021F6A34(SysTask *param0, void *param1) { u16 v0; u32 v1; - UnkStruct_ov5_021F6704 * v2; + UnkStruct_ov5_021F6704 *v2; v2 = (UnkStruct_ov5_021F6704 *)param1; @@ -415,7 +412,7 @@ static void ov5_021F6A34 (SysTask * param0, void * param1) return; } -static void ov5_021F6AD4 (UnkStruct_ov5_021F6704 * param0) +static void ov5_021F6AD4(UnkStruct_ov5_021F6704 *param0) { int v0; @@ -447,16 +444,16 @@ static const u16 Unk_ov5_02200C84[] = { 0x7E }; -BOOL ScrCmd_2EE (ScriptContext * param0) +BOOL ScrCmd_2EE(ScriptContext *param0) { u8 v0; u32 v1[6]; - Pokemon * v2; - FieldSystem * fieldSystem = param0->fieldSystem; + Pokemon *v2; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v4 = ScriptContext_GetVar(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); - u16 * v6 = ScriptContext_GetVarPointer(param0); - u16 * v7 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); + u16 *v6 = ScriptContext_GetVarPointer(param0); + u16 *v7 = ScriptContext_GetVarPointer(param0); v2 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), v4); @@ -492,17 +489,17 @@ BOOL ScrCmd_2EE (ScriptContext * param0) return 0; } -BOOL ScrCmd_31D (ScriptContext * param0) +BOOL ScrCmd_31D(ScriptContext *param0) { - Pokemon * v0; - Party * v1; + Pokemon *v0; + Party *v1; int v2, v3, v4; int v5, v6; u32 v7; int v8[6]; int v9 = 0; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v11 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v11 = ScriptContext_GetVarPointer(param0); v1 = Party_GetFromSavedata(fieldSystem->saveData); v2 = Party_GetCurrentCount(v1); @@ -559,17 +556,17 @@ BOOL ScrCmd_31D (ScriptContext * param0) return 0; } -BOOL ScrCmd_31E (ScriptContext * param0) +BOOL ScrCmd_31E(ScriptContext *param0) { - Pokemon * v0; - Party * v1; + Pokemon *v0; + Party *v1; int v2, v3; u32 v4; int v5; int v6; - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v8 = ScriptContext_GetVar(param0); - u16 * v9 = ScriptContext_GetVarPointer(param0); + u16 *v9 = ScriptContext_GetVarPointer(param0); v1 = Party_GetFromSavedata(fieldSystem->saveData); v0 = Party_GetPokemonBySlotIndex(v1, v8); @@ -615,10 +612,10 @@ BOOL ScrCmd_31E (ScriptContext * param0) return 0; } -BOOL ScrCmd_2F1 (ScriptContext * param0) +BOOL ScrCmd_2F1(ScriptContext *param0) { - Pokemon * v0; - FieldSystem * fieldSystem = param0->fieldSystem; + Pokemon *v0; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -628,15 +625,15 @@ BOOL ScrCmd_2F1 (ScriptContext * param0) return 0; } -BOOL ScrCmd_303 (ScriptContext * param0) +BOOL ScrCmd_303(ScriptContext *param0) { u32 v0, v1, v2; int v3, v4, v5; - Pokemon * v6; - Party * v7; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v9 = ScriptContext_GetVarPointer(param0); - u16 * v10 = ScriptContext_GetVarPointer(param0); + Pokemon *v6; + Party *v7; + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v9 = ScriptContext_GetVarPointer(param0); + u16 *v10 = ScriptContext_GetVarPointer(param0); v5 = 0; *v10 = 0xff; @@ -662,13 +659,13 @@ BOOL ScrCmd_303 (ScriptContext * param0) return 0; } -BOOL ScrCmd_304 (ScriptContext * param0) +BOOL ScrCmd_304(ScriptContext *param0) { u32 v0, v1; u16 v2, v3; - Pokemon * v4; - Party * v5; - FieldSystem * fieldSystem = param0->fieldSystem; + Pokemon *v4; + Party *v5; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v7 = ScriptContext_GetVar(param0); u16 v8 = ScriptContext_GetVar(param0); u16 v9 = ScriptContext_GetVar(param0); @@ -683,14 +680,14 @@ BOOL ScrCmd_304 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2FF (ScriptContext * param0) +BOOL ScrCmd_2FF(ScriptContext *param0) { u16 v0; int v1, v2; - Pokemon * v3; - FieldSystem * fieldSystem = param0->fieldSystem; + Pokemon *v3; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v5 = ScriptContext_GetVar(param0); - u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 *v6 = ScriptContext_GetVarPointer(param0); v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), v5); v0 = Pokemon_GetValue(v3, MON_DATA_SPECIES, NULL); @@ -724,7 +721,7 @@ BOOL ScrCmd_2FF (ScriptContext * param0) return 0; } -static void ov5_021F70CC (Pokemon * param0, int * param1, int * param2) +static void ov5_021F70CC(Pokemon *param0, int *param1, int *param2) { int v0; int v1; @@ -755,11 +752,11 @@ static void ov5_021F70CC (Pokemon * param0, int * param1, int * param2) } } -BOOL ScrCmd_300 (ScriptContext * param0) +BOOL ScrCmd_300(ScriptContext *param0) { - MiscSaveBlock * v0; - Pokemon * v1; - FieldSystem * fieldSystem = param0->fieldSystem; + MiscSaveBlock *v0; + Pokemon *v1; + FieldSystem *fieldSystem = param0->fieldSystem; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), 0); v0 = SaveData_MiscSaveBlock(fieldSystem->saveData); @@ -768,15 +765,15 @@ BOOL ScrCmd_300 (ScriptContext * param0) return 0; } -BOOL ScrCmd_301 (ScriptContext * param0) +BOOL ScrCmd_301(ScriptContext *param0) { int v0, v1, v2; - MiscSaveBlock * v3; - Pokemon * v4; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v6 = ScriptContext_GetVarPointer(param0); - u16 * v7 = ScriptContext_GetVarPointer(param0); - u16 * v8 = ScriptContext_GetVarPointer(param0); + MiscSaveBlock *v3; + Pokemon *v4; + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v6 = ScriptContext_GetVarPointer(param0); + u16 *v7 = ScriptContext_GetVarPointer(param0); + u16 *v8 = ScriptContext_GetVarPointer(param0); v3 = SaveData_MiscSaveBlock(fieldSystem->saveData); MiscSaveBlock_FavoriteMon(v3, &v0, &v1, &v2); @@ -788,13 +785,13 @@ BOOL ScrCmd_301 (ScriptContext * param0) return 0; } -BOOL ScrCmd_305 (ScriptContext * param0) +BOOL ScrCmd_305(ScriptContext *param0) { - Pokemon * v0; - Party * v1; - FieldSystem * fieldSystem = param0->fieldSystem; + Pokemon *v0; + Party *v1; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v3 = ScriptContext_GetVar(param0); - u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 *v4 = ScriptContext_GetVarPointer(param0); v1 = Party_GetFromSavedata(fieldSystem->saveData); v0 = Party_GetPokemonBySlotIndex(v1, v3); @@ -803,13 +800,13 @@ BOOL ScrCmd_305 (ScriptContext * param0) return 0; } -BOOL ScrCmd_30F (ScriptContext * param0) +BOOL ScrCmd_30F(ScriptContext *param0) { - VarsFlags * v0; - UnkStruct_0202CD88 * v1; - FieldSystem * fieldSystem = param0->fieldSystem; + VarsFlags *v0; + UnkStruct_0202CD88 *v1; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v3 = ScriptContext_GetVar(param0); - u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 *v4 = ScriptContext_GetVarPointer(param0); v0 = SaveData_GetVarsFlags(fieldSystem->saveData); v1 = sub_0202CD88(fieldSystem->saveData); @@ -861,7 +858,7 @@ BOOL ScrCmd_30F (ScriptContext * param0) } break; case 15: - if (sub_0202CFB8(v1, (((70 + 1)) + 2)) < 10) { + if (sub_0202CFB8(v1, ((70 + 1) + 2)) < 10) { *v4 = 0; } break; @@ -890,45 +887,45 @@ BOOL ScrCmd_30F (ScriptContext * param0) return 0; } -BOOL ScrCmd_316 (ScriptContext * param0) +BOOL ScrCmd_316(ScriptContext *param0) { return 1; } static const UnkStruct_ov5_02200C90 Unk_ov5_02200C90[] = { - {0x4, 0x7}, - {0x5, 0x5}, - {0x5, 0x9}, - {0x7, 0x7}, - {0x9, 0x5}, - {0x9, 0x9}, - {0xA, 0x7} + { 0x4, 0x7 }, + { 0x5, 0x5 }, + { 0x5, 0x9 }, + { 0x7, 0x7 }, + { 0x9, 0x5 }, + { 0x9, 0x9 }, + { 0xA, 0x7 } }; static const UnkStruct_ov5_02200C90 Unk_ov5_02200CAC[] = { - {0x3, 0x7}, - {0x5, 0x7}, - {0x7, 0x5}, - {0x7, 0x7}, - {0x7, 0x9}, - {0x9, 0x7}, - {0xB, 0x7} + { 0x3, 0x7 }, + { 0x5, 0x7 }, + { 0x7, 0x5 }, + { 0x7, 0x7 }, + { 0x7, 0x9 }, + { 0x9, 0x7 }, + { 0xB, 0x7 } }; static const UnkStruct_ov5_02200C90 Unk_ov5_02200CC8[] = { - {0x5, 0x5}, - {0x5, 0x7}, - {0x5, 0x9}, - {0x7, 0x7}, - {0x9, 0x5}, - {0x9, 0x7}, - {0x9, 0x9} + { 0x5, 0x5 }, + { 0x5, 0x7 }, + { 0x5, 0x9 }, + { 0x7, 0x7 }, + { 0x9, 0x5 }, + { 0x9, 0x7 }, + { 0x9, 0x9 } }; -BOOL ScrCmd_32C (ScriptContext * param0) +BOOL ScrCmd_32C(ScriptContext *param0) { int v0, v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); u16 v5 = ScriptContext_GetVar(param0); @@ -976,16 +973,16 @@ BOOL ScrCmd_32C (ScriptContext * param0) return 0; } -BOOL ScrCmd_32D (ScriptContext * ctx) +BOOL ScrCmd_32D(ScriptContext *ctx) { fx32 v0; VecFx32 v1; - UnkStruct_020216E0 * v2; + UnkStruct_020216E0 *v2; int v3 = 0; - FieldSystem * fieldSystem = ctx->fieldSystem; - MapObjectManager * mapObjMan = fieldSystem->mapObjMan; - MapObject * v6 = Player_MapObject(fieldSystem->playerAvatar); - MapObject * v7; + FieldSystem *fieldSystem = ctx->fieldSystem; + MapObjectManager *mapObjMan = fieldSystem->mapObjMan; + MapObject *v6 = Player_MapObject(fieldSystem->playerAvatar); + MapObject *v7; MapObject_PosVectorOut(v6, &v1); v0 = v1.y; @@ -1020,13 +1017,13 @@ BOOL ScrCmd_32D (ScriptContext * ctx) return 0; } -BOOL ScrCmd_32E (ScriptContext * ctx) +BOOL ScrCmd_32E(ScriptContext *ctx) { int v0 = 0; - FieldSystem * fieldSystem = ctx->fieldSystem; - MapObjectManager * mapObjMan = fieldSystem->mapObjMan; - MapObject * v3 = Player_MapObject(fieldSystem->playerAvatar); - MapObject * v4; + FieldSystem *fieldSystem = ctx->fieldSystem; + MapObjectManager *mapObjMan = fieldSystem->mapObjMan; + MapObject *v3 = Player_MapObject(fieldSystem->playerAvatar); + MapObject *v4; while (sub_020625B0(mapObjMan, &v4, &v0, (1 << 0)) == 1) { if (v4 != v3) { @@ -1037,10 +1034,10 @@ BOOL ScrCmd_32E (ScriptContext * ctx) return 0; } -static void ov5_021F7654 (MapObject * param0, int param1) +static void ov5_021F7654(MapObject *param0, int param1) { VecFx32 v0; - UnkStruct_020216E0 * v1; + UnkStruct_020216E0 *v1; MapObject_SetStatusFlagOn(param0, (1 << 13)); MapObject_PosVectorOut(param0, &v0); @@ -1058,11 +1055,11 @@ static void ov5_021F7654 (MapObject * param0, int param1) } } -BOOL ScrCmd_331 (ScriptContext * ctx) +BOOL ScrCmd_331(ScriptContext *ctx) { - MapObject * v0; - FieldSystem * fieldSystem = ctx->fieldSystem; - MapObjectManager * mapObjMan = fieldSystem->mapObjMan; + MapObject *v0; + FieldSystem *fieldSystem = ctx->fieldSystem; + MapObjectManager *mapObjMan = fieldSystem->mapObjMan; v0 = MapObjMan_LocalMapObjByIndex(mapObjMan, 32); @@ -1079,10 +1076,10 @@ BOOL ScrCmd_331 (ScriptContext * ctx) return 0; } -BOOL ScrCmd_332 (ScriptContext * ctx) +BOOL ScrCmd_332(ScriptContext *ctx) { - MapObject * v0; - MapObjectManager * v1 = ctx->fieldSystem->mapObjMan; + MapObject *v0; + MapObjectManager *v1 = ctx->fieldSystem->mapObjMan; v0 = MapObjMan_LocalMapObjByIndex(v1, 32); @@ -1099,52 +1096,51 @@ BOOL ScrCmd_332 (ScriptContext * ctx) return 0; } -BOOL ScrCmd_338 (ScriptContext * ctx) -{ +BOOL ScrCmd_338(ScriptContext *ctx) +{ int v0; - MapObject * v1 = MapObjMan_LocalMapObjByIndex(ctx->fieldSystem->mapObjMan, 15); - if (v1 != NULL) - { - switch (MapObject_GetXPos(v1)) - { - case 28: - v0 = 6; - break; - case 38: - v0 = 5; - break; - case 40: - v0 = 3; - break; - case 48: - v0 = 2; - break; - default: - v0 = 4; - break; + MapObject *v1 = MapObjMan_LocalMapObjByIndex(ctx->fieldSystem->mapObjMan, 15); + if (v1 != NULL) { + switch (MapObject_GetXPos(v1)) { + case 28: + v0 = 6; + break; + case 38: + v0 = 5; + break; + case 40: + v0 = 3; + break; + case 48: + v0 = 2; + break; + default: + v0 = 4; + break; } ov5_021F7654(v1, v0); } return 0; } -BOOL ScrCmd_339 (ScriptContext * ctx) +BOOL ScrCmd_339(ScriptContext *ctx) { - MapObject * v0 = MapObjMan_LocalMapObjByIndex(ctx->fieldSystem->mapObjMan, 15); - if (v0 != NULL) + MapObject *v0 = MapObjMan_LocalMapObjByIndex(ctx->fieldSystem->mapObjMan, 15); + if (v0 != NULL) { MapObject_SetStatusFlagOff(v0, 8192); + } return 0; } -BOOL ScrCmd_330 (ScriptContext * ctx) +BOOL ScrCmd_330(ScriptContext *ctx) { - UnkStruct_0202C878 * v0 = sub_0202C878(ctx->fieldSystem->saveData); + UnkStruct_0202C878 *v0 = sub_0202C878(ctx->fieldSystem->saveData); sub_02038F8C(v0); return 1; } -BOOL ScrCmd_333 (ScriptContext * ctx) +BOOL ScrCmd_333(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 5d0eecc49d..4cef931332 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -1,56 +1,53 @@ +#include "overlay005/ov5_021F77A8.h" + #include #include -#include "inlines.h" +#include "constants/forms.h" +#include "constants/species.h" #include "struct_decls/struct_0200112C_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "pokemon.h" -#include "bag.h" -#include "overlay005/struct_ov5_021DC1A4_decl.h" -#include "overlay005/struct_ov5_021F7ED8_decl.h" - #include "struct_defs/struct_02013A04_t.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DC018.h" +#include "overlay005/struct_ov5_021DC1A4_decl.h" +#include "overlay005/struct_ov5_021F7ED8_decl.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "unk_0200112C.h" -#include "unk_02005474.h" +#include "bag.h" +#include "field_script_context.h" +#include "heap.h" +#include "inlines.h" #include "message.h" +#include "party.h" +#include "pokemon.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "tutor_movesets.h" +#include "unk_0200112C.h" +#include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "strbuf.h" #include "unk_0202631C.h" -#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_02054884.h" -#include "constants/species.h" -#include "constants/forms.h" -#include "pokemon.h" -#include "party.h" -#include "bag.h" -#include "overlay005/ov5_021DC018.h" -#include "overlay005/ov5_021F77A8.h" -#include "tutor_movesets.h" #include "res/pokemon/tutor_movesets.h" struct UnkStruct_ov5_021F7ED8_t { - FieldSystem * fieldSystem; - SysTask * unk_04; + FieldSystem *fieldSystem; + SysTask *unk_04; Window unk_08; - Window * unk_18; - Strbuf* unk_1C[39]; - MessageLoader * unk_B8; - StringTemplate * unk_BC; + Window *unk_18; + Strbuf *unk_1C[39]; + MessageLoader *unk_B8; + StringTemplate *unk_BC; u8 unk_C0; u8 unk_C1; u8 unk_C2; @@ -61,10 +58,10 @@ struct UnkStruct_ov5_021F7ED8_t { u8 unk_C5; u8 unk_C6; u8 unk_C7; - u16 * unk_C8; - u16 * unk_CC; + u16 *unk_C8; + u16 *unk_CC; UnkStruct_ov84_02240FA8 unk_D0; - BmpList * unk_F0; + BmpList *unk_F0; u16 unk_F4; u16 unk_F6; ResourceMetadata unk_F8[39]; @@ -72,43 +69,43 @@ struct UnkStruct_ov5_021F7ED8_t { u16 unk_27E; }; -BOOL ScrCmd_2E5(ScriptContext * param0); -BOOL ScrCmd_2E9(ScriptContext * param0); -BOOL ScrCmd_2EA(ScriptContext * param0); -BOOL ScrCmd_2EB(ScriptContext * param0); -BOOL ScrCmd_2E6(ScriptContext * param0); -static BOOL ov5_021F7DE8(ScriptContext * param0); +BOOL ScrCmd_2E5(ScriptContext *param0); +BOOL ScrCmd_2E9(ScriptContext *param0); +BOOL ScrCmd_2EA(ScriptContext *param0); +BOOL ScrCmd_2EB(ScriptContext *param0); +BOOL ScrCmd_2E6(ScriptContext *param0); +static BOOL ov5_021F7DE8(ScriptContext *param0); static u16 ov5_021F7A3C(u16 param0); static u16 ov5_021F7A4C(u16 param0); -static u8 ReadMovesetMaskByte(Pokemon * param0, u8 param1); -static u16 ov5_021F7B60(Pokemon * param0, u16 param1); -static void ov5_021F7E10(UnkStruct_ov5_021F7ED8 * param0, MessageLoader * param1); -static void ov5_021F7E18(FieldSystem * fieldSystem, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringTemplate * param7, Window * param8, MessageLoader * param9); -UnkStruct_ov5_021F7ED8 * ov5_021F7ED8(FieldSystem * fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8); -void ov5_021F7F2C(UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param2, u32 param3); -static void ov5_021F7F34(UnkStruct_ov5_021F7ED8 * param0); -static void ov5_021F7FF8(UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param2, u32 param3); -static void ov5_021F8090(UnkStruct_ov5_021F7ED8 * param0); -static void ov5_021F819C(BmpList * param0, u32 param1, u8 param2); -static void ov5_021F81A8(SysTask * param0, void * param1); -static void ov5_021F8250(UnkStruct_ov5_021F7ED8 * param0); - -BOOL ScrCmd_337 (ScriptContext * param0) +static u8 ReadMovesetMaskByte(Pokemon *param0, u8 param1); +static u16 ov5_021F7B60(Pokemon *param0, u16 param1); +static void ov5_021F7E10(UnkStruct_ov5_021F7ED8 *param0, MessageLoader *param1); +static void ov5_021F7E18(FieldSystem *fieldSystem, UnkStruct_ov5_021F7ED8 *param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 *param6, StringTemplate *param7, Window *param8, MessageLoader *param9); +UnkStruct_ov5_021F7ED8 *ov5_021F7ED8(FieldSystem *fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, Window *param7, MessageLoader *param8); +void ov5_021F7F2C(UnkStruct_ov5_021F7ED8 *param0, u32 param1, u32 param2, u32 param3); +static void ov5_021F7F34(UnkStruct_ov5_021F7ED8 *param0); +static void ov5_021F7FF8(UnkStruct_ov5_021F7ED8 *param0, u32 param1, u32 param2, u32 param3); +static void ov5_021F8090(UnkStruct_ov5_021F7ED8 *param0); +static void ov5_021F819C(BmpList *param0, u32 param1, u8 param2); +static void ov5_021F81A8(SysTask *param0, void *param1); +static void ov5_021F8250(UnkStruct_ov5_021F7ED8 *param0); + +BOOL ScrCmd_337(ScriptContext *param0) { u16 v0 = sub_0203F150(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); - u16 * v1 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); - PokedexData * v2 = SaveData_Pokedex(param0->fieldSystem->saveData); + u16 *v1 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); + PokedexData *v2 = SaveData_Pokedex(param0->fieldSystem->saveData); *v1 = sub_02026FE8(v2, v0); return 0; } -BOOL ScrCmd_2E5 (ScriptContext * param0) +BOOL ScrCmd_2E5(ScriptContext *param0) { - Pokemon * v0; + Pokemon *v0; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v1); *v3 = ov5_021F7B60(v0, v2); @@ -116,7 +113,7 @@ BOOL ScrCmd_2E5 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2E9 (ScriptContext * param0) +BOOL ScrCmd_2E9(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); u16 v1 = ScriptContext_GetVar(param0); @@ -126,13 +123,13 @@ BOOL ScrCmd_2E9 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2EA (ScriptContext * param0) +BOOL ScrCmd_2EA(ScriptContext *param0) { int v0; u8 v1, v2, v3, v4; - Bag * v5; + Bag *v5; u16 v6 = ScriptContext_GetVar(param0); - u16 * v7 = ScriptContext_GetVarPointer(param0); + u16 *v7 = ScriptContext_GetVarPointer(param0); v5 = SaveData_GetBag(param0->fieldSystem->saveData); @@ -181,11 +178,11 @@ BOOL ScrCmd_2EA (ScriptContext * param0) return 0; } -BOOL ScrCmd_2EB (ScriptContext * param0) +BOOL ScrCmd_2EB(ScriptContext *param0) { int v0; u8 v1, v2, v3, v4; - Bag * v5; + Bag *v5; u16 v6 = ScriptContext_GetVar(param0); v5 = SaveData_GetBag(param0->fieldSystem->saveData); @@ -212,12 +209,12 @@ BOOL ScrCmd_2EB (ScriptContext * param0) return 0; } -static u16 ov5_021F7A3C (u16 param0) +static u16 ov5_021F7A3C(u16 param0) { return sTeachableMoves[param0].moveID; } -static u16 ov5_021F7A4C (u16 param0) +static u16 ov5_021F7A4C(u16 param0) { int v0; @@ -231,7 +228,7 @@ static u16 ov5_021F7A4C (u16 param0) return 0; } -static u8 ReadMovesetMaskByte (Pokemon * pokemon, u8 offset) +static u8 ReadMovesetMaskByte(Pokemon *pokemon, u8 offset) { u32 species = Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL); u32 form = Pokemon_GetValue(pokemon, MON_DATA_FORM, NULL); @@ -282,7 +279,7 @@ static u8 ReadMovesetMaskByte (Pokemon * pokemon, u8 offset) return sTeachableMovesets[moveset - 1].maskData[offset]; } -static u16 ov5_021F7B60 (Pokemon * param0, u16 param1) +static u16 ov5_021F7B60(Pokemon *param0, u16 param1) { int v0, v1, v2; u8 v3, v4; @@ -318,18 +315,18 @@ static u16 ov5_021F7B60 (Pokemon * param0, u16 param1) return 0; } -BOOL ScrCmd_2E6 (ScriptContext * param0) +BOOL ScrCmd_2E6(ScriptContext *param0) { u8 v0, v1; int v2, v3, v4, v5; - Pokemon * v6; - MessageLoader * v7; - MessageLoader * v8; - FieldSystem * fieldSystem = param0->fieldSystem; - UnkStruct_ov5_021F7ED8 * v10; + Pokemon *v6; + MessageLoader *v7; + MessageLoader *v8; + FieldSystem *fieldSystem = param0->fieldSystem; + UnkStruct_ov5_021F7ED8 *v10; u16 v11[4]; u16 v12[(NELEMS(sTeachableMoves))]; - StringTemplate ** v13 = sub_0203F098(fieldSystem, 15); + StringTemplate **v13 = sub_0203F098(fieldSystem, 15); u16 v14 = ScriptContext_GetVar(param0); u16 v15 = ScriptContext_GetVar(param0); u16 v16 = ScriptContext_ReadHalfWord(param0); @@ -401,10 +398,10 @@ BOOL ScrCmd_2E6 (ScriptContext * param0) return 1; } -static BOOL ov5_021F7DE8 (ScriptContext * param0) +static BOOL ov5_021F7DE8(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v1 = FieldSystem_GetVarPointer(fieldSystem, param0->data[0]); + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v1 = FieldSystem_GetVarPointer(fieldSystem, param0->data[0]); if (*v1 == 0xeeee) { return 0; @@ -413,13 +410,13 @@ static BOOL ov5_021F7DE8 (ScriptContext * param0) return 1; } -static void ov5_021F7E10 (UnkStruct_ov5_021F7ED8 * param0, MessageLoader * param1) +static void ov5_021F7E10(UnkStruct_ov5_021F7ED8 *param0, MessageLoader *param1) { param0->unk_B8 = param1; return; } -static void ov5_021F7E18 (FieldSystem * fieldSystem, UnkStruct_ov5_021F7ED8 * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringTemplate * param7, Window * param8, MessageLoader * param9) +static void ov5_021F7E18(FieldSystem *fieldSystem, UnkStruct_ov5_021F7ED8 *param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 *param6, StringTemplate *param7, Window *param8, MessageLoader *param9) { int v0; @@ -452,9 +449,9 @@ static void ov5_021F7E18 (FieldSystem * fieldSystem, UnkStruct_ov5_021F7ED8 * pa return; } -UnkStruct_ov5_021F7ED8 * ov5_021F7ED8 (FieldSystem * fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, Window * param7, MessageLoader * param8) +UnkStruct_ov5_021F7ED8 *ov5_021F7ED8(FieldSystem *fieldSystem, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, Window *param7, MessageLoader *param8) { - UnkStruct_ov5_021F7ED8 * v0; + UnkStruct_ov5_021F7ED8 *v0; int v1; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021F7ED8)); @@ -469,13 +466,13 @@ UnkStruct_ov5_021F7ED8 * ov5_021F7ED8 (FieldSystem * fieldSystem, u8 param1, u8 return v0; } -void ov5_021F7F2C (UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param2, u32 param3) +void ov5_021F7F2C(UnkStruct_ov5_021F7ED8 *param0, u32 param1, u32 param2, u32 param3) { ov5_021F7FF8(param0, param1, param2, param3); return; } -static void ov5_021F7F34 (UnkStruct_ov5_021F7ED8 * param0) +static void ov5_021F7F34(UnkStruct_ov5_021F7ED8 *param0) { if (param0->unk_C7 > 8) { BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, param0->unk_C4, param0->unk_C5, 11, 8 * 2, 13, 1); @@ -493,13 +490,13 @@ static void ov5_021F7F34 (UnkStruct_ov5_021F7ED8 * param0) return; } -static void ov5_021F7FF8 (UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param2, u32 param3) +static void ov5_021F7FF8(UnkStruct_ov5_021F7ED8 *param0, u32 param1, u32 param2, u32 param3) { int v0; - void * v1; + void *v1; { - Strbuf* v2 = Strbuf_Init((40 * 2), 4); + Strbuf *v2 = Strbuf_Init((40 * 2), 4); MessageLoader_GetStrbuf(param0->unk_B8, param1, v2); StringTemplate_Format(param0->unk_BC, param0->unk_1C[param0->unk_C7], v2); @@ -519,7 +516,7 @@ static void ov5_021F7FF8 (UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param return; } -static void ov5_021F8090 (UnkStruct_ov5_021F7ED8 * param0) +static void ov5_021F8090(UnkStruct_ov5_021F7ED8 *param0) { param0->unk_D0.unk_00 = param0->unk_F8; param0->unk_D0.unk_04 = ov5_021F819C; @@ -544,21 +541,21 @@ static void ov5_021F8090 (UnkStruct_ov5_021F7ED8 * param0) return; } -static void ov5_021F819C (BmpList * param0, u32 param1, u8 param2) +static void ov5_021F819C(BmpList *param0, u32 param1, u8 param2) { u32 v0, v1; u16 v2 = 0; u16 v3 = 0; - UnkStruct_ov5_021F7ED8 * v4 = (UnkStruct_ov5_021F7ED8 *)sub_02001504(param0, 19); + UnkStruct_ov5_021F7ED8 *v4 = (UnkStruct_ov5_021F7ED8 *)sub_02001504(param0, 19); return; } -static void ov5_021F81A8 (SysTask * param0, void * param1) +static void ov5_021F81A8(SysTask *param0, void *param1) { u16 v0; u32 v1; - UnkStruct_ov5_021F7ED8 * v2; + UnkStruct_ov5_021F7ED8 *v2; v2 = (UnkStruct_ov5_021F7ED8 *)param1; @@ -601,7 +598,7 @@ static void ov5_021F81A8 (SysTask * param0, void * param1) return; } -static void ov5_021F8250 (UnkStruct_ov5_021F7ED8 * param0) +static void ov5_021F8250(UnkStruct_ov5_021F7ED8 *param0) { int v0; @@ -624,15 +621,15 @@ static void ov5_021F8250 (UnkStruct_ov5_021F7ED8 * param0) return; } -BOOL ScrCmd_2EC (ScriptContext * param0) +BOOL ScrCmd_2EC(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); - UnkStruct_ov5_021DC1A4 ** v2 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); + UnkStruct_ov5_021DC1A4 **v2 = sub_0203F098(fieldSystem, 0); u8 v3 = ScriptContext_ReadByte(param0); u8 v4 = ScriptContext_ReadByte(param0); u16 v5 = ScriptContext_GetVar(param0); - u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 *v6 = ScriptContext_GetVarPointer(param0); v5 = ov5_021F7A4C(v5); *v2 = ov5_021DD250(fieldSystem, v3, v4, v6, *v1, sTeachableMoves[v5].redCost, sTeachableMoves[v5].blueCost, sTeachableMoves[v5].yellowCost, sTeachableMoves[v5].greenCost); @@ -640,10 +637,10 @@ BOOL ScrCmd_2EC (ScriptContext * param0) return 0; } -BOOL ScrCmd_2ED (ScriptContext * param0) +BOOL ScrCmd_2ED(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = param0->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); ov5_021DD3A8(*v1); return 0; diff --git a/src/overlay005/ov5_021F8370.c b/src/overlay005/ov5_021F8370.c index 287039e69c..3efdd1b024 100644 --- a/src/overlay005/ov5_021F8370.c +++ b/src/overlay005/ov5_021F8370.c @@ -1,22 +1,23 @@ +#include "overlay005/ov5_021F8370.h" + #include #include #include "struct_decls/struct_02027860_decl.h" -#include "overlay005/struct_ov5_021E1890_decl.h" +#include "struct_defs/struct_02071C34.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_02071C34.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/struct_ov5_021E1890_decl.h" +#include "field_system.h" #include "heap.h" #include "savedata_misc.h" #include "unk_02027F50.h" -#include "field_system.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_0206A8DC.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021F8370.h" +#include "vars_flags.h" typedef struct UnkStruct_ov5_021F8480_t UnkStruct_ov5_021F8480; @@ -42,29 +43,29 @@ typedef struct { u16 unk_00; u16 unk_02; u32 unk_04; - UnkStruct_ov5_021E1890 * unk_08; + UnkStruct_ov5_021E1890 *unk_08; } UnkStruct_ov5_021F8480_sub1; struct UnkStruct_ov5_021F8480_t { - FieldSystem * fieldSystem; - UnkStruct_02071C34 * unk_04; + FieldSystem *fieldSystem; + UnkStruct_02071C34 *unk_04; UnkStruct_ov5_021F8480_sub1 unk_08[23]; }; -static void ov5_021F8480(UnkStruct_ov5_021F8480 * param0, const u32 param1); -static BOOL ov5_021F8508(FieldSystem * fieldSystem, u32 param1); -static BOOL ov5_021F851C(int param0, int param1, const UnkStruct_ov5_0220192C * param2, FieldSystem * fieldSystem); +static void ov5_021F8480(UnkStruct_ov5_021F8480 *param0, const u32 param1); +static BOOL ov5_021F8508(FieldSystem *fieldSystem, u32 param1); +static BOOL ov5_021F851C(int param0, int param1, const UnkStruct_ov5_0220192C *param2, FieldSystem *fieldSystem); static const UnkStruct_ov5_0220192C Unk_ov5_0220192C[23]; static const u32 Unk_ov5_0220188C[20]; static const UnkStruct_ov5_022018DC Unk_ov5_022018DC[20]; -void ov5_021F8370 (FieldSystem * fieldSystem) +void ov5_021F8370(FieldSystem *fieldSystem) { int v0; - UnkStruct_02027860 * v1; - UnkStruct_02071C34 * v2; - UnkStruct_ov5_021F8480 * v3; + UnkStruct_02027860 *v1; + UnkStruct_02071C34 *v2; + UnkStruct_ov5_021F8480 *v3; v1 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v2 = sub_02027F6C(v1, 10); @@ -88,19 +89,19 @@ void ov5_021F8370 (FieldSystem * fieldSystem) } } -void ov5_021F83C0 (FieldSystem * fieldSystem) +void ov5_021F83C0(FieldSystem *fieldSystem) { - UnkStruct_ov5_021F8480 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov5_021F8480 *v0 = fieldSystem->unk_04->unk_24; Heap_FreeToHeap(v0); fieldSystem->unk_04->unk_24 = NULL; } -BOOL ov5_021F83D4 (FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4) +BOOL ov5_021F83D4(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4) { int v0; - const UnkStruct_ov5_021F83D4 * v1; - const UnkStruct_ov5_0220192C * v2 = Unk_ov5_0220192C; + const UnkStruct_ov5_021F83D4 *v1; + const UnkStruct_ov5_0220192C *v2 = Unk_ov5_0220192C; for (v0 = 0; v0 < 23; v0++, v2++) { if (ov5_021F851C(param1, param2, v2, fieldSystem) == 1) { @@ -113,18 +114,18 @@ BOOL ov5_021F83D4 (FieldSystem * fieldSystem, const int param1, const int param2 return 0; } -BOOL ov5_021F8410 (FieldSystem * fieldSystem, const int param1, const int param2, const int param3) +BOOL ov5_021F8410(FieldSystem *fieldSystem, const int param1, const int param2, const int param3) { - UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); + UnkStruct_02027860 *v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); if (sub_02027F80(v0) == 10) { int v1; - const UnkStruct_ov5_021F83D4 * v2; - const UnkStruct_ov5_0220192C * v3 = Unk_ov5_0220192C; + const UnkStruct_ov5_021F83D4 *v2; + const UnkStruct_ov5_0220192C *v3 = Unk_ov5_0220192C; for (v1 = 0; v1 < 23; v1++, v3++) { if (ov5_021F851C(param1, param2, v3, fieldSystem) == 1) { - const UnkStruct_ov5_022018DC * v4 = &Unk_ov5_022018DC[v3->unk_00]; + const UnkStruct_ov5_022018DC *v4 = &Unk_ov5_022018DC[v3->unk_00]; if (v4->unk_00 == 10100) { if (param3 != 0) { @@ -141,14 +142,14 @@ BOOL ov5_021F8410 (FieldSystem * fieldSystem, const int param1, const int param2 return 0; } -static void ov5_021F8480 (UnkStruct_ov5_021F8480 * param0, const u32 param1) +static void ov5_021F8480(UnkStruct_ov5_021F8480 *param0, const u32 param1) { int v0, v1; - UnkStruct_ov5_021F8480_sub1 * v2; - VecFx32 v3 = {0, 0, 0}; + UnkStruct_ov5_021F8480_sub1 *v2; + VecFx32 v3 = { 0, 0, 0 }; int v4 = Unk_ov5_0220188C[param1]; - const UnkStruct_ov5_0220192C * v5 = Unk_ov5_0220192C; - FieldSystem * fieldSystem = param0->fieldSystem; + const UnkStruct_ov5_0220192C *v5 = Unk_ov5_0220192C; + FieldSystem *fieldSystem = param0->fieldSystem; for (v0 = 0; v0 < 23; v0++, v5++) { if (v5->unk_00 == param1) { @@ -171,14 +172,14 @@ static void ov5_021F8480 (UnkStruct_ov5_021F8480 * param0, const u32 param1) } } -static BOOL ov5_021F8508 (FieldSystem * fieldSystem, u32 param1) +static BOOL ov5_021F8508(FieldSystem *fieldSystem, u32 param1) { return sub_0206AF6C(SaveData_GetVarsFlags(fieldSystem->saveData), 2, param1); } -static BOOL ov5_021F851C (int param0, int param1, const UnkStruct_ov5_0220192C * param2, FieldSystem * fieldSystem) +static BOOL ov5_021F851C(int param0, int param1, const UnkStruct_ov5_0220192C *param2, FieldSystem *fieldSystem) { - const UnkStruct_ov5_021F83D4 * v0 = ¶m2->unk_10; + const UnkStruct_ov5_021F83D4 *v0 = ¶m2->unk_10; if ((param2->unk_02 == 1) && (ov5_021F8508(fieldSystem, param2->unk_00) == 1)) { if ((param1 >= v0->unk_02) && (param1 <= v0->unk_06) && (param0 >= v0->unk_00) && (param0 <= v0->unk_04)) { @@ -193,141 +194,141 @@ static const UnkStruct_ov5_0220192C Unk_ov5_0220192C[23] = { { 0x0, 0x1, - {(((0xc << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x7 << 4) * FX32_ONE))}, - {0xB, 0x5, 0xD, 0x8} + { (((0xc << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), ((0x7 << 4) * FX32_ONE) }, + { 0xB, 0x5, 0xD, 0x8 }, }, { 0x1, 0x1, - {(((0xf << 4) * FX32_ONE)), (((0 << 4) * FX32_ONE)), (((0x7 << 4) * FX32_ONE))}, - {0xE, 0x5, 0xf, 0x8} + { ((0xf << 4) * FX32_ONE), ((0 << 4) * FX32_ONE), ((0x7 << 4) * FX32_ONE) }, + { 0xE, 0x5, 0xf, 0x8 }, }, { 0x2, 0x1, - {(((0xd << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0xa << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0xB, 0x9, 0xD, 0xA} + { (((0xd << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0xa << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0xB, 0x9, 0xD, 0xA }, }, { 0x3, 0x1, - {(((0x12 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x8 << 4) * FX32_ONE))}, - {0x12, 0x6, 0x14, 0x9} + { (((0x12 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), ((0x8 << 4) * FX32_ONE) }, + { 0x12, 0x6, 0x14, 0x9 }, }, { 0x4, 0x1, - {(((0x14 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x7 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x11, 0x6, 0x11, 0x7} + { (((0x14 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x7 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x11, 0x6, 0x11, 0x7 }, }, { 0x5, 0x1, - {(((0xc << 4) * FX32_ONE)), (((0 << 4) * FX32_ONE)), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0xB, 0x3, 0xC, 0x3} + { ((0xc << 4) * FX32_ONE), ((0 << 4) * FX32_ONE), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0xB, 0x3, 0xC, 0x3 }, }, { 0x6, 0x1, - {(((0xe << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0xD, 0x3, 0xf, 0x3} + { (((0xe << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0xD, 0x3, 0xf, 0x3 }, }, { 0x7, 0x1, - {(((0x11 << 4) * FX32_ONE)), (((0 << 4) * FX32_ONE)), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x10, 0x3, 0x11, 0x3} + { ((0x11 << 4) * FX32_ONE), ((0 << 4) * FX32_ONE), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x10, 0x3, 0x11, 0x3 }, }, { 0x8, 0x1, - {(((0x13 << 4) * FX32_ONE)), (((0 << 4) * FX32_ONE)), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x12, 0x3, 0x13, 0x3} + { ((0x13 << 4) * FX32_ONE), ((0 << 4) * FX32_ONE), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x12, 0x3, 0x13, 0x3 }, }, { 0x9, 0x1, - {(((0x1 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x1, 0x3, 0x1, 0x3} + { (((0x1 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x1, 0x3, 0x1, 0x3 }, }, { 0x9, 0x1, - {(((0x14 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x14, 0x3, 0x14, 0x3} + { (((0x14 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x14, 0x3, 0x14, 0x3 }, }, { 0x9, 0x1, - {(((0x1 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0xb << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x1, 0xB, 0x1, 0xB} + { (((0x1 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0xb << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x1, 0xB, 0x1, 0xB }, }, { 0x9, 0x1, - {(((0x14 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0xb << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x14, 0xB, 0x14, 0xB} + { (((0x14 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0xb << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x14, 0xB, 0x14, 0xB }, }, { 0xA, 0x1, - {(((0x2 << 4) * FX32_ONE)), (((0 << 4) * FX32_ONE)), (((0x8 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x1, 0x7, 0x2, 0x9} + { ((0x2 << 4) * FX32_ONE), ((0 << 4) * FX32_ONE), (((0x8 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x1, 0x7, 0x2, 0x9 }, }, { 0xB, 0x0, - {(((0x12 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x0, 0x0, 0x0, 0x0} + { (((0x12 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x0, 0x0, 0x0, 0x0 }, }, { 0xC, 0x1, - {(((0x2 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x2, 0x3, 0x2, 0x3} + { (((0x2 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x2, 0x3, 0x2, 0x3 }, }, { 0xD, 0x1, - {(((0x6 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x6, 0x3, 0x6, 0x3} + { (((0x6 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x3 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x6, 0x3, 0x6, 0x3 }, }, { 0xE, 0x1, - {(((0x2 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x5 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x1, 0x4, 0x2, 0x6} + { (((0x2 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x5 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x1, 0x4, 0x2, 0x6 }, }, { 0xF, 0x1, - {(((0x6 << 4) * FX32_ONE)), (((0 << 4) * FX32_ONE)), (((0xa << 4) * FX32_ONE))}, - {0x4, 0x9, 0x7, 0xA} + { ((0x6 << 4) * FX32_ONE), ((0 << 4) * FX32_ONE), ((0xa << 4) * FX32_ONE) }, + { 0x4, 0x9, 0x7, 0xA }, }, { 0x10, 0x0, - {(((0xb << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x1 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x0, 0x0, 0x0, 0x0} + { (((0xb << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x1 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x0, 0x0, 0x0, 0x0 }, }, { 0x11, 0x0, - {(((0x8 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x1 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x0, 0x0, 0x0, 0x0} + { (((0x8 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x1 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x0, 0x0, 0x0, 0x0 }, }, { 0x12, 0x0, - {(((0x6 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0xa << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x0, 0x0, 0x0, 0x0} + { (((0x6 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0xa << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x0, 0x0, 0x0, 0x0 }, }, { 0x13, 0x0, - {(((0x7 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), (((0 << 4) * FX32_ONE)), (((0x6 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1))}, - {0x0, 0x0, 0x0, 0x0} - } + { (((0x7 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)), ((0 << 4) * FX32_ONE), (((0x6 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)) }, + { 0x0, 0x0, 0x0, 0x0 }, + }, }; static const u32 Unk_ov5_0220188C[20] = { @@ -354,24 +355,24 @@ static const u32 Unk_ov5_0220188C[20] = { }; static const UnkStruct_ov5_022018DC Unk_ov5_022018DC[20] = { - {0x15}, - {0x16}, - {0x17}, - {0x18}, - {0x19}, - {0x2774}, - {0x1B}, - {0x1C}, - {0x1D}, - {0x1E}, - {0x1F}, - {0x20}, - {0x21}, - {0x22}, - {0x23}, - {0x24}, - {0x25}, - {0x26}, - {0x27}, - {0x28} + { 0x15 }, + { 0x16 }, + { 0x17 }, + { 0x18 }, + { 0x19 }, + { 0x2774 }, + { 0x1B }, + { 0x1C }, + { 0x1D }, + { 0x1E }, + { 0x1F }, + { 0x20 }, + { 0x21 }, + { 0x22 }, + { 0x23 }, + { 0x24 }, + { 0x25 }, + { 0x26 }, + { 0x27 }, + { 0x28 } }; diff --git a/src/overlay005/ov5_021F8560.c b/src/overlay005/ov5_021F8560.c index 25d8187ce5..398adbc4d4 100644 --- a/src/overlay005/ov5_021F8560.c +++ b/src/overlay005/ov5_021F8560.c @@ -1,27 +1,28 @@ +#include "overlay005/ov5_021F8560.h" + #include #include #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073B50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" #include "overlay005/struct_ov5_02201C58.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_0201D15C.h" -#include "player_avatar.h" #include "map_object.h" +#include "player_avatar.h" +#include "unk_0201D15C.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F8560.h" typedef struct { - UnkStruct_ov5_021DF47C * unk_00; + UnkStruct_ov5_021DF47C *unk_00; UnkStruct_02073838 unk_04; UnkStruct_02073B50 unk_18; } UnkStruct_ov5_021F858C; @@ -29,10 +30,10 @@ typedef struct { typedef struct { int unk_00; int unk_04; - UnkStruct_ov5_021DF47C * unk_08; - UnkStruct_ov5_021F858C * unk_0C; - MapObject * unk_10; - PlayerAvatar * playerAvatar; + UnkStruct_ov5_021DF47C *unk_08; + UnkStruct_ov5_021F858C *unk_0C; + MapObject *unk_10; + PlayerAvatar *playerAvatar; } UnkStruct_ov5_021F8668; typedef struct { @@ -50,9 +51,9 @@ typedef struct { UnkStruct_ov5_021F8668 unk_38; } UnkStruct_ov5_021F86CC; -static void ov5_021F858C(UnkStruct_ov5_021F858C * param0); -static void ov5_021F85B0(UnkStruct_ov5_021F858C * param0); -static void ov5_021F8878(int param0, int param1, UnkStruct_ov5_02201C58 * param2); +static void ov5_021F858C(UnkStruct_ov5_021F858C *param0); +static void ov5_021F85B0(UnkStruct_ov5_021F858C *param0); +static void ov5_021F8878(int param0, int param1, UnkStruct_ov5_02201C58 *param2); static const UnkStruct_ov101_021D86B0 Unk_ov5_02201B54; static const VecFx32 Unk_ov5_02201BC8[6]; @@ -61,9 +62,9 @@ static const VecFx32 Unk_ov5_02201B80[6]; static const u32 Unk_ov5_02201B68[6]; static const UnkStruct_ov5_02201C58 Unk_ov5_02201C58[6][4]; -void * ov5_021F8560 (UnkStruct_ov5_021DF47C * param0) +void *ov5_021F8560(UnkStruct_ov5_021DF47C *param0) { - UnkStruct_ov5_021F858C * v0; + UnkStruct_ov5_021F858C *v0; v0 = ov5_021DF53C(param0, (sizeof(UnkStruct_ov5_021F858C)), 0, 0); v0->unk_00 = param0; @@ -72,33 +73,33 @@ void * ov5_021F8560 (UnkStruct_ov5_021DF47C * param0) return v0; } -void ov5_021F857C (void * param0) +void ov5_021F857C(void *param0) { - UnkStruct_ov5_021F858C * v0 = param0; + UnkStruct_ov5_021F858C *v0 = param0; ov5_021F85B0(v0); ov5_021DF554(v0); } -static void ov5_021F858C (UnkStruct_ov5_021F858C * param0) +static void ov5_021F858C(UnkStruct_ov5_021F858C *param0) { ov5_021DFB00(param0->unk_00, ¶m0->unk_04, 0, 81, 0); sub_02073B70(¶m0->unk_18, ¶m0->unk_04); } -static void ov5_021F85B0 (UnkStruct_ov5_021F858C * param0) +static void ov5_021F85B0(UnkStruct_ov5_021F858C *param0) { sub_0207395C(¶m0->unk_04); } -UnkStruct_ov101_021D5D90 * ov5_021F85BC (PlayerAvatar * playerAvatar, int param1, int param2, int param3, int param4, int param5, int param6) +UnkStruct_ov101_021D5D90 *ov5_021F85BC(PlayerAvatar *playerAvatar, int param1, int param2, int param3, int param4, int param5, int param6) { int v0; - UnkStruct_ov101_021D5D90 * v1; - const VecFx32 * v2; - VecFx32 v3 = {0, 0, 0}; + UnkStruct_ov101_021D5D90 *v1; + const VecFx32 *v2; + VecFx32 v3 = { 0, 0, 0 }; UnkStruct_ov5_021F8668 v4; - MapObject * v5; + MapObject *v5; v5 = Player_MapObject(playerAvatar); @@ -110,7 +111,7 @@ UnkStruct_ov101_021D5D90 * ov5_021F85BC (PlayerAvatar * playerAvatar, int param1 v4.playerAvatar = playerAvatar; if (param5 == 0) { - FieldSystem * fieldSystem = MapObject_FieldSystem(v5); + FieldSystem *fieldSystem = MapObject_FieldSystem(v5); v2 = &Unk_ov5_02201BC8[param6]; v3.x = (((param1) << 4) * FX32_ONE) + v2->x; @@ -128,11 +129,11 @@ UnkStruct_ov101_021D5D90 * ov5_021F85BC (PlayerAvatar * playerAvatar, int param1 return v1; } -static int ov5_021F8668 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov5_021F8668(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F86CC * v0 = param1; - const UnkStruct_ov5_021F8668 * v1 = sub_020715BC(param0); - MapObject * v2 = v1->unk_10; + UnkStruct_ov5_021F86CC *v0 = param1; + const UnkStruct_ov5_021F8668 *v1 = sub_020715BC(param0); + MapObject *v2 = v1->unk_10; v0->unk_38 = *v1; v0->unk_04 = v1->unk_00; @@ -150,20 +151,20 @@ static int ov5_021F8668 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov5_021F86CC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F86CC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F86CC * v0 = param1; - MapObject * v1 = v0->unk_38.unk_10; - VecFx32 v2 = {0, 0, 0}; + UnkStruct_ov5_021F86CC *v0 = param1; + MapObject *v1 = v0->unk_38.unk_10; + VecFx32 v2 = { 0, 0, 0 }; sub_020630AC(v1, &v2); } -static void ov5_021F86E4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F86E4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F86CC * v0 = param1; - MapObject * v1 = v0->unk_38.unk_10; - PlayerAvatar * playerAvatar = v0->unk_38.playerAvatar; + UnkStruct_ov5_021F86CC *v0 = param1; + MapObject *v1 = v0->unk_38.unk_10; + PlayerAvatar *playerAvatar = v0->unk_38.playerAvatar; if (((v0)->unk_00 & (1 << 1)) == 0) { return; @@ -211,7 +212,7 @@ static void ov5_021F86E4 (UnkStruct_ov101_021D5D90 * param0, void * param1) MapObject_PosVectorOut(v1, &v3); { - const VecFx32 * v4; + const VecFx32 *v4; if (((v0)->unk_00 & (1 << 6)) == 0) { v4 = &Unk_ov5_02201B80[v0->unk_34]; @@ -219,9 +220,9 @@ static void ov5_021F86E4 (UnkStruct_ov101_021D5D90 * param0, void * param1) v4 = &v0->unk_20; } - v3.x += (((FX32_ONE * 0)) + v4->x) + sub_0201D1D4(v0->unk_08) * v0->unk_0A; - v3.y += (((FX32_ONE * (+8))) + v4->y) + sub_0201D15C(v0->unk_08) * v0->unk_0A; - v3.z += (((FX32_ONE * 0)) + v4->z); + v3.x += ((FX32_ONE * 0) + v4->x) + sub_0201D1D4(v0->unk_08) * v0->unk_0A; + v3.y += ((FX32_ONE * (+8)) + v4->y) + sub_0201D15C(v0->unk_08) * v0->unk_0A; + v3.z += ((FX32_ONE * 0) + v4->z); } if (((v0)->unk_00 & (1 << 5)) == 0) { @@ -236,13 +237,13 @@ static void ov5_021F86E4 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov5_021F8848 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov5_021F8848(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov5_021F86CC * v0 = param1; + UnkStruct_ov5_021F86CC *v0 = param1; if (((v0)->unk_00 & (1 << 0)) == 0) { VecFx32 v1; - UnkStruct_02073B50 * v2 = &v0->unk_38.unk_0C->unk_18; + UnkStruct_02073B50 *v2 = &v0->unk_38.unk_0C->unk_18; sub_020715E4(param0, &v1); sub_02073BF0(v2, &v1, &v0->unk_0C); @@ -251,9 +252,9 @@ static void ov5_021F8848 (UnkStruct_ov101_021D5D90 * param0, void * param1) v0->unk_06++; } -static void ov5_021F8878 (int param0, int param1, UnkStruct_ov5_02201C58 * param2) +static void ov5_021F8878(int param0, int param1, UnkStruct_ov5_02201C58 *param2) { - const UnkStruct_ov5_02201C58 * v0; + const UnkStruct_ov5_02201C58 *v0; GF_ASSERT((u32)param0 < 6); @@ -261,45 +262,45 @@ static void ov5_021F8878 (int param0, int param1, UnkStruct_ov5_02201C58 * param *param2 = *v0; } -UnkStruct_ov5_02201C58 * ov5_021F88A8 (UnkStruct_ov101_021D5D90 * param0) +UnkStruct_ov5_02201C58 *ov5_021F88A8(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov5_021F86CC * v0 = sub_02071598(param0); + UnkStruct_ov5_021F86CC *v0 = sub_02071598(param0); return &v0->unk_0C; } -void ov5_021F88B4 (UnkStruct_ov101_021D5D90 * param0, int param1, int param2) +void ov5_021F88B4(UnkStruct_ov101_021D5D90 *param0, int param1, int param2) { - UnkStruct_ov5_021F86CC * v0 = sub_02071598(param0); + UnkStruct_ov5_021F86CC *v0 = sub_02071598(param0); ov5_021F8878(param2, param1, &v0->unk_0C); } -void ov5_021F88CC (UnkStruct_ov101_021D5D90 * param0, int param1) +void ov5_021F88CC(UnkStruct_ov101_021D5D90 *param0, int param1) { - UnkStruct_ov5_021F86CC * v0 = sub_02071598(param0); + UnkStruct_ov5_021F86CC *v0 = sub_02071598(param0); v0->unk_00 |= param1; } -void ov5_021F88DC (UnkStruct_ov101_021D5D90 * param0, int param1) +void ov5_021F88DC(UnkStruct_ov101_021D5D90 *param0, int param1) { - UnkStruct_ov5_021F86CC * v0 = sub_02071598(param0); + UnkStruct_ov5_021F86CC *v0 = sub_02071598(param0); v0->unk_00 &= ~param1; } -VecFx32 * ov5_021F88F0 (UnkStruct_ov101_021D5D90 * param0) +VecFx32 *ov5_021F88F0(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov5_021F86CC * v0 = sub_02071598(param0); + UnkStruct_ov5_021F86CC *v0 = sub_02071598(param0); return &v0->unk_14; } -VecFx32 * ov5_021F88FC (UnkStruct_ov101_021D5D90 * param0) +VecFx32 *ov5_021F88FC(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov5_021F86CC * v0 = sub_02071598(param0); + UnkStruct_ov5_021F86CC *v0 = sub_02071598(param0); return &v0->unk_20; } -void ov5_021F8908 (UnkStruct_ov101_021D5D90 * param0, u16 param1) +void ov5_021F8908(UnkStruct_ov101_021D5D90 *param0, u16 param1) { - UnkStruct_ov5_021F86CC * v0 = sub_02071598(param0); + UnkStruct_ov5_021F86CC *v0 = sub_02071598(param0); v0->unk_08 = param1; } @@ -312,30 +313,30 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02201B54 = { }; static const VecFx32 Unk_ov5_02201BC8[6] = { - {(16 * FX32_ONE) >> 1, 0x0, (16 * FX32_ONE) >> 1}, - {(16 * FX32_ONE) >> 1, 0x0, (16 * FX32_ONE) >> 1}, - {(16 * FX32_ONE) >> 1, 0x0, (16 * FX32_ONE) >> 1}, - {(16 * FX32_ONE) >> 1, 0x0, (16 * FX32_ONE) >> 1}, - {(16 * FX32_ONE) >> 1, 0x0, (16 * FX32_ONE) >> 1}, - {(16 * FX32_ONE) >> 1, FX32_ONE * 40, (16 * FX32_ONE) >> 1} + { (16 * FX32_ONE) >> 1, 0x0, (16 * FX32_ONE) >> 1 }, + { (16 * FX32_ONE) >> 1, 0x0, (16 * FX32_ONE) >> 1 }, + { (16 * FX32_ONE) >> 1, 0x0, (16 * FX32_ONE) >> 1 }, + { (16 * FX32_ONE) >> 1, 0x0, (16 * FX32_ONE) >> 1 }, + { (16 * FX32_ONE) >> 1, 0x0, (16 * FX32_ONE) >> 1 }, + { (16 * FX32_ONE) >> 1, FX32_ONE * 40, (16 * FX32_ONE) >> 1 } }; static const VecFx32 Unk_ov5_02201C10[6] = { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 } }; static const VecFx32 Unk_ov5_02201B80[6] = { - {(FX32_ONE * 1) / 4, FX32_ONE * 6, FX32_ONE * -5}, - {(FX32_ONE * 1) / 4, FX32_ONE * 6, FX32_ONE * -5}, - {(FX32_ONE * 1) / 4, FX32_ONE * 6, FX32_ONE * -5}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, FX32_ONE * 6} + { (FX32_ONE * 1) / 4, FX32_ONE * 6, FX32_ONE * -5 }, + { (FX32_ONE * 1) / 4, FX32_ONE * 6, FX32_ONE * -5 }, + { (FX32_ONE * 1) / 4, FX32_ONE * 6, FX32_ONE * -5 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, FX32_ONE * 6 } }; static const u32 Unk_ov5_02201B68[6] = { @@ -349,39 +350,39 @@ static const u32 Unk_ov5_02201B68[6] = { static const UnkStruct_ov5_02201C58 Unk_ov5_02201C58[6][4] = { { - {0x0, 0xB4, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x10E, 0x0}, - {0x0, 0x5A, 0x0} + { 0x0, 0xB4, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x10E, 0x0 }, + { 0x0, 0x5A, 0x0 }, }, { - {0x0, 0xB4, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x10E, 0x0}, - {0x0, 0x5A, 0x0} + { 0x0, 0xB4, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x10E, 0x0 }, + { 0x0, 0x5A, 0x0 }, }, { - {0x0, 0xB4, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x10E, 0x0}, - {0x0, 0x5A, 0x0} + { 0x0, 0xB4, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x10E, 0x0 }, + { 0x0, 0x5A, 0x0 }, }, { - {0x0, 0xB4, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x10E, 0x0}, - {0x0, 0x5A, 0x0} + { 0x0, 0xB4, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x10E, 0x0 }, + { 0x0, 0x5A, 0x0 }, }, { - {0x0, 0xB4, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x10E, 0x0}, - {0x0, 0x5A, 0x0} + { 0x0, 0xB4, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x10E, 0x0 }, + { 0x0, 0x5A, 0x0 }, }, { - {0xB4, 0xB4, 0x0}, - {0xB4, 0x0, 0x0}, - {0xB4, 0x5A, 0x0}, - {0xB4, 0x10E, 0x0} - } + { 0xB4, 0xB4, 0x0 }, + { 0xB4, 0x0, 0x0 }, + { 0xB4, 0x5A, 0x0 }, + { 0xB4, 0x10E, 0x0 }, + }, }; diff --git a/src/overlay005/ov5_021FAF40.c b/src/overlay005/ov5_021FAF40.c index f81d6a8b56..deb90de7ac 100644 --- a/src/overlay005/ov5_021FAF40.c +++ b/src/overlay005/ov5_021FAF40.c @@ -1,20 +1,23 @@ #include #include -#include "overlay005/const_ov5_021FD77C.h" +#include "struct_defs/struct_020217F4.h" + +#include "overlay005/const_ov5_021FAF40.h" +#include "overlay005/const_ov5_021FAF48.h" #include "overlay005/const_ov5_021FAF50.h" -#include "overlay005/const_ov5_021FB97C.h" -#include "overlay005/const_ov5_021FB5BC.h" #include "overlay005/const_ov5_021FB470.h" #include "overlay005/const_ov5_021FB484.h" -#include "overlay005/const_ov5_021FAF48.h" +#include "overlay005/const_ov5_021FB51C.h" +#include "overlay005/const_ov5_021FB5BC.h" #include "overlay005/const_ov5_021FB67C.h" +#include "overlay005/const_ov5_021FB97C.h" #include "overlay005/const_ov5_021FC194.h" -#include "overlay005/const_ov5_021FB51C.h" #include "overlay005/const_ov5_021FC9B4.h" -#include "overlay005/const_ov5_021FAF40.h" - -#include "struct_defs/struct_020217F4.h" +#include "overlay005/const_ov5_021FD77C.h" +#include "overlay005/ov5_021EB1A0.h" +#include "overlay005/ov5_021ECA70.h" +#include "overlay005/ov5_021ECC20.h" #include "overlay005/struct_ov5_021EC700.h" #include "overlay005/struct_ov5_021ECD10.h" #include "overlay005/struct_ov5_021ED2D0.h" @@ -24,9 +27,6 @@ #include "overlay005/struct_ov5_021FB97C.h" #include "unk_020677F4.h" -#include "overlay005/ov5_021EB1A0.h" -#include "overlay005/ov5_021ECA70.h" -#include "overlay005/ov5_021ECC20.h" static const UnkStruct_ov5_021FB0F0 Unk_ov5_021FB0F0 = { ov5_021EBA0C, @@ -1915,78 +1915,60 @@ const UnkStruct_ov5_021FB67C Unk_ov5_021FB67C[] = { const UnkStruct_ov5_021EC700 Unk_ov5_021FB51C[] = { { 0x5B, - { + { 0x0, 0x0, - 0x0, - ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) - } + ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) }, }, { 0x5C, - { 0x0, 0x0, ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) } + { 0x0, 0x0, ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) }, }, { 0x5D, - { - 0x0, + { 0x0, 0x0, - ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) - } + ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) }, }, { 0x5E, - { + { 0x0, 0x0, - 0x0, - ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) - } + ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) }, }, { 0x5f, - { - 0x0, + { 0x0, 0x0, - ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) - } + ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) }, }, { 0x60, - { + { 0x0, 0x0, - 0x0, - ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) - } + ((FX32_ONE * 6) - (FX32_ONE * 6) - (FX32_ONE * 2)) }, }, { 0xB7, - { - 0x0, + { 0x0, 0x0, - ((FX32_ONE * 6) - (FX32_ONE * 6)) - } + ((FX32_ONE * 6) - (FX32_ONE * 6)) }, }, { 0xD1, - { + { 0x0, 0x0, - 0x0, - ((FX32_ONE * 6) - (FX32_ONE * 6)) - } + ((FX32_ONE * 6) - (FX32_ONE * 6)) }, }, { 0x106, - { - 0x0, + { 0x0, 0x0, - ((FX32_ONE * 6) - (FX32_ONE * 6)) - } + ((FX32_ONE * 6) - (FX32_ONE * 6)) }, }, { 0xffff, - { + { 0x0, 0x0, - 0x0, - 0x0 - } - } + 0x0 }, + }, }; diff --git a/src/overlay005/ov5_021FF6B8.c b/src/overlay005/ov5_021FF6B8.c index 1a1a7c3427..6892b23f38 100644 --- a/src/overlay005/ov5_021FF6B8.c +++ b/src/overlay005/ov5_021FF6B8.c @@ -1,13 +1,10 @@ #include #include -#include "overlay005/const_ov5_021FF744.h" #include "overlay005/const_ov5_021FF6B8.h" +#include "overlay005/const_ov5_021FF744.h" #include "overlay005/const_ov5_021FF7D0.h" #include "overlay005/const_ov5_021FF85C.h" - -#include "overlay005/struct_ov5_021FF85C.h" - #include "overlay005/ov5_021F10E8.h" #include "overlay005/ov5_021F134C.h" #include "overlay005/ov5_021F17B8.h" @@ -41,6 +38,7 @@ #include "overlay005/ov5_021F600C.h" #include "overlay005/ov5_021F61BC.h" #include "overlay005/ov5_021F8560.h" +#include "overlay005/struct_ov5_021FF85C.h" const UnkStruct_ov5_021FF85C Unk_ov5_021FF85C[35] = { { 0x0, ov5_021F134C, ov5_021F1370 }, diff --git a/src/overlay005/vs_seeker.c b/src/overlay005/vs_seeker.c index 1e39e7a396..2f1915a985 100644 --- a/src/overlay005/vs_seeker.c +++ b/src/overlay005/vs_seeker.c @@ -1,52 +1,53 @@ +#include "overlay005/vs_seeker.h" + #include #include -#include "sys_task_manager.h" +#include "consts/sdat.h" + #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "field/field_system.h" #include "overlay005/map_object_anim_cmd.h" +#include "overlay005/ov5_021DFB54.h" -#include "consts/sdat.h" - -#include "unk_02005474.h" +#include "bag.h" +#include "heap.h" +#include "map_header_data.h" +#include "map_object.h" +#include "player_avatar.h" #include "string_template.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" #include "unk_0201D15C.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_020508D4.h" -#include "player_avatar.h" -#include "map_header_data.h" -#include "map_object.h" #include "unk_020655F4.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" -#include "bag.h" -#include "overlay005/vs_seeker.h" -#include "overlay005/ov5_021DFB54.h" +#include "vars_flags.h" -#define VS_SEEKER_SEARCH_RADIUS_LEFT 7 +#define VS_SEEKER_SEARCH_RADIUS_LEFT 7 #define VS_SEEKER_SEARCH_RADIUS_RIGHT 7 -#define VS_SEEKER_SEARCH_RADIUS_UP 7 -#define VS_SEEKER_SEARCH_RADIUS_DOWN 6 +#define VS_SEEKER_SEARCH_RADIUS_UP 7 +#define VS_SEEKER_SEARCH_RADIUS_DOWN 6 -#define VS_SEEKER_MAX_BATTERY 100 +#define VS_SEEKER_MAX_BATTERY 100 #define VS_SEEKER_REMATCH_CHANCE 50 -#define VS_SEEKER_MAX_REMATCHES 6 +#define VS_SEEKER_MAX_REMATCHES 6 #define VS_SEEKER_REMATCH_DATA_DUMMY 0xFFFF -#define VS_SEEKER_REMATCH_DATA_END 0x0 +#define VS_SEEKER_REMATCH_DATA_END 0x0 -// Number of steps for which the rematches are available +// Number of steps for which the rematches are available // until the Vs. Seeker has to be used again #define VS_SEEKER_MAX_NUM_ACTIVE_STEPS 100 -#define VS_SEEKER_USE_RESULT_OK 0 -#define VS_SEEKER_USE_RESULT_NO_BATTERY 1 -#define VS_SEEKER_USE_RESULT_NO_TRAINERS 2 +#define VS_SEEKER_USE_RESULT_OK 0 +#define VS_SEEKER_USE_RESULT_NO_BATTERY 1 +#define VS_SEEKER_USE_RESULT_NO_TRAINERS 2 #define VS_SEEKER_USE_RESULT_NO_TRAINERS_PICKED 3 // No trainers were picked for a rematch (e.g. all the random chances failed) #define VS_SEEKER_REMATCH_DATA_INDEX_NONE 0xFF @@ -121,257 +122,257 @@ static BOOL VsSeeker_WaitForNpcsToPause(FieldSystem *fieldSystem); static MapObject *VsSeeker_GetSecondDoubleBattleTrainer(FieldSystem *fieldSystem, MapObject *trainerObj, enum VsSeeker2v2TrainerSearchMode mode); const VsSeekerRematchData gVsSeekerRematchData[] = { - { 0xE, 0xE, 0x0, 0x0, 0x0, 0x0 }, - { 0x15, 0x273, 0x274, 0xffff, 0x275, 0x0 }, - { 0x2C, 0x2C, 0x0, 0x0, 0x0, 0x0 }, - { 0x2D, 0xffff, 0x276, 0x277, 0xffff, 0x278 }, - { 0x14, 0x14, 0x0, 0x0, 0x0, 0x0 }, - { 0x26, 0xffff, 0x279, 0x27A, 0xffff, 0x27B }, - { 0x4A, 0xffff, 0xffff, 0x27C, 0xffff, 0x27D }, - { 0x4C, 0x4C, 0x0, 0x0, 0x0, 0x0 }, - { 0x51, 0x51, 0x0, 0x0, 0x0, 0x0 }, - { 0x22A, 0xffff, 0xffff, 0xffff, 0xffff, 0x27E }, - { 0x22B, 0x22B, 0x0, 0x0, 0x0, 0x0 }, - { 0x2E, 0xffff, 0x27F, 0x280, 0x281, 0x0 }, - { 0x38, 0x38, 0x0, 0x0, 0x0, 0x0 }, - { 0x2F, 0xffff, 0x282, 0x283, 0x284, 0x0 }, - { 0x39, 0x39, 0x0, 0x0, 0x0, 0x0 }, - { 0x10, 0x10, 0x0, 0x0, 0x0, 0x0 }, - { 0x22, 0x22, 0x0, 0x0, 0x0, 0x0 }, - { 0x179, 0x285, 0x286, 0xffff, 0x287, 0x0 }, - { 0x84, 0x84, 0x0, 0x0, 0x0, 0x0 }, - { 0x85, 0x85, 0x0, 0x0, 0x0, 0x0 }, - { 0x8C, 0xffff, 0xffff, 0xffff, 0x288, 0x0 }, - { 0x86, 0x86, 0x0, 0x0, 0x0, 0x0 }, - { 0x87, 0x87, 0x0, 0x0, 0x0, 0x0 }, - { 0x8D, 0xffff, 0xffff, 0xffff, 0x289, 0x0 }, - { 0x57, 0x57, 0x0, 0x0, 0x0, 0x0 }, - { 0x110, 0x110, 0x0, 0x0, 0x0, 0x0 }, - { 0x111, 0x111, 0x0, 0x0, 0x0, 0x0 }, - { 0x112, 0xffff, 0xffff, 0xffff, 0x28A, 0x0 }, - { 0x17D, 0x17D, 0x0, 0x0, 0x0, 0x0 }, - { 0x17E, 0x17E, 0x0, 0x0, 0x0, 0x0 }, - { 0x30, 0x30, 0x0, 0x0, 0x0, 0x0 }, - { 0x3A, 0xffff, 0xffff, 0x28B, 0xffff, 0x28C }, - { 0x19, 0x19, 0x0, 0x0, 0x0, 0x0 }, - { 0x1A, 0x1A, 0x0, 0x0, 0x0, 0x0 }, - { 0x1B, 0xffff, 0x28D, 0x28E, 0xffff, 0x28F }, - { 0x1C, 0x1C, 0x0, 0x0, 0x0, 0x0 }, - { 0x1D, 0x1D, 0x0, 0x0, 0x0, 0x0 }, - { 0x1E, 0x1E, 0x0, 0x0, 0x0, 0x0 }, - { 0x1F, 0xffff, 0x290, 0x291, 0xffff, 0x292 }, - { 0x20, 0x20, 0x0, 0x0, 0x0, 0x0 }, - { 0x4B, 0x4B, 0x0, 0x0, 0x0, 0x0 }, - { 0x49, 0xffff, 0xffff, 0x293, 0xffff, 0x294 }, - { 0x115, 0xffff, 0xffff, 0xffff, 0xffff, 0x295 }, - { 0x22D, 0xffff, 0xffff, 0xffff, 0xffff, 0x296 }, - { 0x22E, 0x22E, 0x0, 0x0, 0x0, 0x0 }, - { 0x22F, 0x22F, 0x0, 0x0, 0x0, 0x0 }, - { 0x230, 0x230, 0x0, 0x0, 0x0, 0x0 }, - { 0x42, 0x42, 0x0, 0x0, 0x0, 0x0 }, - { 0xAA, 0xffff, 0xffff, 0xffff, 0x297, 0x0 }, - { 0x116, 0xffff, 0xffff, 0x298, 0xffff, 0x299 }, - { 0x11A, 0x11A, 0x0, 0x0, 0x0, 0x0 }, - { 0x233, 0xffff, 0xffff, 0xffff, 0xffff, 0x29A }, - { 0x234, 0xffff, 0xffff, 0xffff, 0xffff, 0x29B }, - { 0x235, 0x235, 0x0, 0x0, 0x0, 0x0 }, - { 0x236, 0x236, 0x0, 0x0, 0x0, 0x0 }, - { 0x237, 0x237, 0x0, 0x0, 0x0, 0x0 }, - { 0x238, 0x238, 0x0, 0x0, 0x0, 0x0 }, - { 0x43, 0x43, 0x0, 0x0, 0x0, 0x0 }, - { 0xAB, 0xffff, 0xffff, 0xffff, 0x29C, 0x0 }, - { 0x11E, 0x11E, 0x0, 0x0, 0x0, 0x0 }, - { 0x11F, 0xffff, 0xffff, 0x29D, 0xffff, 0x29E }, - { 0x23D, 0xffff, 0xffff, 0xffff, 0xffff, 0x29F }, - { 0x23E, 0xffff, 0xffff, 0xffff, 0xffff, 0x2A0 }, - { 0x23F, 0x23F, 0x0, 0x0, 0x0, 0x0 }, - { 0x240, 0x240, 0x0, 0x0, 0x0, 0x0 }, - { 0x241, 0x241, 0x0, 0x0, 0x0, 0x0 }, - { 0x242, 0x242, 0x0, 0x0, 0x0, 0x0 }, - { 0x77, 0xffff, 0xffff, 0x2A1, 0xffff, 0x2A2 }, - { 0x120, 0xffff, 0xffff, 0xffff, 0xffff, 0x2A3 }, - { 0x247, 0xffff, 0xffff, 0xffff, 0xffff, 0x2A4 }, - { 0x78, 0xffff, 0xffff, 0x2A5, 0xffff, 0x2A6 }, - { 0x121, 0xffff, 0xffff, 0xffff, 0xffff, 0x2A7 }, - { 0x249, 0xffff, 0xffff, 0xffff, 0xffff, 0x2A8 }, - { 0x122, 0x122, 0x0, 0x0, 0x0, 0x0 }, - { 0x123, 0x123, 0x0, 0x0, 0x0, 0x0 }, - { 0x124, 0xffff, 0xffff, 0x2A9, 0xffff, 0x2AA }, - { 0x16, 0x16, 0x0, 0x0, 0x0, 0x0 }, - { 0x17, 0xffff, 0x2AB, 0xffff, 0x2AC, 0x0 }, - { 0x18, 0x18, 0x0, 0x0, 0x0, 0x0 }, - { 0x2B, 0x2B, 0x0, 0x0, 0x0, 0x0 }, - { 0x5B, 0x5B, 0x0, 0x0, 0x0, 0x0 }, - { 0x5C, 0x5C, 0x0, 0x0, 0x0, 0x0 }, - { 0x5D, 0x5D, 0x0, 0x0, 0x0, 0x0 }, - { 0x6F, 0x6F, 0x0, 0x0, 0x0, 0x0 }, - { 0x99, 0xffff, 0xffff, 0xffff, 0x2AD, 0x0 }, - { 0x9A, 0x9A, 0x0, 0x0, 0x0, 0x0 }, - { 0xA8, 0xA8, 0x0, 0x0, 0x0, 0x0 }, - { 0xAC, 0xAC, 0x0, 0x0, 0x0, 0x0 }, - { 0xAD, 0xffff, 0xffff, 0xffff, 0x2AE, 0x0 }, - { 0xAE, 0xAE, 0x0, 0x0, 0x0, 0x0 }, - { 0xAF, 0xAF, 0x0, 0x0, 0x0, 0x0 }, - { 0xF, 0xF, 0x0, 0x0, 0x0, 0x0 }, - { 0x41, 0xffff, 0xffff, 0x2AF, 0xffff, 0x2B0 }, - { 0x126, 0x126, 0x0, 0x0, 0x0, 0x0 }, - { 0x79, 0xffff, 0xffff, 0x2B1, 0xffff, 0x2B2 }, - { 0x54, 0xffff, 0x2B3, 0x2B4, 0xffff, 0x2B5 }, - { 0x12C, 0xffff, 0xffff, 0xffff, 0x2B6, 0x0 }, - { 0x71, 0x71, 0x0, 0x0, 0x0, 0x0 }, - { 0x72, 0x72, 0x0, 0x0, 0x0, 0x0 }, - { 0x130, 0x130, 0x0, 0x0, 0x0, 0x0 }, - { 0x131, 0x131, 0x0, 0x0, 0x0, 0x0 }, - { 0x1B9, 0x1B9, 0x0, 0x0, 0x0, 0x0 }, - { 0x1BA, 0xffff, 0xffff, 0x2B7, 0x2B8, 0x0 }, - { 0x31, 0x31, 0x0, 0x0, 0x0, 0x0 }, - { 0x82, 0x82, 0x0, 0x0, 0x0, 0x0 }, - { 0x132, 0x132, 0x0, 0x0, 0x0, 0x0 }, - { 0x133, 0xffff, 0xffff, 0x2B9, 0xffff, 0x2BA }, - { 0x134, 0x134, 0x0, 0x0, 0x0, 0x0 }, - { 0x2A, 0x2A, 0x0, 0x0, 0x0, 0x0 }, - { 0x45, 0x45, 0x0, 0x0, 0x0, 0x0 }, - { 0x4F, 0x4F, 0x0, 0x0, 0x0, 0x0 }, - { 0x7E, 0x7E, 0x0, 0x0, 0x0, 0x0 }, - { 0x7F, 0x7F, 0x0, 0x0, 0x0, 0x0 }, - { 0x80, 0x80, 0x0, 0x0, 0x0, 0x0 }, - { 0x81, 0x81, 0x0, 0x0, 0x0, 0x0 }, - { 0x94, 0x94, 0x0, 0x0, 0x0, 0x0 }, - { 0x102, 0xffff, 0xffff, 0xffff, 0x2BB, 0x0 }, - { 0x139, 0x139, 0x0, 0x0, 0x0, 0x0 }, - { 0x24B, 0xffff, 0xffff, 0xffff, 0xffff, 0x2BC }, - { 0x24C, 0x24C, 0x0, 0x0, 0x0, 0x0 }, - { 0x37, 0x37, 0x0, 0x0, 0x0, 0x0 }, - { 0x55, 0xffff, 0xffff, 0x2BD, 0xffff, 0x2BE }, - { 0x3, 0x3, 0x0, 0x0, 0x0, 0x0 }, - { 0xB, 0x2BF, 0x2C0, 0xffff, 0x2C1, 0x0 }, - { 0xC, 0xC, 0x0, 0x0, 0x0, 0x0 }, - { 0x142, 0x2C2, 0x2C3, 0x2C4, 0x0, 0x0 }, - { 0x143, 0x143, 0x0, 0x0, 0x0, 0x0 }, - { 0x12, 0x12, 0x0, 0x0, 0x0, 0x0 }, - { 0x13, 0x13, 0x0, 0x0, 0x0, 0x0 }, - { 0x24, 0x24, 0x0, 0x0, 0x0, 0x0 }, - { 0x25, 0x25, 0x0, 0x0, 0x0, 0x0 }, - { 0x27, 0x27, 0x0, 0x0, 0x0, 0x0 }, - { 0x28, 0x28, 0x0, 0x0, 0x0, 0x0 }, - { 0x29, 0x29, 0x0, 0x0, 0x0, 0x0 }, - { 0x146, 0x146, 0x0, 0x0, 0x0, 0x0 }, - { 0x1C3, 0xffff, 0x2C5, 0x2C6, 0xffff, 0x2C7 }, - { 0xD, 0x2C8, 0x2C9, 0xffff, 0x2CA, 0x0 }, - { 0x147, 0xffff, 0x2CB, 0x2CC, 0x2CD, 0x0 }, - { 0x148, 0x148, 0x0, 0x0, 0x0, 0x0 }, - { 0x11, 0x11, 0x0, 0x0, 0x0, 0x0 }, - { 0x23, 0x23, 0x0, 0x0, 0x0, 0x0 }, - { 0x1C8, 0x2CE, 0x2CF, 0xffff, 0x2D0, 0x0 }, - { 0x35, 0xffff, 0x2D1, 0x2D2, 0x2D3, 0x0 }, - { 0x58, 0x58, 0x0, 0x0, 0x0, 0x0 }, - { 0x59, 0x59, 0x0, 0x0, 0x0, 0x0 }, - { 0x5A, 0x5A, 0x0, 0x0, 0x0, 0x0 }, - { 0x66, 0x66, 0x0, 0x0, 0x0, 0x0 }, - { 0x14C, 0xffff, 0x2D4, 0x2D5, 0x2D6, 0x0 }, - { 0x14D, 0x14D, 0x0, 0x0, 0x0, 0x0 }, - { 0x52, 0x52, 0x0, 0x0, 0x0, 0x0 }, - { 0x14F, 0xffff, 0xffff, 0xffff, 0x2D7, 0x2D8 }, - { 0x53, 0xffff, 0x2D9, 0x2DA, 0xffff, 0x2DB }, - { 0x5E, 0xffff, 0x2DC, 0x2DD, 0xffff, 0x2DE }, - { 0x5F, 0x5F, 0x0, 0x0, 0x0, 0x0 }, - { 0x24F, 0xffff, 0xffff, 0xffff, 0xffff, 0x2DF }, - { 0x250, 0x250, 0x0, 0x0, 0x0, 0x0 }, - { 0x251, 0x251, 0x0, 0x0, 0x0, 0x0 }, - { 0x60, 0xffff, 0x2E0, 0x2E1, 0xffff, 0x2E2 }, - { 0x61, 0x61, 0x0, 0x0, 0x0, 0x0 }, - { 0x252, 0xffff, 0xffff, 0xffff, 0xffff, 0x2E3 }, - { 0x253, 0x253, 0x0, 0x0, 0x0, 0x0 }, - { 0x254, 0x254, 0x0, 0x0, 0x0, 0x0 }, - { 0x6E, 0x6E, 0x0, 0x0, 0x0, 0x0 }, - { 0xB4, 0xB4, 0x0, 0x0, 0x0, 0x0 }, - { 0x151, 0xffff, 0xffff, 0xffff, 0x2E4, 0x2E5 }, - { 0x152, 0x152, 0x0, 0x0, 0x0, 0x0 }, - { 0x1E2, 0xffff, 0xffff, 0xffff, 0xffff, 0x2E6 }, - { 0x62, 0x62, 0x0, 0x0, 0x0, 0x0 }, - { 0x63, 0x63, 0x0, 0x0, 0x0, 0x0 }, - { 0x1E6, 0xffff, 0x2E7, 0x2E8, 0x2E9, 0x0 }, - { 0x46, 0x46, 0x0, 0x0, 0x0, 0x0 }, - { 0x47, 0x47, 0x0, 0x0, 0x0, 0x0 }, - { 0x48, 0x48, 0x0, 0x0, 0x0, 0x0 }, - { 0x4E, 0xffff, 0x2EA, 0x2EB, 0x2EC, 0x0 }, - { 0x50, 0x50, 0x0, 0x0, 0x0, 0x0 }, - { 0x92, 0x92, 0x0, 0x0, 0x0, 0x0 }, - { 0x93, 0x93, 0x0, 0x0, 0x0, 0x0 }, - { 0x1E8, 0x1E8, 0x0, 0x0, 0x0, 0x0 }, - { 0x1E9, 0x1E9, 0x0, 0x0, 0x0, 0x0 }, - { 0x1EA, 0x1EA, 0x0, 0x0, 0x0, 0x0 }, - { 0x15A, 0xffff, 0xffff, 0x2ED, 0xffff, 0x2EE }, - { 0x1EB, 0x1EB, 0x0, 0x0, 0x0, 0x0 }, - { 0x1EC, 0x1EC, 0x0, 0x0, 0x0, 0x0 }, - { 0x88, 0x88, 0x0, 0x0, 0x0, 0x0 }, - { 0x89, 0xffff, 0xffff, 0x2EF, 0x2F0, 0x0 }, - { 0x8E, 0x8E, 0x0, 0x0, 0x0, 0x0 }, - { 0x8F, 0xffff, 0xffff, 0x2F1, 0xffff, 0x2F2 }, - { 0x8A, 0x8A, 0x0, 0x0, 0x0, 0x0 }, - { 0x8B, 0xffff, 0xffff, 0x2F3, 0x2F4, 0x0 }, - { 0x90, 0x90, 0x0, 0x0, 0x0, 0x0 }, - { 0x91, 0xffff, 0xffff, 0x2F5, 0x2F6, 0x0 }, - { 0x67, 0x67, 0x0, 0x0, 0x0, 0x0 }, - { 0x68, 0x68, 0x0, 0x0, 0x0, 0x0 }, - { 0x9F, 0x9F, 0x0, 0x0, 0x0, 0x0 }, - { 0xA0, 0xA0, 0x0, 0x0, 0x0, 0x0 }, - { 0xA1, 0xA1, 0x0, 0x0, 0x0, 0x0 }, - { 0xA6, 0xA6, 0x0, 0x0, 0x0, 0x0 }, - { 0xB7, 0xffff, 0xffff, 0xffff, 0xffff, 0x2F7 }, - { 0xB8, 0xB8, 0x0, 0x0, 0x0, 0x0 }, - { 0xB9, 0xffff, 0xffff, 0xffff, 0xffff, 0x2F8 }, - { 0xBA, 0xBA, 0x0, 0x0, 0x0, 0x0 }, - { 0xBB, 0xBB, 0x0, 0x0, 0x0, 0x0 }, - { 0xBC, 0xBC, 0x0, 0x0, 0x0, 0x0 }, - { 0x255, 0xffff, 0xffff, 0xffff, 0xffff, 0x2F9 }, - { 0x256, 0x256, 0x0, 0x0, 0x0, 0x0 }, - { 0x257, 0x257, 0x0, 0x0, 0x0, 0x0 }, - { 0x258, 0x258, 0x0, 0x0, 0x0, 0x0 }, - { 0x69, 0x69, 0x0, 0x0, 0x0, 0x0 }, - { 0x6A, 0x6A, 0x0, 0x0, 0x0, 0x0 }, - { 0xA2, 0xA2, 0x0, 0x0, 0x0, 0x0 }, - { 0xA3, 0xA3, 0x0, 0x0, 0x0, 0x0 }, - { 0xA4, 0xA4, 0x0, 0x0, 0x0, 0x0 }, - { 0xA7, 0xA7, 0x0, 0x0, 0x0, 0x0 }, - { 0xBD, 0xffff, 0xffff, 0xffff, 0xffff, 0x2FA }, - { 0xBE, 0xBE, 0x0, 0x0, 0x0, 0x0 }, - { 0xBF, 0xBF, 0x0, 0x0, 0x0, 0x0 }, - { 0xC0, 0xffff, 0xffff, 0xffff, 0xffff, 0x2FB }, - { 0xC1, 0xC1, 0x0, 0x0, 0x0, 0x0 }, - { 0xC2, 0xC2, 0x0, 0x0, 0x0, 0x0 }, - { 0x1EE, 0x1EE, 0x0, 0x0, 0x0, 0x0 }, - { 0x259, 0xffff, 0xffff, 0xffff, 0xffff, 0x2FC }, - { 0x25A, 0x25A, 0x0, 0x0, 0x0, 0x0 }, - { 0x25B, 0x25B, 0x0, 0x0, 0x0, 0x0 }, - { 0x25C, 0x25C, 0x0, 0x0, 0x0, 0x0 }, - { 0x1, 0x2FD, 0x2FE, 0x2FF, 0x0, 0x0 }, - { 0x2, 0x2, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x4, 0x0, 0x0, 0x0, 0x0 }, - { 0xA, 0xA, 0x0, 0x0, 0x0, 0x0 }, - { 0x21, 0x21, 0x0, 0x0, 0x0, 0x0 }, - { 0x163, 0x300, 0x301, 0xffff, 0x302, 0x0 }, - { 0x164, 0x164, 0x0, 0x0, 0x0, 0x0 }, - { 0x6B, 0xffff, 0x303, 0xffff, 0x304, 0x0 }, - { 0x166, 0x166, 0x0, 0x0, 0x0, 0x0 }, - { 0x167, 0x167, 0x0, 0x0, 0x0, 0x0 }, - { 0x6C, 0xffff, 0xffff, 0x305, 0x307, 0x0 }, - { 0x168, 0x168, 0x0, 0x0, 0x0, 0x0 }, - { 0x169, 0x169, 0x0, 0x0, 0x0, 0x0 }, - { 0x44, 0xffff, 0xffff, 0x306, 0xffff, 0x308 }, - { 0x16A, 0xffff, 0xffff, 0xffff, 0xffff, 0x309 }, - { 0x25D, 0xffff, 0xffff, 0xffff, 0xffff, 0x30A } + { 0xE, 0xE, 0x0, 0x0, 0x0, 0x0 }, + { 0x15, 0x273, 0x274, 0xffff, 0x275, 0x0 }, + { 0x2C, 0x2C, 0x0, 0x0, 0x0, 0x0 }, + { 0x2D, 0xffff, 0x276, 0x277, 0xffff, 0x278 }, + { 0x14, 0x14, 0x0, 0x0, 0x0, 0x0 }, + { 0x26, 0xffff, 0x279, 0x27A, 0xffff, 0x27B }, + { 0x4A, 0xffff, 0xffff, 0x27C, 0xffff, 0x27D }, + { 0x4C, 0x4C, 0x0, 0x0, 0x0, 0x0 }, + { 0x51, 0x51, 0x0, 0x0, 0x0, 0x0 }, + { 0x22A, 0xffff, 0xffff, 0xffff, 0xffff, 0x27E }, + { 0x22B, 0x22B, 0x0, 0x0, 0x0, 0x0 }, + { 0x2E, 0xffff, 0x27F, 0x280, 0x281, 0x0 }, + { 0x38, 0x38, 0x0, 0x0, 0x0, 0x0 }, + { 0x2F, 0xffff, 0x282, 0x283, 0x284, 0x0 }, + { 0x39, 0x39, 0x0, 0x0, 0x0, 0x0 }, + { 0x10, 0x10, 0x0, 0x0, 0x0, 0x0 }, + { 0x22, 0x22, 0x0, 0x0, 0x0, 0x0 }, + { 0x179, 0x285, 0x286, 0xffff, 0x287, 0x0 }, + { 0x84, 0x84, 0x0, 0x0, 0x0, 0x0 }, + { 0x85, 0x85, 0x0, 0x0, 0x0, 0x0 }, + { 0x8C, 0xffff, 0xffff, 0xffff, 0x288, 0x0 }, + { 0x86, 0x86, 0x0, 0x0, 0x0, 0x0 }, + { 0x87, 0x87, 0x0, 0x0, 0x0, 0x0 }, + { 0x8D, 0xffff, 0xffff, 0xffff, 0x289, 0x0 }, + { 0x57, 0x57, 0x0, 0x0, 0x0, 0x0 }, + { 0x110, 0x110, 0x0, 0x0, 0x0, 0x0 }, + { 0x111, 0x111, 0x0, 0x0, 0x0, 0x0 }, + { 0x112, 0xffff, 0xffff, 0xffff, 0x28A, 0x0 }, + { 0x17D, 0x17D, 0x0, 0x0, 0x0, 0x0 }, + { 0x17E, 0x17E, 0x0, 0x0, 0x0, 0x0 }, + { 0x30, 0x30, 0x0, 0x0, 0x0, 0x0 }, + { 0x3A, 0xffff, 0xffff, 0x28B, 0xffff, 0x28C }, + { 0x19, 0x19, 0x0, 0x0, 0x0, 0x0 }, + { 0x1A, 0x1A, 0x0, 0x0, 0x0, 0x0 }, + { 0x1B, 0xffff, 0x28D, 0x28E, 0xffff, 0x28F }, + { 0x1C, 0x1C, 0x0, 0x0, 0x0, 0x0 }, + { 0x1D, 0x1D, 0x0, 0x0, 0x0, 0x0 }, + { 0x1E, 0x1E, 0x0, 0x0, 0x0, 0x0 }, + { 0x1F, 0xffff, 0x290, 0x291, 0xffff, 0x292 }, + { 0x20, 0x20, 0x0, 0x0, 0x0, 0x0 }, + { 0x4B, 0x4B, 0x0, 0x0, 0x0, 0x0 }, + { 0x49, 0xffff, 0xffff, 0x293, 0xffff, 0x294 }, + { 0x115, 0xffff, 0xffff, 0xffff, 0xffff, 0x295 }, + { 0x22D, 0xffff, 0xffff, 0xffff, 0xffff, 0x296 }, + { 0x22E, 0x22E, 0x0, 0x0, 0x0, 0x0 }, + { 0x22F, 0x22F, 0x0, 0x0, 0x0, 0x0 }, + { 0x230, 0x230, 0x0, 0x0, 0x0, 0x0 }, + { 0x42, 0x42, 0x0, 0x0, 0x0, 0x0 }, + { 0xAA, 0xffff, 0xffff, 0xffff, 0x297, 0x0 }, + { 0x116, 0xffff, 0xffff, 0x298, 0xffff, 0x299 }, + { 0x11A, 0x11A, 0x0, 0x0, 0x0, 0x0 }, + { 0x233, 0xffff, 0xffff, 0xffff, 0xffff, 0x29A }, + { 0x234, 0xffff, 0xffff, 0xffff, 0xffff, 0x29B }, + { 0x235, 0x235, 0x0, 0x0, 0x0, 0x0 }, + { 0x236, 0x236, 0x0, 0x0, 0x0, 0x0 }, + { 0x237, 0x237, 0x0, 0x0, 0x0, 0x0 }, + { 0x238, 0x238, 0x0, 0x0, 0x0, 0x0 }, + { 0x43, 0x43, 0x0, 0x0, 0x0, 0x0 }, + { 0xAB, 0xffff, 0xffff, 0xffff, 0x29C, 0x0 }, + { 0x11E, 0x11E, 0x0, 0x0, 0x0, 0x0 }, + { 0x11F, 0xffff, 0xffff, 0x29D, 0xffff, 0x29E }, + { 0x23D, 0xffff, 0xffff, 0xffff, 0xffff, 0x29F }, + { 0x23E, 0xffff, 0xffff, 0xffff, 0xffff, 0x2A0 }, + { 0x23F, 0x23F, 0x0, 0x0, 0x0, 0x0 }, + { 0x240, 0x240, 0x0, 0x0, 0x0, 0x0 }, + { 0x241, 0x241, 0x0, 0x0, 0x0, 0x0 }, + { 0x242, 0x242, 0x0, 0x0, 0x0, 0x0 }, + { 0x77, 0xffff, 0xffff, 0x2A1, 0xffff, 0x2A2 }, + { 0x120, 0xffff, 0xffff, 0xffff, 0xffff, 0x2A3 }, + { 0x247, 0xffff, 0xffff, 0xffff, 0xffff, 0x2A4 }, + { 0x78, 0xffff, 0xffff, 0x2A5, 0xffff, 0x2A6 }, + { 0x121, 0xffff, 0xffff, 0xffff, 0xffff, 0x2A7 }, + { 0x249, 0xffff, 0xffff, 0xffff, 0xffff, 0x2A8 }, + { 0x122, 0x122, 0x0, 0x0, 0x0, 0x0 }, + { 0x123, 0x123, 0x0, 0x0, 0x0, 0x0 }, + { 0x124, 0xffff, 0xffff, 0x2A9, 0xffff, 0x2AA }, + { 0x16, 0x16, 0x0, 0x0, 0x0, 0x0 }, + { 0x17, 0xffff, 0x2AB, 0xffff, 0x2AC, 0x0 }, + { 0x18, 0x18, 0x0, 0x0, 0x0, 0x0 }, + { 0x2B, 0x2B, 0x0, 0x0, 0x0, 0x0 }, + { 0x5B, 0x5B, 0x0, 0x0, 0x0, 0x0 }, + { 0x5C, 0x5C, 0x0, 0x0, 0x0, 0x0 }, + { 0x5D, 0x5D, 0x0, 0x0, 0x0, 0x0 }, + { 0x6F, 0x6F, 0x0, 0x0, 0x0, 0x0 }, + { 0x99, 0xffff, 0xffff, 0xffff, 0x2AD, 0x0 }, + { 0x9A, 0x9A, 0x0, 0x0, 0x0, 0x0 }, + { 0xA8, 0xA8, 0x0, 0x0, 0x0, 0x0 }, + { 0xAC, 0xAC, 0x0, 0x0, 0x0, 0x0 }, + { 0xAD, 0xffff, 0xffff, 0xffff, 0x2AE, 0x0 }, + { 0xAE, 0xAE, 0x0, 0x0, 0x0, 0x0 }, + { 0xAF, 0xAF, 0x0, 0x0, 0x0, 0x0 }, + { 0xF, 0xF, 0x0, 0x0, 0x0, 0x0 }, + { 0x41, 0xffff, 0xffff, 0x2AF, 0xffff, 0x2B0 }, + { 0x126, 0x126, 0x0, 0x0, 0x0, 0x0 }, + { 0x79, 0xffff, 0xffff, 0x2B1, 0xffff, 0x2B2 }, + { 0x54, 0xffff, 0x2B3, 0x2B4, 0xffff, 0x2B5 }, + { 0x12C, 0xffff, 0xffff, 0xffff, 0x2B6, 0x0 }, + { 0x71, 0x71, 0x0, 0x0, 0x0, 0x0 }, + { 0x72, 0x72, 0x0, 0x0, 0x0, 0x0 }, + { 0x130, 0x130, 0x0, 0x0, 0x0, 0x0 }, + { 0x131, 0x131, 0x0, 0x0, 0x0, 0x0 }, + { 0x1B9, 0x1B9, 0x0, 0x0, 0x0, 0x0 }, + { 0x1BA, 0xffff, 0xffff, 0x2B7, 0x2B8, 0x0 }, + { 0x31, 0x31, 0x0, 0x0, 0x0, 0x0 }, + { 0x82, 0x82, 0x0, 0x0, 0x0, 0x0 }, + { 0x132, 0x132, 0x0, 0x0, 0x0, 0x0 }, + { 0x133, 0xffff, 0xffff, 0x2B9, 0xffff, 0x2BA }, + { 0x134, 0x134, 0x0, 0x0, 0x0, 0x0 }, + { 0x2A, 0x2A, 0x0, 0x0, 0x0, 0x0 }, + { 0x45, 0x45, 0x0, 0x0, 0x0, 0x0 }, + { 0x4F, 0x4F, 0x0, 0x0, 0x0, 0x0 }, + { 0x7E, 0x7E, 0x0, 0x0, 0x0, 0x0 }, + { 0x7F, 0x7F, 0x0, 0x0, 0x0, 0x0 }, + { 0x80, 0x80, 0x0, 0x0, 0x0, 0x0 }, + { 0x81, 0x81, 0x0, 0x0, 0x0, 0x0 }, + { 0x94, 0x94, 0x0, 0x0, 0x0, 0x0 }, + { 0x102, 0xffff, 0xffff, 0xffff, 0x2BB, 0x0 }, + { 0x139, 0x139, 0x0, 0x0, 0x0, 0x0 }, + { 0x24B, 0xffff, 0xffff, 0xffff, 0xffff, 0x2BC }, + { 0x24C, 0x24C, 0x0, 0x0, 0x0, 0x0 }, + { 0x37, 0x37, 0x0, 0x0, 0x0, 0x0 }, + { 0x55, 0xffff, 0xffff, 0x2BD, 0xffff, 0x2BE }, + { 0x3, 0x3, 0x0, 0x0, 0x0, 0x0 }, + { 0xB, 0x2BF, 0x2C0, 0xffff, 0x2C1, 0x0 }, + { 0xC, 0xC, 0x0, 0x0, 0x0, 0x0 }, + { 0x142, 0x2C2, 0x2C3, 0x2C4, 0x0, 0x0 }, + { 0x143, 0x143, 0x0, 0x0, 0x0, 0x0 }, + { 0x12, 0x12, 0x0, 0x0, 0x0, 0x0 }, + { 0x13, 0x13, 0x0, 0x0, 0x0, 0x0 }, + { 0x24, 0x24, 0x0, 0x0, 0x0, 0x0 }, + { 0x25, 0x25, 0x0, 0x0, 0x0, 0x0 }, + { 0x27, 0x27, 0x0, 0x0, 0x0, 0x0 }, + { 0x28, 0x28, 0x0, 0x0, 0x0, 0x0 }, + { 0x29, 0x29, 0x0, 0x0, 0x0, 0x0 }, + { 0x146, 0x146, 0x0, 0x0, 0x0, 0x0 }, + { 0x1C3, 0xffff, 0x2C5, 0x2C6, 0xffff, 0x2C7 }, + { 0xD, 0x2C8, 0x2C9, 0xffff, 0x2CA, 0x0 }, + { 0x147, 0xffff, 0x2CB, 0x2CC, 0x2CD, 0x0 }, + { 0x148, 0x148, 0x0, 0x0, 0x0, 0x0 }, + { 0x11, 0x11, 0x0, 0x0, 0x0, 0x0 }, + { 0x23, 0x23, 0x0, 0x0, 0x0, 0x0 }, + { 0x1C8, 0x2CE, 0x2CF, 0xffff, 0x2D0, 0x0 }, + { 0x35, 0xffff, 0x2D1, 0x2D2, 0x2D3, 0x0 }, + { 0x58, 0x58, 0x0, 0x0, 0x0, 0x0 }, + { 0x59, 0x59, 0x0, 0x0, 0x0, 0x0 }, + { 0x5A, 0x5A, 0x0, 0x0, 0x0, 0x0 }, + { 0x66, 0x66, 0x0, 0x0, 0x0, 0x0 }, + { 0x14C, 0xffff, 0x2D4, 0x2D5, 0x2D6, 0x0 }, + { 0x14D, 0x14D, 0x0, 0x0, 0x0, 0x0 }, + { 0x52, 0x52, 0x0, 0x0, 0x0, 0x0 }, + { 0x14F, 0xffff, 0xffff, 0xffff, 0x2D7, 0x2D8 }, + { 0x53, 0xffff, 0x2D9, 0x2DA, 0xffff, 0x2DB }, + { 0x5E, 0xffff, 0x2DC, 0x2DD, 0xffff, 0x2DE }, + { 0x5F, 0x5F, 0x0, 0x0, 0x0, 0x0 }, + { 0x24F, 0xffff, 0xffff, 0xffff, 0xffff, 0x2DF }, + { 0x250, 0x250, 0x0, 0x0, 0x0, 0x0 }, + { 0x251, 0x251, 0x0, 0x0, 0x0, 0x0 }, + { 0x60, 0xffff, 0x2E0, 0x2E1, 0xffff, 0x2E2 }, + { 0x61, 0x61, 0x0, 0x0, 0x0, 0x0 }, + { 0x252, 0xffff, 0xffff, 0xffff, 0xffff, 0x2E3 }, + { 0x253, 0x253, 0x0, 0x0, 0x0, 0x0 }, + { 0x254, 0x254, 0x0, 0x0, 0x0, 0x0 }, + { 0x6E, 0x6E, 0x0, 0x0, 0x0, 0x0 }, + { 0xB4, 0xB4, 0x0, 0x0, 0x0, 0x0 }, + { 0x151, 0xffff, 0xffff, 0xffff, 0x2E4, 0x2E5 }, + { 0x152, 0x152, 0x0, 0x0, 0x0, 0x0 }, + { 0x1E2, 0xffff, 0xffff, 0xffff, 0xffff, 0x2E6 }, + { 0x62, 0x62, 0x0, 0x0, 0x0, 0x0 }, + { 0x63, 0x63, 0x0, 0x0, 0x0, 0x0 }, + { 0x1E6, 0xffff, 0x2E7, 0x2E8, 0x2E9, 0x0 }, + { 0x46, 0x46, 0x0, 0x0, 0x0, 0x0 }, + { 0x47, 0x47, 0x0, 0x0, 0x0, 0x0 }, + { 0x48, 0x48, 0x0, 0x0, 0x0, 0x0 }, + { 0x4E, 0xffff, 0x2EA, 0x2EB, 0x2EC, 0x0 }, + { 0x50, 0x50, 0x0, 0x0, 0x0, 0x0 }, + { 0x92, 0x92, 0x0, 0x0, 0x0, 0x0 }, + { 0x93, 0x93, 0x0, 0x0, 0x0, 0x0 }, + { 0x1E8, 0x1E8, 0x0, 0x0, 0x0, 0x0 }, + { 0x1E9, 0x1E9, 0x0, 0x0, 0x0, 0x0 }, + { 0x1EA, 0x1EA, 0x0, 0x0, 0x0, 0x0 }, + { 0x15A, 0xffff, 0xffff, 0x2ED, 0xffff, 0x2EE }, + { 0x1EB, 0x1EB, 0x0, 0x0, 0x0, 0x0 }, + { 0x1EC, 0x1EC, 0x0, 0x0, 0x0, 0x0 }, + { 0x88, 0x88, 0x0, 0x0, 0x0, 0x0 }, + { 0x89, 0xffff, 0xffff, 0x2EF, 0x2F0, 0x0 }, + { 0x8E, 0x8E, 0x0, 0x0, 0x0, 0x0 }, + { 0x8F, 0xffff, 0xffff, 0x2F1, 0xffff, 0x2F2 }, + { 0x8A, 0x8A, 0x0, 0x0, 0x0, 0x0 }, + { 0x8B, 0xffff, 0xffff, 0x2F3, 0x2F4, 0x0 }, + { 0x90, 0x90, 0x0, 0x0, 0x0, 0x0 }, + { 0x91, 0xffff, 0xffff, 0x2F5, 0x2F6, 0x0 }, + { 0x67, 0x67, 0x0, 0x0, 0x0, 0x0 }, + { 0x68, 0x68, 0x0, 0x0, 0x0, 0x0 }, + { 0x9F, 0x9F, 0x0, 0x0, 0x0, 0x0 }, + { 0xA0, 0xA0, 0x0, 0x0, 0x0, 0x0 }, + { 0xA1, 0xA1, 0x0, 0x0, 0x0, 0x0 }, + { 0xA6, 0xA6, 0x0, 0x0, 0x0, 0x0 }, + { 0xB7, 0xffff, 0xffff, 0xffff, 0xffff, 0x2F7 }, + { 0xB8, 0xB8, 0x0, 0x0, 0x0, 0x0 }, + { 0xB9, 0xffff, 0xffff, 0xffff, 0xffff, 0x2F8 }, + { 0xBA, 0xBA, 0x0, 0x0, 0x0, 0x0 }, + { 0xBB, 0xBB, 0x0, 0x0, 0x0, 0x0 }, + { 0xBC, 0xBC, 0x0, 0x0, 0x0, 0x0 }, + { 0x255, 0xffff, 0xffff, 0xffff, 0xffff, 0x2F9 }, + { 0x256, 0x256, 0x0, 0x0, 0x0, 0x0 }, + { 0x257, 0x257, 0x0, 0x0, 0x0, 0x0 }, + { 0x258, 0x258, 0x0, 0x0, 0x0, 0x0 }, + { 0x69, 0x69, 0x0, 0x0, 0x0, 0x0 }, + { 0x6A, 0x6A, 0x0, 0x0, 0x0, 0x0 }, + { 0xA2, 0xA2, 0x0, 0x0, 0x0, 0x0 }, + { 0xA3, 0xA3, 0x0, 0x0, 0x0, 0x0 }, + { 0xA4, 0xA4, 0x0, 0x0, 0x0, 0x0 }, + { 0xA7, 0xA7, 0x0, 0x0, 0x0, 0x0 }, + { 0xBD, 0xffff, 0xffff, 0xffff, 0xffff, 0x2FA }, + { 0xBE, 0xBE, 0x0, 0x0, 0x0, 0x0 }, + { 0xBF, 0xBF, 0x0, 0x0, 0x0, 0x0 }, + { 0xC0, 0xffff, 0xffff, 0xffff, 0xffff, 0x2FB }, + { 0xC1, 0xC1, 0x0, 0x0, 0x0, 0x0 }, + { 0xC2, 0xC2, 0x0, 0x0, 0x0, 0x0 }, + { 0x1EE, 0x1EE, 0x0, 0x0, 0x0, 0x0 }, + { 0x259, 0xffff, 0xffff, 0xffff, 0xffff, 0x2FC }, + { 0x25A, 0x25A, 0x0, 0x0, 0x0, 0x0 }, + { 0x25B, 0x25B, 0x0, 0x0, 0x0, 0x0 }, + { 0x25C, 0x25C, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x2FD, 0x2FE, 0x2FF, 0x0, 0x0 }, + { 0x2, 0x2, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x4, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA, 0x0, 0x0, 0x0, 0x0 }, + { 0x21, 0x21, 0x0, 0x0, 0x0, 0x0 }, + { 0x163, 0x300, 0x301, 0xffff, 0x302, 0x0 }, + { 0x164, 0x164, 0x0, 0x0, 0x0, 0x0 }, + { 0x6B, 0xffff, 0x303, 0xffff, 0x304, 0x0 }, + { 0x166, 0x166, 0x0, 0x0, 0x0, 0x0 }, + { 0x167, 0x167, 0x0, 0x0, 0x0, 0x0 }, + { 0x6C, 0xffff, 0xffff, 0x305, 0x307, 0x0 }, + { 0x168, 0x168, 0x0, 0x0, 0x0, 0x0 }, + { 0x169, 0x169, 0x0, 0x0, 0x0, 0x0 }, + { 0x44, 0xffff, 0xffff, 0x306, 0xffff, 0x308 }, + { 0x16A, 0xffff, 0xffff, 0xffff, 0xffff, 0x309 }, + { 0x25D, 0xffff, 0xffff, 0xffff, 0xffff, 0x30A } }; static const MapObjectAnimCmd sVsSeekerAnimDoubleExclamationMark[] = { - {0x1, 0x1}, - {0x67, 0x1}, - {0xfe, 0x0} + { 0x1, 0x1 }, + { 0x67, 0x1 }, + { 0xfe, 0x0 } }; static const MapObjectAnimCmd sVsSeekerAnimSingleExclamationMark[] = { - {0x4B, 0x1}, - {0xfe, 0x0} + { 0x4B, 0x1 }, + { 0xfe, 0x0 } }; void VsSeeker_Start(TaskManager *taskMan, StringTemplate *template, u16 *outResult) diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index a6e5ac9887..e528c89cee 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -1,64 +1,64 @@ +#include "overlay006/ov6_0223E140.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021D1BEC_decl.h" -#include "overlay006/struct_ov6_0223FDE4_decl.h" - #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017248.h" #include "struct_defs/struct_02017294.h" +#include "struct_defs/struct_02099F80.h" + #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_02099F80.h" +#include "overlay005/motion_blur.h" +#include "overlay005/ov5_021D0D80.h" +#include "overlay005/ov5_021D1A94.h" +#include "overlay005/ov5_021D521C.h" +#include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay005/struct_ov5_021D52F4.h" -#include "overlay006/struct_ov6_0223E6EC.h" #include "overlay006/funcptr_ov6_0223E6EC.h" +#include "overlay006/struct_ov6_0223E6EC.h" +#include "overlay006/struct_ov6_0223FDE4_decl.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" -#include "unk_02005474.h" +#include "camera.h" +#include "core_sys.h" +#include "field_system.h" +#include "gx_layers.h" +#include "heap.h" +#include "map_object.h" #include "narc.h" -#include "unk_02006E3C.h" +#include "player_avatar.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" +#include "unk_02006E3C.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "gx_layers.h" -#include "camera.h" -#include "field_system.h" #include "unk_020508D4.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_020655F4.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay005/ov5_021D1A94.h" -#include "overlay005/ov5_021D521C.h" -#include "overlay005/motion_blur.h" -#include "overlay006/ov6_0223E140.h" void include_unk_ov6_02248F30(); typedef struct { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; UnkStruct_02099F80 unk_04; - MotionBlur * motionBlur; + MotionBlur *motionBlur; int unk_30; int unk_34; u32 unk_38; } UnkStruct_ov6_0223E140; typedef struct { - UnkStruct_ov6_0223FDE4 * unk_00; + UnkStruct_ov6_0223FDE4 *unk_00; int unk_04; u32 unk_08; u32 unk_0C; @@ -67,15 +67,15 @@ typedef struct { typedef struct { u32 unk_00; s32 unk_04; - UnkStruct_ov6_02240000 * unk_08; + UnkStruct_ov6_02240000 *unk_08; } UnkStruct_ov6_0223E71C; typedef struct { u32 unk_00; s32 unk_04; - UnkStruct_ov6_0223FDE4 * unk_08; - UnkStruct_ov6_02240000 * unk_0C; - Camera * camera; + UnkStruct_ov6_0223FDE4 *unk_08; + UnkStruct_ov6_02240000 *unk_0C; + Camera *camera; } UnkStruct_ov6_0223E548_sub1; typedef struct { @@ -83,22 +83,22 @@ typedef struct { s32 unk_04; int unk_08; UnkStruct_ov6_0223E140 unk_0C; - UnkStruct_ov6_022401B8 * unk_48; - UnkStruct_ov6_0223FDE4 * unk_4C; - UnkStruct_ov6_02240000 * unk_50; - UnkStruct_ov6_02240C44 * unk_54; + UnkStruct_ov6_022401B8 *unk_48; + UnkStruct_ov6_0223FDE4 *unk_4C; + UnkStruct_ov6_02240000 *unk_50; + UnkStruct_ov6_02240C44 *unk_54; UnkStruct_ov6_0223E548_sub1 unk_58; UnkStruct_ov6_0223E71C unk_6C; } UnkStruct_ov6_0223E548; typedef struct { - UnkStruct_ov6_02240774 * unk_00; + UnkStruct_ov6_02240774 *unk_00; } UnkStruct_ov6_0223E7B4; typedef struct { u32 unk_00; - UnkStruct_ov6_02240A00 * unk_04; - UnkStruct_ov6_02240774 * unk_08; + UnkStruct_ov6_02240A00 *unk_04; + UnkStruct_ov6_02240774 *unk_08; } UnkStruct_ov6_0223E830; typedef struct { @@ -118,7 +118,7 @@ typedef struct { typedef struct { u32 unk_00; u32 unk_04; - UnkStruct_ov6_022400A8 * unk_08; + UnkStruct_ov6_022400A8 *unk_08; s16 unk_0C; int unk_10; int unk_14; @@ -136,16 +136,16 @@ typedef struct { fx32 unk_E0; UnkStruct_ov6_0223FD0C unk_E4; UnkStruct_ov6_0223FD0C unk_F4; - FieldSystem * fieldSystem; - MapObject * unk_108; - MapObject * unk_10C; - MapObject * unk_110; - PlayerAvatar * playerAvatar; + FieldSystem *fieldSystem; + MapObject *unk_108; + MapObject *unk_10C; + MapObject *unk_110; + PlayerAvatar *playerAvatar; } UnkStruct_ov6_0223EA98; typedef struct UnkStruct_ov6_0223FDE4_t { - Camera * camera1; - Camera * camera2; + Camera *camera1; + Camera *camera2; UnkStruct_ov6_0223FD0C unk_08; UnkStruct_ov6_0223FD0C unk_18; VecFx32 unk_28; @@ -161,18 +161,18 @@ typedef struct UnkStruct_ov6_02240000_t { u32 unk_14; u32 unk_18; int unk_1C; - SysTask * unk_20; + SysTask *unk_20; } UnkStruct_ov6_02240000; typedef struct { UnkStruct_02017294 unk_00; UnkStruct_020170F4 unk_78; UnkStruct_02017248 unk_88[2]; - UnkStruct_ov6_02240000 * unk_B0; + UnkStruct_ov6_02240000 *unk_B0; UnkStruct_ov6_0223FD0C unk_B4; int unk_C4; int unk_C8; - SysTask * unk_CC; + SysTask *unk_CC; s32 unk_D0; u16 unk_D4; u16 unk_D6; @@ -180,7 +180,7 @@ typedef struct { } UnkStruct_ov6_022400A8_sub1; typedef struct UnkStruct_ov6_022400A8_t { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; UnkStruct_ov6_0223E140 unk_04; UnkStruct_ov6_022400A8_sub1 unk_40; NNSFndAllocator unk_11C; @@ -192,7 +192,7 @@ typedef struct UnkStruct_ov6_022400A8_t { } UnkStruct_ov6_022400A8; typedef struct { - MapObject * unk_00; + MapObject *unk_00; UnkStruct_ov6_0223FD0C unk_04; UnkStruct_ov6_0223FD0C unk_14; int unk_24; @@ -214,7 +214,7 @@ typedef struct { typedef struct UnkStruct_ov6_022401B8_t { u32 unk_00; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; UnkStruct_ov6_02240240 unk_08; UnkStruct_ov6_02240260 unk_34; NNSFndAllocator unk_10C; @@ -253,70 +253,70 @@ typedef struct UnkStruct_ov6_02240C44_t { UnkStruct_02017294 unk_00; UnkStruct_020170F4 unk_78; UnkStruct_02017248 unk_88[4]; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; NNSFndAllocator unk_DC; } UnkStruct_ov6_02240C44; -static void ov6_0223E140(UnkStruct_ov6_0223E140 * param0); -static void ov6_0223E198(UnkStruct_ov6_0223E140 * param0); -static u32 ov6_0223E1AC(const UnkStruct_ov6_0223E140 * param0); +static void ov6_0223E140(UnkStruct_ov6_0223E140 *param0); +static void ov6_0223E198(UnkStruct_ov6_0223E140 *param0); +static u32 ov6_0223E1AC(const UnkStruct_ov6_0223E140 *param0); static void ov6_0223E1B0(void); -static void ov6_0223E1D0(BGL * param0); -static void ov6_0223E2AC(BGL * param0); -static void ov6_0223E2A4(BGL * param0); -static MotionBlur * ov6_0223E2BC(int param0, int param1); -static void ov6_0223E2E8(UnkStruct_ov6_0223E140 * param0); -static void ov6_0223E234(UnkStruct_ov6_0223E140 * param0); -static void ov6_0223E248(UnkStruct_ov6_0223E140 * param0); -static void ov6_0223E2FC(SysTask * param0, void * param1); -static void ov6_0223E25C(SysTask * param0, void * param1); -static void ov6_0223E280(SysTask * param0, void * param1); -static BOOL ov6_0223E71C(UnkStruct_ov6_0223E71C * param0); -static BOOL ov6_022405D0(UnkStruct_ov6_022401B8 * param0); -static BOOL ov6_02240364(UnkStruct_ov6_022401B8 * param0, int param1, int param2); -static void ov6_0223FD00(UnkStruct_ov6_0223FD00 * param0, s32 param1, s32 param2, s32 param3); -static void ov6_0223FD0C(UnkStruct_ov6_0223FD0C * param0, fx32 param1, fx32 param2, s32 param3); -static BOOL ov6_0223FD18(UnkStruct_ov6_0223FD0C * param0, s32 param1); -static void ov6_0223FD58(UnkStruct_020170F4 * param0, u32 param1, u32 param2, u32 param3); -static void ov6_0223FD68(UnkStruct_020170F4 * param0); -static void ov6_0223FD84(UnkStruct_02017248 * param0, NNSFndAllocator * param1); -static BOOL ov6_0223FD98(UnkStruct_02017248 * param0); -static void ov6_0223FD8C(UnkStruct_02017248 * param0); -static void ov6_0223FDA4(UnkStruct_02017248 * param0, fx32 param1); -static void ov6_0223FDAC(UnkStruct_02017294 * param0, UnkStruct_020170F4 * param1); -static void ov6_0223FDB4(UnkStruct_02017294 * param0, UnkStruct_02017248 * param1); -static void ov6_0223FDBC(UnkStruct_02017294 * param0); -static void ov6_0223FDC4(UnkStruct_02017294 * param0, BOOL param1); -static void ov6_0223FDCC(UnkStruct_02017294 * param0, fx32 param1, fx32 param2, fx32 param3); -static void ov6_0223FDD4(UnkStruct_02017294 * param0, fx32 param1, fx32 param2, fx32 param3); -static void ov6_0223FDDC(UnkStruct_02017294 * param0, u16 param1, u32 param2); -static void ov6_0223FF7C(UnkStruct_ov6_0223FDE4 * param0); -static BOOL ov6_0223FFC8(UnkStruct_ov6_0223FDE4 * param0); -static void ov6_0223FFE4(UnkStruct_ov6_0223FDE4 * param0, fx32 param1, fx32 param2); -static void ov6_02240064(SysTask * param0, void * param1); -static void ov6_02240240(UnkStruct_ov6_02240240 * param0, FieldSystem * fieldSystem, u32 param2); -static void ov6_02240260(UnkStruct_ov6_02240260 * param0, u32 param1, NNSFndAllocator * param2); -static void ov6_022402E4(UnkStruct_ov6_02240260 * param0, fx32 param1, fx32 param2, fx32 param3); -static void ov6_02240340(UnkStruct_ov6_02240260 * param0, NNSFndAllocator * param1); -static void ov6_02240600(UnkStruct_ov6_02240260 * param0); -static UnkStruct_ov6_02240774 * ov6_0224060C(u32 param0, u32 param1); -static void ov6_02240654(UnkStruct_ov6_02240774 * param0); -static void ov6_0224067C(UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3, s32 param4, u16 param5, u16 param6, u16 param7); -static void ov6_022406D8(UnkStruct_ov6_02240774 * param0); -static void ov6_02240750(UnkStruct_ov6_02240774 * param0); -static void ov6_022407B8(UnkStruct_ov6_022407B8 * param0, UnkStruct_020170F4 * param1); -static void ov6_022407DC(UnkStruct_ov6_022407B8 * param0); -static void ov6_022407E8(UnkStruct_ov6_022407B8 * param0, fx32 param1, fx32 param2, int param3, fx32 param4, fx32 param5, fx32 param6, u16 param7, u16 param8, u16 param9); -static void ov6_0224085C(UnkStruct_ov6_022407B8 * param0); -static void ov6_0224089C(UnkStruct_ov6_022407B8 * param0); -static UnkStruct_ov6_022407B8 * ov6_022408A8(UnkStruct_ov6_02240774 * param0); -static UnkStruct_ov6_02240A00 * ov6_022408C8(u32 param0, u32 param1); -static void ov6_02240968(UnkStruct_ov6_02240A00 * param0); -static void ov6_02240994(UnkStruct_ov6_02240A00 * param0, fx32 param1, fx32 param2, fx32 param3, u16 param4, u16 param5, u16 param6); -static void ov6_022409D4(UnkStruct_ov6_02240A00 * param0); -static void ov6_022409EC(UnkStruct_ov6_02240A00 * param0); - -static void ov6_0223E140 (UnkStruct_ov6_0223E140 * param0) +static void ov6_0223E1D0(BGL *param0); +static void ov6_0223E2AC(BGL *param0); +static void ov6_0223E2A4(BGL *param0); +static MotionBlur *ov6_0223E2BC(int param0, int param1); +static void ov6_0223E2E8(UnkStruct_ov6_0223E140 *param0); +static void ov6_0223E234(UnkStruct_ov6_0223E140 *param0); +static void ov6_0223E248(UnkStruct_ov6_0223E140 *param0); +static void ov6_0223E2FC(SysTask *param0, void *param1); +static void ov6_0223E25C(SysTask *param0, void *param1); +static void ov6_0223E280(SysTask *param0, void *param1); +static BOOL ov6_0223E71C(UnkStruct_ov6_0223E71C *param0); +static BOOL ov6_022405D0(UnkStruct_ov6_022401B8 *param0); +static BOOL ov6_02240364(UnkStruct_ov6_022401B8 *param0, int param1, int param2); +static void ov6_0223FD00(UnkStruct_ov6_0223FD00 *param0, s32 param1, s32 param2, s32 param3); +static void ov6_0223FD0C(UnkStruct_ov6_0223FD0C *param0, fx32 param1, fx32 param2, s32 param3); +static BOOL ov6_0223FD18(UnkStruct_ov6_0223FD0C *param0, s32 param1); +static void ov6_0223FD58(UnkStruct_020170F4 *param0, u32 param1, u32 param2, u32 param3); +static void ov6_0223FD68(UnkStruct_020170F4 *param0); +static void ov6_0223FD84(UnkStruct_02017248 *param0, NNSFndAllocator *param1); +static BOOL ov6_0223FD98(UnkStruct_02017248 *param0); +static void ov6_0223FD8C(UnkStruct_02017248 *param0); +static void ov6_0223FDA4(UnkStruct_02017248 *param0, fx32 param1); +static void ov6_0223FDAC(UnkStruct_02017294 *param0, UnkStruct_020170F4 *param1); +static void ov6_0223FDB4(UnkStruct_02017294 *param0, UnkStruct_02017248 *param1); +static void ov6_0223FDBC(UnkStruct_02017294 *param0); +static void ov6_0223FDC4(UnkStruct_02017294 *param0, BOOL param1); +static void ov6_0223FDCC(UnkStruct_02017294 *param0, fx32 param1, fx32 param2, fx32 param3); +static void ov6_0223FDD4(UnkStruct_02017294 *param0, fx32 param1, fx32 param2, fx32 param3); +static void ov6_0223FDDC(UnkStruct_02017294 *param0, u16 param1, u32 param2); +static void ov6_0223FF7C(UnkStruct_ov6_0223FDE4 *param0); +static BOOL ov6_0223FFC8(UnkStruct_ov6_0223FDE4 *param0); +static void ov6_0223FFE4(UnkStruct_ov6_0223FDE4 *param0, fx32 param1, fx32 param2); +static void ov6_02240064(SysTask *param0, void *param1); +static void ov6_02240240(UnkStruct_ov6_02240240 *param0, FieldSystem *fieldSystem, u32 param2); +static void ov6_02240260(UnkStruct_ov6_02240260 *param0, u32 param1, NNSFndAllocator *param2); +static void ov6_022402E4(UnkStruct_ov6_02240260 *param0, fx32 param1, fx32 param2, fx32 param3); +static void ov6_02240340(UnkStruct_ov6_02240260 *param0, NNSFndAllocator *param1); +static void ov6_02240600(UnkStruct_ov6_02240260 *param0); +static UnkStruct_ov6_02240774 *ov6_0224060C(u32 param0, u32 param1); +static void ov6_02240654(UnkStruct_ov6_02240774 *param0); +static void ov6_0224067C(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3, s32 param4, u16 param5, u16 param6, u16 param7); +static void ov6_022406D8(UnkStruct_ov6_02240774 *param0); +static void ov6_02240750(UnkStruct_ov6_02240774 *param0); +static void ov6_022407B8(UnkStruct_ov6_022407B8 *param0, UnkStruct_020170F4 *param1); +static void ov6_022407DC(UnkStruct_ov6_022407B8 *param0); +static void ov6_022407E8(UnkStruct_ov6_022407B8 *param0, fx32 param1, fx32 param2, int param3, fx32 param4, fx32 param5, fx32 param6, u16 param7, u16 param8, u16 param9); +static void ov6_0224085C(UnkStruct_ov6_022407B8 *param0); +static void ov6_0224089C(UnkStruct_ov6_022407B8 *param0); +static UnkStruct_ov6_022407B8 *ov6_022408A8(UnkStruct_ov6_02240774 *param0); +static UnkStruct_ov6_02240A00 *ov6_022408C8(u32 param0, u32 param1); +static void ov6_02240968(UnkStruct_ov6_02240A00 *param0); +static void ov6_02240994(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3, u16 param4, u16 param5, u16 param6); +static void ov6_022409D4(UnkStruct_ov6_02240A00 *param0); +static void ov6_022409EC(UnkStruct_ov6_02240A00 *param0); + +static void ov6_0223E140(UnkStruct_ov6_0223E140 *param0) { switch (param0->unk_38) { case 0: @@ -342,18 +342,18 @@ static void ov6_0223E140 (UnkStruct_ov6_0223E140 * param0) } } -static void ov6_0223E198 (UnkStruct_ov6_0223E140 * param0) +static void ov6_0223E198(UnkStruct_ov6_0223E140 *param0) { GF_ASSERT(param0->unk_38 == 2); param0->unk_38 = 3; } -static u32 ov6_0223E1AC (const UnkStruct_ov6_0223E140 * param0) +static u32 ov6_0223E1AC(const UnkStruct_ov6_0223E140 *param0) { return param0->unk_38; } -static void ov6_0223E1B0 (void) +static void ov6_0223E1B0(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_32_FG, @@ -371,7 +371,7 @@ static void ov6_0223E1B0 (void) GXLayers_SetBanks(&v0); } -static void ov6_0223E1D0 (BGL * param0) +static void ov6_0223E1D0(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -410,19 +410,19 @@ static void ov6_0223E1D0 (BGL * param0) } } -static void ov6_0223E234 (UnkStruct_ov6_0223E140 * param0) +static void ov6_0223E234(UnkStruct_ov6_0223E140 *param0) { SysTask_ExecuteAfterVBlank(ov6_0223E25C, param0, 1024); } -static void ov6_0223E248 (UnkStruct_ov6_0223E140 * param0) +static void ov6_0223E248(UnkStruct_ov6_0223E140 *param0) { SysTask_ExecuteAfterVBlank(ov6_0223E280, param0, 1024); } -static void ov6_0223E25C (SysTask * param0, void * param1) +static void ov6_0223E25C(SysTask *param0, void *param1) { - UnkStruct_ov6_0223E140 * v0 = param1; + UnkStruct_ov6_0223E140 *v0 = param1; ov6_0223E1B0(); ov6_0223E2A4(v0->fieldSystem->unk_08); @@ -431,9 +431,9 @@ static void ov6_0223E25C (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov6_0223E280 (SysTask * param0, void * param1) +static void ov6_0223E280(SysTask *param0, void *param1) { - UnkStruct_ov6_0223E140 * v0 = param1; + UnkStruct_ov6_0223E140 *v0 = param1; GXLayers_SetBanks(&v0->unk_04); ov6_0223E2A4(v0->fieldSystem->unk_08); @@ -441,20 +441,20 @@ static void ov6_0223E280 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov6_0223E2A4 (BGL * param0) +static void ov6_0223E2A4(BGL *param0) { ov5_021D143C(param0); } -static void ov6_0223E2AC (BGL * param0) +static void ov6_0223E2AC(BGL *param0) { ov5_021D1434(param0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); } -static MotionBlur * ov6_0223E2BC (int param0, int param1) +static MotionBlur *ov6_0223E2BC(int param0, int param1) { - MotionBlur * motionBlur; + MotionBlur *motionBlur; { MotionBlurParams motionBlurParams = { @@ -480,22 +480,22 @@ static MotionBlur * ov6_0223E2BC (int param0, int param1) return motionBlur; } -static void ov6_0223E2E8 (UnkStruct_ov6_0223E140 * param0) +static void ov6_0223E2E8(UnkStruct_ov6_0223E140 *param0) { SysTask_ExecuteAfterVBlank(ov6_0223E2FC, param0, 1024); } -static void ov6_0223E2FC (SysTask * param0, void * param1) +static void ov6_0223E2FC(SysTask *param0, void *param1) { - UnkStruct_ov6_0223E140 * v0 = param1; + UnkStruct_ov6_0223E140 *v0 = param1; MotionBlur_Delete(&v0->motionBlur, GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); SysTask_Done(param0); } -static void ov6_0223E318 (FieldSystem * fieldSystem, u32 param1, BOOL param2) +static void ov6_0223E318(FieldSystem *fieldSystem, u32 param1, BOOL param2) { - MapObject * v0; + MapObject *v0; v0 = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, param1); @@ -506,10 +506,10 @@ static void ov6_0223E318 (FieldSystem * fieldSystem, u32 param1, BOOL param2) } } -static BOOL ov6_0223E33C (TaskManager * taskMan) +static BOOL ov6_0223E33C(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov6_0223E33C * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov6_0223E33C *v1 = TaskManager_Environment(taskMan); switch (v1->unk_0C) { case 0: @@ -528,10 +528,10 @@ static BOOL ov6_0223E33C (TaskManager * taskMan) return 0; } -void ov6_0223E384 (TaskManager * taskMan) +void ov6_0223E384(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov6_0223E33C * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_0223E33C)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov6_0223E33C *v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_0223E33C)); memset(v1, 0, sizeof(UnkStruct_ov6_0223E33C)); v1->unk_00 = ov6_0223FDE4(4); @@ -540,7 +540,7 @@ void ov6_0223E384 (TaskManager * taskMan) FieldTask_Start(taskMan, ov6_0223E33C, v1); } -static void ov6_0223E3D8 (UnkStruct_ov6_0223E33C * param0) +static void ov6_0223E3D8(UnkStruct_ov6_0223E33C *param0) { fx32 v0 = ov6_0223FFF8(param0->unk_00); fx32 v1; @@ -556,10 +556,10 @@ static void ov6_0223E3D8 (UnkStruct_ov6_0223E33C * param0) } } -static BOOL ov6_0223E408 (TaskManager * param0) +static BOOL ov6_0223E408(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov6_0223E33C * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov6_0223E33C *v1 = TaskManager_Environment(param0); switch (v1->unk_0C) { case 0: @@ -615,10 +615,10 @@ static BOOL ov6_0223E408 (TaskManager * param0) return 0; } -void ov6_0223E4EC (TaskManager * param0) +void ov6_0223E4EC(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov6_0223E33C * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_0223E33C)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov6_0223E33C *v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_0223E33C)); memset(v1, 0, sizeof(UnkStruct_ov6_0223E33C)); v1->unk_00 = ov6_0223FDE4(4); @@ -629,9 +629,9 @@ void ov6_0223E4EC (TaskManager * param0) FieldTask_Start(param0, ov6_0223E408, v1); } -static void ov6_0223E548 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E548(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E548 * v0 = param2; + UnkStruct_ov6_0223E548 *v0 = param2; memset(v0, 0, sizeof(UnkStruct_ov6_0223E548)); @@ -639,15 +639,15 @@ static void ov6_0223E548 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy v0->unk_00 = 0; } -static void ov6_0223E568 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E568(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E548 * v0 = param2; + UnkStruct_ov6_0223E548 *v0 = param2; ov6_022401B8(v0->unk_48); } -static void ov6_0223E574 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E574(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E548 * v0 = param2; + UnkStruct_ov6_0223E548 *v0 = param2; BOOL v1[2]; BOOL v2; @@ -662,8 +662,7 @@ static void ov6_0223E574 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy v0->unk_08 = 0; v0->unk_00++; break; - case 3: - { + case 3: { BOOL v3 = 0; if (v0->unk_04 != 12) { @@ -683,8 +682,7 @@ static void ov6_0223E574 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy v0->unk_08 = 0; v0->unk_00 = 4; } - } - break; + } break; case 4: if (ov6_02240364(v0->unk_48, 0, 60)) { v0->unk_08 = 0; @@ -742,9 +740,9 @@ static void ov6_0223E574 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -static void ov6_0223E6D4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E6D4(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E548 * v0 = param2; + UnkStruct_ov6_0223E548 *v0 = param2; ov6_02240228(v0->unk_48); @@ -753,7 +751,7 @@ static void ov6_0223E6D4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -UnkStruct_ov5_021D1BEC * ov6_0223E6EC (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov6_0223E6EC(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -763,20 +761,20 @@ UnkStruct_ov5_021D1BEC * ov6_0223E6EC (FieldSystem * fieldSystem) ov6_0223E574, ov6_0223E6D4 }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -void ov6_0223E700 (UnkStruct_ov5_021D1BEC * param0) +void ov6_0223E700(UnkStruct_ov5_021D1BEC *param0) { ov5_021D1BEC(param0); } -BOOL ov6_0223E708 (UnkStruct_ov5_021D1BEC * param0) +BOOL ov6_0223E708(UnkStruct_ov5_021D1BEC *param0) { - UnkStruct_ov6_0223E548 * v0 = ov5_021D1C2C(param0); + UnkStruct_ov6_0223E548 *v0 = ov5_021D1C2C(param0); if (v0->unk_00 == 11) { return 1; @@ -785,7 +783,7 @@ BOOL ov6_0223E708 (UnkStruct_ov5_021D1BEC * param0) return 0; } -static BOOL ov6_0223E71C (UnkStruct_ov6_0223E71C * param0) +static BOOL ov6_0223E71C(UnkStruct_ov6_0223E71C *param0) { switch (param0->unk_00) { case 0: @@ -830,10 +828,10 @@ static BOOL ov6_0223E71C (UnkStruct_ov6_0223E71C * param0) return 0; } -static void ov6_0223E7B4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E7B4(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E7B4 * v0 = param2; - MapObject * v1; + UnkStruct_ov6_0223E7B4 *v0 = param2; + MapObject *v1; u16 v2, v3, v4; v1 = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, 0); @@ -847,25 +845,25 @@ static void ov6_0223E7B4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy ov6_0224077C(v0->unk_00, v2, v3, v4); } -static void ov6_0223E7F0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E7F0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E7B4 * v0 = param2; + UnkStruct_ov6_0223E7B4 *v0 = param2; ov6_02240774(v0->unk_00); } -static void ov6_0223E7FC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E7FC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E7B4 * v0 = param2; + UnkStruct_ov6_0223E7B4 *v0 = param2; ov6_022407A8(v0->unk_00); } -static void ov6_0223E808 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E808(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E7B4 * v0 = param2; + UnkStruct_ov6_0223E7B4 *v0 = param2; ov6_022407B0(v0->unk_00); } -UnkStruct_ov5_021D1BEC * ov6_0223E814 (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov6_0223E814(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -875,20 +873,20 @@ UnkStruct_ov5_021D1BEC * ov6_0223E814 (FieldSystem * fieldSystem) ov6_0223E7FC, ov6_0223E808 }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -void ov6_0223E828 (UnkStruct_ov5_021D1BEC * param0) +void ov6_0223E828(UnkStruct_ov5_021D1BEC *param0) { ov5_021D1BEC(param0); } -static void ov6_0223E830 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E830(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E830 * v0 = param2; + UnkStruct_ov6_0223E830 *v0 = param2; VecFx32 v1; CameraAngle v2; @@ -929,9 +927,9 @@ static void ov6_0223E830 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy ov6_02240AEC(v0->unk_08, v1.x, v1.y, v1.z); } -static void ov6_0223E8D0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E8D0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E830 * v0 = param2; + UnkStruct_ov6_0223E830 *v0 = param2; VecFx32 v1; CameraAngle v2; @@ -963,9 +961,9 @@ static void ov6_0223E8D0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy ov6_02240B24(v0->unk_08, v1.x, v1.y, v1.z); } -static void ov6_0223E984 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223E984(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E830 * v0 = param2; + UnkStruct_ov6_0223E830 *v0 = param2; VecFx32 v1; CameraAngle v2; @@ -997,31 +995,31 @@ static void ov6_0223E984 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy ov6_02240B60(v0->unk_08, v1.x, v1.y, v1.z); } -static void ov6_0223EA38 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223EA38(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E830 * v0 = param2; + UnkStruct_ov6_0223E830 *v0 = param2; ov6_02240A00(v0->unk_04); ov6_02240AD4(v0->unk_08); } -static void ov6_0223EA4C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223EA4C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E830 * v0 = param2; + UnkStruct_ov6_0223E830 *v0 = param2; ov6_02240A08(v0->unk_04); ov6_02240ADC(v0->unk_08); } -static void ov6_0223EA60 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223EA60(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223E830 * v0 = param2; + UnkStruct_ov6_0223E830 *v0 = param2; ov6_02240A10(v0->unk_04); ov6_02240AE4(v0->unk_08); } -UnkStruct_ov5_021D1BEC * ov6_0223EA74 (FieldSystem * fieldSystem, u32 param1) +UnkStruct_ov5_021D1BEC *ov6_0223EA74(FieldSystem *fieldSystem, u32 param1) { static UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -1036,22 +1034,22 @@ UnkStruct_ov5_021D1BEC * ov6_0223EA74 (FieldSystem * fieldSystem, u32 param1) ov6_0223E8D0, ov6_0223E984 }; - UnkStruct_ov5_021D1BEC * v2; + UnkStruct_ov5_021D1BEC *v2; v0.unk_08 = v1[param1]; v2 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v2; } -static void ov6_0223EA98 (UnkStruct_ov6_0223EA98 * param0) +static void ov6_0223EA98(UnkStruct_ov6_0223EA98 *param0) { int v0; int v1; - NARC * v2; + NARC *v2; static const int v3[][2] = { - {12, 11}, - {8, 7}, - {10, 9} + { 12, 11 }, + { 8, 7 }, + { 10, 9 } }; v2 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, 4); @@ -1069,15 +1067,15 @@ static void ov6_0223EA98 (UnkStruct_ov6_0223EA98 * param0) NARC_dtor(v2); } -static void ov6_0223EB34 (UnkStruct_ov6_0223EA98 * param0) +static void ov6_0223EB34(UnkStruct_ov6_0223EA98 *param0) { sub_02017110(¶m0->unk_9C); sub_020171A0(¶m0->unk_AC, ¶m0->unk_C0); } -static void ov6_0223EB4C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223EB4C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223EA98 * v0 = param2; + UnkStruct_ov6_0223EA98 *v0 = param2; v0->unk_08 = ov6_02240074(fieldSystem); v0->unk_0C = 0; @@ -1098,19 +1096,19 @@ static void ov6_0223EB4C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy v0->unk_00 = 0; } -static void ov6_0223EBD0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223EBD0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223EA98 * v0 = param2; + UnkStruct_ov6_0223EA98 *v0 = param2; ov6_022400A8(v0->unk_08); } static const fx32 Unk_ov6_02248EA8[][2] = { - {0x1F8, 0x14A}, - {0x243, 0x14A}, - {0x1F8, 0x14A} + { 0x1F8, 0x14A }, + { 0x243, 0x14A }, + { 0x1F8, 0x14A } }; -static BOOL ov6_0223EBDC (UnkStruct_ov6_0223EA98 * param0) +static BOOL ov6_0223EBDC(UnkStruct_ov6_0223EA98 *param0) { BOOL v0[2]; fx32 v1, v2, v3; @@ -1186,7 +1184,7 @@ static BOOL ov6_0223EBDC (UnkStruct_ov6_0223EA98 * param0) return 0; } -static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0) +static BOOL ov6_0223EE5C(UnkStruct_ov6_0223EA98 *param0) { BOOL v0[2]; fx32 v1, v2, v3; @@ -1454,7 +1452,7 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0) return 0; } -static BOOL ov6_0223F744 (UnkStruct_ov6_0223EA98 * param0) +static BOOL ov6_0223F744(UnkStruct_ov6_0223EA98 *param0) { BOOL v0[2]; fx32 v1, v2, v3; @@ -1538,7 +1536,7 @@ static BOOL ov6_0223F744 (UnkStruct_ov6_0223EA98 * param0) return 0; } -static BOOL ov6_0223F9F4 (UnkStruct_ov6_0223EA98 * param0) +static BOOL ov6_0223F9F4(UnkStruct_ov6_0223EA98 *param0) { BOOL v0[2]; fx32 v1, v2, v3; @@ -1561,8 +1559,7 @@ static BOOL ov6_0223F9F4 (UnkStruct_ov6_0223EA98 * param0) param0->unk_14++; } break; - case 1: - { + case 1: { param0->unk_D4 = FX32_CONST(504); param0->unk_D8 = FX32_CONST(439); param0->unk_D0 = 0; @@ -1570,10 +1567,8 @@ static BOOL ov6_0223F9F4 (UnkStruct_ov6_0223EA98 * param0) ov6_0223FD0C(¶m0->unk_E4, v1, param0->unk_D4, 6); ov6_0223FD0C(¶m0->unk_F4, v3, param0->unk_D8, 6); param0->unk_14++; - } - break; - case 2: - { + } break; + case 2: { sub_02017358(¶m0->unk_24, &v1, &v2, &v3); v0[0] = ov6_0223FD18(¶m0->unk_E4, param0->unk_D0); @@ -1585,8 +1580,7 @@ static BOOL ov6_0223F9F4 (UnkStruct_ov6_0223EA98 * param0) if (v0[0] && v0[1]) { param0->unk_14++; } - } - break; + } break; default: return 1; break; @@ -1595,12 +1589,12 @@ static BOOL ov6_0223F9F4 (UnkStruct_ov6_0223EA98 * param0) return 0; } -static void ov6_0223FAF8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223FAF8(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223EA98 * v0 = param2; + UnkStruct_ov6_0223EA98 *v0 = param2; u32 v1[2]; VecFx32 v2; - int v3[] = {68, 38, 390}; + int v3[] = { 68, 38, 390 }; switch (v0->unk_00) { case 0: @@ -1690,42 +1684,42 @@ static void ov6_0223FAF8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -static void ov6_0223FCC0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0223FCC0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0223EA98 * v0 = param2; + UnkStruct_ov6_0223EA98 *v0 = param2; ov6_022400C4(v0->unk_08); } -UnkStruct_ov5_021D1BEC * ov6_0223FCCC (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov6_0223FCCC(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, sizeof(UnkStruct_ov6_0223EA98), ov6_0223EB4C, ov6_0223EBD0, ov6_0223FAF8, ov6_0223FCC0 }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -void ov6_0223FCE0 (UnkStruct_ov5_021D1BEC * param0) +void ov6_0223FCE0(UnkStruct_ov5_021D1BEC *param0) { ov5_021D1BEC(param0); } -void ov6_0223FCE8 (UnkStruct_ov5_021D1BEC * param0) +void ov6_0223FCE8(UnkStruct_ov5_021D1BEC *param0) { - UnkStruct_ov6_0223EA98 * v0 = ov5_021D1C2C(param0); + UnkStruct_ov6_0223EA98 *v0 = ov5_021D1C2C(param0); v0->unk_00 = 3; } -u32 ov6_0223FCF4 (UnkStruct_ov5_021D1BEC * param0) +u32 ov6_0223FCF4(UnkStruct_ov5_021D1BEC *param0) { - UnkStruct_ov6_0223EA98 * v0 = ov5_021D1C2C(param0); + UnkStruct_ov6_0223EA98 *v0 = ov5_021D1C2C(param0); return v0->unk_00; } -static void ov6_0223FD00 (UnkStruct_ov6_0223FD00 * param0, s32 param1, s32 param2, s32 param3) +static void ov6_0223FD00(UnkStruct_ov6_0223FD00 *param0, s32 param1, s32 param2, s32 param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -1733,7 +1727,7 @@ static void ov6_0223FD00 (UnkStruct_ov6_0223FD00 * param0, s32 param1, s32 param param0->unk_0C = param3; } -static void ov6_0223FD0C (UnkStruct_ov6_0223FD0C * param0, fx32 param1, fx32 param2, s32 param3) +static void ov6_0223FD0C(UnkStruct_ov6_0223FD0C *param0, fx32 param1, fx32 param2, s32 param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -1741,7 +1735,7 @@ static void ov6_0223FD0C (UnkStruct_ov6_0223FD0C * param0, fx32 param1, fx32 par param0->unk_0C = param3; } -static BOOL ov6_0223FD18 (UnkStruct_ov6_0223FD0C * param0, s32 param1) +static BOOL ov6_0223FD18(UnkStruct_ov6_0223FD0C *param0, s32 param1) { s32 v0; BOOL v1; @@ -1764,84 +1758,84 @@ static BOOL ov6_0223FD18 (UnkStruct_ov6_0223FD0C * param0, s32 param1) return v1; } -static void ov6_0223FD58 (UnkStruct_020170F4 * param0, u32 param1, u32 param2, u32 param3) +static void ov6_0223FD58(UnkStruct_020170F4 *param0, u32 param1, u32 param2, u32 param3) { sub_020170BC(param0, param1, param2, param3); } -static void ov6_0223FD60 (UnkStruct_020170F4 * param0, NARC * param1, u32 param2, u32 param3) +static void ov6_0223FD60(UnkStruct_020170F4 *param0, NARC *param1, u32 param2, u32 param3) { sub_020170D8(param0, param1, param2, param3); } -static void ov6_0223FD68 (UnkStruct_020170F4 * param0) +static void ov6_0223FD68(UnkStruct_020170F4 *param0) { sub_02017110(param0); } -static void ov6_0223FD70 (UnkStruct_02017248 * param0, const UnkStruct_020170F4 * param1, NARC * param2, u32 param3, u32 param4, NNSFndAllocator * param5) +static void ov6_0223FD70(UnkStruct_02017248 *param0, const UnkStruct_020170F4 *param1, NARC *param2, u32 param3, u32 param4, NNSFndAllocator *param5) { sub_02017164(param0, param1, param2, param3, param4, param5); } -static void ov6_0223FD84 (UnkStruct_02017248 * param0, NNSFndAllocator * param1) +static void ov6_0223FD84(UnkStruct_02017248 *param0, NNSFndAllocator *param1) { sub_020171A0(param0, param1); } -static void ov6_0223FD8C (UnkStruct_02017248 * param0) +static void ov6_0223FD8C(UnkStruct_02017248 *param0) { sub_020171CC(param0, FX32_ONE); } -static BOOL ov6_0223FD98 (UnkStruct_02017248 * param0) +static BOOL ov6_0223FD98(UnkStruct_02017248 *param0) { return sub_02017204(param0, FX32_ONE); } -static void ov6_0223FDA4 (UnkStruct_02017248 * param0, fx32 param1) +static void ov6_0223FDA4(UnkStruct_02017248 *param0, fx32 param1) { sub_02017240(param0, param1); } -static void ov6_0223FDAC (UnkStruct_02017294 * param0, UnkStruct_020170F4 * param1) +static void ov6_0223FDAC(UnkStruct_02017294 *param0, UnkStruct_020170F4 *param1) { sub_02017258(param0, param1); } -static void ov6_0223FDB4 (UnkStruct_02017294 * param0, UnkStruct_02017248 * param1) +static void ov6_0223FDB4(UnkStruct_02017294 *param0, UnkStruct_02017248 *param1) { sub_0201727C(param0, param1); } -static void ov6_0223FDBC (UnkStruct_02017294 * param0) +static void ov6_0223FDBC(UnkStruct_02017294 *param0) { sub_02017294(param0); } -static void ov6_0223FDC4 (UnkStruct_02017294 * param0, BOOL param1) +static void ov6_0223FDC4(UnkStruct_02017294 *param0, BOOL param1) { sub_02017348(param0, param1); } -static void ov6_0223FDCC (UnkStruct_02017294 * param0, fx32 param1, fx32 param2, fx32 param3) +static void ov6_0223FDCC(UnkStruct_02017294 *param0, fx32 param1, fx32 param2, fx32 param3) { sub_02017350(param0, param1, param2, param3); } -static void ov6_0223FDD4 (UnkStruct_02017294 * param0, fx32 param1, fx32 param2, fx32 param3) +static void ov6_0223FDD4(UnkStruct_02017294 *param0, fx32 param1, fx32 param2, fx32 param3) { sub_0201736C(param0, param1, param2, param3); } -static void ov6_0223FDDC (UnkStruct_02017294 * param0, u16 param1, u32 param2) +static void ov6_0223FDDC(UnkStruct_02017294 *param0, u16 param1, u32 param2) { sub_02017388(param0, param1, param2); } -UnkStruct_ov6_0223FDE4 * ov6_0223FDE4 (u32 param0) +UnkStruct_ov6_0223FDE4 *ov6_0223FDE4(u32 param0) { - UnkStruct_ov6_0223FDE4 * v0; + UnkStruct_ov6_0223FDE4 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_0223FDE4)); memset(v0, 0, sizeof(UnkStruct_ov6_0223FDE4)); @@ -1851,13 +1845,13 @@ UnkStruct_ov6_0223FDE4 * ov6_0223FDE4 (u32 param0) return v0; } -void ov6_0223FE08 (UnkStruct_ov6_0223FDE4 * param0) +void ov6_0223FE08(UnkStruct_ov6_0223FDE4 *param0) { Camera_Delete(param0->camera1); Heap_FreeToHeap(param0); } -void ov6_0223FE1C (UnkStruct_ov6_0223FDE4 * param0, fx32 param1, fx32 param2, u32 param3, u32 param4, Camera * camera) +void ov6_0223FE1C(UnkStruct_ov6_0223FDE4 *param0, fx32 param1, fx32 param2, u32 param3, u32 param4, Camera *camera) { ov6_0223FF7C(param0); Camera_Copy(camera, param0->camera1); @@ -1878,7 +1872,7 @@ void ov6_0223FE1C (UnkStruct_ov6_0223FDE4 * param0, fx32 param1, fx32 param2, u3 Sound_PlayEffect(1749); } -void ov6_0223FE9C (UnkStruct_ov6_0223FDE4 * param0) +void ov6_0223FE9C(UnkStruct_ov6_0223FDE4 *param0) { BOOL v0; @@ -1937,7 +1931,7 @@ void ov6_0223FE9C (UnkStruct_ov6_0223FDE4 * param0) } } -BOOL ov6_0223FF6C (UnkStruct_ov6_0223FDE4 * param0) +BOOL ov6_0223FF6C(UnkStruct_ov6_0223FDE4 *param0) { if (param0->unk_40 == 5) { return 1; @@ -1946,7 +1940,7 @@ BOOL ov6_0223FF6C (UnkStruct_ov6_0223FDE4 * param0) return 0; } -static void ov6_0223FF7C (UnkStruct_ov6_0223FDE4 * param0) +static void ov6_0223FF7C(UnkStruct_ov6_0223FDE4 *param0) { memset(¶m0->unk_08, 0, sizeof(UnkStruct_ov6_0223FD0C)); memset(¶m0->unk_18, 0, sizeof(UnkStruct_ov6_0223FD0C)); @@ -1957,7 +1951,7 @@ static void ov6_0223FF7C (UnkStruct_ov6_0223FDE4 * param0) param0->unk_48 = 0; } -static BOOL ov6_0223FFC8 (UnkStruct_ov6_0223FDE4 * param0) +static BOOL ov6_0223FFC8(UnkStruct_ov6_0223FDE4 *param0) { BOOL v0; @@ -1967,28 +1961,28 @@ static BOOL ov6_0223FFC8 (UnkStruct_ov6_0223FDE4 * param0) return v0; } -static void ov6_0223FFE4 (UnkStruct_ov6_0223FDE4 * param0, fx32 param1, fx32 param2) +static void ov6_0223FFE4(UnkStruct_ov6_0223FDE4 *param0, fx32 param1, fx32 param2) { param0->unk_28.x = param0->unk_34.x + param1; param0->unk_28.y = param0->unk_34.y + param2; } -u32 ov6_0223FFF4 (const UnkStruct_ov6_0223FDE4 * param0) +u32 ov6_0223FFF4(const UnkStruct_ov6_0223FDE4 *param0) { return param0->unk_48; } -fx32 ov6_0223FFF8 (const UnkStruct_ov6_0223FDE4 * param0) +fx32 ov6_0223FFF8(const UnkStruct_ov6_0223FDE4 *param0) { return param0->unk_08.unk_08; } -void ov6_0223FFFC (UnkStruct_ov6_0223FDE4 * param0, fx32 param1) +void ov6_0223FFFC(UnkStruct_ov6_0223FDE4 *param0, fx32 param1) { param0->unk_08.unk_08 = param1; } -void ov6_02240000 (UnkStruct_ov6_02240000 * param0, u32 param1, u32 param2, u32 param3) +void ov6_02240000(UnkStruct_ov6_02240000 *param0, u32 param1, u32 param2, u32 param3) { if (param0->unk_1C != 3) { if (param0->unk_20 != NULL) { @@ -2010,20 +2004,20 @@ void ov6_02240000 (UnkStruct_ov6_02240000 * param0, u32 param1, u32 param2, u32 Sound_PlayEffect(1748); } -int ov6_02240060 (const UnkStruct_ov6_02240000 * param0) +int ov6_02240060(const UnkStruct_ov6_02240000 *param0) { return param0->unk_00.unk_00; } -static void ov6_02240064 (SysTask * param0, void * param1) +static void ov6_02240064(SysTask *param0, void *param1) { - UnkStruct_ov6_02240000 * v0 = param1; + UnkStruct_ov6_02240000 *v0 = param1; GX_SetMasterBrightness(v0->unk_00.unk_00); } -UnkStruct_ov6_022400A8 * ov6_02240074 (FieldSystem * fieldSystem) +UnkStruct_ov6_022400A8 *ov6_02240074(FieldSystem *fieldSystem) { - UnkStruct_ov6_022400A8 * v0; + UnkStruct_ov6_022400A8 *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022400A8)); memset(v0, 0, sizeof(UnkStruct_ov6_022400A8)); @@ -2035,13 +2029,13 @@ UnkStruct_ov6_022400A8 * ov6_02240074 (FieldSystem * fieldSystem) return v0; } -void ov6_022400A8 (UnkStruct_ov6_022400A8 * param0) +void ov6_022400A8(UnkStruct_ov6_022400A8 *param0) { GF_ASSERT(param0->unk_12C == 5); Heap_FreeToHeap(param0); } -void ov6_022400C4 (UnkStruct_ov6_022400A8 * param0) +void ov6_022400C4(UnkStruct_ov6_022400A8 *param0) { if ((param0->unk_12C == 0) || (param0->unk_12C == 4) || (param0->unk_12C == 5)) { return; @@ -2057,9 +2051,9 @@ void ov6_022400C4 (UnkStruct_ov6_022400A8 * param0) NNS_G3dGePopMtx(1); } -UnkStruct_ov6_022401B8 * ov6_02240104 (u32 param0, FieldSystem * fieldSystem) +UnkStruct_ov6_022401B8 *ov6_02240104(u32 param0, FieldSystem *fieldSystem) { - UnkStruct_ov6_022401B8 * v0; + UnkStruct_ov6_022401B8 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_022401B8)); memset(v0, 0, sizeof(UnkStruct_ov6_022401B8)); @@ -2071,7 +2065,7 @@ UnkStruct_ov6_022401B8 * ov6_02240104 (u32 param0, FieldSystem * fieldSystem) ov6_02240260(&v0->unk_34, v0->unk_11C, &v0->unk_10C); { - BGL * v1 = sub_0203D170(v0->fieldSystem); + BGL *v1 = sub_0203D170(v0->fieldSystem); sub_02006E3C(172, 74, v1, 2, 0, 0, 0, param0); sub_02006E60(172, 76, v1, 2, 0, 0, 0, param0); @@ -2087,13 +2081,13 @@ UnkStruct_ov6_022401B8 * ov6_02240104 (u32 param0, FieldSystem * fieldSystem) return v0; } -void ov6_022401B8 (UnkStruct_ov6_022401B8 * param0) +void ov6_022401B8(UnkStruct_ov6_022401B8 *param0) { ov6_02240340(¶m0->unk_34, ¶m0->unk_10C); Heap_FreeToHeap(param0); } -void ov6_022401D0 (UnkStruct_ov6_022401B8 * param0, u32 param1) +void ov6_022401D0(UnkStruct_ov6_022401B8 *param0, u32 param1) { VecFx32 v0; @@ -2106,7 +2100,7 @@ void ov6_022401D0 (UnkStruct_ov6_022401B8 * param0, u32 param1) param0->unk_00 = 1; } -BOOL ov6_02240214 (UnkStruct_ov6_022401B8 * param0) +BOOL ov6_02240214(UnkStruct_ov6_022401B8 *param0) { if ((param0->unk_00 == 0) || (param0->unk_00 == 5)) { return 1; @@ -2115,7 +2109,7 @@ BOOL ov6_02240214 (UnkStruct_ov6_022401B8 * param0) return 0; } -void ov6_02240228 (UnkStruct_ov6_022401B8 * param0) +void ov6_02240228(UnkStruct_ov6_022401B8 *param0) { if (ov6_02240214(param0) == 1) { return; @@ -2124,7 +2118,7 @@ void ov6_02240228 (UnkStruct_ov6_022401B8 * param0) ov6_02240600(¶m0->unk_34); } -static void ov6_02240240 (UnkStruct_ov6_02240240 * param0, FieldSystem * fieldSystem, u32 param2) +static void ov6_02240240(UnkStruct_ov6_02240240 *param0, FieldSystem *fieldSystem, u32 param2) { param0->unk_00 = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, param2); GF_ASSERT(param0->unk_00); @@ -2132,10 +2126,10 @@ static void ov6_02240240 (UnkStruct_ov6_02240240 * param0, FieldSystem * fieldSy param0->unk_28 = 0; } -static void ov6_02240260 (UnkStruct_ov6_02240260 * param0, u32 param1, NNSFndAllocator * param2) +static void ov6_02240260(UnkStruct_ov6_02240260 *param0, u32 param1, NNSFndAllocator *param2) { int v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_ARC__DEMO_TENGAN_GRA, param1); @@ -2155,7 +2149,7 @@ static void ov6_02240260 (UnkStruct_ov6_02240260 * param0, u32 param1, NNSFndAll NARC_dtor(v1); } -static void ov6_022402E4 (UnkStruct_ov6_02240260 * param0, fx32 param1, fx32 param2, fx32 param3) +static void ov6_022402E4(UnkStruct_ov6_02240260 *param0, fx32 param1, fx32 param2, fx32 param3) { int v0; @@ -2174,7 +2168,7 @@ static void ov6_022402E4 (UnkStruct_ov6_02240260 * param0, fx32 param1, fx32 par ov6_0223FDC4(¶m0->unk_08, 1); } -static void ov6_02240340 (UnkStruct_ov6_02240260 * param0, NNSFndAllocator * param1) +static void ov6_02240340(UnkStruct_ov6_02240260 *param0, NNSFndAllocator *param1) { int v0; @@ -2185,11 +2179,11 @@ static void ov6_02240340 (UnkStruct_ov6_02240260 * param0, NNSFndAllocator * par } } -static BOOL ov6_02240364 (UnkStruct_ov6_022401B8 * param0, int param1, int param2) +static BOOL ov6_02240364(UnkStruct_ov6_022401B8 *param0, int param1, int param2) { BOOL v0 = 0; - BOOL v1[2] = {0, 0}; - UnkStruct_ov6_02240260 * v2 = ¶m0->unk_34; + BOOL v1[2] = { 0, 0 }; + UnkStruct_ov6_02240260 *v2 = ¶m0->unk_34; if (gCoreSys.pressedKeys & PAD_KEY_UP) { v2->unk_00++; @@ -2393,11 +2387,11 @@ static BOOL ov6_02240364 (UnkStruct_ov6_022401B8 * param0, int param1, int param return v0; } -static BOOL ov6_022405D0 (UnkStruct_ov6_022401B8 * param0) +static BOOL ov6_022405D0(UnkStruct_ov6_022401B8 *param0) { int v0; BOOL v1; - UnkStruct_ov6_02240260 * v2 = ¶m0->unk_34; + UnkStruct_ov6_02240260 *v2 = ¶m0->unk_34; for (v0 = 0; v0 < 2; v0++) { v1 = ov6_0223FD98(&v2->unk_90[v0]); @@ -2410,14 +2404,14 @@ static BOOL ov6_022405D0 (UnkStruct_ov6_022401B8 * param0) return v1; } -static void ov6_02240600 (UnkStruct_ov6_02240260 * param0) +static void ov6_02240600(UnkStruct_ov6_02240260 *param0) { ov6_0223FDBC(¶m0->unk_08); } -static UnkStruct_ov6_02240774 * ov6_0224060C (u32 param0, u32 param1) +static UnkStruct_ov6_02240774 *ov6_0224060C(u32 param0, u32 param1) { - UnkStruct_ov6_02240774 * v0; + UnkStruct_ov6_02240774 *v0; int v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240774)); @@ -2434,7 +2428,7 @@ static UnkStruct_ov6_02240774 * ov6_0224060C (u32 param0, u32 param1) return v0; } -static void ov6_02240654 (UnkStruct_ov6_02240774 * param0) +static void ov6_02240654(UnkStruct_ov6_02240774 *param0) { int v0; @@ -2446,7 +2440,7 @@ static void ov6_02240654 (UnkStruct_ov6_02240774 * param0) Heap_FreeToHeap(param0); } -static void ov6_0224067C (UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3, s32 param4, u16 param5, u16 param6, u16 param7) +static void ov6_0224067C(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3, s32 param4, u16 param5, u16 param6, u16 param7) { GF_ASSERT(param0->unk_1C0 == 0); @@ -2461,10 +2455,10 @@ static void ov6_0224067C (UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 par param0->unk_1C0 = 1; } -static void ov6_022406D8 (UnkStruct_ov6_02240774 * param0) +static void ov6_022406D8(UnkStruct_ov6_02240774 *param0) { int v0; - UnkStruct_ov6_022407B8 * v1; + UnkStruct_ov6_022407B8 *v1; param0->unk_1C4--; @@ -2482,7 +2476,7 @@ static void ov6_022406D8 (UnkStruct_ov6_02240774 * param0) } } -static void ov6_02240750 (UnkStruct_ov6_02240774 * param0) +static void ov6_02240750(UnkStruct_ov6_02240774 *param0) { int v0; @@ -2491,32 +2485,32 @@ static void ov6_02240750 (UnkStruct_ov6_02240774 * param0) } } -UnkStruct_ov6_02240774 * ov6_02240768 (u32 param0) +UnkStruct_ov6_02240774 *ov6_02240768(u32 param0) { return ov6_0224060C(param0, 6); } -void ov6_02240774 (UnkStruct_ov6_02240774 * param0) +void ov6_02240774(UnkStruct_ov6_02240774 *param0) { ov6_02240654(param0); } -void ov6_0224077C (UnkStruct_ov6_02240774 * param0, u16 param1, u16 param2, u16 param3) +void ov6_0224077C(UnkStruct_ov6_02240774 *param0, u16 param1, u16 param2, u16 param3) { - ov6_0224067C(param0, (((param1) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1)), (((param2) << 4) * FX32_ONE) + ((10 << 4) * FX32_ONE), (((param3) << 4) * FX32_ONE) + ((1 << 4) * FX32_ONE), 64, 0, 0, 0); + ov6_0224067C(param0, (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), (((param2) << 4) * FX32_ONE) + ((10 << 4) * FX32_ONE), (((param3) << 4) * FX32_ONE) + ((1 << 4) * FX32_ONE), 64, 0, 0, 0); } -void ov6_022407A8 (UnkStruct_ov6_02240774 * param0) +void ov6_022407A8(UnkStruct_ov6_02240774 *param0) { ov6_022406D8(param0); } -void ov6_022407B0 (UnkStruct_ov6_02240774 * param0) +void ov6_022407B0(UnkStruct_ov6_02240774 *param0) { ov6_02240750(param0); } -static void ov6_022407B8 (UnkStruct_ov6_022407B8 * param0, UnkStruct_020170F4 * param1) +static void ov6_022407B8(UnkStruct_ov6_022407B8 *param0, UnkStruct_020170F4 *param1) { memset(param0, 0, sizeof(UnkStruct_ov6_022407B8)); @@ -2526,12 +2520,12 @@ static void ov6_022407B8 (UnkStruct_ov6_022407B8 * param0, UnkStruct_020170F4 * param0->unk_00 = 0; } -static void ov6_022407DC (UnkStruct_ov6_022407B8 * param0) +static void ov6_022407DC(UnkStruct_ov6_022407B8 *param0) { memset(param0, 0, sizeof(UnkStruct_ov6_022407B8)); } -static void ov6_022407E8 (UnkStruct_ov6_022407B8 * param0, fx32 param1, fx32 param2, int param3, fx32 param4, fx32 param5, fx32 param6, u16 param7, u16 param8, u16 param9) +static void ov6_022407E8(UnkStruct_ov6_022407B8 *param0, fx32 param1, fx32 param2, int param3, fx32 param4, fx32 param5, fx32 param6, u16 param7, u16 param8, u16 param9) { GF_ASSERT(param0->unk_00 == 0); @@ -2547,7 +2541,7 @@ static void ov6_022407E8 (UnkStruct_ov6_022407B8 * param0, fx32 param1, fx32 par param0->unk_8C = 0; } -static void ov6_0224085C (UnkStruct_ov6_022407B8 * param0) +static void ov6_0224085C(UnkStruct_ov6_022407B8 *param0) { BOOL v0; @@ -2565,12 +2559,12 @@ static void ov6_0224085C (UnkStruct_ov6_022407B8 * param0) } } -static void ov6_0224089C (UnkStruct_ov6_022407B8 * param0) +static void ov6_0224089C(UnkStruct_ov6_022407B8 *param0) { ov6_0223FDBC(¶m0->unk_04); } -static UnkStruct_ov6_022407B8 * ov6_022408A8 (UnkStruct_ov6_02240774 * param0) +static UnkStruct_ov6_022407B8 *ov6_022408A8(UnkStruct_ov6_02240774 *param0) { int v0; @@ -2583,11 +2577,11 @@ static UnkStruct_ov6_022407B8 * ov6_022408A8 (UnkStruct_ov6_02240774 * param0) return NULL; } -static UnkStruct_ov6_02240A00 * ov6_022408C8 (u32 param0, u32 param1) +static UnkStruct_ov6_02240A00 *ov6_022408C8(u32 param0, u32 param1) { - UnkStruct_ov6_02240A00 * v0; + UnkStruct_ov6_02240A00 *v0; int v1; - NARC * v2; + NARC *v2; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240A00)); memset(v0, 0, sizeof(UnkStruct_ov6_02240A00)); @@ -2612,7 +2606,7 @@ static UnkStruct_ov6_02240A00 * ov6_022408C8 (u32 param0, u32 param1) return v0; } -static void ov6_02240968 (UnkStruct_ov6_02240A00 * param0) +static void ov6_02240968(UnkStruct_ov6_02240A00 *param0) { int v0; @@ -2625,7 +2619,7 @@ static void ov6_02240968 (UnkStruct_ov6_02240A00 * param0) Heap_FreeToHeap(param0); } -static void ov6_02240994 (UnkStruct_ov6_02240A00 * param0, fx32 param1, fx32 param2, fx32 param3, u16 param4, u16 param5, u16 param6) +static void ov6_02240994(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3, u16 param4, u16 param5, u16 param6) { ov6_0223FDCC(¶m0->unk_00, param1, param2, param3); ov6_0223FDDC(¶m0->unk_00, param4, 0); @@ -2634,7 +2628,7 @@ static void ov6_02240994 (UnkStruct_ov6_02240A00 * param0, fx32 param1, fx32 par ov6_0223FDC4(¶m0->unk_00, 1); } -static void ov6_022409D4 (UnkStruct_ov6_02240A00 * param0) +static void ov6_022409D4(UnkStruct_ov6_02240A00 *param0) { int v0; @@ -2643,78 +2637,78 @@ static void ov6_022409D4 (UnkStruct_ov6_02240A00 * param0) } } -static void ov6_022409EC (UnkStruct_ov6_02240A00 * param0) +static void ov6_022409EC(UnkStruct_ov6_02240A00 *param0) { ov6_0223FDBC(¶m0->unk_00); } -UnkStruct_ov6_02240A00 * ov6_022409F4 (u32 param0) +UnkStruct_ov6_02240A00 *ov6_022409F4(u32 param0) { return ov6_022408C8(param0, 0); } -void ov6_02240A00 (UnkStruct_ov6_02240A00 * param0) +void ov6_02240A00(UnkStruct_ov6_02240A00 *param0) { ov6_02240968(param0); } -void ov6_02240A08 (UnkStruct_ov6_02240A00 * param0) +void ov6_02240A08(UnkStruct_ov6_02240A00 *param0) { VecFx32 v0; ov6_022409D4(param0); } -void ov6_02240A10 (UnkStruct_ov6_02240A00 * param0) +void ov6_02240A10(UnkStruct_ov6_02240A00 *param0) { ov6_022409EC(param0); } -void ov6_02240A18 (UnkStruct_ov6_02240A00 * param0, fx32 param1, fx32 param2, fx32 param3) +void ov6_02240A18(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3) { ov6_02240994(param0, param1 + 170920, param2 + -225940, param3 + -747638, 62623, 32949, 32942); } -void ov6_02240A50 (UnkStruct_ov6_02240A00 * param0, fx32 param1, fx32 param2, fx32 param3) +void ov6_02240A50(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3) { ov6_02240994(param0, param1 + 1141327, param2 + 323947, param3 + -598296, 58801, 49507, 32760); } -void ov6_02240A8C (UnkStruct_ov6_02240A00 * param0, fx32 param1, fx32 param2, fx32 param3) +void ov6_02240A8C(UnkStruct_ov6_02240A00 *param0, fx32 param1, fx32 param2, fx32 param3) { ov6_02240994(param0, param1 + -811008, param2 + 356351, param3 + -2162696, 59165, 21301, 31122); } -UnkStruct_ov6_02240774 * ov6_02240AC8 (u32 param0) +UnkStruct_ov6_02240774 *ov6_02240AC8(u32 param0) { return ov6_0224060C(param0, 6); } -void ov6_02240AD4 (UnkStruct_ov6_02240774 * param0) +void ov6_02240AD4(UnkStruct_ov6_02240774 *param0) { ov6_02240654(param0); } -void ov6_02240ADC (UnkStruct_ov6_02240774 * param0) +void ov6_02240ADC(UnkStruct_ov6_02240774 *param0) { ov6_022406D8(param0); } -void ov6_02240AE4 (UnkStruct_ov6_02240774 * param0) +void ov6_02240AE4(UnkStruct_ov6_02240774 *param0) { ov6_02240750(param0); } -void ov6_02240AEC (UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3) +void ov6_02240AEC(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3) { ov6_0224067C(param0, param1 + 0x11000, param2 + 0xfff91000, param3 + 0xfff35000, 64, 62623, 32949, 32942); } -void ov6_02240B24 (UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3) +void ov6_02240B24(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3) { ov6_0224067C(param0, param1 + 0x252000, param2 + 0x43000, param3 + 0xfffc8000, 64, 58801, 49507, 32760); } -void ov6_02240B60 (UnkStruct_ov6_02240774 * param0, fx32 param1, fx32 param2, fx32 param3) +void ov6_02240B60(UnkStruct_ov6_02240774 *param0, fx32 param1, fx32 param2, fx32 param3) { ov6_0224067C(param0, param1 + 0xffeb4000, param2 + 0xffff3000, param3 + 0xffe3c000, 64, 59165, 21301, 31122); } @@ -2730,15 +2724,15 @@ static const UnkStruct_ov5_021D52F4 Unk_ov6_02248F30[3] = { GX_RGB(31, 31, 31), }, { - {-2022, -3561, 93}, - {0, 0, 4096}, - {0, 0, 4096}, - {0, 0, 4096}, + { -2022, -3561, 93 }, + { 0, 0, 4096 }, + { 0, 0, 4096 }, + { 0, 0, 4096 }, }, GX_RGB(13, 13, 14), GX_RGB(13, 12, 12), GX_RGB(13, 11, 14), - GX_RGB(11, 9, 10) + GX_RGB(11, 9, 10), }, { 16, @@ -2750,15 +2744,15 @@ static const UnkStruct_ov5_021D52F4 Unk_ov6_02248F30[3] = { GX_RGB(31, 31, 31), }, { - {-2022, -3561, 93}, - {0, 0, 4096}, - {0, 0, 4096}, - {0, 0, 4096}, + { -2022, -3561, 93 }, + { 0, 0, 4096 }, + { 0, 0, 4096 }, + { 0, 0, 4096 }, }, GX_RGB(11, 11, 12), GX_RGB(13, 12, 12), GX_RGB(13, 11, 14), - GX_RGB(11, 9, 10) + GX_RGB(11, 9, 10), }, { 24, @@ -2770,28 +2764,28 @@ static const UnkStruct_ov5_021D52F4 Unk_ov6_02248F30[3] = { GX_RGB(31, 31, 31), }, { - {-2022, -3561, 93}, - {0, 0, 4096}, - {0, 0, 4096}, - {0, 0, 4096}, + { -2022, -3561, 93 }, + { 0, 0, 4096 }, + { 0, 0, 4096 }, + { 0, 0, 4096 }, }, GX_RGB(10, 9, 9), GX_RGB(11, 10, 10), GX_RGB(13, 11, 14), - GX_RGB(11, 9, 10) + GX_RGB(11, 9, 10), }, }; -void include_unk_ov6_02248F30 (void) +void include_unk_ov6_02248F30(void) { Unk_ov6_02248F30[0]; } -UnkStruct_ov6_02240C44 * ov6_02240B9C (u32 param0, FieldSystem * fieldSystem) +UnkStruct_ov6_02240C44 *ov6_02240B9C(u32 param0, FieldSystem *fieldSystem) { - UnkStruct_ov6_02240C44 * v0; + UnkStruct_ov6_02240C44 *v0; int v1; - NARC * v2; + NARC *v2; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov6_02240C44)); memset(v0, 0, sizeof(UnkStruct_ov6_02240C44)); @@ -2818,10 +2812,10 @@ UnkStruct_ov6_02240C44 * ov6_02240B9C (u32 param0, FieldSystem * fieldSystem) return v0; } -void ov6_02240C44 (UnkStruct_ov6_02240C44 * param0, u32 param1) +void ov6_02240C44(UnkStruct_ov6_02240C44 *param0, u32 param1) { VecFx32 v0; - MapObject * v1; + MapObject *v1; v1 = MapObjMan_LocalMapObjByIndex(param0->fieldSystem->mapObjMan, param1); @@ -2833,7 +2827,7 @@ void ov6_02240C44 (UnkStruct_ov6_02240C44 * param0, u32 param1) Sound_PlayEffect(1752); } -BOOL ov6_02240C7C (UnkStruct_ov6_02240C44 * param0) +BOOL ov6_02240C7C(UnkStruct_ov6_02240C44 *param0) { int v0; BOOL v1; @@ -2845,7 +2839,7 @@ BOOL ov6_02240C7C (UnkStruct_ov6_02240C44 * param0) return v1; } -void ov6_02240C94 (UnkStruct_ov6_02240C44 * param0) +void ov6_02240C94(UnkStruct_ov6_02240C44 *param0) { ov6_0223FDBC(¶m0->unk_00); } diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c index b2ff500441..aff5d643ba 100644 --- a/src/overlay006/ov6_02240C9C.c +++ b/src/overlay006/ov6_02240C9C.c @@ -1,55 +1,53 @@ +#include "overlay006/ov6_02240C9C.h" + #include #include -#include "inlines.h" - -#include "trainer_info.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_0202D7B0.h" +#include "struct_defs/struct_0206C638.h" + #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_0206C638.h" +#include "overlay005/ov5_021EFB0C.h" #include "overlay006/battle_params.h" +#include "overlay006/ov6_02242F74.h" +#include "overlay006/ov6_02243218.h" +#include "overlay006/ov6_02246B74.h" +#include "overlay006/ov6_02247660.h" +#include "overlay006/ov6_022477B8.h" #include "overlay006/struct_ov6_02242634.h" #include "overlay006/struct_ov6_02242634_sub2.h" +#include "field_overworld_state.h" +#include "field_system.h" +#include "heap.h" +#include "inlines.h" +#include "map_header.h" +#include "map_header_data.h" #include "narc.h" +#include "party.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "pokeradar.h" +#include "roaming_pokemon.h" #include "rtc.h" -#include "heap.h" +#include "trainer_data.h" +#include "trainer_info.h" #include "unk_0201D15C.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" #include "unk_0202D7A8.h" -#include "map_header.h" -#include "map_header_data.h" -#include "field_overworld_state.h" -#include "field_system.h" -#include "vars_flags.h" #include "unk_02050A74.h" #include "unk_02051D8C.h" #include "unk_02054884.h" #include "unk_02054D00.h" #include "unk_020559DC.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" -#include "pokeradar.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" -#include "roaming_pokemon.h" -#include "pokemon.h" -#include "trainer_data.h" -#include "party.h" -#include "overlay005/ov5_021EFB0C.h" -#include "overlay006/ov6_02240C9C.h" -#include "overlay006/ov6_02242F74.h" -#include "overlay006/ov6_02243218.h" -#include "overlay006/ov6_02246B74.h" -#include "overlay006/ov6_02247660.h" -#include "overlay006/ov6_022477B8.h" +#include "vars_flags.h" typedef struct { int unk_00; @@ -77,36 +75,36 @@ typedef struct { typedef struct { int unk_00; - const u8 * unk_04; + const u8 *unk_04; } UnkStruct_ov6_02248FF0; -static BOOL ov6_022417C8(FieldSystem * fieldSystem, const u32 param1, const u8 param2); -static u8 ov6_02241874(FieldSystem * fieldSystem, u8 param1, u8 * param2); -static BOOL ov6_022418B4(FieldSystem * fieldSystem, u32 param1); -static BOOL ov6_022418DC(FieldSystem * fieldSystem, u32 param1); -static BOOL ov6_0224222C(Pokemon * param0, const UnkStruct_ov6_022422D0 * param1, const UnkStruct_ov6_0224222C * param2, const u8 param3, const u8 param4, const u8 param5, u8 * param6); -static BOOL ov6_022422D0(const UnkStruct_ov6_022422D0 * param0, Pokemon * param1, const u8 param2); -static int ov6_0224214C(FieldSystem * fieldSystem); -static int ov6_02242158(FieldSystem * fieldSystem); -static int ov6_02242164(FieldSystem * fieldSystem, const int param1); -static BOOL ov6_02241674(FieldSystem * fieldSystem, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_02242634 * param3, UnkStruct_ov6_0224222C * param4, const UnkStruct_ov6_022422D0 * param5, const UnkStruct_ov6_02241674 * param6); -static BOOL ov6_0224174C(FieldSystem * fieldSystem, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4); -static BOOL ov6_02241790(FieldSystem * fieldSystem, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4); -static BOOL ov6_022417AC(FieldSystem * fieldSystem, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4, const int param5); -static BOOL ov6_02241DC4(Pokemon * param0, const int param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const u8 param4, const int param5, BattleParams * param6); -static BOOL ov6_02241F7C(FieldSystem * fieldSystem, Pokemon * param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const int param4, BattleParams * param5, const int param6, const int param7); -static BOOL ov6_02241F2C(const int param0, const int param1, const int param2, const BOOL param3, const u32 param4, const UnkStruct_ov6_022422D0 * param5, Pokemon * param6, BattleParams * param7); -static u8 ov6_0224226C(const BOOL param0, const u8 param1, const UnkStruct_ov6_022422D0 * param2, const u32 param3, Pokemon * param4); -static void ov6_02242328(FieldSystem * fieldSystem, const BOOL param1, BattleParams ** param2); -static void ov6_02242354(FieldSystem * fieldSystem, const BOOL param1, const BOOL param2, UnkStruct_ov6_0224222C * param3); -static BOOL ov6_02242388(const u8 param0, const UnkStruct_ov6_022422D0 * param1); -static void ov6_0224239C(const u32 param0, UnkStruct_0206C638 * param1, BattleParams * param2); -static BOOL ov6_02242440(FieldSystem * fieldSystem, UnkStruct_0206C638 ** param1); -static BOOL ov6_02242514(const int param0, const UnkStruct_ov6_022422D0 * param1, Pokemon * param2, BattleParams * param3); -static u8 ov6_022425D4(const UnkStruct_ov6_0224222C * param0, const UnkStruct_ov6_022422D0 * param1, const u8 param2); -static void ov6_02242634(FieldSystem * fieldSystem, Pokemon * param1, UnkStruct_ov6_02242634 * param2, UnkStruct_ov6_022422D0 * param3); -static void ov6_02241A90(Pokemon * param0, u8 * param1); -static void ov6_02241ABC(FieldSystem * fieldSystem, u8 * param1); +static BOOL ov6_022417C8(FieldSystem *fieldSystem, const u32 param1, const u8 param2); +static u8 ov6_02241874(FieldSystem *fieldSystem, u8 param1, u8 *param2); +static BOOL ov6_022418B4(FieldSystem *fieldSystem, u32 param1); +static BOOL ov6_022418DC(FieldSystem *fieldSystem, u32 param1); +static BOOL ov6_0224222C(Pokemon *param0, const UnkStruct_ov6_022422D0 *param1, const UnkStruct_ov6_0224222C *param2, const u8 param3, const u8 param4, const u8 param5, u8 *param6); +static BOOL ov6_022422D0(const UnkStruct_ov6_022422D0 *param0, Pokemon *param1, const u8 param2); +static int ov6_0224214C(FieldSystem *fieldSystem); +static int ov6_02242158(FieldSystem *fieldSystem); +static int ov6_02242164(FieldSystem *fieldSystem, const int param1); +static BOOL ov6_02241674(FieldSystem *fieldSystem, Pokemon *param1, BattleParams *param2, UnkStruct_ov6_02242634 *param3, UnkStruct_ov6_0224222C *param4, const UnkStruct_ov6_022422D0 *param5, const UnkStruct_ov6_02241674 *param6); +static BOOL ov6_0224174C(FieldSystem *fieldSystem, Pokemon *param1, BattleParams *param2, UnkStruct_ov6_0224222C *param3, const UnkStruct_ov6_022422D0 *param4); +static BOOL ov6_02241790(FieldSystem *fieldSystem, Pokemon *param1, BattleParams *param2, UnkStruct_ov6_0224222C *param3, const UnkStruct_ov6_022422D0 *param4); +static BOOL ov6_022417AC(FieldSystem *fieldSystem, Pokemon *param1, BattleParams *param2, UnkStruct_ov6_0224222C *param3, const UnkStruct_ov6_022422D0 *param4, const int param5); +static BOOL ov6_02241DC4(Pokemon *param0, const int param1, const UnkStruct_ov6_022422D0 *param2, const UnkStruct_ov6_0224222C *param3, const u8 param4, const int param5, BattleParams *param6); +static BOOL ov6_02241F7C(FieldSystem *fieldSystem, Pokemon *param1, const UnkStruct_ov6_022422D0 *param2, const UnkStruct_ov6_0224222C *param3, const int param4, BattleParams *param5, const int param6, const int param7); +static BOOL ov6_02241F2C(const int param0, const int param1, const int param2, const BOOL param3, const u32 param4, const UnkStruct_ov6_022422D0 *param5, Pokemon *param6, BattleParams *param7); +static u8 ov6_0224226C(const BOOL param0, const u8 param1, const UnkStruct_ov6_022422D0 *param2, const u32 param3, Pokemon *param4); +static void ov6_02242328(FieldSystem *fieldSystem, const BOOL param1, BattleParams **param2); +static void ov6_02242354(FieldSystem *fieldSystem, const BOOL param1, const BOOL param2, UnkStruct_ov6_0224222C *param3); +static BOOL ov6_02242388(const u8 param0, const UnkStruct_ov6_022422D0 *param1); +static void ov6_0224239C(const u32 param0, UnkStruct_0206C638 *param1, BattleParams *param2); +static BOOL ov6_02242440(FieldSystem *fieldSystem, UnkStruct_0206C638 **param1); +static BOOL ov6_02242514(const int param0, const UnkStruct_ov6_022422D0 *param1, Pokemon *param2, BattleParams *param3); +static u8 ov6_022425D4(const UnkStruct_ov6_0224222C *param0, const UnkStruct_ov6_022422D0 *param1, const u8 param2); +static void ov6_02242634(FieldSystem *fieldSystem, Pokemon *param1, UnkStruct_ov6_02242634 *param2, UnkStruct_ov6_022422D0 *param3); +static void ov6_02241A90(Pokemon *param0, u8 *param1); +static void ov6_02241ABC(FieldSystem *fieldSystem, u8 *param1); static const u8 Unk_ov6_02248FDC[] = { 0x0, @@ -161,17 +159,17 @@ static const u8 Unk_ov6_02248FD8[] = { }; static const UnkStruct_ov6_02248FF0 Unk_ov6_02248FF0[] = { - {0x14, Unk_ov6_02248FDC}, - {0x1, Unk_ov6_02248FC0}, - {0x1, Unk_ov6_02248FD4}, - {0x1, Unk_ov6_02248FD0}, - {0x1, Unk_ov6_02248FCC}, - {0x1, Unk_ov6_02248FC8}, - {0x1, Unk_ov6_02248FC4}, - {0x2, Unk_ov6_02248FD8} + { 0x14, Unk_ov6_02248FDC }, + { 0x1, Unk_ov6_02248FC0 }, + { 0x1, Unk_ov6_02248FD4 }, + { 0x1, Unk_ov6_02248FD0 }, + { 0x1, Unk_ov6_02248FCC }, + { 0x1, Unk_ov6_02248FC8 }, + { 0x1, Unk_ov6_02248FC4 }, + { 0x2, Unk_ov6_02248FD8 } }; -void ov6_02240C9C (const UnkStruct_ov6_02242634 * param0, int * param1, int * param2) +void ov6_02240C9C(const UnkStruct_ov6_02242634 *param0, int *param1, int *param2) { int v0; @@ -186,10 +184,10 @@ void ov6_02240C9C (const UnkStruct_ov6_02242634 * param0, int * param1, int * pa } } -static void ov6_02240CC8 (FieldSystem * fieldSystem, const UnkStruct_ov6_02242634 * param1, int * param2, int * param3) +static void ov6_02240CC8(FieldSystem *fieldSystem, const UnkStruct_ov6_02242634 *param1, int *param2, int *param3) { u32 v0; - UnkStruct_0202D7B0 * v1; + UnkStruct_0202D7B0 *v1; v1 = sub_0202D834(fieldSystem->saveData); @@ -203,9 +201,9 @@ static void ov6_02240CC8 (FieldSystem * fieldSystem, const UnkStruct_ov6_0224263 } } -static void ov6_02240D00 (FieldSystem * fieldSystem, const BOOL param1, int * param2, int * param3) +static void ov6_02240D00(FieldSystem *fieldSystem, const BOOL param1, int *param2, int *param3) { - int * v0; + int *v0; u16 v1, v2; if (MapHeader_IsTrophyGarden(fieldSystem->location->mapId)) { @@ -227,10 +225,10 @@ static void ov6_02240D00 (FieldSystem * fieldSystem, const BOOL param1, int * pa } } -BOOL ov6_02240D5C (FieldSystem * fieldSystem) +BOOL ov6_02240D5C(FieldSystem *fieldSystem) { - BattleParams * v0; - Pokemon * v1; + BattleParams *v0; + Pokemon *v1; int v2, v3; u8 v4; u8 v5; @@ -239,8 +237,8 @@ BOOL ov6_02240D5C (FieldSystem * fieldSystem) BOOL v8; BOOL v9; UnkStruct_ov6_02241674 v10; - Party * v11; - UnkStruct_ov6_02242634 * v12; + Party *v11; + UnkStruct_ov6_02242634 *v12; UnkStruct_ov6_0224222C v13[12]; UnkStruct_ov6_022422D0 v14; @@ -265,7 +263,7 @@ BOOL ov6_02240D5C (FieldSystem * fieldSystem) { if (!sub_0202D9D8(sub_0202D834(fieldSystem->saveData))) { - Pokemon * v16; + Pokemon *v16; v16 = Party_FindFirstEligibleBattler(v11); @@ -306,7 +304,7 @@ BOOL ov6_02240D5C (FieldSystem * fieldSystem) } if ((!v8) && (v10.unk_0C == 0)) { - UnkStruct_0206C638 * v17; + UnkStruct_0206C638 *v17; if (ov6_02242440(fieldSystem, &v17)) { if (!ov6_02242388(sub_0202D93C(v17, 6), &v14)) { @@ -394,10 +392,10 @@ BOOL ov6_02240D5C (FieldSystem * fieldSystem) return v6; } -BOOL ov6_0224106C (FieldSystem * fieldSystem, const int param1, BattleParams ** param2) +BOOL ov6_0224106C(FieldSystem *fieldSystem, const int param1, BattleParams **param2) { - Pokemon * v0; - Party * v1; + Pokemon *v0; + Party *v1; BOOL v2; UnkStruct_ov6_0224222C v3[12]; UnkStruct_ov6_022422D0 v4; @@ -443,9 +441,9 @@ BOOL ov6_0224106C (FieldSystem * fieldSystem, const int param1, BattleParams ** } } else { { - UnkStruct_ov6_02242634_sub2 * v10; + UnkStruct_ov6_02242634_sub2 *v10; u8 v11; - UnkStruct_ov6_02242634 * v12; + UnkStruct_ov6_02242634 *v12; v12 = (UnkStruct_ov6_02242634 *)MapHeaderData_GetWildEncounters(fieldSystem); @@ -482,10 +480,10 @@ BOOL ov6_0224106C (FieldSystem * fieldSystem, const int param1, BattleParams ** return 1; } -BOOL ov6_022411C8 (FieldSystem * fieldSystem, TaskManager * param1) +BOOL ov6_022411C8(FieldSystem *fieldSystem, TaskManager *param1) { - BattleParams * v0; - Pokemon * v1; + BattleParams *v0; + Pokemon *v1; int v2, v3; u8 v4; u8 v5; @@ -493,8 +491,8 @@ BOOL ov6_022411C8 (FieldSystem * fieldSystem, TaskManager * param1) BOOL v7; BOOL v8; UnkStruct_ov6_02241674 v9; - Party * v10; - UnkStruct_ov6_02242634 * v11; + Party *v10; + UnkStruct_ov6_02242634 *v11; UnkStruct_ov6_0224222C v12[12]; UnkStruct_ov6_022422D0 v13; @@ -530,7 +528,7 @@ BOOL ov6_022411C8 (FieldSystem * fieldSystem, TaskManager * param1) } if (!v6) { - UnkStruct_0206C638 * v15; + UnkStruct_0206C638 *v15; if (ov6_02242440(fieldSystem, &v15)) { v0 = sub_02051D8C(11, 0x100); @@ -605,9 +603,9 @@ BOOL ov6_022411C8 (FieldSystem * fieldSystem, TaskManager * param1) return 1; } -BOOL ov6_022413E4 (FieldSystem * fieldSystem, BattleParams ** param1) +BOOL ov6_022413E4(FieldSystem *fieldSystem, BattleParams **param1) { - Pokemon * v0; + Pokemon *v0; int v1, v2; u8 v3; u8 v4; @@ -616,8 +614,8 @@ BOOL ov6_022413E4 (FieldSystem * fieldSystem, BattleParams ** param1) BOOL v7; BOOL v8; UnkStruct_ov6_02241674 v9; - Party * v10; - UnkStruct_ov6_02242634 * v11; + Party *v10; + UnkStruct_ov6_02242634 *v11; UnkStruct_ov6_0224222C v12[12]; UnkStruct_ov6_022422D0 v13; @@ -644,7 +642,7 @@ BOOL ov6_022413E4 (FieldSystem * fieldSystem, BattleParams ** param1) { if (!sub_0202D9D8(sub_0202D834(fieldSystem->saveData))) { - Pokemon * v15; + Pokemon *v15; v15 = Party_FindFirstEligibleBattler(v10); @@ -675,7 +673,7 @@ BOOL ov6_022413E4 (FieldSystem * fieldSystem, BattleParams ** param1) } if (!v7) { - UnkStruct_0206C638 * v16; + UnkStruct_0206C638 *v16; if (ov6_02242440(fieldSystem, &v16)) { if (!ov6_02242388(sub_0202D93C(v16, 6), &v13)) { @@ -750,7 +748,7 @@ BOOL ov6_022413E4 (FieldSystem * fieldSystem, BattleParams ** param1) return v5; } -static BOOL ov6_02241674 (FieldSystem * fieldSystem, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_02242634 * param3, UnkStruct_ov6_0224222C * param4, const UnkStruct_ov6_022422D0 * param5, const UnkStruct_ov6_02241674 * param6) +static BOOL ov6_02241674(FieldSystem *fieldSystem, Pokemon *param1, BattleParams *param2, UnkStruct_ov6_02242634 *param3, UnkStruct_ov6_0224222C *param4, const UnkStruct_ov6_022422D0 *param5, const UnkStruct_ov6_02241674 *param6) { BOOL v0; @@ -767,7 +765,7 @@ static BOOL ov6_02241674 (FieldSystem * fieldSystem, Pokemon * param1, BattlePar GetRadarMon(fieldSystem->chain, &v1, &v2); if (param6->unk_04 == 1) { - TrainerInfo * v3; + TrainerInfo *v3; v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem)); v0 = ov6_02241F2C(v1, v2, 1, param6->unk_08, TrainerInfo_ID(v3), param5, param1, param2); @@ -796,7 +794,7 @@ static BOOL ov6_02241674 (FieldSystem * fieldSystem, Pokemon * param1, BattlePar return v0; } -static BOOL ov6_0224174C (FieldSystem * fieldSystem, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4) +static BOOL ov6_0224174C(FieldSystem *fieldSystem, Pokemon *param1, BattleParams *param2, UnkStruct_ov6_0224222C *param3, const UnkStruct_ov6_022422D0 *param4) { BOOL v0; { @@ -814,7 +812,7 @@ static BOOL ov6_0224174C (FieldSystem * fieldSystem, Pokemon * param1, BattlePar return v0; } -static BOOL ov6_02241790 (FieldSystem * fieldSystem, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4) +static BOOL ov6_02241790(FieldSystem *fieldSystem, Pokemon *param1, BattleParams *param2, UnkStruct_ov6_0224222C *param3, const UnkStruct_ov6_022422D0 *param4) { BOOL v0; @@ -825,7 +823,7 @@ static BOOL ov6_02241790 (FieldSystem * fieldSystem, Pokemon * param1, BattlePar return v0; } -static BOOL ov6_022417AC (FieldSystem * fieldSystem, Pokemon * param1, BattleParams * param2, UnkStruct_ov6_0224222C * param3, const UnkStruct_ov6_022422D0 * param4, const int param5) +static BOOL ov6_022417AC(FieldSystem *fieldSystem, Pokemon *param1, BattleParams *param2, UnkStruct_ov6_0224222C *param3, const UnkStruct_ov6_022422D0 *param4, const int param5) { BOOL v0; @@ -833,7 +831,7 @@ static BOOL ov6_022417AC (FieldSystem * fieldSystem, Pokemon * param1, BattlePar return v0; } -static BOOL ov6_022417C8 (FieldSystem * fieldSystem, const u32 param1, const u8 param2) +static BOOL ov6_022417C8(FieldSystem *fieldSystem, const u32 param1, const u8 param2) { u8 v0; u32 v1; @@ -877,7 +875,7 @@ static BOOL ov6_022417C8 (FieldSystem * fieldSystem, const u32 param1, const u8 return 0; } -static u8 ov6_02241874 (FieldSystem * fieldSystem, u8 param1, u8 * param2) +static u8 ov6_02241874(FieldSystem *fieldSystem, u8 param1, u8 *param2) { if (sub_0205DE6C(param1)) { if (sub_0205DB58(param1)) { @@ -892,7 +890,7 @@ static u8 ov6_02241874 (FieldSystem * fieldSystem, u8 param1, u8 * param2) return 0; } -static BOOL ov6_022418B4 (FieldSystem * fieldSystem, u32 param1) +static BOOL ov6_022418B4(FieldSystem *fieldSystem, u32 param1) { param1 = (param1 / 10) >> 8; @@ -909,7 +907,7 @@ static BOOL ov6_022418B4 (FieldSystem * fieldSystem, u32 param1) return 0; } -static BOOL ov6_022418DC (FieldSystem * fieldSystem, u32 param1) +static BOOL ov6_022418DC(FieldSystem *fieldSystem, u32 param1) { if (inline_020564D0(100) >= param1) { return 0; @@ -918,7 +916,7 @@ static BOOL ov6_022418DC (FieldSystem * fieldSystem, u32 param1) } } -static u8 ov6_02241904 (void) +static u8 ov6_02241904(void) { u8 v0; @@ -971,7 +969,7 @@ static u8 ov6_02241904 (void) return 11; } -static u8 ov6_022419A0 (void) +static u8 ov6_022419A0(void) { u8 v0; @@ -996,7 +994,7 @@ static u8 ov6_022419A0 (void) return 4; } -static u8 ov6_022419EC (const int param0) +static u8 ov6_022419EC(const int param0) { u8 v0; u8 v1 = 0; @@ -1050,7 +1048,7 @@ static u8 ov6_022419EC (const int param0) return v1; } -static void ov6_02241A90 (Pokemon * param0, u8 * param1) +static void ov6_02241A90(Pokemon *param0, u8 *param1) { u16 v0; @@ -1061,7 +1059,7 @@ static void ov6_02241A90 (Pokemon * param0, u8 * param1) } } -static void ov6_02241ABC (FieldSystem * fieldSystem, u8 * param1) +static void ov6_02241ABC(FieldSystem *fieldSystem, u8 *param1) { u8 v0; @@ -1074,7 +1072,7 @@ static void ov6_02241ABC (FieldSystem * fieldSystem, u8 * param1) } } -static u8 ov6_02241AE4 (Pokemon * param0, const UnkStruct_ov6_022422D0 * param1) +static u8 ov6_02241AE4(Pokemon *param0, const UnkStruct_ov6_022422D0 *param1) { u32 v0; @@ -1091,7 +1089,7 @@ static u8 ov6_02241AE4 (Pokemon * param0, const UnkStruct_ov6_022422D0 * param1) return inline_020564D0(25); } -static u8 ov6_02241B40 (const UnkStruct_ov6_0224222C * param0, const UnkStruct_ov6_022422D0 * param1) +static u8 ov6_02241B40(const UnkStruct_ov6_0224222C *param0, const UnkStruct_ov6_022422D0 *param1) { u8 v0; u8 v1; @@ -1122,14 +1120,14 @@ static u8 ov6_02241B40 (const UnkStruct_ov6_0224222C * param0, const UnkStruct_o return v2 + v1; } -static void ov6_02241BAC (const u16 param0, const u8 param1, const int param2, const u32 param3, const UnkStruct_ov6_022422D0 * param4, Pokemon * param5, BattleParams * param6) +static void ov6_02241BAC(const u16 param0, const u8 param1, const int param2, const u32 param3, const UnkStruct_ov6_022422D0 *param4, Pokemon *param5, BattleParams *param6) { BOOL v0; u32 v1; BOOL v2; u8 v3; u8 v4; - Pokemon * v5; + Pokemon *v5; v5 = Pokemon_New(11); Pokemon_Init(v5); @@ -1195,12 +1193,12 @@ static void ov6_02241BAC (const u16 param0, const u8 param1, const int param2, c Heap_FreeToHeap(v5); } -static void ov6_02241CC0 (u16 param0, u8 param1, const int param2, const UnkStruct_ov6_022422D0 * param3, Pokemon * param4, BattleParams * param5) +static void ov6_02241CC0(u16 param0, u8 param1, const int param2, const UnkStruct_ov6_022422D0 *param3, Pokemon *param4, BattleParams *param5) { u8 v0; u8 v1; BOOL v2; - Pokemon * v3; + Pokemon *v3; v3 = Pokemon_New(11); Pokemon_Init(v3); @@ -1253,7 +1251,7 @@ static void ov6_02241CC0 (u16 param0, u8 param1, const int param2, const UnkStru Heap_FreeToHeap(v3); } -static BOOL ov6_02241DC4 (Pokemon * param0, const int param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const u8 param4, const int param5, BattleParams * param6) +static BOOL ov6_02241DC4(Pokemon *param0, const int param1, const UnkStruct_ov6_022422D0 *param2, const UnkStruct_ov6_0224222C *param3, const u8 param4, const int param5, BattleParams *param6) { BOOL v0; u8 v1 = 0; @@ -1310,7 +1308,7 @@ static BOOL ov6_02241DC4 (Pokemon * param0, const int param1, const UnkStruct_ov return 1; } -static BOOL ov6_02241F2C (const int param0, const int param1, const int param2, const BOOL param3, const u32 param4, const UnkStruct_ov6_022422D0 * param5, Pokemon * param6, BattleParams * param7) +static BOOL ov6_02241F2C(const int param0, const int param1, const int param2, const BOOL param3, const u32 param4, const UnkStruct_ov6_022422D0 *param5, Pokemon *param6, BattleParams *param7) { u8 v0 = 0; @@ -1326,7 +1324,7 @@ static BOOL ov6_02241F2C (const int param0, const int param1, const int param2, return 1; } -static BOOL ov6_02241F7C (FieldSystem * fieldSystem, Pokemon * param1, const UnkStruct_ov6_022422D0 * param2, const UnkStruct_ov6_0224222C * param3, const int param4, BattleParams * param5, const int param6, const int param7) +static BOOL ov6_02241F7C(FieldSystem *fieldSystem, Pokemon *param1, const UnkStruct_ov6_022422D0 *param2, const UnkStruct_ov6_0224222C *param3, const int param4, BattleParams *param5, const int param6, const int param7) { u8 v0; u8 v1 = 0; @@ -1363,9 +1361,9 @@ static BOOL ov6_02241F7C (FieldSystem * fieldSystem, Pokemon * param1, const Unk return 1; } -void ov6_02242034 (FieldSystem * fieldSystem, BattleParams * param1) +void ov6_02242034(FieldSystem *fieldSystem, BattleParams *param1) { - Pokemon * v0; + Pokemon *v0; int v1; UnkStruct_ov6_022422D0 v2; u8 v3; @@ -1373,7 +1371,7 @@ void ov6_02242034 (FieldSystem * fieldSystem, BattleParams * param1) v1 = ov5_021EFFE4(fieldSystem); { - Party * v4; + Party *v4; v4 = Party_GetFromSavedata(fieldSystem->saveData); v0 = Party_GetPokemonBySlotIndex(v4, 0); @@ -1404,13 +1402,13 @@ void ov6_02242034 (FieldSystem * fieldSystem, BattleParams * param1) return; } -void ov6_022420D4 (FieldSystem * fieldSystem, u16 param1, u8 param2, BattleParams * param3) +void ov6_022420D4(FieldSystem *fieldSystem, u16 param1, u8 param2, BattleParams *param3) { - Pokemon * v0; + Pokemon *v0; UnkStruct_ov6_022422D0 v1; { - Party * v2; + Party *v2; v2 = Party_GetFromSavedata(fieldSystem->saveData); v0 = Party_GetPokemonBySlotIndex(v2, 0); @@ -1422,7 +1420,7 @@ void ov6_022420D4 (FieldSystem * fieldSystem, u16 param1, u8 param2, BattleParam return; } -BOOL ov6_02242110 (FieldSystem * fieldSystem, u8 param1) +BOOL ov6_02242110(FieldSystem *fieldSystem, u8 param1) { int v0 = 0; @@ -1441,25 +1439,25 @@ BOOL ov6_02242110 (FieldSystem * fieldSystem, u8 param1) } } -static int ov6_0224214C (FieldSystem * fieldSystem) +static int ov6_0224214C(FieldSystem *fieldSystem) { - UnkStruct_ov6_02242634 * v0; + UnkStruct_ov6_02242634 *v0; v0 = (UnkStruct_ov6_02242634 *)MapHeaderData_GetWildEncounters(fieldSystem); return v0->unk_00; } -static int ov6_02242158 (FieldSystem * fieldSystem) +static int ov6_02242158(FieldSystem *fieldSystem) { - UnkStruct_ov6_02242634 * v0; + UnkStruct_ov6_02242634 *v0; v0 = (UnkStruct_ov6_02242634 *)MapHeaderData_GetWildEncounters(fieldSystem); return v0->unk_A8; } -static int ov6_02242164 (FieldSystem * fieldSystem, const int param1) +static int ov6_02242164(FieldSystem *fieldSystem, const int param1) { - UnkStruct_ov6_02242634 * v0; + UnkStruct_ov6_02242634 *v0; v0 = (UnkStruct_ov6_02242634 *)MapHeaderData_GetWildEncounters(fieldSystem); @@ -1476,7 +1474,7 @@ static int ov6_02242164 (FieldSystem * fieldSystem, const int param1) } } -static BOOL ov6_0224219C (const UnkStruct_ov6_0224222C * param0, const u8 param1, const u8 param2, u8 * param3) +static BOOL ov6_0224219C(const UnkStruct_ov6_0224222C *param0, const u8 param1, const u8 param2, u8 *param3) { u8 v0[12]; u8 v1; @@ -1506,7 +1504,7 @@ static BOOL ov6_0224219C (const UnkStruct_ov6_0224222C * param0, const u8 param1 return 1; } -static BOOL ov6_0224222C (Pokemon * param0, const UnkStruct_ov6_022422D0 * param1, const UnkStruct_ov6_0224222C * param2, const u8 param3, const u8 param4, const u8 param5, u8 * param6) +static BOOL ov6_0224222C(Pokemon *param0, const UnkStruct_ov6_022422D0 *param1, const UnkStruct_ov6_0224222C *param2, const u8 param3, const u8 param4, const u8 param5, u8 *param6) { if (param1->unk_0D == 0) { if (param1->unk_0E == param5) { @@ -1519,7 +1517,7 @@ static BOOL ov6_0224222C (Pokemon * param0, const UnkStruct_ov6_022422D0 * param return 0; } -static u8 ov6_0224226C (const BOOL param0, const u8 param1, const UnkStruct_ov6_022422D0 * param2, const u32 param3, Pokemon * param4) +static u8 ov6_0224226C(const BOOL param0, const u8 param1, const UnkStruct_ov6_022422D0 *param2, const u32 param3, Pokemon *param4) { int v0; @@ -1554,7 +1552,7 @@ static u8 ov6_0224226C (const BOOL param0, const u8 param1, const UnkStruct_ov6_ return v0; } -static BOOL ov6_022422D0 (const UnkStruct_ov6_022422D0 * param0, Pokemon * param1, const u8 param2) +static BOOL ov6_022422D0(const UnkStruct_ov6_022422D0 *param0, Pokemon *param1, const u8 param2) { u8 v0; @@ -1581,24 +1579,24 @@ static BOOL ov6_022422D0 (const UnkStruct_ov6_022422D0 * param0, Pokemon * param return 0; } -static void ov6_02242328 (FieldSystem * fieldSystem, const BOOL param1, BattleParams ** param2) +static void ov6_02242328(FieldSystem *fieldSystem, const BOOL param1, BattleParams **param2) { if (!param1) { (*param2) = sub_02051D8C(11, (0x0 | 0x0)); } else { - u16 * v0 = sub_0203A784(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + u16 *v0 = sub_0203A784(SaveData_GetFieldOverworldState(fieldSystem->saveData)); (*param2) = sub_02051F24(11, *v0); } } -static void ov6_02242354 (FieldSystem * fieldSystem, const BOOL param1, const BOOL param2, UnkStruct_ov6_0224222C * param3) +static void ov6_02242354(FieldSystem *fieldSystem, const BOOL param1, const BOOL param2, UnkStruct_ov6_0224222C *param3) { if (param1) { ov6_02242F74(sub_0202D814(sub_0202D834(fieldSystem->saveData), 1), param2, fieldSystem->location->mapId, ¶m3[6].unk_00, ¶m3[7].unk_00); } } -static BOOL ov6_02242388 (const u8 param0, const UnkStruct_ov6_022422D0 * param1) +static BOOL ov6_02242388(const u8 param0, const UnkStruct_ov6_022422D0 *param1) { if (param1->unk_04) { if (param1->unk_0C > param0) { @@ -1609,7 +1607,7 @@ static BOOL ov6_02242388 (const u8 param0, const UnkStruct_ov6_022422D0 * param1 return 0; } -static void ov6_0224239C (const u32 param0, UnkStruct_0206C638 * param1, BattleParams * param2) +static void ov6_0224239C(const u32 param0, UnkStruct_0206C638 *param1, BattleParams *param2) { int v0; u8 v1; @@ -1618,7 +1616,7 @@ static void ov6_0224239C (const u32 param0, UnkStruct_0206C638 * param1, BattleP u32 v4; u16 v5; BOOL v6; - Pokemon * v7; + Pokemon *v7; v7 = Pokemon_New(4); v0 = sub_0202D93C(param1, 4); @@ -1639,10 +1637,10 @@ static void ov6_0224239C (const u32 param0, UnkStruct_0206C638 * param1, BattleP Heap_FreeToHeap(v7); } -static BOOL ov6_02242440 (FieldSystem * fieldSystem, UnkStruct_0206C638 ** param1) +static BOOL ov6_02242440(FieldSystem *fieldSystem, UnkStruct_0206C638 **param1) { - UnkStruct_0202D7B0 * v0; - UnkStruct_0206C638 * v1[6]; + UnkStruct_0202D7B0 *v0; + UnkStruct_0206C638 *v1[6]; u8 v2; u8 v3; int v4; @@ -1676,7 +1674,7 @@ static BOOL ov6_02242440 (FieldSystem * fieldSystem, UnkStruct_0206C638 ** param return 1; } -static BOOL ov6_02242514 (const int param0, const UnkStruct_ov6_022422D0 * param1, Pokemon * param2, BattleParams * param3) +static BOOL ov6_02242514(const int param0, const UnkStruct_ov6_022422D0 *param1, Pokemon *param2, BattleParams *param3) { int v0 = 0; @@ -1728,7 +1726,7 @@ static BOOL ov6_02242514 (const int param0, const UnkStruct_ov6_022422D0 * param return Party_AddPokemon(param3->parties[param0], param2); } -static u8 ov6_022425D4 (const UnkStruct_ov6_0224222C * param0, const UnkStruct_ov6_022422D0 * param1, const u8 param2) +static u8 ov6_022425D4(const UnkStruct_ov6_0224222C *param0, const UnkStruct_ov6_022422D0 *param1, const u8 param2) { u8 v0; u8 v1; @@ -1756,7 +1754,7 @@ static u8 ov6_022425D4 (const UnkStruct_ov6_0224222C * param0, const UnkStruct_o return param2; } -static void ov6_02242634 (FieldSystem * fieldSystem, Pokemon * param1, UnkStruct_ov6_02242634 * param2, UnkStruct_ov6_022422D0 * param3) +static void ov6_02242634(FieldSystem *fieldSystem, Pokemon *param1, UnkStruct_ov6_02242634 *param2, UnkStruct_ov6_022422D0 *param3) { if (Pokemon_GetValue(param1, MON_DATA_IS_EGG, NULL) == 0) { param3->unk_0D = 0; diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c index 75bc490977..1c186ed674 100644 --- a/src/overlay006/ov6_022426AC.c +++ b/src/overlay006/ov6_022426AC.c @@ -1,46 +1,47 @@ +#include "overlay006/ov6_022426AC.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" - #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay115/struct_ov115_02261520.h" +#include "heap.h" #include "narc.h" +#include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "sys_task.h" #include "unk_020131EC.h" -#include "heap.h" #include "unk_0201D15C.h" #include "unk_020218BC.h" -#include "pokemon.h" -#include "overlay006/ov6_022426AC.h" typedef struct UnkStruct_ov6_022426B8_t { - UnkStruct_02009714 * unk_00[4]; - UnkStruct_02009DC8 * unk_10[4]; - void * unk_20; - void * unk_24; + UnkStruct_02009714 *unk_00[4]; + UnkStruct_02009DC8 *unk_10[4]; + void *unk_20; + void *unk_24; ArchivedSprite unk_28; - GraphicElementManager * unk_38; + GraphicElementManager *unk_38; UnkStruct_0200C738 unk_3C; - GraphicElementData * unk_1C8; + GraphicElementData *unk_1C8; BOOL unk_1CC; BOOL unk_1D0; } UnkStruct_ov6_022426B8; -static void ov6_022428F8(UnkStruct_ov6_022426B8 * param0); -static void ov6_02242860(SysTask * param0, void * param1); -static void ov6_02242880(UnkStruct_02009714 * param0, UnkStruct_02009714 * param1, void * param2, void * param3); +static void ov6_022428F8(UnkStruct_ov6_022426B8 *param0); +static void ov6_02242860(SysTask *param0, void *param1); +static void ov6_02242880(UnkStruct_02009714 *param0, UnkStruct_02009714 *param1, void *param2, void *param3); static const u8 Unk_ov6_02249030[] = { 0x1, @@ -49,23 +50,23 @@ static const u8 Unk_ov6_02249030[] = { 0x1 }; -UnkStruct_ov6_022426B8 * ov6_022426AC (const int param0) +UnkStruct_ov6_022426B8 *ov6_022426AC(const int param0) { - UnkStruct_ov6_022426B8 * v0; + UnkStruct_ov6_022426B8 *v0; v0 = Heap_AllocFromHeapAtEnd(param0, sizeof(UnkStruct_ov6_022426B8)); return v0; } -void ov6_022426B8 (UnkStruct_ov6_022426B8 * param0) +void ov6_022426B8(UnkStruct_ov6_022426B8 *param0) { Heap_FreeToHeap(param0); } -void ov6_022426C0 (UnkStruct_ov6_022426B8 * param0, const int param1) +void ov6_022426C0(UnkStruct_ov6_022426B8 *param0, const int param1) { int v0; - NARC * v1; + NARC *v1; param0->unk_1CC = 0; @@ -119,7 +120,7 @@ void ov6_022426C0 (UnkStruct_ov6_022426B8 * param0, const int param1) ov6_022428F8(param0); } -void ov6_022427F4 (UnkStruct_ov6_022426B8 * param0) +void ov6_022427F4(UnkStruct_ov6_022426B8 *param0) { param0->unk_1CC = 1; param0->unk_1D0 = 0; @@ -127,17 +128,17 @@ void ov6_022427F4 (UnkStruct_ov6_022426B8 * param0) SysTask_Start(ov6_02242860, param0, 0); } -void ov6_02242814 (UnkStruct_ov6_022426B8 * param0) +void ov6_02242814(UnkStruct_ov6_022426B8 *param0) { param0->unk_1CC = 0; } -BOOL ov6_02242820 (UnkStruct_ov6_022426B8 * param0) +BOOL ov6_02242820(UnkStruct_ov6_022426B8 *param0) { return param0->unk_1D0; } -void ov6_02242828 (UnkStruct_ov6_022426B8 * param0) +void ov6_02242828(UnkStruct_ov6_022426B8 *param0) { u8 v0; @@ -153,9 +154,9 @@ void ov6_02242828 (UnkStruct_ov6_022426B8 * param0) Heap_FreeToHeap(param0->unk_24); } -static void ov6_02242860 (SysTask * param0, void * param1) +static void ov6_02242860(SysTask *param0, void *param1) { - UnkStruct_ov6_022426B8 * v0 = param1; + UnkStruct_ov6_022426B8 *v0 = param1; if (v0->unk_1CC) { sub_020219F8(v0->unk_38); @@ -165,14 +166,14 @@ static void ov6_02242860 (SysTask * param0, void * param1) } } -static void ov6_02242880 (UnkStruct_02009714 * param0, UnkStruct_02009714 * param1, void * param2, void * param3) +static void ov6_02242880(UnkStruct_02009714 *param0, UnkStruct_02009714 *param1, void *param2, void *param3) { int v0; u32 v1, v2; - UnkStruct_02009DC8 * v3; - UnkStruct_02009DC8 * v4; - NNSG2dImageProxy * v5; - const NNSG2dImagePaletteProxy * v6; + UnkStruct_02009DC8 *v3; + UnkStruct_02009DC8 *v4; + NNSG2dImageProxy *v5; + const NNSG2dImagePaletteProxy *v6; v3 = sub_02009DC8(param0, 0); v4 = sub_02009DC8(param1, 1); @@ -195,7 +196,7 @@ static void ov6_02242880 (UnkStruct_02009714 * param0, UnkStruct_02009714 * para GX_LoadOBJPltt(param3, v2, v0); } -static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0) +static void ov6_022428F8(UnkStruct_ov6_022426B8 *param0) { int v0; UnkStruct_ov19_021DA864 v1; diff --git a/src/overlay006/ov6_02242984.c b/src/overlay006/ov6_02242984.c index 9dc3857aef..dba8938091 100644 --- a/src/overlay006/ov6_02242984.c +++ b/src/overlay006/ov6_02242984.c @@ -1,24 +1,25 @@ +#include "overlay006/ov6_02242984.h" + #include #include -#include "inlines.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" -#include "struct_defs/struct_02049FA8.h" +#include "overlay006/ov6_02240C9C.h" +#include "overlay006/ov6_02242F74.h" +#include "overlay006/ov6_022477B8.h" #include "overlay006/struct_ov6_02242634.h" -#include "narc.h" +#include "field_system.h" #include "heap.h" +#include "inlines.h" +#include "map_header_data.h" +#include "narc.h" +#include "player_avatar.h" #include "unk_0202631C.h" #include "unk_0202D7A8.h" #include "unk_02039C80.h" -#include "map_header_data.h" -#include "field_system.h" -#include "player_avatar.h" -#include "overlay006/ov6_02240C9C.h" -#include "overlay006/ov6_02242984.h" -#include "overlay006/ov6_02242F74.h" -#include "overlay006/ov6_022477B8.h" typedef struct { u16 unk_00; @@ -28,16 +29,16 @@ typedef struct { typedef struct UnkStruct_ov6_02242A8C_t { UnkStruct_ov6_02242A10 unk_00[6]; Location unk_18; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; int unk_30; } UnkStruct_ov6_02242A8C; -int ov6_02242984 (FieldSystem * fieldSystem) +int ov6_02242984(FieldSystem *fieldSystem) { u8 v0; BOOL v1; int v2[12]; - UnkStruct_ov6_02242634 * v3; + UnkStruct_ov6_02242634 *v3; v3 = (UnkStruct_ov6_02242634 *)MapHeaderData_GetWildEncounters(fieldSystem); @@ -54,17 +55,17 @@ int ov6_02242984 (FieldSystem * fieldSystem) return v2[inline_020564D0(12)]; } -UnkStruct_ov6_02242A8C * ov6_02242A10 (const int param0, FieldSystem * fieldSystem) +UnkStruct_ov6_02242A8C *ov6_02242A10(const int param0, FieldSystem *fieldSystem) { u8 v0; - UnkStruct_ov6_02242A8C * v1; + UnkStruct_ov6_02242A8C *v1; v1 = Heap_AllocFromHeapAtEnd(param0, sizeof(UnkStruct_ov6_02242A8C)); v1->fieldSystem = fieldSystem; { u8 v2; - UnkStruct_ov6_02242A10 * v3; + UnkStruct_ov6_02242A10 *v3; v3 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 11, 4); @@ -86,12 +87,12 @@ UnkStruct_ov6_02242A8C * ov6_02242A10 (const int param0, FieldSystem * fieldSyst return v1; } -void ov6_02242A8C (UnkStruct_ov6_02242A8C * param0) +void ov6_02242A8C(UnkStruct_ov6_02242A8C *param0) { Heap_FreeToHeap(param0); } -void ov6_02242A94 (const u8 param0, UnkStruct_ov6_02242A8C * param1) +void ov6_02242A94(const u8 param0, UnkStruct_ov6_02242A8C *param1) { int v0; int v1, v2; @@ -114,7 +115,7 @@ void ov6_02242A94 (const u8 param0, UnkStruct_ov6_02242A8C * param1) Location_Set(¶m1->unk_18, v0, -1, param1->unk_00[param0].unk_00, param1->unk_00[param0].unk_02, 0); } -Location * ov6_02242AEC (UnkStruct_ov6_02242A8C * param0) +Location *ov6_02242AEC(UnkStruct_ov6_02242A8C *param0) { return ¶m0->unk_18; } diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c index 9be136f508..1e2a935f09 100644 --- a/src/overlay006/ov6_02242AF0.c +++ b/src/overlay006/ov6_02242AF0.c @@ -1,30 +1,31 @@ +#include "overlay006/ov6_02242AF0.h" + #include #include #include "struct_decls/struct_02027860_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021E1890_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021EF75C.h" +#include "overlay005/struct_ov5_021E1890_decl.h" #include "overlay006/struct_ov6_02242AF0.h" -#include "unk_02005474.h" +#include "field_system.h" #include "heap.h" +#include "player_avatar.h" #include "savedata_misc.h" +#include "unk_02005474.h" #include "unk_02027F50.h" -#include "field_system.h" #include "unk_020508D4.h" -#include "player_avatar.h" #include "unk_020655F4.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021EF75C.h" -#include "overlay006/ov6_02242AF0.h" typedef struct UnkStruct_ov6_02242B58_t UnkStruct_ov6_02242B58; -typedef BOOL (* UnkFuncPtr_ov6_02242B58)(FieldSystem *, UnkStruct_ov6_02242B58 *, const fx32 *, VecFx32 *); +typedef BOOL (*UnkFuncPtr_ov6_02242B58)(FieldSystem *, UnkStruct_ov6_02242B58 *, const fx32 *, VecFx32 *); typedef struct UnkStruct_ov6_02242B58_t { UnkFuncPtr_ov6_02242B58 unk_00; @@ -37,9 +38,9 @@ typedef struct UnkStruct_ov6_02242B58_t { int unk_10; } UnkStruct_ov6_02242B58; -static BOOL ov6_02242C5C(TaskManager * taskMan); -static BOOL ov6_02242D94(FieldSystem * fieldSystem, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3); -static BOOL ov6_02242E60(FieldSystem * fieldSystem, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3); +static BOOL ov6_02242C5C(TaskManager *taskMan); +static BOOL ov6_02242D94(FieldSystem *fieldSystem, UnkStruct_ov6_02242B58 *param1, const fx32 *param2, VecFx32 *param3); +static BOOL ov6_02242E60(FieldSystem *fieldSystem, UnkStruct_ov6_02242B58 *param1, const fx32 *param2, VecFx32 *param3); static const int Unk_ov6_02249058[7] = { 0x4, @@ -81,17 +82,17 @@ static const fx32 Unk_ov6_02249074[] = { FX32_ONE / 2 }; -void ov6_02242AF0 (FieldSystem * fieldSystem) +void ov6_02242AF0(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_ov6_02242AF0 * v1; + UnkStruct_02027860 *v0; + UnkStruct_ov6_02242AF0 *v1; VecFx32 v2; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = (UnkStruct_ov6_02242AF0 *)sub_02027F6C(v0, 6); v2.x = ((FX32_ONE * 16) * (32 * 2 + 2)); - v2.y = ((FX32_ONE * 16)); + v2.y = (FX32_ONE * 16); switch (v1->unk_00) { case 0: @@ -108,11 +109,11 @@ void ov6_02242AF0 (FieldSystem * fieldSystem) ov5_021E19CC(fieldSystem->unk_A4, fieldSystem->unk_30, 475, &v2, NULL, fieldSystem->unk_50); } -void ov6_02242B58 (FieldSystem * fieldSystem, const u16 param1, const u16 param2) +void ov6_02242B58(FieldSystem *fieldSystem, const u16 param1, const u16 param2) { - UnkStruct_02027860 * v0; - UnkStruct_ov6_02242AF0 * v1; - UnkStruct_ov6_02242B58 * v2; + UnkStruct_02027860 *v0; + UnkStruct_ov6_02242AF0 *v1; + UnkStruct_ov6_02242B58 *v2; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = (UnkStruct_ov6_02242AF0 *)sub_02027F6C(v0, 6); @@ -129,11 +130,11 @@ void ov6_02242B58 (FieldSystem * fieldSystem, const u16 param1, const u16 param2 if (param1 == 1) { v2->unk_0C = ((FX32_ONE * 16) * (32 * 2 + 18)); v1->unk_00 = 1; - v2->unk_10 = ((32 * 2 + 10)); + v2->unk_10 = (32 * 2 + 10); } else { v2->unk_0C = ((FX32_ONE * 16) * (32 * 3 + 12)); v1->unk_00 = 2; - v2->unk_10 = ((32 * 3 + 4)); + v2->unk_10 = (32 * 3 + 4); } break; case 1: @@ -141,12 +142,12 @@ void ov6_02242B58 (FieldSystem * fieldSystem, const u16 param1, const u16 param2 v2->unk_04 = 0; v2->unk_0C = ((FX32_ONE * 16) * (32 * 1 + 8)); v1->unk_00 = 0; - v2->unk_10 = ((32 * 1 + 14)); + v2->unk_10 = (32 * 1 + 14); } else { v2->unk_04 = 1; v2->unk_0C = ((FX32_ONE * 16) * (32 * 3 + 12)); v1->unk_00 = 2; - v2->unk_10 = ((32 * 3 + 4)); + v2->unk_10 = (32 * 3 + 4); } break; case 2: @@ -155,11 +156,11 @@ void ov6_02242B58 (FieldSystem * fieldSystem, const u16 param1, const u16 param2 if (param1 == 0) { v2->unk_0C = ((FX32_ONE * 16) * (32 * 1 + 8)); v1->unk_00 = 0; - v2->unk_10 = ((32 * 1 + 14)); + v2->unk_10 = (32 * 1 + 14); } else { v2->unk_0C = ((FX32_ONE * 16) * (32 * 2 + 18)); v1->unk_00 = 1; - v2->unk_10 = ((32 * 2 + 24)); + v2->unk_10 = (32 * 2 + 24); } break; default: @@ -178,10 +179,10 @@ void ov6_02242B58 (FieldSystem * fieldSystem, const u16 param1, const u16 param2 FieldTask_Start(fieldSystem->unk_10, ov6_02242C5C, v2); } -u32 ov6_02242C3C (FieldSystem * fieldSystem, const u16 param1) +u32 ov6_02242C3C(FieldSystem *fieldSystem, const u16 param1) { - UnkStruct_02027860 * v0; - UnkStruct_ov6_02242AF0 * v1; + UnkStruct_02027860 *v0; + UnkStruct_ov6_02242AF0 *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = (UnkStruct_ov6_02242AF0 *)sub_02027F6C(v0, 6); @@ -193,19 +194,19 @@ u32 ov6_02242C3C (FieldSystem * fieldSystem, const u16 param1) } } -static BOOL ov6_02242C5C (TaskManager * taskMan) +static BOOL ov6_02242C5C(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov6_02242B58 * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov6_02242B58 *v1 = TaskManager_Environment(taskMan); switch (v1->unk_05) { case 0: { - NNSG3dResMdl * v2; - NNSG3dResFileHeader ** v3; - UnkStruct_ov5_021E1890 * v4; - NNSG3dRenderObj * v5; + NNSG3dResMdl *v2; + NNSG3dResFileHeader **v3; + UnkStruct_ov5_021E1890 *v4; + NNSG3dRenderObj *v5; v4 = ov5_021E18CC(fieldSystem->unk_A4, 475); v5 = ov5_021E18BC(v4); @@ -231,7 +232,7 @@ static BOOL ov6_02242C5C (TaskManager * taskMan) case 3: { - UnkStruct_ov5_021E1890 * v6; + UnkStruct_ov5_021E1890 *v6; VecFx32 v7; v6 = ov5_021E18CC(fieldSystem->unk_A4, 475); @@ -242,8 +243,7 @@ static BOOL ov6_02242C5C (TaskManager * taskMan) } ov5_021E18A4(v6, &v7); - } - break; + } break; case 4: ov5_021D42B0(fieldSystem->unk_50, fieldSystem->unk_54, 16); (v1->unk_05)++; @@ -256,7 +256,7 @@ static BOOL ov6_02242C5C (TaskManager * taskMan) return 0; } -static BOOL ov6_02242D94 (FieldSystem * fieldSystem, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3) +static BOOL ov6_02242D94(FieldSystem *fieldSystem, UnkStruct_ov6_02242B58 *param1, const fx32 *param2, VecFx32 *param3) { if (param1->unk_04 == 0) { param3->z -= Unk_ov6_02249074[param1->unk_06]; @@ -293,9 +293,9 @@ static BOOL ov6_02242D94 (FieldSystem * fieldSystem, UnkStruct_ov6_02242B58 * pa } } -static BOOL ov6_02242E60 (FieldSystem * fieldSystem, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3) +static BOOL ov6_02242E60(FieldSystem *fieldSystem, UnkStruct_ov6_02242B58 *param1, const fx32 *param2, VecFx32 *param3) { - MapObject * v0; + MapObject *v0; VecFx32 v1; v0 = Player_MapObject(fieldSystem->playerAvatar); diff --git a/src/overlay006/ov6_02242F74.c b/src/overlay006/ov6_02242F74.c index b84c3f7378..66c2f022f9 100644 --- a/src/overlay006/ov6_02242F74.c +++ b/src/overlay006/ov6_02242F74.c @@ -1,15 +1,16 @@ +#include "overlay006/ov6_02242F74.h" + #include #include -#include "narc.h" #include "heap.h" -#include "overlay006/ov6_02242F74.h" +#include "narc.h" static u8 ov6_02242FC0(const int param0); -void ov6_02242F74 (const int param0, const BOOL param1, const int param2, int * param3, int * param4) +void ov6_02242F74(const int param0, const BOOL param1, const int param2, int *param3, int *param4) { - int * v0; + int *v0; int v1; u8 v2; u8 v3 = ov6_02242FC0(param2); @@ -30,7 +31,7 @@ void ov6_02242F74 (const int param0, const BOOL param1, const int param2, int * Heap_FreeToHeap(v0); } -static u8 ov6_02242FC0 (const int param0) +static u8 ov6_02242FC0(const int param0) { u8 v0 = 0; diff --git a/src/overlay006/ov6_02243004.c b/src/overlay006/ov6_02243004.c index 00dd5fd4f8..0294b2fede 100644 --- a/src/overlay006/ov6_02243004.c +++ b/src/overlay006/ov6_02243004.c @@ -1,17 +1,16 @@ +#include "overlay006/ov6_02243004.h" + #include #include -#include "overlay005/struct_ov5_021D1BEC_decl.h" - #include "field/field_system.h" -#include "overlay115/camera_angle.h" - +#include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay006/ov6_0223E140.h" -#include "overlay006/ov6_02243004.h" +#include "overlay115/camera_angle.h" -static UnkStruct_ov5_021D1BEC * Unk_ov6_02249940; +static UnkStruct_ov5_021D1BEC *Unk_ov6_02249940; -BOOL ov6_02243004 (FieldSystem * fieldSystem, int param1) +BOOL ov6_02243004(FieldSystem *fieldSystem, int param1) { VecFx32 v0; CameraAngle v1; diff --git a/src/overlay006/ov6_022430C4.c b/src/overlay006/ov6_022430C4.c index 6b00683345..3acc210c46 100644 --- a/src/overlay006/ov6_022430C4.c +++ b/src/overlay006/ov6_022430C4.c @@ -1,21 +1,23 @@ +#include "overlay006/ov6_022430C4.h" + #include #include -#include "field/field_system.h" #include "struct_defs/struct_020698E4.h" + +#include "field/field_system.h" #include "overlay006/struct_ov6_022430E8.h" -#include "unk_0202D7A8.h" #include "pokeradar.h" -#include "overlay006/ov6_022430C4.h" +#include "unk_0202D7A8.h" -static void ov6_022431A0(UnkStruct_020698E4 * param0, UnkStruct_ov6_022430E8 ** param1); +static void ov6_022431A0(UnkStruct_020698E4 *param0, UnkStruct_ov6_022430E8 **param1); -int ov6_022430C4 (FieldSystem * fieldSystem) +int ov6_022430C4(FieldSystem *fieldSystem) { int v0; int v1; - UnkStruct_020698E4 * v2; + UnkStruct_020698E4 *v2; v2 = sub_0202D830(sub_0202D834(fieldSystem->saveData)); v1 = 0; @@ -29,10 +31,10 @@ int ov6_022430C4 (FieldSystem * fieldSystem) return v1; } -int ov6_022430E8 (FieldSystem * fieldSystem, const u8 param1) +int ov6_022430E8(FieldSystem *fieldSystem, const u8 param1) { - UnkStruct_020698E4 * v0; - UnkStruct_ov6_022430E8 * v1[3]; + UnkStruct_020698E4 *v0; + UnkStruct_ov6_022430E8 *v1[3]; GF_ASSERT(param1 < 3); @@ -42,10 +44,10 @@ int ov6_022430E8 (FieldSystem * fieldSystem, const u8 param1) return v1[param1]->unk_00; } -int ov6_02243114 (FieldSystem * fieldSystem, const u8 param1) +int ov6_02243114(FieldSystem *fieldSystem, const u8 param1) { - UnkStruct_020698E4 * v0; - UnkStruct_ov6_022430E8 * v1[3]; + UnkStruct_020698E4 *v0; + UnkStruct_ov6_022430E8 *v1[3]; GF_ASSERT(param1 < 3); v0 = sub_0202D830(sub_0202D834(fieldSystem->saveData)); @@ -54,23 +56,24 @@ int ov6_02243114 (FieldSystem * fieldSystem, const u8 param1) return v1[param1]->unk_02; } -int ov6_02243140 (FieldSystem * fieldSystem) +int ov6_02243140(FieldSystem *fieldSystem) { return GetChainCount(fieldSystem); } -int GetRadarSpecies (FieldSystem * fieldSystem) { +int GetRadarSpecies(FieldSystem *fieldSystem) +{ int species, level; GetRadarMon(fieldSystem->chain, &species, &level); return species; } -void ov6_02243160 (UnkStruct_020698E4 * param0) +void ov6_02243160(UnkStruct_020698E4 *param0) { int v0; UnkStruct_ov6_022430E8 v1[3]; - UnkStruct_ov6_022430E8 * v2[3]; + UnkStruct_ov6_022430E8 *v2[3]; ov6_022431A0(param0, v2); @@ -83,7 +86,7 @@ void ov6_02243160 (UnkStruct_020698E4 * param0) } } -static void ov6_022431A0 (UnkStruct_020698E4 * param0, UnkStruct_ov6_022430E8 ** param1) +static void ov6_022431A0(UnkStruct_020698E4 *param0, UnkStruct_ov6_022430E8 **param1) { if (param0->unk_00[0].unk_02 < param0->unk_00[1].unk_02) { if (param0->unk_00[1].unk_02 < param0->unk_00[2].unk_02) { diff --git a/src/overlay006/ov6_02243218.c b/src/overlay006/ov6_02243218.c index 5b9db05de5..3b0844b07d 100644 --- a/src/overlay006/ov6_02243218.c +++ b/src/overlay006/ov6_02243218.c @@ -1,10 +1,11 @@ +#include "overlay006/ov6_02243218.h" + #include #include #include "overlay006/struct_ov6_02242634.h" #include "map_header_data.h" -#include "overlay006/ov6_02243218.h" static const u32 Unk_ov6_02249090[22] = { 0x156, @@ -31,12 +32,12 @@ static const u32 Unk_ov6_02249090[22] = { 0xCB }; -u32 ov6_02243218 (const u32 param0) +u32 ov6_02243218(const u32 param0) { return Unk_ov6_02249090[param0 % 22]; } -void ov6_0224322C (const u32 param0, u16 * param1, u16 * param2) +void ov6_0224322C(const u32 param0, u16 *param1, u16 *param2) { UnkStruct_ov6_02242634 v0; u32 v1; diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c index 861d7b19b8..194664bed9 100644 --- a/src/overlay006/ov6_02243258.c +++ b/src/overlay006/ov6_02243258.c @@ -1,3 +1,5 @@ +#include "overlay006/ov6_02243258.h" + #include #include @@ -9,37 +11,35 @@ #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "struct_decls/struct_020711EC_decl.h" -#include "pokemon.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" + #include "field/field_system.h" +#include "overlay005/ov5_021F0EB0.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay083/struct_ov83_0223D9A8.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "unk_02005474.h" +#include "gx_layers.h" +#include "heap.h" +#include "map_object.h" #include "narc.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_020131EC.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D15C.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_0205D8CC.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_020711EC.h" -#include "pokemon.h" -#include "overlay005/ov5_021F0EB0.h" -#include "overlay006/ov6_02243258.h" typedef struct { int unk_00; @@ -66,33 +66,33 @@ typedef struct { fx32 unk_50; fx32 unk_54; fx32 unk_58; - Pokemon * unk_5C; - FieldSystem * fieldSystem; - NNSG2dScreenData * unk_64; - NNSG2dCharacterData * unk_68; - NNSG2dPaletteData * unk_6C; - GraphicElementManager * unk_70; + Pokemon *unk_5C; + FieldSystem *fieldSystem; + NNSG2dScreenData *unk_64; + NNSG2dCharacterData *unk_68; + NNSG2dPaletteData *unk_6C; + GraphicElementManager *unk_70; UnkStruct_0200C738 unk_74; - UnkStruct_02009714 * unk_200; - UnkStruct_02009714 * unk_204; - UnkStruct_02009714 * unk_208; - UnkStruct_02009714 * unk_20C; - UnkStruct_02009DC8 * unk_210[4]; - UnkStruct_02009DC8 * unk_220[3]; - UnkStruct_02009DC8 * unk_22C[4]; - UnkStruct_02009DC8 * unk_23C[2]; - UnkStruct_020711EC * unk_244; - GraphicElementData * unk_248; - GraphicElementData * unk_24C; - UnkStruct_ov101_021D5D90 * unk_250; - UnkStruct_ov101_021D5D90 * unk_254; + UnkStruct_02009714 *unk_200; + UnkStruct_02009714 *unk_204; + UnkStruct_02009714 *unk_208; + UnkStruct_02009714 *unk_20C; + UnkStruct_02009DC8 *unk_210[4]; + UnkStruct_02009DC8 *unk_220[3]; + UnkStruct_02009DC8 *unk_22C[4]; + UnkStruct_02009DC8 *unk_23C[2]; + UnkStruct_020711EC *unk_244; + GraphicElementData *unk_248; + GraphicElementData *unk_24C; + UnkStruct_ov101_021D5D90 *unk_250; + UnkStruct_ov101_021D5D90 *unk_254; ArchivedSprite unk_258; int unk_268; int unk_26C; - void * unk_270; - void * unk_274; - SysTask * unk_278; - SysTask * unk_27C; + void *unk_270; + void *unk_274; + SysTask *unk_278; + SysTask *unk_27C; } UnkStruct_ov6_02243FFC; typedef struct { @@ -101,7 +101,7 @@ typedef struct { } UnkStruct_ov6_02249108; typedef struct { - UnkStruct_ov6_02243FFC * unk_00; + UnkStruct_ov6_02243FFC *unk_00; } UnkStruct_ov6_0224543C; typedef struct { @@ -122,15 +122,15 @@ typedef struct { fx32 unk_4C; fx32 unk_50; fx32 unk_54; - GraphicElementData * unk_58; + GraphicElementData *unk_58; UnkStruct_ov6_0224543C unk_5C; - UnkStruct_ov101_021D5D90 * unk_60; - SysTask * unk_64; + UnkStruct_ov101_021D5D90 *unk_60; + SysTask *unk_64; } UnkStruct_ov6_02249198; typedef struct { - UnkStruct_ov6_02243FFC * unk_00; - GraphicElementData * unk_04; + UnkStruct_ov6_02243FFC *unk_00; + GraphicElementData *unk_04; } UnkStruct_ov6_02245B4C; typedef struct { @@ -139,14 +139,14 @@ typedef struct { int unk_08; int unk_0C; VecFx32 unk_10; - UnkStruct_ov6_02243FFC * unk_1C; - GraphicElementData * unk_20; + UnkStruct_ov6_02243FFC *unk_1C; + GraphicElementData *unk_20; } UnkStruct_ov6_02245B74; typedef struct { s16 unk_00; s16 unk_02; - UnkStruct_02009DC8 * unk_04; + UnkStruct_02009DC8 *unk_04; } UnkStruct_ov6_02243258_sub1; typedef struct { @@ -158,16 +158,16 @@ typedef struct { s8 unk_05; s8 unk_06; s8 unk_07; - GraphicElementManager * unk_08; + GraphicElementManager *unk_08; UnkStruct_0200C738 unk_0C; - UnkStruct_02009714 * unk_198; - UnkStruct_02009714 * unk_19C; - UnkStruct_02009714 * unk_1A0; - UnkStruct_02009714 * unk_1A4; - UnkStruct_ov6_02243258_sub1 * unk_1A8; - UnkStruct_ov6_02243258_sub1 * unk_1AC; - UnkStruct_ov6_02243258_sub1 * unk_1B0; - UnkStruct_ov6_02243258_sub1 * unk_1B4; + UnkStruct_02009714 *unk_198; + UnkStruct_02009714 *unk_19C; + UnkStruct_02009714 *unk_1A0; + UnkStruct_02009714 *unk_1A4; + UnkStruct_ov6_02243258_sub1 *unk_1A8; + UnkStruct_ov6_02243258_sub1 *unk_1AC; + UnkStruct_ov6_02243258_sub1 *unk_1B0; + UnkStruct_ov6_02243258_sub1 *unk_1B4; } UnkStruct_ov6_02243258; typedef struct { @@ -176,19 +176,19 @@ typedef struct { int unk_08; int unk_0C; int unk_10; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; UnkStruct_ov6_02243258 unk_18; - GraphicElementData * unk_1D0; - UnkStruct_020711EC * unk_1D4; - UnkStruct_ov101_021D5D90 * unk_1D8; - SysTask * unk_1DC; + GraphicElementData *unk_1D0; + UnkStruct_020711EC *unk_1D4; + UnkStruct_ov101_021D5D90 *unk_1D8; + SysTask *unk_1DC; } UnkStruct_ov6_02249270; typedef struct { - UnkStruct_020711EC * unk_00; - FieldSystem * fieldSystem; - GraphicElementData * unk_08; - UnkStruct_ov6_02243258 * unk_0C; + UnkStruct_020711EC *unk_00; + FieldSystem *fieldSystem; + GraphicElementData *unk_08; + UnkStruct_ov6_02243258 *unk_0C; } UnkStruct_ov6_02243888; typedef struct { @@ -210,22 +210,22 @@ typedef struct { fx32 unk_50; fx32 unk_54; UnkStruct_ov6_02243888 unk_58; - GraphicElementData * unk_68; - UnkStruct_ov101_021D5D90 * unk_6C; - SysTask * unk_70; + GraphicElementData *unk_68; + UnkStruct_ov101_021D5D90 *unk_6C; + SysTask *unk_70; } UnkStruct_ov6_02249110; typedef struct { int unk_00; int unk_04; - UnkStruct_ov6_02243FFC * unk_08; + UnkStruct_ov6_02243FFC *unk_08; VecFx32 unk_0C; } UnkStruct_ov6_02245328; typedef struct { int unk_00; int unk_04; - GraphicElementData * unk_08; + GraphicElementData *unk_08; UnkStruct_ov6_02245328 unk_0C; } UnkStruct_ov6_02245364; @@ -245,95 +245,95 @@ typedef struct { VecFx32 unk_18; fx32 unk_24; fx32 unk_28; - MapObject * unk_2C; - UnkStruct_ov6_02243FFC * unk_30; + MapObject *unk_2C; + UnkStruct_ov6_02243FFC *unk_30; } UnkStruct_ov100_021D4890; typedef struct { - GraphicElementData * unk_00; - UnkStruct_ov6_02243FFC * unk_04; + GraphicElementData *unk_00; + UnkStruct_ov6_02243FFC *unk_04; } UnkStruct_ov6_02245F80; -static UnkStruct_ov6_02243FFC * ov6_02243FDC(FieldSystem * fieldSystem); -static void ov6_02243FFC(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244004(SysTask * param0, void * param1); -static void ov6_022443B8(SysTask * param0, void * param1); -static void ov6_0224464C(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244674(UnkStruct_ov6_02243FFC * param0); -static void ov6_0224469C(UnkStruct_ov6_02243FFC * param0); -static void ov6_022446B8(SysTask * param0, void * param1); -static void ov6_02244734(SysTask * param0, void * param1); -static void ov6_022447B4(SysTask * param0, void * param1); -static void ov6_022447EC(SysTask * param0, void * param1); -static void ov6_0224481C(UnkStruct_ov6_02243FFC * param0); -static void ov6_022448C8(UnkStruct_ov6_02243FFC * param0); -static NARC * ov6_0224491C(void); -static void ov6_02244928(UnkStruct_ov6_02243FFC * param0, NARC * param1); -static void ov6_02244B6C(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244C10(UnkStruct_ov6_02243FFC * param0); -static GraphicElementData * ov6_02244C20(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7); -static GraphicElementData * ov6_02244CD4(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3); -static GraphicElementData * ov6_02244CFC(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1); -static void ov6_02244D34(GraphicElementData * param0); -static GraphicElementData * ov6_02244D4C(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3); -static void ov6_02244DB4(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244E54(NARC * param0, u32 param1, NNSG2dPaletteData ** param2); -static void ov6_02244E7C(BGL * param0, NARC * param1, u32 param2, NNSG2dCharacterData ** param3); -static void ov6_02244EB4(BGL * param0, NARC * param1, u32 param2, NNSG2dScreenData ** param3); -static void ov6_02244F20(BGL * param0); -static void ov6_02244F2C(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244F50(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244F58(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244F60(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244F74(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244F80(UnkStruct_ov6_02243FFC * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4); -static void ov6_02244F8C(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244FB4(UnkStruct_ov6_02243FFC * param0); -static void ov6_02244FE4(SysTask * param0, void * param1); -static void ov6_0224508C(UnkStruct_ov6_02243FFC * param0, ArchivedSprite * param1); -static void * ov6_0224509C(Pokemon * param0, ArchivedSprite * param1, u32 param2); -static void * ov6_022450E4(ArchivedSprite * param0, u32 param1); -static UnkStruct_02009DC8 * ov6_022450F4(UnkStruct_ov6_02243FFC * param0, NARC * param1); -static void ov6_02245118(UnkStruct_ov6_02243FFC * param0, void * param1); -static UnkStruct_02009DC8 * ov6_0224514C(UnkStruct_ov6_02243FFC * param0, NARC * param1); -static void ov6_02245170(UnkStruct_ov6_02243FFC * param0, void * param1); -static void ov6_022451B8(UnkStruct_ov6_02243FFC * param0); -static GraphicElementData * ov6_0224529C(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1); -static void ov6_022452BC(UnkStruct_ov6_02243FFC * param0, int param1); -static void ov6_02245328(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, const VecFx32 * param2, int param3, int param4, int param5); -static void ov6_0224543C(UnkStruct_ov6_02243FFC * param0); -static void ov6_0224543C(UnkStruct_ov6_02243FFC * param0); -static int ov6_02245470(UnkStruct_ov6_02243FFC * param0); -static void ov6_02245480(UnkStruct_ov6_02243FFC * param0); -static void ov6_0224551C(UnkStruct_ov6_02243FFC * param0); -static void ov6_022456D4(UnkStruct_ov6_02243FFC * param0); -static UnkStruct_ov101_021D5D90 * ov6_02245B4C(UnkStruct_020711EC * param0, GraphicElementData * param1); -static void ov6_02245B74(UnkStruct_ov101_021D5D90 * param0); -static void ov6_02245B80(UnkStruct_ov101_021D5D90 * param0); -static void ov6_02245BC8(UnkStruct_ov101_021D5D90 * param0); -static void ov6_02245F64(UnkStruct_ov6_02243FFC * param0, int param1); -static void ov6_02245FDC(UnkStruct_ov6_02243FFC * param0); -static void ov6_02246018(UnkStruct_ov6_02243FFC * param0); +static UnkStruct_ov6_02243FFC *ov6_02243FDC(FieldSystem *fieldSystem); +static void ov6_02243FFC(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244004(SysTask *param0, void *param1); +static void ov6_022443B8(SysTask *param0, void *param1); +static void ov6_0224464C(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244674(UnkStruct_ov6_02243FFC *param0); +static void ov6_0224469C(UnkStruct_ov6_02243FFC *param0); +static void ov6_022446B8(SysTask *param0, void *param1); +static void ov6_02244734(SysTask *param0, void *param1); +static void ov6_022447B4(SysTask *param0, void *param1); +static void ov6_022447EC(SysTask *param0, void *param1); +static void ov6_0224481C(UnkStruct_ov6_02243FFC *param0); +static void ov6_022448C8(UnkStruct_ov6_02243FFC *param0); +static NARC *ov6_0224491C(void); +static void ov6_02244928(UnkStruct_ov6_02243FFC *param0, NARC *param1); +static void ov6_02244B6C(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244C10(UnkStruct_ov6_02243FFC *param0); +static GraphicElementData *ov6_02244C20(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7); +static GraphicElementData *ov6_02244CD4(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, int param2, int param3); +static GraphicElementData *ov6_02244CFC(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1); +static void ov6_02244D34(GraphicElementData *param0); +static GraphicElementData *ov6_02244D4C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, int param2, int param3); +static void ov6_02244DB4(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244E54(NARC *param0, u32 param1, NNSG2dPaletteData **param2); +static void ov6_02244E7C(BGL *param0, NARC *param1, u32 param2, NNSG2dCharacterData **param3); +static void ov6_02244EB4(BGL *param0, NARC *param1, u32 param2, NNSG2dScreenData **param3); +static void ov6_02244F20(BGL *param0); +static void ov6_02244F2C(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244F50(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244F58(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244F60(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244F74(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244F80(UnkStruct_ov6_02243FFC *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4); +static void ov6_02244F8C(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244FB4(UnkStruct_ov6_02243FFC *param0); +static void ov6_02244FE4(SysTask *param0, void *param1); +static void ov6_0224508C(UnkStruct_ov6_02243FFC *param0, ArchivedSprite *param1); +static void *ov6_0224509C(Pokemon *param0, ArchivedSprite *param1, u32 param2); +static void *ov6_022450E4(ArchivedSprite *param0, u32 param1); +static UnkStruct_02009DC8 *ov6_022450F4(UnkStruct_ov6_02243FFC *param0, NARC *param1); +static void ov6_02245118(UnkStruct_ov6_02243FFC *param0, void *param1); +static UnkStruct_02009DC8 *ov6_0224514C(UnkStruct_ov6_02243FFC *param0, NARC *param1); +static void ov6_02245170(UnkStruct_ov6_02243FFC *param0, void *param1); +static void ov6_022451B8(UnkStruct_ov6_02243FFC *param0); +static GraphicElementData *ov6_0224529C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1); +static void ov6_022452BC(UnkStruct_ov6_02243FFC *param0, int param1); +static void ov6_02245328(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, const VecFx32 *param2, int param3, int param4, int param5); +static void ov6_0224543C(UnkStruct_ov6_02243FFC *param0); +static void ov6_0224543C(UnkStruct_ov6_02243FFC *param0); +static int ov6_02245470(UnkStruct_ov6_02243FFC *param0); +static void ov6_02245480(UnkStruct_ov6_02243FFC *param0); +static void ov6_0224551C(UnkStruct_ov6_02243FFC *param0); +static void ov6_022456D4(UnkStruct_ov6_02243FFC *param0); +static UnkStruct_ov101_021D5D90 *ov6_02245B4C(UnkStruct_020711EC *param0, GraphicElementData *param1); +static void ov6_02245B74(UnkStruct_ov101_021D5D90 *param0); +static void ov6_02245B80(UnkStruct_ov101_021D5D90 *param0); +static void ov6_02245BC8(UnkStruct_ov101_021D5D90 *param0); +static void ov6_02245F64(UnkStruct_ov6_02243FFC *param0, int param1); +static void ov6_02245FDC(UnkStruct_ov6_02243FFC *param0); +static void ov6_02246018(UnkStruct_ov6_02243FFC *param0); static void ov6_02243F2C(void); static void ov6_02243F50(void); -static void * ov6_02245F44(u32 param0, int param1); -static void ov6_02243F74(FieldSystem * fieldSystem, int param1); -static void ov6_02245D10(SysTask * param0, void * param1); +static void *ov6_02245F44(u32 param0, int param1); +static void ov6_02243F74(FieldSystem *fieldSystem, int param1); +static void ov6_02245D10(SysTask *param0, void *param1); -int(*const Unk_ov6_022492D8[])(UnkStruct_ov6_02243FFC *); -int(*const Unk_ov6_02249310[])(UnkStruct_ov6_02243FFC *); +int (*const Unk_ov6_022492D8[])(UnkStruct_ov6_02243FFC *); +int (*const Unk_ov6_02249310[])(UnkStruct_ov6_02243FFC *); static const UnkStruct_ov101_021D86B0 Unk_ov6_02249248; -int(*const * const Unk_ov6_02249198[])(UnkStruct_ov6_02249198 *); -int(*const Unk_ov6_022490E8[])(UnkStruct_ov6_02249198 *); -int(*const Unk_ov6_022490F0[])(UnkStruct_ov6_02249198 *); -int(*const Unk_ov6_022491EC[])(UnkStruct_ov6_02249198 *); +int (*const *const Unk_ov6_02249198[])(UnkStruct_ov6_02249198 *); +int (*const Unk_ov6_022490E8[])(UnkStruct_ov6_02249198 *); +int (*const Unk_ov6_022490F0[])(UnkStruct_ov6_02249198 *); +int (*const Unk_ov6_022491EC[])(UnkStruct_ov6_02249198 *); static const UnkStruct_ov101_021D86B0 Unk_ov6_0224920C; static const UnkStruct_ov6_02249108 Unk_ov6_02249108[1]; static const UnkStruct_ov6_02249108 Unk_ov6_022490F8[1]; static const UnkStruct_ov6_02249108 Unk_ov6_02249118[1]; static const UnkStruct_ov6_02249108 Unk_ov6_02249100[1]; -static void ov6_02243258 (UnkStruct_ov6_02243258 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) +static void ov6_02243258(UnkStruct_ov6_02243258 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) { int v0; @@ -375,7 +375,7 @@ static void ov6_02243258 (UnkStruct_ov6_02243258 * param0, int param1, int param } } -static void ov6_0224339C (UnkStruct_ov6_02243258 * param0) +static void ov6_0224339C(UnkStruct_ov6_02243258 *param0) { int v0; @@ -415,7 +415,7 @@ static void ov6_0224339C (UnkStruct_ov6_02243258 * param0) sub_02021964(param0->unk_08); } -static void ov6_022434B0 (UnkStruct_ov6_02243258 * param0, NARC * param1, int param2, int param3) +static void ov6_022434B0(UnkStruct_ov6_02243258 *param0, NARC *param1, int param2, int param3) { int v0; @@ -431,7 +431,7 @@ static void ov6_022434B0 (UnkStruct_ov6_02243258 * param0, NARC * param1, int pa GF_ASSERT(FALSE); } -static void ov6_02243520 (UnkStruct_ov6_02243258 * param0, int param1) +static void ov6_02243520(UnkStruct_ov6_02243258 *param0, int param1) { int v0; @@ -445,7 +445,7 @@ static void ov6_02243520 (UnkStruct_ov6_02243258 * param0, int param1) GF_ASSERT(FALSE); } -static void ov6_02243554 (UnkStruct_ov6_02243258 * param0, int param1) +static void ov6_02243554(UnkStruct_ov6_02243258 *param0, int param1) { int v0; @@ -459,7 +459,7 @@ static void ov6_02243554 (UnkStruct_ov6_02243258 * param0, int param1) GF_ASSERT(FALSE); } -static void ov6_02243588 (UnkStruct_ov6_02243258 * param0, NARC * param1, int param2, int param3) +static void ov6_02243588(UnkStruct_ov6_02243258 *param0, NARC *param1, int param2, int param3) { int v0; @@ -476,7 +476,7 @@ static void ov6_02243588 (UnkStruct_ov6_02243258 * param0, NARC * param1, int pa GF_ASSERT(FALSE); } -static void ov6_022435F8 (UnkStruct_ov6_02243258 * param0, int param1) +static void ov6_022435F8(UnkStruct_ov6_02243258 *param0, int param1) { int v0; @@ -490,7 +490,7 @@ static void ov6_022435F8 (UnkStruct_ov6_02243258 * param0, int param1) GF_ASSERT(FALSE); } -static void ov6_0224362C (UnkStruct_ov6_02243258 * param0, int param1) +static void ov6_0224362C(UnkStruct_ov6_02243258 *param0, int param1) { int v0; @@ -504,7 +504,7 @@ static void ov6_0224362C (UnkStruct_ov6_02243258 * param0, int param1) GF_ASSERT(FALSE); } -static void ov6_02243660 (UnkStruct_ov6_02243258 * param0, NARC * param1, int param2, int param3) +static void ov6_02243660(UnkStruct_ov6_02243258 *param0, NARC *param1, int param2, int param3) { int v0; @@ -521,7 +521,7 @@ static void ov6_02243660 (UnkStruct_ov6_02243258 * param0, NARC * param1, int pa GF_ASSERT(FALSE); } -static void ov6_022436D0 (UnkStruct_ov6_02243258 * param0, NARC * param1, int param2, int param3) +static void ov6_022436D0(UnkStruct_ov6_02243258 *param0, NARC *param1, int param2, int param3) { int v0; @@ -538,11 +538,11 @@ static void ov6_022436D0 (UnkStruct_ov6_02243258 * param0, NARC * param1, int pa GF_ASSERT(FALSE); } -static GraphicElementData * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7) +static GraphicElementData *ov6_02243740(UnkStruct_ov6_02243258 *param0, const VecFx32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - GraphicElementData * v2; + GraphicElementData *v2; if (param5 == param0->unk_07) { param5 = 0xffffffff; @@ -563,18 +563,18 @@ static GraphicElementData * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const return v2; } -static void ov6_022437C8 (GraphicElementData * param0, VecFx32 * param1) +static void ov6_022437C8(GraphicElementData *param0, VecFx32 *param1) { - const VecFx32 * v0 = sub_02021D28(param0); + const VecFx32 *v0 = sub_02021D28(param0); *param1 = *v0; } -static GraphicElementData * ov6_022437DC (UnkStruct_ov6_02243258 * param0) +static GraphicElementData *ov6_022437DC(UnkStruct_ov6_02243258 *param0) { - GraphicElementData * v0; - VecFx32 v1 = {0, 0, 0}; - VecFx32 v2 = {0, 0, 0}; - VecFx32 v3 = {0x1000, 0x1000, 0}; + GraphicElementData *v0; + VecFx32 v1 = { 0, 0, 0 }; + VecFx32 v2 = { 0, 0, 0 }; + VecFx32 v3 = { 0x1000, 0x1000, 0 }; v0 = ov6_02243740(param0, &v1, 0, 0, 0, 2, 0, 132); @@ -586,10 +586,10 @@ static GraphicElementData * ov6_022437DC (UnkStruct_ov6_02243258 * param0) return v0; } -static GraphicElementData * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int param1) +static GraphicElementData *ov6_02243848(UnkStruct_ov6_02243258 *param0, int param1) { - VecFx32 v0 = {0, 0, 0}; - GraphicElementData * v1; + VecFx32 v0 = { 0, 0, 0 }; + GraphicElementData *v1; u32 v2 = 0; if (param1 == 1) { @@ -605,12 +605,12 @@ static GraphicElementData * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int p } static const UnkStruct_ov101_021D86B0 Unk_ov6_0224925C; -int(*const * const Unk_ov6_02249110[])(UnkStruct_ov6_02249110 *); +int (*const *const Unk_ov6_02249110[])(UnkStruct_ov6_02249110 *); -static UnkStruct_ov101_021D5D90 * ov6_02243888 (FieldSystem * fieldSystem, UnkStruct_020711EC * param1, UnkStruct_ov6_02243258 * param2, GraphicElementData * param3) +static UnkStruct_ov101_021D5D90 *ov6_02243888(FieldSystem *fieldSystem, UnkStruct_020711EC *param1, UnkStruct_ov6_02243258 *param2, GraphicElementData *param3) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {0, 0, 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { 0, 0, 0 }; UnkStruct_ov6_02243888 v2; v2.fieldSystem = fieldSystem; @@ -623,16 +623,16 @@ static UnkStruct_ov101_021D5D90 * ov6_02243888 (FieldSystem * fieldSystem, UnkSt return v0; } -static int ov6_022438BC (UnkStruct_ov101_021D5D90 * param0) +static int ov6_022438BC(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov6_02249110 * v0 = sub_02071598(param0); + UnkStruct_ov6_02249110 *v0 = sub_02071598(param0); return v0->unk_02; } -static int ov6_022438C8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov6_022438C8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov6_02249110 * v0 = param1; - const UnkStruct_ov6_02243888 * v1 = sub_020715BC(param0); + UnkStruct_ov6_02249110 *v0 = param1; + const UnkStruct_ov6_02243888 *v1 = sub_020715BC(param0); v0->unk_58 = *v1; v0->unk_68 = ov6_022437DC(v0->unk_58.unk_0C); @@ -640,9 +640,9 @@ static int ov6_022438C8 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov6_022438EC (UnkStruct_ov101_021D5D90 * param0) +static void ov6_022438EC(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov6_02249110 * v0 = sub_02071598(param0); + UnkStruct_ov6_02249110 *v0 = sub_02071598(param0); if (v0->unk_6C) { sub_0207136C(v0->unk_6C); @@ -655,16 +655,16 @@ static void ov6_022438EC (UnkStruct_ov101_021D5D90 * param0) sub_0207136C(param0); } -static void ov6_02243914 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov6_02243914(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov6_02249110 * v0 = param1; + UnkStruct_ov6_02249110 *v0 = param1; sub_02021BD4(v0->unk_68); } -static void ov6_02243920 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov6_02243920(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov6_02249110 * v0 = param1; - int(*const * v1)(UnkStruct_ov6_02249110 *); + UnkStruct_ov6_02249110 *v0 = param1; + int (*const *v1)(UnkStruct_ov6_02249110 *); v1 = Unk_ov6_02249110[v0->unk_00]; @@ -681,29 +681,31 @@ static const UnkStruct_ov101_021D86B0 Unk_ov6_0224925C = { sub_020715FC }; -static int ov6_02243940 (UnkStruct_ov6_02249110 * param0) +static int ov6_02243940(UnkStruct_ov6_02249110 *param0) { param0->unk_02 = 0; sub_02021CAC(param0->unk_68, 0); return 0; } -static int(*const Unk_ov6_022490EC[])(UnkStruct_ov6_02249110 *) = { +static int (*const Unk_ov6_022490EC[])(UnkStruct_ov6_02249110 *) = { ov6_02243940, }; -static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0) +static void ov6_02243950(UnkStruct_ov101_021D5D90 *param0) { - VecFx32 v0 = {(FX32_ONE * 128), (FX32_ONE * 111), 0}; - VecFx32 v1 = {0x2000, 0x2000, 0}; - UnkStruct_ov6_02249110 * v2 = sub_02071598(param0); + VecFx32 v0 = { (FX32_ONE * 128), (FX32_ONE * 111), 0 }; + VecFx32 v1 = { 0x2000, 0x2000, 0 }; + UnkStruct_ov6_02249110 *v2 = sub_02071598(param0); v2->unk_00 = 1; v2->unk_02 = 0; v2->unk_01 = 0; v2->unk_04 = 0; v2->unk_08 = v0; - v2->unk_14.x = 0; v2->unk_14.y = 0; v2->unk_14.z = 0; + v2->unk_14.x = 0; + v2->unk_14.y = 0; + v2->unk_14.z = 0; v2->unk_38 = (FX32_ONE * 350); v2->unk_2C = v1; v2->unk_50 = 0x400; @@ -711,26 +713,26 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0) v2->unk_48 = (FX32_ONE * (128 + 64)); v2->unk_4C = (FX32_ONE * 32); v2->unk_14.x = sub_0201D264(45) * ((v2->unk_48) / FX32_ONE); - v2->unk_14.y = sub_0201D250(((v2->unk_40) / FX32_ONE)) * ((v2->unk_48) / FX32_ONE); + v2->unk_14.y = sub_0201D250((v2->unk_40) / FX32_ONE) * ((v2->unk_48) / FX32_ONE); v0.x = v2->unk_08.x + v2->unk_14.x; v0.y = v2->unk_08.y + v2->unk_14.y; sub_02021C50(v2->unk_68, &v0); sub_02021C70(v2->unk_68, &v1); - sub_02021C94(v2->unk_68, sub_0201D2A4(((v2->unk_38) / FX32_ONE))); + sub_02021C94(v2->unk_68, sub_0201D2A4((v2->unk_38) / FX32_ONE)); sub_02021F58(v2->unk_68, 132); sub_02021CAC(v2->unk_68, 1); v2->unk_6C = ov6_02245B4C(v2->unk_58.unk_00, v2->unk_58.unk_08); v2->unk_70 = ov5_021F0EB0(v2->unk_58.fieldSystem, 4); - ov5_021F0F10(v2->unk_70, 1, -((FX32_ONE * 120)), 12); + ov5_021F0F10(v2->unk_70, 1, -(FX32_ONE * 120), 12); { - GraphicElementData * v3; - VecFx32 v4 = {0, 0, 0}; - VecFx32 v5 = {0x2000, 0x2000, 0}; + GraphicElementData *v3; + VecFx32 v4 = { 0, 0, 0 }; + VecFx32 v5 = { 0x2000, 0x2000, 0 }; v3 = v2->unk_58.unk_08; @@ -744,11 +746,11 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0) ov6_02243F2C(); } -static int ov6_02243AB8 (UnkStruct_ov6_02249110 * param0) +static int ov6_02243AB8(UnkStruct_ov6_02249110 *param0) { VecFx32 v0; - GraphicElementData * v1 = param0->unk_68; - GraphicElementData * v2 = param0->unk_58.unk_08; + GraphicElementData *v1 = param0->unk_68; + GraphicElementData *v2 = param0->unk_58.unk_08; param0->unk_48 -= param0->unk_4C; @@ -765,7 +767,7 @@ static int ov6_02243AB8 (UnkStruct_ov6_02249110 * param0) } param0->unk_14.x = sub_0201D264(45) * ((param0->unk_48) / FX32_ONE); - param0->unk_14.y = sub_0201D250(((param0->unk_40) / FX32_ONE)) * ((param0->unk_48) / FX32_ONE); + param0->unk_14.y = sub_0201D250((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE); if (((param0->unk_40) / FX32_ONE) < 90) { param0->unk_40 += 0x4000; @@ -803,7 +805,7 @@ static int ov6_02243AB8 (UnkStruct_ov6_02249110 * param0) return 0; } -static int ov6_02243BB8 (UnkStruct_ov6_02249110 * param0) +static int ov6_02243BB8(UnkStruct_ov6_02249110 *param0) { ov6_02245BC8(param0->unk_6C); ov5_021F0F10(param0->unk_70, 2, 0, 12); @@ -817,10 +819,10 @@ static int ov6_02243BB8 (UnkStruct_ov6_02249110 * param0) return 1; } -static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0) +static int ov6_02243BEC(UnkStruct_ov6_02249110 *param0) { VecFx32 v0; - GraphicElementData * v1 = param0->unk_68; + GraphicElementData *v1 = param0->unk_68; param0->unk_48 += param0->unk_4C; param0->unk_4C += 0x1000; @@ -829,7 +831,7 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0) param0->unk_4C = (FX32_ONE * 16); } - param0->unk_14.x = sub_0201D264(((param0->unk_40) / FX32_ONE)) * ((param0->unk_48) / FX32_ONE); + param0->unk_14.x = sub_0201D264((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE); param0->unk_14.y = sub_0201D250(128) * ((param0->unk_48) / FX32_ONE); if (param0->unk_40 < (FX32_ONE * 160)) { @@ -837,7 +839,7 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0) } param0->unk_38 += 0x2000; - sub_02021C94(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE))); + sub_02021C94(v1, sub_0201D2A4((param0->unk_38) / FX32_ONE)); param0->unk_2C.x += param0->unk_50; if (param0->unk_2C.x > 0x1000) { @@ -864,7 +866,7 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0) return 0; } -static int ov6_02243CD8 (UnkStruct_ov6_02249110 * param0) +static int ov6_02243CD8(UnkStruct_ov6_02249110 *param0) { sub_02021CAC(param0->unk_68, 0); SpriteActor_SetSpriteAnimActive(param0->unk_58.unk_08, 1); @@ -875,7 +877,7 @@ static int ov6_02243CD8 (UnkStruct_ov6_02249110 * param0) return 1; } -static int ov6_02243CFC (UnkStruct_ov6_02249110 * param0) +static int ov6_02243CFC(UnkStruct_ov6_02249110 *param0) { param0->unk_04++; @@ -884,12 +886,14 @@ static int ov6_02243CFC (UnkStruct_ov6_02249110 * param0) } { - VecFx32 v0 = {(FX32_ONE * (128 + 8)), (FX32_ONE * (111 - 32)), 0}; - VecFx32 v1 = {0x1000, 0x1000, 0}; + VecFx32 v0 = { (FX32_ONE * (128 + 8)), (FX32_ONE * (111 - 32)), 0 }; + VecFx32 v1 = { 0x1000, 0x1000, 0 }; param0->unk_04 = 0; param0->unk_08 = v0; - param0->unk_14.x = 0; param0->unk_14.y = 0; param0->unk_14.z = 0; + param0->unk_14.x = 0; + param0->unk_14.y = 0; + param0->unk_14.z = 0; param0->unk_38 = (FX32_ONE * 0); param0->unk_2C = v1; param0->unk_50 = 0x200; @@ -899,7 +903,7 @@ static int ov6_02243CFC (UnkStruct_ov6_02249110 * param0) sub_02021C50(param0->unk_68, &v0); sub_02021C70(param0->unk_68, &v1); - sub_02021C94(param0->unk_68, sub_0201D2A4(((param0->unk_38) / FX32_ONE))); + sub_02021C94(param0->unk_68, sub_0201D2A4((param0->unk_38) / FX32_ONE)); sub_02021CAC(param0->unk_68, 1); SpriteActor_SetSpriteAnimActive(param0->unk_58.unk_08, 6); sub_02021CC8(param0->unk_58.unk_08, 1); @@ -909,10 +913,10 @@ static int ov6_02243CFC (UnkStruct_ov6_02249110 * param0) return 1; } -static int ov6_02243DC0 (UnkStruct_ov6_02249110 * param0) +static int ov6_02243DC0(UnkStruct_ov6_02249110 *param0) { VecFx32 v0; - GraphicElementData * v1 = param0->unk_68; + GraphicElementData *v1 = param0->unk_68; param0->unk_48 -= param0->unk_4C; @@ -925,7 +929,7 @@ static int ov6_02243DC0 (UnkStruct_ov6_02249110 * param0) } param0->unk_14.x = sub_0201D264(315) * ((param0->unk_48) / FX32_ONE); - param0->unk_14.y = sub_0201D250(((param0->unk_40) / FX32_ONE)) * ((param0->unk_48) / FX32_ONE); + param0->unk_14.y = sub_0201D250((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE); if (((param0->unk_40) / FX32_ONE) < 180) { param0->unk_40 -= 0x4000; @@ -950,7 +954,7 @@ static int ov6_02243DC0 (UnkStruct_ov6_02249110 * param0) param0->unk_38 = (FX32_ONE * 60); } - sub_02021C94(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE))); + sub_02021C94(v1, sub_0201D2A4((param0->unk_38) / FX32_ONE)); v0.x = param0->unk_08.x + param0->unk_14.x; v0.y = param0->unk_08.y + param0->unk_14.y; @@ -965,7 +969,7 @@ static int ov6_02243DC0 (UnkStruct_ov6_02249110 * param0) return 0; } -static int ov6_02243ECC (UnkStruct_ov6_02249110 * param0) +static int ov6_02243ECC(UnkStruct_ov6_02249110 *param0) { param0->unk_04++; @@ -987,12 +991,12 @@ static int ov6_02243ECC (UnkStruct_ov6_02249110 * param0) return 0; } -static int ov6_02243F1C (UnkStruct_ov6_02249110 * param0) +static int ov6_02243F1C(UnkStruct_ov6_02249110 *param0) { return 0; } -static int(*const Unk_ov6_02249288[])(UnkStruct_ov6_02249110 *) = { +static int (*const Unk_ov6_02249288[])(UnkStruct_ov6_02249110 *) = { ov6_02243AB8, ov6_02243BB8, ov6_02243BEC, @@ -1003,36 +1007,36 @@ static int(*const Unk_ov6_02249288[])(UnkStruct_ov6_02249110 *) = { ov6_02243F1C }; -static int(*const * const Unk_ov6_02249110[])(UnkStruct_ov6_02249110 *) = { +static int (*const *const Unk_ov6_02249110[])(UnkStruct_ov6_02249110 *) = { Unk_ov6_022490EC, Unk_ov6_02249288 }; -static NARC * ov6_02243F20 (void) +static NARC *ov6_02243F20(void) { return NARC_ctor(NARC_INDEX_DATA__FIELD_CUTIN, 4); } -static void ov6_02243F2C (void) +static void ov6_02243F2C(void) { sub_0200F174(0, 1, 1, 0x7fff, 6, 1, 4); } -static void ov6_02243F50 (void) +static void ov6_02243F50(void) { sub_0200F174(0, 0, 0, 0x7fff, 6, 1, 4); } -static void ov6_02243F74 (FieldSystem * fieldSystem, int param1) +static void ov6_02243F74(FieldSystem *fieldSystem, int param1) { - MapObject * v0 = Player_MapObject(fieldSystem->playerAvatar); + MapObject *v0 = Player_MapObject(fieldSystem->playerAvatar); MapObject_SetHidden(v0, param1); } -SysTask * ov6_02243F88 (FieldSystem * fieldSystem, u32 param1, Pokemon * param2, int param3) +SysTask *ov6_02243F88(FieldSystem *fieldSystem, u32 param1, Pokemon *param2, int param3) { - SysTask * v0; - UnkStruct_ov6_02243FFC * v1 = ov6_02243FDC(fieldSystem); + SysTask *v0; + UnkStruct_ov6_02243FFC *v1 = ov6_02243FDC(fieldSystem); v1->unk_5C = param2; v1->unk_0C = param3; @@ -1047,23 +1051,23 @@ SysTask * ov6_02243F88 (FieldSystem * fieldSystem, u32 param1, Pokemon * param2, return v0; } -int ov6_02243FBC (SysTask * param0) +int ov6_02243FBC(SysTask *param0) { - UnkStruct_ov6_02243FFC * v0 = SysTask_GetParam(param0); + UnkStruct_ov6_02243FFC *v0 = SysTask_GetParam(param0); return v0->unk_04; } -void ov6_02243FC8 (SysTask * param0) +void ov6_02243FC8(SysTask *param0) { - UnkStruct_ov6_02243FFC * v0 = SysTask_GetParam(param0); + UnkStruct_ov6_02243FFC *v0 = SysTask_GetParam(param0); ov6_02243FFC(v0); SysTask_Done(param0); } -static UnkStruct_ov6_02243FFC * ov6_02243FDC (FieldSystem * fieldSystem) +static UnkStruct_ov6_02243FFC *ov6_02243FDC(FieldSystem *fieldSystem) { - UnkStruct_ov6_02243FFC * v0 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov6_02243FFC))); + UnkStruct_ov6_02243FFC *v0 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov6_02243FFC))); memset(v0, 0, (sizeof(UnkStruct_ov6_02243FFC))); v0->fieldSystem = fieldSystem; @@ -1071,15 +1075,15 @@ static UnkStruct_ov6_02243FFC * ov6_02243FDC (FieldSystem * fieldSystem) return v0; } -static void ov6_02243FFC (UnkStruct_ov6_02243FFC * param0) +static void ov6_02243FFC(UnkStruct_ov6_02243FFC *param0) { Heap_FreeToHeap(param0); } -static void ov6_02244004 (SysTask * param0, void * param1) +static void ov6_02244004(SysTask *param0, void *param1) { int v0; - UnkStruct_ov6_02243FFC * v1 = param1; + UnkStruct_ov6_02243FFC *v1 = param1; do { v0 = Unk_ov6_022492D8[v1->unk_00](v1); @@ -1094,7 +1098,7 @@ static void ov6_02244004 (SysTask * param0, void * param1) } } -static int ov6_02244038 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244038(UnkStruct_ov6_02243FFC *param0) { ov6_0224481C(param0); ov6_0224464C(param0); @@ -1102,15 +1106,15 @@ static int ov6_02244038 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_02244050 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244050(UnkStruct_ov6_02243FFC *param0) { if (param0->unk_26C == 0) { return 0; } { - VecFx32 v0 = {(FX32_ONE * 128), (FX32_ONE * 96), 0}; - VecFx32 v1 = {(FX32_ONE * (256 + 40)), (FX32_ONE * 96), 0}; + VecFx32 v0 = { (FX32_ONE * 128), (FX32_ONE * 96), 0 }; + VecFx32 v1 = { (FX32_ONE * (256 + 40)), (FX32_ONE * 96), 0 }; param0->unk_248 = ov6_02244CFC(param0, &v0); param0->unk_24C = ov6_0224529C(param0, &v1); @@ -1126,7 +1130,7 @@ static int ov6_02244050 (UnkStruct_ov6_02243FFC * param0) return 1; } -static int ov6_022440C0 (UnkStruct_ov6_02243FFC * param0) +static int ov6_022440C0(UnkStruct_ov6_02243FFC *param0) { ov6_02245FDC(param0); @@ -1134,15 +1138,15 @@ static int ov6_022440C0 (UnkStruct_ov6_02243FFC * param0) param0->unk_54 = (FX32_ONE * -64); param0->unk_44 = (FX32_ONE * 254); param0->unk_48 = (FX32_ONE * 255); - param0->unk_4C = (FX32_ONE * ((96 - 1))); - param0->unk_50 = (FX32_ONE * ((96 + 1))); + param0->unk_4C = (FX32_ONE * (96 - 1)); + param0->unk_50 = (FX32_ONE * (96 + 1)); param0->unk_2C = 1; param0->unk_00++; return 0; } -static int ov6_022440F8 (UnkStruct_ov6_02243FFC * param0) +static int ov6_022440F8(UnkStruct_ov6_02243FFC *param0) { param0->unk_2C = 0; param0->unk_44 += param0->unk_54; @@ -1159,7 +1163,7 @@ static int ov6_022440F8 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_02244138 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244138(UnkStruct_ov6_02243FFC *param0) { param0->unk_2C = 0; param0->unk_4C -= param0->unk_54; @@ -1170,18 +1174,18 @@ static int ov6_02244138 (UnkStruct_ov6_02243FFC * param0) param0->unk_54 = (FX32_ONE * 32); } - if (param0->unk_4C < (FX32_ONE * ((96 - 40)))) { - param0->unk_4C = (FX32_ONE * ((96 - 40))); + if (param0->unk_4C < (FX32_ONE * (96 - 40))) { + param0->unk_4C = (FX32_ONE * (96 - 40)); } - if (param0->unk_50 > (FX32_ONE * ((96 + 40)))) { - param0->unk_50 = (FX32_ONE * ((96 + 40))); + if (param0->unk_50 > (FX32_ONE * (96 + 40))) { + param0->unk_50 = (FX32_ONE * (96 + 40)); } ov6_02244F80(param0, param0->unk_44, param0->unk_4C, param0->unk_48, param0->unk_50); param0->unk_2C = 1; - if ((param0->unk_4C == (FX32_ONE * ((96 - 40)))) && (param0->unk_50 == (FX32_ONE * ((96 + 40))))) { + if ((param0->unk_4C == (FX32_ONE * (96 - 40))) && (param0->unk_50 == (FX32_ONE * (96 + 40)))) { ov6_02244D34(param0->unk_248); param0->unk_00++; } @@ -1189,7 +1193,7 @@ static int ov6_02244138 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_022441BC (UnkStruct_ov6_02243FFC * param0) +static int ov6_022441BC(UnkStruct_ov6_02243FFC *param0) { param0->unk_08++; @@ -1202,9 +1206,9 @@ static int ov6_022441BC (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_022441DC (UnkStruct_ov6_02243FFC * param0) +static int ov6_022441DC(UnkStruct_ov6_02243FFC *param0) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; v0 = sub_02021D28(param0->unk_24C); @@ -1220,9 +1224,9 @@ static int ov6_022441DC (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_02244228 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244228(UnkStruct_ov6_02243FFC *param0) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; param0->unk_58 /= 2; @@ -1244,7 +1248,7 @@ static int ov6_02244228 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_02244284 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244284(UnkStruct_ov6_02243FFC *param0) { param0->unk_08++; @@ -1257,9 +1261,9 @@ static int ov6_02244284 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_022442A4 (UnkStruct_ov6_02243FFC * param0) +static int ov6_022442A4(UnkStruct_ov6_02243FFC *param0) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; param0->unk_58 *= 2; @@ -1282,7 +1286,7 @@ static int ov6_022442A4 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_02244308 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244308(UnkStruct_ov6_02243FFC *param0) { param0->unk_2C = 0; param0->unk_4C += param0->unk_54; @@ -1293,18 +1297,18 @@ static int ov6_02244308 (UnkStruct_ov6_02243FFC * param0) param0->unk_54 = (FX32_ONE * 32); } - if (param0->unk_4C >= (FX32_ONE * ((96 - 8)))) { - param0->unk_4C = (FX32_ONE * ((96 - 8))); + if (param0->unk_4C >= (FX32_ONE * (96 - 8))) { + param0->unk_4C = (FX32_ONE * (96 - 8)); } - if (param0->unk_50 <= (FX32_ONE * ((96 + 8)))) { - param0->unk_50 = (FX32_ONE * ((96 + 8))); + if (param0->unk_50 <= (FX32_ONE * (96 + 8))) { + param0->unk_50 = (FX32_ONE * (96 + 8)); } ov6_02244F80(param0, param0->unk_44, param0->unk_4C, param0->unk_48, param0->unk_50); param0->unk_2C = 1; - if ((param0->unk_4C == (FX32_ONE * ((96 - 8)))) && (param0->unk_50 == (FX32_ONE * ((96 + 8))))) { + if ((param0->unk_4C == (FX32_ONE * (96 - 8))) && (param0->unk_50 == (FX32_ONE * (96 + 8)))) { ov6_02246018(param0); param0->unk_00++; } @@ -1312,7 +1316,7 @@ static int ov6_02244308 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_02244388 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244388(UnkStruct_ov6_02243FFC *param0) { ov6_022448C8(param0); param0->unk_10 = 0; @@ -1320,20 +1324,20 @@ static int ov6_02244388 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_0224439C (UnkStruct_ov6_02243FFC * param0) +static int ov6_0224439C(UnkStruct_ov6_02243FFC *param0) { ov6_02244FB4(param0); param0->unk_00++; return 0; } -static int ov6_022443B0 (UnkStruct_ov6_02243FFC * param0) +static int ov6_022443B0(UnkStruct_ov6_02243FFC *param0) { param0->unk_04 = 1; return 0; } -static int(*const Unk_ov6_022492D8[])(UnkStruct_ov6_02243FFC *) = { +static int (*const Unk_ov6_022492D8[])(UnkStruct_ov6_02243FFC *) = { ov6_02244038, ov6_02244050, ov6_022440C0, @@ -1350,10 +1354,10 @@ static int(*const Unk_ov6_022492D8[])(UnkStruct_ov6_02243FFC *) = { ov6_022443B0 }; -static void ov6_022443B8 (SysTask * param0, void * param1) +static void ov6_022443B8(SysTask *param0, void *param1) { int v0; - UnkStruct_ov6_02243FFC * v1 = param1; + UnkStruct_ov6_02243FFC *v1 = param1; do { v0 = Unk_ov6_02249310[v1->unk_00](v1); @@ -1368,15 +1372,15 @@ static void ov6_022443B8 (SysTask * param0, void * param1) } } -static int ov6_022443EC (UnkStruct_ov6_02243FFC * param0) +static int ov6_022443EC(UnkStruct_ov6_02243FFC *param0) { if (param0->unk_26C == 0) { return 0; } { - VecFx32 v0 = {(FX32_ONE * 128), (FX32_ONE * 96), 0}; - VecFx32 v1 = {(FX32_ONE * (256 + 40)), (FX32_ONE * 96), 0}; + VecFx32 v0 = { (FX32_ONE * 128), (FX32_ONE * 96), 0 }; + VecFx32 v1 = { (FX32_ONE * (256 + 40)), (FX32_ONE * 96), 0 }; param0->unk_248 = ov6_02244CFC(param0, &v0); param0->unk_24C = ov6_0224529C(param0, &v1); @@ -1391,14 +1395,14 @@ static int ov6_022443EC (UnkStruct_ov6_02243FFC * param0) return 1; } -static int ov6_0224445C (UnkStruct_ov6_02243FFC * param0) +static int ov6_0224445C(UnkStruct_ov6_02243FFC *param0) { ov6_022451B8(param0); param0->unk_00++; return 0; } -static int ov6_02244470 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244470(UnkStruct_ov6_02243FFC *param0) { ov6_02244DB4(param0); ov6_02244674(param0); @@ -1406,7 +1410,7 @@ static int ov6_02244470 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_02244488 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244488(UnkStruct_ov6_02243FFC *param0) { if (param0->unk_26C == 0) { return 0; @@ -1418,7 +1422,7 @@ static int ov6_02244488 (UnkStruct_ov6_02243FFC * param0) return 1; } -static int ov6_022444A8 (UnkStruct_ov6_02243FFC * param0) +static int ov6_022444A8(UnkStruct_ov6_02243FFC *param0) { ov6_0224543C(param0); ov6_0224551C(param0); @@ -1428,7 +1432,7 @@ static int ov6_022444A8 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_022444D0 (UnkStruct_ov6_02243FFC * param0) +static int ov6_022444D0(UnkStruct_ov6_02243FFC *param0) { if (ov6_02245470(param0) != 2) { return 0; @@ -1440,7 +1444,7 @@ static int ov6_022444D0 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_022444F8 (UnkStruct_ov6_02243FFC * param0) +static int ov6_022444F8(UnkStruct_ov6_02243FFC *param0) { param0->unk_08++; @@ -1454,7 +1458,7 @@ static int ov6_022444F8 (UnkStruct_ov6_02243FFC * param0) return 1; } -static int ov6_02244518 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244518(UnkStruct_ov6_02243FFC *param0) { if (ov6_02245470(param0) != 3) { return 0; @@ -1469,7 +1473,7 @@ static int ov6_02244518 (UnkStruct_ov6_02243FFC * param0) return 1; } -static int ov6_02244548 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244548(UnkStruct_ov6_02243FFC *param0) { param0->unk_2C = 0; param0->unk_4C += param0->unk_54; @@ -1480,12 +1484,12 @@ static int ov6_02244548 (UnkStruct_ov6_02243FFC * param0) param0->unk_54 = (FX32_ONE * 16); } - if (param0->unk_4C >= (FX32_ONE * ((96 - 1)))) { - param0->unk_4C = (FX32_ONE * ((96 - 1))); + if (param0->unk_4C >= (FX32_ONE * (96 - 1))) { + param0->unk_4C = (FX32_ONE * (96 - 1)); } - if (param0->unk_50 <= (FX32_ONE * ((96 + 1)))) { - param0->unk_50 = (FX32_ONE * ((96 + 1))); + if (param0->unk_50 <= (FX32_ONE * (96 + 1))) { + param0->unk_50 = (FX32_ONE * (96 + 1)); } ov6_02244F80(param0, param0->unk_44, param0->unk_4C, param0->unk_48, param0->unk_50); @@ -1499,7 +1503,7 @@ static int ov6_02244548 (UnkStruct_ov6_02243FFC * param0) } } - if ((param0->unk_4C == (FX32_ONE * ((96 - 1)))) && (param0->unk_50 == (FX32_ONE * ((96 + 1))))) { + if ((param0->unk_4C == (FX32_ONE * (96 - 1))) && (param0->unk_50 == (FX32_ONE * (96 + 1)))) { ov6_02244F20(param0->fieldSystem->unk_08); param0->unk_14 = 1; ov6_02244F58(param0); @@ -1509,7 +1513,7 @@ static int ov6_02244548 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_022445EC (UnkStruct_ov6_02243FFC * param0) +static int ov6_022445EC(UnkStruct_ov6_02243FFC *param0) { if (param0->unk_18 == 0) { if (ov6_02245470(param0) == 4) { @@ -1534,7 +1538,7 @@ static int ov6_022445EC (UnkStruct_ov6_02243FFC * param0) return 0; } -static int ov6_02244634 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02244634(UnkStruct_ov6_02243FFC *param0) { if (ScreenWipe_Done()) { param0->unk_00++; @@ -1543,7 +1547,7 @@ static int ov6_02244634 (UnkStruct_ov6_02243FFC * param0) return 0; } -static int(*const Unk_ov6_02249310[])(UnkStruct_ov6_02243FFC *) = { +static int (*const Unk_ov6_02249310[])(UnkStruct_ov6_02243FFC *) = { ov6_02244038, ov6_022443EC, ov6_022440C0, @@ -1569,21 +1573,21 @@ static int(*const Unk_ov6_02249310[])(UnkStruct_ov6_02243FFC *) = { ov6_022443B0 }; -static void ov6_0224464C (UnkStruct_ov6_02243FFC * param0) +static void ov6_0224464C(UnkStruct_ov6_02243FFC *param0) { param0->unk_268 = 0; param0->unk_26C = 0; param0->unk_278 = SysTask_ExecuteOnVBlank(ov6_022446B8, param0, 0x80); } -static void ov6_02244674 (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244674(UnkStruct_ov6_02243FFC *param0) { param0->unk_268 = 0; param0->unk_26C = 0; param0->unk_278 = SysTask_ExecuteOnVBlank(ov6_022447B4, param0, 0x80); } -static void ov6_0224469C (UnkStruct_ov6_02243FFC * param0) +static void ov6_0224469C(UnkStruct_ov6_02243FFC *param0) { if (param0->unk_278 != NULL) { SysTask_Done(param0->unk_278); @@ -1591,10 +1595,10 @@ static void ov6_0224469C (UnkStruct_ov6_02243FFC * param0) } } -static void ov6_022446B8 (SysTask * param0, void * param1) +static void ov6_022446B8(SysTask *param0, void *param1) { int v0; - UnkStruct_ov6_02243FFC * v1 = param1; + UnkStruct_ov6_02243FFC *v1 = param1; switch (v1->unk_268) { case 0: @@ -1625,10 +1629,10 @@ static void ov6_022446B8 (SysTask * param0, void * param1) } } -static void ov6_02244734 (SysTask * param0, void * param1) +static void ov6_02244734(SysTask *param0, void *param1) { int v0; - UnkStruct_ov6_02243FFC * v1 = param1; + UnkStruct_ov6_02243FFC *v1 = param1; if (v1->unk_268 == 1) { for (v0 = 0; v0 < 4; v0++) { @@ -1658,10 +1662,10 @@ static void ov6_02244734 (SysTask * param0, void * param1) } } -static void ov6_022447B4 (SysTask * param0, void * param1) +static void ov6_022447B4(SysTask *param0, void *param1) { - UnkStruct_ov6_02243FFC * v0 = param1; - UnkStruct_02009DC8 * v1 = sub_02009DC8(v0->unk_200, 0); + UnkStruct_ov6_02243FFC *v0 = param1; + UnkStruct_02009DC8 *v1 = sub_02009DC8(v0->unk_200, 0); switch (v0->unk_268) { case 0: @@ -1672,10 +1676,10 @@ static void ov6_022447B4 (SysTask * param0, void * param1) } } -static void ov6_022447EC (SysTask * param0, void * param1) +static void ov6_022447EC(SysTask *param0, void *param1) { - UnkStruct_ov6_02243FFC * v0 = param1; - UnkStruct_02009DC8 * v1 = sub_02009DC8(v0->unk_200, 0); + UnkStruct_ov6_02243FFC *v0 = param1; + UnkStruct_02009DC8 *v1 = sub_02009DC8(v0->unk_200, 0); if (v0->unk_268 == 1) { sub_02009D4C(v1); @@ -1684,9 +1688,9 @@ static void ov6_022447EC (SysTask * param0, void * param1) } } -static void ov6_0224481C (UnkStruct_ov6_02243FFC * param0) +static void ov6_0224481C(UnkStruct_ov6_02243FFC *param0) { - NARC * v0 = ov6_0224491C(); + NARC *v0 = ov6_0224491C(); ov6_02244F80(param0, (FX32_ONE * 0), (FX32_ONE * 192), (FX32_ONE * 1), (FX32_ONE * 192)); ov6_02244F2C(param0); @@ -1709,7 +1713,7 @@ static void ov6_0224481C (UnkStruct_ov6_02243FFC * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); } -static void ov6_022448C8 (UnkStruct_ov6_02243FFC * param0) +static void ov6_022448C8(UnkStruct_ov6_02243FFC *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 0); sub_0207121C(param0->unk_244); @@ -1724,12 +1728,12 @@ static void ov6_022448C8 (UnkStruct_ov6_02243FFC * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); } -static NARC * ov6_0224491C (void) +static NARC *ov6_0224491C(void) { return NARC_ctor(NARC_INDEX_DATA__FIELD_CUTIN, 4); } -static void ov6_02244928 (UnkStruct_ov6_02243FFC * param0, NARC * param1) +static void ov6_02244928(UnkStruct_ov6_02243FFC *param0, NARC *param1) { int v0; @@ -1796,7 +1800,7 @@ static void ov6_02244928 (UnkStruct_ov6_02243FFC * param0, NARC * param1) param0->unk_274 = ov6_022450E4(¶m0->unk_258, 4); } -static void ov6_02244B6C (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244B6C(UnkStruct_ov6_02243FFC *param0) { int v0; @@ -1832,18 +1836,18 @@ static void ov6_02244B6C (UnkStruct_ov6_02243FFC * param0) sub_02021964(param0->unk_70); } -static void ov6_02244C10 (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244C10(UnkStruct_ov6_02243FFC *param0) { if (param0->unk_70 != NULL) { sub_020219F8(param0->unk_70); } } -static GraphicElementData * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7) +static GraphicElementData *ov6_02244C20(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - GraphicElementData * v2; + GraphicElementData *v2; if (param5 == 4) { sub_020093B4( @@ -1866,9 +1870,9 @@ static GraphicElementData * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const return v2; } -static GraphicElementData * ov6_02244CD4 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3) +static GraphicElementData *ov6_02244CD4(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, int param2, int param3) { - GraphicElementData * v0; + GraphicElementData *v0; v0 = ov6_02244C20(param0, param1, 1, 0, 1, 0, 0, param2); SpriteActor_SetSpriteAnimActive(v0, param3); @@ -1876,9 +1880,9 @@ static GraphicElementData * ov6_02244CD4 (UnkStruct_ov6_02243FFC * param0, const return v0; } -static GraphicElementData * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1) +static GraphicElementData *ov6_02244CFC(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1) { - GraphicElementData * v0; + GraphicElementData *v0; u32 v1 = 0; if (param0->unk_0C == 1) { @@ -1893,17 +1897,17 @@ static GraphicElementData * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const return v0; } -static void ov6_02244D34 (GraphicElementData * param0) +static void ov6_02244D34(GraphicElementData *param0) { sub_02021CC8(param0, 1); sub_02021CE4(param0, FX32_ONE); } -static GraphicElementData * ov6_02244D4C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3) +static GraphicElementData *ov6_02244D4C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, int param2, int param3) { - GraphicElementData * v0; - VecFx32 v1 = {0, 0, 0}; - VecFx32 v2 = {0x1000, 0x1000, 0}; + GraphicElementData *v0; + VecFx32 v1 = { 0, 0, 0 }; + VecFx32 v2 = { 0x1000, 0x1000, 0 }; v0 = ov6_02244C20(param0, param1, 0, 0, 0, 0xffffffff, 0, param2); @@ -1915,10 +1919,10 @@ static GraphicElementData * ov6_02244D4C (UnkStruct_ov6_02243FFC * param0, const return v0; } -static void ov6_02244DB4 (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244DB4(UnkStruct_ov6_02243FFC *param0) { int v0; - NARC * v1 = ov6_0224491C(); + NARC *v1 = ov6_0224491C(); for (v0 = 0; v0 < 4; v0++) { if (param0->unk_210[v0] == NULL) { @@ -1940,9 +1944,9 @@ static void ov6_02244DB4 (UnkStruct_ov6_02243FFC * param0) NARC_dtor(v1); } -static void ov6_02244E54 (NARC * param0, u32 param1, NNSG2dPaletteData ** param2) +static void ov6_02244E54(NARC *param0, u32 param1, NNSG2dPaletteData **param2) { - void * v0; + void *v0; v0 = NARC_AllocAndReadWholeMember(param0, param1, 4); @@ -1952,9 +1956,9 @@ static void ov6_02244E54 (NARC * param0, u32 param1, NNSG2dPaletteData ** param2 Heap_FreeToHeap(v0); } -static void ov6_02244E7C (BGL * param0, NARC * param1, u32 param2, NNSG2dCharacterData ** param3) +static void ov6_02244E7C(BGL *param0, NARC *param1, u32 param2, NNSG2dCharacterData **param3) { - void * v0; + void *v0; v0 = NARC_AllocAndReadWholeMember(param1, param2, 4); NNS_G2dGetUnpackedCharacterData(v0, param3); @@ -1963,9 +1967,9 @@ static void ov6_02244E7C (BGL * param0, NARC * param1, u32 param2, NNSG2dCharact Heap_FreeToHeap(v0); } -static void ov6_02244EB4 (BGL * param0, NARC * param1, u32 param2, NNSG2dScreenData ** param3) +static void ov6_02244EB4(BGL *param0, NARC *param1, u32 param2, NNSG2dScreenData **param3) { - void * v0; + void *v0; sub_02019184(param0, 3, 0, 0); sub_02019184(param0, 3, 3, 0); @@ -1979,12 +1983,12 @@ static void ov6_02244EB4 (BGL * param0, NARC * param1, u32 param2, NNSG2dScreenD Heap_FreeToHeap(v0); } -static void ov6_02244F20 (BGL * param0) +static void ov6_02244F20(BGL *param0) { sub_02019EBC(param0, 3); } -static void ov6_02244F2C (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244F2C(UnkStruct_ov6_02243FFC *param0) { ov6_02244F8C(param0); param0->unk_2C = 0; @@ -1996,17 +2000,17 @@ static void ov6_02244F2C (UnkStruct_ov6_02243FFC * param0) param0->unk_2C = 1; } -static void ov6_02244F50 (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244F50(UnkStruct_ov6_02243FFC *param0) { param0->unk_30 = (GX_WNDMASK_W0); } -static void ov6_02244F58 (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244F58(UnkStruct_ov6_02243FFC *param0) { param0->unk_30 = GX_WNDMASK_NONE; } -static void ov6_02244F60 (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244F60(UnkStruct_ov6_02243FFC *param0) { param0->unk_34 = (GX_WND_PLANEMASK_BG3) | GX_WND_PLANEMASK_OBJ; param0->unk_38 = 0; @@ -2014,13 +2018,13 @@ static void ov6_02244F60 (UnkStruct_ov6_02243FFC * param0) param0->unk_40 = 1; } -static void ov6_02244F74 (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244F74(UnkStruct_ov6_02243FFC *param0) { param0->unk_3C = (GX_WND_PLANEMASK_OBJ | GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3) & (~(GX_WND_PLANEMASK_BG3)); param0->unk_40 = 1; } -static void ov6_02244F80 (UnkStruct_ov6_02243FFC * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4) +static void ov6_02244F80(UnkStruct_ov6_02243FFC *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4) { param0->unk_44 = param1; param0->unk_48 = param3; @@ -2028,13 +2032,13 @@ static void ov6_02244F80 (UnkStruct_ov6_02243FFC * param0, fx32 param1, fx32 par param0->unk_50 = param4; } -static void ov6_02244F8C (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244F8C(UnkStruct_ov6_02243FFC *param0) { GF_ASSERT(param0->unk_27C == NULL); param0->unk_27C = SysTask_ExecuteOnVBlank(ov6_02244FE4, param0, 0x81); } -static void ov6_02244FB4 (UnkStruct_ov6_02243FFC * param0) +static void ov6_02244FB4(UnkStruct_ov6_02243FFC *param0) { GF_ASSERT(param0->unk_27C != NULL); @@ -2042,9 +2046,9 @@ static void ov6_02244FB4 (UnkStruct_ov6_02243FFC * param0) GX_SetVisibleWnd(GX_WNDMASK_NONE); } -static void ov6_02244FE4 (SysTask * param0, void * param1) +static void ov6_02244FE4(SysTask *param0, void *param1) { - UnkStruct_ov6_02243FFC * v0 = param1; + UnkStruct_ov6_02243FFC *v0 = param1; if (v0->unk_2C == 0) { return; @@ -2056,14 +2060,14 @@ static void ov6_02244FE4 (SysTask * param0, void * param1) G2_SetWnd0Position(v0->unk_44 / FX32_ONE, v0->unk_4C / FX32_ONE, v0->unk_48 / FX32_ONE, v0->unk_50 / FX32_ONE); } -static void ov6_0224508C (UnkStruct_ov6_02243FFC * param0, ArchivedSprite * param1) +static void ov6_0224508C(UnkStruct_ov6_02243FFC *param0, ArchivedSprite *param1) { Pokemon_BuildArchivedSprite(param1, param0->unk_5C, 2); } -static void * ov6_0224509C (Pokemon * param0, ArchivedSprite * param1, u32 param2) +static void *ov6_0224509C(Pokemon *param0, ArchivedSprite *param1, u32 param2) { - void * v0 = Heap_AllocFromHeap(4, (32 * 10) * 10); + void *v0 = Heap_AllocFromHeap(4, (32 * 10) * 10); GF_ASSERT(v0 != NULL); @@ -2075,25 +2079,25 @@ static void * ov6_0224509C (Pokemon * param0, ArchivedSprite * param1, u32 param return v0; } -static void * ov6_022450E4 (ArchivedSprite * param0, u32 param1) +static void *ov6_022450E4(ArchivedSprite *param0, u32 param1) { - void * v0 = sub_02013660(param0->archive, param0->palette, param1); + void *v0 = sub_02013660(param0->archive, param0->palette, param1); return v0; } -static UnkStruct_02009DC8 * ov6_022450F4 (UnkStruct_ov6_02243FFC * param0, NARC * param1) +static UnkStruct_02009DC8 *ov6_022450F4(UnkStruct_ov6_02243FFC *param0, NARC *param1) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009A4C(param0->unk_200, param1, 5, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 4); return v0; } -static void ov6_02245118 (UnkStruct_ov6_02243FFC * param0, void * param1) +static void ov6_02245118(UnkStruct_ov6_02243FFC *param0, void *param1) { u32 v0; - UnkStruct_02009DC8 * v1; - const NNSG2dImageProxy * v2; + UnkStruct_02009DC8 *v1; + const NNSG2dImageProxy *v2; v1 = sub_02009DC8(param0->unk_200, 3); v2 = sub_0200A534(v1); @@ -2103,21 +2107,21 @@ static void ov6_02245118 (UnkStruct_ov6_02243FFC * param0, void * param1) GX_LoadOBJ(param1, v0, ((32 * 10) * 10)); } -static UnkStruct_02009DC8 * ov6_0224514C (UnkStruct_ov6_02243FFC * param0, NARC * param1) +static UnkStruct_02009DC8 *ov6_0224514C(UnkStruct_ov6_02243FFC *param0, NARC *param1) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009B04(param0->unk_204, param1, 3, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 4); return v0; } -static void ov6_02245170 (UnkStruct_ov6_02243FFC * param0, void * param1) +static void ov6_02245170(UnkStruct_ov6_02243FFC *param0, void *param1) { u32 v0; - UnkStruct_02009DC8 * v1; - UnkStruct_02009DC8 * v2; - NNSG2dImageProxy * v3; - const NNSG2dImagePaletteProxy * v4; + UnkStruct_02009DC8 *v1; + UnkStruct_02009DC8 *v2; + NNSG2dImageProxy *v3; + const NNSG2dImagePaletteProxy *v4; v2 = sub_02009DC8(param0->unk_200, 3); v3 = sub_0200A534(v2); @@ -2129,10 +2133,10 @@ static void ov6_02245170 (UnkStruct_ov6_02243FFC * param0, void * param1) GX_LoadOBJPltt(param1, v0, 32); } -static void ov6_022451B8 (UnkStruct_ov6_02243FFC * param0) +static void ov6_022451B8(UnkStruct_ov6_02243FFC *param0) { int v0; - UnkStruct_02009DC8 * v1 = sub_02009DC8(param0->unk_200, 3); + UnkStruct_02009DC8 *v1 = sub_02009DC8(param0->unk_200, 3); sub_0200A4E4(v1); sub_02009D68(param0->unk_200, v1); @@ -2173,9 +2177,9 @@ static void ov6_022451B8 (UnkStruct_ov6_02243FFC * param0) GF_ASSERT(v0 < 4); } -static GraphicElementData * ov6_0224529C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1) +static GraphicElementData *ov6_0224529C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1) { - GraphicElementData * v0; + GraphicElementData *v0; v0 = ov6_02244C20(param0, param1, 3, 2, 3, 0xffffffff, 0, 129); return v0; @@ -2184,22 +2188,22 @@ static GraphicElementData * ov6_0224529C (UnkStruct_ov6_02243FFC * param0, const static const UnkStruct_ov101_021D86B0 Unk_ov6_02249220; static const UnkStruct_ov6_0224936C Unk_ov6_0224936C[13] = { - {(FX32_ONE * 15), (FX32_ONE * 63), ((FX32_ONE * 16)), 0x85, 0x0}, - {(FX32_ONE * 76), (FX32_ONE * 67), ((FX32_ONE * 16)), 0x85, 0x0}, - {(FX32_ONE * 128), (FX32_ONE * 61), ((FX32_ONE * 24)), 0x80, 0x1}, - {(FX32_ONE * 240), (FX32_ONE * 69), ((FX32_ONE * 16)), 0x85, 0x0}, - {(FX32_ONE * 40), (FX32_ONE * 78), ((FX32_ONE * 24)), 0x80, 0x1}, - {(FX32_ONE * 72), (FX32_ONE * 91), ((FX32_ONE * 16)), 0x85, 0x0}, - {(FX32_ONE * 208), (FX32_ONE * 86), ((FX32_ONE * 24)), 0x80, 0x1}, - {(FX32_ONE * 56), (FX32_ONE * 116), ((FX32_ONE * 16)), 0x85, 0x0}, - {(FX32_ONE * 95), (FX32_ONE * 109), ((FX32_ONE * 24)), 0x80, 0x1}, - {(FX32_ONE * 159), (FX32_ONE * 100), ((FX32_ONE * 16)), 0x85, 0x0}, - {(FX32_ONE * 24), (FX32_ONE * 126), ((FX32_ONE * 24)), 0x80, 0x1}, - {(FX32_ONE * 140), (FX32_ONE * 125), ((FX32_ONE * 24)), 0x80, 0x1}, - {(FX32_ONE * 221), (FX32_ONE * 124), ((FX32_ONE * 24)), 0x80, 0x1} + { (FX32_ONE * 15), (FX32_ONE * 63), (FX32_ONE * 16), 0x85, 0x0 }, + { (FX32_ONE * 76), (FX32_ONE * 67), (FX32_ONE * 16), 0x85, 0x0 }, + { (FX32_ONE * 128), (FX32_ONE * 61), (FX32_ONE * 24), 0x80, 0x1 }, + { (FX32_ONE * 240), (FX32_ONE * 69), (FX32_ONE * 16), 0x85, 0x0 }, + { (FX32_ONE * 40), (FX32_ONE * 78), (FX32_ONE * 24), 0x80, 0x1 }, + { (FX32_ONE * 72), (FX32_ONE * 91), (FX32_ONE * 16), 0x85, 0x0 }, + { (FX32_ONE * 208), (FX32_ONE * 86), (FX32_ONE * 24), 0x80, 0x1 }, + { (FX32_ONE * 56), (FX32_ONE * 116), (FX32_ONE * 16), 0x85, 0x0 }, + { (FX32_ONE * 95), (FX32_ONE * 109), (FX32_ONE * 24), 0x80, 0x1 }, + { (FX32_ONE * 159), (FX32_ONE * 100), (FX32_ONE * 16), 0x85, 0x0 }, + { (FX32_ONE * 24), (FX32_ONE * 126), (FX32_ONE * 24), 0x80, 0x1 }, + { (FX32_ONE * 140), (FX32_ONE * 125), (FX32_ONE * 24), 0x80, 0x1 }, + { (FX32_ONE * 221), (FX32_ONE * 124), (FX32_ONE * 24), 0x80, 0x1 } }; -static void ov6_022452BC (UnkStruct_ov6_02243FFC * param0, int param1) +static void ov6_022452BC(UnkStruct_ov6_02243FFC *param0, int param1) { int v0, v1, v2; VecFx32 v3, v4; @@ -2222,9 +2226,9 @@ static void ov6_022452BC (UnkStruct_ov6_02243FFC * param0, int param1) } } -static void ov6_02245328 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, const VecFx32 * param2, int param3, int param4, int param5) +static void ov6_02245328(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, const VecFx32 *param2, int param3, int param4, int param5) { - UnkStruct_ov101_021D5D90 * v0; + UnkStruct_ov101_021D5D90 *v0; UnkStruct_ov6_02245328 v1; v1.unk_00 = param3; @@ -2235,11 +2239,11 @@ static void ov6_02245328 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param v0 = sub_02071330(param0->unk_244, &Unk_ov6_02249220, param1, param4, &v1, 132); } -static int ov6_02245364 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov6_02245364(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov6_02245364 * v1 = param1; - const UnkStruct_ov6_02245328 * v2 = sub_020715BC(param0); + UnkStruct_ov6_02245364 *v1 = param1; + const UnkStruct_ov6_02245328 *v2 = sub_020715BC(param0); v1->unk_0C = *v2; v1->unk_04 = sub_020715B4(param0); @@ -2252,16 +2256,16 @@ static int ov6_02245364 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov6_022453AC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov6_022453AC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov6_02245364 * v0 = param1; + UnkStruct_ov6_02245364 *v0 = param1; sub_02021BD4(v0->unk_08); } -static void ov6_022453B8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov6_022453B8(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov6_02245364 * v1 = param1; + UnkStruct_ov6_02245364 *v1 = param1; sub_020715E4(param0, &v0); @@ -2272,7 +2276,7 @@ static void ov6_022453B8 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02021C50(v1->unk_08, &v0); if (v1->unk_0C.unk_04 == 1) { - UnkStruct_ov6_02243FFC * v2 = v1->unk_0C.unk_08; + UnkStruct_ov6_02243FFC *v2 = v1->unk_0C.unk_08; if (v2->unk_14 == 2) { int v3 = 0; @@ -2289,9 +2293,9 @@ static void ov6_022453B8 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov6_02245438 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov6_02245438(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov6_02245364 * v0 = param1; + UnkStruct_ov6_02245364 *v0 = param1; } static const UnkStruct_ov101_021D86B0 Unk_ov6_02249220 = { @@ -2302,24 +2306,24 @@ static const UnkStruct_ov101_021D86B0 Unk_ov6_02249220 = { ov6_02245438 }; -static void ov6_0224543C (UnkStruct_ov6_02243FFC * param0) +static void ov6_0224543C(UnkStruct_ov6_02243FFC *param0) { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; UnkStruct_ov6_0224543C v1; v1.unk_00 = param0; param0->unk_250 = sub_02071330(param0->unk_244, &Unk_ov6_02249248, &v0, 0, &v1, 130); } -static int ov6_02245470 (UnkStruct_ov6_02243FFC * param0) +static int ov6_02245470(UnkStruct_ov6_02243FFC *param0) { - UnkStruct_ov6_02249198 * v0 = sub_02071598(param0->unk_250); + UnkStruct_ov6_02249198 *v0 = sub_02071598(param0->unk_250); return v0->unk_02; } -static void ov6_02245480 (UnkStruct_ov6_02243FFC * param0) +static void ov6_02245480(UnkStruct_ov6_02243FFC *param0) { - UnkStruct_ov6_02249198 * v0 = sub_02071598(param0->unk_250); + UnkStruct_ov6_02249198 *v0 = sub_02071598(param0->unk_250); if (v0->unk_60) { sub_0207136C(v0->unk_60); @@ -2332,11 +2336,11 @@ static void ov6_02245480 (UnkStruct_ov6_02243FFC * param0) sub_0207136C(param0->unk_250); } -static int ov6_022454B0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov6_022454B0(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov6_02249198 * v1 = param1; - const UnkStruct_ov6_0224543C * v2 = sub_020715BC(param0); + UnkStruct_ov6_02249198 *v1 = param1; + const UnkStruct_ov6_0224543C *v2 = sub_020715BC(param0); v1->unk_5C = *v2; sub_020715E4(param0, &v0); @@ -2345,16 +2349,16 @@ static int ov6_022454B0 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov6_022454DC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov6_022454DC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov6_02249198 * v0 = param1; + UnkStruct_ov6_02249198 *v0 = param1; sub_02021BD4(v0->unk_58); } -static void ov6_022454E8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov6_022454E8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov6_02249198 * v0 = param1; - int(*const * v1)(UnkStruct_ov6_02249198 *); + UnkStruct_ov6_02249198 *v0 = param1; + int (*const *v1)(UnkStruct_ov6_02249198 *); v1 = Unk_ov6_02249198[v0->unk_00]; @@ -2363,9 +2367,9 @@ static void ov6_022454E8 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov6_02245508 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov6_02245508(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov6_02249198 * v0 = param1; + UnkStruct_ov6_02249198 *v0 = param1; } static const UnkStruct_ov101_021D86B0 Unk_ov6_02249248 = { @@ -2376,32 +2380,36 @@ static const UnkStruct_ov101_021D86B0 Unk_ov6_02249248 = { ov6_02245508 }; -static int(*const * const Unk_ov6_02249198[])(UnkStruct_ov6_02249198 *) = { - Unk_ov6_022490E8, Unk_ov6_022490F0, Unk_ov6_022491EC, +static int (*const *const Unk_ov6_02249198[])(UnkStruct_ov6_02249198 *) = { + Unk_ov6_022490E8, + Unk_ov6_022490F0, + Unk_ov6_022491EC, }; -static int ov6_0224550C (UnkStruct_ov6_02249198 * param0) +static int ov6_0224550C(UnkStruct_ov6_02249198 *param0) { param0->unk_02 = 0; sub_02021CAC(param0->unk_58, 0); return 0; } -static int(*const Unk_ov6_022490E8[])(UnkStruct_ov6_02249198 *) = { +static int (*const Unk_ov6_022490E8[])(UnkStruct_ov6_02249198 *) = { ov6_0224550C }; -static void ov6_0224551C (UnkStruct_ov6_02243FFC * param0) +static void ov6_0224551C(UnkStruct_ov6_02243FFC *param0) { - VecFx32 v0 = {(FX32_ONE * (128 + 8)), (FX32_ONE * (96 - 8)), 0}; - VecFx32 v1 = {0x400, 0x400, 0}; - UnkStruct_ov6_02249198 * v2 = sub_02071598(param0->unk_250); + VecFx32 v0 = { (FX32_ONE * (128 + 8)), (FX32_ONE * (96 - 8)), 0 }; + VecFx32 v1 = { 0x400, 0x400, 0 }; + UnkStruct_ov6_02249198 *v2 = sub_02071598(param0->unk_250); v2->unk_00 = 1; v2->unk_01 = 0; v2->unk_02 = 0; v2->unk_08 = v0; - v2->unk_14.x = 0; v2->unk_14.y = 0; v2->unk_14.z = 0; + v2->unk_14.x = 0; + v2->unk_14.y = 0; + v2->unk_14.z = 0; v2->unk_38 = (FX32_ONE * 60); v2->unk_2C = v1; v2->unk_50 = 0x200; @@ -2411,14 +2419,14 @@ static void ov6_0224551C (UnkStruct_ov6_02243FFC * param0) sub_02021C50(v2->unk_58, &v0); sub_02021C70(v2->unk_58, &v1); - sub_02021C94(v2->unk_58, sub_0201D2A4(((v2->unk_38) / FX32_ONE))); + sub_02021C94(v2->unk_58, sub_0201D2A4((v2->unk_38) / FX32_ONE)); sub_02021CAC(v2->unk_58, 1); } -static int ov6_022455C4 (UnkStruct_ov6_02249198 * param0) +static int ov6_022455C4(UnkStruct_ov6_02249198 *param0) { VecFx32 v0; - GraphicElementData * v1 = param0->unk_58; + GraphicElementData *v1 = param0->unk_58; param0->unk_48 += param0->unk_4C; @@ -2427,7 +2435,7 @@ static int ov6_022455C4 (UnkStruct_ov6_02249198 * param0) } param0->unk_14.x = sub_0201D264(315) * ((param0->unk_48) / FX32_ONE); - param0->unk_14.y = sub_0201D250(((param0->unk_40) / FX32_ONE)) * ((param0->unk_48) / FX32_ONE); + param0->unk_14.y = sub_0201D250((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE); if (((param0->unk_40) / FX32_ONE) < 270) { param0->unk_40 += 0x4000; @@ -2452,7 +2460,7 @@ static int ov6_022455C4 (UnkStruct_ov6_02249198 * param0) param0->unk_38 = 0; } - sub_02021C94(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE))); + sub_02021C94(v1, sub_0201D2A4((param0->unk_38) / FX32_ONE)); v0.x = param0->unk_08.x + param0->unk_14.x; v0.y = param0->unk_08.y + param0->unk_14.y; @@ -2468,28 +2476,30 @@ static int ov6_022455C4 (UnkStruct_ov6_02249198 * param0) return 0; } -static int ov6_022456D0 (UnkStruct_ov6_02249198 * param0) +static int ov6_022456D0(UnkStruct_ov6_02249198 *param0) { return 0; } -static int(*const Unk_ov6_022490F0[])(UnkStruct_ov6_02249198 *) = { +static int (*const Unk_ov6_022490F0[])(UnkStruct_ov6_02249198 *) = { ov6_022455C4, ov6_022456D0 }; -static void ov6_022456D4 (UnkStruct_ov6_02243FFC * param0) +static void ov6_022456D4(UnkStruct_ov6_02243FFC *param0) { - VecFx32 v0 = {(FX32_ONE * 128), (FX32_ONE * 104), 0}; - VecFx32 v1 = {0x1400, 0x1400, 0}; - UnkStruct_ov6_02249198 * v2 = sub_02071598(param0->unk_250); + VecFx32 v0 = { (FX32_ONE * 128), (FX32_ONE * 104), 0 }; + VecFx32 v1 = { 0x1400, 0x1400, 0 }; + UnkStruct_ov6_02249198 *v2 = sub_02071598(param0->unk_250); v2->unk_00 = 2; v2->unk_01 = 0; v2->unk_02 = 1; v2->unk_04 = 0; v2->unk_08 = v0; - v2->unk_14.x = 0; v2->unk_14.y = 0; v2->unk_14.z = 0; + v2->unk_14.x = 0; + v2->unk_14.y = 0; + v2->unk_14.z = 0; v2->unk_38 = (FX32_ONE * 315); v2->unk_2C = v1; v2->unk_50 = 0x100; @@ -2497,26 +2507,26 @@ static void ov6_022456D4 (UnkStruct_ov6_02243FFC * param0) v2->unk_48 = (FX32_ONE * (128 + 64)); v2->unk_4C = (FX32_ONE * 32); v2->unk_14.x = sub_0201D264(315) * ((v2->unk_48) / FX32_ONE); - v2->unk_14.y = sub_0201D250(((v2->unk_40) / FX32_ONE)) * ((v2->unk_48) / FX32_ONE); + v2->unk_14.y = sub_0201D250((v2->unk_40) / FX32_ONE) * ((v2->unk_48) / FX32_ONE); v0.x = v2->unk_08.x + v2->unk_14.x; v0.y = v2->unk_08.y + v2->unk_14.y; sub_02021C50(v2->unk_58, &v0); sub_02021C70(v2->unk_58, &v1); - sub_02021C94(v2->unk_58, sub_0201D2A4(((v2->unk_38) / FX32_ONE))); + sub_02021C94(v2->unk_58, sub_0201D2A4((v2->unk_38) / FX32_ONE)); sub_02021CAC(v2->unk_58, 1); v2->unk_60 = ov6_02245B4C(param0->unk_244, param0->unk_248); param0->unk_1C = 1; v2->unk_64 = ov5_021F0EB0(param0->fieldSystem, 4); - ov5_021F0F10(v2->unk_64, 1, -((FX32_ONE * 120)), 12); + ov5_021F0F10(v2->unk_64, 1, -(FX32_ONE * 120), 12); { - GraphicElementData * v3; - VecFx32 v4 = {0, 0, 0}; - VecFx32 v5 = {0x1000, 0x1000, 0}; + GraphicElementData *v3; + VecFx32 v4 = { 0, 0, 0 }; + VecFx32 v5 = { 0x1000, 0x1000, 0 }; v3 = v2->unk_5C.unk_00->unk_248; @@ -2527,10 +2537,10 @@ static void ov6_022456D4 (UnkStruct_ov6_02243FFC * param0) } } -static int ov6_02245840 (UnkStruct_ov6_02249198 * param0) +static int ov6_02245840(UnkStruct_ov6_02249198 *param0) { VecFx32 v0; - GraphicElementData * v1 = param0->unk_58; + GraphicElementData *v1 = param0->unk_58; param0->unk_48 -= param0->unk_4C; @@ -2547,7 +2557,7 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0) } param0->unk_14.x = sub_0201D264(315) * ((param0->unk_48) / FX32_ONE); - param0->unk_14.y = sub_0201D250(((param0->unk_40) / FX32_ONE)) * ((param0->unk_48) / FX32_ONE); + param0->unk_14.y = sub_0201D250((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE); if (((param0->unk_40) / FX32_ONE) < 270) { param0->unk_40 += 0x4000; @@ -2572,7 +2582,7 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0) param0->unk_38 = (FX32_ONE * 360); } - sub_02021C94(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE))); + sub_02021C94(v1, sub_0201D2A4((param0->unk_38) / FX32_ONE)); v0.x = param0->unk_08.x + param0->unk_14.x; v0.y = param0->unk_08.y + param0->unk_14.y; @@ -2591,8 +2601,8 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0) } { - GraphicElementData * v2 = param0->unk_5C.unk_00->unk_248; - const VecFx32 * v3 = sub_02021D2C(v2); + GraphicElementData *v2 = param0->unk_5C.unk_00->unk_248; + const VecFx32 *v3 = sub_02021D2C(v2); VecFx32 v4 = *v3; v4.x += 0x80; @@ -2613,15 +2623,15 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0) return 0; } -static int ov6_022459B0 (UnkStruct_ov6_02249198 * param0) +static int ov6_022459B0(UnkStruct_ov6_02249198 *param0) { - GraphicElementData * v0 = param0->unk_5C.unk_00->unk_248; + GraphicElementData *v0 = param0->unk_5C.unk_00->unk_248; SpriteActor_SetSpriteAnimActive(v0, 3); { fx32 v1, v2; - const VecFx32 * v3 = sub_02021D28(v0); + const VecFx32 *v3 = sub_02021D28(v0); v1 = v3->y; v3 = sub_02021D28(param0->unk_58); @@ -2643,10 +2653,10 @@ static int ov6_022459B0 (UnkStruct_ov6_02249198 * param0) return 1; } -static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0) +static int ov6_02245A0C(UnkStruct_ov6_02249198 *param0) { VecFx32 v0; - GraphicElementData * v1 = param0->unk_58; + GraphicElementData *v1 = param0->unk_58; param0->unk_48 += param0->unk_4C; param0->unk_4C += 0x1000; @@ -2655,7 +2665,7 @@ static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0) param0->unk_4C = (FX32_ONE * 16); } - param0->unk_14.x = sub_0201D264(((param0->unk_40) / FX32_ONE)) * ((param0->unk_48) / FX32_ONE); + param0->unk_14.x = sub_0201D264((param0->unk_40) / FX32_ONE) * ((param0->unk_48) / FX32_ONE); param0->unk_14.y = sub_0201D250(128) * ((param0->unk_48) / FX32_ONE); if (param0->unk_40 < (FX32_ONE * 135)) { @@ -2682,8 +2692,8 @@ static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0) sub_02021C50(v1, &v0); { - GraphicElementData * v2 = param0->unk_5C.unk_00->unk_248; - const VecFx32 * v3 = sub_02021D2C(v2); + GraphicElementData *v2 = param0->unk_5C.unk_00->unk_248; + const VecFx32 *v3 = sub_02021D2C(v2); VecFx32 v4 = v0; VecFx32 v5 = *v3; @@ -2714,23 +2724,23 @@ static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0) return 0; } -static int ov6_02245B48 (UnkStruct_ov6_02249198 * param0) +static int ov6_02245B48(UnkStruct_ov6_02249198 *param0) { return 0; } -static int(*const Unk_ov6_022491EC[])(UnkStruct_ov6_02249198 *) = { +static int (*const Unk_ov6_022491EC[])(UnkStruct_ov6_02249198 *) = { ov6_02245840, ov6_022459B0, ov6_02245A0C, ov6_02245B48 }; -static UnkStruct_ov101_021D5D90 * ov6_02245B4C (UnkStruct_020711EC * param0, GraphicElementData * param1) +static UnkStruct_ov101_021D5D90 *ov6_02245B4C(UnkStruct_020711EC *param0, GraphicElementData *param1) { - UnkStruct_ov101_021D5D90 * v0; + UnkStruct_ov101_021D5D90 *v0; UnkStruct_ov6_02245B4C v1; - VecFx32 v2 = {0, 0, 0}; + VecFx32 v2 = { 0, 0, 0 }; v1.unk_04 = param1; v0 = sub_02071330(param0, &Unk_ov6_0224920C, &v2, 0, &v1, 129); @@ -2738,23 +2748,25 @@ static UnkStruct_ov101_021D5D90 * ov6_02245B4C (UnkStruct_020711EC * param0, Gra return v0; } -static void ov6_02245B74 (UnkStruct_ov101_021D5D90 * param0) +static void ov6_02245B74(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov6_02245B74 * v0 = sub_02071598(param0); + UnkStruct_ov6_02245B74 *v0 = sub_02071598(param0); v0->unk_00 = 0; } -static void ov6_02245B80 (UnkStruct_ov101_021D5D90 * param0) +static void ov6_02245B80(UnkStruct_ov101_021D5D90 *param0) { VecFx32 v0; - const VecFx32 * v1; - UnkStruct_ov6_02245B74 * v2 = sub_02071598(param0); + const VecFx32 *v1; + UnkStruct_ov6_02245B74 *v2 = sub_02071598(param0); v2->unk_00 = 1; v2->unk_04 = 0; v2->unk_0C = 0; v2->unk_08 = 0; - v2->unk_10.x = 0; v2->unk_10.y = 0; v2->unk_10.z = 0; + v2->unk_10.x = 0; + v2->unk_10.y = 0; + v2->unk_10.z = 0; v1 = sub_02021D28(v2->unk_20); v0 = *v1; @@ -2762,16 +2774,18 @@ static void ov6_02245B80 (UnkStruct_ov101_021D5D90 * param0) SpriteActor_SetSpriteAnimActive(v2->unk_20, 5); } -static void ov6_02245BC8 (UnkStruct_ov101_021D5D90 * param0) +static void ov6_02245BC8(UnkStruct_ov101_021D5D90 *param0) { VecFx32 v0; - UnkStruct_ov6_02245B74 * v1 = sub_02071598(param0); + UnkStruct_ov6_02245B74 *v1 = sub_02071598(param0); v1->unk_00 = 2; v1->unk_04 = 0; v1->unk_0C = 0; v1->unk_08 = 0; - v1->unk_10.x = 0; v1->unk_10.y = 0; v1->unk_10.z = 0; + v1->unk_10.x = 0; + v1->unk_10.y = 0; + v1->unk_10.z = 0; ov6_022437C8(v1->unk_20, &v0); @@ -2779,10 +2793,10 @@ static void ov6_02245BC8 (UnkStruct_ov101_021D5D90 * param0) SpriteActor_SetSpriteAnimActive(v1->unk_20, 4); } -static int ov6_02245C04 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov6_02245C04(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov6_02245B74 * v0 = param1; - const UnkStruct_ov6_02245B4C * v1 = sub_020715BC(param0); + UnkStruct_ov6_02245B74 *v0 = param1; + const UnkStruct_ov6_02245B4C *v1 = sub_020715BC(param0); v0->unk_1C = v1->unk_00; v0->unk_20 = v1->unk_04; @@ -2812,7 +2826,7 @@ static const fx32 Unk_ov6_022491FC[4] = { (FX32_ONE * -8) }; -static void ov6_02245C18 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov6_02245B74 * param1) +static void ov6_02245C18(UnkStruct_ov101_021D5D90 *param0, UnkStruct_ov6_02245B74 *param1) { VecFx32 v0; @@ -2832,7 +2846,7 @@ static void ov6_02245C18 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov6_02245 } } -static void ov6_02245C64 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov6_02245B74 * param1) +static void ov6_02245C64(UnkStruct_ov101_021D5D90 *param0, UnkStruct_ov6_02245B74 *param1) { VecFx32 v0; @@ -2852,9 +2866,9 @@ static void ov6_02245C64 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov6_02245 } } -static void ov6_02245CB0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov6_02245CB0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov6_02245B74 * v0 = param1; + UnkStruct_ov6_02245B74 *v0 = param1; switch (v0->unk_00) { case 1: @@ -2875,42 +2889,46 @@ static const UnkStruct_ov101_021D86B0 Unk_ov6_0224920C = { }; static const UnkStruct_ov101_021D86B0 dummy_field_cutin = { - sizeof(UnkStruct_ov100_021D4890), NULL, sub_02071600, NULL, sub_020715FC, + sizeof(UnkStruct_ov100_021D4890), + NULL, + sub_02071600, + NULL, + sub_020715FC, }; -int(*const Unk_ov6_02249270[])(UnkStruct_ov6_02249270 *); +int (*const Unk_ov6_02249270[])(UnkStruct_ov6_02249270 *); -SysTask * ov6_02245CCC (FieldSystem * fieldSystem, int param1) +SysTask *ov6_02245CCC(FieldSystem *fieldSystem, int param1) { - UnkStruct_ov6_02249270 * v0 = ov6_02245F44(4, (sizeof(UnkStruct_ov6_02249270))); + UnkStruct_ov6_02249270 *v0 = ov6_02245F44(4, (sizeof(UnkStruct_ov6_02249270))); v0->unk_0C = param1; v0->fieldSystem = fieldSystem; { - SysTask * v1 = SysTask_Start(ov6_02245D10, v0, 133); + SysTask *v1 = SysTask_Start(ov6_02245D10, v0, 133); return v1; } } -int ov6_02245CF0 (SysTask * param0) +int ov6_02245CF0(SysTask *param0) { - UnkStruct_ov6_02249270 * v0 = SysTask_GetParam(param0); + UnkStruct_ov6_02249270 *v0 = SysTask_GetParam(param0); return v0->unk_04; } -void ov6_02245CFC (SysTask * param0) +void ov6_02245CFC(SysTask *param0) { - UnkStruct_ov6_02249270 * v0 = SysTask_GetParam(param0); + UnkStruct_ov6_02249270 *v0 = SysTask_GetParam(param0); Heap_FreeToHeap(v0); SysTask_Done(param0); } -static void ov6_02245D10 (SysTask * param0, void * param1) +static void ov6_02245D10(SysTask *param0, void *param1) { int v0; - UnkStruct_ov6_02249270 * v1 = param1; + UnkStruct_ov6_02249270 *v1 = param1; while (Unk_ov6_02249270[v1->unk_00](v1) == 1) { (void)0; @@ -2927,20 +2945,20 @@ static void ov6_02245D10 (SysTask * param0, void * param1) } } -static int ov6_02245D48 (UnkStruct_ov6_02249270 * param0) +static int ov6_02245D48(UnkStruct_ov6_02249270 *param0) { ov6_02243F74(param0->fieldSystem, 1); param0->unk_00++; return 0; } -static int ov6_02245D60 (UnkStruct_ov6_02249270 * param0) +static int ov6_02245D60(UnkStruct_ov6_02249270 *param0) { param0->unk_1D4 = sub_020711EC(4, 32); ov6_02243258(¶m0->unk_18, 32, 2, 2, 2, 1, 4, 3, 4, 2); { - NARC * v0 = ov6_02243F20(); + NARC *v0 = ov6_02243F20(); ov6_022434B0(¶m0->unk_18, v0, 7, 0); ov6_02243588(¶m0->unk_18, v0, 3, 0); @@ -2977,7 +2995,7 @@ static int ov6_02245D60 (UnkStruct_ov6_02249270 * param0) return 0; } -static int ov6_02245EA4 (UnkStruct_ov6_02249270 * param0) +static int ov6_02245EA4(UnkStruct_ov6_02249270 *param0) { param0->unk_1D0 = ov6_02243848(¶m0->unk_18, param0->unk_0C); sub_02021CAC(param0->unk_1D0, 1); @@ -2991,7 +3009,7 @@ static int ov6_02245EA4 (UnkStruct_ov6_02249270 * param0) return 0; } -static int ov6_02245EEC (UnkStruct_ov6_02249270 * param0) +static int ov6_02245EEC(UnkStruct_ov6_02249270 *param0) { if (ov6_022438BC(param0->unk_1D8) != 2) { return 0; @@ -3003,7 +3021,7 @@ static int ov6_02245EEC (UnkStruct_ov6_02249270 * param0) return 0; } -static int ov6_02245F18 (UnkStruct_ov6_02249270 * param0) +static int ov6_02245F18(UnkStruct_ov6_02249270 *param0) { sub_0207121C(param0->unk_1D4); ov6_0224339C(¶m0->unk_18); @@ -3015,12 +3033,12 @@ static int ov6_02245F18 (UnkStruct_ov6_02249270 * param0) return 0; } -static int ov6_02245F40 (UnkStruct_ov6_02249270 * param0) +static int ov6_02245F40(UnkStruct_ov6_02249270 *param0) { return 0; } -static int(*const Unk_ov6_02249270[])(UnkStruct_ov6_02249270 *) = { +static int (*const Unk_ov6_02249270[])(UnkStruct_ov6_02249270 *) = { ov6_02245D48, ov6_02245D60, ov6_02245EA4, @@ -3029,9 +3047,9 @@ static int(*const Unk_ov6_02249270[])(UnkStruct_ov6_02249270 *) = { ov6_02245F40 }; -static void * ov6_02245F44 (u32 param0, int param1) +static void *ov6_02245F44(u32 param0, int param1) { - void * v0 = Heap_AllocFromHeapAtEnd(param0, param1); + void *v0 = Heap_AllocFromHeapAtEnd(param0, param1); GF_ASSERT(v0 != NULL); memset(v0, 0, param1); @@ -3039,28 +3057,28 @@ static void * ov6_02245F44 (u32 param0, int param1) return v0; } -static void ov6_02245F64 (UnkStruct_ov6_02243FFC * param0, int param1) +static void ov6_02245F64(UnkStruct_ov6_02243FFC *param0, int param1) { - MapObject * v0 = Player_MapObject(param0->fieldSystem->playerAvatar); + MapObject *v0 = Player_MapObject(param0->fieldSystem->playerAvatar); sub_02062DDC(v0); MapObject_SetHidden(v0, param1); } -static int ov6_02245F80 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov6_02245F80(UnkStruct_ov101_021D5D90 *param0, void *param1) { - const UnkStruct_ov6_02245F80 * v0 = sub_020715BC(param0); - UnkStruct_ov6_02245F80 * v1 = param1; + const UnkStruct_ov6_02245F80 *v0 = sub_020715BC(param0); + UnkStruct_ov6_02245F80 *v1 = param1; *v1 = *v0; return 1; } -static void ov6_02245F94 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov6_02245F94(UnkStruct_ov101_021D5D90 *param0, void *param1) { fx32 v0, v1, v2; - const VecFx32 * v3; - UnkStruct_ov6_02245F80 * v4 = param1; + const VecFx32 *v3; + UnkStruct_ov6_02245F80 *v4 = param1; v3 = sub_02021D28(v4->unk_00); v0 = v3->y; @@ -3086,9 +3104,9 @@ static const UnkStruct_ov101_021D86B0 Unk_ov6_02249234 = { sub_020715FC }; -static void ov6_02245FDC (UnkStruct_ov6_02243FFC * param0) +static void ov6_02245FDC(UnkStruct_ov6_02243FFC *param0) { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; UnkStruct_ov6_02245F80 v1; v1.unk_00 = param0->unk_248; @@ -3097,7 +3115,7 @@ static void ov6_02245FDC (UnkStruct_ov6_02243FFC * param0) param0->unk_254 = sub_02071330(param0->unk_244, &Unk_ov6_02249234, &v0, 0, &v1, 134); } -static void ov6_02246018 (UnkStruct_ov6_02243FFC * param0) +static void ov6_02246018(UnkStruct_ov6_02243FFC *param0) { if (param0->unk_254 != NULL) { sub_0207136C(param0->unk_254); @@ -3106,17 +3124,17 @@ static void ov6_02246018 (UnkStruct_ov6_02243FFC * param0) } static const UnkStruct_ov6_02249108 Unk_ov6_02249108[1] = { - {0x1, 0xA} + { 0x1, 0xA } }; static const UnkStruct_ov6_02249108 Unk_ov6_022490F8[1] = { - {0x0, 0x3} + { 0x0, 0x3 } }; static const UnkStruct_ov6_02249108 Unk_ov6_02249118[1] = { - {0x1, 0xB} + { 0x1, 0xB } }; static const UnkStruct_ov6_02249108 Unk_ov6_02249100[1] = { - {0x0, 0xC} + { 0x0, 0xC } }; diff --git a/src/overlay006/ov6_02246034.c b/src/overlay006/ov6_02246034.c index 0eb846cc36..b4f3dcdf7b 100644 --- a/src/overlay006/ov6_02246034.c +++ b/src/overlay006/ov6_02246034.c @@ -1,36 +1,35 @@ +#include "overlay006/ov6_02246034.h" + #include #include -#include "inlines.h" - -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_0202D7B0.h" -#include "field/field_system.h" #include "struct_defs/struct_0206C638.h" + +#include "field/field_system.h" #include "overlay006/battle_params.h" +#include "inlines.h" +#include "party.h" +#include "pokemon.h" +#include "roaming_pokemon.h" #include "unk_0202D7A8.h" -#include "vars_flags.h" #include "unk_0206AFE0.h" -#include "roaming_pokemon.h" -#include "pokemon.h" -#include "party.h" -#include "overlay006/ov6_02246034.h" +#include "vars_flags.h" -static void ov6_02246110(UnkStruct_0202D7B0 * param0, const int param1); -static UnkStruct_0206C638 * ov6_02246148(UnkStruct_0202D7B0 * param0, const int param1); +static void ov6_02246110(UnkStruct_0202D7B0 *param0, const int param1); +static UnkStruct_0206C638 *ov6_02246148(UnkStruct_0202D7B0 *param0, const int param1); -void ov6_02246034 (FieldSystem * fieldSystem, BattleParams * param1) +void ov6_02246034(FieldSystem *fieldSystem, BattleParams *param1) { u16 v0; u8 v1; int v2; - UnkStruct_0202D7B0 * v3; - UnkStruct_0206C638 * v4; - Party * v5; - Pokemon * v6; + UnkStruct_0202D7B0 *v3; + UnkStruct_0206C638 *v4; + Party *v5; + Pokemon *v6; v5 = param1->parties[1]; v6 = Party_GetPokemonBySlotIndex(v5, 0); @@ -42,7 +41,7 @@ void ov6_02246034 (FieldSystem * fieldSystem, BattleParams * param1) v0 = (u16)(Pokemon_GetValue(v6, MON_DATA_CURRENT_HP, NULL)); v1 = (u8)(Pokemon_GetValue(v6, MON_DATA_STATUS_CONDITION, NULL)); - if (((param1->unk_14 == 0x1) && (v0 == 0))) { + if ((param1->unk_14 == 0x1) && (v0 == 0)) { sub_0202D914(&v4); sub_0206B688(SaveData_GetVarsFlags(fieldSystem->saveData), v2, 2); } else if (param1->unk_14 == 0x4) { @@ -61,7 +60,7 @@ void ov6_02246034 (FieldSystem * fieldSystem, BattleParams * param1) } } -static void ov6_02246110 (UnkStruct_0202D7B0 * param0, const int param1) +static void ov6_02246110(UnkStruct_0202D7B0 *param0, const int param1) { int v0; u8 v1; @@ -77,10 +76,10 @@ static void ov6_02246110 (UnkStruct_0202D7B0 * param0, const int param1) } } -static UnkStruct_0206C638 * ov6_02246148 (UnkStruct_0202D7B0 * param0, const int param1) +static UnkStruct_0206C638 *ov6_02246148(UnkStruct_0202D7B0 *param0, const int param1) { u8 v0; - UnkStruct_0206C638 * v1; + UnkStruct_0206C638 *v1; for (v0 = 0; v0 < 6; v0++) { if (sub_0202D8F8(param0, v0)) { diff --git a/src/overlay006/ov6_02246184.c b/src/overlay006/ov6_02246184.c index 6dfc3f152a..1c7d25b848 100644 --- a/src/overlay006/ov6_02246184.c +++ b/src/overlay006/ov6_02246184.c @@ -1,25 +1,26 @@ +#include "overlay006/ov6_02246184.h" + #include #include #include "struct_decls/struct_party_decl.h" -#include "overlay006/struct_ov6_02246204_decl.h" #include "field/field_system.h" +#include "overlay006/struct_ov6_02246204_decl.h" #include "overlay006/struct_ov6_02246254.h" -#include "unk_02006E3C.h" -#include "message.h" #include "heap.h" +#include "map_header.h" +#include "message.h" +#include "party.h" +#include "pokemon.h" #include "strbuf.h" -#include "unk_02025E08.h" #include "trainer_info.h" +#include "unk_02006E3C.h" +#include "unk_02025E08.h" #include "unk_0202F180.h" -#include "map_header.h" #include "unk_020559DC.h" -#include "pokemon.h" -#include "party.h" #include "unk_02092494.h" -#include "overlay006/ov6_02246184.h" typedef struct { u32 unk_00; @@ -45,20 +46,20 @@ typedef struct { } UnkStruct_ov6_0224630C; typedef struct UnkStruct_ov6_02246204_t { - UnkStruct_ov6_0224630C * unk_00; - Pokemon * unk_04; - TrainerInfo * unk_08; + UnkStruct_ov6_0224630C *unk_00; + Pokemon *unk_04; + TrainerInfo *unk_08; u32 unk_0C; u32 unk_10; }; -static Strbuf* ov6_022462E4(u32 param0, u32 param1); -static void ov6_0224630C(Pokemon * param0, UnkStruct_ov6_0224630C * param1, u32 param2, u32 param3, u32 param4, u32 param5); +static Strbuf *ov6_022462E4(u32 param0, u32 param1); +static void ov6_0224630C(Pokemon *param0, UnkStruct_ov6_0224630C *param1, u32 param2, u32 param3, u32 param4, u32 param5); -UnkStruct_ov6_02246204 * ov6_02246184 (u32 param0, u32 param1) +UnkStruct_ov6_02246204 *ov6_02246184(u32 param0, u32 param1) { - UnkStruct_ov6_02246204 * v0; - Strbuf* v1; + UnkStruct_ov6_02246204 *v0; + Strbuf *v1; u16 v2[128]; GF_ASSERT(param1 < 4); @@ -83,7 +84,7 @@ UnkStruct_ov6_02246204 * ov6_02246184 (u32 param0, u32 param1) return v0; } -void ov6_02246204 (UnkStruct_ov6_02246204 * param0) +void ov6_02246204(UnkStruct_ov6_02246204 *param0) { Heap_FreeToHeap(param0->unk_00); Heap_FreeToHeap(param0->unk_04); @@ -91,29 +92,29 @@ void ov6_02246204 (UnkStruct_ov6_02246204 * param0) Heap_FreeToHeap(param0); } -u32 ov6_02246224 (const UnkStruct_ov6_02246204 * param0) +u32 ov6_02246224(const UnkStruct_ov6_02246204 *param0) { return param0->unk_00->unk_00; } -u32 ov6_0224622C (const UnkStruct_ov6_02246204 * param0) +u32 ov6_0224622C(const UnkStruct_ov6_02246204 *param0) { return param0->unk_00->unk_4C; } -void ov6_02246234 (FieldSystem * fieldSystem, UnkStruct_ov6_02246204 * param1, int param2) +void ov6_02246234(FieldSystem *fieldSystem, UnkStruct_ov6_02246204 *param1, int param2) { - Party * v0 = Party_GetFromSavedata(fieldSystem->saveData); + Party *v0 = Party_GetFromSavedata(fieldSystem->saveData); sub_0207A128(v0, param2, param1->unk_04); sub_0202F180(fieldSystem->saveData, param1->unk_04); } -void ov6_02246254 (FieldSystem * fieldSystem, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, Pokemon * param4, Pokemon * param5) +void ov6_02246254(FieldSystem *fieldSystem, UnkStruct_ov6_02246204 *param1, int param2, UnkStruct_ov6_02246254 *param3, Pokemon *param4, Pokemon *param5) { - Party * v0 = Party_GetFromSavedata(fieldSystem->saveData); - Pokemon * v1; - Strbuf* v2; + Party *v0 = Party_GetFromSavedata(fieldSystem->saveData); + Pokemon *v1; + Strbuf *v2; u32 v3; int v4; @@ -142,19 +143,19 @@ void ov6_02246254 (FieldSystem * fieldSystem, UnkStruct_ov6_02246204 * param1, i } } -static Strbuf* ov6_022462E4 (u32 fieldSystem, u32 param1) +static Strbuf *ov6_022462E4(u32 fieldSystem, u32 param1) { - Strbuf* v0; - MessageLoader * v1 = MessageLoader_Init(0, 26, 370, fieldSystem); + Strbuf *v0; + MessageLoader *v1 = MessageLoader_Init(0, 26, 370, fieldSystem); v0 = MessageLoader_GetNewStrbuf(v1, param1); MessageLoader_Free(v1); return v0; } -static void ov6_0224630C (Pokemon * param0, UnkStruct_ov6_0224630C * param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov6_0224630C(Pokemon *param0, UnkStruct_ov6_0224630C *param1, u32 param2, u32 param3, u32 param4, u32 param5) { - Strbuf* v0; + Strbuf *v0; u8 v1; u32 v2; diff --git a/src/overlay006/ov6_02246444.c b/src/overlay006/ov6_02246444.c index 9da21062ce..48bb48203a 100644 --- a/src/overlay006/ov6_02246444.c +++ b/src/overlay006/ov6_02246444.c @@ -1,22 +1,22 @@ +#include "overlay006/ov6_02246444.h" + #include #include #include "struct_decls/struct_0202440C_decl.h" -#include "trainer_info.h" #include "struct_decls/struct_0202E4D4_decl.h" #include "struct_decls/struct_0202E768_decl.h" #include "struct_decls/struct_0202E794_decl.h" -#include "overlay006/struct_ov6_022465F4_decl.h" #include "field/field_system.h" +#include "overlay006/struct_ov6_022465F4_decl.h" +#include "savedata/save_table.h" -#include "unk_020021B0.h" #include "heap.h" -#include "savedata/save_table.h" -#include "unk_02025E08.h" #include "trainer_info.h" +#include "unk_020021B0.h" +#include "unk_02025E08.h" #include "unk_0202E2CC.h" -#include "overlay006/ov6_02246444.h" struct UnkStruct_ov6_022465F4_t { u8 unk_00; @@ -24,75 +24,75 @@ struct UnkStruct_ov6_022465F4_t { u8 unk_02; u8 unk_03; u16 unk_04[8]; - UnkStruct_0202E4D4 * unk_14; + UnkStruct_0202E4D4 *unk_14; }; -static void ov6_02246444 (UnkStruct_ov6_022465F4 * param0) +static void ov6_02246444(UnkStruct_ov6_022465F4 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_ov6_022465F4)); } -static void ov6_02246450 (UnkStruct_ov6_022465F4 * param0, int param1) +static void ov6_02246450(UnkStruct_ov6_022465F4 *param0, int param1) { param0->unk_03 = param1; } -static void ov6_02246454 (UnkStruct_ov6_022465F4 * param0, int param1) +static void ov6_02246454(UnkStruct_ov6_022465F4 *param0, int param1) { param0->unk_02 = param1; } -static void ov6_02246458 (UnkStruct_ov6_022465F4 * param0, int param1) +static void ov6_02246458(UnkStruct_ov6_022465F4 *param0, int param1) { param0->unk_01 = param1; } -static void ov6_0224645C (UnkStruct_ov6_022465F4 * param0, const u16 * param1) +static void ov6_0224645C(UnkStruct_ov6_022465F4 *param0, const u16 *param1) { sub_020021D0(param0->unk_04, param1, 7 + 1); } -static void ov6_02246468 (UnkStruct_ov6_022465F4 * param0, UnkStruct_0202E4D4 * param1) +static void ov6_02246468(UnkStruct_ov6_022465F4 *param0, UnkStruct_0202E4D4 *param1) { param0->unk_00 = sub_0202E55C(param1); param0->unk_14 = param1; } -void ov6_0224647C (UnkStruct_ov6_022465F4 * param0) +void ov6_0224647C(UnkStruct_ov6_022465F4 *param0) { if (param0->unk_14 != NULL) { sub_0202E560(param0->unk_14); } } -int ov6_0224648C (const UnkStruct_ov6_022465F4 * param0) +int ov6_0224648C(const UnkStruct_ov6_022465F4 *param0) { return param0->unk_03; } -int ov6_02246490 (const UnkStruct_ov6_022465F4 * param0) +int ov6_02246490(const UnkStruct_ov6_022465F4 *param0) { return param0->unk_02; } -const u16 * ov6_02246494 (const UnkStruct_ov6_022465F4 * param0) +const u16 *ov6_02246494(const UnkStruct_ov6_022465F4 *param0) { return param0->unk_04; } -void * ov6_02246498 (UnkStruct_ov6_022465F4 * param0) +void *ov6_02246498(UnkStruct_ov6_022465F4 *param0) { return sub_0202E574(param0->unk_14); } -int ov6_022464A4 (const UnkStruct_ov6_022465F4 * param0) +int ov6_022464A4(const UnkStruct_ov6_022465F4 *param0) { return param0->unk_00; } -static UnkStruct_ov6_022465F4 * ov6_022464A8 (FieldSystem * fieldSystem, UnkStruct_0202E794 * param1) +static UnkStruct_ov6_022465F4 *ov6_022464A8(FieldSystem *fieldSystem, UnkStruct_0202E794 *param1) { - UnkStruct_ov6_022465F4 * v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4)); + UnkStruct_ov6_022465F4 *v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4)); ov6_02246444(v0); ov6_0224645C(v0, sub_0202E4C8(param1)); @@ -103,10 +103,10 @@ static UnkStruct_ov6_022465F4 * ov6_022464A8 (FieldSystem * fieldSystem, UnkStru return v0; } -static UnkStruct_ov6_022465F4 * ov6_022464F8 (FieldSystem * fieldSystem, UnkStruct_0202E768 * param1) +static UnkStruct_ov6_022465F4 *ov6_022464F8(FieldSystem *fieldSystem, UnkStruct_0202E768 *param1) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); - UnkStruct_ov6_022465F4 * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4)); + TrainerInfo *v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); + UnkStruct_ov6_022465F4 *v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4)); ov6_02246444(v1); ov6_0224645C(v1, TrainerInfo_Name(v0)); @@ -118,10 +118,10 @@ static UnkStruct_ov6_022465F4 * ov6_022464F8 (FieldSystem * fieldSystem, UnkStru return v1; } -static UnkStruct_ov6_022465F4 * ov6_02246550 (FieldSystem * fieldSystem, int param1) +static UnkStruct_ov6_022465F4 *ov6_02246550(FieldSystem *fieldSystem, int param1) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); - UnkStruct_ov6_022465F4 * v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4)); + TrainerInfo *v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); + UnkStruct_ov6_022465F4 *v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov6_022465F4)); ov6_02246444(v1); v1->unk_00 = param1; @@ -134,24 +134,24 @@ static UnkStruct_ov6_022465F4 * ov6_02246550 (FieldSystem * fieldSystem, int par return v1; } -UnkStruct_ov6_022465F4 * ov6_022465A0 (FieldSystem * fieldSystem, int param1, int param2) +UnkStruct_ov6_022465F4 *ov6_022465A0(FieldSystem *fieldSystem, int param1, int param2) { - TVBroadcast * v0 = SaveData_TVBroadcast(fieldSystem->saveData); + TVBroadcast *v0 = SaveData_TVBroadcast(fieldSystem->saveData); if ((param1 == 4) || (param1 == 5)) { return ov6_02246550(fieldSystem, param2); } if (sub_0202E7C0(param2) == 0) { - UnkStruct_0202E794 * v1 = sub_0202E794(v0, param1, param2); + UnkStruct_0202E794 *v1 = sub_0202E794(v0, param1, param2); return ov6_022464A8(fieldSystem, v1); } else { - UnkStruct_0202E768 * v2 = sub_0202E768(v0, param1, param2); + UnkStruct_0202E768 *v2 = sub_0202E768(v0, param1, param2); return ov6_022464F8(fieldSystem, v2); } } -void ov6_022465F4 (UnkStruct_ov6_022465F4 * param0) +void ov6_022465F4(UnkStruct_ov6_022465F4 *param0) { Heap_FreeToHeap(param0); } diff --git a/src/overlay006/ov6_022465FC.c b/src/overlay006/ov6_022465FC.c index 77db655091..405657c7a8 100644 --- a/src/overlay006/ov6_022465FC.c +++ b/src/overlay006/ov6_022465FC.c @@ -1,20 +1,21 @@ +#include "overlay006/ov6_022465FC.h" + #include #include #include "struct_decls/struct_0202440C_decl.h" -#include "overlay006/struct_ov6_022465F4_decl.h" #include "field/field_system.h" +#include "overlay006/ov6_02246444.h" +#include "overlay006/struct_ov6_022465F4_decl.h" +#include "savedata/save_table.h" #include "narc.h" #include "rtc.h" #include "unk_0201D15C.h" -#include "savedata/save_table.h" #include "unk_0202E2CC.h" #include "unk_020559DC.h" #include "unk_0206CCB0.h" -#include "overlay006/ov6_02246444.h" -#include "overlay006/ov6_022465FC.h" typedef struct { u8 unk_00; @@ -27,27 +28,27 @@ typedef struct { } UnkStruct_ov6_02249470; static const UnkStruct_ov6_02249470 Unk_ov6_02249470[] = { - {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6}, - {0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD}, - {0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14}, - {0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B}, - {0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22}, - {0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29}, - {0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30}, - {0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37}, - {0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E} + { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6 }, + { 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD }, + { 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14 }, + { 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B }, + { 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22 }, + { 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29 }, + { 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30 }, + { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37 }, + { 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E } }; -void ov6_022465FC (FieldSystem * fieldSystem) +void ov6_022465FC(FieldSystem *fieldSystem) { - TVBroadcast * v0 = SaveData_TVBroadcast(fieldSystem->saveData); + TVBroadcast *v0 = SaveData_TVBroadcast(fieldSystem->saveData); sub_0202E374(v0, 1); } -int ov6_0224660C (FieldSystem * fieldSystem) +int ov6_0224660C(FieldSystem *fieldSystem) { int v0; - TVBroadcast * v1 = SaveData_TVBroadcast(fieldSystem->saveData); + TVBroadcast *v1 = SaveData_TVBroadcast(fieldSystem->saveData); if (sub_0202E380(v1) == 1) { return 0; @@ -66,7 +67,7 @@ int ov6_0224660C (FieldSystem * fieldSystem) return 3; } -static int ov6_0224663C (FieldSystem * fieldSystem) +static int ov6_0224663C(FieldSystem *fieldSystem) { u8 v0; u8 v1[7]; @@ -85,7 +86,7 @@ static int ov6_0224663C (FieldSystem * fieldSystem) return v0; } -static int ov6_0224669C (int param0) +static int ov6_0224669C(int param0) { u8 v0; int v1 = (1 + 11) * (param0 - 1); @@ -96,7 +97,7 @@ static int ov6_0224669C (int param0) return v0; } -static void ov6_022466C8 (int param0, u8 * param1) +static void ov6_022466C8(int param0, u8 *param1) { u8 v0; int v1 = (1 + 11) * (param0 - 1) + 1; @@ -104,16 +105,16 @@ static void ov6_022466C8 (int param0, u8 * param1) NARC_ReadFromMemberByIndexPair(param1, NARC_INDEX_ARC__TV, 1, v1, sizeof(u8) * 11); } -static BOOL ov6_022466E8 (FieldSystem * fieldSystem, int param1, int param2) +static BOOL ov6_022466E8(FieldSystem *fieldSystem, int param1, int param2) { return 1; } -static void ov6_022466EC (int param0, FieldSystem * fieldSystem, u8 * param2) +static void ov6_022466EC(int param0, FieldSystem *fieldSystem, u8 *param2) { u8 v0[11]; int v1, v2; - TVBroadcast * v3 = SaveData_TVBroadcast(fieldSystem->saveData); + TVBroadcast *v3 = SaveData_TVBroadcast(fieldSystem->saveData); ov6_022466C8(param0, v0); MI_CpuClear8(param2, sizeof(u8) * 11); @@ -130,7 +131,7 @@ static void ov6_022466EC (int param0, FieldSystem * fieldSystem, u8 * param2) } } -static int ov6_0224673C (FieldSystem * fieldSystem, const u8 * param1) +static int ov6_0224673C(FieldSystem *fieldSystem, const u8 *param1) { u8 v0[11]; int v1, v2; @@ -153,7 +154,7 @@ static int ov6_0224673C (FieldSystem * fieldSystem, const u8 * param1) return v0[MTRNG_Next() % v2]; } -static int ov6_0224678C (TVBroadcast * param0, int param1, int param2, BOOL param3, BOOL param4, u8 * param5) +static int ov6_0224678C(TVBroadcast *param0, int param1, int param2, BOOL param3, BOOL param4, u8 *param5) { if ((param1 != 4) && (param1 != 5)) { return sub_0202E614(param0, param1, param2, param3, param4, param5); @@ -175,10 +176,10 @@ static int ov6_0224678C (TVBroadcast * param0, int param1, int param2, BOOL para return 0; } -static int ov6_022467DC (int param0, FieldSystem * fieldSystem, BOOL param2, BOOL param3, const u8 * param4, u8 * param5) +static int ov6_022467DC(int param0, FieldSystem *fieldSystem, BOOL param2, BOOL param3, const u8 *param4, u8 *param5) { u8 v0[16]; - TVBroadcast * v1 = SaveData_TVBroadcast(fieldSystem->saveData); + TVBroadcast *v1 = SaveData_TVBroadcast(fieldSystem->saveData); int v2, v3; int v4 = 0; @@ -198,10 +199,10 @@ static int ov6_022467DC (int param0, FieldSystem * fieldSystem, BOOL param2, BOO return v4; } -static void ov6_02246844 (FieldSystem * fieldSystem, int param1, u8 * param2) +static void ov6_02246844(FieldSystem *fieldSystem, int param1, u8 *param2) { int v0; - UnkStruct_ov6_022465F4 * v1; + UnkStruct_ov6_022465F4 *v1; for (v0 = 0; *param2 != 0 && v0 < 16; param2++, v0++) { v1 = ov6_022465A0(fieldSystem, param1, *param2); @@ -214,9 +215,9 @@ static void ov6_02246844 (FieldSystem * fieldSystem, int param1, u8 * param2) } } -static void ov6_02246884 (FieldSystem * fieldSystem, u8 * param1) +static void ov6_02246884(FieldSystem *fieldSystem, u8 *param1) { - TVBroadcast * v0 = SaveData_TVBroadcast(fieldSystem->saveData); + TVBroadcast *v0 = SaveData_TVBroadcast(fieldSystem->saveData); while (*param1 != 0) { if (sub_0202E3C4(v0, *param1)) { @@ -227,7 +228,7 @@ static void ov6_02246884 (FieldSystem * fieldSystem, u8 * param1) } } -int ov6_022468B0 (FieldSystem * fieldSystem, BOOL param1, BOOL param2) +int ov6_022468B0(FieldSystem *fieldSystem, BOOL param1, BOOL param2) { u8 v0[11]; u8 v1[16]; @@ -257,7 +258,7 @@ int ov6_022468B0 (FieldSystem * fieldSystem, BOOL param1, BOOL param2) return v2; } -int ov6_02246920 (FieldSystem * fieldSystem) +int ov6_02246920(FieldSystem *fieldSystem) { int v0; @@ -283,7 +284,7 @@ int ov6_02246920 (FieldSystem * fieldSystem) return v0; } -static const UnkStruct_ov6_02249470 * ov6_02246958 (FieldSystem * fieldSystem) +static const UnkStruct_ov6_02249470 *ov6_02246958(FieldSystem *fieldSystem) { int v0 = ov6_0224663C(fieldSystem); @@ -291,10 +292,10 @@ static const UnkStruct_ov6_02249470 * ov6_02246958 (FieldSystem * fieldSystem) return &Unk_ov6_02249470[v0 - 1]; } -int ov6_02246978 (FieldSystem * fieldSystem, int param1) +int ov6_02246978(FieldSystem *fieldSystem, int param1) { - TVBroadcast * v0 = SaveData_TVBroadcast(fieldSystem->saveData); - const UnkStruct_ov6_02249470 * v1 = ov6_02246958(fieldSystem); + TVBroadcast *v0 = SaveData_TVBroadcast(fieldSystem->saveData); + const UnkStruct_ov6_02249470 *v1 = ov6_02246958(fieldSystem); switch (param1) { default: @@ -321,12 +322,12 @@ int ov6_02246978 (FieldSystem * fieldSystem, int param1) } } -BOOL ov6_022469E0 (FieldSystem * fieldSystem, StringTemplate * param1, int param2, u16 * param3, u16 * param4) +BOOL ov6_022469E0(FieldSystem *fieldSystem, StringTemplate *param1, int param2, u16 *param3, u16 *param4) { int v0 = ov6_0224663C(fieldSystem); int v1 = ov6_0224669C(v0); - TVBroadcast * v2 = SaveData_TVBroadcast(fieldSystem->saveData); - UnkStruct_ov6_022465F4 * v3; + TVBroadcast *v2 = SaveData_TVBroadcast(fieldSystem->saveData); + UnkStruct_ov6_022465F4 *v3; sub_0202E384(v2, param2); diff --git a/src/overlay006/ov6_02246A30.c b/src/overlay006/ov6_02246A30.c index 69bf513e54..1e921ec5c9 100644 --- a/src/overlay006/ov6_02246A30.c +++ b/src/overlay006/ov6_02246A30.c @@ -1,35 +1,34 @@ +#include "overlay006/ov6_02246A30.h" + #include #include -#include "inlines.h" - -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" #include "field/field_system.h" +#include "inlines.h" +#include "trainer_info.h" #include "unk_0201D15C.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" -#include "vars_flags.h" #include "unk_0206A8DC.h" -#include "overlay006/ov6_02246A30.h" +#include "vars_flags.h" -typedef BOOL (* UnkStruct_ov6_022494B0)(FieldSystem *); - -static BOOL ov6_02246A30(FieldSystem * fieldSystem); -static BOOL ov6_02246A34(FieldSystem * fieldSystem); -static BOOL ov6_02246A38(FieldSystem * fieldSystem); -static BOOL ov6_02246A4C(FieldSystem * fieldSystem); -static BOOL ov6_02246A60(FieldSystem * fieldSystem); -static BOOL ov6_02246A74(FieldSystem * fieldSystem); -static BOOL ov6_02246A88(FieldSystem * fieldSystem); -static BOOL ov6_02246A9C(FieldSystem * fieldSystem); -static BOOL ov6_02246AB0(FieldSystem * fieldSystem); -static BOOL ov6_02246AC8(FieldSystem * fieldSystem); -static BOOL ov6_02246AD8(FieldSystem * fieldSystem); -static BOOL ov6_02246AE8(FieldSystem * fieldSystem); +typedef BOOL (*UnkStruct_ov6_022494B0)(FieldSystem *); + +static BOOL ov6_02246A30(FieldSystem *fieldSystem); +static BOOL ov6_02246A34(FieldSystem *fieldSystem); +static BOOL ov6_02246A38(FieldSystem *fieldSystem); +static BOOL ov6_02246A4C(FieldSystem *fieldSystem); +static BOOL ov6_02246A60(FieldSystem *fieldSystem); +static BOOL ov6_02246A74(FieldSystem *fieldSystem); +static BOOL ov6_02246A88(FieldSystem *fieldSystem); +static BOOL ov6_02246A9C(FieldSystem *fieldSystem); +static BOOL ov6_02246AB0(FieldSystem *fieldSystem); +static BOOL ov6_02246AC8(FieldSystem *fieldSystem); +static BOOL ov6_02246AD8(FieldSystem *fieldSystem); +static BOOL ov6_02246AE8(FieldSystem *fieldSystem); static const UnkStruct_ov6_022494B0 Unk_ov6_022494B0[] = { ov6_02246A30, @@ -84,55 +83,55 @@ static u8 Unk_ov6_02249878[] = { 0x3 }; -static BOOL ov6_02246A30 (FieldSystem * fieldSystem) +static BOOL ov6_02246A30(FieldSystem *fieldSystem) { return 1; } -static BOOL ov6_02246A34 (FieldSystem * fieldSystem) +static BOOL ov6_02246A34(FieldSystem *fieldSystem) { return 0; } -static BOOL ov6_02246A38 (FieldSystem * fieldSystem) +static BOOL ov6_02246A38(FieldSystem *fieldSystem) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 7); } -static BOOL ov6_02246A4C (FieldSystem * fieldSystem) +static BOOL ov6_02246A4C(FieldSystem *fieldSystem) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 2); } -static BOOL ov6_02246A60 (FieldSystem * fieldSystem) +static BOOL ov6_02246A60(FieldSystem *fieldSystem) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 9); } -static BOOL ov6_02246A74 (FieldSystem * fieldSystem) +static BOOL ov6_02246A74(FieldSystem *fieldSystem) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 10); } -static BOOL ov6_02246A88 (FieldSystem * fieldSystem) +static BOOL ov6_02246A88(FieldSystem *fieldSystem) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 11); } -static BOOL ov6_02246A9C (FieldSystem * fieldSystem) +static BOOL ov6_02246A9C(FieldSystem *fieldSystem) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 17); } -static BOOL ov6_02246AB0 (FieldSystem * fieldSystem) +static BOOL ov6_02246AB0(FieldSystem *fieldSystem) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); + TrainerInfo *v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); if (TrainerInfo_BadgeCount(v0) >= 5) { return 1; @@ -141,25 +140,25 @@ static BOOL ov6_02246AB0 (FieldSystem * fieldSystem) } } -static BOOL ov6_02246AC8 (FieldSystem * fieldSystem) +static BOOL ov6_02246AC8(FieldSystem *fieldSystem) { - PokedexData * v0 = SaveData_Pokedex(fieldSystem->saveData); + PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); return sub_02026F0C(v0); } -static BOOL ov6_02246AD8 (FieldSystem * fieldSystem) +static BOOL ov6_02246AD8(FieldSystem *fieldSystem) { - PokedexData * v0 = SaveData_Pokedex(fieldSystem->saveData); + PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); return sub_02027520(v0); } -static BOOL ov6_02246AE8 (FieldSystem * fieldSystem) +static BOOL ov6_02246AE8(FieldSystem *fieldSystem) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return sub_0206A954(v0); } -static int ov6_02246AF8 (FieldSystem * fieldSystem, u8 * param1) +static int ov6_02246AF8(FieldSystem *fieldSystem, u8 *param1) { int v0, v1; BOOL v2[NELEMS(Unk_ov6_022494B0)]; @@ -180,7 +179,7 @@ static int ov6_02246AF8 (FieldSystem * fieldSystem, u8 * param1) return v1; } -int ov6_02246B40 (FieldSystem * fieldSystem) +int ov6_02246B40(FieldSystem *fieldSystem) { u8 v0[36]; int v1; diff --git a/src/overlay006/ov6_02246B74.c b/src/overlay006/ov6_02246B74.c index 3334ce3da2..da6a90e6fc 100644 --- a/src/overlay006/ov6_02246B74.c +++ b/src/overlay006/ov6_02246B74.c @@ -1,12 +1,13 @@ +#include "overlay006/ov6_02246B74.h" + #include #include #include "rtc.h" -#include "overlay006/ov6_02246B74.h" typedef struct { int unk_00; - const u16 * unk_04; + const u16 *unk_04; } UnkStruct_ov6_0224954C; static const u16 Unk_ov6_02249522[4] = { @@ -89,18 +90,18 @@ static const u16 Unk_ov6_022494E2[3] = { }; static const UnkStruct_ov6_0224954C Unk_ov6_0224954C[12] = { - {0x4, Unk_ov6_02249522}, - {0x4, Unk_ov6_02249502}, - {0x3, Unk_ov6_022494F4}, - {0x4, Unk_ov6_0224951A}, - {0x4, Unk_ov6_0224950A}, - {0x1, Unk_ov6_022494E0}, - {0x3, Unk_ov6_022494E8}, - {0x4, Unk_ov6_022494FA}, - {0x6, Unk_ov6_0224952A}, - {0x3, Unk_ov6_022494EE}, - {0x4, Unk_ov6_02249512}, - {0x3, Unk_ov6_022494E2} + { 0x4, Unk_ov6_02249522 }, + { 0x4, Unk_ov6_02249502 }, + { 0x3, Unk_ov6_022494F4 }, + { 0x4, Unk_ov6_0224951A }, + { 0x4, Unk_ov6_0224950A }, + { 0x1, Unk_ov6_022494E0 }, + { 0x3, Unk_ov6_022494E8 }, + { 0x4, Unk_ov6_022494FA }, + { 0x6, Unk_ov6_0224952A }, + { 0x3, Unk_ov6_022494EE }, + { 0x4, Unk_ov6_02249512 }, + { 0x3, Unk_ov6_022494E2 } }; static const int Unk_ov6_02249538[] = { @@ -111,12 +112,12 @@ static const int Unk_ov6_02249538[] = { 0xA }; -int ov6_02246B74 (const int param0, const BOOL param1) +int ov6_02246B74(const int param0, const BOOL param1) { u8 v0; int v1; RTCDate v2; - const UnkStruct_ov6_0224954C * v3; + const UnkStruct_ov6_0224954C *v3; if (param1) { return param0; diff --git a/src/overlay006/ov6_02246BF4.c b/src/overlay006/ov6_02246BF4.c index ffc70e61ba..a4206e3fd2 100644 --- a/src/overlay006/ov6_02246BF4.c +++ b/src/overlay006/ov6_02246BF4.c @@ -1,16 +1,17 @@ +#include "overlay006/ov6_02246BF4.h" + #include #include #include "field/field_system_decl.h" -#include "savedata.h" +#include "savedata.h" #include "unk_0202D7A8.h" #include "unk_0203E880.h" -#include "overlay006/ov6_02246BF4.h" -BOOL ov6_02246BF4 (SaveData * param0, FieldSystem * fieldSystem) +BOOL ov6_02246BF4(SaveData *param0, FieldSystem *fieldSystem) { - u8 * v0; + u8 *v0; v0 = sub_0202D9CC(sub_0202D834(param0)); diff --git a/src/overlay006/ov6_02246C24.c b/src/overlay006/ov6_02246C24.c index ecc8ff95ab..c3dd96b71f 100644 --- a/src/overlay006/ov6_02246C24.c +++ b/src/overlay006/ov6_02246C24.c @@ -1,20 +1,21 @@ +#include "overlay006/ov6_02246C24.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" -#include "overlay005/struct_ov5_021E1890_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021EF75C.h" +#include "overlay005/struct_ov5_021E1890_decl.h" -#include "unk_02005474.h" #include "heap.h" +#include "unk_02005474.h" #include "unk_02039C80.h" #include "unk_020508D4.h" #include "unk_02054D00.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021EF75C.h" -#include "overlay006/ov6_02246C24.h" typedef struct { VecFx32 unk_00; @@ -25,28 +26,28 @@ typedef struct { u8 unk_10[6]; } UnkStruct_ov6_02246C24; -static BOOL ov6_02246C9C(TaskManager * param0); +static BOOL ov6_02246C9C(TaskManager *param0); static VecFx32 Unk_ov6_0224989C[6] = { - {-((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, -((FX32_ONE * 4) + (FX32_ONE / 2))}, - {((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, -((FX32_ONE * 4) + (FX32_ONE / 2))}, - {-((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, 0x0}, - {((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, 0x0}, - {-((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, ((FX32_ONE * 4) + (FX32_ONE / 2))}, - {((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, ((FX32_ONE * 4) + (FX32_ONE / 2))} + { -((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, -((FX32_ONE * 4) + (FX32_ONE / 2)) }, + { ((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, -((FX32_ONE * 4) + (FX32_ONE / 2)) }, + { -((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, 0x0 }, + { ((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, 0x0 }, + { -((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, ((FX32_ONE * 4) + (FX32_ONE / 2)) }, + { ((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, ((FX32_ONE * 4) + (FX32_ONE / 2)) } }; -void ov6_02246C24 (FieldSystem * fieldSystem, const u8 param1) +void ov6_02246C24(FieldSystem *fieldSystem, const u8 param1) { BOOL v0; - UnkStruct_ov5_021E1890 * v1; + UnkStruct_ov5_021E1890 *v1; int v2; int v3 = 123; v0 = sub_020552B4(fieldSystem, v3, &v1, &v2); if (v0) { - UnkStruct_ov6_02246C24 * v4 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02246C24)); + UnkStruct_ov6_02246C24 *v4 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02246C24)); v4->unk_0C = param1; v4->unk_0D = 0; @@ -69,20 +70,19 @@ void ov6_02246C24 (FieldSystem * fieldSystem, const u8 param1) } } -static BOOL ov6_02246C9C (TaskManager * param0) +static BOOL ov6_02246C9C(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov6_02246C24 * v1 = (UnkStruct_ov6_02246C24 *)TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov6_02246C24 *v1 = (UnkStruct_ov6_02246C24 *)TaskManager_Environment(param0); switch (v1->unk_0F) { - case 0: - { - NNSG3dResMdl * v2; - NNSG3dResFileHeader ** v3; - NNSG3dResMdl * v4; - NNSG3dResFileHeader ** v5; - UnkStruct_ov5_021E1890 * v6; - NNSG3dRenderObj * v7; + case 0: { + NNSG3dResMdl *v2; + NNSG3dResFileHeader **v3; + NNSG3dResMdl *v4; + NNSG3dResFileHeader **v5; + UnkStruct_ov5_021E1890 *v6; + NNSG3dRenderObj *v7; BOOL v8; v3 = ov5_021EF9E8(517, fieldSystem->unk_30); @@ -100,12 +100,11 @@ static BOOL ov6_02246C9C (TaskManager * param0) } (v1->unk_0F)++; break; - case 1: - { - UnkStruct_ov5_021E1890 * v9; - NNSG3dRenderObj * v10; + case 1: { + UnkStruct_ov5_021E1890 *v9; + NNSG3dRenderObj *v10; VecFx32 v11; - VecFx32 v12 = {0, 0, 0}; + VecFx32 v12 = { 0, 0, 0 }; v11.x = v1->unk_00.x + Unk_ov6_0224989C[v1->unk_0D].x; v11.y = v1->unk_00.y + Unk_ov6_0224989C[v1->unk_0D].y; @@ -119,8 +118,7 @@ static BOOL ov6_02246C9C (TaskManager * param0) v10 = ov5_021E18BC(v9); ov5_021D4220(fieldSystem->unk_54, 0x10, v1->unk_0D, v10); (v1->unk_0F)++; - } - break; + } break; case 2: if (v1->unk_0E < 15) { v1->unk_0E++; diff --git a/src/overlay006/ov6_02246F00.c b/src/overlay006/ov6_02246F00.c index 5a81c7ad9a..ce3d088b24 100644 --- a/src/overlay006/ov6_02246F00.c +++ b/src/overlay006/ov6_02246F00.c @@ -1,19 +1,20 @@ +#include "overlay006/ov6_02246F00.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" -#include "overlay005/struct_ov5_021E1890_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021EF75C.h" +#include "overlay005/struct_ov5_021E1890_decl.h" -#include "unk_02005474.h" #include "heap.h" +#include "unk_02005474.h" #include "unk_020508D4.h" #include "unk_02054D00.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021EF75C.h" -#include "overlay006/ov6_02246F00.h" typedef struct { u8 unk_00; @@ -22,16 +23,16 @@ typedef struct { u8 unk_03; } UnkStruct_ov6_02246F00; -static BOOL ov6_02246F40(TaskManager * param0); +static BOOL ov6_02246F40(TaskManager *param0); -void ov6_02246F00 (FieldSystem * fieldSystem, const u8 param1, const u8 param2) +void ov6_02246F00(FieldSystem *fieldSystem, const u8 param1, const u8 param2) { BOOL v0; v0 = sub_020552B4(fieldSystem, 498, NULL, NULL); if (v0) { - UnkStruct_ov6_02246F00 * v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02246F00)); + UnkStruct_ov6_02246F00 *v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02246F00)); v1->unk_00 = param2; v1->unk_01 = param1; @@ -43,18 +44,17 @@ void ov6_02246F00 (FieldSystem * fieldSystem, const u8 param1, const u8 param2) } } -static BOOL ov6_02246F40 (TaskManager * param0) +static BOOL ov6_02246F40(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov6_02246F00 * v1 = (UnkStruct_ov6_02246F00 *)TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov6_02246F00 *v1 = (UnkStruct_ov6_02246F00 *)TaskManager_Environment(param0); switch (v1->unk_02) { - case 0: - { - NNSG3dResMdl * v2; - NNSG3dResFileHeader ** v3; - UnkStruct_ov5_021E1890 * v4; - NNSG3dRenderObj * v5; + case 0: { + NNSG3dResMdl *v2; + NNSG3dResFileHeader **v3; + UnkStruct_ov5_021E1890 *v4; + NNSG3dRenderObj *v5; BOOL v6; v3 = ov5_021EF9E8(498, fieldSystem->unk_30); @@ -69,7 +69,7 @@ static BOOL ov6_02246F40 (TaskManager * param0) (v1->unk_02)++; break; case 1: - GF_ASSERT(((v1->unk_01 == 0) || (v1->unk_01 == 1))); + GF_ASSERT((v1->unk_01 == 0) || (v1->unk_01 == 1)); ov5_021D4250(fieldSystem->unk_54, 0x1, v1->unk_01); @@ -82,7 +82,7 @@ static BOOL ov6_02246F40 (TaskManager * param0) (v1->unk_02)++; break; case 2: - if ((ov5_021D42F0(fieldSystem->unk_54, 0x1))) { + if (ov5_021D42F0(fieldSystem->unk_54, 0x1)) { if (v1->unk_01 == 0) { sub_020057A4(1554, 0); } else { diff --git a/src/overlay006/ov6_02247078.c b/src/overlay006/ov6_02247078.c index 47970fa62e..c71b628cdb 100644 --- a/src/overlay006/ov6_02247078.c +++ b/src/overlay006/ov6_02247078.c @@ -1,29 +1,30 @@ +#include "overlay006/ov6_02247078.h" + #include #include -#include "overlay005/struct_ov5_021E1890_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02055130.h" -#include "unk_02054D00.h" +#include "field/field_system.h" #include "overlay005/ov5_021D37AC.h" #include "overlay005/ov5_021E15F4.h" #include "overlay005/ov5_021EF75C.h" -#include "overlay006/ov6_02247078.h" +#include "overlay005/struct_ov5_021E1890_decl.h" + +#include "unk_02054D00.h" -void ov6_02247078 (FieldSystem * fieldSystem, const u8 param1) +void ov6_02247078(FieldSystem *fieldSystem, const u8 param1) { BOOL v0; - UnkStruct_ov5_021E1890 * v1; + UnkStruct_ov5_021E1890 *v1; UnkStruct_02055130 v2; int v3; - int v4[] = {119, 112, 115, 248}; + int v4[] = { 119, 112, 115, 248 }; v0 = sub_02055324(fieldSystem, v4, 4, &v1, &v3); if (v0) { - NNSG3dResTex * v5; + NNSG3dResTex *v5; v5 = ov5_021EFAA0(fieldSystem->unk_30); ov5_021D41C8(fieldSystem->unk_50, fieldSystem->unk_54, param1, v3, ov5_021E18BC(v1), ov5_021E18C0(v1), v5, 2, 1, 0); @@ -32,12 +33,12 @@ void ov6_02247078 (FieldSystem * fieldSystem, const u8 param1) } } -void ov6_022470E8 (FieldSystem * fieldSystem, const u8 param1) +void ov6_022470E8(FieldSystem *fieldSystem, const u8 param1) { ov5_021D4250(fieldSystem->unk_54, param1, 0); } -void ov6_022470F4 (FieldSystem * fieldSystem, const u8 param1) +void ov6_022470F4(FieldSystem *fieldSystem, const u8 param1) { ov5_021D4250(fieldSystem->unk_54, param1, 1); } diff --git a/src/overlay006/ov6_02247100.c b/src/overlay006/ov6_02247100.c index 307505e302..f11d06ddba 100644 --- a/src/overlay006/ov6_02247100.c +++ b/src/overlay006/ov6_02247100.c @@ -1,56 +1,57 @@ +#include "overlay006/ov6_02247100.h" + #include #include -#include "sys_task_manager.h" #include "struct_decls/struct_0203A790_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "pokemon.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" -#include "struct_defs/struct_02049FA8.h" #include "overlay005/map_object_anim_cmd.h" +#include "overlay005/ov5_021F0EB0.h" +#include "overlay006/ov6_02243258.h" -#include "unk_02005474.h" -#include "unk_0200F174.h" +#include "field_map_change.h" +#include "field_overworld_state.h" #include "heap.h" #include "journal.h" -#include "field_overworld_state.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" +#include "unk_0200F174.h" #include "unk_0203A7D8.h" #include "unk_020508D4.h" -#include "field_map_change.h" -#include "player_avatar.h" #include "unk_020655F4.h" -#include "overlay005/ov5_021F0EB0.h" -#include "overlay006/ov6_02243258.h" -#include "overlay006/ov6_02247100.h" typedef struct { int unk_00; int unk_04; int unk_08; - SysTask * unk_0C; - SysTask * unk_10; - SysTask * unk_14; - MapObject * unk_18; - FieldSystem * fieldSystem; - Pokemon * unk_20; + SysTask *unk_0C; + SysTask *unk_10; + SysTask *unk_14; + MapObject *unk_18; + FieldSystem *fieldSystem; + Pokemon *unk_20; } UnkStruct_ov6_02247100; -static void * ov6_02247590(u32 param0, u32 param1); -static void ov6_0224732C(FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param1); +static void *ov6_02247590(u32 param0, u32 param1); +static void ov6_0224732C(FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param1); -int(*const Unk_ov6_022495CC[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *); -int(*const Unk_ov6_022495BC[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *); -int(*const Unk_ov6_022495F0[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *); +int (*const Unk_ov6_022495CC[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *); +int (*const Unk_ov6_022495BC[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *); +int (*const Unk_ov6_022495F0[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *); const MapObjectAnimCmd Unk_ov6_02249608[]; const MapObjectAnimCmd Unk_ov6_022495DC[]; const MapObjectAnimCmd Unk_ov6_0224966C[]; -void * ov6_02247100 (FieldSystem * fieldSystem, u32 param1) +void *ov6_02247100(FieldSystem *fieldSystem, u32 param1) { - UnkStruct_ov6_02247100 * v0 = ov6_02247590(param1, sizeof(UnkStruct_ov6_02247100)); + UnkStruct_ov6_02247100 *v0 = ov6_02247590(param1, sizeof(UnkStruct_ov6_02247100)); v0->unk_08 = 0; v0->fieldSystem = fieldSystem; @@ -59,11 +60,11 @@ void * ov6_02247100 (FieldSystem * fieldSystem, u32 param1) return v0; } -BOOL ov6_02247120 (TaskManager * taskMan) +BOOL ov6_02247120(TaskManager *taskMan) { int v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov6_02247100 * v2 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov6_02247100 *v2 = TaskManager_Environment(taskMan); do { v0 = Unk_ov6_022495CC[v2->unk_00](taskMan, fieldSystem, v2); @@ -76,10 +77,10 @@ BOOL ov6_02247120 (TaskManager * taskMan) return 0; } -static int ov6_0224715C (TaskManager * taskMan, FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param2) +static int ov6_0224715C(TaskManager *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { param2->unk_14 = ov5_021F0EB0(fieldSystem, 4); - ov5_021F0F10(param2->unk_14, 1, ((FX32_ONE * -150)), 15); + ov5_021F0F10(param2->unk_14, 1, (FX32_ONE * -150), 15); param2->unk_0C = MapObject_StartAnimation(param2->unk_18, Unk_ov6_02249608); param2->unk_00++; @@ -98,7 +99,7 @@ static int ov6_0224715C (TaskManager * taskMan, FieldSystem * fieldSystem, UnkSt return 0; } -static int ov6_022471C0 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param2) +static int ov6_022471C0(TaskManager *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (MapObject_HasAnimationEnded(param2->unk_0C) == 0) { return 0; @@ -123,7 +124,7 @@ static int ov6_022471C0 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkSt return 0; } -static int ov6_02247244 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param2) +static int ov6_02247244(TaskManager *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (MapObject_HasAnimationEnded(param2->unk_0C) == 1) { MapObject_FinishAnimation(param2->unk_0C); @@ -142,9 +143,9 @@ static int ov6_02247244 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkSt return 1; } -static int ov6_02247288 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param2) +static int ov6_02247288(TaskManager *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { - FieldOverworldState * v0 = SaveData_GetFieldOverworldState(fieldSystem->saveData); + FieldOverworldState *v0 = SaveData_GetFieldOverworldState(fieldSystem->saveData); if (param2->unk_08 == 2) { u16 v1; @@ -154,23 +155,23 @@ static int ov6_02247288 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkSt sub_0203A7F0(v1, &v2); sub_02053CD4(taskMan, &v2, param2->unk_08); } else { - Location * v3 = sub_0203A72C(v0); + Location *v3 = sub_0203A72C(v0); sub_02053CD4(taskMan, v3, param2->unk_08); } return 2; } -static int(*const Unk_ov6_022495CC[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *) = { +static int (*const Unk_ov6_022495CC[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *) = { ov6_0224715C, ov6_022471C0, ov6_02247244, ov6_02247288 }; -void * ov6_022472C8 (FieldSystem * fieldSystem, u32 param1, int param2) +void *ov6_022472C8(FieldSystem *fieldSystem, u32 param1, int param2) { - UnkStruct_ov6_02247100 * v0 = ov6_02247590(param1, sizeof(UnkStruct_ov6_02247100)); + UnkStruct_ov6_02247100 *v0 = ov6_02247590(param1, sizeof(UnkStruct_ov6_02247100)); v0->unk_08 = param2; v0->fieldSystem = fieldSystem; @@ -179,11 +180,11 @@ void * ov6_022472C8 (FieldSystem * fieldSystem, u32 param1, int param2) return v0; } -BOOL ov6_022472E8 (TaskManager * taskMan) +BOOL ov6_022472E8(TaskManager *taskMan) { int v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov6_02247100 * v2 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov6_02247100 *v2 = TaskManager_Environment(taskMan); do { v0 = Unk_ov6_022495BC[v2->unk_00](taskMan, fieldSystem, v2); @@ -198,9 +199,9 @@ BOOL ov6_022472E8 (TaskManager * taskMan) return 0; } -static void ov6_0224732C (FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param1) +static void ov6_0224732C(FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param1) { - void * v0; + void *v0; if (param1->unk_08 == 2) { v0 = sub_0202BE00((28 - 19), fieldSystem->location->mapId, 4); @@ -211,7 +212,7 @@ static void ov6_0224732C (FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * pa sub_0202B758(fieldSystem->unk_9C, v0, 1); } -static int ov6_02247354 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param2) +static int ov6_02247354(TaskManager *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (param2->unk_08 == 2) { sub_0200F174(0, 1, 1, 0x0, 6, 1, 4); @@ -220,14 +221,14 @@ static int ov6_02247354 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkSt } param2->unk_14 = ov5_021F0EB0(fieldSystem, 4); - ov5_021F0F10(param2->unk_14, 1, ((FX32_ONE * -150)), 1); + ov5_021F0F10(param2->unk_14, 1, (FX32_ONE * -150), 1); param2->unk_0C = MapObject_StartAnimation(param2->unk_18, Unk_ov6_022495DC); param2->unk_00++; return 0; } -static int ov6_022473C8 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param2) +static int ov6_022473C8(TaskManager *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (MapObject_HasAnimationEnded(param2->unk_0C) == 1) { MapObject_FinishAnimation(param2->unk_0C); @@ -244,7 +245,7 @@ static int ov6_022473C8 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkSt return 1; } -static int ov6_0224740C (TaskManager * taskMan, FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param2) +static int ov6_0224740C(TaskManager *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (MapObject_HasAnimationEnded(param2->unk_0C) == 0) { return 0; @@ -264,7 +265,7 @@ static int ov6_0224740C (TaskManager * taskMan, FieldSystem * fieldSystem, UnkSt return 0; } -static int ov6_02247458 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param2) +static int ov6_02247458(TaskManager *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (MapObject_HasAnimationEnded(param2->unk_0C) == 0) { return 0; @@ -280,16 +281,16 @@ static int ov6_02247458 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkSt return 2; } -static int(*const Unk_ov6_022495BC[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *) = { +static int (*const Unk_ov6_022495BC[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *) = { ov6_02247354, ov6_022473C8, ov6_0224740C, ov6_02247458 }; -void * ov6_02247488 (FieldSystem * fieldSystem, Pokemon * param1, u32 param2) +void *ov6_02247488(FieldSystem *fieldSystem, Pokemon *param1, u32 param2) { - UnkStruct_ov6_02247100 * v0 = ov6_02247590(param2, sizeof(UnkStruct_ov6_02247100)); + UnkStruct_ov6_02247100 *v0 = ov6_02247590(param2, sizeof(UnkStruct_ov6_02247100)); v0->unk_08 = 1; v0->fieldSystem = fieldSystem; @@ -299,11 +300,11 @@ void * ov6_02247488 (FieldSystem * fieldSystem, Pokemon * param1, u32 param2) return v0; } -BOOL ov6_022474AC (TaskManager * taskMan) +BOOL ov6_022474AC(TaskManager *taskMan) { int v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov6_02247100 * v2 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov6_02247100 *v2 = TaskManager_Environment(taskMan); do { v0 = Unk_ov6_022495F0[v2->unk_00](taskMan, fieldSystem, v2); @@ -316,7 +317,7 @@ BOOL ov6_022474AC (TaskManager * taskMan) return 0; } -static int ov6_022474E8 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param2) +static int ov6_022474E8(TaskManager *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { int v0 = PlayerAvatar_Gender(fieldSystem->playerAvatar); @@ -326,7 +327,7 @@ static int ov6_022474E8 (TaskManager * taskMan, FieldSystem * fieldSystem, UnkSt return 0; } -static int ov6_0224750C (TaskManager * taskMan, FieldSystem * fieldSystem, UnkStruct_ov6_02247100 * param2) +static int ov6_0224750C(TaskManager *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (ov6_02243FBC(param2->unk_10) == 0) { return 0; @@ -337,7 +338,7 @@ static int ov6_0224750C (TaskManager * taskMan, FieldSystem * fieldSystem, UnkSt return 1; } -static int(*const Unk_ov6_022495F0[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *) = { +static int (*const Unk_ov6_022495F0[])(TaskManager *, FieldSystem *, UnkStruct_ov6_02247100 *) = { ov6_022474E8, ov6_0224750C, ov6_0224715C, @@ -346,9 +347,9 @@ static int(*const Unk_ov6_022495F0[])(TaskManager *, FieldSystem *, UnkStruct_ov ov6_02247288 }; -void * ov6_02247530 (FieldSystem * fieldSystem, Pokemon * param1, u32 param2) +void *ov6_02247530(FieldSystem *fieldSystem, Pokemon *param1, u32 param2) { - UnkStruct_ov6_02247100 * v0 = ov6_02247590(param2, sizeof(UnkStruct_ov6_02247100)); + UnkStruct_ov6_02247100 *v0 = ov6_02247590(param2, sizeof(UnkStruct_ov6_02247100)); v0->unk_08 = 2; v0->fieldSystem = fieldSystem; @@ -358,11 +359,11 @@ void * ov6_02247530 (FieldSystem * fieldSystem, Pokemon * param1, u32 param2) return v0; } -BOOL ov6_02247554 (TaskManager * taskMan) +BOOL ov6_02247554(TaskManager *taskMan) { int v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov6_02247100 * v2 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov6_02247100 *v2 = TaskManager_Environment(taskMan); do { v0 = Unk_ov6_022495F0[v2->unk_00](taskMan, fieldSystem, v2); @@ -375,9 +376,9 @@ BOOL ov6_02247554 (TaskManager * taskMan) return 0; } -static void * ov6_02247590 (u32 param0, u32 param1) +static void *ov6_02247590(u32 param0, u32 param1) { - void * v0 = Heap_AllocFromHeapAtEnd(param0, param1); + void *v0 = Heap_AllocFromHeapAtEnd(param0, param1); GF_ASSERT(v0 != NULL); memset(v0, 0, param1); @@ -385,66 +386,66 @@ static void * ov6_02247590 (u32 param0, u32 param1) } static const MapObjectAnimCmd Unk_ov6_02249608[] = { - {0x1, 0x1}, - {0x3C, 0x2}, - {0x2, 0x1}, - {0x3C, 0x2}, - {0x0, 0x1}, - {0x3C, 0x2}, - {0x3, 0x1}, - {0x3C, 0x2}, - {0x1, 0x1}, - {0x3C, 0x1}, - {0x2, 0x1}, - {0x3C, 0x1}, - {0x0, 0x1}, - {0x3C, 0x1}, - {0x3, 0x1}, - {0x3C, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x0, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x0, 0x1}, - {0x3, 0x1}, - {0xfe, 0x0} + { 0x1, 0x1 }, + { 0x3C, 0x2 }, + { 0x2, 0x1 }, + { 0x3C, 0x2 }, + { 0x0, 0x1 }, + { 0x3C, 0x2 }, + { 0x3, 0x1 }, + { 0x3C, 0x2 }, + { 0x1, 0x1 }, + { 0x3C, 0x1 }, + { 0x2, 0x1 }, + { 0x3C, 0x1 }, + { 0x0, 0x1 }, + { 0x3C, 0x1 }, + { 0x3, 0x1 }, + { 0x3C, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x0, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x0, 0x1 }, + { 0x3, 0x1 }, + { 0xfe, 0x0 } }; static const MapObjectAnimCmd Unk_ov6_022495DC[] = { - {0x0, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0xfe, 0x0} + { 0x0, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0xfe, 0x0 } }; static const MapObjectAnimCmd Unk_ov6_0224966C[] = { - {0x1, 0x1}, - {0x2, 0x1}, - {0x0, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x0, 0x1}, - {0x3, 0x1}, - {0x1, 0x1}, - {0x3C, 0x1}, - {0x2, 0x1}, - {0x3C, 0x1}, - {0x0, 0x1}, - {0x3C, 0x1}, - {0x3, 0x1}, - {0x3C, 0x1}, - {0x1, 0x1}, - {0x3C, 0x2}, - {0x2, 0x1}, - {0x3C, 0x3}, - {0x0, 0x1}, - {0x3C, 0x4}, - {0x3, 0x1}, - {0x3C, 0x5}, - {0x1, 0x1}, - {0xfe, 0x0} + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x0, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x0, 0x1 }, + { 0x3, 0x1 }, + { 0x1, 0x1 }, + { 0x3C, 0x1 }, + { 0x2, 0x1 }, + { 0x3C, 0x1 }, + { 0x0, 0x1 }, + { 0x3C, 0x1 }, + { 0x3, 0x1 }, + { 0x3C, 0x1 }, + { 0x1, 0x1 }, + { 0x3C, 0x2 }, + { 0x2, 0x1 }, + { 0x3C, 0x3 }, + { 0x0, 0x1 }, + { 0x3C, 0x4 }, + { 0x3, 0x1 }, + { 0x3C, 0x5 }, + { 0x1, 0x1 }, + { 0xfe, 0x0 } }; diff --git a/src/overlay006/ov6_022475B0.c b/src/overlay006/ov6_022475B0.c index a82e10c609..1b1ff9574e 100644 --- a/src/overlay006/ov6_022475B0.c +++ b/src/overlay006/ov6_022475B0.c @@ -1,21 +1,20 @@ +#include "overlay006/ov6_022475B0.h" + #include #include +#include "heap.h" #include "inlines.h" - -#include "savedata.h" - #include "narc.h" -#include "heap.h" +#include "savedata.h" #include "unk_0202D7A8.h" -#include "overlay006/ov6_022475B0.h" -void ov6_022475B0 (SaveData * param0) +void ov6_022475B0(SaveData *param0) { u16 v0; u16 v1, v2; int v3[2]; - int * v4; + int *v4; v4 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 8, 4); @@ -45,10 +44,10 @@ void ov6_022475B0 (SaveData * param0) Heap_FreeToHeap(v4); } -int ov6_02247624 (SaveData * param0) +int ov6_02247624(SaveData *param0) { int v0; - int * v1; + int *v1; u16 v2, v3; sub_0202DA10(param0, &v2, &v3); diff --git a/src/overlay006/ov6_02247660.c b/src/overlay006/ov6_02247660.c index 69a606af73..b3c929419a 100644 --- a/src/overlay006/ov6_02247660.c +++ b/src/overlay006/ov6_02247660.c @@ -1,26 +1,26 @@ +#include "overlay006/ov6_02247660.h" + #include #include -#include "inlines.h" - #include "field/field_system.h" -#include "narc.h" #include "heap.h" +#include "inlines.h" +#include "narc.h" #include "unk_0202B37C.h" #include "unk_02039C80.h" #include "unk_0205F180.h" -#include "overlay006/ov6_02247660.h" -BOOL ov6_02247660 (FieldSystem * fieldSystem) +BOOL ov6_02247660(FieldSystem *fieldSystem) { u8 v0; int v1; int v2; u8 v3; u8 v4; - void * v5; - u16 * v6; + void *v5; + u16 *v6; int v7; int v8[4]; int v9[4]; @@ -58,7 +58,7 @@ BOOL ov6_02247660 (FieldSystem * fieldSystem) v6 = &((u16 *)v5)[2 + v7 * 2]; v2 = v1 / 4; - GF_ASSERT((v2 < 256)); + GF_ASSERT(v2 < 256); v3 = v1 % 4; v4 = 0; @@ -87,15 +87,15 @@ BOOL ov6_02247660 (FieldSystem * fieldSystem) return v12; } -void ov6_02247794 (u8 * param0, u8 * param1) +void ov6_02247794(u8 *param0, u8 *param1) { (*param0) = 20; (*param1) = 10; } -void ov6_022477A0 (int * param0) +void ov6_022477A0(int *param0) { - int * v0; + int *v0; v0 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_ARC__ENCDATA_EX, 0, 4); (*param0) = (*v0); diff --git a/src/overlay006/ov6_022477B8.c b/src/overlay006/ov6_022477B8.c index cbff5dcabb..c379ed54e9 100644 --- a/src/overlay006/ov6_022477B8.c +++ b/src/overlay006/ov6_022477B8.c @@ -1,13 +1,13 @@ +#include "overlay006/ov6_022477B8.h" + #include #include -#include "core_sys.h" - #include "overlay006/struct_ov6_02242634.h" -#include "overlay006/ov6_022477B8.h" +#include "core_sys.h" -void ov6_022477B8 (const UnkStruct_ov6_02242634 * param0, const BOOL param1, int * param2, int * param3) +void ov6_022477B8(const UnkStruct_ov6_02242634 *param0, const BOOL param1, int *param2, int *param3) { if (!param1) { return; diff --git a/src/overlay006/ov6_02247830.c b/src/overlay006/ov6_02247830.c index a6d00cf17a..bd5b1e4636 100644 --- a/src/overlay006/ov6_02247830.c +++ b/src/overlay006/ov6_02247830.c @@ -1,14 +1,14 @@ +#include "overlay006/ov6_02247830.h" + #include #include #include "struct_decls/struct_02014FB0_decl.h" -#include "trainer_info.h" -#include "unk_02014D38.h" #include "trainer_info.h" -#include "overlay006/ov6_02247830.h" +#include "unk_02014D38.h" -static void ov6_02247830 (u8 * param0, u8 param1, u8 param2) +static void ov6_02247830(u8 *param0, u8 param1, u8 param2) { u8 v0; int v1; @@ -26,7 +26,7 @@ static void ov6_02247830 (u8 * param0, u8 param1, u8 param2) } } -static int ov6_02247890 (const UnkStruct_02014FB0 * param0, u16 param1, u16 param2, u16 param3, u16 param4, u16 param5) +static int ov6_02247890(const UnkStruct_02014FB0 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u16 param5) { int v0, v1, v2; s16 v3[4]; @@ -93,11 +93,11 @@ static int ov6_02247890 (const UnkStruct_02014FB0 * param0, u16 param1, u16 para return -1; } -int ov6_022479D0 (const TrainerInfo * param0, u16 param1, u16 param2, u16 param3, u16 param4, u32 param5) +int ov6_022479D0(const TrainerInfo *param0, u16 param1, u16 param2, u16 param3, u16 param4, u32 param5) { int v0; u16 v1; - UnkStruct_02014FB0 * v2; + UnkStruct_02014FB0 *v2; v2 = sub_02014FB0(param5); v1 = TrainerInfo_ID_LowHalf(param0); diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c index 4a9f862ee6..4585cf7e87 100644 --- a/src/overlay006/ov6_02247A0C.c +++ b/src/overlay006/ov6_02247A0C.c @@ -1,35 +1,33 @@ +#include "overlay006/ov6_02247A0C.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_decls/struct_020508D4_decl.h" -#include "savedata.h" +#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" -#include "struct_defs/struct_0205AA50.h" -#include "unk_02002B7C.h" +#include "core_sys.h" +#include "field_system.h" +#include "heap.h" #include "message.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02002B7C.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_02025E08.h" #include "unk_0202F108.h" -#include "field_system.h" #include "unk_020508D4.h" -#include "overlay006/ov6_02247A0C.h" typedef struct { Window unk_00; - MessageLoader * unk_10; - StringTemplate * unk_14; + MessageLoader *unk_10; + StringTemplate *unk_14; } UnkStruct_ov6_02247A90; typedef struct { @@ -39,64 +37,64 @@ typedef struct { } UnkStruct_ov6_022496F4; typedef struct { - void * unk_00; + void *unk_00; int unk_04; } UnkStruct_ov6_02247A0C; static int ov6_02247CF4(const Strbuf *param0, int param1, int param2, int param3); -static BOOL ov6_02247A34(TaskManager * param0); +static BOOL ov6_02247A34(TaskManager *param0); static const UnkStruct_ov6_022496F4 Unk_ov6_022496F4[] = { - {0x2, 0x8, 0x38}, - {0x3, 0x8, 0x48}, - {0x4, 0x8, 0x58}, - {0x5, 0x8, 0x68}, - {0x6, 0x8, 0x78} + { 0x2, 0x8, 0x38 }, + { 0x3, 0x8, 0x48 }, + { 0x4, 0x8, 0x58 }, + { 0x5, 0x8, 0x68 }, + { 0x6, 0x8, 0x78 } }; static const UnkStruct_ov6_022496F4 Unk_ov6_022496D4[] = { - {0x7, 0x70, 0x28}, - {0x8, 0x98, 0x28}, - {0x9, 0xC0, 0x28}, - {0xA, 0xE8, 0x28} + { 0x7, 0x70, 0x28 }, + { 0x8, 0x98, 0x28 }, + { 0x9, 0xC0, 0x28 }, + { 0xA, 0xE8, 0x28 } }; static const UnkStruct_ov6_022496F4 Unk_ov6_0224971C[][4] = { { - {0xB, 0x70, 0x38}, - {0xC, 0x98, 0x38}, - {0xD, 0xC0, 0x38}, - {0xE, 0xE8, 0x38} + { 0xB, 0x70, 0x38 }, + { 0xC, 0x98, 0x38 }, + { 0xD, 0xC0, 0x38 }, + { 0xE, 0xE8, 0x38 }, }, { - {0xF, 0x70, 0x48}, - {0x10, 0x98, 0x48}, - {0x11, 0xC0, 0x48}, - {0x12, 0xE8, 0x48} + { 0xF, 0x70, 0x48 }, + { 0x10, 0x98, 0x48 }, + { 0x11, 0xC0, 0x48 }, + { 0x12, 0xE8, 0x48 }, }, { - {0x13, 0x70, 0x58}, - {0x14, 0x98, 0x58}, - {0x15, 0xC0, 0x58}, - {0x16, 0xE8, 0x58} + { 0x13, 0x70, 0x58 }, + { 0x14, 0x98, 0x58 }, + { 0x15, 0xC0, 0x58 }, + { 0x16, 0xE8, 0x58 }, }, { - {0x17, 0x70, 0x68}, - {0x18, 0x98, 0x68}, - {0x19, 0xC0, 0x68}, - {0x1A, 0xE8, 0x68} + { 0x17, 0x70, 0x68 }, + { 0x18, 0x98, 0x68 }, + { 0x19, 0xC0, 0x68 }, + { 0x1A, 0xE8, 0x68 }, }, { - {0x1B, 0x70, 0x78}, - {0x1C, 0x98, 0x78}, - {0x1D, 0xC0, 0x78}, - {0x1E, 0xE8, 0x78} - } + { 0x1B, 0x70, 0x78 }, + { 0x1C, 0x98, 0x78 }, + { 0x1D, 0xC0, 0x78 }, + { 0x1E, 0xE8, 0x78 }, + }, }; -void ov6_02247A0C (TaskManager * param0) +void ov6_02247A0C(TaskManager *param0) { - UnkStruct_ov6_02247A0C * v0; + UnkStruct_ov6_02247A0C *v0; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov6_02247A0C)); MI_CpuClear8(v0, sizeof(UnkStruct_ov6_02247A0C)); @@ -104,10 +102,10 @@ void ov6_02247A0C (TaskManager * param0) FieldTask_Start(param0, ov6_02247A34, v0); } -static BOOL ov6_02247A34 (TaskManager * param0) +static BOOL ov6_02247A34(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov6_02247A0C * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov6_02247A0C *v1 = TaskManager_Environment(param0); switch (v1->unk_04) { case 0: @@ -128,13 +126,13 @@ static BOOL ov6_02247A34 (TaskManager * param0) return 0; } -void * ov6_02247A90 (void * param0) +void *ov6_02247A90(void *param0) { - UnkStruct_ov6_02247A90 * v0; - BGL * v1; - Strbuf* v2, * v3; + UnkStruct_ov6_02247A90 *v0; + BGL *v1; + Strbuf *v2, *v3; int v4, v5, v6, v7; - SaveData * v8; + SaveData *v8; v1 = sub_0203D170(param0); v8 = FieldSystem_SaveData(param0); @@ -162,7 +160,7 @@ void * ov6_02247A90 (void * param0) Strbuf_Free(v2); v2 = MessageLoader_GetNewStrbuf(v0->unk_10, 1); - v4 = ov6_02247CF4(v2, 0, 1, ((15 * 8))); + v4 = ov6_02247CF4(v2, 0, 1, (15 * 8)); PrintStringSimple(&v0->unk_00, 0, v2, v4, (8 * 2), 0xff, NULL); Strbuf_Free(v2); @@ -199,9 +197,9 @@ void * ov6_02247A90 (void * param0) return v0; } -void ov6_02247CC8 (void * param0) +void ov6_02247CC8(void *param0) { - UnkStruct_ov6_02247A90 * v0 = param0; + UnkStruct_ov6_02247A90 *v0 = param0; Window_Clear(&v0->unk_00, 1); sub_0201ACF4(&v0->unk_00); @@ -211,7 +209,7 @@ void ov6_02247CC8 (void * param0) Heap_FreeToHeap(v0); } -static int ov6_02247CF4 (const Strbuf *param0, int param1, int param2, int param3) +static int ov6_02247CF4(const Strbuf *param0, int param1, int param2, int param3) { int v0, v1; diff --git a/src/overlay006/ov6_02247D30.c b/src/overlay006/ov6_02247D30.c index a5b91ff422..57a31edf3f 100644 --- a/src/overlay006/ov6_02247D30.c +++ b/src/overlay006/ov6_02247D30.c @@ -1,19 +1,20 @@ +#include "overlay006/ov6_02247D30.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" -#include "overlay005/struct_ov5_021E1890_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021EF75C.h" +#include "overlay005/struct_ov5_021E1890_decl.h" #include "heap.h" #include "unk_02039C80.h" #include "unk_020508D4.h" #include "unk_02054D00.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021EF75C.h" -#include "overlay006/ov6_02247D30.h" typedef struct { VecFx32 unk_00; @@ -24,28 +25,28 @@ typedef struct { u8 unk_10[6]; } UnkStruct_ov6_02247D30; -static BOOL ov6_02247DAC(TaskManager * param0); +static BOOL ov6_02247DAC(TaskManager *param0); static VecFx32 Unk_ov6_022498E4[6] = { - {-((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, -((FX32_ONE * 4) + (FX32_ONE / 2))}, - {((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, -((FX32_ONE * 4) + (FX32_ONE / 2))}, - {-((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, 0x0}, - {((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, 0x0}, - {-((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, ((FX32_ONE * 4) + (FX32_ONE / 2))}, - {((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, ((FX32_ONE * 4) + (FX32_ONE / 2))} + { -((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, -((FX32_ONE * 4) + (FX32_ONE / 2)) }, + { ((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, -((FX32_ONE * 4) + (FX32_ONE / 2)) }, + { -((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, 0x0 }, + { ((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, 0x0 }, + { -((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, ((FX32_ONE * 4) + (FX32_ONE / 2)) }, + { ((FX32_ONE * 4) + (FX32_ONE / 2)), FX32_ONE * 12, ((FX32_ONE * 4) + (FX32_ONE / 2)) } }; -void ov6_02247D30 (FieldSystem * fieldSystem, const u8 param1) +void ov6_02247D30(FieldSystem *fieldSystem, const u8 param1) { BOOL v0; - UnkStruct_ov5_021E1890 * v1; + UnkStruct_ov5_021E1890 *v1; int v2; int v3 = 507; v0 = sub_020552B4(fieldSystem, v3, &v1, &v2); if (v0) { - UnkStruct_ov6_02247D30 * v4 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02247D30)); + UnkStruct_ov6_02247D30 *v4 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02247D30)); v4->unk_0C = param1; v4->unk_0D = 0; @@ -67,17 +68,16 @@ void ov6_02247D30 (FieldSystem * fieldSystem, const u8 param1) } } -static BOOL ov6_02247DAC (TaskManager * param0) +static BOOL ov6_02247DAC(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov6_02247D30 * v1 = (UnkStruct_ov6_02247D30 *)TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov6_02247D30 *v1 = (UnkStruct_ov6_02247D30 *)TaskManager_Environment(param0); switch (v1->unk_0F) { - case 0: - { - NNSG3dResMdl * v2; - NNSG3dResFileHeader ** v3; - NNSG3dRenderObj * v4; + case 0: { + NNSG3dResMdl *v2; + NNSG3dResFileHeader **v3; + NNSG3dRenderObj *v4; v3 = ov5_021EF9E8(517, fieldSystem->unk_30); v2 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*v3), 0); @@ -86,12 +86,11 @@ static BOOL ov6_02247DAC (TaskManager * param0) } (v1->unk_0F)++; break; - case 1: - { - UnkStruct_ov5_021E1890 * v5; - NNSG3dRenderObj * v6; + case 1: { + UnkStruct_ov5_021E1890 *v5; + NNSG3dRenderObj *v6; VecFx32 v7; - VecFx32 v8 = {0, 0, 0}; + VecFx32 v8 = { 0, 0, 0 }; v7.x = v1->unk_00.x + Unk_ov6_022498E4[v1->unk_0D].x; v7.y = v1->unk_00.y + Unk_ov6_022498E4[v1->unk_0D].y; @@ -102,8 +101,7 @@ static BOOL ov6_02247DAC (TaskManager * param0) v6 = ov5_021E18BC(v5); ov5_021D4220(fieldSystem->unk_54, 0x10, v1->unk_0D, v6); (v1->unk_0F)++; - } - break; + } break; case 2: if (v1->unk_0E < 15) { v1->unk_0E++; @@ -125,7 +123,7 @@ static BOOL ov6_02247DAC (TaskManager * param0) (v1->unk_0F)++; break; case 4: - if ((ov5_021D42F0(fieldSystem->unk_54, 0x10))) { + if (ov5_021D42F0(fieldSystem->unk_54, 0x10)) { u8 v9; ov5_021D42B0(fieldSystem->unk_50, fieldSystem->unk_54, 0x10); diff --git a/src/overlay006/ov6_02247F5C.c b/src/overlay006/ov6_02247F5C.c index 7251b06580..44b9870822 100644 --- a/src/overlay006/ov6_02247F5C.c +++ b/src/overlay006/ov6_02247F5C.c @@ -1,22 +1,23 @@ +#include "overlay006/ov6_02247F5C.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" -#include "overlay005/struct_ov5_021D3CE4_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/struct_ov5_021D3CE4_decl.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_0206A8DC.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay006/ov6_02247F5C.h" +#include "vars_flags.h" -static BOOL ov6_02247FD0(TaskManager * param0); +static BOOL ov6_02247FD0(TaskManager *param0); -void ov6_02247F5C (FieldSystem * fieldSystem) +void ov6_02247F5C(FieldSystem *fieldSystem) { - UnkStruct_ov5_021D3CE4 * v0; + UnkStruct_ov5_021D3CE4 *v0; if (!sub_0206ADEC(SaveData_GetVarsFlags(fieldSystem->saveData))) { v0 = ov5_021D3DE4(496, 1, fieldSystem->unk_50); @@ -32,16 +33,16 @@ void ov6_02247F5C (FieldSystem * fieldSystem) } } -void ov6_02247FBC (FieldSystem * fieldSystem) +void ov6_02247FBC(FieldSystem *fieldSystem) { FieldTask_Start(fieldSystem->unk_10, ov6_02247FD0, NULL); } -static BOOL ov6_02247FD0 (TaskManager * param0) +static BOOL ov6_02247FD0(TaskManager *param0) { - int * v0; - UnkStruct_ov5_021D3CE4 * v1; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + int *v0; + UnkStruct_ov5_021D3CE4 *v1; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); v0 = FieldTask_GetState(param0); diff --git a/src/overlay006/ov6_02248050.c b/src/overlay006/ov6_02248050.c index 6371092ef8..6d8d3171c9 100644 --- a/src/overlay006/ov6_02248050.c +++ b/src/overlay006/ov6_02248050.c @@ -1,3 +1,5 @@ +#include "overlay006/ov6_02248050.h" + #include #include @@ -5,24 +7,23 @@ #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021D1BEC_decl.h" - #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017248.h" #include "struct_defs/struct_02017294.h" + #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay005/ov5_021D1A94.h" +#include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay006/struct_ov6_0223E6EC.h" -#include "unk_02005474.h" +#include "heap.h" +#include "map_object.h" #include "narc.h" +#include "player_avatar.h" +#include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020170BC.h" -#include "heap.h" -#include "player_avatar.h" -#include "map_object.h" -#include "overlay005/ov5_021D1A94.h" -#include "overlay006/ov6_02248050.h" typedef struct { UnkStruct_02017294 unk_00; @@ -58,8 +59,8 @@ typedef struct { typedef struct { UnkStruct_020170F4 unk_00; UnkStruct_ov6_022486B4 unk_10[16]; - void * unk_CD0[4]; - FieldSystem * fieldSystem; + void *unk_CD0[4]; + FieldSystem *fieldSystem; int unk_CE4; fx32 unk_CE8; fx32 unk_CEC; @@ -68,12 +69,12 @@ typedef struct { u32 unk_D0C; } UnkStruct_ov6_022487F8; -static void ov6_02248050 (MapObjectManager * param0, u32 param1, UnkStruct_02017294 * param2) +static void ov6_02248050(MapObjectManager *param0, u32 param1, UnkStruct_02017294 *param2) { int v0; int v1, v2; VecFx32 v3; - MapObject * v4; + MapObject *v4; v4 = MapObjMan_LocalMapObjByIndex(param0, param1); @@ -104,7 +105,7 @@ static void ov6_02248050 (MapObjectManager * param0, u32 param1, UnkStruct_02017 sub_02017350(param2, (((v1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), v3.y, (((v2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)); } -static void ov6_022480BC (PlayerAvatar * const playerAvatar, UnkStruct_02017294 * param1) +static void ov6_022480BC(PlayerAvatar *const playerAvatar, UnkStruct_02017294 *param1) { int v0; int v1, v2; @@ -137,7 +138,7 @@ static void ov6_022480BC (PlayerAvatar * const playerAvatar, UnkStruct_02017294 sub_02017350(param1, (((v1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), v3.y, (((v2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1)); } -static void ov6_02248124 (PlayerAvatar * const playerAvatar, UnkStruct_02017294 * param1) +static void ov6_02248124(PlayerAvatar *const playerAvatar, UnkStruct_02017294 *param1) { VecFx32 v0; @@ -145,7 +146,7 @@ static void ov6_02248124 (PlayerAvatar * const playerAvatar, UnkStruct_02017294 sub_02017350(param1, v0.x, v0.y, v0.z); } -static void ov6_02248140 (UnkStruct_ov6_02248140 * param0, NARC * param1, u32 param2, u32 param3, int param4, NNSFndAllocator * param5) +static void ov6_02248140(UnkStruct_ov6_02248140 *param0, NARC *param1, u32 param2, u32 param3, int param4, NNSFndAllocator *param5) { int v0; @@ -162,7 +163,7 @@ static void ov6_02248140 (UnkStruct_ov6_02248140 * param0, NARC * param1, u32 pa } } -static void ov6_022481BC (UnkStruct_ov6_02248140 * param0, NNSFndAllocator * param1) +static void ov6_022481BC(UnkStruct_ov6_02248140 *param0, NNSFndAllocator *param1) { int v0; @@ -173,7 +174,7 @@ static void ov6_022481BC (UnkStruct_ov6_02248140 * param0, NNSFndAllocator * par } } -static BOOL ov6_022481F0 (UnkStruct_ov6_02248140 * param0) +static BOOL ov6_022481F0(UnkStruct_ov6_02248140 *param0) { int v0; BOOL v1; @@ -187,7 +188,7 @@ static BOOL ov6_022481F0 (UnkStruct_ov6_02248140 * param0) return v1; } -static void ov6_02248224 (UnkStruct_ov6_02248140 * param0) +static void ov6_02248224(UnkStruct_ov6_02248140 *param0) { int v0; @@ -196,16 +197,16 @@ static void ov6_02248224 (UnkStruct_ov6_02248140 * param0) } } -static void ov6_02248254 (UnkStruct_ov6_02248140 * param0) +static void ov6_02248254(UnkStruct_ov6_02248140 *param0) { sub_02017294(¶m0->unk_00); } -static void ov6_0224825C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0224825C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0224825C * v0 = param2; + UnkStruct_ov6_0224825C *v0 = param2; int v1; - NARC * v2; + NARC *v2; memset(v0, 0, sizeof(UnkStruct_ov6_0224825C)); Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, 4, 32); @@ -221,15 +222,15 @@ static void ov6_0224825C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy v0->unk_EC = 0; } -static void ov6_022482BC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_022482BC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0224825C * v0 = param2; + UnkStruct_ov6_0224825C *v0 = param2; ov6_022481BC(&v0->unk_00, &v0->unk_DC); } -static void ov6_022482CC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_022482CC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0224825C * v0 = param2; + UnkStruct_ov6_0224825C *v0 = param2; int v1; BOOL v2; @@ -249,31 +250,31 @@ static void ov6_022482CC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -static void ov6_02248300 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_02248300(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_0224825C * v0 = param2; + UnkStruct_ov6_0224825C *v0 = param2; ov6_02248254(&v0->unk_00); } -UnkStruct_ov5_021D1BEC * ov6_0224830C (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov6_0224830C(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, sizeof(UnkStruct_ov6_0224825C), ov6_0224825C, ov6_022482BC, ov6_022482CC, ov6_02248300 }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -void ov6_02248320 (UnkStruct_ov5_021D1BEC * param0) +void ov6_02248320(UnkStruct_ov5_021D1BEC *param0) { ov5_021D1BEC(param0); } -BOOL ov6_02248328 (UnkStruct_ov5_021D1BEC * param0) +BOOL ov6_02248328(UnkStruct_ov5_021D1BEC *param0) { - UnkStruct_ov6_0224825C * v0 = ov5_021D1C2C(param0); + UnkStruct_ov6_0224825C *v0 = ov5_021D1C2C(param0); if (v0->unk_EC == 1) { return 1; @@ -282,11 +283,11 @@ BOOL ov6_02248328 (UnkStruct_ov5_021D1BEC * param0) return 0; } -static void ov6_02248340 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_02248340(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_02248340 * v0 = param2; + UnkStruct_ov6_02248340 *v0 = param2; int v1; - NARC * v2; + NARC *v2; memset(v0, 0, sizeof(UnkStruct_ov6_02248340)); Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, 4, 32); @@ -302,11 +303,11 @@ static void ov6_02248340 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy v0->unk_EC = 0; } -static void ov6_022483A0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_022483A0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_02248340 * v0 = param2; + UnkStruct_ov6_02248340 *v0 = param2; int v1; - NARC * v2; + NARC *v2; memset(v0, 0, sizeof(UnkStruct_ov6_02248340)); Heap_FndInitAllocatorForExpHeap(&v0->unk_DC, 4, 32); @@ -322,15 +323,15 @@ static void ov6_022483A0 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy v0->unk_EC = 0; } -static void ov6_02248400 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_02248400(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_02248340 * v0 = param2; + UnkStruct_ov6_02248340 *v0 = param2; ov6_022481BC(&v0->unk_00, &v0->unk_DC); } -static void ov6_02248410 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_02248410(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_02248340 * v0 = param2; + UnkStruct_ov6_02248340 *v0 = param2; int v1; BOOL v2; @@ -350,13 +351,13 @@ static void ov6_02248410 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -static void ov6_02248444 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_02248444(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_02248340 * v0 = param2; + UnkStruct_ov6_02248340 *v0 = param2; ov6_02248254(&v0->unk_00); } -UnkStruct_ov5_021D1BEC * ov6_02248450 (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov6_02248450(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -366,13 +367,13 @@ UnkStruct_ov5_021D1BEC * ov6_02248450 (FieldSystem * fieldSystem) ov6_02248410, ov6_02248444 }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -UnkStruct_ov5_021D1BEC * ov6_02248464 (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov6_02248464(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -382,20 +383,20 @@ UnkStruct_ov5_021D1BEC * ov6_02248464 (FieldSystem * fieldSystem) ov6_02248410, ov6_02248444 }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -void ov6_02248478 (UnkStruct_ov5_021D1BEC * param0) +void ov6_02248478(UnkStruct_ov5_021D1BEC *param0) { ov5_021D1BEC(param0); } -BOOL ov6_02248480 (UnkStruct_ov5_021D1BEC * param0) +BOOL ov6_02248480(UnkStruct_ov5_021D1BEC *param0) { - UnkStruct_ov6_02248340 * v0 = ov5_021D1C2C(param0); + UnkStruct_ov6_02248340 *v0 = ov5_021D1C2C(param0); if (v0->unk_EC == 1) { return 1; @@ -404,11 +405,11 @@ BOOL ov6_02248480 (UnkStruct_ov5_021D1BEC * param0) return 0; } -static void ov6_02248498 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_02248498(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_02248498 * v0 = param2; + UnkStruct_ov6_02248498 *v0 = param2; int v1; - NARC * v2; + NARC *v2; memset(v0, 0, sizeof(UnkStruct_ov6_02248498)); Heap_FndInitAllocatorForExpHeap(&v0->unk_1B8, 4, 32); @@ -424,9 +425,9 @@ static void ov6_02248498 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy v0->unk_1C8 = 0; } -static void ov6_02248500 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_02248500(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_02248498 * v0 = param2; + UnkStruct_ov6_02248498 *v0 = param2; int v1; for (v1 = 0; v1 < 2; v1++) { @@ -434,11 +435,11 @@ static void ov6_02248500 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -static void ov6_02248520 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_02248520(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_02248498 * v0 = param2; + UnkStruct_ov6_02248498 *v0 = param2; BOOL v1; - NARC * v2; + NARC *v2; switch (v0->unk_1C8) { case 0: @@ -468,9 +469,9 @@ static void ov6_02248520 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -static void ov6_022485DC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_022485DC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_02248498 * v0 = param2; + UnkStruct_ov6_02248498 *v0 = param2; int v1; for (v1 = 0; v1 < 2; v1++) { @@ -478,7 +479,7 @@ static void ov6_022485DC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -UnkStruct_ov5_021D1BEC * ov6_022485F4 (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov6_022485F4(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -488,18 +489,18 @@ UnkStruct_ov5_021D1BEC * ov6_022485F4 (FieldSystem * fieldSystem) ov6_02248520, ov6_022485DC }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -void ov6_02248608 (UnkStruct_ov5_021D1BEC * param0) +void ov6_02248608(UnkStruct_ov5_021D1BEC *param0) { ov5_021D1BEC(param0); } -static void ov6_02248610 (UnkStruct_ov6_022486B4 * param0, PlayerAvatar * const playerAvatar, fx32 param2, fx32 param3) +static void ov6_02248610(UnkStruct_ov6_022486B4 *param0, PlayerAvatar *const playerAvatar, fx32 param2, fx32 param3) { VecFx32 v0; int v1; @@ -519,7 +520,7 @@ static void ov6_02248610 (UnkStruct_ov6_022486B4 * param0, PlayerAvatar * const Sound_PlayEffect(1575); } -static void ov6_02248678 (UnkStruct_ov6_022486B4 * param0) +static void ov6_02248678(UnkStruct_ov6_022486B4 *param0) { int v0; BOOL v1; @@ -540,7 +541,7 @@ static void ov6_02248678 (UnkStruct_ov6_022486B4 * param0) } } -static void ov6_022486B4 (UnkStruct_ov6_022486B4 * param0, UnkStruct_020170F4 * param1, NNSFndAllocator * param2, void ** param3) +static void ov6_022486B4(UnkStruct_ov6_022486B4 *param0, UnkStruct_020170F4 *param1, NNSFndAllocator *param2, void **param3) { int v0; @@ -555,7 +556,7 @@ static void ov6_022486B4 (UnkStruct_ov6_022486B4 * param0, UnkStruct_020170F4 * sub_02017348(¶m0->unk_00, 0); } -static void ov6_02248700 (UnkStruct_ov6_022486B4 * param0, NNSFndAllocator * param1) +static void ov6_02248700(UnkStruct_ov6_022486B4 *param0, NNSFndAllocator *param1) { int v0; @@ -566,7 +567,7 @@ static void ov6_02248700 (UnkStruct_ov6_022486B4 * param0, NNSFndAllocator * par memset(param0, 0, sizeof(UnkStruct_ov6_022486B4)); } -static void ov6_02248728 (UnkStruct_ov6_022487F8 * param0) +static void ov6_02248728(UnkStruct_ov6_022487F8 *param0) { VecFx32 v0; @@ -574,16 +575,16 @@ static void ov6_02248728 (UnkStruct_ov6_022487F8 * param0) if (((v0.x - param0->unk_CF0.x) == 0) && (v0.y < param0->unk_CF0.y) && (v0.z > param0->unk_CF0.z)) { param0->unk_CE8 = 0; - param0->unk_CEC = ((16 * FX32_ONE)) * 2; + param0->unk_CEC = (16 * FX32_ONE) * 2; } else { param0->unk_CE8 = ((16 * FX32_ONE) * 2); - param0->unk_CEC = ((16 * FX32_ONE)); + param0->unk_CEC = (16 * FX32_ONE); } param0->unk_CF0 = v0; } -static void ov6_02248798 (UnkStruct_ov6_022487F8 * param0) +static void ov6_02248798(UnkStruct_ov6_022487F8 *param0) { int v0; @@ -599,7 +600,7 @@ static void ov6_02248798 (UnkStruct_ov6_022487F8 * param0) GF_ASSERT(0); } -static void ov6_022487E0 (UnkStruct_ov6_022487F8 * param0) +static void ov6_022487E0(UnkStruct_ov6_022487F8 *param0) { int v0; @@ -608,11 +609,11 @@ static void ov6_022487E0 (UnkStruct_ov6_022487F8 * param0) } } -static void ov6_022487F8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_022487F8(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_022487F8 * v0 = param2; + UnkStruct_ov6_022487F8 *v0 = param2; int v1; - NARC * v2; + NARC *v2; memset(v0, 0, sizeof(UnkStruct_ov6_022487F8)); Heap_FndInitAllocatorForExpHeap(&v0->unk_CFC, 4, 32); @@ -636,9 +637,9 @@ static void ov6_022487F8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy NARC_dtor(v2); } -static void ov6_0224889C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_0224889C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_022487F8 * v0 = param2; + UnkStruct_ov6_022487F8 *v0 = param2; int v1; for (v1 = 0; v1 < 16; v1++) { @@ -652,9 +653,9 @@ static void ov6_0224889C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -static void ov6_022488D8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_022488D8(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_022487F8 * v0 = param2; + UnkStruct_ov6_022487F8 *v0 = param2; switch (v0->unk_D0C) { case 0: @@ -672,9 +673,9 @@ static void ov6_022488D8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -static void ov6_02248914 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov6_02248914(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov6_022487F8 * v0 = param2; + UnkStruct_ov6_022487F8 *v0 = param2; int v1; for (v1 = 0; v1 < 16; v1++) { @@ -682,7 +683,7 @@ static void ov6_02248914 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSy } } -UnkStruct_ov5_021D1BEC * ov6_0224892C (FieldSystem * fieldSystem) +UnkStruct_ov5_021D1BEC *ov6_0224892C(FieldSystem *fieldSystem) { static const UnkStruct_ov6_0223E6EC v0 = { 1024, @@ -692,13 +693,13 @@ UnkStruct_ov5_021D1BEC * ov6_0224892C (FieldSystem * fieldSystem) ov6_022488D8, ov6_02248914 }; - UnkStruct_ov5_021D1BEC * v1; + UnkStruct_ov5_021D1BEC *v1; v1 = ov5_021D1B6C(fieldSystem->unk_04->unk_04, &v0); return v1; } -void ov6_02248940 (UnkStruct_ov5_021D1BEC * param0) +void ov6_02248940(UnkStruct_ov5_021D1BEC *param0) { ov5_021D1BEC(param0); } diff --git a/src/overlay006/ov6_02248948.c b/src/overlay006/ov6_02248948.c index b824172d4a..9ca3cc6e29 100644 --- a/src/overlay006/ov6_02248948.c +++ b/src/overlay006/ov6_02248948.c @@ -1,27 +1,27 @@ +#include "overlay006/ov6_02248948.h" + #include #include -#include "sys_task_manager.h" -#include "overlay005/struct_ov5_021D1BEC_decl.h" - #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay005/struct_ov5_021D1BEC_decl.h" +#include "overlay006/ov6_02248050.h" -#include "sys_task.h" #include "heap.h" -#include "overlay006/ov6_02248050.h" -#include "overlay006/ov6_02248948.h" +#include "sys_task.h" +#include "sys_task_manager.h" typedef struct { - UnkStruct_ov5_021D1BEC * unk_00; - u16 * unk_04; + UnkStruct_ov5_021D1BEC *unk_00; + u16 *unk_04; u32 unk_08; u32 unk_0C; } UnkStruct_ov6_02248948; -typedef UnkStruct_ov5_021D1BEC *(* UnkFuncPtr_ov6_02249840)(FieldSystem *); -typedef void (* UnkFuncPtr_ov6_02249834)(UnkStruct_ov5_021D1BEC *); -typedef BOOL (* UnkFuncPtr_ov6_0224984C)(UnkStruct_ov5_021D1BEC *); +typedef UnkStruct_ov5_021D1BEC *(*UnkFuncPtr_ov6_02249840)(FieldSystem *); +typedef void (*UnkFuncPtr_ov6_02249834)(UnkStruct_ov5_021D1BEC *); +typedef BOOL (*UnkFuncPtr_ov6_0224984C)(UnkStruct_ov5_021D1BEC *); static const UnkFuncPtr_ov6_02249840 Unk_ov6_02249840[3] = { ov6_0224830C, @@ -41,9 +41,9 @@ static const UnkFuncPtr_ov6_0224984C Unk_ov6_0224984C[3] = { ov6_02248480 }; -static void ov6_02248948 (SysTask * param0, void * param1) +static void ov6_02248948(SysTask *param0, void *param1) { - UnkStruct_ov6_02248948 * v0 = param1; + UnkStruct_ov6_02248948 *v0 = param1; switch (v0->unk_08) { case 0: @@ -60,9 +60,9 @@ static void ov6_02248948 (SysTask * param0, void * param1) } } -void ov6_0224899C (FieldSystem * fieldSystem, u16 * param1, u32 param2, u32 param3) +void ov6_0224899C(FieldSystem *fieldSystem, u16 *param1, u32 param2, u32 param3) { - UnkStruct_ov6_02248948 * v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov6_02248948)); + UnkStruct_ov6_02248948 *v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov6_02248948)); memset(v0, 0, sizeof(UnkStruct_ov6_02248948)); diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c index 0cd7b6543a..5eb305bb24 100644 --- a/src/overlay006/ov6_022489E4.c +++ b/src/overlay006/ov6_022489E4.c @@ -1,20 +1,19 @@ +#include "overlay006/ov6_022489E4.h" + #include #include -#include "strbuf.h" -#include "pokemon.h" - #include "struct_defs/struct_020954F0.h" #include "struct_defs/struct_02095C48.h" + #include "overlay006/struct_ov6_02248BE8.h" #include "overlay006/struct_ov6_02248DD8.h" +#include "communication_system.h" #include "heap.h" +#include "pokemon.h" #include "strbuf.h" #include "unk_0202CC64.h" -#include "communication_system.h" -#include "pokemon.h" -#include "overlay006/ov6_022489E4.h" typedef struct { u8 unk_00; @@ -23,17 +22,17 @@ typedef struct { u8 unk_03[1]; } UnkStruct_ov6_02248A94; -static int ov6_02248A94(UnkStruct_ov6_02248A94 * param0[4], int param1, u8 * param2); +static int ov6_02248A94(UnkStruct_ov6_02248A94 *param0[4], int param1, u8 *param2); -void ov6_022489E4 (int param0, int param1, void * param2, void * param3) +void ov6_022489E4(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; MI_CpuCopy8(param2, v0->unk_168[param0], param1); v0->unk_568++; if (v0->unk_568 >= v0->unk_00.unk_117) { - UnkStruct_ov6_02248A94 * v1[4]; + UnkStruct_ov6_02248A94 *v1[4]; int v2; u8 v3; @@ -47,7 +46,7 @@ void ov6_022489E4 (int param0, int param1, void * param2, void * param3) } } -BOOL ov6_02248A64 (UnkStruct_02095C48 * param0) +BOOL ov6_02248A64(UnkStruct_02095C48 *param0) { UnkStruct_ov6_02248A94 v0; @@ -62,7 +61,7 @@ BOOL ov6_02248A64 (UnkStruct_02095C48 * param0) return 0; } -static int ov6_02248A94 (UnkStruct_ov6_02248A94 * param0[4], int param1, u8 * param2) +static int ov6_02248A94(UnkStruct_ov6_02248A94 *param0[4], int param1, u8 *param2) { int v0, v1; @@ -78,12 +77,12 @@ static int ov6_02248A94 (UnkStruct_ov6_02248A94 * param0[4], int param1, u8 * pa return v1; } -void ov6_02248AC8 (int param0, int param1, void * param2, void * param3) +void ov6_02248AC8(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; int v1; int v2; - u8 * v3; + u8 *v3; v1 = Pokemon_StructSize(); v3 = param2; @@ -94,9 +93,9 @@ void ov6_02248AC8 (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL ov6_02248AF0 (UnkStruct_02095C48 * param0, int param1, const Pokemon * param2) +BOOL ov6_02248AF0(UnkStruct_02095C48 *param0, int param1, const Pokemon *param2) { - u8 * v0; + u8 *v0; int v1; int v2; @@ -115,11 +114,11 @@ BOOL ov6_02248AF0 (UnkStruct_02095C48 * param0, int param1, const Pokemon * para return v2; } -void ov6_02248B30 (int param0, int param1, void * param2, void * param3) +void ov6_02248B30(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; int v1, v2; - u8 * v3; + u8 *v3; int v4; v1 = Pokemon_StructSize(); @@ -133,9 +132,9 @@ void ov6_02248B30 (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL ov6_02248B70 (UnkStruct_02095C48 * param0, Pokemon ** param1) +BOOL ov6_02248B70(UnkStruct_02095C48 *param0, Pokemon **param1) { - u8 * v0; + u8 *v0; int v1, v2; int v3; int v4; @@ -157,12 +156,12 @@ BOOL ov6_02248B70 (UnkStruct_02095C48 * param0, Pokemon ** param1) return v3; } -void ov6_02248BC0 (int param0, int param1, void * param2, void * param3) +void ov6_02248BC0(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; int v1; int v2; - u8 * v3; + u8 *v3; v1 = sizeof(UnkStruct_ov6_02248BE8); v3 = param2; @@ -173,9 +172,9 @@ void ov6_02248BC0 (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL ov6_02248BE8 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_02248BE8 * param2) +BOOL ov6_02248BE8(UnkStruct_02095C48 *param0, int param1, const UnkStruct_ov6_02248BE8 *param2) { - u8 * v0; + u8 *v0; int v1; int v2; @@ -194,11 +193,11 @@ BOOL ov6_02248BE8 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_ return v2; } -void ov6_02248C28 (int param0, int param1, void * param2, void * param3) +void ov6_02248C28(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; int v1; - u8 * v2; + u8 *v2; int v3; v1 = sizeof(UnkStruct_020954F0) * (1 + 2) + 1; @@ -212,13 +211,13 @@ void ov6_02248C28 (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL ov6_02248C68 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_020954F0 * param2) +BOOL ov6_02248C68(UnkStruct_02095C48 *param0, int param1, const UnkStruct_020954F0 *param2) { - u8 * v0; + u8 *v0; int v1; int v2; int v3; - const UnkStruct_020954F0 * v4; + const UnkStruct_020954F0 *v4; v4 = param2; v1 = sizeof(UnkStruct_020954F0) * (1 + 2) + 1; @@ -241,12 +240,12 @@ BOOL ov6_02248C68 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_0209 return v2; } -void ov6_02248CBC (int param0, int param1, void * param2, void * param3) +void ov6_02248CBC(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; int v1, v2, v3; - u8 * v4; - u16 * v5; + u8 *v4; + u16 *v5; v3 = 4; v4 = param2; @@ -260,10 +259,10 @@ void ov6_02248CBC (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL ov6_02248CE8 (UnkStruct_02095C48 * param0, int param1, const Strbuf *param2) +BOOL ov6_02248CE8(UnkStruct_02095C48 *param0, int param1, const Strbuf *param2) { int v0, v1; - u8 * v2; + u8 *v2; BOOL v3; u16 v4[8]; @@ -289,12 +288,12 @@ BOOL ov6_02248CE8 (UnkStruct_02095C48 * param0, int param1, const Strbuf *param2 return v3; } -void ov6_02248D38 (int param0, int param1, void * param2, void * param3) +void ov6_02248D38(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; int v1; int v2; - u8 * v3; + u8 *v3; v1 = ChatotCry_SaveSize(); v3 = param2; @@ -305,9 +304,9 @@ void ov6_02248D38 (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL ov6_02248D64 (UnkStruct_02095C48 * param0, int param1, void * param2) +BOOL ov6_02248D64(UnkStruct_02095C48 *param0, int param1, void *param2) { - u8 * v0; + u8 *v0; int v1; int v2; @@ -329,13 +328,13 @@ BOOL ov6_02248D64 (UnkStruct_02095C48 * param0, int param1, void * param2) return v2; } -void ov6_02248DA0 (int param0, int param1, void * param2, void * param3) +void ov6_02248DA0(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; int v1; int v2; - u8 * v3; - UnkStruct_ov6_02248DD8 * v4; + u8 *v3; + UnkStruct_ov6_02248DD8 *v4; v1 = sizeof(UnkStruct_ov6_02248DD8); v4 = param2; @@ -349,9 +348,9 @@ void ov6_02248DA0 (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL ov6_02248DD8 (UnkStruct_02095C48 * param0, int param1, const UnkStruct_ov6_02248DD8 * param2) +BOOL ov6_02248DD8(UnkStruct_02095C48 *param0, int param1, const UnkStruct_ov6_02248DD8 *param2) { - u8 * v0; + u8 *v0; int v1; int v2; diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c index c61c7205fa..2d612bcc7a 100644 --- a/src/overlay007/communication_club.c +++ b/src/overlay007/communication_club.c @@ -1,72 +1,69 @@ +#include "overlay007/communication_club.h" + #include #include -#include "core_sys.h" +#include "constants/communication/comm_type.h" +#include "consts/sdat.h" #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "trainer_info.h" - #include "struct_defs/struct_02013A04_t.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system.h" +#include "gmm/message_bank_unk_0353.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_comm_manager.h" +#include "field_system.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02005474.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" -#include "field_system.h" -#include "field_comm_manager.h" #include "unk_0205D8CC.h" -#include "overlay007/communication_club.h" - -#include "consts/sdat.h" -#include "constants/communication/comm_type.h" -#include "gmm/message_bank_unk_0353.h" typedef struct CommClubManager CommClubManager; -typedef void (* CommClubManTaskFunc)(SysTask *, void *); -typedef void (* UnkFuncPtr_ov7_02249C2C_1)(CommClubManager *); +typedef void (*CommClubManTaskFunc)(SysTask *, void *); +typedef void (*UnkFuncPtr_ov7_02249C2C_1)(CommClubManager *); typedef struct CommClubManager { - Strbuf* strBuff[8]; + Strbuf *strBuff[8]; Window unk_20; Window unk_30; Window msgWindow; - StringTemplate * unk_50; - StringTemplate * unk_54; - StringTemplate * strTempMsg; - BmpList * unk_5C; - UIControlData * unk_60; - ResourceMetadata * unk_64; - FieldSystem * fieldSystem; + StringTemplate *unk_50; + StringTemplate *unk_54; + StringTemplate *strTempMsg; + BmpList *unk_5C; + UIControlData *unk_60; + ResourceMetadata *unk_64; + FieldSystem *fieldSystem; CommClubManTaskFunc commClubTask; UnkFuncPtr_ov7_02249C2C_1 unk_70; - MessageLoader * msgLoader; - TrainerInfo * trainerInfoPersonal; - TrainerInfo * unk_7C; + MessageLoader *msgLoader; + TrainerInfo *trainerInfoPersonal; + TrainerInfo *unk_7C; u8 unk_80[8]; u32 retCode; u16 unk_8C; @@ -90,62 +87,62 @@ enum CommClubRetCode { COMM_CLUB_RET_4, }; -static void CommClubMan_Run(SysTask * task, void * param1); +static void CommClubMan_Run(SysTask *task, void *param1); static void CommClubMan_SetTask(CommClubManTaskFunc param0); static void CommClubMan_PrintMessage(int param0, BOOL param1); -static void CommClubMan_StartBattleClient(CommClubManager * param0); -static void ov7_0224A510(CommClubManager * param0); -static void ov7_02249C44(BmpList * param0, u32 param1, u8 param2); -static void ov7_02249C64(BmpList * param0, u32 param1, u8 param2); -static void ov7_02249C94(BmpList * param0, u32 param1, u8 param2); -static void CommClubMan_PrintChooseJoinMsg(CommClubManager * param0); -static void CommClubMan_DisplayPersonalTrainerInfo(CommClubManager * param0); -static void ov7_02249F54(SysTask * param0, void * param1); -static void ov7_02249FFC(SysTask * param0, void * param1); -static void ov7_0224A0C8(CommClubManager * param0); -static void CommClubTask_SelectServerList(SysTask * param0, void * param1); -static void ov7_0224A34C(SysTask * param0, void * param1); -static void CommClubTask_WaitConfirmLeaveGroup(SysTask * param0, void * param1); -static void CommClubTask_LeaveGroup(SysTask * param0, void * param1); +static void CommClubMan_StartBattleClient(CommClubManager *param0); +static void ov7_0224A510(CommClubManager *param0); +static void ov7_02249C44(BmpList *param0, u32 param1, u8 param2); +static void ov7_02249C64(BmpList *param0, u32 param1, u8 param2); +static void ov7_02249C94(BmpList *param0, u32 param1, u8 param2); +static void CommClubMan_PrintChooseJoinMsg(CommClubManager *param0); +static void CommClubMan_DisplayPersonalTrainerInfo(CommClubManager *param0); +static void ov7_02249F54(SysTask *param0, void *param1); +static void ov7_02249FFC(SysTask *param0, void *param1); +static void ov7_0224A0C8(CommClubManager *param0); +static void CommClubTask_SelectServerList(SysTask *param0, void *param1); +static void ov7_0224A34C(SysTask *param0, void *param1); +static void CommClubTask_WaitConfirmLeaveGroup(SysTask *param0, void *param1); +static void CommClubTask_LeaveGroup(SysTask *param0, void *param1); static void CommClubMan_Disconnect(void); -static void ov7_0224A53C(CommClubManager * param0); +static void ov7_0224A53C(CommClubManager *param0); static void ov7_0224A5D0(void); -static void ov7_0224A64C(CommClubManager * param0); -static void ov7_0224A438(BmpList * param0, u32 param1, u8 param2); -static void ov7_0224A72C(SysTask * param0, void * param1); -static void ov7_0224A7D0(SysTask * param0, void * param1); -static void ov7_0224A97C(SysTask * param0, void * param1); -static void ov7_0224ABA4(SysTask * param0, void * param1); -static void ov7_0224ABE0(SysTask * param0, void * param1); -static void ov7_0224AC08(SysTask * param0, void * param1); -static void ov7_0224AC48(SysTask * param0, void * param1); -static void ov7_0224ACA4(SysTask * param0, void * param1); -static void ov7_0224AE10(SysTask * param0, void * param1); -static void ov7_0224AD68(SysTask * param0, void * param1); -static void ov7_0224ADD8(SysTask * param0, void * param1); -static void ov7_0224AECC(SysTask * param0, void * param1); -static void ov7_0224AE78(SysTask * param0, void * param1); -static void ov7_0224AF2C(SysTask * param0, void * param1); -static void ov7_0224AF84(SysTask * param0, void * param1); -static void CommClubTask_DifferentRegulation(SysTask * param0, void * param1); -static void CommClubMan_DestroyList(SysTask * param0, CommClubManager * param1); -static void CommClubMan_PrintPlayerContactMsg(int param0, CommClubManager * param1); -static void ov7_0224B054(CommClubManager * param0); -static void ov7_0224B08C(CommClubManager * param0); -static void ov7_0224B0E8(SysTask * param0, void * param1); -static void CommClubTask_WaitForGroup(SysTask * param0, void * param1); -static void CommClubTask_ExitGuestRoom(SysTask * param0, void * param1); -static void CommClubTask_ExitGuestRoomEnd(SysTask * param0, void * param1); -static void CommClubMan_PlayerRefused(CommClubManager * param0); -static void ov7_0224B31C(SysTask * param0, void * param1); -static void ov7_0224B348(CommClubManager * param0); -static void ov7_0224B370(SysTask * param0, void * param1); -static void ov7_0224B3A8(CommClubManager * param0); +static void ov7_0224A64C(CommClubManager *param0); +static void ov7_0224A438(BmpList *param0, u32 param1, u8 param2); +static void ov7_0224A72C(SysTask *param0, void *param1); +static void ov7_0224A7D0(SysTask *param0, void *param1); +static void ov7_0224A97C(SysTask *param0, void *param1); +static void ov7_0224ABA4(SysTask *param0, void *param1); +static void ov7_0224ABE0(SysTask *param0, void *param1); +static void ov7_0224AC08(SysTask *param0, void *param1); +static void ov7_0224AC48(SysTask *param0, void *param1); +static void ov7_0224ACA4(SysTask *param0, void *param1); +static void ov7_0224AE10(SysTask *param0, void *param1); +static void ov7_0224AD68(SysTask *param0, void *param1); +static void ov7_0224ADD8(SysTask *param0, void *param1); +static void ov7_0224AECC(SysTask *param0, void *param1); +static void ov7_0224AE78(SysTask *param0, void *param1); +static void ov7_0224AF2C(SysTask *param0, void *param1); +static void ov7_0224AF84(SysTask *param0, void *param1); +static void CommClubTask_DifferentRegulation(SysTask *param0, void *param1); +static void CommClubMan_DestroyList(SysTask *param0, CommClubManager *param1); +static void CommClubMan_PrintPlayerContactMsg(int param0, CommClubManager *param1); +static void ov7_0224B054(CommClubManager *param0); +static void ov7_0224B08C(CommClubManager *param0); +static void ov7_0224B0E8(SysTask *param0, void *param1); +static void CommClubTask_WaitForGroup(SysTask *param0, void *param1); +static void CommClubTask_ExitGuestRoom(SysTask *param0, void *param1); +static void CommClubTask_ExitGuestRoomEnd(SysTask *param0, void *param1); +static void CommClubMan_PlayerRefused(CommClubManager *param0); +static void ov7_0224B31C(SysTask *param0, void *param1); +static void ov7_0224B348(CommClubManager *param0); +static void ov7_0224B370(SysTask *param0, void *param1); +static void ov7_0224B3A8(CommClubManager *param0); static int CommClubMan_MaxPlayers(void); static int CommClubMan_MinPlayers(void); static int CommClubMan_Regulation(void); -static CommClubManager * sCommClubMan = NULL; +static CommClubManager *sCommClubMan = NULL; static const UnkStruct_ov61_0222C884 Unk_ov7_0224ED0C = { 0x3, @@ -157,7 +154,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov7_0224ED0C = { 0x21F }; -static void CommClubMan_PrintMessage (int msgId, BOOL format) +static void CommClubMan_PrintMessage(int msgId, BOOL format) { if (!FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) { PrintString_ForceStop(sCommClubMan->printMsgIndex); @@ -178,7 +175,7 @@ static void CommClubMan_PrintMessage (int msgId, BOOL format) sCommClubMan->printMsgIndex = FieldMessage_Print(&sCommClubMan->msgWindow, sCommClubMan->strBuff[5], SaveData_Options(sCommClubMan->fieldSystem->saveData), 1); } -static void CommClubMan_CreateList (UnkStruct_ov84_02240FA8 param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5) +static void CommClubMan_CreateList(UnkStruct_ov84_02240FA8 param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5) { if (!BGL_WindowAdded(&sCommClubMan->unk_20)) { BGL_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_20, 3, param1, param2, param3, param4, 13, param5); @@ -194,7 +191,7 @@ static void CommClubMan_CreateList (UnkStruct_ov84_02240FA8 param0, u8 param1, u sub_0201A954(&sCommClubMan->unk_20); } -static void CommClubMan_Init (FieldSystem * fieldSystem) +static void CommClubMan_Init(FieldSystem *fieldSystem) { int v0; @@ -228,7 +225,7 @@ static void CommClubMan_Init (FieldSystem * fieldSystem) } } -static void CommClubMan_Delete (void) +static void CommClubMan_Delete(void) { for (int i = 0; i < 8; i++) { Strbuf_Free(sCommClubMan->strBuff[i]); @@ -261,7 +258,7 @@ static void CommClubMan_Delete (void) sCommClubMan = NULL; } -static void CommClubMan_StartBattleClient (CommClubManager * man) +static void CommClubMan_StartBattleClient(CommClubManager *man) { FieldCommMan_StartBattleClient(man->fieldSystem, man->commType, CommClubMan_Regulation()); } @@ -288,7 +285,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov7_0224ED34 = { NULL }; -static void ov7_02249C44 (BmpList * param0, u32 param1, u8 param2) +static void ov7_02249C44(BmpList *param0, u32 param1, u8 param2) { sCommClubMan->unk_98 = 1; @@ -297,14 +294,14 @@ static void ov7_02249C44 (BmpList * param0, u32 param1, u8 param2) } } -static void ov7_02249C64 (BmpList * param0, u32 param1, u8 param2) +static void ov7_02249C64(BmpList *param0, u32 param1, u8 param2) { for (int v0 = 0; v0 < sub_02001504(param0, 3); v0++) { ov7_02249C94(param0, 0, v0); } } -static void ov7_02249C94 (BmpList * param0, u32 param1, u8 param2) +static void ov7_02249C94(BmpList *param0, u32 param1, u8 param2) { int v0 = sub_02033808(); u16 cnt = 0; @@ -319,30 +316,30 @@ static void ov7_02249C94 (BmpList * param0, u32 param1, u8 param2) if (cnt < v0) { sub_020339AC(cnt, sCommClubMan->unk_7C); - + StringTemplate_SetNumber(sCommClubMan->unk_50, 0, cnt + 1, 2, 2, 1); StringTemplate_SetPlayerName(sCommClubMan->unk_50, 1, sCommClubMan->unk_7C); MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00063, sCommClubMan->strBuff[1]); - + StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[0], sCommClubMan->strBuff[1]); PrintStringSimple(&sCommClubMan->unk_20, 0, sCommClubMan->strBuff[0], 8, param2 * 16, 0xff, NULL); - + StringTemplate_SetNumber(sCommClubMan->unk_50, 2, TrainerInfo_ID(sCommClubMan->unk_7C) % 0x10000, 5, 2, 1); - //ID {ID Number} + // ID {ID Number} MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00065, sCommClubMan->strBuff[3]); - + StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[2], sCommClubMan->strBuff[3]); PrintStringSimple(&sCommClubMan->unk_20, 0, sCommClubMan->strBuff[2], 11 * 8, param2 * 16, 0xff, NULL); } else { StringTemplate_SetNumber(sCommClubMan->unk_50, 0, cnt + 1, 2, 2, 1); MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00064, sCommClubMan->strBuff[1]); - + StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[0], sCommClubMan->strBuff[1]); PrintStringSimple(&sCommClubMan->unk_20, 0, sCommClubMan->strBuff[0], 8, param2 * 16, 0xff, NULL); } } -static void CommClubMan_PrintChooseJoinMsg (CommClubManager * param0) +static void CommClubMan_PrintChooseJoinMsg(CommClubManager *param0) { if (!BGL_WindowAdded(&sCommClubMan->unk_30)) { BGL_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_30, 3, 23, 2, 8, 4, 13, (1 + 20 * 5 * 2)); @@ -358,15 +355,15 @@ static void CommClubMan_PrintChooseJoinMsg (CommClubManager * param0) CommClubMan_DisplayPersonalTrainerInfo(sCommClubMan); int sChooseJoinMsg[] = { - pl_msg_00000353_00040, //Choose the friend you want to trade Pokemon with. - pl_msg_00000353_00041, //Choose the Single Battle you would like to join. - pl_msg_00000353_00042, //Choose the Double Battle you would like to join. - pl_msg_00000353_00044, //Choose the Mix Battle you would like to join - pl_msg_00000353_00043, //Choose the Multi Battle you would like to join + pl_msg_00000353_00040, // Choose the friend you want to trade Pokemon with. + pl_msg_00000353_00041, // Choose the Single Battle you would like to join. + pl_msg_00000353_00042, // Choose the Double Battle you would like to join. + pl_msg_00000353_00044, // Choose the Mix Battle you would like to join + pl_msg_00000353_00043, // Choose the Multi Battle you would like to join pl_msg_00000353_00043, - pl_msg_00000353_00045, //Choose the friend(s) you want to cook with. - pl_msg_00000353_00046, //Chose the friend(s) you want to mix records with - pl_msg_00000353_00047, //Choose the friends you want to hold a Contest with. + pl_msg_00000353_00045, // Choose the friend(s) you want to cook with. + pl_msg_00000353_00046, // Chose the friend(s) you want to mix records with + pl_msg_00000353_00047, // Choose the friends you want to hold a Contest with. pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, @@ -374,7 +371,7 @@ static void CommClubMan_PrintChooseJoinMsg (CommClubManager * param0) pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, - pl_msg_00000353_00048, //Choose the friend you want to take to the Battle Tower. + pl_msg_00000353_00048, // Choose the friend you want to take to the Battle Tower. pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, @@ -385,12 +382,12 @@ static void CommClubMan_PrintChooseJoinMsg (CommClubManager * param0) pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, - pl_msg_00000353_00049, //Choose the friend you want to play with at the Battle Factory--Level 50 - pl_msg_00000353_00050, //Choose the friend you want to play with at the Battle Factory--Open Level + pl_msg_00000353_00049, // Choose the friend you want to play with at the Battle Factory--Level 50 + pl_msg_00000353_00050, // Choose the friend you want to play with at the Battle Factory--Open Level pl_msg_00000353_00000, - pl_msg_00000353_00051, //Choose the friend you want to play with at the Battle Hall. - pl_msg_00000353_00052, //Choose the friend you want to play with at the Battle Castle. - pl_msg_00000353_00053 //Chose the friend you want to play with at the Battle Factory + pl_msg_00000353_00051, // Choose the friend you want to play with at the Battle Hall. + pl_msg_00000353_00052, // Choose the friend you want to play with at the Battle Castle. + pl_msg_00000353_00053 // Chose the friend you want to play with at the Battle Factory }; if (sCommClubMan->commType == COMM_TYPE_CONTEST) { @@ -399,11 +396,11 @@ static void CommClubMan_PrintChooseJoinMsg (CommClubManager * param0) } else { CommClubMan_PrintMessage(sChooseJoinMsg[sCommClubMan->commType], FALSE); } - + CommClubMan_SetTask(ov7_02249F54); } -static void CommClubMan_DisplayPersonalTrainerInfo (CommClubManager * param0) +static void CommClubMan_DisplayPersonalTrainerInfo(CommClubManager *param0) { StringTemplate_SetPlayerName(sCommClubMan->unk_54, 0, sCommClubMan->trainerInfoPersonal); StringTemplate_SetNumber(sCommClubMan->unk_54, 1, TrainerInfo_ID(sCommClubMan->trainerInfoPersonal) % 0x10000, 5, 2, 1); @@ -412,7 +409,7 @@ static void CommClubMan_DisplayPersonalTrainerInfo (CommClubManager * param0) PrintStringSimple(&sCommClubMan->unk_30, 0, sCommClubMan->strBuff[7], 2, 2, 0, NULL); } -static void ov7_02249F54 (SysTask * task, void * data) +static void ov7_02249F54(SysTask *task, void *data) { if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) { int v2; @@ -431,11 +428,11 @@ static void ov7_02249F54 (SysTask * task, void * data) } } -static void ov7_02249FFC (SysTask * task, void * param1) +static void ov7_02249FFC(SysTask *task, void *param1) { u32 v0; int v1; - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; CommClubMan_DisplayPersonalTrainerInfo(commClubMan); @@ -476,7 +473,7 @@ static void ov7_02249FFC (SysTask * task, void * param1) } } -static void ov7_0224A0C8 (CommClubManager * commClubMan) +static void ov7_0224A0C8(CommClubManager *commClubMan) { if (sub_02033870() || sCommClubMan->unk_98) { sCommClubMan->unk_98 = 0; @@ -611,9 +608,9 @@ asm static void CommClubTask_SelectServerList (SysTask * task, void * param1) pop {r4, r5, pc} } -static BOOL ov7_0224A244 (SysTask * task, void * data) +static BOOL ov7_0224A244(SysTask *task, void *data) { - CommClubManager * commClubMan = data; + CommClubManager *commClubMan = data; if (CommSys_CheckError()) { CommClubMan_DestroyList(task, commClubMan); @@ -628,7 +625,7 @@ static BOOL ov7_0224A244 (SysTask * task, void * data) CommClubMan_DestroyList(task, commClubMan); CommClubMan_PlayerRefused(commClubMan); } else if (CommList_Get(0, 4) == CommSys_CurNetId()) { - CommClubMan_PrintMessage(pl_msg_00000353_00097, FALSE); //Players have choseen different rules. The same rules must be chosen. + CommClubMan_PrintMessage(pl_msg_00000353_00097, FALSE); // Players have choseen different rules. The same rules must be chosen. CommClubMan_SetTask(CommClubTask_DifferentRegulation); } else if (CommList_Get(0, 2) == CommSys_CurNetId()) { CommList_Refresh(); @@ -651,7 +648,7 @@ static BOOL ov7_0224A244 (SysTask * task, void * data) return TRUE; } -static void ov7_0224A34C (SysTask * task, void * param1) +static void ov7_0224A34C(SysTask *task, void *param1) { if (!FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) { return; @@ -660,30 +657,30 @@ static void ov7_0224A34C (SysTask * task, void * param1) if (ov7_0224A244(task, param1)) { return; } - - if (( PAD_BUTTON_B ) & gCoreSys.pressedKeys) { - CommClubMan_PrintMessage(pl_msg_00000353_00003, FALSE); //Do you want to leave the group? + + if ((PAD_BUTTON_B)&gCoreSys.pressedKeys) { + CommClubMan_PrintMessage(pl_msg_00000353_00003, FALSE); // Do you want to leave the group? CommClubMan_SetTask(CommClubTask_WaitConfirmLeaveGroup); } } -static void CommClubTask_WaitConfirmLeaveGroup (SysTask * task, void * data) +static void CommClubTask_WaitConfirmLeaveGroup(SysTask *task, void *data) { - CommClubManager * commClubMan = data; + CommClubManager *commClubMan = data; if (ov7_0224A244(task, data)) { return; - } - + } + if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) { commClubMan->unk_60 = sub_02002100(sCommClubMan->fieldSystem->unk_08, &Unk_ov7_0224ED0C, 1024 - (18 + 12) - 9, 11, 4); CommClubMan_SetTask(CommClubTask_LeaveGroup); } } -static void CommClubTask_LeaveGroup (SysTask * task, void * data) +static void CommClubTask_LeaveGroup(SysTask *task, void *data) { - CommClubManager * v0 = data; + CommClubManager *v0 = data; u32 v1; if (ov7_0224A244(task, data)) { @@ -696,7 +693,7 @@ static void CommClubTask_LeaveGroup (SysTask * task, void * data) if (v1 == 0) { CommClubMan_DestroyList(task, v0); - CommClubMan_PrintMessage(pl_msg_00000353_00006, FALSE); //You have left the group. + CommClubMan_PrintMessage(pl_msg_00000353_00006, FALSE); // You have left the group. ov7_0224B348(v0); } else if (v1 != 0xffffffff) { CommClubMan_SetTask(CommClubTask_SelectServerList); @@ -725,7 +722,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov7_0224ED14 = { NULL }; -static void ov7_0224A438 (BmpList * param0, u32 param1, u8 param2) +static void ov7_0224A438(BmpList *param0, u32 param1, u8 param2) { u16 v0 = 0; @@ -738,34 +735,34 @@ static void ov7_0224A438 (BmpList * param0, u32 param1, u8 param2) if (NULL != CommInfo_TrainerInfo(v0)) { StringTemplate_SetPlayerName(sCommClubMan->unk_50, 0, CommInfo_TrainerInfo(v0)); MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00066, sCommClubMan->strBuff[1]); - + StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[0], sCommClubMan->strBuff[1]); PrintStringSimple(&sCommClubMan->unk_20, 0, sCommClubMan->strBuff[0], 8, param2 * 16, 0, NULL); - + StringTemplate_SetNumber(sCommClubMan->unk_50, 2, TrainerInfo_ID_LowHalf(CommInfo_TrainerInfo(v0)), 5, 2, 1); MessageLoader_GetStrbuf(sCommClubMan->msgLoader, pl_msg_00000353_00065, sCommClubMan->strBuff[3]); - + StringTemplate_Format(sCommClubMan->unk_50, sCommClubMan->strBuff[2], sCommClubMan->strBuff[3]); PrintStringSimple(&sCommClubMan->unk_20, 0, sCommClubMan->strBuff[2], 9 * 8, param2 * 16, 0, NULL); } } -static void ov7_0224A510 (CommClubManager * commClubMan) +static void ov7_0224A510(CommClubManager *commClubMan) { FieldCommMan_StartBattleServer(commClubMan->fieldSystem, commClubMan->commType, CommClubMan_Regulation()); } -static void CommClubMan_Disconnect (void) +static void CommClubMan_Disconnect(void) { FieldCommMan_EndBattle(); } -static void CommClubMan_SetTask (CommClubManTaskFunc stateFunc) +static void CommClubMan_SetTask(CommClubManTaskFunc stateFunc) { sCommClubMan->commClubTask = stateFunc; } -static void ov7_0224A53C (CommClubManager * man) +static void ov7_0224A53C(CommClubManager *man) { int v0; @@ -786,18 +783,18 @@ static void ov7_0224A53C (CommClubManager * man) CommClubMan_SetTask(ov7_0224A72C); } -static void ov7_0224A5D0 (void) +static void ov7_0224A5D0(void) { int sAwaitingContactMsg[] = { - pl_msg_00000353_00007, //XXXXXXXXXXXXXXXXXXXXXX - pl_msg_00000353_00008, //Single Battle! Awaiting contact from your friend. - pl_msg_00000353_00009, //Double Battle! Awaiting contact from your friend. - pl_msg_00000353_00011, //Mix Battle! Awaiting contact from your friend. - pl_msg_00000353_00010, //Multi Battle! Awaiting contact from your friends. + pl_msg_00000353_00007, // XXXXXXXXXXXXXXXXXXXXXX + pl_msg_00000353_00008, // Single Battle! Awaiting contact from your friend. + pl_msg_00000353_00009, // Double Battle! Awaiting contact from your friend. + pl_msg_00000353_00011, // Mix Battle! Awaiting contact from your friend. + pl_msg_00000353_00010, // Multi Battle! Awaiting contact from your friends. pl_msg_00000353_00010, - pl_msg_00000353_00012, //When the group is ready: A Button: Proceed B Button: Cancel - pl_msg_00000353_00013, //Record Corner! Awaiting contact from your friend(s). - pl_msg_00000353_00014, //When the group is ready: A Button: Proceed B Button: Cancel + pl_msg_00000353_00012, // When the group is ready: A Button: Proceed B Button: Cancel + pl_msg_00000353_00013, // Record Corner! Awaiting contact from your friend(s). + pl_msg_00000353_00014, // When the group is ready: A Button: Proceed B Button: Cancel pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, @@ -805,7 +802,7 @@ static void ov7_0224A5D0 (void) pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, - pl_msg_00000353_00015, //Battle Tower! Awaiting contact from your friend. + pl_msg_00000353_00015, // Battle Tower! Awaiting contact from your friend. pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, @@ -816,12 +813,12 @@ static void ov7_0224A5D0 (void) pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, - pl_msg_00000353_00016, //Battle Factory--Level 50! Awaiting contact from your friend. - pl_msg_00000353_00017, //Battle Factory--Open Level! Awaiting contact from your friend. + pl_msg_00000353_00016, // Battle Factory--Level 50! Awaiting contact from your friend. + pl_msg_00000353_00017, // Battle Factory--Open Level! Awaiting contact from your friend. pl_msg_00000353_00000, - pl_msg_00000353_00018, //Battle Hall! Awaiting contact from your friend. - pl_msg_00000353_00019, //Battle Castle! Awaiting contact from your friend. - pl_msg_00000353_00020 //Battle Arcade! Awaiting contact from your friend. + pl_msg_00000353_00018, // Battle Hall! Awaiting contact from your friend. + pl_msg_00000353_00019, // Battle Castle! Awaiting contact from your friend. + pl_msg_00000353_00020 // Battle Arcade! Awaiting contact from your friend. }; GF_ASSERT(sCommClubMan->commType < (sizeof(sAwaitingContactMsg) / sizeof(int))); @@ -839,7 +836,7 @@ static void ov7_0224A5D0 (void) } } -static void ov7_0224A64C (CommClubManager * commClubMan) +static void ov7_0224A64C(CommClubManager *commClubMan) { int msg, playerCnt; @@ -853,13 +850,13 @@ static void ov7_0224A64C (CommClubManager * commClubMan) StringTemplate_SetNumber(sCommClubMan->unk_54, 0, playerCnt, 2, 5, 1); BGL_FillWindow(&sCommClubMan->unk_30, 15); - + MessageLoader_GetStrbuf(sCommClubMan->msgLoader, msg, sCommClubMan->strBuff[7]); StringTemplate_Format(sCommClubMan->unk_54, sCommClubMan->strBuff[6], sCommClubMan->strBuff[7]); PrintStringSimple(&sCommClubMan->unk_30, 0, sCommClubMan->strBuff[6], 2, 2, 0, NULL); } -static void CommClubMan_PrintPlayerContactMsg (int netId, CommClubManager * commClubMan) +static void CommClubMan_PrintPlayerContactMsg(int netId, CommClubManager *commClubMan) { int sContactMsg[] = { pl_msg_00000353_00021, //{Player} has contacted you. Would you like to trade? @@ -894,9 +891,9 @@ static void CommClubMan_PrintPlayerContactMsg (int netId, CommClubManager * comm pl_msg_00000353_00000, pl_msg_00000353_00028, //{Player} has contacted you. Start the Battle Hall challenge? pl_msg_00000353_00029, //{Player} has contacted you. Start the Battle Castle challenge? - pl_msg_00000353_00030 //{Player} has contacted you. Start the Battle Arcade challenge? + pl_msg_00000353_00030 //{Player} has contacted you. Start the Battle Arcade challenge? }; - TrainerInfo * trainerInfo = CommInfo_TrainerInfo(netId); + TrainerInfo *trainerInfo = CommInfo_TrainerInfo(netId); if (trainerInfo != NULL) { StringTemplate_SetPlayerName(commClubMan->strTempMsg, 1, trainerInfo); @@ -905,9 +902,9 @@ static void CommClubMan_PrintPlayerContactMsg (int netId, CommClubManager * comm CommClubMan_PrintMessage(sContactMsg[commClubMan->commType], TRUE); } -static void CommClubMan_Run (SysTask * task, void * param1) +static void CommClubMan_Run(SysTask *task, void *param1) { - CommClubManager * man = (CommClubManager *)param1; + CommClubManager *man = (CommClubManager *)param1; if (sCommClubMan->commClubTask != NULL) { CommClubManTaskFunc stateFunc = sCommClubMan->commClubTask; @@ -916,9 +913,9 @@ static void CommClubMan_Run (SysTask * task, void * param1) } } -static void ov7_0224A72C (SysTask * task, void * param1) +static void ov7_0224A72C(SysTask *task, void *param1) { - CommClubManager * v0 = (CommClubManager *)param1; + CommClubManager *v0 = (CommClubManager *)param1; u32 v1 = 0xffffffff; ov7_0224A64C(v0); @@ -943,9 +940,9 @@ static void ov7_0224A72C (SysTask * task, void * param1) } } -static void ov7_0224A7D0 (SysTask * task, void * param1) +static void ov7_0224A7D0(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; int v2; @@ -1000,12 +997,12 @@ static void ov7_0224A7D0 (SysTask * task, void * param1) pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, - pl_msg_00000353_00032, //Multi Battle! Is this group OK? + pl_msg_00000353_00032, // Multi Battle! Is this group OK? pl_msg_00000353_00032, pl_msg_00000353_00032, - pl_msg_00000353_00033, //Is this group OK? - pl_msg_00000353_00034, //Record Center! Is this group OK? - pl_msg_00000353_00035, //Contest! Is this group OK? + pl_msg_00000353_00033, // Is this group OK? + pl_msg_00000353_00034, // Record Center! Is this group OK? + pl_msg_00000353_00035, // Contest! Is this group OK? pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, @@ -1043,9 +1040,9 @@ static void ov7_0224A7D0 (SysTask * task, void * param1) } } -static void ov7_0224A97C (SysTask * task, void * param1) +static void ov7_0224A97C(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; int v2; @@ -1085,7 +1082,7 @@ static void ov7_0224A97C (SysTask * task, void * param1) } else if (v1 == 0) { if ((commClubMan->commType == COMM_TYPE_SINGLE_BATTLE) || (commClubMan->commType == COMM_TYPE_DOUBLE_BATTLE)) { if (!CommInfo_CheckBattleRegulation()) { - CommClubMan_PrintMessage(pl_msg_00000353_00097, FALSE); //Players have chosen different rules. The same rules must be chosen. + CommClubMan_PrintMessage(pl_msg_00000353_00097, FALSE); // Players have chosen different rules. The same rules must be chosen. CommClubMan_SetTask(CommClubTask_DifferentRegulation); sub_02036594(4, commClubMan->unk_95); return; @@ -1128,9 +1125,9 @@ static void ov7_0224A97C (SysTask * task, void * param1) } } -static void CommClubTask_DifferentRegulation (SysTask * task, void * param1) +static void CommClubTask_DifferentRegulation(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -1141,9 +1138,9 @@ static void CommClubTask_DifferentRegulation (SysTask * task, void * param1) } } -static void ov7_0224ABA4 (SysTask * task, void * param1) +static void ov7_0224ABA4(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; ov7_0224A64C(commClubMan); @@ -1156,9 +1153,9 @@ static void ov7_0224ABA4 (SysTask * task, void * param1) } } -static void ov7_0224ABE0 (SysTask * task, void * param1) +static void ov7_0224ABE0(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; ov7_0224A64C(commClubMan); @@ -1168,9 +1165,9 @@ static void ov7_0224ABE0 (SysTask * task, void * param1) } } -static void ov7_0224AC08 (SysTask * task, void * param1) +static void ov7_0224AC08(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; int sGroupConfirmMsg[] = { pl_msg_00000353_00000, @@ -1213,9 +1210,9 @@ static void ov7_0224AC08 (SysTask * task, void * param1) CommClubMan_SetTask(ov7_0224AC48); } -static void ov7_0224AC48 (SysTask * task, void * param1) +static void ov7_0224AC48(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; ov7_0224A64C(commClubMan); @@ -1229,9 +1226,9 @@ static void ov7_0224AC48 (SysTask * task, void * param1) } } -static void ov7_0224ACA4 (SysTask * task, void * param1) +static void ov7_0224ACA4(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; int v2; @@ -1267,19 +1264,19 @@ static void ov7_0224ACA4 (SysTask * task, void * param1) } } -static void ov7_0224AD68 (SysTask * task, void * param1) +static void ov7_0224AD68(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; int v1[] = { - pl_msg_00000353_00000, //There appears to be a problem... + pl_msg_00000353_00000, // There appears to be a problem... pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, - pl_msg_00000353_00054, //A member has dropped out. - pl_msg_00000353_00055, //Record mixing with tthis group will be canceled. - pl_msg_00000353_00056, //A Contest involving this group will be canceled. + pl_msg_00000353_00054, // A member has dropped out. + pl_msg_00000353_00055, // Record mixing with tthis group will be canceled. + pl_msg_00000353_00056, // A Contest involving this group will be canceled. pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, @@ -1309,7 +1306,7 @@ static void ov7_0224AD68 (SysTask * task, void * param1) CommClubMan_DestroyList(task, commClubMan); if (sCommClubMan->commType == COMM_TYPE_CONTEST) { - //The {contest type} with these members will be canceled. + // The {contest type} with these members will be canceled. CommClubMan_PrintMessage(pl_msg_00000353_00118 + sCommClubMan->unk_92, 0); } else { CommClubMan_PrintMessage(v1[commClubMan->commType], 0); @@ -1319,7 +1316,7 @@ static void ov7_0224AD68 (SysTask * task, void * param1) SysTask_Start(ov7_0224ADD8, commClubMan, 0); } -static void ov7_0224ADD8 (SysTask * task, void * param1) +static void ov7_0224ADD8(SysTask *task, void *param1) { if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -1329,20 +1326,20 @@ static void ov7_0224ADD8 (SysTask * task, void * param1) } } -static void ov7_0224AE10 (SysTask * task, void * param1) +static void ov7_0224AE10(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; int v2[] = { - pl_msg_00000353_00000, //There appears to be an error... + pl_msg_00000353_00000, // There appears to be an error... pl_msg_00000353_00000, pl_msg_00000353_00000, - pl_msg_00000353_00036, //Cancel a Multi Battle involving this group? + pl_msg_00000353_00036, // Cancel a Multi Battle involving this group? pl_msg_00000353_00036, pl_msg_00000353_00036, - pl_msg_00000353_00037, //Cancel the cooking session? - pl_msg_00000353_00038, //Cancel mixing records with this group? - pl_msg_00000353_00039, //Cancel holding a Contest with this group? + pl_msg_00000353_00037, // Cancel the cooking session? + pl_msg_00000353_00038, // Cancel mixing records with this group? + pl_msg_00000353_00039, // Cancel holding a Contest with this group? pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, @@ -1381,9 +1378,9 @@ static void ov7_0224AE10 (SysTask * task, void * param1) } } -static void ov7_0224AE78 (SysTask * task, void * param1) +static void ov7_0224AE78(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; ov7_0224A64C(commClubMan); sub_02001288(commClubMan->unk_5C); @@ -1394,9 +1391,9 @@ static void ov7_0224AE78 (SysTask * task, void * param1) } } -static void ov7_0224AECC (SysTask * task, void * param1) +static void ov7_0224AECC(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; ov7_0224A64C(commClubMan); @@ -1418,9 +1415,9 @@ static void ov7_0224AECC (SysTask * task, void * param1) } } -static void ov7_0224AF2C (SysTask * task, void * param1) +static void ov7_0224AF2C(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; if (CommSys_CheckError() || (CommSys_ConnectedCount() != commClubMan->connectedCnt)) { @@ -1431,14 +1428,14 @@ static void ov7_0224AF2C (SysTask * task, void * param1) if (CommTiming_IsSyncState(10) && CommTool_IsInitialized()) { CommClubMan_DestroyList(task, commClubMan); - ov7_0224B3A8(commClubMan); + ov7_0224B3A8(commClubMan); } } } -static void ov7_0224AF84 (SysTask * task, void * param1) +static void ov7_0224AF84(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; u32 v1 = 0xffffffff; ov7_0224A64C(commClubMan); @@ -1450,7 +1447,7 @@ static void ov7_0224AF84 (SysTask * task, void * param1) } } -static void CommClubMan_DestroyList (SysTask * task, CommClubManager * param1) +static void CommClubMan_DestroyList(SysTask *task, CommClubManager *param1) { BGL_FillWindow(&sCommClubMan->msgWindow, 15); Window_Clear(¶m1->unk_20, 0); @@ -1471,20 +1468,20 @@ static void CommClubMan_DestroyList (SysTask * task, CommClubManager * param1) } } -static void ov7_0224B054 (CommClubManager * commClubMan) +static void ov7_0224B054(CommClubManager *commClubMan) { StringTemplate_SetPlayerName(commClubMan->strTempMsg, 1, CommInfo_TrainerInfo(1)); - CommClubMan_PrintMessage(pl_msg_00000353_00057, 1); //Reeplied "OK" to {} + CommClubMan_PrintMessage(pl_msg_00000353_00057, 1); // Reeplied "OK" to {} SysTask_Start(CommClubMan_Run, commClubMan, 0); CommClubMan_SetTask(ov7_0224B0E8); } -static void ov7_0224B08C (CommClubManager * commClubMan) +static void ov7_0224B08C(CommClubManager *commClubMan) { sub_020339AC(commClubMan->connectIndex, sCommClubMan->unk_7C); StringTemplate_SetPlayerName(commClubMan->strTempMsg, 1, sCommClubMan->unk_7C); - CommClubMan_PrintMessage(pl_msg_00000353_00004, 1); //Replied, "OK" + CommClubMan_PrintMessage(pl_msg_00000353_00004, 1); // Replied, "OK" commClubMan->connectedCnt = CommSys_ConnectedCount(); @@ -1494,9 +1491,9 @@ static void ov7_0224B08C (CommClubManager * commClubMan) sCommClubMan->msgDelay = (30 * 3); } -static void ov7_0224B0E8 (SysTask * task, void * param1) +static void ov7_0224B0E8(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; if ((CommSys_CurNetId() == 0) && (CommSys_ConnectedCount() != commClubMan->connectedCnt)) { CommClubMan_SetTask(CommClubTask_ExitGuestRoom); @@ -1508,9 +1505,9 @@ static void ov7_0224B0E8 (SysTask * task, void * param1) } } -static void CommClubTask_WaitForGroup (SysTask * task, void * param1) +static void CommClubTask_WaitForGroup(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; if ((CommSys_CurNetId() == 0) && (CommSys_ConnectedCount() != commClubMan->connectedCnt)) { CommClubMan_SetTask(CommClubTask_ExitGuestRoom); @@ -1544,12 +1541,12 @@ static void CommClubTask_WaitForGroup (SysTask * task, void * param1) pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, - pl_msg_00000353_00058, //Multi Battle! Waiting for the rest of the group. + pl_msg_00000353_00058, // Multi Battle! Waiting for the rest of the group. pl_msg_00000353_00058, pl_msg_00000353_00058, - pl_msg_00000353_00059, //Waiting for the rest of the group. - pl_msg_00000353_00060, //Record Center! Waiting for the rest of the group. - pl_msg_00000353_00061, //Contest! Waiting for the rest of the group. + pl_msg_00000353_00059, // Waiting for the rest of the group. + pl_msg_00000353_00060, // Record Center! Waiting for the rest of the group. + pl_msg_00000353_00061, // Contest! Waiting for the rest of the group. pl_msg_00000353_00000, pl_msg_00000353_00000, pl_msg_00000353_00000, @@ -1586,9 +1583,9 @@ static void CommClubTask_WaitForGroup (SysTask * task, void * param1) } } -static void CommClubTask_ExitGuestRoom (SysTask * task, void * param1) +static void CommClubTask_ExitGuestRoom(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) { CommClubMan_PrintMessage(pl_msg_00000353_00000, 0); @@ -1596,9 +1593,9 @@ static void CommClubTask_ExitGuestRoom (SysTask * task, void * param1) } } -static void CommClubTask_ExitGuestRoomEnd (SysTask * task, void * param1) +static void CommClubTask_ExitGuestRoomEnd(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -1609,7 +1606,7 @@ static void CommClubTask_ExitGuestRoomEnd (SysTask * task, void * param1) } } -static void CommClubMan_PlayerRefused (CommClubManager * commClubMan) +static void CommClubMan_PlayerRefused(CommClubManager *commClubMan) { sub_020339AC(commClubMan->connectIndex, sCommClubMan->unk_7C); StringTemplate_SetPlayerName(commClubMan->strTempMsg, 1, sCommClubMan->unk_7C); @@ -1620,9 +1617,9 @@ static void CommClubMan_PlayerRefused (CommClubManager * commClubMan) SysTask_Start(ov7_0224B31C, commClubMan, 0); } -static void ov7_0224B31C (SysTask * task, void * param1) +static void ov7_0224B31C(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) { FieldCommMan_ReconnectBattleClient(); @@ -1631,7 +1628,7 @@ static void ov7_0224B31C (SysTask * task, void * param1) } } -static void ov7_0224B348 (CommClubManager * commClubMan) +static void ov7_0224B348(CommClubManager *commClubMan) { FieldCommMan_ReconnectBattleClient(); @@ -1642,9 +1639,9 @@ static void ov7_0224B348 (CommClubManager * commClubMan) SysTask_Start(ov7_0224B370, commClubMan, 0); } -static void ov7_0224B370 (SysTask * task, void * param1) +static void ov7_0224B370(SysTask *task, void *param1) { - CommClubManager * commClubMan = (CommClubManager *)param1; + CommClubManager *commClubMan = (CommClubManager *)param1; if (FieldMessage_FinishedPrinting(sCommClubMan->printMsgIndex)) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -1654,7 +1651,7 @@ static void ov7_0224B370 (SysTask * task, void * param1) } } -static void ov7_0224B3A8 (CommClubManager * commClubMan) +static void ov7_0224B3A8(CommClubManager *commClubMan) { sub_02036994(0); sCommClubMan->retCode = 2; @@ -1663,22 +1660,22 @@ static void ov7_0224B3A8 (CommClubManager * commClubMan) sub_02033EA8(1); } -int CommClubMan_MinPlayers (void) +int CommClubMan_MinPlayers(void) { return CommType_MinPlayers(sCommClubMan->commType); } -static int CommClubMan_MaxPlayers (void) +static int CommClubMan_MaxPlayers(void) { return CommType_MaxPlayers(sCommClubMan->commType); } -static int CommClubMan_Regulation (void) +static int CommClubMan_Regulation(void) { return sCommClubMan->unk_92 + (sCommClubMan->unk_93 << 4); } -void ov7_0224B414 (FieldSystem * fieldSystem, int commType, int param2, int param3) +void ov7_0224B414(FieldSystem *fieldSystem, int commType, int param2, int param3) { CommClubMan_Init(fieldSystem); sCommClubMan->commType = commType; @@ -1693,12 +1690,12 @@ void ov7_0224B414 (FieldSystem * fieldSystem, int commType, int param2, int para CommClubMan_StartBattleClient(sCommClubMan); } -void ov7_0224B450 (void) +void ov7_0224B450(void) { CommClubMan_PrintChooseJoinMsg(sCommClubMan); } -u32 ov7_0224B460 (void) +u32 ov7_0224B460(void) { u32 v0 = sCommClubMan->retCode; @@ -1709,7 +1706,7 @@ u32 ov7_0224B460 (void) return v0; } -void ov7_0224B47C (FieldSystem * fieldSystem, int commType, int param2, int param3) +void ov7_0224B47C(FieldSystem *fieldSystem, int commType, int param2, int param3) { CommClubMan_Init(fieldSystem); sCommClubMan->commType = commType; @@ -1724,12 +1721,12 @@ void ov7_0224B47C (FieldSystem * fieldSystem, int commType, int param2, int para ov7_0224A510(sCommClubMan); } -void ov7_0224B4B8 (void) +void ov7_0224B4B8(void) { ov7_0224A53C(sCommClubMan); } -u32 CommClub_CheckWindowOpenClient (void) +u32 CommClub_CheckWindowOpenClient(void) { u32 ret = sCommClubMan->retCode; @@ -1740,7 +1737,7 @@ u32 CommClub_CheckWindowOpenClient (void) return ret; } -BOOL ov7_0224B4E4 (void) +BOOL ov7_0224B4E4(void) { return 0; } diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c index 14e203c111..7285109c20 100644 --- a/src/overlay007/ov7_0224B4E8.c +++ b/src/overlay007/ov7_0224B4E8.c @@ -1,60 +1,58 @@ +#include "overlay007/ov7_0224B4E8.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" -#include "strbuf.h" #include "struct_decls/struct_020508D4_decl.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_02098700_decl.h" - +#include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0202610C.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "core_sys.h" +#include "heap.h" +#include "message.h" +#include "party.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_0200112C.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_02025E08.h" #include "unk_0202602C.h" #include "unk_02026150.h" #include "unk_020508D4.h" #include "unk_0205D8CC.h" -#include "party.h" #include "unk_0207A2A8.h" -#include "overlay007/ov7_0224B4E8.h" typedef struct { - BmpList * unk_00; - BmpList * unk_04; - ResourceMetadata * unk_08; - ResourceMetadata * unk_0C; - FieldSystem * fieldSystem; - Strbuf* unk_14; - Strbuf* unk_18; - Strbuf* unk_1C; - Strbuf* unk_20; + BmpList *unk_00; + BmpList *unk_04; + ResourceMetadata *unk_08; + ResourceMetadata *unk_0C; + FieldSystem *fieldSystem; + Strbuf *unk_14; + Strbuf *unk_18; + Strbuf *unk_1C; + Strbuf *unk_20; Window unk_24; Window unk_34; Window unk_44; Window unk_54; - StringTemplate * unk_64; - MessageLoader * unk_68; - HeightWeightData * unk_6C; - u16 * unk_70; + StringTemplate *unk_64; + MessageLoader *unk_68; + HeightWeightData *unk_6C; + u16 *unk_70; int unk_74; u16 unk_78; u16 unk_7A; @@ -90,7 +88,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov7_0224F188 = { NULL }; -static void ov7_0224B4E8 (UnkStruct_ov7_0224B4E8 * param0, int param1) +static void ov7_0224B4E8(UnkStruct_ov7_0224B4E8 *param0, int param1) { if (BGL_WindowAdded(¶m0->unk_54) == 0) { Window_Init(¶m0->unk_54); @@ -106,7 +104,7 @@ static void ov7_0224B4E8 (UnkStruct_ov7_0224B4E8 * param0, int param1) param0->unk_74 = FieldMessage_Print(¶m0->unk_54, param0->unk_18, SaveData_Options(param0->fieldSystem->saveData), 1); } -static void ov7_0224B558 (UnkStruct_ov7_0224B4E8 * param0, BOOL param1) +static void ov7_0224B558(UnkStruct_ov7_0224B4E8 *param0, BOOL param1) { if (param1) { sub_0200E084(¶m0->unk_54, 0); @@ -116,17 +114,17 @@ static void ov7_0224B558 (UnkStruct_ov7_0224B4E8 * param0, BOOL param1) BGL_DeleteWindow(¶m0->unk_54); } -static void ov7_0224B57C (UnkStruct_ov7_0224B4E8 * param0, int param1) +static void ov7_0224B57C(UnkStruct_ov7_0224B4E8 *param0, int param1) { sub_0202616C(param0->fieldSystem->saveData, param1, param0->unk_1C, 4); StringTemplate_SetStrbuf(param0->unk_64, 0, param0->unk_1C, 0, 1, GAME_LANGUAGE); } -static void ov7_0224B5A8 (UnkStruct_ov7_0224B4E8 * param0) +static void ov7_0224B5A8(UnkStruct_ov7_0224B4E8 *param0) { UnkStruct_ov84_02240FA8 v0; - Window * v1 = &(param0->unk_34); - BattleRegulation * v2 = sub_0202610C(param0->fieldSystem->saveData, 0); + Window *v1 = &(param0->unk_34); + BattleRegulation *v2 = sub_0202610C(param0->fieldSystem->saveData, 0); int v3 = 5; if (v2) { @@ -164,7 +162,7 @@ static void ov7_0224B5A8 (UnkStruct_ov7_0224B4E8 * param0) sub_0201A954(¶m0->unk_34); } -static void ov7_0224B6AC (UnkStruct_ov7_0224B4E8 * param0) +static void ov7_0224B6AC(UnkStruct_ov7_0224B4E8 *param0) { if (param0->unk_00) { sub_02001384(param0->unk_00, NULL, NULL); @@ -177,7 +175,7 @@ static void ov7_0224B6AC (UnkStruct_ov7_0224B4E8 * param0) } } -static int ov7_0224B6E8 (UnkStruct_ov7_0224B4E8 * param0) +static int ov7_0224B6E8(UnkStruct_ov7_0224B4E8 *param0) { int v0; u16 v1; @@ -215,19 +213,19 @@ static int ov7_0224B6E8 (UnkStruct_ov7_0224B4E8 * param0) } static UnkStruct_ov7_0224F4D8 Unk_ov7_0224F4D8[] = { - {0x73, (u32)1}, - {0x74, (u32)2}, - {0x72, (u32)0xfffffffe} + { 0x73, (u32)1 }, + { 0x74, (u32)2 }, + { 0x72, (u32)0xfffffffe } }; -static void ov7_0224B788 (UnkStruct_ov7_0224B4E8 * param0) +static void ov7_0224B788(UnkStruct_ov7_0224B4E8 *param0) { UnkStruct_ov84_02240FA8 v0; int v1 = 3, v2; int v3 = 10; int v4 = 9; int v5 = 22; - UnkStruct_ov7_0224F4D8 * v6 = Unk_ov7_0224F4D8; + UnkStruct_ov7_0224F4D8 *v6 = Unk_ov7_0224F4D8; param0->unk_0C = sub_02013A04(v1, 4); @@ -254,7 +252,7 @@ static void ov7_0224B788 (UnkStruct_ov7_0224B4E8 * param0) sub_0201A954(¶m0->unk_44); } -static int ov7_0224B83C (UnkStruct_ov7_0224B4E8 * param0) +static int ov7_0224B83C(UnkStruct_ov7_0224B4E8 *param0) { int v0; u16 v1; @@ -319,13 +317,13 @@ static u8 Unk_ov7_0224F4CC[] = { 0x5D }; -static void ov7_0224B8DC (UnkStruct_ov7_0224B4E8 * param0) +static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0) { - MessageLoader * v0; - StringTemplate * v1 = param0->unk_64; - Strbuf* v2; - Strbuf* v3; - Window * v4; + MessageLoader *v0; + StringTemplate *v1 = param0->unk_64; + Strbuf *v2; + Strbuf *v3; + Window *v4; int v5, v6, v7, v8; const int v9 = 16; const int v10 = 2; @@ -421,16 +419,16 @@ static void ov7_0224B8DC (UnkStruct_ov7_0224B4E8 * param0) sub_0201A954(v4); } -static void ov7_0224BBA0 (UnkStruct_ov7_0224B4E8 * param0) +static void ov7_0224BBA0(UnkStruct_ov7_0224B4E8 *param0) { Window_Clear(¶m0->unk_24, 1); sub_0201C3C0(param0->unk_24.unk_00, param0->unk_24.unk_04); BGL_DeleteWindow(¶m0->unk_24); } -static BOOL ov7_0224BBC4 (UnkStruct_ov7_0224B4E8 * param0) +static BOOL ov7_0224BBC4(UnkStruct_ov7_0224B4E8 *param0) { - Party * v0 = Party_GetFromSavedata(param0->fieldSystem->saveData); + Party *v0 = Party_GetFromSavedata(param0->fieldSystem->saveData); int v1 = sub_0207A594(param0->fieldSystem->unk_B0, v0, param0->unk_6C); int v2; @@ -457,10 +455,10 @@ static BOOL ov7_0224BBC4 (UnkStruct_ov7_0224B4E8 * param0) return 0; } -static BOOL ov7_0224BC74 (TaskManager * param0) +static BOOL ov7_0224BC74(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov7_0224B4E8 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov7_0224B4E8 *v1 = TaskManager_Environment(param0); int v2; switch (v1->unk_7C) { @@ -556,9 +554,9 @@ static BOOL ov7_0224BC74 (TaskManager * param0) return 0; } -static UnkStruct_ov7_0224B4E8 * ov7_0224BE10 (FieldSystem * fieldSystem) +static UnkStruct_ov7_0224B4E8 *ov7_0224BE10(FieldSystem *fieldSystem) { - UnkStruct_ov7_0224B4E8 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov7_0224B4E8)); + UnkStruct_ov7_0224B4E8 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov7_0224B4E8)); MI_CpuClear8(v0, sizeof(UnkStruct_ov7_0224B4E8)); @@ -576,10 +574,10 @@ static UnkStruct_ov7_0224B4E8 * ov7_0224BE10 (FieldSystem * fieldSystem) return v0; } -void ov7_0224BE7C (TaskManager * param0, u16 * param1) +void ov7_0224BE7C(TaskManager *param0, u16 *param1) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov7_0224B4E8 * v1 = ov7_0224BE10(fieldSystem); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov7_0224B4E8 *v1 = ov7_0224BE10(fieldSystem); v1->unk_70 = param1; FieldTask_Start(param0, ov7_0224BC74, v1); diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index d4e24c98ac..24cefa1f97 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -1,54 +1,51 @@ +#include "overlay007/ov7_0224BE9C.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02029D04_decl.h" -#include "savedata.h" -#include "overlay007/struct_ov7_0224BEFC_decl.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0205AA50.h" + +#include "overlay007/struct_ov7_0224BEFC_decl.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bag.h" +#include "core_sys.h" +#include "game_options.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_020298BC.h" #include "unk_0205D8CC.h" -#include "bag.h" -#include "overlay007/ov7_0224BE9C.h" - typedef struct { u32 unk_00; @@ -83,65 +80,65 @@ static const UnkStruct_ov7_0224F1B4 Unk_ov7_0224F1B4[22] = { typedef struct { u32 unk_00; - Window * unk_04; + Window *unk_04; u32 unk_08; u32 unk_0C; - Strbuf* unk_10; + Strbuf *unk_10; } UnkStruct_ov7_0224C3EC; typedef struct { u32 unk_00; - Window * unk_04; - StringTemplate * unk_08; - Strbuf* unk_0C; - Strbuf* unk_10[3]; + Window *unk_04; + StringTemplate *unk_08; + Strbuf *unk_0C; + Strbuf *unk_10[3]; } UnkStruct_ov7_0224C620; typedef struct { u32 unk_00; - Window * unk_04; - BmpList * unk_08; + Window *unk_04; + BmpList *unk_08; ResourceMetadata unk_0C[23]; - Strbuf* unk_C4[23]; + Strbuf *unk_C4[23]; s32 unk_120; - StringTemplate * unk_124; - Strbuf* unk_128; + StringTemplate *unk_124; + Strbuf *unk_128; u16 unk_12C; u16 unk_12E; - void * unk_130; - void (* unk_134)(void *, u32); - UnkStruct_02009714 * unk_138[4]; - UnkStruct_02009DC8 * unk_148[4]; - GraphicElementData * unk_158[2]; + void *unk_130; + void (*unk_134)(void *, u32); + UnkStruct_02009714 *unk_138[4]; + UnkStruct_02009DC8 *unk_148[4]; + GraphicElementData *unk_158[2]; } UnkStruct_ov7_0224C768; -typedef void (* UnkFuncPtr_ov7_0224C768)(void *, u32); +typedef void (*UnkFuncPtr_ov7_0224C768)(void *, u32); typedef struct { u32 unk_00; - UIControlData * unk_04; + UIControlData *unk_04; u32 unk_08; } UnkStruct_ov7_0224CC44; typedef struct { u32 unk_00; - BGL * unk_04; - UnkStruct_ov7_0224C620 * unk_08; - const UnkStruct_ov7_0224F1B4 * unk_0C; - Bag * unk_10; + BGL *unk_04; + UnkStruct_ov7_0224C620 *unk_08; + const UnkStruct_ov7_0224F1B4 *unk_0C; + Bag *unk_10; } UnkStruct_ov7_0224CBE4; typedef struct UnkStruct_ov7_0224BEFC_t { u32 unk_00; u32 unk_04; - SaveData * unk_08; - UnkStruct_02029D04 * unk_0C; - Bag * unk_10; - BGL * unk_14; + SaveData *unk_08; + UnkStruct_02029D04 *unk_0C; + Bag *unk_10; + BGL *unk_14; u32 unk_18; - GraphicElementManager * unk_1C; + GraphicElementManager *unk_1C; UnkStruct_0200C738 unk_20; - MessageLoader * unk_1AC; + MessageLoader *unk_1AC; u32 unk_1B0; u32 unk_1B4; UnkStruct_ov7_0224C3EC unk_1B8; @@ -151,41 +148,41 @@ typedef struct UnkStruct_ov7_0224BEFC_t { UnkStruct_ov7_0224CBE4 unk_354; }; -static void ov7_0224C35C(UnkStruct_ov7_0224BEFC * param0); -static void ov7_0224C3B8(UnkStruct_ov7_0224BEFC * param0); -static void ov7_0224C3CC(UnkStruct_ov7_0224BEFC * param0); -static void ov7_0224C3E0(UnkStruct_ov7_0224BEFC * param0); -static void ov7_0224C338(UnkStruct_ov7_0224BEFC * param0); -static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC * param0, BGL * param1, u32 param2, u32 param3); -static void ov7_0224C444(UnkStruct_ov7_0224C3EC * param0); -static void ov7_0224C468(UnkStruct_ov7_0224C3EC * param0, Strbuf *param1, u32 param2); -static BOOL ov7_0224C4B8(UnkStruct_ov7_0224C3EC * param0); -static void ov7_0224C4E0(UnkStruct_ov7_0224C3EC * param0, MessageLoader * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4); -static void ov7_0224C580(UnkStruct_ov7_0224C3EC * param0, MessageLoader * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4); -static void ov7_0224C620(UnkStruct_ov7_0224C620 * param0, BGL * param1, MessageLoader * param2, u32 param3); -static void ov7_0224C698(UnkStruct_ov7_0224C620 * param0); -static void ov7_0224C6DC(UnkStruct_ov7_0224C620 * param0, u32 param1, u32 param2, u32 param3); -static void ov7_0224C768(UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4, MessageLoader * param5, void * param6, UnkFuncPtr_ov7_0224C768 param7, GraphicElementManager * param8); -static void ov7_0224C934(UnkStruct_ov7_0224C768 * param0); -static u32 ov7_0224C9A4(UnkStruct_ov7_0224C768 * param0); -static void ov7_0224CA0C(UnkStruct_ov7_0224C768 * param0); -static void ov7_0224CA34(UnkStruct_ov7_0224C768 * param0); -static void ov7_0224CA54(UnkStruct_ov19_021DA864 * param0, UnkStruct_ov7_0224C768 * param1, u32 param2); -static void ov7_0224CB40(UnkStruct_ov7_0224C768 * param0); -static void ov7_0224CB70(UnkStruct_ov7_0224C768 * param0); -static void ov7_0224CC44(UnkStruct_ov7_0224CC44 * param0, BGL * param1, u32 param2); -static void ov7_0224CC6C(UnkStruct_ov7_0224CC44 * param0); -static u32 ov7_0224CC78(UnkStruct_ov7_0224CC44 * param0); -static void ov7_0224CBD0(UnkStruct_ov7_0224CBE4 * param0, UnkStruct_ov7_0224C620 * param1, const UnkStruct_ov7_0224F1B4 * param2, Bag * param3, u32 param4, BGL * param5); -static void ov7_0224CBE4(void * param0, u32 param1); -static BOOL ov7_0224CC88(const UnkStruct_02029D04 * param0, const UnkStruct_ov7_0224F1B4 * param1, u32 param2); -static BOOL ov7_0224CCB8(Bag * param0, const UnkStruct_ov7_0224F1B4 * param1, u32 param2, u32 param3); -static BOOL ov7_0224CCE4(const UnkStruct_02029D04 * param0, const UnkStruct_ov7_0224F1B4 * param1, u32 param2); -static void ov7_0224CCF4(UnkStruct_02029D04 * param0, Bag * param1, const UnkStruct_ov7_0224F1B4 * param2, u32 param3, u32 param4); - -UnkStruct_ov7_0224BEFC * ov7_0224BE9C (u32 param0, SaveData * param1, BGL * param2) -{ - UnkStruct_ov7_0224BEFC * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov7_0224BEFC)); +static void ov7_0224C35C(UnkStruct_ov7_0224BEFC *param0); +static void ov7_0224C3B8(UnkStruct_ov7_0224BEFC *param0); +static void ov7_0224C3CC(UnkStruct_ov7_0224BEFC *param0); +static void ov7_0224C3E0(UnkStruct_ov7_0224BEFC *param0); +static void ov7_0224C338(UnkStruct_ov7_0224BEFC *param0); +static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC *param0, BGL *param1, u32 param2, u32 param3); +static void ov7_0224C444(UnkStruct_ov7_0224C3EC *param0); +static void ov7_0224C468(UnkStruct_ov7_0224C3EC *param0, Strbuf *param1, u32 param2); +static BOOL ov7_0224C4B8(UnkStruct_ov7_0224C3EC *param0); +static void ov7_0224C4E0(UnkStruct_ov7_0224C3EC *param0, MessageLoader *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4); +static void ov7_0224C580(UnkStruct_ov7_0224C3EC *param0, MessageLoader *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4); +static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BGL *param1, MessageLoader *param2, u32 param3); +static void ov7_0224C698(UnkStruct_ov7_0224C620 *param0); +static void ov7_0224C6DC(UnkStruct_ov7_0224C620 *param0, u32 param1, u32 param2, u32 param3); +static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BGL *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4, MessageLoader *param5, void *param6, UnkFuncPtr_ov7_0224C768 param7, GraphicElementManager *param8); +static void ov7_0224C934(UnkStruct_ov7_0224C768 *param0); +static u32 ov7_0224C9A4(UnkStruct_ov7_0224C768 *param0); +static void ov7_0224CA0C(UnkStruct_ov7_0224C768 *param0); +static void ov7_0224CA34(UnkStruct_ov7_0224C768 *param0); +static void ov7_0224CA54(UnkStruct_ov19_021DA864 *param0, UnkStruct_ov7_0224C768 *param1, u32 param2); +static void ov7_0224CB40(UnkStruct_ov7_0224C768 *param0); +static void ov7_0224CB70(UnkStruct_ov7_0224C768 *param0); +static void ov7_0224CC44(UnkStruct_ov7_0224CC44 *param0, BGL *param1, u32 param2); +static void ov7_0224CC6C(UnkStruct_ov7_0224CC44 *param0); +static u32 ov7_0224CC78(UnkStruct_ov7_0224CC44 *param0); +static void ov7_0224CBD0(UnkStruct_ov7_0224CBE4 *param0, UnkStruct_ov7_0224C620 *param1, const UnkStruct_ov7_0224F1B4 *param2, Bag *param3, u32 param4, BGL *param5); +static void ov7_0224CBE4(void *param0, u32 param1); +static BOOL ov7_0224CC88(const UnkStruct_02029D04 *param0, const UnkStruct_ov7_0224F1B4 *param1, u32 param2); +static BOOL ov7_0224CCB8(Bag *param0, const UnkStruct_ov7_0224F1B4 *param1, u32 param2, u32 param3); +static BOOL ov7_0224CCE4(const UnkStruct_02029D04 *param0, const UnkStruct_ov7_0224F1B4 *param1, u32 param2); +static void ov7_0224CCF4(UnkStruct_02029D04 *param0, Bag *param1, const UnkStruct_ov7_0224F1B4 *param2, u32 param3, u32 param4); + +UnkStruct_ov7_0224BEFC *ov7_0224BE9C(u32 param0, SaveData *param1, BGL *param2) +{ + UnkStruct_ov7_0224BEFC *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov7_0224BEFC)); memset(v0, 0, sizeof(UnkStruct_ov7_0224BEFC)); @@ -203,7 +200,7 @@ UnkStruct_ov7_0224BEFC * ov7_0224BE9C (u32 param0, SaveData * param1, BGL * para return v0; } -void ov7_0224BEFC (UnkStruct_ov7_0224BEFC * param0) +void ov7_0224BEFC(UnkStruct_ov7_0224BEFC *param0) { MessageLoader_Free(param0->unk_1AC); @@ -214,9 +211,9 @@ void ov7_0224BEFC (UnkStruct_ov7_0224BEFC * param0) Heap_FreeToHeap(param0); } -BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) +BOOL ov7_0224BF2C(UnkStruct_ov7_0224BEFC *param0) { - Strbuf* v0; + Strbuf *v0; BOOL v1; switch (param0->unk_00) { @@ -367,15 +364,15 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0) return 0; } -static void ov7_0224C338 (UnkStruct_ov7_0224BEFC * param0) +static void ov7_0224C338(UnkStruct_ov7_0224BEFC *param0) { - Options * v0 = SaveData_Options(param0->unk_08); + Options *v0 = SaveData_Options(param0->unk_08); param0->unk_1B0 = Options_Frame(v0); param0->unk_1B4 = Options_TextFrameDelay(v0); } -static void ov7_0224C35C (UnkStruct_ov7_0224BEFC * param0) +static void ov7_0224C35C(UnkStruct_ov7_0224BEFC *param0) { sub_0200DD0C(param0->unk_14, 3, 1, 10, param0->unk_1B0, param0->unk_18); sub_02002E98(0, 12 * 32, param0->unk_18); @@ -384,23 +381,23 @@ static void ov7_0224C35C (UnkStruct_ov7_0224BEFC * param0) sub_02019EBC(param0->unk_14, 3); } -static void ov7_0224C3B8 (UnkStruct_ov7_0224BEFC * param0) +static void ov7_0224C3B8(UnkStruct_ov7_0224BEFC *param0) { sub_02019EBC(param0->unk_14, 3); sub_0205D8CC(0, 1); } -static void ov7_0224C3CC (UnkStruct_ov7_0224BEFC * param0) +static void ov7_0224C3CC(UnkStruct_ov7_0224BEFC *param0) { param0->unk_1C = sub_020095C4(2, ¶m0->unk_20, param0->unk_18); } -static void ov7_0224C3E0 (UnkStruct_ov7_0224BEFC * param0) +static void ov7_0224C3E0(UnkStruct_ov7_0224BEFC *param0) { sub_02021964(param0->unk_1C); } -static void ov7_0224C3EC (UnkStruct_ov7_0224C3EC * param0, BGL * param1, u32 param2, u32 param3) +static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC *param0, BGL *param1, u32 param2, u32 param3) { if (param0->unk_00 == 1) { return; @@ -416,7 +413,7 @@ static void ov7_0224C3EC (UnkStruct_ov7_0224C3EC * param0, BGL * param1, u32 par param0->unk_00 = 1; } -static void ov7_0224C444 (UnkStruct_ov7_0224C3EC * param0) +static void ov7_0224C444(UnkStruct_ov7_0224C3EC *param0) { if (param0->unk_00 == 0) { return; @@ -429,7 +426,7 @@ static void ov7_0224C444 (UnkStruct_ov7_0224C3EC * param0) param0->unk_00 = 0; } -static void ov7_0224C468 (UnkStruct_ov7_0224C3EC * param0, Strbuf *param1, u32 param2) +static void ov7_0224C468(UnkStruct_ov7_0224C3EC *param0, Strbuf *param1, u32 param2) { GF_ASSERT(param0->unk_10 == NULL); @@ -441,7 +438,7 @@ static void ov7_0224C468 (UnkStruct_ov7_0224C3EC * param0, Strbuf *param1, u32 p sub_0201A954(param0->unk_04); } -static BOOL ov7_0224C4B8 (UnkStruct_ov7_0224C3EC * param0) +static BOOL ov7_0224C4B8(UnkStruct_ov7_0224C3EC *param0) { if (Message_Printing(param0->unk_0C) == 0) { if (param0->unk_10 != NULL) { @@ -455,11 +452,11 @@ static BOOL ov7_0224C4B8 (UnkStruct_ov7_0224C3EC * param0) return 0; } -static void ov7_0224C4E0 (UnkStruct_ov7_0224C3EC * param0, MessageLoader * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4) +static void ov7_0224C4E0(UnkStruct_ov7_0224C3EC *param0, MessageLoader *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4) { - Strbuf* v0; - Strbuf* v1; - StringTemplate * v2; + Strbuf *v0; + Strbuf *v1; + StringTemplate *v2; v2 = StringTemplate_Default(param2); v1 = Strbuf_Init(200, param2); @@ -482,11 +479,11 @@ static void ov7_0224C4E0 (UnkStruct_ov7_0224C3EC * param0, MessageLoader * param Strbuf_Free(v0); } -static void ov7_0224C580 (UnkStruct_ov7_0224C3EC * param0, MessageLoader * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4) +static void ov7_0224C580(UnkStruct_ov7_0224C3EC *param0, MessageLoader *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4) { - Strbuf* v0; - Strbuf* v1; - StringTemplate * v2; + Strbuf *v0; + Strbuf *v1; + StringTemplate *v2; v2 = StringTemplate_Default(param2); v1 = Strbuf_Init(200, param2); @@ -509,7 +506,7 @@ static void ov7_0224C580 (UnkStruct_ov7_0224C3EC * param0, MessageLoader * param Strbuf_Free(v0); } -static void ov7_0224C620 (UnkStruct_ov7_0224C620 * param0, BGL * param1, MessageLoader * param2, u32 param3) +static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BGL *param1, MessageLoader *param2, u32 param3) { int v0; @@ -530,7 +527,7 @@ static void ov7_0224C620 (UnkStruct_ov7_0224C620 * param0, BGL * param1, Message param0->unk_00 = 1; } -static void ov7_0224C698 (UnkStruct_ov7_0224C620 * param0) +static void ov7_0224C698(UnkStruct_ov7_0224C620 *param0) { int v0; @@ -551,7 +548,7 @@ static void ov7_0224C698 (UnkStruct_ov7_0224C620 * param0) param0->unk_00 = 0; } -static void ov7_0224C6DC (UnkStruct_ov7_0224C620 * param0, u32 param1, u32 param2, u32 param3) +static void ov7_0224C6DC(UnkStruct_ov7_0224C620 *param0, u32 param1, u32 param2, u32 param3) { int v0; @@ -568,10 +565,10 @@ static void ov7_0224C6DC (UnkStruct_ov7_0224C620 * param0, u32 param1, u32 param Window_Show(param0->unk_04, 0, (1 + (18 + 12)), 11); } -static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4, MessageLoader * param5, void * param6, UnkFuncPtr_ov7_0224C768 param7, GraphicElementManager * param8) +static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BGL *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4, MessageLoader *param5, void *param6, UnkFuncPtr_ov7_0224C768 param7, GraphicElementManager *param8) { int v0; - Strbuf* v1; + Strbuf *v1; UnkStruct_ov19_021DA864 v2; UnkStruct_ov83_0223D9A8 v3; static const u8 v4[2] = { @@ -663,7 +660,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par } } -static void ov7_0224C934 (UnkStruct_ov7_0224C768 * param0) +static void ov7_0224C934(UnkStruct_ov7_0224C768 *param0) { int v0; @@ -689,7 +686,7 @@ static void ov7_0224C934 (UnkStruct_ov7_0224C768 * param0) param0->unk_00 = 1; } -static u32 ov7_0224C9A4 (UnkStruct_ov7_0224C768 * param0) +static u32 ov7_0224C9A4(UnkStruct_ov7_0224C768 *param0) { u32 v0; u16 v1; @@ -715,7 +712,7 @@ static u32 ov7_0224C9A4 (UnkStruct_ov7_0224C768 * param0) return v0; } -static void ov7_0224CA0C (UnkStruct_ov7_0224C768 * param0) +static void ov7_0224CA0C(UnkStruct_ov7_0224C768 *param0) { param0->unk_134(param0->unk_130, param0->unk_12C); @@ -723,15 +720,15 @@ static void ov7_0224CA0C (UnkStruct_ov7_0224C768 * param0) ov7_0224CB70(param0); } -static void ov7_0224CA34 (UnkStruct_ov7_0224C768 * param0) +static void ov7_0224CA34(UnkStruct_ov7_0224C768 *param0) { sub_02021CAC(param0->unk_158[0], 0); sub_02021CAC(param0->unk_158[1], 0); } -static void ov7_0224CA54 (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov7_0224C768 * param1, u32 param2) +static void ov7_0224CA54(UnkStruct_ov19_021DA864 *param0, UnkStruct_ov7_0224C768 *param1, u32 param2) { - NARC * v0 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2); + NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2); param1->unk_148[0] = sub_02009A4C(param1->unk_138[0], v0, 4, 0, 5000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); param1->unk_148[1] = sub_02009B04(param1->unk_138[1], v0, 10, 0, 5000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); @@ -744,7 +741,7 @@ static void ov7_0224CA54 (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov7_0224C7 sub_020093B4(param0, 5000, 5000, 5000, 5000, 0xffffffff, 0xffffffff, 0, 0, param1->unk_138[0], param1->unk_138[1], param1->unk_138[2], param1->unk_138[3], NULL, NULL); } -static void ov7_0224CB40 (UnkStruct_ov7_0224C768 * param0) +static void ov7_0224CB40(UnkStruct_ov7_0224C768 *param0) { int v0; @@ -756,13 +753,13 @@ static void ov7_0224CB40 (UnkStruct_ov7_0224C768 * param0) } } -static void ov7_0224CB70 (UnkStruct_ov7_0224C768 * param0) +static void ov7_0224CB70(UnkStruct_ov7_0224C768 *param0) { u16 v0; sub_020014DC(param0->unk_08, &v0, NULL); - if ((v0 <= 0)) { + if (v0 <= 0) { sub_02021CAC(param0->unk_158[0], 0); } else { sub_02021CAC(param0->unk_158[0], 1); @@ -775,7 +772,7 @@ static void ov7_0224CB70 (UnkStruct_ov7_0224C768 * param0) } } -static void ov7_0224CBD0 (UnkStruct_ov7_0224CBE4 * param0, UnkStruct_ov7_0224C620 * param1, const UnkStruct_ov7_0224F1B4 * param2, Bag * param3, u32 param4, BGL * param5) +static void ov7_0224CBD0(UnkStruct_ov7_0224CBE4 *param0, UnkStruct_ov7_0224C620 *param1, const UnkStruct_ov7_0224F1B4 *param2, Bag *param3, u32 param4, BGL *param5) { param0->unk_04 = param5; param0->unk_08 = param1; @@ -784,9 +781,9 @@ static void ov7_0224CBD0 (UnkStruct_ov7_0224CBE4 * param0, UnkStruct_ov7_0224C62 param0->unk_00 = param4; } -static void ov7_0224CBE4 (void * param0, u32 param1) +static void ov7_0224CBE4(void *param0, u32 param1) { - UnkStruct_ov7_0224CBE4 * v0 = param0; + UnkStruct_ov7_0224CBE4 *v0 = param0; u32 v1; if (param1 < 22) { @@ -798,7 +795,7 @@ static void ov7_0224CBE4 (void * param0, u32 param1) } } -static void ov7_0224CC44 (UnkStruct_ov7_0224CC44 * param0, BGL * param1, u32 param2) +static void ov7_0224CC44(UnkStruct_ov7_0224CC44 *param0, BGL *param1, u32 param2) { static const UnkStruct_ov61_0222C884 v0 = { 3, @@ -819,7 +816,7 @@ static void ov7_0224CC44 (UnkStruct_ov7_0224CC44 * param0, BGL * param1, u32 par param0->unk_00 = 1; } -static void ov7_0224CC6C (UnkStruct_ov7_0224CC44 * param0) +static void ov7_0224CC6C(UnkStruct_ov7_0224CC44 *param0) { if (param0->unk_00 == 0) { return; @@ -828,7 +825,7 @@ static void ov7_0224CC6C (UnkStruct_ov7_0224CC44 * param0) param0->unk_00 = 0; } -static u32 ov7_0224CC78 (UnkStruct_ov7_0224CC44 * param0) +static u32 ov7_0224CC78(UnkStruct_ov7_0224CC44 *param0) { u32 v0; @@ -836,7 +833,7 @@ static u32 ov7_0224CC78 (UnkStruct_ov7_0224CC44 * param0) return v0; } -static BOOL ov7_0224CC88 (const UnkStruct_02029D04 * param0, const UnkStruct_ov7_0224F1B4 * param1, u32 param2) +static BOOL ov7_0224CC88(const UnkStruct_02029D04 *param0, const UnkStruct_ov7_0224F1B4 *param1, u32 param2) { int v0; @@ -849,7 +846,7 @@ static BOOL ov7_0224CC88 (const UnkStruct_02029D04 * param0, const UnkStruct_ov7 return 1; } -static BOOL ov7_0224CCB8 (Bag * param0, const UnkStruct_ov7_0224F1B4 * param1, u32 param2, u32 param3) +static BOOL ov7_0224CCB8(Bag *param0, const UnkStruct_ov7_0224F1B4 *param1, u32 param2, u32 param3) { u32 v0; @@ -862,12 +859,12 @@ static BOOL ov7_0224CCB8 (Bag * param0, const UnkStruct_ov7_0224F1B4 * param1, u return 0; } -static BOOL ov7_0224CCE4 (const UnkStruct_02029D04 * param0, const UnkStruct_ov7_0224F1B4 * param1, u32 param2) +static BOOL ov7_0224CCE4(const UnkStruct_02029D04 *param0, const UnkStruct_ov7_0224F1B4 *param1, u32 param2) { return sub_02029D50(param0, param1[param2].unk_00, 1); } -static void ov7_0224CCF4 (UnkStruct_02029D04 * param0, Bag * param1, const UnkStruct_ov7_0224F1B4 * param2, u32 param3, u32 param4) +static void ov7_0224CCF4(UnkStruct_02029D04 *param0, Bag *param1, const UnkStruct_ov7_0224F1B4 *param2, u32 param3, u32 param4) { u32 v0 = param2[param3].unk_00; u32 v1 = param2[param3].unk_04 + 149; diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index cba4f51612..b3d8eb8b29 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -1,121 +1,121 @@ +#include "overlay007/ov7_0224CD28.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" +#include "struct_defs/struct_02081CF4.h" #include "field/field_system.h" -#include "struct_defs/struct_02081CF4.h" +#include "overlay005/ov5_021D0D80.h" +#include "overlay005/ov5_021D2F14.h" #include "overlay007/struct_ov7_0224D008.h" #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bag.h" +#include "camera.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "journal.h" +#include "map_header.h" +#include "message.h" +#include "narc.h" +#include "player_avatar.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_0202854C.h" -#include "journal.h" #include "unk_0202C9F4.h" #include "unk_0202CD50.h" #include "unk_0202D05C.h" -#include "map_header.h" #include "unk_0203D1B8.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_020573FC.h" #include "unk_0205D8CC.h" -#include "player_avatar.h" #include "unk_0206AFE0.h" #include "unk_0206CCB0.h" #include "unk_0207CB08.h" -#include "item.h" -#include "bag.h" #include "unk_0208C098.h" #include "unk_02097B18.h" #include "unk_0209AC14.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay005/ov5_021D2F14.h" -#include "overlay007/ov7_0224CD28.h" +#include "vars_flags.h" -static u8 ov7_0224CE90(FieldSystem * fieldSystem); -static u8 ov7_0224D250(FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1); -static void ov7_0224D008(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224D018(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224D040(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224D1EC(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224D21C(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224D388(FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1); -static void ov7_0224D3E8(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224D474(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224D620(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224E950(FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1); -static void ov7_0224D6BC(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224D85C(BmpList * param0, u32 param1, u8 param2); -static void ov7_0224D9B8(BmpList * param0, u32 param1, u8 param2); -static void ov7_0224DAF8(UnkStruct_ov7_0224D008 * param0, u8 param1); -static u8 ov7_0224DE94(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224E28C(UnkStruct_ov7_0224D008 * param0, u8 param1); -static void ov7_0224DED4(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224E6B8(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224E7C8(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224E3A0(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224E3D8(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224E5B0(UnkStruct_ov7_0224D008 * param0); -static u8 ov7_0224EA2C(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224EA54(FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1); -static void ov7_0224EC20(FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1); -static void ov7_0224EC38(TaskManager * param0); -static u8 ov7_0224EC9C(FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1); -static void ov7_0224EAD0(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224EB14(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224EB38(UnkStruct_ov7_0224D008 * param0, u8 param1); -static void ov7_0224EB7C(UnkStruct_ov7_0224D008 * param0, u16 param1); -static void ov7_0224EC10(UnkStruct_ov7_0224D008 * param0, u8 param1); -static u8 ov7_0224E098(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224E834(UnkStruct_ov7_0224D008 * param0, u16 param1, u16 param2); -static u32 ov7_0224E890(UnkStruct_ov7_0224D008 * param0, u16 param1); -static u16 ov7_0224E8CC(UnkStruct_ov7_0224D008 * param0, u16 param1); -static u32 ov7_0224E8F4(UnkStruct_ov7_0224D008 * param0); -static void ov7_0224E920(UnkStruct_ov7_0224D008 * param0, u32 param1); +static u8 ov7_0224CE90(FieldSystem *fieldSystem); +static u8 ov7_0224D250(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1); +static void ov7_0224D008(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224D018(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224D040(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224D1EC(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224D21C(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224D388(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1); +static void ov7_0224D3E8(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224D474(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224D620(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224E950(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1); +static void ov7_0224D6BC(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224D85C(BmpList *param0, u32 param1, u8 param2); +static void ov7_0224D9B8(BmpList *param0, u32 param1, u8 param2); +static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1); +static u8 ov7_0224DE94(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224E28C(UnkStruct_ov7_0224D008 *param0, u8 param1); +static void ov7_0224DED4(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224E6B8(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224E7C8(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224E3A0(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224E3D8(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224E5B0(UnkStruct_ov7_0224D008 *param0); +static u8 ov7_0224EA2C(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224EA54(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1); +static void ov7_0224EC20(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1); +static void ov7_0224EC38(TaskManager *param0); +static u8 ov7_0224EC9C(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1); +static void ov7_0224EAD0(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224EB14(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224EB38(UnkStruct_ov7_0224D008 *param0, u8 param1); +static void ov7_0224EB7C(UnkStruct_ov7_0224D008 *param0, u16 param1); +static void ov7_0224EC10(UnkStruct_ov7_0224D008 *param0, u8 param1); +static u8 ov7_0224E098(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224E834(UnkStruct_ov7_0224D008 *param0, u16 param1, u16 param2); +static u32 ov7_0224E890(UnkStruct_ov7_0224D008 *param0, u16 param1); +static u16 ov7_0224E8CC(UnkStruct_ov7_0224D008 *param0, u16 param1); +static u32 ov7_0224E8F4(UnkStruct_ov7_0224D008 *param0); +static void ov7_0224E920(UnkStruct_ov7_0224D008 *param0, u32 param1); static const UnkStruct_ov61_0222C884 Unk_ov7_0224F328[] = { - {0x2, 0xC, 0x2, 0x13, 0xE, 0xD, 0x1}, - {0x2, 0x5, 0x12, 0x1B, 0x6, 0xD, 0x10B}, - {0x3, 0x1, 0x1, 0x9, 0x4, 0xD, 0x28}, - {0x3, 0x13, 0xD, 0xC, 0x4, 0xD, 0x4C}, - {0x3, 0x1, 0xF, 0xE, 0x2, 0xD, 0x7C}, - {0x3, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x98} + { 0x2, 0xC, 0x2, 0x13, 0xE, 0xD, 0x1 }, + { 0x2, 0x5, 0x12, 0x1B, 0x6, 0xD, 0x10B }, + { 0x3, 0x1, 0x1, 0x9, 0x4, 0xD, 0x28 }, + { 0x3, 0x13, 0xD, 0xC, 0x4, 0xD, 0x4C }, + { 0x3, 0x1, 0xF, 0xE, 0x2, 0xD, 0x7C }, + { 0x3, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x98 } }; static const UnkStruct_ov61_0222C884 Unk_ov7_0224F2BC = { @@ -160,7 +160,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov7_0224F2C4 = { 0x28 }; -static void ov7_0224CD28 (UnkStruct_ov7_0224D008 * param0, u16 * param1) +static void ov7_0224CD28(UnkStruct_ov7_0224D008 *param0, u16 *param1) { u16 v0; @@ -178,17 +178,17 @@ static void ov7_0224CD28 (UnkStruct_ov7_0224D008 * param0, u16 * param1) } } -static UnkStruct_ov7_0224D008 * ov7_0224CD88 (void) +static UnkStruct_ov7_0224D008 *ov7_0224CD88(void) { - UnkStruct_ov7_0224D008 * v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov7_0224D008)); + UnkStruct_ov7_0224D008 *v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov7_0224D008)); memset(v0, 0, sizeof(UnkStruct_ov7_0224D008)); return v0; } -void ov7_0224CDA4 (TaskManager * param0, FieldSystem * fieldSystem, u16 * param2, u8 param3, BOOL param4) +void ov7_0224CDA4(TaskManager *param0, FieldSystem *fieldSystem, u16 *param2, u8 param3, BOOL param4) { - UnkStruct_ov7_0224D008 * v0 = ov7_0224CD88(); + UnkStruct_ov7_0224D008 *v0 = ov7_0224CD88(); v0->unk_00 = fieldSystem->unk_08; @@ -218,7 +218,7 @@ void ov7_0224CDA4 (TaskManager * param0, FieldSystem * fieldSystem, u16 * param2 FieldTask_Start(param0, ov7_0224CEAC, v0); } -static u8 ov7_0224CE90 (FieldSystem * fieldSystem) +static u8 ov7_0224CE90(FieldSystem *fieldSystem) { int v0 = PlayerAvatar_GetDir(fieldSystem->playerAvatar); @@ -229,10 +229,10 @@ static u8 ov7_0224CE90 (FieldSystem * fieldSystem) return 8; } -BOOL ov7_0224CEAC (TaskManager * param0) +BOOL ov7_0224CEAC(TaskManager *param0) { - FieldSystem * fieldSystem; - UnkStruct_ov7_0224D008 * v1; + FieldSystem *fieldSystem; + UnkStruct_ov7_0224D008 *v1; fieldSystem = TaskManager_FieldSystem(param0); v1 = TaskManager_Environment(param0); @@ -311,19 +311,19 @@ BOOL ov7_0224CEAC (TaskManager * param0) return 0; } -static void ov7_0224D008 (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224D008(UnkStruct_ov7_0224D008 *param0) { ov7_0224D018(param0); ov7_0224D040(param0); } -static void ov7_0224D018 (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224D018(UnkStruct_ov7_0224D008 *param0) { param0->unk_88 = MessageLoader_Init(0, 26, 543, 11); param0->unk_8C = StringTemplate_Default(11); } -static void ov7_0224D040 (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224D040(UnkStruct_ov7_0224D008 *param0) { UnkStruct_02081CF4 v0; u8 v1; @@ -367,7 +367,7 @@ static void ov7_0224D040 (UnkStruct_ov7_0224D008 * param0) param0->unk_80 = sub_02001B7C(&v0, 8, 0, 0, 11, PAD_BUTTON_B); } -static u8 ov7_0224D1EC (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224D1EC(UnkStruct_ov7_0224D008 *param0) { u32 v0 = sub_02001BE0(param0->unk_80); @@ -384,7 +384,7 @@ static u8 ov7_0224D1EC (UnkStruct_ov7_0224D008 * param0) return 1; } -static void ov7_0224D21C (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224D21C(UnkStruct_ov7_0224D008 *param0) { Window_Clear(¶m0->unk_08[0], 1); sub_0201ACF4(¶m0->unk_08[0]); @@ -393,14 +393,14 @@ static void ov7_0224D21C (UnkStruct_ov7_0224D008 * param0) BGL_DeleteWindow(¶m0->unk_08[0]); } -static u8 ov7_0224D250 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1) +static u8 ov7_0224D250(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) { if (FieldMessage_FinishedPrinting(param1->unk_2A4) == 0) { return 0; } if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - void * v0; + void *v0; sub_0200E084(¶m1->unk_08[1], 0); BGL_DeleteWindow(¶m1->unk_08[1]); @@ -439,7 +439,7 @@ static u8 ov7_0224D250 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * para return 0; } -static void ov7_0224D388 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1) +static void ov7_0224D388(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) { sub_02019CB8(param1->unk_00, 3, 0, 2 - 2, 19 - 1, 27 + 5, 4 + 2, 0); @@ -454,7 +454,7 @@ static void ov7_0224D388 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * pa param1->unk_2A5 = 0; } -static void ov7_0224D3E8 (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224D3E8(UnkStruct_ov7_0224D008 *param0) { u32 v0; @@ -469,7 +469,7 @@ static void ov7_0224D3E8 (UnkStruct_ov7_0224D008 * param0) } } -static void ov7_0224D44C (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224D44C(UnkStruct_ov7_0224D008 *param0) { u32 v0; @@ -481,9 +481,9 @@ static void ov7_0224D44C (UnkStruct_ov7_0224D008 * param0) } } -static void ov7_0224D474 (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224D474(UnkStruct_ov7_0224D008 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, 11); @@ -506,7 +506,7 @@ static void ov7_0224D474 (UnkStruct_ov7_0224D008 * param0) NARC_dtor(v0); } -static void ov7_0224D548 (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224D548(UnkStruct_ov7_0224D008 *param0) { param0->unk_2A0 = GXLayers_EngineAGetLayers(); param0->unk_29C[0] = sub_0201A008(param0->unk_00, 0); @@ -525,7 +525,7 @@ static void ov7_0224D548 (UnkStruct_ov7_0224D008 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1); } -static void ov7_0224D5D8 (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224D5D8(UnkStruct_ov7_0224D008 *param0) { BGL_SetPriority(0, param0->unk_29C[0]); BGL_SetPriority(1, param0->unk_29C[1]); @@ -534,10 +534,10 @@ static void ov7_0224D5D8 (UnkStruct_ov7_0224D008 * param0) GXLayers_EngineASetLayers(param0->unk_2A0); } -static u8 ov7_0224D620 (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224D620(UnkStruct_ov7_0224D008 *param0) { if (param0->unk_2A5 != param0->unk_2A6) { - VecFx32 v0 = {8 * FX32_ONE, 0, 0}; + VecFx32 v0 = { 8 * FX32_ONE, 0, 0 }; Camera_Move(&v0, param0->camera); param0->unk_2A5++; @@ -578,7 +578,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov7_0224F308 = { NULL }; -static u32 ov7_0224D698 (UnkStruct_ov7_0224D008 * param0, u16 param1) +static u32 ov7_0224D698(UnkStruct_ov7_0224D008 *param0, u16 param1) { if (param0->unk_2A9 == 1) { return 1 + param1 - 1; @@ -589,14 +589,14 @@ static u32 ov7_0224D698 (UnkStruct_ov7_0224D008 * param0, u16 param1) return (u32)param1; } -static void ov7_0224D6BC (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224D6BC(UnkStruct_ov7_0224D008 *param0) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; UnkStruct_ov84_02240FA8 v2; u32 v3; u32 v4; - MessageLoader * v5; + MessageLoader *v5; BOOL v6 = 0; if ((param0->unk_2A9 == 0) || (param0->unk_2A9 == 3)) { @@ -654,9 +654,9 @@ static void ov7_0224D6BC (UnkStruct_ov7_0224D008 * param0) param0->unk_78 = sub_0200112C(&v2, 0, 0, 11); } -static void ov7_0224D85C (BmpList * param0, u32 param1, u8 param2) +static void ov7_0224D85C(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov7_0224D008 * v0 = (UnkStruct_ov7_0224D008 *)sub_02001504(param0, 19); + UnkStruct_ov7_0224D008 *v0 = (UnkStruct_ov7_0224D008 *)sub_02001504(param0, 19); if (param2 != 1) { Sound_PlayEffect(1592); @@ -665,7 +665,7 @@ static void ov7_0224D85C (BmpList * param0, u32 param1, u8 param2) BGL_FillWindow(&v0->unk_08[1], 0); if (param1 != 0xfffffffe) { - Strbuf* v1; + Strbuf *v1; if (v0->unk_2A9 == 0) { v1 = Strbuf_Init(130, 11); @@ -674,13 +674,13 @@ static void ov7_0224D85C (BmpList * param0, u32 param1, u8 param2) v1 = Strbuf_Init(130, 11); Item_LoadDescription(v1, (u16)param1, 11); } else if (v0->unk_2A9 == 1) { - MessageLoader * v2; + MessageLoader *v2; v2 = MessageLoader_Init(0, 26, 626, 11); v1 = MessageLoader_GetNewStrbuf(v2, 139 + param1 - 1); MessageLoader_Free(v2); } else { - MessageLoader * v3; + MessageLoader *v3; v3 = MessageLoader_Init(0, 26, 542, 11); v1 = MessageLoader_GetNewStrbuf(v3, sub_020981F4((u8)param1)); @@ -719,13 +719,13 @@ static void ov7_0224D85C (BmpList * param0, u32 param1, u8 param2) sub_0201A9A4(&v0->unk_08[1]); } -static void ov7_0224D9B8 (BmpList * param0, u32 param1, u8 param2) +static void ov7_0224D9B8(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov7_0224D008 * v0 = (UnkStruct_ov7_0224D008 *)sub_02001504(param0, 19); + UnkStruct_ov7_0224D008 *v0 = (UnkStruct_ov7_0224D008 *)sub_02001504(param0, 19); if (param1 != 0xfffffffe) { - Strbuf* v1; - Strbuf* v2; + Strbuf *v1; + Strbuf *v2; u32 v3; u32 v4; u16 v5 = (u16)param1; @@ -756,7 +756,7 @@ static void ov7_0224D9B8 (BmpList * param0, u32 param1, u8 param2) } if (param1 == 0xfffffffe) { - Strbuf* v6 = MessageLoader_GetNewStrbuf(v0->unk_88, 8); + Strbuf *v6 = MessageLoader_GetNewStrbuf(v0->unk_88, 8); BGL_WindowColor(&v0->unk_08[0], 15, 0, param2, 19 * 8, 16); sub_0201D78C(&v0->unk_08[0], 0, v6, 0, param2, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -764,10 +764,10 @@ static void ov7_0224D9B8 (BmpList * param0, u32 param1, u8 param2) } } -static void ov7_0224DAF8 (UnkStruct_ov7_0224D008 * param0, u8 param1) +static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1) { - Strbuf* v0; - Strbuf* v1; + Strbuf *v0; + Strbuf *v1; u32 v2; u32 v3; @@ -820,7 +820,7 @@ static void ov7_0224DAF8 (UnkStruct_ov7_0224D008 * param0, u8 param1) sub_0201A9A4(¶m0->unk_08[2]); } -static u8 ov7_0224DC84 (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 *param0) { u32 v0; u16 v1, v2; @@ -845,9 +845,8 @@ static u8 ov7_0224DC84 (UnkStruct_ov7_0224D008 * param0) Sound_PlayEffect(1500); return 12; - default: - { - Strbuf* v3; + default: { + Strbuf *v3; u32 v4; param0->unk_26C[0] = (u16)sub_02021D34(param0->unk_25C[0]); @@ -917,7 +916,7 @@ static u8 ov7_0224DC84 (UnkStruct_ov7_0224D008 * param0) return 4; } -static u8 ov7_0224DE94 (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224DE94(UnkStruct_ov7_0224D008 *param0) { if (FieldMessage_FinishedPrinting(param0->unk_2A4) == 0) { return 5; @@ -932,10 +931,10 @@ static u8 ov7_0224DE94 (UnkStruct_ov7_0224D008 * param0) return 6; } -static void ov7_0224DED4 (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224DED4(UnkStruct_ov7_0224D008 *param0) { - Strbuf* v0; - Strbuf* v1; + Strbuf *v0; + Strbuf *v1; u16 v2; if (param0->unk_2A9 == 0) { @@ -962,7 +961,7 @@ static void ov7_0224DED4 (UnkStruct_ov7_0224D008 * param0) sub_0201A9A4(¶m0->unk_08[4]); } -static u8 ov7_0224DFB0 (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0) { if (sub_0208C15C(¶m0->unk_2AC, param0->unk_2AE) != 0) { Sound_PlayEffect(1592); @@ -1002,9 +1001,9 @@ static u8 ov7_0224DFB0 (UnkStruct_ov7_0224D008 * param0) return 6; } -static u8 ov7_0224E098 (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224E098(UnkStruct_ov7_0224D008 *param0) { - Strbuf* v0; + Strbuf *v0; BOOL v1; if (param0->unk_2A9 == 0) { @@ -1071,10 +1070,10 @@ static u8 ov7_0224E098 (UnkStruct_ov7_0224D008 * param0) return 7; } -static void ov7_0224E28C (UnkStruct_ov7_0224D008 * param0, u8 param1) +static void ov7_0224E28C(UnkStruct_ov7_0224D008 *param0, u8 param1) { - Strbuf* v0; - Strbuf* v1; + Strbuf *v0; + Strbuf *v1; u32 v2; BGL_FillWindow(¶m0->unk_08[3], 15); @@ -1108,7 +1107,7 @@ static void ov7_0224E28C (UnkStruct_ov7_0224D008 * param0, u8 param1) sub_0201A9A4(¶m0->unk_08[3]); } -static u8 ov7_0224E3A0 (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224E3A0(UnkStruct_ov7_0224D008 *param0) { if (FieldMessage_FinishedPrinting(param0->unk_2A4) == 0) { return 7; @@ -1118,12 +1117,11 @@ static u8 ov7_0224E3A0 (UnkStruct_ov7_0224D008 * param0) return 8; } -static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224E3D8(UnkStruct_ov7_0224D008 *param0) { switch (sub_02002114(param0->unk_80, 11)) { - case 0: - { - Strbuf* v0; + case 0: { + Strbuf *v0; if (param0->unk_2A9 == 0) { v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 6); @@ -1179,7 +1177,7 @@ static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0) return 8; } -static u8 ov7_0224E5B0 (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224E5B0(UnkStruct_ov7_0224D008 *param0) { if (FieldMessage_FinishedPrinting(param0->unk_2A4) == 0) { return 9; @@ -1217,7 +1215,7 @@ static u8 ov7_0224E5B0 (UnkStruct_ov7_0224D008 * param0) return 10; } -static u8 ov7_0224E6B8 (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224E6B8(UnkStruct_ov7_0224D008 *param0) { if (FieldMessage_FinishedPrinting(param0->unk_2A4) == 0) { return 10; @@ -1230,7 +1228,7 @@ static u8 ov7_0224E6B8 (UnkStruct_ov7_0224D008 * param0) if (((param0->unk_2A9 == 0) || (param0->unk_2A9 == 3)) && (param0->unk_2AA == 4) && (param0->unk_2AC >= 10)) { if (Bag_TryAddItem(param0->unk_274, 12, 1, 11) == 1) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 10); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 10); StringTemplate_Format(param0->unk_8C, param0->unk_298, v0); Strbuf_Free(v0); @@ -1239,7 +1237,7 @@ static u8 ov7_0224E6B8 (UnkStruct_ov7_0224D008 * param0) param0->unk_2A4 = FieldMessage_Print(¶m0->unk_08[5], param0->unk_298, param0->unk_278, 1); { - UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->unk_284); + UnkStruct_0202CD88 *v1 = sub_0202CD88(param0->unk_284); sub_0202CF28(v1, (1 + 49)); } @@ -1260,7 +1258,7 @@ static u8 ov7_0224E6B8 (UnkStruct_ov7_0224D008 * param0) return 10; } -static u8 ov7_0224E7C8 (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224E7C8(UnkStruct_ov7_0224D008 *param0) { if (FieldMessage_FinishedPrinting(param0->unk_2A4) == 0) { return 11; @@ -1280,7 +1278,7 @@ static u8 ov7_0224E7C8 (UnkStruct_ov7_0224D008 * param0) return 11; } -static void ov7_0224E834 (UnkStruct_ov7_0224D008 * param0, u16 param1, u16 param2) +static void ov7_0224E834(UnkStruct_ov7_0224D008 *param0, u16 param1, u16 param2) { if (param0->unk_2A9 == 0) { StringTemplate_SetItemName(param0->unk_8C, param2, param1); @@ -1293,7 +1291,7 @@ static void ov7_0224E834 (UnkStruct_ov7_0224D008 * param0, u16 param1, u16 param } } -static u32 ov7_0224E890 (UnkStruct_ov7_0224D008 * param0, u16 param1) +static u32 ov7_0224E890(UnkStruct_ov7_0224D008 *param0, u16 param1) { if (param0->unk_2A9 == 0) { return Item_LoadParam(param1, 0, 11); @@ -1306,51 +1304,51 @@ static u32 ov7_0224E890 (UnkStruct_ov7_0224D008 * param0, u16 param1) return sub_020981D0((u8)param1); } -static u16 ov7_0224E8CC (UnkStruct_ov7_0224D008 * param0, u16 param1) +static u16 ov7_0224E8CC(UnkStruct_ov7_0224D008 *param0, u16 param1) { int v0; static const u16 v1[][2] = { - {46, 1}, - {49, 1}, - {47, 1}, - {52, 1}, - {48, 1}, - {45, 1}, - {289, 16}, - {290, 16}, - {291, 16}, - {292, 16}, - {293, 16}, - {294, 16}, - {272, 16}, - {273, 16}, - {214, 32}, - {271, 32}, - {213, 48}, - {220, 48}, - {230, 48}, - {232, 48}, - {266, 48}, - {275, 48}, - {287, 48}, - {326, 48}, - {327, 48}, - {50, 48}, - {333, 32}, - {400, 32}, - {388, 32}, - {372, 32}, - {367, 40}, - {358, 40}, - {335, 48}, - {331, 48}, - {408, 64}, - {357, 64}, - {380, 64}, - {363, 80}, - {386, 80}, - {398, 80}, - {353, 80} + { 46, 1 }, + { 49, 1 }, + { 47, 1 }, + { 52, 1 }, + { 48, 1 }, + { 45, 1 }, + { 289, 16 }, + { 290, 16 }, + { 291, 16 }, + { 292, 16 }, + { 293, 16 }, + { 294, 16 }, + { 272, 16 }, + { 273, 16 }, + { 214, 32 }, + { 271, 32 }, + { 213, 48 }, + { 220, 48 }, + { 230, 48 }, + { 232, 48 }, + { 266, 48 }, + { 275, 48 }, + { 287, 48 }, + { 326, 48 }, + { 327, 48 }, + { 50, 48 }, + { 333, 32 }, + { 400, 32 }, + { 388, 32 }, + { 372, 32 }, + { 367, 40 }, + { 358, 40 }, + { 335, 48 }, + { 331, 48 }, + { 408, 64 }, + { 357, 64 }, + { 380, 64 }, + { 363, 80 }, + { 386, 80 }, + { 398, 80 }, + { 353, 80 } }; for (v0 = 0; v0 < (NELEMS(v1)); v0++) { @@ -1362,7 +1360,7 @@ static u16 ov7_0224E8CC (UnkStruct_ov7_0224D008 * param0, u16 param1) return 0; } -u32 ov7_0224E8F4 (UnkStruct_ov7_0224D008 * param0) +u32 ov7_0224E8F4(UnkStruct_ov7_0224D008 *param0) { if (param0->unk_2A9 == 3) { return sub_0202D230(sub_0202D750(param0->unk_284), 0, 0); @@ -1371,7 +1369,7 @@ u32 ov7_0224E8F4 (UnkStruct_ov7_0224D008 * param0) } } -void ov7_0224E920 (UnkStruct_ov7_0224D008 * param0, u32 param1) +void ov7_0224E920(UnkStruct_ov7_0224D008 *param0, u32 param1) { if (param0->unk_2A9 == 3) { sub_0202D230(sub_0202D750(param0->unk_284), (u16)param1, 6); @@ -1380,10 +1378,10 @@ void ov7_0224E920 (UnkStruct_ov7_0224D008 * param0, u32 param1) } } -static u8 ov7_0224E950 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1) +static u8 ov7_0224E950(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) { if (param1->unk_2A5 != param1->unk_2A6) { - VecFx32 v0 = {-8 * FX32_ONE, 0, 0}; + VecFx32 v0 = { -8 * FX32_ONE, 0, 0 }; Camera_Move(&v0, param1->camera); param1->unk_2A5++; @@ -1406,7 +1404,7 @@ static u8 ov7_0224E950 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * para FieldMessage_DrawWindow(¶m1->unk_08[1], param1->unk_278); { - Strbuf* v1 = MessageLoader_GetNewStrbuf(param1->unk_88, 2); + Strbuf *v1 = MessageLoader_GetNewStrbuf(param1->unk_88, 2); StringTemplate_Format(param1->unk_8C, param1->unk_298, v1); Strbuf_Free(v1); @@ -1417,7 +1415,7 @@ static u8 ov7_0224E950 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * para return 13; } -static u8 ov7_0224EA2C (UnkStruct_ov7_0224D008 * param0) +static u8 ov7_0224EA2C(UnkStruct_ov7_0224D008 *param0) { if (FieldMessage_FinishedPrinting(param0->unk_2A4) == 0) { return 13; @@ -1429,9 +1427,9 @@ static u8 ov7_0224EA2C (UnkStruct_ov7_0224D008 * param0) return 1; } -static void ov7_0224EA54 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1) +static void ov7_0224EA54(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) { - Strbuf* v0; + Strbuf *v0; if (param1->unk_2A9 == 3) { v0 = MessageLoader_GetNewStrbuf(param1->unk_88, 31); @@ -1458,13 +1456,13 @@ static const UnkStruct_ov7_0224F2EC Unk_ov7_0224F2EC = { }; static const UnkStruct_ov7_0224F358 Unk_ov7_0224F358[] = { - {0, 0xB1, 0x8, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0, 0xB1, 0x84, 0x0, 0x1, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {1, 0xAC, 0x18, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {2, 0x16, 0xAC, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0} + { 0, 0xB1, 0x8, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0, 0xB1, 0x84, 0x0, 0x1, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 1, 0xAC, 0x18, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 2, 0x16, 0xAC, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 } }; -static void ov7_0224EAD0 (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224EAD0(UnkStruct_ov7_0224D008 *param0) { u32 v0; @@ -1477,7 +1475,7 @@ static void ov7_0224EAD0 (UnkStruct_ov7_0224D008 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov7_0224EB14 (UnkStruct_ov7_0224D008 * param0) +static void ov7_0224EB14(UnkStruct_ov7_0224D008 *param0) { u32 v0; @@ -1488,7 +1486,7 @@ static void ov7_0224EB14 (UnkStruct_ov7_0224D008 * param0) ov5_021D30A8(¶m0->unk_94); } -static void ov7_0224EB38 (UnkStruct_ov7_0224D008 * param0, u8 param1) +static void ov7_0224EB38(UnkStruct_ov7_0224D008 *param0, u8 param1) { if (param1 == 0) { SpriteActor_SetPositionXY(param0->unk_25C[0], 177, 8); @@ -1499,9 +1497,9 @@ static void ov7_0224EB38 (UnkStruct_ov7_0224D008 * param0, u8 param1) } } -static void ov7_0224EB7C (UnkStruct_ov7_0224D008 * param0, u16 param1) +static void ov7_0224EB7C(UnkStruct_ov7_0224D008 *param0, u16 param1) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; if ((param0->unk_2A9 != 0) && (param0->unk_2A9 != 3)) { sub_02021CAC(param0->unk_25C[3], 0); @@ -1519,21 +1517,21 @@ static void ov7_0224EB7C (UnkStruct_ov7_0224D008 * param0, u16 param1) sub_0200A6B8(v0); } -static void ov7_0224EC10 (UnkStruct_ov7_0224D008 * param0, u8 param1) +static void ov7_0224EC10(UnkStruct_ov7_0224D008 *param0, u8 param1) { sub_0200D414(param0->unk_25C[2], param1); } -static void ov7_0224EC20 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1) +static void ov7_0224EC20(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) { ov5_021D1744(0); param1->unk_297 = 15; } -static void ov7_0224EC38 (TaskManager * param0) +static void ov7_0224EC38(TaskManager *param0) { - FieldSystem * fieldSystem; - UnkStruct_ov7_0224D008 * v1; + FieldSystem *fieldSystem; + UnkStruct_ov7_0224D008 *v1; if (ScreenWipe_Done() == 0) { return; @@ -1545,7 +1543,7 @@ static void ov7_0224EC38 (TaskManager * param0) ov7_0224D21C(v1); { - Bag * v2; + Bag *v2; v2 = SaveData_GetBag(fieldSystem->saveData); v1->unk_04 = sub_0207D824(v2, Unk_ov7_0224F49C, 11); @@ -1559,7 +1557,7 @@ static void ov7_0224EC38 (TaskManager * param0) v1->unk_297 = 16; } -static u8 ov7_0224EC9C (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1) +static u8 ov7_0224EC9C(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) { if (ScreenWipe_Done() == 0) { return 18; @@ -1569,7 +1567,7 @@ static u8 ov7_0224EC9C (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * para FieldMessage_DrawWindow(¶m1->unk_08[1], param1->unk_278); { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param1->unk_88, 2); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param1->unk_88, 2); StringTemplate_Format(param1->unk_8C, param1->unk_298, v0); Strbuf_Free(v0); diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 7b7278122c..5609e5764a 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -1,24 +1,13 @@ +#include "overlay008/ov8_02249960.h" + #include #include -#include "core_sys.h" - -#include "message.h" -#include "sys_task_manager.h" -#include "strbuf.h" #include "struct_decls/struct_02027860_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021D3CAC_decl.h" -#include "overlay005/struct_ov5_021D3CE4_decl.h" -#include "overlay005/struct_ov5_021D57D8_decl.h" -#include "overlay005/struct_ov5_021E1890_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "field/field_system.h" -#include "field/field_system_sub2_t.h" #include "struct_defs/struct_02055130.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02071B10.h" @@ -27,47 +16,57 @@ #include "struct_defs/struct_02071BD0.h" #include "struct_defs/struct_02071BF8.h" #include "struct_defs/struct_02071C18.h" + +#include "field/field_system.h" +#include "field/field_system_sub2_t.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021D57BC.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021E779C.h" +#include "overlay005/ov5_021EF250.h" +#include "overlay005/ov5_021F4018.h" +#include "overlay005/ov5_021F428C.h" +#include "overlay005/ov5_021F47B0.h" +#include "overlay005/ov5_021F5A10.h" +#include "overlay005/struct_ov5_021D3CAC_decl.h" +#include "overlay005/struct_ov5_021D3CE4_decl.h" +#include "overlay005/struct_ov5_021D57D8_decl.h" +#include "overlay005/struct_ov5_021E1890_decl.h" #include "overlay008/struct_ov8_02249FB8.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" -#include "unk_02005474.h" +#include "camera.h" +#include "core_sys.h" +#include "field_system.h" +#include "heap.h" +#include "map_header_data.h" +#include "map_object.h" +#include "map_object_move.h" #include "message.h" +#include "player_avatar.h" +#include "savedata_misc.h" +#include "strbuf.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" +#include "unk_02005474.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "camera.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "savedata_misc.h" #include "unk_02027F50.h" -#include "map_header_data.h" -#include "field_system.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_02054D00.h" #include "unk_0205D8CC.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" #include "unk_0205F180.h" -#include "map_object.h" -#include "map_object_move.h" #include "unk_020655F4.h" #include "unk_02067A84.h" #include "unk_0206AFE0.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021D57BC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021E779C.h" -#include "overlay005/ov5_021EF250.h" -#include "overlay005/ov5_021F4018.h" -#include "overlay005/ov5_021F428C.h" -#include "overlay005/ov5_021F47B0.h" -#include "overlay005/ov5_021F5A10.h" -#include "overlay008/ov8_02249960.h" +#include "vars_flags.h" typedef struct { int unk_00; @@ -80,7 +79,7 @@ typedef struct { } UnkStruct_ov8_0224A1E4_sub1; typedef struct { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; int unk_04; int unk_08; int unk_0C; @@ -103,7 +102,7 @@ typedef struct { } UnkStruct_ov8_0224CB68; typedef struct { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; u8 unk_04[13]; u8 unk_11; u8 unk_12; @@ -133,7 +132,7 @@ typedef struct { typedef struct { int unk_00; - const u8 * unk_04[4]; + const u8 *unk_04[4]; } UnkStruct_ov8_0224E740; typedef struct { @@ -151,7 +150,7 @@ typedef struct { VecFx32 unk_00; u32 unk_0C; u16 unk_10; - UnkStruct_ov5_021E1890 * unk_14; + UnkStruct_ov5_021E1890 *unk_14; } UnkStruct_ov8_0224AF58; typedef struct { @@ -159,7 +158,7 @@ typedef struct { fx32 unk_04; int unk_08; UnkStruct_ov8_0224AF58 unk_0C[2]; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; } UnkStruct_ov8_0224AF00; typedef struct { @@ -171,7 +170,7 @@ typedef struct { int unk_14; int unk_18; int unk_1C; - MapObject * unk_20; + MapObject *unk_20; } UnkStruct_ov8_0224B28C; typedef struct { @@ -179,14 +178,14 @@ typedef struct { int unk_04; fx32 unk_08; fx32 unk_0C; - FieldSystem * fieldSystem; - UnkStruct_02071BD0 * unk_14; - UnkStruct_ov8_0224AF00 * unk_18; + FieldSystem *fieldSystem; + UnkStruct_02071BD0 *unk_14; + UnkStruct_ov8_0224AF00 *unk_18; UnkStruct_ov8_0224B28C unk_1C; u32 unk_40; - Window * unk_44; - MessageLoader * unk_48; - Strbuf* unk_4C; + Window *unk_44; + MessageLoader *unk_48; + Strbuf *unk_4C; } UnkStruct_ov8_0224B67C; typedef struct { @@ -197,8 +196,8 @@ typedef struct { typedef struct { int unk_00; int unk_04; - MapObject * unk_08; - UnkStruct_ov101_021D5D90 * unk_0C; + MapObject *unk_08; + UnkStruct_ov101_021D5D90 *unk_0C; } UnkStruct_ov8_0224B80C; typedef struct { @@ -214,7 +213,7 @@ typedef struct { } UnkStruct_ov8_0224B8A0; typedef struct { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; UnkStruct_ov8_0224B8A0 unk_04[11]; UnkStruct_ov8_0224BCA8 unk_10C[9]; } UnkStruct_ov8_0224B8D0; @@ -232,8 +231,8 @@ typedef struct { int unk_24; int unk_28; int unk_2C; - MapObject * unk_30; - FieldSystem * fieldSystem; + MapObject *unk_30; + FieldSystem *fieldSystem; } UnkStruct_ov8_0224C0C4; typedef struct { @@ -248,9 +247,9 @@ typedef struct { VecFx32 unk_20; fx32 unk_2C; fx32 unk_30; - UnkStruct_ov8_0224BCA8 * unk_34; - UnkStruct_ov8_0224B8A0 * unk_38; - UnkStruct_ov8_0224B8D0 * unk_3C; + UnkStruct_ov8_0224BCA8 *unk_34; + UnkStruct_ov8_0224B8A0 *unk_38; + UnkStruct_ov8_0224B8D0 *unk_3C; UnkStruct_ov8_0224C0C4 unk_40; } UnkStruct_ov8_0224C098; @@ -265,7 +264,7 @@ typedef struct { } UnkStruct_ov8_0224C8D4; typedef struct { - UnkStruct_ov5_021D57D8 * unk_00; + UnkStruct_ov5_021D57D8 *unk_00; int unk_04; u8 unk_08; u8 unk_09; @@ -286,50 +285,50 @@ typedef struct { int unk_00; int unk_04; int unk_08; - SysTask * unk_0C; - UnkStruct_ov101_021D5D90 * unk_10; - MapObject * unk_14; - UnkStruct_ov8_0224C444 * unk_18; + SysTask *unk_0C; + UnkStruct_ov101_021D5D90 *unk_10; + MapObject *unk_14; + UnkStruct_ov8_0224C444 *unk_18; } UnkStruct_ov8_0224C4F8; typedef struct UnkStruct_ov8_0224C444_t { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; UnkStruct_ov8_0224C4F8 unk_04[16]; UnkStruct_ov8_0224C3B4 unk_1C4; u32 unk_1F0; - SysTask * unk_1F4; + SysTask *unk_1F4; } UnkStruct_ov8_0224C444; void include_ov8_02249960(void); static u8 ov8_02249960(const u8 param0, const int param1); -static void ov8_0224996C(const u8 param0, int * param1); -static BOOL ov8_02249A94(TaskManager * param0); -static BOOL ov8_02249B74(TaskManager * param0); -static BOOL ov8_02249CD8(TaskManager * param0); -static void ov8_02249F14(const u8 param0, UnkStruct_ov5_021D3CAC * param1); -static BOOL ov8_0224A018(TaskManager * param0); -static BOOL ov8_0224A0E8(TaskManager * param0); -static BOOL ov8_0224A4FC(TaskManager * param0); -static BOOL ov8_0224A620(TaskManager * param0); -static BOOL ov8_0224A770(TaskManager * param0); -static BOOL ov8_0224ADE8(TaskManager * param0); -static void ov8_0224B8D0(UnkStruct_ov8_0224B8D0 * param0); -static void ov8_0224B958(UnkStruct_ov8_0224B8D0 * param0); -static void ov8_0224BFCC(FieldSystem * fieldSystem, UnkStruct_ov8_0224C098 * param1, UnkStruct_ov8_0224B80C * param2, int param3); -static void ov8_0224C098(UnkStruct_ov8_0224C098 * param0); -static BOOL ov8_0224C0C4(UnkStruct_ov8_0224C098 * param0); -static BOOL ov8_0224C0C8(UnkStruct_ov8_0224C098 * param0, UnkStruct_ov8_0224B80C * param1, int param2); -static void ov8_0224C0FC(UnkStruct_ov8_0224C098 * param0, int param1); -static void ov8_0224C11C(UnkStruct_ov8_0224C098 * param0, int param1); -static void ov8_0224C170(UnkStruct_ov8_0224C098 * param0, fx32 param1); -static void ov8_0224C3B0(SysTask * param0, void * param1); -static void ov8_0224C3B4(UnkStruct_ov8_0224C444 * param0); -static void ov8_0224C444(UnkStruct_ov8_0224C444 * param0); -static void ov8_0224C4F8(UnkStruct_ov8_0224C444 * param0); -static void ov8_0224C518(SysTask * param0, void * param1); - -static u8 ov8_02249960 (const u8 param0, const int param1) +static void ov8_0224996C(const u8 param0, int *param1); +static BOOL ov8_02249A94(TaskManager *param0); +static BOOL ov8_02249B74(TaskManager *param0); +static BOOL ov8_02249CD8(TaskManager *param0); +static void ov8_02249F14(const u8 param0, UnkStruct_ov5_021D3CAC *param1); +static BOOL ov8_0224A018(TaskManager *param0); +static BOOL ov8_0224A0E8(TaskManager *param0); +static BOOL ov8_0224A4FC(TaskManager *param0); +static BOOL ov8_0224A620(TaskManager *param0); +static BOOL ov8_0224A770(TaskManager *param0); +static BOOL ov8_0224ADE8(TaskManager *param0); +static void ov8_0224B8D0(UnkStruct_ov8_0224B8D0 *param0); +static void ov8_0224B958(UnkStruct_ov8_0224B8D0 *param0); +static void ov8_0224BFCC(FieldSystem *fieldSystem, UnkStruct_ov8_0224C098 *param1, UnkStruct_ov8_0224B80C *param2, int param3); +static void ov8_0224C098(UnkStruct_ov8_0224C098 *param0); +static BOOL ov8_0224C0C4(UnkStruct_ov8_0224C098 *param0); +static BOOL ov8_0224C0C8(UnkStruct_ov8_0224C098 *param0, UnkStruct_ov8_0224B80C *param1, int param2); +static void ov8_0224C0FC(UnkStruct_ov8_0224C098 *param0, int param1); +static void ov8_0224C11C(UnkStruct_ov8_0224C098 *param0, int param1); +static void ov8_0224C170(UnkStruct_ov8_0224C098 *param0, fx32 param1); +static void ov8_0224C3B0(SysTask *param0, void *param1); +static void ov8_0224C3B4(UnkStruct_ov8_0224C444 *param0); +static void ov8_0224C444(UnkStruct_ov8_0224C444 *param0); +static void ov8_0224C4F8(UnkStruct_ov8_0224C444 *param0); +static void ov8_0224C518(SysTask *param0, void *param1); + +static u8 ov8_02249960(const u8 param0, const int param1) { u8 v0; @@ -337,18 +336,18 @@ static u8 ov8_02249960 (const u8 param0, const int param1) return v0; } -static void ov8_0224996C (const u8 param0, int * param1) +static void ov8_0224996C(const u8 param0, int *param1) { (*param1) ^= (0x1 << param0); } -void ov8_0224997C (FieldSystem * fieldSystem) +void ov8_0224997C(FieldSystem *fieldSystem) { UnkStruct_02055130 v0; int v1, v2; BOOL v3; int v4; - int v5[] = {239, 240, 241}; + int v5[] = { 239, 240, 241 }; v1 = Player_GetXPos(fieldSystem->playerAvatar); v2 = Player_GetZPos(fieldSystem->playerAvatar); @@ -358,9 +357,9 @@ void ov8_0224997C (FieldSystem * fieldSystem) v3 = sub_02055208(fieldSystem, v5, NELEMS(v5), &v0, NULL, &v4); if (v3) { - UnkStruct_ov8_0224997C * v6; - UnkStruct_02027860 * v7; - UnkStruct_02071B10 * v8; + UnkStruct_ov8_0224997C *v6; + UnkStruct_02027860 *v7; + UnkStruct_02071B10 *v8; v7 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v8 = (UnkStruct_02071B10 *)sub_02027F6C(v7, 1); @@ -383,7 +382,7 @@ void ov8_0224997C (FieldSystem * fieldSystem) } } -BOOL ov8_02249A40 (FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4) +BOOL ov8_02249A40(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4) { u8 v0; @@ -410,11 +409,11 @@ BOOL ov8_02249A40 (FieldSystem * fieldSystem, const int param1, const int param2 return 0; } -static BOOL ov8_02249A94 (TaskManager * taskMan) +static BOOL ov8_02249A94(TaskManager *taskMan) { - UnkStruct_ov5_021E1890 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov8_0224997C * v2 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021E1890 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov8_0224997C *v2 = TaskManager_Environment(taskMan); switch (v2->unk_00) { case 0: @@ -422,11 +421,10 @@ static BOOL ov8_02249A94 (TaskManager * taskMan) ov8_02249F14(0, fieldSystem->unk_50); (v2->unk_00)++; break; - case 1: - { - UnkStruct_ov5_021D3CE4 * v3; - UnkStruct_ov5_021D3CE4 * v4; - UnkStruct_ov5_021D3CE4 * v5; + case 1: { + UnkStruct_ov5_021D3CE4 *v3; + UnkStruct_ov5_021D3CE4 *v4; + UnkStruct_ov5_021D3CE4 *v5; v3 = ov5_021D3DA0(1, fieldSystem->unk_50); v4 = ov5_021D3DA0(2, fieldSystem->unk_50); @@ -449,8 +447,7 @@ static BOOL ov8_02249A94 (TaskManager * taskMan) ov5_021E18A4(v0, &v6); } } - } - break; + } break; case 2: ov5_021EF388(0, (FX32_ONE * 16 * 0), fieldSystem->unk_A0); sub_020057A4(1626, 0); @@ -464,22 +461,21 @@ static BOOL ov8_02249A94 (TaskManager * taskMan) return 0; } -static BOOL ov8_02249B74 (TaskManager * taskMan) +static BOOL ov8_02249B74(TaskManager *taskMan) { - UnkStruct_ov5_021E1890 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov8_0224997C * v2 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021E1890 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov8_0224997C *v2 = TaskManager_Environment(taskMan); switch (v2->unk_00) { case 0: ov8_02249F14(1, fieldSystem->unk_50); (v2->unk_00)++; break; - case 1: - { - UnkStruct_ov5_021D3CE4 * v3; - UnkStruct_ov5_021D3CE4 * v4; - UnkStruct_ov5_021D3CE4 * v5; + case 1: { + UnkStruct_ov5_021D3CE4 *v3; + UnkStruct_ov5_021D3CE4 *v4; + UnkStruct_ov5_021D3CE4 *v5; v3 = ov5_021D3DA0(1, fieldSystem->unk_50); v4 = ov5_021D3DA0(2, fieldSystem->unk_50); @@ -504,8 +500,7 @@ static BOOL ov8_02249B74 (TaskManager * taskMan) } } } - } - break; + } break; case 2: v0 = ov5_021E18CC(fieldSystem->unk_A4, 242); @@ -553,22 +548,21 @@ static BOOL ov8_02249B74 (TaskManager * taskMan) return 0; } -static BOOL ov8_02249CD8 (TaskManager * taskMan) +static BOOL ov8_02249CD8(TaskManager *taskMan) { - UnkStruct_ov5_021E1890 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov8_0224997C * v2 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021E1890 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov8_0224997C *v2 = TaskManager_Environment(taskMan); switch (v2->unk_00) { case 0: ov8_02249F14(2, fieldSystem->unk_50); (v2->unk_00)++; break; - case 1: - { - UnkStruct_ov5_021D3CE4 * v3; - UnkStruct_ov5_021D3CE4 * v4; - UnkStruct_ov5_021D3CE4 * v5; + case 1: { + UnkStruct_ov5_021D3CE4 *v3; + UnkStruct_ov5_021D3CE4 *v4; + UnkStruct_ov5_021D3CE4 *v5; v3 = ov5_021D3DA0(1, fieldSystem->unk_50); v4 = ov5_021D3DA0(2, fieldSystem->unk_50); @@ -591,8 +585,7 @@ static BOOL ov8_02249CD8 (TaskManager * taskMan) ov5_021E18A4(v0, &v6); } } - } - break; + } break; case 2: ov5_021EF388(0, (FX32_ONE * 16 * 4), fieldSystem->unk_A0); sub_020057A4(1626, 0); @@ -606,21 +599,21 @@ static BOOL ov8_02249CD8 (TaskManager * taskMan) return 0; } -void ov8_02249DBC (FieldSystem * fieldSystem) +void ov8_02249DBC(FieldSystem *fieldSystem) { u8 v0; - UnkStruct_ov5_021E1890 * v1; + UnkStruct_ov5_021E1890 *v1; fx32 v2; fx32 v3; BOOL v4, v5, v6; - UnkStruct_02027860 * v7; - UnkStruct_02071B10 * v8; + UnkStruct_02027860 *v7; + UnkStruct_02071B10 *v8; v7 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v8 = (UnkStruct_02071B10 *)sub_02027F6C(v7, 1); { - VecFx32 v9 = {FX32_ONE * 16 * 16, 0, FX32_ONE * 16 * 16}; + VecFx32 v9 = { FX32_ONE * 16 * 16, 0, FX32_ONE * 16 * 16 }; ov5_021E19CC(fieldSystem->unk_A4, fieldSystem->unk_30, 242, &v9, NULL, fieldSystem->unk_50); } @@ -673,7 +666,7 @@ void ov8_02249DBC (FieldSystem * fieldSystem) ov5_021EF388(0, v3, fieldSystem->unk_A0); { - UnkStruct_ov5_021D3CE4 * v11; + UnkStruct_ov5_021D3CE4 *v11; v11 = ov5_021D3DE4(239, 0, fieldSystem->unk_50); @@ -701,9 +694,9 @@ void ov8_02249DBC (FieldSystem * fieldSystem) } } -static void ov8_02249F14 (const u8 param0, UnkStruct_ov5_021D3CAC * param1) +static void ov8_02249F14(const u8 param0, UnkStruct_ov5_021D3CAC *param1) { - UnkStruct_ov5_021D3CE4 * v0; + UnkStruct_ov5_021D3CE4 *v0; int v1, v2, v3; if (param0 == 2) { @@ -746,23 +739,23 @@ static void ov8_02249F14 (const u8 param0, UnkStruct_ov5_021D3CAC * param1) Sound_PlayEffect(1626); } -void include_ov8_02249960 (void) +void include_ov8_02249960(void) { - VecFx32 dummy = {FX32_ONE * (16 * 9 + 8), 0, FX32_ONE * (16 * 13 + 8)}; - VecFx32 * dummy2 = &dummy; + VecFx32 dummy = { FX32_ONE * (16 * 9 + 8), 0, FX32_ONE * (16 * 13 + 8) }; + VecFx32 *dummy2 = &dummy; } -void ov8_02249FB8 (FieldSystem * fieldSystem) +void ov8_02249FB8(FieldSystem *fieldSystem) { - UnkStruct_ov8_0224997C * v0; + UnkStruct_ov8_0224997C *v0; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov8_0224997C)); v0->unk_00 = 0; { VecFx32 v1; - UnkStruct_02027860 * v2; - UnkStruct_ov8_02249FB8 * v3; + UnkStruct_02027860 *v2; + UnkStruct_ov8_02249FB8 *v3; v2 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v3 = (UnkStruct_ov8_02249FB8 *)sub_02027F6C(v2, 2); @@ -779,11 +772,11 @@ void ov8_02249FB8 (FieldSystem * fieldSystem) } } -static BOOL ov8_0224A018 (TaskManager * taskMan) +static BOOL ov8_0224A018(TaskManager *taskMan) { - UnkStruct_ov5_021E1890 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov8_0224997C * v2 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021E1890 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov8_0224997C *v2 = TaskManager_Environment(taskMan); switch (v2->unk_00) { case 0: @@ -791,8 +784,7 @@ static BOOL ov8_0224A018 (TaskManager * taskMan) Sound_PlayEffect(1553); (v2->unk_00)++; break; - case 1: - { + case 1: { v0 = ov5_021E18CC(fieldSystem->unk_A4, 258); { @@ -811,8 +803,7 @@ static BOOL ov8_0224A018 (TaskManager * taskMan) sub_0205ED0C(fieldSystem->playerAvatar, v3.y); ov5_021E18A4(v0, &v3); } - } - break; + } break; case 2: ov5_021EF388(0, (FX32_ONE * 16 * 10), fieldSystem->unk_A0); sub_0205ED48(fieldSystem->playerAvatar, 1); @@ -827,11 +818,11 @@ static BOOL ov8_0224A018 (TaskManager * taskMan) return 0; } -static BOOL ov8_0224A0E8 (TaskManager * taskMan) +static BOOL ov8_0224A0E8(TaskManager *taskMan) { - UnkStruct_ov5_021E1890 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov8_0224997C * v2 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021E1890 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov8_0224997C *v2 = TaskManager_Environment(taskMan); switch (v2->unk_00) { case 0: @@ -839,8 +830,7 @@ static BOOL ov8_0224A0E8 (TaskManager * taskMan) Sound_PlayEffect(1553); (v2->unk_00)++; break; - case 1: - { + case 1: { v0 = ov5_021E18CC(fieldSystem->unk_A4, 258); { @@ -858,8 +848,7 @@ static BOOL ov8_0224A0E8 (TaskManager * taskMan) sub_0205ED0C(fieldSystem->playerAvatar, v3.y); ov5_021E18A4(v0, &v3); } - } - break; + } break; case 2: ov5_021EF388(0, (FX32_ONE * 16 * 0), fieldSystem->unk_A0); sub_0205ED48(fieldSystem->playerAvatar, 1); @@ -874,6 +863,7 @@ static BOOL ov8_0224A0E8 (TaskManager * taskMan) return 0; } +// clang-format off static const u8 Unk_ov8_0224D035[4][1024] = { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1012,205 +1002,206 @@ static const u8 Unk_ov8_0224D035[4][1024] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, }; +// clang-format on static const UnkStruct_ov8_0224CB68 Unk_ov8_0224CB68[24] = { { 0x129, - {0x10, 0x0, 0x9}, - {0x10, 0x1E, 0x9}, + { 0x10, 0x0, 0x9 }, + { 0x10, 0x1E, 0x9 }, 0, 3, - 0x0 + 0x0, }, { 0x128, - {0xB, 0x0, 0xD}, - {0xB, 0xA, 0xD}, + { 0xB, 0x0, 0xD }, + { 0xB, 0xA, 0xD }, 0, 1, - 0x0 + 0x0, }, { 0x128, - {0xF, 0x0, 0xD}, - {0xF, 0xA, 0xD}, + { 0xF, 0x0, 0xD }, + { 0xF, 0xA, 0xD }, 0, 1, - 0x0 + 0x0, }, { 0x128, - {0x13, 0x0, 0xD}, - {0x13, 0xA, 0xD}, + { 0x13, 0x0, 0xD }, + { 0x13, 0xA, 0xD }, 0, 1, - 0x0 + 0x0, }, { 0x128, - {0x18, 0x0, 0xD}, - {0x18, 0xA, 0xD}, + { 0x18, 0x0, 0xD }, + { 0x18, 0xA, 0xD }, 0, 1, - 0x0 + 0x0, }, { 0x128, - {0x15, 0x0, 0x16}, - {0x15, 0xA, 0x16}, + { 0x15, 0x0, 0x16 }, + { 0x15, 0xA, 0x16 }, 0, 1, - 0x0 + 0x0, }, { 0x128, - {0x19, 0x0, 0x9}, - {0x19, 0xA, 0x9}, + { 0x19, 0x0, 0x9 }, + { 0x19, 0xA, 0x9 }, 0, 1, - 0x1 + 0x1, }, { 0x128, - {0x19, 0x0, 0x16}, - {0x19, 0xA, 0x16}, + { 0x19, 0x0, 0x16 }, + { 0x19, 0xA, 0x16 }, 0, 1, - 0x1 + 0x1, }, { 0x128, - {0x1D, 0x0, 0x16}, - {0x1D, 0xA, 0x16}, + { 0x1D, 0x0, 0x16 }, + { 0x1D, 0xA, 0x16 }, 0, 1, - 0x1 + 0x1, }, { 0x128, - {0x5, 0xA, 0x1A}, - {0x5, 0x14, 0x1A}, + { 0x5, 0xA, 0x1A }, + { 0x5, 0x14, 0x1A }, 1, 2, - 0x0 + 0x0, }, { 0x127, - {0xB, 0xA, 0x16}, - {0x12, 0xA, 0x16}, + { 0xB, 0xA, 0x16 }, + { 0x12, 0xA, 0x16 }, 1, 1, - 0x1 + 0x1, }, { 0x128, - {0x1D, 0xA, 0x9}, - {0x1D, 0x14, 0x9}, + { 0x1D, 0xA, 0x9 }, + { 0x1D, 0x14, 0x9 }, 1, 2, - 0x1 + 0x1, }, { 0x127, - {0xA, 0x14, 0x4}, - {0xE, 0x14, 0x4}, + { 0xA, 0x14, 0x4 }, + { 0xE, 0x14, 0x4 }, 2, 2, - 0x0 + 0x0, }, { 0x127, - {0x13, 0x14, 0x4}, - {0x16, 0x14, 0x4}, + { 0x13, 0x14, 0x4 }, + { 0x16, 0x14, 0x4 }, 2, 2, - 0x0 + 0x0, }, { 0x127, - {0x7, 0x14, 0xC}, - {0x16, 0x14, 0xC}, + { 0x7, 0x14, 0xC }, + { 0x16, 0x14, 0xC }, 2, 2, - 0x0 + 0x0, }, { 0x127, - {0x9, 0x14, 0x1A}, - {0x15, 0x14, 0x1A}, + { 0x9, 0x14, 0x1A }, + { 0x15, 0x14, 0x1A }, 2, 2, - 0x0 + 0x0, }, { 0x126, - {0x2, 0x14, 0x13}, - {0x2, 0x14, 0x16}, + { 0x2, 0x14, 0x13 }, + { 0x2, 0x14, 0x16 }, 2, 2, - 0x1 + 0x1, }, { 0x126, - {0x1A, 0x14, 0x10}, - {0x1A, 0x14, 0x16}, + { 0x1A, 0x14, 0x10 }, + { 0x1A, 0x14, 0x16 }, 2, 2, - 0x0 + 0x0, }, { 0x126, - {0x1D, 0x14, 0x10}, - {0x1D, 0x14, 0x16}, + { 0x1D, 0x14, 0x10 }, + { 0x1D, 0x14, 0x16 }, 2, 2, - 0x1 + 0x1, }, { 0x129, - {0x7, 0x0, 0x9}, - {0x7, 0x1E, 0x9}, + { 0x7, 0x0, 0x9 }, + { 0x7, 0x1E, 0x9 }, 0, 3, - 0x1 + 0x1, }, { 0x127, - {0x13, 0x1E, 0x4}, - {0x1A, 0x1E, 0x4}, + { 0x13, 0x1E, 0x4 }, + { 0x1A, 0x1E, 0x4 }, 3, 3, - 0x0 + 0x0, }, { 0x127, - {0x5, 0x1E, 0x1A}, - {0x1A, 0x1E, 0x1A}, + { 0x5, 0x1E, 0x1A }, + { 0x1A, 0x1E, 0x1A }, 3, 3, - 0x1 + 0x1, }, { 0x126, - {0x1D, 0x1E, 0x7}, - {0x1D, 0x1E, 0x17}, + { 0x1D, 0x1E, 0x7 }, + { 0x1D, 0x1E, 0x17 }, 3, 3, - 0x0 + 0x0, }, { 0x126, - {0x2, 0x1E, 0xC}, - {0x2, 0x1E, 0x17}, + { 0x2, 0x1E, 0xC }, + { 0x2, 0x1E, 0x17 }, 3, 3, - 0x1 - } + 0x1, + }, }; -static void ov8_0224A1B4 (const UnkStruct_ov8_0224A1E4 * param0, const BOOL param1, const int param2) +static void ov8_0224A1B4(const UnkStruct_ov8_0224A1E4 *param0, const BOOL param1, const int param2) { - UnkStruct_ov5_021E1890 * v0; + UnkStruct_ov5_021E1890 *v0; int v1; for (v1 = 0; v1 < 24; v1++) { @@ -1221,7 +1212,7 @@ static void ov8_0224A1B4 (const UnkStruct_ov8_0224A1E4 * param0, const BOOL para } } -static u8 ov8_0224A1E4 (UnkStruct_ov8_0224A1E4 * param0) +static u8 ov8_0224A1E4(UnkStruct_ov8_0224A1E4 *param0) { u8 v0; u8 v1; @@ -1246,13 +1237,13 @@ static u8 ov8_0224A1E4 (UnkStruct_ov8_0224A1E4 * param0) return 24; } -static void ov8_0224A254 (UnkStruct_ov8_0224A1E4 * param0, const u8 param1) +static void ov8_0224A254(UnkStruct_ov8_0224A1E4 *param0, const u8 param1) { int v0; u8 v1; - UnkStruct_ov8_0224997C * v2; - UnkStruct_02027860 * v3; - UnkStruct_02071B30 * v4; + UnkStruct_ov8_0224997C *v2; + UnkStruct_02027860 *v3; + UnkStruct_02071B30 *v4; v3 = sub_02027860(FieldSystem_SaveData(param0->fieldSystem)); v4 = (UnkStruct_02071B30 *)sub_02027F6C(v3, 3); @@ -1306,11 +1297,11 @@ static void ov8_0224A254 (UnkStruct_ov8_0224A1E4 * param0, const u8 param1) } } -static void ov8_0224A434 (UnkStruct_ov8_0224A1E4 * param0, const fx32 param1) +static void ov8_0224A434(UnkStruct_ov8_0224A1E4 *param0, const fx32 param1) { - UnkStruct_ov5_021E1890 * v0; - UnkStruct_ov5_021E1890 * v1; - UnkStruct_ov5_021E1890 * v2; + UnkStruct_ov5_021E1890 *v0; + UnkStruct_ov5_021E1890 *v1; + UnkStruct_ov5_021E1890 *v2; v0 = ov5_021E18C4(param0->fieldSystem->unk_A4, param0->unk_04); v1 = ov5_021E18C4(param0->fieldSystem->unk_A4, param0->unk_08); @@ -1341,12 +1332,12 @@ static void ov8_0224A434 (UnkStruct_ov8_0224A1E4 * param0, const fx32 param1) } } -static BOOL ov8_0224A4FC (TaskManager * taskMan) +static BOOL ov8_0224A4FC(TaskManager *taskMan) { - UnkStruct_ov5_021E1890 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov8_0224997C * v2 = TaskManager_Environment(taskMan); - UnkStruct_ov8_0224A1E4 * v3; + UnkStruct_ov5_021E1890 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov8_0224997C *v2 = TaskManager_Environment(taskMan); + UnkStruct_ov8_0224A1E4 *v3; v3 = (UnkStruct_ov8_0224A1E4 *)fieldSystem->unk_04->unk_24; @@ -1356,8 +1347,7 @@ static BOOL ov8_0224A4FC (TaskManager * taskMan) Sound_PlayEffect(1553); (v2->unk_00)++; break; - case 1: - { + case 1: { int v4; v4 = v3->unk_28[v3->unk_E8]; @@ -1394,8 +1384,7 @@ static BOOL ov8_0224A4FC (TaskManager * taskMan) ov5_021E18A4(v0, &v5); ov8_0224A434(v3, v5.y); } - } - break; + } break; case 2: sub_0205ED48(fieldSystem->playerAvatar, 1); Sound_PlayEffect(1562); @@ -1409,13 +1398,13 @@ static BOOL ov8_0224A4FC (TaskManager * taskMan) return 0; } -static BOOL ov8_0224A620 (TaskManager * taskMan) +static BOOL ov8_0224A620(TaskManager *taskMan) { - UnkStruct_ov5_021E1890 * v0; - MapObject * v1; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov8_0224997C * v3 = TaskManager_Environment(taskMan); - UnkStruct_ov8_0224A1E4 * v4; + UnkStruct_ov5_021E1890 *v0; + MapObject *v1; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov8_0224997C *v3 = TaskManager_Environment(taskMan); + UnkStruct_ov8_0224A1E4 *v4; v4 = (UnkStruct_ov8_0224A1E4 *)fieldSystem->unk_04->unk_24; v1 = Player_MapObject(fieldSystem->playerAvatar); @@ -1429,8 +1418,7 @@ static BOOL ov8_0224A620 (TaskManager * taskMan) (v3->unk_00)++; } break; - case 1: - { + case 1: { int v5; v5 = v4->unk_28[v4->unk_E8]; @@ -1471,8 +1459,7 @@ static BOOL ov8_0224A620 (TaskManager * taskMan) ov5_021E18A4(v0, &v6); } - } - break; + } break; case 2: if (LocalMapObj_IsAnimationSet(v1) == 1) { LocalMapObj_SetAnimationCode(v1, 0x4a); @@ -1493,13 +1480,13 @@ static BOOL ov8_0224A620 (TaskManager * taskMan) return 0; } -static BOOL ov8_0224A770 (TaskManager * taskMan) +static BOOL ov8_0224A770(TaskManager *taskMan) { - UnkStruct_ov5_021E1890 * v0; - MapObject * v1; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov8_0224997C * v3 = TaskManager_Environment(taskMan); - UnkStruct_ov8_0224A1E4 * v4; + UnkStruct_ov5_021E1890 *v0; + MapObject *v1; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov8_0224997C *v3 = TaskManager_Environment(taskMan); + UnkStruct_ov8_0224A1E4 *v4; v4 = (UnkStruct_ov8_0224A1E4 *)fieldSystem->unk_04->unk_24; v1 = Player_MapObject(fieldSystem->playerAvatar); @@ -1513,8 +1500,7 @@ static BOOL ov8_0224A770 (TaskManager * taskMan) (v3->unk_00)++; } break; - case 1: - { + case 1: { int v5; v5 = v4->unk_28[v4->unk_E8]; @@ -1555,17 +1541,15 @@ static BOOL ov8_0224A770 (TaskManager * taskMan) ov5_021E18A4(v0, &v6); } - } - break; + } break; case 2: if (LocalMapObj_IsAnimationSet(v1) == 1) { LocalMapObj_SetAnimationCode(v1, 0x4a); (v3->unk_00)++; } break; - case 3: - { - MapObject * v8; + case 3: { + MapObject *v8; v8 = Player_MapObject(fieldSystem->playerAvatar); @@ -1574,8 +1558,7 @@ static BOOL ov8_0224A770 (TaskManager * taskMan) Sound_PlayEffect(1562); (v3->unk_00)++; } - } - break; + } break; case 4: Heap_FreeToHeap(v3); return 1; @@ -1584,11 +1567,11 @@ static BOOL ov8_0224A770 (TaskManager * taskMan) return 0; } -void ov8_0224A8C8 (FieldSystem * fieldSystem) +void ov8_0224A8C8(FieldSystem *fieldSystem) { - UnkStruct_ov8_0224A1E4 * v0; - UnkStruct_02027860 * v1; - UnkStruct_02071B30 * v2; + UnkStruct_ov8_0224A1E4 *v0; + UnkStruct_02027860 *v1; + UnkStruct_02071B30 *v2; v1 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v2 = (UnkStruct_02071B30 *)sub_02027F6C(v1, 3); @@ -1599,7 +1582,7 @@ void ov8_0224A8C8 (FieldSystem * fieldSystem) v0->fieldSystem = fieldSystem; { - VecFx32 v3 = {FX32_ONE * (16 * 16), 0, FX32_ONE * (16 * 16)}; + VecFx32 v3 = { FX32_ONE * (16 * 16), 0, FX32_ONE * (16 * 16) }; v3.y = (FX32_ONE * 16) * 10; v0->unk_04 = ov5_021E19CC(fieldSystem->unk_A4, fieldSystem->unk_30, 300, &v3, NULL, fieldSystem->unk_50); @@ -1664,14 +1647,14 @@ void ov8_0224A8C8 (FieldSystem * fieldSystem) } } -BOOL ov8_0224AAA8 (FieldSystem * fieldSystem) +BOOL ov8_0224AAA8(FieldSystem *fieldSystem) { u8 v0; - UnkStruct_ov8_0224A1E4 * v1; + UnkStruct_ov8_0224A1E4 *v1; { int v2; - UnkStruct_02027860 * v3; + UnkStruct_02027860 *v3; v3 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v2 = sub_02027F80(v3); @@ -1697,19 +1680,19 @@ BOOL ov8_0224AAA8 (FieldSystem * fieldSystem) return 0; } -void ov8_0224AAE8 (FieldSystem * fieldSystem) +void ov8_0224AAE8(FieldSystem *fieldSystem) { - UnkStruct_ov8_0224A1E4 * v0; + UnkStruct_ov8_0224A1E4 *v0; v0 = (UnkStruct_ov8_0224A1E4 *)fieldSystem->unk_04->unk_24; Heap_FreeToHeap(v0); fieldSystem->unk_04->unk_24 = NULL; } -BOOL ov8_0224AAFC (FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4) +BOOL ov8_0224AAFC(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4) { u8 v0; - const u8 * v1; + const u8 *v1; int v2; v0 = (param3 / (FX32_ONE * 16)) / 10; @@ -1725,122 +1708,122 @@ BOOL ov8_0224AAFC (FieldSystem * fieldSystem, const int param1, const int param2 } static const UnkStruct_ov8_0224C788 Unk_ov8_0224C788[3] = { - {0x1CB, 0x3, 0x0, 0x8, 0x1, 0x0, 0x0}, - {0x1CC, 0x8, 0x0, 0x8, 0x2, 0x1, 0x0}, - {0x1CB, 0xD, 0x0, 0x8, 0x0, 0x0, 0x0} + { 0x1CB, 0x3, 0x0, 0x8, 0x1, 0x0, 0x0 }, + { 0x1CC, 0x8, 0x0, 0x8, 0x2, 0x1, 0x0 }, + { 0x1CB, 0xD, 0x0, 0x8, 0x0, 0x0, 0x0 } }; static const UnkStruct_ov8_0224C788 Unk_ov8_0224C874[6] = { - {0x1CB, 0x6, 0x0, 0x8, 0x1, 0x0, 0x0}, - {0x1CA, 0xB, 0x0, 0x8, 0x3, 0x1, 0x0}, - {0x1CF, 0xF, 0x3, 0x8, 0x1, 0x1, 0x1}, - {0x1CF, 0x2, 0x3, 0xD, 0x1, 0x0, 0x1}, - {0x1CA, 0x6, 0x0, 0xD, 0x2, 0x1, 0x0}, - {0x1CD, 0xB, 0x0, 0xD, 0x2, 0x0, 0x0} + { 0x1CB, 0x6, 0x0, 0x8, 0x1, 0x0, 0x0 }, + { 0x1CA, 0xB, 0x0, 0x8, 0x3, 0x1, 0x0 }, + { 0x1CF, 0xF, 0x3, 0x8, 0x1, 0x1, 0x1 }, + { 0x1CF, 0x2, 0x3, 0xD, 0x1, 0x0, 0x1 }, + { 0x1CA, 0x6, 0x0, 0xD, 0x2, 0x1, 0x0 }, + { 0x1CD, 0xB, 0x0, 0xD, 0x2, 0x0, 0x0 } }; static const UnkStruct_ov8_0224C788 Unk_ov8_0224C9F4[13] = { - {0x1CD, 0x6, 0x6, 0x8, 0x1, 0x0, 0x0}, - {0x1CC, 0xB, 0x6, 0x8, 0x0, 0x1, 0x0}, - {0x1CE, 0x10, 0x6, 0x8, 0x0, 0x0, 0x0}, - {0x1CF, 0x2, 0x3, 0xD, 0x0, 0x1, 0x1}, - {0x1CC, 0x6, 0x6, 0xD, 0x1, 0x1, 0x0}, - {0x1CD, 0xB, 0x6, 0xD, 0x3, 0x0, 0x0}, - {0x1CE, 0x10, 0x6, 0xD, 0x3, 0x1, 0x0}, - {0x1CF, 0x14, 0x3, 0xD, 0x1, 0x0, 0x1}, - {0x1D0, 0x2, 0x3, 0x12, 0x0, 0x0, 0x1}, - {0x1CB, 0x6, 0x0, 0x12, 0x1, 0x1, 0x0}, - {0x1CE, 0xB, 0x0, 0x12, 0x3, 0x0, 0x0}, - {0x1CD, 0x10, 0x0, 0x12, 0x0, 0x1, 0x0}, - {0x1D0, 0x14, 0x3, 0x12, 0x1, 0x1, 0x1} + { 0x1CD, 0x6, 0x6, 0x8, 0x1, 0x0, 0x0 }, + { 0x1CC, 0xB, 0x6, 0x8, 0x0, 0x1, 0x0 }, + { 0x1CE, 0x10, 0x6, 0x8, 0x0, 0x0, 0x0 }, + { 0x1CF, 0x2, 0x3, 0xD, 0x0, 0x1, 0x1 }, + { 0x1CC, 0x6, 0x6, 0xD, 0x1, 0x1, 0x0 }, + { 0x1CD, 0xB, 0x6, 0xD, 0x3, 0x0, 0x0 }, + { 0x1CE, 0x10, 0x6, 0xD, 0x3, 0x1, 0x0 }, + { 0x1CF, 0x14, 0x3, 0xD, 0x1, 0x0, 0x1 }, + { 0x1D0, 0x2, 0x3, 0x12, 0x0, 0x0, 0x1 }, + { 0x1CB, 0x6, 0x0, 0x12, 0x1, 0x1, 0x0 }, + { 0x1CE, 0xB, 0x0, 0x12, 0x3, 0x0, 0x0 }, + { 0x1CD, 0x10, 0x0, 0x12, 0x0, 0x1, 0x0 }, + { 0x1D0, 0x14, 0x3, 0x12, 0x1, 0x1, 0x1 } }; -static const UnkStruct_ov8_0224C788 * const Unk_ov8_0224C740[3] = { +static const UnkStruct_ov8_0224C788 *const Unk_ov8_0224C740[3] = { Unk_ov8_0224C788, Unk_ov8_0224C874, Unk_ov8_0224C9F4 }; static const UnkStruct_ov8_0224C8A4 Unk_ov8_0224C8A4[12] = { - {0x1, 0x8, 0x2, 0x1}, - {0x3, 0x6, 0x1, 0x2}, - {0x4, 0x8, 0x2, 0x1}, - {0x3, 0x9, 0x1, 0x2}, - {0x6, 0x8, 0x2, 0x1}, - {0x8, 0x6, 0x1, 0x2}, - {0x9, 0x8, 0x2, 0x1}, - {0x8, 0x9, 0x1, 0x2}, - {0xB, 0x8, 0x2, 0x1}, - {0xD, 0x6, 0x1, 0x2}, - {0xE, 0x8, 0x2, 0x1}, - {0xD, 0x9, 0x1, 0x2} + { 0x1, 0x8, 0x2, 0x1 }, + { 0x3, 0x6, 0x1, 0x2 }, + { 0x4, 0x8, 0x2, 0x1 }, + { 0x3, 0x9, 0x1, 0x2 }, + { 0x6, 0x8, 0x2, 0x1 }, + { 0x8, 0x6, 0x1, 0x2 }, + { 0x9, 0x8, 0x2, 0x1 }, + { 0x8, 0x9, 0x1, 0x2 }, + { 0xB, 0x8, 0x2, 0x1 }, + { 0xD, 0x6, 0x1, 0x2 }, + { 0xE, 0x8, 0x2, 0x1 }, + { 0xD, 0x9, 0x1, 0x2 } }; static const UnkStruct_ov8_0224C8A4 Unk_ov8_0224C954[18] = { - {0x4, 0x8, 0x2, 0x1}, - {0x6, 0x6, 0x1, 0x2}, - {0x7, 0x8, 0x2, 0x1}, - {0x6, 0x9, 0x1, 0x2}, - {0x9, 0x8, 0x2, 0x1}, - {0xB, 0x6, 0x1, 0x2}, - {0xC, 0x8, 0x2, 0x1}, - {0xB, 0x9, 0x1, 0x2}, - {0xF, 0x6, 0x1, 0x5}, - {0x2, 0xB, 0x1, 0x5}, - {0x4, 0xD, 0x2, 0x1}, - {0x6, 0xB, 0x1, 0x2}, - {0x7, 0xD, 0x2, 0x1}, - {0x6, 0xE, 0x1, 0x2}, - {0x9, 0xD, 0x2, 0x1}, - {0xB, 0xB, 0x1, 0x2}, - {0xC, 0xD, 0x2, 0x1}, - {0xB, 0xE, 0x1, 0x2} + { 0x4, 0x8, 0x2, 0x1 }, + { 0x6, 0x6, 0x1, 0x2 }, + { 0x7, 0x8, 0x2, 0x1 }, + { 0x6, 0x9, 0x1, 0x2 }, + { 0x9, 0x8, 0x2, 0x1 }, + { 0xB, 0x6, 0x1, 0x2 }, + { 0xC, 0x8, 0x2, 0x1 }, + { 0xB, 0x9, 0x1, 0x2 }, + { 0xF, 0x6, 0x1, 0x5 }, + { 0x2, 0xB, 0x1, 0x5 }, + { 0x4, 0xD, 0x2, 0x1 }, + { 0x6, 0xB, 0x1, 0x2 }, + { 0x7, 0xD, 0x2, 0x1 }, + { 0x6, 0xE, 0x1, 0x2 }, + { 0x9, 0xD, 0x2, 0x1 }, + { 0xB, 0xB, 0x1, 0x2 }, + { 0xC, 0xD, 0x2, 0x1 }, + { 0xB, 0xE, 0x1, 0x2 } }; static const UnkStruct_ov8_0224C8A4 Unk_ov8_0224CAC5[40] = { - {0x4, 0x8, 0x2, 0x1}, - {0x6, 0x6, 0x1, 0x2}, - {0x7, 0x8, 0x2, 0x1}, - {0x6, 0x9, 0x1, 0x2}, - {0x9, 0x8, 0x2, 0x1}, - {0xB, 0x6, 0x1, 0x2}, - {0xC, 0x8, 0x2, 0x1}, - {0xB, 0x9, 0x1, 0x2}, - {0xE, 0x8, 0x2, 0x1}, - {0x10, 0x6, 0x1, 0x2}, - {0x11, 0x8, 0x2, 0x1}, - {0x10, 0x9, 0x1, 0x2}, - {0x2, 0xB, 0x1, 0x5}, - {0x4, 0xD, 0x2, 0x1}, - {0x6, 0xB, 0x1, 0x2}, - {0x7, 0xD, 0x2, 0x1}, - {0x6, 0xE, 0x1, 0x2}, - {0x9, 0xD, 0x2, 0x1}, - {0xB, 0xB, 0x1, 0x2}, - {0xC, 0xD, 0x2, 0x1}, - {0xB, 0xE, 0x1, 0x2}, - {0xE, 0xD, 0x2, 0x1}, - {0x10, 0xB, 0x1, 0x2}, - {0x11, 0xD, 0x2, 0x1}, - {0x10, 0xE, 0x1, 0x2}, - {0x14, 0xB, 0x1, 0x5}, - {0x2, 0x10, 0x1, 0x5}, - {0x4, 0x12, 0x2, 0x1}, - {0x6, 0x10, 0x1, 0x2}, - {0x7, 0x12, 0x2, 0x1}, - {0x6, 0x13, 0x1, 0x2}, - {0x9, 0x12, 0x2, 0x1}, - {0xB, 0x10, 0x1, 0x2}, - {0xC, 0x12, 0x2, 0x1}, - {0xB, 0x13, 0x1, 0x2}, - {0xE, 0x12, 0x2, 0x1}, - {0x10, 0x10, 0x1, 0x2}, - {0x11, 0x12, 0x2, 0x1}, - {0x10, 0x13, 0x1, 0x2}, - {0x14, 0x10, 0x1, 0x5} + { 0x4, 0x8, 0x2, 0x1 }, + { 0x6, 0x6, 0x1, 0x2 }, + { 0x7, 0x8, 0x2, 0x1 }, + { 0x6, 0x9, 0x1, 0x2 }, + { 0x9, 0x8, 0x2, 0x1 }, + { 0xB, 0x6, 0x1, 0x2 }, + { 0xC, 0x8, 0x2, 0x1 }, + { 0xB, 0x9, 0x1, 0x2 }, + { 0xE, 0x8, 0x2, 0x1 }, + { 0x10, 0x6, 0x1, 0x2 }, + { 0x11, 0x8, 0x2, 0x1 }, + { 0x10, 0x9, 0x1, 0x2 }, + { 0x2, 0xB, 0x1, 0x5 }, + { 0x4, 0xD, 0x2, 0x1 }, + { 0x6, 0xB, 0x1, 0x2 }, + { 0x7, 0xD, 0x2, 0x1 }, + { 0x6, 0xE, 0x1, 0x2 }, + { 0x9, 0xD, 0x2, 0x1 }, + { 0xB, 0xB, 0x1, 0x2 }, + { 0xC, 0xD, 0x2, 0x1 }, + { 0xB, 0xE, 0x1, 0x2 }, + { 0xE, 0xD, 0x2, 0x1 }, + { 0x10, 0xB, 0x1, 0x2 }, + { 0x11, 0xD, 0x2, 0x1 }, + { 0x10, 0xE, 0x1, 0x2 }, + { 0x14, 0xB, 0x1, 0x5 }, + { 0x2, 0x10, 0x1, 0x5 }, + { 0x4, 0x12, 0x2, 0x1 }, + { 0x6, 0x10, 0x1, 0x2 }, + { 0x7, 0x12, 0x2, 0x1 }, + { 0x6, 0x13, 0x1, 0x2 }, + { 0x9, 0x12, 0x2, 0x1 }, + { 0xB, 0x10, 0x1, 0x2 }, + { 0xC, 0x12, 0x2, 0x1 }, + { 0xB, 0x13, 0x1, 0x2 }, + { 0xE, 0x12, 0x2, 0x1 }, + { 0x10, 0x10, 0x1, 0x2 }, + { 0x11, 0x12, 0x2, 0x1 }, + { 0x10, 0x13, 0x1, 0x2 }, + { 0x14, 0x10, 0x1, 0x5 } }; -static const UnkStruct_ov8_0224C8A4 * const Unk_ov8_0224C74C[3] = { +static const UnkStruct_ov8_0224C8A4 *const Unk_ov8_0224C74C[3] = { Unk_ov8_0224C8A4, Unk_ov8_0224C954, Unk_ov8_0224CAC5 @@ -2013,8 +1996,8 @@ UnkStruct_ov8_0224E740 Unk_ov8_0224E740[3] = { Unk_ov8_0224C6E0, Unk_ov8_0224C6F0, Unk_ov8_0224C6E8, - Unk_ov8_0224C6D8 - } + Unk_ov8_0224C6D8, + }, }, { 0xB, @@ -2022,8 +2005,8 @@ UnkStruct_ov8_0224E740 Unk_ov8_0224E740[3] = { Unk_ov8_0224E050, Unk_ov8_0224E038, Unk_ov8_0224E044, - Unk_ov8_0224E05C - } + Unk_ov8_0224E05C, + }, }, { 0xE, @@ -2031,12 +2014,12 @@ UnkStruct_ov8_0224E740 Unk_ov8_0224E740[3] = { Unk_ov8_0224E068, Unk_ov8_0224E078, Unk_ov8_0224E088, - Unk_ov8_0224E098 - } - } + Unk_ov8_0224E098, + }, + }, }; -static u8 ov8_0224AB40 (const u8 param0) +static u8 ov8_0224AB40(const u8 param0) { u8 v0; @@ -2058,9 +2041,9 @@ static u8 ov8_0224AB40 (const u8 param0) return v0; } -static void ov8_0224AB64 (const UnkStruct_ov8_0224C788 * param0, const u8 param1, VecFx32 * param2) +static void ov8_0224AB64(const UnkStruct_ov8_0224C788 *param0, const u8 param1, VecFx32 *param2) { - fx32 * v0 = NULL; + fx32 *v0 = NULL; fx16 v1, v2; switch (param0->unk_07_3) { @@ -2093,11 +2076,11 @@ static void ov8_0224AB64 (const UnkStruct_ov8_0224C788 * param0, const u8 param1 (*v0) = v1; } -void ov8_0224ABD4 (FieldSystem * fieldSystem) +void ov8_0224ABD4(FieldSystem *fieldSystem) { - UnkStruct_ov8_0224ABD4 * v0; - UnkStruct_02027860 * v1; - UnkStruct_02071B6C * v2; + UnkStruct_ov8_0224ABD4 *v0; + UnkStruct_02027860 *v1; + UnkStruct_02071B6C *v2; v1 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v2 = (UnkStruct_02071B6C *)sub_02027F6C(v1, 5); @@ -2118,7 +2101,7 @@ void ov8_0224ABD4 (FieldSystem * fieldSystem) v6 = ov8_0224AB40(v2->unk_04); for (v5 = 0; v5 < v6; v5++) { - const UnkStruct_ov8_0224C788 * v7; + const UnkStruct_ov8_0224C788 *v7; v7 = Unk_ov8_0224C740[v2->unk_04]; @@ -2146,22 +2129,22 @@ void ov8_0224ABD4 (FieldSystem * fieldSystem) } } -void ov8_0224ACAC (FieldSystem * fieldSystem) +void ov8_0224ACAC(FieldSystem *fieldSystem) { - UnkStruct_ov8_0224ABD4 * v0; + UnkStruct_ov8_0224ABD4 *v0; v0 = (UnkStruct_ov8_0224ABD4 *)fieldSystem->unk_04->unk_24; Heap_FreeToHeap(v0); fieldSystem->unk_04->unk_24 = NULL; } -BOOL ov8_0224ACC0 (FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4) +BOOL ov8_0224ACC0(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4) { int v0, v1, v2; - u8 const * v3; + u8 const *v3; u8 v4; - UnkStruct_ov8_0224C8A4 const * v5; - UnkStruct_ov8_0224ABD4 * v6; + UnkStruct_ov8_0224C8A4 const *v5; + UnkStruct_ov8_0224ABD4 *v6; v6 = (UnkStruct_ov8_0224ABD4 *)fieldSystem->unk_04->unk_24; v1 = Unk_ov8_0224E740[v6->unk_11].unk_00; @@ -2181,12 +2164,12 @@ BOOL ov8_0224ACC0 (FieldSystem * fieldSystem, const int param1, const int param2 return 0; } -void ov8_0224AD34 (FieldSystem * fieldSystem, const u8 param1) +void ov8_0224AD34(FieldSystem *fieldSystem, const u8 param1) { - UnkStruct_ov8_0224997C * v0; - UnkStruct_ov8_0224ABD4 * v1; - UnkStruct_02027860 * v2; - UnkStruct_02071B6C * v3; + UnkStruct_ov8_0224997C *v0; + UnkStruct_ov8_0224ABD4 *v1; + UnkStruct_02027860 *v2; + UnkStruct_02071B6C *v3; v2 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v3 = (UnkStruct_02071B6C *)sub_02027F6C(v2, 5); @@ -2229,18 +2212,17 @@ void ov8_0224AD34 (FieldSystem * fieldSystem, const u8 param1) } } -static BOOL ov8_0224ADE8 (TaskManager * param0) +static BOOL ov8_0224ADE8(TaskManager *param0) { - UnkStruct_ov5_021E1890 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov8_0224997C * v2 = TaskManager_Environment(param0); - UnkStruct_ov8_0224ABD4 * v3; + UnkStruct_ov5_021E1890 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov8_0224997C *v2 = TaskManager_Environment(param0); + UnkStruct_ov8_0224ABD4 *v3; v3 = (UnkStruct_ov8_0224ABD4 *)fieldSystem->unk_04->unk_24; switch (v2->unk_00) { - case 0: - { + case 0: { u8 v4; u16 v5; u16 v6; @@ -2265,13 +2247,13 @@ static BOOL ov8_0224ADE8 (TaskManager * param0) v0 = ov5_021E18C4(fieldSystem->unk_A4, v7); { - VecFx32 * v8; + VecFx32 *v8; v8 = ov5_021E1890(v0); { - const UnkStruct_ov8_0224C788 * v9; - fx32 * v10; + const UnkStruct_ov8_0224C788 *v9; + fx32 *v10; u16 v11, v12; v9 = Unk_ov8_0224C740[v3->unk_11]; @@ -2303,8 +2285,7 @@ static BOOL ov8_0224ADE8 (TaskManager * param0) if (v3->unk_16 >= v3->unk_18) { (v2->unk_00)++; } - } - break; + } break; case 1: Heap_FreeToHeap(v2); return 1; @@ -2322,13 +2303,13 @@ static const VecFx32 Unk_ov8_0224C7A0[2] = { { ((11 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), FX32_ONE * 12, - ((13 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1) + ((13 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), }, { ((11 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), - ((FX32_ONE * 13)), - ((13 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1) - } + (FX32_ONE * 13), + ((13 << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), + }, }; static const u16 Unk_ov8_0224C7B8[12] = { @@ -2347,21 +2328,22 @@ static const u16 Unk_ov8_0224C7B8[12] = { }; static const UnkStruct_ov8_0224C774 Unk_ov8_0224C774[5] = { - {0x7, 0x19}, - {0x6, 0xF}, - {0x9, 0xF}, - {0x0, 0x2D}, - {0x0, 0x1E} + { 0x7, 0x19 }, + { 0x6, 0xF }, + { 0x9, 0xF }, + { 0x0, 0x2D }, + { 0x0, 0x1E } }; static const UnkStruct_ov8_0224C7F0 Unk_ov8_0224C7F0[5] = { - {-1, -1, 2}, - {0xB, 0x12, 1}, - {0x6, 0xD, 0}, - {0xB, 0x8, 1}, - {0xB, 0x8, 1} + { -1, -1, 2 }, + { 0xB, 0x12, 1 }, + { 0x6, 0xD, 0 }, + { 0xB, 0x8, 1 }, + { 0xB, 0x8, 1 } }; +// clang-format off static __attribute__((aligned(4))) const u8 Unk_ov8_0224CCE8[5][169] = { { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -2439,28 +2421,29 @@ static __attribute__((aligned(4))) const u8 Unk_ov8_0224CCE8[5][169] = { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0 }, }; +// clang-format on static __attribute__((aligned(4))) const u8 Unk_ov8_0224CA5C[5][21] = { - {1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1}, - {1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1}, - {1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} + { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; -static void ov8_0224AEDC (FieldSystem * fieldSystem, u16 param1) +static void ov8_0224AEDC(FieldSystem *fieldSystem, u16 param1) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); sub_0206B46C(v0, param1); } -static u32 ov8_0224AEF0 (FieldSystem * fieldSystem) +static u32 ov8_0224AEF0(FieldSystem *fieldSystem) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return sub_0206B47C(v0); } -static void ov8_0224AF00 (UnkStruct_ov8_0224AF00 * param0, fx32 param1) +static void ov8_0224AF00(UnkStruct_ov8_0224AF00 *param0, fx32 param1) { param0->unk_04 += param1; @@ -2477,20 +2460,20 @@ static void ov8_0224AF00 (UnkStruct_ov8_0224AF00 * param0, fx32 param1) param0->unk_00 %= (FX32_ONE * 12); } -static void ov8_0224AF58 (UnkStruct_ov8_0224AF58 * param0) +static void ov8_0224AF58(UnkStruct_ov8_0224AF58 *param0) { VecFx32 v0 = param0->unk_00; - VecFx32 * v1 = ov5_021E1890(param0->unk_14); + VecFx32 *v1 = ov5_021E1890(param0->unk_14); v1->x = param0->unk_00.x; v1->y = (0x10000 - param0->unk_00.y) % 0x10000; v1->z = param0->unk_00.z; } -static void ov8_0224AF84 (UnkStruct_ov8_0224AF00 * param0) +static void ov8_0224AF84(UnkStruct_ov8_0224AF00 *param0) { int v0, v1; - UnkStruct_ov8_0224AF58 * v2; + UnkStruct_ov8_0224AF58 *v2; v2 = ¶m0->unk_0C[1]; v1 = ((param0->unk_04) / FX32_ONE); @@ -2520,11 +2503,11 @@ static void ov8_0224AF84 (UnkStruct_ov8_0224AF00 * param0) ov8_0224AF58(v2); } -void ov8_0224B020 (FieldSystem * fieldSystem) +void ov8_0224B020(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071BD0 * v1; - UnkStruct_ov8_0224AF00 * v2; + UnkStruct_02027860 *v0; + UnkStruct_02071BD0 *v1; + UnkStruct_ov8_0224AF00 *v2; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = sub_02027F6C(v0, 8); @@ -2539,10 +2522,10 @@ void ov8_0224B020 (FieldSystem * fieldSystem) { int v3; - UnkStruct_ov8_0224AF58 * v4 = v2->unk_0C; - const u32 * v5 = Unk_ov8_0224C700; - const VecFx32 * v6 = Unk_ov8_0224C7A0; - const VecFx32 v7 = {0, 0, 0}; + UnkStruct_ov8_0224AF58 *v4 = v2->unk_0C; + const u32 *v5 = Unk_ov8_0224C700; + const VecFx32 *v6 = Unk_ov8_0224C7A0; + const VecFx32 v7 = { 0, 0, 0 }; for (v3 = 0; v3 < 2; v3++, v4++, v5++, v6++) { v4->unk_0C = *v5; @@ -2555,12 +2538,12 @@ void ov8_0224B020 (FieldSystem * fieldSystem) } { - int v8[3] = {2, 2, 0}; + int v8[3] = { 2, 2, 0 }; v1->unk_00 = ov8_0224AEF0(fieldSystem); { - const UnkStruct_ov8_0224C774 * v9 = &Unk_ov8_0224C774[v1->unk_00]; + const UnkStruct_ov8_0224C774 *v9 = &Unk_ov8_0224C774[v1->unk_00]; v2->unk_00 = (FX32_ONE * (v9->unk_00)); v2->unk_04 = (FX32_ONE * (v9->unk_02)); @@ -2574,20 +2557,20 @@ void ov8_0224B020 (FieldSystem * fieldSystem) } } -void ov8_0224B0FC (FieldSystem * fieldSystem) +void ov8_0224B0FC(FieldSystem *fieldSystem) { - UnkStruct_ov8_0224AF00 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov8_0224AF00 *v0 = fieldSystem->unk_04->unk_24; Heap_FreeToHeap(v0); fieldSystem->unk_04->unk_24 = NULL; } -BOOL ov8_0224B110 (FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4) +BOOL ov8_0224B110(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4) { BOOL v0; int v1, v2, v3; - UnkStruct_02027860 * v4; - UnkStruct_02071BD0 * v5; + UnkStruct_02027860 *v4; + UnkStruct_02071BD0 *v5; v4 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v5 = sub_02027F6C(v4, 8); @@ -2613,10 +2596,10 @@ BOOL ov8_0224B110 (FieldSystem * fieldSystem, const int param1, const int param2 return v0; } -static void ov8_0224B18C (FieldSystem * fieldSystem, UnkStruct_ov8_0224B28C * param1, int param2, int param3) +static void ov8_0224B18C(FieldSystem *fieldSystem, UnkStruct_ov8_0224B28C *param1, int param2, int param3) { int v0, v1, v2, v3; - const VecFx32 * v4; + const VecFx32 *v4; v0 = Player_GetXPos(fieldSystem->playerAvatar); v1 = Player_GetZPos(fieldSystem->playerAvatar); @@ -2667,10 +2650,10 @@ static void ov8_0224B18C (FieldSystem * fieldSystem, UnkStruct_ov8_0224B28C * pa Camera_TrackTarget(v4, fieldSystem->camera); } -static void ov8_0224B240 (UnkStruct_ov8_0224B28C * param0, int param1, int param2) +static void ov8_0224B240(UnkStruct_ov8_0224B28C *param0, int param1, int param2) { int v0, v1, v2, v3; - const VecFx32 * v4; + const VecFx32 *v4; param0->unk_10 = param0->unk_08; param0->unk_14 = param0->unk_0C; @@ -2706,7 +2689,7 @@ static void ov8_0224B240 (UnkStruct_ov8_0224B28C * param0, int param1, int param } } -static void ov8_0224B28C (UnkStruct_ov8_0224B28C * param0) +static void ov8_0224B28C(UnkStruct_ov8_0224B28C *param0) { param0->unk_04 ^= 1; param0->unk_08 = param0->unk_10; @@ -2715,7 +2698,7 @@ static void ov8_0224B28C (UnkStruct_ov8_0224B28C * param0) param0->unk_1C = Direction_GetOpposite(param0->unk_1C); } -static void ov8_0224B2B4 (UnkStruct_ov8_0224B28C * param0, int param1, int param2, int param3, int param4, int param5) +static void ov8_0224B2B4(UnkStruct_ov8_0224B28C *param0, int param1, int param2, int param3, int param4, int param5) { param0->unk_04 = param1; param0->unk_08 = param2; @@ -2724,18 +2707,18 @@ static void ov8_0224B2B4 (UnkStruct_ov8_0224B28C * param0, int param1, int param param0->unk_1C = param5; } -static void ov8_0224B2C4 (FieldSystem * fieldSystem, UnkStruct_ov8_0224B28C * param1) +static void ov8_0224B2C4(FieldSystem *fieldSystem, UnkStruct_ov8_0224B28C *param1) { - const VecFx32 * v0 = PlayerAvatar_PosVector(fieldSystem->playerAvatar); + const VecFx32 *v0 = PlayerAvatar_PosVector(fieldSystem->playerAvatar); ov5_021E931C(v0, fieldSystem->unk_28); Camera_TrackTarget(v0, fieldSystem->camera); MapObject_Delete(param1->unk_20); } -static BOOL ov8_0224B2E8 (UnkStruct_ov8_0224B28C * param0) +static BOOL ov8_0224B2E8(UnkStruct_ov8_0224B28C *param0) { - MapObject * v0 = param0->unk_20; + MapObject *v0 = param0->unk_20; if (LocalMapObj_IsAnimationSet(param0->unk_20) == 1) { int v1 = 0x9a; @@ -2768,7 +2751,7 @@ static BOOL ov8_0224B2E8 (UnkStruct_ov8_0224B28C * param0) return 0; } -static BOOL ov8_0224B370 (UnkStruct_ov8_0224AF00 * param0, const fx32 param1, const fx32 param2) +static BOOL ov8_0224B370(UnkStruct_ov8_0224AF00 *param0, const fx32 param1, const fx32 param2) { BOOL v0 = 1; fx32 v1 = param0->unk_00; @@ -2787,10 +2770,10 @@ static BOOL ov8_0224B370 (UnkStruct_ov8_0224AF00 * param0, const fx32 param1, co fx32 v5 = v4 + (FX32_ONE * 60); fx32 v6 = param2 + (FX32_ONE * 60); - if (((v2 < v6) && (v5 > v6))) { + if ((v2 < v6) && (v5 > v6)) { v4 = param2; } - } else if (((v2 < param2) && (v4 > param2))) { + } else if ((v2 < param2) && (v4 > param2)) { v4 = param2; } } @@ -2806,13 +2789,13 @@ static BOOL ov8_0224B370 (UnkStruct_ov8_0224AF00 * param0, const fx32 param1, co return v0; } -static BOOL ov8_0224B3D4 (TaskManager * param0) +static BOOL ov8_0224B3D4(TaskManager *param0) { BOOL v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov8_0224B67C * v2 = TaskManager_Environment(param0); - UnkStruct_02071BD0 * v3 = v2->unk_14; - UnkStruct_ov8_0224AF00 * v4 = v2->unk_18; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov8_0224B67C *v2 = TaskManager_Environment(param0); + UnkStruct_02071BD0 *v3 = v2->unk_14; + UnkStruct_ov8_0224AF00 *v4 = v2->unk_18; switch (v2->unk_00) { case 0: @@ -2844,7 +2827,7 @@ static BOOL ov8_0224B3D4 (TaskManager * param0) v0 = ov8_0224B370(v4, v2->unk_08, v2->unk_0C); if (v3->unk_00 == 4) { - const UnkStruct_ov8_0224C774 * v5 = &Unk_ov8_0224C774[v3->unk_00]; + const UnkStruct_ov8_0224C774 *v5 = &Unk_ov8_0224C774[v3->unk_00]; v4->unk_00 = (FX32_ONE * (v5->unk_00)); } @@ -2968,10 +2951,10 @@ static BOOL ov8_0224B3D4 (TaskManager * param0) return 0; } -BOOL ov8_0224B67C (FieldSystem * fieldSystem, Window * param1, MessageLoader * param2, Strbuf *param3) +BOOL ov8_0224B67C(FieldSystem *fieldSystem, Window *param1, MessageLoader *param2, Strbuf *param3) { - UnkStruct_02027860 * v0; - UnkStruct_02071BD0 * v1; + UnkStruct_02027860 *v0; + UnkStruct_02071BD0 *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = sub_02027F6C(v0, 8); @@ -2984,9 +2967,9 @@ BOOL ov8_0224B67C (FieldSystem * fieldSystem, Window * param1, MessageLoader * p ov8_0224AEDC(fieldSystem, v1->unk_00); { - UnkStruct_ov8_0224B67C * v2; - UnkStruct_ov8_0224AF00 * v3 = fieldSystem->unk_04->unk_24; - const UnkStruct_ov8_0224C774 * v4 = &Unk_ov8_0224C774[v1->unk_00]; + UnkStruct_ov8_0224B67C *v2; + UnkStruct_ov8_0224AF00 *v3 = fieldSystem->unk_04->unk_24; + const UnkStruct_ov8_0224C774 *v4 = &Unk_ov8_0224C774[v1->unk_00]; v2 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov8_0224B67C)); memset(v2, 0, sizeof(UnkStruct_ov8_0224B67C)); @@ -3006,11 +2989,11 @@ BOOL ov8_0224B67C (FieldSystem * fieldSystem, Window * param1, MessageLoader * p return 1; } -BOOL ov8_0224B714 (FieldSystem * fieldSystem, int param1, int param2, int param3) +BOOL ov8_0224B714(FieldSystem *fieldSystem, int param1, int param2, int param3) { - UnkStruct_02027860 * v0; - UnkStruct_02071BD0 * v1; - const UnkStruct_ov8_0224C7F0 * v2; + UnkStruct_02027860 *v0; + UnkStruct_02071BD0 *v1; + const UnkStruct_ov8_0224C7F0 *v2; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = sub_02027F6C(v0, 8); @@ -3026,31 +3009,32 @@ BOOL ov8_0224B714 (FieldSystem * fieldSystem, int param1, int param2, int param3 } static const UnkStruct_ov8_0224C90C Unk_ov8_0224C90C[9] = { - {0x3, 0xC}, - {0x4, 0x18}, - {0x8, 0x9}, - {0x8, 0x16}, - {0xF, 0x1C}, - {0x10, 0xC}, - {0x14, 0x13}, - {0x15, 0x1A}, - {0x17, 0xD} + { 0x3, 0xC }, + { 0x4, 0x18 }, + { 0x8, 0x9 }, + { 0x8, 0x16 }, + { 0xF, 0x1C }, + { 0x10, 0xC }, + { 0x14, 0x13 }, + { 0x15, 0x1A }, + { 0x17, 0xD } }; static const UnkStruct_ov8_0224C90C Unk_ov8_0224C99C[11] = { - {0x3, 0x17}, - {0x8, 0xC}, - {0x8, 0xE}, - {0x8, 0x10}, - {0xC, 0x9}, - {0xC, 0xC}, - {0x13, 0xC}, - {0x14, 0xD}, - {0x14, 0x1C}, - {0x16, 0x9}, - {0x17, 0x1E} + { 0x3, 0x17 }, + { 0x8, 0xC }, + { 0x8, 0xE }, + { 0x8, 0x10 }, + { 0xC, 0x9 }, + { 0xC, 0xC }, + { 0x13, 0xC }, + { 0x14, 0xD }, + { 0x14, 0x1C }, + { 0x16, 0x9 }, + { 0x17, 0x1E } }; +// clang-format off static __attribute__((aligned(4))) const u8 Unk_ov8_0224E33C[1024] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -3085,6 +3069,7 @@ static __attribute__((aligned(4))) const u8 Unk_ov8_0224E33C[1024] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; +// clang-format on static const int Unk_ov8_0224C764[4] = { 0x3, @@ -3095,11 +3080,11 @@ static const int Unk_ov8_0224C764[4] = { static int (*const Unk_ov8_0224C818[11])(UnkStruct_ov8_0224C098 *); -void ov8_0224B764 (FieldSystem * fieldSystem) +void ov8_0224B764(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071BF8 * v1; - UnkStruct_ov8_0224B8D0 * v2; + UnkStruct_02027860 *v0; + UnkStruct_02071BF8 *v1; + UnkStruct_ov8_0224B8D0 *v2; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = sub_02027F6C(v0, 4); @@ -3122,22 +3107,22 @@ void ov8_0224B764 (FieldSystem * fieldSystem) v1->unk_00 = 1; } -void ov8_0224B7C0 (FieldSystem * fieldSystem) +void ov8_0224B7C0(FieldSystem *fieldSystem) { - UnkStruct_ov8_0224B8D0 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov8_0224B8D0 *v0 = fieldSystem->unk_04->unk_24; Heap_FreeToHeap(v0); fieldSystem->unk_04->unk_24 = NULL; } -BOOL ov8_0224B7D4 (FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4) +BOOL ov8_0224B7D4(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4) { return 0; } -static MapObject * ov8_0224B7D8 (FieldSystem * fieldSystem, int param1, int param2, int param3) +static MapObject *ov8_0224B7D8(FieldSystem *fieldSystem, int param1, int param2, int param3) { - MapObject * v0; + MapObject *v0; v0 = MapObjectMan_AddMapObject(fieldSystem->mapObjMan, param1, param2, 0, 0x2000, 0x0, fieldSystem->location->mapId); @@ -3147,7 +3132,7 @@ static MapObject * ov8_0224B7D8 (FieldSystem * fieldSystem, int param1, int para return v0; } -static void ov8_0224B80C (UnkStruct_ov8_0224B80C * param0, MapObject * param1, FieldSystem * fieldSystem) +static void ov8_0224B80C(UnkStruct_ov8_0224B80C *param0, MapObject *param1, FieldSystem *fieldSystem) { param0->unk_08 = param1; param0->unk_00 = MapObject_GetXPos(param1); @@ -3160,10 +3145,10 @@ static void ov8_0224B80C (UnkStruct_ov8_0224B80C * param0, MapObject * param1, F } } -static UnkStruct_ov8_0224BCA8 * ov8_0224B854 (UnkStruct_ov8_0224B8D0 * param0, int param1, int param2) +static UnkStruct_ov8_0224BCA8 *ov8_0224B854(UnkStruct_ov8_0224B8D0 *param0, int param1, int param2) { int v0 = 0; - UnkStruct_ov8_0224BCA8 * v1 = param0->unk_10C; + UnkStruct_ov8_0224BCA8 *v1 = param0->unk_10C; do { if ((v1->unk_08.unk_00 == param1) && (v1->unk_08.unk_04 == param2)) { @@ -3177,10 +3162,10 @@ static UnkStruct_ov8_0224BCA8 * ov8_0224B854 (UnkStruct_ov8_0224B8D0 * param0, i return NULL; } -static UnkStruct_ov8_0224B8A0 * ov8_0224B878 (UnkStruct_ov8_0224B8D0 * param0, int param1, int param2) +static UnkStruct_ov8_0224B8A0 *ov8_0224B878(UnkStruct_ov8_0224B8D0 *param0, int param1, int param2) { int v0 = 0; - UnkStruct_ov8_0224B8A0 * v1 = param0->unk_04; + UnkStruct_ov8_0224B8A0 *v1 = param0->unk_04; do { if (v1->unk_00) { @@ -3196,7 +3181,7 @@ static UnkStruct_ov8_0224B8A0 * ov8_0224B878 (UnkStruct_ov8_0224B8D0 * param0, i return NULL; } -static void ov8_0224B8A0 (UnkStruct_ov8_0224B8A0 * param0) +static void ov8_0224B8A0(UnkStruct_ov8_0224B8A0 *param0) { GF_ASSERT(param0); GF_ASSERT(param0->unk_08.unk_0C); @@ -3208,14 +3193,14 @@ static void ov8_0224B8A0 (UnkStruct_ov8_0224B8A0 * param0) param0->unk_00 = 0; } -static void ov8_0224B8D0 (UnkStruct_ov8_0224B8D0 * param0) +static void ov8_0224B8D0(UnkStruct_ov8_0224B8D0 *param0) { int v0; - MapObject * v1; - const UnkStruct_ov8_0224C90C * v2; - FieldSystem * fieldSystem = param0->fieldSystem; - UnkStruct_ov8_0224B8A0 * v4 = param0->unk_04; - UnkStruct_ov8_0224BCA8 * v5 = param0->unk_10C; + MapObject *v1; + const UnkStruct_ov8_0224C90C *v2; + FieldSystem *fieldSystem = param0->fieldSystem; + UnkStruct_ov8_0224B8A0 *v4 = param0->unk_04; + UnkStruct_ov8_0224BCA8 *v5 = param0->unk_10C; memset((u8 *)v4, 0, sizeof(UnkStruct_ov8_0224B8A0) * 11); memset((u8 *)v5, 0, sizeof(UnkStruct_ov8_0224BCA8) * 9); @@ -3233,14 +3218,14 @@ static void ov8_0224B8D0 (UnkStruct_ov8_0224B8D0 * param0) } } -static void ov8_0224B958 (UnkStruct_ov8_0224B8D0 * param0) +static void ov8_0224B958(UnkStruct_ov8_0224B8D0 *param0) { int v0 = 0, v1 = 0; - MapObject * v2; - FieldSystem * fieldSystem = param0->fieldSystem; - MapObjectManager * mapObjMan = fieldSystem->mapObjMan; - UnkStruct_ov8_0224B8A0 * v5 = param0->unk_04; - UnkStruct_ov8_0224BCA8 * v6 = param0->unk_10C; + MapObject *v2; + FieldSystem *fieldSystem = param0->fieldSystem; + MapObjectManager *mapObjMan = fieldSystem->mapObjMan; + UnkStruct_ov8_0224B8A0 *v5 = param0->unk_04; + UnkStruct_ov8_0224BCA8 *v6 = param0->unk_10C; while (sub_020625B0(mapObjMan, &v2, &v0, (1 << 0)) == 1) { if (MapObject_Id(v2) == 0xfd) { @@ -3260,7 +3245,7 @@ static void ov8_0224B958 (UnkStruct_ov8_0224B8D0 * param0) } } -static int ov8_0224B9D8 (int param0, int param1) +static int ov8_0224B9D8(int param0, int param1) { GF_ASSERT(param0 >= 0); GF_ASSERT(param0 < 32); @@ -3273,7 +3258,7 @@ static int ov8_0224B9D8 (int param0, int param1) } } -static u32 ov8_0224BA0C (UnkStruct_ov8_0224B8D0 * param0, int param1, int param2, int param3) +static u32 ov8_0224BA0C(UnkStruct_ov8_0224B8D0 *param0, int param1, int param2, int param3) { u32 v0 = 0; int v1, v2; @@ -3317,7 +3302,7 @@ static u32 ov8_0224BA0C (UnkStruct_ov8_0224B8D0 * param0, int param1, int param2 return v0; } -static u32 ov8_0224BAA0 (UnkStruct_ov8_0224B8D0 * param0, int param1, int param2, int param3, int * param4) +static u32 ov8_0224BAA0(UnkStruct_ov8_0224B8D0 *param0, int param1, int param2, int param3, int *param4) { u32 v0; @@ -3338,12 +3323,12 @@ static u32 ov8_0224BAA0 (UnkStruct_ov8_0224B8D0 * param0, int param1, int param2 return v0; } -static BOOL ov8_0224BAF4 (TaskManager * taskMan) +static BOOL ov8_0224BAF4(TaskManager *taskMan) { - MapObject * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_ov8_0224C098 * v2 = TaskManager_Environment(taskMan); - UnkStruct_ov8_0224B8D0 * v3 = v2->unk_3C; + MapObject *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_ov8_0224C098 *v2 = TaskManager_Environment(taskMan); + UnkStruct_ov8_0224B8D0 *v3 = v2->unk_3C; v0 = Player_MapObject(fieldSystem->playerAvatar); @@ -3367,10 +3352,10 @@ static BOOL ov8_0224BAF4 (TaskManager * taskMan) return 0; } -static BOOL ov8_0224BB78 (TaskManager * taskMan) +static BOOL ov8_0224BB78(TaskManager *taskMan) { int v0; - UnkStruct_ov8_0224C098 * v1; + UnkStruct_ov8_0224C098 *v1; v1 = TaskManager_Environment(taskMan); @@ -3385,10 +3370,10 @@ static BOOL ov8_0224BB78 (TaskManager * taskMan) return 0; } -static int ov8_0224BBA0 (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BBA0(UnkStruct_ov8_0224C098 *param0) { u32 v0; - UnkStruct_ov8_0224B80C * v1 = ¶m0->unk_34->unk_08; + UnkStruct_ov8_0224B80C *v1 = ¶m0->unk_34->unk_08; int v2 = v1->unk_00; int v3 = v1->unk_04; @@ -3401,9 +3386,9 @@ static int ov8_0224BBA0 (UnkStruct_ov8_0224C098 * param0) return 0; } -static int ov8_0224BBD0 (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BBD0(UnkStruct_ov8_0224C098 *param0) { - MapObject * v0; + MapObject *v0; v0 = Player_MapObject(param0->unk_3C->fieldSystem->playerAvatar); @@ -3414,8 +3399,8 @@ static int ov8_0224BBD0 (UnkStruct_ov8_0224C098 * param0) LocalMapObj_SetAnimationCode(v0, sub_02065838(param0->unk_08, 0x1c)); { - UnkStruct_ov8_0224BCA8 * v1 = param0->unk_34; - UnkStruct_ov101_021D5D90 * v2 = v1->unk_08.unk_0C; + UnkStruct_ov8_0224BCA8 *v1 = param0->unk_34; + UnkStruct_ov101_021D5D90 *v2 = v1->unk_08.unk_0C; ov5_021F4698(v2, param0->unk_08, 1); @@ -3432,7 +3417,7 @@ static int ov8_0224BBD0 (UnkStruct_ov8_0224C098 * param0) return 1; } -static int ov8_0224BC48 (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BC48(UnkStruct_ov8_0224C098 *param0) { VecFx32_StepDirection(param0->unk_08, ¶m0->unk_20, param0->unk_2C); sub_020715D4(param0->unk_34->unk_08.unk_0C, ¶m0->unk_20); @@ -3453,9 +3438,9 @@ static int ov8_0224BC48 (UnkStruct_ov8_0224C098 * param0) return 0; } -static int ov8_0224BCA8 (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BCA8(UnkStruct_ov8_0224C098 *param0) { - UnkStruct_ov8_0224BCA8 * v0 = param0->unk_34; + UnkStruct_ov8_0224BCA8 *v0 = param0->unk_34; VecFx32_StepDirection(param0->unk_08, ¶m0->unk_20, param0->unk_2C); sub_020715D4(v0->unk_08.unk_0C, ¶m0->unk_20); @@ -3515,7 +3500,7 @@ static int ov8_0224BCA8 (UnkStruct_ov8_0224C098 * param0) return 0; } -static int ov8_0224BDD0 (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BDD0(UnkStruct_ov8_0224C098 *param0) { ov8_0224C170(param0, param0->unk_2C); param0->unk_04++; @@ -3530,7 +3515,7 @@ static int ov8_0224BDD0 (UnkStruct_ov8_0224C098 * param0) return 0; } -static int ov8_0224BE04 (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BE04(UnkStruct_ov8_0224C098 *param0) { ov8_0224C170(param0, param0->unk_2C); @@ -3548,7 +3533,7 @@ static int ov8_0224BE04 (UnkStruct_ov8_0224C098 * param0) return 0; } -static int ov8_0224BE38 (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BE38(UnkStruct_ov8_0224C098 *param0) { ov8_0224C170(param0, param0->unk_2C); @@ -3560,7 +3545,7 @@ static int ov8_0224BE38 (UnkStruct_ov8_0224C098 * param0) return 0; } -static int ov8_0224BE68 (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BE68(UnkStruct_ov8_0224C098 *param0) { ov8_0224C11C(param0, 0x10); @@ -3572,7 +3557,7 @@ static int ov8_0224BE68 (UnkStruct_ov8_0224C098 * param0) return 0; } -static int ov8_0224BE8C (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BE8C(UnkStruct_ov8_0224C098 *param0) { if (ov5_021F4720(param0->unk_34->unk_08.unk_0C) == 1) { param0->unk_00 = 9; @@ -3581,9 +3566,9 @@ static int ov8_0224BE8C (UnkStruct_ov8_0224C098 * param0) return 0; } -static int ov8_0224BEA4 (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BEA4(UnkStruct_ov8_0224C098 *param0) { - MapObject * v0; + MapObject *v0; v0 = Player_MapObject(param0->unk_3C->fieldSystem->playerAvatar); @@ -3595,13 +3580,13 @@ static int ov8_0224BEA4 (UnkStruct_ov8_0224C098 * param0) return 0; } -static int ov8_0224BECC (UnkStruct_ov8_0224C098 * param0) +static int ov8_0224BECC(UnkStruct_ov8_0224C098 *param0) { Heap_FreeToHeap(param0); return 2; } -static int(*const Unk_ov8_0224C818[11])(UnkStruct_ov8_0224C098 *) = { +static int (*const Unk_ov8_0224C818[11])(UnkStruct_ov8_0224C098 *) = { ov8_0224BBA0, ov8_0224BBD0, ov8_0224BC48, @@ -3615,9 +3600,9 @@ static int(*const Unk_ov8_0224C818[11])(UnkStruct_ov8_0224C098 *) = { ov8_0224BECC }; -static UnkStruct_ov8_0224C098 * ov8_0224BED8 (UnkStruct_ov8_0224B8D0 * param0, UnkStruct_ov8_0224BCA8 * param1, int param2) +static UnkStruct_ov8_0224C098 *ov8_0224BED8(UnkStruct_ov8_0224B8D0 *param0, UnkStruct_ov8_0224BCA8 *param1, int param2) { - UnkStruct_ov8_0224C098 * v0; + UnkStruct_ov8_0224C098 *v0; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov8_0224C098)); GF_ASSERT(v0 != NULL); @@ -3633,21 +3618,21 @@ static UnkStruct_ov8_0224C098 * ov8_0224BED8 (UnkStruct_ov8_0224B8D0 * param0, U return v0; } -static void ov8_0224BF0C (FieldSystem * fieldSystem, UnkStruct_ov8_0224B8D0 * param1, UnkStruct_ov8_0224BCA8 * param2, int param3) +static void ov8_0224BF0C(FieldSystem *fieldSystem, UnkStruct_ov8_0224B8D0 *param1, UnkStruct_ov8_0224BCA8 *param2, int param3) { - UnkStruct_ov8_0224C098 * v0 = ov8_0224BED8(param1, param2, param3); + UnkStruct_ov8_0224C098 *v0 = ov8_0224BED8(param1, param2, param3); FieldTask_Set(fieldSystem, ov8_0224BAF4, v0); } -static void ov8_0224BF2C (FieldSystem * fieldSystem, UnkStruct_ov8_0224B8D0 * param1, UnkStruct_ov8_0224BCA8 * param2, int param3) +static void ov8_0224BF2C(FieldSystem *fieldSystem, UnkStruct_ov8_0224B8D0 *param1, UnkStruct_ov8_0224BCA8 *param2, int param3) { - UnkStruct_ov8_0224C098 * v0 = ov8_0224BED8(param1, param2, param3); + UnkStruct_ov8_0224C098 *v0 = ov8_0224BED8(param1, param2, param3); FieldTask_Set(fieldSystem, ov8_0224BB78, v0); } -BOOL ov8_0224BF4C (FieldSystem * fieldSystem) +BOOL ov8_0224BF4C(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; + UnkStruct_02027860 *v0; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); @@ -3657,9 +3642,9 @@ BOOL ov8_0224BF4C (FieldSystem * fieldSystem) { int v1, v2, v3; - UnkStruct_ov8_0224BCA8 * v4; + UnkStruct_ov8_0224BCA8 *v4; int v5 = PlayerAvatar_GetDir(fieldSystem->playerAvatar); - UnkStruct_ov8_0224B8D0 * v6 = fieldSystem->unk_04->unk_24; + UnkStruct_ov8_0224B8D0 *v6 = fieldSystem->unk_04->unk_24; sub_0206157C(fieldSystem->playerAvatar, v5, &v1, &v2); v4 = ov8_0224B854(v6, v1, v2); @@ -3680,11 +3665,11 @@ BOOL ov8_0224BF4C (FieldSystem * fieldSystem) return 1; } -static void ov8_0224BFCC (FieldSystem * fieldSystem, UnkStruct_ov8_0224C098 * param1, UnkStruct_ov8_0224B80C * param2, int param3) +static void ov8_0224BFCC(FieldSystem *fieldSystem, UnkStruct_ov8_0224C098 *param1, UnkStruct_ov8_0224B80C *param2, int param3) { int v0, v1; - const VecFx32 * v2; - UnkStruct_ov8_0224C0C4 * v3; + const VecFx32 *v2; + UnkStruct_ov8_0224C0C4 *v3; v3 = ¶m1->unk_40; memset(v3, 0, sizeof(UnkStruct_ov8_0224C0C4)); @@ -3721,23 +3706,23 @@ static void ov8_0224BFCC (FieldSystem * fieldSystem, UnkStruct_ov8_0224C098 * pa Camera_TrackTarget(v2, fieldSystem->camera); } -static void ov8_0224C098 (UnkStruct_ov8_0224C098 * param0) +static void ov8_0224C098(UnkStruct_ov8_0224C098 *param0) { - UnkStruct_ov8_0224C0C4 * v0 = ¶m0->unk_40; - const VecFx32 * v1 = PlayerAvatar_PosVector(v0->fieldSystem->playerAvatar); + UnkStruct_ov8_0224C0C4 *v0 = ¶m0->unk_40; + const VecFx32 *v1 = PlayerAvatar_PosVector(v0->fieldSystem->playerAvatar); ov5_021E931C(v1, v0->fieldSystem->unk_28); Camera_TrackTarget(v1, v0->fieldSystem->camera); MapObject_Delete(v0->unk_30); } -static BOOL ov8_0224C0C4 (UnkStruct_ov8_0224C098 * param0) +static BOOL ov8_0224C0C4(UnkStruct_ov8_0224C098 *param0) { - UnkStruct_ov8_0224C0C4 * v0 = ¶m0->unk_40; + UnkStruct_ov8_0224C0C4 *v0 = ¶m0->unk_40; return v0->unk_2C; } -static BOOL ov8_0224C0C8 (UnkStruct_ov8_0224C098 * param0, UnkStruct_ov8_0224B80C * param1, int param2) +static BOOL ov8_0224C0C8(UnkStruct_ov8_0224C098 *param0, UnkStruct_ov8_0224B80C *param1, int param2) { int v0; int v1 = param1->unk_00; @@ -3752,9 +3737,9 @@ static BOOL ov8_0224C0C8 (UnkStruct_ov8_0224C098 * param0, UnkStruct_ov8_0224B80 return 0; } -static void ov8_0224C0FC (UnkStruct_ov8_0224C098 * param0, int param1) +static void ov8_0224C0FC(UnkStruct_ov8_0224C098 *param0, int param1) { - UnkStruct_ov8_0224C0C4 * v0 = ¶m0->unk_40; + UnkStruct_ov8_0224C0C4 *v0 = ¶m0->unk_40; v0->unk_28 = 0; v0->unk_00 = 1; @@ -3765,9 +3750,9 @@ static void ov8_0224C0FC (UnkStruct_ov8_0224C098 * param0, int param1) } } -static void ov8_0224C11C (UnkStruct_ov8_0224C098 * param0, int param1) +static void ov8_0224C11C(UnkStruct_ov8_0224C098 *param0, int param1) { - UnkStruct_ov8_0224C0C4 * v0 = ¶m0->unk_40; + UnkStruct_ov8_0224C0C4 *v0 = ¶m0->unk_40; switch (v0->unk_00) { case 0: @@ -3790,7 +3775,7 @@ static void ov8_0224C11C (UnkStruct_ov8_0224C098 * param0, int param1) } } -static void ov8_0224C170 (UnkStruct_ov8_0224C098 * param0, fx32 param1) +static void ov8_0224C170(UnkStruct_ov8_0224C098 *param0, fx32 param1) { if (param0->unk_18 == 1) { int v0 = ((param1) / FX32_ONE); @@ -3810,10 +3795,11 @@ static void ov8_0224C170 (UnkStruct_ov8_0224C098 * param0, fx32 param1) } static const UnkStruct_ov8_0224C8D4 Unk_ov8_0224C8D4[2] = { - {0x59, 0x0, 0x3, 0x1, 0x3, 0xF, 0x8}, - {0x5A, 0x3, 0x5, 0x1, 0x3, 0x1B, 0x14} + { 0x59, 0x0, 0x3, 0x1, 0x3, 0xF, 0x8 }, + { 0x5A, 0x3, 0x5, 0x1, 0x3, 0x1B, 0x14 } }; +// clang-format off static __attribute__((aligned(4))) const u8 Unk_ov8_0224E0A8[120] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -3824,7 +3810,9 @@ static __attribute__((aligned(4))) const u8 Unk_ov8_0224E0A8[120] = { 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; +// clang-format on +// clang-format off static __attribute__((aligned(4))) const u8 Unk_ov8_0224E120[540] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, @@ -3847,38 +3835,39 @@ static __attribute__((aligned(4))) const u8 Unk_ov8_0224E120[540] = { 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; +// clang-format on -static const u8 * const Unk_ov8_0224C6F8[2] = { +static const u8 *const Unk_ov8_0224C6F8[2] = { Unk_ov8_0224E0A8, Unk_ov8_0224E120 }; static const UnkStruct_ov8_0224C7D0 Unk_ov8_0224C7D0[] = { - {0x0, 0x4, 0x2}, - {0x1, 0x8, 0x2}, - {0x2, 0xC, 0x2}, - {8, 0x0, 0x0} + { 0x0, 0x4, 0x2 }, + { 0x1, 0x8, 0x2 }, + { 0x2, 0xC, 0x2 }, + { 8, 0x0, 0x0 } }; static const UnkStruct_ov8_0224C7D0 Unk_ov8_0224C844[] = { - {0x3, 0x4, 0x2}, - {0x4, 0x9, 0x2}, - {0x5, 0xE, 0x2}, - {0x6, 0x13, 0x2}, - {0x7, 0x18, 0x2}, - {8, 0x0, 0x0} + { 0x3, 0x4, 0x2 }, + { 0x4, 0x9, 0x2 }, + { 0x5, 0xE, 0x2 }, + { 0x6, 0x13, 0x2 }, + { 0x7, 0x18, 0x2 }, + { 8, 0x0, 0x0 } }; -static const UnkStruct_ov8_0224C7D0 * const Unk_ov8_0224C708[2] = { +static const UnkStruct_ov8_0224C7D0 *const Unk_ov8_0224C708[2] = { Unk_ov8_0224C7D0, Unk_ov8_0224C844 }; -void ov8_0224C198 (FieldSystem * fieldSystem) +void ov8_0224C198(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071C18 * v1; - UnkStruct_ov8_0224C444 * v2; + UnkStruct_02027860 *v0; + UnkStruct_02071C18 *v1; + UnkStruct_ov8_0224C444 *v2; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = sub_02027F6C(v0, 2); @@ -3895,8 +3884,8 @@ void ov8_0224C198 (FieldSystem * fieldSystem) { int v3 = 0xd2; - PlayerAvatar * playerAvatar = fieldSystem->playerAvatar; - MapObject * v5 = Player_MapObject(playerAvatar); + PlayerAvatar *playerAvatar = fieldSystem->playerAvatar; + MapObject *v5 = Player_MapObject(playerAvatar); if (PlayerAvatar_Gender(fieldSystem->playerAvatar) == 1) { v3 = 0xd3; @@ -3911,7 +3900,7 @@ void ov8_0224C198 (FieldSystem * fieldSystem) { int v6 = 0; int v7 = fieldSystem->location->mapId; - const UnkStruct_ov8_0224C8D4 * v8 = Unk_ov8_0224C8D4; + const UnkStruct_ov8_0224C8D4 *v8 = Unk_ov8_0224C8D4; do { if (v8->unk_00 == v7) { @@ -3927,7 +3916,7 @@ void ov8_0224C198 (FieldSystem * fieldSystem) v1->unk_02 = 8; if (v6 != 2) { - const u8 * v9 = Unk_ov8_0224C6F8[v6]; + const u8 *v9 = Unk_ov8_0224C6F8[v6]; int v10 = MTRNG_Next() % v8->unk_08; v1->unk_02 = v10 + v8->unk_04; @@ -3951,7 +3940,7 @@ void ov8_0224C198 (FieldSystem * fieldSystem) if (v1->unk_02 != 8) { int v11; - const UnkStruct_ov8_0224C7D0 * v12 = Unk_ov8_0224C708[v6]; + const UnkStruct_ov8_0224C7D0 *v12 = Unk_ov8_0224C708[v6]; while (v12->unk_00 != 8) { if (v12->unk_00 != v1->unk_02) { @@ -3970,9 +3959,9 @@ void ov8_0224C198 (FieldSystem * fieldSystem) v2->unk_1F4 = SysTask_Start(ov8_0224C3B0, v2, 0); } -void ov8_0224C388 (FieldSystem * fieldSystem) +void ov8_0224C388(FieldSystem *fieldSystem) { - UnkStruct_ov8_0224C444 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov8_0224C444 *v0 = fieldSystem->unk_04->unk_24; SysTask_Done(v0->unk_1F4); ov8_0224C4F8(v0); @@ -3981,15 +3970,15 @@ void ov8_0224C388 (FieldSystem * fieldSystem) fieldSystem->unk_04->unk_24 = NULL; } -static void ov8_0224C3B0 (SysTask * task, void * param1) +static void ov8_0224C3B0(SysTask *task, void *param1) { return; } -static void ov8_0224C3B4 (UnkStruct_ov8_0224C444 * param0) +static void ov8_0224C3B4(UnkStruct_ov8_0224C444 *param0) { - UnkStruct_ov8_0224C3B4 * v0 = ¶m0->unk_1C4; - UnkStruct_ov5_021D57D8 * v1 = param0->fieldSystem->unk_48; + UnkStruct_ov8_0224C3B4 *v0 = ¶m0->unk_1C4; + UnkStruct_ov5_021D57D8 *v1 = param0->fieldSystem->unk_48; v0->unk_00 = v1; v0->unk_04 = 10; @@ -4016,12 +4005,12 @@ static void ov8_0224C3B4 (UnkStruct_ov8_0224C444 * param0) ov5_021D585C(v1, v0->unk_0C); } -static void ov8_0224C444 (UnkStruct_ov8_0224C444 * param0) +static void ov8_0224C444(UnkStruct_ov8_0224C444 *param0) { int v0, v1, v2, v3, v4; - MapObject * v5; - UnkStruct_ov8_0224C4F8 * v6 = param0->unk_04; - const MapObjectManager * mapObjMan = param0->fieldSystem->mapObjMan; + MapObject *v5; + UnkStruct_ov8_0224C4F8 *v6 = param0->unk_04; + const MapObjectManager *mapObjMan = param0->fieldSystem->mapObjMan; v0 = 0; v1 = 0; @@ -4052,10 +4041,10 @@ static void ov8_0224C444 (UnkStruct_ov8_0224C444 * param0) } } -static void ov8_0224C4F8 (UnkStruct_ov8_0224C444 * param0) +static void ov8_0224C4F8(UnkStruct_ov8_0224C444 *param0) { int v0; - UnkStruct_ov8_0224C4F8 * v1 = param0->unk_04; + UnkStruct_ov8_0224C4F8 *v1 = param0->unk_04; for (v0 = 0; v0 < 16; v0++, v1++) { if (v1->unk_00) { @@ -4065,19 +4054,19 @@ static void ov8_0224C4F8 (UnkStruct_ov8_0224C444 * param0) } } -static void ov8_0224C518 (SysTask * param0, void * param1) +static void ov8_0224C518(SysTask *param0, void *param1) { return; } -BOOL ov8_0224C51C (FieldSystem * fieldSystem) +BOOL ov8_0224C51C(FieldSystem *fieldSystem) { int v0, v1, v2, v3; - UnkStruct_02027860 * v4; - PlayerAvatar * playerAvatar; - MapObjectManager * mapObjMan; - MapObject * v7; - MapObject * v8; + UnkStruct_02027860 *v4; + PlayerAvatar *playerAvatar; + MapObjectManager *mapObjMan; + MapObject *v7; + MapObject *v8; v4 = sub_02027860(FieldSystem_SaveData(fieldSystem)); @@ -4110,9 +4099,9 @@ BOOL ov8_0224C51C (FieldSystem * fieldSystem) return 0; } -BOOL ov8_0224C5DC (FieldSystem * fieldSystem, void * param1) +BOOL ov8_0224C5DC(FieldSystem *fieldSystem, void *param1) { - UnkStruct_02027860 * v0; + UnkStruct_02027860 *v0; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); @@ -4121,7 +4110,7 @@ BOOL ov8_0224C5DC (FieldSystem * fieldSystem, void * param1) } { - MapObject * v1 = param1; + MapObject *v1 = param1; MapObject_SetXInitial(v1, MapObject_GetXPos(v1)); MapObject_SetZInitial(v1, MapObject_GetZPos(v1)); @@ -4135,14 +4124,14 @@ BOOL ov8_0224C5DC (FieldSystem * fieldSystem, void * param1) return 0; } -BOOL ov8_0224C62C (FieldSystem * fieldSystem, int param1, int param2, int * param3) +BOOL ov8_0224C62C(FieldSystem *fieldSystem, int param1, int param2, int *param3) { if ((*param3) != 0) { return 0; } { - UnkStruct_02027860 * v0; + UnkStruct_02027860 *v0; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); @@ -4151,7 +4140,7 @@ BOOL ov8_0224C62C (FieldSystem * fieldSystem, int param1, int param2, int * para } { - UnkStruct_02071C18 * v1; + UnkStruct_02071C18 *v1; v1 = sub_02027F6C(v0, 2); @@ -4162,8 +4151,8 @@ BOOL ov8_0224C62C (FieldSystem * fieldSystem, int param1, int param2, int * para { int v2 = 0; int v3 = fieldSystem->location->mapId; - const UnkStruct_ov8_0224C8D4 * v4 = Unk_ov8_0224C8D4; - const UnkStruct_ov8_0224C7D0 * v5; + const UnkStruct_ov8_0224C8D4 *v4 = Unk_ov8_0224C8D4; + const UnkStruct_ov8_0224C7D0 *v5; do { if (v4->unk_00 == v3) { diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index c64851c6a8..7f96257157 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -1,10 +1,11 @@ +#include "overlay009/ov9_02249960.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020216E0_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" @@ -16,72 +17,72 @@ #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021D57D8_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" -#include "overlay005/struct_ov5_021E8F60_decl.h" -#include "overlay005/struct_ov5_021EF76C_decl.h" -#include "overlay009/struct_ov9_0224F6EC_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_0200C738.h" -#include "field/field_system.h" -#include "field/field_system_sub2_t.h" #include "struct_defs/struct_02071C5C.h" #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" -#include "overlay005/struct_ov5_021ED0A4.h" + +#include "field/field_system.h" +#include "field/field_system_sub2_t.h" #include "overlay005/map_object_anim_cmd.h" +#include "overlay005/ov5_021D0D80.h" +#include "overlay005/ov5_021D57BC.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/ov5_021E779C.h" +#include "overlay005/ov5_021EB1A0.h" +#include "overlay005/ov5_021ECE40.h" +#include "overlay005/ov5_021F348C.h" +#include "overlay005/ov5_021F8560.h" +#include "overlay005/struct_ov5_021D57D8_decl.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "overlay005/struct_ov5_021E8F60_decl.h" +#include "overlay005/struct_ov5_021ED0A4.h" +#include "overlay005/struct_ov5_021EF76C_decl.h" #include "overlay005/struct_ov5_02201C58.h" #include "overlay009/struct_ov9_02249FF4.h" +#include "overlay009/struct_ov9_0224F6EC_decl.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay083/struct_ov83_0223D9A8.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "overlay115/camera_angle.h" -#include "unk_02005474.h" +#include "camera.h" +#include "field_system.h" +#include "gx_layers.h" +#include "heap.h" +#include "map_header_data.h" +#include "map_object.h" +#include "map_object_move.h" #include "narc.h" +#include "player_avatar.h" +#include "savedata_misc.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "sys_task.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201CED8.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_02020AEC.h" #include "unk_020218BC.h" #include "unk_0202298C.h" -#include "savedata_misc.h" #include "unk_02027F50.h" #include "unk_02039C80.h" -#include "field_system.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" #include "unk_0205F180.h" -#include "map_header_data.h" -#include "map_object.h" -#include "map_object_move.h" #include "unk_020655F4.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_020711EC.h" #include "unk_02073838.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay005/ov5_021D57BC.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021E779C.h" -#include "overlay005/ov5_021EB1A0.h" -#include "overlay005/ov5_021ECE40.h" -#include "overlay005/ov5_021F348C.h" -#include "overlay005/ov5_021F8560.h" -#include "overlay009/ov9_02249960.h" +#include "vars_flags.h" typedef struct UnkStruct_ov9_02249B04_t UnkStruct_ov9_02249B04; @@ -102,17 +103,17 @@ typedef struct { } UnkStruct_ov9_02251EC8; typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190; - UnkStruct_02009714 * unk_194; - UnkStruct_02009714 * unk_198; - UnkStruct_02009714 * unk_19C; - UnkStruct_02009DC8 * unk_1A0[7]; - UnkStruct_02009DC8 * unk_1BC[1]; - UnkStruct_02009DC8 * unk_1C0[7]; - UnkStruct_02009DC8 * unk_1DC[7]; - SysTask * unk_1F8; + UnkStruct_02009714 *unk_190; + UnkStruct_02009714 *unk_194; + UnkStruct_02009714 *unk_198; + UnkStruct_02009714 *unk_19C; + UnkStruct_02009DC8 *unk_1A0[7]; + UnkStruct_02009DC8 *unk_1BC[1]; + UnkStruct_02009DC8 *unk_1C0[7]; + UnkStruct_02009DC8 *unk_1DC[7]; + SysTask *unk_1F8; } UnkStruct_ov9_0224B064; typedef struct { @@ -145,16 +146,16 @@ typedef struct { } UnkStruct_ov9_02253680; typedef struct { - UnkStruct_ov9_02249B04 * unk_00; + UnkStruct_ov9_02249B04 *unk_00; UnkStruct_ov9_02253680 unk_04; - UnkStruct_ov9_0224B064 * unk_34; + UnkStruct_ov9_0224B064 *unk_34; } UnkStruct_ov9_0224B1B4; typedef struct { fx32 unk_00; fx32 unk_04; UnkStruct_ov9_0224B1B4 unk_08; - GraphicElementData * unk_40; + GraphicElementData *unk_40; } UnkStruct_ov9_0224B2C0; typedef struct { @@ -167,8 +168,8 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_ov9_0224C034 * unk_04; - void * unk_08; + UnkStruct_ov9_0224C034 *unk_04; + void *unk_08; } UnkStruct_ov9_0224BFE0; typedef struct { @@ -229,25 +230,25 @@ typedef struct { typedef struct { int unk_00; int unk_04; - UnkStruct_ov9_0224C324 * unk_08; + UnkStruct_ov9_0224C324 *unk_08; u32 unk_0C; - u16 * unk_10; + u16 *unk_10; } UnkStruct_ov9_0224C2C4; typedef struct { int unk_00; - UnkStruct_ov9_0224AA00 * unk_04; + UnkStruct_ov9_0224AA00 *unk_04; } UnkStruct_ov9_0224C640; typedef struct { int unk_00; - UnkStruct_ov9_0224A8A0 * unk_04; + UnkStruct_ov9_0224A8A0 *unk_04; } UnkStruct_ov9_0224C6E4; typedef struct { - const UnkStruct_ov9_0224B3F8 * unk_00; - const UnkStruct_ov9_0224B6CC * unk_04; - const UnkStruct_ov9_0224B748 * unk_08; + const UnkStruct_ov9_0224B3F8 *unk_00; + const UnkStruct_ov9_0224B6CC *unk_04; + const UnkStruct_ov9_0224B748 *unk_08; } UnkStruct_ov9_0224C788; typedef struct { @@ -260,12 +261,12 @@ typedef struct { typedef struct { u32 unk_00; - void * unk_04; - void * unk_08; - void * unk_0C; - void * unk_10; - void * unk_14; - void * unk_18; + void *unk_04; + void *unk_08; + void *unk_0C; + void *unk_10; + void *unk_14; + void *unk_18; } UnkStruct_ov9_0224C14C; typedef struct { @@ -287,12 +288,12 @@ typedef struct { } UnkStruct_ov9_0224A0DC; typedef struct { - Camera * camera; + Camera *camera; CameraAngle unk_04; CameraAngle unk_0C; CameraAngle unk_14; UnkStruct_ov9_0224A0DC unk_1C; - SysTask * unk_3C; + SysTask *unk_3C; } UnkStruct_ov9_02249F9C; typedef struct { @@ -317,18 +318,18 @@ typedef struct { fx32 unk_04; fx32 unk_08; fx32 unk_0C; - NNSG3dAnmObj * unk_10; + NNSG3dAnmObj *unk_10; u16 unk_14; u16 unk_16; - MapObject * unk_18; - UnkStruct_020216E0 * unk_1C; + MapObject *unk_18; + UnkStruct_020216E0 *unk_1C; } UnkStruct_ov9_0224A294; typedef struct { int unk_00; - UnkStruct_ov9_0224A294 * unk_04; - void * unk_08; - void * unk_0C; + UnkStruct_ov9_0224A294 *unk_04; + void *unk_08; + void *unk_0C; NNSFndAllocator unk_10; } UnkStruct_ov9_0224A228; @@ -345,7 +346,7 @@ typedef struct { typedef struct { u32 unk_00; - void * unk_04; + void *unk_04; } UnkStruct_ov9_0224D744_sub2; typedef struct { @@ -367,23 +368,23 @@ typedef struct { u16 unk_04; u16 unk_06; UnkStruct_ov9_0224B6CC unk_08; - UnkStruct_ov9_02249B04 * unk_14; + UnkStruct_ov9_02249B04 *unk_14; } UnkStruct_ov9_0224B708; typedef struct { u32 unk_00; s32 unk_04; - UnkStruct_ov101_021D5D90 ** unk_08; + UnkStruct_ov101_021D5D90 **unk_08; } UnkStruct_ov9_0224B528; typedef struct { int unk_00; int unk_04; u32 unk_08; - NARC * unk_0C; - UnkStruct_02039E30 * unk_10; - UnkStruct_ov5_021EF76C * unk_14; - UnkStruct_ov5_021E8F60 * unk_18; + NARC *unk_0C; + UnkStruct_02039E30 *unk_10; + UnkStruct_ov5_021EF76C *unk_14; + UnkStruct_ov5_021E8F60 *unk_18; } UnkStruct_ov9_0224C8E8; typedef struct { @@ -392,7 +393,7 @@ typedef struct { s16 unk_04; u16 unk_06; u32 unk_08; - UnkStruct_ov9_02249B04 * unk_0C; + UnkStruct_ov9_02249B04 *unk_0C; } UnkStruct_ov9_0224DFA0; typedef struct { @@ -402,7 +403,7 @@ typedef struct { u8 unk_03; VecFx32 unk_04; UnkStruct_ov9_0224DFA0 unk_10; - UnkStruct_ov9_0224D928 * unk_20; + UnkStruct_ov9_0224D928 *unk_20; } UnkStruct_ov9_0224E1CC; typedef struct { @@ -433,7 +434,7 @@ typedef struct { typedef struct { u32 unk_00; - const UnkStruct_ov9_0224DF10 ** unk_04; + const UnkStruct_ov9_0224DF10 **unk_04; } UnkStruct_ov9_02252C38; typedef struct { @@ -441,8 +442,8 @@ typedef struct { u8 unk_01; u16 unk_02; UnkStruct_ov9_0224DF10 unk_04; - MapObject * unk_1C; - UnkStruct_ov101_021D5D90 * unk_20; + MapObject *unk_1C; + UnkStruct_ov101_021D5D90 *unk_20; } UnkStruct_ov9_0224E0DC; typedef struct { @@ -450,7 +451,7 @@ typedef struct { } UnkStruct_ov9_0224DC34; typedef struct { - SysTask * unk_00; + SysTask *unk_00; } UnkStruct_ov9_02249E94; typedef struct { @@ -471,12 +472,12 @@ typedef struct { typedef struct { u32 unk_00; - const UnkStruct_ov9_0224EC10 * unk_04; + const UnkStruct_ov9_0224EC10 *unk_04; } UnkStruct_ov9_02252548; typedef struct { u16 unk_00; - UnkStruct_ov101_021D5D90 * unk_04; + UnkStruct_ov101_021D5D90 *unk_04; UnkStruct_ov9_0224EC10 unk_08; } UnkStruct_ov9_0224EBB8; @@ -485,8 +486,8 @@ typedef struct { } UnkStruct_ov9_0224EB68; typedef struct { - UnkStruct_ov9_02249B04 * unk_00; - const UnkStruct_ov9_0224EBB8 * unk_04; + UnkStruct_ov9_02249B04 *unk_00; + const UnkStruct_ov9_0224EBB8 *unk_04; } UnkStruct_ov9_0224EBCC; typedef struct { @@ -499,11 +500,11 @@ typedef struct { typedef struct { u32 unk_00; - const UnkStruct_ov9_0224EF30 ** unk_04; + const UnkStruct_ov9_0224EF30 **unk_04; } UnkStruct_ov9_02252EB4; typedef struct { - MapObject * unk_00[19]; + MapObject *unk_00[19]; } UnkStruct_ov9_0224EE40; typedef struct { @@ -523,18 +524,18 @@ typedef struct { typedef struct { int unk_00; - const void * unk_04; + const void *unk_04; } UnkStruct_ov9_02251438; typedef struct { u32 unk_00; u16 unk_04; u16 unk_06; - const UnkStruct_ov9_02251438 * unk_08; + const UnkStruct_ov9_02251438 *unk_08; u8 unk_0C[160]; } UnkFuncPtr_ov9_0224E33C; -typedef int (* UnkFuncPtr_ov9_02253BE4)(UnkStruct_ov9_02249B04 *, TaskManager *, u16 *, const void *); +typedef int (*UnkFuncPtr_ov9_02253BE4)(UnkStruct_ov9_02249B04 *, TaskManager *, u16 *, const void *); typedef struct { s16 unk_00; @@ -542,12 +543,12 @@ typedef struct { s32 unk_04; u16 unk_08; u16 unk_0A; - const UnkStruct_ov9_02251438 * unk_0C; + const UnkStruct_ov9_02251438 *unk_0C; } UnkStruct_ov9_02252044; typedef struct { u32 unk_00; - const UnkStruct_ov9_02252044 * unk_04; + const UnkStruct_ov9_02252044 *unk_04; } UnkStruct_ov9_02252D38; typedef struct { @@ -563,8 +564,8 @@ typedef struct { typedef struct { u32 unk_00; - UnkStruct_ov9_0224D928 * unk_04; - UnkStruct_ov101_021D5D90 * unk_08; + UnkStruct_ov9_0224D928 *unk_04; + UnkStruct_ov101_021D5D90 *unk_08; } UnkStruct_ov9_0224E8B4; typedef struct { @@ -575,7 +576,7 @@ typedef struct { int unk_04; int unk_08; int unk_0C[4]; - UnkStruct_ov9_0224E0DC * unk_1C; + UnkStruct_ov9_0224E0DC *unk_1C; } UnkStruct_ov9_0224CA5C; typedef struct { @@ -587,17 +588,17 @@ typedef struct { int unk_0C; int unk_10[4]; int unk_20; - UnkStruct_ov5_021EF76C * unk_24; - UnkStruct_ov9_0224E0DC * unk_28; - SysTask * unk_2C; + UnkStruct_ov5_021EF76C *unk_24; + UnkStruct_ov9_0224E0DC *unk_28; + SysTask *unk_2C; } UnkStruct_ov9_0224CBD8; struct UnkStruct_ov9_02249B04_t { - FieldSystem * fieldSystem; - UnkStruct_02071C5C * unk_04; - NARC * unk_08; - NARC * unk_0C; - NARC * unk_10; + FieldSystem *fieldSystem; + UnkStruct_02071C5C *unk_04; + NARC *unk_08; + NARC *unk_0C; + NARC *unk_10; UnkStruct_ov9_02249F9C unk_14; UnkStruct_ov9_0224A570 unk_54; UnkFuncPtr_ov9_0224E33C unk_D8; @@ -619,7 +620,7 @@ struct UnkStruct_ov9_02249B04_t { GXRgb unk_1EB0[8]; u16 unk_1EC0; u16 unk_1EC2; - SysTask * unk_1EC4; + SysTask *unk_1EC4; }; typedef struct { @@ -632,7 +633,7 @@ typedef struct { VecFx32 unk_10; VecFx32 unk_1C; UnkStruct_ov9_0224B708 unk_28; - UnkStruct_ov9_0224D928 * unk_40; + UnkStruct_ov9_0224D928 *unk_40; } UnkStruct_ov9_0224BA48; typedef struct { @@ -644,7 +645,7 @@ typedef struct { VecFx32 unk_08; VecFx32 unk_14; UnkStruct_ov9_0224B708 unk_20; - UnkStruct_ov9_0224D928 * unk_38; + UnkStruct_ov9_0224D928 *unk_38; } UnkStruct_ov9_0224BC08; typedef struct { @@ -669,9 +670,9 @@ typedef struct { fx32 unk_58; fx32 unk_5C; u32 unk_60; - UnkStruct_ov9_0224E0DC * unk_64; - MapObject * unk_68; - SysTask * unk_6C; + UnkStruct_ov9_0224E0DC *unk_64; + MapObject *unk_68; + SysTask *unk_6C; } UnkStruct_ov9_0224D078; typedef struct { @@ -682,7 +683,7 @@ typedef struct { VecFx32 unk_00; VecFx32 unk_0C; VecFx32 unk_18; - UnkStruct_ov9_0224E0DC * unk_24; + UnkStruct_ov9_0224E0DC *unk_24; fx32 unk_28; fx32 unk_2C; fx32 unk_30; @@ -699,8 +700,8 @@ typedef struct { } UnkStruct_ov9_0224E870; typedef struct { - UnkStruct_ov9_02249B04 * unk_00; - UnkStruct_ov9_0224D928 * unk_04; + UnkStruct_ov9_02249B04 *unk_00; + UnkStruct_ov9_0224D928 *unk_04; UnkStruct_ov9_02252414 unk_08; } UnkStruct_ov9_0224E91C; @@ -719,7 +720,7 @@ typedef struct { VecFx32 unk_04; VecFx32 unk_10; UnkStruct_ov9_0224EBCC unk_1C; - UnkStruct_ov9_0224D928 * unk_24; + UnkStruct_ov9_0224D928 *unk_24; } UnkStruct_ov9_0224ED58; typedef struct { @@ -730,10 +731,10 @@ typedef struct { } UnkStruct_ov9_0225311C; struct UnkStruct_ov9_0224F6EC_t { - UnkStruct_ov9_02249B04 * unk_00; - FieldSystem * fieldSystem; - TaskManager * unk_08; - MapObject * unk_0C; + UnkStruct_ov9_02249B04 *unk_00; + FieldSystem *fieldSystem; + TaskManager *unk_08; + MapObject *unk_0C; u16 unk_10; u16 unk_12; u32 unk_14; @@ -769,7 +770,7 @@ typedef struct { VecFx32 unk_28; VecFx32 unk_34; VecFx32 unk_40; - fx32 * unk_4C; + fx32 *unk_4C; fx32 unk_50; fx32 unk_54; } UnkStruct_ov9_0224F930; @@ -833,7 +834,7 @@ typedef struct { fx32 unk_04; VecFx32 unk_08; int unk_14; - MapObject * unk_18; + MapObject *unk_18; u16 unk_1C[16]; } UnkStruct_ov9_0225074C; @@ -844,22 +845,22 @@ typedef struct { fx32 unk_0C; fx32 unk_10; VecFx32 unk_14; - MapObject * unk_20; + MapObject *unk_20; } UnkStruct_ov9_02250918; typedef struct { fx32 unk_00; VecFx32 unk_04; - SysTask * unk_10; - MapObject * unk_14; + SysTask *unk_10; + MapObject *unk_14; } UnkStruct_ov9_02250AFC; typedef struct { fx32 unk_00; VecFx32 unk_04; - SysTask * unk_10; - SysTask * unk_14; - MapObject * unk_18; + SysTask *unk_10; + SysTask *unk_14; + MapObject *unk_18; } UnkStruct_ov9_02250C14; typedef struct { @@ -872,285 +873,285 @@ typedef struct { s16 unk_02; } UnkStruct_ov9_02250DE8; -static void ov9_02249B04(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249B68(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249C88(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249CAC(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249CC4(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249D18(UnkStruct_ov9_02249B04 * param0, u16 param1, u16 param2, u16 param3); -static void ov9_02249D24(UnkStruct_ov9_02249B04 * param0, u16 * param1, u16 * param2, u16 * param3); -static BOOL ov9_02249D38(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249D44(UnkStruct_ov9_02249B04 * param0, u32 param1); -static u32 ov9_02249D5C(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249D68(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_02249D70(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_02249D8C(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_02249DA8(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_02249DC8(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_02249DE4(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_02249E00(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_02249E20(UnkStruct_ov9_02249B04 * param0, u32 param1); -static u32 ov9_02249E44(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249E94(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249EC8(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249EDC(SysTask * param0, void * param1); -static void ov9_02249EF0(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249F18(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249F3C(SysTask * param0, void * param1); -static void ov9_02249F50(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249F84(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249F88(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249F98(UnkStruct_ov9_02249B04 * param0); -static void ov9_02249FF4(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224A0C8(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224A0DC(SysTask * param0, void * param1); -static BOOL ov9_0224A148(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224A8A0 * param1); -static void ov9_0224A1E4(UnkStruct_ov9_02249B04 * param0, int param1); -static void ov9_0224A228(UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1, UnkStruct_020216E0 * param2); -static void ov9_0224A294(UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1); -static void ov9_0224A2AC(UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1); -static void ov9_0224A334(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224A390(UnkStruct_ov9_02249B04 * param0, MapObject * param1, int param2); -static void ov9_0224A3C4(UnkStruct_ov9_02249B04 * param0, UnkStruct_020216E0 * param1, int param2); -static void ov9_0224A408(UnkStruct_ov9_02249B04 * param0, const UnkStruct_020216E0 * param1); -static void ov9_0224A49C(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224A4C8(UnkStruct_020216E0 * param0, void * param1); -static void ov9_0224A4D0(UnkStruct_ov9_02249B04 * param0, MapObject * param1, int param2, int param3); -static void ov9_0224A570(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224A574(UnkStruct_ov9_02249B04 * param0); -static void * ov9_0224A578(UnkStruct_ov9_02249B04 * param0, int param1); -static void * ov9_0224A598(UnkStruct_ov9_02249B04 * param0); -static BOOL ov9_0224A8A0(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4); -static void ov9_0224A8C0(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224A9E8(UnkStruct_ov9_02249B04 * param0); -static BOOL ov9_0224AA00(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4); -static void ov9_0224AA34(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224AA00 * param1); -static BOOL ov9_0224AAD4(TaskManager * param0); -static BOOL ov9_0224AC58(UnkStruct_ov9_0224AC58 * param0, MapObject * param1); -static void ov9_0224ADC0(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224AED8(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224AEE4(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B064 * param1, NARC * param2); -static void ov9_0224B064(UnkStruct_ov9_0224B064 * param0); -static void ov9_0224B124(SysTask * param0, void * param1); -static GraphicElementData * ov9_0224B130(UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7); -static void ov9_0224B1B4(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov5_021DF47C * param1, UnkStruct_ov9_0224B064 * param2); -static void ov9_0224B3A8(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B3F4(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B3F8(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B528 * param1, const UnkStruct_ov9_0224B3F8 * param2, const UnkStruct_ov9_0224B6CC * param3, int param4, u32 param5); -static void ov9_0224B45C(UnkStruct_ov9_02249B04 * param0, int param1); -static void ov9_0224B4CC(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B514(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B528(UnkStruct_ov9_0224B528 * param0); -static void ov9_0224B560(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B624(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224B64C(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_0224B674(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_0224B698(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224B6BC(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B6CC(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B528 * param1, const UnkStruct_ov9_0224B6CC * param2, int param3); -static UnkStruct_ov101_021D5D90 * ov9_0224B708(UnkStruct_ov9_02249B04 * param0, int param1, int param2, const UnkStruct_ov9_0224B6CC * param3); -static void ov9_0224B748(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4); -static BOOL ov9_0224B7B0(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_0224B844(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_0224B8DC(UnkStruct_ov9_02249B04 * param0, int param1); -static void ov9_0224B570(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B580(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B590(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B5A0(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B5B0(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224B5EC(UnkStruct_ov9_02249B04 * param0); -static u16 ov9_0224B958(UnkStruct_ov101_021D5D90 * param0); -static void ov9_0224BE14(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224BE8C(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224BEB4(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224BF18(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224BF8C(NARC * param0, UnkStruct_ov9_0224BFE0 * param1); -static void ov9_0224BFBC(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224BFE0(UnkStruct_ov9_0224BFE0 * param0); -static void ov9_0224BFFC(UnkStruct_ov9_02249B04 * param0); -static const UnkStruct_ov9_0224C034 * ov9_0224C00C(const UnkStruct_ov9_0224BFE0 * param0, int param1); -static const UnkStruct_ov9_0224C034 * ov9_0224C034(UnkStruct_ov9_02249B04 * param0, int param1); -static u32 ov9_0224C044(UnkStruct_ov9_02249B04 * param0, int param1); -static void ov9_0224C050(const UnkStruct_ov9_0224BFE0 * param0, int param1, int * param2, int * param3, int * param4); -static void ov9_0224C070(UnkStruct_ov9_02249B04 * param0, int param1, int * param2, int * param3, int * param4); -static void ov9_0224C088(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224C14C * param1, int param2); -static void ov9_0224C0F8(UnkStruct_ov9_02249B04 * param0, int param1, int param2); -static void ov9_0224C10C(UnkStruct_ov9_02249B04 * param0, int param1); -static void ov9_0224C120(UnkStruct_ov9_02249B04 * param0, int param1); -static void ov9_0224C14C(UnkStruct_ov9_0224C14C * param0); -static void ov9_0224C164(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C174(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C184(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C194(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C1E4(UnkStruct_ov9_02249B04 * param0); -static int ov9_0224C234(UnkStruct_ov9_0224C14C * param0); -static int ov9_0224C23C(UnkStruct_ov9_0224C14C * param0); -static UnkStruct_ov9_0224C324 * ov9_0224C244(UnkStruct_ov9_0224C14C * param0); -static int ov9_0224C24C(UnkStruct_ov9_0224C14C * param0); -static int ov9_0224C254(UnkStruct_ov9_0224C14C * param0); -static UnkStruct_ov9_0224AA00 * ov9_0224C25C(UnkStruct_ov9_0224C14C * param0); -static int ov9_0224C264(UnkStruct_ov9_0224C14C * param0); -static int ov9_0224C26C(UnkStruct_ov9_0224C14C * param0); -static UnkStruct_ov9_0224A8A0 * ov9_0224C274(UnkStruct_ov9_0224C14C * param0); -static int ov9_0224C27C(UnkStruct_ov9_02249B04 * param0); -static int ov9_0224C288(UnkStruct_ov9_02249B04 * param0); -static const UnkStruct_ov9_0224B3F8 * ov9_0224C2A8(UnkStruct_ov9_0224C14C * param0); -static const UnkStruct_ov9_0224B6CC * ov9_0224C2AC(UnkStruct_ov9_0224C14C * param0); -static const UnkStruct_ov9_0224B748 * ov9_0224C2B4(UnkStruct_ov9_0224C14C * param0); -static void ov9_0224C2C4(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C300(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C378(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, s16 param4); -static void ov9_0224C3F8(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224C44C(UnkStruct_ov9_02249B04 * param0); -static u32 ov9_0224C470(UnkStruct_ov9_02249B04 * param0); -static u32 ov9_0224C494(UnkStruct_ov9_02249B04 * param0); -static u32 ov9_0224C4B8(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3); -static void ov9_0224C4F4(UnkStruct_ov9_02249B04 * param0, u32 param1); -static u16 ov9_0224C52C(UnkStruct_ov9_02249B04 * param0, int param1, int param2); -static u16 ov9_0224C55C(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3); -static void ov9_0224C640(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C680(UnkStruct_ov9_02249B04 * param0); -static const UnkStruct_ov9_0224AA00 * ov9_0224C69C(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4); -static void ov9_0224C6E4(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C724(UnkStruct_ov9_02249B04 * param0); -static const UnkStruct_ov9_0224A8A0 * ov9_0224C740(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4); -static void ov9_0224C788(UnkStruct_ov9_0224C14C * param0, UnkStruct_ov9_0224C788 * param1); -static void ov9_0224C7C8(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C7E8(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C808(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C834(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C854(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C844(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C864(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C888(UnkStruct_ov9_02249B04 * param0); -static const UnkStruct_ov9_0224B3F8 * ov9_0224C8AC(UnkStruct_ov9_02249B04 * param0); -static const UnkStruct_ov9_0224B3F8 * ov9_0224C8B8(UnkStruct_ov9_02249B04 * param0); -static const UnkStruct_ov9_0224B6CC * ov9_0224C8C4(UnkStruct_ov9_02249B04 * param0); -static const UnkStruct_ov9_0224B6CC * ov9_0224C8D0(UnkStruct_ov9_02249B04 * param0); -static const UnkStruct_ov9_0224B748 * ov9_0224C8DC(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C8E8(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224C9E8(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224CA98(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224CB30(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224CBD8(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224CBF8(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224CC08(SysTask * param0, void * param1); -static void ov9_0224CC4C(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224CC50(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, u32 param2); -static BOOL ov9_0224CC7C(UnkStruct_ov9_02249B04 * param0); -static BOOL ov9_0224D040(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3); -static void ov9_0224D078(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1); -static BOOL ov9_0224D098(TaskManager * param0); -static const UnkStruct_ov9_022530A4 * ov9_0224D720(int param0); -static void ov9_0224D744(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224D780(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224D7C0(UnkStruct_ov9_02249B04 * param0, u32 param1); -static UnkStruct_02073838 * ov9_0224D7EC(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224D814(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224D874(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224D994(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224D9BC(UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param2, UnkStruct_02073B50 * param3, UnkStruct_02073974 * param4); -static void ov9_0224DA48(UnkStruct_ov9_02249B04 * param0, int param1, UnkStruct_02073B50 * param2, UnkStruct_02073974 * param3); -static void ov9_0224DA64(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3); -static void ov9_0224DAAC(UnkStruct_ov9_02249B04 * param0, int param1, int param2); -static void ov9_0224DAB8(UnkStruct_ov9_02249B04 * param0, int param1, int param2); +static void ov9_02249B04(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249B68(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249C88(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249CAC(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249CC4(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249D18(UnkStruct_ov9_02249B04 *param0, u16 param1, u16 param2, u16 param3); +static void ov9_02249D24(UnkStruct_ov9_02249B04 *param0, u16 *param1, u16 *param2, u16 *param3); +static BOOL ov9_02249D38(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249D44(UnkStruct_ov9_02249B04 *param0, u32 param1); +static u32 ov9_02249D5C(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249D68(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_02249D70(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_02249D8C(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_02249DA8(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_02249DC8(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_02249DE4(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_02249E00(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_02249E20(UnkStruct_ov9_02249B04 *param0, u32 param1); +static u32 ov9_02249E44(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249E94(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249EC8(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249EDC(SysTask *param0, void *param1); +static void ov9_02249EF0(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249F18(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249F3C(SysTask *param0, void *param1); +static void ov9_02249F50(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249F84(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249F88(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249F98(UnkStruct_ov9_02249B04 *param0); +static void ov9_02249FF4(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224A0C8(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224A0DC(SysTask *param0, void *param1); +static BOOL ov9_0224A148(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_0224A8A0 *param1); +static void ov9_0224A1E4(UnkStruct_ov9_02249B04 *param0, int param1); +static void ov9_0224A228(UnkStruct_ov9_0224A228 *param0, UnkStruct_ov9_0224A294 *param1, UnkStruct_020216E0 *param2); +static void ov9_0224A294(UnkStruct_ov9_0224A228 *param0, UnkStruct_ov9_0224A294 *param1); +static void ov9_0224A2AC(UnkStruct_ov9_0224A228 *param0, UnkStruct_ov9_0224A294 *param1); +static void ov9_0224A334(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224A390(UnkStruct_ov9_02249B04 *param0, MapObject *param1, int param2); +static void ov9_0224A3C4(UnkStruct_ov9_02249B04 *param0, UnkStruct_020216E0 *param1, int param2); +static void ov9_0224A408(UnkStruct_ov9_02249B04 *param0, const UnkStruct_020216E0 *param1); +static void ov9_0224A49C(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224A4C8(UnkStruct_020216E0 *param0, void *param1); +static void ov9_0224A4D0(UnkStruct_ov9_02249B04 *param0, MapObject *param1, int param2, int param3); +static void ov9_0224A570(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224A574(UnkStruct_ov9_02249B04 *param0); +static void *ov9_0224A578(UnkStruct_ov9_02249B04 *param0, int param1); +static void *ov9_0224A598(UnkStruct_ov9_02249B04 *param0); +static BOOL ov9_0224A8A0(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4); +static void ov9_0224A8C0(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224A9E8(UnkStruct_ov9_02249B04 *param0); +static BOOL ov9_0224AA00(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4); +static void ov9_0224AA34(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_0224AA00 *param1); +static BOOL ov9_0224AAD4(TaskManager *param0); +static BOOL ov9_0224AC58(UnkStruct_ov9_0224AC58 *param0, MapObject *param1); +static void ov9_0224ADC0(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224AED8(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224AEE4(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224B064 *param1, NARC *param2); +static void ov9_0224B064(UnkStruct_ov9_0224B064 *param0); +static void ov9_0224B124(SysTask *param0, void *param1); +static GraphicElementData *ov9_0224B130(UnkStruct_ov9_0224B064 *param0, const VecFx32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7); +static void ov9_0224B1B4(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov5_021DF47C *param1, UnkStruct_ov9_0224B064 *param2); +static void ov9_0224B3A8(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B3F4(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B3F8(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224B528 *param1, const UnkStruct_ov9_0224B3F8 *param2, const UnkStruct_ov9_0224B6CC *param3, int param4, u32 param5); +static void ov9_0224B45C(UnkStruct_ov9_02249B04 *param0, int param1); +static void ov9_0224B4CC(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B514(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B528(UnkStruct_ov9_0224B528 *param0); +static void ov9_0224B560(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B624(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224B64C(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_0224B674(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_0224B698(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224B6BC(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B6CC(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224B528 *param1, const UnkStruct_ov9_0224B6CC *param2, int param3); +static UnkStruct_ov101_021D5D90 *ov9_0224B708(UnkStruct_ov9_02249B04 *param0, int param1, int param2, const UnkStruct_ov9_0224B6CC *param3); +static void ov9_0224B748(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4); +static BOOL ov9_0224B7B0(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_0224B844(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_0224B8DC(UnkStruct_ov9_02249B04 *param0, int param1); +static void ov9_0224B570(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B580(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B590(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B5A0(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B5B0(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224B5EC(UnkStruct_ov9_02249B04 *param0); +static u16 ov9_0224B958(UnkStruct_ov101_021D5D90 *param0); +static void ov9_0224BE14(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224BE8C(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224BEB4(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224BF18(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224BF8C(NARC *param0, UnkStruct_ov9_0224BFE0 *param1); +static void ov9_0224BFBC(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224BFE0(UnkStruct_ov9_0224BFE0 *param0); +static void ov9_0224BFFC(UnkStruct_ov9_02249B04 *param0); +static const UnkStruct_ov9_0224C034 *ov9_0224C00C(const UnkStruct_ov9_0224BFE0 *param0, int param1); +static const UnkStruct_ov9_0224C034 *ov9_0224C034(UnkStruct_ov9_02249B04 *param0, int param1); +static u32 ov9_0224C044(UnkStruct_ov9_02249B04 *param0, int param1); +static void ov9_0224C050(const UnkStruct_ov9_0224BFE0 *param0, int param1, int *param2, int *param3, int *param4); +static void ov9_0224C070(UnkStruct_ov9_02249B04 *param0, int param1, int *param2, int *param3, int *param4); +static void ov9_0224C088(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224C14C *param1, int param2); +static void ov9_0224C0F8(UnkStruct_ov9_02249B04 *param0, int param1, int param2); +static void ov9_0224C10C(UnkStruct_ov9_02249B04 *param0, int param1); +static void ov9_0224C120(UnkStruct_ov9_02249B04 *param0, int param1); +static void ov9_0224C14C(UnkStruct_ov9_0224C14C *param0); +static void ov9_0224C164(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C174(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C184(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C194(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C1E4(UnkStruct_ov9_02249B04 *param0); +static int ov9_0224C234(UnkStruct_ov9_0224C14C *param0); +static int ov9_0224C23C(UnkStruct_ov9_0224C14C *param0); +static UnkStruct_ov9_0224C324 *ov9_0224C244(UnkStruct_ov9_0224C14C *param0); +static int ov9_0224C24C(UnkStruct_ov9_0224C14C *param0); +static int ov9_0224C254(UnkStruct_ov9_0224C14C *param0); +static UnkStruct_ov9_0224AA00 *ov9_0224C25C(UnkStruct_ov9_0224C14C *param0); +static int ov9_0224C264(UnkStruct_ov9_0224C14C *param0); +static int ov9_0224C26C(UnkStruct_ov9_0224C14C *param0); +static UnkStruct_ov9_0224A8A0 *ov9_0224C274(UnkStruct_ov9_0224C14C *param0); +static int ov9_0224C27C(UnkStruct_ov9_02249B04 *param0); +static int ov9_0224C288(UnkStruct_ov9_02249B04 *param0); +static const UnkStruct_ov9_0224B3F8 *ov9_0224C2A8(UnkStruct_ov9_0224C14C *param0); +static const UnkStruct_ov9_0224B6CC *ov9_0224C2AC(UnkStruct_ov9_0224C14C *param0); +static const UnkStruct_ov9_0224B748 *ov9_0224C2B4(UnkStruct_ov9_0224C14C *param0); +static void ov9_0224C2C4(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C300(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C378(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, s16 param4); +static void ov9_0224C3F8(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224C44C(UnkStruct_ov9_02249B04 *param0); +static u32 ov9_0224C470(UnkStruct_ov9_02249B04 *param0); +static u32 ov9_0224C494(UnkStruct_ov9_02249B04 *param0); +static u32 ov9_0224C4B8(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3); +static void ov9_0224C4F4(UnkStruct_ov9_02249B04 *param0, u32 param1); +static u16 ov9_0224C52C(UnkStruct_ov9_02249B04 *param0, int param1, int param2); +static u16 ov9_0224C55C(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3); +static void ov9_0224C640(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C680(UnkStruct_ov9_02249B04 *param0); +static const UnkStruct_ov9_0224AA00 *ov9_0224C69C(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4); +static void ov9_0224C6E4(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C724(UnkStruct_ov9_02249B04 *param0); +static const UnkStruct_ov9_0224A8A0 *ov9_0224C740(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4); +static void ov9_0224C788(UnkStruct_ov9_0224C14C *param0, UnkStruct_ov9_0224C788 *param1); +static void ov9_0224C7C8(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C7E8(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C808(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C834(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C854(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C844(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C864(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C888(UnkStruct_ov9_02249B04 *param0); +static const UnkStruct_ov9_0224B3F8 *ov9_0224C8AC(UnkStruct_ov9_02249B04 *param0); +static const UnkStruct_ov9_0224B3F8 *ov9_0224C8B8(UnkStruct_ov9_02249B04 *param0); +static const UnkStruct_ov9_0224B6CC *ov9_0224C8C4(UnkStruct_ov9_02249B04 *param0); +static const UnkStruct_ov9_0224B6CC *ov9_0224C8D0(UnkStruct_ov9_02249B04 *param0); +static const UnkStruct_ov9_0224B748 *ov9_0224C8DC(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C8E8(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224C9E8(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224CA98(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224CB30(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224CBD8(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224CBF8(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224CC08(SysTask *param0, void *param1); +static void ov9_0224CC4C(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224CC50(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1, u32 param2); +static BOOL ov9_0224CC7C(UnkStruct_ov9_02249B04 *param0); +static BOOL ov9_0224D040(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3); +static void ov9_0224D078(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1); +static BOOL ov9_0224D098(TaskManager *param0); +static const UnkStruct_ov9_022530A4 *ov9_0224D720(int param0); +static void ov9_0224D744(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224D780(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224D7C0(UnkStruct_ov9_02249B04 *param0, u32 param1); +static UnkStruct_02073838 *ov9_0224D7EC(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224D814(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224D874(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224D994(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224D9BC(UnkStruct_ov9_02249B04 *param0, u32 param1, u32 param2, UnkStruct_02073B50 *param3, UnkStruct_02073974 *param4); +static void ov9_0224DA48(UnkStruct_ov9_02249B04 *param0, int param1, UnkStruct_02073B50 *param2, UnkStruct_02073974 *param3); +static void ov9_0224DA64(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3); +static void ov9_0224DAAC(UnkStruct_ov9_02249B04 *param0, int param1, int param2); +static void ov9_0224DAB8(UnkStruct_ov9_02249B04 *param0, int param1, int param2); static BOOL ov9_0224DAEC(int param0); static BOOL ov9_0224DB04(int param0); -static void ov9_0224DB1C(UnkStruct_ov9_02249B04 * param0); -static UnkStruct_ov9_0224D928 * ov9_0224D8A4(UnkStruct_ov9_02249B04 * param0, u32 param1, int * param2); -static void ov9_0224D928(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D928 * param1); -static void ov9_0224D938(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D928 * param1); -static void ov9_0224D954(UnkStruct_ov9_02249B04 * param0, int param1); -static BOOL ov9_0224DBE4(UnkStruct_ov9_02249B04 * param0, int param1, VecFx32 * param2); -static void ov9_0224DC34(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224DC4C(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224DC74(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224DCA8(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224DD24(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224DD40(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02252C38 * param1, u32 param2); -static void ov9_0224DDA0(UnkStruct_ov9_02249B04 * param0, u32 param1, int param2); -static UnkStruct_ov9_0224E0DC * ov9_0224DDDC(UnkStruct_ov9_02249B04 * param0); -static UnkStruct_ov9_0224E0DC * ov9_0224DE08(UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param2); -static const UnkStruct_ov9_02252C38 * ov9_0224DE40(u32 param0); -static const UnkStruct_ov9_0224DF10 * ov9_0224DE60(u32 param0, u32 param1); -static const UnkStruct_ov9_02253830 * ov9_0224DE70(u32 param0); -static MapObject * ov9_0224DE94(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6); -static void ov9_0224DF10(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, MapObject * param2); -static UnkStruct_ov101_021D5D90 * ov9_0224DFA0(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1); -static void ov9_0224DFF4(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, const UnkStruct_ov9_0224DF10 * param2, u32 param3); -static void ov9_0224E044(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1); -static void ov9_0224E060(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1); -static void ov9_0224E07C(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, u32 param2); -static void ov9_0224E0DC(UnkStruct_ov9_0224E0DC * param0, u32 param1); -static BOOL ov9_0224E0E0(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_0224E120(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_0224E160(UnkStruct_ov9_02249B04 * param0, int param1); -static UnkStruct_ov9_0224E0DC * ov9_0224E188(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, u32 param4); -static VecFx32 * ov9_0224E330(UnkStruct_ov101_021D5D90 * param0); -static void ov9_0224E33C(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224E34C(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224E350(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02251438 * param1); -static void * ov9_0224E37C(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void * ov9_0224E39C(UnkStruct_ov9_02249B04 * param0); -static BOOL ov9_0224E3A0(UnkStruct_ov9_02249B04 * param0, TaskManager * param1); -static BOOL ov9_0224E434(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3); -static void ov9_0224E498(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02251438 * param1); -static void ov9_0224E4B0(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02252044 * param1); -static BOOL ov9_0224E4BC(TaskManager * param0); -static void ov9_0224E8B4(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224E8EC(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224E91C(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02252414 * param1); -static BOOL ov9_0224E964(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224E984(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224E988(UnkStruct_ov9_02249B04 * param0); -static BOOL ov9_0224E9A4(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_0224E9CC(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_0224E9F4(UnkStruct_ov9_02249B04 * param0, int param1); -static void ov9_0224EB68(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224EB94(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224EBB8(UnkStruct_ov9_0224EBB8 * param0); -static void ov9_0224EC10(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02252548 * param1); -static void ov9_0224EC48(UnkStruct_ov9_02249B04 * param0, u32 param1); -static UnkStruct_ov9_0224EBB8 * ov9_0224EC70(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224EC94(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_0224ECC0(UnkStruct_ov9_02249B04 * param0, int param1); -static BOOL ov9_0224ECE8(UnkStruct_ov9_02249B04 * param0, u32 param1); -static BOOL ov9_0224ED20(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224EE40(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224EE6C(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224EE70(UnkStruct_ov9_02249B04 * param0, MapObject * param1); -static MapObject ** ov9_0224EEA0(UnkStruct_ov9_02249B04 * param0); -static BOOL ov9_0224EF30(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224EF30 * param1, u16 param2); -static BOOL ov9_0224EF64(UnkStruct_ov9_02249B04 * param0, MapObject ** param1, const UnkStruct_ov9_0224EF30 * param2, u32 param3, u16 param4); -static BOOL ov9_0224F048(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224EF30 ** param1, u32 param2); -static void ov9_0224F078(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224F0A4(UnkStruct_ov9_02249B04 * param0, u32 param1); -static MapObject * ov9_0224F0D4(UnkStruct_ov9_02249B04 * param0, u32 param1, u16 param2); -static BOOL ov9_0224F1CC(UnkStruct_ov9_02249B04 * param0, MapObject * param1); -static void ov9_0224F724(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224F760(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224F764(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224F804(UnkStruct_ov9_02249B04 * param0); -static void ov9_0224F854(UnkStruct_ov9_02249B04 * param0, u32 param1); -static void ov9_0224F860(UnkStruct_ov9_02249B04 * param0, s16 param1); -static void ov9_0224F86C(u16 param0, u16 param1, u16 param2, u16 * param3); -static BOOL ov9_02250E6C(int param0, int param1, int param2, const UnkStruct_ov9_02250E6C * param3); +static void ov9_0224DB1C(UnkStruct_ov9_02249B04 *param0); +static UnkStruct_ov9_0224D928 *ov9_0224D8A4(UnkStruct_ov9_02249B04 *param0, u32 param1, int *param2); +static void ov9_0224D928(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D928 *param1); +static void ov9_0224D938(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D928 *param1); +static void ov9_0224D954(UnkStruct_ov9_02249B04 *param0, int param1); +static BOOL ov9_0224DBE4(UnkStruct_ov9_02249B04 *param0, int param1, VecFx32 *param2); +static void ov9_0224DC34(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224DC4C(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224DC74(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224DCA8(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224DD24(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224DD40(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02252C38 *param1, u32 param2); +static void ov9_0224DDA0(UnkStruct_ov9_02249B04 *param0, u32 param1, int param2); +static UnkStruct_ov9_0224E0DC *ov9_0224DDDC(UnkStruct_ov9_02249B04 *param0); +static UnkStruct_ov9_0224E0DC *ov9_0224DE08(UnkStruct_ov9_02249B04 *param0, u32 param1, u32 param2); +static const UnkStruct_ov9_02252C38 *ov9_0224DE40(u32 param0); +static const UnkStruct_ov9_0224DF10 *ov9_0224DE60(u32 param0, u32 param1); +static const UnkStruct_ov9_02253830 *ov9_0224DE70(u32 param0); +static MapObject *ov9_0224DE94(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4, int param5, u32 param6); +static void ov9_0224DF10(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1, MapObject *param2); +static UnkStruct_ov101_021D5D90 *ov9_0224DFA0(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1); +static void ov9_0224DFF4(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1, const UnkStruct_ov9_0224DF10 *param2, u32 param3); +static void ov9_0224E044(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1); +static void ov9_0224E060(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1); +static void ov9_0224E07C(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1, u32 param2); +static void ov9_0224E0DC(UnkStruct_ov9_0224E0DC *param0, u32 param1); +static BOOL ov9_0224E0E0(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_0224E120(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_0224E160(UnkStruct_ov9_02249B04 *param0, int param1); +static UnkStruct_ov9_0224E0DC *ov9_0224E188(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, u32 param4); +static VecFx32 *ov9_0224E330(UnkStruct_ov101_021D5D90 *param0); +static void ov9_0224E33C(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224E34C(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224E350(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02251438 *param1); +static void *ov9_0224E37C(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void *ov9_0224E39C(UnkStruct_ov9_02249B04 *param0); +static BOOL ov9_0224E3A0(UnkStruct_ov9_02249B04 *param0, TaskManager *param1); +static BOOL ov9_0224E434(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3); +static void ov9_0224E498(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02251438 *param1); +static void ov9_0224E4B0(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02252044 *param1); +static BOOL ov9_0224E4BC(TaskManager *param0); +static void ov9_0224E8B4(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224E8EC(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224E91C(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02252414 *param1); +static BOOL ov9_0224E964(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224E984(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224E988(UnkStruct_ov9_02249B04 *param0); +static BOOL ov9_0224E9A4(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_0224E9CC(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_0224E9F4(UnkStruct_ov9_02249B04 *param0, int param1); +static void ov9_0224EB68(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224EB94(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224EBB8(UnkStruct_ov9_0224EBB8 *param0); +static void ov9_0224EC10(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02252548 *param1); +static void ov9_0224EC48(UnkStruct_ov9_02249B04 *param0, u32 param1); +static UnkStruct_ov9_0224EBB8 *ov9_0224EC70(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224EC94(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_0224ECC0(UnkStruct_ov9_02249B04 *param0, int param1); +static BOOL ov9_0224ECE8(UnkStruct_ov9_02249B04 *param0, u32 param1); +static BOOL ov9_0224ED20(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224EE40(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224EE6C(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224EE70(UnkStruct_ov9_02249B04 *param0, MapObject *param1); +static MapObject **ov9_0224EEA0(UnkStruct_ov9_02249B04 *param0); +static BOOL ov9_0224EF30(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_0224EF30 *param1, u16 param2); +static BOOL ov9_0224EF64(UnkStruct_ov9_02249B04 *param0, MapObject **param1, const UnkStruct_ov9_0224EF30 *param2, u32 param3, u16 param4); +static BOOL ov9_0224F048(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_0224EF30 **param1, u32 param2); +static void ov9_0224F078(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224F0A4(UnkStruct_ov9_02249B04 *param0, u32 param1); +static MapObject *ov9_0224F0D4(UnkStruct_ov9_02249B04 *param0, u32 param1, u16 param2); +static BOOL ov9_0224F1CC(UnkStruct_ov9_02249B04 *param0, MapObject *param1); +static void ov9_0224F724(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224F760(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224F764(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224F804(UnkStruct_ov9_02249B04 *param0); +static void ov9_0224F854(UnkStruct_ov9_02249B04 *param0, u32 param1); +static void ov9_0224F860(UnkStruct_ov9_02249B04 *param0, s16 param1); +static void ov9_0224F86C(u16 param0, u16 param1, u16 param2, u16 *param3); +static BOOL ov9_02250E6C(int param0, int param1, int param2, const UnkStruct_ov9_02250E6C *param3); static int ov9_02250EB0(u16 param0, u16 param1); -static void ov9_02250EE8(s16 * param0, s16 param1); -static void ov9_02250F1C(fx32 * param0, fx32 param1); -static void ov9_02250F44(UnkStruct_ov9_02249B04 * param0, int * param1, int * param2, int * param3); -static u32 ov9_022510D0(UnkStruct_ov9_02249B04 * param0); +static void ov9_02250EE8(s16 *param0, s16 param1); +static void ov9_02250F1C(fx32 *param0, fx32 param1); +static void ov9_02250F44(UnkStruct_ov9_02249B04 *param0, int *param1, int *param2, int *param3); +static u32 ov9_022510D0(UnkStruct_ov9_02249B04 *param0); static int ov9_022510D8(u32 param0); -static BOOL ov9_02251104(UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param2); +static BOOL ov9_02251104(UnkStruct_ov9_02249B04 *param0, u32 param1, u32 param2); static void ov9_022511E0(u16 param0); -static void ov9_022511F4(MapObject * param0, const VecFx32 * param1); +static void ov9_022511F4(MapObject *param0, const VecFx32 *param1); static const UnkStruct_ov101_021D86B0 Unk_ov9_02251508; static const UnkStruct_ov101_021D86B0 Unk_ov9_02251468; static const UnkStruct_ov101_021D86B0 Unk_ov9_022514B8; static const UnkStruct_ov101_021D86B0 Unk_ov9_02251530; static const fx32 Unk_ov9_02252CF8[16]; -static void(*const Unk_ov9_02251224[1])(UnkStruct_ov9_02249B04 *, const UnkStruct_ov9_0224AA00 *); +static void (*const Unk_ov9_02251224[1])(UnkStruct_ov9_02249B04 *, const UnkStruct_ov9_0224AA00 *); static const int Unk_ov9_02251E58[7]; static const int Unk_ov9_02251E90[7]; static const int Unk_ov9_02251EAC[7]; @@ -1163,22 +1164,22 @@ static const u32 Unk_ov9_022514A4[5]; static const UnkStruct_ov9_022531D0 Unk_ov9_022531D0[25]; static const VecFx32 Unk_ov9_02253298[25]; static const VecFx32 Unk_ov9_022533C4[25]; -static const UnkStruct_ov101_021D86B0 * const Unk_ov9_02252F6C[25]; +static const UnkStruct_ov101_021D86B0 *const Unk_ov9_02252F6C[25]; static const UnkStruct_ov9_022530A4 Unk_ov9_022530A4[10]; static const UnkStruct_ov9_02252C38 Unk_ov9_02252C38[8]; static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22]; -static const UnkFuncPtr_ov9_02253BE4 * Unk_ov9_02253BE4[18]; +static const UnkFuncPtr_ov9_02253BE4 *Unk_ov9_02253BE4[18]; const UnkStruct_ov9_02252D38 Unk_ov9_02252D38[]; const UnkStruct_ov9_02251438 Unk_ov9_02251438[]; const UnkStruct_ov9_02251438 Unk_ov9_022513D8[]; const UnkStruct_ov9_02252548 Unk_ov9_02252548[]; const UnkStruct_ov9_02252EB4 Unk_ov9_02252EB4[]; -void ov9_02249960 (FieldSystem * fieldSystem) +void ov9_02249960(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071C5C * v1; - UnkStruct_ov9_02249B04 * v2; + UnkStruct_02027860 *v0; + UnkStruct_02071C5C *v1; + UnkStruct_ov9_02249B04 *v2; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = sub_02027F6C(v0, 9); @@ -1226,9 +1227,9 @@ void ov9_02249960 (FieldSystem * fieldSystem) v1->unk_00_0 = 1; } -void ov9_02249A60 (FieldSystem * fieldSystem) +void ov9_02249A60(FieldSystem *fieldSystem) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; ov9_02249F18(v0); ov9_0224E988(v0); @@ -1259,10 +1260,10 @@ void ov9_02249A60 (FieldSystem * fieldSystem) fieldSystem->unk_04->unk_24 = NULL; } -static void ov9_02249B04 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249B04(UnkStruct_ov9_02249B04 *param0) { u32 v0 = ov9_022510D0(param0); - const UnkStruct_ov9_022530A4 * v1 = ov9_0224D720(v0); + const UnkStruct_ov9_022530A4 *v1 = ov9_0224D720(v0); ov9_0224B570(param0); ov9_02249D44(param0, 0); @@ -1277,10 +1278,10 @@ static void ov9_02249B04 (UnkStruct_ov9_02249B04 * param0) ov9_0224F078(param0, v1->unk_08); } -static void ov9_02249B68 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249B68(UnkStruct_ov9_02249B04 *param0) { u32 v0 = ov9_022510D0(param0); - const UnkStruct_ov9_022530A4 * v1 = ov9_0224D720(v0); + const UnkStruct_ov9_022530A4 *v1 = ov9_0224D720(v0); v1 = ov9_0224D720(v1->unk_08); @@ -1297,7 +1298,7 @@ static void ov9_02249B68 (UnkStruct_ov9_02249B04 * param0) ov9_0224F078(param0, v0); } -static void ov9_02249BD4 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249BD4(UnkStruct_ov9_02249B04 *param0, u32 param1) { ov9_0224B570(param0); ov9_02249D44(param0, 0); @@ -1307,7 +1308,7 @@ static void ov9_02249BD4 (UnkStruct_ov9_02249B04 * param0, u32 param1) ov9_0224DB1C(param0); } -static void ov9_02249C08 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249C08(UnkStruct_ov9_02249B04 *param0, u32 param1) { ov9_0224B4CC(param0); ov9_0224EC48(param0, param1); @@ -1315,7 +1316,7 @@ static void ov9_02249C08 (UnkStruct_ov9_02249B04 * param0, u32 param1) ov9_0224F078(param0, param1); } -static void ov9_02249C2C (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249C2C(UnkStruct_ov9_02249B04 *param0, u32 param1) { ov9_0224B580(param0); ov9_02249D44(param0, 0); @@ -1325,7 +1326,7 @@ static void ov9_02249C2C (UnkStruct_ov9_02249B04 * param0, u32 param1) ov9_0224DB1C(param0); } -static void ov9_02249C60 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249C60(UnkStruct_ov9_02249B04 *param0, u32 param1) { ov9_0224B45C(param0, 1); ov9_0224EC48(param0, param1); @@ -1333,24 +1334,24 @@ static void ov9_02249C60 (UnkStruct_ov9_02249B04 * param0, u32 param1) ov9_0224F078(param0, param1); } -static void ov9_02249C88 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249C88(UnkStruct_ov9_02249B04 *param0) { param0->unk_08 = NARC_ctor(NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC, 4); param0->unk_0C = NARC_ctor(NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC_ATTR, 4); param0->unk_10 = NARC_ctor(NARC_INDEX_DATA__TW_ARC_ETC, 4); } -static void ov9_02249CAC (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249CAC(UnkStruct_ov9_02249B04 *param0) { NARC_dtor(param0->unk_08); NARC_dtor(param0->unk_0C); NARC_dtor(param0->unk_10); } -static void ov9_02249CC4 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249CC4(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_02071C5C * v0 = param0->unk_04; - VarsFlags * v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + UnkStruct_02071C5C *v0 = param0->unk_04; + VarsFlags *v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); v0->unk_0C = 0; @@ -1371,123 +1372,123 @@ static void ov9_02249CC4 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_02249D18 (UnkStruct_ov9_02249B04 * param0, u16 param1, u16 param2, u16 param3) +static void ov9_02249D18(UnkStruct_ov9_02249B04 *param0, u16 param1, u16 param2, u16 param3) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; v0->unk_04 = param1; v0->unk_06 = param2; v0->unk_08 = param3; } -static void ov9_02249D24 (UnkStruct_ov9_02249B04 * param0, u16 * param1, u16 * param2, u16 * param3) +static void ov9_02249D24(UnkStruct_ov9_02249B04 *param0, u16 *param1, u16 *param2, u16 *param3) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; *param1 = v0->unk_04; *param2 = v0->unk_06; *param3 = v0->unk_08; } -static BOOL ov9_02249D38 (UnkStruct_ov9_02249B04 * param0) +static BOOL ov9_02249D38(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; return v0->unk_00_0; } -static void ov9_02249D44 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249D44(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; v0->unk_00_1 = param1; } -static u32 ov9_02249D5C (UnkStruct_ov9_02249B04 * param0) +static u32 ov9_02249D5C(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; return v0->unk_00_1; } -static void ov9_02249D68 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249D68(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; v0->unk_0A = param1; } -static void ov9_02249D70 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249D70(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; GF_ASSERT(param1 < 11); v0->unk_0A |= (1 << param1); } -static void ov9_02249D8C (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249D8C(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; GF_ASSERT(param1 < 11); v0->unk_0A &= ~(1 << param1); } -static BOOL ov9_02249DA8 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_02249DA8(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; GF_ASSERT(param1 < 11); - if ((v0->unk_0A & (1 << param1))) { + if (v0->unk_0A & (1 << param1)) { return 1; } return 0; } -static void ov9_02249DC8 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249DC8(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; GF_ASSERT(param1 < 17); v0->unk_0C |= (1 << param1); } -static void ov9_02249DE4 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249DE4(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; GF_ASSERT(param1 < 17); v0->unk_0C &= ~(1 << param1); } -static BOOL ov9_02249E00 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_02249E00(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; GF_ASSERT(param1 < 17); - if ((v0->unk_0C & (1 << param1))) { + if (v0->unk_0C & (1 << param1)) { return 1; } return 0; } -static void ov9_02249E20 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_02249E20(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; GF_ASSERT(param1 < (1 << 4)); v0->unk_00_25 = param1; } -static u32 ov9_02249E44 (UnkStruct_ov9_02249B04 * param0) +static u32 ov9_02249E44(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_02071C5C * v0 = param0->unk_04; + UnkStruct_02071C5C *v0 = param0->unk_04; return v0->unk_00_25; } -BOOL ov9_02249E50 (FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4) +BOOL ov9_02249E50(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; u32 v1 = ov9_022510D0(v0); if (v1 == 582) { @@ -1506,10 +1507,10 @@ BOOL ov9_02249E50 (FieldSystem * fieldSystem, const int param1, const int param2 return 0; } -static void ov9_02249E94 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249E94(UnkStruct_ov9_02249B04 *param0) { int v0; - UnkStruct_ov9_02249E94 * v1 = ¶m0->unk_184; + UnkStruct_ov9_02249E94 *v1 = ¶m0->unk_184; memset(v1, 0, sizeof(UnkStruct_ov9_02249E94)); @@ -1519,19 +1520,19 @@ static void ov9_02249E94 (UnkStruct_ov9_02249B04 * param0) v1->unk_00 = SysTask_Start(ov9_02249EDC, param0, v0); } -static void ov9_02249EC8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249EC8(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_02249E94 * v0 = ¶m0->unk_184; + UnkStruct_ov9_02249E94 *v0 = ¶m0->unk_184; if (v0->unk_00 != NULL) { SysTask_Done(v0->unk_00); } } -static void ov9_02249EDC (SysTask * param0, void * param1) +static void ov9_02249EDC(SysTask *param0, void *param1) { - UnkStruct_ov9_02249B04 * v0 = param1; - UnkStruct_ov9_02249E94 * v1 = &v0->unk_184; + UnkStruct_ov9_02249B04 *v0 = param1; + UnkStruct_ov9_02249E94 *v1 = &v0->unk_184; { ov9_0224A49C(v0); @@ -1542,28 +1543,28 @@ static void ov9_02249EDC (SysTask * param0, void * param1) } } -static void ov9_02249EF0 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249EF0(UnkStruct_ov9_02249B04 *param0) { GF_ASSERT(param0->unk_1EC4 == NULL); param0->unk_1EC4 = SysTask_ExecuteOnVBlank(ov9_02249F3C, param0, 0x80); } -static void ov9_02249F18 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249F18(UnkStruct_ov9_02249B04 *param0) { GF_ASSERT(param0->unk_1EC4 != NULL); SysTask_Done(param0->unk_1EC4); param0->unk_1EC4 = NULL; } -static void ov9_02249F3C (SysTask * param0, void * param1) +static void ov9_02249F3C(SysTask *param0, void *param1) { - UnkStruct_ov9_02249B04 * v0 = param1; + UnkStruct_ov9_02249B04 *v0 = param1; ov9_0224CC4C(v0); ov9_0224F804(v0); } -static void ov9_02249F50 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249F50(UnkStruct_ov9_02249B04 *param0) { { int v0; @@ -1577,26 +1578,26 @@ static void ov9_02249F50 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_02249F84 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249F84(UnkStruct_ov9_02249B04 *param0) { return; } -static void ov9_02249F88 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249F88(UnkStruct_ov9_02249B04 *param0) { sub_02062CCC(param0->fieldSystem->mapObjMan, 0); } -static void ov9_02249F98 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249F98(UnkStruct_ov9_02249B04 *param0) { return; } -void ov9_02249F9C (FieldSystem * fieldSystem) +void ov9_02249F9C(FieldSystem *fieldSystem) { CameraAngle v0; - UnkStruct_ov9_02249B04 * v1 = fieldSystem->unk_04->unk_24; - UnkStruct_ov9_02249F9C * v2 = &v1->unk_14; + UnkStruct_ov9_02249B04 *v1 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249F9C *v2 = &v1->unk_14; v0.x = v2->unk_04.x + v2->unk_0C.x; v0.y = v2->unk_04.y + v2->unk_0C.y; @@ -1605,10 +1606,10 @@ void ov9_02249F9C (FieldSystem * fieldSystem) Camera_SetAngleAroundTarget(&v0, v2->camera); } -void ov9_02249FD0 (FieldSystem * fieldSystem) +void ov9_02249FD0(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071C5C * v1; + UnkStruct_02027860 *v0; + UnkStruct_02071C5C *v1; GF_ASSERT(fieldSystem != NULL); @@ -1620,16 +1621,16 @@ void ov9_02249FD0 (FieldSystem * fieldSystem) v1->unk_08 = 0; } -static void ov9_02249FF4 (UnkStruct_ov9_02249B04 * param0) +static void ov9_02249FF4(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_02249F9C * v0 = ¶m0->unk_14; + UnkStruct_ov9_02249F9C *v0 = ¶m0->unk_14; param0->fieldSystem->unk_20 = 1; v0->camera = param0->fieldSystem->camera; { UnkStruct_ov9_02249FF4 v1 = { - 0x29aec1, {-0x29fe, 0, 0}, 0, 0x5c1, 0 + 0x29aec1, { -0x29fe, 0, 0 }, 0, 0x5c1, 0 }; Camera_SetDistance(v1.unk_00, v0->camera); @@ -1662,9 +1663,9 @@ static void ov9_02249FF4 (UnkStruct_ov9_02249B04 * param0) v0->unk_3C = SysTask_Start(ov9_0224A0DC, param0, 0); } -static void ov9_0224A0C8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224A0C8(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_02249F9C * v0 = ¶m0->unk_14; + UnkStruct_ov9_02249F9C *v0 = ¶m0->unk_14; param0->fieldSystem->unk_20 = 0; @@ -1673,11 +1674,11 @@ static void ov9_0224A0C8 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224A0DC (SysTask * param0, void * param1) +static void ov9_0224A0DC(SysTask *param0, void *param1) { - UnkStruct_ov9_02249B04 * v0 = param1; - UnkStruct_ov9_02249F9C * v1 = &v0->unk_14; - UnkStruct_ov9_0224A0DC * v2 = &v1->unk_1C; + UnkStruct_ov9_02249B04 *v0 = param1; + UnkStruct_ov9_02249F9C *v1 = &v0->unk_14; + UnkStruct_ov9_0224A0DC *v2 = &v1->unk_1C; if (v2->unk_00 == 0) { return; @@ -1699,10 +1700,10 @@ static void ov9_0224A0DC (SysTask * param0, void * param1) v1->unk_0C.z = ((v2->unk_08.z) / FX32_ONE); } -static BOOL ov9_0224A148 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224A8A0 * param1) +static BOOL ov9_0224A148(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_0224A8A0 *param1) { - UnkStruct_ov9_02249F9C * v0 = ¶m0->unk_14; - UnkStruct_ov9_0224A0DC * v1 = &v0->unk_1C; + UnkStruct_ov9_02249F9C *v0 = ¶m0->unk_14; + UnkStruct_ov9_0224A0DC *v1 = &v0->unk_1C; ov9_02249D18(param0, param1->unk_0C, param1->unk_0E, param1->unk_10); @@ -1737,9 +1738,9 @@ static BOOL ov9_0224A148 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 return 1; } -static void ov9_0224A1E4 (UnkStruct_ov9_02249B04 * param0, int param1) +static void ov9_0224A1E4(UnkStruct_ov9_02249B04 *param0, int param1) { - UnkStruct_ov9_0224A228 * v0 = ¶m0->unk_188; + UnkStruct_ov9_0224A228 *v0 = ¶m0->unk_188; v0->unk_00 = param1; param1 *= sizeof(UnkStruct_ov9_0224A294); @@ -1752,11 +1753,11 @@ static void ov9_0224A1E4 (UnkStruct_ov9_02249B04 * param0, int param1) v0->unk_0C = NNS_G3dGetAnmByIdx(v0->unk_08, 0); } -static void ov9_0224A228 (UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1, UnkStruct_020216E0 * param2) +static void ov9_0224A228(UnkStruct_ov9_0224A228 *param0, UnkStruct_ov9_0224A294 *param1, UnkStruct_020216E0 *param2) { - NNSG3dResMdl * v0 = sub_02021430(param2); - NNSG3dResTex * v1 = sub_02021438(param2); - NNSG3dRenderObj * v2 = sub_02021440(param2); + NNSG3dResMdl *v0 = sub_02021430(param2); + NNSG3dResTex *v1 = sub_02021438(param2); + NNSG3dRenderObj *v2 = sub_02021440(param2); GF_ASSERT(param1->unk_10 == NULL); @@ -1773,7 +1774,7 @@ static void ov9_0224A228 (UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A29 } } -static void ov9_0224A294 (UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1) +static void ov9_0224A294(UnkStruct_ov9_0224A228 *param0, UnkStruct_ov9_0224A294 *param1) { if (param1->unk_10 != NULL) { NNS_G3dFreeAnmObj(¶m0->unk_10, param1->unk_10); @@ -1781,17 +1782,17 @@ static void ov9_0224A294 (UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A29 } } -static void ov9_0224A2AC (UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1) +static void ov9_0224A2AC(UnkStruct_ov9_0224A228 *param0, UnkStruct_ov9_0224A294 *param1) { ov9_0224A294(param0, param1); memset(param1, 0, sizeof(UnkStruct_ov9_0224A294)); } -static void ov9_0224A2C0 (UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1) +static void ov9_0224A2C0(UnkStruct_ov9_0224A228 *param0, UnkStruct_ov9_0224A294 *param1) { if (param1->unk_18 != NULL) { if (param1->unk_10 == NULL) { - UnkStruct_020216E0 * v0 = ov5_021EB1A0(param1->unk_18); + UnkStruct_020216E0 *v0 = ov5_021EB1A0(param1->unk_18); if (v0 == NULL) { return; @@ -1802,7 +1803,7 @@ static void ov9_0224A2C0 (UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A29 } } -static int ov9_0224A2E4 (UnkStruct_ov9_0224A294 * param0) +static int ov9_0224A2E4(UnkStruct_ov9_0224A294 *param0) { if (param0->unk_18 != NULL) { if (sub_02062CF8(param0->unk_18) == 0) { @@ -1825,11 +1826,11 @@ static int ov9_0224A2E4 (UnkStruct_ov9_0224A294 * param0) return 0; } -static void ov9_0224A334 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224A334(UnkStruct_ov9_02249B04 *param0) { int v0; - UnkStruct_ov9_0224A228 * v1 = ¶m0->unk_188; - UnkStruct_ov9_0224A294 * v2 = v1->unk_04; + UnkStruct_ov9_0224A228 *v1 = ¶m0->unk_188; + UnkStruct_ov9_0224A294 *v2 = v1->unk_04; for (v0 = 0; v0 < v1->unk_00; v0++, v2++) { ov9_0224A2AC(v1, v2); @@ -1844,7 +1845,7 @@ static void ov9_0224A334 (UnkStruct_ov9_02249B04 * param0) v1->unk_04 = NULL; } -static void ov9_0224A374 (UnkStruct_ov9_0224A294 * param0, MapObject * param1, int param2) +static void ov9_0224A374(UnkStruct_ov9_0224A294 *param0, MapObject *param1, int param2) { param0->unk_00 = param2; param0->unk_04 = (FX32_ONE * (param2)); @@ -1856,11 +1857,11 @@ static void ov9_0224A374 (UnkStruct_ov9_0224A294 * param0, MapObject * param1, i } } -static void ov9_0224A390 (UnkStruct_ov9_02249B04 * param0, MapObject * param1, int param2) +static void ov9_0224A390(UnkStruct_ov9_02249B04 *param0, MapObject *param1, int param2) { int v0 = 0; - UnkStruct_ov9_0224A228 * v1 = ¶m0->unk_188; - UnkStruct_ov9_0224A294 * v2 = v1->unk_04; + UnkStruct_ov9_0224A228 *v1 = ¶m0->unk_188; + UnkStruct_ov9_0224A294 *v2 = v1->unk_04; while (v0 < v1->unk_00) { if ((v2->unk_18 == NULL) && (v2->unk_1C == NULL)) { @@ -1875,11 +1876,11 @@ static void ov9_0224A390 (UnkStruct_ov9_02249B04 * param0, MapObject * param1, i GF_ASSERT(0); } -static void ov9_0224A3C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020216E0 * param1, int param2) +static void ov9_0224A3C4(UnkStruct_ov9_02249B04 *param0, UnkStruct_020216E0 *param1, int param2) { int v0 = 0; - UnkStruct_ov9_0224A228 * v1 = ¶m0->unk_188; - UnkStruct_ov9_0224A294 * v2 = v1->unk_04; + UnkStruct_ov9_0224A228 *v1 = ¶m0->unk_188; + UnkStruct_ov9_0224A294 *v2 = v1->unk_04; while (v0 < v1->unk_00) { if ((v2->unk_18 == NULL) && (v2->unk_1C == NULL)) { @@ -1895,11 +1896,11 @@ static void ov9_0224A3C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020216E0 * GF_ASSERT(0); } -static void ov9_0224A408 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_020216E0 * param1) +static void ov9_0224A408(UnkStruct_ov9_02249B04 *param0, const UnkStruct_020216E0 *param1) { int v0 = 0; - UnkStruct_ov9_0224A228 * v1 = ¶m0->unk_188; - UnkStruct_ov9_0224A294 * v2 = v1->unk_04; + UnkStruct_ov9_0224A228 *v1 = ¶m0->unk_188; + UnkStruct_ov9_0224A294 *v2 = v1->unk_04; while (v0 < v1->unk_00) { if (v2->unk_1C == param1) { @@ -1914,7 +1915,7 @@ static void ov9_0224A408 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_02021 GF_ASSERT(0); } -static void ov9_0224A438 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224A228 * param1, UnkStruct_ov9_0224A294 * param2) +static void ov9_0224A438(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224A228 *param1, UnkStruct_ov9_0224A294 *param2) { int v0; @@ -1947,28 +1948,28 @@ static void ov9_0224A438 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224A22 } } -static void ov9_0224A49C (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224A49C(UnkStruct_ov9_02249B04 *param0) { int v0; - UnkStruct_ov9_0224A228 * v1 = ¶m0->unk_188; - UnkStruct_ov9_0224A294 * v2 = v1->unk_04; + UnkStruct_ov9_0224A228 *v1 = ¶m0->unk_188; + UnkStruct_ov9_0224A294 *v2 = v1->unk_04; for (v0 = 0; v0 < v1->unk_00; v0++, v2++) { ov9_0224A438(param0, v1, v2); } } -static void ov9_0224A4C8 (UnkStruct_020216E0 * param0, void * param1) +static void ov9_0224A4C8(UnkStruct_020216E0 *param0, void *param1) { - UnkStruct_ov9_0224A294 * v0 = param1; + UnkStruct_ov9_0224A294 *v0 = param1; NNS_G3dAnmObjSetFrame(v0->unk_10, v0->unk_0C); } -static void ov9_0224A4D0 (UnkStruct_ov9_02249B04 * param0, MapObject * param1, int param2, int param3) +static void ov9_0224A4D0(UnkStruct_ov9_02249B04 *param0, MapObject *param1, int param2, int param3) { int v0 = 0; - UnkStruct_ov9_0224A228 * v1 = ¶m0->unk_188; - UnkStruct_ov9_0224A294 * v2 = v1->unk_04; + UnkStruct_ov9_0224A228 *v1 = ¶m0->unk_188; + UnkStruct_ov9_0224A294 *v2 = v1->unk_04; while (v0 < v1->unk_00) { if (v2->unk_18 == param1) { @@ -1986,12 +1987,12 @@ static void ov9_0224A4D0 (UnkStruct_ov9_02249B04 * param0, MapObject * param1, i GF_ASSERT(0); } -int ov9_0224A520 (FieldSystem * fieldSystem, MapObject * param1) +int ov9_0224A520(FieldSystem *fieldSystem, MapObject *param1) { int v0 = 0; - UnkStruct_ov9_02249B04 * v1 = fieldSystem->unk_04->unk_24; - UnkStruct_ov9_0224A228 * v2 = &v1->unk_188; - UnkStruct_ov9_0224A294 * v3 = v2->unk_04; + UnkStruct_ov9_02249B04 *v1 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_0224A228 *v2 = &v1->unk_188; + UnkStruct_ov9_0224A294 *v3 = v2->unk_04; while (v0 < v2->unk_00) { if (v3->unk_18 == param1) { @@ -2007,57 +2008,57 @@ int ov9_0224A520 (FieldSystem * fieldSystem, MapObject * param1) return 0; } -void ov9_0224A558 (FieldSystem * fieldSystem, UnkStruct_020216E0 * param1, int param2) +void ov9_0224A558(FieldSystem *fieldSystem, UnkStruct_020216E0 *param1, int param2) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; ov9_0224A3C4(v0, param1, param2); } -void ov9_0224A564 (FieldSystem * fieldSystem, const UnkStruct_020216E0 * param1) +void ov9_0224A564(FieldSystem *fieldSystem, const UnkStruct_020216E0 *param1) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; ov9_0224A408(v0, param1); } -static void ov9_0224A570 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224A570(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224A570 * v0 = ¶m0->unk_54; + UnkStruct_ov9_0224A570 *v0 = ¶m0->unk_54; } -static void ov9_0224A574 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224A574(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224A570 * v0 = ¶m0->unk_54; + UnkStruct_ov9_0224A570 *v0 = ¶m0->unk_54; } -static void * ov9_0224A578 (UnkStruct_ov9_02249B04 * param0, int param1) +static void *ov9_0224A578(UnkStruct_ov9_02249B04 *param0, int param1) { GF_ASSERT(param1 <= 128); { - UnkStruct_ov9_0224A570 * v0 = ¶m0->unk_54; - void * v1 = v0->unk_04; + UnkStruct_ov9_0224A570 *v0 = ¶m0->unk_54; + void *v1 = v0->unk_04; memset(v1, 0, param1); return v1; } } -static void * ov9_0224A598 (UnkStruct_ov9_02249B04 * param0) +static void *ov9_0224A598(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224A570 * v0 = ¶m0->unk_54; - void * v1 = v0->unk_04; + UnkStruct_ov9_0224A570 *v0 = ¶m0->unk_54; + void *v1 = v0->unk_04; return v1; } -BOOL ov9_0224A59C (FieldSystem * fieldSystem, int param1) +BOOL ov9_0224A59C(FieldSystem *fieldSystem, int param1) { - UnkStruct_02027860 * v0; + UnkStruct_02027860 *v0; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); if (sub_02027F80(v0) == 9) { int v1, v2, v3, v4; - UnkStruct_ov9_02249B04 * v5 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v5 = fieldSystem->unk_04->unk_24; v4 = sub_02061434(fieldSystem->playerAvatar, param1); ov9_02250F44(v5, &v1, &v2, &v3); @@ -2094,15 +2095,15 @@ BOOL ov9_0224A59C (FieldSystem * fieldSystem, int param1) return 0; } -BOOL ov9_0224A67C (FieldSystem * fieldSystem, int param1) +BOOL ov9_0224A67C(FieldSystem *fieldSystem, int param1) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; u32 v1 = ov9_022510D0(v0); switch (v1) { case 581: if (param1 == 0) { - VarsFlags * v2 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); + VarsFlags *v2 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); if (sub_0206B5D8(v2) >= 10) { int v3, v4, v5; @@ -2133,9 +2134,9 @@ BOOL ov9_0224A67C (FieldSystem * fieldSystem, int param1) return 0; } -BOOL ov9_0224A71C (FieldSystem * fieldSystem) +BOOL ov9_0224A71C(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; + UnkStruct_02027860 *v0; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); @@ -2146,7 +2147,7 @@ BOOL ov9_0224A71C (FieldSystem * fieldSystem) { int v1, v2, v3; int v4 = PlayerAvatar_GetDir(fieldSystem->playerAvatar); - UnkStruct_ov9_02249B04 * v5 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v5 = fieldSystem->unk_04->unk_24; ov9_02250F44(v5, &v1, &v2, &v3); @@ -2160,7 +2161,7 @@ BOOL ov9_0224A71C (FieldSystem * fieldSystem) { u32 v6 = ov9_022510D0(v5); - VarsFlags * v7 = SaveData_GetVarsFlags(v5->fieldSystem->saveData); + VarsFlags *v7 = SaveData_GetVarsFlags(v5->fieldSystem->saveData); if ((v6 == 581) && (v4 == 0)) { if (sub_0206B5D8(v7) >= 10) { @@ -2181,15 +2182,15 @@ BOOL ov9_0224A71C (FieldSystem * fieldSystem) return 0; } -BOOL ov9_0224A800 (FieldSystem * fieldSystem, int param1) +BOOL ov9_0224A800(FieldSystem *fieldSystem, int param1) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; u32 v1 = ov9_022510D0(v0); switch (v1) { case 581: if (param1 == 0) { - VarsFlags * v2 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); + VarsFlags *v2 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); if (sub_0206B5D8(v2) >= 10) { int v3, v4, v5; @@ -2220,9 +2221,9 @@ BOOL ov9_0224A800 (FieldSystem * fieldSystem, int param1) return 0; } -static BOOL ov9_0224A8A0 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4) +static BOOL ov9_0224A8A0(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4) { - const UnkStruct_ov9_0224A8A0 * v0; + const UnkStruct_ov9_0224A8A0 *v0; v0 = ov9_0224C740(param0, param1, param2, param3, param4); @@ -2234,13 +2235,13 @@ static BOOL ov9_0224A8A0 (UnkStruct_ov9_02249B04 * param0, int param1, int param return 1; } -static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224A8C0(UnkStruct_ov9_02249B04 *param0) { u32 v0, v1; int v2, v3, v4, v5; - int v6[6] = {0, 0, 0, 90, 270, 180}; - PlayerAvatar * playerAvatar = param0->fieldSystem->playerAvatar; - MapObject * v8 = Player_MapObject(playerAvatar); + int v6[6] = { 0, 0, 0, 90, 270, 180 }; + PlayerAvatar *playerAvatar = param0->fieldSystem->playerAvatar; + MapObject *v8 = Player_MapObject(playerAvatar); ov9_02250F44(param0, &v2, &v3, &v4); @@ -2289,7 +2290,7 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0) } if (v5 == 0x2) { - UnkStruct_ov101_021D5D90 * v9; + UnkStruct_ov101_021D5D90 *v9; int v10 = PlayerAvatar_GetDir(playerAvatar); v9 = ov5_021F85BC(playerAvatar, v2, v3, v4, v10, 1, v0); @@ -2299,23 +2300,23 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0) ov9_0224A390(param0, v8, v6[v0]); } -static void ov9_0224A9E8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224A9E8(UnkStruct_ov9_02249B04 *param0) { - PlayerAvatar * v0 = param0->fieldSystem->playerAvatar; + PlayerAvatar *v0 = param0->fieldSystem->playerAvatar; PlayerAvatar_SetDistortionState(v0, AVATAR_DISTORTION_STATE_NONE); PlayerAvatar_ClearSpeed(v0); } -static BOOL ov9_0224AA00 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4) +static BOOL ov9_0224AA00(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4) { { - const UnkStruct_ov9_0224AA00 * v0; + const UnkStruct_ov9_0224AA00 *v0; v0 = ov9_0224C69C(param0, param1, param2, param3, param4); if (v0) { - MapObject * v1 = Player_MapObject(param0->fieldSystem->playerAvatar); + MapObject *v1 = Player_MapObject(param0->fieldSystem->playerAvatar); Unk_ov9_02251224[v0->unk_00](param0, v0); return 1; @@ -2325,9 +2326,9 @@ static BOOL ov9_0224AA00 (UnkStruct_ov9_02249B04 * param0, int param1, int param return 0; } -static void ov9_0224AA34 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224AA00 * param1) +static void ov9_0224AA34(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_0224AA00 *param1) { - UnkStruct_ov9_0224AC58 * v0; + UnkStruct_ov9_0224AC58 *v0; v0 = ov9_0224A578(param0, sizeof(UnkStruct_ov9_0224AC58)); @@ -2336,7 +2337,7 @@ static void ov9_0224AA34 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 v0->unk_08.x = (((param1->unk_14) << 4) * FX32_ONE) / param1->unk_1C; v0->unk_08.y = (((param1->unk_16) << 4) * FX32_ONE) / param1->unk_1C; v0->unk_08.z = (((param1->unk_18) << 4) * FX32_ONE) / param1->unk_1C; - v0->unk_18 = ((FX32_ONE * 16)) / param1->unk_1C; + v0->unk_18 = (FX32_ONE * 16) / param1->unk_1C; v0->unk_28 = v0->unk_08; if (v0->unk_28.x < 0) { @@ -2354,20 +2355,18 @@ static void ov9_0224AA34 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 FieldTask_Set(param0->fieldSystem, ov9_0224AAD4, param0); } -static BOOL ov9_0224AAD4 (TaskManager * param0) +static BOOL ov9_0224AAD4(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov9_02249B04 * v1 = TaskManager_Environment(param0); - UnkStruct_ov9_0224AC58 * v2 = ov9_0224A598(v1); - PlayerAvatar * playerAvatar = fieldSystem->playerAvatar; - MapObject * v4 = Player_MapObject(playerAvatar); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov9_02249B04 *v1 = TaskManager_Environment(param0); + UnkStruct_ov9_0224AC58 *v2 = ov9_0224A598(v1); + PlayerAvatar *playerAvatar = fieldSystem->playerAvatar; + MapObject *v4 = Player_MapObject(playerAvatar); switch (v2->unk_00) { - case 0: - { + case 0: { v2->unk_00++; - } - break; + } break; case 1: if (LocalMapObj_IsAnimationSet(v4) == 0) { break; @@ -2381,27 +2380,21 @@ static BOOL ov9_0224AAD4 (TaskManager * param0) case 4: case 0: break; - case 1: - { - int v8[] = {2, 3, 0, 1}; + case 1: { + int v8[] = { 2, 3, 0, 1 }; v5 = v8[v5]; - } - break; - case 2: - { - int v9[] = {3, 2, 0, 1}; + } break; + case 2: { + int v9[] = { 3, 2, 0, 1 }; v5 = v9[v5]; - } - break; - case 3: - { - int v10[] = {1, 0, 3, 2}; + } break; + case 3: { + int v10[] = { 1, 0, 3, 2 }; v5 = v10[v5]; - } - break; + } break; } v6 = sub_02065838(v5, 0x0); @@ -2420,7 +2413,7 @@ static BOOL ov9_0224AAD4 (TaskManager * param0) { int v11 = 1; int v12 = 0; - MapObject * v13 = Player_MapObject(playerAvatar); + MapObject *v13 = Player_MapObject(playerAvatar); ov9_0224C3F8(v1, v2->unk_34.unk_26); v11 = ov9_022510D8(v2->unk_34.unk_24); @@ -2467,9 +2460,9 @@ static BOOL ov9_0224AAD4 (TaskManager * param0) return 0; } -static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, MapObject * param1) +static BOOL ov9_0224AC58(UnkStruct_ov9_0224AC58 *param0, MapObject *param1) { - const UnkStruct_ov9_0224AA00 * v0 = ¶m0->unk_34; + const UnkStruct_ov9_0224AA00 *v0 = ¶m0->unk_34; { VecFx32 v1; @@ -2537,9 +2530,9 @@ static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, MapObject * param1) { int v3; - fx32 * v4; - VecFx32 * v5 = sub_02063098(param1); - const fx32 * v6 = Unk_ov9_02252CF8; + fx32 *v4; + VecFx32 *v5 = sub_02063098(param1); + const fx32 *v6 = Unk_ov9_02252CF8; param0->unk_14 += param0->unk_18; v3 = ((param0->unk_14) / FX32_ONE); @@ -2580,15 +2573,15 @@ static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, MapObject * param1) return 0; } -static void ov9_0224ADC0 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224ADC0(UnkStruct_ov9_02249B04 *param0) { - char * v0; + char *v0; GXLayers_EngineAToggleLayers(2, 0); { - char * v1; - NNSG2dPaletteData * v2; + char *v1; + NNSG2dPaletteData *v2; v1 = NARC_AllocAndReadWholeMember(param0->unk_10, 1, 4); NNS_G2dGetUnpackedPaletteData(v1, &v2); @@ -2596,8 +2589,8 @@ static void ov9_0224ADC0 (UnkStruct_ov9_02249B04 * param0) { int v3; - UnkStruct_ov9_0224ADC0 * v4 = ¶m0->unk_1D00; - u16 * v5 = v2->pRawData; + UnkStruct_ov9_0224ADC0 *v4 = ¶m0->unk_1D00; + u16 *v5 = v2->pRawData; v5 = &v5[0 * 16]; @@ -2611,8 +2604,8 @@ static void ov9_0224ADC0 (UnkStruct_ov9_02249B04 * param0) } { - char * v6; - NNSG2dCharacterData * v7; + char *v6; + NNSG2dCharacterData *v7; v6 = NARC_AllocAndReadWholeMember(param0->unk_10, 0, 4); NNS_G2dGetUnpackedCharacterData(v6, &v7); @@ -2622,8 +2615,8 @@ static void ov9_0224ADC0 (UnkStruct_ov9_02249B04 * param0) } { - char * v8; - NNSG2dScreenData * v9; + char *v8; + NNSG2dScreenData *v9; v8 = NARC_AllocAndReadWholeMember(param0->unk_10, 2, 4); NNS_G2dGetUnpackedScreenData(v8, &v9); @@ -2649,15 +2642,15 @@ static void ov9_0224ADC0 (UnkStruct_ov9_02249B04 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov9_0224AED8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224AED8(UnkStruct_ov9_02249B04 *param0) { G2_BlendNone(); } -static void ov9_0224AEE4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B064 * param1, NARC * param2) +static void ov9_0224AEE4(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224B064 *param1, NARC *param2) { param1->unk_00 = sub_020095C4(16, ¶m1->unk_04, 4); - sub_0200962C(¶m1->unk_04, ((FX32_ONE * 0)), ((FX32_ONE * -512))); + sub_0200962C(¶m1->unk_04, (FX32_ONE * 0), (FX32_ONE * -512)); param1->unk_190 = sub_02009714(7, 0, 4); param1->unk_194 = sub_02009714(1, 1, 4); param1->unk_198 = sub_02009714(7, 2, 4); @@ -2674,14 +2667,14 @@ static void ov9_0224AEE4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B06 param1->unk_1BC[0] = sub_02009B04(param1->unk_194, param2, Unk_ov9_02251210[0], 0, (0 + 0xff), NNS_G2D_VRAM_TYPE_2DMAIN, 5, 4); { - NNSG2dPaletteData * v1; + NNSG2dPaletteData *v1; v1 = sub_02009E34(param1->unk_1BC[0]); { int v2 = 0; - UnkStruct_ov9_0224ADC0 * v3 = ¶m0->unk_1D00; - u16 * v4 = v3->unk_48; - u16 * v5 = v1->pRawData; + UnkStruct_ov9_0224ADC0 *v3 = ¶m0->unk_1D00; + u16 *v4 = v3->unk_48; + u16 *v5 = v1->pRawData; do { *v4 = *v5; @@ -2707,7 +2700,7 @@ static void ov9_0224AEE4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B06 } } -static void ov9_0224B064 (UnkStruct_ov9_0224B064 * param0) +static void ov9_0224B064(UnkStruct_ov9_0224B064 *param0) { int v0; @@ -2750,17 +2743,17 @@ static void ov9_0224B064 (UnkStruct_ov9_0224B064 * param0) sub_02021964(param0->unk_00); } -static void ov9_0224B124 (SysTask * param0, void * param1) +static void ov9_0224B124(SysTask *param0, void *param1) { - UnkStruct_ov9_0224B064 * v0 = param1; + UnkStruct_ov9_0224B064 *v0 = param1; sub_020219F8(v0->unk_00); } -static GraphicElementData * ov9_0224B130 (UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7) +static GraphicElementData *ov9_0224B130(UnkStruct_ov9_0224B064 *param0, const VecFx32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - GraphicElementData * v2; + GraphicElementData *v2; sub_020093B4(&v0, ((param2) + 0xff), ((param3) + 0xff), ((param4) + 0xff), ((param5) + 0xff), 0xffffffff, 0xffffffff, 0, param6, param0->unk_190, param0->unk_194, param0->unk_198, param0->unk_19C, NULL, NULL); @@ -2777,16 +2770,16 @@ static GraphicElementData * ov9_0224B130 (UnkStruct_ov9_0224B064 * param0, const return v2; } -static void ov9_0224B1B4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov5_021DF47C * param1, UnkStruct_ov9_0224B064 * param2) +static void ov9_0224B1B4(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov5_021DF47C *param1, UnkStruct_ov9_0224B064 *param2) { int v0; UnkStruct_ov9_0224B1B4 v1; - UnkStruct_ov101_021D5D90 * v2; + UnkStruct_ov101_021D5D90 *v2; param0->unk_1EC2 = 0; if (ov9_022510D0(param0) == 582) { - VarsFlags * v3 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v3 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); u32 v4 = sub_0206B5D8(v3); if (v4 >= 10) { @@ -2807,12 +2800,12 @@ static void ov9_0224B1B4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov5_021DF47 } } -static int ov9_0224B23C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov9_0224B23C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - VecFx32 v0 = {0, 0, 0}; - const UnkStruct_ov9_02251EC8 * v1; - const UnkStruct_ov9_0224B1B4 * v2 = sub_020715BC(param0); - UnkStruct_ov9_0224B2C0 * v3 = param1; + VecFx32 v0 = { 0, 0, 0 }; + const UnkStruct_ov9_02251EC8 *v1; + const UnkStruct_ov9_0224B1B4 *v2 = sub_020715BC(param0); + UnkStruct_ov9_0224B2C0 *v3 = param1; v3->unk_08 = *v2; v3->unk_00 = v3->unk_08.unk_04.unk_08; @@ -2825,17 +2818,17 @@ static int ov9_0224B23C (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov9_0224B2C0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224B2C0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224B2C0 * v0 = param1; + UnkStruct_ov9_0224B2C0 *v0 = param1; sub_02021BD4(v0->unk_40); } -static void ov9_0224B2CC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224B2CC(UnkStruct_ov101_021D5D90 *param0, void *param1) { fx32 v0, v1, v2; VecFx32 v3; - UnkStruct_ov9_0224B2C0 * v4 = param1; + UnkStruct_ov9_0224B2C0 *v4 = param1; v2 = Unk_ov9_02252C08[v4->unk_08.unk_00->unk_1EC2][v4->unk_08.unk_04.unk_04]; @@ -2861,15 +2854,15 @@ static void ov9_0224B2CC (UnkStruct_ov101_021D5D90 * param0, void * param1) v3 = v4->unk_08.unk_04.unk_18; - v3.x += ((FX32_ONE * 0)) + (sub_0201D1D4(((v4->unk_00) / FX32_ONE)) * v4->unk_08.unk_04.unk_10); - v3.y += ((FX32_ONE * -512)) + (sub_0201D15C(((v4->unk_00) / FX32_ONE)) * v4->unk_08.unk_04.unk_10); + v3.x += (FX32_ONE * 0) + (sub_0201D1D4((v4->unk_00) / FX32_ONE) * v4->unk_08.unk_04.unk_10); + v3.y += (FX32_ONE * -512) + (sub_0201D15C((v4->unk_00) / FX32_ONE) * v4->unk_08.unk_04.unk_10); sub_020715D4(param0, &v3); sub_02021C50(v4->unk_40, &v3); - sub_02021C94(v4->unk_40, sub_0201D2A4(((v0) / FX32_ONE))); + sub_02021C94(v4->unk_40, sub_0201D2A4((v0) / FX32_ONE)); } -static void ov9_0224B3A4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224B3A4(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } @@ -2882,9 +2875,9 @@ static const UnkStruct_ov101_021D86B0 Unk_ov9_02251508 = { ov9_0224B3A4 }; -static void ov9_0224B3A8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B3A8(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov5_021D57D8 * v0 = param0->fieldSystem->unk_48; + UnkStruct_ov5_021D57D8 *v0 = param0->fieldSystem->unk_48; ov5_021D57FC(v0, 0xffffffff, 1, GX_FOGBLEND_COLOR_ALPHA, 6, 0x7600); ov5_021D5834(v0, 0xffffffff, (GX_RGB(0, 0, 0)), 16); @@ -2902,12 +2895,12 @@ static void ov9_0224B3A8 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224B3F4 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B3F4(UnkStruct_ov9_02249B04 *param0) { return; } -static void ov9_0224B3F8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B528 * param1, const UnkStruct_ov9_0224B3F8 * param2, const UnkStruct_ov9_0224B6CC * param3, int param4, u32 param5) +static void ov9_0224B3F8(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224B528 *param1, const UnkStruct_ov9_0224B3F8 *param2, const UnkStruct_ov9_0224B6CC *param3, int param4, u32 param5) { { GF_ASSERT(param1->unk_08 == NULL); @@ -2931,18 +2924,18 @@ static void ov9_0224B3F8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B52 } } -static void ov9_0224B45C (UnkStruct_ov9_02249B04 * param0, int param1) +static void ov9_0224B45C(UnkStruct_ov9_02249B04 *param0, int param1) { int v0; - const UnkStruct_ov9_022530A4 * v1; + const UnkStruct_ov9_022530A4 *v1; v0 = ov9_022510D0(param0); v1 = ov9_0224D720(v0); if (ov9_0224C27C(param0)) { - UnkStruct_ov9_0224B528 * v2 = ¶m0->unk_171C; - const UnkStruct_ov9_0224B3F8 * v3 = ov9_0224C8AC(param0); - const UnkStruct_ov9_0224B6CC * v4 = ov9_0224C8C4(param0); + UnkStruct_ov9_0224B528 *v2 = ¶m0->unk_171C; + const UnkStruct_ov9_0224B3F8 *v3 = ov9_0224C8AC(param0); + const UnkStruct_ov9_0224B6CC *v4 = ov9_0224C8C4(param0); if ((param1 == 1) || (ov9_02249D38(param0) == 0)) { v2->unk_00 = ~v3->unk_08; @@ -2955,31 +2948,31 @@ static void ov9_0224B45C (UnkStruct_ov9_02249B04 * param0, int param1) } } -static void ov9_0224B4CC (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B4CC(UnkStruct_ov9_02249B04 *param0) { int v0; - const UnkStruct_ov9_022530A4 * v1; + const UnkStruct_ov9_022530A4 *v1; v0 = ov9_022510D0(param0); v1 = ov9_0224D720(v0); v0 = v1->unk_08; if (ov9_0224C288(param0)) { - UnkStruct_ov9_0224B528 * v2 = ¶m0->unk_1728; - const UnkStruct_ov9_0224B3F8 * v3 = ov9_0224C8B8(param0); - const UnkStruct_ov9_0224B6CC * v4 = ov9_0224C8D0(param0); + UnkStruct_ov9_0224B528 *v2 = ¶m0->unk_1728; + const UnkStruct_ov9_0224B3F8 *v3 = ov9_0224C8B8(param0); + const UnkStruct_ov9_0224B6CC *v4 = ov9_0224C8D0(param0); ov9_0224B3F8(param0, v2, v3, v4, v0, ~v3->unk_08); } } -static void ov9_0224B514 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B514(UnkStruct_ov9_02249B04 *param0) { ov9_0224B45C(param0, 0); ov9_0224B4CC(param0); } -static void ov9_0224B528 (UnkStruct_ov9_0224B528 * param0) +static void ov9_0224B528(UnkStruct_ov9_0224B528 *param0) { int v0; @@ -2997,35 +2990,35 @@ static void ov9_0224B528 (UnkStruct_ov9_0224B528 * param0) } } -static void ov9_0224B560 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B560(UnkStruct_ov9_02249B04 *param0) { ov9_0224B570(param0); ov9_0224B580(param0); } -static void ov9_0224B570 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B570(UnkStruct_ov9_02249B04 *param0) { ov9_0224B528(¶m0->unk_171C); } -static void ov9_0224B580 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B580(UnkStruct_ov9_02249B04 *param0) { ov9_0224B528(¶m0->unk_1728); } -static void ov9_0224B590 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B590(UnkStruct_ov9_02249B04 *param0) { param0->unk_171C.unk_08 = NULL; param0->unk_171C.unk_04 = 0; } -static void ov9_0224B5A0 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B5A0(UnkStruct_ov9_02249B04 *param0) { param0->unk_1728.unk_08 = NULL; param0->unk_1728.unk_04 = 0; } -static void ov9_0224B5B0 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B5B0(UnkStruct_ov9_02249B04 *param0) { GF_ASSERT(param0->unk_1728.unk_08 == NULL); GF_ASSERT(param0->unk_1728.unk_04 == 0); @@ -3033,7 +3026,7 @@ static void ov9_0224B5B0 (UnkStruct_ov9_02249B04 * param0) param0->unk_1728 = param0->unk_171C; } -static void ov9_0224B5EC (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B5EC(UnkStruct_ov9_02249B04 *param0) { GF_ASSERT(param0->unk_171C.unk_08 == NULL); GF_ASSERT(param0->unk_171C.unk_04 == 0); @@ -3041,9 +3034,9 @@ static void ov9_0224B5EC (UnkStruct_ov9_02249B04 * param0) param0->unk_171C = param0->unk_1728; } -static void ov9_0224B624 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224B624(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224B528 * v0 = ¶m0->unk_171C; + UnkStruct_ov9_0224B528 *v0 = ¶m0->unk_171C; GF_ASSERT(param1 < 24); @@ -3051,10 +3044,10 @@ static void ov9_0224B624 (UnkStruct_ov9_02249B04 * param0, u32 param1) ov9_02249D44(param0, v0->unk_00); } -static void ov9_0224B64C (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224B64C(UnkStruct_ov9_02249B04 *param0, u32 param1) { u32 v0 = ~(1 << param1); - UnkStruct_ov9_0224B528 * v1 = ¶m0->unk_171C; + UnkStruct_ov9_0224B528 *v1 = ¶m0->unk_171C; GF_ASSERT(param1 < 24); @@ -3062,39 +3055,39 @@ static void ov9_0224B64C (UnkStruct_ov9_02249B04 * param0, u32 param1) ov9_02249D44(param0, v1->unk_00); } -static BOOL ov9_0224B674 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_0224B674(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224B528 * v0 = ¶m0->unk_171C; + UnkStruct_ov9_0224B528 *v0 = ¶m0->unk_171C; GF_ASSERT(param1 < 24); - if ((v0->unk_00 & (1 << param1))) { + if (v0->unk_00 & (1 << param1)) { return 1; } return 0; } -static BOOL ov9_0224B698 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_0224B698(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224B528 * v0 = ¶m0->unk_1728; + UnkStruct_ov9_0224B528 *v0 = ¶m0->unk_1728; GF_ASSERT(param1 < 24); - if ((v0->unk_00 & (1 << param1))) { + if (v0->unk_00 & (1 << param1)) { return 1; } return 0; } -static void ov9_0224B6BC (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224B6BC(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224B528 * v0 = ¶m0->unk_171C; + UnkStruct_ov9_0224B528 *v0 = ¶m0->unk_171C; ov9_02249D44(param0, v0->unk_00); } -static void ov9_0224B6CC (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B528 * param1, const UnkStruct_ov9_0224B6CC * param2, int param3) +static void ov9_0224B6CC(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224B528 *param1, const UnkStruct_ov9_0224B6CC *param2, int param3) { if (param1->unk_04) { int v0; @@ -3105,12 +3098,12 @@ static void ov9_0224B6CC (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B52 } } -static UnkStruct_ov101_021D5D90 * ov9_0224B708 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, const UnkStruct_ov9_0224B6CC * param3) +static UnkStruct_ov101_021D5D90 *ov9_0224B708(UnkStruct_ov9_02249B04 *param0, int param1, int param2, const UnkStruct_ov9_0224B6CC *param3) { - UnkStruct_ov101_021D5D90 * v0; + UnkStruct_ov101_021D5D90 *v0; UnkStruct_ov9_0224B708 v1; - UnkStruct_ov9_0224B528 * v2 = ¶m0->unk_171C; - const UnkStruct_ov101_021D86B0 * v3 = Unk_ov9_02252F6C[param3->unk_04]; + UnkStruct_ov9_0224B528 *v2 = ¶m0->unk_171C; + const UnkStruct_ov101_021D86B0 *v3 = Unk_ov9_02252F6C[param3->unk_04]; v1.unk_00 = param1; v1.unk_02 = param2; @@ -3122,14 +3115,14 @@ static UnkStruct_ov101_021D5D90 * ov9_0224B708 (UnkStruct_ov9_02249B04 * param0, return v0; } -static void ov9_0224B748 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4) +static void ov9_0224B748(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4) { if (ov9_0224C27C(param0)) { - const UnkStruct_ov9_0224B3F8 * v0 = ov9_0224C8AC(param0); + const UnkStruct_ov9_0224B3F8 *v0 = ov9_0224C8AC(param0); if (v0->unk_04) { int v1 = v0->unk_04; - const UnkStruct_ov9_0224B748 * v2; + const UnkStruct_ov9_0224B748 *v2; v2 = ov9_0224C8DC(param0); @@ -3150,12 +3143,12 @@ static void ov9_0224B748 (UnkStruct_ov9_02249B04 * param0, int param1, int param } } -static BOOL ov9_0224B7B0 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_0224B7B0(UnkStruct_ov9_02249B04 *param0, u32 param1) { int v0; u16 v1; - const UnkStruct_ov9_022531D0 * v2; - UnkStruct_ov9_0224B528 * v3 = ¶m0->unk_171C; + const UnkStruct_ov9_022531D0 *v2; + UnkStruct_ov9_0224B528 *v3 = ¶m0->unk_171C; GF_ASSERT(param1 != 25); @@ -3186,12 +3179,12 @@ static BOOL ov9_0224B7B0 (UnkStruct_ov9_02249B04 * param0, u32 param1) return 0; } -static BOOL ov9_0224B844 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_0224B844(UnkStruct_ov9_02249B04 *param0, u32 param1) { int v0; u16 v1; - const UnkStruct_ov9_022531D0 * v2; - UnkStruct_ov9_0224B528 * v3 = ¶m0->unk_171C; + const UnkStruct_ov9_022531D0 *v2; + UnkStruct_ov9_0224B528 *v3 = ¶m0->unk_171C; GF_ASSERT(param1 != 5); @@ -3222,12 +3215,12 @@ static BOOL ov9_0224B844 (UnkStruct_ov9_02249B04 * param0, u32 param1) return 0; } -static BOOL ov9_0224B8DC (UnkStruct_ov9_02249B04 * param0, int param1) +static BOOL ov9_0224B8DC(UnkStruct_ov9_02249B04 *param0, int param1) { int v0; u16 v1; - const UnkStruct_ov9_022531D0 * v2; - UnkStruct_ov9_0224B528 * v3 = ¶m0->unk_171C; + const UnkStruct_ov9_022531D0 *v2; + UnkStruct_ov9_0224B528 *v3 = ¶m0->unk_171C; for (v0 = 0; v0 < v3->unk_04; v0++) { if (sub_020714F0(v3->unk_08[v0]) == 1) { @@ -3254,17 +3247,17 @@ static BOOL ov9_0224B8DC (UnkStruct_ov9_02249B04 * param0, int param1) return 0; } -static u16 ov9_0224B958 (UnkStruct_ov101_021D5D90 * param0) +static u16 ov9_0224B958(UnkStruct_ov101_021D5D90 *param0) { return (u16)sub_020715C4(param0); } -static int ov9_0224B964 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov9_0224B964(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov9_0224B6CC * v1; - UnkStruct_ov9_0224BA48 * v2 = param1; - const UnkStruct_ov9_0224B708 * v3 = sub_020715BC(param0); + UnkStruct_ov9_0224B6CC *v1; + UnkStruct_ov9_0224BA48 *v2 = param1; + const UnkStruct_ov9_0224B708 *v3 = sub_020715BC(param0); v2->unk_28 = *v3; v1 = &v2->unk_28.unk_08; @@ -3298,27 +3291,27 @@ static int ov9_0224B964 (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v5; - const VecFx32 * v6 = &Unk_ov9_02253298[v1->unk_04]; + const VecFx32 *v6 = &Unk_ov9_02253298[v1->unk_04]; v2->unk_10.x += v6->x; v2->unk_10.y += v6->y; v2->unk_10.z += v6->z; } - v2->unk_04 = LCRNG_Next() % ((FX32_ONE * 8)); + v2->unk_04 = LCRNG_Next() % (FX32_ONE * 8); v2->unk_08 = 0x800; - if ((v2->unk_04 & 0x1)) { + if (v2->unk_04 & 0x1) { v2->unk_08 = -v2->unk_08; } return 1; } -static void ov9_0224BA48 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224BA48(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224BA48 * v0 = param1; - UnkStruct_ov9_0224B708 * v1 = &v0->unk_28; + UnkStruct_ov9_0224BA48 *v0 = param1; + UnkStruct_ov9_0224B708 *v1 = &v0->unk_28; if (ov9_0224DAEC(v1->unk_08.unk_04) == 1) { sub_02073AA8(&v0->unk_40->unk_58); @@ -3338,22 +3331,23 @@ static const fx32 Unk_ov9_022521E4[8] = { -0x6000 }; -static void ov9_0224BA6C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224BA6C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - const fx32 * v0; - UnkStruct_ov9_0224BA48 * v1 = param1; - UnkStruct_ov9_0224B708 * v2 = &v1->unk_28; - UnkStruct_ov9_0224B6CC * v3 = &v2->unk_08; + const fx32 *v0; + UnkStruct_ov9_0224BA48 *v1 = param1; + UnkStruct_ov9_0224B708 *v2 = &v1->unk_28; + UnkStruct_ov9_0224B6CC *v3 = &v2->unk_08; u32 v4 = 0, v5 = ov9_022510D0(v2->unk_14); if ((v2->unk_08.unk_04 == 0) && (v5 == v2->unk_02)) { int v6 = 0; int v7 = ((v2->unk_08.unk_08) * 2); - const MapObjectManager * v8 = v2->unk_14->fieldSystem->mapObjMan; - MapObject * v9; + const MapObjectManager *v8 = v2->unk_14->fieldSystem->mapObjMan; + MapObject *v9; while (sub_020625B0( - v8, &v9, &v6, (1 << 0)) == 1) { + v8, &v9, &v6, (1 << 0)) + == 1) { if (MapObject_GetYPos(v9) == v7) { if (MapObject_GetZPos(v9) == v2->unk_08.unk_0A) { if (MapObject_GetXPos(v9) == v2->unk_08.unk_06) { @@ -3377,8 +3371,8 @@ static void ov9_0224BA6C (UnkStruct_ov101_021D5D90 * param0, void * param1) if (v1->unk_04 < 0) { v1->unk_04 = 0; v1->unk_08 = 0x800; - } else if (v1->unk_04 >= ((FX32_ONE * 8))) { - v1->unk_04 = ((FX32_ONE * 8)) - 0x800; + } else if (v1->unk_04 >= (FX32_ONE * 8)) { + v1->unk_04 = (FX32_ONE * 8) - 0x800; v1->unk_08 = -0x800; } @@ -3417,28 +3411,28 @@ static void ov9_0224BA6C (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov9_0224BBDC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224BBDC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224BA48 * v0 = param1; + UnkStruct_ov9_0224BA48 *v0 = param1; if (v0->unk_02 == 0) { return; } if (v0->unk_00 > 0) { - UnkStruct_ov9_0224B708 * v1 = &v0->unk_28; + UnkStruct_ov9_0224B708 *v1 = &v0->unk_28; ov9_0224DAAC(v1->unk_14, v1->unk_08.unk_04, v0->unk_00); sub_02073BB4(&v0->unk_40->unk_04, &v0->unk_1C); } } -static int ov9_0224BC08 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov9_0224BC08(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov9_0224B6CC * v1; - UnkStruct_ov9_0224BC08 * v2 = param1; - const UnkStruct_ov9_0224B708 * v3 = sub_020715BC(param0); + UnkStruct_ov9_0224B6CC *v1; + UnkStruct_ov9_0224BC08 *v2 = param1; + const UnkStruct_ov9_0224B708 *v3 = sub_020715BC(param0); v2->unk_20 = *v3; v1 = &v2->unk_20.unk_08; @@ -3481,7 +3475,7 @@ static int ov9_0224BC08 (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v5; - const VecFx32 * v6 = &Unk_ov9_02253298[v1->unk_04]; + const VecFx32 *v6 = &Unk_ov9_02253298[v1->unk_04]; v2->unk_08.x += v6->x; v2->unk_08.y += v6->y; @@ -3491,10 +3485,10 @@ static int ov9_0224BC08 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov9_0224BCF4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224BCF4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224BC08 * v0 = param1; - UnkStruct_ov9_0224B708 * v1 = &v0->unk_20; + UnkStruct_ov9_0224BC08 *v0 = param1; + UnkStruct_ov9_0224B708 *v1 = &v0->unk_20; if (ov9_0224DAEC(v1->unk_08.unk_04) == 1) { sub_02073AA8(&v0->unk_38->unk_58); @@ -3503,11 +3497,11 @@ static void ov9_0224BCF4 (UnkStruct_ov101_021D5D90 * param0, void * param1) ov9_0224D938(v1->unk_14, v0->unk_38); } -static void ov9_0224BD18 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224BD18(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224BC08 * v0 = param1; - UnkStruct_ov9_0224B708 * v1 = &v0->unk_20; - UnkStruct_ov9_0224B6CC * v2 = &v1->unk_08; + UnkStruct_ov9_0224BC08 *v0 = param1; + UnkStruct_ov9_0224B708 *v1 = &v0->unk_20; + UnkStruct_ov9_0224B6CC *v2 = &v1->unk_08; { BOOL v3; @@ -3566,26 +3560,26 @@ static void ov9_0224BD18 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov9_0224BDE8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224BDE8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224BC08 * v0 = param1; + UnkStruct_ov9_0224BC08 *v0 = param1; if (v0->unk_02 == 0) { return; } if (v0->unk_00 > 0) { - UnkStruct_ov9_0224B708 * v1 = &v0->unk_20; + UnkStruct_ov9_0224B708 *v1 = &v0->unk_20; ov9_0224DAAC(v1->unk_14, v1->unk_08.unk_04, v0->unk_00); sub_02073BB4(&v0->unk_38->unk_04, &v0->unk_08); } } -static void ov9_0224BE14 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224BE14(UnkStruct_ov9_02249B04 *param0) { int v0; - const UnkStruct_ov9_022530A4 * v1; + const UnkStruct_ov9_022530A4 *v1; v0 = ov9_022510D0(param0); v1 = ov9_0224D720(v0); @@ -3609,7 +3603,7 @@ static void ov9_0224BE14 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224BE8C (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224BE8C(UnkStruct_ov9_02249B04 *param0) { ov9_0224C724(param0); ov9_0224C680(param0); @@ -3619,7 +3613,7 @@ static void ov9_0224BE8C (UnkStruct_ov9_02249B04 * param0) ov9_0224BFFC(param0); } -static void ov9_0224BEB4 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224BEB4(UnkStruct_ov9_02249B04 *param0, u32 param1) { ov9_0224C844(param0); ov9_0224C184(param0); @@ -3638,7 +3632,7 @@ static void ov9_0224BEB4 (UnkStruct_ov9_02249B04 * param0, u32 param1) ov9_0224C7C8(param0); } -static void ov9_0224BF18 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224BF18(UnkStruct_ov9_02249B04 *param0, u32 param1) { ov9_0224C724(param0); ov9_0224C680(param0); @@ -3661,7 +3655,7 @@ static void ov9_0224BF18 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static void ov9_0224BF8C (NARC * param0, UnkStruct_ov9_0224BFE0 * param1) +static void ov9_0224BF8C(NARC *param0, UnkStruct_ov9_0224BFE0 *param1) { u32 v0 = NARC_GetMemberSize(param0, 0); @@ -3674,13 +3668,13 @@ static void ov9_0224BF8C (NARC * param0, UnkStruct_ov9_0224BFE0 * param1) (u8 *)param1->unk_04 += 4; } -static void ov9_0224BFBC (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224BFBC(UnkStruct_ov9_02249B04 *param0) { GF_ASSERT(param0->unk_169C.unk_00.unk_08 == NULL); ov9_0224BF8C(param0->unk_08, ¶m0->unk_169C.unk_00); } -static void ov9_0224BFE0 (UnkStruct_ov9_0224BFE0 * param0) +static void ov9_0224BFE0(UnkStruct_ov9_0224BFE0 *param0) { GF_ASSERT(param0->unk_08 != NULL); @@ -3688,15 +3682,15 @@ static void ov9_0224BFE0 (UnkStruct_ov9_0224BFE0 * param0) param0->unk_08 = NULL; } -static void ov9_0224BFFC (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224BFFC(UnkStruct_ov9_02249B04 *param0) { ov9_0224BFE0(¶m0->unk_169C.unk_00); } -static const UnkStruct_ov9_0224C034 * ov9_0224C00C (const UnkStruct_ov9_0224BFE0 * param0, int param1) +static const UnkStruct_ov9_0224C034 *ov9_0224C00C(const UnkStruct_ov9_0224BFE0 *param0, int param1) { int v0 = 0; - const UnkStruct_ov9_0224C034 * v1 = param0->unk_04; + const UnkStruct_ov9_0224C034 *v1 = param0->unk_04; while (v0 < param0->unk_00) { if (param1 == v1->unk_00) { @@ -3712,20 +3706,20 @@ static const UnkStruct_ov9_0224C034 * ov9_0224C00C (const UnkStruct_ov9_0224BFE0 return NULL; } -static const UnkStruct_ov9_0224C034 * ov9_0224C034 (UnkStruct_ov9_02249B04 * param0, int param1) +static const UnkStruct_ov9_0224C034 *ov9_0224C034(UnkStruct_ov9_02249B04 *param0, int param1) { return ov9_0224C00C(¶m0->unk_169C.unk_00, param1); } -static u32 ov9_0224C044 (UnkStruct_ov9_02249B04 * param0, int param1) +static u32 ov9_0224C044(UnkStruct_ov9_02249B04 *param0, int param1) { - const UnkStruct_ov9_0224C034 * v0 = ov9_0224C034(param0, param1); + const UnkStruct_ov9_0224C034 *v0 = ov9_0224C034(param0, param1); return v0->unk_04 + (0 + 1); } -static void ov9_0224C050 (const UnkStruct_ov9_0224BFE0 * param0, int param1, int * param2, int * param3, int * param4) +static void ov9_0224C050(const UnkStruct_ov9_0224BFE0 *param0, int param1, int *param2, int *param3, int *param4) { - const UnkStruct_ov9_0224C034 * v0; + const UnkStruct_ov9_0224C034 *v0; v0 = ov9_0224C00C(param0, param1); @@ -3734,12 +3728,12 @@ static void ov9_0224C050 (const UnkStruct_ov9_0224BFE0 * param0, int param1, int *param4 = v0->unk_0A; } -static void ov9_0224C070 (UnkStruct_ov9_02249B04 * param0, int param1, int * param2, int * param3, int * param4) +static void ov9_0224C070(UnkStruct_ov9_02249B04 *param0, int param1, int *param2, int *param3, int *param4) { ov9_0224C050(¶m0->unk_169C.unk_00, param1, param2, param3, param4); } -static void ov9_0224C088 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224C14C * param1, int param2) +static void ov9_0224C088(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224C14C *param1, int param2) { GF_ASSERT(param1->unk_18 == NULL); @@ -3747,9 +3741,9 @@ static void ov9_0224C088 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224C14 param1->unk_00 = param2; if (param2 != 593) { - u8 * v0; + u8 *v0; u32 v1, v2; - UnkStruct_ov9_0224C088 * v3; + UnkStruct_ov9_0224C088 *v3; v2 = ov9_0224C044(param0, param2); v1 = NARC_GetMemberSize(param0->unk_08, v2); @@ -3770,29 +3764,29 @@ static void ov9_0224C088 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224C14 } } -static void ov9_0224C0F8 (UnkStruct_ov9_02249B04 * param0, int param1, int param2) +static void ov9_0224C0F8(UnkStruct_ov9_02249B04 *param0, int param1, int param2) { ov9_0224C10C(param0, param1); ov9_0224C120(param0, param2); } -static void ov9_0224C10C (UnkStruct_ov9_02249B04 * param0, int param1) +static void ov9_0224C10C(UnkStruct_ov9_02249B04 *param0, int param1) { ov9_0224C088(param0, ¶m0->unk_169C.unk_0C, param1); } -static void ov9_0224C120 (UnkStruct_ov9_02249B04 * param0, int param1) +static void ov9_0224C120(UnkStruct_ov9_02249B04 *param0, int param1) { ov9_0224C088(param0, ¶m0->unk_169C.unk_58, param1); } -static void ov9_0224C134 (UnkStruct_ov9_0224C14C * param0) +static void ov9_0224C134(UnkStruct_ov9_0224C14C *param0) { memset(param0, 0, sizeof(UnkStruct_ov9_0224C14C)); param0->unk_00 = 593; } -static void ov9_0224C14C (UnkStruct_ov9_0224C14C * param0) +static void ov9_0224C14C(UnkStruct_ov9_0224C14C *param0) { if (param0->unk_18 != NULL) { Heap_FreeToHeap(param0->unk_18); @@ -3801,23 +3795,23 @@ static void ov9_0224C14C (UnkStruct_ov9_0224C14C * param0) ov9_0224C134(param0); } -static void ov9_0224C164 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C164(UnkStruct_ov9_02249B04 *param0) { ov9_0224C174(param0); ov9_0224C184(param0); } -static void ov9_0224C174 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C174(UnkStruct_ov9_02249B04 *param0) { ov9_0224C14C(¶m0->unk_169C.unk_0C); } -static void ov9_0224C184 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C184(UnkStruct_ov9_02249B04 *param0) { ov9_0224C14C(¶m0->unk_169C.unk_58); } -static void ov9_0224C194 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C194(UnkStruct_ov9_02249B04 *param0) { GF_ASSERT(param0->unk_169C.unk_58.unk_00 == 593); GF_ASSERT(param0->unk_169C.unk_58.unk_18 == NULL); @@ -3827,7 +3821,7 @@ static void ov9_0224C194 (UnkStruct_ov9_02249B04 * param0) ov9_0224C134(¶m0->unk_169C.unk_0C); } -static void ov9_0224C1E4 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C1E4(UnkStruct_ov9_02249B04 *param0) { GF_ASSERT(param0->unk_169C.unk_0C.unk_00 == 593); GF_ASSERT(param0->unk_169C.unk_0C.unk_18 == NULL); @@ -3836,127 +3830,127 @@ static void ov9_0224C1E4 (UnkStruct_ov9_02249B04 * param0) ov9_0224C134(¶m0->unk_169C.unk_58); } -static int ov9_0224C234 (UnkStruct_ov9_0224C14C * param0) +static int ov9_0224C234(UnkStruct_ov9_0224C14C *param0) { - UnkStruct_ov9_0224C088 * v0 = param0->unk_14; + UnkStruct_ov9_0224C088 *v0 = param0->unk_14; return v0->unk_04; } -static int ov9_0224C23C (UnkStruct_ov9_0224C14C * param0) +static int ov9_0224C23C(UnkStruct_ov9_0224C14C *param0) { - int * v0 = param0->unk_04; + int *v0 = param0->unk_04; return *v0; } -static UnkStruct_ov9_0224C324 * ov9_0224C244 (UnkStruct_ov9_0224C14C * param0) +static UnkStruct_ov9_0224C324 *ov9_0224C244(UnkStruct_ov9_0224C14C *param0) { - u8 * v0 = param0->unk_04; + u8 *v0 = param0->unk_04; v0 += 4; return (UnkStruct_ov9_0224C324 *)v0; } -static int ov9_0224C24C (UnkStruct_ov9_0224C14C * param0) +static int ov9_0224C24C(UnkStruct_ov9_0224C14C *param0) { - UnkStruct_ov9_0224C088 * v0 = param0->unk_14; + UnkStruct_ov9_0224C088 *v0 = param0->unk_14; return v0->unk_08; } -static int ov9_0224C254 (UnkStruct_ov9_0224C14C * param0) +static int ov9_0224C254(UnkStruct_ov9_0224C14C *param0) { - int * v0 = param0->unk_08; + int *v0 = param0->unk_08; return *v0; } -static UnkStruct_ov9_0224AA00 * ov9_0224C25C (UnkStruct_ov9_0224C14C * param0) +static UnkStruct_ov9_0224AA00 *ov9_0224C25C(UnkStruct_ov9_0224C14C *param0) { - u8 * v0 = param0->unk_08; + u8 *v0 = param0->unk_08; v0 += 4; return (UnkStruct_ov9_0224AA00 *)v0; } -static int ov9_0224C264 (UnkStruct_ov9_0224C14C * param0) +static int ov9_0224C264(UnkStruct_ov9_0224C14C *param0) { - UnkStruct_ov9_0224C088 * v0 = param0->unk_14; + UnkStruct_ov9_0224C088 *v0 = param0->unk_14; return v0->unk_0C; } -static int ov9_0224C26C (UnkStruct_ov9_0224C14C * param0) +static int ov9_0224C26C(UnkStruct_ov9_0224C14C *param0) { - int * v0 = param0->unk_0C; + int *v0 = param0->unk_0C; return *v0; } -static UnkStruct_ov9_0224A8A0 * ov9_0224C274 (UnkStruct_ov9_0224C14C * param0) +static UnkStruct_ov9_0224A8A0 *ov9_0224C274(UnkStruct_ov9_0224C14C *param0) { - u8 * v0 = param0->unk_0C; + u8 *v0 = param0->unk_0C; v0 += 4; return (UnkStruct_ov9_0224A8A0 *)v0; } -static int ov9_0224C27C (UnkStruct_ov9_02249B04 * param0) +static int ov9_0224C27C(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C14C * v0 = ¶m0->unk_169C.unk_0C; - UnkStruct_ov9_0224C088 * v1 = v0->unk_14; + UnkStruct_ov9_0224C14C *v0 = ¶m0->unk_169C.unk_0C; + UnkStruct_ov9_0224C088 *v1 = v0->unk_14; return v1->unk_10; } -static int ov9_0224C288 (UnkStruct_ov9_02249B04 * param0) +static int ov9_0224C288(UnkStruct_ov9_02249B04 *param0) { int v0 = 0; - UnkStruct_ov9_0224C14C * v1 = ¶m0->unk_169C.unk_58; + UnkStruct_ov9_0224C14C *v1 = ¶m0->unk_169C.unk_58; if (v1->unk_00 != 593) { - UnkStruct_ov9_0224C088 * v2 = v1->unk_14; + UnkStruct_ov9_0224C088 *v2 = v1->unk_14; v0 = v2->unk_10; } return v0; } -static const UnkStruct_ov9_0224B3F8 * ov9_0224C2A8 (UnkStruct_ov9_0224C14C * param0) +static const UnkStruct_ov9_0224B3F8 *ov9_0224C2A8(UnkStruct_ov9_0224C14C *param0) { - UnkStruct_ov9_0224B3F8 * v0 = param0->unk_10; + UnkStruct_ov9_0224B3F8 *v0 = param0->unk_10; return v0; } -static const UnkStruct_ov9_0224B6CC * ov9_0224C2AC (UnkStruct_ov9_0224C14C * param0) +static const UnkStruct_ov9_0224B6CC *ov9_0224C2AC(UnkStruct_ov9_0224C14C *param0) { - const u8 * v0 = param0->unk_10; + const u8 *v0 = param0->unk_10; v0 += sizeof(UnkStruct_ov9_0224B3F8); return (UnkStruct_ov9_0224B6CC *)v0; } -static const UnkStruct_ov9_0224B748 * ov9_0224C2B4 (UnkStruct_ov9_0224C14C * param0) +static const UnkStruct_ov9_0224B748 *ov9_0224C2B4(UnkStruct_ov9_0224C14C *param0) { - const UnkStruct_ov9_0224B3F8 * v0 = param0->unk_10; - const u8 * v1 = param0->unk_10; + const UnkStruct_ov9_0224B3F8 *v0 = param0->unk_10; + const u8 *v1 = param0->unk_10; v1 += sizeof(UnkStruct_ov9_0224B3F8) + (sizeof(UnkStruct_ov9_0224B6CC) * v0->unk_00); return (UnkStruct_ov9_0224B748 *)v1; } -static void ov9_0224C2C4 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C2C4(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C14C * v0 = ¶m0->unk_169C.unk_0C; + UnkStruct_ov9_0224C14C *v0 = ¶m0->unk_169C.unk_0C; GF_ASSERT(param0->unk_169C.unk_28.unk_08 == NULL); if (ov9_0224C234(v0)) { - UnkStruct_ov9_0224C2C4 * v1 = ¶m0->unk_169C.unk_28; + UnkStruct_ov9_0224C2C4 *v1 = ¶m0->unk_169C.unk_28; v1->unk_04 = ov9_0224C23C(v0); v1->unk_08 = ov9_0224C244(v0); } } -static void ov9_0224C300 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C300(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C2C4 * v0 = ¶m0->unk_169C.unk_28; + UnkStruct_ov9_0224C2C4 *v0 = ¶m0->unk_169C.unk_28; if (v0->unk_10 != NULL) { Heap_FreeToHeap(v0->unk_10); @@ -3965,10 +3959,10 @@ static void ov9_0224C300 (UnkStruct_ov9_02249B04 * param0) memset(v0, 0, sizeof(UnkStruct_ov9_0224C2C4)); } -static BOOL ov9_0224C324 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, s16 param4) +static BOOL ov9_0224C324(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, s16 param4) { - UnkStruct_ov9_0224C2C4 * v0 = ¶m0->unk_169C.unk_28; - const UnkStruct_ov9_0224C324 * v1 = v0->unk_08; + UnkStruct_ov9_0224C2C4 *v0 = ¶m0->unk_169C.unk_28; + const UnkStruct_ov9_0224C324 *v1 = v0->unk_08; int v2 = 0, v3 = v0->unk_04; if (v3 == 0) { @@ -3989,10 +3983,10 @@ static BOOL ov9_0224C324 (UnkStruct_ov9_02249B04 * param0, int param1, int param return 0; } -static void ov9_0224C378 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, s16 param4) +static void ov9_0224C378(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, s16 param4) { - UnkStruct_ov9_0224C2C4 * v0 = ¶m0->unk_169C.unk_28; - const UnkStruct_ov9_0224C324 * v1 = v0->unk_08; + UnkStruct_ov9_0224C2C4 *v0 = ¶m0->unk_169C.unk_28; + const UnkStruct_ov9_0224C324 *v1 = v0->unk_08; int v2 = 0, v3 = v0->unk_04; v0->unk_00 = v3; @@ -4022,10 +4016,10 @@ static void ov9_0224C378 (UnkStruct_ov9_02249B04 * param0, int param1, int param } while (v2 < v3); } -static void ov9_0224C3F8 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224C3F8(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224C2C4 * v0 = ¶m0->unk_169C.unk_28; - const UnkStruct_ov9_0224C324 * v1 = v0->unk_08; + UnkStruct_ov9_0224C2C4 *v0 = ¶m0->unk_169C.unk_28; + const UnkStruct_ov9_0224C324 *v1 = v0->unk_08; int v2 = 0, v3 = v0->unk_04; v0->unk_00 = v3; @@ -4046,9 +4040,9 @@ static void ov9_0224C3F8 (UnkStruct_ov9_02249B04 * param0, u32 param1) ov9_0224C4F4(param0, v1[param1].unk_02); } -static void ov9_0224C44C (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C44C(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C2C4 * v0 = ¶m0->unk_169C.unk_28; + UnkStruct_ov9_0224C2C4 *v0 = ¶m0->unk_169C.unk_28; v0->unk_00 = v0->unk_04; ov9_02249E20(param0, v0->unk_04); @@ -4059,10 +4053,10 @@ static void ov9_0224C44C (UnkStruct_ov9_02249B04 * param0) } } -static u32 ov9_0224C470 (UnkStruct_ov9_02249B04 * param0) +static u32 ov9_0224C470(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C2C4 * v0 = ¶m0->unk_169C.unk_28; - const UnkStruct_ov9_0224C324 * v1 = v0->unk_08; + UnkStruct_ov9_0224C2C4 *v0 = ¶m0->unk_169C.unk_28; + const UnkStruct_ov9_0224C324 *v1 = v0->unk_08; int v2 = 0, v3 = v0->unk_04; if ((v0->unk_04 == 0) || (v0->unk_00 >= v0->unk_04)) { @@ -4070,14 +4064,14 @@ static u32 ov9_0224C470 (UnkStruct_ov9_02249B04 * param0) } { - UnkStruct_ov9_0224C324 * v4 = &v0->unk_08[v0->unk_00]; + UnkStruct_ov9_0224C324 *v4 = &v0->unk_08[v0->unk_00]; return v4->unk_00; } } -static u32 ov9_0224C494 (UnkStruct_ov9_02249B04 * param0) +static u32 ov9_0224C494(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C2C4 * v0 = ¶m0->unk_169C.unk_28; + UnkStruct_ov9_0224C2C4 *v0 = ¶m0->unk_169C.unk_28; int v1 = v0->unk_04; if ((v0->unk_04 == 0) || (v0->unk_00 >= v0->unk_04)) { @@ -4085,14 +4079,14 @@ static u32 ov9_0224C494 (UnkStruct_ov9_02249B04 * param0) } { - const UnkStruct_ov9_0224C324 * v2 = &v0->unk_08[v0->unk_00]; + const UnkStruct_ov9_0224C324 *v2 = &v0->unk_08[v0->unk_00]; return v2->unk_00; } } -static u32 ov9_0224C4B8 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3) +static u32 ov9_0224C4B8(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3) { - UnkStruct_ov9_0224C2C4 * v0 = ¶m0->unk_169C.unk_28; + UnkStruct_ov9_0224C2C4 *v0 = ¶m0->unk_169C.unk_28; int v1 = v0->unk_04; if ((v0->unk_04 == 0) || (v0->unk_00 >= v0->unk_04)) { @@ -4100,7 +4094,7 @@ static u32 ov9_0224C4B8 (UnkStruct_ov9_02249B04 * param0, int param1, int param2 } { - const UnkStruct_ov9_0224C324 * v2 = &v0->unk_08[v0->unk_00]; + const UnkStruct_ov9_0224C324 *v2 = &v0->unk_08[v0->unk_00]; if (ov9_02250E6C(param1, param2, param3, &v2->unk_04) == 0) { return 0; @@ -4110,9 +4104,9 @@ static u32 ov9_0224C4B8 (UnkStruct_ov9_02249B04 * param0, int param1, int param2 } } -static void ov9_0224C4F4 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224C4F4(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224C2C4 * v0 = ¶m0->unk_169C.unk_28; + UnkStruct_ov9_0224C2C4 *v0 = ¶m0->unk_169C.unk_28; if (v0->unk_10 != NULL) { Heap_FreeToHeap(v0->unk_10); @@ -4124,11 +4118,11 @@ static void ov9_0224C4F4 (UnkStruct_ov9_02249B04 * param0, u32 param1) NARC_ReadWholeMember(param0->unk_0C, param1, v0->unk_10); } -static u16 ov9_0224C52C (UnkStruct_ov9_02249B04 * param0, int param1, int param2) +static u16 ov9_0224C52C(UnkStruct_ov9_02249B04 *param0, int param1, int param2) { u16 v0; - UnkStruct_ov9_0224C2C4 * v1 = ¶m0->unk_169C.unk_28; - const UnkStruct_ov9_0224C324 * v2 = &v1->unk_08[v1->unk_00]; + UnkStruct_ov9_0224C2C4 *v1 = ¶m0->unk_169C.unk_28; + const UnkStruct_ov9_0224C324 *v2 = &v1->unk_08[v1->unk_00]; GF_ASSERT(v1->unk_10 != NULL); v0 = v1->unk_10[param1 + (param2 * v2->unk_10)]; @@ -4136,18 +4130,18 @@ static u16 ov9_0224C52C (UnkStruct_ov9_02249B04 * param0, int param1, int param2 return v0; } -static u16 ov9_0224C55C (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3) +static u16 ov9_0224C55C(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3) { u16 v0; int v1 = 0, v2 = 0; - UnkStruct_ov9_0224C2C4 * v3 = ¶m0->unk_169C.unk_28; + UnkStruct_ov9_0224C2C4 *v3 = ¶m0->unk_169C.unk_28; if ((v3->unk_04 == 0) || (v3->unk_00 >= v3->unk_04)) { return 65535; } { - UnkStruct_ov9_0224C324 * v4 = &v3->unk_08[v3->unk_00]; + UnkStruct_ov9_0224C324 *v4 = &v3->unk_08[v3->unk_00]; if (ov9_02250E6C(param1, param2, param3, &v4->unk_04) == 0) { return 65534; @@ -4182,30 +4176,30 @@ static u16 ov9_0224C55C (UnkStruct_ov9_02249B04 * param0, int param1, int param2 } } -static void ov9_0224C640 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C640(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C14C * v0 = ¶m0->unk_169C.unk_0C; + UnkStruct_ov9_0224C14C *v0 = ¶m0->unk_169C.unk_0C; GF_ASSERT(param0->unk_169C.unk_3C.unk_04 == NULL); if (ov9_0224C24C(v0)) { - UnkStruct_ov9_0224C640 * v1 = ¶m0->unk_169C.unk_3C; + UnkStruct_ov9_0224C640 *v1 = ¶m0->unk_169C.unk_3C; v1->unk_00 = ov9_0224C254(v0); v1->unk_04 = ov9_0224C25C(v0); } } -static void ov9_0224C680 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C680(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C640 * v0 = ¶m0->unk_169C.unk_3C; + UnkStruct_ov9_0224C640 *v0 = ¶m0->unk_169C.unk_3C; memset(v0, 0, sizeof(UnkStruct_ov9_0224C640)); } -static const UnkStruct_ov9_0224AA00 * ov9_0224C69C (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4) +static const UnkStruct_ov9_0224AA00 *ov9_0224C69C(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4) { - UnkStruct_ov9_0224C640 * v0 = ¶m0->unk_169C.unk_3C; - UnkStruct_ov9_0224AA00 * v1 = v0->unk_04; + UnkStruct_ov9_0224C640 *v0 = ¶m0->unk_169C.unk_3C; + UnkStruct_ov9_0224AA00 *v1 = v0->unk_04; int v2 = v0->unk_00; while (v2) { @@ -4222,30 +4216,30 @@ static const UnkStruct_ov9_0224AA00 * ov9_0224C69C (UnkStruct_ov9_02249B04 * par return NULL; } -static void ov9_0224C6E4 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C6E4(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C14C * v0 = ¶m0->unk_169C.unk_0C; + UnkStruct_ov9_0224C14C *v0 = ¶m0->unk_169C.unk_0C; GF_ASSERT(param0->unk_169C.unk_44.unk_04 == NULL); if (ov9_0224C264(v0)) { - UnkStruct_ov9_0224C6E4 * v1 = ¶m0->unk_169C.unk_44; + UnkStruct_ov9_0224C6E4 *v1 = ¶m0->unk_169C.unk_44; v1->unk_00 = ov9_0224C26C(v0); v1->unk_04 = ov9_0224C274(v0); } } -static void ov9_0224C724 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C724(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C6E4 * v0 = ¶m0->unk_169C.unk_44; + UnkStruct_ov9_0224C6E4 *v0 = ¶m0->unk_169C.unk_44; memset(v0, 0, sizeof(UnkStruct_ov9_0224C6E4)); } -static const UnkStruct_ov9_0224A8A0 * ov9_0224C740 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4) +static const UnkStruct_ov9_0224A8A0 *ov9_0224C740(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4) { - UnkStruct_ov9_0224C6E4 * v0 = ¶m0->unk_169C.unk_44; - UnkStruct_ov9_0224A8A0 * v1 = v0->unk_04; + UnkStruct_ov9_0224C6E4 *v0 = ¶m0->unk_169C.unk_44; + UnkStruct_ov9_0224A8A0 *v1 = v0->unk_04; int v2 = v0->unk_00; while (v2) { @@ -4262,7 +4256,7 @@ static const UnkStruct_ov9_0224A8A0 * ov9_0224C740 (UnkStruct_ov9_02249B04 * par return NULL; } -static void ov9_0224C788 (UnkStruct_ov9_0224C14C * param0, UnkStruct_ov9_0224C788 * param1) +static void ov9_0224C788(UnkStruct_ov9_0224C14C *param0, UnkStruct_ov9_0224C788 *param1) { GF_ASSERT(param1->unk_00 == NULL); GF_ASSERT(param1->unk_04 == NULL); @@ -4273,103 +4267,103 @@ static void ov9_0224C788 (UnkStruct_ov9_0224C14C * param0, UnkStruct_ov9_0224C78 param1->unk_08 = ov9_0224C2B4(param0); } -static void ov9_0224C7C8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C7C8(UnkStruct_ov9_02249B04 *param0) { if (ov9_0224C27C(param0)) { - UnkStruct_ov9_0224C14C * v0 = ¶m0->unk_169C.unk_0C; - UnkStruct_ov9_0224C788 * v1 = ¶m0->unk_169C.unk_4C; + UnkStruct_ov9_0224C14C *v0 = ¶m0->unk_169C.unk_0C; + UnkStruct_ov9_0224C788 *v1 = ¶m0->unk_169C.unk_4C; ov9_0224C788(v0, v1); } } -static void ov9_0224C7E8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C7E8(UnkStruct_ov9_02249B04 *param0) { if (ov9_0224C288(param0)) { - UnkStruct_ov9_0224C14C * v0 = ¶m0->unk_169C.unk_58; - UnkStruct_ov9_0224C788 * v1 = ¶m0->unk_169C.unk_74; + UnkStruct_ov9_0224C14C *v0 = ¶m0->unk_169C.unk_58; + UnkStruct_ov9_0224C788 *v1 = ¶m0->unk_169C.unk_74; ov9_0224C788(v0, v1); } } -static void ov9_0224C808 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C808(UnkStruct_ov9_02249B04 *param0) { ov9_0224C7C8(param0); ov9_0224C7E8(param0); } -static void ov9_0224C818 (UnkStruct_ov9_0224C788 * param0) +static void ov9_0224C818(UnkStruct_ov9_0224C788 *param0) { memset(param0, 0, sizeof(UnkStruct_ov9_0224C788)); } -static void ov9_0224C834 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C834(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C788 * v0 = ¶m0->unk_169C.unk_4C; + UnkStruct_ov9_0224C788 *v0 = ¶m0->unk_169C.unk_4C; ov9_0224C818(v0); } -static void ov9_0224C844 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C844(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C788 * v0 = ¶m0->unk_169C.unk_74; + UnkStruct_ov9_0224C788 *v0 = ¶m0->unk_169C.unk_74; ov9_0224C818(v0); } -static void ov9_0224C854 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C854(UnkStruct_ov9_02249B04 *param0) { ov9_0224C834(param0); ov9_0224C844(param0); } -static void ov9_0224C864 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C864(UnkStruct_ov9_02249B04 *param0) { param0->unk_169C.unk_74 = param0->unk_169C.unk_4C; ov9_0224C818(¶m0->unk_169C.unk_4C); } -static void ov9_0224C888 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C888(UnkStruct_ov9_02249B04 *param0) { param0->unk_169C.unk_4C = param0->unk_169C.unk_74; ov9_0224C818(¶m0->unk_169C.unk_74); } -static const UnkStruct_ov9_0224B3F8 * ov9_0224C8AC (UnkStruct_ov9_02249B04 * param0) +static const UnkStruct_ov9_0224B3F8 *ov9_0224C8AC(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C788 * v0 = ¶m0->unk_169C.unk_4C; + UnkStruct_ov9_0224C788 *v0 = ¶m0->unk_169C.unk_4C; return v0->unk_00; } -static const UnkStruct_ov9_0224B3F8 * ov9_0224C8B8 (UnkStruct_ov9_02249B04 * param0) +static const UnkStruct_ov9_0224B3F8 *ov9_0224C8B8(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C788 * v0 = ¶m0->unk_169C.unk_74; + UnkStruct_ov9_0224C788 *v0 = ¶m0->unk_169C.unk_74; return v0->unk_00; } -static const UnkStruct_ov9_0224B6CC * ov9_0224C8C4 (UnkStruct_ov9_02249B04 * param0) +static const UnkStruct_ov9_0224B6CC *ov9_0224C8C4(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C788 * v0 = ¶m0->unk_169C.unk_4C; + UnkStruct_ov9_0224C788 *v0 = ¶m0->unk_169C.unk_4C; return v0->unk_04; } -static const UnkStruct_ov9_0224B6CC * ov9_0224C8D0 (UnkStruct_ov9_02249B04 * param0) +static const UnkStruct_ov9_0224B6CC *ov9_0224C8D0(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C788 * v0 = ¶m0->unk_169C.unk_74; + UnkStruct_ov9_0224C788 *v0 = ¶m0->unk_169C.unk_74; return v0->unk_04; } -static const UnkStruct_ov9_0224B748 * ov9_0224C8DC (UnkStruct_ov9_02249B04 * param0) +static const UnkStruct_ov9_0224B748 *ov9_0224C8DC(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C788 * v0 = ¶m0->unk_169C.unk_4C; + UnkStruct_ov9_0224C788 *v0 = ¶m0->unk_169C.unk_4C; return v0->unk_08; } -static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C8E8(UnkStruct_ov9_02249B04 *param0) { int v0, v1; - UnkStruct_ov9_0224C8E8 * v2 = ¶m0->unk_1E88; - FieldSystem * fieldSystem = param0->fieldSystem; - const UnkStruct_ov9_022530A4 * v4, * v5; + UnkStruct_ov9_0224C8E8 *v2 = ¶m0->unk_1E88; + FieldSystem *fieldSystem = param0->fieldSystem; + const UnkStruct_ov9_022530A4 *v4, *v5; v0 = ov9_022510D0(param0); v4 = ov9_0224D720(v0); @@ -4392,7 +4386,7 @@ static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0) } { - NARC * v6 = ov5_021E9828(fieldSystem->unk_28); + NARC *v6 = ov5_021E9828(fieldSystem->unk_28); v2->unk_18 = ov5_021E9830(v2->unk_10, v2->unk_14, v6); ov5_021E931C(PlayerAvatar_PosVector(fieldSystem->playerAvatar), v2->unk_18); @@ -4422,7 +4416,7 @@ static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0) if (ov9_02249D38(param0) == 0) { VecFx32 v12, v13; - MapObject * v14 = Player_MapObject(fieldSystem->playerAvatar); + MapObject *v14 = Player_MapObject(fieldSystem->playerAvatar); MapObject_PosVectorOut(v14, &v13); ov5_021EA6BC(fieldSystem->unk_28, &v12); @@ -4435,9 +4429,9 @@ static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224C9E8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224C9E8(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C8E8 * v0 = ¶m0->unk_1E88; + UnkStruct_ov9_0224C8E8 *v0 = ¶m0->unk_1E88; if (v0->unk_04) { ov5_021E9338(v0->unk_18); @@ -4461,28 +4455,28 @@ static void ov9_0224C9E8 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224CA30 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224CA30(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224C8E8 * v0 = ¶m0->unk_1E88; + UnkStruct_ov9_0224C8E8 *v0 = ¶m0->unk_1E88; if (v0->unk_08) { ov5_021E9C0C(v0->unk_18, param0->fieldSystem->unk_44); } } -void ov9_0224CA50 (FieldSystem * fieldSystem) +void ov9_0224CA50(FieldSystem *fieldSystem) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; ov9_0224CA30(v0); } -void ov9_0224CA5C (FieldSystem * fieldSystem) +void ov9_0224CA5C(FieldSystem *fieldSystem) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; - UnkStruct_ov9_0224C8E8 * v1 = &v0->unk_1E88; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_0224C8E8 *v1 = &v0->unk_1E88; { - UnkStruct_ov9_0224CA5C * v2 = &v0->unk_1CB0; + UnkStruct_ov9_0224CA5C *v2 = &v0->unk_1CB0; if (v2->unk_00 == 1) { ov9_0224CB30(v0); @@ -4496,10 +4490,10 @@ void ov9_0224CA5C (FieldSystem * fieldSystem) } } -static void ov9_0224CA98 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224CA98(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224CA5C * v0 = ¶m0->unk_1CB0; - UnkStruct_ov9_0224C8E8 * v1 = ¶m0->unk_1E88; + UnkStruct_ov9_0224CA5C *v0 = ¶m0->unk_1CB0; + UnkStruct_ov9_0224C8E8 *v1 = ¶m0->unk_1E88; switch (v0->unk_01) { case 0: @@ -4537,11 +4531,11 @@ static void ov9_0224CA98 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224CB30 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224CB30(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224CA5C * v0 = ¶m0->unk_1CB0; - UnkStruct_ov9_0224C8E8 * v1 = ¶m0->unk_1E88; - FieldSystem * fieldSystem = param0->fieldSystem; + UnkStruct_ov9_0224CA5C *v0 = ¶m0->unk_1CB0; + UnkStruct_ov9_0224C8E8 *v1 = ¶m0->unk_1E88; + FieldSystem *fieldSystem = param0->fieldSystem; switch (v0->unk_01) { case 0: @@ -4578,10 +4572,10 @@ static void ov9_0224CB30 (UnkStruct_ov9_02249B04 * param0) } } -static int(*const Unk_ov9_022514E0[5])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224CBD8 *); -static int(*const Unk_ov9_02251428[4])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224CBD8 *); +static int (*const Unk_ov9_022514E0[5])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224CBD8 *); +static int (*const Unk_ov9_02251428[4])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224CBD8 *); -static void ov9_0224CBBC (UnkStruct_ov5_021E8F60 * param0, BOOL param1) +static void ov9_0224CBBC(UnkStruct_ov5_021E8F60 *param0, BOOL param1) { int v0 = 0; @@ -4590,27 +4584,27 @@ static void ov9_0224CBBC (UnkStruct_ov5_021E8F60 * param0, BOOL param1) } while (v0 < 4); } -static void ov9_0224CBD8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224CBD8(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224CBD8 * v0 = ¶m0->unk_1CD0; + UnkStruct_ov9_0224CBD8 *v0 = ¶m0->unk_1CD0; v0->unk_00 = 0; v0->unk_2C = SysTask_Start(ov9_0224CC08, param0, 1); } -static void ov9_0224CBF8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224CBF8(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224CBD8 * v0 = ¶m0->unk_1CD0; + UnkStruct_ov9_0224CBD8 *v0 = ¶m0->unk_1CD0; SysTask_Done(v0->unk_2C); } -static void ov9_0224CC08 (SysTask * param0, void * param1) +static void ov9_0224CC08(SysTask *param0, void *param1) { - UnkStruct_ov9_02249B04 * v0 = param1; - UnkStruct_ov9_0224CBD8 * v1 = &v0->unk_1CD0; + UnkStruct_ov9_02249B04 *v0 = param1; + UnkStruct_ov9_0224CBD8 *v1 = &v0->unk_1CD0; - int(*const * v2)(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224CBD8 *) = NULL; + int (*const *v2)(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224CBD8 *) = NULL; if (v1->unk_00 == 2) { v2 = Unk_ov9_022514E0; @@ -4631,14 +4625,14 @@ static void ov9_0224CC08 (SysTask * param0, void * param1) } } -static void ov9_0224CC4C (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224CC4C(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224CBD8 * v0 = ¶m0->unk_1CD0; + UnkStruct_ov9_0224CBD8 *v0 = ¶m0->unk_1CD0; } -static void ov9_0224CC50 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, u32 param2) +static void ov9_0224CC50(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1, u32 param2) { - UnkStruct_ov9_0224CBD8 * v0 = ¶m0->unk_1CD0; + UnkStruct_ov9_0224CBD8 *v0 = ¶m0->unk_1CD0; GF_ASSERT(v0->unk_00 == 0); GF_ASSERT(param2 != 0); @@ -4649,9 +4643,9 @@ static void ov9_0224CC50 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D v0->unk_28 = param1; } -static BOOL ov9_0224CC7C (UnkStruct_ov9_02249B04 * param0) +static BOOL ov9_0224CC7C(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224CBD8 * v0 = ¶m0->unk_1CD0; + UnkStruct_ov9_0224CBD8 *v0 = ¶m0->unk_1CD0; if (v0->unk_00 != 0) { return 1; @@ -4660,7 +4654,7 @@ static BOOL ov9_0224CC7C (UnkStruct_ov9_02249B04 * param0) return 0; } -static int ov9_0224CC90 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1) +static int ov9_0224CC90(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 *param1) { ov9_0224CBBC(param0->fieldSystem->unk_28, 0); ov9_02249BD4(param0, ov9_022510D0(param0)); @@ -4669,11 +4663,11 @@ static int ov9_0224CC90 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 return 0; } -static int ov9_0224CCB8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1) +static int ov9_0224CCB8(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 *param1) { - FieldSystem * fieldSystem = param0->fieldSystem; - UnkStruct_ov9_0224C8E8 * v1 = ¶m0->unk_1E88; - const UnkStruct_ov9_022530A4 * v2; + FieldSystem *fieldSystem = param0->fieldSystem; + UnkStruct_ov9_0224C8E8 *v1 = ¶m0->unk_1E88; + const UnkStruct_ov9_022530A4 *v2; v2 = ov9_0224D720(ov9_022510D0(param0)); GF_ASSERT(v2->unk_08 != 593); @@ -4710,12 +4704,12 @@ static int ov9_0224CCB8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 return 0; } -static int ov9_0224CD84 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1) +static int ov9_0224CD84(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 *param1) { if (param1->unk_20 == 0) { int v0, v1, v2; - NARC * v3; - UnkStruct_ov9_0224C8E8 * v4 = ¶m0->unk_1E88; + NARC *v3; + UnkStruct_ov9_0224C8E8 *v4 = ¶m0->unk_1E88; v3 = ov5_021E9828(param0->fieldSystem->unk_28); ov5_021E98C8(v4->unk_18, v4->unk_10, v4->unk_14, v3); @@ -4733,9 +4727,9 @@ static int ov9_0224CD84 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 return 0; } -static int ov9_0224CE00 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1) +static int ov9_0224CE00(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 *param1) { - UnkStruct_ov9_0224C8E8 * v0 = ¶m0->unk_1E88; + UnkStruct_ov9_0224C8E8 *v0 = ¶m0->unk_1E88; ov5_021E9B10(v0->unk_18, param1->unk_06, param1->unk_10[param1->unk_06]); @@ -4748,10 +4742,10 @@ static int ov9_0224CE00 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 return 0; } -static int ov9_0224CE2C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1) +static int ov9_0224CE2C(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 *param1) { - const UnkStruct_ov9_022530A4 * v0; - UnkStruct_ov9_0224C8E8 * v1 = ¶m0->unk_1E88; + const UnkStruct_ov9_022530A4 *v0; + UnkStruct_ov9_0224C8E8 *v1 = ¶m0->unk_1E88; if (v1->unk_00 != 593) { v1->unk_08 = 1; @@ -4769,7 +4763,7 @@ static int ov9_0224CE2C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 return 2; } -static int(*const Unk_ov9_022514E0[5])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224CBD8 *) = { +static int (*const Unk_ov9_022514E0[5])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224CBD8 *) = { ov9_0224CC90, ov9_0224CCB8, ov9_0224CD84, @@ -4777,10 +4771,10 @@ static int(*const Unk_ov9_022514E0[5])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0 ov9_0224CE2C }; -static int ov9_0224CE80 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1) +static int ov9_0224CE80(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 *param1) { - const UnkStruct_ov9_022530A4 * v0; - UnkStruct_ov9_0224C8E8 * v1 = ¶m0->unk_1E88; + const UnkStruct_ov9_022530A4 *v0; + UnkStruct_ov9_0224C8E8 *v1 = ¶m0->unk_1E88; v1->unk_08 = 0; @@ -4795,11 +4789,11 @@ static int ov9_0224CE80 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 return 0; } -static int ov9_0224CEBC (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1) +static int ov9_0224CEBC(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 *param1) { - FieldSystem * fieldSystem = param0->fieldSystem; - UnkStruct_ov9_0224C8E8 * v1 = ¶m0->unk_1E88; - const UnkStruct_ov9_022530A4 * v2; + FieldSystem *fieldSystem = param0->fieldSystem; + UnkStruct_ov9_0224C8E8 *v1 = ¶m0->unk_1E88; + const UnkStruct_ov9_022530A4 *v2; v2 = ov9_0224D720(ov9_022510D0(param0)); GF_ASSERT(v2->unk_04 != 593); @@ -4819,7 +4813,7 @@ static int ov9_0224CEBC (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 } if (v1->unk_04 == 0) { - NARC * v3 = ov5_021E9828(fieldSystem->unk_28); + NARC *v3 = ov5_021E9828(fieldSystem->unk_28); v1->unk_18 = ov5_021E9830(NULL, v1->unk_14, v3); ov5_021E7A54(v1->unk_18); @@ -4859,9 +4853,9 @@ static int ov9_0224CEBC (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 return 0; } -static int ov9_0224CFE0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1) +static int ov9_0224CFE0(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 *param1) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; ov5_021EA5E0(fieldSystem->unk_28, param1->unk_06, param1->unk_10[param1->unk_06]); @@ -4874,9 +4868,9 @@ static int ov9_0224CFE0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 return 0; } -static int ov9_0224D008 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 * param1) +static int ov9_0224D008(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224CBD8 *param1) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; ov5_021EA6F4(fieldSystem->unk_28, param1->unk_08, param1->unk_0A); ov9_02249C60(param0, param1->unk_0C); @@ -4890,16 +4884,16 @@ static int ov9_0224D008 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8 return 2; } -static int(*const Unk_ov9_02251428[4])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224CBD8 *) = { +static int (*const Unk_ov9_02251428[4])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224CBD8 *) = { ov9_0224CE80, ov9_0224CEBC, ov9_0224CFE0, ov9_0224D008 }; -static BOOL ov9_0224D040 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3) +static BOOL ov9_0224D040(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3) { - UnkStruct_ov9_0224E0DC * v0; + UnkStruct_ov9_0224E0DC *v0; v0 = ov9_0224E188(param0, param1, param2, param3, ov9_022510D0(param0)); @@ -4915,11 +4909,11 @@ static BOOL ov9_0224D040 (UnkStruct_ov9_02249B04 * param0, int param1, int param return 0; } -static int(*const Unk_ov9_02252224[8])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224D078 *); +static int (*const Unk_ov9_02252224[8])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224D078 *); -static void ov9_0224D078 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1) +static void ov9_0224D078(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1) { - UnkStruct_ov9_0224D078 * v0; + UnkStruct_ov9_0224D078 *v0; v0 = ov9_0224A578(param0, sizeof(UnkStruct_ov9_0224D078)); v0->unk_64 = param1; @@ -4927,11 +4921,11 @@ static void ov9_0224D078 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D FieldTask_Set(param0->fieldSystem, ov9_0224D098, param0); } -static BOOL ov9_0224D098 (TaskManager * param0) +static BOOL ov9_0224D098(TaskManager *param0) { int v0; - UnkStruct_ov9_02249B04 * v1 = TaskManager_Environment(param0); - UnkStruct_ov9_0224D078 * v2 = ov9_0224A598(v1); + UnkStruct_ov9_02249B04 *v1 = TaskManager_Environment(param0); + UnkStruct_ov9_0224D078 *v2 = ov9_0224A598(v1); do { v0 = Unk_ov9_02252224[v2->unk_04](v1, v2); @@ -4944,12 +4938,12 @@ static BOOL ov9_0224D098 (TaskManager * param0) return 0; } -static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) +static int ov9_0224D0C8(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D078 *param1) { u32 v0; - MapObject * v1; - const UnkStruct_ov9_022530A4 * v2; - const UnkStruct_ov9_02253830 * v3; + MapObject *v1; + const UnkStruct_ov9_022530A4 *v2; + const UnkStruct_ov9_02253830 *v3; param1->unk_00 = param1->unk_64->unk_04.unk_0A; param1->unk_02 = param1->unk_64->unk_04.unk_08; @@ -4961,7 +4955,7 @@ static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 param1->unk_06 = v2->unk_08; { - VarsFlags * v4 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v4 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); u16 v5 = sub_0206B5D8(v4); if ((v0 == 573) && (v5 == 2)) { @@ -5016,7 +5010,7 @@ static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 param1->unk_08 = v3->unk_02; if (param1->unk_01 == 0) { - VecFx32 v6, * v7; + VecFx32 v6, *v7; param1->unk_5C = (FX32_ONE * 6); sub_0206309C(v1, &v6); @@ -5044,12 +5038,12 @@ static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 return 0; } -static int ov9_0224D288 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) +static int ov9_0224D288(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D078 *param1) { VecFx32 v0; - PlayerAvatar * playerAvatar = param0->fieldSystem->playerAvatar; - MapObject * v2 = Player_MapObject(playerAvatar); - VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20); + PlayerAvatar *playerAvatar = param0->fieldSystem->playerAvatar; + MapObject *v2 = Player_MapObject(playerAvatar); + VecFx32 *v3 = ov9_0224E330(param1->unk_64->unk_20); sub_0206309C(v2, &v0); @@ -5105,12 +5099,12 @@ static int ov9_0224D288 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 return 0; } -static int ov9_0224D374 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) +static int ov9_0224D374(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D078 *param1) { int v0; - PlayerAvatar * playerAvatar = param0->fieldSystem->playerAvatar; - MapObject * v2 = Player_MapObject(playerAvatar); - VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20); + PlayerAvatar *playerAvatar = param0->fieldSystem->playerAvatar; + MapObject *v2 = Player_MapObject(playerAvatar); + VecFx32 *v3 = ov9_0224E330(param1->unk_64->unk_20); if (param1->unk_44.x != param1->unk_2C.x) { param1->unk_44.x += param1->unk_20.x; @@ -5148,7 +5142,7 @@ static int ov9_0224D374 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 return 0; } -static int ov9_0224D430 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) +static int ov9_0224D430(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D078 *param1) { ov9_0224E0DC(param1->unk_64, 1); @@ -5187,12 +5181,12 @@ static int ov9_0224D430 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 return 0; } -static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) +static int ov9_0224D4C4(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D078 *param1) { int v0; - PlayerAvatar * playerAvatar = param0->fieldSystem->playerAvatar; - MapObject * v2 = Player_MapObject(playerAvatar); - VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20); + PlayerAvatar *playerAvatar = param0->fieldSystem->playerAvatar; + MapObject *v2 = Player_MapObject(playerAvatar); + VecFx32 *v3 = ov9_0224E330(param1->unk_64->unk_20); if (param1->unk_44.x != param1->unk_2C.x) { param1->unk_44.x += param1->unk_20.x; @@ -5227,7 +5221,7 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 sub_020057A4(1481, 0); param1->unk_04 = 5; } else { - MapObject * v5 = Player_MapObject(param0->fieldSystem->playerAvatar); + MapObject *v5 = Player_MapObject(param0->fieldSystem->playerAvatar); MapObject_SetX(v5, param1->unk_0A); MapObject_SetY(v5, param1->unk_0C); @@ -5240,7 +5234,7 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 } { - UnkStruct_ov9_0224E0DC * v6 = param1->unk_64; + UnkStruct_ov9_0224E0DC *v6 = param1->unk_64; v6->unk_04.unk_08 = param1->unk_08; sub_020629B4(v6->unk_1C, v6->unk_04.unk_08, 2); @@ -5255,10 +5249,10 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 return 0; } -static int ov9_0224D5E8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) +static int ov9_0224D5E8(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D078 *param1) { if (ov9_0224CC7C(param0) == 0) { - MapObject * v0 = Player_MapObject(param0->fieldSystem->playerAvatar); + MapObject *v0 = Player_MapObject(param0->fieldSystem->playerAvatar); MapObject_SetX(v0, param1->unk_0A); MapObject_SetY(v0, param1->unk_0C); @@ -5281,7 +5275,7 @@ static int ov9_0224D5E8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 } if ((param1->unk_06 == 577) && (param1->unk_00 == 1) && (param1->unk_64->unk_04.unk_00 == 1)) { - VarsFlags * v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); if (sub_0206B6DC(v1) == 0) { param1->unk_04 = 6; @@ -5296,33 +5290,33 @@ static int ov9_0224D5E8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 } static const MapObjectAnimCmd Unk_ov9_02251378[] = { - {0xf, 0x2}, - {0xC, 0x4}, - {0xfe, 0x0} + { 0xf, 0x2 }, + { 0xC, 0x4 }, + { 0xfe, 0x0 } }; static const MapObjectAnimCmd Unk_ov9_0225136C[] = { - {0xf, 0x1}, - {0xC, 0x4}, - {0xfe, 0x0} + { 0xf, 0x1 }, + { 0xC, 0x4 }, + { 0xfe, 0x0 } }; static const MapObjectAnimCmd Unk_ov9_02251350[] = { - {0xC, 0x4}, - {0xfe, 0x0} + { 0xC, 0x4 }, + { 0xfe, 0x0 } }; -static const MapObjectAnimCmd * const Unk_ov9_02251384[3] = { +static const MapObjectAnimCmd *const Unk_ov9_02251384[3] = { Unk_ov9_02251378, Unk_ov9_0225136C, Unk_ov9_02251350 }; -static int ov9_0224D69C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) +static int ov9_0224D69C(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D078 *param1) { int v0; - MapObject * v1; - const MapObjectAnimCmd * v2; + MapObject *v1; + const MapObjectAnimCmd *v2; v1 = MapObjMan_LocalMapObjByIndex(param0->fieldSystem->mapObjMan, (0x80 + 6)); GF_ASSERT(v1 != NULL); @@ -5337,11 +5331,11 @@ static int ov9_0224D69C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 return 0; } -static int ov9_0224D6E0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1) +static int ov9_0224D6E0(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D078 *param1) { if (MapObject_HasAnimationEnded(param1->unk_6C) == 1) { - VarsFlags * v0; - MapObject * v1; + VarsFlags *v0; + MapObject *v1; MapObject_FinishAnimation(param1->unk_6C); v1 = MapObjMan_LocalMapObjByIndex(param0->fieldSystem->mapObjMan, (0x80 + 6)); @@ -5356,7 +5350,7 @@ static int ov9_0224D6E0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 return 0; } -static int(*const Unk_ov9_02252224[8])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224D078 *) = { +static int (*const Unk_ov9_02252224[8])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0224D078 *) = { ov9_0224D0C8, ov9_0224D288, ov9_0224D374, @@ -5367,10 +5361,10 @@ static int(*const Unk_ov9_02252224[8])(UnkStruct_ov9_02249B04 *, UnkStruct_ov9_0 ov9_0224D6E0 }; -static const UnkStruct_ov9_022530A4 * ov9_0224D720 (int param0) +static const UnkStruct_ov9_022530A4 *ov9_0224D720(int param0) { int v0 = 0; - const UnkStruct_ov9_022530A4 * v1 = Unk_ov9_022530A4; + const UnkStruct_ov9_022530A4 *v1 = Unk_ov9_022530A4; while (v0 < 10) { if (v1->unk_00 == param0) { @@ -5385,10 +5379,10 @@ static const UnkStruct_ov9_022530A4 * ov9_0224D720 (int param0) return NULL; } -static void ov9_0224D744 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224D744(UnkStruct_ov9_02249B04 *param0) { int v0; - UnkStruct_ov9_0224D744 * v1 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v1 = ¶m0->unk_3A4; memset((u8 *)v1, 0, sizeof(UnkStruct_ov9_0224D744)); @@ -5401,9 +5395,9 @@ static void ov9_0224D744 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224D780 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224D780(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224D744 * v0 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v0 = ¶m0->unk_3A4; GF_ASSERT(param1 < 25); @@ -5413,9 +5407,9 @@ static void ov9_0224D780 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static void ov9_0224D7C0 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224D7C0(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224D744 * v0 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v0 = ¶m0->unk_3A4; GF_ASSERT(param1 < 25); @@ -5425,9 +5419,9 @@ static void ov9_0224D7C0 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static UnkStruct_02073838 * ov9_0224D7EC (UnkStruct_ov9_02249B04 * param0, u32 param1) +static UnkStruct_02073838 *ov9_0224D7EC(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224D744 * v0 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v0 = ¶m0->unk_3A4; GF_ASSERT(param1 < 25); GF_ASSERT(v0->unk_00[param1].unk_00 != 25); @@ -5435,9 +5429,9 @@ static UnkStruct_02073838 * ov9_0224D7EC (UnkStruct_ov9_02249B04 * param0, u32 p return &v0->unk_00[param1].unk_04; } -static void ov9_0224D814 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224D814(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224D744 * v0 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v0 = ¶m0->unk_3A4; GF_ASSERT(param1 < 5); @@ -5451,9 +5445,9 @@ static void ov9_0224D814 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static void ov9_0224D874 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224D874(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224D744 * v0 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v0 = ¶m0->unk_3A4; GF_ASSERT(param1 < 5); @@ -5463,11 +5457,11 @@ static void ov9_0224D874 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static UnkStruct_ov9_0224D928 * ov9_0224D8A4 (UnkStruct_ov9_02249B04 * param0, u32 param1, int * param2) +static UnkStruct_ov9_0224D928 *ov9_0224D8A4(UnkStruct_ov9_02249B04 *param0, u32 param1, int *param2) { int v0; BOOL v1; - UnkStruct_ov9_0224D744 * v2 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v2 = ¶m0->unk_3A4; v1 = ov9_0224DB04(param1); @@ -5495,13 +5489,13 @@ static UnkStruct_ov9_0224D928 * ov9_0224D8A4 (UnkStruct_ov9_02249B04 * param0, u return NULL; } -static void ov9_0224D928 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D928 * param1) +static void ov9_0224D928(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D928 *param1) { GF_ASSERT(param1 != NULL); param1->unk_00 = 0; } -static void ov9_0224D938 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D928 * param1) +static void ov9_0224D938(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224D928 *param1) { BOOL v0; @@ -5512,10 +5506,10 @@ static void ov9_0224D938 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D92 } } -static void ov9_0224D954 (UnkStruct_ov9_02249B04 * param0, int param1) +static void ov9_0224D954(UnkStruct_ov9_02249B04 *param0, int param1) { int v0; - UnkStruct_ov9_0224D744 * v1 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v1 = ¶m0->unk_3A4; for (v0 = 0; v0 < 34; v0++) { if (v1->unk_280[v0].unk_00 && (v1->unk_280[v0].unk_02 == param1)) { @@ -5524,10 +5518,10 @@ static void ov9_0224D954 (UnkStruct_ov9_02249B04 * param0, int param1) } } -static void ov9_0224D994 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224D994(UnkStruct_ov9_02249B04 *param0) { int v0; - UnkStruct_ov9_0224D744 * v1 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v1 = ¶m0->unk_3A4; for (v0 = 0; v0 < 25; v0++) { ov9_0224D7C0(param0, v0); @@ -5538,9 +5532,9 @@ static void ov9_0224D994 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224D9BC (UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param2, UnkStruct_02073B50 * param3, UnkStruct_02073974 * param4) +static void ov9_0224D9BC(UnkStruct_ov9_02249B04 *param0, u32 param1, u32 param2, UnkStruct_02073B50 *param3, UnkStruct_02073974 *param4) { - UnkStruct_ov9_0224D744 * v0 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v0 = ¶m0->unk_3A4; if (param1 != 25) { if (v0->unk_00[param1].unk_00 == 25) { @@ -5562,17 +5556,17 @@ static void ov9_0224D9BC (UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param } } -static void ov9_0224DA48 (UnkStruct_ov9_02249B04 * param0, int param1, UnkStruct_02073B50 * param2, UnkStruct_02073974 * param3) +static void ov9_0224DA48(UnkStruct_ov9_02249B04 *param0, int param1, UnkStruct_02073B50 *param2, UnkStruct_02073974 *param3) { - const UnkStruct_ov9_022531D0 * v0 = &Unk_ov9_022531D0[param1]; + const UnkStruct_ov9_022531D0 *v0 = &Unk_ov9_022531D0[param1]; ov9_0224D9BC(param0, v0->unk_00, v0->unk_02, param2, param3); } -static void ov9_0224DA64 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3) +static void ov9_0224DA64(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3) { - const UnkStruct_ov9_022531D0 * v0 = &Unk_ov9_022531D0[param1]; + const UnkStruct_ov9_022531D0 *v0 = &Unk_ov9_022531D0[param1]; int v1 = v0->unk_00; - UnkStruct_ov9_0224D744 * v2 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v2 = ¶m0->unk_3A4; NNS_G3dMdlUseMdlAlpha(v2->unk_00[v1].unk_04.unk_0C); NNS_G3dMdlSetMdlAlphaAll(v2->unk_00[v1].unk_04.unk_0C, param2); @@ -5583,16 +5577,16 @@ static void ov9_0224DA64 (UnkStruct_ov9_02249B04 * param0, int param1, int param } } -static void ov9_0224DAAC (UnkStruct_ov9_02249B04 * param0, int param1, int param2) +static void ov9_0224DAAC(UnkStruct_ov9_02249B04 *param0, int param1, int param2) { ov9_0224DA64(param0, param1, param2, -1); } -static void ov9_0224DAB8 (UnkStruct_ov9_02249B04 * param0, int param1, int param2) +static void ov9_0224DAB8(UnkStruct_ov9_02249B04 *param0, int param1, int param2) { - const UnkStruct_ov9_022531D0 * v0 = &Unk_ov9_022531D0[param1]; + const UnkStruct_ov9_022531D0 *v0 = &Unk_ov9_022531D0[param1]; int v1 = v0->unk_00; - UnkStruct_ov9_0224D744 * v2 = ¶m0->unk_3A4; + UnkStruct_ov9_0224D744 *v2 = ¶m0->unk_3A4; GF_ASSERT(v2->unk_00[v1].unk_00 < 25); param2 &= 0x3f; @@ -5600,9 +5594,9 @@ static void ov9_0224DAB8 (UnkStruct_ov9_02249B04 * param0, int param1, int param NNS_G3dMdlSetMdlPolygonIDAll(v2->unk_00[v1].unk_04.unk_0C, param2); } -static BOOL ov9_0224DAEC (int param0) +static BOOL ov9_0224DAEC(int param0) { - const UnkStruct_ov9_022531D0 * v0 = &Unk_ov9_022531D0[param0]; + const UnkStruct_ov9_022531D0 *v0 = &Unk_ov9_022531D0[param0]; if (v0->unk_02 != 5) { return 1; @@ -5611,9 +5605,9 @@ static BOOL ov9_0224DAEC (int param0) return 0; } -static BOOL ov9_0224DB04 (int param0) +static BOOL ov9_0224DB04(int param0) { - const UnkStruct_ov9_022531D0 * v0 = &Unk_ov9_022531D0[param0]; + const UnkStruct_ov9_022531D0 *v0 = &Unk_ov9_022531D0[param0]; if (v0->unk_04 == 1) { return 1; @@ -5622,7 +5616,7 @@ static BOOL ov9_0224DB04 (int param0) return 0; } -static void ov9_0224DB1C (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224DB1C(UnkStruct_ov9_02249B04 *param0) { int v0; @@ -5645,17 +5639,17 @@ static void ov9_0224DB1C (UnkStruct_ov9_02249B04 * param0) } } -static BOOL ov9_0224DBE4 (UnkStruct_ov9_02249B04 * param0, int param1, VecFx32 * param2) +static BOOL ov9_0224DBE4(UnkStruct_ov9_02249B04 *param0, int param1, VecFx32 *param2) { - const VecFx32 * v0 = &Unk_ov9_022533C4[param1]; + const VecFx32 *v0 = &Unk_ov9_022533C4[param1]; if (v0->x == 0) { return 1; } { - const UnkStruct_ov9_022531D0 * v1 = &Unk_ov9_022531D0[param1]; - UnkStruct_02073838 * v2 = ov9_0224D7EC(param0, v1->unk_00); + const UnkStruct_ov9_022531D0 *v1 = &Unk_ov9_022531D0[param1]; + UnkStruct_02073838 *v2 = ov9_0224D7EC(param0, v1->unk_00); MtxFx33 v3; MTX_Identity33(&v3); @@ -5668,16 +5662,16 @@ static BOOL ov9_0224DBE4 (UnkStruct_ov9_02249B04 * param0, int param1, VecFx32 * return 0; } -static void ov9_0224DC34 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224DC34(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224DC34 * v0 = ¶m0->unk_1734; + UnkStruct_ov9_0224DC34 *v0 = ¶m0->unk_1734; memset(v0, 0, sizeof(UnkStruct_ov9_0224DC34)); } -static void ov9_0224DC4C (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224DC4C(UnkStruct_ov9_02249B04 *param0) { int v0; - UnkStruct_ov9_0224DC34 * v1 = ¶m0->unk_1734; + UnkStruct_ov9_0224DC34 *v1 = ¶m0->unk_1734; for (v0 = 0; v0 < 32; v0++) { if (v1->unk_00[v0].unk_00) { @@ -5686,10 +5680,10 @@ static void ov9_0224DC4C (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224DC74 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224DC74(UnkStruct_ov9_02249B04 *param0, u32 param1) { int v0; - UnkStruct_ov9_0224DC34 * v1 = ¶m0->unk_1734; + UnkStruct_ov9_0224DC34 *v1 = ¶m0->unk_1734; for (v0 = 0; v0 < 32; v0++) { if (v1->unk_00[v0].unk_00) { @@ -5704,13 +5698,13 @@ static void ov9_0224DC74 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static void ov9_0224DCA8 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224DCA8(UnkStruct_ov9_02249B04 *param0) { if (ov9_02249D38(param0) == 1) { int v0 = 0; - UnkStruct_ov9_0224E0DC * v1; - MapObject * v2; - MapObjectManager * v3 = param0->fieldSystem->mapObjMan; + UnkStruct_ov9_0224E0DC *v1; + MapObject *v2; + MapObjectManager *v3 = param0->fieldSystem->mapObjMan; while (sub_020625B0(v3, &v2, &v0, (1 << 0)) == 1) { if (MapObject_Id(v2) == 0xfd) { @@ -5720,16 +5714,16 @@ static void ov9_0224DCA8 (UnkStruct_ov9_02249B04 * param0) } } else { u32 v4 = ov9_022510D0(param0); - const UnkStruct_ov9_022530A4 * v5 = ov9_0224D720(v4); + const UnkStruct_ov9_022530A4 *v5 = ov9_0224D720(v4); ov9_0224DD24(param0, v4); ov9_0224DD24(param0, v5->unk_08); } } -static void ov9_0224DD24 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224DD24(UnkStruct_ov9_02249B04 *param0, u32 param1) { - const UnkStruct_ov9_02252C38 * v0; + const UnkStruct_ov9_02252C38 *v0; v0 = ov9_0224DE40(param1); @@ -5738,11 +5732,11 @@ static void ov9_0224DD24 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static void ov9_0224DD40 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02252C38 * param1, u32 param2) +static void ov9_0224DD40(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02252C38 *param1, u32 param2) { u32 v0; int v1 = 0; - UnkStruct_ov9_0224E0DC * v2; + UnkStruct_ov9_0224E0DC *v2; GF_ASSERT(param1 != NULL); @@ -5762,24 +5756,24 @@ static void ov9_0224DD40 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 } } -static void ov9_0224DDA0 (UnkStruct_ov9_02249B04 * param0, u32 param1, int param2) +static void ov9_0224DDA0(UnkStruct_ov9_02249B04 *param0, u32 param1, int param2) { - const UnkStruct_ov9_02252C38 * v0; + const UnkStruct_ov9_02252C38 *v0; v0 = ov9_0224DE40(param1); if (ov9_0224DE08(param0, v0->unk_04[param2]->unk_00, param1) == NULL) { - UnkStruct_ov9_0224E0DC * v1; + UnkStruct_ov9_0224E0DC *v1; v1 = ov9_0224DDDC(param0); ov9_0224DFF4(param0, v1, v0->unk_04[param2], param1); } } -static UnkStruct_ov9_0224E0DC * ov9_0224DDDC (UnkStruct_ov9_02249B04 * param0) +static UnkStruct_ov9_0224E0DC *ov9_0224DDDC(UnkStruct_ov9_02249B04 *param0) { int v0 = 0; - UnkStruct_ov9_0224DC34 * v1 = ¶m0->unk_1734; + UnkStruct_ov9_0224DC34 *v1 = ¶m0->unk_1734; while (v0 < 32) { if (v1->unk_00[v0].unk_00 == 0) { @@ -5793,10 +5787,10 @@ static UnkStruct_ov9_0224E0DC * ov9_0224DDDC (UnkStruct_ov9_02249B04 * param0) return NULL; } -static UnkStruct_ov9_0224E0DC * ov9_0224DE08 (UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param2) +static UnkStruct_ov9_0224E0DC *ov9_0224DE08(UnkStruct_ov9_02249B04 *param0, u32 param1, u32 param2) { int v0 = 0; - UnkStruct_ov9_0224DC34 * v1 = ¶m0->unk_1734; + UnkStruct_ov9_0224DC34 *v1 = ¶m0->unk_1734; while (v0 < 32) { if ((v1->unk_00[v0].unk_00 == 1) && (v1->unk_00[v0].unk_04.unk_00 == param1) && (v1->unk_00[v0].unk_02 == param2)) { @@ -5809,50 +5803,52 @@ static UnkStruct_ov9_0224E0DC * ov9_0224DE08 (UnkStruct_ov9_02249B04 * param0, u return NULL; } -static const UnkStruct_ov9_02252C38 * ov9_0224DE40 (u32 param0) +static const UnkStruct_ov9_02252C38 *ov9_0224DE40(u32 param0) { int v0 = 0; - const UnkStruct_ov9_02252C38 * v1 = Unk_ov9_02252C38; + const UnkStruct_ov9_02252C38 *v1 = Unk_ov9_02252C38; while (v0 < 8) { if (v1->unk_00 == param0) { return v1; } - v0++; v1++; + v0++; + v1++; } return NULL; } -static const UnkStruct_ov9_0224DF10 * ov9_0224DE60 (u32 param0, u32 param1) +static const UnkStruct_ov9_0224DF10 *ov9_0224DE60(u32 param0, u32 param1) { - const UnkStruct_ov9_02252C38 * v0; + const UnkStruct_ov9_02252C38 *v0; v0 = ov9_0224DE40(param0); return v0->unk_04[param1]; } -static const UnkStruct_ov9_02253830 * ov9_0224DE70 (u32 param0) +static const UnkStruct_ov9_02253830 *ov9_0224DE70(u32 param0) { u32 v0 = 0; - const UnkStruct_ov9_02253830 * v1 = Unk_ov9_02253830; + const UnkStruct_ov9_02253830 *v1 = Unk_ov9_02253830; while (v0 < 22) { if (v1->unk_00 == param0) { return v1; } - v1++; v0++; + v1++; + v0++; } GF_ASSERT(0); return NULL; } -static MapObject * ov9_0224DE94 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6) +static MapObject *ov9_0224DE94(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, int param4, int param5, u32 param6) { - MapObject * v0; + MapObject *v0; v0 = MapObjectMan_AddMapObject(param0->fieldSystem->mapObjMan, param1, param3, 0, 0x2000, 0x0, ov9_022510D0(param0)); @@ -5869,10 +5865,10 @@ static MapObject * ov9_0224DE94 (UnkStruct_ov9_02249B04 * param0, int param1, in return v0; } -static void ov9_0224DF10 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, MapObject * param2) +static void ov9_0224DF10(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1, MapObject *param2) { u32 v0, v1, v2, v3; - const UnkStruct_ov9_0224DF10 * v4; + const UnkStruct_ov9_0224DF10 *v4; v0 = sub_020629D8(param2, 0); v1 = sub_020629D8(param2, 1); @@ -5895,9 +5891,9 @@ static void ov9_0224DF10 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D sub_02062FC4(param2, 1); } -static UnkStruct_ov101_021D5D90 * ov9_0224DFA0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1) +static UnkStruct_ov101_021D5D90 *ov9_0224DFA0(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1) { - UnkStruct_ov101_021D5D90 * v0; + UnkStruct_ov101_021D5D90 *v0; UnkStruct_ov9_0224DFA0 v1; v1.unk_00 = param1->unk_04.unk_02; @@ -5915,7 +5911,7 @@ static UnkStruct_ov101_021D5D90 * ov9_0224DFA0 (UnkStruct_ov9_02249B04 * param0, return v0; } -static void ov9_0224DFF4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, const UnkStruct_ov9_0224DF10 * param2, u32 param3) +static void ov9_0224DFF4(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1, const UnkStruct_ov9_0224DF10 *param2, u32 param3) { param1->unk_00 = 1; param1->unk_02 = param3; @@ -5924,7 +5920,7 @@ static void ov9_0224DFF4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D param1->unk_20 = ov9_0224DFA0(param0, param1); } -static void ov9_0224E044 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1) +static void ov9_0224E044(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1) { if (param1->unk_20 != NULL) { sub_0207136C(param1->unk_20); @@ -5933,7 +5929,7 @@ static void ov9_0224E044 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D memset(param1, 0, sizeof(UnkStruct_ov9_0224E0DC)); } -static void ov9_0224E060 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1) +static void ov9_0224E060(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1) { if (param1->unk_1C != NULL) { MapObject_Delete(param1->unk_1C); @@ -5942,19 +5938,19 @@ static void ov9_0224E060 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D ov9_0224E044(param0, param1); } -static void ov9_0224E07C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, u32 param2) +static void ov9_0224E07C(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224E0DC *param1, u32 param2) { param1->unk_02 = param2; { - const UnkStruct_ov9_0224DF10 * v0; + const UnkStruct_ov9_0224DF10 *v0; v0 = ov9_0224DE60(param2, param1->unk_04.unk_0C); param1->unk_04 = *v0; } { - MapObject * v1 = param1->unk_1C; + MapObject *v1 = param1->unk_1C; MapObject_SetX(v1, param1->unk_04.unk_02); MapObject_SetY(v1, param1->unk_04.unk_04); @@ -5965,17 +5961,17 @@ static void ov9_0224E07C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D } } -static void ov9_0224E0DC (UnkStruct_ov9_0224E0DC * param0, u32 param1) +static void ov9_0224E0DC(UnkStruct_ov9_0224E0DC *param0, u32 param1) { param0->unk_01 = param1; } -static BOOL ov9_0224E0E0 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_0224E0E0(UnkStruct_ov9_02249B04 *param0, u32 param1) { int v0; u16 v1; - const UnkStruct_ov9_022531D0 * v2; - UnkStruct_ov9_0224DC34 * v3 = ¶m0->unk_1734; + const UnkStruct_ov9_022531D0 *v2; + UnkStruct_ov9_0224DC34 *v3 = ¶m0->unk_1734; GF_ASSERT(param1 != 25); @@ -5993,12 +5989,12 @@ static BOOL ov9_0224E0E0 (UnkStruct_ov9_02249B04 * param0, u32 param1) return 0; } -static BOOL ov9_0224E120 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_0224E120(UnkStruct_ov9_02249B04 *param0, u32 param1) { int v0; u16 v1; - const UnkStruct_ov9_022531D0 * v2; - UnkStruct_ov9_0224DC34 * v3 = ¶m0->unk_1734; + const UnkStruct_ov9_022531D0 *v2; + UnkStruct_ov9_0224DC34 *v3 = ¶m0->unk_1734; GF_ASSERT(param1 != 5); @@ -6016,11 +6012,11 @@ static BOOL ov9_0224E120 (UnkStruct_ov9_02249B04 * param0, u32 param1) return 0; } -static BOOL ov9_0224E160 (UnkStruct_ov9_02249B04 * param0, int param1) +static BOOL ov9_0224E160(UnkStruct_ov9_02249B04 *param0, int param1) { int v0; - const UnkStruct_ov9_022531D0 * v1; - UnkStruct_ov9_0224DC34 * v2 = ¶m0->unk_1734; + const UnkStruct_ov9_022531D0 *v1; + UnkStruct_ov9_0224DC34 *v2 = ¶m0->unk_1734; for (v0 = 0; v0 < 32; v0++) { if (v2->unk_00[v0].unk_00) { @@ -6033,11 +6029,11 @@ static BOOL ov9_0224E160 (UnkStruct_ov9_02249B04 * param0, int param1) return 0; } -static UnkStruct_ov9_0224E0DC * ov9_0224E188 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, u32 param4) +static UnkStruct_ov9_0224E0DC *ov9_0224E188(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3, u32 param4) { int v0 = 32; - UnkStruct_ov9_0224E0DC * v1 = param0->unk_1734.unk_00; - const UnkStruct_ov9_0224DF10 * v2; + UnkStruct_ov9_0224E0DC *v1 = param0->unk_1734.unk_00; + const UnkStruct_ov9_0224DF10 *v2; do { if (v1->unk_00 && (v1->unk_02 == param4)) { @@ -6054,11 +6050,11 @@ static UnkStruct_ov9_0224E0DC * ov9_0224E188 (UnkStruct_ov9_02249B04 * param0, i return NULL; } -static int ov9_0224E1CC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov9_0224E1CC(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov9_0224E1CC * v1 = param1; - const UnkStruct_ov9_0224DFA0 * v2 = sub_020715BC(param0); + UnkStruct_ov9_0224E1CC *v1 = param1; + const UnkStruct_ov9_0224DFA0 *v2 = sub_020715BC(param0); v1->unk_10 = *v2; v1->unk_20 = ov9_0224D8A4(v2->unk_0C, v2->unk_06, &v0); @@ -6072,7 +6068,7 @@ static int ov9_0224E1CC (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v3; - const VecFx32 * v4 = &Unk_ov9_02253298[v2->unk_06]; + const VecFx32 *v4 = &Unk_ov9_02253298[v2->unk_06]; v1->unk_04.x += v4->x; v1->unk_04.y += v4->y; @@ -6083,7 +6079,7 @@ static int ov9_0224E1CC (UnkStruct_ov101_021D5D90 * param0, void * param1) v1->unk_00 = 0; if (v2->unk_08 == 1) { - VarsFlags * v5 = SaveData_GetVarsFlags(v2->unk_0C->fieldSystem->saveData); + VarsFlags *v5 = SaveData_GetVarsFlags(v2->unk_0C->fieldSystem->saveData); if (sub_0206AFD0(v5) == 0) { v1->unk_02 = 0; @@ -6095,9 +6091,9 @@ static int ov9_0224E1CC (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov9_0224E274 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224E274(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224E1CC * v0 = param1; + UnkStruct_ov9_0224E1CC *v0 = param1; if (ov9_0224DAEC(v0->unk_10.unk_06) == 1) { sub_02073AA8(&v0->unk_20->unk_58); @@ -6106,12 +6102,12 @@ static void ov9_0224E274 (UnkStruct_ov101_021D5D90 * param0, void * param1) ov9_0224D938(v0->unk_10.unk_0C, v0->unk_20); } -static void ov9_0224E294 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224E294(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224E1CC * v0 = param1; + UnkStruct_ov9_0224E1CC *v0 = param1; if (v0->unk_00 == 1) { - VarsFlags * v1; + VarsFlags *v1; v1 = SaveData_GetVarsFlags(v0->unk_10.unk_0C->fieldSystem->saveData); @@ -6135,13 +6131,13 @@ static void ov9_0224E294 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov9_0224E2E4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224E2E4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224E1CC * v0 = param1; + UnkStruct_ov9_0224E1CC *v0 = param1; if (v0->unk_01 == 0) { if (v0->unk_00 == 1) { - const UnkStruct_ov9_0224DFA0 * v1 = &v0->unk_10; + const UnkStruct_ov9_0224DFA0 *v1 = &v0->unk_10; ov9_0224DA64(v1->unk_0C, v1->unk_06, v0->unk_02, 1); sub_02073BB4(&v0->unk_20->unk_04, &v0->unk_04); @@ -6162,26 +6158,26 @@ static const UnkStruct_ov101_021D86B0 Unk_ov9_02251468 = { ov9_0224E2E4 }; -static VecFx32 * ov9_0224E330 (UnkStruct_ov101_021D5D90 * param0) +static VecFx32 *ov9_0224E330(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov9_0224E1CC * v0 = sub_02071598(param0); + UnkStruct_ov9_0224E1CC *v0 = sub_02071598(param0); return &v0->unk_04; } -static void ov9_0224E33C (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224E33C(UnkStruct_ov9_02249B04 *param0) { - UnkFuncPtr_ov9_0224E33C * v0 = ¶m0->unk_D8; + UnkFuncPtr_ov9_0224E33C *v0 = ¶m0->unk_D8; memset(v0, 0, sizeof(UnkFuncPtr_ov9_0224E33C)); } -static void ov9_0224E34C (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224E34C(UnkStruct_ov9_02249B04 *param0) { return; } -static void ov9_0224E350 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02251438 * param1) +static void ov9_0224E350(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02251438 *param1) { - UnkFuncPtr_ov9_0224E33C * v0 = ¶m0->unk_D8; + UnkFuncPtr_ov9_0224E33C *v0 = ¶m0->unk_D8; GF_ASSERT(v0->unk_00 == 0); GF_ASSERT(param1 != NULL); @@ -6192,31 +6188,31 @@ static void ov9_0224E350 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 v0->unk_08 = param1; } -static void * ov9_0224E37C (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void *ov9_0224E37C(UnkStruct_ov9_02249B04 *param0, u32 param1) { GF_ASSERT(param1 < 160); { - u8 * v0 = param0->unk_D8.unk_0C; + u8 *v0 = param0->unk_D8.unk_0C; memset(v0, 0, param1); return v0; } } -static void * ov9_0224E39C (UnkStruct_ov9_02249B04 * param0) +static void *ov9_0224E39C(UnkStruct_ov9_02249B04 *param0) { - u8 * v0 = param0->unk_D8.unk_0C; + u8 *v0 = param0->unk_D8.unk_0C; return v0; } -static BOOL ov9_0224E3A0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1) +static BOOL ov9_0224E3A0(UnkStruct_ov9_02249B04 *param0, TaskManager *param1) { int v0; int v1; - UnkFuncPtr_ov9_0224E33C * v2; - const UnkFuncPtr_ov9_02253BE4 * v3; - const UnkStruct_ov9_02251438 * v4; + UnkFuncPtr_ov9_0224E33C *v2; + const UnkFuncPtr_ov9_02253BE4 *v3; + const UnkStruct_ov9_02251438 *v4; v2 = ¶m0->unk_D8; v4 = v2->unk_08; @@ -6245,9 +6241,9 @@ static BOOL ov9_0224E3A0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1) return 1; } -static const UnkStruct_ov9_02252044 * ov9_0224E410 (u32 param0) +static const UnkStruct_ov9_02252044 *ov9_0224E410(u32 param0) { - const UnkStruct_ov9_02252D38 * v0 = Unk_ov9_02252D38; + const UnkStruct_ov9_02252D38 *v0 = Unk_ov9_02252D38; while (v0->unk_00 != 593) { if (v0->unk_00 == param0) { @@ -6260,10 +6256,10 @@ static const UnkStruct_ov9_02252044 * ov9_0224E410 (u32 param0) return NULL; } -static BOOL ov9_0224E434 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3) +static BOOL ov9_0224E434(UnkStruct_ov9_02249B04 *param0, int param1, int param2, int param3) { - VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); - const UnkStruct_ov9_02252044 * v1 = ov9_0224E410(ov9_022510D0(param0)); + VarsFlags *v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + const UnkStruct_ov9_02252044 *v1 = ov9_0224E410(ov9_022510D0(param0)); if (v1 != NULL) { u16 v2, v3; @@ -6286,20 +6282,20 @@ static BOOL ov9_0224E434 (UnkStruct_ov9_02249B04 * param0, int param1, int param return 0; } -static void ov9_0224E498 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02251438 * param1) +static void ov9_0224E498(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02251438 *param1) { ov9_0224E350(param0, param1); FieldTask_Set(param0->fieldSystem, ov9_0224E4BC, param0); } -static void ov9_0224E4B0 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02252044 * param1) +static void ov9_0224E4B0(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02252044 *param1) { ov9_0224E498(param0, param1->unk_0C); } -static BOOL ov9_0224E4BC (TaskManager * param0) +static BOOL ov9_0224E4BC(TaskManager *param0) { - UnkStruct_ov9_02249B04 * v0 = TaskManager_Environment(param0); + UnkStruct_ov9_02249B04 *v0 = TaskManager_Environment(param0); if (ov9_0224E3A0(v0, param0) == 1) { return 1; @@ -6308,19 +6304,19 @@ static BOOL ov9_0224E4BC (TaskManager * param0) return 0; } -static int ov9_0224E4D8 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224E4D8(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_0224E4D8 * v0 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_0224E4D8)); + UnkStruct_ov9_0224E4D8 *v0 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_0224E4D8)); *param2 = 1; return 1; } -static int ov9_0224E4E8 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224E4E8(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - MapObject * v0; - const UnkStruct_ov9_0224E4E8 * v1 = param3; - UnkStruct_ov9_0224E4D8 * v2 = ov9_0224E39C(param0); + MapObject *v0; + const UnkStruct_ov9_0224E4E8 *v1 = param3; + UnkStruct_ov9_0224E4D8 *v2 = ov9_0224E39C(param0); v0 = MapObjMan_LocalMapObjByIndex(param0->fieldSystem->mapObjMan, v1->unk_00); GF_ASSERT(v0 != NULL); @@ -6333,11 +6329,11 @@ static int ov9_0224E4E8 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_0224E520 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224E520(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - MapObject * v0; - const UnkStruct_ov9_0224E4E8 * v1 = param3; - UnkStruct_ov9_0224E4D8 * v2 = ov9_0224E39C(param0); + MapObject *v0; + const UnkStruct_ov9_0224E4E8 *v1 = param3; + UnkStruct_ov9_0224E4D8 *v2 = ov9_0224E39C(param0); v0 = MapObjMan_LocalMapObjByIndex(param0->fieldSystem->mapObjMan, v1->unk_00); GF_ASSERT(v0 != NULL); @@ -6355,10 +6351,10 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251360[3] = { ov9_0224E520 }; -static int ov9_0224E550 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224E550(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - const UnkStruct_ov9_0224E550 * v0 = param3; - UnkStruct_ov9_0224E5EC * v1 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_0224E5EC)); + const UnkStruct_ov9_0224E550 *v0 = param3; + UnkStruct_ov9_0224E5EC *v1 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_0224E5EC)); v1->unk_24 = ov9_0224DE08(param0, v0->unk_00, ov9_022510D0(param0)); GF_ASSERT(v1->unk_24 != NULL); @@ -6371,14 +6367,14 @@ static int ov9_0224E550 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, v1->unk_30 = (FX32_ONE * 3); { - VecFx32 * v2 = ov9_0224E330(v1->unk_24->unk_20); + VecFx32 *v2 = ov9_0224E330(v1->unk_24->unk_20); v1->unk_2C = v2->y; } if (v0->unk_02 == 1) { VecFx32 v3; - MapObject * v4 = Player_MapObject(param0->fieldSystem->playerAvatar); + MapObject *v4 = Player_MapObject(param0->fieldSystem->playerAvatar); sub_02062E28(v4, 1); sub_0206309C(v4, &v3); @@ -6392,12 +6388,12 @@ static int ov9_0224E550 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_0224E5EC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224E5EC(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - MapObject * v0 = NULL; - const UnkStruct_ov9_0224E550 * v1 = param3; - UnkStruct_ov9_0224E5EC * v2 = ov9_0224E39C(param0); - VecFx32 * v3 = ov9_0224E330(v2->unk_24->unk_20); + MapObject *v0 = NULL; + const UnkStruct_ov9_0224E550 *v1 = param3; + UnkStruct_ov9_0224E5EC *v2 = ov9_0224E39C(param0); + VecFx32 *v3 = ov9_0224E330(v2->unk_24->unk_20); if (v1->unk_02 == 1) { v0 = Player_MapObject(param0->fieldSystem->playerAvatar); @@ -6450,12 +6446,12 @@ static int ov9_0224E5EC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_0224E6B0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224E6B0(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - VecFx32 v0 = {0, 0, 0}; - const UnkStruct_ov9_0224E550 * v1 = param3; - UnkStruct_ov9_0224E5EC * v2 = ov9_0224E39C(param0); - VecFx32 * v3 = ov9_0224E330(v2->unk_24->unk_20); + VecFx32 v0 = { 0, 0, 0 }; + const UnkStruct_ov9_0224E550 *v1 = param3; + UnkStruct_ov9_0224E5EC *v2 = ov9_0224E39C(param0); + VecFx32 *v3 = ov9_0224E330(v2->unk_24->unk_20); if (v2->unk_00.x != v2->unk_0C.x) { v2->unk_00.x += v2->unk_18.x; @@ -6486,7 +6482,7 @@ static int ov9_0224E6B0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, if (v1->unk_02 == 1) { VecFx32 v4; - MapObject * v5 = Player_MapObject(param0->fieldSystem->playerAvatar); + MapObject *v5 = Player_MapObject(param0->fieldSystem->playerAvatar); MapObject_PosVectorOut(v5, &v4); @@ -6504,12 +6500,12 @@ static int ov9_0224E6B0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_0224E798 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224E798(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - const UnkStruct_ov9_0224E550 * v0 = param3; + const UnkStruct_ov9_0224E550 *v0 = param3; if (v0->unk_02 == 1) { - MapObject * v1 = Player_MapObject(param0->fieldSystem->playerAvatar); + MapObject *v1 = Player_MapObject(param0->fieldSystem->playerAvatar); int v2 = MapObject_GetXPos(v1) + v0->unk_06; int v3 = MapObject_GetYPos(v1) + ((v0->unk_08) * 2); int v4 = MapObject_GetZPos(v1) + v0->unk_0A; @@ -6521,7 +6517,7 @@ static int ov9_0224E798 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { u32 v5; - PlayerAvatar * playerAvatar = param0->fieldSystem->playerAvatar; + PlayerAvatar *playerAvatar = param0->fieldSystem->playerAvatar; v3 = ((v3) / 2); ov9_0224C378(param0, v2, v3, v4, 4); @@ -6548,9 +6544,9 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_022513E8[4] = { ov9_0224E798 }; -static int ov9_0224E860 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224E860(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - const UnkStruct_ov9_0224E860 * v0 = param3; + const UnkStruct_ov9_0224E860 *v0 = param3; ov9_0224F0D4(param0, v0->unk_00, v0->unk_02); return 2; @@ -6560,9 +6556,9 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251258[1] = { ov9_0224E860 }; -static int ov9_0224E870 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224E870(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - const UnkStruct_ov9_0224E870 * v0 = param3; + const UnkStruct_ov9_0224E870 *v0 = param3; ov9_0224F16C(param0->fieldSystem, v0->unk_00); return 2; @@ -6579,33 +6575,33 @@ static const UnkStruct_ov9_02252414 Unk_ov9_02252414[1] = { 0x2A, 0x3, 0x1, - {FX32_ONE, FX32_ONE, FX32_ONE}, - {(FX32_ONE * 48), 0x0, 0x0}, - 0x40 - } + { FX32_ONE, FX32_ONE, FX32_ONE }, + { (FX32_ONE * 48), 0x0, 0x0 }, + 0x40, + }, }; -void ov9_0224E884 (FieldSystem * fieldSystem, u16 param1) +void ov9_0224E884(FieldSystem *fieldSystem, u16 param1) { - UnkStruct_ov9_02249B04 * v0; + UnkStruct_ov9_02249B04 *v0; GF_ASSERT(param1 < 1); v0 = fieldSystem->unk_04->unk_24; ov9_0224E91C(v0, &Unk_ov9_02252414[param1]); } -void ov9_0224E8A8 (FieldSystem * fieldSystem) +void ov9_0224E8A8(FieldSystem *fieldSystem) { - UnkStruct_ov9_02249B04 * v0; + UnkStruct_ov9_02249B04 *v0; v0 = fieldSystem->unk_04->unk_24; ov9_0224E988(v0); } -static void ov9_0224E8B4 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224E8B4(UnkStruct_ov9_02249B04 *param0) { int v0; - UnkStruct_ov9_0224E8B4 * v1 = ¶m0->unk_1EA4; + UnkStruct_ov9_0224E8B4 *v1 = ¶m0->unk_1EA4; if (v1->unk_00 == 0) { v1->unk_04 = ov9_0224D8A4(param0, 20, &v0); @@ -6618,10 +6614,10 @@ static void ov9_0224E8B4 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224E8EC (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224E8EC(UnkStruct_ov9_02249B04 *param0) { int v0; - UnkStruct_ov9_0224E8B4 * v1 = ¶m0->unk_1EA4; + UnkStruct_ov9_0224E8B4 *v1 = ¶m0->unk_1EA4; if (v1->unk_00 == 1) { ov9_0224D938(param0, v1->unk_04); @@ -6631,10 +6627,10 @@ static void ov9_0224E8EC (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224E91C (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02252414 * param1) +static void ov9_0224E91C(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02252414 *param1) { UnkStruct_ov9_0224E91C v0; - UnkStruct_ov9_0224E8B4 * v1 = ¶m0->unk_1EA4; + UnkStruct_ov9_0224E8B4 *v1 = ¶m0->unk_1EA4; ov9_0224E8B4(param0); @@ -6645,10 +6641,10 @@ static void ov9_0224E91C (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 v1->unk_08 = ov5_021DF72C(param0->fieldSystem->unk_40, &Unk_ov9_022514B8, NULL, 0, &v0, 0); } -static BOOL ov9_0224E964 (UnkStruct_ov9_02249B04 * param0) +static BOOL ov9_0224E964(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224E964 * v0; - UnkStruct_ov9_0224E8B4 * v1 = ¶m0->unk_1EA4; + UnkStruct_ov9_0224E964 *v0; + UnkStruct_ov9_0224E8B4 *v1 = ¶m0->unk_1EA4; GF_ASSERT(v1->unk_08 != NULL); @@ -6656,14 +6652,14 @@ static BOOL ov9_0224E964 (UnkStruct_ov9_02249B04 * param0) return v0->unk_34; } -static void ov9_0224E984 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224E984(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224E8B4 * v0 = ¶m0->unk_1EA4; + UnkStruct_ov9_0224E8B4 *v0 = ¶m0->unk_1EA4; } -static void ov9_0224E988 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224E988(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224E8B4 * v0 = ¶m0->unk_1EA4; + UnkStruct_ov9_0224E8B4 *v0 = ¶m0->unk_1EA4; if (v0->unk_08 != NULL) { sub_0207136C(v0->unk_08); @@ -6672,9 +6668,9 @@ static void ov9_0224E988 (UnkStruct_ov9_02249B04 * param0) ov9_0224E8EC(param0); } -static BOOL ov9_0224E9A4 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_0224E9A4(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224E8B4 * v0 = ¶m0->unk_1EA4; + UnkStruct_ov9_0224E8B4 *v0 = ¶m0->unk_1EA4; GF_ASSERT(param1 != 25); @@ -6687,9 +6683,9 @@ static BOOL ov9_0224E9A4 (UnkStruct_ov9_02249B04 * param0, u32 param1) return 0; } -static BOOL ov9_0224E9CC (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_0224E9CC(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224E8B4 * v0 = ¶m0->unk_1EA4; + UnkStruct_ov9_0224E8B4 *v0 = ¶m0->unk_1EA4; GF_ASSERT(param1 != 5); @@ -6702,9 +6698,9 @@ static BOOL ov9_0224E9CC (UnkStruct_ov9_02249B04 * param0, u32 param1) return 0; } -static BOOL ov9_0224E9F4 (UnkStruct_ov9_02249B04 * param0, int param1) +static BOOL ov9_0224E9F4(UnkStruct_ov9_02249B04 *param0, int param1) { - UnkStruct_ov9_0224E8B4 * v0 = ¶m0->unk_1EA4; + UnkStruct_ov9_0224E8B4 *v0 = ¶m0->unk_1EA4; if (v0->unk_00 == 1) { if (param1 == 20) { @@ -6716,19 +6712,19 @@ static BOOL ov9_0224E9F4 (UnkStruct_ov9_02249B04 * param0, int param1) } static const UnkStruct_ov5_02201C58 Unk_ov9_022529F8[5] = { - {0x0, 0x0, 0x0}, - {0x0, 0xB4, 0x0}, - {0x0, 0x5A, 0x0}, - {0x0, 0x10E, 0x0}, - {0x5A, 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0xB4, 0x0 }, + { 0x0, 0x5A, 0x0 }, + { 0x0, 0x10E, 0x0 }, + { 0x5A, 0x0, 0x0 } }; -static int ov9_0224EA0C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov9_0224EA0C(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov9_0224E964 * v1 = param1; - const UnkStruct_ov9_0224E91C * v2 = sub_020715BC(param0); - const UnkStruct_ov9_02252414 * v3; + UnkStruct_ov9_0224E964 *v1 = param1; + const UnkStruct_ov9_0224E91C *v2 = sub_020715BC(param0); + const UnkStruct_ov9_02252414 *v3; v1->unk_00 = *v2; v3 = &v1->unk_00.unk_08; @@ -6750,17 +6746,17 @@ static int ov9_0224EA0C (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov9_0224EA88 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224EA88(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224E964 * v0 = param1; + UnkStruct_ov9_0224E964 *v0 = param1; sub_02073A90(&v0->unk_00.unk_04->unk_58); } -static void ov9_0224EA94 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224EA94(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov9_0224E964 * v1 = param1; - const UnkStruct_ov9_02252414 * v2 = &v1->unk_00.unk_08; + UnkStruct_ov9_0224E964 *v1 = param1; + const UnkStruct_ov9_02252414 *v2 = &v1->unk_00.unk_08; switch (v1->unk_2C) { case 0: @@ -6771,10 +6767,9 @@ static void ov9_0224EA94 (UnkStruct_ov101_021D5D90 * param0, void * param1) } v1->unk_2C++; - case 1: - { + case 1: { VecFx32 v3; - const VecFx32 * v4 = &v2->unk_14; + const VecFx32 *v4 = &v2->unk_14; sub_020715E4(param0, &v3); @@ -6791,8 +6786,7 @@ static void ov9_0224EA94 (UnkStruct_ov101_021D5D90 * param0, void * param1) } sub_020715D4(param0, &v3); - } - break; + } break; case 2: break; } @@ -6802,13 +6796,13 @@ static void ov9_0224EA94 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov9_0224EB34 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224EB34(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224E964 * v0 = param1; + UnkStruct_ov9_0224E964 *v0 = param1; if (v0->unk_2E == 0) { VecFx32 v1; - const VecFx32 * v2; + const VecFx32 *v2; sub_020715E4(param0, &v1); v2 = &v0->unk_00.unk_08.unk_08; @@ -6826,11 +6820,11 @@ static const UnkStruct_ov101_021D86B0 Unk_ov9_022514B8 = { ov9_0224EB34 }; -static void ov9_0224EB68 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224EB68(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224EB68 * v0 = ¶m0->unk_1BB4; + UnkStruct_ov9_0224EB68 *v0 = ¶m0->unk_1BB4; u32 v1 = ov9_022510D0(param0); - const UnkStruct_ov9_022530A4 * v2 = ov9_0224D720(v1); + const UnkStruct_ov9_022530A4 *v2 = ov9_0224D720(v1); ov9_0224EC48(param0, v1); @@ -6839,11 +6833,11 @@ static void ov9_0224EB68 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224EB94 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224EB94(UnkStruct_ov9_02249B04 *param0) { int v0 = 0; - UnkStruct_ov9_0224EB68 * v1 = ¶m0->unk_1BB4; - UnkStruct_ov9_0224EBB8 * v2 = v1->unk_00; + UnkStruct_ov9_0224EB68 *v1 = ¶m0->unk_1BB4; + UnkStruct_ov9_0224EBB8 *v2 = v1->unk_00; while (v0 < 8) { if (v2->unk_04 != NULL) { @@ -6855,7 +6849,7 @@ static void ov9_0224EB94 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224EBB8 (UnkStruct_ov9_0224EBB8 * param0) +static void ov9_0224EBB8(UnkStruct_ov9_0224EBB8 *param0) { if (param0->unk_04 != NULL) { sub_0207136C(param0->unk_04); @@ -6864,14 +6858,14 @@ static void ov9_0224EBB8 (UnkStruct_ov9_0224EBB8 * param0) param0->unk_04 = NULL; } -static void ov9_0224EBCC (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224EBB8 * param1, const UnkStruct_ov9_0224EC10 * param2, u32 param3) +static void ov9_0224EBCC(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224EBB8 *param1, const UnkStruct_ov9_0224EC10 *param2, u32 param3) { param1->unk_00 = param3; param1->unk_08 = *param2; { UnkStruct_ov9_0224EBCC v0; - const UnkStruct_ov101_021D86B0 * v1; + const UnkStruct_ov101_021D86B0 *v1; v0.unk_00 = param0; v0.unk_04 = param1; @@ -6881,11 +6875,11 @@ static void ov9_0224EBCC (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224EBB } } -static void ov9_0224EC10 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_02252548 * param1) +static void ov9_0224EC10(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_02252548 *param1) { u16 v0, v1; - const UnkStruct_ov9_0224EC10 * v2 = param1->unk_04; - UnkStruct_ov9_0224EBB8 * v3; + const UnkStruct_ov9_0224EC10 *v2 = param1->unk_04; + UnkStruct_ov9_0224EBB8 *v3; while (v2->unk_04 != 25) { v0 = v2->unk_0C; @@ -6900,9 +6894,9 @@ static void ov9_0224EC10 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 } } -static void ov9_0224EC48 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224EC48(UnkStruct_ov9_02249B04 *param0, u32 param1) { - const UnkStruct_ov9_02252548 * v0 = Unk_ov9_02252548; + const UnkStruct_ov9_02252548 *v0 = Unk_ov9_02252548; while (v0->unk_00 != 593) { if (v0->unk_00 == param1) { @@ -6915,11 +6909,11 @@ static void ov9_0224EC48 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static UnkStruct_ov9_0224EBB8 * ov9_0224EC70 (UnkStruct_ov9_02249B04 * param0) +static UnkStruct_ov9_0224EBB8 *ov9_0224EC70(UnkStruct_ov9_02249B04 *param0) { int v0 = 0; - UnkStruct_ov9_0224EB68 * v1 = ¶m0->unk_1BB4; - UnkStruct_ov9_0224EBB8 * v2 = v1->unk_00; + UnkStruct_ov9_0224EB68 *v1 = ¶m0->unk_1BB4; + UnkStruct_ov9_0224EBB8 *v2 = v1->unk_00; do { if (v2->unk_04 == NULL) { @@ -6934,11 +6928,11 @@ static UnkStruct_ov9_0224EBB8 * ov9_0224EC70 (UnkStruct_ov9_02249B04 * param0) return NULL; } -static void ov9_0224EC94 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224EC94(UnkStruct_ov9_02249B04 *param0, u32 param1) { int v0 = 0; - UnkStruct_ov9_0224EB68 * v1 = ¶m0->unk_1BB4; - UnkStruct_ov9_0224EBB8 * v2 = v1->unk_00; + UnkStruct_ov9_0224EB68 *v1 = ¶m0->unk_1BB4; + UnkStruct_ov9_0224EBB8 *v2 = v1->unk_00; while (v0 < 8) { if ((v2->unk_00 == param1) && (v2->unk_04 != NULL)) { @@ -6950,11 +6944,11 @@ static void ov9_0224EC94 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static BOOL ov9_0224ECC0 (UnkStruct_ov9_02249B04 * param0, int param1) +static BOOL ov9_0224ECC0(UnkStruct_ov9_02249B04 *param0, int param1) { int v0 = 0; - UnkStruct_ov9_0224EB68 * v1 = ¶m0->unk_1BB4; - UnkStruct_ov9_0224EBB8 * v2 = v1->unk_00; + UnkStruct_ov9_0224EB68 *v1 = ¶m0->unk_1BB4; + UnkStruct_ov9_0224EBB8 *v2 = v1->unk_00; while (v0 < 8) { if (v2->unk_04 != NULL) { @@ -6970,12 +6964,12 @@ static BOOL ov9_0224ECC0 (UnkStruct_ov9_02249B04 * param0, int param1) return 0; } -static BOOL ov9_0224ECE8 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_0224ECE8(UnkStruct_ov9_02249B04 *param0, u32 param1) { int v0 = 0; - const UnkStruct_ov9_022531D0 * v1; - UnkStruct_ov9_0224EB68 * v2 = ¶m0->unk_1BB4; - UnkStruct_ov9_0224EBB8 * v3 = v2->unk_00; + const UnkStruct_ov9_022531D0 *v1; + UnkStruct_ov9_0224EB68 *v2 = ¶m0->unk_1BB4; + UnkStruct_ov9_0224EBB8 *v3 = v2->unk_00; while (v0 < 8) { if (v3->unk_04 != NULL) { @@ -6993,12 +6987,12 @@ static BOOL ov9_0224ECE8 (UnkStruct_ov9_02249B04 * param0, u32 param1) return 0; } -static BOOL ov9_0224ED20 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static BOOL ov9_0224ED20(UnkStruct_ov9_02249B04 *param0, u32 param1) { int v0 = 0; - const UnkStruct_ov9_022531D0 * v1; - UnkStruct_ov9_0224EB68 * v2 = ¶m0->unk_1BB4; - UnkStruct_ov9_0224EBB8 * v3 = v2->unk_00; + const UnkStruct_ov9_022531D0 *v1; + UnkStruct_ov9_0224EB68 *v2 = ¶m0->unk_1BB4; + UnkStruct_ov9_0224EBB8 *v3 = v2->unk_00; while (v0 < 8) { if (v3->unk_04 != NULL) { @@ -7016,12 +7010,12 @@ static BOOL ov9_0224ED20 (UnkStruct_ov9_02249B04 * param0, u32 param1) return 0; } -static int ov9_0224ED58 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov9_0224ED58(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov9_0224ED58 * v1 = param1; - const UnkStruct_ov9_0224EBCC * v2 = sub_020715BC(param0); - const UnkStruct_ov9_0224EC10 * v3 = &v2->unk_04->unk_08; + UnkStruct_ov9_0224ED58 *v1 = param1; + const UnkStruct_ov9_0224EBCC *v2 = sub_020715BC(param0); + const UnkStruct_ov9_0224EC10 *v3 = &v2->unk_04->unk_08; v1->unk_1C = *v2; v1->unk_24 = ov9_0224D8A4(v2->unk_00, v3->unk_04, &v0); @@ -7035,7 +7029,7 @@ static int ov9_0224ED58 (UnkStruct_ov101_021D5D90 * param0, void * param1) { VecFx32 v4; - const VecFx32 * v5 = &Unk_ov9_02253298[v3->unk_04]; + const VecFx32 *v5 = &Unk_ov9_02253298[v3->unk_04]; v1->unk_04.x += v5->x; v1->unk_04.y += v5->y; @@ -7045,11 +7039,11 @@ static int ov9_0224ED58 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov9_0224EDD8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224EDD8(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov9_0224ED58 * v1 = param1; - const UnkStruct_ov9_0224EC10 * v2 = &v1->unk_1C.unk_04->unk_08; + UnkStruct_ov9_0224ED58 *v1 = param1; + const UnkStruct_ov9_0224EC10 *v2 = &v1->unk_1C.unk_04->unk_08; if (ov9_0224DAEC(v2->unk_04) == 1) { sub_02073AA8(&v1->unk_24->unk_58); @@ -7058,9 +7052,9 @@ static void ov9_0224EDD8 (UnkStruct_ov101_021D5D90 * param0, void * param1) ov9_0224D938(v1->unk_1C.unk_00, v1->unk_24); } -static void ov9_0224EDFC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224EDFC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224ED58 * v0 = param1; + UnkStruct_ov9_0224ED58 *v0 = param1; int v1 = v0->unk_1C.unk_04->unk_08.unk_04; if (ov9_0224DAEC(v1) == 1) { @@ -7070,9 +7064,9 @@ static void ov9_0224EDFC (UnkStruct_ov101_021D5D90 * param0, void * param1) v0->unk_02 = ov9_0224DBE4(v0->unk_1C.unk_00, v1, &v0->unk_04); } -static void ov9_0224EE2C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov9_0224EE2C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov9_0224ED58 * v0 = param1; + UnkStruct_ov9_0224ED58 *v0 = param1; if (v0->unk_02 == 1) { sub_02073BB4(&v0->unk_24->unk_04, &v0->unk_04); @@ -7087,11 +7081,11 @@ static const UnkStruct_ov101_021D86B0 Unk_ov9_02251530 = { ov9_0224EE2C }; -static void ov9_0224EE40 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224EE40(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224EE40 * v0 = ¶m0->unk_1C64; + UnkStruct_ov9_0224EE40 *v0 = ¶m0->unk_1C64; u32 v1 = ov9_022510D0(param0); - const UnkStruct_ov9_022530A4 * v2 = ov9_0224D720(v1); + const UnkStruct_ov9_022530A4 *v2 = ov9_0224D720(v1); ov9_0224F078(param0, v1); @@ -7100,16 +7094,16 @@ static void ov9_0224EE40 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224EE6C (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224EE6C(UnkStruct_ov9_02249B04 *param0) { return; } -static void ov9_0224EE70 (UnkStruct_ov9_02249B04 * param0, MapObject * param1) +static void ov9_0224EE70(UnkStruct_ov9_02249B04 *param0, MapObject *param1) { int v0 = 0; - UnkStruct_ov9_0224EE40 * v1 = ¶m0->unk_1C64; - MapObject ** v2 = v1->unk_00; + UnkStruct_ov9_0224EE40 *v1 = ¶m0->unk_1C64; + MapObject **v2 = v1->unk_00; for (v0 = 0; v0 < 19; v0++, v2++) { if ((*v2 != NULL) && (*v2 == param1)) { @@ -7122,10 +7116,10 @@ static void ov9_0224EE70 (UnkStruct_ov9_02249B04 * param0, MapObject * param1) GF_ASSERT(0); } -static MapObject ** ov9_0224EEA0 (UnkStruct_ov9_02249B04 * param0) +static MapObject **ov9_0224EEA0(UnkStruct_ov9_02249B04 *param0) { int v0; - UnkStruct_ov9_0224EE40 * v1 = ¶m0->unk_1C64; + UnkStruct_ov9_0224EE40 *v1 = ¶m0->unk_1C64; for (v0 = 0; v0 < 19; v0++) { if (v1->unk_00[v0] == NULL) { @@ -7137,11 +7131,11 @@ static MapObject ** ov9_0224EEA0 (UnkStruct_ov9_02249B04 * param0) return NULL; } -static MapObject * ov9_0224EECC (UnkStruct_ov9_02249B04 * param0, const ObjectEvent * param1, u32 param2) +static MapObject *ov9_0224EECC(UnkStruct_ov9_02249B04 *param0, const ObjectEvent *param1, u32 param2) { int v0 = 0; - MapObject * v1; - const MapObjectManager * v2 = param0->fieldSystem->mapObjMan; + MapObject *v1; + const MapObjectManager *v2 = param0->fieldSystem->mapObjMan; while (sub_020625B0(v2, &v1, &v0, (1 << 0))) { if (sub_02062918(v1) == param2) { @@ -7155,11 +7149,11 @@ static MapObject * ov9_0224EECC (UnkStruct_ov9_02249B04 * param0, const ObjectEv return NULL; } -static BOOL ov9_0224EF30 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224EF30 * param1, u16 param2) +static BOOL ov9_0224EF30(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_0224EF30 *param1, u16 param2) { u16 v0 = param1->unk_00; u16 v1 = param1->unk_02; - VarsFlags * v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); if (v0 == 6) { if (param2 == 0) { @@ -7172,9 +7166,9 @@ static BOOL ov9_0224EF30 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 return 1; } -static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, MapObject ** param1, const UnkStruct_ov9_0224EF30 * param2, u32 param3, u16 param4) +static BOOL ov9_0224EF64(UnkStruct_ov9_02249B04 *param0, MapObject **param1, const UnkStruct_ov9_0224EF30 *param2, u32 param3, u16 param4) { - MapObject * v0; + MapObject *v0; v0 = ov9_0224EECC(param0, ¶m2->unk_08, param3); @@ -7205,7 +7199,7 @@ static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, MapObject ** param1, MapObject_SetStatusFlagOn(*param1, (1 << 13)); if (v0 == NULL) { - UnkStruct_020216E0 * v1; + UnkStruct_020216E0 *v1; MapObject_SetPosDir(*param1, param2->unk_08.x, (((param2->unk_08.y) >> 3) / FX32_ONE), param2->unk_08.z, param2->unk_08.dir); @@ -7223,9 +7217,9 @@ static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, MapObject ** param1, return 1; } -static BOOL ov9_0224F048 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224EF30 ** param1, u32 param2) +static BOOL ov9_0224F048(UnkStruct_ov9_02249B04 *param0, const UnkStruct_ov9_0224EF30 **param1, u32 param2) { - MapObject ** v0; + MapObject **v0; while ((*param1) != NULL) { v0 = ov9_0224EEA0(param0); @@ -7236,9 +7230,9 @@ static BOOL ov9_0224F048 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0 return 0; } -static void ov9_0224F078 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224F078(UnkStruct_ov9_02249B04 *param0, u32 param1) { - const UnkStruct_ov9_02252EB4 * v0 = Unk_ov9_02252EB4; + const UnkStruct_ov9_02252EB4 *v0 = Unk_ov9_02252EB4; while (v0->unk_00 != 593) { if (v0->unk_00 == param1) { @@ -7250,11 +7244,11 @@ static void ov9_0224F078 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static void ov9_0224F0A4 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224F0A4(UnkStruct_ov9_02249B04 *param0, u32 param1) { int v0 = 0; - UnkStruct_ov9_0224EE40 * v1 = ¶m0->unk_1C64; - MapObject ** v2 = v1->unk_00; + UnkStruct_ov9_0224EE40 *v1 = ¶m0->unk_1C64; + MapObject **v2 = v1->unk_00; for (v0 = 0; v0 < 19; v0++, v2++) { if ((*v2) != NULL) { @@ -7266,14 +7260,14 @@ static void ov9_0224F0A4 (UnkStruct_ov9_02249B04 * param0, u32 param1) } } -static MapObject * ov9_0224F0D4 (UnkStruct_ov9_02249B04 * param0, u32 param1, u16 param2) +static MapObject *ov9_0224F0D4(UnkStruct_ov9_02249B04 *param0, u32 param1, u16 param2) { - MapObject ** v0 = NULL; - const UnkStruct_ov9_02252EB4 * v1 = Unk_ov9_02252EB4; + MapObject **v0 = NULL; + const UnkStruct_ov9_02252EB4 *v1 = Unk_ov9_02252EB4; while (v1->unk_00 != 593) { if (v1->unk_00 == param1) { - const UnkStruct_ov9_0224EF30 ** v2 = v1->unk_04; + const UnkStruct_ov9_0224EF30 **v2 = v1->unk_04; while ((*v2) != NULL) { if ((*v2)->unk_08.localID == param2) { @@ -7303,24 +7297,25 @@ static MapObject * ov9_0224F0D4 (UnkStruct_ov9_02249B04 * param0, u32 param1, u1 return NULL; } -void ov9_0224F158 (FieldSystem * fieldSystem, u16 param1) +void ov9_0224F158(FieldSystem *fieldSystem, u16 param1) { u32 v0 = fieldSystem->location->mapId; - UnkStruct_ov9_02249B04 * v1 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v1 = fieldSystem->unk_04->unk_24; ov9_0224F0D4(v1, v0, param1); } -void ov9_0224F16C (FieldSystem * fieldSystem, u16 param1) +void ov9_0224F16C(FieldSystem *fieldSystem, u16 param1) { int v0 = 0; - MapObject * v1; + MapObject *v1; u32 v2 = fieldSystem->location->mapId; - MapObjectManager * v3 = fieldSystem->mapObjMan; - UnkStruct_ov9_02249B04 * v4 = fieldSystem->unk_04->unk_24; + MapObjectManager *v3 = fieldSystem->mapObjMan; + UnkStruct_ov9_02249B04 *v4 = fieldSystem->unk_04->unk_24; while (sub_020625B0( - v3, &v1, &v0, (1 << 0)) == 1) { + v3, &v1, &v0, (1 << 0)) + == 1) { if ((MapObject_Id(v1) == param1) && (sub_02062918(v1) == v2)) { ov9_0224EE70(v4, v1); return; @@ -7330,11 +7325,11 @@ void ov9_0224F16C (FieldSystem * fieldSystem, u16 param1) GF_ASSERT(0); } -static BOOL ov9_0224F1CC (UnkStruct_ov9_02249B04 * param0, MapObject * param1) +static BOOL ov9_0224F1CC(UnkStruct_ov9_02249B04 *param0, MapObject *param1) { int v0 = 0; - UnkStruct_ov9_0224EE40 * v1 = ¶m0->unk_1C64; - MapObject ** v2 = v1->unk_00; + UnkStruct_ov9_0224EE40 *v1 = ¶m0->unk_1C64; + MapObject **v2 = v1->unk_00; GF_ASSERT(param1 != NULL); @@ -7351,26 +7346,26 @@ static BOOL ov9_0224F1CC (UnkStruct_ov9_02249B04 * param0, MapObject * param1) } static const UnkStruct_ov9_0225311C Unk_ov9_0225311C[] = { - {0x243, 0x4C, 0x44, 0x11}, - {0x243, 0x61, 0x43, 0x11}, - {0x243, 0x56, 0x39, 0x11}, - {0x244, 0x44, 0x43, 0x6}, - {0x244, 0x4B, 0x43, -1}, - {0x244, 0x4F, 0x43, -1}, - {0x244, 0x60, 0x44, 0x7}, - {0x244, 0x64, 0x44, -1}, - {0x244, 0x69, 0x44, -1}, - {0x244, 0x55, 0x3C, 0x8}, - {0x244, 0x55, 0x38, -1}, - {0x244, 0x55, 0x39, -1}, - {0x244, 0x55, 0x34, -1}, - {0x244, 0x55, 0x35, -1}, - {0x251, 0x0, 0x0, 0x0} -}; - -static BOOL ov9_0224F1F8 (u32 param0, int param1, int param2, u32 * param3) -{ - const UnkStruct_ov9_0225311C * v0 = Unk_ov9_0225311C; + { 0x243, 0x4C, 0x44, 0x11 }, + { 0x243, 0x61, 0x43, 0x11 }, + { 0x243, 0x56, 0x39, 0x11 }, + { 0x244, 0x44, 0x43, 0x6 }, + { 0x244, 0x4B, 0x43, -1 }, + { 0x244, 0x4F, 0x43, -1 }, + { 0x244, 0x60, 0x44, 0x7 }, + { 0x244, 0x64, 0x44, -1 }, + { 0x244, 0x69, 0x44, -1 }, + { 0x244, 0x55, 0x3C, 0x8 }, + { 0x244, 0x55, 0x38, -1 }, + { 0x244, 0x55, 0x39, -1 }, + { 0x244, 0x55, 0x34, -1 }, + { 0x244, 0x55, 0x35, -1 }, + { 0x251, 0x0, 0x0, 0x0 } +}; + +static BOOL ov9_0224F1F8(u32 param0, int param1, int param2, u32 *param3) +{ + const UnkStruct_ov9_0225311C *v0 = Unk_ov9_0225311C; while (v0->unk_00 != 593) { if ((v0->unk_00 == param0) && (v0->unk_04 == param1) && (v0->unk_06 == param2)) { @@ -7384,11 +7379,11 @@ static BOOL ov9_0224F1F8 (u32 param0, int param1, int param2, u32 * param3) return 0; } -BOOL ov9_0224F240 (const MapObject * param0, int param1) +BOOL ov9_0224F240(const MapObject *param0, int param1) { int v0, v1; u32 v2, v3; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; fieldSystem = MapObject_FieldSystem(param0); v3 = fieldSystem->location->mapId; @@ -7400,11 +7395,11 @@ BOOL ov9_0224F240 (const MapObject * param0, int param1) return ov9_0224F1F8(v3, v0, v1, &v2); } -static BOOL ov9_0224F284 (const MapObject * param0, u32 * param1) +static BOOL ov9_0224F284(const MapObject *param0, u32 *param1) { int v0, v1; u32 v2; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; fieldSystem = MapObject_FieldSystem(param0); v2 = fieldSystem->location->mapId; @@ -7414,15 +7409,15 @@ static BOOL ov9_0224F284 (const MapObject * param0, u32 * param1) return ov9_0224F1F8(v2, v0, v1, param1); } -BOOL ov9_0224F2B0 (const MapObject * param0) +BOOL ov9_0224F2B0(const MapObject *param0) { u32 v0; return ov9_0224F284(param0, &v0); } -UnkStruct_ov9_0224F6EC * ov9_0224F2BC (FieldSystem * fieldSystem, TaskManager * param1, MapObject * param2) +UnkStruct_ov9_0224F6EC *ov9_0224F2BC(FieldSystem *fieldSystem, TaskManager *param1, MapObject *param2) { - UnkStruct_ov9_0224F6EC * v0; + UnkStruct_ov9_0224F6EC *v0; v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov9_0224F6EC)); memset(v0, 0, sizeof(UnkStruct_ov9_0224F6EC)); @@ -7454,22 +7449,22 @@ UnkStruct_ov9_0224F6EC * ov9_0224F2BC (FieldSystem * fieldSystem, TaskManager * return v0; } -static BOOL ov9_0224F324 (UnkStruct_ov9_0224F6EC * param0) +static BOOL ov9_0224F324(UnkStruct_ov9_0224F6EC *param0) { int v0; VecFx32 v1; - MapObject * v2 = param0->unk_0C; + MapObject *v2 = param0->unk_0C; MapObject_PosVectorOut(v2, &v1); v1.y -= FX32_ONE * 8; MapObject_SetPosVec(v2, &v1); - if (v1.y > (((115 << 4) * FX32_ONE))) { + if (v1.y > ((115 << 4) * FX32_ONE)) { return 0; } Sound_PlayEffect(1571); - v1.y = (((115 << 4) * FX32_ONE)); + v1.y = ((115 << 4) * FX32_ONE); sub_020632D4(v2, &v1, MapObject_Dir(v2)); sub_02062914(v2, 580); @@ -7498,13 +7493,12 @@ static BOOL ov9_0224F324 (UnkStruct_ov9_0224F6EC * param0) return 1; } -static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) +static BOOL ov9_0224F3BC(UnkStruct_ov9_0224F6EC *param0) { switch (param0->unk_10) { - case 0: - { + case 0: { VecFx32 v0; - MapObject * v1 = param0->unk_0C; + MapObject *v1 = param0->unk_0C; MapObject_PosVectorOut(v1, &v0); v0.y -= FX32_ONE * 2; @@ -7521,10 +7515,9 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) param0->unk_18 = 0; param0->unk_10++; break; - case 1: - { + case 1: { VecFx32 v2; - MapObject * v3 = param0->unk_0C; + MapObject *v3 = param0->unk_0C; MapObject_PosVectorOut(v3, &v2); v2.y -= FX32_ONE * 4; @@ -7541,7 +7534,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) { u32 v4 = 0, v5 = 0; - MapObject * v6 = param0->unk_0C; + MapObject *v6 = param0->unk_0C; ov9_02249DC8(param0->unk_00, param0->unk_14); @@ -7595,10 +7588,9 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) param0->unk_10++; break; - case 2: - { + case 2: { VecFx32 v12; - MapObject * v13 = param0->unk_0C; + MapObject *v13 = param0->unk_0C; sub_0206309C(v13, &v12); v12.y = param0->unk_1C + param0->unk_20; @@ -7619,7 +7611,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) { u32 v14 = 0, v15 = 0; - MapObject * v16 = param0->unk_0C; + MapObject *v16 = param0->unk_0C; switch (param0->unk_14) { case 6: @@ -7643,8 +7635,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) param0->unk_10++; break; } - case 3: - { + case 3: { int v17 = 0; v17 += ov9_02249E00( @@ -7655,7 +7646,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) param0->unk_00, 8); if (v17 >= 3) { - VarsFlags * v18 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v18 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); sub_0206AFC0(v18, 1); } @@ -7667,13 +7658,12 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0) return 0; } -static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0) +static BOOL ov9_0224F5D8(UnkStruct_ov9_0224F6EC *param0) { switch (param0->unk_10) { - case 0: - { + case 0: { VecFx32 v0; - MapObject * v1 = param0->unk_0C; + MapObject *v1 = param0->unk_0C; MapObject_PosVectorOut(v1, &v0); v0.y -= FX32_ONE * 2; @@ -7690,10 +7680,9 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0) param0->unk_18 = 0; param0->unk_10++; break; - case 1: - { + case 1: { VecFx32 v2; - MapObject * v3 = param0->unk_0C; + MapObject *v3 = param0->unk_0C; MapObject_PosVectorOut(v3, &v2); v2.y -= FX32_ONE * 4; @@ -7709,10 +7698,9 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0) param0->unk_18 = 0; param0->unk_10++; break; - case 2: - { + case 2: { VecFx32 v4; - MapObject * v5 = param0->unk_0C; + MapObject *v5 = param0->unk_0C; MapObject_PosVectorOut(v5, &v4); v4.y -= FX32_ONE * 8; @@ -7727,7 +7715,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0) { u32 v6 = 0, v7 = 0, v8 = 0, v9 = 0; - MapObject * v10 = param0->unk_0C; + MapObject *v10 = param0->unk_0C; switch (MapObject_Id(v10)) { case (0x80 + 0): @@ -7757,7 +7745,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0) return 0; } -BOOL ov9_0224F6EC (UnkStruct_ov9_0224F6EC * param0) +BOOL ov9_0224F6EC(UnkStruct_ov9_0224F6EC *param0) { BOOL v0; @@ -7780,13 +7768,13 @@ BOOL ov9_0224F6EC (UnkStruct_ov9_0224F6EC * param0) return v0; } -static void ov9_0224F724 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224F724(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224ADC0 * v0 = ¶m0->unk_1D00; + UnkStruct_ov9_0224ADC0 *v0 = ¶m0->unk_1D00; u32 v1 = ov9_022510D0(param0); if (v1 == 582) { - VarsFlags * v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); if (sub_0206B5D8(v2) == 13) { v0->unk_06 = 1; @@ -7797,19 +7785,19 @@ static void ov9_0224F724 (UnkStruct_ov9_02249B04 * param0) v0->unk_02 = -1; } -static void ov9_0224F760 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224F760(UnkStruct_ov9_02249B04 *param0) { return; } -static void ov9_0224F764 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224F764(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224ADC0 * v0 = ¶m0->unk_1D00; - PlayerAvatar * playerAvatar = param0->fieldSystem->playerAvatar; - const VecFx32 * v2 = PlayerAvatar_PosVector(playerAvatar); + UnkStruct_ov9_0224ADC0 *v0 = ¶m0->unk_1D00; + PlayerAvatar *playerAvatar = param0->fieldSystem->playerAvatar; + const VecFx32 *v2 = PlayerAvatar_PosVector(playerAvatar); if (v0->unk_06 == 0) { - v0->unk_00 = (v2->y - (((65 << 4) * FX32_ONE))) / ((((((289 - 65)) << 4) * FX32_ONE)) / 12); + v0->unk_00 = (v2->y - ((65 << 4) * FX32_ONE)) / ((((289 - 65) << 4) * FX32_ONE) / 12); } if (v0->unk_00 < 0) { @@ -7823,7 +7811,7 @@ static void ov9_0224F764 (UnkStruct_ov9_02249B04 * param0) do { ov9_0224F86C( - v0->unk_08[v3], ((4 | (4 << 5) | (8 << 10))), v0->unk_00, &v0->unk_28[v3]); + v0->unk_08[v3], (4 | (4 << 5) | (8 << 10)), v0->unk_00, &v0->unk_28[v3]); v3++; } while (v3 < 16); @@ -7831,7 +7819,7 @@ static void ov9_0224F764 (UnkStruct_ov9_02249B04 * param0) do { ov9_0224F86C( - v0->unk_48[v3], ((6 | (6 << 5) | (8 << 10))), v0->unk_00, &v0->unk_E8[v3]); + v0->unk_48[v3], (6 | (6 << 5) | (8 << 10)), v0->unk_00, &v0->unk_E8[v3]); v3++; } while (v3 < (16 * 5)); @@ -7840,9 +7828,9 @@ static void ov9_0224F764 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224F804 (UnkStruct_ov9_02249B04 * param0) +static void ov9_0224F804(UnkStruct_ov9_02249B04 *param0) { - UnkStruct_ov9_0224ADC0 * v0 = ¶m0->unk_1D00; + UnkStruct_ov9_0224ADC0 *v0 = ¶m0->unk_1D00; if (v0->unk_04 == 1) { { @@ -7852,9 +7840,9 @@ static void ov9_0224F804 (UnkStruct_ov9_02249B04 * param0) { u32 v1; - UnkStruct_ov9_0224B064 * v2; - UnkStruct_02009DC8 * v3; - const NNSG2dImagePaletteProxy * v4; + UnkStruct_ov9_0224B064 *v2; + UnkStruct_02009DC8 *v3; + const NNSG2dImagePaletteProxy *v4; v2 = ¶m0->unk_1A8; v3 = v2->unk_1BC[0]; @@ -7869,22 +7857,22 @@ static void ov9_0224F804 (UnkStruct_ov9_02249B04 * param0) } } -static void ov9_0224F854 (UnkStruct_ov9_02249B04 * param0, u32 param1) +static void ov9_0224F854(UnkStruct_ov9_02249B04 *param0, u32 param1) { - UnkStruct_ov9_0224ADC0 * v0 = ¶m0->unk_1D00; + UnkStruct_ov9_0224ADC0 *v0 = ¶m0->unk_1D00; v0->unk_06 = param1; } -static void ov9_0224F860 (UnkStruct_ov9_02249B04 * param0, s16 param1) +static void ov9_0224F860(UnkStruct_ov9_02249B04 *param0, s16 param1) { - UnkStruct_ov9_0224ADC0 * v0 = ¶m0->unk_1D00; + UnkStruct_ov9_0224ADC0 *v0 = ¶m0->unk_1D00; v0->unk_00 = param1; } -static void ov9_0224F86C (u16 param0, u16 param1, u16 param2, u16 * param3) +static void ov9_0224F86C(u16 param0, u16 param1, u16 param2, u16 *param3) { - const UnkStruct_ov9_0224F86C * v0 = (UnkStruct_ov9_0224F86C *)¶m0; - const UnkStruct_ov9_0224F86C * v1 = (UnkStruct_ov9_0224F86C *)¶m1; + const UnkStruct_ov9_0224F86C *v0 = (UnkStruct_ov9_0224F86C *)¶m0; + const UnkStruct_ov9_0224F86C *v1 = (UnkStruct_ov9_0224F86C *)¶m1; if (param2 > 16) { param2 = 16; @@ -7893,7 +7881,7 @@ static void ov9_0224F86C (u16 param0, u16 param1, u16 param2, u16 * param3) (*param3) = (v0->unk_00_0 + ((v1->unk_00_0 - v0->unk_00_0) * param2 >> 4)) | ((v0->unk_00_5 + ((v1->unk_00_5 - v0->unk_00_5) * param2 >> 4)) << 5) | ((v0->unk_00_10 + ((v1->unk_00_10 - v0->unk_00_10) * param2 >> 4)) << 10); } -static void ov9_0224F8C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224F930 * param1, const UnkStruct_ov9_0224F8C4 * param2, const VecFx32 * param3) +static void ov9_0224F8C4(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224F930 *param1, const UnkStruct_ov9_0224F8C4 *param2, const VecFx32 *param3) { param1->unk_00_3 = param2->unk_00; param1->unk_00_1 = param2->unk_04; @@ -7907,7 +7895,7 @@ static void ov9_0224F8C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224F93 param1->unk_34 = *param3; } -static void ov9_0224F930 (UnkStruct_ov9_0224F930 * param0, int param1, fx32 param2, fx32 param3) +static void ov9_0224F930(UnkStruct_ov9_0224F930 *param0, int param1, fx32 param2, fx32 param3) { switch (param1) { case 0: @@ -7928,7 +7916,7 @@ static void ov9_0224F930 (UnkStruct_ov9_0224F930 * param0, int param1, fx32 para param0->unk_00_2 = 1; } -static BOOL ov9_0224F970 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224F930 * param1) +static BOOL ov9_0224F970(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224F930 *param1) { if (param1->unk_10.x != param1->unk_1C.x) { param1->unk_10.x += param1->unk_04.x; @@ -8003,7 +7991,7 @@ static BOOL ov9_0224F970 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224F93 } static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251E40 = { - {0x0, 0x0, 0x0, 0x0}, + { 0x0, 0x0, 0x0, 0x0 }, 0xF5, 0xEF, 0x0, @@ -8012,7 +8000,7 @@ static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251E40 = { }; static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251888 = { - {0x0, 0x0, 0x0, 0x0}, + { 0x0, 0x0, 0x0, 0x0 }, 0x0, 0x0, 0x0, @@ -8020,9 +8008,9 @@ static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251888 = { 0x20 }; -static void ov9_0224FA94 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224FA94 * param1) +static void ov9_0224FA94(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_0224FA94 *param1) { - MapObject * v0 = Player_MapObject(param0->fieldSystem->playerAvatar); + MapObject *v0 = Player_MapObject(param0->fieldSystem->playerAvatar); int v1 = (((param1->unk_40.unk_10.y) >> 4) / FX32_ONE); if ((param1->unk_04 == 0) && (v1 == -20)) { @@ -8046,14 +8034,14 @@ static void ov9_0224FA94 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224FA9 } } -static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224FB3C(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { VecFx32 v0; - UnkStruct_ov9_0224F930 * v1; - MapObject * v2; - PlayerAvatar * playerAvatar; - UnkStruct_ov9_0224FA94 * v4; - const UnkStruct_ov9_02252384 * v5; + UnkStruct_ov9_0224F930 *v1; + MapObject *v2; + PlayerAvatar *playerAvatar; + UnkStruct_ov9_0224FA94 *v4; + const UnkStruct_ov9_02252384 *v5; v5 = param3; v4 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_0224FA94)); @@ -8073,14 +8061,14 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, ov9_0224A4D0(param0, v2, 90, v4->unk_00); { - VecFx32 v6 = {0, 0, 0}; + VecFx32 v6 = { 0, 0, 0 }; sub_020630AC(v2, &v6); } { - VecFx32 * v7; - UnkStruct_ov101_021D5D90 * v8 = sub_0205EC04(playerAvatar); - UnkStruct_ov5_02201C58 * v9 = ov5_021F88A8(v8); + VecFx32 *v7; + UnkStruct_ov101_021D5D90 *v8 = sub_0205EC04(playerAvatar); + UnkStruct_ov5_02201C58 *v9 = ov5_021F88A8(v8); ov5_021F88B4(v8, 2, 5); ov5_021F88CC(v8, 1 << 2 | 1 << 4 | 1 << 6 | 1 << 5); @@ -8109,21 +8097,21 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_0224FC2C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224FC2C(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - MapObject * v0 = Player_MapObject(param0->fieldSystem->playerAvatar); - UnkStruct_ov9_0224FA94 * v1 = ov9_0224E39C(param0); - UnkStruct_ov9_0224F930 * v2 = &v1->unk_40; + MapObject *v0 = Player_MapObject(param0->fieldSystem->playerAvatar); + UnkStruct_ov9_0224FA94 *v1 = ov9_0224E39C(param0); + UnkStruct_ov9_0224F930 *v2 = &v1->unk_40; ov9_0224F970(param0, v2); MapObject_SetPosVec(v0, &v2->unk_34); ov9_0224FA94(param0, v1); { - UnkStruct_ov101_021D5D90 * v3 = sub_0205EC04(param0->fieldSystem->playerAvatar); + UnkStruct_ov101_021D5D90 *v3 = sub_0205EC04(param0->fieldSystem->playerAvatar); { - UnkStruct_ov5_02201C58 * v4 = ov5_021F88A8(v3); + UnkStruct_ov5_02201C58 *v4 = ov5_021F88A8(v3); ov9_02250F1C(&v1->unk_0C.x, v1->unk_18.x); ov9_02250F1C(&v1->unk_0C.y, v1->unk_18.y); @@ -8140,7 +8128,7 @@ static int ov9_0224FC2C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, } { - VecFx32 * v5 = ov5_021F88FC(v3); + VecFx32 *v5 = ov5_021F88FC(v3); v5->x += v1->unk_24.x; v5->y += v1->unk_24.y; @@ -8158,8 +8146,8 @@ static int ov9_0224FC2C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, ov9_0224F930(v2, 0, 0x400, (FX32_ONE * 4)); { - UnkStruct_ov101_021D5D90 * v6 = sub_0205EC04(param0->fieldSystem->playerAvatar); - VecFx32 * v7; + UnkStruct_ov101_021D5D90 *v6 = sub_0205EC04(param0->fieldSystem->playerAvatar); + VecFx32 *v7; v7 = ov5_021F88FC(v6); v7->x = 0; @@ -8180,13 +8168,13 @@ static int ov9_0224FC2C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_0224FD74 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224FD74(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { int v0; - UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->fieldSystem->playerAvatar); - MapObject * v2 = Player_MapObject(param0->fieldSystem->playerAvatar); - UnkStruct_ov9_0224FA94 * v3 = ov9_0224E39C(param0); - UnkStruct_ov9_0224F930 * v4 = &v3->unk_40; + UnkStruct_ov101_021D5D90 *v1 = sub_0205EC04(param0->fieldSystem->playerAvatar); + MapObject *v2 = Player_MapObject(param0->fieldSystem->playerAvatar); + UnkStruct_ov9_0224FA94 *v3 = ov9_0224E39C(param0); + UnkStruct_ov9_0224F930 *v4 = &v3->unk_40; v0 = ov9_0224F970(param0, v4); MapObject_SetPosVec(v2, &v4->unk_34); @@ -8201,8 +8189,8 @@ static int ov9_0224FD74 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, ov9_0224FA94(param0, v3); { - VecFx32 * v6 = ov5_021F88FC(v1); - VecFx32 * v7 = ov5_021F88F0(v1); + VecFx32 *v6 = ov5_021F88FC(v1); + VecFx32 *v7 = ov5_021F88F0(v1); *v7 = v4->unk_40; @@ -8256,13 +8244,13 @@ static int ov9_0224FD74 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0224FEDC(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { int v0; - UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->fieldSystem->playerAvatar); - MapObject * v2 = Player_MapObject(param0->fieldSystem->playerAvatar); - UnkStruct_ov9_0224FA94 * v3 = ov9_0224E39C(param0); - UnkStruct_ov9_0224F930 * v4 = &v3->unk_40; + UnkStruct_ov101_021D5D90 *v1 = sub_0205EC04(param0->fieldSystem->playerAvatar); + MapObject *v2 = Player_MapObject(param0->fieldSystem->playerAvatar); + UnkStruct_ov9_0224FA94 *v3 = ov9_0224E39C(param0); + UnkStruct_ov9_0224F930 *v4 = &v3->unk_40; v0 = ov9_0224F970(param0, v4); @@ -8272,8 +8260,8 @@ static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, ov9_0224FA94(param0, v3); { - VecFx32 * v5; - UnkStruct_ov5_02201C58 * v6 = ov5_021F88A8(v1); + VecFx32 *v5; + UnkStruct_ov5_02201C58 *v6 = ov5_021F88A8(v1); ov9_02250F1C(&v3->unk_0C.x, v3->unk_18.x); ov9_02250F1C(&v3->unk_0C.y, v3->unk_18.y); @@ -8287,7 +8275,7 @@ static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, ov5_021F8908(v1, ((v3->unk_30) / FX32_ONE)); { - VecFx32 * v7 = ov5_021F88FC(v1); + VecFx32 *v7 = ov5_021F88FC(v1); v7->x += v3->unk_24.x; v7->y += v3->unk_24.y; @@ -8297,9 +8285,9 @@ static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, if (v0 == 3) { int v8, v9, v10; - const UnkStruct_ov9_02252384 * v11 = param3; - const UnkStruct_ov9_0224F8C4 * v12 = &v11->unk_00; - VecFx32 v13 = {0, 0, 0}; + const UnkStruct_ov9_02252384 *v11 = param3; + const UnkStruct_ov9_0224F8C4 *v12 = &v11->unk_00; + VecFx32 v13 = { 0, 0, 0 }; v8 = MapObject_GetXPos(v2) + v12->unk_06; v9 = MapObject_GetYPos(v2) + ((v12->unk_08) * 2); @@ -8319,7 +8307,7 @@ static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { { - VecFx32 * v14 = ov5_021F88FC(v1); + VecFx32 *v14 = ov5_021F88FC(v1); *v14 = v13; v14 = ov5_021F88F0(v1); @@ -8343,11 +8331,11 @@ static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_022500E0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_022500E0(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - u32 v0[2] = {0xa, 0x6}; - UnkStruct_ov9_0224FA94 * v1 = ov9_0224E39C(param0); - MapObject * v2 = Player_MapObject(param0->fieldSystem->playerAvatar); + u32 v0[2] = { 0xa, 0x6 }; + UnkStruct_ov9_0224FA94 *v1 = ov9_0224E39C(param0); + MapObject *v2 = Player_MapObject(param0->fieldSystem->playerAvatar); if (LocalMapObj_IsAnimationSet(v2) == 0) { return 0; @@ -8371,7 +8359,7 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251544[5] = { }; static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251C48 = { - {0x0, 0x0, 0x0, 0x0}, + { 0x0, 0x0, 0x0, 0x0 }, 0x37, 0xF0, 0x0, @@ -8379,9 +8367,9 @@ static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251C48 = { 0x10 }; -static void ov9_02250138 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_02250138 * param1) +static void ov9_02250138(UnkStruct_ov9_02249B04 *param0, UnkStruct_ov9_02250138 *param1) { - MapObject * v0 = Player_MapObject(param0->fieldSystem->playerAvatar); + MapObject *v0 = Player_MapObject(param0->fieldSystem->playerAvatar); int v1 = (((param1->unk_34.unk_10.y) >> 4) / FX32_ONE); if ((param1->unk_04 == 0) && (v1 == 20)) { @@ -8390,14 +8378,14 @@ static void ov9_02250138 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0225013 } } -static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250170(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { VecFx32 v0; - UnkStruct_ov9_0224F930 * v1; - MapObject * v2; - PlayerAvatar * playerAvatar; - UnkStruct_ov9_02250138 * v4; - const UnkStruct_ov9_022523F0 * v5; + UnkStruct_ov9_0224F930 *v1; + MapObject *v2; + PlayerAvatar *playerAvatar; + UnkStruct_ov9_02250138 *v4; + const UnkStruct_ov9_022523F0 *v5; v5 = param3; v4 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_02250138)); @@ -8417,14 +8405,14 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, ov9_0224A4D0(param0, v2, -90, v4->unk_00); { - VecFx32 v6 = {0, 0, 0}; + VecFx32 v6 = { 0, 0, 0 }; sub_020630AC(v2, &v6); } { - VecFx32 * v7; - UnkStruct_ov101_021D5D90 * v8 = sub_0205EC04(playerAvatar); - UnkStruct_ov5_02201C58 * v9 = ov5_021F88A8(v8); + VecFx32 *v7; + UnkStruct_ov101_021D5D90 *v8 = sub_0205EC04(playerAvatar); + UnkStruct_ov5_02201C58 *v9 = ov5_021F88A8(v8); ov5_021F88B4(v8, 3, 1); ov5_021F88CC(v8, 1 << 2 | 1 << 4 | 1 << 6 | 1 << 5); @@ -8453,21 +8441,21 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250260 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250260(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - MapObject * v0 = Player_MapObject(param0->fieldSystem->playerAvatar); - UnkStruct_ov9_02250138 * v1 = ov9_0224E39C(param0); - UnkStruct_ov9_0224F930 * v2 = &v1->unk_34; + MapObject *v0 = Player_MapObject(param0->fieldSystem->playerAvatar); + UnkStruct_ov9_02250138 *v1 = ov9_0224E39C(param0); + UnkStruct_ov9_0224F930 *v2 = &v1->unk_34; ov9_0224F970(param0, v2); MapObject_SetPosVec(v0, &v2->unk_34); ov9_02250138(param0, v1); { - UnkStruct_ov101_021D5D90 * v3 = sub_0205EC04(param0->fieldSystem->playerAvatar); + UnkStruct_ov101_021D5D90 *v3 = sub_0205EC04(param0->fieldSystem->playerAvatar); { - UnkStruct_ov5_02201C58 * v4 = ov5_021F88A8(v3); + UnkStruct_ov5_02201C58 *v4 = ov5_021F88A8(v3); ov9_02250F1C(&v1->unk_08.x, v1->unk_14.x); ov9_02250F1C(&v1->unk_08.y, v1->unk_14.y); @@ -8484,7 +8472,7 @@ static int ov9_02250260 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, } { - VecFx32 * v5 = ov5_021F88FC(v3); + VecFx32 *v5 = ov5_021F88FC(v3); v5->x += v1->unk_20.x; v5->y += v1->unk_20.y; @@ -8502,8 +8490,8 @@ static int ov9_02250260 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, ov9_0224F930(v2, 0, 0x200, (FX32_ONE * 4)); { - UnkStruct_ov101_021D5D90 * v6 = sub_0205EC04(param0->fieldSystem->playerAvatar); - VecFx32 * v7; + UnkStruct_ov101_021D5D90 *v6 = sub_0205EC04(param0->fieldSystem->playerAvatar); + VecFx32 *v7; v7 = ov5_021F88FC(v6); v7->x = 0; @@ -8521,13 +8509,13 @@ static int ov9_02250260 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250388 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250388(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { int v0; - UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->fieldSystem->playerAvatar); - MapObject * v2 = Player_MapObject(param0->fieldSystem->playerAvatar); - UnkStruct_ov9_02250138 * v3 = ov9_0224E39C(param0); - UnkStruct_ov9_0224F930 * v4 = &v3->unk_34; + UnkStruct_ov101_021D5D90 *v1 = sub_0205EC04(param0->fieldSystem->playerAvatar); + MapObject *v2 = Player_MapObject(param0->fieldSystem->playerAvatar); + UnkStruct_ov9_02250138 *v3 = ov9_0224E39C(param0); + UnkStruct_ov9_0224F930 *v4 = &v3->unk_34; v0 = ov9_0224F970(param0, v4); @@ -8536,12 +8524,12 @@ static int ov9_02250388 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, ov9_02250138(param0, v3); { - VecFx32 * v5 = ov5_021F88F0(v1); + VecFx32 *v5 = ov5_021F88F0(v1); *v5 = v4->unk_40; if (v3->unk_04 == 1) { - VecFx32 * v6 = ov5_021F88FC(v1); + VecFx32 *v6 = ov5_021F88FC(v1); if (v6->z < (FX32_ONE * 10)) { v6->x += v3->unk_20.x; @@ -8574,13 +8562,13 @@ static int ov9_02250388 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250468(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { int v0; - UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->fieldSystem->playerAvatar); - MapObject * v2 = Player_MapObject(param0->fieldSystem->playerAvatar); - UnkStruct_ov9_02250138 * v3 = ov9_0224E39C(param0); - UnkStruct_ov9_0224F930 * v4 = &v3->unk_34; + UnkStruct_ov101_021D5D90 *v1 = sub_0205EC04(param0->fieldSystem->playerAvatar); + MapObject *v2 = Player_MapObject(param0->fieldSystem->playerAvatar); + UnkStruct_ov9_02250138 *v3 = ov9_0224E39C(param0); + UnkStruct_ov9_0224F930 *v4 = &v3->unk_34; v0 = ov9_0224F970(param0, v4); @@ -8590,8 +8578,8 @@ static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, ov9_02250138(param0, v3); { - VecFx32 * v5; - UnkStruct_ov5_02201C58 * v6 = ov5_021F88A8(v1); + VecFx32 *v5; + UnkStruct_ov5_02201C58 *v6 = ov5_021F88A8(v1); ov9_02250F1C(&v3->unk_08.x, v3->unk_14.x); ov9_02250F1C(&v3->unk_08.y, v3->unk_14.y); @@ -8605,7 +8593,7 @@ static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, ov5_021F8908(v1, ((v3->unk_2C) / FX32_ONE)); { - VecFx32 * v7 = ov5_021F88FC(v1); + VecFx32 *v7 = ov5_021F88FC(v1); v7->x += v3->unk_20.x; v7->y += v3->unk_20.y; @@ -8615,9 +8603,9 @@ static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, if (v0 == 3) { int v8, v9, v10; - const UnkStruct_ov9_022523F0 * v11 = param3; - const UnkStruct_ov9_0224F8C4 * v12 = &v11->unk_00; - VecFx32 v13 = {0, 0, 0}; + const UnkStruct_ov9_022523F0 *v11 = param3; + const UnkStruct_ov9_0224F8C4 *v12 = &v11->unk_00; + VecFx32 v13 = { 0, 0, 0 }; v8 = MapObject_GetXPos(v2) + v12->unk_06; v9 = MapObject_GetYPos(v2) + ((v12->unk_08) * 2); @@ -8637,7 +8625,7 @@ static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, { { - VecFx32 * v14 = ov5_021F88FC(v1); + VecFx32 *v14 = ov5_021F88FC(v1); *v14 = v13; v14 = ov5_021F88F0(v1); @@ -8656,11 +8644,11 @@ static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250650 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250650(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - u32 v0[3] = {0x97, 0x93, 0x73}; - UnkStruct_ov9_02250138 * v1 = ov9_0224E39C(param0); - MapObject * v2 = Player_MapObject(param0->fieldSystem->playerAvatar); + u32 v0[3] = { 0x97, 0x93, 0x73 }; + UnkStruct_ov9_02250138 *v1 = ov9_0224E39C(param0); + MapObject *v2 = Player_MapObject(param0->fieldSystem->playerAvatar); if (LocalMapObj_IsAnimationSet(v2) == 0) { return 0; @@ -8683,16 +8671,16 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_0225151C[5] = { ov9_02250650 }; -static int ov9_022506AC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_022506AC(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - const UnkStruct_ov9_022506AC * v0 = param3; + const UnkStruct_ov9_022506AC *v0 = param3; sub_0203E8E0(param1, v0->unk_00, NULL, NULL); (*param2)++; return 0; } -static int ov9_022506CC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_022506CC(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { return 2; } @@ -8702,10 +8690,10 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_022512C0[2] = { ov9_022506CC }; -static int ov9_022506D0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_022506D0(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - const UnkStruct_ov9_022506D0 * v0 = param3; - VarsFlags * v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + const UnkStruct_ov9_022506D0 *v0 = param3; + VarsFlags *v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); sub_0206B5E8(v1, v0->unk_00); return 2; @@ -8715,10 +8703,10 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251238[1] = { ov9_022506D0 }; -static int ov9_022506EC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_022506EC(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - const UnkStruct_ov9_022506EC * v0 = param3; - VarsFlags * v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + const UnkStruct_ov9_022506EC *v0 = param3; + VarsFlags *v1 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); sub_0206AFB0(v1, 1, v0->unk_00); return 2; @@ -8728,9 +8716,9 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_0225121C[1] = { ov9_022506EC }; -static int ov9_02250704 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250704(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - const UnkStruct_ov9_02250704 * v0 = param3; + const UnkStruct_ov9_02250704 *v0 = param3; ov9_02249DC8(param0, v0->unk_00); return 2; @@ -8740,9 +8728,9 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251270[1] = { ov9_02250704 }; -static int ov9_02250710 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250710(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - const UnkStruct_ov9_02250704 * v0 = param3; + const UnkStruct_ov9_02250704 *v0 = param3; ov9_02249DE4(param0, v0->unk_00); return 2; @@ -8752,16 +8740,16 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251254[1] = { ov9_02250710 }; -static int ov9_0225071C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0225071C(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - const UnkStruct_ov9_02252414 * v0 = param3; + const UnkStruct_ov9_02252414 *v0 = param3; ov9_0224E91C(param0, v0); *param2 = 1; return 0; } -static int ov9_02250730 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250730(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { if (ov9_0224E964(param0) == 1) { ov9_0224E988(param0); @@ -8795,7 +8783,7 @@ static const u16 Unk_ov9_02252284[16] = { 0x7fff }; -static void ov9_0225074C (UnkStruct_ov9_0225074C * param0) +static void ov9_0225074C(UnkStruct_ov9_0225074C *param0) { u32 v0, v1 = ((param0->unk_00) / FX32_ONE); @@ -8804,15 +8792,15 @@ static void ov9_0225074C (UnkStruct_ov9_0225074C * param0) } } -void ov9_02250780 (FieldSystem * fieldSystem) +void ov9_02250780(FieldSystem *fieldSystem) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; if (v0->unk_1EC0 == 1) { - UnkStruct_ov9_0225074C * v1 = ov9_0224E39C(v0); - UnkStruct_ov5_021ED0A4 * v2 = sub_0206285C(v0->fieldSystem->mapObjMan); - UnkStruct_02022BD8 * v3 = ov5_021EDCB0(v2); - UnkStruct_02022BD8_2 * v4 = sub_02022D98(v3, 0xe6); + UnkStruct_ov9_0225074C *v1 = ov9_0224E39C(v0); + UnkStruct_ov5_021ED0A4 *v2 = sub_0206285C(v0->fieldSystem->mapObjMan); + UnkStruct_02022BD8 *v3 = ov5_021EDCB0(v2); + UnkStruct_02022BD8_2 *v4 = sub_02022D98(v3, 0xe6); NNSGfdPlttKey v5 = sub_02022F14(v4); u32 v6 = NNS_GfdGetPlttKeyAddr(v5); @@ -8820,9 +8808,9 @@ void ov9_02250780 (FieldSystem * fieldSystem) } } -static int ov9_022507C4 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_022507C4(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_0225074C * v0; + UnkStruct_ov9_0225074C *v0; v0 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_0225074C)); v0->unk_18 = ov9_0224F0D4(param0, 582, (0x80 + 0)); @@ -8834,10 +8822,10 @@ static int ov9_022507C4 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_022507FC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_022507FC(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_020216E0 * v0; - UnkStruct_ov9_0225074C * v1; + UnkStruct_020216E0 *v0; + UnkStruct_ov9_0225074C *v1; v1 = ov9_0224E39C(param0); v0 = ov5_021EB1A0(v1->unk_18); @@ -8859,9 +8847,9 @@ static int ov9_022507FC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250854 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250854(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_0225074C * v0; + UnkStruct_ov9_0225074C *v0; v0 = ov9_0224E39C(param0); v0->unk_04 += (FX32_ONE * 8) / (3 * 30); @@ -8887,11 +8875,11 @@ static int ov9_02250854 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_022508C0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_022508C0(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_020216E0 * v0; - NNSG3dResMdl * v1; - UnkStruct_ov9_0225074C * v2; + UnkStruct_020216E0 *v0; + NNSG3dResMdl *v1; + UnkStruct_ov9_0225074C *v2; v2 = ov9_0224E39C(param0); v0 = ov5_021EB1A0(v2->unk_18); @@ -8908,9 +8896,9 @@ static int ov9_022508C0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_022508F4 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_022508F4(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_0225074C * v0; + UnkStruct_ov9_0225074C *v0; v0 = ov9_0224E39C(param0); v0->unk_14++; @@ -8931,9 +8919,9 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251490[5] = { ov9_022508F4 }; -static int ov9_02250918 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250918(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250918 * v0; + UnkStruct_ov9_02250918 *v0; v0 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_02250918)); v0->unk_20 = ov9_0224F0D4(param0, 579, (0x80 + 3)); @@ -8945,9 +8933,9 @@ static int ov9_02250918 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_0225094C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_0225094C(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250918 * v0; + UnkStruct_ov9_02250918 *v0; fx32 v1 = (FX32_ONE * 2); v0 = ov9_0224E39C(param0); @@ -8966,9 +8954,9 @@ static int ov9_0225094C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250994 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250994(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250918 * v0; + UnkStruct_ov9_02250918 *v0; v0 = ov9_0224E39C(param0); v0->unk_14.z -= (FX32_ONE * 1); @@ -8982,10 +8970,10 @@ static int ov9_02250994 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_022509D4 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_022509D4(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250918 * v0; - fx32 v1[8] = {0x0, 0x800, 0x1000, 0x2000, 0x4000, 0x6000, 0x7000, 0x8000}; + UnkStruct_ov9_02250918 *v0; + fx32 v1[8] = { 0x0, 0x800, 0x1000, 0x2000, 0x4000, 0x6000, 0x7000, 0x8000 }; v0 = ov9_0224E39C(param0); v0->unk_14.y = v0->unk_0C + v1[v0->unk_00 >> 1]; @@ -9009,9 +8997,9 @@ static int ov9_022509D4 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250A58 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250A58(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250918 * v0; + UnkStruct_ov9_02250918 *v0; v0 = ov9_0224E39C(param0); v0->unk_14.z += (FX32_ONE * 1); @@ -9025,9 +9013,9 @@ static int ov9_02250A58 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250A90 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250A90(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250918 * v0; + UnkStruct_ov9_02250918 *v0; v0 = ov9_0224E39C(param0); @@ -9059,18 +9047,18 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251CC0[6] = { }; static const MapObjectAnimCmd Unk_ov9_02251E74[] = { - {0x42, 0x1}, - {0x7, 0x1}, - {0x7, 0x1}, - {0xA, 0x1}, - {0x6, 0x1}, - {0x41, 0x1}, - {0xfe, 0x0} + { 0x42, 0x1 }, + { 0x7, 0x1 }, + { 0x7, 0x1 }, + { 0xA, 0x1 }, + { 0x6, 0x1 }, + { 0x41, 0x1 }, + { 0xfe, 0x0 } }; -static int ov9_02250AFC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250AFC(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250AFC * v0; + UnkStruct_ov9_02250AFC *v0; v0 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_02250AFC)); v0->unk_14 = ov9_0224F0D4(param0, 579, (0x80 + 4)); @@ -9081,9 +9069,9 @@ static int ov9_02250AFC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250B30 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250B30(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250AFC * v0; + UnkStruct_ov9_02250AFC *v0; fx32 v1 = (FX32_ONE * 2); v0 = ov9_0224E39C(param0); @@ -9104,9 +9092,9 @@ static int ov9_02250B30 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250B84 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250B84(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250AFC * v0; + UnkStruct_ov9_02250AFC *v0; v0 = ov9_0224E39C(param0); @@ -9119,9 +9107,9 @@ static int ov9_02250B84 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250BAC (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250BAC(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250AFC * v0; + UnkStruct_ov9_02250AFC *v0; v0 = ov9_0224E39C(param0); @@ -9151,97 +9139,97 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251408[4] = { }; static const MapObjectAnimCmd Unk_ov9_02252D80[] = { - {0x42, 0x1}, - {0xf, 0x2}, - {0x10, 0x2}, - {0x13, 0x2}, - {0x11, 0x2}, - {0x12, 0x2}, - {0x10, 0x2}, - {0x13, 0x2}, - {0x11, 0x2}, - {0x12, 0x2}, - {0x12, 0x2}, - {0xE, 0x1}, - {0xA, 0x1}, - {0x42, 0x1}, - {0xB, 0x2}, - {0x7, 0x1}, - {0x41, 0x1}, - {0xfe, 0x0} + { 0x42, 0x1 }, + { 0xf, 0x2 }, + { 0x10, 0x2 }, + { 0x13, 0x2 }, + { 0x11, 0x2 }, + { 0x12, 0x2 }, + { 0x10, 0x2 }, + { 0x13, 0x2 }, + { 0x11, 0x2 }, + { 0x12, 0x2 }, + { 0x12, 0x2 }, + { 0xE, 0x1 }, + { 0xA, 0x1 }, + { 0x42, 0x1 }, + { 0xB, 0x2 }, + { 0x7, 0x1 }, + { 0x41, 0x1 }, + { 0xfe, 0x0 } }; static const MapObjectAnimCmd Unk_ov9_02252DC8[] = { - {0x42, 0x1}, - {0xf, 0x2}, - {0x10, 0x1}, - {0x13, 0x2}, - {0x11, 0x2}, - {0x12, 0x2}, - {0x10, 0x2}, - {0x13, 0x2}, - {0x11, 0x2}, - {0x12, 0x2}, - {0x10, 0x1}, - {0x12, 0x2}, - {0xE, 0x1}, - {0xA, 0x1}, - {0x42, 0x1}, - {0xB, 0x2}, - {0x7, 0x1}, - {0x41, 0x1}, - {0xfe, 0x0} + { 0x42, 0x1 }, + { 0xf, 0x2 }, + { 0x10, 0x1 }, + { 0x13, 0x2 }, + { 0x11, 0x2 }, + { 0x12, 0x2 }, + { 0x10, 0x2 }, + { 0x13, 0x2 }, + { 0x11, 0x2 }, + { 0x12, 0x2 }, + { 0x10, 0x1 }, + { 0x12, 0x2 }, + { 0xE, 0x1 }, + { 0xA, 0x1 }, + { 0x42, 0x1 }, + { 0xB, 0x2 }, + { 0x7, 0x1 }, + { 0x41, 0x1 }, + { 0xfe, 0x0 } }; static const MapObjectAnimCmd Unk_ov9_02252E14[] = { - {0x42, 0x1}, - {0x3f, 0x2}, - {0x2, 0x1}, - {0x3C, 0x3}, - {0x0, 0x1}, - {0x3C, 0x3}, - {0x3, 0x1}, - {0x3C, 0x3}, - {0x1, 0x1}, - {0x3C, 0x3}, - {0x2, 0x1}, - {0x3C, 0x3}, - {0x0, 0x1}, - {0x3C, 0x3}, - {0x3, 0x1}, - {0x3C, 0x3}, - {0x1, 0x1}, - {0x3C, 0x3}, - {0x2, 0x1}, - {0xfe, 0x0} + { 0x42, 0x1 }, + { 0x3f, 0x2 }, + { 0x2, 0x1 }, + { 0x3C, 0x3 }, + { 0x0, 0x1 }, + { 0x3C, 0x3 }, + { 0x3, 0x1 }, + { 0x3C, 0x3 }, + { 0x1, 0x1 }, + { 0x3C, 0x3 }, + { 0x2, 0x1 }, + { 0x3C, 0x3 }, + { 0x0, 0x1 }, + { 0x3C, 0x3 }, + { 0x3, 0x1 }, + { 0x3C, 0x3 }, + { 0x1, 0x1 }, + { 0x3C, 0x3 }, + { 0x2, 0x1 }, + { 0xfe, 0x0 } }; static const MapObjectAnimCmd Unk_ov9_02252E64[] = { - {0x42, 0x1}, - {0x3f, 0x2}, - {0x2, 0x1}, - {0x3C, 0x3}, - {0x0, 0x1}, - {0x3C, 0x3}, - {0x3, 0x1}, - {0x3C, 0x3}, - {0x1, 0x1}, - {0x3C, 0x3}, - {0x2, 0x1}, - {0x3C, 0x3}, - {0x0, 0x1}, - {0x3C, 0x3}, - {0x3, 0x1}, - {0x3C, 0x3}, - {0x1, 0x1}, - {0x3C, 0x3}, - {0x2, 0x1}, - {0xfe, 0x0} -}; - -static int ov9_02250C14 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) -{ - UnkStruct_ov9_02250C14 * v0; + { 0x42, 0x1 }, + { 0x3f, 0x2 }, + { 0x2, 0x1 }, + { 0x3C, 0x3 }, + { 0x0, 0x1 }, + { 0x3C, 0x3 }, + { 0x3, 0x1 }, + { 0x3C, 0x3 }, + { 0x1, 0x1 }, + { 0x3C, 0x3 }, + { 0x2, 0x1 }, + { 0x3C, 0x3 }, + { 0x0, 0x1 }, + { 0x3C, 0x3 }, + { 0x3, 0x1 }, + { 0x3C, 0x3 }, + { 0x1, 0x1 }, + { 0x3C, 0x3 }, + { 0x2, 0x1 }, + { 0xfe, 0x0 } +}; + +static int ov9_02250C14(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) +{ + UnkStruct_ov9_02250C14 *v0; v0 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_02250AFC)); v0->unk_18 = ov9_0224F0D4(param0, 579, (0x80 + 5)); @@ -9251,9 +9239,9 @@ static int ov9_02250C14 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250C48 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250C48(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250C14 * v0; + UnkStruct_ov9_02250C14 *v0; fx32 v1 = (FX32_ONE * 2); v0 = ov9_0224E39C(param0); @@ -9267,7 +9255,7 @@ static int ov9_02250C48 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, if ((((v0->unk_04.y) >> 4) / FX32_ONE) >= 9) { int v2, v3, v4; - const MapObjectAnimCmd * v5, * v6; + const MapObjectAnimCmd *v5, *v6; ov9_02250F44(param0, &v2, &v3, &v4); @@ -9287,9 +9275,9 @@ static int ov9_02250C48 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250CD8 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250CD8(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250C14 * v0; + UnkStruct_ov9_02250C14 *v0; v0 = ov9_0224E39C(param0); @@ -9303,9 +9291,9 @@ static int ov9_02250CD8 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250D10 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250D10(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250C14 * v0; + UnkStruct_ov9_02250C14 *v0; v0 = ov9_0224E39C(param0); @@ -9336,7 +9324,7 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251448[4] = { }; const UnkStruct_ov9_0224A8A0 Unk_ov9_02251D68 = { - {0x0, 0x0, 0x0, 0x0}, + { 0x0, 0x0, 0x0, 0x0 }, 0x10, 0x0, 0x0, @@ -9344,9 +9332,9 @@ const UnkStruct_ov9_0224A8A0 Unk_ov9_02251D68 = { 0x14 }; -static int ov9_02250D78 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250D78(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250D78 * v0; + UnkStruct_ov9_02250D78 *v0; v0 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_02250D78)); @@ -9359,9 +9347,9 @@ static int ov9_02250D78 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 1; } -static int ov9_02250DA0 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250DA0(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250D78 * v0 = ov9_0224E39C(param0); + UnkStruct_ov9_02250D78 *v0 = ov9_0224E39C(param0); v0->unk_02--; @@ -9384,9 +9372,9 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_02251340[2] = { ov9_02250DA0 }; -static int ov9_02250DE8 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250DE8(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250DE8 * v0; + UnkStruct_ov9_02250DE8 *v0; v0 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_02250DE8)); v0->unk_02 = 16; @@ -9396,9 +9384,9 @@ static int ov9_02250DE8 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 1; } -static int ov9_02250E00 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250E00(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250DE8 * v0 = ov9_0224E39C(param0); + UnkStruct_ov9_02250DE8 *v0 = ov9_0224E39C(param0); v0->unk_02--; @@ -9417,9 +9405,9 @@ static int ov9_02250E00 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, return 0; } -static int ov9_02250E50 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1, u16 * param2, const void * param3) +static int ov9_02250E50(UnkStruct_ov9_02249B04 *param0, TaskManager *param1, u16 *param2, const void *param3) { - UnkStruct_ov9_02250DE8 * v0 = ov9_0224E39C(param0); + UnkStruct_ov9_02250DE8 *v0 = ov9_0224E39C(param0); v0->unk_02--; @@ -9436,7 +9424,7 @@ static const UnkFuncPtr_ov9_02253BE4 Unk_ov9_0225139C[3] = { ov9_02250E50 }; -static BOOL ov9_02250E6C (int param0, int param1, int param2, const UnkStruct_ov9_02250E6C * param3) +static BOOL ov9_02250E6C(int param0, int param1, int param2, const UnkStruct_ov9_02250E6C *param3) { if ((param1 >= param3->unk_02) && (param1 <= param3->unk_02 + param3->unk_08) && (param2 >= param3->unk_04) && (param2 <= param3->unk_04 + param3->unk_0A) && (param0 >= param3->unk_00) && (param0 <= param3->unk_00 + param3->unk_06)) { return 1; @@ -9445,7 +9433,7 @@ static BOOL ov9_02250E6C (int param0, int param1, int param2, const UnkStruct_ov return 0; } -static int ov9_02250EB0 (u16 param0, u16 param1) +static int ov9_02250EB0(u16 param0, u16 param1) { int v0 = (s16)param1 - (s16)param0; int v1 = v0; @@ -9467,7 +9455,7 @@ static int ov9_02250EB0 (u16 param0, u16 param1) return v0; } -static void ov9_02250EE8 (s16 * param0, s16 param1) +static void ov9_02250EE8(s16 *param0, s16 param1) { (*param0) += param1; @@ -9480,7 +9468,7 @@ static void ov9_02250EE8 (s16 * param0, s16 param1) } } -static void ov9_02250F1C (fx32 * param0, fx32 param1) +static void ov9_02250F1C(fx32 *param0, fx32 param1) { (*param0) += param1; @@ -9493,9 +9481,9 @@ static void ov9_02250F1C (fx32 * param0, fx32 param1) } } -static void ov9_02250F44 (UnkStruct_ov9_02249B04 * param0, int * param1, int * param2, int * param3) +static void ov9_02250F44(UnkStruct_ov9_02249B04 *param0, int *param1, int *param2, int *param3) { - MapObject * v0 = Player_MapObject(param0->fieldSystem->playerAvatar); + MapObject *v0 = Player_MapObject(param0->fieldSystem->playerAvatar); *param1 = MapObject_GetXPos(v0); *param2 = MapObject_GetYPos(v0); @@ -9503,9 +9491,9 @@ static void ov9_02250F44 (UnkStruct_ov9_02249B04 * param0, int * param1, int * p *param3 = MapObject_GetZPos(v0); } -BOOL ov9_02250F74 (FieldSystem * fieldSystem) +BOOL ov9_02250F74(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; + UnkStruct_02027860 *v0; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); @@ -9516,10 +9504,10 @@ BOOL ov9_02250F74 (FieldSystem * fieldSystem) return 1; } -BOOL ov9_02250F90 (FieldSystem * fieldSystem, int param1, int param2, int param3) +BOOL ov9_02250F90(FieldSystem *fieldSystem, int param1, int param2, int param3) { u16 v0; - UnkStruct_ov9_02249B04 * v1 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v1 = fieldSystem->unk_04->unk_24; v0 = ov9_0224C55C(v1, param1, param2, param3); @@ -9536,10 +9524,10 @@ BOOL ov9_02250F90 (FieldSystem * fieldSystem, int param1, int param2, int param3 return 0; } -BOOL ov9_02250FBC (FieldSystem * fieldSystem, int param1, int param2, int param3) +BOOL ov9_02250FBC(FieldSystem *fieldSystem, int param1, int param2, int param3) { u16 v0; - UnkStruct_ov9_02249B04 * v1 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v1 = fieldSystem->unk_04->unk_24; v0 = ov9_0224C55C(v1, param1, param2, param3); @@ -9550,17 +9538,17 @@ BOOL ov9_02250FBC (FieldSystem * fieldSystem, int param1, int param2, int param3 return 1; } -BOOL ov9_02250FD8 (FieldSystem * fieldSystem, int param1, int param2, int param3) +BOOL ov9_02250FD8(FieldSystem *fieldSystem, int param1, int param2, int param3) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; s16 v1 = ov9_0224C494(v0); return ov9_0224C324(v0, param1, param2, param3, v1); } -void ov9_02251000 (FieldSystem * fieldSystem, int param1, int param2, int param3) +void ov9_02251000(FieldSystem *fieldSystem, int param1, int param2, int param3) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; s16 v1 = ov9_0224C494(v0); if (ov9_0224C324(v0, param1, param2, param3, v1) == 1) { @@ -9571,9 +9559,9 @@ void ov9_02251000 (FieldSystem * fieldSystem, int param1, int param2, int param3 GF_ASSERT(0); } -BOOL ov9_02251044 (FieldSystem * fieldSystem, int param1, int param2, int param3, u32 * param4) +BOOL ov9_02251044(FieldSystem *fieldSystem, int param1, int param2, int param3, u32 *param4) { - UnkStruct_02027860 * v0; + UnkStruct_02027860 *v0; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); @@ -9584,7 +9572,7 @@ BOOL ov9_02251044 (FieldSystem * fieldSystem, int param1, int param2, int param3 { u16 v1; - UnkStruct_ov9_02249B04 * v2 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v2 = fieldSystem->unk_04->unk_24; v1 = ov9_0224C55C(v2, param1, param2, param3); @@ -9598,10 +9586,10 @@ BOOL ov9_02251044 (FieldSystem * fieldSystem, int param1, int param2, int param3 } } -void ov9_02251094 (int param0, int * param1, int * param2, int * param3) +void ov9_02251094(int param0, int *param1, int *param2, int *param3) { UnkStruct_ov9_0224BFE0 v0; - NARC * v1 = NARC_ctor(NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC, 4); + NARC *v1 = NARC_ctor(NARC_INDEX_FIELDDATA__TORNWORLD__TW_ARC, 4); ov9_0224BF8C(v1, &v0); ov9_0224C050(&v0, param0, param1, param2, param3); @@ -9609,12 +9597,12 @@ void ov9_02251094 (int param0, int * param1, int * param2, int * param3) NARC_dtor(v1); } -static u32 ov9_022510D0 (UnkStruct_ov9_02249B04 * param0) +static u32 ov9_022510D0(UnkStruct_ov9_02249B04 *param0) { return param0->fieldSystem->location->mapId; } -static int ov9_022510D8 (u32 param0) +static int ov9_022510D8(u32 param0) { switch (param0) { case 0: @@ -9630,9 +9618,9 @@ static int ov9_022510D8 (u32 param0) return AVATAR_DISTORTION_STATE_ACTIVE; } -static BOOL ov9_02251104 (UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param2) +static BOOL ov9_02251104(UnkStruct_ov9_02249B04 *param0, u32 param1, u32 param2) { - VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); switch (param1) { case 0: @@ -9677,13 +9665,13 @@ static BOOL ov9_02251104 (UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param return 0; } -BOOL ov9_022511A0 (FieldSystem * fieldSystem, int param1, int param2, int param3) +BOOL ov9_022511A0(FieldSystem *fieldSystem, int param1, int param2, int param3) { - UnkStruct_ov9_02249B04 * v0 = fieldSystem->unk_04->unk_24; + UnkStruct_ov9_02249B04 *v0 = fieldSystem->unk_04->unk_24; if (ov9_022510D0(v0) == 582) { if ((param2 == 15) && (param1 == 15) && (param3 == 1)) { - VarsFlags * v1 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); + VarsFlags *v1 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); u32 v2 = sub_0206B5D8(v1); if (v2 == 14) { @@ -9695,16 +9683,16 @@ BOOL ov9_022511A0 (FieldSystem * fieldSystem, int param1, int param2, int param3 return 0; } -static void ov9_022511E0 (u16 param0) +static void ov9_022511E0(u16 param0) { if (Sound_IsEffectPlaying(param0) == 0) { Sound_PlayEffect(param0); } } -static void ov9_022511F4 (MapObject * param0, const VecFx32 * param1) +static void ov9_022511F4(MapObject *param0, const VecFx32 *param1) { - UnkStruct_020216E0 * v0; + UnkStruct_020216E0 *v0; MapObject_SetPosVec(param0, param1); v0 = ov5_021EB1A0(param0); @@ -9733,7 +9721,7 @@ static const fx32 Unk_ov9_02252CF8[16] = { 0 * FX32_ONE }; -static void(*const Unk_ov9_02251224[1])(UnkStruct_ov9_02249B04 *, const UnkStruct_ov9_0224AA00 *) = { +static void (*const Unk_ov9_02251224[1])(UnkStruct_ov9_02249B04 *, const UnkStruct_ov9_0224AA00 *) = { ov9_0224AA34 }; @@ -9772,13 +9760,13 @@ static const int Unk_ov9_02251210[1] = { }; static const UnkStruct_ov9_02251EC8 Unk_ov9_02251EC8[7] = { - {0x0, 0x0, 0x0, 0x0}, - {0x1, 0x0, 0x1, 0x1}, - {0x2, 0x0, 0x2, 0x2}, - {0x3, 0x0, 0x3, 0x3}, - {0x4, 0x0, 0x4, 0x4}, - {0x5, 0x0, 0x5, 0x5}, - {0x6, 0x0, 0x6, 0x6} + { 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x0, 0x1, 0x1 }, + { 0x2, 0x0, 0x2, 0x2 }, + { 0x3, 0x0, 0x3, 0x3 }, + { 0x4, 0x0, 0x4, 0x4 }, + { 0x5, 0x0, 0x5, 0x5 }, + { 0x6, 0x0, 0x6, 0x6 } }; static const UnkStruct_ov9_02253680 Unk_ov9_02253680[9] = { @@ -9789,8 +9777,8 @@ static const UnkStruct_ov9_02253680 Unk_ov9_02253680[9] = { (FX32_ONE * 135), 0x68, 0x1400, - {(FX32_ONE * 128), (FX32_ONE * (96 + 12)), 0x0}, - {FX32_ONE *2, FX32_ONE *2, FX32_ONE *2} + { (FX32_ONE * 128), (FX32_ONE * (96 + 12)), 0x0 }, + { FX32_ONE * 2, FX32_ONE * 2, FX32_ONE * 2 }, }, { 0x6, @@ -9799,8 +9787,8 @@ static const UnkStruct_ov9_02253680 Unk_ov9_02253680[9] = { (FX32_ONE * 135), 0x68, 0x1400, - {(FX32_ONE * 128), (FX32_ONE * (96 + 12)), 0x0}, - {FX32_ONE *2, FX32_ONE *2, FX32_ONE *2} + { (FX32_ONE * 128), (FX32_ONE * (96 + 12)), 0x0 }, + { FX32_ONE * 2, FX32_ONE * 2, FX32_ONE * 2 }, }, { 0x6, @@ -9809,8 +9797,8 @@ static const UnkStruct_ov9_02253680 Unk_ov9_02253680[9] = { (FX32_ONE * 135), 0x68, 0x1400, - {(FX32_ONE * 128), (FX32_ONE * (96 + 12)), 0x0}, - {FX32_ONE *2, FX32_ONE *2, FX32_ONE *2} + { (FX32_ONE * 128), (FX32_ONE * (96 + 12)), 0x0 }, + { FX32_ONE * 2, FX32_ONE * 2, FX32_ONE * 2 }, }, { 0x6, @@ -9819,8 +9807,8 @@ static const UnkStruct_ov9_02253680 Unk_ov9_02253680[9] = { (FX32_ONE * 135), 0x68, 0x1400, - {(FX32_ONE * 128), (FX32_ONE * (96 + 12)), 0x0}, - {FX32_ONE *2, FX32_ONE *2, FX32_ONE *2} + { (FX32_ONE * 128), (FX32_ONE * (96 + 12)), 0x0 }, + { FX32_ONE * 2, FX32_ONE * 2, FX32_ONE * 2 }, }, { 0x1, @@ -9829,8 +9817,8 @@ static const UnkStruct_ov9_02253680 Unk_ov9_02253680[9] = { (FX32_ONE * 90), 0x3C, 0x1000, - {(FX32_ONE * 128), (FX32_ONE * (96 + 32)), 0x0}, - {FX32_ONE, FX32_ONE, FX32_ONE} + { (FX32_ONE * 128), (FX32_ONE * (96 + 32)), 0x0 }, + { FX32_ONE, FX32_ONE, FX32_ONE }, }, { 0x2, @@ -9839,8 +9827,8 @@ static const UnkStruct_ov9_02253680 Unk_ov9_02253680[9] = { (FX32_ONE * 90), 0x3C, 0x1000, - {(FX32_ONE * 128), (FX32_ONE * (96 + 32)), 0x0}, - {FX32_ONE, FX32_ONE, FX32_ONE} + { (FX32_ONE * 128), (FX32_ONE * (96 + 32)), 0x0 }, + { FX32_ONE, FX32_ONE, FX32_ONE }, }, { 0x3, @@ -9849,8 +9837,8 @@ static const UnkStruct_ov9_02253680 Unk_ov9_02253680[9] = { (FX32_ONE * 90), 0x2A, 0xC00, - {(FX32_ONE * 128), (FX32_ONE * (96 + 32)), 0x0}, - {FX32_ONE, FX32_ONE, FX32_ONE} + { (FX32_ONE * 128), (FX32_ONE * (96 + 32)), 0x0 }, + { FX32_ONE, FX32_ONE, FX32_ONE }, }, { 0x4, @@ -9859,8 +9847,8 @@ static const UnkStruct_ov9_02253680 Unk_ov9_02253680[9] = { (FX32_ONE * 90), 0x2A, 0xC00, - {(FX32_ONE * 128), (FX32_ONE * (96 + 32)), 0x0}, - {FX32_ONE, FX32_ONE, FX32_ONE} + { (FX32_ONE * 128), (FX32_ONE * (96 + 32)), 0x0 }, + { FX32_ONE, FX32_ONE, FX32_ONE }, }, { 0x5, @@ -9869,15 +9857,15 @@ static const UnkStruct_ov9_02253680 Unk_ov9_02253680[9] = { (FX32_ONE * 90), 0x0, 0x800, - {(FX32_ONE * 128), (FX32_ONE * (96 + 32)), 0x0}, - {FX32_ONE, FX32_ONE, FX32_ONE} - } + { (FX32_ONE * 128), (FX32_ONE * (96 + 32)), 0x0 }, + { FX32_ONE, FX32_ONE, FX32_ONE }, + }, }; static const fx32 Unk_ov9_02252C08[3][4] = { - {0x0, 0x0, 0x0, 0x0}, - {0x800, 0x1800, 0x3000, 0x5000}, - {-0x800 * 4, -0xc00 * 6, -0x1000 * 7, -0x1400 * 10} + { 0x0, 0x0, 0x0, 0x0 }, + { 0x800, 0x1800, 0x3000, 0x5000 }, + { -0x800 * 4, -0xc00 * 6, -0x1000 * 7, -0x1400 * 10 } }; static const u32 Unk_ov9_02252FD0[25] = { @@ -9917,90 +9905,94 @@ static const u32 Unk_ov9_022514A4[5] = { }; static const UnkStruct_ov9_022531D0 Unk_ov9_022531D0[25] = { - {0x0, 0x5, 0x1}, - {0x1, 0x5, 0x1}, - {0x2, 0x5, 0x1}, - {0x3, 0x5, 0x1}, - {0x4, 0x5, 0x1}, - {0x5, 0x5, 0x1}, - {0x6, 0x5, 0x1}, - {0x7, 0x5, 0x1}, - {0x8, 0x5, 0x1}, - {0x9, 0x5, 0x1}, - {0xA, 0x5, 0x1}, - {0xB, 0x5, 0x1}, - {0xC, 0x5, 0x1}, - {0xD, 0x5, 0x1}, - {0xE, 0x5, 0x1}, - {0xF, 0x5, 0x1}, - {0x10, 0x5, 0x1}, - {0x11, 0x5, 0x1}, - {0x12, 0x5, 0x1}, - {0x13, 0x5, 0x1}, - {0x14, 0x0, 0x0}, - {0x15, 0x3, 0x0}, - {0x16, 0x1, 0x0}, - {0x17, 0x2, 0x0}, - {0x18, 0x4, 0x0} + { 0x0, 0x5, 0x1 }, + { 0x1, 0x5, 0x1 }, + { 0x2, 0x5, 0x1 }, + { 0x3, 0x5, 0x1 }, + { 0x4, 0x5, 0x1 }, + { 0x5, 0x5, 0x1 }, + { 0x6, 0x5, 0x1 }, + { 0x7, 0x5, 0x1 }, + { 0x8, 0x5, 0x1 }, + { 0x9, 0x5, 0x1 }, + { 0xA, 0x5, 0x1 }, + { 0xB, 0x5, 0x1 }, + { 0xC, 0x5, 0x1 }, + { 0xD, 0x5, 0x1 }, + { 0xE, 0x5, 0x1 }, + { 0xF, 0x5, 0x1 }, + { 0x10, 0x5, 0x1 }, + { 0x11, 0x5, 0x1 }, + { 0x12, 0x5, 0x1 }, + { 0x13, 0x5, 0x1 }, + { 0x14, 0x0, 0x0 }, + { 0x15, 0x3, 0x0 }, + { 0x16, 0x1, 0x0 }, + { 0x17, 0x2, 0x0 }, + { 0x18, 0x4, 0x0 } }; static const VecFx32 Unk_ov9_02253298[25] = { - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0 + (-FX32_ONE * 8), -FX32_ONE * 25, (-FX32_ONE * 6) + (FX32_ONE * 8)}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0 + (-FX32_ONE * 8), -FX32_ONE * 25, (-FX32_ONE * 6) + (FX32_ONE * 8)}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0 + (-FX32_ONE * 8), -FX32_ONE * 25, (-FX32_ONE * 6) + (FX32_ONE * 16)}, - {0x0, -FX32_ONE * 25, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 32, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 32, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 32, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 32, -FX32_ONE * 6}, - {0x0, -FX32_ONE * 14, FX32_ONE * 8} + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0 + (-FX32_ONE * 8), -FX32_ONE * 25, (-FX32_ONE * 6) + (FX32_ONE * 8) }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0 + (-FX32_ONE * 8), -FX32_ONE * 25, (-FX32_ONE * 6) + (FX32_ONE * 8) }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0 + (-FX32_ONE * 8), -FX32_ONE * 25, (-FX32_ONE * 6) + (FX32_ONE * 16) }, + { 0x0, -FX32_ONE * 25, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 32, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 32, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 32, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 32, -FX32_ONE * 6 }, + { 0x0, -FX32_ONE * 14, FX32_ONE * 8 } }; static const VecFx32 Unk_ov9_022533C4[25] = { - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4))}, - {(FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 8))}, - {0x0, 0x0, 0x0} + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)) }, + { (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 4)), (FX32_ONE + (0x100 * 8)) }, + { 0x0, 0x0, 0x0 } }; static const UnkStruct_ov101_021D86B0 DATA_EoaFStoneHeader = { - sizeof(UnkStruct_ov9_0224BA48), ov9_0224B964, ov9_0224BA48, NULL, ov9_0224BBDC, + sizeof(UnkStruct_ov9_0224BA48), + ov9_0224B964, + ov9_0224BA48, + NULL, + ov9_0224BBDC, }; static const UnkStruct_ov101_021D86B0 Unk_ov9_022514F4 = { @@ -10019,7 +10011,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov9_0225147C = { ov9_0224BDE8 }; -static const UnkStruct_ov101_021D86B0 * const Unk_ov9_02252F6C[25] = { +static const UnkStruct_ov101_021D86B0 *const Unk_ov9_02252F6C[25] = { &Unk_ov9_022514F4, &Unk_ov9_022514F4, &Unk_ov9_022514F4, @@ -10048,16 +10040,16 @@ static const UnkStruct_ov101_021D86B0 * const Unk_ov9_02252F6C[25] = { }; static const UnkStruct_ov9_022530A4 Unk_ov9_022530A4[10] = { - {0x23D, 0x251, 0x23E}, - {0x23E, 0x23D, 0x23F}, - {0x23F, 0x23E, 0x240}, - {0x240, 0x23F, 0x241}, - {0x241, 0x240, 0x243}, - {0x243, 0x241, 0x244}, - {0x244, 0x243, 0x245}, - {0x245, 0x244, 0x251}, - {0x247, 0x251, 0x251}, - {0x246, 0x251, 0x251} + { 0x23D, 0x251, 0x23E }, + { 0x23E, 0x23D, 0x23F }, + { 0x23F, 0x23E, 0x240 }, + { 0x240, 0x23F, 0x241 }, + { 0x241, 0x240, 0x243 }, + { 0x243, 0x241, 0x244 }, + { 0x244, 0x243, 0x245 }, + { 0x245, 0x244, 0x251 }, + { 0x247, 0x251, 0x251 }, + { 0x246, 0x251, 0x251 } }; static const UnkStruct_ov9_0224DF10 Unk_ov9_02251558 = { @@ -10072,7 +10064,7 @@ static const UnkStruct_ov9_0224DF10 Unk_ov9_02251558 = { 0xB }; -static const UnkStruct_ov9_0224DF10 * Unk_ov9_02253B10[] = { +static const UnkStruct_ov9_0224DF10 *Unk_ov9_02253B10[] = { &Unk_ov9_02251558, NULL }; @@ -10101,7 +10093,7 @@ static const UnkStruct_ov9_0224DF10 Unk_ov9_02251570 = { 0xB }; -static const UnkStruct_ov9_0224DF10 * Unk_ov9_02253B4C[] = { +static const UnkStruct_ov9_0224DF10 *Unk_ov9_02253B4C[] = { &Unk_ov9_02251600, &Unk_ov9_02251570, NULL @@ -10323,7 +10315,7 @@ static const UnkStruct_ov9_0224DF10 Unk_ov9_02251648 = { 0xB }; -static const UnkStruct_ov9_0224DF10 * Unk_ov9_02253C2C[] = { +static const UnkStruct_ov9_0224DF10 *Unk_ov9_02253C2C[] = { &Unk_ov9_02251E10, &Unk_ov9_02251978, &Unk_ov9_022515A0, @@ -10393,7 +10385,7 @@ static const UnkStruct_ov9_0224DF10 Unk_ov9_02251690 = { 0xB }; -static const UnkStruct_ov9_0224DF10 * Unk_ov9_02253B84[] = { +static const UnkStruct_ov9_0224DF10 *Unk_ov9_02253B84[] = { &Unk_ov9_02251A50, &Unk_ov9_02251A98, &Unk_ov9_02251678, @@ -10437,7 +10429,7 @@ static const UnkStruct_ov9_0224DF10 Unk_ov9_02251708 = { 0x8 }; -static const UnkStruct_ov9_0224DF10 * Unk_ov9_02253B74[] = { +static const UnkStruct_ov9_0224DF10 *Unk_ov9_02253B74[] = { &Unk_ov9_02251990, &Unk_ov9_022516D8, &Unk_ov9_02251708, @@ -10480,7 +10472,7 @@ static const UnkStruct_ov9_0224DF10 Unk_ov9_02251768 = { 0x5 }; -static const UnkStruct_ov9_0224DF10 * Unk_ov9_02253B64[] = { +static const UnkStruct_ov9_0224DF10 *Unk_ov9_02253B64[] = { &Unk_ov9_02251870, &Unk_ov9_02251750, &Unk_ov9_02251768, @@ -10511,7 +10503,7 @@ static const UnkStruct_ov9_0224DF10 Unk_ov9_022517C8 = { 0xB }; -static const UnkStruct_ov9_0224DF10 * Unk_ov9_02253B28[] = { +static const UnkStruct_ov9_0224DF10 *Unk_ov9_02253B28[] = { &Unk_ov9_02251828, &Unk_ov9_022517C8, NULL @@ -10529,20 +10521,20 @@ static const UnkStruct_ov9_0224DF10 Unk_ov9_022517F8 = { 0xA }; -static const UnkStruct_ov9_0224DF10 * Unk_ov9_02253B00[] = { +static const UnkStruct_ov9_0224DF10 *Unk_ov9_02253B00[] = { &Unk_ov9_022517F8, NULL }; static const UnkStruct_ov9_02252C38 Unk_ov9_02252C38[8] = { - {0x23D, Unk_ov9_02253B10}, - {0x23E, Unk_ov9_02253B4C}, - {0x23F, Unk_ov9_02253C2C}, - {0x240, Unk_ov9_02253B84}, - {0x241, Unk_ov9_02253B74}, - {0x243, Unk_ov9_02253B64}, - {0x244, Unk_ov9_02253B28}, - {0x245, Unk_ov9_02253B00} + { 0x23D, Unk_ov9_02253B10 }, + { 0x23E, Unk_ov9_02253B4C }, + { 0x23F, Unk_ov9_02253C2C }, + { 0x240, Unk_ov9_02253B84 }, + { 0x241, Unk_ov9_02253B74 }, + { 0x243, Unk_ov9_02253B64 }, + { 0x244, Unk_ov9_02253B28 }, + { 0x245, Unk_ov9_02253B00 } }; static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { @@ -10555,9 +10547,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -16, 0x0, - {0x0, (FX32_ONE * -4), 0x0}, + { 0x0, (FX32_ONE * -4), 0x0 }, 0x0, - 0xB + 0xB, }, { 0x1, @@ -10568,9 +10560,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0x12, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, 0xB, - 0x0 + 0x0, }, { 0x2, @@ -10581,9 +10573,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -28, 0x0, - {0x0, (FX32_ONE * -4), 0x0}, + { 0x0, (FX32_ONE * -4), 0x0 }, 0x1, - 0xB + 0xB, }, { 0x3, @@ -10594,9 +10586,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0x12, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, 0xB, - 0x1 + 0x1, }, { 0x4, @@ -10607,9 +10599,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -14, 0x0, - {0x0, (FX32_ONE * -4), 0x0}, + { 0x0, (FX32_ONE * -4), 0x0 }, 0x2, - 0xB + 0xB, }, { 0x5, @@ -10620,9 +10612,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0x12, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, 0xB, - 0x2 + 0x2, }, { 0x6, @@ -10633,9 +10625,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -18, 0x0, - {0x0, (FX32_ONE * -4), 0x0}, + { 0x0, (FX32_ONE * -4), 0x0 }, 0x3, - 0x6 + 0x6, }, { 0x7, @@ -10646,9 +10638,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -14, 0x0, - {0x0, (FX32_ONE * -4), 0x0}, + { 0x0, (FX32_ONE * -4), 0x0 }, 0x4, - 0xB + 0xB, }, { 0x8, @@ -10659,9 +10651,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -18, 0x0, - {0x0, (FX32_ONE * -4), 0x0}, + { 0x0, (FX32_ONE * -4), 0x0 }, 0x5, - 0xB + 0xB, }, { 0x9, @@ -10672,9 +10664,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -14, 0x0, - {0x0, (FX32_ONE * -4), 0x0}, + { 0x0, (FX32_ONE * -4), 0x0 }, + 0xB, 0xB, - 0xB }, { 0xA, @@ -10685,9 +10677,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0x12, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, 0x6, - 0x3 + 0x3, }, { 0xB, @@ -10698,9 +10690,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0x12, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, 0xB, - 0x4 + 0x4, }, { 0xC, @@ -10711,9 +10703,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -14, 0x0, - {0x0, (FX32_ONE * -4), 0x0}, + { 0x0, (FX32_ONE * -4), 0x0 }, 0x7, - 0x8 + 0x8, }, { 0xD, @@ -10724,9 +10716,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0x12, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, 0x8, - 0x7 + 0x7, }, { 0xE, @@ -10737,9 +10729,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -12, 0x0, - {0x0, (FX32_ONE * -4), 0x0}, + { 0x0, (FX32_ONE * -4), 0x0 }, 0x9, - 0xB + 0xB, }, { 0xF, @@ -10750,9 +10742,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0x12, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, 0xB, - 0x5 + 0x5, }, { 0x10, @@ -10763,9 +10755,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0xA, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, + 0xB, 0xB, - 0xB }, { 0x11, @@ -10776,9 +10768,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0x1, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, 0xB, - 0x9 + 0x9, }, { 0x12, @@ -10789,9 +10781,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -17, 0x0, - {0x0, (FX32_ONE * -4), 0x0}, + { 0x0, (FX32_ONE * -4), 0x0 }, 0xA, - 0xB + 0xB, }, { 0x13, @@ -10802,9 +10794,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0x12, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, 0xB, - 0xA + 0xA, }, { 0x14, @@ -10815,9 +10807,9 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, 0x12, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, + 0xB, 0xB, - 0xB }, { 0x15, @@ -10828,13 +10820,13 @@ static const UnkStruct_ov9_02253830 Unk_ov9_02253830[22] = { 0x0, -14, 0x0, - {0x0, (FX32_ONE * 4), 0x0}, + { 0x0, (FX32_ONE * 4), 0x0 }, 0xB, - 0xB - } + 0xB, + }, }; -static const UnkFuncPtr_ov9_02253BE4 * Unk_ov9_02253BE4[18] = { +static const UnkFuncPtr_ov9_02253BE4 *Unk_ov9_02253BE4[18] = { Unk_ov9_02251360, Unk_ov9_022513E8, Unk_ov9_02251258, @@ -10864,14 +10856,14 @@ static const UnkStruct_ov9_022506D0 Unk_ov9_0225123C = { }; static const UnkStruct_ov9_02251438 Unk_ov9_02251858[] = { - {0x5, &Unk_ov9_02251220}, - {0x6, &Unk_ov9_0225123C}, - {0x12, NULL} + { 0x5, &Unk_ov9_02251220 }, + { 0x6, &Unk_ov9_0225123C }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252044 Unk_ov9_02252044[] = { - {0x28, 0x121, 0x34, 0x3, 0x1, Unk_ov9_02251858}, - {0x0, 0x0, 0x0, 0x0, NULL} + { 0x28, 0x121, 0x34, 0x3, 0x1, Unk_ov9_02251858 }, + { 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_ov9_022506AC Unk_ov9_02251214 = { @@ -10888,15 +10880,15 @@ static const UnkStruct_ov9_0224E860 Unk_ov9_02251248 = { }; static const UnkStruct_ov9_02251438 Unk_ov9_02252064[] = { - {0x5, &Unk_ov9_02251214}, - {0x6, &Unk_ov9_0225124C}, - {0x2, &Unk_ov9_02251248}, - {0x12, NULL} + { 0x5, &Unk_ov9_02251214 }, + { 0x6, &Unk_ov9_0225124C }, + { 0x2, &Unk_ov9_02251248 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252044 Unk_ov9_02252084[] = { - {0xF, 0x101, 0x3A, 0x3, 0x3, Unk_ov9_02252064}, - {0x0, 0x0, 0x0, 0x0, NULL} + { 0xF, 0x101, 0x3A, 0x3, 0x3, Unk_ov9_02252064 }, + { 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_022518B8 = { @@ -10906,7 +10898,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022518B8 = { 0x0, 0x0, -8, - {0x0, 0x0, (FX32_ONE * -4)} + { 0x0, 0x0, (FX32_ONE * -4) } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251308 = { @@ -10921,14 +10913,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022518E8 = { 0x0, 0x0, 0x8, - {0x0, 0x0, (FX32_ONE * 4)} + { 0x0, 0x0, (FX32_ONE * 4) } }; static const UnkStruct_ov9_02251438 Unk_ov9_022520A4[] = { - {0x1, &Unk_ov9_022518B8}, - {0x0, &Unk_ov9_02251308}, - {0x1, &Unk_ov9_022518E8}, - {0x12, NULL} + { 0x1, &Unk_ov9_022518B8 }, + { 0x0, &Unk_ov9_02251308 }, + { 0x1, &Unk_ov9_022518E8 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251900 = { @@ -10938,7 +10930,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251900 = { 0x0, 0x0, -8, - {0x0, 0x0, (FX32_ONE * -4)} + { 0x0, 0x0, (FX32_ONE * -4) } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_022512B0 = { @@ -10953,14 +10945,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251918 = { 0x0, 0x0, 0x8, - {0x0, 0x0, (FX32_ONE * 4)} + { 0x0, 0x0, (FX32_ONE * 4) } }; static const UnkStruct_ov9_02251438 Unk_ov9_022520C4[] = { - {0x1, &Unk_ov9_02251900}, - {0x0, &Unk_ov9_022512B0}, - {0x1, &Unk_ov9_02251918}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251900 }, + { 0x0, &Unk_ov9_022512B0 }, + { 0x1, &Unk_ov9_02251918 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251930 = { @@ -10970,7 +10962,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251930 = { 0x0, 0x0, -8, - {0x0, 0x0, (FX32_ONE * -4)} + { 0x0, 0x0, (FX32_ONE * -4) } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251338 = { @@ -10985,14 +10977,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251948 = { 0x0, 0x0, 0x8, - {0x0, 0x0, (FX32_ONE * 4)} + { 0x0, 0x0, (FX32_ONE * 4) } }; static const UnkStruct_ov9_02251438 Unk_ov9_022520E4[] = { - {0x1, &Unk_ov9_02251930}, - {0x0, &Unk_ov9_02251338}, - {0x1, &Unk_ov9_02251948}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251930 }, + { 0x0, &Unk_ov9_02251338 }, + { 0x1, &Unk_ov9_02251948 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251D20 = { @@ -11002,7 +10994,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251D20 = { 0x0, 0x0, -8, - {0x0, 0x0, (FX32_ONE * -4)} + { 0x0, 0x0, (FX32_ONE * -4) } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_022512F8 = { @@ -11017,14 +11009,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022519A8 = { 0x0, 0x0, 0x8, - {0x0, 0x0, (FX32_ONE * 4)} + { 0x0, 0x0, (FX32_ONE * 4) } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252104[] = { - {0x1, &Unk_ov9_02251D20}, - {0x0, &Unk_ov9_022512F8}, - {0x1, &Unk_ov9_022519A8}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251D20 }, + { 0x0, &Unk_ov9_022512F8 }, + { 0x1, &Unk_ov9_022519A8 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_022519C0 = { @@ -11034,7 +11026,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022519C0 = { 0x9, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251280 = { @@ -11049,14 +11041,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022519D8 = { -9, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252124[] = { - {0x1, &Unk_ov9_022519C0}, - {0x0, &Unk_ov9_02251280}, - {0x1, &Unk_ov9_022519D8}, - {0x12, NULL} + { 0x1, &Unk_ov9_022519C0 }, + { 0x0, &Unk_ov9_02251280 }, + { 0x1, &Unk_ov9_022519D8 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251A08 = { @@ -11066,7 +11058,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251A08 = { 0x9, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251320 = { @@ -11081,14 +11073,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251A20 = { -9, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252144[] = { - {0x1, &Unk_ov9_02251A08}, - {0x0, &Unk_ov9_02251320}, - {0x1, &Unk_ov9_02251A20}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251A08 }, + { 0x0, &Unk_ov9_02251320 }, + { 0x1, &Unk_ov9_02251A20 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251A38 = { @@ -11098,7 +11090,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251A38 = { 0x0, 0x0, 0x25, - {0x0, 0x0, (FX32_ONE * 4)} + { 0x0, 0x0, (FX32_ONE * 4) } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_022512C8 = { @@ -11113,14 +11105,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251A68 = { 0x0, 0x0, -37, - {0x0, 0x0, (FX32_ONE * -4)} + { 0x0, 0x0, (FX32_ONE * -4) } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252164[] = { - {0x1, &Unk_ov9_02251A38}, - {0x0, &Unk_ov9_022512C8}, - {0x1, &Unk_ov9_02251A68}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251A38 }, + { 0x0, &Unk_ov9_022512C8 }, + { 0x1, &Unk_ov9_02251A68 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251A80 = { @@ -11130,7 +11122,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251A80 = { 0x0, 0x0, 0x25, - {0x0, 0x0, (FX32_ONE * 4)} + { 0x0, 0x0, (FX32_ONE * 4) } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_022512D8 = { @@ -11145,14 +11137,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251AB0 = { 0x0, 0x0, -37, - {0x0, 0x0, (FX32_ONE * -4)} + { 0x0, 0x0, (FX32_ONE * -4) } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252184[] = { - {0x1, &Unk_ov9_02251A80}, - {0x0, &Unk_ov9_022512D8}, - {0x1, &Unk_ov9_02251AB0}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251A80 }, + { 0x0, &Unk_ov9_022512D8 }, + { 0x1, &Unk_ov9_02251AB0 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251AC8 = { @@ -11162,7 +11154,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251AC8 = { 0x9, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_022512F0 = { @@ -11177,14 +11169,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251AE0 = { -9, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_022521A4[] = { - {0x1, &Unk_ov9_02251AC8}, - {0x0, &Unk_ov9_022512F0}, - {0x1, &Unk_ov9_02251AE0}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251AC8 }, + { 0x0, &Unk_ov9_022512F0 }, + { 0x1, &Unk_ov9_02251AE0 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251AF8 = { @@ -11194,7 +11186,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251AF8 = { 0x9, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251348 = { @@ -11209,14 +11201,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251B28 = { -9, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_022521C4[] = { - {0x1, &Unk_ov9_02251AF8}, - {0x0, &Unk_ov9_02251348}, - {0x1, &Unk_ov9_02251B28}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251AF8 }, + { 0x0, &Unk_ov9_02251348 }, + { 0x1, &Unk_ov9_02251B28 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251B58 = { @@ -11226,7 +11218,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251B58 = { 0x9, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251318 = { @@ -11241,14 +11233,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251B88 = { -9, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252204[] = { - {0x1, &Unk_ov9_02251B58}, - {0x0, &Unk_ov9_02251318}, - {0x1, &Unk_ov9_02251B88}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251B58 }, + { 0x0, &Unk_ov9_02251318 }, + { 0x1, &Unk_ov9_02251B88 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251D38 = { @@ -11258,7 +11250,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251D38 = { 0x9, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_022512B8 = { @@ -11273,14 +11265,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251BD0 = { -9, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252364[] = { - {0x1, &Unk_ov9_02251D38}, - {0x0, &Unk_ov9_022512B8}, - {0x1, &Unk_ov9_02251BD0}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251D38 }, + { 0x0, &Unk_ov9_022512B8 }, + { 0x1, &Unk_ov9_02251BD0 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251BE8 = { @@ -11290,7 +11282,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251BE8 = { 0x9, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251300 = { @@ -11305,14 +11297,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251C30 = { -9, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252244[] = { - {0x1, &Unk_ov9_02251BE8}, - {0x0, &Unk_ov9_02251300}, - {0x1, &Unk_ov9_02251C30}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251BE8 }, + { 0x0, &Unk_ov9_02251300 }, + { 0x1, &Unk_ov9_02251C30 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251C60 = { @@ -11322,7 +11314,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251C60 = { 0x9, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_022512E0 = { @@ -11337,14 +11329,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251C78 = { -9, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252264[] = { - {0x1, &Unk_ov9_02251C60}, - {0x0, &Unk_ov9_022512E0}, - {0x1, &Unk_ov9_02251C78}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251C60 }, + { 0x0, &Unk_ov9_022512E0 }, + { 0x1, &Unk_ov9_02251C78 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251C18 = { @@ -11354,7 +11346,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251C18 = { 0x0, 0x0, 0x17, - {0x0, 0x0, (FX32_ONE * 4)} + { 0x0, 0x0, (FX32_ONE * 4) } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251310 = { @@ -11369,14 +11361,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251D08 = { 0x0, 0x0, -23, - {0x0, 0x0, (FX32_ONE * -4)} + { 0x0, 0x0, (FX32_ONE * -4) } }; static const UnkStruct_ov9_02251438 Unk_ov9_022522E4[] = { - {0x1, &Unk_ov9_02251C18}, - {0x0, &Unk_ov9_02251310}, - {0x1, &Unk_ov9_02251D08}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251C18 }, + { 0x0, &Unk_ov9_02251310 }, + { 0x1, &Unk_ov9_02251D08 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251D50 = { @@ -11386,7 +11378,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251D50 = { 0x0, 0x0, 0x17, - {0x0, 0x0, (FX32_ONE * 4)} + { 0x0, 0x0, (FX32_ONE * 4) } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_022512D0 = { @@ -11401,14 +11393,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251D98 = { 0x0, 0x0, -23, - {0x0, 0x0, (FX32_ONE * -4)} + { 0x0, 0x0, (FX32_ONE * -4) } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252304[] = { - {0x1, &Unk_ov9_02251D50}, - {0x0, &Unk_ov9_022512D0}, - {0x1, &Unk_ov9_02251D98}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251D50 }, + { 0x0, &Unk_ov9_022512D0 }, + { 0x1, &Unk_ov9_02251D98 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_022518A0 = { @@ -11418,7 +11410,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022518A0 = { -9, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251288 = { @@ -11433,14 +11425,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251DF8 = { 0x9, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252324[] = { - {0x1, &Unk_ov9_022518A0}, - {0x0, &Unk_ov9_02251288}, - {0x1, &Unk_ov9_02251DF8}, - {0x12, NULL} + { 0x1, &Unk_ov9_022518A0 }, + { 0x0, &Unk_ov9_02251288 }, + { 0x1, &Unk_ov9_02251DF8 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251E28 = { @@ -11450,7 +11442,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251E28 = { -9, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251290 = { @@ -11465,14 +11457,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022517E0 = { 0x9, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02251EE4[] = { - {0x1, &Unk_ov9_02251E28}, - {0x0, &Unk_ov9_02251290}, - {0x1, &Unk_ov9_022517E0}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251E28 }, + { 0x0, &Unk_ov9_02251290 }, + { 0x1, &Unk_ov9_022517E0 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_022517B0 = { @@ -11482,7 +11474,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022517B0 = { -17, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251358 = { @@ -11497,14 +11489,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251780 = { 0x11, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02251F04[] = { - {0x1, &Unk_ov9_022517B0}, - {0x0, &Unk_ov9_02251358}, - {0x1, &Unk_ov9_02251780}, - {0x12, NULL} + { 0x1, &Unk_ov9_022517B0 }, + { 0x0, &Unk_ov9_02251358 }, + { 0x1, &Unk_ov9_02251780 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_022515B8 = { @@ -11514,7 +11506,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022515B8 = { -17, 0x0, 0x0, - {(FX32_ONE * -4), 0x0, 0x0} + { (FX32_ONE * -4), 0x0, 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251298 = { @@ -11529,14 +11521,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251720 = { 0x11, 0x0, 0x0, - {(FX32_ONE * 4), 0x0, 0x0} + { (FX32_ONE * 4), 0x0, 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02251F64[] = { - {0x1, &Unk_ov9_022515B8}, - {0x0, &Unk_ov9_02251298}, - {0x1, &Unk_ov9_02251720}, - {0x12, NULL} + { 0x1, &Unk_ov9_022515B8 }, + { 0x0, &Unk_ov9_02251298 }, + { 0x1, &Unk_ov9_02251720 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_022516F0 = { @@ -11546,7 +11538,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022516F0 = { 0x0, -8, 0x0, - {0x0, (FX32_ONE * -2), 0x0} + { 0x0, (FX32_ONE * -2), 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251330 = { @@ -11561,14 +11553,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022516C0 = { 0x0, 0x8, 0x0, - {0x0, (FX32_ONE * 2), 0x0} + { 0x0, (FX32_ONE * 2), 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02251FC4[] = { - {0x1, &Unk_ov9_022516F0}, - {0x0, &Unk_ov9_02251330}, - {0x1, &Unk_ov9_022516C0}, - {0x12, NULL} + { 0x1, &Unk_ov9_022516F0 }, + { 0x0, &Unk_ov9_02251330 }, + { 0x1, &Unk_ov9_022516C0 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251660 = { @@ -11578,7 +11570,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251660 = { 0x0, -8, 0x0, - {0x0, (FX32_ONE * -2), 0x0} + { 0x0, (FX32_ONE * -2), 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_022512E8 = { @@ -11593,14 +11585,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_022516A8 = { 0x0, 0x8, 0x0, - {0x0, (FX32_ONE * 2), 0x0} + { 0x0, (FX32_ONE * 2), 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02251FE4[] = { - {0x1, &Unk_ov9_02251660}, - {0x0, &Unk_ov9_022512E8}, - {0x1, &Unk_ov9_022516A8}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251660 }, + { 0x0, &Unk_ov9_022512E8 }, + { 0x1, &Unk_ov9_022516A8 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251738 = { @@ -11610,7 +11602,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251738 = { 0x0, -8, 0x0, - {0x0, (FX32_ONE * -2), 0x0} + { 0x0, (FX32_ONE * -2), 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_022512A8 = { @@ -11625,14 +11617,14 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251798 = { 0x0, 0x8, 0x0, - {0x0, (FX32_ONE * 2), 0x0} + { 0x0, (FX32_ONE * 2), 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252004[] = { - {0x1, &Unk_ov9_02251738}, - {0x0, &Unk_ov9_022512A8}, - {0x1, &Unk_ov9_02251798}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251738 }, + { 0x0, &Unk_ov9_022512A8 }, + { 0x1, &Unk_ov9_02251798 }, + { 0x12, NULL } }; static const UnkStruct_ov9_0224E550 Unk_ov9_02251810 = { @@ -11642,7 +11634,7 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251810 = { 0x0, -8, 0x0, - {0x0, (FX32_ONE * -2), 0x0} + { 0x0, (FX32_ONE * -2), 0x0 } }; static const UnkStruct_ov9_0224E4E8 Unk_ov9_02251278 = { @@ -11657,42 +11649,42 @@ static const UnkStruct_ov9_0224E550 Unk_ov9_02251840 = { 0x0, 0x8, 0x0, - {0x0, (FX32_ONE * 2), 0x0} + { 0x0, (FX32_ONE * 2), 0x0 } }; static const UnkStruct_ov9_02251438 Unk_ov9_02252024[] = { - {0x1, &Unk_ov9_02251810}, - {0x0, &Unk_ov9_02251278}, - {0x1, &Unk_ov9_02251840}, - {0x12, NULL} + { 0x1, &Unk_ov9_02251810 }, + { 0x0, &Unk_ov9_02251278 }, + { 0x1, &Unk_ov9_02251840 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252044 Unk_ov9_022534F0[] = { - {0x21, 0xE1, 0x24, 0x0, 0x0, Unk_ov9_022520A4}, - {0x21, 0xE1, 0x19, 0x0, 0x0, Unk_ov9_022520C4}, - {0x21, 0xE1, 0x15, 0x0, 0x0, Unk_ov9_022520E4}, - {0x21, 0xE1, 0xA, 0x0, 0x0, Unk_ov9_02252104}, - {0x23, 0xE1, 0x8, 0x0, 0x0, Unk_ov9_02252124}, - {0x2F, 0xE1, 0x8, 0x0, 0x0, Unk_ov9_02252144}, - {0x38, 0xE1, 0xA, 0x0, 0x0, Unk_ov9_02252164}, - {0x38, 0xE1, 0x32, 0x0, 0x0, Unk_ov9_02252184}, - {0x33, 0xE1, 0x1F, 0x0, 0x0, Unk_ov9_022521A4}, - {0x3F, 0xE1, 0x1F, 0x0, 0x0, Unk_ov9_022521C4}, - {0x23, 0xE9, 0xF, 0x0, 0x0, Unk_ov9_02252204}, - {0x2F, 0xE9, 0xF, 0x0, 0x0, Unk_ov9_02252364}, - {0x33, 0xE9, 0xF, 0x0, 0x0, Unk_ov9_02252244}, - {0x3F, 0xE9, 0xF, 0x0, 0x0, Unk_ov9_02252264}, - {0x41, 0xE9, 0x11, 0x0, 0x0, Unk_ov9_022522E4}, - {0x41, 0xE9, 0x2B, 0x0, 0x0, Unk_ov9_02252304}, - {0x3F, 0xE9, 0x2D, 0x0, 0x0, Unk_ov9_02252324}, - {0x33, 0xE9, 0x2D, 0x0, 0x0, Unk_ov9_02251EE4}, - {0x3F, 0xE9, 0x34, 0x0, 0x0, Unk_ov9_02251F04}, - {0x2B, 0xE9, 0x34, 0x0, 0x0, Unk_ov9_02251F64}, - {0x31, 0xE9, 0x24, 0x0, 0x0, Unk_ov9_02251FC4}, - {0x31, 0xE1, 0x21, 0x0, 0x0, Unk_ov9_02251FE4}, - {0x1C, 0xE9, 0x26, 0x0, 0x0, Unk_ov9_02252004}, - {0x1F, 0xE1, 0x26, 0x0, 0x0, Unk_ov9_02252024}, - {0x0, 0x0, 0x0, 0x0, NULL} + { 0x21, 0xE1, 0x24, 0x0, 0x0, Unk_ov9_022520A4 }, + { 0x21, 0xE1, 0x19, 0x0, 0x0, Unk_ov9_022520C4 }, + { 0x21, 0xE1, 0x15, 0x0, 0x0, Unk_ov9_022520E4 }, + { 0x21, 0xE1, 0xA, 0x0, 0x0, Unk_ov9_02252104 }, + { 0x23, 0xE1, 0x8, 0x0, 0x0, Unk_ov9_02252124 }, + { 0x2F, 0xE1, 0x8, 0x0, 0x0, Unk_ov9_02252144 }, + { 0x38, 0xE1, 0xA, 0x0, 0x0, Unk_ov9_02252164 }, + { 0x38, 0xE1, 0x32, 0x0, 0x0, Unk_ov9_02252184 }, + { 0x33, 0xE1, 0x1F, 0x0, 0x0, Unk_ov9_022521A4 }, + { 0x3F, 0xE1, 0x1F, 0x0, 0x0, Unk_ov9_022521C4 }, + { 0x23, 0xE9, 0xF, 0x0, 0x0, Unk_ov9_02252204 }, + { 0x2F, 0xE9, 0xF, 0x0, 0x0, Unk_ov9_02252364 }, + { 0x33, 0xE9, 0xF, 0x0, 0x0, Unk_ov9_02252244 }, + { 0x3F, 0xE9, 0xF, 0x0, 0x0, Unk_ov9_02252264 }, + { 0x41, 0xE9, 0x11, 0x0, 0x0, Unk_ov9_022522E4 }, + { 0x41, 0xE9, 0x2B, 0x0, 0x0, Unk_ov9_02252304 }, + { 0x3F, 0xE9, 0x2D, 0x0, 0x0, Unk_ov9_02252324 }, + { 0x33, 0xE9, 0x2D, 0x0, 0x0, Unk_ov9_02251EE4 }, + { 0x3F, 0xE9, 0x34, 0x0, 0x0, Unk_ov9_02251F04 }, + { 0x2B, 0xE9, 0x34, 0x0, 0x0, Unk_ov9_02251F64 }, + { 0x31, 0xE9, 0x24, 0x0, 0x0, Unk_ov9_02251FC4 }, + { 0x31, 0xE1, 0x21, 0x0, 0x0, Unk_ov9_02251FE4 }, + { 0x1C, 0xE9, 0x26, 0x0, 0x0, Unk_ov9_02252004 }, + { 0x1F, 0xE1, 0x26, 0x0, 0x0, Unk_ov9_02252024 }, + { 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_ov9_022506AC Unk_ov9_02251250 = { @@ -11704,20 +11696,19 @@ static const UnkStruct_ov9_022506D0 Unk_ov9_02251244 = { }; static const UnkStruct_ov9_02251438 Unk_ov9_022518D0[] = { - {0x5, &Unk_ov9_02251250}, - {0x6, &Unk_ov9_02251244}, - {0x12, NULL} + { 0x5, &Unk_ov9_02251250 }, + { 0x6, &Unk_ov9_02251244 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252044 Unk_ov9_02252BD8[] = { - {0x41, 0xC1, 0x29, 0x3, 0x4, Unk_ov9_022518D0}, - {0x41, 0xC1, 0x29, 0x3, 0x5, Unk_ov9_022518D0}, - {0x0, 0x0, 0x0, 0x0, NULL} + { 0x41, 0xC1, 0x29, 0x3, 0x4, Unk_ov9_022518D0 }, + { 0x41, 0xC1, 0x29, 0x3, 0x5, Unk_ov9_022518D0 }, + { 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_ov9_02252384 Unk_ov9_02252384 = { - { - 0x1, + { 0x1, 0x1, 0x0, -42, @@ -11728,13 +11719,12 @@ static const UnkStruct_ov9_02252384 Unk_ov9_02252384 = { 0x0, -21, 0x0, - {0x0, (FX32_ONE * -1), 0x0} - } + { 0x0, (FX32_ONE * -1), 0x0 } } }; static const UnkStruct_ov9_02251438 Unk_ov9_02251438[] = { - {0xA, &Unk_ov9_02252384}, - {0x12, NULL} + { 0xA, &Unk_ov9_02252384 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252414 Unk_ov9_022523A8 = { @@ -11743,8 +11733,8 @@ static const UnkStruct_ov9_02252414 Unk_ov9_022523A8 = { 0x9, 0x1, 0x1, - {FX32_ONE, FX32_ONE, FX32_ONE}, - {0x0, 0x0, (FX32_ONE * 48)}, + { FX32_ONE, FX32_ONE, FX32_ONE }, + { 0x0, 0x0, (FX32_ONE * 48) }, 0x40 }; @@ -11753,9 +11743,9 @@ static const UnkStruct_ov9_022506EC Unk_ov9_02251274 = { }; static const UnkStruct_ov9_02251438 Unk_ov9_02251960[] = { - {0x7, &Unk_ov9_022523A8}, - {0x8, &Unk_ov9_02251274}, - {0x12, NULL} + { 0x7, &Unk_ov9_022523A8 }, + { 0x8, &Unk_ov9_02251274 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252414 Unk_ov9_022523CC = { @@ -11764,8 +11754,8 @@ static const UnkStruct_ov9_02252414 Unk_ov9_022523CC = { 0x20, 0x3, 0x1, - {FX32_ONE, FX32_ONE, FX32_ONE}, - {(FX32_ONE * 48), 0x0, 0x0}, + { FX32_ONE, FX32_ONE, FX32_ONE }, + { (FX32_ONE * 48), 0x0, 0x0 }, 0x48 }; @@ -11774,21 +11764,20 @@ static const UnkStruct_ov9_022506EC Unk_ov9_02251228 = { }; static const UnkStruct_ov9_02251438 Unk_ov9_022519F0[] = { - {0x7, &Unk_ov9_022523CC}, - {0x8, &Unk_ov9_02251228}, - {0x12, NULL} + { 0x7, &Unk_ov9_022523CC }, + { 0x8, &Unk_ov9_02251228 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252044 Unk_ov9_02252C78[] = { - {0x41, 0xA1, 0x39, 0x7, 0x0, Unk_ov9_02251960}, - {0x62, 0xA1, 0x38, 0x7, 0x1, Unk_ov9_022519F0}, - {0x62, 0xA1, 0x39, 0x7, 0x1, Unk_ov9_022519F0}, - {0x0, 0x0, 0x0, 0x0, NULL} + { 0x41, 0xA1, 0x39, 0x7, 0x0, Unk_ov9_02251960 }, + { 0x62, 0xA1, 0x38, 0x7, 0x1, Unk_ov9_022519F0 }, + { 0x62, 0xA1, 0x39, 0x7, 0x1, Unk_ov9_022519F0 }, + { 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_ov9_022523F0 Unk_ov9_022523F0 = { - { - 0x1, + { 0x1, 0x0, 0x0, 0x2A, @@ -11799,38 +11788,37 @@ static const UnkStruct_ov9_022523F0 Unk_ov9_022523F0 = { 0x0, 0x14, 0x0, - {0x0, (FX32_ONE * 8), 0x0} - } + { 0x0, (FX32_ONE * 8), 0x0 } } }; static const UnkStruct_ov9_02251438 Unk_ov9_022513D8[] = { - {0x4, &Unk_ov9_022523F0}, - {0x12, NULL} + { 0x4, &Unk_ov9_022523F0 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02251438 Unk_ov9_022513C8[] = { - {0xC, NULL}, - {0x12, NULL} + { 0xC, NULL }, + { 0x12, NULL } }; static const UnkStruct_ov9_02251438 Unk_ov9_022513B8[] = { - {0xD, NULL}, - {0x12, NULL} + { 0xD, NULL }, + { 0x12, NULL } }; static const UnkStruct_ov9_02251438 Unk_ov9_022513F8[] = { - {0xE, NULL}, - {0x12, NULL} + { 0xE, NULL }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252044 Unk_ov9_02253034[] = { - {0x56, 0x81, 0x35, 0x1, 0xA, Unk_ov9_022513C8}, - {0x57, 0x81, 0x35, 0x1, 0xA, Unk_ov9_022513C8}, - {0x64, 0x81, 0x43, 0x1, 0xB, Unk_ov9_022513B8}, - {0x64, 0x81, 0x44, 0x1, 0xB, Unk_ov9_022513B8}, - {0x50, 0x81, 0x43, 0x1, 0xC, Unk_ov9_022513F8}, - {0x50, 0x81, 0x44, 0x1, 0xC, Unk_ov9_022513F8}, - {0x0, 0x0, 0x0, 0x0, NULL} + { 0x56, 0x81, 0x35, 0x1, 0xA, Unk_ov9_022513C8 }, + { 0x57, 0x81, 0x35, 0x1, 0xA, Unk_ov9_022513C8 }, + { 0x64, 0x81, 0x43, 0x1, 0xB, Unk_ov9_022513B8 }, + { 0x64, 0x81, 0x44, 0x1, 0xB, Unk_ov9_022513B8 }, + { 0x50, 0x81, 0x43, 0x1, 0xC, Unk_ov9_022513F8 }, + { 0x50, 0x81, 0x44, 0x1, 0xC, Unk_ov9_022513F8 }, + { 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_ov9_022506AC Unk_ov9_0225125C = { @@ -11842,16 +11830,16 @@ static const UnkStruct_ov9_022506D0 Unk_ov9_02251234 = { }; static const UnkStruct_ov9_02251438 Unk_ov9_02251B40[] = { - {0x5, &Unk_ov9_0225125C}, - {0x6, &Unk_ov9_02251234}, - {0x12, NULL} + { 0x5, &Unk_ov9_0225125C }, + { 0x6, &Unk_ov9_02251234 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252044 Unk_ov9_02252CB8[] = { - {0x54, 0x41, 0x4C, 0x3, 0x8, Unk_ov9_02251B40}, - {0x55, 0x41, 0x4C, 0x3, 0x8, Unk_ov9_02251B40}, - {0x56, 0x41, 0x4C, 0x3, 0x8, Unk_ov9_02251B40}, - {0x0, 0x0, 0x0, 0x0, NULL} + { 0x54, 0x41, 0x4C, 0x3, 0x8, Unk_ov9_02251B40 }, + { 0x55, 0x41, 0x4C, 0x3, 0x8, Unk_ov9_02251B40 }, + { 0x56, 0x41, 0x4C, 0x3, 0x8, Unk_ov9_02251B40 }, + { 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_ov9_02250704 Unk_ov9_02251260 = { @@ -11859,9 +11847,9 @@ static const UnkStruct_ov9_02250704 Unk_ov9_02251260 = { }; static const UnkStruct_ov9_02251438 Unk_ov9_02251BA0[] = { - {0xF, NULL}, - {0x9, &Unk_ov9_02251260}, - {0x12, NULL} + { 0xF, NULL }, + { 0x9, &Unk_ov9_02251260 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02250704 Unk_ov9_02251268 = { @@ -11869,9 +11857,9 @@ static const UnkStruct_ov9_02250704 Unk_ov9_02251268 = { }; static const UnkStruct_ov9_02251438 Unk_ov9_02251C00[] = { - {0x10, NULL}, - {0x11, &Unk_ov9_02251268}, - {0x12, NULL} + { 0x10, NULL }, + { 0x11, &Unk_ov9_02251268 }, + { 0x12, NULL } }; static const UnkStruct_ov9_022506AC Unk_ov9_02251240 = { @@ -11884,8 +11872,8 @@ static const UnkStruct_ov9_02252414 Unk_ov9_02252438 = { 0x16, 0x3, 0x0, - {FX32_ONE / 4, FX32_ONE / 4, FX32_ONE / 4}, - {(FX32_ONE * 16), 0x0, 0x0}, + { FX32_ONE / 4, FX32_ONE / 4, FX32_ONE / 4 }, + { (FX32_ONE * 16), 0x0, 0x0 }, 0x30 }; @@ -11894,10 +11882,10 @@ static const UnkStruct_ov9_022506D0 Unk_ov9_02251264 = { }; static const UnkStruct_ov9_02251438 Unk_ov9_022522C4[] = { - {0x5, &Unk_ov9_02251240}, - {0x7, &Unk_ov9_02252438}, - {0x6, &Unk_ov9_02251264}, - {0x12, NULL} + { 0x5, &Unk_ov9_02251240 }, + { 0x7, &Unk_ov9_02252438 }, + { 0x6, &Unk_ov9_02251264 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252414 Unk_ov9_0225245C = { @@ -11906,8 +11894,8 @@ static const UnkStruct_ov9_02252414 Unk_ov9_0225245C = { 0x8, 0x4, 0x2, - {FX32_ONE / 2, FX32_ONE / 2, FX32_ONE / 2}, - {0x0, (FX32_ONE * 32), (FX32_ONE * 2)}, + { FX32_ONE / 2, FX32_ONE / 2, FX32_ONE / 2 }, + { 0x0, (FX32_ONE * 32), (FX32_ONE * 2) }, 0x20 }; @@ -11916,9 +11904,9 @@ static const UnkStruct_ov9_022506D0 Unk_ov9_02251230 = { }; static const UnkStruct_ov9_02251438 Unk_ov9_02251DB0[] = { - {0x7, &Unk_ov9_0225245C}, - {0x6, &Unk_ov9_02251230}, - {0x12, NULL} + { 0x7, &Unk_ov9_0225245C }, + { 0x6, &Unk_ov9_02251230 }, + { 0x12, NULL } }; static const UnkStruct_ov9_022506D0 Unk_ov9_0225122C = { @@ -11930,59 +11918,59 @@ static const UnkStruct_ov9_022506AC Unk_ov9_02251218 = { }; static const UnkStruct_ov9_02251438 Unk_ov9_02252344[] = { - {0x6, &Unk_ov9_0225122C}, - {0xB, NULL}, - {0x5, &Unk_ov9_02251218}, - {0x12, NULL} + { 0x6, &Unk_ov9_0225122C }, + { 0xB, NULL }, + { 0x5, &Unk_ov9_02251218 }, + { 0x12, NULL } }; static const UnkStruct_ov9_02252044 Unk_ov9_02252F0C[] = { - {0xF, 0x1, 0x17, 0x1, 0x10, Unk_ov9_02251BA0}, - {0xF, 0x1, 0x18, 0x2, 0x10, Unk_ov9_02251C00}, - {0xF, 0x1, 0x18, 0x3, 0xA, Unk_ov9_022522C4}, - {0xF, 0x1, 0x11, 0x3, 0xB, Unk_ov9_02251DB0}, - {0xF, 0x1, 0xE, 0x3, 0xC, Unk_ov9_02252344}, - {0x0, 0x0, 0x0, 0x0, NULL} + { 0xF, 0x1, 0x17, 0x1, 0x10, Unk_ov9_02251BA0 }, + { 0xF, 0x1, 0x18, 0x2, 0x10, Unk_ov9_02251C00 }, + { 0xF, 0x1, 0x18, 0x3, 0xA, Unk_ov9_022522C4 }, + { 0xF, 0x1, 0x11, 0x3, 0xB, Unk_ov9_02251DB0 }, + { 0xF, 0x1, 0xE, 0x3, 0xC, Unk_ov9_02252344 }, + { 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_ov9_02252D38 Unk_ov9_02252D38[] = { - {0x23D, Unk_ov9_02252044}, - {0x23E, Unk_ov9_02252084}, - {0x23F, Unk_ov9_022534F0}, - {0x240, Unk_ov9_02252BD8}, - {0x241, Unk_ov9_02252C78}, - {0x243, Unk_ov9_02253034}, - {0x245, Unk_ov9_02252CB8}, - {0x246, Unk_ov9_02252F0C}, - {0x251, NULL} + { 0x23D, Unk_ov9_02252044 }, + { 0x23E, Unk_ov9_02252084 }, + { 0x23F, Unk_ov9_022534F0 }, + { 0x240, Unk_ov9_02252BD8 }, + { 0x241, Unk_ov9_02252C78 }, + { 0x243, Unk_ov9_02253034 }, + { 0x245, Unk_ov9_02252CB8 }, + { 0x246, Unk_ov9_02252F0C }, + { 0x251, NULL } }; static const UnkStruct_ov9_0224EC10 Unk_ov9_02251F24[] = { - {0x0, 0x18, 0x37, 0x121, 0x27, 0x0, 0x0}, - {0x0, 0x19, 0x0, 0x0, 0x0} + { 0x0, 0x18, 0x37, 0x121, 0x27, 0x0, 0x0 }, + { 0x0, 0x19, 0x0, 0x0, 0x0 } }; static const UnkStruct_ov9_0224EC10 Unk_ov9_02251F44[] = { - {0x0, 0x15, 0x6A, 0x99, 0x4E, 0x0, 0x0}, - {0x0, 0x19, 0x0, 0x0, 0x0, 0x0, 0x0} + { 0x0, 0x15, 0x6A, 0x99, 0x4E, 0x0, 0x0 }, + { 0x0, 0x19, 0x0, 0x0, 0x0, 0x0, 0x0 } }; static const UnkStruct_ov9_0224EC10 Unk_ov9_02251F84[] = { - {0x0, 0x18, 0xF, 0x1, 0xC, 0x5, 0xE}, - {0x0, 0x19, 0x0, 0x0, 0x0, 0x0, 0x0} + { 0x0, 0x18, 0xF, 0x1, 0xC, 0x5, 0xE }, + { 0x0, 0x19, 0x0, 0x0, 0x0, 0x0, 0x0 } }; static const UnkStruct_ov9_0224EC10 Unk_ov9_02251FA4[] = { - {0x0, 0x18, 0x74, 0x41, 0x4A, 0x0, 0x0}, - {0x0, 0x19, 0x0, 0x0, 0x0} + { 0x0, 0x18, 0x74, 0x41, 0x4A, 0x0, 0x0 }, + { 0x0, 0x19, 0x0, 0x0, 0x0 } }; static const UnkStruct_ov9_02252548 Unk_ov9_02252548[] = { - {0x23D, Unk_ov9_02251F24}, - {0x243, Unk_ov9_02251F44}, - {0x246, Unk_ov9_02251F84}, - {0x247, Unk_ov9_02251FA4}, - {0x251, NULL} + { 0x23D, Unk_ov9_02251F24 }, + { 0x243, Unk_ov9_02251F44 }, + { 0x246, Unk_ov9_02251F84 }, + { 0x247, Unk_ov9_02251FA4 }, + { 0x251, NULL } }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252598 = { @@ -12005,8 +11993,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252598 = { 0x0, 0x37, 0x28, - ((289 << 4) * FX32_ONE) - } + ((289 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022525E8 = { @@ -12029,11 +12017,11 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022525E8 = { 0x0, 0x27, 0x34, - ((289 << 4) * FX32_ONE) - } + ((289 << 4) * FX32_ONE), + }, }; -static const UnkStruct_ov9_0224EF30 * Unk_ov9_02253B34[] = { +static const UnkStruct_ov9_0224EF30 *Unk_ov9_02253B34[] = { &Unk_ov9_02252598, &Unk_ov9_022525E8, NULL @@ -12059,11 +12047,11 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252638 = { 0x0, 0xC, 0x39, - ((257 << 4) * FX32_ONE) - } + ((257 << 4) * FX32_ONE), + }, }; -static const UnkStruct_ov9_0224EF30 * Unk_ov9_02253B08[] = { +static const UnkStruct_ov9_0224EF30 *Unk_ov9_02253B08[] = { &Unk_ov9_02252638, NULL }; @@ -12088,8 +12076,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022526D8 = { 0x0, 0x1E, 0x14, - ((233 << 4) * FX32_ONE) - } + ((233 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252728 = { @@ -12112,11 +12100,11 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252728 = { 0x0, 0x1E, 0x14, - ((232 << 4) * FX32_ONE) - } + ((232 << 4) * FX32_ONE), + }, }; -static const UnkStruct_ov9_0224EF30 * Unk_ov9_02253B58[] = { +static const UnkStruct_ov9_0224EF30 *Unk_ov9_02253B58[] = { &Unk_ov9_022526D8, &Unk_ov9_02252728, NULL @@ -12142,11 +12130,11 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022527A0 = { 0x0, 0x41, 0x31, - ((193 << 4) * FX32_ONE) - } + ((193 << 4) * FX32_ONE), + }, }; -static const UnkStruct_ov9_0224EF30 * Unk_ov9_02253B20[] = { +static const UnkStruct_ov9_0224EF30 *Unk_ov9_02253B20[] = { &Unk_ov9_022527A0, NULL }; @@ -12171,11 +12159,11 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022527F0 = { 0x0, 0x59, 0x40, - ((161 << 4) * FX32_ONE) - } + ((161 << 4) * FX32_ONE), + }, }; -static const UnkStruct_ov9_0224EF30 * Unk_ov9_02253B18[] = { +static const UnkStruct_ov9_0224EF30 *Unk_ov9_02253B18[] = { &Unk_ov9_022527F0, NULL }; @@ -12200,8 +12188,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252840 = { 0x0, 0x4B, 0x44, - ((129 << 4) * FX32_ONE) - } + ((129 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252890 = { @@ -12224,8 +12212,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252890 = { 0x0, 0x62, 0x43, - ((129 << 4) * FX32_ONE) - } + ((129 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022528B8 = { @@ -12248,8 +12236,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022528B8 = { 0x0, 0x56, 0x38, - ((129 << 4) * FX32_ONE) - } + ((129 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252908 = { @@ -12272,8 +12260,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252908 = { 0x0, 0x56, 0x3A, - (((129 - 16) << 4) * FX32_ONE) - } + (((129 - 16) << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252958 = { @@ -12296,8 +12284,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252958 = { 0x0, 0x60, 0x43, - (((129 - 12) << 4) * FX32_ONE) - } + (((129 - 12) << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022529A8 = { @@ -12320,11 +12308,11 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022529A8 = { 0x0, 0x4D, 0x44, - (((129 - 8) << 4) * FX32_ONE) - } + (((129 - 8) << 4) * FX32_ONE), + }, }; -static const UnkStruct_ov9_0224EF30 * Unk_ov9_02253BC8[] = { +static const UnkStruct_ov9_0224EF30 *Unk_ov9_02253BC8[] = { &Unk_ov9_02252840, &Unk_ov9_02252890, &Unk_ov9_022528B8, @@ -12354,8 +12342,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252A20 = { 0x0, 0x4B, 0x44, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252A70 = { @@ -12378,8 +12366,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252A70 = { 0x0, 0x62, 0x43, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252AC0 = { @@ -12402,8 +12390,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252AC0 = { 0x0, 0x56, 0x38, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252AE8 = { @@ -12426,8 +12414,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252AE8 = { 0x0, 0x44, 0x40, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252B10 = { @@ -12450,8 +12438,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252B10 = { 0x0, 0x52, 0x3C, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252B38 = { @@ -12474,8 +12462,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252B38 = { 0x0, 0x60, 0x47, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252480 = { @@ -12498,8 +12486,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252480 = { 0x0, 0x55, 0x50, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022524F8 = { @@ -12522,8 +12510,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022524F8 = { 0x0, 0x54, 0x54, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252520 = { @@ -12546,8 +12534,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252520 = { 0x0, 0x44, 0x43, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252570 = { @@ -12570,8 +12558,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252570 = { 0x0, 0x4B, 0x43, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252610 = { @@ -12594,8 +12582,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252610 = { 0x0, 0x4F, 0x43, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252660 = { @@ -12618,8 +12606,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252660 = { 0x0, 0x55, 0x34, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252750 = { @@ -12642,8 +12630,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252750 = { 0x0, 0x55, 0x38, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022527C8 = { @@ -12666,8 +12654,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022527C8 = { 0x0, 0x55, 0x3C, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252818 = { @@ -12690,8 +12678,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252818 = { 0x0, 0x60, 0x44, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252868 = { @@ -12714,8 +12702,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252868 = { 0x0, 0x64, 0x44, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022528E0 = { @@ -12738,8 +12726,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022528E0 = { 0x0, 0x69, 0x44, - ((115 << 4) * FX32_ONE) - } + ((115 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252930 = { @@ -12762,8 +12750,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252930 = { 0x0, 0x44, 0x42, - ((113 << 4) * FX32_ONE) - } + ((113 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022529D0 = { @@ -12786,8 +12774,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022529D0 = { 0x0, 0x60, 0x45, - ((113 << 4) * FX32_ONE) - } + ((113 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252A48 = { @@ -12810,11 +12798,11 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252A48 = { 0x0, 0x54, 0x3C, - ((113 << 4) * FX32_ONE) - } + ((113 << 4) * FX32_ONE), + }, }; -static const UnkStruct_ov9_0224EF30 * Unk_ov9_02253C78[] = { +static const UnkStruct_ov9_0224EF30 *Unk_ov9_02253C78[] = { &Unk_ov9_02252A20, &Unk_ov9_02252A70, &Unk_ov9_02252AC0, @@ -12858,8 +12846,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252B88 = { 0x0, 0x55, 0x4A, - ((65 << 4) * FX32_ONE) - } + ((65 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022524A8 = { @@ -12882,8 +12870,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022524A8 = { 0x0, 0x54, 0x4A, - ((65 << 4) * FX32_ONE) - } + ((65 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022525C0 = { @@ -12906,8 +12894,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022525C0 = { 0x0, 0x59, 0x45, - ((65 << 4) * FX32_ONE) - } + ((65 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252688 = { @@ -12930,8 +12918,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252688 = { 0x0, 0x55, 0x46, - ((65 << 4) * FX32_ONE) - } + ((65 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252700 = { @@ -12954,11 +12942,11 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252700 = { 0x0, 0x55, 0x4A, - ((65 << 4) * FX32_ONE) - } + ((65 << 4) * FX32_ONE), + }, }; -static const UnkStruct_ov9_0224EF30 * Unk_ov9_02253B98[] = { +static const UnkStruct_ov9_0224EF30 *Unk_ov9_02253B98[] = { &Unk_ov9_02252B88, &Unk_ov9_022524A8, &Unk_ov9_022525C0, @@ -12987,8 +12975,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252980 = { 0x0, 0xF, 0xD, - ((1 << 4) * FX32_ONE) - } + ((1 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252A98 = { @@ -13011,8 +12999,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252A98 = { 0x0, 0xF, 0x17, - ((1 << 4) * FX32_ONE) - } + ((1 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252B60 = { @@ -13035,8 +13023,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252B60 = { 0x0, 0xF, 0x17, - ((1 << 4) * FX32_ONE) - } + ((1 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022524D0 = { @@ -13059,8 +13047,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022524D0 = { 0x0, 0xF, 0xD, - ((1 << 4) * FX32_ONE) - } + ((1 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_022526B0 = { @@ -13083,11 +13071,11 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_022526B0 = { 0x0, 0xF, 0xF, - ((1 << 4) * FX32_ONE) - } + ((1 << 4) * FX32_ONE), + }, }; -static const UnkStruct_ov9_0224EF30 * Unk_ov9_02253BB0[] = { +static const UnkStruct_ov9_0224EF30 *Unk_ov9_02253BB0[] = { &Unk_ov9_02252980, &Unk_ov9_02252A98, &Unk_ov9_02252B60, @@ -13116,8 +13104,8 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252BB0 = { 0x0, 0x74, 0x4A, - ((65 << 4) * FX32_ONE) - } + ((65 << 4) * FX32_ONE), + }, }; static const UnkStruct_ov9_0224EF30 Unk_ov9_02252778 = { @@ -13140,26 +13128,26 @@ static const UnkStruct_ov9_0224EF30 Unk_ov9_02252778 = { 0x0, 0x59, 0x37, - ((65 << 4) * FX32_ONE) - } + ((65 << 4) * FX32_ONE), + }, }; -static const UnkStruct_ov9_0224EF30 * Unk_ov9_02253B40[] = { +static const UnkStruct_ov9_0224EF30 *Unk_ov9_02253B40[] = { &Unk_ov9_02252BB0, &Unk_ov9_02252778, NULL }; static const UnkStruct_ov9_02252EB4 Unk_ov9_02252EB4[] = { - {0x23D, Unk_ov9_02253B34}, - {0x23E, Unk_ov9_02253B08}, - {0x23F, Unk_ov9_02253B58}, - {0x240, Unk_ov9_02253B20}, - {0x241, Unk_ov9_02253B18}, - {0x243, Unk_ov9_02253BC8}, - {0x244, Unk_ov9_02253C78}, - {0x245, Unk_ov9_02253B98}, - {0x246, Unk_ov9_02253BB0}, - {0x247, Unk_ov9_02253B40}, - {0x251, NULL} + { 0x23D, Unk_ov9_02253B34 }, + { 0x23E, Unk_ov9_02253B08 }, + { 0x23F, Unk_ov9_02253B58 }, + { 0x240, Unk_ov9_02253B20 }, + { 0x241, Unk_ov9_02253B18 }, + { 0x243, Unk_ov9_02253BC8 }, + { 0x244, Unk_ov9_02253C78 }, + { 0x245, Unk_ov9_02253B98 }, + { 0x246, Unk_ov9_02253BB0 }, + { 0x247, Unk_ov9_02253B40 }, + { 0x251, NULL }, }; diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 808b9037f4..2cf41a08b9 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -1,8 +1,9 @@ +#include "overlay010/ov10_0221F800.h" + #include #include -#include "core_sys.h" - +#include "struct_decls/font_oam.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" @@ -10,34 +11,52 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" + #include "overlay010/struct_ov10_0221F800.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "bag.h" +#include "camera.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "journal.h" +#include "map_header.h" +#include "message.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "pokemon_summary_app.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" +#include "trainer_data.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200679C.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" @@ -45,41 +64,22 @@ #include "unk_02012744.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_02024220.h" -#include "trainer_info.h" -#include "game_options.h" -#include "journal.h" #include "unk_0202F1D4.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "map_header.h" -#include "pokemon.h" -#include "trainer_data.h" -#include "pokemon_icon.h" -#include "party.h" -#include "item.h" -#include "bag.h" #include "unk_0207E0B8.h" #include "unk_0208C098.h" -#include "pokemon_summary_app.h" -#include "overlay010/ov10_0221F800.h" typedef struct UnkStruct_ov10_0221FB28_t UnkStruct_ov10_0221FB28; -typedef u8 (* UnkFuncPtr_ov10_02222AD0)(UnkStruct_ov10_0221FB28 *); +typedef u8 (*UnkFuncPtr_ov10_02222AD0)(UnkStruct_ov10_0221FB28 *); typedef struct { u32 unk_00; @@ -97,14 +97,14 @@ typedef struct { } UnkStruct_ov10_0221FB28_sub1; typedef struct UnkStruct_ov10_0221FB28_t { - UnkStruct_ov10_0221F800 * unk_00; - const UnkFuncPtr_ov10_02222AD0 * unk_04; - PaletteData * unk_08; - BGL * unk_0C; + UnkStruct_ov10_0221F800 *unk_00; + const UnkFuncPtr_ov10_02222AD0 *unk_04; + PaletteData *unk_08; + BGL *unk_0C; Window unk_10[24]; - SpriteRenderer * unk_190; - SpriteGfxHandler * unk_194; - CellActorData * unk_198[30]; + SpriteRenderer *unk_190; + SpriteGfxHandler *unk_194; + CellActorData *unk_198[30]; u32 unk_210; UnkStruct_ov10_0221FB28_sub1 unk_214[6]; u16 unk_298[96]; @@ -112,11 +112,11 @@ typedef struct UnkStruct_ov10_0221FB28_t { u16 unk_418[96]; u16 unk_4D8[48]; u16 unk_538[2][384]; - UnkStruct_02012744 * unk_B38; - FontOAM * unk_B3C[4]; - GenericPointerData * unk_B4C; - UnkStruct_02014014 * unk_B50; - void * unk_B54; + UnkStruct_02012744 *unk_B38; + FontOAM *unk_B3C[4]; + GenericPointerData *unk_B4C; + UnkStruct_02014014 *unk_B50; + void *unk_B54; u8 unk_B58[4]; u8 unk_B5C[4]; u8 unk_B60[4]; @@ -136,110 +136,110 @@ typedef struct UnkStruct_ov10_0221FB28_t { Window unk_B7C; Window unk_B8C; GXBG0As unk_B9C; - MessageLoader * unk_BA0; - StringTemplate * unk_BA4; - Strbuf* unk_BA8; + MessageLoader *unk_BA0; + StringTemplate *unk_BA4; + Strbuf *unk_BA8; int unk_BAC; int unk_BB0; - UIControlData * unk_BB4; - void * unk_BB8; + UIControlData *unk_BB4; + void *unk_BB8; int unk_BBC; int unk_BC0; BOOL unk_BC4; }; -static void ov10_0221F870(SysTask * param0, void * param1); +static void ov10_0221F870(SysTask *param0, void *param1); static void ov10_0221F900(void); -static u8 ov10_0221FB28(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_0221FE10(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_0221FE48(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_02220014(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_02220228(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_02220350(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_02220360(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_022203A0(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_022203BC(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_022204C0(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_02220A34(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_02220A50(SysTask * param0, UnkStruct_ov10_0221FB28 * param1); -static u8 ov10_022205F4(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_02220604(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_02220698(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_022206D8(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_0222094C(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_0221FC78(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_0221FD00(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_0221FBFC(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_022209E0(UnkStruct_ov10_0221FB28 * param0); +static u8 ov10_0221FB28(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_0221FE10(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_0221FE48(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_02220014(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_02220228(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_02220350(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_02220360(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_022203A0(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_022203BC(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_022204C0(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_02220A34(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_02220A50(SysTask *param0, UnkStruct_ov10_0221FB28 *param1); +static u8 ov10_022205F4(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_02220604(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_02220698(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_022206D8(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_0222094C(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_0221FC78(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_0221FD00(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_0221FBFC(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_022209E0(UnkStruct_ov10_0221FB28 *param0); static BOOL ov10_02220AD0(void); -static void ov10_02220B00(UnkStruct_ov10_0221FB28 * param0, UnkStruct_ov104_02241308 * param1, int param2); -static CellActorData * ov10_02220BA0(UnkStruct_ov10_0221FB28 * param0, const u32 * param1); -static void ov10_02220BE8(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02220C2C(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02220C64(void * param0); -static void ov10_02220C94(UnkStruct_ov10_0221FB28 * param0, GXBG0As param1, int param2); -static void ov10_02220E30(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02220E70(UnkStruct_ov10_0221FB28 * param0); +static void ov10_02220B00(UnkStruct_ov10_0221FB28 *param0, UnkStruct_ov104_02241308 *param1, int param2); +static CellActorData *ov10_02220BA0(UnkStruct_ov10_0221FB28 *param0, const u32 *param1); +static void ov10_02220BE8(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02220C2C(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02220C64(void *param0); +static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int param2); +static void ov10_02220E30(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02220E70(UnkStruct_ov10_0221FB28 *param0); static void ov10_02221004(void); -static void ov10_0222101C(UnkStruct_ov10_0221FB28 * param0); -static void ov10_022214A0(UnkStruct_ov10_0221FB28 * param0, int param1, int param2); -static void ov10_022210F4(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02221188(UnkStruct_ov10_0221FB28 * param0, u8 param1, s16 param2, s16 param3); -static void ov10_022212AC(UnkStruct_ov10_0221FB28 * param0); -static void ov10_022213B8(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02221440(UnkStruct_ov10_0221FB28 * param0, u32 param1, s16 param2, s16 param3); -static void ov10_0222146C(UnkStruct_ov10_0221FB28 * param0); -static void ov10_022217CC(UnkStruct_ov10_0221FB28 * param0); -static int ov10_022218BC(UnkStruct_ov10_0221FB28 * param0); -static void ov10_022218F4(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02221588(UnkStruct_ov10_0221FB28 * param0); -static void ov10_0222166C(UnkStruct_ov10_0221FB28 * param0); -static void ov10_022216E0(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02221970(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02221A10(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02221A3C(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02222050(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02221E58(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02221AE4(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02221C14(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02221C48(UnkStruct_ov10_0221FB28 * param0, u8 param1); -static void ov10_022223C0(UnkStruct_ov10_0221FB28 * param0); -static void ov10_022223E8(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02222720(UnkStruct_ov10_0221FB28 * param0); -static void ov10_022220B4(UnkStruct_ov10_0221FB28 * param0); -static void ov10_0222216C(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02222208(UnkStruct_ov10_0221FB28 * param0); -static void ov10_022222A4(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02222340(UnkStruct_ov10_0221FB28 * param0, s16 param1); +static void ov10_0222101C(UnkStruct_ov10_0221FB28 *param0); +static void ov10_022214A0(UnkStruct_ov10_0221FB28 *param0, int param1, int param2); +static void ov10_022210F4(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02221188(UnkStruct_ov10_0221FB28 *param0, u8 param1, s16 param2, s16 param3); +static void ov10_022212AC(UnkStruct_ov10_0221FB28 *param0); +static void ov10_022213B8(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02221440(UnkStruct_ov10_0221FB28 *param0, u32 param1, s16 param2, s16 param3); +static void ov10_0222146C(UnkStruct_ov10_0221FB28 *param0); +static void ov10_022217CC(UnkStruct_ov10_0221FB28 *param0); +static int ov10_022218BC(UnkStruct_ov10_0221FB28 *param0); +static void ov10_022218F4(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02221588(UnkStruct_ov10_0221FB28 *param0); +static void ov10_0222166C(UnkStruct_ov10_0221FB28 *param0); +static void ov10_022216E0(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02221A10(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02221A3C(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02222050(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02221E58(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02221AE4(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02221C14(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02221C48(UnkStruct_ov10_0221FB28 *param0, u8 param1); +static void ov10_022223C0(UnkStruct_ov10_0221FB28 *param0); +static void ov10_022223E8(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02222720(UnkStruct_ov10_0221FB28 *param0); +static void ov10_022220B4(UnkStruct_ov10_0221FB28 *param0); +static void ov10_0222216C(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02222208(UnkStruct_ov10_0221FB28 *param0); +static void ov10_022222A4(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02222340(UnkStruct_ov10_0221FB28 *param0, s16 param1); static u32 ov10_02221928(u32 param0, BOOL param1); static u32 ov10_0222194C(u32 param0, BOOL param1); -static void ov10_022227A4(UnkStruct_ov10_0221F800 * param0); -static u8 ov10_02220700(UnkStruct_ov10_0221FB28 * param0); -static u8 ov10_022208B0(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02220F1C(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02220DCC(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02220DFC(UnkStruct_ov10_0221FB28 * param0); -static void ov10_022229D4(UnkStruct_ov10_0221FB28 * param0); -static void ov10_0221F930(UnkStruct_ov10_0221FB28 * param0); -static BOOL ov10_02222A08(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02222A28(UnkStruct_ov10_0221FB28 * param0); -static void ov10_02222A48(UnkStruct_ov10_0221FB28 * param0); +static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0); +static u8 ov10_02220700(UnkStruct_ov10_0221FB28 *param0); +static u8 ov10_022208B0(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02220F1C(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02220DCC(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02220DFC(UnkStruct_ov10_0221FB28 *param0); +static void ov10_022229D4(UnkStruct_ov10_0221FB28 *param0); +static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0); +static BOOL ov10_02222A08(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02222A28(UnkStruct_ov10_0221FB28 *param0); +static void ov10_02222A48(UnkStruct_ov10_0221FB28 *param0); static const u32 Unk_ov10_02222DB4[][7] = { - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0}, - {0xB808, 0xB807, 0xB808, 0xB808, 0x1, 0x0, 0x1}, - {0xB808, 0xB807, 0xB808, 0xB808, 0x1, 0x0, 0x1} + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB807, 0xB807, 0xB807, 0xB807, 0x2, 0x0, 0x0 }, + { 0xB808, 0xB807, 0xB808, 0xB808, 0x1, 0x0, 0x1 }, + { 0xB808, 0xB807, 0xB808, 0xB808, 0x1, 0x0, 0x1 } }; static const UnkFuncPtr_ov10_02222AD0 Unk_ov10_02222AD0[] = { @@ -297,90 +297,90 @@ static const UnkFuncPtr_ov10_02222AD0 Unk_ov10_02222C38[] = { }; static const u8 Unk_ov10_02222A7C[][2] = { - {0x6, 0x6}, - {0x0, 0x6}, - {0x0, 0x6}, - {0x4, 0xA}, - {0x0, 0xA}, - {0x0, 0xA} + { 0x6, 0x6 }, + { 0x0, 0x6 }, + { 0x0, 0x6 }, + { 0x4, 0xA }, + { 0x0, 0xA }, + { 0x0, 0xA } }; static const UnkStruct_ov61_0222C884 Unk_ov10_02222CF4[] = { - {0x1, 0x6, 0x1, 0x9, 0x2, 0x0, 0x1}, - {0x1, 0x1, 0x4, 0x5, 0x2, 0x0, 0x13}, - {0x1, 0x7, 0x4, 0x8, 0x2, 0x0, 0x1D}, - {0x1, 0x8, 0x3, 0x6, 0x1, 0x3, 0x2D}, - {0x1, 0x6, 0x7, 0x9, 0x2, 0x0, 0x33}, - {0x1, 0x1, 0xA, 0x5, 0x2, 0x0, 0x45}, - {0x1, 0x7, 0xA, 0x8, 0x2, 0x0, 0x4F}, - {0x1, 0x8, 0x9, 0x6, 0x1, 0x4, 0x5F}, - {0x1, 0x6, 0xD, 0x9, 0x2, 0x0, 0x65}, - {0x1, 0x1, 0x10, 0x5, 0x2, 0x0, 0x77}, - {0x1, 0x7, 0x10, 0x8, 0x2, 0x0, 0x81}, - {0x1, 0x8, 0xF, 0x6, 0x1, 0x5, 0x91}, - {0x1, 0x16, 0x2, 0x9, 0x2, 0x0, 0x97}, - {0x1, 0x11, 0x5, 0x5, 0x2, 0x0, 0xA9}, - {0x1, 0x17, 0x5, 0x8, 0x2, 0x0, 0xB3}, - {0x1, 0x18, 0x4, 0x6, 0x1, 0x6, 0xC3}, - {0x1, 0x16, 0x8, 0x9, 0x2, 0x0, 0xC9}, - {0x1, 0x11, 0xB, 0x5, 0x2, 0x0, 0xDB}, - {0x1, 0x17, 0xB, 0x8, 0x2, 0x0, 0xE5}, - {0x1, 0x18, 0xA, 0x6, 0x1, 0x7, 0xF5}, - {0x1, 0x16, 0xE, 0x9, 0x2, 0x0, 0xFB}, - {0x1, 0x11, 0x11, 0x5, 0x2, 0x0, 0x10D}, - {0x1, 0x17, 0x11, 0x8, 0x2, 0x0, 0x117}, - {0x1, 0x18, 0x10, 0x6, 0x1, 0x8, 0x127} + { 0x1, 0x6, 0x1, 0x9, 0x2, 0x0, 0x1 }, + { 0x1, 0x1, 0x4, 0x5, 0x2, 0x0, 0x13 }, + { 0x1, 0x7, 0x4, 0x8, 0x2, 0x0, 0x1D }, + { 0x1, 0x8, 0x3, 0x6, 0x1, 0x3, 0x2D }, + { 0x1, 0x6, 0x7, 0x9, 0x2, 0x0, 0x33 }, + { 0x1, 0x1, 0xA, 0x5, 0x2, 0x0, 0x45 }, + { 0x1, 0x7, 0xA, 0x8, 0x2, 0x0, 0x4F }, + { 0x1, 0x8, 0x9, 0x6, 0x1, 0x4, 0x5F }, + { 0x1, 0x6, 0xD, 0x9, 0x2, 0x0, 0x65 }, + { 0x1, 0x1, 0x10, 0x5, 0x2, 0x0, 0x77 }, + { 0x1, 0x7, 0x10, 0x8, 0x2, 0x0, 0x81 }, + { 0x1, 0x8, 0xF, 0x6, 0x1, 0x5, 0x91 }, + { 0x1, 0x16, 0x2, 0x9, 0x2, 0x0, 0x97 }, + { 0x1, 0x11, 0x5, 0x5, 0x2, 0x0, 0xA9 }, + { 0x1, 0x17, 0x5, 0x8, 0x2, 0x0, 0xB3 }, + { 0x1, 0x18, 0x4, 0x6, 0x1, 0x6, 0xC3 }, + { 0x1, 0x16, 0x8, 0x9, 0x2, 0x0, 0xC9 }, + { 0x1, 0x11, 0xB, 0x5, 0x2, 0x0, 0xDB }, + { 0x1, 0x17, 0xB, 0x8, 0x2, 0x0, 0xE5 }, + { 0x1, 0x18, 0xA, 0x6, 0x1, 0x7, 0xF5 }, + { 0x1, 0x16, 0xE, 0x9, 0x2, 0x0, 0xFB }, + { 0x1, 0x11, 0x11, 0x5, 0x2, 0x0, 0x10D }, + { 0x1, 0x17, 0x11, 0x8, 0x2, 0x0, 0x117 }, + { 0x1, 0x18, 0x10, 0x6, 0x1, 0x8, 0x127 } }; static const u8 Unk_ov10_02222A70[][2] = { - {0x0, 0x0}, - {0x0, 0x6}, - {0x0, 0xC}, - {0x10, 0x1}, - {0x10, 0x7}, - {0x10, 0xD} + { 0x0, 0x0 }, + { 0x0, 0x6 }, + { 0x0, 0xC }, + { 0x10, 0x1 }, + { 0x10, 0x7 }, + { 0x10, 0xD } }; static const u8 Unk_ov10_02222C6C[][10] = { - {0x1E, 0x10, 0x26, 0x18, 0x2E, 0x18, 0x24, 0x2C, 0x10, 0xE}, - {0x1E, 0x40, 0x26, 0x48, 0x2E, 0x48, 0x24, 0x5C, 0x10, 0x3E}, - {0x1E, 0x70, 0x26, 0x78, 0x2E, 0x78, 0x24, 0x8C, 0x10, 0x6E}, - {0x9E, 0x18, 0xA6, 0x20, 0xAE, 0x20, 0xA4, 0x34, 0x90, 0x16}, - {0x9E, 0x48, 0xA6, 0x50, 0xAE, 0x50, 0xA4, 0x64, 0x90, 0x46}, - {0x9E, 0x78, 0xA6, 0x80, 0xAE, 0x80, 0xA4, 0x94, 0x90, 0x76} + { 0x1E, 0x10, 0x26, 0x18, 0x2E, 0x18, 0x24, 0x2C, 0x10, 0xE }, + { 0x1E, 0x40, 0x26, 0x48, 0x2E, 0x48, 0x24, 0x5C, 0x10, 0x3E }, + { 0x1E, 0x70, 0x26, 0x78, 0x2E, 0x78, 0x24, 0x8C, 0x10, 0x6E }, + { 0x9E, 0x18, 0xA6, 0x20, 0xAE, 0x20, 0xA4, 0x34, 0x90, 0x16 }, + { 0x9E, 0x48, 0xA6, 0x50, 0xAE, 0x50, 0xA4, 0x64, 0x90, 0x46 }, + { 0x9E, 0x78, 0xA6, 0x80, 0xAE, 0x80, 0xA4, 0x94, 0x90, 0x76 } }; static const u32 Unk_ov10_02222F3C[][7] = { - {0xB809, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0}, - {0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0}, - {0xB80A, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0}, - {0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0}, - {0xB80B, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0}, - {0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0}, - {0xB80C, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0}, - {0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0}, - {0xB80D, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0}, - {0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0}, - {0xB80E, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0}, - {0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0}, - {0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0} + { 0xB809, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0 }, + { 0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0 }, + { 0xB80A, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0 }, + { 0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0 }, + { 0xB80B, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0 }, + { 0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0 }, + { 0xB80C, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0 }, + { 0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0 }, + { 0xB80D, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0 }, + { 0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0 }, + { 0xB80E, 0xB808, 0xB809, 0xB809, 0x1, 0x1, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB80F, 0xB809, 0xB80A, 0xB80A, 0x1, 0x0, 0x0 }, + { 0xB810, 0xB80A, 0xB80B, 0xB80B, 0x1, 0x0, 0x0 }, + { 0xB811, 0xB80B, 0xB80C, 0xB80C, 0x1, 0x2, 0x0 } }; static const UnkStruct_ov61_0222C884 Unk_ov10_02222A68 = { @@ -393,9 +393,9 @@ static const UnkStruct_ov61_0222C884 Unk_ov10_02222A68 = { 0x94 }; -void ov10_0221F800 (UnkStruct_ov10_0221F800 * param0) +void ov10_0221F800(UnkStruct_ov10_0221F800 *param0) { - UnkStruct_ov10_0221FB28 * v0; + UnkStruct_ov10_0221FB28 *v0; v0 = SysTask_GetParam(SysTask_StartAndAllocateParam(ov10_0221F870, sizeof(UnkStruct_ov10_0221FB28), 100, param0->unk_24)); memset(v0, 0, sizeof(UnkStruct_ov10_0221FB28)); @@ -411,9 +411,9 @@ void ov10_0221F800 (UnkStruct_ov10_0221F800 * param0) } } -static void ov10_0221F870 (SysTask * param0, void * param1) +static void ov10_0221F870(SysTask *param0, void *param1) { - UnkStruct_ov10_0221FB28 * v0 = param1; + UnkStruct_ov10_0221FB28 *v0 = param1; switch (v0->unk_B73) { case 0: @@ -452,7 +452,7 @@ static void ov10_0221F870 (SysTask * param0, void * param1) } } -static void ov10_0221F900 (void) +static void ov10_0221F900(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -471,7 +471,7 @@ static void ov10_0221F900 (void) MI_CpuClear32((void *)HW_BG_VRAM, HW_BG_VRAM_SIZE); } -static void ov10_0221F930 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0) { if (ov10_02222A08(param0) == 0) { return; @@ -510,8 +510,7 @@ static void ov10_0221F930 (UnkStruct_ov10_0221FB28 * param0) sub_0201C3C0(param0->unk_0C, 0); param0->unk_BB0 = 4; break; - case 4: - { + case 4: { u32 v0 = sub_02002114(param0->unk_BB4, param0->unk_00->unk_24); switch (v0) { @@ -524,8 +523,7 @@ static void ov10_0221F930 (UnkStruct_ov10_0221FB28 * param0) param0->unk_BB4 = NULL; break; } - } - break; + } break; case 5: ov10_022229D4(param0); MessageLoader_GetStrbuf(param0->unk_BA0, 5, param0->unk_BA8); @@ -550,7 +548,7 @@ static void ov10_0221F930 (UnkStruct_ov10_0221FB28 * param0) } } -static u8 ov10_0221FB28 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_0221FB28(UnkStruct_ov10_0221FB28 *param0) { G2_BlendNone(); @@ -597,7 +595,7 @@ static u8 ov10_0221FB28 (UnkStruct_ov10_0221FB28 * param0) return 1; } -static u8 ov10_0221FBFC (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_0221FBFC(UnkStruct_ov10_0221FB28 *param0) { switch (param0->unk_B76) { case 0: @@ -625,7 +623,7 @@ static u8 ov10_0221FBFC (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_0221FC78 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_0221FC78(UnkStruct_ov10_0221FB28 *param0) { switch (param0->unk_B76) { case 0: @@ -653,7 +651,7 @@ static u8 ov10_0221FC78 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_0221FD00 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_0221FD00(UnkStruct_ov10_0221FB28 *param0) { switch (param0->unk_B76) { case 0: @@ -670,7 +668,7 @@ static u8 ov10_0221FD00 (UnkStruct_ov10_0221FB28 * param0) } { int v2; - TrainerInfo * v3; + TrainerInfo *v3; param0->unk_BC4 = 0; @@ -710,7 +708,7 @@ static u8 ov10_0221FD00 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_0221FE10 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_0221FE10(UnkStruct_ov10_0221FB28 *param0) { if (ScreenWipe_Done() == 0) { return 0; @@ -725,7 +723,7 @@ static u8 ov10_0221FE10 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_0221FE48 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_0221FE48(UnkStruct_ov10_0221FB28 *param0) { if (sub_020192EC(param0->unk_0C, 3) <= 24) { param0->unk_B76 = 0; @@ -764,7 +762,7 @@ static u8 ov10_0221FE48 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_02220014 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_02220014(UnkStruct_ov10_0221FB28 *param0) { s16 v0, v1; @@ -832,7 +830,7 @@ static u8 ov10_02220014 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_02220228 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_02220228(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_B76 == 8) { sub_0200F174(0, 0, 0, 0x7fff, 6, 1, param0->unk_00->unk_24); @@ -865,13 +863,13 @@ static u8 ov10_02220228 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_02220350 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_02220350(UnkStruct_ov10_0221FB28 *param0) { param0->unk_B75 = 16; return 2; } -static u8 ov10_02220360 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_02220360(UnkStruct_ov10_0221FB28 *param0) { if (ov10_02220AD0() == 1) { if (param0->unk_00->unk_2A == 1) { @@ -890,7 +888,7 @@ static u8 ov10_02220360 (UnkStruct_ov10_0221FB28 * param0) return 2; } -static u8 ov10_022203A0 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_022203A0(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_B72 == 0) { return ov10_022203BC(param0); @@ -899,7 +897,7 @@ static u8 ov10_022203A0 (UnkStruct_ov10_0221FB28 * param0) return ov10_022204C0(param0); } -static u8 ov10_022203BC (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_022203BC(UnkStruct_ov10_0221FB28 *param0) { sub_0201C63C(param0->unk_0C, 2, 2, Unk_ov10_02222A7C[param0->unk_B76][0]); sub_0201C63C(param0->unk_0C, 3, 2, Unk_ov10_02222A7C[param0->unk_B76][0]); @@ -926,7 +924,7 @@ static u8 ov10_022203BC (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_022204C0 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_022204C0(UnkStruct_ov10_0221FB28 *param0) { sub_0201C63C(param0->unk_0C, 2, 1, Unk_ov10_02222A7C[param0->unk_B76][0]); sub_0201C63C(param0->unk_0C, 3, 1, Unk_ov10_02222A7C[param0->unk_B76][0]); @@ -954,13 +952,13 @@ static u8 ov10_022204C0 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_022205F4 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_022205F4(UnkStruct_ov10_0221FB28 *param0) { param0->unk_B75 = 16; return 2; } -static u8 ov10_02220604 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_02220604(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_B76 == 0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); @@ -983,7 +981,7 @@ static u8 ov10_02220604 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_02220698 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_02220698(UnkStruct_ov10_0221FB28 *param0) { Sound_PlayEffect(1818); SpriteActor_EnableObject(param0->unk_198[12], 1); @@ -993,7 +991,7 @@ static u8 ov10_02220698 (UnkStruct_ov10_0221FB28 * param0) return 1; } -static u8 ov10_022206D8 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_022206D8(UnkStruct_ov10_0221FB28 *param0) { Sound_PlayEffect(1818); SpriteActor_EnableObject(param0->unk_198[12], 1); @@ -1001,7 +999,7 @@ static u8 ov10_022206D8 (UnkStruct_ov10_0221FB28 * param0) return 1; } -static u8 ov10_02220700 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_02220700(UnkStruct_ov10_0221FB28 *param0) { if (ov10_02222A08(param0) == 0) { param0->unk_B75 = 1; @@ -1029,8 +1027,7 @@ static u8 ov10_02220700 (UnkStruct_ov10_0221FB28 * param0) ov10_02222A28(param0); param0->unk_B76++; break; - case 1: - { + case 1: { int v0; v0 = sub_0202F41C(param0->unk_00->unk_00->unk_198, param0->unk_00->unk_2C, 0, 0, ¶m0->unk_B78, ¶m0->unk_B7A); @@ -1073,7 +1070,7 @@ static u8 ov10_02220700 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_022208B0 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_022208B0(UnkStruct_ov10_0221FB28 *param0) { switch (param0->unk_B76) { case 0: @@ -1103,7 +1100,7 @@ static u8 ov10_022208B0 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_0222094C (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_0222094C(UnkStruct_ov10_0221FB28 *param0) { if (ov10_02220AD0() == 1) { if (param0->unk_00->unk_2A == 1) { @@ -1125,7 +1122,7 @@ static u8 ov10_0222094C (UnkStruct_ov10_0221FB28 * param0) return 1; } -static u8 ov10_022209E0 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_022209E0(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_B76 == 0) { Sound_PlayEffect(1817); @@ -1145,14 +1142,14 @@ static u8 ov10_022209E0 (UnkStruct_ov10_0221FB28 * param0) return 0; } -static u8 ov10_02220A34 (UnkStruct_ov10_0221FB28 * param0) +static u8 ov10_02220A34(UnkStruct_ov10_0221FB28 *param0) { sub_0208C120(1, param0->unk_00->unk_24); param0->unk_B73 = 2; return 1; } -static u8 ov10_02220A50 (SysTask * param0, UnkStruct_ov10_0221FB28 * param1) +static u8 ov10_02220A50(SysTask *param0, UnkStruct_ov10_0221FB28 *param1) { if (ScreenWipe_Done() == 0) { return 0; @@ -1184,7 +1181,7 @@ static u8 ov10_02220A50 (SysTask * param0, UnkStruct_ov10_0221FB28 * param1) return 1; } -static BOOL ov10_02220AD0 (void) +static BOOL ov10_02220AD0(void) { switch (sub_020362F4(CommSys_CurNetId())) { case 0: @@ -1198,7 +1195,7 @@ static BOOL ov10_02220AD0 (void) return 0; } -static void ov10_02220B00 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_ov104_02241308 * param1, int param2) +static void ov10_02220B00(UnkStruct_ov10_0221FB28 *param0, UnkStruct_ov104_02241308 *param1, int param2) { sub_0201DBEC(64, param0->unk_00->unk_24); @@ -1206,7 +1203,14 @@ static void ov10_02220B00 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_ov104_022 param0->unk_194 = sub_0200C704(param0->unk_190); { UnkStruct_ov104_0224133C v0 = { - 0, 128, 0, 32, 0, 128, 0, 32, + 0, + 128, + 0, + 32, + 0, + 128, + 0, + 32, }; UnkStruct_ov104_022412F4 v1 = { 0, 1024 * 64, 1024 * 16, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K @@ -1221,7 +1225,7 @@ static void ov10_02220B00 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_ov104_022 GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static CellActorData * ov10_02220BA0 (UnkStruct_ov10_0221FB28 * param0, const u32 * param1) +static CellActorData *ov10_02220BA0(UnkStruct_ov10_0221FB28 *param0, const u32 *param1) { SpriteTemplate v0; @@ -1242,7 +1246,7 @@ static CellActorData * ov10_02220BA0 (UnkStruct_ov10_0221FB28 * param0, const u3 return SpriteActor_LoadResources(param0->unk_190, param0->unk_194, &v0); } -static void ov10_02220BE8 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02220BE8(UnkStruct_ov10_0221FB28 *param0) { u32 v0; @@ -1254,7 +1258,7 @@ static void ov10_02220BE8 (UnkStruct_ov10_0221FB28 * param0) sub_0200C8D4(param0->unk_190); } -static void ov10_02220C2C (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02220C2C(UnkStruct_ov10_0221FB28 *param0) { u16 v0; @@ -1263,9 +1267,9 @@ static void ov10_02220C2C (UnkStruct_ov10_0221FB28 * param0) } } -static void ov10_02220C64 (void * param0) +static void ov10_02220C64(void *param0) { - UnkStruct_ov10_0221FB28 * v0 = param0; + UnkStruct_ov10_0221FB28 *v0 = param0; sub_0201C2B8(v0->unk_0C); sub_02003694(v0->unk_08); @@ -1275,7 +1279,7 @@ static void ov10_02220C64 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov10_02220C94 (UnkStruct_ov10_0221FB28 * param0, GXBG0As param1, int param2) +static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int param2) { param0->unk_B9C = param1; @@ -1389,7 +1393,7 @@ static void ov10_02220C94 (UnkStruct_ov10_0221FB28 * param0, GXBG0As param1, int } } -static void ov10_02220DCC (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02220DCC(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_B7C.unk_0C != NULL) { BGL_DeleteWindow(¶m0->unk_B7C); @@ -1400,7 +1404,7 @@ static void ov10_02220DCC (UnkStruct_ov10_0221FB28 * param0) } } -static void ov10_02220DFC (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02220DFC(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_BA8 != NULL) { Strbuf_Free(param0->unk_BA8); @@ -1415,7 +1419,7 @@ static void ov10_02220DFC (UnkStruct_ov10_0221FB28 * param0) } } -static void ov10_02220E30 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02220E30(UnkStruct_ov10_0221FB28 *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); sub_02019044(param0->unk_0C, 3); @@ -1429,9 +1433,9 @@ static void ov10_02220E30 (UnkStruct_ov10_0221FB28 * param0) Heap_FreeToHeap(param0->unk_0C); } -static void ov10_02220E70 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02220E70(UnkStruct_ov10_0221FB28 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA, param0->unk_00->unk_24); @@ -1445,7 +1449,7 @@ static void ov10_02220E70 (UnkStruct_ov10_0221FB28 * param0) NARC_dtor(v0); } -static void ov10_02220F1C (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02220F1C(UnkStruct_ov10_0221FB28 *param0) { int v0; @@ -1462,12 +1466,12 @@ static void ov10_02220F1C (UnkStruct_ov10_0221FB28 * param0) BGL_AddWindow(param0->unk_0C, ¶m0->unk_B8C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9)); } -static void ov10_02221004 (void) +static void ov10_02221004(void) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ, 8, 8); } -static void ov10_0222101C (UnkStruct_ov10_0221FB28 * param0) +static void ov10_0222101C(UnkStruct_ov10_0221FB28 *param0) { UnkStruct_ov104_02241308 v0 = { 2, 1, 2, 2, 0, 0 @@ -1496,9 +1500,9 @@ static void ov10_0222101C (UnkStruct_ov10_0221FB28 * param0) ov10_02221440(param0, 3, 256, 0); } -static void ov10_022210F4 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022210F4(UnkStruct_ov10_0221FB28 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param0->unk_00->unk_24); @@ -1509,19 +1513,19 @@ static void ov10_022210F4 (UnkStruct_ov10_0221FB28 * param0) NARC_dtor(v0); } -static void ov10_02221188 (UnkStruct_ov10_0221FB28 * param0, u8 param1, s16 param2, s16 param3) +static void ov10_02221188(UnkStruct_ov10_0221FB28 *param0, u8 param1, s16 param2, s16 param3) { u32 v0; - u8 v1[] = {0, 3, 6, 9}; + u8 v1[] = { 0, 3, 6, 9 }; for (v0 = 0; v0 < 3; v0++) { SpriteActor_SetSpritePositionXY(param0->unk_198[v1[param1] + v0], param0->unk_B58[param1] + v0 * 19 + param2, param0->unk_B5C[param1] + param3); } } -static void ov10_022211F0 (UnkStruct_ov10_0221FB28 * param0, Party * param1, u16 param2, u16 param3) +static void ov10_022211F0(UnkStruct_ov10_0221FB28 *param0, Party *param1, u16 param2, u16 param3) { - Pokemon * v0; + Pokemon *v0; u8 v1; u8 v2, v3, v4; @@ -1553,7 +1557,7 @@ static void ov10_022211F0 (UnkStruct_ov10_0221FB28 * param0, Party * param1, u16 } } -static void ov10_022212AC (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022212AC(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_00->unk_29 == 0) { ov10_022211F0(param0, param0->unk_00->unk_04[0], 6, 0); @@ -1566,9 +1570,9 @@ static void ov10_022212AC (UnkStruct_ov10_0221FB28 * param0) } } -static void ov10_0222130C (UnkStruct_ov10_0221FB28 * param0, u32 param1, Strbuf *param2) +static void ov10_0222130C(UnkStruct_ov10_0221FB28 *param0, u32 param1, Strbuf *param2) { - Window * v0; + Window *v0; UnkStruct_020127E8 v1; v0 = ¶m0->unk_10[0]; @@ -1595,7 +1599,7 @@ static void ov10_0222130C (UnkStruct_ov10_0221FB28 * param0, u32 param1, Strbuf BGL_DeleteWindow(v0); } -static void ov10_022213B8 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022213B8(UnkStruct_ov10_0221FB28 *param0) { param0->unk_B38 = sub_02012744(8, param0->unk_00->unk_24); @@ -1614,12 +1618,12 @@ static void ov10_022213B8 (UnkStruct_ov10_0221FB28 * param0) } } -static void ov10_02221440 (UnkStruct_ov10_0221FB28 * param0, u32 param1, s16 param2, s16 param3) +static void ov10_02221440(UnkStruct_ov10_0221FB28 *param0, u32 param1, s16 param2, s16 param3) { sub_020128C4(param0->unk_B3C[param1], param0->unk_B60[param1] + param2, param0->unk_B64[param1] + param3); } -static void ov10_0222146C (UnkStruct_ov10_0221FB28 * param0) +static void ov10_0222146C(UnkStruct_ov10_0221FB28 *param0) { u32 v0; @@ -1634,7 +1638,7 @@ static void ov10_0222146C (UnkStruct_ov10_0221FB28 * param0) sub_020127BC(param0->unk_B38); } -static void ov10_022214A0 (UnkStruct_ov10_0221FB28 * param0, int param1, int param2) +static void ov10_022214A0(UnkStruct_ov10_0221FB28 *param0, int param1, int param2) { if (param0->unk_00->unk_29 == 1) { param0->unk_B58[0] = (24 - 4); @@ -1669,7 +1673,7 @@ static void ov10_022214A0 (UnkStruct_ov10_0221FB28 * param0, int param1, int par } } -static void ov10_02221588 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02221588(UnkStruct_ov10_0221FB28 *param0) { UnkStruct_ov104_02241308 v0 = { 2, 1, 2, 2, 0, 0 @@ -1699,9 +1703,9 @@ static void ov10_02221588 (UnkStruct_ov10_0221FB28 * param0) param0->unk_210 = 14; } -static void ov10_0222166C (UnkStruct_ov10_0221FB28 * param0) +static void ov10_0222166C(UnkStruct_ov10_0221FB28 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__VS_DEMO_GRA, param0->unk_00->unk_24); @@ -1711,7 +1715,7 @@ static void ov10_0222166C (UnkStruct_ov10_0221FB28 * param0) NARC_dtor(v0); } -static void ov10_022216E0 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022216E0(UnkStruct_ov10_0221FB28 *param0) { SpriteActor_EnableObject(param0->unk_198[12], 0); SpriteActor_EnableObject(param0->unk_198[13], 0); @@ -1744,10 +1748,10 @@ static void ov10_022216E0 (UnkStruct_ov10_0221FB28 * param0) sub_0200D364(param0->unk_198[13], 2 - 1); } -static void ov10_022217CC (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022217CC(UnkStruct_ov10_0221FB28 *param0) { - Camera * camera; - void * v1; + Camera *camera; + void *v1; param0->unk_B4C = sub_02024220(param0->unk_00->unk_24, 0, 4, 0, 2, NULL); @@ -1770,9 +1774,9 @@ static void ov10_022217CC (UnkStruct_ov10_0221FB28 * param0) sub_020146F4(param0->unk_B50, 4, NULL, NULL); } -static int ov10_022218BC (UnkStruct_ov10_0221FB28 * param0) +static int ov10_022218BC(UnkStruct_ov10_0221FB28 *param0) { - const MtxFx43 * v0; + const MtxFx43 *v0; int v1; if (param0->unk_00->unk_28 != 1) { @@ -1791,7 +1795,7 @@ static int ov10_022218BC (UnkStruct_ov10_0221FB28 * param0) return 1; } -static void ov10_022218F4 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022218F4(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_00->unk_28 != 1) { return; @@ -1802,7 +1806,7 @@ static void ov10_022218F4 (UnkStruct_ov10_0221FB28 * param0) sub_020242C4(param0->unk_B4C); } -static u32 ov10_02221928 (u32 param0, BOOL param1) +static u32 ov10_02221928(u32 param0, BOOL param1) { u32 v0; NNSGfdTexKey v1; @@ -1816,7 +1820,7 @@ static u32 ov10_02221928 (u32 param0, BOOL param1) return v0; } -static u32 ov10_0222194C (u32 param0, BOOL param1) +static u32 ov10_0222194C(u32 param0, BOOL param1) { NNSGfdPlttKey v0; u32 v1; @@ -1833,7 +1837,7 @@ static u32 ov10_0222194C (u32 param0, BOOL param1) return v1; } -static void ov10_02221970 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1909,7 +1913,7 @@ static void ov10_02221970 (UnkStruct_ov10_0221FB28 * param0) } } -static void ov10_02221A10 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02221A10(UnkStruct_ov10_0221FB28 *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); sub_02019044(param0->unk_0C, 3); @@ -1918,9 +1922,9 @@ static void ov10_02221A10 (UnkStruct_ov10_0221FB28 * param0) Heap_FreeToHeap(param0->unk_0C); } -static void ov10_02221A3C (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02221A3C(UnkStruct_ov10_0221FB28 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_24); @@ -1928,9 +1932,9 @@ static void ov10_02221A3C (UnkStruct_ov10_0221FB28 * param0) sub_0200710C(v0, 17, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24); { - NNSG2dPaletteData * v1; - void * v2; - u16 * v3; + NNSG2dPaletteData *v1; + void *v2; + u16 *v3; v2 = NARC_AllocAndReadWholeMember(v0, 16, param0->unk_00->unk_24); NNS_G2dGetUnpackedPaletteData(v2, &v1); @@ -1945,9 +1949,9 @@ static void ov10_02221A3C (UnkStruct_ov10_0221FB28 * param0) NARC_dtor(v0); } -static void ov10_02221AE4 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02221AE4(UnkStruct_ov10_0221FB28 *param0) { - u16 * v0; + u16 *v0; u32 v1; for (v1 = 0; v1 < 6; v1++) { @@ -1978,9 +1982,9 @@ static void ov10_02221AE4 (UnkStruct_ov10_0221FB28 * param0) sub_0201C3C0(param0->unk_0C, 2); } -static void ov10_02221BC8 (UnkStruct_ov10_0221FB28 * param0, u16 * param1, u8 param2) +static void ov10_02221BC8(UnkStruct_ov10_0221FB28 *param0, u16 *param1, u8 param2) { - u16 * v0; + u16 *v0; u16 v1, v2; v0 = sub_02019FE4(param0->unk_0C, param2); @@ -1997,7 +2001,7 @@ static void ov10_02221BC8 (UnkStruct_ov10_0221FB28 * param0, u16 * param1, u8 pa } } -static void ov10_02221C14 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02221C14(UnkStruct_ov10_0221FB28 *param0) { ov10_02221BC8(param0, ¶m0->unk_538[0][0], 1); ov10_02221BC8(param0, ¶m0->unk_538[1][0], 2); @@ -2006,7 +2010,7 @@ static void ov10_02221C14 (UnkStruct_ov10_0221FB28 * param0) sub_0201C3C0(param0->unk_0C, 2); } -static void ov10_02221C48 (UnkStruct_ov10_0221FB28 * param0, u8 param1) +static void ov10_02221C48(UnkStruct_ov10_0221FB28 *param0, u8 param1) { if (param0->unk_00->unk_29 == 0) { sub_020198E8(param0->unk_0C, 1, 16 + 16 - param1, 0, param1, 24, (const void *)¶m0->unk_538[0][0], 0, 0, 16, 24); @@ -2020,9 +2024,9 @@ static void ov10_02221C48 (UnkStruct_ov10_0221FB28 * param0, u8 param1) sub_0201C3C0(param0->unk_0C, 2); } -static void ov10_02221D14 (UnkStruct_ov10_0221FB28 * param0, Party * param1, u8 param2) +static void ov10_02221D14(UnkStruct_ov10_0221FB28 *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; u16 v1; u16 v2; @@ -2062,7 +2066,7 @@ static void ov10_02221D14 (UnkStruct_ov10_0221FB28 * param0, Party * param1, u8 } } -static void ov10_02221E58 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02221E58(UnkStruct_ov10_0221FB28 *param0) { memset(param0->unk_214, 0, sizeof(UnkStruct_ov10_0221FB28_sub1) * 6); @@ -2070,7 +2074,7 @@ static void ov10_02221E58 (UnkStruct_ov10_0221FB28 * param0) ov10_02221D14(param0, param0->unk_00->unk_04[2], 3); } -static u8 ov10_02221E84 (UnkStruct_ov10_0221FB28 * param0, u32 param1) +static u8 ov10_02221E84(UnkStruct_ov10_0221FB28 *param0, u32 param1) { if (param0->unk_214[param1].unk_06 == 0) { return 0; @@ -2094,7 +2098,7 @@ static u8 ov10_02221E84 (UnkStruct_ov10_0221FB28 * param0, u32 param1) return 0; } -static void ov10_02221EEC (UnkStruct_ov10_0221FB28 * param0, u32 param1) +static void ov10_02221EEC(UnkStruct_ov10_0221FB28 *param0, u32 param1) { u32 v0; @@ -2133,7 +2137,7 @@ static void ov10_02221EEC (UnkStruct_ov10_0221FB28 * param0, u32 param1) } } -static void ov10_02222050 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02222050(UnkStruct_ov10_0221FB28 *param0) { UnkStruct_ov104_02241308 v0 = { 9, 4, 4, 4, 0, 0 @@ -2155,10 +2159,10 @@ static void ov10_02222050 (UnkStruct_ov10_0221FB28 * param0) param0->unk_210 = 30; } -static void ov10_022220B4 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022220B4(UnkStruct_ov10_0221FB28 *param0) { u32 v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, param0->unk_00->unk_24); @@ -2173,9 +2177,9 @@ static void ov10_022220B4 (UnkStruct_ov10_0221FB28 * param0) NARC_dtor(v1); } -static void ov10_0222216C (UnkStruct_ov10_0221FB28 * param0) +static void ov10_0222216C(UnkStruct_ov10_0221FB28 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_24); @@ -2186,9 +2190,9 @@ static void ov10_0222216C (UnkStruct_ov10_0221FB28 * param0) NARC_dtor(v0); } -static void ov10_02222208 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02222208(UnkStruct_ov10_0221FB28 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PST_GRA, param0->unk_00->unk_24); @@ -2199,9 +2203,9 @@ static void ov10_02222208 (UnkStruct_ov10_0221FB28 * param0) NARC_dtor(v0); } -static void ov10_022222A4 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022222A4(UnkStruct_ov10_0221FB28 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_24); @@ -2212,7 +2216,7 @@ static void ov10_022222A4 (UnkStruct_ov10_0221FB28 * param0) NARC_dtor(v0); } -static void ov10_02222340 (UnkStruct_ov10_0221FB28 * param0, s16 param1) +static void ov10_02222340(UnkStruct_ov10_0221FB28 *param0, s16 param1) { s32 v0, v1, v2; @@ -2232,7 +2236,7 @@ static void ov10_02222340 (UnkStruct_ov10_0221FB28 * param0, s16 param1) } } -static void ov10_022223C0 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022223C0(UnkStruct_ov10_0221FB28 *param0) { u32 v0; @@ -2241,7 +2245,7 @@ static void ov10_022223C0 (UnkStruct_ov10_0221FB28 * param0) } } -static void ov10_022223E8 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022223E8(UnkStruct_ov10_0221FB28 *param0) { u32 v0; @@ -2250,11 +2254,11 @@ static void ov10_022223E8 (UnkStruct_ov10_0221FB28 * param0) } } -static void ov10_02222400 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * param1, UnkStruct_0200C440 * param2, StringTemplate * param3, Strbuf *param4, u32 param5) +static void ov10_02222400(UnkStruct_ov10_0221FB28 *param0, MessageLoader *param1, UnkStruct_0200C440 *param2, StringTemplate *param3, Strbuf *param4, u32 param5) { - Pokemon * v0; - Window * v1; - Strbuf* v2; + Pokemon *v0; + Window *v1; + Strbuf *v2; v1 = ¶m0->unk_10[param5 * 4 + 0]; @@ -2282,20 +2286,20 @@ static void ov10_02222400 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * par } } -static void ov10_022224F0 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * param1, UnkStruct_0200C440 * param2, StringTemplate * param3, Strbuf *param4, u32 param5) +static void ov10_022224F0(UnkStruct_ov10_0221FB28 *param0, MessageLoader *param1, UnkStruct_0200C440 *param2, StringTemplate *param3, Strbuf *param4, u32 param5) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_10[param5 * 4 + 1]; sub_0200C648(param2, 1, param0->unk_214[param5].unk_0C, 3, 0, v0, 0, 5 - 3); } -static void ov10_02222528 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * param1, UnkStruct_0200C440 * param2, StringTemplate * param3, Strbuf *param4, u32 param5) +static void ov10_02222528(UnkStruct_ov10_0221FB28 *param0, MessageLoader *param1, UnkStruct_0200C440 *param2, StringTemplate *param3, Strbuf *param4, u32 param5) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; int v3, v4; @@ -2308,9 +2312,9 @@ static void ov10_02222528 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * par sub_0200C5BC(param2, param0->unk_214[param5].unk_08, 3, 0, v0, v3 + (8 * 3) + 8, v4); } -static void ov10_02222594 (UnkStruct_ov10_0221FB28 * param0, u32 param1) +static void ov10_02222594(UnkStruct_ov10_0221FB28 *param0, u32 param1) { - Window * v0; + Window *v0; u32 v1; v0 = ¶m0->unk_10[param1 * 4 + 3]; @@ -2341,11 +2345,11 @@ static void ov10_02222594 (UnkStruct_ov10_0221FB28 * param0, u32 param1) BGL_WindowColor(v0, 10, 0, 5, v1, 1); } -static void ov10_02222684 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * param1, UnkStruct_0200C440 * param2, StringTemplate * param3, Strbuf *param4, u32 param5) +static void ov10_02222684(UnkStruct_ov10_0221FB28 *param0, MessageLoader *param1, UnkStruct_0200C440 *param2, StringTemplate *param3, Strbuf *param4, u32 param5) { - Pokemon * v0; - Window * v1; - Strbuf* v2; + Pokemon *v0; + Window *v1; + Strbuf *v2; u32 v3; v1 = ¶m0->unk_10[param5 * 4]; @@ -2366,12 +2370,12 @@ static void ov10_02222684 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * par sub_0201A9A4(&v1[3]); } -static void ov10_02222720 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02222720(UnkStruct_ov10_0221FB28 *param0) { - MessageLoader * v0; - UnkStruct_0200C440 * v1; - StringTemplate * v2; - Strbuf* v3; + MessageLoader *v0; + UnkStruct_0200C440 *v1; + StringTemplate *v2; + Strbuf *v3; u32 v4; v0 = MessageLoader_Init(0, 26, 453, param0->unk_00->unk_24); @@ -2393,11 +2397,11 @@ static void ov10_02222720 (UnkStruct_ov10_0221FB28 * param0) StringTemplate_Free(v2); } -static void ov10_022227A4 (UnkStruct_ov10_0221F800 * param0) +static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) { - void * v0; - u16 * v1; - u16 * v2; + void *v0; + u16 *v1; + u16 *v2; u8 v3; u8 v4; u8 v5; @@ -2477,13 +2481,13 @@ static void ov10_022227A4 (UnkStruct_ov10_0221F800 * param0) sub_0202B758(param0->unk_00->unk_120, v0, 4); } -static void ov10_022229D4 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_022229D4(UnkStruct_ov10_0221FB28 *param0) { BGL_WindowColor(¶m0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8); sub_0200E060(¶m0->unk_B7C, 0, 1, 15); } -static BOOL ov10_02222A08 (UnkStruct_ov10_0221FB28 * param0) +static BOOL ov10_02222A08(UnkStruct_ov10_0221FB28 *param0) { if ((param0->unk_00->unk_00->unk_198 == NULL) || (sub_0202F250() == 0)) { return 0; @@ -2492,14 +2496,14 @@ static BOOL ov10_02222A08 (UnkStruct_ov10_0221FB28 * param0) return 1; } -static void ov10_02222A28 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02222A28(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_BB8 == NULL) { param0->unk_BB8 = sub_0200E7FC(¶m0->unk_B7C, 1); } } -static void ov10_02222A48 (UnkStruct_ov10_0221FB28 * param0) +static void ov10_02222A48(UnkStruct_ov10_0221FB28 *param0) { if (param0->unk_BB8 != NULL) { DeleteWaitDial(param0->unk_BB8); diff --git a/src/overlay011/ov11_0221F800.c b/src/overlay011/ov11_0221F800.c index c64f1520af..cc08affec7 100644 --- a/src/overlay011/ov11_0221F800.c +++ b/src/overlay011/ov11_0221F800.c @@ -1,373 +1,373 @@ +#include "overlay011/ov11_0221F800.h" + #include #include #include "struct_decls/struct_02002F38_decl.h" #include "unk_02002F38.h" -#include "overlay011/ov11_0221F800.h" __attribute__((aligned(4))) const u16 Unk_ov11_0221F94C[] = { - 0x75CD, - 0x7fff, - 0x6AD7, - 0x6675, - 0x6233, - 0x518f, - 0x456D, - 0x394C, - 0x2D2A, - 0x7319, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x6AD7, + 0x6675, + 0x6233, + 0x518f, + 0x456D, + 0x394C, + 0x2D2A, + 0x7319, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FB8C[] = { - 0x75CD, - 0x7fff, - 0x3adf, - 0x2a9f, - 0x1a5f, - 0x19C, - 0x159, - 0x514, - 0x00cf, - 0x473f, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x3adf, + 0x2a9f, + 0x1a5f, + 0x19C, + 0x159, + 0x514, + 0x00cf, + 0x473f, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FB6C[] = { - 0x75CD, - 0x7fff, - 0x7eaf, - 0x7E4A, - 0x7DE6, - 0x7140, - 0x5D01, - 0x48E2, - 0x34C3, - 0x7ef3, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x7eaf, + 0x7E4A, + 0x7DE6, + 0x7140, + 0x5D01, + 0x48E2, + 0x34C3, + 0x7ef3, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FB4C[] = { - 0x75CD, - 0x7fff, - 0x7E1A, - 0x7D7A, - 0x7CDA, - 0x7016, - 0x6032, - 0x4c4f, - 0x3C8B, - 0x7E7C, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x7E1A, + 0x7D7A, + 0x7CDA, + 0x7016, + 0x6032, + 0x4c4f, + 0x3C8B, + 0x7E7C, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FB2C[] = { - 0x75CD, - 0x7fff, - 0x32DE, - 0x229C, - 0x123A, - 0x1D8, - 0x195, - 0x131, - 0x4ED, - 0x3f1f, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x32DE, + 0x229C, + 0x123A, + 0x1D8, + 0x195, + 0x131, + 0x4ED, + 0x3f1f, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FB0C[] = { - 0x75CD, - 0x7fff, - 0x4276, - 0x3635, - 0x2E14, - 0x1990, - 0x154f, - 0x150C, - 0x10CA, - 0x4ABA, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x4276, + 0x3635, + 0x2E14, + 0x1990, + 0x154f, + 0x150C, + 0x10CA, + 0x4ABA, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FAEC[] = { - 0x75CD, - 0x7fff, - 0x373A, - 0x26f9, - 0x12B8, - 0x256, - 0x01f2, - 0x01af, - 0x54B, - 0x3f7c, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x373A, + 0x26f9, + 0x12B8, + 0x256, + 0x01f2, + 0x01af, + 0x54B, + 0x3f7c, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FACC[] = { - 0x75CD, - 0x7fff, - 0x50D9, - 0x48D5, - 0x3CD2, - 0x30EE, - 0x30CD, - 0x24AB, - 0x20A9, - 0x597A, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x50D9, + 0x48D5, + 0x3CD2, + 0x30EE, + 0x30CD, + 0x24AB, + 0x20A9, + 0x597A, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FAAC[] = { - 0x75CD, - 0x7fff, - 0x6B9C, - 0x6339, - 0x5AD6, - 0x4E52, - 0x4210, - 0x31AD, - 0x256B, - 0x6fbd, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x6B9C, + 0x6339, + 0x5AD6, + 0x4E52, + 0x4210, + 0x31AD, + 0x256B, + 0x6fbd, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FA8C[] = { - 0x75CD, - 0x7fff, - 0x5A7A, - 0x4E17, - 0x45B5, - 0x3D72, - 0x3130, - 0x28ED, - 0x20CB, - 0x66fb, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x5A7A, + 0x4E17, + 0x45B5, + 0x3D72, + 0x3130, + 0x28ED, + 0x20CB, + 0x66fb, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FA6C[] = { - 0x75CD, - 0x7fff, - 0x3a3f, - 0x299E, - 0x18fd, - 0x87C, - 0xC78, - 0x1493, - 0x1CAE, - 0x469f, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x3a3f, + 0x299E, + 0x18fd, + 0x87C, + 0xC78, + 0x1493, + 0x1CAE, + 0x469f, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FA4C[] = { - 0x75CD, - 0x7fff, - 0x7792, - 0x730C, - 0x6A86, - 0x6200, - 0x51A0, - 0x3D20, - 0x28C1, - 0x77B6, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x7792, + 0x730C, + 0x6A86, + 0x6200, + 0x51A0, + 0x3D20, + 0x28C1, + 0x77B6, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FA2C[] = { - 0x75CD, - 0x7fff, - 0x23af, - 0x1B6C, - 0x0f09, - 0x2C6, - 0x666, - 0x9E6, - 0xD86, - 0x3BD5, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x23af, + 0x1B6C, + 0x0f09, + 0x2C6, + 0x666, + 0x9E6, + 0xD86, + 0x3BD5, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221FA0C[] = { - 0x75CD, - 0x7fff, - 0x37bf, - 0x2b9f, - 0x1B3C, - 0x02fa, - 0x297, - 0x214, - 0x5B0, - 0x4fdf, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x37bf, + 0x2b9f, + 0x1B3C, + 0x02fa, + 0x297, + 0x214, + 0x5B0, + 0x4fdf, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221F9EC[] = { - 0x75CD, - 0x7fff, - 0x7dff, - 0x719f, - 0x613E, - 0x50fd, - 0x48B9, - 0x4474, - 0x3c4f, - 0x7edf, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x7dff, + 0x719f, + 0x613E, + 0x50fd, + 0x48B9, + 0x4474, + 0x3c4f, + 0x7edf, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221F9CC[] = { - 0x75CD, - 0x7fff, - 0x7f94, - 0x7B51, - 0x770D, - 0x72AA, - 0x6229, - 0x4DA9, - 0x4588, - 0x7ff7, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x7f94, + 0x7B51, + 0x770D, + 0x72AA, + 0x6229, + 0x4DA9, + 0x4588, + 0x7ff7, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221F9AC[] = { - 0x75CD, - 0x7fff, - 0x6df2, - 0x6daf, - 0x696D, - 0x652A, - 0x5CE8, - 0x50A7, - 0x4486, - 0x7652, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x6df2, + 0x6daf, + 0x696D, + 0x652A, + 0x5CE8, + 0x50A7, + 0x4486, + 0x7652, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221F98C[] = { - 0x75CD, - 0x7fff, - 0x3DD5, - 0x35B2, - 0x316f, - 0x294C, - 0x210B, - 0x1CCB, - 0x18AA, - 0x4617, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7fff, + 0x3DD5, + 0x35B2, + 0x316f, + 0x294C, + 0x210B, + 0x1CCB, + 0x18AA, + 0x4617, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; __attribute__((aligned(4))) const u16 Unk_ov11_0221F96C[] = { - 0x75CD, - 0x7739, - 0x49AD, - 0x3D8C, - 0x356A, - 0x2929, - 0x2108, - 0x1CE7, - 0x18C6, - 0x51ef, - 0x18C6, - 0x0, - 0x318C, - 0x375C, - 0x57BE, - 0x0 + 0x75CD, + 0x7739, + 0x49AD, + 0x3D8C, + 0x356A, + 0x2929, + 0x2108, + 0x1CE7, + 0x18C6, + 0x51ef, + 0x18C6, + 0x0, + 0x318C, + 0x375C, + 0x57BE, + 0x0 }; - __attribute__((aligned(4))) static const u16 Unk_ov11_0221FBAC[] = { 0x33, 0x33, @@ -389,7 +389,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov11_0221FBAC[] = { 0x33 }; -__attribute__((aligned(4))) static const u16 * const Unk_ov11_0221FBD0[] = { +__attribute__((aligned(4))) static const u16 *const Unk_ov11_0221FBD0[] = { Unk_ov11_0221F94C, Unk_ov11_0221FB8C, Unk_ov11_0221FB6C, @@ -412,14 +412,14 @@ __attribute__((aligned(4))) static const u16 * const Unk_ov11_0221FBD0[] = { void include_unk_ov11_0221FBAC(); -void include_unk_ov11_0221FBAC () +void include_unk_ov11_0221FBAC() { Unk_ov11_0221FBAC[0]; } -const u16 * ov11_0221F800 (int param0) +const u16 *ov11_0221F800(int param0) { - const u16 * v0; + const u16 *v0; if (param0 != -1) { v0 = Unk_ov11_0221FBD0[param0]; @@ -430,9 +430,9 @@ const u16 * ov11_0221F800 (int param0) return v0; } -void ov11_0221F81C (PaletteData * param0, int param1, int param2, int param3, int param4) +void ov11_0221F81C(PaletteData *param0, int param1, int param2, int param3, int param4) { - const u16 * v0; + const u16 *v0; v0 = ov11_0221F800(param1); sub_02002FBC(param0, v0, param3, param4 * 16, 0x20); diff --git a/src/overlay011/ov11_0221F840.c b/src/overlay011/ov11_0221F840.c index 86bdefc5b0..326d14e3e4 100644 --- a/src/overlay011/ov11_0221F840.c +++ b/src/overlay011/ov11_0221F840.c @@ -1,22 +1,23 @@ +#include "overlay011/ov11_0221F840.h" + #include #include #include "struct_decls/struct_02014014_decl.h" -#include "unk_02014000.h" -#include "heap.h" #include "camera.h" +#include "heap.h" +#include "unk_02014000.h" #include "unk_0202419C.h" -#include "overlay011/ov11_0221F840.h" static u32 ov11_0221F914(u32 param0, BOOL param1); static u32 ov11_0221F930(u32 param0, BOOL param1); -UnkStruct_02014014 * ov11_0221F840 (int param0) +UnkStruct_02014014 *ov11_0221F840(int param0) { - UnkStruct_02014014 * v0; - void * v1; - Camera * camera; + UnkStruct_02014014 *v0; + void *v1; + Camera *camera; v1 = Heap_AllocFromHeap(param0, 0x4800); v0 = sub_02014014(ov11_0221F914, ov11_0221F930, v1, 0x4800, 1, param0); @@ -29,11 +30,11 @@ UnkStruct_02014014 * ov11_0221F840 (int param0) return v0; } -UnkStruct_02014014 * ov11_0221F888 (int param0) +UnkStruct_02014014 *ov11_0221F888(int param0) { - UnkStruct_02014014 * v0; - void * v1; - Camera * camera; + UnkStruct_02014014 *v0; + void *v1; + Camera *camera; v1 = Heap_AllocFromHeap(param0, 0x4200); @@ -51,9 +52,9 @@ UnkStruct_02014014 * ov11_0221F888 (int param0) return v0; } -void ov11_0221F8D8 (UnkStruct_02014014 * param0) +void ov11_0221F8D8(UnkStruct_02014014 *param0) { - void * v0; + void *v0; v0 = sub_02014730(param0); @@ -61,10 +62,10 @@ void ov11_0221F8D8 (UnkStruct_02014014 * param0) Heap_FreeToHeap(v0); } -void ov11_0221F8F0 (void) +void ov11_0221F8F0(void) { int v0; - const MtxFx43 * v1; + const MtxFx43 *v1; sub_020241B4(); @@ -82,7 +83,7 @@ void ov11_0221F8F0 (void) sub_020146C0(); } -static u32 ov11_0221F914 (u32 param0, BOOL param1) +static u32 ov11_0221F914(u32 param0, BOOL param1) { NNSGfdTexKey v0; u32 v1; @@ -94,7 +95,7 @@ static u32 ov11_0221F914 (u32 param0, BOOL param1) return v1; } -static u32 ov11_0221F930 (u32 param0, BOOL param1) +static u32 ov11_0221F930(u32 param0, BOOL param1) { NNSGfdPlttKey v0; u32 v1; diff --git a/src/overlay012/is_form_symmetrical.c b/src/overlay012/is_form_symmetrical.c index bdbd4242fa..d4fc99af8e 100644 --- a/src/overlay012/is_form_symmetrical.c +++ b/src/overlay012/is_form_symmetrical.c @@ -1,11 +1,11 @@ +#include "overlay012/is_form_symmetrical.h" + #include #include -#include "overlay012/is_form_symmetrical.h" - #include "constants/species.h" -BOOL IsFormSymmetrical (u32 species, u32 formId) +BOOL IsFormSymmetrical(u32 species, u32 formId) { switch (species) { case SPECIES_STARYU: diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c index 3a66d3ca7e..384aabeedd 100644 --- a/src/overlay012/ov12_0221FC20.c +++ b/src/overlay012/ov12_0221FC20.c @@ -1,62 +1,61 @@ +#include "overlay012/ov12_0221FC20.h" + #include #include -#include "inlines.h" -#include "core_sys.h" - +#include "struct_decls/battle_system.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_defs/chatot_cry.h" -#include "struct_decls/battle_system.h" -#include "overlay012/struct_ov12_0222118C_decl.h" -#include "overlay012/struct_ov12_022211D8_decl.h" -#include "overlay012/struct_ov12_022222D4_decl.h" -#include "overlay012/struct_ov12_02226504_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "sys_task_manager.h" -#include "overlay012/struct_ov12_02223764.h" -#include "overlay012/struct_ov12_022380DC.h" -#include "overlay012/funcptr_ov12_02239E68.h" -#include "overlay012/funcptr_ov12_02239EEC.h" + +#include "battle/ov16_0223DF00.h" #include "battle/struct_ov16_0223E0C8.h" #include "battle/struct_ov16_02264408.h" #include "battle/struct_ov16_02264408_sub1.h" #include "battle/struct_ov16_02265BBC.h" -#include "struct_defs/sprite_template.h" +#include "overlay012/funcptr_ov12_02239E68.h" +#include "overlay012/funcptr_ov12_02239EEC.h" +#include "overlay012/is_form_symmetrical.h" +#include "overlay012/ov12_022237EC.h" +#include "overlay012/ov12_02225864.h" +#include "overlay012/ov12_02226998.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/ov12_022380BC.h" +#include "overlay012/struct_ov12_0222118C_decl.h" +#include "overlay012/struct_ov12_022211D8_decl.h" +#include "overlay012/struct_ov12_022222D4_decl.h" +#include "overlay012/struct_ov12_02223764.h" +#include "overlay012/struct_ov12_02226504_decl.h" +#include "overlay012/struct_ov12_022380DC.h" +#include "overlay017/ov17_022413D8.h" #include "overlay104/struct_ov104_02241308.h" +#include "core_sys.h" +#include "heap.h" +#include "inlines.h" +#include "narc.h" +#include "pokemon.h" #include "spl.h" - +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_02014000.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201F834.h" #include "unk_020218BC.h" -#include "pokemon.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_022237EC.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02226998.h" -#include "overlay012/ov12_02235254.h" -#include "overlay012/ov12_022380BC.h" -#include "overlay012/is_form_symmetrical.h" -#include "battle/ov16_0223DF00.h" -#include "overlay017/ov17_022413D8.h" typedef struct UnkStruct_ov12_02223178_t { u8 unk_00; @@ -71,12 +70,12 @@ typedef struct UnkStruct_ov12_02223178_t { u16 unk_14; u16 unk_16; int unk_18; - UnkStruct_02014014 * unk_1C[16]; - UnkSPLStruct6 * unk_5C[20]; - SpriteRenderer * unk_AC; - UnkStruct_ov16_0223E0C8 * unk_B0[4]; + UnkStruct_02014014 *unk_1C[16]; + UnkSPLStruct6 *unk_5C[20]; + SpriteRenderer *unk_AC; + UnkStruct_ov16_0223E0C8 *unk_B0[4]; u8 unk_C0[4]; - Sprite * unk_C4[4]; + Sprite *unk_C4[4]; u32 unk_D4; u16 unk_D8[4]; u8 unk_E0[4]; @@ -84,23 +83,23 @@ typedef struct UnkStruct_ov12_02223178_t { u8 unk_E8[4]; u32 unk_EC[4]; u32 unk_FC[4]; - ChatotCry * unk_10C; - u8 * unk_110; - u16 * unk_114; + ChatotCry *unk_10C; + u8 *unk_110; + u16 *unk_114; int unk_118; } UnkStruct_ov12_02223178; typedef struct { - u32 * unk_00; + u32 *unk_00; u8 unk_04; u8 unk_05; BOOL unk_08; } UnkStruct_ov12_0221FCDC_sub1; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteGfxHandler * unk_04; - CellActorData * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteGfxHandler *unk_04; + CellActorData *unk_08; BOOL unk_0C; } UnkStruct_ov12_02221810; @@ -110,9 +109,9 @@ typedef struct UnkStruct_ov12_0221FCDC_t { BOOL unk_08; BOOL unk_0C; BOOL unk_10; - void * unk_14; - u32 * unk_18; - u32 * unk_1C[3]; + void *unk_14; + u32 *unk_18; + u32 *unk_1C[3]; UnkStruct_ov12_0221FCDC_sub1 unk_28[3]; UnkStruct_ov12_02221810 unk_48[2]; u8 unk_68[16]; @@ -123,26 +122,26 @@ typedef struct UnkStruct_ov12_0221FCDC_t { u16 unk_8C; s32 unk_90[10]; UnkFuncPtr_ov12_02239EEC unk_B8; - UnkStruct_ov12_02223178 * unk_BC; - BGL * unk_C0; - PaletteData * unk_C4; - SpriteGfxHandler * unk_C8[4]; - CellActorData * unk_D8[10]; + UnkStruct_ov12_02223178 *unk_BC; + BGL *unk_C0; + PaletteData *unk_C4; + SpriteGfxHandler *unk_C8[4]; + CellActorData *unk_D8[10]; SpriteTemplate unk_100; - SpriteGfxHandler * unk_134; - CellActorData * unk_138[5]; + SpriteGfxHandler *unk_134; + CellActorData *unk_138[5]; BOOL unk_14C[5]; - UnkStruct_ov12_0222118C * unk_160[5]; - UnkStruct_ov12_022211D8 * unk_174; + UnkStruct_ov12_0222118C *unk_160[5]; + UnkStruct_ov12_022211D8 *unk_174; u8 unk_178; u8 unk_179; u8 unk_17A; u8 unk_17B; - UnkStruct_ov12_022222D4 * unk_17C; + UnkStruct_ov12_022222D4 *unk_17C; UnkStruct_ov16_02264408_sub1 unk_180; int unk_198; u8 unk_19C[4]; - NARC * unk_1A0[6]; + NARC *unk_1A0[6]; } UnkStruct_ov12_0221FCDC; typedef struct UnkStruct_ov12_02220314_t { @@ -158,7 +157,7 @@ typedef struct UnkStruct_ov12_02220314_t { u8 unk_18; u16 unk_1A; u32 unk_1C[7]; - UnkStruct_ov12_0221FCDC * unk_38; + UnkStruct_ov12_0221FCDC *unk_38; } UnkStruct_ov12_02220314; typedef struct UnkStruct_ov12_02221BBC_t { @@ -180,7 +179,7 @@ typedef struct UnkStruct_ov12_02221BBC_t { u16 unk_44_0 : 1; u16 unk_44_1 : 1; u16 unk_44_2 : 14; - UnkStruct_ov12_0221FCDC * unk_48; + UnkStruct_ov12_0221FCDC *unk_48; } UnkStruct_ov12_02221BBC; typedef struct { @@ -193,11 +192,11 @@ typedef struct { typedef struct { UnkStruct_ov12_022224F8_sub1 unk_00[16]; - UnkStruct_ov12_02226504 * unk_C0; + UnkStruct_ov12_02226504 *unk_C0; } UnkStruct_ov12_022224F8; typedef struct UnkStruct_ov12_022222D4_t { - BGL * unk_00; + BGL *unk_00; s16 unk_04; s16 unk_06; s16 unk_08; @@ -206,146 +205,146 @@ typedef struct UnkStruct_ov12_022222D4_t { int unk_10; BOOL unk_14; BOOL unk_18; - UnkStruct_ov12_022224F8 * unk_1C; + UnkStruct_ov12_022224F8 *unk_1C; } UnkStruct_ov12_022222D4; typedef struct { u8 unk_00; u8 unk_01; - Sprite * unk_04; - SysTask * unk_08; + Sprite *unk_04; + SysTask *unk_08; } UnkStruct_ov12_0222118C_sub1; typedef struct UnkStruct_ov12_0222118C_t { - CellActorData * unk_00; + CellActorData *unk_00; UnkStruct_ov12_0222118C_sub1 unk_04; } UnkStruct_ov12_0222118C; typedef struct UnkStruct_ov12_022211D8_t { - BGL * unk_00; + BGL *unk_00; UnkStruct_ov12_0222118C_sub1 unk_04; } UnkStruct_ov12_022211D8; -static void ov12_022224F8(SysTask * param0, void * param1); -static void ov12_0221FC20(UnkStruct_ov12_0221FCDC * param0); -static void ov12_0221FC44(UnkStruct_ov12_0221FCDC * param0); -static SysTask * ov12_0221FC68(u8 param0, UnkStruct_ov12_0221FCDC * param1, SysTaskFunc param2, void * param3, u32 param4); -static void ov12_0221FCA4(u8 param0, UnkStruct_ov12_0221FCDC * param1, SysTask * param2); -static UnkStruct_ov12_02220314 * ov12_02220314(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220344(UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_02220314 * param1); -static void ov12_0222035C(SysTask * param0, void * param1); -static BOOL ov12_0222039C(UnkStruct_ov12_02220314 * param0); -static BOOL ov12_022203A0(UnkStruct_ov12_02220314 * param0); -static BOOL ov12_022203FC(UnkStruct_ov12_02220314 * param0); -static BOOL ov12_02220404(UnkStruct_ov12_02220314 * param0); -static BOOL ov12_0222040C(UnkStruct_ov12_02220314 * param0); -static BOOL ov12_0222044C(UnkStruct_ov12_02220314 * param0); -static void ov12_022204C4(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022204E4(UnkStruct_ov12_0221FCDC * param0); -static void ov12_0222070C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_0222074C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220798(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222950(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221284(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221288(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222CAC(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222CDC(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220E14(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220E44(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220504(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220524(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022206A4(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022206E8(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220F30(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221064(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221098(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222724(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222774(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022227CC(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222820(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222840(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222860(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222984(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022229BC(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022229D8(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222B94(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222BF8(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222CE4(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222C50(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222C54(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220E70(UnkStruct_ov12_0221FCDC * param0); -static void ov12_0222128C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_0222144C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022214C4(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221580(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022217B4(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022217E0(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221A00(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221A14(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221A30(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221424(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220EA8(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022228DC(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222A78(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222AF0(UnkStruct_ov12_0221FCDC * param0); -static void ov12_0222293C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222940(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222944(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221A4C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221A50(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222948(UnkStruct_ov12_0221FCDC * param0); -static void ov12_0222294C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222968(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220F5C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220FA0(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220FFC(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221024(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022230D4(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02223134(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220ED0(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022209A8(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220A3C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220B8C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220C44(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220CFC(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220D3C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220D90(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02220DE8(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022230CC(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02223160(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222CE8(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222D84(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222DCC(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222E2C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222E74(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222EBC(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02222FC8(UnkStruct_ov12_0221FCDC * param0); -static void ov12_0222307C(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022230A8(UnkStruct_ov12_0221FCDC * param0); -static void ov12_02221834(UnkStruct_ov12_0221FCDC * param0); -static void ov12_022219E8(UnkStruct_ov12_0221FCDC * param0); -static void ov12_0222048C(UnkStruct_ov12_0221FCDC * param0); -static int ov12_022210A8(UnkStruct_ov12_0221FCDC * param0, int param1); -static BOOL ov12_02221A54(UnkStruct_ov12_02221BBC * param0, UnkStruct_ov12_0221FCDC * param1, int param2); -static void ov12_02221AA8(UnkStruct_ov12_02221BBC * param0, UnkStruct_ov12_0221FCDC * param1, int param2, int param3); +static void ov12_022224F8(SysTask *param0, void *param1); +static void ov12_0221FC20(UnkStruct_ov12_0221FCDC *param0); +static void ov12_0221FC44(UnkStruct_ov12_0221FCDC *param0); +static SysTask *ov12_0221FC68(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTaskFunc param2, void *param3, u32 param4); +static void ov12_0221FCA4(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTask *param2); +static UnkStruct_ov12_02220314 *ov12_02220314(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220344(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02220314 *param1); +static void ov12_0222035C(SysTask *param0, void *param1); +static BOOL ov12_0222039C(UnkStruct_ov12_02220314 *param0); +static BOOL ov12_022203A0(UnkStruct_ov12_02220314 *param0); +static BOOL ov12_022203FC(UnkStruct_ov12_02220314 *param0); +static BOOL ov12_02220404(UnkStruct_ov12_02220314 *param0); +static BOOL ov12_0222040C(UnkStruct_ov12_02220314 *param0); +static BOOL ov12_0222044C(UnkStruct_ov12_02220314 *param0); +static void ov12_022204C4(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022204E4(UnkStruct_ov12_0221FCDC *param0); +static void ov12_0222070C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_0222074C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220798(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222950(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221284(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221288(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222CAC(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222CDC(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220E14(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220E44(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220504(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220524(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022206A4(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022206E8(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220F30(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221064(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221098(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222724(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222774(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022227CC(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222820(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222840(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222860(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222984(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022229BC(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022229D8(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222B94(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222BF8(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222CE4(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222C50(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222C54(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220E70(UnkStruct_ov12_0221FCDC *param0); +static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_0222144C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022214C4(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022217B4(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022217E0(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221A00(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221A14(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221A30(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221424(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220EA8(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022228DC(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222A78(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222AF0(UnkStruct_ov12_0221FCDC *param0); +static void ov12_0222293C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222940(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222944(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221A4C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221A50(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222948(UnkStruct_ov12_0221FCDC *param0); +static void ov12_0222294C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222968(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220F5C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220FA0(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220FFC(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221024(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022230D4(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02223134(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220ED0(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022209A8(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220A3C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220B8C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220C44(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220CFC(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220D3C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220D90(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02220DE8(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022230CC(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02223160(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222CE8(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222D84(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222DCC(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222E2C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222E74(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222EBC(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02222FC8(UnkStruct_ov12_0221FCDC *param0); +static void ov12_0222307C(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022230A8(UnkStruct_ov12_0221FCDC *param0); +static void ov12_02221834(UnkStruct_ov12_0221FCDC *param0); +static void ov12_022219E8(UnkStruct_ov12_0221FCDC *param0); +static void ov12_0222048C(UnkStruct_ov12_0221FCDC *param0); +static int ov12_022210A8(UnkStruct_ov12_0221FCDC *param0, int param1); +static BOOL ov12_02221A54(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FCDC *param1, int param2); +static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FCDC *param1, int param2, int param3); static int ov12_02221B54(int param0, int param1); -static void ov12_02221B64(UnkStruct_ov12_02221BBC * param0); -static BOOL ov12_02221C50(SysTask * param0, UnkStruct_ov12_02221BBC * param1); -static BOOL ov12_02221F44(SysTask * param0, UnkStruct_ov12_02221BBC * param1); -static BOOL ov12_022222A4(SysTask * param0, UnkStruct_ov12_02221BBC * param1); -static BOOL ov12_02221D50(SysTask * param0, UnkStruct_ov12_02221BBC * param1); -static BOOL ov12_0222206C(SysTask * param0, UnkStruct_ov12_02221BBC * param1); -static BOOL ov12_022222B0(SysTask * param0, UnkStruct_ov12_02221BBC * param1); -static BOOL ov12_0222235C(UnkStruct_ov12_02221BBC * param0); -static BOOL ov12_02222360(UnkStruct_ov12_02221BBC * param0); -static BOOL ov12_022226D0(UnkStruct_ov12_02221BBC * param0); -static BOOL ov12_022226E8(UnkStruct_ov12_02221BBC * param0); -static BOOL ov12_0222240C(UnkStruct_ov12_02221BBC * param0); -static BOOL ov12_022224E4(UnkStruct_ov12_02221BBC * param0); - -static inline int inline_ov12_022204C4_sub_sub(u32 * param0, u8 param1, u8 param2); -static inline int inline_ov12_022204C4_sub(u32 * param0, u8 param1); -static inline int inline_ov12_022204C4(u32 * param0); +static void ov12_02221B64(UnkStruct_ov12_02221BBC *param0); +static BOOL ov12_02221C50(SysTask *param0, UnkStruct_ov12_02221BBC *param1); +static BOOL ov12_02221F44(SysTask *param0, UnkStruct_ov12_02221BBC *param1); +static BOOL ov12_022222A4(SysTask *param0, UnkStruct_ov12_02221BBC *param1); +static BOOL ov12_02221D50(SysTask *param0, UnkStruct_ov12_02221BBC *param1); +static BOOL ov12_0222206C(SysTask *param0, UnkStruct_ov12_02221BBC *param1); +static BOOL ov12_022222B0(SysTask *param0, UnkStruct_ov12_02221BBC *param1); +static BOOL ov12_0222235C(UnkStruct_ov12_02221BBC *param0); +static BOOL ov12_02222360(UnkStruct_ov12_02221BBC *param0); +static BOOL ov12_022226D0(UnkStruct_ov12_02221BBC *param0); +static BOOL ov12_022226E8(UnkStruct_ov12_02221BBC *param0); +static BOOL ov12_0222240C(UnkStruct_ov12_02221BBC *param0); +static BOOL ov12_022224E4(UnkStruct_ov12_02221BBC *param0); + +static inline int inline_ov12_022204C4_sub_sub(u32 *param0, u8 param1, u8 param2); +static inline int inline_ov12_022204C4_sub(u32 *param0, u8 param1); +static inline int inline_ov12_022204C4(u32 *param0); static const s16 Unk_ov12_02238660[] = { 0x20, @@ -366,7 +365,7 @@ static const s16 Unk_ov12_02238660[] = { 0x20 }; -static void ov12_0221FC20 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_0221FC20(UnkStruct_ov12_0221FCDC *param0) { if (param0->unk_89 == 0) { param0->unk_89 == 0; @@ -376,7 +375,7 @@ static void ov12_0221FC20 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_0221FC44 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_0221FC44(UnkStruct_ov12_0221FCDC *param0) { UnkFuncPtr_ov12_02239EEC v0; @@ -386,9 +385,9 @@ static void ov12_0221FC44 (UnkStruct_ov12_0221FCDC * param0) } while (param0->unk_89 == 0 && param0->unk_10 == 1); } -static SysTask * ov12_0221FC68 (u8 param0, UnkStruct_ov12_0221FCDC * param1, SysTaskFunc param2, void * param3, u32 param4) +static SysTask *ov12_0221FC68(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTaskFunc param2, void *param3, u32 param4) { - SysTask * v0; + SysTask *v0; switch (param0) { case 1: @@ -406,7 +405,7 @@ static SysTask * ov12_0221FC68 (u8 param0, UnkStruct_ov12_0221FCDC * param1, Sys return v0; } -static void ov12_0221FCA4 (u8 param0, UnkStruct_ov12_0221FCDC * param1, SysTask * param2) +static void ov12_0221FCA4(u8 param0, UnkStruct_ov12_0221FCDC *param1, SysTask *param2) { switch (param0) { case 1: @@ -423,10 +422,10 @@ static void ov12_0221FCA4 (u8 param0, UnkStruct_ov12_0221FCDC * param1, SysTask SysTask_Done(param2); } -UnkStruct_ov12_0221FCDC * ov12_0221FCDC (int param0) +UnkStruct_ov12_0221FCDC *ov12_0221FCDC(int param0) { int v0; - UnkStruct_ov12_0221FCDC * v1 = NULL; + UnkStruct_ov12_0221FCDC *v1 = NULL; v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov12_0221FCDC)); @@ -471,25 +470,25 @@ UnkStruct_ov12_0221FCDC * ov12_0221FCDC (int param0) return v1; } -void ov12_0221FDC0 (UnkStruct_ov12_0221FCDC * param0, BOOL param1) +void ov12_0221FDC0(UnkStruct_ov12_0221FCDC *param0, BOOL param1) { GF_ASSERT(param0 != NULL); param0->unk_08 = param1; } -BOOL ov12_0221FDD4 (UnkStruct_ov12_0221FCDC * param0) +BOOL ov12_0221FDD4(UnkStruct_ov12_0221FCDC *param0) { GF_ASSERT(param0 != NULL); return param0->unk_08; } -int ov12_0221FDE4 (UnkStruct_ov12_0221FCDC * param0) +int ov12_0221FDE4(UnkStruct_ov12_0221FCDC *param0) { GF_ASSERT(param0 != NULL); return param0->unk_00; } -BOOL ov12_0221FDF4 (UnkStruct_ov12_0221FCDC * param0) +BOOL ov12_0221FDF4(UnkStruct_ov12_0221FCDC *param0) { if (ov12_022201B4(param0) == 0) { return 0; @@ -509,7 +508,7 @@ BOOL ov12_0221FDF4 (UnkStruct_ov12_0221FCDC * param0) return 1; } -BOOL ov12_0221FE30 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov16_02265BBC * param1, u16 param2, UnkStruct_ov16_02264408 * param3) +BOOL ov12_0221FE30(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov16_02265BBC *param1, u16 param2, UnkStruct_ov16_02264408 *param3) { int v0; int v1; @@ -641,7 +640,7 @@ BOOL ov12_0221FE30 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov16_02265BBC * return 1; } -BOOL ov12_0222016C (UnkStruct_ov12_0221FCDC * param0) +BOOL ov12_0222016C(UnkStruct_ov12_0221FCDC *param0) { if (ov12_022201B4(param0) == 0) { return 0; @@ -651,12 +650,12 @@ BOOL ov12_0222016C (UnkStruct_ov12_0221FCDC * param0) return 1; } -BOOL ov12_02220188 (UnkStruct_ov12_0221FCDC * param0) +BOOL ov12_02220188(UnkStruct_ov12_0221FCDC *param0) { return (param0->unk_10 == 1) ? 1 : 0; } -BOOL ov12_02220198 (UnkStruct_ov12_0221FCDC * param0) +BOOL ov12_02220198(UnkStruct_ov12_0221FCDC *param0) { if (param0->unk_14 == NULL) { GF_ASSERT(param0->unk_14); @@ -667,7 +666,7 @@ BOOL ov12_02220198 (UnkStruct_ov12_0221FCDC * param0) return 1; } -BOOL ov12_022201B4 (UnkStruct_ov12_0221FCDC * param0) +BOOL ov12_022201B4(UnkStruct_ov12_0221FCDC *param0) { if (param0 == NULL) { return 0; @@ -676,80 +675,80 @@ BOOL ov12_022201B4 (UnkStruct_ov12_0221FCDC * param0) return (param0->unk_0C == 1) ? 1 : 0; } -SysTask * ov12_022201CC (UnkStruct_ov12_0221FCDC * param0, SysTaskFunc param1, void * param2, u32 param3) +SysTask *ov12_022201CC(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2, u32 param3) { - SysTask * v0; + SysTask *v0; v0 = ov12_0221FC68(1, param0, param1, param2, param3); return v0; } -SysTask * ov12_022201E8 (UnkStruct_ov12_0221FCDC * param0, SysTaskFunc param1, void * param2) +SysTask *ov12_022201E8(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2) { - SysTask * v0; + SysTask *v0; v0 = ov12_0221FC68(1, param0, param1, param2, 1100); return v0; } -SysTask * ov12_02220204 (UnkStruct_ov12_0221FCDC * param0, SysTaskFunc param1, void * param2, u32 param3) +SysTask *ov12_02220204(UnkStruct_ov12_0221FCDC *param0, SysTaskFunc param1, void *param2, u32 param3) { - SysTask * v0; + SysTask *v0; v0 = ov12_0221FC68(2, param0, param1, param2, param3); return v0; } -void ov12_02220220 (UnkStruct_ov12_0221FCDC * param0, SysTask * param1) +void ov12_02220220(UnkStruct_ov12_0221FCDC *param0, SysTask *param1) { ov12_0221FCA4(1, param0, param1); } -void ov12_02220230 (UnkStruct_ov12_0221FCDC * param0, SysTask * param1) +void ov12_02220230(UnkStruct_ov12_0221FCDC *param0, SysTask *param1) { ov12_0221FCA4(2, param0, param1); } -u16 ov12_02220240 (UnkStruct_ov12_0221FCDC * param0) +u16 ov12_02220240(UnkStruct_ov12_0221FCDC *param0) { return param0->unk_BC->unk_14; } -u16 ov12_02220248 (UnkStruct_ov12_0221FCDC * param0) +u16 ov12_02220248(UnkStruct_ov12_0221FCDC *param0) { return param0->unk_BC->unk_16; } -UnkStruct_02014014 * ov12_02220250 (UnkStruct_ov12_0221FCDC * param0) +UnkStruct_02014014 *ov12_02220250(UnkStruct_ov12_0221FCDC *param0) { return param0->unk_BC->unk_1C[param0->unk_BC->unk_18]; } -UnkStruct_02014014 * ov12_02220260 (UnkStruct_ov12_0221FCDC * param0, int param1) +UnkStruct_02014014 *ov12_02220260(UnkStruct_ov12_0221FCDC *param0, int param1) { return param0->unk_BC->unk_1C[param1]; } -UnkSPLStruct6 * ov12_0222026C (UnkStruct_ov12_0221FCDC * param0, int param1) +UnkSPLStruct6 *ov12_0222026C(UnkStruct_ov12_0221FCDC *param0, int param1) { - UnkSPLStruct6 * v0; + UnkSPLStruct6 *v0; v0 = param0->unk_BC->unk_5C[param1]; return v0; } -BGL * ov12_02220278 (UnkStruct_ov12_0221FCDC * param0) +BGL *ov12_02220278(UnkStruct_ov12_0221FCDC *param0) { return param0->unk_C0; } -s32 ov12_02220280 (UnkStruct_ov12_0221FCDC * param0, int param1) +s32 ov12_02220280(UnkStruct_ov12_0221FCDC *param0, int param1) { GF_ASSERT(param1 < (8 + 2)); return param0->unk_90[param1]; } -CellActorData * ov12_02220298 (UnkStruct_ov12_0221FCDC * param0, int param1) +CellActorData *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1) { GF_ASSERT(param1 < 10); GF_ASSERT(param0 != NULL); @@ -758,7 +757,7 @@ CellActorData * ov12_02220298 (UnkStruct_ov12_0221FCDC * param0, int param1) return param0->unk_D8[param1]; } -CellActorData * ov12_022202C0 (UnkStruct_ov12_0221FCDC * param0, int param1) +CellActorData *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1) { GF_ASSERT(param1 < (4 + 1)); GF_ASSERT(param0 != NULL); @@ -767,23 +766,23 @@ CellActorData * ov12_022202C0 (UnkStruct_ov12_0221FCDC * param0, int param1) return param0->unk_138[param1]; } -SpriteGfxHandler * ov12_022202EC (UnkStruct_ov12_0221FCDC * param0) +SpriteGfxHandler *ov12_022202EC(UnkStruct_ov12_0221FCDC *param0) { GF_ASSERT(param0 != NULL); return param0->unk_134; } -SpriteGfxHandler * ov12_02220300 (UnkStruct_ov12_0221FCDC * param0) +SpriteGfxHandler *ov12_02220300(UnkStruct_ov12_0221FCDC *param0) { return param0->unk_C8[0]; } -SpriteRenderer * ov12_02220308 (UnkStruct_ov12_0221FCDC * param0) +SpriteRenderer *ov12_02220308(UnkStruct_ov12_0221FCDC *param0) { return param0->unk_BC->unk_AC; } -static BOOL(*const Unk_ov12_0223862C[])(UnkStruct_ov12_02220314 *) = { +static BOOL (*const Unk_ov12_0223862C[])(UnkStruct_ov12_02220314 *) = { ov12_0222039C, ov12_022203A0, ov12_022203FC, @@ -792,9 +791,9 @@ static BOOL(*const Unk_ov12_0223862C[])(UnkStruct_ov12_02220314 *) = { ov12_0222044C }; -static UnkStruct_ov12_02220314 * ov12_02220314 (UnkStruct_ov12_0221FCDC * param0) +static UnkStruct_ov12_02220314 *ov12_02220314(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02220314 * v0 = NULL; + UnkStruct_ov12_02220314 *v0 = NULL; v0 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov12_02220314)); @@ -809,16 +808,16 @@ static UnkStruct_ov12_02220314 * ov12_02220314 (UnkStruct_ov12_0221FCDC * param0 return v0; } -static void ov12_02220344 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_02220314 * param1) +static void ov12_02220344(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02220314 *param1) { param1->unk_38 = param0; SysTask_Start(ov12_0222035C, param1, 1100); } -static void ov12_0222035C (SysTask * param0, void * param1) +static void ov12_0222035C(SysTask *param0, void *param1) { BOOL v0; - UnkStruct_ov12_02220314 * v1 = (UnkStruct_ov12_02220314 *)param1; + UnkStruct_ov12_02220314 *v1 = (UnkStruct_ov12_02220314 *)param1; v0 = Unk_ov12_0223862C[v1->unk_00](v1); @@ -832,12 +831,12 @@ static void ov12_0222035C (SysTask * param0, void * param1) } } -static BOOL ov12_0222039C (UnkStruct_ov12_02220314 * param0) +static BOOL ov12_0222039C(UnkStruct_ov12_02220314 *param0) { return 0; } -static BOOL ov12_022203A0 (UnkStruct_ov12_02220314 * param0) +static BOOL ov12_022203A0(UnkStruct_ov12_02220314 *param0) { BOOL v0; s8 v1; @@ -876,17 +875,17 @@ static BOOL ov12_022203A0 (UnkStruct_ov12_02220314 * param0) return v0; } -static BOOL ov12_022203FC (UnkStruct_ov12_02220314 * param0) +static BOOL ov12_022203FC(UnkStruct_ov12_02220314 *param0) { return ov12_022203A0(param0); } -static BOOL ov12_02220404 (UnkStruct_ov12_02220314 * param0) +static BOOL ov12_02220404(UnkStruct_ov12_02220314 *param0) { return ov12_022203A0(param0); } -static BOOL ov12_0222040C (UnkStruct_ov12_02220314 * param0) +static BOOL ov12_0222040C(UnkStruct_ov12_02220314 *param0) { BOOL v0; @@ -909,7 +908,7 @@ static BOOL ov12_0222040C (UnkStruct_ov12_02220314 * param0) return v0; } -static BOOL ov12_0222044C (UnkStruct_ov12_02220314 * param0) +static BOOL ov12_0222044C(UnkStruct_ov12_02220314 *param0) { BOOL v0; @@ -1013,12 +1012,12 @@ static const UnkFuncPtr_ov12_02239EEC Unk_ov12_022387D4[] = { ov12_0222048C }; -void ov12_02220474 (void) +void ov12_02220474(void) { G2_SetBlendAlpha((GX_BLEND_PLANEMASK_NONE), (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), 8, 8); } -static inline int inline_ov12_022204C4_sub_sub (u32 * param0, u8 param1, u8 param2) +static inline int inline_ov12_022204C4_sub_sub(u32 *param0, u8 param1, u8 param2) { int v0 = param0[param1]; @@ -1029,7 +1028,7 @@ static inline int inline_ov12_022204C4_sub_sub (u32 * param0, u8 param1, u8 para return v0; } -static inline int inline_ov12_022204C4_sub (u32 * param0, u8 param1) +static inline int inline_ov12_022204C4_sub(u32 *param0, u8 param1) { int v0; @@ -1037,12 +1036,12 @@ static inline int inline_ov12_022204C4_sub (u32 * param0, u8 param1) return v0; } -static inline int inline_ov12_022204C4 (u32 * param0) +static inline int inline_ov12_022204C4(u32 *param0) { return inline_ov12_022204C4_sub(param0, 1); } -static void ov12_0222048C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_0222048C(UnkStruct_ov12_0221FCDC *param0) { param0->unk_89 = 1; @@ -1056,7 +1055,7 @@ static void ov12_0222048C (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_022204C4 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022204C4(UnkStruct_ov12_0221FCDC *param0) { param0->unk_18 += 1; param0->unk_89 = (u8)inline_ov12_022204C4(param0->unk_18); @@ -1064,7 +1063,7 @@ static void ov12_022204C4 (UnkStruct_ov12_0221FCDC * param0) param0->unk_B8 = ov12_0221FC20; } -static void ov12_022204E4 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022204E4(UnkStruct_ov12_0221FCDC *param0) { if (param0->unk_8A == 0) { param0->unk_18 += 1; @@ -1074,7 +1073,7 @@ static void ov12_022204E4 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02220504 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220504(UnkStruct_ov12_0221FCDC *param0) { u32 v0; u32 v1; @@ -1093,7 +1092,7 @@ static void ov12_02220504 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02220524 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220524(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -1104,7 +1103,7 @@ static void ov12_02220524 (UnkStruct_ov12_0221FCDC * param0) } } -int ov12_02220540 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_02220540(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0 = 0; @@ -1135,7 +1134,7 @@ int ov12_02220540 (UnkStruct_ov12_0221FCDC * param0, int param1) return v0; } -void ov12_02220590 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_022380DC * param1, int param2) +void ov12_02220590(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_022380DC *param1, int param2) { int v0; @@ -1173,7 +1172,7 @@ void ov12_02220590 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_022380DC * } } -static void ov12_022206A4 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022206A4(UnkStruct_ov12_0221FCDC *param0) { int v0; UnkStruct_ov12_022380DC v1; @@ -1193,7 +1192,7 @@ static void ov12_022206A4 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_022206E8 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022206E8(UnkStruct_ov12_0221FCDC *param0) { int v0; UnkStruct_ov12_022380DC v1; @@ -1206,7 +1205,7 @@ static void ov12_022206E8 (UnkStruct_ov12_0221FCDC * param0) ov12_022382BC(&v1, param0->unk_00); } -static void ov12_0222070C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_0222070C(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -1227,7 +1226,7 @@ static void ov12_0222070C (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_0222074C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_0222074C(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -1250,7 +1249,7 @@ static void ov12_0222074C (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02220798 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220798(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1 = 0; @@ -1345,7 +1344,7 @@ static void ov12_02220798 (UnkStruct_ov12_0221FCDC * param0) param0->unk_10 = 0; } -static void ov12_022209A8 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022209A8(UnkStruct_ov12_0221FCDC *param0) { u32 v0; u32 v1; @@ -1377,7 +1376,7 @@ static void ov12_022209A8 (UnkStruct_ov12_0221FCDC * param0) param0->unk_BC->unk_5C[0] = ov12_02223880(param0->unk_BC->unk_1C[v2], v0, v1, param0); } -static void ov12_02220A3C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220A3C(UnkStruct_ov12_0221FCDC *param0) { u32 v0; u32 v1; @@ -1413,18 +1412,18 @@ static void ov12_02220A3C (UnkStruct_ov12_0221FCDC * param0) param0->unk_BC->unk_5C[v3] = ov12_02223880(param0->unk_BC->unk_1C[v2], v0, v1, param0); } -static int ov12_02220ADC (UnkStruct_ov12_0221FCDC * param0) +static int ov12_02220ADC(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1, v2; int v3, v4; int v5[][6] = { - {0xFF, 0x1, 0xFF, 0xFF, 0xFF, 0xFF}, - {0x4, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, - {0xFF, 0xFF, 0xFF, 0x3, 0xFF, 0x1}, - {0xFF, 0xFF, 0x6, 0xFF, 0x4, 0xFF}, - {0xFF, 0xFF, 0xFF, 0x1, 0xFF, 0x2}, - {0xFF, 0xFF, 0x4, 0xFF, 0x5, 0xFF} + { 0xFF, 0x1, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0x4, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0x3, 0xFF, 0x1 }, + { 0xFF, 0xFF, 0x6, 0xFF, 0x4, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0x1, 0xFF, 0x2 }, + { 0xFF, 0xFF, 0x4, 0xFF, 0x5, 0xFF } }; v3 = ov12_02220240(param0); @@ -1438,18 +1437,18 @@ static int ov12_02220ADC (UnkStruct_ov12_0221FCDC * param0) return v0 - 1; } -static int ov12_02220B34 (UnkStruct_ov12_0221FCDC * param0) +static int ov12_02220B34(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1, v2; int v3, v4; int v5[][6] = { - {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1}, - {0xFF, 0xFF, 0x1, 0xFF, 0xFF, 0xFF}, - {0xFF, 0xFF, 0xFF, 0x0, 0xFF, 0xFF} + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0x0, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1 }, + { 0xFF, 0xFF, 0x1, 0xFF, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0x0, 0xFF, 0xFF } }; v3 = ov12_02220240(param0); @@ -1463,7 +1462,7 @@ static int ov12_02220B34 (UnkStruct_ov12_0221FCDC * param0) return v0; } -static void ov12_02220B8C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220B8C(UnkStruct_ov12_0221FCDC *param0) { int v0; u32 v1[6]; @@ -1504,7 +1503,7 @@ static void ov12_02220B8C (UnkStruct_ov12_0221FCDC * param0) param0->unk_BC->unk_5C[0] = ov12_02223880(param0->unk_BC->unk_1C[v3], v4, v2, param0); } -static void ov12_02220C44 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220C44(UnkStruct_ov12_0221FCDC *param0) { int v0; u32 v1[4]; @@ -1545,7 +1544,7 @@ static void ov12_02220C44 (UnkStruct_ov12_0221FCDC * param0) param0->unk_BC->unk_5C[0] = ov12_02223880(param0->unk_BC->unk_1C[v3], v4, v2, param0); } -static void ov12_02220CFC (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220CFC(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -1568,7 +1567,7 @@ static void ov12_02220CFC (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02220D3C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220D3C(UnkStruct_ov12_0221FCDC *param0) { u32 v0; u32 v1; @@ -1588,7 +1587,7 @@ static void ov12_02220D3C (UnkStruct_ov12_0221FCDC * param0) param0->unk_B8 = ov12_0221FC20; } -static void ov12_02220D90 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220D90(UnkStruct_ov12_0221FCDC *param0) { u32 v0; u32 v1; @@ -1612,7 +1611,7 @@ static void ov12_02220D90 (UnkStruct_ov12_0221FCDC * param0) param0->unk_B8 = ov12_0221FC20; } -static void ov12_02220DE8 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220DE8(UnkStruct_ov12_0221FCDC *param0) { u32 v0; @@ -1624,7 +1623,7 @@ static void ov12_02220DE8 (UnkStruct_ov12_0221FCDC * param0) param0->unk_BC->unk_1C[v0] = NULL; } -static void ov12_02220E14 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220E14(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -1642,7 +1641,7 @@ static void ov12_02220E14 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02220E44 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220E44(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -1660,7 +1659,7 @@ static void ov12_02220E44 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02220E70 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220E70(UnkStruct_ov12_0221FCDC *param0) { u32 v0; u32 v1; @@ -1680,7 +1679,7 @@ static void ov12_02220E70 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02220EA8 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220EA8(UnkStruct_ov12_0221FCDC *param0) { param0->unk_18 += 1; @@ -1691,7 +1690,7 @@ static void ov12_02220EA8 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02220ED0 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220ED0(UnkStruct_ov12_0221FCDC *param0) { int v0; u32 v1; @@ -1720,7 +1719,7 @@ static void ov12_02220ED0 (UnkStruct_ov12_0221FCDC * param0) v3(param0); } -static void ov12_02220F30 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220F30(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -1733,7 +1732,7 @@ static void ov12_02220F30 (UnkStruct_ov12_0221FCDC * param0) param0->unk_18 += (u32)inline_ov12_022204C4(param0->unk_18); } -static void ov12_02220F5C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220F5C(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -1756,7 +1755,7 @@ static void ov12_02220F5C (UnkStruct_ov12_0221FCDC * param0) param0->unk_18 += (u32)inline_ov12_022204C4(param0->unk_18); } -static void ov12_02220FA0 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220FA0(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1[] = { @@ -1787,7 +1786,7 @@ static void ov12_02220FA0 (UnkStruct_ov12_0221FCDC * param0) param0->unk_18 += (u32)inline_ov12_022204C4(param0->unk_18); } -static void ov12_02220FFC (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02220FFC(UnkStruct_ov12_0221FCDC *param0) { param0->unk_18 += 1; @@ -1798,7 +1797,7 @@ static void ov12_02220FFC (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02221024 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221024(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -1815,7 +1814,7 @@ static void ov12_02221024 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02221064 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221064(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -1831,13 +1830,13 @@ static void ov12_02221064 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02221098 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221098(UnkStruct_ov12_0221FCDC *param0) { param0->unk_18 += 1; param0->unk_18 += (u32)inline_ov12_022204C4(param0->unk_18); } -static int ov12_022210A8 (UnkStruct_ov12_0221FCDC * param0, int param1) +static int ov12_022210A8(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; @@ -1855,8 +1854,7 @@ static int ov12_022210A8 (UnkStruct_ov12_0221FCDC * param0, int param1) v0 = ov12_022352AC(param0, param0->unk_BC->unk_16); break; - case 4: - { + case 4: { int v1; int v2; @@ -1874,10 +1872,8 @@ static int ov12_022210A8 (UnkStruct_ov12_0221FCDC * param0, int param1) if (v0 == 0xFF) { v0 = 0; } - } - break; - case 5: - { + } break; + case 5: { int v3; int v4; @@ -1895,10 +1891,8 @@ static int ov12_022210A8 (UnkStruct_ov12_0221FCDC * param0, int param1) if (v0 == 0xFF) { v0 = 0; } - } - break; - case 6: - { + } break; + case 6: { int v5; int v6; @@ -1916,10 +1910,8 @@ static int ov12_022210A8 (UnkStruct_ov12_0221FCDC * param0, int param1) if (v0 == 0xFF) { v0 = 0; } - } - break; - case 7: - { + } break; + case 7: { int v7; int v8; @@ -1937,16 +1929,15 @@ static int ov12_022210A8 (UnkStruct_ov12_0221FCDC * param0, int param1) if (v0 == 0xFF) { v0 = 0; } - } - break; + } break; } return v0; } -static void ov12_0222118C (SysTask * param0, void * param1) +static void ov12_0222118C(SysTask *param0, void *param1) { - UnkStruct_ov12_0222118C * v0 = (UnkStruct_ov12_0222118C *)param1; + UnkStruct_ov12_0222118C *v0 = (UnkStruct_ov12_0222118C *)param1; s16 v1; s16 v2; @@ -1967,9 +1958,9 @@ static void ov12_0222118C (SysTask * param0, void * param1) SpriteActor_SetSpritePositionXY(v0->unk_00, v1, v2); } -static void ov12_022211D8 (SysTask * param0, void * param1) +static void ov12_022211D8(SysTask *param0, void *param1) { - UnkStruct_ov12_022211D8 * v0 = (UnkStruct_ov12_022211D8 *)param1; + UnkStruct_ov12_022211D8 *v0 = (UnkStruct_ov12_022211D8 *)param1; s16 v1; s16 v2; @@ -1991,7 +1982,7 @@ static void ov12_022211D8 (SysTask * param0, void * param1) sub_02019184(v0->unk_00, 2, 3, -(v2 - 40)); } -void ov12_02221238 (UnkStruct_ov12_0221FCDC * param0, int param1) +void ov12_02221238(UnkStruct_ov12_0221FCDC *param0, int param1) { if (param1 == 4) { if (param0->unk_174 != NULL) { @@ -2008,19 +1999,19 @@ void ov12_02221238 (UnkStruct_ov12_0221FCDC * param0, int param1) } } -static void ov12_02221284 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221284(UnkStruct_ov12_0221FCDC *param0) { return; } -static void ov12_02221288 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221288(UnkStruct_ov12_0221FCDC *param0) { return; } -static void ov12_0222128C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0) { - void * v0 = NULL; + void *v0 = NULL; int v1; int v2; int v3; @@ -2050,7 +2041,7 @@ static void ov12_0222128C (UnkStruct_ov12_0221FCDC * param0) } { - u8 * v8 = sub_02019F28(2); + u8 *v8 = sub_02019F28(2); MI_CpuFill8(v8, 0, 10 * 10 * 2 * 0x20); } @@ -2060,7 +2051,7 @@ static void ov12_0222128C (UnkStruct_ov12_0221FCDC * param0) sub_0200710C(param0->unk_1A0[0], v6, param0->unk_C0, 2, 0, 0, 0, param0->unk_00); if (v2 == 1) { - SysTask * v9; + SysTask *v9; param0->unk_174 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov12_0222118C)); param0->unk_174->unk_00 = param0->unk_C0; @@ -2089,20 +2080,20 @@ static void ov12_0222128C (UnkStruct_ov12_0221FCDC * param0) BGL_SetPriority(2, ov12_0222339C(param0)); } -static void ov12_02221424 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221424(UnkStruct_ov12_0221FCDC *param0) { param0->unk_18 += 1; param0->unk_18 += 1; { - u8 * v0 = sub_02019F28(2); + u8 *v0 = sub_02019F28(2); MI_CpuFill8(v0, 0, 10 * 10 * 2 * 0x20); } ov12_02221238(param0, 4); } -static void ov12_0222144C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_0222144C(UnkStruct_ov12_0221FCDC *param0) { int v0 = (4 + 1); UnkStruct_ov104_02241308 v1 = { @@ -2122,7 +2113,7 @@ static void ov12_0222144C (UnkStruct_ov12_0221FCDC * param0) sub_0200CB30(param0->unk_BC->unk_AC, param0->unk_134, &v1); } -static void ov12_022214C4 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022214C4(UnkStruct_ov12_0221FCDC *param0) { int v0[6]; int v1; @@ -2144,10 +2135,10 @@ static void ov12_022214C4 (UnkStruct_ov12_0221FCDC * param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 78, 0, v0[3]); } -static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0) { - u8 * v0 = NULL; - CellActorData * v1 = NULL; + u8 *v0 = NULL; + CellActorData *v1 = NULL; int v2[6]; int v3; int v4; @@ -2186,7 +2177,7 @@ static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0) v10 = param0->unk_BC->unk_E8[v7]; { SpriteTemplate v11; - Sprite * v12 = ov12_022232FC(param0, v7); + Sprite *v12 = ov12_022232FC(param0, v7); int v13; int v14; s16 v15; @@ -2230,14 +2221,14 @@ static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0) } if (ov12_022232FC(param0, v7) != NULL) { - NNSG2dImageProxy * v18; + NNSG2dImageProxy *v18; v18 = SpriteActor_ImageProxy(v1->unk_00); sub_0201DC68(NNS_GFD_DST_2D_OBJ_CHAR_MAIN, v18->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN], v0, (10 * 10 * ((8 / 2) * 8))); } if (ov12_022232FC(param0, v7) != NULL) { - NNSG2dImagePaletteProxy * v19; + NNSG2dImagePaletteProxy *v19; int v20; v19 = sub_02021F9C(v1->unk_00); @@ -2252,7 +2243,7 @@ static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0) param0->unk_14C[v5] = 1; if (v4 == 1) { - SysTask * v21; + SysTask *v21; if (ov12_022232FC(param0, v7) == NULL) { return; @@ -2270,7 +2261,7 @@ static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_022217B4 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022217B4(UnkStruct_ov12_0221FCDC *param0) { param0->unk_18 += 1; @@ -2281,7 +2272,7 @@ static void ov12_022217B4 (UnkStruct_ov12_0221FCDC * param0) param0->unk_134 = NULL; } -static void ov12_022217E0 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022217E0(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -2298,9 +2289,9 @@ static void ov12_022217E0 (UnkStruct_ov12_0221FCDC * param0) param0->unk_138[v0] = NULL; } -static void ov12_02221810 (SysTask * param0, void * param1) +static void ov12_02221810(SysTask *param0, void *param1) { - UnkStruct_ov12_02221810 * v0 = param1; + UnkStruct_ov12_02221810 *v0 = param1; if (v0->unk_0C == 0) { SysTask_Done(param0); @@ -2312,7 +2303,7 @@ static void ov12_02221810 (SysTask * param0, void * param1) } } -static void ov12_02221834 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221834(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -2345,7 +2336,7 @@ static void ov12_02221834 (UnkStruct_ov12_0221FCDC * param0) { int v5; int v6; - Sprite * v7; + Sprite *v7; v6 = ov12_022210A8(param0, v0); v7 = ov12_022232FC(param0, v6); @@ -2418,7 +2409,7 @@ static void ov12_02221834 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_022219E8 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022219E8(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -2429,7 +2420,7 @@ static void ov12_022219E8 (UnkStruct_ov12_0221FCDC * param0) param0->unk_48[v0].unk_0C = 0; } -static void ov12_02221A00 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221A00(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -2440,7 +2431,7 @@ static void ov12_02221A00 (UnkStruct_ov12_0221FCDC * param0) ov12_02221238(param0, v0); } -static void ov12_02221A14 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221A14(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -2455,7 +2446,7 @@ static void ov12_02221A14 (UnkStruct_ov12_0221FCDC * param0) param0->unk_68[v0] = v1; } -void ov12_02221A30 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02221A30(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -2470,17 +2461,17 @@ void ov12_02221A30 (UnkStruct_ov12_0221FCDC * param0) param0->unk_78[v0] = v1; } -static void ov12_02221A4C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221A4C(UnkStruct_ov12_0221FCDC *param0) { return; } -static void ov12_02221A50 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02221A50(UnkStruct_ov12_0221FCDC *param0) { return; } -static BOOL(*const Unk_ov12_022385CC[])(SysTask *, UnkStruct_ov12_02221BBC *) = { +static BOOL (*const Unk_ov12_022385CC[])(SysTask *, UnkStruct_ov12_02221BBC *) = { ov12_02221C50, ov12_02221F44, ov12_022222A4, @@ -2489,7 +2480,7 @@ static BOOL(*const Unk_ov12_022385CC[])(SysTask *, UnkStruct_ov12_02221BBC *) = ov12_022222B0 }; -static BOOL(*const Unk_ov12_02238644[])(UnkStruct_ov12_02221BBC *) = { +static BOOL (*const Unk_ov12_02238644[])(UnkStruct_ov12_02221BBC *) = { ov12_0222235C, ov12_02222360, ov12_022226D0, @@ -2499,7 +2490,7 @@ static BOOL(*const Unk_ov12_02238644[])(UnkStruct_ov12_02221BBC *) = { ov12_022224E4 }; -static BOOL ov12_02221A54 (UnkStruct_ov12_02221BBC * param0, UnkStruct_ov12_0221FCDC * param1, int param2) +static BOOL ov12_02221A54(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FCDC *param1, int param2) { int v0; int v1; @@ -2526,7 +2517,7 @@ static BOOL ov12_02221A54 (UnkStruct_ov12_02221BBC * param0, UnkStruct_ov12_0221 return 0; } -static void ov12_02221AA8 (UnkStruct_ov12_02221BBC * param0, UnkStruct_ov12_0221FCDC * param1, int param2, int param3) +static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FCDC *param1, int param2, int param3) { sub_02006E3C(7, ov12_022234E4(param3, 0), param1->unk_C0, param2, 0, 0, 1, param1->unk_00); PaletteSys_LoadPalette(param1->unk_C4, 7, ov12_022234E4(param3, 1), param1->unk_00, 0, 0x20, (9 * 16)); @@ -2545,7 +2536,7 @@ static void ov12_02221AA8 (UnkStruct_ov12_02221BBC * param0, UnkStruct_ov12_0221 } } -static int ov12_02221B54 (int param0, int param1) +static int ov12_02221B54(int param0, int param1) { int v0; int v1; @@ -2559,7 +2550,7 @@ static int ov12_02221B54 (int param0, int param1) return v0; } -static void ov12_02221B64 (UnkStruct_ov12_02221BBC * param0) +static void ov12_02221B64(UnkStruct_ov12_02221BBC *param0) { int v0; int v1; @@ -2589,9 +2580,9 @@ static void ov12_02221B64 (UnkStruct_ov12_02221BBC * param0) } } -static UnkStruct_ov12_02221BBC * ov12_02221BBC (UnkStruct_ov12_0221FCDC * param0) +static UnkStruct_ov12_02221BBC *ov12_02221BBC(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02221BBC * v0 = NULL; + UnkStruct_ov12_02221BBC *v0 = NULL; v0 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov12_02221BBC)); @@ -2637,7 +2628,7 @@ static UnkStruct_ov12_02221BBC * ov12_02221BBC (UnkStruct_ov12_0221FCDC * param0 return v0; } -static BOOL ov12_02221C50 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) +static BOOL ov12_02221C50(SysTask *param0, UnkStruct_ov12_02221BBC *param1) { switch (param1->unk_05) { case 0: @@ -2655,8 +2646,7 @@ static BOOL ov12_02221C50 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) param1->unk_05++; break; - case 1: - { + case 1: { sub_02018898(param1->unk_48->unk_C0, 3, 2, GX_BG_CHARBASE_0x0c000); if (ov12_0221FDD4(param1->unk_48) != 1) { @@ -2669,8 +2659,7 @@ static BOOL ov12_02221C50 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) } param1->unk_05++; - case 2: - { + case 2: { int v2 = 0; if (param1->unk_09 < param1->unk_0B) { @@ -2696,8 +2685,7 @@ static BOOL ov12_02221C50 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) if (param1->unk_05 != 2) { return 0; } - } - break; + } break; default: return 0; } @@ -2705,14 +2693,13 @@ static BOOL ov12_02221C50 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) return 1; } -static BOOL ov12_02221D50 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) +static BOOL ov12_02221D50(SysTask *param0, UnkStruct_ov12_02221BBC *param1) { switch (param1->unk_05) { case 0: sub_02019120(2, 1); param1->unk_05++; - case 1: - { + case 1: { int v0 = ov12_02223428(param1->unk_48, 2); int v1 = ov12_02223428(param1->unk_48, 1); @@ -2724,8 +2711,7 @@ static BOOL ov12_02221D50 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) } param1->unk_05++; - case 2: - { + case 2: { int v2 = 0; if (param1->unk_09 < param1->unk_0B) { @@ -2747,8 +2733,7 @@ static BOOL ov12_02221D50 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) } G2_ChangeBlendAlpha(param1->unk_09, param1->unk_0A); - } - break; + } break; case 3: if (param1->unk_44_0 == 1) { ov12_02222338(param1->unk_48); @@ -2791,7 +2776,7 @@ static BOOL ov12_02221D50 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) return 1; } -static BOOL ov12_02221F44 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) +static BOOL ov12_02221F44(SysTask *param0, UnkStruct_ov12_02221BBC *param1) { switch (param1->unk_05) { case 0: @@ -2834,7 +2819,7 @@ static BOOL ov12_02221F44 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) return 1; } -static BOOL ov12_0222206C (SysTask * param0, UnkStruct_ov12_02221BBC * param1) +static BOOL ov12_0222206C(SysTask *param0, UnkStruct_ov12_02221BBC *param1) { switch (param1->unk_05) { case 0: @@ -2905,13 +2890,13 @@ static BOOL ov12_0222206C (SysTask * param0, UnkStruct_ov12_02221BBC * param1) return 1; } -static BOOL ov12_022222A4 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) +static BOOL ov12_022222A4(SysTask *param0, UnkStruct_ov12_02221BBC *param1) { ov12_02221B64(param1); return 0; } -static BOOL ov12_022222B0 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) +static BOOL ov12_022222B0(SysTask *param0, UnkStruct_ov12_02221BBC *param1) { ov12_02221B64(param1); @@ -2922,9 +2907,9 @@ static BOOL ov12_022222B0 (SysTask * param0, UnkStruct_ov12_02221BBC * param1) return 0; } -static void ov12_022222D4 (SysTask * param0, void * param1) +static void ov12_022222D4(SysTask *param0, void *param1) { - UnkStruct_ov12_022222D4 * v0 = (UnkStruct_ov12_022222D4 *)param1; + UnkStruct_ov12_022222D4 *v0 = (UnkStruct_ov12_022222D4 *)param1; if (v0->unk_18 == 1) { Heap_FreeToHeap(v0); @@ -2944,7 +2929,7 @@ static void ov12_022222D4 (SysTask * param0, void * param1) } } -void ov12_02222338 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02222338(UnkStruct_ov12_0221FCDC *param0) { GF_ASSERT(param0); @@ -2955,20 +2940,20 @@ void ov12_02222338 (UnkStruct_ov12_0221FCDC * param0) param0->unk_17C->unk_18 = 1; } -int ov12_02222354 (UnkStruct_ov12_0221FCDC * param0) +int ov12_02222354(UnkStruct_ov12_0221FCDC *param0) { return param0->unk_198; } -static BOOL ov12_0222235C (UnkStruct_ov12_02221BBC * param0) +static BOOL ov12_0222235C(UnkStruct_ov12_02221BBC *param0) { return 0; } -static BOOL ov12_02222360 (UnkStruct_ov12_02221BBC * param0) +static BOOL ov12_02222360(UnkStruct_ov12_02221BBC *param0) { int v0; - UnkStruct_ov12_022222D4 * v1; + UnkStruct_ov12_022222D4 *v1; v1 = Heap_AllocFromHeap(param0->unk_48->unk_00, sizeof(UnkStruct_ov12_022222D4)); @@ -2998,11 +2983,11 @@ static BOOL ov12_02222360 (UnkStruct_ov12_02221BBC * param0) return 0; } -static BOOL ov12_0222240C (UnkStruct_ov12_02221BBC * param0) +static BOOL ov12_0222240C(UnkStruct_ov12_02221BBC *param0) { int v0, v1; - UnkStruct_ov12_0221FCDC * v2; - UnkStruct_ov12_022222D4 * v3; + UnkStruct_ov12_0221FCDC *v2; + UnkStruct_ov12_022222D4 *v3; v2 = param0->unk_48; v3 = Heap_AllocFromHeap(param0->unk_48->unk_00, sizeof(UnkStruct_ov12_022222D4)); @@ -3031,10 +3016,10 @@ static BOOL ov12_0222240C (UnkStruct_ov12_02221BBC * param0) return 0; } -static BOOL ov12_022224E4 (UnkStruct_ov12_02221BBC * param0) +static BOOL ov12_022224E4(UnkStruct_ov12_02221BBC *param0) { - UnkStruct_ov12_0221FCDC * v0; - UnkStruct_ov12_022222D4 * v1; + UnkStruct_ov12_0221FCDC *v0; + UnkStruct_ov12_022222D4 *v1; v0 = param0->unk_48; v1 = param0->unk_48->unk_17C; @@ -3043,12 +3028,12 @@ static BOOL ov12_022224E4 (UnkStruct_ov12_02221BBC * param0) return 0; } -static void ov12_022224F8 (SysTask * param0, void * param1) +static void ov12_022224F8(SysTask *param0, void *param1) { int v0, v1; - u32 * v2; - UnkStruct_ov12_022224F8 * v3 = (UnkStruct_ov12_022224F8 *)(((UnkStruct_ov12_022222D4 *)param1)->unk_1C); - UnkStruct_ov12_022222D4 * v4 = (UnkStruct_ov12_022222D4 *)param1; + u32 *v2; + UnkStruct_ov12_022224F8 *v3 = (UnkStruct_ov12_022224F8 *)(((UnkStruct_ov12_022222D4 *)param1)->unk_1C); + UnkStruct_ov12_022222D4 *v4 = (UnkStruct_ov12_022222D4 *)param1; if (v4->unk_18 == 1) { ov12_022265C0(v4->unk_1C->unk_C0); @@ -3074,7 +3059,7 @@ static void ov12_022224F8 (SysTask * param0, void * param1) } } -void ov12_02222590 (UnkStruct_ov12_0221FCDC * param0, int param1) +void ov12_02222590(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0 = ov12_02223428(param0, 2); @@ -3099,7 +3084,7 @@ void ov12_02222590 (UnkStruct_ov12_0221FCDC * param0, int param1) sub_02006E60(param0->unk_180.unk_00, param0->unk_180.unk_0C, param0->unk_C0, param1, 0, 0, 1, param0->unk_00); } -void ov12_02222664 (UnkStruct_ov12_0221FCDC * param0, int param1) +void ov12_02222664(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0 = ov12_02223428(param0, 1); @@ -3115,21 +3100,21 @@ void ov12_02222664 (UnkStruct_ov12_0221FCDC * param0, int param1) sub_02019EBC(param0->unk_C0, param1); } -static BOOL ov12_022226D0 (UnkStruct_ov12_02221BBC * param0) +static BOOL ov12_022226D0(UnkStruct_ov12_02221BBC *param0) { param0->unk_44_0 = 1; return 0; } -static BOOL ov12_022226E8 (UnkStruct_ov12_02221BBC * param0) +static BOOL ov12_022226E8(UnkStruct_ov12_02221BBC *param0) { ov12_02222338(param0->unk_48); return 0; } -static void ov12_022226F4 (SysTask * param0, void * param1) +static void ov12_022226F4(SysTask *param0, void *param1) { - UnkStruct_ov12_02221BBC * v0 = (UnkStruct_ov12_02221BBC *)param1; + UnkStruct_ov12_02221BBC *v0 = (UnkStruct_ov12_02221BBC *)param1; BOOL v1; v1 = Unk_ov12_022385CC[v0->unk_14](param0, v0); @@ -3142,9 +3127,9 @@ static void ov12_022226F4 (SysTask * param0, void * param1) } } -static void ov12_02222724 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222724(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02221BBC * v0; + UnkStruct_ov12_02221BBC *v0; int v1; v0 = ov12_02221BBC(param0); @@ -3164,7 +3149,7 @@ static void ov12_02222724 (UnkStruct_ov12_0221FCDC * param0) SysTask_Start(ov12_022226F4, v0, 1100); } -static void ov12_02222774 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222774(UnkStruct_ov12_0221FCDC *param0) { int v0; s16 v1; @@ -3195,9 +3180,9 @@ static void ov12_02222774 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_022227CC (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022227CC(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02221BBC * v0; + UnkStruct_ov12_02221BBC *v0; int v1; v0 = ov12_02221BBC(param0); @@ -3217,7 +3202,7 @@ static void ov12_022227CC (UnkStruct_ov12_0221FCDC * param0) SysTask_Start(ov12_022226F4, v0, 1100); } -static void ov12_02222820 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222820(UnkStruct_ov12_0221FCDC *param0) { if (param0->unk_178 == 2) { param0->unk_18 += 1; @@ -3227,7 +3212,7 @@ static void ov12_02222820 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02222840 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222840(UnkStruct_ov12_0221FCDC *param0) { if (param0->unk_178 == 0) { param0->unk_18 += 1; @@ -3237,7 +3222,7 @@ static void ov12_02222840 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02222860 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222860(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -3250,9 +3235,9 @@ static void ov12_02222860 (UnkStruct_ov12_0221FCDC * param0) sub_02006E60(7, ov12_022234E4(v0, 2), param0->unk_C0, 3, 0, 0, 1, param0->unk_00); } -static void ov12_022228DC (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022228DC(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02221BBC * v0; + UnkStruct_ov12_02221BBC *v0; int v1, v2, v3; v0 = ov12_02221BBC(param0); @@ -3281,32 +3266,32 @@ static void ov12_022228DC (UnkStruct_ov12_0221FCDC * param0) SysTask_Start(ov12_022226F4, v0, 1100); } -static void ov12_0222293C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_0222293C(UnkStruct_ov12_0221FCDC *param0) { return; } -static void ov12_02222940 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222940(UnkStruct_ov12_0221FCDC *param0) { return; } -static void ov12_02222944 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222944(UnkStruct_ov12_0221FCDC *param0) { return; } -static void ov12_02222948 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222948(UnkStruct_ov12_0221FCDC *param0) { return; } -static void ov12_0222294C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_0222294C(UnkStruct_ov12_0221FCDC *param0) { return; } -static void ov12_02222950 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222950(UnkStruct_ov12_0221FCDC *param0) { u16 v0; @@ -3317,7 +3302,7 @@ static void ov12_02222950 (UnkStruct_ov12_0221FCDC * param0) Sound_PlayEffect(v0); } -static void ov12_02222968 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222968(UnkStruct_ov12_0221FCDC *param0) { u16 v0; @@ -3329,7 +3314,7 @@ static void ov12_02222968 (UnkStruct_ov12_0221FCDC * param0) sub_020057A4(v0, 0); } -static void ov12_02222984 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222984(UnkStruct_ov12_0221FCDC *param0) { u16 v0; int v1; @@ -3348,7 +3333,7 @@ static void ov12_02222984 (UnkStruct_ov12_0221FCDC * param0) sub_020057FC(v0, 0xffff, v1); } -static void ov12_022229BC (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022229BC(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -3361,9 +3346,9 @@ static void ov12_022229BC (UnkStruct_ov12_0221FCDC * param0) sub_02005818(v0); } -static void ov12_022229D8 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022229D8(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02220314 * v0 = NULL; + UnkStruct_ov12_02220314 *v0 = NULL; v0 = ov12_02220314(param0); memset(v0, 0, sizeof(UnkStruct_ov12_02220314)); @@ -3396,9 +3381,9 @@ static void ov12_022229D8 (UnkStruct_ov12_0221FCDC * param0) ov12_02220344(param0, v0); } -static void ov12_02222A78 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222A78(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02220314 * v0 = NULL; + UnkStruct_ov12_02220314 *v0 = NULL; v0 = ov12_02220314(param0); memset(v0, 0, sizeof(UnkStruct_ov12_02220314)); @@ -3427,9 +3412,9 @@ static void ov12_02222A78 (UnkStruct_ov12_0221FCDC * param0) ov12_02220344(param0, v0); } -static void ov12_02222AF0 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222AF0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02220314 * v0 = NULL; + UnkStruct_ov12_02220314 *v0 = NULL; v0 = ov12_02220314(param0); memset(v0, 0, sizeof(UnkStruct_ov12_02220314)); @@ -3462,9 +3447,9 @@ static void ov12_02222AF0 (UnkStruct_ov12_0221FCDC * param0) ov12_02220344(param0, v0); } -static void ov12_02222B94 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222B94(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02220314 * v0 = NULL; + UnkStruct_ov12_02220314 *v0 = NULL; v0 = ov12_02220314(param0); memset(v0, 0, sizeof(UnkStruct_ov12_02220314)); @@ -3490,9 +3475,9 @@ static void ov12_02222B94 (UnkStruct_ov12_0221FCDC * param0) ov12_02220344(param0, v0); } -static void ov12_02222BF8 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222BF8(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02220314 * v0 = NULL; + UnkStruct_ov12_02220314 *v0 = NULL; v0 = ov12_02220314(param0); memset(v0, 0, sizeof(UnkStruct_ov12_02220314)); @@ -3515,12 +3500,12 @@ static void ov12_02222BF8 (UnkStruct_ov12_0221FCDC * param0) ov12_02220344(param0, v0); } -static void ov12_02222C50 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222C50(UnkStruct_ov12_0221FCDC *param0) { (void)0; } -static void ov12_02222C54 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222C54(UnkStruct_ov12_0221FCDC *param0) { if (param0->unk_8C) { param0->unk_89 = 1; @@ -3544,7 +3529,7 @@ static void ov12_02222C54 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02222CAC (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222CAC(UnkStruct_ov12_0221FCDC *param0) { u16 v0; u16 v1; @@ -3560,17 +3545,17 @@ static void ov12_02222CAC (UnkStruct_ov12_0221FCDC * param0) G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_PLANEMASK_BG1, v0, v1); } -static void ov12_02222CDC (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222CDC(UnkStruct_ov12_0221FCDC *param0) { ov12_02220474(); } -static void ov12_02222CE4 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222CE4(UnkStruct_ov12_0221FCDC *param0) { return; } -static void ov12_02222CE8 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222CE8(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -3603,7 +3588,7 @@ static void ov12_02222CE8 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02222D84 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222D84(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -3619,7 +3604,7 @@ static void ov12_02222D84 (UnkStruct_ov12_0221FCDC * param0) SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[2], v1, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v1 + 5000); } -static void ov12_02222DCC (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222DCC(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -3639,7 +3624,7 @@ static void ov12_02222DCC (UnkStruct_ov12_0221FCDC * param0) SpriteRenderer_LoadPalette(param0->unk_C4, 2, param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[3], v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, v2, v1 + 5000); } -static void ov12_02222E2C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222E2C(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -3655,7 +3640,7 @@ static void ov12_02222E2C (UnkStruct_ov12_0221FCDC * param0) SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[4], v1, 1, v1 + 5000); } -static void ov12_02222E74 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222E74(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -3671,13 +3656,13 @@ static void ov12_02222E74 (UnkStruct_ov12_0221FCDC * param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_C8[v0], param0->unk_1A0[5], v1, 1, v1 + 5000); } -static void ov12_02222EBC (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222EBC(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; int v2; int v3; - CellActorData * v4; + CellActorData *v4; UnkFuncPtr_ov12_02239E68 v5; param0->unk_18 += 1; @@ -3730,12 +3715,12 @@ static void ov12_02222EBC (UnkStruct_ov12_0221FCDC * param0) v5(param0, param0->unk_BC->unk_AC, param0->unk_C8[v2], v4); } -static void ov12_02222FC8 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02222FC8(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; int v2; - CellActorData * v3; + CellActorData *v3; UnkFuncPtr_ov12_02239E68 v4; param0->unk_18 += 1; @@ -3775,7 +3760,7 @@ static void ov12_02222FC8 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_0222307C (UnkStruct_ov12_0221FCDC * param0) +static void ov12_0222307C(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -3791,7 +3776,7 @@ static void ov12_0222307C (UnkStruct_ov12_0221FCDC * param0) param0->unk_C8[v0] = NULL; } -static void ov12_022230A8 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022230A8(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -3807,12 +3792,12 @@ static void ov12_022230A8 (UnkStruct_ov12_0221FCDC * param0) SpriteActor_EnableObject(param0->unk_138[v0], v1); } -static void ov12_022230CC (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022230CC(UnkStruct_ov12_0221FCDC *param0) { GF_ASSERT(FALSE); } -static void ov12_022230D4 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_022230D4(UnkStruct_ov12_0221FCDC *param0) { int v0; s16 v1; @@ -3838,7 +3823,7 @@ static void ov12_022230D4 (UnkStruct_ov12_0221FCDC * param0) Pokemon_PlayCry(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) +static void ov12_02223134(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -3853,12 +3838,12 @@ static void ov12_02223134 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02223160 (UnkStruct_ov12_0221FCDC * param0) +static void ov12_02223160(UnkStruct_ov12_0221FCDC *param0) { return; } -UnkFuncPtr_ov12_02239EEC ov12_02223164 (u32 param0) +UnkFuncPtr_ov12_02239EEC ov12_02223164(u32 param0) { if (param0 > (NELEMS(Unk_ov12_022387D4))) { return NULL; @@ -3867,12 +3852,12 @@ UnkFuncPtr_ov12_02239EEC ov12_02223164 (u32 param0) return Unk_ov12_022387D4[param0]; } -int ov12_02223178 (UnkStruct_ov12_02223178 * param0) +int ov12_02223178(UnkStruct_ov12_02223178 *param0) { return param0->unk_01; } -s8 ov12_0222317C (UnkStruct_ov12_0221FCDC * param0, s8 param1) +s8 ov12_0222317C(UnkStruct_ov12_0221FCDC *param0, s8 param1) { int v0; @@ -3906,7 +3891,7 @@ s8 ov12_0222317C (UnkStruct_ov12_0221FCDC * param0, s8 param1) return v0; } -s8 ov12_02223234 (s8 param0, s8 param1, s8 param2) +s8 ov12_02223234(s8 param0, s8 param1, s8 param2) { s8 v0; @@ -3921,7 +3906,7 @@ s8 ov12_02223234 (s8 param0, s8 param1, s8 param2) return v0; } -BOOL ov12_0222325C (UnkStruct_ov12_0221FCDC * param0, int param1[], int param2) +BOOL ov12_0222325C(UnkStruct_ov12_0221FCDC *param0, int param1[], int param2) { int v0, v1; @@ -3943,37 +3928,37 @@ BOOL ov12_0222325C (UnkStruct_ov12_0221FCDC * param0, int param1[], int param2) return 1; } -SpriteTemplate ov12_0222329C (UnkStruct_ov12_0221FCDC * param0) +SpriteTemplate ov12_0222329C(UnkStruct_ov12_0221FCDC *param0) { return param0->unk_100; } -int ov12_022232B8 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_022232B8(UnkStruct_ov12_0221FCDC *param0, int param1) { return param0->unk_BC->unk_C0[param1]; } -int ov12_022232C4 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_022232C4(UnkStruct_ov12_0221FCDC *param0, int param1) { return param0->unk_BC->unk_E0[param1]; } -int ov12_022232D0 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_022232D0(UnkStruct_ov12_0221FCDC *param0, int param1) { return param0->unk_BC->unk_D8[param1]; } -int ov12_022232E0 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_022232E0(UnkStruct_ov12_0221FCDC *param0, int param1) { return param0->unk_BC->unk_E8[param1]; } -int ov12_022232EC (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_022232EC(UnkStruct_ov12_0221FCDC *param0, int param1) { return param0->unk_BC->unk_EC[param1]; } -Sprite * ov12_022232FC (UnkStruct_ov12_0221FCDC * param0, int param1) +Sprite *ov12_022232FC(UnkStruct_ov12_0221FCDC *param0, int param1) { if (param0->unk_BC->unk_C4[param1] == NULL) { return NULL; @@ -3986,27 +3971,27 @@ Sprite * ov12_022232FC (UnkStruct_ov12_0221FCDC * param0, int param1) } } -PaletteData * ov12_0222332C (UnkStruct_ov12_0221FCDC * param0) +PaletteData *ov12_0222332C(UnkStruct_ov12_0221FCDC *param0) { return param0->unk_C4; } -int ov12_02223334 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_02223334(UnkStruct_ov12_0221FCDC *param0, int param1) { return param0->unk_BC->unk_B0[param1]->unk_08; } -int ov12_02223344 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_02223344(UnkStruct_ov12_0221FCDC *param0, int param1) { return param0->unk_BC->unk_B0[param1]->unk_04; } -int ov12_02223354 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_02223354(UnkStruct_ov12_0221FCDC *param0, int param1) { return param0->unk_BC->unk_B0[param1]->unk_0C; } -BOOL ov12_02223364 (UnkStruct_ov12_0221FCDC * param0) +BOOL ov12_02223364(UnkStruct_ov12_0221FCDC *param0) { u32 v0; @@ -4014,7 +3999,7 @@ BOOL ov12_02223364 (UnkStruct_ov12_0221FCDC * param0) return (v0 != 0) ? 1 : 0; } -BOOL ov12_0222337C (UnkStruct_ov12_0221FCDC * param0, int param1) +BOOL ov12_0222337C(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; @@ -4022,7 +4007,7 @@ BOOL ov12_0222337C (UnkStruct_ov12_0221FCDC * param0, int param1) return (v0 != 0) ? 1 : 0; } -int ov12_0222339C (UnkStruct_ov12_0221FCDC * param0) +int ov12_0222339C(UnkStruct_ov12_0221FCDC *param0) { int v0; @@ -4035,12 +4020,12 @@ int ov12_0222339C (UnkStruct_ov12_0221FCDC * param0) return v0; } -int ov12_022233B0 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_022233B0(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; int v1[][3] = { - {0x1, 0x2, 0x3}, - {0x1, 0x2, 0x3} + { 0x1, 0x2, 0x3 }, + { 0x1, 0x2, 0x3 } }; if (ov12_0221FDD4(param0) == 1) { @@ -4052,12 +4037,12 @@ int ov12_022233B0 (UnkStruct_ov12_0221FCDC * param0, int param1) return v0; } -int ov12_022233EC (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_022233EC(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; int v1[][3] = { - {0x1, 0x2, 0x3}, - {0x1, 0x2, 0x3} + { 0x1, 0x2, 0x3 }, + { 0x1, 0x2, 0x3 } }; if (ov12_0221FDD4(param0) == 1) { @@ -4069,7 +4054,7 @@ int ov12_022233EC (UnkStruct_ov12_0221FCDC * param0, int param1) return v0; } -int ov12_02223428 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_02223428(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; @@ -4103,17 +4088,17 @@ int ov12_02223428 (UnkStruct_ov12_0221FCDC * param0, int param1) return v0; } -void ov12_02223460 (UnkStruct_ov12_0221FCDC * param0, int param1) +void ov12_02223460(UnkStruct_ov12_0221FCDC *param0, int param1) { sub_0201958C(param0->unk_C0, param1, param0->unk_BC->unk_110, 0x10000, 0); } -void ov12_02223488 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02223488(UnkStruct_ov12_0221FCDC *param0) { sub_02002FBC(param0->unk_C4, param0->unk_BC->unk_114, 0, 0, 0x200); } -BOOL ov12_022234A8 (UnkStruct_ov12_0221FCDC * param0, int param1) +BOOL ov12_022234A8(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; int v1; @@ -4129,76 +4114,76 @@ BOOL ov12_022234A8 (UnkStruct_ov12_0221FCDC * param0, int param1) } static const int Unk_ov12_02238928[][5] = { - {0x41, 0x123, 0x3E, 0x3F, 0x40}, - {0x41, 0x123, 0x3E, 0x3F, 0x40}, - {0x41, 0x123, 0x3E, 0x3F, 0x40}, - {0x41, 0x123, 0x3E, 0x3F, 0x40}, - {0x41, 0x123, 0x3E, 0x3F, 0x40}, - {0x41, 0x141, 0x3E, 0x3F, 0x40}, - {0x45, 0x124, 0x42, 0x43, 0x44}, - {0x45, 0x145, 0x42, 0x43, 0x44}, - {0x45, 0x148, 0x42, 0x43, 0x44}, - {0x46, 0x125, 0x47, 0x47, 0x47}, - {0x46, 0x125, 0x47, 0x47, 0x47}, - {0x46, 0x13F, 0x47, 0x47, 0x47}, - {0x46, 0x140, 0x47, 0x47, 0x47}, - {0x46, 0x147, 0x47, 0x47, 0x47}, - {0x4C, 0x126, 0x48, 0x48, 0x48}, - {0x4C, 0x128, 0x48, 0x48, 0x48}, - {0x4C, 0x130, 0x48, 0x48, 0x48}, - {0x4C, 0x138, 0x48, 0x48, 0x48}, - {0x4C, 0x130, 0x48, 0x48, 0x48}, - {0x51, 0x129, 0x52, 0x52, 0x50}, - {0x59, 0x12B, 0x56, 0x57, 0x58}, - {0x5F, 0x12D, 0x5C, 0x5D, 0x5E}, - {0x63, 0x12E, 0x60, 0x61, 0x62}, - {0x64, 0x12F, 0x65, 0x65, 0x65}, - {0x66, 0x131, 0x67, 0x67, 0x67}, - {0x69, 0x132, 0x6A, 0x6A, 0x68}, - {0x6F, 0x133, 0x6E, 0x6E, 0x6E}, - {0x6F, 0x153, 0x6E, 0x6E, 0x6E}, - {0x70, 0x134, 0x71, 0x71, 0x71}, - {0x70, 0x135, 0x71, 0x71, 0x71}, - {0x70, 0x134, 0x71, 0x71, 0x71}, - {0x77, 0x137, 0x74, 0x75, 0x76}, - {0x77, 0x137, 0x74, 0x75, 0x76}, - {0x77, 0x137, 0x74, 0x75, 0x76}, - {0x7C, 0x13B, 0x7D, 0x7D, 0x7D}, - {0x81, 0x13D, 0x82, 0x82, 0x80}, - {0x83, 0x13E, 0x84, 0x84, 0x85}, - {0x8A, 0x143, 0x88, 0x89, 0x89}, - {0x8B, 0x144, 0x8C, 0x8C, 0x8C}, - {0x8D, 0x146, 0x8E, 0x8E, 0x8E}, - {0x92, 0x149, 0x8F, 0x90, 0x91}, - {0x96, 0x14A, 0x93, 0x94, 0x95}, - {0x97, 0x14B, 0x98, 0x98, 0x98}, - {0x99, 0x14C, 0x9A, 0x9A, 0x9A}, - {0x9B, 0x14D, 0x9C, 0x9C, 0x9C}, - {0xA0, 0x14E, 0x9D, 0x9E, 0x9F}, - {0xA1, 0x14F, 0xA2, 0xA2, 0xA2}, - {0x34, 0x11E, 0x35, 0x35, 0x35}, - {0xA3, 0x150, 0xA4, 0xA5, 0xA4}, - {0xA3, 0x152, 0xA4, 0xA5, 0xA4}, - {0xA6, 0x151, 0xA8, 0xA7, 0xA7}, - {0x4E, 0x127, 0x4F, 0x4F, 0x4F}, - {0x5A, 0x12C, 0x5B, 0x5B, 0x5B}, - {0x55, 0x12A, 0x53, 0x53, 0x53}, - {0x72, 0x136, 0x73, 0x73, 0x73}, - {0x7A, 0x13A, 0x7B, 0x7B, 0x7B}, - {0x78, 0x139, 0x79, 0x79, 0x79}, - {0x86, 0x142, 0x87, 0x87, 0x87} + { 0x41, 0x123, 0x3E, 0x3F, 0x40 }, + { 0x41, 0x123, 0x3E, 0x3F, 0x40 }, + { 0x41, 0x123, 0x3E, 0x3F, 0x40 }, + { 0x41, 0x123, 0x3E, 0x3F, 0x40 }, + { 0x41, 0x123, 0x3E, 0x3F, 0x40 }, + { 0x41, 0x141, 0x3E, 0x3F, 0x40 }, + { 0x45, 0x124, 0x42, 0x43, 0x44 }, + { 0x45, 0x145, 0x42, 0x43, 0x44 }, + { 0x45, 0x148, 0x42, 0x43, 0x44 }, + { 0x46, 0x125, 0x47, 0x47, 0x47 }, + { 0x46, 0x125, 0x47, 0x47, 0x47 }, + { 0x46, 0x13F, 0x47, 0x47, 0x47 }, + { 0x46, 0x140, 0x47, 0x47, 0x47 }, + { 0x46, 0x147, 0x47, 0x47, 0x47 }, + { 0x4C, 0x126, 0x48, 0x48, 0x48 }, + { 0x4C, 0x128, 0x48, 0x48, 0x48 }, + { 0x4C, 0x130, 0x48, 0x48, 0x48 }, + { 0x4C, 0x138, 0x48, 0x48, 0x48 }, + { 0x4C, 0x130, 0x48, 0x48, 0x48 }, + { 0x51, 0x129, 0x52, 0x52, 0x50 }, + { 0x59, 0x12B, 0x56, 0x57, 0x58 }, + { 0x5F, 0x12D, 0x5C, 0x5D, 0x5E }, + { 0x63, 0x12E, 0x60, 0x61, 0x62 }, + { 0x64, 0x12F, 0x65, 0x65, 0x65 }, + { 0x66, 0x131, 0x67, 0x67, 0x67 }, + { 0x69, 0x132, 0x6A, 0x6A, 0x68 }, + { 0x6F, 0x133, 0x6E, 0x6E, 0x6E }, + { 0x6F, 0x153, 0x6E, 0x6E, 0x6E }, + { 0x70, 0x134, 0x71, 0x71, 0x71 }, + { 0x70, 0x135, 0x71, 0x71, 0x71 }, + { 0x70, 0x134, 0x71, 0x71, 0x71 }, + { 0x77, 0x137, 0x74, 0x75, 0x76 }, + { 0x77, 0x137, 0x74, 0x75, 0x76 }, + { 0x77, 0x137, 0x74, 0x75, 0x76 }, + { 0x7C, 0x13B, 0x7D, 0x7D, 0x7D }, + { 0x81, 0x13D, 0x82, 0x82, 0x80 }, + { 0x83, 0x13E, 0x84, 0x84, 0x85 }, + { 0x8A, 0x143, 0x88, 0x89, 0x89 }, + { 0x8B, 0x144, 0x8C, 0x8C, 0x8C }, + { 0x8D, 0x146, 0x8E, 0x8E, 0x8E }, + { 0x92, 0x149, 0x8F, 0x90, 0x91 }, + { 0x96, 0x14A, 0x93, 0x94, 0x95 }, + { 0x97, 0x14B, 0x98, 0x98, 0x98 }, + { 0x99, 0x14C, 0x9A, 0x9A, 0x9A }, + { 0x9B, 0x14D, 0x9C, 0x9C, 0x9C }, + { 0xA0, 0x14E, 0x9D, 0x9E, 0x9F }, + { 0xA1, 0x14F, 0xA2, 0xA2, 0xA2 }, + { 0x34, 0x11E, 0x35, 0x35, 0x35 }, + { 0xA3, 0x150, 0xA4, 0xA5, 0xA4 }, + { 0xA3, 0x152, 0xA4, 0xA5, 0xA4 }, + { 0xA6, 0x151, 0xA8, 0xA7, 0xA7 }, + { 0x4E, 0x127, 0x4F, 0x4F, 0x4F }, + { 0x5A, 0x12C, 0x5B, 0x5B, 0x5B }, + { 0x55, 0x12A, 0x53, 0x53, 0x53 }, + { 0x72, 0x136, 0x73, 0x73, 0x73 }, + { 0x7A, 0x13A, 0x7B, 0x7B, 0x7B }, + { 0x78, 0x139, 0x79, 0x79, 0x79 }, + { 0x86, 0x142, 0x87, 0x87, 0x87 } }; -int ov12_022234E4 (int param0, int param1) +int ov12_022234E4(int param0, int param1) { return Unk_ov12_02238928[param0][param1]; } -UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int param2) +UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *param0, int param1, int param2) { int v0; - int v1[] = {0, 0, 20, 10, 10, 20}; - UnkStruct_ov12_02223764 * v2; + int v1[] = { 0, 0, 20, 10, 10, 20 }; + UnkStruct_ov12_02223764 *v2; v2 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov12_02223764)); @@ -4220,7 +4205,7 @@ UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int { int v3[6]; - NARC * v4; + NARC *v4; v4 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param1); @@ -4253,9 +4238,9 @@ UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int int v5; int v6; int v7; - void * v8; + void *v8; int v9[6]; - CellActorData * v10; + CellActorData *v10; for (v5 = 0; v5 < 4; v5++) { if ((v5 != v2->unk_04) && (v2->unk_04 != 0xFF)) { @@ -4278,7 +4263,7 @@ UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int { int v11; SpriteTemplate v12; - Sprite * v13; + Sprite *v13; s16 v14, v15; v13 = v2->unk_48[v5]; @@ -4322,14 +4307,14 @@ UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int } if (v13 != NULL) { - NNSG2dImageProxy * v17; + NNSG2dImageProxy *v17; v17 = SpriteActor_ImageProxy(v10->unk_00); sub_0201DC68(NNS_GFD_DST_2D_OBJ_CHAR_MAIN, v17->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN], v8, (10 * 10 * ((8 / 2) * 8))); } if (v13 != NULL) { - NNSG2dImagePaletteProxy * v18; + NNSG2dImagePaletteProxy *v18; int v19; v18 = sub_02021F9C(v10->unk_00); @@ -4344,15 +4329,15 @@ UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int return v2; } -UnkStruct_ov12_02223764 * ov12_02223764 (BattleSystem * param0, int param1) +UnkStruct_ov12_02223764 *ov12_02223764(BattleSystem *param0, int param1) { - UnkStruct_ov12_02223764 * v0; + UnkStruct_ov12_02223764 *v0; v0 = ov12_022234F8(param0, param1, 0xFF); return v0; } -void ov12_02223770 (UnkStruct_ov12_02223764 * param0) +void ov12_02223770(UnkStruct_ov12_02223764 *param0) { int v0; @@ -4369,7 +4354,7 @@ void ov12_02223770 (UnkStruct_ov12_02223764 * param0) Heap_FreeToHeap(param0); } -void ov12_022237A4 (UnkStruct_ov12_02223764 * param0, int param1) +void ov12_022237A4(UnkStruct_ov12_02223764 *param0, int param1) { int v0; @@ -4386,7 +4371,7 @@ void ov12_022237A4 (UnkStruct_ov12_02223764 * param0, int param1) Heap_FreeToHeap(param0); } -int ov12_022237D8 (UnkStruct_ov12_02223764 * param0) +int ov12_022237D8(UnkStruct_ov12_02223764 *param0) { GF_ASSERT(param0 != NULL); return param0->unk_44[param0->unk_04]; diff --git a/src/overlay012/ov12_022237EC.c b/src/overlay012/ov12_022237EC.c index 501e77f742..dbca03f657 100644 --- a/src/overlay012/ov12_022237EC.c +++ b/src/overlay012/ov12_022237EC.c @@ -1,3 +1,5 @@ +#include "overlay012/ov12_022237EC.h" + #include #include @@ -5,17 +7,15 @@ #include "struct_decls/struct_02014014_decl.h" #include "functypes/funcptr_020146F4.h" - -#include "spl.h" - -#include "narc.h" -#include "unk_02014000.h" #include "overlay011/ov11_0221F840.h" -#include "overlay012/ov12_022237EC.h" #include "overlay012/ov12_0222389C.h" #include "overlay012/ov12_0222421C.h" -static void ov12_022237EC(UnkSPLStruct6 * param0); +#include "narc.h" +#include "spl.h" +#include "unk_02014000.h" + +static void ov12_022237EC(UnkSPLStruct6 *param0); static const UnkFuncPtr_020146F4 Unk_ov12_02238DB0[] = { ov12_022237EC, @@ -43,15 +43,15 @@ static const UnkFuncPtr_020146F4 Unk_ov12_02238DB0[] = { ov12_022238DC }; -static void ov12_022237EC (UnkSPLStruct6 * param0) +static void ov12_022237EC(UnkSPLStruct6 *param0) { return; } -UnkStruct_02014014 * ov12_022237F0 (int param0, int param1, int param2) +UnkStruct_02014014 *ov12_022237F0(int param0, int param1, int param2) { - UnkStruct_02014014 * v0; - void * v1; + UnkStruct_02014014 *v0; + void *v1; v0 = ov11_0221F840(param0); v1 = sub_020144C4(29, param1, param0); @@ -60,10 +60,10 @@ UnkStruct_02014014 * ov12_022237F0 (int param0, int param1, int param2) return v0; } -UnkStruct_02014014 * ov12_02223818 (int param0, int param1, int param2, int param3) +UnkStruct_02014014 *ov12_02223818(int param0, int param1, int param2, int param3) { - UnkStruct_02014014 * v0; - void * v1; + UnkStruct_02014014 *v0; + void *v1; v0 = ov11_0221F840(param0); v1 = sub_020144C4(param1, param2, param0); @@ -72,15 +72,15 @@ UnkStruct_02014014 * ov12_02223818 (int param0, int param1, int param2, int para return v0; } -void * ov12_02223844 (NARC * param0, int param1, int param2) +void *ov12_02223844(NARC *param0, int param1, int param2) { return NARC_AllocAndReadWholeMember(param0, param1, param2); } -UnkStruct_02014014 * ov12_0222384C (NARC * param0, int param1, int param2, int param3) +UnkStruct_02014014 *ov12_0222384C(NARC *param0, int param1, int param2, int param3) { - UnkStruct_02014014 * v0; - void * v1; + UnkStruct_02014014 *v0; + void *v1; v0 = ov11_0221F888(param1); @@ -94,12 +94,12 @@ UnkStruct_02014014 * ov12_0222384C (NARC * param0, int param1, int param2, int p return v0; } -UnkSPLStruct6 * ov12_02223880 (UnkStruct_02014014 * param0, int param1, int param2, void * param3) +UnkSPLStruct6 *ov12_02223880(UnkStruct_02014014 *param0, int param1, int param2, void *param3) { return sub_020146F4(param0, param1, Unk_ov12_02238DB0[param2], param3); } -void ov12_02223894 (UnkStruct_02014014 * param0) +void ov12_02223894(UnkStruct_02014014 *param0) { ov11_0221F8D8(param0); } diff --git a/src/overlay012/ov12_0222389C.c b/src/overlay012/ov12_0222389C.c index f54957294c..9daf27bcb6 100644 --- a/src/overlay012/ov12_0222389C.c +++ b/src/overlay012/ov12_0222389C.c @@ -1,20 +1,20 @@ +#include "overlay012/ov12_0222389C.h" + #include #include #include "struct_decls/struct_02014014_decl.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay115/camera_angle.h" +#include "camera.h" #include "spl.h" - #include "unk_02014000.h" -#include "camera.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_0222389C.h" -#include "overlay012/ov12_02235254.h" -static s8 ov12_0222389C(UnkStruct_ov12_0221FCDC * param0, int param1, int param2); +static s8 ov12_0222389C(UnkStruct_ov12_0221FCDC *param0, int param1, int param2); static const VecFx32 Unk_ov12_0223A218 = { 0x1700, @@ -28,7 +28,7 @@ static const VecFx32 Unk_ov12_0223A224 = { 0x0 }; -static s8 ov12_0222389C (UnkStruct_ov12_0221FCDC * param0, int param1, int param2) +static s8 ov12_0222389C(UnkStruct_ov12_0221FCDC *param0, int param1, int param2) { s8 v0 = 1; int v1, v2; @@ -58,15 +58,15 @@ static s8 ov12_0222389C (UnkStruct_ov12_0221FCDC * param0, int param1, int param return v0; } -void ov12_022238DC (UnkSPLStruct6 * param0) +void ov12_022238DC(UnkSPLStruct6 *param0) { return; } -void ov12_022238E0 (UnkSPLStruct6 * param0) +void ov12_022238E0(UnkSPLStruct6 *param0) { - UnkStruct_ov12_0221FCDC * v0; - UnkStruct_02014014 * v1; + UnkStruct_ov12_0221FCDC *v0; + UnkStruct_02014014 *v1; int v2, v3, v4; VecFx32 v5, v6, v7; @@ -102,7 +102,7 @@ void ov12_022238E0 (UnkSPLStruct6 * param0) { CameraAngle v11; - Camera * camera; + Camera *camera; camera = sub_02014784(v1); @@ -122,10 +122,10 @@ void ov12_022238E0 (UnkSPLStruct6 * param0) } } -void ov12_02223998 (UnkSPLStruct6 * param0) +void ov12_02223998(UnkSPLStruct6 *param0) { - UnkStruct_ov12_0221FCDC * v0; - UnkStruct_02014014 * v1; + UnkStruct_ov12_0221FCDC *v0; + UnkStruct_02014014 *v1; int v2; VecFx32 v3, v4; @@ -143,9 +143,9 @@ void ov12_02223998 (UnkSPLStruct6 * param0) sub_02014744(v1, &v4); } -void ov12_022239F4 (UnkSPLStruct6 * param0) +void ov12_022239F4(UnkSPLStruct6 *param0) { - UnkStruct_ov12_0221FCDC * v0; + UnkStruct_ov12_0221FCDC *v0; int v1; VecFx32 v2; @@ -159,9 +159,9 @@ void ov12_022239F4 (UnkSPLStruct6 * param0) SPL_UnkInline4(param0, v2.z); } -void ov12_02223A38 (UnkSPLStruct6 * param0) +void ov12_02223A38(UnkSPLStruct6 *param0) { - UnkStruct_ov12_0221FCDC * v0; + UnkStruct_ov12_0221FCDC *v0; int v1; VecFx32 v2; @@ -175,9 +175,9 @@ void ov12_02223A38 (UnkSPLStruct6 * param0) SPL_UnkInline4(param0, v2.z); } -void ov12_02223A7C (UnkSPLStruct6 * param0) +void ov12_02223A7C(UnkSPLStruct6 *param0) { - UnkStruct_ov12_0221FCDC * v0; + UnkStruct_ov12_0221FCDC *v0; int v1; int v2; VecFx32 v3; @@ -193,11 +193,11 @@ void ov12_02223A7C (UnkSPLStruct6 * param0) SPL_UnkInline4(param0, v3.z); } -void ov12_02223AC8 (UnkSPLStruct6 * param0) +void ov12_02223AC8(UnkSPLStruct6 *param0) { - UnkStruct_ov12_0221FCDC * v0; + UnkStruct_ov12_0221FCDC *v0; VecFx32 v1; - UnkStruct_02014014 * v2; + UnkStruct_02014014 *v2; int v3; int v4; int v5; @@ -222,11 +222,11 @@ void ov12_02223AC8 (UnkSPLStruct6 * param0) SPL_UnkInline4(param0, v1.z); } -void ov12_02223B30 (UnkSPLStruct6 * param0) +void ov12_02223B30(UnkSPLStruct6 *param0) { - UnkStruct_ov12_0221FCDC * v0; + UnkStruct_ov12_0221FCDC *v0; VecFx32 v1; - UnkStruct_02014014 * v2; + UnkStruct_02014014 *v2; int v3; int v4; int v5; @@ -252,9 +252,9 @@ void ov12_02223B30 (UnkSPLStruct6 * param0) SPL_UnkInline4(param0, v1.z); } -void ov12_02223B98 (UnkSPLStruct6 * param0) +void ov12_02223B98(UnkSPLStruct6 *param0) { - UnkStruct_ov12_0221FCDC * v0; + UnkStruct_ov12_0221FCDC *v0; int v1; int v2; int v3; @@ -262,22 +262,22 @@ void ov12_02223B98 (UnkSPLStruct6 * param0) int v5; int v6; VecFx32 v7; - s16 v8[6] = {0x0, 0x0, 0x0, 0x0, 0, 0}; + s16 v8[6] = { 0x0, 0x0, 0x0, 0x0, 0, 0 }; s16 v9[][6] = { - {0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF}, - {0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF}, - {0xFF, 0xFF, 0xFF, -16, 0xFF, -16}, - {0xFF, 0xFF, 0x20, 0xFF, 0x20, 0xFF}, - {0xFF, 0xFF, 0xFF, 0x10, 0xFF, 0x4}, - {0xFF, 0xFF, -16, 0xFF, 0x0, 0xFF} + { 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0xFF, -16, 0xFF, -16 }, + { 0xFF, 0xFF, 0x20, 0xFF, 0x20, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0x10, 0xFF, 0x4 }, + { 0xFF, 0xFF, -16, 0xFF, 0x0, 0xFF } }; s16 v10[][6] = { - {0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF}, - {0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF}, - {0xFF, 0xFF, 0xFF, 0x10, 0xFF, 0x10}, - {0xFF, 0xFF, 0x0, 0xFF, 0x0, 0xFF}, - {0xFF, 0xFF, 0xFF, 0x0, 0xFF, 0x0}, - {0xFF, 0xFF, 0x18, 0xFF, 0x18, 0xFF} + { 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0x0, 0x0, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0x10, 0xFF, 0x10 }, + { 0xFF, 0xFF, 0x0, 0xFF, 0x0, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0x0, 0xFF, 0x0 }, + { 0xFF, 0xFF, 0x18, 0xFF, 0x18, 0xFF } }; v0 = sub_02014764(); @@ -295,11 +295,11 @@ void ov12_02223B98 (UnkSPLStruct6 * param0) SPL_UnkInline4(param0, v7.z); } -static void ov12_02223C40 (int param0, s8 param1, VecFx32 * param2) +static void ov12_02223C40(int param0, s8 param1, VecFx32 *param2) { - fx32 * v0 = &(param2->x); - fx32 * v1 = &(param2->y); - fx32 * v2 = &(param2->z); + fx32 *v0 = &(param2->x); + fx32 *v1 = &(param2->y); + fx32 *v2 = &(param2->z); switch (param0) { case 0: @@ -333,9 +333,9 @@ static void ov12_02223C40 (int param0, s8 param1, VecFx32 * param2) } } -static void ov12_02223CD4 (UnkStruct_ov12_0221FCDC * param0, UnkSPLStruct6 * param1, int param2, int param3, int param4, s8 param5, VecFx32 * param6) +static void ov12_02223CD4(UnkStruct_ov12_0221FCDC *param0, UnkSPLStruct6 *param1, int param2, int param3, int param4, s8 param5, VecFx32 *param6) { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; switch (param4) { case 0: @@ -357,15 +357,13 @@ static void ov12_02223CD4 (UnkStruct_ov12_0221FCDC * param0, UnkSPLStruct6 * par case 4: ov12_02235508(param0, param2, &v0); break; - case 5: - { - int v1[4] = {0, 0, 0, 0}; + case 5: { + int v1[4] = { 0, 0, 0, 0 }; ov12_0222325C(param0, v1, 4); VEC_Set(&v0, v1[0], v1[1], v1[2]); ov12_02223C40(v1[3], param5, &v0); - } - break; + } break; } v0.x -= param6->x; @@ -375,9 +373,9 @@ static void ov12_02223CD4 (UnkStruct_ov12_0221FCDC * param0, UnkSPLStruct6 * par sub_02014970(param1, &v0); } -static void ov12_02223DA4 (UnkStruct_ov12_0221FCDC * param0, UnkSPLStruct6 * param1, int param2, int param3, int param4, s8 param5, VecFx32 * param6) +static void ov12_02223DA4(UnkStruct_ov12_0221FCDC *param0, UnkSPLStruct6 *param1, int param2, int param3, int param4, s8 param5, VecFx32 *param6) { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; switch (param4) { case 0: @@ -399,15 +397,13 @@ static void ov12_02223DA4 (UnkStruct_ov12_0221FCDC * param0, UnkSPLStruct6 * par case 4: ov12_02235508(param0, param2, &v0); break; - case 5: - { - int v1[4] = {0, 0, 0, 0}; + case 5: { + int v1[4] = { 0, 0, 0, 0 }; ov12_0222325C(param0, v1, 4); VEC_Set(&v0, v1[0], v1[1], v1[2]); ov12_02223C40(v1[3], param5, &v0); - } - break; + } break; } v0.x -= param6->x; @@ -417,9 +413,9 @@ static void ov12_02223DA4 (UnkStruct_ov12_0221FCDC * param0, UnkSPLStruct6 * par sub_02014890(param1, &v0); } -static void ov12_02223E74 (UnkStruct_ov12_0221FCDC * param0, UnkSPLStruct6 * param1, int param2, int param3, int param4, int param5) +static void ov12_02223E74(UnkStruct_ov12_0221FCDC *param0, UnkSPLStruct6 *param1, int param2, int param3, int param4, int param5) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; VecFx32 v1; int v2, v3; VecFx16 v4; @@ -495,7 +491,7 @@ static void ov12_02223E74 (UnkStruct_ov12_0221FCDC * param0, UnkSPLStruct6 * par v5 = ov12_0222389C(param0, param2, param3); { - int v13[3] = {0, 0, 0}; + int v13[3] = { 0, 0, 0 }; VecFx32 v14; ov12_0222325C(param0, v13, 3); @@ -540,10 +536,10 @@ static void ov12_02223E74 (UnkStruct_ov12_0221FCDC * param0, UnkSPLStruct6 * par SPL_UnkInline5(param1, &v4); } -static void ov12_02224138 (UnkSPLStruct6 * param0, int param1, int param2) +static void ov12_02224138(UnkSPLStruct6 *param0, int param1, int param2) { int v0, v1; - UnkStruct_ov12_0221FCDC * v2; + UnkStruct_ov12_0221FCDC *v2; v2 = sub_02014764(); v0 = ov12_02220240(v2); @@ -552,65 +548,65 @@ static void ov12_02224138 (UnkSPLStruct6 * param0, int param1, int param2) ov12_02223E74(v2, param0, v0, v1, param1, param2); } -void ov12_02224168 (UnkSPLStruct6 * param0) +void ov12_02224168(UnkSPLStruct6 *param0) { ov12_02224138(param0, 0, 0); } -void ov12_02224174 (UnkSPLStruct6 * param0) +void ov12_02224174(UnkSPLStruct6 *param0) { ov12_02224138(param0, 1, 1); } -void ov12_02224180 (UnkSPLStruct6 * param0) +void ov12_02224180(UnkSPLStruct6 *param0) { ov12_02224138(param0, 1, 2); } -void ov12_0222418C (UnkSPLStruct6 * param0) +void ov12_0222418C(UnkSPLStruct6 *param0) { ov12_02224138(param0, 1, 3); } -void ov12_02224198 (UnkSPLStruct6 * param0) +void ov12_02224198(UnkSPLStruct6 *param0) { ov12_02224138(param0, 1, 4); } -void ov12_022241A4 (UnkSPLStruct6 * param0) +void ov12_022241A4(UnkSPLStruct6 *param0) { ov12_02224138(param0, 1, 5); } -void ov12_022241B0 (UnkSPLStruct6 * param0) +void ov12_022241B0(UnkSPLStruct6 *param0) { ov12_02224138(param0, 2, 1); } -void ov12_022241BC (UnkSPLStruct6 * param0) +void ov12_022241BC(UnkSPLStruct6 *param0) { ov12_02224138(param0, 2, 2); } -void ov12_022241C8 (UnkSPLStruct6 * param0) +void ov12_022241C8(UnkSPLStruct6 *param0) { ov12_02224138(param0, 2, 3); } -void ov12_022241D4 (UnkSPLStruct6 * param0) +void ov12_022241D4(UnkSPLStruct6 *param0) { ov12_02224138(param0, 2, 4); } -void ov12_022241E0 (UnkSPLStruct6 * param0) +void ov12_022241E0(UnkSPLStruct6 *param0) { ov12_02224138(param0, 2, 5); } -void ov12_022241EC (UnkSPLStruct6 * param0) +void ov12_022241EC(UnkSPLStruct6 *param0) { int v0, v1; - UnkStruct_ov12_0221FCDC * v2; + UnkStruct_ov12_0221FCDC *v2; v2 = sub_02014764(); v0 = ov12_02220240(v2); diff --git a/src/overlay012/ov12_0222421C.c b/src/overlay012/ov12_0222421C.c index 96e4ab0c91..5fc50a03d6 100644 --- a/src/overlay012/ov12_0222421C.c +++ b/src/overlay012/ov12_0222421C.c @@ -1,22 +1,21 @@ +#include "overlay012/ov12_0222421C.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_02014014_decl.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" - -#include "overlay012/struct_ov12_02225640.h" -#include "spl.h" - -#include "unk_02014000.h" -#include "heap.h" #include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_0222421C.h" #include "overlay012/ov12_02225104.h" #include "overlay012/ov12_02225640.h" #include "overlay012/ov12_02235254.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" +#include "overlay012/struct_ov12_02225640.h" + +#include "heap.h" +#include "inlines.h" +#include "spl.h" +#include "unk_02014000.h" typedef struct { int unk_00; @@ -24,16 +23,16 @@ typedef struct { int unk_08; } UnkStruct_ov12_022396AC; -static void ov12_0222421C(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static void ov12_022242E0(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static void ov12_02224614(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static void ov12_02224E74(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static void ov12_02224EA8(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static void ov12_02224EB8(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static void ov12_02225008(UnkStruct_ov12_02225640 * param0, int param1, VecFx32 * param2); -static void ov12_02225094(UnkStruct_ov12_02225640 * param0, VecFx32 * param1); +static void ov12_0222421C(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static void ov12_022242E0(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static void ov12_02224614(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static void ov12_02224E74(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static void ov12_02224EA8(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static void ov12_02224EB8(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static void ov12_02225008(UnkStruct_ov12_02225640 *param0, int param1, VecFx32 *param2); +static void ov12_02225094(UnkStruct_ov12_02225640 *param0, VecFx32 *param1); -static void ov12_0222421C (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static void ov12_0222421C(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { if (param1->unk_0C[2] != 0) { ov12_022242E0(param0, param1); @@ -54,10 +53,10 @@ static void ov12_0222421C (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } } -static void ov12_02224260 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1, VecFx32 * param2) +static void ov12_02224260(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1, VecFx32 *param2) { - UnkStruct_ov12_0221FCDC * v0; - UnkStruct_02014014 * v1; + UnkStruct_ov12_0221FCDC *v0; + UnkStruct_02014014 *v1; int v2; int v3; int v4; @@ -79,10 +78,10 @@ static void ov12_02224260 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par ov12_02235448(v3, param2, ov12_0221FDD4(v0), v2); } -static void ov12_022242A0 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1, VecFx32 * param2) +static void ov12_022242A0(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1, VecFx32 *param2) { - UnkStruct_ov12_0221FCDC * v0; - UnkStruct_02014014 * v1; + UnkStruct_ov12_0221FCDC *v0; + UnkStruct_02014014 *v1; int v2; int v3; int v4; @@ -104,7 +103,7 @@ static void ov12_022242A0 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par ov12_02235448(v4, param2, ov12_0221FDD4(v0), v3); } -static void ov12_022242E0 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static void ov12_022242E0(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { VecFx32 v0; @@ -177,8 +176,7 @@ static void ov12_022242E0 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par case 9: ov12_02235718(param1->unk_00, param1->unk_28, &v0); break; - case 3: - { + case 3: { int v1[3 + 1]; ov12_0222325C(param1->unk_00, v1, 3 + 1); @@ -191,8 +189,7 @@ static void ov12_022242E0 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par v0.x *= param1->unk_08; v0.y *= param1->unk_08; - } - break; + } break; case 4: ov12_02235508(param1->unk_00, param1->unk_24, &v0); ov12_02225094(param1, &v0); @@ -227,33 +224,30 @@ static void ov12_022242E0 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par ov12_02235508(param1->unk_00, param1->unk_24, &v0); break; - case 31: - { + case 31: { int v2; int v3[][2] = { - {-5760, -4352}, - {9488, -1984}, - {-11760, 3280}, - {13768, -1464}, - {-5376, -2808}, - {6984, 2056} + { -5760, -4352 }, + { 9488, -1984 }, + { -11760, 3280 }, + { 13768, -1464 }, + { -5376, -2808 }, + { 6984, 2056 } }; v2 = ov12_02235254(param1->unk_00, param1->unk_24); VEC_Set(&v0, v3[v2][0], v3[v2][1], 0); - } - break; - case 30: - { + } break; + case 30: { int v4; int v5[][2] = { - {-11020, -3488}, - {10880, 7656}, - {-15060, -3160}, - {15000, 7240}, - {-8224, -4608}, - {8424, 8896}, - {15000, -2752}, + { -11020, -3488 }, + { 10880, 7656 }, + { -15060, -3160 }, + { 15000, 7240 }, + { -8224, -4608 }, + { 8424, 8896 }, + { 15000, -2752 }, }; if (ov12_0221FDD4(param1->unk_00) == 1) { @@ -263,19 +257,17 @@ static void ov12_022242E0 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } VEC_Set(&v0, v5[v4][0], v5[v4][1], 0); - } - break; - case 32: - { + } break; + case 32: { int v6; int v7[][2] = { - {-4608, -4480}, - {7624, 2248}, - {-9024, -3018}, - {13056, 2816}, - {-2432, -4800}, - {6208, 3840}, - {7072, -3648} + { -4608, -4480 }, + { 7624, 2248 }, + { -9024, -3018 }, + { 13056, 2816 }, + { -2432, -4800 }, + { 6208, 3840 }, + { 7072, -3648 } }; if (ov12_0221FDD4(param1->unk_00) == 1) { @@ -285,8 +277,7 @@ static void ov12_022242E0 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } VEC_Set(&v0, v7[v6][0], v7[v6][1], 0); - } - break; + } break; } param1->unk_2C = v0; @@ -305,7 +296,7 @@ static const UnkStruct_ov12_022396AC Unk_ov12_0223934C[6][6]; static const UnkStruct_ov12_022396AC Unk_ov12_02239A0C[6][6]; static const UnkStruct_ov12_022396AC Unk_ov12_02239BBC[6][6]; -static void ov12_02224614 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static void ov12_02224614(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { int v0; int v1; @@ -417,8 +408,7 @@ static void ov12_02224614 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } break; case 6: - case 7: - { + case 7: { int v3; int v4[4]; int v5[4]; @@ -428,16 +418,54 @@ static void ov12_02224614 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par int v9[4]; int v10[4]; int v11[7][4] = { - {3176, 1960, -296, 0, }, - {3232, 1600, 1568, 0, }, - {5984, 2496, 6208, 0, }, - {2688, 1408, 1536, 0, }, - {-896, 384, 800, 0, }, - {2336, 1440, 736, 0, }, - {1888, 1856, 1760, 0, }, + { + 3176, + 1960, + -296, + 0, + }, + { + 3232, + 1600, + 1568, + 0, + }, + { + 5984, + 2496, + 6208, + 0, + }, + { + 2688, + 1408, + 1536, + 0, + }, + { + -896, + 384, + 800, + 0, + }, + { + 2336, + 1440, + 736, + 0, + }, + { + 1888, + 1856, + 1760, + 0, + }, }; int v12[4] = { - -2336, 1440, 736, 0, + -2336, + 1440, + 736, + 0, }; for (v3 = 0; v3 < 4; v3++) { @@ -535,8 +563,7 @@ static void ov12_02224614 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } break; } - } - break; + } break; case 3: VEC_Fx16Set(&v2, -800, 1200, 500); break; @@ -553,28 +580,26 @@ static void ov12_02224614 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par VEC_Fx16Set(&v2, -6000, -2200, 0); } break; - case 24: - { + case 24: { int v13; int v14[][2] = { - {2864, 3752}, - {-2944, 1456}, - {2840, -854}, - {-3760, -2536}, - {2288, 2408}, - {-3312, -2776}, + { 2864, 3752 }, + { -2944, 1456 }, + { 2840, -854 }, + { -3760, -2536 }, + { 2288, 2408 }, + { -3312, -2776 }, }; v13 = ov12_02235254(param1->unk_00, param1->unk_24); VEC_Fx16Set(&v2, v14[v13][0], v14[v13][1], 0); - } - break; + } break; } SPL_UnkInline5(param0, &v2); } -static void ov12_02224E74 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static void ov12_02224E74(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { int v0; int v1; @@ -593,12 +618,12 @@ static void ov12_02224E74 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } } -static void ov12_02224EA8 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static void ov12_02224EA8(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { ov12_0222584C(param1->unk_0C[5], param0, param1); } -static void ov12_02224EB8 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static void ov12_02224EB8(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { fx32 v0; int v1; @@ -645,10 +670,10 @@ static void ov12_02224EB8 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par SPL_UnkInline4(param0, v0); } -void ov12_02224F14 (UnkSPLStruct6 * param0) +void ov12_02224F14(UnkSPLStruct6 *param0) { - UnkStruct_ov12_0221FCDC * v0; - UnkStruct_ov12_02225640 * v1; + UnkStruct_ov12_0221FCDC *v0; + UnkStruct_ov12_02225640 *v1; v0 = sub_02014764(); v1 = Heap_AllocFromHeap(ov12_0221FDE4(v0), sizeof(UnkStruct_ov12_02225640)); @@ -688,7 +713,7 @@ void ov12_02224F14 (UnkSPLStruct6 * param0) Heap_FreeToHeap(v1); } -s8 ov12_02224FC4 (UnkStruct_ov12_02225640 * param0) +s8 ov12_02224FC4(UnkStruct_ov12_02225640 *param0) { s8 v0 = 1; int v1, v2; @@ -718,10 +743,10 @@ s8 ov12_02224FC4 (UnkStruct_ov12_02225640 * param0) return v0; } -static void ov12_02225008 (UnkStruct_ov12_02225640 * param0, int param1, VecFx32 * param2) +static void ov12_02225008(UnkStruct_ov12_02225640 *param0, int param1, VecFx32 *param2) { int v0; - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; int v2[4]; int v3[4]; @@ -749,10 +774,10 @@ static void ov12_02225008 (UnkStruct_ov12_02225640 * param0, int param1, VecFx32 (*param2).z += v1.z; } -static void ov12_02225094 (UnkStruct_ov12_02225640 * param0, VecFx32 * param1) +static void ov12_02225094(UnkStruct_ov12_02225640 *param0, VecFx32 *param1) { int v0[3 + 1]; - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; ov12_0222325C(param0->unk_00, v0, 3 + 1); param0->unk_08 = ov12_02224FC4(param0); @@ -773,408 +798,408 @@ static void ov12_02225094 (UnkStruct_ov12_02225640 * param0, VecFx32 * param1) static const UnkStruct_ov12_022396AC Unk_ov12_022396AC[][6] = { { - {0x0, 0x0, 0x0}, - {0xEC0, 0x840, 0xBF8}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0xEC0, 0x840, 0xBF8 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {-4228, -2728, 0xBF8}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { -4228, -2728, 0xBF8 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x1762, 0x630, 0xBF8}, - {0x410, -600, 0x0}, - {0x10D0, 0x9E8, 0xBF8} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x1762, 0x630, 0xBF8 }, + { 0x410, -600, 0x0 }, + { 0x10D0, 0x9E8, 0xBF8 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-6480, -2040, 0xBF8}, - {0x0, 0x0, 0x0}, - {-4384, -2968, 0xBF8}, - {-832, 0xE0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -6480, -2040, 0xBF8 }, + { 0x0, 0x0, 0x0 }, + { -4384, -2968, 0xBF8 }, + { -832, 0xE0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-2008, 0x178, 0x0}, - {0xFC2, 0xA88, 0xBF8}, - {0x0, 0x0, 0x0}, - {0xC14, 0xBDC, 0xBF8} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -2008, 0x178, 0x0 }, + { 0xFC2, 0xA88, 0xBF8 }, + { 0x0, 0x0, 0x0 }, + { 0xC14, 0xBDC, 0xBF8 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-4760, -2672, 0xBF8}, - {0x6C0, -400, 0x0}, - {-3472, -4648, 0xBF8}, - {0x0, 0x0, 0x0} - } + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -4760, -2672, 0xBF8 }, + { 0x6C0, -400, 0x0 }, + { -3472, -4648, 0xBF8 }, + { 0x0, 0x0, 0x0 }, + }, }; static const UnkStruct_ov12_022396AC Unk_ov12_02238FEC[][6] = { { - {0x0, 0x0, 0x0}, - {0x968, 0x4E0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x968, 0x4E0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {-1544, -936, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { -1544, -936, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x798, 0x150, 0x0}, - {0x238, -560, 0x0}, - {0x798, 0x3A0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x798, 0x150, 0x0 }, + { 0x238, -560, 0x0 }, + { 0x798, 0x3A0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-2424, -816, 0x0}, - {0x0, 0x0, 0x0}, - {-2424, -1024, 0x0}, - {-872, 0x8, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -2424, -816, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -2424, -1024, 0x0 }, + { -872, 0x8, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-1432, 0x78, 0x0}, - {0x5D8, 0x308, 0x0}, - {0x0, 0x0, 0x0}, - {0x5D8, 0x4B8, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1432, 0x78, 0x0 }, + { 0x5D8, 0x308, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x5D8, 0x4B8, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-1920, -824, 0x0}, - {0x2A0, 0x8, 0x0}, - {-1920, -1076, 0x0}, - {0x0, 0x0, 0x0} - } + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1920, -824, 0x0 }, + { 0x2A0, 0x8, 0x0 }, + { -1920, -1076, 0x0 }, + { 0x0, 0x0, 0x0 }, + }, }; static const UnkStruct_ov12_022396AC Unk_ov12_0223919C[][6] = { { - {0x0, 0x0, 0x0}, - {0x580, 0x2E0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x580, 0x2E0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {-1208, -784, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { -1208, -784, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x7F8, 0x2A0, 0x0}, - {0x3A0, -616, 0x0}, - {0x6E0, 0x310, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x7F8, 0x2A0, 0x0 }, + { 0x3A0, -616, 0x0 }, + { 0x6E0, 0x310, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-1816, -664, 0x0}, - {0x0, 0x0, 0x0}, - {-1440, -928, 0x0}, - {-680, 0x8, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1816, -664, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1440, -928, 0x0 }, + { -680, 0x8, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-1032, 0x8, 0x0}, - {0x500, 0x2A0, 0x0}, - {0x0, 0x0, 0x0}, - {0x438, 0x408, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1032, 0x8, 0x0 }, + { 0x500, 0x2A0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x438, 0x408, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-1648, -480, 0x0}, - {0x318, 0x8, 0x0}, - {-960, -928, 0x0}, - {0x0, 0x0, 0x0} - } + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1648, -480, 0x0 }, + { 0x318, 0x8, 0x0 }, + { -960, -928, 0x0 }, + { 0x0, 0x0, 0x0 }, + }, }; static const UnkStruct_ov12_022396AC Unk_ov12_022394FC[][6] = { { - {0x0, 0x0, 0x0}, - {0x9E0, 0x634, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x9E0, 0x634, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {-4264, -5056, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { -4264, -5056, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0xF58, 0x458, 0x0}, - {0x2C0, -672, 0x0}, - {0xAE0, 0x460, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0xF58, 0x458, 0x0 }, + { 0x2C0, -672, 0x0 }, + { 0xAE0, 0x460, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-4152, -1560, 0x0}, - {0x0, 0x0, 0x0}, - {-3096, -1976, 0x0}, - {-692, -24, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -4152, -1560, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -3096, -1976, 0x0 }, + { -692, -24, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-792, 0x68, 0x0}, - {0xB08, 0x650, 0x0}, - {0x0, 0x0, 0x0}, - {0x860, 0x790, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -792, 0x68, 0x0 }, + { 0xB08, 0x650, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x860, 0x790, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-2904, -1528, 0x0}, - {0x468, -408, 0x0}, - {-1912, -2072, 0x0}, - {0x0, 0x0, 0x0} - } + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -2904, -1528, 0x0 }, + { 0x468, -408, 0x0 }, + { -1912, -2072, 0x0 }, + { 0x0, 0x0, 0x0 }, + }, }; static const UnkStruct_ov12_022396AC Unk_ov12_0223985C[][6] = { { - {0x0, 0x0, 0x0}, - {0x7A0, 0x448, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x7A0, 0x448, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {-2016, -968, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { -2016, -968, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x780, 0x300, 0x0}, - {0x340, -448, 0x0}, - {0x6C0, 0x340, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x780, 0x300, 0x0 }, + { 0x340, -448, 0x0 }, + { 0x6C0, 0x340, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-2096, -744, 0x0}, - {0x0, 0x0, 0x0}, - {-2096, -1240, 0x0}, - {-752, 0x18, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -2096, -744, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -2096, -1240, 0x0 }, + { -752, 0x18, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-1008, 0xA8, 0x0}, - {0x6D0, 0x368, 0x0}, - {0x0, 0x0, 0x0}, - {0x5D8, 0x4D8, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1008, 0xA8, 0x0 }, + { 0x6D0, 0x368, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x5D8, 0x4D8, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-1980, -712, 0x0}, - {0x278, -200, 0x0}, - {-1680, -1656, 0x0}, - {0x0, 0x0, 0x0} - } + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1980, -712, 0x0 }, + { 0x278, -200, 0x0 }, + { -1680, -1656, 0x0 }, + { 0x0, 0x0, 0x0 }, + }, }; static const UnkStruct_ov12_022396AC Unk_ov12_0223934C[][6] = { { - {0x0, 0x0, 0x0}, - {0xC80, 0x6B8, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0xC80, 0x6B8, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {-3520, -1976, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { -3520, -1976, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0xDE8, 0x3C8, 0x0}, - {0x640, -1472, 0x0}, - {0xCC0, 0x610, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0xDE8, 0x3C8, 0x0 }, + { 0x640, -1472, 0x0 }, + { 0xCC0, 0x610, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-4000, -784, 0x0}, - {0x0, 0x0, 0x0}, - {-3232, -2256, 0x0}, - {-1248, 0x230, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -4000, -784, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -3232, -2256, 0x0 }, + { -1248, 0x230, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-1080, 0x4D8, 0x0}, - {0xC48, 0x798, 0x0}, - {0x0, 0x0, 0x0}, - {0x848, 0x920, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1080, 0x4D8, 0x0 }, + { 0xC48, 0x798, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x848, 0x920, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-2992, -1440, 0x0}, - {0x760, -592, 0x0}, - {-2592, -2704, 0x0}, - {0x0, 0x0, 0x0} - } + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -2992, -1440, 0x0 }, + { 0x760, -592, 0x0 }, + { -2592, -2704, 0x0 }, + { 0x0, 0x0, 0x0 }, + }, }; static const UnkStruct_ov12_022396AC Unk_ov12_02239A0C[][6] = { { - {0x0, 0x0, 0x0}, - {0x640, -64, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x640, -64, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {-1856, -1608, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { -1856, -1608, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x7D0, -192, 0x0}, - {0x2A0, -1328, 0x0}, - {0x7D0, 0xC0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x7D0, -192, 0x0 }, + { 0x2A0, -1328, 0x0 }, + { 0x7D0, 0xC0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-2184, -1536, 0x0}, - {0x0, 0x0, 0x0}, - {-2064, -1880, 0x0}, - {-592, -792, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -2184, -1536, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -2064, -1880, 0x0 }, + { -592, -792, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-1288, -128, 0x0}, - {0x5F8, -448, 0x0}, - {0x0, 0x0, 0x0}, - {0x5F8, 0x128, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1288, -128, 0x0 }, + { 0x5F8, -448, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x5F8, 0x128, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-1528, -1560, 0x0}, - {0x358, -368, 0x0}, - {-1384, -2032, 0x0}, - {0x0, 0x0, 0x0} - } + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -1528, -1560, 0x0 }, + { 0x358, -368, 0x0 }, + { -1384, -2032, 0x0 }, + { 0x0, 0x0, 0x0 }, + }, }; static const UnkStruct_ov12_022396AC Unk_ov12_02239BBC[][6] = { { - {0x0, 0x0, 0x0}, - {0xE00, 0x800, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0xE00, 0x800, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {-3392, -1776, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0} + { -3392, -1776, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {0x1380, 0x7F0, 0x0}, - {0x400, -688, 0x0}, - {0xEC0, 0x7B0, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x1380, 0x7F0, 0x0 }, + { 0x400, -688, 0x0 }, + { 0xEC0, 0x7B0, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-5544, -1592, 0x0}, - {0x0, 0x0, 0x0}, - {-3752, -2232, 0x0}, - {-1704, 0x108, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -5544, -1592, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -3752, -2232, 0x0 }, + { -1704, 0x108, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-2008, -64, 0x0}, - {0xFF8, 0x930, 0x0}, - {0x0, 0x0, 0x0}, - {0xA54, 0x970, 0x0} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -2008, -64, 0x0 }, + { 0xFF8, 0x930, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0xA54, 0x970, 0x0 }, }, { - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - {-3784, -1936, 0x0}, - {0x6F8, -16, 0x0}, - {-3240, -2744, 0x0}, - {0x0, 0x0, 0x0} - } + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { -3784, -1936, 0x0 }, + { 0x6F8, -16, 0x0 }, + { -3240, -2744, 0x0 }, + { 0x0, 0x0, 0x0 }, + }, }; diff --git a/src/overlay012/ov12_02225104.c b/src/overlay012/ov12_02225104.c index 3095e25527..2ed4c16766 100644 --- a/src/overlay012/ov12_02225104.c +++ b/src/overlay012/ov12_02225104.c @@ -1,33 +1,33 @@ +#include "overlay012/ov12_02225104.h" + #include #include +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_0222421C.h" +#include "overlay012/ov12_02235254.h" #include "overlay012/struct_ov12_02225640.h" #include "spl.h" - #include "unk_02014000.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_0222421C.h" -#include "overlay012/ov12_02225104.h" -#include "overlay012/ov12_02235254.h" -static void ov12_02225104(UnkStruct_ov12_02225640 * param0, int param1[]); -static BOOL ov12_02225110(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225114(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_022251F8(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_022251FC(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225200(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_022252C8(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_0222534C(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_022253CC(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225434(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225438(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_0222543C(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225440(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225444(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225550(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); - -static BOOL(*const Unk_ov12_02239D6C[])(UnkSPLStruct6 *, UnkStruct_ov12_02225640 *) = { +static void ov12_02225104(UnkStruct_ov12_02225640 *param0, int param1[]); +static BOOL ov12_02225110(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225114(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_022251F8(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_022251FC(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225200(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_022252C8(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_0222534C(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_022253CC(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225434(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225438(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_0222543C(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225440(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225444(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225550(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); + +static BOOL (*const Unk_ov12_02239D6C[])(UnkSPLStruct6 *, UnkStruct_ov12_02225640 *) = { ov12_02225110, ov12_02225114, ov12_022251F8, @@ -44,20 +44,20 @@ static BOOL(*const Unk_ov12_02239D6C[])(UnkSPLStruct6 *, UnkStruct_ov12_02225640 ov12_02225550 }; -static void ov12_02225104 (UnkStruct_ov12_02225640 * param0, int param1[]) +static void ov12_02225104(UnkStruct_ov12_02225640 *param0, int param1[]) { ov12_0222325C(param0->unk_00, param1, 5); } -static BOOL ov12_02225110 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225110(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { return 1; } -static BOOL ov12_02225114 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225114(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { int v0[5]; - VecFx16 v1 = {0, 0, 0}; + VecFx16 v1 = { 0, 0, 0 }; ov12_02225104(param1, v0); param1->unk_08 = ov12_02224FC4(param1); @@ -67,16 +67,13 @@ static BOOL ov12_02225114 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } switch (v0[0]) { - case 0: - { + case 0: { sub_02014874(param0, &v1); v1.x *= param1->unk_08; v1.y *= param1->unk_08; v1.z *= param1->unk_08; - } - break; - case 1: - { + } break; + case 1: { VEC_Fx16Set(&v1, v0[2], v0[3], v0[4]); v1.x *= param1->unk_08; @@ -86,8 +83,7 @@ static BOOL ov12_02225114 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par sub_02014874(param0, &v1); return 1; - } - break; + } break; case 2: case 3: case 0xFF: @@ -102,20 +98,20 @@ static BOOL ov12_02225114 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_022251F8 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_022251F8(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { return 1; } -static BOOL ov12_022251FC (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_022251FC(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { return 1; } -static BOOL ov12_02225200 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225200(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { int v0[5]; - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; ov12_02225104(param1, v0); param1->unk_08 = ov12_02224FC4(param1); @@ -125,24 +121,20 @@ static BOOL ov12_02225200 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } switch (v0[0]) { - case 0: - { + case 0: { sub_020148A8(param0, &v1); v1.x *= param1->unk_08; v1.y *= param1->unk_08; v1.z *= param1->unk_08; - } - break; - case 1: - { + } break; + case 1: { VEC_Set(&v1, v0[2], v0[3], v0[4]); v1.x *= param1->unk_08; v1.y *= param1->unk_08; v1.z *= param1->unk_08; - } - break; + } break; case 2: ov12_02235508(param1->unk_00, param1->unk_24, &v1); break; @@ -160,7 +152,7 @@ static BOOL ov12_02225200 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_022252C8 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_022252C8(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { int v0[5]; fx16 v1 = 0; @@ -173,18 +165,14 @@ static BOOL ov12_022252C8 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } switch (v0[0]) { - case 0: - { + case 0: { sub_020148F4(param0, &v1); v1 *= param1->unk_08; - } - break; - case 1: - { + } break; + case 1: { v1 = v0[2]; v1 *= param1->unk_08; - } - break; + } break; case 2: case 3: case 0xFF: @@ -195,7 +183,7 @@ static BOOL ov12_022252C8 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_0222534C (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_0222534C(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { int v0[5]; u16 v1 = 0; @@ -208,18 +196,14 @@ static BOOL ov12_0222534C (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } switch (v0[0]) { - case 0: - { + case 0: { sub_02014924(param0, &v1); v1 *= param1->unk_08; - } - break; - case 1: - { + } break; + case 1: { v1 = v0[2]; v1 *= param1->unk_08; - } - break; + } break; case 2: case 3: case 0xFF: @@ -230,7 +214,7 @@ static BOOL ov12_0222534C (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_022253CC (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_022253CC(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { int v0[5]; u16 v1 = 0; @@ -243,16 +227,12 @@ static BOOL ov12_022253CC (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } switch (v0[0]) { - case 0: - { + case 0: { sub_02014954(param0, &v1); - } - break; - case 1: - { + } break; + case 1: { v1 = v0[2]; - } - break; + } break; case 2: case 3: case 0xFF: @@ -263,30 +243,30 @@ static BOOL ov12_022253CC (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_02225434 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225434(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { return 1; } -static BOOL ov12_02225438 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225438(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { return 1; } -static BOOL ov12_0222543C (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_0222543C(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { return 1; } -static BOOL ov12_02225440 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225440(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { return 1; } -static BOOL ov12_02225444 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225444(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { int v0[5]; - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; ov12_02225104(param1, v0); param1->unk_08 = ov12_02224FC4(param1); @@ -296,23 +276,19 @@ static BOOL ov12_02225444 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } switch (v0[0]) { - case 0: - { + case 0: { sub_02014988(param0, &v1); v1.x *= param1->unk_08; v1.y *= param1->unk_08; v1.z *= param1->unk_08; - } - break; - case 1: - { + } break; + case 1: { VEC_Set(&v1, v0[2], v0[3], v0[4]); v1.x *= param1->unk_08; v1.y *= param1->unk_08; v1.z *= param1->unk_08; - } - break; + } break; case 4: ov12_02235508(param1->unk_00, param1->unk_28, &v1); @@ -338,7 +314,7 @@ static BOOL ov12_02225444 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_02225550 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225550(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { int v0[5]; fx16 v1 = 0; @@ -351,18 +327,14 @@ static BOOL ov12_02225550 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par } switch (v0[0]) { - case 0: - { + case 0: { sub_020149D4(param0, &v1); v1 *= param1->unk_08; - } - break; - case 1: - { + } break; + case 1: { v1 = v0[2]; v1 *= param1->unk_08; - } - break; + } break; case 2: case 3: case 0xFF: @@ -373,7 +345,7 @@ static BOOL ov12_02225550 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -void ov12_022255D4 (int param0, UnkSPLStruct6 * param1, UnkStruct_ov12_02225640 * param2) +void ov12_022255D4(int param0, UnkSPLStruct6 *param1, UnkStruct_ov12_02225640 *param2) { BOOL v0; @@ -384,7 +356,7 @@ void ov12_022255D4 (int param0, UnkSPLStruct6 * param1, UnkStruct_ov12_02225640 } } -int ov12_022255EC (int param0) +int ov12_022255EC(int param0) { const int v0[] = { 0x0, @@ -407,7 +379,7 @@ int ov12_022255EC (int param0) return v0[param0]; } -int ov12_02225614 (void) +int ov12_02225614(void) { int v0 = 0; int v1 = 0; diff --git a/src/overlay012/ov12_02225640.c b/src/overlay012/ov12_02225640.c index fad9167764..e86ccfd566 100644 --- a/src/overlay012/ov12_02225640.c +++ b/src/overlay012/ov12_02225640.c @@ -1,29 +1,29 @@ +#include "overlay012/ov12_02225640.h" + #include #include +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02235254.h" #include "overlay012/struct_ov12_02225640.h" #include "overlay115/camera_angle.h" +#include "camera.h" #include "spl.h" - #include "unk_02014000.h" -#include "camera.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02225640.h" -#include "overlay012/ov12_02235254.h" -static void ov12_02225640(UnkStruct_ov12_02225640 * param0, int param1[]); -static BOOL ov12_0222564C(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225670(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_022256AC(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_022256E8(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225724(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225784(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_022257C0(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_022257FC(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); -static BOOL ov12_02225824(UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1); - -static BOOL(*const Unk_ov12_02239E10[])(UnkSPLStruct6 *, UnkStruct_ov12_02225640 *) = { +static void ov12_02225640(UnkStruct_ov12_02225640 *param0, int param1[]); +static BOOL ov12_0222564C(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225670(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_022256AC(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_022256E8(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225724(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225784(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_022257C0(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_022257FC(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); +static BOOL ov12_02225824(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1); + +static BOOL (*const Unk_ov12_02239E10[])(UnkSPLStruct6 *, UnkStruct_ov12_02225640 *) = { ov12_0222564C, ov12_02225670, ov12_022256AC, @@ -35,15 +35,15 @@ static BOOL(*const Unk_ov12_02239E10[])(UnkSPLStruct6 *, UnkStruct_ov12_02225640 ov12_02225824 }; -static void ov12_02225640 (UnkStruct_ov12_02225640 * param0, int param1[]) +static void ov12_02225640(UnkStruct_ov12_02225640 *param0, int param1[]) { ov12_0222325C(param0->unk_00, param1, 4); } -static BOOL ov12_0222564C (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_0222564C(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { - Camera * camera; - CameraAngle v1 = {0, 0, 0}; + Camera *camera; + CameraAngle v1 = { 0, 0, 0 }; camera = sub_02014784(param1->unk_04); Camera_SetAngleAroundTarget(&v1, camera); @@ -51,10 +51,10 @@ static BOOL ov12_0222564C (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_02225670 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225670(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { - Camera * camera; - CameraAngle v1 = {(0x1000 * 2), (0x1000 * 2), 0}; + Camera *camera; + CameraAngle v1 = { (0x1000 * 2), (0x1000 * 2), 0 }; camera = sub_02014784(param1->unk_04); @@ -64,11 +64,11 @@ static BOOL ov12_02225670 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_022256AC (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_022256AC(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { int v0[4]; - CameraAngle v1 = {0, 0, 0, 0}; - Camera * camera; + CameraAngle v1 = { 0, 0, 0, 0 }; + Camera *camera; ov12_02225640(param1, v0); @@ -82,10 +82,10 @@ static BOOL ov12_022256AC (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_022256E8 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_022256E8(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { - Camera * camera; - CameraAngle v1 = {-(0x1000 * 3), (0x1000 * 2), 0x1000}; + Camera *camera; + CameraAngle v1 = { -(0x1000 * 3), (0x1000 * 2), 0x1000 }; camera = sub_02014784(param1->unk_04); @@ -95,11 +95,11 @@ static BOOL ov12_022256E8 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_02225724 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225724(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { - Camera * camera; - CameraAngle v1 = {49664, 5952, 4096}; - CameraAngle v2 = {9248, 3744, 0}; + Camera *camera; + CameraAngle v1 = { 49664, 5952, 4096 }; + CameraAngle v2 = { 9248, 3744, 0 }; camera = sub_02014784(param1->unk_04); sub_02014788(param1->unk_04, 1); @@ -113,10 +113,10 @@ static BOOL ov12_02225724 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_02225784 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225784(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { - Camera * camera; - CameraAngle v1 = {49664, 5952, 4096}; + Camera *camera; + CameraAngle v1 = { 49664, 5952, 4096 }; camera = sub_02014784(param1->unk_04); @@ -126,10 +126,10 @@ static BOOL ov12_02225784 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_022257C0 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_022257C0(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { - Camera * camera; - CameraAngle v1 = {0, 0, -6000}; + Camera *camera; + CameraAngle v1 = { 0, 0, -6000 }; camera = sub_02014784(param1->unk_04); @@ -139,10 +139,10 @@ static BOOL ov12_022257C0 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_022257FC (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_022257FC(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { VecFx32 v0; - Camera * camera; + Camera *camera; camera = sub_02014784(param1->unk_04); @@ -152,10 +152,10 @@ static BOOL ov12_022257FC (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -static BOOL ov12_02225824 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * param1) +static BOOL ov12_02225824(UnkSPLStruct6 *param0, UnkStruct_ov12_02225640 *param1) { VecFx32 v0; - Camera * camera; + Camera *camera; camera = sub_02014784(param1->unk_04); @@ -165,7 +165,7 @@ static BOOL ov12_02225824 (UnkSPLStruct6 * param0, UnkStruct_ov12_02225640 * par return 1; } -void ov12_0222584C (int param0, UnkSPLStruct6 * param1, UnkStruct_ov12_02225640 * param2) +void ov12_0222584C(int param0, UnkSPLStruct6 *param1, UnkStruct_ov12_02225640 *param2) { BOOL v0; diff --git a/src/overlay012/ov12_02225864.c b/src/overlay012/ov12_02225864.c index 61431efb19..a978f61a7c 100644 --- a/src/overlay012/ov12_02225864.c +++ b/src/overlay012/ov12_02225864.c @@ -1,53 +1,53 @@ +#include "overlay012/ov12_02225864.h" + #include #include -#include "inlines.h" - -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/sprite_decl.h" -#include "sys_task_manager.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" - +#include "struct_decls/struct_02002F38_decl.h" #include "struct_defs/struct_0200D0F4.h" + +#include "overlay012/funcptr_ov12_02226274.h" +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02225D50.h" #include "overlay012/struct_ov12_02225F6C.h" #include "overlay012/struct_ov12_02226274.h" -#include "overlay012/funcptr_ov12_02226274.h" #include "overlay012/struct_ov12_02226454.h" +#include "buffer_manager.h" +#include "heap.h" +#include "inlines.h" +#include "screen_scroll_manager.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "sys_task.h" -#include "screen_scroll_manager.h" -#include "buffer_manager.h" -#include "heap.h" #include "unk_0201F834.h" #include "unk_020218BC.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02235254.h" typedef struct { s16 unk_00; s16 unk_02; } UnkStruct_ov12_02239E34; -typedef void (* UnkFuncPtr_ov12_02226490)(void *); +typedef void (*UnkFuncPtr_ov12_02226490)(void *); typedef struct { - SysTask * unk_00; - SysTask * unk_04; + SysTask *unk_00; + SysTask *unk_04; BOOL unk_08; BOOL unk_0C; UnkFuncPtr_ov12_02226490 unk_10; UnkFuncPtr_ov12_02226490 unk_14; - void * unk_18; + void *unk_18; } UnkStruct_ov12_02226490; typedef struct UnkStruct_ov12_02226504_t { UnkStruct_ov12_02226490 unk_00; - BufferManager * bufferManager; + BufferManager *bufferManager; u32 unk_20[192]; u32 unk_320[192]; u32 unk_620; @@ -55,12 +55,12 @@ typedef struct UnkStruct_ov12_02226504_t { typedef struct UnkStruct_ov12_0222660C_t { UnkStruct_ov12_02226490 unk_00; - ScreenScrollManager * screenScrollMgr; + ScreenScrollManager *screenScrollMgr; } UnkStruct_ov12_0222660C; typedef struct UnkStruct_ov12_022267D4_t { BOOL unk_00; - SysTask * unk_04; + SysTask *unk_04; int unk_08; u16 unk_0C; u16 unk_0E; @@ -71,31 +71,31 @@ typedef struct UnkStruct_ov12_022267D4_t { s8 unk_15; s8 unk_16; s8 unk_17; - PaletteData * unk_18; + PaletteData *unk_18; } UnkStruct_ov12_022267D4; -static void ov12_022268DC(u16 * param0, u16 param1); +static void ov12_022268DC(u16 *param0, u16 param1); static const UnkStruct_ov12_02239E34 Unk_ov12_02239E34[][6] = { { - {0x40, 0x70}, - {0xC0, 0x30}, - {0xD8, 0x70}, - {0x50, 0x2A}, - {0x0, 0x0}, - {0x0, 0x0} + { 0x40, 0x70 }, + { 0xC0, 0x30 }, + { 0xD8, 0x70 }, + { 0x50, 0x2A }, + { 0x0, 0x0 }, + { 0x0, 0x0 }, }, { - {0x40, 0x70}, - {0xC0, 0x30}, - {0x28, 0x70}, - {0xD8, 0x32}, - {0x50, 0x78}, - {0xB0, 0x2A} - } + { 0x40, 0x70 }, + { 0xC0, 0x30 }, + { 0x28, 0x70 }, + { 0xD8, 0x32 }, + { 0x50, 0x78 }, + { 0xB0, 0x2A }, + }, }; -void ov12_02225864 (int param0, int param1, s16 * param2, s16 * param3) +void ov12_02225864(int param0, int param1, s16 *param2, s16 *param3) { if (param2 != NULL) { *param2 = Unk_ov12_02239E34[param0][param1].unk_00; @@ -106,7 +106,7 @@ void ov12_02225864 (int param0, int param1, s16 * param2, s16 * param3) } } -void ov12_02225898 (UnkStruct_ov12_0221FCDC * param0, int param1, s16 * param2, s16 * param3) +void ov12_02225898(UnkStruct_ov12_0221FCDC *param0, int param1, s16 *param2, s16 *param3) { if (ov12_0221FDD4(param0) == 1) { ov12_02225864(0, param1 + 2, param2, param3); @@ -119,7 +119,7 @@ void ov12_02225898 (UnkStruct_ov12_0221FCDC * param0, int param1, s16 * param2, } } -s16 ov12_022258E0 (UnkStruct_ov12_0221FCDC * param0, int param1, int param2) +s16 ov12_022258E0(UnkStruct_ov12_0221FCDC *param0, int param1, int param2) { int v0, v1; @@ -148,12 +148,12 @@ s16 ov12_022258E0 (UnkStruct_ov12_0221FCDC * param0, int param1, int param2) return 0; } -u8 ov12_02225950 (CellActorData * param0) +u8 ov12_02225950(CellActorData *param0) { return sub_0201FAB4(sub_02021F9C(param0->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN); } -int ov12_02225964 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_02225964(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; int v1 = 1; @@ -173,7 +173,7 @@ int ov12_02225964 (UnkStruct_ov12_0221FCDC * param0, int param1) return v1; } -int ov12_0222598C (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_0222598C(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; int v1 = 1; @@ -187,7 +187,7 @@ int ov12_0222598C (UnkStruct_ov12_0221FCDC * param0, int param1) return v1; } -fx32 ov12_022259A0 (fx32 param0, fx32 param1, u32 param2) +fx32 ov12_022259A0(fx32 param0, fx32 param1, u32 param2) { fx32 v0; @@ -196,7 +196,7 @@ fx32 ov12_022259A0 (fx32 param0, fx32 param1, u32 param2) return v0; } -u32 ov12_022259AC (fx32 param0, fx32 param1, fx32 param2) +u32 ov12_022259AC(fx32 param0, fx32 param1, fx32 param2) { fx32 v0; fx32 v1; @@ -214,12 +214,12 @@ u32 ov12_022259AC (fx32 param0, fx32 param1, fx32 param2) return v0 >> FX32_SHIFT; } -void ov12_022259DC (UnkStruct_ov12_02225F6C * param0, CellActorData * param1, s16 param2, s16 param3) +void ov12_022259DC(UnkStruct_ov12_02225F6C *param0, CellActorData *param1, s16 param2, s16 param3) { SpriteActor_SetSpritePositionXY(param1, param2 + param0->unk_00, param3 + param0->unk_02); } -void ov12_022259FC (UnkStruct_ov12_02225F6C * param0, CellActorData * param1) +void ov12_022259FC(UnkStruct_ov12_02225F6C *param0, CellActorData *param1) { f32 v0, v1; @@ -227,19 +227,19 @@ void ov12_022259FC (UnkStruct_ov12_02225F6C * param0, CellActorData * param1) sub_0200D6E8(param1, v0, v1); } -void ov12_02225A18 (UnkStruct_ov12_02225F6C * param0, Sprite * param1, s16 param2, s16 param3) +void ov12_02225A18(UnkStruct_ov12_02225F6C *param0, Sprite *param1, s16 param2, s16 param3) { sub_02007DEC(param1, 0, param2 + param0->unk_00); sub_02007DEC(param1, 1, param3 + param0->unk_02); } -void ov12_02225A3C (UnkStruct_ov12_02225F6C * param0, Sprite * param1) +void ov12_02225A3C(UnkStruct_ov12_02225F6C *param0, Sprite *param1) { sub_02007DEC(param1, 12, param0->unk_00); sub_02007DEC(param1, 13, param0->unk_02); } -void ov12_02225A5C (UnkStruct_ov12_02225F6C * param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, int param7) +void ov12_02225A5C(UnkStruct_ov12_02225F6C *param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, int param7) { param0->unk_04[0] = param7; param0->unk_04[1] = param1; @@ -250,7 +250,7 @@ void ov12_02225A5C (UnkStruct_ov12_02225F6C * param0, u16 param1, u16 param2, u1 param0->unk_04[6] = (param4 - param3) / param7; } -void ov12_02225A8C (UnkStruct_ov12_02225F6C * param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, u16 param7) +void ov12_02225A8C(UnkStruct_ov12_02225F6C *param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, u16 param7) { s16 v0; @@ -271,7 +271,7 @@ void ov12_02225A8C (UnkStruct_ov12_02225F6C * param0, u16 param1, u16 param2, u1 param0->unk_04[6] = (param4 - param3) / param0->unk_04[0]; } -BOOL ov12_02225AE0 (UnkStruct_ov12_02225F6C * param0) +BOOL ov12_02225AE0(UnkStruct_ov12_02225F6C *param0) { fx32 v0, v1; @@ -295,7 +295,7 @@ BOOL ov12_02225AE0 (UnkStruct_ov12_02225F6C * param0) return 0; } -BOOL ov12_02225B78 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, CellActorData * param3) +BOOL ov12_02225B78(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, CellActorData *param3) { if (ov12_02225AE0(param0)) { ov12_022259DC(param0, param3, param1, param2); @@ -305,7 +305,7 @@ BOOL ov12_02225B78 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, Ce return 0; } -BOOL ov12_02225BA0 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, Sprite * param3) +BOOL ov12_02225BA0(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, Sprite *param3) { if (ov12_02225AE0(param0)) { ov12_02225A18(param0, param3, param1, param2); @@ -315,7 +315,7 @@ BOOL ov12_02225BA0 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, Sp return 0; } -void ov12_02225BC8 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, s16 param3, s16 param4, u16 param5) +void ov12_02225BC8(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, s16 param3, s16 param4, u16 param5) { GF_ASSERT(param0); @@ -328,7 +328,7 @@ void ov12_02225BC8 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, s1 param0->unk_04[4] = param3 * FX32_ONE; } -BOOL ov12_02225C14 (UnkStruct_ov12_02225F6C * param0) +BOOL ov12_02225C14(UnkStruct_ov12_02225F6C *param0) { GF_ASSERT(param0); @@ -345,7 +345,7 @@ BOOL ov12_02225C14 (UnkStruct_ov12_02225F6C * param0) return 0; } -BOOL ov12_02225C50 (UnkStruct_ov12_02225F6C * param0, CellActorData * param1) +BOOL ov12_02225C50(UnkStruct_ov12_02225F6C *param0, CellActorData *param1) { if (ov12_02225C14(param0)) { ov12_022259DC(param0, param1, 0, 0); @@ -355,7 +355,7 @@ BOOL ov12_02225C50 (UnkStruct_ov12_02225F6C * param0, CellActorData * param1) return 0; } -BOOL ov12_02225C74 (UnkStruct_ov12_02225F6C * param0, Sprite * param1) +BOOL ov12_02225C74(UnkStruct_ov12_02225F6C *param0, Sprite *param1) { if (ov12_02225C14(param0)) { ov12_02225A18(param0, param1, 0, 0); @@ -365,7 +365,7 @@ BOOL ov12_02225C74 (UnkStruct_ov12_02225F6C * param0, Sprite * param1) return 0; } -void ov12_02225C98 (UnkStruct_ov12_02225F6C * param0, UnkStruct_ov12_02225F6C * param1, s16 param2, s16 param3, s16 param4, s16 param5, u16 param6, fx32 param7) +void ov12_02225C98(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1, s16 param2, s16 param3, s16 param4, s16 param5, u16 param6, fx32 param7) { ov12_02225BC8(param0, param2, param3, param4, param5, param6); param1->unk_00 = 0; @@ -373,7 +373,7 @@ void ov12_02225C98 (UnkStruct_ov12_02225F6C * param0, UnkStruct_ov12_02225F6C * ov12_02225A5C(param1, 0, 0, ((90 * 0xffff) / 360), ((270 * 0xffff) / 360), 0, param7, param6); } -BOOL ov12_02225CE4 (UnkStruct_ov12_02225F6C * param0, UnkStruct_ov12_02225F6C * param1) +BOOL ov12_02225CE4(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1) { BOOL v0, v1; @@ -393,7 +393,7 @@ BOOL ov12_02225CE4 (UnkStruct_ov12_02225F6C * param0, UnkStruct_ov12_02225F6C * return 1; } -BOOL ov12_02225D2C (UnkStruct_ov12_02225F6C * param0, UnkStruct_ov12_02225F6C * param1, CellActorData * param2) +BOOL ov12_02225D2C(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1, CellActorData *param2) { if (ov12_02225CE4(param0, param1)) { ov12_022259DC(param0, param2, 0, 0); @@ -403,7 +403,7 @@ BOOL ov12_02225D2C (UnkStruct_ov12_02225F6C * param0, UnkStruct_ov12_02225F6C * return 0; } -void ov12_02225D50 (UnkStruct_ov12_02225D50 * param0, s32 param1, s32 param2, u32 param3) +void ov12_02225D50(UnkStruct_ov12_02225D50 *param0, s32 param1, s32 param2, u32 param3) { GF_ASSERT(param0); @@ -412,7 +412,7 @@ void ov12_02225D50 (UnkStruct_ov12_02225D50 * param0, s32 param1, s32 param2, u3 param0->unk_04[1] = ov12_022259A0(param1 * FX32_ONE, param2 * FX32_ONE, param3) >> FX32_SHIFT; } -void ov12_02225D78 (UnkStruct_ov12_02225D50 * param0, s16 param1, s16 param2, u32 param3) +void ov12_02225D78(UnkStruct_ov12_02225D50 *param0, s16 param1, s16 param2, u32 param3) { GF_ASSERT(param0); @@ -422,7 +422,7 @@ void ov12_02225D78 (UnkStruct_ov12_02225D50 * param0, s16 param1, s16 param2, u3 param0->unk_04[2] = param1 * FX32_ONE; } -BOOL ov12_02225DA0 (UnkStruct_ov12_02225D50 * param0) +BOOL ov12_02225DA0(UnkStruct_ov12_02225D50 *param0) { GF_ASSERT(param0); @@ -436,7 +436,7 @@ BOOL ov12_02225DA0 (UnkStruct_ov12_02225D50 * param0) return 0; } -BOOL ov12_02225DC8 (UnkStruct_ov12_02225D50 * param0) +BOOL ov12_02225DC8(UnkStruct_ov12_02225D50 *param0) { GF_ASSERT(param0); @@ -451,7 +451,7 @@ BOOL ov12_02225DC8 (UnkStruct_ov12_02225D50 * param0) return 0; } -void ov12_02225DF4 (UnkStruct_ov12_02225D50 * param0, u16 param1, u16 param2, fx32 param3, u32 param4) +void ov12_02225DF4(UnkStruct_ov12_02225D50 *param0, u16 param1, u16 param2, fx32 param3, u32 param4) { param0->unk_04[0] = param4; param0->unk_04[1] = param1; @@ -459,7 +459,7 @@ void ov12_02225DF4 (UnkStruct_ov12_02225D50 * param0, u16 param1, u16 param2, fx param0->unk_04[3] = (param2 - param1) / param4; } -BOOL ov12_02225E0C (UnkStruct_ov12_02225D50 * param0) +BOOL ov12_02225E0C(UnkStruct_ov12_02225D50 *param0) { GF_ASSERT(param0); @@ -475,10 +475,10 @@ BOOL ov12_02225E0C (UnkStruct_ov12_02225D50 * param0) return 0; } -#define SCALE_RATE_PER(p1, p2) (((p1) * 0x100) / p2) -void ov12_02225E68 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, s16 param3, u32 param4) +#define SCALE_RATE_PER(p1, p2) (((p1) * 0x100) / p2) +void ov12_02225E68(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, s16 param3, u32 param4) { - UnkStruct_ov12_02225F6C * v0; + UnkStruct_ov12_02225F6C *v0; GF_ASSERT(param0); @@ -492,9 +492,9 @@ void ov12_02225E68 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, s1 v0->unk_04[4] = v0->unk_02 * FX32_ONE; } -BOOL ov12_02225EB8 (UnkStruct_ov12_02225F6C * param0) +BOOL ov12_02225EB8(UnkStruct_ov12_02225F6C *param0) { - UnkStruct_ov12_02225F6C * v0; + UnkStruct_ov12_02225F6C *v0; GF_ASSERT(param0); @@ -513,9 +513,9 @@ BOOL ov12_02225EB8 (UnkStruct_ov12_02225F6C * param0) return 0; } -void ov12_02225EF0 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, s16 param3, s16 param4, s16 param5, u32 param6) +void ov12_02225EF0(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, s16 param3, s16 param4, s16 param5, u32 param6) { - UnkStruct_ov12_02225F6C * v0; + UnkStruct_ov12_02225F6C *v0; GF_ASSERT(param0); @@ -530,9 +530,9 @@ void ov12_02225EF0 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, s1 v0->unk_04[4] = v0->unk_02 * FX32_ONE; } -BOOL ov12_02225F6C (UnkStruct_ov12_02225F6C * param0) +BOOL ov12_02225F6C(UnkStruct_ov12_02225F6C *param0) { - UnkStruct_ov12_02225F6C * v0; + UnkStruct_ov12_02225F6C *v0; GF_ASSERT(param0); @@ -551,13 +551,13 @@ BOOL ov12_02225F6C (UnkStruct_ov12_02225F6C * param0) return 0; } -void ov12_02225FA4 (UnkStruct_ov12_02225F6C * param0, f32 * param1, f32 * param2) +void ov12_02225FA4(UnkStruct_ov12_02225F6C *param0, f32 *param1, f32 *param2) { *param1 = (1.0f * param0->unk_00) / 0x100; *param2 = (1.0f * param0->unk_02) / 0x100; } -s16 ov12_02225FD4 (s16 param0, int param1, fx32 param2) +s16 ov12_02225FD4(s16 param0, int param1, fx32 param2) { fx32 v0 = (80 - (param1 * 2)) * FX32_ONE; fx32 v1 = 0x100 * FX32_ONE; @@ -588,7 +588,7 @@ s16 ov12_02225FD4 (s16 param0, int param1, fx32 param2) return v5; } -void ov12_02226024 (Sprite * param0, s16 param1, s16 param2, fx32 param3, int param4) +void ov12_02226024(Sprite *param0, s16 param1, s16 param2, fx32 param3, int param4) { s16 v0; s16 v1; @@ -604,7 +604,7 @@ void ov12_02226024 (Sprite * param0, s16 param1, s16 param2, fx32 param3, int pa sub_02007DEC(param0, 1, v1 + v0); } -void ov12_0222605C (CellActorData * param0, s16 param1, s16 param2, fx32 param3, int param4) +void ov12_0222605C(CellActorData *param0, s16 param1, s16 param2, fx32 param3, int param4) { s16 v0; s16 v1; @@ -623,7 +623,7 @@ void ov12_0222605C (CellActorData * param0, s16 param1, s16 param2, fx32 param3, SpriteActor_SetSpritePositionXY(param0, v2, v1 + v0); } -BOOL ov12_022260A8 (UnkStruct_ov12_02225F6C * param0, CellActorData * param1) +BOOL ov12_022260A8(UnkStruct_ov12_02225F6C *param0, CellActorData *param1) { if (ov12_02225EB8(param0)) { ov12_022259FC(param0, param1); @@ -633,7 +633,7 @@ BOOL ov12_022260A8 (UnkStruct_ov12_02225F6C * param0, CellActorData * param1) return 0; } -BOOL ov12_022260C8 (UnkStruct_ov12_02225F6C * param0, Sprite * param1) +BOOL ov12_022260C8(UnkStruct_ov12_02225F6C *param0, Sprite *param1) { if (ov12_02225EB8(param0)) { ov12_02225A3C(param0, param1); @@ -643,7 +643,7 @@ BOOL ov12_022260C8 (UnkStruct_ov12_02225F6C * param0, Sprite * param1) return 0; } -BOOL ov12_022260E8 (UnkStruct_ov12_02225F6C * param0, Sprite * param1) +BOOL ov12_022260E8(UnkStruct_ov12_02225F6C *param0, Sprite *param1) { if (ov12_02225F6C(param0)) { ov12_02225A3C(param0, param1); @@ -653,7 +653,7 @@ BOOL ov12_022260E8 (UnkStruct_ov12_02225F6C * param0, Sprite * param1) return 0; } -static inline void inline_ov12_02226138 (s16 * param0, s32 * param1, s32 param2) +static inline void inline_ov12_02226138(s16 *param0, s32 *param1, s32 param2) { s32 v0 = *param1; @@ -666,9 +666,9 @@ static inline void inline_ov12_02226138 (s16 * param0, s32 * param1, s32 param2) } } -void ov12_02226108 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, u32 param3, u32 param4) +void ov12_02226108(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, u32 param3, u32 param4) { - UnkStruct_ov12_02225F6C * v0; + UnkStruct_ov12_02225F6C *v0; GF_ASSERT(param0); @@ -686,9 +686,9 @@ void ov12_02226108 (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, u3 v0->unk_02 = 0; } -BOOL ov12_02226138 (UnkStruct_ov12_02225F6C * param0) +BOOL ov12_02226138(UnkStruct_ov12_02225F6C *param0) { - UnkStruct_ov12_02225F6C * v0; + UnkStruct_ov12_02225F6C *v0; GF_ASSERT(param0); @@ -715,7 +715,7 @@ BOOL ov12_02226138 (UnkStruct_ov12_02225F6C * param0) return 0; } -BOOL ov12_0222619C (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, Sprite * param3) +BOOL ov12_0222619C(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, Sprite *param3) { if (ov12_02226138(param0)) { ov12_02225A18(param0, param3, param1, param2); @@ -725,7 +725,7 @@ BOOL ov12_0222619C (UnkStruct_ov12_02225F6C * param0, s16 param1, s16 param2, Sp return 0; } -void ov12_022261C4 (UnkStruct_ov12_02226274 * param0, UnkStruct_ov12_02225F6C * param1, UnkFuncPtr_ov12_02226274 param2, s16 param3, s16 param4, u16 param5, u8 param6, u8 param7, CellActorData * param8, CellActorData * param9, CellActorData * param10, CellActorData * param11) +void ov12_022261C4(UnkStruct_ov12_02226274 *param0, UnkStruct_ov12_02225F6C *param1, UnkFuncPtr_ov12_02226274 param2, s16 param3, s16 param4, u16 param5, u8 param6, u8 param7, CellActorData *param8, CellActorData *param9, CellActorData *param10, CellActorData *param11) { int v0; @@ -752,7 +752,7 @@ void ov12_022261C4 (UnkStruct_ov12_02226274 * param0, UnkStruct_ov12_02225F6C * } } -BOOL ov12_02226274 (UnkStruct_ov12_02226274 * param0) +BOOL ov12_02226274(UnkStruct_ov12_02226274 *param0) { int v0; BOOL v1[4]; @@ -796,7 +796,7 @@ BOOL ov12_02226274 (UnkStruct_ov12_02226274 * param0) return 0; } -void ov12_022263A4 (UnkStruct_ov12_02225F6C * param0, int param1, int param2) +void ov12_022263A4(UnkStruct_ov12_02225F6C *param0, int param1, int param2) { int v0; @@ -804,10 +804,10 @@ void ov12_022263A4 (UnkStruct_ov12_02225F6C * param0, int param1, int param2) param0->unk_04[0] *= param1; } -static void ov12_022263DC (SysTask * param0, void * param1) +static void ov12_022263DC(SysTask *param0, void *param1) { BOOL v0; - UnkStruct_ov12_02226454 * v1 = param1; + UnkStruct_ov12_02226454 *v1 = param1; v0 = ov12_02225C14(&v1->unk_00); @@ -827,7 +827,7 @@ static void ov12_022263DC (SysTask * param0, void * param1) } } -void ov12_02226424 (UnkStruct_ov12_02226454 * param0, s16 param1, s16 param2, s16 param3, s16 param4, int param5) +void ov12_02226424(UnkStruct_ov12_02226454 *param0, s16 param1, s16 param2, s16 param3, s16 param4, int param5) { ov12_02225BC8(¶m0->unk_00, param1, param2, param3, param4, param5); @@ -835,14 +835,14 @@ void ov12_02226424 (UnkStruct_ov12_02226454 * param0, s16 param1, s16 param2, s1 SysTask_Start(ov12_022263DC, param0, 0); } -BOOL ov12_02226454 (const UnkStruct_ov12_02226454 * param0) +BOOL ov12_02226454(const UnkStruct_ov12_02226454 *param0) { return param0->unk_24; } -static void ov12_02226458 (SysTask * param0, void * param1) +static void ov12_02226458(SysTask *param0, void *param1) { - UnkStruct_ov12_02226490 * v0 = param1; + UnkStruct_ov12_02226490 *v0 = param1; if (v0->unk_08) { v0->unk_0C = 1; @@ -852,9 +852,9 @@ static void ov12_02226458 (SysTask * param0, void * param1) } } -static void ov12_02226474 (SysTask * param0, void * param1) +static void ov12_02226474(SysTask *param0, void *param1) { - UnkStruct_ov12_02226490 * v0 = param1; + UnkStruct_ov12_02226490 *v0 = param1; if (v0->unk_08 && v0->unk_0C) { v0->unk_14(v0->unk_18); @@ -862,7 +862,7 @@ static void ov12_02226474 (SysTask * param0, void * param1) } } -static void ov12_02226490 (UnkStruct_ov12_02226490 * param0, void * param1, UnkFuncPtr_ov12_02226490 param2, UnkFuncPtr_ov12_02226490 param3) +static void ov12_02226490(UnkStruct_ov12_02226490 *param0, void *param1, UnkFuncPtr_ov12_02226490 param2, UnkFuncPtr_ov12_02226490 param3) { GF_ASSERT(param0); @@ -875,7 +875,7 @@ static void ov12_02226490 (UnkStruct_ov12_02226490 * param0, void * param1, UnkF param0->unk_00 = SysTask_ExecuteOnVBlank(ov12_02226474, param0, 0); } -static void ov12_022264D0 (UnkStruct_ov12_02226490 * param0) +static void ov12_022264D0(UnkStruct_ov12_02226490 *param0) { GF_ASSERT(param0); @@ -890,15 +890,15 @@ static void ov12_022264D0 (UnkStruct_ov12_02226490 * param0) BufferManager_StopDMA(); } -static void ov12_022264F4 (UnkStruct_ov12_02226490 * param0) +static void ov12_022264F4(UnkStruct_ov12_02226490 *param0) { GF_ASSERT(param0); param0->unk_08 = 0; } -static void ov12_02226504 (UnkStruct_ov12_02226504 * param0) +static void ov12_02226504(UnkStruct_ov12_02226504 *param0) { - const void * v0; + const void *v0; v0 = BufferManager_GetReadBuffer(param0->bufferManager); @@ -906,23 +906,23 @@ static void ov12_02226504 (UnkStruct_ov12_02226504 * param0) BufferManager_StartDMA(v0, (void *)param0->unk_620, 4, 1); } -static void ov12_02226528 (void * param0) +static void ov12_02226528(void *param0) { - UnkStruct_ov12_02226504 * v0 = param0; + UnkStruct_ov12_02226504 *v0 = param0; BufferManager_SwapBuffers(v0->bufferManager); ov12_02226504(v0); } -static void ov12_0222653C (void * param0) +static void ov12_0222653C(void *param0) { - UnkStruct_ov12_02226504 * v0 = param0; + UnkStruct_ov12_02226504 *v0 = param0; ov12_02226504(v0); } -UnkStruct_ov12_02226504 * ov12_02226544 (u32 param0, u32 param1, int param2) +UnkStruct_ov12_02226504 *ov12_02226544(u32 param0, u32 param1, int param2) { - UnkStruct_ov12_02226504 * v0; + UnkStruct_ov12_02226504 *v0; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov12_02226504)); memset(v0, 0, sizeof(UnkStruct_ov12_02226504)); @@ -941,7 +941,7 @@ UnkStruct_ov12_02226504 * ov12_02226544 (u32 param0, u32 param1, int param2) return v0; } -void ov12_022265C0 (UnkStruct_ov12_02226504 * param0) +void ov12_022265C0(UnkStruct_ov12_02226504 *param0) { GF_ASSERT(param0); @@ -954,38 +954,38 @@ void ov12_022265C0 (UnkStruct_ov12_02226504 * param0) Heap_FreeToHeap(param0); } -void * ov12_022265E4 (const UnkStruct_ov12_02226504 * param0) +void *ov12_022265E4(const UnkStruct_ov12_02226504 *param0) { GF_ASSERT(param0); return BufferManager_GetWriteBuffer(param0->bufferManager); } -void ov12_022265F8 (UnkStruct_ov12_02226504 * param0) +void ov12_022265F8(UnkStruct_ov12_02226504 *param0) { GF_ASSERT(param0); ov12_022264F4(¶m0->unk_00); } -static void ov12_0222660C (void * param0) +static void ov12_0222660C(void *param0) { - UnkStruct_ov12_0222660C * v0 = param0; + UnkStruct_ov12_0222660C *v0 = param0; ScreenScrollManager_SwapBuffers(v0->screenScrollMgr); ScreenScrollManager_RestartDMA(v0->screenScrollMgr); } -static void ov12_02226620 (void * param0) +static void ov12_02226620(void *param0) { - UnkStruct_ov12_0222660C * v0 = param0; + UnkStruct_ov12_0222660C *v0 = param0; ScreenScrollManager_RestartDMA(v0->screenScrollMgr); } -UnkStruct_ov12_0222660C * ov12_0222662C (u8 param0, u8 param1, u16 param2, fx32 param3, s16 param4, u32 param5, u32 param6, u32 param7, int param8) +UnkStruct_ov12_0222660C *ov12_0222662C(u8 param0, u8 param1, u16 param2, fx32 param3, s16 param4, u32 param5, u32 param6, u32 param7, int param8) { - UnkStruct_ov12_0222660C * v0; + UnkStruct_ov12_0222660C *v0; u32 v1; - void * v2; - const void * v3; + void *v2; + const void *v3; v0 = Heap_AllocFromHeap(param8, sizeof(UnkStruct_ov12_0222660C)); GF_ASSERT(v0); @@ -1001,7 +1001,7 @@ UnkStruct_ov12_0222660C * ov12_0222662C (u8 param0, u8 param1, u16 param2, fx32 return v0; } -void ov12_0222669C (UnkStruct_ov12_0222660C * param0) +void ov12_0222669C(UnkStruct_ov12_0222660C *param0) { GF_ASSERT(param0); @@ -1014,24 +1014,24 @@ void ov12_0222669C (UnkStruct_ov12_0222660C * param0) Heap_FreeToHeap(param0); } -void * ov12_022266C0 (const UnkStruct_ov12_0222660C * param0) +void *ov12_022266C0(const UnkStruct_ov12_0222660C *param0) { GF_ASSERT(param0); return ScreenScrollManager_GetWriteBuffer(param0->screenScrollMgr); } -void ov12_022266D4 (UnkStruct_ov12_0222660C * param0) +void ov12_022266D4(UnkStruct_ov12_0222660C *param0) { GF_ASSERT(param0); ov12_022264F4(¶m0->unk_00); } -u32 ov12_022266E8 (u16 param0, u16 param1) +u32 ov12_022266E8(u16 param0, u16 param1) { return (param1 << 16) | param0; } -u32 ov12_022266F0 (int param0) +u32 ov12_022266F0(int param0) { u32 v0; @@ -1053,13 +1053,13 @@ u32 ov12_022266F0 (int param0) return v0; } -void ov12_02226728 (s16 param0, s16 param1, s16 param2, s16 param3, s16 * param4, s16 * param5) +void ov12_02226728(s16 param0, s16 param1, s16 param2, s16 param3, s16 *param4, s16 *param5) { *param4 = (param0 + param2) / 2; *param5 = (param1 + param3) / 2; } -void ov12_02226744 (s16 param0, s16 param1, s16 param2, s16 param3, fx32 * param4) +void ov12_02226744(s16 param0, s16 param1, s16 param2, s16 param3, fx32 *param4) { s16 v0 = (param0 - param2); s16 v1 = (param1 - param3) * -1; @@ -1067,7 +1067,7 @@ void ov12_02226744 (s16 param0, s16 param1, s16 param2, s16 param3, fx32 * param *param4 = FX_Sqrt(((v1 * v1) + (v0 * v0)) * FX32_ONE); } -void ov12_0222676C (s16 param0, s16 param1, s16 param2, s16 param3, u16 * param4) +void ov12_0222676C(s16 param0, s16 param1, s16 param2, s16 param3, u16 *param4) { s16 v0 = (param0 - param2); s16 v1 = (param1 - param3) * -1; @@ -1082,7 +1082,7 @@ void ov12_0222676C (s16 param0, s16 param1, s16 param2, s16 param3, u16 * param4 } } -BOOL ov12_022267A8 (int * param0, int param1, s32 param2) +BOOL ov12_022267A8(int *param0, int param1, s32 param2) { if (param2 < 0) { if (*param0 + param2 > param1) { @@ -1105,9 +1105,9 @@ BOOL ov12_022267A8 (int * param0, int param1, s32 param2) return 1; } -static void ov12_022267D4 (SysTask * param0, void * param1) +static void ov12_022267D4(SysTask *param0, void *param1) { - UnkStruct_ov12_022267D4 * v0 = (UnkStruct_ov12_022267D4 *)param1; + UnkStruct_ov12_022267D4 *v0 = (UnkStruct_ov12_022267D4 *)param1; if (v0->unk_00 == 0) { return; @@ -1139,13 +1139,13 @@ static void ov12_022267D4 (SysTask * param0, void * param1) } } -BOOL ov12_02226848 (UnkStruct_ov12_022267D4 * param0) +BOOL ov12_02226848(UnkStruct_ov12_022267D4 *param0) { GF_ASSERT(param0 != NULL); return param0->unk_00; } -void ov12_02226858 (UnkStruct_ov12_022267D4 * param0) +void ov12_02226858(UnkStruct_ov12_022267D4 *param0) { GF_ASSERT(param0 != NULL); @@ -1153,9 +1153,9 @@ void ov12_02226858 (UnkStruct_ov12_022267D4 * param0) Heap_FreeToHeap(param0); } -UnkStruct_ov12_022267D4 * ov12_02226870 (PaletteData * param0, int param1, int param2, u16 param3, u16 param4, s8 param5, s8 param6, u8 param7, u8 param8, u16 param9, int param10) +UnkStruct_ov12_022267D4 *ov12_02226870(PaletteData *param0, int param1, int param2, u16 param3, u16 param4, s8 param5, s8 param6, u8 param7, u8 param8, u16 param9, int param10) { - UnkStruct_ov12_022267D4 * v0 = NULL; + UnkStruct_ov12_022267D4 *v0 = NULL; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov12_022267D4)); @@ -1184,7 +1184,7 @@ UnkStruct_ov12_022267D4 * ov12_02226870 (PaletteData * param0, int param1, int p return v0; } -static void ov12_022268DC (u16 * param0, u16 param1) +static void ov12_022268DC(u16 *param0, u16 param1) { int v0, v1, v2, v3; u32 v4; @@ -1200,10 +1200,10 @@ static void ov12_022268DC (u16 * param0, u16 param1) } } -void ov12_02226924 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02226924(UnkStruct_ov12_0221FCDC *param0) { - PaletteData * v0; - u16 * v1; + PaletteData *v0; + u16 *v1; v0 = ov12_0222332C(param0); v1 = sub_0200316C(v0, 0); @@ -1215,9 +1215,9 @@ void ov12_02226924 (UnkStruct_ov12_0221FCDC * param0) } } -void ov12_02226954 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02226954(UnkStruct_ov12_0221FCDC *param0) { - PaletteData * v0; + PaletteData *v0; v0 = ov12_0222332C(param0); diff --git a/src/overlay012/ov12_02226998.c b/src/overlay012/ov12_02226998.c index 795143a780..af695b57f1 100644 --- a/src/overlay012/ov12_02226998.c +++ b/src/overlay012/ov12_02226998.c @@ -1,11 +1,11 @@ +#include "overlay012/ov12_02226998.h" + #include #include #include "overlay012/funcptr_ov12_02239E64_1.h" #include "overlay012/funcptr_ov12_02239E68.h" #include "overlay012/funcptr_ov12_02239EEC.h" - -#include "overlay012/ov12_02226998.h" #include "overlay012/ov12_022269C0.h" #include "overlay012/ov12_02226B84.h" #include "overlay012/ov12_0222AC70.h" @@ -145,12 +145,12 @@ static const UnkFuncPtr_ov12_02239E64_1 Unk_ov12_02239E64[] = { NULL }; -void include_unk_ov12_02239E64 () +void include_unk_ov12_02239E64() { Unk_ov12_02239E64[0]; } -UnkFuncPtr_ov12_02239EEC ov12_02226998 (u32 param0) +UnkFuncPtr_ov12_02239EEC ov12_02226998(u32 param0) { UnkFuncPtr_ov12_02239EEC v0; @@ -162,7 +162,7 @@ UnkFuncPtr_ov12_02239EEC ov12_02226998 (u32 param0) return v0; } -UnkFuncPtr_ov12_02239E68 ov12_022269AC (u32 param0) +UnkFuncPtr_ov12_02239E68 ov12_022269AC(u32 param0) { UnkFuncPtr_ov12_02239E68 v0; diff --git a/src/overlay012/ov12_022269C0.c b/src/overlay012/ov12_022269C0.c index 59b589a91b..bdc0ce6545 100644 --- a/src/overlay012/ov12_022269C0.c +++ b/src/overlay012/ov12_022269C0.c @@ -1,54 +1,55 @@ +#include "overlay012/ov12_022269C0.h" + #include #include #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" - -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" -#include "unk_0200C6E4.h" -#include "sys_task.h" -#include "heap.h" #include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_022269C0.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" + +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_0200C6E4.h" typedef struct { u8 unk_00; - UnkStruct_ov12_0221FCDC * unk_04; + UnkStruct_ov12_0221FCDC *unk_04; } UnkStruct_ov12_022269C4; typedef struct { u8 unk_00; - UnkStruct_ov12_0221FCDC * unk_04; + UnkStruct_ov12_0221FCDC *unk_04; } UnkStruct_ov12_02226A14; typedef struct { u8 unk_00; - UnkStruct_ov12_0221FCDC * unk_04; + UnkStruct_ov12_0221FCDC *unk_04; } UnkStruct_ov12_02226A64; typedef struct { u8 unk_00; - UnkStruct_ov12_0221FCDC * unk_04; - SpriteRenderer * unk_08; - SpriteGfxHandler * unk_0C; - CellActorData * unk_10; - CellActorData * unk_14[100]; - GraphicElementData * unk_1A4[10]; + UnkStruct_ov12_0221FCDC *unk_04; + SpriteRenderer *unk_08; + SpriteGfxHandler *unk_0C; + CellActorData *unk_10; + CellActorData *unk_14[100]; + GraphicElementData *unk_1A4[10]; } UnkStruct_ov12_02226AAC; -void ov12_022269C0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_022269C0(UnkStruct_ov12_0221FCDC *param0) { return; } -static void ov12_022269C4 (SysTask * param0, void * param1) +static void ov12_022269C4(SysTask *param0, void *param1) { - UnkStruct_ov12_022269C4 * v0 = (UnkStruct_ov12_022269C4 *)param1; + UnkStruct_ov12_022269C4 *v0 = (UnkStruct_ov12_022269C4 *)param1; switch (v0->unk_00) { case 0: @@ -61,9 +62,9 @@ static void ov12_022269C4 (SysTask * param0, void * param1) } } -void ov12_022269EC (UnkStruct_ov12_0221FCDC * param0) +void ov12_022269EC(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_022269C4 * v0; + UnkStruct_ov12_022269C4 *v0; v0 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov12_022269C4)); @@ -73,9 +74,9 @@ void ov12_022269EC (UnkStruct_ov12_0221FCDC * param0) ov12_022201CC(v0->unk_04, ov12_022269C4, v0, 0x1000); } -static void ov12_02226A14 (SysTask * param0, void * param1) +static void ov12_02226A14(SysTask *param0, void *param1) { - UnkStruct_ov12_02226A14 * v0 = (UnkStruct_ov12_02226A14 *)param1; + UnkStruct_ov12_02226A14 *v0 = (UnkStruct_ov12_02226A14 *)param1; switch (v0->unk_00) { case 0: @@ -88,9 +89,9 @@ static void ov12_02226A14 (SysTask * param0, void * param1) } } -void ov12_02226A3C (UnkStruct_ov12_0221FCDC * param0) +void ov12_02226A3C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02226A14 * v0; + UnkStruct_ov12_02226A14 *v0; v0 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov12_02226A14)); @@ -100,9 +101,9 @@ void ov12_02226A3C (UnkStruct_ov12_0221FCDC * param0) ov12_02220204(v0->unk_04, ov12_02226A14, v0, 0x1000); } -static void ov12_02226A64 (SysTask * param0, void * param1) +static void ov12_02226A64(SysTask *param0, void *param1) { - UnkStruct_ov12_02226A64 * v0 = (UnkStruct_ov12_02226A64 *)param1; + UnkStruct_ov12_02226A64 *v0 = (UnkStruct_ov12_02226A64 *)param1; switch (v0->unk_00) { case 0: @@ -115,9 +116,9 @@ static void ov12_02226A64 (SysTask * param0, void * param1) } } -void ov12_02226A88 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02226A88(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02226A64 * v0; + UnkStruct_ov12_02226A64 *v0; v0 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov12_02226A64)); @@ -127,9 +128,9 @@ void ov12_02226A88 (UnkStruct_ov12_0221FCDC * param0) SysTask_Start(ov12_02226A64, v0, 0x1000); } -static void ov12_02226AAC (SysTask * param0, void * param1) +static void ov12_02226AAC(SysTask *param0, void *param1) { - UnkStruct_ov12_02226AAC * v0 = (UnkStruct_ov12_02226AAC *)param1; + UnkStruct_ov12_02226AAC *v0 = (UnkStruct_ov12_02226AAC *)param1; switch (v0->unk_00) { case 0: @@ -143,21 +144,19 @@ static void ov12_02226AAC (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_0C); break; - case 1: - { - UnkStruct_ov12_0221FCDC * v1 = v0->unk_04; + case 1: { + UnkStruct_ov12_0221FCDC *v1 = v0->unk_04; sub_0200D0F4(v0->unk_10); Heap_FreeToHeap(v0); ov12_02220220(v1, param0); - } - break; + } break; } } -void ov12_02226B1C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02226B1C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02226AAC * v0; + UnkStruct_ov12_02226AAC *v0; SpriteTemplate v1; v0 = Heap_AllocFromHeap(5, sizeof(UnkStruct_ov12_02226AAC)); diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c index f3733a4c53..bf8f4c6938 100644 --- a/src/overlay012/ov12_02226B84.c +++ b/src/overlay012/ov12_02226B84.c @@ -1,44 +1,43 @@ +#include "overlay012/ov12_02226B84.h" + #include #include -#include "inlines.h" - -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "overlay012/struct_ov12_0222660C_decl.h" -#include "overlay012/struct_ov12_022267D4_decl.h" - #include "struct_defs/struct_0200D0F4.h" + +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02225864.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02225D50.h" #include "overlay012/struct_ov12_02225F6C.h" #include "overlay012/struct_ov12_02226454.h" +#include "overlay012/struct_ov12_0222660C_decl.h" +#include "overlay012/struct_ov12_022267D4_decl.h" #include "overlay012/struct_ov12_0222C7E0_sub1.h" #include "overlay012/struct_ov12_02235350.h" #include "overlay012/struct_ov12_0223595C.h" #include "overlay012/struct_ov12_02235998.h" +#include "heap.h" +#include "inlines.h" #include "spl.h" - +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_02014000.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201F834.h" #include "unk_020218BC.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02226B84.h" -#include "overlay012/ov12_02235254.h" typedef struct { int unk_00; @@ -68,8 +67,8 @@ typedef struct { typedef struct { u8 unk_00; - UnkStruct_ov12_0221FCDC * unk_04; - Sprite * unk_08; + UnkStruct_ov12_0221FCDC *unk_04; + Sprite *unk_08; UnkStruct_ov12_02225D50 unk_0C; s32 unk_20; int unk_24; @@ -78,20 +77,20 @@ typedef struct { } UnkStruct_ov12_02227390; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; UnkStruct_ov12_02225F6C unk_04; - Sprite * unk_28; + Sprite *unk_28; s16 unk_2C; s16 unk_2E; } UnkStruct_ov12_022274E4; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; int unk_10; - CellActorData * unk_14; + CellActorData *unk_14; UnkStruct_ov12_02225F6C unk_18; int unk_3C; int unk_40; @@ -102,13 +101,13 @@ typedef struct { } UnkStruct_ov12_02227620; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - PaletteData * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + PaletteData *unk_04; } UnkStruct_ov12_02227808; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - Sprite * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + Sprite *unk_04; int unk_08; int unk_0C; int unk_10; @@ -118,12 +117,12 @@ typedef struct { } UnkStruct_ov12_022278D0; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteGfxHandler * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteGfxHandler *unk_04; int unk_08; s16 unk_0C; s16 unk_0E; - CellActorData * unk_10; + CellActorData *unk_10; UnkStruct_ov12_02225F6C unk_14; int unk_38; int unk_3C; @@ -135,11 +134,11 @@ typedef struct { } UnkStruct_ov12_02227B4C; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; s16 unk_08; s16 unk_0A; - Sprite * unk_0C; + Sprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; int unk_34; int unk_38; @@ -152,8 +151,8 @@ typedef struct { } UnkStruct_ov12_02227DE0; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteGfxHandler * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteGfxHandler *unk_04; UnkStruct_ov12_02226454 unk_08; } UnkStruct_ov12_0222813C; @@ -163,7 +162,7 @@ typedef struct { int unk_08; UnkStruct_ov12_02235998 unk_0C; UnkStruct_ov12_0223595C unk_20; - UnkStruct_ov12_0221FCDC * unk_3C; + UnkStruct_ov12_0221FCDC *unk_3C; } UnkStruct_ov12_02228268; typedef struct { @@ -192,7 +191,7 @@ typedef struct { UnkStruct_ov12_02235998 unk_10; UnkStruct_ov12_0223595C unk_24; UnkStruct_ov12_02225F6C unk_40; - UnkStruct_ov12_0221FCDC * unk_64; + UnkStruct_ov12_0221FCDC *unk_64; } UnkStruct_ov12_0222830C; typedef struct { @@ -202,7 +201,7 @@ typedef struct { UnkStruct_ov12_02235998 unk_0C; UnkStruct_ov12_0223595C unk_20; UnkStruct_ov12_02225F6C unk_3C; - UnkStruct_ov12_0221FCDC * unk_60; + UnkStruct_ov12_0221FCDC *unk_60; s16 unk_64; } UnkStruct_ov12_02228488; @@ -214,8 +213,8 @@ typedef struct { u8 unk_08; u8 unk_09; u8 unk_0A; - UnkStruct_ov12_0221FCDC * unk_0C; - Sprite * unk_10; + UnkStruct_ov12_0221FCDC *unk_0C; + Sprite *unk_10; UnkStruct_ov12_02225F6C unk_14; UnkStruct_ov12_02225F6C unk_38; } UnkStruct_ov12_0222862C; @@ -231,8 +230,8 @@ typedef struct { int unk_0C; int unk_10; int unk_14; - UnkStruct_ov12_0221FCDC * unk_18; - Sprite * unk_1C; + UnkStruct_ov12_0221FCDC *unk_18; + Sprite *unk_1C; UnkStruct_ov12_02225F6C unk_20; UnkStruct_ov12_02225F6C unk_44; } UnkStruct_ov12_02228868; @@ -240,8 +239,8 @@ typedef struct { typedef struct { int unk_00; UnkStruct_ov12_0223595C unk_04; - CellActorData * unk_20; - CellActorData * unk_24; + CellActorData *unk_20; + CellActorData *unk_24; } UnkStruct_ov12_02228B10; typedef struct { @@ -251,7 +250,7 @@ typedef struct { UnkStruct_ov12_02235998 unk_0C; UnkStruct_ov12_0223595C unk_20; UnkStruct_ov12_02225F6C unk_3C; - UnkStruct_ov12_0221FCDC * unk_60; + UnkStruct_ov12_0221FCDC *unk_60; s16 unk_64; s16 unk_66; } UnkStruct_ov12_02228BD0; @@ -273,7 +272,7 @@ typedef struct { typedef struct { UnkStruct_ov12_0223595C unk_00; UnkStruct_ov12_02235998 unk_1C; - UnkStruct_ov12_022267D4 * unk_30; + UnkStruct_ov12_022267D4 *unk_30; } UnkStruct_ov12_02229184; typedef struct { @@ -319,9 +318,9 @@ typedef struct { int unk_1C; int unk_20; int unk_24; - BGL * unk_28; - UnkStruct_ov12_0221FCDC * unk_2C; - SpriteGfxHandler * unk_30; + BGL *unk_28; + UnkStruct_ov12_0221FCDC *unk_2C; + SpriteGfxHandler *unk_30; UnkStruct_ov12_02235998 unk_34[4]; UnkStruct_ov12_02235998 unk_84[4]; UnkStruct_ov12_02225F6C unk_D4; @@ -329,7 +328,7 @@ typedef struct { typedef struct { UnkStruct_ov12_0223595C unk_00; - CellActorData * unk_1C; + CellActorData *unk_1C; s16 unk_20; int unk_24; int unk_28; @@ -351,8 +350,8 @@ typedef struct { int unk_28; int unk_2C; int unk_30; - UnkStruct_02014014 * unk_34; - UnkSPLStruct6 * unk_38; + UnkStruct_02014014 *unk_34; + UnkSPLStruct6 *unk_38; UnkStruct_ov12_0223595C unk_3C; UnkStruct_ov12_02235998 unk_58[4]; UnkStruct_ov12_02225F6C unk_A8[2]; @@ -373,8 +372,8 @@ typedef struct { int unk_28; int unk_2C; int unk_30; - UnkStruct_02014014 * unk_34; - UnkSPLStruct6 * unk_38; + UnkStruct_02014014 *unk_34; + UnkSPLStruct6 *unk_38; UnkStruct_ov12_0223595C unk_3C; UnkStruct_ov12_02225F6C unk_58; VecFx32 unk_7C; @@ -383,25 +382,25 @@ typedef struct { typedef struct { UnkStruct_ov12_0223595C unk_00; - CellActorData * unk_1C; + CellActorData *unk_1C; } UnkStruct_ov12_0222A178; typedef struct { UnkStruct_ov12_0223595C unk_00; - CellActorData * unk_1C; + CellActorData *unk_1C; UnkStruct_ov12_02225D50 unk_20; int unk_34; } UnkStruct_ov12_0222A1F478; typedef struct { UnkStruct_ov12_0223595C unk_00; - CellActorData * unk_1C; + CellActorData *unk_1C; UnkStruct_ov12_02225D50 unk_20; } UnkStruct_ov12_0222A3DC; typedef struct { UnkStruct_ov12_0223595C unk_00; - CellActorData * unk_1C; + CellActorData *unk_1C; u8 unk_20; u8 unk_21; UnkStruct_ov12_02225F6C unk_24[2]; @@ -409,7 +408,7 @@ typedef struct { typedef struct { UnkStruct_ov12_0223595C unk_00; - CellActorData * unk_1C; + CellActorData *unk_1C; int unk_20; int unk_24; int unk_28; @@ -422,7 +421,7 @@ typedef struct { typedef struct { UnkStruct_ov12_0223595C unk_00; - CellActorData * unk_1C[4]; + CellActorData *unk_1C[4]; int unk_2C; int unk_30; } UnkStruct_ov12_0222AB10; @@ -431,21 +430,21 @@ typedef struct { int unk_00; int unk_04; UnkStruct_ov12_0223595C unk_08; - UnkStruct_ov12_0222660C * unk_24; + UnkStruct_ov12_0222660C *unk_24; } UnkStruct_ov12_0222ABBC; -static int ov12_02229454(UnkStruct_ov12_0221FCDC * param0, int param1); +static int ov12_02229454(UnkStruct_ov12_0221FCDC *param0, int param1); -static void ov12_02226B84 (Sprite * param0) +static void ov12_02226B84(Sprite *param0) { sub_02007DEC(param0, 12, 0x100); sub_02007DEC(param0, 13, 0x100); } -static void ov12_02226BA0 (SysTask * param0, void * param1) +static void ov12_02226BA0(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_02226BA0 * v1 = (UnkStruct_ov12_02226BA0 *)param1; + UnkStruct_ov12_02226BA0 *v1 = (UnkStruct_ov12_02226BA0 *)param1; switch (v1->unk_04.unk_00) { case 0: @@ -490,9 +489,9 @@ static void ov12_02226BA0 (SysTask * param0, void * param1) } } -void ov12_02226CB0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02226CB0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02226BA0 * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02226BA0)); + UnkStruct_ov12_02226BA0 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02226BA0)); int v1; ov12_0223595C(param0, &v0->unk_04); @@ -512,17 +511,16 @@ void ov12_02226CB0 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_04.unk_04, ov12_02226BA0, v0); } -static void ov12_02226D38 (SysTask * param0, void * param1) +static void ov12_02226D38(SysTask *param0, void *param1) { - UnkStruct_ov12_02226D38 * v0 = (UnkStruct_ov12_02226D38 *)param1; + UnkStruct_ov12_02226D38 *v0 = (UnkStruct_ov12_02226D38 *)param1; switch (v0->unk_1C.unk_00) { case 0: G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3, v0->unk_16, v0->unk_18); sub_02019120(2, 1); v0->unk_1C.unk_00++; - case 1: - { + case 1: { int v1 = 0; if (v0->unk_16 < v0->unk_08 - 2) { @@ -544,15 +542,13 @@ static void ov12_02226D38 (SysTask * param0, void * param1) } G2_ChangeBlendAlpha(v0->unk_16, v0->unk_18); - } - break; + } break; case 2: if (v0->unk_04) { v0->unk_1C.unk_00++; } break; - case 3: - { + case 3: { int v2 = 0; if (v0->unk_16 > 2) { @@ -574,8 +570,7 @@ static void ov12_02226D38 (SysTask * param0, void * param1) } G2_ChangeBlendAlpha(v0->unk_16, v0->unk_18); - } - break; + } break; default: sub_02019120(2, 0); ov12_02220220(v0->unk_1C.unk_04, param0); @@ -612,9 +607,9 @@ static void ov12_02226D38 (SysTask * param0, void * param1) sub_02019184(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); } -void ov12_02226EB0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02226D38 * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02226D38)); + UnkStruct_ov12_02226D38 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02226D38)); int v1; ov12_0223595C(param0, &v0->unk_1C); @@ -674,17 +669,16 @@ void ov12_02226EB0 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_1C.unk_04, ov12_02226D38, v0); } -static void ov12_02227064 (SysTask * param0, void * param1) +static void ov12_02227064(SysTask *param0, void *param1) { - UnkStruct_ov12_02227064 * v0 = (UnkStruct_ov12_02227064 *)param1; + UnkStruct_ov12_02227064 *v0 = (UnkStruct_ov12_02227064 *)param1; switch (v0->unk_1C.unk_00) { case 0: G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3, v0->unk_16, v0->unk_18); sub_02019120(2, 1); v0->unk_1C.unk_00++; - case 1: - { + case 1: { int v1 = 0; if (v0->unk_16 < 16) { @@ -706,15 +700,13 @@ static void ov12_02227064 (SysTask * param0, void * param1) } G2_ChangeBlendAlpha(v0->unk_16, v0->unk_18); - } - break; + } break; case 2: if (v0->unk_04) { v0->unk_1C.unk_00++; } break; - case 3: - { + case 3: { int v2 = 0; if (v0->unk_16 > 2) { @@ -736,8 +728,7 @@ static void ov12_02227064 (SysTask * param0, void * param1) } G2_ChangeBlendAlpha(v0->unk_16, v0->unk_18); - } - break; + } break; default: sub_02019120(2, 0); ov12_02220220(v0->unk_1C.unk_04, param0); @@ -774,9 +765,9 @@ static void ov12_02227064 (SysTask * param0, void * param1) sub_02019184(v0->unk_1C.unk_14, 2, 3, v0->unk_0C); } -void ov12_022271D8 (UnkStruct_ov12_0221FCDC * param0) +void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02227064 * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02227064)); + UnkStruct_ov12_02227064 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02227064)); int v1; ov12_0223595C(param0, &v0->unk_1C); @@ -838,9 +829,9 @@ void ov12_022271D8 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_1C.unk_04, ov12_02227064, v0); } -static void ov12_02227390 (SysTask * param0, void * param1) +static void ov12_02227390(SysTask *param0, void *param1) { - UnkStruct_ov12_02227390 * v0 = param1; + UnkStruct_ov12_02227390 *v0 = param1; switch (v0->unk_00) { case 0: @@ -862,9 +853,9 @@ static void ov12_02227390 (SysTask * param0, void * param1) } } -void ov12_02227408 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02227408(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02227390 * v0; + UnkStruct_ov12_02227390 *v0; int v1; int v2; int v3; @@ -911,9 +902,9 @@ void ov12_02227408 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_04, ov12_02227390, v0); } -static void ov12_022274E4 (SysTask * param0, void * param1) +static void ov12_022274E4(SysTask *param0, void *param1) { - UnkStruct_ov12_022274E4 * v0 = param1; + UnkStruct_ov12_022274E4 *v0 = param1; if (ov12_02225BA0(&v0->unk_04, v0->unk_2C, v0->unk_2E, v0->unk_28) == 0) { sub_02007DEC(v0->unk_28, 0, v0->unk_2C); @@ -924,9 +915,9 @@ static void ov12_022274E4 (SysTask * param0, void * param1) } } -void ov12_02227534 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02227534(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_022274E4 * v0; + UnkStruct_ov12_022274E4 *v0; v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_022274E4)); v0->unk_00 = param0; @@ -960,7 +951,7 @@ void ov12_02227534 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_022274E4, v0); } -static void ov12_02227620 (UnkStruct_ov12_02227620 * param0, s16 param1, s16 param2) +static void ov12_02227620(UnkStruct_ov12_02227620 *param0, s16 param1, s16 param2) { SpriteActor_EnableObject(param0->unk_14, 1); SpriteActor_SetSpritePositionXY(param0->unk_14, param1, param2); @@ -968,7 +959,7 @@ static void ov12_02227620 (UnkStruct_ov12_02227620 * param0, s16 param1, s16 par ov12_02225E68(¶m0->unk_18, 10, 10, 14, 4); } -static BOOL ov12_02227658 (UnkStruct_ov12_02227620 * param0) +static BOOL ov12_02227658(UnkStruct_ov12_02227620 *param0) { if (ov12_022260A8(¶m0->unk_18, param0->unk_14) == 0) { if (param0->unk_40) { @@ -983,7 +974,7 @@ static BOOL ov12_02227658 (UnkStruct_ov12_02227620 * param0) return 0; } -static BOOL ov12_0222769C (UnkStruct_ov12_02227620 * param0) +static BOOL ov12_0222769C(UnkStruct_ov12_02227620 *param0) { BOOL v0 = 0; @@ -1018,9 +1009,9 @@ static BOOL ov12_0222769C (UnkStruct_ov12_02227620 * param0) return v0; } -static void ov12_02227738 (SysTask * param0, void * param1) +static void ov12_02227738(SysTask *param0, void *param1) { - UnkStruct_ov12_02227620 * v0 = param1; + UnkStruct_ov12_02227620 *v0 = param1; switch (v0->unk_0C) { case 0: @@ -1038,10 +1029,10 @@ static void ov12_02227738 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_0222777C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222777C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02227620 * v0; - Sprite * v1; + UnkStruct_ov12_02227620 *v0; + Sprite *v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02227620)); @@ -1066,9 +1057,9 @@ void ov12_0222777C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_02227738, v0); } -static void ov12_02227808 (SysTask * param0, void * param1) +static void ov12_02227808(SysTask *param0, void *param1) { - UnkStruct_ov12_02227808 * v0 = param1; + UnkStruct_ov12_02227808 *v0 = param1; if (sub_0200384C(v0->unk_04) == 0) { Heap_FreeToHeap(v0); @@ -1076,9 +1067,9 @@ static void ov12_02227808 (SysTask * param0, void * param1) } } -void ov12_02227828 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02227828(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02227808 * v0; + UnkStruct_ov12_02227808 *v0; u16 v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02227808)); @@ -1105,9 +1096,9 @@ void ov12_02227828 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_02227808, v0); } -static void ov12_022278D0 (SysTask * param0, void * param1) +static void ov12_022278D0(SysTask *param0, void *param1) { - UnkStruct_ov12_022278D0 * v0 = param1; + UnkStruct_ov12_022278D0 *v0 = param1; switch (v0->unk_08) { case 0: @@ -1148,9 +1139,9 @@ static void ov12_022278D0 (SysTask * param0, void * param1) } } -void ov12_0222797C (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222797C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_022278D0 * v0; + UnkStruct_ov12_022278D0 *v0; int v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022278D0)); @@ -1174,8 +1165,7 @@ void ov12_0222797C (UnkStruct_ov12_0221FCDC * param0) v0->unk_04 = ov12_022232FC(v0->unk_00, ov12_022352AC(v0->unk_00, ov12_02220248(v0->unk_00))); } break; - case (0x2 | 0x800): - { + case (0x2 | 0x800): { int v2; int v3; @@ -1195,10 +1185,8 @@ void ov12_0222797C (UnkStruct_ov12_0221FCDC * param0) } v0->unk_04 = ov12_022232FC(v0->unk_00, v1); - } - break; - case (0x4 | 0x800): - { + } break; + case (0x4 | 0x800): { int v4; int v5; @@ -1218,10 +1206,8 @@ void ov12_0222797C (UnkStruct_ov12_0221FCDC * param0) } v0->unk_04 = ov12_022232FC(v0->unk_00, v1); - } - break; - case (0x8 | 0x800): - { + } break; + case (0x8 | 0x800): { int v6; int v7; @@ -1241,10 +1227,8 @@ void ov12_0222797C (UnkStruct_ov12_0221FCDC * param0) } v0->unk_04 = ov12_022232FC(v0->unk_00, v1); - } - break; - case (0x10 | 0x800): - { + } break; + case (0x10 | 0x800): { int v8; int v9; @@ -1264,8 +1248,7 @@ void ov12_0222797C (UnkStruct_ov12_0221FCDC * param0) } v0->unk_04 = ov12_022232FC(v0->unk_00, v1); - } - break; + } break; default: GF_ASSERT(0); break; @@ -1285,9 +1268,9 @@ void ov12_0222797C (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_022278D0, v0); } -static void ov12_02227B4C (SysTask * param0, void * param1) +static void ov12_02227B4C(SysTask *param0, void *param1) { - UnkStruct_ov12_02227B4C * v0 = param1; + UnkStruct_ov12_02227B4C *v0 = param1; f32 v1, v2; BOOL v3; @@ -1354,10 +1337,10 @@ static void ov12_02227B4C (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_04); } -void ov12_02227CBC (UnkStruct_ov12_0221FCDC * param0) +void ov12_02227CBC(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02227B4C * v0; - Sprite * v1; + UnkStruct_ov12_02227B4C *v0; + Sprite *v1; int v2; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02227B4C)); @@ -1404,9 +1387,9 @@ void ov12_02227CBC (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02227DE0 (SysTask * param0, void * param1) +static void ov12_02227DE0(SysTask *param0, void *param1) { - UnkStruct_ov12_02227DE0 * v0 = param1; + UnkStruct_ov12_02227DE0 *v0 = param1; switch (v0->unk_04) { case 0: @@ -1454,11 +1437,11 @@ static void ov12_02227DE0 (SysTask * param0, void * param1) } } -void ov12_02227F30 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02227F30(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02227DE0 * v0; + UnkStruct_ov12_02227DE0 *v0; UnkStruct_ov12_02235998 v1[4]; - SysTask * v2; + SysTask *v2; int v3; int v4; @@ -1478,8 +1461,7 @@ void ov12_02227F30 (UnkStruct_ov12_0221FCDC * param0) ov12_02235998(v0->unk_00, ov12_02220280(param0, 0), v1, &v3); v0->unk_0C = v1[0].unk_08; break; - case (0x2 | 0x800): - { + case (0x2 | 0x800): { int v5; int v6; @@ -1499,10 +1481,8 @@ void ov12_02227F30 (UnkStruct_ov12_0221FCDC * param0) } v0->unk_0C = ov12_022232FC(v0->unk_00, v4); - } - break; - case (0x4 | 0x800): - { + } break; + case (0x4 | 0x800): { int v7; int v8; @@ -1522,10 +1502,8 @@ void ov12_02227F30 (UnkStruct_ov12_0221FCDC * param0) } v0->unk_0C = ov12_022232FC(v0->unk_00, v4); - } - break; - case (0x8 | 0x800): - { + } break; + case (0x8 | 0x800): { int v9; int v10; @@ -1545,10 +1523,8 @@ void ov12_02227F30 (UnkStruct_ov12_0221FCDC * param0) } v0->unk_0C = ov12_022232FC(v0->unk_00, v4); - } - break; - case (0x10 | 0x800): - { + } break; + case (0x10 | 0x800): { int v11; int v12; @@ -1568,8 +1544,7 @@ void ov12_02227F30 (UnkStruct_ov12_0221FCDC * param0) } v0->unk_0C = ov12_022232FC(v0->unk_00, v4); - } - break; + } break; } if (v0->unk_0C == NULL) { @@ -1594,9 +1569,9 @@ void ov12_02227F30 (UnkStruct_ov12_0221FCDC * param0) ov12_02227DE0(v2, v0); } -static void ov12_0222813C (SysTask * param0, void * param1) +static void ov12_0222813C(SysTask *param0, void *param1) { - UnkStruct_ov12_0222813C * v0 = param1; + UnkStruct_ov12_0222813C *v0 = param1; if (ov12_02226454(&v0->unk_08)) { Heap_FreeToHeap(v0); @@ -1606,12 +1581,12 @@ static void ov12_0222813C (SysTask * param0, void * param1) } } -void ov12_02228168 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02228168(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222813C * v0; + UnkStruct_ov12_0222813C *v0; int v1; int v2; - CellActorData * v3; + CellActorData *v3; int v4; int v5; @@ -1637,7 +1612,7 @@ void ov12_02228168 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_0222813C, v0); } -void ov12_02228214 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02228214(UnkStruct_ov12_0221FCDC *param0) { UnkStruct_ov12_02235998 v0; int v1; @@ -1655,9 +1630,9 @@ void ov12_02228214 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02228268 (SysTask * param0, void * param1) +static void ov12_02228268(SysTask *param0, void *param1) { - UnkStruct_ov12_02228268 * v0 = (UnkStruct_ov12_02228268 *)param1; + UnkStruct_ov12_02228268 *v0 = (UnkStruct_ov12_02228268 *)param1; if (v0->unk_04 >= v0->unk_08) { if (v0->unk_00 == 0) { @@ -1677,9 +1652,9 @@ static void ov12_02228268 (SysTask * param0, void * param1) } } -void ov12_022282BC (UnkStruct_ov12_0221FCDC * param0) +void ov12_022282BC(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02228268 * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228268)); + UnkStruct_ov12_02228268 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228268)); v0->unk_3C = param0; v0->unk_00 = ov12_02220280(param0, 0) * 2; @@ -1690,9 +1665,9 @@ void ov12_022282BC (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_3C, ov12_02228268, v0); } -static void ov12_0222830C (SysTask * param0, void * param1) +static void ov12_0222830C(SysTask *param0, void *param1) { - UnkStruct_ov12_0222830C * v0 = (UnkStruct_ov12_0222830C *)param1; + UnkStruct_ov12_0222830C *v0 = (UnkStruct_ov12_0222830C *)param1; switch (v0->unk_24.unk_00) { case 0: @@ -1713,12 +1688,12 @@ static void ov12_0222830C (SysTask * param0, void * param1) } } -void ov12_02228394 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02228394(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; int v2; - UnkStruct_ov12_0222830C * v3 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222830C)); + UnkStruct_ov12_0222830C *v3 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222830C)); v3->unk_64 = param0; v3->unk_08 = ov12_02220280(param0, 0); @@ -1769,9 +1744,9 @@ void ov12_02228394 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v3->unk_64, ov12_0222830C, v3); } -static void ov12_02228488 (SysTask * param0, void * param1) +static void ov12_02228488(SysTask *param0, void *param1) { - UnkStruct_ov12_02228488 * v0 = (UnkStruct_ov12_02228488 *)param1; + UnkStruct_ov12_02228488 *v0 = (UnkStruct_ov12_02228488 *)param1; switch (v0->unk_20.unk_00) { case 0: @@ -1796,12 +1771,12 @@ static void ov12_02228488 (SysTask * param0, void * param1) } } -void ov12_02228520 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02228520(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; int v2; - UnkStruct_ov12_02228488 * v3 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228488)); + UnkStruct_ov12_02228488 *v3 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228488)); v3->unk_60 = param0; v3->unk_08 = ov12_02220280(param0, 0); @@ -1853,16 +1828,16 @@ void ov12_02228520 (UnkStruct_ov12_0221FCDC * param0) } { - SysTask * v4; + SysTask *v4; v4 = ov12_022201E8(v3->unk_60, ov12_02228488, v3); ov12_02228488(v4, v3); } } -static void ov12_0222862C (SysTask * param0, void * param1) +static void ov12_0222862C(SysTask *param0, void *param1) { - UnkStruct_ov12_0222862C * v0 = (UnkStruct_ov12_0222862C *)param1; + UnkStruct_ov12_0222862C *v0 = (UnkStruct_ov12_0222862C *)param1; switch (v0->unk_00) { case 0: @@ -1923,9 +1898,9 @@ static void ov12_0222862C (SysTask * param0, void * param1) } } -void ov12_022287CC (UnkStruct_ov12_0221FCDC * param0) +void ov12_022287CC(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222862C * v0; + UnkStruct_ov12_0222862C *v0; v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222862C)); @@ -1943,9 +1918,9 @@ void ov12_022287CC (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_0C, ov12_0222862C, v0); } -static void ov12_02228868 (SysTask * param0, void * param1) +static void ov12_02228868(SysTask *param0, void *param1) { - UnkStruct_ov12_02228868 * v0 = (UnkStruct_ov12_02228868 *)param1; + UnkStruct_ov12_02228868 *v0 = (UnkStruct_ov12_02228868 *)param1; switch (v0->unk_00) { case 0: @@ -2018,9 +1993,9 @@ static void ov12_02228868 (SysTask * param0, void * param1) } } -void ov12_02228A0C (UnkStruct_ov12_0221FCDC * param0) +void ov12_02228A0C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02228868 * v0; + UnkStruct_ov12_02228868 *v0; v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_02228868)); @@ -2056,9 +2031,9 @@ void ov12_02228A0C (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_18, ov12_02228868, v0); } -static void ov12_02228B10 (SysTask * param0, void * param1) +static void ov12_02228B10(SysTask *param0, void *param1) { - UnkStruct_ov12_02228B10 * v0 = (UnkStruct_ov12_02228B10 *)param1; + UnkStruct_ov12_02228B10 *v0 = (UnkStruct_ov12_02228B10 *)param1; switch (v0->unk_04.unk_00) { default: @@ -2073,10 +2048,10 @@ static void ov12_02228B10 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_04.unk_0C); } -void ov12_02228B40 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02228B40(UnkStruct_ov12_0221FCDC *param0) { int v0; - UnkStruct_ov12_02228B10 * v1 = NULL; + UnkStruct_ov12_02228B10 *v1 = NULL; v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228B10)); v0 = ov12_02220280(param0, 0); @@ -2097,9 +2072,9 @@ void ov12_02228B40 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v1->unk_04.unk_04, ov12_02228B10, v1); } -static void ov12_02228BD0 (SysTask * param0, void * param1) +static void ov12_02228BD0(SysTask *param0, void *param1) { - UnkStruct_ov12_02228BD0 * v0 = (UnkStruct_ov12_02228BD0 *)param1; + UnkStruct_ov12_02228BD0 *v0 = (UnkStruct_ov12_02228BD0 *)param1; switch (v0->unk_20.unk_00) { case 0: @@ -2120,12 +2095,12 @@ static void ov12_02228BD0 (SysTask * param0, void * param1) } } -void ov12_02228C6C (UnkStruct_ov12_0221FCDC * param0) +void ov12_02228C6C(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; int v2; - UnkStruct_ov12_02228BD0 * v3 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228BD0)); + UnkStruct_ov12_02228BD0 *v3 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228BD0)); v3->unk_60 = param0; v3->unk_08 = ov12_02220280(param0, 0); @@ -2186,17 +2161,17 @@ void ov12_02228C6C (UnkStruct_ov12_0221FCDC * param0) } { - SysTask * v4; + SysTask *v4; v4 = ov12_022201E8(v3->unk_60, ov12_02228BD0, v3); ov12_02228BD0(v4, v3); } } -static void ov12_02228DB8 (SysTask * param0, void * param1) +static void ov12_02228DB8(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_02228DB8 * v1 = (UnkStruct_ov12_02228DB8 *)param1; + UnkStruct_ov12_02228DB8 *v1 = (UnkStruct_ov12_02228DB8 *)param1; v0 = ov12_02225BA0(&v1->unk_30, v1->unk_1C.unk_04.unk_00, v1->unk_1C.unk_04.unk_02, v1->unk_1C.unk_08); @@ -2208,10 +2183,10 @@ static void ov12_02228DB8 (SysTask * param0, void * param1) } } -void ov12_02228E00 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02228E00(UnkStruct_ov12_0221FCDC *param0) { int v0; - UnkStruct_ov12_02228DB8 * v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228DB8)); + UnkStruct_ov12_02228DB8 *v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228DB8)); ov12_0223595C(param0, &v1->unk_00); ov12_02235998(param0, ov12_02220280(param0, 0), &(v1->unk_1C), &v0); @@ -2228,9 +2203,9 @@ void ov12_02228E00 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v1->unk_00.unk_04, ov12_02228DB8, v1); } -static void ov12_02228E78 (SysTask * param0, void * param1) +static void ov12_02228E78(SysTask *param0, void *param1) { - UnkStruct_ov12_02228E78 * v0 = (UnkStruct_ov12_02228E78 *)param1; + UnkStruct_ov12_02228E78 *v0 = (UnkStruct_ov12_02228E78 *)param1; switch (v0->unk_00.unk_00) { case 0: @@ -2248,14 +2223,14 @@ static void ov12_02228E78 (SysTask * param0, void * param1) } } -void ov12_02228EC0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02228EC0(UnkStruct_ov12_0221FCDC *param0) { UnkStruct_ov12_02235350 v0; int v1; int v2; int v3; int v4; - UnkStruct_ov12_02228E78 * v5 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228E78)); + UnkStruct_ov12_02228E78 *v5 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228E78)); ov12_0223595C(param0, &v5->unk_00); @@ -2296,7 +2271,7 @@ void ov12_02228EC0 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v5->unk_00.unk_04, ov12_02228E78, v5); } -void ov12_02228FB4 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02228FB4(UnkStruct_ov12_0221FCDC *param0) { UnkStruct_ov12_02235350 v0; int v1; @@ -2304,7 +2279,7 @@ void ov12_02228FB4 (UnkStruct_ov12_0221FCDC * param0) int v3; int v4; int v5; - UnkStruct_ov12_02228E78 * v6 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228E78)); + UnkStruct_ov12_02228E78 *v6 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02228E78)); ov12_0223595C(param0, &v6->unk_00); @@ -2354,7 +2329,7 @@ void ov12_02228FB4 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v6->unk_00.unk_04, ov12_02228E78, v6); } -void ov12_022290DC (UnkStruct_ov12_0221FCDC * param0) +void ov12_022290DC(UnkStruct_ov12_0221FCDC *param0) { int v0; int v1; @@ -2393,9 +2368,9 @@ void ov12_022290DC (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02229184 (SysTask * param0, void * param1) +static void ov12_02229184(SysTask *param0, void *param1) { - UnkStruct_ov12_02229184 * v0 = (UnkStruct_ov12_02229184 *)param1; + UnkStruct_ov12_02229184 *v0 = (UnkStruct_ov12_02229184 *)param1; if (ov12_02226848(v0->unk_30) == 0) { ov12_02226858(v0->unk_30); @@ -2404,10 +2379,10 @@ static void ov12_02229184 (SysTask * param0, void * param1) } } -void ov12_022291AC (UnkStruct_ov12_0221FCDC * param0) +void ov12_022291AC(UnkStruct_ov12_0221FCDC *param0) { int v0; - UnkStruct_ov12_02229184 * v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229184)); + UnkStruct_ov12_02229184 *v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229184)); ov12_0223595C(param0, &v1->unk_00); @@ -2429,13 +2404,12 @@ void ov12_022291AC (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v1->unk_00.unk_04, ov12_02229184, v1); } -static void ov12_02229278 (SysTask * param0, void * param1) +static void ov12_02229278(SysTask *param0, void *param1) { - UnkStruct_ov12_02229278 * v0 = (UnkStruct_ov12_02229278 *)param1; + UnkStruct_ov12_02229278 *v0 = (UnkStruct_ov12_02229278 *)param1; switch (v0->unk_00.unk_00) { - case 0: - { + case 0: { if ((++v0->unk_4C) < v0->unk_44) { return; } @@ -2465,8 +2439,7 @@ static void ov12_02229278 (SysTask * param0, void * param1) v0->unk_50 -= v0->unk_42; v0->unk_54 += v0->unk_42; - } - break; + } break; default: ov12_02226B84(v0->unk_1C.unk_08); ov12_02220220(v0->unk_00.unk_04, param0); @@ -2475,9 +2448,9 @@ static void ov12_02229278 (SysTask * param0, void * param1) } } -void ov12_02229304 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02229304(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02229278 * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229278)); + UnkStruct_ov12_02229278 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229278)); ov12_0223595C(param0, &v0->unk_00); @@ -2534,7 +2507,7 @@ void ov12_02229304 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00.unk_04, ov12_02229278, v0); } -static int ov12_02229454 (UnkStruct_ov12_0221FCDC * param0, int param1) +static int ov12_02229454(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0 = 0; @@ -2559,9 +2532,9 @@ static int ov12_02229454 (UnkStruct_ov12_0221FCDC * param0, int param1) return v0; } -static void ov12_022294AC (SysTask * param0, void * param1) +static void ov12_022294AC(SysTask *param0, void *param1) { - UnkStruct_ov12_022294AC * v0 = (UnkStruct_ov12_022294AC *)param1; + UnkStruct_ov12_022294AC *v0 = (UnkStruct_ov12_022294AC *)param1; switch (v0->unk_00.unk_00) { case 0: @@ -2592,9 +2565,9 @@ static void ov12_022294AC (SysTask * param0, void * param1) } } -static void ov12_02229538 (SysTask * param0, void * param1) +static void ov12_02229538(SysTask *param0, void *param1) { - UnkStruct_ov12_022294AC * v0 = (UnkStruct_ov12_022294AC *)param1; + UnkStruct_ov12_022294AC *v0 = (UnkStruct_ov12_022294AC *)param1; switch (v0->unk_00.unk_00) { case 0: @@ -2625,9 +2598,9 @@ static void ov12_02229538 (SysTask * param0, void * param1) } } -static void ov12_022295C4 (SysTask * param0, void * param1) +static void ov12_022295C4(SysTask *param0, void *param1) { - UnkStruct_ov12_022294AC * v0 = (UnkStruct_ov12_022294AC *)param1; + UnkStruct_ov12_022294AC *v0 = (UnkStruct_ov12_022294AC *)param1; switch (v0->unk_00.unk_00) { case 0: @@ -2655,9 +2628,9 @@ static void ov12_022295C4 (SysTask * param0, void * param1) } } -void ov12_02229638 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02229638(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_022294AC * v0; + UnkStruct_ov12_022294AC *v0; int v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022294AC)); @@ -2704,17 +2677,16 @@ void ov12_02229638 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_02229738 (SysTask * param0, void * param1) +static void ov12_02229738(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_02229738 * v1 = (UnkStruct_ov12_02229738 *)param1; + UnkStruct_ov12_02229738 *v1 = (UnkStruct_ov12_02229738 *)param1; switch (v1->unk_00) { case 0: ov12_02226108(&v1->unk_D4, v1->unk_04, v1->unk_08, v1->unk_0C, v1->unk_10); v1->unk_00++; - case 1: - { + case 1: { if (ov12_02226138(&v1->unk_D4) == 0) { if (v1->unk_01 >= v1->unk_18) { v1->unk_00++; @@ -2742,8 +2714,7 @@ static void ov12_02229738 (SysTask * param0, void * param1) sub_02019184(v1->unk_28, v1->unk_1C, 3, v1->unk_D4.unk_02); } } - } - break; + } break; default: ov12_02220220(v1->unk_2C, param0); Heap_FreeToHeap(v1); @@ -2751,10 +2722,10 @@ static void ov12_02229738 (SysTask * param0, void * param1) } } -void ov12_02229810 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02229810(UnkStruct_ov12_0221FCDC *param0) { int v0; - UnkStruct_ov12_02229738 * v1; + UnkStruct_ov12_02229738 *v1; v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229738)); @@ -2778,9 +2749,9 @@ void ov12_02229810 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v1->unk_2C, ov12_02229738, v1); } -static void ov12_0222988C (SysTask * param0, void * param1) +static void ov12_0222988C(SysTask *param0, void *param1) { - UnkStruct_ov12_0222988C * v0 = param1; + UnkStruct_ov12_0222988C *v0 = param1; if ((v0->unk_24 == v0->unk_2C) || (v0->unk_28 == v0->unk_2C)) { ov12_02220220(v0->unk_00.unk_04, param0); @@ -2811,9 +2782,9 @@ static void ov12_0222988C (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_0C); } -void ov12_02229908 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02229908(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222988C * v0; + UnkStruct_ov12_0222988C *v0; int v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222988C)); @@ -2836,14 +2807,14 @@ void ov12_02229908 (UnkStruct_ov12_0221FCDC * param0) sub_0200D7FC(v0->unk_1C, 1); { - SysTask * v2; + SysTask *v2; v2 = ov12_022201E8(v0->unk_00.unk_04, ov12_0222988C, v0); ov12_0222988C(v2, v0); } } -static void ov12_02229980 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_02229980 * param1) +static void ov12_02229980(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02229980 *param1) { param1->unk_00 = ov12_02220280(param0, 0); param1->unk_0C.unk_00 = ov12_02220280(param0, 1); @@ -2888,14 +2859,14 @@ static void ov12_02229980 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_0222 } } -static BOOL ov12_02229A50 (UnkSPLStruct6 * param0) +static BOOL ov12_02229A50(UnkSPLStruct6 *param0) { BOOL v0; v0 = 0; { - UnkSPLStruct8 * v1; + UnkSPLStruct8 *v1; int v2; int v3; @@ -2915,9 +2886,9 @@ static BOOL ov12_02229A50 (UnkSPLStruct6 * param0) return v0; } -static void ov12_02229A6C (SysTask * param0, void * param1) +static void ov12_02229A6C(SysTask *param0, void *param1) { - UnkStruct_ov12_02229980 * v0 = param1; + UnkStruct_ov12_02229980 *v0 = param1; BOOL v1; v1 = ov12_02229A50(v0->unk_38); @@ -2948,12 +2919,12 @@ static void ov12_02229A6C (SysTask * param0, void * param1) } } -void ov12_02229B28 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02229B28(UnkStruct_ov12_0221FCDC *param0) { int v0; VecFx32 v1; VecFx32 v2; - UnkStruct_ov12_02229980 * v3; + UnkStruct_ov12_02229980 *v3; v3 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229980)); @@ -2990,12 +2961,12 @@ void ov12_02229B28 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v3->unk_3C.unk_04, ov12_02229A6C, v3); } -void ov12_02229C5C (UnkStruct_ov12_0221FCDC * param0) +void ov12_02229C5C(UnkStruct_ov12_0221FCDC *param0) { VecFx32 v0; VecFx32 v1; int v2; - UnkStruct_ov12_02229980 * v3; + UnkStruct_ov12_02229980 *v3; v3 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229980)); ov12_0223595C(param0, &v3->unk_3C); @@ -3071,9 +3042,9 @@ void ov12_02229C5C (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v3->unk_3C.unk_04, ov12_02229A6C, v3); } -static void ov12_02229DF0 (SysTask * param0, void * param1) +static void ov12_02229DF0(SysTask *param0, void *param1) { - UnkStruct_ov12_02229980 * v0 = param1; + UnkStruct_ov12_02229980 *v0 = param1; BOOL v1; v1 = ov12_02229A50(v0->unk_38); @@ -3090,12 +3061,12 @@ static void ov12_02229DF0 (SysTask * param0, void * param1) } } -void ov12_02229E54 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02229E54(UnkStruct_ov12_0221FCDC *param0) { int v0; VecFx32 v1; VecFx32 v2; - UnkStruct_ov12_02229980 * v3; + UnkStruct_ov12_02229980 *v3; v3 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229980)); @@ -3132,9 +3103,9 @@ void ov12_02229E54 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v3->unk_3C.unk_04, ov12_02229DF0, v3); } -static void ov12_02229F9C (SysTask * param0, void * param1) +static void ov12_02229F9C(SysTask *param0, void *param1) { - UnkStruct_ov12_02229F9C * v0 = param1; + UnkStruct_ov12_02229F9C *v0 = param1; BOOL v1; v1 = ov12_02229A50(v0->unk_38); @@ -3154,9 +3125,9 @@ static void ov12_02229F9C (SysTask * param0, void * param1) } } -void ov12_0222A00C (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222A00C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02229F9C * v0; + UnkStruct_ov12_02229F9C *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02229F9C)); @@ -3200,10 +3171,10 @@ void ov12_0222A00C (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_3C.unk_04, ov12_02229F9C, v0); } -static void ov12_0222A178 (SysTask * param0, void * param1) +static void ov12_0222A178(SysTask *param0, void *param1) { BOOL v0; - UnkStruct_ov12_0222A178 * v1 = (UnkStruct_ov12_0222A178 *)param1; + UnkStruct_ov12_0222A178 *v1 = (UnkStruct_ov12_0222A178 *)param1; v0 = 1; v0 = sub_0200D3B8(v1->unk_1C); @@ -3219,9 +3190,9 @@ static void ov12_0222A178 (SysTask * param0, void * param1) sub_0200C7EC(v1->unk_00.unk_10); } -void ov12_0222A1AC (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222A1AC(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_0222A178 * v0 = NULL; + UnkStruct_ov12_0222A178 *v0 = NULL; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222A178)); ov12_0223595C(param0, &v0->unk_00); @@ -3287,13 +3258,12 @@ static const s16 Unk_ov12_0223A03C[] = { 0xFF }; -static void ov12_0222A1F4 (SysTask * param0, void * param1) +static void ov12_0222A1F4(SysTask *param0, void *param1) { - UnkStruct_ov12_0222A1F478 * v0 = param1; + UnkStruct_ov12_0222A1F478 *v0 = param1; switch (v0->unk_00.unk_00) { - case 0: - { + case 0: { s16 v1 = Unk_ov12_0223A03C[v0->unk_34]; v0->unk_34++; @@ -3322,10 +3292,8 @@ static void ov12_0222A1F4 (SysTask * param0, void * param1) v0->unk_34 = 0; v0->unk_00.unk_00++; } - } - break; - case 1: - { + } break; + case 1: { if (ov12_02225DA0(&v0->unk_20) == 1) { sub_0200D79C(v0->unk_1C, v0->unk_20.unk_00); } else { @@ -3353,8 +3321,7 @@ static void ov12_0222A1F4 (SysTask * param0, void * param1) } } } - } - break; + } break; default: sub_0200D0F4(v0->unk_1C); ov12_02220220(v0->unk_00.unk_04, param0); @@ -3366,9 +3333,9 @@ static void ov12_0222A1F4 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_10); } -void ov12_0222A34C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222A34C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_0222A1F478 * v0 = NULL; + UnkStruct_ov12_0222A1F478 *v0 = NULL; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222A1F478)); @@ -3397,9 +3364,9 @@ void ov12_0222A34C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00.unk_04, ov12_0222A1F4, v0); } -static void ov12_0222A3DC (SysTask * param0, void * param1) +static void ov12_0222A3DC(SysTask *param0, void *param1) { - UnkStruct_ov12_0222A3DC * v0 = param1; + UnkStruct_ov12_0222A3DC *v0 = param1; BOOL v1; v1 = sub_0200D3B8(v0->unk_1C); @@ -3415,9 +3382,9 @@ static void ov12_0222A3DC (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_10); } -void ov12_0222A410 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222A410(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_0222A3DC * v0; + UnkStruct_ov12_0222A3DC *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222A1F478)); ov12_0223595C(param0, &v0->unk_00); @@ -3451,9 +3418,9 @@ void ov12_0222A410 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00.unk_04, ov12_0222A3DC, v0); } -static void ov12_0222A4A0 (SysTask * param0, void * param1) +static void ov12_0222A4A0(SysTask *param0, void *param1) { - UnkStruct_ov12_0222A4A0 * v0 = param1; + UnkStruct_ov12_0222A4A0 *v0 = param1; BOOL v1; switch (v0->unk_00.unk_00) { @@ -3466,8 +3433,7 @@ static void ov12_0222A4A0 (SysTask * param0, void * param1) v0->unk_00.unk_00++; } break; - case 2: - { + case 2: { BOOL v2 = sub_0200D3B8(v0->unk_1C); if (v2 == 0) { @@ -3477,8 +3443,7 @@ static void ov12_0222A4A0 (SysTask * param0, void * param1) ov12_02235780(v0->unk_00.unk_04, v0->unk_20, v0->unk_21); v0->unk_00.unk_00++; } - } - break; + } break; case 3: if (v0->unk_20 > 0) { v0->unk_20--; @@ -3505,9 +3470,9 @@ static void ov12_0222A4A0 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_10); } -void ov12_0222A5C0 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222A5C0(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_0222A4A0 * v0; + UnkStruct_ov12_0222A4A0 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222A4A0)); ov12_0223595C(param0, &v0->unk_00); @@ -3519,7 +3484,7 @@ void ov12_0222A5C0 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00.unk_04, ov12_0222A4A0, v0); } -void ov12_0222A604 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222A604(UnkStruct_ov12_0221FCDC *param0) { int v0 = ov12_02220280(param0, 0); @@ -3530,7 +3495,7 @@ void ov12_0222A604 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_0222A624 (UnkStruct_ov12_0222A624 * param0) +static void ov12_0222A624(UnkStruct_ov12_0222A624 *param0) { switch (param0->unk_00.unk_00) { case 0: @@ -3633,9 +3598,9 @@ static void ov12_0222A624 (UnkStruct_ov12_0222A624 * param0) } } -static void ov12_0222A878 (SysTask * param0, void * param1) +static void ov12_0222A878(SysTask *param0, void *param1) { - UnkStruct_ov12_0222A624 * v0 = param1; + UnkStruct_ov12_0222A624 *v0 = param1; if (v0->unk_30 != 0) { ov12_0222A624(v0); @@ -3661,9 +3626,9 @@ static void ov12_0222A878 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_0C); } -void ov12_0222A8F4 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222A8F4(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222A624 * v0; + UnkStruct_ov12_0222A624 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222A624)); ov12_0223595C(param0, &v0->unk_00); @@ -3780,10 +3745,10 @@ void ov12_0222A8F4 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00.unk_04, ov12_0222A878, v0); } -static void ov12_0222AB10 (SysTask * param0, void * param1) +static void ov12_0222AB10(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_0222AB10 * v1 = (UnkStruct_ov12_0222AB10 *)param1; + UnkStruct_ov12_0222AB10 *v1 = (UnkStruct_ov12_0222AB10 *)param1; if (v1->unk_2C == 0) { ov12_02220220(v1->unk_00.unk_04, param0); @@ -3804,9 +3769,9 @@ static void ov12_0222AB10 (SysTask * param0, void * param1) sub_0200C7EC(v1->unk_00.unk_0C); } -void ov12_0222AB50 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222AB50(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222AB10 * v0; + UnkStruct_ov12_0222AB10 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222AB10)); ov12_0223595C(param0, &v0->unk_00); @@ -3820,7 +3785,10 @@ void ov12_0222AB50 (UnkStruct_ov12_0221FCDC * param0) { int v1; static int v2[4] = { - 20, 10, 10, 20, + 20, + 10, + 10, + 20, }; for (v1 = 0; v1 < 4; v1++) { @@ -3833,19 +3801,19 @@ void ov12_0222AB50 (UnkStruct_ov12_0221FCDC * param0) } { - SysTask * v3 = ov12_022201E8(v0->unk_00.unk_04, ov12_0222AB10, v0); + SysTask *v3 = ov12_022201E8(v0->unk_00.unk_04, ov12_0222AB10, v0); ov12_0222AB10(v3, v0); } } -static void ov12_0222ABBC (SysTask * param0, void * param1) +static void ov12_0222ABBC(SysTask *param0, void *param1) { - UnkStruct_ov12_0222ABBC * v0 = (UnkStruct_ov12_0222ABBC *)param1; + UnkStruct_ov12_0222ABBC *v0 = (UnkStruct_ov12_0222ABBC *)param1; switch (v0->unk_08.unk_00) { case 0: v0->unk_00 = 0; - v0->unk_24 = ov12_0222662C(0, 160, (((1 * 0xffff) / 360)), (32 * FX32_ONE), (2 * 100), ov12_022233EC(v0->unk_08.unk_04, 2), 0, ov12_022266E8(0, 0), ov12_0221FDE4(v0->unk_08.unk_04)); + v0->unk_24 = ov12_0222662C(0, 160, ((1 * 0xffff) / 360), (32 * FX32_ONE), (2 * 100), ov12_022233EC(v0->unk_08.unk_04, 2), 0, ov12_022266E8(0, 0), ov12_0221FDE4(v0->unk_08.unk_04)); v0->unk_08.unk_00++; break; case 1: @@ -3864,9 +3832,9 @@ static void ov12_0222ABBC (SysTask * param0, void * param1) } } -void ov12_0222AC40 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222AC40(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222ABBC * v0 = NULL; + UnkStruct_ov12_0222ABBC *v0 = NULL; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222ABBC)); ov12_0223595C(param0, &v0->unk_08); diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c index bee91ce6f1..805dc3ad70 100644 --- a/src/overlay012/ov12_0222AC70.c +++ b/src/overlay012/ov12_0222AC70.c @@ -1,36 +1,37 @@ +#include "overlay012/ov12_0222AC70.h" + #include #include -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "overlay012/struct_ov12_022267D4_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" + +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02225864.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02225D50.h" #include "overlay012/struct_ov12_02225F6C.h" #include "overlay012/struct_ov12_02226454.h" +#include "overlay012/struct_ov12_022267D4_decl.h" #include "overlay012/struct_ov12_0222C7E0_sub1.h" #include "overlay012/struct_ov12_02235350.h" #include "overlay012/struct_ov12_0223595C.h" #include "overlay012/struct_ov12_02235998.h" -#include "struct_defs/sprite_template.h" +#include "heap.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201F834.h" #include "unk_020218BC.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_0222AC70.h" -#include "overlay012/ov12_02235254.h" typedef struct { u8 unk_00; @@ -38,10 +39,10 @@ typedef struct { u8 unk_04; u8 unk_05; u8 unk_06; - UnkStruct_ov12_0221FCDC * unk_08; - SpriteRenderer * unk_0C; - SpriteGfxHandler * unk_10; - CellActorData * unk_14[3]; + UnkStruct_ov12_0221FCDC *unk_08; + SpriteRenderer *unk_0C; + SpriteGfxHandler *unk_10; + CellActorData *unk_14[3]; UnkStruct_ov12_02225F6C unk_20; } UnkStruct_ov12_0222AC70; @@ -51,8 +52,8 @@ typedef struct { s16 unk_02; int unk_04; u8 unk_08; - UnkStruct_ov12_0221FCDC * unk_0C; - Sprite * unk_10; + UnkStruct_ov12_0221FCDC *unk_0C; + Sprite *unk_10; UnkStruct_ov12_02225F6C unk_14; UnkStruct_ov12_02225F6C unk_38; } UnkStruct_ov12_0222AFA0; @@ -62,8 +63,8 @@ typedef struct { u8 unk_01; s16 unk_02; int unk_04; - UnkStruct_ov12_0221FCDC * unk_08; - Sprite * unk_0C; + UnkStruct_ov12_0221FCDC *unk_08; + Sprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; UnkStruct_ov12_02225F6C unk_34; } UnkStruct_ov12_0222B220; @@ -77,10 +78,10 @@ typedef struct { u16 unk_06; s16 unk_08; s16 unk_0A; - UnkStruct_ov12_0221FCDC * unk_0C; - Sprite * unk_10; - SpriteGfxHandler * unk_14; - CellActorData * unk_18[4]; + UnkStruct_ov12_0221FCDC *unk_0C; + Sprite *unk_10; + SpriteGfxHandler *unk_14; + CellActorData *unk_18[4]; UnkStruct_ov12_02225F6C unk_28[4]; } UnkStruct_ov12_0222B4C8; @@ -88,8 +89,8 @@ typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; - UnkStruct_ov12_0221FCDC * unk_04; - Sprite * unk_08; + UnkStruct_ov12_0221FCDC *unk_04; + Sprite *unk_08; UnkStruct_ov12_02225F6C unk_0C; } UnkStruct_ov12_0222B914; @@ -98,8 +99,8 @@ typedef struct { u8 unk_01; s16 unk_02; s16 unk_04; - UnkStruct_ov12_0221FCDC * unk_08; - Sprite * unk_0C; + UnkStruct_ov12_0221FCDC *unk_08; + Sprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; } UnkStruct_ov12_0222BA18; @@ -109,18 +110,18 @@ typedef struct { s16 unk_02; s16 unk_04; s16 unk_06; - UnkStruct_ov12_0221FCDC * unk_08; - Sprite * unk_0C; + UnkStruct_ov12_0221FCDC *unk_08; + Sprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; } UnkStruct_ov12_0222BB30; typedef struct { u8 unk_00; u8 unk_01; - PaletteData * unk_04; - UnkStruct_ov12_0221FCDC * unk_08; - UnkStruct_ov12_022267D4 * unk_0C; - Sprite * unk_10; + PaletteData *unk_04; + UnkStruct_ov12_0221FCDC *unk_08; + UnkStruct_ov12_022267D4 *unk_0C; + Sprite *unk_10; } UnkStruct_ov12_0222BD48; typedef struct { @@ -129,8 +130,8 @@ typedef struct { u8 unk_02; s16 unk_04; s16 unk_06; - UnkStruct_ov12_0221FCDC * unk_08; - Sprite * unk_0C; + UnkStruct_ov12_0221FCDC *unk_08; + Sprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; UnkStruct_ov12_02225F6C unk_34; } UnkStruct_ov12_0222BE80; @@ -138,16 +139,16 @@ typedef struct { typedef struct { u8 unk_00; u8 unk_01; - UnkStruct_ov12_0221FCDC * unk_04; - SpriteGfxHandler * unk_08; - CellActorData * unk_0C; - CellActorData * unk_10; + UnkStruct_ov12_0221FCDC *unk_04; + SpriteGfxHandler *unk_08; + CellActorData *unk_0C; + CellActorData *unk_10; } UnkStruct_ov12_0222BFF4; typedef struct { u8 unk_00; u8 unk_01; - CellActorData * unk_04; + CellActorData *unk_04; UnkStruct_ov12_02225F6C unk_08; } UnkStruct_ov12_0222C1A4_sub1; @@ -157,9 +158,9 @@ typedef struct { s16 unk_02; int unk_04; s8 unk_08; - Sprite * unk_0C; - UnkStruct_ov12_0221FCDC * unk_10; - SpriteGfxHandler * unk_14; + Sprite *unk_0C; + UnkStruct_ov12_0221FCDC *unk_10; + SpriteGfxHandler *unk_14; UnkStruct_ov12_0222C1A4_sub1 unk_18[3]; } UnkStruct_ov12_0222C1A4; @@ -169,9 +170,9 @@ typedef struct { u8 unk_02; u8 unk_03; int unk_04; - BGL * unk_08; - UnkStruct_ov12_0221FCDC * unk_0C; - SpriteGfxHandler * unk_10; + BGL *unk_08; + UnkStruct_ov12_0221FCDC *unk_0C; + SpriteGfxHandler *unk_10; UnkStruct_ov12_02235998 unk_14[4]; UnkStruct_ov12_02235998 unk_64[4]; UnkStruct_ov12_02225F6C unk_B4; @@ -183,11 +184,11 @@ typedef struct { u8 unk_02; u8 unk_03; UnkStruct_ov12_02235350 unk_04; - BGL * unk_08; - UnkStruct_ov12_0221FCDC * unk_0C; - SpriteGfxHandler * unk_10; - Sprite * unk_14; - CellActorData * unk_18; + BGL *unk_08; + UnkStruct_ov12_0221FCDC *unk_0C; + SpriteGfxHandler *unk_10; + Sprite *unk_14; + CellActorData *unk_18; UnkStruct_ov12_02225F6C unk_1C; UnkStruct_ov12_02225F6C unk_40; UnkStruct_ov12_02226454 unk_64; @@ -196,7 +197,7 @@ typedef struct { typedef struct { UnkStruct_ov12_0223595C unk_00; UnkStruct_ov12_0222C7E0_sub1 unk_1C; - Sprite * unk_28[2]; + Sprite *unk_28[2]; s16 unk_30; s16 unk_32; s16 unk_34; @@ -209,7 +210,7 @@ typedef struct { UnkStruct_ov12_0223595C unk_00; UnkStruct_ov12_0222C7E0_sub1 unk_1C; UnkStruct_ov12_02235350 unk_28[4]; - Sprite * unk_38[4]; + Sprite *unk_38[4]; int unk_48; UnkStruct_ov12_02225F6C unk_4C; } UnkStruct_ov12_0222C994; @@ -218,8 +219,8 @@ typedef struct { UnkStruct_ov12_0223595C unk_00; UnkStruct_ov12_0222C7E0_sub1 unk_1C; UnkStruct_ov12_02235350 unk_28[2]; - Sprite * unk_30[2]; - CellActorData * unk_38[2]; + Sprite *unk_30[2]; + CellActorData *unk_38[2]; UnkStruct_ov12_02225F6C unk_40[2]; } UnkStruct_ov12_0222CACC; @@ -230,7 +231,7 @@ typedef struct { UnkStruct_ov12_02235350 unk_0C; UnkStruct_ov12_0223595C unk_10; UnkStruct_ov12_0222C7E0_sub1 unk_2C; - CellActorData * unk_38; + CellActorData *unk_38; UnkStruct_ov12_02235998 unk_3C[4]; UnkStruct_ov12_02225F6C unk_8C[2]; UnkStruct_ov12_02225D50 unk_D4; @@ -250,15 +251,15 @@ typedef struct { UnkStruct_ov12_02235350 unk_14; UnkStruct_ov12_0223595C unk_18; UnkStruct_ov12_0222C7E0_sub1 unk_34; - CellActorData * unk_40; - CellActorData * unk_44[2]; + CellActorData *unk_40; + CellActorData *unk_44[2]; UnkStruct_ov12_02235998 unk_4C[4]; UnkStruct_ov12_02225F6C unk_9C; UnkStruct_ov12_02225D50 unk_C0; } UnkStruct_ov12_0222CDF0; typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; UnkStruct_ov12_02225F6C unk_04[2]; } UnkStruct_ov12_0222D128_sub1; @@ -268,10 +269,10 @@ typedef struct { int unk_04; int unk_08; u8 unk_0C; - UnkStruct_ov12_0221FCDC * unk_10; - SpriteRenderer * unk_14; - SpriteGfxHandler * unk_18; - Sprite * unk_1C; + UnkStruct_ov12_0221FCDC *unk_10; + SpriteRenderer *unk_14; + SpriteGfxHandler *unk_18; + Sprite *unk_1C; s16 unk_20; int unk_24; u16 unk_28; @@ -283,15 +284,15 @@ typedef struct { } UnkStruct_ov12_0222D128; static const u8 Unk_ov12_0223A09E[][2] = { - {0x8, 0x2}, - {0xD, 0x1}, - {0x12, 0x3} + { 0x8, 0x2 }, + { 0xD, 0x1 }, + { 0x12, 0x3 } }; -static void ov12_0222AC70 (SysTask * param0, void * param1) +static void ov12_0222AC70(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_0222AC70 * v1 = (UnkStruct_ov12_0222AC70 *)param1; + UnkStruct_ov12_0222AC70 *v1 = (UnkStruct_ov12_0222AC70 *)param1; switch (v1->unk_00) { case 0: @@ -379,10 +380,10 @@ static void ov12_0222AC70 (SysTask * param0, void * param1) sub_0200C7EC(v1->unk_10); } -void ov12_0222AE68 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222AE68(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { int v0; - UnkStruct_ov12_0222AC70 * v1; + UnkStruct_ov12_0222AC70 *v1; SpriteTemplate v2; v1 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222AC70)); @@ -433,9 +434,9 @@ void ov12_0222AE68 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201CC(param0, ov12_0222AC70, v1, 0x1000); } -static void ov12_0222AFA0 (SysTask * param0, void * param1) +static void ov12_0222AFA0(SysTask *param0, void *param1) { - UnkStruct_ov12_0222AFA0 * v0 = (UnkStruct_ov12_0222AFA0 *)param1; + UnkStruct_ov12_0222AFA0 *v0 = (UnkStruct_ov12_0222AFA0 *)param1; switch (v0->unk_00) { case 0: @@ -511,9 +512,9 @@ static void ov12_0222AFA0 (SysTask * param0, void * param1) } } -void ov12_0222B194 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222B194(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222AFA0 * v0; + UnkStruct_ov12_0222AFA0 *v0; v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222AFA0)); @@ -529,9 +530,9 @@ void ov12_0222B194 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_0C, ov12_0222AFA0, v0); } -static void ov12_0222B220 (SysTask * param0, void * param1) +static void ov12_0222B220(SysTask *param0, void *param1) { - UnkStruct_ov12_0222B220 * v0 = (UnkStruct_ov12_0222B220 *)param1; + UnkStruct_ov12_0222B220 *v0 = (UnkStruct_ov12_0222B220 *)param1; switch (v0->unk_00) { case 0: @@ -608,9 +609,9 @@ static void ov12_0222B220 (SysTask * param0, void * param1) } } -void ov12_0222B45C (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222B45C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222B220 * v0; + UnkStruct_ov12_0222B220 *v0; v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222B220)); @@ -625,21 +626,20 @@ void ov12_0222B45C (UnkStruct_ov12_0221FCDC * param0) } static const s16 Unk_ov12_0223A0FE[][3] = { - {0x0, 0x20, 0x7}, - {0x0, 0x20, 0xA}, - {0x20, 0x0, 0x7}, - {0x20, 0x0, 0xA} + { 0x0, 0x20, 0x7 }, + { 0x0, 0x20, 0xA }, + { 0x20, 0x0, 0x7 }, + { 0x20, 0x0, 0xA } }; -static void ov12_0222B4C8 (SysTask * param0, void * param1) +static void ov12_0222B4C8(SysTask *param0, void *param1) { int v0; u8 v1; - UnkStruct_ov12_0222B4C8 * v2 = (UnkStruct_ov12_0222B4C8 *)param1; + UnkStruct_ov12_0222B4C8 *v2 = (UnkStruct_ov12_0222B4C8 *)param1; switch (v2->unk_01) { - case 0: - { + case 0: { int v3 = (v2->unk_00 % 2) * 2; int v4 = (v2->unk_00 + 1) / 2; @@ -695,9 +695,9 @@ static void ov12_0222B4C8 (SysTask * param0, void * param1) sub_0200C7EC(v2->unk_14); } -void ov12_0222B68C (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222B68C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222B4C8 * v0; + UnkStruct_ov12_0222B4C8 *v0; v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222B4C8)); @@ -768,13 +768,13 @@ void ov12_0222B68C (UnkStruct_ov12_0221FCDC * param0) } static const u8 Unk_ov12_0223A098[][3] = { - {0x64, 0x73, 0x6}, - {0x73, 0x64, 0x6} + { 0x64, 0x73, 0x6 }, + { 0x73, 0x64, 0x6 } }; -static void ov12_0222B914 (SysTask * param0, void * param1) +static void ov12_0222B914(SysTask *param0, void *param1) { - UnkStruct_ov12_0222B914 * v0 = (UnkStruct_ov12_0222B914 *)param1; + UnkStruct_ov12_0222B914 *v0 = (UnkStruct_ov12_0222B914 *)param1; switch (v0->unk_00) { case 0: @@ -809,9 +809,9 @@ static void ov12_0222B914 (SysTask * param0, void * param1) } } -void ov12_0222B9E0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222B9E0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222B914 * v0; + UnkStruct_ov12_0222B914 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222B914)); @@ -825,14 +825,14 @@ void ov12_0222B9E0 (UnkStruct_ov12_0221FCDC * param0) } static const u8 Unk_ov12_0223A0DF[][5] = { - {0x64, 0x96, 0x64, 0x32, 0x8}, - {0x96, 0x32, 0x32, 0x96, 0x8}, - {0x32, 0x64, 0x96, 0x64, 0x8} + { 0x64, 0x96, 0x64, 0x32, 0x8 }, + { 0x96, 0x32, 0x32, 0x96, 0x8 }, + { 0x32, 0x64, 0x96, 0x64, 0x8 } }; -static void ov12_0222BA18 (SysTask * param0, void * param1) +static void ov12_0222BA18(SysTask *param0, void *param1) { - UnkStruct_ov12_0222BA18 * v0 = (UnkStruct_ov12_0222BA18 *)param1; + UnkStruct_ov12_0222BA18 *v0 = (UnkStruct_ov12_0222BA18 *)param1; switch (v0->unk_00) { case 0: @@ -864,9 +864,9 @@ static void ov12_0222BA18 (SysTask * param0, void * param1) } } -void ov12_0222BAE4 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222BAE4(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222BA18 * v0; + UnkStruct_ov12_0222BA18 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222BA18)); @@ -881,13 +881,13 @@ void ov12_0222BAE4 (UnkStruct_ov12_0221FCDC * param0) } static const u8 Unk_ov12_0223A0B7[][5] = { - {0x64, 0xA, 0x64, 0xB4, 0xA}, - {0xA, 0xA, 0xB4, 0x0, 0x5} + { 0x64, 0xA, 0x64, 0xB4, 0xA }, + { 0xA, 0xA, 0xB4, 0x0, 0x5 } }; -static void ov12_0222BB30 (SysTask * param0, void * param1) +static void ov12_0222BB30(SysTask *param0, void *param1) { - UnkStruct_ov12_0222BB30 * v0 = (UnkStruct_ov12_0222BB30 *)param1; + UnkStruct_ov12_0222BB30 *v0 = (UnkStruct_ov12_0222BB30 *)param1; switch (v0->unk_00) { case 0: @@ -940,9 +940,9 @@ static void ov12_0222BB30 (SysTask * param0, void * param1) } } -void ov12_0222BCF4 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222BCF4(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222BB30 * v0; + UnkStruct_ov12_0222BB30 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222BB30)); @@ -957,9 +957,9 @@ void ov12_0222BCF4 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_08, ov12_0222BB30, v0); } -static void ov12_0222BD48 (SysTask * param0, void * param1) +static void ov12_0222BD48(SysTask *param0, void *param1) { - UnkStruct_ov12_0222BD48 * v0 = (UnkStruct_ov12_0222BD48 *)param1; + UnkStruct_ov12_0222BD48 *v0 = (UnkStruct_ov12_0222BD48 *)param1; switch (v0->unk_00) { case 0: @@ -994,9 +994,9 @@ static void ov12_0222BD48 (SysTask * param0, void * param1) } } -void ov12_0222BE48 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222BE48(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222BD48 * v0; + UnkStruct_ov12_0222BD48 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222BD48)); @@ -1008,20 +1008,20 @@ void ov12_0222BE48 (UnkStruct_ov12_0221FCDC * param0) } static const u8 Unk_ov12_0223A0C1[][5] = { - {0x64, 0x78, 0x64, 0x50, 0x5}, - {0x78, 0x64, 0x50, 0x78, 0x5}, - {0x64, 0x64, 0x78, 0x64, 0x5} + { 0x64, 0x78, 0x64, 0x50, 0x5 }, + { 0x78, 0x64, 0x50, 0x78, 0x5 }, + { 0x64, 0x64, 0x78, 0x64, 0x5 } }; static const u8 Unk_ov12_0223A0A4[][3] = { - {0x0, 0x10, 0x5}, - {0x10, 0x0, 0x5}, - {0x0, 0x0, 0x5} + { 0x0, 0x10, 0x5 }, + { 0x10, 0x0, 0x5 }, + { 0x0, 0x0, 0x5 } }; -static void ov12_0222BE80 (SysTask * param0, void * param1) +static void ov12_0222BE80(SysTask *param0, void *param1) { - UnkStruct_ov12_0222BE80 * v0 = (UnkStruct_ov12_0222BE80 *)param1; + UnkStruct_ov12_0222BE80 *v0 = (UnkStruct_ov12_0222BE80 *)param1; switch (v0->unk_00) { case 0: @@ -1030,8 +1030,7 @@ static void ov12_0222BE80 (SysTask * param0, void * param1) v0->unk_01++; v0->unk_00++; break; - case 1: - { + case 1: { int v1 = 0; if (ov12_02225F6C(&v0->unk_10) == 0) { @@ -1058,8 +1057,7 @@ static void ov12_0222BE80 (SysTask * param0, void * param1) sub_02007DEC(v0->unk_0C, 12, v0->unk_10.unk_00); sub_02007DEC(v0->unk_0C, 13, v0->unk_10.unk_02); ov12_02226024(v0->unk_0C, v0->unk_34.unk_02, v0->unk_06, v0->unk_10.unk_04[4], 0); - } - break; + } break; default: ov12_02220220(v0->unk_08, param0); Heap_FreeToHeap(v0); @@ -1067,9 +1065,9 @@ static void ov12_0222BE80 (SysTask * param0, void * param1) } } -void ov12_0222BFA8 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222BFA8(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222BE80 * v0; + UnkStruct_ov12_0222BE80 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222BE80)); @@ -1083,9 +1081,9 @@ void ov12_0222BFA8 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_08, ov12_0222BE80, v0); } -static void ov12_0222BFF4 (SysTask * param0, void * param1) +static void ov12_0222BFF4(SysTask *param0, void *param1) { - UnkStruct_ov12_0222BFF4 * v0 = (UnkStruct_ov12_0222BFF4 *)param1; + UnkStruct_ov12_0222BFF4 *v0 = (UnkStruct_ov12_0222BFF4 *)param1; switch (v0->unk_00) { case 0: @@ -1122,9 +1120,9 @@ static void ov12_0222BFF4 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_0222C0C0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222C0C0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222BFF4 * v0; + UnkStruct_ov12_0222BFF4 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222BFF4)); @@ -1158,11 +1156,11 @@ static const u8 Unk_ov12_0223A094[] = { 0x12 }; -static void ov12_0222C1A4 (SysTask * param0, void * param1) +static void ov12_0222C1A4(SysTask *param0, void *param1) { int v0; int v1; - UnkStruct_ov12_0222C1A4 * v2 = (UnkStruct_ov12_0222C1A4 *)param1; + UnkStruct_ov12_0222C1A4 *v2 = (UnkStruct_ov12_0222C1A4 *)param1; switch (v2->unk_00) { case 0: @@ -1259,9 +1257,9 @@ static void ov12_0222C1A4 (SysTask * param0, void * param1) sub_0200C7EC(v2->unk_14); } -void ov12_0222C3C0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222C3C0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222C1A4 * v0; + UnkStruct_ov12_0222C1A4 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222C1A4)); @@ -1319,10 +1317,10 @@ static const s16 Unk_ov12_0223A0EE[] = { 0x0 }; -static void ov12_0222C4A8 (SysTask * param0, void * param1) +static void ov12_0222C4A8(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_0222C4A8 * v1 = (UnkStruct_ov12_0222C4A8 *)param1; + UnkStruct_ov12_0222C4A8 *v1 = (UnkStruct_ov12_0222C4A8 *)param1; switch (v1->unk_00) { case 0: @@ -1382,10 +1380,10 @@ static void ov12_0222C4A8 (SysTask * param0, void * param1) } } -void ov12_0222C5FC (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222C5FC(UnkStruct_ov12_0221FCDC *param0) { int v0; - UnkStruct_ov12_0222C4A8 * v1; + UnkStruct_ov12_0222C4A8 *v1; v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222C4A8)); @@ -1418,9 +1416,9 @@ void ov12_0222C5FC (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v1->unk_0C, ov12_0222C4A8, v1); } -static void ov12_0222C678 (SysTask * param0, void * param1) +static void ov12_0222C678(SysTask *param0, void *param1) { - UnkStruct_ov12_0222C678 * v0 = (UnkStruct_ov12_0222C678 *)param1; + UnkStruct_ov12_0222C678 *v0 = (UnkStruct_ov12_0222C678 *)param1; switch (v0->unk_00) { case 0: @@ -1442,9 +1440,9 @@ static void ov12_0222C678 (SysTask * param0, void * param1) } } -void ov12_0222C6D4 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222C6D4(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222C678 * v0; + UnkStruct_ov12_0222C678 *v0; int v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222C678)); @@ -1481,20 +1479,19 @@ void ov12_0222C6D4 (UnkStruct_ov12_0221FCDC * param0) } static const int Unk_ov12_0223A118[][2] = { - {((20 * 0xffff) / 360), 0x3}, - {((15 * 0xffff) / 360), 0x3}, - {((10 * 0xffff) / 360), 0x2}, - {((5 * 0xffff) / 360), 0x2}, - {((0 * 0xffff) / 360), 0x1} + { ((20 * 0xffff) / 360), 0x3 }, + { ((15 * 0xffff) / 360), 0x3 }, + { ((10 * 0xffff) / 360), 0x2 }, + { ((5 * 0xffff) / 360), 0x2 }, + { ((0 * 0xffff) / 360), 0x1 } }; -static void ov12_0222C7E0 (SysTask * param0, void * param1) +static void ov12_0222C7E0(SysTask *param0, void *param1) { - UnkStruct_ov12_0222C7E0 * v0 = (UnkStruct_ov12_0222C7E0 *)param1; + UnkStruct_ov12_0222C7E0 *v0 = (UnkStruct_ov12_0222C7E0 *)param1; switch (v0->unk_00.unk_00) { - case 0: - { + case 0: { int v1; int v2; @@ -1534,17 +1531,16 @@ static void ov12_0222C7E0 (SysTask * param0, void * param1) } } -static void ov12_0222C884 (SysTask * param0, void * param1) +static void ov12_0222C884(SysTask *param0, void *param1) { - UnkStruct_ov12_0222C7E0 * v0 = (UnkStruct_ov12_0222C7E0 *)param1; + UnkStruct_ov12_0222C7E0 *v0 = (UnkStruct_ov12_0222C7E0 *)param1; switch (v0->unk_00.unk_00) { case 0: ov12_02226108(&v0->unk_38, v0->unk_1C.unk_00, v0->unk_1C.unk_02, v0->unk_1C.unk_04, v0->unk_1C.unk_06); v0->unk_00.unk_00++; break; - case 1: - { + case 1: { UnkStruct_ov12_02235350 v1; ov12_02235918(v0->unk_28[1], &v1); @@ -1552,8 +1548,7 @@ static void ov12_0222C884 (SysTask * param0, void * param1) if (ov12_0222619C(&v0->unk_38, v1.unk_00, v1.unk_02, v0->unk_28[1]) == 0) { v0->unk_00.unk_00++; } - } - break; + } break; default: ov12_02220220(v0->unk_00.unk_04, param0); Heap_FreeToHeap(v0); @@ -1561,9 +1556,9 @@ static void ov12_0222C884 (SysTask * param0, void * param1) } } -void ov12_0222C8F8 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222C8F8(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222C7E0 * v0; + UnkStruct_ov12_0222C7E0 *v0; int v1 = 0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222C7E0)); @@ -1589,10 +1584,10 @@ void ov12_0222C8F8 (UnkStruct_ov12_0221FCDC * param0) } } -static void ov12_0222C994 (SysTask * param0, void * param1) +static void ov12_0222C994(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_0222C994 * v1 = (UnkStruct_ov12_0222C994 *)param1; + UnkStruct_ov12_0222C994 *v1 = (UnkStruct_ov12_0222C994 *)param1; switch (v1->unk_00.unk_00) { case 0: @@ -1622,9 +1617,9 @@ static void ov12_0222C994 (SysTask * param0, void * param1) } } -void ov12_0222CA2C (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222CA2C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222C994 * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222C994)); + UnkStruct_ov12_0222C994 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222C994)); int v1; ov12_0223595C(param0, &v0->unk_00); @@ -1670,10 +1665,10 @@ void ov12_0222CA2C (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00.unk_04, ov12_0222C994, v0); } -static void ov12_0222CACC (SysTask * param0, void * param1) +static void ov12_0222CACC(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_0222CACC * v1 = (UnkStruct_ov12_0222CACC *)param1; + UnkStruct_ov12_0222CACC *v1 = (UnkStruct_ov12_0222CACC *)param1; switch (v1->unk_00.unk_00) { case 0: @@ -1700,9 +1695,9 @@ static void ov12_0222CACC (SysTask * param0, void * param1) } } -void ov12_0222CB90 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222CB90(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222CACC * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222CACC)); + UnkStruct_ov12_0222CACC *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222CACC)); int v1; ov12_0223595C(param0, &v0->unk_00); @@ -1717,10 +1712,10 @@ void ov12_0222CB90 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00.unk_04, ov12_0222CACC, v0); } -static void ov12_0222CBFC (SysTask * param0, void * param1) +static void ov12_0222CBFC(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_0222CBFC * v1 = (UnkStruct_ov12_0222CBFC *)param1; + UnkStruct_ov12_0222CBFC *v1 = (UnkStruct_ov12_0222CBFC *)param1; if (ov12_02225D2C(&v1->unk_8C[0], &v1->unk_8C[1], v1->unk_38) == 0) { sub_0200D0F4(v1->unk_38); @@ -1738,11 +1733,11 @@ static void ov12_0222CBFC (SysTask * param0, void * param1) sub_0200C7EC(v1->unk_10.unk_10); } -void ov12_0222CC54 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222CC54(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { int v0; int v1; - UnkStruct_ov12_0222CBFC * v2; + UnkStruct_ov12_0222CBFC *v2; v2 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222CBFC)); ov12_0223595C(param0, &v2->unk_10); @@ -1785,9 +1780,9 @@ void ov12_0222CC54 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v2->unk_10.unk_04, ov12_0222CBFC, v2); } -static void ov12_0222CDF0 (SysTask * param0, void * param1) +static void ov12_0222CDF0(SysTask *param0, void *param1) { - UnkStruct_ov12_0222CDF0 * v0 = (UnkStruct_ov12_0222CDF0 *)param1; + UnkStruct_ov12_0222CDF0 *v0 = (UnkStruct_ov12_0222CDF0 *)param1; switch (v0->unk_18.unk_00) { case 0: @@ -1859,9 +1854,9 @@ static void ov12_0222CDF0 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_18.unk_10); } -void ov12_0222CFA0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222CFA0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222CDF0 * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222CDF0)); + UnkStruct_ov12_0222CDF0 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222CDF0)); ov12_0223595C(param0, &v0->unk_18); @@ -1935,15 +1930,15 @@ void ov12_0222CFA0 (UnkStruct_ov12_0221FCDC * param0) } static const u8 Unk_ov12_0223A0D0[][5] = { - {0x64, 0x64, 0x64, 0x46, 0x8}, - {0x64, 0x64, 0x46, 0x78, 0x3}, - {0x64, 0x64, 0x78, 0x64, 0x3} + { 0x64, 0x64, 0x64, 0x46, 0x8 }, + { 0x64, 0x64, 0x46, 0x78, 0x3 }, + { 0x64, 0x64, 0x78, 0x64, 0x3 } }; -static void ov12_0222D128 (SysTask * param0, void * param1) +static void ov12_0222D128(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_0222D128 * v1 = (UnkStruct_ov12_0222D128 *)param1; + UnkStruct_ov12_0222D128 *v1 = (UnkStruct_ov12_0222D128 *)param1; switch (v1->unk_00) { case 0: @@ -1974,8 +1969,7 @@ static void ov12_0222D128 (SysTask * param0, void * param1) v1->unk_00++; } break; - case 3: - { + case 3: { s16 v3, v4; SpriteActor_GetSpritePositionXY(v1->unk_30[0].unk_00, &v3, &v4); @@ -1986,15 +1980,13 @@ static void ov12_0222D128 (SysTask * param0, void * param1) } else { v1->unk_00++; } - } - break; - case 4: - { + } break; + case 4: { s16 v5, v6; SpriteActor_GetSpritePositionXY(v1->unk_30[0].unk_00, &v5, &v6); - if (v6 <= (((40 - 16 + 20 + 10) + 50))) { + if (v6 <= ((40 - 16 + 20 + 10) + 50)) { sub_0200D5DC(v1->unk_30[0].unk_00, 0, 2); sub_0200D5DC(v1->unk_30[1].unk_00, 0, 2); } else { @@ -2039,15 +2031,14 @@ static void ov12_0222D128 (SysTask * param0, void * param1) v1->unk_00++; break; - case 6: - { + case 6: { s16 v11, v12, v13, v14; s8 v15[][2] = { - {+1, -1}, - {-1, +1}, - {+1, -1}, - {+1, -1}, - {+1, -1}, + { +1, -1 }, + { -1, +1 }, + { +1, -1 }, + { +1, -1 }, + { +1, -1 }, }; SpriteActor_GetSpritePositionXY(v1->unk_30[0].unk_00, &v11, &v12); @@ -2059,8 +2050,7 @@ static void ov12_0222D128 (SysTask * param0, void * param1) v1->unk_0C++; v1->unk_00++; break; - case 7: - { + case 7: { u8 v16 = 0; if (ov12_02225D2C(&v1->unk_30[0].unk_04[0], &v1->unk_30[0].unk_04[1], v1->unk_30[0].unk_00) == 0) { @@ -2078,10 +2068,8 @@ static void ov12_0222D128 (SysTask * param0, void * param1) v1->unk_00--; } } - } - break; - case 8: - { + } break; + case 8: { int v17 = 0; if (ov12_022267A8(&v1->unk_04, 0, -2) == 1) { @@ -2097,8 +2085,7 @@ static void ov12_0222D128 (SysTask * param0, void * param1) if (v17 == 2) { v1->unk_00++; } - } - break; + } break; default: for (v0 = 0; v0 < ov12_02220280(v1->unk_10, 0); v0++) { sub_0200D0F4(v1->unk_30[v0].unk_00); @@ -2138,10 +2125,10 @@ static void ov12_0222D128 (SysTask * param0, void * param1) sub_0200C7EC(v1->unk_18); } -void ov12_0222D56C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222D56C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { int v0; - UnkStruct_ov12_0222D128 * v1; + UnkStruct_ov12_0222D128 *v1; SpriteTemplate v2; v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222D128)); diff --git a/src/overlay012/ov12_0222D6B0.c b/src/overlay012/ov12_0222D6B0.c index 22093cdcd4..b0a8d15429 100644 --- a/src/overlay012/ov12_0222D6B0.c +++ b/src/overlay012/ov12_0222D6B0.c @@ -1,30 +1,31 @@ +#include "overlay012/ov12_0222D6B0.h" + #include #include #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "overlay012/struct_ov12_0222660C_decl.h" -#include "overlay012/struct_ov12_022267D4_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" + +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02225864.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02225F6C.h" #include "overlay012/struct_ov12_02226454.h" +#include "overlay012/struct_ov12_0222660C_decl.h" +#include "overlay012/struct_ov12_022267D4_decl.h" #include "overlay012/struct_ov12_02235350.h" #include "overlay012/struct_ov12_0223595C.h" -#include "struct_defs/sprite_template.h" +#include "heap.h" +#include "sys_task_manager.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_0222D6B0.h" -#include "overlay012/ov12_02235254.h" typedef struct { u8 unk_00; @@ -33,10 +34,10 @@ typedef struct { u8 unk_05; u8 unk_06; u8 unk_07; - UnkStruct_ov12_0221FCDC * unk_08; - SpriteRenderer * unk_0C; - SpriteGfxHandler * unk_10; - CellActorData * unk_14[3]; + UnkStruct_ov12_0221FCDC *unk_08; + SpriteRenderer *unk_0C; + SpriteGfxHandler *unk_10; + CellActorData *unk_14[3]; UnkStruct_ov12_02225F6C unk_20; } UnkStruct_ov12_0222D6B0; @@ -47,29 +48,29 @@ typedef struct { u8 unk_08; u8 unk_09; u8 unk_0A; - UnkStruct_ov12_0221FCDC * unk_0C; - SpriteRenderer * unk_10; - SpriteGfxHandler * unk_14; - CellActorData * unk_18[6]; + UnkStruct_ov12_0221FCDC *unk_0C; + SpriteRenderer *unk_10; + SpriteGfxHandler *unk_14; + CellActorData *unk_18[6]; int unk_30; - CellActorData * unk_34; - CellActorData * unk_38; + CellActorData *unk_34; + CellActorData *unk_38; UnkStruct_ov12_02225F6C unk_3C; UnkStruct_ov12_02225F6C unk_60; } UnkStruct_ov12_0222D934; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; u8 unk_0C; u8 unk_0D; u8 unk_0E; u8 unk_0F; - CellActorData * unk_10; + CellActorData *unk_10; UnkStruct_ov12_02225F6C unk_14; f32 unk_38; - int * unk_3C; + int *unk_3C; } UnkStruct_ov12_0222DC98; typedef struct { @@ -78,9 +79,9 @@ typedef struct { u8 unk_02; u8 unk_03; u8 unk_04; - UnkStruct_ov12_0221FCDC * unk_08; - SpriteRenderer * unk_0C; - SpriteGfxHandler * unk_10; + UnkStruct_ov12_0221FCDC *unk_08; + SpriteRenderer *unk_0C; + SpriteGfxHandler *unk_10; UnkStruct_ov12_0222DC98 unk_14[20]; int unk_514[20]; } UnkStruct_ov12_0222DE24; @@ -88,9 +89,9 @@ typedef struct { typedef struct { int unk_00; UnkStruct_ov12_0223595C unk_04; - CellActorData * unk_20; - CellActorData * unk_24; - UnkStruct_ov12_0222660C * unk_28; + CellActorData *unk_20; + CellActorData *unk_24; + UnkStruct_ov12_0222660C *unk_28; UnkStruct_ov12_02226454 unk_2C; } UnkStruct_ov12_0222E080; @@ -98,7 +99,7 @@ typedef struct { UnkStruct_ov12_0223595C unk_00; s16 unk_1C; s16 unk_1E[4]; - CellActorData * unk_28[4]; + CellActorData *unk_28[4]; } UnkStruct_ov12_0222E25C; typedef struct { @@ -106,22 +107,22 @@ typedef struct { int unk_1C; s16 unk_20; s16 unk_22[4]; - CellActorData * unk_2C[4]; - UnkStruct_ov12_022267D4 * unk_3C[6]; + CellActorData *unk_2C[4]; + UnkStruct_ov12_022267D4 *unk_3C[6]; int unk_54; int unk_58; } UnkStruct_ov12_0222E390; static const u8 Unk_ov12_0223A144[][2] = { - {0x14, 0x2}, - {0xD, 0x1}, - {0x12, 0x3} + { 0x14, 0x2 }, + { 0xD, 0x1 }, + { 0x12, 0x3 } }; -static void ov12_0222D6B0 (SysTask * param0, void * param1) +static void ov12_0222D6B0(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_0222D6B0 * v1 = (UnkStruct_ov12_0222D6B0 *)param1; + UnkStruct_ov12_0222D6B0 *v1 = (UnkStruct_ov12_0222D6B0 *)param1; switch (v1->unk_00) { case 0: @@ -188,10 +189,10 @@ static void ov12_0222D6B0 (SysTask * param0, void * param1) sub_0200C7EC(v1->unk_10); } -void ov12_0222D7C0 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222D7C0(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { int v0; - UnkStruct_ov12_0222D6B0 * v1; + UnkStruct_ov12_0222D6B0 *v1; SpriteTemplate v2; v1 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222D6B0)); @@ -252,31 +253,31 @@ void ov12_0222D7C0 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S } static const UnkStruct_ov12_02235350 Unk_ov12_0223A162[] = { - {0x50, 0x32}, - {0xB4, 0x32}, - {0x50, 0x64}, - {0xB4, 0x64}, - {0x50, 0x4B}, - {0xB4, 0x4B} + { 0x50, 0x32 }, + { 0xB4, 0x32 }, + { 0x50, 0x64 }, + { 0xB4, 0x64 }, + { 0x50, 0x4B }, + { 0xB4, 0x4B } }; static const UnkStruct_ov12_02235350 Unk_ov12_0223A17A[][2] = { { - {0x78, 0x50}, - {0x88, 0x50} + { 0x78, 0x50 }, + { 0x88, 0x50 }, }, { - {0x78, 0x50}, - {0x88, 0x50} + { 0x78, 0x50 }, + { 0x88, 0x50 }, }, { - {0x78, 0x50}, - {0x88, 0x50} + { 0x78, 0x50 }, + { 0x88, 0x50 }, }, { - {0x58, 0x50}, - {0xA8, 0x50} - } + { 0x58, 0x50 }, + { 0xA8, 0x50 }, + }, }; static const u8 Unk_ov12_0223A140[] = { @@ -286,11 +287,11 @@ static const u8 Unk_ov12_0223A140[] = { 0x3 }; -static void ov12_0222D934 (SysTask * param0, void * param1) +static void ov12_0222D934(SysTask *param0, void *param1) { int v0; int v1 = 0; - UnkStruct_ov12_0222D934 * v2 = (UnkStruct_ov12_0222D934 *)param1; + UnkStruct_ov12_0222D934 *v2 = (UnkStruct_ov12_0222D934 *)param1; switch (v2->unk_00) { case 0: @@ -343,8 +344,7 @@ static void ov12_0222D934 (SysTask * param0, void * param1) v2->unk_30++; v2->unk_00++; break; - case 2: - { + case 2: { int v5 = 0; BOOL v6; @@ -369,8 +369,7 @@ static void ov12_0222D934 (SysTask * param0, void * param1) v2->unk_00++; } } - } - break; + } break; case 3: if (v2->unk_09 > 0) { v2->unk_09--; @@ -409,10 +408,10 @@ static void ov12_0222D934 (SysTask * param0, void * param1) sub_0200C7EC(v2->unk_14); } -void ov12_0222DB60 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222DB60(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { int v0; - UnkStruct_ov12_0222D934 * v1; + UnkStruct_ov12_0222D934 *v1; SpriteTemplate v2; v1 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222D934)); @@ -467,17 +466,17 @@ void ov12_0222DB60 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S } static const UnkStruct_ov12_02235350 Unk_ov12_0223A14A[] = { - {0x0, 0x0}, - {0x80, 0x0}, - {0x100, 0x0}, - {0x0, 0xAA}, - {0x80, 0xAA}, - {0x100, 0xAA} + { 0x0, 0x0 }, + { 0x80, 0x0 }, + { 0x100, 0x0 }, + { 0x0, 0xAA }, + { 0x80, 0xAA }, + { 0x100, 0xAA } }; -static void ov12_0222DC98 (SysTask * param0, void * param1) +static void ov12_0222DC98(SysTask *param0, void *param1) { - UnkStruct_ov12_0222DC98 * v0 = (UnkStruct_ov12_0222DC98 *)param1; + UnkStruct_ov12_0222DC98 *v0 = (UnkStruct_ov12_0222DC98 *)param1; switch (v0->unk_0C) { case 0: @@ -528,8 +527,7 @@ static void ov12_0222DC98 (SysTask * param0, void * param1) v0->unk_0C++; } break; - case 6: - { + case 6: { UnkStruct_ov12_02235350 v1; int v2; @@ -538,10 +536,8 @@ static void ov12_0222DC98 (SysTask * param0, void * param1) SpriteActor_GetSpritePositionXY(v0->unk_10, &v1.unk_00, &v1.unk_02); ov12_02225BC8(&v0->unk_14, v1.unk_00, Unk_ov12_0223A14A[v0->unk_0F].unk_00, v1.unk_02, Unk_ov12_0223A14A[v0->unk_0F].unk_02, v2); v0->unk_0C++; - } - break; - case 7: - { + } break; + case 7: { BOOL v3; v3 = ov12_02225C50(&v0->unk_14, v0->unk_10); @@ -562,14 +558,13 @@ static void ov12_0222DC98 (SysTask * param0, void * param1) sub_0200D330(v0->unk_10); } -static void ov12_0222DE24 (SysTask * param0, void * param1) +static void ov12_0222DE24(SysTask *param0, void *param1) { int v0; - UnkStruct_ov12_0222DE24 * v1 = (UnkStruct_ov12_0222DE24 *)param1; + UnkStruct_ov12_0222DE24 *v1 = (UnkStruct_ov12_0222DE24 *)param1; switch (v1->unk_00) { - case 0: - { + case 0: { BOOL v2 = 1; for (v0 = 0; v0 < v1->unk_02; v0++) { @@ -582,8 +577,7 @@ static void ov12_0222DE24 (SysTask * param0, void * param1) if (v2 == 1) { v1->unk_00++; } - } - break; + } break; case 1: for (v0 = 0; v0 < v1->unk_02; v0++) { v1->unk_514[v0] = 2; @@ -591,8 +585,7 @@ static void ov12_0222DE24 (SysTask * param0, void * param1) v1->unk_00++; break; - case 2: - { + case 2: { BOOL v3 = 1; for (v0 = 0; v0 < v1->unk_02; v0++) { @@ -605,8 +598,7 @@ static void ov12_0222DE24 (SysTask * param0, void * param1) if (v3 == 1) { v1->unk_00++; } - } - break; + } break; case 3: for (v0 = 0; v0 < v1->unk_02; v0++) { sub_0200D0F4(v1->unk_14[v0].unk_10); @@ -624,19 +616,19 @@ static void ov12_0222DE24 (SysTask * param0, void * param1) } static const s16 Unk_ov12_0223A19A[][4] = { - {0x1E, 0x28, 0x32, 0x35}, - {0x1E, 0x5D, 0x32, 0x35}, - {0x1E, 0x92, 0x32, 0x35}, - {0x50, 0x28, 0x32, 0x35}, - {0x50, 0x5D, 0x32, 0x35}, - {0x50, 0x92, 0x32, 0x35} + { 0x1E, 0x28, 0x32, 0x35 }, + { 0x1E, 0x5D, 0x32, 0x35 }, + { 0x1E, 0x92, 0x32, 0x35 }, + { 0x50, 0x28, 0x32, 0x35 }, + { 0x50, 0x5D, 0x32, 0x35 }, + { 0x50, 0x92, 0x32, 0x35 } }; -void ov12_0222DEFC (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222DEFC(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { int v0; int v1; - UnkStruct_ov12_0222DE24 * v2; + UnkStruct_ov12_0222DE24 *v2; SpriteTemplate v3; v2 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222DE24)); @@ -656,7 +648,7 @@ void ov12_0222DEFC (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S { s16 v4, v5; - CellActorData * v6; + CellActorData *v6; v2->unk_14[0].unk_10 = param3; v0 = 0; @@ -696,14 +688,13 @@ void ov12_0222DEFC (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201CC(param0, ov12_0222DE24, v2, 1100 + 1); } -static void ov12_0222E080 (SysTask * param0, void * param1) +static void ov12_0222E080(SysTask *param0, void *param1) { - UnkStruct_ov12_0222E080 * v0 = (UnkStruct_ov12_0222E080 *)param1; + UnkStruct_ov12_0222E080 *v0 = (UnkStruct_ov12_0222E080 *)param1; switch (v0->unk_04.unk_00) { - case 0: - { - Sprite * v1; + case 0: { + Sprite *v1; v1 = ov12_022232FC(v0->unk_04.unk_04, ov12_02220240(v0->unk_04.unk_04)); sub_02007DEC(v1, 6, 1); @@ -716,7 +707,7 @@ static void ov12_0222E080 (SysTask * param0, void * param1) } v0->unk_00 = 0; - v0->unk_28 = ov12_0222662C(0, 160, (((2 * 0xffff) / 360)), (12 * FX32_ONE), (2 * 100), ov12_022233EC(v0->unk_04.unk_04, 1), 0, ov12_022266E8(0, 0), ov12_0221FDE4(v0->unk_04.unk_04)); + v0->unk_28 = ov12_0222662C(0, 160, ((2 * 0xffff) / 360), (12 * FX32_ONE), (2 * 100), ov12_022233EC(v0->unk_04.unk_04, 1), 0, ov12_022266E8(0, 0), ov12_0221FDE4(v0->unk_04.unk_04)); v0->unk_04.unk_00++; break; case 2: @@ -736,7 +727,7 @@ static void ov12_0222E080 (SysTask * param0, void * param1) } { - Sprite * v2; + Sprite *v2; v2 = ov12_022232FC(v0->unk_04.unk_04, ov12_02220240(v0->unk_04.unk_04)); sub_02007DEC(v2, 6, 0); @@ -756,9 +747,9 @@ static void ov12_0222E080 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_04.unk_0C); } -void ov12_0222E1A8 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222E1A8(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222E080 * v0 = NULL; + UnkStruct_ov12_0222E080 *v0 = NULL; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222E080)); ov12_0223595C(param0, &v0->unk_04); @@ -780,16 +771,16 @@ void ov12_0222E1A8 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_04.unk_04, ov12_0222E080, v0); } -void ov12_0222E248 (CellActorData * param0) +void ov12_0222E248(CellActorData *param0) { if (sub_0200D408(param0) == 1) { sub_0200D330(param0); } } -static void ov12_0222E25C (SysTask * param0, void * param1) +static void ov12_0222E25C(SysTask *param0, void *param1) { - UnkStruct_ov12_0222E25C * v0 = (UnkStruct_ov12_0222E25C *)param1; + UnkStruct_ov12_0222E25C *v0 = (UnkStruct_ov12_0222E25C *)param1; if (v0->unk_1C <= 0) { ov12_0222E248(v0->unk_28[2]); @@ -828,9 +819,9 @@ static void ov12_0222E25C (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_10); } -void ov12_0222E2F8 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222E2F8(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_0222E25C * v0 = NULL; + UnkStruct_ov12_0222E25C *v0 = NULL; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222E25C)); v0->unk_1C = 10; @@ -867,9 +858,9 @@ void ov12_0222E2F8 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00.unk_04, ov12_0222E25C, v0); } -static void ov12_0222E390 (SysTask * param0, void * param1) +static void ov12_0222E390(SysTask *param0, void *param1) { - UnkStruct_ov12_0222E390 * v0 = (UnkStruct_ov12_0222E390 *)param1; + UnkStruct_ov12_0222E390 *v0 = (UnkStruct_ov12_0222E390 *)param1; { int v1; @@ -967,9 +958,9 @@ static void ov12_0222E390 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_10); } -void ov12_0222E61C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_0222E390 * v0 = NULL; + UnkStruct_ov12_0222E390 *v0 = NULL; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222E390)); v0->unk_20 = 10; @@ -998,7 +989,7 @@ void ov12_0222E61C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S s16 v5; s16 v6; int v7; - Sprite * v8; + Sprite *v8; v7 = ov12_02220240(param0); v8 = ov12_022232FC(param0, v7); diff --git a/src/overlay012/ov12_0222E784.c b/src/overlay012/ov12_0222E784.c index cfd5c29245..103cca7e13 100644 --- a/src/overlay012/ov12_0222E784.c +++ b/src/overlay012/ov12_0222E784.c @@ -1,19 +1,19 @@ +#include "overlay012/ov12_0222E784.h" + #include #include -#include "sys_task_manager.h" +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02225864.h" +#include "overlay012/ov12_02235254.h" #include "overlay012/struct_ov12_0221FCDC_decl.h" - #include "overlay012/struct_ov12_02225F6C.h" #include "overlay012/struct_ov12_0223595C.h" #include "overlay012/struct_ov12_02235998.h" +#include "sys_task_manager.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_0222E784.h" -#include "overlay012/ov12_02235254.h" typedef struct { UnkStruct_ov12_0223595C unk_00; @@ -25,9 +25,9 @@ typedef struct { UnkStruct_ov12_02225F6C unk_60; } UnkStruct_ov12_0222E784; -static void ov12_0222E784 (SysTask * param0, void * param1) +static void ov12_0222E784(SysTask *param0, void *param1) { - UnkStruct_ov12_0222E784 * v0 = (UnkStruct_ov12_0222E784 *)param1; + UnkStruct_ov12_0222E784 *v0 = (UnkStruct_ov12_0222E784 *)param1; switch (v0->unk_00.unk_00) { case 0: @@ -61,9 +61,9 @@ static void ov12_0222E784 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_0C); } -void ov12_0222E810 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222E810(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222E784 * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222E784)); + UnkStruct_ov12_0222E784 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222E784)); ov12_0223595C(param0, &v0->unk_00); diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c index 5fb695b671..60722279aa 100644 --- a/src/overlay012/ov12_0222E91C.c +++ b/src/overlay012/ov12_0222E91C.c @@ -1,40 +1,41 @@ +#include "overlay012/ov12_0222E91C.h" + #include #include #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "overlay012/struct_ov12_022267D4_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" + +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02225864.h" +#include "overlay012/ov12_0222D6B0.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/ov12_022380BC.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02225F6C.h" +#include "overlay012/struct_ov12_022267D4_decl.h" #include "overlay012/struct_ov12_02235350.h" #include "overlay012/struct_ov12_0223595C.h" #include "overlay012/struct_ov12_02235998.h" #include "overlay012/struct_ov12_022380DC.h" -#include "struct_defs/sprite_template.h" +#include "heap.h" +#include "pokemon.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201F834.h" #include "unk_020218BC.h" -#include "pokemon.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_0222D6B0.h" -#include "overlay012/ov12_0222E91C.h" -#include "overlay012/ov12_02235254.h" -#include "overlay012/ov12_022380BC.h" typedef struct { UnkStruct_ov12_0223595C unk_00; UnkStruct_ov12_02235998 unk_1C; - CellActorData * unk_30; + CellActorData *unk_30; UnkStruct_ov12_02225F6C unk_34; UnkStruct_ov12_02225F6C unk_58; UnkStruct_ov12_02225F6C unk_7C; @@ -49,20 +50,20 @@ typedef struct { UnkStruct_ov12_0223595C unk_00; s16 unk_1C; s16 unk_1E[8]; - CellActorData * unk_30[8]; + CellActorData *unk_30[8]; UnkStruct_ov12_02225F6C unk_50; } UnkStruct_ov12_0222EC18; typedef struct { UnkStruct_ov12_0223595C unk_00; - CellActorData * unk_1C[3]; + CellActorData *unk_1C[3]; int unk_28; f32 unk_2C; f32 unk_30; u8 unk_34; u8 unk_35; s8 unk_36; - UnkStruct_ov12_022267D4 * unk_38[2]; + UnkStruct_ov12_022267D4 *unk_38[2]; } UnkStruct_ov12_0222EE50; typedef struct { @@ -87,14 +88,14 @@ typedef struct { int unk_10; int unk_14; int unk_18; - Sprite * unk_1C; + Sprite *unk_1C; UnkStruct_ov12_0223595C unk_20; UnkStruct_ov12_02235998 unk_3C; } UnkStruct_ov12_0222F464; -static void ov12_0222E91C (SysTask * param0, void * param1) +static void ov12_0222E91C(SysTask *param0, void *param1) { - UnkStruct_ov12_0222E91C * v0 = (UnkStruct_ov12_0222E91C *)param1; + UnkStruct_ov12_0222E91C *v0 = (UnkStruct_ov12_0222E91C *)param1; switch (v0->unk_00.unk_00) { case 0: @@ -111,8 +112,7 @@ static void ov12_0222E91C (SysTask * param0, void * param1) v0->unk_A0++; v0->unk_00.unk_00++; break; - case 1: - { + case 1: { int v1 = 0; if (ov12_02225C50(&v0->unk_58, v0->unk_1C.unk_0C) == 0) { @@ -134,8 +134,7 @@ static void ov12_0222E91C (SysTask * param0, void * param1) v0->unk_00.unk_00++; } } - } - break; + } break; default: ov12_02220220(v0->unk_00.unk_04, param0); ov12_02235E80(v0); @@ -147,9 +146,9 @@ static void ov12_0222E91C (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_0C); } -void ov12_0222EAA0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222EAA0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222E91C * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222E91C)); + UnkStruct_ov12_0222E91C *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222E91C)); ov12_0223595C(param0, &v0->unk_00); @@ -168,7 +167,7 @@ void ov12_0222EAA0 (UnkStruct_ov12_0221FCDC * param0) v0->unk_A4 = -sub_020080C0(v0->unk_1C.unk_08, 41); { - CellActorData * v1; + CellActorData *v1; int v2; int v3 = ov12_02223334(v0->unk_00.unk_04, ov12_02220240(v0->unk_00.unk_04)); int v4 = ov12_02223344(v0->unk_00.unk_04, ov12_02220240(v0->unk_00.unk_04)); @@ -191,9 +190,9 @@ void ov12_0222EAA0 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00.unk_04, ov12_0222E91C, v0); } -static void ov12_0222EC18 (SysTask * param0, void * param1) +static void ov12_0222EC18(SysTask *param0, void *param1) { - UnkStruct_ov12_0222EC18 * v0 = (UnkStruct_ov12_0222EC18 *)param1; + UnkStruct_ov12_0222EC18 *v0 = (UnkStruct_ov12_0222EC18 *)param1; { int v1; @@ -228,9 +227,9 @@ static void ov12_0222EC18 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_10); } -void ov12_0222EC90 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_0222EC18 * v0 = NULL; + UnkStruct_ov12_0222EC18 *v0 = NULL; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222EC18)); v0->unk_1C = 10; @@ -257,7 +256,7 @@ void ov12_0222EC90 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S } { - Sprite * v5; + Sprite *v5; s16 v6, v7, v8, v9; v5 = ov12_022232FC(v0->unk_00.unk_04, ov12_02220240(v0->unk_00.unk_04)); @@ -332,9 +331,9 @@ void ov12_0222EC90 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00.unk_04, ov12_0222EC18, v0); } -static void ov12_0222EE50 (SysTask * param0, void * param1) +static void ov12_0222EE50(SysTask *param0, void *param1) { - UnkStruct_ov12_0222EE50 * v0 = param1; + UnkStruct_ov12_0222EE50 *v0 = param1; switch (v0->unk_00.unk_00) { case 0: @@ -386,9 +385,9 @@ static void ov12_0222EE50 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_00.unk_0C); } -void ov12_0222EFB0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222EFB0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222EE50 * v0; + UnkStruct_ov12_0222EE50 *v0; int v1; s16 v2, v3; s16 v4; @@ -436,7 +435,7 @@ void ov12_0222EFB0 (UnkStruct_ov12_0221FCDC * param0) u8 v7; u8 v8; u8 v9; - Sprite * v10; + Sprite *v10; UnkStruct_ov12_02235350 v11; UnkStruct_ov12_02235350 v12; @@ -475,16 +474,16 @@ void ov12_0222EFB0 (UnkStruct_ov12_0221FCDC * param0) G2_ChangeBlendAlpha(v0->unk_34, v0->unk_35); { - SysTask * v14; + SysTask *v14; v14 = ov12_022201E8(v0->unk_00.unk_04, ov12_0222EE50, v0); ov12_0222EE50(v14, v0); } } -static void ov12_0222F208 (SysTask * param0, void * param1) +static void ov12_0222F208(SysTask *param0, void *param1) { - UnkStruct_ov12_0222F208 * v0 = (UnkStruct_ov12_0222F208 *)param1; + UnkStruct_ov12_0222F208 *v0 = (UnkStruct_ov12_0222F208 *)param1; switch (v0->unk_00.unk_00) { case 0: @@ -530,10 +529,10 @@ static void ov12_0222F208 (SysTask * param0, void * param1) } } -void ov12_0222F2F8 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0) { int v0; - UnkStruct_ov12_0222F208 * v1; + UnkStruct_ov12_0222F208 *v1; v1 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222F208)); ov12_0223595C(param0, &v1->unk_00); @@ -596,14 +595,14 @@ void ov12_0222F2F8 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v1->unk_00.unk_04, ov12_0222F208, v1); } -static void ov12_0222F44C (Sprite * param0, int param1, int param2, int param3, int param4) +static void ov12_0222F44C(Sprite *param0, int param1, int param2, int param3, int param4) { sub_020086D4(param0, param1, 80 - param3, param2, param4); } -static void ov12_0222F464 (SysTask * param0, void * param1) +static void ov12_0222F464(SysTask *param0, void *param1) { - UnkStruct_ov12_0222F464 * v0 = param1; + UnkStruct_ov12_0222F464 *v0 = param1; switch (v0->unk_20.unk_00) { case 0: @@ -655,9 +654,9 @@ static void ov12_0222F464 (SysTask * param0, void * param1) } } -void ov12_0222F5EC (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222F5EC(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222F464 * v0; + UnkStruct_ov12_0222F464 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0222F464)); ov12_0223595C(param0, &v0->unk_20); diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c index f2be779947..0e14592dd3 100644 --- a/src/overlay012/ov12_0222F700.c +++ b/src/overlay012/ov12_0222F700.c @@ -1,42 +1,42 @@ +#include "overlay012/ov12_0222F700.h" + #include #include -#include "enums.h" - -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" -#include "overlay012/struct_ov12_02226504_decl.h" -#include "overlay012/struct_ov12_0222660C_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" + +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02225864.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02225D50.h" #include "overlay012/struct_ov12_02225F6C.h" #include "overlay012/struct_ov12_02226274.h" #include "overlay012/struct_ov12_02226454.h" -#include "struct_defs/sprite_template.h" +#include "overlay012/struct_ov12_02226504_decl.h" +#include "overlay012/struct_ov12_0222660C_decl.h" +#include "enums.h" +#include "heap.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_0200762C.h" #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_020218BC.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_0222F700.h" -#include "overlay012/ov12_02235254.h" typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteGfxHandler * unk_04; - Sprite * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteGfxHandler *unk_04; + Sprite *unk_08; UnkStruct_ov12_02225F6C unk_0C; - CellActorData * unk_30[2]; + CellActorData *unk_30[2]; UnkStruct_ov12_02226274 unk_38; s16 unk_E8; s16 unk_EA; @@ -44,10 +44,10 @@ typedef struct { } UnkStruct_ov12_0222F700; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; s16 unk_08; - Sprite * unk_0C; + Sprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; UnkStruct_ov12_02225D50 unk_34; s16 unk_48; @@ -55,7 +55,7 @@ typedef struct { } UnkStruct_ov12_0222F888; typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; UnkStruct_ov12_02225F6C unk_04; UnkStruct_ov12_02225D50 unk_28; s16 unk_3C; @@ -66,9 +66,9 @@ typedef struct { } UnkStruct_ov12_0222FAFC; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; UnkStruct_ov12_0222FAFC unk_0C; UnkStruct_ov12_0222FAFC unk_58[2]; int unk_EC; @@ -78,14 +78,14 @@ typedef struct { } UnkStruct_ov12_0222FC44; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteGfxHandler * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteGfxHandler *unk_04; int unk_08; int unk_0C; UnkStruct_ov12_02225F6C unk_10; UnkStruct_ov12_02225F6C unk_34; - CellActorData * unk_58; - Sprite * unk_5C; + CellActorData *unk_58; + Sprite *unk_5C; s16 unk_60; s16 unk_62; s16 unk_64; @@ -93,35 +93,35 @@ typedef struct { } UnkStruct_ov12_0222FF80; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; int unk_08; - Sprite * unk_0C; + Sprite *unk_0C; s16 unk_10; s16 unk_12; s16 unk_14; s16 unk_16; - UnkStruct_ov12_0222660C * unk_18; + UnkStruct_ov12_0222660C *unk_18; UnkStruct_ov12_02225F6C unk_1C; UnkStruct_ov12_02226454 unk_40; } UnkStruct_ov12_02230194; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteGfxHandler * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteGfxHandler *unk_04; int unk_08; int unk_0C; - CellActorData * unk_10; + CellActorData *unk_10; UnkStruct_ov12_02225F6C unk_14; UnkStruct_ov12_02225D50 unk_38; BOOL unk_4C; } UnkStruct_ov12_02230540; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; - Sprite * unk_08; - CellActorData * unk_0C; + Sprite *unk_08; + CellActorData *unk_0C; BOOL unk_10; UnkStruct_ov12_02225F6C unk_14; s16 unk_38; @@ -130,24 +130,24 @@ typedef struct { } UnkStruct_ov12_02230600; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; int unk_08; int unk_0C; - Sprite * unk_10; - UnkStruct_ov12_0222660C * unk_14; - PaletteData * unk_18; + Sprite *unk_10; + UnkStruct_ov12_0222660C *unk_14; + PaletteData *unk_18; UnkStruct_ov12_02226454 unk_1C; int unk_44; - CellActorData * unk_48; + CellActorData *unk_48; } UnkStruct_ov12_02230910; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; - CellActorData * unk_10; + CellActorData *unk_10; UnkStruct_ov12_02225F6C unk_14; UnkStruct_ov12_02225D50 unk_38; int unk_4C; @@ -156,7 +156,7 @@ typedef struct { } UnkStruct_ov12_02230BE0; typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; UnkStruct_ov12_02225F6C unk_04; BOOL unk_28; int unk_2C; @@ -165,13 +165,13 @@ typedef struct { } UnkStruct_ov12_02230E24; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; int unk_10; int unk_14; - Sprite * unk_18; + Sprite *unk_18; s16 unk_1C; s16 unk_1E; UnkStruct_ov12_02225F6C unk_20; @@ -180,30 +180,30 @@ typedef struct { } UnkStruct_ov12_02230F3C; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; - Sprite * unk_10; + Sprite *unk_10; s16 unk_14; s16 unk_16; UnkStruct_ov12_02225F6C unk_18; s32 unk_3C; - Sprite * unk_40; + Sprite *unk_40; s16 unk_44; s16 unk_46; - CellActorData * unk_48; + CellActorData *unk_48; UnkStruct_ov12_02225F6C unk_4C; UnkStruct_ov12_02225F6C unk_70; } UnkStruct_ov12_022310D4; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteGfxHandler * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteGfxHandler *unk_04; int unk_08; int unk_0C; - Sprite * unk_10; - CellActorData * unk_14; + Sprite *unk_10; + CellActorData *unk_14; s16 unk_18; s16 unk_1A; UnkStruct_ov12_02225F6C unk_1C; @@ -212,14 +212,14 @@ typedef struct { } UnkStruct_ov12_02231390; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; - Sprite * unk_10; + Sprite *unk_10; UnkStruct_ov12_02225F6C unk_14; int unk_38; - CellActorData * unk_3C; + CellActorData *unk_3C; int unk_40; UnkStruct_ov12_02225F6C unk_44; UnkStruct_ov12_02225F6C unk_68; @@ -229,12 +229,12 @@ typedef struct { } UnkStruct_ov12_02231508; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; - Sprite * unk_10; - CellActorData * unk_14; + Sprite *unk_10; + CellActorData *unk_14; UnkStruct_ov12_02225F6C unk_18; UnkStruct_ov12_02226454 unk_3C; s16 unk_64; @@ -244,13 +244,13 @@ typedef struct { } UnkStruct_ov12_02231760; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; - Sprite * unk_10; - Sprite * unk_14[4]; - CellActorData * unk_24; + Sprite *unk_10; + Sprite *unk_14[4]; + CellActorData *unk_24; UnkStruct_ov12_02225F6C unk_28; s16 unk_4C; s16 unk_4E; @@ -261,8 +261,8 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_ov12_0221FCDC * unk_04; - Sprite * unk_08; + UnkStruct_ov12_0221FCDC *unk_04; + Sprite *unk_08; s16 unk_0C; s16 unk_0E; UnkStruct_ov12_02225D50 unk_10; @@ -274,10 +274,10 @@ typedef struct { } UnkStruct_ov12_02231CD4; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; int unk_08; - Sprite * unk_0C; + Sprite *unk_0C; UnkStruct_ov12_02225F6C unk_10; int unk_34; int unk_38; @@ -286,12 +286,12 @@ typedef struct { } UnkStruct_ov12_02231F18; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; int unk_10; - CellActorData * unk_14; + CellActorData *unk_14; UnkStruct_ov12_02225F6C unk_18; UnkStruct_ov12_02226454 unk_3C; int unk_64; @@ -305,8 +305,8 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_ov12_0221FCDC * unk_04; - Sprite * unk_08; + UnkStruct_ov12_0221FCDC *unk_04; + Sprite *unk_08; s16 unk_0C; s16 unk_0E; UnkStruct_ov12_02225F6C unk_10; @@ -315,44 +315,44 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_ov12_0221FCDC * unk_04; + UnkStruct_ov12_0221FCDC *unk_04; int unk_08; - Sprite * unk_0C; + Sprite *unk_0C; s16 unk_10; s16 unk_12; UnkStruct_ov12_02225F6C unk_14; - Sprite * unk_38; + Sprite *unk_38; s16 unk_3C; s16 unk_3E; UnkStruct_ov12_02225F6C unk_40; } UnkStruct_ov12_022324E0; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; int unk_10; int unk_14; - Sprite * unk_18; + Sprite *unk_18; UnkStruct_ov12_02225F6C unk_1C; int unk_40; s16 unk_44; s16 unk_46; - CellActorData * unk_48[6]; + CellActorData *unk_48[6]; int unk_60[6]; int unk_78[6]; } UnkStruct_ov12_02232720; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; - Sprite * unk_10; + Sprite *unk_10; UnkStruct_ov12_02225F6C unk_14; UnkStruct_ov12_02225F6C unk_38; - CellActorData * unk_5C; + CellActorData *unk_5C; UnkStruct_ov12_02225F6C unk_60; int unk_84; s16 unk_88; @@ -360,49 +360,49 @@ typedef struct { } UnkStruct_ov12_02232B40; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteGfxHandler * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteGfxHandler *unk_04; int unk_08; int unk_0C; int unk_10; int unk_14; - CellActorData * unk_18; - CellActorData * unk_1C; - CellActorData * unk_20; - CellActorData * unk_24; + CellActorData *unk_18; + CellActorData *unk_1C; + CellActorData *unk_20; + CellActorData *unk_24; UnkStruct_ov12_02225F6C unk_28; UnkStruct_ov12_02225F6C unk_4C; UnkStruct_ov12_02225F6C unk_70; int unk_94; int unk_98; UnkStruct_ov12_02226454 unk_9C; - PaletteData * unk_C4; + PaletteData *unk_C4; BOOL unk_C8; BOOL unk_CC; } UnkStruct_ov12_02232D38; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; - Sprite * unk_10; + Sprite *unk_10; UnkStruct_ov12_02225F6C unk_14; s16 unk_38; s16 unk_3A; - CellActorData * unk_3C[3]; + CellActorData *unk_3C[3]; UnkStruct_ov12_02226274 unk_48; UnkStruct_ov12_02225F6C unk_F8; } UnkStruct_ov12_022332E8; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; int unk_10; int unk_14; - CellActorData * unk_18[6]; + CellActorData *unk_18[6]; UnkStruct_ov12_02225F6C unk_30[6]; UnkStruct_ov12_02226454 unk_108; s16 unk_130; @@ -410,23 +410,23 @@ typedef struct { } UnkStruct_ov12_0223351C; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; int unk_10; int unk_14; - CellActorData * unk_18[15]; + CellActorData *unk_18[15]; UnkStruct_ov12_02225F6C unk_54[15]; int unk_270; int unk_274; } UnkStruct_ov12_02233900; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - UnkStruct_ov12_02226504 * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + UnkStruct_ov12_02226504 *unk_04; int unk_08; - Sprite * unk_0C; + Sprite *unk_0C; int unk_10; int unk_14; int unk_18; @@ -439,28 +439,28 @@ typedef struct { } UnkStruct_ov12_02233AA0; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; int unk_08; UnkStruct_ov12_02225F6C unk_0C; } UnkStruct_ov12_02233DCC; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; - CellActorData * unk_10; + CellActorData *unk_10; UnkStruct_ov12_02226454 unk_14; } UnkStruct_ov12_02233F4C; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; s16 unk_08; s16 unk_0A; s16 unk_0C; - Sprite * unk_10; + Sprite *unk_10; UnkStruct_ov12_02225F6C unk_14; UnkStruct_ov12_02225F6C unk_38; int unk_5C; @@ -473,19 +473,19 @@ typedef struct { } UnkStruct_ov12_02234044; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteGfxHandler * unk_04; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteGfxHandler *unk_04; UnkStruct_ov12_02225F6C unk_08; - CellActorData * unk_2C; + CellActorData *unk_2C; } UnkStruct_ov12_02234290; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; int unk_08; int unk_0C; int unk_10; - Sprite * unk_14; + Sprite *unk_14; s16 unk_18; s16 unk_1A; UnkStruct_ov12_02225F6C unk_1C; @@ -493,20 +493,20 @@ typedef struct { } UnkStruct_ov12_022343A0; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; int unk_08; int unk_0C; - Sprite * unk_10; + Sprite *unk_10; s16 unk_14; s16 unk_16; UnkStruct_ov12_02225F6C unk_18; UnkStruct_ov12_02225F6C unk_3C; } UnkStruct_ov12_02234528; -static void ov12_0222F700 (SysTask * param0, void * param1) +static void ov12_0222F700(SysTask *param0, void *param1) { - UnkStruct_ov12_0222F700 * v0 = param1; + UnkStruct_ov12_0222F700 *v0 = param1; BOOL v1[3]; int v2; @@ -528,9 +528,9 @@ static void ov12_0222F700 (SysTask * param0, void * param1) Heap_FreeToHeap(v0); } -void ov12_0222F770 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222F770(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222F700 * v0; + UnkStruct_ov12_0222F700 *v0; int v1; int v2; UnkStruct_ov12_02225F6C v3; @@ -565,9 +565,9 @@ void ov12_0222F770 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_0222F700, v0); } -static void ov12_0222F888 (SysTask * param0, void * param1) +static void ov12_0222F888(SysTask *param0, void *param1) { - UnkStruct_ov12_0222F888 * v0 = param1; + UnkStruct_ov12_0222F888 *v0 = param1; switch (v0->unk_04) { case 0: @@ -626,9 +626,9 @@ static void ov12_0222F888 (SysTask * param0, void * param1) } } -void ov12_0222F9E4 (UnkStruct_ov12_0221FCDC * param0) +void ov12_0222F9E4(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222F888 * v0; + UnkStruct_ov12_0222F888 *v0; int v1; int v2; int v3; @@ -670,7 +670,7 @@ void ov12_0222F9E4 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_0222F888, v0); } -static void ov12_0222FAFC (UnkStruct_ov12_0222FAFC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, const SpriteTemplate * param3, const UnkStruct_ov12_0222FAFC * param4) +static void ov12_0222FAFC(UnkStruct_ov12_0222FAFC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, const SpriteTemplate *param3, const UnkStruct_ov12_0222FAFC *param4) { param0->unk_00 = SpriteActor_LoadResources(param1, param2, param3); param0->unk_04 = param4->unk_04; @@ -686,17 +686,17 @@ static void ov12_0222FAFC (UnkStruct_ov12_0222FAFC * param0, SpriteRenderer * pa sub_0200D460(param0->unk_00, 1); } -static void ov12_0222FB6C (UnkStruct_ov12_0222FAFC * param0) +static void ov12_0222FB6C(UnkStruct_ov12_0222FAFC *param0) { sub_0200D0F4(param0->unk_00); } -static void ov12_0222FB78 (UnkStruct_ov12_0222FAFC * param0, BOOL param1) +static void ov12_0222FB78(UnkStruct_ov12_0222FAFC *param0, BOOL param1) { SpriteActor_EnableObject(param0->unk_00, param1); } -static BOOL ov12_0222FB84 (UnkStruct_ov12_0222FAFC * param0) +static BOOL ov12_0222FB84(UnkStruct_ov12_0222FAFC *param0) { if (param0->unk_48 == 0) { return 1; @@ -712,10 +712,10 @@ static BOOL ov12_0222FB84 (UnkStruct_ov12_0222FAFC * param0) } else { if (param0->unk_44 < 1) { if (param0->unk_44 == 0) { - ov12_02225A8C(¶m0->unk_04, param0->unk_04.unk_04[1], (((180 * 0xffff) / 360)), param0->unk_04.unk_04[1], (((180 * 0xffff) / 360)), param0->unk_04.unk_04[2], param0->unk_04.unk_04[4], (((10 * 0xffff) / 360))); + ov12_02225A8C(¶m0->unk_04, param0->unk_04.unk_04[1], ((180 * 0xffff) / 360), param0->unk_04.unk_04[1], ((180 * 0xffff) / 360), param0->unk_04.unk_04[2], param0->unk_04.unk_04[4], ((10 * 0xffff) / 360)); } - ov12_02225DF4(¶m0->unk_28, (((0 * 0xffff) / 360)), (((360 * 0xffff) / 360)), (-1 * FX32_ONE), param0->unk_04.unk_04[0]); + ov12_02225DF4(¶m0->unk_28, ((0 * 0xffff) / 360), ((360 * 0xffff) / 360), (-1 * FX32_ONE), param0->unk_04.unk_04[0]); } param0->unk_44++; @@ -728,9 +728,9 @@ static BOOL ov12_0222FB84 (UnkStruct_ov12_0222FAFC * param0) return 1; } -static void ov12_0222FC44 (SysTask * param0, void * param1) +static void ov12_0222FC44(SysTask *param0, void *param1) { - UnkStruct_ov12_0222FC44 * v0 = param1; + UnkStruct_ov12_0222FC44 *v0 = param1; int v1; BOOL v2 = 0; BOOL v3; @@ -813,9 +813,9 @@ static void ov12_0222FC44 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_0222FE30 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_0222FE30(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_0222FC44 * v0; + UnkStruct_ov12_0222FC44 *v0; SpriteTemplate v1; int v2; int v3; @@ -837,8 +837,8 @@ void ov12_0222FE30 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S v0->unk_0C.unk_00 = param3; v0->unk_0C.unk_44 = 0; - ov12_02225A8C(&v0->unk_0C.unk_04, (((90 * 0xffff) / 360)), (((270 * 0xffff) / 360)), (((90 * 0xffff) / 360)), (((270 * 0xffff) / 360)), v4, (-8 * FX32_ONE), (((10 * 0xffff) / 360))); - ov12_02225DF4(&v0->unk_0C.unk_28, (((0 * 0xffff) / 360)), (((360 * 0xffff) / 360)), (-1 * FX32_ONE), v0->unk_0C.unk_04.unk_04[0]); + ov12_02225A8C(&v0->unk_0C.unk_04, ((90 * 0xffff) / 360), ((270 * 0xffff) / 360), ((90 * 0xffff) / 360), ((270 * 0xffff) / 360), v4, (-8 * FX32_ONE), ((10 * 0xffff) / 360)); + ov12_02225DF4(&v0->unk_0C.unk_28, ((0 * 0xffff) / 360), ((360 * 0xffff) / 360), (-1 * FX32_ONE), v0->unk_0C.unk_04.unk_04[0]); v0->unk_0C.unk_3C = v0->unk_0C.unk_04.unk_04[5]; v0->unk_0C.unk_48 = 1; @@ -869,7 +869,7 @@ void ov12_0222FE30 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_0222FC44, v0); } -static void ov12_0222FF80 (UnkStruct_ov12_0222FF80 * param0) +static void ov12_0222FF80(UnkStruct_ov12_0222FF80 *param0) { f32 v0, v1; @@ -884,9 +884,9 @@ static void ov12_0222FF80 (UnkStruct_ov12_0222FF80 * param0) param0->unk_64 *= -1; } -static void ov12_02230018 (SysTask * param0, void * param1) +static void ov12_02230018(SysTask *param0, void *param1) { - UnkStruct_ov12_0222FF80 * v0 = param1; + UnkStruct_ov12_0222FF80 *v0 = param1; BOOL v1; switch (v0->unk_08) { @@ -922,9 +922,9 @@ static void ov12_02230018 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_04); } -void ov12_022300C4 (UnkStruct_ov12_0221FCDC * param0) +void ov12_022300C4(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_0222FF80 * v0; + UnkStruct_ov12_0222FF80 *v0; v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_0222FF80)); @@ -951,7 +951,7 @@ void ov12_022300C4 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_02230018, v0); } -static void ov12_02230194 (UnkStruct_ov12_02230194 * param0, void * param1) +static void ov12_02230194(UnkStruct_ov12_02230194 *param0, void *param1) { u32 v0; @@ -959,9 +959,9 @@ static void ov12_02230194 (UnkStruct_ov12_02230194 * param0, void * param1) MI_CpuFill32(param1, v0, sizeof(u32) * 192); } -static BOOL ov12_022301B4 (UnkStruct_ov12_02230194 * param0) +static BOOL ov12_022301B4(UnkStruct_ov12_02230194 *param0) { - u32 * v0; + u32 *v0; int v1; BOOL v2; s16 v3, v4; @@ -990,9 +990,9 @@ static BOOL ov12_022301B4 (UnkStruct_ov12_02230194 * param0) return v2; } -static void ov12_0223025C (SysTask * param0, void * param1) +static void ov12_0223025C(SysTask *param0, void *param1) { - UnkStruct_ov12_02230194 * v0 = param1; + UnkStruct_ov12_02230194 *v0 = param1; switch (v0->unk_04) { case 0: @@ -1046,11 +1046,11 @@ static void ov12_0223025C (SysTask * param0, void * param1) } } -void ov12_022303D0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_022303D0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02230194 * v0; + UnkStruct_ov12_02230194 *v0; int v1; - SysTask * v2; + SysTask *v2; int v3; v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_02230194)); @@ -1082,7 +1082,7 @@ void ov12_022303D0 (UnkStruct_ov12_0221FCDC * param0) v0->unk_16 = 192; } - v0->unk_18 = ov12_0222662C(v0->unk_14, v0->unk_16, (((5 * 0xffff) / 360)), (8 * FX32_ONE) * v1, 80, ov12_022233EC(param0, 1), SysTask_GetPriority(v2) + 1, ov12_022266E8(v0->unk_10, v0->unk_12), ov12_0221FDE4(param0)); + v0->unk_18 = ov12_0222662C(v0->unk_14, v0->unk_16, ((5 * 0xffff) / 360), (8 * FX32_ONE) * v1, 80, ov12_022233EC(param0, 1), SysTask_GetPriority(v2) + 1, ov12_022266E8(v0->unk_10, v0->unk_12), ov12_0221FDE4(param0)); ov12_02225BC8(&v0->unk_1C, 0, 80, 0, 40, 24); v0->unk_1C.unk_04[1] *= v1; @@ -1096,9 +1096,9 @@ void ov12_022303D0 (UnkStruct_ov12_0221FCDC * param0) ov12_0223025C(v2, v0); } -static void ov12_02230540 (SysTask * param0, void * param1) +static void ov12_02230540(SysTask *param0, void *param1) { - UnkStruct_ov12_02230540 * v0 = param1; + UnkStruct_ov12_02230540 *v0 = param1; BOOL v1; f32 v2, v3; @@ -1143,9 +1143,9 @@ static void ov12_02230540 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_04); } -static void ov12_02230600 (SysTask * param0, void * param1) +static void ov12_02230600(SysTask *param0, void *param1) { - UnkStruct_ov12_02230600 * v0 = param1; + UnkStruct_ov12_02230600 *v0 = param1; BOOL v1; switch (v0->unk_04) { @@ -1200,9 +1200,9 @@ static void ov12_02230600 (SysTask * param0, void * param1) } } -void ov12_02230754 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02230754(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02230540 * v0; + UnkStruct_ov12_02230540 *v0; int v1; v0 = Heap_AllocFromHeap(ov12_0221FDE4(param0), sizeof(UnkStruct_ov12_02230540)); @@ -1232,9 +1232,9 @@ void ov12_02230754 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_02230540, v0); } -void ov12_02230804 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02230804(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02230600 * v0; + UnkStruct_ov12_02230600 *v0; int v1; int v2; int v3; @@ -1274,7 +1274,7 @@ void ov12_02230804 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_02230600, v0); } -static BOOL ov12_02230910 (UnkStruct_ov12_02230910 * param0) +static BOOL ov12_02230910(UnkStruct_ov12_02230910 *param0) { BOOL v0 = 0; @@ -1308,9 +1308,9 @@ static BOOL ov12_02230910 (UnkStruct_ov12_02230910 * param0) return v0; } -static void ov12_02230994 (SysTask * param0, void * param1) +static void ov12_02230994(SysTask *param0, void *param1) { - UnkStruct_ov12_02230910 * v0 = param1; + UnkStruct_ov12_02230910 *v0 = param1; BOOL v1; switch (v0->unk_04) { @@ -1349,9 +1349,9 @@ static void ov12_02230994 (SysTask * param0, void * param1) } } -void ov12_02230A8C (UnkStruct_ov12_0221FCDC * param0) +void ov12_02230A8C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02230910 * v0; + UnkStruct_ov12_02230910 *v0; int v1; s16 v2, v3; int v4; @@ -1385,16 +1385,16 @@ void ov12_02230A8C (UnkStruct_ov12_0221FCDC * param0) SpriteActor_EnableObject(v0->unk_48, 0); } - v0->unk_14 = ov12_0222662C(v3, v3 + 80, (((5 * 0xffff) / 360)), (5 * FX32_ONE), 100, ov12_022233EC(param0, 1), 0, ov12_022266E8(-v2, -v3), ov12_0221FDE4(param0)); + v0->unk_14 = ov12_0222662C(v3, v3 + 80, ((5 * 0xffff) / 360), (5 * FX32_ONE), 100, ov12_022233EC(param0, 1), 0, ov12_022266E8(-v2, -v3), ov12_0221FDE4(param0)); v4 = 1 << 8; sub_02003A2C(v0->unk_18, 0, v4, 8, 0x0); ov12_022201E8(v0->unk_00, ov12_02230994, v0); } -static void ov12_02230BE0 (SysTask * param0, void * param1) +static void ov12_02230BE0(SysTask *param0, void *param1) { - UnkStruct_ov12_02230BE0 * v0 = param1; + UnkStruct_ov12_02230BE0 *v0 = param1; BOOL v1; f32 v2, v3; int v4, v5; @@ -1452,9 +1452,9 @@ static void ov12_02230BE0 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02230CEC (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02230CEC(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02230BE0 * v0; + UnkStruct_ov12_02230BE0 *v0; int v1; int v2; s16 v3, v4; @@ -1497,17 +1497,17 @@ void ov12_02230CEC (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_02225E68(&v0->unk_14, 1, 10, 10, 8); if (v2 >= 0) { - ov12_02225D50(&v0->unk_38, (((359 * 0xffff) / 360)), (((320 * 0xffff) / 360)), 4); - v0->unk_50 = (((359 * 0xffff) / 360)); + ov12_02225D50(&v0->unk_38, ((359 * 0xffff) / 360), ((320 * 0xffff) / 360), 4); + v0->unk_50 = ((359 * 0xffff) / 360); } else { - ov12_02225D50(&v0->unk_38, (((0 * 0xffff) / 360)), (((40 * 0xffff) / 360)), 4); - v0->unk_50 = (((0 * 0xffff) / 360)); + ov12_02225D50(&v0->unk_38, ((0 * 0xffff) / 360), ((40 * 0xffff) / 360), 4); + v0->unk_50 = ((0 * 0xffff) / 360); } ov12_022201E8(v0->unk_00, ov12_02230BE0, v0); } -static void ov12_02230E24 (UnkStruct_ov12_02230E24 * param0, CellActorData * param1, s16 param2, s16 param3, BOOL param4) +static void ov12_02230E24(UnkStruct_ov12_02230E24 *param0, CellActorData *param1, s16 param2, s16 param3, BOOL param4) { param0->unk_00 = param1; @@ -1531,18 +1531,18 @@ static void ov12_02230E24 (UnkStruct_ov12_02230E24 * param0, CellActorData * par SpriteActor_EnableObject(param0->unk_00, 0); } -static void ov12_02230E9C (UnkStruct_ov12_02230E24 * param0) +static void ov12_02230E9C(UnkStruct_ov12_02230E24 *param0) { sub_0200D0F4(param0->unk_00); } -static void ov12_02230EA8 (UnkStruct_ov12_02230E24 * param0) +static void ov12_02230EA8(UnkStruct_ov12_02230E24 *param0) { SpriteActor_EnableObject(param0->unk_00, 1); sub_0200D390(param0->unk_00, 1); } -static BOOL ov12_02230EC0 (UnkStruct_ov12_02230E24 * param0) +static BOOL ov12_02230EC0(UnkStruct_ov12_02230E24 *param0) { BOOL v0; f32 v1, v2; @@ -1573,9 +1573,9 @@ static BOOL ov12_02230EC0 (UnkStruct_ov12_02230E24 * param0) return 1; } -static void ov12_02230F3C (SysTask * param0, void * param1) +static void ov12_02230F3C(SysTask *param0, void *param1) { - UnkStruct_ov12_02230F3C * v0 = param1; + UnkStruct_ov12_02230F3C *v0 = param1; int v1; BOOL v2; @@ -1623,9 +1623,9 @@ static void ov12_02230F3C (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02231010 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02231010(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02230F3C * v0; + UnkStruct_ov12_02230F3C *v0; int v1; int v2; int v3; @@ -1663,9 +1663,9 @@ void ov12_02231010 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_02230F3C, v0); } -static void ov12_022310D4 (SysTask * param0, void * param1) +static void ov12_022310D4(SysTask *param0, void *param1) { - UnkStruct_ov12_022310D4 * v0 = param1; + UnkStruct_ov12_022310D4 *v0 = param1; switch (v0->unk_0C) { case 0: @@ -1729,9 +1729,9 @@ static void ov12_022310D4 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_022312A4 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_022312A4(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_022310D4 * v0; + UnkStruct_ov12_022310D4 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022310D4)); @@ -1758,9 +1758,9 @@ void ov12_022312A4 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_022310D4, v0); } -static void ov12_02231390 (SysTask * param0, void * param1) +static void ov12_02231390(SysTask *param0, void *param1) { - UnkStruct_ov12_02231390 * v0 = param1; + UnkStruct_ov12_02231390 *v0 = param1; switch (v0->unk_08) { case 0: @@ -1795,9 +1795,9 @@ static void ov12_02231390 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_04); } -void ov12_02231444 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02231444(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02231390 * v0; + UnkStruct_ov12_02231390 *v0; int v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02231390)); @@ -1827,7 +1827,7 @@ void ov12_02231444 (UnkStruct_ov12_0221FCDC * param0) sub_0200C7EC(v0->unk_04); } -static BOOL ov12_02231508 (UnkStruct_ov12_02231508 * param0) +static BOOL ov12_02231508(UnkStruct_ov12_02231508 *param0) { BOOL v0 = 0; @@ -1857,7 +1857,7 @@ static BOOL ov12_02231508 (UnkStruct_ov12_02231508 * param0) return v0; } -static BOOL ov12_02231584 (UnkStruct_ov12_02231508 * param0) +static BOOL ov12_02231584(UnkStruct_ov12_02231508 *param0) { BOOL v0 = 0; BOOL v1; @@ -1889,9 +1889,9 @@ static BOOL ov12_02231584 (UnkStruct_ov12_02231508 * param0) return v0; } -static void ov12_02231608 (SysTask * param0, void * param1) +static void ov12_02231608(SysTask *param0, void *param1) { - UnkStruct_ov12_02231508 * v0 = param1; + UnkStruct_ov12_02231508 *v0 = param1; switch (v0->unk_0C) { case 0: @@ -1911,9 +1911,9 @@ static void ov12_02231608 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02231650 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02231650(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02231508 * v0; + UnkStruct_ov12_02231508 *v0; int v1; int v2; s16 v3; @@ -1958,7 +1958,7 @@ void ov12_02231650 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_02231608, v0); } -static void ov12_02231760 (UnkStruct_ov12_02231760 * param0) +static void ov12_02231760(UnkStruct_ov12_02231760 *param0) { switch (param0->unk_68) { case 0: @@ -1985,9 +1985,9 @@ static void ov12_02231760 (UnkStruct_ov12_02231760 * param0) } } -static void ov12_0223181C (SysTask * param0, void * param1) +static void ov12_0223181C(SysTask *param0, void *param1) { - UnkStruct_ov12_02231760 * v0 = param1; + UnkStruct_ov12_02231760 *v0 = param1; switch (v0->unk_0C) { case 0: @@ -2045,9 +2045,9 @@ static void ov12_0223181C (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02231950 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02231950(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02231760 * v0; + UnkStruct_ov12_02231760 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02231760)); @@ -2064,7 +2064,7 @@ void ov12_02231950 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_0223181C, v0); } -static void ov12_022319AC (UnkStruct_ov12_022319AC * param0) +static void ov12_022319AC(UnkStruct_ov12_022319AC *param0) { switch (param0->unk_50) { case 0: @@ -2085,9 +2085,9 @@ static void ov12_022319AC (UnkStruct_ov12_022319AC * param0) } } -static void ov12_02231A38 (SysTask * param0, void * param1) +static void ov12_02231A38(SysTask *param0, void *param1) { - UnkStruct_ov12_022319AC * v0 = param1; + UnkStruct_ov12_022319AC *v0 = param1; int v1; switch (v0->unk_0C) { @@ -2179,9 +2179,9 @@ static void ov12_02231A38 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02231C1C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02231C1C(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_022319AC * v0; + UnkStruct_ov12_022319AC *v0; int v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022319AC)); @@ -2213,11 +2213,11 @@ void ov12_02231C1C (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_02231A38, v0); } -static void ov12_02231CD4 (UnkStruct_ov12_02231CD4 * param0, BOOL param1) +static void ov12_02231CD4(UnkStruct_ov12_02231CD4 *param0, BOOL param1) { fx32 v0; - ov12_02225D78(¶m0->unk_10, 0, (((15 * 0xffff) / 360)), 3); + ov12_02225D78(¶m0->unk_10, 0, ((15 * 0xffff) / 360), 3); if (param1) { param0->unk_10.unk_04[1] *= -1; @@ -2230,7 +2230,7 @@ static void ov12_02231CD4 (UnkStruct_ov12_02231CD4 * param0, BOOL param1) param0->unk_50 = 0; } -static BOOL ov12_02231D18 (UnkStruct_ov12_02231CD4 * param0) +static BOOL ov12_02231D18(UnkStruct_ov12_02231CD4 *param0) { BOOL v0 = 0; @@ -2278,9 +2278,9 @@ static BOOL ov12_02231D18 (UnkStruct_ov12_02231CD4 * param0) return v0; } -static void ov12_02231E28 (SysTask * param0, void * param1) +static void ov12_02231E28(SysTask *param0, void *param1) { - UnkStruct_ov12_02231CD4 * v0 = param1; + UnkStruct_ov12_02231CD4 *v0 = param1; switch (v0->unk_00) { case 0: @@ -2303,9 +2303,9 @@ static void ov12_02231E28 (SysTask * param0, void * param1) } } -void ov12_02231E7C (UnkStruct_ov12_0221FCDC * param0) +void ov12_02231E7C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02231CD4 * v0; + UnkStruct_ov12_02231CD4 *v0; int v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02231CD4)); @@ -2335,7 +2335,7 @@ void ov12_02231E7C (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_04, ov12_02231E28, v0); } -static BOOL ov12_02231F18 (UnkStruct_ov12_02231F18 * param0) +static BOOL ov12_02231F18(UnkStruct_ov12_02231F18 *param0) { BOOL v0 = 0; @@ -2372,9 +2372,9 @@ static BOOL ov12_02231F18 (UnkStruct_ov12_02231F18 * param0) return v0; } -static void ov12_02231FD8 (SysTask * param0, void * param1) +static void ov12_02231FD8(SysTask *param0, void *param1) { - UnkStruct_ov12_02231F18 * v0 = param1; + UnkStruct_ov12_02231F18 *v0 = param1; switch (v0->unk_04) { case 0: @@ -2397,10 +2397,10 @@ static void ov12_02231FD8 (SysTask * param0, void * param1) } } -void ov12_02232024 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02232024(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02231F18 * v0; - Sprite * v1; + UnkStruct_ov12_02231F18 *v0; + Sprite *v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02231F18)); @@ -2416,7 +2416,7 @@ void ov12_02232024 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_02231FD8, v0); } -static void ov12_02232084 (UnkStruct_ov12_02232084 * param0) +static void ov12_02232084(UnkStruct_ov12_02232084 *param0) { ov12_02225E68(¶m0->unk_18, param0->unk_74 / 100, 10, param0->unk_78 / 100, param0->unk_70 / 100); ov12_02235780(param0->unk_00, 16, 16 - 16); @@ -2426,7 +2426,7 @@ static void ov12_02232084 (UnkStruct_ov12_02232084 * param0) param0->unk_68 = 0; } -static BOOL ov12_022320EC (UnkStruct_ov12_02232084 * param0) +static BOOL ov12_022320EC(UnkStruct_ov12_02232084 *param0) { BOOL v0 = 0; @@ -2463,7 +2463,7 @@ static BOOL ov12_022320EC (UnkStruct_ov12_02232084 * param0) return v0; } -static BOOL ov12_022321C4 (UnkStruct_ov12_02232084 * param0) +static BOOL ov12_022321C4(UnkStruct_ov12_02232084 *param0) { BOOL v0 = 0; @@ -2496,9 +2496,9 @@ static BOOL ov12_022321C4 (UnkStruct_ov12_02232084 * param0) return v0; } -static void ov12_0223223C (SysTask * param0, void * param1) +static void ov12_0223223C(SysTask *param0, void *param1) { - UnkStruct_ov12_02232084 * v0 = param1; + UnkStruct_ov12_02232084 *v0 = param1; BOOL v1, v2; switch (v0->unk_0C) { @@ -2558,10 +2558,10 @@ static void ov12_0223223C (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02232378 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02232378(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02232084 * v0; - Sprite * v1; + UnkStruct_ov12_02232084 *v0; + Sprite *v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02232084)); @@ -2584,7 +2584,7 @@ void ov12_02232378 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_0223223C, v0); } -static void ov12_022323E4 (UnkStruct_ov12_022323E4 * param0) +static void ov12_022323E4(UnkStruct_ov12_022323E4 *param0) { switch (param0->unk_34) { case 0: @@ -2598,9 +2598,9 @@ static void ov12_022323E4 (UnkStruct_ov12_022323E4 * param0) } } -static void ov12_02232430 (SysTask * param0, void * param1) +static void ov12_02232430(SysTask *param0, void *param1) { - UnkStruct_ov12_022323E4 * v0 = param1; + UnkStruct_ov12_022323E4 *v0 = param1; switch (v0->unk_00) { case 0: @@ -2627,9 +2627,9 @@ static void ov12_02232430 (SysTask * param0, void * param1) } } -void ov12_0223249C (UnkStruct_ov12_0221FCDC * param0) +void ov12_0223249C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_022323E4 * v0; + UnkStruct_ov12_022323E4 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022323E4)); @@ -2642,9 +2642,9 @@ void ov12_0223249C (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_04, ov12_02232430, v0); } -static void ov12_022324E0 (SysTask * param0, void * param1) +static void ov12_022324E0(SysTask *param0, void *param1) { - UnkStruct_ov12_022324E0 * v0 = param1; + UnkStruct_ov12_022324E0 *v0 = param1; switch (v0->unk_00) { case 0: @@ -2706,9 +2706,9 @@ static void ov12_022324E0 (SysTask * param0, void * param1) } } -void ov12_022326AC (UnkStruct_ov12_0221FCDC * param0) +void ov12_022326AC(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_022324E0 * v0; + UnkStruct_ov12_022324E0 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022324E0)); @@ -2724,13 +2724,13 @@ void ov12_022326AC (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_04, ov12_022324E0, v0); } -static void ov12_02232720 (UnkStruct_ov12_02232720 * param0) +static void ov12_02232720(UnkStruct_ov12_02232720 *param0) { param0->unk_40 = 0; ov12_02225EF0(¶m0->unk_1C, 10, 9, 10, 8, 10, 2); } -static BOOL ov12_02232744 (UnkStruct_ov12_02232720 * param0) +static BOOL ov12_02232744(UnkStruct_ov12_02232720 *param0) { BOOL v0 = 0; @@ -2769,7 +2769,7 @@ static BOOL ov12_02232744 (UnkStruct_ov12_02232720 * param0) return v0; } -static void ov12_0223283C (CellActorData * param0, int * param1, fx32 param2) +static void ov12_0223283C(CellActorData *param0, int *param1, fx32 param2) { *param1 = 0; @@ -2783,7 +2783,7 @@ static void ov12_0223283C (CellActorData * param0, int * param1, fx32 param2) sub_0200D34C(param0, 55 * FX32_ONE); } -static BOOL ov12_02232888 (CellActorData * param0, int * param1) +static BOOL ov12_02232888(CellActorData *param0, int *param1) { BOOL v0 = 0; @@ -2805,9 +2805,9 @@ static BOOL ov12_02232888 (CellActorData * param0, int * param1) return v0; } -static void ov12_022328B8 (SysTask * param0, void * param1) +static void ov12_022328B8(SysTask *param0, void *param1) { - UnkStruct_ov12_02232720 * v0 = param1; + UnkStruct_ov12_02232720 *v0 = param1; BOOL v1, v2; int v3; @@ -2868,9 +2868,9 @@ static void ov12_022328B8 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_022329E0 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_022329E0(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02232720 * v0; + UnkStruct_ov12_02232720 *v0; SpriteTemplate v1; int v2; s16 v3; @@ -2925,9 +2925,9 @@ void ov12_022329E0 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_022328B8, v0); } -static void ov12_02232B40 (SysTask * param0, void * param1) +static void ov12_02232B40(SysTask *param0, void *param1) { - UnkStruct_ov12_02232B40 * v0 = param1; + UnkStruct_ov12_02232B40 *v0 = param1; int v1, v2; switch (v0->unk_0C) { @@ -2982,9 +2982,9 @@ static void ov12_02232B40 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02232CA8 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02232CA8(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02232B40 * v0; + UnkStruct_ov12_02232B40 *v0; s16 v1, v2; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02232B40)); @@ -3014,7 +3014,7 @@ static const u16 Unk_ov12_0223A1CC[6] = { 0x1 }; -static void ov12_02232D38 (UnkStruct_ov12_02232D38 * param0, CellActorData * param1) +static void ov12_02232D38(UnkStruct_ov12_02232D38 *param0, CellActorData *param1) { int v0; @@ -3022,7 +3022,7 @@ static void ov12_02232D38 (UnkStruct_ov12_02232D38 * param0, CellActorData * par sub_02003A2C(param0->unk_C4, 2, v0, 8, 0x0); } -static void ov12_02232D64 (UnkStruct_ov12_02232D38 * param0) +static void ov12_02232D64(UnkStruct_ov12_02232D38 *param0) { int v0; f32 v1, v2; @@ -3048,7 +3048,7 @@ static void ov12_02232D64 (UnkStruct_ov12_02232D38 * param0) ov12_02232D38(param0, param0->unk_18); } -static BOOL ov12_02232E04 (UnkStruct_ov12_02232D38 * param0) +static BOOL ov12_02232E04(UnkStruct_ov12_02232D38 *param0) { BOOL v0 = 0; f32 v1, v2; @@ -3102,7 +3102,7 @@ static BOOL ov12_02232E04 (UnkStruct_ov12_02232D38 * param0) return v0; } -static void ov12_02232F30 (UnkStruct_ov12_02232D38 * param0) +static void ov12_02232F30(UnkStruct_ov12_02232D38 *param0) { s16 v0, v1; f32 v2, v3; @@ -3132,7 +3132,7 @@ static void ov12_02232F30 (UnkStruct_ov12_02232D38 * param0) ov12_02232D38(param0, param0->unk_1C); } -static BOOL ov12_02232FF0 (UnkStruct_ov12_02232D38 * param0) +static BOOL ov12_02232FF0(UnkStruct_ov12_02232D38 *param0) { f32 v0, v1; BOOL v2 = 0; @@ -3172,9 +3172,9 @@ static BOOL ov12_02232FF0 (UnkStruct_ov12_02232D38 * param0) return v2; } -static void ov12_02233094 (SysTask * param0, void * param1) +static void ov12_02233094(SysTask *param0, void *param1) { - UnkStruct_ov12_02232D38 * v0 = param1; + UnkStruct_ov12_02232D38 *v0 = param1; switch (v0->unk_08) { case 0: @@ -3222,10 +3222,10 @@ static void ov12_02233094 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_04); } -void ov12_02233178 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02233178(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02232D38 * v0; - Sprite * v1; + UnkStruct_ov12_02232D38 *v0; + Sprite *v1; s16 v2, v3; s16 v4, v5; @@ -3277,22 +3277,22 @@ void ov12_02233178 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_02233094, v0); } -static void ov12_022332E8 (UnkStruct_ov12_022332E8 * param0) +static void ov12_022332E8(UnkStruct_ov12_022332E8 *param0) { ov12_02225E68(¶m0->unk_F8, 25, 10, 10, 10); ov12_022261C4(¶m0->unk_48, ¶m0->unk_F8, ov12_02225EB8, param0->unk_38, param0->unk_3A, 9, 3, 1, param0->unk_3C[2], param0->unk_3C[1], param0->unk_3C[0], NULL); } -static void ov12_02233338 (UnkStruct_ov12_022332E8 * param0) +static void ov12_02233338(UnkStruct_ov12_022332E8 *param0) { ov12_02225E68(¶m0->unk_F8, 10, 10, 25, 6); ov12_022261C4(¶m0->unk_48, ¶m0->unk_F8, ov12_02225EB8, param0->unk_38, param0->unk_3A, 5, 3, 1, param0->unk_3C[0], param0->unk_3C[1], param0->unk_3C[2], NULL); SpriteActor_EnableObject(param0->unk_3C[0], 1); } -static void ov12_02233394 (SysTask * param0, void * param1) +static void ov12_02233394(SysTask *param0, void *param1) { - UnkStruct_ov12_022332E8 * v0 = param1; + UnkStruct_ov12_022332E8 *v0 = param1; int v1; switch (v0->unk_0C) { @@ -3331,9 +3331,9 @@ static void ov12_02233394 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02233454 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02233454(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_022332E8 * v0; + UnkStruct_ov12_022332E8 *v0; int v1; SpriteTemplate v2; @@ -3368,7 +3368,7 @@ void ov12_02233454 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_02233394, v0); } -static void ov12_0223351C (UnkStruct_ov12_0223351C * param0, int param1) +static void ov12_0223351C(UnkStruct_ov12_0223351C *param0, int param1) { int v0; int v1; @@ -3376,13 +3376,13 @@ static void ov12_0223351C (UnkStruct_ov12_0223351C * param0, int param1) v1 = ((360 * 0xffff) / 360) / 6; for (v0 = 0; v0 < 6; v0++) { - ov12_02225A5C(¶m0->unk_30[v0], (((0 * 0xffff) / 360)), (((180 * 0xffff) / 360)), 0, 0, (FX32_ONE * 50), 0, 48); + ov12_02225A5C(¶m0->unk_30[v0], ((0 * 0xffff) / 360), ((180 * 0xffff) / 360), 0, 0, (FX32_ONE * 50), 0, 48); param0->unk_30[v0].unk_04[1] += (v1 * v0); param0->unk_30[v0].unk_04[5] *= param1; } } -static void ov12_02233574 (UnkStruct_ov12_0223351C * param0) +static void ov12_02233574(UnkStruct_ov12_0223351C *param0) { int v0; s16 v1; @@ -3404,9 +3404,9 @@ static void ov12_02233574 (UnkStruct_ov12_0223351C * param0) } } -static void ov12_02233644 (SysTask * param0, void * param1) +static void ov12_02233644(SysTask *param0, void *param1) { - UnkStruct_ov12_0223351C * v0 = param1; + UnkStruct_ov12_0223351C *v0 = param1; int v1; switch (v0->unk_0C) { @@ -3454,11 +3454,11 @@ static void ov12_02233644 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02233734 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02233734(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_0223351C * v0; + UnkStruct_ov12_0223351C *v0; int v1; - Sprite * v2; + Sprite *v2; SpriteTemplate v3; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0223351C)); @@ -3490,7 +3490,7 @@ void ov12_02233734 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_02233644, v0); } -static void ov12_022337E0 (CellActorData * param0, UnkStruct_ov12_02225F6C * param1, int param2, int param3) +static void ov12_022337E0(CellActorData *param0, UnkStruct_ov12_02225F6C *param1, int param2, int param3) { s16 v0, v1; @@ -3499,7 +3499,7 @@ static void ov12_022337E0 (CellActorData * param0, UnkStruct_ov12_02225F6C * par SpriteActor_EnableObject(param0, 1); } -static BOOL ov12_02233834 (CellActorData * param0, UnkStruct_ov12_02225F6C * param1) +static BOOL ov12_02233834(CellActorData *param0, UnkStruct_ov12_02225F6C *param1) { s16 v0, v1; s16 v2; @@ -3510,7 +3510,7 @@ static BOOL ov12_02233834 (CellActorData * param0, UnkStruct_ov12_02225F6C * par if (ov12_02225C50(param1, param0)) { SpriteActor_GetSpritePositionXY(param0, &v0, &v1); - v5 = v0 * (((2 * 0xffff) / 360)); + v5 = v0 * ((2 * 0xffff) / 360); v2 = FX_Mul(FX_SinIdx(v5), (FX32_ONE * 14)) >> FX32_SHIFT; SpriteActor_SetSpritePositionXY(param0, v0, v1 + v2); @@ -3526,7 +3526,7 @@ static BOOL ov12_02233834 (CellActorData * param0, UnkStruct_ov12_02225F6C * par return 1; } -static BOOL ov12_02233900 (UnkStruct_ov12_02233900 * param0) +static BOOL ov12_02233900(UnkStruct_ov12_02233900 *param0) { int v0; BOOL v1; @@ -3555,9 +3555,9 @@ static BOOL ov12_02233900 (UnkStruct_ov12_02233900 * param0) return 0; } -static void ov12_02233988 (SysTask * param0, void * param1) +static void ov12_02233988(SysTask *param0, void *param1) { - UnkStruct_ov12_02233900 * v0 = param1; + UnkStruct_ov12_02233900 *v0 = param1; int v1; if (ov12_02233900(v0)) { @@ -3572,12 +3572,12 @@ static void ov12_02233988 (SysTask * param0, void * param1) } } -void ov12_022339C4 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_022339C4(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02233900 * v0; + UnkStruct_ov12_02233900 *v0; int v1; s16 v2, v3; - Sprite * v4; + Sprite *v4; SpriteTemplate v5; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02233900)); @@ -3612,23 +3612,23 @@ void ov12_022339C4 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_02233988, v0); } -static void ov12_02233AA0 (UnkStruct_ov12_02233AA0 * param0) +static void ov12_02233AA0(UnkStruct_ov12_02233AA0 *param0) { switch (param0->unk_2C) { case 0: - param0->unk_18 = (((180 * 0xffff) / 360)); + param0->unk_18 = ((180 * 0xffff) / 360); param0->unk_24 = 5; param0->unk_1C = (16 * FX32_ONE); param0->unk_28 = 16; break; case 1: - param0->unk_18 = (((180 * 0xffff) / 360)); + param0->unk_18 = ((180 * 0xffff) / 360); param0->unk_24 = -5; param0->unk_1C = (-16 * FX32_ONE); param0->unk_28 = 16; break; case 2: - param0->unk_18 = (((180 * 0xffff) / 360)); + param0->unk_18 = ((180 * 0xffff) / 360); param0->unk_24 = 10; param0->unk_1C = (20 * FX32_ONE); param0->unk_28 = 16; @@ -3637,9 +3637,9 @@ static void ov12_02233AA0 (UnkStruct_ov12_02233AA0 * param0) } } -static void ov12_02233AF4 (UnkStruct_ov12_02233AA0 * param0) +static void ov12_02233AF4(UnkStruct_ov12_02233AA0 *param0) { - u32 * v0 = ov12_022265E4(param0->unk_04); + u32 *v0 = ov12_022265E4(param0->unk_04); int v1; s16 v2; s16 v3; @@ -3682,9 +3682,9 @@ static void ov12_02233AF4 (UnkStruct_ov12_02233AA0 * param0) } } -static void ov12_02233BD8 (SysTask * param0, void * param1) +static void ov12_02233BD8(SysTask *param0, void *param1) { - UnkStruct_ov12_02233AA0 * v0 = param1; + UnkStruct_ov12_02233AA0 *v0 = param1; switch (v0->unk_08) { case 0: @@ -3726,10 +3726,10 @@ static void ov12_02233BD8 (SysTask * param0, void * param1) } } -void ov12_02233CD4 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02233CD4(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02233AA0 * v0; - Sprite * v1; + UnkStruct_ov12_02233AA0 *v0; + Sprite *v1; s16 v2, v3; int v4; @@ -3764,9 +3764,9 @@ void ov12_02233CD4 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_02233BD8, v0); } -static void ov12_02233DCC (SysTask * param0, void * param1) +static void ov12_02233DCC(SysTask *param0, void *param1) { - UnkStruct_ov12_02233DCC * v0 = param1; + UnkStruct_ov12_02233DCC *v0 = param1; switch (v0->unk_04) { case 0: @@ -3811,9 +3811,9 @@ static void ov12_02233DCC (SysTask * param0, void * param1) } } -void ov12_02233F30 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02233F30(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02233DCC * v0; + UnkStruct_ov12_02233DCC *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02233AA0)); v0->unk_00 = param0; @@ -3821,9 +3821,9 @@ void ov12_02233F30 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_02233DCC, v0); } -static void ov12_02233F4C (SysTask * param0, void * param1) +static void ov12_02233F4C(SysTask *param0, void *param1) { - UnkStruct_ov12_02233F4C * v0 = param1; + UnkStruct_ov12_02233F4C *v0 = param1; switch (v0->unk_0C) { case 0: @@ -3857,9 +3857,9 @@ static void ov12_02233F4C (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02234008 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02234008(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02233F4C * v0; + UnkStruct_ov12_02233F4C *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02233F4C)); @@ -3874,9 +3874,9 @@ void ov12_02234008 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_02233F4C, v0); } -static void ov12_02234044 (SysTask * param0, void * param1) +static void ov12_02234044(SysTask *param0, void *param1) { - UnkStruct_ov12_02234044 * v0 = param1; + UnkStruct_ov12_02234044 *v0 = param1; BOOL v1; switch (v0->unk_04) { @@ -3931,9 +3931,9 @@ static void ov12_02234044 (SysTask * param0, void * param1) } } -void ov12_02234214 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02234214(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02234044 * v0; + UnkStruct_ov12_02234044 *v0; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02234044)); @@ -3954,9 +3954,9 @@ void ov12_02234214 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_02234044, v0); } -static void ov12_02234290 (SysTask * param0, void * param1) +static void ov12_02234290(SysTask *param0, void *param1) { - UnkStruct_ov12_02234290 * v0 = param1; + UnkStruct_ov12_02234290 *v0 = param1; if (ov12_02225C50(&v0->unk_08, v0->unk_2C) == 0) { sub_0200D0F4(v0->unk_2C); @@ -3968,9 +3968,9 @@ static void ov12_02234290 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_04); } -void ov12_022342C4 (UnkStruct_ov12_0221FCDC * param0) +void ov12_022342C4(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02234290 * v0; + UnkStruct_ov12_02234290 *v0; int v1; int v2, v3; int v4, v5; @@ -4004,9 +4004,9 @@ void ov12_022342C4 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_02234290, v0); } -static void ov12_022343A0 (SysTask * param0, void * param1) +static void ov12_022343A0(SysTask *param0, void *param1) { - UnkStruct_ov12_022343A0 * v0 = param1; + UnkStruct_ov12_022343A0 *v0 = param1; switch (v0->unk_04) { case 0: @@ -4047,9 +4047,9 @@ static void ov12_022343A0 (SysTask * param0, void * param1) } } -void ov12_022344D0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_022344D0(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_022343A0 * v0; + UnkStruct_ov12_022343A0 *v0; int v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022343A0)); @@ -4066,9 +4066,9 @@ void ov12_022344D0 (UnkStruct_ov12_0221FCDC * param0) ov12_022201E8(v0->unk_00, ov12_022343A0, v0); } -static void ov12_02234528 (SysTask * param0, void * param1) +static void ov12_02234528(SysTask *param0, void *param1) { - UnkStruct_ov12_02234528 * v0 = param1; + UnkStruct_ov12_02234528 *v0 = param1; s16 v1, v2; switch (v0->unk_04) { @@ -4105,9 +4105,9 @@ static void ov12_02234528 (SysTask * param0, void * param1) } } -void ov12_0223464C (UnkStruct_ov12_0221FCDC * param0) +void ov12_0223464C(UnkStruct_ov12_0221FCDC *param0) { - UnkStruct_ov12_02234528 * v0; + UnkStruct_ov12_02234528 *v0; int v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02234528)); diff --git a/src/overlay012/ov12_022346A4.c b/src/overlay012/ov12_022346A4.c index c8935503d5..963e4a3645 100644 --- a/src/overlay012/ov12_022346A4.c +++ b/src/overlay012/ov12_022346A4.c @@ -1,81 +1,82 @@ +#include "overlay012/ov12_022346A4.h" + #include #include #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" + +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02225864.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02225F6C.h" #include "overlay012/struct_ov12_02226454.h" -#include "struct_defs/sprite_template.h" +#include "heap.h" +#include "sys_task_manager.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "heap.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_022346A4.h" -#include "overlay012/ov12_02235254.h" typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; int unk_08; - SpriteGfxHandler * unk_0C; + SpriteGfxHandler *unk_0C; int unk_10; - CellActorData * unk_14[2]; + CellActorData *unk_14[2]; UnkStruct_ov12_02225F6C unk_1C[2]; UnkStruct_ov12_02225F6C unk_64[2]; } UnkStruct_ov12_022346A4; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; int unk_08; - SpriteGfxHandler * unk_0C; - CellActorData * unk_10; + SpriteGfxHandler *unk_0C; + CellActorData *unk_10; UnkStruct_ov12_02226454 unk_14; } UnkStruct_ov12_022348C8; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; + UnkStruct_ov12_0221FCDC *unk_00; int unk_04; - SpriteGfxHandler * unk_08; - CellActorData * unk_0C[6]; + SpriteGfxHandler *unk_08; + CellActorData *unk_0C[6]; int unk_24[6]; int unk_3C[6]; } UnkStruct_ov12_02234A10; typedef struct { - UnkStruct_ov12_0221FCDC * unk_00; - SpriteRenderer * unk_04; - SpriteGfxHandler * unk_08; + UnkStruct_ov12_0221FCDC *unk_00; + SpriteRenderer *unk_04; + SpriteGfxHandler *unk_08; int unk_0C; int unk_10; int unk_14; - CellActorData * unk_18[6]; + CellActorData *unk_18[6]; UnkStruct_ov12_02225F6C unk_30[6]; UnkStruct_ov12_02226454 unk_108; s16 unk_130; s16 unk_132; } UnkStruct_ov12_02234BD8; -static void ov12_02234750(SysTask * param0, void * param1); -static void ov12_0223483C(CellActorData * param0, UnkStruct_ov12_02225F6C * param1, UnkStruct_ov12_02225F6C * param2, int param3); -static BOOL ov12_0223489C(CellActorData * param0, UnkStruct_ov12_02225F6C * param1, UnkStruct_ov12_02225F6C * param2); -static void ov12_02234918(SysTask * param0, void * param1); -static void ov12_02234B64(SysTask * param0, void * param1); -static BOOL ov12_02234B34(CellActorData * param0, int * param1, int * param2); -static void ov12_02234AE0(CellActorData * param0, int * param1, int * param2, int param3, int param4); -static void ov12_02234CA8(SysTask * param0, void * param1); +static void ov12_02234750(SysTask *param0, void *param1); +static void ov12_0223483C(CellActorData *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2, int param3); +static BOOL ov12_0223489C(CellActorData *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2); +static void ov12_02234918(SysTask *param0, void *param1); +static void ov12_02234B64(SysTask *param0, void *param1); +static BOOL ov12_02234B34(CellActorData *param0, int *param1, int *param2); +static void ov12_02234AE0(CellActorData *param0, int *param1, int *param2, int param3, int param4); +static void ov12_02234CA8(SysTask *param0, void *param1); -void ov12_022346A4 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_022346A4(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { SpriteTemplate v0; - UnkStruct_ov12_022346A4 * v1; + UnkStruct_ov12_022346A4 *v1; int v2; int v3; @@ -107,9 +108,9 @@ void ov12_022346A4 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v1->unk_00, ov12_02234750, v1); } -static void ov12_02234750 (SysTask * param0, void * param1) +static void ov12_02234750(SysTask *param0, void *param1) { - UnkStruct_ov12_022346A4 * v0 = param1; + UnkStruct_ov12_022346A4 *v0 = param1; int v1; switch (v0->unk_04) { @@ -153,7 +154,7 @@ static void ov12_02234750 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_0C); } -static void ov12_0223483C (CellActorData * param0, UnkStruct_ov12_02225F6C * param1, UnkStruct_ov12_02225F6C * param2, int param3) +static void ov12_0223483C(CellActorData *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2, int param3) { s16 v0, v1; @@ -165,7 +166,7 @@ static void ov12_0223483C (CellActorData * param0, UnkStruct_ov12_02225F6C * par ov12_02225E68(param2, 2, 10, 10, 32); } -static BOOL ov12_0223489C (CellActorData * param0, UnkStruct_ov12_02225F6C * param1, UnkStruct_ov12_02225F6C * param2) +static BOOL ov12_0223489C(CellActorData *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2) { BOOL v0; @@ -180,9 +181,9 @@ static BOOL ov12_0223489C (CellActorData * param0, UnkStruct_ov12_02225F6C * par return 1; } -void ov12_022348C8 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_022348C8(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_022348C8 * v0; + UnkStruct_ov12_022348C8 *v0; int v1; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_022348C8)); @@ -201,9 +202,9 @@ void ov12_022348C8 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v0->unk_00, ov12_02234918, v0); } -static void ov12_02234918 (SysTask * param0, void * param1) +static void ov12_02234918(SysTask *param0, void *param1) { - UnkStruct_ov12_022348C8 * v0 = param1; + UnkStruct_ov12_022348C8 *v0 = param1; int v1; switch (v0->unk_04) { @@ -248,10 +249,10 @@ static void ov12_02234918 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_0C); } -void ov12_02234A10 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02234A10(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { SpriteTemplate v0; - UnkStruct_ov12_02234A10 * v1; + UnkStruct_ov12_02234A10 *v1; int v2; int v3; int v4; @@ -286,7 +287,7 @@ void ov12_02234A10 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, S ov12_022201E8(v1->unk_00, ov12_02234B64, v1); } -static void ov12_02234AE0 (CellActorData * param0, int * param1, int * param2, int param3, int param4) +static void ov12_02234AE0(CellActorData *param0, int *param1, int *param2, int param3, int param4) { s16 v0, v1; @@ -303,7 +304,7 @@ static void ov12_02234AE0 (CellActorData * param0, int * param1, int * param2, i SpriteActor_SetSpritePositionXY(param0, v0, v1); } -static BOOL ov12_02234B34 (CellActorData * param0, int * param1, int * param2) +static BOOL ov12_02234B34(CellActorData *param0, int *param1, int *param2) { if (*param2 > 0) { (*param2)--; @@ -323,9 +324,9 @@ static BOOL ov12_02234B34 (CellActorData * param0, int * param1, int * param2) return 0; } -static void ov12_02234B64 (SysTask * param0, void * param1) +static void ov12_02234B64(SysTask *param0, void *param1) { - UnkStruct_ov12_02234A10 * v0 = param1; + UnkStruct_ov12_02234A10 *v0 = param1; int v1; BOOL v2; @@ -352,7 +353,7 @@ static void ov12_02234B64 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -static void ov12_02234BD8 (UnkStruct_ov12_02234BD8 * param0, int param1) +static void ov12_02234BD8(UnkStruct_ov12_02234BD8 *param0, int param1) { int v0; int v1; @@ -360,13 +361,13 @@ static void ov12_02234BD8 (UnkStruct_ov12_02234BD8 * param0, int param1) v1 = ((360 * 0xffff) / 360) / 6; for (v0 = 0; v0 < 6; v0++) { - ov12_02225A5C(¶m0->unk_30[v0], (((0 * 0xffff) / 360)), (((180 * 0xffff) / 360)), 0, 0, (FX32_ONE * 50), 0, 48); + ov12_02225A5C(¶m0->unk_30[v0], ((0 * 0xffff) / 360), ((180 * 0xffff) / 360), 0, 0, (FX32_ONE * 50), 0, 48); param0->unk_30[v0].unk_04[1] += (v1 * v0); param0->unk_30[v0].unk_04[5] *= param1; } } -static void ov12_02234C30 (UnkStruct_ov12_02234BD8 * param0) +static void ov12_02234C30(UnkStruct_ov12_02234BD8 *param0) { int v0; u16 v1; @@ -384,9 +385,9 @@ static void ov12_02234C30 (UnkStruct_ov12_02234BD8 * param0) } } -static void ov12_02234CA8 (SysTask * param0, void * param1) +static void ov12_02234CA8(SysTask *param0, void *param1) { - UnkStruct_ov12_02234BD8 * v0 = param1; + UnkStruct_ov12_02234BD8 *v0 = param1; int v1; switch (v0->unk_0C) { @@ -435,11 +436,11 @@ static void ov12_02234CA8 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_08); } -void ov12_02234D98 (UnkStruct_ov12_0221FCDC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, CellActorData * param3) +void ov12_02234D98(UnkStruct_ov12_0221FCDC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, CellActorData *param3) { - UnkStruct_ov12_02234BD8 * v0; + UnkStruct_ov12_02234BD8 *v0; int v1; - Sprite * v2; + Sprite *v2; SpriteTemplate v3; v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02234BD8)); diff --git a/src/overlay012/ov12_02234E44.c b/src/overlay012/ov12_02234E44.c index 8562bb1bd8..2853862110 100644 --- a/src/overlay012/ov12_02234E44.c +++ b/src/overlay012/ov12_02234E44.c @@ -1,19 +1,20 @@ +#include "overlay012/ov12_02234E44.h" + #include #include -#include "sys_task_manager.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" - #include "struct_defs/struct_0200D0F4.h" + +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_0223595C.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_02018340.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02234E44.h" -#include "overlay012/ov12_02235254.h" typedef struct { int unk_00; @@ -30,32 +31,32 @@ typedef struct { typedef struct { UnkStruct_ov12_02234E44 unk_00; UnkStruct_ov12_0223595C unk_18; - CellActorData * unk_34; - CellActorData * unk_38; - CellActorData * unk_3C; + CellActorData *unk_34; + CellActorData *unk_38; + CellActorData *unk_3C; u8 unk_40; } UnkStruct_ov12_02234E54; static const int Unk_ov12_0223A1D8[][4] = { - {0x3C, 0x122, 0x3D, 0x3D}, - {0x36, 0x11F, 0x37, 0x37}, - {0x38, 0x120, 0x39, 0x39}, - {0x3A, 0x121, 0x3B, 0x3B} + { 0x3C, 0x122, 0x3D, 0x3D }, + { 0x36, 0x11F, 0x37, 0x37 }, + { 0x38, 0x120, 0x39, 0x39 }, + { 0x3A, 0x121, 0x3B, 0x3B } }; -static void ov12_02234E44 (UnkStruct_ov12_02234E44 * param0, s16 param1, s16 param2) +static void ov12_02234E44(UnkStruct_ov12_02234E44 *param0, s16 param1, s16 param2) { param0->unk_0C = param1; param0->unk_0E = param2; } -static void ov12_02234E4C (UnkStruct_ov12_02234E44 * param0, u16 param1, u16 param2) +static void ov12_02234E4C(UnkStruct_ov12_02234E44 *param0, u16 param1, u16 param2) { param0->unk_14 = param1; param0->unk_16 = param2; } -static void ov12_02234E54 (UnkStruct_ov12_02234E54 * param0, int param1) +static void ov12_02234E54(UnkStruct_ov12_02234E54 *param0, int param1) { int v0; int v1; @@ -70,9 +71,9 @@ static void ov12_02234E54 (UnkStruct_ov12_02234E54 * param0, int param1) sub_02006E60(param0->unk_00.unk_00, Unk_ov12_0223A1D8[param0->unk_00.unk_04][2], param0->unk_18.unk_14, param1, 0, 0, 1, v0); } -static void ov12_02234EF0 (SysTask * param0, void * param1) +static void ov12_02234EF0(SysTask *param0, void *param1) { - UnkStruct_ov12_02234E54 * v0 = (UnkStruct_ov12_02234E54 *)param1; + UnkStruct_ov12_02234E54 *v0 = (UnkStruct_ov12_02234E54 *)param1; switch (v0->unk_18.unk_00) { case 0: @@ -133,16 +134,16 @@ static void ov12_02234EF0 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_18.unk_0C); } -static void ov12_0223505C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_02234E44 * param1) +static void ov12_0223505C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02234E44 *param1) { (*param1).unk_00 = 7; (*param1).unk_04 = ov12_02220280(param0, 0); (*param1).unk_08 = ov12_02220280(param0, 1); } -static void ov12_0223507C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_02234E44 * param1) +static void ov12_0223507C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02234E44 *param1) { - UnkStruct_ov12_02234E54 * v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02234E54)); + UnkStruct_ov12_02234E54 *v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02234E54)); ov12_0223595C(param0, &v0->unk_18); @@ -211,7 +212,7 @@ static void ov12_0223507C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_0223 ov12_022201E8(v0->unk_18.unk_04, ov12_02234EF0, v0); } -void ov12_022351A4 (UnkStruct_ov12_0221FCDC * param0) +void ov12_022351A4(UnkStruct_ov12_0221FCDC *param0) { UnkStruct_ov12_02234E44 v0; @@ -221,7 +222,7 @@ void ov12_022351A4 (UnkStruct_ov12_0221FCDC * param0) ov12_0223507C(param0, &v0); } -void ov12_022351D0 (UnkStruct_ov12_0221FCDC * param0) +void ov12_022351D0(UnkStruct_ov12_0221FCDC *param0) { UnkStruct_ov12_02234E44 v0; @@ -231,7 +232,7 @@ void ov12_022351D0 (UnkStruct_ov12_0221FCDC * param0) ov12_0223507C(param0, &v0); } -void ov12_022351FC (UnkStruct_ov12_0221FCDC * param0) +void ov12_022351FC(UnkStruct_ov12_0221FCDC *param0) { UnkStruct_ov12_02234E44 v0; @@ -241,7 +242,7 @@ void ov12_022351FC (UnkStruct_ov12_0221FCDC * param0) ov12_0223507C(param0, &v0); } -void ov12_02235228 (UnkStruct_ov12_0221FCDC * param0) +void ov12_02235228(UnkStruct_ov12_0221FCDC *param0) { UnkStruct_ov12_02234E44 v0; s16 v1 = 3 + 3; diff --git a/src/overlay012/ov12_02235254.c b/src/overlay012/ov12_02235254.c index b9bc78d6c8..2c12c8f2d1 100644 --- a/src/overlay012/ov12_02235254.c +++ b/src/overlay012/ov12_02235254.c @@ -1,26 +1,26 @@ +#include "overlay012/ov12_02235254.h" + #include #include -#include "inlines.h" - #include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "overlay012/struct_ov12_0221FCDC_decl.h" - #include "struct_defs/struct_0200D0F4.h" + +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/struct_ov12_0221FCDC_decl.h" #include "overlay012/struct_ov12_02235350.h" #include "overlay012/struct_ov12_0223595C.h" #include "overlay012/struct_ov12_02235998.h" +#include "heap.h" +#include "inlines.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" #include "unk_02014000.h" -#include "heap.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_02235254.h" void ov17_022413D8(void); -void include_unk_ov12_0223A218(VecFx32 * dummy); +void include_unk_ov12_0223A218(VecFx32 *dummy); static const VecFx32 Unk_ov12_0223A218 = { 0x1700, @@ -34,17 +34,17 @@ static const VecFx32 Unk_ov12_0223A224 = { 0x0 }; -void include_unk_ov12_0223A218 (VecFx32 * dummy) +void include_unk_ov12_0223A218(VecFx32 *dummy) { *dummy = Unk_ov12_0223A218; } -int ov12_02235254 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_02235254(UnkStruct_ov12_0221FCDC *param0, int param1) { return ov12_022232B8(param0, param1); } -int ov12_0223525C (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_0223525C(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; int v1; @@ -67,7 +67,7 @@ int ov12_0223525C (UnkStruct_ov12_0221FCDC * param0, int param1) return v1; } -int ov12_02235288 (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_02235288(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; int v1; @@ -83,7 +83,7 @@ int ov12_02235288 (UnkStruct_ov12_0221FCDC * param0, int param1) return 0; } -int ov12_022352AC (UnkStruct_ov12_0221FCDC * param0, int param1) +int ov12_022352AC(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; int v1; @@ -127,7 +127,7 @@ int ov12_022352AC (UnkStruct_ov12_0221FCDC * param0, int param1) return v1; } -int ov12_02235310 (int param0) +int ov12_02235310(int param0) { switch (param0) { case 0: @@ -148,23 +148,23 @@ int ov12_02235310 (int param0) return 0; } -void ov12_02235350 (int param0, int param1, UnkStruct_ov12_02235350 * param2) +void ov12_02235350(int param0, int param1, UnkStruct_ov12_02235350 *param2) { const UnkStruct_ov12_02235350 v0[] = { - {0x40, 0x70}, - {0xC0, 0x30}, - {0x28, 0x70}, - {0xD8, 0x32}, - {0x50, 0x78}, - {0xB0, 0x2A} + { 0x40, 0x70 }, + { 0xC0, 0x30 }, + { 0x28, 0x70 }, + { 0xD8, 0x32 }, + { 0x50, 0x78 }, + { 0xB0, 0x2A } }; const UnkStruct_ov12_02235350 v1[] = { - {0xD8, 0x70}, - {0x50, 0x2A}, - {0xD8, 0x70}, - {0x50, 0x2A}, - {0xD8, 0x70}, - {0x50, 0x2A} + { 0xD8, 0x70 }, + { 0x50, 0x2A }, + { 0xD8, 0x70 }, + { 0x50, 0x2A }, + { 0xD8, 0x70 }, + { 0x50, 0x2A } }; if (param1) { @@ -175,7 +175,7 @@ void ov12_02235350 (int param0, int param1, UnkStruct_ov12_02235350 * param2) *param2 = v0[param0]; } -void ov12_022353AC (UnkStruct_ov12_0221FCDC * param0, int param1, UnkStruct_ov12_02235350 * param2) +void ov12_022353AC(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235350 *param2) { int v0, v1; @@ -185,219 +185,219 @@ void ov12_022353AC (UnkStruct_ov12_0221FCDC * param0, int param1, UnkStruct_ov12 ov12_02235350(v0, v1, param2); } -static void ov12_022353CC (int param0, VecFx32 * param1, int param2, int param3, int param4) +static void ov12_022353CC(int param0, VecFx32 *param1, int param2, int param3, int param4) { int v0; - const VecFx32 * v1; + const VecFx32 *v1; const VecFx32 v2[][24] = { { - {-9616, -5464, 0x40}, - {-10240, -6400, 0x40}, - {-3968, -3328, 0x40}, - {-6568, -4000, 0x40}, - {-3968, -3328, 0x40}, - {-6720, -5792, 0x40}, - {-8632, -6936, 0x0}, - {-8632, -6936, 0x0}, - {-12544, -3840, 0x0}, - {-12544, -3840, 0x0}, - {-9632, -5856, 0x0}, - {-9632, -5856, 0x0}, - {-4144, -5200, 0x0}, - {-4144, -5200, 0x0}, - {-12480, -4288, 0x0}, - {-12480, -4288, 0x0}, - {-1792, -4224, 0x0}, - {-1792, -4224, 0x0}, - {-8320, -4160, 0x0}, - {-8320, -4160, 0x0}, - {0x2378, 0x15A0, 0x0}, - {0x2378, 0x15A0, 0x0}, - {-6248, -2944, 0x0}, - {-6248, -2944, 0x0} + { -9616, -5464, 0x40 }, + { -10240, -6400, 0x40 }, + { -3968, -3328, 0x40 }, + { -6568, -4000, 0x40 }, + { -3968, -3328, 0x40 }, + { -6720, -5792, 0x40 }, + { -8632, -6936, 0x0 }, + { -8632, -6936, 0x0 }, + { -12544, -3840, 0x0 }, + { -12544, -3840, 0x0 }, + { -9632, -5856, 0x0 }, + { -9632, -5856, 0x0 }, + { -4144, -5200, 0x0 }, + { -4144, -5200, 0x0 }, + { -12480, -4288, 0x0 }, + { -12480, -4288, 0x0 }, + { -1792, -4224, 0x0 }, + { -1792, -4224, 0x0 }, + { -8320, -4160, 0x0 }, + { -8320, -4160, 0x0 }, + { 0x2378, 0x15A0, 0x0 }, + { 0x2378, 0x15A0, 0x0 }, + { -6248, -2944, 0x0 }, + { -6248, -2944, 0x0 }, }, { - {0x2B30, 0x1130, -5248}, - {0x2800, 0xC00, -5248}, - {0x2480, 0x880, -5248}, - {0x2260, 0x1940, -5248}, - {0x2480, 0x880, -5248}, - {0x38C0, 0x1F60, -5248}, - {0x3268, 0x13F4, 0x0}, - {0x3268, 0x13F4, 0x0}, - {0x1538, 0x1A18, 0x0}, - {0x1538, 0x1A18, 0x0}, - {0x3358, 0x2C08, 0x0}, - {0x3358, 0x2C08, 0x0}, - {0x40D0, 0x1430, 0x0}, - {0x40D0, 0x1430, 0x0}, - {0x3380, 0x1DC0, 0x0}, - {0x3380, 0x1DC0, 0x0}, - {0x4200, 0xD00, 0x0}, - {0x4200, 0xD00, 0x0}, - {0x2A80, 0x1180, 0x0}, - {0x2A80, 0x1180, 0x0}, - {-6936, -4832, 0x0}, - {-6936, -4832, 0x0}, - {0x2058, 0x1538, 0x0}, - {0x2058, 0x1538, 0x0} + { 0x2B30, 0x1130, -5248 }, + { 0x2800, 0xC00, -5248 }, + { 0x2480, 0x880, -5248 }, + { 0x2260, 0x1940, -5248 }, + { 0x2480, 0x880, -5248 }, + { 0x38C0, 0x1F60, -5248 }, + { 0x3268, 0x13F4, 0x0 }, + { 0x3268, 0x13F4, 0x0 }, + { 0x1538, 0x1A18, 0x0 }, + { 0x1538, 0x1A18, 0x0 }, + { 0x3358, 0x2C08, 0x0 }, + { 0x3358, 0x2C08, 0x0 }, + { 0x40D0, 0x1430, 0x0 }, + { 0x40D0, 0x1430, 0x0 }, + { 0x3380, 0x1DC0, 0x0 }, + { 0x3380, 0x1DC0, 0x0 }, + { 0x4200, 0xD00, 0x0 }, + { 0x4200, 0xD00, 0x0 }, + { 0x2A80, 0x1180, 0x0 }, + { 0x2A80, 0x1180, 0x0 }, + { -6936, -4832, 0x0 }, + { -6936, -4832, 0x0 }, + { 0x2058, 0x1538, 0x0 }, + { 0x2058, 0x1538, 0x0 }, }, { - {-14936, -5032, 0x40}, - {-15360, -6272, 0x40}, - {-9856, -3200, 0x40}, - {-11400, -2944, 0x40}, - {-9856, -3200, 0x40}, - {-9856, -3200, 0x40}, - {-9456, -3104, 0x0}, - {-9456, -3104, 0x0}, - {-17856, -3624, 0x0}, - {-17856, -3624, 0x0}, - {-12592, -2976, 0x0}, - {-12592, -2976, 0x0}, - {-6366, -3776, 0x0}, - {-6366, -3776, 0x0}, - {-14912, -2176, 0x0}, - {-14912, -2176, 0x0}, - {-6080, -5504, 0x0}, - {-6080, -5504, 0x0}, - {-12032, -3200, 0x0}, - {-12032, -3200, 0x0}, - {0x2A48, 0x1D40, 0x0}, - {0x2A48, 0x1D40, 0x0}, - {-9856, -3200, 0x0}, - {-9856, -3200, 0x0} + { -14936, -5032, 0x40 }, + { -15360, -6272, 0x40 }, + { -9856, -3200, 0x40 }, + { -11400, -2944, 0x40 }, + { -9856, -3200, 0x40 }, + { -9856, -3200, 0x40 }, + { -9456, -3104, 0x0 }, + { -9456, -3104, 0x0 }, + { -17856, -3624, 0x0 }, + { -17856, -3624, 0x0 }, + { -12592, -2976, 0x0 }, + { -12592, -2976, 0x0 }, + { -6366, -3776, 0x0 }, + { -6366, -3776, 0x0 }, + { -14912, -2176, 0x0 }, + { -14912, -2176, 0x0 }, + { -6080, -5504, 0x0 }, + { -6080, -5504, 0x0 }, + { -12032, -3200, 0x0 }, + { -12032, -3200, 0x0 }, + { 0x2A48, 0x1D40, 0x0 }, + { 0x2A48, 0x1D40, 0x0 }, + { -9856, -3200, 0x0 }, + { -9856, -3200, 0x0 }, }, { - {0x1CC8, 0x1748, -5248}, - {0x3500, 0xB80, -5248}, - {0x3500, 0xB80, -5248}, - {0x3170, 0x1668, -5248}, - {0x3500, 0xB80, -5248}, - {0x3500, 0xB80, -5248}, - {0x4640, 0x18C0, 0x0}, - {0x4640, 0x18C0, 0x0}, - {0x1F58, 0x1778, 0x0}, - {0x1F58, 0x1778, 0x0}, - {0x3310, 0x1840, 0x0}, - {0x3310, 0x1840, 0x0}, - {0x4400, 0x1440, 0x0}, - {0x4400, 0x1440, 0x0}, - {0x3F00, 0x1CC0, 0x0}, - {0x3F00, 0x1CC0, 0x0}, - {0x50C0, 0xD98, 0x0}, - {0x50C0, 0xD98, 0x0}, - {0x3480, 0x1520, 0x0}, - {0x3480, 0x1520, 0x0}, - {-9536, -3120, 0xAA8}, - {-9536, -3120, 0xAA8}, - {0x3500, 0xB80, 0x0}, - {0x3500, 0xB80, 0x0} + { 0x1CC8, 0x1748, -5248 }, + { 0x3500, 0xB80, -5248 }, + { 0x3500, 0xB80, -5248 }, + { 0x3170, 0x1668, -5248 }, + { 0x3500, 0xB80, -5248 }, + { 0x3500, 0xB80, -5248 }, + { 0x4640, 0x18C0, 0x0 }, + { 0x4640, 0x18C0, 0x0 }, + { 0x1F58, 0x1778, 0x0 }, + { 0x1F58, 0x1778, 0x0 }, + { 0x3310, 0x1840, 0x0 }, + { 0x3310, 0x1840, 0x0 }, + { 0x4400, 0x1440, 0x0 }, + { 0x4400, 0x1440, 0x0 }, + { 0x3F00, 0x1CC0, 0x0 }, + { 0x3F00, 0x1CC0, 0x0 }, + { 0x50C0, 0xD98, 0x0 }, + { 0x50C0, 0xD98, 0x0 }, + { 0x3480, 0x1520, 0x0 }, + { 0x3480, 0x1520, 0x0 }, + { -9536, -3120, 0xAA8 }, + { -9536, -3120, 0xAA8 }, + { 0x3500, 0xB80, 0x0 }, + { 0x3500, 0xB80, 0x0 }, }, { - {-5364, -6568, -0x400}, - {-7552, -6912, -0x400}, - {-2308, -5632, -0x400}, - {-2984, -5272, -0x400}, - {-2308, -5632, -0x400}, - {-2308, -5632, -0x400}, - {-2480, -5568, 0x0}, - {-2480, -5568, 0x0}, - {-8200, -4776, 0x0}, - {-8200, -4776, 0x0}, - {-5600, -6480, 0x0}, - {-5600, -6480, 0x0}, - {-632, -5176, 0x0}, - {-632, -5176, 0x0}, - {-8448, -8384, 0x0}, - {-8448, -8384, 0x0}, - {0x200, -6528, 0x0}, - {0x200, -6528, 0x0}, - {-6848, -6144, 0x0}, - {-6848, -6144, 0x0}, - {0x1420, 0x1D40, 0x0}, - {0x1420, 0x1D40, 0x0}, - {-2308, -5632, 0x0}, - {-2308, -5632, 0x0} + { -5364, -6568, -0x400 }, + { -7552, -6912, -0x400 }, + { -2308, -5632, -0x400 }, + { -2984, -5272, -0x400 }, + { -2308, -5632, -0x400 }, + { -2308, -5632, -0x400 }, + { -2480, -5568, 0x0 }, + { -2480, -5568, 0x0 }, + { -8200, -4776, 0x0 }, + { -8200, -4776, 0x0 }, + { -5600, -6480, 0x0 }, + { -5600, -6480, 0x0 }, + { -632, -5176, 0x0 }, + { -632, -5176, 0x0 }, + { -8448, -8384, 0x0 }, + { -8448, -8384, 0x0 }, + { 0x200, -6528, 0x0 }, + { 0x200, -6528, 0x0 }, + { -6848, -6144, 0x0 }, + { -6848, -6144, 0x0 }, + { 0x1420, 0x1D40, 0x0 }, + { 0x1420, 0x1D40, 0x0 }, + { -2308, -5632, 0x0 }, + { -2308, -5632, 0x0 }, }, { - {0x3B50, 0x1148, -0x1cb0}, - {0x1B00, 0x1000, -0x1cb0}, - {0x1B00, 0x1000, -0x1cb0}, - {0x1AF8, 0x2048, -0x1cb0}, - {0x1B00, 0x1000, -0x1cb0}, - {0x1B00, 0x1000, -0x1cb0}, - {0x3210, 0x15E0, 0x0}, - {0x3210, 0x15E0, 0x0}, - {0x7D8, 0x1258, 0x0}, - {0x7D8, 0x1258, 0x0}, - {0x1F58, 0x18A8, 0x0}, - {0x1F58, 0x18A8, 0x0}, - {0x2E08, 0x1808, 0x0}, - {0x2E08, 0x1808, 0x0}, - {0x2700, 0x2500, 0x0}, - {0x2700, 0x2500, 0x0}, - {0x3640, 0xD98, 0x0}, - {0x3640, 0xD98, 0x0}, - {0x1840, 0x1540, 0x0}, - {0x1840, 0x1540, 0x0}, - {-5408, -6000, 0x0}, - {-5408, -6000, 0x0}, - {0x1B00, 0x1000, 0x0}, - {0x1B00, 0x1000, 0x0} + { 0x3B50, 0x1148, -0x1cb0 }, + { 0x1B00, 0x1000, -0x1cb0 }, + { 0x1B00, 0x1000, -0x1cb0 }, + { 0x1AF8, 0x2048, -0x1cb0 }, + { 0x1B00, 0x1000, -0x1cb0 }, + { 0x1B00, 0x1000, -0x1cb0 }, + { 0x3210, 0x15E0, 0x0 }, + { 0x3210, 0x15E0, 0x0 }, + { 0x7D8, 0x1258, 0x0 }, + { 0x7D8, 0x1258, 0x0 }, + { 0x1F58, 0x18A8, 0x0 }, + { 0x1F58, 0x18A8, 0x0 }, + { 0x2E08, 0x1808, 0x0 }, + { 0x2E08, 0x1808, 0x0 }, + { 0x2700, 0x2500, 0x0 }, + { 0x2700, 0x2500, 0x0 }, + { 0x3640, 0xD98, 0x0 }, + { 0x3640, 0xD98, 0x0 }, + { 0x1840, 0x1540, 0x0 }, + { 0x1840, 0x1540, 0x0 }, + { -5408, -6000, 0x0 }, + { -5408, -6000, 0x0 }, + { 0x1B00, 0x1000, 0x0 }, + { 0x1B00, 0x1000, 0x0 }, }, { - {0x1CC8, -5032, 0x40}, - {0x3500, -6272, 0x40}, - {0x3500, -3200, 0x40}, - {0x3170, -2944, 0x40}, - {0x3500, -3200, 0x40}, - {0x3500, -3200, 0x40}, - {0x3500, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {0x1D90, -3200, 0x0}, - {0x1D90, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {0x3500, -3200, 0x0}, - {-9536, 0x1D40, 0x0}, - {-9536, 0x1D40, 0x0}, - {0x3500, -3200, 0x0}, - {0x3500, -2944, 0x0} + { 0x1CC8, -5032, 0x40 }, + { 0x3500, -6272, 0x40 }, + { 0x3500, -3200, 0x40 }, + { 0x3170, -2944, 0x40 }, + { 0x3500, -3200, 0x40 }, + { 0x3500, -3200, 0x40 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x1D90, -3200, 0x0 }, + { 0x1D90, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -3200, 0x0 }, + { -9536, 0x1D40, 0x0 }, + { -9536, 0x1D40, 0x0 }, + { 0x3500, -3200, 0x0 }, + { 0x3500, -2944, 0x0 }, }, { - {-5364, 0x1148, -5248}, - {-7552, 0x1000, -5248}, - {-2308, 0x1000, -5248}, - {-2984, 0x2048, -5248}, - {-2308, 0x1000, -5248}, - {-2308, 0x1000, -5248}, - {-2480, 0x15E0, 0x0}, - {-2480, 0x15E0, 0x0}, - {-8200, 0x1258, 0x0}, - {-8200, 0x1258, 0x0}, - {-5600, 0x18A8, 0x0}, - {-5600, 0x18A8, 0x0}, - {-632, 0x1808, 0x0}, - {-632, 0x1808, 0x0}, - {-8448, 0x2500, 0x0}, - {-8448, 0x2500, 0x0}, - {0x200, 0xD98, 0x0}, - {0x200, 0xD98, 0x0}, - {-6848, 0x1540, 0x0}, - {-6848, 0x1540, 0x0}, - {0x1420, -6000, 0xAA8}, - {0x1420, -5408, 0xAA8}, - {-2308, 0x1000, 0x0}, - {-2984, 0x2048, 0x0} - } + { -5364, 0x1148, -5248 }, + { -7552, 0x1000, -5248 }, + { -2308, 0x1000, -5248 }, + { -2984, 0x2048, -5248 }, + { -2308, 0x1000, -5248 }, + { -2308, 0x1000, -5248 }, + { -2480, 0x15E0, 0x0 }, + { -2480, 0x15E0, 0x0 }, + { -8200, 0x1258, 0x0 }, + { -8200, 0x1258, 0x0 }, + { -5600, 0x18A8, 0x0 }, + { -5600, 0x18A8, 0x0 }, + { -632, 0x1808, 0x0 }, + { -632, 0x1808, 0x0 }, + { -8448, 0x2500, 0x0 }, + { -8448, 0x2500, 0x0 }, + { 0x200, 0xD98, 0x0 }, + { 0x200, 0xD98, 0x0 }, + { -6848, 0x1540, 0x0 }, + { -6848, 0x1540, 0x0 }, + { 0x1420, -6000, 0xAA8 }, + { 0x1420, -5408, 0xAA8 }, + { -2308, 0x1000, 0x0 }, + { -2984, 0x2048, 0x0 }, + }, }; if (param2 == 1) { @@ -420,71 +420,71 @@ static void ov12_022353CC (int param0, VecFx32 * param1, int param2, int param3, VEC_Set(param1, v1->x, v1->y, v1->z); } -void ov12_02235448 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_02235448(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 0); } -void ov12_02235458 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_02235458(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 1); } -void ov12_02235468 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_02235468(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 2); } -void ov12_02235478 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_02235478(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 3); } -void ov12_02235488 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_02235488(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 4); } -void ov12_02235498 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_02235498(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 5); } -void ov12_022354A8 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_022354A8(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 6); } -void ov12_022354B8 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_022354B8(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 7); } -void ov12_022354C8 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_022354C8(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 8); } -void ov12_022354D8 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_022354D8(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 9); } -void ov12_022354E8 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_022354E8(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 10); } -void ov12_022354F8 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_022354F8(int param0, VecFx32 *param1, int param2, int param3) { ov12_022353CC(param0, param1, param2, param3, 11); } -void ov12_02235508 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_02235508(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -494,11 +494,11 @@ void ov12_02235508 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_02235448(v0, param2, v1, v2); } -void ov12_02235538 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_02235538(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -508,11 +508,11 @@ void ov12_02235538 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_02235458(v0, param2, v1, v2); } -void ov12_02235568 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_02235568(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -522,11 +522,11 @@ void ov12_02235568 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_02235468(v0, param2, v1, v2); } -void ov12_02235598 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_02235598(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -536,11 +536,11 @@ void ov12_02235598 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_02235478(v0, param2, v1, v2); } -void ov12_022355C8 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_022355C8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -550,11 +550,11 @@ void ov12_022355C8 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_02235488(v0, param2, v1, v2); } -void ov12_022355F8 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_022355F8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -564,11 +564,11 @@ void ov12_022355F8 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_02235498(v0, param2, v1, v2); } -void ov12_02235628 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_02235628(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -578,11 +578,11 @@ void ov12_02235628 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_022354A8(v0, param2, v1, v2); } -void ov12_02235658 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_02235658(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -592,11 +592,11 @@ void ov12_02235658 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_022354B8(v0, param2, v1, v2); } -void ov12_02235688 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_02235688(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -606,11 +606,11 @@ void ov12_02235688 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_022354C8(v0, param2, v1, v2); } -void ov12_022356B8 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_022356B8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -620,11 +620,11 @@ void ov12_022356B8 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_022354D8(v0, param2, v1, v2); } -void ov12_022356E8 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_022356E8(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -634,11 +634,11 @@ void ov12_022356E8 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_022354E8(v0, param2, v1, v2); } -void ov12_02235718 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * param2) +void ov12_02235718(UnkStruct_ov12_0221FCDC *param0, int param1, VecFx32 *param2) { int v0, v1; int v2; - UnkStruct_02014014 * v3; + UnkStruct_02014014 *v3; v3 = ov12_02220250(param0); v2 = sub_02014790(v3); @@ -648,19 +648,19 @@ void ov12_02235718 (UnkStruct_ov12_0221FCDC * param0, int param1, VecFx32 * para ov12_022354F8(v0, param2, v1, v2); } -void ov12_02235748 (VecFx32 * param0) +void ov12_02235748(VecFx32 *param0) { param0->x = 0; param0->y = (+16512) + (60 * 172); param0->z = 0; } -void ov12_02235758 (int param0, VecFx32 * param1, int param2, int param3) +void ov12_02235758(int param0, VecFx32 *param1, int param2, int param3) { ov12_02235448(param0, param1, param2, param3); } -void ov12_02235760 (int param0, VecFx32 * param1) +void ov12_02235760(int param0, VecFx32 *param1) { if (param0 == 0) { sub_02014770(param1); @@ -669,7 +669,7 @@ void ov12_02235760 (int param0, VecFx32 * param1) } } -void ov12_02235780 (UnkStruct_ov12_0221FCDC * param0, int param1, int param2) +void ov12_02235780(UnkStruct_ov12_0221FCDC *param0, int param1, int param2) { int v0 = param1; int v1 = param2; @@ -685,7 +685,7 @@ void ov12_02235780 (UnkStruct_ov12_0221FCDC * param0, int param1, int param2) G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, (1 << ov12_022233EC(param0, 2)) | GX_BLEND_PLANEMASK_BG0, v0, v1); } -void ov12_022357BC (UnkStruct_ov12_0221FCDC * param0, int param1, int param2, int param3) +void ov12_022357BC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2, int param3) { int v0 = param2; int v1 = param3; @@ -701,7 +701,7 @@ void ov12_022357BC (UnkStruct_ov12_0221FCDC * param0, int param1, int param2, in G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, param1, v0, v1); } -void ov12_022357EC (UnkStruct_ov12_0221FCDC * param0, int param1, int param2) +void ov12_022357EC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2) { int v0 = param1; int v1 = param2; @@ -717,7 +717,7 @@ void ov12_022357EC (UnkStruct_ov12_0221FCDC * param0, int param1, int param2) G2_SetBlendAlpha((1 << ov12_022233EC(param0, 1)), (1 << ov12_022233EC(param0, 2)) | GX_WND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_OBJ, v0, v1); } -void ov12_02235838 (UnkStruct_ov12_0221FCDC * param0, int param1, BOOL param2) +void ov12_02235838(UnkStruct_ov12_0221FCDC *param0, int param1, BOOL param2) { if (param1 == 0) { G2_SetWnd0InsidePlane((1 << ov12_022233EC(param0, 2)) | (1 << ov12_022233EC(param0, 0)) | (1 << ov12_022233EC(param0, 1)) | GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_OBJ, param2); @@ -728,7 +728,7 @@ void ov12_02235838 (UnkStruct_ov12_0221FCDC * param0, int param1, BOOL param2) G2_SetWndOutsidePlane((1 << ov12_022233EC(param0, 0)) | (1 << ov12_022233EC(param0, 1)) | GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_OBJ, 1); } -void ov12_02235918 (Sprite * param0, UnkStruct_ov12_02235350 * param1) +void ov12_02235918(Sprite *param0, UnkStruct_ov12_02235350 *param1) { if (param0 == NULL) { param1->unk_00 = 0; @@ -744,12 +744,12 @@ void ov12_02235918 (Sprite * param0, UnkStruct_ov12_02235350 * param1) param1->unk_02 = sub_020080C0(param0, 1); } -void ov12_02235950 (CellActorData * param0, UnkStruct_ov12_02235350 * param1) +void ov12_02235950(CellActorData *param0, UnkStruct_ov12_02235350 *param1) { SpriteActor_GetSpritePositionXY(param0, &(param1->unk_00), &(param1->unk_02)); } -void ov12_0223595C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_0223595C * param1) +void ov12_0223595C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_0223595C *param1) { param1->unk_00 = 0; param1->unk_01 = 0; @@ -763,7 +763,7 @@ void ov12_0223595C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_0223595C * param1->unk_18 = ov12_0222332C(param0); } -void ov12_02235998 (UnkStruct_ov12_0221FCDC * param0, int param1, UnkStruct_ov12_02235998 * param2, int * param3) +void ov12_02235998(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3) { *param3 = 0; @@ -904,7 +904,7 @@ void ov12_02235998 (UnkStruct_ov12_0221FCDC * param0, int param1, UnkStruct_ov12 } } -void ov12_02235D74 (UnkStruct_ov12_0221FCDC * param0, int param1, UnkStruct_ov12_02235998 * param2, int * param3) +void ov12_02235D74(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3) { *param3 = 0; @@ -933,10 +933,10 @@ void ov12_02235D74 (UnkStruct_ov12_0221FCDC * param0, int param1, UnkStruct_ov12 } } -void * ov12_02235E50 (UnkStruct_ov12_0221FCDC * param0, int param1) +void *ov12_02235E50(UnkStruct_ov12_0221FCDC *param0, int param1) { int v0; - void * v1; + void *v1; v1 = NULL; @@ -951,7 +951,7 @@ void * ov12_02235E50 (UnkStruct_ov12_0221FCDC * param0, int param1) return v1; } -void ov12_02235E80 (void * param0) +void ov12_02235E80(void *param0) { GF_ASSERT(param0 != NULL); Heap_FreeToHeap(param0); diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c index b310d25f16..38a8b086a5 100644 --- a/src/overlay012/ov12_02235E94.c +++ b/src/overlay012/ov12_02235E94.c @@ -1,53 +1,53 @@ +#include "overlay012/ov12_02235E94.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" -#include "sys_task_manager.h" -#include "overlay012/struct_ov12_022267D4_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "functypes/funcptr_020146F4.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0202CA64.h" + +#include "functypes/funcptr_020146F4.h" +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_022237EC.h" +#include "overlay012/ov12_02225864.h" +#include "overlay012/ov12_02235254.h" +#include "overlay012/ov12_02237E54.h" #include "overlay012/struct_ov12_02223764.h" #include "overlay012/struct_ov12_02225D50.h" #include "overlay012/struct_ov12_02225F6C.h" +#include "overlay012/struct_ov12_022267D4_decl.h" #include "overlay012/struct_ov12_02236030.h" #include "overlay012/struct_ov12_02236690.h" #include "overlay012/struct_ov12_02237728.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_02241308.h" +#include "heap.h" +#include "narc.h" +#include "pokemon.h" #include "spl.h" - +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_020093B4.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_02014000.h" -#include "heap.h" #include "unk_0201D15C.h" #include "unk_0202C9F4.h" -#include "pokemon.h" #include "unk_02097B18.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_022237EC.h" -#include "overlay012/ov12_02225864.h" -#include "overlay012/ov12_02235254.h" -#include "overlay012/ov12_02235E94.h" -#include "overlay012/ov12_02237E54.h" typedef struct { int unk_00; int unk_04; int unk_08; - BOOL * unk_0C; - UnkStruct_02014014 * unk_10; - UnkStruct_0202CA64 * unk_14; + BOOL *unk_0C; + UnkStruct_02014014 *unk_10; + UnkStruct_0202CA64 *unk_14; UnkFuncPtr_020146F4 unk_18; } UnkStruct_02236430; @@ -55,13 +55,13 @@ typedef struct UnkStruct_ov12_02235FE0_t { int unk_00; UnkStruct_ov12_02236030 unk_04; int unk_10; - UnkStruct_02014014 * unk_14[9]; - UnkStruct_0202CA64 * unk_38[9]; + UnkStruct_02014014 *unk_14[9]; + UnkStruct_0202CA64 *unk_38[9]; BOOL unk_5C[9]; - UnkSPLStruct6 * unk_80; - SysTask * unk_84; + UnkSPLStruct6 *unk_80; + SysTask *unk_84; BOOL unk_88; - NARC * unk_8C; + NARC *unk_8C; int unk_90; int unk_94; int unk_98; @@ -71,8 +71,8 @@ typedef struct UnkStruct_ov12_02235FE0_t { typedef struct UnkStruct_ov12_02236648_t { UnkStruct_ov12_02236690 unk_00; - UnkSPLStruct6 * unk_14; - UnkStruct_02014014 * unk_18; + UnkSPLStruct6 *unk_14; + UnkStruct_02014014 *unk_18; int unk_1C; int unk_20; } UnkStruct_ov12_02236648; @@ -101,108 +101,108 @@ typedef struct BallRotation { s8 unk_22; BOOL unk_24; BOOL unk_28; - SpriteGfxHandler * unk_2C; - CellActorData * unk_30; + SpriteGfxHandler *unk_2C; + CellActorData *unk_30; UnkStruct_ov12_02225D50 unk_34; UnkStruct_ov12_02225F6C unk_48[2]; BallThrow unk_90; UnkStruct_ov12_02237C54_sub1 unk_B8; - SysTask * unk_CC; - UnkStruct_ov12_02236648 * unk_D0; - UnkStruct_ov12_022267D4 * unk_D4; - UnkStruct_ov12_02223764 * unk_D8; + SysTask *unk_CC; + UnkStruct_ov12_02236648 *unk_D0; + UnkStruct_ov12_022267D4 *unk_D4; + UnkStruct_ov12_02223764 *unk_D8; int unk_DC; } BallRotation; -static void ov12_022363CC(SysTask * param0, void * param1); -static void ov12_0223646C(UnkStruct_ov12_02235FE0 * param0, UnkFuncPtr_020146F4 param1); -static void ov12_02236598(UnkSPLStruct6 * param0); -static void ov12_022365D4(UnkSPLStruct6 * param0); -static void ov12_02237C54(BallRotation * param0); -static void ov12_02237D8C(BallRotation * param0); -static void ov12_022378A0(BallRotation * param0); -static void ov12_02237B14(BallRotation * param0, s16 * param1, s16 * param2); -static BOOL ov12_02236F24(BallRotation * param0); -static BOOL ov12_022371E4(BallRotation * param0); -static BOOL ov12_02237608(BallRotation * param0); -static BOOL ov12_02236F10(BallRotation * param0); -static BOOL ov12_02237694(BallRotation * param0); -static BOOL ov12_02237474(BallRotation * param0); +static void ov12_022363CC(SysTask *param0, void *param1); +static void ov12_0223646C(UnkStruct_ov12_02235FE0 *param0, UnkFuncPtr_020146F4 param1); +static void ov12_02236598(UnkSPLStruct6 *param0); +static void ov12_022365D4(UnkSPLStruct6 *param0); +static void ov12_02237C54(BallRotation *param0); +static void ov12_02237D8C(BallRotation *param0); +static void ov12_022378A0(BallRotation *param0); +static void ov12_02237B14(BallRotation *param0, s16 *param1, s16 *param2); +static BOOL ov12_02236F24(BallRotation *param0); +static BOOL ov12_022371E4(BallRotation *param0); +static BOOL ov12_02237608(BallRotation *param0); +static BOOL ov12_02236F10(BallRotation *param0); +static BOOL ov12_02237694(BallRotation *param0); +static BOOL ov12_02237474(BallRotation *param0); static const int Unk_ov12_0223AF00[][4] = { - {0x120, 0x5C, 0x11F, 0x11E}, - {0x123, 0x5D, 0x122, 0x121}, - {0x126, 0x5E, 0x125, 0x124}, - {0x11D, 0x5B, 0x11C, 0x11B}, - {0x129, 0x5F, 0x128, 0x127}, - {0x12C, 0x60, 0x12B, 0x12A}, - {0x12F, 0x61, 0x12E, 0x12D}, - {0x132, 0x62, 0x131, 0x130}, - {0x135, 0x63, 0x134, 0x133}, - {0x138, 0x64, 0x137, 0x136}, - {0x13B, 0x65, 0x13A, 0x139}, - {0x13E, 0x66, 0x13D, 0x13C}, - {0x144, 0x68, 0x143, 0x142}, - {0x147, 0x69, 0x146, 0x145}, - {0x141, 0x67, 0x140, 0x13F}, - {0x14A, 0x6A, 0x149, 0x148}, - {0x14D, 0x6B, 0x14C, 0x14B}, - {0x153, 0x6D, 0x152, 0x151}, - {0x150, 0x6C, 0x14F, 0x14E}, - {0x150, 0x6C, 0x14F, 0x14E} + { 0x120, 0x5C, 0x11F, 0x11E }, + { 0x123, 0x5D, 0x122, 0x121 }, + { 0x126, 0x5E, 0x125, 0x124 }, + { 0x11D, 0x5B, 0x11C, 0x11B }, + { 0x129, 0x5F, 0x128, 0x127 }, + { 0x12C, 0x60, 0x12B, 0x12A }, + { 0x12F, 0x61, 0x12E, 0x12D }, + { 0x132, 0x62, 0x131, 0x130 }, + { 0x135, 0x63, 0x134, 0x133 }, + { 0x138, 0x64, 0x137, 0x136 }, + { 0x13B, 0x65, 0x13A, 0x139 }, + { 0x13E, 0x66, 0x13D, 0x13C }, + { 0x144, 0x68, 0x143, 0x142 }, + { 0x147, 0x69, 0x146, 0x145 }, + { 0x141, 0x67, 0x140, 0x13F }, + { 0x14A, 0x6A, 0x149, 0x148 }, + { 0x14D, 0x6B, 0x14C, 0x14B }, + { 0x153, 0x6D, 0x152, 0x151 }, + { 0x150, 0x6C, 0x14F, 0x14E }, + { 0x150, 0x6C, 0x14F, 0x14E } }; static const int Unk_ov12_0223AD70[][2] = { - {0x1, 0x5}, - {0x2, 0x4}, - {0x3, 0x3}, - {0x4, 0x3}, - {0x5, 0x3}, - {0x6, 0x4}, - {0x7, 0x3}, - {0x8, 0x4}, - {0x9, 0x3}, - {0xA, 0x5}, - {0xB, 0x4}, - {0xC, 0x3}, - {0xD, 0x3}, - {0xE, 0x3}, - {0xF, 0x4}, - {0x10, 0x4}, - {0x11, 0x3}, - {0x1, 0x5}, - {0x1, 0x5}, - {0x24, 0x2} + { 0x1, 0x5 }, + { 0x2, 0x4 }, + { 0x3, 0x3 }, + { 0x4, 0x3 }, + { 0x5, 0x3 }, + { 0x6, 0x4 }, + { 0x7, 0x3 }, + { 0x8, 0x4 }, + { 0x9, 0x3 }, + { 0xA, 0x5 }, + { 0xB, 0x4 }, + { 0xC, 0x3 }, + { 0xD, 0x3 }, + { 0xE, 0x3 }, + { 0xF, 0x4 }, + { 0x10, 0x4 }, + { 0x11, 0x3 }, + { 0x1, 0x5 }, + { 0x1, 0x5 }, + { 0x24, 0x2 } }; static const int Unk_ov12_0223AE10[][3] = { - {0x13, 0x0, 0x5}, - {0x14, 0x2, 0x5}, - {0x15, 0x1, 0x5}, - {0x16, 0x3, 0x5}, - {0x17, 0x1, 0x5}, - {0x18, 0x1, 0x6}, - {0x19, 0x1, 0x5}, - {0x1A, 0x1, 0x5}, - {0x1B, 0x2, 0x5}, - {0x1C, 0x3, 0x7}, - {0x1D, 0x1, 0x6}, - {0x1E, 0x0, 0x5}, - {0x1F, 0x1, 0x5}, - {0x20, 0x0, 0x5}, - {0x21, 0x1, 0x6}, - {0x22, 0x1, 0x6}, - {0x23, 0x3, 0x5}, - {0x13, 0x0, 0x5}, - {0x13, 0x0, 0x5}, - {0x24, 0xFF, 0x2} + { 0x13, 0x0, 0x5 }, + { 0x14, 0x2, 0x5 }, + { 0x15, 0x1, 0x5 }, + { 0x16, 0x3, 0x5 }, + { 0x17, 0x1, 0x5 }, + { 0x18, 0x1, 0x6 }, + { 0x19, 0x1, 0x5 }, + { 0x1A, 0x1, 0x5 }, + { 0x1B, 0x2, 0x5 }, + { 0x1C, 0x3, 0x7 }, + { 0x1D, 0x1, 0x6 }, + { 0x1E, 0x0, 0x5 }, + { 0x1F, 0x1, 0x5 }, + { 0x20, 0x0, 0x5 }, + { 0x21, 0x1, 0x6 }, + { 0x22, 0x1, 0x6 }, + { 0x23, 0x3, 0x5 }, + { 0x13, 0x0, 0x5 }, + { 0x13, 0x0, 0x5 }, + { 0x24, 0xFF, 0x2 } }; -static int ov12_02235E94 (int param0) +static int ov12_02235E94(int param0) { int v0; - if ((param0 < 1) || (param0 > ((0xFF + 20)))) { + if ((param0 < 1) || (param0 > (0xFF + 20))) { v0 = 4; } else if (param0 >= 0xFF) { v0 = param0 - 0xFF; @@ -213,12 +213,22 @@ static int ov12_02235E94 (int param0) return v0 - 1; } -static BOOL ov12_02235EB0 (int param0) +static BOOL ov12_02235EB0(int param0) { int v0; BOOL v1; int v2[] = { - 6, 7, 8, 9, 10, 11, 12, 13, 15, 16, 17, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 15, + 16, + 17, }; v1 = 0; @@ -235,12 +245,17 @@ static BOOL ov12_02235EB0 (int param0) return v1; } -static BOOL ov12_02235EF0 (int param0) +static BOOL ov12_02235EF0(int param0) { int v0; BOOL v1; int v2[] = { - 6, 7, 8, 9, 10, 11, + 6, + 7, + 8, + 9, + 10, + 11, }; v1 = 0; @@ -257,12 +272,14 @@ static BOOL ov12_02235EF0 (int param0) return v1; } -static BOOL ov12_02235F2C (int param0) +static BOOL ov12_02235F2C(int param0) { int v0; BOOL v1; int v2[] = { - 3, 5, 1, + 3, + 5, + 1, }; v1 = 1; @@ -279,7 +296,7 @@ static BOOL ov12_02235F2C (int param0) return v1; } -static int ov12_02235F64 (int param0) +static int ov12_02235F64(int param0) { int v0; @@ -287,7 +304,7 @@ static int ov12_02235F64 (int param0) return Unk_ov12_0223AD70[v0][0]; } -static int ov12_02235F78 (int param0) +static int ov12_02235F78(int param0) { int v0; @@ -295,7 +312,7 @@ static int ov12_02235F78 (int param0) return Unk_ov12_0223AD70[v0][1]; } -static int ov12_02235F8C (int param0) +static int ov12_02235F8C(int param0) { int v0; @@ -303,7 +320,7 @@ static int ov12_02235F8C (int param0) return Unk_ov12_0223AE10[v0][0]; } -static int ov12_02235FA0 (int param0) +static int ov12_02235FA0(int param0) { int v0; @@ -311,7 +328,7 @@ static int ov12_02235FA0 (int param0) return Unk_ov12_0223AE10[v0][2]; } -static int ov12_02235FB4 (int param0) +static int ov12_02235FB4(int param0) { int v0; @@ -319,7 +336,7 @@ static int ov12_02235FB4 (int param0) return Unk_ov12_0223AE10[v0][1]; } -static int ov12_02235FC8 (int param0, int param1) +static int ov12_02235FC8(int param0, int param1) { int v0; @@ -327,9 +344,9 @@ static int ov12_02235FC8 (int param0, int param1) return Unk_ov12_0223AF00[v0][param1]; } -UnkStruct_ov12_02235FE0 * ov12_02235FE0 (int param0) +UnkStruct_ov12_02235FE0 *ov12_02235FE0(int param0) { - UnkStruct_ov12_02235FE0 * v0 = NULL; + UnkStruct_ov12_02235FE0 *v0 = NULL; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov12_02235FE0)); @@ -344,9 +361,9 @@ UnkStruct_ov12_02235FE0 * ov12_02235FE0 (int param0) return v0; } -UnkStruct_ov12_02235FE0 * ov12_02236004 (int param0, const UnkStruct_ov12_02236030 * param1) +UnkStruct_ov12_02235FE0 *ov12_02236004(int param0, const UnkStruct_ov12_02236030 *param1) { - UnkStruct_ov12_02235FE0 * v0 = NULL; + UnkStruct_ov12_02235FE0 *v0 = NULL; v0 = ov12_02235FE0(param0); ov12_02236030(v0, param1); @@ -366,7 +383,7 @@ UnkStruct_ov12_02235FE0 * ov12_02236004 (int param0, const UnkStruct_ov12_022360 return v0; } -void ov12_02236030 (UnkStruct_ov12_02235FE0 * param0, const UnkStruct_ov12_02236030 * param1) +void ov12_02236030(UnkStruct_ov12_02235FE0 *param0, const UnkStruct_ov12_02236030 *param1) { param0->unk_04 = *param1; param0->unk_9C = Pokemon_GetValue(param0->unk_04.unk_08, MON_DATA_MAIL_ID, NULL); @@ -387,14 +404,14 @@ void ov12_02236030 (UnkStruct_ov12_02235FE0 * param0, const UnkStruct_ov12_02236 } } -static void ov12_022360A0 (SysTask * param0, void * param1) +static void ov12_022360A0(SysTask *param0, void *param1) { - UnkStruct_ov12_02235FE0 * v0 = param1; + UnkStruct_ov12_02235FE0 *v0 = param1; int v1; int v2; int v3; int v4; - UnkStruct_0202CA64 * v5; + UnkStruct_0202CA64 *v5; switch (v0->unk_90) { case 0: @@ -543,13 +560,13 @@ static void ov12_022360A0 (SysTask * param0, void * param1) } } -void ov12_02236320 (UnkStruct_ov12_02235FE0 * param0) +void ov12_02236320(UnkStruct_ov12_02235FE0 *param0) { int v0; int v1; int v2; int v3; - UnkStruct_0202CA64 * v4; + UnkStruct_0202CA64 *v4; if (param0->unk_94 == 0) { v3 = ov12_02235F64(param0->unk_98); @@ -562,7 +579,7 @@ void ov12_02236320 (UnkStruct_ov12_02235FE0 * param0) param0->unk_90 = 0; { - SysTask * v5; + SysTask *v5; v5 = SysTask_Start(ov12_022360A0, param0, 1000); ov12_022360A0(v5, param0); @@ -570,7 +587,7 @@ void ov12_02236320 (UnkStruct_ov12_02235FE0 * param0) } } -BOOL ov12_02236374 (UnkStruct_ov12_02235FE0 * param0) +BOOL ov12_02236374(UnkStruct_ov12_02235FE0 *param0) { if (param0->unk_90 == 0xFF) { return 1; @@ -579,7 +596,7 @@ BOOL ov12_02236374 (UnkStruct_ov12_02235FE0 * param0) return 0; } -void ov12_02236384 (UnkStruct_ov12_02235FE0 * param0, UnkFuncPtr_020146F4 param1) +void ov12_02236384(UnkStruct_ov12_02235FE0 *param0, UnkFuncPtr_020146F4 param1) { param0->unk_88 = 1; @@ -589,21 +606,21 @@ void ov12_02236384 (UnkStruct_ov12_02235FE0 * param0, UnkFuncPtr_020146F4 param1 param0->unk_84 = SysTask_Start(ov12_022363CC, param0, 1000); } -void ov12_022363B4 (UnkStruct_ov12_02235FE0 * param0) +void ov12_022363B4(UnkStruct_ov12_02235FE0 *param0) { ov12_02236384(param0, ov12_02236598); } -BOOL ov12_022363C4 (UnkStruct_ov12_02235FE0 * param0) +BOOL ov12_022363C4(UnkStruct_ov12_02235FE0 *param0) { return param0->unk_88; } -static void ov12_022363CC (SysTask * param0, void * param1) +static void ov12_022363CC(SysTask *param0, void *param1) { int v0; BOOL v1; - UnkStruct_ov12_02235FE0 * v2 = (UnkStruct_ov12_02235FE0 *)param1; + UnkStruct_ov12_02235FE0 *v2 = (UnkStruct_ov12_02235FE0 *)param1; v1 = 0; @@ -630,14 +647,14 @@ static void ov12_022363CC (SysTask * param0, void * param1) } } -void ov12_02236428 (UnkStruct_ov12_02235FE0 * param0) +void ov12_02236428(UnkStruct_ov12_02235FE0 *param0) { Heap_FreeToHeap(param0); } -static void ov12_02236430 (SysTask * param0, void * param1) +static void ov12_02236430(SysTask *param0, void *param1) { - UnkStruct_02236430 * v0 = (UnkStruct_02236430 *)param1; + UnkStruct_02236430 *v0 = (UnkStruct_02236430 *)param1; if (v0->unk_04 == 0) { *(v0->unk_0C) = 1; @@ -650,7 +667,7 @@ static void ov12_02236430 (SysTask * param0, void * param1) } } -static void ov12_0223646C (UnkStruct_ov12_02235FE0 * param0, UnkFuncPtr_020146F4 param1) +static void ov12_0223646C(UnkStruct_ov12_02235FE0 *param0, UnkFuncPtr_020146F4 param1) { int v0, v1; int v2; @@ -667,7 +684,7 @@ static void ov12_0223646C (UnkStruct_ov12_02235FE0 * param0, UnkFuncPtr_020146F4 sub_02014788(param0->unk_14[0], 1); } else { for (v0 = 0; v0 < param0->unk_10; v0++) { - UnkStruct_02236430 * v4 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_02236430)); + UnkStruct_02236430 *v4 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_02236430)); GF_ASSERT(v4 != NULL); @@ -689,7 +706,7 @@ static void ov12_0223646C (UnkStruct_ov12_02235FE0 * param0, UnkFuncPtr_020146F4 } } -static void ov12_02236520 (int param0, VecFx32 * param1) +static void ov12_02236520(int param0, VecFx32 *param1) { ov12_02235758(param0, param1, 0, 1); @@ -738,10 +755,10 @@ static void ov12_02236520 (int param0, VecFx32 * param1) } } -static void ov12_02236598 (UnkSPLStruct6 * param0) +static void ov12_02236598(UnkSPLStruct6 *param0) { int v0; - UnkStruct_ov12_02235FE0 * v1; + UnkStruct_ov12_02235FE0 *v1; v1 = sub_02014764(); v0 = v1->unk_04.unk_00; @@ -754,12 +771,12 @@ static void ov12_02236598 (UnkSPLStruct6 * param0) } } -static void ov12_022365D4 (UnkSPLStruct6 * param0) +static void ov12_022365D4(UnkSPLStruct6 *param0) { VecFx32 v0; int v1; - UnkStruct_ov12_02235FE0 * v2; - UnkStruct_02236430 * v3; + UnkStruct_ov12_02235FE0 *v2; + UnkStruct_02236430 *v3; v3 = sub_02014764(); v1 = v3->unk_08; @@ -807,9 +824,9 @@ static void ov12_022365D4 (UnkSPLStruct6 * param0) SPL_UnkInline1(param0, &v0); } -static void ov12_02236648 (UnkSPLStruct6 * param0) +static void ov12_02236648(UnkSPLStruct6 *param0) { - UnkStruct_ov12_02236648 * v0 = sub_02014764(); + UnkStruct_ov12_02236648 *v0 = sub_02014764(); { VecFx32 v1; @@ -826,9 +843,9 @@ static void ov12_02236648 (UnkSPLStruct6 * param0) } } -UnkStruct_ov12_02236648 * ov12_02236690 (UnkStruct_ov12_02236690 * param0) +UnkStruct_ov12_02236648 *ov12_02236690(UnkStruct_ov12_02236690 *param0) { - UnkStruct_ov12_02236648 * v0; + UnkStruct_ov12_02236648 *v0; v0 = Heap_AllocFromHeap(param0->unk_08, sizeof(UnkStruct_ov12_02236648)); GF_ASSERT(v0 != NULL); @@ -836,8 +853,8 @@ UnkStruct_ov12_02236648 * ov12_02236690 (UnkStruct_ov12_02236690 * param0) v0->unk_00 = *param0; if (v0->unk_00.unk_10) { - v0->unk_20 = ov12_02235F8C((0xFF + 20)); - v0->unk_1C = ov12_02235FA0((0xFF + 20)); + v0->unk_20 = ov12_02235F8C(0xFF + 20); + v0->unk_1C = ov12_02235FA0(0xFF + 20); } else { v0->unk_20 = ov12_02235F8C(v0->unk_00.unk_04); v0->unk_1C = ov12_02235FA0(v0->unk_00.unk_04); @@ -848,11 +865,11 @@ UnkStruct_ov12_02236648 * ov12_02236690 (UnkStruct_ov12_02236690 * param0) return v0; } -void ov12_022366F0 (UnkStruct_ov12_02236648 * param0) +void ov12_022366F0(UnkStruct_ov12_02236648 *param0) { int v0; int v1; - UnkStruct_ov12_02236648 * v2 = param0; + UnkStruct_ov12_02236648 *v2 = param0; if (v2->unk_00.unk_0C == 0xFF) { if (v2->unk_00.unk_10) { @@ -876,9 +893,9 @@ void ov12_022366F0 (UnkStruct_ov12_02236648 * param0) sub_02014788(v2->unk_18, 1); } -BOOL ov12_02236764 (UnkStruct_ov12_02236648 * param0) +BOOL ov12_02236764(UnkStruct_ov12_02236648 *param0) { - UnkStruct_ov12_02236648 * v0 = param0; + UnkStruct_ov12_02236648 *v0 = param0; if (sub_02014710(v0->unk_18) == 0) { ov12_02223894(v0->unk_18); @@ -888,12 +905,12 @@ BOOL ov12_02236764 (UnkStruct_ov12_02236648 * param0) return 1; } -void ov12_02236780 (UnkStruct_ov12_02236648 * param0) +void ov12_02236780(UnkStruct_ov12_02236648 *param0) { Heap_FreeToHeap(param0); } -static BOOL(*const Unk_ov12_0223AB84[])(BallRotation *) = { +static BOOL (*const Unk_ov12_0223AB84[])(BallRotation *) = { ov12_02236F24, ov12_022371E4, ov12_02237608, @@ -902,7 +919,7 @@ static BOOL(*const Unk_ov12_0223AB84[])(BallRotation *) = { ov12_02237474 }; -static BOOL ov12_02236788 (BallRotation * param0) +static BOOL ov12_02236788(BallRotation *param0) { BOOL v0; @@ -920,7 +937,7 @@ static BOOL ov12_02236788 (BallRotation * param0) return 1; } -static BOOL ov12_022367B0 (BallRotation * param0) +static BOOL ov12_022367B0(BallRotation *param0) { BOOL v0; @@ -938,7 +955,7 @@ static BOOL ov12_022367B0 (BallRotation * param0) return 1; } -static BOOL ov12_022367D8 (BallRotation * param0) +static BOOL ov12_022367D8(BallRotation *param0) { BOOL v0; @@ -956,7 +973,7 @@ static BOOL ov12_022367D8 (BallRotation * param0) return 1; } -static BOOL ov12_02236800 (BallRotation * param0) +static BOOL ov12_02236800(BallRotation *param0) { BOOL v0; @@ -974,7 +991,7 @@ static BOOL ov12_02236800 (BallRotation * param0) return 1; } -static BOOL ov12_02236828 (BallRotation * param0) +static BOOL ov12_02236828(BallRotation *param0) { BOOL v0; @@ -992,7 +1009,7 @@ static BOOL ov12_02236828 (BallRotation * param0) return 1; } -static BOOL ov12_02236850 (BallRotation * param0) +static BOOL ov12_02236850(BallRotation *param0) { BOOL v0; @@ -1010,7 +1027,7 @@ static BOOL ov12_02236850 (BallRotation * param0) return 1; } -static BOOL ov12_02236878 (BallRotation * param0) +static BOOL ov12_02236878(BallRotation *param0) { BOOL v0; @@ -1028,7 +1045,7 @@ static BOOL ov12_02236878 (BallRotation * param0) return 1; } -static BOOL ov12_022368A0 (BallRotation * param0) +static BOOL ov12_022368A0(BallRotation *param0) { BOOL v0; @@ -1046,7 +1063,7 @@ static BOOL ov12_022368A0 (BallRotation * param0) return 1; } -static BOOL(*const Unk_ov12_0223AB9C[])(BallRotation *) = { +static BOOL (*const Unk_ov12_0223AB9C[])(BallRotation *) = { ov12_02236788, ov12_022367B0, ov12_022367D8, @@ -1057,13 +1074,13 @@ static BOOL(*const Unk_ov12_0223AB9C[])(BallRotation *) = { ov12_022368A0 }; -void ov12_022368C8 (BallRotation * param0, int param1) +void ov12_022368C8(BallRotation *param0, int param1) { param0->unk_00 = param1; param0->unk_04 = 0; } -BOOL ov12_022368D0 (BallRotation * param0, int param1) +BOOL ov12_022368D0(BallRotation *param0, int param1) { BOOL v0; @@ -1071,7 +1088,7 @@ BOOL ov12_022368D0 (BallRotation * param0, int param1) return v0; } -static void ov12_022368E4 (BallRotation * param0, int param1) +static void ov12_022368E4(BallRotation *param0, int param1) { param0->unk_14 = param1; param0->unk_08 = 0; @@ -1079,12 +1096,12 @@ static void ov12_022368E4 (BallRotation * param0, int param1) param0->unk_10 = 0; } -static BOOL ov12_022368F0 (BallRotation * param0) +static BOOL ov12_022368F0(BallRotation *param0) { return 1; } -static BOOL ov12_022368F4 (BallRotation * param0) +static BOOL ov12_022368F4(BallRotation *param0) { BOOL v0; @@ -1097,13 +1114,13 @@ static BOOL ov12_022368F4 (BallRotation * param0) return 1; } -static BOOL ov12_0223690C (BallRotation * param0) +static BOOL ov12_0223690C(BallRotation *param0) { ov12_022368E4(param0, 3); return 1; } -static BOOL ov12_02236918 (BallRotation * param0) +static BOOL ov12_02236918(BallRotation *param0) { switch (param0->unk_08) { case 0: @@ -1123,30 +1140,26 @@ static BOOL ov12_02236918 (BallRotation * param0) } param0->unk_08++; break; - case 1: - { + case 1: { int v1 = sub_0200D3E0(param0->unk_30); if (v1 >= 2) { param0->unk_24 = 0; param0->unk_08++; } - } - break; + } break; case 2: ov12_022366F0(param0->unk_D0); ov12_02223770(param0->unk_D8); param0->unk_08++; break; - case 3: - { + case 3: { if (ov12_02236764(param0->unk_D0) == 0) { sub_0200D3CC(param0->unk_30, 0); ov12_02236780(param0->unk_D0); param0->unk_08++; } - } - break; + } break; default: ov12_022368E4(param0, 4); break; @@ -1155,12 +1168,12 @@ static BOOL ov12_02236918 (BallRotation * param0) return 1; } -static BOOL ov12_022369F8 (BallRotation * param0) +static BOOL ov12_022369F8(BallRotation *param0) { return 1; } -static BOOL ov12_022369FC (BallRotation * param0) +static BOOL ov12_022369FC(BallRotation *param0) { BOOL v0; @@ -1173,38 +1186,36 @@ static BOOL ov12_022369FC (BallRotation * param0) param0->unk_B8.unk_10 = 12; param0->unk_0C++; break; - default: - { + default: { v0 = ov12_02236F24(param0); if (v0 == 0) { ov12_022368E4(param0, 6); } - } - break; + } break; } return 1; } -static BOOL ov12_02236A50 (BallRotation * param0) +static BOOL ov12_02236A50(BallRotation *param0) { return 1; } -static BOOL ov12_02236A54 (BallRotation * param0) +static BOOL ov12_02236A54(BallRotation *param0) { ov12_022368E4(param0, 8); return 1; } -static BOOL ov12_02236A60 (BallRotation * param0) +static BOOL ov12_02236A60(BallRotation *param0) { ov12_022368E4(param0, 9); return 1; } -static BOOL ov12_02236A6C (BallRotation * param0) +static BOOL ov12_02236A6C(BallRotation *param0) { switch (param0->unk_08) { case 0: @@ -1216,8 +1227,7 @@ static BOOL ov12_02236A6C (BallRotation * param0) sub_02003178(param0->unk_90.paletteSys, 0x4, 1 << v0, -1, 0, 12, 0x37F); param0->unk_08++; - } - break; + } break; case 1: if (sub_0200384C(param0->unk_90.paletteSys) != 0) { break; @@ -1244,13 +1254,13 @@ static BOOL ov12_02236A6C (BallRotation * param0) return 1; } -static BOOL ov12_02236B14 (BallRotation * param0) +static BOOL ov12_02236B14(BallRotation *param0) { ov12_022368E4(param0, 11); return 1; } -static BOOL ov12_02236B20 (BallRotation * param0) +static BOOL ov12_02236B20(BallRotation *param0) { switch (param0->unk_08) { case 0: @@ -1281,52 +1291,51 @@ static BOOL ov12_02236B20 (BallRotation * param0) return 1; } -static BOOL ov12_02236B94 (BallRotation * param0) +static BOOL ov12_02236B94(BallRotation *param0) { return 1; } static const s16 Unk_ov12_0223ACF0[][3] = { - {0x0, -7, 0x1}, - {0x1, -5, 0x0}, - {0x0, -3, 0x0}, - {0x1, -2, 0x0}, - {0x1, 0x2, 0x0}, - {0x1, 0x3, 0x0}, - {0x0, 0x5, 0x0}, - {0x1, 0x7, 0x1}, - {0x0, -5, 0x1}, - {0x0, -3, 0x0}, - {0x1, -2, 0x0}, - {0x1, 0x2, 0x0}, - {0x0, 0x3, 0x0}, - {0x0, 0x5, 0x1}, - {0x0, -2, 0x0}, - {0x1, -1, 0x0}, - {0x0, 0x1, 0x0}, - {0x0, 0x2, 0x0}, - {0x0, -2, 0x1}, - {0x0, 0x2, 0x1}, - {0xFF, 0xFF, 0x0} + { 0x0, -7, 0x1 }, + { 0x1, -5, 0x0 }, + { 0x0, -3, 0x0 }, + { 0x1, -2, 0x0 }, + { 0x1, 0x2, 0x0 }, + { 0x1, 0x3, 0x0 }, + { 0x0, 0x5, 0x0 }, + { 0x1, 0x7, 0x1 }, + { 0x0, -5, 0x1 }, + { 0x0, -3, 0x0 }, + { 0x1, -2, 0x0 }, + { 0x1, 0x2, 0x0 }, + { 0x0, 0x3, 0x0 }, + { 0x0, 0x5, 0x1 }, + { 0x0, -2, 0x0 }, + { 0x1, -1, 0x0 }, + { 0x0, 0x1, 0x0 }, + { 0x0, 0x2, 0x0 }, + { 0x0, -2, 0x1 }, + { 0x0, 0x2, 0x1 }, + { 0xFF, 0xFF, 0x0 } }; static const int Unk_ov12_0223ABE4[][2] = { - {0x1, 0x5E6}, - {0x8, 0x5E6}, - {0xE, 0x5E7}, - {0x12, 0x5E8}, - {0x14, 0x5E9} + { 0x1, 0x5E6 }, + { 0x8, 0x5E6 }, + { 0xE, 0x5E7 }, + { 0x12, 0x5E8 }, + { 0x14, 0x5E9 } }; -static BOOL ov12_02236B98 (BallRotation * param0) +static BOOL ov12_02236B98(BallRotation *param0) { switch (param0->unk_08) { case 0: sub_0200D364(param0->unk_30, 1); sub_0200D3CC(param0->unk_30, 0); param0->unk_08++; - case 1: - { + case 1: { s16 v0, v1; int v2; @@ -1353,8 +1362,7 @@ static BOOL ov12_02236B98 (BallRotation * param0) } else { sub_0200D5DC(param0->unk_30, v0, v1); } - } - break; + } break; default: ov12_022368E4(param0, 14); break; @@ -1363,12 +1371,12 @@ static BOOL ov12_02236B98 (BallRotation * param0) return 1; } -static BOOL ov12_02236C34 (BallRotation * param0) +static BOOL ov12_02236C34(BallRotation *param0) { return 1; } -static BOOL ov12_02236C38 (BallRotation * param0) +static BOOL ov12_02236C38(BallRotation *param0) { param0->unk_0C++; @@ -1381,26 +1389,25 @@ static BOOL ov12_02236C38 (BallRotation * param0) return 1; } -static BOOL ov12_02236C58 (BallRotation * param0) +static BOOL ov12_02236C58(BallRotation *param0) { ov12_022368E4(param0, 17); return 1; } static const s16 Unk_ov12_0223AC38[][12] = { - {-2, -0, 0x2, 0x2, 0x0, -2, 0xFF, 0xFF, 0xFF}, - {-1, -0, 0x1, 0x1, 0x0, -1, 0xFF, 0xFF, 0xFF}, - {-1, 0x0, 0x1, 0x1, 0x0, -1, 0x0, 0x0, 0x0, 0x0, 0x0, 0xFF} + { -2, -0, 0x2, 0x2, 0x0, -2, 0xFF, 0xFF, 0xFF }, + { -1, -0, 0x1, 0x1, 0x0, -1, 0xFF, 0xFF, 0xFF }, + { -1, 0x0, 0x1, 0x1, 0x0, -1, 0x0, 0x0, 0x0, 0x0, 0x0, 0xFF } }; -static BOOL ov12_02236C64 (BallRotation * param0) +static BOOL ov12_02236C64(BallRotation *param0) { switch (param0->unk_08) { case 0: GF_ASSERT(param0->unk_18 < 3); param0->unk_08++; - case 1: - { + case 1: { s16 v0; v0 = Unk_ov12_0223AC38[param0->unk_18][param0->unk_0C]; @@ -1418,10 +1425,9 @@ static BOOL ov12_02236C64 (BallRotation * param0) } sub_0200D5DC(param0->unk_30, v0, 0); - sub_0200D7C0(param0->unk_30, (((((v0) * 2) * 0xffff) / 360))); + sub_0200D7C0(param0->unk_30, ((((v0) * 2) * 0xffff) / 360)); } - } - break; + } break; default: break; } @@ -1429,24 +1435,24 @@ static BOOL ov12_02236C64 (BallRotation * param0) return 1; } -static BOOL ov12_02236CFC (BallRotation * param0) +static BOOL ov12_02236CFC(BallRotation *param0) { return 1; } -static BOOL ov12_02236D00 (BallRotation * param0) +static BOOL ov12_02236D00(BallRotation *param0) { ov12_022368E4(param0, 20); return 1; } -static BOOL ov12_02236D0C (BallRotation * param0) +static BOOL ov12_02236D0C(BallRotation *param0) { ov12_022368E4(param0, 27); return 1; } -static BOOL ov12_02236D18 (BallRotation * param0) +static BOOL ov12_02236D18(BallRotation *param0) { switch (param0->unk_08) { case 0: @@ -1458,8 +1464,7 @@ static BOOL ov12_02236D18 (BallRotation * param0) sub_02003178(param0->unk_90.paletteSys, 0x4, 1 << v0, -5, 0, 10, 0x0); param0->unk_08++; - } - break; + } break; case 1: if (sub_0200384C(param0->unk_90.paletteSys) != 0) { break; @@ -1482,15 +1487,13 @@ static BOOL ov12_02236D18 (BallRotation * param0) ov12_022366F0(param0->unk_D0); param0->unk_08++; break; - case 3: - { + case 3: { if (ov12_02236764(param0->unk_D0) == 0) { sub_0200D3CC(param0->unk_30, 0); ov12_02236780(param0->unk_D0); param0->unk_08++; } - } - break; + } break; default: if (sub_0200384C(param0->unk_90.paletteSys) != 0) { break; @@ -1503,16 +1506,15 @@ static BOOL ov12_02236D18 (BallRotation * param0) return 1; } -static BOOL ov12_02236E08 (BallRotation * param0) +static BOOL ov12_02236E08(BallRotation *param0) { return 1; } -static BOOL ov12_02236E0C (BallRotation * param0) +static BOOL ov12_02236E0C(BallRotation *param0) { switch (param0->unk_08) { - case 0: - { + case 0: { int v0; v0 = sub_0200D43C(param0->unk_30); @@ -1535,13 +1537,13 @@ static BOOL ov12_02236E0C (BallRotation * param0) return 1; } -static BOOL ov12_02236E70 (BallRotation * param0) +static BOOL ov12_02236E70(BallRotation *param0) { ov12_022368E4(param0, 25); return 1; } -static BOOL ov12_02236E7C (BallRotation * param0) +static BOOL ov12_02236E7C(BallRotation *param0) { switch (param0->unk_08) { case 0: @@ -1568,18 +1570,18 @@ static BOOL ov12_02236E7C (BallRotation * param0) return 1; } -static BOOL ov12_02236F00 (BallRotation * param0) +static BOOL ov12_02236F00(BallRotation *param0) { ov12_022368E4(param0, 27); return 1; } -static BOOL ov12_02236F0C (BallRotation * param0) +static BOOL ov12_02236F0C(BallRotation *param0) { return 0; } -static BOOL(*const Unk_ov12_0223AC80[])(BallRotation *) = { +static BOOL (*const Unk_ov12_0223AC80[])(BallRotation *) = { ov12_022368F0, ov12_022368F4, ov12_0223690C, @@ -1610,7 +1612,7 @@ static BOOL(*const Unk_ov12_0223AC80[])(BallRotation *) = { ov12_02236F0C }; -static BOOL ov12_02236F10 (BallRotation * param0) +static BOOL ov12_02236F10(BallRotation *param0) { BOOL v0; @@ -1618,7 +1620,7 @@ static BOOL ov12_02236F10 (BallRotation * param0) return v0; } -static BOOL ov12_02236F24 (BallRotation * param0) +static BOOL ov12_02236F24(BallRotation *param0) { switch (param0->unk_08) { case 0: @@ -1729,7 +1731,7 @@ static BOOL ov12_02236F24 (BallRotation * param0) return 1; } -static BOOL ov12_022371E4 (BallRotation * param0) +static BOOL ov12_022371E4(BallRotation *param0) { switch (param0->unk_08) { case 0: @@ -1837,14 +1839,14 @@ static BOOL ov12_022371E4 (BallRotation * param0) } static const int Unk_ov12_0223ABBC[][2] = { - {0x0, 0x2}, - {0x2, 0x2}, - {0x2, 0x6}, - {0x1, 0x6}, - {0x0, 0x6} + { 0x0, 0x2 }, + { 0x2, 0x2 }, + { 0x2, 0x6 }, + { 0x1, 0x6 }, + { 0x0, 0x6 } }; -static BOOL ov12_02237474 (BallRotation * param0) +static BOOL ov12_02237474(BallRotation *param0) { switch (param0->unk_08) { case 0: @@ -1867,8 +1869,7 @@ static BOOL ov12_02237474 (BallRotation * param0) param0->unk_08++; } break; - case 2: - { + case 2: { UnkStruct_ov12_02236690 v0; v0.unk_04 = param0->unk_90.ballID; @@ -1926,11 +1927,10 @@ static BOOL ov12_02237474 (BallRotation * param0) return 1; } -static BOOL ov12_02237608 (BallRotation * param0) +static BOOL ov12_02237608(BallRotation *param0) { switch (param0->unk_08) { - case 0: - { + case 0: { if (param0->unk_10 == 0) { ov12_02225D50(¶m0->unk_34, -((45 * 0xffff) / 360), +((45 * 0xffff) / 360), 10); } else { @@ -1962,7 +1962,7 @@ static BOOL ov12_02237608 (BallRotation * param0) return 1; } -static BOOL ov12_02237694 (BallRotation * param0) +static BOOL ov12_02237694(BallRotation *param0) { if (param0->unk_08 == 0xFF) { return 0; @@ -1980,10 +1980,10 @@ static BOOL ov12_02237694 (BallRotation * param0) return 1; } -static void ov12_022376D0 (SysTask * param0, void * param1) +static void ov12_022376D0(SysTask *param0, void *param1) { BOOL v0; - BallRotation * v1 = (BallRotation *)param1; + BallRotation *v1 = (BallRotation *)param1; if (v1->unk_1C == 0) { return; @@ -2008,9 +2008,9 @@ static void ov12_022376D0 (SysTask * param0, void * param1) sub_0200C7EC(v1->unk_2C); } -BallRotation * ov12_02237728 (BallThrow * param0) +BallRotation *ov12_02237728(BallThrow *param0) { - BallRotation * v0 = NULL; + BallRotation *v0 = NULL; v0 = Heap_AllocFromHeap(param0->heapID, sizeof(BallRotation)); MI_CpuClear8(v0, sizeof(BallRotation)); @@ -2057,29 +2057,29 @@ BallRotation * ov12_02237728 (BallThrow * param0) return v0; } -BOOL ov12_022377F8 (BallRotation * param0) +BOOL ov12_022377F8(BallRotation *param0) { GF_ASSERT(param0 != NULL); return param0->unk_1C ? 1 : 0; } -BOOL ov12_02237810 (BallRotation * param0) +BOOL ov12_02237810(BallRotation *param0) { GF_ASSERT(param0 != NULL); return param0->unk_28 ? 1 : 0; } -void ov12_02237828 (BallRotation * param0, int param1) +void ov12_02237828(BallRotation *param0, int param1) { param0->unk_14 = param1; } -BOOL ov12_0223782C (BallRotation * param0, int param1) +BOOL ov12_0223782C(BallRotation *param0, int param1) { return (param0->unk_14 == param1) ? 1 : 0; } -void ov12_0223783C (BallRotation * param0) +void ov12_0223783C(BallRotation *param0) { int v0 = param0->unk_90.heapID; @@ -2091,7 +2091,7 @@ void ov12_0223783C (BallRotation * param0) Heap_FreeToHeap(param0); } -void ov12_0223786C (BallRotation * param0, int param1) +void ov12_0223786C(BallRotation *param0, int param1) { param0->unk_90.mode = param1; param0->unk_08 = 0; @@ -2102,14 +2102,14 @@ void ov12_0223786C (BallRotation * param0, int param1) SpriteActor_GetSpritePositionXY(param0->unk_30, ¶m0->unk_B8.unk_00, ¶m0->unk_B8.unk_02); } -int ov12_02237890 (BallRotation * param0) +int ov12_02237890(BallRotation *param0) { GF_ASSERT(param0 != NULL); return param0->unk_90.mode; } -static void ov12_022378A0 (BallRotation * param0) +static void ov12_022378A0(BallRotation *param0) { SpriteActor_GetSpritePositionXY(param0->unk_30, ¶m0->unk_B8.unk_00, ¶m0->unk_B8.unk_02); @@ -2199,7 +2199,7 @@ static void ov12_022378A0 (BallRotation * param0) param0->unk_B8.unk_08 = 20; } -static void ov12_02237B14 (BallRotation * param0, s16 * param1, s16 * param2) +static void ov12_02237B14(BallRotation *param0, s16 *param1, s16 *param2) { switch (param0->unk_90.type) { case 0: @@ -2268,7 +2268,7 @@ static void ov12_02237B14 (BallRotation * param0, s16 * param1, s16 * param2) } } -static void ov12_02237C54 (BallRotation * param0) +static void ov12_02237C54(BallRotation *param0) { int v0; int v1; @@ -2301,7 +2301,7 @@ static void ov12_02237C54 (BallRotation * param0) v3 = ov12_02235FC8(param0->unk_90.ballID, 3); { - NARC * v6; + NARC *v6; v6 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param0->unk_90.heapID); @@ -2313,7 +2313,7 @@ static void ov12_02237C54 (BallRotation * param0) } } -static void ov12_02237D8C (BallRotation * param0) +static void ov12_02237D8C(BallRotation *param0) { int v0; SpriteTemplate v1; @@ -2344,37 +2344,37 @@ static void ov12_02237D8C (BallRotation * param0) ov12_02220474(); } -void ov12_02237E0C (BallRotation * param0, int param1) +void ov12_02237E0C(BallRotation *param0, int param1) { SpriteActor_EnableObject(param0->unk_30, param1); } -void ov12_02237E18 (BallRotation * param0, s16 param1, s16 param2) +void ov12_02237E18(BallRotation *param0, s16 param1, s16 param2) { SpriteActor_SetSpritePositionXY(param0->unk_30, param1, param2); } -void ov12_02237E24 (BallRotation * param0, u16 param1) +void ov12_02237E24(BallRotation *param0, u16 param1) { sub_0200D79C(param0->unk_30, param1); } -void ov12_02237E30 (BallRotation * param0, BOOL param1) +void ov12_02237E30(BallRotation *param0, BOOL param1) { param0->unk_24 = param1; } -void ov12_02237E34 (BallRotation * param0, int param1) +void ov12_02237E34(BallRotation *param0, int param1) { sub_0200D474(param0->unk_30, param1); } -void ov12_02237E40 (BallRotation * param0, int param1) +void ov12_02237E40(BallRotation *param0, int param1) { sub_0200D460(param0->unk_30, param1); } -void ov12_02237E4C (BallRotation * param0, int param1) +void ov12_02237E4C(BallRotation *param0, int param1) { param0->unk_DC = param1; } diff --git a/src/overlay012/ov12_02237E54.c b/src/overlay012/ov12_02237E54.c index 60bc0dd40b..61021e77d9 100644 --- a/src/overlay012/ov12_02237E54.c +++ b/src/overlay012/ov12_02237E54.c @@ -1,3 +1,5 @@ +#include "overlay012/ov12_02237E54.h" + #include #include @@ -5,9 +7,8 @@ #include "unk_0202C9F4.h" #include "unk_02097B18.h" -#include "overlay012/ov12_02237E54.h" -int ov12_02237E54 (s16 param0, s16 param1, s16 param2, s16 param3) +int ov12_02237E54(s16 param0, s16 param1, s16 param2, s16 param3) { int v0; s16 v1 = (param0 - param2); @@ -18,7 +19,7 @@ int ov12_02237E54 (s16 param0, s16 param1, s16 param2, s16 param3) return v0; } -int ov12_02237E80 (UnkStruct_0202CA64 * param0) +int ov12_02237E80(UnkStruct_0202CA64 *param0) { int v0; s16 v1, v2; @@ -30,7 +31,7 @@ int ov12_02237E80 (UnkStruct_0202CA64 * param0) return v0; } -int ov12_02237EA0 (UnkStruct_0202CA64 * param0) +int ov12_02237EA0(UnkStruct_0202CA64 *param0) { int v0; int v1; @@ -38,7 +39,13 @@ int ov12_02237EA0 (UnkStruct_0202CA64 * param0) int v3; int v4; const u8 v5[] = { - 0, 8, 14, 20, 20, 16, 16, + 0, + 8, + 14, + 20, + 20, + 16, + 16, }; v3 = sub_0202CA7C(param0); @@ -50,7 +57,7 @@ int ov12_02237EA0 (UnkStruct_0202CA64 * param0) if (v2 >= (60 - 4)) { v4 = 3; } else { - v4 = (((v2 + 1) / 20)); + v4 = ((v2 + 1) / 20); if (v4 >= (60 / 20)) { v4 = 3; diff --git a/src/overlay012/ov12_02237EFC.c b/src/overlay012/ov12_02237EFC.c index 626a2be137..02a7124ad2 100644 --- a/src/overlay012/ov12_02237EFC.c +++ b/src/overlay012/ov12_02237EFC.c @@ -1,29 +1,29 @@ +#include "overlay012/ov12_02237EFC.h" + #include #include #include "struct_decls/struct_02014014_decl.h" -#include "sys_task_manager.h" #include "functypes/funcptr_020146F4.h" +#include "overlay012/ov12_0221FC20.h" +#include "overlay012/ov12_022237EC.h" #include "overlay012/struct_ov12_02237EFC.h" #include "overlay012/struct_ov12_02237F38.h" +#include "heap.h" #include "spl.h" - #include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02014000.h" -#include "heap.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay012/ov12_022237EC.h" -#include "overlay012/ov12_02237EFC.h" typedef struct UnkStruct_ov12_02238004_t { int unk_00; int unk_04; UnkStruct_ov12_02237F38 unk_08; - UnkStruct_02014014 * unk_10; - UnkSPLStruct6 * unk_14; - SysTask * unk_18; + UnkStruct_02014014 *unk_10; + UnkSPLStruct6 *unk_14; + SysTask *unk_18; int unk_1C; BOOL unk_20; } UnkStruct_ov12_02238004; @@ -31,17 +31,17 @@ typedef struct UnkStruct_ov12_02238004_t { typedef struct UnkStruct_ov12_02237F98_t { int unk_00; UnkStruct_ov12_02237EFC unk_04; - UnkStruct_ov12_02238004 * unk_08[16]; + UnkStruct_ov12_02238004 *unk_08[16]; } UnkStruct_ov12_02237F98; -static void ov12_02238030(SysTask * param0, void * param1); -static void ov12_02238054(UnkStruct_ov12_02238004 * param0, UnkFuncPtr_020146F4 param1); -static void ov12_02238080(UnkSPLStruct6 * param0); +static void ov12_02238030(SysTask *param0, void *param1); +static void ov12_02238054(UnkStruct_ov12_02238004 *param0, UnkFuncPtr_020146F4 param1); +static void ov12_02238080(UnkSPLStruct6 *param0); static int ov12_02238088(int param0); -UnkStruct_ov12_02237F98 * ov12_02237EFC (int param0, UnkStruct_ov12_02237EFC * param1) +UnkStruct_ov12_02237F98 *ov12_02237EFC(int param0, UnkStruct_ov12_02237EFC *param1) { - UnkStruct_ov12_02237F98 * v0; + UnkStruct_ov12_02237F98 *v0; v0 = NULL; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov12_02237F98)); @@ -70,10 +70,10 @@ UnkStruct_ov12_02237F98 * ov12_02237EFC (int param0, UnkStruct_ov12_02237EFC * p return v0; } -UnkStruct_ov12_02238004 * ov12_02237F38 (UnkStruct_ov12_02237F98 * param0, UnkStruct_ov12_02237F38 * param1) +UnkStruct_ov12_02238004 *ov12_02237F38(UnkStruct_ov12_02237F98 *param0, UnkStruct_ov12_02237F38 *param1) { int v0; - UnkStruct_ov12_02238004 * v1 = NULL; + UnkStruct_ov12_02238004 *v1 = NULL; for (v0 = 0; v0 < 16; v0++) { if (param0->unk_08[v0] != NULL) { @@ -96,7 +96,7 @@ UnkStruct_ov12_02238004 * ov12_02237F38 (UnkStruct_ov12_02237F98 * param0, UnkSt return v1; } -void ov12_02237F74 (UnkStruct_ov12_02237F98 * param0) +void ov12_02237F74(UnkStruct_ov12_02237F98 *param0) { int v0; @@ -111,7 +111,7 @@ void ov12_02237F74 (UnkStruct_ov12_02237F98 * param0) Heap_FreeToHeap(param0); } -void ov12_02237F98 (UnkStruct_ov12_02237F98 * param0) +void ov12_02237F98(UnkStruct_ov12_02237F98 *param0) { int v0; @@ -134,9 +134,9 @@ void ov12_02237F98 (UnkStruct_ov12_02237F98 * param0) } } -UnkStruct_ov12_02238004 * ov12_02237FC8 (int param0, UnkStruct_ov12_02237F38 * param1) +UnkStruct_ov12_02238004 *ov12_02237FC8(int param0, UnkStruct_ov12_02237F38 *param1) { - UnkStruct_ov12_02238004 * v0; + UnkStruct_ov12_02238004 *v0; v0 == NULL; @@ -155,21 +155,21 @@ UnkStruct_ov12_02238004 * ov12_02237FC8 (int param0, UnkStruct_ov12_02237F38 * p return v0; } -void ov12_02238004 (UnkStruct_ov12_02238004 * param0) +void ov12_02238004(UnkStruct_ov12_02238004 *param0) { param0->unk_20 = 1; ov12_02238054(param0, ov12_02238080); param0->unk_18 = SysTask_Start(ov12_02238030, param0, 1000); } -BOOL ov12_0223802C (UnkStruct_ov12_02238004 * param0) +BOOL ov12_0223802C(UnkStruct_ov12_02238004 *param0) { return param0->unk_20; } -static void ov12_02238030 (SysTask * param0, void * param1) +static void ov12_02238030(SysTask *param0, void *param1) { - UnkStruct_ov12_02238004 * v0 = (UnkStruct_ov12_02238004 *)param1; + UnkStruct_ov12_02238004 *v0 = (UnkStruct_ov12_02238004 *)param1; int v1 = 0; v1 = sub_02014710(v0->unk_10); @@ -184,7 +184,7 @@ static void ov12_02238030 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov12_02238054 (UnkStruct_ov12_02238004 * param0, UnkFuncPtr_020146F4 param1) +static void ov12_02238054(UnkStruct_ov12_02238004 *param0, UnkFuncPtr_020146F4 param1) { int v0; @@ -195,14 +195,14 @@ static void ov12_02238054 (UnkStruct_ov12_02238004 * param0, UnkFuncPtr_020146F4 sub_02014788(param0->unk_10, param0->unk_08.unk_04); } -static void ov12_02238080 (UnkSPLStruct6 * param0) +static void ov12_02238080(UnkSPLStruct6 *param0) { - UnkStruct_ov12_02238004 * v0; + UnkStruct_ov12_02238004 *v0; v0 = sub_02014764(); } -static int ov12_02238088 (int param0) +static int ov12_02238088(int param0) { const int v0[] = { 0x5, diff --git a/src/overlay012/ov12_022380BC.c b/src/overlay012/ov12_022380BC.c index d7866654b5..7410a3b462 100644 --- a/src/overlay012/ov12_022380BC.c +++ b/src/overlay012/ov12_022380BC.c @@ -1,64 +1,64 @@ +#include "overlay012/ov12_022380BC.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" +#include "struct_defs/archived_sprite.h" -#include "overlay012/const_ov12_0223B0B8.h" #include "overlay012/const_ov12_0223B0A0.h" +#include "overlay012/const_ov12_0223B0B8.h" #include "overlay012/const_ov12_0223B0DC.h" - -#include "struct_defs/archived_sprite.h" #include "overlay012/struct_ov12_022380DC.h" #include "narc.h" +#include "pokemon.h" #include "unk_0200762C.h" #include "unk_020131EC.h" -#include "pokemon.h" -#include "overlay012/ov12_022380BC.h" -static void ov12_022380DC(UnkStruct_ov12_022380DC * param0, int param1, int param2, int param3); +static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param2, int param3); const s16 Unk_ov12_0223B0B8[][3] = { - {0x150, 0x70, 0xFFFFFFFFFFFFFE00}, - {0xFFFFFFFFFFFFFFB0, 0x32, 0xFFFFFFFFFFFFFD80}, - {0x13C, 0x70, 0xFFFFFFFFFFFFFE00}, - {0xFFFFFFFFFFFFFFC4, 0x32, 0xFFFFFFFFFFFFFF9C}, - {0x164, 0x78, 0x0}, - {0xFFFFFFFFFFFFFF9C, 0x2A, 0xFFFFFFFFFFFFFD80} + { 0x150, 0x70, 0xFFFFFFFFFFFFFE00 }, + { 0xFFFFFFFFFFFFFFB0, 0x32, 0xFFFFFFFFFFFFFD80 }, + { 0x13C, 0x70, 0xFFFFFFFFFFFFFE00 }, + { 0xFFFFFFFFFFFFFFC4, 0x32, 0xFFFFFFFFFFFFFF9C }, + { 0x164, 0x78, 0x0 }, + { 0xFFFFFFFFFFFFFF9C, 0x2A, 0xFFFFFFFFFFFFFD80 } }; const s16 Unk_ov12_0223B0A0[][2] = { - {0x40, 0x20}, - {0xC0, 0xE0}, - {0x28, 0x20}, - {0xD8, 0xE0}, - {0x50, 0x20}, - {0xB0, 0xE0} + { 0x40, 0x20 }, + { 0xC0, 0xE0 }, + { 0x28, 0x20 }, + { 0xD8, 0xE0 }, + { 0x50, 0x20 }, + { 0xB0, 0xE0 } }; const s16 Unk_ov12_0223B0DC[][3] = { - {0xFFFFFFFFFFFFFFB0, 0x70, 0xFFFFFFFFFFFFFE00}, - {0x150, 0x32, 0xFFFFFFFFFFFFFE00}, - {0xFFFFFFFFFFFFFFB0, 0x70, 0xFFFFFFFFFFFFFE00}, - {0x150, 0x32, 0xFFFFFFFFFFFFFE00}, - {0xFFFFFFFFFFFFFFB0, 0x70, 0xFFFFFFFFFFFFFE00}, - {0x150, 0x32, 0xFFFFFFFFFFFFFE00} + { 0xFFFFFFFFFFFFFFB0, 0x70, 0xFFFFFFFFFFFFFE00 }, + { 0x150, 0x32, 0xFFFFFFFFFFFFFE00 }, + { 0xFFFFFFFFFFFFFFB0, 0x70, 0xFFFFFFFFFFFFFE00 }, + { 0x150, 0x32, 0xFFFFFFFFFFFFFE00 }, + { 0xFFFFFFFFFFFFFFB0, 0x70, 0xFFFFFFFFFFFFFE00 }, + { 0x150, 0x32, 0xFFFFFFFFFFFFFE00 } }; -void ov12_022380BC (UnkStruct_ov12_022380DC * param0, int param1) +void ov12_022380BC(UnkStruct_ov12_022380DC *param0, int param1) { ov12_022380DC(param0, param0->unk_00, 0, param1); } -void ov12_022380CC (UnkStruct_ov12_022380DC * param0, int param1) +void ov12_022380CC(UnkStruct_ov12_022380DC *param0, int param1) { ov12_022380DC(param0, param0->unk_04, 1, param1); } -static void ov12_022380DC (UnkStruct_ov12_022380DC * param0, int param1, int param2, int param3) +static void ov12_022380DC(UnkStruct_ov12_022380DC *param0, int param1, int param2, int param3) { ArchivedSprite v0; - ArchivedSprite * v1; + ArchivedSprite *v1; int v2; int v3; int v4; @@ -110,7 +110,7 @@ static void ov12_022380DC (UnkStruct_ov12_022380DC * param0, int param1, int par sub_02007DEC(param0->unk_18[param0->unk_00], 1, v8 + v11); if (v4 == 2) { - NARC * v13 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, param3); + NARC *v13 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, param3); PokeSprite_LoadYOffset(v13, &v9, v2); PokeSprite_LoadXOffsetShadow(v13, &v10, v2); @@ -125,9 +125,9 @@ static void ov12_022380DC (UnkStruct_ov12_022380DC * param0, int param1, int par } } -void ov12_022382BC (UnkStruct_ov12_022380DC * param0, int param1) +void ov12_022382BC(UnkStruct_ov12_022380DC *param0, int param1) { - ArchivedSprite * v0; + ArchivedSprite *v0; int v1; int v2; int v3; @@ -160,10 +160,10 @@ void ov12_022382BC (UnkStruct_ov12_022380DC * param0, int param1) sub_02007DEC(param0->unk_18[param0->unk_00], 1, v6); } -void ov12_02238390 (UnkStruct_ov12_022380DC * param0, int param1) +void ov12_02238390(UnkStruct_ov12_022380DC *param0, int param1) { ArchivedSprite v0; - ArchivedSprite * v1; + ArchivedSprite *v1; int v2; int v3; u8 v4; @@ -208,7 +208,7 @@ void ov12_02238390 (UnkStruct_ov12_022380DC * param0, int param1) } } -s16 ov12_022384CC (int param0, int param1) +s16 ov12_022384CC(int param0, int param1) { if (param1 == 0) { return Unk_ov12_0223B0A0[param0][0]; diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 4782fc622e..05124a1855 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -1,13 +1,17 @@ +#include "overlay013/ov13_0221FC20.h" + #include #include -#include "core_sys.h" - +#include "struct_decls/battle_system.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "struct_decls/battle_system.h" -#include "touch_screen.h" +#include "battle/ov16_0223DF00.h" +#include "overlay013/ov13_02221A88.h" +#include "overlay013/ov13_02224500.h" +#include "overlay013/ov13_02225710.h" +#include "overlay013/ov13_02228A38.h" #include "overlay013/struct_ov13_0221FC20.h" #include "overlay013/struct_ov13_022213F0.h" #include "overlay013/struct_ov13_02221ED0.h" @@ -15,170 +19,166 @@ #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "bag.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "move_table.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200679C.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "pokemon.h" -#include "move_table.h" -#include "party.h" -#include "item.h" -#include "bag.h" #include "unk_0208C098.h" -#include "pokemon_summary_app.h" #include "unk_02094EDC.h" -#include "overlay013/ov13_0221FC20.h" -#include "overlay013/ov13_02221A88.h" -#include "overlay013/ov13_02224500.h" -#include "overlay013/ov13_02225710.h" -#include "overlay013/ov13_02228A38.h" -#include "battle/ov16_0223DF00.h" -static void ov13_0221FCAC(SysTask * param0, void * param1); -static u8 ov13_0221FE5C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0221FF60(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222012C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_022201DC(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222081C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220834(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220848(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220864(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_022207DC(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_022203A0(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220418(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222050C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220628(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222088C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222072C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220738(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220750(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220744(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222075C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220768(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222078C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_022207B8(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_022208A4(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220A4C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220B78(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02220BA4(SysTask * param0, UnkStruct_ov13_022213F0 * param1); -static u8 ov13_0222029C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0221FFDC(UnkStruct_ov13_022213F0 * param0); -static void ov13_02220C0C(UnkStruct_ov13_022213F0 * param0); -static void ov13_02220D1C(BGL * param0); -static void ov13_02220D4C(UnkStruct_ov13_022213F0 * param0); -static void ov13_02220F08(UnkStruct_ov13_022213F0 * param0); -static void ov13_02220F60(UnkStruct_ov13_022213F0 * param0); -static void ov13_02220F98(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222124C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_022212C4(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222130C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222139C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02221354(UnkStruct_ov13_022213F0 * param0); -static int ov13_022213E4(UnkStruct_ov13_022213F0 * param0, const TouchScreenRect *rect); -static void ov13_022216C0(UnkStruct_ov13_022213F0 * param0, u8 param1); -static void ov13_02221738(UnkStruct_ov13_022213F0 * param0, u8 param1); -static u8 ov13_022217A4(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_02221428(UnkStruct_ov13_022213F0 * param0, s32 param1, s32 param2); -static void ov13_022214E0(UnkStruct_ov13_022213F0 * param0, u8 param1); -static void ov13_02221560(UnkStruct_ov13_022213F0 * param0, u16 param1, u16 param2, u16 param3); -static void ov13_02221654(UnkStruct_ov13_022213F0 * param0, u8 param1); -static u8 ov13_022219DC(UnkStruct_ov13_022213F0 * param0); -static void ov13_02221A04(UnkStruct_ov13_022213F0 * param0); -static void ov13_02221A3C(UnkStruct_ov13_022213F0 * param0); -static u8 ov13_0222194C(UnkStruct_ov13_022213F0 * param0); -static void ov13_02221A54(BattleSystem * param0, u16 param1, u16 param2, u32 param3); +static void ov13_0221FCAC(SysTask *param0, void *param1); +static u8 ov13_0221FE5C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0221FF60(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222012C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_022201DC(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222081C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220834(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220848(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220864(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_022207DC(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_022203A0(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220418(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222050C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220628(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222088C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222072C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220738(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220750(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220744(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222075C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220768(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222078C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_022207B8(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_022208A4(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220A4C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220B78(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02220BA4(SysTask *param0, UnkStruct_ov13_022213F0 *param1); +static u8 ov13_0222029C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0221FFDC(UnkStruct_ov13_022213F0 *param0); +static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0); +static void ov13_02220D1C(BGL *param0); +static void ov13_02220D4C(UnkStruct_ov13_022213F0 *param0); +static void ov13_02220F08(UnkStruct_ov13_022213F0 *param0); +static void ov13_02220F60(UnkStruct_ov13_022213F0 *param0); +static void ov13_02220F98(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222124C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_022212C4(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222130C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222139C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02221354(UnkStruct_ov13_022213F0 *param0); +static int ov13_022213E4(UnkStruct_ov13_022213F0 *param0, const TouchScreenRect *rect); +static void ov13_022216C0(UnkStruct_ov13_022213F0 *param0, u8 param1); +static void ov13_02221738(UnkStruct_ov13_022213F0 *param0, u8 param1); +static u8 ov13_022217A4(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_02221428(UnkStruct_ov13_022213F0 *param0, s32 param1, s32 param2); +static void ov13_022214E0(UnkStruct_ov13_022213F0 *param0, u8 param1); +static void ov13_02221560(UnkStruct_ov13_022213F0 *param0, u16 param1, u16 param2, u16 param3); +static void ov13_02221654(UnkStruct_ov13_022213F0 *param0, u8 param1); +static u8 ov13_022219DC(UnkStruct_ov13_022213F0 *param0); +static void ov13_02221A04(UnkStruct_ov13_022213F0 *param0); +static void ov13_02221A3C(UnkStruct_ov13_022213F0 *param0); +static u8 ov13_0222194C(UnkStruct_ov13_022213F0 *param0); +static void ov13_02221A54(BattleSystem *param0, u16 param1, u16 param2, u32 param3); static const TouchScreenRect Unk_ov13_02228DEC[] = { - {0x0, 0x2F, 0x0, 0x7F}, - {0x8, 0x37, 0x80, 0xFF}, - {0x30, 0x5F, 0x0, 0x7F}, - {0x38, 0x67, 0x80, 0xFF}, - {0x60, 0x8F, 0x0, 0x7F}, - {0x68, 0x97, 0x80, 0xFF}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x0, 0x2F, 0x0, 0x7F }, + { 0x8, 0x37, 0x80, 0xFF }, + { 0x30, 0x5F, 0x0, 0x7F }, + { 0x38, 0x67, 0x80, 0xFF }, + { 0x60, 0x8F, 0x0, 0x7F }, + { 0x68, 0x97, 0x80, 0xFF }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov13_02228D24[] = { - {0x8, 0x8F, 0x8, 0xF7}, - {0x98, 0xBF, 0x0, 0x67}, - {0x98, 0xBF, 0x68, 0xCF}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x8, 0x8F, 0x8, 0xF7 }, + { 0x98, 0xBF, 0x0, 0x67 }, + { 0x98, 0xBF, 0x68, 0xCF }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov13_02228D38[] = { - {0x98, 0xBF, 0x0, 0x27}, - {0x98, 0xBF, 0x28, 0x4F}, - {0x98, 0xBF, 0x60, 0xC7}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x98, 0xBF, 0x0, 0x27 }, + { 0x98, 0xBF, 0x28, 0x4F }, + { 0x98, 0xBF, 0x60, 0xC7 }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov13_02228E2C[] = { - {0x30, 0x5F, 0x0, 0x7F}, - {0x30, 0x5F, 0x80, 0xFF}, - {0x60, 0x8F, 0x0, 0x7F}, - {0x60, 0x8F, 0x80, 0xFF}, - {0x98, 0xBF, 0x0, 0x27}, - {0x98, 0xBF, 0x28, 0x4F}, - {0x98, 0xBF, 0x60, 0xC7}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x30, 0x5F, 0x0, 0x7F }, + { 0x30, 0x5F, 0x80, 0xFF }, + { 0x60, 0x8F, 0x0, 0x7F }, + { 0x60, 0x8F, 0x80, 0xFF }, + { 0x98, 0xBF, 0x0, 0x27 }, + { 0x98, 0xBF, 0x28, 0x4F }, + { 0x98, 0xBF, 0x60, 0xC7 }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov13_02228D4C[] = { - {0x98, 0xA7, 0x58, 0x7F}, - {0x98, 0xA7, 0x80, 0xA7}, - {0xA8, 0xB7, 0x58, 0x7F}, - {0xA8, 0xB7, 0x80, 0xA7}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x98, 0xA7, 0x58, 0x7F }, + { 0x98, 0xA7, 0x80, 0xA7 }, + { 0xA8, 0xB7, 0x58, 0x7F }, + { 0xA8, 0xB7, 0x80, 0xA7 }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov13_02228E0C[] = { - {0x30, 0x5F, 0x0, 0x7F}, - {0x30, 0x5F, 0x80, 0xFF}, - {0x60, 0x8F, 0x0, 0x7F}, - {0x60, 0x8F, 0x80, 0xFF}, - {0x90, 0xBF, 0x40, 0xBF}, - {0x0, 0x27, 0xB8, 0xFF}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x30, 0x5F, 0x0, 0x7F }, + { 0x30, 0x5F, 0x80, 0xFF }, + { 0x60, 0x8F, 0x0, 0x7F }, + { 0x60, 0x8F, 0x80, 0xFF }, + { 0x90, 0xBF, 0x40, 0xBF }, + { 0x0, 0x27, 0xB8, 0xFF }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov13_02228D14[] = { - {0x98, 0xBF, 0x0, 0xCF}, - {0x0, 0x27, 0xB8, 0xFF}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x98, 0xBF, 0x0, 0xCF }, + { 0x0, 0x27, 0xB8, 0xFF }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov13_02228D64[] = { - {0x30, 0x5F, 0x0, 0x7F}, - {0x30, 0x5F, 0x80, 0xFF}, - {0x60, 0x8F, 0x0, 0x7F}, - {0x60, 0x8F, 0x80, 0xFF}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x30, 0x5F, 0x0, 0x7F }, + { 0x30, 0x5F, 0x80, 0xFF }, + { 0x60, 0x8F, 0x0, 0x7F }, + { 0x60, 0x8F, 0x80, 0xFF }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; -void ov13_0221FC20 (UnkStruct_ov13_0221FC20 * param0) +void ov13_0221FC20(UnkStruct_ov13_0221FC20 *param0) { - UnkStruct_ov13_022213F0 * v0; + UnkStruct_ov13_022213F0 *v0; if (param0->unk_11 > 5) { param0->unk_11 = 0; @@ -196,9 +196,9 @@ void ov13_0221FC20 (UnkStruct_ov13_0221FC20 * param0) v0->unk_208B = BattleSystem_BattlerSlot(param0->unk_08, param0->unk_28); } -static void ov13_0221FCAC (SysTask * param0, void * param1) +static void ov13_0221FCAC(SysTask *param0, void *param1) { - UnkStruct_ov13_022213F0 * v0 = (UnkStruct_ov13_022213F0 *)param1; + UnkStruct_ov13_022213F0 *v0 = (UnkStruct_ov13_022213F0 *)param1; switch (v0->unk_2074) { case 0: @@ -291,7 +291,7 @@ static void ov13_0221FCAC (SysTask * param0, void * param1) ov13_0222601C(v0); } -static u8 ov13_0221FE5C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0221FE5C(UnkStruct_ov13_022213F0 *param0) { u8 v0; @@ -338,7 +338,7 @@ static u8 ov13_0221FE5C (UnkStruct_ov13_022213F0 * param0) return v0; } -static u8 ov13_0221FF60 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0221FF60(UnkStruct_ov13_022213F0 *param0) { if (sub_0200384C(param0->unk_1E4) != 0) { return 1; @@ -368,9 +368,9 @@ static u8 ov13_0221FF60 (UnkStruct_ov13_022213F0 * param0) return 1; } -static u8 ov13_0221FFDC (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0221FFDC(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_0221FC20 * v0 = param0->unk_00; + UnkStruct_ov13_0221FC20 *v0 = param0->unk_00; if (((v0->unk_11 == 0) && (v0->unk_18[0] != 0)) || ((v0->unk_11 == 1) && (v0->unk_18[1] != 0))) { ov13_0222449C(param0); @@ -413,7 +413,7 @@ static u8 ov13_0221FFDC (UnkStruct_ov13_022213F0 * param0) return 17; } -static u8 ov13_0222012C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222012C(UnkStruct_ov13_022213F0 *param0) { u8 v0 = ov13_022212C4(param0); @@ -456,13 +456,12 @@ static u8 ov13_0222012C (UnkStruct_ov13_022213F0 * param0) return 2; } -static u8 ov13_022201DC (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_022201DC(UnkStruct_ov13_022213F0 *param0) { u8 v0 = ov13_0222130C(param0); switch (v0) { - case 0: - { + case 0: { u8 v1 = ov13_02221428(param0, param0->unk_00->unk_11, -1); if (v1 == 0xff) { @@ -475,8 +474,7 @@ static u8 ov13_022201DC (UnkStruct_ov13_022213F0 * param0) ov13_02225FCC(param0, 12); param0->unk_2075 = 14; return 22; - case 1: - { + case 1: { u8 v2 = ov13_02221428(param0, param0->unk_00->unk_11, 1); if (v2 == 0xff) { @@ -505,7 +503,7 @@ static u8 ov13_022201DC (UnkStruct_ov13_022213F0 * param0) return 3; } -static u8 ov13_0222029C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222029C(UnkStruct_ov13_022213F0 *param0) { u8 v0 = ov13_02221354(param0); @@ -523,8 +521,7 @@ static u8 ov13_0222029C (UnkStruct_ov13_022213F0 * param0) param0->unk_00->unk_34 = v0; param0->unk_2075 = 10; return 22; - case 4: - { + case 4: { u8 v1 = ov13_02221428(param0, param0->unk_00->unk_11, -1); if (v1 == 0xff) { @@ -538,8 +535,7 @@ static u8 ov13_0222029C (UnkStruct_ov13_022213F0 * param0) param0->unk_2075 = 14; return 22; - case 5: - { + case 5: { u8 v2 = ov13_02221428(param0, param0->unk_00->unk_11, 1); if (v2 == 0xff) { @@ -568,7 +564,7 @@ static u8 ov13_0222029C (UnkStruct_ov13_022213F0 * param0) return 4; } -static u8 ov13_022203A0 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_022203A0(UnkStruct_ov13_022213F0 *param0) { u8 v0 = ov13_0222139C(param0); @@ -594,7 +590,7 @@ static u8 ov13_022203A0 (UnkStruct_ov13_022213F0 * param0) return 5; } -static u8 ov13_02220418 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220418(UnkStruct_ov13_022213F0 *param0) { int v0 = ov13_022213E4(param0, Unk_ov13_02228E0C); @@ -642,7 +638,7 @@ static u8 ov13_02220418 (UnkStruct_ov13_022213F0 * param0) return 19; } -static u8 ov13_0222050C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222050C(UnkStruct_ov13_022213F0 *param0) { int v0 = ov13_022213E4(param0, Unk_ov13_02228D14); @@ -703,9 +699,9 @@ static u8 ov13_0222050C (UnkStruct_ov13_022213F0 * param0) return 20; } -static u8 ov13_02220628 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220628(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_0221FC20 * v0; + UnkStruct_ov13_0221FC20 *v0; int v1; v0 = param0->unk_00; @@ -756,37 +752,37 @@ static u8 ov13_02220628 (UnkStruct_ov13_022213F0 * param0) return 21; } -static u8 ov13_0222072C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222072C(UnkStruct_ov13_022213F0 *param0) { ov13_022216C0(param0, 0); return 1; } -static u8 ov13_02220738 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220738(UnkStruct_ov13_022213F0 *param0) { ov13_022216C0(param0, 1); return 2; } -static u8 ov13_02220744 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220744(UnkStruct_ov13_022213F0 *param0) { ov13_022216C0(param0, 2); return 3; } -static u8 ov13_02220750 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220750(UnkStruct_ov13_022213F0 *param0) { ov13_022216C0(param0, 3); return 4; } -static u8 ov13_0222075C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222075C(UnkStruct_ov13_022213F0 *param0) { ov13_022216C0(param0, 4); return 5; } -static u8 ov13_02220768 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220768(UnkStruct_ov13_022213F0 *param0) { if (param0->unk_2073_0 == 0) { ov13_022216C0(param0, 6); @@ -797,7 +793,7 @@ static u8 ov13_02220768 (UnkStruct_ov13_022213F0 * param0) return 19; } -static u8 ov13_0222078C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222078C(UnkStruct_ov13_022213F0 *param0) { ov13_022252E8(param0); @@ -810,7 +806,7 @@ static u8 ov13_0222078C (UnkStruct_ov13_022213F0 * param0) return 20; } -static u8 ov13_022207B8 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_022207B8(UnkStruct_ov13_022213F0 *param0) { ov13_022216C0(param0, 5); @@ -821,7 +817,7 @@ static u8 ov13_022207B8 (UnkStruct_ov13_022213F0 * param0) return 21; } -static u8 ov13_022207DC (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_022207DC(UnkStruct_ov13_022213F0 *param0) { ov13_02224B7C(param0, param0->unk_2076); ov13_02221BF8(param0, param0->unk_2076); @@ -835,20 +831,20 @@ static u8 ov13_022207DC (UnkStruct_ov13_022213F0 * param0) return 4; } -static u8 ov13_0222081C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222081C(UnkStruct_ov13_022213F0 *param0) { ov13_022240E0(param0); param0->unk_2075 = 16; return 17; } -static u8 ov13_02220834 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220834(UnkStruct_ov13_022213F0 *param0) { sub_0200E084(¶m0->unk_204C[1], 0); return 2; } -static u8 ov13_02220848 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220848(UnkStruct_ov13_022213F0 *param0) { if (Message_Printing(param0->unk_2077) == 0) { return 18; @@ -857,7 +853,7 @@ static u8 ov13_02220848 (UnkStruct_ov13_022213F0 * param0) return 17; } -static u8 ov13_02220864 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220864(UnkStruct_ov13_022213F0 *param0) { if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || (TouchScreen_Tapped() == 1)) { return param0->unk_2075; @@ -866,7 +862,7 @@ static u8 ov13_02220864 (UnkStruct_ov13_022213F0 * param0) return 18; } -static u8 ov13_0222088C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222088C(UnkStruct_ov13_022213F0 *param0) { if (param0->unk_1F9F_7 == 0) { return param0->unk_2075; @@ -875,9 +871,9 @@ static u8 ov13_0222088C (UnkStruct_ov13_022213F0 * param0) return 22; } -static u8 ov13_022208A4 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_022208A4(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_0221FC20 * v0 = param0->unk_00; + UnkStruct_ov13_0221FC20 *v0 = param0->unk_00; switch (param0->unk_2078) { case 0: @@ -938,9 +934,9 @@ static u8 ov13_022208A4 (UnkStruct_ov13_022213F0 * param0) return 23; } -static u8 ov13_02220A4C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220A4C(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_0221FC20 * v0 = param0->unk_00; + UnkStruct_ov13_0221FC20 *v0 = param0->unk_00; u32 v1, v2; switch (param0->unk_2078) { @@ -990,13 +986,13 @@ static u8 ov13_02220A4C (UnkStruct_ov13_022213F0 * param0) return 24; } -static u8 ov13_02220B78 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02220B78(UnkStruct_ov13_022213F0 *param0) { sub_02003178(param0->unk_1E4, (0x2 | 0x8), 0xffff, -8, 0, 16, 0); return 26; } -static u8 ov13_02220BA4 (SysTask * param0, UnkStruct_ov13_022213F0 * param1) +static u8 ov13_02220BA4(SysTask *param0, UnkStruct_ov13_022213F0 *param1) { if (sub_0200384C(param1->unk_1E4) != 0) { return 0; @@ -1018,7 +1014,7 @@ static u8 ov13_02220BA4 (SysTask * param0, UnkStruct_ov13_022213F0 * param1) return 1; } -static void ov13_02220C0C (UnkStruct_ov13_022213F0 * param0) +static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1119,7 +1115,7 @@ static void ov13_02220C0C (UnkStruct_ov13_022213F0 * param0) sub_0201C3C0(param0->unk_1E0, 4); } -static void ov13_02220D1C (BGL * param0) +static void ov13_02220D1C(BGL *param0) { GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); sub_02019044(param0, 4); @@ -1128,16 +1124,16 @@ static void ov13_02220D1C (BGL * param0) sub_02019044(param0, 7); } -static void ov13_02220D4C (UnkStruct_ov13_022213F0 * param0) +static void ov13_02220D4C(UnkStruct_ov13_022213F0 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_B_PLIST_GRA, param0->unk_00->unk_0C); sub_020070E8(v0, 22, param0->unk_1E0, 7, 0, 0, 0, param0->unk_00->unk_0C); { - NNSG2dScreenData * v1; - void * v2; + NNSG2dScreenData *v1; + void *v2; v2 = NARC_AllocAndReadWholeMember(v0, 20, param0->unk_00->unk_0C); NNS_G2dGetUnpackedScreenData(v2, &v1); @@ -1155,7 +1151,7 @@ static void ov13_02220D4C (UnkStruct_ov13_022213F0 * param0) NARC_dtor(v0); { - u16 * v3 = sub_02003164(param0->unk_1E4, 1); + u16 *v3 = sub_02003164(param0->unk_1E4, 1); memcpy(param0->unk_1F5C, &v3[12 * 16], 0x20 * 2); } @@ -1170,8 +1166,8 @@ static void ov13_02220D4C (UnkStruct_ov13_022213F0 * param0) } { - u16 * v5 = sub_02003164(param0->unk_1E4, 1); - u16 * v6 = Heap_AllocFromHeap(param0->unk_00->unk_0C, 0x20); + u16 *v5 = sub_02003164(param0->unk_1E4, 1); + u16 *v6 = Heap_AllocFromHeap(param0->unk_00->unk_0C, 0x20); memcpy(v6, &v5[13 * 16], 0x20); memcpy(&v6[7], &v5[9 * 16 + 10], 4); @@ -1182,7 +1178,7 @@ static void ov13_02220D4C (UnkStruct_ov13_022213F0 * param0) } } -static void ov13_02220F08 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02220F08(UnkStruct_ov13_022213F0 *param0) { param0->unk_1FA4 = MessageLoader_Init(0, 26, 3, param0->unk_00->unk_0C); param0->unk_1FA0 = sub_0200C440(15, 14, 0, param0->unk_00->unk_0C); @@ -1190,7 +1186,7 @@ static void ov13_02220F08 (UnkStruct_ov13_022213F0 * param0) param0->unk_1FAC = Strbuf_Init(512, param0->unk_00->unk_0C); } -static void ov13_02220F60 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02220F60(UnkStruct_ov13_022213F0 *param0) { MessageLoader_Free(param0->unk_1FA4); sub_0200C560(param0->unk_1FA0); @@ -1198,7 +1194,7 @@ static void ov13_02220F60 (UnkStruct_ov13_022213F0 * param0) Strbuf_Free(param0->unk_1FAC); } -static void ov13_02220F98 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02220F98(UnkStruct_ov13_022213F0 *param0) { u16 v0, v1; @@ -1250,7 +1246,7 @@ static void ov13_02220F98 (UnkStruct_ov13_022213F0 * param0) param0->unk_04[v0].unk_2E = (u8)Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_FORM, NULL); for (v1 = 0; v1 < 4; v1++) { - UnkStruct_ov13_022236B8 * v2 = ¶m0->unk_04[v0].unk_30[v1]; + UnkStruct_ov13_022236B8 *v2 = ¶m0->unk_04[v0].unk_30[v1]; v2->unk_00 = Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_MOVE1 + v1, NULL); @@ -1269,7 +1265,7 @@ static void ov13_02220F98 (UnkStruct_ov13_022213F0 * param0) } } -static u8 ov13_0222124C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222124C(UnkStruct_ov13_022213F0 *param0) { int v0 = ov13_022213E4(param0, Unk_ov13_02228DEC); @@ -1298,7 +1294,7 @@ static u8 ov13_0222124C (UnkStruct_ov13_022213F0 * param0) return 0; } -static u8 ov13_022212C4 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_022212C4(UnkStruct_ov13_022213F0 *param0) { int v0 = ov13_022213E4(param0, Unk_ov13_02228D24); @@ -1317,7 +1313,7 @@ static u8 ov13_022212C4 (UnkStruct_ov13_022213F0 * param0) return (u8)v0; } -static u8 ov13_0222130C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222130C(UnkStruct_ov13_022213F0 *param0) { int v0 = ov13_022213E4(param0, Unk_ov13_02228D38); @@ -1336,7 +1332,7 @@ static u8 ov13_0222130C (UnkStruct_ov13_022213F0 * param0) return (u8)v0; } -static u8 ov13_02221354 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02221354(UnkStruct_ov13_022213F0 *param0) { int v0 = ov13_022213E4(param0, Unk_ov13_02228E2C); @@ -1355,7 +1351,7 @@ static u8 ov13_02221354 (UnkStruct_ov13_022213F0 * param0) return (u8)v0; } -static u8 ov13_0222139C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222139C(UnkStruct_ov13_022213F0 *param0) { int v0 = ov13_022213E4(param0, Unk_ov13_02228D4C); @@ -1374,13 +1370,13 @@ static u8 ov13_0222139C (UnkStruct_ov13_022213F0 * param0) return (u8)v0; } -static int ov13_022213E4 (UnkStruct_ov13_022213F0 * param0, const TouchScreenRect *rect) +static int ov13_022213E4(UnkStruct_ov13_022213F0 *param0, const TouchScreenRect *rect) { int v0 = sub_02022664(rect); return v0; } -u8 ov13_022213F0 (UnkStruct_ov13_022213F0 * param0, s32 param1) +u8 ov13_022213F0(UnkStruct_ov13_022213F0 *param0, s32 param1) { if (param0->unk_04[param1].unk_04 == 0) { return 0; @@ -1393,12 +1389,12 @@ u8 ov13_022213F0 (UnkStruct_ov13_022213F0 * param0, s32 param1) return 2; } -static u8 ov13_02221428 (UnkStruct_ov13_022213F0 * param0, s32 param1, s32 param2) +static u8 ov13_02221428(UnkStruct_ov13_022213F0 *param0, s32 param1, s32 param2) { s32 v0 = param1; if (ov13_0222198C(param0) == 1) { - u8 v1[] = {0, 2, 4, 1, 3, 5}; + u8 v1[] = { 0, 2, 4, 1, 3, 5 }; for (param1 = 0; param1 < 6; param1++) { if (v0 == v1[param1]) { @@ -1450,9 +1446,9 @@ static u8 ov13_02221428 (UnkStruct_ov13_022213F0 * param0, s32 param1, s32 param return 0xff; } -static void ov13_022214E0 (UnkStruct_ov13_022213F0 * param0, u8 param1) +static void ov13_022214E0(UnkStruct_ov13_022213F0 *param0, u8 param1) { - UnkStruct_ov13_02221ED0 * v0; + UnkStruct_ov13_02221ED0 *v0; u32 v1; u32 v2; u16 v3; @@ -1495,12 +1491,12 @@ static void ov13_022214E0 (UnkStruct_ov13_022213F0 * param0, u8 param1) sub_0201C3C0(param0->unk_1E0, 7); } -static void ov13_02221560 (UnkStruct_ov13_022213F0 * param0, u16 param1, u16 param2, u16 param3) +static void ov13_02221560(UnkStruct_ov13_022213F0 *param0, u16 param1, u16 param2, u16 param3) { sub_02019CB8(param0->unk_1E0, 7, param1, param2, param3, 1, 1, 16); } -static void ov13_02221590 (UnkStruct_ov13_022213F0 * param0, u16 param1, u8 param2) +static void ov13_02221590(UnkStruct_ov13_022213F0 *param0, u16 param1, u8 param2) { sub_02019CB8(param0->unk_1E0, 7, param1, 2 + param2 * 2, 14, 1, 1, 16); sub_02019CB8(param0->unk_1E0, 7, param1 + 1, 2 + param2 * 2 + 1, 14, 1, 1, 16); @@ -1508,7 +1504,7 @@ static void ov13_02221590 (UnkStruct_ov13_022213F0 * param0, u16 param1, u8 para sub_02019CB8(param0->unk_1E0, 7, param1 + 33, 2 + param2 * 2 + 1, 14 + 1, 1, 1, 16); } -static void ov13_02221630 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02221630(UnkStruct_ov13_022213F0 *param0) { u16 v0; @@ -1517,7 +1513,7 @@ static void ov13_02221630 (UnkStruct_ov13_022213F0 * param0) } } -static void ov13_02221654 (UnkStruct_ov13_022213F0 * param0, u8 param1) +static void ov13_02221654(UnkStruct_ov13_022213F0 *param0, u8 param1) { u32 v0; u16 v1; @@ -1531,7 +1527,7 @@ static void ov13_02221654 (UnkStruct_ov13_022213F0 * param0, u8 param1) ov13_02221630(param0); if (param0->unk_00->unk_34 < 4) { - UnkStruct_ov13_022236B8 * v4 = ¶m0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34]; + UnkStruct_ov13_022236B8 *v4 = ¶m0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34]; v2 = v4->unk_00; } else { @@ -1548,7 +1544,7 @@ static void ov13_02221654 (UnkStruct_ov13_022213F0 * param0, u8 param1) sub_0201C3C0(param0->unk_1E0, 7); } -static void ov13_022216C0 (UnkStruct_ov13_022213F0 * param0, u8 param1) +static void ov13_022216C0(UnkStruct_ov13_022213F0 *param0, u8 param1) { ov13_02221738(param0, param1); @@ -1569,22 +1565,22 @@ static void ov13_022216C0 (UnkStruct_ov13_022213F0 * param0, u8 param1) } static const u32 Unk_ov13_02228E50[][2] = { - {0x1, 0x0}, - {0x13, 0x12}, - {0x5, 0x4}, - {0x3, 0x2}, - {0x7, 0x6}, - {0x9, 0x8}, - {0xB, 0xA}, - {0xF, 0xE}, - {0xD, 0xC}, - {0x11, 0x10} + { 0x1, 0x0 }, + { 0x13, 0x12 }, + { 0x5, 0x4 }, + { 0x3, 0x2 }, + { 0x7, 0x6 }, + { 0x9, 0x8 }, + { 0xB, 0xA }, + { 0xF, 0xE }, + { 0xD, 0xC }, + { 0x11, 0x10 } }; -static void ov13_02221738 (UnkStruct_ov13_022213F0 * param0, u8 param1) +static void ov13_02221738(UnkStruct_ov13_022213F0 *param0, u8 param1) { - NNSG2dScreenData * v0; - void * v1; + NNSG2dScreenData *v0; + void *v1; u32 v2; for (v2 = 0; v2 < 2; v2++) { @@ -1596,10 +1592,10 @@ static void ov13_02221738 (UnkStruct_ov13_022213F0 * param0, u8 param1) } } -static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_022217A4(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0; - Strbuf* v1; + UnkStruct_ov13_02221ED0 *v0; + Strbuf *v1; v0 = ¶m0->unk_04[param0->unk_00->unk_11]; @@ -1660,7 +1656,7 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) return 1; } -static u8 ov13_0222194C (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_0222194C(UnkStruct_ov13_022213F0 *param0) { if (param0->unk_04[param0->unk_00->unk_11].unk_17_7 != 0) { return 1; @@ -1669,7 +1665,7 @@ static u8 ov13_0222194C (UnkStruct_ov13_022213F0 * param0) return 0; } -u8 ov13_0222196C (UnkStruct_ov13_022213F0 * param0) +u8 ov13_0222196C(UnkStruct_ov13_022213F0 *param0) { u32 v0 = BattleSystem_BattleType(param0->unk_00->unk_08); @@ -1680,7 +1676,7 @@ u8 ov13_0222196C (UnkStruct_ov13_022213F0 * param0) return 0; } -u8 ov13_0222198C (UnkStruct_ov13_022213F0 * param0) +u8 ov13_0222198C(UnkStruct_ov13_022213F0 *param0) { u32 v0 = BattleSystem_BattleType(param0->unk_00->unk_08); @@ -1691,7 +1687,7 @@ u8 ov13_0222198C (UnkStruct_ov13_022213F0 * param0) return 0; } -u8 ov13_022219AC (UnkStruct_ov13_022213F0 * param0, u8 param1) +u8 ov13_022219AC(UnkStruct_ov13_022213F0 *param0, u8 param1) { if (ov13_0222198C(param0) == 1) { if (param0->unk_208B == 2) { @@ -1708,7 +1704,7 @@ u8 ov13_022219AC (UnkStruct_ov13_022213F0 * param0, u8 param1) return 0; } -static u8 ov13_022219DC (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_022219DC(UnkStruct_ov13_022213F0 *param0) { u16 v0; @@ -1721,7 +1717,7 @@ static u8 ov13_022219DC (UnkStruct_ov13_022213F0 * param0) return Item_IsHMMove(v0); } -static void ov13_02221A04 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02221A04(UnkStruct_ov13_022213F0 *param0) { SpriteActor_EnableObject(param0->unk_1FB4[26], 0); sub_0201AD10(¶m0->unk_206C[10]); @@ -1729,13 +1725,13 @@ static void ov13_02221A04 (UnkStruct_ov13_022213F0 * param0) sub_0201AD10(¶m0->unk_206C[7]); } -static void ov13_02221A3C (UnkStruct_ov13_022213F0 * param0) +static void ov13_02221A3C(UnkStruct_ov13_022213F0 *param0) { ov13_02221630(param0); sub_0201C3C0(param0->unk_1E0, 7); } -static void ov13_02221A54 (BattleSystem * param0, u16 param1, u16 param2, u32 param3) +static void ov13_02221A54(BattleSystem *param0, u16 param1, u16 param2, u32 param3) { if ((param1 != 65) && (param1 != 67) && (param1 != 66)) { Bag_TryRemoveItem(BattleSystem_Bag(param0), param1, 1, param3); diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c index e3ce33d1d0..7711f4b2de 100644 --- a/src/overlay013/ov13_02221A88.c +++ b/src/overlay013/ov13_02221A88.c @@ -1,178 +1,179 @@ +#include "overlay013/ov13_02221A88.h" + #include #include -#include "pokemon.h" #include "struct_defs/struct_0205AA50.h" + +#include "battle/ov16_0223DF00.h" #include "overlay013/struct_ov13_0221FC20.h" #include "overlay013/struct_ov13_022213F0.h" #include "overlay013/struct_ov13_02221ED0.h" #include "overlay013/struct_ov13_022236B8.h" #include "overlay061/struct_ov61_0222C884.h" -#include "unk_02002328.h" -#include "unk_02002B7C.h" +#include "heap.h" +#include "item.h" #include "message.h" +#include "move_table.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02002328.h" +#include "unk_02002B7C.h" #include "unk_0200C440.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "pokemon.h" -#include "move_table.h" -#include "party.h" -#include "item.h" #include "unk_0208C098.h" -#include "pokemon_summary_app.h" #include "unk_02094EDC.h" -#include "overlay013/ov13_02221A88.h" -#include "battle/ov16_0223DF00.h" -static void ov13_0222339C(UnkStruct_ov13_022213F0 * param0); -static void ov13_022234C8(UnkStruct_ov13_022213F0 * param0); -static void ov13_022237F8(UnkStruct_ov13_022213F0 * param0); -static void ov13_022236B8(UnkStruct_ov13_022213F0 * param0); -static void ov13_02223A10(UnkStruct_ov13_022213F0 * param0); -static void ov13_02223E68(UnkStruct_ov13_022213F0 * param0); -static void ov13_02223B74(UnkStruct_ov13_022213F0 * param0); -static void ov13_02223C9C(UnkStruct_ov13_022213F0 * param0); -static void ov13_02223F7C(UnkStruct_ov13_022213F0 * param0); -static void ov13_02223550(UnkStruct_ov13_022213F0 * param0, u32 param1); +static void ov13_0222339C(UnkStruct_ov13_022213F0 *param0); +static void ov13_022234C8(UnkStruct_ov13_022213F0 *param0); +static void ov13_022237F8(UnkStruct_ov13_022213F0 *param0); +static void ov13_022236B8(UnkStruct_ov13_022213F0 *param0); +static void ov13_02223A10(UnkStruct_ov13_022213F0 *param0); +static void ov13_02223E68(UnkStruct_ov13_022213F0 *param0); +static void ov13_02223B74(UnkStruct_ov13_022213F0 *param0); +static void ov13_02223C9C(UnkStruct_ov13_022213F0 *param0); +static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0); +static void ov13_02223550(UnkStruct_ov13_022213F0 *param0, u32 param1); static const UnkStruct_ov61_0222C884 Unk_ov13_02228EA0[] = { - {0x4, 0x2, 0x15, 0x16, 0x2, 0xF, 0x1F}, - {0x4, 0x2, 0x13, 0x1B, 0x4, 0xF, 0x1F} + { 0x4, 0x2, 0x15, 0x16, 0x2, 0xF, 0x1F }, + { 0x4, 0x2, 0x13, 0x1B, 0x4, 0xF, 0x1F } }; static const UnkStruct_ov61_0222C884 Unk_ov13_02228F54[] = { - {0x5, 0x0, 0x0, 0xF, 0x5, 0x9, 0x85}, - {0x5, 0x10, 0x1, 0xF, 0x5, 0x9, 0xD0}, - {0x5, 0x0, 0x6, 0xF, 0x5, 0x9, 0x11B}, - {0x5, 0x10, 0x7, 0xF, 0x5, 0x9, 0x166}, - {0x5, 0x0, 0xC, 0xF, 0x5, 0x9, 0x1B1}, - {0x5, 0x10, 0xD, 0xF, 0x5, 0x9, 0x1FC} + { 0x5, 0x0, 0x0, 0xF, 0x5, 0x9, 0x85 }, + { 0x5, 0x10, 0x1, 0xF, 0x5, 0x9, 0xD0 }, + { 0x5, 0x0, 0x6, 0xF, 0x5, 0x9, 0x11B }, + { 0x5, 0x10, 0x7, 0xF, 0x5, 0x9, 0x166 }, + { 0x5, 0x0, 0xC, 0xF, 0x5, 0x9, 0x1B1 }, + { 0x5, 0x10, 0xD, 0xF, 0x5, 0x9, 0x1FC } }; static const UnkStruct_ov61_0222C884 Unk_ov13_02228EDC[] = { - {0x5, 0xA, 0x4, 0xC, 0x3, 0x9, 0x1}, - {0x5, 0xB, 0xC, 0xA, 0x3, 0x9, 0x25}, - {0x5, 0x1, 0x14, 0xB, 0x3, 0x9, 0x43}, - {0x5, 0xE, 0x14, 0xB, 0x3, 0x9, 0x64} + { 0x5, 0xA, 0x4, 0xC, 0x3, 0x9, 0x1 }, + { 0x5, 0xB, 0xC, 0xA, 0x3, 0x9, 0x25 }, + { 0x5, 0x1, 0x14, 0xB, 0x3, 0x9, 0x43 }, + { 0x5, 0xE, 0x14, 0xB, 0x3, 0x9, 0x64 } }; static const UnkStruct_ov61_0222C884 Unk_ov13_02228FBC[] = { - {0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x125}, - {0x5, 0x1, 0x6, 0xE, 0x5, 0x9, 0x149}, - {0x5, 0x11, 0x6, 0xE, 0x5, 0x9, 0x18F}, - {0x5, 0x1, 0xC, 0xE, 0x5, 0x9, 0x1D5}, - {0x5, 0x11, 0xC, 0xE, 0x5, 0x9, 0x21B}, - {0x5, 0xD, 0x14, 0xB, 0x3, 0x9, 0x104}, - {0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x137}, - {0x5, 0x1, 0x6, 0xE, 0x5, 0x9, 0x261}, - {0x5, 0x11, 0x6, 0xE, 0x5, 0x9, 0x2A7}, - {0x5, 0x1, 0xC, 0xE, 0x5, 0x9, 0x2ED}, - {0x5, 0x11, 0xC, 0xE, 0x5, 0x9, 0x333} + { 0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x125 }, + { 0x5, 0x1, 0x6, 0xE, 0x5, 0x9, 0x149 }, + { 0x5, 0x11, 0x6, 0xE, 0x5, 0x9, 0x18F }, + { 0x5, 0x1, 0xC, 0xE, 0x5, 0x9, 0x1D5 }, + { 0x5, 0x11, 0xC, 0xE, 0x5, 0x9, 0x21B }, + { 0x5, 0xD, 0x14, 0xB, 0x3, 0x9, 0x104 }, + { 0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x137 }, + { 0x5, 0x1, 0x6, 0xE, 0x5, 0x9, 0x261 }, + { 0x5, 0x11, 0x6, 0xE, 0x5, 0x9, 0x2A7 }, + { 0x5, 0x1, 0xC, 0xE, 0x5, 0x9, 0x2ED }, + { 0x5, 0x11, 0xC, 0xE, 0x5, 0x9, 0x333 } }; static const UnkStruct_ov61_0222C884 Unk_ov13_022290FC[] = { - {0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x125}, - {0x5, 0x1, 0x9, 0xB, 0x2, 0xD, 0x149}, - {0x5, 0x1, 0xB, 0x12, 0x4, 0xD, 0x15F}, - {0x5, 0x4, 0x10, 0xC, 0x2, 0xD, 0x1A7}, - {0x5, 0x18, 0x4, 0x7, 0x2, 0xD, 0x1BF}, - {0x5, 0x1C, 0x7, 0x3, 0x2, 0xD, 0x1CD}, - {0x5, 0x1C, 0x9, 0x3, 0x2, 0xD, 0x1D3}, - {0x5, 0x1C, 0xF, 0x3, 0x2, 0xD, 0x1D9}, - {0x5, 0x1C, 0xB, 0x3, 0x2, 0xD, 0x1DF}, - {0x5, 0x1C, 0xD, 0x3, 0x2, 0xD, 0x1E5}, - {0x5, 0x19, 0x6, 0x6, 0x1, 0x9, 0x1EB}, - {0x5, 0x5, 0x4, 0x3, 0x2, 0xD, 0x1F1}, - {0x5, 0xD, 0x6, 0x6, 0x2, 0xD, 0x1F7}, - {0x5, 0x15, 0x4, 0x2, 0x2, 0xD, 0x85}, - {0x5, 0x15, 0x7, 0x6, 0x2, 0xD, 0x89}, - {0x5, 0x15, 0x9, 0x6, 0x2, 0xD, 0x95}, - {0x5, 0x15, 0xF, 0x6, 0x2, 0xD, 0xA1}, - {0x5, 0x15, 0xB, 0x6, 0x2, 0xD, 0xAD}, - {0x5, 0x15, 0xD, 0x6, 0x2, 0xD, 0xB9}, - {0x5, 0x1, 0x4, 0x4, 0x2, 0xD, 0xC5}, - {0x5, 0x1, 0x6, 0xB, 0x2, 0xD, 0xCD}, - {0x5, 0xD, 0x14, 0xB, 0x3, 0x9, 0xE3}, - {0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x137}, - {0x5, 0x1, 0x9, 0xB, 0x2, 0xD, 0x261}, - {0x5, 0x1, 0xB, 0x12, 0x4, 0xD, 0x277}, - {0x5, 0x4, 0x10, 0xC, 0x2, 0xD, 0x2BF}, - {0x5, 0x18, 0x4, 0x7, 0x2, 0xD, 0x2D7}, - {0x5, 0x1C, 0x7, 0x3, 0x2, 0xD, 0x2E5}, - {0x5, 0x1C, 0x9, 0x3, 0x2, 0xD, 0x2EB}, - {0x5, 0x1C, 0xF, 0x3, 0x2, 0xD, 0x2F1}, - {0x5, 0x1C, 0xB, 0x3, 0x2, 0xD, 0x2F7}, - {0x5, 0x1C, 0xD, 0x3, 0x2, 0xD, 0x2FD}, - {0x5, 0x19, 0x6, 0x6, 0x1, 0x9, 0x303}, - {0x5, 0x5, 0x4, 0x3, 0x2, 0xD, 0x309}, - {0x5, 0xD, 0x6, 0x6, 0x2, 0xD, 0x30F} + { 0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x125 }, + { 0x5, 0x1, 0x9, 0xB, 0x2, 0xD, 0x149 }, + { 0x5, 0x1, 0xB, 0x12, 0x4, 0xD, 0x15F }, + { 0x5, 0x4, 0x10, 0xC, 0x2, 0xD, 0x1A7 }, + { 0x5, 0x18, 0x4, 0x7, 0x2, 0xD, 0x1BF }, + { 0x5, 0x1C, 0x7, 0x3, 0x2, 0xD, 0x1CD }, + { 0x5, 0x1C, 0x9, 0x3, 0x2, 0xD, 0x1D3 }, + { 0x5, 0x1C, 0xF, 0x3, 0x2, 0xD, 0x1D9 }, + { 0x5, 0x1C, 0xB, 0x3, 0x2, 0xD, 0x1DF }, + { 0x5, 0x1C, 0xD, 0x3, 0x2, 0xD, 0x1E5 }, + { 0x5, 0x19, 0x6, 0x6, 0x1, 0x9, 0x1EB }, + { 0x5, 0x5, 0x4, 0x3, 0x2, 0xD, 0x1F1 }, + { 0x5, 0xD, 0x6, 0x6, 0x2, 0xD, 0x1F7 }, + { 0x5, 0x15, 0x4, 0x2, 0x2, 0xD, 0x85 }, + { 0x5, 0x15, 0x7, 0x6, 0x2, 0xD, 0x89 }, + { 0x5, 0x15, 0x9, 0x6, 0x2, 0xD, 0x95 }, + { 0x5, 0x15, 0xF, 0x6, 0x2, 0xD, 0xA1 }, + { 0x5, 0x15, 0xB, 0x6, 0x2, 0xD, 0xAD }, + { 0x5, 0x15, 0xD, 0x6, 0x2, 0xD, 0xB9 }, + { 0x5, 0x1, 0x4, 0x4, 0x2, 0xD, 0xC5 }, + { 0x5, 0x1, 0x6, 0xB, 0x2, 0xD, 0xCD }, + { 0x5, 0xD, 0x14, 0xB, 0x3, 0x9, 0xE3 }, + { 0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x137 }, + { 0x5, 0x1, 0x9, 0xB, 0x2, 0xD, 0x261 }, + { 0x5, 0x1, 0xB, 0x12, 0x4, 0xD, 0x277 }, + { 0x5, 0x4, 0x10, 0xC, 0x2, 0xD, 0x2BF }, + { 0x5, 0x18, 0x4, 0x7, 0x2, 0xD, 0x2D7 }, + { 0x5, 0x1C, 0x7, 0x3, 0x2, 0xD, 0x2E5 }, + { 0x5, 0x1C, 0x9, 0x3, 0x2, 0xD, 0x2EB }, + { 0x5, 0x1C, 0xF, 0x3, 0x2, 0xD, 0x2F1 }, + { 0x5, 0x1C, 0xB, 0x3, 0x2, 0xD, 0x2F7 }, + { 0x5, 0x1C, 0xD, 0x3, 0x2, 0xD, 0x2FD }, + { 0x5, 0x19, 0x6, 0x6, 0x1, 0x9, 0x303 }, + { 0x5, 0x5, 0x4, 0x3, 0x2, 0xD, 0x309 }, + { 0x5, 0xD, 0x6, 0x6, 0x2, 0xD, 0x30F } }; static const UnkStruct_ov61_0222C884 Unk_ov13_02229074[] = { - {0x4, 0x4, 0x5, 0xB, 0x2, 0xD, 0x9D}, - {0x4, 0x17, 0x5, 0x5, 0x2, 0xD, 0xB7}, - {0x4, 0xA, 0x10, 0x3, 0x2, 0xD, 0xE1}, - {0x4, 0xA, 0xD, 0x3, 0x2, 0xD, 0xE7}, - {0x4, 0x10, 0x8, 0xF, 0xA, 0xD, 0xED}, - {0x4, 0x6, 0xA, 0x8, 0x2, 0xD, 0x19B}, - {0x4, 0x5, 0x1, 0x9, 0x2, 0xD, 0x8B}, - {0x4, 0x14, 0x5, 0x2, 0x2, 0xD, 0xB3}, - {0x4, 0x1, 0x10, 0x8, 0x2, 0xD, 0xC1}, - {0x4, 0x1, 0xD, 0x8, 0x2, 0xD, 0xD1}, - {0x4, 0x1, 0x8, 0xC, 0x2, 0xD, 0x183}, - {0x4, 0x4, 0x5, 0xB, 0x2, 0xD, 0x1AB}, - {0x4, 0x17, 0x5, 0x5, 0x2, 0xD, 0x1C1}, - {0x4, 0xA, 0x10, 0x3, 0x2, 0xD, 0x1CB}, - {0x4, 0xA, 0xD, 0x3, 0x2, 0xD, 0x1D1}, - {0x4, 0x10, 0x8, 0xF, 0xA, 0xD, 0x1D7}, - {0x4, 0x6, 0xA, 0x8, 0x2, 0xD, 0x26D} + { 0x4, 0x4, 0x5, 0xB, 0x2, 0xD, 0x9D }, + { 0x4, 0x17, 0x5, 0x5, 0x2, 0xD, 0xB7 }, + { 0x4, 0xA, 0x10, 0x3, 0x2, 0xD, 0xE1 }, + { 0x4, 0xA, 0xD, 0x3, 0x2, 0xD, 0xE7 }, + { 0x4, 0x10, 0x8, 0xF, 0xA, 0xD, 0xED }, + { 0x4, 0x6, 0xA, 0x8, 0x2, 0xD, 0x19B }, + { 0x4, 0x5, 0x1, 0x9, 0x2, 0xD, 0x8B }, + { 0x4, 0x14, 0x5, 0x2, 0x2, 0xD, 0xB3 }, + { 0x4, 0x1, 0x10, 0x8, 0x2, 0xD, 0xC1 }, + { 0x4, 0x1, 0xD, 0x8, 0x2, 0xD, 0xD1 }, + { 0x4, 0x1, 0x8, 0xC, 0x2, 0xD, 0x183 }, + { 0x4, 0x4, 0x5, 0xB, 0x2, 0xD, 0x1AB }, + { 0x4, 0x17, 0x5, 0x5, 0x2, 0xD, 0x1C1 }, + { 0x4, 0xA, 0x10, 0x3, 0x2, 0xD, 0x1CB }, + { 0x4, 0xA, 0xD, 0x3, 0x2, 0xD, 0x1D1 }, + { 0x4, 0x10, 0x8, 0xF, 0xA, 0xD, 0x1D7 }, + { 0x4, 0x6, 0xA, 0x8, 0x2, 0xD, 0x26D } }; static const UnkStruct_ov61_0222C884 Unk_ov13_02228F24[] = { - {0x4, 0x5, 0x1, 0x9, 0x2, 0xD, 0x85}, - {0x4, 0x1, 0x6, 0xE, 0x5, 0x9, 0x97}, - {0x4, 0x11, 0x6, 0xE, 0x5, 0x9, 0xDD}, - {0x4, 0x1, 0xC, 0xE, 0x5, 0x9, 0x123}, - {0x4, 0x11, 0xC, 0xE, 0x5, 0x9, 0x169}, - {0x4, 0x9, 0x12, 0xE, 0x5, 0x9, 0x1AF} + { 0x4, 0x5, 0x1, 0x9, 0x2, 0xD, 0x85 }, + { 0x4, 0x1, 0x6, 0xE, 0x5, 0x9, 0x97 }, + { 0x4, 0x11, 0x6, 0xE, 0x5, 0x9, 0xDD }, + { 0x4, 0x1, 0xC, 0xE, 0x5, 0x9, 0x123 }, + { 0x4, 0x11, 0xC, 0xE, 0x5, 0x9, 0x169 }, + { 0x4, 0x9, 0x12, 0xE, 0x5, 0x9, 0x1AF } }; static const UnkStruct_ov61_0222C884 Unk_ov13_02229014[] = { - {0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x1}, - {0x5, 0x4, 0x5, 0xB, 0x2, 0xD, 0x13}, - {0x5, 0x14, 0x5, 0x2, 0x2, 0xD, 0x29}, - {0x5, 0x17, 0x5, 0x5, 0x2, 0xD, 0x2D}, - {0x5, 0x1, 0x10, 0x8, 0x2, 0xD, 0x5B}, - {0x5, 0x1, 0xD, 0x8, 0x2, 0xD, 0x6B}, - {0x5, 0xA, 0x10, 0x3, 0x2, 0xD, 0x7B}, - {0x5, 0xA, 0xD, 0x3, 0x2, 0xD, 0x81}, - {0x5, 0x10, 0x8, 0xF, 0xA, 0xD, 0x87}, - {0x5, 0x1, 0x8, 0xC, 0x2, 0xD, 0x11D}, - {0x5, 0x6, 0xA, 0x8, 0x2, 0xD, 0x135}, - {0x5, 0x7, 0x14, 0xC, 0x3, 0x9, 0x37} + { 0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x1 }, + { 0x5, 0x4, 0x5, 0xB, 0x2, 0xD, 0x13 }, + { 0x5, 0x14, 0x5, 0x2, 0x2, 0xD, 0x29 }, + { 0x5, 0x17, 0x5, 0x5, 0x2, 0xD, 0x2D }, + { 0x5, 0x1, 0x10, 0x8, 0x2, 0xD, 0x5B }, + { 0x5, 0x1, 0xD, 0x8, 0x2, 0xD, 0x6B }, + { 0x5, 0xA, 0x10, 0x3, 0x2, 0xD, 0x7B }, + { 0x5, 0xA, 0xD, 0x3, 0x2, 0xD, 0x81 }, + { 0x5, 0x10, 0x8, 0xF, 0xA, 0xD, 0x87 }, + { 0x5, 0x1, 0x8, 0xC, 0x2, 0xD, 0x11D }, + { 0x5, 0x6, 0xA, 0x8, 0x2, 0xD, 0x135 }, + { 0x5, 0x7, 0x14, 0xC, 0x3, 0x9, 0x37 } }; static const UnkStruct_ov61_0222C884 Unk_ov13_02228EFC[] = { - {0x4, 0x5, 0x1, 0x9, 0x2, 0xD, 0x8B}, - {0x4, 0x1, 0x6, 0xE, 0x5, 0x9, 0x9D}, - {0x4, 0x11, 0x6, 0xE, 0x5, 0x9, 0xE3}, - {0x4, 0x1, 0xC, 0xE, 0x5, 0x9, 0x129}, - {0x4, 0x11, 0xC, 0xE, 0x5, 0x9, 0x16F} + { 0x4, 0x5, 0x1, 0x9, 0x2, 0xD, 0x8B }, + { 0x4, 0x1, 0x6, 0xE, 0x5, 0x9, 0x9D }, + { 0x4, 0x11, 0x6, 0xE, 0x5, 0x9, 0xE3 }, + { 0x4, 0x1, 0xC, 0xE, 0x5, 0x9, 0x129 }, + { 0x4, 0x11, 0xC, 0xE, 0x5, 0x9, 0x16F } }; static const UnkStruct_ov61_0222C884 Unk_ov13_02228F84[] = { - {0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x1}, - {0x5, 0x4, 0x8, 0xB, 0x2, 0xD, 0x13}, - {0x5, 0x14, 0x8, 0x2, 0x2, 0xD, 0x29}, - {0x5, 0x17, 0x8, 0x5, 0x2, 0xD, 0x2D}, - {0x5, 0x2, 0xB, 0xC, 0x2, 0xD, 0x145}, - {0x5, 0x10, 0xB, 0xF, 0x6, 0xD, 0x15D}, - {0x5, 0x7, 0x14, 0xC, 0x3, 0x9, 0x37} + { 0x5, 0x5, 0x1, 0x9, 0x2, 0xD, 0x1 }, + { 0x5, 0x4, 0x8, 0xB, 0x2, 0xD, 0x13 }, + { 0x5, 0x14, 0x8, 0x2, 0x2, 0xD, 0x29 }, + { 0x5, 0x17, 0x8, 0x5, 0x2, 0xD, 0x2D }, + { 0x5, 0x2, 0xB, 0xC, 0x2, 0xD, 0x145 }, + { 0x5, 0x10, 0xB, 0xF, 0x6, 0xD, 0x15D }, + { 0x5, 0x7, 0x14, 0xC, 0x3, 0x9, 0x37 } }; static const u32 Unk_ov13_02228EC4[] = { @@ -192,7 +193,7 @@ static const u32 Unk_ov13_02228EB0[] = { 0x49 }; -void ov13_02221A88 (UnkStruct_ov13_022213F0 * param0) +void ov13_02221A88(UnkStruct_ov13_022213F0 *param0) { u32 v0; @@ -203,9 +204,9 @@ void ov13_02221A88 (UnkStruct_ov13_022213F0 * param0) ov13_02221AC4(param0, param0->unk_2076); } -void ov13_02221AC4 (UnkStruct_ov13_022213F0 * param0, u32 param1) +void ov13_02221AC4(UnkStruct_ov13_022213F0 *param0, u32 param1) { - const UnkStruct_ov61_0222C884 * v0; + const UnkStruct_ov61_0222C884 *v0; u8 v1; switch (param1) { @@ -255,12 +256,12 @@ void ov13_02221AC4 (UnkStruct_ov13_022213F0 * param0, u32 param1) } } -void ov13_02221BB0 (UnkStruct_ov13_022213F0 * param0) +void ov13_02221BB0(UnkStruct_ov13_022213F0 *param0) { sub_0201A928(param0->unk_206C, param0->unk_2070); } -void ov13_02221BC8 (UnkStruct_ov13_022213F0 * param0) +void ov13_02221BC8(UnkStruct_ov13_022213F0 *param0) { u32 v0; @@ -271,7 +272,7 @@ void ov13_02221BC8 (UnkStruct_ov13_022213F0 * param0) } } -void ov13_02221BF8 (UnkStruct_ov13_022213F0 * param0, u32 param1) +void ov13_02221BF8(UnkStruct_ov13_022213F0 *param0, u32 param1) { switch (param1) { case 0: @@ -305,12 +306,12 @@ void ov13_02221BF8 (UnkStruct_ov13_022213F0 * param0, u32 param1) } } -static void ov13_02221C54 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2, u16 param3, u8 param4, u8 param5) +static void ov13_02221C54(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2, u16 param3, u8 param4, u8 param5) { - Window * v0; - UnkStruct_ov13_02221ED0 * v1; - Strbuf* v2; - Strbuf* v3; + Window *v0; + UnkStruct_ov13_02221ED0 *v1; + Strbuf *v2; + Strbuf *v3; u32 v4; v0 = ¶m0->unk_206C[param1]; @@ -359,17 +360,17 @@ static void ov13_02221C54 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(v0); } -static void ov13_02221E08 (UnkStruct_ov13_022213F0 * param0, u32 param1, u16 param2, u8 param3, u8 param4) +static void ov13_02221E08(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param2, u8 param3, u8 param4) { - UnkStruct_ov13_02221ED0 * v0 = ¶m0->unk_04[param2]; + UnkStruct_ov13_02221ED0 *v0 = ¶m0->unk_04[param2]; sub_0200C648(param0->unk_1FA0, 1, v0->unk_16_0, 3, 0, ¶m0->unk_206C[param1], param3 + 8, param4); sub_0201A9A4(¶m0->unk_206C[param1]); } -static void ov13_02221E50 (UnkStruct_ov13_022213F0 * param0, u32 param1, u16 param2, u8 param3, u8 param4) +static void ov13_02221E50(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param2, u8 param3, u8 param4) { - UnkStruct_ov13_02221ED0 * v0 = ¶m0->unk_04[param2]; + UnkStruct_ov13_02221ED0 *v0 = ¶m0->unk_04[param2]; sub_0200C5BC(param0->unk_1FA0, v0->unk_10, 3, 1, ¶m0->unk_206C[param1], param3, param4); sub_0200C578(param0->unk_1FA0, 0, ¶m0->unk_206C[param1], param3 + 8 * 3, param4); @@ -377,9 +378,9 @@ static void ov13_02221E50 (UnkStruct_ov13_022213F0 * param0, u32 param1, u16 par sub_0201A9A4(¶m0->unk_206C[param1]); } -static void ov13_02221ED0 (UnkStruct_ov13_022213F0 * param0, u32 param1, u16 param2, u8 param3, u8 param4) +static void ov13_02221ED0(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param2, u8 param3, u8 param4) { - UnkStruct_ov13_02221ED0 * v0; + UnkStruct_ov13_02221ED0 *v0; u8 v1 = 1; u8 v2; @@ -409,11 +410,11 @@ static void ov13_02221ED0 (UnkStruct_ov13_022213F0 * param0, u32 param1, u16 par sub_0201A9A4(¶m0->unk_206C[param1]); } -static void ov13_02221FA8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) +static void ov13_02221FA8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) { - UnkStruct_ov13_02221ED0 * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov13_02221ED0 *v0; + Strbuf *v1; + Strbuf *v2; v0 = ¶m0->unk_04[param2]; v1 = Strbuf_Init(16, param0->unk_00->unk_0C); @@ -427,11 +428,11 @@ static void ov13_02221FA8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(¶m0->unk_206C[param1]); } -static void ov13_02222030 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) +static void ov13_02222030(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) { - UnkStruct_ov13_02221ED0 * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov13_02221ED0 *v0; + Strbuf *v1; + Strbuf *v2; v0 = ¶m0->unk_04[param2]; @@ -451,11 +452,11 @@ static void ov13_02222030 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(¶m0->unk_206C[param1]); } -static void ov13_022220CC (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2, u32 param3, u16 param4, u16 param5, u32 param6) +static void ov13_022220CC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2, u32 param3, u16 param4, u16 param5, u32 param6) { - Window * v0; - Strbuf* v1; - Strbuf* v2; + Window *v0; + Strbuf *v1; + Strbuf *v2; u32 v3; v0 = ¶m0->unk_206C[param2]; @@ -477,9 +478,9 @@ static void ov13_022220CC (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(v0); } -static void ov13_02222170 (UnkStruct_ov13_022213F0 * param0, u16 param1, u8 param2, u8 param3) +static void ov13_02222170(UnkStruct_ov13_022213F0 *param0, u16 param1, u8 param2, u8 param3) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 14); @@ -488,9 +489,9 @@ static void ov13_02222170 (UnkStruct_ov13_022213F0 * param0, u16 param1, u8 para sub_0201A9A4(¶m0->unk_206C[param1]); } -static void ov13_022221C8 (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_022221C8(UnkStruct_ov13_022213F0 *param0, u32 param1) { - Strbuf* v0; + Strbuf *v0; sub_0200E060(¶m0->unk_204C[0], 1, 1, 14); BGL_FillWindow(¶m0->unk_204C[0], 15); @@ -502,10 +503,10 @@ static void ov13_022221C8 (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(¶m0->unk_204C[0]); } -static void ov13_0222222C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) +static void ov13_0222222C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; v0 = ¶m0->unk_206C[param1]; @@ -517,11 +518,11 @@ static void ov13_0222222C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(v0); } -static void ov13_02222290 (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_02222290(UnkStruct_ov13_022213F0 *param0, u32 param1) { - UnkStruct_ov13_02221ED0 * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov13_02221ED0 *v0; + Strbuf *v1; + Strbuf *v2; u16 v3; u16 v4; @@ -570,11 +571,11 @@ static void ov13_02222290 (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(¶m0->unk_206C[12 + v4]); } -static void ov13_02222464 (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_02222464(UnkStruct_ov13_022213F0 *param0, u32 param1) { - UnkStruct_ov13_02221ED0 * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov13_02221ED0 *v0; + Strbuf *v1; + Strbuf *v2; u16 v3; u8 v4; u8 v5; @@ -602,11 +603,11 @@ static void ov13_02222464 (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(¶m0->unk_206C[5 + v3]); } -static void ov13_02222560 (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_02222560(UnkStruct_ov13_022213F0 *param0, u32 param1) { - UnkStruct_ov13_02221ED0 * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov13_02221ED0 *v0; + Strbuf *v1; + Strbuf *v2; u16 v3; u8 v4; u8 v5; @@ -634,11 +635,11 @@ static void ov13_02222560 (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(¶m0->unk_206C[6 + v3]); } -static void ov13_0222265C (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_0222265C(UnkStruct_ov13_022213F0 *param0, u32 param1) { - UnkStruct_ov13_02221ED0 * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov13_02221ED0 *v0; + Strbuf *v1; + Strbuf *v2; u16 v3; u8 v4; u8 v5; @@ -667,11 +668,11 @@ static void ov13_0222265C (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(¶m0->unk_206C[7 + v3]); } -static void ov13_0222275C (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_0222275C(UnkStruct_ov13_022213F0 *param0, u32 param1) { - UnkStruct_ov13_02221ED0 * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov13_02221ED0 *v0; + Strbuf *v1; + Strbuf *v2; u16 v3; u8 v4; u8 v5; @@ -699,11 +700,11 @@ static void ov13_0222275C (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(¶m0->unk_206C[8 + v3]); } -static void ov13_0222285C (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_0222285C(UnkStruct_ov13_022213F0 *param0, u32 param1) { - UnkStruct_ov13_02221ED0 * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov13_02221ED0 *v0; + Strbuf *v1; + Strbuf *v2; u16 v3; u8 v4; u8 v5; @@ -731,11 +732,11 @@ static void ov13_0222285C (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(¶m0->unk_206C[9 + v3]); } -static void ov13_0222295C (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1) { - UnkStruct_ov13_02221ED0 * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov13_02221ED0 *v0; + Strbuf *v1; + Strbuf *v2; u32 v3, v4; u16 v5; u16 v6; @@ -778,11 +779,11 @@ static void ov13_0222295C (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(¶m0->unk_206C[4 + v6]); } -static void ov13_02222AF4 (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_02222AF4(UnkStruct_ov13_022213F0 *param0, u32 param1) { - UnkStruct_ov13_02221ED0 * v0; - MessageLoader * v1; - Strbuf* v2; + UnkStruct_ov13_02221ED0 *v0; + MessageLoader *v1; + Strbuf *v2; u32 v3; v0 = ¶m0->unk_04[param1]; @@ -796,10 +797,10 @@ static void ov13_02222AF4 (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(¶m0->unk_206C[2 + v3]); } -static void ov13_02222B6C (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_02222B6C(UnkStruct_ov13_022213F0 *param0, u32 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_206C[param1]; v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 51); @@ -809,11 +810,11 @@ static void ov13_02222B6C (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(v0); } -static void ov13_02222BB4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) +static void ov13_02222BB4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) { - Window * v0; - Strbuf* v1; - Strbuf* v2; + Window *v0; + Strbuf *v1; + Strbuf *v2; u16 v3; u16 v4; @@ -844,10 +845,10 @@ static void ov13_02222BB4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(v0); } -static void ov13_02222C9C (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_02222C9C(UnkStruct_ov13_022213F0 *param0, u32 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_206C[param1]; v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 48); @@ -857,11 +858,11 @@ static void ov13_02222C9C (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(v0); } -static void ov13_02222CE4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) +static void ov13_02222CE4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) { - Window * v0; - Strbuf* v1; - Strbuf* v2; + Window *v0; + Strbuf *v1; + Strbuf *v2; u16 v3; u16 v4; @@ -892,11 +893,11 @@ static void ov13_02222CE4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(v0); } -static void ov13_02222DCC (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) +static void ov13_02222DCC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) { - MessageLoader * v0; - Window * v1; - Strbuf* v2; + MessageLoader *v0; + Window *v1; + Strbuf *v2; v1 = ¶m0->unk_206C[param1]; v0 = MessageLoader_Init(1, 26, 646, param0->unk_00->unk_0C); @@ -908,11 +909,11 @@ static void ov13_02222DCC (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(v1); } -static void ov13_02222E2C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) +static void ov13_02222E2C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) { - MessageLoader * v0; - Window * v1; - Strbuf* v2; + MessageLoader *v0; + Window *v1; + Strbuf *v2; u32 v3; u32 v4; @@ -929,10 +930,10 @@ static void ov13_02222E2C (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(v1); } -static void ov13_02222E94 (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_02222E94(UnkStruct_ov13_022213F0 *param0, u32 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u16 v2; u16 v3; @@ -946,10 +947,10 @@ static void ov13_02222E94 (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(v0); } -static void ov13_02222EF8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2) +static void ov13_02222EF8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_206C[param1]; @@ -973,11 +974,11 @@ static void ov13_02222EF8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(v0); } -static void ov13_02222F74 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 param2, u32 param3) +static void ov13_02222F74(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2, u32 param3) { - Window * v0; - Strbuf* v1; - Strbuf* v2; + Window *v0; + Strbuf *v1; + Strbuf *v2; u32 v3, v4; u32 v5; @@ -1012,10 +1013,10 @@ static void ov13_02222F74 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par sub_0201A9A4(v0); } -static void ov13_022230A8 (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_022230A8(UnkStruct_ov13_022213F0 *param0, u32 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; v0 = ¶m0->unk_206C[param1]; @@ -1033,10 +1034,10 @@ static void ov13_022230A8 (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(v0); } -void ov13_02223118 (UnkStruct_ov13_022213F0 * param0) +void ov13_02223118(UnkStruct_ov13_022213F0 *param0) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; if (param0->unk_2076 == 7) { v0 = ¶m0->unk_206C[8]; @@ -1053,11 +1054,11 @@ void ov13_02223118 (UnkStruct_ov13_022213F0 * param0) sub_0201A9A4(v0); } -static void ov13_0222317C (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_022236B8 * param1, u32 param2) +static void ov13_0222317C(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236B8 *param1, u32 param2) { - Window * v0; - Strbuf* v1; - Strbuf* v2; + Window *v0; + Strbuf *v1; + Strbuf *v2; u32 v3; v0 = ¶m0->unk_206C[param2]; @@ -1093,11 +1094,11 @@ static void ov13_0222317C (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_0222 sub_0201A9A4(v0); } -static void ov13_022232C8 (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_022236B8 * param1, u32 param2) +static void ov13_022232C8(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236B8 *param1, u32 param2) { - Window * v0; - Strbuf* v1; - Strbuf* v2; + Window *v0; + Strbuf *v1; + Strbuf *v2; u32 v3; v0 = ¶m0->unk_206C[param2]; @@ -1121,7 +1122,7 @@ static void ov13_022232C8 (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_0222 sub_0201A9A4(v0); } -static void ov13_0222339C (UnkStruct_ov13_022213F0 * param0) +static void ov13_0222339C(UnkStruct_ov13_022213F0 *param0) { s32 v0; @@ -1152,7 +1153,7 @@ static void ov13_0222339C (UnkStruct_ov13_022213F0 * param0) } } -void ov13_02223448 (UnkStruct_ov13_022213F0 * param0, u8 param1) +void ov13_02223448(UnkStruct_ov13_022213F0 *param0, u8 param1) { BGL_WindowColor(¶m0->unk_206C[0 + param1], 0, 56, 32, 24, 8); BGL_WindowColor(¶m0->unk_206C[0 + param1], 0, (48 + 16), 24, 64, 8); @@ -1161,14 +1162,14 @@ void ov13_02223448 (UnkStruct_ov13_022213F0 * param0, u8 param1) ov13_02221ED0(param0, 0 + param1, param1, (48 + 16), 24); } -void ov13_022234A8 (UnkStruct_ov13_022213F0 * param0, u8 param1) +void ov13_022234A8(UnkStruct_ov13_022213F0 *param0, u8 param1) { if (param0->unk_04[param1].unk_17_7 == 0) { ov13_02221E08(param0, 0 + param1, param1, 0, 32); } } -static void ov13_022234C8 (UnkStruct_ov13_022213F0 * param0) +static void ov13_022234C8(UnkStruct_ov13_022213F0 *param0) { BGL_FillWindow(¶m0->unk_206C[0], 0); BGL_FillWindow(¶m0->unk_206C[1], 0); @@ -1188,12 +1189,12 @@ static void ov13_022234C8 (UnkStruct_ov13_022213F0 * param0) } } -static void ov13_02223550 (UnkStruct_ov13_022213F0 * param0, u32 param1) +static void ov13_02223550(UnkStruct_ov13_022213F0 *param0, u32 param1) { - Window * v0; - UnkStruct_ov13_02221ED0 * v1; - Strbuf* v2; - Strbuf* v3; + Window *v0; + UnkStruct_ov13_02221ED0 *v1; + Strbuf *v2; + Strbuf *v3; u8 v4; u8 v5; u8 v6; @@ -1248,9 +1249,9 @@ static void ov13_02223550 (UnkStruct_ov13_022213F0 * param0, u32 param1) sub_0201A9A4(v0); } -static void ov13_022236B8 (UnkStruct_ov13_022213F0 * param0) +static void ov13_022236B8(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_022236B8 * v0; + UnkStruct_ov13_022236B8 *v0; u16 v1, v2; v2 = 6 * param0->unk_2071; @@ -1285,7 +1286,7 @@ static void ov13_022236B8 (UnkStruct_ov13_022213F0 * param0) param0->unk_2071 ^= 1; } -static void ov13_022237F8 (UnkStruct_ov13_022213F0 * param0) +static void ov13_022237F8(UnkStruct_ov13_022213F0 *param0) { u32 v0; @@ -1332,9 +1333,9 @@ static void ov13_022237F8 (UnkStruct_ov13_022213F0 * param0) param0->unk_2071 ^= 1; } -static void ov13_02223A10 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02223A10(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_022236B8 * v0; + UnkStruct_ov13_022236B8 *v0; u32 v1; v1 = 11 * param0->unk_2071; @@ -1368,9 +1369,9 @@ static void ov13_02223A10 (UnkStruct_ov13_022213F0 * param0) param0->unk_2071 ^= 1; } -static void ov13_02223B74 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02223B74(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_022236B8 * v0; + UnkStruct_ov13_022236B8 *v0; u32 v1; BGL_FillWindow(¶m0->unk_206C[0], 0); @@ -1410,7 +1411,7 @@ static void ov13_02223B74 (UnkStruct_ov13_022213F0 * param0) sub_0201A9A4(¶m0->unk_206C[5]); } -static void ov13_02223C9C (UnkStruct_ov13_022213F0 * param0) +static void ov13_02223C9C(UnkStruct_ov13_022213F0 *param0) { BGL_FillWindow(¶m0->unk_206C[0], 0); BGL_FillWindow(¶m0->unk_206C[2], 0); @@ -1432,7 +1433,7 @@ static void ov13_02223C9C (UnkStruct_ov13_022213F0 * param0) ov13_02222E94(param0, 9); if (param0->unk_00->unk_34 < 4) { - UnkStruct_ov13_022236B8 * v0 = ¶m0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34]; + UnkStruct_ov13_022236B8 *v0 = ¶m0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34]; ov13_022220CC(param0, v0->unk_00, 1, Unk_ov13_02228EB0[param0->unk_00->unk_34], 0, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)))); ov13_02222BB4(param0, 6, v0->unk_06); @@ -1454,9 +1455,9 @@ static void ov13_02223C9C (UnkStruct_ov13_022213F0 * param0) ov13_022230A8(param0, 11); } -static void ov13_02223E68 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02223E68(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_022236B8 * v0; + UnkStruct_ov13_022236B8 *v0; u32 v1; BGL_FillWindow(¶m0->unk_206C[0], 0); @@ -1488,13 +1489,13 @@ static void ov13_02223E68 (UnkStruct_ov13_022213F0 * param0) sub_0201A9A4(¶m0->unk_206C[4]); } -void ov13_02223F5C (UnkStruct_ov13_022213F0 * param0, u16 param1, u16 param2) +void ov13_02223F5C(UnkStruct_ov13_022213F0 *param0, u16 param1, u16 param2) { - UnkStruct_ov13_022236B8 * v0 = ¶m0->unk_04[param0->unk_00->unk_11].unk_30[param2]; + UnkStruct_ov13_022236B8 *v0 = ¶m0->unk_04[param0->unk_00->unk_11].unk_30[param2]; ov13_022232C8(param0, v0, param1); } -static void ov13_02223F7C (UnkStruct_ov13_022213F0 * param0) +static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0) { BGL_FillWindow(¶m0->unk_206C[0], 0); BGL_FillWindow(¶m0->unk_206C[2], 0); @@ -1508,7 +1509,7 @@ static void ov13_02223F7C (UnkStruct_ov13_022213F0 * param0) ov13_02222170(param0, 2, 0, 0); { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 57); @@ -1522,7 +1523,7 @@ static void ov13_02223F7C (UnkStruct_ov13_022213F0 * param0) } if (param0->unk_00->unk_34 < 4) { - UnkStruct_ov13_022236B8 * v2 = ¶m0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34]; + UnkStruct_ov13_022236B8 *v2 = ¶m0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34]; ov13_022220CC(param0, v2->unk_00, 1, Unk_ov13_02228EB0[param0->unk_00->unk_34], 0, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)))); ov13_02222E2C(param0, 5, v2->unk_00); @@ -1538,25 +1539,25 @@ static void ov13_02223F7C (UnkStruct_ov13_022213F0 * param0) ov13_022230A8(param0, 6); } -void ov13_022240E0 (UnkStruct_ov13_022213F0 * param0) +void ov13_022240E0(UnkStruct_ov13_022213F0 *param0) { sub_0200E060(¶m0->unk_204C[1], 1, 1, 14); BGL_FillWindow(¶m0->unk_204C[1], 15); ov13_02224108(param0); } -void ov13_02224108 (UnkStruct_ov13_022213F0 * param0) +void ov13_02224108(UnkStruct_ov13_022213F0 *param0) { sub_02002AC8(1); param0->unk_2077 = PrintStringSimple(¶m0->unk_204C[1], 1, param0->unk_1FAC, 0, 0, BattleSystem_TextSpeed(param0->unk_00->unk_08), NULL); } -void ov13_02224144 (UnkStruct_ov13_022213F0 * param0) +void ov13_02224144(UnkStruct_ov13_022213F0 *param0) { - Pokemon * v0; - UnkStruct_ov13_0221FC20 * v1; - void * v2; - Strbuf* v3; + Pokemon *v0; + UnkStruct_ov13_0221FC20 *v1; + void *v2; + Strbuf *v3; u16 v4; u8 v5; u8 v6; @@ -1653,11 +1654,11 @@ void ov13_02224144 (UnkStruct_ov13_022213F0 * param0) Heap_FreeToHeap(v2); } -void ov13_0222449C (UnkStruct_ov13_022213F0 * param0) +void ov13_0222449C(UnkStruct_ov13_022213F0 *param0) { - Pokemon * v0; - UnkStruct_ov13_0221FC20 * v1; - Strbuf* v2; + Pokemon *v0; + UnkStruct_ov13_0221FC20 *v1; + Strbuf *v2; v1 = param0->unk_00; v0 = BattleSystem_PartyPokemon(v1->unk_08, v1->unk_28, v1->unk_2C[v1->unk_11]); diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 758796fe4c..693bb23403 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -1,115 +1,116 @@ +#include "overlay013/ov13_02224500.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" -#include "battle/struct_ov16_0226DC24_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020F1DB8.h" + +#include "battle/ov16_0223DF00.h" +#include "battle/ov16_0226DB7C.h" +#include "battle/struct_ov16_0226DC24_decl.h" +#include "overlay013/ov13_02228A38.h" #include "overlay013/struct_ov13_022213F0.h" #include "overlay013/struct_ov13_02221ED0.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_02241308.h" -#include "narc.h" -#include "unk_0200C6E4.h" #include "gx_layers.h" +#include "item.h" #include "move_table.h" -#include "pokemon_icon.h" +#include "narc.h" #include "party.h" +#include "pokemon_icon.h" +#include "pokemon_summary_app.h" +#include "unk_0200C6E4.h" #include "unk_0207C908.h" -#include "item.h" #include "unk_0207E0B8.h" #include "unk_0208C098.h" -#include "pokemon_summary_app.h" -#include "overlay013/ov13_02224500.h" -#include "overlay013/ov13_02228A38.h" -#include "battle/ov16_0223DF00.h" -#include "battle/ov16_0226DB7C.h" -static void ov13_0222453C(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224588(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224670(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224848(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224720(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224798(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224948(UnkStruct_ov13_022213F0 * param0); -static void ov13_022249CC(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224C14(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224CB0(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224D08(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224DA0(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224E78(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224F3C(UnkStruct_ov13_022213F0 * param0); -static void ov13_02224FA8(UnkStruct_ov13_022213F0 * param0); -static void ov13_0222506C(UnkStruct_ov13_022213F0 * param0); -static void ov13_022250D8(UnkStruct_ov13_022213F0 * param0); -static void ov13_02225150(UnkStruct_ov13_022213F0 * param0); -static void ov13_022251B4(UnkStruct_ov13_022213F0 * param0); -static void ov13_02225248(UnkStruct_ov13_022213F0 * param0); -static void ov13_02225420(UnkStruct_ov13_022213F0 * param0); -static void ov13_0222554C(UnkStruct_ov13_022213F0 * param0); -static void ov13_022255B8(UnkStruct_ov13_022213F0 * param0); +static void ov13_0222453C(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224588(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224670(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224848(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224720(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224798(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224948(UnkStruct_ov13_022213F0 *param0); +static void ov13_022249CC(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224C14(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224CB0(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224D08(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224DA0(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224E78(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224F3C(UnkStruct_ov13_022213F0 *param0); +static void ov13_02224FA8(UnkStruct_ov13_022213F0 *param0); +static void ov13_0222506C(UnkStruct_ov13_022213F0 *param0); +static void ov13_022250D8(UnkStruct_ov13_022213F0 *param0); +static void ov13_02225150(UnkStruct_ov13_022213F0 *param0); +static void ov13_022251B4(UnkStruct_ov13_022213F0 *param0); +static void ov13_02225248(UnkStruct_ov13_022213F0 *param0); +static void ov13_02225420(UnkStruct_ov13_022213F0 *param0); +static void ov13_0222554C(UnkStruct_ov13_022213F0 *param0); +static void ov13_022255B8(UnkStruct_ov13_022213F0 *param0); static const int Unk_ov13_02229514[][5] = { - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB007, 0xB007, 0xB007, 0xB007, 0x1}, - {0xB008, 0xB007, 0xB007, 0xB007, 0x1}, - {0xB009, 0xB007, 0xB007, 0xB007, 0x1}, - {0xB00A, 0xB007, 0xB007, 0xB007, 0x1}, - {0xB00B, 0xB007, 0xB007, 0xB007, 0x1}, - {0xB00C, 0xB007, 0xB007, 0xB007, 0x1}, - {0xB00D, 0xB008, 0xB008, 0xB008, 0x1}, - {0xB00D, 0xB008, 0xB008, 0xB008, 0x1}, - {0xB00D, 0xB008, 0xB008, 0xB008, 0x1}, - {0xB00D, 0xB008, 0xB008, 0xB008, 0x1}, - {0xB00D, 0xB008, 0xB008, 0xB008, 0x1}, - {0xB00D, 0xB008, 0xB008, 0xB008, 0x1}, - {0xB00E, 0xB009, 0xB009, 0xB009, 0x0}, - {0xB00F, 0xB009, 0xB009, 0xB009, 0x0}, - {0xB010, 0xB009, 0xB009, 0xB009, 0x0}, - {0xB011, 0xB009, 0xB009, 0xB009, 0x0}, - {0xB012, 0xB009, 0xB009, 0xB009, 0x0}, - {0xB013, 0xB009, 0xB009, 0xB009, 0x0}, - {0xB014, 0xB009, 0xB009, 0xB009, 0x0}, - {0xB015, 0xB009, 0xB009, 0xB009, 0x0}, - {0xB017, 0xB00B, 0xB00B, 0xB00B, 0x0}, - {0xB017, 0xB00B, 0xB00B, 0xB00B, 0x0}, - {0xB017, 0xB00B, 0xB00B, 0xB00B, 0x0}, - {0xB017, 0xB00B, 0xB00B, 0xB00B, 0x0}, - {0xB017, 0xB00B, 0xB00B, 0xB00B, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0}, - {0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0} + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB007, 0xB007, 0xB007, 0xB007, 0x1 }, + { 0xB008, 0xB007, 0xB007, 0xB007, 0x1 }, + { 0xB009, 0xB007, 0xB007, 0xB007, 0x1 }, + { 0xB00A, 0xB007, 0xB007, 0xB007, 0x1 }, + { 0xB00B, 0xB007, 0xB007, 0xB007, 0x1 }, + { 0xB00C, 0xB007, 0xB007, 0xB007, 0x1 }, + { 0xB00D, 0xB008, 0xB008, 0xB008, 0x1 }, + { 0xB00D, 0xB008, 0xB008, 0xB008, 0x1 }, + { 0xB00D, 0xB008, 0xB008, 0xB008, 0x1 }, + { 0xB00D, 0xB008, 0xB008, 0xB008, 0x1 }, + { 0xB00D, 0xB008, 0xB008, 0xB008, 0x1 }, + { 0xB00D, 0xB008, 0xB008, 0xB008, 0x1 }, + { 0xB00E, 0xB009, 0xB009, 0xB009, 0x0 }, + { 0xB00F, 0xB009, 0xB009, 0xB009, 0x0 }, + { 0xB010, 0xB009, 0xB009, 0xB009, 0x0 }, + { 0xB011, 0xB009, 0xB009, 0xB009, 0x0 }, + { 0xB012, 0xB009, 0xB009, 0xB009, 0x0 }, + { 0xB013, 0xB009, 0xB009, 0xB009, 0x0 }, + { 0xB014, 0xB009, 0xB009, 0xB009, 0x0 }, + { 0xB015, 0xB009, 0xB009, 0xB009, 0x0 }, + { 0xB017, 0xB00B, 0xB00B, 0xB00B, 0x0 }, + { 0xB017, 0xB00B, 0xB00B, 0xB00B, 0x0 }, + { 0xB017, 0xB00B, 0xB00B, 0xB00B, 0x0 }, + { 0xB017, 0xB00B, 0xB00B, 0xB00B, 0x0 }, + { 0xB017, 0xB00B, 0xB00B, 0xB00B, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 }, + { 0xB016, 0xB00A, 0xB00A, 0xB00A, 0x0 } }; static const int Unk_ov13_02229404[][2] = { - {0x10, 0x10}, - {0x90, 0x18}, - {0x10, 0x40}, - {0x90, 0x48}, - {0x10, 0x70}, - {0x90, 0x78} + { 0x10, 0x10 }, + { 0x90, 0x18 }, + { 0x10, 0x40 }, + { 0x90, 0x48 }, + { 0x10, 0x70 }, + { 0x90, 0x78 } }; static const int Unk_ov13_02229434[][2] = { - {0x1C, 0x28}, - {0x9C, 0x30}, - {0x1C, 0x58}, - {0x9C, 0x60}, - {0x1C, 0x88}, - {0x9C, 0x90} + { 0x1C, 0x28 }, + { 0x9C, 0x30 }, + { 0x1C, 0x58 }, + { 0x9C, 0x60 }, + { 0x1C, 0x88 }, + { 0x9C, 0x90 } }; static const int Unk_ov13_0222921C[2] = { @@ -128,15 +129,15 @@ static const int Unk_ov13_0222924C[2] = { }; static const int Unk_ov13_022292C4[][2] = { - {0x82, 0x10}, - {0xA4, 0x10} + { 0x82, 0x10 }, + { 0xA4, 0x10 } }; static const int Unk_ov13_02229324[][2] = { - {0x18, 0x50}, - {0x98, 0x50}, - {0x18, 0x80}, - {0x98, 0x80} + { 0x18, 0x50 }, + { 0x98, 0x50 }, + { 0x18, 0x80 }, + { 0x98, 0x80 } }; static const int Unk_ov13_02229244[2] = { @@ -150,8 +151,8 @@ static const int Unk_ov13_02229254[2] = { }; static const int Unk_ov13_022292A4[][2] = { - {0x82, 0x10}, - {0xA4, 0x10} + { 0x82, 0x10 }, + { 0xA4, 0x10 } }; static const int Unk_ov13_02229264[2] = { @@ -165,8 +166,8 @@ static const int Unk_ov13_02229224[2] = { }; static const int Unk_ov13_022292B4[][2] = { - {0x82, 0x10}, - {0xA4, 0x10} + { 0x82, 0x10 }, + { 0xA4, 0x10 } }; static const int Unk_ov13_0222922C[2] = { @@ -185,16 +186,16 @@ static const int Unk_ov13_02229234[2] = { }; static const int Unk_ov13_02229294[][2] = { - {0x82, 0x10}, - {0xA4, 0x10} + { 0x82, 0x10 }, + { 0xA4, 0x10 } }; static const int Unk_ov13_022293DC[][2] = { - {0x18, 0x50}, - {0x98, 0x50}, - {0x18, 0x80}, - {0x98, 0x80}, - {0x58, 0xB0} + { 0x18, 0x50 }, + { 0x98, 0x50 }, + { 0x18, 0x80 }, + { 0x98, 0x80 }, + { 0x58, 0xB0 } }; static const int Unk_ov13_0222927C[2] = { @@ -203,8 +204,8 @@ static const int Unk_ov13_0222927C[2] = { }; static const int Unk_ov13_02229284[][2] = { - {0x82, 0x10}, - {0xA4, 0x10} + { 0x82, 0x10 }, + { 0xA4, 0x10 } }; static const int Unk_ov13_0222926C[2] = { @@ -222,7 +223,7 @@ static const int Unk_ov13_0222925C[2] = { 0x48 }; -void ov13_02224500 (UnkStruct_ov13_022213F0 * param0) +void ov13_02224500(UnkStruct_ov13_022213F0 *param0) { ov13_0222453C(param0); ov13_02224588(param0); @@ -235,10 +236,10 @@ void ov13_02224500 (UnkStruct_ov13_022213F0 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov13_0222453C (UnkStruct_ov13_022213F0 * param0) +static void ov13_0222453C(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov104_02241308 v0 = {18, 6, 6, 6, 0, 0}; - SpriteRenderer * v1 = ov16_0223E010(param0->unk_00->unk_08); + UnkStruct_ov104_02241308 v0 = { 18, 6, 6, 6, 0, 0 }; + SpriteRenderer *v1 = ov16_0223E010(param0->unk_00->unk_08); param0->unk_1FB0 = sub_0200C704(v1); @@ -246,11 +247,11 @@ static void ov13_0222453C (UnkStruct_ov13_022213F0 * param0) sub_0200CB30(v1, param0->unk_1FB0, &v0); } -static void ov13_02224588 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224588(UnkStruct_ov13_022213F0 *param0) { - SpriteRenderer * v0; + SpriteRenderer *v0; u32 v1; - NARC * v2; + NARC *v2; v2 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, param0->unk_00->unk_0C); v0 = ov16_0223E010(param0->unk_00->unk_08); @@ -270,10 +271,10 @@ static void ov13_02224588 (UnkStruct_ov13_022213F0 * param0) NARC_dtor(v2); } -static void ov13_02224670 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224670(UnkStruct_ov13_022213F0 *param0) { - SpriteRenderer * v0 = ov16_0223E010(param0->unk_00->unk_08); - NARC * v1; + SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); + NARC *v1; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PST_GRA, param0->unk_00->unk_0C); @@ -284,9 +285,9 @@ static void ov13_02224670 (UnkStruct_ov13_022213F0 * param0) NARC_dtor(v1); } -static void ov13_02224720 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224720(UnkStruct_ov13_022213F0 *param0) { - SpriteRenderer * v0; + SpriteRenderer *v0; u32 v1; v0 = ov16_0223E010(param0->unk_00->unk_08); @@ -301,11 +302,11 @@ static void ov13_02224720 (UnkStruct_ov13_022213F0 * param0) sub_0207CAC4(v0, param0->unk_1FB0, NNS_G2D_VRAM_TYPE_2DSUB, 0, 45077); } -static void ov13_02224798 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224798(UnkStruct_ov13_022213F0 *param0) { - SpriteRenderer * v0; + SpriteRenderer *v0; u32 v1; - NARC * v2; + NARC *v2; v2 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, param0->unk_00->unk_0C); v0 = ov16_0223E010(param0->unk_00->unk_08); @@ -317,9 +318,9 @@ static void ov13_02224798 (UnkStruct_ov13_022213F0 * param0) NARC_dtor(v2); } -static void ov13_02224848 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224848(UnkStruct_ov13_022213F0 *param0) { - SpriteRenderer * v0 = ov16_0223E010(param0->unk_00->unk_08); + SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); sub_0200CD7C(param0->unk_1E4, 3, v0, param0->unk_1FB0, 72, 27, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 45067); sub_0200CE0C(v0, param0->unk_1FB0, 72, 25, 0, 45067); @@ -327,10 +328,10 @@ static void ov13_02224848 (UnkStruct_ov13_022213F0 * param0) sub_0200CBDC(v0, param0->unk_1FB0, 72, 26, 0, NNS_G2D_VRAM_TYPE_2DSUB, 45079); } -static CellActorData * ov13_022248D8 (UnkStruct_ov13_022213F0 * param0, u32 param1) +static CellActorData *ov13_022248D8(UnkStruct_ov13_022213F0 *param0, u32 param1) { SpriteTemplate v0; - SpriteRenderer * v1; + SpriteRenderer *v1; v1 = ov16_0223E010(param0->unk_00->unk_08); @@ -351,7 +352,7 @@ static CellActorData * ov13_022248D8 (UnkStruct_ov13_022213F0 * param0, u32 para return SpriteActor_LoadResources(v1, param0->unk_1FB0, &v0); } -static void ov13_02224948 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224948(UnkStruct_ov13_022213F0 *param0) { u32 v0; @@ -362,9 +363,9 @@ static void ov13_02224948 (UnkStruct_ov13_022213F0 * param0) ov13_022249CC(param0); } -void ov13_02224970 (UnkStruct_ov13_022213F0 * param0) +void ov13_02224970(UnkStruct_ov13_022213F0 *param0) { - SpriteRenderer * v0; + SpriteRenderer *v0; u32 v1; v0 = ov16_0223E010(param0->unk_00->unk_08); @@ -377,13 +378,13 @@ void ov13_02224970 (UnkStruct_ov13_022213F0 * param0) sub_0200D0B0(v0, param0->unk_1FB0); } -static void ov13_022249AC (CellActorData * param0, const int param1, const int param2) +static void ov13_022249AC(CellActorData *param0, const int param1, const int param2) { SpriteActor_EnableObject(param0, 1); SpriteActor_SetSpritePositionXY(param0, param1, param2); } -static void ov13_022249CC (UnkStruct_ov13_022213F0 * param0) +static void ov13_022249CC(UnkStruct_ov13_022213F0 *param0) { s32 v0; @@ -396,23 +397,23 @@ static void ov13_022249CC (UnkStruct_ov13_022213F0 * param0) } } -static void ov13_02224A0C (UnkStruct_ov13_022213F0 * param0, CellActorData * param1, u32 param2, u8 param3) +static void ov13_02224A0C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1, u32 param2, u8 param3) { - SpriteRenderer * v0 = ov16_0223E010(param0->unk_00->unk_08); + SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); sub_0200D948(v0, param0->unk_1FB0, sub_0207C944(), sub_0207C908(param3), 1, param2); sub_0200D41C(param1, sub_0207C92C(param3) + 4); } -static void ov13_02224A5C (UnkStruct_ov13_022213F0 * param0, CellActorData * param1, u32 param2) +static void ov13_02224A5C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1, u32 param2) { - SpriteRenderer * v0 = ov16_0223E010(param0->unk_00->unk_08); + SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_08); sub_0200D948(v0, param0->unk_1FB0, sub_0207CAC0(), sub_0207CA90(param2), 1, 45077); sub_0200D41C(param1, sub_0207CAA8(param2) + 4); } -static void ov13_02224AB0 (u16 param0, CellActorData * param1, const int param2, const int param3) +static void ov13_02224AB0(u16 param0, CellActorData *param1, const int param2, const int param3) { if (param0 == 7) { return; @@ -422,7 +423,7 @@ static void ov13_02224AB0 (u16 param0, CellActorData * param1, const int param2, ov13_022249AC(param1, param2, param3); } -static void ov13_02224AD4 (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_02221ED0 * param1, const int * param2) +static void ov13_02224AD4(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_02221ED0 *param1, const int *param2) { ov13_02224A0C(param0, param0->unk_1FB4[19], 45070, param1->unk_14); ov13_022249AC(param0->unk_1FB4[19], param2[0], param2[1]); @@ -433,7 +434,7 @@ static void ov13_02224AD4 (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_0222 } } -static void ov13_02224B28 (u16 param0, CellActorData * param1, const int param2, const int param3) +static void ov13_02224B28(u16 param0, CellActorData *param1, const int param2, const int param3) { if (param0 == 0) { return; @@ -448,7 +449,7 @@ static void ov13_02224B28 (u16 param0, CellActorData * param1, const int param2, ov13_022249AC(param1, param2, param3); } -static void ov13_02224B5C (u8 param0, CellActorData * param1, const int param2, const int param3) +static void ov13_02224B5C(u8 param0, CellActorData *param1, const int param2, const int param3) { if (param0 == 0) { return; @@ -458,7 +459,7 @@ static void ov13_02224B5C (u8 param0, CellActorData * param1, const int param2, ov13_022249AC(param1, param2, param3); } -void ov13_02224B7C (UnkStruct_ov13_022213F0 * param0, u32 param1) +void ov13_02224B7C(UnkStruct_ov13_022213F0 *param0, u32 param1) { u32 v0; @@ -500,7 +501,7 @@ void ov13_02224B7C (UnkStruct_ov13_022213F0 * param0, u32 param1) } } -static void ov13_02224C14 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224C14(UnkStruct_ov13_022213F0 *param0) { s32 v0; @@ -516,9 +517,9 @@ static void ov13_02224C14 (UnkStruct_ov13_022213F0 * param0) } } -static void ov13_02224CB0 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224CB0(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0; + UnkStruct_ov13_02221ED0 *v0; u16 v1; v0 = ¶m0->unk_04[param0->unk_00->unk_11]; @@ -528,9 +529,9 @@ static void ov13_02224CB0 (UnkStruct_ov13_022213F0 * param0) ov13_02224B5C(v0->unk_2D, param0->unk_1FB4[32 + param0->unk_00->unk_11], Unk_ov13_0222921C[0] + 16, Unk_ov13_0222921C[1] + 8); } -static void ov13_02224D08 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224D08(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0; + UnkStruct_ov13_02221ED0 *v0; u16 v1; v0 = ¶m0->unk_04[param0->unk_00->unk_11]; @@ -543,9 +544,9 @@ static void ov13_02224D08 (UnkStruct_ov13_022213F0 * param0) ov13_02224B28(v0->unk_1A, param0->unk_1FB4[6], 20, 132); } -static void ov13_02224DA0 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224DA0(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0; + UnkStruct_ov13_02221ED0 *v0; u32 v1; v0 = ¶m0->unk_04[param0->unk_00->unk_11]; @@ -566,9 +567,9 @@ static void ov13_02224DA0 (UnkStruct_ov13_022213F0 * param0) } } -static void ov13_02224E78 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224E78(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0 = ¶m0->unk_04[param0->unk_00->unk_11]; + UnkStruct_ov13_02221ED0 *v0 = ¶m0->unk_04[param0->unk_00->unk_11]; ov13_022249AC(param0->unk_1FB4[7 + param0->unk_00->unk_11], Unk_ov13_02229264[0], Unk_ov13_02229264[1]); ov13_02224AB0(v0->unk_17_3, param0->unk_1FB4[13 + param0->unk_00->unk_11], Unk_ov13_02229224[0], Unk_ov13_02229224[1]); @@ -580,9 +581,9 @@ static void ov13_02224E78 (UnkStruct_ov13_022213F0 * param0) ov13_022249AC(param0->unk_1FB4[26], Unk_ov13_02229214[0], Unk_ov13_02229214[1]); } -static void ov13_02224F3C (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224F3C(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0; + UnkStruct_ov13_02221ED0 *v0; u16 v1; v0 = ¶m0->unk_04[param0->unk_00->unk_11]; @@ -594,9 +595,9 @@ static void ov13_02224F3C (UnkStruct_ov13_022213F0 * param0) ov13_022252E8(param0); } -static void ov13_02224FA8 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02224FA8(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0 = ¶m0->unk_04[param0->unk_00->unk_11]; + UnkStruct_ov13_02221ED0 *v0 = ¶m0->unk_04[param0->unk_00->unk_11]; ov13_022249AC(param0->unk_1FB4[7 + param0->unk_00->unk_11], Unk_ov13_0222927C[0], Unk_ov13_0222927C[1]); ov13_02224AD4(param0, v0, &Unk_ov13_02229284[0][0]); @@ -613,9 +614,9 @@ static void ov13_02224FA8 (UnkStruct_ov13_022213F0 * param0) ov13_022249AC(param0->unk_1FB4[26], Unk_ov13_02229274[0], Unk_ov13_02229274[1]); } -static void ov13_0222506C (UnkStruct_ov13_022213F0 * param0) +static void ov13_0222506C(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0; + UnkStruct_ov13_02221ED0 *v0; u16 v1; v0 = ¶m0->unk_04[param0->unk_00->unk_11]; @@ -627,9 +628,9 @@ static void ov13_0222506C (UnkStruct_ov13_022213F0 * param0) ov13_022252E8(param0); } -static void ov13_022250D8 (UnkStruct_ov13_022213F0 * param0) +static void ov13_022250D8(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0 = ¶m0->unk_04[param0->unk_00->unk_11]; + UnkStruct_ov13_02221ED0 *v0 = ¶m0->unk_04[param0->unk_00->unk_11]; ov13_022249AC(param0->unk_1FB4[7 + param0->unk_00->unk_11], Unk_ov13_0222927C[0], Unk_ov13_0222927C[1]); ov13_022249AC(param0->unk_1FB4[21 + param0->unk_00->unk_34], Unk_ov13_0222925C[0], Unk_ov13_0222925C[1]); @@ -638,9 +639,9 @@ static void ov13_022250D8 (UnkStruct_ov13_022213F0 * param0) ov13_02225420(param0); } -static void ov13_02225150 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02225150(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0 = ¶m0->unk_04[param0->unk_00->unk_11]; + UnkStruct_ov13_02221ED0 *v0 = ¶m0->unk_04[param0->unk_00->unk_11]; ov13_022249AC(param0->unk_1FB4[7 + param0->unk_00->unk_11], Unk_ov13_0222927C[0], Unk_ov13_0222927C[1]); ov13_02224B28(v0->unk_1A, param0->unk_1FB4[0 + param0->unk_00->unk_11], Unk_ov13_0222927C[0] + 8, Unk_ov13_0222927C[1] + 8); @@ -649,9 +650,9 @@ static void ov13_02225150 (UnkStruct_ov13_022213F0 * param0) ov13_02225420(param0); } -static void ov13_022251B4 (UnkStruct_ov13_022213F0 * param0) +static void ov13_022251B4(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0; + UnkStruct_ov13_02221ED0 *v0; u16 v1; v0 = ¶m0->unk_04[param0->unk_00->unk_11]; @@ -671,9 +672,9 @@ static void ov13_022251B4 (UnkStruct_ov13_022213F0 * param0) } } -static void ov13_02225248 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02225248(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0; + UnkStruct_ov13_02221ED0 *v0; u16 v1; v0 = ¶m0->unk_04[param0->unk_00->unk_11]; @@ -693,7 +694,7 @@ static void ov13_02225248 (UnkStruct_ov13_022213F0 * param0) } } -void ov13_022252E8 (UnkStruct_ov13_022213F0 * param0) +void ov13_022252E8(UnkStruct_ov13_022213F0 *param0) { if (param0->unk_2073_0 == 0) { ov13_022251B4(param0); @@ -702,7 +703,7 @@ void ov13_022252E8 (UnkStruct_ov13_022213F0 * param0) } } -static void ov13_02225304 (CellActorData * param0, u8 param1) +static void ov13_02225304(CellActorData *param0, u8 param1) { if (sub_0200D37C(param0) == param1) { return; @@ -712,7 +713,7 @@ static void ov13_02225304 (CellActorData * param0, u8 param1) sub_0200D364(param0, param1); } -static u8 ov13_02225324 (UnkStruct_ov13_02221ED0 * param0) +static u8 ov13_02225324(UnkStruct_ov13_02221ED0 *param0) { if (param0->unk_10 == 0) { return 0; @@ -736,7 +737,7 @@ static u8 ov13_02225324 (UnkStruct_ov13_02221ED0 * param0) return 0; } -void ov13_0222537C (UnkStruct_ov13_022213F0 * param0) +void ov13_0222537C(UnkStruct_ov13_022213F0 *param0) { u16 v0; u16 v1; @@ -753,7 +754,7 @@ void ov13_0222537C (UnkStruct_ov13_022213F0 * param0) } } -static s16 ov13_022253DC (u32 param0, s16 param1, s16 param2) +static s16 ov13_022253DC(u32 param0, s16 param1, s16 param2) { u32 v0; @@ -772,9 +773,9 @@ static s16 ov13_022253DC (u32 param0, s16 param1, s16 param2) return param2 + (s16)v0; } -static void ov13_02225420 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02225420(UnkStruct_ov13_022213F0 *param0) { - UnkStruct_ov13_02221ED0 * v0; + UnkStruct_ov13_02221ED0 *v0; u16 v1; v0 = ¶m0->unk_04[param0->unk_00->unk_11]; @@ -792,10 +793,10 @@ static void ov13_02225420 (UnkStruct_ov13_022213F0 * param0) ov13_022249AC(param0->unk_1FB4[31], ov13_022253DC(v0->unk_2C, 123, 143), ov13_022253DC(v0->unk_2C, 16, 24)); } -static void ov13_0222554C (UnkStruct_ov13_022213F0 * param0) +static void ov13_0222554C(UnkStruct_ov13_022213F0 *param0) { - SpriteRenderer * v0; - UnkStruct_ov16_0226DC24 * v1; + SpriteRenderer *v0; + UnkStruct_ov16_0226DC24 *v1; v0 = ov16_0223E010(param0->unk_00->unk_08); ov16_0226DB7C(v0, param0->unk_1FB0, param0->unk_1E4, param0->unk_00->unk_0C, 45080, 45068, 45068, 45068); @@ -804,80 +805,80 @@ static void ov13_0222554C (UnkStruct_ov13_022213F0 * param0) ov13_02228A64(param0->unk_2084, v1); } -static void ov13_022255B8 (UnkStruct_ov13_022213F0 * param0) +static void ov13_022255B8(UnkStruct_ov13_022213F0 *param0) { ov16_0226DCA8(ov13_02228A58(param0->unk_2084)); ov16_0226DBFC(param0->unk_1FB0, 45080, 45068, 45068, 45068); } static const ByteFlagSet Unk_ov13_02229464[] = { - {0x8, 0x8, 0x78, 0x28, 0x6, 0x2, 0x6, 0x1}, - {0x88, 0x10, 0xF8, 0x30, 0x4, 0x3, 0x0, 0x2}, - {0x8, 0x38, 0x78, 0x58, 0x0, 0x4, 0x1, 0x3}, - {0x88, 0x40, 0xF8, 0x60, 0x1, 0x5, 0x2, 0x4}, - {0x8, 0x68, 0x78, 0x88, 0x2, 0x1, 0x3, 0x5}, - {0x88, 0x70, 0xF8, 0x90, 0x3, 0x6, 0x4, 0x6}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x5, 0x0, 0x5, 0x0} + { 0x8, 0x8, 0x78, 0x28, 0x6, 0x2, 0x6, 0x1 }, + { 0x88, 0x10, 0xF8, 0x30, 0x4, 0x3, 0x0, 0x2 }, + { 0x8, 0x38, 0x78, 0x58, 0x0, 0x4, 0x1, 0x3 }, + { 0x88, 0x40, 0xF8, 0x60, 0x1, 0x5, 0x2, 0x4 }, + { 0x8, 0x68, 0x78, 0x88, 0x2, 0x1, 0x3, 0x5 }, + { 0x88, 0x70, 0xF8, 0x90, 0x3, 0x6, 0x4, 0x6 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x5, 0x0, 0x5, 0x0 } }; static const ByteFlagSet Unk_ov13_02229344[] = { - {0x10, 0x10, 0xF0, 0x88, 0x0, 0x81, 0x0, 0x0}, - {0x8, 0xA0, 0x60, 0xB8, 0x0, 0x1, 0x1, 0x2}, - {0x70, 0xA0, 0xC8, 0xB8, 0x0, 0x2, 0x1, 0x3}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x0, 0x3, 0x2, 0x3} + { 0x10, 0x10, 0xF0, 0x88, 0x0, 0x81, 0x0, 0x0 }, + { 0x8, 0xA0, 0x60, 0xB8, 0x0, 0x1, 0x1, 0x2 }, + { 0x70, 0xA0, 0xC8, 0xB8, 0x0, 0x2, 0x1, 0x3 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x0, 0x3, 0x2, 0x3 } }; static const ByteFlagSet Unk_ov13_02229304[] = { - {0x8, 0xA0, 0x20, 0xB8, 0x0, 0x0, 0x0, 0x1}, - {0x30, 0xA0, 0x48, 0xB8, 0x1, 0x1, 0x0, 0x2}, - {0x68, 0xA0, 0xC0, 0xB8, 0x2, 0x2, 0x1, 0x3}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x3, 0x3, 0x2, 0x3} + { 0x8, 0xA0, 0x20, 0xB8, 0x0, 0x0, 0x0, 0x1 }, + { 0x30, 0xA0, 0x48, 0xB8, 0x1, 0x1, 0x0, 0x2 }, + { 0x68, 0xA0, 0xC0, 0xB8, 0x2, 0x2, 0x1, 0x3 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x3, 0x3, 0x2, 0x3 } }; static const ByteFlagSet Unk_ov13_022294D4[] = { - {0x8, 0x38, 0x78, 0x58, 0x0, 0x2, 0x0, 0x1}, - {0x88, 0x38, 0xF8, 0x58, 0x1, 0x3, 0x0, 0x1}, - {0x8, 0x68, 0x78, 0x88, 0x0, 0x84, 0x2, 0x3}, - {0x88, 0x68, 0xF8, 0x88, 0x1, 0x87, 0x2, 0x3}, - {0x8, 0xA0, 0x20, 0xB8, 0x2, 0x4, 0x4, 0x5}, - {0x30, 0xA0, 0x48, 0xB8, 0x2, 0x5, 0x4, 0x6}, - {0x68, 0xA0, 0xC0, 0xB8, 0x3, 0x6, 0x5, 0x7}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x3, 0x7, 0x6, 0x7} + { 0x8, 0x38, 0x78, 0x58, 0x0, 0x2, 0x0, 0x1 }, + { 0x88, 0x38, 0xF8, 0x58, 0x1, 0x3, 0x0, 0x1 }, + { 0x8, 0x68, 0x78, 0x88, 0x0, 0x84, 0x2, 0x3 }, + { 0x88, 0x68, 0xF8, 0x88, 0x1, 0x87, 0x2, 0x3 }, + { 0x8, 0xA0, 0x20, 0xB8, 0x2, 0x4, 0x4, 0x5 }, + { 0x30, 0xA0, 0x48, 0xB8, 0x2, 0x5, 0x4, 0x6 }, + { 0x68, 0xA0, 0xC0, 0xB8, 0x3, 0x6, 0x5, 0x7 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x3, 0x7, 0x6, 0x7 } }; static const ByteFlagSet Unk_ov13_02229364[] = { - {0x5C, 0x9D, 0x7C, 0xA5, 0x0, 0x2, 0x0, 0x1}, - {0x84, 0x9D, 0xA4, 0xA5, 0x1, 0x3, 0x0, 0x4}, - {0x5C, 0xAD, 0x7C, 0xB5, 0x0, 0x2, 0x2, 0x3}, - {0x84, 0xAD, 0xA4, 0xB5, 0x1, 0x3, 0x2, 0x4}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x4, 0x4, 0x83, 0x4} + { 0x5C, 0x9D, 0x7C, 0xA5, 0x0, 0x2, 0x0, 0x1 }, + { 0x84, 0x9D, 0xA4, 0xA5, 0x1, 0x3, 0x0, 0x4 }, + { 0x5C, 0xAD, 0x7C, 0xB5, 0x0, 0x2, 0x2, 0x3 }, + { 0x84, 0xAD, 0xA4, 0xB5, 0x1, 0x3, 0x2, 0x4 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x4, 0x4, 0x83, 0x4 } }; static const ByteFlagSet Unk_ov13_0222949C[] = { - {0x8, 0x38, 0x78, 0x58, 0x5, 0x2, 0x0, 0x1}, - {0x88, 0x38, 0xF8, 0x58, 0x5, 0x3, 0x0, 0x1}, - {0x8, 0x68, 0x78, 0x88, 0x0, 0x4, 0x2, 0x3}, - {0x88, 0x68, 0xF8, 0x88, 0x1, 0x6, 0x2, 0x3}, - {0x48, 0x98, 0xB8, 0xB8, 0x2, 0x4, 0x4, 0x6}, - {0xC0, 0x8, 0xF8, 0x18, 0x5, 0x81, 0x0, 0x5}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x3, 0x6, 0x4, 0x6} + { 0x8, 0x38, 0x78, 0x58, 0x5, 0x2, 0x0, 0x1 }, + { 0x88, 0x38, 0xF8, 0x58, 0x5, 0x3, 0x0, 0x1 }, + { 0x8, 0x68, 0x78, 0x88, 0x0, 0x4, 0x2, 0x3 }, + { 0x88, 0x68, 0xF8, 0x88, 0x1, 0x6, 0x2, 0x3 }, + { 0x48, 0x98, 0xB8, 0xB8, 0x2, 0x4, 0x4, 0x6 }, + { 0xC0, 0x8, 0xF8, 0x18, 0x5, 0x81, 0x0, 0x5 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x3, 0x6, 0x4, 0x6 } }; static const ByteFlagSet Unk_ov13_022292D4[] = { - {0x8, 0xA0, 0xC8, 0xB8, 0x1, 0x0, 0x0, 0x2}, - {0xC0, 0x8, 0xF8, 0x18, 0x1, 0x82, 0x0, 0x1}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x1, 0x2, 0x0, 0x2} + { 0x8, 0xA0, 0xC8, 0xB8, 0x1, 0x0, 0x0, 0x2 }, + { 0xC0, 0x8, 0xF8, 0x18, 0x1, 0x82, 0x0, 0x1 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x1, 0x2, 0x0, 0x2 } }; static const ByteFlagSet Unk_ov13_022293B4[] = { - {0x8, 0x38, 0x78, 0x58, 0x0, 0x2, 0x0, 0x1}, - {0x88, 0x38, 0xF8, 0x58, 0x1, 0x3, 0x0, 0x1}, - {0x8, 0x68, 0x78, 0x88, 0x0, 0x4, 0x2, 0x3}, - {0x88, 0x68, 0xF8, 0x88, 0x1, 0x4, 0x2, 0x3}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x83, 0x4, 0x4, 0x4} + { 0x8, 0x38, 0x78, 0x58, 0x0, 0x2, 0x0, 0x1 }, + { 0x88, 0x38, 0xF8, 0x58, 0x1, 0x3, 0x0, 0x1 }, + { 0x8, 0x68, 0x78, 0x88, 0x0, 0x4, 0x2, 0x3 }, + { 0x88, 0x68, 0xF8, 0x88, 0x1, 0x4, 0x2, 0x3 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x83, 0x4, 0x4, 0x4 } }; -static const ByteFlagSet * const Unk_ov13_0222938C[] = { +static const ByteFlagSet *const Unk_ov13_0222938C[] = { Unk_ov13_02229464, Unk_ov13_02229344, Unk_ov13_02229304, @@ -890,7 +891,7 @@ static const ByteFlagSet * const Unk_ov13_0222938C[] = { Unk_ov13_022292D4 }; -static void ov13_022255EC (UnkStruct_ov13_022213F0 * param0) +static void ov13_022255EC(UnkStruct_ov13_022213F0 *param0) { if (param0->unk_2073_4 == 0) { ov13_02228AC8(param0->unk_2084, 0x5f); @@ -899,7 +900,7 @@ static void ov13_022255EC (UnkStruct_ov13_022213F0 * param0) } } -static void ov13_02225614 (UnkStruct_ov13_022213F0 * param0) +static void ov13_02225614(UnkStruct_ov13_022213F0 *param0) { if (param0->unk_2073_4 == 0) { ov13_02228AC8(param0->unk_2084, 5); @@ -908,7 +909,7 @@ static void ov13_02225614 (UnkStruct_ov13_022213F0 * param0) } } -void ov13_0222563C (UnkStruct_ov13_022213F0 * param0, u8 param1) +void ov13_0222563C(UnkStruct_ov13_022213F0 *param0, u8 param1) { ov13_02228A9C(param0->unk_2084, Unk_ov13_0222938C[param1]); @@ -939,7 +940,7 @@ void ov13_0222563C (UnkStruct_ov13_022213F0 * param0, u8 param1) } } -void ov13_022256E8 (UnkStruct_ov13_022213F0 * param0) +void ov13_022256E8(UnkStruct_ov13_022213F0 *param0) { ov13_02228A60(param0->unk_2084, 0); ov13_02228A90(param0->unk_2084); diff --git a/src/overlay013/ov13_02225710.c b/src/overlay013/ov13_02225710.c index fc8587ec1a..503a22e110 100644 --- a/src/overlay013/ov13_02225710.c +++ b/src/overlay013/ov13_02225710.c @@ -1,14 +1,15 @@ +#include "overlay013/ov13_02225710.h" + #include #include +#include "overlay013/ov13_0221FC20.h" #include "overlay013/struct_ov13_022213F0.h" +#include "heap.h" #include "unk_02002F38.h" #include "unk_0200C6E4.h" -#include "heap.h" #include "unk_02018340.h" -#include "overlay013/ov13_0221FC20.h" -#include "overlay013/ov13_02225710.h" typedef struct { u8 unk_00; @@ -17,44 +18,44 @@ typedef struct { u8 unk_03; } UnkStruct_ov13_02229924; -static void ov13_02225AF0(u16 * param0, u16 * param1, u8 param2, u8 param3, u8 param4, u8 param5); -static u8 ov13_02226484(UnkStruct_ov13_022213F0 * param0); +static void ov13_02225AF0(u16 *param0, u16 *param1, u8 param2, u8 param3, u8 param4, u8 param5); +static u8 ov13_02226484(UnkStruct_ov13_022213F0 *param0); static const UnkStruct_ov13_02229924 Unk_ov13_02229924[] = { - {0x0, 0x0, 0x10, 0x6}, - {0x10, 0x1, 0x10, 0x6}, - {0x0, 0x6, 0x10, 0x6}, - {0x10, 0x7, 0x10, 0x6}, - {0x0, 0xC, 0x10, 0x6}, - {0x10, 0xD, 0x10, 0x6}, - {0x1B, 0x13, 0x5, 0x5}, - {0x1, 0x1, 0x1E, 0x11}, - {0x0, 0x13, 0xD, 0x5}, - {0xC, 0x13, 0xD, 0x5}, - {0xD, 0x13, 0xD, 0x5}, - {0xC, 0x13, 0xD, 0x5}, - {0x0, 0x13, 0x5, 0x5}, - {0x5, 0x13, 0x5, 0x5}, - {0x0, 0x6, 0x10, 0x6}, - {0x10, 0x6, 0x10, 0x6}, - {0x0, 0xC, 0x10, 0x6}, - {0x10, 0xC, 0x10, 0x6}, - {0x17, 0x0, 0x9, 0x4}, - {0x0, 0x6, 0x10, 0x6}, - {0x10, 0x6, 0x10, 0x6}, - {0x0, 0xC, 0x10, 0x6}, - {0x10, 0xC, 0x10, 0x6}, - {0x0, 0x6, 0x10, 0x6}, - {0x10, 0x6, 0x10, 0x6}, - {0x0, 0xC, 0x10, 0x6}, - {0x10, 0xC, 0x10, 0x6}, - {0x8, 0x12, 0x10, 0x6}, - {0x0, 0x13, 0x1A, 0x5}, - {0x0, 0x13, 0x1A, 0x5}, - {0xB, 0x13, 0x5, 0x2}, - {0x10, 0x13, 0x5, 0x2}, - {0xB, 0x15, 0x5, 0x2}, - {0x10, 0x15, 0x5, 0x2} + { 0x0, 0x0, 0x10, 0x6 }, + { 0x10, 0x1, 0x10, 0x6 }, + { 0x0, 0x6, 0x10, 0x6 }, + { 0x10, 0x7, 0x10, 0x6 }, + { 0x0, 0xC, 0x10, 0x6 }, + { 0x10, 0xD, 0x10, 0x6 }, + { 0x1B, 0x13, 0x5, 0x5 }, + { 0x1, 0x1, 0x1E, 0x11 }, + { 0x0, 0x13, 0xD, 0x5 }, + { 0xC, 0x13, 0xD, 0x5 }, + { 0xD, 0x13, 0xD, 0x5 }, + { 0xC, 0x13, 0xD, 0x5 }, + { 0x0, 0x13, 0x5, 0x5 }, + { 0x5, 0x13, 0x5, 0x5 }, + { 0x0, 0x6, 0x10, 0x6 }, + { 0x10, 0x6, 0x10, 0x6 }, + { 0x0, 0xC, 0x10, 0x6 }, + { 0x10, 0xC, 0x10, 0x6 }, + { 0x17, 0x0, 0x9, 0x4 }, + { 0x0, 0x6, 0x10, 0x6 }, + { 0x10, 0x6, 0x10, 0x6 }, + { 0x0, 0xC, 0x10, 0x6 }, + { 0x10, 0xC, 0x10, 0x6 }, + { 0x0, 0x6, 0x10, 0x6 }, + { 0x10, 0x6, 0x10, 0x6 }, + { 0x0, 0xC, 0x10, 0x6 }, + { 0x10, 0xC, 0x10, 0x6 }, + { 0x8, 0x12, 0x10, 0x6 }, + { 0x0, 0x13, 0x1A, 0x5 }, + { 0x0, 0x13, 0x1A, 0x5 }, + { 0xB, 0x13, 0x5, 0x2 }, + { 0x10, 0x13, 0x5, 0x2 }, + { 0xB, 0x15, 0x5, 0x2 }, + { 0x10, 0x15, 0x5, 0x2 } }; static const u8 Unk_ov13_02229838[] = { @@ -192,7 +193,7 @@ static const u8 Unk_ov13_02229848[] = { 0xFF }; -static const u8 * const Unk_ov13_0222989C[] = { +static const u8 *const Unk_ov13_0222989C[] = { Unk_ov13_02229838, Unk_ov13_02229830, Unk_ov13_02229864, @@ -253,7 +254,7 @@ static const u8 Unk_ov13_0222987C[] = { 0x2 }; -void ov13_02225710 (UnkStruct_ov13_022213F0 * param0, u16 * param1) +void ov13_02225710(UnkStruct_ov13_022213F0 *param0, u16 *param1) { ov13_02225AF0(param0->unk_1E8[0], param1, 0, 0, 16, 6); ov13_02225AF0(param0->unk_1E8[1], param1, 0, (0 + 6), 16, 6); @@ -298,7 +299,7 @@ void ov13_02225710 (UnkStruct_ov13_022213F0 * param0, u16 * param1) ov13_02225AF0(param0->unk_1F20[2], param1, 10, 59, 5, 2); } -void ov13_02225A3C (UnkStruct_ov13_022213F0 * param0, u16 * param1) +void ov13_02225A3C(UnkStruct_ov13_022213F0 *param0, u16 *param1) { ov13_02225AF0(param0->unk_C48[0], param1, 0, 0, 30, 17); ov13_02225AF0(param0->unk_C48[1], param1, 0, (0 + 17), 30, 17); @@ -307,10 +308,10 @@ void ov13_02225A3C (UnkStruct_ov13_022213F0 * param0, u16 * param1) ov13_02225AF0(param0->unk_183C[0], param1, 0, 51, 16, 6); ov13_02225AF0(param0->unk_183C[1], param1, (0 + 16), 51, 16, 6); ov13_02225AF0(param0->unk_183C[2], param1, 0, (51 + 6), 16, 6); - ov13_02225AF0(param0->unk_183C[3], param1, ((0 + 16)), ((51 + 6)), 16, 6); + ov13_02225AF0(param0->unk_183C[3], param1, (0 + 16), (51 + 6), 16, 6); } -static void ov13_02225AF0 (u16 * param0, u16 * param1, u8 param2, u8 param3, u8 param4, u8 param5) +static void ov13_02225AF0(u16 *param0, u16 *param1, u8 param2, u8 param3, u8 param4, u8 param5) { u16 v0, v1; @@ -321,7 +322,7 @@ static void ov13_02225AF0 (u16 * param0, u16 * param1, u8 param2, u8 param3, u8 } } -static u16 * ov13_02225B40 (UnkStruct_ov13_022213F0 * param0, u8 param1, u8 param2, u8 param3) +static u16 *ov13_02225B40(UnkStruct_ov13_022213F0 *param0, u8 param1, u8 param2, u8 param3) { switch (param1) { case 0: @@ -377,9 +378,9 @@ static u16 * ov13_02225B40 (UnkStruct_ov13_022213F0 * param0, u8 param1, u8 para return NULL; } -static void ov13_02225C4C (UnkStruct_ov13_022213F0 * param0, u16 * param1, u8 param2, u8 param3, u8 param4) +static void ov13_02225C4C(UnkStruct_ov13_022213F0 *param0, u16 *param1, u8 param2, u8 param3, u8 param4) { - u16 * v0; + u16 *v0; u8 v1, v2; u8 v3, v4; @@ -431,9 +432,9 @@ static void ov13_02225C4C (UnkStruct_ov13_022213F0 * param0, u16 * param1, u8 pa } } -static void ov13_02225D8C (UnkStruct_ov13_022213F0 * param0, u8 param1, u8 param2, u8 param3) +static void ov13_02225D8C(UnkStruct_ov13_022213F0 *param0, u8 param1, u8 param2, u8 param3) { - u16 * v0 = Heap_AllocFromHeap(param0->unk_00->unk_0C, Unk_ov13_02229924[param1].unk_02 * Unk_ov13_02229924[param1].unk_03 * 2); + u16 *v0 = Heap_AllocFromHeap(param0->unk_00->unk_0C, Unk_ov13_02229924[param1].unk_02 * Unk_ov13_02229924[param1].unk_03 * 2); ov13_02225C4C(param0, v0, param1, param2, param3); @@ -442,9 +443,9 @@ static void ov13_02225D8C (UnkStruct_ov13_022213F0 * param0, u8 param1, u8 param Heap_FreeToHeap(v0); } -static void ov13_02225E08 (UnkStruct_ov13_022213F0 * param0, u8 param1, u8 param2) +static void ov13_02225E08(UnkStruct_ov13_022213F0 *param0, u8 param1, u8 param2) { - const u8 * v0; + const u8 *v0; u16 v1; u8 v2, v3; @@ -487,7 +488,7 @@ static void ov13_02225E08 (UnkStruct_ov13_022213F0 * param0, u8 param1, u8 param } } -static void ov13_02225EB8 (UnkStruct_ov13_022213F0 * param0, u8 param1, u8 param2) +static void ov13_02225EB8(UnkStruct_ov13_022213F0 *param0, u8 param1, u8 param2) { switch (param1) { case 0: @@ -526,7 +527,7 @@ static void ov13_02225EB8 (UnkStruct_ov13_022213F0 * param0, u8 param1, u8 param } } -void ov13_02225FCC (UnkStruct_ov13_022213F0 * param0, u8 param1) +void ov13_02225FCC(UnkStruct_ov13_022213F0 *param0, u8 param1) { param0->unk_1F9F_4 = 0; @@ -542,7 +543,7 @@ void ov13_02225FCC (UnkStruct_ov13_022213F0 * param0, u8 param1) param0->unk_1F9F_7 = 1; } -void ov13_0222601C (UnkStruct_ov13_022213F0 * param0) +void ov13_0222601C(UnkStruct_ov13_022213F0 *param0) { if (param0->unk_1F9F_7 == 0) { return; @@ -573,7 +574,7 @@ void ov13_0222601C (UnkStruct_ov13_022213F0 * param0) } } -void ov13_022260EC (UnkStruct_ov13_022213F0 * param0, u8 param1) +void ov13_022260EC(UnkStruct_ov13_022213F0 *param0, u8 param1) { u16 v0, v1; @@ -695,7 +696,7 @@ void ov13_022260EC (UnkStruct_ov13_022213F0 * param0, u8 param1) } } -void ov13_02226444 (UnkStruct_ov13_022213F0 * param0, u8 param1) +void ov13_02226444(UnkStruct_ov13_022213F0 *param0, u8 param1) { if (param1 == 3) { sub_02002FBC(param0->unk_1E4, ¶m0->unk_1F5C[16], 1, 12 * 16, 0x20); @@ -704,7 +705,7 @@ void ov13_02226444 (UnkStruct_ov13_022213F0 * param0, u8 param1) } } -static u8 ov13_02226484 (UnkStruct_ov13_022213F0 * param0) +static u8 ov13_02226484(UnkStruct_ov13_022213F0 *param0) { u16 v0, v1; @@ -723,7 +724,7 @@ static u8 ov13_02226484 (UnkStruct_ov13_022213F0 * param0) return 0; } -void ov13_022264C4 (UnkStruct_ov13_022213F0 * param0) +void ov13_022264C4(UnkStruct_ov13_022213F0 *param0) { if (ov13_022213F0(param0, param0->unk_00->unk_11) == 2) { ov13_02225D8C(param0, 0 + param0->unk_00->unk_11, 0, 1); diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 6d3d5ab12f..8998040f29 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -1,114 +1,111 @@ +#include "overlay013/ov13_022264F4.h" + #include #include -#include "core_sys.h" - +#include "struct_decls/battle_system.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" -#include "struct_decls/battle_system.h" -#include "touch_screen.h" +#include "battle/battle_lib.h" +#include "battle/ov16_0223DF00.h" +#include "battle/ov16_0226DE44.h" +#include "overlay013/ov13_02227288.h" +#include "overlay013/ov13_02227A4C.h" +#include "overlay013/ov13_02227BDC.h" +#include "overlay013/ov13_02228128.h" +#include "overlay013/ov13_02228A38.h" #include "overlay013/struct_ov13_022264F4.h" #include "overlay013/struct_ov13_02227244.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "bag.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200679C.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "party.h" -#include "item.h" -#include "bag.h" -#include "overlay013/ov13_022264F4.h" -#include "overlay013/ov13_02227288.h" -#include "overlay013/ov13_02227A4C.h" -#include "overlay013/ov13_02227BDC.h" -#include "overlay013/ov13_02228128.h" -#include "overlay013/ov13_02228A38.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_lib.h" -#include "battle/ov16_0226DE44.h" -static void ov13_02226590(SysTask * param0, void * param1); -static u8 ov13_0222668C(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226760(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226838(UnkStruct_ov13_02227244 * param0); -static u8 ov13_022269C0(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226C48(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226C54(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226C60(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226948(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226C6C(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226C7C(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226C94(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226CBC(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226D94(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226CD4(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226CFC(SysTask * param0, UnkStruct_ov13_02227244 * param1); -static void ov13_02226ED0(UnkStruct_ov13_02227244 * param0); -static void ov13_02226F9C(BGL * param0); -static void ov13_02226FC4(UnkStruct_ov13_02227244 * param0); -static void ov13_022270B8(UnkStruct_ov13_02227244 * param0); -static void ov13_022270F8(UnkStruct_ov13_02227244 * param0); -static u8 ov13_02226A5C(UnkStruct_ov13_02227244 * param0); -static void ov13_02227118(UnkStruct_ov13_02227244 * param0, u8 param1); -static void ov13_022271D0(UnkStruct_ov13_02227244 * param0, u8 param1); -static int ov13_02227238(UnkStruct_ov13_02227244 * param0, const TouchScreenRect *rect); -static void ov13_02227260(BattleSystem * param0, u16 param1, u16 param2, u32 param3); +static void ov13_02226590(SysTask *param0, void *param1); +static u8 ov13_0222668C(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226760(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226838(UnkStruct_ov13_02227244 *param0); +static u8 ov13_022269C0(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226C48(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226C54(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226C60(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226948(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226C6C(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226C7C(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226C94(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226CBC(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226D94(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226CD4(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226CFC(SysTask *param0, UnkStruct_ov13_02227244 *param1); +static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0); +static void ov13_02226F9C(BGL *param0); +static void ov13_02226FC4(UnkStruct_ov13_02227244 *param0); +static void ov13_022270B8(UnkStruct_ov13_02227244 *param0); +static void ov13_022270F8(UnkStruct_ov13_02227244 *param0); +static u8 ov13_02226A5C(UnkStruct_ov13_02227244 *param0); +static void ov13_02227118(UnkStruct_ov13_02227244 *param0, u8 param1); +static void ov13_022271D0(UnkStruct_ov13_02227244 *param0, u8 param1); +static int ov13_02227238(UnkStruct_ov13_02227244 *param0, const TouchScreenRect *rect); +static void ov13_02227260(BattleSystem *param0, u16 param1, u16 param2, u32 param3); static const TouchScreenRect Unk_ov13_02229A1C[] = { - {0x8, 0x4F, 0x0, 0x7F}, - {0x50, 0x97, 0x0, 0x7F}, - {0x8, 0x4F, 0x80, 0xFF}, - {0x50, 0x97, 0x80, 0xFF}, - {0x98, 0xBF, 0x0, 0xCF}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x8, 0x4F, 0x0, 0x7F }, + { 0x50, 0x97, 0x0, 0x7F }, + { 0x8, 0x4F, 0x80, 0xFF }, + { 0x50, 0x97, 0x80, 0xFF }, + { 0x98, 0xBF, 0x0, 0xCF }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov13_02229A38[] = { - {0x8, 0x37, 0x0, 0x7F}, - {0x8, 0x37, 0x80, 0xFF}, - {0x38, 0x67, 0x0, 0x7F}, - {0x38, 0x67, 0x80, 0xFF}, - {0x68, 0x97, 0x0, 0x7F}, - {0x68, 0x97, 0x80, 0xFF}, - {0x98, 0xBF, 0x0, 0x27}, - {0x98, 0xBF, 0x28, 0x4F}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x8, 0x37, 0x0, 0x7F }, + { 0x8, 0x37, 0x80, 0xFF }, + { 0x38, 0x67, 0x0, 0x7F }, + { 0x38, 0x67, 0x80, 0xFF }, + { 0x68, 0x97, 0x0, 0x7F }, + { 0x68, 0x97, 0x80, 0xFF }, + { 0x98, 0xBF, 0x0, 0x27 }, + { 0x98, 0xBF, 0x28, 0x4F }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov13_022299AC[] = { - {0x98, 0xBF, 0x0, 0xCF}, - {0x98, 0xBF, 0xD8, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x98, 0xBF, 0x0, 0xCF }, + { 0x98, 0xBF, 0xD8, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; -void ov13_022264F4 (UnkStruct_ov13_022264F4 * param0) +void ov13_022264F4(UnkStruct_ov13_022264F4 *param0) { - UnkStruct_ov13_02227244 * v0; + UnkStruct_ov13_02227244 *v0; v0 = SysTask_GetParam(SysTask_StartAndAllocateParam(ov13_02226590, sizeof(UnkStruct_ov13_02227244), 100, param0->unk_0C)); memset(v0, 0, sizeof(UnkStruct_ov13_02227244)); @@ -119,7 +116,7 @@ void ov13_022264F4 (UnkStruct_ov13_022264F4 * param0) v0->unk_114A = 0; { - UnkStruct_0207D99C * v1; + UnkStruct_0207D99C *v1; u8 v2; v1 = BattleSystem_BagCursor(param0->unk_00); @@ -139,9 +136,9 @@ void ov13_022264F4 (UnkStruct_ov13_022264F4 * param0) } } -static void ov13_02226590 (SysTask * param0, void * param1) +static void ov13_02226590(SysTask *param0, void *param1) { - UnkStruct_ov13_02227244 * v0 = (UnkStruct_ov13_02227244 *)param1; + UnkStruct_ov13_02227244 *v0 = (UnkStruct_ov13_02227244 *)param1; switch (v0->unk_114A) { case 0: @@ -196,7 +193,7 @@ static void ov13_02226590 (SysTask * param0, void * param1) sub_0200C7EC(v0->unk_30C); } -static u8 ov13_0222668C (UnkStruct_ov13_02227244 * param0) +static u8 ov13_0222668C(UnkStruct_ov13_02227244 *param0) { G2S_BlendNone(); @@ -231,7 +228,7 @@ static u8 ov13_0222668C (UnkStruct_ov13_02227244 * param0) return 1; } -static u8 ov13_02226760 (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226760(UnkStruct_ov13_02227244 *param0) { if (sub_0200384C(param0->unk_08) != 0) { return 1; @@ -282,7 +279,7 @@ static u8 ov13_02226760 (UnkStruct_ov13_02227244 * param0) return 1; } -static u8 ov13_02226838 (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226838(UnkStruct_ov13_02227244 *param0) { { int v0 = ov13_02227238(param0, Unk_ov13_02229A38); @@ -341,7 +338,7 @@ static u8 ov13_02226838 (UnkStruct_ov13_02227244 * param0) return 2; } -static u8 ov13_02226948 (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226948(UnkStruct_ov13_02227244 *param0) { s8 v0 = param0->unk_00->unk_2C[param0->unk_114D]; @@ -364,7 +361,7 @@ static u8 ov13_02226948 (UnkStruct_ov13_02227244 * param0) return 2; } -static u8 ov13_022269C0 (UnkStruct_ov13_02227244 * param0) +static u8 ov13_022269C0(UnkStruct_ov13_02227244 *param0) { { int v0 = ov13_02227238(param0, Unk_ov13_022299AC); @@ -397,17 +394,17 @@ static u8 ov13_022269C0 (UnkStruct_ov13_02227244 * param0) return 3; } -static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226A5C(UnkStruct_ov13_02227244 *param0) { - UnkStruct_ov13_022264F4 * v0 = param0->unk_00; + UnkStruct_ov13_022264F4 *v0 = param0->unk_00; if (param0->unk_114D == 3) { int v1 = ov13_02227244(param0); u32 v2 = Item_LoadParam(v0->unk_1C, 7, v0->unk_0C); if ((v0->unk_18 != 0) && (v0->unk_1C != 55) && (v2 != 3)) { - Pokemon * v3; - Strbuf* v4; + Pokemon *v3; + Strbuf *v4; v3 = BattleSystem_PartyPokemon(v0->unk_00, v0->unk_10, v1); v4 = MessageLoader_GetNewStrbuf(param0->unk_10, 46); @@ -431,8 +428,8 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) ov13_02227260(v0->unk_00, v0->unk_1C, param0->unk_114D, v0->unk_0C); return 13; } else { - MessageLoader * v5; - Strbuf* v6; + MessageLoader *v5; + Strbuf *v6; v5 = MessageLoader_Init(1, 26, 213, v0->unk_0C); v6 = MessageLoader_GetNewStrbuf(v5, 36); @@ -473,8 +470,8 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) } { - Party * v7 = BattleSystem_Party(v0->unk_00, v0->unk_10); - PCBoxes * v8 = ov16_0223E228(v0->unk_00); + Party *v7 = BattleSystem_Party(v0->unk_00, v0->unk_10); + PCBoxes *v8 = ov16_0223E228(v0->unk_00); if ((Party_GetCurrentCount(v7) == 6) && (PCBoxes_FirstEmptyBox(v8) == 18)) { MessageLoader_GetStrbuf(param0->unk_10, 45, param0->unk_18); @@ -488,31 +485,31 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) return 13; } -static u8 ov13_02226C48 (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226C48(UnkStruct_ov13_02227244 *param0) { ov13_022271D0(param0, 0); return 1; } -static u8 ov13_02226C54 (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226C54(UnkStruct_ov13_02227244 *param0) { ov13_022271D0(param0, 1); return 2; } -static u8 ov13_02226C60 (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226C60(UnkStruct_ov13_02227244 *param0) { ov13_022271D0(param0, 2); return 3; } -static u8 ov13_02226C6C (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226C6C(UnkStruct_ov13_02227244 *param0) { sub_0200E084(¶m0->unk_1C, 0); return 3; } -static u8 ov13_02226C7C (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226C7C(UnkStruct_ov13_02227244 *param0) { if (Message_Printing(param0->unk_32) == 0) { return 10; @@ -521,7 +518,7 @@ static u8 ov13_02226C7C (UnkStruct_ov13_02227244 * param0) return 9; } -static u8 ov13_02226C94 (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226C94(UnkStruct_ov13_02227244 *param0) { if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || (TouchScreen_Tapped() == 1)) { return param0->unk_114B; @@ -530,7 +527,7 @@ static u8 ov13_02226C94 (UnkStruct_ov13_02227244 * param0) return 10; } -static u8 ov13_02226CBC (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226CBC(UnkStruct_ov13_02227244 *param0) { if (param0->unk_113E == 2) { return param0->unk_114B; @@ -539,13 +536,13 @@ static u8 ov13_02226CBC (UnkStruct_ov13_02227244 * param0) return 11; } -static u8 ov13_02226CD4 (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226CD4(UnkStruct_ov13_02227244 *param0) { sub_02003178(param0->unk_08, (0x2 | 0x8), 0xffff, -8, 0, 16, 0); return 14; } -static u8 ov13_02226CFC (SysTask * param0, UnkStruct_ov13_02227244 * param1) +static u8 ov13_02226CFC(SysTask *param0, UnkStruct_ov13_02227244 *param1) { if (sub_0200384C(param1->unk_08) != 0) { return 0; @@ -562,7 +559,7 @@ static u8 ov13_02226CFC (SysTask * param0, UnkStruct_ov13_02227244 * param1) sub_02002C60(2); if (param1->unk_00->unk_1C != 0) { - UnkStruct_0207D99C * v0; + UnkStruct_0207D99C *v0; u8 v1; v0 = BattleSystem_BagCursor(param1->unk_00->unk_00); @@ -580,7 +577,7 @@ static u8 ov13_02226CFC (SysTask * param0, UnkStruct_ov13_02227244 * param1) return 1; } -static u8 ov13_02226D94 (UnkStruct_ov13_02227244 * param0) +static u8 ov13_02226D94(UnkStruct_ov13_02227244 *param0) { if (sub_0200384C(param0->unk_08) != 0) { return 12; @@ -638,7 +635,7 @@ static u8 ov13_02226D94 (UnkStruct_ov13_02227244 * param0) return 12; } -static void ov13_02226ED0 (UnkStruct_ov13_02227244 * param0) +static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -719,7 +716,7 @@ static void ov13_02226ED0 (UnkStruct_ov13_02227244 * param0) sub_0201C3C0(param0->unk_04, 4); } -static void ov13_02226F9C (BGL * param0) +static void ov13_02226F9C(BGL *param0) { GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_OBJ, 0); sub_02019044(param0, 4); @@ -727,9 +724,9 @@ static void ov13_02226F9C (BGL * param0) sub_02019044(param0, 6); } -static void ov13_02226FC4 (UnkStruct_ov13_02227244 * param0) +static void ov13_02226FC4(UnkStruct_ov13_02227244 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__B_BAG_GRA, param0->unk_00->unk_0C); @@ -737,9 +734,9 @@ static void ov13_02226FC4 (UnkStruct_ov13_02227244 * param0) sub_0200710C(v0, 0, param0->unk_04, 6, 0, 0, 0, param0->unk_00->unk_0C); { - NNSG2dScreenData * v1; - void * v2; - u16 * v3; + NNSG2dScreenData *v1; + void *v2; + u16 *v3; v2 = NARC_AllocAndReadWholeMember(v0, 1, param0->unk_00->unk_0C); NNS_G2dGetUnpackedScreenData(v2, &v1); @@ -760,7 +757,7 @@ static void ov13_02226FC4 (UnkStruct_ov13_02227244 * param0) } } -static void ov13_022270B8 (UnkStruct_ov13_02227244 * param0) +static void ov13_022270B8(UnkStruct_ov13_02227244 *param0) { param0->unk_10 = MessageLoader_Init(0, 26, 2, param0->unk_00->unk_0C); param0->unk_0C = sub_0200C440(15, 14, 0, param0->unk_00->unk_0C); @@ -768,7 +765,7 @@ static void ov13_022270B8 (UnkStruct_ov13_02227244 * param0) param0->unk_18 = Strbuf_Init(512, param0->unk_00->unk_0C); } -static void ov13_022270F8 (UnkStruct_ov13_02227244 * param0) +static void ov13_022270F8(UnkStruct_ov13_02227244 *param0) { MessageLoader_Free(param0->unk_10); sub_0200C560(param0->unk_0C); @@ -776,7 +773,7 @@ static void ov13_022270F8 (UnkStruct_ov13_02227244 * param0) Strbuf_Free(param0->unk_18); } -static void ov13_02227118 (UnkStruct_ov13_02227244 * param0, u8 param1) +static void ov13_02227118(UnkStruct_ov13_02227244 *param0, u8 param1) { switch (param1) { case 0: @@ -794,7 +791,7 @@ static void ov13_02227118 (UnkStruct_ov13_02227244 * param0, u8 param1) } } -static void ov13_0222717C (UnkStruct_ov13_02227244 * param0, u8 param1) +static void ov13_0222717C(UnkStruct_ov13_02227244 *param0, u8 param1) { if (param1 != 2) { return; @@ -804,7 +801,7 @@ static void ov13_0222717C (UnkStruct_ov13_02227244 * param0, u8 param1) sub_02019E2C(param0->unk_04, 6, 2, 40, 28, 8, 8 + param0->unk_114D); } -static void ov13_022271D0 (UnkStruct_ov13_02227244 * param0, u8 param1) +static void ov13_022271D0(UnkStruct_ov13_02227244 *param0, u8 param1) { ov13_0222717C(param0, param1); ov13_02227118(param0, param1); @@ -824,13 +821,13 @@ static void ov13_022271D0 (UnkStruct_ov13_02227244 * param0, u8 param1) ov13_02227E68(param0, param0->unk_114C); } -static int ov13_02227238 (UnkStruct_ov13_02227244 * param0, const TouchScreenRect *rect) +static int ov13_02227238(UnkStruct_ov13_02227244 *param0, const TouchScreenRect *rect) { int v0 = sub_02022664(rect); return v0; } -int ov13_02227244 (UnkStruct_ov13_02227244 * param0) +int ov13_02227244(UnkStruct_ov13_02227244 *param0) { int v0; @@ -838,7 +835,7 @@ int ov13_02227244 (UnkStruct_ov13_02227244 * param0) return v0; } -static void ov13_02227260 (BattleSystem * param0, u16 param1, u16 param2, u32 param3) +static void ov13_02227260(BattleSystem *param0, u16 param1, u16 param2, u32 param3) { Bag_TryRemoveItem(BattleSystem_Bag(param0), param1, 1, param3); Bag_SetLastItemUsed(BattleSystem_BagCursor(param0), param1, param2); diff --git a/src/overlay013/ov13_02227288.c b/src/overlay013/ov13_02227288.c index 139acfb50e..aed5fca65b 100644 --- a/src/overlay013/ov13_02227288.c +++ b/src/overlay013/ov13_02227288.c @@ -1,27 +1,27 @@ +#include "overlay013/ov13_02227288.h" + #include #include -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" + +#include "battle/ov16_0223DF00.h" #include "overlay013/struct_ov13_02227244.h" #include "overlay061/struct_ov61_0222C884.h" -#include "unk_02002328.h" -#include "unk_02002B7C.h" +#include "item.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02002328.h" +#include "unk_02002B7C.h" #include "unk_0200DA60.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "item.h" -#include "overlay013/ov13_02227288.h" -#include "battle/ov16_0223DF00.h" -static void ov13_022273CC(UnkStruct_ov13_02227244 * param0); -static void ov13_02227888(UnkStruct_ov13_02227244 * param0); -static void ov13_02227974(UnkStruct_ov13_02227244 * param0); +static void ov13_022273CC(UnkStruct_ov13_02227244 *param0); +static void ov13_02227888(UnkStruct_ov13_02227244 *param0); +static void ov13_02227974(UnkStruct_ov13_02227244 *param0); static const UnkStruct_ov61_0222C884 Unk_ov13_02229A60 = { 0x4, @@ -34,58 +34,58 @@ static const UnkStruct_ov61_0222C884 Unk_ov13_02229A60 = { }; static const UnkStruct_ov61_0222C884 Unk_ov13_02229A88[] = { - {0x4, 0x2, 0x4, 0xC, 0x5, 0x0, 0x2CE}, - {0x4, 0x2, 0xD, 0xC, 0x5, 0x0, 0x30A}, - {0x4, 0x12, 0x5, 0xC, 0x3, 0x0, 0x286}, - {0x4, 0x12, 0xE, 0xC, 0x3, 0x0, 0x2AA}, - {0x4, 0x5, 0x14, 0x14, 0x3, 0x0, 0x24A} + { 0x4, 0x2, 0x4, 0xC, 0x5, 0x0, 0x2CE }, + { 0x4, 0x2, 0xD, 0xC, 0x5, 0x0, 0x30A }, + { 0x4, 0x12, 0x5, 0xC, 0x3, 0x0, 0x286 }, + { 0x4, 0x12, 0xE, 0xC, 0x3, 0x0, 0x2AA }, + { 0x4, 0x5, 0x14, 0x14, 0x3, 0x0, 0x24A } }; static const UnkStruct_ov61_0222C884 Unk_ov13_02229AE0[] = { - {0x5, 0x1, 0x1, 0xE, 0x3, 0x0, 0x1}, - {0x5, 0x8, 0x4, 0x4, 0x3, 0x4, 0x2B}, - {0x5, 0x11, 0x1, 0xE, 0x3, 0x0, 0x37}, - {0x5, 0x18, 0x4, 0x4, 0x3, 0x4, 0x61}, - {0x5, 0x1, 0x7, 0xE, 0x3, 0x0, 0x6D}, - {0x5, 0x8, 0xA, 0x4, 0x3, 0x4, 0x97}, - {0x5, 0x11, 0x7, 0xE, 0x3, 0x0, 0xA3}, - {0x5, 0x18, 0xA, 0x4, 0x3, 0x4, 0xCD}, - {0x5, 0x1, 0xD, 0xE, 0x3, 0x0, 0xD9}, - {0x5, 0x8, 0x10, 0x4, 0x3, 0x4, 0x103}, - {0x5, 0x11, 0xD, 0xE, 0x3, 0x0, 0x10F}, - {0x5, 0x18, 0x10, 0x4, 0x3, 0x4, 0x139}, - {0x5, 0x1, 0x1, 0xE, 0x3, 0x0, 0x145}, - {0x5, 0x8, 0x4, 0x4, 0x3, 0x4, 0x16F}, - {0x5, 0x11, 0x1, 0xE, 0x3, 0x0, 0x17B}, - {0x5, 0x18, 0x4, 0x4, 0x3, 0x4, 0x1A5}, - {0x5, 0x1, 0x7, 0xE, 0x3, 0x0, 0x1B1}, - {0x5, 0x8, 0xA, 0x4, 0x3, 0x4, 0x1DB}, - {0x5, 0x11, 0x7, 0xE, 0x3, 0x0, 0x1E7}, - {0x5, 0x18, 0xA, 0x4, 0x3, 0x4, 0x211}, - {0x5, 0x1, 0xD, 0xE, 0x3, 0x0, 0x21D}, - {0x5, 0x8, 0x10, 0x4, 0x3, 0x4, 0x247}, - {0x5, 0x11, 0xD, 0xE, 0x3, 0x0, 0x253}, - {0x5, 0x18, 0x10, 0x4, 0x3, 0x4, 0x27D}, - {0x5, 0xB, 0x13, 0xA, 0x5, 0x4, 0x289}, - {0x5, 0x16, 0x14, 0x4, 0x3, 0x4, 0x2BB} + { 0x5, 0x1, 0x1, 0xE, 0x3, 0x0, 0x1 }, + { 0x5, 0x8, 0x4, 0x4, 0x3, 0x4, 0x2B }, + { 0x5, 0x11, 0x1, 0xE, 0x3, 0x0, 0x37 }, + { 0x5, 0x18, 0x4, 0x4, 0x3, 0x4, 0x61 }, + { 0x5, 0x1, 0x7, 0xE, 0x3, 0x0, 0x6D }, + { 0x5, 0x8, 0xA, 0x4, 0x3, 0x4, 0x97 }, + { 0x5, 0x11, 0x7, 0xE, 0x3, 0x0, 0xA3 }, + { 0x5, 0x18, 0xA, 0x4, 0x3, 0x4, 0xCD }, + { 0x5, 0x1, 0xD, 0xE, 0x3, 0x0, 0xD9 }, + { 0x5, 0x8, 0x10, 0x4, 0x3, 0x4, 0x103 }, + { 0x5, 0x11, 0xD, 0xE, 0x3, 0x0, 0x10F }, + { 0x5, 0x18, 0x10, 0x4, 0x3, 0x4, 0x139 }, + { 0x5, 0x1, 0x1, 0xE, 0x3, 0x0, 0x145 }, + { 0x5, 0x8, 0x4, 0x4, 0x3, 0x4, 0x16F }, + { 0x5, 0x11, 0x1, 0xE, 0x3, 0x0, 0x17B }, + { 0x5, 0x18, 0x4, 0x4, 0x3, 0x4, 0x1A5 }, + { 0x5, 0x1, 0x7, 0xE, 0x3, 0x0, 0x1B1 }, + { 0x5, 0x8, 0xA, 0x4, 0x3, 0x4, 0x1DB }, + { 0x5, 0x11, 0x7, 0xE, 0x3, 0x0, 0x1E7 }, + { 0x5, 0x18, 0xA, 0x4, 0x3, 0x4, 0x211 }, + { 0x5, 0x1, 0xD, 0xE, 0x3, 0x0, 0x21D }, + { 0x5, 0x8, 0x10, 0x4, 0x3, 0x4, 0x247 }, + { 0x5, 0x11, 0xD, 0xE, 0x3, 0x0, 0x253 }, + { 0x5, 0x18, 0x10, 0x4, 0x3, 0x4, 0x27D }, + { 0x5, 0xB, 0x13, 0xA, 0x5, 0x4, 0x289 }, + { 0x5, 0x16, 0x14, 0x4, 0x3, 0x4, 0x2BB } }; static const UnkStruct_ov61_0222C884 Unk_ov13_02229A68[] = { - {0x5, 0x7, 0x4, 0xC, 0x2, 0x4, 0x2C7}, - {0x5, 0x14, 0x4, 0x4, 0x2, 0x4, 0x2DF}, - {0x5, 0x2, 0x9, 0x1C, 0x6, 0x4, 0x2E7}, - {0x5, 0xA, 0x14, 0x6, 0x3, 0x0, 0x38F} + { 0x5, 0x7, 0x4, 0xC, 0x2, 0x4, 0x2C7 }, + { 0x5, 0x14, 0x4, 0x4, 0x2, 0x4, 0x2DF }, + { 0x5, 0x2, 0x9, 0x1C, 0x6, 0x4, 0x2E7 }, + { 0x5, 0xA, 0x14, 0x6, 0x3, 0x0, 0x38F } }; -void ov13_02227288 (UnkStruct_ov13_02227244 * param0) +void ov13_02227288(UnkStruct_ov13_02227244 *param0) { sub_0201A8D4(param0->unk_04, ¶m0->unk_1C, &Unk_ov13_02229A60); ov13_022272AC(param0, param0->unk_114C); } -void ov13_022272AC (UnkStruct_ov13_02227244 * param0, u32 param1) +void ov13_022272AC(UnkStruct_ov13_02227244 *param0, u32 param1) { - const UnkStruct_ov61_0222C884 * v0; + const UnkStruct_ov61_0222C884 *v0; u8 v1; switch (param1) { @@ -110,12 +110,12 @@ void ov13_022272AC (UnkStruct_ov13_02227244 * param0, u32 param1) } } -void ov13_02227324 (UnkStruct_ov13_02227244 * param0) +void ov13_02227324(UnkStruct_ov13_02227244 *param0) { sub_0201A928(param0->unk_2C, param0->unk_30); } -void ov13_02227334 (UnkStruct_ov13_02227244 * param0) +void ov13_02227334(UnkStruct_ov13_02227244 *param0) { u32 v0; @@ -123,7 +123,7 @@ void ov13_02227334 (UnkStruct_ov13_02227244 * param0) BGL_DeleteWindow(¶m0->unk_1C); } -void ov13_02227350 (UnkStruct_ov13_02227244 * param0, u32 param1) +void ov13_02227350(UnkStruct_ov13_02227244 *param0, u32 param1) { switch (param1) { case 0: @@ -138,10 +138,10 @@ void ov13_02227350 (UnkStruct_ov13_02227244 * param0, u32 param1) } } -static void ov13_02227374 (UnkStruct_ov13_02227244 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov13_02227374(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; u32 v3; @@ -155,7 +155,7 @@ static void ov13_02227374 (UnkStruct_ov13_02227244 * param0, u32 param1, u32 par sub_0201A9A4(v0); } -static void ov13_022273CC (UnkStruct_ov13_02227244 * param0) +static void ov13_022273CC(UnkStruct_ov13_02227244 *param0) { u32 v0; @@ -171,7 +171,7 @@ static void ov13_022273CC (UnkStruct_ov13_02227244 * param0) ov13_02227374(param0, 3, 6, 2, 8, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0)))); if (param0->unk_00->unk_20 != 0) { - Strbuf* v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 8); + Strbuf *v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 8); sub_0201D78C(¶m0->unk_2C[4], 2, v1, 0, 6, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL); Strbuf_Free(v1); @@ -180,18 +180,18 @@ static void ov13_022273CC (UnkStruct_ov13_02227244 * param0) } static const u32 Unk_ov13_02229AB0[][2] = { - {0x9, 0xA}, - {0xB, 0xC}, - {0xD, 0xE}, - {0xF, 0x10}, - {0x11, 0x12}, - {0x13, 0x14} + { 0x9, 0xA }, + { 0xB, 0xC }, + { 0xD, 0xE }, + { 0xF, 0x10 }, + { 0x11, 0x12 }, + { 0x13, 0x14 } }; -static void ov13_022274A8 (UnkStruct_ov13_02227244 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov13_022274A8(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; u32 v3; @@ -215,10 +215,10 @@ static void ov13_022274A8 (UnkStruct_ov13_02227244 * param0, u32 param1, u32 par sub_0201A9A4(v0); } -static void ov13_0222754C (UnkStruct_ov13_02227244 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6) +static void ov13_0222754C(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6) { - Strbuf* v0; - Window * v1; + Strbuf *v0; + Window *v1; v1 = ¶m0->unk_2C[param3]; @@ -236,7 +236,7 @@ static void ov13_0222754C (UnkStruct_ov13_02227244 * param0, u32 param1, u32 par sub_0201A9A4(v1); } -static void ov13_022275E0 (UnkStruct_ov13_02227244 * param0, u32 param1) +static void ov13_022275E0(UnkStruct_ov13_02227244 *param0, u32 param1) { u32 v0; u32 v1; @@ -253,7 +253,7 @@ static void ov13_022275E0 (UnkStruct_ov13_02227244 * param0, u32 param1) ov13_0222754C(param0, v1, param1, v0 + 1 + param1 * 2, 0, 4, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); } -void ov13_02227650 (UnkStruct_ov13_02227244 * param0) +void ov13_02227650(UnkStruct_ov13_02227244 *param0) { u16 v0; @@ -266,10 +266,10 @@ void ov13_02227650 (UnkStruct_ov13_02227244 * param0) param0->unk_31 ^= 1; } -void ov13_02227698 (UnkStruct_ov13_02227244 * param0) +void ov13_02227698(UnkStruct_ov13_02227244 *param0) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; u32 v3; @@ -280,13 +280,13 @@ void ov13_02227698 (UnkStruct_ov13_02227244 * param0) v2 = sub_02002D7C(0, v1, 0); v3 = (sub_0201C294(v0) * 8 - v2) / 2; - sub_0201D78C(v0, 0, v1, v3, 4, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(v0, 0, v1, v3, 4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 29); StringTemplate_SetNumber(param0->unk_14, 0, param0->unk_1154[param0->unk_114D] + 1, 2, 0, 1); StringTemplate_Format(param0->unk_14, param0->unk_18, v1); - sub_0201D78C(v0, 0, param0->unk_18, v3 + v2, 4, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(v0, 0, param0->unk_18, v3 + v2, 4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 30); @@ -294,44 +294,44 @@ void ov13_02227698 (UnkStruct_ov13_02227244 * param0) StringTemplate_Format(param0->unk_14, param0->unk_18, v1); v2 = sub_02002D7C(0, param0->unk_18, 0); - sub_0201D78C(v0, 0, param0->unk_18, v3 - v2, 4, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(v0, 0, param0->unk_18, v3 - v2, 4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); sub_0201A9A4(v0); } -static void ov13_022277C8 (UnkStruct_ov13_02227244 * param0) +static void ov13_022277C8(UnkStruct_ov13_02227244 *param0) { BGL_FillWindow(¶m0->unk_2C[24], 0); switch (param0->unk_114D) { case 0: - ov13_02227374(param0, 24, 22, 0, 4, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))))); - ov13_02227374(param0, 24, 23, 0, (4 + 16), (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))))); + ov13_02227374(param0, 24, 22, 0, 4, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); + ov13_02227374(param0, 24, 23, 0, (4 + 16), ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); break; case 1: - ov13_02227374(param0, 24, 24, 0, 4, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))))); - ov13_02227374(param0, 24, 25, 0, (4 + 16), (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))))); + ov13_02227374(param0, 24, 24, 0, 4, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); + ov13_02227374(param0, 24, 25, 0, (4 + 16), ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); break; case 2: - ov13_02227374(param0, 24, 26, 0, 12, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))))); + ov13_02227374(param0, 24, 26, 0, 12, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); break; case 3: - ov13_02227374(param0, 24, 27, 0, 12, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))))); + ov13_02227374(param0, 24, 27, 0, 12, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); break; } } -static void ov13_02227888 (UnkStruct_ov13_02227244 * param0) +static void ov13_02227888(UnkStruct_ov13_02227244 *param0) { ov13_02227650(param0); ov13_022277C8(param0); ov13_02227698(param0); } -static void ov13_022278A0 (UnkStruct_ov13_02227244 * param0, u32 param1) +static void ov13_022278A0(UnkStruct_ov13_02227244 *param0, u32 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_2C[0]; v1 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[0][0]); @@ -339,15 +339,15 @@ static void ov13_022278A0 (UnkStruct_ov13_02227244 * param0, u32 param1) StringTemplate_SetItemName(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].item); StringTemplate_Format(param0->unk_14, param0->unk_18, v1); BGL_FillWindow(v0, 0); - sub_0201D78C(v0, 0, param0->unk_18, 0, 0, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(v0, 0, param0->unk_18, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); sub_0201A9A4(v0); } -static void ov13_02227910 (UnkStruct_ov13_02227244 * param0, u32 param1) +static void ov13_02227910(UnkStruct_ov13_02227244 *param0, u32 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_2C[2]; v1 = Strbuf_Init(130, param0->unk_00->unk_0C); @@ -358,7 +358,7 @@ static void ov13_02227910 (UnkStruct_ov13_02227244 * param0, u32 param1) sub_0201A9A4(v0); } -static void ov13_02227974 (UnkStruct_ov13_02227244 * param0) +static void ov13_02227974(UnkStruct_ov13_02227244 *param0) { u32 v0; u32 v1; @@ -375,14 +375,14 @@ static void ov13_02227974 (UnkStruct_ov13_02227244 * param0) ov13_02227374(param0, 3, 31, 2, 6, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0)))); } -void ov13_022279F4 (UnkStruct_ov13_02227244 * param0) +void ov13_022279F4(UnkStruct_ov13_02227244 *param0) { sub_0200E060(¶m0->unk_1C, 1, 1024 - (18 + 12), 14); BGL_FillWindow(¶m0->unk_1C, 15); ov13_02227A1C(param0); } -void ov13_02227A1C (UnkStruct_ov13_02227244 * param0) +void ov13_02227A1C(UnkStruct_ov13_02227244 *param0) { sub_02002AC8(1); param0->unk_32 = PrintStringSimple(¶m0->unk_1C, 1, param0->unk_18, 0, 0, BattleSystem_TextSpeed(param0->unk_00->unk_00), NULL); diff --git a/src/overlay013/ov13_02227A4C.c b/src/overlay013/ov13_02227A4C.c index c50d8adb20..1b45772be4 100644 --- a/src/overlay013/ov13_02227A4C.c +++ b/src/overlay013/ov13_02227A4C.c @@ -1,13 +1,14 @@ +#include "overlay013/ov13_02227A4C.h" + #include #include #include "overlay013/struct_ov13_02227244.h" -#include "item.h" #include "bag.h" -#include "overlay013/ov13_02227A4C.h" +#include "item.h" -u8 ov13_02227A4C (UnkStruct_ov13_02227244 * param0) +u8 ov13_02227A4C(UnkStruct_ov13_02227244 *param0) { if (param0->unk_00->unk_20 == 0) { return 0; @@ -22,7 +23,7 @@ u8 ov13_02227A4C (UnkStruct_ov13_02227244 * param0) return 1; } -void ov13_02227A7C (UnkStruct_ov13_02227244 * param0) +void ov13_02227A7C(UnkStruct_ov13_02227244 *param0) { u32 v0; @@ -43,9 +44,9 @@ static const u8 Unk_ov13_02229BB0[] = { 0x0 }; -void ov13_02227AC8 (UnkStruct_ov13_02227244 * param0) +void ov13_02227AC8(UnkStruct_ov13_02227244 *param0) { - BagItem * v0; + BagItem *v0; u32 v1, v2, v3; s32 v4; @@ -89,7 +90,7 @@ void ov13_02227AC8 (UnkStruct_ov13_02227244 * param0) } } -u16 ov13_02227BA8 (UnkStruct_ov13_02227244 * param0, u32 param1) +u16 ov13_02227BA8(UnkStruct_ov13_02227244 *param0, u32 param1) { if ((param0->unk_3C[param0->unk_114D][param0->unk_00->unk_2C[param0->unk_114D] * 6 + param1].item != 0) && (param0->unk_3C[param0->unk_114D][param0->unk_00->unk_2C[param0->unk_114D] * 6 + param1].quantity != 0)) { return param0->unk_3C[param0->unk_114D][param0->unk_00->unk_2C[param0->unk_114D] * 6 + param1].item; diff --git a/src/overlay013/ov13_02227BDC.c b/src/overlay013/ov13_02227BDC.c index e734eb5aa5..d3790cf042 100644 --- a/src/overlay013/ov13_02227BDC.c +++ b/src/overlay013/ov13_02227BDC.c @@ -1,41 +1,42 @@ +#include "overlay013/ov13_02227BDC.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" -#include "battle/struct_ov16_0226DC24_decl.h" -#include "battle/struct_ov16_0226DEEC_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020F1DB8.h" + +#include "battle/ov16_0223DF00.h" +#include "battle/ov16_0226DB7C.h" +#include "battle/ov16_0226DE44.h" +#include "battle/struct_ov16_0226DC24_decl.h" +#include "battle/struct_ov16_0226DEEC_decl.h" +#include "overlay013/ov13_02227A4C.h" +#include "overlay013/ov13_02228A38.h" #include "overlay013/struct_ov13_02227244.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_02241308.h" -#include "unk_02002F38.h" -#include "narc.h" -#include "unk_0200C6E4.h" #include "gx_layers.h" #include "item.h" -#include "overlay013/ov13_02227A4C.h" -#include "overlay013/ov13_02227BDC.h" -#include "overlay013/ov13_02228A38.h" -#include "battle/ov16_0223DF00.h" -#include "battle/ov16_0226DB7C.h" -#include "battle/ov16_0226DE44.h" +#include "narc.h" +#include "unk_02002F38.h" +#include "unk_0200C6E4.h" -static void ov13_02227C08(UnkStruct_ov13_02227244 * param0); -static void ov13_02227C54(UnkStruct_ov13_02227244 * param0); -static void ov13_02227D10(UnkStruct_ov13_02227244 * param0, u16 param1, u32 param2); -static void ov13_02227D48(UnkStruct_ov13_02227244 * param0, u16 param1, u16 param2, u32 param3); -static void ov13_02227DE8(UnkStruct_ov13_02227244 * param0); -static void ov13_02227EAC(UnkStruct_ov13_02227244 * param0); -static void ov13_02227EE0(UnkStruct_ov13_02227244 * param0); -static void ov13_02227F38(UnkStruct_ov13_02227244 * param0); -static void ov13_02227F7C(UnkStruct_ov13_02227244 * param0); -static void ov13_02227FDC(UnkStruct_ov13_02227244 * param0); -static void ov13_02228070(UnkStruct_ov13_02227244 * param0); -static void ov13_022280C8(UnkStruct_ov13_02227244 * param0); +static void ov13_02227C08(UnkStruct_ov13_02227244 *param0); +static void ov13_02227C54(UnkStruct_ov13_02227244 *param0); +static void ov13_02227D10(UnkStruct_ov13_02227244 *param0, u16 param1, u32 param2); +static void ov13_02227D48(UnkStruct_ov13_02227244 *param0, u16 param1, u16 param2, u32 param3); +static void ov13_02227DE8(UnkStruct_ov13_02227244 *param0); +static void ov13_02227EAC(UnkStruct_ov13_02227244 *param0); +static void ov13_02227EE0(UnkStruct_ov13_02227244 *param0); +static void ov13_02227F38(UnkStruct_ov13_02227244 *param0); +static void ov13_02227F7C(UnkStruct_ov13_02227244 *param0); +static void ov13_02227FDC(UnkStruct_ov13_02227244 *param0); +static void ov13_02228070(UnkStruct_ov13_02227244 *param0); +static void ov13_022280C8(UnkStruct_ov13_02227244 *param0); static const int Unk_ov13_02229BC0[2] = { 0x18, @@ -43,12 +44,12 @@ static const int Unk_ov13_02229BC0[2] = { }; static const int Unk_ov13_02229C44[][2] = { - {0x2C, 0x2D}, - {0xAC, 0x2D}, - {0x2C, 0x5D}, - {0xAC, 0x5D}, - {0x2C, 0x8D}, - {0xAC, 0x8D} + { 0x2C, 0x2D }, + { 0xAC, 0x2D }, + { 0x2C, 0x5D }, + { 0xAC, 0x5D }, + { 0x2C, 0x8D }, + { 0xAC, 0x8D } }; static const int Unk_ov13_02229BB8[2] = { @@ -57,15 +58,15 @@ static const int Unk_ov13_02229BB8[2] = { }; static const int Unk_ov13_02229CBC[][5] = { - {0xB4B7, 0xB4B7, 0xB4B7, 0xB4B7, 0x1}, - {0xB4B8, 0xB4B8, 0xB4B7, 0xB4B7, 0x1}, - {0xB4B9, 0xB4B9, 0xB4B7, 0xB4B7, 0x1}, - {0xB4BA, 0xB4BA, 0xB4B7, 0xB4B7, 0x1}, - {0xB4BB, 0xB4BB, 0xB4B7, 0xB4B7, 0x1}, - {0xB4BC, 0xB4BC, 0xB4B7, 0xB4B7, 0x1} + { 0xB4B7, 0xB4B7, 0xB4B7, 0xB4B7, 0x1 }, + { 0xB4B8, 0xB4B8, 0xB4B7, 0xB4B7, 0x1 }, + { 0xB4B9, 0xB4B9, 0xB4B7, 0xB4B7, 0x1 }, + { 0xB4BA, 0xB4BA, 0xB4B7, 0xB4B7, 0x1 }, + { 0xB4BB, 0xB4BB, 0xB4B7, 0xB4B7, 0x1 }, + { 0xB4BC, 0xB4BC, 0xB4B7, 0xB4B7, 0x1 } }; -void ov13_02227BDC (UnkStruct_ov13_02227244 * param0) +void ov13_02227BDC(UnkStruct_ov13_02227244 *param0) { ov13_02227C08(param0); ov13_02227C54(param0); @@ -76,10 +77,10 @@ void ov13_02227BDC (UnkStruct_ov13_02227244 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov13_02227C08 (UnkStruct_ov13_02227244 * param0) +static void ov13_02227C08(UnkStruct_ov13_02227244 *param0) { - UnkStruct_ov104_02241308 v0 = {8, 8, 3, 3, 0, 0}; - SpriteRenderer * v1 = ov16_0223E010(param0->unk_00->unk_00); + UnkStruct_ov104_02241308 v0 = { 8, 8, 3, 3, 0, 0 }; + SpriteRenderer *v1 = ov16_0223E010(param0->unk_00->unk_00); param0->unk_30C = sub_0200C704(v1); @@ -87,11 +88,11 @@ static void ov13_02227C08 (UnkStruct_ov13_02227244 * param0) sub_0200CB30(v1, param0->unk_30C, &v0); } -static void ov13_02227C54 (UnkStruct_ov13_02227244 * param0) +static void ov13_02227C54(UnkStruct_ov13_02227244 *param0) { - SpriteRenderer * v0; + SpriteRenderer *v0; u32 v1; - NARC * v2; + NARC *v2; v2 = NARC_ctor(NARC_INDEX_ITEMTOOL__ITEMDATA__ITEM_ICON, param0->unk_00->unk_0C); v0 = ov16_0223E010(param0->unk_00->unk_00); @@ -106,21 +107,21 @@ static void ov13_02227C54 (UnkStruct_ov13_02227244 * param0) NARC_dtor(v2); } -static void ov13_02227D10 (UnkStruct_ov13_02227244 * param0, u16 param1, u32 param2) +static void ov13_02227D10(UnkStruct_ov13_02227244 *param0, u16 param1, u32 param2) { - SpriteRenderer * v0 = ov16_0223E010(param0->unk_00->unk_00); + SpriteRenderer *v0 = ov16_0223E010(param0->unk_00->unk_00); sub_0200D948(v0, param0->unk_30C, 16, Item_FileID(param1, 1), 0, param2); } -static void ov13_02227D48 (UnkStruct_ov13_02227244 * param0, u16 param1, u16 param2, u32 param3) +static void ov13_02227D48(UnkStruct_ov13_02227244 *param0, u16 param1, u16 param2, u32 param3) { PaletteSys_LoadPalette(param0->unk_08, 16, Item_FileID(param1, 2), param0->unk_00->unk_0C, 3, 0x20, param2 * 16); } -static CellActorData * ov13_02227D78 (UnkStruct_ov13_02227244 * param0, u32 param1) +static CellActorData *ov13_02227D78(UnkStruct_ov13_02227244 *param0, u32 param1) { SpriteTemplate v0; - SpriteRenderer * v1; + SpriteRenderer *v1; v1 = ov16_0223E010(param0->unk_00->unk_00); @@ -141,7 +142,7 @@ static CellActorData * ov13_02227D78 (UnkStruct_ov13_02227244 * param0, u32 para return SpriteActor_LoadResources(v1, param0->unk_30C, &v0); } -static void ov13_02227DE8 (UnkStruct_ov13_02227244 * param0) +static void ov13_02227DE8(UnkStruct_ov13_02227244 *param0) { u32 v0; @@ -150,9 +151,9 @@ static void ov13_02227DE8 (UnkStruct_ov13_02227244 * param0) } } -void ov13_02227E08 (UnkStruct_ov13_02227244 * param0) +void ov13_02227E08(UnkStruct_ov13_02227244 *param0) { - SpriteRenderer * v0; + SpriteRenderer *v0; u32 v1; v0 = ov16_0223E010(param0->unk_00->unk_00); @@ -166,13 +167,13 @@ void ov13_02227E08 (UnkStruct_ov13_02227244 * param0) sub_0200D0B0(v0, param0->unk_30C); } -static void ov13_02227E48 (CellActorData * param0, const int param1, const int param2) +static void ov13_02227E48(CellActorData *param0, const int param1, const int param2) { SpriteActor_EnableObject(param0, 1); SpriteActor_SetSpritePositionXY(param0, param1, param2); } -void ov13_02227E68 (UnkStruct_ov13_02227244 * param0, u32 param1) +void ov13_02227E68(UnkStruct_ov13_02227244 *param0, u32 param1) { u32 v0; @@ -193,7 +194,7 @@ void ov13_02227E68 (UnkStruct_ov13_02227244 * param0, u32 param1) } } -static void ov13_02227EAC (UnkStruct_ov13_02227244 * param0) +static void ov13_02227EAC(UnkStruct_ov13_02227244 *param0) { u16 v0; @@ -204,7 +205,7 @@ static void ov13_02227EAC (UnkStruct_ov13_02227244 * param0) } } -static void ov13_02227EE0 (UnkStruct_ov13_02227244 * param0) +static void ov13_02227EE0(UnkStruct_ov13_02227244 *param0) { u32 v0; u16 v1; @@ -222,7 +223,7 @@ static void ov13_02227EE0 (UnkStruct_ov13_02227244 * param0) } } -static void ov13_02227F38 (UnkStruct_ov13_02227244 * param0) +static void ov13_02227F38(UnkStruct_ov13_02227244 *param0) { u16 v0; @@ -233,10 +234,10 @@ static void ov13_02227F38 (UnkStruct_ov13_02227244 * param0) ov13_02227E48(param0->unk_310[0], Unk_ov13_02229BB8[0], Unk_ov13_02229BB8[1]); } -static void ov13_02227F7C (UnkStruct_ov13_02227244 * param0) +static void ov13_02227F7C(UnkStruct_ov13_02227244 *param0) { - SpriteRenderer * v0; - UnkStruct_ov16_0226DC24 * v1; + SpriteRenderer *v0; + UnkStruct_ov16_0226DC24 *v1; v0 = ov16_0223E010(param0->unk_00->unk_00); ov16_0226DB7C(v0, param0->unk_30C, param0->unk_08, param0->unk_00->unk_0C, 46270, 46270, 46265, 46265); @@ -245,45 +246,45 @@ static void ov13_02227F7C (UnkStruct_ov13_02227244 * param0) ov13_02228A64(param0->unk_34, v1); } -static void ov13_02227FDC (UnkStruct_ov13_02227244 * param0) +static void ov13_02227FDC(UnkStruct_ov13_02227244 *param0) { ov16_0226DCA8(ov13_02228A58(param0->unk_34)); ov16_0226DBFC(param0->unk_30C, 46270, 46270, 46265, 46265); } static const ByteFlagSet Unk_ov13_02229C14[] = { - {0x8, 0x10, 0x78, 0x48, 0x0, 0x1, 0x0, 0x2}, - {0x8, 0x58, 0x78, 0x90, 0x0, 0x4, 0x1, 0x3}, - {0x88, 0x10, 0xF8, 0x48, 0x2, 0x3, 0x0, 0x2}, - {0x88, 0x58, 0xF8, 0x90, 0x2, 0x5, 0x1, 0x3}, - {0x8, 0xA0, 0xC8, 0xB8, 0x1, 0x4, 0x4, 0x5}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x83, 0x5, 0x4, 0x5} + { 0x8, 0x10, 0x78, 0x48, 0x0, 0x1, 0x0, 0x2 }, + { 0x8, 0x58, 0x78, 0x90, 0x0, 0x4, 0x1, 0x3 }, + { 0x88, 0x10, 0xF8, 0x48, 0x2, 0x3, 0x0, 0x2 }, + { 0x88, 0x58, 0xF8, 0x90, 0x2, 0x5, 0x1, 0x3 }, + { 0x8, 0xA0, 0xC8, 0xB8, 0x1, 0x4, 0x4, 0x5 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x83, 0x5, 0x4, 0x5 } }; static const ByteFlagSet Unk_ov13_02229C74[] = { - {0x8, 0x10, 0x78, 0x30, 0x0, 0x2, 0x0, 0x1}, - {0x88, 0x10, 0xF8, 0x30, 0x1, 0x3, 0x0, 0x1}, - {0x8, 0x40, 0x78, 0x60, 0x0, 0x4, 0x2, 0x3}, - {0x88, 0x40, 0xF8, 0x60, 0x1, 0x5, 0x2, 0x3}, - {0x8, 0x70, 0x78, 0x90, 0x2, 0x86, 0x4, 0x5}, - {0x88, 0x70, 0xF8, 0x90, 0x3, 0x8, 0x4, 0x5}, - {0x8, 0xA0, 0x20, 0xB8, 0x4, 0x6, 0x6, 0x7}, - {0x30, 0xA0, 0x48, 0xB8, 0x4, 0x7, 0x6, 0x8}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x5, 0x8, 0x7, 0x8} + { 0x8, 0x10, 0x78, 0x30, 0x0, 0x2, 0x0, 0x1 }, + { 0x88, 0x10, 0xF8, 0x30, 0x1, 0x3, 0x0, 0x1 }, + { 0x8, 0x40, 0x78, 0x60, 0x0, 0x4, 0x2, 0x3 }, + { 0x88, 0x40, 0xF8, 0x60, 0x1, 0x5, 0x2, 0x3 }, + { 0x8, 0x70, 0x78, 0x90, 0x2, 0x86, 0x4, 0x5 }, + { 0x88, 0x70, 0xF8, 0x90, 0x3, 0x8, 0x4, 0x5 }, + { 0x8, 0xA0, 0x20, 0xB8, 0x4, 0x6, 0x6, 0x7 }, + { 0x30, 0xA0, 0x48, 0xB8, 0x4, 0x7, 0x6, 0x8 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x5, 0x8, 0x7, 0x8 } }; static const ByteFlagSet Unk_ov13_02229BD4[] = { - {0x8, 0xA0, 0xC8, 0xB8, 0x0, 0x0, 0x0, 0x1}, - {0xE0, 0xA0, 0xF8, 0xB8, 0x1, 0x1, 0x0, 0x1} + { 0x8, 0xA0, 0xC8, 0xB8, 0x0, 0x0, 0x0, 0x1 }, + { 0xE0, 0xA0, 0xF8, 0xB8, 0x1, 0x1, 0x0, 0x1 } }; -static const ByteFlagSet * const Unk_ov13_02229BC8[] = { +static const ByteFlagSet *const Unk_ov13_02229BC8[] = { Unk_ov13_02229C14, Unk_ov13_02229C74, Unk_ov13_02229BD4 }; -void ov13_02228008 (UnkStruct_ov13_02227244 * param0, u8 param1) +void ov13_02228008(UnkStruct_ov13_02227244 *param0, u8 param1) { ov13_02228A9C(param0->unk_34, Unk_ov13_02229BC8[param1]); @@ -299,17 +300,17 @@ void ov13_02228008 (UnkStruct_ov13_02227244 * param0, u8 param1) } } -void ov13_02228050 (UnkStruct_ov13_02227244 * param0) +void ov13_02228050(UnkStruct_ov13_02227244 *param0) { ov13_02228A60(param0->unk_34, 0); ov13_02228A90(param0->unk_34); ov16_0226DDE8(ov13_02228A58(param0->unk_34)); } -static void ov13_02228070 (UnkStruct_ov13_02227244 * param0) +static void ov13_02228070(UnkStruct_ov13_02227244 *param0) { - SpriteRenderer * v0; - UnkStruct_ov16_0226DEEC * v1; + SpriteRenderer *v0; + UnkStruct_ov16_0226DEEC *v1; v0 = ov16_0223E010(param0->unk_00->unk_00); @@ -317,19 +318,19 @@ static void ov13_02228070 (UnkStruct_ov13_02227244 * param0) param0->unk_38 = ov16_0226DEEC(v0, param0->unk_30C, param0->unk_00->unk_0C, 46269, 46269, 46264, 46264, 0, 0); } -static void ov13_022280C8 (UnkStruct_ov13_02227244 * param0) +static void ov13_022280C8(UnkStruct_ov13_02227244 *param0) { ov16_0226DF68(param0->unk_38); ov16_0226DEC4(param0->unk_30C, 46269, 46269, 46264, 46264); } static const int Unk_ov13_02229BFC[3][2] = { - {0xC0, 0x18}, - {0x40, 0x10}, - {0x68, 0x98} + { 0xC0, 0x18 }, + { 0x40, 0x10 }, + { 0x68, 0x98 } }; -void ov13_022280F0 (UnkStruct_ov13_02227244 * param0, u8 param1) +void ov13_022280F0(UnkStruct_ov13_02227244 *param0, u8 param1) { if (param0->unk_00->unk_14 == 1) { ov16_0226DFB0(param0->unk_38, Unk_ov13_02229BFC[param1][0], Unk_ov13_02229BFC[param1][1]); diff --git a/src/overlay013/ov13_02228128.c b/src/overlay013/ov13_02228128.c index ab02f87dba..68602715d5 100644 --- a/src/overlay013/ov13_02228128.c +++ b/src/overlay013/ov13_02228128.c @@ -1,14 +1,16 @@ +#include "overlay013/ov13_02228128.h" + #include #include #include "struct_defs/struct_0200D0F4.h" + +#include "overlay013/ov13_02227A4C.h" #include "overlay013/struct_ov13_02227244.h" -#include "unk_0200C6E4.h" #include "heap.h" +#include "unk_0200C6E4.h" #include "unk_02018340.h" -#include "overlay013/ov13_02227A4C.h" -#include "overlay013/ov13_02228128.h" typedef struct { u8 unk_00; @@ -17,26 +19,26 @@ typedef struct { u8 unk_03; } UnkStruct_ov13_02229D7C; -static void ov13_02228460(u16 * param0, u16 * param1, u8 param2, u8 param3, u8 param4, u8 param5); +static void ov13_02228460(u16 *param0, u16 *param1, u8 param2, u8 param3, u8 param4, u8 param5); static const UnkStruct_ov13_02229D7C Unk_ov13_02229D7C[] = { - {0x0, 0x1, 0x10, 0x9}, - {0x0, 0xA, 0x10, 0x9}, - {0x10, 0x1, 0x10, 0x9}, - {0x10, 0xA, 0x10, 0x9}, - {0x0, 0x13, 0x1A, 0x5}, - {0x1B, 0x13, 0x5, 0x5}, - {0x20, 0x1, 0x10, 0x6}, - {0x30, 0x1, 0x10, 0x6}, - {0x20, 0x7, 0x10, 0x6}, - {0x30, 0x7, 0x10, 0x6}, - {0x20, 0xD, 0x10, 0x6}, - {0x30, 0xD, 0x10, 0x6}, - {0x20, 0x13, 0x5, 0x5}, - {0x25, 0x13, 0x5, 0x5}, - {0x3B, 0x13, 0x5, 0x5}, - {0x0, 0x33, 0x1A, 0x5}, - {0x1B, 0x33, 0x5, 0x5} + { 0x0, 0x1, 0x10, 0x9 }, + { 0x0, 0xA, 0x10, 0x9 }, + { 0x10, 0x1, 0x10, 0x9 }, + { 0x10, 0xA, 0x10, 0x9 }, + { 0x0, 0x13, 0x1A, 0x5 }, + { 0x1B, 0x13, 0x5, 0x5 }, + { 0x20, 0x1, 0x10, 0x6 }, + { 0x30, 0x1, 0x10, 0x6 }, + { 0x20, 0x7, 0x10, 0x6 }, + { 0x30, 0x7, 0x10, 0x6 }, + { 0x20, 0xD, 0x10, 0x6 }, + { 0x30, 0xD, 0x10, 0x6 }, + { 0x20, 0x13, 0x5, 0x5 }, + { 0x25, 0x13, 0x5, 0x5 }, + { 0x3B, 0x13, 0x5, 0x5 }, + { 0x0, 0x33, 0x1A, 0x5 }, + { 0x1B, 0x33, 0x5, 0x5 } }; static const u8 Unk_ov13_02229D48[] = { @@ -141,7 +143,7 @@ static const u8 Unk_ov13_02229D38[] = { 0xFF }; -static const u8 * const Unk_ov13_02229DC0[] = { +static const u8 *const Unk_ov13_02229DC0[] = { Unk_ov13_02229D48, Unk_ov13_02229D3C, Unk_ov13_02229D44, @@ -167,7 +169,7 @@ static const u8 * const Unk_ov13_02229DC0[] = { Unk_ov13_02229D54 }; -void ov13_02228128 (UnkStruct_ov13_02227244 * param0, u16 * param1) +void ov13_02228128(UnkStruct_ov13_02227244 *param0, u16 *param1) { ov13_02228460(param0->unk_328[0], param1, 0, 0, 16, 9); ov13_02228460(param0->unk_328[1], param1, 0, (0 + 9), 16, 9); @@ -202,19 +204,19 @@ void ov13_02228128 (UnkStruct_ov13_02227244 * param0, u16 * param1) ov13_02228460(param0->unk_FBE[2], param1, ((20 + 4) + 4), 47, 4, 4); ov13_02228460(param0->unk_101E[0], param1, 20, (47 + 4), 4, 4); - ov13_02228460(param0->unk_101E[1], param1, (20 + 4), ((47 + 4)), 4, 4); - ov13_02228460(param0->unk_101E[2], param1, ((20 + 4) + 4), ((47 + 4)), 4, 4); + ov13_02228460(param0->unk_101E[1], param1, (20 + 4), (47 + 4), 4, 4); + ov13_02228460(param0->unk_101E[2], param1, ((20 + 4) + 4), (47 + 4), 4, 4); ov13_02228460(param0->unk_107E[0], param1, 20, ((47 + 4) + 4), 4, 4); - ov13_02228460(param0->unk_107E[1], param1, (20 + 4), (((47 + 4) + 4)), 4, 4); - ov13_02228460(param0->unk_107E[2], param1, ((20 + 4) + 4), (((47 + 4) + 4)), 4, 4); + ov13_02228460(param0->unk_107E[1], param1, (20 + 4), ((47 + 4) + 4), 4, 4); + ov13_02228460(param0->unk_107E[2], param1, ((20 + 4) + 4), ((47 + 4) + 4), 4, 4); ov13_02228460(param0->unk_10DE[0], param1, 20, (((47 + 4) + 4) + 4), 4, 4); - ov13_02228460(param0->unk_10DE[1], param1, (20 + 4), ((((47 + 4) + 4) + 4)), 4, 4); - ov13_02228460(param0->unk_10DE[2], param1, ((20 + 4) + 4), ((((47 + 4) + 4) + 4)), 4, 4); + ov13_02228460(param0->unk_10DE[1], param1, (20 + 4), (((47 + 4) + 4) + 4), 4, 4); + ov13_02228460(param0->unk_10DE[2], param1, ((20 + 4) + 4), (((47 + 4) + 4) + 4), 4, 4); } -static void ov13_02228460 (u16 * param0, u16 * param1, u8 param2, u8 param3, u8 param4, u8 param5) +static void ov13_02228460(u16 *param0, u16 *param1, u8 param2, u8 param3, u8 param4, u8 param5) { u16 v0, v1; @@ -225,7 +227,7 @@ static void ov13_02228460 (u16 * param0, u16 * param1, u8 param2, u8 param3, u8 } } -static u16 * ov13_022284B0 (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param2) +static u16 *ov13_022284B0(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2) { switch (param1) { case 0: @@ -257,7 +259,7 @@ static u16 * ov13_022284B0 (UnkStruct_ov13_02227244 * param0, u8 param1, u8 para return NULL; } -static u16 ov13_02228558 (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param2, u8 param3) +static u16 ov13_02228558(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2, u8 param3) { if (param2 == 3) { return 5; @@ -295,9 +297,9 @@ static u16 ov13_02228558 (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param2 return 0; } -static void ov13_022285C8 (UnkStruct_ov13_02227244 * param0, u16 * param1, u8 param2, u8 param3) +static void ov13_022285C8(UnkStruct_ov13_02227244 *param0, u16 *param1, u8 param2, u8 param3) { - u16 * v0; + u16 *v0; u16 v1, v2; if (param2 == 0) { @@ -319,9 +321,9 @@ static void ov13_022285C8 (UnkStruct_ov13_02227244 * param0, u16 * param1, u8 pa } } -static void ov13_0222863C (UnkStruct_ov13_02227244 * param0, u16 * param1, u8 param2, u8 param3, u8 param4) +static void ov13_0222863C(UnkStruct_ov13_02227244 *param0, u16 *param1, u8 param2, u8 param3, u8 param4) { - u16 * v0; + u16 *v0; u16 v1; u16 v2; @@ -335,9 +337,9 @@ static void ov13_0222863C (UnkStruct_ov13_02227244 * param0, u16 * param1, u8 pa ov13_022285C8(param0, param1, param2, param3); } -static void ov13_022286B8 (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param2, u8 param3) +static void ov13_022286B8(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2, u8 param3) { - u16 * v0; + u16 *v0; v0 = Heap_AllocFromHeap(param0->unk_00->unk_0C, Unk_ov13_02229D7C[param1].unk_02 * Unk_ov13_02229D7C[param1].unk_03 * 2); @@ -348,9 +350,9 @@ static void ov13_022286B8 (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param Heap_FreeToHeap(v0); } -static void ov13_0222872C (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param2) +static void ov13_0222872C(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2) { - const u8 * v0; + const u8 *v0; u16 v1; u8 v2, v3; @@ -386,9 +388,9 @@ static void ov13_0222872C (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param } } -static void ov13_022287A4 (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param2) +static void ov13_022287A4(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2) { - CellActorData * v0; + CellActorData *v0; u8 v1; if ((param1 >= 6) && (param1 <= 11)) { @@ -416,7 +418,7 @@ static void ov13_022287A4 (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param } } -void ov13_0222880C (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param2) +void ov13_0222880C(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2) { param0->unk_113E = 0; param0->unk_113F = 0; @@ -425,7 +427,7 @@ void ov13_0222880C (UnkStruct_ov13_02227244 * param0, u8 param1, u8 param2) param0->unk_1141_0 = 1; } -void ov13_02228848 (UnkStruct_ov13_02227244 * param0) +void ov13_02228848(UnkStruct_ov13_02227244 *param0) { if (param0->unk_1141_0 == 0) { return; @@ -457,7 +459,7 @@ void ov13_02228848 (UnkStruct_ov13_02227244 * param0) } } -void ov13_02228924 (UnkStruct_ov13_02227244 * param0, u8 param1) +void ov13_02228924(UnkStruct_ov13_02227244 *param0, u8 param1) { switch (param1) { case 0: @@ -474,8 +476,7 @@ void ov13_02228924 (UnkStruct_ov13_02227244 * param0, u8 param1) ov13_022286B8(param0, 5, 0, param1); break; - case 1: - { + case 1: { u32 v0; for (v0 = 0; v0 < 6; v0++) { diff --git a/src/overlay013/ov13_02228A38.c b/src/overlay013/ov13_02228A38.c index ecb3ed52c2..aa0da7bb73 100644 --- a/src/overlay013/ov13_02228A38.c +++ b/src/overlay013/ov13_02228A38.c @@ -1,61 +1,61 @@ +#include "overlay013/ov13_02228A38.h" + #include #include -#include "core_sys.h" +#include "struct_defs/struct_020F1DB8.h" -#include "overlay013/struct_ov13_02228A50_decl.h" +#include "battle/ov16_0226DB7C.h" #include "battle/struct_ov16_0226DC24_decl.h" +#include "overlay013/struct_ov13_02228A50_decl.h" -#include "struct_defs/struct_020F1DB8.h" - -#include "unk_02005474.h" +#include "core_sys.h" #include "heap.h" +#include "unk_02005474.h" #include "unk_0201E010.h" -#include "overlay013/ov13_02228A38.h" -#include "battle/ov16_0226DB7C.h" struct UnkStruct_ov13_02228A50_t { - UnkStruct_ov16_0226DC24 * unk_00; - const ByteFlagSet * unk_04; + UnkStruct_ov16_0226DC24 *unk_00; + const ByteFlagSet *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; u32 unk_0C; }; -UnkStruct_ov13_02228A50 * ov13_02228A38 (u32 param0) +UnkStruct_ov13_02228A50 *ov13_02228A38(u32 param0) { - UnkStruct_ov13_02228A50 * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov13_02228A50)); + UnkStruct_ov13_02228A50 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov13_02228A50)); memset(v0, 0, sizeof(UnkStruct_ov13_02228A50)); return v0; } -void ov13_02228A50 (UnkStruct_ov13_02228A50 * param0) +void ov13_02228A50(UnkStruct_ov13_02228A50 *param0) { Heap_FreeToHeap(param0); } -UnkStruct_ov16_0226DC24 * ov13_02228A58 (UnkStruct_ov13_02228A50 * param0) +UnkStruct_ov16_0226DC24 *ov13_02228A58(UnkStruct_ov13_02228A50 *param0) { return param0->unk_00; } -u8 ov13_02228A5C (UnkStruct_ov13_02228A50 * param0) +u8 ov13_02228A5C(UnkStruct_ov13_02228A50 *param0) { return param0->unk_08; } -void ov13_02228A60 (UnkStruct_ov13_02228A50 * param0, u8 param1) +void ov13_02228A60(UnkStruct_ov13_02228A50 *param0, u8 param1) { param0->unk_08 = param1; } -void ov13_02228A64 (UnkStruct_ov13_02228A50 * param0, UnkStruct_ov16_0226DC24 * param1) +void ov13_02228A64(UnkStruct_ov13_02228A50 *param0, UnkStruct_ov16_0226DC24 *param1) { param0->unk_00 = param1; } -void ov13_02228A68 (UnkStruct_ov13_02228A50 * param0, u8 param1) +void ov13_02228A68(UnkStruct_ov13_02228A50 *param0, u8 param1) { param0->unk_09 = param1; @@ -64,13 +64,13 @@ void ov13_02228A68 (UnkStruct_ov13_02228A50 * param0, u8 param1) } } -void ov13_02228A90 (UnkStruct_ov13_02228A50 * param0) +void ov13_02228A90(UnkStruct_ov13_02228A50 *param0) { param0->unk_09 = 0; param0->unk_0A = 0xff; } -void ov13_02228A9C (UnkStruct_ov13_02228A50 * param0, const ByteFlagSet * param1) +void ov13_02228A9C(UnkStruct_ov13_02228A50 *param0, const ByteFlagSet *param1) { ov13_02228A90(param0); @@ -82,12 +82,12 @@ void ov13_02228A9C (UnkStruct_ov13_02228A50 * param0, const ByteFlagSet * param1 } } -void ov13_02228AC8 (UnkStruct_ov13_02228A50 * param0, u32 param1) +void ov13_02228AC8(UnkStruct_ov13_02228A50 *param0, u32 param1) { param0->unk_0C = param1; } -static u8 ov13_02228ACC (UnkStruct_ov13_02228A50 * param0) +static u8 ov13_02228ACC(UnkStruct_ov13_02228A50 *param0) { if (param0->unk_08 == 1) { return 1; @@ -103,7 +103,7 @@ static u8 ov13_02228ACC (UnkStruct_ov13_02228A50 * param0) return 0; } -static u8 ov13_02228B18 (const ByteFlagSet * param0, u8 param1) +static u8 ov13_02228B18(const ByteFlagSet *param0, u8 param1) { switch (param1) { case 0: @@ -131,7 +131,7 @@ static u8 ov13_02228B18 (const ByteFlagSet * param0, u8 param1) return 0; } -u32 ov13_02228B64 (UnkStruct_ov13_02228A50 * param0) +u32 ov13_02228B64(UnkStruct_ov13_02228A50 *param0) { u8 v0, v1, v2, v3; u8 v4; diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 5a8bdc0bc3..475240f815 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -1,13 +1,25 @@ +#include "overlay017/ov17_0223B140.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" +#include "struct_defs/struct_02099F80.h" +#include "overlay011/ov11_0221F840.h" +#include "overlay012/ov12_0221FC20.h" #include "overlay017/const_ov17_022536B4.h" - -#include "struct_defs/struct_02099F80.h" +#include "overlay017/ov17_0223F118.h" +#include "overlay017/ov17_0223F7E4.h" +#include "overlay017/ov17_02241270.h" +#include "overlay017/ov17_022413D8.h" +#include "overlay017/ov17_02243AC4.h" +#include "overlay017/ov17_02243C28.h" +#include "overlay017/ov17_02245F14.h" +#include "overlay017/ov17_02246ECC.h" +#include "overlay017/ov17_0224F080.h" +#include "overlay017/ov17_0224F18C.h" #include "overlay017/struct_ov17_0223BCE8.h" #include "overlay017/struct_ov17_0223BE58.h" #include "overlay017/struct_ov17_02246F24.h" @@ -17,86 +29,74 @@ #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "move_table.h" +#include "narc.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_020041CC.h" -#include "game_overlay.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "move_table.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" -#include "overlay011/ov11_0221F840.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay017/ov17_0223B140.h" -#include "overlay017/ov17_0223F118.h" -#include "overlay017/ov17_0223F7E4.h" -#include "overlay017/ov17_02241270.h" -#include "overlay017/ov17_022413D8.h" -#include "overlay017/ov17_02243AC4.h" -#include "overlay017/ov17_02243C28.h" -#include "overlay017/ov17_02245F14.h" -#include "overlay017/ov17_02246ECC.h" -#include "overlay017/ov17_0224F080.h" -#include "overlay017/ov17_0224F18C.h" FS_EXTERN_OVERLAY(overlay11); FS_EXTERN_OVERLAY(overlay12); FS_EXTERN_OVERLAY(overlay22); -static void ov17_0223B728(BGL * param0); -static void ov17_0223B858(UnkStruct_ov17_02246F24 * param0); +static void ov17_0223B728(BGL *param0); +static void ov17_0223B858(UnkStruct_ov17_02246F24 *param0); static void ov17_0223B884(void); -static void ov17_0223B6F0(SysTask * param0, void * param1); -static void ov17_0223B6BC(void * param0); -static void ov17_0223B8C4(UnkStruct_ov17_02246F24 * param0); -static int ov17_0223BCE8(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223BD58(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223BDCC(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223BE58(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223BF1C(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223BFB0(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223C004(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223C068(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223C100(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223C2DC(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223C330(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223C350(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223BE54(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223C81C(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223C888(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static int ov17_0223CA30(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1); -static void ov17_0223B8F8(UnkStruct_ov17_02246F24 * param0, NARC * param1); -static void ov17_0223B9A4(UnkStruct_ov17_02246F24 * param0); -static void ov17_0223BA10(UnkStruct_ov17_02246F24 * param0, NARC * param1); -static void ov17_0223BAD0(UnkStruct_ov17_02246F24 * param0); -static void ov17_0223BBA8(UnkStruct_ov17_02246F24 * param0, NARC * param1); -static void ov17_0223BCDC(UnkStruct_ov17_02246F24 * param0); -static void ov17_0223BCE0(UnkStruct_ov17_02246F24 * param0, NARC * param1); -static void ov17_0223BCE4(UnkStruct_ov17_02246F24 * param0); -void ov17_0223BB14(UnkStruct_ov17_02246F24 * param0, int param1, int param2); - -static int(*const Unk_ov17_02252E10[])(UnkStruct_ov17_02246F24 *, UnkStruct_ov17_0223BCE8 *) = { +static void ov17_0223B6F0(SysTask *param0, void *param1); +static void ov17_0223B6BC(void *param0); +static void ov17_0223B8C4(UnkStruct_ov17_02246F24 *param0); +static int ov17_0223BCE8(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223BD58(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223BDCC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223BE58(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223BF1C(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223BFB0(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223C004(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223C068(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223C100(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223C2DC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223C330(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223C350(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223BE54(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223C81C(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223C888(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static int ov17_0223CA30(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1); +static void ov17_0223B8F8(UnkStruct_ov17_02246F24 *param0, NARC *param1); +static void ov17_0223B9A4(UnkStruct_ov17_02246F24 *param0); +static void ov17_0223BA10(UnkStruct_ov17_02246F24 *param0, NARC *param1); +static void ov17_0223BAD0(UnkStruct_ov17_02246F24 *param0); +static void ov17_0223BBA8(UnkStruct_ov17_02246F24 *param0, NARC *param1); +static void ov17_0223BCDC(UnkStruct_ov17_02246F24 *param0); +static void ov17_0223BCE0(UnkStruct_ov17_02246F24 *param0, NARC *param1); +static void ov17_0223BCE4(UnkStruct_ov17_02246F24 *param0); +void ov17_0223BB14(UnkStruct_ov17_02246F24 *param0, int param1, int param2); + +static int (*const Unk_ov17_02252E10[])(UnkStruct_ov17_02246F24 *, UnkStruct_ov17_0223BCE8 *) = { ov17_0223BCE8, ov17_0223BD58, ov17_0223BDCC, @@ -143,9 +143,9 @@ static const UnkStruct_ov104_02241308 Unk_ov17_02252DB0 = { 0x8 }; -int ov17_0223B140 (OverlayManager * param0, int * param1) +int ov17_0223B140(OverlayManager *param0, int *param1) { - UnkStruct_ov17_02246F24 * v0; + UnkStruct_ov17_02246F24 *v0; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -194,15 +194,15 @@ int ov17_0223B140 (OverlayManager * param0, int * param1) sub_02002BB8(2, 21); v0->unk_0C.unk_18 = sub_0200C6E4(21); - sub_0200C73C(v0->unk_0C.unk_18, &Unk_ov17_02252DC8, &Unk_ov17_02252D9C, ((16 + 16))); + sub_0200C73C(v0->unk_0C.unk_18, &Unk_ov17_02252DC8, &Unk_ov17_02252D9C, (16 + 16)); sub_0200966C(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_64K); sub_02009704(NNS_G2D_VRAM_TYPE_2DMAIN); v0->unk_0C.unk_1C = sub_0200C704(v0->unk_0C.unk_18); - sub_0200C7C0(v0->unk_0C.unk_18, v0->unk_0C.unk_1C, ((64 + 64))); + sub_0200C7C0(v0->unk_0C.unk_18, v0->unk_0C.unk_1C, (64 + 64)); sub_0200CB30(v0->unk_0C.unk_18, v0->unk_0C.unk_1C, &Unk_ov17_02252DB0); - sub_0200964C(sub_0200C738(v0->unk_0C.unk_18), 0, (((192 + 80) << FX32_SHIFT))); + sub_0200964C(sub_0200C738(v0->unk_0C.unk_18), 0, ((192 + 80) << FX32_SHIFT)); v0->unk_0C.unk_04 = sub_0200762C(21); ov17_0223B884(); @@ -219,8 +219,8 @@ int ov17_0223B140 (OverlayManager * param0, int * param1) v0->unk_0C.unk_4C = Strbuf_Init((3 * 160), 21); { - NARC * v1; - NARC * v2; + NARC *v1; + NARC *v2; v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 21); v2 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_OBJ, 21); @@ -266,9 +266,9 @@ int ov17_0223B140 (OverlayManager * param0, int * param1) return 1; } -int ov17_0223B444 (OverlayManager * param0, int * param1) +int ov17_0223B444(OverlayManager *param0, int *param1) { - UnkStruct_ov17_02246F24 * v0 = OverlayManager_Data(param0); + UnkStruct_ov17_02246F24 *v0 = OverlayManager_Data(param0); int v1; sub_02094E98(v0->unk_00); @@ -320,9 +320,9 @@ int ov17_0223B444 (OverlayManager * param0, int * param1) return 0; } -int ov17_0223B580 (OverlayManager * param0, int * param1) +int ov17_0223B580(OverlayManager *param0, int *param1) { - UnkStruct_ov17_02246F24 * v0 = OverlayManager_Data(param0); + UnkStruct_ov17_02246F24 *v0 = OverlayManager_Data(param0); int v1; sub_020141E4(); @@ -388,9 +388,9 @@ int ov17_0223B580 (OverlayManager * param0, int * param1) return 1; } -static void ov17_0223B6BC (void * param0) +static void ov17_0223B6BC(void *param0) { - UnkStruct_ov17_02246F24 * v0 = param0; + UnkStruct_ov17_02246F24 *v0 = param0; sub_02008A94(v0->unk_0C.unk_04); sub_0201DCAC(); @@ -401,9 +401,9 @@ static void ov17_0223B6BC (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov17_0223B6F0 (SysTask * param0, void * param1) +static void ov17_0223B6F0(SysTask *param0, void *param1) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; if (v0->unk_7EC == 1) { sub_02007768(v0->unk_0C.unk_04); @@ -416,7 +416,7 @@ static void ov17_0223B6F0 (SysTask * param0, void * param1) sub_02038A1C(21, v0->unk_0C.unk_24); } -static void ov17_0223B728 (BGL * param0) +static void ov17_0223B728(BGL *param0) { GXLayers_DisableEngineALayers(); @@ -468,7 +468,7 @@ static void ov17_0223B728 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -483,7 +483,7 @@ static void ov17_0223B728 (BGL * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -498,7 +498,7 @@ static void ov17_0223B728 (BGL * param0) 3, 0, 0, - 0 + 0, }, }; @@ -524,12 +524,12 @@ static void ov17_0223B728 (BGL * param0) } } -static void ov17_0223B858 (UnkStruct_ov17_02246F24 * param0) +static void ov17_0223B858(UnkStruct_ov17_02246F24 *param0) { - BGL_AddWindow(param0->unk_0C.unk_24, ¶m0->unk_0C.unk_28[0], 1, 11, 0x13, 20, 4, 0xd, (((0x8000 - 0x2000) / 32))); + BGL_AddWindow(param0->unk_0C.unk_24, ¶m0->unk_0C.unk_28[0], 1, 11, 0x13, 20, 4, 0xd, ((0x8000 - 0x2000) / 32)); } -static void ov17_0223B884 (void) +static void ov17_0223B884(void) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -547,7 +547,7 @@ static void ov17_0223B884 (void) sub_02014000(); } -static void ov17_0223B8C4 (UnkStruct_ov17_02246F24 * param0) +static void ov17_0223B8C4(UnkStruct_ov17_02246F24 *param0) { int v0; @@ -560,7 +560,7 @@ static void ov17_0223B8C4 (UnkStruct_ov17_02246F24 * param0) ov17_02243C28(param0); } -static void ov17_0223B8F8 (UnkStruct_ov17_02246F24 * param0, NARC * param1) +static void ov17_0223B8F8(UnkStruct_ov17_02246F24 *param0, NARC *param1) { SpriteRenderer_LoadPalette(param0->unk_0C.unk_50, 2, param0->unk_0C.unk_18, param0->unk_0C.unk_1C, param1, 0, 0, 6, NNS_G2D_VRAM_TYPE_2DMAIN, 33001); SpriteRenderer_LoadPalette(param0->unk_0C.unk_50, 2, param0->unk_0C.unk_18, param0->unk_0C.unk_1C, param1, 9, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33005); @@ -575,7 +575,7 @@ static void ov17_0223B8F8 (UnkStruct_ov17_02246F24 * param0, NARC * param1) ov17_02242154(param0->unk_0C.unk_18, param0->unk_0C.unk_1C, param1); } -static void ov17_0223B9A4 (UnkStruct_ov17_02246F24 * param0) +static void ov17_0223B9A4(UnkStruct_ov17_02246F24 *param0) { ov17_02241E24(¶m0->unk_0C); ov17_0224197C(¶m0->unk_0C); @@ -595,7 +595,7 @@ static void ov17_0223B9A4 (UnkStruct_ov17_02246F24 * param0) ov17_02242248(¶m0->unk_0C); } -static void ov17_0223BA10 (UnkStruct_ov17_02246F24 * param0, NARC * param1) +static void ov17_0223BA10(UnkStruct_ov17_02246F24 *param0, NARC *param1) { SpriteRenderer_LoadPalette(param0->unk_0C.unk_50, 3, param0->unk_0C.unk_18, param0->unk_0C.unk_1C, param1, 4, 0, 3, NNS_G2D_VRAM_TYPE_2DSUB, 33007); SpriteRenderer_LoadPalette(param0->unk_0C.unk_50, 3, param0->unk_0C.unk_18, param0->unk_0C.unk_1C, param1, 9, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 33008); @@ -621,7 +621,7 @@ static void ov17_0223BA10 (UnkStruct_ov17_02246F24 * param0, NARC * param1) } } -static void ov17_0223BAD0 (UnkStruct_ov17_02246F24 * param0) +static void ov17_0223BAD0(UnkStruct_ov17_02246F24 *param0) { SpriteGfxHandler_UnloadPlttObjById(param0->unk_0C.unk_1C, 33007); @@ -638,7 +638,7 @@ static void ov17_0223BAD0 (UnkStruct_ov17_02246F24 * param0) } } -void ov17_0223BB14 (UnkStruct_ov17_02246F24 * param0, int param1, int param2) +void ov17_0223BB14(UnkStruct_ov17_02246F24 *param0, int param1, int param2) { if (param1 == 0) { sub_02006E3C(45, 3, param0->unk_0C.unk_24, 2, 0, 0x4000, 1, 21); @@ -659,7 +659,7 @@ void ov17_0223BB14 (UnkStruct_ov17_02246F24 * param0, int param1, int param2) } } -static void ov17_0223BBA8 (UnkStruct_ov17_02246F24 * param0, NARC * param1) +static void ov17_0223BBA8(UnkStruct_ov17_02246F24 *param0, NARC *param1) { sub_020070E8(param1, 1, param0->unk_0C.unk_24, 3, 0, 0, 1, 21); sub_0200710C(param1, 2, param0->unk_0C.unk_24, 3, 0, 0, 1, 21); @@ -671,7 +671,7 @@ static void ov17_0223BBA8 (UnkStruct_ov17_02246F24 * param0, NARC * param1) PaletteSys_LoadPalette(param0->unk_0C.unk_50, 45, 30, 21, 0, 0, 0); { - u16 * v0, * v1, * v2, * v3; + u16 *v0, *v1, *v2, *v3; v0 = Heap_AllocFromHeap(21, 0x20); v1 = Heap_AllocFromHeap(21, 0x20); @@ -690,22 +690,22 @@ static void ov17_0223BBA8 (UnkStruct_ov17_02246F24 * param0, NARC * param1) } } -static void ov17_0223BCDC (UnkStruct_ov17_02246F24 * param0) +static void ov17_0223BCDC(UnkStruct_ov17_02246F24 *param0) { return; } -static void ov17_0223BCE0 (UnkStruct_ov17_02246F24 * param0, NARC * param1) +static void ov17_0223BCE0(UnkStruct_ov17_02246F24 *param0, NARC *param1) { return; } -static void ov17_0223BCE4 (UnkStruct_ov17_02246F24 * param0) +static void ov17_0223BCE4(UnkStruct_ov17_02246F24 *param0) { return; } -static int ov17_0223BCE8 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223BCE8(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { switch (param1->unk_00) { case 0: @@ -731,7 +731,7 @@ static int ov17_0223BCE8 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223BD58 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223BD58(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { if (sub_0209590C(param0->unk_00) == 0) { return 1; @@ -757,7 +757,7 @@ static int ov17_0223BD58 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223BDCC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223BDCC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { switch (param1->unk_00) { case 0: @@ -785,7 +785,7 @@ static int ov17_0223BDCC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223BE54 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223BE54(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { switch (param1->unk_00) { case 0: @@ -796,7 +796,7 @@ static int ov17_0223BE54 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223BE58 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223BE58(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { switch (param1->unk_00) { case 0: @@ -809,8 +809,7 @@ static int ov17_0223BE58 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B param1->unk_00++; } break; - case 2: - { + case 2: { UnkStruct_ov17_0223BE58 v0; int v1; @@ -831,7 +830,7 @@ static int ov17_0223BE58 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223BF1C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223BF1C(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { int v0, v1, v2; @@ -856,7 +855,7 @@ static int ov17_0223BF1C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 1; } -static int ov17_0223BFB0 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223BFB0(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { switch (param1->unk_00) { case 0: @@ -874,7 +873,7 @@ static int ov17_0223BFB0 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223C004 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223C004(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { switch (param1->unk_00) { case 0: @@ -895,7 +894,7 @@ static int ov17_0223C004 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223C068 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223C068(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { switch (param1->unk_00) { case 0: @@ -926,7 +925,7 @@ static int ov17_0223C068 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223C100 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223C100(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { switch (param1->unk_00) { case 0: @@ -993,7 +992,7 @@ static int ov17_0223C100 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223C2DC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223C2DC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { int v0; @@ -1013,7 +1012,7 @@ static int ov17_0223C2DC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223C330 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223C330(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { param0->unk_220.unk_05++; @@ -1025,7 +1024,7 @@ static int ov17_0223C330 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B } } -static int ov17_0223C350 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223C350(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { BOOL v0; @@ -1066,8 +1065,7 @@ static int ov17_0223C350 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B param1->unk_00 = 1; } break; - case 6: - { + case 6: { int v1; for (v1 = 0; v1 < 4; v1++) { @@ -1076,8 +1074,7 @@ static int ov17_0223C350 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B } param1->unk_00++; break; - case 7: - { + case 7: { int v2[(1 + 2)]; int v3[(1 + 2)]; int v4[(1 + 2)][4]; @@ -1258,7 +1255,7 @@ static int ov17_0223C350 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223C81C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223C81C(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { switch (param1->unk_00) { case 0: @@ -1281,7 +1278,7 @@ static int ov17_0223C81C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223C888 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223C888(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { int v0; @@ -1296,8 +1293,7 @@ static int ov17_0223C888 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B param1->unk_00++; } break; - case 2: - { + case 2: { int v1; v1 = 0; @@ -1362,11 +1358,10 @@ static int ov17_0223C888 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223B return 0; } -static int ov17_0223CA30 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BCE8 * param1) +static int ov17_0223CA30(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BCE8 *param1) { switch (param1->unk_00) { - case 0: - { + case 0: { int v0; for (v0 = 0; v0 < 4; v0++) { diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index ccd3ef7364..d5a0d33835 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -1,87 +1,88 @@ +#include "overlay017/ov17_0223CB1C.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/struct_02099F80.h" + +#include "overlay011/ov11_0221F840.h" +#include "overlay017/ov17_0223F118.h" +#include "overlay017/ov17_022476F8.h" +#include "overlay017/ov17_02247A48.h" +#include "overlay017/ov17_0224F18C.h" #include "overlay017/struct_ov17_0223D60C.h" #include "overlay017/struct_ov17_02247A48.h" +#include "overlay022/ov22_0225AF8C.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "game_options.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "game_overlay.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_020366A0.h" #include "unk_020393C8.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" -#include "overlay011/ov11_0221F840.h" -#include "overlay017/ov17_0223CB1C.h" -#include "overlay017/ov17_0223F118.h" -#include "overlay017/ov17_022476F8.h" -#include "overlay017/ov17_02247A48.h" -#include "overlay017/ov17_0224F18C.h" -#include "overlay022/ov22_0225AF8C.h" FS_EXTERN_OVERLAY(overlay11); FS_EXTERN_OVERLAY(overlay12); FS_EXTERN_OVERLAY(overlay22); -static void ov17_0223D0C8(void * param0); -static void ov17_0223D164(SysTask * param0, void * param1); -static void ov17_0223D1B8(BGL * param0); -static void ov17_0223D324(UnkStruct_ov17_02247A48 * param0); -static void ov17_0223D390(UnkStruct_ov17_02247A48 * param0); -static void ov17_0223D3B8(UnkStruct_ov17_02247A48 * param0, NARC * param1); -static void ov17_0223D434(UnkStruct_ov17_02247A48 * param0); -static void ov17_0223D468(UnkStruct_ov17_02247A48 * param0, NARC * param1); -static void ov17_0223D498(UnkStruct_ov17_02247A48 * param0); -static void ov17_0223D4A8(UnkStruct_ov17_02247A48 * param0, NARC * param1); -static void ov17_0223D5AC(UnkStruct_ov17_02247A48 * param0); -static void ov17_0223D5B0(UnkStruct_ov17_02247A48 * param0, NARC * param1); -static void ov17_0223D608(UnkStruct_ov17_02247A48 * param0); -static int ov17_0223D60C(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); -static int ov17_0223D640(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); -static int ov17_0223D99C(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); -static int ov17_0223DA78(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); +static void ov17_0223D0C8(void *param0); +static void ov17_0223D164(SysTask *param0, void *param1); +static void ov17_0223D1B8(BGL *param0); +static void ov17_0223D324(UnkStruct_ov17_02247A48 *param0); +static void ov17_0223D390(UnkStruct_ov17_02247A48 *param0); +static void ov17_0223D3B8(UnkStruct_ov17_02247A48 *param0, NARC *param1); +static void ov17_0223D434(UnkStruct_ov17_02247A48 *param0); +static void ov17_0223D468(UnkStruct_ov17_02247A48 *param0, NARC *param1); +static void ov17_0223D498(UnkStruct_ov17_02247A48 *param0); +static void ov17_0223D4A8(UnkStruct_ov17_02247A48 *param0, NARC *param1); +static void ov17_0223D5AC(UnkStruct_ov17_02247A48 *param0); +static void ov17_0223D5B0(UnkStruct_ov17_02247A48 *param0, NARC *param1); +static void ov17_0223D608(UnkStruct_ov17_02247A48 *param0); +static int ov17_0223D60C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); +static int ov17_0223D640(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); +static int ov17_0223D99C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); +static int ov17_0223DA78(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); static void ov17_0223D350(void); -static int ov17_0223D6B8(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); -static int ov17_0223D7DC(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); -static int ov17_0223D82C(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); -static int ov17_0223D8DC(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); -static int ov17_0223D96C(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); -static int ov17_0223D71C(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); -static int ov17_0223D78C(UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1); - -static int(*const Unk_ov17_02252F44[])(UnkStruct_ov17_02247A48 *, UnkStruct_ov17_0223D60C *) = { +static int ov17_0223D6B8(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); +static int ov17_0223D7DC(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); +static int ov17_0223D82C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); +static int ov17_0223D8DC(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); +static int ov17_0223D96C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); +static int ov17_0223D71C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); +static int ov17_0223D78C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1); + +static int (*const Unk_ov17_02252F44[])(UnkStruct_ov17_02247A48 *, UnkStruct_ov17_0223D60C *) = { ov17_0223D60C, ov17_0223D640, ov17_0223D6B8, @@ -123,9 +124,9 @@ static const UnkStruct_ov104_02241308 Unk_ov17_02252EC8 = { 0x8 }; -int ov17_0223CB1C (OverlayManager * param0, int * param1) +int ov17_0223CB1C(OverlayManager *param0, int *param1) { - UnkStruct_ov17_02247A48 * v0; + UnkStruct_ov17_02247A48 *v0; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -172,13 +173,13 @@ int ov17_0223CB1C (OverlayManager * param0, int * param1) v0->unk_0C.unk_1C = sub_0200C6E4(22); - sub_0200C73C(v0->unk_0C.unk_1C, &Unk_ov17_02252EFC, &Unk_ov17_02252EB4, ((16 + 16))); + sub_0200C73C(v0->unk_0C.unk_1C, &Unk_ov17_02252EFC, &Unk_ov17_02252EB4, (16 + 16)); sub_0200966C(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_64K); sub_02009704(NNS_G2D_VRAM_TYPE_2DMAIN); v0->unk_0C.unk_20 = sub_0200C704(v0->unk_0C.unk_1C); - sub_0200C7C0(v0->unk_0C.unk_1C, v0->unk_0C.unk_20, ((64 + 64))); + sub_0200C7C0(v0->unk_0C.unk_1C, v0->unk_0C.unk_20, (64 + 64)); sub_0200CB30(v0->unk_0C.unk_1C, v0->unk_0C.unk_20, &Unk_ov17_02252EC8); sub_0200964C(sub_0200C738(v0->unk_0C.unk_1C), 0, (256 * FX32_ONE)); @@ -190,8 +191,8 @@ int ov17_0223CB1C (OverlayManager * param0, int * param1) v0->unk_0C.unk_40 = Strbuf_Init((2 * 160), 22); { - NARC * v1; - NARC * v2; + NARC *v1; + NARC *v2; v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 22); v2 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_OBJ, 22); @@ -228,9 +229,9 @@ int ov17_0223CB1C (OverlayManager * param0, int * param1) return 1; } -int ov17_0223CDDC (OverlayManager * param0, int * param1) +int ov17_0223CDDC(OverlayManager *param0, int *param1) { - UnkStruct_ov17_02247A48 * v0 = OverlayManager_Data(param0); + UnkStruct_ov17_02247A48 *v0 = OverlayManager_Data(param0); int v1; sub_02094E98(v0->unk_00); @@ -287,9 +288,9 @@ int ov17_0223CDDC (OverlayManager * param0, int * param1) return 0; } -int ov17_0223CF8C (OverlayManager * param0, int * param1) +int ov17_0223CF8C(OverlayManager *param0, int *param1) { - UnkStruct_ov17_02247A48 * v0 = OverlayManager_Data(param0); + UnkStruct_ov17_02247A48 *v0 = OverlayManager_Data(param0); int v1; sub_020141E4(); @@ -352,9 +353,9 @@ int ov17_0223CF8C (OverlayManager * param0, int * param1) return 1; } -static void ov17_0223D0C8 (void * param0) +static void ov17_0223D0C8(void *param0) { - UnkStruct_ov17_02247A48 * v0 = param0; + UnkStruct_ov17_02247A48 *v0 = param0; { G2_SetWnd0Position(v0->unk_F58, v0->unk_F59, v0->unk_F5A, v0->unk_F5B); @@ -381,9 +382,9 @@ static void ov17_0223D0C8 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov17_0223D164 (SysTask * param0, void * param1) +static void ov17_0223D164(SysTask *param0, void *param1) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; if (v0->unk_4F6 == 1) { sub_02007768(v0->unk_0C.unk_04); @@ -408,7 +409,7 @@ static void ov17_0223D164 (SysTask * param0, void * param1) sub_02038A1C(22, v0->unk_0C.unk_24); } -static void ov17_0223D1B8 (BGL * param0) +static void ov17_0223D1B8(BGL *param0) { GXLayers_DisableEngineALayers(); @@ -460,7 +461,7 @@ static void ov17_0223D1B8 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -475,10 +476,22 @@ static void ov17_0223D1B8 (BGL * param0) 2, 0, 0, - 0 + 0, }, { - 0, 0, 0x1000, 0, 3, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x3000, GX_BG_CHARBASE_0x04000, GX_BG_EXTPLTT_01, 3, 0, 0, 0 + 0, + 0, + 0x1000, + 0, + 3, + GX_BG_COLORMODE_16, + GX_BG_SCRBASE_0x3000, + GX_BG_CHARBASE_0x04000, + GX_BG_EXTPLTT_01, + 3, + 0, + 0, + 0, }, }; @@ -514,7 +527,7 @@ static void ov17_0223D1B8 (BGL * param0) 3, 0, 0, - 0 + 0, }, }; @@ -525,12 +538,12 @@ static void ov17_0223D1B8 (BGL * param0) } } -static void ov17_0223D324 (UnkStruct_ov17_02247A48 * param0) +static void ov17_0223D324(UnkStruct_ov17_02247A48 *param0) { - BGL_AddWindow(param0->unk_0C.unk_24, ¶m0->unk_0C.unk_28[0], 1, 0x2, 0x13, 27, 4, 13, (((18 + 12) + 1))); + BGL_AddWindow(param0->unk_0C.unk_24, ¶m0->unk_0C.unk_28[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1)); } -static void ov17_0223D350 (void) +static void ov17_0223D350(void) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -548,7 +561,7 @@ static void ov17_0223D350 (void) sub_02014000(); } -static void ov17_0223D390 (UnkStruct_ov17_02247A48 * param0) +static void ov17_0223D390(UnkStruct_ov17_02247A48 *param0) { int v0; @@ -561,7 +574,7 @@ static void ov17_0223D390 (UnkStruct_ov17_02247A48 * param0) ov17_02247A48(param0); } -static void ov17_0223D3B8 (UnkStruct_ov17_02247A48 * param0, NARC * param1) +static void ov17_0223D3B8(UnkStruct_ov17_02247A48 *param0, NARC *param1) { SpriteRenderer_LoadPalette(param0->unk_0C.unk_44, 2, param0->unk_0C.unk_1C, param0->unk_0C.unk_20, param1, 7, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 33001); @@ -570,7 +583,7 @@ static void ov17_0223D3B8 (UnkStruct_ov17_02247A48 * param0, NARC * param1) ov17_0223F630(¶m0->unk_0C.unk_A8, param0->unk_0C.unk_1C, param0->unk_0C.unk_20, 33001, 33001, 33001, 33001, 0, 200, 3, 50000); } -static void ov17_0223D434 (UnkStruct_ov17_02247A48 * param0) +static void ov17_0223D434(UnkStruct_ov17_02247A48 *param0) { ov17_02247798(param0->unk_0C.unk_20); ov17_0223F6C4(¶m0->unk_0C.unk_A8); @@ -579,17 +592,17 @@ static void ov17_0223D434 (UnkStruct_ov17_02247A48 * param0) SpriteGfxHandler_UnloadPlttObjById(param0->unk_0C.unk_20, 33001); } -static void ov17_0223D468 (UnkStruct_ov17_02247A48 * param0, NARC * param1) +static void ov17_0223D468(UnkStruct_ov17_02247A48 *param0, NARC *param1) { sub_0200CD7C(param0->unk_0C.unk_44, 3, param0->unk_0C.unk_1C, param0->unk_0C.unk_20, 46, 8, 0, 2, NNS_G2D_VRAM_TYPE_2DSUB, 33002); } -static void ov17_0223D498 (UnkStruct_ov17_02247A48 * param0) +static void ov17_0223D498(UnkStruct_ov17_02247A48 *param0) { SpriteGfxHandler_UnloadPlttObjById(param0->unk_0C.unk_20, 33002); } -static void ov17_0223D4A8 (UnkStruct_ov17_02247A48 * param0, NARC * param1) +static void ov17_0223D4A8(UnkStruct_ov17_02247A48 *param0, NARC *param1) { int v0; @@ -608,24 +621,24 @@ static void ov17_0223D4A8 (UnkStruct_ov17_02247A48 * param0, NARC * param1) PaletteSys_LoadPalette(param0->unk_0C.unk_44, 45, 37, 22, 0, 0x20, 0xc * 16); } -static void ov17_0223D5AC (UnkStruct_ov17_02247A48 * param0) +static void ov17_0223D5AC(UnkStruct_ov17_02247A48 *param0) { return; } -static void ov17_0223D5B0 (UnkStruct_ov17_02247A48 * param0, NARC * param1) +static void ov17_0223D5B0(UnkStruct_ov17_02247A48 *param0, NARC *param1) { sub_020070E8(param1, 19, param0->unk_0C.unk_24, 4, 0, 0, 1, 22); sub_0200710C(param1, 20, param0->unk_0C.unk_24, 4, 0, 0, 1, 22); PaletteSys_LoadPalette(param0->unk_0C.unk_44, 45, 34, 22, 1, 0, 0); } -static void ov17_0223D608 (UnkStruct_ov17_02247A48 * param0) +static void ov17_0223D608(UnkStruct_ov17_02247A48 *param0) { return; } -static int ov17_0223D60C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223D60C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: @@ -645,7 +658,7 @@ static int ov17_0223D60C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D return 0; } -static int ov17_0223D640 (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223D640(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: @@ -672,7 +685,7 @@ static int ov17_0223D640 (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D return 0; } -static int ov17_0223D6B8 (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223D6B8(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: @@ -692,7 +705,7 @@ static int ov17_0223D6B8 (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D return 0; } -static int ov17_0223D71C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223D71C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: @@ -715,7 +728,7 @@ static int ov17_0223D71C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D return 0; } -static int ov17_0223D78C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223D78C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: @@ -733,7 +746,7 @@ static int ov17_0223D78C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D return 0; } -static int ov17_0223D7DC (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223D7DC(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: @@ -751,7 +764,7 @@ static int ov17_0223D7DC (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D return 0; } -static int ov17_0223D82C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223D82C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: @@ -789,7 +802,7 @@ static int ov17_0223D82C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D return 0; } -static int ov17_0223D8DC (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223D8DC(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: @@ -813,7 +826,7 @@ static int ov17_0223D8DC (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D return 0; } -static int ov17_0223D96C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223D96C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: @@ -832,7 +845,7 @@ static int ov17_0223D96C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D return 0; } -static int ov17_0223D99C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223D99C(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: @@ -875,7 +888,7 @@ static int ov17_0223D99C (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D return 0; } -static int ov17_0223DA78 (UnkStruct_ov17_02247A48 * param0, UnkStruct_ov17_0223D60C * param1) +static int ov17_0223DA78(UnkStruct_ov17_02247A48 *param0, UnkStruct_ov17_0223D60C *param1) { switch (param1->unk_00) { case 0: diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index f9882f8cac..778e0ea76b 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -1,185 +1,220 @@ +#include "overlay017/ov17_0223DAD0.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/struct_02099F80.h" + +#include "overlay011/ov11_0221F840.h" +#include "overlay017/ov17_0223F118.h" +#include "overlay017/ov17_022492DC.h" +#include "overlay017/ov17_0224A0FC.h" +#include "overlay017/ov17_0224CFB8.h" +#include "overlay017/ov17_0224F18C.h" +#include "overlay017/ov17_02250744.h" #include "overlay017/struct_ov17_0223E838.h" #include "overlay017/struct_ov17_0223F03C.h" #include "overlay017/struct_ov17_0224CD84.h" #include "overlay017/struct_ov17_0224DF54.h" #include "overlay017/struct_ov17_02252FC4.h" #include "overlay017/struct_ov17_02253084.h" +#include "overlay022/ov22_0225AF8C.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "camera.h" +#include "game_options.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "game_overlay.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "camera.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "pokemon.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" -#include "overlay011/ov11_0221F840.h" -#include "overlay017/ov17_0223DAD0.h" -#include "overlay017/ov17_0223F118.h" -#include "overlay017/ov17_022492DC.h" -#include "overlay017/ov17_0224A0FC.h" -#include "overlay017/ov17_0224CFB8.h" -#include "overlay017/ov17_0224F18C.h" -#include "overlay017/ov17_02250744.h" -#include "overlay022/ov22_0225AF8C.h" FS_EXTERN_OVERLAY(overlay11); FS_EXTERN_OVERLAY(overlay12); FS_EXTERN_OVERLAY(overlay22); -static void ov17_0223E09C(void * param0); -static void ov17_0223E1FC(SysTask * param0, void * param1); -static void ov17_0223E250(BGL * param0); -static void ov17_0223E380(UnkStruct_ov17_0224DF54 * param0); -static void ov17_0223E458(UnkStruct_ov17_0224DF54 * param0); -static void ov17_0223E4B0(UnkStruct_ov17_0224DF54 * param0, NARC * param1); -static void ov17_0223E588(UnkStruct_ov17_0224DF54 * param0); -static void ov17_0223E60C(UnkStruct_ov17_0224DF54 * param0, NARC * param1); -static void ov17_0223E678(UnkStruct_ov17_0224DF54 * param0); -static void ov17_0223E67C(UnkStruct_ov17_0224DF54 * param0, NARC * param1); -static void ov17_0223E76C(UnkStruct_ov17_0224DF54 * param0); -static void ov17_0223E770(UnkStruct_ov17_0224DF54 * param0, NARC * param1); -static void ov17_0223E774(UnkStruct_ov17_0224DF54 * param0); -static void ov17_0223E778(UnkStruct_ov17_0224DF54 * param0); -static void ov17_0223E7E0(UnkStruct_ov17_0224DF54 * param0); -static int ov17_0223E838(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223E8AC(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223E954(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223EE54(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223EEB8(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223F03C(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223E9A4(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223EBB0(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223EC20(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223EC74(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223ECC8(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223ED1C(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static int ov17_0223ED9C(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1); -static BOOL ov17_0223E3CC(UnkStruct_ov17_0224DF54 * param0, int * param1, int * param2); +static void ov17_0223E09C(void *param0); +static void ov17_0223E1FC(SysTask *param0, void *param1); +static void ov17_0223E250(BGL *param0); +static void ov17_0223E380(UnkStruct_ov17_0224DF54 *param0); +static void ov17_0223E458(UnkStruct_ov17_0224DF54 *param0); +static void ov17_0223E4B0(UnkStruct_ov17_0224DF54 *param0, NARC *param1); +static void ov17_0223E588(UnkStruct_ov17_0224DF54 *param0); +static void ov17_0223E60C(UnkStruct_ov17_0224DF54 *param0, NARC *param1); +static void ov17_0223E678(UnkStruct_ov17_0224DF54 *param0); +static void ov17_0223E67C(UnkStruct_ov17_0224DF54 *param0, NARC *param1); +static void ov17_0223E76C(UnkStruct_ov17_0224DF54 *param0); +static void ov17_0223E770(UnkStruct_ov17_0224DF54 *param0, NARC *param1); +static void ov17_0223E774(UnkStruct_ov17_0224DF54 *param0); +static void ov17_0223E778(UnkStruct_ov17_0224DF54 *param0); +static void ov17_0223E7E0(UnkStruct_ov17_0224DF54 *param0); +static int ov17_0223E838(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223E8AC(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223E954(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223EE54(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223EEB8(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223F03C(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223E9A4(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223EBB0(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223EC20(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223EC74(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223ECC8(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223ED1C(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static int ov17_0223ED9C(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1); +static BOOL ov17_0223E3CC(UnkStruct_ov17_0224DF54 *param0, int *param1, int *param2); static void ov17_0223E450(void); static u32 ov17_0223E800(u32 param0, BOOL param1); static u32 ov17_0223E81C(u32 param0, BOOL param1); static const UnkStruct_ov17_02253084 Unk_ov17_02253084[] = { - { - 0x499, - 0x78, - 0x2, - 0x3, - 0x4, - 0x4, - { 0x2, 0x2, 0x3, 0x3 } - }, - { - 0x49B, - 0x78, - 0x2, - 0x4, - 0x4, - 0x4, - { 0x2, 0x2, 0x3, 0x3 } - }, - { - 0x4B5, - 0x64, - 0x2, - 0x4, - 0x3, - 0x3, - { 0x1, 0x1, 0x2, 0x2 } - }, - { - 0x4B9, - 0x3C, - 0x2, - 0x4, - 0x3, - 0x3, - { 0x2, 0x2, 0x3, 0x3 } - }, - { - 0x4B7, - 0x96, - 0x2, - 0x4, - 0x4, - 0x4, - { 0x1, 0x1, 0x2, 0x2 } - }, - { - 0x4B6, - 0x84, - 0x2, - 0x4, - 0x4, - 0x4, - { 0x1, 0x1, 0x2, 0x2 } - }, - { - 0x4B8, - 0x8C, - 0x2, - 0x4, - 0x4, - 0x4, - { 0x1, 0x1, 0x2, 0x2 } - } + { + 0x499, + 0x78, + 0x2, + 0x3, + 0x4, + 0x4, + { + 0x2, + 0x2, + 0x3, + 0x3, + }, + }, + { + 0x49B, + 0x78, + 0x2, + 0x4, + 0x4, + 0x4, + { + 0x2, + 0x2, + 0x3, + 0x3, + }, + }, + { + 0x4B5, + 0x64, + 0x2, + 0x4, + 0x3, + 0x3, + { + 0x1, + 0x1, + 0x2, + 0x2, + }, + }, + { + 0x4B9, + 0x3C, + 0x2, + 0x4, + 0x3, + 0x3, + { + 0x2, + 0x2, + 0x3, + 0x3, + }, + }, + { + 0x4B7, + 0x96, + 0x2, + 0x4, + 0x4, + 0x4, + { + 0x1, + 0x1, + 0x2, + 0x2, + }, + }, + { + 0x4B6, + 0x84, + 0x2, + 0x4, + 0x4, + 0x4, + { + 0x1, + 0x1, + 0x2, + 0x2, + }, + }, + { + 0x4B8, + 0x8C, + 0x2, + 0x4, + 0x4, + 0x4, + { + 0x1, + 0x1, + 0x2, + 0x2, + }, + }, }; static const struct { - u32 unk_00; - u32 unk_04; + u32 unk_00; + u32 unk_04; } Unk_ov17_0225312C[4][5] = { - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x0 }, - { 0x2, 0x1, 0x3, 0x1, 0x4, 0x0, 0x5, 0x0, 0x6, 0x0 }, - { 0x2, 0x1, 0x3, 0x1, 0x4, 0x0, 0x5, 0x0, 0x6, 0x0 } + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x0 }, + { 0x2, 0x1, 0x3, 0x1, 0x4, 0x0, 0x5, 0x0, 0x6, 0x0 }, + { 0x2, 0x1, 0x3, 0x1, 0x4, 0x0, 0x5, 0x0, 0x6, 0x0 } }; static const UnkStruct_ov17_02252FC4 Unk_ov17_02252FC4[] = { - { 0xE, 0x10, 0x20 }, - { 0xF, 0xC, 0x1E } + { 0xE, 0x10, 0x20 }, + { 0xF, 0xC, 0x1E } }; - -static int(*const Unk_ov17_02253050[])(UnkStruct_ov17_0224DF54 *, UnkStruct_ov17_0223E838 *) = { +static int (*const Unk_ov17_02253050[])(UnkStruct_ov17_0224DF54 *, UnkStruct_ov17_0223E838 *) = { ov17_0223E838, ov17_0223E8AC, ov17_0223E954, @@ -223,9 +258,9 @@ static const UnkStruct_ov104_02241308 Unk_ov17_02252FF0 = { 0x8 }; -int ov17_0223DAD0 (OverlayManager * param0, int * param1) +int ov17_0223DAD0(OverlayManager *param0, int *param1) { - UnkStruct_ov17_0224DF54 * v0; + UnkStruct_ov17_0224DF54 *v0; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -275,13 +310,13 @@ int ov17_0223DAD0 (OverlayManager * param0, int * param1) v0->unk_14.unk_58 = sub_0200C6E4(23); - sub_0200C73C(v0->unk_14.unk_58, &Unk_ov17_02253008, &Unk_ov17_02252FDC, ((16 + 16))); + sub_0200C73C(v0->unk_14.unk_58, &Unk_ov17_02253008, &Unk_ov17_02252FDC, (16 + 16)); sub_0200966C(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_64K); sub_02009704(NNS_G2D_VRAM_TYPE_2DMAIN); v0->unk_14.unk_5C = sub_0200C704(v0->unk_14.unk_58); - sub_0200C7C0(v0->unk_14.unk_58, v0->unk_14.unk_5C, ((64 + 64))); + sub_0200C7C0(v0->unk_14.unk_58, v0->unk_14.unk_5C, (64 + 64)); sub_0200CB30(v0->unk_14.unk_58, v0->unk_14.unk_5C, &Unk_ov17_02252FF0); sub_0200964C(sub_0200C738(v0->unk_14.unk_58), 0, (256 * FX32_ONE)); @@ -294,8 +329,8 @@ int ov17_0223DAD0 (OverlayManager * param0, int * param1) v0->unk_14.unk_94 = sub_02012744((3 * 3), 23); { - NARC * v1; - NARC * v2; + NARC *v1; + NARC *v2; v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 23); v2 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_OBJ, 23); @@ -337,9 +372,9 @@ int ov17_0223DAD0 (OverlayManager * param0, int * param1) return 1; } -int ov17_0223DDD4 (OverlayManager * param0, int * param1) +int ov17_0223DDD4(OverlayManager *param0, int *param1) { - UnkStruct_ov17_0224DF54 * v0 = OverlayManager_Data(param0); + UnkStruct_ov17_0224DF54 *v0 = OverlayManager_Data(param0); int v1; sub_02094E98(v0->unk_00); @@ -391,9 +426,9 @@ int ov17_0223DDD4 (OverlayManager * param0, int * param1) return 0; } -int ov17_0223DF0C (OverlayManager * param0, int * param1) +int ov17_0223DF0C(OverlayManager *param0, int *param1) { - UnkStruct_ov17_0224DF54 * v0 = OverlayManager_Data(param0); + UnkStruct_ov17_0224DF54 *v0 = OverlayManager_Data(param0); int v1; GF_ASSERT(sub_02014710(v0->unk_0C) == 0); @@ -460,9 +495,9 @@ int ov17_0223DF0C (OverlayManager * param0, int * param1) return 1; } -static void ov17_0223E09C (void * param0) +static void ov17_0223E09C(void *param0) { - UnkStruct_ov17_0224DF54 * v0 = param0; + UnkStruct_ov17_0224DF54 *v0 = param0; if (v0->unk_1078) { u32 v1, v2; @@ -507,10 +542,10 @@ static void ov17_0223E09C (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov17_0223E18C (UnkStruct_ov17_0224DF54 * param0) +static void ov17_0223E18C(UnkStruct_ov17_0224DF54 *param0) { - u16 * v0; - UnkStruct_ov17_0224CD84 * v1; + u16 *v0; + UnkStruct_ov17_0224CD84 *v1; s32 v2; v1 = ¶m0->unk_1050; @@ -541,9 +576,9 @@ static void ov17_0223E18C (UnkStruct_ov17_0224DF54 * param0) } } -static void ov17_0223E1FC (SysTask * param0, void * param1) +static void ov17_0223E1FC(SysTask *param0, void *param1) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; ov17_0223E18C(v0); @@ -569,7 +604,7 @@ static void ov17_0223E1FC (SysTask * param0, void * param1) sub_02038A1C(23, v0->unk_14.unk_60); } -static void ov17_0223E250 (BGL * param0) +static void ov17_0223E250(BGL *param0) { GXLayers_DisableEngineALayers(); @@ -621,7 +656,7 @@ static void ov17_0223E250 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -636,7 +671,7 @@ static void ov17_0223E250 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -651,7 +686,7 @@ static void ov17_0223E250 (BGL * param0) 3, 0, 0, - 0 + 0, }, }; @@ -677,13 +712,13 @@ static void ov17_0223E250 (BGL * param0) } } -static void ov17_0223E380 (UnkStruct_ov17_0224DF54 * param0) +static void ov17_0223E380(UnkStruct_ov17_0224DF54 *param0) { - BGL_AddWindow(param0->unk_14.unk_60, ¶m0->unk_14.unk_64[0], 1, 0x2, 0x13, 27, 4, 13, (((18 + 12) + 1))); - BGL_AddWindow(param0->unk_14.unk_60, ¶m0->unk_14.unk_64[1], 1, 0x2, 0xb, 27, 2, 13, (((18 + 12) + 1))); + BGL_AddWindow(param0->unk_14.unk_60, ¶m0->unk_14.unk_64[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1)); + BGL_AddWindow(param0->unk_14.unk_60, ¶m0->unk_14.unk_64[1], 1, 0x2, 0xb, 27, 2, 13, ((18 + 12) + 1)); } -static BOOL ov17_0223E3CC (UnkStruct_ov17_0224DF54 * param0, int * param1, int * param2) +static BOOL ov17_0223E3CC(UnkStruct_ov17_0224DF54 *param0, int *param1, int *param2) { if ((param0->unk_00->unk_155 == 1) && (param0->unk_00->unk_15B > 0)) { param0->unk_1B26 = 1; @@ -702,12 +737,12 @@ static BOOL ov17_0223E3CC (UnkStruct_ov17_0224DF54 * param0, int * param1, int * } } -static void ov17_0223E450 (void) +static void ov17_0223E450(void) { sub_02014000(); } -static void ov17_0223E458 (UnkStruct_ov17_0224DF54 * param0) +static void ov17_0223E458(UnkStruct_ov17_0224DF54 *param0) { int v0; @@ -725,7 +760,7 @@ static void ov17_0223E458 (UnkStruct_ov17_0224DF54 * param0) } } -static void ov17_0223E4B0 (UnkStruct_ov17_0224DF54 * param0, NARC * param1) +static void ov17_0223E4B0(UnkStruct_ov17_0224DF54 *param0, NARC *param1) { SpriteRenderer_LoadPalette(param0->unk_14.unk_90, 2, param0->unk_14.unk_58, param0->unk_14.unk_5C, param1, 6, 0, 8, NNS_G2D_VRAM_TYPE_2DMAIN, 33001); @@ -747,7 +782,7 @@ static void ov17_0223E4B0 (UnkStruct_ov17_0224DF54 * param0, NARC * param1) ov17_0224B01C(param0); } -static void ov17_0223E588 (UnkStruct_ov17_0224DF54 * param0) +static void ov17_0223E588(UnkStruct_ov17_0224DF54 *param0) { ov17_0224A210(param0->unk_14.unk_5C); ov17_0224A428(param0->unk_14.unk_5C); @@ -770,7 +805,7 @@ static void ov17_0223E588 (UnkStruct_ov17_0224DF54 * param0) SpriteGfxHandler_UnloadPlttObjById(param0->unk_14.unk_5C, 33001); } -static void ov17_0223E60C (UnkStruct_ov17_0224DF54 * param0, NARC * param1) +static void ov17_0223E60C(UnkStruct_ov17_0224DF54 *param0, NARC *param1) { sub_0200CD7C(param0->unk_14.unk_90, 3, param0->unk_14.unk_58, param0->unk_14.unk_5C, 46, 6, 0, 2, NNS_G2D_VRAM_TYPE_2DSUB, 33002); sub_0200CD7C(param0->unk_14.unk_90, 3, param0->unk_14.unk_58, param0->unk_14.unk_5C, 46, 9, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 33003); @@ -778,12 +813,12 @@ static void ov17_0223E60C (UnkStruct_ov17_0224DF54 * param0, NARC * param1) ov17_022493C4(param0->unk_1074); } -static void ov17_0223E678 (UnkStruct_ov17_0224DF54 * param0) +static void ov17_0223E678(UnkStruct_ov17_0224DF54 *param0) { return; } -static void ov17_0223E67C (UnkStruct_ov17_0224DF54 * param0, NARC * param1) +static void ov17_0223E67C(UnkStruct_ov17_0224DF54 *param0, NARC *param1) { int v0; @@ -807,33 +842,33 @@ static void ov17_0223E67C (UnkStruct_ov17_0224DF54 * param0, NARC * param1) ov17_0224C848(param0); { - u16 * v4; + u16 *v4; v4 = sub_02003164(param0->unk_14.unk_90, 0); MI_CpuCopy16(v4, param0->unk_1050.unk_00, 0x200); } } -static void ov17_0223E76C (UnkStruct_ov17_0224DF54 * param0) +static void ov17_0223E76C(UnkStruct_ov17_0224DF54 *param0) { return; } -static void ov17_0223E770 (UnkStruct_ov17_0224DF54 * param0, NARC * param1) +static void ov17_0223E770(UnkStruct_ov17_0224DF54 *param0, NARC *param1) { return; } -static void ov17_0223E774 (UnkStruct_ov17_0224DF54 * param0) +static void ov17_0223E774(UnkStruct_ov17_0224DF54 *param0) { return; } -static void ov17_0223E778 (UnkStruct_ov17_0224DF54 * param0) +static void ov17_0223E778(UnkStruct_ov17_0224DF54 *param0) { - void * v0; - Camera * camera; - void * v2; + void *v0; + Camera *camera; + void *v2; GF_ASSERT(param0->unk_0C == NULL); @@ -847,9 +882,9 @@ static void ov17_0223E778 (UnkStruct_ov17_0224DF54 * param0) sub_020144CC(param0->unk_0C, v2, (1 << 1) | (1 << 3), 1); } -static void ov17_0223E7E0 (UnkStruct_ov17_0224DF54 * param0) +static void ov17_0223E7E0(UnkStruct_ov17_0224DF54 *param0) { - void * v0; + void *v0; v0 = sub_02014730(param0->unk_0C); sub_0201411C(param0->unk_0C); @@ -858,7 +893,7 @@ static void ov17_0223E7E0 (UnkStruct_ov17_0224DF54 * param0) param0->unk_0C = NULL; } -static u32 ov17_0223E800 (u32 param0, BOOL param1) +static u32 ov17_0223E800(u32 param0, BOOL param1) { NNSGfdTexKey v0; u32 v1; @@ -870,7 +905,7 @@ static u32 ov17_0223E800 (u32 param0, BOOL param1) return v1; } -static u32 ov17_0223E81C (u32 param0, BOOL param1) +static u32 ov17_0223E81C(u32 param0, BOOL param1) { NNSGfdPlttKey v0; u32 v1; @@ -882,7 +917,7 @@ static u32 ov17_0223E81C (u32 param0, BOOL param1) return v1; } -static int ov17_0223E838 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223E838(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { int v0; @@ -910,7 +945,7 @@ static int ov17_0223E838 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223E8AC (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223E8AC(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { switch (param1->unk_00) { case 0: @@ -941,7 +976,7 @@ static int ov17_0223E8AC (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223E954 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223E954(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { switch (param1->unk_00) { case 0: @@ -959,7 +994,7 @@ static int ov17_0223E954 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223E9A4 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223E9A4(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { int v0, v1; u64 v2; @@ -1017,7 +1052,7 @@ static int ov17_0223E9A4 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223EBB0 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223EBB0(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { int v0; @@ -1042,7 +1077,7 @@ static int ov17_0223EBB0 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223EC20 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223EC20(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { switch (param1->unk_00) { case 0: @@ -1060,7 +1095,7 @@ static int ov17_0223EC20 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223EC74 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223EC74(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { switch (param1->unk_00) { case 0: @@ -1078,7 +1113,7 @@ static int ov17_0223EC74 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223ECC8 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223ECC8(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { switch (param1->unk_00) { case 0: @@ -1096,7 +1131,7 @@ static int ov17_0223ECC8 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223ED1C (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223ED1C(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { switch (param1->unk_00) { case 0: @@ -1122,7 +1157,7 @@ static int ov17_0223ED1C (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223ED9C (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223ED9C(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { int v0; @@ -1166,7 +1201,7 @@ static int ov17_0223ED9C (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223EE54 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223EE54(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { switch (param1->unk_00) { case 0: @@ -1186,13 +1221,12 @@ static int ov17_0223EE54 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223EEB8 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223EEB8(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { int v0, v1; switch (param1->unk_00) { - case 0: - { + case 0: { int v2, v3, v4; s16 v5[4], v6[4]; s16 v7[4]; @@ -1263,7 +1297,7 @@ static int ov17_0223EEB8 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -static int ov17_0223F03C (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E838 * param1) +static int ov17_0223F03C(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0223E838 *param1) { UnkStruct_ov17_0223F03C v0; int v1; @@ -1290,7 +1324,7 @@ static int ov17_0223F03C (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0223E return 0; } -int ov17_0223F0BC (int param0, int param1) +int ov17_0223F0BC(int param0, int param1) { switch (param1) { case 3: diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c index b33f159222..b150b56a27 100644 --- a/src/overlay017/ov17_0223F118.c +++ b/src/overlay017/ov17_0223F118.c @@ -1,53 +1,53 @@ +#include "overlay017/ov17_0223F118.h" + #include -#include #include +#include +#include "struct_decls/font_oam.h" #include "struct_decls/struct_02002F38_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" - +#include "struct_defs/sprite_manager_allocation.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02095C48.h" + +#include "overlay017/ov17_02252A70.h" #include "overlay017/struct_ov17_0223F2E4.h" #include "overlay017/struct_ov17_0223F6E8.h" #include "overlay017/struct_ov17_0223F744.h" -#include "struct_defs/sprite_template.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "pokemon.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "game_overlay.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" -#include "gx_layers.h" #include "unk_02024220.h" -#include "pokemon.h" -#include "overlay017/ov17_0223F118.h" -#include "overlay017/ov17_02252A70.h" FS_EXTERN_OVERLAY(overlay11); FS_EXTERN_OVERLAY(overlay12); FS_EXTERN_OVERLAY(overlay22); -static void ov17_0223F6E8(SysTask * param0, void * param1); +static void ov17_0223F6E8(SysTask *param0, void *param1); static void ov17_0223F15C(void); -static void ov17_0223F774(SysTask * param0, void * param1); +static void ov17_0223F774(SysTask *param0, void *param1); static const SpriteTemplate Unk_ov17_022531FC = { 0x0, @@ -57,7 +57,7 @@ static const SpriteTemplate Unk_ov17_022531FC = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x0, 0x0, 0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x0, 0x0, 0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -68,30 +68,30 @@ static const struct { s16 unk_04; u8 unk_06; } Unk_ov17_022531CC[] = { - {0xD, 0xAC, 0xFFFFFFFFFFFFFE80, 0x1}, - {0x25, 0xA4, 0x300, 0x1}, - {0x40, 0xB0, 0xFFFFFFFFFFFFFF80, 0x0}, - {0xC0, 0xB0, 0x80, 0x0}, - {0xDB, 0xA4, 0xFFFFFFFFFFFFFD00, 0x1}, - {0xF3, 0xAC, 0x180, 0x1} + { 0xD, 0xAC, 0xFFFFFFFFFFFFFE80, 0x1 }, + { 0x25, 0xA4, 0x300, 0x1 }, + { 0x40, 0xB0, 0xFFFFFFFFFFFFFF80, 0x0 }, + { 0xC0, 0xB0, 0x80, 0x0 }, + { 0xDB, 0xA4, 0xFFFFFFFFFFFFFD00, 0x1 }, + { 0xF3, 0xAC, 0x180, 0x1 } }; -static void NitroStaticInit (void) +static void NitroStaticInit(void) { Overlay_LoadByID(FS_OVERLAY_ID(overlay11), 2); Overlay_LoadByID(FS_OVERLAY_ID(overlay12), 2); Overlay_LoadByID(FS_OVERLAY_ID(overlay22), 2); } -GenericPointerData * ov17_0223F140 (int param0) +GenericPointerData *ov17_0223F140(int param0) { - GenericPointerData * v0; + GenericPointerData *v0; v0 = sub_02024220(param0, 0, 2, 0, 2, ov17_0223F15C); return v0; } -static void ov17_0223F15C (void) +static void ov17_0223F15C(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -106,18 +106,18 @@ static void ov17_0223F15C (void) G3_ViewPort(0, 0, 255, 191); } -void ov17_0223F1E0 (GenericPointerData * param0) +void ov17_0223F1E0(GenericPointerData *param0) { sub_020242C4(param0); } -void ov17_0223F1E8 (int param0, BGL * param1, SpriteGfxHandler * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) +void ov17_0223F1E8(int param0, BGL *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) { UnkStruct_020127E8 v0; Window v1; SpriteManagerAllocation v2; int v3; - FontOAM * v4; + FontOAM *v4; int v5, v6; int v7 = 0; @@ -172,13 +172,13 @@ void ov17_0223F1E8 (int param0, BGL * param1, SpriteGfxHandler * param2, UnkStru param4->unk_10 = v5; } -void ov17_0223F2E4 (UnkStruct_ov17_0223F2E4 * param0) +void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 *param0) { sub_02012870(param0->unk_00); sub_0201EE28(¶m0->unk_04); } -void ov17_0223F2F8 (UnkStruct_ov17_0223F2E4 * param0, int param1, int param2, int param3) +void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 *param0, int param1, int param2, int param3) { if (param3 == 1) { param1 -= param0->unk_10 / 2; @@ -188,10 +188,10 @@ void ov17_0223F2F8 (UnkStruct_ov17_0223F2E4 * param0, int param1, int param2, in sub_020128C4(param0->unk_00, param1, param2); } -Strbuf* ov17_0223F310 (u32 param0, u32 param1) +Strbuf *ov17_0223F310(u32 param0, u32 param1) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; v0 = MessageLoader_Init(1, 26, 207, param1); v1 = MessageLoader_GetNewStrbuf(v0, param0); @@ -200,9 +200,9 @@ Strbuf* ov17_0223F310 (u32 param0, u32 param1) return v1; } -void ov17_0223F334 (UnkStruct_02095C48 * param0, int param1) +void ov17_0223F334(UnkStruct_02095C48 *param0, int param1) { - u8 * v0; + u8 *v0; int v1; v0 = ov17_02252A9C(param1, param0->unk_00.unk_112); @@ -214,7 +214,7 @@ void ov17_0223F334 (UnkStruct_02095C48 * param0, int param1) Heap_FreeToHeap(v0); } -void ov17_0223F374 (UnkStruct_02095C48 * param0) +void ov17_0223F374(UnkStruct_02095C48 *param0) { int v0, v1, v2, v3, v4; u32 v5; @@ -314,7 +314,7 @@ void ov17_0223F374 (UnkStruct_02095C48 * param0) } } -void ov17_0223F560 (SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, int param4, int param5, int param6) +void ov17_0223F560(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, int param4, int param5, int param6) { if (param3 != -1) { sub_0200CBDC(param0, param1, 46, 73, 1, NNS_G2D_VRAM_TYPE_2DMAIN, param3); @@ -333,7 +333,7 @@ void ov17_0223F560 (SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteD } } -void ov17_0223F5E8 (SpriteGfxHandler * param0, int param1, int param2, int param3, int param4) +void ov17_0223F5E8(SpriteGfxHandler *param0, int param1, int param2, int param3, int param4) { if (param1 != -1) { SpriteGfxHandler_UnloadCharObjById(param0, param1); @@ -352,7 +352,7 @@ void ov17_0223F5E8 (SpriteGfxHandler * param0, int param1, int param2, int param } } -void ov17_0223F630 (UnkStruct_ov17_0223F6E8 * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10) +void ov17_0223F630(UnkStruct_ov17_0223F6E8 *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10) { int v0; SpriteTemplate v1; @@ -381,7 +381,7 @@ void ov17_0223F630 (UnkStruct_ov17_0223F6E8 * param0, SpriteRenderer * param1, S param0->unk_18 = SysTask_Start(ov17_0223F6E8, param0, param10); } -void ov17_0223F6C4 (UnkStruct_ov17_0223F6E8 * param0) +void ov17_0223F6C4(UnkStruct_ov17_0223F6E8 *param0) { int v0; @@ -393,9 +393,9 @@ void ov17_0223F6C4 (UnkStruct_ov17_0223F6E8 * param0) param0->unk_18 = NULL; } -static void ov17_0223F6E8 (SysTask * param0, void * param1) +static void ov17_0223F6E8(SysTask *param0, void *param1) { - UnkStruct_ov17_0223F6E8 * v0 = param1; + UnkStruct_ov17_0223F6E8 *v0 = param1; int v1; for (v1 = 0; v1 < 6; v1++) { @@ -403,9 +403,9 @@ static void ov17_0223F6E8 (SysTask * param0, void * param1) } } -UnkStruct_ov17_0223F744 * ov17_0223F70C (int param0, PaletteData * param1, const u16 * param2, int param3, int param4, u32 param5) +UnkStruct_ov17_0223F744 *ov17_0223F70C(int param0, PaletteData *param1, const u16 *param2, int param3, int param4, u32 param5) { - UnkStruct_ov17_0223F744 * v0; + UnkStruct_ov17_0223F744 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov17_0223F744)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0223F744)); @@ -419,7 +419,7 @@ UnkStruct_ov17_0223F744 * ov17_0223F70C (int param0, PaletteData * param1, const return v0; } -void ov17_0223F744 (UnkStruct_ov17_0223F744 * param0) +void ov17_0223F744(UnkStruct_ov17_0223F744 *param0) { GF_ASSERT(param0->unk_00 != NULL); @@ -427,7 +427,7 @@ void ov17_0223F744 (UnkStruct_ov17_0223F744 * param0) Heap_FreeToHeap(param0); } -BOOL ov17_0223F760 (void) +BOOL ov17_0223F760(void) { if (sub_0200AC1C(1) == 1) { return 1; @@ -436,9 +436,9 @@ BOOL ov17_0223F760 (void) return 0; } -static void ov17_0223F774 (SysTask * param0, void * param1) +static void ov17_0223F774(SysTask *param0, void *param1) { - UnkStruct_ov17_0223F744 * v0 = param1; + UnkStruct_ov17_0223F744 *v0 = param1; if (sub_0200AC1C(1) == 0) { return; diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c index c4fd7c0d5f..3e14d248e5 100644 --- a/src/overlay017/ov17_0223F7E4.c +++ b/src/overlay017/ov17_0223F7E4.c @@ -1,55 +1,54 @@ +#include "overlay017/ov17_0223F7E4.h" + #include #include -#include "core_sys.h" -#include "assert.h" - +#include "struct_decls/font_oam.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "overlay017/struct_ov17_02252B48_decl.h" - +#include "struct_defs/sprite_manager_allocation.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "sys_task_manager.h" -#include "struct_defs/sprite_manager_allocation.h" -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48.h" + +#include "overlay017/ov17_0223F118.h" +#include "overlay017/ov17_02241270.h" +#include "overlay017/ov17_022413D8.h" +#include "overlay017/ov17_0224F080.h" +#include "overlay017/ov17_02252AB0.h" #include "overlay017/struct_ov17_0223F88C.h" #include "overlay017/struct_ov17_022472F8.h" +#include "overlay017/struct_ov17_02252B48_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "struct_defs/sprite_template.h" +#include "assert.h" +#include "core_sys.h" +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "move_table.h" +#include "narc.h" +#include "pokemon.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "message_util.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" -#include "strbuf.h" -#include "pokemon.h" -#include "move_table.h" #include "unk_02094EDC.h" -#include "overlay017/ov17_0223F118.h" -#include "overlay017/ov17_0223F7E4.h" -#include "overlay017/ov17_02241270.h" -#include "overlay017/ov17_022413D8.h" -#include "overlay017/ov17_0224F080.h" -#include "overlay017/ov17_02252AB0.h" typedef struct { s8 unk_00; @@ -77,9 +76,9 @@ typedef struct { s16 unk_02; union { struct { - CellActorData * unk_00[3]; - const s16 * unk_0C; - const UnkStruct_ov17_02253388 * unk_10; + CellActorData *unk_00[3]; + const s16 *unk_0C; + const UnkStruct_ov17_02253388 *unk_10; int unk_14; u8 unk_18; u8 unk_19; @@ -96,13 +95,13 @@ typedef struct { } UnkStruct_ov17_02240950; typedef struct { - const UnkStruct_ov17_02253388 * unk_00; + const UnkStruct_ov17_02253388 *unk_00; u8 unk_04; s8 unk_05; } UnkStruct_ov17_0223F7E4_sub1; typedef struct { - FontOAM * unk_00; + FontOAM *unk_00; SpriteManagerAllocation unk_04; u16 unk_10; } UnkStruct_ov17_02240138; @@ -123,29 +122,29 @@ typedef struct { } UnkStruct_ov17_0223FF38; typedef struct UnkStruct_ov17_0223F7E4_t { - UnkStruct_02095C48 * unk_00; - UnkStruct_ov17_0223F88C * unk_04; - UnkStruct_ov17_022472F8 * unk_08; - void * unk_0C; - SysTask * unk_10; - SysTask * unk_14; + UnkStruct_02095C48 *unk_00; + UnkStruct_ov17_0223F88C *unk_04; + UnkStruct_ov17_022472F8 *unk_08; + void *unk_0C; + SysTask *unk_10; + SysTask *unk_14; UnkStruct_ov17_0223F7E4_sub1 unk_18; - u16 * unk_20[5]; - u16 * unk_34[2]; - UnkStruct_02012744 * unk_3C; + u16 *unk_20[5]; + u16 *unk_34[2]; + UnkStruct_02012744 *unk_3C; UnkStruct_ov17_02240138 unk_40[12]; - CellActorData * unk_118[4]; - CellActorData * unk_128; - CellActorData * unk_12C[4][6]; + CellActorData *unk_118[4]; + CellActorData *unk_128; + CellActorData *unk_12C[4][6]; UnkStruct_ov17_0223FF38 unk_18C; - void * unk_2C0; - NNSG2dCharacterData * unk_2C4; + void *unk_2C0; + NNSG2dCharacterData *unk_2C4; s8 unk_2C8; u8 unk_2C9; UnkStruct_ov17_0223F7E4_sub2 unk_2CC; UnkStruct_ov17_02240950 unk_2EC; UnkStruct_ov17_02240E68 unk_2F6; - UnkStruct_ov17_02252B48 * unk_2FC; + UnkStruct_ov17_02252B48 *unk_2FC; UnkStruct_ov17_02241004 unk_300; u8 unk_304; } UnkStruct_ov17_0223F7E4; @@ -171,54 +170,54 @@ typedef struct { }; u16 unk_0C_val2[4]; }; - const TouchScreenRect * unk_14; - const int * unk_18; - const u8 * unk_1C; - int (* unk_20)(UnkStruct_ov17_0223F7E4 * param0, int param1); - void (* unk_24)(UnkStruct_ov17_0223F7E4 * param0, int param1); - void (* unk_28)(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2); - int (* unk_2C)(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2); + const TouchScreenRect *unk_14; + const int *unk_18; + const u8 *unk_1C; + int (*unk_20)(UnkStruct_ov17_0223F7E4 *param0, int param1); + void (*unk_24)(UnkStruct_ov17_0223F7E4 *param0, int param1); + void (*unk_28)(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2); + int (*unk_2C)(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2); } UnkStruct_ov17_02253558; -static void * ov17_0223F7E4(void); -static void ov17_0223FBD4(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2); -static void ov17_0223FCAC(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2); -static void ov17_0223FF38(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2); -static int ov17_0223FFF4(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2); -static int ov17_02240094(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2); -static void ov17_0224028C(UnkStruct_ov17_0223F7E4 * param0); -static void ov17_022402A8(UnkStruct_ov17_0223F7E4 * param0); -static void ov17_022404B0(UnkStruct_ov17_0223F7E4 * param0); -static void ov17_022402E8(UnkStruct_ov17_0223F7E4 * param0, u16 param1[]); -static void ov17_02240388(UnkStruct_ov17_0223F7E4 * param0); -static void ov17_02240424(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2); -static void ov17_022404A8(UnkStruct_ov17_0223F7E4 * param0); -static void ov17_022404CC(SysTaskFunc param0, UnkStruct_ov17_0223F7E4 * param1); -static void ov17_022404FC(UnkStruct_ov17_0223F7E4 * param0); -static void ov17_0224051C(SysTask * param0, void * param1); -static void ov17_02240658(SysTask * param0, void * param1); -static void ov17_022411E4(SysTask * param0, void * param1); -static void ov17_02241220(SysTask * param0, void * param1); -static void ov17_02240138(UnkStruct_ov17_0223F7E4 * param0, UnkStruct_ov17_02240138 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov17_02240BF4 * param10); -static void ov17_02240260(UnkStruct_ov17_0223F7E4 * param0); -void ov17_0223F80C(BGL * param0); -void ov17_0223F864(BGL * param0); -void * ov17_0223F88C(UnkStruct_02095C48 * param0, UnkStruct_ov17_0223F88C * param1, UnkStruct_ov17_022472F8 * param2); -void ov17_0223F960(UnkStruct_ov17_0223F7E4 * param0); -void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 * param0, int param1, int param2, void * param3); -int ov17_0223FAF8(UnkStruct_ov17_0223F7E4 * param0); -BOOL ov17_0223FBC0(UnkStruct_ov17_0223F7E4 * param0); -static void ov17_022409F4(UnkStruct_ov17_0223F7E4 * param0); -static void ov17_02240BF4(UnkStruct_ov17_0223F7E4 * param0, const Strbuf *param1, int param2, UnkStruct_ov17_02240BF4 * param3, u32 param4); -static void ov17_02240C60(const Strbuf *param0, int param1, int * param2, int * param3); -static void ov17_02240950(SysTask * param0, void * param1); -static void ov17_02240930(UnkStruct_ov17_0223F7E4 * param0, int param1); -static int ov17_02240C90(UnkStruct_ov17_0223F7E4 * param0); -static int ov17_02240D04(UnkStruct_ov17_0223F7E4 * param0, int param1); -static void ov17_02240E68(UnkStruct_ov17_0223F7E4 * param0, int param1); -static int ov17_02240EA4(UnkStruct_ov17_0223F7E4 * param0, int param1); -static void ov17_02240FC4(UnkStruct_ov17_0223F7E4 * param0, int param1); -static u32 ov17_02241004(UnkStruct_ov17_02241004 * param0, int param1, int param2, const u8 * param3); +static void *ov17_0223F7E4(void); +static void ov17_0223FBD4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2); +static void ov17_0223FCAC(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2); +static void ov17_0223FF38(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2); +static int ov17_0223FFF4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2); +static int ov17_02240094(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2); +static void ov17_0224028C(UnkStruct_ov17_0223F7E4 *param0); +static void ov17_022402A8(UnkStruct_ov17_0223F7E4 *param0); +static void ov17_022404B0(UnkStruct_ov17_0223F7E4 *param0); +static void ov17_022402E8(UnkStruct_ov17_0223F7E4 *param0, u16 param1[]); +static void ov17_02240388(UnkStruct_ov17_0223F7E4 *param0); +static void ov17_02240424(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2); +static void ov17_022404A8(UnkStruct_ov17_0223F7E4 *param0); +static void ov17_022404CC(SysTaskFunc param0, UnkStruct_ov17_0223F7E4 *param1); +static void ov17_022404FC(UnkStruct_ov17_0223F7E4 *param0); +static void ov17_0224051C(SysTask *param0, void *param1); +static void ov17_02240658(SysTask *param0, void *param1); +static void ov17_022411E4(SysTask *param0, void *param1); +static void ov17_02241220(SysTask *param0, void *param1); +static void ov17_02240138(UnkStruct_ov17_0223F7E4 *param0, UnkStruct_ov17_02240138 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov17_02240BF4 *param10); +static void ov17_02240260(UnkStruct_ov17_0223F7E4 *param0); +void ov17_0223F80C(BGL *param0); +void ov17_0223F864(BGL *param0); +void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1, UnkStruct_ov17_022472F8 *param2); +void ov17_0223F960(UnkStruct_ov17_0223F7E4 *param0); +void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void *param3); +int ov17_0223FAF8(UnkStruct_ov17_0223F7E4 *param0); +BOOL ov17_0223FBC0(UnkStruct_ov17_0223F7E4 *param0); +static void ov17_022409F4(UnkStruct_ov17_0223F7E4 *param0); +static void ov17_02240BF4(UnkStruct_ov17_0223F7E4 *param0, const Strbuf *param1, int param2, UnkStruct_ov17_02240BF4 *param3, u32 param4); +static void ov17_02240C60(const Strbuf *param0, int param1, int *param2, int *param3); +static void ov17_02240950(SysTask *param0, void *param1); +static void ov17_02240930(UnkStruct_ov17_0223F7E4 *param0, int param1); +static int ov17_02240C90(UnkStruct_ov17_0223F7E4 *param0); +static int ov17_02240D04(UnkStruct_ov17_0223F7E4 *param0, int param1); +static void ov17_02240E68(UnkStruct_ov17_0223F7E4 *param0, int param1); +static int ov17_02240EA4(UnkStruct_ov17_0223F7E4 *param0, int param1); +static void ov17_02240FC4(UnkStruct_ov17_0223F7E4 *param0, int param1); +static u32 ov17_02241004(UnkStruct_ov17_02241004 *param0, int param1, int param2, const u8 *param3); __attribute__((aligned(4))) static const u16 Unk_ov17_02253250[] = { 0x8, @@ -234,140 +233,140 @@ __attribute__((aligned(4))) static const u16 Unk_ov17_02253238[] = { }; __attribute__((aligned(4))) static const u16 Unk_ov17_02253278[][2] = { - {0x13, 0x20}, - {0x93, 0x20}, - {0x13, 0x80}, - {0x93, 0x80} + { 0x13, 0x20 }, + { 0x93, 0x20 }, + { 0x13, 0x80 }, + { 0x93, 0x80 } }; __attribute__((aligned(4))) static const u16 Unk_ov17_02253314[][2][2] = { { - {0x13, 0x40}, - {0x13, 0x50} + { 0x13, 0x40 }, + { 0x13, 0x50 }, }, { - {0x93, 0x40}, - {0x93, 0x50} + { 0x93, 0x40 }, + { 0x93, 0x50 }, }, { - {0x13, 0xA0}, - {0x13, 0xB0} + { 0x13, 0xA0 }, + { 0x13, 0xB0 }, }, { - {0x93, 0xA0}, - {0x93, 0xB0} - } + { 0x93, 0xA0 }, + { 0x93, 0xB0 }, + }, }; __attribute__((aligned(4))) static const u16 Unk_ov17_0225325C[][2] = { - {0x28, 0x48}, - {0x80, 0x48}, - {0xD8, 0x48} + { 0x28, 0x48 }, + { 0x80, 0x48 }, + { 0xD8, 0x48 } }; __attribute__((aligned(4))) static const int Unk_ov17_02253334[][2] = { - {0x3F, 0x34}, - {0xBF, 0x34}, - {0x3F, 0x94}, - {0xBF, 0x94} + { 0x3F, 0x34 }, + { 0xBF, 0x34 }, + { 0x3F, 0x94 }, + { 0xBF, 0x94 } }; __attribute__((aligned(4))) const u16 Unk_ov17_022534B8[] = { - 0x75CD, - 0x7fff, - 0x67ff, - 0x4bff, - 0x2fff, - 0x13ff, - 0x039f, - 0x33E, - 0x154D, - 0x4fff, - 0x2108, - 0x7C2B, - 0x318C, - 0x4631, - 0x5AD6, - 0x0, - 0x75CD, - 0x7fff, - 0x7f9f, - 0x7f3f, - 0x7adf, - 0x729f, - 0x6a5f, - 0x659f, - 0x1CED, - 0x7f5f, - 0x2108, - 0x7C2B, - 0x318C, - 0x4631, - 0x5AD6, - 0x0, - 0x75CD, - 0x7fff, - 0x63fc, - 0x37f7, - 0x2f73, - 0x2730, - 0x1f0c, - 0x16C8, - 0x1146, - 0x5bf8, - 0x2108, - 0x7C2B, - 0x318C, - 0x4631, - 0x5AD6, - 0x0, - 0x75CD, - 0x7fff, - 0x4f1f, - 0x4adf, - 0x467f, - 0x3e1f, - 0x39bf, - 0x00bf, - 0x1CED, - 0x5b5f, - 0x2108, - 0x7C2B, - 0x318C, - 0x4631, - 0x5AD6, - 0x0, - 0x75CD, - 0x7fff, - 0x7ff9, - 0x7f93, - 0x7f0e, - 0x7faa, - 0x7768, - 0x7EC5, - 0x2904, - 0x7fb7, - 0x2108, - 0x7C2B, - 0x318C, - 0x4631, - 0x5AD6, - 0x0 + 0x75CD, + 0x7fff, + 0x67ff, + 0x4bff, + 0x2fff, + 0x13ff, + 0x039f, + 0x33E, + 0x154D, + 0x4fff, + 0x2108, + 0x7C2B, + 0x318C, + 0x4631, + 0x5AD6, + 0x0, + 0x75CD, + 0x7fff, + 0x7f9f, + 0x7f3f, + 0x7adf, + 0x729f, + 0x6a5f, + 0x659f, + 0x1CED, + 0x7f5f, + 0x2108, + 0x7C2B, + 0x318C, + 0x4631, + 0x5AD6, + 0x0, + 0x75CD, + 0x7fff, + 0x63fc, + 0x37f7, + 0x2f73, + 0x2730, + 0x1f0c, + 0x16C8, + 0x1146, + 0x5bf8, + 0x2108, + 0x7C2B, + 0x318C, + 0x4631, + 0x5AD6, + 0x0, + 0x75CD, + 0x7fff, + 0x4f1f, + 0x4adf, + 0x467f, + 0x3e1f, + 0x39bf, + 0x00bf, + 0x1CED, + 0x5b5f, + 0x2108, + 0x7C2B, + 0x318C, + 0x4631, + 0x5AD6, + 0x0, + 0x75CD, + 0x7fff, + 0x7ff9, + 0x7f93, + 0x7f0e, + 0x7faa, + 0x7768, + 0x7EC5, + 0x2904, + 0x7fb7, + 0x2108, + 0x7C2B, + 0x318C, + 0x4631, + 0x5AD6, + 0x0 }; static const UnkStruct_ov97_0222DB78 Unk_ov17_02253448[] = { - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0} + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x6800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x7800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x0, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov17_022532D0[] = { - {0x8, 0x60, 0x8, 0x78}, - {0x8, 0x60, 0x88, 0xF8}, - {0x68, 0xC0, 0x8, 0x78}, - {0x68, 0xC0, 0x88, 0xF8}, - {0xFF, 0x0, 0x0, 0x0} + { 0x8, 0x60, 0x8, 0x78 }, + { 0x8, 0x60, 0x88, 0xF8 }, + { 0x68, 0xC0, 0x8, 0x78 }, + { 0x68, 0xC0, 0x88, 0xF8 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const int Unk_ov17_02253288[NELEMS(Unk_ov17_022532D0) - 1] = { @@ -385,16 +384,16 @@ __attribute__((aligned(4))) static const u8 Unk_ov17_02253230[NELEMS(Unk_ov17_02 }; __attribute__((aligned(4))) static const u8 Unk_ov17_0225323C[2][2] = { - {0x0, 0x1}, - {0x2, 0x3} + { 0x0, 0x1 }, + { 0x2, 0x3 } }; static const TouchScreenRect Unk_ov17_022532A8[] = { - {0x8, 0x80, 0x0, 0x50}, - {0x8, 0x80, 0x58, 0xA8}, - {0x8, 0x80, 0xB0, 0xFF}, - {0x88, 0xC0, 0x0, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x8, 0x80, 0x0, 0x50 }, + { 0x8, 0x80, 0x58, 0xA8 }, + { 0x8, 0x80, 0xB0, 0xFF }, + { 0x88, 0xC0, 0x0, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const int Unk_ov17_02253268[NELEMS(Unk_ov17_022532A8) - 1] = { @@ -412,63 +411,63 @@ __attribute__((aligned(4))) static const u8 Unk_ov17_02253234[NELEMS(Unk_ov17_02 }; __attribute__((aligned(4))) static const u8 Unk_ov17_02253240[2][3] = { - {0x0, 0x1, 0x2}, - {0x3, 0x3, 0x3} + { 0x0, 0x1, 0x2 }, + { 0x3, 0x3, 0x3 } }; static const UnkStruct_ov17_02253558 Unk_ov17_02253558[] = { { 0x9, 0x0, - {0x1, 0xFFFF, 0x0, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { 0x1, 0xFFFF, 0x0, 0xFFFF }, + { 0x2, 0x1, 0x3, 0x0 }, NULL, NULL, NULL, NULL, NULL, ov17_0223FBD4, - NULL + NULL, }, { 0xB, 0x1, - {0xFFFF, 0xFFFF, 0x4, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { 0xFFFF, 0xFFFF, 0x4, 0xFFFF }, + { 0x2, 0x1, 0x3, 0x0 }, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL }, { 0xB, 0x1, - {0x2, 0xFFFF, 0x4, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { 0x2, 0xFFFF, 0x4, 0xFFFF }, + { 0x2, 0x1, 0x3, 0x0 }, Unk_ov17_022532D0, Unk_ov17_02253288, Unk_ov17_02253230, ov17_02240D04, ov17_02240E68, ov17_0223FCAC, - ov17_0223FFF4 + ov17_0223FFF4, }, { 0xB, 0x1, - {0x3, 0xFFFF, 0x4, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { 0x3, 0xFFFF, 0x4, 0xFFFF }, + { 0x2, 0x1, 0x3, 0x0 }, Unk_ov17_022532A8, Unk_ov17_02253268, Unk_ov17_02253234, ov17_02240EA4, ov17_02240FC4, ov17_0223FF38, - ov17_02240094 - } + ov17_02240094, + }, }; static const SpriteTemplate Unk_ov17_02253354 = { @@ -479,30 +478,30 @@ static const SpriteTemplate Unk_ov17_02253354 = { 0x64, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x80F6, 0x80EF, 0x80F4, 0x80F4, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F6, 0x80EF, 0x80F4, 0x80F4, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; __attribute__((aligned(4))) static const u16 Unk_ov17_02253298[][2] = { - {0x27, 0x30}, - {0xA7, 0x30}, - {0x27, 0x90}, - {0xA7, 0x90} + { 0x27, 0x30 }, + { 0xA7, 0x30 }, + { 0x27, 0x90 }, + { 0xA7, 0x90 } }; __attribute__((aligned(4))) static const s16 Unk_ov17_022532E4[][3] = { - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180} + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 } }; __attribute__((aligned(4))) static const UnkStruct_ov17_02253388 Unk_ov17_02253388[] = { - {0x0, 0xB, 0x1, 0xE}, - {0x0, 0xB, 0x11, 0x1E}, - {0xC, 0x17, 0x1, 0xE}, - {0xC, 0x17, 0x11, 0x1E} + { 0x0, 0xB, 0x1, 0xE }, + { 0x0, 0xB, 0x11, 0x1E }, + { 0xC, 0x17, 0x1, 0xE }, + { 0xC, 0x17, 0x11, 0x1E } }; __attribute__((aligned(4))) static const s16 Unk_ov17_02253248[] = { @@ -513,29 +512,29 @@ __attribute__((aligned(4))) static const s16 Unk_ov17_02253248[] = { }; __attribute__((aligned(4))) static const UnkStruct_ov17_02253388 Unk_ov17_02253408[] = { - {0x1, 0xB, 0x1, 0xE}, - {0x1, 0xB, 0x11, 0x1E}, - {0xD, 0x17, 0x1, 0xE}, - {0xD, 0x17, 0x11, 0x1E} + { 0x1, 0xB, 0x1, 0xE }, + { 0x1, 0xB, 0x11, 0x1E }, + { 0xD, 0x17, 0x1, 0xE }, + { 0xD, 0x17, 0x11, 0x1E } }; __attribute__((aligned(4))) static const s16 Unk_ov17_022532FC[][3] = { - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180}, - {0x0, 0xC0, 0x180} + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 }, + { 0x0, 0xC0, 0x180 } }; __attribute__((aligned(4))) static const UnkStruct_ov17_02253388 Unk_ov17_022533C8[] = { - {0x0, 0xF, 0x0, 0x9}, - {0x0, 0xF, 0xB, 0x14}, - {0x0, 0xF, 0x16, 0x1F}, - {0x10, 0x17, 0x0, 0x1F} + { 0x0, 0xF, 0x0, 0x9 }, + { 0x0, 0xF, 0xB, 0x14 }, + { 0x0, 0xF, 0x16, 0x1F }, + { 0x10, 0x17, 0x0, 0x1F } }; -static void * ov17_0223F7E4 (void) +static void *ov17_0223F7E4(void) { - UnkStruct_ov17_0223F7E4 * v0; + UnkStruct_ov17_0223F7E4 *v0; v0 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_0223F7E4)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0223F7E4)); @@ -544,7 +543,7 @@ static void * ov17_0223F7E4 (void) return v0; } -void ov17_0223F80C (BGL * param0) +void ov17_0223F80C(BGL *param0) { int v0; @@ -556,7 +555,7 @@ void ov17_0223F80C (BGL * param0) } } -void ov17_0223F864 (BGL * param0) +void ov17_0223F864(BGL *param0) { int v0; @@ -566,10 +565,10 @@ void ov17_0223F864 (BGL * param0) } } -void * ov17_0223F88C (UnkStruct_02095C48 * param0, UnkStruct_ov17_0223F88C * param1, UnkStruct_ov17_022472F8 * param2) +void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1, UnkStruct_ov17_022472F8 *param2) { - UnkStruct_ov17_0223F7E4 * v0; - NARC * v1; + UnkStruct_ov17_0223F7E4 *v0; + NARC *v1; v0 = ov17_0223F7E4(); @@ -581,8 +580,8 @@ void * ov17_0223F88C (UnkStruct_02095C48 * param0, UnkStruct_ov17_0223F88C * par v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 21); { - NNSG2dScreenData * v2; - void * v3; + NNSG2dScreenData *v2; + void *v3; int v4; for (v4 = 0; v4 < 5; v4++) { @@ -594,8 +593,8 @@ void * ov17_0223F88C (UnkStruct_02095C48 * param0, UnkStruct_ov17_0223F88C * par } { - u16 * v5; - PaletteData * v6; + u16 *v5; + PaletteData *v6; int v7; v6 = v0->unk_04->unk_50; @@ -613,7 +612,7 @@ void * ov17_0223F88C (UnkStruct_02095C48 * param0, UnkStruct_ov17_0223F88C * par return v0; } -void ov17_0223F960 (UnkStruct_ov17_0223F7E4 * param0) +void ov17_0223F960(UnkStruct_ov17_0223F7E4 *param0) { int v0; @@ -634,13 +633,13 @@ void ov17_0223F960 (UnkStruct_ov17_0223F7E4 * param0) Heap_FreeToHeap(param0); } -void ov17_0223F9C4 (UnkStruct_ov17_0223F7E4 * param0, int param1, int param2, void * param3) +void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void *param3) { - const UnkStruct_ov17_02253558 * v0, * v1; + const UnkStruct_ov17_02253558 *v0, *v1; int v2; - BGL * v3; - SpriteRenderer * v4; - SpriteGfxHandler * v5; + BGL *v3; + SpriteRenderer *v4; + SpriteGfxHandler *v5; param0->unk_0C = param3; @@ -690,10 +689,10 @@ void ov17_0223F9C4 (UnkStruct_ov17_0223F7E4 * param0, int param1, int param2, vo SysTask_ExecuteAfterVBlank(ov17_02241220, param0, 10); } -int ov17_0223FAF8 (UnkStruct_ov17_0223F7E4 * param0) +int ov17_0223FAF8(UnkStruct_ov17_0223F7E4 *param0) { int v0, v1, v2, v3; - const UnkStruct_ov17_02253558 * v4; + const UnkStruct_ov17_02253558 *v4; int v5 = 0; GF_ASSERT(param0->unk_2C8 != -1); @@ -743,7 +742,7 @@ int ov17_0223FAF8 (UnkStruct_ov17_0223F7E4 * param0) return v0; } -BOOL ov17_0223FBC0 (UnkStruct_ov17_0223F7E4 * param0) +BOOL ov17_0223FBC0(UnkStruct_ov17_0223F7E4 *param0) { if ((param0->unk_10 == NULL) && (param0->unk_14 == NULL)) { return 1; @@ -752,9 +751,9 @@ BOOL ov17_0223FBC0 (UnkStruct_ov17_0223F7E4 * param0) return 0; } -static void ov17_0223FBD4 (UnkStruct_ov17_0223F7E4 * param0, int param1, int param2) +static void ov17_0223FBD4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2) { - Strbuf* v0, * v1; + Strbuf *v0, *v1; u32 v2, v3; v2 = sub_02095848(param0->unk_04->unk_00->unk_110, param0->unk_04->unk_00->unk_111, param0->unk_00->unk_155); @@ -770,14 +769,14 @@ static void ov17_0223FBD4 (UnkStruct_ov17_0223F7E4 * param0, int param1, int par sub_02002FEC(param0->unk_04->unk_50, 45, 38, 21, 1, 0x20, 2 * 16, 16 * param0->unk_04->unk_00->unk_10F); } -static void ov17_0223FCAC (UnkStruct_ov17_0223F7E4 * param0, int param1, int param2) +static void ov17_0223FCAC(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2) { u16 v0[4], v1[4]; int v2; - Strbuf* v3; - Strbuf* v4, * v5; + Strbuf *v3; + Strbuf *v4, *v5; u32 v6, v7; - UnkStruct_ov17_0223FF38 * v8; + UnkStruct_ov17_0223FF38 *v8; v8 = ¶m0->unk_18C; param0->unk_2C9 = 0xff; @@ -848,12 +847,12 @@ static void ov17_0223FCAC (UnkStruct_ov17_0223F7E4 * param0, int param1, int par } } -static void ov17_0223FF38 (UnkStruct_ov17_0223F7E4 * param0, int param1, int param2) +static void ov17_0223FF38(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2) { int v0; - BGL * v1; - Strbuf* v2; - UnkStruct_ov17_0223FF38 * v3; + BGL *v1; + Strbuf *v2; + UnkStruct_ov17_0223FF38 *v3; v3 = ¶m0->unk_18C; v1 = param0->unk_04->unk_24; @@ -870,12 +869,12 @@ static void ov17_0223FF38 (UnkStruct_ov17_0223F7E4 * param0, int param1, int par param0->unk_128 = ov17_022412C0(param0->unk_04->unk_18, param0->unk_04->unk_1C, param0->unk_04->unk_00->unk_10E); } -static int ov17_0223FFF4 (UnkStruct_ov17_0223F7E4 * param0, int param1, int param2) +static int ov17_0223FFF4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2) { u32 v0; int v1; - const s16 * v2; - const UnkStruct_ov17_02253388 * v3; + const s16 *v2; + const UnkStruct_ov17_02253388 *v3; v0 = param1; @@ -909,7 +908,7 @@ static int ov17_0223FFF4 (UnkStruct_ov17_0223F7E4 * param0, int param1, int para return param1; } -static int ov17_02240094 (UnkStruct_ov17_0223F7E4 * param0, int param1, int param2) +static int ov17_02240094(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2) { int v0; int v1; @@ -950,15 +949,15 @@ static int ov17_02240094 (UnkStruct_ov17_0223F7E4 * param0, int param1, int para return param1; } -static void ov17_02240138 (UnkStruct_ov17_0223F7E4 * param0, UnkStruct_ov17_02240138 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov17_02240BF4 * param10) +static void ov17_02240138(UnkStruct_ov17_0223F7E4 *param0, UnkStruct_ov17_02240138 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov17_02240BF4 *param10) { UnkStruct_020127E8 v0; Window v1; SpriteManagerAllocation v2; int v3; - FontOAM * v4; - BGL * v5; - SpriteGfxHandler * v6; + FontOAM *v4; + BGL *v5; + SpriteGfxHandler *v6; int v7, v8; GF_ASSERT(param1->unk_00 == NULL); @@ -988,7 +987,7 @@ static void ov17_02240138 (UnkStruct_ov17_0223F7E4 * param0, UnkStruct_ov17_0224 param7 -= v7 / 2; } - param8 += ((((192 + 80) << FX32_SHIFT)) >> FX32_SHIFT) - 8; + param8 += (((192 + 80) << FX32_SHIFT) >> FX32_SHIFT) - 8; v0.unk_00 = param0->unk_3C; v0.unk_04 = &v1; @@ -1017,7 +1016,7 @@ static void ov17_02240138 (UnkStruct_ov17_0223F7E4 * param0, UnkStruct_ov17_0224 param1->unk_10 = v7; } -static void ov17_02240260 (UnkStruct_ov17_0223F7E4 * param0) +static void ov17_02240260(UnkStruct_ov17_0223F7E4 *param0) { int v0; @@ -1030,7 +1029,7 @@ static void ov17_02240260 (UnkStruct_ov17_0223F7E4 * param0) } } -static void ov17_0224028C (UnkStruct_ov17_0223F7E4 * param0) +static void ov17_0224028C(UnkStruct_ov17_0223F7E4 *param0) { if (param0->unk_128 != NULL) { ov17_02241314(param0->unk_128); @@ -1038,7 +1037,7 @@ static void ov17_0224028C (UnkStruct_ov17_0223F7E4 * param0) } } -static void ov17_022402A8 (UnkStruct_ov17_0223F7E4 * param0) +static void ov17_022402A8(UnkStruct_ov17_0223F7E4 *param0) { int v0, v1; @@ -1052,11 +1051,11 @@ static void ov17_022402A8 (UnkStruct_ov17_0223F7E4 * param0) } } -static void ov17_022402E8 (UnkStruct_ov17_0223F7E4 * param0, u16 param1[]) +static void ov17_022402E8(UnkStruct_ov17_0223F7E4 *param0, u16 param1[]) { int v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; + SpriteRenderer *v1; + SpriteGfxHandler *v2; SpriteTemplate v3; int v4; @@ -1075,16 +1074,16 @@ static void ov17_022402E8 (UnkStruct_ov17_0223F7E4 * param0, u16 param1[]) v3.y = Unk_ov17_02253298[v0][1]; param0->unk_118[v0] = ov17_0224F154(v1, v2, v4, &v3); - sub_0200D500(param0->unk_118[v0], v3.x, v3.y, (((192 + 80) << FX32_SHIFT))); + sub_0200D500(param0->unk_118[v0], v3.x, v3.y, ((192 + 80) << FX32_SHIFT)); } } } -static void ov17_02240388 (UnkStruct_ov17_0223F7E4 * param0) +static void ov17_02240388(UnkStruct_ov17_0223F7E4 *param0) { int v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; + SpriteRenderer *v1; + SpriteGfxHandler *v2; v1 = param0->unk_04->unk_18; v2 = param0->unk_04->unk_1C; @@ -1097,12 +1096,12 @@ static void ov17_02240388 (UnkStruct_ov17_0223F7E4 * param0) } } -static void ov17_022403B0 (UnkStruct_ov17_0223F7E4 * param0, const s16 * param1, const UnkStruct_ov17_02253388 * param2, int param3, int param4) +static void ov17_022403B0(UnkStruct_ov17_0223F7E4 *param0, const s16 *param1, const UnkStruct_ov17_02253388 *param2, int param3, int param4) { int v0, v1; - BGL * v2; - u16 * v3, * v4; - u16 * v5, * v6; + BGL *v2; + u16 *v3, *v4; + u16 *v5, *v6; int v7; v2 = param0->unk_04->unk_24; @@ -1122,10 +1121,14 @@ static void ov17_022403B0 (UnkStruct_ov17_0223F7E4 * param0, const s16 * param1, sub_0201C3C0(v2, 4); } -static void ov17_02240424 (UnkStruct_ov17_0223F7E4 * param0, int param1, int param2) +static void ov17_02240424(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2) { - const u16 * const v0[] = { - &Unk_ov17_022534B8[16 * 3], &Unk_ov17_022534B8[16 * 4], &Unk_ov17_022534B8[16 * 1], &Unk_ov17_022534B8[16 * 2], &Unk_ov17_022534B8[16 * 0], + const u16 *const v0[] = { + &Unk_ov17_022534B8[16 * 3], + &Unk_ov17_022534B8[16 * 4], + &Unk_ov17_022534B8[16 * 1], + &Unk_ov17_022534B8[16 * 2], + &Unk_ov17_022534B8[16 * 0], }; if (param1 != -1) { @@ -1136,12 +1139,12 @@ static void ov17_02240424 (UnkStruct_ov17_0223F7E4 * param0, int param1, int par } } -static void ov17_022404A8 (UnkStruct_ov17_0223F7E4 * param0) +static void ov17_022404A8(UnkStruct_ov17_0223F7E4 *param0) { ov17_022404B0(param0); } -static void ov17_022404B0 (UnkStruct_ov17_0223F7E4 * param0) +static void ov17_022404B0(UnkStruct_ov17_0223F7E4 *param0) { ov17_0224028C(param0); ov17_022402A8(param0); @@ -1149,7 +1152,7 @@ static void ov17_022404B0 (UnkStruct_ov17_0223F7E4 * param0) ov17_02240260(param0); } -static void ov17_022404CC (SysTaskFunc param0, UnkStruct_ov17_0223F7E4 * param1) +static void ov17_022404CC(SysTaskFunc param0, UnkStruct_ov17_0223F7E4 *param1) { GF_ASSERT(param1->unk_10 == NULL); @@ -1157,7 +1160,7 @@ static void ov17_022404CC (SysTaskFunc param0, UnkStruct_ov17_0223F7E4 * param1) param1->unk_10 = SysTask_Start(param0, param1, 1300); } -static void ov17_022404FC (UnkStruct_ov17_0223F7E4 * param0) +static void ov17_022404FC(UnkStruct_ov17_0223F7E4 *param0) { if (param0->unk_10 != NULL) { SysTask_Done(param0->unk_10); @@ -1166,10 +1169,10 @@ static void ov17_022404FC (UnkStruct_ov17_0223F7E4 * param0) } } -static void ov17_0224051C (SysTask * param0, void * param1) +static void ov17_0224051C(SysTask *param0, void *param1) { - UnkStruct_ov17_0223F7E4 * v0 = param1; - BGL * v1; + UnkStruct_ov17_0223F7E4 *v0 = param1; + BGL *v1; int v2, v3; int v4; @@ -1224,10 +1227,10 @@ static void ov17_0224051C (SysTask * param0, void * param1) } } -static void ov17_02240658 (SysTask * param0, void * param1) +static void ov17_02240658(SysTask *param0, void *param1) { - UnkStruct_ov17_0223F7E4 * v0 = param1; - BGL * v1; + UnkStruct_ov17_0223F7E4 *v0 = param1; + BGL *v1; int v2, v3; int v4, v5, v6; int v7, v8; @@ -1356,7 +1359,7 @@ static void ov17_02240658 (SysTask * param0, void * param1) } } -static void ov17_022408E0 (SysTaskFunc param0, UnkStruct_ov17_0223F7E4 * param1) +static void ov17_022408E0(SysTaskFunc param0, UnkStruct_ov17_0223F7E4 *param1) { GF_ASSERT(param1->unk_14 == NULL); @@ -1364,7 +1367,7 @@ static void ov17_022408E0 (SysTaskFunc param0, UnkStruct_ov17_0223F7E4 * param1) param1->unk_14 = SysTask_Start(param0, param1, 1320); } -static void ov17_02240910 (UnkStruct_ov17_0223F7E4 * param0) +static void ov17_02240910(UnkStruct_ov17_0223F7E4 *param0) { if (param0->unk_14 != NULL) { SysTask_Done(param0->unk_14); @@ -1373,7 +1376,7 @@ static void ov17_02240910 (UnkStruct_ov17_0223F7E4 * param0) } } -static void ov17_02240930 (UnkStruct_ov17_0223F7E4 * param0, int param1) +static void ov17_02240930(UnkStruct_ov17_0223F7E4 *param0, int param1) { if (param1 == 0xff) { return; @@ -1383,11 +1386,11 @@ static void ov17_02240930 (UnkStruct_ov17_0223F7E4 * param0, int param1) param0->unk_2EC.unk_09 = param1; } -static void ov17_02240950 (SysTask * param0, void * param1) +static void ov17_02240950(SysTask *param0, void *param1) { - UnkStruct_ov17_0223F7E4 * v0 = param1; - UnkStruct_ov17_02240950 * v1; - PaletteData * v2; + UnkStruct_ov17_0223F7E4 *v0 = param1; + UnkStruct_ov17_02240950 *v1; + PaletteData *v2; int v3, v4; v1 = &v0->unk_2EC; @@ -1421,7 +1424,7 @@ static void ov17_02240950 (SysTask * param0, void * param1) } } -static void ov17_022409F4 (UnkStruct_ov17_0223F7E4 * param0) +static void ov17_022409F4(UnkStruct_ov17_0223F7E4 *param0) { int v0, v1; @@ -1446,12 +1449,12 @@ static void ov17_022409F4 (UnkStruct_ov17_0223F7E4 * param0) } } -void ov17_02240A80 (UnkStruct_ov17_0223F7E4 * param0, u16 param1[]) +void ov17_02240A80(UnkStruct_ov17_0223F7E4 *param0, u16 param1[]) { - UnkStruct_ov17_0223FF38 * v0; + UnkStruct_ov17_0223FF38 *v0; int v1; - Strbuf* v2; - Strbuf* v3, * v4, * v5; + Strbuf *v2; + Strbuf *v3, *v4, *v5; u32 v6, v7; v0 = ¶m0->unk_18C; @@ -1493,7 +1496,7 @@ void ov17_02240A80 (UnkStruct_ov17_0223F7E4 * param0, u16 param1[]) } } -static void ov17_02240BF4 (UnkStruct_ov17_0223F7E4 * param0, const Strbuf *param1, int param2, UnkStruct_ov17_02240BF4 * param3, u32 param4) +static void ov17_02240BF4(UnkStruct_ov17_0223F7E4 *param0, const Strbuf *param1, int param2, UnkStruct_ov17_02240BF4 *param3, u32 param4) { int v0, v1; @@ -1511,7 +1514,7 @@ static void ov17_02240BF4 (UnkStruct_ov17_0223F7E4 * param0, const Strbuf *param PrintStringWithColorAndMargins(¶m3->unk_00, param2, param1, 0, 0, 0xff, param4, 0, 0, NULL); } -static void ov17_02240C60 (const Strbuf *param0, int param1, int * param2, int * param3) +static void ov17_02240C60(const Strbuf *param0, int param1, int *param2, int *param3) { int v0, v1; @@ -1526,10 +1529,10 @@ static void ov17_02240C60 (const Strbuf *param0, int param1, int * param2, int * *param3 = v1; } -static int ov17_02240C90 (UnkStruct_ov17_0223F7E4 * param0) +static int ov17_02240C90(UnkStruct_ov17_0223F7E4 *param0) { - UnkStruct_ov17_02241004 * v0; - const UnkStruct_ov17_02253558 * v1; + UnkStruct_ov17_02241004 *v0; + const UnkStruct_ov17_02253558 *v1; v0 = ¶m0->unk_300; v1 = &Unk_ov17_02253558[param0->unk_2C8]; @@ -1555,14 +1558,14 @@ static int ov17_02240C90 (UnkStruct_ov17_0223F7E4 * param0) return v1->unk_20(param0, 0); } -static int ov17_02240D04 (UnkStruct_ov17_0223F7E4 * param0, int param1) +static int ov17_02240D04(UnkStruct_ov17_0223F7E4 *param0, int param1) { - UnkStruct_ov17_02241004 * v0; + UnkStruct_ov17_02241004 *v0; u32 v1; - const UnkStruct_ov17_02253558 * v2; + const UnkStruct_ov17_02253558 *v2; int v3, v4; u8 v5[2][2]; - UnkStruct_ov17_02240E68 * v6; + UnkStruct_ov17_02240E68 *v6; u16 v7[4]; v6 = ¶m0->unk_2F6; @@ -1586,7 +1589,7 @@ static int ov17_02240D04 (UnkStruct_ov17_0223F7E4 * param0, int param1) v3 = Unk_ov17_0225323C[v0->unk_01][v0->unk_02]; } - ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, (((192 + 80) << FX32_SHIFT))); + ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -1600,7 +1603,7 @@ static int ov17_02240D04 (UnkStruct_ov17_0223F7E4 * param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v3 = Unk_ov17_0225323C[v0->unk_01][v0->unk_02]; - ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, (((192 + 80) << FX32_SHIFT))); + ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov17_0225323C[v0->unk_01][v0->unk_02]; @@ -1611,9 +1614,9 @@ static int ov17_02240D04 (UnkStruct_ov17_0223F7E4 * param0, int param1) return 0xffffffff; } -static void ov17_02240E68 (UnkStruct_ov17_0223F7E4 * param0, int param1) +static void ov17_02240E68(UnkStruct_ov17_0223F7E4 *param0, int param1) { - UnkStruct_ov17_02240E68 * v0; + UnkStruct_ov17_02240E68 *v0; int v1, v2; v0 = ¶m0->unk_2F6; @@ -1629,14 +1632,14 @@ static void ov17_02240E68 (UnkStruct_ov17_0223F7E4 * param0, int param1) } } -static int ov17_02240EA4 (UnkStruct_ov17_0223F7E4 * param0, int param1) +static int ov17_02240EA4(UnkStruct_ov17_0223F7E4 *param0, int param1) { - UnkStruct_ov17_02241004 * v0; + UnkStruct_ov17_02241004 *v0; u32 v1; - const UnkStruct_ov17_02253558 * v2; + const UnkStruct_ov17_02253558 *v2; int v3, v4; u8 v5[2][3]; - UnkStruct_ov17_02240E68 * v6; + UnkStruct_ov17_02240E68 *v6; v6 = ¶m0->unk_2F6; v0 = ¶m0->unk_300; @@ -1646,7 +1649,7 @@ static int ov17_02240EA4 (UnkStruct_ov17_0223F7E4 * param0, int param1) v0->unk_02 = v6->unk_02; v0->unk_01 = v6->unk_03; v3 = Unk_ov17_02253240[v0->unk_01][v0->unk_02]; - ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, (((192 + 80) << FX32_SHIFT))); + ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); return 0xffffffff; } @@ -1659,7 +1662,7 @@ static int ov17_02240EA4 (UnkStruct_ov17_0223F7E4 * param0, int param1) case PAD_KEY_LEFT: case PAD_KEY_RIGHT: v3 = Unk_ov17_02253240[v0->unk_01][v0->unk_02]; - ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, (((192 + 80) << FX32_SHIFT))); + ov17_02252C78(param0->unk_2FC, v2->unk_14[v3].rect.left + 8, v2->unk_14[v3].rect.right - 8, v2->unk_14[v3].rect.top + 8, v2->unk_14[v3].rect.bottom - 8, ((192 + 80) << FX32_SHIFT)); break; case PAD_BUTTON_A: return Unk_ov17_02253240[v0->unk_01][v0->unk_02]; @@ -1670,9 +1673,9 @@ static int ov17_02240EA4 (UnkStruct_ov17_0223F7E4 * param0, int param1) return 0xffffffff; } -static void ov17_02240FC4 (UnkStruct_ov17_0223F7E4 * param0, int param1) +static void ov17_02240FC4(UnkStruct_ov17_0223F7E4 *param0, int param1) { - UnkStruct_ov17_02240E68 * v0; + UnkStruct_ov17_02240E68 *v0; int v1, v2, v3; if (param1 == 3) { @@ -1692,7 +1695,7 @@ static void ov17_02240FC4 (UnkStruct_ov17_0223F7E4 * param0, int param1) } } -static u32 ov17_02241004 (UnkStruct_ov17_02241004 * param0, int param1, int param2, const u8 * param3) +static u32 ov17_02241004(UnkStruct_ov17_02241004 *param0, int param1, int param2, const u8 *param3) { int v0, v1; u32 v2; @@ -1807,9 +1810,9 @@ static u32 ov17_02241004 (UnkStruct_ov17_02241004 * param0, int param1, int para return v2; } -static void ov17_022411E4 (SysTask * param0, void * param1) +static void ov17_022411E4(SysTask *param0, void *param1) { - UnkStruct_ov17_0223F7E4 * v0 = param1; + UnkStruct_ov17_0223F7E4 *v0 = param1; sub_0201958C(v0->unk_04->unk_24, 4, v0->unk_2C4->pRawData, 0x6000, 0); Heap_FreeToHeap(v0->unk_2C0); @@ -1819,10 +1822,10 @@ static void ov17_022411E4 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov17_02241220 (SysTask * param0, void * param1) +static void ov17_02241220(SysTask *param0, void *param1) { - UnkStruct_ov17_0223F7E4 * v0 = param1; - const UnkStruct_ov17_02253558 * v1; + UnkStruct_ov17_0223F7E4 *v0 = param1; + const UnkStruct_ov17_02253558 *v1; int v2; v1 = &Unk_ov17_02253558[v0->unk_2C8]; diff --git a/src/overlay017/ov17_02241270.c b/src/overlay017/ov17_02241270.c index 870064fe0a..5fe930d664 100644 --- a/src/overlay017/ov17_02241270.c +++ b/src/overlay017/ov17_02241270.c @@ -1,15 +1,15 @@ +#include "overlay017/ov17_02241270.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" - -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" #include "unk_0200C6E4.h" -#include "overlay017/ov17_02241270.h" static const SpriteTemplate Unk_ov17_0225364C = { 0x28, @@ -19,7 +19,7 @@ static const SpriteTemplate Unk_ov17_0225364C = { 0x3E8, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x80FB, 0x80EF, 0x80F6, 0x80F6, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80FB, 0x80EF, 0x80F6, 0x80F6, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -32,7 +32,7 @@ static const SpriteTemplate Unk_ov17_02253618 = { 0x3E9, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x80FA, 0x80EF, 0x80F5, 0x80F5, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80FA, 0x80EF, 0x80F5, 0x80F5, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -45,51 +45,51 @@ static const SpriteTemplate Unk_ov17_02253680 = { 0x3E9, 0x1, NNS_G2D_VRAM_TYPE_2DSUB, - {0x80FA, 0x80EF, 0x80F5, 0x80F5, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80FA, 0x80EF, 0x80F5, 0x80F5, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; -void ov17_02241270 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_02241270(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 42, 1, NNS_G2D_VRAM_TYPE_2DSUB, 33019); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 43, 1, 33014); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 44, 1, 33014); } -CellActorData * ov17_022412C0 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2) +CellActorData *ov17_022412C0(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2) { - CellActorData * v0; + CellActorData *v0; v0 = SpriteActor_LoadResources(param0, param1, &Unk_ov17_0225364C); - sub_0200D500(v0, (5 * 8) + (11 * 8) * param2, (0xc * 8) + 0 * param2, (((192 + 80) << FX32_SHIFT))); + sub_0200D500(v0, (5 * 8) + (11 * 8) * param2, (0xc * 8) + 0 * param2, ((192 + 80) << FX32_SHIFT)); SpriteActor_UpdateObject(v0->unk_00); return v0; } -void ov17_022412F0 (SpriteGfxHandler * param0) +void ov17_022412F0(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33019); SpriteGfxHandler_UnloadCellObjById(param0, 33014); SpriteGfxHandler_UnloadAnimObjById(param0, 33014); } -void ov17_02241314 (CellActorData * param0) +void ov17_02241314(CellActorData *param0) { sub_0200D0F4(param0); } -void ov17_0224131C (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_0224131C(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 45, 1, NNS_G2D_VRAM_TYPE_2DSUB, 33018); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 46, 1, 33013); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 47, 1, 33013); } -CellActorData * ov17_0224136C (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4) +CellActorData *ov17_0224136C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, int param4) { - CellActorData * v0; + CellActorData *v0; if (param4 >= 0) { v0 = SpriteActor_LoadResources(param0, param1, &Unk_ov17_02253618); @@ -97,18 +97,18 @@ CellActorData * ov17_0224136C (SpriteRenderer * param0, SpriteGfxHandler * param v0 = SpriteActor_LoadResources(param0, param1, &Unk_ov17_02253680); } - sub_0200D500(v0, param2, param3, (((192 + 80) << FX32_SHIFT))); + sub_0200D500(v0, param2, param3, ((192 + 80) << FX32_SHIFT)); SpriteActor_UpdateObject(v0->unk_00); return v0; } -void ov17_022413AC (CellActorData * param0) +void ov17_022413AC(CellActorData *param0) { sub_0200D0F4(param0); } -void ov17_022413B4 (SpriteGfxHandler * param0) +void ov17_022413B4(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33018); SpriteGfxHandler_UnloadCellObjById(param0, 33013); diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index e32a05b6ee..245a27cf66 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -1,22 +1,21 @@ +#include "overlay017/ov17_022413D8.h" + #include #include -#include "inlines.h" -#include "assert.h" - #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" - -#include "overlay017/const_ov17_022536B4.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020954F0.h" #include "struct_defs/struct_02095C48.h" + +#include "overlay012/is_form_symmetrical.h" +#include "overlay017/const_ov17_022536B4.h" +#include "overlay017/ov17_0223B140.h" +#include "overlay017/ov17_0223F118.h" #include "overlay017/struct_ov17_0223F88C.h" #include "overlay017/struct_ov17_0224145C.h" #include "overlay017/struct_ov17_0224290C.h" @@ -26,35 +25,33 @@ #include "overlay017/struct_ov17_02246F24.h" #include "overlay017/struct_ov17_022472F8.h" #include "overlay017/struct_ov17_022538F0.h" -#include "struct_defs/sprite_template.h" +#include "assert.h" +#include "game_options.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "game_options.h" -#include "pokemon.h" #include "unk_0208C098.h" #include "unk_02094EDC.h" -#include "overlay012/is_form_symmetrical.h" -#include "overlay017/ov17_0223B140.h" -#include "overlay017/ov17_0223F118.h" -#include "overlay017/ov17_022413D8.h" typedef struct { - UnkStruct_ov17_02246F24 * unk_00; - u8 * unk_04; + UnkStruct_ov17_02246F24 *unk_00; + u8 *unk_04; s16 unk_08; s16 unk_0A; u8 unk_0C; @@ -62,7 +59,7 @@ typedef struct { } UnkStruct_ov17_022426E8; typedef struct { - UnkStruct_ov17_02246F24 * unk_00; + UnkStruct_ov17_02246F24 *unk_00; int unk_04; u8 unk_08; u8 unk_09; @@ -72,11 +69,11 @@ typedef struct { u8 unk_0D; u8 unk_0E; s8 unk_0F; - u8 * unk_10; + u8 *unk_10; } UnkStruct_ov17_022431A0; typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; f32 unk_04; f32 unk_08; u8 unk_0C; @@ -84,10 +81,10 @@ typedef struct { } UnkStruct_ov17_02242048; typedef struct { - UnkStruct_ov17_02246F24 * unk_00; - UnkStruct_ov17_0224145C * unk_04; - CellActorData * unk_08; - u8 * unk_0C; + UnkStruct_ov17_02246F24 *unk_00; + UnkStruct_ov17_0224145C *unk_04; + CellActorData *unk_08; + u8 *unk_0C; u32 unk_10; u32 unk_14; s32 unk_18; @@ -101,8 +98,8 @@ typedef struct { } UnkStruct_ov17_0224331C; typedef struct { - UnkStruct_ov17_02246F24 * unk_00; - u8 * unk_04; + UnkStruct_ov17_02246F24 *unk_00; + u8 *unk_04; u8 unk_08; s8 unk_09; u8 unk_0A; @@ -128,9 +125,9 @@ typedef struct { } UnkStruct_ov17_02241B3C; typedef struct { - UnkStruct_ov17_0223F88C * unk_00; - CellActorData * unk_04; - CellActorData * unk_08; + UnkStruct_ov17_0223F88C *unk_00; + CellActorData *unk_04; + CellActorData *unk_08; fx32 unk_0C; s32 unk_10; s32 unk_14; @@ -149,9 +146,9 @@ typedef struct { } UnkStruct_ov17_022422B8; typedef struct { - UnkStruct_ov17_02246F24 * unk_00; - CellActorData * unk_04; - u8 * unk_08; + UnkStruct_ov17_02246F24 *unk_00; + CellActorData *unk_04; + u8 *unk_08; u16 unk_0C; u8 unk_0E; u8 unk_0F; @@ -164,22 +161,22 @@ typedef struct { } UnkStruct_ov17_022436D0; void include_unk_ov17_02253784(); -void ov17_02242EE4(UnkStruct_ov17_02246F24 * param0, int param1); -void ov17_02242FA4(UnkStruct_ov17_02246F24 * param0); -void ov17_02242FC0(UnkStruct_ov17_02246F24 * param0); -void ov17_02242FE8(UnkStruct_ov17_02246F24 * param0); -void ov17_022426E8(UnkStruct_ov17_02246F24 * param0, int param1, u8 * param2); -static void ov17_02242720(SysTask * param0, void * param1); -static void ov17_02242884(SysTask * param0, void * param1); -static void ov17_022431E8(SysTask * param0, void * param1); -static void ov17_02242048(CellActorData * param0); -static void ov17_0224207C(SysTask * param0, void * param1); -static void ov17_02241C2C(SysTask * param0, void * param1); -static void ov17_02241CF0(SysTask * param0, void * param1); -static void ov17_022434E0(SysTask * param0, void * param1); -static void ov17_022436A4(SysTask * param0, void * param1); -static void ov17_02243750(SysTask * param0, void * param1); -static void ov17_022414C0(SysTask * param0, void * param1); +void ov17_02242EE4(UnkStruct_ov17_02246F24 *param0, int param1); +void ov17_02242FA4(UnkStruct_ov17_02246F24 *param0); +void ov17_02242FC0(UnkStruct_ov17_02246F24 *param0); +void ov17_02242FE8(UnkStruct_ov17_02246F24 *param0); +void ov17_022426E8(UnkStruct_ov17_02246F24 *param0, int param1, u8 *param2); +static void ov17_02242720(SysTask *param0, void *param1); +static void ov17_02242884(SysTask *param0, void *param1); +static void ov17_022431E8(SysTask *param0, void *param1); +static void ov17_02242048(CellActorData *param0); +static void ov17_0224207C(SysTask *param0, void *param1); +static void ov17_02241C2C(SysTask *param0, void *param1); +static void ov17_02241CF0(SysTask *param0, void *param1); +static void ov17_022434E0(SysTask *param0, void *param1); +static void ov17_022436A4(SysTask *param0, void *param1); +static void ov17_02243750(SysTask *param0, void *param1); +static void ov17_022414C0(SysTask *param0, void *param1); static const SpriteTemplate Unk_ov17_022538BC = { 0x60, @@ -189,7 +186,7 @@ static const SpriteTemplate Unk_ov17_022538BC = { 0x2713, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x0, 0x0, 0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x0, 0x0, 0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -202,7 +199,7 @@ static const SpriteTemplate Unk_ov17_02253820 = { 0x2712, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80EC, 0x80E9, 0x80EC, 0x80EC, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80EC, 0x80E9, 0x80EC, 0x80EC, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -215,7 +212,7 @@ static const SpriteTemplate Unk_ov17_02253854 = { 0x2710, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80ED, 0x80E9, 0x80ED, 0x80ED, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80ED, 0x80E9, 0x80ED, 0x80ED, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -228,7 +225,7 @@ static const SpriteTemplate Unk_ov17_02253888 = { 0xB, 0x3, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80EE, 0x80E9, 0x80EE, 0x80EE, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80EE, 0x80E9, 0x80EE, 0x80EE, 0xFFFFFFFF, 0xFFFFFFFF }, 0x0, 0x0 }; @@ -241,7 +238,7 @@ static const SpriteTemplate Unk_ov17_022537EC = { 0xD, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80F0, 0x80E9, 0x80F0, 0x80F0, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F0, 0x80E9, 0x80F0, 0x80F0, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -254,7 +251,7 @@ static const SpriteTemplate Unk_ov17_0225371C = { 0xC, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80EF, 0x80E9, 0x80EF, 0x80EF, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80EF, 0x80E9, 0x80EF, 0x80EF, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -267,7 +264,7 @@ static const SpriteTemplate Unk_ov17_02253750 = { 0xE, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80F1, 0x80E9, 0x80F1, 0x80F1, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F1, 0x80E9, 0x80F1, 0x80F1, 0xFFFFFFFF, 0xFFFFFFFF }, 0x0, 0x0 }; @@ -280,7 +277,7 @@ static const SpriteTemplate Unk_ov17_02253784 = { 0xA, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80F2, 0x80EE, 0x80F2, 0x80F2, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F2, 0x80EE, 0x80F2, 0x80F2, 0xFFFFFFFF, 0xFFFFFFFF }, 0x0, 0x0 }; @@ -293,81 +290,81 @@ static const SpriteTemplate Unk_ov17_022537B8 = { 0x2711, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80F5, 0x80E9, 0x80F3, 0x80F3, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F5, 0x80E9, 0x80F3, 0x80F3, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; __attribute__((aligned(4))) static const s16 Unk_ov17_0225370C[4][2] = { - {0x5, 0x2B}, - {0x5, 0x5B}, - {0x5, 0x8B}, - {0x5, 0xBB} + { 0x5, 0x2B }, + { 0x5, 0x5B }, + { 0x5, 0x8B }, + { 0x5, 0xBB } }; __attribute__((aligned(4))) static const s16 Unk_ov17_022536D8[(1 + 2)][2] = { - {0x58, 0xC}, - {0x78, 0xC}, - {0x98, 0xC} + { 0x58, 0xC }, + { 0x78, 0xC }, + { 0x98, 0xC } }; static const struct { s16 unk_00; s16 unk_02; } Unk_ov17_022536E4[] = { - {0x60, 0x14}, - {0x80, 0x14}, - {0xA0, 0x14} + { 0x60, 0x14 }, + { 0x80, 0x14 }, + { 0xA0, 0x14 } }; static const UnkStruct_ov17_022538F0 Unk_ov17_022538F0[] = { - {0x0, 0x0, 0x0}, - {0x0, 0x5, 0x1}, - {0x1, 0x5, 0x1}, - {0x2, 0x5, 0x1}, - {0x3, 0x1B, 0x0}, - {0x4, 0x0, 0x0}, - {0x5, 0x6, 0x0}, - {0x6, 0x1C, 0x0}, - {0x7, 0x1C, 0x0}, - {0x8, 0x1C, 0x0}, - {0x9, 0x1C, 0x0}, - {0xA, 0x6, 0x0}, - {0xB, 0x6, 0x0}, - {0xC, 0x6, 0x0}, - {0xD, 0x6, 0x0}, - {0xE, 0x6, 0x0}, - {0xF, 0x6, 0x0}, - {0x10, 0x6, 0x0}, - {0x11, 0x6, 0x0}, - {0x12, 0x6, 0x0}, - {0x13, 0x6, 0x0}, - {0x14, 0x6, 0x0}, - {0x15, 0x6, 0x0}, - {0x16, 0x0, 0x0}, - {0x17, 0x0, 0x0}, - {0x18, 0x0, 0x0}, - {0x19, 0x5, 0x0}, - {0x1A, 0x0, 0x0}, - {0x1B, 0x0, 0x0}, - {0x1C, 0x0, 0x0}, - {0x1D, 0x0, 0x0}, - {0x1E, 0x2, 0x0}, - {0x1F, 0x2, 0x0}, - {0x20, 0x2, 0x0}, - {0x21, 0x2, 0x0}, - {0x22, 0x2, 0x0}, - {0x23, 0x0, 0x0}, - {0x24, 0x0, 0x0}, - {0x25, 0x0, 0x0}, - {0x26, 0x0, 0x0}, - {0x27, 0x0, 0x0}, - {0x28, 0x0, 0x0}, - {0x44, 0x0, 0x0}, - {0x45, 0x0, 0x0}, - {0x46, 0x0, 0x0}, - {0x47, 0x0, 0x0}, - {0x48, 0x0, 0x1} + { 0x0, 0x0, 0x0 }, + { 0x0, 0x5, 0x1 }, + { 0x1, 0x5, 0x1 }, + { 0x2, 0x5, 0x1 }, + { 0x3, 0x1B, 0x0 }, + { 0x4, 0x0, 0x0 }, + { 0x5, 0x6, 0x0 }, + { 0x6, 0x1C, 0x0 }, + { 0x7, 0x1C, 0x0 }, + { 0x8, 0x1C, 0x0 }, + { 0x9, 0x1C, 0x0 }, + { 0xA, 0x6, 0x0 }, + { 0xB, 0x6, 0x0 }, + { 0xC, 0x6, 0x0 }, + { 0xD, 0x6, 0x0 }, + { 0xE, 0x6, 0x0 }, + { 0xF, 0x6, 0x0 }, + { 0x10, 0x6, 0x0 }, + { 0x11, 0x6, 0x0 }, + { 0x12, 0x6, 0x0 }, + { 0x13, 0x6, 0x0 }, + { 0x14, 0x6, 0x0 }, + { 0x15, 0x6, 0x0 }, + { 0x16, 0x0, 0x0 }, + { 0x17, 0x0, 0x0 }, + { 0x18, 0x0, 0x0 }, + { 0x19, 0x5, 0x0 }, + { 0x1A, 0x0, 0x0 }, + { 0x1B, 0x0, 0x0 }, + { 0x1C, 0x0, 0x0 }, + { 0x1D, 0x0, 0x0 }, + { 0x1E, 0x2, 0x0 }, + { 0x1F, 0x2, 0x0 }, + { 0x20, 0x2, 0x0 }, + { 0x21, 0x2, 0x0 }, + { 0x22, 0x2, 0x0 }, + { 0x23, 0x0, 0x0 }, + { 0x24, 0x0, 0x0 }, + { 0x25, 0x0, 0x0 }, + { 0x26, 0x0, 0x0 }, + { 0x27, 0x0, 0x0 }, + { 0x28, 0x0, 0x0 }, + { 0x44, 0x0, 0x0 }, + { 0x45, 0x0, 0x0 }, + { 0x46, 0x0, 0x0 }, + { 0x47, 0x0, 0x0 }, + { 0x48, 0x0, 0x1 } }; __attribute__((aligned(4))) static const int Unk_ov17_022536FC[] = { @@ -384,19 +381,19 @@ __attribute__((aligned(4))) const u8 Unk_ov17_022536B4[] = { 0xB }; -void include_unk_ov17_02253784 () +void include_unk_ov17_02253784() { s16 dummy = Unk_ov17_02253784.x; } -void ov17_022413D8 (void) +void ov17_022413D8(void) { G2_BlendNone(); } -void ov17_022413E4 (UnkStruct_ov17_02246F24 * param0, int param1, int param2) +void ov17_022413E4(UnkStruct_ov17_02246F24 *param0, int param1, int param2) { - u16 * v0; + u16 *v0; int v1, v2; v0 = sub_02019FE4(param0->unk_0C.unk_24, 2); @@ -409,7 +406,7 @@ void ov17_022413E4 (UnkStruct_ov17_02246F24 * param0, int param1, int param2) } } -void ov17_02241428 (UnkStruct_ov17_02246F24 * param0) +void ov17_02241428(UnkStruct_ov17_02246F24 *param0) { int v0; @@ -420,9 +417,9 @@ void ov17_02241428 (UnkStruct_ov17_02246F24 * param0) sub_0201C3C0(param0->unk_0C.unk_24, 2); } -UnkStruct_ov17_0224145C * ov17_0224145C (UnkStruct_ov17_02246F24 * param0, int param1) +UnkStruct_ov17_0224145C *ov17_0224145C(UnkStruct_ov17_02246F24 *param0, int param1) { - UnkStruct_ov17_0224145C * v0; + UnkStruct_ov17_0224145C *v0; v0 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_0224145C)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224145C)); @@ -434,7 +431,7 @@ UnkStruct_ov17_0224145C * ov17_0224145C (UnkStruct_ov17_02246F24 * param0, int p return v0; } -void ov17_02241494 (UnkStruct_ov17_0224145C * param0) +void ov17_02241494(UnkStruct_ov17_0224145C *param0) { GF_ASSERT(param0->unk_0B == 0); @@ -442,20 +439,20 @@ void ov17_02241494 (UnkStruct_ov17_0224145C * param0) Heap_FreeToHeap(param0); } -void ov17_022414B0 (UnkStruct_ov17_0224145C * param0) +void ov17_022414B0(UnkStruct_ov17_0224145C *param0) { param0->unk_0B = 1; param0->unk_08 = (10 << 8); } -BOOL ov17_022414BC (UnkStruct_ov17_0224145C * param0) +BOOL ov17_022414BC(UnkStruct_ov17_0224145C *param0) { return param0->unk_0B; } -static void ov17_022414C0 (SysTask * param0, void * param1) +static void ov17_022414C0(SysTask *param0, void *param1) { - UnkStruct_ov17_0224145C * v0 = param1; + UnkStruct_ov17_0224145C *v0 = param1; if (v0->unk_0B == 0) { return; @@ -475,14 +472,14 @@ static void ov17_022414C0 (SysTask * param0, void * param1) } } -void ov17_02241524 (UnkStruct_ov17_0223F88C * param0, int param1) +void ov17_02241524(UnkStruct_ov17_0223F88C *param0, int param1) { sub_02007DC8(param0->unk_08[param1]); GF_ASSERT(param0->unk_58[param1].unk_00 != NULL); MI_CpuClear8(param0->unk_58[param1].unk_00, (32 * 10 * 10)); - param0->unk_08[param1] = sub_02095484(param0->unk_04, param1, param0->unk_00->unk_00[param1], 0, ¶m0->unk_58[param1], 21, (((256 - 40))) - 32 * param1, ((((104 + 8)))) - 32 * param1, -0x200); + param0->unk_08[param1] = sub_02095484(param0->unk_04, param1, param0->unk_00->unk_00[param1], 0, ¶m0->unk_58[param1], 21, (256 - 40) - 32 * param1, (104 + 8) - 32 * param1, -0x200); sub_02007DEC(param0->unk_08[param1], 6, 1); sub_02007DEC(param0->unk_08[param1], 37, 1); @@ -499,7 +496,7 @@ void ov17_02241524 (UnkStruct_ov17_0223F88C * param0, int param1) } } -void ov17_022415E4 (UnkStruct_ov17_0223F88C * param0) +void ov17_022415E4(UnkStruct_ov17_0223F88C *param0) { int v0; @@ -507,7 +504,7 @@ void ov17_022415E4 (UnkStruct_ov17_0223F88C * param0) GF_ASSERT(param0->unk_58[v0].unk_00 == NULL); param0->unk_58[v0].unk_00 = Heap_AllocFromHeap(21, (32 * 10 * 10)); - param0->unk_08[v0] = sub_02095484(param0->unk_04, v0, param0->unk_00->unk_00[v0], 0, ¶m0->unk_58[v0], 21, (((256 - 40))) - 32 * v0, ((((104 + 8)))) - 32 * v0, -0x200); + param0->unk_08[v0] = sub_02095484(param0->unk_04, v0, param0->unk_00->unk_00[v0], 0, ¶m0->unk_58[v0], 21, (256 - 40) - 32 * v0, (104 + 8) - 32 * v0, -0x200); sub_02007DEC(param0->unk_08[v0], 6, 1); sub_02007DEC(param0->unk_08[v0], 37, 1); @@ -533,7 +530,7 @@ void ov17_022415E4 (UnkStruct_ov17_0223F88C * param0) MI_CpuClear32(param0->unk_98.unk_00, (32 * 10 * 10)); } -void ov17_022416E4 (UnkStruct_ov17_0223F88C * param0) +void ov17_022416E4(UnkStruct_ov17_0223F88C *param0) { int v0; @@ -547,9 +544,9 @@ void ov17_022416E4 (UnkStruct_ov17_0223F88C * param0) param0->unk_98.unk_00 = NULL; } -static CellActorData * ov17_02241720 (PaletteData * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, const UnkStruct_020954F0 * param3, int param4, NARC * param5) +static CellActorData *ov17_02241720(PaletteData *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, const UnkStruct_020954F0 *param3, int param4, NARC *param5) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; u32 v2, v3, v4, v5; @@ -593,7 +590,7 @@ static CellActorData * ov17_02241720 (PaletteData * param0, SpriteRenderer * par return v0; } -static void ov17_02241814 (SpriteGfxHandler * param0, CellActorData * param1, int param2) +static void ov17_02241814(SpriteGfxHandler *param0, CellActorData *param1, int param2) { sub_0200D0F4(param1); SpriteGfxHandler_UnloadCharObjById(param0, 33001 + param2); @@ -602,7 +599,7 @@ static void ov17_02241814 (SpriteGfxHandler * param0, CellActorData * param1, in SpriteGfxHandler_UnloadAnimObjById(param0, 33001 + param2); } -static void ov17_02241854 (PaletteData * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, NARC * param3) +static void ov17_02241854(PaletteData *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, NARC *param3) { u32 v0, v1, v2; @@ -615,16 +612,18 @@ static void ov17_02241854 (PaletteData * param0, SpriteRenderer * param1, Sprite SpriteRenderer_LoadAnimResObjFromOpenNarc(param1, param2, param3, v2, 1, 33004); } -static CellActorData * ov17_022418A4 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2) +static CellActorData *ov17_022418A4(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; const int v2[] = { - 2, 4, 5, + 2, + 4, + 5, }; v1 = Unk_ov17_02253820; - v1.x = ((8 * 12)) + ((4 * 8)) * param2; + v1.x = (8 * 12) + (4 * 8) * param2; v1.y = (8 * 4) + 0 * param2; v1.plttIdx = v2[param2]; @@ -634,19 +633,19 @@ static CellActorData * ov17_022418A4 (SpriteRenderer * param0, SpriteGfxHandler return v0; } -static void ov17_02241900 (CellActorData * param0) +static void ov17_02241900(CellActorData *param0) { sub_0200D0F4(param0); } -static void ov17_02241908 (SpriteGfxHandler * param0) +static void ov17_02241908(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33004); SpriteGfxHandler_UnloadCellObjById(param0, 33004); SpriteGfxHandler_UnloadAnimObjById(param0, 33004); } -void ov17_02241928 (UnkStruct_ov17_0223F88C * param0, UnkStruct_02095C48 * param1, NARC * param2) +void ov17_02241928(UnkStruct_ov17_0223F88C *param0, UnkStruct_02095C48 *param1, NARC *param2) { int v0; @@ -658,7 +657,7 @@ void ov17_02241928 (UnkStruct_ov17_0223F88C * param0, UnkStruct_02095C48 * param } } -void ov17_0224197C (UnkStruct_ov17_0223F88C * param0) +void ov17_0224197C(UnkStruct_ov17_0223F88C *param0) { int v0; @@ -670,7 +669,7 @@ void ov17_0224197C (UnkStruct_ov17_0223F88C * param0) ov17_02241908(param0->unk_1C); } -void ov17_022419AC (PaletteData * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, NARC * param3) +void ov17_022419AC(PaletteData *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, NARC *param3) { u32 v0, v1, v2; @@ -683,16 +682,16 @@ void ov17_022419AC (PaletteData * param0, SpriteRenderer * param1, SpriteGfxHand SpriteRenderer_LoadAnimResObjFromOpenNarc(param1, param2, param3, v2, 1, 33011); } -void ov17_02241A00 (SpriteGfxHandler * param0) +void ov17_02241A00(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33013); SpriteGfxHandler_UnloadCellObjById(param0, 33011); SpriteGfxHandler_UnloadAnimObjById(param0, 33011); } -void ov17_02241A24 (UnkStruct_ov17_0223F88C * param0) +void ov17_02241A24(UnkStruct_ov17_0223F88C *param0) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; v1 = Unk_ov17_022537B8; @@ -704,7 +703,7 @@ void ov17_02241A24 (UnkStruct_ov17_0223F88C * param0) param0->unk_17C = v0; } -void ov17_02241A64 (UnkStruct_ov17_0223F88C * param0) +void ov17_02241A64(UnkStruct_ov17_0223F88C *param0) { GF_ASSERT(param0->unk_17C != NULL); @@ -712,7 +711,7 @@ void ov17_02241A64 (UnkStruct_ov17_0223F88C * param0) param0->unk_17C = NULL; } -void ov17_02241A8C (UnkStruct_ov17_0223F88C * param0, int param1, int param2) +void ov17_02241A8C(UnkStruct_ov17_0223F88C *param0, int param1, int param2) { GF_ASSERT(param0->unk_17C != NULL); @@ -736,15 +735,15 @@ void ov17_02241A8C (UnkStruct_ov17_0223F88C * param0, int param1, int param2) } } -void ov17_02241B1C (UnkStruct_ov17_0223F88C * param0) +void ov17_02241B1C(UnkStruct_ov17_0223F88C *param0) { GF_ASSERT(param0->unk_17C != NULL); SpriteActor_EnableObject(param0->unk_17C, 0); } -void ov17_02241B3C (UnkStruct_ov17_02246F24 * param0, int param1, int param2, u8 * param3) +void ov17_02241B3C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, u8 *param3) { - UnkStruct_ov17_02241B3C * v0; + UnkStruct_ov17_02241B3C *v0; v0 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02241B3C)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02241B3C)); @@ -791,9 +790,9 @@ void ov17_02241B3C (UnkStruct_ov17_02246F24 * param0, int param1, int param2, u8 } } -static void ov17_02241C2C (SysTask * param0, void * param1) +static void ov17_02241C2C(SysTask *param0, void *param1) { - UnkStruct_ov17_02241B3C * v0 = param1; + UnkStruct_ov17_02241B3C *v0 = param1; switch (v0->unk_0A) { case 0: @@ -833,9 +832,9 @@ static void ov17_02241C2C (SysTask * param0, void * param1) SpriteActor_SetSpritePositionXY(v0->unk_00->unk_0C.unk_A8[v0->unk_08], v0->unk_10 / 0x100, v0->unk_14 / 0x100); } -static void ov17_02241CF0 (SysTask * param0, void * param1) +static void ov17_02241CF0(SysTask *param0, void *param1) { - UnkStruct_ov17_02241B3C * v0 = param1; + UnkStruct_ov17_02241B3C *v0 = param1; switch (v0->unk_0A) { case 0: @@ -868,7 +867,7 @@ static void ov17_02241CF0 (SysTask * param0, void * param1) } } -void ov17_02241D94 (UnkStruct_ov17_0223F88C * param0, int param1, NARC * param2) +void ov17_02241D94(UnkStruct_ov17_0223F88C *param0, int param1, NARC *param2) { GF_ASSERT(param0->unk_C0 == NULL); @@ -879,10 +878,10 @@ void ov17_02241D94 (UnkStruct_ov17_0223F88C * param0, int param1, NARC * param2) param0->unk_C0 = SpriteActor_LoadResources(param0->unk_18, param0->unk_1C, &Unk_ov17_02253854); SpriteActor_UpdateObject(param0->unk_C0->unk_00); - SpriteActor_SetSpritePositionXY(param0->unk_C0, ((8 * 12)) + ((4 * 8)) * param1, (7 * 8)); + SpriteActor_SetSpritePositionXY(param0->unk_C0, (8 * 12) + (4 * 8) * param1, (7 * 8)); } -void ov17_02241E24 (UnkStruct_ov17_0223F88C * param0) +void ov17_02241E24(UnkStruct_ov17_0223F88C *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_1C, 33005); SpriteGfxHandler_UnloadCellObjById(param0->unk_1C, 33005); @@ -892,21 +891,21 @@ void ov17_02241E24 (UnkStruct_ov17_0223F88C * param0) param0->unk_C0 = NULL; } -void ov17_02241E58 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_02241E58(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 17, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33006); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 16, 1, 33006); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 15, 1, 33006); } -void ov17_02241EA4 (SpriteGfxHandler * param0) +void ov17_02241EA4(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33006); SpriteGfxHandler_UnloadCellObjById(param0, 33006); SpriteGfxHandler_UnloadAnimObjById(param0, 33006); } -static inline void inline_ov17_02241EC4 (UnkStruct_ov17_0223F88C * param0, int param1, int param2) +static inline void inline_ov17_02241EC4(UnkStruct_ov17_0223F88C *param0, int param1, int param2) { if (param0->unk_C4[param1][param2] != NULL) { sub_0200D0F4(param0->unk_C4[param1][param2]); @@ -914,7 +913,7 @@ static inline void inline_ov17_02241EC4 (UnkStruct_ov17_0223F88C * param0, int p } } -static void ov17_02241EC4 (UnkStruct_ov17_0223F88C * param0, int param1) +static void ov17_02241EC4(UnkStruct_ov17_0223F88C *param0, int param1) { int v0; @@ -923,7 +922,7 @@ static void ov17_02241EC4 (UnkStruct_ov17_0223F88C * param0, int param1) } } -void ov17_02241EF0 (UnkStruct_ov17_0223F88C * param0) +void ov17_02241EF0(UnkStruct_ov17_0223F88C *param0) { int v0; @@ -932,9 +931,9 @@ void ov17_02241EF0 (UnkStruct_ov17_0223F88C * param0) } } -static CellActorData * ov17_02241F08 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3) +static CellActorData *ov17_02241F08(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3) { - CellActorData * v0; + CellActorData *v0; v0 = SpriteActor_LoadResources(param0, param1, &Unk_ov17_02253888); @@ -944,7 +943,7 @@ static CellActorData * ov17_02241F08 (SpriteRenderer * param0, SpriteGfxHandler return v0; } -void ov17_02241F34 (UnkStruct_ov17_0223F88C * param0, int param1, int param2, int param3) +void ov17_02241F34(UnkStruct_ov17_0223F88C *param0, int param1, int param2, int param3) { int v0, v1, v2, v3; @@ -976,9 +975,9 @@ void ov17_02241F34 (UnkStruct_ov17_0223F88C * param0, int param1, int param2, in sub_02004F7C(1761, 0xffff, 64 * (v0 - 1)); } -static void ov17_02242048 (CellActorData * param0) +static void ov17_02242048(CellActorData *param0) { - UnkStruct_ov17_02242048 * v0; + UnkStruct_ov17_02242048 *v0; v0 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02242048)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02242048)); @@ -988,9 +987,9 @@ static void ov17_02242048 (CellActorData * param0) SysTask_Start(ov17_0224207C, v0, 40000); } -static void ov17_0224207C (SysTask * param0, void * param1) +static void ov17_0224207C(SysTask *param0, void *param1) { - UnkStruct_ov17_02242048 * v0 = param1; + UnkStruct_ov17_02242048 *v0 = param1; switch (v0->unk_0C) { case 0: @@ -1031,7 +1030,7 @@ static void ov17_0224207C (SysTask * param0, void * param1) } } -void ov17_02242154 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_02242154(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 26, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33008); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 25, 1, 33008); @@ -1041,7 +1040,7 @@ void ov17_02242154 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * p SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 27, 1, 33007); } -void ov17_022421E0 (SpriteGfxHandler * param0) +void ov17_022421E0(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33008); SpriteGfxHandler_UnloadCellObjById(param0, 33008); @@ -1051,13 +1050,13 @@ void ov17_022421E0 (SpriteGfxHandler * param0) SpriteGfxHandler_UnloadAnimObjById(param0, 33007); } -static inline void inline_ov17_0224221C (UnkStruct_ov17_0223F88C * param0, int param1, int param2) +static inline void inline_ov17_0224221C(UnkStruct_ov17_0223F88C *param0, int param1, int param2) { sub_0200D0F4(param0->unk_124[param1][param2]); param0->unk_124[param1][param2] = NULL; } -static void ov17_0224221C (UnkStruct_ov17_0223F88C * param0, int param1) +static void ov17_0224221C(UnkStruct_ov17_0223F88C *param0, int param1) { int v0; @@ -1068,7 +1067,7 @@ static void ov17_0224221C (UnkStruct_ov17_0223F88C * param0, int param1) } } -void ov17_02242248 (UnkStruct_ov17_0223F88C * param0) +void ov17_02242248(UnkStruct_ov17_0223F88C *param0) { int v0; @@ -1077,9 +1076,9 @@ void ov17_02242248 (UnkStruct_ov17_0223F88C * param0) } } -static CellActorData * ov17_02242260 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3) +static CellActorData *ov17_02242260(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3) { - CellActorData * v0; + CellActorData *v0; v0 = SpriteActor_LoadResources(param0, param1, &Unk_ov17_022537EC); @@ -1089,9 +1088,9 @@ static CellActorData * ov17_02242260 (SpriteRenderer * param0, SpriteGfxHandler return v0; } -static CellActorData * ov17_0224228C (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3) +static CellActorData *ov17_0224228C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3) { - CellActorData * v0; + CellActorData *v0; v0 = SpriteActor_LoadResources(param0, param1, &Unk_ov17_0225371C); @@ -1101,9 +1100,9 @@ static CellActorData * ov17_0224228C (SpriteRenderer * param0, SpriteGfxHandler return v0; } -static void ov17_022422B8 (SysTask * param0, void * param1) +static void ov17_022422B8(SysTask *param0, void *param1) { - UnkStruct_ov17_022422B8 * v0 = param1; + UnkStruct_ov17_022422B8 *v0 = param1; switch (v0->unk_2E) { case 0: @@ -1167,7 +1166,7 @@ static void ov17_022422B8 (SysTask * param0, void * param1) SpriteActor_SetSpritePositionXY(v0->unk_04, v0->unk_10 / 0x100, v0->unk_14 / 0x100); } -BOOL ov17_022424A8 (UnkStruct_ov17_0223F88C * param0, int param1) +BOOL ov17_022424A8(UnkStruct_ov17_0223F88C *param0, int param1) { int v0; @@ -1182,10 +1181,10 @@ BOOL ov17_022424A8 (UnkStruct_ov17_0223F88C * param0, int param1) return 1; } -void ov17_022424D4 (UnkStruct_ov17_0223F88C * param0, int param1, int param2) +void ov17_022424D4(UnkStruct_ov17_0223F88C *param0, int param1, int param2) { int v0, v1; - UnkStruct_ov17_022422B8 * v2; + UnkStruct_ov17_022422B8 *v2; v0 = param2 / 10; GF_ASSERT(v0 <= 5); @@ -1212,14 +1211,14 @@ void ov17_022424D4 (UnkStruct_ov17_0223F88C * param0, int param1, int param2) } } - for ( ; v1 < 5; v1++) { + for (; v1 < 5; v1++) { if (param0->unk_124[param1][v1] != NULL) { inline_ov17_0224221C(param0, param1, v1); } } } -static void ov17_0224262C (UnkStruct_ov17_02246F24 * param0, GXOamMode param1, int param2) +static void ov17_0224262C(UnkStruct_ov17_02246F24 *param0, GXOamMode param1, int param2) { int v0, v1; int v2, v3; @@ -1252,9 +1251,9 @@ static void ov17_0224262C (UnkStruct_ov17_02246F24 * param0, GXOamMode param1, i } } -void ov17_022426E8 (UnkStruct_ov17_02246F24 * param0, int param1, u8 * param2) +void ov17_022426E8(UnkStruct_ov17_02246F24 *param0, int param1, u8 *param2) { - UnkStruct_ov17_022426E8 * v0; + UnkStruct_ov17_022426E8 *v0; *param2 = 0; @@ -1268,9 +1267,9 @@ void ov17_022426E8 (UnkStruct_ov17_02246F24 * param0, int param1, u8 * param2) SysTask_Start(ov17_02242720, v0, 1000); } -static void ov17_02242720 (SysTask * param0, void * param1) +static void ov17_02242720(SysTask *param0, void *param1) { - UnkStruct_ov17_022426E8 * v0 = param1; + UnkStruct_ov17_022426E8 *v0 = param1; switch (v0->unk_0C) { case 0: @@ -1330,9 +1329,9 @@ static void ov17_02242720 (SysTask * param0, void * param1) } } -static void ov17_02242884 (SysTask * param0, void * param1) +static void ov17_02242884(SysTask *param0, void *param1) { - UnkStruct_ov17_022426E8 * v0 = param1; + UnkStruct_ov17_022426E8 *v0 = param1; int v1 = 0; if (v0->unk_0D == 0) { @@ -1369,7 +1368,7 @@ static void ov17_02242884 (SysTask * param0, void * param1) } } -static void ov17_0224290C (UnkStruct_ov17_02246F24 * param0, int param1, const UnkStruct_ov17_022449B8 * param2, const void * param3) +static void ov17_0224290C(UnkStruct_ov17_02246F24 *param0, int param1, const UnkStruct_ov17_022449B8 *param2, const void *param3) { GF_ASSERT(param1 < 2 || param2 != NULL); @@ -1483,9 +1482,8 @@ static void ov17_0224290C (UnkStruct_ov17_02246F24 * param0, int param1, const U StringTemplate_SetContestJudgeName(param0->unk_0C.unk_48, 1, param0->unk_0C.unk_00->unk_C0[param2->unk_05].unk_00); StringTemplate_SetMoveName(param0->unk_0C.unk_48, 2, param2->unk_02); break; - case 28: - { - const UnkStruct_ov17_0224290C * v0 = param3; + case 28: { + const UnkStruct_ov17_0224290C *v0 = param3; int v1; StringTemplate_SetContestJudgeName(param0->unk_0C.unk_48, 0, param0->unk_0C.unk_00->unk_C0[v0->unk_00].unk_00); @@ -1497,23 +1495,22 @@ static void ov17_0224290C (UnkStruct_ov17_02246F24 * param0, int param1, const U StringTemplate_SetNickname(param0->unk_0C.unk_48, 1 + v1, Pokemon_GetBoxPokemon(param0->unk_0C.unk_00->unk_00[v0->unk_01[v1]])); } - } - break; + } break; default: GF_ASSERT(FALSE); break; } } -void ov17_02242DA8 (UnkStruct_ov17_02246F24 * param0) +void ov17_02242DA8(UnkStruct_ov17_02246F24 *param0) { BGL_FillWindow(¶m0->unk_0C.unk_28[0], 0xff); sub_0201A954(¶m0->unk_0C.unk_28[0]); } -static void ov17_02242DC0 (UnkStruct_ov17_02246F24 * param0, MessageLoader * param1, u32 param2, int param3, const UnkStruct_ov17_022449B8 * param4, const void * param5, int param6) +static void ov17_02242DC0(UnkStruct_ov17_02246F24 *param0, MessageLoader *param1, u32 param2, int param3, const UnkStruct_ov17_022449B8 *param4, const void *param5, int param6) { - Strbuf* v0; + Strbuf *v0; u32 v1; if (param6 == 1) { @@ -1546,7 +1543,7 @@ static void ov17_02242DC0 (UnkStruct_ov17_02246F24 * param0, MessageLoader * par Strbuf_Free(v0); } -void ov17_02242E5C (UnkStruct_ov17_02246F24 * param0, u32 param1, const UnkStruct_ov17_022449B8 * param2, const void * param3) +void ov17_02242E5C(UnkStruct_ov17_02246F24 *param0, u32 param1, const UnkStruct_ov17_022449B8 *param2, const void *param3) { u32 v0, v1, v2; @@ -1559,7 +1556,7 @@ void ov17_02242E5C (UnkStruct_ov17_02246F24 * param0, u32 param1, const UnkStruc ov17_02242DC0(param0, param0->unk_0C.unk_38, v0, v1, param2, param3, v2); } -void ov17_02242E9C (UnkStruct_ov17_02246F24 * param0, int param1, int param2, const UnkStruct_ov17_022449B8 * param3, const void * param4) +void ov17_02242E9C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, const UnkStruct_ov17_022449B8 *param3, const void *param4) { u32 v0, v1; @@ -1567,7 +1564,7 @@ void ov17_02242E9C (UnkStruct_ov17_02246F24 * param0, int param1, int param2, co ov17_02242DC0(param0, param0->unk_0C.unk_44, v0, v1, param3, param4, 0); } -int ov17_02242ECC (UnkStruct_ov17_02246F24 * param0) +int ov17_02242ECC(UnkStruct_ov17_02246F24 *param0) { if (param0->unk_0C.unk_210 == 0xff) { return 0; @@ -1576,9 +1573,9 @@ int ov17_02242ECC (UnkStruct_ov17_02246F24 * param0) return Message_Printing(param0->unk_0C.unk_210); } -void ov17_02242EE4 (UnkStruct_ov17_02246F24 * param0, int param1) +void ov17_02242EE4(UnkStruct_ov17_02246F24 *param0, int param1) { - Strbuf* v0; + Strbuf *v0; u32 v1; v0 = Strbuf_Init(12, 21); @@ -1597,7 +1594,7 @@ void ov17_02242EE4 (UnkStruct_ov17_02246F24 * param0, int param1) Strbuf_Free(v0); } -void ov17_02242FA4 (UnkStruct_ov17_02246F24 * param0) +void ov17_02242FA4(UnkStruct_ov17_02246F24 *param0) { int v0; @@ -1608,7 +1605,7 @@ void ov17_02242FA4 (UnkStruct_ov17_02246F24 * param0) ov17_02242FE8(param0); } -void ov17_02242FC0 (UnkStruct_ov17_02246F24 * param0) +void ov17_02242FC0(UnkStruct_ov17_02246F24 *param0) { int v0; @@ -1618,7 +1615,7 @@ void ov17_02242FC0 (UnkStruct_ov17_02246F24 * param0) } } -void ov17_02242FE8 (UnkStruct_ov17_02246F24 * param0) +void ov17_02242FE8(UnkStruct_ov17_02246F24 *param0) { int v0, v1; @@ -1629,21 +1626,21 @@ void ov17_02242FE8 (UnkStruct_ov17_02246F24 * param0) } } -void ov17_02243040 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_02243040(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 23, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33009); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 22, 1, 33009); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 21, 1, 33009); } -void ov17_0224308C (SpriteGfxHandler * param0) +void ov17_0224308C(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33009); SpriteGfxHandler_UnloadCellObjById(param0, 33009); SpriteGfxHandler_UnloadAnimObjById(param0, 33009); } -void ov17_022430AC (UnkStruct_ov17_0223F88C * param0, int param1, int param2) +void ov17_022430AC(UnkStruct_ov17_0223F88C *param0, int param1, int param2) { if (param0->unk_160[param1] == NULL) { param0->unk_160[param1] = SpriteActor_LoadResources(param0->unk_18, param0->unk_1C, &Unk_ov17_02253750); @@ -1654,7 +1651,7 @@ void ov17_022430AC (UnkStruct_ov17_0223F88C * param0, int param1, int param2) SpriteActor_UpdateObject(param0->unk_160[param1]->unk_00); } -void ov17_022430F8 (UnkStruct_ov17_0223F88C * param0) +void ov17_022430F8(UnkStruct_ov17_0223F88C *param0) { int v0; @@ -1666,7 +1663,7 @@ void ov17_022430F8 (UnkStruct_ov17_0223F88C * param0) } } -void ov17_02243120 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_022449B8 * param1, int param2) +void ov17_02243120(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_022449B8 *param1, int param2) { MI_CpuClear8(param1, sizeof(UnkStruct_ov17_022449B8)); @@ -1675,7 +1672,7 @@ void ov17_02243120 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_022449B8 * param1->unk_05 = param0->unk_220.unk_0E[param2]; } -u32 ov17_0224314C (int param0, int param1, UnkStruct_ov17_022449B8 * param2) +u32 ov17_0224314C(int param0, int param1, UnkStruct_ov17_022449B8 *param2) { int v0; @@ -1696,7 +1693,7 @@ u32 ov17_0224314C (int param0, int param1, UnkStruct_ov17_022449B8 * param2) return v0; } -int ov17_02243174 (int param0) +int ov17_02243174(int param0) { int v0; int v1; @@ -1715,9 +1712,9 @@ int ov17_02243174 (int param0) return v1; } -void ov17_022431A0 (UnkStruct_ov17_02246F24 * param0, int param1, u8 param2, int param3, int param4, u8 * param5) +void ov17_022431A0(UnkStruct_ov17_02246F24 *param0, int param1, u8 param2, int param3, int param4, u8 *param5) { - UnkStruct_ov17_022431A0 * v0; + UnkStruct_ov17_022431A0 *v0; *param5 = 0; @@ -1735,9 +1732,9 @@ void ov17_022431A0 (UnkStruct_ov17_02246F24 * param0, int param1, u8 param2, int SysTask_Start(ov17_022431E8, v0, 3000); } -static void ov17_022431E8 (SysTask * param0, void * param1) +static void ov17_022431E8(SysTask *param0, void *param1) { - UnkStruct_ov17_022431A0 * v0 = param1; + UnkStruct_ov17_022431A0 *v0 = param1; switch (v0->unk_08) { case 0: @@ -1749,8 +1746,7 @@ static void ov17_022431E8 (SysTask * param0, void * param1) Sound_PlayEffect(1765); sub_02004AD4(1765, v0->unk_04); v0->unk_08++; - case 1: - { + case 1: { u32 v1; if (v0->unk_09 == 0) { @@ -1819,9 +1815,9 @@ static void ov17_022431E8 (SysTask * param0, void * param1) } } -void ov17_0224331C (UnkStruct_ov17_02246F24 * param0, int param1, int param2, u8 * param3, UnkStruct_ov17_0224145C * param4) +void ov17_0224331C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, u8 *param3, UnkStruct_ov17_0224145C *param4) { - UnkStruct_ov17_0224331C * v0; + UnkStruct_ov17_0224331C *v0; s32 v1, v2; s16 v3, v4, v5, v6; int v7; @@ -1843,7 +1839,8 @@ void ov17_0224331C (UnkStruct_ov17_02246F24 * param0, int param1, int param2, u8 if (*param3 == 0) { SpriteActor_GetSpritePositionXY(param0->unk_0C.unk_C4[param1][v7], &v3, &v4); v8 = sub_0208C0A4( - MATH_IAbs(v3 - v1), MATH_IAbs(v4 - v2)) * 0x100; + MATH_IAbs(v3 - v1), MATH_IAbs(v4 - v2)) + * 0x100; { f32 v10, v11; @@ -1879,9 +1876,9 @@ void ov17_0224331C (UnkStruct_ov17_02246F24 * param0, int param1, int param2, u8 } } -static void ov17_022434E0 (SysTask * param0, void * param1) +static void ov17_022434E0(SysTask *param0, void *param1) { - UnkStruct_ov17_0224331C * v0 = param1; + UnkStruct_ov17_0224331C *v0 = param1; int v1, v2, v3; s16 v4, v5; @@ -1933,9 +1930,9 @@ static void ov17_022434E0 (SysTask * param0, void * param1) } } -UnkStruct_ov17_0224365C * ov17_0224365C (UnkStruct_ov17_02246F24 * param0, int param1) +UnkStruct_ov17_0224365C *ov17_0224365C(UnkStruct_ov17_02246F24 *param0, int param1) { - UnkStruct_ov17_0224365C * v0; + UnkStruct_ov17_0224365C *v0; v0 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_0224365C)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224365C)); @@ -1947,15 +1944,15 @@ UnkStruct_ov17_0224365C * ov17_0224365C (UnkStruct_ov17_02246F24 * param0, int p return v0; } -void ov17_02243690 (UnkStruct_ov17_0224365C * param0) +void ov17_02243690(UnkStruct_ov17_0224365C *param0) { SysTask_Done(param0->unk_04); Heap_FreeToHeap(param0); } -static void ov17_022436A4 (SysTask * param0, void * param1) +static void ov17_022436A4(SysTask *param0, void *param1) { - UnkStruct_ov17_0224365C * v0 = param1; + UnkStruct_ov17_0224365C *v0 = param1; int v1; for (v1 = 0; v1 < 5; v1++) { @@ -1967,9 +1964,9 @@ static void ov17_022436A4 (SysTask * param0, void * param1) } } -void ov17_022436D0 (UnkStruct_ov17_02246F24 * param0, int param1, int param2, int param3, u8 * param4) +void ov17_022436D0(UnkStruct_ov17_02246F24 *param0, int param1, int param2, int param3, u8 *param4) { - UnkStruct_ov17_022436D0 * v0; + UnkStruct_ov17_022436D0 *v0; int v1; int v2, v3; @@ -1999,9 +1996,9 @@ void ov17_022436D0 (UnkStruct_ov17_02246F24 * param0, int param1, int param2, in } } -static void ov17_02243750 (SysTask * param0, void * param1) +static void ov17_02243750(SysTask *param0, void *param1) { - UnkStruct_ov17_022436D0 * v0 = param1; + UnkStruct_ov17_022436D0 *v0 = param1; s16 v1, v2; int v3, v4; @@ -2077,34 +2074,46 @@ static void ov17_02243750 (SysTask * param0, void * param1) } } -u32 ov17_02243944 (int param0) +u32 ov17_02243944(int param0) { const u16 v0[] = { - 41, 40, 36, 38, 39, + 41, + 40, + 36, + 38, + 39, }; return v0[param0]; } -u32 ov17_02243970 (int param0) +u32 ov17_02243970(int param0) { const u16 v0[] = { - 12, 13, 14, 15, 16, + 12, + 13, + 14, + 15, + 16, }; return v0[param0]; } -u32 ov17_0224399C (int param0) +u32 ov17_0224399C(int param0) { const u16 v0[] = { - 18, 19, 20, 21, 22, + 18, + 19, + 20, + 21, + 22, }; return v0[param0]; } -void ov17_022439C8 (UnkStruct_02095C48 * param0, int param1, int param2, UnkStruct_ov17_022439C8 * param3) +void ov17_022439C8(UnkStruct_02095C48 *param0, int param1, int param2, UnkStruct_ov17_022439C8 *param3) { MI_CpuClear8(param3, sizeof(UnkStruct_ov17_022439C8)); @@ -2123,8 +2132,7 @@ void ov17_022439C8 (UnkStruct_02095C48 * param0, int param1, int param2, UnkStru case 218: param3->unk_08 = 0; break; - case 174: - { + case 174: { int v0, v1; v0 = Pokemon_GetValue(param0->unk_00.unk_00[param1], MON_DATA_TYPE_1, NULL); @@ -2135,8 +2143,7 @@ void ov17_022439C8 (UnkStruct_02095C48 * param0, int param1, int param2, UnkStru } else { param3->unk_07 = 0; } - } - break; + } break; case 119: param3->unk_04 = 1; break; @@ -2153,7 +2160,7 @@ void ov17_022439C8 (UnkStruct_02095C48 * param0, int param1, int param2, UnkStru } } -int ov17_02243A98 (UnkStruct_ov17_022472F8 * param0, int param1, int param2) +int ov17_02243A98(UnkStruct_ov17_022472F8 *param0, int param1, int param2) { if (param2 == 0) { return 0; diff --git a/src/overlay017/ov17_02243AC4.c b/src/overlay017/ov17_02243AC4.c index 75edbbde8f..83654b5b68 100644 --- a/src/overlay017/ov17_02243AC4.c +++ b/src/overlay017/ov17_02243AC4.c @@ -1,20 +1,21 @@ +#include "overlay017/ov17_02243AC4.h" + #include #include #include "overlay017/struct_ov17_022472F8.h" #include "move_table.h" -#include "overlay017/ov17_02243AC4.h" __attribute__((aligned(4))) static const s8 Unk_ov17_022539C8[][5] = { - {0xA, 0x0, 0xFFFFFFFFFFFFFFF6, 0xFFFFFFFFFFFFFFF6, 0x0}, - {0x0, 0xA, 0x0, 0xFFFFFFFFFFFFFFF6, 0xFFFFFFFFFFFFFFF6}, - {0xFFFFFFFFFFFFFFF6, 0x0, 0xA, 0x0, 0xFFFFFFFFFFFFFFF6}, - {0xFFFFFFFFFFFFFFF6, 0xFFFFFFFFFFFFFFF6, 0x0, 0xA, 0x0}, - {0x0, 0xFFFFFFFFFFFFFFF6, 0xFFFFFFFFFFFFFFF6, 0x0, 0xA} + { 0xA, 0x0, 0xFFFFFFFFFFFFFFF6, 0xFFFFFFFFFFFFFFF6, 0x0 }, + { 0x0, 0xA, 0x0, 0xFFFFFFFFFFFFFFF6, 0xFFFFFFFFFFFFFFF6 }, + { 0xFFFFFFFFFFFFFFF6, 0x0, 0xA, 0x0, 0xFFFFFFFFFFFFFFF6 }, + { 0xFFFFFFFFFFFFFFF6, 0xFFFFFFFFFFFFFFF6, 0x0, 0xA, 0x0 }, + { 0x0, 0xFFFFFFFFFFFFFFF6, 0xFFFFFFFFFFFFFFF6, 0x0, 0xA } }; -int ov17_02243AC4 (UnkStruct_ov17_022472F8 * param0, int param1) +int ov17_02243AC4(UnkStruct_ov17_022472F8 *param0, int param1) { int v0, v1; @@ -30,7 +31,7 @@ int ov17_02243AC4 (UnkStruct_ov17_022472F8 * param0, int param1) return v1; } -int ov17_02243AE4 (int param0) +int ov17_02243AE4(int param0) { static const u8 v0[] = { 3 * 10, @@ -42,7 +43,7 @@ int ov17_02243AE4 (int param0) return v0[param0]; } -int ov17_02243AF0 (int param0, int param1, int param2, int param3) +int ov17_02243AF0(int param0, int param1, int param2, int param3) { int v0; int v1; @@ -74,7 +75,7 @@ __attribute__((aligned(4))) static const s16 Unk_ov17_022539B8[] = { 0x2710 }; -void ov17_02243B0C (UnkStruct_ov17_022472F8 * param0) +void ov17_02243B0C(UnkStruct_ov17_022472F8 *param0) { int v0, v1, v2; s16 v3[4]; diff --git a/src/overlay017/ov17_02243C28.c b/src/overlay017/ov17_02243C28.c index e4ba912407..d221d12b19 100644 --- a/src/overlay017/ov17_02243C28.c +++ b/src/overlay017/ov17_02243C28.c @@ -1,10 +1,14 @@ +#include "overlay017/ov17_02243C28.h" + #include #include -#include "sys_task_manager.h" - #include "battle/struct_ov16_02264408.h" #include "battle/struct_ov16_02265BBC.h" +#include "overlay012/ov12_0221FC20.h" +#include "overlay017/ov17_0223F7E4.h" +#include "overlay017/ov17_022413D8.h" +#include "overlay017/ov17_0224F18C.h" #include "overlay017/struct_ov17_02243C28.h" #include "overlay017/struct_ov17_02243C80.h" #include "overlay017/struct_ov17_02243D34.h" @@ -27,106 +31,102 @@ #include "overlay017/struct_ov17_0224F3D8.h" #include "overlay017/struct_ov17_022539E4.h" -#include "unk_02005474.h" -#include "unk_0200762C.h" -#include "sys_task.h" #include "heap.h" #include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" +#include "unk_0200762C.h" #include "unk_02094EDC.h" -#include "overlay012/ov12_0221FC20.h" -#include "overlay017/ov17_0223F7E4.h" -#include "overlay017/ov17_022413D8.h" -#include "overlay017/ov17_02243C28.h" -#include "overlay017/ov17_0224F18C.h" -static int ov17_02243C68(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02243C80(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02243C94(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4); -static int ov17_02243CDC(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02243CF4(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02243D34(SysTask * param0, void * param1); -static int ov17_02243EF8(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02243F10(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02243F68(SysTask * param0, void * param1); -static int ov17_022440C8(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_022440E0(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224413C(SysTask * param0, void * param1); -static int ov17_02244228(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02244240(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_022442AC(SysTask * param0, void * param1); -static int ov17_022443E0(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_022443F8(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_022444BC(SysTask * param0, void * param1); -static int ov17_02244958(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02244970(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02244BB0(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4); -static void ov17_022449B8(SysTask * param0, void * param1); -static int ov17_02244BD4(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02244BEC(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static int ov17_02244BF0(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02244C08(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02244C68(SysTask * param0, void * param1); -static int ov17_02243C98(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02243CB0(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static int ov17_02245DA4(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02245DBC(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static int ov17_02244D20(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02244D38(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02244D98(SysTask * param0, void * param1); -static int ov17_02244FBC(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02244FD4(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02245034(SysTask * param0, void * param1); -static int ov17_02245124(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224513C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224519C(SysTask * param0, void * param1); -static int ov17_02245510(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02245528(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02245588(SysTask * param0, void * param1); -static int ov17_02245678(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02245690(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_022456E8(SysTask * param0, void * param1); -static int ov17_02245B48(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02245B60(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02245BC8(SysTask * param0, void * param1); -static int ov17_02245E00(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02245E14(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02245E8C(SysTask * param0, void * param1); -static int ov17_02245C4C(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02245C60(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02245CA4(SysTask * param0, void * param1); -static int ov17_0224595C(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02245974(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_022459D4(SysTask * param0, void * param1); -static int ov17_02243DB4(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02243DCC(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02243E2C(SysTask * param0, void * param1); +static int ov17_02243C68(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02243C80(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02243C94(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4); +static int ov17_02243CDC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02243CF4(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02243D34(SysTask *param0, void *param1); +static int ov17_02243EF8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02243F10(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02243F68(SysTask *param0, void *param1); +static int ov17_022440C8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_022440E0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224413C(SysTask *param0, void *param1); +static int ov17_02244228(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02244240(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_022442AC(SysTask *param0, void *param1); +static int ov17_022443E0(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_022443F8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_022444BC(SysTask *param0, void *param1); +static int ov17_02244958(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02244970(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02244BB0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4); +static void ov17_022449B8(SysTask *param0, void *param1); +static int ov17_02244BD4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02244BEC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static int ov17_02244BF0(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02244C08(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02244C68(SysTask *param0, void *param1); +static int ov17_02243C98(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02243CB0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static int ov17_02245DA4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02245DBC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static int ov17_02244D20(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02244D38(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02244D98(SysTask *param0, void *param1); +static int ov17_02244FBC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02244FD4(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02245034(SysTask *param0, void *param1); +static int ov17_02245124(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224513C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224519C(SysTask *param0, void *param1); +static int ov17_02245510(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02245528(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02245588(SysTask *param0, void *param1); +static int ov17_02245678(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02245690(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_022456E8(SysTask *param0, void *param1); +static int ov17_02245B48(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02245B60(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02245BC8(SysTask *param0, void *param1); +static int ov17_02245E00(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02245E14(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02245E8C(SysTask *param0, void *param1); +static int ov17_02245C4C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02245C60(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02245CA4(SysTask *param0, void *param1); +static int ov17_0224595C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02245974(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_022459D4(SysTask *param0, void *param1); +static int ov17_02243DB4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02243DCC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02243E2C(SysTask *param0, void *param1); static const UnkStruct_ov17_022539E4 Unk_ov17_022539E4[] = { - {ov17_02243C68, ov17_02243C80, ov17_02243C94}, - {ov17_02243C98, ov17_02243CB0, NULL}, - {ov17_02243CDC, ov17_02243CF4, NULL}, - {ov17_02243DB4, ov17_02243DCC, NULL}, - {ov17_02243EF8, ov17_02243F10, NULL}, - {ov17_022440C8, ov17_022440E0, NULL}, - {ov17_02244228, ov17_02244240, NULL}, - {ov17_022443E0, ov17_022443F8, NULL}, - {ov17_02244958, ov17_02244970, ov17_02244BB0}, - {ov17_02244BD4, ov17_02244BEC, NULL}, - {ov17_02244BF0, ov17_02244C08, NULL}, - {ov17_02244D20, ov17_02244D38, NULL}, - {ov17_02244FBC, ov17_02244FD4, NULL}, - {ov17_02245124, ov17_0224513C, NULL}, - {ov17_02245510, ov17_02245528, NULL}, - {ov17_02245510, ov17_02245528, NULL}, - {ov17_02245678, ov17_02245690, NULL}, - {ov17_0224595C, ov17_02245974, NULL}, - {ov17_02245B48, ov17_02245B60, NULL}, - {ov17_02245DA4, ov17_02245DBC, NULL}, - {ov17_02245E00, ov17_02245E14, NULL}, - {ov17_02245C4C, ov17_02245C60, NULL} + { ov17_02243C68, ov17_02243C80, ov17_02243C94 }, + { ov17_02243C98, ov17_02243CB0, NULL }, + { ov17_02243CDC, ov17_02243CF4, NULL }, + { ov17_02243DB4, ov17_02243DCC, NULL }, + { ov17_02243EF8, ov17_02243F10, NULL }, + { ov17_022440C8, ov17_022440E0, NULL }, + { ov17_02244228, ov17_02244240, NULL }, + { ov17_022443E0, ov17_022443F8, NULL }, + { ov17_02244958, ov17_02244970, ov17_02244BB0 }, + { ov17_02244BD4, ov17_02244BEC, NULL }, + { ov17_02244BF0, ov17_02244C08, NULL }, + { ov17_02244D20, ov17_02244D38, NULL }, + { ov17_02244FBC, ov17_02244FD4, NULL }, + { ov17_02245124, ov17_0224513C, NULL }, + { ov17_02245510, ov17_02245528, NULL }, + { ov17_02245510, ov17_02245528, NULL }, + { ov17_02245678, ov17_02245690, NULL }, + { ov17_0224595C, ov17_02245974, NULL }, + { ov17_02245B48, ov17_02245B60, NULL }, + { ov17_02245DA4, ov17_02245DBC, NULL }, + { ov17_02245E00, ov17_02245E14, NULL }, + { ov17_02245C4C, ov17_02245C60, NULL } }; -void ov17_02243C28 (UnkStruct_ov17_02246F24 * param0) +void ov17_02243C28(UnkStruct_ov17_02246F24 *param0) { UnkStruct_ov17_02243C28 v0; @@ -139,39 +139,39 @@ void ov17_02243C28 (UnkStruct_ov17_02246F24 * param0) ov17_0224F18C(¶m0->unk_BF8, &v0); } -static int ov17_02243C68 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02243C68(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, NULL, 0); return v1; } -static void ov17_02243C80 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02243C80(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; ov17_0224F26C(&v0->unk_BF8, param2, NULL, 0); } -static void ov17_02243C94 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4) +static void ov17_02243C94(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; return; } -static int ov17_02243C98 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02243C98(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, NULL, 0); return v1; } -static void ov17_02243CB0 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02243CB0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; v0->unk_1614 = 1; @@ -180,19 +180,19 @@ static void ov17_02243CB0 (UnkStruct_ov17_0224F30C * param0, void * param1, cons } } -static int ov17_02243CDC (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02243CDC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, NULL, 0); return v1; } -static void ov17_02243CF4 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02243CF4(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02243D34 * v1; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02243D34 *v1; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02243D34)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02243D34)); @@ -203,9 +203,9 @@ static void ov17_02243CF4 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02243D34, v1, 30000); } -static void ov17_02243D34 (SysTask * param0, void * param1) +static void ov17_02243D34(SysTask *param0, void *param1) { - UnkStruct_ov17_02243D34 * v0 = param1; + UnkStruct_ov17_02243D34 *v0 = param1; switch (v0->unk_0F) { case 0: @@ -233,20 +233,20 @@ static void ov17_02243D34 (SysTask * param0, void * param1) } } -static int ov17_02243DB4 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02243DB4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02243DCC (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02243DCC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02246F24_sub1 * v1 = param3; - UnkStruct_ov17_02243DCC * v2; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02246F24_sub1 *v1 = param3; + UnkStruct_ov17_02243DCC *v2; v2 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02243DCC)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02243DCC)); @@ -259,9 +259,9 @@ static void ov17_02243DCC (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02243E2C, v2, 30000); } -static void ov17_02243E2C (SysTask * param0, void * param1) +static void ov17_02243E2C(SysTask *param0, void *param1) { - UnkStruct_ov17_02243DCC * v0 = param1; + UnkStruct_ov17_02243DCC *v0 = param1; switch (v0->unk_0C) { case 0: @@ -302,20 +302,20 @@ static void ov17_02243E2C (SysTask * param0, void * param1) } } -static int ov17_02243EF8 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02243EF8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02243F10 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02243F10(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02243F10 * v1; - UnkStruct_ov17_02246F24_sub1 * v2; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02243F10 *v1; + UnkStruct_ov17_02246F24_sub1 *v2; v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02243F10)); @@ -331,9 +331,9 @@ static void ov17_02243F10 (UnkStruct_ov17_0224F30C * param0, void * param1, cons ov17_02242DA8(v0); } -static void ov17_02243F68 (SysTask * param0, void * param1) +static void ov17_02243F68(SysTask *param0, void *param1) { - UnkStruct_ov17_02243F10 * v0 = param1; + UnkStruct_ov17_02243F10 *v0 = param1; int v1, v2; v1 = v0->unk_15; @@ -348,8 +348,7 @@ static void ov17_02243F68 (SysTask * param0, void * param1) v0->unk_14++; } break; - case 1: - { + case 1: { int v3, v4; v3 = v0->unk_15; @@ -357,11 +356,11 @@ static void ov17_02243F68 (SysTask * param0, void * param1) sub_02007DEC(v0->unk_00->unk_0C.unk_08[v3], 37, 0); sub_02007DEC(v0->unk_00->unk_0C.unk_08[v3], 6, 0); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v3], 0, ((((256 - 40))) + 40)); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v3], 1, (((((104 + 8)))) + 60) + v4); + sub_02007DEC(v0->unk_00->unk_0C.unk_08[v3], 0, ((256 - 40) + 40)); + sub_02007DEC(v0->unk_00->unk_0C.unk_08[v3], 1, ((104 + 8) + 60) + v4); - v0->unk_0C = ((((256 - 40))) + 40) << 8; - v0->unk_10 = (((((104 + 8)))) + 60) << 8; + v0->unk_0C = ((256 - 40) + 40) << 8; + v0->unk_10 = ((104 + 8) + 60) << 8; } v0->unk_14++; break; @@ -374,12 +373,12 @@ static void ov17_02243F68 (SysTask * param0, void * param1) v0->unk_14++; case 3: - v0->unk_0C -= (((((((256 - 40))) + 40) - (((256 - 40)))) << 8) / 7); - v0->unk_10 -= ((((((((104 + 8)))) + 60) - ((((104 + 8))))) << 8) / 7); + v0->unk_0C -= (((((256 - 40) + 40) - (256 - 40)) << 8) / 7); + v0->unk_10 -= (((((104 + 8) + 60) - (104 + 8)) << 8) / 7); - if (((v0->unk_0C >> 8) <= (((256 - 40)))) || ((v0->unk_10 >> 8) <= ((((104 + 8)))))) { - v0->unk_0C = (((256 - 40))) << 8; - v0->unk_10 = ((((104 + 8)))) << 8; + if (((v0->unk_0C >> 8) <= (256 - 40)) || ((v0->unk_10 >> 8) <= (104 + 8))) { + v0->unk_0C = (256 - 40) << 8; + v0->unk_10 = (104 + 8) << 8; v0->unk_14++; } @@ -397,20 +396,20 @@ static void ov17_02243F68 (SysTask * param0, void * param1) } } -static int ov17_022440C8 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_022440C8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_022440E0 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_022440E0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02243F10 * v1; - UnkStruct_ov17_02246F24_sub1 * v2; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02243F10 *v1; + UnkStruct_ov17_02246F24_sub1 *v2; int v3, v4; v2 = param3; @@ -425,15 +424,15 @@ static void ov17_022440E0 (UnkStruct_ov17_0224F30C * param0, void * param1, cons v4 = v1->unk_15; v3 = Pokemon_SpriteYOffset(v0->unk_0C.unk_00->unk_00[v4], 0); - v1->unk_0C = (((256 - 40))) << 8; - v1->unk_10 = ((((104 + 8)))) << 8; + v1->unk_0C = (256 - 40) << 8; + v1->unk_10 = (104 + 8) << 8; SysTask_Start(ov17_0224413C, v1, 30000); } -static void ov17_0224413C (SysTask * param0, void * param1) +static void ov17_0224413C(SysTask *param0, void *param1) { - UnkStruct_ov17_02243F10 * v0 = param1; + UnkStruct_ov17_02243F10 *v0 = param1; int v1, v2; v1 = v0->unk_15; @@ -441,10 +440,10 @@ static void ov17_0224413C (SysTask * param0, void * param1) switch (v0->unk_14) { case 0: - v0->unk_0C += (((((((256 - 40))) + 40) - (((256 - 40)))) << 8) / 7); - v0->unk_10 += ((((((((104 + 8)))) + 60) - ((((104 + 8))))) << 8) / 7); + v0->unk_0C += (((((256 - 40) + 40) - (256 - 40)) << 8) / 7); + v0->unk_10 += (((((104 + 8) + 60) - (104 + 8)) << 8) / 7); - if (((v0->unk_0C >> 8) >= ((((256 - 40))) + 40)) || ((v0->unk_10 >> 8) >= (((((104 + 8)))) + 60))) { + if (((v0->unk_0C >> 8) >= ((256 - 40) + 40)) || ((v0->unk_10 >> 8) >= ((104 + 8) + 60))) { sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 37, 1); sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 6, 1); v0->unk_14++; @@ -469,20 +468,20 @@ static void ov17_0224413C (SysTask * param0, void * param1) } } -static int ov17_02244228 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02244228(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02244240 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02244240(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02244240 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02244240 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02244240)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244240)); @@ -498,14 +497,13 @@ static void ov17_02244240 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_022442AC, v1, 30000); } -static void ov17_022442AC (SysTask * param0, void * param1) +static void ov17_022442AC(SysTask *param0, void *param1) { - UnkStruct_ov17_02244240 * v0 = param1; + UnkStruct_ov17_02244240 *v0 = param1; int v1; switch (v0->unk_0C) { - case 0: - { + case 0: { int v2; v2 = ov17_02243174(v0->unk_00->unk_220.unk_12[v0->unk_0D]); @@ -570,20 +568,20 @@ static void ov17_022442AC (SysTask * param0, void * param1) } } -static int ov17_022443E0 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_022443E0(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_022443F8 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_022443F8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_022443F8 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_022443F8 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_022443F8)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_022443F8)); @@ -601,11 +599,11 @@ static void ov17_022443F8 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_022444BC, v1, 5); } -static void ov17_022444BC (SysTask * param0, void * param1) +static void ov17_022444BC(SysTask *param0, void *param1) { - UnkStruct_ov17_022443F8 * v0 = param1; + UnkStruct_ov17_022443F8 *v0 = param1; int v1; - UnkStruct_ov17_022444BC * v2; + UnkStruct_ov17_022444BC *v2; v2 = &v0->unk_14.unk_10.unk_00[v0->unk_0D]; @@ -661,8 +659,7 @@ static void ov17_022444BC (SysTask * param0, void * param1) case 9: ov17_022439C8(v0->unk_00->unk_00, v0->unk_0D, v0->unk_0E, &v0->unk_104); v0->unk_0C++; - case 10: - { + case 10: { UnkStruct_ov16_02265BBC v3; UnkStruct_ov16_02264408 v4; int v5; @@ -762,12 +759,12 @@ static void ov17_022444BC (SysTask * param0, void * param1) } sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 37, 0); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 0, ((256 - 40))); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 1, (((104 + 8))) + v17); + sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 0, (256 - 40)); + sub_02007DEC(v0->unk_00->unk_0C.unk_08[v0->unk_0D], 1, (104 + 8) + v17); sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 37, 1); sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 0, 80); - sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 1, (((50 - 8)))); + sub_02007DEC(v0->unk_00->unk_0C.unk_08[v1], 1, (50 - 8)); } v0->unk_0C++; @@ -819,20 +816,20 @@ static void ov17_022444BC (SysTask * param0, void * param1) } } -static int ov17_02244958 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02244958(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, NULL, 0); return v1; } -static void ov17_02244970 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02244970(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02244970 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02244970 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02244970)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244970)); @@ -844,9 +841,9 @@ static void ov17_02244970 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_022449B8, v1, 100); } -static void ov17_022449B8 (SysTask * param0, void * param1) +static void ov17_022449B8(SysTask *param0, void *param1) { - UnkStruct_ov17_02244970 * v0 = param1; + UnkStruct_ov17_02244970 *v0 = param1; int v1; switch (v0->unk_0C) { @@ -959,10 +956,10 @@ static void ov17_022449B8 (SysTask * param0, void * param1) } } -static void ov17_02244BB0 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4) +static void ov17_02244BB0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02244BB0 * v1; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02244BB0 *v1; v1 = param3->unk_00[param4]; @@ -970,34 +967,34 @@ static void ov17_02244BB0 (UnkStruct_ov17_0224F30C * param0, void * param1, cons v0->unk_220.unk_0E[param4] = v1->unk_02; } -static int ov17_02244BD4 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02244BD4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02244BEC (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02244BEC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { return; } -static int ov17_02244BF0 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02244BF0(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02244C08 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02244C08(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02244C08 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02244C08 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02244C08)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08)); @@ -1011,10 +1008,10 @@ static void ov17_02244C08 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02244C68, v1, 30000); } -static void ov17_02244C68 (SysTask * param0, void * param1) +static void ov17_02244C68(SysTask *param0, void *param1) { - UnkStruct_ov17_02244C08 * v0 = param1; - UnkStruct_ov17_022444BC * v1; + UnkStruct_ov17_02244C08 *v0 = param1; + UnkStruct_ov17_022444BC *v1; v1 = &v0->unk_14.unk_10.unk_00[v0->unk_0D]; @@ -1053,20 +1050,20 @@ static void ov17_02244C68 (SysTask * param0, void * param1) } } -static int ov17_02244D20 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02244D20(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02244D38 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02244D38(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02244C08 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02244C08 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02244C08)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08)); @@ -1080,10 +1077,10 @@ static void ov17_02244D38 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02244D98, v1, 30000); } -static void ov17_02244D98 (SysTask * param0, void * param1) +static void ov17_02244D98(SysTask *param0, void *param1) { - UnkStruct_ov17_02244C08 * v0 = param1; - UnkStruct_ov17_022444BC * v1; + UnkStruct_ov17_02244C08 *v0 = param1; + UnkStruct_ov17_022444BC *v1; v1 = &v0->unk_14.unk_10.unk_00[v0->unk_0D]; @@ -1137,8 +1134,7 @@ static void ov17_02244D98 (SysTask * param0, void * param1) v0->unk_0C = 11; } break; - case 9: - { + case 9: { int v2 = 0, v3, v4; v0->unk_10++; @@ -1158,8 +1154,7 @@ static void ov17_02244D98 (SysTask * param0, void * param1) } else { v0->unk_0C = 11; } - } - break; + } break; case 10: v0->unk_0F++; @@ -1172,8 +1167,7 @@ static void ov17_02244D98 (SysTask * param0, void * param1) v0->unk_0C++; case 12: v0->unk_0C++; - case 13: - { + case 13: { int v5, v6; for (v5 = 0; v5 < 4; v5++) { @@ -1199,20 +1193,20 @@ static void ov17_02244D98 (SysTask * param0, void * param1) } } -static int ov17_02244FBC (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02244FBC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02244FD4 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02244FD4(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02244C08 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02244C08 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02244C08)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08)); @@ -1226,10 +1220,10 @@ static void ov17_02244FD4 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02245034, v1, 30000); } -static void ov17_02245034 (SysTask * param0, void * param1) +static void ov17_02245034(SysTask *param0, void *param1) { - UnkStruct_ov17_02244C08 * v0 = param1; - UnkStruct_ov17_022444BC * v1; + UnkStruct_ov17_02244C08 *v0 = param1; + UnkStruct_ov17_022444BC *v1; v1 = &v0->unk_14.unk_10.unk_00[v0->unk_0D]; @@ -1283,20 +1277,20 @@ static void ov17_02245034 (SysTask * param0, void * param1) } } -static int ov17_02245124 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02245124(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_0224513C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224513C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02244C08 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02244C08 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02244C08)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08)); @@ -1310,10 +1304,10 @@ static void ov17_0224513C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_0224519C, v1, 30000); } -static void ov17_0224519C (SysTask * param0, void * param1) +static void ov17_0224519C(SysTask *param0, void *param1) { - UnkStruct_ov17_02244C08 * v0 = param1; - UnkStruct_ov17_022444BC * v1; + UnkStruct_ov17_02244C08 *v0 = param1; + UnkStruct_ov17_022444BC *v1; v1 = &v0->unk_14.unk_10.unk_00[v0->unk_0D]; @@ -1490,20 +1484,20 @@ static void ov17_0224519C (SysTask * param0, void * param1) } } -static int ov17_02245510 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02245510(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02245528 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02245528(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02244C08 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02244C08 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02244C08)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08)); @@ -1517,10 +1511,10 @@ static void ov17_02245528 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02245588, v1, 30000); } -static void ov17_02245588 (SysTask * param0, void * param1) +static void ov17_02245588(SysTask *param0, void *param1) { - UnkStruct_ov17_02244C08 * v0 = param1; - UnkStruct_ov17_022444BC * v1; + UnkStruct_ov17_02244C08 *v0 = param1; + UnkStruct_ov17_022444BC *v1; v1 = &v0->unk_14.unk_10.unk_00[v0->unk_0D]; @@ -1575,20 +1569,20 @@ static void ov17_02245588 (SysTask * param0, void * param1) } } -static int ov17_02245678 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02245678(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02245690 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02245690(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02245690 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02245690 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02245690)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02245690)); @@ -1600,10 +1594,10 @@ static void ov17_02245690 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_022456E8, v1, 30000); } -static void ov17_022456E8 (SysTask * param0, void * param1) +static void ov17_022456E8(SysTask *param0, void *param1) { - UnkStruct_ov17_02245690 * v0 = param1; - UnkStruct_ov17_022444BC * v1; + UnkStruct_ov17_02245690 *v0 = param1; + UnkStruct_ov17_022444BC *v1; int v2, v3, v4; v2 = v0->unk_10.unk_D6_val1.unk_01[v0->unk_F0]; @@ -1626,8 +1620,7 @@ static void ov17_022456E8 (SysTask * param0, void * param1) case 0: v0->unk_EE = v1->unk_1A; v0->unk_0C++; - case 1: - { + case 1: { int v5; if (v1->unk_09 == 0) { @@ -1742,20 +1735,20 @@ static void ov17_022456E8 (SysTask * param0, void * param1) } } -static int ov17_0224595C (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224595C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02245974 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02245974(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02244C08 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02244C08 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02244C08)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08)); @@ -1769,10 +1762,10 @@ static void ov17_02245974 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_022459D4, v1, 30000); } -static void ov17_022459D4 (SysTask * param0, void * param1) +static void ov17_022459D4(SysTask *param0, void *param1) { - UnkStruct_ov17_02244C08 * v0 = param1; - UnkStruct_ov17_022444BC * v1; + UnkStruct_ov17_02244C08 *v0 = param1; + UnkStruct_ov17_022444BC *v1; v1 = &v0->unk_14.unk_10.unk_00[v0->unk_0D]; @@ -1857,20 +1850,20 @@ static void ov17_022459D4 (SysTask * param0, void * param1) } } -static int ov17_02245B48 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02245B48(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02245B60 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02245B60(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02244C08 * v1; - UnkStruct_ov17_02246F24_sub1 * v2 = param3; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02244C08 *v1; + UnkStruct_ov17_02246F24_sub1 *v2 = param3; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02244C08)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02244C08)); @@ -1884,24 +1877,22 @@ static void ov17_02245B60 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02245BC8, v1, 30000); } -static void ov17_02245BC8 (SysTask * param0, void * param1) +static void ov17_02245BC8(SysTask *param0, void *param1) { - UnkStruct_ov17_02244C08 * v0 = param1; - UnkStruct_ov17_022444BC * v1; + UnkStruct_ov17_02244C08 *v0 = param1; + UnkStruct_ov17_022444BC *v1; v1 = &v0->unk_14.unk_10.unk_00[v0->unk_0D]; switch (v0->unk_0C) { - case 0: - { + case 0: { u32 v2; UnkStruct_ov17_022449B8 v3; v2 = ov17_0224314C(v0->unk_0D, v1->unk_18, &v3); ov17_02242E5C(v0->unk_00, v2, &v3, NULL); v0->unk_0C++; - } - break; + } break; case 1: if (ov17_02242ECC(v0->unk_00) == 0) { v0->unk_0C++; @@ -1918,20 +1909,20 @@ static void ov17_02245BC8 (SysTask * param0, void * param1) } } -static int ov17_02245C4C (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02245C4C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02245C60 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02245C60(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02246F24_sub1 * v1 = param3; - UnkStruct_ov17_02245C60 * v2; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02246F24_sub1 *v1 = param3; + UnkStruct_ov17_02245C60 *v2; v2 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02245C60)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02245C60)); @@ -1943,9 +1934,9 @@ static void ov17_02245C60 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02245CA4, v2, 30000); } -static void ov17_02245CA4 (SysTask * param0, void * param1) +static void ov17_02245CA4(SysTask *param0, void *param1) { - UnkStruct_ov17_02245C60 * v0 = param1; + UnkStruct_ov17_02245C60 *v0 = param1; int v1, v2; @@ -1954,8 +1945,7 @@ static void ov17_02245CA4 (SysTask * param0, void * param1) ov17_022431A0(v0->unk_00, 0, 0, 70, 0, &v0->unk_27); v0->unk_20++; break; - case 1: - { + case 1: { int v3; for (v3 = 0; v3 < 4; v3++) { @@ -1995,19 +1985,19 @@ static void ov17_02245CA4 (SysTask * param0, void * param1) } } -static int ov17_02245DA4 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02245DA4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(&v0->unk_BF8, 0xff, param2, param3, sizeof(UnkStruct_ov17_022472F8)); return v1; } -static void ov17_02245DBC (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02245DBC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_022472F8 * v1; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_022472F8 *v1; v1 = param3; v0->unk_220 = *v1; @@ -2019,20 +2009,20 @@ static void ov17_02245DBC (UnkStruct_ov17_0224F30C * param0, void * param1, cons ov17_0224F26C(&v0->unk_BF8, param2, NULL, 0); } -static int ov17_02245E00 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02245E00(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; + UnkStruct_ov17_02246F24 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02246F24_sub1)); return v1; } -static void ov17_02245E14 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02245E14(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02246F24 * v0 = param1; - UnkStruct_ov17_02246F24_sub1 * v1 = param3; - UnkStruct_ov17_02245E14 * v2; + UnkStruct_ov17_02246F24 *v0 = param1; + UnkStruct_ov17_02246F24_sub1 *v1 = param3; + UnkStruct_ov17_02245E14 *v2; v2 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02245E14)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02245E14)); @@ -2049,9 +2039,9 @@ static void ov17_02245E14 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02245E8C, v2, 30000); } -static void ov17_02245E8C (SysTask * param0, void * param1) +static void ov17_02245E8C(SysTask *param0, void *param1) { - UnkStruct_ov17_02245E14 * v0 = param1; + UnkStruct_ov17_02245E14 *v0 = param1; switch (v0->unk_10) { case 0: diff --git a/src/overlay017/ov17_02245F14.c b/src/overlay017/ov17_02245F14.c index 996e68e07e..08b8dd14be 100644 --- a/src/overlay017/ov17_02245F14.c +++ b/src/overlay017/ov17_02245F14.c @@ -1,6 +1,10 @@ +#include "overlay017/ov17_02245F14.h" + #include #include +#include "overlay017/ov17_022413D8.h" +#include "overlay017/ov17_02243AC4.h" #include "overlay017/struct_ov17_022444BC.h" #include "overlay017/struct_ov17_022463C4.h" #include "overlay017/struct_ov17_02246540.h" @@ -9,11 +13,8 @@ #include "move_table.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" -#include "overlay017/ov17_022413D8.h" -#include "overlay017/ov17_02243AC4.h" -#include "overlay017/ov17_02245F14.h" -typedef int (* UnkFuncPtr_ov17_02253AF8)(UnkStruct_ov17_02246F24 *, UnkStruct_ov17_02246540 *, int, int, int); +typedef int (*UnkFuncPtr_ov17_02253AF8)(UnkStruct_ov17_02246F24 *, UnkStruct_ov17_02246540 *, int, int, int); typedef struct { UnkFuncPtr_ov17_02253AF8 unk_00; @@ -22,66 +23,66 @@ typedef struct { u8 unk_06[2]; } UnkStruct_ov17_02253AF8; -static void ov17_02246540(UnkStruct_ov17_02246540 * param0); -static int ov17_02246578(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246668(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246774(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_022467CC(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246830(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246834(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_0224687C(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_022468D4(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246918(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246960(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_022469DC(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_022469FC(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246A50(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246AB0(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246B74(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246BC0(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246C10(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246C4C(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246C88(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246CDC(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246DA4(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246E08(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); -static int ov17_02246E68(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4); +static void ov17_02246540(UnkStruct_ov17_02246540 *param0); +static int ov17_02246578(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246668(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246774(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_022467CC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246830(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246834(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_0224687C(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_022468D4(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246918(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246960(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_022469DC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_022469FC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246A50(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246AB0(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246B74(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246BC0(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246C10(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246C4C(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246C88(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246CDC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246DA4(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246E08(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); +static int ov17_02246E68(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4); __attribute__((aligned(4))) static const u8 Unk_ov17_02253AEC[] = { - 0xA, - 0x14, - 0x1E, - 0x28 + 0xA, + 0x14, + 0x1E, + 0x28 }; static const UnkStruct_ov17_02253AF8 Unk_ov17_02253AF8[] = { - {ov17_02246830, 0x3, 0xFF}, - {ov17_02246578, 0x3, 0xFF}, - {ov17_02246668, 0x3, 0xFF}, - {ov17_02246774, 0x5, 0xFF}, - {ov17_022467CC, 0x3, 0xFF}, - {ov17_02246830, 0x3, 0xFF}, - {ov17_02246834, 0x5, 0x0}, - {ov17_0224687C, 0x3, 0xFF}, - {ov17_022468D4, 0x3, 0xFF}, - {ov17_02246918, 0x5, 0x0}, - {ov17_02246960, 0x3, 0xFF}, - {ov17_022469DC, 0x3, 0xFF}, - {ov17_02246A50, 0x3, 0xFF}, - {ov17_022469FC, 0x3, 0xFF}, - {ov17_02246AB0, 0x3, 0xFF}, - {ov17_02246B74, 0x3, 0xFF}, - {ov17_02246BC0, 0x3, 0xFF}, - {ov17_02246C10, 0x3, 0xFF}, - {ov17_02246C4C, 0x3, 0xFF}, - {ov17_02246C88, 0x3, 0xFF}, - {ov17_02246CDC, 0x3, 0xFF}, - {ov17_02246DA4, 0x3, 0xFF}, - {ov17_02246E08, 0x3, 0xFF}, - {ov17_02246E68, 0x6, 0xFF} + { ov17_02246830, 0x3, 0xFF }, + { ov17_02246578, 0x3, 0xFF }, + { ov17_02246668, 0x3, 0xFF }, + { ov17_02246774, 0x5, 0xFF }, + { ov17_022467CC, 0x3, 0xFF }, + { ov17_02246830, 0x3, 0xFF }, + { ov17_02246834, 0x5, 0x0 }, + { ov17_0224687C, 0x3, 0xFF }, + { ov17_022468D4, 0x3, 0xFF }, + { ov17_02246918, 0x5, 0x0 }, + { ov17_02246960, 0x3, 0xFF }, + { ov17_022469DC, 0x3, 0xFF }, + { ov17_02246A50, 0x3, 0xFF }, + { ov17_022469FC, 0x3, 0xFF }, + { ov17_02246AB0, 0x3, 0xFF }, + { ov17_02246B74, 0x3, 0xFF }, + { ov17_02246BC0, 0x3, 0xFF }, + { ov17_02246C10, 0x3, 0xFF }, + { ov17_02246C4C, 0x3, 0xFF }, + { ov17_02246C88, 0x3, 0xFF }, + { ov17_02246CDC, 0x3, 0xFF }, + { ov17_02246DA4, 0x3, 0xFF }, + { ov17_02246E08, 0x3, 0xFF }, + { ov17_02246E68, 0x6, 0xFF } }; -static void ov17_02245F14 (UnkStruct_ov17_022444BC * param0, int param1, int param2, int param3, int param4, int param5, int param6) +static void ov17_02245F14(UnkStruct_ov17_022444BC *param0, int param1, int param2, int param3, int param4, int param5, int param6) { param0->unk_12 = param1; param0->unk_13 = param2; @@ -103,7 +104,7 @@ static void ov17_02245F14 (UnkStruct_ov17_022444BC * param0, int param1, int par } } -void ov17_02245F44 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1) +void ov17_02245F44(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1) { int v0; @@ -122,7 +123,7 @@ void ov17_02245F44 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * } } -void ov17_02245FB4 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2) +void ov17_02245FB4(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2) { int v0; @@ -137,7 +138,7 @@ void ov17_02245FB4 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * } } -void ov17_02246018 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2) +void ov17_02246018(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2) { int v0; @@ -150,7 +151,7 @@ void ov17_02246018 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * } } -void ov17_02246044 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1) +void ov17_02246044(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1) { int v0; @@ -162,7 +163,7 @@ void ov17_02246044 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param0->unk_220.unk_30 = *param1; } -static void ov17_02246090 (UnkStruct_ov17_02246540 * param0, int param1) +static void ov17_02246090(UnkStruct_ov17_02246540 *param0, int param1) { int v0; @@ -180,7 +181,7 @@ static void ov17_02246090 (UnkStruct_ov17_02246540 * param0, int param1) } } -void ov17_022460C8 (UnkStruct_ov17_02246540 * param0) +void ov17_022460C8(UnkStruct_ov17_02246540 *param0) { int v0; @@ -189,7 +190,7 @@ void ov17_022460C8 (UnkStruct_ov17_02246540 * param0) } } -void ov17_022460DC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2) +void ov17_022460DC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2) { u32 v0, v1; @@ -204,7 +205,7 @@ void ov17_022460DC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * } } -void ov17_02246138 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2) +void ov17_02246138(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2) { ov17_02246090(param1, param2); @@ -212,7 +213,7 @@ void ov17_02246138 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1->unk_00[param2].unk_18 = param1->unk_00[param2].unk_04; } -void ov17_02246160 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3) +void ov17_02246160(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3) { int v0; @@ -236,7 +237,7 @@ void ov17_02246160 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * } } -void ov17_02246228 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3) +void ov17_02246228(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3) { int v0; @@ -251,7 +252,7 @@ void ov17_02246228 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1->unk_00[param2].unk_18 += param1->unk_00[param2].unk_1E + param1->unk_00[param2].unk_20; } -BOOL ov17_022462A4 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3) +BOOL ov17_022462A4(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3) { int v0; @@ -267,7 +268,7 @@ BOOL ov17_022462A4 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * return 0; } -BOOL ov17_02246304 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3) +BOOL ov17_02246304(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3) { int v0; @@ -283,7 +284,7 @@ BOOL ov17_02246304 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * return 0; } -BOOL ov17_02246364 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3) +BOOL ov17_02246364(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3) { int v0; @@ -299,7 +300,7 @@ BOOL ov17_02246364 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * return 0; } -void ov17_022463C4 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, UnkStruct_ov17_022463C4 * param3) +void ov17_022463C4(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, UnkStruct_ov17_022463C4 *param3) { int v0, v1, v2; @@ -373,7 +374,7 @@ void ov17_022463C4 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1->unk_00[param2].unk_18 += param1->unk_00[param2].unk_08; } -void ov17_02246518 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, UnkStruct_ov17_022463C4 * param3) +void ov17_02246518(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, UnkStruct_ov17_022463C4 *param3) { int v0; @@ -383,7 +384,7 @@ void ov17_02246518 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1->unk_00[param2].unk_18 += v0; } -static void ov17_02246540 (UnkStruct_ov17_02246540 * param0) +static void ov17_02246540(UnkStruct_ov17_02246540 *param0) { int v0; @@ -393,7 +394,7 @@ static void ov17_02246540 (UnkStruct_ov17_02246540 * param0) } } -static int ov17_02246578 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246578(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { u8 v0[4]; int v1, v2, v3; @@ -447,7 +448,7 @@ static int ov17_02246578 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_02246668 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246668(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { s8 v0, v1; u8 v2[4]; @@ -502,7 +503,7 @@ static int ov17_02246668 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_02246774 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246774(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0; @@ -527,7 +528,7 @@ static int ov17_02246774 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_022467CC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_022467CC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0; int v1; @@ -544,12 +545,12 @@ static int ov17_022467CC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 0; } -static int ov17_02246830 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246830(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { return 1; } -static int ov17_02246834 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246834(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { if (param1->unk_00[param3].unk_09 == 0) { param1->unk_00[param3].unk_1E += (10 * 3); @@ -561,7 +562,7 @@ static int ov17_02246834 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_0224687C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_0224687C(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { if (param1->unk_00[param3].unk_00 != param0->unk_220.unk_26[param3]) { param1->unk_A0[param3].unk_00_0 = param1->unk_00[param3].unk_00; @@ -572,7 +573,7 @@ static int ov17_0224687C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 0; } -static int ov17_022468D4 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_022468D4(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0, v1; @@ -589,7 +590,7 @@ static int ov17_022468D4 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 0; } -static int ov17_02246918 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246918(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { if (param1->unk_00[param3].unk_09 == 4 - 1) { param1->unk_00[param3].unk_1E += (10 * 15); @@ -601,7 +602,7 @@ static int ov17_02246918 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_02246960 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246960(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0; @@ -631,13 +632,13 @@ static int ov17_02246960 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_022469DC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_022469DC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { param1->unk_00[param3].unk_28_12 = param1->unk_00[param3].unk_02; return 1; } -static int ov17_022469FC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_022469FC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0; @@ -649,7 +650,7 @@ static int ov17_022469FC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_02246A50 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246A50(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0; @@ -668,7 +669,7 @@ static int ov17_02246A50 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_02246AB0 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246AB0(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { s8 v0, v1; u8 v2[4]; @@ -706,7 +707,7 @@ static int ov17_02246AB0 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_02246B74 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246B74(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { if (param4 == 4 - 1) { param1->unk_00[param3].unk_1E += param1->unk_00[param3].unk_18; @@ -717,7 +718,7 @@ static int ov17_02246B74 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 0; } -static int ov17_02246BC0 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246BC0(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0, v1; static const u8 v2[] = { @@ -737,7 +738,7 @@ static int ov17_02246BC0 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_02246C10 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246C10(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { if (param4 == 0) { param1->unk_00[param3].unk_1E += 10 * 2; @@ -748,7 +749,7 @@ static int ov17_02246C10 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 0; } -static int ov17_02246C4C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246C4C(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { if (param4 == 4 - 1) { param1->unk_00[param3].unk_1E += 10 * 2; @@ -759,7 +760,7 @@ static int ov17_02246C4C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 0; } -static int ov17_02246C88 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246C88(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0; @@ -771,7 +772,7 @@ static int ov17_02246C88 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_02246CDC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246CDC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0, v1, v2; @@ -797,7 +798,7 @@ static int ov17_02246CDC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 0; } -static int ov17_02246DA4 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246DA4(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0; @@ -823,7 +824,7 @@ static int ov17_02246DA4 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 1; } -static int ov17_02246E08 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246E08(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0; @@ -842,7 +843,7 @@ static int ov17_02246E08 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246 return 0; } -static int ov17_02246E68 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246540 * param1, int param2, int param3, int param4) +static int ov17_02246E68(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246540 *param1, int param2, int param3, int param4) { int v0; diff --git a/src/overlay017/ov17_02246ECC.c b/src/overlay017/ov17_02246ECC.c index 654324bdd3..49baa63d5f 100644 --- a/src/overlay017/ov17_02246ECC.c +++ b/src/overlay017/ov17_02246ECC.c @@ -1,17 +1,18 @@ +#include "overlay017/ov17_02246ECC.h" + #include #include +#include "overlay017/ov17_022413D8.h" #include "overlay017/struct_ov17_0223BE58.h" #include "overlay017/struct_ov17_02246F24.h" #include "overlay017/struct_ov17_022472F8.h" #include "heap.h" -#include "pokemon.h" #include "move_table.h" +#include "pokemon.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" -#include "overlay017/ov17_022413D8.h" -#include "overlay017/ov17_02246ECC.h" typedef struct { u16 unk_00; @@ -34,38 +35,38 @@ typedef struct { s16 unk_04[4]; } UnkStruct_ov17_02253C30; -static void ov17_02246F24(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246F9C * param1, int param2); -static void ov17_02246F9C(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246F9C * param1, int param2, u16 * param3, u8 * param4); -static int ov17_022472F8(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247308(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247320(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247338(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247350(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247368(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247380(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247398(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_022473B0(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_022473C8(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_022473E0(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_022473F8(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247424(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247454(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247474(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247490(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_022474D8(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247520(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247538(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247550(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_0224757C(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_022475A8(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_022475D4(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247600(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_0224762C(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247658(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_02247684(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); -static int ov17_022476B0(UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4); - -static int(*const Unk_ov17_02253BBC[])(UnkStruct_ov17_022472F8 *, int, UnkStruct_ov17_02246F9C *, u8 *, int) = { +static void ov17_02246F24(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246F9C *param1, int param2); +static void ov17_02246F9C(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246F9C *param1, int param2, u16 *param3, u8 *param4); +static int ov17_022472F8(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247308(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247320(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247338(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247350(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247368(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247380(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247398(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_022473B0(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_022473C8(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_022473E0(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_022473F8(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247424(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247454(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247474(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247490(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_022474D8(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247520(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247538(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247550(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_0224757C(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_022475A8(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_022475D4(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247600(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_0224762C(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247658(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_02247684(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); +static int ov17_022476B0(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4); + +static int (*const Unk_ov17_02253BBC[])(UnkStruct_ov17_022472F8 *, int, UnkStruct_ov17_02246F9C *, u8 *, int) = { NULL, ov17_022472F8, ov17_02247308, @@ -98,1171 +99,1992 @@ static int(*const Unk_ov17_02253BBC[])(UnkStruct_ov17_022472F8 *, int, UnkStruct }; static const UnkStruct_ov17_02253C30 Unk_ov17_02253C30[] = { - { - 0x1, - 0x14, - 0xf0, - 0x1, - { 0x46, 0x14, 0x14, -20 } - }, - { - 0x1, - 0x14, - 0x16, - 0x1, - { 0x64, 0x14, 0x14, -20 } - }, - { - 0x1, - 0x14, - 0x8, - 0x1, - { 0x28, 0x14, 0x14, -20 } - }, - { - 0x1, - 0x14, - 0x17, - 0x2, - { 0xA, 0x14, 0x0, 0x0 } - }, - { - 0x1, - 0x15, - 0xf0, - 0x2, - { 0x0, 0x14, 0x0, 0x0 } - }, - { - 0x1, - 0x16, - 0x10, - 0x1, - { 0x28, 0x14, 0x14, -20 } - }, - { - 0x1, - 0x17, - 0xA, - 0x0, - { 0x14, 0x0, 0x0, 0x0 } - }, - { - 0x1, - 0x18, - 0x9, - 0x0, - { -1000, 0x14, -20, 0x0 } - }, - { - 0x1, - 0x19, - 0x9, - 0x1, - { 0x14, 0x14, -20, 0x0 } - }, - { - 0x1, - 0x1A, - 0x6, - 0x3, - { 0xA, 0x14, 0x0, 0x0 } - }, - { - 0x1, - 0x1B, - 0x6, - 0x1, - { 0xA, 0x14, 0x0, 0x0 } - }, - { - 0x1, - 0x1C, - 0xD, - 0x1, - { 0x1E, 0x0, 0x0, -20 } - }, - { - 0x1, - 0xE, - 0x4, - 0x0, - { 0xA, 0x0, 0x14, 0x14 } - }, - { - 0x1, - 0xF, - 0xf0, - 0x0, - { 0xF, 0x0, 0x14, 0x14 } - }, - { - 0x1, - 0xF, - 0x1, - 0x0, - { 0xA, 0x14, 0x14, 0x14 } - }, - { - 0x1, - 0x10, - 0xD, - 0x1, - { 0xF, 0x0, 0x0, 0x14 } - }, - { - 0x1, - 0x11, - 0xD, - 0x1, - { 0xA, 0x0, 0x0, 0x14 } - }, - { - 0x1, - 0x1, - 0xB, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x1, - 0x1, - 0x1, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x1, - 0x1, - 0xE, - 0x0, - { -1000, 0x0, -20, 0x0 } - }, - { - 0x1, - 0x1, - 0x2, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x1, - 0x2, - 0xf1, - 0x0, - { 0x14, 0x0, 0x14, 0x0 } - }, - { - 0x1, - 0x2, - 0x9, - 0x0, - { 0xA, 0x14, -20, 0x14 } - }, - { - 0x1, - 0x2, - 0x2, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x1, - 0x2, - 0x1, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x1, - 0x2, - 0xE, - 0x0, - { -1000, 0x0, -20, 0x0 } - }, - { - 0x1, - 0x2, - 0xB, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x1, - 0x2, - 0x17, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x1, - 0x3, - 0x5, - 0x0, - { 0x1E, 0x0, 0x14, -20 } - }, - { - 0x1, - 0x3, - 0xB, - 0x0, - { 0x19, 0x14, 0x14, -20 } - }, - { - 0x1, - 0x4, - 0xB, - 0x0, - { 0xA, 0x14, 0x14, -20 } - }, - { - 0x1, - 0x5, - 0xC, - 0x0, - { -1000, 0x14, 0x0, -20 } - }, - { - 0x1, - 0x6, - 0x2, - 0x0, - { 0x28, 0x14, 0x0, -20 } - }, - { - 0x1, - 0x6, - 0xB, - 0x0, - { 0x32, 0x14, 0x0, -20 } - }, - { - 0x1, - 0x7, - 0x11, - 0x0, - { 0x1E, 0x0, 0x14, -20 } - }, - { - 0x1, - 0x8, - 0x12, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x1, - 0x9, - 0x13, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x1, - 0xA, - 0x14, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x1, - 0xB, - 0x15, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x1, - 0xB, - 0xB, - 0x0, - { 0x23, 0x14, -20, -20 } - }, - { - 0x1, - 0xB, - 0x2, - 0x0, - { 0x28, 0x14, -20, -20 } - }, - { - 0x1, - 0xC, - 0xE, - 0x0, - { 0x14, 0x14, -20, 0x14 } - }, - { - 0x1, - 0xC, - 0x9, - 0x0, - { 0x14, 0x14, -20, 0x14 } - }, - { - 0x1, - 0xD, - 0x9, - 0x0, - { 0x3C, 0x14, -20, 0x14 } - }, - { - 0x2, - 0x14, - 0xf0, - 0x1, - { 0x32, 0x14, 0x14, -20 } - }, - { - 0x2, - 0x14, - 0x16, - 0x1, - { 0x50, 0x14, 0x14, -20 } - }, - { - 0x2, - 0x14, - 0x8, - 0x1, - { 0x28, 0x14, 0x14, -20 } - }, - { - 0x2, - 0x14, - 0xC, - 0x1, - { 0x32, 0x14, -20, -20 } - }, - { - 0x2, - 0x14, - 0x14, - 0x1, - { 0x28, 0x14, 0x0, -20 } - }, - { - 0x2, - 0x14, - 0x17, - 0x2, - { 0x14, 0x14, 0x0, -20 } - }, - { - 0x2, - 0x16, - 0x10, - 0x1, - { 0x1E, 0x14, 0x0, -20 } - }, - { - 0x2, - 0x17, - 0xA, - 0x0, - { 0x14, 0x0, 0x0, -20 } - }, - { - 0x2, - 0x18, - 0x9, - 0x0, - { -1000, 0x14, -20, -20 } - }, - { - 0x2, - 0x19, - 0x9, - 0x1, - { 0x14, 0x14, -20, -20 } - }, - { - 0x2, - 0x1A, - 0x6, - 0x3, - { 0x1E, 0x14, -20, -20 } - }, - { - 0x2, - 0x1B, - 0x6, - 0x1, - { 0xA, 0x0, 0x0, -20 } - }, - { - 0x2, - 0x1C, - 0xD, - 0x1, - { 0x1E, 0x0, 0x0, -20 } - }, - { - 0x2, - 0xE, - 0x4, - 0x0, - { 0x14, 0x0, 0x14, 0x14 } - }, - { - 0x2, - 0xF, - 0xf0, - 0x0, - { 0xF, 0x0, 0x14, 0x14 } - }, - { - 0x2, - 0xF, - 0x1, - 0x0, - { 0xA, 0x0, 0x14, 0x14 } - }, - { - 0x2, - 0x10, - 0xD, - 0x1, - { 0xF, 0x0, 0x0, 0x14 } - }, - { - 0x2, - 0x1, - 0xB, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x2, - 0x1, - 0x1, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x2, - 0x1, - 0xE, - 0x0, - { -1000, 0x0, -20, 0x14 } - }, - { - 0x2, - 0x1, - 0x2, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x2, - 0x2, - 0xf1, - 0x0, - { 0x14, 0x0, 0x14, 0x14 } - }, - { - 0x2, - 0x2, - 0x17, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x2, - 0x2, - 0x9, - 0x0, - { 0xA, 0x14, -20, 0x14 } - }, - { - 0x2, - 0x2, - 0x2, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x2, - 0x2, - 0x1, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x2, - 0x2, - 0xE, - 0x0, - { -1000, 0x0, -20, 0x14 } - }, - { - 0x2, - 0x2, - 0xB, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x2, - 0x3, - 0xB, - 0x0, - { 0x1E, 0x14, 0x14, -20 } - }, - { - 0x2, - 0x4, - 0xB, - 0x0, - { 0xA, 0x14, 0x14, -20 } - }, - { - 0x2, - 0x6, - 0xB, - 0x0, - { 0x32, 0x14, 0x14, -20 } - }, - { - 0x2, - 0x6, - 0x2, - 0x0, - { 0x28, 0x14, 0x0, -20 } - }, - { - 0x2, - 0x6, - 0xE, - 0x0, - { 0xA, 0x14, -20, -20 } - }, - { - 0x2, - 0x7, - 0x11, - 0x0, - { -1000, 0x0, -20, -20 } - }, - { - 0x2, - 0x8, - 0x12, - 0x0, - { -1000, 0x0, -20, -20 } - }, - { - 0x2, - 0x9, - 0x13, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x2, - 0xB, - 0x2, - 0x0, - { 0xA, 0x0, 0x0, -20 } - }, - { - 0x2, - 0xB, - 0x15, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x2, - 0xB, - 0xB, - 0x0, - { 0x28, 0x14, 0x0, -20 } - }, - { - 0x2, - 0xB, - 0xE, - 0x0, - { 0xA, 0x14, 0x0, -20 } - }, - { - 0x2, - 0xC, - 0xE, - 0x0, - { 0x14, 0x14, 0x0, 0x14 } - }, - { - 0x2, - 0xC, - 0x9, - 0x0, - { 0x14, 0x14, -20, 0x14 } - }, - { - 0x2, - 0xD, - 0x9, - 0x0, - { 0x3C, 0x14, -20, 0x14 } - }, - { - 0x3, - 0x14, - 0x10, - 0x1, - { 0x28, 0x14, 0x0, -20 } - }, - { - 0x3, - 0x14, - 0x14, - 0x1, - { 0x28, 0x14, 0x0, -20 } - }, - { - 0x3, - 0x14, - 0xC, - 0x1, - { 0x28, 0x14, -20, -20 } - }, - { - 0x3, - 0x15, - 0x14, - 0x1, - { 0x28, 0x14, 0x0, -20 } - }, - { - 0x3, - 0x15, - 0xC, - 0x1, - { 0x1E, 0x14, -20, -20 } - }, - { - 0x3, - 0x15, - 0xf0, - 0x1, - { 0x1E, 0x0, 0x14, -20 } - }, - { - 0x3, - 0x17, - 0xA, - 0x0, - { 0xA, 0x0, 0x0, -20 } - }, - { - 0x3, - 0x18, - 0x9, - 0x0, - { -1000, 0x14, -20, -20 } - }, - { - 0x3, - 0x19, - 0x9, - 0x1, - { 0x14, 0x14, -20, -20 } - }, - { - 0x3, - 0x1A, - 0x6, - 0x3, - { 0x1E, 0x14, 0x0, -20 } - }, - { - 0x3, - 0x1C, - 0xD, - 0x1, - { 0xA, 0x0, 0x0, -20 } - }, - { - 0x3, - 0xE, - 0x4, - 0x0, - { 0x14, 0x0, 0x14, 0x14 } - }, - { - 0x3, - 0xF, - 0xf0, - 0x0, - { 0xF, 0x0, 0x14, 0x14 } - }, - { - 0x3, - 0xF, - 0x1, - 0x0, - { 0xA, 0x14, 0x14, 0x14 } - }, - { - 0x3, - 0x1, - 0xB, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x3, - 0x1, - 0x1, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x3, - 0x1, - 0xE, - 0x0, - { -1000, 0x0, 0x0, 0x14 } - }, - { - 0x3, - 0x1, - 0x2, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x3, - 0x2, - 0x17, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x3, - 0x2, - 0x9, - 0x0, - { 0xA, 0x14, -20, 0x14 } - }, - { - 0x3, - 0x2, - 0x2, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x3, - 0x2, - 0x1, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x3, - 0x2, - 0xE, - 0x0, - { -1000, 0x0, -20, 0x14 } - }, - { - 0x3, - 0x2, - 0xB, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x3, - 0x2, - 0xf1, - 0x0, - { 0xA, 0x0, 0x14, 0x0 } - }, - { - 0x3, - 0x3, - 0xB, - 0x0, - { 0x1E, 0x14, 0x0, -20 } - }, - { - 0x3, - 0x4, - 0xB, - 0x0, - { 0xA, 0x14, 0x0, -20 } - }, - { - 0x3, - 0x6, - 0x2, - 0x0, - { 0x28, 0x0, 0x0, -20 } - }, - { - 0x3, - 0x6, - 0xE, - 0x0, - { 0xA, 0x14, 0x0, -20 } - }, - { - 0x3, - 0x6, - 0xB, - 0x0, - { 0x14, 0x14, 0x0, -20 } - }, - { - 0x3, - 0x7, - 0x11, - 0x0, - { -1000, 0x0, -20, -20 } - }, - { - 0x3, - 0x8, - 0x12, - 0x0, - { -1000, 0x0, -20, -20 } - }, - { - 0x3, - 0x9, - 0x13, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x3, - 0xB, - 0xE, - 0x0, - { 0xA, 0x14, -20, -20 } - }, - { - 0x3, - 0xB, - 0x2, - 0x0, - { 0x14, 0x14, 0x0, -20 } - }, - { - 0x3, - 0xB, - 0xB, - 0x0, - { 0x14, 0x14, 0x0, -20 } - }, - { - 0x3, - 0xB, - 0x15, - 0x0, - { 0x1E, 0x0, 0x0, -20 } - }, - { - 0x3, - 0xC, - 0xE, - 0x0, - { 0x14, 0x14, -20, 0x14 } - }, - { - 0x3, - 0xC, - 0x9, - 0x0, - { 0x14, 0x14, -20, 0x14 } - }, - { - 0x3, - 0xD, - 0x9, - 0x0, - { 0x3C, 0x14, -20, 0x14 } - }, - { - 0x4, - 0x14, - 0x10, - 0x1, - { 0x28, 0x14, 0x14, -20 } - }, - { - 0x4, - 0x14, - 0xC, - 0x1, - { 0x28, 0x14, -20, -20 } - }, - { - 0x4, - 0x14, - 0x14, - 0x1, - { 0x14, 0x14, 0x0, -20 } - }, - { - 0x4, - 0x15, - 0x10, - 0x1, - { 0x1E, 0x14, 0x0, -20 } - }, - { - 0x4, - 0x15, - 0xC, - 0x1, - { 0x1E, 0x14, -20, -20 } - }, - { - 0x4, - 0x15, - 0x14, - 0x1, - { 0x28, 0x14, 0x0, -20 } - }, - { - 0x4, - 0x17, - 0xA, - 0x0, - { 0xA, 0x0, 0x0, -20 } - }, - { - 0x4, - 0x18, - 0x9, - 0x0, - { -1000, 0x14, -20, -20 } - }, - { - 0x4, - 0x19, - 0x9, - 0x1, - { 0x14, 0x14, -20, -20 } - }, - { - 0x4, - 0x1A, - 0x6, - 0x3, - { 0x1E, 0x14, 0x0, -20 } - }, - { - 0x4, - 0xE, - 0x4, - 0x0, - { 0x14, 0x0, 0x14, 0x0 } - }, - { - 0x4, - 0xF, - 0xf0, - 0x0, - { 0xF, 0x0, 0x14, 0x14 } - }, - { - 0x4, - 0xF, - 0x1, - 0x0, - { 0xA, 0x14, 0x14, 0x14 } - }, - { - 0x4, - 0x1, - 0xB, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x4, - 0x1, - 0x1, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x4, - 0x1, - 0xE, - 0x0, - { -1000, 0x0, -20, 0x14 } - }, - { - 0x4, - 0x1, - 0x2, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x4, - 0x2, - 0x17, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x4, - 0x2, - 0x9, - 0x0, - { 0xA, 0x14, -20, 0x14 } - }, - { - 0x4, - 0x2, - 0x2, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x4, - 0x2, - 0x1, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x4, - 0x2, - 0xE, - 0x0, - { -1000, 0x0, -20, 0x14 } - }, - { - 0x4, - 0x2, - 0xB, - 0x0, - { -1000, 0x0, 0x0, 0x0 } - }, - { - 0x4, - 0x2, - 0xf1, - 0x0, - { 0xA, 0x0, 0x14, 0x14 } - }, - { - 0x4, - 0x2, - 0x15, - 0x0, - { 0x50, 0x14, 0x0, 0x0 } - }, - { - 0x4, - 0x2, - 0xF, - 0x0, - { 0x50, 0x14, 0x0, 0x0 } - }, - { - 0x4, - 0x12, - 0x8, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x4, - 0x13, - 0xD, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x4, - 0x6, - 0xB, - 0x0, - { 0x1E, 0x14, 0x0, -20 } - }, - { - 0x4, - 0x6, - 0xF, - 0x0, - { 0x3C, 0x14, 0x14, -20 } - }, - { - 0x4, - 0x7, - 0x11, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x4, - 0x8, - 0x12, - 0x0, - { 0x28, 0x14, 0x14, -20 } - }, - { - 0x4, - 0x9, - 0x13, - 0x0, - { -1000, 0x0, 0x0, -20 } - }, - { - 0x4, - 0xB, - 0x15, - 0x0, - { 0x3C, 0x14, 0x14, -20 } - }, - { - 0x4, - 0xB, - 0xB, - 0x0, - { 0xA, 0x14, 0x0, -20 } - }, - { - 0x4, - 0xC, - 0xE, - 0x0, - { 0x14, 0x14, -20, 0x14 } - }, - { - 0x4, - 0xC, - 0x9, - 0x0, - { 0x14, 0x14, -20, 0x14 } - }, - { - 0x4, - 0xD, - 0x9, - 0x0, - { 0x3C, 0x14, -20, 0x14 } - } + { + 0x1, + 0x14, + 0xf0, + 0x1, + { + 0x46, + 0x14, + 0x14, + -20, + }, + }, + { + 0x1, + 0x14, + 0x16, + 0x1, + { + 0x64, + 0x14, + 0x14, + -20, + }, + }, + { + 0x1, + 0x14, + 0x8, + 0x1, + { + 0x28, + 0x14, + 0x14, + -20, + }, + }, + { + 0x1, + 0x14, + 0x17, + 0x2, + { + 0xA, + 0x14, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x15, + 0xf0, + 0x2, + { + 0x0, + 0x14, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x16, + 0x10, + 0x1, + { + 0x28, + 0x14, + 0x14, + -20, + }, + }, + { + 0x1, + 0x17, + 0xA, + 0x0, + { + 0x14, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x18, + 0x9, + 0x0, + { + -1000, + 0x14, + -20, + 0x0, + }, + }, + { + 0x1, + 0x19, + 0x9, + 0x1, + { + 0x14, + 0x14, + -20, + 0x0, + }, + }, + { + 0x1, + 0x1A, + 0x6, + 0x3, + { + 0xA, + 0x14, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x1B, + 0x6, + 0x1, + { + 0xA, + 0x14, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x1C, + 0xD, + 0x1, + { + 0x1E, + 0x0, + 0x0, + -20, + }, + }, + { + 0x1, + 0xE, + 0x4, + 0x0, + { + 0xA, + 0x0, + 0x14, + 0x14, + }, + }, + { + 0x1, + 0xF, + 0xf0, + 0x0, + { + 0xF, + 0x0, + 0x14, + 0x14, + }, + }, + { + 0x1, + 0xF, + 0x1, + 0x0, + { + 0xA, + 0x14, + 0x14, + 0x14, + }, + }, + { + 0x1, + 0x10, + 0xD, + 0x1, + { + 0xF, + 0x0, + 0x0, + 0x14, + }, + }, + { + 0x1, + 0x11, + 0xD, + 0x1, + { + 0xA, + 0x0, + 0x0, + 0x14, + }, + }, + { + 0x1, + 0x1, + 0xB, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x1, + 0x1, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x1, + 0xE, + 0x0, + { + -1000, + 0x0, + -20, + 0x0, + }, + }, + { + 0x1, + 0x1, + 0x2, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x2, + 0xf1, + 0x0, + { + 0x14, + 0x0, + 0x14, + 0x0, + }, + }, + { + 0x1, + 0x2, + 0x9, + 0x0, + { + 0xA, + 0x14, + -20, + 0x14, + }, + }, + { + 0x1, + 0x2, + 0x2, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x2, + 0x1, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x2, + 0xE, + 0x0, + { + -1000, + 0x0, + -20, + 0x0, + }, + }, + { + 0x1, + 0x2, + 0xB, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x2, + 0x17, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x1, + 0x3, + 0x5, + 0x0, + { + 0x1E, + 0x0, + 0x14, + -20, + }, + }, + { + 0x1, + 0x3, + 0xB, + 0x0, + { + 0x19, + 0x14, + 0x14, + -20, + }, + }, + { + 0x1, + 0x4, + 0xB, + 0x0, + { + 0xA, + 0x14, + 0x14, + -20, + }, + }, + { + 0x1, + 0x5, + 0xC, + 0x0, + { + -1000, + 0x14, + 0x0, + -20, + }, + }, + { + 0x1, + 0x6, + 0x2, + 0x0, + { + 0x28, + 0x14, + 0x0, + -20, + }, + }, + { + 0x1, + 0x6, + 0xB, + 0x0, + { + 0x32, + 0x14, + 0x0, + -20, + }, + }, + { + 0x1, + 0x7, + 0x11, + 0x0, + { + 0x1E, + 0x0, + 0x14, + -20, + }, + }, + { + 0x1, + 0x8, + 0x12, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x1, + 0x9, + 0x13, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x1, + 0xA, + 0x14, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x1, + 0xB, + 0x15, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x1, + 0xB, + 0xB, + 0x0, + { + 0x23, + 0x14, + -20, + -20, + }, + }, + { + 0x1, + 0xB, + 0x2, + 0x0, + { + 0x28, + 0x14, + -20, + -20, + }, + }, + { + 0x1, + 0xC, + 0xE, + 0x0, + { + 0x14, + 0x14, + -20, + 0x14, + }, + }, + { + 0x1, + 0xC, + 0x9, + 0x0, + { + 0x14, + 0x14, + -20, + 0x14, + }, + }, + { + 0x1, + 0xD, + 0x9, + 0x0, + { + 0x3C, + 0x14, + -20, + 0x14, + }, + }, + { + 0x2, + 0x14, + 0xf0, + 0x1, + { + 0x32, + 0x14, + 0x14, + -20, + }, + }, + { + 0x2, + 0x14, + 0x16, + 0x1, + { + 0x50, + 0x14, + 0x14, + -20, + }, + }, + { + 0x2, + 0x14, + 0x8, + 0x1, + { + 0x28, + 0x14, + 0x14, + -20, + }, + }, + { + 0x2, + 0x14, + 0xC, + 0x1, + { + 0x32, + 0x14, + -20, + -20, + }, + }, + { + 0x2, + 0x14, + 0x14, + 0x1, + { + 0x28, + 0x14, + 0x0, + -20, + }, + }, + { + 0x2, + 0x14, + 0x17, + 0x2, + { + 0x14, + 0x14, + 0x0, + -20, + }, + }, + { + 0x2, + 0x16, + 0x10, + 0x1, + { + 0x1E, + 0x14, + 0x0, + -20, + }, + }, + { + 0x2, + 0x17, + 0xA, + 0x0, + { + 0x14, + 0x0, + 0x0, + -20, + }, + }, + { + 0x2, + 0x18, + 0x9, + 0x0, + { + -1000, + 0x14, + -20, + -20, + }, + }, + { + 0x2, + 0x19, + 0x9, + 0x1, + { + 0x14, + 0x14, + -20, + -20, + }, + }, + { + 0x2, + 0x1A, + 0x6, + 0x3, + { + 0x1E, + 0x14, + -20, + -20, + }, + }, + { + 0x2, + 0x1B, + 0x6, + 0x1, + { + 0xA, + 0x0, + 0x0, + -20, + }, + }, + { + 0x2, + 0x1C, + 0xD, + 0x1, + { + 0x1E, + 0x0, + 0x0, + -20, + }, + }, + { + 0x2, + 0xE, + 0x4, + 0x0, + { + 0x14, + 0x0, + 0x14, + 0x14, + }, + }, + { + 0x2, + 0xF, + 0xf0, + 0x0, + { + 0xF, + 0x0, + 0x14, + 0x14, + }, + }, + { + 0x2, + 0xF, + 0x1, + 0x0, + { + 0xA, + 0x0, + 0x14, + 0x14, + }, + }, + { + 0x2, + 0x10, + 0xD, + 0x1, + { + 0xF, + 0x0, + 0x0, + 0x14, + }, + }, + { + 0x2, + 0x1, + 0xB, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x2, + 0x1, + 0x1, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x2, + 0x1, + 0xE, + 0x0, + { + -1000, + 0x0, + -20, + 0x14, + }, + }, + { + 0x2, + 0x1, + 0x2, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x2, + 0x2, + 0xf1, + 0x0, + { + 0x14, + 0x0, + 0x14, + 0x14, + }, + }, + { + 0x2, + 0x2, + 0x17, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x2, + 0x2, + 0x9, + 0x0, + { + 0xA, + 0x14, + -20, + 0x14, + }, + }, + { + 0x2, + 0x2, + 0x2, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x2, + 0x2, + 0x1, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x2, + 0x2, + 0xE, + 0x0, + { + -1000, + 0x0, + -20, + 0x14, + }, + }, + { + 0x2, + 0x2, + 0xB, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x2, + 0x3, + 0xB, + 0x0, + { + 0x1E, + 0x14, + 0x14, + -20, + }, + }, + { + 0x2, + 0x4, + 0xB, + 0x0, + { + 0xA, + 0x14, + 0x14, + -20, + }, + }, + { + 0x2, + 0x6, + 0xB, + 0x0, + { + 0x32, + 0x14, + 0x14, + -20, + }, + }, + { + 0x2, + 0x6, + 0x2, + 0x0, + { + 0x28, + 0x14, + 0x0, + -20, + }, + }, + { + 0x2, + 0x6, + 0xE, + 0x0, + { + 0xA, + 0x14, + -20, + -20, + }, + }, + { + 0x2, + 0x7, + 0x11, + 0x0, + { + -1000, + 0x0, + -20, + -20, + }, + }, + { + 0x2, + 0x8, + 0x12, + 0x0, + { + -1000, + 0x0, + -20, + -20, + }, + }, + { + 0x2, + 0x9, + 0x13, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x2, + 0xB, + 0x2, + 0x0, + { + 0xA, + 0x0, + 0x0, + -20, + }, + }, + { + 0x2, + 0xB, + 0x15, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x2, + 0xB, + 0xB, + 0x0, + { + 0x28, + 0x14, + 0x0, + -20, + }, + }, + { + 0x2, + 0xB, + 0xE, + 0x0, + { + 0xA, + 0x14, + 0x0, + -20, + }, + }, + { + 0x2, + 0xC, + 0xE, + 0x0, + { + 0x14, + 0x14, + 0x0, + 0x14, + }, + }, + { + 0x2, + 0xC, + 0x9, + 0x0, + { + 0x14, + 0x14, + -20, + 0x14, + }, + }, + { + 0x2, + 0xD, + 0x9, + 0x0, + { + 0x3C, + 0x14, + -20, + 0x14, + }, + }, + { + 0x3, + 0x14, + 0x10, + 0x1, + { + 0x28, + 0x14, + 0x0, + -20, + }, + }, + { + 0x3, + 0x14, + 0x14, + 0x1, + { + 0x28, + 0x14, + 0x0, + -20, + }, + }, + { + 0x3, + 0x14, + 0xC, + 0x1, + { + 0x28, + 0x14, + -20, + -20, + }, + }, + { + 0x3, + 0x15, + 0x14, + 0x1, + { + 0x28, + 0x14, + 0x0, + -20, + }, + }, + { + 0x3, + 0x15, + 0xC, + 0x1, + { + 0x1E, + 0x14, + -20, + -20, + }, + }, + { + 0x3, + 0x15, + 0xf0, + 0x1, + { + 0x1E, + 0x0, + 0x14, + -20, + }, + }, + { + 0x3, + 0x17, + 0xA, + 0x0, + { + 0xA, + 0x0, + 0x0, + -20, + }, + }, + { + 0x3, + 0x18, + 0x9, + 0x0, + { + -1000, + 0x14, + -20, + -20, + }, + }, + { + 0x3, + 0x19, + 0x9, + 0x1, + { + 0x14, + 0x14, + -20, + -20, + }, + }, + { + 0x3, + 0x1A, + 0x6, + 0x3, + { + 0x1E, + 0x14, + 0x0, + -20, + }, + }, + { + 0x3, + 0x1C, + 0xD, + 0x1, + { + 0xA, + 0x0, + 0x0, + -20, + }, + }, + { + 0x3, + 0xE, + 0x4, + 0x0, + { + 0x14, + 0x0, + 0x14, + 0x14, + }, + }, + { + 0x3, + 0xF, + 0xf0, + 0x0, + { + 0xF, + 0x0, + 0x14, + 0x14, + }, + }, + { + 0x3, + 0xF, + 0x1, + 0x0, + { + 0xA, + 0x14, + 0x14, + 0x14, + }, + }, + { + 0x3, + 0x1, + 0xB, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x3, + 0x1, + 0x1, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x3, + 0x1, + 0xE, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x14, + }, + }, + { + 0x3, + 0x1, + 0x2, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x3, + 0x2, + 0x17, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x3, + 0x2, + 0x9, + 0x0, + { + 0xA, + 0x14, + -20, + 0x14, + }, + }, + { + 0x3, + 0x2, + 0x2, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x3, + 0x2, + 0x1, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x3, + 0x2, + 0xE, + 0x0, + { + -1000, + 0x0, + -20, + 0x14, + }, + }, + { + 0x3, + 0x2, + 0xB, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x3, + 0x2, + 0xf1, + 0x0, + { + 0xA, + 0x0, + 0x14, + 0x0, + }, + }, + { + 0x3, + 0x3, + 0xB, + 0x0, + { + 0x1E, + 0x14, + 0x0, + -20, + }, + }, + { + 0x3, + 0x4, + 0xB, + 0x0, + { + 0xA, + 0x14, + 0x0, + -20, + }, + }, + { + 0x3, + 0x6, + 0x2, + 0x0, + { + 0x28, + 0x0, + 0x0, + -20, + }, + }, + { + 0x3, + 0x6, + 0xE, + 0x0, + { + 0xA, + 0x14, + 0x0, + -20, + }, + }, + { + 0x3, + 0x6, + 0xB, + 0x0, + { + 0x14, + 0x14, + 0x0, + -20, + }, + }, + { + 0x3, + 0x7, + 0x11, + 0x0, + { + -1000, + 0x0, + -20, + -20, + }, + }, + { + 0x3, + 0x8, + 0x12, + 0x0, + { + -1000, + 0x0, + -20, + -20, + }, + }, + { + 0x3, + 0x9, + 0x13, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x3, + 0xB, + 0xE, + 0x0, + { + 0xA, + 0x14, + -20, + -20, + }, + }, + { + 0x3, + 0xB, + 0x2, + 0x0, + { + 0x14, + 0x14, + 0x0, + -20, + }, + }, + { + 0x3, + 0xB, + 0xB, + 0x0, + { + 0x14, + 0x14, + 0x0, + -20, + }, + }, + { + 0x3, + 0xB, + 0x15, + 0x0, + { + 0x1E, + 0x0, + 0x0, + -20, + }, + }, + { + 0x3, + 0xC, + 0xE, + 0x0, + { + 0x14, + 0x14, + -20, + 0x14, + }, + }, + { + 0x3, + 0xC, + 0x9, + 0x0, + { + 0x14, + 0x14, + -20, + 0x14, + }, + }, + { + 0x3, + 0xD, + 0x9, + 0x0, + { + 0x3C, + 0x14, + -20, + 0x14, + }, + }, + { + 0x4, + 0x14, + 0x10, + 0x1, + { + 0x28, + 0x14, + 0x14, + -20, + }, + }, + { + 0x4, + 0x14, + 0xC, + 0x1, + { + 0x28, + 0x14, + -20, + -20, + }, + }, + { + 0x4, + 0x14, + 0x14, + 0x1, + { + 0x14, + 0x14, + 0x0, + -20, + }, + }, + { + 0x4, + 0x15, + 0x10, + 0x1, + { + 0x1E, + 0x14, + 0x0, + -20, + }, + }, + { + 0x4, + 0x15, + 0xC, + 0x1, + { + 0x1E, + 0x14, + -20, + -20, + }, + }, + { + 0x4, + 0x15, + 0x14, + 0x1, + { + 0x28, + 0x14, + 0x0, + -20, + }, + }, + { + 0x4, + 0x17, + 0xA, + 0x0, + { + 0xA, + 0x0, + 0x0, + -20, + }, + }, + { + 0x4, + 0x18, + 0x9, + 0x0, + { + -1000, + 0x14, + -20, + -20, + }, + }, + { + 0x4, + 0x19, + 0x9, + 0x1, + { + 0x14, + 0x14, + -20, + -20, + }, + }, + { + 0x4, + 0x1A, + 0x6, + 0x3, + { + 0x1E, + 0x14, + 0x0, + -20, + }, + }, + { + 0x4, + 0xE, + 0x4, + 0x0, + { + 0x14, + 0x0, + 0x14, + 0x0, + }, + }, + { + 0x4, + 0xF, + 0xf0, + 0x0, + { + 0xF, + 0x0, + 0x14, + 0x14, + }, + }, + { + 0x4, + 0xF, + 0x1, + 0x0, + { + 0xA, + 0x14, + 0x14, + 0x14, + }, + }, + { + 0x4, + 0x1, + 0xB, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x4, + 0x1, + 0x1, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x4, + 0x1, + 0xE, + 0x0, + { + -1000, + 0x0, + -20, + 0x14, + }, + }, + { + 0x4, + 0x1, + 0x2, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x4, + 0x2, + 0x17, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x4, + 0x2, + 0x9, + 0x0, + { + 0xA, + 0x14, + -20, + 0x14, + }, + }, + { + 0x4, + 0x2, + 0x2, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x4, + 0x2, + 0x1, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x4, + 0x2, + 0xE, + 0x0, + { + -1000, + 0x0, + -20, + 0x14, + }, + }, + { + 0x4, + 0x2, + 0xB, + 0x0, + { + -1000, + 0x0, + 0x0, + 0x0, + }, + }, + { + 0x4, + 0x2, + 0xf1, + 0x0, + { + 0xA, + 0x0, + 0x14, + 0x14, + }, + }, + { + 0x4, + 0x2, + 0x15, + 0x0, + { + 0x50, + 0x14, + 0x0, + 0x0, + }, + }, + { + 0x4, + 0x2, + 0xF, + 0x0, + { + 0x50, + 0x14, + 0x0, + 0x0, + }, + }, + { + 0x4, + 0x12, + 0x8, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x4, + 0x13, + 0xD, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x4, + 0x6, + 0xB, + 0x0, + { + 0x1E, + 0x14, + 0x0, + -20, + }, + }, + { + 0x4, + 0x6, + 0xF, + 0x0, + { + 0x3C, + 0x14, + 0x14, + -20, + }, + }, + { + 0x4, + 0x7, + 0x11, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x4, + 0x8, + 0x12, + 0x0, + { + 0x28, + 0x14, + 0x14, + -20, + }, + }, + { + 0x4, + 0x9, + 0x13, + 0x0, + { + -1000, + 0x0, + 0x0, + -20, + }, + }, + { + 0x4, + 0xB, + 0x15, + 0x0, + { + 0x3C, + 0x14, + 0x14, + -20, + }, + }, + { + 0x4, + 0xB, + 0xB, + 0x0, + { + 0xA, + 0x14, + 0x0, + -20, + }, + }, + { + 0x4, + 0xC, + 0xE, + 0x0, + { + 0x14, + 0x14, + -20, + 0x14, + }, + }, + { + 0x4, + 0xC, + 0x9, + 0x0, + { + 0x14, + 0x14, + -20, + 0x14, + }, + }, + { + 0x4, + 0xD, + 0x9, + 0x0, + { + 0x3C, + 0x14, + -20, + 0x14, + }, + }, }; - - - - -void ov17_02246ECC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BE58 * param1) +void ov17_02246ECC(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_0223BE58 *param1) { int v0; - UnkStruct_ov17_02246F9C * v1; + UnkStruct_ov17_02246F9C *v1; v1 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_02246F9C)); @@ -1274,7 +2096,7 @@ void ov17_02246ECC (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0223BE58 * Heap_FreeToHeap(v1); } -static void ov17_02246F24 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246F9C * param1, int param2) +static void ov17_02246F24(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246F9C *param1, int param2) { int v0; @@ -1294,10 +2116,10 @@ static void ov17_02246F24 (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0224 param1->unk_30 = param0->unk_00->unk_00.unk_FC[param2]; } -static void ov17_02246F9C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_02246F9C * param1, int param2, u16 * param3, u8 * param4) +static void ov17_02246F9C(UnkStruct_ov17_02246F24 *param0, UnkStruct_ov17_02246F9C *param1, int param2, u16 *param3, u8 *param4) { int v0, v1, v2, v3, v4; - UnkStruct_ov17_022472F8 * v5; + UnkStruct_ov17_022472F8 *v5; int v6; u8 v7[1 + 2]; @@ -1432,7 +2254,10 @@ static void ov17_02246F9C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0224 if (v16 == (1 + 2)) { const u8 v20[] = { - 230, 128, 51, 0, + 230, + 128, + 51, + 0, }; v18 = sub_02094E98(param0->unk_00) & 0xff; @@ -1466,7 +2291,7 @@ static void ov17_02246F9C (UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_0224 } } -static int ov17_022472F8 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_022472F8(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { if (param0->unk_00 == 4) { return 1; @@ -1475,7 +2300,7 @@ static int ov17_022472F8 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247308 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247308(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { if (param0->unk_30.unk_A0[param1].unk_00_16 != 0) { return 1; @@ -1484,7 +2309,7 @@ static int ov17_02247308 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247320 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247320(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1497,7 +2322,7 @@ static int ov17_02247320 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247338 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247338(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1510,7 +2335,7 @@ static int ov17_02247338 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247350 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247350(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1523,7 +2348,7 @@ static int ov17_02247350 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247368 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247368(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1536,7 +2361,7 @@ static int ov17_02247368 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247380 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247380(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1549,7 +2374,7 @@ static int ov17_02247380 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247398 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247398(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1562,7 +2387,7 @@ static int ov17_02247398 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_022473B0 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_022473B0(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1575,7 +2400,7 @@ static int ov17_022473B0 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_022473C8 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_022473C8(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1588,7 +2413,7 @@ static int ov17_022473C8 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_022473E0 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_022473E0(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1601,7 +2426,7 @@ static int ov17_022473E0 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_022473F8 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_022473F8(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1620,7 +2445,7 @@ static int ov17_022473F8 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247424 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247424(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1641,7 +2466,7 @@ static int ov17_02247424 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247454 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247454(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1654,7 +2479,7 @@ static int ov17_02247454 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247474 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247474(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1667,7 +2492,7 @@ static int ov17_02247474 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247490 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247490(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1697,7 +2522,7 @@ static int ov17_02247490 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_022474D8 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_022474D8(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1727,7 +2552,7 @@ static int ov17_022474D8 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247520 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247520(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1740,7 +2565,7 @@ static int ov17_02247520 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247538 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247538(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1753,7 +2578,7 @@ static int ov17_02247538 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247550 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247550(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1773,7 +2598,7 @@ static int ov17_02247550 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_0224757C (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_0224757C(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1793,7 +2618,7 @@ static int ov17_0224757C (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_022475A8 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_022475A8(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1813,7 +2638,7 @@ static int ov17_022475A8 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_022475D4 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_022475D4(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1830,7 +2655,7 @@ static int ov17_022475D4 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 1; } -static int ov17_02247600 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247600(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0; @@ -1847,7 +2672,7 @@ static int ov17_02247600 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 1; } -static int ov17_0224762C (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_0224762C(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1867,7 +2692,7 @@ static int ov17_0224762C (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247658 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247658(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1887,7 +2712,7 @@ static int ov17_02247658 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_02247684 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_02247684(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; @@ -1907,7 +2732,7 @@ static int ov17_02247684 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruc return 0; } -static int ov17_022476B0 (UnkStruct_ov17_022472F8 * param0, int param1, UnkStruct_ov17_02246F9C * param2, u8 * param3, int param4) +static int ov17_022476B0(UnkStruct_ov17_022472F8 *param0, int param1, UnkStruct_ov17_02246F9C *param2, u8 *param3, int param4) { int v0, v1; diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index 68b1f1546b..e0e63d1a84 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -1,39 +1,38 @@ +#include "overlay017/ov17_022476F8.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" - #include "struct_defs/archived_sprite.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" + #include "overlay017/struct_ov17_022476F8.h" #include "overlay017/struct_ov17_0224792C.h" #include "overlay017/struct_ov17_02247A48.h" #include "overlay017/struct_ov17_0225442C.h" -#include "struct_defs/sprite_template.h" -#include "unk_02005474.h" -#include "unk_0200762C.h" +#include "game_options.h" +#include "heap.h" #include "message.h" +#include "pokemon.h" +#include "strbuf.h" #include "string_template.h" -#include "unk_0200C6E4.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" +#include "unk_0200762C.h" +#include "unk_0200C6E4.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "game_options.h" -#include "pokemon.h" -#include "overlay017/ov17_022476F8.h" typedef struct { - u8 * unk_00; - CellActorData * unk_04; + u8 *unk_00; + CellActorData *unk_04; s32 unk_08; s32 unk_0C; fx32 unk_10; @@ -49,33 +48,33 @@ static const SpriteTemplate Unk_ov17_022543F8 = { 0xA, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x80EA, 0x80EA, 0x80EA, 0x80EA, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80EA, 0x80EA, 0x80EA, 0x80EA, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; static const UnkStruct_ov17_0225442C Unk_ov17_0225442C[] = { - {0x0, 0x0}, - {0x0, 0x0}, - {0x11, 0x0}, - {0x1, 0x1}, - {0x2, 0x1}, - {0x3, 0x1}, - {0x4, 0x1}, - {0x5, 0x0}, - {0x6, 0x0}, - {0x7, 0x0}, - {0x8, 0x0}, - {0x9, 0x0}, - {0xA, 0x0}, - {0xB, 0x0}, - {0xC, 0x0} + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0x11, 0x0 }, + { 0x1, 0x1 }, + { 0x2, 0x1 }, + { 0x3, 0x1 }, + { 0x4, 0x1 }, + { 0x5, 0x0 }, + { 0x6, 0x0 }, + { 0x7, 0x0 }, + { 0x8, 0x0 }, + { 0x9, 0x0 }, + { 0xA, 0x0 }, + { 0xB, 0x0 }, + { 0xC, 0x0 } }; void include_ov17_022476F8(void); -static void ov17_02247840(SysTask * param0, void * param1); +static void ov17_02247840(SysTask *param0, void *param1); -void ov17_022476F8 (UnkStruct_ov17_022476F8 * param0, int param1) +void ov17_022476F8(UnkStruct_ov17_022476F8 *param0, int param1) { if (param0->unk_08[param1] == NULL) { GF_ASSERT(param0->unk_48[param1].unk_00 == NULL); @@ -89,7 +88,7 @@ void ov17_022476F8 (UnkStruct_ov17_022476F8 * param0, int param1) param0->unk_48[param1].unk_00 = NULL; } -void ov17_02247734 (UnkStruct_ov17_022476F8 * param0) +void ov17_02247734(UnkStruct_ov17_022476F8 *param0) { int v0; @@ -98,23 +97,23 @@ void ov17_02247734 (UnkStruct_ov17_022476F8 * param0) } } -void ov17_0224774C (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_0224774C(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 67, 1, NNS_G2D_VRAM_TYPE_2DSUB, 33002); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 68, 1, 33002); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 69, 1, 33002); } -void ov17_02247798 (SpriteGfxHandler * param0) +void ov17_02247798(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33002); SpriteGfxHandler_UnloadCellObjById(param0, 33002); SpriteGfxHandler_UnloadAnimObjById(param0, 33002); } -void ov17_022477B8 (UnkStruct_ov17_02247A48 * param0, int param1, int param2, fx32 param3, int param4) +void ov17_022477B8(UnkStruct_ov17_02247A48 *param0, int param1, int param2, fx32 param3, int param4) { - UnkStruct_ov17_022477B8 * v0; + UnkStruct_ov17_022477B8 *v0; v0 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_022477B8)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_022477B8)); @@ -137,9 +136,9 @@ void ov17_022477B8 (UnkStruct_ov17_02247A48 * param0, int param1, int param2, fx Sound_PlayEffect(1761); } -static void ov17_02247840 (SysTask * param0, void * param1) +static void ov17_02247840(SysTask *param0, void *param1) { - UnkStruct_ov17_022477B8 * v0 = param1; + UnkStruct_ov17_022477B8 *v0 = param1; s32 v1; switch (v0->unk_14) { @@ -165,7 +164,7 @@ static void ov17_02247840 (SysTask * param0, void * param1) } } -void ov17_022478D0 (UnkStruct_ov17_02247A48 * param0, int param1) +void ov17_022478D0(UnkStruct_ov17_02247A48 *param0, int param1) { ArchivedSprite v0; @@ -175,7 +174,7 @@ void ov17_022478D0 (UnkStruct_ov17_02247A48 * param0, int param1) param0->unk_0C.unk_18 = sub_02007C34(param0->unk_0C.unk_04, &v0, 320, 32, (-0x200 - 0x40), 3, NULL, NULL); } -void ov17_02247918 (UnkStruct_ov17_02247A48 * param0) +void ov17_02247918(UnkStruct_ov17_02247A48 *param0) { if (param0->unk_0C.unk_18 == NULL) { return; @@ -185,7 +184,7 @@ void ov17_02247918 (UnkStruct_ov17_02247A48 * param0) param0->unk_0C.unk_18 = NULL; } -static void ov17_0224792C (UnkStruct_ov17_02247A48 * param0, int param1, const UnkStruct_ov17_0224792C * param2) +static void ov17_0224792C(UnkStruct_ov17_02247A48 *param0, int param1, const UnkStruct_ov17_0224792C *param2) { if (param1 != 0) { GF_ASSERT(param2 != NULL); @@ -204,9 +203,9 @@ static void ov17_0224792C (UnkStruct_ov17_02247A48 * param0, int param1, const U } } -static void ov17_02247990 (UnkStruct_ov17_02247A48 * param0, MessageLoader * param1, u32 param2, int param3, const UnkStruct_ov17_0224792C * param4) +static void ov17_02247990(UnkStruct_ov17_02247A48 *param0, MessageLoader *param1, u32 param2, int param3, const UnkStruct_ov17_0224792C *param4) { - Strbuf* v0; + Strbuf *v0; int v1; if (param0->unk_00->unk_155 == 0) { @@ -225,7 +224,7 @@ static void ov17_02247990 (UnkStruct_ov17_02247A48 * param0, MessageLoader * par Strbuf_Free(v0); } -void ov17_02247A08 (UnkStruct_ov17_02247A48 * param0, u32 param1, const UnkStruct_ov17_0224792C * param2) +void ov17_02247A08(UnkStruct_ov17_02247A48 *param0, u32 param1, const UnkStruct_ov17_0224792C *param2) { u32 v0, v1; @@ -237,12 +236,12 @@ void ov17_02247A08 (UnkStruct_ov17_02247A48 * param0, u32 param1, const UnkStruc ov17_02247990(param0, param0->unk_0C.unk_38, v0, v1, param2); } -int ov17_02247A3C (UnkStruct_ov17_02247A48 * param0) +int ov17_02247A3C(UnkStruct_ov17_02247A48 *param0) { return Message_Printing(param0->unk_0C.unk_C4); } -void include_ov17_022476F8 (void) +void include_ov17_022476F8(void) { const u16 dummy[5] = { 9, 10, 11, 12, 13 diff --git a/src/overlay017/ov17_02247A48.c b/src/overlay017/ov17_02247A48.c index 317b90a1a5..45c1e61a6b 100644 --- a/src/overlay017/ov17_02247A48.c +++ b/src/overlay017/ov17_02247A48.c @@ -1,12 +1,12 @@ +#include "overlay017/ov17_02247A48.h" + #include #include -#include "core_sys.h" -#include "assert.h" - -#include "sys_task_manager.h" - +#include "overlay012/ov12_02235E94.h" #include "overlay012/struct_ov12_02237728.h" +#include "overlay017/ov17_022476F8.h" +#include "overlay017/ov17_0224F18C.h" #include "overlay017/struct_ov17_02243C28.h" #include "overlay017/struct_ov17_02243C80.h" #include "overlay017/struct_ov17_02247A48.h" @@ -30,97 +30,95 @@ #include "overlay017/struct_ov17_0224F30C.h" #include "overlay017/struct_ov17_0224F3D8.h" #include "overlay017/struct_ov17_022539E4.h" +#include "overlay022/ov22_0225AF8C.h" #include "overlay022/struct_ov22_0225AF8C.h" +#include "assert.h" +#include "core_sys.h" +#include "heap.h" +#include "pokemon.h" #include "spl.h" - +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_0200A9DC.h" -#include "sys_task.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" -#include "pokemon.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" -#include "overlay012/ov12_02235E94.h" -#include "overlay017/ov17_022476F8.h" -#include "overlay017/ov17_02247A48.h" -#include "overlay017/ov17_0224F18C.h" -#include "overlay022/ov22_0225AF8C.h" -static int ov17_02247A88(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02247A9C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02247AAC(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4); -static int ov17_02247AEC(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02247B00(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02247C5C(SysTask * param0, void * param1); -static int ov17_02247D68(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02247D7C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02247DC8(SysTask * param0, void * param1); -static int ov17_02247E78(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02247E8C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02247EDC(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02247F2C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02247F8C(SysTask * param0, void * param1); -static int ov17_02248138(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224814C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02248198(SysTask * param0, void * param1); -static int ov17_02247AB0(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02247AC4(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static int ov17_02248258(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224826C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_022482B0(SysTask * param0, void * param1); -static int ov17_0224840C(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02248420(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02248464(SysTask * param0, void * param1); -static int ov17_022485E8(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_022485FC(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02248648(SysTask * param0, void * param1); -static int ov17_022486E4(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_022486F8(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02248744(SysTask * param0, void * param1); -static int ov17_022487E8(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_022487FC(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02248860(SysTask * param0, void * param1); -static void ov17_022489C8(SysTask * param0, void * param1); -static void ov17_02248A24(SysTask * param0, void * param1); -static void ov17_02248AA4(SysTask * param0, void * param1); -static void ov17_02248BE0(SysTask * param0, void * param1); -static int ov17_02248D28(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02248D3C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02248DA4(SysTask * param0, void * param1); -static int ov17_02248FBC(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02248FD0(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02249014(SysTask * param0, void * param1); -static int ov17_02248E58(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02248E6C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02248EC4(SysTask * param0, void * param1); -static int ov17_0224924C(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02249260(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_022492AC(SysTask * param0, void * param1); +static int ov17_02247A88(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02247A9C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02247AAC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4); +static int ov17_02247AEC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02247B00(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02247C5C(SysTask *param0, void *param1); +static int ov17_02247D68(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02247D7C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02247DC8(SysTask *param0, void *param1); +static int ov17_02247E78(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02247E8C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02247EDC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02247F2C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02247F8C(SysTask *param0, void *param1); +static int ov17_02248138(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224814C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02248198(SysTask *param0, void *param1); +static int ov17_02247AB0(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02247AC4(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static int ov17_02248258(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224826C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_022482B0(SysTask *param0, void *param1); +static int ov17_0224840C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02248420(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02248464(SysTask *param0, void *param1); +static int ov17_022485E8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_022485FC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02248648(SysTask *param0, void *param1); +static int ov17_022486E4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_022486F8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02248744(SysTask *param0, void *param1); +static int ov17_022487E8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_022487FC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02248860(SysTask *param0, void *param1); +static void ov17_022489C8(SysTask *param0, void *param1); +static void ov17_02248A24(SysTask *param0, void *param1); +static void ov17_02248AA4(SysTask *param0, void *param1); +static void ov17_02248BE0(SysTask *param0, void *param1); +static int ov17_02248D28(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02248D3C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02248DA4(SysTask *param0, void *param1); +static int ov17_02248FBC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02248FD0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02249014(SysTask *param0, void *param1); +static int ov17_02248E58(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02248E6C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02248EC4(SysTask *param0, void *param1); +static int ov17_0224924C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02249260(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_022492AC(SysTask *param0, void *param1); static const UnkStruct_ov17_022539E4 Unk_ov17_02254488[] = { - {ov17_02247A88, ov17_02247A9C, ov17_02247AAC}, - {ov17_02247AB0, ov17_02247AC4, NULL}, - {ov17_02247AEC, ov17_02247B00, NULL}, - {ov17_02247D68, ov17_02247D7C, NULL}, - {ov17_02247E78, ov17_02247E8C, NULL}, - {ov17_02247E78, ov17_02247EDC, NULL}, - {ov17_02247E78, ov17_02247F2C, NULL}, - {ov17_02248138, ov17_0224814C, NULL}, - {ov17_02248258, ov17_0224826C, NULL}, - {ov17_0224840C, ov17_02248420, NULL}, - {ov17_022485E8, ov17_022485FC, NULL}, - {ov17_022486E4, ov17_022486F8, NULL}, - {ov17_022487E8, ov17_022487FC, NULL}, - {ov17_02248D28, ov17_02248D3C, NULL}, - {ov17_02248E58, ov17_02248E6C, NULL}, - {ov17_02248FBC, ov17_02248FD0, NULL}, - {ov17_0224924C, ov17_02249260, NULL} + { ov17_02247A88, ov17_02247A9C, ov17_02247AAC }, + { ov17_02247AB0, ov17_02247AC4, NULL }, + { ov17_02247AEC, ov17_02247B00, NULL }, + { ov17_02247D68, ov17_02247D7C, NULL }, + { ov17_02247E78, ov17_02247E8C, NULL }, + { ov17_02247E78, ov17_02247EDC, NULL }, + { ov17_02247E78, ov17_02247F2C, NULL }, + { ov17_02248138, ov17_0224814C, NULL }, + { ov17_02248258, ov17_0224826C, NULL }, + { ov17_0224840C, ov17_02248420, NULL }, + { ov17_022485E8, ov17_022485FC, NULL }, + { ov17_022486E4, ov17_022486F8, NULL }, + { ov17_022487E8, ov17_022487FC, NULL }, + { ov17_02248D28, ov17_02248D3C, NULL }, + { ov17_02248E58, ov17_02248E6C, NULL }, + { ov17_02248FBC, ov17_02248FD0, NULL }, + { ov17_0224924C, ov17_02249260, NULL } }; __attribute__((aligned(4))) static const s8 Unk_ov17_02254468[] = { @@ -146,7 +144,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov17_02254470[] = { 0x138 }; -void ov17_02247A48 (UnkStruct_ov17_02247A48 * param0) +void ov17_02247A48(UnkStruct_ov17_02247A48 *param0) { UnkStruct_ov17_02243C28 v0; @@ -159,39 +157,39 @@ void ov17_02247A48 (UnkStruct_ov17_02247A48 * param0) ov17_0224F18C(¶m0->unk_4F8, &v0); } -static int ov17_02247A88 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02247A88(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_02247A9C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02247A9C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; ov17_0224F26C(param0, param2, NULL, 0); } -static void ov17_02247AAC (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4) +static void ov17_02247AAC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; return; } -static int ov17_02247AB0 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02247AB0(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_02247AC4 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02247AC4(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; v0->unk_F14 = 1; @@ -200,20 +198,20 @@ static void ov17_02247AC4 (UnkStruct_ov17_0224F30C * param0, void * param1, cons } } -static int ov17_02247AEC (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02247AEC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02249260)); return v1; } -static void ov17_02247B00 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02247B00(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_02247DC8 * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_02247DC8 *v2; s32 v3; int v4; @@ -265,9 +263,9 @@ static void ov17_02247B00 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02247C5C, v2, 30000); } -static void ov17_02247C5C (SysTask * param0, void * param1) +static void ov17_02247C5C(SysTask *param0, void *param1) { - UnkStruct_ov17_02247C5C * v0 = param1; + UnkStruct_ov17_02247C5C *v0 = param1; int v1; switch (v0->unk_10) { @@ -307,20 +305,20 @@ static void ov17_02247C5C (SysTask * param0, void * param1) } } -static int ov17_02247D68 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02247D68(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02249260)); return v1; } -static void ov17_02247D7C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02247D7C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_02247DC8 * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_02247DC8 *v2; v2 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02247DC8)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02247DC8)); @@ -333,9 +331,9 @@ static void ov17_02247D7C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02247DC8, v2, 30000); } -static void ov17_02247DC8 (SysTask * param0, void * param1) +static void ov17_02247DC8(SysTask *param0, void *param1) { - UnkStruct_ov17_02247DC8 * v0 = param1; + UnkStruct_ov17_02247DC8 *v0 = param1; int v1; switch (v0->unk_10) { @@ -364,20 +362,20 @@ static void ov17_02247DC8 (SysTask * param0, void * param1) } } -static int ov17_02247E78 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02247E78(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02249260)); return v1; } -static void ov17_02247E8C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02247E8C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_02247F8C * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_02247F8C *v2; v2 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02247F8C)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02247F8C)); @@ -391,11 +389,11 @@ static void ov17_02247E8C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02247F8C, v2, 30000); } -static void ov17_02247EDC (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02247EDC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_02247F8C * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_02247F8C *v2; v2 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02247F8C)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02247F8C)); @@ -409,11 +407,11 @@ static void ov17_02247EDC (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02247F8C, v2, 30000); } -static void ov17_02247F2C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02247F2C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_02247F8C * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_02247F8C *v2; v2 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02247F8C)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02247F8C)); @@ -430,9 +428,9 @@ static void ov17_02247F2C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02247F8C, v2, 30000); } -static void ov17_02247F8C (SysTask * param0, void * param1) +static void ov17_02247F8C(SysTask *param0, void *param1) { - UnkStruct_ov17_02247F8C * v0 = param1; + UnkStruct_ov17_02247F8C *v0 = param1; int v1; switch (v0->unk_10) { @@ -522,20 +520,20 @@ static void ov17_02247F8C (SysTask * param0, void * param1) } } -static int ov17_02248138 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02248138(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02249260)); return v1; } -static void ov17_0224814C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224814C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_02248198 * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_02248198 *v2; v2 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02248198)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02248198)); @@ -548,9 +546,9 @@ static void ov17_0224814C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02248198, v2, 30000); } -static void ov17_02248198 (SysTask * param0, void * param1) +static void ov17_02248198(SysTask *param0, void *param1) { - UnkStruct_ov17_02248198 * v0 = param1; + UnkStruct_ov17_02248198 *v0 = param1; int v1; v1 = Pokemon_DPSpriteYOffset(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_11], 2); @@ -580,19 +578,19 @@ static void ov17_02248198 (SysTask * param0, void * param1) } } -static int ov17_02248258 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02248258(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_0224826C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224826C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_022482B0 * v1; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_022482B0 *v1; v1 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_022482B0)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_022482B0)); @@ -604,9 +602,9 @@ static void ov17_0224826C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_022482B0, v1, 30000); } -static void ov17_022482B0 (SysTask * param0, void * param1) +static void ov17_022482B0(SysTask *param0, void *param1) { - UnkStruct_ov17_022482B0 * v0 = param1; + UnkStruct_ov17_022482B0 *v0 = param1; switch (v0->unk_10) { case 0: @@ -624,7 +622,7 @@ static void ov17_022482B0 (SysTask * param0, void * param1) v0->unk_13 = 1; { - u16 * v1, * v2; + u16 *v1, *v2; int v3, v4, v5, v6, v7; v1 = sub_02019FE4(v0->unk_00->unk_0C.unk_24, 2); @@ -681,19 +679,19 @@ static void ov17_022482B0 (SysTask * param0, void * param1) } } -static int ov17_0224840C (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224840C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_02248420 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02248420(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02248464 * v1; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02248464 *v1; v1 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02248464)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02248464)); @@ -705,9 +703,9 @@ static void ov17_02248420 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02248464, v1, 30000); } -static void ov17_02248464 (SysTask * param0, void * param1) +static void ov17_02248464(SysTask *param0, void *param1) { - UnkStruct_ov17_02248464 * v0 = param1; + UnkStruct_ov17_02248464 *v0 = param1; switch (v0->unk_10) { case 0: @@ -725,7 +723,7 @@ static void ov17_02248464 (SysTask * param0, void * param1) v0->unk_13 = 1; { - u16 * v1, * v2; + u16 *v1, *v2; int v3, v4, v5, v6, v7; int v8; @@ -789,20 +787,20 @@ static void ov17_02248464 (SysTask * param0, void * param1) } } -static int ov17_022485E8 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_022485E8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02249260)); return v1; } -static void ov17_022485FC (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_022485FC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_02248744 * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_02248744 *v2; v2 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02248744)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02248744)); @@ -815,9 +813,9 @@ static void ov17_022485FC (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02248648, v2, 30000); } -static void ov17_02248648 (SysTask * param0, void * param1) +static void ov17_02248648(SysTask *param0, void *param1) { - UnkStruct_ov17_02248744 * v0 = param1; + UnkStruct_ov17_02248744 *v0 = param1; switch (v0->unk_10) { case 0: @@ -844,20 +842,20 @@ static void ov17_02248648 (SysTask * param0, void * param1) } } -static int ov17_022486E4 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_022486E4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02249260)); return v1; } -static void ov17_022486F8 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_022486F8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_02248744 * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_02248744 *v2; v2 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02248744)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02248744)); @@ -870,9 +868,9 @@ static void ov17_022486F8 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02248744, v2, 30000); } -static void ov17_02248744 (SysTask * param0, void * param1) +static void ov17_02248744(SysTask *param0, void *param1) { - UnkStruct_ov17_02248744 * v0 = param1; + UnkStruct_ov17_02248744 *v0 = param1; switch (v0->unk_10) { case 0: @@ -900,20 +898,20 @@ static void ov17_02248744 (SysTask * param0, void * param1) } } -static int ov17_022487E8 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_022487E8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02249260)); return v1; } -static void ov17_022487FC (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_022487FC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_02248860 * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_02248860 *v2; v2 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02248860)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02248860)); @@ -931,9 +929,9 @@ static void ov17_022487FC (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02248860, v2, 30000); } -static void ov17_02248860 (SysTask * param0, void * param1) +static void ov17_02248860(SysTask *param0, void *param1) { - UnkStruct_ov17_02248860 * v0 = param1; + UnkStruct_ov17_02248860 *v0 = param1; switch (v0->unk_10) { case 0: @@ -978,17 +976,17 @@ static void ov17_02248860 (SysTask * param0, void * param1) } } -static void ov17_02248990 (UnkSPLStruct6 * param0) +static void ov17_02248990(UnkSPLStruct6 *param0) { { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; SPL_UnkInline1(param0, &v0); } } -static void ov17_022489C8 (SysTask * param0, void * param1) +static void ov17_022489C8(SysTask *param0, void *param1) { - UnkStruct_ov17_022489C8 * v0 = param1; + UnkStruct_ov17_022489C8 *v0 = param1; switch (v0->unk_14) { case 0: @@ -1012,9 +1010,9 @@ static void ov17_022489C8 (SysTask * param0, void * param1) } } -static void ov17_02248A24 (SysTask * param0, void * param1) +static void ov17_02248A24(SysTask *param0, void *param1) { - UnkStruct_ov17_02248A24 * v0 = param1; + UnkStruct_ov17_02248A24 *v0 = param1; switch (v0->unk_08) { case 0: @@ -1025,8 +1023,7 @@ static void ov17_02248A24 (SysTask * param0, void * param1) v0->unk_08++; } break; - case 1: - { + case 1: { BallThrow v1; v1.type = 14; @@ -1053,17 +1050,16 @@ static void ov17_02248A24 (SysTask * param0, void * param1) } } -static void ov17_02248AA4 (SysTask * param0, void * param1) +static void ov17_02248AA4(SysTask *param0, void *param1) { - UnkStruct_ov17_02248AA4 * v0 = param1; + UnkStruct_ov17_02248AA4 *v0 = param1; s32 v1; s32 v2, v3; v1 = Pokemon_DPSpriteYOffset(v0->unk_00->unk_0C.unk_00->unk_00[v0->unk_0E], 2); switch (v0->unk_0C) { - case 0: - { + case 0: { v0->unk_04 = 0; v0->unk_08 = 0; ov22_0225B0EC(v0->unk_00->unk_F18[v0->unk_0E].unk_00, 0, 0, FX32_ONE); @@ -1099,9 +1095,9 @@ static void ov17_02248AA4 (SysTask * param0, void * param1) } } -static void ov17_02248BE0 (SysTask * param0, void * param1) +static void ov17_02248BE0(SysTask *param0, void *param1) { - UnkStruct_ov17_02248BE0 * v0 = param1; + UnkStruct_ov17_02248BE0 *v0 = param1; switch (v0->unk_0C) { case 0: @@ -1160,20 +1156,20 @@ static void ov17_02248BE0 (SysTask * param0, void * param1) } } -static int ov17_02248D28 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02248D28(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02249260)); return v1; } -static void ov17_02248D3C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02248D3C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_02248DA4 * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_02248DA4 *v2; v2 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02248DA4)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_02248DA4)); @@ -1190,9 +1186,9 @@ static void ov17_02248D3C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02248DA4, v2, 30000); } -static void ov17_02248DA4 (SysTask * param0, void * param1) +static void ov17_02248DA4(SysTask *param0, void *param1) { - UnkStruct_ov17_02248DA4 * v0 = param1; + UnkStruct_ov17_02248DA4 *v0 = param1; switch (v0->unk_10) { case 0: @@ -1229,20 +1225,20 @@ static void ov17_02248DA4 (SysTask * param0, void * param1) } } -static int ov17_02248E58 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02248E58(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02249260)); return v1; } -static void ov17_02248E6C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02248E6C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02248EC4 * v1; - UnkStruct_ov17_02249260 * v2 = param3; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02248EC4 *v1; + UnkStruct_ov17_02249260 *v2 = param3; v1 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02248EC4)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02248EC4)); @@ -1258,9 +1254,9 @@ static void ov17_02248E6C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02248EC4, v1, 30000); } -static void ov17_02248EC4 (SysTask * param0, void * param1) +static void ov17_02248EC4(SysTask *param0, void *param1) { - UnkStruct_ov17_02248EC4 * v0 = param1; + UnkStruct_ov17_02248EC4 *v0 = param1; int v1; switch (v0->unk_10) { @@ -1283,7 +1279,7 @@ static void ov17_02248EC4 (SysTask * param0, void * param1) case 1: if (sub_0200AC1C(1) == 1) { sub_020038B0(v0->unk_00->unk_0C.unk_44, 0, 0, 0x0, 0, (13 * 16)); - sub_020038B0(v0->unk_00->unk_0C.unk_44, 2, 0, 0x0, 0, (((16 - 2) * 16))); + sub_020038B0(v0->unk_00->unk_0C.unk_44, 2, 0, 0x0, 0, ((16 - 2) * 16)); v0->unk_10++; } break; @@ -1295,19 +1291,19 @@ static void ov17_02248EC4 (SysTask * param0, void * param1) } } -static int ov17_02248FBC (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02248FBC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_02248FD0 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02248FD0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249014 * v1; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249014 *v1; v1 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_02249014)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02249014)); @@ -1319,9 +1315,9 @@ static void ov17_02248FD0 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02249014, v1, 30000); } -static void ov17_02249014 (SysTask * param0, void * param1) +static void ov17_02249014(SysTask *param0, void *param1) { - UnkStruct_ov17_02249014 * v0 = param1; + UnkStruct_ov17_02249014 *v0 = param1; int v1; v0->unk_18++; @@ -1363,7 +1359,7 @@ static void ov17_02249014 (SysTask * param0, void * param1) } { - u16 * v2, * v3; + u16 *v2, *v3; int v4, v5, v6, v7, v8; v2 = sub_02019FE4(v0->unk_00->unk_0C.unk_24, 2); @@ -1432,20 +1428,20 @@ static void ov17_02249014 (SysTask * param0, void * param1) } } -static int ov17_0224924C (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224924C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; + UnkStruct_ov17_02247A48 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_02249260)); return v1; } -static void ov17_02249260 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02249260(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_02247A48 * v0 = param1; - UnkStruct_ov17_02249260 * v1 = param3; - UnkStruct_ov17_022492AC * v2; + UnkStruct_ov17_02247A48 *v0 = param1; + UnkStruct_ov17_02249260 *v1 = param3; + UnkStruct_ov17_022492AC *v2; v2 = Heap_AllocFromHeap(22, sizeof(UnkStruct_ov17_022492AC)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_022492AC)); @@ -1458,9 +1454,9 @@ static void ov17_02249260 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_022492AC, v2, 30000); } -static void ov17_022492AC (SysTask * param0, void * param1) +static void ov17_022492AC(SysTask *param0, void *param1) { - UnkStruct_ov17_022492AC * v0 = param1; + UnkStruct_ov17_022492AC *v0 = param1; switch (v0->unk_10) { case 0: diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c index 0e84adb935..adcc9c8dd7 100644 --- a/src/overlay017/ov17_022492DC.c +++ b/src/overlay017/ov17_022492DC.c @@ -1,40 +1,38 @@ +#include "overlay017/ov17_022492DC.h" + #include #include -#include "core_sys.h" - -#include "message.h" +#include "struct_decls/font_oam.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - +#include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "sys_task_manager.h" -#include "struct_defs/sprite_manager_allocation.h" -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C48.h" + #include "overlay017/struct_ov17_0224A1EC.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" -#include "message.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" -#include "strbuf.h" #include "unk_02094EDC.h" -#include "overlay017/ov17_022492DC.h" typedef struct { s32 unk_00; @@ -53,10 +51,10 @@ typedef struct { } UnkStruct_ov17_02254630; typedef struct { - SysTask * unk_00; - u8 * unk_04; - void * unk_08; - u8 * unk_0C; + SysTask *unk_00; + u8 *unk_04; + void *unk_08; + u8 *unk_0C; UnkStruct_ov17_02254630 unk_10; u16 unk_1C; } UnkStruct_ov17_02249B30; @@ -66,9 +64,9 @@ typedef struct { s16 unk_02; union { struct { - UnkStruct_ov17_02249B30 * unk_00; - const UnkStruct_ov17_02254630 * unk_04[3]; - CellActorData * unk_10[3]; + UnkStruct_ov17_02249B30 *unk_00; + const UnkStruct_ov17_02254630 *unk_04[3]; + CellActorData *unk_10[3]; u32 unk_1C[3]; int unk_28; u16 unk_2C; @@ -79,31 +77,31 @@ typedef struct { } UnkStruct_ov17_022492DC_sub2; typedef struct { - const UnkStruct_ov17_022492DC_sub1_sub1 * unk_00; + const UnkStruct_ov17_022492DC_sub1_sub1 *unk_00; u8 unk_04; s8 unk_05; } UnkStruct_ov17_022492DC_sub1; typedef struct { - FontOAM * unk_00; + FontOAM *unk_00; SpriteManagerAllocation unk_04; u16 unk_10; } UnkStruct_ov17_02249BC4; typedef struct UnkStruct_ov17_022492DC_t { - UnkStruct_02095C48 * unk_00; - UnkStruct_ov17_0224A1EC * unk_04; - void * unk_08; - SysTask * unk_0C; + UnkStruct_02095C48 *unk_00; + UnkStruct_ov17_0224A1EC *unk_04; + void *unk_08; + SysTask *unk_0C; UnkStruct_ov17_022492DC_sub1 unk_10; - UnkStruct_02012744 * unk_18; + UnkStruct_02012744 *unk_18; UnkStruct_ov17_02249BC4 unk_1C[6]; u16 unk_88; s8 unk_8A; UnkStruct_ov17_022492DC_sub2 unk_8C; - u8 * unk_C4[3]; - u16 * unk_D0[4]; - u16 * unk_E0[2]; + u8 *unk_C4[3]; + u16 *unk_D0[4]; + u16 *unk_E0[2]; } UnkStruct_ov17_022492DC; typedef struct { @@ -127,34 +125,34 @@ typedef struct { }; u16 unk_0C_val2[4]; }; - const TouchScreenRect * unk_14; - const int * unk_18; - void (* unk_1C)(UnkStruct_ov17_022492DC * param0, int param1, int param2); - int (* unk_20)(UnkStruct_ov17_022492DC * param0, int param1); + const TouchScreenRect *unk_14; + const int *unk_18; + void (*unk_1C)(UnkStruct_ov17_022492DC *param0, int param1, int param2); + int (*unk_20)(UnkStruct_ov17_022492DC *param0, int param1); } UnkStruct_ov17_02254578; -static UnkStruct_ov17_02249B30 * ov17_02249AAC(UnkStruct_ov17_022492DC * param0, int param1, u16 param2, u32 param3, const UnkStruct_ov17_02254630 * param4, int param5); -static UnkStruct_ov17_02249B30 * ov17_02249B08(UnkStruct_ov17_022492DC * param0, int param1, u16 param2, u32 param3, const UnkStruct_ov17_02254630 * param4, int param5); -static void * ov17_022492DC(void); -static void ov17_022498E8(UnkStruct_ov17_022492DC * param0, int param1, int param2); -static int ov17_02249A0C(UnkStruct_ov17_022492DC * param0, int param1); -static BOOL ov17_02249B30(UnkStruct_ov17_02249B30 * param0); -static void ov17_02249B54(UnkStruct_ov17_02249B30 * param0); -static void ov17_02249D3C(UnkStruct_ov17_022492DC * param0, int param1); -static void ov17_02249D50(SysTaskFunc param0, UnkStruct_ov17_022492DC * param1); -static void ov17_02249D80(UnkStruct_ov17_022492DC * param0); -static void ov17_02249DA0(SysTask * param0, void * param1); -static void ov17_0224A038(SysTask * param0, void * param1); -static void ov17_0224A088(SysTask * param0, void * param1); -static void ov17_0224A0C8(SysTask * param0, void * param1); -static void ov17_022498F4(UnkStruct_ov17_022492DC * param0); -static void ov17_02249BC4(UnkStruct_ov17_022492DC * param0, UnkStruct_ov17_02249BC4 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9); -static void ov17_02249CD0(UnkStruct_ov17_022492DC * param0); -static void ov17_02249CFC(UnkStruct_ov17_022492DC * param0, int param1); -static void ov17_02249828(UnkStruct_ov17_022492DC * param0); -static void ov17_0224981C(UnkStruct_ov17_022492DC * param0, int param1, int param2); -static void ov17_022493DC(UnkStruct_ov17_022492DC * param0); -static void ov17_022495F8(UnkStruct_ov17_022492DC * param0); +static UnkStruct_ov17_02249B30 *ov17_02249AAC(UnkStruct_ov17_022492DC *param0, int param1, u16 param2, u32 param3, const UnkStruct_ov17_02254630 *param4, int param5); +static UnkStruct_ov17_02249B30 *ov17_02249B08(UnkStruct_ov17_022492DC *param0, int param1, u16 param2, u32 param3, const UnkStruct_ov17_02254630 *param4, int param5); +static void *ov17_022492DC(void); +static void ov17_022498E8(UnkStruct_ov17_022492DC *param0, int param1, int param2); +static int ov17_02249A0C(UnkStruct_ov17_022492DC *param0, int param1); +static BOOL ov17_02249B30(UnkStruct_ov17_02249B30 *param0); +static void ov17_02249B54(UnkStruct_ov17_02249B30 *param0); +static void ov17_02249D3C(UnkStruct_ov17_022492DC *param0, int param1); +static void ov17_02249D50(SysTaskFunc param0, UnkStruct_ov17_022492DC *param1); +static void ov17_02249D80(UnkStruct_ov17_022492DC *param0); +static void ov17_02249DA0(SysTask *param0, void *param1); +static void ov17_0224A038(SysTask *param0, void *param1); +static void ov17_0224A088(SysTask *param0, void *param1); +static void ov17_0224A0C8(SysTask *param0, void *param1); +static void ov17_022498F4(UnkStruct_ov17_022492DC *param0); +static void ov17_02249BC4(UnkStruct_ov17_022492DC *param0, UnkStruct_ov17_02249BC4 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9); +static void ov17_02249CD0(UnkStruct_ov17_022492DC *param0); +static void ov17_02249CFC(UnkStruct_ov17_022492DC *param0, int param1); +static void ov17_02249828(UnkStruct_ov17_022492DC *param0); +static void ov17_0224981C(UnkStruct_ov17_022492DC *param0, int param1, int param2); +static void ov17_022493DC(UnkStruct_ov17_022492DC *param0); +static void ov17_022495F8(UnkStruct_ov17_022492DC *param0); static const UnkStruct_ov97_0222DB78 Unk_ov17_022545C0[] = { { @@ -170,7 +168,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov17_022545C0[] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -185,7 +183,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov17_022545C0[] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -200,7 +198,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov17_022545C0[] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -215,16 +213,16 @@ static const UnkStruct_ov97_0222DB78 Unk_ov17_022545C0[] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0, + }, }; static const TouchScreenRect Unk_ov17_02254564[] = { - {0x0, 0x50, 0x58, 0xA8}, - {0x60, 0xB0, 0x58, 0xA8}, - {0x28, 0x78, 0x8, 0x58}, - {0x28, 0x78, 0xA8, 0xF8}, - {0xFF, 0x0, 0x0, 0x0} + { 0x0, 0x50, 0x58, 0xA8 }, + { 0x60, 0xB0, 0x58, 0xA8 }, + { 0x28, 0x78, 0x8, 0x58 }, + { 0x28, 0x78, 0xA8, 0xF8 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const int Unk_ov17_02254554[NELEMS(Unk_ov17_02254564) - 1] = { @@ -238,49 +236,49 @@ static const UnkStruct_ov17_02254578 Unk_ov17_02254578[] = { { 0x0, 0x0, - {0x0, 0xFFFF, 0x1, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { 0x0, 0xFFFF, 0x1, 0xFFFF }, + { 0x2, 0x1, 0x3, 0x0 }, NULL, NULL, ov17_0224981C, - NULL + NULL, }, { 0x1, 0x1, - {0x2, 0xFFFF, 0x3, 0xFFFF}, - {0x2, 0x1, 0x3, 0x0}, + { 0x2, 0xFFFF, 0x3, 0xFFFF }, + { 0x2, 0x1, 0x3, 0x0 }, Unk_ov17_02254564, Unk_ov17_02254554, ov17_022498E8, - ov17_02249A0C - } + ov17_02249A0C, + }, }; static const UnkStruct_ov17_02254630 Unk_ov17_02254630[][4] = { { - {0x0, 0x0, 0xC, 0x0, 0x6, 0xC}, - {0x12, 0x0, 0xC, 0x0, 0x6, 0xC}, - {0x6, 0x0, 0xC, 0x0, 0x6, 0xC}, - {0xC, 0x0, 0xC, 0x0, 0x6, 0xC} + { 0x0, 0x0, 0xC, 0x0, 0x6, 0xC }, + { 0x12, 0x0, 0xC, 0x0, 0x6, 0xC }, + { 0x6, 0x0, 0xC, 0x0, 0x6, 0xC }, + { 0xC, 0x0, 0xC, 0x0, 0x6, 0xC }, }, { - {0x0, 0x0, 0x6, 0x0, 0x6, 0xC}, - {0x12, 0x0, 0x6, 0x0, 0x6, 0xC}, - {0x6, 0x0, 0x6, 0x0, 0x6, 0xC}, - {0xC, 0x0, 0x6, 0x0, 0x6, 0xC} + { 0x0, 0x0, 0x6, 0x0, 0x6, 0xC }, + { 0x12, 0x0, 0x6, 0x0, 0x6, 0xC }, + { 0x6, 0x0, 0x6, 0x0, 0x6, 0xC }, + { 0xC, 0x0, 0x6, 0x0, 0x6, 0xC }, }, { - {0x0, 0x0, 0x0, 0x0, 0x6, 0xC}, - {0x12, 0x0, 0x0, 0x0, 0x6, 0xC}, - {0x6, 0x0, 0x0, 0x0, 0x6, 0xC}, - {0xC, 0x0, 0x0, 0x0, 0x6, 0xC} - } + { 0x0, 0x0, 0x0, 0x0, 0x6, 0xC }, + { 0x12, 0x0, 0x0, 0x0, 0x6, 0xC }, + { 0x6, 0x0, 0x0, 0x0, 0x6, 0xC }, + { 0xC, 0x0, 0x0, 0x0, 0x6, 0xC }, + }, }; -static void * ov17_022492DC (void) +static void *ov17_022492DC(void) { - UnkStruct_ov17_022492DC * v0; + UnkStruct_ov17_022492DC *v0; v0 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_022492DC)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_022492DC)); @@ -289,7 +287,7 @@ static void * ov17_022492DC (void) return v0; } -void ov17_02249300 (BGL * param0) +void ov17_02249300(BGL *param0) { int v0; @@ -301,7 +299,7 @@ void ov17_02249300 (BGL * param0) } } -void ov17_02249358 (BGL * param0) +void ov17_02249358(BGL *param0) { int v0; @@ -311,9 +309,9 @@ void ov17_02249358 (BGL * param0) } } -void * ov17_02249380 (UnkStruct_02095C48 * param0, UnkStruct_ov17_0224A1EC * param1) +void *ov17_02249380(UnkStruct_02095C48 *param0, UnkStruct_ov17_0224A1EC *param1) { - UnkStruct_ov17_022492DC * v0; + UnkStruct_ov17_022492DC *v0; v0 = ov17_022492DC(); @@ -326,7 +324,7 @@ void * ov17_02249380 (UnkStruct_02095C48 * param0, UnkStruct_ov17_0224A1EC * par return v0; } -void ov17_022493A4 (UnkStruct_ov17_022492DC * param0) +void ov17_022493A4(UnkStruct_ov17_022492DC *param0) { ov17_022495F8(param0); ov17_02249D3C(param0, 1); @@ -335,18 +333,18 @@ void ov17_022493A4 (UnkStruct_ov17_022492DC * param0) Heap_FreeToHeap(param0); } -void ov17_022493C4 (UnkStruct_ov17_022492DC * param0) +void ov17_022493C4(UnkStruct_ov17_022492DC *param0) { ov17_02249828(param0); ov17_022498F4(param0); ov17_02249CFC(param0, 0); } -static void ov17_022493DC (UnkStruct_ov17_022492DC * param0) +static void ov17_022493DC(UnkStruct_ov17_022492DC *param0) { - NNSG2dCharacterData * v0; - NNSG2dScreenData * v1; - void * v2; + NNSG2dCharacterData *v0; + NNSG2dScreenData *v1; + void *v2; param0->unk_C4[0] = Heap_AllocFromHeap(23, (0x8000 - (0x800 * 4))); param0->unk_C4[1] = Heap_AllocFromHeap(23, (0x8000 - (0x800 * 4))); @@ -393,7 +391,7 @@ static void ov17_022493DC (UnkStruct_ov17_022492DC * param0) sub_020030E4(45, 33, 23, 0x200, 0, param0->unk_E0[1]); } -static void ov17_022495F8 (UnkStruct_ov17_022492DC * param0) +static void ov17_022495F8(UnkStruct_ov17_022492DC *param0) { int v0; @@ -410,13 +408,13 @@ static void ov17_022495F8 (UnkStruct_ov17_022492DC * param0) } } -void ov17_02249640 (UnkStruct_ov17_022492DC * param0, int param1, int param2, void * param3) +void ov17_02249640(UnkStruct_ov17_022492DC *param0, int param1, int param2, void *param3) { - const UnkStruct_ov17_02254578 * v0, * v1; + const UnkStruct_ov17_02254578 *v0, *v1; int v2; - BGL * v3; - SpriteRenderer * v4; - SpriteGfxHandler * v5; + BGL *v3; + SpriteRenderer *v4; + SpriteGfxHandler *v5; param0->unk_08 = param3; @@ -466,10 +464,10 @@ void ov17_02249640 (UnkStruct_ov17_022492DC * param0, int param1, int param2, vo SysTask_ExecuteAfterVBlank(ov17_0224A038, param0, 10); } -int ov17_02249760 (UnkStruct_ov17_022492DC * param0) +int ov17_02249760(UnkStruct_ov17_022492DC *param0) { int v0, v1, v2; - const UnkStruct_ov17_02254578 * v3; + const UnkStruct_ov17_02254578 *v3; GF_ASSERT(param0->unk_8A != -1); v3 = &Unk_ov17_02254578[param0->unk_8A]; @@ -508,7 +506,7 @@ int ov17_02249760 (UnkStruct_ov17_022492DC * param0) return v0; } -BOOL ov17_02249804 (UnkStruct_ov17_022492DC * param0) +BOOL ov17_02249804(UnkStruct_ov17_022492DC *param0) { if (param0->unk_0C == NULL) { return 1; @@ -517,21 +515,21 @@ BOOL ov17_02249804 (UnkStruct_ov17_022492DC * param0) return 0; } -int ov17_02249814 (UnkStruct_ov17_022492DC * param0) +int ov17_02249814(UnkStruct_ov17_022492DC *param0) { return param0->unk_8A; } -static void ov17_0224981C (UnkStruct_ov17_022492DC * param0, int param1, int param2) +static void ov17_0224981C(UnkStruct_ov17_022492DC *param0, int param1, int param2) { ov17_02249CFC(param0, 1); } -static void ov17_02249828 (UnkStruct_ov17_022492DC * param0) +static void ov17_02249828(UnkStruct_ov17_022492DC *param0) { - Strbuf* v0, * v1; + Strbuf *v0, *v1; u32 v2, v3; - MessageLoader * v4; + MessageLoader *v4; v4 = MessageLoader_Init(1, 26, 204, 23); v2 = sub_02095848(param0->unk_04->unk_00->unk_110, param0->unk_04->unk_00->unk_111, param0->unk_00->unk_155); @@ -547,15 +545,15 @@ static void ov17_02249828 (UnkStruct_ov17_022492DC * param0) MessageLoader_Free(v4); } -static void ov17_022498E8 (UnkStruct_ov17_022492DC * param0, int param1, int param2) +static void ov17_022498E8(UnkStruct_ov17_022492DC *param0, int param1, int param2) { ov17_02249CFC(param0, 1); } -static void ov17_022498F4 (UnkStruct_ov17_022492DC * param0) +static void ov17_022498F4(UnkStruct_ov17_022492DC *param0) { - Strbuf* v0, * v1, * v2, * v3; - MessageLoader * v4; + Strbuf *v0, *v1, *v2, *v3; + MessageLoader *v4; v4 = param0->unk_04->unk_84; @@ -580,7 +578,7 @@ static void ov17_022498F4 (UnkStruct_ov17_022492DC * param0) Strbuf_Free(v3); } -static int ov17_02249A0C (UnkStruct_ov17_022492DC * param0, int param1) +static int ov17_02249A0C(UnkStruct_ov17_022492DC *param0, int param1) { int v0; @@ -618,9 +616,9 @@ static int ov17_02249A0C (UnkStruct_ov17_022492DC * param0, int param1) return param1; } -static UnkStruct_ov17_02249B30 * ov17_02249AAC (UnkStruct_ov17_022492DC * param0, int param1, u16 param2, u32 param3, const UnkStruct_ov17_02254630 * param4, int param5) +static UnkStruct_ov17_02249B30 *ov17_02249AAC(UnkStruct_ov17_022492DC *param0, int param1, u16 param2, u32 param3, const UnkStruct_ov17_02254630 *param4, int param5) { - UnkStruct_ov17_02249B30 * v0; + UnkStruct_ov17_02249B30 *v0; v0 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_02249B30)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02249B30)); @@ -636,9 +634,9 @@ static UnkStruct_ov17_02249B30 * ov17_02249AAC (UnkStruct_ov17_022492DC * param0 return v0; } -static UnkStruct_ov17_02249B30 * ov17_02249B08 (UnkStruct_ov17_022492DC * param0, int param1, u16 param2, u32 param3, const UnkStruct_ov17_02254630 * param4, int param5) +static UnkStruct_ov17_02249B30 *ov17_02249B08(UnkStruct_ov17_022492DC *param0, int param1, u16 param2, u32 param3, const UnkStruct_ov17_02254630 *param4, int param5) { - UnkStruct_ov17_02249B30 * v0; + UnkStruct_ov17_02249B30 *v0; v0 = ov17_02249AAC(param0, param1, param2, param3, param4, param5); v0->unk_00 = SysTask_ExecuteAfterVBlank(ov17_0224A0C8, v0, 20); @@ -646,7 +644,7 @@ static UnkStruct_ov17_02249B30 * ov17_02249B08 (UnkStruct_ov17_022492DC * param0 return v0; } -static BOOL ov17_02249B30 (UnkStruct_ov17_02249B30 * param0) +static BOOL ov17_02249B30(UnkStruct_ov17_02249B30 *param0) { if (param0->unk_00 == NULL) { if (param0->unk_08 != NULL) { @@ -660,7 +658,7 @@ static BOOL ov17_02249B30 (UnkStruct_ov17_02249B30 * param0) return 0; } -static void ov17_02249B54 (UnkStruct_ov17_02249B30 * param0) +static void ov17_02249B54(UnkStruct_ov17_02249B30 *param0) { int v0, v1, v2; u32 v3, v4; @@ -678,15 +676,15 @@ static void ov17_02249B54 (UnkStruct_ov17_02249B30 * param0) } } -static void ov17_02249BC4 (UnkStruct_ov17_022492DC * param0, UnkStruct_ov17_02249BC4 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9) +static void ov17_02249BC4(UnkStruct_ov17_022492DC *param0, UnkStruct_ov17_02249BC4 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9) { UnkStruct_020127E8 v0; Window v1; SpriteManagerAllocation v2; int v3; - FontOAM * v4; - BGL * v5; - SpriteGfxHandler * v6; + FontOAM *v4; + BGL *v5; + SpriteGfxHandler *v6; int v7, v8; GF_ASSERT(param1->unk_00 == NULL); @@ -742,7 +740,7 @@ static void ov17_02249BC4 (UnkStruct_ov17_022492DC * param0, UnkStruct_ov17_0224 param1->unk_10 = v7; } -static void ov17_02249CD0 (UnkStruct_ov17_022492DC * param0) +static void ov17_02249CD0(UnkStruct_ov17_022492DC *param0) { int v0; @@ -755,9 +753,9 @@ static void ov17_02249CD0 (UnkStruct_ov17_022492DC * param0) } } -static void ov17_02249CFC (UnkStruct_ov17_022492DC * param0, int param1) +static void ov17_02249CFC(UnkStruct_ov17_022492DC *param0, int param1) { - SpriteGfxHandler * v0; + SpriteGfxHandler *v0; int v1; int v2, v3; @@ -783,7 +781,7 @@ static void ov17_02249CFC (UnkStruct_ov17_022492DC * param0, int param1) } } -static void ov17_02249D3C (UnkStruct_ov17_022492DC * param0, int param1) +static void ov17_02249D3C(UnkStruct_ov17_022492DC *param0, int param1) { if (param1 == 1) { ov17_02249CD0(param0); @@ -792,7 +790,7 @@ static void ov17_02249D3C (UnkStruct_ov17_022492DC * param0, int param1) } } -static void ov17_02249D50 (SysTaskFunc param0, UnkStruct_ov17_022492DC * param1) +static void ov17_02249D50(SysTaskFunc param0, UnkStruct_ov17_022492DC *param1) { GF_ASSERT(param1->unk_0C == NULL); @@ -800,7 +798,7 @@ static void ov17_02249D50 (SysTaskFunc param0, UnkStruct_ov17_022492DC * param1) param1->unk_0C = SysTask_Start(param0, param1, 1300); } -static void ov17_02249D80 (UnkStruct_ov17_022492DC * param0) +static void ov17_02249D80(UnkStruct_ov17_022492DC *param0) { if (param0->unk_0C != NULL) { SysTask_Done(param0->unk_0C); @@ -809,10 +807,10 @@ static void ov17_02249D80 (UnkStruct_ov17_022492DC * param0) } } -static void ov17_02249DA0 (SysTask * param0, void * param1) +static void ov17_02249DA0(SysTask *param0, void *param1) { - UnkStruct_ov17_022492DC * v0 = param1; - BGL * v1; + UnkStruct_ov17_022492DC *v0 = param1; + BGL *v1; int v2, v3; int v4; @@ -912,10 +910,10 @@ static void ov17_02249DA0 (SysTask * param0, void * param1) } } -static void ov17_0224A038 (SysTask * param0, void * param1) +static void ov17_0224A038(SysTask *param0, void *param1) { - UnkStruct_ov17_022492DC * v0 = param1; - const UnkStruct_ov17_02254578 * v1; + UnkStruct_ov17_022492DC *v0 = param1; + const UnkStruct_ov17_02254578 *v1; int v2; v1 = &Unk_ov17_02254578[v0->unk_8A]; @@ -931,9 +929,9 @@ static void ov17_0224A038 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov17_0224A088 (SysTask * param0, void * param1) +static void ov17_0224A088(SysTask *param0, void *param1) { - UnkStruct_ov17_022492DC * v0 = param1; + UnkStruct_ov17_022492DC *v0 = param1; if (v0->unk_88 != 0xffff) { sub_0201958C(v0->unk_04->unk_60, 4, v0->unk_C4[v0->unk_88], (0x8000 - (0x800 * 4)), 0); @@ -943,16 +941,16 @@ static void ov17_0224A088 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov17_0224A0C8 (SysTask * param0, void * param1) +static void ov17_0224A0C8(SysTask *param0, void *param1) { - UnkStruct_ov17_02249B30 * v0 = param1; + UnkStruct_ov17_02249B30 *v0 = param1; ov17_02249B54(v0); v0->unk_00 = NULL; SysTask_Done(param0); } -void ov17_0224A0E0 (UnkStruct_ov17_022492DC * param0, u16 param1, u8 param2) +void ov17_0224A0E0(UnkStruct_ov17_022492DC *param0, u16 param1, u8 param2) { sub_020039B0(param0->unk_04->unk_90, 1, (0 * 16), (16 * 4), param2, param1); } diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index e6d7424bfb..8144fcb550 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -1,21 +1,18 @@ -#include -#include +#include "overlay017/ov17_0224A0FC.h" #include +#include +#include -#include "assert.h" -#include "inlines.h" - -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" -#include "message.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "overlay022/struct_ov22_0225B1BC_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" + +#include "overlay017/ov17_0223DAD0.h" +#include "overlay017/ov17_0223F118.h" #include "overlay017/struct_ov17_0224A1EC.h" #include "overlay017/struct_ov17_0224A8D4.h" #include "overlay017/struct_ov17_0224ABFC.h" @@ -34,40 +31,39 @@ #include "overlay017/struct_ov17_0224EDE0.h" #include "overlay017/struct_ov17_02253084.h" #include "overlay017/struct_ov17_0225470C.h" +#include "overlay022/ov22_0225AF8C.h" #include "overlay022/struct_ov22_0225AF8C.h" -#include "struct_defs/sprite_template.h" +#include "overlay022/struct_ov22_0225B1BC_decl.h" +#include "assert.h" +#include "game_options.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "pokemon.h" #include "spl.h" - +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_02012744.h" #include "unk_02014000.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" -#include "pokemon.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" -#include "overlay017/ov17_0223DAD0.h" -#include "overlay017/ov17_0223F118.h" -#include "overlay017/ov17_0224A0FC.h" -#include "overlay022/ov22_0225AF8C.h" typedef struct { - UnkStruct_ov17_0224DF54 * unk_00; - UnkStruct_ov17_0224B09C * unk_04; - UnkStruct_ov17_0224ABFC * unk_08; - u8 * unk_0C; + UnkStruct_ov17_0224DF54 *unk_00; + UnkStruct_ov17_0224B09C *unk_04; + UnkStruct_ov17_0224ABFC *unk_08; + u8 *unk_0C; u8 unk_10; u8 unk_11; s32 unk_14; @@ -79,8 +75,8 @@ typedef struct { } UnkStruct_ov17_0224C6B0; typedef struct { - UnkStruct_ov22_0225B1BC * unk_00; - u8 * unk_04; + UnkStruct_ov22_0225B1BC *unk_00; + u8 *unk_04; GXRgb unk_08; GXRgb unk_0A; u16 unk_0C; @@ -88,45 +84,45 @@ typedef struct { u8 unk_10; } UnkStruct_ov17_0224CEE4; -static void ov17_0224A8D4(SysTask * param0, void * param1); -static void ov17_0224AA68(SysTask * param0, void * param1); -static void ov17_0224B528(UnkStruct_ov17_0224DF54 * param0, int param1, int param2, int param3, int param4, int param5); -static void ov17_0224B5F0(SysTask * param0, void * param1); -void ov17_0224BD00(UnkStruct_ov17_0224DF54 * param0); -void ov17_0224BD28(UnkStruct_ov17_0224DF54 * param0, int param1, int param2); -int ov17_0224BDF0(UnkStruct_ov17_0224DF54 * param0, int param1); -int ov17_0224BE24(UnkStruct_ov17_0224DF54 * param0, int param1); -static void ov17_0224BE50(SysTask * param0, void * param1); -static void ov17_0224BE64(UnkStruct_ov17_0224BE50 * param0); -static void ov17_0224BF58(UnkStruct_ov17_0224BE50 * param0); -static void ov17_0224C414(SysTask * param0, void * param1); -static BOOL ov17_0224B7BC(UnkStruct_ov17_0224B7BC * param0, Sprite * param1, UnkStruct_ov17_0224B09C * param2, int param3, int param4, int param5, UnkStruct_ov17_0224ABFC * param6, u32 param7); -static BOOL ov17_0224B8D0(UnkStruct_ov17_0224B7BC * param0, Sprite * param1, UnkStruct_ov17_0224B09C * param2, int param3, int param4, int param5, int param6, u32 param7); -static BOOL ov17_0224BA50(UnkStruct_ov17_0224B7BC * param0, Sprite * param1, UnkStruct_ov17_0224B09C * param2, int param3, int param4, int param5, int param6, u32 param7); -static void ov17_0224ABFC(SysTask * param0, void * param1); +static void ov17_0224A8D4(SysTask *param0, void *param1); +static void ov17_0224AA68(SysTask *param0, void *param1); +static void ov17_0224B528(UnkStruct_ov17_0224DF54 *param0, int param1, int param2, int param3, int param4, int param5); +static void ov17_0224B5F0(SysTask *param0, void *param1); +void ov17_0224BD00(UnkStruct_ov17_0224DF54 *param0); +void ov17_0224BD28(UnkStruct_ov17_0224DF54 *param0, int param1, int param2); +int ov17_0224BDF0(UnkStruct_ov17_0224DF54 *param0, int param1); +int ov17_0224BE24(UnkStruct_ov17_0224DF54 *param0, int param1); +static void ov17_0224BE50(SysTask *param0, void *param1); +static void ov17_0224BE64(UnkStruct_ov17_0224BE50 *param0); +static void ov17_0224BF58(UnkStruct_ov17_0224BE50 *param0); +static void ov17_0224C414(SysTask *param0, void *param1); +static BOOL ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, UnkStruct_ov17_0224ABFC *param6, u32 param7); +static BOOL ov17_0224B8D0(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7); +static BOOL ov17_0224BA50(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7); +static void ov17_0224ABFC(SysTask *param0, void *param1); static int ov17_0224B06C(int param0); -static void ov17_0224AE84(SysTask * param0, void * param1); -static void ov17_0224C718(SysTask * param0, void * param1); -void ov17_0224C89C(UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_0224EDE0 * param1); -static void ov17_0224CA28(SysTask * param0, void * param1); -static void ov17_0224CAC0(UnkSPLStruct6 * param0); -static void ov17_0224CB00(UnkStruct_ov17_0224DF54 * param0, int param1, int param2); -static void ov17_0224CB80(UnkStruct_ov17_0224DF54 * param0, int param1); -void ov17_0224CD84(UnkStruct_ov17_0224DF54 * param0, u32 param1, u32 param2, int param3, int param4, u16 param5); -static void ov17_0224CD60(SysTask * param0, void * param1); -static void ov17_0224CF4C(SysTask * param0, void * param1); -static void ov17_0224C7B8(SysTask * param0, void * param1); +static void ov17_0224AE84(SysTask *param0, void *param1); +static void ov17_0224C718(SysTask *param0, void *param1); +void ov17_0224C89C(UnkStruct_ov17_0224DF54 *param0, const UnkStruct_ov17_0224EDE0 *param1); +static void ov17_0224CA28(SysTask *param0, void *param1); +static void ov17_0224CAC0(UnkSPLStruct6 *param0); +static void ov17_0224CB00(UnkStruct_ov17_0224DF54 *param0, int param1, int param2); +static void ov17_0224CB80(UnkStruct_ov17_0224DF54 *param0, int param1); +void ov17_0224CD84(UnkStruct_ov17_0224DF54 *param0, u32 param1, u32 param2, int param3, int param4, u16 param5); +static void ov17_0224CD60(SysTask *param0, void *param1); +static void ov17_0224CF4C(SysTask *param0, void *param1); +static void ov17_0224C7B8(SysTask *param0, void *param1); __attribute__((aligned(4))) static const struct { u16 unk_00; u16 unk_02; } Unk_ov17_022546DC[] = { - {0x0, 0x0}, - {0x1F, 0x7}, - {0x7C00, 0x7}, - {0x3E0, 0x7}, - {0x27FF, 0x8}, - {0x0, 0x7} + { 0x0, 0x0 }, + { 0x1F, 0x7 }, + { 0x7C00, 0x7 }, + { 0x3E0, 0x7 }, + { 0x27FF, 0x8 }, + { 0x0, 0x7 } }; __attribute__((aligned(4))) static const u8 Unk_ov17_022549C0[] = { @@ -137,17 +133,17 @@ __attribute__((aligned(4))) static const u8 Unk_ov17_022549C0[] = { }; __attribute__((aligned(4))) static const s16 Unk_ov17_022546F4[4][3] = { - {0x80, 0x60, 0xFFFFFFFFFFFFFE00}, - {0x30, 0x28, 0xFFFFFFFFFFFFFD80}, - {0x80, 0x28, 0xFFFFFFFFFFFFFD80}, - {0xD0, 0x28, 0xFFFFFFFFFFFFFD80} + { 0x80, 0x60, 0xFFFFFFFFFFFFFE00 }, + { 0x30, 0x28, 0xFFFFFFFFFFFFFD80 }, + { 0x80, 0x28, 0xFFFFFFFFFFFFFD80 }, + { 0xD0, 0x28, 0xFFFFFFFFFFFFFD80 } }; __attribute__((aligned(4))) static const s16 Unk_ov17_022546CC[4][2] = { - {0x80, 0x58}, - {0x30, 0x20}, - {0x80, 0x20}, - {0xD0, 0x20} + { 0x80, 0x58 }, + { 0x30, 0x20 }, + { 0x80, 0x20 }, + { 0xD0, 0x20 } }; __attribute__((aligned(4))) static const u8 Unk_ov17_022549BC[] = { @@ -165,7 +161,7 @@ static const SpriteTemplate Unk_ov17_02254760 = { 0x2D, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80EB, 0x80E9, 0x80EB, 0x80EB, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80EB, 0x80E9, 0x80EB, 0x80EB, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -178,7 +174,7 @@ static const SpriteTemplate Unk_ov17_02254794 = { 0xD, 0x3, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80EF, 0x80E9, 0x80EC, 0x80EC, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80EF, 0x80E9, 0x80EC, 0x80EC, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -191,7 +187,7 @@ static const SpriteTemplate Unk_ov17_022547C8 = { 0x2E, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80F0, 0x80E9, 0x80ED, 0x80ED, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F0, 0x80E9, 0x80ED, 0x80ED, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -204,7 +200,7 @@ static const SpriteTemplate Unk_ov17_022547FC = { 0xB, 0x5, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80F1, 0x80E9, 0x80EE, 0x80EE, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F1, 0x80E9, 0x80EE, 0x80EE, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -217,7 +213,7 @@ static const SpriteTemplate Unk_ov17_02254830 = { 0x30, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80F2, 0x80E9, 0x80EF, 0x80EF, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F2, 0x80E9, 0x80EF, 0x80EF, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -230,7 +226,7 @@ static const SpriteTemplate Unk_ov17_02254864 = { 0x2F, 0x3, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80F4, 0x80E9, 0x80F1, 0x80F1, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F4, 0x80E9, 0x80F1, 0x80F1, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -243,20 +239,20 @@ static const SpriteTemplate Unk_ov17_0225472C = { 0xE, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80F5, 0x80E9, 0x80F2, 0x80F2, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F5, 0x80E9, 0x80F2, 0x80F2, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; static const UnkStruct_ov17_0225470C Unk_ov17_0225470C[] = { - {0x0, 0x0}, - {0x8, 0x6}, - {0x14, 0x1}, - {0xB, 0x0}, - {0x9, 0x3}, - {0xA, 0x3}, - {0x12, 0x4}, - {0x13, 0x0} + { 0x0, 0x0 }, + { 0x8, 0x6 }, + { 0x14, 0x1 }, + { 0xB, 0x0 }, + { 0x9, 0x3 }, + { 0xA, 0x3 }, + { 0x12, 0x4 }, + { 0x13, 0x0 } }; __attribute__((aligned(4))) static const s32 Unk_ov17_02254938[(16 * 2) + 1] = { @@ -323,27 +319,27 @@ __attribute__((aligned(4))) static const s32 Unk_ov17_022548D4[(12 * 2) + 1] = { 0x6274 }; -static const s32 * const Unk_ov17_022546C4[] = { +static const s32 *const Unk_ov17_022546C4[] = { Unk_ov17_02254938, Unk_ov17_022548D4 }; -s16 ov17_0224A0FC (int param0) +s16 ov17_0224A0FC(int param0) { return Unk_ov17_022546F4[param0][0]; } -s16 ov17_0224A10C (int param0) +s16 ov17_0224A10C(int param0) { return Unk_ov17_022546F4[param0][1]; } -s16 ov17_0224A120 (int param0) +s16 ov17_0224A120(int param0) { return Unk_ov17_022546F4[param0][2]; } -void ov17_0224A134 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224A134(UnkStruct_ov17_0224DF54 *param0) { int v0; UnkStruct_ov22_0225AF8C v1; @@ -379,7 +375,7 @@ void ov17_0224A134 (UnkStruct_ov17_0224DF54 * param0) } } -void ov17_0224A1EC (UnkStruct_ov17_0224A1EC * param0) +void ov17_0224A1EC(UnkStruct_ov17_0224A1EC *param0) { int v0; @@ -390,12 +386,12 @@ void ov17_0224A1EC (UnkStruct_ov17_0224A1EC * param0) } } -void ov17_0224A20C (SpriteRenderer * param0, SpriteGfxHandler * param1) +void ov17_0224A20C(SpriteRenderer *param0, SpriteGfxHandler *param1) { return; } -void ov17_0224A210 (SpriteGfxHandler * param0) +void ov17_0224A210(SpriteGfxHandler *param0) { return; } @@ -433,7 +429,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov17_02254898[] = { 0x2311 }; -void ov17_0224A214 (UnkStruct_ov17_0224A1EC * param0, int param1, int param2) +void ov17_0224A214(UnkStruct_ov17_0224A1EC *param0, int param1, int param2) { int v0, v1, v2; int v3, v4, v5; @@ -450,7 +446,7 @@ void ov17_0224A214 (UnkStruct_ov17_0224A1EC * param0, int param1, int param2) v2 = param1 % 8; { - u16 * v6; + u16 *v6; v6 = sub_02019FE4(param0->unk_60, 3); v6 = &v6[32 * 0x13 + v5]; @@ -474,7 +470,7 @@ void ov17_0224A214 (UnkStruct_ov17_0224A1EC * param0, int param1, int param2) v0++; } - for ( ; v0 < v3; v0++) { + for (; v0 < v3; v0++) { if (v0 % 8 == 0) { v6[v0] = 0x200c; } else { @@ -491,7 +487,7 @@ void ov17_0224A214 (UnkStruct_ov17_0224A1EC * param0, int param1, int param2) v0++; } - for ( ; v0 < v3; v0++) { + for (; v0 < v3; v0++) { v6[v0] = Unk_ov17_02254898[v0]; } } @@ -500,7 +496,7 @@ void ov17_0224A214 (UnkStruct_ov17_0224A1EC * param0, int param1, int param2) } } -void ov17_0224A368 (UnkStruct_ov17_0224A1EC * param0, int param1, int param2, int param3) +void ov17_0224A368(UnkStruct_ov17_0224A1EC *param0, int param1, int param2, int param3) { int v0; @@ -508,7 +504,7 @@ void ov17_0224A368 (UnkStruct_ov17_0224A1EC * param0, int param1, int param2, in ov17_0224A214(param0, v0, param3); } -void ov17_0224A390 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_0224A390(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 58, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33003); SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 59, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33004); @@ -518,7 +514,7 @@ void ov17_0224A390 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * p SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 63, 1, 33003); } -void ov17_0224A428 (SpriteGfxHandler * param0) +void ov17_0224A428(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33003); SpriteGfxHandler_UnloadCharObjById(param0, 33004); @@ -528,9 +524,9 @@ void ov17_0224A428 (SpriteGfxHandler * param0) SpriteGfxHandler_UnloadAnimObjById(param0, 33003); } -static int ov17_0224A46C (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, int param3, int param4, int param5, int param6, int param7) +static int ov17_0224A46C(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, int param3, int param4, int param5, int param6, int param7) { - CellActorData * v0; + CellActorData *v0; int v1; SpriteTemplate v2; @@ -582,7 +578,7 @@ static int ov17_0224A46C (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * par sub_0200D500(v0, param5, param6, (256 * FX32_ONE)); sub_0200D390(v0, 1); - for (v1 = 0; v1 < ((((16 * 2)) / 2) * 4 + 4); v1++) { + for (v1 = 0; v1 < (((16 * 2) / 2) * 4 + 4); v1++) { if (param0->unk_D8[v1] == NULL) { param0->unk_D8[v1] = v0; return v1; @@ -593,11 +589,11 @@ static int ov17_0224A46C (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * par return 0; } -void ov17_0224A580 (UnkStruct_ov17_0224A1EC * param0) +void ov17_0224A580(UnkStruct_ov17_0224A1EC *param0) { int v0; - for (v0 = 0; v0 < ((((16 * 2)) / 2) * 4 + 4); v0++) { + for (v0 = 0; v0 < (((16 * 2) / 2) * 4 + 4); v0++) { if (param0->unk_D8[v0] != NULL) { sub_0200D0F4(param0->unk_D8[v0]); param0->unk_D8[v0] = NULL; @@ -605,23 +601,23 @@ void ov17_0224A580 (UnkStruct_ov17_0224A1EC * param0) } } -void ov17_0224A5A8 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_0224A5A8(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 55, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33007); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 56, 1, 33004); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 57, 1, 33004); } -void ov17_0224A5F8 (SpriteGfxHandler * param0) +void ov17_0224A5F8(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33007); SpriteGfxHandler_UnloadCellObjById(param0, 33004); SpriteGfxHandler_UnloadAnimObjById(param0, 33004); } -void ov17_0224A61C (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2) +void ov17_0224A61C(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2) { - CellActorData * v0; + CellActorData *v0; int v1; for (v1 = 0; v1 < 3; v1++) { @@ -630,7 +626,7 @@ void ov17_0224A61C (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, S } } -void ov17_0224A650 (UnkStruct_ov17_0224A1EC * param0) +void ov17_0224A650(UnkStruct_ov17_0224A1EC *param0) { int v0, v1; @@ -640,10 +636,10 @@ void ov17_0224A650 (UnkStruct_ov17_0224A1EC * param0) } } -void ov17_0224A674 (UnkStruct_ov17_0224A1EC * param0) +void ov17_0224A674(UnkStruct_ov17_0224A1EC *param0) { int v0; - Strbuf* v1, * v2, * v3; + Strbuf *v1, *v2, *v3; v1 = MessageLoader_GetNewStrbuf(param0->unk_84, 5); v2 = MessageLoader_GetNewStrbuf(param0->unk_84, 6); @@ -665,7 +661,7 @@ void ov17_0224A674 (UnkStruct_ov17_0224A1EC * param0) Strbuf_Free(v3); } -void ov17_0224A7B8 (UnkStruct_ov17_0224A1EC * param0) +void ov17_0224A7B8(UnkStruct_ov17_0224A1EC *param0) { int v0, v1; @@ -676,11 +672,11 @@ void ov17_0224A7B8 (UnkStruct_ov17_0224A1EC * param0) } } -void ov17_0224A7E0 (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2, int param3, int param4, u8 param5) +void ov17_0224A7E0(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2, int param3, int param4, u8 param5) { - CellActorData * v0; + CellActorData *v0; int v1, v2, v3, v4; - UnkStruct_ov17_0224A8D4 * v5; + UnkStruct_ov17_0224A8D4 *v5; v4 = (param5 == 0) ? param5 : (param5 - 1); @@ -714,9 +710,9 @@ void ov17_0224A7E0 (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, S v5->unk_08 = SysTask_Start(ov17_0224A8D4, v5, ((30000 + 10000) + 200)); } -static void ov17_0224A8D4 (SysTask * param0, void * param1) +static void ov17_0224A8D4(SysTask *param0, void *param1) { - UnkStruct_ov17_0224A8D4 * v0 = param1; + UnkStruct_ov17_0224A8D4 *v0 = param1; int v1, v2; switch (v0->unk_10) { @@ -750,7 +746,7 @@ static void ov17_0224A8D4 (SysTask * param0, void * param1) } } -void ov17_0224A95C (UnkStruct_ov17_0224A1EC * param0) +void ov17_0224A95C(UnkStruct_ov17_0224A1EC *param0) { int v0; @@ -762,23 +758,23 @@ void ov17_0224A95C (UnkStruct_ov17_0224A1EC * param0) } } -void ov17_0224A984 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_0224A984(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 64, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33008); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 65, 1, 33005); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 66, 1, 33005); } -void ov17_0224A9D4 (SpriteGfxHandler * param0) +void ov17_0224A9D4(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33008); SpriteGfxHandler_UnloadCellObjById(param0, 33005); SpriteGfxHandler_UnloadAnimObjById(param0, 33005); } -void ov17_0224A9F8 (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2) +void ov17_0224A9F8(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2) { - CellActorData * v0; + CellActorData *v0; v0 = SpriteActor_LoadResources(param1, param2, &Unk_ov17_022547C8); SpriteActor_UpdateObject(v0->unk_00); @@ -786,7 +782,7 @@ void ov17_0224A9F8 (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, S param0->unk_1E8 = v0; } -void ov17_0224AA1C (UnkStruct_ov17_0224A1EC * param0) +void ov17_0224AA1C(UnkStruct_ov17_0224A1EC *param0) { int v0, v1; @@ -796,19 +792,19 @@ void ov17_0224AA1C (UnkStruct_ov17_0224A1EC * param0) } } -void ov17_0224AA38 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224AA38(UnkStruct_ov17_0224DF54 *param0) { param0->unk_14.unk_1EC = SysTask_Start(ov17_0224AA68, param0, (((30000 + 10000) + 100) + 10)); } -void ov17_0224AA58 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224AA58(UnkStruct_ov17_0224DF54 *param0) { SysTask_Done(param0->unk_14.unk_1EC); } -static void ov17_0224AA68 (SysTask * param0, void * param1) +static void ov17_0224AA68(SysTask *param0, void *param1) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1, v2, v3; v3 = v0->unk_00->unk_00.unk_113; @@ -818,21 +814,21 @@ static void ov17_0224AA68 (SysTask * param0, void * param1) sub_0200D500(v0->unk_14.unk_1E8, v1, v2 - 8 * 5, (256 * FX32_ONE)); } -void ov17_0224AA94 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_0224AA94(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 90, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33010); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 89, 1, 33007); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 88, 1, 33007); } -void ov17_0224AAE4 (SpriteGfxHandler * param0) +void ov17_0224AAE4(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33010); SpriteGfxHandler_UnloadCellObjById(param0, 33007); SpriteGfxHandler_UnloadAnimObjById(param0, 33007); } -void ov17_0224AB08 (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2) +void ov17_0224AB08(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2) { int v0; @@ -850,7 +846,7 @@ void ov17_0224AB08 (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, S ov17_0224ABDC(param0, 0); } -void ov17_0224ABB0 (UnkStruct_ov17_0224A1EC * param0) +void ov17_0224ABB0(UnkStruct_ov17_0224A1EC *param0) { int v0; @@ -861,7 +857,7 @@ void ov17_0224ABB0 (UnkStruct_ov17_0224A1EC * param0) } } -void ov17_0224ABDC (UnkStruct_ov17_0224A1EC * param0, int param1) +void ov17_0224ABDC(UnkStruct_ov17_0224A1EC *param0, int param1) { int v0; @@ -870,9 +866,9 @@ void ov17_0224ABDC (UnkStruct_ov17_0224A1EC * param0, int param1) } } -static void ov17_0224ABFC (SysTask * param0, void * param1) +static void ov17_0224ABFC(SysTask *param0, void *param1) { - UnkStruct_ov17_0224ABFC * v0 = param1; + UnkStruct_ov17_0224ABFC *v0 = param1; int v1, v2, v3, v4; f32 v5; @@ -901,55 +897,55 @@ static void ov17_0224ABFC (SysTask * param0, void * param1) sub_0200D6E8(v0->unk_04, v5, v5); } -void ov17_0224AC78 (UnkStruct_ov17_0224ABFC * param0, int param1, int param2) +void ov17_0224AC78(UnkStruct_ov17_0224ABFC *param0, int param1, int param2) { param0->unk_11 = param1; param0->unk_12 = param2; } -void ov17_0224AC80 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_0224AC80(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 93, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33011); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 92, 1, 33008); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 91, 1, 33008); } -void ov17_0224ACD0 (SpriteGfxHandler * param0) +void ov17_0224ACD0(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33011); SpriteGfxHandler_UnloadCellObjById(param0, 33008); SpriteGfxHandler_UnloadAnimObjById(param0, 33008); } -void ov17_0224ACF4 (UnkStruct_ov17_0224A1EC * param0, SpriteRenderer * param1, SpriteGfxHandler * param2) +void ov17_0224ACF4(UnkStruct_ov17_0224A1EC *param0, SpriteRenderer *param1, SpriteGfxHandler *param2) { return; } -void ov17_0224ACF8 (UnkStruct_ov17_0224A1EC * param0) +void ov17_0224ACF8(UnkStruct_ov17_0224A1EC *param0) { return; } -void ov17_0224ACFC (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_0224ACFC(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 96, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33012); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 95, 1, 33009); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 94, 1, 33009); } -void ov17_0224AD4C (SpriteGfxHandler * param0) +void ov17_0224AD4C(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33012); SpriteGfxHandler_UnloadCellObjById(param0, 33009); SpriteGfxHandler_UnloadAnimObjById(param0, 33009); } -BOOL ov17_0224AD70 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2) +BOOL ov17_0224AD70(UnkStruct_ov17_0224DF54 *param0, int param1, int param2) { - CellActorData * v0; + CellActorData *v0; u32 v1, v2; - UnkStruct_ov17_0224AE84 * v3; + UnkStruct_ov17_0224AE84 *v3; int v4, v5, v6; v3 = param0->unk_14.unk_290[param1]; @@ -1006,9 +1002,9 @@ BOOL ov17_0224AD70 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2) return 1; } -static void ov17_0224AE84 (SysTask * param0, void * param1) +static void ov17_0224AE84(SysTask *param0, void *param1) { - UnkStruct_ov17_0224AE84 * v0 = param1; + UnkStruct_ov17_0224AE84 *v0 = param1; s32 v1, v2; v0->unk_08 += v0->unk_10; @@ -1033,7 +1029,7 @@ static void ov17_0224AE84 (SysTask * param0, void * param1) sub_0200D500(v0->unk_04, v1, v2, (256 * FX32_ONE)); } -static void ov17_0224AF3C (UnkStruct_ov17_0224DF54 * param0, int param1, int param2, int param3) +static void ov17_0224AF3C(UnkStruct_ov17_0224DF54 *param0, int param1, int param2, int param3) { int v0, v1, v2, v3, v4; @@ -1065,24 +1061,24 @@ static void ov17_0224AF3C (UnkStruct_ov17_0224DF54 * param0, int param1, int par } } -void ov17_0224AFA8 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_0224AFA8(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 99, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33013); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 98, 1, 33010); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 97, 1, 33010); } -void ov17_0224AFF8 (SpriteGfxHandler * param0) +void ov17_0224AFF8(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33013); SpriteGfxHandler_UnloadCellObjById(param0, 33010); SpriteGfxHandler_UnloadAnimObjById(param0, 33010); } -BOOL ov17_0224B01C (UnkStruct_ov17_0224DF54 * param0) +BOOL ov17_0224B01C(UnkStruct_ov17_0224DF54 *param0) { - CellActorData * v0; - UnkStruct_ov17_0224B058 * v1; + CellActorData *v0; + UnkStruct_ov17_0224B058 *v1; v1 = ¶m0->unk_14.unk_910; v0 = SpriteActor_LoadResources(param0->unk_14.unk_58, param0->unk_14.unk_5C, &Unk_ov17_0225472C); @@ -1095,20 +1091,20 @@ BOOL ov17_0224B01C (UnkStruct_ov17_0224DF54 * param0) return 1; } -void ov17_0224B058 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224B058(UnkStruct_ov17_0224DF54 *param0) { - UnkStruct_ov17_0224B058 * v0; + UnkStruct_ov17_0224B058 *v0; v0 = ¶m0->unk_14.unk_910; sub_0200D0F4(v0->unk_04); } -void ov17_0224B068 (UnkStruct_ov17_0224A1EC * param0, int param1) +void ov17_0224B068(UnkStruct_ov17_0224A1EC *param0, int param1) { return; } -static int ov17_0224B06C (int param0) +static int ov17_0224B06C(int param0) { int v0; @@ -1124,7 +1120,7 @@ static int ov17_0224B06C (int param0) return v0; } -void ov17_0224B09C (Sprite * param0, UnkStruct_ov17_0224B09C * param1) +void ov17_0224B09C(Sprite *param0, UnkStruct_ov17_0224B09C *param1) { s32 v0, v1; @@ -1144,7 +1140,7 @@ void ov17_0224B09C (Sprite * param0, UnkStruct_ov17_0224B09C * param1) } } -void ov17_0224B0CC (UnkStruct_ov17_0224A1EC * param0) +void ov17_0224B0CC(UnkStruct_ov17_0224A1EC *param0) { int v0; @@ -1153,7 +1149,7 @@ void ov17_0224B0CC (UnkStruct_ov17_0224A1EC * param0) } } -static BOOL ov17_0224B0E8 (UnkStruct_ov17_0224DF54 * param0, int param1, const UnkStruct_ov17_0224EDE0 * param2) +static BOOL ov17_0224B0E8(UnkStruct_ov17_0224DF54 *param0, int param1, const UnkStruct_ov17_0224EDE0 *param2) { int v0; int v1, v2, v3; @@ -1170,7 +1166,7 @@ static BOOL ov17_0224B0E8 (UnkStruct_ov17_0224DF54 * param0, int param1, const U s16 v6, v7; int v8; - for (v8 = 0; v8 < ((((16 * 2)) / 2) * 4 + 4); v8++) { + for (v8 = 0; v8 < (((16 * 2) / 2) * 4 + 4); v8++) { if (param0->unk_14.unk_D8[v8] != NULL) { sub_0200D5A0(param0->unk_14.unk_D8[v8], &v6, &v7, (256 * FX32_ONE)); @@ -1193,7 +1189,7 @@ static BOOL ov17_0224B0E8 (UnkStruct_ov17_0224DF54 * param0, int param1, const U return 1; } -void ov17_0224B20C (UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_0224EDE0 * param1) +void ov17_0224B20C(UnkStruct_ov17_0224DF54 *param0, const UnkStruct_ov17_0224EDE0 *param1) { int v0, v1, v2; @@ -1330,15 +1326,15 @@ void ov17_0224B20C (UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_0224E } } -static void ov17_0224B528 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2, int param3, int param4, int param5) +static void ov17_0224B528(UnkStruct_ov17_0224DF54 *param0, int param1, int param2, int param3, int param4, int param5) { int v0, v1; - UnkStruct_ov17_0224B5C8 * v2; + UnkStruct_ov17_0224B5C8 *v2; v2 = ¶m0->unk_EA4[param1]; v1 = -1; - for (v0 = v2->unk_20; v0 < (((16 * 2))); v0++) { + for (v0 = v2->unk_20; v0 < (16 * 2); v0++) { if (v2->unk_00[v0] == 0) { v1 = v0; break; @@ -1365,20 +1361,20 @@ static void ov17_0224B528 (UnkStruct_ov17_0224DF54 * param0, int param1, int par v2->unk_23 = param5; } -void ov17_0224B59C (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224B59C(UnkStruct_ov17_0224DF54 *param0) { param0->unk_08 = SysTask_Start(ov17_0224B5F0, param0, ((30000 + 9000) + 10)); } -void ov17_0224B5B8 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224B5B8(UnkStruct_ov17_0224DF54 *param0) { SysTask_Done(param0->unk_08); param0->unk_08 = NULL; } -BOOL ov17_0224B5C8 (UnkStruct_ov17_0224DF54 * param0) +BOOL ov17_0224B5C8(UnkStruct_ov17_0224DF54 *param0) { - UnkStruct_ov17_0224B5C8 * v0; + UnkStruct_ov17_0224B5C8 *v0; int v1; for (v1 = 0; v1 < 4; v1++) { @@ -1392,10 +1388,10 @@ BOOL ov17_0224B5C8 (UnkStruct_ov17_0224DF54 * param0) return 1; } -static void ov17_0224B5F0 (SysTask * param0, void * param1) +static void ov17_0224B5F0(SysTask *param0, void *param1) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224B5C8 * v1; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224B5C8 *v1; int v2, v3, v4; u32 v5; @@ -1439,7 +1435,7 @@ static void ov17_0224B5F0 (SysTask * param0, void * param1) v1->unk_00[v1->unk_20] = 0; v1->unk_20++; - if (v1->unk_20 >= (((16 * 2)))) { + if (v1->unk_20 >= (16 * 2)) { v1->unk_20 = 0; } @@ -1449,7 +1445,7 @@ static void ov17_0224B5F0 (SysTask * param0, void * param1) } } -static inline void inline_ov17_0224B7BC (UnkStruct_ov17_0224B7BC * param0, Sprite * param1, UnkStruct_ov17_0224B09C * param2, int param3, int param4, int param5) +static inline void inline_ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5) { s32 v0, v1, v2, v3; s32 v4, v5; @@ -1485,7 +1481,7 @@ static inline void inline_ov17_0224B7BC (UnkStruct_ov17_0224B7BC * param0, Sprit ov22_0225B100(param2->unk_00, param2->unk_04, param2->unk_08); } -static BOOL ov17_0224B7BC (UnkStruct_ov17_0224B7BC * param0, Sprite * param1, UnkStruct_ov17_0224B09C * param2, int param3, int param4, int param5, UnkStruct_ov17_0224ABFC * param6, u32 param7) +static BOOL ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, UnkStruct_ov17_0224ABFC *param6, u32 param7) { BOOL v0 = 0; @@ -1532,7 +1528,7 @@ static BOOL ov17_0224B7BC (UnkStruct_ov17_0224B7BC * param0, Sprite * param1, Un return v0; } -static BOOL ov17_0224B8D0 (UnkStruct_ov17_0224B7BC * param0, Sprite * param1, UnkStruct_ov17_0224B09C * param2, int param3, int param4, int param5, int param6, u32 param7) +static BOOL ov17_0224B8D0(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7) { BOOL v0 = 0; s32 v1; @@ -1600,7 +1596,7 @@ static BOOL ov17_0224B8D0 (UnkStruct_ov17_0224B7BC * param0, Sprite * param1, Un return v0; } -static BOOL ov17_0224BA50 (UnkStruct_ov17_0224B7BC * param0, Sprite * param1, UnkStruct_ov17_0224B09C * param2, int param3, int param4, int param5, int param6, u32 param7) +static BOOL ov17_0224BA50(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7) { BOOL v0 = 0; s32 v1; @@ -1679,7 +1675,7 @@ static BOOL ov17_0224BA50 (UnkStruct_ov17_0224B7BC * param0, Sprite * param1, Un return v0; } -void ov17_0224BC4C (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224BC4C(UnkStruct_ov17_0224DF54 *param0) { int v0; @@ -1688,7 +1684,7 @@ void ov17_0224BC4C (UnkStruct_ov17_0224DF54 * param0) } } -void ov17_0224BC68 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2) +void ov17_0224BC68(UnkStruct_ov17_0224DF54 *param0, int param1, int param2) { GF_ASSERT(param0->unk_FC8[param1].unk_04 == NULL); MI_CpuClear8(¶m0->unk_FC8[param1], sizeof(UnkStruct_ov17_0224BE50)); @@ -1703,7 +1699,7 @@ void ov17_0224BC68 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2) param0->unk_FC8[param1].unk_04 = SysTask_Start(ov17_0224BE50, ¶m0->unk_FC8[param1], (30000 + 9000)); } -void ov17_0224BD00 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224BD00(UnkStruct_ov17_0224DF54 *param0) { int v0; @@ -1715,7 +1711,7 @@ void ov17_0224BD00 (UnkStruct_ov17_0224DF54 * param0) } } -void ov17_0224BD28 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2) +void ov17_0224BD28(UnkStruct_ov17_0224DF54 *param0, int param1, int param2) { if (param0->unk_FC8[param1].unk_04 == NULL) { return; @@ -1755,7 +1751,7 @@ void ov17_0224BD28 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2) } } -int ov17_0224BDF0 (UnkStruct_ov17_0224DF54 * param0, int param1) +int ov17_0224BDF0(UnkStruct_ov17_0224DF54 *param0, int param1) { if (param0->unk_FC8[param1].unk_04 == NULL) { return 1; @@ -1768,7 +1764,7 @@ int ov17_0224BDF0 (UnkStruct_ov17_0224DF54 * param0, int param1) return 0; } -int ov17_0224BE24 (UnkStruct_ov17_0224DF54 * param0, int param1) +int ov17_0224BE24(UnkStruct_ov17_0224DF54 *param0, int param1) { if (param0->unk_FC8[param1].unk_04 == NULL) { return 1; @@ -1781,15 +1777,15 @@ int ov17_0224BE24 (UnkStruct_ov17_0224DF54 * param0, int param1) return 0; } -static void ov17_0224BE50 (SysTask * param0, void * param1) +static void ov17_0224BE50(SysTask *param0, void *param1) { - UnkStruct_ov17_0224BE50 * v0 = param1; + UnkStruct_ov17_0224BE50 *v0 = param1; ov17_0224BE64(v0); ov17_0224BF58(v0); } -static void ov17_0224BE64 (UnkStruct_ov17_0224BE50 * param0) +static void ov17_0224BE64(UnkStruct_ov17_0224BE50 *param0) { u64 v0, v1; u32 v2; @@ -1828,7 +1824,7 @@ static void ov17_0224BE64 (UnkStruct_ov17_0224BE50 * param0) ov17_0224B09C(param0->unk_08, param0->unk_0C); } -static void ov17_0224BF58 (UnkStruct_ov17_0224BE50 * param0) +static void ov17_0224BF58(UnkStruct_ov17_0224BE50 *param0) { u32 v0; s32 v1, v2; @@ -1888,7 +1884,7 @@ static void ov17_0224BF58 (UnkStruct_ov17_0224BE50 * param0) ov22_0225B100(param0->unk_0C->unk_00, param0->unk_0C->unk_04, param0->unk_0C->unk_08); } -static void ov17_0224C0C0 (UnkStruct_ov17_0224DF54 * param0, int param1, const UnkStruct_ov17_0224C0C0 * param2) +static void ov17_0224C0C0(UnkStruct_ov17_0224DF54 *param0, int param1, const UnkStruct_ov17_0224C0C0 *param2) { u32 v0; @@ -1930,9 +1926,9 @@ static void ov17_0224C0C0 (UnkStruct_ov17_0224DF54 * param0, int param1, const U } } -static void ov17_0224C244 (UnkStruct_ov17_0224DF54 * param0, MessageLoader * param1, u32 param2, int param3, const UnkStruct_ov17_0224C0C0 * param4) +static void ov17_0224C244(UnkStruct_ov17_0224DF54 *param0, MessageLoader *param1, u32 param2, int param3, const UnkStruct_ov17_0224C0C0 *param4) { - Strbuf* v0; + Strbuf *v0; int v1; if (param0->unk_00->unk_155 == 0) { @@ -1951,7 +1947,7 @@ static void ov17_0224C244 (UnkStruct_ov17_0224DF54 * param0, MessageLoader * par Strbuf_Free(v0); } -void ov17_0224C2CC (UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruct_ov17_0224C0C0 * param2) +void ov17_0224C2CC(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_ov17_0224C0C0 *param2) { u32 v0, v1; @@ -1963,28 +1959,28 @@ void ov17_0224C2CC (UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruc ov17_0224C244(param0, param0->unk_14.unk_84, v0, v1, param2); } -int ov17_0224C300 (UnkStruct_ov17_0224DF54 * param0) +int ov17_0224C300(UnkStruct_ov17_0224DF54 *param0) { return Message_Printing(param0->unk_14.unk_A18); } -void ov17_0224C310 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2) +void ov17_0224C310(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param2, 76, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33009); SpriteRenderer_LoadCellResObjFromOpenNarc(param0, param1, param2, 77, 1, 33006); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, 78, 1, 33006); } -void ov17_0224C360 (SpriteGfxHandler * param0) +void ov17_0224C360(SpriteGfxHandler *param0) { SpriteGfxHandler_UnloadCharObjById(param0, 33009); SpriteGfxHandler_UnloadCellObjById(param0, 33006); SpriteGfxHandler_UnloadAnimObjById(param0, 33006); } -void ov17_0224C384 (UnkStruct_ov17_0224DF54 * param0, SpriteRenderer * param1, SpriteGfxHandler * param2) +void ov17_0224C384(UnkStruct_ov17_0224DF54 *param0, SpriteRenderer *param1, SpriteGfxHandler *param2) { - UnkStruct_ov17_0224C384 * v0; + UnkStruct_ov17_0224C384 *v0; GF_ASSERT(param0->unk_14.unk_1FC == NULL); @@ -2002,7 +1998,7 @@ void ov17_0224C384 (UnkStruct_ov17_0224DF54 * param0, SpriteRenderer * param1, S v0->unk_00 = SysTask_Start(ov17_0224C414, v0, ((30000 + 10000) + 15)); } -void ov17_0224C3E4 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224C3E4(UnkStruct_ov17_0224DF54 *param0) { SysTask_Done(param0->unk_14.unk_1FC->unk_00); sub_0200D0F4(param0->unk_14.unk_1FC->unk_04); @@ -2011,9 +2007,9 @@ void ov17_0224C3E4 (UnkStruct_ov17_0224DF54 * param0) param0->unk_14.unk_1FC = NULL; } -static void ov17_0224C414 (SysTask * param0, void * param1) +static void ov17_0224C414(SysTask *param0, void *param1) { - UnkStruct_ov17_0224C384 * v0 = param1; + UnkStruct_ov17_0224C384 *v0 = param1; switch (v0->unk_0C) { case 0: @@ -2028,7 +2024,7 @@ static void ov17_0224C414 (SysTask * param0, void * param1) SpriteActor_UpdateObject(v0->unk_04->unk_00); } -void ov17_0224C434 (UnkStruct_ov17_0224B058 * param0, u32 param1, u32 param2, int param3) +void ov17_0224C434(UnkStruct_ov17_0224B058 *param0, u32 param1, u32 param2, int param3) { u32 v0; int v1, v2; @@ -2041,13 +2037,13 @@ void ov17_0224C434 (UnkStruct_ov17_0224B058 * param0, u32 param1, u32 param2, in SpriteActor_EnableObject(param0->unk_04, 1); } -void ov17_0224C47C (UnkStruct_ov17_0224B058 * param0, int param1) +void ov17_0224C47C(UnkStruct_ov17_0224B058 *param0, int param1) { sub_0200D500(param0->unk_04, -1, (0x16 * 8), (256 * FX32_ONE)); SpriteActor_EnableObject(param0->unk_04, param1); } -void ov17_0224C49C (UnkStruct_ov17_0224C384 * param0, u32 param1, u32 param2, int param3) +void ov17_0224C49C(UnkStruct_ov17_0224C384 *param0, u32 param1, u32 param2, int param3) { u32 v0, v1, v2; int v3, v4, v5; @@ -2073,12 +2069,12 @@ void ov17_0224C49C (UnkStruct_ov17_0224C384 * param0, u32 param1, u32 param2, in SpriteActor_EnableObject(param0->unk_04, 1); } -void ov17_0224C540 (UnkStruct_ov17_0224C384 * param0) +void ov17_0224C540(UnkStruct_ov17_0224C384 *param0) { SpriteActor_EnableObject(param0->unk_04, 0); } -void ov17_0224C54C (UnkStruct_ov17_0224C384 * param0, int param1) +void ov17_0224C54C(UnkStruct_ov17_0224C384 *param0, int param1) { int v0, v1; @@ -2089,18 +2085,18 @@ void ov17_0224C54C (UnkStruct_ov17_0224C384 * param0, int param1) sub_0200D500(param0->unk_04, v1, (0x12 * 8), (256 * FX32_ONE)); } -int ov17_0224C57C (int param0) +int ov17_0224C57C(int param0) { - const u8 v0[] = {3, 3, 4, 4}; + const u8 v0[] = { 3, 3, 4, 4 }; GF_ASSERT(NELEMS(v0) - 1 == 3); return v0[param0]; } -void ov17_0224C5A0 (UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruct_ov17_0224C0C0 * param2) +void ov17_0224C5A0(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_ov17_0224C0C0 *param2) { u32 v0, v1; - Strbuf* v2; + Strbuf *v2; GF_ASSERT(param1 < NELEMS(Unk_ov17_0225470C)); @@ -2125,14 +2121,14 @@ void ov17_0224C5A0 (UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruc param0->unk_1B25 = 1; } -void ov17_0224C640 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224C640(UnkStruct_ov17_0224DF54 *param0) { sub_0200E084(¶m0->unk_14.unk_64[1], 1); sub_0201C3C0(param0->unk_14.unk_60, 1); param0->unk_1B25 = 0; } -s64 ov17_0224C660 (UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_02253084 * param1, int param2) +s64 ov17_0224C660(UnkStruct_ov17_0224DF54 *param0, const UnkStruct_ov17_02253084 *param1, int param2) { s64 v0; @@ -2142,7 +2138,7 @@ s64 ov17_0224C660 (UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_022530 return v0 - param0->unk_107C; } -s64 ov17_0224C6A8 (UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_02253084 * param1, int param2) +s64 ov17_0224C6A8(UnkStruct_ov17_0224DF54 *param0, const UnkStruct_ov17_02253084 *param1, int param2) { s64 v0; @@ -2150,9 +2146,9 @@ s64 ov17_0224C6A8 (UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_022530 return v0; } -void ov17_0224C6B0 (UnkStruct_ov17_0224DF54 * param0, int param1, u8 * param2) +void ov17_0224C6B0(UnkStruct_ov17_0224DF54 *param0, int param1, u8 *param2) { - UnkStruct_ov17_0224C6B0 * v0; + UnkStruct_ov17_0224C6B0 *v0; *param2 = 0; @@ -2171,9 +2167,9 @@ void ov17_0224C6B0 (UnkStruct_ov17_0224DF54 * param0, int param1, u8 * param2) } } -static void ov17_0224C718 (SysTask * param0, void * param1) +static void ov17_0224C718(SysTask *param0, void *param1) { - UnkStruct_ov17_0224C6B0 * v0 = param1; + UnkStruct_ov17_0224C6B0 *v0 = param1; switch (v0->unk_10) { case 0: @@ -2209,9 +2205,9 @@ static void ov17_0224C718 (SysTask * param0, void * param1) } } -static void ov17_0224C7B8 (SysTask * param0, void * param1) +static void ov17_0224C7B8(SysTask *param0, void *param1) { - UnkStruct_ov17_0224C6B0 * v0 = param1; + UnkStruct_ov17_0224C6B0 *v0 = param1; s32 v1; fx32 v2; @@ -2246,25 +2242,25 @@ static void ov17_0224C7B8 (SysTask * param0, void * param1) } } -void ov17_0224C848 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224C848(UnkStruct_ov17_0224DF54 *param0) { return; } -void ov17_0224C84C (void) +void ov17_0224C84C(void) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, 0, 0); } -void ov17_0224C864 (UnkStruct_ov17_0224DF54 * param0, int param1) +void ov17_0224C864(UnkStruct_ov17_0224DF54 *param0, int param1) { - u16 * v0; + u16 *v0; v0 = sub_02003164(param0->unk_14.unk_90, 0); sub_020039F8(v0, param0->unk_1050.unk_00, (0x1fff ^ ((1 << 4) | (1 << 3) | (1 << 2))), Unk_ov17_022546DC[param1].unk_02, Unk_ov17_022546DC[param1].unk_00); } -void ov17_0224C89C (UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_0224EDE0 * param1) +void ov17_0224C89C(UnkStruct_ov17_0224DF54 *param0, const UnkStruct_ov17_0224EDE0 *param1) { int v0; @@ -2299,7 +2295,7 @@ void ov17_0224C89C (UnkStruct_ov17_0224DF54 * param0, const UnkStruct_ov17_0224E ov17_0224C864(param0, v0); } -void ov17_0224C8E8 (UnkStruct_ov17_0224DF54 * param0, u32 param1) +void ov17_0224C8E8(UnkStruct_ov17_0224DF54 *param0, u32 param1) { int v0; u32 v1; @@ -2321,9 +2317,9 @@ void ov17_0224C8E8 (UnkStruct_ov17_0224DF54 * param0, u32 param1) } } -void ov17_0224C9A4 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224C9A4(UnkStruct_ov17_0224DF54 *param0) { - UnkStruct_ov17_0224C9A4 * v0; + UnkStruct_ov17_0224C9A4 *v0; GF_ASSERT(param0->unk_14.unk_1F0.unk_04 == NULL); @@ -2332,7 +2328,7 @@ void ov17_0224C9A4 (UnkStruct_ov17_0224DF54 * param0) v0->unk_04 = SysTask_Start(ov17_0224CA28, v0, (30000 + 10000)); } -void ov17_0224C9D4 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224C9D4(UnkStruct_ov17_0224DF54 *param0) { if (param0->unk_14.unk_1F0.unk_04 == NULL) { return; @@ -2342,9 +2338,9 @@ void ov17_0224C9D4 (UnkStruct_ov17_0224DF54 * param0) param0->unk_14.unk_1F0.unk_04 = NULL; } -void ov17_0224C9F0 (UnkStruct_ov17_0224DF54 * param0, int param1) +void ov17_0224C9F0(UnkStruct_ov17_0224DF54 *param0, int param1) { - UnkStruct_ov17_0224C9A4 * v0; + UnkStruct_ov17_0224C9A4 *v0; v0 = ¶m0->unk_14.unk_1F0; GF_ASSERT(v0->unk_04 != NULL); @@ -2361,16 +2357,16 @@ void ov17_0224C9F0 (UnkStruct_ov17_0224DF54 * param0, int param1) Sound_PlayEffect(1784); } -static void ov17_0224CA28 (SysTask * param0, void * param1) +static void ov17_0224CA28(SysTask *param0, void *param1) { - UnkStruct_ov17_0224C9A4 * v0 = param1; + UnkStruct_ov17_0224C9A4 *v0 = param1; if (v0->unk_0B == 0) { return; } { - u16 * v1; + u16 *v1; v1 = sub_02003164(v0->unk_00->unk_14.unk_90, 0); sub_0200393C(&v1[v0->unk_0A], &v0->unk_00->unk_1050.unk_00[v0->unk_0A], 16, v0->unk_08 >> 8, 0x7fff); @@ -2385,7 +2381,7 @@ static void ov17_0224CA28 (SysTask * param0, void * param1) } } -void ov17_0224CA90 (UnkStruct_ov17_0224DF54 * param0, u32 param1, s32 param2, s32 param3, s32 param4, fx32 param5) +void ov17_0224CA90(UnkStruct_ov17_0224DF54 *param0, u32 param1, s32 param2, s32 param3, s32 param4, fx32 param5) { param0->unk_1064.unk_00 = param2; param0->unk_1064.unk_04 = param3; @@ -2395,10 +2391,10 @@ void ov17_0224CA90 (UnkStruct_ov17_0224DF54 * param0, u32 param1, s32 param2, s3 sub_020146F4(param0->unk_0C, param1, ov17_0224CAC0, param0); } -static void ov17_0224CAC0 (UnkSPLStruct6 * param0) +static void ov17_0224CAC0(UnkSPLStruct6 *param0) { - UnkStruct_ov17_0224DF54 * v0; - UnkStruct_ov17_0224CAC0 * v1; + UnkStruct_ov17_0224DF54 *v0; + UnkStruct_ov17_0224CAC0 *v1; v0 = sub_02014764(); v1 = &v0->unk_1064; @@ -2410,7 +2406,7 @@ static void ov17_0224CAC0 (UnkSPLStruct6 * param0) sub_020147B0(param0, v1->unk_0C); } -static void ov17_0224CB00 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2) +static void ov17_0224CB00(UnkStruct_ov17_0224DF54 *param0, int param1, int param2) { s32 v0; @@ -2425,7 +2421,7 @@ static void ov17_0224CB00 (UnkStruct_ov17_0224DF54 * param0, int param1, int par } } -static void ov17_0224CB80 (UnkStruct_ov17_0224DF54 * param0, int param1) +static void ov17_0224CB80(UnkStruct_ov17_0224DF54 *param0, int param1) { fx32 v0 = FX32_ONE; @@ -2460,15 +2456,15 @@ static void ov17_0224CB80 (UnkStruct_ov17_0224DF54 * param0, int param1) Sound_PlayEffect(1765); } -static void ov17_0224CD60 (SysTask * param0, void * param1) +static void ov17_0224CD60(SysTask *param0, void *param1) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, 0, 0); SysTask_Done(param0); } -void ov17_0224CD84 (UnkStruct_ov17_0224DF54 * param0, u32 param1, u32 param2, int param3, int param4, u16 param5) +void ov17_0224CD84(UnkStruct_ov17_0224DF54 *param0, u32 param1, u32 param2, int param3, int param4, u16 param5) { - UnkStruct_ov17_0224CD84 * v0; + UnkStruct_ov17_0224CD84 *v0; v0 = ¶m0->unk_1050; v0->unk_08 = param3 << 8; @@ -2479,12 +2475,12 @@ void ov17_0224CD84 (UnkStruct_ov17_0224DF54 * param0, u32 param1, u32 param2, in v0->unk_10 = 1; } -void ov17_0224CDB4 (UnkStruct_ov17_0224DF54 * param0, int param1) +void ov17_0224CDB4(UnkStruct_ov17_0224DF54 *param0, int param1) { param0->unk_1050.unk_11 = param1; } -void ov17_0224CDC0 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2) +void ov17_0224CDC0(UnkStruct_ov17_0224DF54 *param0, int param1, int param2) { int v0; GXRgb v1, v2; @@ -2508,7 +2504,7 @@ void ov17_0224CDC0 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2) Sound_PlayEffect(1772); } -void ov17_0224CE08 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224CE08(UnkStruct_ov17_0224DF54 *param0) { int v0; @@ -2517,7 +2513,7 @@ void ov17_0224CE08 (UnkStruct_ov17_0224DF54 * param0) } } -void ov17_0224CE28 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224CE28(UnkStruct_ov17_0224DF54 *param0) { int v0, v1, v2; s16 v3[4]; @@ -2558,9 +2554,9 @@ void ov17_0224CE28 (UnkStruct_ov17_0224DF54 * param0) } } -void ov17_0224CEE4 (UnkStruct_ov17_0224DF54 * param0, int param1, GXRgb param2, GXRgb param3, int param4, int param5, u8 * param6) +void ov17_0224CEE4(UnkStruct_ov17_0224DF54 *param0, int param1, GXRgb param2, GXRgb param3, int param4, int param5, u8 *param6) { - UnkStruct_ov17_0224CEE4 * v0; + UnkStruct_ov17_0224CEE4 *v0; v0 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224CEE4)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224CEE4)); @@ -2580,9 +2576,9 @@ void ov17_0224CEE4 (UnkStruct_ov17_0224DF54 * param0, int param1, GXRgb param2, SysTask_Start(ov17_0224CF4C, v0, (30000 + 10000)); } -static void ov17_0224CF4C (SysTask * param0, void * param1) +static void ov17_0224CF4C(SysTask *param0, void *param1) { - UnkStruct_ov17_0224CEE4 * v0 = param1; + UnkStruct_ov17_0224CEE4 *v0 = param1; u16 v1; int v2; @@ -2607,7 +2603,7 @@ static void ov17_0224CF4C (SysTask * param0, void * param1) } } -BOOL ov17_0224CFA8 (u32 param0) +BOOL ov17_0224CFA8(u32 param0) { switch (param0) { case 50: diff --git a/src/overlay017/ov17_0224CFB8.c b/src/overlay017/ov17_0224CFB8.c index 655aaa3f7d..70b2cbdd2a 100644 --- a/src/overlay017/ov17_0224CFB8.c +++ b/src/overlay017/ov17_0224CFB8.c @@ -1,8 +1,13 @@ +#include "overlay017/ov17_0224CFB8.h" + #include #include -#include "sys_task_manager.h" - +#include "overlay017/ov17_0223DAD0.h" +#include "overlay017/ov17_022492DC.h" +#include "overlay017/ov17_0224A0FC.h" +#include "overlay017/ov17_0224E930.h" +#include "overlay017/ov17_0224F18C.h" #include "overlay017/struct_ov17_0223F03C.h" #include "overlay017/struct_ov17_02243C28.h" #include "overlay017/struct_ov17_02243C80.h" @@ -27,82 +32,77 @@ #include "overlay017/struct_ov17_0224F30C.h" #include "overlay017/struct_ov17_0224F3D8.h" #include "overlay017/struct_ov17_022539E4.h" +#include "overlay022/ov22_0225AF8C.h" +#include "communication_system.h" +#include "heap.h" +#include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "sys_task.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" -#include "communication_system.h" -#include "pokemon.h" #include "unk_02094EDC.h" -#include "overlay017/ov17_0223DAD0.h" -#include "overlay017/ov17_022492DC.h" -#include "overlay017/ov17_0224A0FC.h" -#include "overlay017/ov17_0224CFB8.h" -#include "overlay017/ov17_0224E930.h" -#include "overlay017/ov17_0224F18C.h" -#include "overlay022/ov22_0225AF8C.h" -static int ov17_0224CFF8(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224D00C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224D01C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4); -static int ov17_0224D020(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224D034(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224D078(SysTask * param0, void * param1); -static int ov17_0224D1D4(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224D1E8(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224D240(SysTask * param0, void * param1); -static int ov17_0224DF88(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224DF9C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224DFF8(SysTask * param0, void * param1); -static void ov17_0224E1F4(SysTask * param0, void * param1); -static int ov17_0224D544(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224D558(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224D710(SysTask * param0, void * param1); -static void ov17_0224DF84(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4); -static int ov17_0224D4EC(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224D500(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static int ov17_0224DC1C(UnkStruct_ov17_0224DC1C * param0, int * param1, int param2, int param3); -static UnkStruct_ov17_0224D69C * ov17_0224D668(UnkStruct_ov17_0224DF54 * param0, int param1); -static void ov17_0224D69C(UnkStruct_ov17_0224D69C * param0); -static void ov17_0224D6CC(SysTask * param0, void * param1); -static int ov17_0224E43C(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224E450(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224E4A8(SysTask * param0, void * param1); -static int ov17_0224E518(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224E52C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224E584(SysTask * param0, void * param1); -static int ov17_0224E648(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224E65C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224E6C8(SysTask * param0, void * param1); -static int ov17_0224E77C(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224E790(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static int ov17_0224E7B4(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224E7C8(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static int ov17_0224D3C4(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224D3D8(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224D41C(SysTask * param0, void * param1); -static void ov17_0224DF54(UnkStruct_ov17_0224DF54 * param0); -static int ov17_0224E800(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0224E814(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0224E86C(SysTask * param0, void * param1); +static int ov17_0224CFF8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224D00C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224D01C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4); +static int ov17_0224D020(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224D034(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224D078(SysTask *param0, void *param1); +static int ov17_0224D1D4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224D1E8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224D240(SysTask *param0, void *param1); +static int ov17_0224DF88(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224DF9C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224DFF8(SysTask *param0, void *param1); +static void ov17_0224E1F4(SysTask *param0, void *param1); +static int ov17_0224D544(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224D558(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224D710(SysTask *param0, void *param1); +static void ov17_0224DF84(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4); +static int ov17_0224D4EC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224D500(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static int ov17_0224DC1C(UnkStruct_ov17_0224DC1C *param0, int *param1, int param2, int param3); +static UnkStruct_ov17_0224D69C *ov17_0224D668(UnkStruct_ov17_0224DF54 *param0, int param1); +static void ov17_0224D69C(UnkStruct_ov17_0224D69C *param0); +static void ov17_0224D6CC(SysTask *param0, void *param1); +static int ov17_0224E43C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224E450(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224E4A8(SysTask *param0, void *param1); +static int ov17_0224E518(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224E52C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224E584(SysTask *param0, void *param1); +static int ov17_0224E648(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224E65C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224E6C8(SysTask *param0, void *param1); +static int ov17_0224E77C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224E790(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static int ov17_0224E7B4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224E7C8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static int ov17_0224D3C4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224D3D8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224D41C(SysTask *param0, void *param1); +static void ov17_0224DF54(UnkStruct_ov17_0224DF54 *param0); +static int ov17_0224E800(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0224E814(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0224E86C(SysTask *param0, void *param1); static const UnkStruct_ov17_022539E4 Unk_ov17_022549E4[] = { - {ov17_0224CFF8, ov17_0224D00C, ov17_0224D01C}, - {ov17_0224D020, ov17_0224D034, NULL}, - {ov17_0224D1D4, ov17_0224D1E8, NULL}, - {ov17_0224D3C4, ov17_0224D3D8, NULL}, - {ov17_0224D4EC, ov17_0224D500, NULL}, - {ov17_0224D544, ov17_0224D558, ov17_0224DF84}, - {ov17_0224DF88, ov17_0224DF9C, NULL}, - {ov17_0224E43C, ov17_0224E450, NULL}, - {ov17_0224E518, ov17_0224E52C, NULL}, - {ov17_0224E648, ov17_0224E65C, NULL}, - {ov17_0224E77C, ov17_0224E790, NULL}, - {ov17_0224E7B4, ov17_0224E7C8, NULL}, - {ov17_0224E800, ov17_0224E814, NULL} + { ov17_0224CFF8, ov17_0224D00C, ov17_0224D01C }, + { ov17_0224D020, ov17_0224D034, NULL }, + { ov17_0224D1D4, ov17_0224D1E8, NULL }, + { ov17_0224D3C4, ov17_0224D3D8, NULL }, + { ov17_0224D4EC, ov17_0224D500, NULL }, + { ov17_0224D544, ov17_0224D558, ov17_0224DF84 }, + { ov17_0224DF88, ov17_0224DF9C, NULL }, + { ov17_0224E43C, ov17_0224E450, NULL }, + { ov17_0224E518, ov17_0224E52C, NULL }, + { ov17_0224E648, ov17_0224E65C, NULL }, + { ov17_0224E77C, ov17_0224E790, NULL }, + { ov17_0224E7B4, ov17_0224E7C8, NULL }, + { ov17_0224E800, ov17_0224E814, NULL } }; __attribute__((aligned(4))) static const s8 Unk_ov17_022549C4[] = { @@ -128,7 +128,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov17_022549CC[] = { 0x138 }; -void ov17_0224CFB8 (UnkStruct_ov17_0224DF54 * param0) +void ov17_0224CFB8(UnkStruct_ov17_0224DF54 *param0) { UnkStruct_ov17_02243C28 v0; @@ -141,40 +141,40 @@ void ov17_0224CFB8 (UnkStruct_ov17_0224DF54 * param0) ov17_0224F18C(¶m0->unk_109C, &v0); } -static int ov17_0224CFF8 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224CFF8(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_0224D00C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224D00C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; ov17_0224F26C(param0, param2, NULL, 0); } -static void ov17_0224D01C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4) +static void ov17_0224D01C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; return; } -static int ov17_0224D020 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224D020(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_0224D034 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224D034(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224D078 * v1; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224D078 *v1; v1 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224D078)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0224D078)); @@ -186,9 +186,9 @@ static void ov17_0224D034 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_0224D078, v1, 30000); } -static void ov17_0224D078 (SysTask * param0, void * param1) +static void ov17_0224D078(SysTask *param0, void *param1) { - UnkStruct_ov17_0224D078 * v0 = param1; + UnkStruct_ov17_0224D078 *v0 = param1; switch (v0->unk_10) { case 0: @@ -206,7 +206,7 @@ static void ov17_0224D078 (SysTask * param0, void * param1) v0->unk_13 = 1; { - u16 * v1, * v2; + u16 *v1, *v2; int v3, v4, v5, v6, v7; v1 = sub_02019FE4(v0->unk_00->unk_14.unk_60, 2); @@ -263,19 +263,19 @@ static void ov17_0224D078 (SysTask * param0, void * param1) } } -static int ov17_0224D1D4 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224D1D4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_0224D1E8 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224D1E8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224D240 * v1; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224D240 *v1; v1 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224D240)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0224D240)); @@ -289,9 +289,9 @@ static void ov17_0224D1E8 (UnkStruct_ov17_0224F30C * param0, void * param1, cons Sound_PlayBGM(1135); } -static void ov17_0224D240 (SysTask * param0, void * param1) +static void ov17_0224D240(SysTask *param0, void *param1) { - UnkStruct_ov17_0224D240 * v0 = param1; + UnkStruct_ov17_0224D240 *v0 = param1; switch (v0->unk_10) { case 0: @@ -308,7 +308,7 @@ static void ov17_0224D240 (SysTask * param0, void * param1) v0->unk_13 = 1; { - u16 * v1, * v2; + u16 *v1, *v2; int v3, v4, v5, v6, v7; int v8; @@ -371,19 +371,19 @@ static void ov17_0224D240 (SysTask * param0, void * param1) } } -static int ov17_0224D3C4 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224D3C4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_0224D3D8 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224D3D8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224D41C * v1; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224D41C *v1; v1 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224D41C)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0224D41C)); @@ -395,9 +395,9 @@ static void ov17_0224D3D8 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_0224D41C, v1, 30000); } -static void ov17_0224D41C (SysTask * param0, void * param1) +static void ov17_0224D41C(SysTask *param0, void *param1) { - UnkStruct_ov17_0224D41C * v0 = param1; + UnkStruct_ov17_0224D41C *v0 = param1; switch (v0->unk_10) { case 0: @@ -441,19 +441,19 @@ static void ov17_0224D41C (SysTask * param0, void * param1) } } -static int ov17_0224D4EC (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224D4EC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0223F03C)); return v1; } -static void ov17_0224D500 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224D500(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0223F03C * v1 = param3; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0223F03C *v1 = param3; int v2; v0->unk_1B24 = 1; @@ -467,20 +467,20 @@ static void ov17_0224D500 (UnkStruct_ov17_0224F30C * param0, void * param1, cons } } -static int ov17_0224D544 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224D544(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224DF54_sub2)); return v1; } -static void ov17_0224D558 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224D558(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224DF54_sub2 * v1 = param3; - UnkStruct_ov17_0224D710 * v2; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224DF54_sub2 *v1 = param3; + UnkStruct_ov17_0224D710 *v2; int v3, v4; v2 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224D710)); @@ -525,9 +525,9 @@ static void ov17_0224D558 (UnkStruct_ov17_0224F30C * param0, void * param1, cons } } -static UnkStruct_ov17_0224D69C * ov17_0224D668 (UnkStruct_ov17_0224DF54 * param0, int param1) +static UnkStruct_ov17_0224D69C *ov17_0224D668(UnkStruct_ov17_0224DF54 *param0, int param1) { - UnkStruct_ov17_0224D69C * v0; + UnkStruct_ov17_0224D69C *v0; v0 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224D69C)); MI_CpuClear8(v0, sizeof(UnkStruct_ov17_0224D69C)); @@ -539,21 +539,21 @@ static UnkStruct_ov17_0224D69C * ov17_0224D668 (UnkStruct_ov17_0224DF54 * param0 return v0; } -static void ov17_0224D69C (UnkStruct_ov17_0224D69C * param0) +static void ov17_0224D69C(UnkStruct_ov17_0224D69C *param0) { SysTask_Done(param0->unk_00); Heap_FreeToHeap(param0); } -void ov17_0224D6B0 (UnkStruct_ov17_0224D69C * param0, const UnkStruct_ov17_0224EDE0 * param1) +void ov17_0224D6B0(UnkStruct_ov17_0224D69C *param0, const UnkStruct_ov17_0224EDE0 *param1) { param0->unk_08 = *param1; param0->unk_12 = 1; } -static void ov17_0224D6CC (SysTask * param0, void * param1) +static void ov17_0224D6CC(SysTask *param0, void *param1) { - UnkStruct_ov17_0224D69C * v0 = param1; + UnkStruct_ov17_0224D69C *v0 = param1; if (v0->unk_12 == 0) { return; @@ -569,9 +569,9 @@ static void ov17_0224D6CC (SysTask * param0, void * param1) } } -static void ov17_0224D710 (SysTask * param0, void * param1) +static void ov17_0224D710(SysTask *param0, void *param1) { - UnkStruct_ov17_0224D710 * v0 = param1; + UnkStruct_ov17_0224D710 *v0 = param1; int v1, v2, v3; u32 v4; int v5; @@ -631,8 +631,7 @@ static void ov17_0224D710 (SysTask * param0, void * param1) (void)0; } break; - case 2: - { + case 2: { ov17_0224A368(&v0->unk_00->unk_14, v0->unk_00->unk_107C - v0->unk_00->unk_1084, v0->unk_18.unk_0C, v0->unk_00->unk_A3C.unk_2F); ov17_0224C49C(v0->unk_00->unk_14.unk_1FC, v0->unk_00->unk_107C - v0->unk_00->unk_1084, v0->unk_18.unk_0C, v0->unk_00->unk_A3C.unk_2F); ov17_0224C434(&v0->unk_00->unk_14.unk_910, v0->unk_00->unk_107C - v0->unk_00->unk_1084, v0->unk_18.unk_0C, v0->unk_00->unk_A3C.unk_2F); @@ -689,7 +688,7 @@ static void ov17_0224D710 (SysTask * param0, void * param1) UnkStruct_ov17_0224EDE0 v8; int v9; - if ((v4 < (v0->unk_18.unk_0C >> 1))) { + if (v4 < (v0->unk_18.unk_0C >> 1)) { v9 = 0; } else { v9 = 1; @@ -782,7 +781,7 @@ static void ov17_0224D710 (SysTask * param0, void * param1) } } -static int ov17_0224DC1C (UnkStruct_ov17_0224DC1C * param0, int * param1, int param2, int param3) +static int ov17_0224DC1C(UnkStruct_ov17_0224DC1C *param0, int *param1, int param2, int param3) { int v0; @@ -845,7 +844,7 @@ static int ov17_0224DC1C (UnkStruct_ov17_0224DC1C * param0, int * param1, int pa return v0; } -int ov17_0224DD28 (int param0) +int ov17_0224DD28(int param0) { int v0; @@ -870,7 +869,7 @@ int ov17_0224DD28 (int param0) return v0; } -int ov17_0224DD5C (int param0) +int ov17_0224DD5C(int param0) { int v0; @@ -895,7 +894,7 @@ int ov17_0224DD5C (int param0) return v0; } -static void ov17_0224DD90 (int param0, const UnkStruct_ov17_0224DD90 * param1, u8 * param2, u8 * param3) +static void ov17_0224DD90(int param0, const UnkStruct_ov17_0224DD90 *param1, u8 *param2, u8 *param3) { if (param0 <= param1->unk_00) { *param2 = 0; @@ -915,7 +914,7 @@ static void ov17_0224DD90 (int param0, const UnkStruct_ov17_0224DD90 * param1, u } } -static void ov17_0224DDE4 (u32 param0, u32 param1, u32 * param2, u32 * param3) +static void ov17_0224DDE4(u32 param0, u32 param1, u32 *param2, u32 *param3) { u32 v0, v1, v2, v3, v4; u32 v5, v6; @@ -952,7 +951,7 @@ static void ov17_0224DDE4 (u32 param0, u32 param1, u32 * param2, u32 * param3) *param3 = v7; } -void ov17_0224DE54 (int param0, int param1, u32 param2, u32 param3, const UnkStruct_ov17_0224DD90 * param4, UnkStruct_ov17_0224EDE0 * param5, const UnkStruct_ov17_0224EDE0 * param6, int param7, int param8, int param9, int param10) +void ov17_0224DE54(int param0, int param1, u32 param2, u32 param3, const UnkStruct_ov17_0224DD90 *param4, UnkStruct_ov17_0224EDE0 *param5, const UnkStruct_ov17_0224EDE0 *param6, int param7, int param8, int param9, int param10) { int v0, v1; u8 v2, v3; @@ -1005,7 +1004,7 @@ void ov17_0224DE54 (int param0, int param1, u32 param2, u32 param3, const UnkStr param5->unk_08_2 = 1; } -static void ov17_0224DF54 (UnkStruct_ov17_0224DF54 * param0) +static void ov17_0224DF54(UnkStruct_ov17_0224DF54 *param0) { int v0; @@ -1019,26 +1018,26 @@ static void ov17_0224DF54 (UnkStruct_ov17_0224DF54 * param0) param0->unk_14.unk_A27 = 0; } -static void ov17_0224DF84 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4) +static void ov17_0224DF84(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; return; } -static int ov17_0224DF88 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224DF88(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224DF54_sub2)); return v1; } -static void ov17_0224DF9C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224DF9C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224DF54_sub2 * v1 = param3; - UnkStruct_ov17_0224DFF8 * v2; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224DF54_sub2 *v1 = param3; + UnkStruct_ov17_0224DFF8 *v2; v2 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224DFF8)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0224DFF8)); @@ -1051,9 +1050,9 @@ static void ov17_0224DF9C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_0224DFF8, v2, 30000); } -static void ov17_0224DFF8 (SysTask * param0, void * param1) +static void ov17_0224DFF8(SysTask *param0, void *param1) { - UnkStruct_ov17_0224DFF8 * v0 = param1; + UnkStruct_ov17_0224DFF8 *v0 = param1; int v1, v2; switch (v0->unk_10) { @@ -1142,9 +1141,9 @@ static void ov17_0224DFF8 (SysTask * param0, void * param1) } } -static void ov17_0224E1F4 (SysTask * param0, void * param1) +static void ov17_0224E1F4(SysTask *param0, void *param1) { - UnkStruct_ov17_0224E1F4 * v0 = param1; + UnkStruct_ov17_0224E1F4 *v0 = param1; int v1, v2, v3, v4, v5, v6; int v7; @@ -1243,20 +1242,20 @@ static void ov17_0224E1F4 (SysTask * param0, void * param1) } } -static int ov17_0224E43C (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224E43C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224DF54_sub2)); return v1; } -static void ov17_0224E450 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224E450(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224E4A8 * v1; - UnkStruct_ov17_0224DF54_sub2 * v2 = param3; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224E4A8 *v1; + UnkStruct_ov17_0224DF54_sub2 *v2 = param3; v1 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224E4A8)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0224E4A8)); @@ -1269,9 +1268,9 @@ static void ov17_0224E450 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_0224E4A8, v1, 30000); } -static void ov17_0224E4A8 (SysTask * param0, void * param1) +static void ov17_0224E4A8(SysTask *param0, void *param1) { - UnkStruct_ov17_0224E4A8 * v0 = param1; + UnkStruct_ov17_0224E4A8 *v0 = param1; int v1; switch (v0->unk_45) { @@ -1294,20 +1293,20 @@ static void ov17_0224E4A8 (SysTask * param0, void * param1) } } -static int ov17_0224E518 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224E518(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224DF54_sub2)); return v1; } -static void ov17_0224E52C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224E52C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224E584 * v1; - UnkStruct_ov17_0224DF54_sub2 * v2 = param3; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224E584 *v1; + UnkStruct_ov17_0224DF54_sub2 *v2 = param3; v1 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224E584)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0224E584)); @@ -1320,9 +1319,9 @@ static void ov17_0224E52C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_0224E584, v1, 30000); } -static void ov17_0224E584 (SysTask * param0, void * param1) +static void ov17_0224E584(SysTask *param0, void *param1) { - UnkStruct_ov17_0224E584 * v0 = param1; + UnkStruct_ov17_0224E584 *v0 = param1; int v1; switch (v0->unk_45) { @@ -1338,8 +1337,7 @@ static void ov17_0224E584 (SysTask * param0, void * param1) v0->unk_45++; break; - case 1: - { + case 1: { int v2 = 0, v3 = 0; for (v1 = 0; v1 < 4; v1++) { @@ -1356,8 +1354,7 @@ static void ov17_0224E584 (SysTask * param0, void * param1) ov17_0224BD00(v0->unk_00); v0->unk_45++; } - } - break; + } break; default: ov17_02249640(v0->unk_00->unk_1074, 0, 1, NULL); ov17_0224A0E0(v0->unk_00->unk_1074, 0x0, 0); @@ -1369,20 +1366,20 @@ static void ov17_0224E584 (SysTask * param0, void * param1) } } -static int ov17_0224E648 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224E648(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224DF54_sub2)); return v1; } -static void ov17_0224E65C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224E65C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224DF54_sub2 * v1 = param3; - UnkStruct_ov17_0224E6C8 * v2; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224DF54_sub2 *v1 = param3; + UnkStruct_ov17_0224E6C8 *v2; v2 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224E6C8)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0224E6C8)); @@ -1399,9 +1396,9 @@ static void ov17_0224E65C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_0224E6C8, v2, 30000); } -static void ov17_0224E6C8 (SysTask * param0, void * param1) +static void ov17_0224E6C8(SysTask *param0, void *param1) { - UnkStruct_ov17_0224E6C8 * v0 = param1; + UnkStruct_ov17_0224E6C8 *v0 = param1; switch (v0->unk_10) { case 0: @@ -1440,36 +1437,36 @@ static void ov17_0224E6C8 (SysTask * param0, void * param1) } } -static int ov17_0224E77C (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224E77C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224DF54_sub1)); return v1; } -static void ov17_0224E790 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224E790(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; v0->unk_A3C = *((UnkStruct_ov17_0224DF54_sub1 *)param3); ov17_0224F26C(param0, param2, NULL, 0); } -static int ov17_0224E7B4 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224E7B4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224DF54_sub2)); return v1; } -static void ov17_0224E7C8 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224E7C8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224DF54_sub2 * v1 = param3; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224DF54_sub2 *v1 = param3; sub_0200569C(); Sound_PlayBGM(v1->unk_24.unk_00); @@ -1480,20 +1477,20 @@ static void ov17_0224E7C8 (UnkStruct_ov17_0224F30C * param0, void * param1, cons ov17_0224F26C(param0, param2, NULL, 0); } -static int ov17_0224E800 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0224E800(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; + UnkStruct_ov17_0224DF54 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224DF54_sub2)); return v1; } -static void ov17_0224E814 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0224E814(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224DF54 * v0 = param1; - UnkStruct_ov17_0224DF54_sub2 * v1 = param3; - UnkStruct_ov17_0224E86C * v2; + UnkStruct_ov17_0224DF54 *v0 = param1; + UnkStruct_ov17_0224DF54_sub2 *v1 = param3; + UnkStruct_ov17_0224E86C *v2; v2 = Heap_AllocFromHeap(23, sizeof(UnkStruct_ov17_0224E86C)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0224E86C)); @@ -1506,9 +1503,9 @@ static void ov17_0224E814 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_0224E86C, v2, 30000); } -static void ov17_0224E86C (SysTask * param0, void * param1) +static void ov17_0224E86C(SysTask *param0, void *param1) { - UnkStruct_ov17_0224E86C * v0 = param1; + UnkStruct_ov17_0224E86C *v0 = param1; switch (v0->unk_4C) { case 0: diff --git a/src/overlay017/ov17_0224E930.c b/src/overlay017/ov17_0224E930.c index 7da1b2cf7e..df7afc5d60 100644 --- a/src/overlay017/ov17_0224E930.c +++ b/src/overlay017/ov17_0224E930.c @@ -1,6 +1,10 @@ +#include "overlay017/ov17_0224E930.h" + #include #include +#include "overlay017/ov17_0223DAD0.h" +#include "overlay017/ov17_0224CFB8.h" #include "overlay017/struct_ov17_0224D69C.h" #include "overlay017/struct_ov17_0224DF54.h" #include "overlay017/struct_ov17_0224E958.h" @@ -8,15 +12,12 @@ #include "overlay017/struct_ov17_02253084.h" #include "unk_020933F8.h" -#include "overlay017/ov17_0223DAD0.h" -#include "overlay017/ov17_0224CFB8.h" -#include "overlay017/ov17_0224E930.h" static int ov17_0224EBE0(int param0, int param1); static int ov17_0224EC24(int param0, int param1, int param2, int param3, int param4, int param5, int param6); static int ov17_0224ECC4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7); -static void ov17_0224EDE0(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0224E958 * param1, u32 param2, u32 param3, u32 param4, const UnkStruct_ov17_02253084 * param5, UnkStruct_ov17_0224D69C * param6); -static void ov17_0224EE90(UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0224E958 * param1, u32 param2, u32 param3, u32 param4, const UnkStruct_ov17_02253084 * param5, UnkStruct_ov17_0224D69C * param6); +static void ov17_0224EDE0(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0224E958 *param1, u32 param2, u32 param3, u32 param4, const UnkStruct_ov17_02253084 *param5, UnkStruct_ov17_0224D69C *param6); +static void ov17_0224EE90(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0224E958 *param1, u32 param2, u32 param3, u32 param4, const UnkStruct_ov17_02253084 *param5, UnkStruct_ov17_0224D69C *param6); __attribute__((aligned(4))) static const s8 Unk_ov17_02254A80[] = { 0x1, @@ -32,7 +33,7 @@ __attribute__((aligned(4))) static const u8 Unk_ov17_02254A84[] = { 0x0 }; -void ov17_0224E930 (UnkStruct_ov17_0224E958 * param0, int param1, int param2, u32 param3, int param4) +void ov17_0224E930(UnkStruct_ov17_0224E958 *param0, int param1, int param2, u32 param3, int param4) { MI_CpuClear8(param0, sizeof(UnkStruct_ov17_0224E958)); @@ -42,7 +43,7 @@ void ov17_0224E930 (UnkStruct_ov17_0224E958 * param0, int param1, int param2, u3 param0->unk_39 = param4; } -void ov17_0224E958 (UnkStruct_ov17_0224E958 * param0) +void ov17_0224E958(UnkStruct_ov17_0224E958 *param0) { u32 v0; int v1, v2, v3; @@ -60,10 +61,10 @@ void ov17_0224E958 (UnkStruct_ov17_0224E958 * param0) param0->unk_39 = v3; } -void ov17_0224E990 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0224E958 * param1, u32 param2, u32 param3) +void ov17_0224E990(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0224E958 *param1, u32 param2, u32 param3) { int v0, v1, v2, v3, v4; - u8 v5[((16 * 2)) / 2]; + u8 v5[(16 * 2) / 2]; u32 v6; s32 v7; int v8; @@ -171,7 +172,7 @@ void ov17_0224E990 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0224E958 * } } -static int ov17_0224EBE0 (int param0, int param1) +static int ov17_0224EBE0(int param0, int param1) { int v0; @@ -196,7 +197,7 @@ static int ov17_0224EBE0 (int param0, int param1) return v0; } -static int ov17_0224EC24 (int param0, int param1, int param2, int param3, int param4, int param5, int param6) +static int ov17_0224EC24(int param0, int param1, int param2, int param3, int param4, int param5, int param6) { int v0 = 0; @@ -249,7 +250,7 @@ static int ov17_0224EC24 (int param0, int param1, int param2, int param3, int pa return v0; } -static int ov17_0224ECC4 (int param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7) +static int ov17_0224ECC4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7) { int v0 = 0; @@ -317,7 +318,7 @@ static int ov17_0224ECC4 (int param0, int param1, int param2, int param3, int pa return v0; } -void ov17_0224ED8C (int param0, UnkStruct_ov17_0224DF54 * param1, UnkStruct_ov17_0224E958 * param2, u32 param3, u32 param4, u32 param5, const UnkStruct_ov17_02253084 * param6, UnkStruct_ov17_0224D69C * param7) +void ov17_0224ED8C(int param0, UnkStruct_ov17_0224DF54 *param1, UnkStruct_ov17_0224E958 *param2, u32 param3, u32 param4, u32 param5, const UnkStruct_ov17_02253084 *param6, UnkStruct_ov17_0224D69C *param7) { if ((param2->unk_38 == 0) && (param0 == 0)) { ov17_0224EDE0(param1, param2, param3, param4, param5, param6, param7); @@ -326,7 +327,7 @@ void ov17_0224ED8C (int param0, UnkStruct_ov17_0224DF54 * param1, UnkStruct_ov17 } } -static void ov17_0224EDE0 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0224E958 * param1, u32 param2, u32 param3, u32 param4, const UnkStruct_ov17_02253084 * param5, UnkStruct_ov17_0224D69C * param6) +static void ov17_0224EDE0(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0224E958 *param1, u32 param2, u32 param3, u32 param4, const UnkStruct_ov17_02253084 *param5, UnkStruct_ov17_0224D69C *param6) { UnkStruct_ov17_0224EDE0 v0; u32 v1; @@ -366,10 +367,10 @@ static void ov17_0224EDE0 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0224 } } -static void ov17_0224EE90 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_ov17_0224E958 * param1, u32 param2, u32 param3, u32 param4, const UnkStruct_ov17_02253084 * param5, UnkStruct_ov17_0224D69C * param6) +static void ov17_0224EE90(UnkStruct_ov17_0224DF54 *param0, UnkStruct_ov17_0224E958 *param1, u32 param2, u32 param3, u32 param4, const UnkStruct_ov17_02253084 *param5, UnkStruct_ov17_0224D69C *param6) { UnkStruct_ov17_0224EDE0 v0; - UnkStruct_ov17_0224EDE0 * v1; + UnkStruct_ov17_0224EDE0 *v1; u32 v2, v3; v2 = param4 / 2; diff --git a/src/overlay017/ov17_0224F080.c b/src/overlay017/ov17_0224F080.c index a9fcde5f82..d7f60e8944 100644 --- a/src/overlay017/ov17_0224F080.c +++ b/src/overlay017/ov17_0224F080.c @@ -1,14 +1,14 @@ +#include "overlay017/ov17_0224F080.h" + #include #include #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" - -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" #include "unk_0200C6E4.h" -#include "overlay017/ov17_0224F080.h" __attribute__((aligned(4))) static const u32 Unk_ov17_02254A90[] = { 0x30, @@ -26,58 +26,58 @@ __attribute__((aligned(4))) static const u8 Unk_ov17_02254A88[] = { 0x1 }; -u32 ov17_0224F080 (int param0) +u32 ov17_0224F080(int param0) { GF_ASSERT(param0 < NELEMS(Unk_ov17_02254A90)); return Unk_ov17_02254A90[param0]; } -u32 ov17_0224F098 (void) +u32 ov17_0224F098(void) { return 49; } -u32 ov17_0224F09C (void) +u32 ov17_0224F09C(void) { return 50; } -u8 ov17_0224F0A0 (int param0) +u8 ov17_0224F0A0(int param0) { GF_ASSERT(param0 < NELEMS(Unk_ov17_02254A88)); return Unk_ov17_02254A88[param0]; } -u32 ov17_0224F0B8 (void) +u32 ov17_0224F0B8(void) { return 46; } -void ov17_0224F0BC (SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) +void ov17_0224F0BC(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) { sub_0200CBDC(param0, param1, ov17_0224F0B8(), ov17_0224F080(param3), 1, param2, param4); } -void ov17_0224F0F0 (SpriteRenderer * param0, SpriteGfxHandler * param1, u32 param2, u32 param3) +void ov17_0224F0F0(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3) { sub_0200CE0C(param0, param1, ov17_0224F0B8(), ov17_0224F098(), 1, param2); sub_0200CE3C(param0, param1, ov17_0224F0B8(), ov17_0224F09C(), 1, param3); } -void ov17_0224F138 (SpriteGfxHandler * param0, u32 param1) +void ov17_0224F138(SpriteGfxHandler *param0, u32 param1) { SpriteGfxHandler_UnloadCharObjById(param0, param1); } -void ov17_0224F140 (SpriteGfxHandler * param0, u32 param1, u32 param2) +void ov17_0224F140(SpriteGfxHandler *param0, u32 param1, u32 param2) { SpriteGfxHandler_UnloadCellObjById(param0, param1); SpriteGfxHandler_UnloadAnimObjById(param0, param2); } -CellActorData * ov17_0224F154 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, const SpriteTemplate * param3) +CellActorData *ov17_0224F154(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; v1 = *param3; @@ -87,7 +87,7 @@ CellActorData * ov17_0224F154 (SpriteRenderer * param0, SpriteGfxHandler * param return v0; } -void ov17_0224F184 (CellActorData * param0) +void ov17_0224F184(CellActorData *param0) { sub_0200D0F4(param0); } diff --git a/src/overlay017/ov17_0224F18C.c b/src/overlay017/ov17_0224F18C.c index 06b681ab13..d61fe3589a 100644 --- a/src/overlay017/ov17_0224F18C.c +++ b/src/overlay017/ov17_0224F18C.c @@ -1,3 +1,5 @@ +#include "overlay017/ov17_0224F18C.h" + #include #include @@ -7,9 +9,8 @@ #include "overlay017/struct_ov17_0224F3D8.h" #include "communication_system.h" -#include "overlay017/ov17_0224F18C.h" -void ov17_0224F18C (UnkStruct_ov17_0224F30C * param0, const UnkStruct_ov17_02243C28 * param1) +void ov17_0224F18C(UnkStruct_ov17_0224F30C *param0, const UnkStruct_ov17_02243C28 *param1) { MI_CpuClear8(param0, sizeof(UnkStruct_ov17_0224F30C)); @@ -20,7 +21,7 @@ void ov17_0224F18C (UnkStruct_ov17_0224F30C * param0, const UnkStruct_ov17_02243 param0->unk_08 = param1->unk_08; } -static int ov17_0224F1B4 (UnkStruct_ov17_0224F30C * param0) +static int ov17_0224F1B4(UnkStruct_ov17_0224F30C *param0) { int v0; @@ -35,12 +36,12 @@ static int ov17_0224F1B4 (UnkStruct_ov17_0224F30C * param0) return 0; } -static void ov17_0224F1E0 (UnkStruct_ov17_0224F30C * param0, int param1) +static void ov17_0224F1E0(UnkStruct_ov17_0224F30C *param0, int param1) { param0->unk_0C &= 0xffffffff ^ (1 << param1); } -int ov17_0224F1F8 (UnkStruct_ov17_0224F30C * param0, u8 param1, u16 param2, void * param3, int param4) +int ov17_0224F1F8(UnkStruct_ov17_0224F30C *param0, u8 param1, u16 param2, void *param3, int param4) { UnkStruct_ov17_02243C80 v0; @@ -63,7 +64,7 @@ int ov17_0224F1F8 (UnkStruct_ov17_0224F30C * param0, u8 param1, u16 param2, void return v0.unk_05; } -void ov17_0224F26C (UnkStruct_ov17_0224F30C * param0, const UnkStruct_ov17_02243C80 * param1, void * param2, int param3) +void ov17_0224F26C(UnkStruct_ov17_0224F30C *param0, const UnkStruct_ov17_02243C80 *param1, void *param2, int param3) { UnkStruct_ov17_02243C80 v0; @@ -85,13 +86,13 @@ void ov17_0224F26C (UnkStruct_ov17_0224F30C * param0, const UnkStruct_ov17_02243 param0->unk_A10 = 1; } -static void ov17_0224F2DC (UnkStruct_ov17_0224F30C * param0, int param1, UnkStruct_ov17_02243C80 ** param2, void ** param3) +static void ov17_0224F2DC(UnkStruct_ov17_0224F30C *param0, int param1, UnkStruct_ov17_02243C80 **param2, void **param3) { *param2 = (void *)param0->unk_210[param1]; *param3 = ¶m0->unk_210[param1][sizeof(UnkStruct_ov17_02243C80)]; } -static BOOL ov17_0224F2F8 (UnkStruct_ov17_0224F30C * param0) +static BOOL ov17_0224F2F8(UnkStruct_ov17_0224F30C *param0) { if (param0->unk_A10 == 1) { return 0; @@ -104,7 +105,7 @@ static BOOL ov17_0224F2F8 (UnkStruct_ov17_0224F30C * param0) return 1; } -int ov17_0224F30C (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +int ov17_0224F30C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { if (ov17_0224F2F8(param0) == 0) { return 0; @@ -115,7 +116,7 @@ int ov17_0224F30C (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, return 1; } -static BOOL ov17_0224F344 (int param0, int param1, int param2) +static BOOL ov17_0224F344(int param0, int param1, int param2) { if ((param0 == param2) || (param2 == 0xff) || ((param2 == 0xfe) && (param1 == param0))) { return 1; @@ -124,7 +125,7 @@ static BOOL ov17_0224F344 (int param0, int param1, int param2) return 0; } -BOOL ov17_0224F35C (UnkStruct_ov17_0224F30C * param0) +BOOL ov17_0224F35C(UnkStruct_ov17_0224F30C *param0) { if (param0->unk_A10 == 0) { return 0; @@ -138,7 +139,7 @@ BOOL ov17_0224F35C (UnkStruct_ov17_0224F30C * param0) param0->unk_A10 = 0; return 1; } else { - UnkStruct_ov17_02243C80 * v0; + UnkStruct_ov17_02243C80 *v0; v0 = (void *)param0->unk_10; @@ -151,15 +152,15 @@ BOOL ov17_0224F35C (UnkStruct_ov17_0224F30C * param0) return 0; } -BOOL ov17_0224F3D0 (UnkStruct_ov17_0224F30C * param0) +BOOL ov17_0224F3D0(UnkStruct_ov17_0224F30C *param0) { return param0->unk_A10; } -int ov17_0224F3D8 (UnkStruct_ov17_0224F30C * param0, void * param1) +int ov17_0224F3D8(UnkStruct_ov17_0224F30C *param0, void *param1) { - UnkStruct_ov17_02243C80 * v0; - void * v1; + UnkStruct_ov17_02243C80 *v0; + void *v1; UnkStruct_ov17_0224F3D8 v2; int v3; @@ -199,7 +200,7 @@ int ov17_0224F3D8 (UnkStruct_ov17_0224F30C * param0, void * param1) return 0; } -BOOL ov17_0224F4B8 (UnkStruct_ov17_0224F30C * param0, int param1, int param2, int param3) +BOOL ov17_0224F4B8(UnkStruct_ov17_0224F30C *param0, int param1, int param2, int param3) { if (param2 != param3) { return 1; diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index a803383666..ab4647859e 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -1,10 +1,16 @@ +#include "overlay017/ov17_0224F4D4.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/struct_02099F80.h" + +#include "overlay011/ov11_0221F840.h" +#include "overlay017/ov17_0223F118.h" +#include "overlay017/ov17_0224F18C.h" +#include "overlay017/ov17_02250744.h" +#include "overlay017/ov17_02251D6C.h" #include "overlay017/struct_ov17_0224FCA0.h" #include "overlay017/struct_ov17_0224FECC.h" #include "overlay084/struct_ov84_0223BA5C.h" @@ -13,73 +19,68 @@ #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "game_overlay.h" -#include "overlay_manager.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_020366A0.h" #include "unk_020393C8.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" -#include "overlay011/ov11_0221F840.h" -#include "overlay017/ov17_0223F118.h" -#include "overlay017/ov17_0224F18C.h" -#include "overlay017/ov17_0224F4D4.h" -#include "overlay017/ov17_02250744.h" -#include "overlay017/ov17_02251D6C.h" FS_EXTERN_OVERLAY(overlay11); FS_EXTERN_OVERLAY(overlay12); FS_EXTERN_OVERLAY(overlay22); -static void ov17_0224FA24(void * param0); -static void ov17_0224FAAC(void * param0); -static void ov17_0224FAFC(SysTask * param0, void * param1); -static void ov17_0224FB34(BGL * param0); -static void ov17_0224FCA0(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_0224FE1C(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_0224FE48(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_0224FE50(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_0224FE58(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_0224FE5C(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_0224FE60(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_0224FE68(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_0224FE70(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_0224FEC8(UnkStruct_ov17_0224FCA0 * param0); -static int ov17_0224FECC(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); -static int ov17_02250000(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); -static int ov17_02250084(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); -static int ov17_022504E4(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); -static int ov17_02250548(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); -static int ov17_0225062C(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); -static int ov17_022506AC(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); +static void ov17_0224FA24(void *param0); +static void ov17_0224FAAC(void *param0); +static void ov17_0224FAFC(SysTask *param0, void *param1); +static void ov17_0224FB34(BGL *param0); +static void ov17_0224FCA0(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_0224FE1C(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_0224FE48(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_0224FE50(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_0224FE58(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_0224FE5C(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_0224FE60(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_0224FE68(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_0224FE70(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_0224FEC8(UnkStruct_ov17_0224FCA0 *param0); +static int ov17_0224FECC(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); +static int ov17_02250000(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); +static int ov17_02250084(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); +static int ov17_022504E4(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); +static int ov17_02250548(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); +static int ov17_0225062C(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); +static int ov17_022506AC(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); static void ov17_0224FDDC(void); -static int ov17_022500E8(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); -static int ov17_02250178(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); -static int ov17_02250284(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); -static int ov17_022503B0(UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1); -static void ov17_0224FAE4(SysTask * param0, void * param1); +static int ov17_022500E8(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); +static int ov17_02250178(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); +static int ov17_02250284(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); +static int ov17_022503B0(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1); +static void ov17_0224FAE4(SysTask *param0, void *param1); -static int(*const Unk_ov17_02254B54[])(UnkStruct_ov17_0224FCA0 *, UnkStruct_ov17_0224FECC *) = { +static int (*const Unk_ov17_02254B54[])(UnkStruct_ov17_0224FCA0 *, UnkStruct_ov17_0224FECC *) = { ov17_0224FECC, ov17_02250000, ov17_02250084, @@ -132,9 +133,9 @@ __attribute__((aligned(4))) static const u16 Unk_ov17_02254AB4[] = { 0xF }; -int ov17_0224F4D4 (OverlayManager * param0, int * param1) +int ov17_0224F4D4(OverlayManager *param0, int *param1) { - UnkStruct_ov17_0224FCA0 * v0; + UnkStruct_ov17_0224FCA0 *v0; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -183,12 +184,12 @@ int ov17_0224F4D4 (OverlayManager * param0, int * param1) v0->unk_10.unk_18 = sub_0200C6E4(24); - sub_0200C73C(v0->unk_10.unk_18, &Unk_ov17_02254B0C, &Unk_ov17_02254AC4, ((16 + 16))); + sub_0200C73C(v0->unk_10.unk_18, &Unk_ov17_02254B0C, &Unk_ov17_02254AC4, (16 + 16)); sub_0200966C(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_64K); sub_02009704(NNS_G2D_VRAM_TYPE_2DMAIN); v0->unk_10.unk_1C = sub_0200C704(v0->unk_10.unk_18); - sub_0200C7C0(v0->unk_10.unk_18, v0->unk_10.unk_1C, ((64 + 64))); + sub_0200C7C0(v0->unk_10.unk_18, v0->unk_10.unk_1C, (64 + 64)); sub_0200CB30(v0->unk_10.unk_18, v0->unk_10.unk_1C, &Unk_ov17_02254AD8); v0->unk_10.unk_04 = sub_0200762C(24); @@ -225,9 +226,9 @@ int ov17_0224F4D4 (OverlayManager * param0, int * param1) return 1; } -int ov17_0224F754 (OverlayManager * param0, int * param1) +int ov17_0224F754(OverlayManager *param0, int *param1) { - UnkStruct_ov17_0224FCA0 * v0 = OverlayManager_Data(param0); + UnkStruct_ov17_0224FCA0 *v0 = OverlayManager_Data(param0); int v1; sub_02094E98(v0->unk_00); @@ -277,9 +278,9 @@ int ov17_0224F754 (OverlayManager * param0, int * param1) return 0; } -int ov17_0224F86C (OverlayManager * param0, int * param1) +int ov17_0224F86C(OverlayManager *param0, int *param1) { - UnkStruct_ov17_0224FCA0 * v0 = OverlayManager_Data(param0); + UnkStruct_ov17_0224FCA0 *v0 = OverlayManager_Data(param0); int v1; sub_020141E4(); @@ -351,9 +352,9 @@ int ov17_0224F86C (OverlayManager * param0, int * param1) return 1; } -static void ov17_0224FA24 (void * param0) +static void ov17_0224FA24(void *param0) { - UnkStruct_ov17_0224FCA0 * v0 = param0; + UnkStruct_ov17_0224FCA0 *v0 = param0; { G2_SetWnd0Position(v0->unk_851, v0->unk_852, v0->unk_853, v0->unk_854); @@ -369,9 +370,9 @@ static void ov17_0224FA24 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov17_0224FAAC (void * param0) +static void ov17_0224FAAC(void *param0) { - UnkStruct_ov17_0224FCA0 * v0 = param0; + UnkStruct_ov17_0224FCA0 *v0 = param0; s32 v1; if (v0->unk_127B == 1) { @@ -385,18 +386,18 @@ static void ov17_0224FAAC (void * param0) } } -static void ov17_0224FAE4 (SysTask * param0, void * param1) +static void ov17_0224FAE4(SysTask *param0, void *param1) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; if (v0->unk_127B == 1) { BGL_SetPriority(1, 2); } } -static void ov17_0224FAFC (SysTask * param0, void * param1) +static void ov17_0224FAFC(SysTask *param0, void *param1) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; if (v0->unk_850 == 1) { sub_02007768(v0->unk_10.unk_04); @@ -409,7 +410,7 @@ static void ov17_0224FAFC (SysTask * param0, void * param1) sub_02038A1C(24, v0->unk_10.unk_20); } -static void ov17_0224FB34 (BGL * param0) +static void ov17_0224FB34(BGL *param0) { GXLayers_DisableEngineALayers(); @@ -461,7 +462,7 @@ static void ov17_0224FB34 (BGL * param0) 2, 0, 0, - 0 + 0, }, { 0, @@ -476,7 +477,7 @@ static void ov17_0224FB34 (BGL * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -491,7 +492,7 @@ static void ov17_0224FB34 (BGL * param0) 3, 0, 0, - 0 + 0, }, }; @@ -514,8 +515,7 @@ static void ov17_0224FB34 (BGL * param0) { UnkStruct_ov97_0222DB78 v3[] = { - { - 0, + { 0, 0, 0x800, 0, @@ -527,8 +527,7 @@ static void ov17_0224FB34 (BGL * param0) 3, 0, 0, - 0 - }, + 0 }, }; sub_020183C4(param0, 4, &v3[0], 0); @@ -538,20 +537,20 @@ static void ov17_0224FB34 (BGL * param0) } } -static void ov17_0224FCA0 (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_0224FCA0(UnkStruct_ov17_0224FCA0 *param0) { - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[0], 1, 0x2, 0x13, 27, 4, 13, (((18 + 12) + 1))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[1], 1, 6, 1 + 4 * 0, 8, 3, 13, ((((18 + 12) + 1)) + (27 * 4))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[2], 1, 6, 1 + 4 * 1, 8, 3, 13, (((((18 + 12) + 1)) + (27 * 4)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[3], 1, 6, 1 + 4 * 2, 8, 3, 13, ((((((18 + 12) + 1)) + (27 * 4)) + (8 * 3)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[4], 1, 6, 1 + 4 * 3, 8, 3, 13, (((((((18 + 12) + 1)) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[5], 1, 0x10, 1 + 4 * 0, 8, 3, 13, ((((((((18 + 12) + 1)) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[6], 1, 0x10, 1 + 4 * 1, 8, 3, 13, (((((((((18 + 12) + 1)) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[7], 1, 0x10, 1 + 4 * 2, 8, 3, 13, ((((((((((18 + 12) + 1)) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); - BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[8], 1, 0x10, 1 + 4 * 3, 8, 3, 13, (((((((((((18 + 12) + 1)) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); + BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1)); + BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[1], 1, 6, 1 + 4 * 0, 8, 3, 13, (((18 + 12) + 1) + (27 * 4))); + BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[2], 1, 6, 1 + 4 * 1, 8, 3, 13, ((((18 + 12) + 1) + (27 * 4)) + (8 * 3))); + BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[3], 1, 6, 1 + 4 * 2, 8, 3, 13, (((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3))); + BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[4], 1, 6, 1 + 4 * 3, 8, 3, 13, ((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3))); + BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[5], 1, 0x10, 1 + 4 * 0, 8, 3, 13, (((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); + BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[6], 1, 0x10, 1 + 4 * 1, 8, 3, 13, ((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); + BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[7], 1, 0x10, 1 + 4 * 2, 8, 3, 13, (((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); + BGL_AddWindow(param0->unk_10.unk_20, ¶m0->unk_10.unk_24[8], 1, 0x10, 1 + 4 * 3, 8, 3, 13, ((((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3))); } -static void ov17_0224FDDC (void) +static void ov17_0224FDDC(void) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -569,7 +568,7 @@ static void ov17_0224FDDC (void) sub_02014000(); } -static void ov17_0224FE1C (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_0224FE1C(UnkStruct_ov17_0224FCA0 *param0) { int v0; @@ -582,49 +581,49 @@ static void ov17_0224FE1C (UnkStruct_ov17_0224FCA0 * param0) ov17_02251D6C(param0); } -static void ov17_0224FE48 (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_0224FE48(UnkStruct_ov17_0224FCA0 *param0) { ov17_02250A88(param0); } -static void ov17_0224FE50 (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_0224FE50(UnkStruct_ov17_0224FCA0 *param0) { ov17_02250D8C(param0); } -static void ov17_0224FE58 (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_0224FE58(UnkStruct_ov17_0224FCA0 *param0) { return; } -static void ov17_0224FE5C (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_0224FE5C(UnkStruct_ov17_0224FCA0 *param0) { return; } -static void ov17_0224FE60 (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_0224FE60(UnkStruct_ov17_0224FCA0 *param0) { ov17_022509AC(param0); } -static void ov17_0224FE68 (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_0224FE68(UnkStruct_ov17_0224FCA0 *param0) { ov17_02250D24(param0); } -static void ov17_0224FE70 (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_0224FE70(UnkStruct_ov17_0224FCA0 *param0) { sub_02006E3C(45, 19, param0->unk_10.unk_20, 4, 0, 0, 1, 24); sub_02006E60(45, 20, param0->unk_10.unk_20, 4, 0, 0, 1, 24); PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 34, 24, 1, 0, 0); } -static void ov17_0224FEC8 (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_0224FEC8(UnkStruct_ov17_0224FCA0 *param0) { return; } -static int ov17_0224FECC (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_0224FECC(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { int v0; @@ -680,7 +679,7 @@ static int ov17_0224FECC (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224F return 0; } -static int ov17_02250000 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_02250000(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { switch (param1->unk_00) { case 0: @@ -706,7 +705,7 @@ static int ov17_02250000 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224F return 0; } -static int ov17_02250084 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_02250084(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { switch (param1->unk_00) { case 0: @@ -726,7 +725,7 @@ static int ov17_02250084 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224F return 0; } -static int ov17_022500E8 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_022500E8(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { switch (param1->unk_00) { case 0: @@ -758,7 +757,7 @@ static int ov17_022500E8 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224F return 0; } -static int ov17_02250178 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_02250178(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { switch (param1->unk_00) { case 0: @@ -813,7 +812,7 @@ static int ov17_02250178 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224F return 0; } -static int ov17_02250284 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_02250284(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { switch (param1->unk_00) { case 0: @@ -869,7 +868,7 @@ static int ov17_02250284 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224F return 0; } -static int ov17_022503B0 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_022503B0(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { switch (param1->unk_00) { case 0: @@ -925,7 +924,7 @@ static int ov17_022503B0 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224F return 0; } -static int ov17_022504E4 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_022504E4(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { switch (param1->unk_00) { case 0: @@ -945,7 +944,7 @@ static int ov17_022504E4 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224F return 0; } -static int ov17_02250548 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_02250548(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { switch (param1->unk_00) { case 0: @@ -981,7 +980,7 @@ static int ov17_02250548 (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224F return 0; } -static int ov17_0225062C (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_0225062C(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { switch (param1->unk_00) { case 0: @@ -1007,7 +1006,7 @@ static int ov17_0225062C (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224F return 0; } -static int ov17_022506AC (UnkStruct_ov17_0224FCA0 * param0, UnkStruct_ov17_0224FECC * param1) +static int ov17_022506AC(UnkStruct_ov17_0224FCA0 *param0, UnkStruct_ov17_0224FECC *param1) { switch (param1->unk_00) { case 0: diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 67a9442245..8ae121e2b6 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -1,70 +1,68 @@ +#include "overlay017/ov17_02250744.h" + #include #include -#include "assert.h" - -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" -#include "message.h" -#include "sys_task_manager.h" -#include "strbuf.h" - +#include "struct_decls/struct_02006C24_decl.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02095C48.h" + +#include "overlay017/ov17_0223F118.h" #include "overlay017/struct_ov17_0224FCA0.h" #include "overlay017/struct_ov17_022507C4.h" #include "overlay017/struct_ov17_022508E4.h" #include "overlay017/struct_ov17_02254C0C.h" -#include "struct_defs/sprite_template.h" +#include "assert.h" +#include "game_options.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" -#include "pokemon.h" -#include "pokemon_icon.h" #include "unk_020933F8.h" #include "unk_02094EDC.h" -#include "overlay017/ov17_0223F118.h" -#include "overlay017/ov17_02250744.h" typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; - u8 * unk_04; + UnkStruct_ov17_0224FCA0 *unk_00; + u8 *unk_04; s32 unk_08; s32 unk_0C; u8 unk_10; } UnkStruct_ov17_02251598; typedef struct { - Sprite * unk_00; - u8 * unk_04; + Sprite *unk_00; + u8 *unk_04; s32 unk_08; s32 unk_0C; u8 unk_10; } UnkStruct_ov17_02251718; typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; + UnkStruct_ov17_0224FCA0 *unk_00; s16 unk_04; } UnkStruct_ov17_02250FE4; typedef struct { - UnkStruct_ov17_0224FCA0 * unk_00; - CellActorData * unk_04; + UnkStruct_ov17_0224FCA0 *unk_00; + CellActorData *unk_04; s32 unk_08; s32 unk_0C; s16 unk_10; @@ -74,62 +72,62 @@ typedef struct { s32 unk_1C; } UnkStruct_ov17_02251070; -static void ov17_022507F0(UnkStruct_ov17_0224FCA0 * param0, int param1, const UnkStruct_ov17_022508E4 * param2); -static void ov17_022508E4(UnkStruct_ov17_0224FCA0 * param0, MessageLoader * param1, u32 param2, int param3, const UnkStruct_ov17_022508E4 * param4); -void ov17_02250744(UnkStruct_ov17_0224FCA0 * param0); -void ov17_022507C4(UnkStruct_ov17_022507C4 * param0); -void ov17_02250968(UnkStruct_ov17_0224FCA0 * param0, u32 param1, const UnkStruct_ov17_022508E4 * param2); -int ov17_0225099C(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250DB0(UnkStruct_ov17_0224FCA0 * param0); -void ov17_02250EFC(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_02250F4C(SysTask * param0, void * param1); -void ov17_02250F68(UnkStruct_ov17_0224FCA0 * param0, NARC * param1); -void ov17_02250FBC(UnkStruct_ov17_0224FCA0 * param0); -void ov17_0225122C(UnkStruct_ov17_0224FCA0 * param0, NARC * param1); -void ov17_022512E0(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_022515F4(SysTask * param0, void * param1); -static void ov17_02251688(SysTask * param0, void * param1); -static void ov17_02251784(SysTask * param0, void * param1); -static void ov17_022517F0(SysTask * param0, void * param1); -static void ov17_0225102C(SysTask * param0, void * param1); -static void ov17_02251070(UnkStruct_ov17_0224FCA0 * param0); -static void ov17_02251140(SysTask * param0, void * param1); +static void ov17_022507F0(UnkStruct_ov17_0224FCA0 *param0, int param1, const UnkStruct_ov17_022508E4 *param2); +static void ov17_022508E4(UnkStruct_ov17_0224FCA0 *param0, MessageLoader *param1, u32 param2, int param3, const UnkStruct_ov17_022508E4 *param4); +void ov17_02250744(UnkStruct_ov17_0224FCA0 *param0); +void ov17_022507C4(UnkStruct_ov17_022507C4 *param0); +void ov17_02250968(UnkStruct_ov17_0224FCA0 *param0, u32 param1, const UnkStruct_ov17_022508E4 *param2); +int ov17_0225099C(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250DB0(UnkStruct_ov17_0224FCA0 *param0); +void ov17_02250EFC(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_02250F4C(SysTask *param0, void *param1); +void ov17_02250F68(UnkStruct_ov17_0224FCA0 *param0, NARC *param1); +void ov17_02250FBC(UnkStruct_ov17_0224FCA0 *param0); +void ov17_0225122C(UnkStruct_ov17_0224FCA0 *param0, NARC *param1); +void ov17_022512E0(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_022515F4(SysTask *param0, void *param1); +static void ov17_02251688(SysTask *param0, void *param1); +static void ov17_02251784(SysTask *param0, void *param1); +static void ov17_022517F0(SysTask *param0, void *param1); +static void ov17_0225102C(SysTask *param0, void *param1); +static void ov17_02251070(UnkStruct_ov17_0224FCA0 *param0); +static void ov17_02251140(SysTask *param0, void *param1); __attribute__((aligned(4))) static const s16 Unk_ov17_02254BF4[4][3] = { - {0x2C, 0x46, 0xFFFFFFFFFFFFFE00}, - {0x64, 0x46, 0xFFFFFFFFFFFFFD80}, - {0x9C, 0x46, 0xFFFFFFFFFFFFFD80}, - {0xD4, 0x46, 0xFFFFFFFFFFFFFD80} + { 0x2C, 0x46, 0xFFFFFFFFFFFFFE00 }, + { 0x64, 0x46, 0xFFFFFFFFFFFFFD80 }, + { 0x9C, 0x46, 0xFFFFFFFFFFFFFD80 }, + { 0xD4, 0x46, 0xFFFFFFFFFFFFFD80 } }; static const struct { s16 unk_00; s16 unk_02; } Unk_ov17_02254BD4[] = { - {0x1C, 0x14}, - {0x1C, 0x34}, - {0x1C, 0x54}, - {0x1C, 0x74} + { 0x1C, 0x14 }, + { 0x1C, 0x34 }, + { 0x1C, 0x54 }, + { 0x1C, 0x74 } }; static const struct { s16 unk_00; s16 unk_02; } Unk_ov17_02254BE4[] = { - {0xE8, 0xD}, - {0xE8, 0x2D}, - {0xE8, 0x4D}, - {0xE8, 0x6D} + { 0xE8, 0xD }, + { 0xE8, 0x2D }, + { 0xE8, 0x4D }, + { 0xE8, 0x6D } }; static const UnkStruct_ov17_02254C0C Unk_ov17_02254C0C[] = { - {0x0, 0x0}, - {0x0, 0x0}, - {0x1, 0x0}, - {0x2, 0x0}, - {0x3, 0x0}, - {0x4, 0x3}, - {0x5, 0x0} + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0x1, 0x0 }, + { 0x2, 0x0 }, + { 0x3, 0x0 }, + { 0x4, 0x3 }, + { 0x5, 0x0 } }; static const SpriteTemplate Unk_ov17_02254C5C = { @@ -140,7 +138,7 @@ static const SpriteTemplate Unk_ov17_02254C5C = { 0x64, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80EA, 0x80EB, 0x80EA, 0x80EA, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80EA, 0x80EB, 0x80EA, 0x80EA, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -153,7 +151,7 @@ static const SpriteTemplate Unk_ov17_02254C28 = { 0x14, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80EF, 0x80E9, 0x80EC, 0x80EC, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80EF, 0x80E9, 0x80EC, 0x80EC, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -166,7 +164,7 @@ static const SpriteTemplate Unk_ov17_02254C90 = { 0x64, 0x3, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80EE, 0x80E9, 0x80EB, 0x80EB, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80EE, 0x80E9, 0x80EB, 0x80EB, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -179,12 +177,12 @@ static const SpriteTemplate Unk_ov17_02254CC4 = { 0x6E, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x80F0, 0x80EC, 0x80ED, 0x80ED, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x80F0, 0x80EC, 0x80ED, 0x80ED, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; -void ov17_02250744 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250744(UnkStruct_ov17_0224FCA0 *param0) { int v0, v1; @@ -198,7 +196,7 @@ void ov17_02250744 (UnkStruct_ov17_0224FCA0 * param0) } } -void ov17_022507C4 (UnkStruct_ov17_022507C4 * param0) +void ov17_022507C4(UnkStruct_ov17_022507C4 *param0) { int v0; @@ -209,7 +207,7 @@ void ov17_022507C4 (UnkStruct_ov17_022507C4 * param0) } } -static void ov17_022507F0 (UnkStruct_ov17_0224FCA0 * param0, int param1, const UnkStruct_ov17_022508E4 * param2) +static void ov17_022507F0(UnkStruct_ov17_0224FCA0 *param0, int param1, const UnkStruct_ov17_022508E4 *param2) { u32 v0; @@ -239,9 +237,9 @@ static void ov17_022507F0 (UnkStruct_ov17_0224FCA0 * param0, int param1, const U } } -static void ov17_022508E4 (UnkStruct_ov17_0224FCA0 * param0, MessageLoader * param1, u32 param2, int param3, const UnkStruct_ov17_022508E4 * param4) +static void ov17_022508E4(UnkStruct_ov17_0224FCA0 *param0, MessageLoader *param1, u32 param2, int param3, const UnkStruct_ov17_022508E4 *param4) { - Strbuf* v0; + Strbuf *v0; int v1; if (param0->unk_00->unk_155 == 0) { @@ -261,7 +259,7 @@ static void ov17_022508E4 (UnkStruct_ov17_0224FCA0 * param0, MessageLoader * par Strbuf_Free(v0); } -void ov17_02250968 (UnkStruct_ov17_0224FCA0 * param0, u32 param1, const UnkStruct_ov17_022508E4 * param2) +void ov17_02250968(UnkStruct_ov17_0224FCA0 *param0, u32 param1, const UnkStruct_ov17_022508E4 *param2) { u32 v0, v1; @@ -273,15 +271,15 @@ void ov17_02250968 (UnkStruct_ov17_0224FCA0 * param0, u32 param1, const UnkStruc ov17_022508E4(param0, param0->unk_10.unk_B4, v0, v1, param2); } -int ov17_0225099C (UnkStruct_ov17_0224FCA0 * param0) +int ov17_0225099C(UnkStruct_ov17_0224FCA0 *param0) { return Message_Printing(param0->unk_10.unk_388); } -void ov17_022509AC (UnkStruct_ov17_0224FCA0 * param0) +void ov17_022509AC(UnkStruct_ov17_0224FCA0 *param0) { int v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 24); @@ -299,27 +297,27 @@ void ov17_022509AC (UnkStruct_ov17_0224FCA0 * param0) NARC_dtor(v1); } -void ov17_02250A84 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250A84(UnkStruct_ov17_0224FCA0 *param0) { return; } -void ov17_02250A88 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250A88(UnkStruct_ov17_0224FCA0 *param0) { ov17_0223F560(param0->unk_10.unk_18, param0->unk_10.unk_1C, param0->unk_10.unk_C0, 33001, 33002, 33001, 33001); ov17_0223F630(¶m0->unk_10.unk_108, param0->unk_10.unk_18, param0->unk_10.unk_1C, 33001, 33002, 33001, 33001, 0, 200, 3, 50000); } -void ov17_02250AD8 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250AD8(UnkStruct_ov17_0224FCA0 *param0) { ov17_0223F6C4(¶m0->unk_10.unk_108); ov17_0223F5E8(param0->unk_10.unk_1C, 33001, 33002, 33001, 33001); } -void ov17_02250B00 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250B00(UnkStruct_ov17_0224FCA0 *param0) { int v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_BG, 24); @@ -336,7 +334,7 @@ void ov17_02250B00 (UnkStruct_ov17_0224FCA0 * param0) PaletteSys_LoadPalette(param0->unk_10.unk_C0, 38, sub_0200DD08(v0), 24, 0, 0x20, 14 * 16); { - Strbuf* v2; + Strbuf *v2; int v3, v4; v2 = Strbuf_Init(12, 24); @@ -363,20 +361,20 @@ void ov17_02250B00 (UnkStruct_ov17_0224FCA0 * param0) NARC_dtor(v1); } -void ov17_02250CEC (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250CEC(UnkStruct_ov17_0224FCA0 *param0) { sub_020038B0(param0->unk_10.unk_C0, 1, 2, 0x0, 0, 16 * 16); sub_020038B0(param0->unk_10.unk_C0, 3, 2, 0x0, 0, 16 * 16); } -void ov17_02250D24 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250D24(UnkStruct_ov17_0224FCA0 *param0) { return; } -void ov17_02250D28 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250D28(UnkStruct_ov17_0224FCA0 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_CONTEST__GRAPHIC__CONTEST_OBJ, 24); @@ -390,7 +388,7 @@ void ov17_02250D28 (UnkStruct_ov17_0224FCA0 * param0) NARC_dtor(v0); } -void ov17_02250D8C (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250D8C(UnkStruct_ov17_0224FCA0 *param0) { ov17_02250EFC(param0); ov17_022512E0(param0); @@ -399,11 +397,11 @@ void ov17_02250D8C (UnkStruct_ov17_0224FCA0 * param0) ov17_022513C0(param0); } -void ov17_02250DB0 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250DB0(UnkStruct_ov17_0224FCA0 *param0) { SpriteTemplate v0; int v1, v2; - NARC * v3; + NARC *v3; v3 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 24); @@ -434,7 +432,7 @@ void ov17_02250DB0 (UnkStruct_ov17_0224FCA0 * param0) NARC_dtor(v3); } -void ov17_02250EFC (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250EFC(UnkStruct_ov17_0224FCA0 *param0) { int v0; @@ -450,9 +448,9 @@ void ov17_02250EFC (UnkStruct_ov17_0224FCA0 * param0) SysTask_Done(param0->unk_10.unk_124); } -static void ov17_02250F4C (SysTask * param0, void * param1) +static void ov17_02250F4C(SysTask *param0, void *param1) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; for (v1 = 0; v1 < 4; v1++) { @@ -460,23 +458,23 @@ static void ov17_02250F4C (SysTask * param0, void * param1) } } -void ov17_02250F68 (UnkStruct_ov17_0224FCA0 * param0, NARC * param1) +void ov17_02250F68(UnkStruct_ov17_0224FCA0 *param0, NARC *param1) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_10.unk_18, param0->unk_10.unk_1C, param1, 102, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33007); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_10.unk_18, param0->unk_10.unk_1C, param1, 101, 1, 33004); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_10.unk_18, param0->unk_10.unk_1C, param1, 100, 1, 33004); } -void ov17_02250FBC (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250FBC(UnkStruct_ov17_0224FCA0 *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_10.unk_1C, 33007); SpriteGfxHandler_UnloadCellObjById(param0->unk_10.unk_1C, 33004); SpriteGfxHandler_UnloadAnimObjById(param0->unk_10.unk_1C, 33004); } -void ov17_02250FE4 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02250FE4(UnkStruct_ov17_0224FCA0 *param0) { - UnkStruct_ov17_02250FE4 * v0; + UnkStruct_ov17_02250FE4 *v0; int v1; v0 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_02250FE4)); @@ -491,14 +489,14 @@ void ov17_02250FE4 (UnkStruct_ov17_0224FCA0 * param0) SysTask_Start(ov17_0225102C, v0, (50000 + 10)); } -void ov17_02251020 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02251020(UnkStruct_ov17_0224FCA0 *param0) { param0->unk_1279 = 1; } -static void ov17_0225102C (SysTask * param0, void * param1) +static void ov17_0225102C(SysTask *param0, void *param1) { - UnkStruct_ov17_02250FE4 * v0 = param1; + UnkStruct_ov17_02250FE4 *v0 = param1; if (v0->unk_00->unk_1279 == 1) { Heap_FreeToHeap(param1); @@ -516,10 +514,10 @@ static void ov17_0225102C (SysTask * param0, void * param1) } } -static void ov17_02251070 (UnkStruct_ov17_0224FCA0 * param0) +static void ov17_02251070(UnkStruct_ov17_0224FCA0 *param0) { - CellActorData * v0; - UnkStruct_ov17_02251070 * v1; + CellActorData *v0; + UnkStruct_ov17_02251070 *v1; s32 v2, v3; v1 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_02251070)); @@ -547,9 +545,9 @@ static void ov17_02251070 (UnkStruct_ov17_0224FCA0 * param0) param0->unk_127A++; } -static void ov17_02251140 (SysTask * param0, void * param1) +static void ov17_02251140(SysTask *param0, void *param1) { - UnkStruct_ov17_02251070 * v0 = param1; + UnkStruct_ov17_02251070 *v0 = param1; if ((v0->unk_00->unk_1279 == 1) || ((v0->unk_0C / 0x100) > (192 + 16)) || (((v0->unk_08 + v0->unk_10) / 0x100) < -16)) { v0->unk_00->unk_127A--; @@ -573,7 +571,7 @@ static void ov17_02251140 (SysTask * param0, void * param1) sub_0200D330(v0->unk_04); } -void ov17_0225122C (UnkStruct_ov17_0224FCA0 * param0, NARC * param1) +void ov17_0225122C(UnkStruct_ov17_0224FCA0 *param0, NARC *param1) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_10.unk_18, param0->unk_10.unk_1C, param1, 84, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33006); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_10.unk_18, param0->unk_10.unk_1C, param1, 83, 1, 33003); @@ -595,7 +593,7 @@ void ov17_0225122C (UnkStruct_ov17_0224FCA0 * param0, NARC * param1) } } -void ov17_022512E0 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_022512E0(UnkStruct_ov17_0224FCA0 *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_10.unk_1C, 33006); SpriteGfxHandler_UnloadCellObjById(param0->unk_10.unk_1C, 33003); @@ -610,14 +608,14 @@ void ov17_022512E0 (UnkStruct_ov17_0224FCA0 * param0) } } -void ov17_0225131C (UnkStruct_ov17_0224FCA0 * param0, int param1, int param2) +void ov17_0225131C(UnkStruct_ov17_0224FCA0 *param0, int param1, int param2) { sub_0200D364(param0->unk_10.unk_138[param1], param2); SpriteActor_EnableObject(param0->unk_10.unk_138[param1], 1); Sound_PlayEffect(1501); } -void ov17_02251344 (UnkStruct_ov17_0224FCA0 * param0, NARC * param1) +void ov17_02251344(UnkStruct_ov17_0224FCA0 *param0, NARC *param1) { SpriteRenderer_LoadPalette(param0->unk_10.unk_C0, 2, param0->unk_10.unk_18, param0->unk_10.unk_1C, param1, 11, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33004); SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_10.unk_18, param0->unk_10.unk_1C, param1, 87, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33008); @@ -625,7 +623,7 @@ void ov17_02251344 (UnkStruct_ov17_0224FCA0 * param0, NARC * param1) SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_10.unk_18, param0->unk_10.unk_1C, param1, 85, 1, 33005); } -void ov17_022513C0 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_022513C0(UnkStruct_ov17_0224FCA0 *param0) { SpriteGfxHandler_UnloadPlttObjById(param0->unk_10.unk_1C, 33004); SpriteGfxHandler_UnloadCharObjById(param0->unk_10.unk_1C, 33008); @@ -633,10 +631,10 @@ void ov17_022513C0 (UnkStruct_ov17_0224FCA0 * param0) SpriteGfxHandler_UnloadAnimObjById(param0->unk_10.unk_1C, 33005); } -void ov17_022513F4 (UnkStruct_ov17_0224FCA0 * param0, int param1, int param2, int param3, int param4) +void ov17_022513F4(UnkStruct_ov17_0224FCA0 *param0, int param1, int param2, int param3, int param4) { int v0; - CellActorData ** v1; + CellActorData **v1; int v2; int v3, v4, v5, v6, v7, v8; @@ -694,7 +692,7 @@ void ov17_022513F4 (UnkStruct_ov17_0224FCA0 * param0, int param1, int param2, in } } -void ov17_02251544 (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02251544(UnkStruct_ov17_0224FCA0 *param0) { int v0, v1; @@ -715,9 +713,9 @@ void ov17_02251544 (UnkStruct_ov17_0224FCA0 * param0) } } -void ov17_02251598 (UnkStruct_ov17_0224FCA0 * param0, int param1, u8 * param2) +void ov17_02251598(UnkStruct_ov17_0224FCA0 *param0, int param1, u8 *param2) { - UnkStruct_ov17_02251598 * v0; + UnkStruct_ov17_02251598 *v0; *param2 = 0; v0 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_02251598)); @@ -738,9 +736,9 @@ void ov17_02251598 (UnkStruct_ov17_0224FCA0 * param0, int param1, u8 * param2) } } -static void ov17_022515F4 (SysTask * param0, void * param1) +static void ov17_022515F4(SysTask *param0, void *param1) { - UnkStruct_ov17_02251598 * v0 = param1; + UnkStruct_ov17_02251598 *v0 = param1; switch (v0->unk_10) { case 0: @@ -770,9 +768,9 @@ static void ov17_022515F4 (SysTask * param0, void * param1) } } -static void ov17_02251688 (SysTask * param0, void * param1) +static void ov17_02251688(SysTask *param0, void *param1) { - UnkStruct_ov17_02251598 * v0 = param1; + UnkStruct_ov17_02251598 *v0 = param1; switch (v0->unk_10) { case 0: @@ -802,9 +800,9 @@ static void ov17_02251688 (SysTask * param0, void * param1) } } -void ov17_02251718 (UnkStruct_ov17_0224FCA0 * param0, int param1, int param2, u8 * param3) +void ov17_02251718(UnkStruct_ov17_0224FCA0 *param0, int param1, int param2, u8 *param3) { - UnkStruct_ov17_02251718 * v0; + UnkStruct_ov17_02251718 *v0; *param3 = 0; v0 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_02251718)); @@ -825,9 +823,9 @@ void ov17_02251718 (UnkStruct_ov17_0224FCA0 * param0, int param1, int param2, u8 } } -static void ov17_02251784 (SysTask * param0, void * param1) +static void ov17_02251784(SysTask *param0, void *param1) { - UnkStruct_ov17_02251718 * v0 = param1; + UnkStruct_ov17_02251718 *v0 = param1; switch (v0->unk_10) { case 0: @@ -852,9 +850,9 @@ static void ov17_02251784 (SysTask * param0, void * param1) } } -static void ov17_022517F0 (SysTask * param0, void * param1) +static void ov17_022517F0(SysTask *param0, void *param1) { - UnkStruct_ov17_02251718 * v0 = param1; + UnkStruct_ov17_02251718 *v0 = param1; switch (v0->unk_10) { case 0: @@ -878,7 +876,7 @@ static void ov17_022517F0 (SysTask * param0, void * param1) } } -static int ov17_02251860 (UnkStruct_02095C48 * param0, int param1) +static int ov17_02251860(UnkStruct_02095C48 *param0, int param1) { switch (param0->unk_00.unk_111) { case 0: @@ -937,7 +935,7 @@ static int ov17_02251860 (UnkStruct_02095C48 * param0, int param1) } } -static int ov17_02251914 (UnkStruct_02095C48 * param0, int param1) +static int ov17_02251914(UnkStruct_02095C48 *param0, int param1) { int v0, v1; @@ -948,7 +946,7 @@ static int ov17_02251914 (UnkStruct_02095C48 * param0, int param1) return v1; } -void ov17_02251930 (UnkStruct_02095C48 * param0, int param1, s16 param2[]) +void ov17_02251930(UnkStruct_02095C48 *param0, int param1, s16 param2[]) { int v0[4]; int v1[4]; @@ -1002,7 +1000,7 @@ void ov17_02251930 (UnkStruct_02095C48 * param0, int param1, s16 param2[]) } } -void ov17_02251A1C (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02251A1C(UnkStruct_ov17_0224FCA0 *param0) { int v0; diff --git a/src/overlay017/ov17_02251D6C.c b/src/overlay017/ov17_02251D6C.c index 4c0cd34f41..8c79b97de4 100644 --- a/src/overlay017/ov17_02251D6C.c +++ b/src/overlay017/ov17_02251D6C.c @@ -1,8 +1,11 @@ +#include "overlay017/ov17_02251D6C.h" + #include #include -#include "sys_task_manager.h" - +#include "overlay017/ov17_0223F118.h" +#include "overlay017/ov17_0224F18C.h" +#include "overlay017/ov17_02250744.h" #include "overlay017/struct_ov17_02243C28.h" #include "overlay017/struct_ov17_02243C80.h" #include "overlay017/struct_ov17_0224F30C.h" @@ -20,64 +23,61 @@ #include "overlay017/struct_ov17_022529C8.h" #include "overlay017/struct_ov17_022539E4.h" +#include "heap.h" +#include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_0200762C.h" #include "unk_0200A9DC.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "pokemon.h" -#include "overlay017/ov17_0223F118.h" -#include "overlay017/ov17_0224F18C.h" -#include "overlay017/ov17_02250744.h" -#include "overlay017/ov17_02251D6C.h" -static int ov17_02251DAC(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02251DC0(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02251DD0(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4); -static int ov17_02251E54(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02251E68(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02251EAC(SysTask * param0, void * param1); -static int ov17_02252008(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_0225201C(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02252060(SysTask * param0, void * param1); -static int ov17_022521E4(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_022521F8(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static int ov17_02252210(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02252224(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0225228C(SysTask * param0, void * param1); -static int ov17_02252344(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02252358(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_022523AC(SysTask * param0, void * param1); -static int ov17_0225260C(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02252620(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_0225266C(SysTask * param0, void * param1); -static int ov17_02252514(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02252528(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02252580(SysTask * param0, void * param1); -static int ov17_02251DD4(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02251DE8(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static int ov17_02252798(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_022527AC(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_02252858(SysTask * param0, void * param1); -static int ov17_02252970(UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3); -static void ov17_02252984(UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3); -static void ov17_022529C8(SysTask * param0, void * param1); +static int ov17_02251DAC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02251DC0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02251DD0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4); +static int ov17_02251E54(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02251E68(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02251EAC(SysTask *param0, void *param1); +static int ov17_02252008(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_0225201C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02252060(SysTask *param0, void *param1); +static int ov17_022521E4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_022521F8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static int ov17_02252210(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02252224(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0225228C(SysTask *param0, void *param1); +static int ov17_02252344(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02252358(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_022523AC(SysTask *param0, void *param1); +static int ov17_0225260C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02252620(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_0225266C(SysTask *param0, void *param1); +static int ov17_02252514(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02252528(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02252580(SysTask *param0, void *param1); +static int ov17_02251DD4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02251DE8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static int ov17_02252798(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_022527AC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_02252858(SysTask *param0, void *param1); +static int ov17_02252970(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3); +static void ov17_02252984(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3); +static void ov17_022529C8(SysTask *param0, void *param1); static const UnkStruct_ov17_022539E4 Unk_ov17_02254D18[] = { - {ov17_02251DAC, ov17_02251DC0, ov17_02251DD0}, - {ov17_02251DD4, ov17_02251DE8, NULL}, - {ov17_02251E54, ov17_02251E68, NULL}, - {ov17_02252008, ov17_0225201C, NULL}, - {ov17_022521E4, ov17_022521F8, NULL}, - {ov17_02252210, ov17_02252224, NULL}, - {ov17_02252344, ov17_02252358, NULL}, - {ov17_02252514, ov17_02252528, NULL}, - {ov17_0225260C, ov17_02252620, NULL}, - {ov17_02252798, ov17_022527AC, NULL}, - {ov17_02252970, ov17_02252984, NULL} + { ov17_02251DAC, ov17_02251DC0, ov17_02251DD0 }, + { ov17_02251DD4, ov17_02251DE8, NULL }, + { ov17_02251E54, ov17_02251E68, NULL }, + { ov17_02252008, ov17_0225201C, NULL }, + { ov17_022521E4, ov17_022521F8, NULL }, + { ov17_02252210, ov17_02252224, NULL }, + { ov17_02252344, ov17_02252358, NULL }, + { ov17_02252514, ov17_02252528, NULL }, + { ov17_0225260C, ov17_02252620, NULL }, + { ov17_02252798, ov17_022527AC, NULL }, + { ov17_02252970, ov17_02252984, NULL } }; __attribute__((aligned(4))) static const s8 Unk_ov17_02254CF8[] = { @@ -103,7 +103,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov17_02254D00[] = { 0x138 }; -void ov17_02251D6C (UnkStruct_ov17_0224FCA0 * param0) +void ov17_02251D6C(UnkStruct_ov17_0224FCA0 *param0) { UnkStruct_ov17_02243C28 v0; @@ -116,40 +116,40 @@ void ov17_02251D6C (UnkStruct_ov17_0224FCA0 * param0) ov17_0224F18C(¶m0->unk_85C, &v0); } -static int ov17_02251DAC (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02251DAC(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_02251DC0 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02251DC0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; ov17_0224F26C(param0, param2, NULL, 0); } -static void ov17_02251DD0 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, UnkStruct_ov17_0224F3D8 * param3, int param4) +static void ov17_02251DD0(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, UnkStruct_ov17_0224F3D8 *param3, int param4) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; return; } -static int ov17_02251DD4 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02251DD4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224FCA0_sub1)); return v1; } -static void ov17_02251DE8 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02251DE8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; - UnkStruct_ov17_0224FCA0_sub1 * v1 = param3; + UnkStruct_ov17_0224FCA0 *v0 = param1; + UnkStruct_ov17_0224FCA0_sub1 *v1 = param3; int v2; v0->unk_39A = *v1; @@ -161,19 +161,19 @@ static void ov17_02251DE8 (UnkStruct_ov17_0224F30C * param0, void * param1, cons ov17_0224F26C(param0, param2, NULL, 0); } -static int ov17_02251E54 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02251E54(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_02251E68 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02251E68(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; - UnkStruct_ov17_02251EAC * v1; + UnkStruct_ov17_0224FCA0 *v0 = param1; + UnkStruct_ov17_02251EAC *v1; v1 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_02251EAC)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_02251EAC)); @@ -185,9 +185,9 @@ static void ov17_02251E68 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02251EAC, v1, 30000); } -static void ov17_02251EAC (SysTask * param0, void * param1) +static void ov17_02251EAC(SysTask *param0, void *param1) { - UnkStruct_ov17_02251EAC * v0 = param1; + UnkStruct_ov17_02251EAC *v0 = param1; switch (v0->unk_10) { case 0: @@ -205,7 +205,7 @@ static void ov17_02251EAC (SysTask * param0, void * param1) v0->unk_13 = 1; { - u16 * v1, * v2; + u16 *v1, *v2; int v3, v4, v5, v6, v7; v1 = sub_02019FE4(v0->unk_00->unk_10.unk_20, 2); @@ -262,19 +262,19 @@ static void ov17_02251EAC (SysTask * param0, void * param1) } } -static int ov17_02252008 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02252008(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_0225201C (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_0225201C(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; - UnkStruct_ov17_0225201C * v1; + UnkStruct_ov17_0224FCA0 *v0 = param1; + UnkStruct_ov17_0225201C *v1; v1 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_0225201C)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_0225201C)); @@ -286,9 +286,9 @@ static void ov17_0225201C (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02252060, v1, 30000); } -static void ov17_02252060 (SysTask * param0, void * param1) +static void ov17_02252060(SysTask *param0, void *param1) { - UnkStruct_ov17_0225201C * v0 = param1; + UnkStruct_ov17_0225201C *v0 = param1; switch (v0->unk_10) { case 0: @@ -305,7 +305,7 @@ static void ov17_02252060 (SysTask * param0, void * param1) v0->unk_13 = 1; { - u16 * v1, * v2; + u16 *v1, *v2; int v3, v4, v5, v6, v7; int v8; @@ -369,37 +369,37 @@ static void ov17_02252060 (SysTask * param0, void * param1) } } -static int ov17_022521E4 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_022521E4(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_022521F8 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_022521F8(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; v0->unk_1278 = 1; ov17_0224F26C(param0, param2, NULL, 0); } -static int ov17_02252210 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02252210(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224FCA0_sub2)); return v1; } -static void ov17_02252224 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02252224(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; - UnkStruct_ov17_0224FCA0_sub2 * v1 = param3; - UnkStruct_ov17_0225228C * v2; + UnkStruct_ov17_0224FCA0 *v0 = param1; + UnkStruct_ov17_0224FCA0_sub2 *v1 = param3; + UnkStruct_ov17_0225228C *v2; v2 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_0225228C)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0225228C)); @@ -417,9 +417,9 @@ static void ov17_02252224 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_0225228C, v2, 30000); } -static void ov17_0225228C (SysTask * param0, void * param1) +static void ov17_0225228C(SysTask *param0, void *param1) { - UnkStruct_ov17_0225228C * v0 = param1; + UnkStruct_ov17_0225228C *v0 = param1; switch (v0->unk_10) { case 0: @@ -459,19 +459,19 @@ static void ov17_0225228C (SysTask * param0, void * param1) } } -static int ov17_02252344 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02252344(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224FCA0_sub1)); return v1; } -static void ov17_02252358 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02252358(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; - UnkStruct_ov17_022523AC * v1; + UnkStruct_ov17_0224FCA0 *v0 = param1; + UnkStruct_ov17_022523AC *v1; v0->unk_39A = *((UnkStruct_ov17_0224FCA0_sub1 *)param3); @@ -485,9 +485,9 @@ static void ov17_02252358 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_022523AC, v1, 1000); } -static void ov17_022523AC (SysTask * param0, void * param1) +static void ov17_022523AC(SysTask *param0, void *param1) { - UnkStruct_ov17_022523AC * v0 = param1; + UnkStruct_ov17_022523AC *v0 = param1; switch (v0->unk_10) { case 0: @@ -554,20 +554,20 @@ static void ov17_022523AC (SysTask * param0, void * param1) } } -static int ov17_02252514 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02252514(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224FCA0_sub2)); return v1; } -static void ov17_02252528 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02252528(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; - UnkStruct_ov17_0224FCA0_sub2 * v1 = param3; - UnkStruct_ov17_02252580 * v2; + UnkStruct_ov17_0224FCA0 *v0 = param1; + UnkStruct_ov17_0224FCA0_sub2 *v1 = param3; + UnkStruct_ov17_02252580 *v2; int v3; v2 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_02252580)); @@ -584,9 +584,9 @@ static void ov17_02252528 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02252580, v2, 30000); } -static void ov17_02252580 (SysTask * param0, void * param1) +static void ov17_02252580(SysTask *param0, void *param1) { - UnkStruct_ov17_02252580 * v0 = param1; + UnkStruct_ov17_02252580 *v0 = param1; switch (v0->unk_10) { case 0: @@ -621,20 +621,20 @@ static void ov17_02252580 (SysTask * param0, void * param1) } } -static int ov17_0225260C (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_0225260C(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224FCA0_sub2)); return v1; } -static void ov17_02252620 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02252620(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; - UnkStruct_ov17_0224FCA0_sub2 * v1 = param3; - UnkStruct_ov17_0225266C * v2; + UnkStruct_ov17_0224FCA0 *v0 = param1; + UnkStruct_ov17_0224FCA0_sub2 *v1 = param3; + UnkStruct_ov17_0225266C *v2; v2 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_0225266C)); MI_CpuClear8(v2, sizeof(UnkStruct_ov17_0225266C)); @@ -647,9 +647,9 @@ static void ov17_02252620 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_0225266C, v2, 30000); } -static void ov17_0225266C (SysTask * param0, void * param1) +static void ov17_0225266C(SysTask *param0, void *param1) { - UnkStruct_ov17_0225266C * v0 = param1; + UnkStruct_ov17_0225266C *v0 = param1; switch (v0->unk_10) { case 0: @@ -673,8 +673,7 @@ static void ov17_0225266C (SysTask * param0, void * param1) v0->unk_10++; } break; - case 4: - { + case 4: { int v1, v2; v1 = Pokemon_GetValue(v0->unk_00->unk_10.unk_00->unk_00[v0->unk_11], MON_DATA_SPECIES, NULL); @@ -704,20 +703,20 @@ static void ov17_0225266C (SysTask * param0, void * param1) } } -static int ov17_02252798 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02252798(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, param3, sizeof(UnkStruct_ov17_0224FCA0_sub2)); return v1; } -static void ov17_022527AC (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_022527AC(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; - UnkStruct_ov17_0224FCA0_sub2 * v1 = param3; - UnkStruct_ov17_02252858 * v2; + UnkStruct_ov17_0224FCA0 *v0 = param1; + UnkStruct_ov17_0224FCA0_sub2 *v1 = param3; + UnkStruct_ov17_02252858 *v2; int v3; v2 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_02252858)); @@ -752,9 +751,9 @@ static void ov17_022527AC (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_02252858, v2, 30000); } -static void ov17_02252858 (SysTask * param0, void * param1) +static void ov17_02252858(SysTask *param0, void *param1) { - UnkStruct_ov17_02252858 * v0 = param1; + UnkStruct_ov17_02252858 *v0 = param1; int v1, v2, v3; switch (v0->unk_10) { @@ -824,19 +823,19 @@ static void ov17_02252858 (SysTask * param0, void * param1) } } -static int ov17_02252970 (UnkStruct_ov17_0224F30C * param0, void * param1, int param2, void * param3) +static int ov17_02252970(UnkStruct_ov17_0224F30C *param0, void *param1, int param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; + UnkStruct_ov17_0224FCA0 *v0 = param1; int v1; v1 = ov17_0224F1F8(param0, 0xff, param2, NULL, 0); return v1; } -static void ov17_02252984 (UnkStruct_ov17_0224F30C * param0, void * param1, const UnkStruct_ov17_02243C80 * param2, void * param3) +static void ov17_02252984(UnkStruct_ov17_0224F30C *param0, void *param1, const UnkStruct_ov17_02243C80 *param2, void *param3) { - UnkStruct_ov17_0224FCA0 * v0 = param1; - UnkStruct_ov17_022529C8 * v1; + UnkStruct_ov17_0224FCA0 *v0 = param1; + UnkStruct_ov17_022529C8 *v1; v1 = Heap_AllocFromHeap(24, sizeof(UnkStruct_ov17_022529C8)); MI_CpuClear8(v1, sizeof(UnkStruct_ov17_022529C8)); @@ -848,9 +847,9 @@ static void ov17_02252984 (UnkStruct_ov17_0224F30C * param0, void * param1, cons SysTask_Start(ov17_022529C8, v1, 30000); } -static void ov17_022529C8 (SysTask * param0, void * param1) +static void ov17_022529C8(SysTask *param0, void *param1) { - UnkStruct_ov17_022529C8 * v0 = param1; + UnkStruct_ov17_022529C8 *v0 = param1; switch (v0->unk_10) { case 0: diff --git a/src/overlay017/ov17_02252A70.c b/src/overlay017/ov17_02252A70.c index 654f97203e..3a7b14b123 100644 --- a/src/overlay017/ov17_02252A70.c +++ b/src/overlay017/ov17_02252A70.c @@ -1,3 +1,5 @@ +#include "overlay017/ov17_02252A70.h" + #include #include @@ -5,9 +7,8 @@ #include "unk_02006E3C.h" #include "unk_020298BC.h" -#include "overlay017/ov17_02252A70.h" -u32 ov17_02252A70 (const UnkStruct_02029C88 * param0, const u8 * param1) +u32 ov17_02252A70(const UnkStruct_02029C88 *param0, const u8 *param1) { u8 v0; u32 v1; @@ -25,7 +26,7 @@ u32 ov17_02252A70 (const UnkStruct_02029C88 * param0, const u8 * param1) return v1; } -u8 * ov17_02252A9C (u32 param0, u32 param1) +u8 *ov17_02252A9C(u32 param0, u32 param1) { return sub_02006FE8(90, 3 + param1, 0, param0, 0); } diff --git a/src/overlay017/ov17_02252AB0.c b/src/overlay017/ov17_02252AB0.c index 509d09e97a..302c614441 100644 --- a/src/overlay017/ov17_02252AB0.c +++ b/src/overlay017/ov17_02252AB0.c @@ -1,30 +1,30 @@ +#include "overlay017/ov17_02252AB0.h" + #include #include #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" - -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" -#include "unk_0200C6E4.h" -#include "sys_task.h" #include "heap.h" -#include "overlay017/ov17_02252AB0.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_0200C6E4.h" typedef struct UnkStruct_ov17_02252B48_t { - CellActorData * unk_00[5]; - SysTask * unk_14; + CellActorData *unk_00[5]; + SysTask *unk_14; } UnkStruct_ov17_02252B48; -static void ov17_02252CB8(SysTask * param0, void * param1); -void ov17_02252AB0(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, u32 param3, u32 param4, u32 param5, u32 param6); -void ov17_02252B20(SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4); -UnkStruct_ov17_02252B48 * ov17_02252B48(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -void ov17_02252BCC(UnkStruct_ov17_02252B48 * param0); -void ov17_02252C9C(UnkStruct_ov17_02252B48 * param0); +static void ov17_02252CB8(SysTask *param0, void *param1); +void ov17_02252AB0(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, u32 param3, u32 param4, u32 param5, u32 param6); +void ov17_02252B20(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4); +UnkStruct_ov17_02252B48 *ov17_02252B48(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +void ov17_02252BCC(UnkStruct_ov17_02252B48 *param0); +void ov17_02252C9C(UnkStruct_ov17_02252B48 *param0); static const SpriteTemplate Unk_ov17_02254D9C = { 0x0, @@ -34,12 +34,12 @@ static const SpriteTemplate Unk_ov17_02254D9C = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x0, 0x0, 0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x0, 0x0, 0x0, 0x0, 0xFFFFFFFF, 0xFFFFFFFF }, 0x0, 0x0 }; -void ov17_02252AB0 (SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, u32 param3, u32 param4, u32 param5, u32 param6) +void ov17_02252AB0(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, u32 param3, u32 param4, u32 param5, u32 param6) { sub_0200CD7C(param2, 3, param0, param1, 27, 80, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param4); sub_0200CBDC(param0, param1, 27, 250, 1, NNS_G2D_VRAM_TYPE_2DSUB, param3); @@ -47,7 +47,7 @@ void ov17_02252AB0 (SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteD sub_0200CE3C(param0, param1, 27, 252, 1, param6); } -void ov17_02252B20 (SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param3, u32 param4) +void ov17_02252B20(SpriteGfxHandler *param0, u32 param1, u32 param2, u32 param3, u32 param4) { SpriteGfxHandler_UnloadCharObjById(param0, param1); SpriteGfxHandler_UnloadPlttObjById(param0, param2); @@ -55,9 +55,9 @@ void ov17_02252B20 (SpriteGfxHandler * param0, u32 param1, u32 param2, u32 param SpriteGfxHandler_UnloadAnimObjById(param0, param4); } -UnkStruct_ov17_02252B48 * ov17_02252B48 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +UnkStruct_ov17_02252B48 *ov17_02252B48(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { - UnkStruct_ov17_02252B48 * v0; + UnkStruct_ov17_02252B48 *v0; SpriteTemplate v1; int v2; @@ -81,7 +81,7 @@ UnkStruct_ov17_02252B48 * ov17_02252B48 (SpriteRenderer * param0, SpriteGfxHandl return v0; } -void ov17_02252BCC (UnkStruct_ov17_02252B48 * param0) +void ov17_02252BCC(UnkStruct_ov17_02252B48 *param0) { int v0; @@ -93,7 +93,7 @@ void ov17_02252BCC (UnkStruct_ov17_02252B48 * param0) Heap_FreeToHeap(param0); } -void ov17_02252BF0 (UnkStruct_ov17_02252B48 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9) +void ov17_02252BF0(UnkStruct_ov17_02252B48 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9) { int v0; @@ -112,12 +112,12 @@ void ov17_02252BF0 (UnkStruct_ov17_02252B48 * param0, int param1, int param2, in } } -void ov17_02252C78 (UnkStruct_ov17_02252B48 * param0, int param1, int param2, int param3, int param4, fx32 param5) +void ov17_02252C78(UnkStruct_ov17_02252B48 *param0, int param1, int param2, int param3, int param4, fx32 param5) { ov17_02252BF0(param0, param1, param3, param2, param3, param1, param4, param2, param4, param5); } -void ov17_02252C9C (UnkStruct_ov17_02252B48 * param0) +void ov17_02252C9C(UnkStruct_ov17_02252B48 *param0) { int v0; @@ -126,9 +126,9 @@ void ov17_02252C9C (UnkStruct_ov17_02252B48 * param0) } } -static void ov17_02252CB8 (SysTask * param0, void * param1) +static void ov17_02252CB8(SysTask *param0, void *param1) { - UnkStruct_ov17_02252B48 * v0 = param1; + UnkStruct_ov17_02252B48 *v0 = param1; int v1; if (sub_0200D408(v0->unk_00[0]) == 0) { diff --git a/src/overlay017/ov17_02252CEC.c b/src/overlay017/ov17_02252CEC.c index 9e8a83a71c..e5143d16f7 100644 --- a/src/overlay017/ov17_02252CEC.c +++ b/src/overlay017/ov17_02252CEC.c @@ -1,7 +1,11 @@ +#include "overlay017/ov17_02252CEC.h" + #include #include #include "struct_defs/struct_02095C48.h" + +#include "overlay017/ov17_0224A0FC.h" #include "overlay017/struct_ov17_02246F24.h" #include "overlay017/struct_ov17_02247A48.h" #include "overlay017/struct_ov17_0224DF54.h" @@ -9,28 +13,25 @@ #include "overlay017/struct_ov17_0224F30C.h" #include "overlay017/struct_ov17_0224FCA0.h" -#include "overlay017/ov17_0224A0FC.h" -#include "overlay017/ov17_02252CEC.h" - -void ov17_02252CEC (int param0, int param1, void * param2, void * param3) +void ov17_02252CEC(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; - UnkStruct_ov17_0224F30C * v1; + UnkStruct_02095C48 *v0 = param3; + UnkStruct_ov17_0224F30C *v1; if (v0->unk_154 == 0) { - UnkStruct_ov17_02247A48 * v2; + UnkStruct_ov17_02247A48 *v2; v2 = v0->unk_150; v1 = &v2->unk_4F8; } else if (v0->unk_154 == 1) { - UnkStruct_ov17_0224DF54 * v3; + UnkStruct_ov17_0224DF54 *v3; v3 = v0->unk_150; v1 = &v3->unk_109C; } else if (v0->unk_154 == 2) { - UnkStruct_ov17_02246F24 * v4; + UnkStruct_ov17_02246F24 *v4; v4 = v0->unk_150; v1 = &v4->unk_BF8; } else if (v0->unk_154 == 3) { - UnkStruct_ov17_0224FCA0 * v5; + UnkStruct_ov17_0224FCA0 *v5; v5 = v0->unk_150; v1 = &v5->unk_85C; } else { @@ -45,11 +46,11 @@ void ov17_02252CEC (int param0, int param1, void * param2, void * param3) v1->unk_A11[param0] = 1; } -void ov17_02252D7C (int param0, int param1, void * param2, void * param3) +void ov17_02252D7C(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; - UnkStruct_ov17_0224DF54 * v1; - UnkStruct_ov17_0224EDE0 * v2; + UnkStruct_02095C48 *v0 = param3; + UnkStruct_ov17_0224DF54 *v1; + UnkStruct_ov17_0224EDE0 *v2; v1 = v0->unk_150; v2 = param2; diff --git a/src/overlay018/ov18_0221F800.c b/src/overlay018/ov18_0221F800.c index 3d68a6034b..77b9937125 100644 --- a/src/overlay018/ov18_0221F800.c +++ b/src/overlay018/ov18_0221F800.c @@ -1,15 +1,16 @@ +#include "overlay018/ov18_0221F800.h" + +#include #include #include -#include #include "heap.h" #include "unk_02033200.h" -#include "overlay018/ov18_0221F800.h" -void ov18_0221F800 (int param0) +void ov18_0221F800(int param0) { OSIntrMode v0; - void * v1; + void *v1; sub_02033478(); @@ -17,7 +18,7 @@ void ov18_0221F800 (int param0) OS_InitAlarm(); v0 = OS_DisableInterrupts(); - DWC_SetAuthServer((DWC_CONNECTINET_AUTH_RELEASE)); + DWC_SetAuthServer(DWC_CONNECTINET_AUTH_RELEASE); v1 = Heap_AllocFromHeap(param0, DWC_UTILITY_WORK_SIZE); (void)DWC_StartUtility(v1, DWC_LANGUAGE_ENGLISH, DWC_UTILITY_TOP_MENU_COMMON); @@ -25,5 +26,5 @@ void ov18_0221F800 (int param0) Heap_FreeToHeap(v1); OS_RestoreInterrupts(v0); - OS_EnableIrq( ); + OS_EnableIrq(); } diff --git a/src/overlay019/ov19_021D603C.c b/src/overlay019/ov19_021D603C.c index eb0705f656..cdd2719fc6 100644 --- a/src/overlay019/ov19_021D603C.c +++ b/src/overlay019/ov19_021D603C.c @@ -1,18 +1,19 @@ +#include "overlay019/ov19_021D603C.h" + #include #include #include "overlay019/struct_ov19_021D6104.h" #include "touch_screen.h" -#include "overlay019/ov19_021D603C.h" -static void ov19_021D60FC(UnkStruct_ov19_021D6104 * param0, int (* func)(UnkStruct_ov19_021D6104 *, BOOL, BOOL)); -static int ov19_021D6104(UnkStruct_ov19_021D6104 * param0, BOOL param1, BOOL param2); -static int ov19_021D6134(UnkStruct_ov19_021D6104 * param0, BOOL param1, BOOL param2); -static u16 ov19_021D6164(const UnkStruct_ov19_021D6104 * param0, u32 param1, u32 param2); -static int ov19_021D617C(const UnkStruct_ov19_021D6104 * param0, u16 param1, u16 param2); +static void ov19_021D60FC(UnkStruct_ov19_021D6104 *param0, int (*func)(UnkStruct_ov19_021D6104 *, BOOL, BOOL)); +static int ov19_021D6104(UnkStruct_ov19_021D6104 *param0, BOOL param1, BOOL param2); +static int ov19_021D6134(UnkStruct_ov19_021D6104 *param0, BOOL param1, BOOL param2); +static u16 ov19_021D6164(const UnkStruct_ov19_021D6104 *param0, u32 param1, u32 param2); +static int ov19_021D617C(const UnkStruct_ov19_021D6104 *param0, u16 param1, u16 param2); -void ov19_021D603C (UnkStruct_ov19_021D6104 * param0, int param1, int param2, int param3, int param4) +void ov19_021D603C(UnkStruct_ov19_021D6104 *param0, int param1, int param2, int param3, int param4) { param0->unk_30 = ov19_021D6104; param0->unk_1C = 0; @@ -38,7 +39,7 @@ void ov19_021D603C (UnkStruct_ov19_021D6104 * param0, int param1, int param2, in } } -int ov19_021D60A8 (UnkStruct_ov19_021D6104 * param0) +int ov19_021D60A8(UnkStruct_ov19_021D6104 *param0) { BOOL v0, v1; @@ -61,13 +62,13 @@ int ov19_021D60A8 (UnkStruct_ov19_021D6104 * param0) return param0->unk_30(param0, v0, v1); } -static void ov19_021D60FC (UnkStruct_ov19_021D6104 * param0, int (* func)(UnkStruct_ov19_021D6104 *, BOOL, BOOL)) +static void ov19_021D60FC(UnkStruct_ov19_021D6104 *param0, int (*func)(UnkStruct_ov19_021D6104 *, BOOL, BOOL)) { param0->unk_00 = 0; param0->unk_30 = func; } -static int ov19_021D6104 (UnkStruct_ov19_021D6104 * param0, BOOL param1, BOOL param2) +static int ov19_021D6104(UnkStruct_ov19_021D6104 *param0, BOOL param1, BOOL param2) { if (param1 && param2) { param0->unk_04 = param0->unk_14; @@ -80,7 +81,7 @@ static int ov19_021D6104 (UnkStruct_ov19_021D6104 * param0, BOOL param1, BOOL pa return 0; } -static int ov19_021D6134 (UnkStruct_ov19_021D6104 * param0, BOOL param1, BOOL param2) +static int ov19_021D6134(UnkStruct_ov19_021D6104 *param0, BOOL param1, BOOL param2) { if (param1 == 0) { ov19_021D60FC(param0, ov19_021D6104); @@ -90,7 +91,7 @@ static int ov19_021D6134 (UnkStruct_ov19_021D6104 * param0, BOOL param1, BOOL pa return 2; } -int ov19_021D614C (const UnkStruct_ov19_021D6104 * param0) +int ov19_021D614C(const UnkStruct_ov19_021D6104 *param0) { int v0; u16 v1; @@ -101,7 +102,7 @@ int ov19_021D614C (const UnkStruct_ov19_021D6104 * param0) return v0; } -static u16 ov19_021D6164 (const UnkStruct_ov19_021D6104 * param0, u32 param1, u32 param2) +static u16 ov19_021D6164(const UnkStruct_ov19_021D6104 *param0, u32 param1, u32 param2) { fx32 v0, v1; @@ -111,10 +112,11 @@ static u16 ov19_021D6164 (const UnkStruct_ov19_021D6104 * param0, u32 param1, u3 return FX_Atan2Idx(v1, v0); } -static int ov19_021D617C (const UnkStruct_ov19_021D6104 * param0, u16 param1, u16 param2) +static int ov19_021D617C(const UnkStruct_ov19_021D6104 *param0, u16 param1, u16 param2) { static const u16 v0[] = { - 0x300, 0x1800, + 0x300, + 0x1800, }; int v1, v2, v3, v4; diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c index bccf756400..fe827cab1e 100644 --- a/src/overlay019/ov19_021D61B0.c +++ b/src/overlay019/ov19_021D61B0.c @@ -1,23 +1,32 @@ +#include "overlay019/ov19_021D61B0.h" + #include #include -#include "enums.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay019/struct_ov19_021D5DF8_decl.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" -#include "overlay019/struct_ov19_021DCF88_decl.h" -#include "overlay019/struct_ov19_021DE3E8_decl.h" -#include "overlay019/struct_ov19_021DEC04_decl.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02099F80.h" -#include "overlay019/struct_ov19_021D4DF0.h" + #include "overlay019/funcptr_ov19_021D79B8.h" +#include "overlay019/ov19_021D0D80.h" +#include "overlay019/ov19_021D79F8.h" +#include "overlay019/ov19_021D8B54.h" +#include "overlay019/ov19_021DA270.h" +#include "overlay019/ov19_021DA814.h" +#include "overlay019/ov19_021DA92C.h" +#include "overlay019/ov19_021DB2FC.h" +#include "overlay019/ov19_021DB8E4.h" +#include "overlay019/ov19_021DC5F0.h" +#include "overlay019/ov19_021DCF88.h" +#include "overlay019/ov19_021DE3E8.h" +#include "overlay019/ov19_021DEC04.h" +#include "overlay019/struct_ov19_021D4DF0.h" +#include "overlay019/struct_ov19_021D5DF8_decl.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D8318.h" #include "overlay019/struct_ov19_021D8E00.h" #include "overlay019/struct_ov19_021DA384.h" @@ -27,49 +36,40 @@ #include "overlay019/struct_ov19_021DB6F0.h" #include "overlay019/struct_ov19_021DBA9C.h" #include "overlay019/struct_ov19_021DC680.h" +#include "overlay019/struct_ov19_021DCF88_decl.h" +#include "overlay019/struct_ov19_021DE3E8_decl.h" +#include "overlay019/struct_ov19_021DEC04_decl.h" #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" +#include "narc.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_0200A784.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021D79F8.h" -#include "overlay019/ov19_021D8B54.h" -#include "overlay019/ov19_021DA270.h" -#include "overlay019/ov19_021DA814.h" -#include "overlay019/ov19_021DA92C.h" -#include "overlay019/ov19_021DB2FC.h" -#include "overlay019/ov19_021DB8E4.h" -#include "overlay019/ov19_021DC5F0.h" -#include "overlay019/ov19_021DCF88.h" -#include "overlay019/ov19_021DE3E8.h" -#include "overlay019/ov19_021DEC04.h" struct UnkStruct_ov19_021D61B0_t { - SysTask * unk_00; - SysTask * unk_04; - SysTask * unk_08[4]; - GraphicElementManager * unk_18; + SysTask *unk_00; + SysTask *unk_04; + SysTask *unk_08[4]; + GraphicElementManager *unk_18; UnkStruct_0200C738 unk_1C; NNSG2dImagePaletteProxy unk_1A8; - UnkStruct_02007768 * unk_1BC; - BGL * unk_1C0; - const UnkStruct_ov19_021D4DF0 * unk_1C4; + UnkStruct_02007768 *unk_1BC; + BGL *unk_1C0; + const UnkStruct_ov19_021D4DF0 *unk_1C4; UnkStruct_ov19_021DA384 unk_1C8; UnkStruct_ov19_021D8318 unk_494; UnkStruct_ov19_021D8E00 unk_5E24; @@ -78,10 +78,10 @@ struct UnkStruct_ov19_021D61B0_t { UnkStruct_ov19_021DB6F0 unk_6658; UnkStruct_ov19_021DBA9C unk_6690; UnkStruct_ov19_021DC680 unk_B290; - UnkStruct_ov19_021DCF88 * unk_B408; - UnkStruct_ov19_021DE3E8 * unk_B40C; - UnkStruct_ov19_021DEC04 * unk_B410; - const UnkStruct_ov19_021D5DF8 * unk_B414; + UnkStruct_ov19_021DCF88 *unk_B408; + UnkStruct_ov19_021DE3E8 *unk_B40C; + UnkStruct_ov19_021DEC04 *unk_B410; + const UnkStruct_ov19_021D5DF8 *unk_B414; }; typedef struct { @@ -90,76 +90,76 @@ typedef struct { u16 unk_06; u16 unk_08; u16 unk_0A; - UnkStruct_ov19_021D61B0 * unk_0C; - void * unk_10; + UnkStruct_ov19_021D61B0 *unk_0C; + void *unk_10; } UnkStruct_ov19_021D6640; -static void ov19_021D6474(SysTask * param0, void * param1); -static void ov19_021D6640(UnkStruct_ov19_021D6640 * param0); -static void ov19_021D6664(SysTask * param0, void * param1); -static void ov19_021D6694(SysTask * param0, void * param1); -static void ov19_021D671C(SysTask * param0, void * param1); -static void ov19_021D6780(SysTask * param0, void * param1); -static void ov19_021D67DC(SysTask * param0, void * param1); -static void ov19_021D6824(SysTask * param0, void * param1); -static void ov19_021D68E4(SysTask * param0, void * param1); -static void ov19_021D6940(SysTask * param0, void * param1); -static void ov19_021D69BC(SysTask * param0, void * param1); -static void ov19_021D6A1C(SysTask * param0, void * param1); -static void ov19_021D6A38(SysTask * param0, void * param1); -static void ov19_021D6A74(SysTask * param0, void * param1); -static void ov19_021D6AB0(SysTask * param0, void * param1); -static void ov19_021D6AEC(SysTask * param0, void * param1); -static void ov19_021D6B1C(SysTask * param0, void * param1); -static void ov19_021D6B6C(SysTask * param0, void * param1); -static void ov19_021D6BA8(SysTask * param0, void * param1); -static void ov19_021D6BF0(SysTask * param0, void * param1); -static void ov19_021D6C38(SysTask * param0, void * param1); -static void ov19_021D6C74(SysTask * param0, void * param1); -static void ov19_021D6CB0(SysTask * param0, void * param1); -static void ov19_021D6CF8(SysTask * param0, void * param1); -static void ov19_021D6D40(SysTask * param0, void * param1); -static void ov19_021D6D88(SysTask * param0, void * param1); -static void ov19_021D6DF8(SysTask * param0, void * param1); -static void ov19_021D6E48(SysTask * param0, void * param1); -static void ov19_021D6E70(SysTask * param0, void * param1); -static void ov19_021D6EA4(SysTask * param0, void * param1); -static void ov19_021D6EC0(SysTask * param0, void * param1); -static void ov19_021D6EDC(SysTask * param0, void * param1); -static void ov19_021D6F0C(SysTask * param0, void * param1); -static void ov19_021D6F3C(SysTask * param0, void * param1); -static void ov19_021D6F78(SysTask * param0, void * param1); -static void ov19_021D6FB0(SysTask * param0, void * param1); -static void ov19_021D6FEC(SysTask * param0, void * param1); -static void ov19_021D7028(SysTask * param0, void * param1); -static void ov19_021D70E8(SysTask * param0, void * param1); -static void ov19_021D7138(SysTask * param0, void * param1); -static void ov19_021D71BC(SysTask * param0, void * param1); -static void ov19_021D71F8(SysTask * param0, void * param1); -static void ov19_021D7248(SysTask * param0, void * param1); -static void ov19_021D7278(SysTask * param0, void * param1); -static void ov19_021D72E8(SysTask * param0, void * param1); -static void ov19_021D7324(SysTask * param0, void * param1); -static void ov19_021D7340(SysTask * param0, void * param1); -static void ov19_021D735C(SysTask * param0, void * param1); -static void ov19_021D7380(SysTask * param0, void * param1); -static void ov19_021D7398(SysTask * param0, void * param1); -static void ov19_021D73B0(SysTask * param0, void * param1); -static void ov19_021D73EC(SysTask * param0, void * param1); -static void ov19_021D7408(SysTask * param0, void * param1); -static void ov19_021D7424(SysTask * param0, void * param1); -static void ov19_021D7460(SysTask * param0, void * param1); -static void ov19_021D74B4(UnkStruct_ov19_021D61B0 * param0, const UnkStruct_ov19_021D4DF0 * param1); -static void ov19_021D75CC(UnkStruct_ov19_021D61B0 * param0, const UnkStruct_ov19_021D4DF0 * param1, NARC * param2); +static void ov19_021D6474(SysTask *param0, void *param1); +static void ov19_021D6640(UnkStruct_ov19_021D6640 *param0); +static void ov19_021D6664(SysTask *param0, void *param1); +static void ov19_021D6694(SysTask *param0, void *param1); +static void ov19_021D671C(SysTask *param0, void *param1); +static void ov19_021D6780(SysTask *param0, void *param1); +static void ov19_021D67DC(SysTask *param0, void *param1); +static void ov19_021D6824(SysTask *param0, void *param1); +static void ov19_021D68E4(SysTask *param0, void *param1); +static void ov19_021D6940(SysTask *param0, void *param1); +static void ov19_021D69BC(SysTask *param0, void *param1); +static void ov19_021D6A1C(SysTask *param0, void *param1); +static void ov19_021D6A38(SysTask *param0, void *param1); +static void ov19_021D6A74(SysTask *param0, void *param1); +static void ov19_021D6AB0(SysTask *param0, void *param1); +static void ov19_021D6AEC(SysTask *param0, void *param1); +static void ov19_021D6B1C(SysTask *param0, void *param1); +static void ov19_021D6B6C(SysTask *param0, void *param1); +static void ov19_021D6BA8(SysTask *param0, void *param1); +static void ov19_021D6BF0(SysTask *param0, void *param1); +static void ov19_021D6C38(SysTask *param0, void *param1); +static void ov19_021D6C74(SysTask *param0, void *param1); +static void ov19_021D6CB0(SysTask *param0, void *param1); +static void ov19_021D6CF8(SysTask *param0, void *param1); +static void ov19_021D6D40(SysTask *param0, void *param1); +static void ov19_021D6D88(SysTask *param0, void *param1); +static void ov19_021D6DF8(SysTask *param0, void *param1); +static void ov19_021D6E48(SysTask *param0, void *param1); +static void ov19_021D6E70(SysTask *param0, void *param1); +static void ov19_021D6EA4(SysTask *param0, void *param1); +static void ov19_021D6EC0(SysTask *param0, void *param1); +static void ov19_021D6EDC(SysTask *param0, void *param1); +static void ov19_021D6F0C(SysTask *param0, void *param1); +static void ov19_021D6F3C(SysTask *param0, void *param1); +static void ov19_021D6F78(SysTask *param0, void *param1); +static void ov19_021D6FB0(SysTask *param0, void *param1); +static void ov19_021D6FEC(SysTask *param0, void *param1); +static void ov19_021D7028(SysTask *param0, void *param1); +static void ov19_021D70E8(SysTask *param0, void *param1); +static void ov19_021D7138(SysTask *param0, void *param1); +static void ov19_021D71BC(SysTask *param0, void *param1); +static void ov19_021D71F8(SysTask *param0, void *param1); +static void ov19_021D7248(SysTask *param0, void *param1); +static void ov19_021D7278(SysTask *param0, void *param1); +static void ov19_021D72E8(SysTask *param0, void *param1); +static void ov19_021D7324(SysTask *param0, void *param1); +static void ov19_021D7340(SysTask *param0, void *param1); +static void ov19_021D735C(SysTask *param0, void *param1); +static void ov19_021D7380(SysTask *param0, void *param1); +static void ov19_021D7398(SysTask *param0, void *param1); +static void ov19_021D73B0(SysTask *param0, void *param1); +static void ov19_021D73EC(SysTask *param0, void *param1); +static void ov19_021D7408(SysTask *param0, void *param1); +static void ov19_021D7424(SysTask *param0, void *param1); +static void ov19_021D7460(SysTask *param0, void *param1); +static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_021D4DF0 *param1); +static void ov19_021D75CC(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_021D4DF0 *param1, NARC *param2); static void ov19_021D76FC(void); -static void ov19_021D7774(UnkStruct_ov19_021D61B0 * param0, const UnkStruct_ov19_021D4DF0 * param1, NARC * param2); +static void ov19_021D7774(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_021D4DF0 *param1, NARC *param2); static int ov19_021D77A4(u32 param0, u32 param1); static void ov19_021D7970(void); static void ov19_021D797C(void); -BOOL ov19_021D61B0 (UnkStruct_ov19_021D61B0 ** param0, const UnkStruct_ov19_021D4DF0 * param1, const UnkStruct_ov19_021D5DF8 * param2) +BOOL ov19_021D61B0(UnkStruct_ov19_021D61B0 **param0, const UnkStruct_ov19_021D4DF0 *param1, const UnkStruct_ov19_021D5DF8 *param2) { - UnkStruct_ov19_021D61B0 * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021D61B0)); + UnkStruct_ov19_021D61B0 *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021D61B0)); if (v0 != NULL) { v0->unk_1C4 = param1; @@ -168,7 +168,7 @@ BOOL ov19_021D61B0 (UnkStruct_ov19_021D61B0 ** param0, const UnkStruct_ov19_021D if (v0->unk_1C0 != NULL) { u32 v1; BOOL v2 = 1; - NARC * v3; + NARC *v3; v3 = NARC_ctor(NARC_INDEX_GRAPHIC__BOX, 10); @@ -226,9 +226,9 @@ BOOL ov19_021D61B0 (UnkStruct_ov19_021D61B0 ** param0, const UnkStruct_ov19_021D return 0; } -static void ov19_021D6474 (SysTask * param0, void * param1) +static void ov19_021D6474(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0 = (UnkStruct_ov19_021D61B0 *)param1; + UnkStruct_ov19_021D61B0 *v0 = (UnkStruct_ov19_021D61B0 *)param1; ov19_021D797C(); @@ -241,7 +241,7 @@ static void ov19_021D6474 (SysTask * param0, void * param1) G3_SwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z); } -void ov19_021D64A0 (UnkStruct_ov19_021D61B0 * param0) +void ov19_021D64A0(UnkStruct_ov19_021D61B0 *param0) { SetMainCallback(NULL, NULL); SysTask_Done(param0->unk_00); @@ -271,68 +271,68 @@ void ov19_021D64A0 (UnkStruct_ov19_021D61B0 * param0) sub_0200A878(); } -void ov19_021D6594 (UnkStruct_ov19_021D61B0 * param0, u32 param1) +void ov19_021D6594(UnkStruct_ov19_021D61B0 *param0, u32 param1) { static const struct { SysTaskFunc unk_00; u32 unk_04; } v0[] = { - {ov19_021D6694, 0}, - {ov19_021D671C, 0}, - {ov19_021D6780, 0}, - {ov19_021D67DC, 0}, - {ov19_021D6824, 0}, - {ov19_021D68E4, 0}, - {ov19_021D6940, 0}, - {ov19_021D69BC, 0}, - {ov19_021D6A1C, 0}, - {ov19_021D6A38, 0}, - {ov19_021D6A74, 0}, - {ov19_021D6AB0, 0}, - {ov19_021D6AEC, 0}, - {ov19_021D6B1C, 0}, - {ov19_021D6B6C, 0}, - {ov19_021D6BA8, 0}, - {ov19_021D6BF0, 0}, - {ov19_021D6C38, 0}, - {ov19_021D6C74, 0}, - {ov19_021D6CB0, 0}, - {ov19_021D6CF8, 0}, - {ov19_021D6D40, 0}, - {ov19_021D6D88, 0}, - {ov19_021D6DF8, 0}, - {ov19_021D6E48, 0}, - {ov19_021D6E70, 0}, - {ov19_021D6EA4, 0}, - {ov19_021D6EC0, 0}, - {ov19_021D6EDC, 0}, - {ov19_021D6F0C, 0}, - {ov19_021D6F3C, 0}, - {ov19_021D6F78, 0}, - {ov19_021D6FB0, 0}, - {ov19_021D6FEC, 0}, - {ov19_021D7028, 0}, - {ov19_021D70E8, 0}, - {ov19_021D7138, 0}, - {ov19_021D71BC, 0}, - {ov19_021D71F8, 0}, - {ov19_021D7248, 0}, - {ov19_021D7278, 0}, - {ov19_021D72E8, 0}, - {ov19_021D7324, 0}, - {ov19_021D7340, 0}, - {ov19_021D735C, 0}, - {ov19_021D7380, 0}, - {ov19_021D7398, 0}, - {ov19_021D73B0, 0}, - {ov19_021D73EC, 0}, - {ov19_021D7408, 0}, - {ov19_021D7424, 0}, - {ov19_021D7460, 0}, + { ov19_021D6694, 0 }, + { ov19_021D671C, 0 }, + { ov19_021D6780, 0 }, + { ov19_021D67DC, 0 }, + { ov19_021D6824, 0 }, + { ov19_021D68E4, 0 }, + { ov19_021D6940, 0 }, + { ov19_021D69BC, 0 }, + { ov19_021D6A1C, 0 }, + { ov19_021D6A38, 0 }, + { ov19_021D6A74, 0 }, + { ov19_021D6AB0, 0 }, + { ov19_021D6AEC, 0 }, + { ov19_021D6B1C, 0 }, + { ov19_021D6B6C, 0 }, + { ov19_021D6BA8, 0 }, + { ov19_021D6BF0, 0 }, + { ov19_021D6C38, 0 }, + { ov19_021D6C74, 0 }, + { ov19_021D6CB0, 0 }, + { ov19_021D6CF8, 0 }, + { ov19_021D6D40, 0 }, + { ov19_021D6D88, 0 }, + { ov19_021D6DF8, 0 }, + { ov19_021D6E48, 0 }, + { ov19_021D6E70, 0 }, + { ov19_021D6EA4, 0 }, + { ov19_021D6EC0, 0 }, + { ov19_021D6EDC, 0 }, + { ov19_021D6F0C, 0 }, + { ov19_021D6F3C, 0 }, + { ov19_021D6F78, 0 }, + { ov19_021D6FB0, 0 }, + { ov19_021D6FEC, 0 }, + { ov19_021D7028, 0 }, + { ov19_021D70E8, 0 }, + { ov19_021D7138, 0 }, + { ov19_021D71BC, 0 }, + { ov19_021D71F8, 0 }, + { ov19_021D7248, 0 }, + { ov19_021D7278, 0 }, + { ov19_021D72E8, 0 }, + { ov19_021D7324, 0 }, + { ov19_021D7340, 0 }, + { ov19_021D735C, 0 }, + { ov19_021D7380, 0 }, + { ov19_021D7398, 0 }, + { ov19_021D73B0, 0 }, + { ov19_021D73EC, 0 }, + { ov19_021D7408, 0 }, + { ov19_021D7424, 0 }, + { ov19_021D7460, 0 }, }; if (param1 < NELEMS(v0)) { - UnkStruct_ov19_021D6640 * v1; + UnkStruct_ov19_021D6640 *v1; u32 v2; for (v2 = 0; v2 < 4; v2++) { @@ -359,9 +359,9 @@ void ov19_021D6594 (UnkStruct_ov19_021D61B0 * param0, u32 param1) } } -BOOL ov19_021D6600 (UnkStruct_ov19_021D61B0 * param0, u32 param1) +BOOL ov19_021D6600(UnkStruct_ov19_021D61B0 *param0, u32 param1) { - UnkStruct_ov19_021D6640 * v0; + UnkStruct_ov19_021D6640 *v0; int v1; for (v1 = 0; v1 < 4; v1++) { @@ -377,7 +377,7 @@ BOOL ov19_021D6600 (UnkStruct_ov19_021D61B0 * param0, u32 param1) return 1; } -BOOL ov19_021D6628 (UnkStruct_ov19_021D61B0 * param0) +BOOL ov19_021D6628(UnkStruct_ov19_021D61B0 *param0) { int v0; @@ -390,18 +390,18 @@ BOOL ov19_021D6628 (UnkStruct_ov19_021D61B0 * param0) return 1; } -static void ov19_021D6640 (UnkStruct_ov19_021D6640 * param0) +static void ov19_021D6640(UnkStruct_ov19_021D6640 *param0) { - UnkStruct_ov19_021D61B0 * v0 = param0->unk_0C; + UnkStruct_ov19_021D61B0 *v0 = param0->unk_0C; SysTask_Done(v0->unk_08[param0->unk_04]); v0->unk_08[param0->unk_04] = NULL; Heap_FreeToHeap(param0); } -static void ov19_021D6664 (SysTask * param0, void * param1) +static void ov19_021D6664(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0 = (UnkStruct_ov19_021D61B0 *)param1; + UnkStruct_ov19_021D61B0 *v0 = (UnkStruct_ov19_021D61B0 *)param1; ov19_021DAA80(&v0->unk_6604); @@ -411,20 +411,19 @@ static void ov19_021D6664 (SysTask * param0, void * param1) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov19_021D6694 (SysTask * param0, void * param1) +static void ov19_021D6694(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; v1 = v0->unk_1C4; switch (v2->unk_06) { - case 0: - { - NARC * v3 = NARC_ctor(NARC_INDEX_GRAPHIC__BOX, 10); + case 0: { + NARC *v3 = NARC_ctor(NARC_INDEX_GRAPHIC__BOX, 10); ov19_021D74B4(v0, v1); ov19_021D75CC(v0, v1, v3); @@ -448,11 +447,11 @@ static void ov19_021D6694 (SysTask * param0, void * param1) } } -static void ov19_021D671C (SysTask * param0, void * param1) +static void ov19_021D671C(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -473,11 +472,11 @@ static void ov19_021D671C (SysTask * param0, void * param1) } } -static void ov19_021D6780 (SysTask * param0, void * param1) +static void ov19_021D6780(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -497,11 +496,11 @@ static void ov19_021D6780 (SysTask * param0, void * param1) } } -static void ov19_021D67DC (SysTask * param0, void * param1) +static void ov19_021D67DC(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -520,11 +519,11 @@ static void ov19_021D67DC (SysTask * param0, void * param1) } } -static void ov19_021D6824 (SysTask * param0, void * param1) +static void ov19_021D6824(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -540,8 +539,7 @@ static void ov19_021D6824 (SysTask * param0, void * param1) } v2->unk_06++; - case 2: - { + case 2: { int v3 = ov19_021D77A4(v0->unk_494.unk_00, v1->unk_40.unk_00); ov19_021D7B4C(&v0->unk_494, &v1->unk_40, v3, 1); @@ -566,11 +564,11 @@ static void ov19_021D6824 (SysTask * param0, void * param1) } } -static void ov19_021D68E4 (SysTask * param0, void * param1) +static void ov19_021D68E4(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -592,11 +590,11 @@ static void ov19_021D68E4 (SysTask * param0, void * param1) } } -static void ov19_021D6940 (SysTask * param0, void * param1) +static void ov19_021D6940(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -629,11 +627,11 @@ static void ov19_021D6940 (SysTask * param0, void * param1) } } -static void ov19_021D69BC (SysTask * param0, void * param1) +static void ov19_021D69BC(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -656,11 +654,11 @@ static void ov19_021D69BC (SysTask * param0, void * param1) ov19_021D6640(v2); } -static void ov19_021D6A1C (SysTask * param0, void * param1) +static void ov19_021D6A1C(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -670,11 +668,11 @@ static void ov19_021D6A1C (SysTask * param0, void * param1) ov19_021D6640(v2); } -static void ov19_021D6A38 (SysTask * param0, void * param1) +static void ov19_021D6A38(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -693,11 +691,11 @@ static void ov19_021D6A38 (SysTask * param0, void * param1) } } -static void ov19_021D6A74 (SysTask * param0, void * param1) +static void ov19_021D6A74(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -716,11 +714,11 @@ static void ov19_021D6A74 (SysTask * param0, void * param1) } } -static void ov19_021D6AB0 (SysTask * param0, void * param1) +static void ov19_021D6AB0(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -739,11 +737,11 @@ static void ov19_021D6AB0 (SysTask * param0, void * param1) } } -static void ov19_021D6AEC (SysTask * param0, void * param1) +static void ov19_021D6AEC(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -760,11 +758,11 @@ static void ov19_021D6AEC (SysTask * param0, void * param1) } } -static void ov19_021D6B1C (SysTask * param0, void * param1) +static void ov19_021D6B1C(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -787,11 +785,11 @@ static void ov19_021D6B1C (SysTask * param0, void * param1) } } -static void ov19_021D6B6C (SysTask * param0, void * param1) +static void ov19_021D6B6C(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -810,11 +808,11 @@ static void ov19_021D6B6C (SysTask * param0, void * param1) } } -static void ov19_021D6BA8 (SysTask * param0, void * param1) +static void ov19_021D6BA8(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -833,11 +831,11 @@ static void ov19_021D6BA8 (SysTask * param0, void * param1) } } -static void ov19_021D6BF0 (SysTask * param0, void * param1) +static void ov19_021D6BF0(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -856,11 +854,11 @@ static void ov19_021D6BF0 (SysTask * param0, void * param1) } } -static void ov19_021D6C38 (SysTask * param0, void * param1) +static void ov19_021D6C38(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -879,11 +877,11 @@ static void ov19_021D6C38 (SysTask * param0, void * param1) } } -static void ov19_021D6C74 (SysTask * param0, void * param1) +static void ov19_021D6C74(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -902,11 +900,11 @@ static void ov19_021D6C74 (SysTask * param0, void * param1) } } -static void ov19_021D6CB0 (SysTask * param0, void * param1) +static void ov19_021D6CB0(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -926,11 +924,11 @@ static void ov19_021D6CB0 (SysTask * param0, void * param1) } } -static void ov19_021D6CF8 (SysTask * param0, void * param1) +static void ov19_021D6CF8(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -950,11 +948,11 @@ static void ov19_021D6CF8 (SysTask * param0, void * param1) } } -static void ov19_021D6D40 (SysTask * param0, void * param1) +static void ov19_021D6D40(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -974,11 +972,11 @@ static void ov19_021D6D40 (SysTask * param0, void * param1) } } -static void ov19_021D6D88 (SysTask * param0, void * param1) +static void ov19_021D6D88(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; u32 v3; v2 = (UnkStruct_ov19_021D6640 *)param1; @@ -1002,11 +1000,11 @@ static void ov19_021D6D88 (SysTask * param0, void * param1) ov19_021D6640(v2); } -static void ov19_021D6DF8 (SysTask * param0, void * param1) +static void ov19_021D6DF8(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; u32 v3; v2 = (UnkStruct_ov19_021D6640 *)param1; @@ -1028,11 +1026,11 @@ static void ov19_021D6DF8 (SysTask * param0, void * param1) } } -static void ov19_021D6E48 (SysTask * param0, void * param1) +static void ov19_021D6E48(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1042,11 +1040,11 @@ static void ov19_021D6E48 (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D6E70 (SysTask * param0, void * param1) +static void ov19_021D6E70(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1057,10 +1055,10 @@ static void ov19_021D6E70 (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D6EA4 (SysTask * param0, void * param1) +static void ov19_021D6EA4(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1069,10 +1067,10 @@ static void ov19_021D6EA4 (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D6EC0 (SysTask * param0, void * param1) +static void ov19_021D6EC0(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1081,11 +1079,11 @@ static void ov19_021D6EC0 (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D6EDC (SysTask * param0, void * param1) +static void ov19_021D6EDC(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1096,11 +1094,11 @@ static void ov19_021D6EDC (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D6F0C (SysTask * param0, void * param1) +static void ov19_021D6F0C(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1111,11 +1109,11 @@ static void ov19_021D6F0C (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D6F3C (SysTask * param0, void * param1) +static void ov19_021D6F3C(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1133,11 +1131,11 @@ static void ov19_021D6F3C (SysTask * param0, void * param1) } } -static void ov19_021D6F78 (SysTask * param0, void * param1) +static void ov19_021D6F78(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1154,11 +1152,11 @@ static void ov19_021D6F78 (SysTask * param0, void * param1) } } -static void ov19_021D6FB0 (SysTask * param0, void * param1) +static void ov19_021D6FB0(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1176,11 +1174,11 @@ static void ov19_021D6FB0 (SysTask * param0, void * param1) } } -static void ov19_021D6FEC (SysTask * param0, void * param1) +static void ov19_021D6FEC(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1199,11 +1197,11 @@ static void ov19_021D6FEC (SysTask * param0, void * param1) } } -static void ov19_021D7028 (SysTask * param0, void * param1) +static void ov19_021D7028(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1245,11 +1243,11 @@ static void ov19_021D7028 (SysTask * param0, void * param1) } } -static void ov19_021D70E8 (SysTask * param0, void * param1) +static void ov19_021D70E8(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1270,11 +1268,11 @@ static void ov19_021D70E8 (SysTask * param0, void * param1) } } -static void ov19_021D7138 (SysTask * param0, void * param1) +static void ov19_021D7138(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1304,11 +1302,11 @@ static void ov19_021D7138 (SysTask * param0, void * param1) } } -static void ov19_021D71BC (SysTask * param0, void * param1) +static void ov19_021D71BC(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1327,11 +1325,11 @@ static void ov19_021D71BC (SysTask * param0, void * param1) } } -static void ov19_021D71F8 (SysTask * param0, void * param1) +static void ov19_021D71F8(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1355,11 +1353,11 @@ static void ov19_021D71F8 (SysTask * param0, void * param1) } } -static void ov19_021D7248 (SysTask * param0, void * param1) +static void ov19_021D7248(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1371,11 +1369,11 @@ static void ov19_021D7248 (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D7278 (SysTask * param0, void * param1) +static void ov19_021D7278(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1404,11 +1402,11 @@ static void ov19_021D7278 (SysTask * param0, void * param1) } } -static void ov19_021D72E8 (SysTask * param0, void * param1) +static void ov19_021D72E8(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1427,11 +1425,11 @@ static void ov19_021D72E8 (SysTask * param0, void * param1) } } -static void ov19_021D7324 (SysTask * param0, void * param1) +static void ov19_021D7324(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1441,11 +1439,11 @@ static void ov19_021D7324 (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D7340 (SysTask * param0, void * param1) +static void ov19_021D7340(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1455,11 +1453,11 @@ static void ov19_021D7340 (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D735C (SysTask * param0, void * param1) +static void ov19_021D735C(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1470,11 +1468,11 @@ static void ov19_021D735C (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D7380 (SysTask * param0, void * param1) +static void ov19_021D7380(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1484,11 +1482,11 @@ static void ov19_021D7380 (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D7398 (SysTask * param0, void * param1) +static void ov19_021D7398(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1498,11 +1496,11 @@ static void ov19_021D7398 (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D73B0 (SysTask * param0, void * param1) +static void ov19_021D73B0(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1521,11 +1519,11 @@ static void ov19_021D73B0 (SysTask * param0, void * param1) } } -static void ov19_021D73EC (SysTask * param0, void * param1) +static void ov19_021D73EC(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1535,11 +1533,11 @@ static void ov19_021D73EC (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D7408 (SysTask * param0, void * param1) +static void ov19_021D7408(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1549,11 +1547,11 @@ static void ov19_021D7408 (SysTask * param0, void * param1) ov19_021D6640(v1); } -static void ov19_021D7424 (SysTask * param0, void * param1) +static void ov19_021D7424(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - UnkStruct_ov19_021D6640 * v1; - const UnkStruct_ov19_021D4DF0 * v2; + UnkStruct_ov19_021D61B0 *v0; + UnkStruct_ov19_021D6640 *v1; + const UnkStruct_ov19_021D4DF0 *v2; v1 = (UnkStruct_ov19_021D6640 *)param1; v0 = v1->unk_0C; @@ -1572,11 +1570,11 @@ static void ov19_021D7424 (SysTask * param0, void * param1) } } -static void ov19_021D7460 (SysTask * param0, void * param1) +static void ov19_021D7460(SysTask *param0, void *param1) { - UnkStruct_ov19_021D61B0 * v0; - const UnkStruct_ov19_021D4DF0 * v1; - UnkStruct_ov19_021D6640 * v2; + UnkStruct_ov19_021D61B0 *v0; + const UnkStruct_ov19_021D4DF0 *v1; + UnkStruct_ov19_021D6640 *v2; v2 = (UnkStruct_ov19_021D6640 *)param1; v0 = v2->unk_0C; @@ -1596,7 +1594,7 @@ static void ov19_021D7460 (SysTask * param0, void * param1) } } -static void ov19_021D74B4 (UnkStruct_ov19_021D61B0 * param0, const UnkStruct_ov19_021D4DF0 * param1) +static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_021D4DF0 *param1) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -1803,7 +1801,7 @@ static void ov19_021D74B4 (UnkStruct_ov19_021D61B0 * param0, const UnkStruct_ov1 ov19_021D76FC(); } -static void ov19_021D75CC (UnkStruct_ov19_021D61B0 * param0, const UnkStruct_ov19_021D4DF0 * param1, NARC * param2) +static void ov19_021D75CC(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_021D4DF0 *param1, NARC *param2) { sub_020070E8(param2, 4, param0->unk_1C0, 1, 0, 0, 1, 10); sub_02019CB8(param0->unk_1C0, 1, 0x0, 0, 0, 32, 32, 17); @@ -1832,7 +1830,7 @@ static void ov19_021D75CC (UnkStruct_ov19_021D61B0 * param0, const UnkStruct_ov1 GX_DispOn(); } -static void ov19_021D76FC (void) +static void ov19_021D76FC(void) { NNS_G3dInit(); G3X_InitMtxStack(); @@ -1849,14 +1847,14 @@ static void ov19_021D76FC (void) G3_ViewPort(0, 0, 255, 191); } -static void ov19_021D7774 (UnkStruct_ov19_021D61B0 * param0, const UnkStruct_ov19_021D4DF0 * param1, NARC * param2) +static void ov19_021D7774(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_021D4DF0 *param1, NARC *param2) { ov19_021D8C1C(¶m0->unk_5E24, param2); ov19_021DA864(¶m0->unk_65BC, param2); ov19_021DE584(param0->unk_B40C); } -static int ov19_021D77A4 (u32 param0, u32 param1) +static int ov19_021D77A4(u32 param0, u32 param1) { int v0, v1; @@ -1871,52 +1869,52 @@ static int ov19_021D77A4 (u32 param0, u32 param1) return (v0 >= v1) ? -1 : 1; } -SysTask * ov19_021D77C8 (SysTaskFunc param0, void * param1, u32 param2) +SysTask *ov19_021D77C8(SysTaskFunc param0, void *param1, u32 param2) { return SysTask_ExecuteOnVBlank(param0, param1, param2); } -NNSG2dImagePaletteProxy * ov19_021D77D0 (UnkStruct_ov19_021D61B0 * param0) +NNSG2dImagePaletteProxy *ov19_021D77D0(UnkStruct_ov19_021D61B0 *param0) { return &(param0->unk_1A8); } -UnkStruct_ov19_021DA384 * ov19_021D77D8 (UnkStruct_ov19_021D61B0 * param0) +UnkStruct_ov19_021DA384 *ov19_021D77D8(UnkStruct_ov19_021D61B0 *param0) { return &(param0->unk_1C8); } -UnkStruct_ov19_021D8318 * ov19_021D77E0 (UnkStruct_ov19_021D61B0 * param0) +UnkStruct_ov19_021D8318 *ov19_021D77E0(UnkStruct_ov19_021D61B0 *param0) { return &(param0->unk_494); } -UnkStruct_ov19_021DC680 * ov19_021D77E8 (UnkStruct_ov19_021D61B0 * param0) +UnkStruct_ov19_021DC680 *ov19_021D77E8(UnkStruct_ov19_021D61B0 *param0) { return &(param0->unk_B290); } -UnkStruct_ov19_021D8E00 * ov19_021D77F4 (UnkStruct_ov19_021D61B0 * param0) +UnkStruct_ov19_021D8E00 *ov19_021D77F4(UnkStruct_ov19_021D61B0 *param0) { return &(param0->unk_5E24); } -UnkStruct_ov19_021DE3E8 * ov19_021D7800 (UnkStruct_ov19_021D61B0 * param0) +UnkStruct_ov19_021DE3E8 *ov19_021D7800(UnkStruct_ov19_021D61B0 *param0) { return param0->unk_B40C; } -UnkStruct_ov19_021DBA9C * ov19_021D780C (UnkStruct_ov19_021D61B0 * param0) +UnkStruct_ov19_021DBA9C *ov19_021D780C(UnkStruct_ov19_021D61B0 *param0) { return &(param0->unk_6690); } -UnkStruct_02007768 * ov19_021D7818 (UnkStruct_ov19_021D61B0 * param0) +UnkStruct_02007768 *ov19_021D7818(UnkStruct_ov19_021D61B0 *param0) { return param0->unk_1BC; } -int ov19_021D7820 (UnkStruct_ov19_021D61B0 * param0) +int ov19_021D7820(UnkStruct_ov19_021D61B0 *param0) { if (ov19_021D5E08(param0->unk_1C4) != 4) { return 0; @@ -1925,7 +1923,7 @@ int ov19_021D7820 (UnkStruct_ov19_021D61B0 * param0) } } -void ov19_021D783C (UnkStruct_ov19_021DA864 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, NNSG2dCellDataBank * param3, NNSG2dCellAnimBankData * param4, u32 param5) +void ov19_021D783C(UnkStruct_ov19_021DA864 *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, NNSG2dCellDataBank *param3, NNSG2dCellAnimBankData *param4, u32 param5) { param0->unk_00 = param1; param0->unk_08 = param2; @@ -1938,10 +1936,10 @@ void ov19_021D783C (UnkStruct_ov19_021DA864 * param0, NNSG2dImageProxy * param1, param0->unk_1C = 0; } -GraphicElementData * ov19_021D785C (GraphicElementManager * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5) +GraphicElementData *ov19_021D785C(GraphicElementManager *param0, UnkStruct_ov19_021DA864 *param1, u32 param2, u32 param3, u32 param4, int param5) { UnkStruct_ov83_0223D9A8 v0; - GraphicElementData * v1; + GraphicElementData *v1; v0.unk_00 = param0; v0.unk_04 = param1; @@ -1967,7 +1965,7 @@ GraphicElementData * ov19_021D785C (GraphicElementManager * param0, UnkStruct_ov return v1; } -void ov19_021D78AC (GraphicElementData * param0, u32 param1) +void ov19_021D78AC(GraphicElementData *param0, u32 param1) { OSIntrMode v0 = OS_DisableInterrupts(); @@ -1975,7 +1973,7 @@ void ov19_021D78AC (GraphicElementData * param0, u32 param1) OS_RestoreInterrupts(v0); } -void ov19_021D78C8 (const u16 * param0, u16 * param1, u32 param2, u16 param3, u32 param4) +void ov19_021D78C8(const u16 *param0, u16 *param1, u32 param2, u16 param3, u32 param4) { int v0, v1, v2; int v3, v4, v5; @@ -1986,9 +1984,9 @@ void ov19_021D78C8 (const u16 * param0, u16 * param1, u32 param2, u16 param3, u3 v5 = ((param3 >> 10) & 0x1f) << 8; while (param2--) { - v0 = (((*param0) & 0x1f)) << 8; - v1 = ((((*param0) >> 5) & 0x1f)) << 8; - v2 = ((((*param0) >> 10) & 0x1f)) << 8; + v0 = ((*param0) & 0x1f) << 8; + v1 = (((*param0) >> 5) & 0x1f) << 8; + v2 = (((*param0) >> 10) & 0x1f) << 8; v0 += (((v3 - v0) / 16) * param4); v1 += (((v4 - v1) / 16) * param4); @@ -2005,7 +2003,7 @@ void ov19_021D78C8 (const u16 * param0, u16 * param1, u32 param2, u16 param3, u3 } } -const UnkStruct_ov19_021D5DF8 * ov19_021D7964 (UnkStruct_ov19_021D61B0 * param0) +const UnkStruct_ov19_021D5DF8 *ov19_021D7964(UnkStruct_ov19_021D61B0 *param0) { return param0->unk_B414; } @@ -2014,16 +2012,16 @@ static u32 Unk_ov19_021E05EC = 0; static struct { UnkFuncPtr_ov19_021D79B8 unk_00; - void * unk_04; - void * unk_08; + void *unk_04; + void *unk_08; } Unk_ov19_021E05F0[32]; -static void ov19_021D7970 (void) +static void ov19_021D7970(void) { Unk_ov19_021E05EC = 0; } -static void ov19_021D797C (void) +static void ov19_021D797C(void) { if (Unk_ov19_021E05EC) { u32 i; @@ -2040,7 +2038,7 @@ static void ov19_021D797C (void) } } -void ov19_021D79B8 (void * param0, UnkFuncPtr_ov19_021D79B8 param1, void * param2) +void ov19_021D79B8(void *param0, UnkFuncPtr_ov19_021D79B8 param1, void *param2) { GF_ASSERT(Unk_ov19_021E05EC < 32); diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c index 3caa074ef0..acff13e4b5 100644 --- a/src/overlay019/ov19_021D79F8.c +++ b/src/overlay019/ov19_021D79F8.c @@ -1,77 +1,77 @@ +#include "overlay019/ov19_021D79F8.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" -#include "overlay019/struct_ov19_021D5DF8_decl.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay019/ov19_021D0D80.h" +#include "overlay019/ov19_021D61B0.h" +#include "overlay019/ov19_021DA270.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D4F5C.h" +#include "overlay019/struct_ov19_021D5DF8_decl.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D8318.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DCD18.h" +#include "heap.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02006E3C.h" -#include "sys_task.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "pokemon_icon.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021D79F8.h" -#include "overlay019/ov19_021DA270.h" static const struct { u8 unk_00; u8 unk_01; u8 unk_02; } Unk_ov19_021E0178[] = { - {30, 29, 28}, - {33, 32, 31}, - {36, 35, 34}, - {39, 38, 37}, - {42, 41, 40}, - {45, 44, 43}, - {48, 47, 46}, - {51, 50, 49}, - {54, 53, 52}, - {57, 56, 55}, - {60, 59, 58}, - {63, 62, 61}, - {66, 65, 64}, - {69, 68, 67}, - {72, 71, 70}, - {75, 74, 73}, - {78, 77, 76}, - {81, 80, 79}, - {84, 83, 82}, - {87, 86, 85}, - {90, 89, 88}, - {93, 92, 91}, - {96, 95, 94}, - {99, 98, 97}, - {102, 101, 100}, - {105, 104, 103}, - {108, 107, 106}, - {111, 110, 109}, - {114, 113, 112}, - {117, 116, 115}, - {120, 119, 118}, - {123, 122, 121}, + { 30, 29, 28 }, + { 33, 32, 31 }, + { 36, 35, 34 }, + { 39, 38, 37 }, + { 42, 41, 40 }, + { 45, 44, 43 }, + { 48, 47, 46 }, + { 51, 50, 49 }, + { 54, 53, 52 }, + { 57, 56, 55 }, + { 60, 59, 58 }, + { 63, 62, 61 }, + { 66, 65, 64 }, + { 69, 68, 67 }, + { 72, 71, 70 }, + { 75, 74, 73 }, + { 78, 77, 76 }, + { 81, 80, 79 }, + { 84, 83, 82 }, + { 87, 86, 85 }, + { 90, 89, 88 }, + { 93, 92, 91 }, + { 96, 95, 94 }, + { 99, 98, 97 }, + { 102, 101, 100 }, + { 105, 104, 103 }, + { 108, 107, 106 }, + { 111, 110, 109 }, + { 114, 113, 112 }, + { 117, 116, 115 }, + { 120, 119, 118 }, + { 123, 122, 121 }, }; typedef struct { - UnkStruct_ov19_021D8318 * unk_00; + UnkStruct_ov19_021D8318 *unk_00; s16 unk_04; s16 unk_06; s16 unk_08; @@ -79,34 +79,35 @@ typedef struct { u32 unk_0C; } UnkStruct_ov19_021D81B8; -static void ov19_021D7AF4(const UnkStruct_ov19_021D8318 * param0, int param1, u32 * param2, u32 * param3, u32 * param4); -static void ov19_021D7BC0(UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, int param2, BOOL param3); -static void ov19_021D7C58(UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, int param2); -static void ov19_021D7D00(UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, u32 param2, u32 param3, u32 param4); -static void ov19_021D7E24(SysTask * param0, void * param1); -static void ov19_021D7E6C(SysTask * param0, void * param1); -static void ov19_021D7F14(UnkStruct_ov19_021D8318 * param0, fx32 param1, s32 param2); -static void ov19_021D7F9C(UnkStruct_ov19_021D8318 * param0, fx32 param1); -static void ov19_021D803C(UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1, int param2, int param3); -static void ov19_021D8114(UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1, int param2); -static void ov19_021D813C(UnkStruct_ov19_021D8318 * param0, u32 param1); -static void ov19_021D81B8(UnkStruct_ov19_021D8318 * param0, int param1, int param2, u32 param3); -static void ov19_021D8210(SysTask * param0, void * param1); -static void ov19_021D826C(void * param0); -static void ov19_021D8274(SysTask * param0, void * param1); -static void ov19_021D8318(UnkStruct_ov19_021D8318 * param0); +static void ov19_021D7AF4(const UnkStruct_ov19_021D8318 *param0, int param1, u32 *param2, u32 *param3, u32 *param4); +static void ov19_021D7BC0(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2, BOOL param3); +static void ov19_021D7C58(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2); +static void ov19_021D7D00(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, u32 param2, u32 param3, u32 param4); +static void ov19_021D7E24(SysTask *param0, void *param1); +static void ov19_021D7E6C(SysTask *param0, void *param1); +static void ov19_021D7F14(UnkStruct_ov19_021D8318 *param0, fx32 param1, s32 param2); +static void ov19_021D7F9C(UnkStruct_ov19_021D8318 *param0, fx32 param1); +static void ov19_021D803C(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1, int param2, int param3); +static void ov19_021D8114(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1, int param2); +static void ov19_021D813C(UnkStruct_ov19_021D8318 *param0, u32 param1); +static void ov19_021D81B8(UnkStruct_ov19_021D8318 *param0, int param1, int param2, u32 param3); +static void ov19_021D8210(SysTask *param0, void *param1); +static void ov19_021D826C(void *param0); +static void ov19_021D8274(SysTask *param0, void *param1); +static void ov19_021D8318(UnkStruct_ov19_021D8318 *param0); static u32 ov19_021D85B4(u32 param0); -static void ov19_021D85C4(UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DA384 * param1, u32 param2, u32 param3, s32 param4, UnkStruct_ov19_021DCD18 * param5); -static void ov19_021D865C(UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -static void ov19_021D86B4(UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2); -static void ov19_021D870C(UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1); -static void ov19_021D8764(u16 * param0, const u16 * param1, u32 param2, u32 param3, u32 param4); +static void ov19_021D85C4(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DA384 *param1, u32 param2, u32 param3, s32 param4, UnkStruct_ov19_021DCD18 *param5); +static void ov19_021D865C(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2); +static void ov19_021D86B4(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2); +static void ov19_021D870C(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1); +static void ov19_021D8764(u16 *param0, const u16 *param1, u32 param2, u32 param3, u32 param4); static const u16 Unk_ov19_021E0138[] = { - 9, 10, + 9, + 10, }; -BOOL ov19_021D79F8 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4) +BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4) { param0->unk_00 = param2->unk_40.unk_00; param0->unk_01 = 11; @@ -126,13 +127,13 @@ BOOL ov19_021D79F8 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D61B0 * return 1; } -void ov19_021D7A74 (UnkStruct_ov19_021D8318 * param0) +void ov19_021D7A74(UnkStruct_ov19_021D8318 *param0) { ov19_021DA3F0(param0->unk_58F0, param0->unk_A8[0], (5 * 6)); ov19_021DA3F0(param0->unk_58F0, param0->unk_A8[1], (5 * 6)); } -void ov19_021D7A9C (UnkStruct_ov19_021D8318 * param0) +void ov19_021D7A9C(UnkStruct_ov19_021D8318 *param0) { param0->unk_0C = sub_020192EC(param0->unk_58F4, 3); param0->unk_0C -= param0->unk_585C; @@ -142,7 +143,7 @@ void ov19_021D7A9C (UnkStruct_ov19_021D8318 * param0) sub_02019CB8(param0->unk_58F4, 3, 0x18, 0, 0, 64, 32, 9); } -static void ov19_021D7AF4 (const UnkStruct_ov19_021D8318 * param0, int param1, u32 * param2, u32 * param3, u32 * param4) +static void ov19_021D7AF4(const UnkStruct_ov19_021D8318 *param0, int param1, u32 *param2, u32 *param3, u32 *param4) { if (param1 != 0) { *param2 = (param0->unk_02 ^ 1) * (21 * 20); @@ -155,7 +156,7 @@ static void ov19_021D7AF4 (const UnkStruct_ov19_021D8318 * param0, int param1, u } } -void ov19_021D7B4C (UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, int param2, BOOL param3) +void ov19_021D7B4C(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2, BOOL param3) { u32 v0, v1, v2; @@ -171,10 +172,10 @@ void ov19_021D7B4C (UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4 } } -static void ov19_021D7BC0 (UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, int param2, BOOL param3) +static void ov19_021D7BC0(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2, BOOL param3) { - NNSG2dPaletteData * v0; - void * v1; + NNSG2dPaletteData *v0; + void *v1; v1 = sub_02006F88(18, Unk_ov19_021E0178[param1->unk_01].unk_02, &v0, 10); @@ -198,17 +199,17 @@ static void ov19_021D7BC0 (UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov1 } } -static void ov19_021D7C58 (UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, int param2) +static void ov19_021D7C58(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2) { - void * v0; + void *v0; v0 = sub_02006FE8(18, Unk_ov19_021E0178[param1->unk_01].unk_01, 1, 10, 1); if (v0 != NULL) { - NNSG2dCharacterData * v1; + NNSG2dCharacterData *v1; if (NNS_G2dGetUnpackedBGCharacterData(v0, &v1)) { - Window * v2; + Window *v2; v2 = sub_0201A778(10, 1); @@ -234,15 +235,15 @@ static void ov19_021D7C58 (UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov1 } } -static void ov19_021D7D00 (UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, u32 param2, u32 param3, u32 param4) +static void ov19_021D7D00(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, u32 param2, u32 param3, u32 param4) { - void * v0; + void *v0; v0 = sub_02006FE8(18, Unk_ov19_021E0178[param1->unk_01].unk_00, 1, 10, 1); if (v0) { - u16 * v1; - NNSG2dScreenData * v2; + u16 *v1; + NNSG2dScreenData *v2; NNS_G2dGetUnpackedScreenData(v0, &v2); v1 = sub_02019FE4(param0->unk_58F4, 3); @@ -256,7 +257,7 @@ static void ov19_021D7D00 (UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov1 } } -void ov19_021D7D70 (UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, int param2) +void ov19_021D7D70(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2) { param0->unk_08 = (sub_020192EC(param0->unk_58F4, 3) & (REG_G2_BG3HOFS_OFFSET_MASK)) << FX32_SHIFT; param0->unk_14 = param0->unk_08 + ((((21 + 2) * 8) * param2) << FX32_SHIFT); @@ -284,14 +285,14 @@ void ov19_021D7D70 (UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4 ov19_021D77C8(ov19_021D7E6C, param0, 1); } -BOOL ov19_021D7E1C (UnkStruct_ov19_021D8318 * param0) +BOOL ov19_021D7E1C(UnkStruct_ov19_021D8318 *param0) { return param0->unk_9C; } -static void ov19_021D7E24 (SysTask * param0, void * param1) +static void ov19_021D7E24(SysTask *param0, void *param1) { - UnkStruct_ov19_021D8318 * v0 = (UnkStruct_ov19_021D8318 *)param1; + UnkStruct_ov19_021D8318 *v0 = (UnkStruct_ov19_021D8318 *)param1; if (v0->unk_04) { if (v0->unk_98 == 2) { @@ -308,9 +309,9 @@ static void ov19_021D7E24 (SysTask * param0, void * param1) v0->unk_9C = 1; } -static void ov19_021D7E6C (SysTask * param0, void * param1) +static void ov19_021D7E6C(SysTask *param0, void *param1) { - UnkStruct_ov19_021D8318 * v0 = (UnkStruct_ov19_021D8318 *)param1; + UnkStruct_ov19_021D8318 *v0 = (UnkStruct_ov19_021D8318 *)param1; u32 v1, v2; v1 = v0->unk_03; @@ -334,7 +335,7 @@ static void ov19_021D7E6C (SysTask * param0, void * param1) } } -static void ov19_021D7F14 (UnkStruct_ov19_021D8318 * param0, fx32 param1, s32 param2) +static void ov19_021D7F14(UnkStruct_ov19_021D8318 *param0, fx32 param1, s32 param2) { int v0, v1; @@ -353,7 +354,7 @@ static void ov19_021D7F14 (UnkStruct_ov19_021D8318 * param0, fx32 param1, s32 pa } } -static void ov19_021D7F9C (UnkStruct_ov19_021D8318 * param0, fx32 param1) +static void ov19_021D7F9C(UnkStruct_ov19_021D8318 *param0, fx32 param1) { int v0, v1, v2, v3; @@ -380,10 +381,10 @@ static void ov19_021D7F9C (UnkStruct_ov19_021D8318 * param0, fx32 param1) } } -static void ov19_021D803C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1, int param2, int param3) +static void ov19_021D803C(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1, int param2, int param3) { - const PCBoxes * v0; - BoxPokemon * v1; + const PCBoxes *v0; + BoxPokemon *v1; int v2, v3; u32 v4; @@ -407,7 +408,7 @@ static void ov19_021D803C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D } } -static void ov19_021D8114 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1, int param2) +static void ov19_021D8114(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1, int param2) { int v0; @@ -423,10 +424,10 @@ static void ov19_021D8114 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D } } -static void ov19_021D813C (UnkStruct_ov19_021D8318 * param0, u32 param1) +static void ov19_021D813C(UnkStruct_ov19_021D8318 *param0, u32 param1) { - const PCBoxes * v0; - BoxPokemon * v1; + const PCBoxes *v0; + BoxPokemon *v1; u32 v2, v3; v0 = ov19_021D5E90(param0->unk_58F8); @@ -443,9 +444,9 @@ static void ov19_021D813C (UnkStruct_ov19_021D8318 * param0, u32 param1) } } -static void ov19_021D81B8 (UnkStruct_ov19_021D8318 * param0, int param1, int param2, u32 param3) +static void ov19_021D81B8(UnkStruct_ov19_021D8318 *param0, int param1, int param2, u32 param3) { - UnkStruct_ov19_021D81B8 * v0; + UnkStruct_ov19_021D81B8 *v0; param0->unk_A3 = 0; v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021D81B8)); @@ -466,9 +467,9 @@ static void ov19_021D81B8 (UnkStruct_ov19_021D8318 * param0, int param1, int par } } -static void ov19_021D8210 (SysTask * param0, void * param1) +static void ov19_021D8210(SysTask *param0, void *param1) { - UnkStruct_ov19_021D81B8 * v0 = param1; + UnkStruct_ov19_021D81B8 *v0 = param1; if (v0->unk_0A) { v0->unk_0A--; @@ -484,19 +485,19 @@ static void ov19_021D8210 (SysTask * param0, void * param1) } } -static void ov19_021D826C (void * param0) +static void ov19_021D826C(void *param0) { - UnkStruct_ov19_021D8318 * v0 = param0; + UnkStruct_ov19_021D8318 *v0 = param0; v0->unk_A3 = 0; } static int Unk_ov19_021E077C = 0; -static void ov19_021D8274 (SysTask * param0, void * param1) +static void ov19_021D8274(SysTask *param0, void *param1) { static u32 v0 = 0, v1 = 0, v2 = 0; - static const UnkStruct_ov19_021D4F5C * v3 = NULL; - UnkStruct_ov19_021D8318 * v4 = param1; + static const UnkStruct_ov19_021D4F5C *v3 = NULL; + UnkStruct_ov19_021D8318 *v4 = param1; switch (Unk_ov19_021E077C) { case 0: @@ -518,7 +519,7 @@ static void ov19_021D8274 (SysTask * param0, void * param1) } } -static void ov19_021D8318 (UnkStruct_ov19_021D8318 * param0) +static void ov19_021D8318(UnkStruct_ov19_021D8318 *param0) { param0->unk_A3 = (SysTask_ExecuteAfterVBlank(ov19_021D8274, param0, 0) != NULL); @@ -527,13 +528,13 @@ static void ov19_021D8318 (UnkStruct_ov19_021D8318 * param0) } } -void ov19_021D8350 (UnkStruct_ov19_021D8318 * param0) +void ov19_021D8350(UnkStruct_ov19_021D8318 *param0) { param0->unk_A2 = 0; ov19_021D81B8(param0, 0, 8, Unk_ov19_021E0138[param0->unk_02] * 0x20); } -BOOL ov19_021D8370 (UnkStruct_ov19_021D8318 * param0) +BOOL ov19_021D8370(UnkStruct_ov19_021D8318 *param0) { switch (param0->unk_A2) { case 0: @@ -564,17 +565,17 @@ BOOL ov19_021D8370 (UnkStruct_ov19_021D8318 * param0) return 0; } -void ov19_021D8408 (UnkStruct_ov19_021D8318 * param0, u32 param1, s32 param2, UnkStruct_ov19_021DCD18 * param3) +void ov19_021D8408(UnkStruct_ov19_021D8318 *param0, u32 param1, s32 param2, UnkStruct_ov19_021DCD18 *param3) { ov19_021DA418(¶m0->unk_A8[param0->unk_02][param1], param3, 1); ov19_021DA754(param0->unk_58F0, param3, param2); ov19_021DA3CC(param0->unk_58F0, ¶m0->unk_A8[param0->unk_02][param1], 1); } -void ov19_021D845C (UnkStruct_ov19_021D8318 * param0, u32 param1, const UnkStruct_ov19_021DCD18 * param2) +void ov19_021D845C(UnkStruct_ov19_021D8318 *param0, u32 param1, const UnkStruct_ov19_021DCD18 *param2) { u32 v0; - UnkStruct_ov19_021DCD18 * v1; + UnkStruct_ov19_021DCD18 *v1; v0 = 88 + (param0->unk_02 * 480) + ((4 * 4) * param1); v1 = ¶m0->unk_A8[param0->unk_02][param1]; @@ -586,15 +587,15 @@ void ov19_021D845C (UnkStruct_ov19_021D8318 * param0, u32 param1, const UnkStruc ov19_021D89F4(param0, param1); } -UnkStruct_ov19_021DCD18 * ov19_021D84C8 (UnkStruct_ov19_021D8318 * param0, u32 param1) +UnkStruct_ov19_021DCD18 *ov19_021D84C8(UnkStruct_ov19_021D8318 *param0, u32 param1) { return ¶m0->unk_A8[param0->unk_02][param1]; } -void ov19_021D84E0 (UnkStruct_ov19_021D8318 * param0) +void ov19_021D84E0(UnkStruct_ov19_021D8318 *param0) { int v0, v1; - BoxPokemon * v2; + BoxPokemon *v2; v1 = sub_0207999C(param0->unk_58F8->unk_00); @@ -615,7 +616,7 @@ void ov19_021D84E0 (UnkStruct_ov19_021D8318 * param0) } } -static u32 ov19_021D85B4 (u32 param0) +static u32 ov19_021D85B4(u32 param0) { static const u16 v0[(5 * 6)] = { 5, @@ -653,9 +654,9 @@ static u32 ov19_021D85B4 (u32 param0) return 11 + v0[param0]; } -static void ov19_021D85C4 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DA384 * param1, u32 param2, u32 param3, s32 param4, UnkStruct_ov19_021DCD18 * param5) +static void ov19_021D85C4(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DA384 *param1, u32 param2, u32 param3, s32 param4, UnkStruct_ov19_021DCD18 *param5) { - BoxPokemon * v0; + BoxPokemon *v0; u32 v1, v2, v3, v4, v5; u64 v6, v7; @@ -678,7 +679,7 @@ static void ov19_021D85C4 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D } } -static void ov19_021D865C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2) +static void ov19_021D865C(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2) { VecFx32 v0; int v1, v2; @@ -696,7 +697,7 @@ static void ov19_021D865C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D } } -static void ov19_021D86B4 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2) +static void ov19_021D86B4(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2) { VecFx32 v0; int v1, v2; @@ -714,7 +715,7 @@ static void ov19_021D86B4 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D } } -static void ov19_021D870C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021DCD18 * param1) +static void ov19_021D870C(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD18 *param1) { VecFx32 v0; int v1, v2, v3; @@ -736,10 +737,10 @@ static void ov19_021D870C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D } } -static void ov19_021D8764 (u16 * param0, const u16 * param1, u32 param2, u32 param3, u32 param4) +static void ov19_021D8764(u16 *param0, const u16 *param1, u32 param2, u32 param3, u32 param4) { u32 v0, v1; - u16 * v2; + u16 *v2; u16 v3; if (param2 >= 32) { @@ -792,7 +793,7 @@ static void ov19_021D8764 (u16 * param0, const u16 * param1, u32 param2, u32 par } } -void ov19_021D8860 (UnkStruct_ov19_021D8318 * param0, u32 param1) +void ov19_021D8860(UnkStruct_ov19_021D8318 *param0, u32 param1) { param0->unk_A0 = param1; param0->unk_A4 = 0; @@ -800,14 +801,14 @@ void ov19_021D8860 (UnkStruct_ov19_021D8318 * param0, u32 param1) ov19_021DA7B8(param0->unk_58F0, &(param0->unk_A8[param0->unk_02][param1]), 1); } -BOOL ov19_021D8898 (UnkStruct_ov19_021D8318 * param0) +BOOL ov19_021D8898(UnkStruct_ov19_021D8318 *param0) { - UnkStruct_ov19_021DCD18 * v0 = &(param0->unk_A8[param0->unk_02][param0->unk_A0]); + UnkStruct_ov19_021DCD18 *v0 = &(param0->unk_A8[param0->unk_02][param0->unk_A0]); switch (param0->unk_A4) { case 0: if (ov19_021DA7E0(param0->unk_58F0, v0)) { - const UnkStruct_ov19_021D5DF8 * v1 = ov19_021D7964(param0->unk_58FC); + const UnkStruct_ov19_021D5DF8 *v1 = ov19_021D7964(param0->unk_58FC); if (ov19_021D3B18(v1)) { if (ov19_021D3B20(v1)) { @@ -832,7 +833,7 @@ BOOL ov19_021D8898 (UnkStruct_ov19_021D8318 * param0) return 0; } -void ov19_021D8938 (UnkStruct_ov19_021D8318 * param0) +void ov19_021D8938(UnkStruct_ov19_021D8318 *param0) { u32 v0; int v1; @@ -846,7 +847,7 @@ void ov19_021D8938 (UnkStruct_ov19_021D8318 * param0) } } -void ov19_021D8988 (UnkStruct_ov19_021D8318 * param0, u32 param1, u32 param2) +void ov19_021D8988(UnkStruct_ov19_021D8318 *param0, u32 param1, u32 param2) { if (param0->unk_A8[param0->unk_02][param1].unk_00 != NULL) { ov19_021DA690(param0->unk_58F0, &(param0->unk_A8[param0->unk_02][param1]), param2); @@ -855,14 +856,14 @@ void ov19_021D8988 (UnkStruct_ov19_021D8318 * param0, u32 param1, u32 param2) } } -void ov19_021D89F4 (UnkStruct_ov19_021D8318 * param0, u32 param1) +void ov19_021D89F4(UnkStruct_ov19_021D8318 *param0, u32 param1) { if (param0->unk_A8[param0->unk_02][param1].unk_00 != NULL) { ov19_021DA694(param0->unk_58F0, &(param0->unk_A8[param0->unk_02][param1]), 1); } } -void ov19_021D8A24 (UnkStruct_ov19_021D8318 * param0) +void ov19_021D8A24(UnkStruct_ov19_021D8318 *param0) { u32 v0, v1; @@ -874,7 +875,7 @@ void ov19_021D8A24 (UnkStruct_ov19_021D8318 * param0) } } -void ov19_021D8A6C (UnkStruct_ov19_021D8318 * param0) +void ov19_021D8A6C(UnkStruct_ov19_021D8318 *param0) { u32 v0, v1, v2, v3, v4, v5, v6; @@ -897,7 +898,7 @@ void ov19_021D8A6C (UnkStruct_ov19_021D8318 * param0) } } -void ov19_021D8B14 (UnkStruct_ov19_021D8318 * param0) +void ov19_021D8B14(UnkStruct_ov19_021D8318 *param0) { int v0; diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c index ebc76817e6..94d02dc15d 100644 --- a/src/overlay019/ov19_021D8B54.c +++ b/src/overlay019/ov19_021D8B54.c @@ -1,33 +1,34 @@ +#include "overlay019/ov19_021D8B54.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay019/struct_ov19_021D5DF8_decl.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" +#include "overlay019/ov19_021D0D80.h" +#include "overlay019/ov19_021D61B0.h" +#include "overlay019/ov19_021D79F8.h" +#include "overlay019/ov19_021DA270.h" +#include "overlay019/ov19_021DC5F0.h" +#include "overlay019/ov19_021DE3E8.h" #include "overlay019/struct_ov19_021D4DF0.h" +#include "overlay019/struct_ov19_021D5DF8_decl.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D8E00.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay019/struct_ov19_021DCD18.h" -#include "unk_02006E3C.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_0201D15C.h" #include "unk_020218BC.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021D79F8.h" -#include "overlay019/ov19_021D8B54.h" -#include "overlay019/ov19_021DA270.h" -#include "overlay019/ov19_021DC5F0.h" -#include "overlay019/ov19_021DE3E8.h" typedef struct { - GraphicElementData * unk_00; + GraphicElementData *unk_00; u16 unk_04; u16 unk_06; u32 unk_08; @@ -38,34 +39,34 @@ typedef struct { fx32 unk_1C; fx32 unk_20; fx32 unk_24; - UnkStruct_ov19_021D8E00 * unk_28; + UnkStruct_ov19_021D8E00 *unk_28; } UnkStruct_ov19_021D9554; -static void ov19_021D8E00(UnkStruct_ov19_021D8E00 * param0); -static void ov19_021D8EE0(const UnkStruct_ov19_021D8E00 * param0, BOOL * param1, BOOL * param2); -static void ov19_021D9088(SysTask * param0, void * param1); -static void ov19_021D928C(SysTask * param0, void * param1); -static void ov19_021D93D0(SysTask * param0, void * param1); -static void ov19_021D9554(UnkStruct_ov19_021D8E00 * param0, GraphicElementData * param1, fx32 param2, s32 param3, u32 param4); -static BOOL ov19_021D95E0(UnkStruct_ov19_021D8E00 * param0); -static void ov19_021D95F4(void * param0); -static void ov19_021D9600(SysTask * param0, void * param1); -static void ov19_021D9718(SysTask * param0, void * param1); -static void ov19_021D9894(SysTask * param0, void * param1); -static void ov19_021D9B78(SysTask * param0, void * param1); -static void ov19_021D9C18(SysTask * param0, void * param1); -static void ov19_021D9CB4(SysTask * param0, void * param1); -static void ov19_021D9D48(s32 * param0, s32 * param1, u8 * param2, UnkStruct_ov19_021D8E00 * param3); -static void ov19_021D9E04(UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1); -static void ov19_021D9EB0(UnkStruct_ov19_021D8E00 * param0); -static void ov19_021DA038(UnkStruct_ov19_021D8E00 * param0); -static void ov19_021DA06C(UnkStruct_ov19_021D8E00 * param0); -static void ov19_021DA110(UnkStruct_ov19_021D8E00 * param0); -static void ov19_021DA1F8(UnkStruct_ov19_021D8E00 * param0); -static void ov19_021DA204(UnkStruct_ov19_021D8E00 * param0); -static GraphicElementData * ov19_021DA224(UnkStruct_ov19_021D8E00 * param0); - -BOOL ov19_021D8B54 (UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4) +static void ov19_021D8E00(UnkStruct_ov19_021D8E00 *param0); +static void ov19_021D8EE0(const UnkStruct_ov19_021D8E00 *param0, BOOL *param1, BOOL *param2); +static void ov19_021D9088(SysTask *param0, void *param1); +static void ov19_021D928C(SysTask *param0, void *param1); +static void ov19_021D93D0(SysTask *param0, void *param1); +static void ov19_021D9554(UnkStruct_ov19_021D8E00 *param0, GraphicElementData *param1, fx32 param2, s32 param3, u32 param4); +static BOOL ov19_021D95E0(UnkStruct_ov19_021D8E00 *param0); +static void ov19_021D95F4(void *param0); +static void ov19_021D9600(SysTask *param0, void *param1); +static void ov19_021D9718(SysTask *param0, void *param1); +static void ov19_021D9894(SysTask *param0, void *param1); +static void ov19_021D9B78(SysTask *param0, void *param1); +static void ov19_021D9C18(SysTask *param0, void *param1); +static void ov19_021D9CB4(SysTask *param0, void *param1); +static void ov19_021D9D48(s32 *param0, s32 *param1, u8 *param2, UnkStruct_ov19_021D8E00 *param3); +static void ov19_021D9E04(UnkStruct_ov19_021D8E00 *param0, VecFx32 *param1); +static void ov19_021D9EB0(UnkStruct_ov19_021D8E00 *param0); +static void ov19_021DA038(UnkStruct_ov19_021D8E00 *param0); +static void ov19_021DA06C(UnkStruct_ov19_021D8E00 *param0); +static void ov19_021DA110(UnkStruct_ov19_021D8E00 *param0); +static void ov19_021DA1F8(UnkStruct_ov19_021D8E00 *param0); +static void ov19_021DA204(UnkStruct_ov19_021D8E00 *param0); +static GraphicElementData *ov19_021DA224(UnkStruct_ov19_021D8E00 *param0); + +BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, GraphicElementManager *param3, NARC *param4) { param0->unk_794 = param1; param0->unk_790 = param2; @@ -93,7 +94,7 @@ BOOL ov19_021D8B54 (UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 * return 1; } -void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1) +void ov19_021D8C1C(UnkStruct_ov19_021D8E00 *param0, NARC *param1) { UnkStruct_ov19_021DA864 v0; u32 v1, v2; @@ -173,7 +174,7 @@ void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1) ov19_021D9AEC(param0); } -static void ov19_021D8E00 (UnkStruct_ov19_021D8E00 * param0) +static void ov19_021D8E00(UnkStruct_ov19_021D8E00 *param0) { VecFx32 v0; s32 v1, v2; @@ -191,7 +192,7 @@ static void ov19_021D8E00 (UnkStruct_ov19_021D8E00 * param0) param0->unk_78C = 1; } -void ov19_021D8E84 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D8E84(UnkStruct_ov19_021D8E00 *param0) { if (param0->unk_14) { Heap_FreeToHeap(param0->unk_14); @@ -224,7 +225,7 @@ void ov19_021D8E84 (UnkStruct_ov19_021D8E00 * param0) } } -static void ov19_021D8EE0 (const UnkStruct_ov19_021D8E00 * param0, BOOL * param1, BOOL * param2) +static void ov19_021D8EE0(const UnkStruct_ov19_021D8E00 *param0, BOOL *param1, BOOL *param2) { *param1 = *param2 = 0; @@ -252,7 +253,7 @@ static void ov19_021D8EE0 (const UnkStruct_ov19_021D8E00 * param0, BOOL * param1 } } -void ov19_021D8F60 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D8F60(UnkStruct_ov19_021D8E00 *param0) { BOOL v0, v1; s32 v2, v3; @@ -309,14 +310,14 @@ void ov19_021D8F60 (UnkStruct_ov19_021D8E00 * param0) ov19_021D77C8(ov19_021D9088, param0, 0); } -BOOL ov19_021D9074 (UnkStruct_ov19_021D8E00 * param0) +BOOL ov19_021D9074(UnkStruct_ov19_021D8E00 *param0) { return param0->unk_787 == 0; } -static void ov19_021D9088 (SysTask * param0, void * param1) +static void ov19_021D9088(SysTask *param0, void *param1) { - UnkStruct_ov19_021D8E00 * v0 = (UnkStruct_ov19_021D8E00 *)param1; + UnkStruct_ov19_021D8E00 *v0 = (UnkStruct_ov19_021D8E00 *)param1; VecFx32 v1; v1.z = 0; @@ -380,7 +381,7 @@ static void ov19_021D9088 (SysTask * param0, void * param1) SysTask_Done(param0); } -void ov19_021D9230 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9230(UnkStruct_ov19_021D8E00 *param0) { SpriteActor_SetSpriteAnimActive(param0->unk_04, 1); @@ -393,14 +394,14 @@ void ov19_021D9230 (UnkStruct_ov19_021D8E00 * param0) ov19_021D77C8(ov19_021D928C, param0, 0); } -BOOL ov19_021D9278 (UnkStruct_ov19_021D8E00 * param0) +BOOL ov19_021D9278(UnkStruct_ov19_021D8E00 *param0) { return param0->unk_784 == 255; } -static void ov19_021D928C (SysTask * param0, void * param1) +static void ov19_021D928C(SysTask *param0, void *param1) { - UnkStruct_ov19_021D8E00 * v0 = (UnkStruct_ov19_021D8E00 *)param1; + UnkStruct_ov19_021D8E00 *v0 = (UnkStruct_ov19_021D8E00 *)param1; VecFx32 v1 = *(sub_02021D28(v0->unk_04)); switch (v0->unk_784) { @@ -438,7 +439,7 @@ static void ov19_021D928C (SysTask * param0, void * param1) } } -void ov19_021D9368 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9368(UnkStruct_ov19_021D8E00 *param0) { param0->unk_780 = (12 << FX32_SHIFT) / 6; param0->unk_770 = (param0->unk_768 + 12); @@ -448,7 +449,7 @@ void ov19_021D9368 (UnkStruct_ov19_021D8E00 * param0) ov19_021D77C8(ov19_021D93D0, param0, 0); } -BOOL ov19_021D939C (UnkStruct_ov19_021D8E00 * param0) +BOOL ov19_021D939C(UnkStruct_ov19_021D8E00 *param0) { if (param0->unk_784 == 255) { ov19_021DA06C(param0); @@ -460,9 +461,9 @@ BOOL ov19_021D939C (UnkStruct_ov19_021D8E00 * param0) return 0; } -static void ov19_021D93D0 (SysTask * param0, void * param1) +static void ov19_021D93D0(SysTask *param0, void *param1) { - UnkStruct_ov19_021D8E00 * v0 = (UnkStruct_ov19_021D8E00 *)param1; + UnkStruct_ov19_021D8E00 *v0 = (UnkStruct_ov19_021D8E00 *)param1; VecFx32 v1 = *(sub_02021D28(v0->unk_04)); switch (v0->unk_784) { @@ -504,10 +505,10 @@ static void ov19_021D93D0 (SysTask * param0, void * param1) } } -void ov19_021D94B4 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D94B4(UnkStruct_ov19_021D8E00 *param0) { VecFx32 v0; - GraphicElementData * v1; + GraphicElementData *v1; SpriteActor_SetSpriteAnimActive(param0->unk_04, 1); @@ -523,7 +524,7 @@ void ov19_021D94B4 (UnkStruct_ov19_021D8E00 * param0) param0->unk_784 = 0; } -BOOL ov19_021D9530 (UnkStruct_ov19_021D8E00 * param0) +BOOL ov19_021D9530(UnkStruct_ov19_021D8E00 *param0) { if (ov19_021D95E0(param0)) { SpriteActor_SetSpriteAnimActive(param0->unk_04, 2); @@ -534,9 +535,9 @@ BOOL ov19_021D9530 (UnkStruct_ov19_021D8E00 * param0) return 0; } -static void ov19_021D9554 (UnkStruct_ov19_021D8E00 * param0, GraphicElementData * param1, fx32 param2, s32 param3, u32 param4) +static void ov19_021D9554(UnkStruct_ov19_021D8E00 *param0, GraphicElementData *param1, fx32 param2, s32 param3, u32 param4) { - UnkStruct_ov19_021D9554 * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021D9554)); + UnkStruct_ov19_021D9554 *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021D9554)); if (v0) { VecFx32 v1; @@ -565,20 +566,20 @@ static void ov19_021D9554 (UnkStruct_ov19_021D8E00 * param0, GraphicElementData } } -static BOOL ov19_021D95E0 (UnkStruct_ov19_021D8E00 * param0) +static BOOL ov19_021D95E0(UnkStruct_ov19_021D8E00 *param0) { return param0->unk_788 == 0; } -static void ov19_021D95F4 (void * param0) +static void ov19_021D95F4(void *param0) { - UnkStruct_ov19_021D8E00 * v0 = param0; + UnkStruct_ov19_021D8E00 *v0 = param0; v0->unk_788 = 0; } -static void ov19_021D9600 (SysTask * param0, void * param1) +static void ov19_021D9600(SysTask *param0, void *param1) { - UnkStruct_ov19_021D9554 * v0 = (UnkStruct_ov19_021D9554 *)param1; + UnkStruct_ov19_021D9554 *v0 = (UnkStruct_ov19_021D9554 *)param1; VecFx32 v1; v1 = *sub_02021D28(v0->unk_00); @@ -609,7 +610,7 @@ static void ov19_021D9600 (SysTask * param0, void * param1) } } -void ov19_021D9690 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9690(UnkStruct_ov19_021D8E00 *param0) { VecFx32 v0; @@ -630,14 +631,14 @@ void ov19_021D9690 (UnkStruct_ov19_021D8E00 * param0) } } -BOOL ov19_021D9704 (UnkStruct_ov19_021D8E00 * param0) +BOOL ov19_021D9704(UnkStruct_ov19_021D8E00 *param0) { return param0->unk_788 == 0; } -static void ov19_021D9718 (SysTask * param0, void * param1) +static void ov19_021D9718(SysTask *param0, void *param1) { - UnkStruct_ov19_021D8E00 * v0 = (UnkStruct_ov19_021D8E00 *)param1; + UnkStruct_ov19_021D8E00 *v0 = (UnkStruct_ov19_021D8E00 *)param1; switch (v0->unk_784) { case 0: @@ -655,8 +656,7 @@ static void ov19_021D9718 (SysTask * param0, void * param1) v0->unk_784++; } break; - case 1: - { + case 1: { VecFx32 v2 = *sub_02021D28(v0->unk_04); if (v0->unk_787) { @@ -669,12 +669,11 @@ static void ov19_021D9718 (SysTask * param0, void * param1) v0->unk_788 = 0; SysTask_Done(param0); } - } - break; + } break; } } -void ov19_021D97FC (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D97FC(UnkStruct_ov19_021D8E00 *param0) { VecFx32 v0 = *sub_02021D28(param0->unk_04); @@ -688,7 +687,7 @@ void ov19_021D97FC (UnkStruct_ov19_021D8E00 * param0) } } -BOOL ov19_021D9858 (UnkStruct_ov19_021D8E00 * param0) +BOOL ov19_021D9858(UnkStruct_ov19_021D8E00 *param0) { if (param0->unk_788 == 0) { if ((param0->unk_78C == 0) && (param0->unk_78D == 0)) { @@ -703,9 +702,9 @@ BOOL ov19_021D9858 (UnkStruct_ov19_021D8E00 * param0) return 0; } -static void ov19_021D9894 (SysTask * param0, void * param1) +static void ov19_021D9894(SysTask *param0, void *param1) { - UnkStruct_ov19_021D8E00 * v0; + UnkStruct_ov19_021D8E00 *v0; VecFx32 v1; v0 = (UnkStruct_ov19_021D8E00 *)param1; @@ -723,7 +722,7 @@ static void ov19_021D9894 (SysTask * param0, void * param1) } } -void ov19_021D9900 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9900(UnkStruct_ov19_021D8E00 *param0) { if (param0->unk_790->unk_110 == ov19_021D5E68(param0->unk_790)) { ov19_021D84E0(param0->unk_758); @@ -733,7 +732,7 @@ void ov19_021D9900 (UnkStruct_ov19_021D8E00 * param0) SpriteActor_SetSpriteAnimActive(param0->unk_04, 0); } -void ov19_021D9938 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9938(UnkStruct_ov19_021D8E00 *param0) { SpriteActor_SetSpriteAnimActive(param0->unk_04, 1); ov19_021DA7B8(param0->unk_48, param0->unk_4C, 1); @@ -741,9 +740,9 @@ void ov19_021D9938 (UnkStruct_ov19_021D8E00 * param0) param0->unk_784 = 0; } -BOOL ov19_021D995C (UnkStruct_ov19_021D8E00 * param0) +BOOL ov19_021D995C(UnkStruct_ov19_021D8E00 *param0) { - const UnkStruct_ov19_021D5DF8 * v0 = ov19_021D7964(param0->unk_794); + const UnkStruct_ov19_021D5DF8 *v0 = ov19_021D7964(param0->unk_794); switch (param0->unk_784) { case 0: @@ -775,7 +774,7 @@ BOOL ov19_021D995C (UnkStruct_ov19_021D8E00 * param0) return 0; } -void ov19_021D99F4 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D99F4(UnkStruct_ov19_021D8E00 *param0) { sub_02021E80(param0->unk_04, 1); @@ -788,7 +787,7 @@ void ov19_021D99F4 (UnkStruct_ov19_021D8E00 * param0) } } -void ov19_021D9A2C (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9A2C(UnkStruct_ov19_021D8E00 *param0) { sub_02021E80(param0->unk_04, 2); @@ -801,7 +800,7 @@ void ov19_021D9A2C (UnkStruct_ov19_021D8E00 * param0) } } -void ov19_021D9A64 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9A64(UnkStruct_ov19_021D8E00 *param0) { if (param0->unk_78C) { u32 v0 = ov19_021D5EA0(param0->unk_790); @@ -809,7 +808,7 @@ void ov19_021D9A64 (UnkStruct_ov19_021D8E00 * param0) } } -void ov19_021D9A8C (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9A8C(UnkStruct_ov19_021D8E00 *param0) { u32 v0 = ov19_021D5EC8(param0->unk_790); @@ -818,7 +817,7 @@ void ov19_021D9A8C (UnkStruct_ov19_021D8E00 * param0) } } -void ov19_021D9AB0 (UnkStruct_ov19_021D8E00 * param0, u32 param1) +void ov19_021D9AB0(UnkStruct_ov19_021D8E00 *param0, u32 param1) { if (param0->unk_4C->unk_00 != NULL) { ov19_021DA690(param0->unk_48, param0->unk_4C, param1); @@ -827,7 +826,7 @@ void ov19_021D9AB0 (UnkStruct_ov19_021D8E00 * param0, u32 param1) } } -void ov19_021D9AEC (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9AEC(UnkStruct_ov19_021D8E00 *param0) { if (ov19_021D5EE0(param0->unk_790)) { sub_02021E90(param0->unk_04, 1); @@ -836,17 +835,17 @@ void ov19_021D9AEC (UnkStruct_ov19_021D8E00 * param0) } } -void ov19_021D9B10 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9B10(UnkStruct_ov19_021D8E00 *param0) { SpriteActor_SetSpriteAnimActive(param0->unk_04, 1); } -void ov19_021D9B1C (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1) +void ov19_021D9B1C(UnkStruct_ov19_021D8E00 *param0, VecFx32 *param1) { *param1 = *(sub_02021D28(param0->unk_04)); } -void ov19_021D9B34 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9B34(UnkStruct_ov19_021D8E00 *param0) { param0->unk_784 = 0; @@ -856,14 +855,14 @@ void ov19_021D9B34 (UnkStruct_ov19_021D8E00 * param0) } } -BOOL ov19_021D9B64 (UnkStruct_ov19_021D8E00 * param0) +BOOL ov19_021D9B64(UnkStruct_ov19_021D8E00 *param0) { return param0->unk_788 == 0; } -static void ov19_021D9B78 (SysTask * param0, void * param1) +static void ov19_021D9B78(SysTask *param0, void *param1) { - UnkStruct_ov19_021D8E00 * v0 = param1; + UnkStruct_ov19_021D8E00 *v0 = param1; switch (v0->unk_784) { case 0: @@ -880,7 +879,7 @@ static void ov19_021D9B78 (SysTask * param0, void * param1) } } -void ov19_021D9BD4 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9BD4(UnkStruct_ov19_021D8E00 *param0) { param0->unk_784 = 0; @@ -890,14 +889,14 @@ void ov19_021D9BD4 (UnkStruct_ov19_021D8E00 * param0) } } -BOOL ov19_021D9C04 (UnkStruct_ov19_021D8E00 * param0) +BOOL ov19_021D9C04(UnkStruct_ov19_021D8E00 *param0) { return param0->unk_788 == 0; } -static void ov19_021D9C18 (SysTask * param0, void * param1) +static void ov19_021D9C18(SysTask *param0, void *param1) { - UnkStruct_ov19_021D8E00 * v0 = param1; + UnkStruct_ov19_021D8E00 *v0 = param1; switch (v0->unk_784) { case 0: @@ -914,7 +913,7 @@ static void ov19_021D9C18 (SysTask * param0, void * param1) } } -void ov19_021D9C74 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9C74(UnkStruct_ov19_021D8E00 *param0) { param0->unk_784 = 0; @@ -923,14 +922,14 @@ void ov19_021D9C74 (UnkStruct_ov19_021D8E00 * param0) } } -BOOL ov19_021D9CA0 (UnkStruct_ov19_021D8E00 * param0) +BOOL ov19_021D9CA0(UnkStruct_ov19_021D8E00 *param0) { return param0->unk_788 == 0; } -static void ov19_021D9CB4 (SysTask * param0, void * param1) +static void ov19_021D9CB4(SysTask *param0, void *param1) { - UnkStruct_ov19_021D8E00 * v0 = param1; + UnkStruct_ov19_021D8E00 *v0 = param1; switch (v0->unk_784) { case 0: @@ -947,14 +946,14 @@ static void ov19_021D9CB4 (SysTask * param0, void * param1) } } -void ov19_021D9D10 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9D10(UnkStruct_ov19_021D8E00 *param0) { if (param0->unk_78D) { SpriteActor_SetSpriteAnimActive(param0->unk_04, 1); } } -void ov19_021D9D28 (UnkStruct_ov19_021D8E00 * param0) +void ov19_021D9D28(UnkStruct_ov19_021D8E00 *param0) { if (param0->unk_78D) { SpriteActor_SetSpriteAnimActive(param0->unk_04, 0); @@ -962,9 +961,9 @@ void ov19_021D9D28 (UnkStruct_ov19_021D8E00 * param0) } } -static void ov19_021D9D48 (s32 * param0, s32 * param1, u8 * param2, UnkStruct_ov19_021D8E00 * param3) +static void ov19_021D9D48(s32 *param0, s32 *param1, u8 *param2, UnkStruct_ov19_021D8E00 *param3) { - const UnkStruct_ov19_021D4DF0 * v0 = param3->unk_790; + const UnkStruct_ov19_021D4DF0 *v0 = param3->unk_790; *param2 = ov19_021D5E10(v0); @@ -973,15 +972,13 @@ static void ov19_021D9D48 (s32 * param0, s32 * param1, u8 * param2, UnkStruct_ov *param0 = 112 + ov19_021D7820(param3->unk_794) + ov19_021D5E14(v0) * 24 + 0; *param1 = 40 + ov19_021D5E1C(v0) * 24 + -16; break; - case 1: - { + case 1: { u32 v1 = ov19_021D5E2C(v0); ov19_021DCD30(ov19_021D77E8(param3->unk_794), v1, param0, param1); (*param0) += 0; (*param1) += -16; - } - break; + } break; case 2: *param0 = 168 + ov19_021D7820(param3->unk_794); *param1 = 8; @@ -997,7 +994,7 @@ static void ov19_021D9D48 (s32 * param0, s32 * param1, u8 * param2, UnkStruct_ov } } -static void ov19_021D9E04 (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1) +static void ov19_021D9E04(UnkStruct_ov19_021D8E00 *param0, VecFx32 *param1) { sub_02021C50(param0->unk_04, param1); @@ -1026,7 +1023,7 @@ static void ov19_021D9E04 (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1) } } -static void ov19_021D9EB0 (UnkStruct_ov19_021D8E00 * param0) +static void ov19_021D9EB0(UnkStruct_ov19_021D8E00 *param0) { if (ov19_021D5E10(param0->unk_790) == 0) { if (ov19_021D5F20(param0->unk_790)) { @@ -1069,7 +1066,7 @@ static void ov19_021D9EB0 (UnkStruct_ov19_021D8E00 * param0) } } -static void ov19_021DA038 (UnkStruct_ov19_021D8E00 * param0) +static void ov19_021DA038(UnkStruct_ov19_021D8E00 *param0) { int v0; @@ -1080,7 +1077,7 @@ static void ov19_021DA038 (UnkStruct_ov19_021D8E00 * param0) param0->unk_78C = 1; } -static void ov19_021DA06C (UnkStruct_ov19_021D8E00 * param0) +static void ov19_021DA06C(UnkStruct_ov19_021D8E00 *param0) { if (ov19_021D5E10(param0->unk_790) == 0) { if (ov19_021D5F20(param0->unk_790)) { @@ -1102,13 +1099,13 @@ static void ov19_021DA06C (UnkStruct_ov19_021D8E00 * param0) } } -static void ov19_021DA110 (UnkStruct_ov19_021D8E00 * param0) +static void ov19_021DA110(UnkStruct_ov19_021D8E00 *param0) { if (ov19_021D5E10(param0->unk_790) == 0) { u32 v0 = ov19_021D5E24(param0->unk_790); { - UnkStruct_ov19_021DCD18 * v1 = ov19_021D84C8(param0->unk_758, v0); + UnkStruct_ov19_021DCD18 *v1 = ov19_021D84C8(param0->unk_758, v0); ov19_021DA754(param0->unk_48, param0->unk_4C, 1520); ov19_021DA754(param0->unk_48, v1, 1520 + 16); @@ -1123,7 +1120,7 @@ static void ov19_021DA110 (UnkStruct_ov19_021D8E00 * param0) u32 v2 = ov19_021D5E2C(param0->unk_790); { - UnkStruct_ov19_021DCD18 * v3 = ov19_021DCD18(param0->unk_75C, v2); + UnkStruct_ov19_021DCD18 *v3 = ov19_021DCD18(param0->unk_75C, v2); ov19_021DA754(param0->unk_48, param0->unk_4C, 1520); ov19_021DA754(param0->unk_48, v3, 1520 + 16); @@ -1137,21 +1134,21 @@ static void ov19_021DA110 (UnkStruct_ov19_021D8E00 * param0) } } -static void ov19_021DA1F8 (UnkStruct_ov19_021D8E00 * param0) +static void ov19_021DA1F8(UnkStruct_ov19_021D8E00 *param0) { param0->unk_78C = 0; } -static void ov19_021DA204 (UnkStruct_ov19_021D8E00 * param0) +static void ov19_021DA204(UnkStruct_ov19_021D8E00 *param0) { ov19_021DA3F0(param0->unk_48, param0->unk_4C, 1); param0->unk_78C = 0; param0->unk_754 = 0; } -static GraphicElementData * ov19_021DA224 (UnkStruct_ov19_021D8E00 * param0) +static GraphicElementData *ov19_021DA224(UnkStruct_ov19_021D8E00 *param0) { - UnkStruct_ov19_021DCD18 * v0; + UnkStruct_ov19_021DCD18 *v0; u32 v1; if (ov19_021D5E10(param0->unk_790) == 0) { diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c index 88d8106763..a06c4ff5a9 100644 --- a/src/overlay019/ov19_021DA270.c +++ b/src/overlay019/ov19_021DA270.c @@ -1,31 +1,31 @@ +#include "overlay019/ov19_021DA270.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "pokemon.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" +#include "overlay019/ov19_021D0D80.h" +#include "overlay019/ov19_021D61B0.h" #include "overlay019/struct_ov19_021D4DF0.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay019/struct_ov19_021DCD18.h" -#include "narc.h" -#include "unk_02006E3C.h" #include "heap.h" -#include "unk_020218BC.h" +#include "narc.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021DA270.h" +#include "unk_02006E3C.h" +#include "unk_020218BC.h" -BOOL ov19_021DA270 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4) +BOOL ov19_021DA270(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, GraphicElementManager *param3, NARC *param4) { NNSG2dImagePaletteProxy v0; - NNSG2dPaletteData * v1; - void * v2; + NNSG2dPaletteData *v1; + void *v2; param0->unk_48 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 10); @@ -36,7 +36,7 @@ BOOL ov19_021DA270 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021D61B0 * if (v2) { BOOL v3; - NNSG2dPaletteCompressInfo * v4; + NNSG2dPaletteCompressInfo *v4; NNS_G2dInitImagePaletteProxy(&v0); v3 = NNS_G2dGetUnpackedPaletteCompressInfo(v2, &v4); @@ -67,7 +67,7 @@ BOOL ov19_021DA270 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021D61B0 * return 1; } -void ov19_021DA384 (UnkStruct_ov19_021DA384 * param0) +void ov19_021DA384(UnkStruct_ov19_021DA384 *param0) { if (param0->unk_08 != NULL) { Heap_FreeToHeap(param0->unk_08); @@ -94,7 +94,7 @@ void ov19_021DA384 (UnkStruct_ov19_021DA384 * param0) } } -void ov19_021DA3CC (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2) +void ov19_021DA3CC(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2) { while (param2--) { param1->unk_00 = NULL; @@ -103,7 +103,7 @@ void ov19_021DA3CC (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * } } -void ov19_021DA3F0 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2) +void ov19_021DA3F0(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2) { while (param2--) { if (param1->unk_00 != NULL) { @@ -115,14 +115,14 @@ void ov19_021DA3F0 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * } } -void ov19_021DA418 (const UnkStruct_ov19_021DCD18 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2) +void ov19_021DA418(const UnkStruct_ov19_021DCD18 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2) { MI_CpuCopy32(param0, param1, sizeof(UnkStruct_ov19_021DCD18) * param2); } -void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, s32 param2, s32 param3, u32 param4, u32 param5, u32 param6, UnkStruct_ov19_021DCD18 * param7) +void ov19_021DA428(UnkStruct_ov19_021DA384 *param0, BoxPokemon *param1, s32 param2, s32 param3, u32 param4, u32 param5, u32 param6, UnkStruct_ov19_021DCD18 *param7) { - NNSG2dCharacterData * v0; + NNSG2dCharacterData *v0; UnkStruct_ov19_021DA864 v1; u16 v2; u8 v3; @@ -159,9 +159,9 @@ void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, s32 p BoxPokemon_ExitDecryptionContext(param1, v5); } -void ov19_021DA548 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, u32 param2, u32 param3, u8 * param4, s32 param5, s32 param6, u32 param7, u32 param8, u32 param9, UnkStruct_ov19_021DCD18 * param10) +void ov19_021DA548(UnkStruct_ov19_021DA384 *param0, BoxPokemon *param1, u32 param2, u32 param3, u8 *param4, s32 param5, s32 param6, u32 param7, u32 param8, u32 param9, UnkStruct_ov19_021DCD18 *param10) { - NNSG2dCharacterData * v0; + NNSG2dCharacterData *v0; UnkStruct_ov19_021DA864 v1; BOOL v2; u8 v3, v4; @@ -195,12 +195,12 @@ void ov19_021DA548 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, u32 p BoxPokemon_ExitDecryptionContext(param1, v2); } -void ov19_021DA63C (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2) +void ov19_021DA63C(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2) { if (param2 != 0) { int v0; - if ((param2 & 1)) { + if (param2 & 1) { if (param1->unk_30 == 0) { sub_02021FE0(param1->unk_00, GX_OAM_MODE_XLU); return; @@ -218,21 +218,21 @@ void ov19_021DA63C (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * sub_02021FE0(param1->unk_00, GX_OAM_MODE_NORMAL); } -void ov19_021DA68C (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2) +void ov19_021DA68C(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2) { param1->unk_2E = param2; } -void ov19_021DA690 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2) +void ov19_021DA690(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2) { param1->unk_30 = param2; } -void ov19_021DA694 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, BOOL param2) +void ov19_021DA694(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, BOOL param2) { int v0; u32 v1; - NNSG2dCharacterData * v2; + NNSG2dCharacterData *v2; if ((param1->unk_30 == 112) && (param1->unk_28 == PokeIconSpriteIndex(487, 0, 0))) { param1->unk_28 = PokeIconSpriteIndex(487, 0, 1); @@ -251,15 +251,15 @@ void ov19_021DA694 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * MI_CpuCopy32(v2->pRawData, (void *)v1, (4 * 4) * 0x20); } -void ov19_021DA744 (UnkStruct_ov19_021DA384 * param0, void * param1, u32 param2, u32 param3) +void ov19_021DA744(UnkStruct_ov19_021DA384 *param0, void *param1, u32 param2, u32 param3) { NARC_ReadFromMember(param0->unk_48, param2, 0, param3, param1); } -void ov19_021DA754 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2) +void ov19_021DA754(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2) { if (param1->unk_00 != NULL) { - NNSG2dCharacterData * v0; + NNSG2dCharacterData *v0; NNS_G2dInitImageProxy(&(param1->unk_04)); @@ -274,7 +274,7 @@ void ov19_021DA754 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * } } -void ov19_021DA7B8 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2) +void ov19_021DA7B8(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2) { if ((param2 == 1) || (param2 == 2)) { sub_02021CF8(param1->unk_00, 1); @@ -285,24 +285,24 @@ void ov19_021DA7B8 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * SpriteActor_SetSpriteAnimActive(param1->unk_00, param2); } -BOOL ov19_021DA7E0 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1) +BOOL ov19_021DA7E0(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1) { return sub_02021FD0(param1->unk_00) == 0; } -void ov19_021DA7F4 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, BOOL param2) +void ov19_021DA7F4(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, BOOL param2) { u32 v0 = ((param2) ? 6 : 2) + param1->unk_2C; sub_02021E90(param1->unk_00, v0); } -NNSG2dCellDataBank * ov19_021DA80C (UnkStruct_ov19_021DA384 * param0) +NNSG2dCellDataBank *ov19_021DA80C(UnkStruct_ov19_021DA384 *param0) { return param0->unk_10; } -NNSG2dAnimBankData * ov19_021DA810 (UnkStruct_ov19_021DA384 * param0) +NNSG2dAnimBankData *ov19_021DA810(UnkStruct_ov19_021DA384 *param0) { return param0->unk_04; } diff --git a/src/overlay019/ov19_021DA814.c b/src/overlay019/ov19_021DA814.c index b01caf0229..0188b1d3ff 100644 --- a/src/overlay019/ov19_021DA814.c +++ b/src/overlay019/ov19_021DA814.c @@ -1,21 +1,22 @@ +#include "overlay019/ov19_021DA814.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" +#include "overlay019/ov19_021D61B0.h" #include "overlay019/struct_ov19_021D4DF0.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay019/struct_ov19_021DA8D8.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "unk_02006E3C.h" #include "unk_020218BC.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021DA814.h" -BOOL ov19_021DA814 (UnkStruct_ov19_021DA8D8 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4) +BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, GraphicElementManager *param3, NARC *param4) { param0->unk_44 = param1; param0->unk_3C = param3; @@ -32,7 +33,7 @@ BOOL ov19_021DA814 (UnkStruct_ov19_021DA8D8 * param0, UnkStruct_ov19_021D61B0 * return 1; } -void ov19_021DA864 (UnkStruct_ov19_021DA8D8 * param0, NARC * param1) +void ov19_021DA864(UnkStruct_ov19_021DA8D8 *param0, NARC *param1) { UnkStruct_ov19_021DA864 v0; @@ -44,7 +45,7 @@ void ov19_021DA864 (UnkStruct_ov19_021DA8D8 * param0, NARC * param1) sub_02021E90(param0->unk_04, 1); } -void ov19_021DA8D8 (UnkStruct_ov19_021DA8D8 * param0) +void ov19_021DA8D8(UnkStruct_ov19_021DA8D8 *param0) { if (param0->unk_08 != NULL) { Heap_FreeToHeap(param0->unk_08); @@ -57,7 +58,7 @@ void ov19_021DA8D8 (UnkStruct_ov19_021DA8D8 * param0) } } -void ov19_021DA8FC (UnkStruct_ov19_021DA8D8 * param0, int param1) +void ov19_021DA8FC(UnkStruct_ov19_021DA8D8 *param0, int param1) { switch (param1) { case 0: diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index 967f8f67bb..37010594dc 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -1,44 +1,43 @@ +#include "overlay019/ov19_021DA92C.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "strbuf.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" - #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0205AA50.h" + +#include "overlay019/ov19_021D0D80.h" +#include "overlay019/ov19_021D61B0.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D5BAC.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay019/struct_ov19_021DA9E0.h" #include "overlay061/struct_ov61_0222C884.h" +#include "heap.h" +#include "message.h" +#include "pokemon.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" -#include "message.h" #include "unk_0200C440.h" -#include "sys_task.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "pokemon.h" #include "unk_0207C908.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021DA92C.h" typedef struct { u16 unk_00; u16 unk_02; u16 unk_04; u16 unk_06; - UnkStruct_ov19_021DA9E0 * unk_08; + UnkStruct_ov19_021DA9E0 *unk_08; } UnkStruct_ov19_021DAE2C; u32 sub_0207C908(int param0); @@ -47,21 +46,21 @@ u32 sub_0207C924(void); u32 sub_0207C928(void); u8 sub_0207C92C(int param0); u32 sub_0207C944(void); -void sub_0201AA10(Window * param0, u32 param1, u32 param2); -static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 * param0); -static void ov19_021DAC4C(UnkStruct_ov19_021DA9E0 * param0); -static void ov19_021DAC90(UnkStruct_ov19_021DA9E0 * param0); -static void ov19_021DACB0(UnkStruct_ov19_021DA9E0 * param0); -static void ov19_021DACDC(UnkStruct_ov19_021DA9E0 * param0); -static void ov19_021DACF8(SysTask * param0, void * param1); -static void ov19_021DADCC(UnkStruct_ov19_021DA9E0 * param0, fx32 param1); -static void ov19_021DAE10(UnkStruct_ov19_021DA9E0 * param0); -static void ov19_021DAE2C(UnkStruct_ov19_021DAE2C * param0); -static void ov19_021DAE60(Window * param0, UnkStruct_ov19_021DA9E0 * param1, u32 param2, u32 param3); -static void ov19_021DB0E4(UnkStruct_ov19_021DA9E0 * param0); -static void ov19_021DB24C(UnkStruct_ov19_021DA9E0 * param0, u8 param1); - -BOOL ov19_021DA92C (UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, const MessageLoader * param5, NARC * param6) +void sub_0201AA10(Window *param0, u32 param1, u32 param2); +static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0); +static void ov19_021DAC4C(UnkStruct_ov19_021DA9E0 *param0); +static void ov19_021DAC90(UnkStruct_ov19_021DA9E0 *param0); +static void ov19_021DACB0(UnkStruct_ov19_021DA9E0 *param0); +static void ov19_021DACDC(UnkStruct_ov19_021DA9E0 *param0); +static void ov19_021DACF8(SysTask *param0, void *param1); +static void ov19_021DADCC(UnkStruct_ov19_021DA9E0 *param0, fx32 param1); +static void ov19_021DAE10(UnkStruct_ov19_021DA9E0 *param0); +static void ov19_021DAE2C(UnkStruct_ov19_021DAE2C *param0); +static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 param2, u32 param3); +static void ov19_021DB0E4(UnkStruct_ov19_021DA9E0 *param0); +static void ov19_021DB24C(UnkStruct_ov19_021DA9E0 *param0, u8 param1); + +BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4, const MessageLoader *param5, NARC *param6) { int v0; @@ -95,7 +94,7 @@ BOOL ov19_021DA92C (UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * return 1; } -void ov19_021DA9E0 (UnkStruct_ov19_021DA9E0 * param0) +void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 *param0) { int v0; @@ -154,14 +153,14 @@ void ov19_021DA9E0 (UnkStruct_ov19_021DA9E0 * param0) ov19_021DAC90(param0); } -void ov19_021DAA80 (UnkStruct_ov19_021DA9E0 * param0) +void ov19_021DAA80(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_00) { sub_02008A94(param0->unk_20); } } -void ov19_021DAA90 (UnkStruct_ov19_021DA9E0 * param0) +void ov19_021DAA90(UnkStruct_ov19_021DA9E0 *param0) { ArchivedSprite v0; @@ -169,7 +168,7 @@ void ov19_021DAA90 (UnkStruct_ov19_021DA9E0 * param0) param0->unk_24 = sub_02007C34(param0->unk_20, &v0, 44, 84, 0, 0, NULL, NULL); } -BOOL ov19_021DAAC4 (UnkStruct_ov19_021DA9E0 * param0) +BOOL ov19_021DAAC4(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_24) { sub_02007DC8(param0->unk_24); @@ -180,13 +179,13 @@ BOOL ov19_021DAAC4 (UnkStruct_ov19_021DA9E0 * param0) return 1; } -void ov19_021DAADC (UnkStruct_ov19_021DA9E0 * param0) +void ov19_021DAADC(UnkStruct_ov19_021DA9E0 *param0) { static const UnkStruct_ov61_0222C884 v0[] = { - {2, 0, 1, 10, 2, 1, 288}, - {2, 5, 3, 5, 1, 1, 308}, - {2, 0, 16, 10, 3, 3, 313}, - {2, 1, 21, 12, 4, 1, 343} + { 2, 0, 1, 10, 2, 1, 288 }, + { 2, 5, 3, 5, 1, 1, 308 }, + { 2, 0, 16, 10, 3, 3, 313 }, + { 2, 1, 21, 12, 4, 1, 343 } }; if (param0->unk_00 == 0) { @@ -215,7 +214,7 @@ void ov19_021DAADC (UnkStruct_ov19_021DA9E0 * param0) ov19_021DAC4C(param0); } -static void ov19_021DAB44 (UnkStruct_ov19_021DA9E0 * param0) +static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0) { NNSG2dImageProxy v0; UnkStruct_ov19_021DA864 v1; @@ -245,13 +244,13 @@ static void ov19_021DAB44 (UnkStruct_ov19_021DA9E0 * param0) param0->unk_30 = ov19_021D785C(param0->unk_0C, &v1, 56, 176, 47, NNS_G2D_VRAM_TYPE_2DMAIN); } -static void ov19_021DAC4C (UnkStruct_ov19_021DA9E0 * param0) +static void ov19_021DAC4C(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_4C == NULL) { - UnkStruct_ov19_021DAE2C * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DAE2C)); + UnkStruct_ov19_021DAE2C *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DAE2C)); if (v0) { - const UnkStruct_ov19_021D5BAC * v1 = ov19_021D5E70(param0->unk_10); + const UnkStruct_ov19_021D5BAC *v1 = ov19_021D5E70(param0->unk_10); v0->unk_00 = (v1->unk_0F) ? 4 : 0; v0->unk_08 = param0; @@ -262,7 +261,7 @@ static void ov19_021DAC4C (UnkStruct_ov19_021DA9E0 * param0) } } -static void ov19_021DAC90 (UnkStruct_ov19_021DA9E0 * param0) +static void ov19_021DAC90(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_4C) { Heap_FreeToHeap(SysTask_GetParam(param0->unk_4C)); @@ -271,21 +270,21 @@ static void ov19_021DAC90 (UnkStruct_ov19_021DA9E0 * param0) } } -static void ov19_021DACB0 (UnkStruct_ov19_021DA9E0 * param0) +static void ov19_021DACB0(UnkStruct_ov19_021DA9E0 *param0) { - UnkStruct_ov19_021DAE2C * v0 = SysTask_GetParam(param0->unk_4C); + UnkStruct_ov19_021DAE2C *v0 = SysTask_GetParam(param0->unk_4C); if (v0) { - const UnkStruct_ov19_021D5BAC * v1 = ov19_021D5E70(param0->unk_10); + const UnkStruct_ov19_021D5BAC *v1 = ov19_021D5E70(param0->unk_10); v0->unk_00 = (v1->unk_0F) ? 4 : 0; ov19_021DAE10(param0); } } -static void ov19_021DACDC (UnkStruct_ov19_021DA9E0 * param0) +static void ov19_021DACDC(UnkStruct_ov19_021DA9E0 *param0) { - UnkStruct_ov19_021DAE2C * v0 = SysTask_GetParam(param0->unk_4C); + UnkStruct_ov19_021DAE2C *v0 = SysTask_GetParam(param0->unk_4C); if (v0) { v0->unk_00 = 4; @@ -293,11 +292,11 @@ static void ov19_021DACDC (UnkStruct_ov19_021DA9E0 * param0) } } -static void ov19_021DACF8 (SysTask * param0, void * param1) +static void ov19_021DACF8(SysTask *param0, void *param1) { - UnkStruct_ov19_021DAE2C * v0 = (UnkStruct_ov19_021DAE2C *)param1; - UnkStruct_ov19_021DA9E0 * v1 = v0->unk_08; - const UnkStruct_ov19_021D5BAC * v2; + UnkStruct_ov19_021DAE2C *v0 = (UnkStruct_ov19_021DAE2C *)param1; + UnkStruct_ov19_021DA9E0 *v1 = v0->unk_08; + const UnkStruct_ov19_021D5BAC *v2; switch (v0->unk_00) { case 0: @@ -349,7 +348,7 @@ static void ov19_021DACF8 (SysTask * param0, void * param1) } } -static void ov19_021DADCC (UnkStruct_ov19_021DA9E0 * param0, fx32 param1) +static void ov19_021DADCC(UnkStruct_ov19_021DA9E0 *param0, fx32 param1) { int v0; VecFx32 v1; @@ -369,7 +368,7 @@ static void ov19_021DADCC (UnkStruct_ov19_021DA9E0 * param0, fx32 param1) } } -static void ov19_021DAE10 (UnkStruct_ov19_021DA9E0 * param0) +static void ov19_021DAE10(UnkStruct_ov19_021DA9E0 *param0) { int v0; @@ -378,10 +377,10 @@ static void ov19_021DAE10 (UnkStruct_ov19_021DA9E0 * param0) } } -static void ov19_021DAE2C (UnkStruct_ov19_021DAE2C * param0) +static void ov19_021DAE2C(UnkStruct_ov19_021DAE2C *param0) { u32 v0; - Window * v1; + Window *v1; v1 = &(param0->unk_08->unk_04[3]); @@ -397,9 +396,9 @@ static void ov19_021DAE2C (UnkStruct_ov19_021DAE2C * param0) ov19_021DAE60(v1, param0->unk_08, v0, 1); } -static void ov19_021DAE60 (Window * param0, UnkStruct_ov19_021DA9E0 * param1, u32 param2, u32 param3) +static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 param2, u32 param3) { - const Strbuf* v0; + const Strbuf *v0; u32 v1; v1 = (param3 * 16) + 0; @@ -415,8 +414,7 @@ static void ov19_021DAE60 (Window * param0, UnkStruct_ov19_021DA9E0 * param1, u3 v0 = param1->unk_10->unk_4C.unk_24; break; - case 1: - { + case 1: { VecFx32 v2; u32 v3, v4; @@ -452,7 +450,7 @@ static void ov19_021DAE60 (Window * param0, UnkStruct_ov19_021DA9E0 * param1, u3 sub_0201D78C(param0, 0, v0, 0, v1, 0xff, (u32)(((9 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } -void ov19_021DAF98 (UnkStruct_ov19_021DA9E0 * param0) +void ov19_021DAF98(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_00 == 0) { return; @@ -473,7 +471,7 @@ void ov19_021DAF98 (UnkStruct_ov19_021DA9E0 * param0) sub_0201ACCC(¶m0->unk_04[3]); } -void ov19_021DAFF8 (UnkStruct_ov19_021DA9E0 * param0) +void ov19_021DAFF8(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_00 == 0) { return; @@ -503,7 +501,7 @@ void ov19_021DAFF8 (UnkStruct_ov19_021DA9E0 * param0) ov19_021DACB0(param0); } -void ov19_021DB078 (UnkStruct_ov19_021DA9E0 * param0) +void ov19_021DB078(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_00 == 0) { return; @@ -529,10 +527,10 @@ void ov19_021DB078 (UnkStruct_ov19_021DA9E0 * param0) ov19_021DACDC(param0); } -static void ov19_021DB0E4 (UnkStruct_ov19_021DA9E0 * param0) +static void ov19_021DB0E4(UnkStruct_ov19_021DA9E0 *param0) { ArchivedSprite v0; - const UnkStruct_ov19_021D5BAC * v1; + const UnkStruct_ov19_021D5BAC *v1; v1 = ov19_021D5E70(param0->unk_10); @@ -564,7 +562,7 @@ static void ov19_021DB0E4 (UnkStruct_ov19_021DA9E0 * param0) ov19_021DB24C(param0, v1->unk_0B); } -BOOL ov19_021DB220 (UnkStruct_ov19_021DA9E0 * param0) +BOOL ov19_021DB220(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_00 == 0) { return 1; @@ -573,23 +571,23 @@ BOOL ov19_021DB220 (UnkStruct_ov19_021DA9E0 * param0) return 1; } -void ov19_021DB224 (UnkStruct_ov19_021DA9E0 * param0) +void ov19_021DB224(UnkStruct_ov19_021DA9E0 *param0) { if (param0->unk_00 == 0) { return; } if (ov19_021D5E4C(param0->unk_10)) { - const UnkStruct_ov19_021D5BAC * v0; + const UnkStruct_ov19_021D5BAC *v0; v0 = ov19_021D5E70(param0->unk_10); ov19_021DB24C(param0, v0->unk_0B); } } -static void ov19_021DB24C (UnkStruct_ov19_021DA9E0 * param0, u8 param1) +static void ov19_021DB24C(UnkStruct_ov19_021DA9E0 *param0, u8 param1) { - u16 * v0; + u16 *v0; u32 v1; int v2; @@ -608,9 +606,9 @@ static void ov19_021DB24C (UnkStruct_ov19_021DA9E0 * param0, u8 param1) sub_02019460(param0->unk_08, 2, v0, 6 * sizeof(u16), v1); } -void ov19_021DB2B0 (UnkStruct_ov19_021DA9E0 * param0) +void ov19_021DB2B0(UnkStruct_ov19_021DA9E0 *param0) { - const UnkStruct_ov19_021D5BAC * v0; + const UnkStruct_ov19_021D5BAC *v0; if (param0->unk_00 == 0) { return; diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c index 3add66af06..1d05055c81 100644 --- a/src/overlay019/ov19_021DB2FC.c +++ b/src/overlay019/ov19_021DB2FC.c @@ -1,39 +1,38 @@ -#include "enums.h" +#include "overlay019/ov19_021DB2FC.h" #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021D4DF0.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DB6F0.h" #include "overlay019/struct_ov19_021DF964.h" #include "overlay061/struct_ov61_0222C884.h" -#include "unk_02001AF4.h" -#include "unk_02006E3C.h" +#include "enums.h" +#include "heap.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02001AF4.h" +#include "unk_02006E3C.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "overlay019/ov19_021DB2FC.h" -static void ov19_021DB4B4(BGL * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); -static void ov19_021DB638(UnkStruct_ov19_021DB6F0 * param0, Window * param1, u8 param2, u32 param3); -static void ov19_021DB684(UnkStruct_ov19_021DB6F0 * param0, u32 param1); -static void ov19_021DB7BC(BGL * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); -static void ov19_021DB84C(BGL * param0, Window * param1); -static void ov19_021DB898(BGL * param0, Window * param1); +static void ov19_021DB4B4(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); +static void ov19_021DB638(UnkStruct_ov19_021DB6F0 *param0, Window *param1, u8 param2, u32 param3); +static void ov19_021DB684(UnkStruct_ov19_021DB6F0 *param0, u32 param1); +static void ov19_021DB7BC(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); +static void ov19_021DB84C(BGL *param0, Window *param1); +static void ov19_021DB898(BGL *param0, Window *param1); -BOOL ov19_021DB2FC (UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, MessageLoader * param5, const StringTemplate * param6, int param7, NARC * param8) +BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4, MessageLoader *param5, const StringTemplate *param6, int param7, NARC *param8) { param0->unk_0C = param1; param0->unk_00 = param3; @@ -56,7 +55,7 @@ BOOL ov19_021DB2FC (UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * return 1; } -void ov19_021DB370 (UnkStruct_ov19_021DB6F0 * param0) +void ov19_021DB370(UnkStruct_ov19_021DB6F0 *param0) { if (param0->unk_18) { int v0; @@ -86,11 +85,11 @@ void ov19_021DB370 (UnkStruct_ov19_021DB6F0 * param0) } } -void ov19_021DB3C4 (UnkStruct_ov19_021DB6F0 * param0) +void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0) { static const UnkStruct_ov61_0222C884 v0[] = { - {1, 2, 21, 27, 2, 4, 539}, - {1, 19, 3, 12, 16, 4, 593} + { 1, 2, 21, 27, 2, 4, 539 }, + { 1, 19, 3, 12, 16, 4, 593 } }; param0->unk_18 = sub_0201A778(10, 2); @@ -108,7 +107,7 @@ void ov19_021DB3C4 (UnkStruct_ov19_021DB6F0 * param0) sub_0200DD0C(param0->unk_00, 1, 521, 8, param0->unk_20, 10); } -void ov19_021DB448 (UnkStruct_ov19_021DB6F0 * param0, u32 param1) +void ov19_021DB448(UnkStruct_ov19_021DB6F0 *param0, u32 param1) { sub_0201A9F4(¶m0->unk_18[0]); ov19_021DB4B4(param0->unk_00, param0->unk_18[0].unk_04, param0->unk_18[0].unk_05, param0->unk_18[0].unk_06, param0->unk_18[0].unk_07, param0->unk_18[0].unk_08); @@ -122,9 +121,9 @@ void ov19_021DB448 (UnkStruct_ov19_021DB6F0 * param0, u32 param1) param0->unk_1C = 1; } -static void ov19_021DB4B4 (BGL * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov19_021DB4B4(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) { - u16 * v0; + u16 *v0; u32 v1, v2; v0 = sub_02019FE4(param0, param1); @@ -164,9 +163,9 @@ static void ov19_021DB4B4 (BGL * param0, u32 param1, u32 param2, u32 param3, u32 v0[4 + param4] = (8 << 12) | (521 + 17); } -void ov19_021DB57C (UnkStruct_ov19_021DB6F0 * param0, const UnkStruct_ov19_021DF964 * param1) +void ov19_021DB57C(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF964 *param1) { - Window * v0; + Window *v0; u32 v1, v2; if (param0->unk_1E) { @@ -197,14 +196,14 @@ void ov19_021DB57C (UnkStruct_ov19_021DB6F0 * param0, const UnkStruct_ov19_021DF param0->unk_1E = 1; } -static void ov19_021DB638 (UnkStruct_ov19_021DB6F0 * param0, Window * param1, u8 param2, u32 param3) +static void ov19_021DB638(UnkStruct_ov19_021DB6F0 *param0, Window *param1, u8 param2, u32 param3) { sub_0201AE08(param1, param0->unk_28->pRawData, param3 * 8, ((param2 & (1 << param3)) ? 0 : 8), 48, 16, 44, param3 * 16 + 4, 8, 8, 0xff); } -static void ov19_021DB684 (UnkStruct_ov19_021DB6F0 * param0, u32 param1) +static void ov19_021DB684(UnkStruct_ov19_021DB6F0 *param0, u32 param1) { - u16 * v0; + u16 *v0; u32 v1, v2, v3, v4; v0 = sub_02019FE4(param0->unk_00, 1); @@ -226,7 +225,7 @@ static void ov19_021DB684 (UnkStruct_ov19_021DB6F0 * param0, u32 param1) ov19_021DB7BC(param0->unk_00, 1, 19, 3 + v4 * 2, 12, param1 * 2); } -void ov19_021DB6F0 (UnkStruct_ov19_021DB6F0 * param0) +void ov19_021DB6F0(UnkStruct_ov19_021DB6F0 *param0) { if (param0->unk_1C) { ov19_021DB898(param0->unk_00, ¶m0->unk_18[0]); @@ -241,7 +240,7 @@ void ov19_021DB6F0 (UnkStruct_ov19_021DB6F0 * param0) sub_02019448(param0->unk_00, 1); } -void ov19_021DB724 (UnkStruct_ov19_021DB6F0 * param0) +void ov19_021DB724(UnkStruct_ov19_021DB6F0 *param0) { if (param0->unk_1E) { ov19_021DB84C(param0->unk_00, ¶m0->unk_18[1]); @@ -251,9 +250,9 @@ void ov19_021DB724 (UnkStruct_ov19_021DB6F0 * param0) sub_02019448(param0->unk_00, 1); } -void ov19_021DB748 (UnkStruct_ov19_021DB6F0 * param0, const UnkStruct_ov19_021DF964 * param1) +void ov19_021DB748(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF964 *param1) { - Window * v0; + Window *v0; u32 v1; v0 = &(param0->unk_18[1]); @@ -264,9 +263,9 @@ void ov19_021DB748 (UnkStruct_ov19_021DB6F0 * param0, const UnkStruct_ov19_021DF sub_0201ACCC(v0); } -void ov19_021DB790 (UnkStruct_ov19_021DB6F0 * param0, const UnkStruct_ov19_021DF964 * param1) +void ov19_021DB790(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF964 *param1) { - Window * v0; + Window *v0; int v1; v0 = &(param0->unk_18[1]); @@ -278,9 +277,9 @@ void ov19_021DB790 (UnkStruct_ov19_021DB6F0 * param0, const UnkStruct_ov19_021DF sub_0201ACCC(v0); } -static void ov19_021DB7BC (BGL * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov19_021DB7BC(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5) { - u16 * v0; + u16 *v0; u32 v1; v0 = sub_02019FE4(param0, param1); @@ -309,9 +308,9 @@ static void ov19_021DB7BC (BGL * param0, u32 param1, u32 param2, u32 param3, u32 v0[param4 + 1] = (7 << 12) | (512 + 8); } -static void ov19_021DB84C (BGL * param0, Window * param1) +static void ov19_021DB84C(BGL *param0, Window *param1) { - u16 * v0; + u16 *v0; u32 v1, v2, v3, v4; v0 = sub_02019FE4(param0, param1->unk_04); @@ -326,9 +325,9 @@ static void ov19_021DB84C (BGL * param0, Window * param1) } } -static void ov19_021DB898 (BGL * param0, Window * param1) +static void ov19_021DB898(BGL *param0, Window *param1) { - u16 * v0; + u16 *v0; u32 v1, v2, v3, v4; v0 = sub_02019FE4(param0, param1->unk_04); diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c index ce9df01272..74c2760255 100644 --- a/src/overlay019/ov19_021DB8E4.c +++ b/src/overlay019/ov19_021DB8E4.c @@ -1,48 +1,48 @@ +#include "overlay019/ov19_021DB8E4.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" - -#include "sys_task_manager.h" #include "struct_defs/struct_0205AA50.h" + +#include "overlay019/ov19_021D0D80.h" +#include "overlay019/ov19_021D61B0.h" #include "overlay019/struct_ov19_021D4DF0.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay019/struct_ov19_021DBA9C.h" #include "overlay061/struct_ov61_0222C884.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "pokemon.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02006E3C.h" -#include "message.h" #include "unk_0200C440.h" -#include "sys_task.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "item.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021DB8E4.h" typedef struct { - UnkStruct_ov19_021DBA9C * unk_00; + UnkStruct_ov19_021DBA9C *unk_00; u8 unk_04; u8 unk_05; BOOL unk_08; } UnkStruct_ov19_021DC034; typedef struct { - UnkStruct_ov19_021DBA9C * unk_00; - BGL * unk_04; + UnkStruct_ov19_021DBA9C *unk_00; + BGL *unk_04; fx32 unk_08; fx32 unk_0C; fx32 unk_10; @@ -50,29 +50,29 @@ typedef struct { u16 unk_16; } UnkStruct_ov19_021DC29C; -static int ov19_021DBD40(UnkStruct_ov19_021DBA9C * param0); -static void ov19_021DBD4C(UnkStruct_ov19_021DBA9C * param0); -static void ov19_021DBD68(UnkStruct_ov19_021DBA9C * param0, u32 param1); -static void ov19_021DBD9C(UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 param2); -static void ov19_021DBDF4(UnkStruct_ov19_021DBA9C * param0); -static void ov19_021DBEF8(UnkStruct_ov19_021DBA9C * param0); -static void ov19_021DBF18(UnkStruct_ov19_021DBA9C * param0); -static void ov19_021DBF4C(UnkStruct_ov19_021DBA9C * param0); -static void ov19_021DBFB0(UnkStruct_ov19_021DBA9C * param0); -static void ov19_021DBFC4(UnkStruct_ov19_021DBA9C * param0); -static void ov19_021DC01C(UnkStruct_ov19_021DBA9C * param0); -static void ov19_021DC034(UnkStruct_ov19_021DBA9C * param0, int param1); -static void ov19_021DC074(SysTask * param0, void * param1); -static BOOL ov19_021DC090(UnkStruct_ov19_021DBA9C * param0); -static void ov19_021DC0A0(SysTask * param0, void * param1); -static void ov19_021DC1CC(SysTask * param0, void * param1); -static void ov19_021DC37C(SysTask * param0, void * param1); -static void ov19_021DC46C(SysTask * param0, void * param1); -static void ov19_021DC4F8(UnkStruct_ov19_021DBA9C * param0, u32 param1); -static void ov19_021DC5B8(UnkStruct_ov19_021DBA9C * param0, fx32 param1); -static void ov19_021DC5E0(UnkStruct_ov19_021DBA9C * param0); - -BOOL ov19_021DB8E4 (UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, NARC * param5) +static int ov19_021DBD40(UnkStruct_ov19_021DBA9C *param0); +static void ov19_021DBD4C(UnkStruct_ov19_021DBA9C *param0); +static void ov19_021DBD68(UnkStruct_ov19_021DBA9C *param0, u32 param1); +static void ov19_021DBD9C(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2); +static void ov19_021DBDF4(UnkStruct_ov19_021DBA9C *param0); +static void ov19_021DBEF8(UnkStruct_ov19_021DBA9C *param0); +static void ov19_021DBF18(UnkStruct_ov19_021DBA9C *param0); +static void ov19_021DBF4C(UnkStruct_ov19_021DBA9C *param0); +static void ov19_021DBFB0(UnkStruct_ov19_021DBA9C *param0); +static void ov19_021DBFC4(UnkStruct_ov19_021DBA9C *param0); +static void ov19_021DC01C(UnkStruct_ov19_021DBA9C *param0); +static void ov19_021DC034(UnkStruct_ov19_021DBA9C *param0, int param1); +static void ov19_021DC074(SysTask *param0, void *param1); +static BOOL ov19_021DC090(UnkStruct_ov19_021DBA9C *param0); +static void ov19_021DC0A0(SysTask *param0, void *param1); +static void ov19_021DC1CC(SysTask *param0, void *param1); +static void ov19_021DC37C(SysTask *param0, void *param1); +static void ov19_021DC46C(SysTask *param0, void *param1); +static void ov19_021DC4F8(UnkStruct_ov19_021DBA9C *param0, u32 param1); +static void ov19_021DC5B8(UnkStruct_ov19_021DBA9C *param0, fx32 param1); +static void ov19_021DC5E0(UnkStruct_ov19_021DBA9C *param0); + +BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4, NARC *param5) { int v0; @@ -84,8 +84,8 @@ BOOL ov19_021DB8E4 (UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * sub_020070E8(param5, 4, param3, 1, 0, 0, 1, 10); { - NNSG2dPaletteData * v1; - void * v2; + NNSG2dPaletteData *v1; + void *v2; v2 = sub_020071EC(param5, 27, &v1, 10); MI_CpuCopy16(v1->pRawData, &(param0->unk_E4[0][0]), 0x40); @@ -137,12 +137,12 @@ BOOL ov19_021DB8E4 (UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * return 1; } -void ov19_021DBA9C (UnkStruct_ov19_021DBA9C * param0) +void ov19_021DBA9C(UnkStruct_ov19_021DBA9C *param0) { static const UnkStruct_ov61_0222C884 v0[] = { - {1, 10, 6, 12, 2, 2, 128}, - {1, 3, 13, 26, 1, 2, 152}, - {1, 5, 25, 27, 6, 2, 178} + { 1, 10, 6, 12, 2, 2, 128 }, + { 1, 3, 13, 26, 1, 2, 152 }, + { 1, 5, 25, 27, 6, 2, 178 } }; param0->unk_10 = sub_0201A778(10, NELEMS(v0)); @@ -156,7 +156,7 @@ void ov19_021DBA9C (UnkStruct_ov19_021DBA9C * param0) } } -void ov19_021DBAD0 (UnkStruct_ov19_021DBA9C * param0) +void ov19_021DBAD0(UnkStruct_ov19_021DBA9C *param0) { if (param0->unk_4BF8) { MessageLoader_Free(param0->unk_4BF8); @@ -197,19 +197,19 @@ void ov19_021DBAD0 (UnkStruct_ov19_021DBA9C * param0) } } -void ov19_021DBB48 (UnkStruct_ov19_021DBA9C * param0) +void ov19_021DBB48(UnkStruct_ov19_021DBA9C *param0) { param0->unk_E0 = ov19_021D5EA8(param0->unk_0C); ov19_021DBDF4(param0); ov19_021DC034(param0, 0); } -BOOL ov19_021DBB68 (UnkStruct_ov19_021DBA9C * param0) +BOOL ov19_021DBB68(UnkStruct_ov19_021DBA9C *param0) { return ov19_021DC090(param0); } -void ov19_021DBB70 (UnkStruct_ov19_021DBA9C * param0) +void ov19_021DBB70(UnkStruct_ov19_021DBA9C *param0) { param0->unk_E0 = ov19_021D5EA8(param0->unk_0C); @@ -218,20 +218,20 @@ void ov19_021DBB70 (UnkStruct_ov19_021DBA9C * param0) ov19_021DBFC4(param0); } -void ov19_021DBB94 (UnkStruct_ov19_021DBA9C * param0) +void ov19_021DBB94(UnkStruct_ov19_021DBA9C *param0) { ov19_021DC034(param0, 1); } -BOOL ov19_021DBBA0 (UnkStruct_ov19_021DBA9C * param0) +BOOL ov19_021DBBA0(UnkStruct_ov19_021DBA9C *param0) { return ov19_021DC090(param0); } -void ov19_021DBBA8 (UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 param2, NNS_G2D_VRAM_TYPE param3, NNSG2dImageProxy * param4) +void ov19_021DBBA8(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2, NNS_G2D_VRAM_TYPE param3, NNSG2dImageProxy *param4) { - const PCBoxes * v0; - BoxPokemon * v1; + const PCBoxes *v0; + BoxPokemon *v1; u32 v2, v3, v4, v5; u8 v6, v7; int v8; @@ -263,7 +263,16 @@ void ov19_021DBBA8 (UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 param2, NN { static const u8 v10[] = { - 0xe, 0xf, 0x5, 0x4, 0xd, 0xc, 0x3, 0xb, 0xa, 0x9, + 0xe, + 0xf, + 0x5, + 0x4, + 0xd, + 0xc, + 0x3, + 0xb, + 0xa, + 0x9, }; v6 = 14 * 0x10 + v10[v6]; @@ -301,12 +310,12 @@ void ov19_021DBBA8 (UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 param2, NN } } -NNSG2dCellDataBank * ov19_021DBD3C (UnkStruct_ov19_021DBA9C * param0) +NNSG2dCellDataBank *ov19_021DBD3C(UnkStruct_ov19_021DBA9C *param0) { return param0->unk_20; } -static int ov19_021DBD40 (UnkStruct_ov19_021DBA9C * param0) +static int ov19_021DBD40(UnkStruct_ov19_021DBA9C *param0) { int v0 = param0->unk_E0 - (7 / 2); @@ -317,7 +326,7 @@ static int ov19_021DBD40 (UnkStruct_ov19_021DBA9C * param0) return v0; } -static void ov19_021DBD4C (UnkStruct_ov19_021DBA9C * param0) +static void ov19_021DBD4C(UnkStruct_ov19_021DBA9C *param0) { int v0; @@ -326,14 +335,14 @@ static void ov19_021DBD4C (UnkStruct_ov19_021DBA9C * param0) } } -static void ov19_021DBD68 (UnkStruct_ov19_021DBA9C * param0, u32 param1) +static void ov19_021DBD68(UnkStruct_ov19_021DBA9C *param0, u32 param1) { MI_CpuCopy32(param0->unk_18->pRawData, param0->unk_3E4[param1], 1024); DC_FlushRange(param0->unk_3E4, 1024); param0->unk_4BE4[param1] = 1; } -static void ov19_021DBD9C (UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 param2) +static void ov19_021DBD9C(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2) { u32 v0 = 1584 + 32 * param1; @@ -348,10 +357,10 @@ static void ov19_021DBD9C (UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 par } } -static void ov19_021DBDF4 (UnkStruct_ov19_021DBA9C * param0) +static void ov19_021DBDF4(UnkStruct_ov19_021DBA9C *param0) { UnkStruct_ov19_021DA864 v0; - UnkStruct_ov19_021DA384 * v1; + UnkStruct_ov19_021DA384 *v1; NNSG2dImageProxy v2; VecFx32 v3; int v4, v5; @@ -385,7 +394,7 @@ static void ov19_021DBDF4 (UnkStruct_ov19_021DBA9C * param0) } } -static void ov19_021DBEF8 (UnkStruct_ov19_021DBA9C * param0) +static void ov19_021DBEF8(UnkStruct_ov19_021DBA9C *param0) { int v0; @@ -397,7 +406,7 @@ static void ov19_021DBEF8 (UnkStruct_ov19_021DBA9C * param0) } } -static void ov19_021DBF18 (UnkStruct_ov19_021DBA9C * param0) +static void ov19_021DBF18(UnkStruct_ov19_021DBA9C *param0) { int v0, v1; @@ -413,10 +422,10 @@ static void ov19_021DBF18 (UnkStruct_ov19_021DBA9C * param0) } } -static void ov19_021DBF4C (UnkStruct_ov19_021DBA9C * param0) +static void ov19_021DBF4C(UnkStruct_ov19_021DBA9C *param0) { - const PCBoxes * v0; - Window * v1; + const PCBoxes *v0; + Window *v1; u32 v2, v3; v0 = ov19_021D5E90(param0->unk_0C); @@ -432,18 +441,18 @@ static void ov19_021DBF4C (UnkStruct_ov19_021DBA9C * param0) sub_0201ACCC(v1); } -static void ov19_021DBFB0 (UnkStruct_ov19_021DBA9C * param0) +static void ov19_021DBFB0(UnkStruct_ov19_021DBA9C *param0) { - Window * v0 = ¶m0->unk_10[0]; + Window *v0 = ¶m0->unk_10[0]; BGL_FillWindow(v0, 7); sub_0201ACCC(v0); } -static void ov19_021DBFC4 (UnkStruct_ov19_021DBA9C * param0) +static void ov19_021DBFC4(UnkStruct_ov19_021DBA9C *param0) { s32 v0, v1; - Window * v2; + Window *v2; v2 = ¶m0->unk_10[1]; BGL_FillWindow(v2, 4); @@ -460,20 +469,21 @@ static void ov19_021DBFC4 (UnkStruct_ov19_021DBA9C * param0) sub_0201ACCC(v2); } -static void ov19_021DC01C (UnkStruct_ov19_021DBA9C * param0) +static void ov19_021DC01C(UnkStruct_ov19_021DBA9C *param0) { - Window * v0 = ¶m0->unk_10[1]; + Window *v0 = ¶m0->unk_10[1]; BGL_FillWindow(v0, 4); sub_0201ACCC(v0); } -static void ov19_021DC034 (UnkStruct_ov19_021DBA9C * param0, int param1) +static void ov19_021DC034(UnkStruct_ov19_021DBA9C *param0, int param1) { static const SysTaskFunc v0[] = { - ov19_021DC0A0, ov19_021DC1CC, + ov19_021DC0A0, + ov19_021DC1CC, }; - UnkStruct_ov19_021DC034 * v1 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DC034)); + UnkStruct_ov19_021DC034 *v1 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DC034)); if (v1) { v1->unk_00 = param0; @@ -488,9 +498,9 @@ static void ov19_021DC034 (UnkStruct_ov19_021DBA9C * param0, int param1) } } -static void ov19_021DC074 (SysTask * param0, void * param1) +static void ov19_021DC074(SysTask *param0, void *param1) { - UnkStruct_ov19_021DC034 * v0 = (UnkStruct_ov19_021DC034 *)param1; + UnkStruct_ov19_021DC034 *v0 = (UnkStruct_ov19_021DC034 *)param1; v0->unk_00->unk_DC = NULL; @@ -498,15 +508,15 @@ static void ov19_021DC074 (SysTask * param0, void * param1) SysTask_Done(param0); } -static BOOL ov19_021DC090 (UnkStruct_ov19_021DBA9C * param0) +static BOOL ov19_021DC090(UnkStruct_ov19_021DBA9C *param0) { return param0->unk_DC == NULL; } -static void ov19_021DC0A0 (SysTask * param0, void * param1) +static void ov19_021DC0A0(SysTask *param0, void *param1) { - UnkStruct_ov19_021DC034 * v0 = (UnkStruct_ov19_021DC034 *)param1; - UnkStruct_ov19_021DBA9C * v1 = v0->unk_00; + UnkStruct_ov19_021DC034 *v0 = (UnkStruct_ov19_021DC034 *)param1; + UnkStruct_ov19_021DBA9C *v1 = v0->unk_00; switch (v0->unk_04) { case 0: @@ -552,10 +562,10 @@ static void ov19_021DC0A0 (SysTask * param0, void * param1) } } -static void ov19_021DC1CC (SysTask * param0, void * param1) +static void ov19_021DC1CC(SysTask *param0, void *param1) { - UnkStruct_ov19_021DC034 * v0 = (UnkStruct_ov19_021DC034 *)param1; - UnkStruct_ov19_021DBA9C * v1 = v0->unk_00; + UnkStruct_ov19_021DC034 *v0 = (UnkStruct_ov19_021DC034 *)param1; + UnkStruct_ov19_021DBA9C *v1 = v0->unk_00; switch (v0->unk_04) { case 0: @@ -584,9 +594,9 @@ static void ov19_021DC1CC (SysTask * param0, void * param1) } } -void ov19_021DC29C (UnkStruct_ov19_021DBA9C * param0) +void ov19_021DC29C(UnkStruct_ov19_021DBA9C *param0) { - UnkStruct_ov19_021DC29C * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DC29C)); + UnkStruct_ov19_021DC29C *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DC29C)); if (v0) { u32 v1 = ov19_021D5F88(param0->unk_0C); @@ -612,20 +622,20 @@ void ov19_021DC29C (UnkStruct_ov19_021DBA9C * param0) } } -BOOL ov19_021DC364 (UnkStruct_ov19_021DBA9C * param0) +BOOL ov19_021DC364(UnkStruct_ov19_021DBA9C *param0) { return param0->unk_DC == NULL; } -static void ov19_021DC374 (void * param0) +static void ov19_021DC374(void *param0) { - UnkStruct_ov19_021DBA9C * v0 = param0; + UnkStruct_ov19_021DBA9C *v0 = param0; v0->unk_DC = NULL; } -static void ov19_021DC37C (SysTask * param0, void * param1) +static void ov19_021DC37C(SysTask *param0, void *param1) { - UnkStruct_ov19_021DC29C * v0 = param1; + UnkStruct_ov19_021DC29C *v0 = param1; switch (v0->unk_16) { case 0: @@ -647,9 +657,9 @@ static void ov19_021DC37C (SysTask * param0, void * param1) } } -void ov19_021DC3F4 (UnkStruct_ov19_021DBA9C * param0) +void ov19_021DC3F4(UnkStruct_ov19_021DBA9C *param0) { - UnkStruct_ov19_021DC29C * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DC29C)); + UnkStruct_ov19_021DC29C *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DC29C)); if (v0) { v0->unk_16 = 0; @@ -663,7 +673,7 @@ void ov19_021DC3F4 (UnkStruct_ov19_021DBA9C * param0) } } -BOOL ov19_021DC43C (UnkStruct_ov19_021DBA9C * param0) +BOOL ov19_021DC43C(UnkStruct_ov19_021DBA9C *param0) { if (param0->unk_DC == NULL) { sub_02019184(param0->unk_04, 1, 3, 0); @@ -674,15 +684,15 @@ BOOL ov19_021DC43C (UnkStruct_ov19_021DBA9C * param0) return 0; } -static void ov19_021DC464 (void * param0) +static void ov19_021DC464(void *param0) { - UnkStruct_ov19_021DBA9C * v0 = param0; + UnkStruct_ov19_021DBA9C *v0 = param0; v0->unk_DC = NULL; } -static void ov19_021DC46C (SysTask * param0, void * param1) +static void ov19_021DC46C(SysTask *param0, void *param1) { - UnkStruct_ov19_021DC29C * v0 = param1; + UnkStruct_ov19_021DC29C *v0 = param1; if (v0->unk_14) { v0->unk_14--; @@ -699,14 +709,14 @@ static void ov19_021DC46C (SysTask * param0, void * param1) } } -static void ov19_021DC4F8 (UnkStruct_ov19_021DBA9C * param0, u32 param1) +static void ov19_021DC4F8(UnkStruct_ov19_021DBA9C *param0, u32 param1) { if (param1 != 0) { UnkStruct_ov19_021DA864 v0; - UnkStruct_ov19_021DA384 * v1; + UnkStruct_ov19_021DA384 *v1; NNSG2dImageProxy v2; - NNSG2dCharacterData * v3; - void * v4; + NNSG2dCharacterData *v3; + void *v4; v1 = ov19_021D77D8(param0->unk_00); ov19_021D783C(&v0, &v2, ov19_021D77D0(param0->unk_00), v1->unk_1C, v1->unk_20, 0); @@ -727,7 +737,7 @@ static void ov19_021DC4F8 (UnkStruct_ov19_021DBA9C * param0, u32 param1) } } -static void ov19_021DC5B8 (UnkStruct_ov19_021DBA9C * param0, fx32 param1) +static void ov19_021DC5B8(UnkStruct_ov19_021DBA9C *param0, fx32 param1) { if (param0->unk_90) { VecFx32 v0; @@ -740,7 +750,7 @@ static void ov19_021DC5B8 (UnkStruct_ov19_021DBA9C * param0, fx32 param1) } } -static void ov19_021DC5E0 (UnkStruct_ov19_021DBA9C * param0) +static void ov19_021DC5E0(UnkStruct_ov19_021DBA9C *param0) { if (param0->unk_90) { sub_02021BD4(param0->unk_90); diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c index 8fee43063e..000ea384e2 100644 --- a/src/overlay019/ov19_021DC5F0.c +++ b/src/overlay019/ov19_021DC5F0.c @@ -1,53 +1,54 @@ +#include "overlay019/ov19_021DC5F0.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" -#include "pokemon.h" -#include "overlay019/struct_ov19_021D5DF8_decl.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" +#include "overlay019/ov19_021D0D80.h" +#include "overlay019/ov19_021D61B0.h" +#include "overlay019/ov19_021D79F8.h" +#include "overlay019/ov19_021DA270.h" #include "overlay019/struct_ov19_021D4DF0.h" +#include "overlay019/struct_ov19_021D5DF8_decl.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DC680.h" #include "overlay019/struct_ov19_021DCD18.h" -#include "unk_02006E3C.h" -#include "sys_task.h" #include "heap.h" +#include "party.h" +#include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" #include "unk_020218BC.h" -#include "party.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021D79F8.h" -#include "overlay019/ov19_021DA270.h" -#include "overlay019/ov19_021DC5F0.h" static const struct { u16 unk_00; u16 unk_02; } Unk_ov19_021E0234[] = { - {144, 28}, - {192, 36}, - {144, 68}, - {192, 76}, - {144, 108}, - {192, 116}, + { 144, 28 }, + { 192, 36 }, + { 144, 68 }, + { 192, 76 }, + { 144, 108 }, + { 192, 116 }, }; -static void ov19_021DC708(SysTask * param0, void * param1); -static void ov19_021DC79C(SysTask * param0, void * param1); -static void ov19_021DC8E8(SysTask * param0, void * param1); -static void ov19_021DCA18(SysTask * param0, void * param1); -static void ov19_021DCD64(UnkStruct_ov19_021DC680 * param0, u32 param1); -static void ov19_021DCDB4(UnkStruct_ov19_021DC680 * param0, VecFx32 * param1); -static void ov19_021DCE50(UnkStruct_ov19_021DC680 * param0, fx32 param1); -static void ov19_021DCEB8(UnkStruct_ov19_021DC680 * param0, BOOL param1); -static void ov19_021DCF50(UnkStruct_ov19_021DC680 * param0); - -BOOL ov19_021DC5F0 (UnkStruct_ov19_021DC680 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, NARC * param5) +static void ov19_021DC708(SysTask *param0, void *param1); +static void ov19_021DC79C(SysTask *param0, void *param1); +static void ov19_021DC8E8(SysTask *param0, void *param1); +static void ov19_021DCA18(SysTask *param0, void *param1); +static void ov19_021DCD64(UnkStruct_ov19_021DC680 *param0, u32 param1); +static void ov19_021DCDB4(UnkStruct_ov19_021DC680 *param0, VecFx32 *param1); +static void ov19_021DCE50(UnkStruct_ov19_021DC680 *param0, fx32 param1); +static void ov19_021DCEB8(UnkStruct_ov19_021DC680 *param0, BOOL param1); +static void ov19_021DCF50(UnkStruct_ov19_021DC680 *param0); + +BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4, NARC *param5) { param0->unk_00 = param1; param0->unk_0C = param2; @@ -81,7 +82,7 @@ BOOL ov19_021DC5F0 (UnkStruct_ov19_021DC680 * param0, UnkStruct_ov19_021D61B0 * return 1; } -void ov19_021DC680 (UnkStruct_ov19_021DC680 * param0) +void ov19_021DC680(UnkStruct_ov19_021DC680 *param0) { if (param0->unk_14) { Heap_FreeToHeap(param0->unk_14); @@ -94,7 +95,7 @@ void ov19_021DC680 (UnkStruct_ov19_021DC680 * param0) ov19_021DCF50(param0); } -void ov19_021DC6A0 (UnkStruct_ov19_021DC680 * param0) +void ov19_021DC6A0(UnkStruct_ov19_021DC680 *param0) { param0->unk_2B = 0; ov19_021DCD64(param0, param0->unk_2B); @@ -102,7 +103,7 @@ void ov19_021DC6A0 (UnkStruct_ov19_021DC680 * param0) sub_02019448(param0->unk_04, 2); } -void ov19_021DC6C8 (UnkStruct_ov19_021DC680 * param0) +void ov19_021DC6C8(UnkStruct_ov19_021DC680 *param0) { ov19_021DCEB8(param0, 0); @@ -110,14 +111,14 @@ void ov19_021DC6C8 (UnkStruct_ov19_021DC680 * param0) param0->unk_2C = (ov19_021D77C8(ov19_021DC708, param0, 0) != NULL); } -BOOL ov19_021DC6F8 (UnkStruct_ov19_021DC680 * param0) +BOOL ov19_021DC6F8(UnkStruct_ov19_021DC680 *param0) { return param0->unk_2C == 0; } -static void ov19_021DC708 (SysTask * param0, void * param1) +static void ov19_021DC708(SysTask *param0, void *param1) { - UnkStruct_ov19_021DC680 * v0 = (UnkStruct_ov19_021DC680 *)param1; + UnkStruct_ov19_021DC680 *v0 = (UnkStruct_ov19_021DC680 *)param1; fx32 v1; if (v0->unk_2B > 2) { @@ -138,12 +139,12 @@ static void ov19_021DC708 (SysTask * param0, void * param1) } } -void ov19_021DC768 (UnkStruct_ov19_021DC680 * param0) +void ov19_021DC768(UnkStruct_ov19_021DC680 *param0) { param0->unk_2C = (ov19_021D77C8(ov19_021DC79C, param0, 0) != NULL); } -BOOL ov19_021DC788 (UnkStruct_ov19_021DC680 * param0) +BOOL ov19_021DC788(UnkStruct_ov19_021DC680 *param0) { if (param0->unk_2C == 0) { ov19_021DCF50(param0); @@ -153,9 +154,9 @@ BOOL ov19_021DC788 (UnkStruct_ov19_021DC680 * param0) return 0; } -static void ov19_021DC79C (SysTask * param0, void * param1) +static void ov19_021DC79C(SysTask *param0, void *param1) { - UnkStruct_ov19_021DC680 * v0 = (UnkStruct_ov19_021DC680 *)param1; + UnkStruct_ov19_021DC680 *v0 = (UnkStruct_ov19_021DC680 *)param1; fx32 v1; if (v0->unk_2B < (26 - 2)) { @@ -185,7 +186,7 @@ static void ov19_021DC79C (SysTask * param0, void * param1) } } -void ov19_021DC834 (UnkStruct_ov19_021DC680 * param0) +void ov19_021DC834(UnkStruct_ov19_021DC680 *param0) { int v0 = Party_GetCurrentCount(param0->unk_0C->unk_04); @@ -211,10 +212,10 @@ void ov19_021DC834 (UnkStruct_ov19_021DC680 * param0) } } -static void ov19_021DC8E8 (SysTask * param0, void * param1) +static void ov19_021DC8E8(SysTask *param0, void *param1) { - UnkStruct_ov19_021DC680 * v0; - VecFx32 * v1; + UnkStruct_ov19_021DC680 *v0; + VecFx32 *v1; int v2, v3, v4; v0 = (UnkStruct_ov19_021DC680 *)param1; @@ -237,12 +238,12 @@ static void ov19_021DC8E8 (SysTask * param0, void * param1) } } -BOOL ov19_021DC95C (UnkStruct_ov19_021DC680 * param0) +BOOL ov19_021DC95C(UnkStruct_ov19_021DC680 *param0) { return param0->unk_2C == 0; } -void ov19_021DC96C (UnkStruct_ov19_021DC680 * param0) +void ov19_021DC96C(UnkStruct_ov19_021DC680 *param0) { u32 v0 = Party_GetCurrentCount(param0->unk_0C->unk_04) - 1; @@ -260,14 +261,14 @@ void ov19_021DC96C (UnkStruct_ov19_021DC680 * param0) } } -BOOL ov19_021DCA08 (UnkStruct_ov19_021DC680 * param0) +BOOL ov19_021DCA08(UnkStruct_ov19_021DC680 *param0) { return param0->unk_2C == 0; } -static void ov19_021DCA18 (SysTask * param0, void * param1) +static void ov19_021DCA18(SysTask *param0, void *param1) { - UnkStruct_ov19_021DC680 * v0; + UnkStruct_ov19_021DC680 *v0; VecFx32 v1; BOOL v2; @@ -292,7 +293,7 @@ static void ov19_021DCA18 (SysTask * param0, void * param1) } } -void ov19_021DCAC0 (UnkStruct_ov19_021DC680 * param0) +void ov19_021DCAC0(UnkStruct_ov19_021DC680 *param0) { u32 v0; @@ -305,21 +306,21 @@ void ov19_021DCAC0 (UnkStruct_ov19_021DC680 * param0) param0->unk_28 = v0; } -void ov19_021DCAFC (UnkStruct_ov19_021DC680 * param0, u32 param1) +void ov19_021DCAFC(UnkStruct_ov19_021DC680 *param0, u32 param1) { param0->unk_174 = 0; param0->unk_28 = param1; ov19_021DA7B8(param0->unk_38, &(param0->unk_3C[param1]), 1); } -BOOL ov19_021DCB20 (UnkStruct_ov19_021DC680 * param0) +BOOL ov19_021DCB20(UnkStruct_ov19_021DC680 *param0) { - UnkStruct_ov19_021DCD18 * v0 = &(param0->unk_3C[param0->unk_28]); + UnkStruct_ov19_021DCD18 *v0 = &(param0->unk_3C[param0->unk_28]); switch (param0->unk_174) { case 0: if (ov19_021DA7E0(param0->unk_38, v0)) { - const UnkStruct_ov19_021D5DF8 * v1 = ov19_021D7964(param0->unk_00); + const UnkStruct_ov19_021D5DF8 *v1 = ov19_021D7964(param0->unk_00); if (ov19_021D3B18(v1)) { if (ov19_021D3B20(v1)) { @@ -342,7 +343,7 @@ BOOL ov19_021DCB20 (UnkStruct_ov19_021DC680 * param0) return 0; } -void ov19_021DCBA0 (UnkStruct_ov19_021DC680 * param0) +void ov19_021DCBA0(UnkStruct_ov19_021DC680 *param0) { if (ov19_021D5E10(param0->unk_0C) == 1) { u32 v0; @@ -358,7 +359,7 @@ void ov19_021DCBA0 (UnkStruct_ov19_021DC680 * param0) } } -void ov19_021DCBDC (UnkStruct_ov19_021DC680 * param0, u32 param1, u32 param2) +void ov19_021DCBDC(UnkStruct_ov19_021DC680 *param0, u32 param1, u32 param2) { if (param0->unk_3C[param1].unk_00 != NULL) { ov19_021DA690(param0->unk_38, ¶m0->unk_3C[param1], param2); @@ -367,7 +368,7 @@ void ov19_021DCBDC (UnkStruct_ov19_021DC680 * param0, u32 param1, u32 param2) } } -void ov19_021DCC14 (UnkStruct_ov19_021DC680 * param0) +void ov19_021DCC14(UnkStruct_ov19_021DC680 *param0) { u32 v0, v1; @@ -379,7 +380,7 @@ void ov19_021DCC14 (UnkStruct_ov19_021DC680 * param0) } } -void ov19_021DCC44 (UnkStruct_ov19_021DC680 * param0, u32 param1, u32 param2, UnkStruct_ov19_021DCD18 * param3) +void ov19_021DCC44(UnkStruct_ov19_021DC680 *param0, u32 param1, u32 param2, UnkStruct_ov19_021DCD18 *param3) { ov19_021DA418(¶m0->unk_3C[param1], param3, 1); ov19_021DA754(param0->unk_38, param3, param2); @@ -388,11 +389,11 @@ void ov19_021DCC44 (UnkStruct_ov19_021DC680 * param0, u32 param1, u32 param2, Un param0->unk_28 = param1; } -void ov19_021DCC80 (UnkStruct_ov19_021DC680 * param0, u32 param1, const UnkStruct_ov19_021DCD18 * param2) +void ov19_021DCC80(UnkStruct_ov19_021DC680 *param0, u32 param1, const UnkStruct_ov19_021DCD18 *param2) { u32 v0; u32 v1; - UnkStruct_ov19_021DCD18 * v2; + UnkStruct_ov19_021DCD18 *v2; v0 = Party_GetCurrentCount(param0->unk_0C->unk_04) - 1; v1 = 1048 + 32 * v0; @@ -406,11 +407,11 @@ void ov19_021DCC80 (UnkStruct_ov19_021DC680 * param0, u32 param1, const UnkStruc param0->unk_28 = param1; } -void ov19_021DCCD4 (UnkStruct_ov19_021DC680 * param0, u32 param1, const UnkStruct_ov19_021DCD18 * param2) +void ov19_021DCCD4(UnkStruct_ov19_021DC680 *param0, u32 param1, const UnkStruct_ov19_021DCD18 *param2) { u32 v0; u32 v1; - UnkStruct_ov19_021DCD18 * v2; + UnkStruct_ov19_021DCD18 *v2; v0 = param1; v1 = 1048 + 32 * v0; @@ -424,13 +425,13 @@ void ov19_021DCCD4 (UnkStruct_ov19_021DC680 * param0, u32 param1, const UnkStruc param0->unk_28 = param1; } -UnkStruct_ov19_021DCD18 * ov19_021DCD18 (UnkStruct_ov19_021DC680 * param0, u32 param1) +UnkStruct_ov19_021DCD18 *ov19_021DCD18(UnkStruct_ov19_021DC680 *param0, u32 param1) { GF_ASSERT(param1 < 6); return ¶m0->unk_3C[param1]; } -void ov19_021DCD30 (UnkStruct_ov19_021DC680 * param0, u32 param1, s32 * param2, s32 * param3) +void ov19_021DCD30(UnkStruct_ov19_021DC680 *param0, u32 param1, s32 *param2, s32 *param3) { if (param1 == 6) { *param2 = 192 + param0->unk_34; @@ -441,7 +442,7 @@ void ov19_021DCD30 (UnkStruct_ov19_021DC680 * param0, u32 param1, s32 * param2, } } -static void ov19_021DCD64 (UnkStruct_ov19_021DC680 * param0, u32 param1) +static void ov19_021DCD64(UnkStruct_ov19_021DC680 *param0, u32 param1) { u32 v0, v1, v2; @@ -462,7 +463,7 @@ static void ov19_021DCD64 (UnkStruct_ov19_021DC680 * param0, u32 param1) sub_020198C0(param0->unk_04, 2, ((u8 *)param0->unk_18->rawData) + v0, param0->unk_30, v2, 15, v1); } -static void ov19_021DCDB4 (UnkStruct_ov19_021DC680 * param0, VecFx32 * param1) +static void ov19_021DCDB4(UnkStruct_ov19_021DC680 *param0, VecFx32 *param1) { fx32 v0, v1; u32 v2, v3, v4; @@ -486,7 +487,7 @@ static void ov19_021DCDB4 (UnkStruct_ov19_021DC680 * param0, VecFx32 * param1) } } -static void ov19_021DCE50 (UnkStruct_ov19_021DC680 * param0, fx32 param1) +static void ov19_021DCE50(UnkStruct_ov19_021DC680 *param0, fx32 param1) { VecFx32 v0; int v1; @@ -512,9 +513,9 @@ static void ov19_021DCE50 (UnkStruct_ov19_021DC680 * param0, fx32 param1) } } -static void ov19_021DCEB8 (UnkStruct_ov19_021DC680 * param0, BOOL param1) +static void ov19_021DCEB8(UnkStruct_ov19_021DC680 *param0, BOOL param1) { - Pokemon * v0; + Pokemon *v0; int v1, v2, v3; v3 = (param1) ? 0 : 208; @@ -527,7 +528,7 @@ static void ov19_021DCEB8 (UnkStruct_ov19_021DC680 * param0, BOOL param1) } } -static void ov19_021DCF50 (UnkStruct_ov19_021DC680 * param0) +static void ov19_021DCF50(UnkStruct_ov19_021DC680 *param0) { int v0, v1; diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c index 8e6d62c9b0..065ae775d0 100644 --- a/src/overlay019/ov19_021DCF88.c +++ b/src/overlay019/ov19_021DCF88.c @@ -1,40 +1,39 @@ +#include "overlay019/ov19_021DCF88.h" + #include #include -#include "enums.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" -#include "overlay019/struct_ov19_021DCF88_decl.h" - -#include "sys_task_manager.h" #include "struct_defs/struct_0205AA50.h" + +#include "overlay019/ov19_021D0D80.h" +#include "overlay019/ov19_021D61B0.h" +#include "overlay019/ov19_021DB8E4.h" #include "overlay019/struct_ov19_021D4DF0.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay019/struct_ov19_021DBA9C.h" +#include "overlay019/struct_ov19_021DCF88_decl.h" -#include "unk_02006E3C.h" -#include "sys_task.h" +#include "enums.h" #include "heap.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_020797C8.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021DB8E4.h" -#include "overlay019/ov19_021DCF88.h" typedef struct { - UnkStruct_ov19_021DCF88 * unk_00; + UnkStruct_ov19_021DCF88 *unk_00; u32 unk_04; - GraphicElementData * unk_08; + GraphicElementData *unk_08; u16 unk_0C; s16 unk_0E; fx32 unk_10; @@ -43,8 +42,8 @@ typedef struct { } UnkStruct_ov19_021DD378; typedef struct { - void * unk_00; - GraphicElementData * unk_04; + void *unk_00; + GraphicElementData *unk_04; fx32 unk_08; fx32 unk_0C; fx32 unk_10; @@ -59,8 +58,8 @@ typedef struct { } UnkStruct_ov19_021DDBD0; typedef struct { - UnkStruct_ov19_021DCF88 * unk_00; - GraphicElementData ** unk_04; + UnkStruct_ov19_021DCF88 *unk_00; + GraphicElementData **unk_04; UnkStruct_ov19_021DDBD0 unk_08[10]; u8 unk_1C0[10]; u8 unk_1CA; @@ -70,68 +69,68 @@ typedef struct { } UnkStruct_ov19_021DDBF8; struct UnkStruct_ov19_021DCF88_t { - UnkStruct_ov19_021D61B0 * unk_00; - const UnkStruct_ov19_021D4DF0 * unk_04; - BGL * unk_08; - GraphicElementManager * unk_0C; + UnkStruct_ov19_021D61B0 *unk_00; + const UnkStruct_ov19_021D4DF0 *unk_04; + BGL *unk_08; + GraphicElementManager *unk_0C; u32 unk_10; - SysTask * unk_14; + SysTask *unk_14; NNSG2dImagePaletteProxy unk_18; - GraphicElementData * unk_2C; - GraphicElementData * unk_30; - GraphicElementData * unk_34[8]; - GraphicElementData * unk_54[10]; + GraphicElementData *unk_2C; + GraphicElementData *unk_30; + GraphicElementData *unk_34[8]; + GraphicElementData *unk_54[10]; int unk_7C; int unk_80; - Strbuf* unk_84; + Strbuf *unk_84; Window unk_88; - void * unk_98; - NNSG2dCellDataBank * unk_9C; - void * unk_A0; - NNSG2dAnimBankData * unk_A4; - void * unk_A8; - NNSG2dCellDataBank * unk_AC; - void * unk_B0; - NNSG2dAnimBankData * unk_B4; + void *unk_98; + NNSG2dCellDataBank *unk_9C; + void *unk_A0; + NNSG2dAnimBankData *unk_A4; + void *unk_A8; + NNSG2dCellDataBank *unk_AC; + void *unk_B0; + NNSG2dAnimBankData *unk_B4; UnkStruct_ov19_021DD378 unk_B8; u8 unk_D4[16]; u8 unk_E4[16]; }; -static void ov19_021DD024(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DD224(UnkStruct_ov19_021DCF88 * param0, NARC * param1); -static void ov19_021DD2BC(UnkStruct_ov19_021DCF88 * param0, NARC * param1); -static SysTask * ov19_021DD344(UnkStruct_ov19_021DCF88 * param0, SysTaskFunc param1, void * param2); -static void ov19_021DD358(UnkStruct_ov19_021DCF88 * param0); -static BOOL ov19_021DD368(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DD46C(SysTask * param0, void * param1); -static void ov19_021DD544(SysTask * param0, void * param1); -static void ov19_021DD670(SysTask * param0, void * param1); -static void ov19_021DD794(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DD7E8(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DD854(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DD8F8(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DD998(UnkStruct_ov19_021DCF88 * param0); +static void ov19_021DD024(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DD224(UnkStruct_ov19_021DCF88 *param0, NARC *param1); +static void ov19_021DD2BC(UnkStruct_ov19_021DCF88 *param0, NARC *param1); +static SysTask *ov19_021DD344(UnkStruct_ov19_021DCF88 *param0, SysTaskFunc param1, void *param2); +static void ov19_021DD358(UnkStruct_ov19_021DCF88 *param0); +static BOOL ov19_021DD368(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DD46C(SysTask *param0, void *param1); +static void ov19_021DD544(SysTask *param0, void *param1); +static void ov19_021DD670(SysTask *param0, void *param1); +static void ov19_021DD794(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DD7E8(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DD854(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DD8F8(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DD998(UnkStruct_ov19_021DCF88 *param0); static u32 ov19_021DD9B8(u32 param0, u32 param1); -static void ov19_021DD9DC(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DDA7C(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DDA9C(SysTask * param0, void * param1); -static void ov19_021DDB20(SysTask * param0, void * param1); -static void ov19_021DDBD0(SysTask * param0, UnkStruct_ov19_021DDBD0 * param1); -static void ov19_021DDBF8(UnkStruct_ov19_021DDBF8 * param0, GraphicElementData * param1, UnkStruct_ov19_021DDBD0 * param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7); -static void ov19_021DDC74(UnkStruct_ov19_021DDBF8 * param0, UnkStruct_ov19_021DDBD0 * param1, u32 param2, u32 param3, u32 param4); -static void ov19_021DDCC0(SysTask * param0, void * param1); -static void ov19_021DDD78(void * param0); -static void ov19_021DDD80(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DDDD0(SysTask * param0, void * param1); -static void ov19_021DDFA8(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DDFFC(SysTask * param0, void * param1); -static void ov19_021DE0A0(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DE0F0(SysTask * param0, void * param1); -static void ov19_021DE2A4(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DE324(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DE330(UnkStruct_ov19_021DCF88 * param0); -static void ov19_021DE350(UnkStruct_ov19_021DCF88 * param0); +static void ov19_021DD9DC(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DDA7C(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DDA9C(SysTask *param0, void *param1); +static void ov19_021DDB20(SysTask *param0, void *param1); +static void ov19_021DDBD0(SysTask *param0, UnkStruct_ov19_021DDBD0 *param1); +static void ov19_021DDBF8(UnkStruct_ov19_021DDBF8 *param0, GraphicElementData *param1, UnkStruct_ov19_021DDBD0 *param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7); +static void ov19_021DDC74(UnkStruct_ov19_021DDBF8 *param0, UnkStruct_ov19_021DDBD0 *param1, u32 param2, u32 param3, u32 param4); +static void ov19_021DDCC0(SysTask *param0, void *param1); +static void ov19_021DDD78(void *param0); +static void ov19_021DDD80(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DDDD0(SysTask *param0, void *param1); +static void ov19_021DDFA8(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DDFFC(SysTask *param0, void *param1); +static void ov19_021DE0A0(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DE0F0(SysTask *param0, void *param1); +static void ov19_021DE2A4(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DE324(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DE330(UnkStruct_ov19_021DCF88 *param0); +static void ov19_021DE350(UnkStruct_ov19_021DCF88 *param0); static const fx32 Unk_ov19_021E0258[] = { 0x0, @@ -149,150 +148,150 @@ static const struct { s16 x; s16 y; } Unk_ov19_021E028C[] = { - {0x6A, 0x248}, - {0x6A, 0x242}, - {0x6A, 0x23E}, - {0x69, 0x23A}, - {0x69, 0x238}, - {0x69, 0x236}, - {0x69, 0x234}, - {0x69, 0x232}, - {0x69, 0x230}, - {0x68, 0x22E}, - {0x68, 0x22C}, - {0x68, 0x22A}, - {0x68, 0x228}, - {0x67, 0x226}, - {0x67, 0x224}, - {0x67, 0x223}, - {0x66, 0x221}, - {0x66, 0x21F}, - {0x65, 0x21D}, - {0x65, 0x21B}, - {0x64, 0x219}, - {0x64, 0x217}, - {0x63, 0x216}, - {0x62, 0x214}, - {0x62, 0x212}, - {0x61, 0x210}, - {0x60, 0x20E}, - {0x60, 0x20D}, - {0x5F, 0x20B}, - {0x5E, 0x209}, - {0x5E, 0x208}, - {0x5D, 0x206}, - {0x5C, 0x204}, - {0x5B, 0x203}, - {0x5A, 0x201}, - {0x59, 0x1FF}, - {0x58, 0x1FE}, - {0x57, 0x1FC}, - {0x56, 0x1FB}, - {0x56, 0x1F9}, - {0x55, 0x1F8}, - {0x53, 0x1F6}, - {0x52, 0x1F5}, - {0x51, 0x1F3}, - {0x50, 0x1F2}, - {0x4F, 0x1F0}, - {0x4E, 0x1EF}, - {0x4D, 0x1EE}, - {0x4C, 0x1EC}, - {0x4B, 0x1EB}, - {0x49, 0x1EA}, - {0x48, 0x1E8}, - {0x47, 0x1E7}, - {0x46, 0x1E6}, - {0x44, 0x1E5}, - {0x43, 0x1E4}, - {0x42, 0x1E3}, - {0x41, 0x1E2}, - {0x3F, 0x1E1}, - {0x3E, 0x1DF}, - {0x3D, 0x1DF}, - {0x3B, 0x1DE}, - {0x3A, 0x1DD}, - {0x38, 0x1DC}, - {0x37, 0x1DB}, - {0x36, 0x1DA}, - {0x34, 0x1D9}, - {0x33, 0x1D8}, - {0x31, 0x1D8}, - {0x30, 0x1D7}, - {0x2E, 0x1D6}, - {0x2D, 0x1D6}, - {0x2B, 0x1D5}, - {0x2A, 0x1D4}, - {0x28, 0x1D4}, - {0x27, 0x1D3}, - {0x25, 0x1D3}, - {0x24, 0x1D2}, - {0x22, 0x1D2}, - {0x21, 0x1D2}, - {0x1F, 0x1D1}, - {0x1E, 0x1D1}, - {0x1C, 0x1D1}, - {0x1A, 0x1D0}, - {0x19, 0x1D0}, - {0x17, 0x1D0}, - {0x16, 0x1D0}, - {0x14, 0x1D0}, - {0x13, 0x1D0}, - {0x11, 0x1D0}, - {0x10, 0x1D0}, - {0x10, 0x1CE}, - {0x10, 0x1CC}, - {0x10, 0x1CA}, - {0x10, 0x1C8}, - {0x10, 0x1C6}, - {0x10, 0x1C4}, - {0x10, 0x1C2}, - {0x10, 0x1C0}, - {0x10, 0x1BF}, - {0x10, 0x1BD}, - {0x10, 0x1BC}, - {0x10, 0x1BA}, - {0x10, 0x1B9}, - {0x10, 0x1B7}, - {0x10, 0x1B6}, - {0x10, 0x1B4}, - {0x10, 0x1B3}, - {0x10, 0x1B1}, - {0x10, 0x1B0}, - {0x10, 0x1AE}, - {0x10, 0x1AD}, - {0x10, 0x1AB}, - {0x10, 0x1AA}, - {0x10, 0x1A8}, - {0x10, 0x1A7}, - {0x10, 0x1A6}, - {0x10, 0x1A4}, - {0x10, 0x1A2}, - {0x10, 0x1A0}, - {0x10, 0x19E}, - {0x10, 0x19C}, - {0x10, 0x19A}, - {0x10, 0x198}, - {0x10, 0x196}, - {0x10, 0x194}, - {0x10, 0x192}, - {0x10, 0x190}, - {0x10, 0x18E}, - {0x10, 0x18C}, - {0x10, 0x18A}, - {0x10, 0x188}, - {0x10, 0x186}, - {0x10, 0x184}, - {0x10, 0x182}, - {0x10, 0x180}, - {0x10, 0x17E}, - {0x10, 0x17C}, - {0x10, 0x17A}, - {0x10, 0x178}, - {0x10, 0x176}, - {0x10, 0x174}, - {0x10, 0x172}, - {0x10, 0x170} + { 0x6A, 0x248 }, + { 0x6A, 0x242 }, + { 0x6A, 0x23E }, + { 0x69, 0x23A }, + { 0x69, 0x238 }, + { 0x69, 0x236 }, + { 0x69, 0x234 }, + { 0x69, 0x232 }, + { 0x69, 0x230 }, + { 0x68, 0x22E }, + { 0x68, 0x22C }, + { 0x68, 0x22A }, + { 0x68, 0x228 }, + { 0x67, 0x226 }, + { 0x67, 0x224 }, + { 0x67, 0x223 }, + { 0x66, 0x221 }, + { 0x66, 0x21F }, + { 0x65, 0x21D }, + { 0x65, 0x21B }, + { 0x64, 0x219 }, + { 0x64, 0x217 }, + { 0x63, 0x216 }, + { 0x62, 0x214 }, + { 0x62, 0x212 }, + { 0x61, 0x210 }, + { 0x60, 0x20E }, + { 0x60, 0x20D }, + { 0x5F, 0x20B }, + { 0x5E, 0x209 }, + { 0x5E, 0x208 }, + { 0x5D, 0x206 }, + { 0x5C, 0x204 }, + { 0x5B, 0x203 }, + { 0x5A, 0x201 }, + { 0x59, 0x1FF }, + { 0x58, 0x1FE }, + { 0x57, 0x1FC }, + { 0x56, 0x1FB }, + { 0x56, 0x1F9 }, + { 0x55, 0x1F8 }, + { 0x53, 0x1F6 }, + { 0x52, 0x1F5 }, + { 0x51, 0x1F3 }, + { 0x50, 0x1F2 }, + { 0x4F, 0x1F0 }, + { 0x4E, 0x1EF }, + { 0x4D, 0x1EE }, + { 0x4C, 0x1EC }, + { 0x4B, 0x1EB }, + { 0x49, 0x1EA }, + { 0x48, 0x1E8 }, + { 0x47, 0x1E7 }, + { 0x46, 0x1E6 }, + { 0x44, 0x1E5 }, + { 0x43, 0x1E4 }, + { 0x42, 0x1E3 }, + { 0x41, 0x1E2 }, + { 0x3F, 0x1E1 }, + { 0x3E, 0x1DF }, + { 0x3D, 0x1DF }, + { 0x3B, 0x1DE }, + { 0x3A, 0x1DD }, + { 0x38, 0x1DC }, + { 0x37, 0x1DB }, + { 0x36, 0x1DA }, + { 0x34, 0x1D9 }, + { 0x33, 0x1D8 }, + { 0x31, 0x1D8 }, + { 0x30, 0x1D7 }, + { 0x2E, 0x1D6 }, + { 0x2D, 0x1D6 }, + { 0x2B, 0x1D5 }, + { 0x2A, 0x1D4 }, + { 0x28, 0x1D4 }, + { 0x27, 0x1D3 }, + { 0x25, 0x1D3 }, + { 0x24, 0x1D2 }, + { 0x22, 0x1D2 }, + { 0x21, 0x1D2 }, + { 0x1F, 0x1D1 }, + { 0x1E, 0x1D1 }, + { 0x1C, 0x1D1 }, + { 0x1A, 0x1D0 }, + { 0x19, 0x1D0 }, + { 0x17, 0x1D0 }, + { 0x16, 0x1D0 }, + { 0x14, 0x1D0 }, + { 0x13, 0x1D0 }, + { 0x11, 0x1D0 }, + { 0x10, 0x1D0 }, + { 0x10, 0x1CE }, + { 0x10, 0x1CC }, + { 0x10, 0x1CA }, + { 0x10, 0x1C8 }, + { 0x10, 0x1C6 }, + { 0x10, 0x1C4 }, + { 0x10, 0x1C2 }, + { 0x10, 0x1C0 }, + { 0x10, 0x1BF }, + { 0x10, 0x1BD }, + { 0x10, 0x1BC }, + { 0x10, 0x1BA }, + { 0x10, 0x1B9 }, + { 0x10, 0x1B7 }, + { 0x10, 0x1B6 }, + { 0x10, 0x1B4 }, + { 0x10, 0x1B3 }, + { 0x10, 0x1B1 }, + { 0x10, 0x1B0 }, + { 0x10, 0x1AE }, + { 0x10, 0x1AD }, + { 0x10, 0x1AB }, + { 0x10, 0x1AA }, + { 0x10, 0x1A8 }, + { 0x10, 0x1A7 }, + { 0x10, 0x1A6 }, + { 0x10, 0x1A4 }, + { 0x10, 0x1A2 }, + { 0x10, 0x1A0 }, + { 0x10, 0x19E }, + { 0x10, 0x19C }, + { 0x10, 0x19A }, + { 0x10, 0x198 }, + { 0x10, 0x196 }, + { 0x10, 0x194 }, + { 0x10, 0x192 }, + { 0x10, 0x190 }, + { 0x10, 0x18E }, + { 0x10, 0x18C }, + { 0x10, 0x18A }, + { 0x10, 0x188 }, + { 0x10, 0x186 }, + { 0x10, 0x184 }, + { 0x10, 0x182 }, + { 0x10, 0x180 }, + { 0x10, 0x17E }, + { 0x10, 0x17C }, + { 0x10, 0x17A }, + { 0x10, 0x178 }, + { 0x10, 0x176 }, + { 0x10, 0x174 }, + { 0x10, 0x172 }, + { 0x10, 0x170 } }; static const u16 Unk_ov19_021E0264[] = { @@ -306,13 +305,13 @@ static const u16 Unk_ov19_021E0264[] = { 0x0 }; -BOOL ov19_021DCF88 (UnkStruct_ov19_021DCF88 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4) +BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4) { if (ov19_021D5E08(param2) == 4) { *param0 = NULL; return 1; } else { - UnkStruct_ov19_021DCF88 * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DCF88)); + UnkStruct_ov19_021DCF88 *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DCF88)); if (v0) { int v1; @@ -350,7 +349,7 @@ BOOL ov19_021DCF88 (UnkStruct_ov19_021DCF88 ** param0, UnkStruct_ov19_021D61B0 * } } -static void ov19_021DD024 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DD024(UnkStruct_ov19_021DCF88 *param0) { fx32 v0, v1, v2; int v3; @@ -371,7 +370,7 @@ static void ov19_021DD024 (UnkStruct_ov19_021DCF88 * param0) param0->unk_E4[v3] = 0; } -void ov19_021DD078 (UnkStruct_ov19_021DCF88 * param0) +void ov19_021DD078(UnkStruct_ov19_021DCF88 *param0) { if (param0) { int v0; @@ -422,7 +421,7 @@ void ov19_021DD078 (UnkStruct_ov19_021DCF88 * param0) } } -void ov19_021DD114 (UnkStruct_ov19_021DCF88 * param0, NARC * param1) +void ov19_021DD114(UnkStruct_ov19_021DCF88 *param0, NARC *param1) { if (param0) { sub_020070E8(param1, 127, param0->unk_08, 7, 0, 0, 1, 10); @@ -442,7 +441,7 @@ void ov19_021DD114 (UnkStruct_ov19_021DCF88 * param0, NARC * param1) } } -static void ov19_021DD224 (UnkStruct_ov19_021DCF88 * param0, NARC * param1) +static void ov19_021DD224(UnkStruct_ov19_021DCF88 *param0, NARC *param1) { UnkStruct_ov19_021DA864 v0; NNSG2dImageProxy v1; @@ -464,7 +463,7 @@ static void ov19_021DD224 (UnkStruct_ov19_021DCF88 * param0, NARC * param1) } } -static void ov19_021DD2BC (UnkStruct_ov19_021DCF88 * param0, NARC * param1) +static void ov19_021DD2BC(UnkStruct_ov19_021DCF88 *param0, NARC *param1) { param0->unk_98 = sub_02007204(param1, 139, 1, &(param0->unk_9C), 10); param0->unk_A0 = sub_02007220(param1, 140, 1, &(param0->unk_A4), 10); @@ -475,31 +474,31 @@ static void ov19_021DD2BC (UnkStruct_ov19_021DCF88 * param0, NARC * param1) sub_0200716C(param1, 144, NNS_G2D_VRAM_TYPE_2DSUB, 0, 10, &(param0->unk_18)); } -static SysTask * ov19_021DD344 (UnkStruct_ov19_021DCF88 * param0, SysTaskFunc param1, void * param2) +static SysTask *ov19_021DD344(UnkStruct_ov19_021DCF88 *param0, SysTaskFunc param1, void *param2) { param0->unk_14 = ov19_021D77C8(param1, param2, 0); return param0->unk_14; } -static void ov19_021DD358 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DD358(UnkStruct_ov19_021DCF88 *param0) { SysTask_Done(param0->unk_14); param0->unk_14 = NULL; } -static BOOL ov19_021DD368 (UnkStruct_ov19_021DCF88 * param0) +static BOOL ov19_021DD368(UnkStruct_ov19_021DCF88 *param0) { return param0->unk_14 == NULL; } -void ov19_021DD378 (UnkStruct_ov19_021DCF88 * param0) +void ov19_021DD378(UnkStruct_ov19_021DCF88 *param0) { if (param0) { u32 v0 = param0->unk_04->unk_9C.unk_00; if (param0->unk_10 != v0) { SysTaskFunc v1; - UnkStruct_ov19_021DD378 * v2 = &(param0->unk_B8); + UnkStruct_ov19_021DD378 *v2 = &(param0->unk_B8); v2->unk_00 = param0; v2->unk_08 = NULL; @@ -559,7 +558,7 @@ void ov19_021DD378 (UnkStruct_ov19_021DCF88 * param0) } } -BOOL ov19_021DD45C (UnkStruct_ov19_021DCF88 * param0) +BOOL ov19_021DD45C(UnkStruct_ov19_021DCF88 *param0) { if (param0) { return ov19_021DD368(param0); @@ -568,10 +567,10 @@ BOOL ov19_021DD45C (UnkStruct_ov19_021DCF88 * param0) } } -static void ov19_021DD46C (SysTask * param0, void * param1) +static void ov19_021DD46C(SysTask *param0, void *param1) { - UnkStruct_ov19_021DD378 * v0 = (UnkStruct_ov19_021DD378 *)param1; - UnkStruct_ov19_021DCF88 * v1 = v0->unk_00; + UnkStruct_ov19_021DD378 *v0 = (UnkStruct_ov19_021DD378 *)param1; + UnkStruct_ov19_021DCF88 *v1 = v0->unk_00; switch (v0->unk_04) { case 0: @@ -606,10 +605,10 @@ static void ov19_021DD46C (SysTask * param0, void * param1) } } -static void ov19_021DD544 (SysTask * param0, void * param1) +static void ov19_021DD544(SysTask *param0, void *param1) { - UnkStruct_ov19_021DD378 * v0 = (UnkStruct_ov19_021DD378 *)param1; - UnkStruct_ov19_021DCF88 * v1 = v0->unk_00; + UnkStruct_ov19_021DD378 *v0 = (UnkStruct_ov19_021DD378 *)param1; + UnkStruct_ov19_021DCF88 *v1 = v0->unk_00; switch (v0->unk_04) { case 0: @@ -655,10 +654,10 @@ static void ov19_021DD544 (SysTask * param0, void * param1) } } -static void ov19_021DD670 (SysTask * param0, void * param1) +static void ov19_021DD670(SysTask *param0, void *param1) { - UnkStruct_ov19_021DD378 * v0 = (UnkStruct_ov19_021DD378 *)param1; - UnkStruct_ov19_021DCF88 * v1 = v0->unk_00; + UnkStruct_ov19_021DD378 *v0 = (UnkStruct_ov19_021DD378 *)param1; + UnkStruct_ov19_021DCF88 *v1 = v0->unk_00; switch (v0->unk_04) { case 0: @@ -689,7 +688,7 @@ static void ov19_021DD670 (SysTask * param0, void * param1) } } -void ov19_021DD714 (UnkStruct_ov19_021DCF88 * param0) +void ov19_021DD714(UnkStruct_ov19_021DCF88 *param0) { if (param0) { switch (param0->unk_10) { @@ -705,7 +704,7 @@ void ov19_021DD714 (UnkStruct_ov19_021DCF88 * param0) } } -BOOL ov19_021DD740 (UnkStruct_ov19_021DCF88 * param0) +BOOL ov19_021DD740(UnkStruct_ov19_021DCF88 *param0) { if (param0) { if (ov19_021DD368(param0)) { @@ -722,7 +721,7 @@ BOOL ov19_021DD740 (UnkStruct_ov19_021DCF88 * param0) } } -void ov19_021DD768 (UnkStruct_ov19_021DCF88 * param0) +void ov19_021DD768(UnkStruct_ov19_021DCF88 *param0) { if (param0) { switch (param0->unk_10) { @@ -738,7 +737,7 @@ void ov19_021DD768 (UnkStruct_ov19_021DCF88 * param0) } } -static void ov19_021DD794 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DD794(UnkStruct_ov19_021DCF88 *param0) { int v0, v1, v2, v3; @@ -770,7 +769,7 @@ static void ov19_021DD794 (UnkStruct_ov19_021DCF88 * param0) } } -static void ov19_021DD7E8 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DD7E8(UnkStruct_ov19_021DCF88 *param0) { int v0; @@ -784,7 +783,7 @@ static void ov19_021DD7E8 (UnkStruct_ov19_021DCF88 * param0) } } -BOOL ov19_021DD820 (UnkStruct_ov19_021DCF88 * param0) +BOOL ov19_021DD820(UnkStruct_ov19_021DCF88 *param0) { if (param0) { if (ov19_021DD368(param0)) { @@ -804,10 +803,10 @@ BOOL ov19_021DD820 (UnkStruct_ov19_021DCF88 * param0) } } -static void ov19_021DD854 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DD854(UnkStruct_ov19_021DCF88 *param0) { UnkStruct_ov19_021DA864 v0; - UnkStruct_ov19_021DBA9C * v1; + UnkStruct_ov19_021DBA9C *v1; NNSG2dImageProxy v2; int v3, v4; @@ -837,10 +836,10 @@ static void ov19_021DD854 (UnkStruct_ov19_021DCF88 * param0) param0->unk_80 = 0; } -static void ov19_021DD8F8 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DD8F8(UnkStruct_ov19_021DCF88 *param0) { UnkStruct_ov19_021DA864 v0; - UnkStruct_ov19_021DBA9C * v1; + UnkStruct_ov19_021DBA9C *v1; int v2, v3, v4, v5, v6, v7, v8; v1 = ov19_021D780C(param0->unk_00); @@ -905,7 +904,7 @@ static void ov19_021DD8F8 (UnkStruct_ov19_021DCF88 * param0) } } -static void ov19_021DD998 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DD998(UnkStruct_ov19_021DCF88 *param0) { int v0; @@ -917,7 +916,7 @@ static void ov19_021DD998 (UnkStruct_ov19_021DCF88 * param0) } } -static u32 ov19_021DD9B8 (u32 param0, u32 param1) +static u32 ov19_021DD9B8(u32 param0, u32 param1) { if (param0 == 0) { return (param1 == 0) ? 1 : 0; @@ -930,7 +929,7 @@ static u32 ov19_021DD9B8 (u32 param0, u32 param1) } } -static void ov19_021DD9DC (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DD9DC(UnkStruct_ov19_021DCF88 *param0) { UnkStruct_ov19_021DA864 v0; NNSG2dImageProxy v1; @@ -954,7 +953,7 @@ static void ov19_021DD9DC (UnkStruct_ov19_021DCF88 * param0) param0->unk_80 = ov19_021D5EC0(param0->unk_04); } -static void ov19_021DDA7C (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DDA7C(UnkStruct_ov19_021DCF88 *param0) { int v0; @@ -966,9 +965,9 @@ static void ov19_021DDA7C (UnkStruct_ov19_021DCF88 * param0) } } -static void ov19_021DDA9C (SysTask * param0, void * param1) +static void ov19_021DDA9C(SysTask *param0, void *param1) { - UnkStruct_ov19_021DDBD0 * v0 = (UnkStruct_ov19_021DDBD0 *)param1; + UnkStruct_ov19_021DDBD0 *v0 = (UnkStruct_ov19_021DDBD0 *)param1; VecFx32 v1; if (v0->unk_16) { @@ -998,9 +997,9 @@ static void ov19_021DDA9C (SysTask * param0, void * param1) } } -static void ov19_021DDB20 (SysTask * param0, void * param1) +static void ov19_021DDB20(SysTask *param0, void *param1) { - UnkStruct_ov19_021DDBD0 * v0 = (UnkStruct_ov19_021DDBD0 *)param1; + UnkStruct_ov19_021DDBD0 *v0 = (UnkStruct_ov19_021DDBD0 *)param1; VecFx32 v1; if (v0->unk_16) { @@ -1041,16 +1040,16 @@ static void ov19_021DDB20 (SysTask * param0, void * param1) } } -static void ov19_021DDBD0 (SysTask * param0, UnkStruct_ov19_021DDBD0 * param1) +static void ov19_021DDBD0(SysTask *param0, UnkStruct_ov19_021DDBD0 *param1) { - UnkStruct_ov19_021DDBF8 * v0 = param1->unk_00; + UnkStruct_ov19_021DDBF8 *v0 = param1->unk_00; GF_ASSERT(v0->unk_1CB); v0->unk_1CB--; SysTask_Done(param0); } -static void ov19_021DDBF8 (UnkStruct_ov19_021DDBF8 * param0, GraphicElementData * param1, UnkStruct_ov19_021DDBD0 * param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7) +static void ov19_021DDBF8(UnkStruct_ov19_021DDBF8 *param0, GraphicElementData *param1, UnkStruct_ov19_021DDBD0 *param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7) { SysTaskFunc v0; @@ -1077,7 +1076,7 @@ static void ov19_021DDBF8 (UnkStruct_ov19_021DDBF8 * param0, GraphicElementData } } -static void ov19_021DDC74 (UnkStruct_ov19_021DDBF8 * param0, UnkStruct_ov19_021DDBD0 * param1, u32 param2, u32 param3, u32 param4) +static void ov19_021DDC74(UnkStruct_ov19_021DDBF8 *param0, UnkStruct_ov19_021DDBD0 *param1, u32 param2, u32 param3, u32 param4) { int v0; @@ -1102,14 +1101,13 @@ static void ov19_021DDC74 (UnkStruct_ov19_021DDBF8 * param0, UnkStruct_ov19_021D param1->unk_24 = (param1->unk_20 - param1->unk_1C) / (s32)v0; } -static void ov19_021DDCC0 (SysTask * param0, void * param1) +static void ov19_021DDCC0(SysTask *param0, void *param1) { - UnkStruct_ov19_021DDBF8 * v0 = (UnkStruct_ov19_021DDBF8 *)param1; - UnkStruct_ov19_021DCF88 * v1 = v0->unk_00; + UnkStruct_ov19_021DDBF8 *v0 = (UnkStruct_ov19_021DDBF8 *)param1; + UnkStruct_ov19_021DCF88 *v1 = v0->unk_00; switch (v0->unk_1CC) { - case 0: - { + case 0: { int v2; v0->unk_1CA++; @@ -1124,8 +1122,7 @@ static void ov19_021DDCC0 (SysTask * param0, void * param1) v0->unk_1CC = 1; } } - } - break; + } break; case 1: v0->unk_1CD -= (1 * 2); @@ -1142,21 +1139,21 @@ static void ov19_021DDCC0 (SysTask * param0, void * param1) } } -static void ov19_021DDD78 (void * param0) +static void ov19_021DDD78(void *param0) { - UnkStruct_ov19_021DCF88 * v0 = param0; + UnkStruct_ov19_021DCF88 *v0 = param0; ov19_021DD358(v0); } -static void ov19_021DDD80 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DDD80(UnkStruct_ov19_021DCF88 *param0) { - UnkStruct_ov19_021DDBF8 * v0; + UnkStruct_ov19_021DDBF8 *v0; int v1; v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DDBF8)); if (v0) { - SysTask * v2; + SysTask *v2; v0->unk_00 = param0; v0->unk_1CC = 0; @@ -1173,14 +1170,13 @@ static void ov19_021DDD80 (UnkStruct_ov19_021DCF88 * param0) } } -static void ov19_021DDDD0 (SysTask * param0, void * param1) +static void ov19_021DDDD0(SysTask *param0, void *param1) { - UnkStruct_ov19_021DDBF8 * v0 = (UnkStruct_ov19_021DDBF8 *)param1; - UnkStruct_ov19_021DCF88 * v1 = v0->unk_00; + UnkStruct_ov19_021DDBF8 *v0 = (UnkStruct_ov19_021DDBF8 *)param1; + UnkStruct_ov19_021DCF88 *v1 = v0->unk_00; switch (v0->unk_1CC) { - case 0: - { + case 0: { int v2, v3, v4, v5, v6, v7, v8; if (v1->unk_04->unk_9C.unk_04 > 0) { @@ -1254,8 +1250,7 @@ static void ov19_021DDDD0 (SysTask * param0, void * param1) } v0->unk_1CC++; - } - break; + } break; case 1: if (v0->unk_1CB == 0) { v0->unk_1CC++; @@ -1265,15 +1260,15 @@ static void ov19_021DDDD0 (SysTask * param0, void * param1) } } -static void ov19_021DDFA8 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DDFA8(UnkStruct_ov19_021DCF88 *param0) { - UnkStruct_ov19_021DDBF8 * v0; + UnkStruct_ov19_021DDBF8 *v0; int v1; v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DDBF8)); if (v0) { - SysTask * v2; + SysTask *v2; v0->unk_00 = param0; v0->unk_04 = param0->unk_54; @@ -1291,14 +1286,13 @@ static void ov19_021DDFA8 (UnkStruct_ov19_021DCF88 * param0) } } -static void ov19_021DDFFC (SysTask * param0, void * param1) +static void ov19_021DDFFC(SysTask *param0, void *param1) { - UnkStruct_ov19_021DDBF8 * v0 = (UnkStruct_ov19_021DDBF8 *)param1; - UnkStruct_ov19_021DCF88 * v1 = v0->unk_00; + UnkStruct_ov19_021DDBF8 *v0 = (UnkStruct_ov19_021DDBF8 *)param1; + UnkStruct_ov19_021DCF88 *v1 = v0->unk_00; switch (v0->unk_1CC) { - case 0: - { + case 0: { int v2, v3, v4; v4 = 6; @@ -1315,8 +1309,7 @@ static void ov19_021DDFFC (SysTask * param0, void * param1) } v0->unk_1CC++; - } - break; + } break; case 1: if (v0->unk_1CB == 0) { v0->unk_1CC++; @@ -1326,15 +1319,15 @@ static void ov19_021DDFFC (SysTask * param0, void * param1) } } -static void ov19_021DE0A0 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DE0A0(UnkStruct_ov19_021DCF88 *param0) { - UnkStruct_ov19_021DDBF8 * v0; + UnkStruct_ov19_021DDBF8 *v0; int v1; v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DDBF8)); if (v0) { - SysTask * v2; + SysTask *v2; v0->unk_00 = param0; v0->unk_1CC = 0; @@ -1351,14 +1344,13 @@ static void ov19_021DE0A0 (UnkStruct_ov19_021DCF88 * param0) } } -static void ov19_021DE0F0 (SysTask * param0, void * param1) +static void ov19_021DE0F0(SysTask *param0, void *param1) { - UnkStruct_ov19_021DDBF8 * v0 = (UnkStruct_ov19_021DDBF8 *)param1; - UnkStruct_ov19_021DCF88 * v1 = v0->unk_00; + UnkStruct_ov19_021DDBF8 *v0 = (UnkStruct_ov19_021DDBF8 *)param1; + UnkStruct_ov19_021DCF88 *v1 = v0->unk_00; switch (v0->unk_1CC) { - case 0: - { + case 0: { int v2, v3, v4, v5, v6, v7, v8, v9, v10; v3 = ov19_021D5EB0(v1->unk_04); @@ -1399,7 +1391,7 @@ static void ov19_021DE0F0 (SysTask * param0, void * param1) v10 = 0; - for ( ; v5 < 8; v5++) { + for (; v5 < 8; v5++) { v7 -= v4; ov19_021DDBF8(v0, v1->unk_34[v2], &(v0->unk_08[v2]), v6, v7, 6 * (v9), v10, 1); @@ -1427,7 +1419,7 @@ static void ov19_021DE0F0 (SysTask * param0, void * param1) v7 = v6 + (v9 - 2); } - for ( ; v5 < v8; v5++) { + for (; v5 < v8; v5++) { ov19_021DDC74(v0, &(v0->unk_08[v2]), 6, v6, v7); v7 -= v4; @@ -1441,8 +1433,7 @@ static void ov19_021DE0F0 (SysTask * param0, void * param1) } v0->unk_1CC++; - } - break; + } break; case 1: if (v0->unk_1CB == 0) { v0->unk_1CC++; @@ -1452,15 +1443,15 @@ static void ov19_021DE0F0 (SysTask * param0, void * param1) } } -static void ov19_021DE2A4 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DE2A4(UnkStruct_ov19_021DCF88 *param0) { - UnkStruct_ov19_021DDBF8 * v0; + UnkStruct_ov19_021DDBF8 *v0; int v1; v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DDBF8)); if (v0) { - SysTask * v2; + SysTask *v2; v0->unk_00 = param0; v0->unk_1CC = 0; @@ -1477,7 +1468,7 @@ static void ov19_021DE2A4 (UnkStruct_ov19_021DCF88 * param0) } } -void ov19_021DE2F4 (UnkStruct_ov19_021DCF88 * param0) +void ov19_021DE2F4(UnkStruct_ov19_021DCF88 *param0) { if (param0) { if (param0->unk_34[0] != NULL) { @@ -1491,29 +1482,29 @@ void ov19_021DE2F4 (UnkStruct_ov19_021DCF88 * param0) } } -static void ov19_021DE324 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DE324(UnkStruct_ov19_021DCF88 *param0) { sub_02019120(4, 0); } -static void ov19_021DE330 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DE330(UnkStruct_ov19_021DCF88 *param0) { G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_ALL, 14, 2); sub_02019120(4, 1); } -static void ov19_021DE350 (UnkStruct_ov19_021DCF88 * param0) +static void ov19_021DE350(UnkStruct_ov19_021DCF88 *param0) { static const struct { s16 unk_00; s16 unk_02; } v0[] = { - {36, 4}, - {36, 36}, - {50, 69}, - {92, 92}, - {114, 124}, - {124, 156}, + { 36, 4 }, + { 36, 36 }, + { 50, 69 }, + { 92, 92 }, + { 114, 124 }, + { 124, 156 }, }; int v1, v2; diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c index 20f7a4670f..46fbcc9b9f 100644 --- a/src/overlay019/ov19_021DE3E8.c +++ b/src/overlay019/ov19_021DE3E8.c @@ -1,55 +1,56 @@ +#include "overlay019/ov19_021DE3E8.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" -#include "overlay019/struct_ov19_021DE3E8_decl.h" +#include "overlay019/ov19_021D0D80.h" +#include "overlay019/ov19_021D61B0.h" +#include "overlay019/ov19_021D8B54.h" +#include "overlay019/ov19_021DC5F0.h" #include "overlay019/struct_ov19_021D4DF0.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021D8E00.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DA864.h" +#include "overlay019/struct_ov19_021DE3E8_decl.h" -#include "unk_02006E3C.h" -#include "sys_task.h" #include "heap.h" -#include "unk_020218BC.h" #include "item.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021D8B54.h" -#include "overlay019/ov19_021DC5F0.h" -#include "overlay019/ov19_021DE3E8.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" +#include "unk_020218BC.h" static const struct { u32 unk_00; u32 unk_04; } Unk_ov19_021E04CC[] = { - {1536 * 0x20, 7}, - {1552 * 0x20, 8}, - {1568 * 0x20, 9}, + { 1536 * 0x20, 7 }, + { 1552 * 0x20, 8 }, + { 1568 * 0x20, 9 }, }; struct UnkStruct_ov19_021DE3E8_t { BOOL unk_00; - UnkStruct_ov19_021D61B0 * unk_04; - const UnkStruct_ov19_021D4DF0 * unk_08; - BGL * unk_0C; - GraphicElementManager * unk_10; - UnkStruct_ov19_021DA384 * unk_14; - UnkStruct_ov19_021D8E00 * unk_18; - GraphicElementData * unk_1C[3]; + UnkStruct_ov19_021D61B0 *unk_04; + const UnkStruct_ov19_021D4DF0 *unk_08; + BGL *unk_0C; + GraphicElementManager *unk_10; + UnkStruct_ov19_021DA384 *unk_14; + UnkStruct_ov19_021D8E00 *unk_18; + GraphicElementData *unk_1C[3]; int unk_28[3]; int unk_34; int unk_38; }; typedef struct { - UnkStruct_ov19_021DE3E8 * unk_00; - GraphicElementData * unk_04; + UnkStruct_ov19_021DE3E8 *unk_00; + GraphicElementData *unk_04; VecFx32 unk_08; VecFx32 unk_14; fx32 unk_20; @@ -59,21 +60,21 @@ typedef struct { int unk_30; } UnkStruct_ov19_021DE858; -static void ov19_021DE450(UnkStruct_ov19_021DE3E8 * param0); -static void ov19_021DE51C(UnkStruct_ov19_021DE3E8 * param0); -static int ov19_021DE538(UnkStruct_ov19_021DE3E8 * param0, int param1); -static int ov19_021DE560(UnkStruct_ov19_021DE3E8 * param0, int param1); -static void ov19_021DE57C(UnkStruct_ov19_021DE3E8 * param0, int param1, int param2); -static void ov19_021DE59C(UnkStruct_ov19_021DE3E8 * param0); -static void ov19_021DE5D4(UnkStruct_ov19_021DE3E8 * param0); -static void ov19_021DE694(UnkStruct_ov19_021DE3E8 * param0, VecFx32 * param1, u32 * param2); -static void ov19_021DE718(UnkStruct_ov19_021DE3E8 * param0, int param1, int param2); -static void ov19_021DE858(UnkStruct_ov19_021DE3E8 * param0, int param1, const VecFx32 * param2, int param3, int param4); -static void ov19_021DE8E0(SysTask * param0, void * param1); - -BOOL ov19_021DE3E8 (UnkStruct_ov19_021DE3E8 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4) +static void ov19_021DE450(UnkStruct_ov19_021DE3E8 *param0); +static void ov19_021DE51C(UnkStruct_ov19_021DE3E8 *param0); +static int ov19_021DE538(UnkStruct_ov19_021DE3E8 *param0, int param1); +static int ov19_021DE560(UnkStruct_ov19_021DE3E8 *param0, int param1); +static void ov19_021DE57C(UnkStruct_ov19_021DE3E8 *param0, int param1, int param2); +static void ov19_021DE59C(UnkStruct_ov19_021DE3E8 *param0); +static void ov19_021DE5D4(UnkStruct_ov19_021DE3E8 *param0); +static void ov19_021DE694(UnkStruct_ov19_021DE3E8 *param0, VecFx32 *param1, u32 *param2); +static void ov19_021DE718(UnkStruct_ov19_021DE3E8 *param0, int param1, int param2); +static void ov19_021DE858(UnkStruct_ov19_021DE3E8 *param0, int param1, const VecFx32 *param2, int param3, int param4); +static void ov19_021DE8E0(SysTask *param0, void *param1); + +BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4) { - UnkStruct_ov19_021DE3E8 * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DE3E8)); + UnkStruct_ov19_021DE3E8 *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DE3E8)); if (v0) { v0->unk_04 = param1; @@ -94,19 +95,19 @@ BOOL ov19_021DE3E8 (UnkStruct_ov19_021DE3E8 ** param0, UnkStruct_ov19_021D61B0 * return 0; } -void ov19_021DE440 (UnkStruct_ov19_021DE3E8 * param0) +void ov19_021DE440(UnkStruct_ov19_021DE3E8 *param0) { ov19_021DE51C(param0); Heap_FreeToHeap(param0); } -static void ov19_021DE450 (UnkStruct_ov19_021DE3E8 * param0) +static void ov19_021DE450(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00) { UnkStruct_ov19_021DA864 v0; NNSG2dImageProxy v1; - NNSG2dCharacterData * v2; - void * v3; + NNSG2dCharacterData *v2; + void *v3; int v4; ov19_021D783C(&v0, &v1, ov19_021D77D0(param0->unk_04), param0->unk_14->unk_1C, param0->unk_14->unk_20, 0); @@ -142,7 +143,7 @@ static void ov19_021DE450 (UnkStruct_ov19_021DE3E8 * param0) } } -static void ov19_021DE51C (UnkStruct_ov19_021DE3E8 * param0) +static void ov19_021DE51C(UnkStruct_ov19_021DE3E8 *param0) { int v0; @@ -153,7 +154,7 @@ static void ov19_021DE51C (UnkStruct_ov19_021DE3E8 * param0) } } -static int ov19_021DE538 (UnkStruct_ov19_021DE3E8 * param0, int param1) +static int ov19_021DE538(UnkStruct_ov19_021DE3E8 *param0, int param1) { int v0; @@ -167,7 +168,7 @@ static int ov19_021DE538 (UnkStruct_ov19_021DE3E8 * param0, int param1) return -1; } -static int ov19_021DE560 (UnkStruct_ov19_021DE3E8 * param0, int param1) +static int ov19_021DE560(UnkStruct_ov19_021DE3E8 *param0, int param1) { int v0; @@ -180,12 +181,12 @@ static int ov19_021DE560 (UnkStruct_ov19_021DE3E8 * param0, int param1) return -1; } -static void ov19_021DE57C (UnkStruct_ov19_021DE3E8 * param0, int param1, int param2) +static void ov19_021DE57C(UnkStruct_ov19_021DE3E8 *param0, int param1, int param2) { param0->unk_28[param1] = param2; } -void ov19_021DE584 (UnkStruct_ov19_021DE3E8 * param0) +void ov19_021DE584(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00 == 0) { return; @@ -195,7 +196,7 @@ void ov19_021DE584 (UnkStruct_ov19_021DE3E8 * param0) ov19_021DE5D4(param0); } -static void ov19_021DE59C (UnkStruct_ov19_021DE3E8 * param0) +static void ov19_021DE59C(UnkStruct_ov19_021DE3E8 *param0) { u32 v0 = ov19_021D5E74(param0->unk_08); @@ -208,7 +209,7 @@ static void ov19_021DE59C (UnkStruct_ov19_021DE3E8 * param0) } } -static void ov19_021DE5D4 (UnkStruct_ov19_021DE3E8 * param0) +static void ov19_021DE5D4(UnkStruct_ov19_021DE3E8 *param0) { u32 v0 = ov19_021D5F7C(param0->unk_08); @@ -240,7 +241,7 @@ static void ov19_021DE5D4 (UnkStruct_ov19_021DE3E8 * param0) } } -static void ov19_021DE694 (UnkStruct_ov19_021DE3E8 * param0, VecFx32 * param1, u32 * param2) +static void ov19_021DE694(UnkStruct_ov19_021DE3E8 *param0, VecFx32 *param1, u32 *param2) { param1->z = 0; @@ -261,7 +262,7 @@ static void ov19_021DE694 (UnkStruct_ov19_021DE3E8 * param0, VecFx32 * param1, u } } -static void ov19_021DE718 (UnkStruct_ov19_021DE3E8 * param0, int param1, int param2) +static void ov19_021DE718(UnkStruct_ov19_021DE3E8 *param0, int param1, int param2) { if (param1 >= 0) { VecFx32 v0; @@ -278,7 +279,7 @@ static void ov19_021DE718 (UnkStruct_ov19_021DE3E8 * param0, int param1, int par } } -void ov19_021DE7A0 (UnkStruct_ov19_021DE3E8 * param0) +void ov19_021DE7A0(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00) { int v0, v1; @@ -304,7 +305,7 @@ void ov19_021DE7A0 (UnkStruct_ov19_021DE3E8 * param0) } } -BOOL ov19_021DE800 (UnkStruct_ov19_021DE3E8 * param0) +BOOL ov19_021DE800(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00 == 0) { return 1; @@ -331,9 +332,9 @@ BOOL ov19_021DE800 (UnkStruct_ov19_021DE3E8 * param0) } } -static void ov19_021DE858 (UnkStruct_ov19_021DE3E8 * param0, int param1, const VecFx32 * param2, int param3, int param4) +static void ov19_021DE858(UnkStruct_ov19_021DE3E8 *param0, int param1, const VecFx32 *param2, int param3, int param4) { - UnkStruct_ov19_021DE858 * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DE858)); + UnkStruct_ov19_021DE858 *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DE858)); if (v0) { v0->unk_00 = param0; @@ -354,9 +355,9 @@ static void ov19_021DE858 (UnkStruct_ov19_021DE3E8 * param0, int param1, const V } } -static void ov19_021DE8E0 (SysTask * param0, void * param1) +static void ov19_021DE8E0(SysTask *param0, void *param1) { - UnkStruct_ov19_021DE858 * v0 = param1; + UnkStruct_ov19_021DE858 *v0 = param1; switch (v0->unk_30) { case 0: @@ -381,7 +382,7 @@ static void ov19_021DE8E0 (SysTask * param0, void * param1) } } -void ov19_021DE954 (UnkStruct_ov19_021DE3E8 * param0) +void ov19_021DE954(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00) { int v0 = ov19_021DE560(param0, 1); @@ -401,12 +402,12 @@ void ov19_021DE954 (UnkStruct_ov19_021DE3E8 * param0) } } -BOOL ov19_021DE9A8 (UnkStruct_ov19_021DE3E8 * param0) +BOOL ov19_021DE9A8(UnkStruct_ov19_021DE3E8 *param0) { return param0->unk_34 == 0; } -void ov19_021DE9B8 (UnkStruct_ov19_021DE3E8 * param0) +void ov19_021DE9B8(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00) { int v0 = ov19_021DE560(param0, 1); @@ -418,7 +419,7 @@ void ov19_021DE9B8 (UnkStruct_ov19_021DE3E8 * param0) } } -BOOL ov19_021DE9E4 (UnkStruct_ov19_021DE3E8 * param0) +BOOL ov19_021DE9E4(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00) { int v0 = ov19_021DE560(param0, 2); @@ -435,7 +436,7 @@ BOOL ov19_021DE9E4 (UnkStruct_ov19_021DE3E8 * param0) return 1; } -void ov19_021DEA18 (UnkStruct_ov19_021DE3E8 * param0) +void ov19_021DEA18(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00) { int v0 = ov19_021DE560(param0, 3); @@ -452,12 +453,12 @@ void ov19_021DEA18 (UnkStruct_ov19_021DE3E8 * param0) } } -BOOL ov19_021DEA64 (UnkStruct_ov19_021DE3E8 * param0) +BOOL ov19_021DEA64(UnkStruct_ov19_021DE3E8 *param0) { return param0->unk_34 == 0; } -void ov19_021DEA74 (UnkStruct_ov19_021DE3E8 * param0) +void ov19_021DEA74(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00) { int v0 = ov19_021DE560(param0, 3); @@ -484,12 +485,12 @@ void ov19_021DEA74 (UnkStruct_ov19_021DE3E8 * param0) } } -BOOL ov19_021DEB08 (UnkStruct_ov19_021DE3E8 * param0) +BOOL ov19_021DEB08(UnkStruct_ov19_021DE3E8 *param0) { return param0->unk_34 == 0; } -void ov19_021DEB18 (UnkStruct_ov19_021DE3E8 * param0) +void ov19_021DEB18(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00) { int v0 = ov19_021DE560(param0, 3); @@ -512,7 +513,7 @@ void ov19_021DEB18 (UnkStruct_ov19_021DE3E8 * param0) } } -BOOL ov19_021DEB60 (UnkStruct_ov19_021DE3E8 * param0) +BOOL ov19_021DEB60(UnkStruct_ov19_021DE3E8 *param0) { if (param0->unk_00) { if (param0->unk_38 != -1) { @@ -528,7 +529,7 @@ BOOL ov19_021DEB60 (UnkStruct_ov19_021DE3E8 * param0) return 1; } -void ov19_021DEB9C (UnkStruct_ov19_021DE3E8 * param0, const VecFx32 * param1) +void ov19_021DEB9C(UnkStruct_ov19_021DE3E8 *param0, const VecFx32 *param1) { if (param0->unk_00) { int v0 = ov19_021DE560(param0, 3); @@ -544,7 +545,7 @@ void ov19_021DEB9C (UnkStruct_ov19_021DE3E8 * param0, const VecFx32 * param1) } } -void ov19_021DEBDC (UnkStruct_ov19_021DE3E8 * param0, u32 param1) +void ov19_021DEBDC(UnkStruct_ov19_021DE3E8 *param0, u32 param1) { if (param0->unk_00) { int v0 = ov19_021DE560(param0, 3); diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c index 9d5bb278d0..d0ecee7d24 100644 --- a/src/overlay019/ov19_021DEC04.c +++ b/src/overlay019/ov19_021DEC04.c @@ -1,102 +1,100 @@ +#include "overlay019/ov19_021DEC04.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "pokemon.h" -#include "overlay019/struct_ov19_021D61B0_decl.h" -#include "overlay019/struct_ov19_021DEC04_decl.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay019/ov19_021D0D80.h" +#include "overlay019/ov19_021D61B0.h" +#include "overlay019/ov19_021DA270.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D5FAC.h" +#include "overlay019/struct_ov19_021D61B0_decl.h" #include "overlay019/struct_ov19_021DA384.h" #include "overlay019/struct_ov19_021DA864.h" +#include "overlay019/struct_ov19_021DEC04_decl.h" #include "overlay061/struct_ov61_0222C884.h" -#include "unk_02002B7C.h" -#include "unk_02006E3C.h" +#include "heap.h" +#include "inlines.h" #include "message.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "strbuf.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02002B7C.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "pokemon_icon.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021D61B0.h" -#include "overlay019/ov19_021DA270.h" -#include "overlay019/ov19_021DEC04.h" struct UnkStruct_ov19_021DEC04_t { BOOL unk_00; - UnkStruct_ov19_021D61B0 * unk_04; - const UnkStruct_ov19_021D4DF0 * unk_08; - BGL * unk_0C; - GraphicElementManager * unk_10; - UnkStruct_ov19_021DA384 * unk_14; + UnkStruct_ov19_021D61B0 *unk_04; + const UnkStruct_ov19_021D4DF0 *unk_08; + BGL *unk_0C; + GraphicElementManager *unk_10; + UnkStruct_ov19_021DA384 *unk_14; u32 unk_18[2]; - GraphicElementData * unk_20[2]; - GraphicElementData * unk_28[2]; - GraphicElementData * unk_30; - GraphicElementData * unk_34[2][5]; - void * unk_5C; - NNSG2dCellDataBank * unk_60; - void * unk_64; - NNSG2dAnimBankData * unk_68; - MessageLoader * unk_6C; - MessageLoader * unk_70; - Strbuf* unk_74; + GraphicElementData *unk_20[2]; + GraphicElementData *unk_28[2]; + GraphicElementData *unk_30; + GraphicElementData *unk_34[2][5]; + void *unk_5C; + NNSG2dCellDataBank *unk_60; + void *unk_64; + NNSG2dAnimBankData *unk_68; + MessageLoader *unk_6C; + MessageLoader *unk_70; + Strbuf *unk_74; Window unk_78[7]; u8 unk_E8[640]; - NNSG2dScreenData * unk_368; - NNSG2dScreenData * unk_36C; - void * unk_370; - void * unk_374; + NNSG2dScreenData *unk_368; + NNSG2dScreenData *unk_36C; + void *unk_370; + void *unk_374; int unk_378; int unk_37C; - SysTask * unk_380; + SysTask *unk_380; }; -static void ov19_021DEEFC(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DEF64(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DEFC8(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DF03C(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DF064(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DF0CC(UnkStruct_ov19_021DEC04 * param0, int param1); -static void ov19_021DF108(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DF140(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DF178(UnkStruct_ov19_021DEC04 * param0, int param1); -static void ov19_021DF250(UnkStruct_ov19_021DEC04 * param0, int param1); -static void ov19_021DF270(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DF2A8(UnkStruct_ov19_021DEC04 * param0); -static inline u32 inline_ov19_021DF3AC(Window * param0, u32 param1, const Strbuf *param2); -static void ov19_021DF2E0(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DF394(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 * param0, int param1); -static void ov19_021DF4D0(UnkStruct_ov19_021DEC04 * param0, int param1); -static void ov19_021DF5D0(UnkStruct_ov19_021DEC04 * param0, NARC * param1); -static void ov19_021DF730(UnkStruct_ov19_021DEC04 * param0, u32 param1); -static void ov19_021DF7D0(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DF834(UnkStruct_ov19_021DEC04 * param0); -static void ov19_021DF8C8(UnkStruct_ov19_021DEC04 * param0, int param1); -static void ov19_021DF930(SysTask * param0, void * param1); - -BOOL ov19_021DEC04 (UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, MessageLoader * param5, NARC * param6) +static void ov19_021DEEFC(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DEF64(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DEFC8(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DF03C(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DF064(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DF0CC(UnkStruct_ov19_021DEC04 *param0, int param1); +static void ov19_021DF108(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DF140(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DF178(UnkStruct_ov19_021DEC04 *param0, int param1); +static void ov19_021DF250(UnkStruct_ov19_021DEC04 *param0, int param1); +static void ov19_021DF270(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DF2A8(UnkStruct_ov19_021DEC04 *param0); +static inline u32 inline_ov19_021DF3AC(Window *param0, u32 param1, const Strbuf *param2); +static void ov19_021DF2E0(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DF394(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 *param0, int param1); +static void ov19_021DF4D0(UnkStruct_ov19_021DEC04 *param0, int param1); +static void ov19_021DF5D0(UnkStruct_ov19_021DEC04 *param0, NARC *param1); +static void ov19_021DF730(UnkStruct_ov19_021DEC04 *param0, u32 param1); +static void ov19_021DF7D0(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DF834(UnkStruct_ov19_021DEC04 *param0); +static void ov19_021DF8C8(UnkStruct_ov19_021DEC04 *param0, int param1); +static void ov19_021DF930(SysTask *param0, void *param1); + +BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, GraphicElementManager *param4, MessageLoader *param5, NARC *param6) { if (ov19_021D5E08(param2) != 4) { *param0 = NULL; return 1; } else { - UnkStruct_ov19_021DEC04 * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DEC04)); + UnkStruct_ov19_021DEC04 *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DEC04)); if (v0) { v0->unk_04 = param1; @@ -118,7 +116,7 @@ BOOL ov19_021DEC04 (UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * } } -void ov19_021DECAC (UnkStruct_ov19_021DEC04 * param0) +void ov19_021DECAC(UnkStruct_ov19_021DEC04 *param0) { if (param0) { Heap_FreeToHeap(param0->unk_370); @@ -131,7 +129,7 @@ void ov19_021DECAC (UnkStruct_ov19_021DEC04 * param0) } } -void ov19_021DECE8 (UnkStruct_ov19_021DEC04 * param0, NARC * param1) +void ov19_021DECE8(UnkStruct_ov19_021DEC04 *param0, NARC *param1) { if (param0) { ov19_021DEEFC(param0); @@ -155,7 +153,7 @@ void ov19_021DECE8 (UnkStruct_ov19_021DEC04 * param0, NARC * param1) } } -void ov19_021DEDDC (UnkStruct_ov19_021DEC04 * param0, BOOL param1) +void ov19_021DEDDC(UnkStruct_ov19_021DEC04 *param0, BOOL param1) { if (param0) { int v0 = ov19_021D5F9C(param0->unk_08); @@ -172,7 +170,7 @@ void ov19_021DEDDC (UnkStruct_ov19_021DEC04 * param0, BOOL param1) } } -void ov19_021DEE34 (UnkStruct_ov19_021DEC04 * param0) +void ov19_021DEE34(UnkStruct_ov19_021DEC04 *param0) { ov19_021DF834(param0); @@ -195,12 +193,12 @@ void ov19_021DEE34 (UnkStruct_ov19_021DEC04 * param0) } } -BOOL ov19_021DEE84 (UnkStruct_ov19_021DEC04 * param0) +BOOL ov19_021DEE84(UnkStruct_ov19_021DEC04 *param0) { return 1; } -void ov19_021DEE88 (UnkStruct_ov19_021DEC04 * param0) +void ov19_021DEE88(UnkStruct_ov19_021DEC04 *param0) { if (param0) { param0->unk_37C = 0; @@ -209,7 +207,7 @@ void ov19_021DEE88 (UnkStruct_ov19_021DEC04 * param0) } } -BOOL ov19_021DEEA8 (UnkStruct_ov19_021DEC04 * param0) +BOOL ov19_021DEEA8(UnkStruct_ov19_021DEC04 *param0) { if (param0) { switch (param0->unk_37C) { @@ -232,16 +230,16 @@ BOOL ov19_021DEEA8 (UnkStruct_ov19_021DEC04 * param0) } } -static void ov19_021DEEFC (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DEEFC(UnkStruct_ov19_021DEC04 *param0) { - NNSG2dScreenData * v0 = (ov19_021D5F9C(param0->unk_08) == 0) ? param0->unk_368 : param0->unk_36C; + NNSG2dScreenData *v0 = (ov19_021D5F9C(param0->unk_08) == 0) ? param0->unk_368 : param0->unk_36C; sub_020198E8(param0->unk_0C, 2, 0, 0, 6, 32, v0->rawData, 0, 0, 32, 32); sub_020198E8(param0->unk_0C, 2, 26, 0, 6, 32, v0->rawData, 26, 0, 32, 32); sub_02019448(param0->unk_0C, 2); } -static void ov19_021DEF64 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DEF64(UnkStruct_ov19_021DEC04 *param0) { switch (ov19_021D5FA4(param0->unk_08)) { case 0: @@ -262,18 +260,12 @@ static void ov19_021DEF64 (UnkStruct_ov19_021DEC04 * param0) } } -static void ov19_021DEFC8 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DEFC8(UnkStruct_ov19_021DEC04 *param0) { static const UnkStruct_ov61_0222C884 v0[] = { - { - 4, 3, 1, 9, 2, 0, 1 - }, - { - 4, 20, 1, 9, 2, 1, 19 - }, - { - 4, 13, 4, 6, 16, 0, 37 - } + { 4, 3, 1, 9, 2, 0, 1 }, + { 4, 20, 1, 9, 2, 1, 19 }, + { 4, 13, 4, 6, 16, 0, 37 } }; int v1; @@ -297,7 +289,7 @@ static void ov19_021DEFC8 (UnkStruct_ov19_021DEC04 * param0) ov19_021DF064(param0); } -static void ov19_021DF03C (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DF03C(UnkStruct_ov19_021DEC04 *param0) { int v0; @@ -308,7 +300,7 @@ static void ov19_021DF03C (UnkStruct_ov19_021DEC04 * param0) } } -static void ov19_021DF064 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DF064(UnkStruct_ov19_021DEC04 *param0) { int v0 = ov19_021D5FA4(param0->unk_08); @@ -332,7 +324,7 @@ static void ov19_021DF064 (UnkStruct_ov19_021DEC04 * param0) param0->unk_378 = v0; } -static void ov19_021DF0CC (UnkStruct_ov19_021DEC04 * param0, int param1) +static void ov19_021DF0CC(UnkStruct_ov19_021DEC04 *param0, int param1) { switch (param1) { case 0: @@ -350,15 +342,11 @@ static void ov19_021DF0CC (UnkStruct_ov19_021DEC04 * param0, int param1) } } -static void ov19_021DF108 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DF108(UnkStruct_ov19_021DEC04 *param0) { static const UnkStruct_ov61_0222C884 v0[] = { - { - 4, 3, 4, 9, 16, 0, 133 - }, - { - 4, 20, 4, 9, 16, 1, 277 - } + { 4, 3, 4, 9, 16, 0, 133 }, + { 4, 20, 4, 9, 16, 1, 277 } }; int v1; @@ -369,7 +357,7 @@ static void ov19_021DF108 (UnkStruct_ov19_021DEC04 * param0) } } -static void ov19_021DF140 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DF140(UnkStruct_ov19_021DEC04 *param0) { int v0; @@ -382,10 +370,10 @@ static void ov19_021DF140 (UnkStruct_ov19_021DEC04 * param0) } } -static void ov19_021DF178 (UnkStruct_ov19_021DEC04 * param0, int param1) +static void ov19_021DF178(UnkStruct_ov19_021DEC04 *param0, int param1) { - #define DEFINE_00(tx) ((128 << FX32_SHIFT) + (((((tx) - 128) << FX32_SHIFT) * 10) / 100)) - #define DEFINE_01(ty) ((484 << FX32_SHIFT) + (((((ty) - 484) << FX32_SHIFT) * 10) / 100)) +#define DEFINE_00(tx) ((128 << FX32_SHIFT) + (((((tx)-128) << FX32_SHIFT) * 10) / 100)) +#define DEFINE_01(ty) ((484 << FX32_SHIFT) + (((((ty)-484) << FX32_SHIFT) * 10) / 100)) static const struct { fx32 unk_00; @@ -393,14 +381,14 @@ static void ov19_021DF178 (UnkStruct_ov19_021DEC04 * param0, int param1) fx32 unk_08; fx32 unk_0C; } v0[] = { - {DEFINE_00(128), DEFINE_01(438), 128 << FX32_SHIFT, 438 << FX32_SHIFT}, - {DEFINE_00(172), DEFINE_01(470), 172 << FX32_SHIFT, 470 << FX32_SHIFT}, - {DEFINE_00(155), DEFINE_01(520), 155 << FX32_SHIFT, 520 << FX32_SHIFT}, - {DEFINE_00(100), DEFINE_01(520), 100 << FX32_SHIFT, 520 << FX32_SHIFT}, - {DEFINE_00(84), DEFINE_01(470), 84 << FX32_SHIFT, 470 << FX32_SHIFT}, + { DEFINE_00(128), DEFINE_01(438), 128 << FX32_SHIFT, 438 << FX32_SHIFT }, + { DEFINE_00(172), DEFINE_01(470), 172 << FX32_SHIFT, 470 << FX32_SHIFT }, + { DEFINE_00(155), DEFINE_01(520), 155 << FX32_SHIFT, 520 << FX32_SHIFT }, + { DEFINE_00(100), DEFINE_01(520), 100 << FX32_SHIFT, 520 << FX32_SHIFT }, + { DEFINE_00(84), DEFINE_01(470), 84 << FX32_SHIFT, 470 << FX32_SHIFT }, }; - const UnkStruct_ov19_021D5FAC * v1; + const UnkStruct_ov19_021D5FAC *v1; BOOL v2, v3, v4; v1 = ov19_021D5FAC(param0->unk_08, param1); @@ -411,7 +399,7 @@ static void ov19_021DF178 (UnkStruct_ov19_021DEC04 * param0, int param1) if ((((v2 == 1) && (v3 == 1)) || ((v3 == 0) && (v4 == 1))) && (v1->unk_06 == 0)) { int v5; VecFx32 v6; - const u16 * v7 = &v1->unk_16; + const u16 *v7 = &v1->unk_16; v6.z = 0; @@ -428,11 +416,11 @@ static void ov19_021DF178 (UnkStruct_ov19_021DEC04 * param0, int param1) ov19_021DF250(param0, param1); } - #undef DEFINE_00 - #undef DEFINE_01 +#undef DEFINE_00 +#undef DEFINE_01 } -static void ov19_021DF250 (UnkStruct_ov19_021DEC04 * param0, int param1) +static void ov19_021DF250(UnkStruct_ov19_021DEC04 *param0, int param1) { int v0; @@ -441,11 +429,11 @@ static void ov19_021DF250 (UnkStruct_ov19_021DEC04 * param0, int param1) } } -static void ov19_021DF270 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DF270(UnkStruct_ov19_021DEC04 *param0) { static const UnkStruct_ov61_0222C884 v0[] = { - {4, 1, 4, 11, 12, 0, 133}, - {4, 20, 4, 11, 12, 1, 265} + { 4, 1, 4, 11, 12, 0, 133 }, + { 4, 20, 4, 11, 12, 1, 265 } }; int v1; @@ -456,7 +444,7 @@ static void ov19_021DF270 (UnkStruct_ov19_021DEC04 * param0) } } -static void ov19_021DF2A8 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DF2A8(UnkStruct_ov19_021DEC04 *param0) { int v0; @@ -469,17 +457,24 @@ static void ov19_021DF2A8 (UnkStruct_ov19_021DEC04 * param0) } } -static inline u32 inline_ov19_021DF3AC (Window * param0, u32 param1, const Strbuf *param2) +static inline u32 inline_ov19_021DF3AC(Window *param0, u32 param1, const Strbuf *param2) { return ((param0->unk_07 * 8) - sub_02002D7C(param1, param2, 0)) / 2; } -static void ov19_021DF2E0 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DF2E0(UnkStruct_ov19_021DEC04 *param0) { static const u16 v0[] = { - 35, 36, 37, 38, 39, 40, 41, 42, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, }; - Window * v1 = ¶m0->unk_78[2]; + Window *v1 = ¶m0->unk_78[2]; int v2; BGL_FillWindow(v1, 0); @@ -500,18 +495,18 @@ static void ov19_021DF2E0 (UnkStruct_ov19_021DEC04 * param0) sub_0201ACCC(v1); } -static void ov19_021DF394 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DF394(UnkStruct_ov19_021DEC04 *param0) { - Window * v0 = ¶m0->unk_78[2]; + Window *v0 = ¶m0->unk_78[2]; BGL_FillWindow(v0, 0); sub_0201ACCC(v0); } -static void ov19_021DF3AC (UnkStruct_ov19_021DEC04 * param0, int param1) +static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 *param0, int param1) { - Window * v0; - const UnkStruct_ov19_021D5FAC * v1; + Window *v0; + const UnkStruct_ov19_021D5FAC *v1; BOOL v2, v3, v4; v0 = &(param0->unk_78[3 + param1]); @@ -526,7 +521,7 @@ static void ov19_021DF3AC (UnkStruct_ov19_021DEC04 * param0, int param1) int v5; if (v1->unk_06 == 0) { - const u16 * v6 = &v1->unk_08; + const u16 *v6 = &v1->unk_08; sub_0201D78C(v0, 0, v1->unk_2C, inline_ov19_021DF3AC(v0, 0, v1->unk_2C), 0, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); @@ -546,10 +541,10 @@ static void ov19_021DF3AC (UnkStruct_ov19_021DEC04 * param0, int param1) sub_0201ACCC(v0); } -static void ov19_021DF4D0 (UnkStruct_ov19_021DEC04 * param0, int param1) +static void ov19_021DF4D0(UnkStruct_ov19_021DEC04 *param0, int param1) { - Window * v0; - const UnkStruct_ov19_021D5FAC * v1; + Window *v0; + const UnkStruct_ov19_021D5FAC *v1; BOOL v2, v3, v4; v0 = &(param0->unk_78[5 + param1]); @@ -582,14 +577,14 @@ static void ov19_021DF4D0 (UnkStruct_ov19_021DEC04 * param0, int param1) sub_0201ACCC(v0); } -static void ov19_021DF5D0 (UnkStruct_ov19_021DEC04 * param0, NARC * param1) +static void ov19_021DF5D0(UnkStruct_ov19_021DEC04 *param0, NARC *param1) { - static const struct { + static const struct { s16 unk_00; s16 unk_02; } v0[] = { - {0, 568}, - {256, 568}, + { 0, 568 }, + { 256, 568 }, }; NNSG2dImageProxy v1; UnkStruct_ov19_021DA864 v2; @@ -626,14 +621,14 @@ static void ov19_021DF5D0 (UnkStruct_ov19_021DEC04 * param0, NARC * param1) ov19_021DF730(param0, v3); } -static void ov19_021DF730 (UnkStruct_ov19_021DEC04 * param0, u32 param1) +static void ov19_021DF730(UnkStruct_ov19_021DEC04 *param0, u32 param1) { - static const struct { + static const struct { s16 unk_00; s16 unk_02; } v0[] = { - {112, 394}, - {144, 394}, + { 112, 394 }, + { 144, 394 }, }; NNSG2dImageProxy v1; UnkStruct_ov19_021DA864 v2; @@ -651,7 +646,7 @@ static void ov19_021DF730 (UnkStruct_ov19_021DEC04 * param0, u32 param1) } } -static void ov19_021DF7D0 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DF7D0(UnkStruct_ov19_021DEC04 *param0) { int v0, v1; @@ -673,13 +668,13 @@ static void ov19_021DF7D0 (UnkStruct_ov19_021DEC04 * param0) Heap_FreeToHeap(param0->unk_64); } -static void ov19_021DF834 (UnkStruct_ov19_021DEC04 * param0) +static void ov19_021DF834(UnkStruct_ov19_021DEC04 *param0) { int v0 = ov19_021D5F9C(param0->unk_08); - const UnkStruct_ov19_021D5FAC * v1 = ov19_021D5FAC(param0->unk_08, v0); - GraphicElementData * v2 = param0->unk_20[v0]; - BoxPokemon * v3 = (BoxPokemon *)(v1->unk_00); - NNSG2dCharacterData * v4; + const UnkStruct_ov19_021D5FAC *v1 = ov19_021D5FAC(param0->unk_08, v0); + GraphicElementData *v2 = param0->unk_20[v0]; + BoxPokemon *v3 = (BoxPokemon *)(v1->unk_00); + NNSG2dCharacterData *v4; if (ov19_021D5E34(param0->unk_08)) { u32 v5 = 4 + PokeIconPaletteIndex(v1->unk_04, v1->unk_07, v1->unk_06); @@ -697,9 +692,9 @@ static void ov19_021DF834 (UnkStruct_ov19_021DEC04 * param0) } } -static void ov19_021DF8C8 (UnkStruct_ov19_021DEC04 * param0, int param1) +static void ov19_021DF8C8(UnkStruct_ov19_021DEC04 *param0, int param1) { - Window * v0; + Window *v0; param1 = ov19_021D5F9C(param0->unk_08); v0 = &(param0->unk_78[0 + param1]); @@ -707,16 +702,16 @@ static void ov19_021DF8C8 (UnkStruct_ov19_021DEC04 * param0, int param1) BGL_FillWindow(v0, 0); if (ov19_021D5E34(param0->unk_08)) { - const UnkStruct_ov19_021D5FAC * v1 = ov19_021D5FAC(param0->unk_08, param1); + const UnkStruct_ov19_021D5FAC *v1 = ov19_021D5FAC(param0->unk_08, param1); sub_0201D78C(v0, 0, v1->unk_28, inline_ov19_021DF3AC(v0, 0, v1->unk_28), 0, 0xff, (u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } sub_0201ACCC(v0); } -static void ov19_021DF930 (SysTask * param0, void * param1) +static void ov19_021DF930(SysTask *param0, void *param1) { - UnkStruct_ov19_021DEC04 * v0 = param1; + UnkStruct_ov19_021DEC04 *v0 = param1; BOOL v1 = ov19_021D5FC0(v0->unk_08); if (sub_02021E24(v0->unk_30) == 3) { diff --git a/src/overlay019/ov19_021DF964.c b/src/overlay019/ov19_021DF964.c index f62b8f418e..e495fb5a4e 100644 --- a/src/overlay019/ov19_021DF964.c +++ b/src/overlay019/ov19_021DF964.c @@ -1,27 +1,26 @@ -#include "enums.h" +#include "overlay019/ov19_021DF964.h" #include #include -#include "core_sys.h" - #include "struct_decls/struct_020797DC_decl.h" +#include "overlay019/ov19_021D0D80.h" #include "overlay019/struct_ov19_021D4DF0.h" #include "overlay019/struct_ov19_021D5BAC.h" #include "overlay019/struct_ov19_021DF964.h" +#include "core_sys.h" +#include "enums.h" #include "unk_02005474.h" #include "unk_020797C8.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay019/ov19_021DF964.h" -static void ov19_021DFCF8(UnkStruct_ov19_021DF964 * param0); -static void ov19_021DFD08(UnkStruct_ov19_021DF964 * param0, UnkEnum_021DFB94 param1); +static void ov19_021DFCF8(UnkStruct_ov19_021DF964 *param0); +static void ov19_021DFD08(UnkStruct_ov19_021DF964 *param0, UnkEnum_021DFB94 param1); -void ov19_021DF964 (UnkStruct_ov19_021D4DF0 * param0, u32 param1) +void ov19_021DF964(UnkStruct_ov19_021D4DF0 *param0, u32 param1) { - UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74); + UnkStruct_ov19_021DF964 *v0 = &(param0->unk_74); ov19_021DFCF8(v0); ov19_021DFD08(v0, UnkEnum_021DFB94_54); @@ -31,9 +30,9 @@ void ov19_021DF964 (UnkStruct_ov19_021D4DF0 * param0, u32 param1) v0->unk_23 = 0; } -void ov19_021DF990 (UnkStruct_ov19_021D4DF0 * param0) +void ov19_021DF990(UnkStruct_ov19_021D4DF0 *param0) { - UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74); + UnkStruct_ov19_021DF964 *v0 = &(param0->unk_74); ov19_021DFCF8(v0); v0->unk_23 = 1; @@ -50,7 +49,7 @@ void ov19_021DF990 (UnkStruct_ov19_021D4DF0 * param0) ov19_021DFD08(v0, UnkEnum_021DFB94_37); { - const UnkStruct_ov19_021D5BAC * v1 = ov19_021D5E70(param0); + const UnkStruct_ov19_021D5BAC *v1 = ov19_021D5E70(param0); if (v1->unk_0F == 0) { ov19_021DFD08(v0, UnkEnum_021DFB94_40); @@ -84,9 +83,9 @@ void ov19_021DF990 (UnkStruct_ov19_021D4DF0 * param0) } } -void ov19_021DFAD0 (UnkStruct_ov19_021D4DF0 * param0) +void ov19_021DFAD0(UnkStruct_ov19_021D4DF0 *param0) { - UnkStruct_ov19_021DF964 * v0; + UnkStruct_ov19_021DF964 *v0; u32 v1, v2; v0 = &(param0->unk_74); @@ -118,10 +117,10 @@ void ov19_021DFAD0 (UnkStruct_ov19_021D4DF0 * param0) ov19_021DFD08(v0, UnkEnum_021DFB94_51); } -void ov19_021DFB50 (UnkStruct_ov19_021D4DF0 * param0) +void ov19_021DFB50(UnkStruct_ov19_021D4DF0 *param0) { - UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74); - const PCBoxes * v1 = ov19_021D5E90(param0); + UnkStruct_ov19_021DF964 *v0 = &(param0->unk_74); + const PCBoxes *v1 = ov19_021D5E90(param0); ov19_021DFCF8(v0); ov19_021DFD08(v0, UnkEnum_021DFB94_00); @@ -136,10 +135,10 @@ void ov19_021DFB50 (UnkStruct_ov19_021D4DF0 * param0) v0->unk_23 = 2; } -void ov19_021DFB94 (UnkStruct_ov19_021D4DF0 * param0, UnkEnum_021DFB94 param1) +void ov19_021DFB94(UnkStruct_ov19_021D4DF0 *param0, UnkEnum_021DFB94 param1) { - UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74); - const PCBoxes * v1 = ov19_021D5E90(param0); + UnkStruct_ov19_021DF964 *v0 = &(param0->unk_74); + const PCBoxes *v1 = ov19_021D5E90(param0); u32 v2; ov19_021DFCF8(v0); @@ -167,16 +166,16 @@ void ov19_021DFB94 (UnkStruct_ov19_021D4DF0 * param0, UnkEnum_021DFB94 param1) } } -void ov19_021DFC04 (UnkStruct_ov19_021D4DF0 * param0, UnkEnum_021DFB94 param1) +void ov19_021DFC04(UnkStruct_ov19_021D4DF0 *param0, UnkEnum_021DFB94 param1) { static const u16 v0[][4] = { - {UnkEnum_021DFB94_10, UnkEnum_021DFB94_11, UnkEnum_021DFB94_12, UnkEnum_021DFB94_13}, - {UnkEnum_021DFB94_14, UnkEnum_021DFB94_15, UnkEnum_021DFB94_16, UnkEnum_021DFB94_17}, - {UnkEnum_021DFB94_18, UnkEnum_021DFB94_19, UnkEnum_021DFB94_20, UnkEnum_021DFB94_21}, - {UnkEnum_021DFB94_22, UnkEnum_021DFB94_23, UnkEnum_021DFB94_24, UnkEnum_021DFB94_25}, + { UnkEnum_021DFB94_10, UnkEnum_021DFB94_11, UnkEnum_021DFB94_12, UnkEnum_021DFB94_13 }, + { UnkEnum_021DFB94_14, UnkEnum_021DFB94_15, UnkEnum_021DFB94_16, UnkEnum_021DFB94_17 }, + { UnkEnum_021DFB94_18, UnkEnum_021DFB94_19, UnkEnum_021DFB94_20, UnkEnum_021DFB94_21 }, + { UnkEnum_021DFB94_22, UnkEnum_021DFB94_23, UnkEnum_021DFB94_24, UnkEnum_021DFB94_25 }, }; - UnkStruct_ov19_021DF964 * v1 = &(param0->unk_74); - const PCBoxes * v2 = ov19_021D5E90(param0); + UnkStruct_ov19_021DF964 *v1 = &(param0->unk_74); + const PCBoxes *v2 = ov19_021D5E90(param0); int v3; ov19_021DFCF8(v1); @@ -213,9 +212,9 @@ void ov19_021DFC04 (UnkStruct_ov19_021D4DF0 * param0, UnkEnum_021DFB94 param1) v1->unk_23 = 3; } -void ov19_021DFC80 (UnkStruct_ov19_021D4DF0 * param0) +void ov19_021DFC80(UnkStruct_ov19_021D4DF0 *param0) { - UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74); + UnkStruct_ov19_021DF964 *v0 = &(param0->unk_74); ov19_021DFCF8(v0); @@ -232,28 +231,28 @@ void ov19_021DFC80 (UnkStruct_ov19_021D4DF0 * param0) ov19_021DFD08(v0, UnkEnum_021DFB94_45); } -void ov19_021DFCE4 (UnkStruct_ov19_021D4DF0 * param0, u32 param1) +void ov19_021DFCE4(UnkStruct_ov19_021D4DF0 *param0, u32 param1) { - UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74); + UnkStruct_ov19_021DF964 *v0 = &(param0->unk_74); v0->unk_22 ^= (1 << param1); } -static void ov19_021DFCF8 (UnkStruct_ov19_021DF964 * param0) +static void ov19_021DFCF8(UnkStruct_ov19_021DF964 *param0) { param0->unk_21 = 0; param0->unk_20 = 0; } -static void ov19_021DFD08 (UnkStruct_ov19_021DF964 * param0, UnkEnum_021DFB94 param1) +static void ov19_021DFD08(UnkStruct_ov19_021DF964 *param0, UnkEnum_021DFB94 param1) { if (param0->unk_21 < 8) { param0->unk_00[param0->unk_21++] = param1; } } -int ov19_021DFD2C (UnkStruct_ov19_021D4DF0 * param0) +int ov19_021DFD2C(UnkStruct_ov19_021D4DF0 *param0) { - UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74); + UnkStruct_ov19_021DF964 *v0 = &(param0->unk_74); if (gCoreSys.pressedKeys & PAD_KEY_UP) { if (v0->unk_20) { @@ -288,14 +287,14 @@ int ov19_021DFD2C (UnkStruct_ov19_021D4DF0 * param0) return -3; } -UnkEnum_021DFB94 ov19_021DFDDC (UnkStruct_ov19_021D4DF0 * param0) +UnkEnum_021DFB94 ov19_021DFDDC(UnkStruct_ov19_021D4DF0 *param0) { - UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74); + UnkStruct_ov19_021DF964 *v0 = &(param0->unk_74); return v0->unk_00[v0->unk_20]; } -UnkEnum_021DFB94 ov19_021DFDEC (UnkStruct_ov19_021D4DF0 * param0) +UnkEnum_021DFB94 ov19_021DFDEC(UnkStruct_ov19_021D4DF0 *param0) { - UnkStruct_ov19_021DF964 * v0 = &(param0->unk_74); + UnkStruct_ov19_021DF964 *v0 = &(param0->unk_74); return v0->unk_00[0]; } diff --git a/src/overlay020/ov20_021D0D80.c b/src/overlay020/ov20_021D0D80.c index ce9e019679..bcf2d295ed 100644 --- a/src/overlay020/ov20_021D0D80.c +++ b/src/overlay020/ov20_021D0D80.c @@ -1,31 +1,31 @@ +#include "overlay020/ov20_021D0D80.h" + #include #include -#include "core_sys.h" - -#include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_decls/struct_0209747C_decl.h" #include "struct_decls/struct_020998EC_decl.h" +#include "struct_defs/sentence.h" + +#include "overlay020/ov20_021D2098.h" +#include "overlay020/ov20_021D5044.h" #include "overlay020/struct_ov20_021D2128_decl.h" -#include "struct_defs/sentence.h" +#include "core_sys.h" +#include "heap.h" +#include "overlay_manager.h" +#include "strbuf.h" #include "touch_screen.h" - #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" #include "unk_02014A84.h" -#include "heap.h" #include "unk_02023FCC.h" #include "unk_0209747C.h" #include "unk_020998EC.h" -#include "overlay020/ov20_021D0D80.h" -#include "overlay020/ov20_021D2098.h" -#include "overlay020/ov20_021D5044.h" -typedef int (* UnkFuncPtr_ov20_021D1034)(UnkStruct_ov20_021D16E8 *, int *); -typedef void (* UnkFuncPtr_ov20_021D1C4C)(UnkStruct_ov20_021D16E8 *, int *); +typedef int (*UnkFuncPtr_ov20_021D1034)(UnkStruct_ov20_021D16E8 *, int *); +typedef void (*UnkFuncPtr_ov20_021D1C4C)(UnkStruct_ov20_021D16E8 *, int *); typedef struct { u8 unk_00; @@ -48,12 +48,12 @@ typedef struct { } UnkStruct_ov20_021D0F64; typedef struct UnkStruct_ov20_021D16E8_t { - UnkStruct_0209747C * unk_00; + UnkStruct_0209747C *unk_00; u32 unk_04; Sentence unk_08; u16 unk_10[2]; - UnkStruct_ov20_021D2128 * unk_14; - UnkStruct_020998EC * unk_18; + UnkStruct_ov20_021D2128 *unk_14; + UnkStruct_020998EC *unk_18; int unk_1C; UnkFuncPtr_ov20_021D1034 unk_20; UnkFuncPtr_ov20_021D1034 unk_24; @@ -64,7 +64,7 @@ typedef struct UnkStruct_ov20_021D16E8_t { u16 unk_34; int unk_38; int unk_3C; - UnkStruct_02023FCC * unk_40; + UnkStruct_02023FCC *unk_40; BOOL unk_44; BOOL unk_48; u16 unk_4C; @@ -78,50 +78,50 @@ typedef struct UnkStruct_ov20_021D16E8_t { UnkStruct_ov20_021D1F34 unk_66; } UnkStruct_ov20_021D16E8; -static void ov20_021D0E38(u32 param0, u32 param1, void * param2); -static UnkStruct_ov20_021D16E8 * ov20_021D0EC8(OverlayManager * param0); -static void ov20_021D0F64(UnkStruct_ov20_021D0F64 * param0, Sentence * param1); -static void ov20_021D0F88(UnkStruct_ov20_021D0F64 * param0, Sentence * param1); -static void ov20_021D0FCC(UnkStruct_ov20_021D0F64 * param0, Sentence * param1); -static void ov20_021D1014(UnkStruct_ov20_021D16E8 * param0, OverlayManager * param1); -static void ov20_021D1034(UnkStruct_ov20_021D16E8 * param0, UnkFuncPtr_ov20_021D1034 param1); -static int ov20_021D103C(UnkStruct_ov20_021D16E8 * param0, int * param1); -static int ov20_021D1050(UnkStruct_ov20_021D16E8 * param0, int * param1); -static int ov20_021D1130(UnkStruct_ov20_021D16E8 * param0, int * param1); -static int ov20_021D1260(UnkStruct_ov20_021D16E8 * param0, int * param1); -static int ov20_021D1468(UnkStruct_ov20_021D16E8 * param0, int * param1); -static int ov20_021D15A0(UnkStruct_ov20_021D16E8 * param0, int * param1); -static BOOL ov20_021D16E8(UnkStruct_ov20_021D16E8 * param0); -static BOOL ov20_021D1720(UnkStruct_ov20_021D16E8 * param0); -static BOOL ov20_021D1738(UnkStruct_ov20_021D16E8 * param0); -static BOOL ov20_021D17F0(UnkStruct_ov20_021D16E8 * param0); -static void ov20_021D1884(UnkStruct_ov20_021D18BC * param0, UnkStruct_ov20_021D16E8 * param1); -static u32 ov20_021D18BC(const UnkStruct_ov20_021D18BC * param0); -static u32 ov20_021D18C8(const UnkStruct_ov20_021D18BC * param0); -static int ov20_021D18D8(const UnkStruct_ov20_021D18BC * param0); -static int ov20_021D18DC(const UnkStruct_ov20_021D18BC * param0); -static int ov20_021D18E0(const UnkStruct_ov20_021D18BC * param0); -static int ov20_021D18E4(UnkStruct_ov20_021D16E8 * param0, int * param1); -static int ov20_021D1A68(UnkStruct_ov20_021D18BC * param0, u16 param1); -static int ov20_021D1B48(UnkStruct_ov20_021D18BC * param0); -static int ov20_021D1B70(UnkStruct_ov20_021D18BC * param0); -static BOOL ov20_021D1BB0(UnkStruct_ov20_021D16E8 * param0); -static int ov20_021D1C18(UnkStruct_ov20_021D16E8 * param0, int * param1); -static void ov20_021D1C4C(UnkStruct_ov20_021D16E8 * param0, UnkFuncPtr_ov20_021D1C4C param1); -static void ov20_021D1C54(UnkStruct_ov20_021D16E8 * param0); -static void ov20_021D1C5C(UnkStruct_ov20_021D16E8 * param0, int * param1); -static void ov20_021D1C90(UnkStruct_ov20_021D16E8 * param0, int * param1); -static void ov20_021D1DBC(UnkStruct_ov20_021D16E8 * param0, int * param1); -static BOOL ov20_021D1E70(UnkStruct_ov20_021D16E8 * param0); -static BOOL ov20_021D1E8C(UnkStruct_ov20_021D16E8 * param0); -static void ov20_021D1ED4(UnkStruct_ov20_021D1F34 * param0, int param1, int param2); -static int ov20_021D1EDC(UnkStruct_ov20_021D1F34 * param0, u16 param1); -static u32 ov20_021D1F34(const UnkStruct_ov20_021D1F34 * param0); -static void ov20_021D1F38(UnkStruct_ov20_021D16E8 * param0, int * param1); - -int ov20_021D0D80 (OverlayManager * param0, int * param1) +static void ov20_021D0E38(u32 param0, u32 param1, void *param2); +static UnkStruct_ov20_021D16E8 *ov20_021D0EC8(OverlayManager *param0); +static void ov20_021D0F64(UnkStruct_ov20_021D0F64 *param0, Sentence *param1); +static void ov20_021D0F88(UnkStruct_ov20_021D0F64 *param0, Sentence *param1); +static void ov20_021D0FCC(UnkStruct_ov20_021D0F64 *param0, Sentence *param1); +static void ov20_021D1014(UnkStruct_ov20_021D16E8 *param0, OverlayManager *param1); +static void ov20_021D1034(UnkStruct_ov20_021D16E8 *param0, UnkFuncPtr_ov20_021D1034 param1); +static int ov20_021D103C(UnkStruct_ov20_021D16E8 *param0, int *param1); +static int ov20_021D1050(UnkStruct_ov20_021D16E8 *param0, int *param1); +static int ov20_021D1130(UnkStruct_ov20_021D16E8 *param0, int *param1); +static int ov20_021D1260(UnkStruct_ov20_021D16E8 *param0, int *param1); +static int ov20_021D1468(UnkStruct_ov20_021D16E8 *param0, int *param1); +static int ov20_021D15A0(UnkStruct_ov20_021D16E8 *param0, int *param1); +static BOOL ov20_021D16E8(UnkStruct_ov20_021D16E8 *param0); +static BOOL ov20_021D1720(UnkStruct_ov20_021D16E8 *param0); +static BOOL ov20_021D1738(UnkStruct_ov20_021D16E8 *param0); +static BOOL ov20_021D17F0(UnkStruct_ov20_021D16E8 *param0); +static void ov20_021D1884(UnkStruct_ov20_021D18BC *param0, UnkStruct_ov20_021D16E8 *param1); +static u32 ov20_021D18BC(const UnkStruct_ov20_021D18BC *param0); +static u32 ov20_021D18C8(const UnkStruct_ov20_021D18BC *param0); +static int ov20_021D18D8(const UnkStruct_ov20_021D18BC *param0); +static int ov20_021D18DC(const UnkStruct_ov20_021D18BC *param0); +static int ov20_021D18E0(const UnkStruct_ov20_021D18BC *param0); +static int ov20_021D18E4(UnkStruct_ov20_021D16E8 *param0, int *param1); +static int ov20_021D1A68(UnkStruct_ov20_021D18BC *param0, u16 param1); +static int ov20_021D1B48(UnkStruct_ov20_021D18BC *param0); +static int ov20_021D1B70(UnkStruct_ov20_021D18BC *param0); +static BOOL ov20_021D1BB0(UnkStruct_ov20_021D16E8 *param0); +static int ov20_021D1C18(UnkStruct_ov20_021D16E8 *param0, int *param1); +static void ov20_021D1C4C(UnkStruct_ov20_021D16E8 *param0, UnkFuncPtr_ov20_021D1C4C param1); +static void ov20_021D1C54(UnkStruct_ov20_021D16E8 *param0); +static void ov20_021D1C5C(UnkStruct_ov20_021D16E8 *param0, int *param1); +static void ov20_021D1C90(UnkStruct_ov20_021D16E8 *param0, int *param1); +static void ov20_021D1DBC(UnkStruct_ov20_021D16E8 *param0, int *param1); +static BOOL ov20_021D1E70(UnkStruct_ov20_021D16E8 *param0); +static BOOL ov20_021D1E8C(UnkStruct_ov20_021D16E8 *param0); +static void ov20_021D1ED4(UnkStruct_ov20_021D1F34 *param0, int param1, int param2); +static int ov20_021D1EDC(UnkStruct_ov20_021D1F34 *param0, u16 param1); +static u32 ov20_021D1F34(const UnkStruct_ov20_021D1F34 *param0); +static void ov20_021D1F38(UnkStruct_ov20_021D16E8 *param0, int *param1); + +int ov20_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov20_021D16E8 * v0; + UnkStruct_ov20_021D16E8 *v0; switch (*param1) { case 0: @@ -150,9 +150,9 @@ int ov20_021D0D80 (OverlayManager * param0, int * param1) return 0; } -int ov20_021D0DF8 (OverlayManager * param0, int * param1) +int ov20_021D0DF8(OverlayManager *param0, int *param1) { - UnkStruct_ov20_021D16E8 * v0 = OverlayManager_Data(param0); + UnkStruct_ov20_021D16E8 *v0 = OverlayManager_Data(param0); v0->unk_30 = gCoreSys.pressedKeys; v0->unk_32 = gCoreSys.heldKeys; @@ -170,9 +170,9 @@ int ov20_021D0DF8 (OverlayManager * param0, int * param1) return 0; } -static void ov20_021D0E38 (u32 param0, u32 param1, void * param2) +static void ov20_021D0E38(u32 param0, u32 param1, void *param2) { - UnkStruct_ov20_021D16E8 * v0 = param2; + UnkStruct_ov20_021D16E8 *v0 = param2; switch (param1) { case 0: @@ -212,7 +212,7 @@ static void ov20_021D0E38 (u32 param0, u32 param1, void * param2) } } -int ov20_021D0EA8 (OverlayManager * param0, int * param1) +int ov20_021D0EA8(OverlayManager *param0, int *param1) { ov20_021D1014(OverlayManager_Data(param0), param0); @@ -222,16 +222,16 @@ int ov20_021D0EA8 (OverlayManager * param0, int * param1) return 1; } -static UnkStruct_ov20_021D16E8 * ov20_021D0EC8 (OverlayManager * param0) +static UnkStruct_ov20_021D16E8 *ov20_021D0EC8(OverlayManager *param0) { static const TouchScreenHitTable v0[] = { - {24, 80, 24, 112}, - {112, 168, 24, 112}, - {40, 72, 176, 208}, - {120, 152, 176, 208}, - {0xff, 0, 0, 0}, + { 24, 80, 24, 112 }, + { 112, 168, 24, 112 }, + { 40, 72, 176, 208 }, + { 120, 152, 176, 208 }, + { 0xff, 0, 0, 0 }, }; - UnkStruct_ov20_021D16E8 * v1; + UnkStruct_ov20_021D16E8 *v1; v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov20_021D16E8), 34); @@ -261,14 +261,14 @@ static UnkStruct_ov20_021D16E8 * ov20_021D0EC8 (OverlayManager * param0) return v1; } -static void ov20_021D0F64 (UnkStruct_ov20_021D0F64 * param0, Sentence * param1) +static void ov20_021D0F64(UnkStruct_ov20_021D0F64 *param0, Sentence *param1) { param0->unk_00 = sub_02014C80(param1); param0->unk_03 = sub_02014CD4(param0->unk_00); param0->unk_02 = sub_02014C84(param1); } -static void ov20_021D0F88 (UnkStruct_ov20_021D0F64 * param0, Sentence * param1) +static void ov20_021D0F88(UnkStruct_ov20_021D0F64 *param0, Sentence *param1) { param0->unk_02++; @@ -286,7 +286,7 @@ static void ov20_021D0F88 (UnkStruct_ov20_021D0F64 * param0, Sentence * param1) sub_02014CE0(param1, param0->unk_00, param0->unk_02); } -static void ov20_021D0FCC (UnkStruct_ov20_021D0F64 * param0, Sentence * param1) +static void ov20_021D0FCC(UnkStruct_ov20_021D0F64 *param0, Sentence *param1) { param0->unk_02--; @@ -304,7 +304,7 @@ static void ov20_021D0FCC (UnkStruct_ov20_021D0F64 * param0, Sentence * param1) sub_02014CE0(param1, param0->unk_00, param0->unk_02); } -static void ov20_021D1014 (UnkStruct_ov20_021D16E8 * param0, OverlayManager * param1) +static void ov20_021D1014(UnkStruct_ov20_021D16E8 *param0, OverlayManager *param1) { sub_02024034(param0->unk_40); ov20_021D2128(param0->unk_14); @@ -312,22 +312,24 @@ static void ov20_021D1014 (UnkStruct_ov20_021D16E8 * param0, OverlayManager * pa OverlayManager_FreeData(param1); } -static void ov20_021D1034 (UnkStruct_ov20_021D16E8 * param0, UnkFuncPtr_ov20_021D1034 param1) +static void ov20_021D1034(UnkStruct_ov20_021D16E8 *param0, UnkFuncPtr_ov20_021D1034 param1) { param0->unk_20 = param1; param0->unk_1C = 0; } -static int ov20_021D103C (UnkStruct_ov20_021D16E8 * param0, int * param1) +static int ov20_021D103C(UnkStruct_ov20_021D16E8 *param0, int *param1) { static const UnkFuncPtr_ov20_021D1034 v0[] = { - ov20_021D1050, ov20_021D1130, ov20_021D1260, + ov20_021D1050, + ov20_021D1130, + ov20_021D1260, }; return v0[param0->unk_04](param0, param1); } -static int ov20_021D1050 (UnkStruct_ov20_021D16E8 * param0, int * param1) +static int ov20_021D1050(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -373,7 +375,7 @@ static int ov20_021D1050 (UnkStruct_ov20_021D16E8 * param0, int * param1) return 0; } -static int ov20_021D1130 (UnkStruct_ov20_021D16E8 * param0, int * param1) +static int ov20_021D1130(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -437,7 +439,7 @@ static int ov20_021D1130 (UnkStruct_ov20_021D16E8 * param0, int * param1) return 0; } -static int ov20_021D1260 (UnkStruct_ov20_021D16E8 * param0, int * param1) +static int ov20_021D1260(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -532,7 +534,7 @@ static int ov20_021D1260 (UnkStruct_ov20_021D16E8 * param0, int * param1) return 0; } -static int ov20_021D1468 (UnkStruct_ov20_021D16E8 * param0, int * param1) +static int ov20_021D1468(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -604,7 +606,7 @@ static int ov20_021D1468 (UnkStruct_ov20_021D16E8 * param0, int * param1) return 0; } -static int ov20_021D15A0 (UnkStruct_ov20_021D16E8 * param0, int * param1) +static int ov20_021D15A0(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -668,7 +670,7 @@ static int ov20_021D15A0 (UnkStruct_ov20_021D16E8 * param0, int * param1) return 0; } -static BOOL ov20_021D16E8 (UnkStruct_ov20_021D16E8 * param0) +static BOOL ov20_021D16E8(UnkStruct_ov20_021D16E8 *param0) { if (param0->unk_65 == 0) { return sub_02099CA0(param0->unk_18, param0->unk_50) != 0; @@ -677,16 +679,17 @@ static BOOL ov20_021D16E8 (UnkStruct_ov20_021D16E8 * param0) } } -static BOOL ov20_021D1720 (UnkStruct_ov20_021D16E8 * param0) +static BOOL ov20_021D1720(UnkStruct_ov20_021D16E8 *param0) { - static BOOL(*const v0[])(UnkStruct_ov20_021D16E8 *) = { - ov20_021D1738, ov20_021D17F0, + static BOOL (*const v0[])(UnkStruct_ov20_021D16E8 *) = { + ov20_021D1738, + ov20_021D17F0, }; return v0[param0->unk_65](param0); } -static BOOL ov20_021D1738 (UnkStruct_ov20_021D16E8 * param0) +static BOOL ov20_021D1738(UnkStruct_ov20_021D16E8 *param0) { static const struct { u8 unk_00; @@ -694,19 +697,19 @@ static BOOL ov20_021D1738 (UnkStruct_ov20_021D16E8 * param0) u8 unk_02; u8 unk_03; } v0[] = { - {0xfe, 3, 2, 1}, - {0xfe, 4, 0, 2}, - {0xfe, 5, 1, 0}, - {0, 6, 5, 4}, - {1, 7, 3, 5}, - {2, 8, 4, 3}, - {3, 9, 8, 7}, - {4, 10, 6, 8}, - {5, 11, 7, 6}, - {6, 0xfe, 11, 10}, - {7, 0xfe, 9, 11}, - {8, 0xfe, 10, 9}, - {9, 0, 0xfe, 0xfe}, + { 0xfe, 3, 2, 1 }, + { 0xfe, 4, 0, 2 }, + { 0xfe, 5, 1, 0 }, + { 0, 6, 5, 4 }, + { 1, 7, 3, 5 }, + { 2, 8, 4, 3 }, + { 3, 9, 8, 7 }, + { 4, 10, 6, 8 }, + { 5, 11, 7, 6 }, + { 6, 0xfe, 11, 10 }, + { 7, 0xfe, 9, 11 }, + { 8, 0xfe, 10, 9 }, + { 9, 0, 0xfe, 0xfe }, }; u32 v1 = param0->unk_50; @@ -751,7 +754,7 @@ static BOOL ov20_021D1738 (UnkStruct_ov20_021D16E8 * param0) return 0; } -static BOOL ov20_021D17F0 (UnkStruct_ov20_021D16E8 * param0) +static BOOL ov20_021D17F0(UnkStruct_ov20_021D16E8 *param0) { if (param0->unk_50 != 0xfe) { int v0 = 0xff; @@ -798,7 +801,7 @@ static BOOL ov20_021D17F0 (UnkStruct_ov20_021D16E8 * param0) return 0; } -static void ov20_021D1884 (UnkStruct_ov20_021D18BC * param0, UnkStruct_ov20_021D16E8 * param1) +static void ov20_021D1884(UnkStruct_ov20_021D18BC *param0, UnkStruct_ov20_021D16E8 *param1) { param0->unk_00 = 0; param0->unk_06 = 0; @@ -813,32 +816,32 @@ static void ov20_021D1884 (UnkStruct_ov20_021D18BC * param0, UnkStruct_ov20_021D } } -static u32 ov20_021D18BC (const UnkStruct_ov20_021D18BC * param0) +static u32 ov20_021D18BC(const UnkStruct_ov20_021D18BC *param0) { return (param0->unk_07 * 2) + param0->unk_06; } -static u32 ov20_021D18C8 (const UnkStruct_ov20_021D18BC * param0) +static u32 ov20_021D18C8(const UnkStruct_ov20_021D18BC *param0) { return (param0->unk_00 * 2) + ov20_021D18BC(param0); } -static int ov20_021D18D8 (const UnkStruct_ov20_021D18BC * param0) +static int ov20_021D18D8(const UnkStruct_ov20_021D18BC *param0) { return param0->unk_08; } -static int ov20_021D18DC (const UnkStruct_ov20_021D18BC * param0) +static int ov20_021D18DC(const UnkStruct_ov20_021D18BC *param0) { return param0->unk_00; } -static int ov20_021D18E0 (const UnkStruct_ov20_021D18BC * param0) +static int ov20_021D18E0(const UnkStruct_ov20_021D18BC *param0) { return param0->unk_02; } -static int ov20_021D18E4 (UnkStruct_ov20_021D16E8 * param0, int * param1) +static int ov20_021D18E4(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -921,7 +924,7 @@ static int ov20_021D18E4 (UnkStruct_ov20_021D16E8 * param0, int * param1) return 0; } -static int ov20_021D1A68 (UnkStruct_ov20_021D18BC * param0, u16 param1) +static int ov20_021D1A68(UnkStruct_ov20_021D18BC *param0, u16 param1) { if (param1 & PAD_KEY_DOWN) { if (param0->unk_07 < 4) { @@ -993,7 +996,7 @@ static int ov20_021D1A68 (UnkStruct_ov20_021D18BC * param0, u16 param1) return 0; } -static int ov20_021D1B48 (UnkStruct_ov20_021D18BC * param0) +static int ov20_021D1B48(UnkStruct_ov20_021D18BC *param0) { if (param0->unk_00) { if (param0->unk_00 >= 5) { @@ -1010,7 +1013,7 @@ static int ov20_021D1B48 (UnkStruct_ov20_021D18BC * param0) return 4; } -static int ov20_021D1B70 (UnkStruct_ov20_021D18BC * param0) +static int ov20_021D1B70(UnkStruct_ov20_021D18BC *param0) { if (param0->unk_00 < param0->unk_02) { if ((param0->unk_00 + 5) <= param0->unk_02) { @@ -1032,7 +1035,7 @@ static int ov20_021D1B70 (UnkStruct_ov20_021D18BC * param0) return 4; } -static BOOL ov20_021D1BB0 (UnkStruct_ov20_021D16E8 * param0) +static BOOL ov20_021D1BB0(UnkStruct_ov20_021D16E8 *param0) { u32 v0; u16 v1; @@ -1060,7 +1063,7 @@ static BOOL ov20_021D1BB0 (UnkStruct_ov20_021D16E8 * param0) return ov20_021D1E8C(param0); } -static int ov20_021D1C18 (UnkStruct_ov20_021D16E8 * param0, int * param1) +static int ov20_021D1C18(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -1077,18 +1080,18 @@ static int ov20_021D1C18 (UnkStruct_ov20_021D16E8 * param0, int * param1) return 0; } -static void ov20_021D1C4C (UnkStruct_ov20_021D16E8 * param0, UnkFuncPtr_ov20_021D1C4C param1) +static void ov20_021D1C4C(UnkStruct_ov20_021D16E8 *param0, UnkFuncPtr_ov20_021D1C4C param1) { param0->unk_2C = param1; param0->unk_28 = 0; } -static void ov20_021D1C54 (UnkStruct_ov20_021D16E8 * param0) +static void ov20_021D1C54(UnkStruct_ov20_021D16E8 *param0) { param0->unk_2C = NULL; } -static void ov20_021D1C5C (UnkStruct_ov20_021D16E8 * param0, int * param1) +static void ov20_021D1C5C(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -1103,7 +1106,7 @@ static void ov20_021D1C5C (UnkStruct_ov20_021D16E8 * param0, int * param1) } } -static void ov20_021D1C90 (UnkStruct_ov20_021D16E8 * param0, int * param1) +static void ov20_021D1C90(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -1162,7 +1165,7 @@ static void ov20_021D1C90 (UnkStruct_ov20_021D16E8 * param0, int * param1) } } -static void ov20_021D1DBC (UnkStruct_ov20_021D16E8 * param0, int * param1) +static void ov20_021D1DBC(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -1199,12 +1202,12 @@ static void ov20_021D1DBC (UnkStruct_ov20_021D16E8 * param0, int * param1) } } -static BOOL ov20_021D1E70 (UnkStruct_ov20_021D16E8 * param0) +static BOOL ov20_021D1E70(UnkStruct_ov20_021D16E8 *param0) { return sub_020975A0(param0->unk_00, param0->unk_10, ¶m0->unk_08) == 0; } -static BOOL ov20_021D1E8C (UnkStruct_ov20_021D16E8 * param0) +static BOOL ov20_021D1E8C(UnkStruct_ov20_021D16E8 *param0) { switch (param0->unk_04) { case 0: @@ -1218,13 +1221,13 @@ static BOOL ov20_021D1E8C (UnkStruct_ov20_021D16E8 * param0) return 0; } -static void ov20_021D1ED4 (UnkStruct_ov20_021D1F34 * param0, int param1, int param2) +static void ov20_021D1ED4(UnkStruct_ov20_021D1F34 *param0, int param1, int param2) { param0->unk_00 = param2; param0->unk_01 = param1; } -static int ov20_021D1EDC (UnkStruct_ov20_021D1F34 * param0, u16 param1) +static int ov20_021D1EDC(UnkStruct_ov20_021D1F34 *param0, u16 param1) { if (param1 & PAD_KEY_UP) { if (param0->unk_00 == 0) { @@ -1255,12 +1258,12 @@ static int ov20_021D1EDC (UnkStruct_ov20_021D1F34 * param0, u16 param1) return -1; } -static u32 ov20_021D1F34 (const UnkStruct_ov20_021D1F34 * param0) +static u32 ov20_021D1F34(const UnkStruct_ov20_021D1F34 *param0) { return param0->unk_00; } -static void ov20_021D1F38 (UnkStruct_ov20_021D16E8 * param0, int * param1) +static void ov20_021D1F38(UnkStruct_ov20_021D16E8 *param0, int *param1) { switch (*param1) { case 0: @@ -1279,27 +1282,27 @@ static void ov20_021D1F38 (UnkStruct_ov20_021D16E8 * param0, int * param1) } } -u32 ov20_021D1F84 (const UnkStruct_ov20_021D16E8 * param0) +u32 ov20_021D1F84(const UnkStruct_ov20_021D16E8 *param0) { return param0->unk_04; } -u32 ov20_021D1F88 (const UnkStruct_ov20_021D16E8 * param0) +u32 ov20_021D1F88(const UnkStruct_ov20_021D16E8 *param0) { return sub_02097554(param0->unk_00); } -u32 ov20_021D1F94 (const UnkStruct_ov20_021D16E8 * param0) +u32 ov20_021D1F94(const UnkStruct_ov20_021D16E8 *param0) { return param0->unk_65; } -u32 ov20_021D1F9C (const UnkStruct_ov20_021D16E8 * param0) +u32 ov20_021D1F9C(const UnkStruct_ov20_021D16E8 *param0) { return sub_02014C80(¶m0->unk_08); } -u16 ov20_021D1FA8 (const UnkStruct_ov20_021D16E8 * param0, int param1) +u16 ov20_021D1FA8(const UnkStruct_ov20_021D16E8 *param0, int param1) { if (param0->unk_04 == 2) { return sub_02014C78(¶m0->unk_08, param1); @@ -1308,27 +1311,27 @@ u16 ov20_021D1FA8 (const UnkStruct_ov20_021D16E8 * param0, int param1) } } -Strbuf* ov20_021D1FC0 (const UnkStruct_ov20_021D16E8 * param0, u32 param1) +Strbuf *ov20_021D1FC0(const UnkStruct_ov20_021D16E8 *param0, u32 param1) { return sub_02014BA0(&(param0->unk_08), param1); } -u32 ov20_021D1FCC (const UnkStruct_ov20_021D16E8 * param0) +u32 ov20_021D1FCC(const UnkStruct_ov20_021D16E8 *param0) { return param0->unk_4E; } -u32 ov20_021D1FD4 (const UnkStruct_ov20_021D16E8 * param0) +u32 ov20_021D1FD4(const UnkStruct_ov20_021D16E8 *param0) { return param0->unk_4C; } -u32 ov20_021D1FDC (const UnkStruct_ov20_021D16E8 * param0) +u32 ov20_021D1FDC(const UnkStruct_ov20_021D16E8 *param0) { return param0->unk_50; } -u32 ov20_021D1FE4 (const UnkStruct_ov20_021D16E8 * param0) +u32 ov20_021D1FE4(const UnkStruct_ov20_021D16E8 *param0) { if (param0->unk_65 == 0) { return sub_02099CA0(param0->unk_18, param0->unk_50); @@ -1337,7 +1340,7 @@ u32 ov20_021D1FE4 (const UnkStruct_ov20_021D16E8 * param0) } } -void ov20_021D2008 (const UnkStruct_ov20_021D16E8 * param0, u32 param1, Strbuf *param2) +void ov20_021D2008(const UnkStruct_ov20_021D16E8 *param0, u32 param1, Strbuf *param2) { if (param0->unk_65 == 0) { sub_02099CA8(param0->unk_18, param0->unk_50, param1, param2); @@ -1346,22 +1349,22 @@ void ov20_021D2008 (const UnkStruct_ov20_021D16E8 * param0, u32 param1, Strbuf * } } -u32 ov20_021D2034 (const UnkStruct_ov20_021D16E8 * param0) +u32 ov20_021D2034(const UnkStruct_ov20_021D16E8 *param0) { return ov20_021D18BC(&(param0->unk_54)); } -int ov20_021D2040 (const UnkStruct_ov20_021D16E8 * param0) +int ov20_021D2040(const UnkStruct_ov20_021D16E8 *param0) { return ov20_021D18D8(&(param0->unk_54)); } -BOOL ov20_021D204C (const UnkStruct_ov20_021D16E8 * param0) +BOOL ov20_021D204C(const UnkStruct_ov20_021D16E8 *param0) { return ov20_021D18DC(&(param0->unk_54)) != 0; } -BOOL ov20_021D2060 (const UnkStruct_ov20_021D16E8 * param0) +BOOL ov20_021D2060(const UnkStruct_ov20_021D16E8 *param0) { int v0, v1; @@ -1371,12 +1374,12 @@ BOOL ov20_021D2060 (const UnkStruct_ov20_021D16E8 * param0) return v0 < v1; } -int ov20_021D2080 (const UnkStruct_ov20_021D16E8 * param0) +int ov20_021D2080(const UnkStruct_ov20_021D16E8 *param0) { return sub_02097558(param0->unk_00); } -u32 ov20_021D208C (const UnkStruct_ov20_021D16E8 * param0) +u32 ov20_021D208C(const UnkStruct_ov20_021D16E8 *param0) { return ov20_021D1F34(¶m0->unk_66); } diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c index d639395ac3..22ff16dd59 100644 --- a/src/overlay020/ov20_021D2098.c +++ b/src/overlay020/ov20_021D2098.c @@ -1,3 +1,5 @@ +#include "overlay020/ov20_021D2098.h" + #include #include @@ -6,109 +8,108 @@ #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_020998EC_decl.h" +#include "struct_defs/struct_0200C738.h" +#include "struct_defs/struct_02099F80.h" + +#include "overlay019/struct_ov19_021DA864.h" +#include "overlay020/ov20_021D0D80.h" +#include "overlay020/ov20_021D2EA4.h" +#include "overlay020/ov20_021D3864.h" +#include "overlay020/ov20_021D3A54.h" +#include "overlay020/ov20_021D40E8.h" +#include "overlay020/ov20_021D4728.h" #include "overlay020/struct_ov20_021D16E8_decl.h" #include "overlay020/struct_ov20_021D30F8_decl.h" #include "overlay020/struct_ov20_021D3980_decl.h" #include "overlay020/struct_ov20_021D3E0C_decl.h" #include "overlay020/struct_ov20_021D4210_decl.h" #include "overlay020/struct_ov20_021D4AD4_decl.h" - -#include "struct_defs/struct_0200C738.h" -#include "struct_defs/struct_02099F80.h" -#include "overlay019/struct_ov19_021DA864.h" #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_0200A784.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "overlay020/ov20_021D0D80.h" -#include "overlay020/ov20_021D2098.h" -#include "overlay020/ov20_021D2EA4.h" -#include "overlay020/ov20_021D3864.h" -#include "overlay020/ov20_021D3A54.h" -#include "overlay020/ov20_021D40E8.h" -#include "overlay020/ov20_021D4728.h" typedef struct UnkStruct_ov20_021D2128_t { - SysTask * unk_00; - SysTask * unk_04; - SysTask * unk_08[4]; - const UnkStruct_ov20_021D16E8 * unk_18; - const UnkStruct_020998EC * unk_1C; - BGL * unk_20; - GraphicElementManager * unk_24; + SysTask *unk_00; + SysTask *unk_04; + SysTask *unk_08[4]; + const UnkStruct_ov20_021D16E8 *unk_18; + const UnkStruct_020998EC *unk_1C; + BGL *unk_20; + GraphicElementManager *unk_24; UnkStruct_0200C738 unk_28; NNSG2dImageProxy unk_1B4[2]; NNSG2dImagePaletteProxy unk_1FC[2]; - NNSG2dCellDataBank * unk_224[2]; - NNSG2dCellAnimBankData * unk_22C[2]; - void * unk_234[2]; - void * unk_23C[2]; - UnkStruct_ov20_021D30F8 * unk_244; - UnkStruct_ov20_021D3980 * unk_248; - UnkStruct_ov20_021D3E0C * unk_24C; - UnkStruct_ov20_021D4210 * unk_250; - UnkStruct_ov20_021D4AD4 * unk_254; + NNSG2dCellDataBank *unk_224[2]; + NNSG2dCellAnimBankData *unk_22C[2]; + void *unk_234[2]; + void *unk_23C[2]; + UnkStruct_ov20_021D30F8 *unk_244; + UnkStruct_ov20_021D3980 *unk_248; + UnkStruct_ov20_021D3E0C *unk_24C; + UnkStruct_ov20_021D4210 *unk_250; + UnkStruct_ov20_021D4AD4 *unk_254; } UnkStruct_ov20_021D2128; typedef struct { - UnkStruct_ov20_021D2128 * unk_00; - const UnkStruct_ov20_021D16E8 * unk_04; - const UnkStruct_020998EC * unk_08; + UnkStruct_ov20_021D2128 *unk_00; + const UnkStruct_ov20_021D16E8 *unk_04; + const UnkStruct_020998EC *unk_08; u32 unk_0C; int unk_10; int unk_14; } UnkStruct_ov20_021D2238; -static void ov20_021D2178(SysTask * param0, void * param1); -static void ov20_021D217C(SysTask * param0, void * param1); -static void ov20_021D2238(UnkStruct_ov20_021D2238 * param0); -static void ov20_021D2260(SysTask * param0, void * param1); -static void ov20_021D2370(UnkStruct_ov20_021D2238 * param0, NARC * param1); -static void ov20_021D2414(SysTask * param0, void * param1); -static void ov20_021D24EC(UnkStruct_ov20_021D2238 * param0); -static void ov20_021D2570(SysTask * param0, void * param1); -static void ov20_021D25C0(SysTask * param0, void * param1); -static void ov20_021D25EC(SysTask * param0, void * param1); -static void ov20_021D2630(SysTask * param0, void * param1); -static void ov20_021D2660(SysTask * param0, void * param1); -static void ov20_021D26D8(SysTask * param0, void * param1); -static void ov20_021D2740(SysTask * param0, void * param1); -static void ov20_021D27E4(SysTask * param0, void * param1); -static void ov20_021D2848(SysTask * param0, void * param1); -static void ov20_021D28E8(SysTask * param0, void * param1); -static void ov20_021D29BC(SysTask * param0, void * param1); -static void ov20_021D2A9C(SysTask * param0, void * param1); -static void ov20_021D2B74(SysTask * param0, void * param1); -static void ov20_021D2B94(SysTask * param0, void * param1); -static void ov20_021D2BB4(SysTask * param0, void * param1); -static void ov20_021D2BD4(SysTask * param0, void * param1); -static void ov20_021D2BF4(SysTask * param0, void * param1); -static void ov20_021D2C44(SysTask * param0, void * param1); -static void ov20_021D2C60(SysTask * param0, void * param1); -static void ov20_021D2CB0(SysTask * param0, void * param1); -static void ov20_021D2D00(SysTask * param0, void * param1); -static void ov20_021D2D1C(SysTask * param0, void * param1); -static void ov20_021D2D3C(SysTask * param0, void * param1); -static void ov20_021D2D84(SysTask * param0, void * param1); -static void ov20_021D2DA0(SysTask * param0, void * param1); -static void ov20_021D2DBC(SysTask * param0, void * param1); -static void ov20_021D2DD8(SysTask * param0, void * param1); - -UnkStruct_ov20_021D2128 * ov20_021D2098 (const UnkStruct_ov20_021D16E8 * param0, const UnkStruct_020998EC * param1) -{ - UnkStruct_ov20_021D2128 * v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D2128)); +static void ov20_021D2178(SysTask *param0, void *param1); +static void ov20_021D217C(SysTask *param0, void *param1); +static void ov20_021D2238(UnkStruct_ov20_021D2238 *param0); +static void ov20_021D2260(SysTask *param0, void *param1); +static void ov20_021D2370(UnkStruct_ov20_021D2238 *param0, NARC *param1); +static void ov20_021D2414(SysTask *param0, void *param1); +static void ov20_021D24EC(UnkStruct_ov20_021D2238 *param0); +static void ov20_021D2570(SysTask *param0, void *param1); +static void ov20_021D25C0(SysTask *param0, void *param1); +static void ov20_021D25EC(SysTask *param0, void *param1); +static void ov20_021D2630(SysTask *param0, void *param1); +static void ov20_021D2660(SysTask *param0, void *param1); +static void ov20_021D26D8(SysTask *param0, void *param1); +static void ov20_021D2740(SysTask *param0, void *param1); +static void ov20_021D27E4(SysTask *param0, void *param1); +static void ov20_021D2848(SysTask *param0, void *param1); +static void ov20_021D28E8(SysTask *param0, void *param1); +static void ov20_021D29BC(SysTask *param0, void *param1); +static void ov20_021D2A9C(SysTask *param0, void *param1); +static void ov20_021D2B74(SysTask *param0, void *param1); +static void ov20_021D2B94(SysTask *param0, void *param1); +static void ov20_021D2BB4(SysTask *param0, void *param1); +static void ov20_021D2BD4(SysTask *param0, void *param1); +static void ov20_021D2BF4(SysTask *param0, void *param1); +static void ov20_021D2C44(SysTask *param0, void *param1); +static void ov20_021D2C60(SysTask *param0, void *param1); +static void ov20_021D2CB0(SysTask *param0, void *param1); +static void ov20_021D2D00(SysTask *param0, void *param1); +static void ov20_021D2D1C(SysTask *param0, void *param1); +static void ov20_021D2D3C(SysTask *param0, void *param1); +static void ov20_021D2D84(SysTask *param0, void *param1); +static void ov20_021D2DA0(SysTask *param0, void *param1); +static void ov20_021D2DBC(SysTask *param0, void *param1); +static void ov20_021D2DD8(SysTask *param0, void *param1); + +UnkStruct_ov20_021D2128 *ov20_021D2098(const UnkStruct_ov20_021D16E8 *param0, const UnkStruct_020998EC *param1) +{ + UnkStruct_ov20_021D2128 *v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D2128)); if (v0) { int v1; @@ -135,7 +136,7 @@ UnkStruct_ov20_021D2128 * ov20_021D2098 (const UnkStruct_ov20_021D16E8 * param0, return v0; } -void ov20_021D2128 (UnkStruct_ov20_021D2128 * param0) +void ov20_021D2128(UnkStruct_ov20_021D2128 *param0) { if (param0) { int v0; @@ -159,19 +160,19 @@ void ov20_021D2128 (UnkStruct_ov20_021D2128 * param0) } } -SysTask * ov20_021D2170 (SysTaskFunc param0, void * param1, int param2) +SysTask *ov20_021D2170(SysTaskFunc param0, void *param1, int param2) { return SysTask_ExecuteOnVBlank(param0, param1, param2); } -static void ov20_021D2178 (SysTask * param0, void * param1) +static void ov20_021D2178(SysTask *param0, void *param1) { return; } -static void ov20_021D217C (SysTask * param0, void * param1) +static void ov20_021D217C(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2128 * v0 = param1; + UnkStruct_ov20_021D2128 *v0 = param1; sub_020219F8(v0->unk_24); sub_0200A858(); @@ -179,7 +180,7 @@ static void ov20_021D217C (SysTask * param0, void * param1) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -void ov20_021D21A0 (UnkStruct_ov20_021D2128 * param0, int param1) +void ov20_021D21A0(UnkStruct_ov20_021D2128 *param0, int param1) { static const SysTaskFunc v0[] = { ov20_021D2260, @@ -214,7 +215,7 @@ void ov20_021D21A0 (UnkStruct_ov20_021D2128 * param0, int param1) }; if (param1 < NELEMS(v0)) { - UnkStruct_ov20_021D2238 * v1 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D2238)); + UnkStruct_ov20_021D2238 *v1 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D2238)); if (v1) { int v2; @@ -238,7 +239,7 @@ void ov20_021D21A0 (UnkStruct_ov20_021D2128 * param0, int param1) } } -BOOL ov20_021D21F8 (UnkStruct_ov20_021D2128 * param0) +BOOL ov20_021D21F8(UnkStruct_ov20_021D2128 *param0) { int v0; @@ -251,13 +252,13 @@ BOOL ov20_021D21F8 (UnkStruct_ov20_021D2128 * param0) return 1; } -BOOL ov20_021D2210 (UnkStruct_ov20_021D2128 * param0, int param1) +BOOL ov20_021D2210(UnkStruct_ov20_021D2128 *param0, int param1) { int v0; for (v0 = 0; v0 < 4; v0++) { if (param0->unk_08[v0] != NULL) { - UnkStruct_ov20_021D2238 * v1 = SysTask_GetParam(param0->unk_08[v0]); + UnkStruct_ov20_021D2238 *v1 = SysTask_GetParam(param0->unk_08[v0]); if (v1->unk_0C == param1) { return 0; @@ -268,17 +269,17 @@ BOOL ov20_021D2210 (UnkStruct_ov20_021D2128 * param0, int param1) return 1; } -static void ov20_021D2238 (UnkStruct_ov20_021D2238 * param0) +static void ov20_021D2238(UnkStruct_ov20_021D2238 *param0) { SysTask_Done(param0->unk_00->unk_08[param0->unk_10]); param0->unk_00->unk_08[param0->unk_10] = NULL; Heap_FreeToHeap(param0); } -static void ov20_021D2260 (SysTask * param0, void * param1) +static void ov20_021D2260(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - NARC * v1; + UnkStruct_ov20_021D2238 *v0 = param1; + NARC *v1; GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -317,9 +318,9 @@ static void ov20_021D2260 (SysTask * param0, void * param1) ov20_021D2238(v0); } -static void ov20_021D2370 (UnkStruct_ov20_021D2238 * param0, NARC * param1) +static void ov20_021D2370(UnkStruct_ov20_021D2238 *param0, NARC *param1) { - UnkStruct_ov20_021D2128 * v0 = param0->unk_00; + UnkStruct_ov20_021D2128 *v0 = param0->unk_00; NNS_G2dInitImagePaletteProxy(&(v0->unk_1FC[0])); NNS_G2dInitImagePaletteProxy(&(v0->unk_1FC[1])); @@ -336,10 +337,10 @@ static void ov20_021D2370 (UnkStruct_ov20_021D2238 * param0, NARC * param1) v0->unk_23C[1] = NULL; } -static void ov20_021D2414 (SysTask * param0, void * param1) +static void ov20_021D2414(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -378,7 +379,7 @@ static void ov20_021D2414 (SysTask * param0, void * param1) } } -static void ov20_021D24EC (UnkStruct_ov20_021D2238 * param0) +static void ov20_021D24EC(UnkStruct_ov20_021D2238 *param0) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -473,7 +474,7 @@ static void ov20_021D24EC (UnkStruct_ov20_021D2238 * param0) 0, 0 }; - UnkStruct_ov20_021D2128 * v7 = param0->unk_00; + UnkStruct_ov20_021D2128 *v7 = param0->unk_00; GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); @@ -489,10 +490,10 @@ static void ov20_021D24EC (UnkStruct_ov20_021D2238 * param0) sub_020183C4(v7->unk_20, 4, &v6, 0); } -static void ov20_021D2570 (SysTask * param0, void * param1) +static void ov20_021D2570(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -510,10 +511,10 @@ static void ov20_021D2570 (SysTask * param0, void * param1) } } -static void ov20_021D25C0 (SysTask * param0, void * param1) +static void ov20_021D25C0(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D3228(v1->unk_244); ov20_021D3700(v1->unk_244, ov20_021D1FCC(v0->unk_04)); @@ -521,10 +522,10 @@ static void ov20_021D25C0 (SysTask * param0, void * param1) ov20_021D2238(v0); } -static void ov20_021D25EC (SysTask * param0, void * param1) +static void ov20_021D25EC(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D369C(v1->unk_244, 0); ov20_021D36B0(v1->unk_244); @@ -535,10 +536,10 @@ static void ov20_021D25EC (SysTask * param0, void * param1) ov20_021D2238(v0); } -static void ov20_021D2630 (SysTask * param0, void * param1) +static void ov20_021D2630(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D39D4(v1->unk_248, 0); ov20_021D36D0(v1->unk_244); @@ -546,10 +547,10 @@ static void ov20_021D2630 (SysTask * param0, void * param1) ov20_021D2238(v0); } -static void ov20_021D2660 (SysTask * param0, void * param1) +static void ov20_021D2660(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -569,10 +570,10 @@ static void ov20_021D2660 (SysTask * param0, void * param1) } } -static void ov20_021D26D8 (SysTask * param0, void * param1) +static void ov20_021D26D8(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -593,10 +594,10 @@ static void ov20_021D26D8 (SysTask * param0, void * param1) } } -static void ov20_021D2740 (SysTask * param0, void * param1) +static void ov20_021D2740(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -624,10 +625,10 @@ static void ov20_021D2740 (SysTask * param0, void * param1) } } -static void ov20_021D27E4 (SysTask * param0, void * param1) +static void ov20_021D27E4(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -646,10 +647,10 @@ static void ov20_021D27E4 (SysTask * param0, void * param1) } } -static void ov20_021D2848 (SysTask * param0, void * param1) +static void ov20_021D2848(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -675,10 +676,10 @@ static void ov20_021D2848 (SysTask * param0, void * param1) } } -static void ov20_021D28E8 (SysTask * param0, void * param1) +static void ov20_021D28E8(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -712,10 +713,10 @@ static void ov20_021D28E8 (SysTask * param0, void * param1) } } -static void ov20_021D29BC (SysTask * param0, void * param1) +static void ov20_021D29BC(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -749,10 +750,10 @@ static void ov20_021D29BC (SysTask * param0, void * param1) } } -static void ov20_021D2A9C (SysTask * param0, void * param1) +static void ov20_021D2A9C(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -785,46 +786,46 @@ static void ov20_021D2A9C (SysTask * param0, void * param1) } } -static void ov20_021D2B74 (SysTask * param0, void * param1) +static void ov20_021D2B74(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D3700(v1->unk_244, ov20_021D1FCC(v1->unk_18)); ov20_021D2238(v0); } -static void ov20_021D2B94 (SysTask * param0, void * param1) +static void ov20_021D2B94(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D39EC(v1->unk_248, ov20_021D1FD4(v1->unk_18)); ov20_021D2238(v0); } -static void ov20_021D2BB4 (SysTask * param0, void * param1) +static void ov20_021D2BB4(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D3E74(v1->unk_24C, ov20_021D1FDC(v1->unk_18)); ov20_021D2238(v0); } -static void ov20_021D2BD4 (SysTask * param0, void * param1) +static void ov20_021D2BD4(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D4480(v1->unk_250, ov20_021D2034(v1->unk_18)); ov20_021D2238(v0); } -static void ov20_021D2BF4 (SysTask * param0, void * param1) +static void ov20_021D2BF4(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; switch (v0->unk_14) { case 0: @@ -840,19 +841,19 @@ static void ov20_021D2BF4 (SysTask * param0, void * param1) } } -static void ov20_021D2C44 (SysTask * param0, void * param1) +static void ov20_021D2C44(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D3578(v1->unk_244, 0); ov20_021D2238(v0); } -static void ov20_021D2C60 (SysTask * param0, void * param1) +static void ov20_021D2C60(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D3578(v1->unk_244, 2); ov20_021D3790(v1->unk_244, ov20_021D208C(v0->unk_04)); @@ -866,10 +867,10 @@ static void ov20_021D2C60 (SysTask * param0, void * param1) ov20_021D2238(v0); } -static void ov20_021D2CB0 (SysTask * param0, void * param1) +static void ov20_021D2CB0(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D3578(v1->unk_244, 3); ov20_021D3790(v1->unk_244, ov20_021D208C(v0->unk_04)); @@ -883,28 +884,28 @@ static void ov20_021D2CB0 (SysTask * param0, void * param1) ov20_021D2238(v0); } -static void ov20_021D2D00 (SysTask * param0, void * param1) +static void ov20_021D2D00(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D3578(v1->unk_244, 1); ov20_021D2238(v0); } -static void ov20_021D2D1C (SysTask * param0, void * param1) +static void ov20_021D2D1C(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D381C(v1->unk_244, ov20_021D208C(v0->unk_04)); ov20_021D2238(v0); } -static void ov20_021D2D3C (SysTask * param0, void * param1) +static void ov20_021D2D3C(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D3578(v1->unk_244, 0); ov20_021D384C(v1->unk_244); @@ -918,58 +919,58 @@ static void ov20_021D2D3C (SysTask * param0, void * param1) ov20_021D2238(v0); } -static void ov20_021D2D84 (SysTask * param0, void * param1) +static void ov20_021D2D84(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D4DF4(v1->unk_254, 0, 1); ov20_021D2238(v0); } -static void ov20_021D2DA0 (SysTask * param0, void * param1) +static void ov20_021D2DA0(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D4DF4(v1->unk_254, 1, 1); ov20_021D2238(v0); } -static void ov20_021D2DBC (SysTask * param0, void * param1) +static void ov20_021D2DBC(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D4DF4(v1->unk_254, 0, 0); ov20_021D2238(v0); } -static void ov20_021D2DD8 (SysTask * param0, void * param1) +static void ov20_021D2DD8(SysTask *param0, void *param1) { - UnkStruct_ov20_021D2238 * v0 = param1; - UnkStruct_ov20_021D2128 * v1 = v0->unk_00; + UnkStruct_ov20_021D2238 *v0 = param1; + UnkStruct_ov20_021D2128 *v1 = v0->unk_00; ov20_021D4DF4(v1->unk_254, 1, 0); ov20_021D2238(v0); } -u32 ov20_021D2DF4 (UnkStruct_ov20_021D2128 * param0) +u32 ov20_021D2DF4(UnkStruct_ov20_021D2128 *param0) { return ov20_021D3574(param0->unk_244); } -BGL * ov20_021D2E04 (UnkStruct_ov20_021D2128 * param0) +BGL *ov20_021D2E04(UnkStruct_ov20_021D2128 *param0) { return param0->unk_20; } -GraphicElementManager * ov20_021D2E08 (UnkStruct_ov20_021D2128 * param0) +GraphicElementManager *ov20_021D2E08(UnkStruct_ov20_021D2128 *param0) { return param0->unk_24; } -void ov20_021D2E0C (UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3) +void ov20_021D2E0C(UnkStruct_ov20_021D2128 *param0, UnkStruct_ov19_021DA864 *param1, u32 param2, u32 param3) { param1->unk_00 = ¶m0->unk_1B4[param2]; param1->unk_08 = ¶m0->unk_1FC[param2]; @@ -982,10 +983,10 @@ void ov20_021D2E0C (UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1->unk_1C = 0; } -GraphicElementData * ov20_021D2E50 (UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5) +GraphicElementData *ov20_021D2E50(UnkStruct_ov20_021D2128 *param0, UnkStruct_ov19_021DA864 *param1, u32 param2, u32 param3, u32 param4, int param5) { UnkStruct_ov83_0223D9A8 v0; - GraphicElementData * v1; + GraphicElementData *v1; OSIntrMode v2; v0.unk_00 = param0->unk_24; diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index b7ff7d7267..53dfc721fc 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -1,35 +1,34 @@ +#include "overlay020/ov20_021D2EA4.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_020998EC_decl.h" -#include "overlay020/struct_ov20_021D16E8_decl.h" -#include "overlay020/struct_ov20_021D2128_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay020/ov20_021D0D80.h" +#include "overlay020/ov20_021D2098.h" +#include "overlay020/struct_ov20_021D16E8_decl.h" +#include "overlay020/struct_ov20_021D2128_decl.h" -#include "unk_02002B7C.h" -#include "unk_02006E3C.h" +#include "charcode.h" +#include "heap.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02002B7C.h" +#include "unk_02006E3C.h" #include "unk_0200DA60.h" #include "unk_020149F0.h" #include "unk_02014D38.h" -#include "heap.h" #include "unk_02018340.h" -#include "charcode.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "overlay020/ov20_021D0D80.h" -#include "overlay020/ov20_021D2098.h" -#include "overlay020/ov20_021D2EA4.h" typedef struct { s16 unk_00; @@ -37,24 +36,24 @@ typedef struct { } UnkStruct_ov20_021D34CC; typedef struct { - Strbuf* unk_00; - const u16 * unk_04; + Strbuf *unk_00; + const u16 *unk_04; int unk_08; } UnkStruct_ov20_021D33C8; typedef struct UnkStruct_ov20_021D30F8_t { - UnkStruct_ov20_021D2128 * unk_00; - const UnkStruct_ov20_021D16E8 * unk_04; - const UnkStruct_020998EC * unk_08; + UnkStruct_ov20_021D2128 *unk_00; + const UnkStruct_ov20_021D16E8 *unk_04; + const UnkStruct_020998EC *unk_08; Window unk_0C; Window unk_1C; Window unk_2C; - GraphicElementData * unk_3C; - GraphicElementData * unk_40; - GraphicElementData * unk_44; - MessageLoader * unk_48; - Strbuf* unk_4C; - UnkStruct_020149F0 * unk_50; + GraphicElementData *unk_3C; + GraphicElementData *unk_40; + GraphicElementData *unk_44; + MessageLoader *unk_48; + Strbuf *unk_4C; + UnkStruct_020149F0 *unk_50; UnkStruct_ov20_021D34CC unk_54[2]; u32 unk_5C; u32 unk_60; @@ -62,23 +61,23 @@ typedef struct UnkStruct_ov20_021D30F8_t { u16 unk_70[10][16]; } UnkStruct_ov20_021D30F8; -static void ov20_021D30A4(UnkStruct_ov20_021D30F8 * param0, NARC * param1); -static void ov20_021D30F8(UnkStruct_ov20_021D30F8 * param0); -static void ov20_021D312C(UnkStruct_ov20_021D30F8 * param0); -static void ov20_021D3184(UnkStruct_ov20_021D30F8 * param0); -static u32 ov20_021D32D0(UnkStruct_ov20_021D30F8 * param0); -static void ov20_021D33C8(UnkStruct_ov20_021D33C8 * param0, UnkStruct_ov20_021D30F8 * param1); -static void ov20_021D33F4(UnkStruct_ov20_021D33C8 * param0); -static int ov20_021D3400(UnkStruct_ov20_021D33C8 * param0, Strbuf *param1); -static void ov20_021D34CC(const UnkStruct_ov20_021D34CC * param0, UnkStruct_ov20_021D34CC * param1); -static void ov20_021D34E0(const UnkStruct_ov20_021D34CC * param0, UnkStruct_ov20_021D34CC * param1); -static void ov20_021D34F4(Window * param0, const UnkStruct_ov20_021D34CC * param1); -static void ov20_021D351C(UnkStruct_ov20_021D30F8 * param0, Window * param1, const UnkStruct_ov20_021D34CC * param2, u16 param3); -static void ov20_021D375C(UnkStruct_ov20_021D30F8 * param0, BOOL param1); - -UnkStruct_ov20_021D30F8 * ov20_021D2EA4 (UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2) +static void ov20_021D30A4(UnkStruct_ov20_021D30F8 *param0, NARC *param1); +static void ov20_021D30F8(UnkStruct_ov20_021D30F8 *param0); +static void ov20_021D312C(UnkStruct_ov20_021D30F8 *param0); +static void ov20_021D3184(UnkStruct_ov20_021D30F8 *param0); +static u32 ov20_021D32D0(UnkStruct_ov20_021D30F8 *param0); +static void ov20_021D33C8(UnkStruct_ov20_021D33C8 *param0, UnkStruct_ov20_021D30F8 *param1); +static void ov20_021D33F4(UnkStruct_ov20_021D33C8 *param0); +static int ov20_021D3400(UnkStruct_ov20_021D33C8 *param0, Strbuf *param1); +static void ov20_021D34CC(const UnkStruct_ov20_021D34CC *param0, UnkStruct_ov20_021D34CC *param1); +static void ov20_021D34E0(const UnkStruct_ov20_021D34CC *param0, UnkStruct_ov20_021D34CC *param1); +static void ov20_021D34F4(Window *param0, const UnkStruct_ov20_021D34CC *param1); +static void ov20_021D351C(UnkStruct_ov20_021D30F8 *param0, Window *param1, const UnkStruct_ov20_021D34CC *param2, u16 param3); +static void ov20_021D375C(UnkStruct_ov20_021D30F8 *param0, BOOL param1); + +UnkStruct_ov20_021D30F8 *ov20_021D2EA4(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2) { - UnkStruct_ov20_021D30F8 * v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D30F8)); + UnkStruct_ov20_021D30F8 *v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D30F8)); v0->unk_00 = param0; v0->unk_04 = param1; @@ -93,7 +92,7 @@ UnkStruct_ov20_021D30F8 * ov20_021D2EA4 (UnkStruct_ov20_021D2128 * param0, const return v0; } -void ov20_021D2EF0 (UnkStruct_ov20_021D30F8 * param0) +void ov20_021D2EF0(UnkStruct_ov20_021D30F8 *param0) { if (param0->unk_50) { sub_02014A20(param0->unk_50); @@ -125,9 +124,9 @@ void ov20_021D2EF0 (UnkStruct_ov20_021D30F8 * param0) Heap_FreeToHeap(param0); } -void ov20_021D2F50 (UnkStruct_ov20_021D30F8 * param0, NARC * param1) +void ov20_021D2F50(UnkStruct_ov20_021D30F8 *param0, NARC *param1) { - BGL * v0; + BGL *v0; u32 v1; v0 = ov20_021D2E04(param0->unk_00); @@ -165,10 +164,10 @@ void ov20_021D2F50 (UnkStruct_ov20_021D30F8 * param0, NARC * param1) sub_02019448(v0, 0); } -static void ov20_021D30A4 (UnkStruct_ov20_021D30F8 * param0, NARC * param1) +static void ov20_021D30A4(UnkStruct_ov20_021D30F8 *param0, NARC *param1) { - NNSG2dPaletteData * v0; - void * v1; + NNSG2dPaletteData *v0; + void *v1; sub_02007130(param1, 6, 0, 0, 14 * 0x20, 35); @@ -180,7 +179,7 @@ static void ov20_021D30A4 (UnkStruct_ov20_021D30F8 * param0, NARC * param1) Heap_FreeToHeap(v1); } -static void ov20_021D30F8 (UnkStruct_ov20_021D30F8 * param0) +static void ov20_021D30F8(UnkStruct_ov20_021D30F8 *param0) { if (ov20_021D1F84(param0->unk_04) == 2) { int v0 = 1 + ov20_021D1F9C(param0->unk_04); @@ -190,7 +189,7 @@ static void ov20_021D30F8 (UnkStruct_ov20_021D30F8 * param0) } } -static void ov20_021D312C (UnkStruct_ov20_021D30F8 * param0) +static void ov20_021D312C(UnkStruct_ov20_021D30F8 *param0) { switch (ov20_021D1F84(param0->unk_04)) { case 0: @@ -211,7 +210,7 @@ static void ov20_021D312C (UnkStruct_ov20_021D30F8 * param0) } } -static void ov20_021D3184 (UnkStruct_ov20_021D30F8 * param0) +static void ov20_021D3184(UnkStruct_ov20_021D30F8 *param0) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov20_021D34CC v1; @@ -240,7 +239,7 @@ static void ov20_021D3184 (UnkStruct_ov20_021D30F8 * param0) } } -void ov20_021D3228 (UnkStruct_ov20_021D30F8 * param0) +void ov20_021D3228(UnkStruct_ov20_021D30F8 *param0) { ov20_021D30F8(param0); BGL_FillWindow(¶m0->unk_0C, 13); @@ -264,9 +263,9 @@ void ov20_021D3228 (UnkStruct_ov20_021D30F8 * param0) sub_0201ACCC(¶m0->unk_0C); } -static u32 ov20_021D32D0 (UnkStruct_ov20_021D30F8 * param0) +static u32 ov20_021D32D0(UnkStruct_ov20_021D30F8 *param0) { - Strbuf* v0 = ov20_021D1FC0(param0->unk_04, 35); + Strbuf *v0 = ov20_021D1FC0(param0->unk_04, 35); int v1, v2, v3; BOOL v4; u16 v5; @@ -312,7 +311,7 @@ static u32 ov20_021D32D0 (UnkStruct_ov20_021D30F8 * param0) return v3; } -static void ov20_021D33C8 (UnkStruct_ov20_021D33C8 * param0, UnkStruct_ov20_021D30F8 * param1) +static void ov20_021D33C8(UnkStruct_ov20_021D33C8 *param0, UnkStruct_ov20_021D30F8 *param1) { param0->unk_00 = ov20_021D1FC0(param1->unk_04, 35); param0->unk_04 = Strbuf_GetData(param0->unk_00); @@ -324,14 +323,14 @@ static void ov20_021D33C8 (UnkStruct_ov20_021D33C8 * param0, UnkStruct_ov20_021D } } -static void ov20_021D33F4 (UnkStruct_ov20_021D33C8 * param0) +static void ov20_021D33F4(UnkStruct_ov20_021D33C8 *param0) { Strbuf_Free(param0->unk_00); } -static int ov20_021D3400 (UnkStruct_ov20_021D33C8 * param0, Strbuf *param1) +static int ov20_021D3400(UnkStruct_ov20_021D33C8 *param0, Strbuf *param1) { - const u16 * v0 = param0->unk_04; + const u16 *v0 = param0->unk_04; int v1; switch (param0->unk_08) { @@ -386,19 +385,19 @@ static int ov20_021D3400 (UnkStruct_ov20_021D33C8 * param0, Strbuf *param1) return v1; } -static void ov20_021D34CC (const UnkStruct_ov20_021D34CC * param0, UnkStruct_ov20_021D34CC * param1) +static void ov20_021D34CC(const UnkStruct_ov20_021D34CC *param0, UnkStruct_ov20_021D34CC *param1) { param1->unk_00 = param0->unk_00 - (96 / 2); param1->unk_02 = param0->unk_02 - (16 / 2); } -static void ov20_021D34E0 (const UnkStruct_ov20_021D34CC * param0, UnkStruct_ov20_021D34CC * param1) +static void ov20_021D34E0(const UnkStruct_ov20_021D34CC *param0, UnkStruct_ov20_021D34CC *param1) { param1->unk_00 = param0->unk_00 + 3 * 8; param1->unk_02 = param0->unk_02 + 1 * 8; } -static void ov20_021D34F4 (Window * param0, const UnkStruct_ov20_021D34CC * param1) +static void ov20_021D34F4(Window *param0, const UnkStruct_ov20_021D34CC *param1) { UnkStruct_ov20_021D34CC v0; @@ -406,7 +405,7 @@ static void ov20_021D34F4 (Window * param0, const UnkStruct_ov20_021D34CC * para BGL_WindowColor(param0, 14, v0.unk_00, v0.unk_02, 96, 16); } -static void ov20_021D351C (UnkStruct_ov20_021D30F8 * param0, Window * param1, const UnkStruct_ov20_021D34CC * param2, u16 param3) +static void ov20_021D351C(UnkStruct_ov20_021D30F8 *param0, Window *param1, const UnkStruct_ov20_021D34CC *param2, u16 param3) { if (param3 != 0xffff) { UnkStruct_ov20_021D34CC v0; @@ -421,12 +420,12 @@ static void ov20_021D351C (UnkStruct_ov20_021D30F8 * param0, Window * param1, co } } -u32 ov20_021D3574 (const UnkStruct_ov20_021D30F8 * param0) +u32 ov20_021D3574(const UnkStruct_ov20_021D30F8 *param0) { return param0->unk_5C; } -void ov20_021D3578 (UnkStruct_ov20_021D30F8 * param0, u32 param1) +void ov20_021D3578(UnkStruct_ov20_021D30F8 *param0, u32 param1) { BGL_FillWindow(¶m0->unk_1C, 9); @@ -434,8 +433,8 @@ void ov20_021D3578 (UnkStruct_ov20_021D30F8 * param0, u32 param1) case 0: { - StringTemplate * v0 = StringTemplate_New(2, 60, 0); - Strbuf* v1 = Strbuf_Init(300, 0); + StringTemplate *v0 = StringTemplate_New(2, 60, 0); + Strbuf *v1 = Strbuf_Init(300, 0); StringTemplate_SetBagPocketName(v0, 0, 0); MessageLoader_GetStrbuf(param0->unk_48, 0 + ov20_021D1F88(param0->unk_04), param0->unk_4C); @@ -444,8 +443,7 @@ void ov20_021D3578 (UnkStruct_ov20_021D30F8 * param0, u32 param1) Strbuf_Free(v1); StringTemplate_Free(v0); - } - break; + } break; case 2: MessageLoader_GetStrbuf(param0->unk_48, 6, param0->unk_4C); sub_0201D78C(¶m0->unk_1C, 1, param0->unk_4C, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL); @@ -463,23 +461,23 @@ void ov20_021D3578 (UnkStruct_ov20_021D30F8 * param0, u32 param1) sub_0201ACCC(¶m0->unk_1C); } -void ov20_021D3684 (UnkStruct_ov20_021D30F8 * param0) +void ov20_021D3684(UnkStruct_ov20_021D30F8 *param0) { ov20_021D375C(param0, 0); } -void ov20_021D3690 (UnkStruct_ov20_021D30F8 * param0) +void ov20_021D3690(UnkStruct_ov20_021D30F8 *param0) { ov20_021D375C(param0, 1); } -void ov20_021D369C (UnkStruct_ov20_021D30F8 * param0, BOOL param1) +void ov20_021D369C(UnkStruct_ov20_021D30F8 *param0, BOOL param1) { sub_02021CAC(param0->unk_3C, param1); ov20_021D375C(param0, 1); } -void ov20_021D36B0 (UnkStruct_ov20_021D30F8 * param0) +void ov20_021D36B0(UnkStruct_ov20_021D30F8 *param0) { if (ov20_021D1F84(param0->unk_04) == 2) { sub_02021CAC(param0->unk_40, 0); @@ -487,7 +485,7 @@ void ov20_021D36B0 (UnkStruct_ov20_021D30F8 * param0) } } -void ov20_021D36D0 (UnkStruct_ov20_021D30F8 * param0) +void ov20_021D36D0(UnkStruct_ov20_021D30F8 *param0) { if (ov20_021D1F84(param0->unk_04) == 2) { sub_02021CAC(param0->unk_40, 1); @@ -498,7 +496,7 @@ void ov20_021D36D0 (UnkStruct_ov20_021D30F8 * param0) } } -void ov20_021D3700 (UnkStruct_ov20_021D30F8 * param0, int param1) +void ov20_021D3700(UnkStruct_ov20_021D30F8 *param0, int param1) { VecFx32 v0; @@ -521,7 +519,7 @@ void ov20_021D3700 (UnkStruct_ov20_021D30F8 * param0, int param1) ov20_021D375C(param0, 1); } -static void ov20_021D375C (UnkStruct_ov20_021D30F8 * param0, BOOL param1) +static void ov20_021D375C(UnkStruct_ov20_021D30F8 *param0, BOOL param1) { if (param0->unk_5C != 0) { if (param1) { @@ -538,7 +536,7 @@ static void ov20_021D375C (UnkStruct_ov20_021D30F8 * param0, BOOL param1) } } -void ov20_021D3790 (UnkStruct_ov20_021D30F8 * param0, int param1) +void ov20_021D3790(UnkStruct_ov20_021D30F8 *param0, int param1) { BGL_FillWindow(¶m0->unk_2C, 9); @@ -554,13 +552,13 @@ void ov20_021D3790 (UnkStruct_ov20_021D30F8 * param0, int param1) sub_0201A954(¶m0->unk_2C); } -void ov20_021D381C (UnkStruct_ov20_021D30F8 * param0, int param1) +void ov20_021D381C(UnkStruct_ov20_021D30F8 *param0, int param1) { BGL_WindowColor(¶m0->unk_2C, 9, 0, 0, 14, 4 * 8); sub_02014A58(param0->unk_50, ¶m0->unk_2C, 0, 0 + (param1 * 16)); } -void ov20_021D384C (UnkStruct_ov20_021D30F8 * param0) +void ov20_021D384C(UnkStruct_ov20_021D30F8 *param0) { Window_Clear(¶m0->unk_2C, 0); sub_0201ACF4(¶m0->unk_2C); diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c index 82f287e38a..0891633112 100644 --- a/src/overlay020/ov20_021D3864.c +++ b/src/overlay020/ov20_021D3864.c @@ -1,42 +1,42 @@ +#include "overlay020/ov20_021D3864.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_020998EC_decl.h" -#include "overlay020/struct_ov20_021D16E8_decl.h" -#include "overlay020/struct_ov20_021D2128_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay020/ov20_021D2098.h" +#include "overlay020/struct_ov20_021D16E8_decl.h" +#include "overlay020/struct_ov20_021D2128_decl.h" #include "overlay061/struct_ov61_0222C884.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" #include "unk_02002B7C.h" #include "unk_02006E3C.h" -#include "message.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "overlay020/ov20_021D2098.h" -#include "overlay020/ov20_021D3864.h" typedef struct UnkStruct_ov20_021D3980_t { - UnkStruct_ov20_021D2128 * unk_00; - const UnkStruct_ov20_021D16E8 * unk_04; - const UnkStruct_020998EC * unk_08; - GraphicElementData * unk_0C; + UnkStruct_ov20_021D2128 *unk_00; + const UnkStruct_ov20_021D16E8 *unk_04; + const UnkStruct_020998EC *unk_08; + GraphicElementData *unk_0C; } UnkStruct_ov20_021D3980; -static void ov20_021D390C(BGL * param0, const UnkStruct_ov61_0222C884 * param1, u32 param2); -static void ov20_021D3980(UnkStruct_ov20_021D3980 * param0); +static void ov20_021D390C(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u32 param2); +static void ov20_021D3980(UnkStruct_ov20_021D3980 *param0); -UnkStruct_ov20_021D3980 * ov20_021D3864 (UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2) +UnkStruct_ov20_021D3980 *ov20_021D3864(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2) { - UnkStruct_ov20_021D3980 * v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D3980)); + UnkStruct_ov20_021D3980 *v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D3980)); v0->unk_00 = param0; v0->unk_04 = param1; @@ -46,7 +46,7 @@ UnkStruct_ov20_021D3980 * ov20_021D3864 (UnkStruct_ov20_021D2128 * param0, const return v0; } -void ov20_021D3880 (UnkStruct_ov20_021D3980 * param0) +void ov20_021D3880(UnkStruct_ov20_021D3980 *param0) { if (param0->unk_0C) { sub_02021BD4(param0->unk_0C); @@ -55,7 +55,7 @@ void ov20_021D3880 (UnkStruct_ov20_021D3980 * param0) Heap_FreeToHeap(param0); } -void ov20_021D3898 (UnkStruct_ov20_021D3980 * param0, NARC * param1) +void ov20_021D3898(UnkStruct_ov20_021D3980 *param0, NARC *param1) { static const UnkStruct_ov61_0222C884 v0 = { 3, 3, 6, 10, 2, 13, 64 @@ -63,7 +63,7 @@ void ov20_021D3898 (UnkStruct_ov20_021D3980 * param0, NARC * param1) static const UnkStruct_ov61_0222C884 v1 = { 3, 19, 6, 10, 2, 13, 84 }; - BGL * v2; + BGL *v2; v2 = ov20_021D2E04(param0->unk_00); @@ -77,10 +77,10 @@ void ov20_021D3898 (UnkStruct_ov20_021D3980 * param0, NARC * param1) sub_02019448(v2, 3); } -static void ov20_021D390C (BGL * param0, const UnkStruct_ov61_0222C884 * param1, u32 param2) +static void ov20_021D390C(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u32 param2) { Window v0; - Strbuf* v1; + Strbuf *v1; u32 v2; sub_0201A8D4(param0, &v0, param1); @@ -96,7 +96,7 @@ static void ov20_021D390C (BGL * param0, const UnkStruct_ov61_0222C884 * param1, BGL_DeleteWindow(&v0); } -static void ov20_021D3980 (UnkStruct_ov20_021D3980 * param0) +static void ov20_021D3980(UnkStruct_ov20_021D3980 *param0) { UnkStruct_ov19_021DA864 v0; @@ -107,27 +107,27 @@ static void ov20_021D3980 (UnkStruct_ov20_021D3980 * param0) sub_02021CAC(param0->unk_0C, 0); } -void ov20_021D39BC (UnkStruct_ov20_021D3980 * param0) +void ov20_021D39BC(UnkStruct_ov20_021D3980 *param0) { SpriteActor_SetSpriteAnimActive(param0->unk_0C, 3); } -void ov20_021D39C8 (UnkStruct_ov20_021D3980 * param0) +void ov20_021D39C8(UnkStruct_ov20_021D3980 *param0) { SpriteActor_SetSpriteAnimActive(param0->unk_0C, 2); } -void ov20_021D39D4 (UnkStruct_ov20_021D3980 * param0, BOOL param1) +void ov20_021D39D4(UnkStruct_ov20_021D3980 *param0, BOOL param1) { sub_02021CAC(param0->unk_0C, param1); } -BOOL ov20_021D39E0 (UnkStruct_ov20_021D3980 * param0) +BOOL ov20_021D39E0(UnkStruct_ov20_021D3980 *param0) { return sub_02021D34(param0->unk_0C); } -void ov20_021D39EC (UnkStruct_ov20_021D3980 * param0, int param1) +void ov20_021D39EC(UnkStruct_ov20_021D3980 *param0, int param1) { VecFx32 v0; @@ -149,12 +149,12 @@ void ov20_021D39EC (UnkStruct_ov20_021D3980 * param0, int param1) SpriteActor_SetSpriteAnimActive(param0->unk_0C, 2); } -void ov20_021D3A2C (UnkStruct_ov20_021D3980 * param0) +void ov20_021D3A2C(UnkStruct_ov20_021D3980 *param0) { sub_02019184(ov20_021D2E04(param0->unk_00), 3, 3, 64); } -void ov20_021D3A40 (UnkStruct_ov20_021D3980 * param0) +void ov20_021D3A40(UnkStruct_ov20_021D3980 *param0) { sub_02019184(ov20_021D2E04(param0->unk_00), 3, 3, 0); } diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c index 5f8db67236..df52f222ed 100644 --- a/src/overlay020/ov20_021D3A54.c +++ b/src/overlay020/ov20_021D3A54.c @@ -1,59 +1,57 @@ +#include "overlay020/ov20_021D3A54.h" + #include #include -#include "enums.h" - #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_020998EC_decl.h" -#include "overlay020/struct_ov20_021D16E8_decl.h" -#include "overlay020/struct_ov20_021D2128_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay020/ov20_021D0D80.h" +#include "overlay020/ov20_021D2098.h" +#include "overlay020/ov20_021D4E38.h" +#include "overlay020/ov20_021D5044.h" +#include "overlay020/struct_ov20_021D16E8_decl.h" +#include "overlay020/struct_ov20_021D2128_decl.h" #include "overlay020/struct_ov20_021D4E8C.h" #include "overlay020/struct_ov20_021D4FF0.h" +#include "enums.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02006E3C.h" -#include "message.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_020998EC.h" -#include "overlay020/ov20_021D0D80.h" -#include "overlay020/ov20_021D2098.h" -#include "overlay020/ov20_021D3A54.h" -#include "overlay020/ov20_021D4E38.h" -#include "overlay020/ov20_021D5044.h" typedef struct UnkStruct_ov20_021D3E0C_t { - UnkStruct_ov20_021D2128 * unk_00; - const UnkStruct_ov20_021D16E8 * unk_04; - const UnkStruct_020998EC * unk_08; - BGL * unk_0C; + UnkStruct_ov20_021D2128 *unk_00; + const UnkStruct_ov20_021D16E8 *unk_04; + const UnkStruct_020998EC *unk_08; + BGL *unk_0C; u32 unk_10; u32 unk_14; - SysTask * unk_18; + SysTask *unk_18; UnkStruct_ov20_021D4FF0 unk_1C; UnkStruct_ov20_021D4E8C unk_3C; - GraphicElementData * unk_5C; + GraphicElementData *unk_5C; } UnkStruct_ov20_021D3E0C; -static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 param2); -static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 param2); -static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 param2); -static void ov20_021D3E0C(UnkStruct_ov20_021D3E0C * param0); +static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2); +static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2); +static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2); +static void ov20_021D3E0C(UnkStruct_ov20_021D3E0C *param0); -UnkStruct_ov20_021D3E0C * ov20_021D3A54 (UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2) +UnkStruct_ov20_021D3E0C *ov20_021D3A54(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2) { - UnkStruct_ov20_021D3E0C * v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D3E0C)); + UnkStruct_ov20_021D3E0C *v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D3E0C)); v0->unk_00 = param0; v0->unk_04 = param1; @@ -66,7 +64,7 @@ UnkStruct_ov20_021D3E0C * ov20_021D3A54 (UnkStruct_ov20_021D2128 * param0, const return v0; } -void ov20_021D3A80 (UnkStruct_ov20_021D3E0C * param0) +void ov20_021D3A80(UnkStruct_ov20_021D3E0C *param0) { if (param0->unk_5C) { sub_02021BD4(param0->unk_5C); @@ -75,9 +73,9 @@ void ov20_021D3A80 (UnkStruct_ov20_021D3E0C * param0) Heap_FreeToHeap(param0); } -void ov20_021D3A98 (UnkStruct_ov20_021D3E0C * param0, NARC * param1) +void ov20_021D3A98(UnkStruct_ov20_021D3E0C *param0, NARC *param1) { - BGL * v0; + BGL *v0; u32 v1; v0 = ov20_021D2E04(param0->unk_00); @@ -103,12 +101,12 @@ void ov20_021D3A98 (UnkStruct_ov20_021D3E0C * param0, NARC * param1) sub_02019448(v0, 1); } -static u32 ov20_021D3B74 (UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 param2) +static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2) { int v0, v1, v2; Window v3; - MessageLoader * v4; - Strbuf* v5; + MessageLoader *v4; + Strbuf *v5; u32 v6, v7; v4 = MessageLoader_Init(1, 26, 436, 35); @@ -152,10 +150,10 @@ static u32 ov20_021D3B74 (UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 pa return param2; } -static u32 ov20_021D3C78 (UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 param2) +static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2) { Window v0; - Strbuf* v1; + Strbuf *v1; u32 v2, v3, v4, v5, v6; GF_ASSERT(param2 < (1024 - 200)); @@ -191,18 +189,18 @@ static u32 ov20_021D3C78 (UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 pa return param2; } -static u32 ov20_021D3D44 (UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 param2) +static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C *param0, BGL *param1, u32 param2) { static const struct { u16 unk_00; u16 unk_02; } v0[] = { - {12, 21}, - {44, 21}, + { 12, 21 }, + { 44, 21 }, }; Window v1; - MessageLoader * v2; - Strbuf* v3; + MessageLoader *v2; + Strbuf *v3; int v4, v5; v2 = MessageLoader_Init(1, 26, 436, 35); @@ -228,7 +226,7 @@ static u32 ov20_021D3D44 (UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 pa return param2; } -static void ov20_021D3E0C (UnkStruct_ov20_021D3E0C * param0) +static void ov20_021D3E0C(UnkStruct_ov20_021D3E0C *param0) { UnkStruct_ov19_021DA864 v0; @@ -238,7 +236,7 @@ static void ov20_021D3E0C (UnkStruct_ov20_021D3E0C * param0) sub_02021CAC(param0->unk_5C, 0); } -void ov20_021D3E48 (UnkStruct_ov20_021D3E0C * param0, BOOL param1) +void ov20_021D3E48(UnkStruct_ov20_021D3E0C *param0, BOOL param1) { sub_02021CAC(param0->unk_5C, param1); @@ -251,7 +249,7 @@ void ov20_021D3E48 (UnkStruct_ov20_021D3E0C * param0, BOOL param1) } } -void ov20_021D3E74 (UnkStruct_ov20_021D3E0C * param0, u32 param1) +void ov20_021D3E74(UnkStruct_ov20_021D3E0C *param0, u32 param1) { VecFx32 v0; u32 v1; @@ -286,17 +284,17 @@ void ov20_021D3E74 (UnkStruct_ov20_021D3E0C * param0, u32 param1) SpriteActor_SetSpriteAnimActive(param0->unk_5C, v2); } -void ov20_021D3EF8 (UnkStruct_ov20_021D3E0C * param0) +void ov20_021D3EF8(UnkStruct_ov20_021D3E0C *param0) { param0->unk_14 = 0; ov20_021D4FB0(&(param0->unk_1C), GX_BLEND_PLANEMASK_BG1, -10, 0, 16); } -BOOL ov20_021D3F10 (UnkStruct_ov20_021D3E0C * param0) +BOOL ov20_021D3F10(UnkStruct_ov20_021D3E0C *param0) { switch (param0->unk_14) { case 0: - if (ov20_021D4FF0((¶m0->unk_1C))) { + if (ov20_021D4FF0(¶m0->unk_1C)) { ov20_021D4E38(&(param0->unk_3C), param0->unk_0C, 1, 1, 24, 6); param0->unk_14++; } @@ -308,13 +306,13 @@ BOOL ov20_021D3F10 (UnkStruct_ov20_021D3E0C * param0) return 0; } -void ov20_021D3F60 (UnkStruct_ov20_021D3E0C * param0) +void ov20_021D3F60(UnkStruct_ov20_021D3E0C *param0) { param0->unk_14 = 0; ov20_021D4E38(&(param0->unk_3C), param0->unk_0C, 1, 1, -24, 6); } -BOOL ov20_021D3F84 (UnkStruct_ov20_021D3E0C * param0) +BOOL ov20_021D3F84(UnkStruct_ov20_021D3E0C *param0) { switch (param0->unk_14) { case 0: @@ -324,33 +322,33 @@ BOOL ov20_021D3F84 (UnkStruct_ov20_021D3E0C * param0) } break; case 1: - return ov20_021D4FF0((¶m0->unk_1C)); + return ov20_021D4FF0(¶m0->unk_1C); } return 0; } -void ov20_021D3FD0 (UnkStruct_ov20_021D3E0C * param0) +void ov20_021D3FD0(UnkStruct_ov20_021D3E0C *param0) { sub_02019184(param0->unk_0C, 1, 3, 2); } -void ov20_021D3FE0 (UnkStruct_ov20_021D3E0C * param0) +void ov20_021D3FE0(UnkStruct_ov20_021D3E0C *param0) { ov20_021D4FB0(&(param0->unk_1C), GX_BLEND_PLANEMASK_BG1, 0, -10, 16); } -BOOL ov20_021D3FF8 (UnkStruct_ov20_021D3E0C * param0) +BOOL ov20_021D3FF8(UnkStruct_ov20_021D3E0C *param0) { return ov20_021D4FF0(&(param0->unk_1C)); } -void ov20_021D4004 (UnkStruct_ov20_021D3E0C * param0) +void ov20_021D4004(UnkStruct_ov20_021D3E0C *param0) { ov20_021D4F1C(¶m0->unk_1C, GX_BLEND_PLANEMASK_BG1, GX_BLEND_ALL, 124, 0, (6 * 2)); } -BOOL ov20_021D4020 (UnkStruct_ov20_021D3E0C * param0) +BOOL ov20_021D4020(UnkStruct_ov20_021D3E0C *param0) { if (ov20_021D4F4C(¶m0->unk_1C)) { sub_02019120(1, 0); @@ -360,19 +358,19 @@ BOOL ov20_021D4020 (UnkStruct_ov20_021D3E0C * param0) return 0; } -void ov20_021D403C (UnkStruct_ov20_021D3E0C * param0) +void ov20_021D403C(UnkStruct_ov20_021D3E0C *param0) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_ALL, 0, 16); sub_02019120(1, 1); ov20_021D4F1C(¶m0->unk_1C, GX_BLEND_PLANEMASK_BG1, GX_BLEND_ALL, 0, 124, (6 * 2)); } -BOOL ov20_021D4078 (UnkStruct_ov20_021D3E0C * param0) +BOOL ov20_021D4078(UnkStruct_ov20_021D3E0C *param0) { return ov20_021D4F4C(¶m0->unk_1C); } -void ov20_021D4084 (UnkStruct_ov20_021D3E0C * param0) +void ov20_021D4084(UnkStruct_ov20_021D3E0C *param0) { int v0; @@ -385,7 +383,7 @@ void ov20_021D4084 (UnkStruct_ov20_021D3E0C * param0) sub_02019184(param0->unk_0C, 1, 0, v0); } -void ov20_021D40A8 (UnkStruct_ov20_021D3E0C * param0) +void ov20_021D40A8(UnkStruct_ov20_021D3E0C *param0) { int v0; @@ -398,7 +396,7 @@ void ov20_021D40A8 (UnkStruct_ov20_021D3E0C * param0) ov20_021D4E38(&(param0->unk_3C), param0->unk_0C, 1, 0, v0, 16); } -BOOL ov20_021D40DC (UnkStruct_ov20_021D3E0C * param0) +BOOL ov20_021D40DC(UnkStruct_ov20_021D3E0C *param0) { return ov20_021D4E8C(&(param0->unk_3C)); } diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c index 211a2cf3b4..3c55e54a1f 100644 --- a/src/overlay020/ov20_021D40E8.c +++ b/src/overlay020/ov20_021D40E8.c @@ -1,41 +1,40 @@ +#include "overlay020/ov20_021D40E8.h" + #include #include -#include "enums.h" - #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_020998EC_decl.h" -#include "overlay020/struct_ov20_021D16E8_decl.h" -#include "overlay020/struct_ov20_021D2128_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay020/ov20_021D0D80.h" +#include "overlay020/ov20_021D2098.h" +#include "overlay020/ov20_021D4E38.h" +#include "overlay020/struct_ov20_021D16E8_decl.h" +#include "overlay020/struct_ov20_021D2128_decl.h" #include "overlay020/struct_ov20_021D4E8C.h" #include "overlay020/struct_ov20_021D4FF0.h" +#include "enums.h" #include "heap.h" +#include "strbuf.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "overlay020/ov20_021D0D80.h" -#include "overlay020/ov20_021D2098.h" -#include "overlay020/ov20_021D40E8.h" -#include "overlay020/ov20_021D4E38.h" typedef struct UnkStruct_ov20_021D4210_t { - UnkStruct_ov20_021D2128 * unk_00; - const UnkStruct_ov20_021D16E8 * unk_04; - const UnkStruct_020998EC * unk_08; - BGL * unk_0C; + UnkStruct_ov20_021D2128 *unk_00; + const UnkStruct_ov20_021D16E8 *unk_04; + const UnkStruct_020998EC *unk_08; + BGL *unk_0C; Window unk_10; Window unk_20; - GraphicElementData * unk_30; - GraphicElementData * unk_34; - GraphicElementData * unk_38; - Strbuf* unk_3C; + GraphicElementData *unk_30; + GraphicElementData *unk_34; + GraphicElementData *unk_38; + Strbuf *unk_3C; UnkStruct_ov20_021D4FF0 unk_40; UnkStruct_ov20_021D4E8C unk_60; u32 unk_80; @@ -45,14 +44,14 @@ typedef struct UnkStruct_ov20_021D4210_t { int unk_90; } UnkStruct_ov20_021D4210; -static void ov20_021D4210(UnkStruct_ov20_021D4210 * param0); -static void ov20_021D45AC(UnkStruct_ov20_021D4210 * param0, int param1); -static void ov20_021D4638(UnkStruct_ov20_021D4210 * param0); -static void ov20_021D4658(UnkStruct_ov20_021D4210 * param0, u32 param1, u32 param2); +static void ov20_021D4210(UnkStruct_ov20_021D4210 *param0); +static void ov20_021D45AC(UnkStruct_ov20_021D4210 *param0, int param1); +static void ov20_021D4638(UnkStruct_ov20_021D4210 *param0); +static void ov20_021D4658(UnkStruct_ov20_021D4210 *param0, u32 param1, u32 param2); -UnkStruct_ov20_021D4210 * ov20_021D40E8 (UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2) +UnkStruct_ov20_021D4210 *ov20_021D40E8(UnkStruct_ov20_021D2128 *param0, const UnkStruct_ov20_021D16E8 *param1, const UnkStruct_020998EC *param2) { - UnkStruct_ov20_021D4210 * v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D4210)); + UnkStruct_ov20_021D4210 *v0 = Heap_AllocFromHeap(35, sizeof(UnkStruct_ov20_021D4210)); v0->unk_00 = param0; v0->unk_04 = param1; @@ -70,7 +69,7 @@ UnkStruct_ov20_021D4210 * ov20_021D40E8 (UnkStruct_ov20_021D2128 * param0, const return v0; } -void ov20_021D4164 (UnkStruct_ov20_021D4210 * param0) +void ov20_021D4164(UnkStruct_ov20_021D4210 *param0) { if (param0->unk_30) { sub_02021BD4(param0->unk_30); @@ -93,9 +92,9 @@ void ov20_021D4164 (UnkStruct_ov20_021D4210 * param0) Heap_FreeToHeap(param0); } -void ov20_021D41A8 (UnkStruct_ov20_021D4210 * param0) +void ov20_021D41A8(UnkStruct_ov20_021D4210 *param0) { - BGL * v0; + BGL *v0; u32 v1; v0 = ov20_021D2E04(param0->unk_00); @@ -113,7 +112,7 @@ void ov20_021D41A8 (UnkStruct_ov20_021D4210 * param0) sub_02019120(2, 0); } -static void ov20_021D4210 (UnkStruct_ov20_021D4210 * param0) +static void ov20_021D4210(UnkStruct_ov20_021D4210 *param0) { UnkStruct_ov19_021DA864 v0; @@ -132,7 +131,7 @@ static void ov20_021D4210 (UnkStruct_ov20_021D4210 * param0) sub_02021CAC(param0->unk_38, 0); } -void ov20_021D4294 (UnkStruct_ov20_021D4210 * param0) +void ov20_021D4294(UnkStruct_ov20_021D4210 *param0) { u32 v0, v1, v2; @@ -158,7 +157,7 @@ void ov20_021D4294 (UnkStruct_ov20_021D4210 * param0) sub_0201ACCC(¶m0->unk_10); } -void ov20_021D42E4 (UnkStruct_ov20_021D4210 * param0) +void ov20_021D42E4(UnkStruct_ov20_021D4210 *param0) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_ALL, 0, 16); sub_02019120(2, 1); @@ -175,7 +174,7 @@ void ov20_021D42E4 (UnkStruct_ov20_021D4210 * param0) ov20_021D4F1C(¶m0->unk_40, GX_BLEND_PLANEMASK_BG2, GX_BLEND_ALL, 0, 124, (6 * 2)); } -BOOL ov20_021D4390 (UnkStruct_ov20_021D4210 * param0) +BOOL ov20_021D4390(UnkStruct_ov20_021D4210 *param0) { switch (param0->unk_80) { case 0: @@ -190,13 +189,13 @@ BOOL ov20_021D4390 (UnkStruct_ov20_021D4210 * param0) return 0; } -void ov20_021D43B4 (UnkStruct_ov20_021D4210 * param0) +void ov20_021D43B4(UnkStruct_ov20_021D4210 *param0) { param0->unk_80 = 0; ov20_021D4F1C(¶m0->unk_40, GX_BLEND_PLANEMASK_BG2, GX_BLEND_ALL, 124, 0, (6 * 2)); } -BOOL ov20_021D43D8 (UnkStruct_ov20_021D4210 * param0) +BOOL ov20_021D43D8(UnkStruct_ov20_021D4210 *param0) { switch (param0->unk_80) { case 0: @@ -214,7 +213,7 @@ BOOL ov20_021D43D8 (UnkStruct_ov20_021D4210 * param0) return 0; } -void ov20_021D4440 (UnkStruct_ov20_021D4210 * param0, BOOL param1) +void ov20_021D4440(UnkStruct_ov20_021D4210 *param0, BOOL param1) { sub_02021CAC(param0->unk_30, param1); @@ -227,7 +226,7 @@ void ov20_021D4440 (UnkStruct_ov20_021D4210 * param0, BOOL param1) } } -void ov20_021D4480 (UnkStruct_ov20_021D4210 * param0, u32 param1) +void ov20_021D4480(UnkStruct_ov20_021D4210 *param0, u32 param1) { VecFx32 v0; u32 v1, v2; @@ -243,7 +242,7 @@ void ov20_021D4480 (UnkStruct_ov20_021D4210 * param0, u32 param1) SpriteActor_SetSpriteAnimActive(param0->unk_30, 8); } -void ov20_021D44BC (UnkStruct_ov20_021D4210 * param0, int param1) +void ov20_021D44BC(UnkStruct_ov20_021D4210 *param0, int param1) { int v0, v1, v2, v3, v4, v5, v6; @@ -284,7 +283,7 @@ void ov20_021D44BC (UnkStruct_ov20_021D4210 * param0, int param1) ov20_021D4E38(&(param0->unk_60), param0->unk_0C, 2, 1, param1 * 24, v6); } -BOOL ov20_021D4578 (UnkStruct_ov20_021D4210 * param0) +BOOL ov20_021D4578(UnkStruct_ov20_021D4210 *param0) { if (ov20_021D4E8C(¶m0->unk_60)) { sub_02021CAC(param0->unk_34, ov20_021D204C(param0->unk_04)); @@ -295,7 +294,7 @@ BOOL ov20_021D4578 (UnkStruct_ov20_021D4210 * param0) return 0; } -static void ov20_021D45AC (UnkStruct_ov20_021D4210 * param0, int param1) +static void ov20_021D45AC(UnkStruct_ov20_021D4210 *param0, int param1) { int v0, v1; @@ -315,7 +314,7 @@ static void ov20_021D45AC (UnkStruct_ov20_021D4210 * param0, int param1) } } -static void ov20_021D4638 (UnkStruct_ov20_021D4210 * param0) +static void ov20_021D4638(UnkStruct_ov20_021D4210 *param0) { param0->unk_8C = 48; param0->unk_90 = 0; @@ -323,7 +322,7 @@ static void ov20_021D4638 (UnkStruct_ov20_021D4210 * param0) sub_02019184(param0->unk_0C, 2, 3, 0); } -static void ov20_021D4658 (UnkStruct_ov20_021D4210 * param0, u32 param1, u32 param2) +static void ov20_021D4658(UnkStruct_ov20_021D4210 *param0, u32 param1, u32 param2) { ov20_021D2008(param0->unk_04, param1, param0->unk_3C); diff --git a/src/overlay020/ov20_021D4E38.c b/src/overlay020/ov20_021D4E38.c index be51b7b9f8..de79b3d195 100644 --- a/src/overlay020/ov20_021D4E38.c +++ b/src/overlay020/ov20_021D4E38.c @@ -1,22 +1,23 @@ +#include "overlay020/ov20_021D4E38.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" +#include "overlay020/ov20_021D2098.h" #include "overlay020/struct_ov20_021D4E8C.h" #include "overlay020/struct_ov20_021D4FF0.h" #include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02018340.h" -#include "overlay020/ov20_021D2098.h" -#include "overlay020/ov20_021D4E38.h" -static void ov20_021D4ED8(SysTask * param0, void * param1); -static void ov20_021D4F74(SysTask * param0, void * param1); -static void ov20_021D5018(SysTask * param0, void * param1); +static void ov20_021D4ED8(SysTask *param0, void *param1); +static void ov20_021D4F74(SysTask *param0, void *param1); +static void ov20_021D5018(SysTask *param0, void *param1); -void ov20_021D4E38 (UnkStruct_ov20_021D4E8C * param0, BGL * param1, u32 param2, int param3, int param4, int param5) +void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BGL *param1, u32 param2, int param3, int param4, int param5) { param0->unk_00 = param1; param0->unk_04 = param2; @@ -36,7 +37,7 @@ void ov20_021D4E38 (UnkStruct_ov20_021D4E8C * param0, BGL * param1, u32 param2, param0->unk_1A = 0; } -BOOL ov20_021D4E8C (UnkStruct_ov20_021D4E8C * param0) +BOOL ov20_021D4E8C(UnkStruct_ov20_021D4E8C *param0) { switch (param0->unk_1A) { case 0: @@ -57,9 +58,9 @@ BOOL ov20_021D4E8C (UnkStruct_ov20_021D4E8C * param0) return 0; } -static void ov20_021D4ED8 (SysTask * param0, void * param1) +static void ov20_021D4ED8(SysTask *param0, void *param1) { - UnkStruct_ov20_021D4E8C * v0 = param1; + UnkStruct_ov20_021D4E8C *v0 = param1; if (v0->unk_18) { v0->unk_0C += v0->unk_14; @@ -70,19 +71,19 @@ static void ov20_021D4ED8 (SysTask * param0, void * param1) } } -void ov20_021D4F1C (UnkStruct_ov20_021D4FF0 * param0, int param1, int param2, int param3, int param4, int param5) +void ov20_021D4F1C(UnkStruct_ov20_021D4FF0 *param0, int param1, int param2, int param3, int param4, int param5) { param0->unk_00 = param1; param0->unk_04 = param2; param0->unk_14 = param5; param0->unk_08 = param3; - param0->unk_10 = (fx32)((param4 - param3)) / param5; + param0->unk_10 = (fx32)(param4 - param3) / param5; param0->unk_0C = param4; param0->unk_18 = 0; param0->unk_1C = ov20_021D2170(ov20_021D4F74, param0, 0); } -BOOL ov20_021D4F4C (UnkStruct_ov20_021D4FF0 * param0) +BOOL ov20_021D4F4C(UnkStruct_ov20_021D4FF0 *param0) { switch (param0->unk_18) { case 0: @@ -99,9 +100,9 @@ BOOL ov20_021D4F4C (UnkStruct_ov20_021D4FF0 * param0) return 0; } -static void ov20_021D4F74 (SysTask * param0, void * param1) +static void ov20_021D4F74(SysTask *param0, void *param1) { - UnkStruct_ov20_021D4FF0 * v0 = param1; + UnkStruct_ov20_021D4FF0 *v0 = param1; int v1, v2; if (v0->unk_14) { @@ -121,7 +122,7 @@ static void ov20_021D4F74 (SysTask * param0, void * param1) G2_SetBlendAlpha(v0->unk_00, v0->unk_04, v1, v2); } -void ov20_021D4FB0 (UnkStruct_ov20_021D4FF0 * param0, int param1, int param2, int param3, int param4) +void ov20_021D4FB0(UnkStruct_ov20_021D4FF0 *param0, int param1, int param2, int param3, int param4) { G2_SetBlendBrightness(param1, param2); @@ -129,12 +130,12 @@ void ov20_021D4FB0 (UnkStruct_ov20_021D4FF0 * param0, int param1, int param2, in param0->unk_14 = param4; param0->unk_08 = param2 * FX32_ONE; param0->unk_0C = param3 * FX32_ONE; - param0->unk_10 = (fx32)((param0->unk_0C - param0->unk_08)) / param4; + param0->unk_10 = (fx32)(param0->unk_0C - param0->unk_08) / param4; param0->unk_18 = 0; param0->unk_1C = ov20_021D2170(ov20_021D5018, param0, 0); } -BOOL ov20_021D4FF0 (UnkStruct_ov20_021D4FF0 * param0) +BOOL ov20_021D4FF0(UnkStruct_ov20_021D4FF0 *param0) { switch (param0->unk_18) { case 0: @@ -151,9 +152,9 @@ BOOL ov20_021D4FF0 (UnkStruct_ov20_021D4FF0 * param0) return 0; } -static void ov20_021D5018 (SysTask * param0, void * param1) +static void ov20_021D5018(SysTask *param0, void *param1) { - UnkStruct_ov20_021D4FF0 * v0 = param1; + UnkStruct_ov20_021D4FF0 *v0 = param1; int v1; if (v0->unk_14) { diff --git a/src/overlay020/ov20_021D5044.c b/src/overlay020/ov20_021D5044.c index eb3f71500c..97a86b935e 100644 --- a/src/overlay020/ov20_021D5044.c +++ b/src/overlay020/ov20_021D5044.c @@ -1,11 +1,10 @@ +#include "overlay020/ov20_021D5044.h" + #include #include #include "strbuf.h" -#include "strbuf.h" -#include "overlay020/ov20_021D5044.h" - static const struct { u16 unk_00; u8 unk_02; @@ -17,85 +16,85 @@ static const struct { u8 unk_08; u8 unk_09; } Unk_ov20_021D5320[] = { - {0x12B, 0x1C, 0xC, 0xFE, 0xA, 0x9, 0x1, 0x0, 0x14}, - {0x12C, 0x2C, 0xC, 0xFE, 0xB, 0x0, 0x2, 0x1, 0x15}, - {0x12D, 0x3C, 0xC, 0xFE, 0xC, 0x1, 0x3, 0x2, 0x16}, - {0x12E, 0x4C, 0xC, 0xFE, 0xD, 0x2, 0x4, 0x3, 0x17}, - {0x12F, 0x5C, 0xC, 0xFE, 0xE, 0x3, 0x5, 0x4, 0x18}, - {0x130, 0x6C, 0xC, 0xFE, 0xF, 0x4, 0x6, 0x5, 0x19}, - {0x131, 0x7C, 0xC, 0xFE, 0x10, 0x5, 0x7, 0x6, 0x10}, - {0x132, 0x8C, 0xC, 0xFE, 0x11, 0x6, 0x8, 0x7, 0x11}, - {0x133, 0x9C, 0xC, 0xFE, 0x12, 0x7, 0x9, 0x8, 0x12}, - {0x134, 0xAC, 0xC, 0xFE, 0x13, 0x8, 0x0, 0x9, 0x1A}, - {0x135, 0x1C, 0x1C, 0x0, 0x14, 0x13, 0xB, 0x0, 0x14}, - {0x136, 0x2C, 0x1C, 0x1, 0x15, 0xA, 0xC, 0x1, 0x15}, - {0x137, 0x3C, 0x1C, 0x2, 0x16, 0xB, 0xD, 0x2, 0x16}, - {0x138, 0x4C, 0x1C, 0x3, 0x17, 0xC, 0xE, 0x3, 0x17}, - {0x139, 0x5C, 0x1C, 0x4, 0x18, 0xD, 0xF, 0x4, 0x18}, - {0x13A, 0x6C, 0x1C, 0x5, 0x19, 0xE, 0x10, 0x5, 0x19}, - {0x13B, 0x7C, 0x1C, 0x6, 0xFE, 0xF, 0x11, 0x6, 0x10}, - {0x13C, 0x8C, 0x1C, 0x7, 0xFE, 0x10, 0x12, 0x7, 0x11}, - {0x13D, 0x9C, 0x1C, 0x8, 0xFE, 0x11, 0x13, 0x8, 0x12}, - {0x13E, 0xAC, 0x1C, 0x9, 0x1A, 0x12, 0xA, 0x9, 0x1A}, - {0x13F, 0x1C, 0x2C, 0xA, 0xFE, 0x1A, 0x15, 0x0, 0x14}, - {0x140, 0x2C, 0x2C, 0xB, 0xFE, 0x14, 0x16, 0x1, 0x15}, - {0x141, 0x3C, 0x2C, 0xC, 0xFE, 0x15, 0x17, 0x2, 0x16}, - {0x142, 0x4C, 0x2C, 0xD, 0xFE, 0x16, 0x18, 0x3, 0x17}, - {0x143, 0x5C, 0x2C, 0xE, 0xFE, 0x17, 0x19, 0x4, 0x18}, - {0x144, 0x6C, 0x2C, 0xF, 0xFE, 0x18, 0x1A, 0x5, 0x19}, - {0x1AB, 0xAC, 0x2C, 0x13, 0xFE, 0x19, 0x14, 0x9, 0x1A} + { 0x12B, 0x1C, 0xC, 0xFE, 0xA, 0x9, 0x1, 0x0, 0x14 }, + { 0x12C, 0x2C, 0xC, 0xFE, 0xB, 0x0, 0x2, 0x1, 0x15 }, + { 0x12D, 0x3C, 0xC, 0xFE, 0xC, 0x1, 0x3, 0x2, 0x16 }, + { 0x12E, 0x4C, 0xC, 0xFE, 0xD, 0x2, 0x4, 0x3, 0x17 }, + { 0x12F, 0x5C, 0xC, 0xFE, 0xE, 0x3, 0x5, 0x4, 0x18 }, + { 0x130, 0x6C, 0xC, 0xFE, 0xF, 0x4, 0x6, 0x5, 0x19 }, + { 0x131, 0x7C, 0xC, 0xFE, 0x10, 0x5, 0x7, 0x6, 0x10 }, + { 0x132, 0x8C, 0xC, 0xFE, 0x11, 0x6, 0x8, 0x7, 0x11 }, + { 0x133, 0x9C, 0xC, 0xFE, 0x12, 0x7, 0x9, 0x8, 0x12 }, + { 0x134, 0xAC, 0xC, 0xFE, 0x13, 0x8, 0x0, 0x9, 0x1A }, + { 0x135, 0x1C, 0x1C, 0x0, 0x14, 0x13, 0xB, 0x0, 0x14 }, + { 0x136, 0x2C, 0x1C, 0x1, 0x15, 0xA, 0xC, 0x1, 0x15 }, + { 0x137, 0x3C, 0x1C, 0x2, 0x16, 0xB, 0xD, 0x2, 0x16 }, + { 0x138, 0x4C, 0x1C, 0x3, 0x17, 0xC, 0xE, 0x3, 0x17 }, + { 0x139, 0x5C, 0x1C, 0x4, 0x18, 0xD, 0xF, 0x4, 0x18 }, + { 0x13A, 0x6C, 0x1C, 0x5, 0x19, 0xE, 0x10, 0x5, 0x19 }, + { 0x13B, 0x7C, 0x1C, 0x6, 0xFE, 0xF, 0x11, 0x6, 0x10 }, + { 0x13C, 0x8C, 0x1C, 0x7, 0xFE, 0x10, 0x12, 0x7, 0x11 }, + { 0x13D, 0x9C, 0x1C, 0x8, 0xFE, 0x11, 0x13, 0x8, 0x12 }, + { 0x13E, 0xAC, 0x1C, 0x9, 0x1A, 0x12, 0xA, 0x9, 0x1A }, + { 0x13F, 0x1C, 0x2C, 0xA, 0xFE, 0x1A, 0x15, 0x0, 0x14 }, + { 0x140, 0x2C, 0x2C, 0xB, 0xFE, 0x14, 0x16, 0x1, 0x15 }, + { 0x141, 0x3C, 0x2C, 0xC, 0xFE, 0x15, 0x17, 0x2, 0x16 }, + { 0x142, 0x4C, 0x2C, 0xD, 0xFE, 0x16, 0x18, 0x3, 0x17 }, + { 0x143, 0x5C, 0x2C, 0xE, 0xFE, 0x17, 0x19, 0x4, 0x18 }, + { 0x144, 0x6C, 0x2C, 0xF, 0xFE, 0x18, 0x1A, 0x5, 0x19 }, + { 0x1AB, 0xAC, 0x2C, 0x13, 0xFE, 0x19, 0x14, 0x9, 0x1A } }; -u32 ov20_021D5044 (void) +u32 ov20_021D5044(void) { return NELEMS(Unk_ov20_021D5320); } -void ov20_021D5048 (u32 param0, Strbuf *param1) +void ov20_021D5048(u32 param0, Strbuf *param1) { GF_ASSERT(param0 < NELEMS(Unk_ov20_021D5320)); Strbuf_CopyNumChars(param1, &(Unk_ov20_021D5320[param0].unk_00), 2); } -void ov20_021D506C (u32 param0, u32 * param1, u32 * param2) +void ov20_021D506C(u32 param0, u32 *param1, u32 *param2) { - GF_ASSERT((param0 < NELEMS(Unk_ov20_021D5320))); + GF_ASSERT(param0 < NELEMS(Unk_ov20_021D5320)); *param1 = Unk_ov20_021D5320[param0].unk_02; *param2 = Unk_ov20_021D5320[param0].unk_03; } -int ov20_021D5098 (u32 param0) +int ov20_021D5098(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_ov20_021D5320)); return Unk_ov20_021D5320[param0].unk_04; } -int ov20_021D50B4 (u32 param0) +int ov20_021D50B4(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_ov20_021D5320)); return Unk_ov20_021D5320[param0].unk_05; } -int ov20_021D50D0 (u32 param0) +int ov20_021D50D0(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_ov20_021D5320)); return Unk_ov20_021D5320[param0].unk_06; } -int ov20_021D50EC (u32 param0) +int ov20_021D50EC(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_ov20_021D5320)); return Unk_ov20_021D5320[param0].unk_07; } -int ov20_021D5108 (u32 param0) +int ov20_021D5108(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_ov20_021D5320)); return Unk_ov20_021D5320[param0].unk_08; } -int ov20_021D5124 (u32 param0) +int ov20_021D5124(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_ov20_021D5320)); return Unk_ov20_021D5320[param0].unk_09; diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c index 606a2332bb..20917458a5 100644 --- a/src/overlay021/ov21_021D0D80.c +++ b/src/overlay021/ov21_021D0D80.c @@ -1,20 +1,42 @@ +#include "overlay021/ov21_021D0D80.h" + #include -#include #include +#include #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0209ACBC_decl.h" -#include "overlay021/struct_ov21_021D3FE0_decl.h" -#include "overlay021/struct_ov21_021D423C_decl.h" -#include "overlay021/struct_ov21_021D4C0C_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay021/funcptr_ov21_021E9B74.h" +#include "overlay021/funcptr_ov21_021E9B9C.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D3FE0.h" +#include "overlay021/ov21_021D423C.h" +#include "overlay021/ov21_021D4340.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021D5600.h" +#include "overlay021/ov21_021D5AEC.h" +#include "overlay021/ov21_021D76B0.h" +#include "overlay021/ov21_021D85B0.h" +#include "overlay021/ov21_021D94BC.h" +#include "overlay021/ov21_021DC9BC.h" +#include "overlay021/ov21_021DDD2C.h" +#include "overlay021/ov21_021DE668.h" +#include "overlay021/ov21_021DF734.h" +#include "overlay021/ov21_021E0C68.h" +#include "overlay021/ov21_021E1924.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/ov21_021E3FFC.h" +#include "overlay021/ov21_021E4CA4.h" +#include "overlay021/ov21_021E6014.h" +#include "overlay021/ov21_021E68F4.h" +#include "overlay021/ov21_021E737C.h" +#include "overlay021/ov21_021E8484.h" #include "overlay021/struct_ov21_021D0D80.h" #include "overlay021/struct_ov21_021D0D80_1.h" #include "overlay021/struct_ov21_021D13FC.h" @@ -23,106 +45,83 @@ #include "overlay021/struct_ov21_021D3208.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D37DC.h" +#include "overlay021/struct_ov21_021D3FE0_decl.h" +#include "overlay021/struct_ov21_021D423C_decl.h" #include "overlay021/struct_ov21_021D4660.h" +#include "overlay021/struct_ov21_021D4C0C_decl.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021E68F4.h" -#include "overlay021/funcptr_ov21_021E9B74.h" -#include "overlay021/funcptr_ov21_021E9B9C.h" #include "overlay022/struct_ov22_022559F8.h" -#include "unk_020041CC.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" #include "overlay_manager.h" +#include "pokemon.h" +#include "strbuf.h" +#include "touch_screen.h" +#include "unk_020041CC.h" #include "unk_0200A328.h" #include "unk_0200A784.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_0202631C.h" -#include "pokemon.h" #include "unk_02098988.h" #include "unk_0209ACBC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D3FE0.h" -#include "overlay021/ov21_021D423C.h" -#include "overlay021/ov21_021D4340.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021D5600.h" -#include "overlay021/ov21_021D5AEC.h" -#include "overlay021/ov21_021D76B0.h" -#include "overlay021/ov21_021D85B0.h" -#include "overlay021/ov21_021D94BC.h" -#include "overlay021/ov21_021DC9BC.h" -#include "overlay021/ov21_021DDD2C.h" -#include "overlay021/ov21_021DE668.h" -#include "overlay021/ov21_021DF734.h" -#include "overlay021/ov21_021E0C68.h" -#include "overlay021/ov21_021E1924.h" -#include "overlay021/ov21_021E29DC.h" -#include "overlay021/ov21_021E3FFC.h" -#include "overlay021/ov21_021E4CA4.h" -#include "overlay021/ov21_021E6014.h" -#include "overlay021/ov21_021E68F4.h" -#include "overlay021/ov21_021E737C.h" -#include "overlay021/ov21_021E8484.h" typedef struct UnkStruct_ov21_021D0F60_t { BOOL unk_00; int unk_04; - UnkStruct_0209ACBC * unk_08; + UnkStruct_0209ACBC *unk_08; UnkStruct_ov21_021D3320 unk_0C; UnkStruct_ov21_021D13FC unk_177C; int unk_1A60; int unk_1A64; int unk_1A68; int unk_1A6C; - UnkStruct_ov21_021D423C * unk_1A70; - UnkStruct_ov21_021D423C * unk_1A74; - UnkStruct_ov21_021D423C * unk_1A78; - UnkStruct_ov21_021D423C * unk_1A7C; + UnkStruct_ov21_021D423C *unk_1A70; + UnkStruct_ov21_021D423C *unk_1A74; + UnkStruct_ov21_021D423C *unk_1A78; + UnkStruct_ov21_021D423C *unk_1A7C; UnkStruct_ov21_021D4660 unk_1A80; UnkStruct_ov21_021E68F4 unk_1A94[10]; UnkStruct_ov21_021E68F4 unk_1C24[8]; - UnkStruct_ov21_021D3FE0 * unk_1D64; - UnkStruct_ov21_021D3FE0 * unk_1D68; - UnkStruct_ov21_021D3FE0 * unk_1D6C; - UnkStruct_ov21_021D3FE0 * unk_1D70; + UnkStruct_ov21_021D3FE0 *unk_1D64; + UnkStruct_ov21_021D3FE0 *unk_1D68; + UnkStruct_ov21_021D3FE0 *unk_1D6C; + UnkStruct_ov21_021D3FE0 *unk_1D70; } UnkStruct_ov21_021D0F60; typedef struct { - UnkStruct_ov21_021D0F60 * unk_00; + UnkStruct_ov21_021D0F60 *unk_00; } UnkStruct_ov21_021D0F18; -static void ov21_021D0F04(void * param0); -static void ov21_021D0F18(UnkStruct_ov21_021D0F18 * param0); -static void ov21_021D0F38(UnkStruct_ov21_021D0F18 * param0); -static BOOL ov21_021D0F58(UnkStruct_ov21_021D0F18 * param0); -static void ov21_021D1D08(UnkStruct_ov21_021D0F60 * param0); +static void ov21_021D0F04(void *param0); +static void ov21_021D0F18(UnkStruct_ov21_021D0F18 *param0); +static void ov21_021D0F38(UnkStruct_ov21_021D0F18 *param0); +static BOOL ov21_021D0F58(UnkStruct_ov21_021D0F18 *param0); +static void ov21_021D1D08(UnkStruct_ov21_021D0F60 *param0); static void ov21_021D1E74(void); static void ov21_021D1E94(int param0); static void ov21_021D1F10(void); static void ov21_021D1F84(void); -static void ov21_021D1EEC(UnkStruct_ov21_021D0F60 * param0); +static void ov21_021D1EEC(UnkStruct_ov21_021D0F60 *param0); -int ov21_021D0D80 (OverlayManager * param0, int * param1) +int ov21_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov21_021D0F18 * v0; - UnkStruct_ov21_021D0D80 * v1; + UnkStruct_ov21_021D0F18 *v0; + UnkStruct_ov21_021D0D80 *v1; UnkStruct_ov21_021D0D80_1 v2; BOOL v3; @@ -170,9 +169,9 @@ int ov21_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov21_021D0E3C (OverlayManager * param0, int * param1) +int ov21_021D0E3C(OverlayManager *param0, int *param1) { - UnkStruct_ov21_021D0F18 * v0 = OverlayManager_Data(param0); + UnkStruct_ov21_021D0F18 *v0 = OverlayManager_Data(param0); BOOL v1; switch (*param1) { @@ -207,9 +206,9 @@ int ov21_021D0E3C (OverlayManager * param0, int * param1) return 0; } -int ov21_021D0EC8 (OverlayManager * param0, int * param1) +int ov21_021D0EC8(OverlayManager *param0, int *param1) { - UnkStruct_ov21_021D0F18 * v0 = OverlayManager_Data(param0); + UnkStruct_ov21_021D0F18 *v0 = OverlayManager_Data(param0); BOOL v1; SetMainCallback(NULL, NULL); @@ -226,9 +225,9 @@ int ov21_021D0EC8 (OverlayManager * param0, int * param1) return 1; } -static void ov21_021D0F04 (void * param0) +static void ov21_021D0F04(void *param0) { - UnkStruct_ov21_021D0F18 * v0 = param0; + UnkStruct_ov21_021D0F18 *v0 = param0; if (v0->unk_00) { ov21_021D12D8(v0->unk_00); @@ -237,17 +236,17 @@ static void ov21_021D0F04 (void * param0) sub_0201DCAC(); } -static void ov21_021D0F18 (UnkStruct_ov21_021D0F18 * param0) +static void ov21_021D0F18(UnkStruct_ov21_021D0F18 *param0) { sub_0200F174(0, 1, 1, 0x0, 6, 1, 37); } -static void ov21_021D0F38 (UnkStruct_ov21_021D0F18 * param0) +static void ov21_021D0F38(UnkStruct_ov21_021D0F18 *param0) { sub_0200F174(0, 0, 0, 0x0, 6, 1, 37); } -static BOOL ov21_021D0F58 (UnkStruct_ov21_021D0F18 * param0) +static BOOL ov21_021D0F58(UnkStruct_ov21_021D0F18 *param0) { return ScreenWipe_Done(); } @@ -300,9 +299,9 @@ const static UnkFuncPtr_ov21_021E9B9C Unk_ov21_021E9B54[8] = { ov21_021E84E4 }; -UnkStruct_ov21_021D0F60 * ov21_021D0F60 (int param0, const UnkStruct_ov21_021D0D80_1 * param1) +UnkStruct_ov21_021D0F60 *ov21_021D0F60(int param0, const UnkStruct_ov21_021D0D80_1 *param1) { - UnkStruct_ov21_021D0F60 * v0; + UnkStruct_ov21_021D0F60 *v0; int v1; UnkStruct_ov21_021D3208 v2; @@ -353,7 +352,7 @@ UnkStruct_ov21_021D0F60 * ov21_021D0F60 (int param0, const UnkStruct_ov21_021D0D return v0; } -BOOL ov21_021D10B8 (UnkStruct_ov21_021D0F60 * param0) +BOOL ov21_021D10B8(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); @@ -415,7 +414,7 @@ BOOL ov21_021D10B8 (UnkStruct_ov21_021D0F60 * param0) return 0; } -void ov21_021D12B0 (int param0) +void ov21_021D12B0(int param0) { ov21_021D1E74(); @@ -424,7 +423,7 @@ void ov21_021D12B0 (int param0) ov21_021D1F10(); } -void ov21_021D12C4 (void) +void ov21_021D12C4(void) { sub_0200A878(); sub_0201E958(); @@ -432,115 +431,115 @@ void ov21_021D12C4 (void) ov21_021D1F84(); } -void ov21_021D12D8 (UnkStruct_ov21_021D0F60 * param0) +void ov21_021D12D8(UnkStruct_ov21_021D0F60 *param0) { ov21_021D214C(¶m0->unk_177C); sub_0200A858(); } -UnkStruct_ov21_021D3FE0 * ov21_021D12EC (UnkStruct_ov21_021D0F60 * param0) +UnkStruct_ov21_021D3FE0 *ov21_021D12EC(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return param0->unk_1D64; } -UnkStruct_ov21_021D3FE0 * ov21_021D1300 (UnkStruct_ov21_021D0F60 * param0) +UnkStruct_ov21_021D3FE0 *ov21_021D1300(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return param0->unk_1D68; } -UnkStruct_ov21_021D3FE0 * ov21_021D1314 (UnkStruct_ov21_021D0F60 * param0) +UnkStruct_ov21_021D3FE0 *ov21_021D1314(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return param0->unk_1D6C; } -UnkStruct_ov21_021D3FE0 * ov21_021D1328 (UnkStruct_ov21_021D0F60 * param0) +UnkStruct_ov21_021D3FE0 *ov21_021D1328(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return param0->unk_1D70; } -UnkStruct_ov21_021D423C * ov21_021D133C (UnkStruct_ov21_021D0F60 * param0) +UnkStruct_ov21_021D423C *ov21_021D133C(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return param0->unk_1A70; } -UnkStruct_ov21_021D423C * ov21_021D1350 (UnkStruct_ov21_021D0F60 * param0) +UnkStruct_ov21_021D423C *ov21_021D1350(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return param0->unk_1A74; } -UnkStruct_ov21_021D423C * ov21_021D1364 (UnkStruct_ov21_021D0F60 * param0) +UnkStruct_ov21_021D423C *ov21_021D1364(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return param0->unk_1A78; } -UnkStruct_ov21_021D423C * ov21_021D1378 (UnkStruct_ov21_021D0F60 * param0) +UnkStruct_ov21_021D423C *ov21_021D1378(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return param0->unk_1A7C; } -int * ov21_021D138C (UnkStruct_ov21_021D0F60 * param0) +int *ov21_021D138C(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return ¶m0->unk_1A60; } -int * ov21_021D13A0 (UnkStruct_ov21_021D0F60 * param0) +int *ov21_021D13A0(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return ¶m0->unk_1A64; } -int * ov21_021D13B4 (UnkStruct_ov21_021D0F60 * param0) +int *ov21_021D13B4(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return ¶m0->unk_1A68; } -int * ov21_021D13C8 (UnkStruct_ov21_021D0F60 * param0) +int *ov21_021D13C8(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return ¶m0->unk_1A6C; } -BOOL * ov21_021D13DC (UnkStruct_ov21_021D0F60 * param0) +BOOL *ov21_021D13DC(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return ¶m0->unk_00; } -UnkStruct_ov21_021D3320 * ov21_021D13EC (UnkStruct_ov21_021D0F60 * param0) +UnkStruct_ov21_021D3320 *ov21_021D13EC(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return ¶m0->unk_0C; } -UnkStruct_ov21_021D13FC * ov21_021D13FC (UnkStruct_ov21_021D0F60 * param0) +UnkStruct_ov21_021D13FC *ov21_021D13FC(UnkStruct_ov21_021D0F60 *param0) { GF_ASSERT(param0); return ¶m0->unk_177C; } -UnkStruct_ov21_021E68F4 * ov21_021D1410 (UnkStruct_ov21_021D0F60 * param0, int param1) +UnkStruct_ov21_021E68F4 *ov21_021D1410(UnkStruct_ov21_021D0F60 *param0, int param1) { GF_ASSERT(param1 < 10); return ¶m0->unk_1A94[param1]; } -UnkStruct_ov21_021E68F4 * ov21_021D1430 (UnkStruct_ov21_021D0F60 * param0, int param1) +UnkStruct_ov21_021E68F4 *ov21_021D1430(UnkStruct_ov21_021D0F60 *param0, int param1) { GF_ASSERT(param1 < 8); return ¶m0->unk_1C24[param1]; } -void ov21_021D144C (GraphicElementData * param0, int param1) +void ov21_021D144C(GraphicElementData *param0, int param1) { switch (param1) { case 0: @@ -563,7 +562,7 @@ void ov21_021D144C (GraphicElementData * param0, int param1) } } -void ov21_021D1498 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2) +void ov21_021D1498(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2) { int v0 = sub_02021E74(param0); int v1, v2; @@ -592,7 +591,7 @@ void ov21_021D1498 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param } } -void ov21_021D1524 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4) +void ov21_021D1524(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4) { int v0; @@ -606,7 +605,7 @@ void ov21_021D1524 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param } } -void ov21_021D154C (TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4) +void ov21_021D154C(TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4) { hitTable->rect.top = param1; hitTable->rect.bottom = param2; @@ -614,7 +613,7 @@ void ov21_021D154C (TouchScreenHitTable *hitTable, int param1, int param2, int p hitTable->rect.right = param4; } -void ov21_021D1558 (UnkStruct_ov21_021D157C * param0, BGL * param1, int param2, NNSG2dScreenData * param3, int param4, int param5, int param6, int param7, int param8) +void ov21_021D1558(UnkStruct_ov21_021D157C *param0, BGL *param1, int param2, NNSG2dScreenData *param3, int param4, int param5, int param6, int param7, int param8) { param0->unk_00 = param1; param0->unk_08 = param2; @@ -627,7 +626,7 @@ void ov21_021D1558 (UnkStruct_ov21_021D157C * param0, BGL * param1, int param2, param0->unk_1C = 0; } -BOOL ov21_021D157C (UnkStruct_ov21_021D157C * param0) +BOOL ov21_021D157C(UnkStruct_ov21_021D157C *param0) { int v0; int v1; @@ -657,10 +656,10 @@ BOOL ov21_021D157C (UnkStruct_ov21_021D157C * param0) return 1; } -void ov21_021D1650 (Window * param0, int param1, int param2, int param3) +void ov21_021D1650(Window *param0, int param1, int param2, int param3) { - Strbuf* v0; - Strbuf* v1; + Strbuf *v0; + Strbuf *v1; if (param1 > 0) { v0 = Strbuf_Init(4, param3); @@ -678,9 +677,9 @@ void ov21_021D1650 (Window * param0, int param1, int param2, int param3) ov21_021D5600(v1); } -Window * ov21_021D16D8 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3) +Window *ov21_021D16D8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3) { - Window * v0; + Window *v0; if (ov21_021D36D8(param1) == 0) { v0 = ov21_021D172C(param0->unk_14C, param2, param3); @@ -691,9 +690,9 @@ Window * ov21_021D16D8 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_0 return v0; } -Window * ov21_021D170C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2) +Window *ov21_021D170C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2) { - Window * v0; + Window *v0; v0 = ov21_021D4D6C(param0, 15, 2); ov21_021D1650(v0, param2, param2, param1); @@ -701,9 +700,9 @@ Window * ov21_021D170C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2 return v0; } -Window * ov21_021D172C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2) +Window *ov21_021D172C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2) { - Window * v0; + Window *v0; int v1; v1 = Pokemon_SinnohDexNumber(param2); @@ -718,15 +717,15 @@ Window * ov21_021D172C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2 return v0; } -void ov21_021D1778 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, fx32 param4, fx32 param5) +void ov21_021D1778(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, fx32 param4, fx32 param5) { - GraphicElementData * v0; - GraphicElementData * v1; + GraphicElementData *v0; + GraphicElementData *v1; UnkStruct_ov21_021D4CB8 v2; - Window * v3; - UnkStruct_02009DC8 * v4; + Window *v3; + UnkStruct_02009DC8 *v4; VecFx32 v5; - const UnkStruct_ov21_021D37DC * v6; + const UnkStruct_ov21_021D37DC *v6; u32 v7 = ov21_021D36D8(param1); v6 = ov21_021D37DC(param1, param3); @@ -768,12 +767,12 @@ void ov21_021D1778 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3 ov21_021D4DA0(v3); } -void ov21_021D1848 (UnkStruct_ov21_021D13FC * param0, int param1, int param2) +void ov21_021D1848(UnkStruct_ov21_021D13FC *param0, int param1, int param2) { ov21_021D1858(¶m0->unk_1B0, param1, param2); } -void ov21_021D1858 (UnkStruct_ov21_021D22F8 * param0, int param1, int param2) +void ov21_021D1858(UnkStruct_ov21_021D22F8 *param0, int param1, int param2) { VecFx32 v0; @@ -789,7 +788,7 @@ void ov21_021D1858 (UnkStruct_ov21_021D22F8 * param0, int param1, int param2) } } -void ov21_021D1890 (UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5) +void ov21_021D1890(UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5) { switch (param2) { case 201: @@ -825,7 +824,7 @@ void ov21_021D1890 (UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D3320 * } } -u32 ov21_021D19D8 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6, int param7) +u32 ov21_021D19D8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6, int param7) { int v0; u32 v1 = 0; @@ -843,7 +842,7 @@ u32 ov21_021D19D8 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -u32 ov21_021D1A34 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6) +u32 ov21_021D1A34(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6) { int v0; @@ -856,7 +855,7 @@ u32 ov21_021D1A34 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -u32 ov21_021D1A78 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6) +u32 ov21_021D1A78(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6) { int v0; @@ -869,7 +868,7 @@ u32 ov21_021D1A78 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -u32 ov21_021D1AC0 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6) +u32 ov21_021D1AC0(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6) { int v0; @@ -882,7 +881,7 @@ u32 ov21_021D1AC0 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -u32 ov21_021D1B08 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6) +u32 ov21_021D1B08(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6) { int v0; @@ -895,7 +894,7 @@ u32 ov21_021D1B08 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -u32 ov21_021D1B4C (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6) +u32 ov21_021D1B4C(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6) { int v0; @@ -908,7 +907,7 @@ u32 ov21_021D1B4C (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -u32 ov21_021D1B94 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6) +u32 ov21_021D1B94(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6) { int v0; @@ -921,7 +920,7 @@ u32 ov21_021D1B94 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -u32 ov21_021D1BD8 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6) +u32 ov21_021D1BD8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6) { int v0; int v1; @@ -938,7 +937,7 @@ u32 ov21_021D1BD8 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -u32 ov21_021D1C30 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6) +u32 ov21_021D1C30(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6) { int v0; int v1; @@ -955,7 +954,7 @@ u32 ov21_021D1C30 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -u32 ov21_021D1C88 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, int param4, int param5, int param6) +u32 ov21_021D1C88(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3, int param4, int param5, int param6) { int v0; int v1; @@ -973,10 +972,10 @@ u32 ov21_021D1C88 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D33 return v0; } -Strbuf* ov21_021D1CE0 (int param0, int param1) +Strbuf *ov21_021D1CE0(int param0, int param1) { - Strbuf* v0; - MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); + Strbuf *v0; + MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); v0 = MessageLoader_GetNewStrbuf(v1, param0); MessageLoader_Free(v1); @@ -984,7 +983,7 @@ Strbuf* ov21_021D1CE0 (int param0, int param1) return v0; } -static void ov21_021D1D08 (UnkStruct_ov21_021D0F60 * param0) +static void ov21_021D1D08(UnkStruct_ov21_021D0F60 *param0) { int v0; @@ -1039,7 +1038,7 @@ static void ov21_021D1D08 (UnkStruct_ov21_021D0F60 * param0) Heap_FreeToHeap(param0); } -static void ov21_021D1E74 (void) +static void ov21_021D1E74(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -1057,14 +1056,16 @@ static void ov21_021D1E74 (void) GXLayers_SetBanks(&v0); } -static void ov21_021D1E94 (int param0) +static void ov21_021D1E94(int param0) { NNS_G2dInitOamManagerModule(); sub_0200A784(0, 128, 0, 32, 0, 128, 0, 32, param0); { UnkStruct_ov22_022559F8 v0 = { - 32, 0x14000, 0x4000, + 32, + 0x14000, + 0x4000, }; v0.unk_0C = param0; @@ -1076,13 +1077,13 @@ static void ov21_021D1E94 (int param0) sub_0201F8E4(); } -static void ov21_021D1EEC (UnkStruct_ov21_021D0F60 * param0) +static void ov21_021D1EEC(UnkStruct_ov21_021D0F60 *param0) { ov21_021D426C(param0->unk_1A70, ¶m0->unk_1A80, 1); param0->unk_1A60 = 1; } -static void ov21_021D1F10 (void) +static void ov21_021D1F10(void) { NNS_G3dInit(); @@ -1099,7 +1100,7 @@ static void ov21_021D1F10 (void) NNS_GfdInitFrmPlttVramManager(0x4000, 1); } -static void ov21_021D1F84 (void) +static void ov21_021D1F84(void) { NNS_GfdResetFrmTexVramState(); NNS_GfdResetFrmPlttVramState(); diff --git a/src/overlay021/ov21_021D1F90.c b/src/overlay021/ov21_021D1F90.c index b384bb8aa1..1ef991de0c 100644 --- a/src/overlay021/ov21_021D1F90.c +++ b/src/overlay021/ov21_021D1F90.c @@ -1,29 +1,29 @@ +#include "overlay021/ov21_021D1F90.h" + #include #include -#include "overlay021/ov21_021D1F90.h" - -int ov21_021D1F90 (void) +int ov21_021D1F90(void) { return 70; } -int ov21_021D1F94 (int param0) +int ov21_021D1F94(int param0) { return 3 + param0; } -int ov21_021D1F98 (void) +int ov21_021D1F98(void) { return 0; } -int ov21_021D1F9C (void) +int ov21_021D1F9C(void) { return 2; } -int ov21_021D1FA0 (void) +int ov21_021D1FA0(void) { return 1; } diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index ec73875abf..6fe444d08c 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -1,18 +1,20 @@ +#include "overlay021/ov21_021D1FA4.h" + #include #include -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay021/struct_ov21_021D4EE4_decl.h" - #include "struct_defs/archived_sprite.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021D4EE4.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D1FA4.h" #include "overlay021/struct_ov21_021D22F8.h" @@ -21,53 +23,52 @@ #include "overlay021/struct_ov21_021D2648.h" #include "overlay021/struct_ov21_021D3124.h" #include "overlay021/struct_ov21_021D4CB8.h" +#include "overlay021/struct_ov21_021D4EE4_decl.h" #include "overlay022/struct_ov22_022550D4.h" #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02002B7C.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" +#include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02002B7C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "sys_task.h" #include "unk_02012744.h" #include "unk_02015064.h" -#include "heap.h" #include "unk_02018340.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "pokemon.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021D4EE4.h" -static void ov21_021D2830(BGL * param0, int param1); -static void ov21_021D299C(BGL * param0); -static void ov21_021D29D0(UnkStruct_ov21_021D13FC * param0, int param1); -static void ov21_021D2A00(UnkStruct_ov21_021D13FC * param0); -static void ov21_021D2A0C(UnkStruct_ov21_021D13FC * param0, int param1); -static void ov21_021D2AB4(UnkStruct_ov21_021D13FC * param0); -static void ov21_021D2AE8(UnkStruct_ov21_021D13FC * param0, int param1); -static void ov21_021D2C10(UnkStruct_ov21_021D13FC * param0); -static void ov21_021D2C8C(UnkStruct_ov21_021D13FC * param0, int param1); -static void ov21_021D2D4C(UnkStruct_ov21_021D13FC * param0); -static void ov21_021D2E70(UnkStruct_ov21_021D13FC * param0, int param1); -static void ov21_021D2F14(UnkStruct_ov21_021D13FC * param0); -static void ov21_021D2F5C(UnkStruct_ov21_021D13FC * param0, int param1); -static void ov21_021D300C(UnkStruct_ov21_021D13FC * param0); -static void ov21_021D3034(UnkStruct_ov21_021D13FC * param0); -static void ov21_021D3054(UnkStruct_ov21_021D13FC * param0); -static void ov21_021D3064(SysTask * param0, void * param1); -static void ov21_021D30D8(UnkStruct_ov21_021D2584 * param0, int param1, int param2, int param3, int param4); -static void ov21_021D31D0(UnkStruct_ov21_021D13FC * param0); -static void ov21_021D31F0(UnkStruct_ov21_021D13FC * param0); -static void ov21_021D3124(UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3, int param4); -static void ov21_021D3194(SysTask * param0, void * param1); - -void ov21_021D1FA4 (UnkStruct_ov21_021D13FC * param0, int param1) +static void ov21_021D2830(BGL *param0, int param1); +static void ov21_021D299C(BGL *param0); +static void ov21_021D29D0(UnkStruct_ov21_021D13FC *param0, int param1); +static void ov21_021D2A00(UnkStruct_ov21_021D13FC *param0); +static void ov21_021D2A0C(UnkStruct_ov21_021D13FC *param0, int param1); +static void ov21_021D2AB4(UnkStruct_ov21_021D13FC *param0); +static void ov21_021D2AE8(UnkStruct_ov21_021D13FC *param0, int param1); +static void ov21_021D2C10(UnkStruct_ov21_021D13FC *param0); +static void ov21_021D2C8C(UnkStruct_ov21_021D13FC *param0, int param1); +static void ov21_021D2D4C(UnkStruct_ov21_021D13FC *param0); +static void ov21_021D2E70(UnkStruct_ov21_021D13FC *param0, int param1); +static void ov21_021D2F14(UnkStruct_ov21_021D13FC *param0); +static void ov21_021D2F5C(UnkStruct_ov21_021D13FC *param0, int param1); +static void ov21_021D300C(UnkStruct_ov21_021D13FC *param0); +static void ov21_021D3034(UnkStruct_ov21_021D13FC *param0); +static void ov21_021D3054(UnkStruct_ov21_021D13FC *param0); +static void ov21_021D3064(SysTask *param0, void *param1); +static void ov21_021D30D8(UnkStruct_ov21_021D2584 *param0, int param1, int param2, int param3, int param4); +static void ov21_021D31D0(UnkStruct_ov21_021D13FC *param0); +static void ov21_021D31F0(UnkStruct_ov21_021D13FC *param0); +static void ov21_021D3124(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3, int param4); +static void ov21_021D3194(SysTask *param0, void *param1); + +void ov21_021D1FA4(UnkStruct_ov21_021D13FC *param0, int param1) { UnkStruct_ov84_0223BA5C v0; UnkStruct_ov21_021D1FA4 v1; @@ -110,7 +111,7 @@ void ov21_021D1FA4 (UnkStruct_ov21_021D13FC * param0, int param1) ov21_021D2F5C(param0, param1); } -void ov21_021D2098 (UnkStruct_ov21_021D13FC * param0) +void ov21_021D2098(UnkStruct_ov21_021D13FC *param0) { ov21_021D2D4C(param0); ov21_021D2C10(param0); @@ -134,7 +135,7 @@ void ov21_021D2098 (UnkStruct_ov21_021D13FC * param0) memset(param0, 0, sizeof(UnkStruct_ov21_021D13FC)); } -void ov21_021D2124 (UnkStruct_ov21_021D13FC * param0) +void ov21_021D2124(UnkStruct_ov21_021D13FC *param0) { sub_020219F8(param0->unk_138); @@ -144,28 +145,28 @@ void ov21_021D2124 (UnkStruct_ov21_021D13FC * param0) sub_020150EC(param0->unk_164); } -void ov21_021D214C (UnkStruct_ov21_021D13FC * param0) +void ov21_021D214C(UnkStruct_ov21_021D13FC *param0) { sub_0201C2B8(param0->unk_00); sub_02008A94(param0->unk_150); } -void ov21_021D2164 (UnkStruct_ov21_021D13FC * param0, int param1, int param2) +void ov21_021D2164(UnkStruct_ov21_021D13FC *param0, int param1, int param2) { ov21_021D222C(param0, param1, param2, 0); } -Sprite * ov21_021D2170 (const UnkStruct_ov21_021D13FC * param0) +Sprite *ov21_021D2170(const UnkStruct_ov21_021D13FC *param0) { return ov21_021D2274(param0, 0); } -void ov21_021D217C (const UnkStruct_ov21_021D13FC * param0, BOOL param1) +void ov21_021D217C(const UnkStruct_ov21_021D13FC *param0, BOOL param1) { ov21_021D2280(param0, param1, 0); } -void ov21_021D2188 (UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3, int param4, u8 param5, u32 param6, int param7, int param8, int param9) +void ov21_021D2188(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3, int param4, u8 param5, u32 param6, int param7, int param8, int param9) { ArchivedSprite v0; s16 v1; @@ -191,24 +192,24 @@ void ov21_021D2188 (UnkStruct_ov21_021D13FC * param0, int param1, int param2, in param0->unk_150, &v0, param7, param8 + v1, 0, 0, NULL, NULL); } -void ov21_021D222C (UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3) +void ov21_021D222C(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3) { sub_02007DEC(param0->unk_154[param3], 0, param1); sub_02007DEC(param0->unk_154[param3], 1, param2); } -void ov21_021D2250 (UnkStruct_ov21_021D13FC * param0, int * param1, int * param2, int param3) +void ov21_021D2250(UnkStruct_ov21_021D13FC *param0, int *param1, int *param2, int param3) { *param1 = sub_020080C0(param0->unk_154[param3], 0); *param2 = sub_020080C0(param0->unk_154[param3], 1); } -Sprite * ov21_021D2274 (const UnkStruct_ov21_021D13FC * param0, int param1) +Sprite *ov21_021D2274(const UnkStruct_ov21_021D13FC *param0, int param1) { return param0->unk_154[param1]; } -void ov21_021D2280 (const UnkStruct_ov21_021D13FC * param0, BOOL param1, int param2) +void ov21_021D2280(const UnkStruct_ov21_021D13FC *param0, BOOL param1, int param2) { if (param0->unk_154[param2] == NULL) { return; @@ -221,24 +222,24 @@ void ov21_021D2280 (const UnkStruct_ov21_021D13FC * param0, BOOL param1, int par } } -GraphicElementData * ov21_021D22A8 (const UnkStruct_ov21_021D13FC * param0) +GraphicElementData *ov21_021D22A8(const UnkStruct_ov21_021D13FC *param0) { GF_ASSERT(param0->unk_1B0.unk_00); return param0->unk_1B0.unk_00; } -GraphicElementData * ov21_021D22C4 (const UnkStruct_ov21_021D13FC * param0) +GraphicElementData *ov21_021D22C4(const UnkStruct_ov21_021D13FC *param0) { GF_ASSERT(param0->unk_1B0.unk_04); return param0->unk_1B0.unk_04; } -void ov21_021D22E0 (UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D4CB8 * param1, int param2, int param3, u32 param4) +void ov21_021D22E0(UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D4CB8 *param1, int param2, int param3, u32 param4) { ov21_021D22F8(¶m0->unk_1B0, param1, param2, param3, param4); } -void ov21_021D22F8 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_ov21_021D4CB8 * param1, int param2, int param3, u32 param4) +void ov21_021D22F8(UnkStruct_ov21_021D22F8 *param0, UnkStruct_ov21_021D4CB8 *param1, int param2, int param3, u32 param4) { if ((param3 == param0->unk_28) && (param4 == param0->unk_2C)) { sub_020129D0(param0->unk_08->unk_00, 1); @@ -259,27 +260,27 @@ void ov21_021D22F8 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_ov21_021D4CB8 * } } -UnkStruct_02009DC8 * ov21_021D2344 (const UnkStruct_ov21_021D13FC * param0, int param1) +UnkStruct_02009DC8 *ov21_021D2344(const UnkStruct_ov21_021D13FC *param0, int param1) { GF_ASSERT(param1 <= 3); return param0->unk_1B0.unk_0C[param1]; } -void ov21_021D2360 (const UnkStruct_ov21_021D13FC * param0, GXOamMode param1) +void ov21_021D2360(const UnkStruct_ov21_021D13FC *param0, GXOamMode param1) { sub_02021FE0(param0->unk_1B0.unk_00, param1); sub_02021FE0(param0->unk_1B0.unk_04, param1); sub_02012AF0(param0->unk_1B0.unk_08->unk_00, param1); } -void ov21_021D238C (const UnkStruct_ov21_021D13FC * param0, int param1) +void ov21_021D238C(const UnkStruct_ov21_021D13FC *param0, int param1) { sub_02021E80(param0->unk_1B0.unk_00, param1); sub_02021E80(param0->unk_1B0.unk_04, param1); sub_02012A00(param0->unk_1B0.unk_08->unk_00, param1); } -void ov21_021D23C0 (const UnkStruct_ov21_021D13FC * param0, BOOL param1) +void ov21_021D23C0(const UnkStruct_ov21_021D13FC *param0, BOOL param1) { if (param0->unk_1B0.unk_00) { sub_02021CAC(param0->unk_1B0.unk_00, param1); @@ -294,7 +295,7 @@ void ov21_021D23C0 (const UnkStruct_ov21_021D13FC * param0, BOOL param1) } } -void ov21_021D23F8 (UnkStruct_ov21_021D23F8 * param0, u8 param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) +void ov21_021D23F8(UnkStruct_ov21_021D23F8 *param0, u8 param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { param0->unk_00 = param8; param0->unk_04 = param6; @@ -307,7 +308,7 @@ void ov21_021D23F8 (UnkStruct_ov21_021D23F8 * param0, u8 param1, int param2, int param0->unk_20 = 0; } -BOOL ov21_021D2424 (UnkStruct_ov21_021D23F8 * param0) +BOOL ov21_021D2424(UnkStruct_ov21_021D23F8 *param0) { int v0, v1; @@ -327,7 +328,7 @@ BOOL ov21_021D2424 (UnkStruct_ov21_021D23F8 * param0) return ov21_021D24EC(param0); } -int ov21_021D2484 (UnkStruct_ov21_021D23F8 * param0) +int ov21_021D2484(UnkStruct_ov21_021D23F8 *param0) { fx32 v0; @@ -337,7 +338,7 @@ int ov21_021D2484 (UnkStruct_ov21_021D23F8 * param0) return (v0 >> FX32_SHIFT) + param0->unk_14; } -int ov21_021D24B8 (UnkStruct_ov21_021D23F8 * param0) +int ov21_021D24B8(UnkStruct_ov21_021D23F8 *param0) { fx32 v0; @@ -347,7 +348,7 @@ int ov21_021D24B8 (UnkStruct_ov21_021D23F8 * param0) return (v0 >> FX32_SHIFT) + param0->unk_0C; } -BOOL ov21_021D24EC (UnkStruct_ov21_021D23F8 * param0) +BOOL ov21_021D24EC(UnkStruct_ov21_021D23F8 *param0) { if (param0->unk_20 <= param0->unk_1C) { return 0; @@ -356,9 +357,9 @@ BOOL ov21_021D24EC (UnkStruct_ov21_021D23F8 * param0) return 1; } -void ov21_021D24FC (const UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D23F8 * param1) +void ov21_021D24FC(const UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D23F8 *param1) { - Sprite * v0; + Sprite *v0; int v1; v1 = -ov21_021D24B8(param1); @@ -367,9 +368,9 @@ void ov21_021D24FC (const UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D2 sub_020086FC(v0, v1, v1, 0, 0); } -void ov21_021D251C (const UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D23F8 * param1, int param2) +void ov21_021D251C(const UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D23F8 *param1, int param2) { - Sprite * v0; + Sprite *v0; int v1; v1 = -ov21_021D24B8(param1); @@ -378,7 +379,7 @@ void ov21_021D251C (const UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D2 sub_020086FC(v0, v1, v1, 0, 0); } -void ov21_021D2544 (const UnkStruct_ov21_021D4EE4 * param0, UnkStruct_ov21_021D13FC * param1) +void ov21_021D2544(const UnkStruct_ov21_021D4EE4 *param0, UnkStruct_ov21_021D13FC *param1) { int v0, v1, v2, v3; @@ -387,12 +388,12 @@ void ov21_021D2544 (const UnkStruct_ov21_021D4EE4 * param0, UnkStruct_ov21_021D1 ov21_021D2574(param1, v0, v1, v2, v3); } -void ov21_021D2574 (UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3, int param4) +void ov21_021D2574(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3, int param4) { ov21_021D3124(param0, param1, param2, param3, param4); } -void ov21_021D2584 (UnkStruct_ov21_021D2584 * param0, int param1) +void ov21_021D2584(UnkStruct_ov21_021D2584 *param0, int param1) { int v0; @@ -401,12 +402,12 @@ void ov21_021D2584 (UnkStruct_ov21_021D2584 * param0, int param1) } } -BOOL ov21_021D25A0 (UnkStruct_ov21_021D2584 * param0) +BOOL ov21_021D25A0(UnkStruct_ov21_021D2584 *param0) { return sub_02021D34(param0->unk_00[0]); } -void ov21_021D25AC (UnkStruct_ov21_021D2584 * param0, BOOL param1) +void ov21_021D25AC(UnkStruct_ov21_021D2584 *param0, BOOL param1) { param0->unk_30 = param1; @@ -415,7 +416,7 @@ void ov21_021D25AC (UnkStruct_ov21_021D2584 * param0, BOOL param1) } } -void ov21_021D25B8 (const UnkStruct_ov21_021D4EE4 * param0, UnkStruct_ov21_021D13FC * param1) +void ov21_021D25B8(const UnkStruct_ov21_021D4EE4 *param0, UnkStruct_ov21_021D13FC *param1) { int v0, v1, v2, v3; @@ -424,7 +425,7 @@ void ov21_021D25B8 (const UnkStruct_ov21_021D4EE4 * param0, UnkStruct_ov21_021D1 ov21_021D25E8(param1, v0, v1, v2, v3); } -void ov21_021D25E8 (UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3, int param4) +void ov21_021D25E8(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3, int param4) { param0->unk_1E0.unk_20 = param1; param0->unk_1E0.unk_24 = param2; @@ -440,7 +441,7 @@ void ov21_021D25E8 (UnkStruct_ov21_021D13FC * param0, int param1, int param2, in param0->unk_218.unk_54 = 0; } -void ov21_021D2648 (UnkStruct_ov21_021D2648 * param0, int param1, int param2, int param3, int param4, int param5) +void ov21_021D2648(UnkStruct_ov21_021D2648 *param0, int param1, int param2, int param3, int param4, int param5) { param0->unk_00 = param1; param0->unk_04 = param3; @@ -452,7 +453,7 @@ void ov21_021D2648 (UnkStruct_ov21_021D2648 * param0, int param1, int param2, in param0->unk_18 = 0; } -BOOL ov21_021D2664 (UnkStruct_ov21_021D2648 * param0) +BOOL ov21_021D2664(UnkStruct_ov21_021D2648 *param0) { fx32 v0, v1; @@ -473,20 +474,20 @@ BOOL ov21_021D2664 (UnkStruct_ov21_021D2648 * param0) return 1; } -NARC * ov21_021D26E0 (UnkStruct_ov21_021D13FC * param0) +NARC *ov21_021D26E0(UnkStruct_ov21_021D13FC *param0) { return param0->unk_278; } -void * ov21_021D26E8 (UnkStruct_ov21_021D13FC * param0, u32 param1, BOOL param2, u32 param3) +void *ov21_021D26E8(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, u32 param3) { - void * v0; + void *v0; v0 = NARC_AllocAndReadWholeMember(param0->unk_278, param1, param3); if (v0 != NULL) { if (param2) { - void * v1; + void *v1; v1 = Heap_AllocFromHeap(param3, MI_GetUncompressedSize(v0)); @@ -502,12 +503,12 @@ void * ov21_021D26E8 (UnkStruct_ov21_021D13FC * param0, u32 param1, BOOL param2, return v0; } -u32 ov21_021D2724 (UnkStruct_ov21_021D13FC * param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +u32 ov21_021D2724(UnkStruct_ov21_021D13FC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { - void * v0 = ov21_021D26E8(param0, param1, param6, param7); + void *v0 = ov21_021D26E8(param0, param1, param6, param7); if (v0 != NULL) { - NNSG2dCharacterData * v1; + NNSG2dCharacterData *v1; if (NNS_G2dGetUnpackedBGCharacterData(v0, &v1)) { if (param5 == 0) { @@ -523,9 +524,9 @@ u32 ov21_021D2724 (UnkStruct_ov21_021D13FC * param0, u32 param1, BGL * param2, u return param5; } -void ov21_021D276C (UnkStruct_ov21_021D13FC * param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) +void ov21_021D276C(UnkStruct_ov21_021D13FC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) { - static void(*const v0[])(const void *, u32, u32) = { + static void (*const v0[])(const void *, u32, u32) = { GX_LoadBGPltt, GX_LoadOBJPltt, GX_LoadBGExtPltt, @@ -536,10 +537,10 @@ void ov21_021D276C (UnkStruct_ov21_021D13FC * param0, u32 param1, int param2, u3 GXS_LoadOBJExtPltt }; - void * v1 = ov21_021D26E8(param0, param1, 0, param5); + void *v1 = ov21_021D26E8(param0, param1, 0, param5); if (v1 != NULL) { - NNSG2dPaletteData * v2; + NNSG2dPaletteData *v2; if (NNS_G2dGetUnpackedPaletteData(v1, &v2)) { if (param4 == 0) { @@ -554,9 +555,9 @@ void ov21_021D276C (UnkStruct_ov21_021D13FC * param0, u32 param1, int param2, u3 } } -void * ov21_021D27B8 (UnkStruct_ov21_021D13FC * param0, u32 param1, BOOL param2, NNSG2dScreenData ** param3, u32 param4) +void *ov21_021D27B8(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4) { - void * v0 = ov21_021D26E8(param0, param1, param2, param4); + void *v0 = ov21_021D26E8(param0, param1, param2, param4); if (v0 != NULL) { if (NNS_G2dGetUnpackedScreenData(v0, param3) == 0) { @@ -568,9 +569,9 @@ void * ov21_021D27B8 (UnkStruct_ov21_021D13FC * param0, u32 param1, BOOL param2, return v0; } -void * ov21_021D27E0 (UnkStruct_ov21_021D13FC * param0, u32 param1, NNSG2dPaletteData ** param2, u32 param3) +void *ov21_021D27E0(UnkStruct_ov21_021D13FC *param0, u32 param1, NNSG2dPaletteData **param2, u32 param3) { - void * v0 = ov21_021D26E8(param0, param1, 0, param3); + void *v0 = ov21_021D26E8(param0, param1, 0, param3); if (v0 != NULL) { if (NNS_G2dGetUnpackedPaletteData(v0, param2) == 0) { @@ -582,9 +583,9 @@ void * ov21_021D27E0 (UnkStruct_ov21_021D13FC * param0, u32 param1, NNSG2dPalett return v0; } -void * ov21_021D2808 (UnkStruct_ov21_021D13FC * param0, u32 param1, BOOL param2, NNSG2dCharacterData ** param3, u32 param4) +void *ov21_021D2808(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4) { - void * v0 = ov21_021D26E8(param0, param1, param2, param4); + void *v0 = ov21_021D26E8(param0, param1, param2, param4); if (v0 != NULL) { if (NNS_G2dGetUnpackedBGCharacterData(v0, param3) == 0) { @@ -596,7 +597,7 @@ void * ov21_021D2808 (UnkStruct_ov21_021D13FC * param0, u32 param1, BOOL param2, return v0; } -static void ov21_021D2830 (BGL * param0, int param1) +static void ov21_021D2830(BGL *param0, int param1) { { UnkStruct_ov97_0222DB78 v0 = { @@ -734,7 +735,7 @@ static void ov21_021D2830 (BGL * param0, int param1) } } -static void ov21_021D299C (BGL * param0) +static void ov21_021D299C(BGL *param0) { sub_02019044(param0, 1); sub_02019044(param0, 2); @@ -744,19 +745,19 @@ static void ov21_021D299C (BGL * param0) sub_02019044(param0, 6); } -static void ov21_021D29D0 (UnkStruct_ov21_021D13FC * param0, int param1) +static void ov21_021D29D0(UnkStruct_ov21_021D13FC *param0, int param1) { BGL_AddWindow(param0->unk_00, ¶m0->unk_04, 1, 0, 0, 32, 32, 0, 0); BGL_FillWindow(¶m0->unk_04, 0); sub_0201A954(¶m0->unk_04); } -static void ov21_021D2A00 (UnkStruct_ov21_021D13FC * param0) +static void ov21_021D2A00(UnkStruct_ov21_021D13FC *param0) { BGL_DeleteWindow(¶m0->unk_04); } -static void ov21_021D2A0C (UnkStruct_ov21_021D13FC * param0, int param1) +static void ov21_021D2A0C(UnkStruct_ov21_021D13FC *param0, int param1) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -784,7 +785,7 @@ static void ov21_021D2A0C (UnkStruct_ov21_021D13FC * param0, int param1) } } -static void ov21_021D2AB4 (UnkStruct_ov21_021D13FC * param0) +static void ov21_021D2AB4(UnkStruct_ov21_021D13FC *param0) { int v0; @@ -798,10 +799,10 @@ static void ov21_021D2AB4 (UnkStruct_ov21_021D13FC * param0) sub_020150A8(param0->unk_164); } -static void ov21_021D2AE8 (UnkStruct_ov21_021D13FC * param0, int param1) +static void ov21_021D2AE8(UnkStruct_ov21_021D13FC *param0, int param1) { - UnkStruct_ov21_021D22F8 * v0 = ¶m0->unk_1B0; - NARC * v1 = ov21_021D26E0(param0); + UnkStruct_ov21_021D22F8 *v0 = ¶m0->unk_1B0; + NARC *v1 = ov21_021D26E0(param0); v0->unk_0C[0] = sub_02009A4C(param0->unk_13C[0], v1, 78, 1, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, param1); @@ -817,7 +818,7 @@ static void ov21_021D2AE8 (UnkStruct_ov21_021D13FC * param0, int param1) v0->unk_0C[3] = sub_02009BC4(param0->unk_13C[3], v1, 77, 1, 3000, 3, param1); } -void ov21_021D2B88 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_02009714 ** param1, int param2, NARC * param3) +void ov21_021D2B88(UnkStruct_ov21_021D22F8 *param0, UnkStruct_02009714 **param1, int param2, NARC *param3) { param0->unk_0C[0] = sub_02009A4C(param1[0], param3, 78, 1, 3000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -833,9 +834,9 @@ void ov21_021D2B88 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_02009714 ** para param0->unk_0C[3] = sub_02009BC4(param1[3], param3, 77, 1, 3000, 3, param2); } -static void ov21_021D2C10 (UnkStruct_ov21_021D13FC * param0) +static void ov21_021D2C10(UnkStruct_ov21_021D13FC *param0) { - UnkStruct_ov21_021D22F8 * v0 = ¶m0->unk_1B0; + UnkStruct_ov21_021D22F8 *v0 = ¶m0->unk_1B0; sub_0200A4E4(v0->unk_0C[0]); sub_0200A6DC(v0->unk_0C[1]); @@ -846,7 +847,7 @@ static void ov21_021D2C10 (UnkStruct_ov21_021D13FC * param0) sub_02009D68(param0->unk_13C[3], v0->unk_0C[3]); } -void ov21_021D2C58 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_02009714 ** param1) +void ov21_021D2C58(UnkStruct_ov21_021D22F8 *param0, UnkStruct_02009714 **param1) { sub_0200A4E4(param0->unk_0C[0]); sub_0200A6DC(param0->unk_0C[1]); @@ -857,7 +858,7 @@ void ov21_021D2C58 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_02009714 ** para sub_02009D68(param1[3], param0->unk_0C[3]); } -static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1) +static void ov21_021D2C8C(UnkStruct_ov21_021D13FC *param0, int param1) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; @@ -890,7 +891,7 @@ static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1) param0->unk_1B0.unk_2C = 0; } -static void ov21_021D2D4C (UnkStruct_ov21_021D13FC * param0) +static void ov21_021D2D4C(UnkStruct_ov21_021D13FC *param0) { sub_02021BD4(param0->unk_1B0.unk_00); param0->unk_1B0.unk_00 = NULL; @@ -904,7 +905,7 @@ static void ov21_021D2D4C (UnkStruct_ov21_021D13FC * param0) } } -void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4) +void ov21_021D2D88(UnkStruct_ov21_021D22F8 *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3, int param4) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; @@ -937,7 +938,7 @@ void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * pa param0->unk_2C = 0; } -void ov21_021D2E1C (UnkStruct_ov21_021D22F8 * param0) +void ov21_021D2E1C(UnkStruct_ov21_021D22F8 *param0) { sub_02021BD4(param0->unk_00); param0->unk_00 = NULL; @@ -951,7 +952,7 @@ void ov21_021D2E1C (UnkStruct_ov21_021D22F8 * param0) } } -void ov21_021D2E44 (UnkStruct_ov21_021D22F8 * param0, BOOL param1) +void ov21_021D2E44(UnkStruct_ov21_021D22F8 *param0, BOOL param1) { if (param0->unk_00) { sub_02021CAC(param0->unk_00, param1); @@ -966,10 +967,10 @@ void ov21_021D2E44 (UnkStruct_ov21_021D22F8 * param0, BOOL param1) } } -static void ov21_021D2E70 (UnkStruct_ov21_021D13FC * param0, int param1) +static void ov21_021D2E70(UnkStruct_ov21_021D13FC *param0, int param1) { - UnkStruct_ov21_021D2584 * v0 = ¶m0->unk_1E0; - NARC * v1 = ov21_021D26E0(param0); + UnkStruct_ov21_021D2584 *v0 = ¶m0->unk_1E0; + NARC *v1 = ov21_021D26E0(param0); v0->unk_10[0] = sub_02009A4C(param0->unk_13C[0], v1, 119, 1, 12000, NNS_G2D_VRAM_TYPE_2DSUB, param1); @@ -985,9 +986,9 @@ static void ov21_021D2E70 (UnkStruct_ov21_021D13FC * param0, int param1) v0->unk_10[3] = sub_02009BC4(param0->unk_13C[3], v1, 118, 1, 12000, 3, param1); } -static void ov21_021D2F14 (UnkStruct_ov21_021D13FC * param0) +static void ov21_021D2F14(UnkStruct_ov21_021D13FC *param0) { - UnkStruct_ov21_021D2584 * v0 = ¶m0->unk_1E0; + UnkStruct_ov21_021D2584 *v0 = ¶m0->unk_1E0; sub_0200A4E4(v0->unk_10[0]); sub_0200A6DC(v0->unk_10[1]); @@ -998,12 +999,12 @@ static void ov21_021D2F14 (UnkStruct_ov21_021D13FC * param0) sub_02009D68(param0->unk_13C[3], v0->unk_10[3]); } -static void ov21_021D2F5C (UnkStruct_ov21_021D13FC * param0, int param1) +static void ov21_021D2F5C(UnkStruct_ov21_021D13FC *param0, int param1) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; int v2; - UnkStruct_ov21_021D2584 * v3 = ¶m0->unk_1E0; + UnkStruct_ov21_021D2584 *v3 = ¶m0->unk_1E0; sub_020093B4(&v0, 12000, 12000, 12000, 12000, 0xffffffff, 0xffffffff, 0, 0, param0->unk_13C[0], param0->unk_13C[1], param0->unk_13C[2], param0->unk_13C[3], NULL, NULL); @@ -1025,10 +1026,10 @@ static void ov21_021D2F5C (UnkStruct_ov21_021D13FC * param0, int param1) ov21_021D31D0(param0); } -static void ov21_021D300C (UnkStruct_ov21_021D13FC * param0) +static void ov21_021D300C(UnkStruct_ov21_021D13FC *param0) { int v0; - UnkStruct_ov21_021D2584 * v1 = ¶m0->unk_1E0; + UnkStruct_ov21_021D2584 *v1 = ¶m0->unk_1E0; ov21_021D31F0(param0); ov21_021D3054(param0); @@ -1038,19 +1039,19 @@ static void ov21_021D300C (UnkStruct_ov21_021D13FC * param0) } } -static void ov21_021D3034 (UnkStruct_ov21_021D13FC * param0) +static void ov21_021D3034(UnkStruct_ov21_021D13FC *param0) { param0->unk_270 = SysTask_Start(ov21_021D3064, ¶m0->unk_1E0, 1); } -static void ov21_021D3054 (UnkStruct_ov21_021D13FC * param0) +static void ov21_021D3054(UnkStruct_ov21_021D13FC *param0) { SysTask_Done(param0->unk_270); } -static void ov21_021D3064 (SysTask * param0, void * param1) +static void ov21_021D3064(SysTask *param0, void *param1) { - UnkStruct_ov21_021D2584 * v0 = param1; + UnkStruct_ov21_021D2584 *v0 = param1; int v1; int v2, v3; fx32 v4; @@ -1078,7 +1079,7 @@ static void ov21_021D3064 (SysTask * param0, void * param1) ov21_021D30D8(v0, v0->unk_20, v0->unk_24, v2, v3); } -static void ov21_021D30D8 (UnkStruct_ov21_021D2584 * param0, int param1, int param2, int param3, int param4) +static void ov21_021D30D8(UnkStruct_ov21_021D2584 *param0, int param1, int param2, int param3, int param4) { VecFx32 v0; int v1, v2; @@ -1093,9 +1094,9 @@ static void ov21_021D30D8 (UnkStruct_ov21_021D2584 * param0, int param1, int par } } -static void ov21_021D3124 (UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3, int param4) +static void ov21_021D3124(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3, int param4) { - UnkStruct_ov21_021D3124 * v0 = ¶m0->unk_218; + UnkStruct_ov21_021D3124 *v0 = ¶m0->unk_218; if ((v0->unk_44 == param1) && (v0->unk_48 == param2) && (v0->unk_4C == param3) && (v0->unk_50 == param4)) { return; @@ -1113,9 +1114,9 @@ static void ov21_021D3124 (UnkStruct_ov21_021D13FC * param0, int param1, int par v0->unk_54 = 1; } -static void ov21_021D3194 (SysTask * param0, void * param1) +static void ov21_021D3194(SysTask *param0, void *param1) { - UnkStruct_ov21_021D3124 * v0 = param1; + UnkStruct_ov21_021D3124 *v0 = param1; BOOL v1; if (v0->unk_54 == 0) { @@ -1135,12 +1136,12 @@ static void ov21_021D3194 (SysTask * param0, void * param1) } } -static void ov21_021D31D0 (UnkStruct_ov21_021D13FC * param0) +static void ov21_021D31D0(UnkStruct_ov21_021D13FC *param0) { param0->unk_274 = SysTask_Start(ov21_021D3194, ¶m0->unk_218, 0); } -static void ov21_021D31F0 (UnkStruct_ov21_021D13FC * param0) +static void ov21_021D31F0(UnkStruct_ov21_021D13FC *param0) { SysTask_Done(param0->unk_274); param0->unk_274 = NULL; diff --git a/src/overlay021/ov21_021D3208.c b/src/overlay021/ov21_021D3208.c index 71298591f9..e4d656665e 100644 --- a/src/overlay021/ov21_021D3208.c +++ b/src/overlay021/ov21_021D3208.c @@ -1,9 +1,8 @@ +#include "overlay021/ov21_021D3208.h" + #include #include -#include "core_sys.h" - -#include "strbuf.h" #include "struct_decls/pokedexdata_decl.h" #include "overlay021/struct_ov21_021D3208.h" @@ -11,28 +10,28 @@ #include "overlay021/struct_ov21_021D37DC.h" #include "overlay021/struct_ov21_021D3A60.h" -#include "unk_02006E3C.h" +#include "core_sys.h" #include "heap.h" #include "strbuf.h" #include "trainer_info.h" +#include "unk_02006E3C.h" #include "unk_0202631C.h" #include "unk_02098700.h" #include "unk_02098988.h" -#include "overlay021/ov21_021D3208.h" -static void ov21_021D39A4(u16 * param0, int * param1, const PokedexData * param2, const u16 * param3, int param4); -static void ov21_021D39E4(u16 * param0, int * param1, const u16 * param2, int param3, const u16 * param4, int param5, BOOL param6, const PokedexData * param7); -static void ov21_021D3A60(UnkStruct_ov21_021D3A60 * param0, const PokedexData * param1, const u16 * param2, int param3); -static void ov21_021D3AB8(UnkStruct_ov21_021D3A60 * param0, const u16 * param1, int param2); -static void ov21_021D3B28(UnkStruct_ov21_021D3A60 * param0); -static void ov21_021D3FA8(UnkStruct_ov21_021D3A60 * param0, int * param1, int * param2); -static u16 * ov21_021D3B64(int param0, int param1, int * param2); -static void ov21_021D3B98(int param0, u16 * param1, int * param2, const u16 * param3, int param4, int param5, const PokedexData * param6); -static void ov21_021D3C48(int param0, u16 * param1, int * param2, const u16 * param3, int param4, int param5, const PokedexData * param6); -static void ov21_021D3D2C(int param0, u16 * param1, int * param2, const u16 * param3, int param4, int param5, const PokedexData * param6); -static void ov21_021D3E80(int param0, u16 * param1, int * param2, const u16 * param3, int param4, int param5, const PokedexData * param6); +static void ov21_021D39A4(u16 *param0, int *param1, const PokedexData *param2, const u16 *param3, int param4); +static void ov21_021D39E4(u16 *param0, int *param1, const u16 *param2, int param3, const u16 *param4, int param5, BOOL param6, const PokedexData *param7); +static void ov21_021D3A60(UnkStruct_ov21_021D3A60 *param0, const PokedexData *param1, const u16 *param2, int param3); +static void ov21_021D3AB8(UnkStruct_ov21_021D3A60 *param0, const u16 *param1, int param2); +static void ov21_021D3B28(UnkStruct_ov21_021D3A60 *param0); +static void ov21_021D3FA8(UnkStruct_ov21_021D3A60 *param0, int *param1, int *param2); +static u16 *ov21_021D3B64(int param0, int param1, int *param2); +static void ov21_021D3B98(int param0, u16 *param1, int *param2, const u16 *param3, int param4, int param5, const PokedexData *param6); +static void ov21_021D3C48(int param0, u16 *param1, int *param2, const u16 *param3, int param4, int param5, const PokedexData *param6); +static void ov21_021D3D2C(int param0, u16 *param1, int *param2, const u16 *param3, int param4, int param5, const PokedexData *param6); +static void ov21_021D3E80(int param0, u16 *param1, int *param2, const u16 *param3, int param4, int param5, const PokedexData *param6); -void ov21_021D3208 (UnkStruct_ov21_021D3320 * param0, UnkStruct_ov21_021D3208 * param1, int param2) +void ov21_021D3208(UnkStruct_ov21_021D3320 *param0, UnkStruct_ov21_021D3208 *param1, int param2) { int v0; int v1; @@ -104,7 +103,7 @@ void ov21_021D3208 (UnkStruct_ov21_021D3320 * param0, UnkStruct_ov21_021D3208 * param0->unk_176C = param1->unk_18; } -void ov21_021D3320 (UnkStruct_ov21_021D3320 * param0) +void ov21_021D3320(UnkStruct_ov21_021D3320 *param0) { Strbuf_Free(param0->unk_1754); Pokedex_HeightWeightData_Release(param0->unk_1748); @@ -113,7 +112,7 @@ void ov21_021D3320 (UnkStruct_ov21_021D3320 * param0) param0->unk_1748 = NULL; } -u32 ov21_021D334C (const UnkStruct_ov21_021D3320 * param0, int param1, int param2) +u32 ov21_021D334C(const UnkStruct_ov21_021D3320 *param0, int param1, int param2) { u32 v0; @@ -121,7 +120,7 @@ u32 ov21_021D334C (const UnkStruct_ov21_021D3320 * param0, int param1, int param return v0; } -u32 ov21_021D335C (const UnkStruct_ov21_021D3320 * param0, int param1) +u32 ov21_021D335C(const UnkStruct_ov21_021D3320 *param0, int param1) { int v0; @@ -131,7 +130,7 @@ u32 ov21_021D335C (const UnkStruct_ov21_021D3320 * param0, int param1) return v0; } -u32 ov21_021D3374 (const UnkStruct_ov21_021D3320 * param0, int param1) +u32 ov21_021D3374(const UnkStruct_ov21_021D3320 *param0, int param1) { u32 v0; @@ -141,7 +140,7 @@ u32 ov21_021D3374 (const UnkStruct_ov21_021D3320 * param0, int param1) return v0; } -u32 ov21_021D338C (const UnkStruct_ov21_021D3320 * param0, int param1) +u32 ov21_021D338C(const UnkStruct_ov21_021D3320 *param0, int param1) { u32 v0; @@ -151,7 +150,7 @@ u32 ov21_021D338C (const UnkStruct_ov21_021D3320 * param0, int param1) return v0; } -u32 ov21_021D33A4 (const UnkStruct_ov21_021D3320 * param0, int param1) +u32 ov21_021D33A4(const UnkStruct_ov21_021D3320 *param0, int param1) { u32 v0; @@ -161,7 +160,7 @@ u32 ov21_021D33A4 (const UnkStruct_ov21_021D3320 * param0, int param1) return v0; } -u32 ov21_021D33BC (const UnkStruct_ov21_021D3320 * param0, int param1) +u32 ov21_021D33BC(const UnkStruct_ov21_021D3320 *param0, int param1) { u32 v0; @@ -171,12 +170,12 @@ u32 ov21_021D33BC (const UnkStruct_ov21_021D3320 * param0, int param1) return v0; } -u32 ov21_021D33D4 (const UnkStruct_ov21_021D3320 * param0, u32 param1) +u32 ov21_021D33D4(const UnkStruct_ov21_021D3320 *param0, u32 param1) { return sub_0202756C(param0->unk_00, param1, 0); } -u32 ov21_021D33E0 (const UnkStruct_ov21_021D3320 * param0, int param1) +u32 ov21_021D33E0(const UnkStruct_ov21_021D3320 *param0, int param1) { int v0 = ov21_021D334C(param0, param1, 1); @@ -187,58 +186,58 @@ u32 ov21_021D33E0 (const UnkStruct_ov21_021D3320 * param0, int param1) return 2; } -u32 ov21_021D33F8 (const UnkStruct_ov21_021D3320 * param0) +u32 ov21_021D33F8(const UnkStruct_ov21_021D3320 *param0) { return sub_0202702C(param0->unk_00, 0); } -u32 ov21_021D3404 (const UnkStruct_ov21_021D3320 * param0, int param1) +u32 ov21_021D3404(const UnkStruct_ov21_021D3320 *param0, int param1) { return sub_02027264(param0->unk_00, param1); } -u32 ov21_021D3410 (const UnkStruct_ov21_021D3320 * param0, u32 param1, int param2) +u32 ov21_021D3410(const UnkStruct_ov21_021D3320 *param0, u32 param1, int param2) { return sub_0202756C(param0->unk_00, param1, param2); } -u32 ov21_021D341C (const UnkStruct_ov21_021D3320 * param0, u32 param1) +u32 ov21_021D341C(const UnkStruct_ov21_021D3320 *param0, u32 param1) { return sub_020276C8(param0->unk_00, param1); } -BOOL ov21_021D3428 (const UnkStruct_ov21_021D3320 * param0) +BOOL ov21_021D3428(const UnkStruct_ov21_021D3320 *param0) { return sub_02027474(param0->unk_00); } -void ov21_021D3434 (UnkStruct_ov21_021D3320 * param0, u32 param1) +void ov21_021D3434(UnkStruct_ov21_021D3320 *param0, u32 param1) { param0->unk_175C = param1; } -u32 ov21_021D3440 (const UnkStruct_ov21_021D3320 * param0) +u32 ov21_021D3440(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_175C; } -void ov21_021D344C (UnkStruct_ov21_021D3320 * param0, u32 param1) +void ov21_021D344C(UnkStruct_ov21_021D3320 *param0, u32 param1) { param0->unk_175E = param1; } -u32 ov21_021D3458 (const UnkStruct_ov21_021D3320 * param0) +u32 ov21_021D3458(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_175E; } -BOOL ov21_021D3464 (UnkStruct_ov21_021D3320 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, BOOL param8) +BOOL ov21_021D3464(UnkStruct_ov21_021D3320 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, BOOL param8) { - u16 * v0; + u16 *v0; int v1; - u16 * v2; + u16 *v2; int v3; - u16 * v4; + u16 *v4; int v5; BOOL v6; @@ -326,7 +325,7 @@ BOOL ov21_021D3464 (UnkStruct_ov21_021D3320 * param0, int param1, int param2, in ov21_021D3A60(¶m0->unk_04, param0->unk_00, v0, v1); - if (((param1 != 0) || (param2 != 0) || (param3 != 0) || (param4 != 0) || (param5 != 0))) { + if ((param1 != 0) || (param2 != 0) || (param3 != 0) || (param4 != 0) || (param5 != 0)) { param8 = 1; } @@ -348,12 +347,12 @@ BOOL ov21_021D3464 (UnkStruct_ov21_021D3320 * param0, int param1, int param2, in return v6; } -BOOL ov21_021D3684 (UnkStruct_ov21_021D3320 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7) +BOOL ov21_021D3684(UnkStruct_ov21_021D3320 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7) { return ov21_021D3464(param0, param1, param2, param3, param4, param5, param6, param7, 0); } -BOOL ov21_021D36A4 (const UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D36A4(const UnkStruct_ov21_021D3320 *param0, int param1) { if (param1 == 0) { return 1; @@ -366,7 +365,7 @@ BOOL ov21_021D36A4 (const UnkStruct_ov21_021D3320 * param0, int param1) return 0; } -BOOL ov21_021D36C0 (UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D36C0(UnkStruct_ov21_021D3320 *param0, int param1) { BOOL v0; @@ -379,12 +378,12 @@ BOOL ov21_021D36C0 (UnkStruct_ov21_021D3320 * param0, int param1) return v0; } -int ov21_021D36D8 (const UnkStruct_ov21_021D3320 * param0) +int ov21_021D36D8(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_1730; } -BOOL ov21_021D36E4 (const UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D36E4(const UnkStruct_ov21_021D3320 *param0, int param1) { if (((param1) >= 0) && ((param1) < param0->unk_04.unk_F6C)) { return 1; @@ -393,7 +392,7 @@ BOOL ov21_021D36E4 (const UnkStruct_ov21_021D3320 * param0, int param1) return 0; } -BOOL ov21_021D36FC (UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D36FC(UnkStruct_ov21_021D3320 *param0, int param1) { if (ov21_021D36E4(param0, param1)) { param0->unk_04.unk_F68 = param1; @@ -403,7 +402,7 @@ BOOL ov21_021D36FC (UnkStruct_ov21_021D3320 * param0, int param1) return 0; } -BOOL ov21_021D371C (UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D371C(UnkStruct_ov21_021D3320 *param0, int param1) { if (ov21_021D36E4(param0, param0->unk_04.unk_F68 + param1)) { param0->unk_04.unk_F68 += param1; @@ -419,17 +418,17 @@ BOOL ov21_021D371C (UnkStruct_ov21_021D3320 * param0, int param1) return 0; } -int ov21_021D375C (const UnkStruct_ov21_021D3320 * param0) +int ov21_021D375C(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_04.unk_F68; } -int ov21_021D3768 (const UnkStruct_ov21_021D3320 * param0) +int ov21_021D3768(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_04.unk_F6C; } -int ov21_021D3770 (const UnkStruct_ov21_021D3320 * param0, u32 param1) +int ov21_021D3770(const UnkStruct_ov21_021D3320 *param0, u32 param1) { int v0; int v1 = ov21_021D3768(param0); @@ -446,7 +445,7 @@ int ov21_021D3770 (const UnkStruct_ov21_021D3320 * param0, u32 param1) return v0; } -BOOL ov21_021D3794 (UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D3794(UnkStruct_ov21_021D3320 *param0, int param1) { u32 v0 = ov21_021D3768(param0); u32 v1 = ov21_021D3770(param0, param1); @@ -458,17 +457,17 @@ BOOL ov21_021D3794 (UnkStruct_ov21_021D3320 * param0, int param1) return 0; } -int ov21_021D37BC (const UnkStruct_ov21_021D3320 * param0) +int ov21_021D37BC(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_04.unk_00[param0->unk_04.unk_F68].unk_00; } -int ov21_021D37CC (const UnkStruct_ov21_021D3320 * param0) +int ov21_021D37CC(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_04.unk_00[param0->unk_04.unk_F68].unk_04; } -const UnkStruct_ov21_021D37DC * ov21_021D37DC (const UnkStruct_ov21_021D3320 * param0, int param1) +const UnkStruct_ov21_021D37DC *ov21_021D37DC(const UnkStruct_ov21_021D3320 *param0, int param1) { if (ov21_021D36E4(param0, param1)) { return ¶m0->unk_04.unk_00[param1]; @@ -477,7 +476,7 @@ const UnkStruct_ov21_021D37DC * ov21_021D37DC (const UnkStruct_ov21_021D3320 * p return NULL; } -BOOL ov21_021D37F8 (const UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D37F8(const UnkStruct_ov21_021D3320 *param0, int param1) { if ((param0->unk_04.unk_1728 > param1) && (param1 >= 0)) { return 1; @@ -486,7 +485,7 @@ BOOL ov21_021D37F8 (const UnkStruct_ov21_021D3320 * param0, int param1) return 0; } -BOOL ov21_021D3810 (UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D3810(UnkStruct_ov21_021D3320 *param0, int param1) { if (ov21_021D37F8(param0, param1)) { param0->unk_04.unk_1724 = param1; @@ -498,7 +497,7 @@ BOOL ov21_021D3810 (UnkStruct_ov21_021D3320 * param0, int param1) return 0; } -BOOL ov21_021D3844 (UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D3844(UnkStruct_ov21_021D3320 *param0, int param1) { if (ov21_021D387C(param0, param1)) { param0->unk_04.unk_1724 += param1; @@ -510,7 +509,7 @@ BOOL ov21_021D3844 (UnkStruct_ov21_021D3320 * param0, int param1) return 0; } -BOOL ov21_021D387C (UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D387C(UnkStruct_ov21_021D3320 *param0, int param1) { if (ov21_021D37F8(param0, param0->unk_04.unk_1724 + param1)) { return 1; @@ -519,22 +518,22 @@ BOOL ov21_021D387C (UnkStruct_ov21_021D3320 * param0, int param1) return 0; } -int ov21_021D3898 (const UnkStruct_ov21_021D3320 * param0) +int ov21_021D3898(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_04.unk_1724; } -int ov21_021D38A4 (const UnkStruct_ov21_021D3320 * param0) +int ov21_021D38A4(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_04.unk_1728; } -int ov21_021D38B0 (const UnkStruct_ov21_021D3320 * param0, int param1) +int ov21_021D38B0(const UnkStruct_ov21_021D3320 *param0, int param1) { return param0->unk_04.unk_F70[param1]; } -void ov21_021D38C0 (UnkStruct_ov21_021D3320 * param0) +void ov21_021D38C0(UnkStruct_ov21_021D3320 *param0) { int v0; @@ -546,27 +545,27 @@ void ov21_021D38C0 (UnkStruct_ov21_021D3320 * param0) } } -int ov21_021D38FC (const UnkStruct_ov21_021D3320 * param0) +int ov21_021D38FC(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_1738; } -int ov21_021D3908 (const UnkStruct_ov21_021D3320 * param0) +int ov21_021D3908(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_173C; } -Strbuf* ov21_021D3914 (const UnkStruct_ov21_021D3320 * param0) +Strbuf *ov21_021D3914(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_1754; } -u32 ov21_021D3920 (const UnkStruct_ov21_021D3320 * param0) +u32 ov21_021D3920(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_1750; } -BOOL ov21_021D392C (const UnkStruct_ov21_021D3320 * param0, int param1) +BOOL ov21_021D392C(const UnkStruct_ov21_021D3320 *param0, int param1) { int v0 = ov21_021D37BC(param0); @@ -577,12 +576,12 @@ BOOL ov21_021D392C (const UnkStruct_ov21_021D3320 * param0, int param1) return sub_020274D0(param0->unk_00, v0, param1); } -BOOL ov21_021D3954 (const UnkStruct_ov21_021D3320 * param0) +BOOL ov21_021D3954(const UnkStruct_ov21_021D3320 *param0) { return sub_02027494(param0->unk_00); } -void ov21_021D3960 (UnkStruct_ov21_021D3320 * param0) +void ov21_021D3960(UnkStruct_ov21_021D3320 *param0) { if (gCoreSys.touchHeld) { param0->unk_1758 = 0; @@ -598,12 +597,12 @@ void ov21_021D3960 (UnkStruct_ov21_021D3320 * param0) } } -u32 ov21_021D3998 (const UnkStruct_ov21_021D3320 * param0) +u32 ov21_021D3998(const UnkStruct_ov21_021D3320 *param0) { return param0->unk_1758; } -static void ov21_021D39A4 (u16 * param0, int * param1, const PokedexData * param2, const u16 * param3, int param4) +static void ov21_021D39A4(u16 *param0, int *param1, const PokedexData *param2, const u16 *param3, int param4) { int v0; @@ -617,7 +616,7 @@ static void ov21_021D39A4 (u16 * param0, int * param1, const PokedexData * param } } -static void ov21_021D39E4 (u16 * param0, int * param1, const u16 * param2, int param3, const u16 * param4, int param5, BOOL param6, const PokedexData * param7) +static void ov21_021D39E4(u16 *param0, int *param1, const u16 *param2, int param3, const u16 *param4, int param5, BOOL param6, const PokedexData *param7) { int v0, v1; @@ -643,7 +642,7 @@ static void ov21_021D39E4 (u16 * param0, int * param1, const u16 * param2, int p } } -static void ov21_021D3A60 (UnkStruct_ov21_021D3A60 * param0, const PokedexData * param1, const u16 * param2, int param3) +static void ov21_021D3A60(UnkStruct_ov21_021D3A60 *param0, const PokedexData *param1, const u16 *param2, int param3) { int v0; @@ -661,7 +660,7 @@ static void ov21_021D3A60 (UnkStruct_ov21_021D3A60 * param0, const PokedexData * } } -static void ov21_021D3AB8 (UnkStruct_ov21_021D3A60 * param0, const u16 * param1, int param2) +static void ov21_021D3AB8(UnkStruct_ov21_021D3A60 *param0, const u16 *param1, int param2) { int v0; int v1; @@ -683,7 +682,7 @@ static void ov21_021D3AB8 (UnkStruct_ov21_021D3A60 * param0, const u16 * param1, } } -static void ov21_021D3B28 (UnkStruct_ov21_021D3A60 * param0) +static void ov21_021D3B28(UnkStruct_ov21_021D3A60 *param0) { int v0; @@ -695,10 +694,10 @@ static void ov21_021D3B28 (UnkStruct_ov21_021D3A60 * param0) } } -static u16 * ov21_021D3B64 (int param0, int param1, int * param2) +static u16 *ov21_021D3B64(int param0, int param1, int *param2) { u32 v0; - u16 * v1; + u16 *v1; u32 v2; GF_ASSERT(47 > param1); @@ -710,9 +709,9 @@ static u16 * ov21_021D3B64 (int param0, int param1, int * param2) return v1; } -static void ov21_021D3B98 (int param0, u16 * param1, int * param2, const u16 * param3, int param4, int param5, const PokedexData * param6) +static void ov21_021D3B98(int param0, u16 *param1, int *param2, const u16 *param3, int param4, int param5, const PokedexData *param6) { - u16 * v0; + u16 *v0; int v1; BOOL v2 = 0; @@ -750,9 +749,9 @@ static void ov21_021D3B98 (int param0, u16 * param1, int * param2, const u16 * p } } -static void ov21_021D3C48 (int param0, u16 * param1, int * param2, const u16 * param3, int param4, int param5, const PokedexData * param6) +static void ov21_021D3C48(int param0, u16 *param1, int *param2, const u16 *param3, int param4, int param5, const PokedexData *param6) { - u16 * v0; + u16 *v0; int v1; switch (param0) { @@ -800,9 +799,9 @@ static void ov21_021D3C48 (int param0, u16 * param1, int * param2, const u16 * p } } -static void ov21_021D3D2C (int param0, u16 * param1, int * param2, const u16 * param3, int param4, int param5, const PokedexData * param6) +static void ov21_021D3D2C(int param0, u16 *param1, int *param2, const u16 *param3, int param4, int param5, const PokedexData *param6) { - u16 * v0; + u16 *v0; int v1; switch (param0) { @@ -874,9 +873,9 @@ static void ov21_021D3D2C (int param0, u16 * param1, int * param2, const u16 * p } } -static void ov21_021D3E80 (int param0, u16 * param1, int * param2, const u16 * param3, int param4, int param5, const PokedexData * param6) +static void ov21_021D3E80(int param0, u16 *param1, int *param2, const u16 *param3, int param4, int param5, const PokedexData *param6) { - u16 * v0; + u16 *v0; int v1; switch (param0) { @@ -939,7 +938,7 @@ static void ov21_021D3E80 (int param0, u16 * param1, int * param2, const u16 * p } } -static void ov21_021D3FA8 (UnkStruct_ov21_021D3A60 * param0, int * param1, int * param2) +static void ov21_021D3FA8(UnkStruct_ov21_021D3A60 *param0, int *param1, int *param2) { int v0; diff --git a/src/overlay021/ov21_021D3FE0.c b/src/overlay021/ov21_021D3FE0.c index ae1bae646f..85526d7ba1 100644 --- a/src/overlay021/ov21_021D3FE0.c +++ b/src/overlay021/ov21_021D3FE0.c @@ -1,19 +1,19 @@ +#include "overlay021/ov21_021D3FE0.h" + #include #include -#include "overlay021/struct_ov21_021D4008.h" #include "overlay021/funcptr_ov21_021D41EC.h" #include "overlay021/funcptr_ov21_021D420C.h" -#include "overlay021/struct_ov21_021E6B20.h" - +#include "overlay021/struct_ov21_021D4008.h" #include "overlay021/struct_ov21_021E6A68.h" +#include "overlay021/struct_ov21_021E6B20.h" #include "heap.h" -#include "overlay021/ov21_021D3FE0.h" typedef struct UnkStruct_ov21_021D3FE0_t { - void * unk_00; - void * unk_04; + void *unk_00; + void *unk_04; int unk_08; UnkStruct_ov21_021E6A68 unk_0C; UnkFuncPtr_ov21_021D41EC unk_20[3]; @@ -22,14 +22,14 @@ typedef struct UnkStruct_ov21_021D3FE0_t { int unk_44; } UnkStruct_ov21_021D3FE0; -static void ov21_021D41D8(UnkStruct_ov21_021E6A68 * param0); -static void ov21_021D41E4(UnkStruct_ov21_021E6B20 * param0); -static int ov21_021D41EC(UnkFuncPtr_ov21_021D41EC param0, UnkStruct_ov21_021E6A68 * param1, void * param2); -static int ov21_021D420C(UnkFuncPtr_ov21_021D420C param0, void * param1, UnkStruct_ov21_021E6B20 * param2, const void * param3, const UnkStruct_ov21_021E6A68 * param4); +static void ov21_021D41D8(UnkStruct_ov21_021E6A68 *param0); +static void ov21_021D41E4(UnkStruct_ov21_021E6B20 *param0); +static int ov21_021D41EC(UnkFuncPtr_ov21_021D41EC param0, UnkStruct_ov21_021E6A68 *param1, void *param2); +static int ov21_021D420C(UnkFuncPtr_ov21_021D420C param0, void *param1, UnkStruct_ov21_021E6B20 *param2, const void *param3, const UnkStruct_ov21_021E6A68 *param4); -UnkStruct_ov21_021D3FE0 * ov21_021D3FE0 (int param0) +UnkStruct_ov21_021D3FE0 *ov21_021D3FE0(int param0) { - UnkStruct_ov21_021D3FE0 * v0; + UnkStruct_ov21_021D3FE0 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D3FE0)); @@ -42,7 +42,7 @@ UnkStruct_ov21_021D3FE0 * ov21_021D3FE0 (int param0) return v0; } -void ov21_021D4008 (UnkStruct_ov21_021D3FE0 * param0, const UnkStruct_ov21_021D4008 * param1) +void ov21_021D4008(UnkStruct_ov21_021D3FE0 *param0, const UnkStruct_ov21_021D4008 *param1) { GF_ASSERT(param0); GF_ASSERT(param1); @@ -66,7 +66,7 @@ void ov21_021D4008 (UnkStruct_ov21_021D3FE0 * param0, const UnkStruct_ov21_021D4 param0->unk_38[2] = param1->unk_0C[2]; } -int ov21_021D4078 (UnkStruct_ov21_021D3FE0 * param0) +int ov21_021D4078(UnkStruct_ov21_021D3FE0 *param0) { int v0; @@ -111,7 +111,7 @@ int ov21_021D4078 (UnkStruct_ov21_021D3FE0 * param0) return 0; } -int ov21_021D4100 (UnkStruct_ov21_021D3FE0 * param0) +int ov21_021D4100(UnkStruct_ov21_021D3FE0 *param0) { int v0; @@ -150,18 +150,18 @@ int ov21_021D4100 (UnkStruct_ov21_021D3FE0 * param0) return 0; } -void ov21_021D4194 (UnkStruct_ov21_021D3FE0 * param0, BOOL param1) +void ov21_021D4194(UnkStruct_ov21_021D3FE0 *param0, BOOL param1) { param0->unk_0C.unk_10 = param1; } -void ov21_021D4198 (UnkStruct_ov21_021D3FE0 * param0) +void ov21_021D4198(UnkStruct_ov21_021D3FE0 *param0) { GF_ASSERT(param0); param0->unk_0C.unk_0C = 1; } -BOOL ov21_021D41A8 (UnkStruct_ov21_021D3FE0 * param0) +BOOL ov21_021D41A8(UnkStruct_ov21_021D3FE0 *param0) { GF_ASSERT(param0); @@ -172,7 +172,7 @@ BOOL ov21_021D41A8 (UnkStruct_ov21_021D3FE0 * param0) return 0; } -BOOL ov21_021D41C0 (UnkStruct_ov21_021D3FE0 * param0) +BOOL ov21_021D41C0(UnkStruct_ov21_021D3FE0 *param0) { GF_ASSERT(param0); @@ -183,20 +183,20 @@ BOOL ov21_021D41C0 (UnkStruct_ov21_021D3FE0 * param0) return 0; } -static void ov21_021D41D8 (UnkStruct_ov21_021E6A68 * param0) +static void ov21_021D41D8(UnkStruct_ov21_021E6A68 *param0) { param0->unk_00 = 0; param0->unk_08 = NULL; param0->unk_0C = 0; } -static void ov21_021D41E4 (UnkStruct_ov21_021E6B20 * param0) +static void ov21_021D41E4(UnkStruct_ov21_021E6B20 *param0) { param0->unk_00 = 0; param0->unk_08 = NULL; } -static int ov21_021D41EC (UnkFuncPtr_ov21_021D41EC param0, UnkStruct_ov21_021E6A68 * param1, void * param2) +static int ov21_021D41EC(UnkFuncPtr_ov21_021D41EC param0, UnkStruct_ov21_021E6A68 *param1, void *param2) { int v0; @@ -208,7 +208,7 @@ static int ov21_021D41EC (UnkFuncPtr_ov21_021D41EC param0, UnkStruct_ov21_021E6A return v0; } -static int ov21_021D420C (UnkFuncPtr_ov21_021D420C param0, void * param1, UnkStruct_ov21_021E6B20 * param2, const void * param3, const UnkStruct_ov21_021E6A68 * param4) +static int ov21_021D420C(UnkFuncPtr_ov21_021D420C param0, void *param1, UnkStruct_ov21_021E6B20 *param2, const void *param3, const UnkStruct_ov21_021E6A68 *param4) { int v0; diff --git a/src/overlay021/ov21_021D423C.c b/src/overlay021/ov21_021D423C.c index 721c0288b9..7d41a7bd76 100644 --- a/src/overlay021/ov21_021D423C.c +++ b/src/overlay021/ov21_021D423C.c @@ -1,24 +1,25 @@ +#include "overlay021/ov21_021D423C.h" + #include #include #include "overlay021/struct_ov21_021D4660.h" #include "heap.h" -#include "overlay021/ov21_021D423C.h" typedef struct UnkStruct_ov21_021D423C_t { - UnkStruct_ov21_021D4660 * unk_00; + UnkStruct_ov21_021D4660 *unk_00; int unk_04; - UnkStruct_ov21_021D4660 * unk_08; + UnkStruct_ov21_021D4660 *unk_08; } UnkStruct_ov21_021D423C; -static BOOL ov21_021D42EC(UnkStruct_ov21_021D423C * param0); -static UnkStruct_ov21_021D4660 * ov21_021D42FC(UnkStruct_ov21_021D423C * param0, int param1); -static void ov21_021D4334(UnkStruct_ov21_021D423C * param0, UnkStruct_ov21_021D4660 * param1); +static BOOL ov21_021D42EC(UnkStruct_ov21_021D423C *param0); +static UnkStruct_ov21_021D4660 *ov21_021D42FC(UnkStruct_ov21_021D423C *param0, int param1); +static void ov21_021D4334(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1); -UnkStruct_ov21_021D423C * ov21_021D423C (int param0) +UnkStruct_ov21_021D423C *ov21_021D423C(int param0) { - UnkStruct_ov21_021D423C * v0; + UnkStruct_ov21_021D423C *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D423C)); GF_ASSERT(v0); @@ -27,7 +28,7 @@ UnkStruct_ov21_021D423C * ov21_021D423C (int param0) return v0; } -void ov21_021D426C (UnkStruct_ov21_021D423C * param0, UnkStruct_ov21_021D4660 * param1, int param2) +void ov21_021D426C(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1, int param2) { GF_ASSERT(param0); @@ -35,9 +36,9 @@ void ov21_021D426C (UnkStruct_ov21_021D423C * param0, UnkStruct_ov21_021D4660 * param0->unk_04 = param2; } -const UnkStruct_ov21_021D4660 * ov21_021D4284 (UnkStruct_ov21_021D423C * param0, int param1) +const UnkStruct_ov21_021D4660 *ov21_021D4284(UnkStruct_ov21_021D423C *param0, int param1) { - UnkStruct_ov21_021D4660 * v0; + UnkStruct_ov21_021D4660 *v0; BOOL v1; GF_ASSERT(param0); @@ -61,7 +62,7 @@ const UnkStruct_ov21_021D4660 * ov21_021D4284 (UnkStruct_ov21_021D423C * param0, return param0->unk_08; } -BOOL ov21_021D42D4 (UnkStruct_ov21_021D423C * param0) +BOOL ov21_021D42D4(UnkStruct_ov21_021D423C *param0) { GF_ASSERT(param0); @@ -72,7 +73,7 @@ BOOL ov21_021D42D4 (UnkStruct_ov21_021D423C * param0) return 0; } -static BOOL ov21_021D42EC (UnkStruct_ov21_021D423C * param0) +static BOOL ov21_021D42EC(UnkStruct_ov21_021D423C *param0) { if (param0->unk_08) { return 1; @@ -81,7 +82,7 @@ static BOOL ov21_021D42EC (UnkStruct_ov21_021D423C * param0) return 0; } -static UnkStruct_ov21_021D4660 * ov21_021D42FC (UnkStruct_ov21_021D423C * param0, int param1) +static UnkStruct_ov21_021D4660 *ov21_021D42FC(UnkStruct_ov21_021D423C *param0, int param1) { int v0; @@ -96,7 +97,7 @@ static UnkStruct_ov21_021D4660 * ov21_021D42FC (UnkStruct_ov21_021D423C * param0 return NULL; } -static void ov21_021D4334 (UnkStruct_ov21_021D423C * param0, UnkStruct_ov21_021D4660 * param1) +static void ov21_021D4334(UnkStruct_ov21_021D423C *param0, UnkStruct_ov21_021D4660 *param1) { param0->unk_08 = param1; diff --git a/src/overlay021/ov21_021D4340.c b/src/overlay021/ov21_021D4340.c index c825b6c706..cc48b61e3c 100644 --- a/src/overlay021/ov21_021D4340.c +++ b/src/overlay021/ov21_021D4340.c @@ -1,11 +1,15 @@ +#include "overlay021/ov21_021D4340.h" + #include #include +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D3FE0.h" +#include "overlay021/ov21_021D423C.h" #include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D3FE0_decl.h" -#include "overlay021/struct_ov21_021D423C_decl.h" - #include "overlay021/struct_ov21_021D4008.h" +#include "overlay021/struct_ov21_021D423C_decl.h" #include "overlay021/struct_ov21_021D4340.h" #include "overlay021/struct_ov21_021D4340_1.h" #include "overlay021/struct_ov21_021D43A8.h" @@ -15,16 +19,12 @@ #include "overlay021/struct_ov21_021E68F4.h" #include "heap.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D3FE0.h" -#include "overlay021/ov21_021D423C.h" -#include "overlay021/ov21_021D4340.h" -static void ov21_021D4628(UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D423C * param1, UnkStruct_ov21_021D3FE0 * param2); +static void ov21_021D4628(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D423C *param1, UnkStruct_ov21_021D3FE0 *param2); -BOOL ov21_021D4340 (UnkStruct_ov21_021D4340_1 * param0) +BOOL ov21_021D4340(UnkStruct_ov21_021D4340_1 *param0) { - UnkStruct_ov21_021D4340 * v0 = param0->unk_08; + UnkStruct_ov21_021D4340 *v0 = param0->unk_08; switch (param0->unk_00) { case 0: @@ -53,9 +53,9 @@ BOOL ov21_021D4340 (UnkStruct_ov21_021D4340_1 * param0) return 0; } -BOOL ov21_021D43A8 (UnkStruct_ov21_021D4340_1 * param0) +BOOL ov21_021D43A8(UnkStruct_ov21_021D4340_1 *param0) { - UnkStruct_ov21_021D43A8 * v0 = param0->unk_08; + UnkStruct_ov21_021D43A8 *v0 = param0->unk_08; BOOL v1[4]; int v2; @@ -94,9 +94,9 @@ BOOL ov21_021D43A8 (UnkStruct_ov21_021D4340_1 * param0) return 0; } -BOOL ov21_021D4434 (UnkStruct_ov21_021D4340_1 * param0) +BOOL ov21_021D4434(UnkStruct_ov21_021D4340_1 *param0) { - UnkStruct_ov21_021D4434 * v0 = param0->unk_08; + UnkStruct_ov21_021D4434 *v0 = param0->unk_08; BOOL v1[4]; int v2; @@ -173,9 +173,9 @@ BOOL ov21_021D4434 (UnkStruct_ov21_021D4340_1 * param0) return 0; } -BOOL ov21_021D4558 (UnkStruct_ov21_021D4340_1 * param0) +BOOL ov21_021D4558(UnkStruct_ov21_021D4340_1 *param0) { - UnkStruct_ov21_021D4558 * v0 = param0->unk_08; + UnkStruct_ov21_021D4558 *v0 = param0->unk_08; BOOL v1[2]; int v2; @@ -235,7 +235,7 @@ BOOL ov21_021D4558 (UnkStruct_ov21_021D4340_1 * param0) return 0; } -static void ov21_021D4628 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D423C * param1, UnkStruct_ov21_021D3FE0 * param2) +static void ov21_021D4628(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D423C *param1, UnkStruct_ov21_021D3FE0 *param2) { UnkStruct_ov21_021D4008 v0; @@ -250,7 +250,7 @@ static void ov21_021D4628 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D } } -void ov21_021D4660 (UnkStruct_ov21_021D4660 * param0) +void ov21_021D4660(UnkStruct_ov21_021D4660 *param0) { GF_ASSERT(param0->unk_08.unk_08); @@ -258,9 +258,9 @@ void ov21_021D4660 (UnkStruct_ov21_021D4660 * param0) param0->unk_08.unk_08 = NULL; } -void ov21_021D467C (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D467C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4434 * v0; + UnkStruct_ov21_021D4434 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4434; @@ -286,9 +286,9 @@ void ov21_021D467C (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D4704 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D4704(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D43A8 * v0; + UnkStruct_ov21_021D43A8 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D43A8; @@ -307,9 +307,9 @@ void ov21_021D4704 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D475C (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D475C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4434 * v0; + UnkStruct_ov21_021D4434 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4434; @@ -335,9 +335,9 @@ void ov21_021D475C (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D47F0 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D47F0(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4434 * v0; + UnkStruct_ov21_021D4434 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4434; @@ -363,9 +363,9 @@ void ov21_021D47F0 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D4878 (UnkStruct_ov21_021D4660 * param0, UnkStruct_ov21_021D0F60 * param1, int param2, int param3) +void ov21_021D4878(UnkStruct_ov21_021D4660 *param0, UnkStruct_ov21_021D0F60 *param1, int param2, int param3) { - UnkStruct_ov21_021D4340 * v0; + UnkStruct_ov21_021D4340 *v0; param0->unk_00 = param3; param0->unk_04 = ov21_021D4340; @@ -380,9 +380,9 @@ void ov21_021D4878 (UnkStruct_ov21_021D4660 * param0, UnkStruct_ov21_021D0F60 * param0->unk_08.unk_08 = v0; } -void ov21_021D48B8 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D48B8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4558 * v0; + UnkStruct_ov21_021D4558 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4558; @@ -402,9 +402,9 @@ void ov21_021D48B8 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D491C (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D491C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4558 * v0; + UnkStruct_ov21_021D4558 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4558; @@ -424,9 +424,9 @@ void ov21_021D491C (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D4980 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D4980(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4558 * v0; + UnkStruct_ov21_021D4558 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4558; @@ -446,9 +446,9 @@ void ov21_021D4980 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D49E4 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D49E4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4340 * v0; + UnkStruct_ov21_021D4340 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4340; @@ -465,9 +465,9 @@ void ov21_021D49E4 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D4A3C (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D4A3C(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4340 * v0; + UnkStruct_ov21_021D4340 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4340; @@ -484,9 +484,9 @@ void ov21_021D4A3C (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D4A94 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D4A94(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4558 * v0; + UnkStruct_ov21_021D4558 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4558; @@ -506,9 +506,9 @@ void ov21_021D4A94 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D4AF8 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D4AF8(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4340 * v0; + UnkStruct_ov21_021D4340 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4340; @@ -525,9 +525,9 @@ void ov21_021D4AF8 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D4B50 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D4B50(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4558 * v0; + UnkStruct_ov21_021D4558 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4558; @@ -547,9 +547,9 @@ void ov21_021D4B50 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21 param1->unk_08.unk_08 = v0; } -void ov21_021D4BB4 (int param0, UnkStruct_ov21_021D4660 * param1, UnkStruct_ov21_021D0F60 * param2, int param3) +void ov21_021D4BB4(int param0, UnkStruct_ov21_021D4660 *param1, UnkStruct_ov21_021D0F60 *param2, int param3) { - UnkStruct_ov21_021D4340 * v0; + UnkStruct_ov21_021D4340 *v0; param1->unk_00 = param3; param1->unk_04 = ov21_021D4340; diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c index c274ecb4bd..035156155f 100644 --- a/src/overlay021/ov21_021D4C0C.c +++ b/src/overlay021/ov21_021D4C0C.c @@ -1,43 +1,42 @@ +#include "overlay021/ov21_021D4C0C.h" + #include #include -#include "message.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay021/struct_ov21_021D1FA4.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" -#include "unk_02002B7C.h" +#include "heap.h" #include "message.h" +#include "strbuf.h" +#include "unk_02002B7C.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" -#include "strbuf.h" -#include "overlay021/ov21_021D4C0C.h" typedef struct UnkStruct_ov21_021D4C0C_t { - UnkStruct_02012744 * unk_00; - GraphicElementManager * unk_04; - BGL * unk_08; - UnkStruct_ov21_021D4CA0 * unk_0C; + UnkStruct_02012744 *unk_00; + GraphicElementManager *unk_04; + BGL *unk_08; + UnkStruct_ov21_021D4CA0 *unk_0C; int unk_10; int unk_14; } UnkStruct_ov21_021D4C0C; -static BOOL ov21_021D4EA4(UnkStruct_ov21_021D4CA0 * param0); -static UnkStruct_ov21_021D4CA0 * ov21_021D4EB4(UnkStruct_ov21_021D4C0C * param0); +static BOOL ov21_021D4EA4(UnkStruct_ov21_021D4CA0 *param0); +static UnkStruct_ov21_021D4CA0 *ov21_021D4EB4(UnkStruct_ov21_021D4C0C *param0); -UnkStruct_ov21_021D4C0C * ov21_021D4C0C (const UnkStruct_ov21_021D1FA4 * param0) +UnkStruct_ov21_021D4C0C *ov21_021D4C0C(const UnkStruct_ov21_021D1FA4 *param0) { - UnkStruct_ov21_021D4C0C * v0; + UnkStruct_ov21_021D4C0C *v0; v0 = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_ov21_021D4C0C)); @@ -58,7 +57,7 @@ UnkStruct_ov21_021D4C0C * ov21_021D4C0C (const UnkStruct_ov21_021D1FA4 * param0) return v0; } -void ov21_021D4C6C (UnkStruct_ov21_021D4C0C * param0) +void ov21_021D4C6C(UnkStruct_ov21_021D4C0C *param0) { GF_ASSERT(param0); @@ -71,7 +70,7 @@ void ov21_021D4C6C (UnkStruct_ov21_021D4C0C * param0) Heap_FreeToHeap(param0); } -UnkStruct_ov21_021D4CA0 * ov21_021D4CA0 (const UnkStruct_ov21_021D4CB8 * param0) +UnkStruct_ov21_021D4CA0 *ov21_021D4CA0(const UnkStruct_ov21_021D4CB8 *param0) { int v0; @@ -79,10 +78,10 @@ UnkStruct_ov21_021D4CA0 * ov21_021D4CA0 (const UnkStruct_ov21_021D4CB8 * param0) return ov21_021D4CB8(param0, v0); } -UnkStruct_ov21_021D4CA0 * ov21_021D4CB8 (const UnkStruct_ov21_021D4CB8 * param0, int param1) +UnkStruct_ov21_021D4CA0 *ov21_021D4CB8(const UnkStruct_ov21_021D4CB8 *param0, int param1) { UnkStruct_020127E8 v0; - UnkStruct_ov21_021D4CA0 * v1; + UnkStruct_ov21_021D4CA0 *v1; v1 = ov21_021D4EB4(param0->unk_00); @@ -107,7 +106,7 @@ UnkStruct_ov21_021D4CA0 * ov21_021D4CB8 (const UnkStruct_ov21_021D4CB8 * param0, return v1; } -void ov21_021D4D1C (UnkStruct_ov21_021D4CA0 * param0) +void ov21_021D4D1C(UnkStruct_ov21_021D4CA0 *param0) { sub_02012870(param0->unk_00); sub_0201EE28(¶m0->unk_04); @@ -115,7 +114,7 @@ void ov21_021D4D1C (UnkStruct_ov21_021D4CA0 * param0) memset(param0, 0, sizeof(UnkStruct_ov21_021D4CA0)); } -void ov21_021D4D3C (UnkStruct_ov21_021D4C0C * param0) +void ov21_021D4D3C(UnkStruct_ov21_021D4C0C *param0) { int v0; @@ -126,9 +125,9 @@ void ov21_021D4D3C (UnkStruct_ov21_021D4C0C * param0) } } -Window * ov21_021D4D6C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2) +Window *ov21_021D4D6C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2) { - Window * v0; + Window *v0; v0 = sub_0201A778(param0->unk_14, 1); @@ -138,15 +137,15 @@ Window * ov21_021D4D6C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2 return v0; } -void ov21_021D4DA0 (Window * param0) +void ov21_021D4DA0(Window *param0) { sub_0201A928(param0, 1); } -u32 ov21_021D4DAC (UnkStruct_ov21_021D4C0C * param0, Window * param1, u32 param2, u32 param3, int param4, int param5) +u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3, int param4, int param5) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; u32 v2; v0 = MessageLoader_Init(0, 26, param2, param0->unk_14); @@ -162,10 +161,10 @@ u32 ov21_021D4DAC (UnkStruct_ov21_021D4C0C * param0, Window * param1, u32 param2 return v2; } -void ov21_021D4E10 (UnkStruct_ov21_021D4C0C * param0, Window * param1, u32 param2, u32 param3) +void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; int v2; int v3; @@ -183,12 +182,12 @@ void ov21_021D4E10 (UnkStruct_ov21_021D4C0C * param0, Window * param1, u32 param MessageLoader_Free(v0); } -void ov21_021D4E80 (UnkStruct_ov21_021D4C0C * param0, Window * param1, Strbuf *param2, int param3, int param4) +void ov21_021D4E80(UnkStruct_ov21_021D4C0C *param0, Window *param1, Strbuf *param2, int param3, int param4) { sub_0201D78C(param1, 2, param2, param3, param4, 0xff, ((u32)(((3 & 0xff) << 16) | ((2 & 0xff) << 8) | ((1 & 0xff) << 0))), NULL); } -static BOOL ov21_021D4EA4 (UnkStruct_ov21_021D4CA0 * param0) +static BOOL ov21_021D4EA4(UnkStruct_ov21_021D4CA0 *param0) { if (param0->unk_00) { return 1; @@ -197,7 +196,7 @@ static BOOL ov21_021D4EA4 (UnkStruct_ov21_021D4CA0 * param0) return 0; } -static UnkStruct_ov21_021D4CA0 * ov21_021D4EB4 (UnkStruct_ov21_021D4C0C * param0) +static UnkStruct_ov21_021D4CA0 *ov21_021D4EB4(UnkStruct_ov21_021D4C0C *param0) { int v0; diff --git a/src/overlay021/ov21_021D4EE4.c b/src/overlay021/ov21_021D4EE4.c index e12f83c9ad..8c12b3f6d0 100644 --- a/src/overlay021/ov21_021D4EE4.c +++ b/src/overlay021/ov21_021D4EE4.c @@ -1,34 +1,34 @@ +#include "overlay021/ov21_021D4EE4.h" + #include #include -#include "inlines.h" - #include "overlay021/struct_ov21_021D4FE4.h" #include "heap.h" -#include "overlay021/ov21_021D4EE4.h" +#include "inlines.h" typedef struct UnkStruct_ov21_021D4EE4_t { - const UnkStruct_ov21_021D4FE4 * unk_00; + const UnkStruct_ov21_021D4FE4 *unk_00; int unk_04; int unk_08; int unk_0C; int unk_10; } UnkStruct_ov21_021D4EE4; -static int inline inline_ov21_021D4F7C(const UnkStruct_ov21_021D4EE4 * param0); -static int inline inline_ov21_021D5040(const UnkStruct_ov21_021D4EE4 * param0, int param1, int param2); -static void inline inline_ov21_021D4F20(UnkStruct_ov21_021D4EE4 * param0, int param1); -static void inline inline_ov21_021D4F20_1(UnkStruct_ov21_021D4EE4 * param0, int param1); -static void ov21_021D5040(UnkStruct_ov21_021D4EE4 * param0, int param1); -static void ov21_021D5090(UnkStruct_ov21_021D4EE4 * param0, int param1); -static void ov21_021D50E0(UnkStruct_ov21_021D4EE4 * param0, int param1); -static void ov21_021D5110(UnkStruct_ov21_021D4EE4 * param0, int param1); -static void ov21_021D5140(UnkStruct_ov21_021D4EE4 * param0, int param1); - -UnkStruct_ov21_021D4EE4 * ov21_021D4EE4 (int param0) +static int inline inline_ov21_021D4F7C(const UnkStruct_ov21_021D4EE4 *param0); +static int inline inline_ov21_021D5040(const UnkStruct_ov21_021D4EE4 *param0, int param1, int param2); +static void inline inline_ov21_021D4F20(UnkStruct_ov21_021D4EE4 *param0, int param1); +static void inline inline_ov21_021D4F20_1(UnkStruct_ov21_021D4EE4 *param0, int param1); +static void ov21_021D5040(UnkStruct_ov21_021D4EE4 *param0, int param1); +static void ov21_021D5090(UnkStruct_ov21_021D4EE4 *param0, int param1); +static void ov21_021D50E0(UnkStruct_ov21_021D4EE4 *param0, int param1); +static void ov21_021D5110(UnkStruct_ov21_021D4EE4 *param0, int param1); +static void ov21_021D5140(UnkStruct_ov21_021D4EE4 *param0, int param1); + +UnkStruct_ov21_021D4EE4 *ov21_021D4EE4(int param0) { - UnkStruct_ov21_021D4EE4 * v0; + UnkStruct_ov21_021D4EE4 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4EE4)); memset(v0, 0, sizeof(UnkStruct_ov21_021D4EE4)); @@ -36,12 +36,12 @@ UnkStruct_ov21_021D4EE4 * ov21_021D4EE4 (int param0) return v0; } -void ov21_021D4EFC (UnkStruct_ov21_021D4EE4 * param0) +void ov21_021D4EFC(UnkStruct_ov21_021D4EE4 *param0) { Heap_FreeToHeap(param0); } -void ov21_021D4F04 (UnkStruct_ov21_021D4EE4 * param0, const UnkStruct_ov21_021D4FE4 * param1, int param2, int param3) +void ov21_021D4F04(UnkStruct_ov21_021D4EE4 *param0, const UnkStruct_ov21_021D4FE4 *param1, int param2, int param3) { memset(param0, 0, sizeof(UnkStruct_ov21_021D4EE4)); @@ -50,7 +50,7 @@ void ov21_021D4F04 (UnkStruct_ov21_021D4EE4 * param0, const UnkStruct_ov21_021D4 param0->unk_08 = param3; } -void ov21_021D4F20 (UnkStruct_ov21_021D4EE4 * param0, int param1, int param2) +void ov21_021D4F20(UnkStruct_ov21_021D4EE4 *param0, int param1, int param2) { int v0; @@ -73,7 +73,7 @@ void ov21_021D4F20 (UnkStruct_ov21_021D4EE4 * param0, int param1, int param2) } } -int ov21_021D4F7C (const UnkStruct_ov21_021D4EE4 * param0) +int ov21_021D4F7C(const UnkStruct_ov21_021D4EE4 *param0) { int v0; @@ -81,7 +81,7 @@ int ov21_021D4F7C (const UnkStruct_ov21_021D4EE4 * param0) return param0->unk_00[v0].unk_18; } -void ov21_021D4F94 (const UnkStruct_ov21_021D4EE4 * param0, int * param1, int * param2) +void ov21_021D4F94(const UnkStruct_ov21_021D4EE4 *param0, int *param1, int *param2) { int v0; @@ -91,7 +91,7 @@ void ov21_021D4F94 (const UnkStruct_ov21_021D4EE4 * param0, int * param1, int * *param2 = param0->unk_00[v0].unk_04; } -void ov21_021D4FBC (const UnkStruct_ov21_021D4EE4 * param0, int * param1, int * param2) +void ov21_021D4FBC(const UnkStruct_ov21_021D4EE4 *param0, int *param1, int *param2) { int v0; @@ -101,7 +101,7 @@ void ov21_021D4FBC (const UnkStruct_ov21_021D4EE4 * param0, int * param1, int * *param2 = param0->unk_00[v0].unk_0C; } -void ov21_021D4FE4 (UnkStruct_ov21_021D4FE4 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7) +void ov21_021D4FE4(UnkStruct_ov21_021D4FE4 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7) { param0->unk_00 = param1; param0->unk_04 = param2; @@ -112,7 +112,7 @@ void ov21_021D4FE4 (UnkStruct_ov21_021D4FE4 * param0, int param1, int param2, in param0->unk_18 = param7; } -void ov21_021D4FFC (int param0, int * param1, int * param2, int param3, int param4, int param5, int param6) +void ov21_021D4FFC(int param0, int *param1, int *param2, int param3, int param4, int param5, int param6) { if ((param0 == 0) || (param0 == 2)) { param3 -= param5 / 2; @@ -130,7 +130,7 @@ void ov21_021D4FFC (int param0, int * param1, int * param2, int param3, int para *param2 = param4; } -static int inline inline_ov21_021D4F7C (const UnkStruct_ov21_021D4EE4 * param0) +static int inline inline_ov21_021D4F7C(const UnkStruct_ov21_021D4EE4 *param0) { int v0; @@ -140,7 +140,7 @@ static int inline inline_ov21_021D4F7C (const UnkStruct_ov21_021D4EE4 * param0) return v0; } -static int inline inline_ov21_021D5040 (const UnkStruct_ov21_021D4EE4 * param0, int param1, int param2) +static int inline inline_ov21_021D5040(const UnkStruct_ov21_021D4EE4 *param0, int param1, int param2) { int v0; @@ -150,10 +150,10 @@ static int inline inline_ov21_021D5040 (const UnkStruct_ov21_021D4EE4 * param0, return v0; } -static void ov21_021D5040 (UnkStruct_ov21_021D4EE4 * param0, int param1) +static void ov21_021D5040(UnkStruct_ov21_021D4EE4 *param0, int param1) { int v0; - const UnkStruct_ov21_021D4FE4 * v1; + const UnkStruct_ov21_021D4FE4 *v1; int v2; int v3; @@ -179,10 +179,10 @@ static void ov21_021D5040 (UnkStruct_ov21_021D4EE4 * param0, int param1) } } -static void ov21_021D5090 (UnkStruct_ov21_021D4EE4 * param0, int param1) +static void ov21_021D5090(UnkStruct_ov21_021D4EE4 *param0, int param1) { int v0; - const UnkStruct_ov21_021D4FE4 * v1; + const UnkStruct_ov21_021D4FE4 *v1; int v2; int v3; @@ -209,7 +209,7 @@ static void ov21_021D5090 (UnkStruct_ov21_021D4EE4 * param0, int param1) } } -static void ov21_021D50E0 (UnkStruct_ov21_021D4EE4 * param0, int param1) +static void ov21_021D50E0(UnkStruct_ov21_021D4EE4 *param0, int param1) { int v0; int v1; @@ -223,7 +223,7 @@ static void ov21_021D50E0 (UnkStruct_ov21_021D4EE4 * param0, int param1) } } -static void ov21_021D5110 (UnkStruct_ov21_021D4EE4 * param0, int param1) +static void ov21_021D5110(UnkStruct_ov21_021D4EE4 *param0, int param1) { int v0; int v1; @@ -237,19 +237,19 @@ static void ov21_021D5110 (UnkStruct_ov21_021D4EE4 * param0, int param1) } } -static void inline inline_ov21_021D4F20 (UnkStruct_ov21_021D4EE4 * param0, int param1) +static void inline inline_ov21_021D4F20(UnkStruct_ov21_021D4EE4 *param0, int param1) { GF_ASSERT((param1 >= 0) && (param1 < param0->unk_04)); param0->unk_0C = param1; } -static void inline inline_ov21_021D4F20_1 (UnkStruct_ov21_021D4EE4 * param0, int param1) +static void inline inline_ov21_021D4F20_1(UnkStruct_ov21_021D4EE4 *param0, int param1) { GF_ASSERT((param1 >= 0) && (param1 < param0->unk_08)); param0->unk_10 = param1; } -static void ov21_021D5140 (UnkStruct_ov21_021D4EE4 * param0, int param1) +static void ov21_021D5140(UnkStruct_ov21_021D4EE4 *param0, int param1) { int v0; int v1 = param0->unk_04 * param0->unk_08; diff --git a/src/overlay021/ov21_021D517C.c b/src/overlay021/ov21_021D517C.c index 5673f935b0..5c41f0d5e0 100644 --- a/src/overlay021/ov21_021D517C.c +++ b/src/overlay021/ov21_021D517C.c @@ -1,18 +1,19 @@ +#include "overlay021/ov21_021D517C.h" + #include #include #include "struct_defs/struct_0205AA50.h" #include "unk_02018340.h" -#include "overlay021/ov21_021D517C.h" -static void ov21_021D5248(Window * param0, u8 * param1, u16 param2, u16 param3, int param4, int param5, u8 param6, u8 param7); -static void ov21_021D52A0(u8 * param0, int param1, int param2, int param3, int param4); -static int ov21_021D52D4(u8 * param0, int param1, int param2, int param3, int param4); -static void ov21_021D5304(u8 * param0, int * param1, int param2, int param3, int param4, int param5); +static void ov21_021D5248(Window *param0, u8 *param1, u16 param2, u16 param3, int param4, int param5, u8 param6, u8 param7); +static void ov21_021D52A0(u8 *param0, int param1, int param2, int param3, int param4); +static int ov21_021D52D4(u8 *param0, int param1, int param2, int param3, int param4); +static void ov21_021D5304(u8 *param0, int *param1, int param2, int param3, int param4, int param5); static int ov21_021D5424(int param0); -void ov21_021D517C (Window * param0, u8 * param1, u16 param2, u16 param3, u8 param4, u8 * param5, u8 param6, u8 param7, u16 param8, u16 param9) +void ov21_021D517C(Window *param0, u8 *param1, u16 param2, u16 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u16 param8, u16 param9) { int v0, v1; @@ -23,7 +24,7 @@ void ov21_021D517C (Window * param0, u8 * param1, u16 param2, u16 param3, u8 par } } -void ov21_021D5214 (u8 * param0, u8 param1, u8 param2) +void ov21_021D5214(u8 *param0, u8 param1, u8 param2) { int v0, v1; @@ -34,7 +35,7 @@ void ov21_021D5214 (u8 * param0, u8 param1, u8 param2) } } -static void ov21_021D5248 (Window * param0, u8 * param1, u16 param2, u16 param3, int param4, int param5, u8 param6, u8 param7) +static void ov21_021D5248(Window *param0, u8 *param1, u16 param2, u16 param3, int param4, int param5, u8 param6, u8 param7) { int v0; int v1; @@ -48,7 +49,7 @@ static void ov21_021D5248 (Window * param0, u8 * param1, u16 param2, u16 param3, } } -static void ov21_021D52A0 (u8 * param0, int param1, int param2, int param3, int param4) +static void ov21_021D52A0(u8 *param0, int param1, int param2, int param3, int param4) { int v0; int v1; @@ -61,7 +62,7 @@ static void ov21_021D52A0 (u8 * param0, int param1, int param2, int param3, int } } -static int ov21_021D52D4 (u8 * param0, int param1, int param2, int param3, int param4) +static int ov21_021D52D4(u8 *param0, int param1, int param2, int param3, int param4) { if ((param1 < 0) || (param1 >= param3)) { return -1; @@ -74,7 +75,7 @@ static int ov21_021D52D4 (u8 * param0, int param1, int param2, int param3, int p return param0[(param2 * param3) + param1]; } -static void ov21_021D5304 (u8 * param0, int * param1, int param2, int param3, int param4, int param5) +static void ov21_021D5304(u8 *param0, int *param1, int param2, int param3, int param4, int param5) { int v0; @@ -121,7 +122,7 @@ static void ov21_021D5304 (u8 * param0, int * param1, int param2, int param3, in } } -static int ov21_021D5424 (int param0) +static int ov21_021D5424(int param0) { int v0; diff --git a/src/overlay021/ov21_021D5600.c b/src/overlay021/ov21_021D5600.c index e1a085d291..2774da071e 100644 --- a/src/overlay021/ov21_021D5600.c +++ b/src/overlay021/ov21_021D5600.c @@ -1,16 +1,17 @@ +#include "overlay021/ov21_021D5600.h" + #include #include -#include "inlines.h" +#include "constants/narc.h" +#include "constants/species.h" +#include "error_handling.h" +#include "inlines.h" #include "message.h" #include "message_util.h" -#include "error_handling.h" #include "strbuf.h" #include "unk_020986CC.h" -#include "overlay021/ov21_021D5600.h" -#include "constants/species.h" -#include "constants/narc.h" static const u8 Unk_ov21_021E9CC4[6] = { 0x1, @@ -23,29 +24,28 @@ static const u8 Unk_ov21_021E9CC4[6] = { static inline int inline_ov21_021D5764(int param0); static inline BOOL inline_ov21_021D5764_1(int param0, int param1); -static Strbuf* LoadMessage(int param0, int param1, int param2); -static void ov21_021D5764(int param0, int param1, int * param2, int * param3, int * param4); +static Strbuf *LoadMessage(int param0, int param1, int param2); +static void ov21_021D5764(int param0, int param1, int *param2, int *param3, int *param4); -void ov21_021D5600 (Strbuf *param0) +void ov21_021D5600(Strbuf *param0) { Strbuf_Free(param0); } -int ov21_021D5608 (int param0) +int ov21_021D5608(int param0) { return sub_020986E8(Unk_ov21_021E9CC4[param0 + 1]); } - -Strbuf* ov21_021D561C (int param0, int param1, int param2) +Strbuf *ov21_021D561C(int param0, int param1, int param2) { int v0; int v1; int v2; int v3; - + ov21_021D5764(param0, param1, &v0, &v1, &v2); - + if (v2 == 6) { return MessageUtil_SpeciesName(param0, param2); } else { @@ -60,19 +60,19 @@ Strbuf* ov21_021D561C (int param0, int param1, int param2) v3 = Unk_ov21_021E9CCC[v2]; v2 = v0; } - + return LoadMessage(v3, v2, param2); } -Strbuf* ov21_021D566C (int param0, int param1, int param2) +Strbuf *ov21_021D566C(int param0, int param1, int param2) { int v0; int v1; int v2; int v3; - + ov21_021D5764(param0, param1, &v0, &v1, &v2); - + if (v2 == 6) { v2 = param0; v3 = 711; @@ -88,19 +88,19 @@ Strbuf* ov21_021D566C (int param0, int param1, int param2) v3 = Unk_ov21_021E9CE4[v2]; v2 = v0; } - + return LoadMessage(v3, v2, param2); } - -Strbuf* ov21_021D56BC (int param0, int param1, int param2, int param3) + +Strbuf *ov21_021D56BC(int param0, int param1, int param2, int param3) { int v0; int v1; int v2; int v3; - + ov21_021D5764(param0, param1, &v0, &v1, &v2); - + if (v2 == 6) { GF_ASSERT(param2 < 1); v2 = param0 * 1 + param2; @@ -118,11 +118,11 @@ Strbuf* ov21_021D56BC (int param0, int param1, int param2, int param3) v3 = Unk_ov21_021E9CFC[v2]; v2 = v0 * 1 + param2; } - + return LoadMessage(v3, v2, param3); } -static inline BOOL inline_ov21_021D5764_1 (int param0, int param1) +static inline BOOL inline_ov21_021D5764_1(int param0, int param1) { if ((param0 > NATIONAL_DEX_COUNT) && (param1 != 6)) { return 0; @@ -131,12 +131,12 @@ static inline BOOL inline_ov21_021D5764_1 (int param0, int param1) return 1; } -static Strbuf* LoadMessage (int bankID, int entryID, int heapID) +static Strbuf *LoadMessage(int bankID, int entryID, int heapID) { MessageLoader *messageLoader = MessageLoader_Init(1, NARC_INDEX_MSGDATA__PL_MSG, bankID, heapID); if (messageLoader) { - Strbuf* strbuf = Strbuf_Init(256, heapID); + Strbuf *strbuf = Strbuf_Init(256, heapID); if (strbuf) { MessageLoader_GetStrbuf(messageLoader, entryID, strbuf); @@ -149,7 +149,7 @@ static Strbuf* LoadMessage (int bankID, int entryID, int heapID) return NULL; } -static void ov21_021D5764 (int param0, int param1, int * param2, int * param3, int * param4) +static void ov21_021D5764(int param0, int param1, int *param2, int *param3, int *param4) { *param3 = sub_020986CC(param1); @@ -161,7 +161,7 @@ static void ov21_021D5764 (int param0, int param1, int * param2, int * param3, i GF_ASSERT(inline_ov21_021D5764_1(*param2, *param4)); } -static inline int inline_ov21_021D5764 (int param0) +static inline int inline_ov21_021D5764(int param0) { GF_ASSERT(param0 < 6); return (param0 == 1) ? 6 : param0; diff --git a/src/overlay021/ov21_021D57B4.c b/src/overlay021/ov21_021D57B4.c index e39398b968..26d747ca5c 100644 --- a/src/overlay021/ov21_021D57B4.c +++ b/src/overlay021/ov21_021D57B4.c @@ -1,3 +1,5 @@ +#include "overlay021/ov21_021D57B4.h" + #include #include @@ -7,12 +9,11 @@ #include "overlay021/struct_ov21_021D5868.h" #include "overlay021/struct_ov21_021D5890.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "unk_02006E3C.h" #include "unk_020218BC.h" -#include "overlay021/ov21_021D57B4.h" -void ov21_021D57B4 (UnkStruct_ov21_021D5844 * param0, int param1, int param2, int param3) +void ov21_021D57B4(UnkStruct_ov21_021D5844 *param0, int param1, int param2, int param3) { int v0; u32 v1; @@ -54,7 +55,7 @@ void ov21_021D57B4 (UnkStruct_ov21_021D5844 * param0, int param1, int param2, in param0->unk_04 = v1 / sizeof(int); } -void ov21_021D5844 (UnkStruct_ov21_021D5844 * param0) +void ov21_021D5844(UnkStruct_ov21_021D5844 *param0) { GF_ASSERT(param0); GF_ASSERT(param0->unk_00); @@ -65,9 +66,9 @@ void ov21_021D5844 (UnkStruct_ov21_021D5844 * param0) param0->unk_04 = 0; } -UnkStruct_ov21_021D5868 * ov21_021D5868 (int param0, int * param1) +UnkStruct_ov21_021D5868 *ov21_021D5868(int param0, int *param1) { - UnkStruct_ov21_021D5868 * v0; + UnkStruct_ov21_021D5868 *v0; u32 v1; v0 = (UnkStruct_ov21_021D5868 *)sub_02007068(188, 0, 0, param0, 0, &v1); @@ -79,9 +80,9 @@ UnkStruct_ov21_021D5868 * ov21_021D5868 (int param0, int * param1) return v0; } -UnkStruct_ov21_021D5890 * ov21_021D5890 (int param0, int * param1) +UnkStruct_ov21_021D5890 *ov21_021D5890(int param0, int *param1) { - UnkStruct_ov21_021D5890 * v0; + UnkStruct_ov21_021D5890 *v0; u32 v1; v0 = (UnkStruct_ov21_021D5890 *)sub_02007068(188, 2, 0, param0, 0, &v1); @@ -93,7 +94,7 @@ UnkStruct_ov21_021D5890 * ov21_021D5890 (int param0, int * param1) return v0; } -void ov21_021D58C0 (u8 * param0, u8 param1, u8 param2, const UnkStruct_ov21_021D5890 * param3) +void ov21_021D58C0(u8 *param0, u8 param1, u8 param2, const UnkStruct_ov21_021D5890 *param3) { int v0, v1; @@ -107,7 +108,7 @@ void ov21_021D58C0 (u8 * param0, u8 param1, u8 param2, const UnkStruct_ov21_021D } } -u32 ov21_021D5948 (u8 * param0, int param1, int param2, const UnkStruct_ov21_021D5890 * param3, const UnkStruct_ov21_021D5844 * param4, const u8 * param5, u32 param6) +u32 ov21_021D5948(u8 *param0, int param1, int param2, const UnkStruct_ov21_021D5890 *param3, const UnkStruct_ov21_021D5844 *param4, const u8 *param5, u32 param6) { int v0; int v1; @@ -131,7 +132,7 @@ u32 ov21_021D5948 (u8 * param0, int param1, int param2, const UnkStruct_ov21_021 return v2; } -void ov21_021D59D8 (GraphicElementData * param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 * param5, int param6, int param7) +void ov21_021D59D8(GraphicElementData *param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 *param5, int param6, int param7) { VecFx32 v0; @@ -149,7 +150,7 @@ void ov21_021D59D8 (GraphicElementData * param0, int param1, int param2, int par } } -int ov21_021D5A20 (GraphicElementData ** param0, int param1, int param2, int param3, int param4, int param5, int param6, const UnkStruct_ov21_021D5868 * param7, const UnkStruct_ov21_021D5844 * param8, int param9, int param10, const u8 * param11, u32 param12, u32 * param13) +int ov21_021D5A20(GraphicElementData **param0, int param1, int param2, int param3, int param4, int param5, int param6, const UnkStruct_ov21_021D5868 *param7, const UnkStruct_ov21_021D5844 *param8, int param9, int param10, const u8 *param11, u32 param12, u32 *param13) { int v0, v1; int v2 = param1; diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c index 294eb5a3a6..63bca992a2 100644 --- a/src/overlay021/ov21_021D5AEC.c +++ b/src/overlay021/ov21_021D5AEC.c @@ -1,19 +1,22 @@ +#include "overlay021/ov21_021D5AEC.h" + #include #include -#include "core_sys.h" - -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4340.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D157C.h" #include "overlay021/struct_ov21_021D2648.h" @@ -23,33 +26,27 @@ #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021D5B68.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "core_sys.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" #include "unk_02005474.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4340.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021D5AEC.h" typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021D5C08; typedef struct { @@ -65,102 +62,102 @@ typedef struct { } UnkStruct_ov21_021D7464; typedef struct { - GraphicElementData * unk_00[9]; + GraphicElementData *unk_00[9]; int unk_24; - UnkStruct_ov21_021D4CA0 * unk_28[9]; + UnkStruct_ov21_021D4CA0 *unk_28[9]; int unk_4C; - GraphicElementData * unk_50[9]; - GraphicElementData * unk_74; + GraphicElementData *unk_50[9]; + GraphicElementData *unk_74; fx32 unk_78; - GraphicElementData * unk_7C; - UnkStruct_02009714 * unk_80[4]; + GraphicElementData *unk_7C; + UnkStruct_02009714 *unk_80[4]; UnkStruct_ov19_021DA864 unk_90; UnkStruct_ov19_021DA864 unk_B4; - void * unk_D8; - NNSG2dScreenData * unk_DC; + void *unk_D8; + NNSG2dScreenData *unk_DC; UnkStruct_ov21_021D157C unk_E0; UnkStruct_ov21_021D2648 unk_104; UnkStruct_ov21_021D2648 unk_124; int unk_144; } UnkStruct_ov21_021D71A8; -static UnkStruct_ov21_021D5B68 * ov21_021D5B90(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021D5BCC(UnkStruct_ov21_021D5B68 * param0); -static UnkStruct_ov21_021D5C08 * ov21_021D5BE0(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021D5C08(UnkStruct_ov21_021D5C08 * param0); -static UnkStruct_ov21_021D4660 * ov21_021D5C1C(int param0, UnkStruct_ov21_021E68F4 * param1, UnkStruct_ov21_021D0F60 * param2); -static void ov21_021D5C7C(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021D5B68 *ov21_021D5B90(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021D5BCC(UnkStruct_ov21_021D5B68 *param0); +static UnkStruct_ov21_021D5C08 *ov21_021D5BE0(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021D5C08(UnkStruct_ov21_021D5C08 *param0); +static UnkStruct_ov21_021D4660 *ov21_021D5C1C(int param0, UnkStruct_ov21_021E68F4 *param1, UnkStruct_ov21_021D0F60 *param2); +static void ov21_021D5C7C(UnkStruct_ov21_021D4660 *param0); static int ov21_021D5CB4(void); -static int ov21_021D5CB8(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D5D04(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D5D34(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D5D48(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021D5E2C(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021D5EA8(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021D71A8(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1, const UnkStruct_ov21_021D5B68 * param2, BOOL param3); -static BOOL ov21_021D71E4(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1, const UnkStruct_ov21_021D5B68 * param2, BOOL param3); -static void ov21_021D7248(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1, const UnkStruct_ov21_021D5B68 * param2, BOOL param3); -static BOOL ov21_021D72D4(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1, const UnkStruct_ov21_021D5B68 * param2, BOOL param3); -static void ov21_021D6FB4(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1, const UnkStruct_ov21_021D5B68 * param2, BOOL param3); -static BOOL ov21_021D7044(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1); -static void ov21_021D7094(UnkStruct_ov21_021D5C08 * param0, const UnkStruct_ov21_021D5B68 * param1, BOOL param2); -static void ov21_021D7394(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1); -static BOOL ov21_021D73C8(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1); -static void ov21_021D73F0(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1); -static BOOL ov21_021D7424(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1); -static void ov21_021D5F7C(UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1, int param2); -static BOOL ov21_021D601C(UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1, int param2); -static void ov21_021D5FC4(UnkStruct_ov21_021D5B68 * param0); -static void ov21_021D5FD4(UnkStruct_ov21_021D5B68 * param0); -static void ov21_021D5F58(UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1); -static void ov21_021D60A4(UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1); -static void ov21_021D60FC(UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1, int param2); -static BOOL ov21_021D6108(UnkStruct_ov21_021D5B68 * param0, int param1); -static void ov21_021D5F6C(UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1); -static void ov21_021D744C(UnkStruct_ov21_021D5B68 * param0); -static void ov21_021D7464(UnkStruct_ov21_021D7464 * param0, UnkStruct_ov21_021D5B68 * param1); -static BOOL ov21_021D747C(UnkStruct_ov21_021D5B68 * param0); -static BOOL ov21_021D74B0(UnkStruct_ov21_021D5B68 * param0, int param1); -static void ov21_021D7538(UnkStruct_ov21_021D5B68 * param0, int param1); -static void ov21_021D7590(UnkStruct_ov21_021D7464 * param0, UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D75DC(UnkStruct_ov21_021D7464 * param0, UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D6C24(UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D6114(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3); -static void ov21_021D61D8(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1); -static void ov21_021D61F4(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3); -static void ov21_021D62E4(UnkStruct_ov21_021D13FC * param0, int param1); -static void ov21_021D637C(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, int param2, int param3); -static void ov21_021D63C0(UnkStruct_ov21_021D71A8 * param0); -static void ov21_021D63DC(UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3); -static void ov21_021D64B0(UnkStruct_ov21_021D13FC * param0, int param1, int param2); -static void ov21_021D6538(UnkStruct_ov21_021D71A8 * param0, int param1); -static void ov21_021D6580(UnkStruct_ov21_021D71A8 * param0); -static void ov21_021D65DC(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, int param2); -static void ov21_021D6744(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, int param2); -static void ov21_021D695C(UnkStruct_ov21_021D71A8 * param0); -static int ov21_021D70C0(UnkStruct_ov21_021D13FC * param0, int param1); -static void ov21_021D67EC(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3); -static void ov21_021D6940(UnkStruct_ov21_021D71A8 * param0); -static void ov21_021D68C8(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2); -static void ov21_021D70E8(UnkStruct_ov21_021D71A8 * param0); -static void ov21_021D7124(UnkStruct_ov21_021D71A8 * param0); -static void ov21_021D6994(UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D69A0(UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D6ED0(UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D6A58(UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D6AE4(UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D6B94(UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D6BB0(UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D6C44(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3); -static void ov21_021D6CC8(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3); -static void ov21_021D6D78(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3, int param4, int param5); -static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, int param2, int param3, int param4); -static void ov21_021D6CA4(GraphicElementData * param0, int * param1, int * param2); +static int ov21_021D5CB8(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D5D04(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D5D34(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D5D48(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021D5E2C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021D5EA8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021D71A8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1, const UnkStruct_ov21_021D5B68 *param2, BOOL param3); +static BOOL ov21_021D71E4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1, const UnkStruct_ov21_021D5B68 *param2, BOOL param3); +static void ov21_021D7248(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1, const UnkStruct_ov21_021D5B68 *param2, BOOL param3); +static BOOL ov21_021D72D4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1, const UnkStruct_ov21_021D5B68 *param2, BOOL param3); +static void ov21_021D6FB4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1, const UnkStruct_ov21_021D5B68 *param2, BOOL param3); +static BOOL ov21_021D7044(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1); +static void ov21_021D7094(UnkStruct_ov21_021D5C08 *param0, const UnkStruct_ov21_021D5B68 *param1, BOOL param2); +static void ov21_021D7394(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1); +static BOOL ov21_021D73C8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1); +static void ov21_021D73F0(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1); +static BOOL ov21_021D7424(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1); +static void ov21_021D5F7C(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1, int param2); +static BOOL ov21_021D601C(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1, int param2); +static void ov21_021D5FC4(UnkStruct_ov21_021D5B68 *param0); +static void ov21_021D5FD4(UnkStruct_ov21_021D5B68 *param0); +static void ov21_021D5F58(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1); +static void ov21_021D60A4(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1); +static void ov21_021D60FC(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1, int param2); +static BOOL ov21_021D6108(UnkStruct_ov21_021D5B68 *param0, int param1); +static void ov21_021D5F6C(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1); +static void ov21_021D744C(UnkStruct_ov21_021D5B68 *param0); +static void ov21_021D7464(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B68 *param1); +static BOOL ov21_021D747C(UnkStruct_ov21_021D5B68 *param0); +static BOOL ov21_021D74B0(UnkStruct_ov21_021D5B68 *param0, int param1); +static void ov21_021D7538(UnkStruct_ov21_021D5B68 *param0, int param1); +static void ov21_021D7590(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D75DC(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D6C24(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D6114(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); +static void ov21_021D61D8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1); +static void ov21_021D61F4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); +static void ov21_021D62E4(UnkStruct_ov21_021D13FC *param0, int param1); +static void ov21_021D637C(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2, int param3); +static void ov21_021D63C0(UnkStruct_ov21_021D71A8 *param0); +static void ov21_021D63DC(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3); +static void ov21_021D64B0(UnkStruct_ov21_021D13FC *param0, int param1, int param2); +static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int param1); +static void ov21_021D6580(UnkStruct_ov21_021D71A8 *param0); +static void ov21_021D65DC(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2); +static void ov21_021D6744(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2); +static void ov21_021D695C(UnkStruct_ov21_021D71A8 *param0); +static int ov21_021D70C0(UnkStruct_ov21_021D13FC *param0, int param1); +static void ov21_021D67EC(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); +static void ov21_021D6940(UnkStruct_ov21_021D71A8 *param0); +static void ov21_021D68C8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2); +static void ov21_021D70E8(UnkStruct_ov21_021D71A8 *param0); +static void ov21_021D7124(UnkStruct_ov21_021D71A8 *param0); +static void ov21_021D6994(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D69A0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D6ED0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D6A58(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D6AE4(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D6B94(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D6BB0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D6C44(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); +static void ov21_021D6CC8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); +static void ov21_021D6D78(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3, int param4, int param5); +static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2, int param3, int param4); +static void ov21_021D6CA4(GraphicElementData *param0, int *param1, int *param2); static fx32 ov21_021D6BF8(fx32 param0, fx32 param1, int param2, int param3); -static void ov21_021D6F20(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2); -static void ov21_021D6F74(const UnkStruct_ov21_021D5B68 * param0); -static void ov21_021D6F64(UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D5B68 * param1); -static void ov21_021D7160(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3); +static void ov21_021D6F20(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2); +static void ov21_021D6F74(const UnkStruct_ov21_021D5B68 *param0); +static void ov21_021D6F64(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D5B68 *param1); +static void ov21_021D7160(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); const static int Unk_ov21_021E9D14[] = { (180 * FX32_ONE) + 9 * FX32_ONE, @@ -190,11 +187,11 @@ const static int Unk_ov21_021E9D40[] = { 152 * FX32_ONE }; -void ov21_021D5AEC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) +void ov21_021D5AEC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) { - UnkStruct_ov21_021D5B68 * v0; - UnkStruct_ov21_021D5C08 * v1; - UnkStruct_ov21_021D4660 * v2; + UnkStruct_ov21_021D5B68 *v0; + UnkStruct_ov21_021D5C08 *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021D5B90(param2, param1); v1 = ov21_021D5BE0(param2, param1); @@ -213,14 +210,14 @@ void ov21_021D5AEC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021D5EA8; } -void ov21_021D5B50 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021D5B50(UnkStruct_ov21_021E68F4 *param0) { ov21_021D5BCC(param0->unk_00); ov21_021D5C08(param0->unk_04); ov21_021D5C7C(param0->unk_20); } -BOOL ov21_021D5B68 (const UnkStruct_ov21_021D5B68 * param0) +BOOL ov21_021D5B68(const UnkStruct_ov21_021D5B68 *param0) { if ((param0->unk_24 == 1) || (param0->unk_28 == 1) || (param0->unk_2C == 1) || (param0->unk_30 == 1) || (param0->unk_34 == 1)) { return 0; @@ -229,9 +226,9 @@ BOOL ov21_021D5B68 (const UnkStruct_ov21_021D5B68 * param0) return 1; } -static UnkStruct_ov21_021D5B68 * ov21_021D5B90 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D5B68 *ov21_021D5B90(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D5B68 * v0; + UnkStruct_ov21_021D5B68 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D5B68)); GF_ASSERT(v0); @@ -246,15 +243,15 @@ static UnkStruct_ov21_021D5B68 * ov21_021D5B90 (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021D5BCC (UnkStruct_ov21_021D5B68 * param0) +static void ov21_021D5BCC(UnkStruct_ov21_021D5B68 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static UnkStruct_ov21_021D5C08 * ov21_021D5BE0 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D5C08 *ov21_021D5BE0(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D5C08 * v0; + UnkStruct_ov21_021D5C08 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D5C08)); @@ -266,15 +263,15 @@ static UnkStruct_ov21_021D5C08 * ov21_021D5BE0 (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021D5C08 (UnkStruct_ov21_021D5C08 * param0) +static void ov21_021D5C08(UnkStruct_ov21_021D5C08 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static UnkStruct_ov21_021D4660 * ov21_021D5C1C (int param0, UnkStruct_ov21_021E68F4 * param1, UnkStruct_ov21_021D0F60 * param2) +static UnkStruct_ov21_021D4660 *ov21_021D5C1C(int param0, UnkStruct_ov21_021E68F4 *param1, UnkStruct_ov21_021D0F60 *param2) { - UnkStruct_ov21_021D4660 * v0; + UnkStruct_ov21_021D4660 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * ov21_021D5CB4()); ov21_021D467C(param0, &v0[0], param2, (1 << 0)); @@ -286,7 +283,7 @@ static UnkStruct_ov21_021D4660 * ov21_021D5C1C (int param0, UnkStruct_ov21_021E6 return v0; } -static void ov21_021D5C7C (UnkStruct_ov21_021D4660 * param0) +static void ov21_021D5C7C(UnkStruct_ov21_021D4660 *param0) { GF_ASSERT(param0); @@ -299,14 +296,14 @@ static void ov21_021D5C7C (UnkStruct_ov21_021D4660 * param0) Heap_FreeToHeap(param0); } -static int ov21_021D5CB4 (void) +static int ov21_021D5CB4(void) { return 5; } -static int ov21_021D5CB8 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D5CB8(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021D5B68 * v0 = param1; + UnkStruct_ov21_021D5B68 *v0 = param1; param0->unk_08 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021D7464)); @@ -328,10 +325,10 @@ static int ov21_021D5CB8 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021D5D04 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D5D04(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021D5B68 * v0 = param1; - UnkStruct_ov21_021D7464 * v1 = param0->unk_08; + UnkStruct_ov21_021D5B68 *v0 = param1; + UnkStruct_ov21_021D7464 *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -347,7 +344,7 @@ static int ov21_021D5D04 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021D5D34 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D5D34(UnkStruct_ov21_021E6A68 *param0, void *param1) { Heap_FreeToHeap(param0->unk_08); param0->unk_08 = NULL; @@ -355,12 +352,12 @@ static int ov21_021D5D34 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021D5D48 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D5D48(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - UnkStruct_ov21_021D5C08 * v0 = param0; - const UnkStruct_ov21_021D5B68 * v1 = param2; - const UnkStruct_ov21_021D7464 * v2 = param3->unk_08; - UnkStruct_ov21_021D71A8 * v3 = param1->unk_08; + UnkStruct_ov21_021D5C08 *v0 = param0; + const UnkStruct_ov21_021D5B68 *v1 = param2; + const UnkStruct_ov21_021D7464 *v2 = param3->unk_08; + UnkStruct_ov21_021D71A8 *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -409,12 +406,12 @@ static int ov21_021D5D48 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021D5E2C (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D5E2C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - UnkStruct_ov21_021D5C08 * v0 = param0; - const UnkStruct_ov21_021D5B68 * v1 = param2; - const UnkStruct_ov21_021D7464 * v2 = param3->unk_08; - UnkStruct_ov21_021D71A8 * v3 = param1->unk_08; + UnkStruct_ov21_021D5C08 *v0 = param0; + const UnkStruct_ov21_021D5B68 *v1 = param2; + const UnkStruct_ov21_021D7464 *v2 = param3->unk_08; + UnkStruct_ov21_021D71A8 *v3 = param1->unk_08; int v4; if (v1->unk_1C == 0) { @@ -440,12 +437,12 @@ static int ov21_021D5E2C (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021D5EA8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D5EA8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - UnkStruct_ov21_021D5C08 * v0 = param0; - const UnkStruct_ov21_021D5B68 * v1 = param2; - const UnkStruct_ov21_021D7464 * v2 = param3->unk_08; - UnkStruct_ov21_021D71A8 * v3 = param1->unk_08; + UnkStruct_ov21_021D5C08 *v0 = param0; + const UnkStruct_ov21_021D5B68 *v1 = param2; + const UnkStruct_ov21_021D7464 *v2 = param3->unk_08; + UnkStruct_ov21_021D71A8 *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -488,7 +485,7 @@ static int ov21_021D5EA8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021D5F58 (UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1) +static void ov21_021D5F58(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1) { param0->unk_08 = 0; param1->unk_00 = 0; @@ -497,14 +494,14 @@ static void ov21_021D5F58 (UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D param1->unk_0C = 4; } -static void ov21_021D5F6C (UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1) +static void ov21_021D5F6C(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1) { param1->unk_04 = (64 * 10); param1->unk_08 = 0; param1->unk_0C = 0; } -static void ov21_021D5F7C (UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1, int param2) +static void ov21_021D5F7C(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1, int param2) { if (ov21_021D601C(param0, param1, param2) == 1) { return; @@ -527,7 +524,7 @@ static void ov21_021D5F7C (UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D ov21_021D5FD4(param0); } -static void ov21_021D5FC4 (UnkStruct_ov21_021D5B68 * param0) +static void ov21_021D5FC4(UnkStruct_ov21_021D5B68 *param0) { param0->unk_24 = 0; param0->unk_28 = 0; @@ -536,7 +533,7 @@ static void ov21_021D5FC4 (UnkStruct_ov21_021D5B68 * param0) param0->unk_34 = 0; } -static void ov21_021D5FD4 (UnkStruct_ov21_021D5B68 * param0) +static void ov21_021D5FD4(UnkStruct_ov21_021D5B68 *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_B) { if (param0->unk_04->unk_1740 == 0) { @@ -564,7 +561,7 @@ static void ov21_021D5FD4 (UnkStruct_ov21_021D5B68 * param0) } } -static BOOL ov21_021D601C (UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1, int param2) +static BOOL ov21_021D601C(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1, int param2) { if (param0->unk_28) { ov21_021D744C(param0); @@ -599,7 +596,7 @@ static BOOL ov21_021D601C (UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D return 0; } -static void ov21_021D60A4 (UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1) +static void ov21_021D60A4(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1) { if (param1->unk_00 == 0) { return; @@ -623,19 +620,19 @@ static void ov21_021D60A4 (UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D } } -static void ov21_021D60FC (UnkStruct_ov21_021D5B68 * param0, UnkStruct_ov21_021D7464 * param1, int param2) +static void ov21_021D60FC(UnkStruct_ov21_021D5B68 *param0, UnkStruct_ov21_021D7464 *param1, int param2) { param0->unk_0C = (64 * 10); param1->unk_00 = param2; param0->unk_08 = param2; } -static BOOL ov21_021D6108 (UnkStruct_ov21_021D5B68 * param0, int param1) +static BOOL ov21_021D6108(UnkStruct_ov21_021D5B68 *param0, int param1) { return ov21_021D3844(param0->unk_04, param1); } -static void ov21_021D6114 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3) +static void ov21_021D6114(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3) { ov21_021D276C(param1, 0, 0, 0, 0, param3); ov21_021D62E4(param1, param3); @@ -657,7 +654,7 @@ static void ov21_021D6114 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D ov21_021D6F20(param0, param1, param2); } -static void ov21_021D61D8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1) +static void ov21_021D61D8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1) { ov21_021D695C(param0); ov21_021D6580(param0); @@ -665,11 +662,11 @@ static void ov21_021D61D8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D ov21_021D63C0(param0); } -static void ov21_021D61F4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3) +static void ov21_021D61F4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3) { - void * v0; - NNSG2dPaletteData * v1; - u8 * v2; + void *v0; + NNSG2dPaletteData *v1; + u8 *v2; ov21_021D276C(param1, 4, 0, 0, 32, param3); @@ -700,10 +697,10 @@ static void ov21_021D61F4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D ov21_021D6F20(param0, param1, param2); } -static void ov21_021D62E4 (UnkStruct_ov21_021D13FC * param0, int param1) +static void ov21_021D62E4(UnkStruct_ov21_021D13FC *param0, int param1) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0, 28, param0->unk_00, 3, 0, 0, 1, param1); @@ -719,7 +716,7 @@ static void ov21_021D62E4 (UnkStruct_ov21_021D13FC * param0, int param1) sub_0201C3C0(param0->unk_00, 3); } -static void ov21_021D637C (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, int param2, int param3) +static void ov21_021D637C(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2, int param3) { int v0; @@ -734,17 +731,17 @@ static void ov21_021D637C (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D param0->unk_D8 = ov21_021D27B8(param1, v0, 1, ¶m0->unk_DC, param2); } -static void ov21_021D63C0 (UnkStruct_ov21_021D71A8 * param0) +static void ov21_021D63C0(UnkStruct_ov21_021D71A8 *param0) { Heap_FreeToHeap(param0->unk_D8); param0->unk_D8 = NULL; param0->unk_DC = NULL; } -static void ov21_021D63DC (UnkStruct_ov21_021D13FC * param0, int param1, int param2, int param3) +static void ov21_021D63DC(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3) { - Strbuf* v0 = Strbuf_Init(32, param1); - MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); + Strbuf *v0 = Strbuf_Init(32, param1); + MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); MessageLoader_GetStrbuf(v1, 0, v0); sub_0201D78C(¶m0->unk_04, 0, v0, 8, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -763,10 +760,10 @@ static void ov21_021D63DC (UnkStruct_ov21_021D13FC * param0, int param1, int par sub_0201C3C0(param0->unk_00, 1); } -static void ov21_021D64B0 (UnkStruct_ov21_021D13FC * param0, int param1, int param2) +static void ov21_021D64B0(UnkStruct_ov21_021D13FC *param0, int param1, int param2) { - Strbuf* v0 = Strbuf_Init(32, param1); - MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); + Strbuf *v0 = Strbuf_Init(32, param1); + MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); MessageLoader_GetStrbuf(v1, 109, v0); sub_0201D78C(¶m0->unk_04, 0, v0, 8, 152, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -777,7 +774,7 @@ static void ov21_021D64B0 (UnkStruct_ov21_021D13FC * param0, int param1, int par sub_0201C3C0(param0->unk_00, 1); } -static void ov21_021D6538 (UnkStruct_ov21_021D71A8 * param0, int param1) +static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int param1) { param0->unk_80[0] = sub_02009714(2, 0, param1); param0->unk_80[1] = sub_02009714(2, 1, param1); @@ -785,9 +782,9 @@ static void ov21_021D6538 (UnkStruct_ov21_021D71A8 * param0, int param1) param0->unk_80[3] = sub_02009714(2, 3, param1); } -static void ov21_021D6580 (UnkStruct_ov21_021D71A8 * param0) +static void ov21_021D6580(UnkStruct_ov21_021D71A8 *param0) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009DC8(param0->unk_80[0], 81); sub_0200A4E4(v0); @@ -804,10 +801,10 @@ static void ov21_021D6580 (UnkStruct_ov21_021D71A8 * param0) sub_02009754(param0->unk_80[3]); } -static void ov21_021D65DC (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, int param2) +static void ov21_021D65DC(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2) { - UnkStruct_02009DC8 * v0; - NARC * v1 = ov21_021D26E0(param1); + UnkStruct_02009DC8 *v0; + NARC *v1 = ov21_021D26E0(param1); v0 = sub_02009A4C(param0->unk_80[0], v1, 81, 1, 81, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -831,7 +828,7 @@ static void ov21_021D65DC (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D sub_020093B4(¶m0->unk_B4, 111, 3, 109, 110, 0xffffffff, 0xffffffff, 0, 2, param0->unk_80[0], param0->unk_80[1], param0->unk_80[2], param0->unk_80[3], NULL, NULL); } -static void ov21_021D6744 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, int param2) +static void ov21_021D6744(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2) { UnkStruct_ov83_0223D9A8 v0; int v1; @@ -871,15 +868,15 @@ static void ov21_021D6744 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D sub_02021FE0(param0->unk_7C, GX_OAM_MODE_XLU); } -static void ov21_021D67EC (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3) +static void ov21_021D67EC(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3) { int v0; int v1; int v2; int v3; UnkStruct_ov21_021D4CB8 v4; - Window * v5; - const UnkStruct_ov21_021D37DC * v6; + Window *v5; + const UnkStruct_ov21_021D37DC *v6; int v7; v4.unk_00 = param1->unk_14C; @@ -923,11 +920,11 @@ static void ov21_021D67EC (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D } } -static void ov21_021D68C8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2) +static void ov21_021D68C8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2) { int v0; int v1; - const UnkStruct_ov21_021D37DC * v2; + const UnkStruct_ov21_021D37DC *v2; v1 = ov21_021D3898(param2->unk_04); v0 = ov21_021D375C(param2->unk_04); @@ -949,7 +946,7 @@ static void ov21_021D68C8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D } } -static void ov21_021D6940 (UnkStruct_ov21_021D71A8 * param0) +static void ov21_021D6940(UnkStruct_ov21_021D71A8 *param0) { int v0; @@ -960,7 +957,7 @@ static void ov21_021D6940 (UnkStruct_ov21_021D71A8 * param0) } } -static void ov21_021D695C (UnkStruct_ov21_021D71A8 * param0) +static void ov21_021D695C(UnkStruct_ov21_021D71A8 *param0) { int v0; @@ -976,13 +973,13 @@ static void ov21_021D695C (UnkStruct_ov21_021D71A8 * param0) sub_02021BD4(param0->unk_7C); } -static void ov21_021D6994 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D6994(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1) { param0->unk_24 = 0; ov21_021D6ED0(param0, param1); } -static void ov21_021D69A0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D69A0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1) { int v0; VecFx32 v1; @@ -1038,7 +1035,7 @@ static void ov21_021D69A0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2 } } -static void ov21_021D6A58 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D6A58(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1) { int v0; int v1; @@ -1083,9 +1080,9 @@ static void ov21_021D6A58 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2 } } -static void ov21_021D6AE4 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D6AE4(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; int v2; int v3; @@ -1093,7 +1090,7 @@ static void ov21_021D6AE4 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2 int v5; int v6; int v7; - const UnkStruct_ov21_021D37DC * v8; + const UnkStruct_ov21_021D37DC *v8; int v9; int v10; int v11; @@ -1139,13 +1136,13 @@ static void ov21_021D6AE4 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2 } } -static void ov21_021D6B94 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D6B94(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1) { int v0 = ov21_021D38A4(param1->unk_04); param0->unk_78 = FX_Div((54 * FX32_ONE), v0 << FX32_SHIFT); } -static void ov21_021D6BB0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D6BB0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1) { VecFx32 v0; int v1 = ov21_021D3898(param1->unk_04); @@ -1157,7 +1154,7 @@ static void ov21_021D6BB0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2 sub_02021C50(param0->unk_74, &v0); } -static fx32 ov21_021D6BF8 (fx32 param0, fx32 param1, int param2, int param3) +static fx32 ov21_021D6BF8(fx32 param0, fx32 param1, int param2, int param3) { fx32 v0; @@ -1168,13 +1165,13 @@ static fx32 ov21_021D6BF8 (fx32 param0, fx32 param1, int param2, int param3) return v0 + param0; } -static void ov21_021D6C24 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D6C24(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1) { memset(param0, 0, sizeof(UnkStruct_ov21_021D71A8)); param0->unk_144 = ov21_021D3898(param1->unk_04); } -static void ov21_021D6C44 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3) +static void ov21_021D6C44(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3) { int v0; int v1, v2; @@ -1202,9 +1199,9 @@ static void ov21_021D6C44 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D } } -static void ov21_021D6CA4 (GraphicElementData * param0, int * param1, int * param2) +static void ov21_021D6CA4(GraphicElementData *param0, int *param1, int *param2) { - const VecFx32 * v0; + const VecFx32 *v0; v0 = sub_02021D28(param0); @@ -1214,7 +1211,7 @@ static void ov21_021D6CA4 (GraphicElementData * param0, int * param1, int * para *param2 -= (16 / 2); } -static void ov21_021D6CC8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3) +static void ov21_021D6CC8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3) { int v0; int v1; @@ -1238,7 +1235,7 @@ static void ov21_021D6CC8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D break; } - if ((param2->unk_08 == 0)) { + if (param2->unk_08 == 0) { ov21_021D67EC(param0, param1, param2, param3); } else { v2 %= 9; @@ -1260,11 +1257,11 @@ static void ov21_021D6CC8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D } } -static void ov21_021D6D78 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3, int param4, int param5) +static void ov21_021D6D78(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3, int param4, int param5) { UnkStruct_ov21_021D4CB8 v0; - Window * v1; - const UnkStruct_ov21_021D37DC * v2; + Window *v1; + const UnkStruct_ov21_021D37DC *v2; v2 = ov21_021D37DC(param2->unk_04, param5); GF_ASSERT(v2); @@ -1291,12 +1288,12 @@ static void ov21_021D6D78 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D ov21_021D4DA0(v1); } -static void ov21_021D6DF4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, int param2, int param3, int param4) +static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2, int param3, int param4) { UnkStruct_ov21_021D4CB8 v0; - Window * v1; - Strbuf* v2 = Strbuf_Init(32, param2); - MessageLoader * v3 = MessageLoader_Init(0, 26, 697, param2); + Window *v1; + Strbuf *v2 = Strbuf_Init(32, param2); + MessageLoader *v3 = MessageLoader_Init(0, 26, 697, param2); v0.unk_00 = param1->unk_14C; v0.unk_08 = param0->unk_90.unk_08; @@ -1328,7 +1325,7 @@ static void ov21_021D6DF4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D MessageLoader_Free(v3); } -static void ov21_021D6ED0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D6ED0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1) { int v0; int v1; @@ -1353,11 +1350,11 @@ static void ov21_021D6ED0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2 } } -static void ov21_021D6F20 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2) +static void ov21_021D6F20(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2) { fx32 v0; int v1; - Sprite * v2; + Sprite *v2; v0 = FX_Mul(31 << FX32_SHIFT, ((64 * 10) - param2->unk_0C) << FX32_SHIFT); v0 = FX_Div(v0, (64 * 10) << FX32_SHIFT); @@ -1367,15 +1364,15 @@ static void ov21_021D6F20 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D sub_02007DEC(v2, 23, v1); } -static void ov21_021D6F64 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D6F64(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D5B68 *param1) { - Sprite * v0; + Sprite *v0; v0 = ov21_021D2170(param0); sub_02007DEC(v0, 23, 31); } -static void ov21_021D6F74 (const UnkStruct_ov21_021D5B68 * param0) +static void ov21_021D6F74(const UnkStruct_ov21_021D5B68 *param0) { fx32 v0; int v1; @@ -1387,7 +1384,7 @@ static void ov21_021D6F74 (const UnkStruct_ov21_021D5B68 * param0) G2_ChangeBlendAlpha(v1, 16 - v1); } -static void ov21_021D6FB4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1, const UnkStruct_ov21_021D5B68 * param2, BOOL param3) +static void ov21_021D6FB4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1, const UnkStruct_ov21_021D5B68 *param2, BOOL param3) { int v0, v1; int v2, v3; @@ -1430,7 +1427,7 @@ static void ov21_021D6FB4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D ov21_021D1558(¶m0->unk_E0, param1->unk_00->unk_00, 2, param0->unk_DC, v0, v1, v2, v3, v4); } -static BOOL ov21_021D7044 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1) +static BOOL ov21_021D7044(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1) { BOOL v0; int v1; @@ -1454,7 +1451,7 @@ static BOOL ov21_021D7044 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D return v0; } -static void ov21_021D7094 (UnkStruct_ov21_021D5C08 * param0, const UnkStruct_ov21_021D5B68 * param1, BOOL param2) +static void ov21_021D7094(UnkStruct_ov21_021D5C08 *param0, const UnkStruct_ov21_021D5B68 *param1, BOOL param2) { if (param1->unk_10 == 0) { if (param2 == 0) { @@ -1465,9 +1462,9 @@ static void ov21_021D7094 (UnkStruct_ov21_021D5C08 * param0, const UnkStruct_ov2 GX_SetVisibleWnd(GX_WNDMASK_NONE); } -static int ov21_021D70C0 (UnkStruct_ov21_021D13FC * param0, int param1) +static int ov21_021D70C0(UnkStruct_ov21_021D13FC *param0, int param1) { - Window * v0; + Window *v0; int v1; v0 = ov21_021D4D6C(param0->unk_14C, 15, 2); @@ -1478,7 +1475,7 @@ static int ov21_021D70C0 (UnkStruct_ov21_021D13FC * param0, int param1) return v1; } -static void ov21_021D70E8 (UnkStruct_ov21_021D71A8 * param0) +static void ov21_021D70E8(UnkStruct_ov21_021D71A8 *param0) { int v0; @@ -1494,7 +1491,7 @@ static void ov21_021D70E8 (UnkStruct_ov21_021D71A8 * param0) } } -static void ov21_021D7124 (UnkStruct_ov21_021D71A8 * param0) +static void ov21_021D7124(UnkStruct_ov21_021D71A8 *param0) { int v0; @@ -1510,9 +1507,9 @@ static void ov21_021D7124 (UnkStruct_ov21_021D71A8 * param0) } } -static void ov21_021D7160 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3) +static void ov21_021D7160(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, const UnkStruct_ov21_021D5B68 *param2, int param3) { - const VecFx32 * v0; + const VecFx32 *v0; int v1; v1 = (param0->unk_24 + 4) % 9; @@ -1522,7 +1519,7 @@ static void ov21_021D7160 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D ov21_021D238C(param1, 0); } -static void ov21_021D71A8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1, const UnkStruct_ov21_021D5B68 * param2, BOOL param3) +static void ov21_021D71A8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1, const UnkStruct_ov21_021D5B68 *param2, BOOL param3) { ov21_021D6FB4(param0, param1, param2, param3); @@ -1535,7 +1532,7 @@ static void ov21_021D71A8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D } } -static BOOL ov21_021D71E4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1, const UnkStruct_ov21_021D5B68 * param2, BOOL param3) +static BOOL ov21_021D71E4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1, const UnkStruct_ov21_021D5B68 *param2, BOOL param3) { BOOL v0[2]; @@ -1564,7 +1561,7 @@ static BOOL ov21_021D71E4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D return 0; } -static void ov21_021D7248 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1, const UnkStruct_ov21_021D5B68 * param2, BOOL param3) +static void ov21_021D7248(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1, const UnkStruct_ov21_021D5B68 *param2, BOOL param3) { ov21_021D70E8(param0); ov21_021D6FB4(param0, param1, param2, param3); @@ -1583,7 +1580,7 @@ static void ov21_021D7248 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D } } -static BOOL ov21_021D72D4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1, const UnkStruct_ov21_021D5B68 * param2, BOOL param3) +static BOOL ov21_021D72D4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1, const UnkStruct_ov21_021D5B68 *param2, BOOL param3) { BOOL v0[4]; int v1; @@ -1629,13 +1626,13 @@ static BOOL ov21_021D72D4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D return 0; } -static void ov21_021D7394 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1) +static void ov21_021D7394(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1) { ov21_021D2648(¶m0->unk_104, 56, 48, 80, 72, 4); ov21_021D2164(param1->unk_00, param0->unk_104.unk_00, param0->unk_104.unk_04); } -static BOOL ov21_021D73C8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1) +static BOOL ov21_021D73C8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1) { BOOL v0; @@ -1645,13 +1642,13 @@ static BOOL ov21_021D73C8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D return v0; } -static void ov21_021D73F0 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1) +static void ov21_021D73F0(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1) { ov21_021D2648(¶m0->unk_124, 170, 172, 82, 32, 4); ov21_021D1848(param1->unk_00, param0->unk_124.unk_00, param0->unk_124.unk_04); } -static BOOL ov21_021D7424 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D5C08 * param1) +static BOOL ov21_021D7424(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C08 *param1) { BOOL v0; @@ -1661,7 +1658,7 @@ static BOOL ov21_021D7424 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D return v0; } -static void ov21_021D744C (UnkStruct_ov21_021D5B68 * param0) +static void ov21_021D744C(UnkStruct_ov21_021D5B68 *param0) { *param0->unk_00 |= (1 << 2); param0->unk_10 = 0; @@ -1669,7 +1666,7 @@ static void ov21_021D744C (UnkStruct_ov21_021D5B68 * param0) param0->unk_20 = 2; } -static void ov21_021D7464 (UnkStruct_ov21_021D7464 * param0, UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D7464(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B68 *param1) { *param1->unk_00 |= (1 << 1); param1->unk_10 = 0; @@ -1678,7 +1675,7 @@ static void ov21_021D7464 (UnkStruct_ov21_021D7464 * param0, UnkStruct_ov21_021D param1->unk_20 = 2; } -static BOOL ov21_021D747C (UnkStruct_ov21_021D5B68 * param0) +static BOOL ov21_021D747C(UnkStruct_ov21_021D5B68 *param0) { if (param0->unk_04->unk_1740 == 0) { *param0->unk_00 |= (1 << 0); @@ -1692,7 +1689,7 @@ static BOOL ov21_021D747C (UnkStruct_ov21_021D5B68 * param0) return 0; } -static BOOL ov21_021D74B0 (UnkStruct_ov21_021D5B68 * param0, int param1) +static BOOL ov21_021D74B0(UnkStruct_ov21_021D5B68 *param0, int param1) { int v0; @@ -1727,7 +1724,7 @@ static BOOL ov21_021D74B0 (UnkStruct_ov21_021D5B68 * param0, int param1) return 0; } -static void ov21_021D7538 (UnkStruct_ov21_021D5B68 * param0, int param1) +static void ov21_021D7538(UnkStruct_ov21_021D5B68 *param0, int param1) { u32 v0 = ov21_021D37BC(param0->unk_04); @@ -1745,7 +1742,7 @@ static void ov21_021D7538 (UnkStruct_ov21_021D5B68 * param0, int param1) param0->unk_1C = 0; } -static void ov21_021D7590 (UnkStruct_ov21_021D7464 * param0, UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D7590(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B68 *param1) { param0->unk_18--; @@ -1764,7 +1761,7 @@ static void ov21_021D7590 (UnkStruct_ov21_021D7464 * param0, UnkStruct_ov21_021D } } -static void ov21_021D75DC (UnkStruct_ov21_021D7464 * param0, UnkStruct_ov21_021D5B68 * param1) +static void ov21_021D75DC(UnkStruct_ov21_021D7464 *param0, UnkStruct_ov21_021D5B68 *param1) { if (gCoreSys.heldKeys & PAD_KEY_UP) { if (ov21_021D6108(param1, -1)) { diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c index 1af96f2764..a7bbeaf238 100644 --- a/src/overlay021/ov21_021D76B0.c +++ b/src/overlay021/ov21_021D76B0.c @@ -1,18 +1,23 @@ +#include "overlay021/ov21_021D76B0.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4340.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021D5AEC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4660.h" @@ -20,46 +25,40 @@ #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021D5B68.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "core_sys.h" +#include "heap.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201F834.h" #include "unk_020218BC.h" #include "unk_02023FCC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4340.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021D5AEC.h" -#include "overlay021/ov21_021D76B0.h" typedef struct { int unk_00[7]; - UnkStruct_ov21_021D5B68 * unk_1C; - int * unk_20; + UnkStruct_ov21_021D5B68 *unk_1C; + int *unk_20; int unk_24; } UnkStruct_ov21_021D77D4; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021D77E8; typedef struct { - UnkStruct_02023FCC * unk_00; - void * unk_04; - TouchScreenHitTable * unk_08; + UnkStruct_02023FCC *unk_00; + void *unk_04; + TouchScreenHitTable *unk_08; int unk_0C; int unk_10; int unk_14; @@ -69,68 +68,68 @@ typedef struct { } UnkStruct_ov21_021D7A64; typedef struct { - UnkStruct_ov21_021D7A64 * unk_00; - UnkStruct_ov21_021D77D4 * unk_04; + UnkStruct_ov21_021D7A64 *unk_00; + UnkStruct_ov21_021D77D4 *unk_04; } UnkStruct_ov21_021D7B8C; typedef struct { - GraphicElementData * unk_00[3]; - UnkStruct_ov21_021D4CA0 * unk_0C[3]; - GraphicElementData * unk_18; - GraphicElementData * unk_1C; - GraphicElementData * unk_20; - UnkStruct_ov21_021D4CA0 * unk_24; + GraphicElementData *unk_00[3]; + UnkStruct_ov21_021D4CA0 *unk_0C[3]; + GraphicElementData *unk_18; + GraphicElementData *unk_1C; + GraphicElementData *unk_20; + UnkStruct_ov21_021D4CA0 *unk_24; u16 unk_28; u16 unk_2A; - UnkStruct_02009DC8 * unk_2C[4]; + UnkStruct_02009DC8 *unk_2C[4]; } UnkStruct_ov21_021D7C64; -static UnkStruct_ov21_021D77D4 * ov21_021D7728(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D77E8 * ov21_021D7770(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021D7798(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021D77D4(UnkStruct_ov21_021D77D4 * param0); -static void ov21_021D77E8(UnkStruct_ov21_021D77E8 * param0); -static void ov21_021D77FC(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021D77D4 *ov21_021D7728(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D77E8 *ov21_021D7770(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021D7798(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021D77D4(UnkStruct_ov21_021D77D4 *param0); +static void ov21_021D77E8(UnkStruct_ov21_021D77E8 *param0); +static void ov21_021D77FC(UnkStruct_ov21_021D4660 *param0); static int ov21_021D7814(void); -static int ov21_021D7818(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D7860(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D78AC(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D78C0(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021D7950(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021D79E4(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021D84A8(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4); -static void ov21_021D7A64(UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D77D4 * param1, int param2); -static void ov21_021D7B20(UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D77D4 * param1); -static void ov21_021D7B70(UnkStruct_ov21_021D7A64 * param0); -static void ov21_021D7B8C(u32 param0, u32 param1, void * param2); -static void ov21_021D84B8(UnkStruct_ov21_021D77D4 * param0); -static void ov21_021D7C64(UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2, int param3); -static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, int param2); -static void ov21_021D7CD8(UnkStruct_ov21_021D77E8 * param0, const UnkStruct_ov21_021D77D4 * param1, int param2); -static void ov21_021D7D8C(UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, int param2); -static void ov21_021D7E3C(UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1); -static void ov21_021D7E80(UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2, int param3); -static void ov21_021D7FEC(UnkStruct_ov21_021D7C64 * param0); -static void ov21_021D8018(UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2, int param3); -static void ov21_021D81EC(UnkStruct_ov21_021D7C64 * param0); -static void ov21_021D820C(UnkStruct_ov21_021D77E8 * param0, int param1); -static void ov21_021D828C(UnkStruct_ov21_021D77E8 * param0, int param1); -static void ov21_021D853C(UnkStruct_ov21_021D77D4 * param0, int param1); -static void ov21_021D82A8(UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D77D4 * param1); -static void ov21_021D8324(UnkStruct_ov21_021D7A64 * param0); -static void ov21_021D8354(UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, int param2, fx32 param3); -static void ov21_021D83C0(UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2); -static void ov21_021D8434(UnkStruct_ov21_021D7A64 * param0, int param1, int param2); -static BOOL ov21_021D84E0(UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D3320 * param1); -static BOOL ov21_021D8508(UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D3320 * param1); -static void ov21_021D8530(UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D77D4 * param1); +static int ov21_021D7818(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D7860(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D78AC(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D78C0(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021D7950(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021D79E4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021D84A8(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4); +static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, int param2); +static void ov21_021D7B20(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1); +static void ov21_021D7B70(UnkStruct_ov21_021D7A64 *param0); +static void ov21_021D7B8C(u32 param0, u32 param1, void *param2); +static void ov21_021D84B8(UnkStruct_ov21_021D77D4 *param0); +static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, const UnkStruct_ov21_021D77D4 *param2, int param3); +static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, int param2); +static void ov21_021D7CD8(UnkStruct_ov21_021D77E8 *param0, const UnkStruct_ov21_021D77D4 *param1, int param2); +static void ov21_021D7D8C(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, int param2); +static void ov21_021D7E3C(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1); +static void ov21_021D7E80(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, const UnkStruct_ov21_021D77D4 *param2, int param3); +static void ov21_021D7FEC(UnkStruct_ov21_021D7C64 *param0); +static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, const UnkStruct_ov21_021D77D4 *param2, int param3); +static void ov21_021D81EC(UnkStruct_ov21_021D7C64 *param0); +static void ov21_021D820C(UnkStruct_ov21_021D77E8 *param0, int param1); +static void ov21_021D828C(UnkStruct_ov21_021D77E8 *param0, int param1); +static void ov21_021D853C(UnkStruct_ov21_021D77D4 *param0, int param1); +static void ov21_021D82A8(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1); +static void ov21_021D8324(UnkStruct_ov21_021D7A64 *param0); +static void ov21_021D8354(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, int param2, fx32 param3); +static void ov21_021D83C0(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, const UnkStruct_ov21_021D77D4 *param2); +static void ov21_021D8434(UnkStruct_ov21_021D7A64 *param0, int param1, int param2); +static BOOL ov21_021D84E0(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D3320 *param1); +static BOOL ov21_021D8508(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D3320 *param1); +static void ov21_021D8530(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1); static fx32 ov21_021D8580(fx32 param0, s32 param1); -void ov21_021D76B0 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) +void ov21_021D76B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) { - UnkStruct_ov21_021D77D4 * v0; - UnkStruct_ov21_021D77E8 * v1; - UnkStruct_ov21_021D4660 * v2; + UnkStruct_ov21_021D77D4 *v0; + UnkStruct_ov21_021D77E8 *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021D7728(param2, param1); v1 = ov21_021D7770(param2, param1); @@ -149,17 +148,17 @@ void ov21_021D76B0 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021D79E4; } -void ov21_021D7710 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021D7710(UnkStruct_ov21_021E68F4 *param0) { ov21_021D77D4(param0->unk_00); ov21_021D77E8(param0->unk_00); ov21_021D77FC(param0->unk_20); } -static UnkStruct_ov21_021D77D4 * ov21_021D7728 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D77D4 *ov21_021D7728(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D77D4 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021D77D4 *v0; + UnkStruct_ov21_021E68F4 *v1; int v2; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D77D4)); @@ -180,10 +179,10 @@ static UnkStruct_ov21_021D77D4 * ov21_021D7728 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D77E8 * ov21_021D7770 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D77E8 *ov21_021D7770(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D77E8 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021D77E8 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D77E8)); @@ -195,9 +194,9 @@ static UnkStruct_ov21_021D77E8 * ov21_021D7770 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D4660 * ov21_021D7798 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021D7798(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D4660 * v0; + UnkStruct_ov21_021D4660 *v0; int v1 = ov21_021D7814(); v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * v1); @@ -210,19 +209,19 @@ static UnkStruct_ov21_021D4660 * ov21_021D7798 (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021D77D4 (UnkStruct_ov21_021D77D4 * param0) +static void ov21_021D77D4(UnkStruct_ov21_021D77D4 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021D77E8 (UnkStruct_ov21_021D77E8 * param0) +static void ov21_021D77E8(UnkStruct_ov21_021D77E8 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021D77FC (UnkStruct_ov21_021D4660 * param0) +static void ov21_021D77FC(UnkStruct_ov21_021D4660 *param0) { GF_ASSERT(param0); @@ -230,15 +229,15 @@ static void ov21_021D77FC (UnkStruct_ov21_021D4660 * param0) Heap_FreeToHeap(param0); } -static int ov21_021D7814 (void) +static int ov21_021D7814(void) { return 1; } -static int ov21_021D7818 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D7818(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021D77D4 * v0 = param1; - UnkStruct_ov21_021D7A64 * v1; + UnkStruct_ov21_021D77D4 *v0 = param1; + UnkStruct_ov21_021D7A64 *v1; int v2; param0->unk_08 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021D7A64)); @@ -257,10 +256,10 @@ static int ov21_021D7818 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021D7860 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D7860(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021D77D4 * v0 = param1; - UnkStruct_ov21_021D7A64 * v1 = param0->unk_08; + UnkStruct_ov21_021D77D4 *v0 = param1; + UnkStruct_ov21_021D7A64 *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -283,7 +282,7 @@ static int ov21_021D7860 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021D78AC (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D78AC(UnkStruct_ov21_021E6A68 *param0, void *param1) { ov21_021D7B70(param0->unk_08); Heap_FreeToHeap(param0->unk_08); @@ -291,12 +290,12 @@ static int ov21_021D78AC (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021D78C0 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D78C0(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021D77D4 * v0 = param2; - const UnkStruct_ov21_021D7A64 * v1 = param3->unk_08; - UnkStruct_ov21_021D77E8 * v2 = param0; - UnkStruct_ov21_021D7C64 * v3 = param1->unk_08; + const UnkStruct_ov21_021D77D4 *v0 = param2; + const UnkStruct_ov21_021D7A64 *v1 = param3->unk_08; + UnkStruct_ov21_021D77E8 *v2 = param0; + UnkStruct_ov21_021D7C64 *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -327,12 +326,12 @@ static int ov21_021D78C0 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021D7950 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D7950(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021D77D4 * v0 = param2; - const UnkStruct_ov21_021D7A64 * v1 = param3->unk_08; - UnkStruct_ov21_021D77E8 * v2 = param0; - UnkStruct_ov21_021D7C64 * v3 = param1->unk_08; + const UnkStruct_ov21_021D77D4 *v0 = param2; + const UnkStruct_ov21_021D7A64 *v1 = param3->unk_08; + UnkStruct_ov21_021D77E8 *v2 = param0; + UnkStruct_ov21_021D7C64 *v3 = param1->unk_08; ov21_021D144C(v3->unk_00[0], v0->unk_00[0]); ov21_021D144C(v3->unk_00[1], v0->unk_00[1]); @@ -354,12 +353,12 @@ static int ov21_021D7950 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021D79E4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D79E4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021D77D4 * v0 = param2; - const UnkStruct_ov21_021D7A64 * v1 = param3->unk_08; - UnkStruct_ov21_021D77E8 * v2 = param0; - UnkStruct_ov21_021D7C64 * v3 = param1->unk_08; + const UnkStruct_ov21_021D77D4 *v0 = param2; + const UnkStruct_ov21_021D7A64 *v1 = param3->unk_08; + UnkStruct_ov21_021D77E8 *v2 = param0; + UnkStruct_ov21_021D7C64 *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -388,9 +387,9 @@ static int ov21_021D79E4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021D7A64 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D77D4 * param1, int param2) +static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, int param2) { - UnkStruct_ov21_021D7B8C * v0; + UnkStruct_ov21_021D7B8C *v0; param0->unk_08 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 7); @@ -415,7 +414,7 @@ static void ov21_021D7A64 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D param0->unk_00 = sub_02023FCC(param0->unk_08, 7, ov21_021D7B8C, v0, param2); } -static void ov21_021D7B20 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D77D4 * param1) +static void ov21_021D7B20(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1) { int v0; @@ -437,7 +436,7 @@ static void ov21_021D7B20 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D } } -static void ov21_021D7B70 (UnkStruct_ov21_021D7A64 * param0) +static void ov21_021D7B70(UnkStruct_ov21_021D7A64 *param0) { sub_02024034(param0->unk_00); Heap_FreeToHeap(param0->unk_04); @@ -446,12 +445,12 @@ static void ov21_021D7B70 (UnkStruct_ov21_021D7A64 * param0) param0->unk_08 = NULL; } -static void ov21_021D7B8C (u32 param0, u32 param1, void * param2) +static void ov21_021D7B8C(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021D7B8C * v0 = param2; - UnkStruct_ov21_021D77D4 * v1 = v0->unk_04; - UnkStruct_ov21_021D7A64 * v2 = v0->unk_00; - UnkStruct_ov21_021D3320 * v3 = v1->unk_1C->unk_04; + UnkStruct_ov21_021D7B8C *v0 = param2; + UnkStruct_ov21_021D77D4 *v1 = v0->unk_04; + UnkStruct_ov21_021D7A64 *v2 = v0->unk_00; + UnkStruct_ov21_021D3320 *v3 = v1->unk_1C->unk_04; int v4; int v5; @@ -516,7 +515,7 @@ static void ov21_021D7B8C (u32 param0, u32 param1, void * param2) } } -static void ov21_021D7C64 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2, int param3) +static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, const UnkStruct_ov21_021D77D4 *param2, int param3) { ov21_021D7CD8(param1, param2, param3); ov21_021D820C(param1, param3); @@ -527,7 +526,7 @@ static void ov21_021D7C64 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D BGL_SetPriority(7, 3); } -static void ov21_021D7CAC (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, int param2) +static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, int param2) { ov21_021D81EC(param0); ov21_021D7FEC(param0); @@ -537,11 +536,11 @@ static void ov21_021D7CAC (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D BGL_SetPriority(7, 1); } -static void ov21_021D7CD8 (UnkStruct_ov21_021D77E8 * param0, const UnkStruct_ov21_021D77D4 * param1, int param2) +static void ov21_021D7CD8(UnkStruct_ov21_021D77E8 *param0, const UnkStruct_ov21_021D77D4 *param1, int param2) { - void * v0; - NNSG2dScreenData * v1; - BGL * v2 = param0->unk_00->unk_00; + void *v0; + NNSG2dScreenData *v1; + BGL *v2 = param0->unk_00->unk_00; ov21_021D276C(param0->unk_00, 0, 4, 0, 0, param2); @@ -562,10 +561,10 @@ static void ov21_021D7CD8 (UnkStruct_ov21_021D77E8 * param0, const UnkStruct_ov2 sub_0201C3C0(v2, 6); } -static void ov21_021D7D8C (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, int param2) +static void ov21_021D7D8C(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_2C[0] = sub_02009A4C(v0->unk_13C[0], v1, 84, 1, 84 + 1000, NNS_G2D_VRAM_TYPE_2DSUB, param2); @@ -581,9 +580,9 @@ static void ov21_021D7D8C (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D param0->unk_2C[3] = sub_02009BC4(v0->unk_13C[3], v1, 83, 1, 83 + 1000, 3, param2); } -static void ov21_021D7E3C (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1) +static void ov21_021D7E3C(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_2C[0]); sub_0200A6DC(param0->unk_2C[1]); @@ -593,11 +592,11 @@ static void ov21_021D7E3C (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D sub_02009D68(v0->unk_13C[3], param0->unk_2C[3]); } -static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2, int param3) +static void ov21_021D7E80(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, const UnkStruct_ov21_021D77D4 *param2, int param3) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; sub_020093B4(&v0, 84 + 1000, 3 + 1000, 82 + 1000, 83 + 1000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -664,7 +663,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D SpriteActor_SetSpriteAnimActive(param0->unk_20, 5); } -static void ov21_021D7FEC (UnkStruct_ov21_021D7C64 * param0) +static void ov21_021D7FEC(UnkStruct_ov21_021D7C64 *param0) { sub_02021BD4(param0->unk_00[0]); sub_02021BD4(param0->unk_00[1]); @@ -674,12 +673,12 @@ static void ov21_021D7FEC (UnkStruct_ov21_021D7C64 * param0) sub_02021BD4(param0->unk_20); } -static void ov21_021D8018 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2, int param3) +static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, const UnkStruct_ov21_021D77D4 *param2, int param3) { - Window * v0; + Window *v0; UnkStruct_ov21_021D4CB8 v1; - UnkStruct_02009DC8 * v2; - UnkStruct_ov21_021D13FC * v3 = param1->unk_00; + UnkStruct_02009DC8 *v2; + UnkStruct_ov21_021D13FC *v3 = param1->unk_00; int v4; GF_ASSERT(param0->unk_00[0]); @@ -753,7 +752,7 @@ static void ov21_021D8018 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D ov21_021D4DA0(v0); } -static void ov21_021D81EC (UnkStruct_ov21_021D7C64 * param0) +static void ov21_021D81EC(UnkStruct_ov21_021D7C64 *param0) { ov21_021D4D1C(param0->unk_0C[0]); ov21_021D4D1C(param0->unk_0C[1]); @@ -761,11 +760,11 @@ static void ov21_021D81EC (UnkStruct_ov21_021D7C64 * param0) ov21_021D4D1C(param0->unk_24); } -static void ov21_021D820C (UnkStruct_ov21_021D77E8 * param0, int param1) +static void ov21_021D820C(UnkStruct_ov21_021D77E8 *param0, int param1) { - void * v0; - NNSG2dScreenData * v1; - BGL * v2 = param0->unk_00->unk_00; + void *v0; + NNSG2dScreenData *v1; + BGL *v2 = param0->unk_00->unk_00; ov21_021D2724(param0->unk_00, 27, v2, 7, 0, 0, 1, param1); @@ -778,18 +777,18 @@ static void ov21_021D820C (UnkStruct_ov21_021D77E8 * param0, int param1) sub_02019184(v2, 7, 3, 0); } -static void ov21_021D828C (UnkStruct_ov21_021D77E8 * param0, int param1) +static void ov21_021D828C(UnkStruct_ov21_021D77E8 *param0, int param1) { - BGL * v0 = param0->unk_00->unk_00; + BGL *v0 = param0->unk_00->unk_00; sub_02019690(7, 64, 0, param1); sub_02019EBC(v0, 7); } -static void ov21_021D82A8 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D77D4 * param1) +static void ov21_021D82A8(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1) { int v0; - UnkStruct_ov21_021D3320 * v1 = param1->unk_1C->unk_04; + UnkStruct_ov21_021D3320 *v1 = param1->unk_1C->unk_04; if (param1->unk_1C->unk_0C <= 0) { if (param0->unk_10 != 0) { @@ -828,7 +827,7 @@ static void ov21_021D82A8 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D } } -static void ov21_021D8324 (UnkStruct_ov21_021D7A64 * param0) +static void ov21_021D8324(UnkStruct_ov21_021D7A64 *param0) { int v0, v1; int v2, v3; @@ -842,7 +841,7 @@ static void ov21_021D8324 (UnkStruct_ov21_021D7A64 * param0) param0->unk_0C *= 10; } -static void ov21_021D8354 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, int param2, fx32 param3) +static void ov21_021D8354(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, int param2, fx32 param3) { int v0; @@ -858,13 +857,13 @@ static void ov21_021D8354 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D param0->unk_2A = param0->unk_28; } -static void ov21_021D83C0 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2) +static void ov21_021D83C0(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, const UnkStruct_ov21_021D77D4 *param2) { int v0; int v1; int v2 = (64 * 10) - param2->unk_1C->unk_0C; - v1 = (((25 * 0xffff) / 360)) * v2; + v1 = ((25 * 0xffff) / 360) * v2; v0 = v1 / (64 * 10); if (param2->unk_1C->unk_08 == 1) { @@ -883,7 +882,7 @@ static void ov21_021D83C0 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D } } -static void ov21_021D8434 (UnkStruct_ov21_021D7A64 * param0, int param1, int param2) +static void ov21_021D8434(UnkStruct_ov21_021D7A64 *param0, int param1, int param2) { if (param0->unk_0C > 0) { if (param0->unk_0C - 2 >= 4) { @@ -921,14 +920,14 @@ static void ov21_021D8434 (UnkStruct_ov21_021D7A64 * param0, int param1, int par } } -static void ov21_021D84A8 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4) +static void ov21_021D84A8(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4) { ov21_021D1524(param0, param1, param2, param3, param4); } -static void ov21_021D84B8 (UnkStruct_ov21_021D77D4 * param0) +static void ov21_021D84B8(UnkStruct_ov21_021D77D4 *param0) { - UnkStruct_ov21_021D5B68 * v0 = param0->unk_1C; + UnkStruct_ov21_021D5B68 *v0 = param0->unk_1C; if (v0->unk_2C) { param0->unk_00[2] = 2; @@ -946,7 +945,7 @@ static void ov21_021D84B8 (UnkStruct_ov21_021D77D4 * param0) } } -static BOOL ov21_021D84E0 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D3320 * param1) +static BOOL ov21_021D84E0(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D3320 *param1) { int v0; @@ -965,7 +964,7 @@ static BOOL ov21_021D84E0 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D return 1; } -static BOOL ov21_021D8508 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D3320 * param1) +static BOOL ov21_021D8508(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D3320 *param1) { int v0; @@ -984,14 +983,14 @@ static BOOL ov21_021D8508 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D return 1; } -static void ov21_021D8530 (UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D77D4 * param1) +static void ov21_021D8530(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1) { param0->unk_10 = 0; param0->unk_0C = 0; param1->unk_1C->unk_08 = 0; } -static void ov21_021D853C (UnkStruct_ov21_021D77D4 * param0, int param1) +static void ov21_021D853C(UnkStruct_ov21_021D77D4 *param0, int param1) { if (ov21_021D5B68(param0->unk_1C) == 0) { return; @@ -1009,7 +1008,7 @@ static void ov21_021D853C (UnkStruct_ov21_021D77D4 * param0, int param1) param0->unk_1C->unk_1C = 0; } -static fx32 ov21_021D8580 (fx32 param0, s32 param1) +static fx32 ov21_021D8580(fx32 param0, s32 param1) { int v0; diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c index 08950bce3d..aff614dd8a 100644 --- a/src/overlay021/ov21_021D85B0.c +++ b/src/overlay021/ov21_021D85B0.c @@ -1,25 +1,31 @@ +#include "overlay021/ov21_021D85B0.h" + #include #include -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4340.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D157C.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4660.h" #include "overlay021/struct_ov21_021D5B68.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "heap.h" +#include "strbuf.h" #include "unk_02002B7C.h" #include "unk_02005474.h" #include "unk_0200762C.h" @@ -27,21 +33,14 @@ #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4340.h" -#include "overlay021/ov21_021D85B0.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; - UnkStruct_ov21_021D5B68 * unk_08; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; + UnkStruct_ov21_021D5B68 *unk_08; int unk_0C; int unk_10; int unk_14; @@ -56,7 +55,7 @@ typedef struct { } UnkStruct_ov21_021D8788; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021D879C; typedef struct { @@ -72,57 +71,57 @@ typedef struct { int unk_14; BOOL unk_18; int unk_1C; - GraphicElementData * unk_20; - UnkStruct_02009DC8 * unk_24[4]; + GraphicElementData *unk_20; + UnkStruct_02009DC8 *unk_24[4]; UnkStruct_ov21_021D157C unk_34; - GraphicElementData * unk_58; - void * unk_5C; - NNSG2dScreenData * unk_60; + GraphicElementData *unk_58; + void *unk_5C; + NNSG2dScreenData *unk_60; } UnkStruct_ov21_021D9320; -static UnkStruct_ov21_021D8788 * ov21_021D86E8(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D879C * ov21_021D8724(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021D874C(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021D8788(UnkStruct_ov21_021D8788 * param0); -static void ov21_021D879C(UnkStruct_ov21_021D879C * param0); -static void ov21_021D87B0(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021D8788 *ov21_021D86E8(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D879C *ov21_021D8724(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021D874C(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021D8788(UnkStruct_ov21_021D8788 *param0); +static void ov21_021D879C(UnkStruct_ov21_021D879C *param0); +static void ov21_021D87B0(UnkStruct_ov21_021D4660 *param0); static int ov21_021D87C8(void); -static int ov21_021D87CC(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D8804(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D8928(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D893C(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021D89B8(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021D89F4(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021D9320(UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3); -static void ov21_021D9390(UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3); -static void ov21_021D93F4(UnkStruct_ov21_021D879C * param0, int param1); -static void ov21_021D9454(UnkStruct_ov21_021D879C * param0, UnkStruct_ov21_021D9320 * param1, int param2); -static void ov21_021D8A7C(UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, const UnkStruct_ov21_021D87CC * param3, int param4); -static void ov21_021D8B40(UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1); -static void ov21_021D8B8C(UnkStruct_ov21_021D879C * param0, const UnkStruct_ov21_021D8788 * param1, int param2); -static void ov21_021D8C1C(UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, int param2); -static void ov21_021D8CC8(UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1); -static void ov21_021D8D0C(UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3); -static void ov21_021D8DC0(UnkStruct_ov21_021D9320 * param0); -static void ov21_021D8BC4(UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3, int param4); -static void ov21_021D8BEC(UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1); -static void ov21_021D8ED4(UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3); -static void ov21_021D8F98(UnkStruct_ov21_021D879C * param0, int param1, int param2); -static void ov21_021D8DD4(UnkStruct_ov21_021D879C * param0, int param1, int param2); -static void ov21_021D9054(UnkStruct_ov21_021D879C * param0, int param1, int param2); -static void ov21_021D90B4(UnkStruct_ov21_021D879C * param0, int param1, int param2); -static void ov21_021D9234(UnkStruct_ov21_021D879C * param0, int param1, int param2); -static void ov21_021D9240(UnkStruct_ov21_021D879C * param0, int param1, int param2); -static void ov21_021D915C(UnkStruct_ov21_021D879C * param0, int param1, int param2, int param3); -static void ov21_021D924C(UnkStruct_ov21_021D9320 * param0, int param1); -static void ov21_021D8E68(UnkStruct_ov21_021D879C * param0, int param1); -static void ov21_021D8C00(UnkStruct_ov21_021D879C * param0); - -void ov21_021D85B0 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) +static int ov21_021D87CC(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D8804(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D8928(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D893C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021D89B8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021D89F4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021D9320(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, int param3); +static void ov21_021D9390(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, int param3); +static void ov21_021D93F4(UnkStruct_ov21_021D879C *param0, int param1); +static void ov21_021D9454(UnkStruct_ov21_021D879C *param0, UnkStruct_ov21_021D9320 *param1, int param2); +static void ov21_021D8A7C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, const UnkStruct_ov21_021D87CC *param3, int param4); +static void ov21_021D8B40(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1); +static void ov21_021D8B8C(UnkStruct_ov21_021D879C *param0, const UnkStruct_ov21_021D8788 *param1, int param2); +static void ov21_021D8C1C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, int param2); +static void ov21_021D8CC8(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1); +static void ov21_021D8D0C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, int param3); +static void ov21_021D8DC0(UnkStruct_ov21_021D9320 *param0); +static void ov21_021D8BC4(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, int param3, int param4); +static void ov21_021D8BEC(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1); +static void ov21_021D8ED4(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, int param3); +static void ov21_021D8F98(UnkStruct_ov21_021D879C *param0, int param1, int param2); +static void ov21_021D8DD4(UnkStruct_ov21_021D879C *param0, int param1, int param2); +static void ov21_021D9054(UnkStruct_ov21_021D879C *param0, int param1, int param2); +static void ov21_021D90B4(UnkStruct_ov21_021D879C *param0, int param1, int param2); +static void ov21_021D9234(UnkStruct_ov21_021D879C *param0, int param1, int param2); +static void ov21_021D9240(UnkStruct_ov21_021D879C *param0, int param1, int param2); +static void ov21_021D915C(UnkStruct_ov21_021D879C *param0, int param1, int param2, int param3); +static void ov21_021D924C(UnkStruct_ov21_021D9320 *param0, int param1); +static void ov21_021D8E68(UnkStruct_ov21_021D879C *param0, int param1); +static void ov21_021D8C00(UnkStruct_ov21_021D879C *param0); + +void ov21_021D85B0(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) { - UnkStruct_ov21_021D8788 * v0; - UnkStruct_ov21_021D879C * v1; - UnkStruct_ov21_021D4660 * v2; + UnkStruct_ov21_021D8788 *v0; + UnkStruct_ov21_021D879C *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021D86E8(param2, param1); v1 = ov21_021D8724(param2, param1); @@ -141,58 +140,58 @@ void ov21_021D85B0 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021D89F4; } -void ov21_021D8610 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021D8610(UnkStruct_ov21_021E68F4 *param0) { ov21_021D8788(param0->unk_00); ov21_021D879C(param0->unk_04); ov21_021D87B0(param0->unk_20); } -void ov21_021D8628 (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021D8628(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + UnkStruct_ov21_021D8788 *v0 = param0->unk_00; GF_ASSERT(param1 < 4); v0->unk_0C = param1; } -int ov21_021D863C (const UnkStruct_ov21_021E68F4 * param0) +int ov21_021D863C(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + const UnkStruct_ov21_021D8788 *v0 = param0->unk_00; return v0->unk_0C; } -void ov21_021D8644 (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021D8644(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + UnkStruct_ov21_021D8788 *v0 = param0->unk_00; GF_ASSERT(param1 < 6); v0->unk_10 = param1; } -int ov21_021D8658 (const UnkStruct_ov21_021E68F4 * param0) +int ov21_021D8658(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + const UnkStruct_ov21_021D8788 *v0 = param0->unk_00; return v0->unk_10; } -void ov21_021D8660 (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021D8660(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + UnkStruct_ov21_021D8788 *v0 = param0->unk_00; GF_ASSERT(param1 < 10); v0->unk_14 = param1; } -int ov21_021D8674 (const UnkStruct_ov21_021E68F4 * param0) +int ov21_021D8674(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + const UnkStruct_ov21_021D8788 *v0 = param0->unk_00; return v0->unk_14; } -void ov21_021D867C (UnkStruct_ov21_021E68F4 * param0, int param1, int param2) +void ov21_021D867C(UnkStruct_ov21_021E68F4 *param0, int param1, int param2) { - UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + UnkStruct_ov21_021D8788 *v0 = param0->unk_00; GF_ASSERT(param1 < 18); @@ -203,9 +202,9 @@ void ov21_021D867C (UnkStruct_ov21_021E68F4 * param0, int param1, int param2) } } -int ov21_021D8698 (const UnkStruct_ov21_021E68F4 * param0, int param1) +int ov21_021D8698(const UnkStruct_ov21_021E68F4 *param0, int param1) { - const UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + const UnkStruct_ov21_021D8788 *v0 = param0->unk_00; if (param1 == 0) { return v0->unk_18; @@ -214,50 +213,50 @@ int ov21_021D8698 (const UnkStruct_ov21_021E68F4 * param0, int param1) return v0->unk_1C; } -void ov21_021D86A8 (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021D86A8(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + UnkStruct_ov21_021D8788 *v0 = param0->unk_00; GF_ASSERT(param1 < 15); v0->unk_20 = param1; } -int ov21_021D86BC (const UnkStruct_ov21_021E68F4 * param0) +int ov21_021D86BC(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + const UnkStruct_ov21_021D8788 *v0 = param0->unk_00; return v0->unk_20; } -void ov21_021D86C4 (UnkStruct_ov21_021E68F4 * param0, BOOL param1) +void ov21_021D86C4(UnkStruct_ov21_021E68F4 *param0, BOOL param1) { - UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + UnkStruct_ov21_021D8788 *v0 = param0->unk_00; v0->unk_24 = 1; v0->unk_28 = param1; } -BOOL ov21_021D86D0 (const UnkStruct_ov21_021E68F4 * param0) +BOOL ov21_021D86D0(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + const UnkStruct_ov21_021D8788 *v0 = param0->unk_00; return v0->unk_28; } -int ov21_021D86D8 (const UnkStruct_ov21_021E68F4 * param0) +int ov21_021D86D8(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + const UnkStruct_ov21_021D8788 *v0 = param0->unk_00; return v0->unk_30; } -int ov21_021D86E0 (const UnkStruct_ov21_021E68F4 * param0) +int ov21_021D86E0(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021D8788 * v0 = param0->unk_00; + const UnkStruct_ov21_021D8788 *v0 = param0->unk_00; return v0->unk_34; } -static UnkStruct_ov21_021D8788 * ov21_021D86E8 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D8788 *ov21_021D86E8(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D8788 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021D8788 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D8788)); @@ -272,10 +271,10 @@ static UnkStruct_ov21_021D8788 * ov21_021D86E8 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D879C * ov21_021D8724 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D879C *ov21_021D8724(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D879C * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021D879C *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D879C)); @@ -287,9 +286,9 @@ static UnkStruct_ov21_021D879C * ov21_021D8724 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D4660 * ov21_021D874C (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021D874C(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D4660 * v0; + UnkStruct_ov21_021D4660 *v0; int v1 = ov21_021D87C8(); v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * v1); @@ -302,19 +301,19 @@ static UnkStruct_ov21_021D4660 * ov21_021D874C (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021D8788 (UnkStruct_ov21_021D8788 * param0) +static void ov21_021D8788(UnkStruct_ov21_021D8788 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021D879C (UnkStruct_ov21_021D879C * param0) +static void ov21_021D879C(UnkStruct_ov21_021D879C *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021D87B0 (UnkStruct_ov21_021D4660 * param0) +static void ov21_021D87B0(UnkStruct_ov21_021D4660 *param0) { GF_ASSERT(param0); @@ -322,15 +321,15 @@ static void ov21_021D87B0 (UnkStruct_ov21_021D4660 * param0) Heap_FreeToHeap(param0); } -static int ov21_021D87C8 (void) +static int ov21_021D87C8(void) { return 1; } -static int ov21_021D87CC (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D87CC(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021D8788 * v0 = param1; - UnkStruct_ov21_021D87CC * v1; + UnkStruct_ov21_021D8788 *v0 = param1; + UnkStruct_ov21_021D87CC *v1; v1 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021D87CC)); @@ -352,10 +351,10 @@ static int ov21_021D87CC (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021D8804 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D8804(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021D8788 * v0 = param1; - UnkStruct_ov21_021D87CC * v1 = param0->unk_08; + UnkStruct_ov21_021D8788 *v0 = param1; + UnkStruct_ov21_021D87CC *v1 = param0->unk_08; BOOL v2; if (param0->unk_0C == 1) { @@ -439,10 +438,10 @@ static int ov21_021D8804 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021D8928 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D8928(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021D87CC * v0 = param0->unk_08; - UnkStruct_ov21_021D8788 * v1 = param1; + UnkStruct_ov21_021D87CC *v0 = param0->unk_08; + UnkStruct_ov21_021D8788 *v1 = param1; Heap_FreeToHeap(v0); param0->unk_08 = NULL; @@ -450,12 +449,12 @@ static int ov21_021D8928 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021D893C (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D893C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021D8788 * v0 = param2; - const UnkStruct_ov21_021D87CC * v1 = param3->unk_08; - UnkStruct_ov21_021D879C * v2 = param0; - UnkStruct_ov21_021D9320 * v3 = param1->unk_08; + const UnkStruct_ov21_021D8788 *v0 = param2; + const UnkStruct_ov21_021D87CC *v1 = param3->unk_08; + UnkStruct_ov21_021D879C *v2 = param0; + UnkStruct_ov21_021D9320 *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -481,12 +480,12 @@ static int ov21_021D893C (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021D89B8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D89B8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021D8788 * v0 = param2; - const UnkStruct_ov21_021D87CC * v1 = param3->unk_08; - UnkStruct_ov21_021D879C * v2 = param0; - UnkStruct_ov21_021D9320 * v3 = param1->unk_08; + const UnkStruct_ov21_021D8788 *v0 = param2; + const UnkStruct_ov21_021D87CC *v1 = param3->unk_08; + UnkStruct_ov21_021D879C *v2 = param0; + UnkStruct_ov21_021D9320 *v3 = param1->unk_08; if (v0->unk_30 == 0) { ov21_021D8ED4(v3, v2, v0, param1->unk_04); @@ -499,12 +498,12 @@ static int ov21_021D89B8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021D89F4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D89F4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021D8788 * v0 = param2; - const UnkStruct_ov21_021D87CC * v1 = param3->unk_08; - UnkStruct_ov21_021D879C * v2 = param0; - UnkStruct_ov21_021D9320 * v3 = param1->unk_08; + const UnkStruct_ov21_021D8788 *v0 = param2; + const UnkStruct_ov21_021D87CC *v1 = param3->unk_08; + UnkStruct_ov21_021D879C *v2 = param0; + UnkStruct_ov21_021D9320 *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -537,7 +536,7 @@ static int ov21_021D89F4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021D8A7C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, const UnkStruct_ov21_021D87CC * param3, int param4) +static void ov21_021D8A7C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, const UnkStruct_ov21_021D87CC *param3, int param4) { sub_02019EBC(param1->unk_00->unk_00, 2); sub_02019EBC(param1->unk_00->unk_00, 1); @@ -562,7 +561,7 @@ static void ov21_021D8A7C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D BGL_SetPriority(2, 0); } -static void ov21_021D8B40 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1) +static void ov21_021D8B40(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1) { ov21_021D8DC0(param0); ov21_021D8CC8(param0, param1); @@ -575,15 +574,15 @@ static void ov21_021D8B40 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D BGL_SetPriority(2, 1); } -static void ov21_021D8B8C (UnkStruct_ov21_021D879C * param0, const UnkStruct_ov21_021D8788 * param1, int param2) +static void ov21_021D8B8C(UnkStruct_ov21_021D879C *param0, const UnkStruct_ov21_021D8788 *param1, int param2) { - void * v0; + void *v0; ov21_021D2724(param0->unk_00, 28, param0->unk_00->unk_00, 3, 0, 0, 1, param2); ov21_021D276C(param0->unk_00, 5, 0, 0, 32, param2); } -static void ov21_021D8BC4 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3, int param4) +static void ov21_021D8BC4(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, int param3, int param4) { int v0; @@ -596,25 +595,25 @@ static void ov21_021D8BC4 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D param0->unk_5C = ov21_021D27B8(param1->unk_00, v0, 1, ¶m0->unk_60, param3); } -static void ov21_021D8BEC (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1) +static void ov21_021D8BEC(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1) { Heap_FreeToHeap(param0->unk_5C); param0->unk_5C = NULL; param0->unk_60 = NULL; } -static void ov21_021D8C00 (UnkStruct_ov21_021D879C * param0) +static void ov21_021D8C00(UnkStruct_ov21_021D879C *param0) { - Sprite * v0 = ov21_021D2170(param0->unk_00); + Sprite *v0 = ov21_021D2170(param0->unk_00); sub_02007DEC(v0, 6, 1); sub_02008780(v0); } -static void ov21_021D8C1C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, int param2) +static void ov21_021D8C1C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(v0); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(v0); param0->unk_24[0] = sub_02009A4C(v0->unk_13C[0], v1, 81, 1, 81 + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -630,9 +629,9 @@ static void ov21_021D8C1C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D param0->unk_24[3] = sub_02009BC4(v0->unk_13C[3], v1, 80, 1, 80 + 15000, 3, param2); } -static void ov21_021D8CC8 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1) +static void ov21_021D8CC8(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_24[0]); sub_0200A6DC(param0->unk_24[1]); @@ -643,11 +642,11 @@ static void ov21_021D8CC8 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D sub_02009D68(v0->unk_13C[3], param0->unk_24[3]); } -static void ov21_021D8D0C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3) +static void ov21_021D8D0C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, int param3) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; sub_020093B4(&v0, 81 + 15000, 3 + 15000, 79 + 15000, 80 + 15000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -674,16 +673,16 @@ static void ov21_021D8D0C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D sub_02021E80(param0->unk_58, 0); } -static void ov21_021D8DC0 (UnkStruct_ov21_021D9320 * param0) +static void ov21_021D8DC0(UnkStruct_ov21_021D9320 *param0) { sub_02021BD4(param0->unk_20); sub_02021BD4(param0->unk_58); } -static void ov21_021D8DD4 (UnkStruct_ov21_021D879C * param0, int param1, int param2) +static void ov21_021D8DD4(UnkStruct_ov21_021D879C *param0, int param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - Strbuf* v1; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; + Strbuf *v1; int v2; BGL_WindowColor(&v0->unk_04, 0, 24, 8, 208, 32); @@ -716,10 +715,10 @@ static void ov21_021D8DD4 (UnkStruct_ov21_021D879C * param0, int param1, int par Strbuf_Free(v1); } -static void ov21_021D8E68 (UnkStruct_ov21_021D879C * param0, int param1) +static void ov21_021D8E68(UnkStruct_ov21_021D879C *param0, int param1) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - Strbuf* v1; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; + Strbuf *v1; BGL_WindowColor(&v0->unk_04, 0, 24, 8, 208, 32); @@ -734,7 +733,7 @@ static void ov21_021D8E68 (UnkStruct_ov21_021D879C * param0, int param1) Strbuf_Free(v1); } -static void ov21_021D8ED4 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3) +static void ov21_021D8ED4(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, int param3) { if (param2->unk_2C != param0->unk_18) { param0->unk_18 = param2->unk_2C; @@ -784,10 +783,10 @@ static void ov21_021D8ED4 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D } } -static void ov21_021D8F98 (UnkStruct_ov21_021D879C * param0, int param1, int param2) +static void ov21_021D8F98(UnkStruct_ov21_021D879C *param0, int param1, int param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; int v2, v3; int v4; @@ -826,10 +825,10 @@ static void ov21_021D8F98 (UnkStruct_ov21_021D879C * param0, int param1, int par sub_0201C3C0(param0->unk_00->unk_00, 3); } -static void ov21_021D9054 (UnkStruct_ov21_021D879C * param0, int param1, int param2) +static void ov21_021D9054(UnkStruct_ov21_021D879C *param0, int param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - Strbuf* v1; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; + Strbuf *v1; int v2; BGL_WindowColor(&v0->unk_04, 0, 88, 52, 80, 16); @@ -845,10 +844,10 @@ static void ov21_021D9054 (UnkStruct_ov21_021D879C * param0, int param1, int par Strbuf_Free(v1); } -static void ov21_021D90B4 (UnkStruct_ov21_021D879C * param0, int param1, int param2) +static void ov21_021D90B4(UnkStruct_ov21_021D879C *param0, int param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - Strbuf* v1; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; + Strbuf *v1; int v2; int v3; @@ -897,10 +896,10 @@ static void ov21_021D90B4 (UnkStruct_ov21_021D879C * param0, int param1, int par Strbuf_Free(v1); } -static void ov21_021D915C (UnkStruct_ov21_021D879C * param0, int param1, int param2, int param3) +static void ov21_021D915C(UnkStruct_ov21_021D879C *param0, int param1, int param2, int param3) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - Strbuf* v1; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; + Strbuf *v1; int v2; int v3; @@ -973,17 +972,17 @@ static void ov21_021D915C (UnkStruct_ov21_021D879C * param0, int param1, int par Strbuf_Free(v1); } -static void ov21_021D9234 (UnkStruct_ov21_021D879C * param0, int param1, int param2) +static void ov21_021D9234(UnkStruct_ov21_021D879C *param0, int param1, int param2) { ov21_021D915C(param0, param1, param2, 102); } -static void ov21_021D9240 (UnkStruct_ov21_021D879C * param0, int param1, int param2) +static void ov21_021D9240(UnkStruct_ov21_021D879C *param0, int param1, int param2) { ov21_021D915C(param0, param1, param2, 120); } -static void ov21_021D924C (UnkStruct_ov21_021D9320 * param0, int param1) +static void ov21_021D924C(UnkStruct_ov21_021D9320 *param0, int param1) { if (param1 == 0) { sub_02021CAC(param0->unk_20, 0); @@ -1039,7 +1038,7 @@ static void ov21_021D924C (UnkStruct_ov21_021D9320 * param0, int param1) } } -static void ov21_021D9320 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3) +static void ov21_021D9320(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, int param3) { if (param2->unk_34 == 4) { if (param2->unk_30 == 1) { @@ -1054,7 +1053,7 @@ static void ov21_021D9320 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D ov21_021D157C(¶m0->unk_34); } -static void ov21_021D9390 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3) +static void ov21_021D9390(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, int param3) { int v0; int v1; @@ -1069,16 +1068,16 @@ static void ov21_021D9390 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D } v1 = 4 - param2->unk_34; - v0 = (((180 * 0xffff) / 360)) * v1; + v0 = ((180 * 0xffff) / 360) * v1; v0 = v0 / 4; sub_02021C94(param0->unk_58, (u16)v0); } -static void ov21_021D93F4 (UnkStruct_ov21_021D879C * param0, int param1) +static void ov21_021D93F4(UnkStruct_ov21_021D879C *param0, int param1) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - Strbuf* v1; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; + Strbuf *v1; int v2; BGL_FillWindow(¶m0->unk_00->unk_04, 0); @@ -1096,7 +1095,7 @@ static void ov21_021D93F4 (UnkStruct_ov21_021D879C * param0, int param1) BGL_SetPriority(2, 1); } -static void ov21_021D9454 (UnkStruct_ov21_021D879C * param0, UnkStruct_ov21_021D9320 * param1, int param2) +static void ov21_021D9454(UnkStruct_ov21_021D879C *param0, UnkStruct_ov21_021D9320 *param1, int param2) { BGL_SetPriority(1, 1); BGL_SetPriority(2, 0); diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c index b09497cde3..01a9b995a2 100644 --- a/src/overlay021/ov21_021D94BC.c +++ b/src/overlay021/ov21_021D94BC.c @@ -1,77 +1,76 @@ +#include "overlay021/ov21_021D94BC.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" -#include "overlay021/struct_ov21_021D4C0C_decl.h" -#include "overlay021/struct_ov21_021D4EE4_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021D4EE4.h" +#include "overlay021/ov21_021D85B0.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D2648.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4660.h" +#include "overlay021/struct_ov21_021D4C0C_decl.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" +#include "overlay021/struct_ov21_021D4EE4_decl.h" #include "overlay021/struct_ov21_021D4FE4.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "core_sys.h" +#include "heap.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201F834.h" #include "unk_020218BC.h" #include "unk_02023FCC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021D4EE4.h" -#include "overlay021/ov21_021D85B0.h" -#include "overlay021/ov21_021D94BC.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; - UnkStruct_ov21_021E68F4 * unk_08; - UnkStruct_ov21_021E68F4 * unk_0C; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; + UnkStruct_ov21_021E68F4 *unk_08; + UnkStruct_ov21_021E68F4 *unk_0C; } UnkStruct_ov21_021D95B8; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; int unk_04; - BOOL * unk_08; + BOOL *unk_08; } UnkStruct_ov21_021D95CC; typedef struct { - void * unk_00; - void * unk_04; + void *unk_00; + void *unk_04; } UnkStruct_ov21_021D9D18; typedef struct { - UnkStruct_02023FCC * unk_00; - TouchScreenHitTable * unk_04; - UnkStruct_02023FCC * unk_08; - TouchScreenHitTable * unk_0C; + UnkStruct_02023FCC *unk_00; + TouchScreenHitTable *unk_04; + UnkStruct_02023FCC *unk_08; + TouchScreenHitTable *unk_0C; UnkStruct_ov21_021D9D18 unk_10; - UnkStruct_ov21_021D4EE4 * unk_18; - UnkStruct_ov21_021D4FE4 * unk_1C; + UnkStruct_ov21_021D4EE4 *unk_18; + UnkStruct_ov21_021D4FE4 *unk_1C; int unk_20; int unk_24; int unk_28; @@ -87,144 +86,144 @@ typedef struct { } UnkStruct_ov21_021D9B24; typedef struct { - GraphicElementData * unk_00[6]; - UnkStruct_ov21_021D4CA0 * unk_18[6]; - GraphicElementData * unk_30[15]; - UnkStruct_ov21_021D4CA0 * unk_6C[15]; - GraphicElementData * unk_A8[15]; - UnkStruct_02009DC8 * unk_E4[4]; - UnkStruct_02009DC8 * unk_F4[4]; + GraphicElementData *unk_00[6]; + UnkStruct_ov21_021D4CA0 *unk_18[6]; + GraphicElementData *unk_30[15]; + UnkStruct_ov21_021D4CA0 *unk_6C[15]; + GraphicElementData *unk_A8[15]; + UnkStruct_02009DC8 *unk_E4[4]; + UnkStruct_02009DC8 *unk_F4[4]; int unk_104; int unk_108; UnkStruct_ov21_021D2648 unk_10C; int unk_12C; int unk_130; - BOOL * unk_134; + BOOL *unk_134; } UnkStruct_ov21_021DC96C; -static UnkStruct_ov21_021D95B8 * ov21_021D9534(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D95CC * ov21_021D957C(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021D95B4(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021D95B8(UnkStruct_ov21_021D95B8 * param0); -static void ov21_021D95CC(UnkStruct_ov21_021D95CC * param0); -static void ov21_021D95E0(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021D95B8 *ov21_021D9534(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D95CC *ov21_021D957C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021D95B4(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021D95B8(UnkStruct_ov21_021D95B8 *param0); +static void ov21_021D95CC(UnkStruct_ov21_021D95CC *param0); +static void ov21_021D95E0(UnkStruct_ov21_021D4660 *param0); static int ov21_021D95E4(void); -static int ov21_021D95E8(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D964C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D9780(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021D97A0(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021D9830(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021D9960(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021DC96C(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, const UnkStruct_ov21_021D95B8 * param2); -static void ov21_021D9A08(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, const UnkStruct_ov21_021D95B8 * param2, const UnkStruct_ov21_021D9B24 * param3, int param4); -static void ov21_021D9A4C(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1); -static void ov21_021D9A74(UnkStruct_ov21_021D95CC * param0, const UnkStruct_ov21_021D95B8 * param1, int param2); -static void ov21_021DB50C(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2); -static void ov21_021DB5DC(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1); -static void ov21_021DB634(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2); -static void ov21_021DB6C8(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1); -static void ov21_021DC7C0(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1); -static void ov21_021DC7F4(UnkStruct_ov21_021DC96C * param0); -static void ov21_021DC8B4(UnkStruct_ov21_021DC96C * param0, int param1, int param2, int param3); -static void ov21_021DC8D0(UnkStruct_ov21_021DC96C * param0, int param1); -static void ov21_021DC90C(UnkStruct_ov21_021DC96C * param0, int param1); -static void ov21_021DC93C(UnkStruct_ov21_021DC96C * param0, int param1); -static void ov21_021DB708(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2); -static void ov21_021DB78C(UnkStruct_ov21_021DC96C * param0); -static void ov21_021DB81C(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1, int param2, int param3); -static void ov21_021DB79C(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2); -static void ov21_021DB858(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1); -static void ov21_021DB90C(UnkStruct_ov21_021DC96C * param0); -static void ov21_021DB924(UnkStruct_ov21_021DC96C * param0); -static void ov21_021DB944(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1); -static void ov21_021DB9B4(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1); -static void ov21_021DBA24(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1); -static void ov21_021DBAB8(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1); -static void ov21_021DBB74(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1); -static void ov21_021DBBE4(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2); -static void ov21_021DBDA0(UnkStruct_ov21_021DC96C * param0); -static void ov21_021DBDC8(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2); -static void ov21_021DBE2C(UnkStruct_ov21_021DC96C * param0); -static void ov21_021DBE98(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2, int param3, int param4); -static void ov21_021DBE3C(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2); -static void ov21_021DBEC8(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2); -static void ov21_021DC04C(UnkStruct_ov21_021DC96C * param0); -static void ov21_021DC068(UnkStruct_ov21_021DC96C * param0); -static void ov21_021DC088(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2); -static void ov21_021DC12C(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2); -static void ov21_021DC1E8(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2); -static void ov21_021DC2A4(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2); -static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2); -static void ov21_021D9B24(UnkStruct_ov21_021D9B24 * param0); -static void ov21_021D9B34(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2); -static void ov21_021D9B58(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2, int param3, int param4); -static void ov21_021D9B98(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021D9BB0(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2, int param3); -static void ov21_021D9B04(UnkStruct_ov21_021D9B24 * param0); -static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2); -static void ov21_021D9C90(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021D9D00(UnkStruct_ov21_021D9B24 * param0); -static void ov21_021D9D18(u32 param0, u32 param1, void * param2); -static void ov21_021D9CA8(UnkStruct_ov21_021D9B24 * param0); -static void ov21_021D9CB8(UnkStruct_ov21_021D9B24 * param0, int param1); -static void ov21_021D9D50(UnkStruct_ov21_021D9B24 * param0); -static void ov21_021D9D68(UnkStruct_ov21_021D9B24 * param0); -static void ov21_021D9D78(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2); -static void ov21_021D9E08(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021D9E90(u32 param0, u32 param1, void * param2); -static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2); -static void ov21_021D9F44(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021D9FF8(u32 param0, u32 param1, void * param2); -static void ov21_021DA018(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2); -static void ov21_021DA0BC(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DA18C(u32 param0, u32 param1, void * param2); -static void ov21_021DA0FC(UnkStruct_ov21_021D9B24 * param0, int param1); -static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2); -static void ov21_021DA280(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DA2C0(u32 param0, u32 param1, void * param2); -static void ov21_021DA308(UnkStruct_ov21_021D9B24 * param0, int param1); -static void ov21_021DA38C(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2); -static void ov21_021DA41C(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DA514(u32 param0, u32 param1, void * param2); -static void ov21_021DB3C8(UnkStruct_ov21_021D9B24 * param0); -static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 * param0, int param1); -static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 * param0, int param1, int param2, int param3); -static void ov21_021DB428(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DB2FC(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DB38C(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2, int param3); -static void ov21_021DB468(UnkStruct_ov21_021D9B24 * param0, int param1); -static void ov21_021DA534(UnkStruct_ov21_021D4FE4 * param0, int param1); -static void ov21_021DA5A8(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 * param0, int param1); -static void ov21_021DA7B0(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DA888(UnkStruct_ov21_021D9B24 * param0, int param1); -static void ov21_021DA988(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 * param0, int param1); -static void ov21_021DAC08(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DAD74(UnkStruct_ov21_021D9B24 * param0, int param1); -static void ov21_021DAED8(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DB02C(UnkStruct_ov21_021D9B24 * param0, int param1); -static void ov21_021DB12C(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DB480(UnkStruct_ov21_021D95CC * param0, const UnkStruct_ov21_021D9B24 * param1, const UnkStruct_ov21_021D95B8 * param2); -static void ov21_021DB49C(UnkStruct_ov21_021D95CC * param0, const UnkStruct_ov21_021D9B24 * param1, const UnkStruct_ov21_021D95B8 * param2); -static void ov21_021DB4D4(UnkStruct_ov21_021D95CC * param0, const UnkStruct_ov21_021D9B24 * param1); -static BOOL ov21_021DB4E4(UnkStruct_ov21_021D95CC * param0, BOOL param1); -static void ov21_021DC35C(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DC368(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DC380(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2, int param3); -static void ov21_021DC3BC(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DC48C(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DC4F8(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DC57C(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DC600(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); -static void ov21_021DC67C(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2); -static void ov21_021DC720(UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1); - -void ov21_021D94BC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) -{ - UnkStruct_ov21_021D95B8 * v0; - UnkStruct_ov21_021D95CC * v1; - UnkStruct_ov21_021D4660 * v2; +static int ov21_021D95E8(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D964C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D9780(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021D97A0(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021D9830(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021D9960(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021DC96C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, const UnkStruct_ov21_021D95B8 *param2); +static void ov21_021D9A08(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, const UnkStruct_ov21_021D95B8 *param2, const UnkStruct_ov21_021D9B24 *param3, int param4); +static void ov21_021D9A4C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1); +static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021DB50C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DB5DC(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1); +static void ov21_021DB634(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DB6C8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1); +static void ov21_021DC7C0(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1); +static void ov21_021DC7F4(UnkStruct_ov21_021DC96C *param0); +static void ov21_021DC8B4(UnkStruct_ov21_021DC96C *param0, int param1, int param2, int param3); +static void ov21_021DC8D0(UnkStruct_ov21_021DC96C *param0, int param1); +static void ov21_021DC90C(UnkStruct_ov21_021DC96C *param0, int param1); +static void ov21_021DC93C(UnkStruct_ov21_021DC96C *param0, int param1); +static void ov21_021DB708(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DB78C(UnkStruct_ov21_021DC96C *param0); +static void ov21_021DB81C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1, int param2, int param3); +static void ov21_021DB79C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DB858(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1); +static void ov21_021DB90C(UnkStruct_ov21_021DC96C *param0); +static void ov21_021DB924(UnkStruct_ov21_021DC96C *param0); +static void ov21_021DB944(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1); +static void ov21_021DB9B4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1); +static void ov21_021DBA24(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1); +static void ov21_021DBAB8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1); +static void ov21_021DBB74(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1); +static void ov21_021DBBE4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DBDA0(UnkStruct_ov21_021DC96C *param0); +static void ov21_021DBDC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DBE2C(UnkStruct_ov21_021DC96C *param0); +static void ov21_021DBE98(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2, int param3, int param4); +static void ov21_021DBE3C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2); +static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2); +static void ov21_021DC04C(UnkStruct_ov21_021DC96C *param0); +static void ov21_021DC068(UnkStruct_ov21_021DC96C *param0); +static void ov21_021DC088(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2); +static void ov21_021DC12C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2); +static void ov21_021DC1E8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2); +static void ov21_021DC2A4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2); +static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021D9B24(UnkStruct_ov21_021D9B24 *param0); +static void ov21_021D9B34(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021D9B58(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3, int param4); +static void ov21_021D9B98(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021D9BB0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3); +static void ov21_021D9B04(UnkStruct_ov21_021D9B24 *param0); +static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021D9C90(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021D9D00(UnkStruct_ov21_021D9B24 *param0); +static void ov21_021D9D18(u32 param0, u32 param1, void *param2); +static void ov21_021D9CA8(UnkStruct_ov21_021D9B24 *param0); +static void ov21_021D9CB8(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021D9D50(UnkStruct_ov21_021D9B24 *param0); +static void ov21_021D9D68(UnkStruct_ov21_021D9B24 *param0); +static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021D9E08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021D9E90(u32 param0, u32 param1, void *param2); +static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021D9F44(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021D9FF8(u32 param0, u32 param1, void *param2); +static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021DA0BC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DA18C(u32 param0, u32 param1, void *param2); +static void ov21_021DA0FC(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021DA280(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DA2C0(u32 param0, u32 param1, void *param2); +static void ov21_021DA308(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021DA41C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DA514(u32 param0, u32 param1, void *param2); +static void ov21_021DB3C8(UnkStruct_ov21_021D9B24 *param0); +static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 *param0, int param1, int param2, int param3); +static void ov21_021DB428(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DB2FC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DB38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3); +static void ov21_021DB468(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DA534(UnkStruct_ov21_021D4FE4 *param0, int param1); +static void ov21_021DA5A8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DA7B0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DA988(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DAC08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DAED8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, int param1); +static void ov21_021DB12C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DB480(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1, const UnkStruct_ov21_021D95B8 *param2); +static void ov21_021DB49C(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1, const UnkStruct_ov21_021D95B8 *param2); +static void ov21_021DB4D4(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1); +static BOOL ov21_021DB4E4(UnkStruct_ov21_021D95CC *param0, BOOL param1); +static void ov21_021DC35C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DC368(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DC380(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3); +static void ov21_021DC3BC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DC48C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DC4F8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DC57C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DC600(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); +static void ov21_021DC67C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2); +static void ov21_021DC720(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1); + +void ov21_021D94BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +{ + UnkStruct_ov21_021D95B8 *v0; + UnkStruct_ov21_021D95CC *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021D9534(param2, param1); v1 = ov21_021D957C(param2, param1); @@ -242,17 +241,17 @@ void ov21_021D94BC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021D9960; } -void ov21_021D951C (UnkStruct_ov21_021E68F4 * param0) +void ov21_021D951C(UnkStruct_ov21_021E68F4 *param0) { ov21_021D95B8(param0->unk_00); ov21_021D95CC(param0->unk_04); ov21_021D95E0(param0->unk_20); } -static UnkStruct_ov21_021D95B8 * ov21_021D9534 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D95B8 *ov21_021D9534(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D95B8 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021D95B8 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D95B8)); @@ -267,10 +266,10 @@ static UnkStruct_ov21_021D95B8 * ov21_021D9534 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D95CC * ov21_021D957C (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D95CC *ov21_021D957C(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D95CC * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021D95CC *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D95CC)); @@ -282,37 +281,37 @@ static UnkStruct_ov21_021D95CC * ov21_021D957C (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D4660 * ov21_021D95B4 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021D95B4(int param0, UnkStruct_ov21_021D0F60 *param1) { return NULL; } -static void ov21_021D95B8 (UnkStruct_ov21_021D95B8 * param0) +static void ov21_021D95B8(UnkStruct_ov21_021D95B8 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021D95CC (UnkStruct_ov21_021D95CC * param0) +static void ov21_021D95CC(UnkStruct_ov21_021D95CC *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021D95E0 (UnkStruct_ov21_021D4660 * param0) +static void ov21_021D95E0(UnkStruct_ov21_021D4660 *param0) { return; } -static int ov21_021D95E4 (void) +static int ov21_021D95E4(void) { return 0; } -static int ov21_021D95E8 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D95E8(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021D95B8 * v0 = param1; - UnkStruct_ov21_021D9B24 * v1; + UnkStruct_ov21_021D95B8 *v0 = param1; + UnkStruct_ov21_021D9B24 *v1; int v2; v1 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021D9B24)); @@ -335,11 +334,11 @@ static int ov21_021D95E8 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021D964C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D964C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021D95B8 * v0 = param1; - UnkStruct_ov21_021D9B24 * v1 = param0->unk_08; - UnkStruct_ov21_021D95CC * v2 = v0->unk_0C->unk_04; + UnkStruct_ov21_021D95B8 *v0 = param1; + UnkStruct_ov21_021D9B24 *v1 = param0->unk_08; + UnkStruct_ov21_021D95CC *v2 = v0->unk_0C->unk_04; int v3; int v4; @@ -372,7 +371,7 @@ static int ov21_021D964C (UnkStruct_ov21_021E6A68 * param0, void * param1) ov21_021D9B98(v1, v0); - if ((ov21_021D3998(v0->unk_04) == 2)) { + if (ov21_021D3998(v0->unk_04) == 2) { ov21_021DB2FC(v1, v0); } @@ -417,9 +416,9 @@ static int ov21_021D964C (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021D9780 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021D9780(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021D9B24 * v0 = param0->unk_08; + UnkStruct_ov21_021D9B24 *v0 = param0->unk_08; ov21_021D9B24(v0); ov21_021DB3C8(v0); @@ -429,12 +428,12 @@ static int ov21_021D9780 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021D97A0 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D97A0(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021D95B8 * v0 = param2; - const UnkStruct_ov21_021D9B24 * v1 = param3->unk_08; - UnkStruct_ov21_021D95CC * v2 = param0; - UnkStruct_ov21_021DC96C * v3 = param1->unk_08; + const UnkStruct_ov21_021D95B8 *v0 = param2; + const UnkStruct_ov21_021D9B24 *v1 = param3->unk_08; + UnkStruct_ov21_021D95CC *v2 = param0; + UnkStruct_ov21_021DC96C *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -461,12 +460,12 @@ static int ov21_021D97A0 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021D9830 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D9830(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021D95B8 * v0 = param2; - const UnkStruct_ov21_021D9B24 * v1 = param3->unk_08; - UnkStruct_ov21_021D95CC * v2 = param0; - UnkStruct_ov21_021DC96C * v3 = param1->unk_08; + const UnkStruct_ov21_021D95B8 *v0 = param2; + const UnkStruct_ov21_021D9B24 *v1 = param3->unk_08; + UnkStruct_ov21_021D95CC *v2 = param0; + UnkStruct_ov21_021DC96C *v3 = param1->unk_08; int v4; int v5; int v6; @@ -533,12 +532,12 @@ static int ov21_021D9830 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021D9960 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021D9960(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021D95B8 * v0 = param2; - const UnkStruct_ov21_021D9B24 * v1 = param3->unk_08; - UnkStruct_ov21_021D95CC * v2 = param0; - UnkStruct_ov21_021DC96C * v3 = param1->unk_08; + const UnkStruct_ov21_021D95B8 *v0 = param2; + const UnkStruct_ov21_021D9B24 *v1 = param3->unk_08; + UnkStruct_ov21_021D95CC *v2 = param0; + UnkStruct_ov21_021DC96C *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -577,7 +576,7 @@ static int ov21_021D9960 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021D9A08 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, const UnkStruct_ov21_021D95B8 * param2, const UnkStruct_ov21_021D9B24 * param3, int param4) +static void ov21_021D9A08(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, const UnkStruct_ov21_021D95B8 *param2, const UnkStruct_ov21_021D9B24 *param3, int param4) { ov21_021D9A74(param1, param2, param4); ov21_021DB50C(param0, param1, param4); @@ -586,7 +585,7 @@ static void ov21_021D9A08 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D ov21_021DC8B4(param0, GX_OAM_MODE_XLU, param0->unk_104, param0->unk_108); } -static void ov21_021D9A4C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1) +static void ov21_021D9A4C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1) { ov21_021DBE2C(param0); ov21_021DB78C(param0); @@ -594,10 +593,10 @@ static void ov21_021D9A4C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D ov21_021D2584(¶m1->unk_00->unk_1E0, 0); } -static void ov21_021D9A74 (UnkStruct_ov21_021D95CC * param0, const UnkStruct_ov21_021D95B8 * param1, int param2) +static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D95B8 *param1, int param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 29, param0->unk_00->unk_00, 6, 0, 0, 1, param2); @@ -608,14 +607,14 @@ static void ov21_021D9A74 (UnkStruct_ov21_021D95CC * param0, const UnkStruct_ov2 sub_0201C3C0(param0->unk_00->unk_00, 6); } -static void ov21_021D9ADC (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2) +static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) { ov21_021D9BEC(param0, param1, param2); ov21_021D9B58(param0, param1, param2, param0->unk_24, param0->unk_28); ov21_021D9B04(param0); } -static void ov21_021D9B04 (UnkStruct_ov21_021D9B24 * param0) +static void ov21_021D9B04(UnkStruct_ov21_021D9B24 *param0) { int v0; @@ -628,19 +627,19 @@ static void ov21_021D9B04 (UnkStruct_ov21_021D9B24 * param0) } } -static void ov21_021D9B24 (UnkStruct_ov21_021D9B24 * param0) +static void ov21_021D9B24(UnkStruct_ov21_021D9B24 *param0) { ov21_021D9D00(param0); ov21_021D9D50(param0); } -static void ov21_021D9B34 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2) +static void ov21_021D9B34(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) { ov21_021D9D50(param0); ov21_021D9B58(param0, param1, param2, param0->unk_24, param0->unk_28); } -static void ov21_021D9B58 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2, int param3, int param4) +static void ov21_021D9B58(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3, int param4) { switch (param3) { case 0: @@ -664,13 +663,13 @@ static void ov21_021D9B58 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021D9B98 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021D9B98(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { ov21_021D9C90(param0, param1); ov21_021D9BB0(param0, param1, param0->unk_24, param0->unk_28); } -static void ov21_021D9BB0 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2, int param3) +static void ov21_021D9BB0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3) { switch (param2) { case 0: @@ -694,7 +693,7 @@ static void ov21_021D9BB0 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021D9BEC (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2) +static void ov21_021D9BEC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) { param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 6); @@ -710,14 +709,14 @@ static void ov21_021D9BEC (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_00 = sub_02023FCC(param0->unk_04, 6, ov21_021D9D18, ¶m0->unk_10, param2); } -static void ov21_021D9C90 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021D9C90(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { ov21_021D9CA8(param0); sub_0202404C(param0->unk_00); ov21_021D9CB8(param0, param0->unk_24); } -static void ov21_021D9CA8 (UnkStruct_ov21_021D9B24 * param0) +static void ov21_021D9CA8(UnkStruct_ov21_021D9B24 *param0) { int v0; @@ -726,7 +725,7 @@ static void ov21_021D9CA8 (UnkStruct_ov21_021D9B24 * param0) } } -static void ov21_021D9CB8 (UnkStruct_ov21_021D9B24 * param0, int param1) +static void ov21_021D9CB8(UnkStruct_ov21_021D9B24 *param0, int param1) { switch (param1) { case 0: @@ -754,18 +753,18 @@ static void ov21_021D9CB8 (UnkStruct_ov21_021D9B24 * param0, int param1) } } -static void ov21_021D9D00 (UnkStruct_ov21_021D9B24 * param0) +static void ov21_021D9D00(UnkStruct_ov21_021D9B24 *param0) { sub_02024034(param0->unk_00); Heap_FreeToHeap(param0->unk_04); param0->unk_04 = NULL; } -static void ov21_021D9D18 (u32 param0, u32 param1, void * param2) +static void ov21_021D9D18(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021D9D18 * v0 = param2; - UnkStruct_ov21_021D95B8 * v1 = v0->unk_00; - UnkStruct_ov21_021D9B24 * v2 = v0->unk_04; + UnkStruct_ov21_021D9D18 *v0 = param2; + UnkStruct_ov21_021D95B8 *v1 = v0->unk_00; + UnkStruct_ov21_021D9B24 *v2 = v0->unk_04; v2->unk_2C[param0] = param1; @@ -781,7 +780,7 @@ static void ov21_021D9D18 (u32 param0, u32 param1, void * param2) } } -static void ov21_021D9D50 (UnkStruct_ov21_021D9B24 * param0) +static void ov21_021D9D50(UnkStruct_ov21_021D9B24 *param0) { sub_02024034(param0->unk_08); Heap_FreeToHeap(param0->unk_0C); @@ -789,7 +788,7 @@ static void ov21_021D9D50 (UnkStruct_ov21_021D9B24 * param0) param0->unk_0C = NULL; } -static void ov21_021D9D68 (UnkStruct_ov21_021D9B24 * param0) +static void ov21_021D9D68(UnkStruct_ov21_021D9B24 *param0) { int v0; @@ -798,7 +797,7 @@ static void ov21_021D9D68 (UnkStruct_ov21_021D9B24 * param0) } } -static void ov21_021D9D78 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2) +static void ov21_021D9D78(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) { int v0, v1; int v2, v3; @@ -819,7 +818,7 @@ static void ov21_021D9D78 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_08 = sub_02023FCC(param0->unk_0C, 6, ov21_021D9E90, ¶m0->unk_10, param2); } -static void ov21_021D9E08 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021D9E08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0; @@ -863,11 +862,11 @@ static void ov21_021D9E08 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021D9E90 (u32 param0, u32 param1, void * param2) +static void ov21_021D9E90(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021D9D18 * v0 = param2; - UnkStruct_ov21_021D95B8 * v1 = v0->unk_00; - UnkStruct_ov21_021D9B24 * v2 = v0->unk_04; + UnkStruct_ov21_021D9D18 *v0 = param2; + UnkStruct_ov21_021D95B8 *v1 = v0->unk_00; + UnkStruct_ov21_021D9B24 *v2 = v0->unk_04; v2->unk_44[param0] = param1; @@ -881,7 +880,7 @@ static void ov21_021D9E90 (u32 param0, u32 param1, void * param2) } } -static void ov21_021D9EB4 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2) +static void ov21_021D9EB4(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) { int v0, v1; int v2, v3; @@ -902,7 +901,7 @@ static void ov21_021D9EB4 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_08 = sub_02023FCC(param0->unk_0C, 10, ov21_021D9FF8, ¶m0->unk_10, param2); } -static void ov21_021D9F44 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021D9F44(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0; @@ -963,11 +962,11 @@ static void ov21_021D9F44 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021D9FF8 (u32 param0, u32 param1, void * param2) +static void ov21_021D9FF8(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021D9D18 * v0 = param2; - UnkStruct_ov21_021D95B8 * v1 = v0->unk_00; - UnkStruct_ov21_021D9B24 * v2 = v0->unk_04; + UnkStruct_ov21_021D9D18 *v0 = param2; + UnkStruct_ov21_021D95B8 *v1 = v0->unk_00; + UnkStruct_ov21_021D9B24 *v2 = v0->unk_04; v2->unk_44[param0] = param1; @@ -981,7 +980,7 @@ static void ov21_021D9FF8 (u32 param0, u32 param1, void * param2) } } -static void ov21_021DA018 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2) +static void ov21_021DA018(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) { int v0, v1; int v2, v3; @@ -1007,7 +1006,7 @@ static void ov21_021DA018 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_08 = sub_02023FCC(param0->unk_0C, 11, ov21_021DA18C, ¶m0->unk_10, param2); } -static void ov21_021DA0BC (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DA0BC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0; @@ -1020,7 +1019,7 @@ static void ov21_021DA0BC (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D ov21_021DA0FC(param0, ov21_021D8698(param1->unk_08, 1)); } -static void ov21_021DA0FC (UnkStruct_ov21_021D9B24 * param0, int param1) +static void ov21_021DA0FC(UnkStruct_ov21_021D9B24 *param0, int param1) { switch (param1) { case 1: @@ -1073,11 +1072,11 @@ static void ov21_021DA0FC (UnkStruct_ov21_021D9B24 * param0, int param1) } } -static void ov21_021DA18C (u32 param0, u32 param1, void * param2) +static void ov21_021DA18C(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021D9D18 * v0 = param2; - UnkStruct_ov21_021D95B8 * v1 = v0->unk_00; - UnkStruct_ov21_021D9B24 * v2 = v0->unk_04; + UnkStruct_ov21_021D9D18 *v0 = param2; + UnkStruct_ov21_021D95B8 *v1 = v0->unk_00; + UnkStruct_ov21_021D9B24 *v2 = v0->unk_04; v2->unk_44[param0] = param1; @@ -1095,7 +1094,7 @@ static void ov21_021DA18C (u32 param0, u32 param1, void * param2) } } -static void ov21_021DA1C8 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2) +static void ov21_021DA1C8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) { int v0, v1; int v2, v3; @@ -1126,7 +1125,7 @@ static void ov21_021DA1C8 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_08 = sub_02023FCC(param0->unk_0C, 10, ov21_021DA2C0, ¶m0->unk_10, param2); } -static void ov21_021DA280 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DA280(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0; @@ -1139,11 +1138,11 @@ static void ov21_021DA280 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D ov21_021DA308(param0, ov21_021D8698(param1->unk_08, 1)); } -static void ov21_021DA2C0 (u32 param0, u32 param1, void * param2) +static void ov21_021DA2C0(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021D9D18 * v0 = param2; - UnkStruct_ov21_021D95B8 * v1 = v0->unk_00; - UnkStruct_ov21_021D9B24 * v2 = v0->unk_04; + UnkStruct_ov21_021D9D18 *v0 = param2; + UnkStruct_ov21_021D95B8 *v1 = v0->unk_00; + UnkStruct_ov21_021D9B24 *v2 = v0->unk_04; v2->unk_44[param0] = param1; @@ -1166,7 +1165,7 @@ static void ov21_021DA2C0 (u32 param0, u32 param1, void * param2) } } -static void ov21_021DA308 (UnkStruct_ov21_021D9B24 * param0, int param1) +static void ov21_021DA308(UnkStruct_ov21_021D9B24 *param0, int param1) { switch (param1) { case 10: @@ -1214,7 +1213,7 @@ static void ov21_021DA308 (UnkStruct_ov21_021D9B24 * param0, int param1) } } -static void ov21_021DA38C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2) +static void ov21_021DA38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) { int v0, v1; int v2, v3; @@ -1236,7 +1235,7 @@ static void ov21_021DA38C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_08 = sub_02023FCC(param0->unk_0C, 15, ov21_021DA514, ¶m0->unk_10, param2); } -static void ov21_021DA41C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DA41C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0; @@ -1322,11 +1321,11 @@ static void ov21_021DA41C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021DA514 (u32 param0, u32 param1, void * param2) +static void ov21_021DA514(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021D9D18 * v0 = param2; - UnkStruct_ov21_021D95B8 * v1 = v0->unk_00; - UnkStruct_ov21_021D9B24 * v2 = v0->unk_04; + UnkStruct_ov21_021D9D18 *v0 = param2; + UnkStruct_ov21_021D95B8 *v1 = v0->unk_00; + UnkStruct_ov21_021D9B24 *v2 = v0->unk_04; v2->unk_44[param0] = param1; @@ -1340,7 +1339,7 @@ static void ov21_021DA514 (u32 param0, u32 param1, void * param2) } } -static void ov21_021DA534 (UnkStruct_ov21_021D4FE4 * param0, int param1) +static void ov21_021DA534(UnkStruct_ov21_021D4FE4 *param0, int param1) { int v0, v1; int v2, v3; @@ -1387,7 +1386,7 @@ static void ov21_021DA534 (UnkStruct_ov21_021D4FE4 * param0, int param1) ov21_021D4FE4(param0, v0, v1, v2, v3, 0, 0, param1); } -static void ov21_021DA5A8 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DA5A8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { if (gCoreSys.heldKeys & PAD_BUTTON_A) { if (param0->unk_8C == 0) { @@ -1433,7 +1432,7 @@ static void ov21_021DA5A8 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021DA6B0 (UnkStruct_ov21_021D9B24 * param0, int param1) +static void ov21_021DA6B0(UnkStruct_ov21_021D9B24 *param0, int param1) { int v0, v1; int v2, v3; @@ -1506,7 +1505,7 @@ static void ov21_021DA6B0 (UnkStruct_ov21_021D9B24 * param0, int param1) ov21_021D4F04(param0->unk_18, param0->unk_1C, 3, 6); } -static void ov21_021DA7B0 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DA7B0(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { if (gCoreSys.heldKeys & PAD_BUTTON_A) { if (param0->unk_8C == 0) { @@ -1544,7 +1543,7 @@ static void ov21_021DA7B0 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021DA888 (UnkStruct_ov21_021D9B24 * param0, int param1) +static void ov21_021DA888(UnkStruct_ov21_021D9B24 *param0, int param1) { int v0, v1; int v2, v3; @@ -1617,7 +1616,7 @@ static void ov21_021DA888 (UnkStruct_ov21_021D9B24 * param0, int param1) ov21_021D4F04(param0->unk_18, param0->unk_1C, 3, 6); } -static void ov21_021DA988 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DA988(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { if (gCoreSys.heldKeys & PAD_BUTTON_A) { if (param0->unk_8C == 0) { @@ -1671,7 +1670,7 @@ static void ov21_021DA988 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021DAAD4 (UnkStruct_ov21_021D9B24 * param0, int param1) +static void ov21_021DAAD4(UnkStruct_ov21_021D9B24 *param0, int param1) { int v0, v1; int v2, v3; @@ -1764,7 +1763,7 @@ static void ov21_021DAAD4 (UnkStruct_ov21_021D9B24 * param0, int param1) ov21_021D4F04(param0->unk_18, param0->unk_1C, 3, 6); } -static void ov21_021DAC08 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DAC08(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { if (gCoreSys.heldKeys & PAD_BUTTON_A) { if (param0->unk_8C == 0) { @@ -1823,7 +1822,7 @@ static void ov21_021DAC08 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021DAD74 (UnkStruct_ov21_021D9B24 * param0, int param1) +static void ov21_021DAD74(UnkStruct_ov21_021D9B24 *param0, int param1) { int v0, v1; int v2, v3; @@ -1930,7 +1929,7 @@ static void ov21_021DAD74 (UnkStruct_ov21_021D9B24 * param0, int param1) ov21_021D4F04(param0->unk_18, param0->unk_1C, 3, 6); } -static void ov21_021DAED8 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DAED8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { if (gCoreSys.heldKeys & PAD_BUTTON_A) { if (param0->unk_8C == 0) { @@ -1985,7 +1984,7 @@ static void ov21_021DAED8 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021DB02C (UnkStruct_ov21_021D9B24 * param0, int param1) +static void ov21_021DB02C(UnkStruct_ov21_021D9B24 *param0, int param1) { int v0, v1; int v2, v3; @@ -2058,7 +2057,7 @@ static void ov21_021DB02C (UnkStruct_ov21_021D9B24 * param0, int param1) ov21_021D4F04(param0->unk_18, param0->unk_1C, 4, 6); } -static void ov21_021DB12C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DB12C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { if (gCoreSys.heldKeys & PAD_BUTTON_A) { if (param0->unk_8C == 0) { @@ -2132,7 +2131,7 @@ static void ov21_021DB12C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021DB2FC (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DB2FC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) { ov21_021D4F20(param0->unk_18, 0, 1); @@ -2158,7 +2157,7 @@ static void ov21_021DB2FC (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D ov21_021DB38C(param0, param1, param0->unk_24, param0->unk_28); } -static void ov21_021DB38C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2, int param3) +static void ov21_021DB38C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3) { switch (param2) { case 0: @@ -2182,7 +2181,7 @@ static void ov21_021DB38C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021DB3C8 (UnkStruct_ov21_021D9B24 * param0) +static void ov21_021DB3C8(UnkStruct_ov21_021D9B24 *param0) { Heap_FreeToHeap(param0->unk_1C); ov21_021D4EFC(param0->unk_18); @@ -2190,12 +2189,12 @@ static void ov21_021DB3C8 (UnkStruct_ov21_021D9B24 * param0) param0->unk_1C = NULL; } -static void ov21_021DB3E0 (UnkStruct_ov21_021D9B24 * param0, int param1) +static void ov21_021DB3E0(UnkStruct_ov21_021D9B24 *param0, int param1) { ov21_021DB3EC(param0, param1, param0->unk_24, param0->unk_28); } -static void ov21_021DB3EC (UnkStruct_ov21_021D9B24 * param0, int param1, int param2, int param3) +static void ov21_021DB3EC(UnkStruct_ov21_021D9B24 *param0, int param1, int param2, int param3) { switch (param2) { case 0: @@ -2219,7 +2218,7 @@ static void ov21_021DB3EC (UnkStruct_ov21_021D9B24 * param0, int param1, int par } } -static void ov21_021DB428 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DB428(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0; @@ -2244,23 +2243,23 @@ static void ov21_021DB428 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D ov21_021D4F20(param0->unk_18, 4, v0); } -static void ov21_021DB468 (UnkStruct_ov21_021D9B24 * param0, int param1) +static void ov21_021DB468(UnkStruct_ov21_021D9B24 *param0, int param1) { ov21_021DB3C8(param0); ov21_021DB3EC(param0, param1, param0->unk_24, param0->unk_28); } -static void ov21_021DB480 (UnkStruct_ov21_021D95CC * param0, const UnkStruct_ov21_021D9B24 * param1, const UnkStruct_ov21_021D95B8 * param2) +static void ov21_021DB480(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1, const UnkStruct_ov21_021D95B8 *param2) { ov21_021D25B8(param1->unk_18, param0->unk_00); ov21_021DB49C(param0, param1, param2); } -static void ov21_021DB49C (UnkStruct_ov21_021D95CC * param0, const UnkStruct_ov21_021D9B24 * param1, const UnkStruct_ov21_021D95B8 * param2) +static void ov21_021DB49C(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1, const UnkStruct_ov21_021D95B8 *param2) { BOOL v0; - if ((ov21_021D3998(param2->unk_04) != 0)) { + if (ov21_021D3998(param2->unk_04) != 0) { v0 = ov21_021DB4E4(param0, 1); if (v0) { @@ -2273,15 +2272,15 @@ static void ov21_021DB49C (UnkStruct_ov21_021D95CC * param0, const UnkStruct_ov2 } } -static void ov21_021DB4D4 (UnkStruct_ov21_021D95CC * param0, const UnkStruct_ov21_021D9B24 * param1) +static void ov21_021DB4D4(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_021D9B24 *param1) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; ov21_021D2544(param1->unk_18, v0); } -static BOOL ov21_021DB4E4 (UnkStruct_ov21_021D95CC * param0, BOOL param1) +static BOOL ov21_021DB4E4(UnkStruct_ov21_021D95CC *param0, BOOL param1) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; if (ov21_021D25A0(&v0->unk_1E0) != param1) { ov21_021D2584(&v0->unk_1E0, param1); @@ -2291,10 +2290,10 @@ static BOOL ov21_021DB4E4 (UnkStruct_ov21_021D95CC * param0, BOOL param1) return 0; } -static void ov21_021DB50C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2) +static void ov21_021DB50C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_E4[0] = sub_02009A4C(v0->unk_13C[0], v1, 125, 1, 125 + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2); @@ -2310,9 +2309,9 @@ static void ov21_021DB50C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D param0->unk_E4[3] = sub_02009BC4(v0->unk_13C[3], v1, 124, 1, 124 + 16000, 3, param2); } -static void ov21_021DB5DC (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1) +static void ov21_021DB5DC(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_E4[0]); sub_0200A6DC(param0->unk_E4[1]); @@ -2323,10 +2322,10 @@ static void ov21_021DB5DC (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D sub_02009D68(v0->unk_13C[3], param0->unk_E4[3]); } -static void ov21_021DB634 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2) +static void ov21_021DB634(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_F4[0] = sub_02009A4C(v0->unk_13C[0], v1, 128, 1, 128 + 16000, NNS_G2D_VRAM_TYPE_2DSUB, param2); @@ -2337,9 +2336,9 @@ static void ov21_021DB634 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D param0->unk_F4[3] = sub_02009BC4(v0->unk_13C[3], v1, 127, 1, 127 + 16000, 3, param2); } -static void ov21_021DB6C8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1) +static void ov21_021DB6C8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_F4[0]); sub_02009D68(v0->unk_13C[0], param0->unk_F4[0]); @@ -2347,11 +2346,11 @@ static void ov21_021DB6C8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D sub_02009D68(v0->unk_13C[3], param0->unk_F4[3]); } -static void ov21_021DB708 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2) +static void ov21_021DB708(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3; sub_020093B4(&v0, 125 + 16000, 3 + 16000, 126 + 16000, 124 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -2366,17 +2365,17 @@ static void ov21_021DB708 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D ov21_021DB81C(param0, &v1, param0->unk_104, param0->unk_108); } -static void ov21_021DB78C (UnkStruct_ov21_021DC96C * param0) +static void ov21_021DB78C(UnkStruct_ov21_021DC96C *param0) { ov21_021DB90C(param0); ov21_021DB924(param0); } -static void ov21_021DB79C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2) +static void ov21_021DB79C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3; sub_020093B4(&v0, 125 + 16000, 3 + 16000, 126 + 16000, 124 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -2391,7 +2390,7 @@ static void ov21_021DB79C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D ov21_021DB81C(param0, &v1, param0->unk_104, param0->unk_108); } -static void ov21_021DB81C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1, int param2, int param3) +static void ov21_021DB81C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1, int param2, int param3) { switch (param2) { case 0: @@ -2415,7 +2414,7 @@ static void ov21_021DB81C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223 } } -static void ov21_021DB858 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1) +static void ov21_021DB858(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1) { int v0; @@ -2466,7 +2465,7 @@ static void ov21_021DB858 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223 } } -static void ov21_021DB90C (UnkStruct_ov21_021DC96C * param0) +static void ov21_021DB90C(UnkStruct_ov21_021DC96C *param0) { int v0; @@ -2475,7 +2474,7 @@ static void ov21_021DB90C (UnkStruct_ov21_021DC96C * param0) } } -static void ov21_021DB924 (UnkStruct_ov21_021DC96C * param0) +static void ov21_021DB924(UnkStruct_ov21_021DC96C *param0) { int v0; @@ -2487,7 +2486,7 @@ static void ov21_021DB924 (UnkStruct_ov21_021DC96C * param0) } } -static void ov21_021DB944 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1) +static void ov21_021DB944(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1) { int v0, v1; @@ -2504,7 +2503,7 @@ static void ov21_021DB944 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223 } } -static void ov21_021DB9B4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1) +static void ov21_021DB9B4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1) { int v0, v1; @@ -2521,7 +2520,7 @@ static void ov21_021DB9B4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223 } } -static void ov21_021DBA24 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1) +static void ov21_021DBA24(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1) { int v0, v1; @@ -2546,7 +2545,7 @@ static void ov21_021DBA24 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223 SpriteActor_SetSpriteAnimActive(param0->unk_30[10], 5); } -static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1) +static void ov21_021DBAB8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1) { int v0, v1; @@ -2579,7 +2578,7 @@ static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223 SpriteActor_SetSpriteAnimActive(param0->unk_30[9], 4); } -static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1) +static void ov21_021DBB74(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov83_0223D9A8 *param1) { int v0, v1; @@ -2597,11 +2596,11 @@ static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223 } } -static void ov21_021DBBE4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2) +static void ov21_021DBBE4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3, v4; sub_020093B4(&v0, 128 + 16000, 3 + 16000, 129 + 16000, 127 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -2672,7 +2671,7 @@ static void ov21_021DBBE4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D } } -static void ov21_021DBDA0 (UnkStruct_ov21_021DC96C * param0) +static void ov21_021DBDA0(UnkStruct_ov21_021DC96C *param0) { int v0; @@ -2684,11 +2683,11 @@ static void ov21_021DBDA0 (UnkStruct_ov21_021DC96C * param0) } } -static void ov21_021DBDC8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2) +static void ov21_021DBDC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) { UnkStruct_ov21_021D4CB8 v0; - UnkStruct_02009DC8 * v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_02009DC8 *v1; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; v1 = sub_02009DC8(v2->unk_13C[1], 3 + 16000); @@ -2703,17 +2702,17 @@ static void ov21_021DBDC8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D ov21_021DBE98(param0, &v0, v2->unk_14C, param0->unk_104, param0->unk_108); } -static void ov21_021DBE2C (UnkStruct_ov21_021DC96C * param0) +static void ov21_021DBE2C(UnkStruct_ov21_021DC96C *param0) { ov21_021DC04C(param0); ov21_021DC068(param0); } -static void ov21_021DBE3C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2) +static void ov21_021DBE3C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2) { UnkStruct_ov21_021D4CB8 v0; - UnkStruct_02009DC8 * v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_02009DC8 *v1; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; v1 = sub_02009DC8(v2->unk_13C[1], 3 + 16000); @@ -2728,7 +2727,7 @@ static void ov21_021DBE3C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D ov21_021DBE98(param0, &v0, v2->unk_14C, param0->unk_104, param0->unk_108); } -static void ov21_021DBE98 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2, int param3, int param4) +static void ov21_021DBE98(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2, int param3, int param4) { switch (param3) { case 0: @@ -2749,9 +2748,9 @@ static void ov21_021DBE98 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D } } -static void ov21_021DBEC8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2) +static void ov21_021DBEC8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2) { - Window * v0; + Window *v0; int v1; u32 v2; @@ -2817,7 +2816,7 @@ static void ov21_021DBEC8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D ov21_021D4DA0(v0); } -static void ov21_021DC04C (UnkStruct_ov21_021DC96C * param0) +static void ov21_021DC04C(UnkStruct_ov21_021DC96C *param0) { int v0; @@ -2828,7 +2827,7 @@ static void ov21_021DC04C (UnkStruct_ov21_021DC96C * param0) } } -static void ov21_021DC068 (UnkStruct_ov21_021DC96C * param0) +static void ov21_021DC068(UnkStruct_ov21_021DC96C *param0) { int v0; @@ -2840,9 +2839,9 @@ static void ov21_021DC068 (UnkStruct_ov21_021DC96C * param0) } } -static void ov21_021DC088 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2) +static void ov21_021DC088(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2) { - Window * v0; + Window *v0; int v1; int v2; int v3; @@ -2887,9 +2886,9 @@ static void ov21_021DC088 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D } } -static void ov21_021DC12C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2) +static void ov21_021DC12C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2) { - Window * v0; + Window *v0; int v1; int v2, v3; int v4; @@ -2946,9 +2945,9 @@ static void ov21_021DC12C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D } } -static void ov21_021DC1E8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2) +static void ov21_021DC1E8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2) { - Window * v0; + Window *v0; int v1; int v2, v3; int v4; @@ -3005,9 +3004,9 @@ static void ov21_021DC1E8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D } } -static void ov21_021DC2A4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D4CB8 * param1, UnkStruct_ov21_021D4C0C * param2) +static void ov21_021DC2A4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D4CB8 *param1, UnkStruct_ov21_021D4C0C *param2) { - Window * v0; + Window *v0; int v1; int v2, v3; int v4; @@ -3061,19 +3060,19 @@ static void ov21_021DC2A4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D } } -static void ov21_021DC35C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DC35C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0 = param0->unk_24; param0->unk_84 = 0xffff; } -static void ov21_021DC368 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DC368(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { ov21_021DC3BC(param0, param1); ov21_021DC380(param0, param1, param0->unk_24, param0->unk_28); } -static void ov21_021DC380 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2, int param3) +static void ov21_021DC380(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2, int param3) { switch (param2) { case 0: @@ -3097,7 +3096,7 @@ static void ov21_021DC380 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021DC3BC (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DC3BC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { switch (param0->unk_80) { case 0: @@ -3142,7 +3141,7 @@ static void ov21_021DC3BC (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_80 = 0xffff; } -static void ov21_021DC48C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DC48C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0 = 100; @@ -3179,7 +3178,7 @@ static void ov21_021DC48C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_84 = 0xffff; } -static void ov21_021DC4F8 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DC4F8(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0 = 100; @@ -3229,7 +3228,7 @@ static void ov21_021DC4F8 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_84 = 0xffff; } -static void ov21_021DC57C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DC57C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0 = 100; @@ -3279,7 +3278,7 @@ static void ov21_021DC57C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_84 = 0xffff; } -static void ov21_021DC600 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DC600(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0 = 100; @@ -3326,7 +3325,7 @@ static void ov21_021DC600 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_84 = 0xffff; } -static void ov21_021DC67C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1, int param2) +static void ov21_021DC67C(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2) { if (param2 != 0) { if ((ov21_021D8698(param1->unk_08, 0) != param2) && (ov21_021D8698(param1->unk_08, 1) != param2)) { @@ -3352,7 +3351,7 @@ static void ov21_021DC67C (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D } } -static void ov21_021DC720 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D95B8 * param1) +static void ov21_021DC720(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1) { int v0 = 100; @@ -3416,7 +3415,7 @@ static void ov21_021DC720 (UnkStruct_ov21_021D9B24 * param0, UnkStruct_ov21_021D param0->unk_84 = 0xffff; } -static void ov21_021DC7C0 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1) +static void ov21_021DC7C0(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1) { if (param0->unk_12C == 0) { if (param1->unk_04 > 0) { @@ -3431,7 +3430,7 @@ static void ov21_021DC7C0 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D } } -static void ov21_021DC7F4 (UnkStruct_ov21_021DC96C * param0) +static void ov21_021DC7F4(UnkStruct_ov21_021DC96C *param0) { BOOL v0; @@ -3468,7 +3467,7 @@ static void ov21_021DC7F4 (UnkStruct_ov21_021DC96C * param0) } } -static void ov21_021DC8B4 (UnkStruct_ov21_021DC96C * param0, int param1, int param2, int param3) +static void ov21_021DC8B4(UnkStruct_ov21_021DC96C *param0, int param1, int param2, int param3) { if (param2 == 2) { if (param3 == 0) { @@ -3481,7 +3480,7 @@ static void ov21_021DC8B4 (UnkStruct_ov21_021DC96C * param0, int param1, int par } } -static void ov21_021DC8D0 (UnkStruct_ov21_021DC96C * param0, int param1) +static void ov21_021DC8D0(UnkStruct_ov21_021DC96C *param0, int param1) { int v0; @@ -3500,7 +3499,7 @@ static void ov21_021DC8D0 (UnkStruct_ov21_021DC96C * param0, int param1) } } -static void ov21_021DC90C (UnkStruct_ov21_021DC96C * param0, int param1) +static void ov21_021DC90C(UnkStruct_ov21_021DC96C *param0, int param1) { int v0; @@ -3517,7 +3516,7 @@ static void ov21_021DC90C (UnkStruct_ov21_021DC96C * param0, int param1) } } -static void ov21_021DC93C (UnkStruct_ov21_021DC96C * param0, int param1) +static void ov21_021DC93C(UnkStruct_ov21_021DC96C *param0, int param1) { int v0; @@ -3534,7 +3533,7 @@ static void ov21_021DC93C (UnkStruct_ov21_021DC96C * param0, int param1) } } -static void ov21_021DC96C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, const UnkStruct_ov21_021D95B8 * param2) +static void ov21_021DC96C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, const UnkStruct_ov21_021D95B8 *param2) { if (ov21_021D86E0(param2->unk_08) == 4) { if (ov21_021D86D8(param2->unk_08) == 3) { diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c index 4cdf9abe89..41fd88e725 100644 --- a/src/overlay021/ov21_021DC9BC.c +++ b/src/overlay021/ov21_021DC9BC.c @@ -1,14 +1,23 @@ +#include "overlay021/ov21_021DC9BC.h" + #include #include -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021D517C.h" +#include "overlay021/ov21_021D57B4.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D2648.h" #include "overlay021/struct_ov21_021D3320.h" @@ -18,71 +27,62 @@ #include "overlay021/struct_ov21_021D5868.h" #include "overlay021/struct_ov21_021D5890.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "gx_layers.h" +#include "heap.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021D517C.h" -#include "overlay021/ov21_021D57B4.h" -#include "overlay021/ov21_021DC9BC.h" -#include "overlay021/ov21_021E29DC.h" static const u16 Unk_ov21_021E9D78[] = { - 0xffff + 0xffff }; static const u16 Unk_ov21_021E9D76[] = { - 0xffff + 0xffff }; static const u16 Unk_ov21_021E9D74[] = { - 0xffff + 0xffff }; static const u16 Unk_ov21_021E9D72[] = { - 0xffff + 0xffff }; static const u16 Unk_ov21_021E9D70[] = { - 0xffff + 0xffff }; static const u16 Unk_ov21_021E9D6E[] = { - 0xffff + 0xffff }; static const u16 Unk_ov21_021E9D6C[] = { - 0xffff + 0xffff }; static const u16 Unk_ov21_021E9D7A[] = { - 0xA, - 0xffff + 0xA, + 0xffff }; typedef struct { - UnkStruct_ov21_021D3320 * unk_00; + UnkStruct_ov21_021D3320 *unk_00; int unk_04; - UnkStruct_ov21_021E68F4 * unk_08; + UnkStruct_ov21_021E68F4 *unk_08; } UnkStruct_ov21_021DCACC; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; int unk_04; int unk_08; int unk_0C; @@ -91,8 +91,8 @@ typedef struct { typedef struct { int unk_00; - u8 * unk_04; - u8 * unk_08; + u8 *unk_04; + u8 *unk_08; u32 unk_0C; u32 unk_10; UnkStruct_ov21_021D5844 unk_14; @@ -103,21 +103,21 @@ typedef struct { typedef struct { int unk_00; - GraphicElementData * unk_04[44]; - UnkStruct_02009DC8 * unk_B4[4]; + GraphicElementData *unk_04[44]; + UnkStruct_02009DC8 *unk_B4[4]; int unk_C4; - GraphicElementData * unk_C8; - UnkStruct_ov21_021D4CA0 * unk_CC; - UnkStruct_02009DC8 * unk_D0[4]; - UnkStruct_ov21_021D4CA0 * unk_E0[3]; + GraphicElementData *unk_C8; + UnkStruct_ov21_021D4CA0 *unk_CC; + UnkStruct_02009DC8 *unk_D0[4]; + UnkStruct_ov21_021D4CA0 *unk_E0[3]; u8 unk_EC[900]; u8 unk_470[900]; - void * unk_7F4; - NNSG2dCharacterData * unk_7F8; - void * unk_7FC; - NNSG2dCharacterData * unk_800; - UnkStruct_ov21_021D5868 * unk_804; - UnkStruct_ov21_021D5890 * unk_808; + void *unk_7F4; + NNSG2dCharacterData *unk_7F8; + void *unk_7FC; + NNSG2dCharacterData *unk_800; + UnkStruct_ov21_021D5868 *unk_804; + UnkStruct_ov21_021D5890 *unk_808; int unk_80C; int unk_810; UnkStruct_ov21_021D2648 unk_814; @@ -127,53 +127,53 @@ typedef struct { u32 unk_840; } UnkStruct_ov21_021DD420; -static UnkStruct_ov21_021DCACC * ov21_021DCA5C(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021DCAE0 * ov21_021DCAA0(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021DCACC(UnkStruct_ov21_021DCACC * param0); -static void ov21_021DCAE0(UnkStruct_ov21_021DCAE0 * param0); +static UnkStruct_ov21_021DCACC *ov21_021DCA5C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DCAE0 *ov21_021DCAA0(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021DCACC(UnkStruct_ov21_021DCACC *param0); +static void ov21_021DCAE0(UnkStruct_ov21_021DCAE0 *param0); static int ov21_021DCAF4(void); -static int ov21_021DCAF8(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DCB6C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DCBA8(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DCBD8(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021DCCD8(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021DCD04(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021DDCF4(UnkStruct_ov21_021DCAE0 * param0, const UnkStruct_ov21_021DCACC * param1); -static void ov21_021DD420(UnkStruct_ov21_021DD420 * param0); -static void ov21_021DD458(UnkStruct_ov21_021DD420 * param0); -static void ov21_021DD490(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, BOOL param3); -static BOOL ov21_021DD508(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, BOOL param3); -static void ov21_021DD554(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, BOOL param3); -static BOOL ov21_021DD5E4(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, BOOL param3); -static void ov21_021DCDD0(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, const UnkStruct_ov21_021DDABC * param3, int param4); -static void ov21_021DCE20(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1); -static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 * param0, const UnkStruct_ov21_021DCACC * param1, int param2); -static void ov21_021DD668(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, int param2); -static void ov21_021DD6C0(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1); -static void ov21_021DCFC8(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, int param2); -static void ov21_021DD114(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1); -static void ov21_021DD1A8(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, int param2); -static void ov21_021DD2B8(UnkStruct_ov21_021DD420 * param0); -static void ov21_021DD2E0(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, int param3); -static void ov21_021DD3FC(UnkStruct_ov21_021DD420 * param0); -static void ov21_021DD9E8(UnkStruct_ov21_021DD420 * param0, const UnkStruct_ov21_021DDABC * param1); -static void ov21_021DDA48(UnkStruct_ov21_021DD420 * param0, int param1); -static void ov21_021DDA80(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, const UnkStruct_ov21_021DDABC * param3, int param4); -static void ov21_021DD710(UnkStruct_ov21_021DD420 * param0, const UnkStruct_ov21_021DCACC * param1, const UnkStruct_ov21_021DDABC * param2, int param3); -static void ov21_021DD8B4(UnkStruct_ov21_021DD420 * param0); -static u8 * ov21_021DD900(u32 param0, const UnkStruct_ov21_021DCACC * param1, u32 * param2); -static u8 * ov21_021DD908(u32 param0, const UnkStruct_ov21_021DCACC * param1, u32 * param2); -static void ov21_021DD964(UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1); -static void ov21_021DDB8C(UnkStruct_ov21_021DD420 * param0); -static void ov21_021DDBCC(UnkStruct_ov21_021DD420 * param0); -static void ov21_021DDC14(UnkStruct_ov21_021DD420 * param0); -static void ov21_021DDABC(UnkStruct_ov21_021DDABC * param0, UnkStruct_ov21_021DCACC * param1, int param2); -static void ov21_021DDB68(UnkStruct_ov21_021DDABC * param0); - -void ov21_021DC9BC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) +static int ov21_021DCAF8(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DCB6C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DCBA8(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DCBD8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021DCCD8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021DCD04(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021DDCF4(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1); +static void ov21_021DD420(UnkStruct_ov21_021DD420 *param0); +static void ov21_021DD458(UnkStruct_ov21_021DD420 *param0); +static void ov21_021DD490(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3); +static BOOL ov21_021DD508(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3); +static void ov21_021DD554(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3); +static BOOL ov21_021DD5E4(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3); +static void ov21_021DCDD0(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const UnkStruct_ov21_021DDABC *param3, int param4); +static void ov21_021DCE20(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1); +static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1, int param2); +static void ov21_021DD668(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, int param2); +static void ov21_021DD6C0(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1); +static void ov21_021DCFC8(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, int param2); +static void ov21_021DD114(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1); +static void ov21_021DD1A8(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, int param2); +static void ov21_021DD2B8(UnkStruct_ov21_021DD420 *param0); +static void ov21_021DD2E0(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, int param3); +static void ov21_021DD3FC(UnkStruct_ov21_021DD420 *param0); +static void ov21_021DD9E8(UnkStruct_ov21_021DD420 *param0, const UnkStruct_ov21_021DDABC *param1); +static void ov21_021DDA48(UnkStruct_ov21_021DD420 *param0, int param1); +static void ov21_021DDA80(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const UnkStruct_ov21_021DDABC *param3, int param4); +static void ov21_021DD710(UnkStruct_ov21_021DD420 *param0, const UnkStruct_ov21_021DCACC *param1, const UnkStruct_ov21_021DDABC *param2, int param3); +static void ov21_021DD8B4(UnkStruct_ov21_021DD420 *param0); +static u8 *ov21_021DD900(u32 param0, const UnkStruct_ov21_021DCACC *param1, u32 *param2); +static u8 *ov21_021DD908(u32 param0, const UnkStruct_ov21_021DCACC *param1, u32 *param2); +static void ov21_021DD964(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1); +static void ov21_021DDB8C(UnkStruct_ov21_021DD420 *param0); +static void ov21_021DDBCC(UnkStruct_ov21_021DD420 *param0); +static void ov21_021DDC14(UnkStruct_ov21_021DD420 *param0); +static void ov21_021DDABC(UnkStruct_ov21_021DDABC *param0, UnkStruct_ov21_021DCACC *param1, int param2); +static void ov21_021DDB68(UnkStruct_ov21_021DDABC *param0); + +void ov21_021DC9BC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) { - UnkStruct_ov21_021DCACC * v0; - UnkStruct_ov21_021DCAE0 * v1; + UnkStruct_ov21_021DCACC *v0; + UnkStruct_ov21_021DCAE0 *v1; v0 = ov21_021DCA5C(param2, param1); v1 = ov21_021DCAA0(param2, param1); @@ -190,49 +190,49 @@ void ov21_021DC9BC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021DCD04; } -void ov21_021DCA14 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021DCA14(UnkStruct_ov21_021E68F4 *param0) { ov21_021DCACC(param0->unk_00); ov21_021DCAE0(param0->unk_04); } -int ov21_021DCA28 (const UnkStruct_ov21_021E68F4 * param0) +int ov21_021DCA28(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021DCACC * v0 = param0->unk_00; + const UnkStruct_ov21_021DCACC *v0 = param0->unk_00; return v0->unk_04; } -void ov21_021DCA30 (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021DCA30(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021DCACC * v0 = param0->unk_00; + UnkStruct_ov21_021DCACC *v0 = param0->unk_00; GF_ASSERT(param1 < 3); v0->unk_04 = param1; } -void ov21_021DCA44 (UnkStruct_ov21_021E68F4 * param0, int param1, int param2) +void ov21_021DCA44(UnkStruct_ov21_021E68F4 *param0, int param1, int param2) { - UnkStruct_ov21_021DCAE0 * v0 = param0->unk_04; + UnkStruct_ov21_021DCAE0 *v0 = param0->unk_04; v0->unk_04 = param1; v0->unk_08 = param2; } -void ov21_021DCA4C (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021DCA4C(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021DCAE0 * v0 = param0->unk_04; + UnkStruct_ov21_021DCAE0 *v0 = param0->unk_04; v0->unk_0C = param1; } -void ov21_021DCA54 (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021DCA54(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021DCAE0 * v0 = param0->unk_04; + UnkStruct_ov21_021DCAE0 *v0 = param0->unk_04; v0->unk_10 = param1; } -static UnkStruct_ov21_021DCACC * ov21_021DCA5C (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021DCACC *ov21_021DCA5C(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021DCACC * v0; + UnkStruct_ov21_021DCACC *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DCACC)); @@ -245,10 +245,10 @@ static UnkStruct_ov21_021DCACC * ov21_021DCA5C (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021DCAE0 * ov21_021DCAA0 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021DCAE0 *ov21_021DCAA0(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021DCAE0 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021DCAE0 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DCAE0)); @@ -260,27 +260,27 @@ static UnkStruct_ov21_021DCAE0 * ov21_021DCAA0 (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021DCACC (UnkStruct_ov21_021DCACC * param0) +static void ov21_021DCACC(UnkStruct_ov21_021DCACC *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021DCAE0 (UnkStruct_ov21_021DCAE0 * param0) +static void ov21_021DCAE0(UnkStruct_ov21_021DCAE0 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static int ov21_021DCAF4 (void) +static int ov21_021DCAF4(void) { return 0; } -static int ov21_021DCAF8 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DCAF8(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021DCACC * v0 = param1; - UnkStruct_ov21_021DDABC * v1; + UnkStruct_ov21_021DCACC *v0 = param1; + UnkStruct_ov21_021DDABC *v1; v1 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021DDABC)); @@ -309,10 +309,10 @@ static int ov21_021DCAF8 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021DCB6C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DCB6C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021DCACC * v0 = param1; - UnkStruct_ov21_021DDABC * v1 = param0->unk_08; + UnkStruct_ov21_021DCACC *v0 = param1; + UnkStruct_ov21_021DDABC *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -331,9 +331,9 @@ static int ov21_021DCB6C (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021DCBA8 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DCBA8(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021DDABC * v0 = param0->unk_08; + UnkStruct_ov21_021DDABC *v0 = param0->unk_08; if (v0->unk_04) { Heap_FreeToHeap(v0->unk_04); @@ -351,12 +351,12 @@ static int ov21_021DCBA8 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021DCBD8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DCBD8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DCACC * v0 = param2; - const UnkStruct_ov21_021DDABC * v1 = param3->unk_08; - UnkStruct_ov21_021DCAE0 * v2 = param0; - UnkStruct_ov21_021DD420 * v3 = param1->unk_08; + const UnkStruct_ov21_021DCACC *v0 = param2; + const UnkStruct_ov21_021DDABC *v1 = param3->unk_08; + UnkStruct_ov21_021DCAE0 *v2 = param0; + UnkStruct_ov21_021DD420 *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -405,12 +405,12 @@ static int ov21_021DCBD8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021DCCD8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DCCD8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DCACC * v0 = param2; - const UnkStruct_ov21_021DDABC * v1 = param3->unk_08; - UnkStruct_ov21_021DCAE0 * v2 = param0; - UnkStruct_ov21_021DD420 * v3 = param1->unk_08; + const UnkStruct_ov21_021DCACC *v0 = param2; + const UnkStruct_ov21_021DDABC *v1 = param3->unk_08; + UnkStruct_ov21_021DCAE0 *v2 = param0; + UnkStruct_ov21_021DD420 *v3 = param1->unk_08; ov21_021DDC14(v3); ov21_021DDA80(v3, v2, v0, v1, param1->unk_04); @@ -418,12 +418,12 @@ static int ov21_021DCCD8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021DCD04 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DCD04(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DCACC * v0 = param2; - const UnkStruct_ov21_021DDABC * v1 = param3->unk_08; - UnkStruct_ov21_021DCAE0 * v2 = param0; - UnkStruct_ov21_021DD420 * v3 = param1->unk_08; + const UnkStruct_ov21_021DCACC *v0 = param2; + const UnkStruct_ov21_021DDABC *v1 = param3->unk_08; + UnkStruct_ov21_021DCAE0 *v2 = param0; + UnkStruct_ov21_021DD420 *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -469,7 +469,7 @@ static int ov21_021DCD04 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021DCDD0 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, const UnkStruct_ov21_021DDABC * param3, int param4) +static void ov21_021DCDD0(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const UnkStruct_ov21_021DDABC *param3, int param4) { ov21_021DCE40(param1, param2, param4); ov21_021DD668(param0, param1, param4); @@ -480,7 +480,7 @@ static void ov21_021DCDD0 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D ov21_021DDCF4(param1, param2); } -static void ov21_021DCE20 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1) +static void ov21_021DCE20(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1) { ov21_021DD6C0(param0, param1); ov21_021DD3FC(param0); @@ -488,10 +488,10 @@ static void ov21_021DCE20 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D ov21_021DD114(param0, param1); } -static void ov21_021DCE40 (UnkStruct_ov21_021DCAE0 * param0, const UnkStruct_ov21_021DCACC * param1, int param2) +static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1, int param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param2); @@ -531,10 +531,10 @@ static void ov21_021DCE40 (UnkStruct_ov21_021DCAE0 * param0, const UnkStruct_ov2 sub_0201C3C0(param0->unk_00->unk_00, 3); } -static void ov21_021DCFC8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, int param2) +static void ov21_021DCFC8(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_B4[0] = sub_02009A4C(v0->unk_13C[0], v1, 108, 1, 108 + 6000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -557,9 +557,9 @@ static void ov21_021DCFC8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D param0->unk_D0[3] = sub_02009BC4(v0->unk_13C[3], v1, 92, 1, 92 + 6000, 3, param2); } -static void ov21_021DD114 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1) +static void ov21_021DD114(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_B4[0]); sub_02009D68(v0->unk_13C[0], param0->unk_B4[0]); @@ -573,11 +573,11 @@ static void ov21_021DD114 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D sub_02009D68(v0->unk_13C[3], param0->unk_D0[3]); } -static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, int param2) +static void ov21_021DD1A8(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3; sub_020093B4(&v0, 93 + 6000, 14 + 6000, 91 + 6000, 92 + 6000, 0xffffffff, 0xffffffff, 0, 1, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -610,7 +610,7 @@ static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D } } -static void ov21_021DD2B8 (UnkStruct_ov21_021DD420 * param0) +static void ov21_021DD2B8(UnkStruct_ov21_021DD420 *param0) { int v0; @@ -623,12 +623,12 @@ static void ov21_021DD2B8 (UnkStruct_ov21_021DD420 * param0) } } -static void ov21_021DD2E0 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, int param3) +static void ov21_021DD2E0(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, int param3) { - Window * v0; + Window *v0; UnkStruct_ov21_021D4CB8 v1; - UnkStruct_02009DC8 * v2; - UnkStruct_ov21_021D13FC * v3 = param1->unk_00; + UnkStruct_02009DC8 *v2; + UnkStruct_ov21_021D13FC *v3 = param1->unk_00; int v4; int v5; u32 v6; @@ -674,7 +674,7 @@ static void ov21_021DD2E0 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D } } -static void ov21_021DD3FC (UnkStruct_ov21_021DD420 * param0) +static void ov21_021DD3FC(UnkStruct_ov21_021DD420 *param0) { int v0; @@ -685,7 +685,7 @@ static void ov21_021DD3FC (UnkStruct_ov21_021DD420 * param0) } } -static void ov21_021DD420 (UnkStruct_ov21_021DD420 * param0) +static void ov21_021DD420(UnkStruct_ov21_021DD420 *param0) { int v0; @@ -697,7 +697,7 @@ static void ov21_021DD420 (UnkStruct_ov21_021DD420 * param0) } } -static void ov21_021DD458 (UnkStruct_ov21_021DD420 * param0) +static void ov21_021DD458(UnkStruct_ov21_021DD420 *param0) { int v0; @@ -709,7 +709,7 @@ static void ov21_021DD458 (UnkStruct_ov21_021DD420 * param0) } } -static void ov21_021DD490 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, BOOL param3) +static void ov21_021DD490(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3) { ov21_021DD420(param0); @@ -724,7 +724,7 @@ static void ov21_021DD490 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D ov21_021D24FC(param1->unk_00, ¶m1->unk_00->unk_168); } -static BOOL ov21_021DD508 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, BOOL param3) +static BOOL ov21_021DD508(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3) { BOOL v0; @@ -747,7 +747,7 @@ static BOOL ov21_021DD508 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D return 0; } -static void ov21_021DD554 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, BOOL param3) +static void ov21_021DD554(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3) { ov21_021DD420(param0); @@ -764,7 +764,7 @@ static void ov21_021DD554 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D } } -static BOOL ov21_021DD5E4 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, BOOL param3) +static BOOL ov21_021DD5E4(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, BOOL param3) { BOOL v0[2]; int v1; @@ -799,7 +799,7 @@ static BOOL ov21_021DD5E4 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D return 0; } -static void ov21_021DD668 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, int param2) +static void ov21_021DD668(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, int param2) { BGL_FillWindow(¶m1->unk_00->unk_04, 0); @@ -809,7 +809,7 @@ static void ov21_021DD668 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D sub_0201C2B4(¶m1->unk_00->unk_04, 8); } -static void ov21_021DD6C0 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1) +static void ov21_021DD6C0(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1) { BGL_FillWindow(¶m1->unk_00->unk_04, 0); sub_02019EBC(param1->unk_00->unk_00, 1); @@ -826,13 +826,13 @@ static void ov21_021DD6C0 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D sub_0201C2B4(¶m1->unk_00->unk_04, 0); } -static void ov21_021DD710 (UnkStruct_ov21_021DD420 * param0, const UnkStruct_ov21_021DCACC * param1, const UnkStruct_ov21_021DDABC * param2, int param3) +static void ov21_021DD710(UnkStruct_ov21_021DD420 *param0, const UnkStruct_ov21_021DCACC *param1, const UnkStruct_ov21_021DDABC *param2, int param3) { int v0, v1; int v2, v3; int v4, v5; int v6; - u8 * v7; + u8 *v7; int v8; ov21_021DD8B4(param0); @@ -888,7 +888,7 @@ static void ov21_021DD710 (UnkStruct_ov21_021DD420 * param0, const UnkStruct_ov2 Heap_FreeToHeap(v7); } -static void ov21_021DD8B4 (UnkStruct_ov21_021DD420 * param0) +static void ov21_021DD8B4(UnkStruct_ov21_021DD420 *param0) { int v0; @@ -902,11 +902,11 @@ static void ov21_021DD8B4 (UnkStruct_ov21_021DD420 * param0) param0->unk_C4 = 0; } -static u8 * ov21_021DD900 (u32 param0, const UnkStruct_ov21_021DCACC * param1, u32 * param2) +static u8 *ov21_021DD900(u32 param0, const UnkStruct_ov21_021DCACC *param1, u32 *param2) { u32 v0; int v1; - u8 * v2; + u8 *v2; v0 = 0; @@ -997,11 +997,11 @@ static u8 * ov21_021DD900 (u32 param0, const UnkStruct_ov21_021DCACC * param1, u return v2; } -static u8 * ov21_021DD908 (u32 param0, const UnkStruct_ov21_021DCACC * param1, u32 * param2) +static u8 *ov21_021DD908(u32 param0, const UnkStruct_ov21_021DCACC *param1, u32 *param2) { u32 v0; int v1; - u8 * v2; + u8 *v2; v0 = 0; @@ -1094,7 +1094,7 @@ static u8 * ov21_021DD908 (u32 param0, const UnkStruct_ov21_021DCACC * param1, u return v2; } -static void ov21_021DD964 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1) +static void ov21_021DD964(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1) { BGL_FillWindow(¶m1->unk_00->unk_04, 0); @@ -1104,7 +1104,7 @@ static void ov21_021DD964 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D sub_0201A954(¶m1->unk_00->unk_04); } -static void ov21_021DD9E8 (UnkStruct_ov21_021DD420 * param0, const UnkStruct_ov21_021DDABC * param1) +static void ov21_021DD9E8(UnkStruct_ov21_021DD420 *param0, const UnkStruct_ov21_021DDABC *param1) { if ((param0->unk_834 <= 0) && (param0->unk_838 <= 0) && (param0->unk_83C <= 0) && (param0->unk_840 <= 0)) { sub_02021CAC(param0->unk_C8, 1); @@ -1115,7 +1115,7 @@ static void ov21_021DD9E8 (UnkStruct_ov21_021DD420 * param0, const UnkStruct_ov2 } } -static void ov21_021DDA48 (UnkStruct_ov21_021DD420 * param0, int param1) +static void ov21_021DDA48(UnkStruct_ov21_021DD420 *param0, int param1) { int v0; @@ -1128,7 +1128,7 @@ static void ov21_021DDA48 (UnkStruct_ov21_021DD420 * param0, int param1) } } -static void ov21_021DDA80 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, const UnkStruct_ov21_021DCACC * param2, const UnkStruct_ov21_021DDABC * param3, int param4) +static void ov21_021DDA80(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, const UnkStruct_ov21_021DCACC *param2, const UnkStruct_ov21_021DDABC *param3, int param4) { if (param0->unk_00 != param3->unk_00) { ov21_021DD710(param0, param2, param3, param4); @@ -1139,7 +1139,7 @@ static void ov21_021DDA80 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D } } -static void ov21_021DDABC (UnkStruct_ov21_021DDABC * param0, UnkStruct_ov21_021DCACC * param1, int param2) +static void ov21_021DDABC(UnkStruct_ov21_021DDABC *param0, UnkStruct_ov21_021DCACC *param1, int param2) { int v0; int v1; @@ -1175,7 +1175,7 @@ static void ov21_021DDABC (UnkStruct_ov21_021DDABC * param0, UnkStruct_ov21_021D } } -static void ov21_021DDB68 (UnkStruct_ov21_021DDABC * param0) +static void ov21_021DDB68(UnkStruct_ov21_021DDABC *param0) { ov21_021D5844(¶m0->unk_14); ov21_021D5844(¶m0->unk_1C); @@ -1183,7 +1183,7 @@ static void ov21_021DDB68 (UnkStruct_ov21_021DDABC * param0) ov21_021D5844(¶m0->unk_2C); } -static void ov21_021DDB8C (UnkStruct_ov21_021DD420 * param0) +static void ov21_021DDB8C(UnkStruct_ov21_021DD420 *param0) { int v0; @@ -1197,7 +1197,7 @@ static void ov21_021DDB8C (UnkStruct_ov21_021DD420 * param0) } } -static void ov21_021DDBCC (UnkStruct_ov21_021DD420 * param0) +static void ov21_021DDBCC(UnkStruct_ov21_021DD420 *param0) { int v0; @@ -1209,7 +1209,7 @@ static void ov21_021DDBCC (UnkStruct_ov21_021DD420 * param0) } } -static void ov21_021DDC14 (UnkStruct_ov21_021DD420 * param0) +static void ov21_021DDC14(UnkStruct_ov21_021DD420 *param0) { fx32 v0; int v1; @@ -1254,9 +1254,9 @@ static void ov21_021DDC14 (UnkStruct_ov21_021DD420 * param0) } } -static void ov21_021DDCF4 (UnkStruct_ov21_021DCAE0 * param0, const UnkStruct_ov21_021DCACC * param1) +static void ov21_021DDCF4(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1) { - Sprite * v0 = ov21_021D2170(param0->unk_00); + Sprite *v0 = ov21_021D2170(param0->unk_00); int v1 = ov21_021D37BC(param1->unk_00); ov21_021D1890(param0->unk_00, param1->unk_00, v1, 2, 40, 120); diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c index e2f100ee7d..bee1d1b33b 100644 --- a/src/overlay021/ov21_021DDD2C.c +++ b/src/overlay021/ov21_021DDD2C.c @@ -1,55 +1,54 @@ +#include "overlay021/ov21_021DDD2C.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" -#include "touch_screen.h" #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021DC9BC.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4660.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "core_sys.h" +#include "heap.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_020218BC.h" #include "unk_02023FCC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021DC9BC.h" -#include "overlay021/ov21_021DDD2C.h" -#include "overlay021/ov21_021E29DC.h" typedef struct { - UnkStruct_ov21_021E68F4 * unk_00; - UnkStruct_ov21_021D3320 * unk_04; - UnkStruct_ov21_021E68F4 * unk_08; + UnkStruct_ov21_021E68F4 *unk_00; + UnkStruct_ov21_021D3320 *unk_04; + UnkStruct_ov21_021E68F4 *unk_08; } UnkStruct_ov21_021DDDA4; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021DDDF0; typedef struct { - void * unk_00; - void * unk_04; + void *unk_00; + void *unk_04; } UnkStruct_ov21_021DDE4C_sub1; typedef struct { @@ -57,65 +56,65 @@ typedef struct { int unk_04; int unk_08; int unk_0C; - UnkStruct_02023FCC * unk_10; - TouchScreenHitTable * unk_14; + UnkStruct_02023FCC *unk_10; + TouchScreenHitTable *unk_14; UnkStruct_ov21_021DDE4C_sub1 unk_18; int unk_20; BOOL unk_24; } UnkStruct_ov21_021DDE4C; typedef struct { - GraphicElementData * unk_00; - UnkStruct_02009DC8 * unk_04[4]; - void * unk_14; + GraphicElementData *unk_00; + UnkStruct_02009DC8 *unk_04[4]; + void *unk_14; int unk_18; int unk_1C; - NNSG2dPaletteData * unk_20; + NNSG2dPaletteData *unk_20; int unk_24; int unk_28; } UnkStruct_ov21_021DDEC8; -static UnkStruct_ov21_021DDDA4 * ov21_021DDDA4(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021DDDF0 * ov21_021DDDF0(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021DDE18(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021DDE1C(UnkStruct_ov21_021DDDA4 * param0); -static void ov21_021DDE30(UnkStruct_ov21_021DDDF0 * param0); -static void ov21_021DDE44(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DDDF0 *ov21_021DDDF0(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021DDE18(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021DDE1C(UnkStruct_ov21_021DDDA4 *param0); +static void ov21_021DDE30(UnkStruct_ov21_021DDDF0 *param0); +static void ov21_021DDE44(UnkStruct_ov21_021D4660 *param0); static int ov21_021DDE48(void); -static int ov21_021DDE4C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DDE84(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DDEB4(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DDEC8(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021DDF80(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021DDFB4(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021DE040(UnkStruct_ov21_021DDEC8 * param0); -static void ov21_021DE04C(UnkStruct_ov21_021DDEC8 * param0); -static void ov21_021DE058(UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, const UnkStruct_ov21_021DDDA4 * param2, BOOL param3); -static BOOL ov21_021DE0C4(UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, const UnkStruct_ov21_021DDDA4 * param2, BOOL param3); -static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1, int param2); -static void ov21_021DE334(UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1); -static void ov21_021DE44C(u32 param0, u32 param1, void * param2); -static void ov21_021DE484(UnkStruct_ov21_021DDE4C * param0); -static void ov21_021DE3D0(UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1); -static void ov21_021DE5A4(UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1); -static void ov21_021DE358(UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1); -static void ov21_021DE630(UnkStruct_ov21_021DDDF0 * param0, const UnkStruct_ov21_021DDE4C * param1, const UnkStruct_ov21_021DDDA4 * param2); -static void ov21_021DE100(UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, int param2); -static void ov21_021DE128(UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, int param2); -static void ov21_021DE13C(UnkStruct_ov21_021DDDF0 * param0, int param1); -static void ov21_021DE1A4(UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, int param2); -static void ov21_021DE224(UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1); -static void ov21_021DE258(UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, int param2); -static void ov21_021DE2E0(UnkStruct_ov21_021DDEC8 * param0); -static void ov21_021DE49C(UnkStruct_ov21_021DDEC8 * param0, const UnkStruct_ov21_021DDDA4 * param1, const UnkStruct_ov21_021DDE4C * param2); +static int ov21_021DDE4C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DDE84(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DDEB4(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DDEC8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021DDF80(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021DDFB4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021DE040(UnkStruct_ov21_021DDEC8 *param0); +static void ov21_021DE04C(UnkStruct_ov21_021DDEC8 *param0); +static void ov21_021DE058(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, const UnkStruct_ov21_021DDDA4 *param2, BOOL param3); +static BOOL ov21_021DE0C4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, const UnkStruct_ov21_021DDDA4 *param2, BOOL param3); +static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, int param2); +static void ov21_021DE334(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1); +static void ov21_021DE44C(u32 param0, u32 param1, void *param2); +static void ov21_021DE484(UnkStruct_ov21_021DDE4C *param0); +static void ov21_021DE3D0(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1); +static void ov21_021DE5A4(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1); +static void ov21_021DE358(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1); +static void ov21_021DE630(UnkStruct_ov21_021DDDF0 *param0, const UnkStruct_ov21_021DDE4C *param1, const UnkStruct_ov21_021DDDA4 *param2); +static void ov21_021DE100(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2); +static void ov21_021DE128(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2); +static void ov21_021DE13C(UnkStruct_ov21_021DDDF0 *param0, int param1); +static void ov21_021DE1A4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2); +static void ov21_021DE224(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1); +static void ov21_021DE258(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2); +static void ov21_021DE2E0(UnkStruct_ov21_021DDEC8 *param0); +static void ov21_021DE49C(UnkStruct_ov21_021DDEC8 *param0, const UnkStruct_ov21_021DDDA4 *param1, const UnkStruct_ov21_021DDE4C *param2); static int ov21_021DE5DC(int param0); -static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, const UnkStruct_ov21_021DDDA4 * param2, int param3); +static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, const UnkStruct_ov21_021DDDA4 *param2, int param3); -void ov21_021DDD2C (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) +void ov21_021DDD2C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) { - UnkStruct_ov21_021DDDA4 * v0; - UnkStruct_ov21_021DDDF0 * v1; - UnkStruct_ov21_021D4660 * v2; + UnkStruct_ov21_021DDDA4 *v0; + UnkStruct_ov21_021DDDF0 *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021DDDA4(param2, param1); v1 = ov21_021DDDF0(param2, param1); @@ -134,16 +133,16 @@ void ov21_021DDD2C (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021DDFB4; } -void ov21_021DDD8C (UnkStruct_ov21_021E68F4 * param0) +void ov21_021DDD8C(UnkStruct_ov21_021E68F4 *param0) { ov21_021DDE1C(param0->unk_00); ov21_021DDE30(param0->unk_04); ov21_021DDE44(param0->unk_20); } -static UnkStruct_ov21_021DDDA4 * ov21_021DDDA4 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021DDDA4 *ov21_021DDDA4(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021DDDA4 * v0; + UnkStruct_ov21_021DDDA4 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DDDA4)); @@ -157,9 +156,9 @@ static UnkStruct_ov21_021DDDA4 * ov21_021DDDA4 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021DDDF0 * ov21_021DDDF0 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021DDDF0 *ov21_021DDDF0(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021DDDF0 * v0; + UnkStruct_ov21_021DDDF0 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DDDF0)); @@ -171,37 +170,37 @@ static UnkStruct_ov21_021DDDF0 * ov21_021DDDF0 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D4660 * ov21_021DDE18 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021DDE18(int param0, UnkStruct_ov21_021D0F60 *param1) { return NULL; } -static void ov21_021DDE1C (UnkStruct_ov21_021DDDA4 * param0) +static void ov21_021DDE1C(UnkStruct_ov21_021DDDA4 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021DDE30 (UnkStruct_ov21_021DDDF0 * param0) +static void ov21_021DDE30(UnkStruct_ov21_021DDDF0 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021DDE44 (UnkStruct_ov21_021D4660 * param0) +static void ov21_021DDE44(UnkStruct_ov21_021D4660 *param0) { return; } -static int ov21_021DDE48 (void) +static int ov21_021DDE48(void) { return 0; } -static int ov21_021DDE4C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DDE4C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021DDDA4 * v0 = param1; - UnkStruct_ov21_021DDE4C * v1; + UnkStruct_ov21_021DDDA4 *v0 = param1; + UnkStruct_ov21_021DDE4C *v1; v1 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021DDE4C)); @@ -216,10 +215,10 @@ static int ov21_021DDE4C (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021DDE84 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DDE84(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021DDDA4 * v0 = param1; - UnkStruct_ov21_021DDE4C * v1 = param0->unk_08; + UnkStruct_ov21_021DDDA4 *v0 = param1; + UnkStruct_ov21_021DDE4C *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -236,10 +235,10 @@ static int ov21_021DDE84 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021DDEB4 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DDEB4(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021DDDA4 * v0 = param1; - UnkStruct_ov21_021DDE4C * v1 = param0->unk_08; + UnkStruct_ov21_021DDDA4 *v0 = param1; + UnkStruct_ov21_021DDE4C *v1 = param0->unk_08; ov21_021DE484(v1); Heap_FreeToHeap(v1); @@ -247,12 +246,12 @@ static int ov21_021DDEB4 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021DDEC8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DDEC8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DDDA4 * v0 = param2; - const UnkStruct_ov21_021DDE4C * v1 = param3->unk_08; - UnkStruct_ov21_021DDDF0 * v2 = param0; - UnkStruct_ov21_021DDEC8 * v3 = param1->unk_08; + const UnkStruct_ov21_021DDDA4 *v0 = param2; + const UnkStruct_ov21_021DDE4C *v1 = param3->unk_08; + UnkStruct_ov21_021DDDF0 *v2 = param0; + UnkStruct_ov21_021DDEC8 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -285,12 +284,12 @@ static int ov21_021DDEC8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021DDF80 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DDF80(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DDDA4 * v0 = param2; - const UnkStruct_ov21_021DDE4C * v1 = param3->unk_08; - UnkStruct_ov21_021DDDF0 * v2 = param0; - UnkStruct_ov21_021DDEC8 * v3 = param1->unk_08; + const UnkStruct_ov21_021DDDA4 *v0 = param2; + const UnkStruct_ov21_021DDE4C *v1 = param3->unk_08; + UnkStruct_ov21_021DDDF0 *v2 = param0; + UnkStruct_ov21_021DDEC8 *v3 = param1->unk_08; ov21_021DE49C(v3, v0, v1); ov21_021DE630(v2, v1, v0); @@ -299,12 +298,12 @@ static int ov21_021DDF80 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021DDFB4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DDFB4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DDDA4 * v0 = param2; - const UnkStruct_ov21_021DDE4C * v1 = param3->unk_08; - UnkStruct_ov21_021DDDF0 * v2 = param0; - UnkStruct_ov21_021DDEC8 * v3 = param1->unk_08; + const UnkStruct_ov21_021DDDA4 *v0 = param2; + const UnkStruct_ov21_021DDE4C *v1 = param3->unk_08; + UnkStruct_ov21_021DDDF0 *v2 = param0; + UnkStruct_ov21_021DDEC8 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -335,17 +334,17 @@ static int ov21_021DDFB4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021DE040 (UnkStruct_ov21_021DDEC8 * param0) +static void ov21_021DE040(UnkStruct_ov21_021DDEC8 *param0) { sub_02021FE0(param0->unk_00, GX_OAM_MODE_XLU); } -static void ov21_021DE04C (UnkStruct_ov21_021DDEC8 * param0) +static void ov21_021DE04C(UnkStruct_ov21_021DDEC8 *param0) { sub_02021FE0(param0->unk_00, GX_OAM_MODE_NORMAL); } -static void ov21_021DE058 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, const UnkStruct_ov21_021DDDA4 * param2, BOOL param3) +static void ov21_021DE058(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, const UnkStruct_ov21_021DDDA4 *param2, BOOL param3) { ov21_021DE040(param0); @@ -358,7 +357,7 @@ static void ov21_021DE058 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D } } -static BOOL ov21_021DE0C4 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, const UnkStruct_ov21_021DDDA4 * param2, BOOL param3) +static BOOL ov21_021DE0C4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, const UnkStruct_ov21_021DDDA4 *param2, BOOL param3) { BOOL v0; @@ -379,23 +378,23 @@ static BOOL ov21_021DE0C4 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D return 0; } -static void ov21_021DE100 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, int param2) +static void ov21_021DE100(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2) { ov21_021DE13C(param1, param2); ov21_021DE1A4(param0, param1, param2); ov21_021DE258(param0, param1, param2); } -static void ov21_021DE128 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, int param2) +static void ov21_021DE128(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2) { ov21_021DE2E0(param0); ov21_021DE224(param0, param1); } -static void ov21_021DE13C (UnkStruct_ov21_021DDDF0 * param0, int param1) +static void ov21_021DE13C(UnkStruct_ov21_021DDDF0 *param0, int param1) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 34, param0->unk_00->unk_00, 6, 0, 0, 1, param1); @@ -406,10 +405,10 @@ static void ov21_021DE13C (UnkStruct_ov21_021DDDF0 * param0, int param1) sub_0201C3C0(param0->unk_00->unk_00, 6); } -static void ov21_021DE1A4 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, int param2) +static void ov21_021DE1A4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_04[0] = sub_02009A4C(v0->unk_13C[0], v1, 105, 1, 105 + 6000, NNS_G2D_VRAM_TYPE_2DSUB, param2); @@ -420,9 +419,9 @@ static void ov21_021DE1A4 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D param0->unk_04[3] = sub_02009BC4(v0->unk_13C[3], v1, 104, 1, 104 + 6000, 3, param2); } -static void ov21_021DE224 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1) +static void ov21_021DE224(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_04[0]); @@ -431,11 +430,11 @@ static void ov21_021DE224 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D sub_02009D68(v0->unk_13C[3], param0->unk_04[3]); } -static void ov21_021DE258 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, int param2) +static void ov21_021DE258(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; sub_020093B4(&v0, 105 + 6000, 11 + 2100, 103 + 6000, 104 + 6000, 0xffffffff, 0xffffffff, 0, 1, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -453,12 +452,12 @@ static void ov21_021DE258 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D SpriteActor_SetSpriteAnimActive(param0->unk_00, 0); } -static void ov21_021DE2E0 (UnkStruct_ov21_021DDEC8 * param0) +static void ov21_021DE2E0(UnkStruct_ov21_021DDEC8 *param0) { sub_02021BD4(param0->unk_00); } -static void ov21_021DE2EC (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1, int param2) +static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, int param2) { param0->unk_14 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 1); param0->unk_14[0].circle.code = TOUCHSCREEN_USE_CIRCLE; @@ -470,7 +469,7 @@ static void ov21_021DE2EC (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021D param0->unk_10 = sub_02023FCC(param0->unk_14, 1, ov21_021DE44C, ¶m0->unk_18, param2); } -static void ov21_021DE334 (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1) +static void ov21_021DE334(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1) { sub_0202404C(param0->unk_10); ov21_021DE3D0(param0, param1); @@ -479,7 +478,7 @@ static void ov21_021DE334 (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021D param0->unk_14[0].circle.y = param0->unk_04; } -static void ov21_021DE358 (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1) +static void ov21_021DE358(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1) { s32 v0; @@ -514,7 +513,7 @@ static void ov21_021DE358 (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021D } } -static void ov21_021DE3D0 (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1) +static void ov21_021DE3D0(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1) { int v0; int v1; @@ -559,11 +558,11 @@ static void ov21_021DE3D0 (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021D } } -static void ov21_021DE44C (u32 param0, u32 param1, void * param2) +static void ov21_021DE44C(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021DDE4C_sub1 * v0 = param2; - UnkStruct_ov21_021DDDA4 * v1 = v0->unk_00; - UnkStruct_ov21_021DDE4C * v2 = v0->unk_04; + UnkStruct_ov21_021DDE4C_sub1 *v0 = param2; + UnkStruct_ov21_021DDDA4 *v1 = v0->unk_00; + UnkStruct_ov21_021DDE4C *v2 = v0->unk_04; switch (param1) { case 0: @@ -579,14 +578,14 @@ static void ov21_021DE44C (u32 param0, u32 param1, void * param2) } } -static void ov21_021DE484 (UnkStruct_ov21_021DDE4C * param0) +static void ov21_021DE484(UnkStruct_ov21_021DDE4C *param0) { sub_02024034(param0->unk_10); Heap_FreeToHeap(param0->unk_14); param0->unk_14 = NULL; } -static void ov21_021DE49C (UnkStruct_ov21_021DDEC8 * param0, const UnkStruct_ov21_021DDDA4 * param1, const UnkStruct_ov21_021DDE4C * param2) +static void ov21_021DE49C(UnkStruct_ov21_021DDEC8 *param0, const UnkStruct_ov21_021DDDA4 *param1, const UnkStruct_ov21_021DDE4C *param2) { VecFx32 v0; @@ -598,7 +597,7 @@ static void ov21_021DE49C (UnkStruct_ov21_021DDEC8 * param0, const UnkStruct_ov2 SpriteActor_SetSpriteAnimActive(param0->unk_00, ov21_021DCA28(param1->unk_00)); } -static void ov21_021DE4D4 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, const UnkStruct_ov21_021DDDA4 * param2, int param3) +static void ov21_021DE4D4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, const UnkStruct_ov21_021DDDA4 *param2, int param3) { int v0; int v1 = 0; @@ -659,7 +658,7 @@ static void ov21_021DE4D4 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D } } -static void ov21_021DE5A4 (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1) +static void ov21_021DE5A4(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1) { int v0 = ov21_021DCA28(param1->unk_00); @@ -679,7 +678,7 @@ static void ov21_021DE5A4 (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021D } } -static int ov21_021DE5DC (int param0) +static int ov21_021DE5DC(int param0) { int v0; int v1; @@ -699,9 +698,9 @@ static int ov21_021DE5DC (int param0) return v1; } -static void ov21_021DE630 (UnkStruct_ov21_021DDDF0 * param0, const UnkStruct_ov21_021DDE4C * param1, const UnkStruct_ov21_021DDDA4 * param2) +static void ov21_021DE630(UnkStruct_ov21_021DDDF0 *param0, const UnkStruct_ov21_021DDE4C *param1, const UnkStruct_ov21_021DDDA4 *param2) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; if (ov21_021E33BC(param2->unk_08) == 1) { if (param1->unk_24 == 0) { diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c index c82ef6bb2c..c585c15441 100644 --- a/src/overlay021/ov21_021DE668.c +++ b/src/overlay021/ov21_021DE668.c @@ -1,118 +1,116 @@ +#include "overlay021/ov21_021DE668.h" + #include #include -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" -#include "overlay021/struct_ov21_021D4C0C_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1F90.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021D5600.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D2648.h" +#include "overlay021/struct_ov21_021D4C0C_decl.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021DE6D4.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "heap.h" +#include "message.h" +#include "pokemon.h" +#include "strbuf.h" #include "unk_02002B7C.h" #include "unk_02005474.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "message.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "pokemon.h" #include "unk_02098988.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1F90.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021D5600.h" -#include "overlay021/ov21_021DE668.h" -#include "overlay021/ov21_021E29DC.h" typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021DE760; typedef struct { - GraphicElementData * unk_00[3]; - GraphicElementData * unk_0C; - UnkStruct_ov21_021D4CA0 * unk_10; - UnkStruct_02009DC8 * unk_14[4]; - UnkStruct_02009DC8 * unk_24[4]; + GraphicElementData *unk_00[3]; + GraphicElementData *unk_0C; + UnkStruct_ov21_021D4CA0 *unk_10; + UnkStruct_02009DC8 *unk_14[4]; + UnkStruct_02009DC8 *unk_24[4]; UnkStruct_ov21_021D2648 unk_34; UnkStruct_ov21_021D2648 unk_54; } UnkStruct_ov21_021DF374; -static UnkStruct_ov21_021DE6D4 * ov21_021DE6E8(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021DE760 * ov21_021DE724(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021DE74C(UnkStruct_ov21_021DE6D4 * param0); -static void ov21_021DE760(UnkStruct_ov21_021DE760 * param0); +static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DE760 *ov21_021DE724(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021DE74C(UnkStruct_ov21_021DE6D4 *param0); +static void ov21_021DE760(UnkStruct_ov21_021DE760 *param0); static int ov21_021DE774(void); -static int ov21_021DE778(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DE79C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DE7F8(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DE804(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021DE8E4(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021DE8E8(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021DF374(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3); -static BOOL ov21_021DF3F0(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3); -static void ov21_021DF44C(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3); -static BOOL ov21_021DF4D0(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3); -static void ov21_021DF548(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3); -static BOOL ov21_021DF5D0(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3); -static void ov21_021DF6B4(UnkStruct_ov21_021DE760 * param0); -static void ov21_021DF64C(UnkStruct_ov21_021DF374 * param0); -static void ov21_021DF680(UnkStruct_ov21_021DF374 * param0); -static void ov21_021DF6C4(UnkStruct_ov21_021DF374 * param0, int param1, int param2, int param3); -static BOOL ov21_021DF6E0(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1); -static void ov21_021DF6FC(UnkStruct_ov21_021DF374 * param0); -static BOOL ov21_021DF718(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1); -static void ov21_021DE9A4(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3); -static void ov21_021DEA0C(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1); -static void ov21_021DEA44(UnkStruct_ov21_021DE760 * param0, int param1); -static void ov21_021DEB58(UnkStruct_ov21_021DE760 * param0, const UnkStruct_ov21_021DE6D4 * param1, int param2); -static void ov21_021DEC2C(Window * param0, int param1, int param2, u32 param3); -static void ov21_021DEC80(Window * param0, int param1, int param2, u32 param3); -static void ov21_021DECD4(Window * param0, int param1, int param2, int param3, u32 param4); -static void ov21_021DED24(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3); -static void ov21_021DED68(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1); -static void ov21_021DED7C(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, int param2, int param3); -static void ov21_021DEE38(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1); -static void ov21_021DEE80(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, int param2); -static void ov21_021DEEF8(UnkStruct_ov21_021DF374 * param0); -static void ov21_021DEFA8(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, int param2); -static void ov21_021DF054(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1); -static void ov21_021DF098(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3); -static void ov21_021DF1F8(UnkStruct_ov21_021DF374 * param0); -static void ov21_021DF214(UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3); -static void ov21_021DF35C(UnkStruct_ov21_021DF374 * param0); -static void ov21_021DEF08(UnkStruct_ov21_021DE760 * param0, const UnkStruct_ov21_021DE6D4 * param1, int param2); -static void ov21_021DEF3C(UnkStruct_ov21_021DE760 * param0); -static void ov21_021DEF54(UnkStruct_ov21_021DE760 * param0, const UnkStruct_ov21_021DE6D4 * param1); -static void ov21_021DEF8C(UnkStruct_ov21_021DE760 * param0); - -void ov21_021DE668 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) +static int ov21_021DE778(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DE79C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DE7F8(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DE804(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021DE8E4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021DE8E8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021DF374(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3); +static BOOL ov21_021DF3F0(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3); +static void ov21_021DF44C(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3); +static BOOL ov21_021DF4D0(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3); +static void ov21_021DF548(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3); +static BOOL ov21_021DF5D0(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3); +static void ov21_021DF6B4(UnkStruct_ov21_021DE760 *param0); +static void ov21_021DF64C(UnkStruct_ov21_021DF374 *param0); +static void ov21_021DF680(UnkStruct_ov21_021DF374 *param0); +static void ov21_021DF6C4(UnkStruct_ov21_021DF374 *param0, int param1, int param2, int param3); +static BOOL ov21_021DF6E0(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1); +static void ov21_021DF6FC(UnkStruct_ov21_021DF374 *param0); +static BOOL ov21_021DF718(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1); +static void ov21_021DE9A4(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3); +static void ov21_021DEA0C(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1); +static void ov21_021DEA44(UnkStruct_ov21_021DE760 *param0, int param1); +static void ov21_021DEB58(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_021DE6D4 *param1, int param2); +static void ov21_021DEC2C(Window *param0, int param1, int param2, u32 param3); +static void ov21_021DEC80(Window *param0, int param1, int param2, u32 param3); +static void ov21_021DECD4(Window *param0, int param1, int param2, int param3, u32 param4); +static void ov21_021DED24(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3); +static void ov21_021DED68(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1); +static void ov21_021DED7C(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, int param2, int param3); +static void ov21_021DEE38(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1); +static void ov21_021DEE80(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, int param2); +static void ov21_021DEEF8(UnkStruct_ov21_021DF374 *param0); +static void ov21_021DEFA8(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, int param2); +static void ov21_021DF054(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1); +static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3); +static void ov21_021DF1F8(UnkStruct_ov21_021DF374 *param0); +static void ov21_021DF214(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3); +static void ov21_021DF35C(UnkStruct_ov21_021DF374 *param0); +static void ov21_021DEF08(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_021DE6D4 *param1, int param2); +static void ov21_021DEF3C(UnkStruct_ov21_021DE760 *param0); +static void ov21_021DEF54(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_021DE6D4 *param1); +static void ov21_021DEF8C(UnkStruct_ov21_021DE760 *param0); + +void ov21_021DE668(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) { - UnkStruct_ov21_021DE6D4 * v0; - UnkStruct_ov21_021DE760 * v1; + UnkStruct_ov21_021DE6D4 *v0; + UnkStruct_ov21_021DE760 *v1; v0 = ov21_021DE6E8(param2, param1); v1 = ov21_021DE724(param2, param1); @@ -129,18 +127,18 @@ void ov21_021DE668 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021DE8E8; } -void ov21_021DE6C0 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021DE6C0(UnkStruct_ov21_021E68F4 *param0) { ov21_021DE74C(param0->unk_00); ov21_021DE760(param0->unk_04); } -BOOL ov21_021DE6D4 (UnkStruct_ov21_021DE6D4 * param0, int param1) +BOOL ov21_021DE6D4(UnkStruct_ov21_021DE6D4 *param0, int param1) { return 0; } -BOOL ov21_021DE6D8 (UnkStruct_ov21_021DE6D4 * param0, int param1) +BOOL ov21_021DE6D8(UnkStruct_ov21_021DE6D4 *param0, int param1) { BOOL v0 = 1; @@ -153,10 +151,10 @@ BOOL ov21_021DE6D8 (UnkStruct_ov21_021DE6D4 * param0, int param1) return v0; } -static UnkStruct_ov21_021DE6D4 * ov21_021DE6E8 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021DE6D4 *ov21_021DE6E8(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021DE6D4 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021DE6D4 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DE6D4)); @@ -171,10 +169,10 @@ static UnkStruct_ov21_021DE6D4 * ov21_021DE6E8 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021DE760 * ov21_021DE724 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021DE760 *ov21_021DE724(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021DE760 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021DE760 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DE760)); @@ -186,26 +184,26 @@ static UnkStruct_ov21_021DE760 * ov21_021DE724 (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021DE74C (UnkStruct_ov21_021DE6D4 * param0) +static void ov21_021DE74C(UnkStruct_ov21_021DE6D4 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021DE760 (UnkStruct_ov21_021DE760 * param0) +static void ov21_021DE760(UnkStruct_ov21_021DE760 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static int ov21_021DE774 (void) +static int ov21_021DE774(void) { return 0; } -static int ov21_021DE778 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DE778(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021DE6D4 * v0 = param1; + UnkStruct_ov21_021DE6D4 *v0 = param1; ov21_021D3434(v0->unk_04, ov21_021D37BC(v0->unk_04)); ov21_021D344C(v0->unk_04, ov21_021D36D8(v0->unk_04)); @@ -213,9 +211,9 @@ static int ov21_021DE778 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021DE79C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DE79C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021DE6D4 * v0 = param1; + UnkStruct_ov21_021DE6D4 *v0 = param1; if (param0->unk_0C == 1) { return 1; @@ -241,17 +239,17 @@ static int ov21_021DE79C (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021DE7F8 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DE7F8(UnkStruct_ov21_021E6A68 *param0, void *param1) { sub_0200592C(0); return 1; } -static int ov21_021DE804 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DE804(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DE6D4 * v0 = param2; - UnkStruct_ov21_021DE760 * v1 = param0; - UnkStruct_ov21_021DF374 * v2 = param1->unk_08; + const UnkStruct_ov21_021DE6D4 *v0 = param2; + UnkStruct_ov21_021DE760 *v1 = param0; + UnkStruct_ov21_021DF374 *v2 = param1->unk_08; BOOL v3; switch (param1->unk_00) { @@ -304,16 +302,16 @@ static int ov21_021DE804 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021DE8E4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DE8E4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { return 0; } -static int ov21_021DE8E8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DE8E8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DE6D4 * v0 = param2; - UnkStruct_ov21_021DE760 * v1 = param0; - UnkStruct_ov21_021DF374 * v2 = param1->unk_08; + const UnkStruct_ov21_021DE6D4 *v0 = param2; + UnkStruct_ov21_021DE760 *v1 = param0; + UnkStruct_ov21_021DF374 *v2 = param1->unk_08; BOOL v3; switch (param1->unk_00) { @@ -366,7 +364,7 @@ static int ov21_021DE8E8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021DE9A4 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3) +static void ov21_021DE9A4(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3) { ov21_021DEF08(param1, param2, param3); ov21_021DEF54(param1, param2); @@ -381,7 +379,7 @@ static void ov21_021DE9A4 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D } } -static void ov21_021DEA0C (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1) +static void ov21_021DEA0C(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1) { ov21_021DF35C(param0); @@ -394,10 +392,10 @@ static void ov21_021DEA0C (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D sub_02019EBC(param1->unk_00->unk_00, 1); } -static void ov21_021DEA44 (UnkStruct_ov21_021DE760 * param0, int param1) +static void ov21_021DEA44(UnkStruct_ov21_021DE760 *param0, int param1) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param1); @@ -419,7 +417,7 @@ static void ov21_021DEA44 (UnkStruct_ov21_021DE760 * param0, int param1) sub_0201C3C0(param0->unk_00->unk_00, 3); } -static void ov21_021DEB58 (UnkStruct_ov21_021DE760 * param0, const UnkStruct_ov21_021DE6D4 * param1, int param2) +static void ov21_021DEB58(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_021DE6D4 *param1, int param2) { int v0 = ov21_021D37BC(param1->unk_04); @@ -430,10 +428,10 @@ static void ov21_021DEB58 (UnkStruct_ov21_021DE760 * param0, const UnkStruct_ov2 ov21_021DEB8C(¶m0->unk_00->unk_04, v0, param2, param1->unk_18, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0)))); } -void ov21_021DEB8C (Window * param0, int param1, int param2, int param3, u32 param4) +void ov21_021DEB8C(Window *param0, int param1, int param2, int param3, u32 param4) { - Strbuf* v0 = Strbuf_Init(64, param2); - MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param2); + Strbuf *v0 = Strbuf_Init(64, param2); + MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param2); MessageLoader_GetStrbuf(v1, 9, v0); sub_0201D78C(param0, 0, v0, 152, 88, 0, param4, NULL); @@ -448,10 +446,10 @@ void ov21_021DEB8C (Window * param0, int param1, int param2, int param3, u32 par ov21_021DECD4(param0, param2, param1, param3, param4); } -static void ov21_021DEC2C (Window * param0, int param1, int param2, u32 param3) +static void ov21_021DEC2C(Window *param0, int param1, int param2, u32 param3) { - Strbuf* v0 = Strbuf_Init(64, param1); - MessageLoader * v1; + Strbuf *v0 = Strbuf_Init(64, param1); + MessageLoader *v1; int v2; v2 = sub_020989D0(); @@ -463,10 +461,10 @@ static void ov21_021DEC2C (Window * param0, int param1, int param2, u32 param3) MessageLoader_Free(v1); } -static void ov21_021DEC80 (Window * param0, int param1, int param2, u32 param3) +static void ov21_021DEC80(Window *param0, int param1, int param2, u32 param3) { - Strbuf* v0 = Strbuf_Init(64, param1); - MessageLoader * v1; + Strbuf *v0 = Strbuf_Init(64, param1); + MessageLoader *v1; int v2; v2 = sub_020989C4(); @@ -478,9 +476,9 @@ static void ov21_021DEC80 (Window * param0, int param1, int param2, u32 param3) MessageLoader_Free(v1); } -static void ov21_021DECD4 (Window * param0, int param1, int param2, int param3, u32 param4) +static void ov21_021DECD4(Window *param0, int param1, int param2, int param3, u32 param4) { - Strbuf* v0 = ov21_021D56BC(param2, GAME_LANGUAGE, param3, param1); + Strbuf *v0 = ov21_021D56BC(param2, GAME_LANGUAGE, param3, param1); u32 v1 = sub_02002EB4(0, v0, 0); u32 v2 = (v1 < 240) ? 128 - v1 / 2 : 8; @@ -488,7 +486,7 @@ static void ov21_021DECD4 (Window * param0, int param1, int param2, int param3, ov21_021D5600(v0); } -static void ov21_021DED24 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3) +static void ov21_021DED24(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3) { int v0 = ov21_021D37BC(param2->unk_04); int v1 = ov21_021D33D4(param2->unk_04, v0); @@ -501,15 +499,15 @@ static void ov21_021DED24 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D ov21_021DEE80(param0, param1, param3); } -static void ov21_021DED68 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1) +static void ov21_021DED68(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1) { ov21_021DEEF8(param0); ov21_021DEE38(param0, param1); } -static void ov21_021DED7C (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, int param2, int param3) +static void ov21_021DED7C(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, int param2, int param3) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; int v1 = ov21_021D1F90(); int v2 = ov21_021D1F94(param3); int v3 = ov21_021D1F98(); @@ -530,9 +528,9 @@ static void ov21_021DED7C (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D param0->unk_24[3] = sub_02009918(v0->unk_13C[3], v1, v5, 1, 4000, 3, param2); } -static void ov21_021DEE38 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1) +static void ov21_021DEE38(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; if (param0->unk_24[0] == NULL) { return; @@ -546,11 +544,11 @@ static void ov21_021DEE38 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D sub_02009D68(v0->unk_13C[3], param0->unk_24[3]); } -static void ov21_021DEE80 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, int param2) +static void ov21_021DEE80(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; sub_020093B4(&v0, 4000, 4000, 4000, 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -565,46 +563,46 @@ static void ov21_021DEE80 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D param0->unk_00[0] = sub_02021B90(&v1); } -static void ov21_021DEEF8 (UnkStruct_ov21_021DF374 * param0) +static void ov21_021DEEF8(UnkStruct_ov21_021DF374 *param0) { if (param0->unk_00[0]) { sub_02021BD4(param0->unk_00[0]); } } -static void ov21_021DEF08 (UnkStruct_ov21_021DE760 * param0, const UnkStruct_ov21_021DE6D4 * param1, int param2) +static void ov21_021DEF08(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_021DE6D4 *param1, int param2) { ov21_021D1778(param0->unk_00, param1->unk_04, param2, ov21_021D375C(param1->unk_04), (172 * FX32_ONE), (32 * FX32_ONE)); ov21_021D238C(param0->unk_00, 0); } -static void ov21_021DEF3C (UnkStruct_ov21_021DE760 * param0) +static void ov21_021DEF3C(UnkStruct_ov21_021DE760 *param0) { ov21_021D23C0(param0->unk_00, 0); ov21_021D2360(param0->unk_00, GX_OAM_MODE_NORMAL); } -static void ov21_021DEF54 (UnkStruct_ov21_021DE760 * param0, const UnkStruct_ov21_021DE6D4 * param1) +static void ov21_021DEF54(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_021DE6D4 *param1) { - Sprite * v0 = ov21_021D2170(param0->unk_00); + Sprite *v0 = ov21_021D2170(param0->unk_00); int v1 = ov21_021D37BC(param1->unk_04); ov21_021D1890(param0->unk_00, param1->unk_04, v1, 2, 48, 72); sub_02007DEC(v0, 6, 0); } -static void ov21_021DEF8C (UnkStruct_ov21_021DE760 * param0) +static void ov21_021DEF8C(UnkStruct_ov21_021DE760 *param0) { - Sprite * v0 = ov21_021D2170(param0->unk_00); + Sprite *v0 = ov21_021D2170(param0->unk_00); sub_02007DEC(v0, 6, 1); sub_02008780(v0); } -static void ov21_021DEFA8 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, int param2) +static void ov21_021DEFA8(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_14[0] = sub_02009A4C(v0->unk_13C[0], v1, 90, 1, 90 + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -620,9 +618,9 @@ static void ov21_021DEFA8 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D param0->unk_14[3] = sub_02009BC4(v0->unk_13C[3], v1, 89, 1, 89 + 4000, 3, param2); } -static void ov21_021DF054 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1) +static void ov21_021DF054(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_14[0]); sub_0200A6DC(param0->unk_14[1]); @@ -632,11 +630,11 @@ static void ov21_021DF054 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D sub_02009D68(v0->unk_13C[3], param0->unk_14[3]); } -static void ov21_021DF098 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3) +static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3 = ov21_021D37BC(param2->unk_04); int v4, v5; int v6 = ov21_021D33D4(param2->unk_04, v3); @@ -670,7 +668,7 @@ static void ov21_021DF098 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D } } -int ov21_021DF180 (int param0) +int ov21_021DF180(int param0) { int v0; @@ -732,7 +730,7 @@ int ov21_021DF180 (int param0) return v0; } -static void ov21_021DF1F8 (UnkStruct_ov21_021DF374 * param0) +static void ov21_021DF1F8(UnkStruct_ov21_021DF374 *param0) { if (param0->unk_00[1]) { sub_02021BD4(param0->unk_00[1]); @@ -743,15 +741,15 @@ static void ov21_021DF1F8 (UnkStruct_ov21_021DF374 * param0) } } -static void ov21_021DF214 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3) +static void ov21_021DF214(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3 = ov21_021D37BC(param2->unk_04); - Window * v4; + Window *v4; UnkStruct_ov21_021D4CB8 v5; - UnkStruct_02009DC8 * v6; + UnkStruct_02009DC8 *v6; sub_020093B4(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -790,10 +788,10 @@ static void ov21_021DF214 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D ov21_021D4DA0(v4); } -Window * ov21_021DF30C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2) +Window *ov21_021DF30C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ov21_021D4D6C(param0, 18, 2); v1 = ov21_021D566C(param1, GAME_LANGUAGE, param2); @@ -810,14 +808,14 @@ Window * ov21_021DF30C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2 return v0; } -static void ov21_021DF35C (UnkStruct_ov21_021DF374 * param0) +static void ov21_021DF35C(UnkStruct_ov21_021DF374 *param0) { sub_02021BD4(param0->unk_0C); param0->unk_0C = NULL; ov21_021D4D1C(param0->unk_10); } -static void ov21_021DF374 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3) +static void ov21_021DF374(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3) { ov21_021D2360(param1->unk_00, GX_OAM_MODE_XLU); ov21_021DF64C(param0); @@ -833,7 +831,7 @@ static void ov21_021DF374 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D ov21_021DF6B4(param1); } -static BOOL ov21_021DF3F0 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3) +static BOOL ov21_021DF3F0(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3) { BOOL v0; @@ -858,7 +856,7 @@ static BOOL ov21_021DF3F0 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D return v0; } -static void ov21_021DF44C (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3) +static void ov21_021DF44C(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3) { ov21_021DF64C(param0); @@ -876,7 +874,7 @@ static void ov21_021DF44C (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D } } -static BOOL ov21_021DF4D0 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3) +static BOOL ov21_021DF4D0(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3) { BOOL v0[3]; int v1; @@ -912,7 +910,7 @@ static BOOL ov21_021DF4D0 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D return 0; } -static void ov21_021DF548 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3) +static void ov21_021DF548(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3) { ov21_021DF64C(param0); ov21_021D2360(param1->unk_00, GX_OAM_MODE_XLU); @@ -930,7 +928,7 @@ static void ov21_021DF548 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D } } -static BOOL ov21_021DF5D0 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, BOOL param3) +static BOOL ov21_021DF5D0(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, BOOL param3) { BOOL v0[2]; int v1; @@ -967,7 +965,7 @@ static BOOL ov21_021DF5D0 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D return 0; } -static void ov21_021DF64C (UnkStruct_ov21_021DF374 * param0) +static void ov21_021DF64C(UnkStruct_ov21_021DF374 *param0) { int v0; @@ -981,7 +979,7 @@ static void ov21_021DF64C (UnkStruct_ov21_021DF374 * param0) sub_02012AF0(param0->unk_10->unk_00, GX_OAM_MODE_XLU); } -static void ov21_021DF680 (UnkStruct_ov21_021DF374 * param0) +static void ov21_021DF680(UnkStruct_ov21_021DF374 *param0) { int v0; @@ -995,17 +993,17 @@ static void ov21_021DF680 (UnkStruct_ov21_021DF374 * param0) sub_02012AF0(param0->unk_10->unk_00, GX_OAM_MODE_NORMAL); } -static void ov21_021DF6B4 (UnkStruct_ov21_021DE760 * param0) +static void ov21_021DF6B4(UnkStruct_ov21_021DE760 *param0) { ov21_021D24FC(param0->unk_00, ¶m0->unk_00->unk_168); } -static void ov21_021DF6C4 (UnkStruct_ov21_021DF374 * param0, int param1, int param2, int param3) +static void ov21_021DF6C4(UnkStruct_ov21_021DF374 *param0, int param1, int param2, int param3) { ov21_021D2648(¶m0->unk_34, 48, param1, 72, param2, param3); } -static BOOL ov21_021DF6E0 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1) +static BOOL ov21_021DF6E0(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1) { BOOL v0; @@ -1015,12 +1013,12 @@ static BOOL ov21_021DF6E0 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D return v0; } -static void ov21_021DF6FC (UnkStruct_ov21_021DF374 * param0) +static void ov21_021DF6FC(UnkStruct_ov21_021DF374 *param0) { ov21_021D2648(¶m0->unk_54, 172, 170, 32, 82, 4); } -static BOOL ov21_021DF718 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1) +static BOOL ov21_021DF718(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1) { BOOL v0; diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c index 22808ae553..ab6e338b09 100644 --- a/src/overlay021/ov21_021DF734.c +++ b/src/overlay021/ov21_021DF734.c @@ -1,66 +1,65 @@ +#include "overlay021/ov21_021DF734.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D2648.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "heap.h" +#include "inlines.h" +#include "pokemon.h" #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201F834.h" #include "unk_020218BC.h" -#include "pokemon.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021DF734.h" -#include "overlay021/ov21_021E29DC.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; - const UnkStruct_ov21_021E68F4 * unk_08; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; + const UnkStruct_ov21_021E68F4 *unk_08; int unk_0C; int unk_10; int unk_14; } UnkStruct_ov21_021DF844; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; BOOL unk_04; BOOL unk_08; } UnkStruct_ov21_021DF858; typedef struct { - GraphicElementData * unk_00[4]; - UnkStruct_02009DC8 * unk_10[4]; - UnkStruct_ov21_021D4CA0 * unk_20[2]; + GraphicElementData *unk_00[4]; + UnkStruct_02009DC8 *unk_10[4]; + UnkStruct_ov21_021D4CA0 *unk_20[2]; UnkStruct_ov21_021D2648 unk_28[4]; int unk_A8[4]; int unk_B8; - GraphicElementData * unk_BC; + GraphicElementData *unk_BC; int unk_C0; BOOL unk_C4; int unk_C8; @@ -68,77 +67,77 @@ typedef struct { } UnkStruct_ov21_021DFFF8; static inline int inline_ov21_021E00F4(int param0, int param1); -static UnkStruct_ov21_021DF844 * ov21_021DF7CC(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021DF858 * ov21_021DF80C(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021DF844(UnkStruct_ov21_021DF844 * param0); -static void ov21_021DF858(UnkStruct_ov21_021DF858 * param0); +static UnkStruct_ov21_021DF844 *ov21_021DF7CC(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021DF858 *ov21_021DF80C(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021DF844(UnkStruct_ov21_021DF844 *param0); +static void ov21_021DF858(UnkStruct_ov21_021DF858 *param0); static int ov21_021DF86C(void); static int ov21_021DF870(int param0, int param1, int param2, int param3); -static int ov21_021DF888(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DF8B0(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DF8C0(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021DF8C4(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021DF958(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021DFA18(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021DFF38(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, BOOL param3); -static BOOL ov21_021DFFA8(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, BOOL param3); -static void ov21_021E0078(UnkStruct_ov21_021DF858 * param0); -static void ov21_021DFFF8(UnkStruct_ov21_021DFFF8 * param0); -static void ov21_021E0038(UnkStruct_ov21_021DFFF8 * param0); -static void ov21_021E0094(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1); -static BOOL ov21_021E00B8(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1); -static void ov21_021E00F4(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, int param2, int param3, int param4); -static BOOL ov21_021E015C(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, int param2); -static int ov21_021E01CC(int param0, const UnkStruct_ov21_021DF844 * param1); -static int ov21_021E0268(int param0, const UnkStruct_ov21_021DF844 * param1); -static int ov21_021E02F0(int param0, const UnkStruct_ov21_021DF844 * param1); -static void ov21_021DFA84(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3); -static void ov21_021DFACC(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1); -static void ov21_021DFAE8(UnkStruct_ov21_021DF858 * param0, int param1); -static void ov21_021DFD1C(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, int param2); -static void ov21_021DFDC8(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1); -static void ov21_021DFE0C(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3); -static void ov21_021DFF18(UnkStruct_ov21_021DFFF8 * param0); -static void ov21_021DFB50(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2); -static void ov21_021DFBB4(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2); -static void ov21_021DFBEC(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5, int param6); -static void ov21_021E0354(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E03EC(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E0478(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E0504(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E0590(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E061C(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E06A8(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E072C(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E07B8(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E0844(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E0B24(int param0, int * param1, int * param2); -static void ov21_021DFD00(UnkStruct_ov21_021DF858 * param0); -static void ov21_021E08D0(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E0944(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5); -static void ov21_021E09A4(UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5, int param6, int param7); -static int ov21_021E0A4C(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0A8C(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0A90(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0A94(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0A98(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0AA8(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0AB8(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0AC8(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0AD8(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0ADC(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0AEC(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0AFC(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0B10(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2); -static int ov21_021E0B64(UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2, int param3); -static void ov21_021E0BF8(UnkStruct_ov21_021DFFF8 * param0); -static void ov21_021E0C10(UnkStruct_ov21_021DFFF8 * param0); -static void ov21_021E0C30(UnkStruct_ov21_021DFFF8 * param0); - -void ov21_021DF734 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) -{ - UnkStruct_ov21_021DF844 * v0; - UnkStruct_ov21_021DF858 * v1; +static int ov21_021DF888(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DF8B0(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DF8C0(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021DF8C4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021DF958(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021DFA18(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021DFF38(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, BOOL param3); +static BOOL ov21_021DFFA8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, BOOL param3); +static void ov21_021E0078(UnkStruct_ov21_021DF858 *param0); +static void ov21_021DFFF8(UnkStruct_ov21_021DFFF8 *param0); +static void ov21_021E0038(UnkStruct_ov21_021DFFF8 *param0); +static void ov21_021E0094(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1); +static BOOL ov21_021E00B8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1); +static void ov21_021E00F4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, int param2, int param3, int param4); +static BOOL ov21_021E015C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, int param2); +static int ov21_021E01CC(int param0, const UnkStruct_ov21_021DF844 *param1); +static int ov21_021E0268(int param0, const UnkStruct_ov21_021DF844 *param1); +static int ov21_021E02F0(int param0, const UnkStruct_ov21_021DF844 *param1); +static void ov21_021DFA84(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3); +static void ov21_021DFACC(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1); +static void ov21_021DFAE8(UnkStruct_ov21_021DF858 *param0, int param1); +static void ov21_021DFD1C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, int param2); +static void ov21_021DFDC8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1); +static void ov21_021DFE0C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3); +static void ov21_021DFF18(UnkStruct_ov21_021DFFF8 *param0); +static void ov21_021DFB50(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2); +static void ov21_021DFBB4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2); +static void ov21_021DFBEC(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5, int param6); +static void ov21_021E0354(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E03EC(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E0478(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E0504(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E0590(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E061C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E06A8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E072C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E07B8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E0844(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E0B24(int param0, int *param1, int *param2); +static void ov21_021DFD00(UnkStruct_ov21_021DF858 *param0); +static void ov21_021E08D0(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E0944(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5); +static void ov21_021E09A4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5, int param6, int param7); +static int ov21_021E0A4C(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0A8C(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0A90(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0A94(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0A98(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0AA8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0AB8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0AC8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0AD8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0ADC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0AEC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0AFC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0B10(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2); +static int ov21_021E0B64(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2, int param3); +static void ov21_021E0BF8(UnkStruct_ov21_021DFFF8 *param0); +static void ov21_021E0C10(UnkStruct_ov21_021DFFF8 *param0); +static void ov21_021E0C30(UnkStruct_ov21_021DFFF8 *param0); + +void ov21_021DF734(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +{ + UnkStruct_ov21_021DF844 *v0; + UnkStruct_ov21_021DF858 *v1; v0 = ov21_021DF7CC(param2, param1); v1 = ov21_021DF80C(param2, param1); @@ -156,16 +155,16 @@ void ov21_021DF734 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021DFA18; } -void ov21_021DF78C (UnkStruct_ov21_021E68F4 * param0) +void ov21_021DF78C(UnkStruct_ov21_021E68F4 *param0) { ov21_021DF844(param0->unk_00); ov21_021DF858(param0->unk_04); } -BOOL ov21_021DF7A0 (UnkStruct_ov21_021E68F4 * param0, int param1) +BOOL ov21_021DF7A0(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021DF844 * v0 = param0->unk_00; - UnkStruct_ov21_021DF858 * v1 = param0->unk_04; + UnkStruct_ov21_021DF844 *v0 = param0->unk_00; + UnkStruct_ov21_021DF858 *v1 = param0->unk_04; int v2; if (v1->unk_04 == 1) { @@ -182,10 +181,10 @@ BOOL ov21_021DF7A0 (UnkStruct_ov21_021E68F4 * param0, int param1) return 0; } -static UnkStruct_ov21_021DF844 * ov21_021DF7CC (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021DF844 *ov21_021DF7CC(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021DF844 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021DF844 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DF844)); @@ -200,10 +199,10 @@ static UnkStruct_ov21_021DF844 * ov21_021DF7CC (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021DF858 * ov21_021DF80C (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021DF858 *ov21_021DF80C(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021DF858 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021DF858 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021DF858)); @@ -215,24 +214,24 @@ static UnkStruct_ov21_021DF858 * ov21_021DF80C (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021DF844 (UnkStruct_ov21_021DF844 * param0) +static void ov21_021DF844(UnkStruct_ov21_021DF844 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021DF858 (UnkStruct_ov21_021DF858 * param0) +static void ov21_021DF858(UnkStruct_ov21_021DF858 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static int ov21_021DF86C (void) +static int ov21_021DF86C(void) { return 0; } -static inline int inline_ov21_021DF870 (int param0, int param1, int param2) +static inline int inline_ov21_021DF870(int param0, int param1, int param2) { int v0; @@ -253,7 +252,7 @@ static inline int inline_ov21_021DF870 (int param0, int param1, int param2) return v0; } -static int ov21_021DF870 (int param0, int param1, int param2, int param3) +static int ov21_021DF870(int param0, int param1, int param2, int param3) { int v0; @@ -262,9 +261,9 @@ static int ov21_021DF870 (int param0, int param1, int param2, int param3) return v0; } -static int ov21_021DF888 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DF888(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021DF844 * v0 = param1; + UnkStruct_ov21_021DF844 *v0 = param1; int v1; v1 = ov21_021D37BC(v0->unk_04); @@ -276,9 +275,9 @@ static int ov21_021DF888 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021DF8B0 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DF8B0(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021DF844 * v0 = param1; + UnkStruct_ov21_021DF844 *v0 = param1; if (param0->unk_0C == 1) { return 1; @@ -291,16 +290,16 @@ static int ov21_021DF8B0 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021DF8C0 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021DF8C0(UnkStruct_ov21_021E6A68 *param0, void *param1) { return 1; } -static int ov21_021DF8C4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DF8C4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DF844 * v0 = param2; - UnkStruct_ov21_021DF858 * v1 = param0; - UnkStruct_ov21_021DFFF8 * v2 = param1->unk_08; + const UnkStruct_ov21_021DF844 *v0 = param2; + UnkStruct_ov21_021DF858 *v1 = param0; + UnkStruct_ov21_021DFFF8 *v2 = param1->unk_08; BOOL v3; switch (param1->unk_00) { @@ -335,11 +334,11 @@ static int ov21_021DF8C4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021DF958 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DF958(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DF844 * v0 = param2; - UnkStruct_ov21_021DF858 * v1 = param0; - UnkStruct_ov21_021DFFF8 * v2 = param1->unk_08; + const UnkStruct_ov21_021DF844 *v0 = param2; + UnkStruct_ov21_021DF858 *v1 = param0; + UnkStruct_ov21_021DFFF8 *v2 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -360,7 +359,7 @@ static int ov21_021DF958 (void * param0, UnkStruct_ov21_021E6B20 * param1, const } break; case 2: - if ((v1->unk_08 == 1)) { + if (v1->unk_08 == 1) { ov21_021E0944(v2, v1, v0, param1->unk_04, v0->unk_0C, v0->unk_14); ov21_021DFBB4(v2, v1, v0); v1->unk_08 = 0; @@ -378,11 +377,11 @@ static int ov21_021DF958 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021DFA18 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021DFA18(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021DF844 * v0 = param2; - UnkStruct_ov21_021DF858 * v1 = param0; - UnkStruct_ov21_021DFFF8 * v2 = param1->unk_08; + const UnkStruct_ov21_021DF844 *v0 = param2; + UnkStruct_ov21_021DF858 *v1 = param0; + UnkStruct_ov21_021DFFF8 *v2 = param1->unk_08; BOOL v3; switch (param1->unk_00) { @@ -414,7 +413,7 @@ static int ov21_021DFA18 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021DFA84 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3) +static void ov21_021DFA84(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3) { ov21_021DFB50(param0, param1, param2); ov21_021DFD1C(param0, param1, param3); @@ -423,17 +422,17 @@ static void ov21_021DFA84 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D ov21_021E08D0(param0, param1, param2, param3, param2->unk_0C, param2->unk_14); } -static void ov21_021DFACC (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1) +static void ov21_021DFACC(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1) { ov21_021E0BF8(param0); ov21_021DFF18(param0); ov21_021DFDC8(param0, param1); } -static void ov21_021DFAE8 (UnkStruct_ov21_021DF858 * param0, int param1) +static void ov21_021DFAE8(UnkStruct_ov21_021DF858 *param0, int param1) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param1); @@ -444,7 +443,7 @@ static void ov21_021DFAE8 (UnkStruct_ov21_021DF858 * param0, int param1) sub_0201C3C0(param0->unk_00->unk_00, 3); } -static void ov21_021DFB50 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2) +static void ov21_021DFB50(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2) { int v0 = ov21_021D37BC(param2->unk_04); int v1; @@ -460,7 +459,7 @@ static void ov21_021DFB50 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D } } -static void ov21_021DFBB4 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2) +static void ov21_021DFBB4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2) { int v0 = ov21_021D37BC(param2->unk_04); int v1; @@ -470,7 +469,7 @@ static void ov21_021DFBB4 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D ov21_021DFBEC(param0, param1, param2, v0, param2->unk_0C, v2, 2); } -static void ov21_021DFBEC (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5, int param6) +static void ov21_021DFBEC(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5, int param6) { GF_ASSERT(param6 <= 2); @@ -514,7 +513,7 @@ static void ov21_021DFBEC (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D } } -static void ov21_021DFD00 (UnkStruct_ov21_021DF858 * param0) +static void ov21_021DFD00(UnkStruct_ov21_021DF858 *param0) { int v0; @@ -523,10 +522,10 @@ static void ov21_021DFD00 (UnkStruct_ov21_021DF858 * param0) } } -static void ov21_021DFD1C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, int param2) +static void ov21_021DFD1C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_10[0] = sub_02009A4C(v0->unk_13C[0], v1, 122, 1, 122 + 14000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -542,9 +541,9 @@ static void ov21_021DFD1C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D param0->unk_10[3] = sub_02009BC4(v0->unk_13C[3], v1, 121, 1, 121 + 14000, 3, param2); } -static void ov21_021DFDC8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1) +static void ov21_021DFDC8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_10[0]); sub_0200A6DC(param0->unk_10[1]); @@ -554,11 +553,11 @@ static void ov21_021DFDC8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D sub_02009D68(v0->unk_13C[3], param0->unk_10[3]); } -static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3) +static void ov21_021DFE0C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3, v4; int v5; @@ -601,7 +600,7 @@ static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D } } -static void ov21_021DFF18 (UnkStruct_ov21_021DFFF8 * param0) +static void ov21_021DFF18(UnkStruct_ov21_021DFFF8 *param0) { int v0; @@ -612,7 +611,7 @@ static void ov21_021DFF18 (UnkStruct_ov21_021DFFF8 * param0) sub_02021BD4(param0->unk_BC); } -static void ov21_021DFF38 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, BOOL param3) +static void ov21_021DFF38(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, BOOL param3) { ov21_021DFFF8(param0); @@ -627,7 +626,7 @@ static void ov21_021DFF38 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D ov21_021E0078(param1); } -static BOOL ov21_021DFFA8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, BOOL param3) +static BOOL ov21_021DFFA8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, BOOL param3) { BOOL v0; @@ -650,7 +649,7 @@ static BOOL ov21_021DFFA8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D return v0; } -static void ov21_021DFFF8 (UnkStruct_ov21_021DFFF8 * param0) +static void ov21_021DFFF8(UnkStruct_ov21_021DFFF8 *param0) { int v0; @@ -665,7 +664,7 @@ static void ov21_021DFFF8 (UnkStruct_ov21_021DFFF8 * param0) } } -static void ov21_021E0038 (UnkStruct_ov21_021DFFF8 * param0) +static void ov21_021E0038(UnkStruct_ov21_021DFFF8 *param0) { int v0; @@ -680,7 +679,7 @@ static void ov21_021E0038 (UnkStruct_ov21_021DFFF8 * param0) } } -static void ov21_021E0078 (UnkStruct_ov21_021DF858 * param0) +static void ov21_021E0078(UnkStruct_ov21_021DF858 *param0) { int v0; @@ -689,7 +688,7 @@ static void ov21_021E0078 (UnkStruct_ov21_021DF858 * param0) } } -static void ov21_021E0094 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1) +static void ov21_021E0094(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1) { int v0; @@ -698,7 +697,7 @@ static void ov21_021E0094 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D } } -static BOOL ov21_021E00B8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1) +static BOOL ov21_021E00B8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1) { int v0; BOOL v1; @@ -718,7 +717,7 @@ static BOOL ov21_021E00B8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D return v1; } -static void ov21_021E00F4 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, int param2, int param3, int param4) +static void ov21_021E00F4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, int param2, int param3, int param4) { int v0; int v1; @@ -733,7 +732,7 @@ static void ov21_021E00F4 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D param0->unk_A8[param4] = v1 - v3; } -static BOOL ov21_021E015C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, int param2) +static BOOL ov21_021E015C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, int param2) { BOOL v0; VecFx32 v1; @@ -750,7 +749,7 @@ static BOOL ov21_021E015C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D return v0; } -static int ov21_021E01CC (int param0, const UnkStruct_ov21_021DF844 * param1) +static int ov21_021E01CC(int param0, const UnkStruct_ov21_021DF844 *param1) { switch (param0) { case 201: @@ -778,7 +777,7 @@ static int ov21_021E01CC (int param0, const UnkStruct_ov21_021DF844 * param1) return ov21_021E02F0(param0, param1); } -static int ov21_021E0268 (int param0, const UnkStruct_ov21_021DF844 * param1) +static int ov21_021E0268(int param0, const UnkStruct_ov21_021DF844 *param1) { switch (param0) { case 201: @@ -798,7 +797,7 @@ static int ov21_021E0268 (int param0, const UnkStruct_ov21_021DF844 * param1) return ov21_021D33E0(param1->unk_04, param0); } -static int ov21_021E02F0 (int param0, const UnkStruct_ov21_021DF844 * param1) +static int ov21_021E02F0(int param0, const UnkStruct_ov21_021DF844 *param1) { int v0; int v1; @@ -839,7 +838,7 @@ static int ov21_021E02F0 (int param0, const UnkStruct_ov21_021DF844 * param1) return 0; } -static void ov21_021E0354 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E0354(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0; int v1, v2; @@ -858,7 +857,7 @@ static void ov21_021E0354 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D GF_ASSERT(v0 != -1); } -static void ov21_021E03EC (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E03EC(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0, v1; int v2; @@ -877,7 +876,7 @@ static void ov21_021E03EC (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D GF_ASSERT(v2 != -1); } -static void ov21_021E0478 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E0478(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0, v1; int v2; @@ -896,7 +895,7 @@ static void ov21_021E0478 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D GF_ASSERT(v2 != -1); } -static void ov21_021E0504 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E0504(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0, v1; int v2; @@ -915,7 +914,7 @@ static void ov21_021E0504 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D GF_ASSERT(v2 != -1); } -static void ov21_021E0590 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E0590(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0, v1; int v2; @@ -934,7 +933,7 @@ static void ov21_021E0590 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D GF_ASSERT(v2 != -1); } -static void ov21_021E061C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E061C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0, v1; int v2; @@ -953,7 +952,7 @@ static void ov21_021E061C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D GF_ASSERT(v2 != -1); } -static void ov21_021E06A8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E06A8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0, v1; int v2; @@ -972,7 +971,7 @@ static void ov21_021E06A8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D GF_ASSERT(v2 != 15); } -static void ov21_021E072C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E072C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0, v1; int v2; @@ -991,7 +990,7 @@ static void ov21_021E072C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D GF_ASSERT(v2 != -1); } -static void ov21_021E07B8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E07B8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0, v1; int v2; @@ -1010,7 +1009,7 @@ static void ov21_021E07B8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D GF_ASSERT(v2 != -1); } -static void ov21_021E0844 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E0844(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0, v1; int v2; @@ -1029,7 +1028,7 @@ static void ov21_021E0844 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D GF_ASSERT(v2 != -1); } -static void ov21_021E08D0 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E08D0(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0; int v1; @@ -1042,7 +1041,7 @@ static void ov21_021E08D0 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D ov21_021E09A4(param0, param1, param2, param3, param4, v0, v1, 1); } -static void ov21_021E0944 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5) +static void ov21_021E0944(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5) { int v0; int v1; @@ -1056,11 +1055,11 @@ static void ov21_021E0944 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D ov21_021E09A4(param0, param1, param2, param3, param4, v0, v1, v2); } -static void ov21_021E09A4 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3, int param4, int param5, int param6, int param7) +static void ov21_021E09A4(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3, int param4, int param5, int param6, int param7) { - Window * v0; + Window *v0; UnkStruct_ov21_021D4CB8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3; int v4; @@ -1091,7 +1090,7 @@ static void ov21_021E09A4 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D ov21_021D4DA0(v0); } -static int ov21_021E0A4C (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0A4C(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; int v1; @@ -1115,7 +1114,7 @@ static int ov21_021E0A4C (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static int ov21_021E0A8C (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0A8C(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; @@ -1123,7 +1122,7 @@ static int ov21_021E0A8C (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static int ov21_021E0A90 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0A90(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; @@ -1131,14 +1130,14 @@ static int ov21_021E0A90 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static int ov21_021E0A94 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0A94(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0 = 21; return v0; } -static int ov21_021E0A98 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0A98(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; int v1 = ov21_021D33A4(param1->unk_04, param2); @@ -1147,7 +1146,7 @@ static int ov21_021E0A98 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static int ov21_021E0AA8 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0AA8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; int v1 = ov21_021D33BC(param1->unk_04, param2); @@ -1157,7 +1156,7 @@ static int ov21_021E0AA8 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static int ov21_021E0AB8 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0AB8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; int v1 = ov21_021D3374(param1->unk_04, param2); @@ -1167,7 +1166,7 @@ static int ov21_021E0AB8 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static int ov21_021E0AC8 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0AC8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; int v1 = ov21_021D338C(param1->unk_04, param2); @@ -1176,13 +1175,13 @@ static int ov21_021E0AC8 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static int ov21_021E0AD8 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0AD8(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0 = 20; return v0; } -static int ov21_021E0ADC (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0ADC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; int v1 = ov21_021D3404(param1->unk_04, param2); @@ -1191,7 +1190,7 @@ static int ov21_021E0ADC (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static int ov21_021E0AEC (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0AEC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; int v1 = ov21_021D3410(param1->unk_04, 492, param2); @@ -1200,7 +1199,7 @@ static int ov21_021E0AEC (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static int ov21_021E0AFC (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0AFC(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; int v1 = ov21_021D3410(param1->unk_04, 487, param2); @@ -1209,7 +1208,7 @@ static int ov21_021E0AFC (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static int ov21_021E0B10 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2) +static int ov21_021E0B10(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2) { int v0; int v1 = ov21_021D3410(param1->unk_04, 479, param2); @@ -1218,7 +1217,7 @@ static int ov21_021E0B10 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static inline int inline_ov21_021E00F4 (int param0, int param1) +static inline int inline_ov21_021E00F4(int param0, int param1) { if (param0 == 0) { return param1; @@ -1233,7 +1232,7 @@ static inline int inline_ov21_021E00F4 (int param0, int param1) return param1; } -static void ov21_021E0B24 (int param0, int * param1, int * param2) +static void ov21_021E0B24(int param0, int *param1, int *param2) { int v0 = 0; int v1 = 0; @@ -1260,7 +1259,7 @@ static void ov21_021E0B24 (int param0, int * param1, int * param2) *param2 = v1; } -static int ov21_021E0B64 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21_021DF844 * param1, int param2, int param3) +static int ov21_021E0B64(UnkStruct_ov21_021DF858 *param0, const UnkStruct_ov21_021DF844 *param1, int param2, int param3) { int v0; @@ -1311,7 +1310,7 @@ static int ov21_021E0B64 (UnkStruct_ov21_021DF858 * param0, const UnkStruct_ov21 return v0; } -static void ov21_021E0BF8 (UnkStruct_ov21_021DFFF8 * param0) +static void ov21_021E0BF8(UnkStruct_ov21_021DFFF8 *param0) { int v0; @@ -1320,7 +1319,7 @@ static void ov21_021E0BF8 (UnkStruct_ov21_021DFFF8 * param0) } } -static void ov21_021E0C10 (UnkStruct_ov21_021DFFF8 * param0) +static void ov21_021E0C10(UnkStruct_ov21_021DFFF8 *param0) { sub_02021CAC(param0->unk_BC, 0); @@ -1328,7 +1327,7 @@ static void ov21_021E0C10 (UnkStruct_ov21_021DFFF8 * param0) param0->unk_C4 = 1; } -static void ov21_021E0C30 (UnkStruct_ov21_021DFFF8 * param0) +static void ov21_021E0C30(UnkStruct_ov21_021DFFF8 *param0) { if (param0->unk_C4) { param0->unk_C0--; diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c index 32cbe0576c..44c65330d9 100644 --- a/src/overlay021/ov21_021E0C68.c +++ b/src/overlay021/ov21_021E0C68.c @@ -1,116 +1,114 @@ +#include "overlay021/ov21_021E0C68.h" + #include #include -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021D5600.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D2648.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "heap.h" +#include "message.h" +#include "strbuf.h" #include "unk_02002B7C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "message.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021D5600.h" -#include "overlay021/ov21_021E0C68.h" -#include "overlay021/ov21_021E29DC.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; int unk_08; int unk_0C; - const UnkStruct_ov21_021E68F4 * unk_10; + const UnkStruct_ov21_021E68F4 *unk_10; int unk_14; int unk_18; int unk_1C; } UnkStruct_ov21_021E0D68; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021E0D7C; typedef struct { - GraphicElementData * unk_00; - UnkStruct_ov21_021D4CA0 * unk_04; - UnkStruct_02009DC8 * unk_08[4]; + GraphicElementData *unk_00; + UnkStruct_ov21_021D4CA0 *unk_04; + UnkStruct_02009DC8 *unk_08[4]; UnkStruct_ov21_021D2648 unk_18; UnkStruct_ov21_021D2648 unk_38; } UnkStruct_ov21_021E14D4; -static UnkStruct_ov21_021E0D68 * ov21_021E0D04(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021E0D7C * ov21_021E0D40(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021E0D68(UnkStruct_ov21_021E0D68 * param0); -static void ov21_021E0D7C(UnkStruct_ov21_021E0D7C * param0); +static UnkStruct_ov21_021E0D68 *ov21_021E0D04(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E0D7C *ov21_021E0D40(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E0D68(UnkStruct_ov21_021E0D68 *param0); +static void ov21_021E0D7C(UnkStruct_ov21_021E0D7C *param0); static int ov21_021E0D90(void); -static int ov21_021E0D94(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E0D98(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E0DA8(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E0DAC(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E0E8C(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E0E90(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021E14D4(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3); -static BOOL ov21_021E1550(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3); -static void ov21_021E15AC(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3); -static BOOL ov21_021E1630(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3); -static void ov21_021E16A8(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3); -static BOOL ov21_021E1730(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3); -static void ov21_021E17DC(UnkStruct_ov21_021E0D7C * param0); -static void ov21_021E17AC(UnkStruct_ov21_021E14D4 * param0); -static void ov21_021E17C4(UnkStruct_ov21_021E14D4 * param0); -static void ov21_021E17EC(UnkStruct_ov21_021E14D4 * param0, int param1, int param2, int param3); -static BOOL ov21_021E1808(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1); -static void ov21_021E1824(UnkStruct_ov21_021E14D4 * param0); -static BOOL ov21_021E1840(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1); -static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, int param3); -static void ov21_021E0F94(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1); -static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C * param0, int param1); -static void ov21_021E10D0(UnkStruct_ov21_021E0D7C * param0, const UnkStruct_ov21_021E0D68 * param1, int param2); -static void ov21_021E1188(UnkStruct_ov21_021E0D7C * param0, int param1, int param2, int param3, int param4); +static int ov21_021E0D94(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E0D98(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E0DA8(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E0DAC(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E0E8C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E0E90(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021E14D4(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3); +static BOOL ov21_021E1550(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3); +static void ov21_021E15AC(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3); +static BOOL ov21_021E1630(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3); +static void ov21_021E16A8(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3); +static BOOL ov21_021E1730(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3); +static void ov21_021E17DC(UnkStruct_ov21_021E0D7C *param0); +static void ov21_021E17AC(UnkStruct_ov21_021E14D4 *param0); +static void ov21_021E17C4(UnkStruct_ov21_021E14D4 *param0); +static void ov21_021E17EC(UnkStruct_ov21_021E14D4 *param0, int param1, int param2, int param3); +static BOOL ov21_021E1808(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1); +static void ov21_021E1824(UnkStruct_ov21_021E14D4 *param0); +static BOOL ov21_021E1840(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1); +static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, int param3); +static void ov21_021E0F94(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1); +static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1); +static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int param2); +static void ov21_021E1188(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3, int param4); static int ov21_021E185C(int param0); -static void ov21_021E18A0(UnkStruct_ov21_021E0D7C * param0, int param1, int param2, int param3); -static void ov21_021E18DC(UnkStruct_ov21_021E0D7C * param0, int param1, int param2, int param3); -static void ov21_021E136C(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, int param3); -static void ov21_021E14BC(UnkStruct_ov21_021E14D4 * param0); -static Window * ov21_021E1460(UnkStruct_ov21_021E0D7C * param0, int param1, int param2); -static void ov21_021E127C(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, int param2); -static void ov21_021E1328(UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1); -static void ov21_021E11DC(UnkStruct_ov21_021E0D7C * param0, const UnkStruct_ov21_021E0D68 * param1, int param2); -static void ov21_021E1210(UnkStruct_ov21_021E0D7C * param0); -static void ov21_021E1228(UnkStruct_ov21_021E0D7C * param0, const UnkStruct_ov21_021E0D68 * param1); -static void ov21_021E1260(UnkStruct_ov21_021E0D7C * param0); - -void ov21_021E0C68 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) -{ - UnkStruct_ov21_021E0D68 * v0; - UnkStruct_ov21_021E0D7C * v1; +static void ov21_021E18A0(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3); +static void ov21_021E18DC(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3); +static void ov21_021E136C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, int param3); +static void ov21_021E14BC(UnkStruct_ov21_021E14D4 *param0); +static Window *ov21_021E1460(UnkStruct_ov21_021E0D7C *param0, int param1, int param2); +static void ov21_021E127C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, int param2); +static void ov21_021E1328(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1); +static void ov21_021E11DC(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int param2); +static void ov21_021E1210(UnkStruct_ov21_021E0D7C *param0); +static void ov21_021E1228(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1); +static void ov21_021E1260(UnkStruct_ov21_021E0D7C *param0); + +void ov21_021E0C68(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +{ + UnkStruct_ov21_021E0D68 *v0; + UnkStruct_ov21_021E0D7C *v1; v0 = ov21_021E0D04(param2, param1); v1 = ov21_021E0D40(param2, param1); @@ -127,35 +125,35 @@ void ov21_021E0C68 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021E0E90; } -void ov21_021E0CC0 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021E0CC0(UnkStruct_ov21_021E68F4 *param0) { ov21_021E0D68(param0->unk_00); ov21_021E0D7C(param0->unk_04); } -void ov21_021E0CD4 (UnkStruct_ov21_021E68F4 * param0, int param1, int param2) +void ov21_021E0CD4(UnkStruct_ov21_021E68F4 *param0, int param1, int param2) { - UnkStruct_ov21_021E0D68 * v0 = param0->unk_00; + UnkStruct_ov21_021E0D68 *v0 = param0->unk_00; v0->unk_08 = param1; v0->unk_0C = param2; } -void ov21_021E0CDC (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021E0CDC(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021E0D68 * v0 = param0->unk_00; + UnkStruct_ov21_021E0D68 *v0 = param0->unk_00; v0->unk_14 = param1; } -BOOL ov21_021E0CE4 (UnkStruct_ov21_021E68F4 * param0) +BOOL ov21_021E0CE4(UnkStruct_ov21_021E68F4 *param0) { - UnkStruct_ov21_021E0D68 * v0 = param0->unk_00; + UnkStruct_ov21_021E0D68 *v0 = param0->unk_00; return 0; } -BOOL ov21_021E0CE8 (UnkStruct_ov21_021E68F4 * param0, int param1) +BOOL ov21_021E0CE8(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021E0D68 * v0 = param0->unk_00; + UnkStruct_ov21_021E0D68 *v0 = param0->unk_00; BOOL v1 = 1; if (param1 == 1) { @@ -168,18 +166,18 @@ BOOL ov21_021E0CE8 (UnkStruct_ov21_021E68F4 * param0, int param1) return v1; } -void ov21_021E0CF8 (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021E0CF8(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021E0D68 * v0 = param0->unk_00; + UnkStruct_ov21_021E0D68 *v0 = param0->unk_00; v0->unk_18 = param1; v0->unk_1C = 0; } -static UnkStruct_ov21_021E0D68 * ov21_021E0D04 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E0D68 *ov21_021E0D04(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E0D68 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E0D68 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E0D68)); @@ -196,10 +194,10 @@ static UnkStruct_ov21_021E0D68 * ov21_021E0D04 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021E0D7C * ov21_021E0D40 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E0D7C *ov21_021E0D40(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E0D7C * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E0D7C *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E0D7C)); @@ -211,31 +209,31 @@ static UnkStruct_ov21_021E0D7C * ov21_021E0D40 (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021E0D68 (UnkStruct_ov21_021E0D68 * param0) +static void ov21_021E0D68(UnkStruct_ov21_021E0D68 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E0D7C (UnkStruct_ov21_021E0D7C * param0) +static void ov21_021E0D7C(UnkStruct_ov21_021E0D7C *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static int ov21_021E0D90 (void) +static int ov21_021E0D90(void) { return 0; } -static int ov21_021E0D94 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E0D94(UnkStruct_ov21_021E6A68 *param0, void *param1) { return 1; } -static int ov21_021E0D98 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E0D98(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E0D68 * v0 = param1; + UnkStruct_ov21_021E0D68 *v0 = param1; if (param0->unk_0C == 1) { return 1; @@ -248,16 +246,16 @@ static int ov21_021E0D98 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021E0DA8 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E0DA8(UnkStruct_ov21_021E6A68 *param0, void *param1) { return 1; } -static int ov21_021E0DAC (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E0DAC(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E0D68 * v0 = param2; - UnkStruct_ov21_021E0D7C * v1 = param0; - UnkStruct_ov21_021E14D4 * v2 = param1->unk_08; + const UnkStruct_ov21_021E0D68 *v0 = param2; + UnkStruct_ov21_021E0D7C *v1 = param0; + UnkStruct_ov21_021E14D4 *v2 = param1->unk_08; BOOL v3; switch (param1->unk_00) { @@ -311,16 +309,16 @@ static int ov21_021E0DAC (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E0E8C (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E0E8C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { return 0; } -static int ov21_021E0E90 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E0E90(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E0D68 * v0 = param2; - UnkStruct_ov21_021E0D7C * v1 = param0; - UnkStruct_ov21_021E14D4 * v2 = param1->unk_08; + const UnkStruct_ov21_021E0D68 *v0 = param2; + UnkStruct_ov21_021E0D7C *v1 = param0; + UnkStruct_ov21_021E14D4 *v2 = param1->unk_08; BOOL v3; switch (param1->unk_00) { @@ -374,7 +372,7 @@ static int ov21_021E0E90 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021E0F4C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, int param3) +static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, int param3) { ov21_021E11DC(param1, param2, param3); ov21_021E1228(param1, param2); @@ -384,7 +382,7 @@ static void ov21_021E0F4C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E ov21_021E10D0(param1, param2, param3); } -static void ov21_021E0F94 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1) +static void ov21_021E0F94(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1) { ov21_021E14BC(param0); BGL_FillWindow(¶m1->unk_00->unk_04, 0); @@ -393,10 +391,10 @@ static void ov21_021E0F94 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E sub_02019EBC(param1->unk_00->unk_00, 1); } -static void ov21_021E0FBC (UnkStruct_ov21_021E0D7C * param0, int param1) +static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param1); @@ -421,10 +419,10 @@ static void ov21_021E0FBC (UnkStruct_ov21_021E0D7C * param0, int param1) sub_0201C3C0(param0->unk_00->unk_00, 3); } -static void ov21_021E10D0 (UnkStruct_ov21_021E0D7C * param0, const UnkStruct_ov21_021E0D68 * param1, int param2) +static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int param2) { - Strbuf* v0 = Strbuf_Init(64, param2); - MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param2); + Strbuf *v0 = Strbuf_Init(64, param2); + MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param2); int v2 = ov21_021D37BC(param1->unk_04); int v3; int v4; @@ -450,9 +448,9 @@ static void ov21_021E10D0 (UnkStruct_ov21_021E0D7C * param0, const UnkStruct_ov2 ov21_021E18DC(param0, param2, v2, param1->unk_18); } -static void ov21_021E1188 (UnkStruct_ov21_021E0D7C * param0, int param1, int param2, int param3, int param4) +static void ov21_021E1188(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3, int param4) { - Strbuf* v0 = ov21_021D56BC(param2, param3, param4, param1); + Strbuf *v0 = ov21_021D56BC(param2, param3, param4, param1); u32 v1 = sub_02002EB4(0, v0, 0); u32 v2 = (v1 < 240) ? 128 - v1 / 2 : 8; @@ -460,39 +458,39 @@ static void ov21_021E1188 (UnkStruct_ov21_021E0D7C * param0, int param1, int par ov21_021D5600(v0); } -static void ov21_021E11DC (UnkStruct_ov21_021E0D7C * param0, const UnkStruct_ov21_021E0D68 * param1, int param2) +static void ov21_021E11DC(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int param2) { ov21_021D1778(param0->unk_00, param1->unk_04, param2, ov21_021D375C(param1->unk_04), (172 * FX32_ONE), (32 * FX32_ONE)); ov21_021D238C(param0->unk_00, 0); } -static void ov21_021E1210 (UnkStruct_ov21_021E0D7C * param0) +static void ov21_021E1210(UnkStruct_ov21_021E0D7C *param0) { ov21_021D23C0(param0->unk_00, 0); ov21_021D2360(param0->unk_00, GX_OAM_MODE_NORMAL); } -static void ov21_021E1228 (UnkStruct_ov21_021E0D7C * param0, const UnkStruct_ov21_021E0D68 * param1) +static void ov21_021E1228(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1) { - Sprite * v0 = ov21_021D2170(param0->unk_00); + Sprite *v0 = ov21_021D2170(param0->unk_00); int v1 = ov21_021D37BC(param1->unk_04); ov21_021D1890(param0->unk_00, param1->unk_04, v1, 2, 48, 72); sub_02007DEC(v0, 6, 0); } -static void ov21_021E1260 (UnkStruct_ov21_021E0D7C * param0) +static void ov21_021E1260(UnkStruct_ov21_021E0D7C *param0) { - Sprite * v0 = ov21_021D2170(param0->unk_00); + Sprite *v0 = ov21_021D2170(param0->unk_00); sub_02007DEC(v0, 6, 1); sub_02008780(v0); } -static void ov21_021E127C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, int param2) +static void ov21_021E127C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_08[0] = sub_02009A4C(v0->unk_13C[0], v1, 90, 1, 90 + 4000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -508,9 +506,9 @@ static void ov21_021E127C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E param0->unk_08[3] = sub_02009BC4(v0->unk_13C[3], v1, 89, 1, 89 + 4000, 3, param2); } -static void ov21_021E1328 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1) +static void ov21_021E1328(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_08[0]); sub_0200A6DC(param0->unk_08[1]); @@ -521,15 +519,15 @@ static void ov21_021E1328 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E sub_02009D68(v0->unk_13C[3], param0->unk_08[3]); } -static void ov21_021E136C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, int param3) +static void ov21_021E136C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, int param3) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3 = ov21_021D37BC(param2->unk_04); - Window * v4; + Window *v4; UnkStruct_ov21_021D4CB8 v5; - UnkStruct_02009DC8 * v6; + UnkStruct_02009DC8 *v6; sub_020093B4(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -568,10 +566,10 @@ static void ov21_021E136C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E ov21_021D4DA0(v4); } -static Window * ov21_021E1460 (UnkStruct_ov21_021E0D7C * param0, int param1, int param2) +static Window *ov21_021E1460(UnkStruct_ov21_021E0D7C *param0, int param1, int param2) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ov21_021D4D6C(param0->unk_00->unk_14C, 18, 2); v1 = ov21_021D566C(param1, GAME_LANGUAGE, param2); @@ -587,14 +585,14 @@ static Window * ov21_021E1460 (UnkStruct_ov21_021E0D7C * param0, int param1, int return v0; } -static void ov21_021E14BC (UnkStruct_ov21_021E14D4 * param0) +static void ov21_021E14BC(UnkStruct_ov21_021E14D4 *param0) { sub_02021BD4(param0->unk_00); param0->unk_00 = NULL; ov21_021D4D1C(param0->unk_04); } -static void ov21_021E14D4 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3) +static void ov21_021E14D4(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3) { ov21_021D2360(param1->unk_00, GX_OAM_MODE_XLU); ov21_021E17AC(param0); @@ -610,7 +608,7 @@ static void ov21_021E14D4 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E ov21_021E17DC(param1); } -static BOOL ov21_021E1550 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3) +static BOOL ov21_021E1550(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3) { BOOL v0; @@ -635,7 +633,7 @@ static BOOL ov21_021E1550 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E return v0; } -static void ov21_021E15AC (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3) +static void ov21_021E15AC(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3) { ov21_021E17AC(param0); @@ -653,7 +651,7 @@ static void ov21_021E15AC (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E } } -static BOOL ov21_021E1630 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3) +static BOOL ov21_021E1630(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3) { BOOL v0[3]; int v1; @@ -690,7 +688,7 @@ static BOOL ov21_021E1630 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E return 0; } -static void ov21_021E16A8 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3) +static void ov21_021E16A8(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3) { ov21_021E17AC(param0); ov21_021D2360(param1->unk_00, GX_OAM_MODE_XLU); @@ -708,7 +706,7 @@ static void ov21_021E16A8 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E } } -static BOOL ov21_021E1730 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, BOOL param3) +static BOOL ov21_021E1730(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, BOOL param3) { BOOL v0[2]; int v1; @@ -745,29 +743,29 @@ static BOOL ov21_021E1730 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E return 0; } -static void ov21_021E17AC (UnkStruct_ov21_021E14D4 * param0) +static void ov21_021E17AC(UnkStruct_ov21_021E14D4 *param0) { sub_02021FE0(param0->unk_00, GX_OAM_MODE_XLU); sub_02012AF0(param0->unk_04->unk_00, GX_OAM_MODE_XLU); } -static void ov21_021E17C4 (UnkStruct_ov21_021E14D4 * param0) +static void ov21_021E17C4(UnkStruct_ov21_021E14D4 *param0) { sub_02021FE0(param0->unk_00, GX_OAM_MODE_NORMAL); sub_02012AF0(param0->unk_04->unk_00, GX_OAM_MODE_NORMAL); } -static void ov21_021E17DC (UnkStruct_ov21_021E0D7C * param0) +static void ov21_021E17DC(UnkStruct_ov21_021E0D7C *param0) { ov21_021D24FC(param0->unk_00, ¶m0->unk_00->unk_168); } -static void ov21_021E17EC (UnkStruct_ov21_021E14D4 * param0, int param1, int param2, int param3) +static void ov21_021E17EC(UnkStruct_ov21_021E14D4 *param0, int param1, int param2, int param3) { ov21_021D2648(¶m0->unk_18, 48, param1, 72, param2, param3); } -static BOOL ov21_021E1808 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1) +static BOOL ov21_021E1808(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1) { BOOL v0; @@ -777,12 +775,12 @@ static BOOL ov21_021E1808 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E return v0; } -static void ov21_021E1824 (UnkStruct_ov21_021E14D4 * param0) +static void ov21_021E1824(UnkStruct_ov21_021E14D4 *param0) { ov21_021D2648(¶m0->unk_38, 172, 170, 32, 82, 4); } -static BOOL ov21_021E1840 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1) +static BOOL ov21_021E1840(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1) { BOOL v0; @@ -792,7 +790,7 @@ static BOOL ov21_021E1840 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E return v0; } -static int ov21_021E185C (int param0) +static int ov21_021E185C(int param0) { int v0; @@ -823,17 +821,17 @@ static int ov21_021E185C (int param0) return v0; } -static void ov21_021E18A0 (UnkStruct_ov21_021E0D7C * param0, int param1, int param2, int param3) +static void ov21_021E18A0(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3) { - Strbuf* v0 = ov21_021D561C(param2, param3, param1); + Strbuf *v0 = ov21_021D561C(param2, param3, param1); sub_0201D78C(¶m0->unk_00->unk_04, 0, v0, 120, 96, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov21_021D5600(v0); } -static void ov21_021E18DC (UnkStruct_ov21_021E0D7C * param0, int param1, int param2, int param3) +static void ov21_021E18DC(UnkStruct_ov21_021E0D7C *param0, int param1, int param2, int param3) { - Strbuf* v0 = ov21_021D566C(param2, param3, param1); + Strbuf *v0 = ov21_021D566C(param2, param3, param1); u32 v1; v1 = 240 - sub_02002D7C(0, v0, 0); diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c index 1a99b24d55..6ea41bc73c 100644 --- a/src/overlay021/ov21_021E1924.c +++ b/src/overlay021/ov21_021E1924.c @@ -1,17 +1,25 @@ +#include "overlay021/ov21_021E1924.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4340.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021D5600.h" +#include "overlay021/ov21_021DE668.h" +#include "overlay021/ov21_021E0C68.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4660.h" @@ -19,55 +27,46 @@ #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021DE6D4.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "core_sys.h" +#include "heap.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201F834.h" #include "unk_020218BC.h" #include "unk_02023FCC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4340.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021D5600.h" -#include "overlay021/ov21_021DE668.h" -#include "overlay021/ov21_021E0C68.h" -#include "overlay021/ov21_021E1924.h" -#include "overlay021/ov21_021E29DC.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; - UnkStruct_ov21_021DE6D4 * unk_08; - UnkStruct_ov21_021E68F4 * unk_0C; - UnkStruct_ov21_021E68F4 * unk_10; - const UnkStruct_ov21_021E68F4 * unk_14; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; + UnkStruct_ov21_021DE6D4 *unk_08; + UnkStruct_ov21_021E68F4 *unk_0C; + UnkStruct_ov21_021E68F4 *unk_10; + const UnkStruct_ov21_021E68F4 *unk_14; } UnkStruct_ov21_021E1A7C; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021E1A90; typedef struct { - void * unk_00; - void * unk_04; + void *unk_00; + void *unk_04; } UnkStruct_ov21_021E1E8C; typedef struct { - UnkStruct_02023FCC * unk_00; - TouchScreenHitTable * unk_04; + UnkStruct_02023FCC *unk_00; + TouchScreenHitTable *unk_04; UnkStruct_ov21_021E1E8C unk_08; int unk_10; int unk_14[8]; @@ -76,55 +75,55 @@ typedef struct { } UnkStruct_ov21_021E1E74; typedef struct { - GraphicElementData * unk_00[8]; - UnkStruct_ov21_021D4CA0 * unk_20[8]; - UnkStruct_02009DC8 * unk_40[4]; - GraphicElementData * unk_50[8]; - UnkStruct_02009DC8 * unk_70[4]; + GraphicElementData *unk_00[8]; + UnkStruct_ov21_021D4CA0 *unk_20[8]; + UnkStruct_02009DC8 *unk_40[4]; + GraphicElementData *unk_50[8]; + UnkStruct_02009DC8 *unk_70[4]; int unk_80[8]; - void * unk_A0[8]; + void *unk_A0[8]; u32 unk_C0; } UnkStruct_ov21_021E2588; -static UnkStruct_ov21_021E1A7C * ov21_021E199C(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021E1A90 * ov21_021E19FC(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021E1A24(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021E1A7C(UnkStruct_ov21_021E1A7C * param0); -static void ov21_021E1A90(UnkStruct_ov21_021E1A90 * param0); -static void ov21_021E1AA4(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021E1A7C *ov21_021E199C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E1A90 *ov21_021E19FC(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E1A24(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E1A7C(UnkStruct_ov21_021E1A7C *param0); +static void ov21_021E1A90(UnkStruct_ov21_021E1A90 *param0); +static void ov21_021E1AA4(UnkStruct_ov21_021D4660 *param0); static int ov21_021E1ACC(void); -static int ov21_021E1AD0(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E1B14(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E1B54(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E1B68(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E1BFC(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E1CB8(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021E2588(UnkStruct_ov21_021E2588 * param0); -static void ov21_021E25C0(UnkStruct_ov21_021E2588 * param0); -static void ov21_021E25F8(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, const UnkStruct_ov21_021E1A7C * param2, BOOL param3); -static BOOL ov21_021E2664(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, const UnkStruct_ov21_021E1A7C * param2, BOOL param3); -static void ov21_021E1D40(UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1, int param2); -static void ov21_021E1E00(UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1); -static void ov21_021E1E74(UnkStruct_ov21_021E1E74 * param0); -static void ov21_021E1E8C(u32 param0, u32 param1, void * param2); -static void ov21_021E26A0(UnkStruct_ov21_021E1A90 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10); -static void ov21_021E274C(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4); -static void ov21_021E28D0(UnkStruct_ov21_021E2588 * param0, const UnkStruct_ov21_021E1E74 * param1); -static void ov21_021E29A4(GraphicElementData * param0, int param1, int param2); -static void ov21_021E2968(UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1); -static void ov21_021E2014(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2); -static void ov21_021E2044(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2); -static void ov21_021E20A4(UnkStruct_ov21_021E1A90 * param0, int param1); -static void ov21_021E2180(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2); -static void ov21_021E226C(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1); -static void ov21_021E22C8(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2); -static void ov21_021E2458(UnkStruct_ov21_021E2588 * param0); -static void ov21_021E2478(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2); -static void ov21_021E256C(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1); -static void ov21_021E275C(UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1, int param2); -static void ov21_021E27C0(UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1, int param2, int param3); -static void ov21_021E2864(UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1); -static void ov21_021E28A8(UnkStruct_ov21_021E1E74 * param0); +static int ov21_021E1AD0(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E1B14(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E1B54(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E1B68(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E1BFC(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E1CB8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021E2588(UnkStruct_ov21_021E2588 *param0); +static void ov21_021E25C0(UnkStruct_ov21_021E2588 *param0); +static void ov21_021E25F8(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, const UnkStruct_ov21_021E1A7C *param2, BOOL param3); +static BOOL ov21_021E2664(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, const UnkStruct_ov21_021E1A7C *param2, BOOL param3); +static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, int param2); +static void ov21_021E1E00(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1); +static void ov21_021E1E74(UnkStruct_ov21_021E1E74 *param0); +static void ov21_021E1E8C(u32 param0, u32 param1, void *param2); +static void ov21_021E26A0(UnkStruct_ov21_021E1A90 *param0, GraphicElementData *param1, UnkStruct_ov21_021D4CA0 *param2, int param3, int param4, int param5, int *param6, int param7, int param8, int param9, void **param10); +static void ov21_021E274C(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4); +static void ov21_021E28D0(UnkStruct_ov21_021E2588 *param0, const UnkStruct_ov21_021E1E74 *param1); +static void ov21_021E29A4(GraphicElementData *param0, int param1, int param2); +static void ov21_021E2968(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1); +static void ov21_021E2014(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2); +static void ov21_021E2044(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2); +static void ov21_021E20A4(UnkStruct_ov21_021E1A90 *param0, int param1); +static void ov21_021E2180(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2); +static void ov21_021E226C(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1); +static void ov21_021E22C8(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2); +static void ov21_021E2458(UnkStruct_ov21_021E2588 *param0); +static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2); +static void ov21_021E256C(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1); +static void ov21_021E275C(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, int param2); +static void ov21_021E27C0(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, int param2, int param3); +static void ov21_021E2864(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1); +static void ov21_021E28A8(UnkStruct_ov21_021E1E74 *param0); static u32 const Unk_ov21_021E9D80[(7 - 2 + 1)] = { 28 << FX32_SHIFT, @@ -144,11 +143,11 @@ static u32 const Unk_ov21_021E9D98[(7 - 2 + 1)] = { 0x0 }; -void ov21_021E1924 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) +void ov21_021E1924(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) { - UnkStruct_ov21_021E1A7C * v0; - UnkStruct_ov21_021E1A90 * v1; - UnkStruct_ov21_021D4660 * v2; + UnkStruct_ov21_021E1A7C *v0; + UnkStruct_ov21_021E1A90 *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021E199C(param2, param1); v1 = ov21_021E19FC(param2, param1); @@ -167,18 +166,18 @@ void ov21_021E1924 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021E1CB8; } -void ov21_021E1984 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021E1984(UnkStruct_ov21_021E68F4 *param0) { ov21_021E1A7C(param0->unk_00); ov21_021E1A90(param0->unk_00); ov21_021E1AA4(param0->unk_20); } -static UnkStruct_ov21_021E1A7C * ov21_021E199C (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E1A7C *ov21_021E199C(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E1A7C * v0; - UnkStruct_ov21_021E68F4 * v1; - UnkStruct_ov21_021D3320 * v2; + UnkStruct_ov21_021E1A7C *v0; + UnkStruct_ov21_021E68F4 *v1; + UnkStruct_ov21_021D3320 *v2; int v3; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E1A7C)); @@ -204,10 +203,10 @@ static UnkStruct_ov21_021E1A7C * ov21_021E199C (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021E1A90 * ov21_021E19FC (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E1A90 *ov21_021E19FC(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E1A90 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E1A90 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E1A90)); @@ -219,9 +218,9 @@ static UnkStruct_ov21_021E1A90 * ov21_021E19FC (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D4660 * ov21_021E1A24 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021E1A24(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D4660 * v0; + UnkStruct_ov21_021D4660 *v0; int v1 = ov21_021E1ACC(); v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * v1); @@ -236,19 +235,19 @@ static UnkStruct_ov21_021D4660 * ov21_021E1A24 (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021E1A7C (UnkStruct_ov21_021E1A7C * param0) +static void ov21_021E1A7C(UnkStruct_ov21_021E1A7C *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E1A90 (UnkStruct_ov21_021E1A90 * param0) +static void ov21_021E1A90(UnkStruct_ov21_021E1A90 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E1AA4 (UnkStruct_ov21_021D4660 * param0) +static void ov21_021E1AA4(UnkStruct_ov21_021D4660 *param0) { GF_ASSERT(param0); @@ -258,15 +257,15 @@ static void ov21_021E1AA4 (UnkStruct_ov21_021D4660 * param0) Heap_FreeToHeap(param0); } -static int ov21_021E1ACC (void) +static int ov21_021E1ACC(void) { return 3; } -static int ov21_021E1AD0 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E1AD0(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E1A7C * v0 = param1; - UnkStruct_ov21_021E1E74 * v1 = param0->unk_08; + UnkStruct_ov21_021E1A7C *v0 = param1; + UnkStruct_ov21_021E1E74 *v1 = param0->unk_08; int v2; v1 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021E1E74)); @@ -286,10 +285,10 @@ static int ov21_021E1AD0 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E1B14 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E1B14(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E1A7C * v0 = param1; - UnkStruct_ov21_021E1E74 * v1 = param0->unk_08; + UnkStruct_ov21_021E1A7C *v0 = param1; + UnkStruct_ov21_021E1E74 *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -308,10 +307,10 @@ static int ov21_021E1B14 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021E1B54 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E1B54(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E1A7C * v0 = param1; - UnkStruct_ov21_021E1E74 * v1 = param0->unk_08; + UnkStruct_ov21_021E1A7C *v0 = param1; + UnkStruct_ov21_021E1E74 *v1 = param0->unk_08; ov21_021E1E74(v1); Heap_FreeToHeap(v1); @@ -319,12 +318,12 @@ static int ov21_021E1B54 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E1B68 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E1B68(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E1A7C * v0 = param2; - const UnkStruct_ov21_021E1E74 * v1 = param3->unk_08; - UnkStruct_ov21_021E1A90 * v2 = param0; - UnkStruct_ov21_021E2588 * v3 = param1->unk_08; + const UnkStruct_ov21_021E1A7C *v0 = param2; + const UnkStruct_ov21_021E1E74 *v1 = param3->unk_08; + UnkStruct_ov21_021E1A90 *v2 = param0; + UnkStruct_ov21_021E2588 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -353,12 +352,12 @@ static int ov21_021E1B68 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E1BFC (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E1BFC(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E1A7C * v0 = param2; - const UnkStruct_ov21_021E1E74 * v1 = param3->unk_08; - UnkStruct_ov21_021E1A90 * v2 = param0; - UnkStruct_ov21_021E2588 * v3 = param1->unk_08; + const UnkStruct_ov21_021E1A7C *v0 = param2; + const UnkStruct_ov21_021E1E74 *v1 = param3->unk_08; + UnkStruct_ov21_021E1A90 *v2 = param0; + UnkStruct_ov21_021E2588 *v3 = param1->unk_08; int v4; int v5; BOOL v6; @@ -396,12 +395,12 @@ static int ov21_021E1BFC (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E1CB8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E1CB8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E1A7C * v0 = param2; - const UnkStruct_ov21_021E1E74 * v1 = param3->unk_08; - UnkStruct_ov21_021E1A90 * v2 = param0; - UnkStruct_ov21_021E2588 * v3 = param1->unk_08; + const UnkStruct_ov21_021E1A7C *v0 = param2; + const UnkStruct_ov21_021E1E74 *v1 = param3->unk_08; + UnkStruct_ov21_021E1A90 *v2 = param0; + UnkStruct_ov21_021E2588 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -431,7 +430,7 @@ static int ov21_021E1CB8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021E1D40 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1, int param2) +static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, int param2) { param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 8); @@ -449,7 +448,7 @@ static void ov21_021E1D40 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E param0->unk_00 = sub_02023FCC(param0->unk_04, 8, ov21_021E1E8C, ¶m0->unk_08, param2); } -static void ov21_021E1E00 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1) +static void ov21_021E1E00(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1) { int v0; @@ -494,7 +493,7 @@ static void ov21_021E1E00 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E } } -static void ov21_021E1E74 (UnkStruct_ov21_021E1E74 * param0) +static void ov21_021E1E74(UnkStruct_ov21_021E1E74 *param0) { sub_02024034(param0->unk_00); Heap_FreeToHeap(param0->unk_04); @@ -502,11 +501,11 @@ static void ov21_021E1E74 (UnkStruct_ov21_021E1E74 * param0) param0->unk_04 = NULL; } -static void ov21_021E1E8C (u32 param0, u32 param1, void * param2) +static void ov21_021E1E8C(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021E1E8C * v0 = param2; - UnkStruct_ov21_021E1A7C * v1 = v0->unk_00; - UnkStruct_ov21_021E1E74 * v2 = v0->unk_04; + UnkStruct_ov21_021E1E8C *v0 = param2; + UnkStruct_ov21_021E1A7C *v1 = v0->unk_00; + UnkStruct_ov21_021E1E74 *v2 = v0->unk_04; BOOL v3; v2->unk_14[param0] = param1; @@ -619,7 +618,7 @@ static void ov21_021E1E8C (u32 param0, u32 param1, void * param2) } } -static void ov21_021E2014 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2) +static void ov21_021E2014(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2) { ov21_021E20A4(param1, param2); ov21_021E2180(param0, param1, param2); @@ -627,7 +626,7 @@ static void ov21_021E2014 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E ov21_021E2478(param0, param1, param2); } -static void ov21_021E2044 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2) +static void ov21_021E2044(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2) { int v0; @@ -644,10 +643,10 @@ static void ov21_021E2044 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E } } -static void ov21_021E20A4 (UnkStruct_ov21_021E1A90 * param0, int param1) +static void ov21_021E20A4(UnkStruct_ov21_021E1A90 *param0, int param1) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 34, param0->unk_00->unk_00, 6, 0, 0, 1, param1); @@ -658,20 +657,20 @@ static void ov21_021E20A4 (UnkStruct_ov21_021E1A90 * param0, int param1) v0 = ov21_021D27B8(param0->unk_00, 60, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), (((132 - (40 / 2)) / 8)), v1->screenWidth / 8, v1->screenHeight / 8); + sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((132 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); v0 = ov21_021D27B8(param0->unk_00, 63, 1, &v1, param1); - sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), (((76 - (40 / 2)) / 8)), v1->screenWidth / 8, v1->screenHeight / 8); + sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((76 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8); Heap_FreeToHeap(v0); sub_0201C3C0(param0->unk_00->unk_00, 6); } -static void ov21_021E2180 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2) +static void ov21_021E2180(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(v0); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(v0); param0->unk_40[0] = sub_02009A4C(v0->unk_13C[0], v1, 102, 1, 102 + 5000, NNS_G2D_VRAM_TYPE_2DSUB, param2); @@ -689,9 +688,9 @@ static void ov21_021E2180 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E param0->unk_70[3] = sub_02009BC4(v0->unk_13C[3], v1, 98, 1, 98 + 5000, 3, param2); } -static void ov21_021E226C (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1) +static void ov21_021E226C(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_40[0]); sub_02009D68(v0->unk_13C[0], param0->unk_40[0]); @@ -704,11 +703,11 @@ static void ov21_021E226C (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E sub_02009D68(v0->unk_13C[3], param0->unk_70[3]); } -static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2) +static void ov21_021E22C8(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3; sub_020093B4(&v0, 102 + 5000, 11 + 2100, 100 + 5000, 101 + 5000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -767,7 +766,7 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E } } -static void ov21_021E2458 (UnkStruct_ov21_021E2588 * param0) +static void ov21_021E2458(UnkStruct_ov21_021E2588 *param0) { int v0; @@ -780,12 +779,12 @@ static void ov21_021E2458 (UnkStruct_ov21_021E2588 * param0) } } -static void ov21_021E2478 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2) +static void ov21_021E2478(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2) { - Window * v0; + Window *v0; UnkStruct_ov21_021D4CB8 v1; - UnkStruct_02009DC8 * v2; - UnkStruct_ov21_021D13FC * v3 = param1->unk_00; + UnkStruct_02009DC8 *v2; + UnkStruct_ov21_021D13FC *v3 = param1->unk_00; int v4; int v5; @@ -835,7 +834,7 @@ static void ov21_021E2478 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E } } -static void ov21_021E256C (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1) +static void ov21_021E256C(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1) { int v0; @@ -846,7 +845,7 @@ static void ov21_021E256C (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E } } -static void ov21_021E2588 (UnkStruct_ov21_021E2588 * param0) +static void ov21_021E2588(UnkStruct_ov21_021E2588 *param0) { int v0; @@ -863,7 +862,7 @@ static void ov21_021E2588 (UnkStruct_ov21_021E2588 * param0) } } -static void ov21_021E25C0 (UnkStruct_ov21_021E2588 * param0) +static void ov21_021E25C0(UnkStruct_ov21_021E2588 *param0) { int v0; @@ -880,7 +879,7 @@ static void ov21_021E25C0 (UnkStruct_ov21_021E2588 * param0) } } -static void ov21_021E25F8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, const UnkStruct_ov21_021E1A7C * param2, BOOL param3) +static void ov21_021E25F8(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, const UnkStruct_ov21_021E1A7C *param2, BOOL param3) { ov21_021E2588(param0); @@ -893,7 +892,7 @@ static void ov21_021E25F8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E } } -static BOOL ov21_021E2664 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, const UnkStruct_ov21_021E1A7C * param2, BOOL param3) +static BOOL ov21_021E2664(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, const UnkStruct_ov21_021E1A7C *param2, BOOL param3) { BOOL v0; @@ -914,10 +913,10 @@ static BOOL ov21_021E2664 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E return 0; } -static void ov21_021E26A0 (UnkStruct_ov21_021E1A90 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10) +static void ov21_021E26A0(UnkStruct_ov21_021E1A90 *param0, GraphicElementData *param1, UnkStruct_ov21_021D4CA0 *param2, int param3, int param4, int param5, int *param6, int param7, int param8, int param9, void **param10) { int v0; - NNSG2dPaletteData * v1; + NNSG2dPaletteData *v1; BOOL v2; BOOL v3 = 0; int v4; @@ -964,12 +963,12 @@ static void ov21_021E26A0 (UnkStruct_ov21_021E1A90 * param0, GraphicElementData } } -static void ov21_021E274C (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4) +static void ov21_021E274C(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4) { ov21_021D1524(param0, param1, param2, param3, param4); } -static void ov21_021E275C (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1, int param2) +static void ov21_021E275C(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, int param2) { int v0, v1; @@ -1001,7 +1000,7 @@ static void ov21_021E275C (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E } } -static void ov21_021E27C0 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1, int param2, int param3) +static void ov21_021E27C0(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1, int param2, int param3) { int v0, v1; int v2; @@ -1051,7 +1050,7 @@ static void ov21_021E27C0 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E } } -static void ov21_021E2864 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1) +static void ov21_021E2864(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1) { BOOL v0; @@ -1070,7 +1069,7 @@ static void ov21_021E2864 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E } } -static void ov21_021E28A8 (UnkStruct_ov21_021E1E74 * param0) +static void ov21_021E28A8(UnkStruct_ov21_021E1E74 *param0) { if (gCoreSys.pressedKeys & PAD_KEY_UP) { param0->unk_34 = 1; @@ -1085,7 +1084,7 @@ static void ov21_021E28A8 (UnkStruct_ov21_021E1E74 * param0) param0->unk_34 = 8; } -static void ov21_021E28D0 (UnkStruct_ov21_021E2588 * param0, const UnkStruct_ov21_021E1E74 * param1) +static void ov21_021E28D0(UnkStruct_ov21_021E2588 *param0, const UnkStruct_ov21_021E1E74 *param1) { if ((param1->unk_38 & 1) == 0) { sub_02021CAC(param0->unk_00[2], 0); @@ -1124,7 +1123,7 @@ static void ov21_021E28D0 (UnkStruct_ov21_021E2588 * param0, const UnkStruct_ov2 } } -static void ov21_021E2968 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1) +static void ov21_021E2968(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A7C *param1) { BOOL v0; int v1; @@ -1143,7 +1142,7 @@ static void ov21_021E2968 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E } } -static void ov21_021E29A4 (GraphicElementData * param0, int param1, int param2) +static void ov21_021E29A4(GraphicElementData *param0, int param1, int param2) { int v0; diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c index a6b2436d92..970157c9d3 100644 --- a/src/overlay021/ov21_021E29DC.c +++ b/src/overlay021/ov21_021E29DC.c @@ -1,72 +1,71 @@ +#include "overlay021/ov21_021E29DC.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" -#include "overlay021/struct_ov21_021D4EE4_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4340.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021D4EE4.h" +#include "overlay021/ov21_021DC9BC.h" +#include "overlay021/ov21_021E0C68.h" +#include "overlay021/ov21_021E3FFC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4660.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" +#include "overlay021/struct_ov21_021D4EE4_decl.h" #include "overlay021/struct_ov21_021D4FE4.h" #include "overlay021/struct_ov21_021D5B68.h" #include "overlay021/struct_ov21_021DE6D4.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "core_sys.h" +#include "heap.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201F834.h" #include "unk_020218BC.h" #include "unk_02023FCC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4340.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021D4EE4.h" -#include "overlay021/ov21_021DC9BC.h" -#include "overlay021/ov21_021E0C68.h" -#include "overlay021/ov21_021E29DC.h" -#include "overlay021/ov21_021E3FFC.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; int unk_08; - UnkStruct_ov21_021D5B68 * unk_0C; - UnkStruct_ov21_021DE6D4 * unk_10; - UnkStruct_ov21_021E68F4 * unk_14; - UnkStruct_ov21_021E68F4 * unk_18; - UnkStruct_ov21_021E68F4 * unk_1C; - UnkStruct_ov21_021E68F4 * unk_20; - UnkStruct_ov21_021E68F4 * unk_24; + UnkStruct_ov21_021D5B68 *unk_0C; + UnkStruct_ov21_021DE6D4 *unk_10; + UnkStruct_ov21_021E68F4 *unk_14; + UnkStruct_ov21_021E68F4 *unk_18; + UnkStruct_ov21_021E68F4 *unk_1C; + UnkStruct_ov21_021E68F4 *unk_20; + UnkStruct_ov21_021E68F4 *unk_24; BOOL unk_28; BOOL unk_2C; BOOL unk_30; } UnkStruct_ov21_021E2BA8; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021E2BBC; typedef struct { @@ -75,14 +74,14 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_ov21_021D4CA0 * unk_04[5]; - UnkStruct_02009DC8 * unk_18[4]; + UnkStruct_ov21_021D4CA0 *unk_04[5]; + UnkStruct_02009DC8 *unk_18[4]; } UnkStruct_ov21_021E326C; typedef struct { - int * unk_00; - UnkStruct_ov21_021E2BA8 * unk_04; - UnkStruct_ov21_021D3320 * unk_08; + int *unk_00; + UnkStruct_ov21_021E2BA8 *unk_04; + UnkStruct_ov21_021D3320 *unk_08; int unk_0C[6]; BOOL unk_24; int unk_28; @@ -91,106 +90,106 @@ typedef struct { } UnkStruct_ov21_021E342C; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021E3440; typedef struct { - void * unk_00; - void * unk_04; + void *unk_00; + void *unk_04; } UnkStruct_ov21_021E37CC; typedef struct { - UnkStruct_02023FCC * unk_00; - TouchScreenHitTable * unk_04; + UnkStruct_02023FCC *unk_00; + TouchScreenHitTable *unk_04; UnkStruct_ov21_021E37CC unk_08; int unk_10; - UnkStruct_ov21_021D4EE4 * unk_14; - UnkStruct_ov21_021D4FE4 * unk_18; + UnkStruct_ov21_021D4EE4 *unk_14; + UnkStruct_ov21_021D4FE4 *unk_18; } UnkStruct_ov21_021E37B4; typedef struct { - GraphicElementData * unk_00[6]; - UnkStruct_02009DC8 * unk_18[4]; + GraphicElementData *unk_00[6]; + UnkStruct_02009DC8 *unk_18[4]; } UnkStruct_ov21_021E3900; -static UnkStruct_ov21_021E2BA8 * ov21_021E2A5C(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021E2BBC * ov21_021E2AE0(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021E2B08(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021E2BA8(UnkStruct_ov21_021E2BA8 * param0); -static void ov21_021E2BBC(UnkStruct_ov21_021E2BBC * param0); -static void ov21_021E2BD0(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E2BBC *ov21_021E2AE0(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E2B08(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E2BA8(UnkStruct_ov21_021E2BA8 *param0); +static void ov21_021E2BBC(UnkStruct_ov21_021E2BBC *param0); +static void ov21_021E2BD0(UnkStruct_ov21_021D4660 *param0); static int ov21_021E2C20(void); -static int ov21_021E2C24(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E2C2C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E2C5C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E2C64(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E2D10(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E2D38(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021E3320(UnkStruct_ov21_021E2BA8 * param0); +static int ov21_021E2C24(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E2C2C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E2C5C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E2C64(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E2D10(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E2D38(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021E3320(UnkStruct_ov21_021E2BA8 *param0); static BOOL ov21_021E2EC0(int param0); -static BOOL ov21_021E2EC4(UnkStruct_ov21_021E2BA8 * param0, int param1, int param2); -static void ov21_021E2E10(UnkStruct_ov21_021E2BA8 * param0); -static void ov21_021E2E00(UnkStruct_ov21_021E2BA8 * param0); -static void ov21_021E3080(UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1, const UnkStruct_ov21_021E2BA8 * param2, int param3); -static void ov21_021E30BC(UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1); -static void ov21_021E30E4(UnkStruct_ov21_021E2BBC * param0, const UnkStruct_ov21_021E2BA8 * param1, int param2); -static void ov21_021E3178(UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1, int param2); -static void ov21_021E3224(UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1); -static void ov21_021E3268(UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1, int param2); -static void ov21_021E326C(UnkStruct_ov21_021E326C * param0); -static void ov21_021E331C(UnkStruct_ov21_021E326C * param0, int param1); -static void ov21_021E3270(UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1, int param2); -static void ov21_021E3304(UnkStruct_ov21_021E326C * param0); -static void ov21_021E3FC0(UnkStruct_ov21_021E326C * param0, int param1, int param2); -static void ov21_021E3BE0(UnkStruct_ov21_021E326C * param0); -static void ov21_021E3BFC(UnkStruct_ov21_021E326C * param0); -static UnkStruct_ov21_021E342C * ov21_021E33C4(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021E3440 * ov21_021E3400(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021E3428(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021E342C(UnkStruct_ov21_021E342C * param0); -static void ov21_021E3440(UnkStruct_ov21_021E3440 * param0); -static void ov21_021E3454(UnkStruct_ov21_021D4660 * param0); +static BOOL ov21_021E2EC4(UnkStruct_ov21_021E2BA8 *param0, int param1, int param2); +static void ov21_021E2E10(UnkStruct_ov21_021E2BA8 *param0); +static void ov21_021E2E00(UnkStruct_ov21_021E2BA8 *param0); +static void ov21_021E3080(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1, const UnkStruct_ov21_021E2BA8 *param2, int param3); +static void ov21_021E30BC(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1); +static void ov21_021E30E4(UnkStruct_ov21_021E2BBC *param0, const UnkStruct_ov21_021E2BA8 *param1, int param2); +static void ov21_021E3178(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1, int param2); +static void ov21_021E3224(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1); +static void ov21_021E3268(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1, int param2); +static void ov21_021E326C(UnkStruct_ov21_021E326C *param0); +static void ov21_021E331C(UnkStruct_ov21_021E326C *param0, int param1); +static void ov21_021E3270(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1, int param2); +static void ov21_021E3304(UnkStruct_ov21_021E326C *param0); +static void ov21_021E3FC0(UnkStruct_ov21_021E326C *param0, int param1, int param2); +static void ov21_021E3BE0(UnkStruct_ov21_021E326C *param0); +static void ov21_021E3BFC(UnkStruct_ov21_021E326C *param0); +static UnkStruct_ov21_021E342C *ov21_021E33C4(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E3440 *ov21_021E3400(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E3428(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E342C(UnkStruct_ov21_021E342C *param0); +static void ov21_021E3440(UnkStruct_ov21_021E3440 *param0); +static void ov21_021E3454(UnkStruct_ov21_021D4660 *param0); static int ov21_021E3458(void); -static int ov21_021E345C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E34AC(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E3520(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E3540(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E35D0(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E3604(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static BOOL ov21_021E3C18(UnkStruct_ov21_021E342C * param0, int param1, int param2); -static void ov21_021E3688(UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1, int param2); -static void ov21_021E3724(UnkStruct_ov21_021E342C * param0); -static void ov21_021E3734(UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1); -static void ov21_021E37B4(UnkStruct_ov21_021E37B4 * param0); -static void ov21_021E37CC(u32 param0, u32 param1, void * param2); -static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1, int param2); -static void ov21_021E3D48(UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1); -static void ov21_021E3E74(UnkStruct_ov21_021E37B4 * param0); -static void ov21_021E3E8C(UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1); -static void ov21_021E3EEC(UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1); -static void ov21_021E3F2C(UnkStruct_ov21_021E3440 * param0, const UnkStruct_ov21_021E37B4 * param1, const UnkStruct_ov21_021E342C * param2); -static void ov21_021E3F48(UnkStruct_ov21_021E3440 * param0, const UnkStruct_ov21_021E37B4 * param1, const UnkStruct_ov21_021E342C * param2); -static void ov21_021E3F88(UnkStruct_ov21_021E3440 * param0, const UnkStruct_ov21_021E37B4 * param1); -static BOOL ov21_021E3F98(UnkStruct_ov21_021E3440 * param0, BOOL param1); -static void ov21_021E3C2C(UnkStruct_ov21_021E342C * param0); -static void ov21_021E3C34(UnkStruct_ov21_021E342C * param0); -static void ov21_021E3C64(UnkStruct_ov21_021E342C * param0); -static void ov21_021E3900(UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1, const UnkStruct_ov21_021E342C * param2, int param3); -static void ov21_021E393C(UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1); -static void ov21_021E3960(UnkStruct_ov21_021E3440 * param0, const UnkStruct_ov21_021E342C * param1, int param2); -static void ov21_021E39FC(UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1, int param2); -static void ov21_021E3AAC(UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1); -static void ov21_021E3AF0(UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1, int param2); -static void ov21_021E3BC0(UnkStruct_ov21_021E3900 * param0); -static void ov21_021E3FE4(UnkStruct_ov21_021E3900 * param0, const UnkStruct_ov21_021E342C * param1); -static void ov21_021E3BD8(UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1, int param2); -static void ov21_021E3BDC(UnkStruct_ov21_021E3900 * param0); - -void ov21_021E29DC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) -{ - UnkStruct_ov21_021E2BA8 * v0; - UnkStruct_ov21_021E2BBC * v1; - UnkStruct_ov21_021D4660 * v2; +static int ov21_021E345C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E34AC(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E3520(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E3540(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E35D0(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E3604(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static BOOL ov21_021E3C18(UnkStruct_ov21_021E342C *param0, int param1, int param2); +static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, int param2); +static void ov21_021E3724(UnkStruct_ov21_021E342C *param0); +static void ov21_021E3734(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1); +static void ov21_021E37B4(UnkStruct_ov21_021E37B4 *param0); +static void ov21_021E37CC(u32 param0, u32 param1, void *param2); +static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, int param2); +static void ov21_021E3D48(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1); +static void ov21_021E3E74(UnkStruct_ov21_021E37B4 *param0); +static void ov21_021E3E8C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1); +static void ov21_021E3EEC(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1); +static void ov21_021E3F2C(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_021E37B4 *param1, const UnkStruct_ov21_021E342C *param2); +static void ov21_021E3F48(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_021E37B4 *param1, const UnkStruct_ov21_021E342C *param2); +static void ov21_021E3F88(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_021E37B4 *param1); +static BOOL ov21_021E3F98(UnkStruct_ov21_021E3440 *param0, BOOL param1); +static void ov21_021E3C2C(UnkStruct_ov21_021E342C *param0); +static void ov21_021E3C34(UnkStruct_ov21_021E342C *param0); +static void ov21_021E3C64(UnkStruct_ov21_021E342C *param0); +static void ov21_021E3900(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, const UnkStruct_ov21_021E342C *param2, int param3); +static void ov21_021E393C(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1); +static void ov21_021E3960(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_021E342C *param1, int param2); +static void ov21_021E39FC(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, int param2); +static void ov21_021E3AAC(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1); +static void ov21_021E3AF0(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, int param2); +static void ov21_021E3BC0(UnkStruct_ov21_021E3900 *param0); +static void ov21_021E3FE4(UnkStruct_ov21_021E3900 *param0, const UnkStruct_ov21_021E342C *param1); +static void ov21_021E3BD8(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, int param2); +static void ov21_021E3BDC(UnkStruct_ov21_021E3900 *param0); + +void ov21_021E29DC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +{ + UnkStruct_ov21_021E2BA8 *v0; + UnkStruct_ov21_021E2BBC *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021E2A5C(param2, param1); v1 = ov21_021E2AE0(param2, param1); @@ -209,23 +208,23 @@ void ov21_021E29DC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021E2D38; } -void ov21_021E2A3C (UnkStruct_ov21_021E68F4 * param0) +void ov21_021E2A3C(UnkStruct_ov21_021E68F4 *param0) { ov21_021E2BA8(param0->unk_00); ov21_021E2BBC(param0->unk_04); ov21_021E2BD0(param0->unk_20); } -BOOL ov21_021E2A54 (const UnkStruct_ov21_021E68F4 * param0) +BOOL ov21_021E2A54(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021E2BA8 * v0 = param0->unk_00; + const UnkStruct_ov21_021E2BA8 *v0 = param0->unk_00; return v0->unk_28; } -static UnkStruct_ov21_021E2BA8 * ov21_021E2A5C (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E2BA8 *ov21_021E2A5C(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E2BA8 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E2BA8 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E2BA8)); @@ -263,10 +262,10 @@ static UnkStruct_ov21_021E2BA8 * ov21_021E2A5C (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021E2BBC * ov21_021E2AE0 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E2BBC *ov21_021E2AE0(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E2BBC * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E2BBC *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E2BBC)); @@ -278,9 +277,9 @@ static UnkStruct_ov21_021E2BBC * ov21_021E2AE0 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D4660 * ov21_021E2B08 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021E2B08(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D4660 * v0; + UnkStruct_ov21_021D4660 *v0; int v1 = ov21_021E2C20(); v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * v1); @@ -300,19 +299,19 @@ static UnkStruct_ov21_021D4660 * ov21_021E2B08 (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021E2BA8 (UnkStruct_ov21_021E2BA8 * param0) +static void ov21_021E2BA8(UnkStruct_ov21_021E2BA8 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E2BBC (UnkStruct_ov21_021E2BBC * param0) +static void ov21_021E2BBC(UnkStruct_ov21_021E2BBC *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E2BD0 (UnkStruct_ov21_021D4660 * param0) +static void ov21_021E2BD0(UnkStruct_ov21_021D4660 *param0) { GF_ASSERT(param0); @@ -328,25 +327,25 @@ static void ov21_021E2BD0 (UnkStruct_ov21_021D4660 * param0) Heap_FreeToHeap(param0); } -static int ov21_021E2C20 (void) +static int ov21_021E2C20(void) { return 8; } -static int ov21_021E2C24 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E2C24(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E2BA8 * v0 = param1; - UnkStruct_ov21_021E2C24 * v1 = param0->unk_08; + UnkStruct_ov21_021E2BA8 *v0 = param1; + UnkStruct_ov21_021E2C24 *v1 = param0->unk_08; v0->unk_10->unk_1C = 1; return 1; } -static int ov21_021E2C2C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E2C2C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E2BA8 * v0 = param1; - UnkStruct_ov21_021E2C24 * v1 = param0->unk_08; + UnkStruct_ov21_021E2BA8 *v0 = param1; + UnkStruct_ov21_021E2C24 *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -364,21 +363,21 @@ static int ov21_021E2C2C (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021E2C5C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E2C5C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E2BA8 * v0 = param1; - UnkStruct_ov21_021E2C24 * v1 = param0->unk_08; + UnkStruct_ov21_021E2BA8 *v0 = param1; + UnkStruct_ov21_021E2C24 *v1 = param0->unk_08; v0->unk_08 = 0; return 1; } -static int ov21_021E2C64 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E2C64(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E2BA8 * v0 = param2; - const UnkStruct_ov21_021E2C24 * v1 = param3->unk_08; - UnkStruct_ov21_021E2BBC * v2 = param0; - UnkStruct_ov21_021E326C * v3 = param1->unk_08; + const UnkStruct_ov21_021E2BA8 *v0 = param2; + const UnkStruct_ov21_021E2C24 *v1 = param3->unk_08; + UnkStruct_ov21_021E2BBC *v2 = param0; + UnkStruct_ov21_021E326C *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -411,12 +410,12 @@ static int ov21_021E2C64 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E2D10 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E2D10(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E2BA8 * v0 = param2; - const UnkStruct_ov21_021E2C24 * v1 = param3->unk_08; - UnkStruct_ov21_021E2BBC * v2 = param0; - UnkStruct_ov21_021E326C * v3 = param1->unk_08; + const UnkStruct_ov21_021E2BA8 *v0 = param2; + const UnkStruct_ov21_021E2C24 *v1 = param3->unk_08; + UnkStruct_ov21_021E2BBC *v2 = param0; + UnkStruct_ov21_021E326C *v3 = param1->unk_08; if (v3->unk_00 != v0->unk_08) { ov21_021E331C(v3, v0->unk_08); @@ -427,12 +426,12 @@ static int ov21_021E2D10 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E2D38 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E2D38(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E2BA8 * v0 = param2; - const UnkStruct_ov21_021E2C24 * v1 = param3->unk_08; - UnkStruct_ov21_021E2BBC * v2 = param0; - UnkStruct_ov21_021E326C * v3 = param1->unk_08; + const UnkStruct_ov21_021E2BA8 *v0 = param2; + const UnkStruct_ov21_021E2C24 *v1 = param3->unk_08; + UnkStruct_ov21_021E2BBC *v2 = param0; + UnkStruct_ov21_021E326C *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -469,13 +468,13 @@ static int ov21_021E2D38 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021E2E00 (UnkStruct_ov21_021E2BA8 * param0) +static void ov21_021E2E00(UnkStruct_ov21_021E2BA8 *param0) { ov21_021E2E10(param0); param0->unk_30 = 1; } -static void ov21_021E2E10 (UnkStruct_ov21_021E2BA8 * param0) +static void ov21_021E2E10(UnkStruct_ov21_021E2BA8 *param0) { *param0->unk_00 |= (0x1 << 1); param0->unk_28 = 0; @@ -518,12 +517,12 @@ static void ov21_021E2E10 (UnkStruct_ov21_021E2BA8 * param0) } } -static BOOL ov21_021E2EC0 (int param0) +static BOOL ov21_021E2EC0(int param0) { return 0; } -static BOOL ov21_021E2EC4 (UnkStruct_ov21_021E2BA8 * param0, int param1, int param2) +static BOOL ov21_021E2EC4(UnkStruct_ov21_021E2BA8 *param0, int param1, int param2) { int v0, v1; BOOL v2 = 1; @@ -634,7 +633,7 @@ static BOOL ov21_021E2EC4 (UnkStruct_ov21_021E2BA8 * param0, int param1, int par return v2; } -static void ov21_021E3080 (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1, const UnkStruct_ov21_021E2BA8 * param2, int param3) +static void ov21_021E3080(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1, const UnkStruct_ov21_021E2BA8 *param2, int param3) { ov21_021E30E4(param0, param2, param3); ov21_021E3178(param0, param1, param3); @@ -643,7 +642,7 @@ static void ov21_021E3080 (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E ov21_021E3FC0(param1, 0, 1); } -static void ov21_021E30BC (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1) +static void ov21_021E30BC(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1) { ov21_021E326C(param1); ov21_021E3224(param0, param1); @@ -652,10 +651,10 @@ static void ov21_021E30BC (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E sub_02019EBC(param0->unk_00->unk_00, 2); } -static void ov21_021E30E4 (UnkStruct_ov21_021E2BBC * param0, const UnkStruct_ov21_021E2BA8 * param1, int param2) +static void ov21_021E30E4(UnkStruct_ov21_021E2BBC *param0, const UnkStruct_ov21_021E2BA8 *param1, int param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D276C(param0->unk_00, 6, 0, 0, 0, param2); @@ -672,10 +671,10 @@ static void ov21_021E30E4 (UnkStruct_ov21_021E2BBC * param0, const UnkStruct_ov2 sub_0201C3C0(param0->unk_00->unk_00, 2); } -static void ov21_021E3178 (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1, int param2) +static void ov21_021E3178(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; - NARC * v1 = ov21_021D26E0(param0->unk_00); + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; + NARC *v1 = ov21_021D26E0(param0->unk_00); param1->unk_18[0] = sub_02009A4C(v0->unk_13C[0], v1, 87, 1, 87 + 2000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -691,9 +690,9 @@ static void ov21_021E3178 (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E param1->unk_18[3] = sub_02009BC4(v0->unk_13C[3], v1, 86, 1, 86 + 2000, 3, param2); } -static void ov21_021E3224 (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1) +static void ov21_021E3224(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; sub_0200A4E4(param1->unk_18[0]); sub_0200A6DC(param1->unk_18[1]); @@ -704,21 +703,21 @@ static void ov21_021E3224 (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E sub_02009D68(v0->unk_13C[3], param1->unk_18[3]); } -static void ov21_021E3268 (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1, int param2) +static void ov21_021E3268(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1, int param2) { return; } -static void ov21_021E326C (UnkStruct_ov21_021E326C * param0) +static void ov21_021E326C(UnkStruct_ov21_021E326C *param0) { return; } -static void ov21_021E3270 (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E326C * param1, int param2) +static void ov21_021E3270(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1, int param2) { - Window * v0; + Window *v0; UnkStruct_ov21_021D4CB8 v1; - UnkStruct_ov21_021D13FC * v2 = param0->unk_00; + UnkStruct_ov21_021D13FC *v2 = param0->unk_00; int v3; int v4; @@ -749,7 +748,7 @@ static void ov21_021E3270 (UnkStruct_ov21_021E2BBC * param0, UnkStruct_ov21_021E } } -static void ov21_021E3304 (UnkStruct_ov21_021E326C * param0) +static void ov21_021E3304(UnkStruct_ov21_021E326C *param0) { int v0; @@ -758,22 +757,22 @@ static void ov21_021E3304 (UnkStruct_ov21_021E326C * param0) } } -static void ov21_021E331C (UnkStruct_ov21_021E326C * param0, int param1) +static void ov21_021E331C(UnkStruct_ov21_021E326C *param0, int param1) { return; } -static void ov21_021E3320 (UnkStruct_ov21_021E2BA8 * param0) +static void ov21_021E3320(UnkStruct_ov21_021E2BA8 *param0) { param0->unk_28 = 1; param0->unk_10->unk_14 = 1; } -void ov21_021E332C (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) +void ov21_021E332C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) { - UnkStruct_ov21_021E342C * v0; - UnkStruct_ov21_021E3440 * v1; - UnkStruct_ov21_021D4660 * v2; + UnkStruct_ov21_021E342C *v0; + UnkStruct_ov21_021E3440 *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021E33C4(param2, param1); v1 = ov21_021E3400(param2, param1); @@ -792,41 +791,41 @@ void ov21_021E332C (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021E3604; } -void ov21_021E338C (UnkStruct_ov21_021E68F4 * param0) +void ov21_021E338C(UnkStruct_ov21_021E68F4 *param0) { ov21_021E342C(param0->unk_00); ov21_021E3440(param0->unk_04); ov21_021E3454(param0->unk_20); } -BOOL ov21_021E33A4 (const UnkStruct_ov21_021E68F4 * param0) +BOOL ov21_021E33A4(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021E342C * v0 = param0->unk_00; + const UnkStruct_ov21_021E342C *v0 = param0->unk_00; return v0->unk_24; } -BOOL ov21_021E33AC (const UnkStruct_ov21_021E68F4 * param0) +BOOL ov21_021E33AC(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021E342C * v0 = param0->unk_00; + const UnkStruct_ov21_021E342C *v0 = param0->unk_00; return v0->unk_28; } -void ov21_021E33B4 (UnkStruct_ov21_021E68F4 * param0, BOOL param1) +void ov21_021E33B4(UnkStruct_ov21_021E68F4 *param0, BOOL param1) { - UnkStruct_ov21_021E342C * v0 = param0->unk_00; + UnkStruct_ov21_021E342C *v0 = param0->unk_00; v0->unk_30 = param1; } -BOOL ov21_021E33BC (const UnkStruct_ov21_021E68F4 * param0) +BOOL ov21_021E33BC(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021E342C * v0 = param0->unk_00; + const UnkStruct_ov21_021E342C *v0 = param0->unk_00; return v0->unk_30; } -static UnkStruct_ov21_021E342C * ov21_021E33C4 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E342C *ov21_021E33C4(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E342C * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E342C *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E342C)); @@ -841,10 +840,10 @@ static UnkStruct_ov21_021E342C * ov21_021E33C4 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021E3440 * ov21_021E3400 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E3440 *ov21_021E3400(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E3440 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E3440 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E3440)); @@ -856,37 +855,37 @@ static UnkStruct_ov21_021E3440 * ov21_021E3400 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D4660 * ov21_021E3428 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021E3428(int param0, UnkStruct_ov21_021D0F60 *param1) { return NULL; } -static void ov21_021E342C (UnkStruct_ov21_021E342C * param0) +static void ov21_021E342C(UnkStruct_ov21_021E342C *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E3440 (UnkStruct_ov21_021E3440 * param0) +static void ov21_021E3440(UnkStruct_ov21_021E3440 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E3454 (UnkStruct_ov21_021D4660 * param0) +static void ov21_021E3454(UnkStruct_ov21_021D4660 *param0) { return; } -static int ov21_021E3458 (void) +static int ov21_021E3458(void) { return 0; } -static int ov21_021E345C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E345C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E342C * v0 = param1; - UnkStruct_ov21_021E37B4 * v1 = param0->unk_08; + UnkStruct_ov21_021E342C *v0 = param1; + UnkStruct_ov21_021E37B4 *v1 = param0->unk_08; int v2; v1 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021E37B4)); @@ -905,10 +904,10 @@ static int ov21_021E345C (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E34AC (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E34AC(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E342C * v0 = param1; - UnkStruct_ov21_021E37B4 * v1 = param0->unk_08; + UnkStruct_ov21_021E342C *v0 = param1; + UnkStruct_ov21_021E37B4 *v1 = param0->unk_08; if (param0->unk_0C == 1) { v0->unk_24 = 0; @@ -941,10 +940,10 @@ static int ov21_021E34AC (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021E3520 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E3520(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E342C * v0 = param1; - UnkStruct_ov21_021E37B4 * v1 = param0->unk_08; + UnkStruct_ov21_021E342C *v0 = param1; + UnkStruct_ov21_021E37B4 *v1 = param0->unk_08; ov21_021E37B4(v1); ov21_021E3E74(v1); @@ -955,12 +954,12 @@ static int ov21_021E3520 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E3540 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E3540(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E342C * v0 = param2; - const UnkStruct_ov21_021E37B4 * v1 = param3->unk_08; - UnkStruct_ov21_021E3440 * v2 = param0; - UnkStruct_ov21_021E3900 * v3 = param1->unk_08; + const UnkStruct_ov21_021E342C *v0 = param2; + const UnkStruct_ov21_021E37B4 *v1 = param3->unk_08; + UnkStruct_ov21_021E3440 *v2 = param0; + UnkStruct_ov21_021E3900 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -991,12 +990,12 @@ static int ov21_021E3540 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E35D0 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E35D0(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E342C * v0 = param2; - const UnkStruct_ov21_021E37B4 * v1 = param3->unk_08; - UnkStruct_ov21_021E3440 * v2 = param0; - UnkStruct_ov21_021E3900 * v3 = param1->unk_08; + const UnkStruct_ov21_021E342C *v0 = param2; + const UnkStruct_ov21_021E37B4 *v1 = param3->unk_08; + UnkStruct_ov21_021E3440 *v2 = param0; + UnkStruct_ov21_021E3900 *v3 = param1->unk_08; int v4; for (v4 = 0; v4 < 6; v4++) { @@ -1008,12 +1007,12 @@ static int ov21_021E35D0 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E3604 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E3604(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E342C * v0 = param2; - const UnkStruct_ov21_021E37B4 * v1 = param3->unk_08; - UnkStruct_ov21_021E3440 * v2 = param0; - UnkStruct_ov21_021E3900 * v3 = param1->unk_08; + const UnkStruct_ov21_021E342C *v0 = param2; + const UnkStruct_ov21_021E37B4 *v1 = param3->unk_08; + UnkStruct_ov21_021E3440 *v2 = param0; + UnkStruct_ov21_021E3900 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -1044,7 +1043,7 @@ static int ov21_021E3604 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021E3688 (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1, int param2) +static void ov21_021E3688(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, int param2) { param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 6); @@ -1060,7 +1059,7 @@ static void ov21_021E3688 (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E param0->unk_00 = sub_02023FCC(param0->unk_04, 6, ov21_021E37CC, ¶m0->unk_08, param2); } -static void ov21_021E3724 (UnkStruct_ov21_021E342C * param0) +static void ov21_021E3724(UnkStruct_ov21_021E342C *param0) { int v0; @@ -1069,7 +1068,7 @@ static void ov21_021E3724 (UnkStruct_ov21_021E342C * param0) } } -static void ov21_021E3734 (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1) +static void ov21_021E3734(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1) { if (param1->unk_2C == 0) { sub_0202404C(param0->unk_00); @@ -1113,19 +1112,19 @@ static void ov21_021E3734 (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E } } -static void ov21_021E37B4 (UnkStruct_ov21_021E37B4 * param0) +static void ov21_021E37B4(UnkStruct_ov21_021E37B4 *param0) { sub_02024034(param0->unk_00); Heap_FreeToHeap(param0->unk_04); param0->unk_04 = NULL; } -static void ov21_021E37CC (u32 param0, u32 param1, void * param2) +static void ov21_021E37CC(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021E37CC * v0 = param2; - UnkStruct_ov21_021E342C * v1 = v0->unk_00; - UnkStruct_ov21_021E37B4 * v2 = v0->unk_04; - UnkStruct_ov21_021E2BA8 * v3 = v1->unk_04; + UnkStruct_ov21_021E37CC *v0 = param2; + UnkStruct_ov21_021E342C *v1 = v0->unk_00; + UnkStruct_ov21_021E37B4 *v2 = v0->unk_04; + UnkStruct_ov21_021E2BA8 *v3 = v1->unk_04; v1->unk_0C[param0] = param1; @@ -1205,7 +1204,7 @@ static void ov21_021E37CC (u32 param0, u32 param1, void * param2) } } -static void ov21_021E3900 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1, const UnkStruct_ov21_021E342C * param2, int param3) +static void ov21_021E3900(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, const UnkStruct_ov21_021E342C *param2, int param3) { ov21_021E3960(param1, param2, param3); ov21_021E39FC(param0, param1, param3); @@ -1214,7 +1213,7 @@ static void ov21_021E3900 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E ov21_021E3FE4(param0, param2); } -static void ov21_021E393C (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1) +static void ov21_021E393C(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1) { ov21_021E3BDC(param0); ov21_021E3BC0(param0); @@ -1222,10 +1221,10 @@ static void ov21_021E393C (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E sub_02019EBC(param1->unk_00->unk_00, 5); } -static void ov21_021E3960 (UnkStruct_ov21_021E3440 * param0, const UnkStruct_ov21_021E342C * param1, int param2) +static void ov21_021E3960(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_021E342C *param1, int param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; if (param1->unk_04->unk_30) { ov21_021D276C(param0->unk_00, 6, 4, 0, 0, param2); @@ -1244,10 +1243,10 @@ static void ov21_021E3960 (UnkStruct_ov21_021E3440 * param0, const UnkStruct_ov2 sub_0201C3C0(param0->unk_00->unk_00, 5); } -static void ov21_021E39FC (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1, int param2) +static void ov21_021E39FC(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_18[0] = sub_02009A4C(v0->unk_13C[0], v1, 96, 1, 96 + 2100, NNS_G2D_VRAM_TYPE_2DSUB, param2); @@ -1263,9 +1262,9 @@ static void ov21_021E39FC (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E param0->unk_18[3] = sub_02009BC4(v0->unk_13C[3], v1, 95, 1, 95 + 2100, 3, param2); } -static void ov21_021E3AAC (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1) +static void ov21_021E3AAC(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_18[0]); sub_0200A6DC(param0->unk_18[1]); @@ -1276,11 +1275,11 @@ static void ov21_021E3AAC (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E sub_02009D68(v0->unk_13C[3], param0->unk_18[3]); } -static void ov21_021E3AF0 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1, int param2) +static void ov21_021E3AF0(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3; sub_020093B4(&v0, 96 + 2100, 11 + 2100, 94 + 2100, 95 + 2100, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -1319,7 +1318,7 @@ static void ov21_021E3AF0 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E } } -static void ov21_021E3BC0 (UnkStruct_ov21_021E3900 * param0) +static void ov21_021E3BC0(UnkStruct_ov21_021E3900 *param0) { int v0; @@ -1328,17 +1327,17 @@ static void ov21_021E3BC0 (UnkStruct_ov21_021E3900 * param0) } } -static void ov21_021E3BD8 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1, int param2) +static void ov21_021E3BD8(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, int param2) { return; } -static void ov21_021E3BDC (UnkStruct_ov21_021E3900 * param0) +static void ov21_021E3BDC(UnkStruct_ov21_021E3900 *param0) { return; } -static void ov21_021E3BE0 (UnkStruct_ov21_021E326C * param0) +static void ov21_021E3BE0(UnkStruct_ov21_021E326C *param0) { int v0; @@ -1347,7 +1346,7 @@ static void ov21_021E3BE0 (UnkStruct_ov21_021E326C * param0) } } -static void ov21_021E3BFC (UnkStruct_ov21_021E326C * param0) +static void ov21_021E3BFC(UnkStruct_ov21_021E326C *param0) { int v0; @@ -1356,9 +1355,9 @@ static void ov21_021E3BFC (UnkStruct_ov21_021E326C * param0) } } -static BOOL ov21_021E3C18 (UnkStruct_ov21_021E342C * param0, int param1, int param2) +static BOOL ov21_021E3C18(UnkStruct_ov21_021E342C *param0, int param1, int param2) { - UnkStruct_ov21_021E2BA8 * v0 = param0->unk_04; + UnkStruct_ov21_021E2BA8 *v0 = param0->unk_04; BOOL v1; v1 = ov21_021E2EC4(v0, param1, param2); @@ -1370,15 +1369,15 @@ static BOOL ov21_021E3C18 (UnkStruct_ov21_021E342C * param0, int param1, int par return v1; } -static void ov21_021E3C2C (UnkStruct_ov21_021E342C * param0) +static void ov21_021E3C2C(UnkStruct_ov21_021E342C *param0) { - UnkStruct_ov21_021E2BA8 * v0 = param0->unk_04; + UnkStruct_ov21_021E2BA8 *v0 = param0->unk_04; ov21_021E3C34(param0); } -static void ov21_021E3C34 (UnkStruct_ov21_021E342C * param0) +static void ov21_021E3C34(UnkStruct_ov21_021E342C *param0) { - UnkStruct_ov21_021E2BA8 * v0 = param0->unk_04; + UnkStruct_ov21_021E2BA8 *v0 = param0->unk_04; int v1; int v2; @@ -1392,12 +1391,12 @@ static void ov21_021E3C34 (UnkStruct_ov21_021E342C * param0) } } -static void ov21_021E3C64 (UnkStruct_ov21_021E342C * param0) +static void ov21_021E3C64(UnkStruct_ov21_021E342C *param0) { param0->unk_2C = 0; } -static void ov21_021E3C6C (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1, int param2) +static void ov21_021E3C6C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1, int param2) { int v0; @@ -1421,9 +1420,9 @@ static void ov21_021E3C6C (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E ov21_021D4F04(param0->unk_14, param0->unk_18, 6, 1); } -static void ov21_021E3D48 (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1) +static void ov21_021E3D48(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1) { - UnkStruct_ov21_021E2BA8 * v0 = param1->unk_04; + UnkStruct_ov21_021E2BA8 *v0 = param1->unk_04; if (param1->unk_2C) { return; @@ -1494,7 +1493,7 @@ static void ov21_021E3D48 (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E } } -static void ov21_021E3E74 (UnkStruct_ov21_021E37B4 * param0) +static void ov21_021E3E74(UnkStruct_ov21_021E37B4 *param0) { Heap_FreeToHeap(param0->unk_18); ov21_021D4EFC(param0->unk_14); @@ -1502,9 +1501,9 @@ static void ov21_021E3E74 (UnkStruct_ov21_021E37B4 * param0) param0->unk_18 = NULL; } -static void ov21_021E3E8C (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1) +static void ov21_021E3E8C(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1) { - UnkStruct_ov21_021E2BA8 * v0 = param1->unk_04; + UnkStruct_ov21_021E2BA8 *v0 = param1->unk_04; param1->unk_30 = 0; @@ -1529,11 +1528,11 @@ static void ov21_021E3E8C (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E } } -static void ov21_021E3EEC (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E342C * param1) +static void ov21_021E3EEC(UnkStruct_ov21_021E37B4 *param0, UnkStruct_ov21_021E342C *param1) { - UnkStruct_ov21_021E2BA8 * v0 = param1->unk_04; + UnkStruct_ov21_021E2BA8 *v0 = param1->unk_04; - if ((v0->unk_08 == 0)) { + if (v0->unk_08 == 0) { return; } @@ -1541,7 +1540,7 @@ static void ov21_021E3EEC (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E return; } - if ((param1->unk_30 == 0)) { + if (param1->unk_30 == 0) { if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { param1->unk_30 = 1; } @@ -1552,20 +1551,20 @@ static void ov21_021E3EEC (UnkStruct_ov21_021E37B4 * param0, UnkStruct_ov21_021E } } -static void ov21_021E3F2C (UnkStruct_ov21_021E3440 * param0, const UnkStruct_ov21_021E37B4 * param1, const UnkStruct_ov21_021E342C * param2) +static void ov21_021E3F2C(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_021E37B4 *param1, const UnkStruct_ov21_021E342C *param2) { ov21_021D25B8(param1->unk_14, param0->unk_00); ov21_021E3F48(param0, param1, param2); } -static void ov21_021E3F48 (UnkStruct_ov21_021E3440 * param0, const UnkStruct_ov21_021E37B4 * param1, const UnkStruct_ov21_021E342C * param2) +static void ov21_021E3F48(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_021E37B4 *param1, const UnkStruct_ov21_021E342C *param2) { BOOL v0; - if ((ov21_021D3998(param2->unk_08) != 0)) { + if (ov21_021D3998(param2->unk_08) != 0) { v0 = ov21_021E3F98(param0, 1); - if ((param2->unk_30 == 0)) { + if (param2->unk_30 == 0) { if (v0) { ov21_021D25B8(param1->unk_14, param0->unk_00); } @@ -1577,15 +1576,15 @@ static void ov21_021E3F48 (UnkStruct_ov21_021E3440 * param0, const UnkStruct_ov2 } } -static void ov21_021E3F88 (UnkStruct_ov21_021E3440 * param0, const UnkStruct_ov21_021E37B4 * param1) +static void ov21_021E3F88(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_021E37B4 *param1) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; ov21_021D2544(param1->unk_14, v0); } -static BOOL ov21_021E3F98 (UnkStruct_ov21_021E3440 * param0, BOOL param1) +static BOOL ov21_021E3F98(UnkStruct_ov21_021E3440 *param0, BOOL param1) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; if (ov21_021D25A0(&v0->unk_1E0) != param1) { ov21_021D2584(&v0->unk_1E0, param1); @@ -1595,13 +1594,13 @@ static BOOL ov21_021E3F98 (UnkStruct_ov21_021E3440 * param0, BOOL param1) return 0; } -static void ov21_021E3FC0 (UnkStruct_ov21_021E326C * param0, int param1, int param2) +static void ov21_021E3FC0(UnkStruct_ov21_021E326C *param0, int param1, int param2) { sub_020129D0(param0->unk_04[param2]->unk_00, 0); sub_020129D0(param0->unk_04[param1]->unk_00, 1); } -static void ov21_021E3FE4 (UnkStruct_ov21_021E3900 * param0, const UnkStruct_ov21_021E342C * param1) +static void ov21_021E3FE4(UnkStruct_ov21_021E3900 *param0, const UnkStruct_ov21_021E342C *param1) { if (ov21_021D3954(param1->unk_08) == 0) { sub_02021CAC(param0->unk_00[4], 0); diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c index 8c07b3c992..78c3e2ba38 100644 --- a/src/overlay021/ov21_021E3FFC.c +++ b/src/overlay021/ov21_021E3FFC.c @@ -1,48 +1,48 @@ +#include "overlay021/ov21_021E3FFC.h" + #include #include -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/ov21_021E4CA4.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D2648.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "heap.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_020218BC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021E29DC.h" -#include "overlay021/ov21_021E3FFC.h" -#include "overlay021/ov21_021E4CA4.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; - UnkStruct_ov21_021E68F4 * unk_08; - UnkStruct_ov21_021E68F4 * unk_0C; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; + UnkStruct_ov21_021E68F4 *unk_08; + UnkStruct_ov21_021E68F4 *unk_0C; } UnkStruct_ov21_021E40F4; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; int unk_04; int unk_08; int unk_0C; @@ -50,19 +50,19 @@ typedef struct { } UnkStruct_ov21_021E4108; typedef struct { - const SNDWaveData * unk_00; + const SNDWaveData *unk_00; int unk_04; int unk_08; u8 unk_0C[9]; } UnkStruct_ov21_021E4898; typedef struct { - GraphicElementData * unk_00; + GraphicElementData *unk_00; int unk_04; } UnkStruct_ov21_021E4B30_sub1; typedef struct { - GraphicElementData * unk_00; + GraphicElementData *unk_00; int unk_04; int unk_08; } UnkStruct_ov21_021E4B30_sub2; @@ -75,57 +75,57 @@ typedef struct { typedef struct { UnkStruct_ov21_021D2648 unk_00; UnkStruct_ov21_021E4B30 unk_20[9]; - UnkStruct_02009DC8 * unk_314[4]; + UnkStruct_02009DC8 *unk_314[4]; int unk_324; int unk_328; int unk_32C; } UnkStruct_ov21_021E4360; -static UnkStruct_ov21_021E40F4 * ov21_021E4080(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021E4108 * ov21_021E40C8(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021E40F4(UnkStruct_ov21_021E40F4 * param0); -static void ov21_021E4108(UnkStruct_ov21_021E4108 * param0); +static UnkStruct_ov21_021E40F4 *ov21_021E4080(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E4108 *ov21_021E40C8(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E40F4(UnkStruct_ov21_021E40F4 *param0); +static void ov21_021E4108(UnkStruct_ov21_021E4108 *param0); static int ov21_021E411C(void); -static int ov21_021E4120(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E4168(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E4194(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E41A8(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E4268(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E4288(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021E4328(UnkStruct_ov21_021E4108 * param0, const UnkStruct_ov21_021E40F4 * param1); -static void ov21_021E4360(UnkStruct_ov21_021E4360 * param0); -static void ov21_021E4394(UnkStruct_ov21_021E4360 * param0); -static void ov21_021E43C8(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, BOOL param3); -static BOOL ov21_021E4440(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, BOOL param3); -static void ov21_021E448C(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, BOOL param3); -static BOOL ov21_021E4518(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, BOOL param3); -static void ov21_021E4590(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, const UnkStruct_ov21_021E4898 * param3, int param4); -static void ov21_021E45DC(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1); -static void ov21_021E45FC(UnkStruct_ov21_021E4108 * param0, const UnkStruct_ov21_021E40F4 * param1, int param2); -static void ov21_021E4664(UnkStruct_ov21_021E4108 * param0); -static void ov21_021E46A8(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, int param2); -static void ov21_021E4770(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1); -static void ov21_021E47CC(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, int param2); -static void ov21_021E4868(UnkStruct_ov21_021E4360 * param0); -static void ov21_021E4890(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, int param3); -static void ov21_021E4894(UnkStruct_ov21_021E4360 * param0); -static void ov21_021E4898(UnkStruct_ov21_021E4898 * param0, UnkStruct_ov21_021E40F4 * param1); -static void ov21_021E4ABC(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1); -static void ov21_021E4A28(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E4898 * param2); -static void ov21_021E48B0(UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const SNDWaveData * param2, int param3, int param4, int param5, int param6, int param7, int * param8); -static void ov21_021E49D0(UnkStruct_ov21_021E4108 * param0, int param1, int param2, int param3, int param4, int * param5); -static void ov21_021E495C(Window * param0, u8 param1, int param2, int param3, int * param4); -static void ov21_021E4C68(UnkStruct_ov21_021E4898 * param0, UnkStruct_ov21_021E40F4 * param1); -static void ov21_021E4AF4(UnkStruct_ov21_021E4360 * param0); -static void ov21_021E4B10(UnkStruct_ov21_021E4360 * param0, const UnkStruct_ov21_021E4898 * param1); -static void ov21_021E4B30(UnkStruct_ov21_021E4B30 * param0, int param1); -static void ov21_021E4B94(UnkStruct_ov21_021E4B30 * param0, int param1); -static void ov21_021E4C38(GraphicElementData * param0, int param1); - -void ov21_021E3FFC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) -{ - UnkStruct_ov21_021E40F4 * v0; - UnkStruct_ov21_021E4108 * v1; +static int ov21_021E4120(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E4168(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E4194(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E41A8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E4268(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E4288(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021E4328(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_021E40F4 *param1); +static void ov21_021E4360(UnkStruct_ov21_021E4360 *param0); +static void ov21_021E4394(UnkStruct_ov21_021E4360 *param0); +static void ov21_021E43C8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3); +static BOOL ov21_021E4440(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3); +static void ov21_021E448C(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3); +static BOOL ov21_021E4518(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3); +static void ov21_021E4590(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, const UnkStruct_ov21_021E4898 *param3, int param4); +static void ov21_021E45DC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1); +static void ov21_021E45FC(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_021E40F4 *param1, int param2); +static void ov21_021E4664(UnkStruct_ov21_021E4108 *param0); +static void ov21_021E46A8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2); +static void ov21_021E4770(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1); +static void ov21_021E47CC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2); +static void ov21_021E4868(UnkStruct_ov21_021E4360 *param0); +static void ov21_021E4890(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, int param3); +static void ov21_021E4894(UnkStruct_ov21_021E4360 *param0); +static void ov21_021E4898(UnkStruct_ov21_021E4898 *param0, UnkStruct_ov21_021E40F4 *param1); +static void ov21_021E4ABC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1); +static void ov21_021E4A28(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E4898 *param2); +static void ov21_021E48B0(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const SNDWaveData *param2, int param3, int param4, int param5, int param6, int param7, int *param8); +static void ov21_021E49D0(UnkStruct_ov21_021E4108 *param0, int param1, int param2, int param3, int param4, int *param5); +static void ov21_021E495C(Window *param0, u8 param1, int param2, int param3, int *param4); +static void ov21_021E4C68(UnkStruct_ov21_021E4898 *param0, UnkStruct_ov21_021E40F4 *param1); +static void ov21_021E4AF4(UnkStruct_ov21_021E4360 *param0); +static void ov21_021E4B10(UnkStruct_ov21_021E4360 *param0, const UnkStruct_ov21_021E4898 *param1); +static void ov21_021E4B30(UnkStruct_ov21_021E4B30 *param0, int param1); +static void ov21_021E4B94(UnkStruct_ov21_021E4B30 *param0, int param1); +static void ov21_021E4C38(GraphicElementData *param0, int param1); + +void ov21_021E3FFC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +{ + UnkStruct_ov21_021E40F4 *v0; + UnkStruct_ov21_021E4108 *v1; v0 = ov21_021E4080(param2, param1); v1 = ov21_021E40C8(param2, param1); @@ -142,36 +142,36 @@ void ov21_021E3FFC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021E4288; } -void ov21_021E4054 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021E4054(UnkStruct_ov21_021E68F4 *param0) { ov21_021E40F4(param0->unk_00); ov21_021E4108(param0->unk_04); } -void ov21_021E4068 (UnkStruct_ov21_021E68F4 * param0, int param1, int param2) +void ov21_021E4068(UnkStruct_ov21_021E68F4 *param0, int param1, int param2) { - UnkStruct_ov21_021E4108 * v0 = param0->unk_04; + UnkStruct_ov21_021E4108 *v0 = param0->unk_04; v0->unk_04 = param1; v0->unk_08 = param2; } -void ov21_021E4070 (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021E4070(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021E4108 * v0 = param0->unk_04; + UnkStruct_ov21_021E4108 *v0 = param0->unk_04; v0->unk_0C = param1; } -void ov21_021E4078 (UnkStruct_ov21_021E68F4 * param0, int param1) +void ov21_021E4078(UnkStruct_ov21_021E68F4 *param0, int param1) { - UnkStruct_ov21_021E4108 * v0 = param0->unk_04; + UnkStruct_ov21_021E4108 *v0 = param0->unk_04; v0->unk_10 = param1; } -static UnkStruct_ov21_021E40F4 * ov21_021E4080 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E40F4 *ov21_021E4080(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E40F4 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E40F4 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E40F4)); @@ -186,10 +186,10 @@ static UnkStruct_ov21_021E40F4 * ov21_021E4080 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021E4108 * ov21_021E40C8 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E4108 *ov21_021E40C8(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E4108 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E4108 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E4108)); @@ -201,27 +201,27 @@ static UnkStruct_ov21_021E4108 * ov21_021E40C8 (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021E40F4 (UnkStruct_ov21_021E40F4 * param0) +static void ov21_021E40F4(UnkStruct_ov21_021E40F4 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E4108 (UnkStruct_ov21_021E4108 * param0) +static void ov21_021E4108(UnkStruct_ov21_021E4108 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static int ov21_021E411C (void) +static int ov21_021E411C(void) { return 0; } -static int ov21_021E4120 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E4120(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E40F4 * v0 = param1; - UnkStruct_ov21_021E4898 * v1; + UnkStruct_ov21_021E40F4 *v0 = param1; + UnkStruct_ov21_021E4898 *v1; int v2 = ov21_021D37BC(v0->unk_04); v1 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021E4898)); @@ -239,10 +239,10 @@ static int ov21_021E4120 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E4168 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E4168(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E40F4 * v0 = param1; - UnkStruct_ov21_021E4898 * v1 = param0->unk_08; + UnkStruct_ov21_021E40F4 *v0 = param1; + UnkStruct_ov21_021E4898 *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -258,9 +258,9 @@ static int ov21_021E4168 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021E4194 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E4194(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E4898 * v0 = param0->unk_08; + UnkStruct_ov21_021E4898 *v0 = param0->unk_08; Heap_FreeToHeap(v0); param0->unk_08 = NULL; @@ -268,12 +268,12 @@ static int ov21_021E4194 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E41A8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E41A8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E40F4 * v0 = param2; - const UnkStruct_ov21_021E4898 * v1 = param3->unk_08; - UnkStruct_ov21_021E4108 * v2 = param0; - UnkStruct_ov21_021E4360 * v3 = param1->unk_08; + const UnkStruct_ov21_021E40F4 *v0 = param2; + const UnkStruct_ov21_021E4898 *v1 = param3->unk_08; + UnkStruct_ov21_021E4108 *v2 = param0; + UnkStruct_ov21_021E4360 *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -314,12 +314,12 @@ static int ov21_021E41A8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E4268 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E4268(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E40F4 * v0 = param2; - const UnkStruct_ov21_021E4898 * v1 = param3->unk_08; - UnkStruct_ov21_021E4108 * v2 = param0; - UnkStruct_ov21_021E4360 * v3 = param1->unk_08; + const UnkStruct_ov21_021E40F4 *v0 = param2; + const UnkStruct_ov21_021E4898 *v1 = param3->unk_08; + UnkStruct_ov21_021E4108 *v2 = param0; + UnkStruct_ov21_021E4360 *v3 = param1->unk_08; ov21_021E4A28(v3, v2, v1); ov21_021E4B10(v3, v1); @@ -327,12 +327,12 @@ static int ov21_021E4268 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E4288 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E4288(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E40F4 * v0 = param2; - const UnkStruct_ov21_021E4898 * v1 = param3->unk_08; - UnkStruct_ov21_021E4108 * v2 = param0; - UnkStruct_ov21_021E4360 * v3 = param1->unk_08; + const UnkStruct_ov21_021E40F4 *v0 = param2; + const UnkStruct_ov21_021E4898 *v1 = param3->unk_08; + UnkStruct_ov21_021E4108 *v2 = param0; + UnkStruct_ov21_021E4360 *v3 = param1->unk_08; BOOL v4; switch (param1->unk_00) { @@ -374,16 +374,16 @@ static int ov21_021E4288 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021E4328 (UnkStruct_ov21_021E4108 * param0, const UnkStruct_ov21_021E40F4 * param1) +static void ov21_021E4328(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_021E40F4 *param1) { - Sprite * v0 = ov21_021D2170(param0->unk_00); + Sprite *v0 = ov21_021D2170(param0->unk_00); int v1 = ov21_021D37BC(param1->unk_04); ov21_021D1890(param0->unk_00, param1->unk_04, v1, 2, 48, 64); sub_02007DEC(v0, 6, 0); } -static void ov21_021E4360 (UnkStruct_ov21_021E4360 * param0) +static void ov21_021E4360(UnkStruct_ov21_021E4360 *param0) { int v0, v1; @@ -396,7 +396,7 @@ static void ov21_021E4360 (UnkStruct_ov21_021E4360 * param0) } } -static void ov21_021E4394 (UnkStruct_ov21_021E4360 * param0) +static void ov21_021E4394(UnkStruct_ov21_021E4360 *param0) { int v0, v1; @@ -409,7 +409,7 @@ static void ov21_021E4394 (UnkStruct_ov21_021E4360 * param0) } } -static void ov21_021E43C8 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, BOOL param3) +static void ov21_021E43C8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3) { ov21_021E4360(param0); @@ -424,7 +424,7 @@ static void ov21_021E43C8 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E ov21_021D24FC(param1->unk_00, ¶m1->unk_00->unk_168); } -static BOOL ov21_021E4440 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, BOOL param3) +static BOOL ov21_021E4440(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3) { BOOL v0; @@ -447,7 +447,7 @@ static BOOL ov21_021E4440 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E return 0; } -static void ov21_021E448C (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, BOOL param3) +static void ov21_021E448C(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3) { ov21_021E4360(param0); @@ -464,7 +464,7 @@ static void ov21_021E448C (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E } } -static BOOL ov21_021E4518 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, BOOL param3) +static BOOL ov21_021E4518(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, BOOL param3) { BOOL v0[2]; int v1; @@ -499,7 +499,7 @@ static BOOL ov21_021E4518 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E return 0; } -static void ov21_021E4590 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, const UnkStruct_ov21_021E4898 * param3, int param4) +static void ov21_021E4590(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, const UnkStruct_ov21_021E4898 *param3, int param4) { ov21_021E45FC(param1, param2, param4); ov21_021E46A8(param0, param1, param4); @@ -510,7 +510,7 @@ static void ov21_021E4590 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E ov21_021E4AF4(param0); } -static void ov21_021E45DC (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1) +static void ov21_021E45DC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1) { ov21_021E4894(param0); ov21_021E4868(param0); @@ -518,10 +518,10 @@ static void ov21_021E45DC (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E ov21_021E4664(param1); } -static void ov21_021E45FC (UnkStruct_ov21_021E4108 * param0, const UnkStruct_ov21_021E40F4 * param1, int param2) +static void ov21_021E45FC(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_021E40F4 *param1, int param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param2); v0 = ov21_021D27B8(param0->unk_00, 70, 1, &v1, param2); @@ -531,7 +531,7 @@ static void ov21_021E45FC (UnkStruct_ov21_021E4108 * param0, const UnkStruct_ov2 sub_0201C3C0(param0->unk_00->unk_00, 3); } -static void ov21_021E4664 (UnkStruct_ov21_021E4108 * param0) +static void ov21_021E4664(UnkStruct_ov21_021E4108 *param0) { sub_0201C63C(param0->unk_00->unk_00, 1, 0, 0); BGL_WindowColor(¶m0->unk_00->unk_04, 0, 0, 0, 256, 192); @@ -539,10 +539,10 @@ static void ov21_021E4664 (UnkStruct_ov21_021E4108 * param0) sub_0201C2B4(¶m0->unk_00->unk_04, 0); } -static void ov21_021E46A8 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, int param2) +static void ov21_021E46A8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_314[0] = sub_02009A4C(v0->unk_13C[0], v1, 116, 1, 116 + 11000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -558,9 +558,9 @@ static void ov21_021E46A8 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E param0->unk_314[3] = sub_02009BC4(v0->unk_13C[3], v1, 115, 1, 115 + 11000, 3, param2); } -static void ov21_021E4770 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1) +static void ov21_021E4770(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_314[0]); sub_0200A6DC(param0->unk_314[1]); @@ -571,11 +571,11 @@ static void ov21_021E4770 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E sub_02009D68(v0->unk_13C[3], param0->unk_314[3]); } -static void ov21_021E47CC (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, int param2) +static void ov21_021E47CC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3, v4; sub_020093B4(&v0, 116 + 11000, 19 + 11000, 117 + 11000, 115 + 11000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -597,7 +597,7 @@ static void ov21_021E47CC (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E } } -static void ov21_021E4868 (UnkStruct_ov21_021E4360 * param0) +static void ov21_021E4868(UnkStruct_ov21_021E4360 *param0) { int v0, v1; @@ -610,25 +610,25 @@ static void ov21_021E4868 (UnkStruct_ov21_021E4360 * param0) } } -static void ov21_021E4890 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E40F4 * param2, int param3) +static void ov21_021E4890(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E40F4 *param2, int param3) { return; } -static void ov21_021E4894 (UnkStruct_ov21_021E4360 * param0) +static void ov21_021E4894(UnkStruct_ov21_021E4360 *param0) { return; } -static void ov21_021E4898 (UnkStruct_ov21_021E4898 * param0, UnkStruct_ov21_021E40F4 * param1) +static void ov21_021E4898(UnkStruct_ov21_021E4898 *param0, UnkStruct_ov21_021E40F4 *param1) { int v0 = ov21_021E4D1C(param1->unk_0C); param0->unk_04 = sub_02005188(1, param0->unk_00, v0); } -static void ov21_021E48B0 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const SNDWaveData * param2, int param3, int param4, int param5, int param6, int param7, int * param8) +static void ov21_021E48B0(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const SNDWaveData *param2, int param3, int param4, int param5, int param6, int param7, int *param8) { - const u8 * v0 = sub_020050E0(param2); + const u8 *v0 = sub_020050E0(param2); int v1; int v2; int v3; @@ -648,7 +648,7 @@ static void ov21_021E48B0 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E } } -static void ov21_021E495C (Window * param0, u8 param1, int param2, int param3, int * param4) +static void ov21_021E495C(Window *param0, u8 param1, int param2, int param3, int *param4) { int v0; int v1; @@ -684,7 +684,7 @@ static void ov21_021E495C (Window * param0, u8 param1, int param2, int param3, i *param4 = v0; } -static void ov21_021E49D0 (UnkStruct_ov21_021E4108 * param0, int param1, int param2, int param3, int param4, int * param5) +static void ov21_021E49D0(UnkStruct_ov21_021E4108 *param0, int param1, int param2, int param3, int param4, int *param5) { int v0; @@ -696,7 +696,7 @@ static void ov21_021E49D0 (UnkStruct_ov21_021E4108 * param0, int param1, int par } } -static void ov21_021E4A28 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, const UnkStruct_ov21_021E4898 * param2) +static void ov21_021E4A28(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, const UnkStruct_ov21_021E4898 *param2) { int v0; @@ -721,14 +721,14 @@ static void ov21_021E4A28 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E param0->unk_32C = param2->unk_04; } -static void ov21_021E4ABC (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1) +static void ov21_021E4ABC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1) { sub_0201C2B4(¶m1->unk_00->unk_04, 9); ov21_021E49D0(param1, 0, 256, 0, 151, ¶m0->unk_328); sub_0201A954(¶m1->unk_00->unk_04); } -static void ov21_021E4AF4 (UnkStruct_ov21_021E4360 * param0) +static void ov21_021E4AF4(UnkStruct_ov21_021E4360 *param0) { int v0; @@ -737,7 +737,7 @@ static void ov21_021E4AF4 (UnkStruct_ov21_021E4360 * param0) } } -static void ov21_021E4B10 (UnkStruct_ov21_021E4360 * param0, const UnkStruct_ov21_021E4898 * param1) +static void ov21_021E4B10(UnkStruct_ov21_021E4360 *param0, const UnkStruct_ov21_021E4898 *param1) { int v0; @@ -746,7 +746,7 @@ static void ov21_021E4B10 (UnkStruct_ov21_021E4360 * param0, const UnkStruct_ov2 } } -static void ov21_021E4B30 (UnkStruct_ov21_021E4B30 * param0, int param1) +static void ov21_021E4B30(UnkStruct_ov21_021E4B30 *param0, int param1) { int v0; VecFx32 v1; @@ -769,7 +769,7 @@ static void ov21_021E4B30 (UnkStruct_ov21_021E4B30 * param0, int param1) sub_02021CAC(param0->unk_48.unk_00, 0); } -static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1) +static void ov21_021E4B94(UnkStruct_ov21_021E4B30 *param0, int param1) { int v0; int v1 = 0; @@ -813,10 +813,10 @@ static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1) } } -static void ov21_021E4C38 (GraphicElementData * param0, int param1) +static void ov21_021E4C38(GraphicElementData *param0, int param1) { VecFx32 v0; - const VecFx32 * v1; + const VecFx32 *v1; v1 = sub_02021D28(param0); v0 = *v1; @@ -825,7 +825,7 @@ static void ov21_021E4C38 (GraphicElementData * param0, int param1) sub_02021C50(param0, &v0); } -static void ov21_021E4C68 (UnkStruct_ov21_021E4898 * param0, UnkStruct_ov21_021E40F4 * param1) +static void ov21_021E4C68(UnkStruct_ov21_021E4898 *param0, UnkStruct_ov21_021E40F4 *param1) { int v0 = ov21_021E4D1C(param1->unk_0C); diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c index 512f46bb8b..5d8edfdb42 100644 --- a/src/overlay021/ov21_021E4CA4.c +++ b/src/overlay021/ov21_021E4CA4.c @@ -1,28 +1,34 @@ +#include "overlay021/ov21_021E4CA4.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4660.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "core_sys.h" +#include "heap.h" +#include "touch_screen.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_020093B4.h" @@ -30,42 +36,35 @@ #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201F834.h" #include "unk_020218BC.h" #include "unk_02023FCC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021E29DC.h" -#include "overlay021/ov21_021E4CA4.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; - UnkStruct_ov21_021E68F4 * unk_08; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; + UnkStruct_ov21_021E68F4 *unk_08; int unk_0C; } UnkStruct_ov21_021E4D90; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021E4DA4; typedef struct { - void * unk_00; - void * unk_04; + void *unk_00; + void *unk_04; } UnkStruct_ov21_021E5228; typedef struct { - UnkStruct_02023FCC * unk_00; - TouchScreenHitTable * unk_04; + UnkStruct_02023FCC *unk_00; + TouchScreenHitTable *unk_04; UnkStruct_ov21_021E5228 unk_08; - TouchScreenHitTable * unk_10; - UnkStruct_02023FCC * unk_14; + TouchScreenHitTable *unk_10; + UnkStruct_02023FCC *unk_14; int unk_18[2]; BOOL unk_20; BOOL unk_24; @@ -86,7 +85,7 @@ typedef struct { int unk_60; BOOL unk_64; int unk_68; - const SNDWaveData * unk_6C; + const SNDWaveData *unk_6C; } UnkStruct_ov21_021E51DC; typedef struct { @@ -99,97 +98,97 @@ typedef struct { } UnkStruct_ov21_021E5C80; typedef struct { - GraphicElementData * unk_00; - GraphicElementData * unk_04; + GraphicElementData *unk_00; + GraphicElementData *unk_04; UnkStruct_ov21_021E5C80 unk_08; - GraphicElementData * unk_20; + GraphicElementData *unk_20; UnkStruct_ov21_021E5C80 unk_24; - GraphicElementData * unk_3C; + GraphicElementData *unk_3C; int unk_40; fx32 unk_44; int unk_48; u16 unk_4C; - UnkStruct_ov21_021D4CA0 * unk_50[2]; - UnkStruct_02009DC8 * unk_58[4]; - void * unk_68; - NNSG2dPaletteData * unk_6C; + UnkStruct_ov21_021D4CA0 *unk_50[2]; + UnkStruct_02009DC8 *unk_58[4]; + void *unk_68; + NNSG2dPaletteData *unk_6C; BOOL unk_70; } UnkStruct_ov21_021E5004; -static UnkStruct_ov21_021E4D90 * ov21_021E4D24(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021E4DA4 * ov21_021E4D64(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021E4D8C(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021E4D90(UnkStruct_ov21_021E4D90 * param0); -static void ov21_021E4DA4(UnkStruct_ov21_021E4DA4 * param0); -static void ov21_021E4DB8(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021E4D90 *ov21_021E4D24(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E4DA4 *ov21_021E4D64(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E4D8C(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E4D90(UnkStruct_ov21_021E4D90 *param0); +static void ov21_021E4DA4(UnkStruct_ov21_021E4DA4 *param0); +static void ov21_021E4DB8(UnkStruct_ov21_021D4660 *param0); static int ov21_021E4DBC(void); -static int ov21_021E4DC0(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E4E00(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E4E84(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E4E98(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E4F20(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E4F78(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021E5004(UnkStruct_ov21_021E5004 * param0); -static void ov21_021E5040(UnkStruct_ov21_021E5004 * param0); -static void ov21_021E507C(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, const UnkStruct_ov21_021E4D90 * param2, BOOL param3); -static BOOL ov21_021E50EC(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, const UnkStruct_ov21_021E4D90 * param2, BOOL param3); -static void ov21_021E5128(UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1, int param2); -static void ov21_021E51DC(UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1); -static void ov21_021E5200(UnkStruct_ov21_021E51DC * param0); -static void ov21_021E5228(u32 param0, u32 param1, void * param2); -static void ov21_021E5F5C(UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1); -static void ov21_021E5FD0(UnkStruct_ov21_021E4DA4 * param0, const UnkStruct_ov21_021E4D90 * param1); -static void ov21_021E5268(u32 param0, u32 param1, void * param2); -static void ov21_021E530C(u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStruct_ov21_021E51DC * param2); -static void ov21_021E537C(u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStruct_ov21_021E51DC * param2); -static void ov21_021E545C(u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStruct_ov21_021E51DC * param2); -static void ov21_021E5498(u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStruct_ov21_021E51DC * param2); -static void ov21_021E5DE8(UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1, int param2); -static void ov21_021E5E18(UnkStruct_ov21_021E51DC * param0); -static void ov21_021E5E48(UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1); -static void ov21_021E5E78(UnkStruct_ov21_021E51DC * param0, BOOL param1); -static void ov21_021E5C80(GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, BOOL param3); -static void ov21_021E5CF8(GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3); -static void ov21_021E5D90(GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2); -static void ov21_021E59B4(UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1); -static void ov21_021E5A04(UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1); -static void ov21_021E5A2C(UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1); -static void ov21_021E5C4C(UnkStruct_ov21_021E5004 * param0); -static void ov21_021E5ED8(UnkStruct_ov21_021E51DC * param0, BOOL param1); -static void ov21_021E5EF0(UnkStruct_ov21_021E51DC * param0, BOOL param1); -static void ov21_021E5EF4(UnkStruct_ov21_021E51DC * param0); -static void ov21_021E5F00(UnkStruct_ov21_021E51DC * param0); -static void ov21_021E5F38(UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1); +static int ov21_021E4DC0(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E4E00(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E4E84(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E4E98(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E4F20(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E4F78(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021E5004(UnkStruct_ov21_021E5004 *param0); +static void ov21_021E5040(UnkStruct_ov21_021E5004 *param0); +static void ov21_021E507C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, const UnkStruct_ov21_021E4D90 *param2, BOOL param3); +static BOOL ov21_021E50EC(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, const UnkStruct_ov21_021E4D90 *param2, BOOL param3); +static void ov21_021E5128(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1, int param2); +static void ov21_021E51DC(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1); +static void ov21_021E5200(UnkStruct_ov21_021E51DC *param0); +static void ov21_021E5228(u32 param0, u32 param1, void *param2); +static void ov21_021E5F5C(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1); +static void ov21_021E5FD0(UnkStruct_ov21_021E4DA4 *param0, const UnkStruct_ov21_021E4D90 *param1); +static void ov21_021E5268(u32 param0, u32 param1, void *param2); +static void ov21_021E530C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct_ov21_021E51DC *param2); +static void ov21_021E537C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct_ov21_021E51DC *param2); +static void ov21_021E545C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct_ov21_021E51DC *param2); +static void ov21_021E5498(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct_ov21_021E51DC *param2); +static void ov21_021E5DE8(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1, int param2); +static void ov21_021E5E18(UnkStruct_ov21_021E51DC *param0); +static void ov21_021E5E48(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1); +static void ov21_021E5E78(UnkStruct_ov21_021E51DC *param0, BOOL param1); +static void ov21_021E5C80(GraphicElementData *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2, BOOL param3); +static void ov21_021E5CF8(GraphicElementData *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2, int param3); +static void ov21_021E5D90(GraphicElementData *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2); +static void ov21_021E59B4(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1); +static void ov21_021E5A04(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1); +static void ov21_021E5A2C(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1); +static void ov21_021E5C4C(UnkStruct_ov21_021E5004 *param0); +static void ov21_021E5ED8(UnkStruct_ov21_021E51DC *param0, BOOL param1); +static void ov21_021E5EF0(UnkStruct_ov21_021E51DC *param0, BOOL param1); +static void ov21_021E5EF4(UnkStruct_ov21_021E51DC *param0); +static void ov21_021E5F00(UnkStruct_ov21_021E51DC *param0); +static void ov21_021E5F38(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1); static void ov21_021E5F28(int param0); static void ov21_021E5FF4(int param0); -static void ov21_021E5A44(UnkStruct_ov21_021E51DC * param0); -static void ov21_021E5AAC(UnkStruct_ov21_021E51DC * param0); -static void ov21_021E5AD8(UnkStruct_ov21_021E51DC * param0); -static void ov21_021E5B50(UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1); -static void ov21_021E5E28(UnkStruct_ov21_021E51DC * param0); -static void ov21_021E5B6C(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, const UnkStruct_ov21_021E51DC * param2); -static void ov21_021E5BE4(UnkStruct_ov21_021E51DC * param0, int param1); -static void ov21_021E5C18(UnkStruct_ov21_021E51DC * param0, int param1); -static void ov21_021E54D4(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2); -static void ov21_021E5510(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2); -static void ov21_021E5538(UnkStruct_ov21_021E4DA4 * param0, int param1); -static void ov21_021E5620(UnkStruct_ov21_021E4DA4 * param0); -static void ov21_021E5644(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2); -static void ov21_021E56F0(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1); -static void ov21_021E5734(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2); -static void ov21_021E5898(UnkStruct_ov21_021E5004 * param0); -static void ov21_021E58B8(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2); -static void ov21_021E599C(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1); -static void ov21_021E5E80(UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2); -static void ov21_021E5E98(UnkStruct_ov21_021E5004 * param0); -static void ov21_021E5EAC(UnkStruct_ov21_021E5004 * param0); -static void ov21_021E5EC0(UnkStruct_ov21_021E5004 * param0); - -void ov21_021E4CA4 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) -{ - UnkStruct_ov21_021E4D90 * v0; - UnkStruct_ov21_021E4DA4 * v1; - UnkStruct_ov21_021D4660 * v2; +static void ov21_021E5A44(UnkStruct_ov21_021E51DC *param0); +static void ov21_021E5AAC(UnkStruct_ov21_021E51DC *param0); +static void ov21_021E5AD8(UnkStruct_ov21_021E51DC *param0); +static void ov21_021E5B50(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1); +static void ov21_021E5E28(UnkStruct_ov21_021E51DC *param0); +static void ov21_021E5B6C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, const UnkStruct_ov21_021E51DC *param2); +static void ov21_021E5BE4(UnkStruct_ov21_021E51DC *param0, int param1); +static void ov21_021E5C18(UnkStruct_ov21_021E51DC *param0, int param1); +static void ov21_021E54D4(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2); +static void ov21_021E5510(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2); +static void ov21_021E5538(UnkStruct_ov21_021E4DA4 *param0, int param1); +static void ov21_021E5620(UnkStruct_ov21_021E4DA4 *param0); +static void ov21_021E5644(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2); +static void ov21_021E56F0(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1); +static void ov21_021E5734(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2); +static void ov21_021E5898(UnkStruct_ov21_021E5004 *param0); +static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2); +static void ov21_021E599C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1); +static void ov21_021E5E80(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2); +static void ov21_021E5E98(UnkStruct_ov21_021E5004 *param0); +static void ov21_021E5EAC(UnkStruct_ov21_021E5004 *param0); +static void ov21_021E5EC0(UnkStruct_ov21_021E5004 *param0); + +void ov21_021E4CA4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +{ + UnkStruct_ov21_021E4D90 *v0; + UnkStruct_ov21_021E4DA4 *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021E4D24(param2, param1); v1 = ov21_021E4D64(param2, param1); @@ -208,23 +207,23 @@ void ov21_021E4CA4 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021E4F78; } -void ov21_021E4D04 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021E4D04(UnkStruct_ov21_021E68F4 *param0) { ov21_021E4D90(param0->unk_00); ov21_021E4DA4(param0->unk_04); ov21_021E4DB8(param0->unk_20); } -int ov21_021E4D1C (const UnkStruct_ov21_021E68F4 * param0) +int ov21_021E4D1C(const UnkStruct_ov21_021E68F4 *param0) { - const UnkStruct_ov21_021E4D90 * v0 = param0->unk_00; + const UnkStruct_ov21_021E4D90 *v0 = param0->unk_00; return v0->unk_0C; } -static UnkStruct_ov21_021E4D90 * ov21_021E4D24 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E4D90 *ov21_021E4D24(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E4D90 * v0; + UnkStruct_ov21_021E4D90 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E4D90)); @@ -238,10 +237,10 @@ static UnkStruct_ov21_021E4D90 * ov21_021E4D24 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021E4DA4 * ov21_021E4D64 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E4DA4 *ov21_021E4D64(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E4DA4 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E4DA4 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E4DA4)); @@ -253,37 +252,37 @@ static UnkStruct_ov21_021E4DA4 * ov21_021E4D64 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D4660 * ov21_021E4D8C (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021E4D8C(int param0, UnkStruct_ov21_021D0F60 *param1) { return NULL; } -static void ov21_021E4D90 (UnkStruct_ov21_021E4D90 * param0) +static void ov21_021E4D90(UnkStruct_ov21_021E4D90 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E4DA4 (UnkStruct_ov21_021E4DA4 * param0) +static void ov21_021E4DA4(UnkStruct_ov21_021E4DA4 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E4DB8 (UnkStruct_ov21_021D4660 * param0) +static void ov21_021E4DB8(UnkStruct_ov21_021D4660 *param0) { return; } -static int ov21_021E4DBC (void) +static int ov21_021E4DBC(void) { return 0; } -static int ov21_021E4DC0 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E4DC0(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E4D90 * v0 = param1; - UnkStruct_ov21_021E51DC * v1 = param0->unk_08; + UnkStruct_ov21_021E4D90 *v0 = param1; + UnkStruct_ov21_021E51DC *v1 = param0->unk_08; int v2; int v3 = ov21_021D37BC(v0->unk_04); @@ -300,10 +299,10 @@ static int ov21_021E4DC0 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E4E00 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E4E00(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E4D90 * v0 = param1; - UnkStruct_ov21_021E51DC * v1 = param0->unk_08; + UnkStruct_ov21_021E4D90 *v0 = param1; + UnkStruct_ov21_021E51DC *v1 = param0->unk_08; if (param0->unk_0C == 1) { ov21_021E5E18(v1); @@ -338,10 +337,10 @@ static int ov21_021E4E00 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021E4E84 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E4E84(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E4D90 * v0 = param1; - UnkStruct_ov21_021E51DC * v1 = param0->unk_08; + UnkStruct_ov21_021E4D90 *v0 = param1; + UnkStruct_ov21_021E51DC *v1 = param0->unk_08; ov21_021E5200(v1); Heap_FreeToHeap(v1); @@ -349,12 +348,12 @@ static int ov21_021E4E84 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E4E98 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E4E98(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E4D90 * v0 = param2; - const UnkStruct_ov21_021E51DC * v1 = param3->unk_08; - UnkStruct_ov21_021E4DA4 * v2 = param0; - UnkStruct_ov21_021E5004 * v3 = param1->unk_08; + const UnkStruct_ov21_021E4D90 *v0 = param2; + const UnkStruct_ov21_021E51DC *v1 = param3->unk_08; + UnkStruct_ov21_021E4DA4 *v2 = param0; + UnkStruct_ov21_021E5004 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -382,12 +381,12 @@ static int ov21_021E4E98 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E4F20 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E4F20(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E4D90 * v0 = param2; - const UnkStruct_ov21_021E51DC * v1 = param3->unk_08; - UnkStruct_ov21_021E4DA4 * v2 = param0; - UnkStruct_ov21_021E5004 * v3 = param1->unk_08; + const UnkStruct_ov21_021E4D90 *v0 = param2; + const UnkStruct_ov21_021E51DC *v1 = param3->unk_08; + UnkStruct_ov21_021E4DA4 *v2 = param0; + UnkStruct_ov21_021E5004 *v3 = param1->unk_08; if (ov21_021E33AC(v0->unk_08)) { ov21_021E59B4(v3, v1); @@ -403,12 +402,12 @@ static int ov21_021E4F20 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E4F78 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E4F78(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E4D90 * v0 = param2; - const UnkStruct_ov21_021E51DC * v1 = param3->unk_08; - UnkStruct_ov21_021E4DA4 * v2 = param0; - UnkStruct_ov21_021E5004 * v3 = param1->unk_08; + const UnkStruct_ov21_021E4D90 *v0 = param2; + const UnkStruct_ov21_021E51DC *v1 = param3->unk_08; + UnkStruct_ov21_021E4DA4 *v2 = param0; + UnkStruct_ov21_021E5004 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -439,7 +438,7 @@ static int ov21_021E4F78 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021E5004 (UnkStruct_ov21_021E5004 * param0) +static void ov21_021E5004(UnkStruct_ov21_021E5004 *param0) { sub_02021FE0(param0->unk_00, GX_OAM_MODE_XLU); sub_02021FE0(param0->unk_3C, GX_OAM_MODE_XLU); @@ -450,7 +449,7 @@ static void ov21_021E5004 (UnkStruct_ov21_021E5004 * param0) sub_02012AF0(param0->unk_50[1]->unk_00, GX_OAM_MODE_XLU); } -static void ov21_021E5040 (UnkStruct_ov21_021E5004 * param0) +static void ov21_021E5040(UnkStruct_ov21_021E5004 *param0) { sub_02021FE0(param0->unk_00, GX_OAM_MODE_NORMAL); sub_02021FE0(param0->unk_3C, GX_OAM_MODE_NORMAL); @@ -461,7 +460,7 @@ static void ov21_021E5040 (UnkStruct_ov21_021E5004 * param0) sub_02012AF0(param0->unk_50[1]->unk_00, GX_OAM_MODE_NORMAL); } -static void ov21_021E507C (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, const UnkStruct_ov21_021E4D90 * param2, BOOL param3) +static void ov21_021E507C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, const UnkStruct_ov21_021E4D90 *param2, BOOL param3) { ov21_021E5004(param0); @@ -474,7 +473,7 @@ static void ov21_021E507C (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E } } -static BOOL ov21_021E50EC (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, const UnkStruct_ov21_021E4D90 * param2, BOOL param3) +static BOOL ov21_021E50EC(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, const UnkStruct_ov21_021E4D90 *param2, BOOL param3) { BOOL v0; @@ -495,7 +494,7 @@ static BOOL ov21_021E50EC (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E return 0; } -static void ov21_021E5128 (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1, int param2) +static void ov21_021E5128(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1, int param2) { param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 3); param0->unk_10 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 2); @@ -522,7 +521,7 @@ static void ov21_021E5128 (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E param0->unk_14 = sub_02023FCC(param0->unk_10, 2, ov21_021E5268, ¶m0->unk_08, param2); } -static void ov21_021E51DC (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1) +static void ov21_021E51DC(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1) { int v0; @@ -534,7 +533,7 @@ static void ov21_021E51DC (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E sub_0202404C(param0->unk_14); } -static void ov21_021E5200 (UnkStruct_ov21_021E51DC * param0) +static void ov21_021E5200(UnkStruct_ov21_021E51DC *param0) { sub_02024034(param0->unk_00); sub_02024034(param0->unk_14); @@ -545,11 +544,11 @@ static void ov21_021E5200 (UnkStruct_ov21_021E51DC * param0) param0->unk_10 = NULL; } -static void ov21_021E5228 (u32 param0, u32 param1, void * param2) +static void ov21_021E5228(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021E5228 * v0 = param2; - UnkStruct_ov21_021E4D90 * v1 = v0->unk_00; - UnkStruct_ov21_021E51DC * v2 = v0->unk_04; + UnkStruct_ov21_021E5228 *v0 = param2; + UnkStruct_ov21_021E4D90 *v1 = v0->unk_00; + UnkStruct_ov21_021E51DC *v2 = v0->unk_04; switch (param1) { case 0: @@ -569,11 +568,11 @@ static void ov21_021E5228 (u32 param0, u32 param1, void * param2) } } -static void ov21_021E5268 (u32 param0, u32 param1, void * param2) +static void ov21_021E5268(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021E5228 * v0 = param2; - UnkStruct_ov21_021E4D90 * v1 = v0->unk_00; - UnkStruct_ov21_021E51DC * v2 = v0->unk_04; + UnkStruct_ov21_021E5228 *v0 = param2; + UnkStruct_ov21_021E4D90 *v1 = v0->unk_00; + UnkStruct_ov21_021E51DC *v2 = v0->unk_04; int v3 = ov21_021D37BC(v1->unk_04); v2->unk_18[param0] = param1; @@ -622,7 +621,7 @@ static void ov21_021E5268 (u32 param0, u32 param1, void * param2) } } -static void ov21_021E530C (u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStruct_ov21_021E51DC * param2) +static void ov21_021E530C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct_ov21_021E51DC *param2) { switch (param0) { case 0: @@ -655,7 +654,7 @@ static void ov21_021E530C (u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStru } } -static void ov21_021E537C (u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStruct_ov21_021E51DC * param2) +static void ov21_021E537C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct_ov21_021E51DC *param2) { int v0; @@ -718,14 +717,14 @@ static void ov21_021E537C (u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStru } } -static void ov21_021E545C (u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStruct_ov21_021E51DC * param2) +static void ov21_021E545C(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct_ov21_021E51DC *param2) { switch (param0) { case 0: param2->unk_30 = 0; break; case 1: - param2->unk_5C = param2->unk_60 * ((32 / 8)); + param2->unk_5C = param2->unk_60 * (32 / 8); param2->unk_4C = 0; break; case 2: @@ -739,14 +738,14 @@ static void ov21_021E545C (u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStru } } -static void ov21_021E5498 (u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStruct_ov21_021E51DC * param2) +static void ov21_021E5498(u32 param0, UnkStruct_ov21_021E4D90 *param1, UnkStruct_ov21_021E51DC *param2) { switch (param0) { case 0: param2->unk_30 = 0; break; case 1: - param2->unk_5C = param2->unk_60 * ((32 / 8)); + param2->unk_5C = param2->unk_60 * (32 / 8); param2->unk_4C = 0; break; case 2: @@ -760,7 +759,7 @@ static void ov21_021E5498 (u32 param0, UnkStruct_ov21_021E4D90 * param1, UnkStru } } -static void ov21_021E54D4 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2) +static void ov21_021E54D4(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2) { ov21_021E5538(param1, param2); ov21_021E5644(param0, param1, param2); @@ -769,7 +768,7 @@ static void ov21_021E54D4 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E ov21_021E5E80(param0, param1, param2); } -static void ov21_021E5510 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2) +static void ov21_021E5510(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2) { int v0; @@ -780,10 +779,10 @@ static void ov21_021E5510 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E ov21_021E5E98(param0); } -static void ov21_021E5538 (UnkStruct_ov21_021E4DA4 * param0, int param1) +static void ov21_021E5538(UnkStruct_ov21_021E4DA4 *param0, int param1) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 34, param0->unk_00->unk_00, 6, 0, 0, 1, param1); v0 = ov21_021D27B8(param0->unk_00, 71, 1, &v1, param1); @@ -803,17 +802,17 @@ static void ov21_021E5538 (UnkStruct_ov21_021E4DA4 * param0, int param1) BGL_SetPriority(7, 3); } -static void ov21_021E5620 (UnkStruct_ov21_021E4DA4 * param0) +static void ov21_021E5620(UnkStruct_ov21_021E4DA4 *param0) { sub_02019EBC(param0->unk_00->unk_00, 6); sub_02019EBC(param0->unk_00->unk_00, 7); BGL_SetPriority(7, 1); } -static void ov21_021E5644 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2) +static void ov21_021E5644(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_58[0] = sub_02009A4C(v0->unk_13C[0], v1, 113, 1, 113 + 10000, NNS_G2D_VRAM_TYPE_2DSUB, param2); @@ -829,9 +828,9 @@ static void ov21_021E5644 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E param0->unk_58[3] = sub_02009BC4(v0->unk_13C[3], v1, 112, 1, 112 + 10000, 3, param2); } -static void ov21_021E56F0 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1) +static void ov21_021E56F0(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_58[0]); sub_0200A6DC(param0->unk_58[1]); @@ -841,11 +840,11 @@ static void ov21_021E56F0 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E sub_02009D68(v0->unk_13C[3], param0->unk_58[3]); } -static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2) +static void ov21_021E5734(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3; int v4, v5; @@ -912,7 +911,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E param0->unk_24.unk_14 = 2; } -static void ov21_021E5898 (UnkStruct_ov21_021E5004 * param0) +static void ov21_021E5898(UnkStruct_ov21_021E5004 *param0) { sub_02021BD4(param0->unk_00); sub_02021BD4(param0->unk_3C); @@ -920,12 +919,12 @@ static void ov21_021E5898 (UnkStruct_ov21_021E5004 * param0) sub_02021BD4(param0->unk_20); } -static void ov21_021E58B8 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2) +static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2) { - Window * v0; + Window *v0; UnkStruct_ov21_021D4CB8 v1; - UnkStruct_02009DC8 * v2; - UnkStruct_ov21_021D13FC * v3 = param1->unk_00; + UnkStruct_02009DC8 *v2; + UnkStruct_ov21_021D13FC *v3 = param1->unk_00; int v4; u32 v5; @@ -965,7 +964,7 @@ static void ov21_021E58B8 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E sub_020129D0(param0->unk_50[1]->unk_00, 0); } -static void ov21_021E599C (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1) +static void ov21_021E599C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1) { int v0; @@ -974,7 +973,7 @@ static void ov21_021E599C (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E } } -static void ov21_021E59B4 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1) +static void ov21_021E59B4(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1) { int v0; @@ -993,7 +992,7 @@ static void ov21_021E59B4 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov2 } } -static void ov21_021E5A04 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1) +static void ov21_021E5A04(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1) { int v0 = param1->unk_18[0]; @@ -1004,14 +1003,14 @@ static void ov21_021E5A04 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov2 } } -static void ov21_021E5A2C (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1) +static void ov21_021E5A2C(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1) { int v0 = param1->unk_18[1]; ov21_021E5C80(param0->unk_20, ¶m0->unk_24, param1->unk_64, v0); } -static void ov21_021E5A44 (UnkStruct_ov21_021E51DC * param0) +static void ov21_021E5A44(UnkStruct_ov21_021E51DC *param0) { int v0, v1; int v2, v3; @@ -1037,24 +1036,24 @@ static void ov21_021E5A44 (UnkStruct_ov21_021E51DC * param0) param0->unk_5C %= 88; } - if ((param0->unk_5C >= 32) && (param0->unk_5C <= ((88 - 32)))) { + if ((param0->unk_5C >= 32) && (param0->unk_5C <= (88 - 32))) { if (v4 > 0) { param0->unk_5C = 32; } else { - param0->unk_5C = ((88 - 32)); + param0->unk_5C = (88 - 32); } } } -static void ov21_021E5AAC (UnkStruct_ov21_021E51DC * param0) +static void ov21_021E5AAC(UnkStruct_ov21_021E51DC *param0) { - if ((param0->unk_5C / ((32 / 8))) != param0->unk_60) { + if ((param0->unk_5C / (32 / 8)) != param0->unk_60) { Sound_PlayEffect(1527); - param0->unk_60 = param0->unk_5C / ((32 / 8)); + param0->unk_60 = param0->unk_5C / (32 / 8); } } -static void ov21_021E5AD8 (UnkStruct_ov21_021E51DC * param0) +static void ov21_021E5AD8(UnkStruct_ov21_021E51DC *param0) { int v0; @@ -1094,7 +1093,7 @@ static void ov21_021E5AD8 (UnkStruct_ov21_021E51DC * param0) param0->unk_5C = 88; } - v0 = (88 / ((32 / 8))) - param0->unk_60; + v0 = (88 / (32 / 8)) - param0->unk_60; v0 = v0 * 8; if (v0 > 0) { @@ -1105,12 +1104,12 @@ static void ov21_021E5AD8 (UnkStruct_ov21_021E51DC * param0) } } -static void ov21_021E5B50 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1) +static void ov21_021E5B50(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1) { sub_02021C94(param0->unk_00, sub_0201D580(14, param1->unk_5C)); } -static void ov21_021E5B6C (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, const UnkStruct_ov21_021E51DC * param2) +static void ov21_021E5B6C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, const UnkStruct_ov21_021E51DC *param2) { int v0 = sub_02005188(1, param2->unk_6C, param2->unk_3C); @@ -1128,7 +1127,7 @@ static void ov21_021E5B6C (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E param0->unk_48 = v0; } -static void ov21_021E5BE4 (UnkStruct_ov21_021E51DC * param0, int param1) +static void ov21_021E5BE4(UnkStruct_ov21_021E51DC *param0, int param1) { int v0; fx32 v1; @@ -1142,7 +1141,7 @@ static void ov21_021E5BE4 (UnkStruct_ov21_021E51DC * param0, int param1) param0->unk_44 = v2; } -static void ov21_021E5C18 (UnkStruct_ov21_021E51DC * param0, int param1) +static void ov21_021E5C18(UnkStruct_ov21_021E51DC *param0, int param1) { int v0; fx32 v1; @@ -1156,7 +1155,7 @@ static void ov21_021E5C18 (UnkStruct_ov21_021E51DC * param0, int param1) param0->unk_40 = v2; } -static void ov21_021E5C4C (UnkStruct_ov21_021E5004 * param0) +static void ov21_021E5C4C(UnkStruct_ov21_021E5004 *param0) { if (param0->unk_40 == 0) { sub_020129D0(param0->unk_50[0]->unk_00, 1); @@ -1167,7 +1166,7 @@ static void ov21_021E5C4C (UnkStruct_ov21_021E5004 * param0) } } -static void ov21_021E5C80 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3) +static void ov21_021E5C80(GraphicElementData *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2, int param3) { int v0; @@ -1201,7 +1200,7 @@ static void ov21_021E5C80 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 } } -static void ov21_021E5CF8 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3) +static void ov21_021E5CF8(GraphicElementData *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2, int param3) { int v0; @@ -1240,7 +1239,7 @@ static void ov21_021E5CF8 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 } } -static void ov21_021E5D90 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2) +static void ov21_021E5D90(GraphicElementData *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2) { int v0; @@ -1261,7 +1260,7 @@ static void ov21_021E5D90 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 } } -static void ov21_021E5DE8 (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1, int param2) +static void ov21_021E5DE8(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1, int param2) { param0->unk_2C = 1; @@ -1269,13 +1268,13 @@ static void ov21_021E5DE8 (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E ov21_021E5F00(param0); } -static void ov21_021E5E18 (UnkStruct_ov21_021E51DC * param0) +static void ov21_021E5E18(UnkStruct_ov21_021E51DC *param0) { sub_0200592C(0); param0->unk_2C = 0; } -static void ov21_021E5E28 (UnkStruct_ov21_021E51DC * param0) +static void ov21_021E5E28(UnkStruct_ov21_021E51DC *param0) { if (param0->unk_50 == 1) { sub_02004EEC(0); @@ -1288,7 +1287,7 @@ static void ov21_021E5E28 (UnkStruct_ov21_021E51DC * param0) param0->unk_50 = 0; } -static void ov21_021E5E48 (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1) +static void ov21_021E5E48(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1) { int v0 = ov21_021D37BC(param1->unk_04); @@ -1302,35 +1301,35 @@ static void ov21_021E5E48 (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E } } -static void ov21_021E5E78 (UnkStruct_ov21_021E51DC * param0, BOOL param1) +static void ov21_021E5E78(UnkStruct_ov21_021E51DC *param0, BOOL param1) { param0->unk_64 = param1; param0->unk_68 = 10; } -static void ov21_021E5E80 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2) +static void ov21_021E5E80(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2) { param0->unk_68 = ov21_021D27E0(param1->unk_00, 20, ¶m0->unk_6C, param2); } -static void ov21_021E5E98 (UnkStruct_ov21_021E5004 * param0) +static void ov21_021E5E98(UnkStruct_ov21_021E5004 *param0) { Heap_FreeToHeap(param0->unk_68); param0->unk_68 = NULL; param0->unk_6C = NULL; } -static void ov21_021E5EAC (UnkStruct_ov21_021E5004 * param0) +static void ov21_021E5EAC(UnkStruct_ov21_021E5004 *param0) { sub_0201DC68(NNS_GFD_DST_2D_BG_PLTT_SUB, 7 * 32, param0->unk_6C->pRawData, 32); } -static void ov21_021E5EC0 (UnkStruct_ov21_021E5004 * param0) +static void ov21_021E5EC0(UnkStruct_ov21_021E5004 *param0) { sub_0201DC68(NNS_GFD_DST_2D_BG_PLTT_SUB, 7 * 32, &((u8 *)(param0->unk_6C->pRawData))[32], 32); } -static void ov21_021E5ED8 (UnkStruct_ov21_021E51DC * param0, BOOL param1) +static void ov21_021E5ED8(UnkStruct_ov21_021E51DC *param0, BOOL param1) { ov21_021E5EF0(param0, param1); @@ -1339,19 +1338,19 @@ static void ov21_021E5ED8 (UnkStruct_ov21_021E51DC * param0, BOOL param1) } } -static void ov21_021E5EF0 (UnkStruct_ov21_021E51DC * param0, BOOL param1) +static void ov21_021E5EF0(UnkStruct_ov21_021E51DC *param0, BOOL param1) { param0->unk_48 = param1; } -static void ov21_021E5EF4 (UnkStruct_ov21_021E51DC * param0) +static void ov21_021E5EF4(UnkStruct_ov21_021E51DC *param0) { param0->unk_3C = 0; param0->unk_40 = 0; param0->unk_44 = 0; } -static void ov21_021E5F00 (UnkStruct_ov21_021E51DC * param0) +static void ov21_021E5F00(UnkStruct_ov21_021E51DC *param0) { if (param0->unk_2C) { ov21_021E5FF4(param0->unk_3C); @@ -1360,12 +1359,12 @@ static void ov21_021E5F00 (UnkStruct_ov21_021E51DC * param0) } } -static void ov21_021E5F28 (int param0) +static void ov21_021E5F28(int param0) { sub_02004A54(8, param0, 0); } -static void ov21_021E5F38 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1) +static void ov21_021E5F38(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1) { if (param1->unk_48 != param0->unk_70) { if (param1->unk_48 == 1) { @@ -1378,7 +1377,7 @@ static void ov21_021E5F38 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov2 } } -static void ov21_021E5F5C (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1) +static void ov21_021E5F5C(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D90 *param1) { int v0 = ov21_021D37BC(param1->unk_04); @@ -1409,16 +1408,16 @@ static void ov21_021E5F5C (UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E } } -static void ov21_021E5FD0 (UnkStruct_ov21_021E4DA4 * param0, const UnkStruct_ov21_021E4D90 * param1) +static void ov21_021E5FD0(UnkStruct_ov21_021E4DA4 *param0, const UnkStruct_ov21_021E4D90 *param1) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; if (ov21_021E33BC(param1->unk_08) == 1) { ov21_021D2574(v0, 180, 131, 24, 24); } } -static void ov21_021E5FF4 (int param0) +static void ov21_021E5FF4(int param0) { sub_02004F68(1, 0xffff, param0); sub_02004F68(8, 0xffff, 20 + param0); diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c index 83d2758c03..bc6a4ec952 100644 --- a/src/overlay021/ov21_021E6014.c +++ b/src/overlay021/ov21_021E6014.c @@ -1,52 +1,50 @@ +#include "overlay021/ov21_021E6014.h" + #include #include -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4660.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "strbuf.h" #include "unk_02002B7C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "message.h" -#include "message_util.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02098700.h" #include "unk_02098988.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021E29DC.h" -#include "overlay021/ov21_021E6014.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; - UnkStruct_ov21_021E68F4 * unk_08; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; + UnkStruct_ov21_021E68F4 *unk_08; } UnkStruct_ov21_021E6104; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021E6118; typedef struct { @@ -54,50 +52,50 @@ typedef struct { } UnkStruct_ov21_021E6134; typedef struct { - UnkStruct_02009DC8 * unk_00[4]; - GraphicElementData * unk_10; + UnkStruct_02009DC8 *unk_00[4]; + GraphicElementData *unk_10; } UnkStruct_ov21_021E6274; -static UnkStruct_ov21_021E6104 * ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021E6118 * ov21_021E60D8(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021E6100(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021E6104(UnkStruct_ov21_021E6104 * param0); -static void ov21_021E6118(UnkStruct_ov21_021E6118 * param0); -static void ov21_021E612C(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E6118 *ov21_021E60D8(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E6100(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E6104(UnkStruct_ov21_021E6104 *param0); +static void ov21_021E6118(UnkStruct_ov21_021E6118 *param0); +static void ov21_021E612C(UnkStruct_ov21_021D4660 *param0); static int ov21_021E6130(void); -static int ov21_021E6134(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E6158(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E6168(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E617C(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E6200(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E6204(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021E6274(UnkStruct_ov21_021E6274 * param0); -static void ov21_021E6280(UnkStruct_ov21_021E6274 * param0); -static void ov21_021E628C(UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, BOOL param3); -static BOOL ov21_021E62F8(UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, BOOL param3); -static void ov21_021E6338(UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, const UnkStruct_ov21_021E6134 * param3, int param4); -static void ov21_021E638C(UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1); -static void ov21_021E63C0(UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1, int param2); -static void ov21_021E6428(UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, int param2); -static void ov21_021E64D4(UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1); -static void ov21_021E6518(UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, int param3); -static void ov21_021E65EC(UnkStruct_ov21_021E6274 * param0); -static void ov21_021E65F8(UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, int param3); -static void ov21_021E65FC(UnkStruct_ov21_021E6274 * param0); -static void ov21_021E6600(UnkStruct_ov21_021E6118 * param0, int param1); -static void ov21_021E66B0(UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1, int param2); -static void ov21_021E67C8(UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1); -static void ov21_021E6844(UnkStruct_ov21_021E6118 * param0); -static void ov21_021E6860(GraphicElementData * param0, short param1); -static void ov21_021E687C(Sprite * param0, short param1); -static void ov21_021E688C(GraphicElementData * param0, short param1); -static void ov21_021E68B0(Sprite * param0, short param1); - -void ov21_021E6014 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) -{ - UnkStruct_ov21_021E6104 * v0; - UnkStruct_ov21_021E6118 * v1; - UnkStruct_ov21_021D4660 * v2; +static int ov21_021E6134(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E6158(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E6168(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E617C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E6200(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E6204(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021E6274(UnkStruct_ov21_021E6274 *param0); +static void ov21_021E6280(UnkStruct_ov21_021E6274 *param0); +static void ov21_021E628C(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); +static BOOL ov21_021E62F8(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3); +static void ov21_021E6338(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int param4); +static void ov21_021E638C(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1); +static void ov21_021E63C0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int param2); +static void ov21_021E6428(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, int param2); +static void ov21_021E64D4(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1); +static void ov21_021E6518(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int param3); +static void ov21_021E65EC(UnkStruct_ov21_021E6274 *param0); +static void ov21_021E65F8(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int param3); +static void ov21_021E65FC(UnkStruct_ov21_021E6274 *param0); +static void ov21_021E6600(UnkStruct_ov21_021E6118 *param0, int param1); +static void ov21_021E66B0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int param2); +static void ov21_021E67C8(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1); +static void ov21_021E6844(UnkStruct_ov21_021E6118 *param0); +static void ov21_021E6860(GraphicElementData *param0, short param1); +static void ov21_021E687C(Sprite *param0, short param1); +static void ov21_021E688C(GraphicElementData *param0, short param1); +static void ov21_021E68B0(Sprite *param0, short param1); + +void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +{ + UnkStruct_ov21_021E6104 *v0; + UnkStruct_ov21_021E6118 *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021E608C(param2, param1); v1 = ov21_021E60D8(param2, param1); @@ -116,16 +114,16 @@ void ov21_021E6014 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021E6204; } -void ov21_021E6074 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021E6074(UnkStruct_ov21_021E68F4 *param0) { ov21_021E6104(param0->unk_00); ov21_021E6118(param0->unk_04); ov21_021E612C(param0->unk_20); } -static UnkStruct_ov21_021E6104 * ov21_021E608C (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E6104 *ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E6104 * v0; + UnkStruct_ov21_021E6104 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6104)); GF_ASSERT(v0); @@ -138,10 +136,10 @@ static UnkStruct_ov21_021E6104 * ov21_021E608C (int param0, UnkStruct_ov21_021D0 return v0; } -UnkStruct_ov21_021E6118 * ov21_021E60D8 (int param0, UnkStruct_ov21_021D0F60 * param1) +UnkStruct_ov21_021E6118 *ov21_021E60D8(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E6118 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E6118 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6118)); GF_ASSERT(v0); @@ -152,37 +150,37 @@ UnkStruct_ov21_021E6118 * ov21_021E60D8 (int param0, UnkStruct_ov21_021D0F60 * p return v0; } -static UnkStruct_ov21_021D4660 * ov21_021E6100 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021E6100(int param0, UnkStruct_ov21_021D0F60 *param1) { return NULL; } -static void ov21_021E6104 (UnkStruct_ov21_021E6104 * param0) +static void ov21_021E6104(UnkStruct_ov21_021E6104 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E6118 (UnkStruct_ov21_021E6118 * param0) +static void ov21_021E6118(UnkStruct_ov21_021E6118 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E612C (UnkStruct_ov21_021D4660 * param0) +static void ov21_021E612C(UnkStruct_ov21_021D4660 *param0) { return; } -static int ov21_021E6130 (void) +static int ov21_021E6130(void) { return 0; } -static int ov21_021E6134 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E6134(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E6104 * v0 = param1; - UnkStruct_ov21_021E6134 * v1; + UnkStruct_ov21_021E6104 *v0 = param1; + UnkStruct_ov21_021E6134 *v1; v1 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021E6134)); @@ -194,10 +192,10 @@ static int ov21_021E6134 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E6158 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E6158(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E6104 * v0 = param1; - UnkStruct_ov21_021E6134 * v1 = param0->unk_08; + UnkStruct_ov21_021E6104 *v0 = param1; + UnkStruct_ov21_021E6134 *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -210,10 +208,10 @@ static int ov21_021E6158 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021E6168 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E6168(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E6104 * v0 = param1; - UnkStruct_ov21_021E6134 * v1 = param0->unk_08; + UnkStruct_ov21_021E6104 *v0 = param1; + UnkStruct_ov21_021E6134 *v1 = param0->unk_08; Heap_FreeToHeap(v1); param0->unk_08 = NULL; @@ -221,12 +219,12 @@ static int ov21_021E6168 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E617C (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E617C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E6104 * v0 = param2; - const UnkStruct_ov21_021E6134 * v1 = param3->unk_08; - UnkStruct_ov21_021E6118 * v2 = param0; - UnkStruct_ov21_021E6274 * v3 = param1->unk_08; + const UnkStruct_ov21_021E6104 *v0 = param2; + const UnkStruct_ov21_021E6134 *v1 = param3->unk_08; + UnkStruct_ov21_021E6118 *v2 = param0; + UnkStruct_ov21_021E6274 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -251,22 +249,22 @@ static int ov21_021E617C (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E6200 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E6200(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E6104 * v0 = param2; - const UnkStruct_ov21_021E6134 * v1 = param3->unk_08; - UnkStruct_ov21_021E6118 * v2 = param0; - UnkStruct_ov21_021E6274 * v3 = param1->unk_08; + const UnkStruct_ov21_021E6104 *v0 = param2; + const UnkStruct_ov21_021E6134 *v1 = param3->unk_08; + UnkStruct_ov21_021E6118 *v2 = param0; + UnkStruct_ov21_021E6274 *v3 = param1->unk_08; return 0; } -static int ov21_021E6204 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E6204(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E6104 * v0 = param2; - const UnkStruct_ov21_021E6134 * v1 = param3->unk_08; - UnkStruct_ov21_021E6118 * v2 = param0; - UnkStruct_ov21_021E6274 * v3 = param1->unk_08; + const UnkStruct_ov21_021E6104 *v0 = param2; + const UnkStruct_ov21_021E6134 *v1 = param3->unk_08; + UnkStruct_ov21_021E6118 *v2 = param0; + UnkStruct_ov21_021E6274 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -294,17 +292,17 @@ static int ov21_021E6204 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021E6274 (UnkStruct_ov21_021E6274 * param0) +static void ov21_021E6274(UnkStruct_ov21_021E6274 *param0) { sub_02021FE0(param0->unk_10, GX_OAM_MODE_XLU); } -static void ov21_021E6280 (UnkStruct_ov21_021E6274 * param0) +static void ov21_021E6280(UnkStruct_ov21_021E6274 *param0) { sub_02021FE0(param0->unk_10, GX_OAM_MODE_NORMAL); } -static void ov21_021E628C (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, BOOL param3) +static void ov21_021E628C(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3) { ov21_021E6274(param0); @@ -317,7 +315,7 @@ static void ov21_021E628C (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E } } -static BOOL ov21_021E62F8 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, BOOL param3) +static BOOL ov21_021E62F8(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3) { BOOL v0; @@ -338,7 +336,7 @@ static BOOL ov21_021E62F8 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E return 0; } -static void ov21_021E6338 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, const UnkStruct_ov21_021E6134 * param3, int param4) +static void ov21_021E6338(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, const UnkStruct_ov21_021E6134 *param3, int param4) { ov21_021E63C0(param1, param2, param4); ov21_021E6600(param1, param4); @@ -349,7 +347,7 @@ static void ov21_021E6338 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E ov21_021E67C8(param1, param2); } -static void ov21_021E638C (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1) +static void ov21_021E638C(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1) { ov21_021E65FC(param0); ov21_021E65EC(param0); @@ -361,10 +359,10 @@ static void ov21_021E638C (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E ov21_021E6844(param1); } -static void ov21_021E63C0 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1, int param2) +static void ov21_021E63C0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param2); @@ -375,10 +373,10 @@ static void ov21_021E63C0 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov2 sub_0201C3C0(param0->unk_00->unk_00, 3); } -static void ov21_021E6428 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, int param2) +static void ov21_021E6428(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(v0); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(v0); param0->unk_00[0] = sub_02009A4C(v0->unk_13C[0], v1, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -394,9 +392,9 @@ static void ov21_021E6428 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E param0->unk_00[3] = sub_02009BC4(v0->unk_13C[3], v1, 92, 1, 92 + 7000, 3, param2); } -static void ov21_021E64D4 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1) +static void ov21_021E64D4(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_00[0]); sub_0200A6DC(param0->unk_00[1]); @@ -406,11 +404,11 @@ static void ov21_021E64D4 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E sub_02009D68(v0->unk_13C[3], param0->unk_00[3]); } -static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, int param3) +static void ov21_021E6518(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int param3) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; VecFx32 v3; short v4; short v5; @@ -442,25 +440,25 @@ static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E ov21_021E688C(param0->unk_10, v5); } -static void ov21_021E65EC (UnkStruct_ov21_021E6274 * param0) +static void ov21_021E65EC(UnkStruct_ov21_021E6274 *param0) { sub_02021BD4(param0->unk_10); } -static void ov21_021E65F8 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, int param3) +static void ov21_021E65F8(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, int param3) { return; } -static void ov21_021E65FC (UnkStruct_ov21_021E6274 * param0) +static void ov21_021E65FC(UnkStruct_ov21_021E6274 *param0) { return; } -static void ov21_021E6600 (UnkStruct_ov21_021E6118 * param0, int param1) +static void ov21_021E6600(UnkStruct_ov21_021E6118 *param0, int param1) { - Strbuf* v0 = Strbuf_Init(32, param1); - MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); + Strbuf *v0 = Strbuf_Init(32, param1); + MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); MessageLoader_GetStrbuf(v1, 43, v0); @@ -477,12 +475,12 @@ static void ov21_021E6600 (UnkStruct_ov21_021E6118 * param0, int param1) MessageLoader_Free(v1); } -static void ov21_021E66B0 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1, int param2) +static void ov21_021E66B0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, int param2) { - Strbuf* v0 = Strbuf_Init(32, param2); - MessageLoader * v1; + Strbuf *v0 = Strbuf_Init(32, param2); + MessageLoader *v1; int v2 = ov21_021D37BC(param1->unk_04); - Strbuf* v3 = MessageUtil_SpeciesName(v2, param2); + Strbuf *v3 = MessageUtil_SpeciesName(v2, param2); int v4; v4 = sub_020989D0(); @@ -518,9 +516,9 @@ static void ov21_021E66B0 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov2 MessageLoader_Free(v1); } -static void ov21_021E67C8 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1) +static void ov21_021E67C8(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1) { - Sprite * v0 = ov21_021D2170(param0->unk_00); + Sprite *v0 = ov21_021D2170(param0->unk_00); short v1; short v2; int v3 = ov21_021D37BC(param1->unk_04); @@ -537,15 +535,15 @@ static void ov21_021E67C8 (UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov2 ov21_021E68B0(v0, v2); } -static void ov21_021E6844 (UnkStruct_ov21_021E6118 * param0) +static void ov21_021E6844(UnkStruct_ov21_021E6118 *param0) { - Sprite * v0 = ov21_021D2170(param0->unk_00); + Sprite *v0 = ov21_021D2170(param0->unk_00); sub_02007DEC(v0, 6, 1); sub_02008780(v0); } -static void ov21_021E6860 (GraphicElementData * param0, short param1) +static void ov21_021E6860(GraphicElementData *param0, short param1) { VecFx32 v0; @@ -555,12 +553,12 @@ static void ov21_021E6860 (GraphicElementData * param0, short param1) sub_02021C50(param0, &v0); } -static void ov21_021E687C (Sprite * param0, short param1) +static void ov21_021E687C(Sprite *param0, short param1) { sub_02007DEC(param0, 1, 88 + param1); } -static void ov21_021E688C (GraphicElementData * param0, short param1) +static void ov21_021E688C(GraphicElementData *param0, short param1) { VecFx32 v0; @@ -570,7 +568,7 @@ static void ov21_021E688C (GraphicElementData * param0, short param1) sub_02021C80(param0, &v0, 2); } -static void ov21_021E68B0 (Sprite * param0, short param1) +static void ov21_021E68B0(Sprite *param0, short param1) { fx32 v0; diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c index ac370e8f0f..343dd15215 100644 --- a/src/overlay021/ov21_021E68F4.c +++ b/src/overlay021/ov21_021E68F4.c @@ -1,123 +1,122 @@ +#include "overlay021/ov21_021E68F4.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4340.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4660.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "core_sys.h" +#include "heap.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201F834.h" #include "unk_020218BC.h" #include "unk_02023FCC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4340.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021E29DC.h" -#include "overlay021/ov21_021E68F4.h" typedef struct { - int * unk_00; + int *unk_00; int unk_04; - UnkStruct_ov21_021D3320 * unk_08; - UnkStruct_ov21_021E68F4 * unk_0C; + UnkStruct_ov21_021D3320 *unk_08; + UnkStruct_ov21_021E68F4 *unk_0C; } UnkStruct_ov21_021E6A20; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021E6A34; typedef struct { - void * unk_00; - void * unk_04; + void *unk_00; + void *unk_04; } UnkStruct_ov21_021E6E04; typedef struct { - UnkStruct_02023FCC * unk_00; - TouchScreenHitTable * unk_04; + UnkStruct_02023FCC *unk_00; + TouchScreenHitTable *unk_04; UnkStruct_ov21_021E6E04 unk_08; int unk_10[2]; } UnkStruct_ov21_021E6DAC; typedef struct { - GraphicElementData * unk_00[2]; - UnkStruct_ov21_021D4CA0 * unk_08[2]; - UnkStruct_02009DC8 * unk_10[4]; - GraphicElementData * unk_20[4]; + GraphicElementData *unk_00[2]; + UnkStruct_ov21_021D4CA0 *unk_08[2]; + UnkStruct_02009DC8 *unk_10[4]; + GraphicElementData *unk_20[4]; int unk_30[2]; - void * unk_38[2]; + void *unk_38[2]; } UnkStruct_ov21_021E6C60; -static UnkStruct_ov21_021E6A20 * ov21_021E696C(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021E6A34 * ov21_021E69B0(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021E69D8(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021E6A20(UnkStruct_ov21_021E6A20 * param0); -static void ov21_021E6A34(UnkStruct_ov21_021E6A34 * param0); -static void ov21_021E6A48(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021E6A20 *ov21_021E696C(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E6A34 *ov21_021E69B0(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E69D8(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E6A20(UnkStruct_ov21_021E6A20 *param0); +static void ov21_021E6A34(UnkStruct_ov21_021E6A34 *param0); +static void ov21_021E6A48(UnkStruct_ov21_021D4660 *param0); static int ov21_021E6A68(void); -static int ov21_021E6A6C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E6AB8(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E6B0C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E6B20(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E6BA8(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E6BD8(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021E6C60(UnkStruct_ov21_021E6C60 * param0); -static void ov21_021E6C88(UnkStruct_ov21_021E6C60 * param0); -static void ov21_021E6CB0(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, const UnkStruct_ov21_021E6A20 * param2, BOOL param3); -static BOOL ov21_021E6D1C(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, const UnkStruct_ov21_021E6A20 * param2, BOOL param3); -static void ov21_021E6D58(UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E6A20 * param1, int param2); -static void ov21_021E6DAC(UnkStruct_ov21_021E6DAC * param0); -static void ov21_021E6DBC(UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E6A20 * param1); -static void ov21_021E6DEC(UnkStruct_ov21_021E6DAC * param0); -static void ov21_021E6E04(u32 param0, u32 param1, void * param2); -static void ov21_021E71D0(UnkStruct_ov21_021E6A34 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10); -static void ov21_021E727C(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4); -static void ov21_021E728C(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, const UnkStruct_ov21_021E6DAC * param2, int param3); -static void ov21_021E72E8(UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E6A20 * param1); -static void ov21_021E732C(UnkStruct_ov21_021E6A34 * param0, const UnkStruct_ov21_021E6A20 * param1); -static void ov21_021E7368(UnkStruct_ov21_021E6A34 * param0, int param1, int param2, int param3, int param4); -static void ov21_021E6E64(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2); -static void ov21_021E6E94(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2); -static void ov21_021E6EF0(UnkStruct_ov21_021E6A34 * param0, int param1); -static void ov21_021E6F58(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2); -static void ov21_021E6FD8(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1); -static void ov21_021E700C(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2); -static void ov21_021E70BC(UnkStruct_ov21_021E6C60 * param0); -static void ov21_021E70D4(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2); -static void ov21_021E71B8(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1); - -void ov21_021E68F4 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) -{ - UnkStruct_ov21_021E6A20 * v0; - UnkStruct_ov21_021E6A34 * v1; - UnkStruct_ov21_021D4660 * v2; +static int ov21_021E6A6C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E6AB8(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E6B0C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E6B20(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E6BA8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E6BD8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021E6C60(UnkStruct_ov21_021E6C60 *param0); +static void ov21_021E6C88(UnkStruct_ov21_021E6C60 *param0); +static void ov21_021E6CB0(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, const UnkStruct_ov21_021E6A20 *param2, BOOL param3); +static BOOL ov21_021E6D1C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, const UnkStruct_ov21_021E6A20 *param2, BOOL param3); +static void ov21_021E6D58(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1, int param2); +static void ov21_021E6DAC(UnkStruct_ov21_021E6DAC *param0); +static void ov21_021E6DBC(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1); +static void ov21_021E6DEC(UnkStruct_ov21_021E6DAC *param0); +static void ov21_021E6E04(u32 param0, u32 param1, void *param2); +static void ov21_021E71D0(UnkStruct_ov21_021E6A34 *param0, GraphicElementData *param1, UnkStruct_ov21_021D4CA0 *param2, int param3, int param4, int param5, int *param6, int param7, int param8, int param9, void **param10); +static void ov21_021E727C(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4); +static void ov21_021E728C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, const UnkStruct_ov21_021E6DAC *param2, int param3); +static void ov21_021E72E8(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1); +static void ov21_021E732C(UnkStruct_ov21_021E6A34 *param0, const UnkStruct_ov21_021E6A20 *param1); +static void ov21_021E7368(UnkStruct_ov21_021E6A34 *param0, int param1, int param2, int param3, int param4); +static void ov21_021E6E64(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2); +static void ov21_021E6E94(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2); +static void ov21_021E6EF0(UnkStruct_ov21_021E6A34 *param0, int param1); +static void ov21_021E6F58(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2); +static void ov21_021E6FD8(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1); +static void ov21_021E700C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2); +static void ov21_021E70BC(UnkStruct_ov21_021E6C60 *param0); +static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2); +static void ov21_021E71B8(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1); + +void ov21_021E68F4(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +{ + UnkStruct_ov21_021E6A20 *v0; + UnkStruct_ov21_021E6A34 *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021E696C(param2, param1); v1 = ov21_021E69B0(param2, param1); @@ -136,16 +135,16 @@ void ov21_021E68F4 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021E6BD8; } -void ov21_021E6954 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021E6954(UnkStruct_ov21_021E68F4 *param0) { ov21_021E6A20(param0->unk_00); ov21_021E6A34(param0->unk_04); ov21_021E6A48(param0->unk_20); } -static UnkStruct_ov21_021E6A20 * ov21_021E696C (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E6A20 *ov21_021E696C(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E6A20 * v0; + UnkStruct_ov21_021E6A20 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6A20)); @@ -160,10 +159,10 @@ static UnkStruct_ov21_021E6A20 * ov21_021E696C (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021E6A34 * ov21_021E69B0 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E6A34 *ov21_021E69B0(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E6A34 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E6A34 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E6A34)); @@ -175,9 +174,9 @@ static UnkStruct_ov21_021E6A34 * ov21_021E69B0 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D4660 * ov21_021E69D8 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021E69D8(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021D4660 * v0; + UnkStruct_ov21_021D4660 *v0; int v1 = ov21_021E6A68(); v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021D4660) * v1); @@ -191,19 +190,19 @@ static UnkStruct_ov21_021D4660 * ov21_021E69D8 (int param0, UnkStruct_ov21_021D0 return v0; } -static void ov21_021E6A20 (UnkStruct_ov21_021E6A20 * param0) +static void ov21_021E6A20(UnkStruct_ov21_021E6A20 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E6A34 (UnkStruct_ov21_021E6A34 * param0) +static void ov21_021E6A34(UnkStruct_ov21_021E6A34 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E6A48 (UnkStruct_ov21_021D4660 * param0) +static void ov21_021E6A48(UnkStruct_ov21_021D4660 *param0) { GF_ASSERT(param0); @@ -213,15 +212,15 @@ static void ov21_021E6A48 (UnkStruct_ov21_021D4660 * param0) Heap_FreeToHeap(param0); } -static int ov21_021E6A68 (void) +static int ov21_021E6A68(void) { return 2; } -static int ov21_021E6A6C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E6A6C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E6A20 * v0 = param1; - UnkStruct_ov21_021E6DAC * v1 = param0->unk_08; + UnkStruct_ov21_021E6A20 *v0 = param1; + UnkStruct_ov21_021E6DAC *v1 = param0->unk_08; int v2; v1 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021E6DAC)); @@ -241,10 +240,10 @@ static int ov21_021E6A6C (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E6AB8 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E6AB8(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E6A20 * v0 = param1; - UnkStruct_ov21_021E6DAC * v1 = param0->unk_08; + UnkStruct_ov21_021E6A20 *v0 = param1; + UnkStruct_ov21_021E6DAC *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -267,10 +266,10 @@ static int ov21_021E6AB8 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021E6B0C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E6B0C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E6A20 * v0 = param1; - UnkStruct_ov21_021E6DAC * v1 = param0->unk_08; + UnkStruct_ov21_021E6A20 *v0 = param1; + UnkStruct_ov21_021E6DAC *v1 = param0->unk_08; ov21_021E6DEC(v1); Heap_FreeToHeap(v1); @@ -278,12 +277,12 @@ static int ov21_021E6B0C (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E6B20 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E6B20(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E6A20 * v0 = param2; - const UnkStruct_ov21_021E6DAC * v1 = param3->unk_08; - UnkStruct_ov21_021E6A34 * v2 = param0; - UnkStruct_ov21_021E6C60 * v3 = param1->unk_08; + const UnkStruct_ov21_021E6A20 *v0 = param2; + const UnkStruct_ov21_021E6DAC *v1 = param3->unk_08; + UnkStruct_ov21_021E6A34 *v2 = param0; + UnkStruct_ov21_021E6C60 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -311,12 +310,12 @@ static int ov21_021E6B20 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E6BA8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E6BA8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E6A20 * v0 = param2; - const UnkStruct_ov21_021E6DAC * v1 = param3->unk_08; - UnkStruct_ov21_021E6A34 * v2 = param0; - UnkStruct_ov21_021E6C60 * v3 = param1->unk_08; + const UnkStruct_ov21_021E6A20 *v0 = param2; + const UnkStruct_ov21_021E6DAC *v1 = param3->unk_08; + UnkStruct_ov21_021E6A34 *v2 = param0; + UnkStruct_ov21_021E6C60 *v3 = param1->unk_08; if (ov21_021E33AC(v0->unk_0C)) { ov21_021E728C(v3, v2, v1, param1->unk_04); @@ -326,12 +325,12 @@ static int ov21_021E6BA8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E6BD8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E6BD8(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E6A20 * v0 = param2; - const UnkStruct_ov21_021E6DAC * v1 = param3->unk_08; - UnkStruct_ov21_021E6A34 * v2 = param0; - UnkStruct_ov21_021E6C60 * v3 = param1->unk_08; + const UnkStruct_ov21_021E6A20 *v0 = param2; + const UnkStruct_ov21_021E6DAC *v1 = param3->unk_08; + UnkStruct_ov21_021E6A34 *v2 = param0; + UnkStruct_ov21_021E6C60 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -361,7 +360,7 @@ static int ov21_021E6BD8 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021E6C60 (UnkStruct_ov21_021E6C60 * param0) +static void ov21_021E6C60(UnkStruct_ov21_021E6C60 *param0) { int v0; @@ -371,7 +370,7 @@ static void ov21_021E6C60 (UnkStruct_ov21_021E6C60 * param0) } } -static void ov21_021E6C88 (UnkStruct_ov21_021E6C60 * param0) +static void ov21_021E6C88(UnkStruct_ov21_021E6C60 *param0) { int v0; @@ -381,7 +380,7 @@ static void ov21_021E6C88 (UnkStruct_ov21_021E6C60 * param0) } } -static void ov21_021E6CB0 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, const UnkStruct_ov21_021E6A20 * param2, BOOL param3) +static void ov21_021E6CB0(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, const UnkStruct_ov21_021E6A20 *param2, BOOL param3) { ov21_021E6C60(param0); @@ -394,7 +393,7 @@ static void ov21_021E6CB0 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E } } -static BOOL ov21_021E6D1C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, const UnkStruct_ov21_021E6A20 * param2, BOOL param3) +static BOOL ov21_021E6D1C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, const UnkStruct_ov21_021E6A20 *param2, BOOL param3) { BOOL v0; @@ -415,7 +414,7 @@ static BOOL ov21_021E6D1C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E return 0; } -static void ov21_021E6D58 (UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E6A20 * param1, int param2) +static void ov21_021E6D58(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1, int param2) { param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 2); @@ -427,7 +426,7 @@ static void ov21_021E6D58 (UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E param0->unk_00 = sub_02023FCC(param0->unk_04, 2, ov21_021E6E04, ¶m0->unk_08, param2); } -static void ov21_021E6DAC (UnkStruct_ov21_021E6DAC * param0) +static void ov21_021E6DAC(UnkStruct_ov21_021E6DAC *param0) { int v0; @@ -436,7 +435,7 @@ static void ov21_021E6DAC (UnkStruct_ov21_021E6DAC * param0) } } -static void ov21_021E6DBC (UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E6A20 * param1) +static void ov21_021E6DBC(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1) { sub_0202404C(param0->unk_00); @@ -456,7 +455,7 @@ static void ov21_021E6DBC (UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E } } -static void ov21_021E6DEC (UnkStruct_ov21_021E6DAC * param0) +static void ov21_021E6DEC(UnkStruct_ov21_021E6DAC *param0) { sub_02024034(param0->unk_00); Heap_FreeToHeap(param0->unk_04); @@ -464,11 +463,11 @@ static void ov21_021E6DEC (UnkStruct_ov21_021E6DAC * param0) param0->unk_04 = NULL; } -static void ov21_021E6E04 (u32 param0, u32 param1, void * param2) +static void ov21_021E6E04(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021E6E04 * v0 = param2; - UnkStruct_ov21_021E6A20 * v1 = v0->unk_00; - UnkStruct_ov21_021E6DAC * v2 = v0->unk_04; + UnkStruct_ov21_021E6E04 *v0 = param2; + UnkStruct_ov21_021E6A20 *v1 = v0->unk_00; + UnkStruct_ov21_021E6DAC *v2 = v0->unk_04; v2->unk_10[param0] = param1; @@ -500,7 +499,7 @@ static void ov21_021E6E04 (u32 param0, u32 param1, void * param2) } } -static void ov21_021E6E64 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2) +static void ov21_021E6E64(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2) { ov21_021E6EF0(param1, param2); ov21_021E6F58(param0, param1, param2); @@ -508,7 +507,7 @@ static void ov21_021E6E64 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E ov21_021E70D4(param0, param1, param2); } -static void ov21_021E6E94 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2) +static void ov21_021E6E94(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2) { int v0; @@ -525,10 +524,10 @@ static void ov21_021E6E94 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E } } -static void ov21_021E6EF0 (UnkStruct_ov21_021E6A34 * param0, int param1) +static void ov21_021E6EF0(UnkStruct_ov21_021E6A34 *param0, int param1) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 34, param0->unk_00->unk_00, 6, 0, 0, 1, param1); @@ -539,10 +538,10 @@ static void ov21_021E6EF0 (UnkStruct_ov21_021E6A34 * param0, int param1) sub_0201C3C0(param0->unk_00->unk_00, 6); } -static void ov21_021E6F58 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2) +static void ov21_021E6F58(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(param1->unk_00); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(param1->unk_00); param0->unk_10[0] = sub_02009A4C(v0->unk_13C[0], v1, 102, 1, 102 + 9000, NNS_G2D_VRAM_TYPE_2DSUB, param2); @@ -553,9 +552,9 @@ static void ov21_021E6F58 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E param0->unk_10[3] = sub_02009BC4(v0->unk_13C[3], v1, 101, 1, 101 + 9000, 3, param2); } -static void ov21_021E6FD8 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1) +static void ov21_021E6FD8(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_10[0]); sub_02009D68(v0->unk_13C[0], param0->unk_10[0]); @@ -563,11 +562,11 @@ static void ov21_021E6FD8 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E sub_02009D68(v0->unk_13C[3], param0->unk_10[3]); } -static void ov21_021E700C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2) +static void ov21_021E700C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3; sub_020093B4(&v0, 102 + 9000, 11 + 2100, 100 + 9000, 101 + 9000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -595,7 +594,7 @@ static void ov21_021E700C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 1); } -static void ov21_021E70BC (UnkStruct_ov21_021E6C60 * param0) +static void ov21_021E70BC(UnkStruct_ov21_021E6C60 *param0) { int v0; @@ -604,12 +603,12 @@ static void ov21_021E70BC (UnkStruct_ov21_021E6C60 * param0) } } -static void ov21_021E70D4 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2) +static void ov21_021E70D4(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2) { - Window * v0; + Window *v0; UnkStruct_ov21_021D4CB8 v1; - UnkStruct_02009DC8 * v2; - UnkStruct_ov21_021D13FC * v3 = param1->unk_00; + UnkStruct_02009DC8 *v2; + UnkStruct_ov21_021D13FC *v3 = param1->unk_00; int v4; u32 v5; @@ -651,7 +650,7 @@ static void ov21_021E70D4 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E ov21_021D4DA0(v0); } -static void ov21_021E71B8 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1) +static void ov21_021E71B8(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1) { int v0; @@ -660,10 +659,10 @@ static void ov21_021E71B8 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E } } -static void ov21_021E71D0 (UnkStruct_ov21_021E6A34 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10) +static void ov21_021E71D0(UnkStruct_ov21_021E6A34 *param0, GraphicElementData *param1, UnkStruct_ov21_021D4CA0 *param2, int param3, int param4, int param5, int *param6, int param7, int param8, int param9, void **param10) { int v0; - NNSG2dPaletteData * v1; + NNSG2dPaletteData *v1; BOOL v2; BOOL v3 = 0; int v4; @@ -710,12 +709,12 @@ static void ov21_021E71D0 (UnkStruct_ov21_021E6A34 * param0, GraphicElementData } } -static void ov21_021E727C (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4) +static void ov21_021E727C(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4) { ov21_021D1524(param0, param1, param2, param3, param4); } -static void ov21_021E728C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, const UnkStruct_ov21_021E6DAC * param2, int param3) +static void ov21_021E728C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, const UnkStruct_ov21_021E6DAC *param2, int param3) { int v0; int v1; @@ -731,7 +730,7 @@ static void ov21_021E728C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E } } -static void ov21_021E72E8 (UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E6A20 * param1) +static void ov21_021E72E8(UnkStruct_ov21_021E6DAC *param0, UnkStruct_ov21_021E6A20 *param1) { if (gCoreSys.pressedKeys & PAD_BUTTON_A) { if (param1->unk_04 == 1) { @@ -748,7 +747,7 @@ static void ov21_021E72E8 (UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E } } -static void ov21_021E732C (UnkStruct_ov21_021E6A34 * param0, const UnkStruct_ov21_021E6A20 * param1) +static void ov21_021E732C(UnkStruct_ov21_021E6A34 *param0, const UnkStruct_ov21_021E6A20 *param1) { if (ov21_021E33BC(param1->unk_0C) == 1) { if (param1->unk_04 == 0) { @@ -759,8 +758,8 @@ static void ov21_021E732C (UnkStruct_ov21_021E6A34 * param0, const UnkStruct_ov2 } } -static void ov21_021E7368 (UnkStruct_ov21_021E6A34 * param0, int param1, int param2, int param3, int param4) +static void ov21_021E7368(UnkStruct_ov21_021E6A34 *param0, int param1, int param2, int param3, int param4) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; ov21_021D2574(v0, param1, param2, param3, param4); } diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c index 2a789e1c2c..af55dcf5a5 100644 --- a/src/overlay021/ov21_021E737C.c +++ b/src/overlay021/ov21_021E737C.c @@ -1,53 +1,51 @@ +#include "overlay021/ov21_021E737C.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02015214_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay021/struct_ov21_021E7F40.h" #include "overlay022/struct_ov22_022557A0.h" #include "overlay022/struct_ov22_02255800.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "narc.h" +#include "pokemon_icon.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" -#include "narc.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "message.h" -#include "message_util.h" -#include "sys_task.h" #include "unk_02015064.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "pokemon_icon.h" #include "unk_02098700.h" #include "unk_02098988.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021E29DC.h" -#include "overlay021/ov21_021E737C.h" typedef struct { int unk_00; @@ -59,19 +57,19 @@ typedef struct { } UnkStruct_ov21_021E9DB0; typedef struct { - UnkStruct_ov21_021D3320 * unk_00; - UnkStruct_ov21_021E68F4 * unk_04; + UnkStruct_ov21_021D3320 *unk_00; + UnkStruct_ov21_021E68F4 *unk_04; } UnkStruct_ov21_021E7468; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; - UnkStruct_02015128 * unk_04; - UnkStruct_020151A4 * unk_08; - UnkStruct_02015214 * unk_0C; - void * unk_10; - void * unk_14; - NNSG2dCharacterData * unk_18; - NNSG2dPaletteData * unk_1C; + UnkStruct_ov21_021D13FC *unk_00; + UnkStruct_02015128 *unk_04; + UnkStruct_020151A4 *unk_08; + UnkStruct_02015214 *unk_0C; + void *unk_10; + void *unk_14; + NNSG2dCharacterData *unk_18; + NNSG2dPaletteData *unk_1C; } UnkStruct_ov21_021E747C; typedef struct { @@ -80,11 +78,11 @@ typedef struct { } UnkStruct_ov21_021E74A0; typedef struct { - UnkStruct_02015214 * unk_00; - GraphicElementData * unk_04; - GraphicElementData * unk_08; - GraphicElementData * unk_0C; - GraphicElementData * unk_10; + UnkStruct_02015214 *unk_00; + GraphicElementData *unk_04; + GraphicElementData *unk_08; + GraphicElementData *unk_0C; + GraphicElementData *unk_10; int unk_14; int unk_18; int unk_1C; @@ -92,115 +90,115 @@ typedef struct { int unk_24; int unk_28; int unk_2C; - BOOL * unk_30; + BOOL *unk_30; } UnkStruct_ov21_021E8084; typedef struct { - UnkStruct_02015214 * unk_00; - GraphicElementData * unk_04; - GraphicElementData * unk_08; - GraphicElementData * unk_0C; - GraphicElementData * unk_10; + UnkStruct_02015214 *unk_00; + GraphicElementData *unk_04; + GraphicElementData *unk_08; + GraphicElementData *unk_0C; + GraphicElementData *unk_10; int unk_14; int unk_18; int unk_1C; - BOOL * unk_20; + BOOL *unk_20; } UnkStruct_ov21_021E81F8; typedef struct { - GraphicElementData * unk_00; + GraphicElementData *unk_00; fx32 unk_04; fx32 unk_08; s16 unk_0C; int unk_10; int unk_14; int unk_18; - BOOL * unk_1C; + BOOL *unk_1C; } UnkStruct_ov21_021E82C8; typedef struct { - GraphicElementData * unk_00; - GraphicElementData * unk_04; - GraphicElementData * unk_08; - GraphicElementData * unk_0C[2]; - UnkStruct_02009DC8 * unk_14[4]; - UnkStruct_02009DC8 * unk_24[4]; - const UnkStruct_ov21_021E9DB0 * unk_34; + GraphicElementData *unk_00; + GraphicElementData *unk_04; + GraphicElementData *unk_08; + GraphicElementData *unk_0C[2]; + UnkStruct_02009DC8 *unk_14[4]; + UnkStruct_02009DC8 *unk_24[4]; + const UnkStruct_ov21_021E9DB0 *unk_34; int unk_38; - SysTask * unk_3C; + SysTask *unk_3C; UnkStruct_ov21_021E8084 unk_40; UnkStruct_ov21_021E81F8 unk_74; UnkStruct_ov21_021E82C8 unk_98; BOOL unk_B8; - u16 * unk_BC; - u16 * unk_C0; + u16 *unk_BC; + u16 *unk_C0; } UnkStruct_ov21_021E7714; -static UnkStruct_ov21_021E7468 * ov21_021E73E8(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021E747C * ov21_021E7424(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021E7468(UnkStruct_ov21_021E7468 * param0); -static void ov21_021E747C(UnkStruct_ov21_021E747C * param0); +static UnkStruct_ov21_021E7468 *ov21_021E73E8(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E747C *ov21_021E7424(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E7468(UnkStruct_ov21_021E7468 *param0); +static void ov21_021E747C(UnkStruct_ov21_021E747C *param0); static int ov21_021E749C(void); -static int ov21_021E74A0(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E750C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E751C(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E7530(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E75D4(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E7694(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021E7714(UnkStruct_ov21_021E7714 * param0); -static void ov21_021E7718(UnkStruct_ov21_021E7714 * param0); -static void ov21_021E771C(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, BOOL param3); -static BOOL ov21_021E77A4(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, BOOL param3); -static void ov21_021E7800(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, const UnkStruct_ov21_021E74A0 * param3, int param4); -static void ov21_021E785C(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1); -static void ov21_021E789C(UnkStruct_ov21_021E747C * param0, const UnkStruct_ov21_021E7468 * param1, int param2); -static void ov21_021E7904(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, int param3); -static void ov21_021E7AA0(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1); -static void ov21_021E7B34(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, int param3); -static void ov21_021E7CCC(UnkStruct_ov21_021E7714 * param0); -static void ov21_021E7CF0(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, int param3); -static void ov21_021E7CF4(UnkStruct_ov21_021E7714 * param0); -static void ov21_021E7CF8(UnkStruct_ov21_021E747C * param0, int param1); -static void ov21_021E7DA8(UnkStruct_ov21_021E747C * param0, const UnkStruct_ov21_021E7468 * param1, int param2); -static void ov21_021E7EC0(UnkStruct_ov21_021E747C * param0, int param1); -static void ov21_021E7F20(UnkStruct_ov21_021E747C * param0); -static void ov21_021E7F40(UnkStruct_ov21_021E747C * param0, int param1); -static void ov21_021E7F7C(UnkStruct_ov21_021E747C * param0); -static const UnkStruct_ov21_021E9DB0 * ov21_021E83D8(const UnkStruct_ov21_021E9DB0 * param0, int param1, int param2); -static void ov21_021E80D4(UnkStruct_02015214 * param0, GraphicElementData * param1, GraphicElementData * param2, GraphicElementData * param3, GraphicElementData * param4, u16 param5); -static void ov21_021E7F88(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, int param2); -static void ov21_021E7FD0(SysTask * param0, void * param1); -static void ov21_021E8084(UnkStruct_ov21_021E8084 * param0); -static void ov21_021E8188(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, u16 param2, u16 param3, int param4); -static void ov21_021E81F8(SysTask * param0, void * param1); -static void ov21_021E8258(UnkStruct_ov21_021E7714 * param0, s16 param1, int param2); -static void ov21_021E82C8(SysTask * param0, void * param1); -static void ov21_021E8400(UnkStruct_ov21_021E7714 * param0, u8 param1, u16 param2); +static int ov21_021E74A0(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E750C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E751C(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E7530(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E75D4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E7694(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021E7714(UnkStruct_ov21_021E7714 *param0); +static void ov21_021E7718(UnkStruct_ov21_021E7714 *param0); +static void ov21_021E771C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, BOOL param3); +static BOOL ov21_021E77A4(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, BOOL param3); +static void ov21_021E7800(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, const UnkStruct_ov21_021E74A0 *param3, int param4); +static void ov21_021E785C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1); +static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, int param2); +static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3); +static void ov21_021E7AA0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1); +static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3); +static void ov21_021E7CCC(UnkStruct_ov21_021E7714 *param0); +static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3); +static void ov21_021E7CF4(UnkStruct_ov21_021E7714 *param0); +static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, int param1); +static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, int param2); +static void ov21_021E7EC0(UnkStruct_ov21_021E747C *param0, int param1); +static void ov21_021E7F20(UnkStruct_ov21_021E747C *param0); +static void ov21_021E7F40(UnkStruct_ov21_021E747C *param0, int param1); +static void ov21_021E7F7C(UnkStruct_ov21_021E747C *param0); +static const UnkStruct_ov21_021E9DB0 *ov21_021E83D8(const UnkStruct_ov21_021E9DB0 *param0, int param1, int param2); +static void ov21_021E80D4(UnkStruct_02015214 *param0, GraphicElementData *param1, GraphicElementData *param2, GraphicElementData *param3, GraphicElementData *param4, u16 param5); +static void ov21_021E7F88(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, int param2); +static void ov21_021E7FD0(SysTask *param0, void *param1); +static void ov21_021E8084(UnkStruct_ov21_021E8084 *param0); +static void ov21_021E8188(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, u16 param2, u16 param3, int param4); +static void ov21_021E81F8(SysTask *param0, void *param1); +static void ov21_021E8258(UnkStruct_ov21_021E7714 *param0, s16 param1, int param2); +static void ov21_021E82C8(SysTask *param0, void *param1); +static void ov21_021E8400(UnkStruct_ov21_021E7714 *param0, u8 param1, u16 param2); const static UnkStruct_ov21_021E9DB0 Unk_ov21_021E9DB0[17] = { - {0x0, 0x1, 0x80, 0x0, 0x0, 0x0}, - {0xA, 0x1, 0x80, 0x2D8, 0x0, 0x0}, - {0x14, 0x1, 0x80, 0x222, 0x0, 0x0}, - {0x1E, 0x1, 0x80, 0x2D8, 0x0, 0x0}, - {0x28, 0x1, 0x80, 0x38E, 0x0, 0x0}, - {0x32, 0x0, 0x80, 0x444, 0x0, 0x0}, - {0x3C, 0x0, 0x80, 0x4FA, 0x0, 0x0}, - {0x46, 0x0, 0x80, 0x5B0, 0x0, 0x0}, - {0x96, 0x0, 0x80, 0xAAA, 0x0, 0x0}, - {0x12C, 0x0, 0x100, 0xAAA, 0x0, 0x0}, - {0x1F4, 0x0, 0x180, 0xAAA, 0x0, 0x0}, - {0x2EE, 0x0, 0x200, 0xAAA, 0x0, 0x0}, - {0x41A, 0x0, 0x280, 0xAAA, 0x1, 0x0}, - {0x60E, 0x0, 0x300, 0xAAA, 0x1, 0xFFFFFFFFFFFFFFFE}, - {0x92E, 0x0, 0x380, 0xAAA, 0x1, 0xFFFFFFFFFFFFFFFC}, - {0xDAC, 0x0, 0x400, 0xAAA, 0x1, 0xFFFFFFFFFFFFFFF8}, - {0xFFFF, 0x0, 0x480, 0xAAA, 0x1, 0xFFFFFFFFFFFFFFF0} + { 0x0, 0x1, 0x80, 0x0, 0x0, 0x0 }, + { 0xA, 0x1, 0x80, 0x2D8, 0x0, 0x0 }, + { 0x14, 0x1, 0x80, 0x222, 0x0, 0x0 }, + { 0x1E, 0x1, 0x80, 0x2D8, 0x0, 0x0 }, + { 0x28, 0x1, 0x80, 0x38E, 0x0, 0x0 }, + { 0x32, 0x0, 0x80, 0x444, 0x0, 0x0 }, + { 0x3C, 0x0, 0x80, 0x4FA, 0x0, 0x0 }, + { 0x46, 0x0, 0x80, 0x5B0, 0x0, 0x0 }, + { 0x96, 0x0, 0x80, 0xAAA, 0x0, 0x0 }, + { 0x12C, 0x0, 0x100, 0xAAA, 0x0, 0x0 }, + { 0x1F4, 0x0, 0x180, 0xAAA, 0x0, 0x0 }, + { 0x2EE, 0x0, 0x200, 0xAAA, 0x0, 0x0 }, + { 0x41A, 0x0, 0x280, 0xAAA, 0x1, 0x0 }, + { 0x60E, 0x0, 0x300, 0xAAA, 0x1, 0xFFFFFFFFFFFFFFFE }, + { 0x92E, 0x0, 0x380, 0xAAA, 0x1, 0xFFFFFFFFFFFFFFFC }, + { 0xDAC, 0x0, 0x400, 0xAAA, 0x1, 0xFFFFFFFFFFFFFFF8 }, + { 0xFFFF, 0x0, 0x480, 0xAAA, 0x1, 0xFFFFFFFFFFFFFFF0 } }; -void ov21_021E737C (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) +void ov21_021E737C(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) { - UnkStruct_ov21_021E7468 * v0; - UnkStruct_ov21_021E747C * v1; + UnkStruct_ov21_021E7468 *v0; + UnkStruct_ov21_021E747C *v1; v0 = ov21_021E73E8(param2, param1); v1 = ov21_021E7424(param2, param1); @@ -217,15 +215,15 @@ void ov21_021E737C (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021E7694; } -void ov21_021E73D4 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021E73D4(UnkStruct_ov21_021E68F4 *param0) { ov21_021E7468(param0->unk_00); ov21_021E747C(param0->unk_04); } -static UnkStruct_ov21_021E7468 * ov21_021E73E8 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E7468 *ov21_021E73E8(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E7468 * v0; + UnkStruct_ov21_021E7468 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E7468)); GF_ASSERT(v0); @@ -237,10 +235,10 @@ static UnkStruct_ov21_021E7468 * ov21_021E73E8 (int param0, UnkStruct_ov21_021D0 return v0; } -UnkStruct_ov21_021E747C * ov21_021E7424 (int param0, UnkStruct_ov21_021D0F60 * param1) +UnkStruct_ov21_021E747C *ov21_021E7424(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E747C * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E747C *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E747C)); @@ -256,13 +254,13 @@ UnkStruct_ov21_021E747C * ov21_021E7424 (int param0, UnkStruct_ov21_021D0F60 * p return v0; } -static void ov21_021E7468 (UnkStruct_ov21_021E7468 * param0) +static void ov21_021E7468(UnkStruct_ov21_021E7468 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E747C (UnkStruct_ov21_021E747C * param0) +static void ov21_021E747C(UnkStruct_ov21_021E747C *param0) { GF_ASSERT(param0); @@ -271,15 +269,15 @@ static void ov21_021E747C (UnkStruct_ov21_021E747C * param0) Heap_FreeToHeap(param0); } -static int ov21_021E749C (void) +static int ov21_021E749C(void) { return 0; } -static int ov21_021E74A0 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E74A0(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E7468 * v0 = param1; - UnkStruct_ov21_021E74A0 * v1; + UnkStruct_ov21_021E7468 *v0 = param1; + UnkStruct_ov21_021E74A0 *v1; int v2; int v3; int v4; @@ -310,10 +308,10 @@ static int ov21_021E74A0 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E750C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E750C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E7468 * v0 = param1; - UnkStruct_ov21_021E74A0 * v1 = param0->unk_08; + UnkStruct_ov21_021E7468 *v0 = param1; + UnkStruct_ov21_021E74A0 *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -326,10 +324,10 @@ static int ov21_021E750C (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021E751C (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E751C(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E7468 * v0 = param1; - UnkStruct_ov21_021E74A0 * v1 = param0->unk_08; + UnkStruct_ov21_021E7468 *v0 = param1; + UnkStruct_ov21_021E74A0 *v1 = param0->unk_08; Heap_FreeToHeap(v1); param0->unk_08 = NULL; @@ -337,12 +335,12 @@ static int ov21_021E751C (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E7530 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E7530(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E7468 * v0 = param2; - const UnkStruct_ov21_021E74A0 * v1 = param3->unk_08; - UnkStruct_ov21_021E747C * v2 = param0; - UnkStruct_ov21_021E7714 * v3 = param1->unk_08; + const UnkStruct_ov21_021E7468 *v0 = param2; + const UnkStruct_ov21_021E74A0 *v1 = param3->unk_08; + UnkStruct_ov21_021E747C *v2 = param0; + UnkStruct_ov21_021E7714 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -371,12 +369,12 @@ static int ov21_021E7530 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E75D4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E75D4(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E7468 * v0 = param2; - const UnkStruct_ov21_021E74A0 * v1 = param3->unk_08; - UnkStruct_ov21_021E747C * v2 = param0; - UnkStruct_ov21_021E7714 * v3 = param1->unk_08; + const UnkStruct_ov21_021E7468 *v0 = param2; + const UnkStruct_ov21_021E74A0 *v1 = param3->unk_08; + UnkStruct_ov21_021E747C *v2 = param0; + UnkStruct_ov21_021E7714 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -426,12 +424,12 @@ static int ov21_021E75D4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E7694 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E7694(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E7468 * v0 = param2; - const UnkStruct_ov21_021E74A0 * v1 = param3->unk_08; - UnkStruct_ov21_021E747C * v2 = param0; - UnkStruct_ov21_021E7714 * v3 = param1->unk_08; + const UnkStruct_ov21_021E7468 *v0 = param2; + const UnkStruct_ov21_021E74A0 *v1 = param3->unk_08; + UnkStruct_ov21_021E747C *v2 = param0; + UnkStruct_ov21_021E7714 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -463,17 +461,17 @@ static int ov21_021E7694 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021E7714 (UnkStruct_ov21_021E7714 * param0) +static void ov21_021E7714(UnkStruct_ov21_021E7714 *param0) { return; } -static void ov21_021E7718 (UnkStruct_ov21_021E7714 * param0) +static void ov21_021E7718(UnkStruct_ov21_021E7714 *param0) { return; } -static void ov21_021E771C (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, BOOL param3) +static void ov21_021E771C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, BOOL param3) { ov21_021E7714(param0); @@ -487,7 +485,7 @@ static void ov21_021E771C (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E } } -static BOOL ov21_021E77A4 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, BOOL param3) +static BOOL ov21_021E77A4(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, BOOL param3) { BOOL v0; @@ -510,7 +508,7 @@ static BOOL ov21_021E77A4 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E return 0; } -static void ov21_021E7800 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, const UnkStruct_ov21_021E74A0 * param3, int param4) +static void ov21_021E7800(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, const UnkStruct_ov21_021E74A0 *param3, int param4) { ov21_021E789C(param1, param2, param4); ov21_021E7CF8(param1, param4); @@ -523,7 +521,7 @@ static void ov21_021E7800 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E sub_02015240(param1->unk_0C, 1); } -static void ov21_021E785C (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1) +static void ov21_021E785C(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1) { ov21_021E7CF4(param0); ov21_021E7CCC(param0); @@ -536,10 +534,10 @@ static void ov21_021E785C (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E sub_020152BC(param1->unk_0C, 0); } -static void ov21_021E789C (UnkStruct_ov21_021E747C * param0, const UnkStruct_ov21_021E7468 * param1, int param2) +static void ov21_021E789C(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, int param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param2); @@ -550,15 +548,15 @@ static void ov21_021E789C (UnkStruct_ov21_021E747C * param0, const UnkStruct_ov2 sub_0201C3C0(param0->unk_00->unk_00, 3); } -static void ov21_021E7904 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, int param3) +static void ov21_021E7904(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; int v1, v2, v3, v4; int v5 = ov21_021D37BC(param2->unk_00); BOOL v6; - NARC * v7 = ov21_021D26E0(param1->unk_00); + NARC *v7 = ov21_021D26E0(param1->unk_00); int v8; - NARC * v9; + NARC *v9; v9 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, param3); v8 = ov21_021D33D4(param2->unk_00, v5); @@ -602,9 +600,9 @@ static void ov21_021E7904 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E NARC_dtor(v9); } -static void ov21_021E7AA0 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1) +static void ov21_021E7AA0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_14[0]); sub_0200A6DC(param0->unk_14[1]); @@ -626,11 +624,11 @@ static void ov21_021E7AA0 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E Heap_FreeToHeap(param0->unk_C0); } -static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, int param3) +static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; VecFx32 v3; short v4; short v5; @@ -689,7 +687,7 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E sub_02021EC4(param0->unk_04, PokeIconPaletteIndex(v6, v7, 0)); } -static void ov21_021E7CCC (UnkStruct_ov21_021E7714 * param0) +static void ov21_021E7CCC(UnkStruct_ov21_021E7714 *param0) { sub_02021BD4(param0->unk_00); sub_02021BD4(param0->unk_04); @@ -698,20 +696,20 @@ static void ov21_021E7CCC (UnkStruct_ov21_021E7714 * param0) sub_02021BD4(param0->unk_0C[1]); } -static void ov21_021E7CF0 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, int param3) +static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, int param3) { return; } -static void ov21_021E7CF4 (UnkStruct_ov21_021E7714 * param0) +static void ov21_021E7CF4(UnkStruct_ov21_021E7714 *param0) { return; } -static void ov21_021E7CF8 (UnkStruct_ov21_021E747C * param0, int param1) +static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, int param1) { - Strbuf* v0 = Strbuf_Init(32, param1); - MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); + Strbuf *v0 = Strbuf_Init(32, param1); + MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); MessageLoader_GetStrbuf(v1, 44, v0); @@ -728,12 +726,12 @@ static void ov21_021E7CF8 (UnkStruct_ov21_021E747C * param0, int param1) MessageLoader_Free(v1); } -static void ov21_021E7DA8 (UnkStruct_ov21_021E747C * param0, const UnkStruct_ov21_021E7468 * param1, int param2) +static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, int param2) { - Strbuf* v0 = Strbuf_Init(32, param2); - MessageLoader * v1; + Strbuf *v0 = Strbuf_Init(32, param2); + MessageLoader *v1; int v2 = ov21_021D37BC(param1->unk_00); - Strbuf* v3 = MessageUtil_SpeciesName(v2, param2); + Strbuf *v3 = MessageUtil_SpeciesName(v2, param2); int v4; v4 = sub_020989C4(); @@ -769,7 +767,7 @@ static void ov21_021E7DA8 (UnkStruct_ov21_021E747C * param0, const UnkStruct_ov2 MessageLoader_Free(v1); } -static void ov21_021E7EC0 (UnkStruct_ov21_021E747C * param0, int param1) +static void ov21_021E7EC0(UnkStruct_ov21_021E747C *param0, int param1) { UnkStruct_ov22_022557A0 v0; UnkStruct_ov22_02255800 v1; @@ -789,7 +787,7 @@ static void ov21_021E7EC0 (UnkStruct_ov21_021E747C * param0, int param1) param0->unk_08 = sub_020151A4(&v1); } -static void ov21_021E7F20 (UnkStruct_ov21_021E747C * param0) +static void ov21_021E7F20(UnkStruct_ov21_021E747C *param0) { sub_02015164(param0->unk_04); sub_020151D4(param0->unk_08); @@ -797,7 +795,7 @@ static void ov21_021E7F20 (UnkStruct_ov21_021E747C * param0) Heap_FreeToHeap(param0->unk_14); } -static void ov21_021E7F40 (UnkStruct_ov21_021E747C * param0, int param1) +static void ov21_021E7F40(UnkStruct_ov21_021E747C *param0, int param1) { UnkStruct_ov21_021E7F40 v0; @@ -815,12 +813,12 @@ static void ov21_021E7F40 (UnkStruct_ov21_021E747C * param0, int param1) param0->unk_0C = sub_02015214(&v0); } -static void ov21_021E7F7C (UnkStruct_ov21_021E747C * param0) +static void ov21_021E7F7C(UnkStruct_ov21_021E747C *param0) { sub_02015238(param0->unk_0C); } -static void ov21_021E7F88 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, int param2) +static void ov21_021E7F88(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, int param2) { param0->unk_40.unk_00 = param1->unk_0C; param0->unk_40.unk_04 = param0->unk_0C[0]; @@ -840,9 +838,9 @@ static void ov21_021E7F88 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E param0->unk_3C = SysTask_Start(ov21_021E7FD0, ¶m0->unk_40, 0); } -static void ov21_021E7FD0 (SysTask * param0, void * param1) +static void ov21_021E7FD0(SysTask *param0, void *param1) { - UnkStruct_ov21_021E8084 * v0 = (UnkStruct_ov21_021E8084 *)param1; + UnkStruct_ov21_021E8084 *v0 = (UnkStruct_ov21_021E8084 *)param1; switch (v0->unk_2C) { case 0: @@ -854,21 +852,21 @@ static void ov21_021E7FD0 (SysTask * param0, void * param1) break; case 2: v0->unk_24 = (-((3 * 0xffff) / 360)) * v0->unk_14; - v0->unk_20 = -(((1 * 0xffff) / 360)) * v0->unk_14; + v0->unk_20 = -((1 * 0xffff) / 360) * v0->unk_14; v0->unk_28 = 3; v0->unk_2C = 1; ov21_021E8084(v0); break; case 3: - v0->unk_24 = (((3 * 0xffff) / 360)) * v0->unk_14; - v0->unk_20 = (((1 * 0xffff) / 360)) * v0->unk_14; + v0->unk_24 = ((3 * 0xffff) / 360) * v0->unk_14; + v0->unk_20 = ((1 * 0xffff) / 360) * v0->unk_14; v0->unk_28 = 4; v0->unk_2C = 1; ov21_021E8084(v0); break; case 4: - v0->unk_24 = (((0 * 0xffff) / 360)) * v0->unk_14; - v0->unk_20 = -(((1 * 0xffff) / 360)) * v0->unk_14; + v0->unk_24 = ((0 * 0xffff) / 360) * v0->unk_14; + v0->unk_20 = -((1 * 0xffff) / 360) * v0->unk_14; v0->unk_2C = 1; v0->unk_18--; @@ -888,7 +886,7 @@ static void ov21_021E7FD0 (SysTask * param0, void * param1) } } -static void ov21_021E8084 (UnkStruct_ov21_021E8084 * param0) +static void ov21_021E8084(UnkStruct_ov21_021E8084 *param0) { if (param0->unk_20 < 0) { if ((param0->unk_1C + param0->unk_20) >= param0->unk_24) { @@ -909,7 +907,7 @@ static void ov21_021E8084 (UnkStruct_ov21_021E8084 * param0) ov21_021E80D4(param0->unk_00, param0->unk_04, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_1C); } -static void ov21_021E80D4 (UnkStruct_02015214 * param0, GraphicElementData * param1, GraphicElementData * param2, GraphicElementData * param3, GraphicElementData * param4, u16 param5) +static void ov21_021E80D4(UnkStruct_02015214 *param0, GraphicElementData *param1, GraphicElementData *param2, GraphicElementData *param3, GraphicElementData *param4, u16 param5) { fx32 v0, v1; VecFx32 v2; @@ -934,7 +932,7 @@ static void ov21_021E80D4 (UnkStruct_02015214 * param0, GraphicElementData * par sub_02021C50(param2, &v2); } -static void ov21_021E8188 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, u16 param2, u16 param3, int param4) +static void ov21_021E8188(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, u16 param2, u16 param3, int param4) { param0->unk_74.unk_00 = param1->unk_0C; param0->unk_74.unk_04 = param0->unk_0C[0]; @@ -956,9 +954,9 @@ static void ov21_021E8188 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E param0->unk_3C = SysTask_Start(ov21_021E81F8, ¶m0->unk_74, 0); } -static void ov21_021E81F8 (SysTask * param0, void * param1) +static void ov21_021E81F8(SysTask *param0, void *param1) { - UnkStruct_ov21_021E81F8 * v0 = (UnkStruct_ov21_021E81F8 *)param1; + UnkStruct_ov21_021E81F8 *v0 = (UnkStruct_ov21_021E81F8 *)param1; BOOL v1 = 0; if (v0->unk_18 < 0) { @@ -985,9 +983,9 @@ static void ov21_021E81F8 (SysTask * param0, void * param1) } } -static void ov21_021E8258 (UnkStruct_ov21_021E7714 * param0, s16 param1, int param2) +static void ov21_021E8258(UnkStruct_ov21_021E7714 *param0, s16 param1, int param2) { - const VecFx32 * v0; + const VecFx32 *v0; if (param2 == 0) { param0->unk_98.unk_00 = param0->unk_04; @@ -1009,9 +1007,9 @@ static void ov21_021E8258 (UnkStruct_ov21_021E7714 * param0, s16 param1, int par param0->unk_3C = SysTask_Start(ov21_021E82C8, ¶m0->unk_98, 0); } -static void ov21_021E82C8 (SysTask * param0, void * param1) +static void ov21_021E82C8(SysTask *param0, void *param1) { - UnkStruct_ov21_021E82C8 * v0 = (UnkStruct_ov21_021E82C8 *)param1; + UnkStruct_ov21_021E82C8 *v0 = (UnkStruct_ov21_021E82C8 *)param1; int v1; VecFx32 v2; @@ -1075,7 +1073,7 @@ static void ov21_021E82C8 (SysTask * param0, void * param1) } } -static const UnkStruct_ov21_021E9DB0 * ov21_021E83D8 (const UnkStruct_ov21_021E9DB0 * param0, int param1, int param2) +static const UnkStruct_ov21_021E9DB0 *ov21_021E83D8(const UnkStruct_ov21_021E9DB0 *param0, int param1, int param2) { int v0; @@ -1088,10 +1086,10 @@ static const UnkStruct_ov21_021E9DB0 * ov21_021E83D8 (const UnkStruct_ov21_021E9 return NULL; } -static void ov21_021E8400 (UnkStruct_ov21_021E7714 * param0, u8 param1, u16 param2) +static void ov21_021E8400(UnkStruct_ov21_021E7714 *param0, u8 param1, u16 param2) { - NNSG2dPaletteData * v0 = sub_02009E34(param0->unk_14[1]); - const NNSG2dImagePaletteProxy * v1 = sub_0200A72C(param0->unk_14[1], NULL); + NNSG2dPaletteData *v0 = sub_02009E34(param0->unk_14[1]); + const NNSG2dImagePaletteProxy *v1 = sub_0200A72C(param0->unk_14[1], NULL); sub_0200393C(v0->pRawData, param0->unk_BC, 3 * 16, param1, param2); sub_0201DC68(NNS_GFD_DST_2D_OBJ_PLTT_MAIN, NNS_G2dGetImagePaletteLocation(v1, NNS_G2D_VRAM_TYPE_2DMAIN), param0->unk_BC, 3 * 32); diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c index 0b2468df84..ae1f8b40bf 100644 --- a/src/overlay021/ov21_021E8484.c +++ b/src/overlay021/ov21_021E8484.c @@ -1,124 +1,123 @@ +#include "overlay021/ov21_021E8484.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "overlay021/struct_ov21_021D0F60_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D3208.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021DF734.h" +#include "overlay021/ov21_021E29DC.h" +#include "overlay021/struct_ov21_021D0F60_decl.h" #include "overlay021/struct_ov21_021D13FC.h" #include "overlay021/struct_ov21_021D3320.h" #include "overlay021/struct_ov21_021D4660.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021E68F4.h" +#include "overlay021/struct_ov21_021E6A68.h" #include "overlay021/struct_ov21_021E6B20.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "overlay021/struct_ov21_021E6A68.h" - +#include "core_sys.h" +#include "heap.h" +#include "touch_screen.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201F834.h" #include "unk_020218BC.h" #include "unk_02023FCC.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D3208.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021DF734.h" -#include "overlay021/ov21_021E29DC.h" -#include "overlay021/ov21_021E8484.h" typedef struct { - int * unk_00; - UnkStruct_ov21_021D3320 * unk_04; - UnkStruct_ov21_021E68F4 * unk_08; - UnkStruct_ov21_021E68F4 * unk_0C; + int *unk_00; + UnkStruct_ov21_021D3320 *unk_04; + UnkStruct_ov21_021E68F4 *unk_08; + UnkStruct_ov21_021E68F4 *unk_0C; } UnkStruct_ov21_021E8570; typedef struct { - UnkStruct_ov21_021D13FC * unk_00; + UnkStruct_ov21_021D13FC *unk_00; } UnkStruct_ov21_021E8584; typedef struct { - void * unk_00; - void * unk_04; + void *unk_00; + void *unk_04; } UnkStruct_ov21_021E88E8; typedef struct { - UnkStruct_02023FCC * unk_00; - TouchScreenHitTable * unk_04; + UnkStruct_02023FCC *unk_00; + TouchScreenHitTable *unk_04; UnkStruct_ov21_021E88E8 unk_08; int unk_10[1]; BOOL unk_14; } UnkStruct_ov21_021E88B0; typedef struct { - GraphicElementData * unk_00[1]; - UnkStruct_ov21_021D4CA0 * unk_04[1]; - UnkStruct_02009DC8 * unk_08[4]; - GraphicElementData * unk_18[4]; + GraphicElementData *unk_00[1]; + UnkStruct_ov21_021D4CA0 *unk_04[1]; + UnkStruct_02009DC8 *unk_08[4]; + GraphicElementData *unk_18[4]; int unk_28[1]; - void * unk_2C[1]; + void *unk_2C[1]; } UnkStruct_ov21_021E8794; -static UnkStruct_ov21_021E8570 * ov21_021E84FC(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021E8584 * ov21_021E8544(int param0, UnkStruct_ov21_021D0F60 * param1); -static UnkStruct_ov21_021D4660 * ov21_021E856C(int param0, UnkStruct_ov21_021D0F60 * param1); -static void ov21_021E8570(UnkStruct_ov21_021E8570 * param0); -static void ov21_021E8584(UnkStruct_ov21_021E8584 * param0); -static void ov21_021E8598(UnkStruct_ov21_021D4660 * param0); +static UnkStruct_ov21_021E8570 *ov21_021E84FC(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021E8584 *ov21_021E8544(int param0, UnkStruct_ov21_021D0F60 *param1); +static UnkStruct_ov21_021D4660 *ov21_021E856C(int param0, UnkStruct_ov21_021D0F60 *param1); +static void ov21_021E8570(UnkStruct_ov21_021E8570 *param0); +static void ov21_021E8584(UnkStruct_ov21_021E8584 *param0); +static void ov21_021E8598(UnkStruct_ov21_021D4660 *param0); static int ov21_021E859C(void); -static int ov21_021E85A0(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E85DC(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E8640(UnkStruct_ov21_021E6A68 * param0, void * param1); -static int ov21_021E8654(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E86DC(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static int ov21_021E870C(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3); -static void ov21_021E8794(UnkStruct_ov21_021E8794 * param0); -static void ov21_021E87AC(UnkStruct_ov21_021E8794 * param0); -static void ov21_021E87C4(UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, const UnkStruct_ov21_021E8570 * param2, BOOL param3); -static BOOL ov21_021E8830(UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, const UnkStruct_ov21_021E8570 * param2, BOOL param3); -static void ov21_021E886C(UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E8570 * param1, int param2); -static void ov21_021E88B0(UnkStruct_ov21_021E88B0 * param0); -static void ov21_021E88B8(UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E8570 * param1); -static void ov21_021E88D0(UnkStruct_ov21_021E88B0 * param0); -static void ov21_021E88E8(u32 param0, u32 param1, void * param2); -static void ov21_021E8BE8(UnkStruct_ov21_021E8584 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10); -static void ov21_021E8C94(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4); -static void ov21_021E8CBC(UnkStruct_ov21_021E8584 * param0, UnkStruct_ov21_021E8794 * param1, const UnkStruct_ov21_021E88B0 * param2, int param3); -static void ov21_021E8D3C(const UnkStruct_ov21_021E8570 * param0); -static void ov21_021E8CF0(UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E8570 * param1); -static void ov21_021E8D04(UnkStruct_ov21_021E8584 * param0, const UnkStruct_ov21_021E8570 * param1); -static void ov21_021E8D28(UnkStruct_ov21_021E8584 * param0, int param1, int param2, int param3, int param4); -static void ov21_021E891C(UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2); -static void ov21_021E894C(UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2); -static void ov21_021E898C(UnkStruct_ov21_021E8584 * param0, int param1); -static void ov21_021E89F4(UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2); -static void ov21_021E8A74(UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1); -static void ov21_021E8AA8(UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2); -static void ov21_021E8B34(UnkStruct_ov21_021E8794 * param0); -static void ov21_021E8B40(UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2); -static void ov21_021E8BDC(UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1); - -void ov21_021E8484 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2) -{ - UnkStruct_ov21_021E8570 * v0; - UnkStruct_ov21_021E8584 * v1; - UnkStruct_ov21_021D4660 * v2; +static int ov21_021E85A0(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E85DC(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E8640(UnkStruct_ov21_021E6A68 *param0, void *param1); +static int ov21_021E8654(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E86DC(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static int ov21_021E870C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3); +static void ov21_021E8794(UnkStruct_ov21_021E8794 *param0); +static void ov21_021E87AC(UnkStruct_ov21_021E8794 *param0); +static void ov21_021E87C4(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, const UnkStruct_ov21_021E8570 *param2, BOOL param3); +static BOOL ov21_021E8830(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, const UnkStruct_ov21_021E8570 *param2, BOOL param3); +static void ov21_021E886C(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1, int param2); +static void ov21_021E88B0(UnkStruct_ov21_021E88B0 *param0); +static void ov21_021E88B8(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1); +static void ov21_021E88D0(UnkStruct_ov21_021E88B0 *param0); +static void ov21_021E88E8(u32 param0, u32 param1, void *param2); +static void ov21_021E8BE8(UnkStruct_ov21_021E8584 *param0, GraphicElementData *param1, UnkStruct_ov21_021D4CA0 *param2, int param3, int param4, int param5, int *param6, int param7, int param8, int param9, void **param10); +static void ov21_021E8C94(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4); +static void ov21_021E8CBC(UnkStruct_ov21_021E8584 *param0, UnkStruct_ov21_021E8794 *param1, const UnkStruct_ov21_021E88B0 *param2, int param3); +static void ov21_021E8D3C(const UnkStruct_ov21_021E8570 *param0); +static void ov21_021E8CF0(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1); +static void ov21_021E8D04(UnkStruct_ov21_021E8584 *param0, const UnkStruct_ov21_021E8570 *param1); +static void ov21_021E8D28(UnkStruct_ov21_021E8584 *param0, int param1, int param2, int param3, int param4); +static void ov21_021E891C(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2); +static void ov21_021E894C(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2); +static void ov21_021E898C(UnkStruct_ov21_021E8584 *param0, int param1); +static void ov21_021E89F4(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2); +static void ov21_021E8A74(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1); +static void ov21_021E8AA8(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2); +static void ov21_021E8B34(UnkStruct_ov21_021E8794 *param0); +static void ov21_021E8B40(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2); +static void ov21_021E8BDC(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1); + +void ov21_021E8484(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2) +{ + UnkStruct_ov21_021E8570 *v0; + UnkStruct_ov21_021E8584 *v1; + UnkStruct_ov21_021D4660 *v2; v0 = ov21_021E84FC(param2, param1); v1 = ov21_021E8544(param2, param1); @@ -137,16 +136,16 @@ void ov21_021E8484 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param0->unk_14[2] = ov21_021E870C; } -void ov21_021E84E4 (UnkStruct_ov21_021E68F4 * param0) +void ov21_021E84E4(UnkStruct_ov21_021E68F4 *param0) { ov21_021E8570(param0->unk_00); ov21_021E8584(param0->unk_04); ov21_021E8598(param0->unk_20); } -static UnkStruct_ov21_021E8570 * ov21_021E84FC (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E8570 *ov21_021E84FC(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E8570 * v0; + UnkStruct_ov21_021E8570 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E8570)); @@ -161,10 +160,10 @@ static UnkStruct_ov21_021E8570 * ov21_021E84FC (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021E8584 * ov21_021E8544 (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021E8584 *ov21_021E8544(int param0, UnkStruct_ov21_021D0F60 *param1) { - UnkStruct_ov21_021E8584 * v0; - UnkStruct_ov21_021E68F4 * v1; + UnkStruct_ov21_021E8584 *v0; + UnkStruct_ov21_021E68F4 *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov21_021E8584)); @@ -176,37 +175,37 @@ static UnkStruct_ov21_021E8584 * ov21_021E8544 (int param0, UnkStruct_ov21_021D0 return v0; } -static UnkStruct_ov21_021D4660 * ov21_021E856C (int param0, UnkStruct_ov21_021D0F60 * param1) +static UnkStruct_ov21_021D4660 *ov21_021E856C(int param0, UnkStruct_ov21_021D0F60 *param1) { return NULL; } -static void ov21_021E8570 (UnkStruct_ov21_021E8570 * param0) +static void ov21_021E8570(UnkStruct_ov21_021E8570 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E8584 (UnkStruct_ov21_021E8584 * param0) +static void ov21_021E8584(UnkStruct_ov21_021E8584 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void ov21_021E8598 (UnkStruct_ov21_021D4660 * param0) +static void ov21_021E8598(UnkStruct_ov21_021D4660 *param0) { return; } -static int ov21_021E859C (void) +static int ov21_021E859C(void) { return 0; } -static int ov21_021E85A0 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E85A0(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E8570 * v0 = param1; - UnkStruct_ov21_021E88B0 * v1 = param0->unk_08; + UnkStruct_ov21_021E8570 *v0 = param1; + UnkStruct_ov21_021E88B0 *v1 = param0->unk_08; int v2; v1 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov21_021E88B0)); @@ -224,10 +223,10 @@ static int ov21_021E85A0 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E85DC (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E85DC(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E8570 * v0 = param1; - UnkStruct_ov21_021E88B0 * v1 = param0->unk_08; + UnkStruct_ov21_021E8570 *v0 = param1; + UnkStruct_ov21_021E88B0 *v1 = param0->unk_08; if (param0->unk_0C == 1) { return 1; @@ -255,10 +254,10 @@ static int ov21_021E85DC (UnkStruct_ov21_021E6A68 * param0, void * param1) return 0; } -static int ov21_021E8640 (UnkStruct_ov21_021E6A68 * param0, void * param1) +static int ov21_021E8640(UnkStruct_ov21_021E6A68 *param0, void *param1) { - UnkStruct_ov21_021E8570 * v0 = param1; - UnkStruct_ov21_021E88B0 * v1 = param0->unk_08; + UnkStruct_ov21_021E8570 *v0 = param1; + UnkStruct_ov21_021E88B0 *v1 = param0->unk_08; ov21_021E88D0(v1); Heap_FreeToHeap(v1); @@ -266,12 +265,12 @@ static int ov21_021E8640 (UnkStruct_ov21_021E6A68 * param0, void * param1) return 1; } -static int ov21_021E8654 (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E8654(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E8570 * v0 = param2; - const UnkStruct_ov21_021E88B0 * v1 = param3->unk_08; - UnkStruct_ov21_021E8584 * v2 = param0; - UnkStruct_ov21_021E8794 * v3 = param1->unk_08; + const UnkStruct_ov21_021E8570 *v0 = param2; + const UnkStruct_ov21_021E88B0 *v1 = param3->unk_08; + UnkStruct_ov21_021E8584 *v2 = param0; + UnkStruct_ov21_021E8794 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -299,12 +298,12 @@ static int ov21_021E8654 (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E86DC (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E86DC(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E8570 * v0 = param2; - const UnkStruct_ov21_021E88B0 * v1 = param3->unk_08; - UnkStruct_ov21_021E8584 * v2 = param0; - UnkStruct_ov21_021E8794 * v3 = param1->unk_08; + const UnkStruct_ov21_021E8570 *v0 = param2; + const UnkStruct_ov21_021E88B0 *v1 = param3->unk_08; + UnkStruct_ov21_021E8584 *v2 = param0; + UnkStruct_ov21_021E8794 *v3 = param1->unk_08; if (ov21_021E33AC(v0->unk_08)) { ov21_021E8CBC(v2, v3, v1, param1->unk_04); @@ -314,12 +313,12 @@ static int ov21_021E86DC (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static int ov21_021E870C (void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3) +static int ov21_021E870C(void *param0, UnkStruct_ov21_021E6B20 *param1, const void *param2, const UnkStruct_ov21_021E6A68 *param3) { - const UnkStruct_ov21_021E8570 * v0 = param2; - const UnkStruct_ov21_021E88B0 * v1 = param3->unk_08; - UnkStruct_ov21_021E8584 * v2 = param0; - UnkStruct_ov21_021E8794 * v3 = param1->unk_08; + const UnkStruct_ov21_021E8570 *v0 = param2; + const UnkStruct_ov21_021E88B0 *v1 = param3->unk_08; + UnkStruct_ov21_021E8584 *v2 = param0; + UnkStruct_ov21_021E8794 *v3 = param1->unk_08; switch (param1->unk_00) { case 0: @@ -349,7 +348,7 @@ static int ov21_021E870C (void * param0, UnkStruct_ov21_021E6B20 * param1, const return 0; } -static void ov21_021E8794 (UnkStruct_ov21_021E8794 * param0) +static void ov21_021E8794(UnkStruct_ov21_021E8794 *param0) { int v0; @@ -359,7 +358,7 @@ static void ov21_021E8794 (UnkStruct_ov21_021E8794 * param0) } } -static void ov21_021E87AC (UnkStruct_ov21_021E8794 * param0) +static void ov21_021E87AC(UnkStruct_ov21_021E8794 *param0) { int v0; @@ -369,7 +368,7 @@ static void ov21_021E87AC (UnkStruct_ov21_021E8794 * param0) } } -static void ov21_021E87C4 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, const UnkStruct_ov21_021E8570 * param2, BOOL param3) +static void ov21_021E87C4(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, const UnkStruct_ov21_021E8570 *param2, BOOL param3) { ov21_021E8794(param0); @@ -382,7 +381,7 @@ static void ov21_021E87C4 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E } } -static BOOL ov21_021E8830 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, const UnkStruct_ov21_021E8570 * param2, BOOL param3) +static BOOL ov21_021E8830(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, const UnkStruct_ov21_021E8570 *param2, BOOL param3) { BOOL v0; @@ -403,7 +402,7 @@ static BOOL ov21_021E8830 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E return 0; } -static void ov21_021E886C (UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E8570 * param1, int param2) +static void ov21_021E886C(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1, int param2) { param0->unk_04 = Heap_AllocFromHeap(param2, sizeof(TouchScreenHitTable) * 1); @@ -414,7 +413,7 @@ static void ov21_021E886C (UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E param0->unk_00 = sub_02023FCC(param0->unk_04, 1, ov21_021E88E8, ¶m0->unk_08, param2); } -static void ov21_021E88B0 (UnkStruct_ov21_021E88B0 * param0) +static void ov21_021E88B0(UnkStruct_ov21_021E88B0 *param0) { int v0; @@ -423,7 +422,7 @@ static void ov21_021E88B0 (UnkStruct_ov21_021E88B0 * param0) } } -static void ov21_021E88B8 (UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E8570 * param1) +static void ov21_021E88B8(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1) { sub_0202404C(param0->unk_00); @@ -432,7 +431,7 @@ static void ov21_021E88B8 (UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E } } -static void ov21_021E88D0 (UnkStruct_ov21_021E88B0 * param0) +static void ov21_021E88D0(UnkStruct_ov21_021E88B0 *param0) { sub_02024034(param0->unk_00); Heap_FreeToHeap(param0->unk_04); @@ -440,11 +439,11 @@ static void ov21_021E88D0 (UnkStruct_ov21_021E88B0 * param0) param0->unk_04 = NULL; } -static void ov21_021E88E8 (u32 param0, u32 param1, void * param2) +static void ov21_021E88E8(u32 param0, u32 param1, void *param2) { - UnkStruct_ov21_021E88E8 * v0 = param2; - UnkStruct_ov21_021E8570 * v1 = v0->unk_00; - UnkStruct_ov21_021E88B0 * v2 = v0->unk_04; + UnkStruct_ov21_021E88E8 *v0 = param2; + UnkStruct_ov21_021E8570 *v1 = v0->unk_00; + UnkStruct_ov21_021E88B0 *v2 = v0->unk_04; v2->unk_10[param0] = param1; @@ -473,7 +472,7 @@ static void ov21_021E88E8 (u32 param0, u32 param1, void * param2) } } -static void ov21_021E891C (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2) +static void ov21_021E891C(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2) { ov21_021E898C(param1, param2); ov21_021E89F4(param0, param1, param2); @@ -481,7 +480,7 @@ static void ov21_021E891C (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E ov21_021E8B40(param0, param1, param2); } -static void ov21_021E894C (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2) +static void ov21_021E894C(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2) { int v0; @@ -497,10 +496,10 @@ static void ov21_021E894C (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E } } -static void ov21_021E898C (UnkStruct_ov21_021E8584 * param0, int param1) +static void ov21_021E898C(UnkStruct_ov21_021E8584 *param0, int param1) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; ov21_021D2724(param0->unk_00, 34, param0->unk_00->unk_00, 6, 0, 0, 1, param1); @@ -511,10 +510,10 @@ static void ov21_021E898C (UnkStruct_ov21_021E8584 * param0, int param1) sub_0201C3C0(param0->unk_00->unk_00, 6); } -static void ov21_021E89F4 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2) +static void ov21_021E89F4(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; - NARC * v1 = ov21_021D26E0(v0); + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; + NARC *v1 = ov21_021D26E0(v0); param0->unk_08[0] = sub_02009A4C(v0->unk_13C[0], v1, 102, 1, 102 + 13000, NNS_G2D_VRAM_TYPE_2DSUB, param2); @@ -525,9 +524,9 @@ static void ov21_021E89F4 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E param0->unk_08[3] = sub_02009BC4(v0->unk_13C[3], v1, 101, 1, 101 + 13000, 3, param2); } -static void ov21_021E8A74 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1) +static void ov21_021E8A74(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1) { - UnkStruct_ov21_021D13FC * v0 = param1->unk_00; + UnkStruct_ov21_021D13FC *v0 = param1->unk_00; sub_0200A4E4(param0->unk_08[0]); sub_02009D68(v0->unk_13C[0], param0->unk_08[0]); @@ -535,11 +534,11 @@ static void ov21_021E8A74 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E sub_02009D68(v0->unk_13C[3], param0->unk_08[3]); } -static void ov21_021E8AA8 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2) +static void ov21_021E8AA8(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - UnkStruct_ov21_021D13FC * v2 = param1->unk_00; + UnkStruct_ov21_021D13FC *v2 = param1->unk_00; int v3; sub_020093B4(&v0, 102 + 13000, 11 + 2100, 100 + 13000, 101 + 13000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL); @@ -559,7 +558,7 @@ static void ov21_021E8AA8 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 2); } -static void ov21_021E8B34 (UnkStruct_ov21_021E8794 * param0) +static void ov21_021E8B34(UnkStruct_ov21_021E8794 *param0) { int v0; @@ -568,12 +567,12 @@ static void ov21_021E8B34 (UnkStruct_ov21_021E8794 * param0) } } -static void ov21_021E8B40 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2) +static void ov21_021E8B40(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2) { - Window * v0; + Window *v0; UnkStruct_ov21_021D4CB8 v1; - UnkStruct_02009DC8 * v2; - UnkStruct_ov21_021D13FC * v3 = param1->unk_00; + UnkStruct_02009DC8 *v2; + UnkStruct_ov21_021D13FC *v3 = param1->unk_00; int v4; u32 v5; @@ -603,7 +602,7 @@ static void ov21_021E8B40 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E ov21_021D4DA0(v0); } -static void ov21_021E8BDC (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1) +static void ov21_021E8BDC(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1) { int v0; @@ -612,10 +611,10 @@ static void ov21_021E8BDC (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E } } -static void ov21_021E8BE8 (UnkStruct_ov21_021E8584 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10) +static void ov21_021E8BE8(UnkStruct_ov21_021E8584 *param0, GraphicElementData *param1, UnkStruct_ov21_021D4CA0 *param2, int param3, int param4, int param5, int *param6, int param7, int param8, int param9, void **param10) { int v0; - NNSG2dPaletteData * v1; + NNSG2dPaletteData *v1; BOOL v2; BOOL v3 = 0; int v4; @@ -662,7 +661,7 @@ static void ov21_021E8BE8 (UnkStruct_ov21_021E8584 * param0, GraphicElementData } } -static void ov21_021E8C94 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4) +static void ov21_021E8C94(GraphicElementData *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4) { int v0; @@ -676,7 +675,7 @@ static void ov21_021E8C94 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 } } -static void ov21_021E8CBC (UnkStruct_ov21_021E8584 * param0, UnkStruct_ov21_021E8794 * param1, const UnkStruct_ov21_021E88B0 * param2, int param3) +static void ov21_021E8CBC(UnkStruct_ov21_021E8584 *param0, UnkStruct_ov21_021E8794 *param1, const UnkStruct_ov21_021E88B0 *param2, int param3) { int v0; int v1; @@ -688,27 +687,27 @@ static void ov21_021E8CBC (UnkStruct_ov21_021E8584 * param0, UnkStruct_ov21_021E } } -static void ov21_021E8CF0 (UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E8570 * param1) +static void ov21_021E8CF0(UnkStruct_ov21_021E88B0 *param0, UnkStruct_ov21_021E8570 *param1) { if (gCoreSys.heldKeys & PAD_BUTTON_A) { param0->unk_14 = 1; } } -static void ov21_021E8D04 (UnkStruct_ov21_021E8584 * param0, const UnkStruct_ov21_021E8570 * param1) +static void ov21_021E8D04(UnkStruct_ov21_021E8584 *param0, const UnkStruct_ov21_021E8570 *param1) { if (ov21_021E33BC(param1->unk_08) == 1) { ov21_021E8D28(param0, 128, 144, 228, 64); } } -static void ov21_021E8D28 (UnkStruct_ov21_021E8584 * param0, int param1, int param2, int param3, int param4) +static void ov21_021E8D28(UnkStruct_ov21_021E8584 *param0, int param1, int param2, int param3, int param4) { - UnkStruct_ov21_021D13FC * v0 = param0->unk_00; + UnkStruct_ov21_021D13FC *v0 = param0->unk_00; ov21_021D2574(v0, param1, param2, param3, param4); } -static void ov21_021E8D3C (const UnkStruct_ov21_021E8570 * param0) +static void ov21_021E8D3C(const UnkStruct_ov21_021E8570 *param0) { ov21_021DF7A0(param0->unk_0C, 1); } diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 976f7c9b7d..6c599b631a 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -1,27 +1,30 @@ +#include "overlay021/ov21_021E8D48.h" + #include #include +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "pokemon.h" -#include "overlay021/struct_ov21_021D4C0C_decl.h" - #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay021/ov21_021D1F90.h" +#include "overlay021/ov21_021D1FA4.h" +#include "overlay021/ov21_021D4C0C.h" +#include "overlay021/ov21_021DE668.h" #include "overlay021/struct_ov21_021D1FA4.h" #include "overlay021/struct_ov21_021D22F8.h" +#include "overlay021/struct_ov21_021D4C0C_decl.h" #include "overlay021/struct_ov21_021D4CA0.h" #include "overlay021/struct_ov21_021D4CB8.h" #include "overlay021/struct_ov21_021E8E0C.h" @@ -29,65 +32,60 @@ #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "pokemon.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "message.h" -#include "sys_task.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "pokemon.h" #include "unk_02098988.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay021/ov21_021D1F90.h" -#include "overlay021/ov21_021D1FA4.h" -#include "overlay021/ov21_021D4C0C.h" -#include "overlay021/ov21_021DE668.h" -#include "overlay021/ov21_021E8D48.h" typedef struct { - GraphicElementData * unk_00; - UnkStruct_02009DC8 * unk_04[4]; + GraphicElementData *unk_00; + UnkStruct_02009DC8 *unk_04[4]; } UnkStruct_ov21_021E94F8; typedef struct { - GraphicElementData * unk_00; - UnkStruct_ov21_021D4CA0 * unk_04; + GraphicElementData *unk_00; + UnkStruct_ov21_021D4CA0 *unk_04; } UnkStruct_ov21_021E95B0; typedef struct { - GraphicElementData * unk_00[2]; - UnkStruct_02009DC8 * unk_08[4]; + GraphicElementData *unk_00[2]; + UnkStruct_02009DC8 *unk_08[4]; } UnkStruct_ov21_021E968C; typedef struct { - void * unk_00[2]; - NNSG2dPaletteData * unk_08[2]; + void *unk_00[2]; + NNSG2dPaletteData *unk_08[2]; int unk_10; int unk_14[2]; int unk_1C; } UnkStruct_ov21_021E9A9C; typedef struct UnkStruct_ov21_021E8D48_t { - BGL * unk_00; - Window * unk_04; - PaletteData * unk_08; - Sprite * unk_0C; + BGL *unk_00; + Window *unk_04; + PaletteData *unk_08; + Sprite *unk_0C; UnkStruct_0200C738 unk_10; - GraphicElementManager * unk_19C; - UnkStruct_02009714 * unk_1A0[4]; - UnkStruct_ov21_021D4C0C * unk_1B0; + GraphicElementManager *unk_19C; + UnkStruct_02009714 *unk_1A0[4]; + UnkStruct_ov21_021D4C0C *unk_1B0; UnkStruct_ov21_021D22F8 unk_1B4; UnkStruct_ov21_021E94F8 unk_1E4; UnkStruct_ov21_021E95B0 unk_1F8; @@ -95,57 +93,57 @@ typedef struct UnkStruct_ov21_021E8D48_t { u32 unk_218; u32 unk_21C; u32 unk_220; - SysTask * unk_224; + SysTask *unk_224; UnkStruct_ov21_021E9A9C unk_228; BOOL unk_248; } UnkStruct_ov21_021E8D48; -static void ov21_021E9828(SysTask * param0, void * param1); -static void ov21_021E98D8(PaletteData * param0, Sprite * param1); -static void ov21_021E98F8(PaletteData * param0, Sprite * param1, int param2, int param3, int param4, int param5, int param6); -static BOOL ov21_021E9948(PaletteData * param0, Sprite * param1); -static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 * param0, const UnkStruct_ov21_021E8E0C * param1); -static void ov21_021E900C(UnkStruct_ov21_021E8D48 * param0); -static void ov21_021E90B0(BGL * param0, int param1); -static void ov21_021E9194(BGL * param0); -static Window * ov21_021E91B0(BGL * param0, int param1); -static void ov21_021E91F0(Window * param0); -static void ov21_021E9208(UnkStruct_02009714 ** param0, int param1); -static void ov21_021E9228(UnkStruct_02009714 ** param0); -static void ov21_021E9240(UnkStruct_ov21_021D22F8 * param0, UnkStruct_ov21_021D4C0C * param1, int param2, int param3, int param4); -static void ov21_021E92B0(UnkStruct_ov21_021D22F8 * param0); -static Sprite * ov21_021E99E0(UnkStruct_02007768 * param0, Pokemon * param1, int param2, int param3, int param4); -static void ov21_021E92C4(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); -static void ov21_021E9344(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, NARC * param3, int param4, int param5, int param6, int param7, int param8, int param9); -static void ov21_021E93C4(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1); -static void ov21_021E93F8(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, UnkStruct_ov19_021DA864 * param2, int param3); -static void ov21_021E9458(UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714 ** param1, int param2, int param3); -static void ov21_021E94A4(UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714 ** param1); -static void ov21_021E94B0(UnkStruct_ov21_021E94F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3); -static void ov21_021E94F8(UnkStruct_ov21_021E94F8 * param0); -static void ov21_021E9504(UnkStruct_ov21_021E95B0 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4); -static void ov21_021E9554(UnkStruct_ov21_021E95B0 * param0); -static void ov21_021E9560(UnkStruct_ov21_021E95B0 * param0, UnkStruct_ov21_021D4C0C * param1, int param2, int param3, UnkStruct_02009DC8 * param4); -static void ov21_021E95B0(UnkStruct_ov21_021E95B0 * param0); -static void ov21_021E95BC(UnkStruct_ov21_021E968C * param0, UnkStruct_02009714 ** param1, int param2, int param3, NARC * param4); -static void ov21_021E95EC(UnkStruct_ov21_021E968C * param0, UnkStruct_02009714 ** param1); -static void ov21_021E95F8(UnkStruct_ov21_021E968C * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4); -static void ov21_021E968C(UnkStruct_ov21_021E968C * param0); -static void ov21_021E96A8(BGL * param0, int param1, NARC * param2); -static void ov21_021E97C4(BGL * param0, int param1, NARC * param2); -static void ov21_021E9968(Window * param0, int param1, int param2); -static void ov21_021E998C(Window * param0, int param1); +static void ov21_021E9828(SysTask *param0, void *param1); +static void ov21_021E98D8(PaletteData *param0, Sprite *param1); +static void ov21_021E98F8(PaletteData *param0, Sprite *param1, int param2, int param3, int param4, int param5, int param6); +static BOOL ov21_021E9948(PaletteData *param0, Sprite *param1); +static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 *param0, const UnkStruct_ov21_021E8E0C *param1); +static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0); +static void ov21_021E90B0(BGL *param0, int param1); +static void ov21_021E9194(BGL *param0); +static Window *ov21_021E91B0(BGL *param0, int param1); +static void ov21_021E91F0(Window *param0); +static void ov21_021E9208(UnkStruct_02009714 **param0, int param1); +static void ov21_021E9228(UnkStruct_02009714 **param0); +static void ov21_021E9240(UnkStruct_ov21_021D22F8 *param0, UnkStruct_ov21_021D4C0C *param1, int param2, int param3, int param4); +static void ov21_021E92B0(UnkStruct_ov21_021D22F8 *param0); +static Sprite *ov21_021E99E0(UnkStruct_02007768 *param0, Pokemon *param1, int param2, int param3, int param4); +static void ov21_021E92C4(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); +static void ov21_021E9344(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1, int param2, NARC *param3, int param4, int param5, int param6, int param7, int param8, int param9); +static void ov21_021E93C4(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1); +static void ov21_021E93F8(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1, UnkStruct_ov19_021DA864 *param2, int param3); +static void ov21_021E9458(UnkStruct_ov21_021E94F8 *param0, UnkStruct_02009714 **param1, int param2, int param3); +static void ov21_021E94A4(UnkStruct_ov21_021E94F8 *param0, UnkStruct_02009714 **param1); +static void ov21_021E94B0(UnkStruct_ov21_021E94F8 *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3); +static void ov21_021E94F8(UnkStruct_ov21_021E94F8 *param0); +static void ov21_021E9504(UnkStruct_ov21_021E95B0 *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3, UnkStruct_02009DC8 **param4); +static void ov21_021E9554(UnkStruct_ov21_021E95B0 *param0); +static void ov21_021E9560(UnkStruct_ov21_021E95B0 *param0, UnkStruct_ov21_021D4C0C *param1, int param2, int param3, UnkStruct_02009DC8 *param4); +static void ov21_021E95B0(UnkStruct_ov21_021E95B0 *param0); +static void ov21_021E95BC(UnkStruct_ov21_021E968C *param0, UnkStruct_02009714 **param1, int param2, int param3, NARC *param4); +static void ov21_021E95EC(UnkStruct_ov21_021E968C *param0, UnkStruct_02009714 **param1); +static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3, int param4); +static void ov21_021E968C(UnkStruct_ov21_021E968C *param0); +static void ov21_021E96A8(BGL *param0, int param1, NARC *param2); +static void ov21_021E97C4(BGL *param0, int param1, NARC *param2); +static void ov21_021E9968(Window *param0, int param1, int param2); +static void ov21_021E998C(Window *param0, int param1); static void ov21_021E9A0C(int param0); static void ov21_021E9A38(void); -static void ov21_021E9A40(UnkStruct_ov21_021E9A9C * param0, int param1, int param2, NARC * param3); -static void ov21_021E9A9C(UnkStruct_ov21_021E9A9C * param0); -static void ov21_021E9AC8(UnkStruct_ov21_021E9A9C * param0); -static void ov21_021E9AE8(UnkStruct_ov21_021E9A9C * param0, int param1); -static void ov21_021E9B08(UnkStruct_ov21_021E9A9C * param0, int param1); +static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, int param1, int param2, NARC *param3); +static void ov21_021E9A9C(UnkStruct_ov21_021E9A9C *param0); +static void ov21_021E9AC8(UnkStruct_ov21_021E9A9C *param0); +static void ov21_021E9AE8(UnkStruct_ov21_021E9A9C *param0, int param1); +static void ov21_021E9B08(UnkStruct_ov21_021E9A9C *param0, int param1); -UnkStruct_ov21_021E8D48 * ov21_021E8D48 (const UnkStruct_ov21_021E8E0C * param0) +UnkStruct_ov21_021E8D48 *ov21_021E8D48(const UnkStruct_ov21_021E8E0C *param0) { - UnkStruct_ov21_021E8D48 * v0 = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_ov21_021E8D48)); + UnkStruct_ov21_021E8D48 *v0 = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_ov21_021E8D48)); memset(v0, 0, sizeof(UnkStruct_ov21_021E8D48)); @@ -172,7 +170,7 @@ UnkStruct_ov21_021E8D48 * ov21_021E8D48 (const UnkStruct_ov21_021E8E0C * param0) return v0; } -void ov21_021E8DD0 (UnkStruct_ov21_021E8D48 * param0) +void ov21_021E8DD0(UnkStruct_ov21_021E8D48 *param0) { ov21_021E900C(param0); @@ -180,7 +178,7 @@ void ov21_021E8DD0 (UnkStruct_ov21_021E8D48 * param0) Heap_FreeToHeap(param0); } -BOOL ov21_021E8DEC (const UnkStruct_ov21_021E8D48 * param0) +BOOL ov21_021E8DEC(const UnkStruct_ov21_021E8D48 *param0) { if (param0->unk_21C == 4) { return 1; @@ -189,20 +187,20 @@ BOOL ov21_021E8DEC (const UnkStruct_ov21_021E8D48 * param0) return 0; } -Sprite * ov21_021E8E00 (UnkStruct_ov21_021E8D48 * param0) +Sprite *ov21_021E8E00(UnkStruct_ov21_021E8D48 *param0) { return param0->unk_0C; } -void ov21_021E8E04 (UnkStruct_ov21_021E8D48 * param0, BOOL param1) +void ov21_021E8E04(UnkStruct_ov21_021E8D48 *param0, BOOL param1) { param0->unk_248 = param1; } -static void ov21_021E8E0C (UnkStruct_ov21_021E8D48 * param0, const UnkStruct_ov21_021E8E0C * param1) +static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 *param0, const UnkStruct_ov21_021E8E0C *param1) { UnkStruct_ov21_021D1FA4 v0; - NARC * v1 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1->unk_0C); + NARC *v1 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1->unk_0C); int v2; param0->unk_220 = Pokemon_GetValue(param1->unk_10, MON_DATA_SPECIES, NULL); @@ -263,7 +261,7 @@ static void ov21_021E8E0C (UnkStruct_ov21_021E8D48 * param0, const UnkStruct_ov2 NARC_dtor(v1); } -static void ov21_021E900C (UnkStruct_ov21_021E8D48 * param0) +static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0) { ov21_021E9AC8(¶m0->unk_228); ov21_021E968C(¶m0->unk_200); @@ -285,7 +283,7 @@ static void ov21_021E900C (UnkStruct_ov21_021E8D48 * param0) ov21_021E9A38(); } -static void ov21_021E90B0 (BGL * param0, int param1) +static void ov21_021E90B0(BGL *param0, int param1) { { UnkStruct_ov97_0222DB78 v0 = { @@ -361,16 +359,16 @@ static void ov21_021E90B0 (BGL * param0, int param1) } } -static void ov21_021E9194 (BGL * param0) +static void ov21_021E9194(BGL *param0) { sub_02019044(param0, 1); sub_02019044(param0, 2); sub_02019044(param0, 3); } -static Window * ov21_021E91B0 (BGL * param0, int param1) +static Window *ov21_021E91B0(BGL *param0, int param1) { - Window * v0; + Window *v0; v0 = sub_0201A778(param1, 1); @@ -381,14 +379,14 @@ static Window * ov21_021E91B0 (BGL * param0, int param1) return v0; } -static void ov21_021E91F0 (Window * param0) +static void ov21_021E91F0(Window *param0) { sub_0201ACF4(param0); BGL_DeleteWindow(param0); sub_0201A928(param0, 1); } -static void ov21_021E9208 (UnkStruct_02009714 ** param0, int param1) +static void ov21_021E9208(UnkStruct_02009714 **param0, int param1) { int v0; @@ -397,7 +395,7 @@ static void ov21_021E9208 (UnkStruct_02009714 ** param0, int param1) } } -static void ov21_021E9228 (UnkStruct_02009714 ** param0) +static void ov21_021E9228(UnkStruct_02009714 **param0) { int v0; @@ -407,11 +405,11 @@ static void ov21_021E9228 (UnkStruct_02009714 ** param0) } } -static void ov21_021E9240 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_ov21_021D4C0C * param1, int param2, int param3, int param4) +static void ov21_021E9240(UnkStruct_ov21_021D22F8 *param0, UnkStruct_ov21_021D4C0C *param1, int param2, int param3, int param4) { UnkStruct_ov21_021D4CB8 v0; - Window * v1; - UnkStruct_02009DC8 * v2; + Window *v1; + UnkStruct_02009DC8 *v2; v2 = param0->unk_0C[1]; @@ -437,7 +435,7 @@ static void ov21_021E9240 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_ov21_021D ov21_021D4DA0(v1); } -static void ov21_021E92B0 (UnkStruct_ov21_021D22F8 * param0) +static void ov21_021E92B0(UnkStruct_ov21_021D22F8 *param0) { if (param0->unk_08) { ov21_021D4D1C(param0->unk_08); @@ -445,7 +443,7 @@ static void ov21_021E92B0 (UnkStruct_ov21_021D22F8 * param0) } } -static void ov21_021E92C4 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) +static void ov21_021E92C4(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) { param0[0] = sub_0200985C(param1[0], param3, param4, 1, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -461,7 +459,7 @@ static void ov21_021E92C4 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** p param0[3] = sub_02009918(param1[3], param3, param7, 1, param9, 3, param2); } -static void ov21_021E9344 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, NARC * param3, int param4, int param5, int param6, int param7, int param8, int param9) +static void ov21_021E9344(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1, int param2, NARC *param3, int param4, int param5, int param6, int param7, int param8, int param9) { param0[0] = sub_02009A4C(param1[0], param3, param4, 1, param9, NNS_G2D_VRAM_TYPE_2DMAIN, param2); @@ -477,7 +475,7 @@ static void ov21_021E9344 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** p param0[3] = sub_02009BC4(param1[3], param3, param7, 1, param9, 3, param2); } -static void ov21_021E93C4 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1) +static void ov21_021E93C4(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1) { sub_0200A4E4(param0[0]); sub_0200A6DC(param0[1]); @@ -488,12 +486,12 @@ static void ov21_021E93C4 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** p sub_02009D68(param1[3], param0[3]); } -static void ov21_021E93F8 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, UnkStruct_ov19_021DA864 * param2, int param3) +static void ov21_021E93F8(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1, UnkStruct_ov19_021DA864 *param2, int param3) { sub_020093B4(param2, sub_02009E08(param0[0]), sub_02009E08(param0[1]), sub_02009E08(param0[2]), sub_02009E08(param0[3]), 0xffffffff, 0xffffffff, 0, param3, param1[0], param1[1], param1[2], param1[3], NULL, NULL); } -static void ov21_021E9458 (UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714 ** param1, int param2, int param3) +static void ov21_021E9458(UnkStruct_ov21_021E94F8 *param0, UnkStruct_02009714 **param1, int param2, int param3) { int v0 = ov21_021D1F90(); int v1 = ov21_021D1F94(param2); @@ -504,12 +502,12 @@ static void ov21_021E9458 (UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714 ov21_021E92C4(param0->unk_04, param1, param3, v0, v1, v2, v3, v4, 1, 4000); } -static void ov21_021E94A4 (UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714 ** param1) +static void ov21_021E94A4(UnkStruct_ov21_021E94F8 *param0, UnkStruct_02009714 **param1) { ov21_021E93C4(param0->unk_04, param1); } -static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3) +static void ov21_021E94B0(UnkStruct_ov21_021E94F8 *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3) { UnkStruct_ov83_0223D9A8 v0; UnkStruct_ov19_021DA864 v1; @@ -528,12 +526,12 @@ static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, GraphicElementManag GF_ASSERT(param0->unk_00); } -static void ov21_021E94F8 (UnkStruct_ov21_021E94F8 * param0) +static void ov21_021E94F8(UnkStruct_ov21_021E94F8 *param0) { sub_02021BD4(param0->unk_00); } -static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4) +static void ov21_021E9504(UnkStruct_ov21_021E95B0 *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3, UnkStruct_02009DC8 **param4) { UnkStruct_ov83_0223D9A8 v0; UnkStruct_ov19_021DA864 v1; @@ -554,14 +552,14 @@ static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, GraphicElementManag SpriteActor_SetSpriteAnimActive(param0->unk_00, 0x11); } -static void ov21_021E9554 (UnkStruct_ov21_021E95B0 * param0) +static void ov21_021E9554(UnkStruct_ov21_021E95B0 *param0) { sub_02021BD4(param0->unk_00); } -static void ov21_021E9560 (UnkStruct_ov21_021E95B0 * param0, UnkStruct_ov21_021D4C0C * param1, int param2, int param3, UnkStruct_02009DC8 * param4) +static void ov21_021E9560(UnkStruct_ov21_021E95B0 *param0, UnkStruct_ov21_021D4C0C *param1, int param2, int param3, UnkStruct_02009DC8 *param4) { - Window * v0; + Window *v0; UnkStruct_ov21_021D4CB8 v1; v0 = ov21_021DF30C(param1, param3, param2); @@ -582,22 +580,22 @@ static void ov21_021E9560 (UnkStruct_ov21_021E95B0 * param0, UnkStruct_ov21_021D ov21_021D4DA0(v0); } -static void ov21_021E95B0 (UnkStruct_ov21_021E95B0 * param0) +static void ov21_021E95B0(UnkStruct_ov21_021E95B0 *param0) { ov21_021D4D1C(param0->unk_04); } -static void ov21_021E95BC (UnkStruct_ov21_021E968C * param0, UnkStruct_02009714 ** param1, int param2, int param3, NARC * param4) +static void ov21_021E95BC(UnkStruct_ov21_021E968C *param0, UnkStruct_02009714 **param1, int param2, int param3, NARC *param4) { ov21_021E9344(param0->unk_08, param1, param3, param4, 90, 13, 88, 89, 5, 17000); } -static void ov21_021E95EC (UnkStruct_ov21_021E968C * param0, UnkStruct_02009714 ** param1) +static void ov21_021E95EC(UnkStruct_ov21_021E968C *param0, UnkStruct_02009714 **param1) { ov21_021E93C4(param0->unk_08, param1); } -static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4) +static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3, int param4) { UnkStruct_ov83_0223D9A8 v0; UnkStruct_ov19_021DA864 v1; @@ -632,7 +630,7 @@ static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManag } } -static void ov21_021E968C (UnkStruct_ov21_021E968C * param0) +static void ov21_021E968C(UnkStruct_ov21_021E968C *param0) { if (param0->unk_00[0]) { sub_02021BD4(param0->unk_00[0]); @@ -643,10 +641,10 @@ static void ov21_021E968C (UnkStruct_ov21_021E968C * param0) } } -static void ov21_021E96A8 (BGL * param0, int param1, NARC * param2) +static void ov21_021E96A8(BGL *param0, int param1, NARC *param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; sub_02007130(param2, 6, 0, 0, 0, param1); sub_020070E8(param2, 33, param0, 3, 0, 0, 1, param1); @@ -673,10 +671,10 @@ static void ov21_021E96A8 (BGL * param0, int param1, NARC * param2) sub_0201C3C0(param0, 3); } -static void ov21_021E97C4 (BGL * param0, int param1, NARC * param2) +static void ov21_021E97C4(BGL *param0, int param1, NARC *param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; sub_020070E8(param2, 33, param0, 2, 0, 0, 1, param1); @@ -687,9 +685,9 @@ static void ov21_021E97C4 (BGL * param0, int param1, NARC * param2) sub_0201C3C0(param0, 2); } -static void ov21_021E9828 (SysTask * param0, void * param1) +static void ov21_021E9828(SysTask *param0, void *param1) { - UnkStruct_ov21_021E8D48 * v0 = param1; + UnkStruct_ov21_021E8D48 *v0 = param1; BOOL v1; switch (v0->unk_21C) { @@ -725,20 +723,20 @@ static void ov21_021E9828 (SysTask * param0, void * param1) sub_020219F8(v0->unk_19C); } -static void ov21_021E98D8 (PaletteData * param0, Sprite * param1) +static void ov21_021E98D8(PaletteData *param0, Sprite *param1) { sub_02003070(param0, 0, 0, 32 * 0x10); sub_02003070(param0, 2, 0, (((16 - 2) * 16) * sizeof(u16))); } -static void ov21_021E98F8 (PaletteData * param0, Sprite * param1, int param2, int param3, int param4, int param5, int param6) +static void ov21_021E98F8(PaletteData *param0, Sprite *param1, int param2, int param3, int param4, int param5, int param6) { sub_020086FC(param1, param2, param4, param5, param6); sub_02003178(param0, 0x1 | 0x4, 0xffff, param5, param3, param4, param6); sub_02003858(param0, 0); } -static BOOL ov21_021E9948 (PaletteData * param0, Sprite * param1) +static BOOL ov21_021E9948(PaletteData *param0, Sprite *param1) { BOOL v0[2]; @@ -752,16 +750,16 @@ static BOOL ov21_021E9948 (PaletteData * param0, Sprite * param1) return 0; } -static void ov21_021E9968 (Window * param0, int param1, int param2) +static void ov21_021E9968(Window *param0, int param1, int param2) { ov21_021DEB8C(param0, param2, param1, 0, ((u32)(((2 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0)))); ov21_021E998C(param0, param1); } -static void ov21_021E998C (Window * param0, int param1) +static void ov21_021E998C(Window *param0, int param1) { - Strbuf* v0 = Strbuf_Init(64, param1); - MessageLoader * v1 = MessageLoader_Init(0, 26, 697, param1); + Strbuf *v0 = Strbuf_Init(64, param1); + MessageLoader *v1 = MessageLoader_Init(0, 26, 697, param1); MessageLoader_GetStrbuf(v1, 110, v0); sub_0201D78C(param0, 0, v0, 32, 0, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -770,7 +768,7 @@ static void ov21_021E998C (Window * param0, int param1) MessageLoader_Free(v1); } -static Sprite * ov21_021E99E0 (UnkStruct_02007768 * param0, Pokemon * param1, int param2, int param3, int param4) +static Sprite *ov21_021E99E0(UnkStruct_02007768 *param0, Pokemon *param1, int param2, int param3, int param4) { ArchivedSprite v0; @@ -778,7 +776,7 @@ static Sprite * ov21_021E99E0 (UnkStruct_02007768 * param0, Pokemon * param1, in return sub_02007C34(param0, &v0, param2, param3, 0, 0, NULL, NULL); } -static void ov21_021E9A0C (int param0) +static void ov21_021E9A0C(int param0) { UnkStruct_ov22_022559F8 v0 = { 32, (1024 * 0x40), (512 * 0x20), 0 @@ -788,12 +786,12 @@ static void ov21_021E9A0C (int param0) sub_0201E88C(&v0, GX_OBJVRAMMODE_CHAR_1D_128K, GX_OBJVRAMMODE_CHAR_1D_32K); } -static void ov21_021E9A38 (void) +static void ov21_021E9A38(void) { sub_0201E958(); } -static void ov21_021E9A40 (UnkStruct_ov21_021E9A9C * param0, int param1, int param2, NARC * param3) +static void ov21_021E9A40(UnkStruct_ov21_021E9A9C *param0, int param1, int param2, NARC *param3) { int v0; @@ -814,7 +812,7 @@ static void ov21_021E9A40 (UnkStruct_ov21_021E9A9C * param0, int param1, int par ov21_021E9AE8(param0, param0->unk_1C); } -static void ov21_021E9A9C (UnkStruct_ov21_021E9A9C * param0) +static void ov21_021E9A9C(UnkStruct_ov21_021E9A9C *param0) { if (param0->unk_14[param0->unk_1C] <= param0->unk_10) { param0->unk_1C++; @@ -830,7 +828,7 @@ static void ov21_021E9A9C (UnkStruct_ov21_021E9A9C * param0) } } -static void ov21_021E9AC8 (UnkStruct_ov21_021E9A9C * param0) +static void ov21_021E9AC8(UnkStruct_ov21_021E9A9C *param0) { int v0; @@ -841,13 +839,13 @@ static void ov21_021E9AC8 (UnkStruct_ov21_021E9A9C * param0) memset(param0, 0, sizeof(UnkStruct_ov21_021E9A9C)); } -static void ov21_021E9AE8 (UnkStruct_ov21_021E9A9C * param0, int param1) +static void ov21_021E9AE8(UnkStruct_ov21_021E9A9C *param0, int param1) { DC_FlushRange((void *)param0->unk_08[param1]->pRawData, 1 * 32); GX_LoadBGPltt(param0->unk_08[param1]->pRawData, 0 * 32, 1 * 32); } -static void ov21_021E9B08 (UnkStruct_ov21_021E9A9C * param0, int param1) +static void ov21_021E9B08(UnkStruct_ov21_021E9A9C *param0, int param1) { sub_0201DC68(NNS_GFD_DST_2D_BG_PLTT_MAIN, 0 * 32, param0->unk_08[param1]->pRawData, 1 * 32); } diff --git a/src/overlay022/ov22_02254DE0.c b/src/overlay022/ov22_02254DE0.c index 592b5af534..bdad15f81e 100644 --- a/src/overlay022/ov22_02254DE0.c +++ b/src/overlay022/ov22_02254DE0.c @@ -1,28 +1,28 @@ +#include "overlay022/ov22_02254DE0.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02015214_decl.h" -#include "touch_screen.h" #include "overlay021/struct_ov21_021E7F40.h" +#include "overlay022/ov22_02255094.h" #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_0225500C.h" #include "overlay022/struct_ov22_02255040.h" -#include "unk_02015064.h" +#include "core_sys.h" #include "heap.h" -#include "overlay022/ov22_02254DE0.h" -#include "overlay022/ov22_02255094.h" +#include "touch_screen.h" +#include "unk_02015064.h" -static UnkStruct_ov22_02255040 * ov22_02254FE0(UnkStruct_ov22_02254DE0 * param0); -static UnkStruct_02015214 * ov22_0225500C(UnkStruct_ov22_0225500C * param0); -static void ov22_02255040(UnkStruct_ov22_02255040 * param0, TouchScreenHitTable *hitTable); +static UnkStruct_ov22_02255040 *ov22_02254FE0(UnkStruct_ov22_02254DE0 *param0); +static UnkStruct_02015214 *ov22_0225500C(UnkStruct_ov22_0225500C *param0); +static void ov22_02255040(UnkStruct_ov22_02255040 *param0, TouchScreenHitTable *hitTable); -UnkStruct_ov22_02254DE0 * ov22_02254DE0 (int param0, int param1) +UnkStruct_ov22_02254DE0 *ov22_02254DE0(int param0, int param1) { - UnkStruct_ov22_02254DE0 * v0; + UnkStruct_ov22_02254DE0 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov22_02254DE0)); v0->unk_00 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov22_02255040) * param0); @@ -32,16 +32,16 @@ UnkStruct_ov22_02254DE0 * ov22_02254DE0 (int param0, int param1) return v0; } -void ov22_02254E0C (UnkStruct_ov22_02254DE0 * param0) +void ov22_02254E0C(UnkStruct_ov22_02254DE0 *param0) { Heap_FreeToHeap(param0->unk_00); Heap_FreeToHeap(param0); param0 = NULL; } -UnkStruct_ov22_02255040 * ov22_02254E20 (UnkStruct_ov22_0225500C * param0) +UnkStruct_ov22_02255040 *ov22_02254E20(UnkStruct_ov22_0225500C *param0) { - UnkStruct_ov22_02255040 * v0; + UnkStruct_ov22_02255040 *v0; v0 = ov22_02254FE0(param0->unk_00); GF_ASSERT(v0); @@ -52,7 +52,7 @@ UnkStruct_ov22_02255040 * ov22_02254E20 (UnkStruct_ov22_0225500C * param0) return v0; } -BOOL ov22_02254E44 (UnkStruct_ov22_02255040 * param0) +BOOL ov22_02254E44(UnkStruct_ov22_02255040 *param0) { TouchScreenHitTable v0; @@ -60,7 +60,7 @@ BOOL ov22_02254E44 (UnkStruct_ov22_02255040 * param0) return TouchScreen_LocationHeld(&v0); } -BOOL ov22_02254E54 (UnkStruct_ov22_02255040 * param0, int * param1, int * param2, NNSG2dCharacterData * param3) +BOOL ov22_02254E54(UnkStruct_ov22_02255040 *param0, int *param1, int *param2, NNSG2dCharacterData *param3) { BOOL v0; int v1, v2; @@ -94,7 +94,7 @@ BOOL ov22_02254E54 (UnkStruct_ov22_02255040 * param0, int * param1, int * param2 return 0; } -BOOL ov22_02254EDC (UnkStruct_ov22_02255040 * param0, int param1, int param2) +BOOL ov22_02254EDC(UnkStruct_ov22_02255040 *param0, int param1, int param2) { TouchScreenHitTable v0; @@ -102,12 +102,12 @@ BOOL ov22_02254EDC (UnkStruct_ov22_02255040 * param0, int param1, int param2) return sub_02022830(&v0, param1, param2); } -void ov22_02254EF4 (UnkStruct_ov22_02255040 * param0, s16 param1, s16 param2) +void ov22_02254EF4(UnkStruct_ov22_02255040 *param0, s16 param1, s16 param2) { sub_02015254(param0->unk_04, param1, param2); } -void ov22_02254F00 (UnkStruct_ov22_02255040 * param0, int * param1, int * param2) +void ov22_02254F00(UnkStruct_ov22_02255040 *param0, int *param1, int *param2) { NNSG2dSVec2 v0; @@ -116,7 +116,7 @@ void ov22_02254F00 (UnkStruct_ov22_02255040 * param0, int * param1, int * param2 *param2 = v0.y; } -void ov22_02254F30 (UnkStruct_ov22_02255040 * param0, int * param1, int * param2) +void ov22_02254F30(UnkStruct_ov22_02255040 *param0, int *param1, int *param2) { NNSG2dSVec2 v0; @@ -125,22 +125,22 @@ void ov22_02254F30 (UnkStruct_ov22_02255040 * param0, int * param1, int * param2 *param2 = v0.y; } -void ov22_02254F60 (UnkStruct_ov22_02255040 * param0, BOOL param1) +void ov22_02254F60(UnkStruct_ov22_02255040 *param0, BOOL param1) { sub_02015240(param0->unk_04, param1); } -void ov22_02254F6C (UnkStruct_ov22_02255040 * param0, int param1) +void ov22_02254F6C(UnkStruct_ov22_02255040 *param0, int param1) { sub_0201528C(param0->unk_04, param1); } -int ov22_02254F78 (UnkStruct_ov22_02255040 * param0) +int ov22_02254F78(UnkStruct_ov22_02255040 *param0) { return sub_02015290(param0->unk_04); } -void ov22_02254F84 (UnkStruct_ov22_02255040 * param0, int * param1, int * param2) +void ov22_02254F84(UnkStruct_ov22_02255040 *param0, int *param1, int *param2) { int v0, v1; @@ -171,7 +171,7 @@ void ov22_02254F84 (UnkStruct_ov22_02255040 * param0, int * param1, int * param2 } } -static UnkStruct_ov22_02255040 * ov22_02254FE0 (UnkStruct_ov22_02254DE0 * param0) +static UnkStruct_ov22_02255040 *ov22_02254FE0(UnkStruct_ov22_02254DE0 *param0) { int v0; @@ -184,7 +184,7 @@ static UnkStruct_ov22_02255040 * ov22_02254FE0 (UnkStruct_ov22_02254DE0 * param0 return NULL; } -static UnkStruct_02015214 * ov22_0225500C (UnkStruct_ov22_0225500C * param0) +static UnkStruct_02015214 *ov22_0225500C(UnkStruct_ov22_0225500C *param0) { UnkStruct_ov21_021E7F40 v0; @@ -201,7 +201,7 @@ static UnkStruct_02015214 * ov22_0225500C (UnkStruct_ov22_0225500C * param0) return sub_02015214(&v0); } -static void ov22_02255040 (UnkStruct_ov22_02255040 * param0, TouchScreenHitTable *hitTable) +static void ov22_02255040(UnkStruct_ov22_02255040 *param0, TouchScreenHitTable *hitTable) { NNSG2dSVec2 v0 = sub_0201525C(param0->unk_04); NNSG2dSVec2 v1 = sub_02015280(param0->unk_04); diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c index 91354aaec8..58b9bba1de 100644 --- a/src/overlay022/ov22_02255094.c +++ b/src/overlay022/ov22_02255094.c @@ -1,16 +1,16 @@ +#include "overlay022/ov22_02255094.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" - #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022550D4.h" #include "overlay022/struct_ov22_022557A0.h" @@ -22,6 +22,9 @@ #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" @@ -30,43 +33,40 @@ #include "unk_0200A328.h" #include "unk_0200A784.h" #include "unk_02015064.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_0202298C.h" #include "unk_0202419C.h" -#include "overlay022/ov22_02255094.h" static void ov22_02255634(void); static void ov22_02255654(void); static void ov22_022556DC(void); static void ov22_0225572C(void); static void ov22_02255738(void); -static void ov22_02255748(UnkStruct_ov22_0225A0E4 * param0, const UnkStruct_ov22_022550D4 * param1); -static void ov22_02255784(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_02255794(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_02255C24(UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3); -static void ov22_02255C90(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_02255BF4(UnkStruct_ov22_0225A0E4 * param0, int param1); -static void ov22_02255C14(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_022559F8(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_02255A98(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_02255AC0(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_022559B4(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_022559E0(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_022557A0(UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_022557A0 * param1, int param2); -static void ov22_02255800(UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255800 * param1, int param2); -static void ov22_02255860(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_02255984(UnkStruct_ov22_0225A0E4 * param0); -static void ov22_02255CB8(UnkStruct_ov22_02255CB8 * param0, int param1, int param2, int param3); -static void ov22_02255D0C(UnkStruct_ov22_02255CB8 * param0); -static void ov22_02255ACC(UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1); -static void ov22_02255B50(UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1); - -void ov22_02255094 (void) +static void ov22_02255748(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1); +static void ov22_02255784(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_02255794(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, int param3); +static void ov22_02255C90(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_02255BF4(UnkStruct_ov22_0225A0E4 *param0, int param1); +static void ov22_02255C14(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_022559F8(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_02255A98(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_02255AC0(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_022559B4(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_022559E0(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_022557A0(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_022557A0 *param1, int param2); +static void ov22_02255800(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255800 *param1, int param2); +static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_02255984(UnkStruct_ov22_0225A0E4 *param0); +static void ov22_02255CB8(UnkStruct_ov22_02255CB8 *param0, int param1, int param2, int param3); +static void ov22_02255D0C(UnkStruct_ov22_02255CB8 *param0); +static void ov22_02255ACC(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1); +static void ov22_02255B50(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1); + +void ov22_02255094(void) { ov22_02255634(); ov22_02255654(); @@ -77,7 +77,7 @@ void ov22_02255094 (void) GXLayers_SwapDisplay(); } -void ov22_022550B4 (void) +void ov22_022550B4(void) { gCoreSys.unk_65 = 0; @@ -88,7 +88,7 @@ void ov22_022550B4 (void) GX_ResetBankForTex(); } -void ov22_022550D4 (UnkStruct_ov22_0225A0E4 * param0) +void ov22_022550D4(UnkStruct_ov22_0225A0E4 *param0) { UnkStruct_ov22_022550D4 v0 = { 718, 118, 19, 14 @@ -107,7 +107,7 @@ void ov22_022550D4 (UnkStruct_ov22_0225A0E4 * param0) ov22_02255860(param0); } -void ov22_02255134 (UnkStruct_ov22_0225A0E4 * param0) +void ov22_02255134(UnkStruct_ov22_0225A0E4 *param0) { ov22_02255C14(param0); ov22_02255784(param0); @@ -126,7 +126,7 @@ void ov22_02255134 (UnkStruct_ov22_0225A0E4 * param0) param0->unk_10 = NULL; } -void ov22_02255180 (UnkStruct_ov22_0225A0E4 * param0) +void ov22_02255180(UnkStruct_ov22_0225A0E4 *param0) { sub_020241B4(); @@ -144,19 +144,19 @@ void ov22_02255180 (UnkStruct_ov22_0225A0E4 * param0) ov22_02255AC0(param0); } -void ov22_022551B4 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1) +void ov22_022551B4(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1) { ov22_022557A0(param0, param1->unk_00, param1->unk_04); ov22_02255800(param0, param1->unk_08, param1->unk_0C); } -void ov22_022551D0 (UnkStruct_ov22_0225A0E4 * param0) +void ov22_022551D0(UnkStruct_ov22_0225A0E4 *param0) { sub_0201517C(param0->unk_00); sub_020151EC(param0->unk_00); } -GraphicElementData * ov22_022551E4 (UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5) +GraphicElementData *ov22_022551E4(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, int param3, int param4, int param5) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; @@ -175,77 +175,77 @@ GraphicElementData * ov22_022551E4 (UnkStruct_ov22_0225A0E4 * param0, int param1 return sub_02021B90(&v1); } -void ov22_02255248 (UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5) +void ov22_02255248(UnkStruct_ov22_0225A0E4 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009A4C(param0->unk_48[0], param1, param2, param3, param5, param4, 14); sub_0200A3DC(v0); } -void ov22_02255268 (UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6) +void ov22_02255268(UnkStruct_ov22_0225A0E4 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009B04(param0->unk_48[1], param1, param2, param3, param6, param4, param5, 14); sub_0200A640(v0); } -void ov22_0225528C (UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4) +void ov22_0225528C(UnkStruct_ov22_0225A0E4 *param0, NARC *param1, int param2, BOOL param3, int param4) { sub_02009BC4(param0->unk_48[2], param1, param2, param3, param4, 2, 14); } -void ov22_022552A8 (UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4) +void ov22_022552A8(UnkStruct_ov22_0225A0E4 *param0, NARC *param1, int param2, BOOL param3, int param4) { sub_02009BC4(param0->unk_48[3], param1, param2, param3, param4, 3, 14); } -void ov22_022552C4 (UnkStruct_ov22_0225A0E4 * param0, int param1) +void ov22_022552C4(UnkStruct_ov22_0225A0E4 *param0, int param1) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009DC8(param0->unk_48[0], param1); sub_02009D68(param0->unk_48[0], v0); } -void ov22_022552D8 (UnkStruct_ov22_0225A0E4 * param0, int param1) +void ov22_022552D8(UnkStruct_ov22_0225A0E4 *param0, int param1) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009DC8(param0->unk_48[1], param1); sub_02009D68(param0->unk_48[1], v0); } -void ov22_022552EC (UnkStruct_ov22_0225A0E4 * param0, int param1) +void ov22_022552EC(UnkStruct_ov22_0225A0E4 *param0, int param1) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009DC8(param0->unk_48[2], param1); sub_02009D68(param0->unk_48[2], v0); } -void ov22_02255300 (UnkStruct_ov22_0225A0E4 * param0, int param1) +void ov22_02255300(UnkStruct_ov22_0225A0E4 *param0, int param1) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009DC8(param0->unk_48[3], param1); sub_02009D68(param0->unk_48[3], v0); } -void ov22_02255314 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1) +void ov22_02255314(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1) { ov22_02255CB8(param1, (100 + 18), (1 + 18), 14); ov22_02255ACC(param0, param1); ov22_02255B50(param0, param1); } -void ov22_02255338 (UnkStruct_ov22_02255CB8 * param0) +void ov22_02255338(UnkStruct_ov22_02255CB8 *param0) { ov22_02255D0C(param0); } -NNSG2dCharacterData * ov22_02255340 (UnkStruct_ov22_0225A0E4 * param0, void * param1, int param2) +NNSG2dCharacterData *ov22_02255340(UnkStruct_ov22_0225A0E4 *param0, void *param1, int param2) { sub_02022A1C(param0->unk_34, param1, param2); NNS_G2dGetUnpackedCharacterData(param1, ¶m0->unk_38[param2]); @@ -253,14 +253,14 @@ NNSG2dCharacterData * ov22_02255340 (UnkStruct_ov22_0225A0E4 * param0, void * pa return param0->unk_38[param2]; } -void ov22_02255360 (void) +void ov22_02255360(void) { GX_SetVisibleWnd(GX_WNDMASK_NONE); G2_SetBG0Priority(1); G2_SetBG1Priority(0); } -void ov22_02255390 (void) +void ov22_02255390(void) { GX_SetVisibleWnd(GX_WNDMASK_W0); G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 0); @@ -270,21 +270,21 @@ void ov22_02255390 (void) G2_SetBG1Priority(1); } -void ov22_022553F8 (UnkStruct_ov22_0225A0E4 * param0) +void ov22_022553F8(UnkStruct_ov22_0225A0E4 *param0) { sub_0201C2B8(param0->unk_40); sub_02008A94(param0->unk_20); sub_0200A858(); } -void ov22_02255410 (UnkStruct_ov22_02255CB8 * param0, int param1) +void ov22_02255410(UnkStruct_ov22_02255CB8 *param0, int param1) { ov22_02255CB8(param0, (100 + 18), (1 + 18), param1); } -int ov22_02255420 (NNSG2dCharacterData * param0, int param1, int param2, int param3) +int ov22_02255420(NNSG2dCharacterData *param0, int param1, int param2, int param3) { - u32 * v0; + u32 *v0; int v1, v2; int v3; int v4; @@ -310,7 +310,7 @@ int ov22_02255420 (NNSG2dCharacterData * param0, int param1, int param2, int par return 0; } -void ov22_0225547C (UnkStruct_ov22_0225A0E4 * param0, const UnkStruct_ov22_022550D4 * param1, int param2) +void ov22_0225547C(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1, int param2) { ov22_02255748(param0, param1); ov22_02255C24(param0, param2, 0x2800, 0x20); @@ -318,7 +318,7 @@ void ov22_0225547C (UnkStruct_ov22_0225A0E4 * param0, const UnkStruct_ov22_02255 ov22_02255BF4(param0, param2); } -void ov22_022554A8 (UnkStruct_ov22_0225A0E4 * param0, BGL * param1, int param2) +void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BGL *param1, int param2) { param0->unk_40 = param1; @@ -346,7 +346,7 @@ void ov22_022554A8 (UnkStruct_ov22_0225A0E4 * param0, BGL * param1, int param2) } } -void ov22_022554F8 (UnkStruct_ov22_0225A0E4 * param0) +void ov22_022554F8(UnkStruct_ov22_0225A0E4 *param0) { ov22_02255C14(param0); ov22_02255784(param0); @@ -359,17 +359,17 @@ void ov22_022554F8 (UnkStruct_ov22_0225A0E4 * param0) param0->unk_10 = NULL; } -void ov22_02255524 (UnkStruct_ov22_0225A0E4 * param0) +void ov22_02255524(UnkStruct_ov22_0225A0E4 *param0) { sub_02019044(param0->unk_40, 2); } -void ov22_02255530 (UnkStruct_ov22_0225A0E4 * param0) +void ov22_02255530(UnkStruct_ov22_0225A0E4 *param0) { sub_02008A94(param0->unk_20); } -void ov22_0225553C (UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, u16 param3, const VecFx32 * param4) +void ov22_0225553C(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, u16 param3, const VecFx32 *param4) { G3_Identity(); G3_PushMtx(); @@ -400,7 +400,7 @@ void ov22_0225553C (UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, u1 G3_PopMtx(1); } -void ov22_022555D4 (UnkStruct_ov22_0225A0E4 * param0, int param1) +void ov22_022555D4(UnkStruct_ov22_0225A0E4 *param0, int param1) { param0->unk_5C = NARC_ctor(NARC_INDEX_GRAPHIC__IMAGECLIP, 14); ov22_022559F8(param0); @@ -408,7 +408,7 @@ void ov22_022555D4 (UnkStruct_ov22_0225A0E4 * param0, int param1) ov22_02255860(param0); } -void ov22_022555FC (UnkStruct_ov22_0225A0E4 * param0) +void ov22_022555FC(UnkStruct_ov22_0225A0E4 *param0) { ov22_02255984(param0); Heap_FreeToHeap(param0->unk_40); @@ -416,18 +416,18 @@ void ov22_022555FC (UnkStruct_ov22_0225A0E4 * param0) ov22_02255A98(param0); } -void ov22_0225561C (UnkStruct_ov22_0225A0E4 * param0) +void ov22_0225561C(UnkStruct_ov22_0225A0E4 *param0) { sub_0201C2B8(param0->unk_40); sub_0200A858(); } -void ov22_0225562C (UnkStruct_ov22_0225A0E4 * param0) +void ov22_0225562C(UnkStruct_ov22_0225A0E4 *param0) { ov22_02255AC0(param0); } -static void ov22_02255634 (void) +static void ov22_02255634(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_C, @@ -445,7 +445,7 @@ static void ov22_02255634 (void) GXLayers_SetBanks(&v0); } -static void ov22_02255654 (void) +static void ov22_02255654(void) { NNS_G3dInit(); G3X_InitMtxStack(); @@ -465,7 +465,7 @@ static void ov22_02255654 (void) NNS_GfdInitFrmPlttVramManager(0x4000, 1); } -static void ov22_022556DC (void) +static void ov22_022556DC(void) { { UnkStruct_ov84_0223BA5C v0 = { @@ -487,13 +487,13 @@ static void ov22_022556DC (void) GXLayers_EngineBToggleLayers((GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_OBJ), 1); } -static void ov22_0225572C (void) +static void ov22_0225572C(void) { NNS_GfdResetFrmTexVramState(); NNS_GfdResetFrmPlttVramState(); } -static void ov22_02255738 (void) +static void ov22_02255738(void) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -501,7 +501,7 @@ static void ov22_02255738 (void) NNS_G2dInitOamManagerModule(); } -static void ov22_02255748 (UnkStruct_ov22_0225A0E4 * param0, const UnkStruct_ov22_022550D4 * param1) +static void ov22_02255748(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1) { param0->unk_00 = sub_02015064(param1); param0->unk_04 = Heap_AllocFromHeap(param1->unk_0C, sizeof(UnkStruct_02015128 *) * (100 + 18)); @@ -513,18 +513,18 @@ static void ov22_02255748 (UnkStruct_ov22_0225A0E4 * param0, const UnkStruct_ov2 param0->unk_1C = 1; } -static void ov22_02255784 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_02255784(UnkStruct_ov22_0225A0E4 *param0) { sub_020150A8(param0->unk_00); param0->unk_00 = NULL; } -static void ov22_02255794 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_02255794(UnkStruct_ov22_0225A0E4 *param0) { sub_020150EC(param0->unk_00); } -static void ov22_022557A0 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_022557A0 * param1, int param2) +static void ov22_022557A0(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_022557A0 *param1, int param2) { int v0; @@ -541,7 +541,7 @@ static void ov22_022557A0 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_0225 } } -static void ov22_02255800 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255800 * param1, int param2) +static void ov22_02255800(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255800 *param1, int param2) { int v0; @@ -558,7 +558,7 @@ static void ov22_02255800 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_0225 } } -static void ov22_02255860 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_02255860(UnkStruct_ov22_0225A0E4 *param0) { { UnkStruct_ov97_0222DB78 v0 = { @@ -671,7 +671,7 @@ static void ov22_02255860 (UnkStruct_ov22_0225A0E4 * param0) } } -static void ov22_02255984 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_02255984(UnkStruct_ov22_0225A0E4 *param0) { sub_02019044(param0->unk_40, 1); sub_02019044(param0->unk_40, 2); @@ -680,22 +680,22 @@ static void ov22_02255984 (UnkStruct_ov22_0225A0E4 * param0) sub_02019044(param0->unk_40, 5); } -static void ov22_022559B4 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_022559B4(UnkStruct_ov22_0225A0E4 *param0) { - param0->unk_34 = sub_0202298C((((100 + 18)) + 1), 14); - param0->unk_38 = Heap_AllocFromHeap(14, sizeof(NNSG2dCharacterData *) * (((100 + 18)) + 1)); - memset(param0->unk_38, 0, sizeof(NNSG2dCharacterData *) * (((100 + 18)) + 1)); - param0->unk_3C = (((100 + 18)) + 1); + param0->unk_34 = sub_0202298C(((100 + 18) + 1), 14); + param0->unk_38 = Heap_AllocFromHeap(14, sizeof(NNSG2dCharacterData *) * ((100 + 18) + 1)); + memset(param0->unk_38, 0, sizeof(NNSG2dCharacterData *) * ((100 + 18) + 1)); + param0->unk_3C = ((100 + 18) + 1); } -static void ov22_022559E0 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_022559E0(UnkStruct_ov22_0225A0E4 *param0) { Heap_FreeToHeap(param0->unk_38); sub_020229D8(param0->unk_34); param0->unk_3C = 0; } -static void ov22_022559F8 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_022559F8(UnkStruct_ov22_0225A0E4 *param0) { { UnkStruct_ov22_022559F8 v0 = { @@ -724,7 +724,7 @@ static void ov22_022559F8 (UnkStruct_ov22_0225A0E4 * param0) param0->unk_48[3] = sub_02009714(48, 3, 14); } -static void ov22_02255A98 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_02255A98(UnkStruct_ov22_0225A0E4 *param0) { sub_02021964(param0->unk_44); @@ -741,16 +741,16 @@ static void ov22_02255A98 (UnkStruct_ov22_0225A0E4 * param0) sub_0200A878(); } -static void ov22_02255AC0 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_02255AC0(UnkStruct_ov22_0225A0E4 *param0) { sub_020219F8(param0->unk_44); } -static void ov22_02255ACC (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1) +static void ov22_02255ACC(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1) { int v0; int v1; - void * v2; + void *v2; for (v0 = 0; v0 < 100; v0++) { v2 = sub_0200723C(param0->unk_5C, v0 + 1, 0, 14, 1); @@ -772,10 +772,10 @@ static void ov22_02255ACC (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_0225 param1->unk_08[0].unk_08 = 3; } -static void ov22_02255B50 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1) +static void ov22_02255B50(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1) { int v0; - void * v1; + void *v1; int v2; for (v0 = 0; v0 < 18; v0++) { @@ -797,18 +797,18 @@ static void ov22_02255B50 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_0225 } } -static void ov22_02255BF4 (UnkStruct_ov22_0225A0E4 * param0, int param1) +static void ov22_02255BF4(UnkStruct_ov22_0225A0E4 *param0, int param1) { param0->unk_30 = sub_0200723C(param0->unk_5C, 235, 0, param1, 0); } -static void ov22_02255C14 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_02255C14(UnkStruct_ov22_0225A0E4 *param0) { Heap_FreeToHeap(param0->unk_30); param0->unk_30 = NULL; } -static void ov22_02255C24 (UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3) +static void ov22_02255C24(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, int param3) { param0->unk_20 = sub_0200762C(param1); param0->unk_24 = NNS_GfdAllocTexVram(param2, 0, 0); @@ -820,7 +820,7 @@ static void ov22_02255C24 (UnkStruct_ov22_0225A0E4 * param0, int param1, int par param0->unk_2C = 1; } -static void ov22_02255C90 (UnkStruct_ov22_0225A0E4 * param0) +static void ov22_02255C90(UnkStruct_ov22_0225A0E4 *param0) { sub_02007B6C(param0->unk_20); @@ -830,7 +830,7 @@ static void ov22_02255C90 (UnkStruct_ov22_0225A0E4 * param0) param0->unk_2C = 0; } -static void ov22_02255CB8 (UnkStruct_ov22_02255CB8 * param0, int param1, int param2, int param3) +static void ov22_02255CB8(UnkStruct_ov22_02255CB8 *param0, int param1, int param2, int param3) { param0->unk_00 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov22_022557A0) * param1); memset(param0->unk_00, 0, sizeof(UnkStruct_ov22_022557A0) * param1); @@ -843,7 +843,7 @@ static void ov22_02255CB8 (UnkStruct_ov22_02255CB8 * param0, int param1, int par param0->unk_0C = param2; } -static void ov22_02255D0C (UnkStruct_ov22_02255CB8 * param0) +static void ov22_02255D0C(UnkStruct_ov22_02255CB8 *param0) { if (param0->unk_10) { sub_020229D8(param0->unk_10); diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 6452fc11c4..2292ae4782 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -1,22 +1,32 @@ +#include "overlay022/ov22_02255D44.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02015920_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029C88_decl.h" -#include "pokemon.h" - #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0203DA00.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02093BBC.h" #include "struct_defs/struct_02095C60.h" + +#include "overlay022/ov22_02254DE0.h" +#include "overlay022/ov22_02255094.h" +#include "overlay022/ov22_022578F4.h" +#include "overlay022/ov22_02257F50.h" +#include "overlay022/ov22_022588F0.h" +#include "overlay022/ov22_0225894C.h" +#include "overlay022/ov22_022589E0.h" +#include "overlay022/ov22_02259098.h" +#include "overlay022/ov22_02259484.h" +#include "overlay022/ov22_02259560.h" +#include "overlay022/ov22_022597BC.h" +#include "overlay022/ov22_02259C58.h" +#include "overlay022/ov22_0225A428.h" +#include "overlay022/ov22_0225AF44.h" #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_02255CB8.h" #include "overlay022/struct_ov22_02256BAC.h" @@ -37,57 +47,44 @@ #include "overlay022/struct_ov22_0225AF68.h" #include "overlay022/struct_ov22_0225B388.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200679C.h" -#include "overlay_manager.h" #include "unk_020093B4.h" #include "unk_0200A9DC.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D670.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_020298BC.h" #include "unk_0202CD50.h" #include "unk_020363E8.h" #include "unk_020393C8.h" #include "unk_02094EDC.h" #include "unk_02095AF0.h" -#include "overlay022/ov22_02254DE0.h" -#include "overlay022/ov22_02255094.h" -#include "overlay022/ov22_02255D44.h" -#include "overlay022/ov22_022578F4.h" -#include "overlay022/ov22_02257F50.h" -#include "overlay022/ov22_022588F0.h" -#include "overlay022/ov22_0225894C.h" -#include "overlay022/ov22_022589E0.h" -#include "overlay022/ov22_02259098.h" -#include "overlay022/ov22_02259484.h" -#include "overlay022/ov22_02259560.h" -#include "overlay022/ov22_022597BC.h" -#include "overlay022/ov22_02259C58.h" -#include "overlay022/ov22_0225A428.h" -#include "overlay022/ov22_0225AF44.h" typedef struct { UnkStruct_ov22_0225A0E4 unk_00; UnkStruct_ov22_0225899C unk_1E8; UnkStruct_ov22_02259484 unk_3C0; - UnkStruct_ov22_02254DE0 * unk_3C8; + UnkStruct_ov22_02254DE0 *unk_3C8; UnkStruct_ov22_02257F50 unk_3CC; UnkStruct_ov22_02257964 unk_458; UnkStruct_ov22_0225AF68 unk_4E0; @@ -97,30 +94,30 @@ typedef struct { UnkStruct_ov22_0225A428 unk_5C4; int unk_70C; int unk_710; - UnkStruct_02015920 * unk_714; - Window * unk_718; + UnkStruct_02015920 *unk_714; + Window *unk_718; BOOL unk_71C; int unk_720; int unk_724; int unk_728; int unk_72C; int unk_730; - UnkStruct_02095C60 * unk_734; - const Options * unk_738; + UnkStruct_02095C60 *unk_734; + const Options *unk_738; u32 unk_73C; - Strbuf* unk_740; - StringTemplate * unk_744; + Strbuf *unk_740; + StringTemplate *unk_744; } UnkStruct_ov22_02255D44; typedef struct { - UnkStruct_ov22_02255D44 * unk_00; - BOOL * unk_04; + UnkStruct_ov22_02255D44 *unk_00; + BOOL *unk_04; int unk_08; int unk_0C; } UnkStruct_ov22_02256C48; typedef struct { - UnkStruct_ov22_02259560 * unk_00; + UnkStruct_ov22_02259560 *unk_00; u32 unk_04; } UnkStruct_ov22_02256FD8_sub1; @@ -129,74 +126,74 @@ typedef struct { int unk_A8; } UnkStruct_ov22_02256FD8; -static void ov22_02256940(void * param0); -static void ov22_022566C0(UnkStruct_ov22_02255D44 * param0); -static void ov22_022566EC(UnkStruct_ov22_02255D44 * param0); -static void ov22_022566F4(UnkStruct_ov22_02255D44 * param0); -static void ov22_02256708(UnkStruct_ov22_02255D44 * param0, Pokemon * param1, int param2, BOOL param3); -static void ov22_02256790(UnkStruct_ov22_02255D44 * param0, Pokemon * param1, int param2); -static void ov22_022567D8(UnkStruct_ov22_02255D44 * param0); -static void ov22_022567FC(UnkStruct_ov22_02255D44 * param0); -static void ov22_022568B8(UnkStruct_ov22_02255D44 * param0); -static void ov22_022568DC(UnkStruct_ov22_02255D44 * param0); -static void ov22_02256948(UnkStruct_ov22_02255D44 * param0, int param1); -static void ov22_0225698C(UnkStruct_ov22_02255D44 * param0); -static void ov22_0225699C(UnkStruct_ov22_02255D44 * param0); -static void ov22_02256A28(UnkStruct_ov22_02255D44 * param0); -static void ov22_02256AB4(UnkStruct_ov22_02255D44 * param0); -static void ov22_02256AC4(UnkStruct_ov22_02255D44 * param0); -static void ov22_02256AD4(UnkStruct_ov22_02255D44 * param0); -static void ov22_02256AE4(UnkStruct_ov22_02259C58 * param0, void * param1); -static void ov22_02256B04(UnkStruct_ov22_02259C58 * param0, void * param1); -static void ov22_02256B24(UnkStruct_ov22_02259C58 * param0, void * param1); -static void ov22_02256B44(UnkStruct_ov22_02259C58 * param0, void * param1); -static void ov22_02256B78(UnkStruct_ov22_02259C58 * param0, void * param1); -static void ov22_02256BAC(UnkStruct_ov22_02255D44 * param0, const Options * param1); -static void ov22_02256BF4(UnkStruct_ov22_02255D44 * param0, int param1, int param2, UnkStruct_02095C60 * param3, const Options * param4); -static void ov22_02256C38(UnkStruct_ov22_02255D44 * param0); -static void ov22_02256C48(UnkStruct_ov22_02255D44 * param0, BOOL * param1); -static void ov22_02256C70(SysTask * param0, void * param1); -static void ov22_02256DB8(UnkStruct_ov22_02255D44 * param0, BOOL * param1); -static void ov22_02256DE0(SysTask * param0, void * param1); -static BOOL ov22_02257098(UnkStruct_ov22_02256C48 * param0, int param1, int param2, int param3); -static void ov22_02256F38(UnkStruct_02029C68 * param0, UnkStruct_ov22_02257964 * param1, const TrainerInfo * param2); -static void ov22_02256FD8(UnkStruct_02029C88 * param0, UnkStruct_ov22_02257964 * param1, int param2, const TrainerInfo * param3); -static void ov22_02257104(UnkStruct_ov22_02255D44 * param0); -static void ov22_0225718C(UnkStruct_ov22_02255D44 * param0); -static void ov22_022571D4(UnkStruct_ov22_02255D44 * param0); -static void ov22_02257258(UnkStruct_ov22_02255D44 * param0); -static u32 ov22_02257278(UnkStruct_ov22_02255D44 * param0); -static void ov22_022575B4(UnkStruct_ov22_02255D44 * param0); -static u32 ov22_02257624(UnkStruct_ov22_02255D44 * param0); -static void ov22_022574CC(UnkStruct_ov22_02255D44 * param0, u32 param1); -static void ov22_022574E4(UnkStruct_ov22_02255D44 * param0, u32 param1); -static void ov22_022574EC(UnkStruct_ov22_02255D44 * param0); -static void ov22_022574F4(UnkStruct_ov22_02255D44 * param0, u32 param1); -static u32 ov22_0225751C(UnkStruct_ov22_02255D44 * param0, u32 param1); -static void ov22_02257524(UnkStruct_ov22_02255D44 * param0, int param1, int param2); -static void ov22_02257540(UnkStruct_ov22_02255D44 * param0); -static void ov22_02257548(UnkStruct_ov22_02255D44 * param0); -static void ov22_022572A0(UnkStruct_ov22_02255D44 * param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5); -static void ov22_02257368(UnkStruct_ov22_02255D44 * param0, u32 param1); -static u32 ov22_022573EC(UnkStruct_ov22_02255D44 * param0, u32 param1); -static void ov22_02257498(UnkStruct_ov22_02255D44 * param0); -static void ov22_022574B0(UnkStruct_ov22_02255D44 * param0); -static void ov22_02257564(UnkStruct_ov22_02255D44 * param0); +static void ov22_02256940(void *param0); +static void ov22_022566C0(UnkStruct_ov22_02255D44 *param0); +static void ov22_022566EC(UnkStruct_ov22_02255D44 *param0); +static void ov22_022566F4(UnkStruct_ov22_02255D44 *param0); +static void ov22_02256708(UnkStruct_ov22_02255D44 *param0, Pokemon *param1, int param2, BOOL param3); +static void ov22_02256790(UnkStruct_ov22_02255D44 *param0, Pokemon *param1, int param2); +static void ov22_022567D8(UnkStruct_ov22_02255D44 *param0); +static void ov22_022567FC(UnkStruct_ov22_02255D44 *param0); +static void ov22_022568B8(UnkStruct_ov22_02255D44 *param0); +static void ov22_022568DC(UnkStruct_ov22_02255D44 *param0); +static void ov22_02256948(UnkStruct_ov22_02255D44 *param0, int param1); +static void ov22_0225698C(UnkStruct_ov22_02255D44 *param0); +static void ov22_0225699C(UnkStruct_ov22_02255D44 *param0); +static void ov22_02256A28(UnkStruct_ov22_02255D44 *param0); +static void ov22_02256AB4(UnkStruct_ov22_02255D44 *param0); +static void ov22_02256AC4(UnkStruct_ov22_02255D44 *param0); +static void ov22_02256AD4(UnkStruct_ov22_02255D44 *param0); +static void ov22_02256AE4(UnkStruct_ov22_02259C58 *param0, void *param1); +static void ov22_02256B04(UnkStruct_ov22_02259C58 *param0, void *param1); +static void ov22_02256B24(UnkStruct_ov22_02259C58 *param0, void *param1); +static void ov22_02256B44(UnkStruct_ov22_02259C58 *param0, void *param1); +static void ov22_02256B78(UnkStruct_ov22_02259C58 *param0, void *param1); +static void ov22_02256BAC(UnkStruct_ov22_02255D44 *param0, const Options *param1); +static void ov22_02256BF4(UnkStruct_ov22_02255D44 *param0, int param1, int param2, UnkStruct_02095C60 *param3, const Options *param4); +static void ov22_02256C38(UnkStruct_ov22_02255D44 *param0); +static void ov22_02256C48(UnkStruct_ov22_02255D44 *param0, BOOL *param1); +static void ov22_02256C70(SysTask *param0, void *param1); +static void ov22_02256DB8(UnkStruct_ov22_02255D44 *param0, BOOL *param1); +static void ov22_02256DE0(SysTask *param0, void *param1); +static BOOL ov22_02257098(UnkStruct_ov22_02256C48 *param0, int param1, int param2, int param3); +static void ov22_02256F38(UnkStruct_02029C68 *param0, UnkStruct_ov22_02257964 *param1, const TrainerInfo *param2); +static void ov22_02256FD8(UnkStruct_02029C88 *param0, UnkStruct_ov22_02257964 *param1, int param2, const TrainerInfo *param3); +static void ov22_02257104(UnkStruct_ov22_02255D44 *param0); +static void ov22_0225718C(UnkStruct_ov22_02255D44 *param0); +static void ov22_022571D4(UnkStruct_ov22_02255D44 *param0); +static void ov22_02257258(UnkStruct_ov22_02255D44 *param0); +static u32 ov22_02257278(UnkStruct_ov22_02255D44 *param0); +static void ov22_022575B4(UnkStruct_ov22_02255D44 *param0); +static u32 ov22_02257624(UnkStruct_ov22_02255D44 *param0); +static void ov22_022574CC(UnkStruct_ov22_02255D44 *param0, u32 param1); +static void ov22_022574E4(UnkStruct_ov22_02255D44 *param0, u32 param1); +static void ov22_022574EC(UnkStruct_ov22_02255D44 *param0); +static void ov22_022574F4(UnkStruct_ov22_02255D44 *param0, u32 param1); +static u32 ov22_0225751C(UnkStruct_ov22_02255D44 *param0, u32 param1); +static void ov22_02257524(UnkStruct_ov22_02255D44 *param0, int param1, int param2); +static void ov22_02257540(UnkStruct_ov22_02255D44 *param0); +static void ov22_02257548(UnkStruct_ov22_02255D44 *param0); +static void ov22_022572A0(UnkStruct_ov22_02255D44 *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5); +static void ov22_02257368(UnkStruct_ov22_02255D44 *param0, u32 param1); +static u32 ov22_022573EC(UnkStruct_ov22_02255D44 *param0, u32 param1); +static void ov22_02257498(UnkStruct_ov22_02255D44 *param0); +static void ov22_022574B0(UnkStruct_ov22_02255D44 *param0); +static void ov22_02257564(UnkStruct_ov22_02255D44 *param0); static int ov22_02257580(int param0); -static void ov22_0225764C(UnkStruct_ov22_02256FD8 * param0); -static void ov22_02257658(UnkStruct_ov22_02256FD8 * param0, UnkStruct_ov22_02259560 * param1, u32 param2); -static void ov22_0225768C(UnkStruct_ov22_02256FD8 * param0); -static UnkStruct_ov22_02259560 * ov22_022576E8(UnkStruct_ov22_02256FD8 * param0, u32 param1); -static BOOL ov22_022576FC(UnkStruct_ov22_02256FD8 * param0, u32 param1); -static BOOL ov22_0225771C(UnkStruct_ov22_02256FD8_sub1 * param0, UnkStruct_ov22_02256FD8_sub1 * param1); -static void ov22_02257778(UnkStruct_ov22_02256FD8 * param0, UnkStruct_ov22_02259560 * param1, u32 param2); -static void ov22_022577A0(UnkStruct_ov22_02255D44 * param0); - -int ov22_02255D44 (OverlayManager * param0, int * param1) -{ - UnkStruct_ov22_02255D44 * v0; +static void ov22_0225764C(UnkStruct_ov22_02256FD8 *param0); +static void ov22_02257658(UnkStruct_ov22_02256FD8 *param0, UnkStruct_ov22_02259560 *param1, u32 param2); +static void ov22_0225768C(UnkStruct_ov22_02256FD8 *param0); +static UnkStruct_ov22_02259560 *ov22_022576E8(UnkStruct_ov22_02256FD8 *param0, u32 param1); +static BOOL ov22_022576FC(UnkStruct_ov22_02256FD8 *param0, u32 param1); +static BOOL ov22_0225771C(UnkStruct_ov22_02256FD8_sub1 *param0, UnkStruct_ov22_02256FD8_sub1 *param1); +static void ov22_02257778(UnkStruct_ov22_02256FD8 *param0, UnkStruct_ov22_02259560 *param1, u32 param2); +static void ov22_022577A0(UnkStruct_ov22_02255D44 *param0); + +int ov22_02255D44(OverlayManager *param0, int *param1) +{ + UnkStruct_ov22_02255D44 *v0; u32 v1; - UnkStruct_0203DA00 * v2; + UnkStruct_0203DA00 *v2; Heap_Create(3, 13, 0x20000); Heap_Create(3, 14, 0x40000); @@ -238,13 +235,13 @@ int ov22_02255D44 (OverlayManager * param0, int * param1) return 1; } -int ov22_02255E50 (OverlayManager * param0, int * param1) +int ov22_02255E50(OverlayManager *param0, int *param1) { - UnkStruct_ov22_02255D44 * v0 = OverlayManager_Data(param0); + UnkStruct_ov22_02255D44 *v0 = OverlayManager_Data(param0); int v1 = 0; - UnkStruct_0203DA00 * v2 = OverlayManager_Args(param0); + UnkStruct_0203DA00 *v2 = OverlayManager_Args(param0); - switch ((*param1)) { + switch (*param1) { case 0: case 1: sub_0200F174( @@ -361,11 +358,11 @@ int ov22_02255E50 (OverlayManager * param0, int * param1) return v1; } -int ov22_02256098 (OverlayManager * param0, int * param1) +int ov22_02256098(OverlayManager *param0, int *param1) { - UnkStruct_ov22_02255D44 * v0 = OverlayManager_Data(param0); + UnkStruct_ov22_02255D44 *v0 = OverlayManager_Data(param0); u32 v1; - UnkStruct_0203DA00 * v2 = OverlayManager_Args(param0); + UnkStruct_0203DA00 *v2 = OverlayManager_Args(param0); if (v0->unk_71C == 1) { sub_0202CFEC(v2->unk_10, 7); @@ -409,11 +406,11 @@ int ov22_02256098 (OverlayManager * param0, int * param1) return 1; } -int ov22_02256174 (OverlayManager * param0, int * param1) +int ov22_02256174(OverlayManager *param0, int *param1) { - UnkStruct_ov22_02255D44 * v0; + UnkStruct_ov22_02255D44 *v0; u32 v1; - UnkStruct_02093BBC * v2; + UnkStruct_02093BBC *v2; Heap_Create(3, 13, 0x20000); Heap_Create(3, 14, 0x40000); @@ -474,13 +471,13 @@ int ov22_02256174 (OverlayManager * param0, int * param1) return 1; } -int ov22_022562EC (OverlayManager * param0, int * param1) +int ov22_022562EC(OverlayManager *param0, int *param1) { - UnkStruct_ov22_02255D44 * v0 = OverlayManager_Data(param0); + UnkStruct_ov22_02255D44 *v0 = OverlayManager_Data(param0); int v1 = 0; int v2; - switch ((*param1)) { + switch (*param1) { case 0: sub_0200564C((127 / 3), 30); (*param1)++; @@ -633,11 +630,11 @@ int ov22_022562EC (OverlayManager * param0, int * param1) return v1; } -int ov22_02256600 (OverlayManager * param0, int * param1) +int ov22_02256600(OverlayManager *param0, int *param1) { - UnkStruct_ov22_02255D44 * v0 = OverlayManager_Data(param0); + UnkStruct_ov22_02255D44 *v0 = OverlayManager_Data(param0); u32 v1; - UnkStruct_02093BBC * v2 = OverlayManager_Args(param0); + UnkStruct_02093BBC *v2 = OverlayManager_Args(param0); ov22_02256FD8(v2->unk_04, &v0->unk_458, v0->unk_724, v2->unk_24); @@ -672,7 +669,7 @@ int ov22_02256600 (OverlayManager * param0, int * param1) return 1; } -static void ov22_022566C0 (UnkStruct_ov22_02255D44 * param0) +static void ov22_022566C0(UnkStruct_ov22_02255D44 *param0) { UnkStruct_ov22_02255CB8 v0; @@ -683,19 +680,19 @@ static void ov22_022566C0 (UnkStruct_ov22_02255D44 * param0) ov22_02255338(&v0); } -static void ov22_022566EC (UnkStruct_ov22_02255D44 * param0) +static void ov22_022566EC(UnkStruct_ov22_02255D44 *param0) { ov22_02255180(¶m0->unk_00); } -static void ov22_022566F4 (UnkStruct_ov22_02255D44 * param0) +static void ov22_022566F4(UnkStruct_ov22_02255D44 *param0) { ov22_022551D0(¶m0->unk_00); ov22_02255134(¶m0->unk_00); ov22_022550B4(); } -static void ov22_02256708 (UnkStruct_ov22_02255D44 * param0, Pokemon * param1, int param2, BOOL param3) +static void ov22_02256708(UnkStruct_ov22_02255D44 *param0, Pokemon *param1, int param2, BOOL param3) { UnkStruct_ov22_0225B388 v0; @@ -727,7 +724,7 @@ static void ov22_02256708 (UnkStruct_ov22_02255D44 * param0, Pokemon * param1, i ov22_02257C88(¶m0->unk_458, 0, 14); } -static void ov22_02256790 (UnkStruct_ov22_02255D44 * param0, Pokemon * param1, int param2) +static void ov22_02256790(UnkStruct_ov22_02255D44 *param0, Pokemon *param1, int param2) { int v0, v1; UnkStruct_ov22_022596B0 v2; @@ -738,14 +735,14 @@ static void ov22_02256790 (UnkStruct_ov22_02255D44 * param0, Pokemon * param1, i ov22_022591EC(¶m0->unk_458.unk_2C.unk_4C, 192, (16 + 129) - ((v1 / 2) - v2.unk_03) + -4); } -static void ov22_022567D8 (UnkStruct_ov22_02255D44 * param0) +static void ov22_022567D8(UnkStruct_ov22_02255D44 *param0) { ov22_02257CD4(¶m0->unk_458); ov22_02257A98(¶m0->unk_458); ov22_02257948(¶m0->unk_458); } -static void ov22_022567FC (UnkStruct_ov22_02255D44 * param0) +static void ov22_022567FC(UnkStruct_ov22_02255D44 *param0) { UnkStruct_ov22_02258470 v0; @@ -788,14 +785,14 @@ static void ov22_022567FC (UnkStruct_ov22_02255D44 * param0) } } -static void ov22_022568B8 (UnkStruct_ov22_02255D44 * param0) +static void ov22_022568B8(UnkStruct_ov22_02255D44 *param0) { ov22_02258408(¶m0->unk_3CC); ov22_022581C0(¶m0->unk_3CC); ov22_02257F88(¶m0->unk_3CC); } -static void ov22_022568DC (UnkStruct_ov22_02255D44 * param0) +static void ov22_022568DC(UnkStruct_ov22_02255D44 *param0) { G2_SetBG0Priority(1); G2_SetBG1Priority(0); @@ -808,13 +805,13 @@ static void ov22_022568DC (UnkStruct_ov22_02255D44 * param0) ov22_022583A0(¶m0->unk_3CC, 0, 2, 0, NULL); } -static void ov22_02256940 (void * param0) +static void ov22_02256940(void *param0) { - UnkStruct_ov22_02255D44 * v0 = param0; + UnkStruct_ov22_02255D44 *v0 = param0; ov22_022553F8(&v0->unk_00); } -static void ov22_02256948 (UnkStruct_ov22_02255D44 * param0, int param1) +static void ov22_02256948(UnkStruct_ov22_02255D44 *param0, int param1) { UnkStruct_ov22_022599A0 v0; @@ -834,12 +831,12 @@ static void ov22_02256948 (UnkStruct_ov22_02255D44 * param0, int param1) ov22_022597BC(¶m0->unk_518, &v0); } -static void ov22_0225698C (UnkStruct_ov22_02255D44 * param0) +static void ov22_0225698C(UnkStruct_ov22_02255D44 *param0) { ov22_02259804(¶m0->unk_518); } -static void ov22_0225699C (UnkStruct_ov22_02255D44 * param0) +static void ov22_0225699C(UnkStruct_ov22_02255D44 *param0) { ov22_02259DBC(¶m0->unk_544, ¶m0->unk_00); ov22_02259FF4(¶m0->unk_544, 0, ov22_02256B04, param0, 0); @@ -849,7 +846,7 @@ static void ov22_0225699C (UnkStruct_ov22_02255D44 * param0) ov22_02259FF4(¶m0->unk_544, 4, ov22_02256AE4, param0, 0); } -static void ov22_02256A28 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02256A28(UnkStruct_ov22_02255D44 *param0) { ov22_02259DBC(¶m0->unk_544, ¶m0->unk_00); ov22_02259FF4(¶m0->unk_544, 0, ov22_02256B04, param0, 0); @@ -859,24 +856,24 @@ static void ov22_02256A28 (UnkStruct_ov22_02255D44 * param0) ov22_02259FF4(¶m0->unk_544, 4, ov22_02256AE4, param0, 0); } -static void ov22_02256AB4 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02256AB4(UnkStruct_ov22_02255D44 *param0) { ov22_02259F24(¶m0->unk_544, ¶m0->unk_00); } -static void ov22_02256AC4 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02256AC4(UnkStruct_ov22_02255D44 *param0) { ov22_02259F88(¶m0->unk_544); } -static void ov22_02256AD4 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02256AD4(UnkStruct_ov22_02255D44 *param0) { ov22_02259FA0(¶m0->unk_544); } -static void ov22_02256AE4 (UnkStruct_ov22_02259C58 * param0, void * param1) +static void ov22_02256AE4(UnkStruct_ov22_02259C58 *param0, void *param1) { - UnkStruct_ov22_02255D44 * v0 = param1; + UnkStruct_ov22_02255D44 *v0 = param1; if (ov22_02258460(&v0->unk_3CC) == 0) { return; @@ -885,27 +882,27 @@ static void ov22_02256AE4 (UnkStruct_ov22_02259C58 * param0, void * param1) v0->unk_70C = 3; } -static void ov22_02256B04 (UnkStruct_ov22_02259C58 * param0, void * param1) +static void ov22_02256B04(UnkStruct_ov22_02259C58 *param0, void *param1) { - UnkStruct_ov22_02255D44 * v0 = param1; + UnkStruct_ov22_02255D44 *v0 = param1; int v1; v1 = ov22_02258414(&v0->unk_3CC); ov22_02258258(&v0->unk_3CC, v1, 0); } -static void ov22_02256B24 (UnkStruct_ov22_02259C58 * param0, void * param1) +static void ov22_02256B24(UnkStruct_ov22_02259C58 *param0, void *param1) { - UnkStruct_ov22_02255D44 * v0 = param1; + UnkStruct_ov22_02255D44 *v0 = param1; int v1; v1 = ov22_02258414(&v0->unk_3CC); ov22_02258258(&v0->unk_3CC, v1, 1); } -static void ov22_02256B44 (UnkStruct_ov22_02259C58 * param0, void * param1) +static void ov22_02256B44(UnkStruct_ov22_02259C58 *param0, void *param1) { - UnkStruct_ov22_02255D44 * v0 = param1; + UnkStruct_ov22_02255D44 *v0 = param1; int v1; int v2; @@ -917,9 +914,9 @@ static void ov22_02256B44 (UnkStruct_ov22_02259C58 * param0, void * param1) } } -static void ov22_02256B78 (UnkStruct_ov22_02259C58 * param0, void * param1) +static void ov22_02256B78(UnkStruct_ov22_02259C58 *param0, void *param1) { - UnkStruct_ov22_02255D44 * v0 = param1; + UnkStruct_ov22_02255D44 *v0 = param1; int v1; int v2; @@ -931,7 +928,7 @@ static void ov22_02256B78 (UnkStruct_ov22_02259C58 * param0, void * param1) } } -static void ov22_02256BAC (UnkStruct_ov22_02255D44 * param0, const Options * param1) +static void ov22_02256BAC(UnkStruct_ov22_02255D44 *param0, const Options *param1) { UnkStruct_ov22_02256BAC v0; @@ -947,7 +944,7 @@ static void ov22_02256BAC (UnkStruct_ov22_02255D44 * param0, const Options * par ov22_0225A428(¶m0->unk_5C4, &v0, (1 | 2 | 4 | 8)); } -static void ov22_02256BF4 (UnkStruct_ov22_02255D44 * param0, int param1, int param2, UnkStruct_02095C60 * param3, const Options * param4) +static void ov22_02256BF4(UnkStruct_ov22_02255D44 *param0, int param1, int param2, UnkStruct_02095C60 *param3, const Options *param4) { UnkStruct_ov22_02256BAC v0; BOOL v1; @@ -966,15 +963,15 @@ static void ov22_02256BF4 (UnkStruct_ov22_02255D44 * param0, int param1, int par ov22_0225A428(¶m0->unk_5C4, &v0, (1 | 2 | 4 | 8 | 16 | 32)); } -static void ov22_02256C38 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02256C38(UnkStruct_ov22_02255D44 *param0) { ov22_0225A560(¶m0->unk_5C4); } -static void ov22_02256C48 (UnkStruct_ov22_02255D44 * param0, BOOL * param1) +static void ov22_02256C48(UnkStruct_ov22_02255D44 *param0, BOOL *param1) { - SysTask * v0; - UnkStruct_ov22_02256C48 * v1; + SysTask *v0; + UnkStruct_ov22_02256C48 *v1; v0 = SysTask_StartAndAllocateParam(ov22_02256C70, sizeof(UnkStruct_ov22_02256C48), 10, 13); v1 = SysTask_GetParam(v0); @@ -984,9 +981,9 @@ static void ov22_02256C48 (UnkStruct_ov22_02255D44 * param0, BOOL * param1) v1->unk_0C = 0; } -static void ov22_02256C70 (SysTask * param0, void * param1) +static void ov22_02256C70(SysTask *param0, void *param1) { - UnkStruct_ov22_02256C48 * v0 = param1; + UnkStruct_ov22_02256C48 *v0 = param1; BOOL v1; switch (v0->unk_0C) { @@ -1054,10 +1051,10 @@ static void ov22_02256C70 (SysTask * param0, void * param1) } } -static void ov22_02256DB8 (UnkStruct_ov22_02255D44 * param0, BOOL * param1) +static void ov22_02256DB8(UnkStruct_ov22_02255D44 *param0, BOOL *param1) { - SysTask * v0; - UnkStruct_ov22_02256C48 * v1; + SysTask *v0; + UnkStruct_ov22_02256C48 *v1; v0 = SysTask_StartAndAllocateParam(ov22_02256DE0, sizeof(UnkStruct_ov22_02256C48), 10, 13); v1 = SysTask_GetParam(v0); @@ -1068,9 +1065,9 @@ static void ov22_02256DB8 (UnkStruct_ov22_02255D44 * param0, BOOL * param1) v1->unk_0C = 0; } -static void ov22_02256DE0 (SysTask * param0, void * param1) +static void ov22_02256DE0(SysTask *param0, void *param1) { - UnkStruct_ov22_02256C48 * v0 = param1; + UnkStruct_ov22_02256C48 *v0 = param1; BOOL v1; switch (v0->unk_0C) { @@ -1140,11 +1137,11 @@ static void ov22_02256DE0 (SysTask * param0, void * param1) } } -static void ov22_02256F38 (UnkStruct_02029C68 * param0, UnkStruct_ov22_02257964 * param1, const TrainerInfo * param2) +static void ov22_02256F38(UnkStruct_02029C68 *param0, UnkStruct_ov22_02257964 *param1, const TrainerInfo *param2) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; int v1; - Strbuf* v2; + Strbuf *v2; int v3; sub_02029F84(param0); @@ -1184,13 +1181,13 @@ static void ov22_02256F38 (UnkStruct_02029C68 * param0, UnkStruct_ov22_02257964 sub_02029F5C(param0); } -static void ov22_02256FD8 (UnkStruct_02029C88 * param0, UnkStruct_ov22_02257964 * param1, int param2, const TrainerInfo * param3) +static void ov22_02256FD8(UnkStruct_02029C88 *param0, UnkStruct_ov22_02257964 *param1, int param2, const TrainerInfo *param3) { int v0; int v1; - UnkStruct_ov22_02256FD8 * v2; - UnkStruct_ov22_02259560 * v3; - Strbuf* v4; + UnkStruct_ov22_02256FD8 *v2; + UnkStruct_ov22_02259560 *v3; + Strbuf *v4; int v5; v2 = Heap_AllocFromHeap(13, sizeof(UnkStruct_ov22_02256FD8)); @@ -1225,7 +1222,7 @@ static void ov22_02256FD8 (UnkStruct_02029C88 * param0, UnkStruct_ov22_02257964 Heap_FreeToHeap(v2); } -static BOOL ov22_02257098 (UnkStruct_ov22_02256C48 * param0, int param1, int param2, int param3) +static BOOL ov22_02257098(UnkStruct_ov22_02256C48 *param0, int param1, int param2, int param3) { if (param0->unk_08 < 8) { ov22_02257AB0(¶m0->unk_00->unk_458, param1, param2); @@ -1247,7 +1244,7 @@ static BOOL ov22_02257098 (UnkStruct_ov22_02256C48 * param0, int param1, int par return 0; } -static void ov22_02257104 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02257104(UnkStruct_ov22_02255D44 *param0) { sub_02019EBC(param0->unk_00.unk_40, 3); sub_02019184(param0->unk_00.unk_40, 3, 0, 0); @@ -1268,7 +1265,7 @@ static void ov22_02257104 (UnkStruct_ov22_02255D44 * param0) sub_0200F338(0); } -static void ov22_0225718C (UnkStruct_ov22_02255D44 * param0) +static void ov22_0225718C(UnkStruct_ov22_02255D44 *param0) { ov22_02257548(param0); @@ -1284,7 +1281,7 @@ static void ov22_0225718C (UnkStruct_ov22_02255D44 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov22_022571D4 (UnkStruct_ov22_02255D44 * param0) +static void ov22_022571D4(UnkStruct_ov22_02255D44 *param0) { UnkStruct_02015958 v0; @@ -1308,14 +1305,14 @@ static void ov22_022571D4 (UnkStruct_ov22_02255D44 * param0) G2_SetBG3Priority(0); } -static void ov22_02257258 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02257258(UnkStruct_ov22_02255D44 *param0) { sub_02015A54(param0->unk_714); ov22_022574EC(param0); sub_02019EBC(param0->unk_00.unk_40, 3); } -static u32 ov22_02257278 (UnkStruct_ov22_02255D44 * param0) +static u32 ov22_02257278(UnkStruct_ov22_02255D44 *param0) { u32 v0; @@ -1336,10 +1333,10 @@ static u32 ov22_02257278 (UnkStruct_ov22_02255D44 * param0) return v0; } -static void ov22_022572A0 (UnkStruct_ov22_02255D44 * param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5) +static void ov22_022572A0(UnkStruct_ov22_02255D44 *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; int v2 = Options_Frame(param0->unk_738); sub_02002E98(0, 7 * 32, 14); @@ -1357,11 +1354,11 @@ static void ov22_022572A0 (UnkStruct_ov22_02255D44 * param0, u32 param1, u8 para sub_0201A954(param0->unk_718); } -static void ov22_02257368 (UnkStruct_ov22_02255D44 * param0, u32 param1) +static void ov22_02257368(UnkStruct_ov22_02255D44 *param0, u32 param1) { - MessageLoader * v0; - Strbuf* v1; - Strbuf* v2; + MessageLoader *v0; + Strbuf *v1; + Strbuf *v2; BGL_FillWindow(param0->unk_718, 15); @@ -1377,12 +1374,12 @@ static void ov22_02257368 (UnkStruct_ov22_02255D44 * param0, u32 param1) sub_0201A954(param0->unk_718); } -static u32 ov22_022573EC (UnkStruct_ov22_02255D44 * param0, u32 param1) +static u32 ov22_022573EC(UnkStruct_ov22_02255D44 *param0, u32 param1) { u32 v0; - MessageLoader * v1; + MessageLoader *v1; u32 v2; - Strbuf* v3; + Strbuf *v3; GF_ASSERT(param0->unk_740 == NULL); @@ -1409,55 +1406,55 @@ static u32 ov22_022573EC (UnkStruct_ov22_02255D44 * param0, u32 param1) return v0; } -static void ov22_02257498 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02257498(UnkStruct_ov22_02255D44 *param0) { Strbuf_Free(param0->unk_740); param0->unk_740 = NULL; } -static void ov22_022574B0 (UnkStruct_ov22_02255D44 * param0) +static void ov22_022574B0(UnkStruct_ov22_02255D44 *param0) { sub_0201ACF4(param0->unk_718); BGL_DeleteWindow(param0->unk_718); } -static void ov22_022574CC (UnkStruct_ov22_02255D44 * param0, u32 param1) +static void ov22_022574CC(UnkStruct_ov22_02255D44 *param0, u32 param1) { ov22_022572A0(param0, param1, 2, 1, 27, 2); } -static void ov22_022574E4 (UnkStruct_ov22_02255D44 * param0, u32 param1) +static void ov22_022574E4(UnkStruct_ov22_02255D44 *param0, u32 param1) { ov22_02257368(param0, param1); } -static void ov22_022574EC (UnkStruct_ov22_02255D44 * param0) +static void ov22_022574EC(UnkStruct_ov22_02255D44 *param0) { ov22_022574B0(param0); } -static void ov22_022574F4 (UnkStruct_ov22_02255D44 * param0, u32 param1) +static void ov22_022574F4(UnkStruct_ov22_02255D44 *param0, u32 param1) { ov22_022572A0(param0, param1, 2, 19, 27, 4); param0->unk_744 = StringTemplate_Default(13); } -static u32 ov22_0225751C (UnkStruct_ov22_02255D44 * param0, u32 param1) +static u32 ov22_0225751C(UnkStruct_ov22_02255D44 *param0, u32 param1) { return ov22_022573EC(param0, param1); } -static void ov22_02257524 (UnkStruct_ov22_02255D44 * param0, int param1, int param2) +static void ov22_02257524(UnkStruct_ov22_02255D44 *param0, int param1, int param2) { StringTemplate_SetNumber(param0->unk_744, param1, param2, 2, 0, 1); } -static void ov22_02257540 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02257540(UnkStruct_ov22_02255D44 *param0) { ov22_02257498(param0); } -static void ov22_02257548 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02257548(UnkStruct_ov22_02255D44 *param0) { ov22_022574B0(param0); @@ -1465,7 +1462,7 @@ static void ov22_02257548 (UnkStruct_ov22_02255D44 * param0) param0->unk_744 = NULL; } -static void ov22_02257564 (UnkStruct_ov22_02255D44 * param0) +static void ov22_02257564(UnkStruct_ov22_02255D44 *param0) { int v0; @@ -1473,7 +1470,7 @@ static void ov22_02257564 (UnkStruct_ov22_02255D44 * param0) ov22_0225A6B8(¶m0->unk_5C4, v0); } -static int ov22_02257580 (int param0) +static int ov22_02257580(int param0) { int v0; @@ -1498,7 +1495,7 @@ static int ov22_02257580 (int param0) return v0; } -static void ov22_022575B4 (UnkStruct_ov22_02255D44 * param0) +static void ov22_022575B4(UnkStruct_ov22_02255D44 *param0) { UnkStruct_02015958 v0; @@ -1520,7 +1517,7 @@ static void ov22_022575B4 (UnkStruct_ov22_02255D44 * param0) G2_SetBG3Priority(0); } -static u32 ov22_02257624 (UnkStruct_ov22_02255D44 * param0) +static u32 ov22_02257624(UnkStruct_ov22_02255D44 *param0) { u32 v0; @@ -1541,12 +1538,12 @@ static u32 ov22_02257624 (UnkStruct_ov22_02255D44 * param0) return v0; } -static void ov22_0225764C (UnkStruct_ov22_02256FD8 * param0) +static void ov22_0225764C(UnkStruct_ov22_02256FD8 *param0) { memset(param0, 0, sizeof(UnkStruct_ov22_02256FD8)); } -static void ov22_02257658 (UnkStruct_ov22_02256FD8 * param0, UnkStruct_ov22_02259560 * param1, u32 param2) +static void ov22_02257658(UnkStruct_ov22_02256FD8 *param0, UnkStruct_ov22_02259560 *param1, u32 param2) { GF_ASSERT(param1); param0->unk_00[param0->unk_A8].unk_00 = param1; @@ -1554,7 +1551,7 @@ static void ov22_02257658 (UnkStruct_ov22_02256FD8 * param0, UnkStruct_ov22_0225 param0->unk_A8++; } -static void ov22_0225768C (UnkStruct_ov22_02256FD8 * param0) +static void ov22_0225768C(UnkStruct_ov22_02256FD8 *param0) { int v0, v1; BOOL v2; @@ -1583,13 +1580,13 @@ static void ov22_0225768C (UnkStruct_ov22_02256FD8 * param0) } } -static UnkStruct_ov22_02259560 * ov22_022576E8 (UnkStruct_ov22_02256FD8 * param0, u32 param1) +static UnkStruct_ov22_02259560 *ov22_022576E8(UnkStruct_ov22_02256FD8 *param0, u32 param1) { GF_ASSERT(param1 < 21); return param0->unk_00[param1].unk_00; } -static BOOL ov22_022576FC (UnkStruct_ov22_02256FD8 * param0, u32 param1) +static BOOL ov22_022576FC(UnkStruct_ov22_02256FD8 *param0, u32 param1) { GF_ASSERT(param1 < 21); @@ -1600,7 +1597,7 @@ static BOOL ov22_022576FC (UnkStruct_ov22_02256FD8 * param0, u32 param1) return 0; } -static BOOL ov22_0225771C (UnkStruct_ov22_02256FD8_sub1 * param0, UnkStruct_ov22_02256FD8_sub1 * param1) +static BOOL ov22_0225771C(UnkStruct_ov22_02256FD8_sub1 *param0, UnkStruct_ov22_02256FD8_sub1 *param1) { int v0[6]; BOOL v1; @@ -1623,9 +1620,9 @@ static BOOL ov22_0225771C (UnkStruct_ov22_02256FD8_sub1 * param0, UnkStruct_ov22 return 0; } -static void ov22_02257778 (UnkStruct_ov22_02256FD8 * param0, UnkStruct_ov22_02259560 * param1, u32 param2) +static void ov22_02257778(UnkStruct_ov22_02256FD8 *param0, UnkStruct_ov22_02259560 *param1, u32 param2) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; v0 = param1->unk_08; @@ -1638,7 +1635,7 @@ static void ov22_02257778 (UnkStruct_ov22_02256FD8 * param0, UnkStruct_ov22_0225 } } -static void ov22_022577A0 (UnkStruct_ov22_02255D44 * param0) +static void ov22_022577A0(UnkStruct_ov22_02255D44 *param0) { int v0; int v1 = 0; @@ -1661,7 +1658,7 @@ static void ov22_022577A0 (UnkStruct_ov22_02255D44 * param0) } } -void ov22_022577EC (u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, int * param5, int * param6) +void ov22_022577EC(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, int *param5, int *param6) { u32 v0, v1; u32 v2, v3; diff --git a/src/overlay022/ov22_022578F4.c b/src/overlay022/ov22_022578F4.c index 7a0a31314b..feb0cf5277 100644 --- a/src/overlay022/ov22_022578F4.c +++ b/src/overlay022/ov22_022578F4.c @@ -1,11 +1,17 @@ +#include "overlay022/ov22_022578F4.h" + #include #include -#include "pokemon.h" - #include "struct_defs/archived_sprite.h" -#include "touch_screen.h" #include "struct_defs/struct_020298D8.h" + +#include "overlay022/ov22_02254DE0.h" +#include "overlay022/ov22_02255D44.h" +#include "overlay022/ov22_02259098.h" +#include "overlay022/ov22_02259484.h" +#include "overlay022/ov22_02259560.h" +#include "overlay022/ov22_022597BC.h" #include "overlay022/struct_ov22_0225500C.h" #include "overlay022/struct_ov22_02255040.h" #include "overlay022/struct_ov22_02257964.h" @@ -13,20 +19,15 @@ #include "overlay022/struct_ov22_022599A0.h" #include "overlay022/struct_ov22_0225B388.h" +#include "pokemon.h" +#include "touch_screen.h" #include "unk_0200762C.h" #include "unk_02015064.h" -#include "overlay022/ov22_02254DE0.h" -#include "overlay022/ov22_02255D44.h" -#include "overlay022/ov22_022578F4.h" -#include "overlay022/ov22_02259098.h" -#include "overlay022/ov22_02259484.h" -#include "overlay022/ov22_02259560.h" -#include "overlay022/ov22_022597BC.h" -static void ov22_02257DEC(UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * param1, BOOL param2, NNSG2dCharacterData ** param3); -static void ov22_02257EC8(UnkStruct_ov22_02259560 * param0, int * param1, int * param2); +static void ov22_02257DEC(UnkStruct_ov22_02257964 *param0, UnkStruct_ov22_02259560 *param1, BOOL param2, NNSG2dCharacterData **param3); +static void ov22_02257EC8(UnkStruct_ov22_02259560 *param0, int *param1, int *param2); -void ov22_022578F4 (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_0225B388 * param1) +void ov22_022578F4(UnkStruct_ov22_02257964 *param0, UnkStruct_ov22_0225B388 *param1) { param0->unk_2C.unk_00 = param1->unk_00; param0->unk_2C.unk_04 = param1->unk_04; @@ -45,56 +46,56 @@ void ov22_022578F4 (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_0225B388 * param0->unk_00.unk_28 = param1->unk_20; { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; v0 = ov22_022594C0(param0->unk_00.unk_00, ¶m0->unk_2C.unk_4C, 3); ov22_02259520(v0, ¶m0->unk_00.unk_14); } } -void ov22_02257948 (UnkStruct_ov22_02257964 * param0) +void ov22_02257948(UnkStruct_ov22_02257964 *param0) { ov22_022579F0(param0); ov22_02257A98(param0); memset(param0, 0, sizeof(UnkStruct_ov22_02257964)); } -void ov22_02257964 (UnkStruct_ov22_02257964 * param0, Pokemon * param1, ArchivedSprite * param2, int param3, int param4, int param5, int param6) +void ov22_02257964(UnkStruct_ov22_02257964 *param0, Pokemon *param1, ArchivedSprite *param2, int param3, int param4, int param5, int param6) { ov22_022590C0(¶m0->unk_2C.unk_4C, param0->unk_2C.unk_10, param1, param2, param6); ov22_022591D0(¶m0->unk_2C.unk_4C, param5); ov22_022591EC(¶m0->unk_2C.unk_4C, param3, param4); } -void ov22_02257998 (UnkStruct_ov22_02257964 * param0, Pokemon * param1, ArchivedSprite * param2, int param3) +void ov22_02257998(UnkStruct_ov22_02257964 *param0, Pokemon *param1, ArchivedSprite *param2, int param3) { ov22_022590C0(¶m0->unk_2C.unk_4C, param0->unk_2C.unk_10, param1, param2, param3); } -void ov22_022579B4 (UnkStruct_ov22_02257964 * param0, Pokemon * param1, ArchivedSprite * param2, int param3) +void ov22_022579B4(UnkStruct_ov22_02257964 *param0, Pokemon *param1, ArchivedSprite *param2, int param3) { ov22_022590D4(¶m0->unk_2C.unk_4C, param0->unk_2C.unk_10, param1, param2, param3, 1); } -void ov22_022579D8 (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * param1) +void ov22_022579D8(UnkStruct_ov22_02257964 *param0, UnkStruct_ov22_02259560 *param1) { ov22_02259520(param1, param0->unk_00.unk_14.unk_0C); } -void ov22_022579E8 (UnkStruct_ov22_02259560 * param0) +void ov22_022579E8(UnkStruct_ov22_02259560 *param0) { ov22_02259530(param0); } -void ov22_022579F0 (UnkStruct_ov22_02257964 * param0) +void ov22_022579F0(UnkStruct_ov22_02257964 *param0) { ov22_022591B8(¶m0->unk_2C.unk_4C); } -BOOL ov22_022579FC (UnkStruct_ov22_02257964 * param0, int param1, int param2, int param3, int param4) +BOOL ov22_022579FC(UnkStruct_ov22_02257964 *param0, int param1, int param2, int param3, int param4) { UnkStruct_ov22_0225500C v0; - UnkStruct_ov22_02255040 * v1; + UnkStruct_ov22_02255040 *v1; if (param0->unk_00.unk_24 < param0->unk_00.unk_28) { v0.unk_00 = param0->unk_2C.unk_18; @@ -110,7 +111,7 @@ BOOL ov22_022579FC (UnkStruct_ov22_02257964 * param0, int param1, int param2, in ov22_02254F6C(v1, param4); { - UnkStruct_ov22_02259560 * v2; + UnkStruct_ov22_02259560 *v2; v2 = ov22_022594C0(param0->unk_00.unk_00, v1, 0); ov22_02259520(v2, ¶m0->unk_00.unk_04); @@ -124,7 +125,7 @@ BOOL ov22_022579FC (UnkStruct_ov22_02257964 * param0, int param1, int param2, in return 0; } -BOOL ov22_02257A5C (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * param1, NNSG2dCharacterData ** param2) +BOOL ov22_02257A5C(UnkStruct_ov22_02257964 *param0, UnkStruct_ov22_02259560 *param1, NNSG2dCharacterData **param2) { if (param0->unk_00.unk_24 < param0->unk_00.unk_28) { ov22_02257DEC(param0, param1, 1, param2); @@ -136,7 +137,7 @@ BOOL ov22_02257A5C (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * return 0; } -void ov22_02257A80 (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * param1) +void ov22_02257A80(UnkStruct_ov22_02257964 *param0, UnkStruct_ov22_02259560 *param1) { ov22_02259530(param1); @@ -145,7 +146,7 @@ void ov22_02257A80 (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * GF_ASSERT(param0->unk_00.unk_24 >= 0); } -void ov22_02257A98 (UnkStruct_ov22_02257964 * param0) +void ov22_02257A98(UnkStruct_ov22_02257964 *param0) { ov22_02259540(¶m0->unk_00.unk_04); ov22_02259540(¶m0->unk_00.unk_14); @@ -153,18 +154,18 @@ void ov22_02257A98 (UnkStruct_ov22_02257964 * param0) param0->unk_00.unk_24 = 0; } -void ov22_02257AB0 (UnkStruct_ov22_02257964 * param0, int param1, int param2) +void ov22_02257AB0(UnkStruct_ov22_02257964 *param0, int param1, int param2) { ov22_022596EC(¶m0->unk_00.unk_04, param1, param2); ov22_022596EC(¶m0->unk_00.unk_14, param1, param2); } -void ov22_02257ACC (UnkStruct_ov22_02257964 * param0, int param1, int param2) +void ov22_02257ACC(UnkStruct_ov22_02257964 *param0, int param1, int param2) { ov22_022596EC(¶m0->unk_00.unk_14, param1, param2); } -void ov22_02257AD8 (UnkStruct_ov22_02257964 * param0, int param1, int param2, int param3, int param4) +void ov22_02257AD8(UnkStruct_ov22_02257964 *param0, int param1, int param2, int param3, int param4) { ov22_022596EC(¶m0->unk_00.unk_04, -param1, -param2); ov22_022596EC(¶m0->unk_00.unk_04, param3, param4); @@ -172,14 +173,14 @@ void ov22_02257AD8 (UnkStruct_ov22_02257964 * param0, int param1, int param2, in ov22_022596EC(¶m0->unk_00.unk_14, param3, param4); } -void ov22_02257B10 (UnkStruct_ov22_02257964 * param0) +void ov22_02257B10(UnkStruct_ov22_02257964 *param0) { ov22_02257B1C(param0, -1); } -void ov22_02257B1C (UnkStruct_ov22_02257964 * param0, int param1) +void ov22_02257B1C(UnkStruct_ov22_02257964 *param0, int param1) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; v0 = param0->unk_00.unk_14.unk_08; @@ -211,9 +212,9 @@ void ov22_02257B1C (UnkStruct_ov22_02257964 * param0, int param1) } } -void ov22_02257B74 (UnkStruct_ov22_02257964 * param0, int param1) +void ov22_02257B74(UnkStruct_ov22_02257964 *param0, int param1) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; int v1; v0 = param0->unk_00.unk_14.unk_08; @@ -245,7 +246,7 @@ void ov22_02257B74 (UnkStruct_ov22_02257964 * param0, int param1) } } -BOOL ov22_02257BE8 (UnkStruct_ov22_02257964 * param0) +BOOL ov22_02257BE8(UnkStruct_ov22_02257964 *param0) { TouchScreenHitTable v0; @@ -257,7 +258,7 @@ BOOL ov22_02257BE8 (UnkStruct_ov22_02257964 * param0) return TouchScreen_LocationHeld(&v0); } -BOOL ov22_02257C04 (UnkStruct_ov22_02257964 * param0, int param1, int param2) +BOOL ov22_02257C04(UnkStruct_ov22_02257964 *param0, int param1, int param2) { TouchScreenHitTable v0; @@ -269,9 +270,9 @@ BOOL ov22_02257C04 (UnkStruct_ov22_02257964 * param0, int param1, int param2) return sub_02022830(&v0, param1, param2); } -UnkStruct_ov22_02259560 * ov22_02257C20 (UnkStruct_ov22_02257964 * param0, int * param1, int * param2, NNSG2dCharacterData ** param3) +UnkStruct_ov22_02259560 *ov22_02257C20(UnkStruct_ov22_02257964 *param0, int *param1, int *param2, NNSG2dCharacterData **param3) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; BOOL v1; v0 = param0->unk_00.unk_14.unk_08; @@ -301,7 +302,7 @@ UnkStruct_ov22_02259560 * ov22_02257C20 (UnkStruct_ov22_02257964 * param0, int * return NULL; } -void ov22_02257C88 (UnkStruct_ov22_02257964 * param0, int param1, int param2) +void ov22_02257C88(UnkStruct_ov22_02257964 *param0, int param1, int param2) { UnkStruct_ov22_022599A0 v0; @@ -323,29 +324,29 @@ void ov22_02257C88 (UnkStruct_ov22_02257964 * param0, int param1, int param2) param0->unk_2C.unk_48 = param1; } -void ov22_02257CD4 (UnkStruct_ov22_02257964 * param0) +void ov22_02257CD4(UnkStruct_ov22_02257964 *param0) { ov22_02259804(¶m0->unk_2C.unk_1C); } -void ov22_02257CE0 (UnkStruct_ov22_02257964 * param0, int * param1, int * param2) +void ov22_02257CE0(UnkStruct_ov22_02257964 *param0, int *param1, int *param2) { *param1 = sub_020080C0(param0->unk_2C.unk_4C.unk_00, 0); *param2 = sub_020080C0(param0->unk_2C.unk_4C.unk_00, 1); } -int ov22_02257D00 (UnkStruct_ov22_02257964 * param0) +int ov22_02257D00(UnkStruct_ov22_02257964 *param0) { return param0->unk_00.unk_24; } -void ov22_02257D04 (UnkStruct_ov22_02257964 * param0, int * param1, int * param2) +void ov22_02257D04(UnkStruct_ov22_02257964 *param0, int *param1, int *param2) { int v0; int v1; int v2; int v3; - UnkStruct_ov22_02259560 * v4; + UnkStruct_ov22_02259560 *v4; v4 = param0->unk_00.unk_14.unk_08; v0 = 0; @@ -369,19 +370,19 @@ void ov22_02257D04 (UnkStruct_ov22_02257964 * param0, int * param1, int * param2 *param2 = v1; } -void ov22_02257D70 (UnkStruct_ov22_02257964 * param0, GXRgb param1) +void ov22_02257D70(UnkStruct_ov22_02257964 *param0, GXRgb param1) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; v0 = param0->unk_00.unk_14.unk_08; while (v0 != ¶m0->unk_00.unk_14) { if (v0->unk_04 == 0) { - UnkStruct_ov22_02255040 * v1 = v0->unk_00; + UnkStruct_ov22_02255040 *v1 = v0->unk_00; sub_0201529C(v1->unk_04, param1); } else { - UnkStruct_020298D8 * v2 = v0->unk_00; + UnkStruct_020298D8 *v2 = v0->unk_00; sub_02007DEC(v2->unk_00, 24, (param1 >> 10) & 0x1f); sub_02007DEC(v2->unk_00, 25, (param1 >> 5) & 0x1f); @@ -394,14 +395,14 @@ void ov22_02257D70 (UnkStruct_ov22_02257964 * param0, GXRgb param1) v0 = param0->unk_00.unk_04.unk_08; while (v0 != ¶m0->unk_00.unk_04) { - UnkStruct_ov22_02255040 * v3 = v0->unk_00; + UnkStruct_ov22_02255040 *v3 = v0->unk_00; sub_0201529C(v3->unk_04, param1); v0 = v0->unk_08; } } -static void ov22_02257DEC (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_02259560 * param1, BOOL param2, NNSG2dCharacterData ** param3) +static void ov22_02257DEC(UnkStruct_ov22_02257964 *param0, UnkStruct_ov22_02259560 *param1, BOOL param2, NNSG2dCharacterData **param3) { int v0; int v1; @@ -416,7 +417,7 @@ static void ov22_02257DEC (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_0225 int v10; int v11, v12; BOOL v13; - NNSG2dCharacterData * v14; + NNSG2dCharacterData *v14; int v15, v16; ov22_02259648(param1, &v1, &v2); @@ -427,7 +428,7 @@ static void ov22_02257DEC (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_0225 v8 = v2 + v4 - v16; v9 = v1 + v5; v10 = v1 + v3 - v15; - v14 = param3[((100 + 18))]; + v14 = param3[(100 + 18)]; v13 = 0; @@ -451,7 +452,7 @@ static void ov22_02257DEC (UnkStruct_ov22_02257964 * param0, UnkStruct_ov22_0225 } } -static void ov22_02257EC8 (UnkStruct_ov22_02259560 * param0, int * param1, int * param2) +static void ov22_02257EC8(UnkStruct_ov22_02259560 *param0, int *param1, int *param2) { int v0, v1; int v2, v3; diff --git a/src/overlay022/ov22_02257F50.c b/src/overlay022/ov22_02257F50.c index dfb5d70974..06fc07eddf 100644 --- a/src/overlay022/ov22_02257F50.c +++ b/src/overlay022/ov22_02257F50.c @@ -1,7 +1,13 @@ +#include "overlay022/ov22_02257F50.h" + #include #include -#include "touch_screen.h" +#include "overlay022/ov22_02254DE0.h" +#include "overlay022/ov22_0225894C.h" +#include "overlay022/ov22_02259484.h" +#include "overlay022/ov22_02259560.h" +#include "overlay022/ov22_022597BC.h" #include "overlay022/struct_ov22_0225500C.h" #include "overlay022/struct_ov22_02255040.h" #include "overlay022/struct_ov22_02257F50.h" @@ -11,25 +17,20 @@ #include "overlay022/struct_ov22_02259560.h" #include "overlay022/struct_ov22_022599A0.h" -#include "unk_0200679C.h" #include "heap.h" #include "sys_task_manager.h" +#include "touch_screen.h" +#include "unk_0200679C.h" #include "unk_0201D15C.h" -#include "overlay022/ov22_02254DE0.h" -#include "overlay022/ov22_02257F50.h" -#include "overlay022/ov22_0225894C.h" -#include "overlay022/ov22_02259484.h" -#include "overlay022/ov22_02259560.h" -#include "overlay022/ov22_022597BC.h" typedef struct { - UnkStruct_ov22_02259560 * unk_00; + UnkStruct_ov22_02259560 *unk_00; int unk_04; int unk_08; } UnkStruct_ov22_0225886C; typedef struct { - UnkStruct_ov22_02257F50 * unk_00; + UnkStruct_ov22_02257F50 *unk_00; int unk_04; int unk_08; int unk_0C; @@ -39,30 +40,30 @@ typedef struct { int unk_1C; int unk_20; int unk_24; - UnkStruct_ov22_0225886C * unk_28; + UnkStruct_ov22_0225886C *unk_28; int unk_2C; } UnkStruct_ov22_022586C4; -static void ov22_02258470(UnkStruct_ov22_02257F50 * param0, UnkStruct_ov22_02258470 * param1); -static void ov22_022584AC(UnkStruct_ov22_02259560 * param0, int param1); -static void ov22_022584F0(UnkStruct_ov22_02257F50_sub1_sub1 * param0, int param1); -static void ov22_02258534(UnkStruct_ov22_02257F50_sub1_sub1 * param0); -static UnkStruct_ov22_02259560 * ov22_0225855C(UnkStruct_ov22_02257F50 * param0); -static UnkStruct_ov22_02259560 * ov22_02258584(UnkStruct_ov22_02257F50 * param0, int param1, int param2); -static int ov22_022585A8(UnkStruct_ov22_02257F50 * param0, int param1, int param2); -static UnkStruct_ov22_02259560 * ov22_022585C4(UnkStruct_ov22_02257F50 * param0, int param1, int param2, int param3); -static void ov22_022584E0(UnkStruct_ov22_02257F50 * param0, int param1); -static void ov22_022585E8(UnkStruct_ov22_02257F50 * param0, UnkStruct_ov22_02255040 * param1, int param2, int param3); -static void ov22_02258610(int param0, int * param1, int * param2); -static void ov22_0225864C(UnkStruct_ov22_02257F50 * param0, int param1, int param2, int param3, int param4); -static void ov22_022586C4(SysTask * param0, void * param1); -static void ov22_0225882C(UnkStruct_ov22_02259560 * param0, UnkStruct_ov22_0225886C * param1, int param2); -static UnkStruct_ov22_0225886C * ov22_02258844(UnkStruct_ov22_0225886C * param0, int param1); -static void ov22_0225886C(UnkStruct_ov22_0225886C * param0, int param1); -static void ov22_02258890(UnkStruct_ov22_0225886C * param0); +static void ov22_02258470(UnkStruct_ov22_02257F50 *param0, UnkStruct_ov22_02258470 *param1); +static void ov22_022584AC(UnkStruct_ov22_02259560 *param0, int param1); +static void ov22_022584F0(UnkStruct_ov22_02257F50_sub1_sub1 *param0, int param1); +static void ov22_02258534(UnkStruct_ov22_02257F50_sub1_sub1 *param0); +static UnkStruct_ov22_02259560 *ov22_0225855C(UnkStruct_ov22_02257F50 *param0); +static UnkStruct_ov22_02259560 *ov22_02258584(UnkStruct_ov22_02257F50 *param0, int param1, int param2); +static int ov22_022585A8(UnkStruct_ov22_02257F50 *param0, int param1, int param2); +static UnkStruct_ov22_02259560 *ov22_022585C4(UnkStruct_ov22_02257F50 *param0, int param1, int param2, int param3); +static void ov22_022584E0(UnkStruct_ov22_02257F50 *param0, int param1); +static void ov22_022585E8(UnkStruct_ov22_02257F50 *param0, UnkStruct_ov22_02255040 *param1, int param2, int param3); +static void ov22_02258610(int param0, int *param1, int *param2); +static void ov22_0225864C(UnkStruct_ov22_02257F50 *param0, int param1, int param2, int param3, int param4); +static void ov22_022586C4(SysTask *param0, void *param1); +static void ov22_0225882C(UnkStruct_ov22_02259560 *param0, UnkStruct_ov22_0225886C *param1, int param2); +static UnkStruct_ov22_0225886C *ov22_02258844(UnkStruct_ov22_0225886C *param0, int param1); +static void ov22_0225886C(UnkStruct_ov22_0225886C *param0, int param1); +static void ov22_02258890(UnkStruct_ov22_0225886C *param0); static int ov22_022588D8(int param0, int param1); -void ov22_02257F50 (UnkStruct_ov22_02257F50 * param0, UnkStruct_ov22_02258470 * param1) +void ov22_02257F50(UnkStruct_ov22_02257F50 *param0, UnkStruct_ov22_02258470 *param1) { param0->unk_44.unk_00 = param1->unk_00; param0->unk_44.unk_04 = param1->unk_04; @@ -77,7 +78,7 @@ void ov22_02257F50 (UnkStruct_ov22_02257F50 * param0, UnkStruct_ov22_02258470 * ov22_02258470(param0, param1); } -void ov22_02257F88 (UnkStruct_ov22_02257F50 * param0) +void ov22_02257F88(UnkStruct_ov22_02257F50 *param0) { int v0; @@ -90,7 +91,7 @@ void ov22_02257F88 (UnkStruct_ov22_02257F50 * param0) memset(param0, 0, sizeof(UnkStruct_ov22_02257F50)); } -int ov22_02257FB0 (int param0, int param1, UnkStruct_ov22_0225899C * param2) +int ov22_02257FB0(int param0, int param1, UnkStruct_ov22_0225899C *param2) { int v0; @@ -139,7 +140,7 @@ int ov22_02257FB0 (int param0, int param1, UnkStruct_ov22_0225899C * param2) return v0; } -void ov22_0225804C (int param0, int param1, int * param2, int * param3, int param4, int param5, UnkStruct_ov22_0225899C * param6) +void ov22_0225804C(int param0, int param1, int *param2, int *param3, int param4, int param5, UnkStruct_ov22_0225899C *param6) { switch (param0) { case 0: @@ -156,11 +157,11 @@ void ov22_0225804C (int param0, int param1, int * param2, int * param3, int para } } -void ov22_022580A4 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) +void ov22_022580A4(UnkStruct_ov22_02257F50 *param0, int param1, int param2) { UnkStruct_ov22_0225500C v0; - UnkStruct_ov22_02255040 * v1; - UnkStruct_ov22_02259560 * v2; + UnkStruct_ov22_02255040 *v1; + UnkStruct_ov22_02259560 *v2; int v3; int v4, v5; int v6, v7; @@ -210,18 +211,18 @@ void ov22_022580A4 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) ov22_022585E8(param0, v1, param1, v3); } -void ov22_0225818C (UnkStruct_ov22_02257F50 * param0, int param1, int param2, UnkStruct_ov22_02259560 * param3) +void ov22_0225818C(UnkStruct_ov22_02257F50 *param0, int param1, int param2, UnkStruct_ov22_02259560 *param3) { ov22_02259520(param3, param0->unk_00.unk_0C[param1].unk_00 + param2); ov22_022585E8(param0, param3->unk_00, param1, param2); } -void ov22_022581B8 (UnkStruct_ov22_02259560 * param0) +void ov22_022581B8(UnkStruct_ov22_02259560 *param0) { ov22_02259530(param0); } -void ov22_022581C0 (UnkStruct_ov22_02257F50 * param0) +void ov22_022581C0(UnkStruct_ov22_02257F50 *param0) { int v0, v1; @@ -232,10 +233,10 @@ void ov22_022581C0 (UnkStruct_ov22_02257F50 * param0) } } -void ov22_022581EC (UnkStruct_ov22_02257F50 * param0) +void ov22_022581EC(UnkStruct_ov22_02257F50 *param0) { - UnkStruct_ov22_02259560 * v0; - UnkStruct_ov22_02259560 * v1; + UnkStruct_ov22_02259560 *v0; + UnkStruct_ov22_02259560 *v1; BOOL v2; int v3 = -1; @@ -253,7 +254,7 @@ void ov22_022581EC (UnkStruct_ov22_02257F50 * param0) } } -BOOL ov22_02258218 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) +BOOL ov22_02258218(UnkStruct_ov22_02257F50 *param0, int param1, int param2) { if (param0->unk_00.unk_3C == 0) { ov22_0225864C(param0, param0->unk_00.unk_00, param0->unk_00.unk_0C[param0->unk_00.unk_00].unk_08, param1, param2); @@ -269,9 +270,9 @@ BOOL ov22_02258218 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) return 0; } -BOOL ov22_02258258 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) +BOOL ov22_02258258(UnkStruct_ov22_02257F50 *param0, int param1, int param2) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; int v1; int v2; int v3; @@ -302,7 +303,7 @@ BOOL ov22_02258258 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) return 0; } -void ov22_022582C0 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) +void ov22_022582C0(UnkStruct_ov22_02257F50 *param0, int param1, int param2) { ov22_022584E0(param0, 0); @@ -313,7 +314,7 @@ void ov22_022582C0 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) ov22_022581EC(param0); } -BOOL ov22_022582E8 (UnkStruct_ov22_02257F50 * param0) +BOOL ov22_022582E8(UnkStruct_ov22_02257F50 *param0) { TouchScreenHitTable v0; @@ -325,7 +326,7 @@ BOOL ov22_022582E8 (UnkStruct_ov22_02257F50 * param0) return TouchScreen_LocationHeld(&v0); } -BOOL ov22_02258304 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) +BOOL ov22_02258304(UnkStruct_ov22_02257F50 *param0, int param1, int param2) { TouchScreenHitTable v0; @@ -337,10 +338,10 @@ BOOL ov22_02258304 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) return sub_02022830(&v0, param1, param2); } -UnkStruct_ov22_02259560 * ov22_02258320 (UnkStruct_ov22_02257F50 * param0, int * param1, int * param2, NNSG2dCharacterData ** param3) +UnkStruct_ov22_02259560 *ov22_02258320(UnkStruct_ov22_02257F50 *param0, int *param1, int *param2, NNSG2dCharacterData **param3) { - UnkStruct_ov22_02259560 * v0; - UnkStruct_ov22_02259560 * v1; + UnkStruct_ov22_02259560 *v0; + UnkStruct_ov22_02259560 *v1; BOOL v2; v1 = ov22_0225855C(param0); @@ -361,7 +362,7 @@ UnkStruct_ov22_02259560 * ov22_02258320 (UnkStruct_ov22_02257F50 * param0, int * return NULL; } -void ov22_02258354 (UnkStruct_ov22_02257F50 * param0, int param1) +void ov22_02258354(UnkStruct_ov22_02257F50 *param0, int param1) { UnkStruct_ov22_022599A0 v0; @@ -383,7 +384,7 @@ void ov22_02258354 (UnkStruct_ov22_02257F50 * param0, int param1) param0->unk_00.unk_40 = param1; } -void ov22_022583A0 (UnkStruct_ov22_02257F50 * param0, int param1, int param2, int param3, BOOL * param4) +void ov22_022583A0(UnkStruct_ov22_02257F50 *param0, int param1, int param2, int param3, BOOL *param4) { UnkStruct_ov22_022599A0 v0; int v1, v2; @@ -418,18 +419,18 @@ void ov22_022583A0 (UnkStruct_ov22_02257F50 * param0, int param1, int param2, in param0->unk_00.unk_40 = param1; } -void ov22_02258408 (UnkStruct_ov22_02257F50 * param0) +void ov22_02258408(UnkStruct_ov22_02257F50 *param0) { ov22_02259804(¶m0->unk_44.unk_18); } -int ov22_02258414 (UnkStruct_ov22_02257F50 * param0) +int ov22_02258414(UnkStruct_ov22_02257F50 *param0) { GF_ASSERT(param0); return param0->unk_00.unk_00; } -int ov22_02258424 (UnkStruct_ov22_02257F50 * param0, int param1) +int ov22_02258424(UnkStruct_ov22_02257F50 *param0, int param1) { UnkStruct_ov22_02257F50_sub1_sub1 v0; @@ -439,15 +440,15 @@ int ov22_02258424 (UnkStruct_ov22_02257F50 * param0, int param1) return v0.unk_08; } -void ov22_0225844C (UnkStruct_ov22_02257F50 * param0, int param1, int param2, int param3, int param4) +void ov22_0225844C(UnkStruct_ov22_02257F50 *param0, int param1, int param2, int param3, int param4) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; v0 = ov22_02258584(param0, param1, param2); ov22_022596EC(v0, param3, param4); } -BOOL ov22_02258460 (UnkStruct_ov22_02257F50 * param0) +BOOL ov22_02258460(UnkStruct_ov22_02257F50 *param0) { if (param0->unk_00.unk_3C == 0) { return 1; @@ -456,7 +457,7 @@ BOOL ov22_02258460 (UnkStruct_ov22_02257F50 * param0) return 0; } -static void ov22_02258470 (UnkStruct_ov22_02257F50 * param0, UnkStruct_ov22_02258470 * param1) +static void ov22_02258470(UnkStruct_ov22_02257F50 *param0, UnkStruct_ov22_02258470 *param1) { ov22_022584F0(¶m0->unk_00.unk_0C[0], param1->unk_1C); @@ -468,9 +469,9 @@ static void ov22_02258470 (UnkStruct_ov22_02257F50 * param0, UnkStruct_ov22_0225 ov22_022584F0(¶m0->unk_00.unk_0C[3], 1); } -static void ov22_022584AC (UnkStruct_ov22_02259560 * param0, int param1) +static void ov22_022584AC(UnkStruct_ov22_02259560 *param0, int param1) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; v0 = param0->unk_08; @@ -483,23 +484,23 @@ static void ov22_022584AC (UnkStruct_ov22_02259560 * param0, int param1) } } -static void ov22_022584D0 (UnkStruct_ov22_02257F50 * param0, int param1, int param2, int param3) +static void ov22_022584D0(UnkStruct_ov22_02257F50 *param0, int param1, int param2, int param3) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; v0 = ov22_02258584(param0, param1, param2); ov22_022584AC(v0, param3); } -static void ov22_022584E0 (UnkStruct_ov22_02257F50 * param0, int param1) +static void ov22_022584E0(UnkStruct_ov22_02257F50 *param0, int param1) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; v0 = ov22_0225855C(param0); ov22_022584AC(v0, param1); } -static void ov22_022584F0 (UnkStruct_ov22_02257F50_sub1_sub1 * param0, int param1) +static void ov22_022584F0(UnkStruct_ov22_02257F50_sub1_sub1 *param0, int param1) { int v0; @@ -515,14 +516,14 @@ static void ov22_022584F0 (UnkStruct_ov22_02257F50_sub1_sub1 * param0, int param } } -static void ov22_02258534 (UnkStruct_ov22_02257F50_sub1_sub1 * param0) +static void ov22_02258534(UnkStruct_ov22_02257F50_sub1_sub1 *param0) { Heap_FreeToHeap(param0->unk_00); param0->unk_00 = NULL; memset(param0, 0, sizeof(UnkStruct_ov22_02257F50_sub1_sub1)); } -static UnkStruct_ov22_02259560 * ov22_0225855C (UnkStruct_ov22_02257F50 * param0) +static UnkStruct_ov22_02259560 *ov22_0225855C(UnkStruct_ov22_02257F50 *param0) { UnkStruct_ov22_02257F50_sub1_sub1 v0; @@ -530,7 +531,7 @@ static UnkStruct_ov22_02259560 * ov22_0225855C (UnkStruct_ov22_02257F50 * param0 return &v0.unk_00[v0.unk_08]; } -static UnkStruct_ov22_02259560 * ov22_02258584 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) +static UnkStruct_ov22_02259560 *ov22_02258584(UnkStruct_ov22_02257F50 *param0, int param1, int param2) { UnkStruct_ov22_02257F50_sub1_sub1 v0; @@ -538,10 +539,10 @@ static UnkStruct_ov22_02259560 * ov22_02258584 (UnkStruct_ov22_02257F50 * param0 return &v0.unk_00[param2]; } -static int ov22_022585A8 (UnkStruct_ov22_02257F50 * param0, int param1, int param2) +static int ov22_022585A8(UnkStruct_ov22_02257F50 *param0, int param1, int param2) { - UnkStruct_ov22_02259560 * v0; - UnkStruct_ov22_02259560 * v1; + UnkStruct_ov22_02259560 *v0; + UnkStruct_ov22_02259560 *v1; int v2 = 0; v0 = ov22_02258584(param0, param1, param2); @@ -555,10 +556,10 @@ static int ov22_022585A8 (UnkStruct_ov22_02257F50 * param0, int param1, int para return v2; } -static UnkStruct_ov22_02259560 * ov22_022585C4 (UnkStruct_ov22_02257F50 * param0, int param1, int param2, int param3) +static UnkStruct_ov22_02259560 *ov22_022585C4(UnkStruct_ov22_02257F50 *param0, int param1, int param2, int param3) { - UnkStruct_ov22_02259560 * v0; - UnkStruct_ov22_02259560 * v1; + UnkStruct_ov22_02259560 *v0; + UnkStruct_ov22_02259560 *v1; int v2 = 0; v0 = ov22_02258584(param0, param1, param2); @@ -576,7 +577,7 @@ static UnkStruct_ov22_02259560 * ov22_022585C4 (UnkStruct_ov22_02257F50 * param0 return NULL; } -static void ov22_022585E8 (UnkStruct_ov22_02257F50 * param0, UnkStruct_ov22_02255040 * param1, int param2, int param3) +static void ov22_022585E8(UnkStruct_ov22_02257F50 *param0, UnkStruct_ov22_02255040 *param1, int param2, int param3) { if ((param0->unk_00.unk_00 != param2) || (param0->unk_00.unk_0C[param2].unk_08 != param3)) { ov22_02254F60(param1, 0); @@ -585,7 +586,7 @@ static void ov22_022585E8 (UnkStruct_ov22_02257F50 * param0, UnkStruct_ov22_0225 } } -static void ov22_02258610 (int param0, int * param1, int * param2) +static void ov22_02258610(int param0, int *param1, int *param2) { int v0; int v1; @@ -603,10 +604,10 @@ static void ov22_02258610 (int param0, int * param1, int * param2) *param1 += 8; } -static void ov22_0225864C (UnkStruct_ov22_02257F50 * param0, int param1, int param2, int param3, int param4) +static void ov22_0225864C(UnkStruct_ov22_02257F50 *param0, int param1, int param2, int param3, int param4) { - SysTask * v0; - UnkStruct_ov22_022586C4 * v1; + SysTask *v0; + UnkStruct_ov22_022586C4 *v1; v0 = SysTask_StartAndAllocateParam(ov22_022586C4, sizeof(UnkStruct_ov22_022586C4), 0, 13); v1 = SysTask_GetParam(v0); @@ -628,9 +629,9 @@ static void ov22_0225864C (UnkStruct_ov22_02257F50 * param0, int param1, int par param0->unk_00.unk_3C = 1; } -static void ov22_022586C4 (SysTask * param0, void * param1) +static void ov22_022586C4(SysTask *param0, void *param1) { - UnkStruct_ov22_022586C4 * v0 = param1; + UnkStruct_ov22_022586C4 *v0 = param1; int v1; int v2; @@ -649,7 +650,7 @@ static void ov22_022586C4 (SysTask * param0, void * param1) case 1: for (v1 = 0; v1 < v0->unk_18; v1++) { if ((v0->unk_20 - 1) >= 0) { - UnkStruct_ov22_02259560 * v3; + UnkStruct_ov22_02259560 *v3; v0->unk_20--; v3 = ov22_022585C4(v0->unk_00, v0->unk_04, v0->unk_08, v0->unk_20); @@ -665,7 +666,7 @@ static void ov22_022586C4 (SysTask * param0, void * param1) case 2: for (v1 = 0; v1 < v0->unk_18; v1++) { if ((v0->unk_24 - 1) >= 0) { - UnkStruct_ov22_02259560 * v4; + UnkStruct_ov22_02259560 *v4; v0->unk_24--; v4 = ov22_022585C4(v0->unk_00, v0->unk_0C, v0->unk_10, v0->unk_24); @@ -706,9 +707,9 @@ static void ov22_022586C4 (SysTask * param0, void * param1) ov22_0225886C(v0->unk_28, v0->unk_2C); } -static void ov22_0225882C (UnkStruct_ov22_02259560 * param0, UnkStruct_ov22_0225886C * param1, int param2) +static void ov22_0225882C(UnkStruct_ov22_02259560 *param0, UnkStruct_ov22_0225886C *param1, int param2) { - UnkStruct_ov22_0225886C * v0; + UnkStruct_ov22_0225886C *v0; v0 = ov22_02258844(param1, param2); @@ -717,7 +718,7 @@ static void ov22_0225882C (UnkStruct_ov22_02259560 * param0, UnkStruct_ov22_0225 v0->unk_08 = (132 / 3); } -static UnkStruct_ov22_0225886C * ov22_02258844 (UnkStruct_ov22_0225886C * param0, int param1) +static UnkStruct_ov22_0225886C *ov22_02258844(UnkStruct_ov22_0225886C *param0, int param1) { int v0; @@ -730,7 +731,7 @@ static UnkStruct_ov22_0225886C * ov22_02258844 (UnkStruct_ov22_0225886C * param0 return NULL; } -static void ov22_0225886C (UnkStruct_ov22_0225886C * param0, int param1) +static void ov22_0225886C(UnkStruct_ov22_0225886C *param0, int param1) { int v0; @@ -741,7 +742,7 @@ static void ov22_0225886C (UnkStruct_ov22_0225886C * param0, int param1) } } -static void ov22_02258890 (UnkStruct_ov22_0225886C * param0) +static void ov22_02258890(UnkStruct_ov22_0225886C *param0) { int v0, v1; @@ -756,7 +757,7 @@ static void ov22_02258890 (UnkStruct_ov22_0225886C * param0) } } -static int ov22_022588D8 (int param0, int param1) +static int ov22_022588D8(int param0, int param1) { param0 += param1 - (param0 % param1); return param0 / param1; diff --git a/src/overlay022/ov22_022588F0.c b/src/overlay022/ov22_022588F0.c index e76bf4e76b..d38f5ef818 100644 --- a/src/overlay022/ov22_022588F0.c +++ b/src/overlay022/ov22_022588F0.c @@ -1,15 +1,15 @@ +#include "overlay022/ov22_022588F0.h" + #include #include -#include "core_sys.h" - #include "overlay022/struct_ov22_02258A48.h" -#include "overlay022/ov22_022588F0.h" +#include "core_sys.h" -static void ov22_02258948(UnkStruct_ov22_02258A48 * param0); +static void ov22_02258948(UnkStruct_ov22_02258A48 *param0); -void ov22_022588F0 (UnkStruct_ov22_02258A48 * param0) +void ov22_022588F0(UnkStruct_ov22_02258A48 *param0) { memset(param0, 0, sizeof(UnkStruct_ov22_02258A48)); @@ -18,7 +18,7 @@ void ov22_022588F0 (UnkStruct_ov22_02258A48 * param0) param0->unk_0C = ov22_02258948; } -void ov22_0225890C (UnkStruct_ov22_02258A48 * param0) +void ov22_0225890C(UnkStruct_ov22_02258A48 *param0) { if (gCoreSys.touchPressed) { param0->unk_04(param0); @@ -37,7 +37,7 @@ void ov22_0225890C (UnkStruct_ov22_02258A48 * param0) param0->unk_18 = gCoreSys.touchHeld; } -static void ov22_02258948 (UnkStruct_ov22_02258A48 * param0) +static void ov22_02258948(UnkStruct_ov22_02258A48 *param0) { return; } diff --git a/src/overlay022/ov22_0225894C.c b/src/overlay022/ov22_0225894C.c index 910a753666..7752953972 100644 --- a/src/overlay022/ov22_0225894C.c +++ b/src/overlay022/ov22_0225894C.c @@ -1,3 +1,5 @@ +#include "overlay022/ov22_0225894C.h" + #include #include @@ -6,9 +8,8 @@ #include "overlay022/struct_ov22_0225899C.h" #include "unk_020298BC.h" -#include "overlay022/ov22_0225894C.h" -void ov22_0225894C (const UnkStruct_02029D04 * param0, UnkStruct_ov22_0225899C * param1) +void ov22_0225894C(const UnkStruct_02029D04 *param0, UnkStruct_ov22_0225899C *param1) { int v0; u32 v1; @@ -30,18 +31,18 @@ void ov22_0225894C (const UnkStruct_02029D04 * param0, UnkStruct_ov22_0225899C * } } -u32 ov22_0225899C (const UnkStruct_ov22_0225899C * param0, u32 param1) +u32 ov22_0225899C(const UnkStruct_ov22_0225899C *param0, u32 param1) { GF_ASSERT(param1 < 100); return param0->unk_00[param1]; } -u32 ov22_022589B0 (const UnkStruct_ov22_0225899C * param0, u32 param1) +u32 ov22_022589B0(const UnkStruct_ov22_0225899C *param0, u32 param1) { return param0->unk_190[param1]; } -u32 ov22_022589BC (const UnkStruct_ov22_0225899C * param0, u32 param1) +u32 ov22_022589BC(const UnkStruct_ov22_0225899C *param0, u32 param1) { int v0; diff --git a/src/overlay022/ov22_022589E0.c b/src/overlay022/ov22_022589E0.c index 735b635c4a..d10ef0d417 100644 --- a/src/overlay022/ov22_022589E0.c +++ b/src/overlay022/ov22_022589E0.c @@ -1,8 +1,15 @@ +#include "overlay022/ov22_022589E0.h" + #include #include -#include "core_sys.h" - +#include "overlay022/ov22_02255094.h" +#include "overlay022/ov22_022578F4.h" +#include "overlay022/ov22_02257F50.h" +#include "overlay022/ov22_022588F0.h" +#include "overlay022/ov22_02259098.h" +#include "overlay022/ov22_02259560.h" +#include "overlay022/ov22_0225A428.h" #include "overlay022/struct_ov22_02255040.h" #include "overlay022/struct_ov22_02257964.h" #include "overlay022/struct_ov22_02257F50.h" @@ -11,26 +18,19 @@ #include "overlay022/struct_ov22_0225A0E4.h" #include "overlay022/struct_ov22_0225A428.h" -#include "unk_02005474.h" -#include "unk_0200679C.h" +#include "core_sys.h" #include "heap.h" #include "sys_task_manager.h" +#include "unk_02005474.h" +#include "unk_0200679C.h" #include "unk_0201D15C.h" -#include "overlay022/ov22_02255094.h" -#include "overlay022/ov22_022578F4.h" -#include "overlay022/ov22_02257F50.h" -#include "overlay022/ov22_022588F0.h" -#include "overlay022/ov22_022589E0.h" -#include "overlay022/ov22_02259098.h" -#include "overlay022/ov22_02259560.h" -#include "overlay022/ov22_0225A428.h" typedef struct { - UnkStruct_ov22_0225A0E4 * unk_00; - UnkStruct_ov22_02257964 * unk_04; - UnkStruct_ov22_02257F50 * unk_08; - UnkStruct_ov22_0225A428 * unk_0C; - UnkStruct_ov22_02259560 * unk_10; + UnkStruct_ov22_0225A0E4 *unk_00; + UnkStruct_ov22_02257964 *unk_04; + UnkStruct_ov22_02257F50 *unk_08; + UnkStruct_ov22_0225A428 *unk_0C; + UnkStruct_ov22_02259560 *unk_10; int unk_14; int unk_18; s16 unk_1C; @@ -44,8 +44,8 @@ typedef struct { } UnkStruct_ov22_02258EE4; typedef struct { - UnkStruct_ov22_02257F50 * unk_00; - UnkStruct_ov22_02259560 * unk_04; + UnkStruct_ov22_02257F50 *unk_00; + UnkStruct_ov22_02259560 *unk_04; int unk_08; int unk_0C; int unk_10; @@ -53,30 +53,30 @@ typedef struct { int unk_18; int unk_1C; int unk_20; - int * unk_24; - u32 * unk_28; + int *unk_24; + u32 *unk_28; } UnkStruct_ov22_02258FC0; -static void ov22_02258A48(UnkStruct_ov22_02258A48 * param0); -static void ov22_02258BB8(UnkStruct_ov22_02258A48 * param0); -static void ov22_02258D4C(UnkStruct_ov22_02258A48 * param0); -static void ov22_02258E88(UnkStruct_ov22_02258EE4 * param0, UnkStruct_ov22_02259560 * param1, int param2, int param3, int param4, int param5); -static void ov22_02258EE4(UnkStruct_ov22_02258EE4 * param0); -static void ov22_02259040(UnkStruct_ov22_02258EE4 * param0); -static void ov22_02258D7C(UnkStruct_ov22_02258A48 * param0); -static void ov22_02258DAC(UnkStruct_ov22_02258A48 * param0); -static void ov22_02258EF8(UnkStruct_ov22_02258A48 * param0, int * param1, int * param2, int * param3, int * param4); -static void ov22_02258F38(UnkStruct_ov22_02258A48 * param0, int * param1, int * param2, int * param3, int * param4); -static void ov22_02259074(UnkStruct_ov22_02258A48 * param0, int param1, int param2); -static void ov22_02258B78(UnkStruct_ov22_02258A48 * param0); -static void ov22_02258B74(UnkStruct_ov22_02258A48 * param0); -static void ov22_02258E5C(UnkStruct_ov22_02258A48 * param0); -static void ov22_02258F4C(UnkStruct_ov22_02258EE4 * param0, int param1, int param2, int param3, int param4, int param5); -static void ov22_02258FC0(SysTask * param0, void * param1); - -void ov22_022589E0 (UnkStruct_ov22_02258A48 * param0, UnkStruct_ov22_02257964 * param1, UnkStruct_ov22_02257F50 * param2, UnkStruct_ov22_0225A0E4 * param3, UnkStruct_ov22_0225A428 * param4, BOOL param5) +static void ov22_02258A48(UnkStruct_ov22_02258A48 *param0); +static void ov22_02258BB8(UnkStruct_ov22_02258A48 *param0); +static void ov22_02258D4C(UnkStruct_ov22_02258A48 *param0); +static void ov22_02258E88(UnkStruct_ov22_02258EE4 *param0, UnkStruct_ov22_02259560 *param1, int param2, int param3, int param4, int param5); +static void ov22_02258EE4(UnkStruct_ov22_02258EE4 *param0); +static void ov22_02259040(UnkStruct_ov22_02258EE4 *param0); +static void ov22_02258D7C(UnkStruct_ov22_02258A48 *param0); +static void ov22_02258DAC(UnkStruct_ov22_02258A48 *param0); +static void ov22_02258EF8(UnkStruct_ov22_02258A48 *param0, int *param1, int *param2, int *param3, int *param4); +static void ov22_02258F38(UnkStruct_ov22_02258A48 *param0, int *param1, int *param2, int *param3, int *param4); +static void ov22_02259074(UnkStruct_ov22_02258A48 *param0, int param1, int param2); +static void ov22_02258B78(UnkStruct_ov22_02258A48 *param0); +static void ov22_02258B74(UnkStruct_ov22_02258A48 *param0); +static void ov22_02258E5C(UnkStruct_ov22_02258A48 *param0); +static void ov22_02258F4C(UnkStruct_ov22_02258EE4 *param0, int param1, int param2, int param3, int param4, int param5); +static void ov22_02258FC0(SysTask *param0, void *param1); + +void ov22_022589E0(UnkStruct_ov22_02258A48 *param0, UnkStruct_ov22_02257964 *param1, UnkStruct_ov22_02257F50 *param2, UnkStruct_ov22_0225A0E4 *param3, UnkStruct_ov22_0225A428 *param4, BOOL param5) { - UnkStruct_ov22_02258EE4 * v0; + UnkStruct_ov22_02258EE4 *v0; ov22_022588F0(param0); @@ -96,16 +96,16 @@ void ov22_022589E0 (UnkStruct_ov22_02258A48 * param0, UnkStruct_ov22_02257964 * param0->unk_10 = ov22_02258A34; } -void ov22_02258A34 (UnkStruct_ov22_02258A48 * param0) +void ov22_02258A34(UnkStruct_ov22_02258A48 *param0) { Heap_FreeToHeap(param0->unk_00); ov22_022588F0(param0); } -static void ov22_02258A48 (UnkStruct_ov22_02258A48 * param0) +static void ov22_02258A48(UnkStruct_ov22_02258A48 *param0) { - UnkStruct_ov22_02258EE4 * v0 = param0->unk_00; - UnkStruct_ov22_02259560 * v1; + UnkStruct_ov22_02258EE4 *v0 = param0->unk_00; + UnkStruct_ov22_02259560 *v1; BOOL v2; int v3, v4; int v5; @@ -124,7 +124,7 @@ static void ov22_02258A48 (UnkStruct_ov22_02258A48 * param0) } } - if ((v1 != NULL)) { + if (v1 != NULL) { if (v1->unk_04 == 0) { ov22_02257A80(v0->unk_04, v1); v6 = 0; @@ -180,14 +180,14 @@ static void ov22_02258A48 (UnkStruct_ov22_02258A48 * param0) } } -static void ov22_02258B74 (UnkStruct_ov22_02258A48 * param0) +static void ov22_02258B74(UnkStruct_ov22_02258A48 *param0) { return; } -static void ov22_02258B78 (UnkStruct_ov22_02258A48 * param0) +static void ov22_02258B78(UnkStruct_ov22_02258A48 *param0) { - UnkStruct_ov22_02258EE4 * v0 = param0->unk_00; + UnkStruct_ov22_02258EE4 *v0 = param0->unk_00; if (v0->unk_10) { GF_ASSERT(v0->unk_10->unk_04 == 1); @@ -197,9 +197,9 @@ static void ov22_02258B78 (UnkStruct_ov22_02258A48 * param0) } } -static void ov22_02258BB8 (UnkStruct_ov22_02258A48 * param0) +static void ov22_02258BB8(UnkStruct_ov22_02258A48 *param0) { - UnkStruct_ov22_02258EE4 * v0 = param0->unk_00; + UnkStruct_ov22_02258EE4 *v0 = param0->unk_00; int v1; int v2; int v3, v4, v5, v6; @@ -232,7 +232,7 @@ static void ov22_02258BB8 (UnkStruct_ov22_02258A48 * param0) Sound_PlayEffect(1514); } } else { - UnkStruct_ov22_02255040 * v12 = v0->unk_10->unk_00; + UnkStruct_ov22_02255040 *v12 = v0->unk_10->unk_00; ov22_02258EF8(param0, &v3, &v4, &v5, &v6); @@ -243,8 +243,8 @@ static void ov22_02258BB8 (UnkStruct_ov22_02258A48 * param0) if (v0->unk_20 == 1) { ov22_02259698(v0->unk_10, &v7, &v8); - v9 = ((8 + 2)) + (MTRNG_Next() % ((112 - (2 * 2)) - v7)); - v10 = ((16 + 2)) + (MTRNG_Next() % ((129 - (2 * 2)) - v8)); + v9 = (8 + 2) + (MTRNG_Next() % ((112 - (2 * 2)) - v7)); + v10 = (16 + 2) + (MTRNG_Next() % ((129 - (2 * 2)) - v8)); } else { v9 = v0->unk_1C; v10 = v0->unk_1E; @@ -267,9 +267,9 @@ static void ov22_02258BB8 (UnkStruct_ov22_02258A48 * param0) } } -static void ov22_02258D4C (UnkStruct_ov22_02258A48 * param0) +static void ov22_02258D4C(UnkStruct_ov22_02258A48 *param0) { - UnkStruct_ov22_02258EE4 * v0 = param0->unk_00; + UnkStruct_ov22_02258EE4 *v0 = param0->unk_00; int v1, v2; if (v0->unk_10 != NULL) { @@ -282,9 +282,9 @@ static void ov22_02258D4C (UnkStruct_ov22_02258A48 * param0) } } -static void ov22_02258D7C (UnkStruct_ov22_02258A48 * param0) +static void ov22_02258D7C(UnkStruct_ov22_02258A48 *param0) { - UnkStruct_ov22_02258EE4 * v0 = param0->unk_00; + UnkStruct_ov22_02258EE4 *v0 = param0->unk_00; BOOL v1, v2; int v3, v4; @@ -300,9 +300,9 @@ static void ov22_02258D7C (UnkStruct_ov22_02258A48 * param0) } } -static void ov22_02258DAC (UnkStruct_ov22_02258A48 * param0) +static void ov22_02258DAC(UnkStruct_ov22_02258A48 *param0) { - UnkStruct_ov22_02258EE4 * v0 = param0->unk_00; + UnkStruct_ov22_02258EE4 *v0 = param0->unk_00; int v1, v2; int v3, v4; int v5, v6; @@ -349,10 +349,10 @@ static void ov22_02258DAC (UnkStruct_ov22_02258A48 * param0) } } -static void ov22_02258E5C (UnkStruct_ov22_02258A48 * param0) +static void ov22_02258E5C(UnkStruct_ov22_02258A48 *param0) { - UnkStruct_ov22_02258EE4 * v0 = param0->unk_00; - UnkStruct_ov22_02255040 * v1; + UnkStruct_ov22_02258EE4 *v0 = param0->unk_00; + UnkStruct_ov22_02255040 *v1; int v2; if (v0->unk_10) { @@ -365,7 +365,7 @@ static void ov22_02258E5C (UnkStruct_ov22_02258A48 * param0) } } -static void ov22_02258E88 (UnkStruct_ov22_02258EE4 * param0, UnkStruct_ov22_02259560 * param1, int param2, int param3, int param4, int param5) +static void ov22_02258E88(UnkStruct_ov22_02258EE4 *param0, UnkStruct_ov22_02259560 *param1, int param2, int param3, int param4, int param5) { int v0, v1; @@ -389,7 +389,7 @@ static void ov22_02258E88 (UnkStruct_ov22_02258EE4 * param0, UnkStruct_ov22_0225 ov22_02259560(param1, param5); } -static void ov22_02258EE4 (UnkStruct_ov22_02258EE4 * param0) +static void ov22_02258EE4(UnkStruct_ov22_02258EE4 *param0) { param0->unk_10 = NULL; param0->unk_1C = 0; @@ -398,9 +398,9 @@ static void ov22_02258EE4 (UnkStruct_ov22_02258EE4 * param0) param0->unk_21 = 0; } -static void ov22_02258EF8 (UnkStruct_ov22_02258A48 * param0, int * param1, int * param2, int * param3, int * param4) +static void ov22_02258EF8(UnkStruct_ov22_02258A48 *param0, int *param1, int *param2, int *param3, int *param4) { - UnkStruct_ov22_02258EE4 * v0 = param0->unk_00; + UnkStruct_ov22_02258EE4 *v0 = param0->unk_00; int v1, v2; int v3, v4; @@ -413,17 +413,17 @@ static void ov22_02258EF8 (UnkStruct_ov22_02258A48 * param0, int * param1, int * *param4 = v3 + v1; } -static void ov22_02258F38 (UnkStruct_ov22_02258A48 * param0, int * param1, int * param2, int * param3, int * param4) +static void ov22_02258F38(UnkStruct_ov22_02258A48 *param0, int *param1, int *param2, int *param3, int *param4) { - UnkStruct_ov22_02258EE4 * v0 = param0->unk_00; + UnkStruct_ov22_02258EE4 *v0 = param0->unk_00; ov22_02259724(v0->unk_10, param1, param2, param3, param4); } -static void ov22_02258F4C (UnkStruct_ov22_02258EE4 * param0, int param1, int param2, int param3, int param4, int param5) +static void ov22_02258F4C(UnkStruct_ov22_02258EE4 *param0, int param1, int param2, int param3, int param4, int param5) { - SysTask * v0; - UnkStruct_ov22_02258FC0 * v1; + SysTask *v0; + UnkStruct_ov22_02258FC0 *v1; int v2, v3; v0 = SysTask_StartAndAllocateParam(ov22_02258FC0, sizeof(UnkStruct_ov22_02258FC0), 0, 13); @@ -447,9 +447,9 @@ static void ov22_02258F4C (UnkStruct_ov22_02258EE4 * param0, int param1, int par param0->unk_30 = 0; } -static void ov22_02258FC0 (SysTask * param0, void * param1) +static void ov22_02258FC0(SysTask *param0, void *param1) { - UnkStruct_ov22_02258FC0 * v0 = param1; + UnkStruct_ov22_02258FC0 *v0 = param1; int v1, v2; if (*v0->unk_24 == 1) { @@ -478,20 +478,20 @@ static void ov22_02258FC0 (SysTask * param0, void * param1) } } -static void ov22_02259040 (UnkStruct_ov22_02258EE4 * param0) +static void ov22_02259040(UnkStruct_ov22_02258EE4 *param0) { if (param0->unk_10->unk_04 == 0) { - UnkStruct_ov22_02255040 * v0 = param0->unk_10->unk_00; + UnkStruct_ov22_02255040 *v0 = param0->unk_10->unk_00; ov22_0225A628(param0->unk_0C, 26, 386, v0->unk_00); } else if (param0->unk_10->unk_04 == 1) { - UnkStruct_ov22_02255040 * v0 = param0->unk_10->unk_00; + UnkStruct_ov22_02255040 *v0 = param0->unk_10->unk_00; ov22_0225A628(param0->unk_0C, 26, 388, v0->unk_00); } } -static void ov22_02259074 (UnkStruct_ov22_02258A48 * param0, int param1, int param2) +static void ov22_02259074(UnkStruct_ov22_02258A48 *param0, int param1, int param2) { - UnkStruct_ov22_02258EE4 * v0 = param0->unk_00; + UnkStruct_ov22_02258EE4 *v0 = param0->unk_00; ov22_022595F8(v0->unk_10, param1, param2); ov22_02257ACC(v0->unk_04, param1 - v0->unk_24, param2 - v0->unk_28); diff --git a/src/overlay022/ov22_02259098.c b/src/overlay022/ov22_02259098.c index 545b77cc38..2f761332a7 100644 --- a/src/overlay022/ov22_02259098.c +++ b/src/overlay022/ov22_02259098.c @@ -1,45 +1,44 @@ +#include "overlay022/ov22_02259098.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02007768_decl.h" -#include "pokemon.h" - #include "struct_defs/archived_sprite.h" -#include "touch_screen.h" #include "struct_defs/struct_020298D8.h" + +#include "overlay022/ov22_02255094.h" #include "overlay022/struct_ov22_022596B0.h" #include "overlay022/struct_ov22_0225A0E4.h" -#include "unk_02006E3C.h" -#include "unk_0200762C.h" +#include "core_sys.h" #include "heap.h" #include "pokemon.h" -#include "overlay022/ov22_02255094.h" -#include "overlay022/ov22_02259098.h" +#include "touch_screen.h" +#include "unk_02006E3C.h" +#include "unk_0200762C.h" -static int ov22_0225936C(char * param0, int param1); +static int ov22_0225936C(char *param0, int param1); static void ov22_02259448(TouchScreenRect *rect, int param1, int param2, int param3, int param4); -static void ov22_022593B8(char * param0, int param1, int param2, UnkStruct_ov22_022596B0 * param3); +static void ov22_022593B8(char *param0, int param1, int param2, UnkStruct_ov22_022596B0 *param3); -void ov22_02259098 (UnkStruct_ov22_0225A0E4 * param0, ArchivedSprite * param1) +void ov22_02259098(UnkStruct_ov22_0225A0E4 *param0, ArchivedSprite *param1) { - void * v0; - NNSG2dCharacterData * v1; + void *v0; + NNSG2dCharacterData *v1; v0 = sub_02006FE8(param1->archive, param1->character, 0, 14, 0); - v1 = ov22_02255340(param0, v0, ((100 + 18))); + v1 = ov22_02255340(param0, v0, (100 + 18)); sub_020093A0((u8 *)v1->pRawData, param1->archive); } -void ov22_022590C0 (UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Pokemon * param2, ArchivedSprite * param3, int param4) +void ov22_022590C0(UnkStruct_020298D8 *param0, UnkStruct_02007768 *param1, Pokemon *param2, ArchivedSprite *param3, int param4) { ov22_022590D4(param0, param1, param2, param3, param4, 0); } -void ov22_022590D4 (UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Pokemon * param2, ArchivedSprite * param3, int param4, BOOL param5) +void ov22_022590D4(UnkStruct_020298D8 *param0, UnkStruct_02007768 *param1, Pokemon *param2, ArchivedSprite *param3, int param4, BOOL param5) { int v0 = Pokemon_GetValue(param2, MON_DATA_SPECIES, NULL); @@ -64,8 +63,8 @@ void ov22_022590D4 (UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Po { u8 v3 = Pokemon_DPSpriteYOffset(param2, 2); - void * v4; - NNSG2dCharacterData * v5; + void *v4; + NNSG2dCharacterData *v5; v4 = sub_02006FE8(param3->archive, param3->character, 0, param4, 0); @@ -87,23 +86,23 @@ void ov22_022590D4 (UnkStruct_020298D8 * param0, UnkStruct_02007768 * param1, Po param0->unk_0C = param2; } -void ov22_022591B8 (UnkStruct_020298D8 * param0) +void ov22_022591B8(UnkStruct_020298D8 *param0) { sub_02007DC8(param0->unk_00); memset(param0, 0, sizeof(UnkStruct_020298D8)); } -void ov22_022591D0 (UnkStruct_020298D8 * param0, int param1) +void ov22_022591D0(UnkStruct_020298D8 *param0, int param1) { sub_02007DEC(param0->unk_00, 2, param1); } -int ov22_022591E0 (UnkStruct_020298D8 * param0) +int ov22_022591E0(UnkStruct_020298D8 *param0) { return sub_020080C0(param0->unk_00, 2); } -void ov22_022591EC (UnkStruct_020298D8 * param0, int param1, int param2) +void ov22_022591EC(UnkStruct_020298D8 *param0, int param1, int param2) { int v0, v1; @@ -117,29 +116,29 @@ void ov22_022591EC (UnkStruct_020298D8 * param0, int param1, int param2) ov22_02259448(¶m0->unk_04, param1, param2, v0, v1); } -BOOL ov22_02259238 (UnkStruct_020298D8 * param0) +BOOL ov22_02259238(UnkStruct_020298D8 *param0) { return TouchScreen_LocationHeld(¶m0->unk_04); } -BOOL ov22_02259244 (UnkStruct_020298D8 * param0, int param1, int param2) +BOOL ov22_02259244(UnkStruct_020298D8 *param0, int param1, int param2) { return sub_02022830(¶m0->unk_04, param1, param2); } -void ov22_02259250 (UnkStruct_020298D8 * param0, int * param1, int * param2) +void ov22_02259250(UnkStruct_020298D8 *param0, int *param1, int *param2) { *param1 = sub_020080C0(param0->unk_00, 0); *param2 = sub_020080C0(param0->unk_00, 1); } -void ov22_02259270 (UnkStruct_020298D8 * param0, int * param1, int * param2) +void ov22_02259270(UnkStruct_020298D8 *param0, int *param1, int *param2) { *param1 = 80; *param2 = 80; } -BOOL ov22_02259278 (UnkStruct_020298D8 * param0, int * param1, int * param2, NNSG2dCharacterData * param3) +BOOL ov22_02259278(UnkStruct_020298D8 *param0, int *param1, int *param2, NNSG2dCharacterData *param3) { int v0; int v1, v2; @@ -169,7 +168,7 @@ BOOL ov22_02259278 (UnkStruct_020298D8 * param0, int * param1, int * param2, NNS return 0; } -BOOL ov22_022592F0 (UnkStruct_020298D8 * param0, int param1, int param2, NNSG2dCharacterData * param3) +BOOL ov22_022592F0(UnkStruct_020298D8 *param0, int param1, int param2, NNSG2dCharacterData *param3) { int v0; int v1, v2; @@ -199,12 +198,12 @@ BOOL ov22_022592F0 (UnkStruct_020298D8 * param0, int param1, int param2, NNSG2dC return 0; } -void ov22_02259358 (UnkStruct_020298D8 * param0, UnkStruct_ov22_022596B0 * param1) +void ov22_02259358(UnkStruct_020298D8 *param0, UnkStruct_ov22_022596B0 *param1) { *param1 = param0->unk_08; } -static int ov22_0225936C (char * param0, int param1) +static int ov22_0225936C(char *param0, int param1) { int v0, v1; int v2; @@ -226,7 +225,7 @@ static int ov22_0225936C (char * param0, int param1) return 80; } -static void ov22_022593B8 (char * param0, int param1, int param2, UnkStruct_ov22_022596B0 * param3) +static void ov22_022593B8(char *param0, int param1, int param2, UnkStruct_ov22_022596B0 *param3) { int v0, v1; int v2; @@ -265,7 +264,7 @@ static void ov22_022593B8 (char * param0, int param1, int param2, UnkStruct_ov22 } } -static void ov22_02259448 (TouchScreenRect *rect, int param1, int param2, int param3, int param4) +static void ov22_02259448(TouchScreenRect *rect, int param1, int param2, int param3, int param4) { if ((param2 - param4) >= 0) { rect->rect.top = param2 - param4; diff --git a/src/overlay022/ov22_02259484.c b/src/overlay022/ov22_02259484.c index 89b827d867..110ba05e2b 100644 --- a/src/overlay022/ov22_02259484.c +++ b/src/overlay022/ov22_02259484.c @@ -1,3 +1,5 @@ +#include "overlay022/ov22_02259484.h" + #include #include @@ -5,9 +7,8 @@ #include "overlay022/struct_ov22_02259560.h" #include "heap.h" -#include "overlay022/ov22_02259484.h" -void ov22_02259484 (UnkStruct_ov22_02259484 * param0, int param1, int param2) +void ov22_02259484(UnkStruct_ov22_02259484 *param0, int param1, int param2) { param0->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov22_02259560) * param1); GF_ASSERT(param0->unk_00); @@ -15,14 +16,14 @@ void ov22_02259484 (UnkStruct_ov22_02259484 * param0, int param1, int param2) param0->unk_04 = param1; } -void ov22_022594AC (UnkStruct_ov22_02259484 * param0) +void ov22_022594AC(UnkStruct_ov22_02259484 *param0) { Heap_FreeToHeap(param0->unk_00); param0->unk_00 = NULL; param0->unk_04 = 0; } -UnkStruct_ov22_02259560 * ov22_022594C0 (UnkStruct_ov22_02259484 * param0, void * param1, int param2) +UnkStruct_ov22_02259560 *ov22_022594C0(UnkStruct_ov22_02259484 *param0, void *param1, int param2) { int v0; @@ -43,12 +44,12 @@ UnkStruct_ov22_02259560 * ov22_022594C0 (UnkStruct_ov22_02259484 * param0, void return param0->unk_00 + v0; } -void ov22_02259510 (UnkStruct_ov22_02259560 * param0) +void ov22_02259510(UnkStruct_ov22_02259560 *param0) { memset(param0, 0, sizeof(UnkStruct_ov22_02259560)); } -void ov22_02259520 (UnkStruct_ov22_02259560 * param0, UnkStruct_ov22_02259560 * param1) +void ov22_02259520(UnkStruct_ov22_02259560 *param0, UnkStruct_ov22_02259560 *param1) { param0->unk_08 = param1->unk_08; param1->unk_08->unk_0C = param0; @@ -56,16 +57,16 @@ void ov22_02259520 (UnkStruct_ov22_02259560 * param0, UnkStruct_ov22_02259560 * param1->unk_08 = param0; } -void ov22_02259530 (UnkStruct_ov22_02259560 * param0) +void ov22_02259530(UnkStruct_ov22_02259560 *param0) { param0->unk_0C->unk_08 = param0->unk_08; param0->unk_08->unk_0C = param0->unk_0C; } -void ov22_02259540 (UnkStruct_ov22_02259560 * param0) +void ov22_02259540(UnkStruct_ov22_02259560 *param0) { - UnkStruct_ov22_02259560 * v0; - UnkStruct_ov22_02259560 * v1; + UnkStruct_ov22_02259560 *v0; + UnkStruct_ov22_02259560 *v1; v0 = param0->unk_08; diff --git a/src/overlay022/ov22_02259560.c b/src/overlay022/ov22_02259560.c index b9bd614ca5..6ca2856554 100644 --- a/src/overlay022/ov22_02259560.c +++ b/src/overlay022/ov22_02259560.c @@ -1,30 +1,31 @@ +#include "overlay022/ov22_02259560.h" + #include #include #include "struct_defs/struct_020298D8.h" -#include "overlay022/struct_ov22_02255040.h" -#include "overlay022/struct_ov22_02259560.h" -#include "overlay022/struct_ov22_022596B0.h" #include "overlay022/ov22_02254DE0.h" #include "overlay022/ov22_02259098.h" -#include "overlay022/ov22_02259560.h" +#include "overlay022/struct_ov22_02255040.h" +#include "overlay022/struct_ov22_02259560.h" +#include "overlay022/struct_ov22_022596B0.h" -void ov22_02259560 (UnkStruct_ov22_02259560 * param0, int param1) +void ov22_02259560(UnkStruct_ov22_02259560 *param0, int param1) { if (param0->unk_04 < 3) { - UnkStruct_ov22_02255040 * v0 = param0->unk_00; + UnkStruct_ov22_02255040 *v0 = param0->unk_00; ov22_02254F6C(v0, param1); } else { - UnkStruct_020298D8 * v1 = param0->unk_00; + UnkStruct_020298D8 *v1 = param0->unk_00; ov22_022591D0(v1, param1); } } -BOOL ov22_02259578 (UnkStruct_ov22_02259560 * param0, int param1, int param2) +BOOL ov22_02259578(UnkStruct_ov22_02259560 *param0, int param1, int param2) { if (param0->unk_04 < 3) { - UnkStruct_ov22_02255040 * v0 = param0->unk_00; + UnkStruct_ov22_02255040 *v0 = param0->unk_00; if (param1 == 0xffffffff) { return ov22_02254E44(v0); @@ -34,7 +35,7 @@ BOOL ov22_02259578 (UnkStruct_ov22_02259560 * param0, int param1, int param2) } { - UnkStruct_020298D8 * v1 = param0->unk_00; + UnkStruct_020298D8 *v1 = param0->unk_00; if (param1 == 0xffffffff) { return ov22_02259238(v1); @@ -44,19 +45,19 @@ BOOL ov22_02259578 (UnkStruct_ov22_02259560 * param0, int param1, int param2) } } -BOOL ov22_022595AC (UnkStruct_ov22_02259560 * param0, int * param1, int * param2, NNSG2dCharacterData ** param3) +BOOL ov22_022595AC(UnkStruct_ov22_02259560 *param0, int *param1, int *param2, NNSG2dCharacterData **param3) { - NNSG2dCharacterData * v0; + NNSG2dCharacterData *v0; if (param0->unk_04 == 0) { - UnkStruct_ov22_02255040 * v1 = param0->unk_00; + UnkStruct_ov22_02255040 *v1 = param0->unk_00; v0 = param3[v1->unk_00]; return ov22_02254E54(v1, param1, param2, v0); } if (param0->unk_04 == 1) { - UnkStruct_ov22_02255040 * v2 = param0->unk_00; + UnkStruct_ov22_02255040 *v2 = param0->unk_00; int v3 = v2->unk_00 + 100; v0 = param3[v3]; @@ -64,7 +65,7 @@ BOOL ov22_022595AC (UnkStruct_ov22_02259560 * param0, int * param1, int * param2 } if (param0->unk_04 == 2) { - UnkStruct_ov22_02255040 * v4 = param0->unk_00; + UnkStruct_ov22_02255040 *v4 = param0->unk_00; int v5 = v4->unk_00 + 100; v0 = param3[v5]; @@ -72,21 +73,21 @@ BOOL ov22_022595AC (UnkStruct_ov22_02259560 * param0, int * param1, int * param2 } { - UnkStruct_020298D8 * v6 = param0->unk_00; + UnkStruct_020298D8 *v6 = param0->unk_00; - v0 = param3[((100 + 18))]; + v0 = param3[(100 + 18)]; return ov22_02259278(v6, param1, param2, v0); } } -void ov22_022595F8 (UnkStruct_ov22_02259560 * param0, int param1, int param2) +void ov22_022595F8(UnkStruct_ov22_02259560 *param0, int param1, int param2) { if (param0->unk_04 < 3) { - UnkStruct_ov22_02255040 * v0 = param0->unk_00; + UnkStruct_ov22_02255040 *v0 = param0->unk_00; ov22_02254EF4(v0, param1, param2); } else { - UnkStruct_020298D8 * v1 = param0->unk_00; + UnkStruct_020298D8 *v1 = param0->unk_00; int v2, v3; ov22_02259270(v1, &v2, &v3); @@ -98,13 +99,13 @@ void ov22_022595F8 (UnkStruct_ov22_02259560 * param0, int param1, int param2) } } -void ov22_02259648 (UnkStruct_ov22_02259560 * param0, int * param1, int * param2) +void ov22_02259648(UnkStruct_ov22_02259560 *param0, int *param1, int *param2) { if (param0->unk_04 < 3) { - UnkStruct_ov22_02255040 * v0 = param0->unk_00; + UnkStruct_ov22_02255040 *v0 = param0->unk_00; ov22_02254F00(v0, param1, param2); } else { - UnkStruct_020298D8 * v1 = param0->unk_00; + UnkStruct_020298D8 *v1 = param0->unk_00; int v2, v3; ov22_02259250(v1, param1, param2); @@ -117,27 +118,27 @@ void ov22_02259648 (UnkStruct_ov22_02259560 * param0, int * param1, int * param2 } } -void ov22_02259698 (UnkStruct_ov22_02259560 * param0, int * param1, int * param2) +void ov22_02259698(UnkStruct_ov22_02259560 *param0, int *param1, int *param2) { if (param0->unk_04 < 3) { - UnkStruct_ov22_02255040 * v0 = param0->unk_00; + UnkStruct_ov22_02255040 *v0 = param0->unk_00; ov22_02254F30(v0, param1, param2); } else { - UnkStruct_020298D8 * v1 = param0->unk_00; + UnkStruct_020298D8 *v1 = param0->unk_00; ov22_02259270(v1, param1, param2); } } -void ov22_022596B0 (UnkStruct_ov22_02259560 * param0, int * param1, int * param2, int * param3, int * param4) +void ov22_022596B0(UnkStruct_ov22_02259560 *param0, int *param1, int *param2, int *param3, int *param4) { if (param0->unk_04 < 3) { - UnkStruct_ov22_02255040 * v0 = param0->unk_00; + UnkStruct_ov22_02255040 *v0 = param0->unk_00; ov22_02254F84(v0, param1, param3); *param2 = *param1; *param4 = *param3; } else { UnkStruct_ov22_022596B0 v1; - UnkStruct_020298D8 * v2 = param0->unk_00; + UnkStruct_020298D8 *v2 = param0->unk_00; ov22_02259358(v2, &v1); @@ -148,9 +149,9 @@ void ov22_022596B0 (UnkStruct_ov22_02259560 * param0, int * param1, int * param2 } } -void ov22_022596EC (UnkStruct_ov22_02259560 * param0, int param1, int param2) +void ov22_022596EC(UnkStruct_ov22_02259560 *param0, int param1, int param2) { - UnkStruct_ov22_02259560 * v0; + UnkStruct_ov22_02259560 *v0; int v1, v2; v0 = param0->unk_08; @@ -167,7 +168,7 @@ void ov22_022596EC (UnkStruct_ov22_02259560 * param0, int param1, int param2) } } -void ov22_02259724 (UnkStruct_ov22_02259560 * param0, int * param1, int * param2, int * param3, int * param4) +void ov22_02259724(UnkStruct_ov22_02259560 *param0, int *param1, int *param2, int *param3, int *param4) { int v0, v1; int v2, v3; @@ -184,7 +185,7 @@ void ov22_02259724 (UnkStruct_ov22_02259560 * param0, int * param1, int * param2 *param4 = v2 + v0 - v6; } -void ov22_02259780 (UnkStruct_ov22_02259560 * param0, int * param1, int * param2) +void ov22_02259780(UnkStruct_ov22_02259560 *param0, int *param1, int *param2) { int v0, v1; int v2, v3; diff --git a/src/overlay022/ov22_022597BC.c b/src/overlay022/ov22_022597BC.c index 75eafb2e80..e9fa190719 100644 --- a/src/overlay022/ov22_022597BC.c +++ b/src/overlay022/ov22_022597BC.c @@ -1,3 +1,5 @@ +#include "overlay022/ov22_022597BC.h" + #include #include @@ -8,18 +10,17 @@ #include "overlay022/struct_ov22_022599A0.h" #include "overlay022/struct_ov22_0225AF44.h" +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_0200679C.h" #include "unk_02006E3C.h" -#include "sys_task.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" -#include "overlay022/ov22_022597BC.h" typedef struct { - UnkStruct_ov22_022597BC * unk_00; + UnkStruct_ov22_022597BC *unk_00; UnkStruct_ov22_022599A0 unk_04; - BOOL * unk_34; + BOOL *unk_34; int unk_38; int unk_3C; int unk_40; @@ -28,31 +29,31 @@ typedef struct { } UnkStruct_ov22_022598F4; typedef struct { - BGL * unk_00; - NNSG2dCharacterData * unk_04; - void * unk_08; + BGL *unk_00; + NNSG2dCharacterData *unk_04; + void *unk_08; int unk_0C; int unk_10; } UnkStruct_ov22_02259B3C; typedef struct { - NNSG2dPaletteData * unk_00; - void * unk_04; + NNSG2dPaletteData *unk_00; + void *unk_04; int unk_08; int unk_0C; int unk_10; } UnkStruct_ov22_02259B8C; -static void ov22_02259980(const NNSG2dScreenData * param0, int param1); -static void ov22_022599A0(UnkStruct_ov22_022599A0 * param0, int * param1, int * param2); -static void ov22_02259A4C(SysTask * param0, void * param1); -static void ov22_02259ABC(BGL * param0, int param1, const NNSG2dScreenData * param2, int param3, int param4, int param5, int param6, int param7, int param8); -static void ov22_02259B3C(u32 param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5); +static void ov22_02259980(const NNSG2dScreenData *param0, int param1); +static void ov22_022599A0(UnkStruct_ov22_022599A0 *param0, int *param1, int *param2); +static void ov22_02259A4C(SysTask *param0, void *param1); +static void ov22_02259ABC(BGL *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4, int param5, int param6, int param7, int param8); +static void ov22_02259B3C(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5); static void ov22_02259B8C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); -static void ov22_02259BD4(SysTask * param0, void * param1); -static void ov22_02259C10(SysTask * param0, void * param1); +static void ov22_02259BD4(SysTask *param0, void *param1); +static void ov22_02259C10(SysTask *param0, void *param1); -void ov22_022597BC (UnkStruct_ov22_022597BC * param0, UnkStruct_ov22_022599A0 * param1) +void ov22_022597BC(UnkStruct_ov22_022597BC *param0, UnkStruct_ov22_022599A0 *param1) { param0->unk_00 = param1->unk_00; param0->unk_0C = param1->unk_14 / 8; @@ -67,13 +68,13 @@ void ov22_022597BC (UnkStruct_ov22_022597BC * param0, UnkStruct_ov22_022599A0 * ov22_022599A0(param1, ¶m0->unk_14, ¶m0->unk_18); } -void ov22_02259804 (UnkStruct_ov22_022597BC * param0) +void ov22_02259804(UnkStruct_ov22_022597BC *param0) { sub_02019EBC(param0->unk_00, param0->unk_1C); memset(param0, 0, sizeof(UnkStruct_ov22_022597BC)); } -void ov22_02259820 (UnkStruct_ov22_02259820 * param0, UnkStruct_ov22_0225AF44 * param1) +void ov22_02259820(UnkStruct_ov22_02259820 *param0, UnkStruct_ov22_0225AF44 *param1) { param0->unk_00 = param1->unk_00; param0->unk_04 = param1->unk_04; @@ -83,10 +84,10 @@ void ov22_02259820 (UnkStruct_ov22_02259820 * param0, UnkStruct_ov22_0225AF44 * param0->unk_14 = param1->unk_0C; } -void ov22_02259838 (UnkStruct_ov22_02259820 * param0, int param1) +void ov22_02259838(UnkStruct_ov22_02259820 *param0, int param1) { - NNSG2dScreenData * v0; - void * v1; + NNSG2dScreenData *v0; + void *v1; int v2; param0->unk_0C += param1; @@ -109,10 +110,10 @@ void ov22_02259838 (UnkStruct_ov22_02259820 * param0, int param1) } } -void ov22_022598A0 (UnkStruct_ov22_02259820 * param0) +void ov22_022598A0(UnkStruct_ov22_02259820 *param0) { - NNSG2dScreenData * v0; - void * v1; + NNSG2dScreenData *v0; + void *v1; v1 = sub_02006F6C(param0->unk_00->unk_04, param0->unk_00->unk_08, 0, &v0, param0->unk_14); @@ -122,10 +123,10 @@ void ov22_022598A0 (UnkStruct_ov22_02259820 * param0) memset(param0, 0, sizeof(UnkStruct_ov22_02259820)); } -void ov22_022598F4 (UnkStruct_ov22_022597BC * param0, UnkStruct_ov22_022599A0 * param1, int param2, int param3, int param4, BOOL * param5) +void ov22_022598F4(UnkStruct_ov22_022597BC *param0, UnkStruct_ov22_022599A0 *param1, int param2, int param3, int param4, BOOL *param5) { - UnkStruct_ov22_022598F4 * v0; - SysTask * v1; + UnkStruct_ov22_022598F4 *v0; + SysTask *v1; v1 = SysTask_StartAndAllocateParam(ov22_02259A4C, sizeof(UnkStruct_ov22_022598F4), 0, 13); v0 = SysTask_GetParam(v1); @@ -148,10 +149,10 @@ void ov22_022598F4 (UnkStruct_ov22_022597BC * param0, UnkStruct_ov22_022599A0 * ov22_022599A0(param1, NULL, NULL); } -static void ov22_02259980 (const NNSG2dScreenData * param0, int param1) +static void ov22_02259980(const NNSG2dScreenData *param0, int param1) { int v0; - u16 * v1; + u16 *v1; int v2 = param0->szByte / 2; v1 = (u16 *)param0->rawData; @@ -161,11 +162,11 @@ static void ov22_02259980 (const NNSG2dScreenData * param0, int param1) } } -static void ov22_022599A0 (UnkStruct_ov22_022599A0 * param0, int * param1, int * param2) +static void ov22_022599A0(UnkStruct_ov22_022599A0 *param0, int *param1, int *param2) { int v0; - NNSG2dScreenData * v1; - void * v2; + NNSG2dScreenData *v1; + void *v2; int v3, v4; int v5, v6; @@ -198,9 +199,9 @@ static void ov22_022599A0 (UnkStruct_ov22_022599A0 * param0, int * param1, int * } } -static void ov22_02259A4C (SysTask * param0, void * param1) +static void ov22_02259A4C(SysTask *param0, void *param1) { - UnkStruct_ov22_022598F4 * v0 = param1; + UnkStruct_ov22_022598F4 *v0 = param1; v0->unk_38--; @@ -220,7 +221,7 @@ static void ov22_02259A4C (SysTask * param0, void * param1) } } -static void ov22_02259ABC (BGL * param0, int param1, const NNSG2dScreenData * param2, int param3, int param4, int param5, int param6, int param7, int param8) +static void ov22_02259ABC(BGL *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4, int param5, int param6, int param7, int param8) { ov22_02259980(param2, param7); sub_020198E8(param0, param1, param5, param6, param3, param4, param2->rawData, 0, 0, param3, param4); @@ -228,9 +229,9 @@ static void ov22_02259ABC (BGL * param0, int param1, const NNSG2dScreenData * pa sub_0201C3C0(param0, param1); } -static void ov22_02259B3C (u32 param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5) +static void ov22_02259B3C(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5) { - UnkStruct_ov22_02259B3C * v0; + UnkStruct_ov22_02259B3C *v0; v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_ov22_02259B3C)); memset(v0, 0, sizeof(UnkStruct_ov22_02259B3C)); @@ -243,9 +244,9 @@ static void ov22_02259B3C (u32 param0, u32 param1, BGL * param2, u32 param3, u32 SysTask_ExecuteAfterVBlank(ov22_02259BD4, v0, 128); } -static void ov22_02259B8C (u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) +static void ov22_02259B8C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) { - UnkStruct_ov22_02259B8C * v0; + UnkStruct_ov22_02259B8C *v0; v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_ov22_02259B8C)); memset(v0, 0, sizeof(UnkStruct_ov22_02259B8C)); @@ -258,9 +259,9 @@ static void ov22_02259B8C (u32 param0, u32 param1, int param2, u32 param3, u32 p SysTask_ExecuteAfterVBlank(ov22_02259C10, v0, 128); } -static void ov22_02259BD4 (SysTask * param0, void * param1) +static void ov22_02259BD4(SysTask *param0, void *param1) { - UnkStruct_ov22_02259B3C * v0 = param1; + UnkStruct_ov22_02259B3C *v0 = param1; DC_FlushRange(v0->unk_04->pRawData, v0->unk_04->szByte); @@ -270,9 +271,9 @@ static void ov22_02259BD4 (SysTask * param0, void * param1) Heap_FreeToHeap(v0); } -static void ov22_02259C10 (SysTask * param0, void * param1) +static void ov22_02259C10(SysTask *param0, void *param1) { - UnkStruct_ov22_02259B8C * v0 = param1; + UnkStruct_ov22_02259B8C *v0 = param1; DC_FlushRange(v0->unk_00->pRawData, v0->unk_10); diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c index 5ec701bed3..68aba58252 100644 --- a/src/overlay022/ov22_0225A428.c +++ b/src/overlay022/ov22_0225A428.c @@ -1,17 +1,18 @@ +#include "overlay022/ov22_0225A428.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095C60.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay022/ov22_022597BC.h" #include "overlay022/struct_ov22_02256BAC.h" #include "overlay022/struct_ov22_022597BC.h" #include "overlay022/struct_ov22_022599A0.h" @@ -22,51 +23,49 @@ #include "overlay022/struct_ov22_0225AE9C.h" #include "overlay083/struct_ov83_0223D9A8.h" +#include "game_options.h" +#include "message.h" +#include "strbuf.h" +#include "sys_task.h" #include "unk_02002B7C.h" #include "unk_02005474.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "message.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_02095AF0.h" -#include "overlay022/ov22_022597BC.h" -#include "overlay022/ov22_0225A428.h" -static void ov22_0225A6E0(UnkStruct_ov22_022597BC * param0, BGL * param1); -static void ov22_0225A718(BGL * param0, const Options * param1); -static void ov22_0225A748(Window ** param0, BGL * param1, int param2, int param3, int param4, int param5, int param6, BOOL param7); -static void ov22_0225A7B8(UnkStruct_ov22_022597BC * param0); -static void ov22_0225A7C0(Window * param0); -static s32 ov22_0225A7CC(Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6); -static s32 ov22_0225A814(Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, Strbuf **param7); -static s32 ov22_0225A860(Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7); -static s32 ov22_0225A8B4(Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7, Strbuf **param8); -static void ov22_0225A914(UnkStruct_ov22_0225A914 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4); -static void ov22_0225A9C8(UnkStruct_ov22_0225A914 * param0, int param1); -static void ov22_0225AA10(UnkStruct_ov22_0225A914 * param0, UnkStruct_02009714 ** param1); -static void ov22_0225AB54(UnkStruct_ov22_0225AB54 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6); -static void ov22_0225AC58(UnkStruct_ov22_0225AB54 * param0, UnkStruct_02009714 ** param1); -static void ov22_0225AC8C(UnkStruct_ov22_0225AB54 * param0); -static void ov22_0225AD5C(UnkStruct_ov22_0225AB54 * param0); -static void ov22_0225ACBC(UnkStruct_ov22_0225AB54 * param0); -static void ov22_0225ACE4(UnkStruct_ov22_0225AB54 * param0); -static void ov22_0225ADC0(UnkStruct_ov22_0225AB54 * param0, UnkStruct_ov22_0225AE9C * param1); -static void ov22_0225AE9C(UnkStruct_ov22_0225AE9C * param0); -static BOOL ov22_0225AF34(const UnkStruct_ov22_0225AE9C * param0); -static void ov22_0225AA34(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, NARC * param3, int param4, int param5, int param6, int param7, int param8, int param9); -static void ov22_0225AAC0(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1); -static void ov22_0225AAF4(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, UnkStruct_ov19_021DA864 * param2, int param3); -static void ov22_0225AD68(UnkStruct_ov22_0225AD68 * param0, fx32 param1, fx32 param2, int param3); -static BOOL ov22_0225AD78(UnkStruct_ov22_0225AD68 * param0); - -void ov22_0225A428 (UnkStruct_ov22_0225A428 * param0, UnkStruct_ov22_02256BAC * param1, int param2) +static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BGL *param1); +static void ov22_0225A718(BGL *param0, const Options *param1); +static void ov22_0225A748(Window **param0, BGL *param1, int param2, int param3, int param4, int param5, int param6, BOOL param7); +static void ov22_0225A7B8(UnkStruct_ov22_022597BC *param0); +static void ov22_0225A7C0(Window *param0); +static s32 ov22_0225A7CC(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6); +static s32 ov22_0225A814(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6, Strbuf **param7); +static s32 ov22_0225A860(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7); +static s32 ov22_0225A8B4(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7, Strbuf **param8); +static void ov22_0225A914(UnkStruct_ov22_0225A914 *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3, NARC *param4); +static void ov22_0225A9C8(UnkStruct_ov22_0225A914 *param0, int param1); +static void ov22_0225AA10(UnkStruct_ov22_0225A914 *param0, UnkStruct_02009714 **param1); +static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3, BGL *param4, UnkStruct_02095C60 *param5, NARC *param6); +static void ov22_0225AC58(UnkStruct_ov22_0225AB54 *param0, UnkStruct_02009714 **param1); +static void ov22_0225AC8C(UnkStruct_ov22_0225AB54 *param0); +static void ov22_0225AD5C(UnkStruct_ov22_0225AB54 *param0); +static void ov22_0225ACBC(UnkStruct_ov22_0225AB54 *param0); +static void ov22_0225ACE4(UnkStruct_ov22_0225AB54 *param0); +static void ov22_0225ADC0(UnkStruct_ov22_0225AB54 *param0, UnkStruct_ov22_0225AE9C *param1); +static void ov22_0225AE9C(UnkStruct_ov22_0225AE9C *param0); +static BOOL ov22_0225AF34(const UnkStruct_ov22_0225AE9C *param0); +static void ov22_0225AA34(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1, int param2, NARC *param3, int param4, int param5, int param6, int param7, int param8, int param9); +static void ov22_0225AAC0(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1); +static void ov22_0225AAF4(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1, UnkStruct_ov19_021DA864 *param2, int param3); +static void ov22_0225AD68(UnkStruct_ov22_0225AD68 *param0, fx32 param1, fx32 param2, int param3); +static BOOL ov22_0225AD78(UnkStruct_ov22_0225AD68 *param0); + +void ov22_0225A428(UnkStruct_ov22_0225A428 *param0, UnkStruct_ov22_02256BAC *param1, int param2) { if (param2 & 1) { memset(param0, 0, sizeof(UnkStruct_ov22_0225A428)); @@ -106,7 +105,7 @@ void ov22_0225A428 (UnkStruct_ov22_0225A428 * param0, UnkStruct_ov22_02256BAC * param0->unk_138 |= param2; } -void ov22_0225A560 (UnkStruct_ov22_0225A428 * param0) +void ov22_0225A560(UnkStruct_ov22_0225A428 *param0) { if (param0->unk_138 & 2) { ov22_0225A7B8(¶m0->unk_00); @@ -136,52 +135,52 @@ void ov22_0225A560 (UnkStruct_ov22_0225A428 * param0) memset(param0, 0, sizeof(UnkStruct_ov22_0225A428)); } -void ov22_0225A610 (UnkStruct_ov22_0225A428 * param0) +void ov22_0225A610(UnkStruct_ov22_0225A428 *param0) { if (param0->unk_138 & 16) { ov22_0225AC8C(¶m0->unk_A0); } } -void ov22_0225A628 (UnkStruct_ov22_0225A428 * param0, int param1, int param2, int param3) +void ov22_0225A628(UnkStruct_ov22_0225A428 *param0, int param1, int param2, int param3) { - GF_ASSERT((param0->unk_138 & 4)); + GF_ASSERT(param0->unk_138 & 4); ov22_0225A7CC(param0->unk_2C, param1, param2, param3, 0, 0, 0xff); } -s32 ov22_0225A660 (UnkStruct_ov22_0225A428 * param0, int param1, int param2, int param3) +s32 ov22_0225A660(UnkStruct_ov22_0225A428 *param0, int param1, int param2, int param3) { - GF_ASSERT((param0->unk_138 & 4)); + GF_ASSERT(param0->unk_138 & 4); return ov22_0225A814(param0->unk_2C, param1, param2, param3, 0, 0, param0->unk_140, ¶m0->unk_144); } -void ov22_0225A6A0 (UnkStruct_ov22_0225A428 * param0) +void ov22_0225A6A0(UnkStruct_ov22_0225A428 *param0) { Strbuf_Free(param0->unk_144); param0->unk_144 = NULL; } -void ov22_0225A6B8 (UnkStruct_ov22_0225A428 * param0, int param1) +void ov22_0225A6B8(UnkStruct_ov22_0225A428 *param0, int param1) { ov22_0225A9C8(¶m0->unk_38, param1); } -int ov22_0225A6C4 (const UnkStruct_ov22_0225A428 * param0) +int ov22_0225A6C4(const UnkStruct_ov22_0225A428 *param0) { return param0->unk_A0.unk_1C; } -void ov22_0225A6CC (UnkStruct_ov22_0225A428 * param0, int param1) +void ov22_0225A6CC(UnkStruct_ov22_0225A428 *param0, int param1) { param0->unk_A0.unk_20 = param1; } -BOOL ov22_0225A6D4 (const UnkStruct_ov22_0225A428 * param0) +BOOL ov22_0225A6D4(const UnkStruct_ov22_0225A428 *param0) { return ov22_0225AF34(¶m0->unk_A0.unk_30); } -static void ov22_0225A6E0 (UnkStruct_ov22_022597BC * param0, BGL * param1) +static void ov22_0225A6E0(UnkStruct_ov22_022597BC *param0, BGL *param1) { UnkStruct_ov22_022599A0 v0; @@ -201,7 +200,7 @@ static void ov22_0225A6E0 (UnkStruct_ov22_022597BC * param0, BGL * param1) ov22_022597BC(param0, &v0); } -static void ov22_0225A718 (BGL * param0, const Options * param1) +static void ov22_0225A718(BGL *param0, const Options *param1) { int v0 = Options_Frame(param1); @@ -209,7 +208,7 @@ static void ov22_0225A718 (BGL * param0, const Options * param1) sub_02002E98(4, 2 * 32, 14); } -static void ov22_0225A748 (Window ** param0, BGL * param1, int param2, int param3, int param4, int param5, int param6, BOOL param7) +static void ov22_0225A748(Window **param0, BGL *param1, int param2, int param3, int param4, int param5, int param6, BOOL param7) { *param0 = sub_0201A778(14, 1); @@ -224,17 +223,17 @@ static void ov22_0225A748 (Window ** param0, BGL * param1, int param2, int param sub_0201A954(*param0); } -static void ov22_0225A7B8 (UnkStruct_ov22_022597BC * param0) +static void ov22_0225A7B8(UnkStruct_ov22_022597BC *param0) { ov22_02259804(param0); } -static void ov22_0225A7C0 (Window * param0) +static void ov22_0225A7C0(Window *param0) { sub_0201A928(param0, 1); } -static s32 ov22_0225A7CC (Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6) +static s32 ov22_0225A7CC(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6) { s32 v0; @@ -245,7 +244,7 @@ static s32 ov22_0225A7CC (Window * param0, int param1, int param2, int param3, i return v0; } -static s32 ov22_0225A814 (Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, Strbuf **param7) +static s32 ov22_0225A814(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6, Strbuf **param7) { s32 v0; @@ -256,10 +255,10 @@ static s32 ov22_0225A814 (Window * param0, int param1, int param2, int param3, i return v0; } -static s32 ov22_0225A860 (Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7) +static s32 ov22_0225A860(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; s32 v2; v0 = MessageLoader_Init(0, param1, param2, 13); @@ -274,9 +273,9 @@ static s32 ov22_0225A860 (Window * param0, int param1, int param2, int param3, i return v2; } -static s32 ov22_0225A8B4 (Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7, Strbuf **param8) +static s32 ov22_0225A8B4(Window *param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7, Strbuf **param8) { - MessageLoader * v0; + MessageLoader *v0; s32 v1; GF_ASSERT(*param8 == NULL); @@ -291,7 +290,7 @@ static s32 ov22_0225A8B4 (Window * param0, int param1, int param2, int param3, i return v1; } -static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4) +static void ov22_0225A914(UnkStruct_ov22_0225A914 *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3, NARC *param4) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; @@ -325,7 +324,7 @@ static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManag } } -static void ov22_0225A9C8 (UnkStruct_ov22_0225A914 * param0, int param1) +static void ov22_0225A9C8(UnkStruct_ov22_0225A914 *param0, int param1) { int v0; @@ -342,7 +341,7 @@ static void ov22_0225A9C8 (UnkStruct_ov22_0225A914 * param0, int param1) param0->unk_60 = param1; } -static void ov22_0225AA10 (UnkStruct_ov22_0225A914 * param0, UnkStruct_02009714 ** param1) +static void ov22_0225AA10(UnkStruct_ov22_0225A914 *param0, UnkStruct_02009714 **param1) { int v0; @@ -353,7 +352,7 @@ static void ov22_0225AA10 (UnkStruct_ov22_0225A914 * param0, UnkStruct_02009714 ov22_0225AAC0(param0->unk_00, param1); } -static void ov22_0225AA34 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, NARC * param3, int param4, int param5, int param6, int param7, int param8, int param9) +static void ov22_0225AA34(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1, int param2, NARC *param3, int param4, int param5, int param6, int param7, int param8, int param9) { param0[0] = sub_02009A4C(param1[0], param3, param4, 0, param9 + param4, NNS_G2D_VRAM_TYPE_2DSUB, param2); @@ -369,7 +368,7 @@ static void ov22_0225AA34 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** p param0[3] = sub_02009BC4(param1[3], param3, param7, 0, param9 + param7, 3, param2); } -static void ov22_0225AAC0 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1) +static void ov22_0225AAC0(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1) { sub_0200A4E4(param0[0]); sub_0200A6DC(param0[1]); @@ -379,12 +378,12 @@ static void ov22_0225AAC0 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** p sub_02009D68(param1[3], param0[3]); } -static void ov22_0225AAF4 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, UnkStruct_ov19_021DA864 * param2, int param3) +static void ov22_0225AAF4(UnkStruct_02009DC8 **param0, UnkStruct_02009714 **param1, UnkStruct_ov19_021DA864 *param2, int param3) { sub_020093B4(param2, sub_02009E08(param0[0]), sub_02009E08(param0[1]), sub_02009E08(param0[2]), sub_02009E08(param0[3]), 0xffffffff, 0xffffffff, 0, param3, param1[0], param1[1], param1[2], param1[3], NULL, NULL); } -static void ov22_0225AB54 (UnkStruct_ov22_0225AB54 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6) +static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, GraphicElementManager *param1, UnkStruct_02009714 **param2, int param3, BGL *param4, UnkStruct_02095C60 *param5, NARC *param6) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; @@ -425,7 +424,7 @@ static void ov22_0225AB54 (UnkStruct_ov22_0225AB54 * param0, GraphicElementManag sub_0201A954(param0->unk_18); } -static void ov22_0225AC58 (UnkStruct_ov22_0225AB54 * param0, UnkStruct_02009714 ** param1) +static void ov22_0225AC58(UnkStruct_ov22_0225AB54 *param0, UnkStruct_02009714 **param1) { if (param0->unk_24) { SysTask_Done(param0->unk_24); @@ -441,7 +440,7 @@ static void ov22_0225AC58 (UnkStruct_ov22_0225AB54 * param0, UnkStruct_02009714 memset(param0, 0, sizeof(UnkStruct_ov22_0225AB54)); } -static void ov22_0225AC8C (UnkStruct_ov22_0225AB54 * param0) +static void ov22_0225AC8C(UnkStruct_ov22_0225AB54 *param0) { u32 v0; @@ -454,7 +453,7 @@ static void ov22_0225AC8C (UnkStruct_ov22_0225AB54 * param0) ov22_0225AE9C(¶m0->unk_30); } -static void ov22_0225ACBC (UnkStruct_ov22_0225AB54 * param0) +static void ov22_0225ACBC(UnkStruct_ov22_0225AB54 *param0) { if (param0->unk_1C != param0->unk_2C->unk_00.unk_00) { param0->unk_1C = param0->unk_2C->unk_00.unk_00; @@ -466,7 +465,7 @@ static void ov22_0225ACBC (UnkStruct_ov22_0225AB54 * param0) } } -static void ov22_0225ACE4 (UnkStruct_ov22_0225AB54 * param0) +static void ov22_0225ACE4(UnkStruct_ov22_0225AB54 *param0) { int v0; int v1; @@ -500,14 +499,14 @@ static void ov22_0225ACE4 (UnkStruct_ov22_0225AB54 * param0) } } -static void ov22_0225AD5C (UnkStruct_ov22_0225AB54 * param0) +static void ov22_0225AD5C(UnkStruct_ov22_0225AB54 *param0) { if ((param0->unk_20 - 1) >= 0) { param0->unk_20--; } } -static void ov22_0225AD68 (UnkStruct_ov22_0225AD68 * param0, fx32 param1, fx32 param2, int param3) +static void ov22_0225AD68(UnkStruct_ov22_0225AD68 *param0, fx32 param1, fx32 param2, int param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -516,7 +515,7 @@ static void ov22_0225AD68 (UnkStruct_ov22_0225AD68 * param0, fx32 param1, fx32 p param0->unk_0C = 0; } -static BOOL ov22_0225AD78 (UnkStruct_ov22_0225AD68 * param0) +static BOOL ov22_0225AD78(UnkStruct_ov22_0225AD68 *param0) { fx32 v0; @@ -535,7 +534,7 @@ static BOOL ov22_0225AD78 (UnkStruct_ov22_0225AD68 * param0) return 1; } -static void ov22_0225ADC0 (UnkStruct_ov22_0225AB54 * param0, UnkStruct_ov22_0225AE9C * param1) +static void ov22_0225ADC0(UnkStruct_ov22_0225AB54 *param0, UnkStruct_ov22_0225AE9C *param1) { int v0; fx32 v1; @@ -575,7 +574,7 @@ static void ov22_0225ADC0 (UnkStruct_ov22_0225AB54 * param0, UnkStruct_ov22_0225 param1->unk_00 = 1; } -static void ov22_0225AE9C (UnkStruct_ov22_0225AE9C * param0) +static void ov22_0225AE9C(UnkStruct_ov22_0225AE9C *param0) { VecFx32 v0; VecFx32 v1; @@ -613,7 +612,7 @@ static void ov22_0225AE9C (UnkStruct_ov22_0225AE9C * param0) } } -static BOOL ov22_0225AF34 (const UnkStruct_ov22_0225AE9C * param0) +static BOOL ov22_0225AF34(const UnkStruct_ov22_0225AE9C *param0) { if (param0->unk_00 == 1) { return 0; diff --git a/src/overlay022/ov22_0225AF44.c b/src/overlay022/ov22_0225AF44.c index 808bbce6af..e7a721cd38 100644 --- a/src/overlay022/ov22_0225AF44.c +++ b/src/overlay022/ov22_0225AF44.c @@ -1,14 +1,14 @@ +#include "overlay022/ov22_0225AF44.h" + #include #include +#include "overlay022/ov22_022597BC.h" #include "overlay022/struct_ov22_02257964.h" #include "overlay022/struct_ov22_0225AF44.h" #include "overlay022/struct_ov22_0225AF68.h" -#include "overlay022/ov22_022597BC.h" -#include "overlay022/ov22_0225AF44.h" - -void ov22_0225AF44 (UnkStruct_ov22_0225AF68 * param0, const UnkStruct_ov22_02257964 * param1, int param2) +void ov22_0225AF44(UnkStruct_ov22_0225AF68 *param0, const UnkStruct_ov22_02257964 *param1, int param2) { UnkStruct_ov22_0225AF44 v0; @@ -22,12 +22,12 @@ void ov22_0225AF44 (UnkStruct_ov22_0225AF68 * param0, const UnkStruct_ov22_02257 ov22_02259820(¶m0->unk_04, &v0); } -void ov22_0225AF68 (UnkStruct_ov22_0225AF68 * param0) +void ov22_0225AF68(UnkStruct_ov22_0225AF68 *param0) { ov22_02259838(¶m0->unk_04, 1); } -void ov22_0225AF74 (UnkStruct_ov22_0225AF68 * param0) +void ov22_0225AF74(UnkStruct_ov22_0225AF68 *param0) { ov22_022598A0(¶m0->unk_04); memset(param0, 0, sizeof(UnkStruct_ov22_0225AF68)); diff --git a/src/overlay022/ov22_0225AF8C.c b/src/overlay022/ov22_0225AF8C.c index 2b7130914c..819ce9561b 100644 --- a/src/overlay022/ov22_0225AF8C.c +++ b/src/overlay022/ov22_0225AF8C.c @@ -1,3 +1,5 @@ +#include "overlay022/ov22_0225AF8C.h" + #include #include @@ -6,9 +8,14 @@ #include "struct_decls/struct_02029C88_decl.h" #include "struct_decls/struct_0202A138_decl.h" #include "struct_decls/struct_0202A150_decl.h" -#include "pokemon.h" - #include "struct_defs/archived_sprite.h" + +#include "overlay022/ov22_02254DE0.h" +#include "overlay022/ov22_02255094.h" +#include "overlay022/ov22_022578F4.h" +#include "overlay022/ov22_02259098.h" +#include "overlay022/ov22_02259484.h" +#include "overlay022/ov22_0225AF44.h" #include "overlay022/struct_ov22_02254DE0.h" #include "overlay022/struct_ov22_022550D4.h" #include "overlay022/struct_ov22_02255CB8.h" @@ -19,28 +26,21 @@ #include "overlay022/struct_ov22_0225AF8C.h" #include "overlay022/struct_ov22_0225B388.h" +#include "heap.h" #include "narc.h" +#include "pokemon.h" #include "unk_02006E3C.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0202298C.h" #include "unk_020298BC.h" -#include "pokemon.h" -#include "overlay022/ov22_02254DE0.h" -#include "overlay022/ov22_02255094.h" -#include "overlay022/ov22_022578F4.h" -#include "overlay022/ov22_02259098.h" -#include "overlay022/ov22_02259484.h" -#include "overlay022/ov22_0225AF44.h" -#include "overlay022/ov22_0225AF8C.h" typedef struct UnkStruct_ov22_0225B1BC_t { UnkStruct_ov22_0225A0E4 unk_00; UnkStruct_ov22_02259484 unk_1E8; - UnkStruct_ov22_02254DE0 * unk_1F0; + UnkStruct_ov22_02254DE0 *unk_1F0; UnkStruct_ov22_02257964 unk_1F4; UnkStruct_ov22_0225AF68 unk_27C; - Pokemon * unk_298; + Pokemon *unk_298; int unk_29C; int unk_2A0; int unk_2A4; @@ -54,33 +54,33 @@ typedef struct UnkStruct_ov22_0225B1BC_t { } UnkStruct_ov22_0225B1BC; typedef struct { - const UnkStruct_0202A138 * unk_00; - const UnkStruct_0202A150 * unk_04[20]; + const UnkStruct_0202A138 *unk_00; + const UnkStruct_0202A150 *unk_04[20]; int unk_54; - BGL * unk_58; + BGL *unk_58; int unk_5C; int unk_60; int unk_64; int unk_68; } UnkStruct_ov22_0225B4E4; -static UnkStruct_ov22_0225B1BC * ov22_0225B1BC(const UnkStruct_ov22_0225B4E4 * param0); -static UnkStruct_ov22_0225B1BC * ov22_0225B258(const UnkStruct_ov22_0225B4E4 * param0); -static void ov22_0225B2D4(UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov22_0225B4E4 * param1); -static void ov22_0225B328(UnkStruct_ov22_0225B1BC * param0); -static void ov22_0225B35C(UnkStruct_ov22_0225B1BC * param0); -static void ov22_0225B388(UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov22_0225B4E4 * param1); -static void ov22_0225B450(UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov22_0225B4E4 * param1); -static void ov22_0225B464(UnkStruct_ov22_0225B1BC * param0); -static void ov22_0225B480(UnkStruct_ov22_0225B1BC * param0); -static void ov22_0225B490(UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov22_0225B4E4 * param1); -static void ov22_0225B4E4(UnkStruct_ov22_0225B4E4 * param0, const UnkStruct_ov22_0225AF8C * param1); -static void ov22_0225B4F8(UnkStruct_ov22_0225B4E4 * param0, const UnkStruct_02029C68 * param1); -static void ov22_0225B540(UnkStruct_ov22_0225B4E4 * param0, const UnkStruct_02029C88 * param1); -static void ov22_0225B588(UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1, const UnkStruct_ov22_0225B4E4 * param2, int param3); -static void ov22_0225B5A8(UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1, const UnkStruct_ov22_0225B4E4 * param2, int param3); - -UnkStruct_ov22_0225B1BC * ov22_0225AF8C (const UnkStruct_ov22_0225AF8C * param0, const UnkStruct_02029C68 * param1) +static UnkStruct_ov22_0225B1BC *ov22_0225B1BC(const UnkStruct_ov22_0225B4E4 *param0); +static UnkStruct_ov22_0225B1BC *ov22_0225B258(const UnkStruct_ov22_0225B4E4 *param0); +static void ov22_0225B2D4(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_0225B4E4 *param1); +static void ov22_0225B328(UnkStruct_ov22_0225B1BC *param0); +static void ov22_0225B35C(UnkStruct_ov22_0225B1BC *param0); +static void ov22_0225B388(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_0225B4E4 *param1); +static void ov22_0225B450(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_0225B4E4 *param1); +static void ov22_0225B464(UnkStruct_ov22_0225B1BC *param0); +static void ov22_0225B480(UnkStruct_ov22_0225B1BC *param0); +static void ov22_0225B490(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_0225B4E4 *param1); +static void ov22_0225B4E4(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_ov22_0225AF8C *param1); +static void ov22_0225B4F8(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_02029C68 *param1); +static void ov22_0225B540(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_02029C88 *param1); +static void ov22_0225B588(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, int param3); +static void ov22_0225B5A8(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, int param3); + +UnkStruct_ov22_0225B1BC *ov22_0225AF8C(const UnkStruct_ov22_0225AF8C *param0, const UnkStruct_02029C68 *param1) { UnkStruct_ov22_0225B4E4 v0; @@ -90,7 +90,7 @@ UnkStruct_ov22_0225B1BC * ov22_0225AF8C (const UnkStruct_ov22_0225AF8C * param0, return ov22_0225B1BC(&v0); } -UnkStruct_ov22_0225B1BC * ov22_0225AFB0 (const UnkStruct_ov22_0225AF8C * param0, const UnkStruct_02029C88 * param1) +UnkStruct_ov22_0225B1BC *ov22_0225AFB0(const UnkStruct_ov22_0225AF8C *param0, const UnkStruct_02029C88 *param1) { UnkStruct_ov22_0225B4E4 v0; @@ -100,7 +100,7 @@ UnkStruct_ov22_0225B1BC * ov22_0225AFB0 (const UnkStruct_ov22_0225AF8C * param0, return ov22_0225B1BC(&v0); } -UnkStruct_ov22_0225B1BC * ov22_0225AFD4 (const UnkStruct_ov22_0225AF8C * param0, const UnkStruct_02029C88 * param1) +UnkStruct_ov22_0225B1BC *ov22_0225AFD4(const UnkStruct_ov22_0225AF8C *param0, const UnkStruct_02029C88 *param1) { UnkStruct_ov22_0225B4E4 v0; @@ -110,7 +110,7 @@ UnkStruct_ov22_0225B1BC * ov22_0225AFD4 (const UnkStruct_ov22_0225AF8C * param0, return ov22_0225B258(&v0); } -void ov22_0225AFF8 (UnkStruct_ov22_0225B1BC * param0) +void ov22_0225AFF8(UnkStruct_ov22_0225B1BC *param0) { if (param0->unk_2C4 == 1) { ov22_0225AF68(¶m0->unk_27C); @@ -121,7 +121,7 @@ void ov22_0225AFF8 (UnkStruct_ov22_0225B1BC * param0) } } -void ov22_0225B020 (UnkStruct_ov22_0225B1BC * param0) +void ov22_0225B020(UnkStruct_ov22_0225B1BC *param0) { if (param0->unk_2C4) { ov22_0225B480(param0); @@ -139,22 +139,22 @@ void ov22_0225B020 (UnkStruct_ov22_0225B1BC * param0) Heap_FreeToHeap(param0); } -void ov22_0225B06C (UnkStruct_ov22_0225B1BC * param0) +void ov22_0225B06C(UnkStruct_ov22_0225B1BC *param0) { ov22_02255530(¶m0->unk_00); } -void ov22_0225B074 (UnkStruct_ov22_0225B1BC * param0, BOOL param1) +void ov22_0225B074(UnkStruct_ov22_0225B1BC *param0, BOOL param1) { param0->unk_2C8 = param1; } -void ov22_0225B07C (UnkStruct_ov22_0225B1BC * param0, BOOL param1) +void ov22_0225B07C(UnkStruct_ov22_0225B1BC *param0, BOOL param1) { param0->unk_00.unk_1C = param1; } -void ov22_0225B080 (UnkStruct_ov22_0225B1BC * param0, int param1, int param2) +void ov22_0225B080(UnkStruct_ov22_0225B1BC *param0, int param1, int param2) { ov22_02257AD8(¶m0->unk_1F4, param0->unk_2A0, param0->unk_2A4, param1, param2); @@ -167,25 +167,25 @@ void ov22_0225B080 (UnkStruct_ov22_0225B1BC * param0, int param1, int param2) param0->unk_2A4 = param2; } -void ov22_0225B0D8 (UnkStruct_ov22_0225B1BC * param0, int param1, int param2) +void ov22_0225B0D8(UnkStruct_ov22_0225B1BC *param0, int param1, int param2) { param0->unk_2A8 = param1; param0->unk_2AC = param2; } -void ov22_0225B0E4 (UnkStruct_ov22_0225B1BC * param0, u16 param1) +void ov22_0225B0E4(UnkStruct_ov22_0225B1BC *param0, u16 param1) { param0->unk_2B0 = param1; } -void ov22_0225B0EC (UnkStruct_ov22_0225B1BC * param0, fx32 param1, fx32 param2, fx32 param3) +void ov22_0225B0EC(UnkStruct_ov22_0225B1BC *param0, fx32 param1, fx32 param2, fx32 param3) { param0->unk_2B4.x = param1; param0->unk_2B4.y = param2; param0->unk_2B4.z = param3; } -void ov22_0225B100 (UnkStruct_ov22_0225B1BC * param0, int param1, int param2) +void ov22_0225B100(UnkStruct_ov22_0225B1BC *param0, int param1, int param2) { int v0, v1; int v2, v3; @@ -210,7 +210,7 @@ void ov22_0225B100 (UnkStruct_ov22_0225B1BC * param0, int param1, int param2) ov22_0225B0D8(param0, v8, v9); } -void ov22_0225B158 (UnkStruct_ov22_0225B1BC * param0, int param1, int param2, int param3) +void ov22_0225B158(UnkStruct_ov22_0225B1BC *param0, int param1, int param2, int param3) { int v0; fx32 v1; @@ -223,20 +223,20 @@ void ov22_0225B158 (UnkStruct_ov22_0225B1BC * param0, int param1, int param2, in ov22_0225B100(param0, param1, param2 - v0); } -void ov22_0225B198 (UnkStruct_ov22_0225B1BC * param0, GXRgb param1) +void ov22_0225B198(UnkStruct_ov22_0225B1BC *param0, GXRgb param1) { param0->unk_2C0 = param1; ov22_02257D70(¶m0->unk_1F4, param1); } -void ov22_0225B1AC (UnkStruct_ov22_0225B1BC * param0, int param1) +void ov22_0225B1AC(UnkStruct_ov22_0225B1BC *param0, int param1) { ov22_02257B74(¶m0->unk_1F4, param1); } -static UnkStruct_ov22_0225B1BC * ov22_0225B1BC (const UnkStruct_ov22_0225B4E4 * param0) +static UnkStruct_ov22_0225B1BC *ov22_0225B1BC(const UnkStruct_ov22_0225B4E4 *param0) { - UnkStruct_ov22_0225B1BC * v0; + UnkStruct_ov22_0225B1BC *v0; BOOL v1; v0 = Heap_AllocFromHeap(param0->unk_68, sizeof(UnkStruct_ov22_0225B1BC)); @@ -264,9 +264,9 @@ static UnkStruct_ov22_0225B1BC * ov22_0225B1BC (const UnkStruct_ov22_0225B4E4 * return v0; } -static UnkStruct_ov22_0225B1BC * ov22_0225B258 (const UnkStruct_ov22_0225B4E4 * param0) +static UnkStruct_ov22_0225B1BC *ov22_0225B258(const UnkStruct_ov22_0225B4E4 *param0) { - UnkStruct_ov22_0225B1BC * v0; + UnkStruct_ov22_0225B1BC *v0; BOOL v1; v0 = Heap_AllocFromHeap(param0->unk_68, sizeof(UnkStruct_ov22_0225B1BC)); @@ -292,7 +292,7 @@ static UnkStruct_ov22_0225B1BC * ov22_0225B258 (const UnkStruct_ov22_0225B4E4 * return v0; } -static void ov22_0225B2D4 (UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov22_0225B4E4 * param1) +static void ov22_0225B2D4(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_0225B4E4 *param1) { UnkStruct_ov22_02255CB8 v0; UnkStruct_ov22_022550D4 v1; @@ -310,12 +310,12 @@ static void ov22_0225B2D4 (UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov2 ov22_02255338(&v0); } -static void ov22_0225B328 (UnkStruct_ov22_0225B1BC * param0) +static void ov22_0225B328(UnkStruct_ov22_0225B1BC *param0) { ov22_0225553C(¶m0->unk_00, param0->unk_2A0 + param0->unk_2A8, param0->unk_2A4 + param0->unk_2AC, param0->unk_2B0, ¶m0->unk_2B4); } -static void ov22_0225B35C (UnkStruct_ov22_0225B1BC * param0) +static void ov22_0225B35C(UnkStruct_ov22_0225B1BC *param0) { ov22_022551D0(¶m0->unk_00); ov22_022554F8(¶m0->unk_00); @@ -327,7 +327,7 @@ static void ov22_0225B35C (UnkStruct_ov22_0225B1BC * param0) NARC_dtor(param0->unk_00.unk_5C); } -static void ov22_0225B388 (UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov22_0225B4E4 * param1) +static void ov22_0225B388(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_0225B4E4 *param1) { UnkStruct_ov22_0225B388 v0; int v1, v2, v3; @@ -373,23 +373,23 @@ static void ov22_0225B388 (UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov2 } } -static void ov22_0225B450 (UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov22_0225B4E4 * param1) +static void ov22_0225B450(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_0225B4E4 *param1) { ov22_02257C88(¶m0->unk_1F4, param1->unk_5C, param1->unk_68); } -static void ov22_0225B464 (UnkStruct_ov22_0225B1BC * param0) +static void ov22_0225B464(UnkStruct_ov22_0225B1BC *param0) { ov22_02257A98(¶m0->unk_1F4); ov22_02257948(¶m0->unk_1F4); } -static void ov22_0225B480 (UnkStruct_ov22_0225B1BC * param0) +static void ov22_0225B480(UnkStruct_ov22_0225B1BC *param0) { ov22_02257CD4(¶m0->unk_1F4); } -static void ov22_0225B490 (UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov22_0225B4E4 * param1) +static void ov22_0225B490(UnkStruct_ov22_0225B1BC *param0, const UnkStruct_ov22_0225B4E4 *param1) { param0->unk_2A0 = (136 - (8 * 8)); param0->unk_2A4 = (16 + (5 * 8)); @@ -405,7 +405,7 @@ static void ov22_0225B490 (UnkStruct_ov22_0225B1BC * param0, const UnkStruct_ov2 param0->unk_2C0 = GX_RGB(31, 31, 31); } -static void ov22_0225B4E4 (UnkStruct_ov22_0225B4E4 * param0, const UnkStruct_ov22_0225AF8C * param1) +static void ov22_0225B4E4(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_ov22_0225AF8C *param1) { param0->unk_58 = param1->unk_00; param0->unk_60 = param1->unk_04; @@ -413,7 +413,7 @@ static void ov22_0225B4E4 (UnkStruct_ov22_0225B4E4 * param0, const UnkStruct_ov2 param0->unk_68 = param1->unk_0C; } -static void ov22_0225B4F8 (UnkStruct_ov22_0225B4E4 * param0, const UnkStruct_02029C68 * param1) +static void ov22_0225B4F8(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_02029C68 *param1) { int v0; @@ -430,7 +430,7 @@ static void ov22_0225B4F8 (UnkStruct_ov22_0225B4E4 * param0, const UnkStruct_020 param0->unk_5C = sub_0202A1DC(param1); } -static void ov22_0225B540 (UnkStruct_ov22_0225B4E4 * param0, const UnkStruct_02029C88 * param1) +static void ov22_0225B540(UnkStruct_ov22_0225B4E4 *param0, const UnkStruct_02029C88 *param1) { int v0; @@ -447,17 +447,17 @@ static void ov22_0225B540 (UnkStruct_ov22_0225B4E4 * param0, const UnkStruct_020 param0->unk_5C = sub_0202A5B8(param1); } -static void ov22_0225B588 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1, const UnkStruct_ov22_0225B4E4 * param2, int param3) +static void ov22_0225B588(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, int param3) { ov22_02255410(param1, param3); ov22_0225B5A8(param0, param1, param2, param3); } -static void ov22_0225B5A8 (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1, const UnkStruct_ov22_0225B4E4 * param2, int param3) +static void ov22_0225B5A8(UnkStruct_ov22_0225A0E4 *param0, UnkStruct_ov22_02255CB8 *param1, const UnkStruct_ov22_0225B4E4 *param2, int param3) { int v0; int v1; - void * v2; + void *v2; int v3; for (v0 = 0; v0 < param2->unk_54; v0++) { diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index 3b8ea2a003..9243c748da 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -1,68 +1,65 @@ +#include "overlay022/ov22_0225B660.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029C88_decl.h" -#include "pokemon.h" -#include "overlay022/struct_ov22_0225B1BC_decl.h" - #include "struct_defs/struct_02041DC8.h" #include "struct_defs/struct_0205AA50.h" + +#include "overlay022/ov22_02255094.h" +#include "overlay022/ov22_0225AF8C.h" #include "overlay022/struct_ov22_0225A0E4.h" #include "overlay022/struct_ov22_0225AF8C.h" +#include "overlay022/struct_ov22_0225B1BC_decl.h" -#include "unk_02002B7C.h" -#include "overlay_manager.h" -#include "unk_02006E3C.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" #include "message.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02002B7C.h" +#include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_020298BC.h" -#include "pokemon.h" #include "unk_02094EDC.h" -#include "overlay022/ov22_02255094.h" -#include "overlay022/ov22_0225AF8C.h" -#include "overlay022/ov22_0225B660.h" typedef struct { - const UnkStruct_02029C68 * unk_00; - const UnkStruct_02029C88 * unk_04; + const UnkStruct_02029C68 *unk_00; + const UnkStruct_02029C88 *unk_04; u32 unk_08; u32 unk_0C; - UnkStruct_ov22_0225B1BC * unk_10; + UnkStruct_ov22_0225B1BC *unk_10; UnkStruct_ov22_0225A0E4 unk_14; - GraphicElementData * unk_1FC; - Window * unk_200; + GraphicElementData *unk_1FC; + Window *unk_200; } UnkStruct_ov22_0225B85C; -static void ov22_0225B848(void * param0); -static void ov22_0225B85C(UnkStruct_ov22_0225B85C * param0); -static void ov22_0225B910(UnkStruct_ov22_0225B85C * param0); -static void ov22_0225B964(UnkStruct_ov22_0225B85C * param0); -static void ov22_0225BA00(UnkStruct_ov22_0225B85C * param0); -static void ov22_0225BA40(UnkStruct_ov22_0225B85C * param0); -static void ov22_0225BAA8(UnkStruct_ov22_0225B85C * param0); -static void ov22_0225BAD0(UnkStruct_ov22_0225B85C * param0); -static void ov22_0225BB00(UnkStruct_ov22_0225B85C * param0); -static void ov22_0225BC18(UnkStruct_ov22_0225B85C * param0); - -int ov22_0225B660 (OverlayManager * param0, int * param1) +static void ov22_0225B848(void *param0); +static void ov22_0225B85C(UnkStruct_ov22_0225B85C *param0); +static void ov22_0225B910(UnkStruct_ov22_0225B85C *param0); +static void ov22_0225B964(UnkStruct_ov22_0225B85C *param0); +static void ov22_0225BA00(UnkStruct_ov22_0225B85C *param0); +static void ov22_0225BA40(UnkStruct_ov22_0225B85C *param0); +static void ov22_0225BAA8(UnkStruct_ov22_0225B85C *param0); +static void ov22_0225BAD0(UnkStruct_ov22_0225B85C *param0); +static void ov22_0225BB00(UnkStruct_ov22_0225B85C *param0); +static void ov22_0225BC18(UnkStruct_ov22_0225B85C *param0); + +int ov22_0225B660(OverlayManager *param0, int *param1) { - UnkStruct_ov22_0225B85C * v0; - UnkStruct_02041DC8 * v1; + UnkStruct_ov22_0225B85C *v0; + UnkStruct_02041DC8 *v1; Heap_Create(3, 13, 0x20000); Heap_Create(3, 14, 0x40000); @@ -113,9 +110,9 @@ int ov22_0225B660 (OverlayManager * param0, int * param1) return 1; } -int ov22_0225B738 (OverlayManager * param0, int * param1) +int ov22_0225B738(OverlayManager *param0, int *param1) { - UnkStruct_ov22_0225B85C * v0 = OverlayManager_Data(param0); + UnkStruct_ov22_0225B85C *v0 = OverlayManager_Data(param0); { sub_020241B4(); @@ -159,9 +156,9 @@ int ov22_0225B738 (OverlayManager * param0, int * param1) return 0; } -int ov22_0225B7FC (OverlayManager * param0, int * param1) +int ov22_0225B7FC(OverlayManager *param0, int *param1) { - UnkStruct_ov22_0225B85C * v0 = OverlayManager_Data(param0); + UnkStruct_ov22_0225B85C *v0 = OverlayManager_Data(param0); ov22_0225B020(v0->unk_10); ov22_0225BA00(v0); @@ -178,18 +175,18 @@ int ov22_0225B7FC (OverlayManager * param0, int * param1) return 1; } -static void ov22_0225B848 (void * param0) +static void ov22_0225B848(void *param0) { - UnkStruct_ov22_0225B85C * v0 = param0; + UnkStruct_ov22_0225B85C *v0 = param0; ov22_0225B06C(v0->unk_10); ov22_0225561C(&v0->unk_14); } -static void ov22_0225B85C (UnkStruct_ov22_0225B85C * param0) +static void ov22_0225B85C(UnkStruct_ov22_0225B85C *param0) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; int v2; int v3; @@ -212,14 +209,14 @@ static void ov22_0225B85C (UnkStruct_ov22_0225B85C * param0) sub_0201C3C0(param0->unk_14.unk_40, 1); } -static void ov22_0225B910 (UnkStruct_ov22_0225B85C * param0) +static void ov22_0225B910(UnkStruct_ov22_0225B85C *param0) { sub_02006E84(12, 12, 4, 0, 32, 14); sub_02006E60(12, 11, param0->unk_14.unk_40, 4, 0, 0, 1, 14); sub_02006E3C(12, 10, param0->unk_14.unk_40, 4, 0, 0, 1, 14); } -static void ov22_0225B964 (UnkStruct_ov22_0225B85C * param0) +static void ov22_0225B964(UnkStruct_ov22_0225B85C *param0) { ov22_02255248(¶m0->unk_14, param0->unk_14.unk_5C, 233, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1000); ov22_02255268(¶m0->unk_14, param0->unk_14.unk_5C, 234, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 6, 1000); @@ -231,7 +228,7 @@ static void ov22_0225B964 (UnkStruct_ov22_0225B85C * param0) sub_02021E80(param0->unk_1FC, 1); } -static void ov22_0225BA00 (UnkStruct_ov22_0225B85C * param0) +static void ov22_0225BA00(UnkStruct_ov22_0225B85C *param0) { ov22_022552C4(¶m0->unk_14, 1000); ov22_022552D8(¶m0->unk_14, 1000); @@ -240,7 +237,7 @@ static void ov22_0225BA00 (UnkStruct_ov22_0225B85C * param0) sub_02021BD4(param0->unk_1FC); } -static void ov22_0225BA40 (UnkStruct_ov22_0225B85C * param0) +static void ov22_0225BA40(UnkStruct_ov22_0225B85C *param0) { param0->unk_200 = sub_0201A778(14, 1); @@ -252,14 +249,14 @@ static void ov22_0225BA40 (UnkStruct_ov22_0225B85C * param0) sub_02019184(param0->unk_14.unk_40, 3, 3, 0); } -static void ov22_0225BAA8 (UnkStruct_ov22_0225B85C * param0) +static void ov22_0225BAA8(UnkStruct_ov22_0225B85C *param0) { sub_0201ACF4(param0->unk_200); BGL_DeleteWindow(param0->unk_200); sub_0201A928(param0->unk_200, 1); } -static void ov22_0225BAD0 (UnkStruct_ov22_0225B85C * param0) +static void ov22_0225BAD0(UnkStruct_ov22_0225B85C *param0) { BGL_FillWindow(param0->unk_200, 0); @@ -272,16 +269,16 @@ static void ov22_0225BAD0 (UnkStruct_ov22_0225B85C * param0) sub_0201A954(param0->unk_200); } -static void ov22_0225BB00 (UnkStruct_ov22_0225B85C * param0) +static void ov22_0225BB00(UnkStruct_ov22_0225B85C *param0) { VecFx32 v0; int v1, v2; int v3; u16 v4; - StringTemplate * v5; - Strbuf* v6; - Strbuf* v7; - MessageLoader * v8; + StringTemplate *v5; + Strbuf *v6; + Strbuf *v7; + MessageLoader *v8; v8 = MessageLoader_Init(0, 26, 385, 13); GF_ASSERT(v8); @@ -321,16 +318,16 @@ static void ov22_0225BB00 (UnkStruct_ov22_0225B85C * param0) StringTemplate_Free(v5); } -static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) +static void ov22_0225BC18(UnkStruct_ov22_0225B85C *param0) { int v0; - StringTemplate * v1; - Strbuf* v2; - Strbuf* v3; + StringTemplate *v1; + Strbuf *v2; + Strbuf *v3; int v4; - Pokemon * v5; - BoxPokemon * v6; - MessageLoader * v7; + Pokemon *v5; + BoxPokemon *v6; + MessageLoader *v7; int v8, v9; int v10; diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index 49c38172e8..125d1b5ad4 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -1,86 +1,85 @@ +#include "overlay023/ov23_0223E140.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "camera.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_020298B0_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0200C738.h" +#include "struct_defs/struct_02099F80.h" + #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_02099F80.h" +#include "overlay005/hblank_system.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" +#include "overlay023/ov23_022416A8.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_0224340C.h" +#include "overlay023/ov23_02248F1C.h" +#include "overlay023/ov23_0224A1D0.h" +#include "overlay023/ov23_0224B05C.h" +#include "overlay023/ov23_0224F294.h" +#include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_0224271C.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "camera.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_system.h" +#include "gx_layers.h" +#include "heap.h" +#include "journal.h" +#include "narc.h" +#include "savedata.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" #include "unk_0200A9DC.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" #include "unk_0202854C.h" -#include "journal.h" #include "unk_0202CD50.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020393C8.h" #include "unk_02039C80.h" -#include "field_system.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_02054D00.h" -#include "comm_player_manager.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_0206CCB0.h" -#include "overlay005/hblank_system.h" -#include "overlay023/ov23_0223E140.h" -#include "overlay023/ov23_022416A8.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_0224340C.h" -#include "overlay023/ov23_02248F1C.h" -#include "overlay023/ov23_0224A1D0.h" -#include "overlay023/ov23_0224B05C.h" -#include "overlay023/ov23_0224F294.h" -#include "overlay023/ov23_02253D40.h" +#include "vars_flags.h" typedef struct { u8 unk_00; @@ -100,10 +99,10 @@ typedef struct { int unk_04; int unk_08; int unk_0C; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; int unk_14; - void * unk_18[4]; - NNSG2dPaletteData * unk_28[4]; + void *unk_18[4]; + NNSG2dPaletteData *unk_28[4]; int unk_38[4]; int unk_48; int unk_4C; @@ -118,7 +117,7 @@ typedef struct { } UnkStruct_ov23_0223E6F8; typedef struct { - void * unk_00; + void *unk_00; u16 unk_04; u16 unk_06; u16 unk_08; @@ -131,7 +130,7 @@ typedef struct { } UnkStruct_ov23_02256EB0; typedef struct { - UnkStruct_ov23_02256EB0 * unk_00; + UnkStruct_ov23_02256EB0 *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; @@ -146,29 +145,29 @@ typedef struct { } UnkStruct_ov23_022412CC; typedef struct { - FieldSystem * fieldSystem; - BGL * unk_04; + FieldSystem *fieldSystem; + BGL *unk_04; MATHRandContext32 unk_08; - GraphicElementManager * unk_20; + GraphicElementManager *unk_20; UnkStruct_0200C738 unk_24; - UnkStruct_02009714 * unk_1B0[4]; - UnkStruct_02009DC8 * unk_1C0[8]; + UnkStruct_02009714 *unk_1B0[4]; + UnkStruct_02009DC8 *unk_1C0[8]; UnkStruct_ov19_021DA864 unk_1E0; UnkStruct_ov19_021DA864 unk_204[2]; - GraphicElementData * unk_24C[8]; + GraphicElementData *unk_24C[8]; UnkStruct_ov23_0223E6F8 unk_26C[250]; - UIControlData * unk_848; - UnkStruct_ov23_0223E6F8 * unk_84C[8]; + UIControlData *unk_848; + UnkStruct_ov23_0223E6F8 *unk_84C[8]; u8 unk_86C[8]; UnkStruct_ov23_0223FC9C unk_874[8]; u8 unk_8BC[8]; - SysTask * unk_8C4; - SysTask * unk_8C8; - SysTask * unk_8CC; - UnkStruct_ov23_022412CC * unk_8D0; + SysTask *unk_8C4; + SysTask *unk_8C8; + SysTask *unk_8CC; + UnkStruct_ov23_022412CC *unk_8D0; UnkStruct_ov23_0224142C unk_8D4[8]; u8 unk_8FC[8]; - void * unk_904; + void *unk_904; u8 unk_908[8]; u8 unk_910[8]; u8 unk_918[8]; @@ -186,401 +185,401 @@ typedef struct { u8 unk_A30; } UnkStruct_ov23_02257740; -static void ov23_02240688(BGL * param0); -static void ov23_0223E434(MATHRandContext16 * param0, int param1); -static UnkStruct_ov23_0223E6F8 * ov23_0223E6F8(void); -static UnkStruct_ov23_0223E6F8 * ov23_0223E88C(u16 param0, u16 param1); -static void ov23_0223EA38(SysTask * param0, void * param1); -static void ov23_0223EE80(UnkStruct_ov23_0223EE80 * param0); +static void ov23_02240688(BGL *param0); +static void ov23_0223E434(MATHRandContext16 *param0, int param1); +static UnkStruct_ov23_0223E6F8 *ov23_0223E6F8(void); +static UnkStruct_ov23_0223E6F8 *ov23_0223E88C(u16 param0, u16 param1); +static void ov23_0223EA38(SysTask *param0, void *param1); +static void ov23_0223EE80(UnkStruct_ov23_0223EE80 *param0); static void ov23_0223EF98(void); -static void ov23_0223F70C(FieldSystem * fieldSystem); -static void ov23_0223FA3C(BGL * param0, int param1, UnkStruct_ov23_0223EE80 * param2); -static void ov23_0223FF60(int param0, BGL * param1, int param2, UnkStruct_ov23_0223EE80 * param3); -static void ov23_0223FF8C(BGL * param0); -static void ov23_022401B0(BGL * param0); -static BOOL ov23_02240CFC(UnkStruct_ov23_0223EE80 * param0); -static void ov23_022404C8(BGL * param0); -static void ov23_022404F8(BGL * param0, int param1, int param2, int param3); -static BOOL ov23_02240934(UnkStruct_ov23_0223EE80 * param0); -static BOOL ov23_022409F0(UnkStruct_ov23_0223EE80 * param0); -static BOOL ov23_02240A90(UnkStruct_ov23_0223EE80 * param0); +static void ov23_0223F70C(FieldSystem *fieldSystem); +static void ov23_0223FA3C(BGL *param0, int param1, UnkStruct_ov23_0223EE80 *param2); +static void ov23_0223FF60(int param0, BGL *param1, int param2, UnkStruct_ov23_0223EE80 *param3); +static void ov23_0223FF8C(BGL *param0); +static void ov23_022401B0(BGL *param0); +static BOOL ov23_02240CFC(UnkStruct_ov23_0223EE80 *param0); +static void ov23_022404C8(BGL *param0); +static void ov23_022404F8(BGL *param0, int param1, int param2, int param3); +static BOOL ov23_02240934(UnkStruct_ov23_0223EE80 *param0); +static BOOL ov23_022409F0(UnkStruct_ov23_0223EE80 *param0); +static BOOL ov23_02240A90(UnkStruct_ov23_0223EE80 *param0); static void ov23_02240E88(void); static void ov23_0224108C(void); static void ov23_0224119C(void); -static void ov23_022411E8(void * param0); +static void ov23_022411E8(void *param0); static void ov23_022413B4(void); -static UnkStruct_ov23_0223E6F8 * ov23_0223E740(int param0, int param1); -static void ov23_0223FDE0(UnkStruct_ov23_0223EE80 * param0); -static void ov23_02240B84(BGL * param0); +static UnkStruct_ov23_0223E6F8 *ov23_0223E740(int param0, int param1); +static void ov23_0223FDE0(UnkStruct_ov23_0223EE80 *param0); +static void ov23_02240B84(BGL *param0); static void ov23_022414D4(void); static void ov23_0223E834(void); -static UnkStruct_ov23_02257740 * Unk_ov23_02257740 = NULL; +static UnkStruct_ov23_02257740 *Unk_ov23_02257740 = NULL; static u8 Unk_ov23_02256D3A[6][3] = { - {'x', 'x', 'x'}, - {'o', 'x', 'o'}, - {'o', 'x', 'o'}, - {'o', 'x', 'o'}, - {'o', 'x', 'o'}, - {'x', 'x', 'x'}, + { 'x', 'x', 'x' }, + { 'o', 'x', 'o' }, + { 'o', 'x', 'o' }, + { 'o', 'x', 'o' }, + { 'o', 'x', 'o' }, + { 'x', 'x', 'x' }, }; static u8 Unk_ov23_02256D4C[3][6] = { - {'x', 'o', 'o', 'o', 'o', 'x'}, - {'x', 'x', 'x', 'x', 'x', 'x'}, - {'x', 'o', 'o', 'o', 'o', 'x'}, + { 'x', 'o', 'o', 'o', 'o', 'x' }, + { 'x', 'x', 'x', 'x', 'x', 'x' }, + { 'x', 'o', 'o', 'o', 'o', 'x' }, }; static u8 Unk_ov23_02256BFC[2][3] = { - {'x', 'x', 'x'}, - {'o', 'x', 'o'}, + { 'x', 'x', 'x' }, + { 'o', 'x', 'o' }, }; static u8 Unk_ov23_02256C02[3][2] = { - {'o', 'x'}, - {'x', 'x'}, - {'o', 'x'}, + { 'o', 'x' }, + { 'x', 'x' }, + { 'o', 'x' }, }; static u8 Unk_ov23_02256C20[2][3] = { - {'o', 'x', 'o'}, - {'x', 'x', 'x'}, + { 'o', 'x', 'o' }, + { 'x', 'x', 'x' }, }; static u8 Unk_ov23_02256C1A[3][2] = { - {'x', 'o'}, - {'x', 'x'}, - {'x', 'o'}, + { 'x', 'o' }, + { 'x', 'x' }, + { 'x', 'o' }, }; static u8 Unk_ov23_02256C0E[2][3] = { - {'x', 'x', 'o'}, - {'o', 'x', 'x'}, + { 'x', 'x', 'o' }, + { 'o', 'x', 'x' }, }; static u8 Unk_ov23_02256C26[3][2] = { - {'o', 'x'}, - {'x', 'x'}, - {'x', 'o'}, + { 'o', 'x' }, + { 'x', 'x' }, + { 'x', 'o' }, }; static u8 Unk_ov23_02256C08[2][3] = { - {'o', 'x', 'x'}, - {'x', 'x', 'o'}, + { 'o', 'x', 'x' }, + { 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256C14[3][2] = { - {'x', 'o'}, - {'x', 'x'}, - {'o', 'x'}, + { 'x', 'o' }, + { 'x', 'x' }, + { 'o', 'x' }, }; static u8 Unk_ov23_02256D0A[4][4] = { - {'o', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'o'}, + { 'o', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256CBA[4][4] = { - {'x', 'x', 'x', 'o'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'o', 'x', 'x', 'x'}, + { 'x', 'x', 'x', 'o' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'o', 'x', 'x', 'x' }, }; static u8 Unk_ov23_02256C45[3][3] = { - {'o', 'x', 'x'}, - {'x', 'x', 'x'}, - {'x', 'x', 'o'}, + { 'o', 'x', 'x' }, + { 'x', 'x', 'x' }, + { 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256CDA[4][4] = { - {'o', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'o'}, + { 'o', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256CEA[4][4] = { - {'x', 'x', 'x', 'o'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'o', 'x', 'x', 'x'}, + { 'x', 'x', 'x', 'o' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'o', 'x', 'x', 'x' }, }; static u8 Unk_ov23_02256D5E[4][5] = { - {'x', 'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x', 'x'}, - {'o', 'x', 'x', 'x', 'o'}, + { 'x', 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x', 'x' }, + { 'o', 'x', 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256C3C[3][3] = { - {'x', 'x', 'x'}, - {'x', 'x', 'x'}, - {'x', 'x', 'o'}, + { 'x', 'x', 'x' }, + { 'x', 'x', 'x' }, + { 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256C34[2][4] = { - {'o', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'o'}, + { 'o', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256C2C[4][2] = { - {'x', 'o'}, - {'x', 'x'}, - {'x', 'x'}, - {'o', 'x'}, + { 'x', 'o' }, + { 'x', 'x' }, + { 'x', 'x' }, + { 'o', 'x' }, }; static u8 Unk_ov23_02256D72[5][4] = { - {'o', 'o', 'x', 'x'}, - {'o', 'x', 'x', 'x'}, - {'o', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'o'}, - {'x', 'x', 'o', 'o'}, + { 'o', 'o', 'x', 'x' }, + { 'o', 'x', 'x', 'x' }, + { 'o', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'o' }, + { 'x', 'x', 'o', 'o' }, }; static u8 Unk_ov23_02256D86[4][5] = { - {'x', 'x', 'o', 'o', 'o'}, - {'x', 'x', 'x', 'x', 'o'}, - {'o', 'x', 'x', 'x', 'x'}, - {'o', 'o', 'x', 'x', 'x'}, + { 'x', 'x', 'o', 'o', 'o' }, + { 'x', 'x', 'x', 'x', 'o' }, + { 'o', 'x', 'x', 'x', 'x' }, + { 'o', 'o', 'x', 'x', 'x' }, }; static u8 Unk_ov23_02256D9A[5][4] = { - {'o', 'o', 'x', 'x'}, - {'o', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'o'}, - {'x', 'x', 'x', 'o'}, - {'x', 'x', 'o', 'o'}, + { 'o', 'o', 'x', 'x' }, + { 'o', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'o' }, + { 'x', 'x', 'x', 'o' }, + { 'x', 'x', 'o', 'o' }, }; static u8 Unk_ov23_02256DAE[4][5] = { - {'x', 'x', 'x', 'o', 'o'}, - {'x', 'x', 'x', 'x', 'o'}, - {'o', 'x', 'x', 'x', 'x'}, - {'o', 'o', 'o', 'x', 'x'}, + { 'x', 'x', 'x', 'o', 'o' }, + { 'x', 'x', 'x', 'x', 'o' }, + { 'o', 'x', 'x', 'x', 'x' }, + { 'o', 'o', 'o', 'x', 'x' }, }; static u8 Unk_ov23_02256C4E[3][3] = { - {'o', 'x', 'o'}, - {'x', 'x', 'x'}, - {'x', 'x', 'x'}, + { 'o', 'x', 'o' }, + { 'x', 'x', 'x' }, + { 'x', 'x', 'x' }, }; static u8 Unk_ov23_02256C57[3][3] = { - {'o', 'x', 'o'}, - {'x', 'x', 'x'}, - {'o', 'x', 'o'}, + { 'o', 'x', 'o' }, + { 'x', 'x', 'x' }, + { 'o', 'x', 'o' }, }; static u8 Unk_ov23_02256C8A[3][4] = { - {'o', 'x', 'x', 'o'}, - {'x', 'x', 'x', 'x'}, - {'o', 'x', 'x', 'o'}, + { 'o', 'x', 'x', 'o' }, + { 'x', 'x', 'x', 'x' }, + { 'o', 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256C96[4][3] = { - {'o', 'x', 'o'}, - {'x', 'x', 'x'}, - {'x', 'x', 'x'}, - {'o', 'x', 'o'}, + { 'o', 'x', 'o' }, + { 'x', 'x', 'x' }, + { 'x', 'x', 'x' }, + { 'o', 'x', 'o' }, }; static u8 Unk_ov23_02256DD6[5][5] = { - {'x', 'x', 'x', 'x', 'o'}, - {'x', 'x', 'x', 'x', 'x'}, - {'x', 'x', 'o', 'x', 'x'}, - {'o', 'o', 'o', 'x', 'x'}, - {'o', 'o', 'x', 'x', 'o'}, + { 'x', 'x', 'x', 'x', 'o' }, + { 'x', 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'o', 'x', 'x' }, + { 'o', 'o', 'o', 'x', 'x' }, + { 'o', 'o', 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256DEF[5][5] = { - {'o', 'o', 'x', 'x', 'x'}, - {'o', 'o', 'x', 'x', 'x'}, - {'x', 'o', 'o', 'x', 'x'}, - {'x', 'x', 'x', 'x', 'x'}, - {'o', 'x', 'x', 'x', 'o'}, + { 'o', 'o', 'x', 'x', 'x' }, + { 'o', 'o', 'x', 'x', 'x' }, + { 'x', 'o', 'o', 'x', 'x' }, + { 'x', 'x', 'x', 'x', 'x' }, + { 'o', 'x', 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256E08[5][5] = { - {'o', 'x', 'x', 'o', 'o'}, - {'x', 'x', 'o', 'o', 'o'}, - {'x', 'x', 'o', 'x', 'x'}, - {'x', 'x', 'x', 'x', 'x'}, - {'o', 'x', 'x', 'x', 'x'}, + { 'o', 'x', 'x', 'o', 'o' }, + { 'x', 'x', 'o', 'o', 'o' }, + { 'x', 'x', 'o', 'x', 'x' }, + { 'x', 'x', 'x', 'x', 'x' }, + { 'o', 'x', 'x', 'x', 'x' }, }; static u8 Unk_ov23_02256E21[5][5] = { - {'o', 'x', 'x', 'x', 'o'}, - {'x', 'x', 'x', 'x', 'x'}, - {'x', 'x', 'o', 'o', 'x'}, - {'x', 'x', 'x', 'o', 'o'}, - {'x', 'x', 'x', 'o', 'o'}, + { 'o', 'x', 'x', 'x', 'o' }, + { 'x', 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'o', 'o', 'x' }, + { 'x', 'x', 'x', 'o', 'o' }, + { 'x', 'x', 'x', 'o', 'o' }, }; static u8 Unk_ov23_02256C60[3][3] = { - {'x', 'x', 'x'}, - {'x', 'x', 'o'}, - {'x', 'x', 'x'}, + { 'x', 'x', 'x' }, + { 'x', 'x', 'o' }, + { 'x', 'x', 'x' }, }; static u8 Unk_ov23_02256C69[3][3] = { - {'x', 'x', 'x'}, - {'x', 'x', 'x'}, - {'x', 'x', 'o'}, + { 'x', 'x', 'x' }, + { 'x', 'x', 'x' }, + { 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256CA2[3][4] = { - {'x', 'o', 'x', 'o'}, - {'x', 'x', 'x', 'o'}, - {'x', 'x', 'x', 'x'}, + { 'x', 'o', 'x', 'o' }, + { 'x', 'x', 'x', 'o' }, + { 'x', 'x', 'x', 'x' }, }; static u8 Unk_ov23_02256CAE[3][4] = { - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'o', 'x'}, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'o', 'x' }, }; static u8 Unk_ov23_02256BF0[2][2] = { - {'x', 'o'}, - {'x', 'x'}, + { 'x', 'o' }, + { 'x', 'x' }, }; static u8 Unk_ov23_02256DC2[4][5] = { - {'o', 'x', 'x', 'x', 'o'}, - {'o', 'x', 'x', 'x', 'o'}, - {'x', 'x', 'x', 'x', 'x'}, - {'o', 'x', 'x', 'x', 'o'}, + { 'o', 'x', 'x', 'x', 'o' }, + { 'o', 'x', 'x', 'x', 'o' }, + { 'x', 'x', 'x', 'x', 'x' }, + { 'o', 'x', 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256CFA[4][4] = { - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'o', 'x', 'x', 'o'}, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'o', 'x', 'x', 'o' }, }; static u8 Unk_ov23_02256D1A[4][4] = { - {'x', 'o', 'x', 'o'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'o', 'x', 'o', 'x'}, + { 'x', 'o', 'x', 'o' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'o', 'x', 'o', 'x' }, }; static u8 Unk_ov23_02256D2A[4][4] = { - {'o', 'x', 'x', 'o'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, - {'x', 'o', 'o', 'x'}, + { 'o', 'x', 'x', 'o' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'o', 'o', 'x' }, }; static u8 Unk_ov23_02256C72[3][4] = { - {'x', 'o', 'x', 'o'}, - {'x', 'x', 'x', 'x'}, - {'x', 'x', 'x', 'x'}, + { 'x', 'o', 'x', 'o' }, + { 'x', 'x', 'x', 'x' }, + { 'x', 'x', 'x', 'x' }, }; static u8 Unk_ov23_02256CCA[4][4] = { - {'o', 'o', 'x', 'o'}, - {'x', 'x', 'x', 'o'}, - {'o', 'x', 'x', 'x'}, - {'o', 'x', 'o', 'o'}, + { 'o', 'o', 'x', 'o' }, + { 'x', 'x', 'x', 'o' }, + { 'o', 'x', 'x', 'x' }, + { 'o', 'x', 'o', 'o' }, }; static u8 Unk_ov23_02256C7E[3][4] = { - {'x', 'x', 'x'}, - {'x', 'x', 'x'}, - {'x', 'o', 'x'}, + { 'x', 'x', 'x' }, + { 'x', 'x', 'x' }, + { 'x', 'o', 'x' }, }; static UnkStruct_ov23_02256EB0 Unk_ov23_02256EB0[] = { - {NULL, 0x1E, 0x16, 0x1B, 0x14, 0x4, 0x4, 0x1, 0x39, 0x37}, - {NULL, 0x16, 0x1E, 0x14, 0x1B, 0x4, 0x4, 0x2, 0x67, 0x65}, - {NULL, 0xA7, 0xC2, 0x6E, 0xA4, 0x4, 0x4, 0x3, 0x2, 0x0}, - {NULL, 0xC2, 0xA7, 0x96, 0x7C, 0x4, 0x4, 0x4, 0x5, 0x3}, - {NULL, 0x96, 0x96, 0x6B, 0x6B, 0x4, 0x4, 0x5, 0x3F, 0x3D}, - {NULL, 0xF, 0xD, 0xD, 0xA, 0x6, 0x6, 0x6, 0x38, 0x37}, - {NULL, 0xD, 0xF, 0xA, 0xD, 0x6, 0x6, 0x7, 0x66, 0x65}, - {NULL, 0x53, 0x60, 0x3D, 0x4B, 0x6, 0x6, 0x8, 0x1, 0x0}, - {NULL, 0x60, 0x53, 0x4B, 0x3D, 0x6, 0x6, 0x9, 0x4, 0x3}, - {NULL, 0x4B, 0x4B, 0x35, 0x35, 0x6, 0x6, 0xA, 0x3E, 0x3D}, - {NULL, 0x0, 0x0, 0x0, 0x0, 0x6, 0x6, 0xB, 0x3B, 0x3C}, - {NULL, 0x0, 0x0, 0x2, 0x2, 0x8, 0x8, 0xC, 0x2F, 0x30}, - {Unk_ov23_02256C4E, 0x4, 0x1, 0xF, 0x3, 0x6, 0x6, 0xD, 0x6A, 0x6B}, - {Unk_ov23_02256C57, 0x2, 0x2, 0xA, 0xA, 0x6, 0x6, 0xE, 0x68, 0x69}, - {Unk_ov23_02256C34, 0x1, 0x2, 0x1, 0x8, 0x8, 0x4, 0xF, 0x42, 0x43}, - {Unk_ov23_02256C2C, 0x1, 0x2, 0x2, 0x7, 0x4, 0x8, 0xF, 0x44, 0x43}, - {NULL, 0x4, 0x4, 0x14, 0x14, 0x4, 0x4, 0x10, 0x12, 0x13}, - {Unk_ov23_02256C45, 0x4, 0x1, 0x1E, 0x5, 0x6, 0x6, 0x11, 0x2D, 0x2E}, - {NULL, 0x4, 0x4, 0x14, 0x14, 0x8, 0x4, 0x12, 0x32, 0x33}, - {NULL, 0x4, 0x1, 0x1E, 0x5, 0x6, 0x6, 0x13, 0x18, 0x19}, - {Unk_ov23_02256C3C, 0x1, 0x4, 0x5, 0x1E, 0x6, 0x6, 0x14, 0x40, 0x41}, - {Unk_ov23_02256C96, 0x1, 0x2, 0x3, 0xF, 0x6, 0x8, 0x15, 0x60, 0x61}, - {Unk_ov23_02256C8A, 0x1, 0x2, 0x2, 0xF, 0x8, 0x6, 0x15, 0x62, 0x61}, - {Unk_ov23_02256D0A, 0x0, 0x0, 0x3, 0x1, 0x8, 0x8, 0x17, 0x29, 0x31}, - {Unk_ov23_02256CBA, 0x0, 0x0, 0x3, 0x1, 0x8, 0x8, 0x17, 0x2C, 0x31}, - {Unk_ov23_02256D0A, 0x0, 0x0, 0x3, 0x1, 0x8, 0x8, 0x17, 0x2A, 0x31}, - {Unk_ov23_02256CBA, 0x0, 0x0, 0x3, 0x1, 0x8, 0x8, 0x17, 0x2B, 0x31}, - {Unk_ov23_02256D5E, 0x0, 0x0, 0x1, 0xD, 0xA, 0x8, 0x18, 0x3A, 0x31}, - {Unk_ov23_02256D72, 0x0, 0x0, 0x3, 0x1, 0x8, 0xA, 0x19, 0x6D, 0x31}, - {Unk_ov23_02256D86, 0x0, 0x0, 0x3, 0x1, 0xA, 0x8, 0x19, 0x70, 0x31}, - {Unk_ov23_02256D9A, 0x0, 0x0, 0x3, 0x1, 0x8, 0xA, 0x19, 0x6E, 0x31}, - {Unk_ov23_02256DAE, 0x0, 0x0, 0x3, 0x1, 0xA, 0x8, 0x19, 0x6F, 0x31}, - {Unk_ov23_02256DD6, 0x0, 0x0, 0x1, 0x3, 0xA, 0xA, 0x1A, 0x45, 0x31}, - {Unk_ov23_02256DEF, 0x0, 0x0, 0x1, 0x3, 0xA, 0xA, 0x1A, 0x48, 0x31}, - {Unk_ov23_02256E08, 0x0, 0x0, 0x1, 0x3, 0xA, 0xA, 0x1A, 0x46, 0x31}, - {Unk_ov23_02256E21, 0x0, 0x0, 0x1, 0x3, 0xA, 0xA, 0x1A, 0x47, 0x31}, - {Unk_ov23_02256CDA, 0x0, 0x0, 0x2, 0x2, 0x8, 0x8, 0x1B, 0x34, 0x35}, - {Unk_ov23_02256CEA, 0x0, 0x0, 0x3, 0x3, 0x8, 0x8, 0x1B, 0x36, 0x35}, - {Unk_ov23_02256D3A, 0x1, 0x1, 0x5, 0x5, 0x6, 0xC, 0x1C, 0xA, 0xB}, - {Unk_ov23_02256D4C, 0x1, 0x1, 0x5, 0x5, 0xC, 0x6, 0x1C, 0xC, 0xB}, - {Unk_ov23_02256C57, 0x8, 0x8, 0xA, 0xA, 0x6, 0x6, 0x1D, 0x11, 0xF}, - {NULL, 0x1, 0x1, 0x2, 0x2, 0x6, 0x6, 0x1E, 0x10, 0xF}, - {Unk_ov23_02256C60, 0xD, 0xD, 0x11, 0x11, 0x6, 0x6, 0x1F, 0x58, 0x4F}, - {Unk_ov23_02256C69, 0xD, 0xD, 0x11, 0x11, 0x6, 0x6, 0x20, 0x4B, 0x5D}, - {Unk_ov23_02256CA2, 0xD, 0xD, 0x11, 0x11, 0x8, 0x6, 0x21, 0x5F, 0x5C}, - {Unk_ov23_02256CAE, 0xD, 0xD, 0x11, 0x11, 0x8, 0x6, 0x22, 0x51, 0x59}, - {Unk_ov23_02256BF0, 0x21, 0x21, 0x1E, 0x1E, 0x4, 0x4, 0x23, 0x14, 0x15}, - {Unk_ov23_02256DC2, 0x0, 0x19, 0x0, 0xC, 0xA, 0x8, 0x24, 0x6C, 0x31}, - {Unk_ov23_02256CFA, 0x19, 0x0, 0xC, 0x0, 0x8, 0x8, 0x25, 0x73, 0x31}, - {Unk_ov23_02256D1A, 0x1, 0x1, 0x5, 0x2, 0x8, 0x8, 0x26, 0x49, 0x4A}, - {NULL, 0x1, 0x1, 0x2, 0x5, 0x6, 0x6, 0x27, 0x6, 0x7}, - {Unk_ov23_02256D2A, 0x2, 0x1, 0xB, 0x5, 0x8, 0x8, 0x28, 0xD, 0xE}, - {Unk_ov23_02256CCA, 0x1, 0x2, 0x5, 0xB, 0x8, 0x8, 0x29, 0x63, 0x64}, - {Unk_ov23_02256C72, 0x2, 0x1, 0xB, 0x5, 0x8, 0x6, 0x2A, 0x16, 0x17}, - {Unk_ov23_02256C7E, 0x1, 0x2, 0x5, 0xB, 0x6, 0x6, 0x2B, 0x71, 0x72}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x2C, 0x56, 0x4F}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x2D, 0x56, 0x5D}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x2E, 0x56, 0x5C}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x2F, 0x56, 0x59}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x30, 0x56, 0x54}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x31, 0x56, 0x50}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x32, 0x56, 0x57}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x33, 0x56, 0x53}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x34, 0x56, 0x5B}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x35, 0x56, 0x5E}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x36, 0x56, 0x4C}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x37, 0x56, 0x5A}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x38, 0x56, 0x52}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x39, 0x56, 0x4E}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x3A, 0x56, 0x4D}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x3B, 0x56, 0x55}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x2, 0x3C, 0x1B, 0x1A}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x2, 0x8, 0x3C, 0x1C, 0x1A}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x4, 0x4, 0x3D, 0x1D, 0x1A}, - {Unk_ov23_02256BFC, 0x1, 0x1, 0x1, 0x1, 0x6, 0x4, 0x3E, 0x1E, 0x1A}, - {Unk_ov23_02256C02, 0x1, 0x1, 0x1, 0x1, 0x4, 0x6, 0x3E, 0x21, 0x1A}, - {Unk_ov23_02256C20, 0x1, 0x1, 0x1, 0x1, 0x6, 0x4, 0x3E, 0x1F, 0x1A}, - {Unk_ov23_02256C1A, 0x1, 0x1, 0x1, 0x1, 0x4, 0x6, 0x3E, 0x20, 0x1A}, - {Unk_ov23_02256C0E, 0x1, 0x1, 0x1, 0x1, 0x6, 0x4, 0x3F, 0x22, 0x1A}, - {Unk_ov23_02256C26, 0x1, 0x1, 0x1, 0x1, 0x4, 0x6, 0x3F, 0x23, 0x1A}, - {Unk_ov23_02256C08, 0x1, 0x1, 0x1, 0x1, 0x6, 0x4, 0x40, 0x24, 0x1A}, - {Unk_ov23_02256C14, 0x1, 0x1, 0x1, 0x1, 0x4, 0x6, 0x40, 0x25, 0x1A}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x6, 0x6, 0x41, 0x26, 0x1A}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x4, 0x8, 0x42, 0x27, 0x1A}, - {NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x4, 0x42, 0x28, 0x1A} + { NULL, 0x1E, 0x16, 0x1B, 0x14, 0x4, 0x4, 0x1, 0x39, 0x37 }, + { NULL, 0x16, 0x1E, 0x14, 0x1B, 0x4, 0x4, 0x2, 0x67, 0x65 }, + { NULL, 0xA7, 0xC2, 0x6E, 0xA4, 0x4, 0x4, 0x3, 0x2, 0x0 }, + { NULL, 0xC2, 0xA7, 0x96, 0x7C, 0x4, 0x4, 0x4, 0x5, 0x3 }, + { NULL, 0x96, 0x96, 0x6B, 0x6B, 0x4, 0x4, 0x5, 0x3F, 0x3D }, + { NULL, 0xF, 0xD, 0xD, 0xA, 0x6, 0x6, 0x6, 0x38, 0x37 }, + { NULL, 0xD, 0xF, 0xA, 0xD, 0x6, 0x6, 0x7, 0x66, 0x65 }, + { NULL, 0x53, 0x60, 0x3D, 0x4B, 0x6, 0x6, 0x8, 0x1, 0x0 }, + { NULL, 0x60, 0x53, 0x4B, 0x3D, 0x6, 0x6, 0x9, 0x4, 0x3 }, + { NULL, 0x4B, 0x4B, 0x35, 0x35, 0x6, 0x6, 0xA, 0x3E, 0x3D }, + { NULL, 0x0, 0x0, 0x0, 0x0, 0x6, 0x6, 0xB, 0x3B, 0x3C }, + { NULL, 0x0, 0x0, 0x2, 0x2, 0x8, 0x8, 0xC, 0x2F, 0x30 }, + { Unk_ov23_02256C4E, 0x4, 0x1, 0xF, 0x3, 0x6, 0x6, 0xD, 0x6A, 0x6B }, + { Unk_ov23_02256C57, 0x2, 0x2, 0xA, 0xA, 0x6, 0x6, 0xE, 0x68, 0x69 }, + { Unk_ov23_02256C34, 0x1, 0x2, 0x1, 0x8, 0x8, 0x4, 0xF, 0x42, 0x43 }, + { Unk_ov23_02256C2C, 0x1, 0x2, 0x2, 0x7, 0x4, 0x8, 0xF, 0x44, 0x43 }, + { NULL, 0x4, 0x4, 0x14, 0x14, 0x4, 0x4, 0x10, 0x12, 0x13 }, + { Unk_ov23_02256C45, 0x4, 0x1, 0x1E, 0x5, 0x6, 0x6, 0x11, 0x2D, 0x2E }, + { NULL, 0x4, 0x4, 0x14, 0x14, 0x8, 0x4, 0x12, 0x32, 0x33 }, + { NULL, 0x4, 0x1, 0x1E, 0x5, 0x6, 0x6, 0x13, 0x18, 0x19 }, + { Unk_ov23_02256C3C, 0x1, 0x4, 0x5, 0x1E, 0x6, 0x6, 0x14, 0x40, 0x41 }, + { Unk_ov23_02256C96, 0x1, 0x2, 0x3, 0xF, 0x6, 0x8, 0x15, 0x60, 0x61 }, + { Unk_ov23_02256C8A, 0x1, 0x2, 0x2, 0xF, 0x8, 0x6, 0x15, 0x62, 0x61 }, + { Unk_ov23_02256D0A, 0x0, 0x0, 0x3, 0x1, 0x8, 0x8, 0x17, 0x29, 0x31 }, + { Unk_ov23_02256CBA, 0x0, 0x0, 0x3, 0x1, 0x8, 0x8, 0x17, 0x2C, 0x31 }, + { Unk_ov23_02256D0A, 0x0, 0x0, 0x3, 0x1, 0x8, 0x8, 0x17, 0x2A, 0x31 }, + { Unk_ov23_02256CBA, 0x0, 0x0, 0x3, 0x1, 0x8, 0x8, 0x17, 0x2B, 0x31 }, + { Unk_ov23_02256D5E, 0x0, 0x0, 0x1, 0xD, 0xA, 0x8, 0x18, 0x3A, 0x31 }, + { Unk_ov23_02256D72, 0x0, 0x0, 0x3, 0x1, 0x8, 0xA, 0x19, 0x6D, 0x31 }, + { Unk_ov23_02256D86, 0x0, 0x0, 0x3, 0x1, 0xA, 0x8, 0x19, 0x70, 0x31 }, + { Unk_ov23_02256D9A, 0x0, 0x0, 0x3, 0x1, 0x8, 0xA, 0x19, 0x6E, 0x31 }, + { Unk_ov23_02256DAE, 0x0, 0x0, 0x3, 0x1, 0xA, 0x8, 0x19, 0x6F, 0x31 }, + { Unk_ov23_02256DD6, 0x0, 0x0, 0x1, 0x3, 0xA, 0xA, 0x1A, 0x45, 0x31 }, + { Unk_ov23_02256DEF, 0x0, 0x0, 0x1, 0x3, 0xA, 0xA, 0x1A, 0x48, 0x31 }, + { Unk_ov23_02256E08, 0x0, 0x0, 0x1, 0x3, 0xA, 0xA, 0x1A, 0x46, 0x31 }, + { Unk_ov23_02256E21, 0x0, 0x0, 0x1, 0x3, 0xA, 0xA, 0x1A, 0x47, 0x31 }, + { Unk_ov23_02256CDA, 0x0, 0x0, 0x2, 0x2, 0x8, 0x8, 0x1B, 0x34, 0x35 }, + { Unk_ov23_02256CEA, 0x0, 0x0, 0x3, 0x3, 0x8, 0x8, 0x1B, 0x36, 0x35 }, + { Unk_ov23_02256D3A, 0x1, 0x1, 0x5, 0x5, 0x6, 0xC, 0x1C, 0xA, 0xB }, + { Unk_ov23_02256D4C, 0x1, 0x1, 0x5, 0x5, 0xC, 0x6, 0x1C, 0xC, 0xB }, + { Unk_ov23_02256C57, 0x8, 0x8, 0xA, 0xA, 0x6, 0x6, 0x1D, 0x11, 0xF }, + { NULL, 0x1, 0x1, 0x2, 0x2, 0x6, 0x6, 0x1E, 0x10, 0xF }, + { Unk_ov23_02256C60, 0xD, 0xD, 0x11, 0x11, 0x6, 0x6, 0x1F, 0x58, 0x4F }, + { Unk_ov23_02256C69, 0xD, 0xD, 0x11, 0x11, 0x6, 0x6, 0x20, 0x4B, 0x5D }, + { Unk_ov23_02256CA2, 0xD, 0xD, 0x11, 0x11, 0x8, 0x6, 0x21, 0x5F, 0x5C }, + { Unk_ov23_02256CAE, 0xD, 0xD, 0x11, 0x11, 0x8, 0x6, 0x22, 0x51, 0x59 }, + { Unk_ov23_02256BF0, 0x21, 0x21, 0x1E, 0x1E, 0x4, 0x4, 0x23, 0x14, 0x15 }, + { Unk_ov23_02256DC2, 0x0, 0x19, 0x0, 0xC, 0xA, 0x8, 0x24, 0x6C, 0x31 }, + { Unk_ov23_02256CFA, 0x19, 0x0, 0xC, 0x0, 0x8, 0x8, 0x25, 0x73, 0x31 }, + { Unk_ov23_02256D1A, 0x1, 0x1, 0x5, 0x2, 0x8, 0x8, 0x26, 0x49, 0x4A }, + { NULL, 0x1, 0x1, 0x2, 0x5, 0x6, 0x6, 0x27, 0x6, 0x7 }, + { Unk_ov23_02256D2A, 0x2, 0x1, 0xB, 0x5, 0x8, 0x8, 0x28, 0xD, 0xE }, + { Unk_ov23_02256CCA, 0x1, 0x2, 0x5, 0xB, 0x8, 0x8, 0x29, 0x63, 0x64 }, + { Unk_ov23_02256C72, 0x2, 0x1, 0xB, 0x5, 0x8, 0x6, 0x2A, 0x16, 0x17 }, + { Unk_ov23_02256C7E, 0x1, 0x2, 0x5, 0xB, 0x6, 0x6, 0x2B, 0x71, 0x72 }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x2C, 0x56, 0x4F }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x2D, 0x56, 0x5D }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x2E, 0x56, 0x5C }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x2F, 0x56, 0x59 }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x30, 0x56, 0x54 }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x31, 0x56, 0x50 }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x32, 0x56, 0x57 }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x33, 0x56, 0x53 }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x34, 0x56, 0x5B }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x35, 0x56, 0x5E }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x36, 0x56, 0x4C }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x37, 0x56, 0x5A }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x38, 0x56, 0x52 }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x39, 0x56, 0x4E }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x3A, 0x56, 0x4D }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x6, 0x3B, 0x56, 0x55 }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x2, 0x3C, 0x1B, 0x1A }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x2, 0x8, 0x3C, 0x1C, 0x1A }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x4, 0x4, 0x3D, 0x1D, 0x1A }, + { Unk_ov23_02256BFC, 0x1, 0x1, 0x1, 0x1, 0x6, 0x4, 0x3E, 0x1E, 0x1A }, + { Unk_ov23_02256C02, 0x1, 0x1, 0x1, 0x1, 0x4, 0x6, 0x3E, 0x21, 0x1A }, + { Unk_ov23_02256C20, 0x1, 0x1, 0x1, 0x1, 0x6, 0x4, 0x3E, 0x1F, 0x1A }, + { Unk_ov23_02256C1A, 0x1, 0x1, 0x1, 0x1, 0x4, 0x6, 0x3E, 0x20, 0x1A }, + { Unk_ov23_02256C0E, 0x1, 0x1, 0x1, 0x1, 0x6, 0x4, 0x3F, 0x22, 0x1A }, + { Unk_ov23_02256C26, 0x1, 0x1, 0x1, 0x1, 0x4, 0x6, 0x3F, 0x23, 0x1A }, + { Unk_ov23_02256C08, 0x1, 0x1, 0x1, 0x1, 0x6, 0x4, 0x40, 0x24, 0x1A }, + { Unk_ov23_02256C14, 0x1, 0x1, 0x1, 0x1, 0x4, 0x6, 0x40, 0x25, 0x1A }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x6, 0x6, 0x41, 0x26, 0x1A }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x4, 0x8, 0x42, 0x27, 0x1A }, + { NULL, 0x1, 0x1, 0x1, 0x1, 0x8, 0x4, 0x42, 0x28, 0x1A } }; static const UnkStruct_ov61_0222C884 Unk_ov23_0225630E = { @@ -593,7 +592,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov23_0225630E = { 0x21F }; -static void ov23_0223E140 (void) +static void ov23_0223E140(void) { int i; @@ -617,10 +616,10 @@ static void ov23_0223E140 (void) } } -void ov23_0223E1E4 (void * param0, FieldSystem * fieldSystem) +void ov23_0223E1E4(void *param0, FieldSystem *fieldSystem) { int v0, v1; - UndergroundData * v2; + UndergroundData *v2; if (Unk_ov23_02257740) { return; @@ -671,22 +670,22 @@ void ov23_0223E1E4 (void * param0, FieldSystem * fieldSystem) } } -int ov23_0223E2E8 (void) +int ov23_0223E2E8(void) { return sizeof(UnkStruct_ov23_02257740); } -void ov23_0223E2F0 (void) +void ov23_0223E2F0(void) { return; } -void ov23_0223E2F4 (void) +void ov23_0223E2F4(void) { return; } -void ov23_0223E2F8 (void) +void ov23_0223E2F8(void) { if (Unk_ov23_02257740) { if (Unk_ov23_02257740->unk_8C8) { @@ -706,9 +705,9 @@ void ov23_0223E2F8 (void) } } -BOOL ov23_0223E354 (int param0, UnkStruct_ov23_0224271C * param1) +BOOL ov23_0223E354(int param0, UnkStruct_ov23_0224271C *param1) { - UnkStruct_ov23_0223E6F8 * v0 = ov23_0223E88C(param1->unk_00, param1->unk_02); + UnkStruct_ov23_0223E6F8 *v0 = ov23_0223E88C(param1->unk_00, param1->unk_02); u8 v1; v1 = param0; @@ -728,7 +727,7 @@ BOOL ov23_0223E354 (int param0, UnkStruct_ov23_0224271C * param1) return 0; } -static BOOL ov23_0223E3AC (FieldSystem * fieldSystem, int param1, int param2) +static BOOL ov23_0223E3AC(FieldSystem *fieldSystem, int param1, int param2) { if (ov23_02242E58(param1, param2)) { return 0; @@ -763,13 +762,13 @@ static BOOL ov23_0223E3AC (FieldSystem * fieldSystem, int param1, int param2) return 0; } -static void ov23_0223E434 (MATHRandContext16 * param0, int param1) +static void ov23_0223E434(MATHRandContext16 *param0, int param1) { int v0, v1, v2, v3; u16 v4, v5, v6; u16 v7, v8, v9; - UnkStruct_ov23_0223E6F8 * v10; - UndergroundData * v11 = sub_020298B0(Unk_ov23_02257740->fieldSystem->saveData); + UnkStruct_ov23_0223E6F8 *v10; + UndergroundData *v11 = sub_020298B0(Unk_ov23_02257740->fieldSystem->saveData); v6 = (sub_02039E10(Unk_ov23_02257740->fieldSystem->unk_2C) - 2) * 32; v9 = (sub_02039E20(Unk_ov23_02257740->fieldSystem->unk_2C) - 2) * 32; @@ -825,12 +824,12 @@ static void ov23_0223E434 (MATHRandContext16 * param0, int param1) } } -void ov23_0223E650 (int param0, int param1, MATHRandContext16 * param2) +void ov23_0223E650(int param0, int param1, MATHRandContext16 *param2) { int v0, v1, v2, v3; u16 v4, v5; - UnkStruct_ov23_0223E6F8 * v6; - UndergroundData * v7 = sub_020298B0(Unk_ov23_02257740->fieldSystem->saveData); + UnkStruct_ov23_0223E6F8 *v6; + UndergroundData *v7 = sub_020298B0(Unk_ov23_02257740->fieldSystem->saveData); v3 = 0; @@ -854,7 +853,7 @@ void ov23_0223E650 (int param0, int param1, MATHRandContext16 * param2) } } -static UnkStruct_ov23_0223E6F8 * ov23_0223E6F8 (void) +static UnkStruct_ov23_0223E6F8 *ov23_0223E6F8(void) { int v0; @@ -867,7 +866,7 @@ static UnkStruct_ov23_0223E6F8 * ov23_0223E6F8 (void) return NULL; } -static UnkStruct_ov23_0223E6F8 * ov23_0223E740 (int param0, int param1) +static UnkStruct_ov23_0223E6F8 *ov23_0223E740(int param0, int param1) { int v0 = -1, v1, v2 = param1 * 30 * 32 + param0; int v3; @@ -901,12 +900,12 @@ static UnkStruct_ov23_0223E6F8 * ov23_0223E740 (int param0, int param1) return &Unk_ov23_02257740->unk_26C[v0]; } -static void ov23_0223E834 (void) +static void ov23_0223E834(void) { - UndergroundData * v0 = sub_020298B0(Unk_ov23_02257740->fieldSystem->saveData); + UndergroundData *v0 = sub_020298B0(Unk_ov23_02257740->fieldSystem->saveData); int v1; int v2, v3; - UnkStruct_ov23_0223E6F8 * v4; + UnkStruct_ov23_0223E6F8 *v4; for (v1 = 0; v1 < 255; v1++) { v2 = sub_020291CC(v0, v1); @@ -919,7 +918,7 @@ static void ov23_0223E834 (void) } } -void ov23_0223E878 (void) +void ov23_0223E878(void) { int v0; @@ -929,7 +928,7 @@ void ov23_0223E878 (void) } } -static UnkStruct_ov23_0223E6F8 * ov23_0223E88C (u16 param0, u16 param1) +static UnkStruct_ov23_0223E6F8 *ov23_0223E88C(u16 param0, u16 param1) { int v0; @@ -942,7 +941,7 @@ static UnkStruct_ov23_0223E6F8 * ov23_0223E88C (u16 param0, u16 param1) return NULL; } -static int ov23_0223E8CC (u16 param0, u16 param1) +static int ov23_0223E8CC(u16 param0, u16 param1) { int v0, v1 = param1 - 80, v2 = param1 + 80, v3 = param0 - 80, v4 = param0 + 80; int v5 = 0, v6; @@ -1001,7 +1000,7 @@ static int ov23_0223E8CC (u16 param0, u16 param1) return -1; } -static void ov23_0223E99C (SysTask * param0, void * param1) +static void ov23_0223E99C(SysTask *param0, void *param1) { if (Unk_ov23_02257740->unk_848) { sub_02002154(Unk_ov23_02257740->unk_848, 4); @@ -1013,9 +1012,9 @@ static void ov23_0223E99C (SysTask * param0, void * param1) SysTask_Done(param0); } -void ov23_0223E9D4 (int param0, int param1, void * param2, void * param3) +void ov23_0223E9D4(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; if ((v0[0] == CommSys_CurNetId()) && CommSys_IsSendingMovementData()) { Unk_ov23_02257740->unk_A24 = ov23_02253F40(ov23_0224219C(), 19, 0, NULL); @@ -1026,7 +1025,7 @@ void ov23_0223E9D4 (int param0, int param1, void * param2, void * param3) } } -static void ov23_0223EA38 (SysTask * param0, void * param1) +static void ov23_0223EA38(SysTask *param0, void *param1) { u8 v0; @@ -1058,12 +1057,12 @@ static void ov23_0223EA38 (SysTask * param0, void * param1) } } -void ov23_0223EAF8 (int param0, int param1, void * param2, void * param3) +void ov23_0223EAF8(int param0, int param1, void *param2, void *param3) { - UndergroundData * v0 = sub_020298B0(Unk_ov23_02257740->fieldSystem->saveData); - UnkStruct_ov23_0223E6F8 * v1 = Unk_ov23_02257740->unk_84C[param0]; + UndergroundData *v0 = sub_020298B0(Unk_ov23_02257740->fieldSystem->saveData); + UnkStruct_ov23_0223E6F8 *v1 = Unk_ov23_02257740->unk_84C[param0]; u8 v2 = param0; - u8 * v3 = param2; + u8 *v3 = param2; if ((v3[0] != 0) && v1) { if (v1->unk_04 == 0xff) { @@ -1084,9 +1083,9 @@ void ov23_0223EAF8 (int param0, int param1, void * param2, void * param3) } } -void ov23_0223EB8C (int param0, int param1, void * param2, void * param3) +void ov23_0223EB8C(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; if (v0[0] == CommSys_CurNetId()) { sub_020594FC(); @@ -1096,16 +1095,16 @@ void ov23_0223EB8C (int param0, int param1, void * param2, void * param3) Unk_ov23_02257740->unk_908[v0[0]] = 1; } -void ov23_0223EBC0 (int param0, int param1, void * param2, void * param3) +void ov23_0223EBC0(int param0, int param1, void *param2, void *param3) { Unk_ov23_02257740->unk_86C[param0] = 0; Unk_ov23_02257740->unk_8FC[param0] = 0; } -void ov23_0223EBE4 (int param0, int param1, void * param2, void * param3) +void ov23_0223EBE4(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; u8 v1[3]; int v2; @@ -1116,14 +1115,14 @@ void ov23_0223EBE4 (int param0, int param1, void * param2, void * param3) sub_02035B48(69, v1); } -int ov23_0223EBFC (void) +int ov23_0223EBFC(void) { return 2; } -void ov23_0223EC00 (int param0, int param1, void * param2, void * param3) +void ov23_0223EC00(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; u8 v1[3]; int v2; @@ -1135,12 +1134,12 @@ void ov23_0223EC00 (int param0, int param1, void * param2, void * param3) Unk_ov23_02257740->unk_918[v0[0]] = v0[2]; } -int ov23_0223EC30 (void) +int ov23_0223EC30(void) { return 3; } -static void ov23_0223EC34 (BGL * param0) +static void ov23_0223EC34(BGL *param0) { { UnkStruct_02099F80 v0 = { @@ -1259,11 +1258,11 @@ static void ov23_0223EC34 (BGL * param0) sub_02019690(0, 32, 0, 29); } -static void ov23_0223ED68 (int param0, int param1, BOOL param2, BOOL param3, BOOL param4) +static void ov23_0223ED68(int param0, int param1, BOOL param2, BOOL param3, BOOL param4) { - void * v0; - Camera * camera; - void * v2; + void *v0; + Camera *camera; + void *v2; VecFx32 v3; if (param2) { @@ -1299,13 +1298,13 @@ static void ov23_0223ED68 (int param0, int param1, BOOL param2, BOOL param3, BOO } } -static void ov23_0223EE80 (UnkStruct_ov23_0223EE80 * param0) +static void ov23_0223EE80(UnkStruct_ov23_0223EE80 *param0) { int v0; - BGL * v1; - void * v2; - Camera * camera; - void * v4; + BGL *v1; + void *v2; + Camera *camera; + void *v4; int v5; sub_02004550(58, 0, 0); @@ -1331,7 +1330,7 @@ static void ov23_0223EE80 (UnkStruct_ov23_0223EE80 * param0) sub_0200DD0C(v1, 3, (512 - (18 + 12)), 10, 0, 29); { - NARC * v6; + NARC *v6; v6 = NARC_ctor(NARC_INDEX_DATA__UG_FOSSIL, 29); sub_02007130(v6, 1, 0, 0, 32 * 3, 29); @@ -1345,13 +1344,13 @@ static void ov23_0223EE80 (UnkStruct_ov23_0223EE80 * param0) ov23_0223FA3C(v1, v0, param0); } -static void ov23_0223EF98 (void) +static void ov23_0223EF98(void) { int v0; - BGL * v1; - void * v2; - Camera * camera; - void * v4; + BGL *v1; + void *v2; + Camera *camera; + void *v4; int v5; ov23_022404C8(Unk_ov23_02257740->unk_04); @@ -1372,9 +1371,9 @@ static void ov23_0223EF98 (void) ov23_02240688(Unk_ov23_02257740->unk_04); } -static void ov23_0223F020 (UnkStruct_ov23_0223EE80 * param0) +static void ov23_0223F020(UnkStruct_ov23_0223EE80 *param0) { - void * v0; + void *v0; int v1; sub_02019044(Unk_ov23_02257740->unk_04, 0); @@ -1412,10 +1411,10 @@ static void ov23_0223F020 (UnkStruct_ov23_0223EE80 * param0) ov23_02253E2C(ov23_0224219C(), Unk_ov23_02257740->fieldSystem->unk_08, (1024 - (18 + 12)), (((1024 - (18 + 12)) - 73) - (27 * 4))); } -static void ov23_0223F118 (SysTask * param0, void * param1) +static void ov23_0223F118(SysTask *param0, void *param1) { - UnkStruct_ov23_0223EE80 * v0 = param1; - FieldSystem * fieldSystem = v0->fieldSystem; + UnkStruct_ov23_0223EE80 *v0 = param1; + FieldSystem *fieldSystem = v0->fieldSystem; switch (v0->unk_00) { case 0: @@ -1485,7 +1484,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1) v0->unk_08++; if (v0->unk_08 > 80) { - UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); + UndergroundData *v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); ov23_02254044(ov23_0224219C()); @@ -1674,10 +1673,10 @@ static void ov23_0223F118 (SysTask * param0, void * param1) } } -static void ov23_0223F70C (FieldSystem * fieldSystem) +static void ov23_0223F70C(FieldSystem *fieldSystem) { - UnkStruct_ov23_0223EE80 * v0; - void * v1 = sub_0202BE14(11); + UnkStruct_ov23_0223EE80 *v0; + void *v1 = sub_0202BE14(11); sub_0202B758(fieldSystem->unk_9C, v1, 1); v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov23_0223EE80)); @@ -1691,7 +1690,7 @@ static void ov23_0223F70C (FieldSystem * fieldSystem) Unk_ov23_02257740->unk_8CC = SysTask_Start(ov23_0223F118, v0, 100); } -static BOOL ov23_0223F768 (void) +static BOOL ov23_0223F768(void) { int v0; @@ -1704,7 +1703,7 @@ static BOOL ov23_0223F768 (void) return 0; } -static int ov23_0223F78C (int param0, int param1, int param2) +static int ov23_0223F78C(int param0, int param1, int param2) { int v0; @@ -1724,9 +1723,9 @@ static int ov23_0223F78C (int param0, int param1, int param2) return 0; } -static BOOL ov23_0223F804 (UnkStruct_ov23_02256EB0 * param0, int param1, int param2) +static BOOL ov23_0223F804(UnkStruct_ov23_02256EB0 *param0, int param1, int param2) { - u8 * v0 = param0->unk_00; + u8 *v0 = param0->unk_00; int v1, v2, v3; if (v0 == NULL) { @@ -1744,7 +1743,7 @@ static BOOL ov23_0223F804 (UnkStruct_ov23_02256EB0 * param0, int param1, int par return 1; } -static BOOL ov23_0223F838 (int param0, int param1, int param2) +static BOOL ov23_0223F838(int param0, int param1, int param2) { int v0, v1, v2, v3, v4; @@ -1786,10 +1785,10 @@ static BOOL ov23_0223F838 (int param0, int param1, int param2) return 1; } -static int ov23_0223F970 (UnkStruct_ov23_02256EB0 * param0) +static int ov23_0223F970(UnkStruct_ov23_02256EB0 *param0) { - SaveData * v0 = FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem); - UndergroundData * v1 = sub_020298B0(v0); + SaveData *v0 = FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem); + UndergroundData *v1 = sub_020298B0(v0); BOOL v2 = TrainerInfo_ID(SaveData_GetTrainerInfo(v0)) % 2; BOOL v3 = sub_02027474(SaveData_Pokedex(v0)); int v4 = 0; @@ -1811,7 +1810,7 @@ static int ov23_0223F970 (UnkStruct_ov23_02256EB0 * param0) return v4; } -static int ov23_0223F9C8 (void) +static int ov23_0223F9C8(void) { int v0, v1 = 0; @@ -1826,7 +1825,7 @@ static int ov23_0223F9C8 (void) return v1; } -static int ov23_0223F9F0 (int param0) +static int ov23_0223F9F0(int param0) { int v0, v1 = param0; @@ -1846,7 +1845,7 @@ static int ov23_0223F9F0 (int param0) return 0; } -static int ov23_0223FA20 (void) +static int ov23_0223FA20(void) { int v0, v1 = 0; @@ -1859,9 +1858,9 @@ static int ov23_0223FA20 (void) return v1; } -static void ov23_0223FA3C (BGL * param0, int param1, UnkStruct_ov23_0223EE80 * param2) +static void ov23_0223FA3C(BGL *param0, int param1, UnkStruct_ov23_0223EE80 *param2) { - UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); + UndergroundData *v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); int v1, v2, v3 = ov23_0223F9C8(); int v4, v5, v6, v7, v8 = 0, v9, v10; int v11 = ov23_0223FA20(); @@ -1928,10 +1927,10 @@ static void ov23_0223FA3C (BGL * param0, int param1, UnkStruct_ov23_0223EE80 * p ov23_0223FF60(v1, param0, param1, param2); } -static int ov23_0223FC9C (int param0, BGL * param1, int param2, UnkStruct_ov23_0223EE80 * param3) +static int ov23_0223FC9C(int param0, BGL *param1, int param2, UnkStruct_ov23_0223EE80 *param3) { - UnkStruct_ov23_0223FC9C * v0 = &Unk_ov23_02257740->unk_874[param0]; - u16 * v1 = sub_02019FE4(param1, 1); + UnkStruct_ov23_0223FC9C *v0 = &Unk_ov23_02257740->unk_874[param0]; + u16 *v1 = sub_02019FE4(param1, 1); int v2 = v0->unk_05 * 2; int v3 = v0->unk_06 * 2; int v4 = v2 + v0->unk_00->unk_0C; @@ -1939,7 +1938,7 @@ static int ov23_0223FC9C (int param0, BGL * param1, int param2, UnkStruct_ov23_0 int v6, v7, v8, v9 = param2; u32 v10; int v11 = param0; - NARC * v12; + NARC *v12; v12 = NARC_ctor(NARC_INDEX_DATA__UG_PARTS, 29); @@ -1993,7 +1992,7 @@ static u8 Unk_ov23_02257570[] = { 0xff }; -static void ov23_0223FDE0 (UnkStruct_ov23_0223EE80 * param0) +static void ov23_0223FDE0(UnkStruct_ov23_0223EE80 *param0) { int v0, v1, v2, v3; VecFx32 v4; @@ -2020,7 +2019,7 @@ static void ov23_0223FDE0 (UnkStruct_ov23_0223EE80 * param0) for (v0 = 0; v0 < 4; v0++) { if (param0->unk_38[v0]) { - u16 * v5 = param0->unk_28[v0]->pRawData; + u16 *v5 = param0->unk_28[v0]->pRawData; u8 v6 = Unk_ov23_02257570[param0->unk_38[v0] - 1]; if (v6 == 0xff) { @@ -2039,7 +2038,7 @@ static void ov23_0223FDE0 (UnkStruct_ov23_0223EE80 * param0) } } -static void ov23_0223FF60 (int param0, BGL * param1, int param2, UnkStruct_ov23_0223EE80 * param3) +static void ov23_0223FF60(int param0, BGL *param1, int param2, UnkStruct_ov23_0223EE80 *param3) { int v0, v1 = 512 + 24 * 3 + 32 + 1; u32 v2; @@ -2050,26 +2049,26 @@ static void ov23_0223FF60 (int param0, BGL * param1, int param2, UnkStruct_ov23_ } } -static void ov23_0223FF8C (BGL * param0) +static void ov23_0223FF8C(BGL *param0) { static const u8 v0 = 8; static const u8 v1 = 5; static u8 v2[v0][v0] = { - {0, 0, 4, 4, 4, 4, 0, 0}, - {0, 4, 4, 4, 4, 4, 4, 0}, - {4, 4, 4, 4, 4, 4}, - {4, 4, 4, 4, 4, 4}, - {4, 4, 4, 4, 4, 4}, - {4, 4, 4, 4, 4, 4}, - {0, 4, 4, 4, 4, 4, 4, 0}, - {0, 0, 4, 4, 4, 4, 0, 0} + { 0, 0, 4, 4, 4, 4, 0, 0 }, + { 0, 4, 4, 4, 4, 4, 4, 0 }, + { 4, 4, 4, 4, 4, 4 }, + { 4, 4, 4, 4, 4, 4 }, + { 4, 4, 4, 4, 4, 4 }, + { 4, 4, 4, 4, 4, 4 }, + { 0, 4, 4, 4, 4, 4, 4, 0 }, + { 0, 0, 4, 4, 4, 4, 0, 0 } }; static u8 v3[v1][v1] = { - {0, 6, 6, 6, 0}, - {6, 6, 6, 6, 6}, - {6, 6, 6, 6, 6}, - {6, 6, 6, 6, 6}, - {0, 6, 6, 6, 0} + { 0, 6, 6, 6, 0 }, + { 6, 6, 6, 6, 6 }, + { 6, 6, 6, 6, 6 }, + { 6, 6, 6, 6, 6 }, + { 0, 6, 6, 6, 0 } }; int v4, v5, v6, v7, v8, v9, v10; BOOL v11 = 1; @@ -2157,22 +2156,22 @@ static void ov23_0223FF8C (BGL * param0) } } -static void ov23_022401B0 (BGL * param0) +static void ov23_022401B0(BGL *param0) { - static u8 v0[] = {0xe, 0xf, 0x1e, 0x1f}; - static u8 v1[] = {0xa, 0xb, 0x1a, 0x1b}; - static u8 v2[] = {0x8, 0x9, 0x18, 0x19}; - static u8 v3[] = {0x6, 0x7, 0x16, 0x17}; - static u8 v4[] = {0x4, 0x5, 0x14, 0x15}; - static u8 v5[] = {0x2, 0x3, 0x12, 0x13}; - static u8 v6[] = {0x0, 0x1, 0x10, 0x11}; - static u8 * v7[] = {v0, v1, v2, v3, v4, v5, v6}; - u16 * v8 = sub_02019FE4(param0, 2); + static u8 v0[] = { 0xe, 0xf, 0x1e, 0x1f }; + static u8 v1[] = { 0xa, 0xb, 0x1a, 0x1b }; + static u8 v2[] = { 0x8, 0x9, 0x18, 0x19 }; + static u8 v3[] = { 0x6, 0x7, 0x16, 0x17 }; + static u8 v4[] = { 0x4, 0x5, 0x14, 0x15 }; + static u8 v5[] = { 0x2, 0x3, 0x12, 0x13 }; + static u8 v6[] = { 0x0, 0x1, 0x10, 0x11 }; + static u8 *v7[] = { v0, v1, v2, v3, v4, v5, v6 }; + u16 *v8 = sub_02019FE4(param0, 2); int v9, v10, v11; for (v9 = 0; v9 < 10; v9++) { for (v10 = 0; v10 < 13; v10++) { - u8 * v12 = v7[Unk_ov23_02257740->unk_9A2[v9][v10]]; + u8 *v12 = v7[Unk_ov23_02257740->unk_9A2[v9][v10]]; v11 = v10 * 2 + ((v9 * 2 + 4) * 32); v8[v11] = v12[0] + 0x2001; @@ -2185,7 +2184,7 @@ static void ov23_022401B0 (BGL * param0) sub_02019448(param0, 2); } -static BOOL ov23_02240244 (int param0, int param1) +static BOOL ov23_02240244(int param0, int param1) { int v0; int v1 = Unk_ov23_02257740->unk_920[param1][param0]; @@ -2203,7 +2202,7 @@ static BOOL ov23_02240244 (int param0, int param1) return 0; } -static BOOL ov23_02240280 (int param0, int param1) +static BOOL ov23_02240280(int param0, int param1) { int v0 = Unk_ov23_02257740->unk_920[param1][param0]; @@ -2218,12 +2217,12 @@ static BOOL ov23_02240280 (int param0, int param1) return 0; } -static void ov23_022402B8 (int param0, int param1, BOOL param2, UnkStruct_ov23_0223EE80 * param3) +static void ov23_022402B8(int param0, int param1, BOOL param2, UnkStruct_ov23_0223EE80 *param3) { - static s8 v0[] = {1, -1, -1, 1}; - static s8 v1[] = {1, -1, 1, -1}; - static s8 v2[] = {0, 0, -1, 1}; - static s8 v3[] = {1, -1, 0, 0}; + static s8 v0[] = { 1, -1, -1, 1 }; + static s8 v1[] = { 1, -1, 1, -1 }; + static s8 v2[] = { 0, 0, -1, 1 }; + static s8 v3[] = { 1, -1, 0, 0 }; int v4, v5, v6, v7; BOOL v8 = 0, v9 = 0; @@ -2292,7 +2291,7 @@ static void ov23_022402B8 (int param0, int param1, BOOL param2, UnkStruct_ov23_0 } } -static void ov23_02240454 (u16 * param0, UnkStruct_ov23_02256BF8 * param1, int param2, int param3) +static void ov23_02240454(u16 *param0, UnkStruct_ov23_02256BF8 *param1, int param2, int param3) { int v0, v1, v2, v3, v4; @@ -2328,9 +2327,9 @@ static UnkStruct_ov23_02256BF8 endPos[] = { 0x4 }; -static void ov23_022404C8 (BGL * param0) +static void ov23_022404C8(BGL *param0) { - u16 * v0; + u16 *v0; Unk_ov23_02257740->unk_A2A = 1; Unk_ov23_02257740->unk_A28 = 1; @@ -2339,11 +2338,11 @@ static void ov23_022404C8 (BGL * param0) ov23_02240454(v0, Unk_ov23_02256BF4, 0x30, 54); } -static void ov23_022404F8 (BGL * param0, int param1, int param2, int param3) +static void ov23_022404F8(BGL *param0, int param1, int param2, int param3) { VecFx32 v0; - u8 * v1; - u16 * v2; + u8 *v1; + u16 *v2; if (param3 < 2) { return; @@ -2411,7 +2410,7 @@ static void ov23_022404F8 (BGL * param0, int param1, int param2, int param3) sub_02019448(param0, 1); } -static void ov23_02240660 (VecFx32 * param0) +static void ov23_02240660(VecFx32 *param0) { int v0; int v1 = Unk_ov23_02257740->unk_A2B; @@ -2419,16 +2418,16 @@ static void ov23_02240660 (VecFx32 * param0) v1 = (v1 / 4) * 4; v1 = v1 + 8; - param0->x = FX32_ONE * ((v1 + 8)); + param0->x = FX32_ONE * (v1 + 8); param0->y = FX32_ONE * 16; } -static void ov23_02240688 (BGL * param0) +static void ov23_02240688(BGL *param0) { VecFx32 v0; int v1 = Unk_ov23_02257740->unk_A2B; int v2, v3, v4; - u16 * v5 = sub_02019FE4(param0, 0); + u16 *v5 = sub_02019FE4(param0, 0); v1 = (v1 / 4) * 4; v4 = 6 - (v1 % 24) / 4; @@ -2449,7 +2448,7 @@ static void ov23_02240688 (BGL * param0) sub_02019448(param0, 0); } -static void ov23_02240758 (UnkStruct_ov23_0223EE80 * param0) +static void ov23_02240758(UnkStruct_ov23_0223EE80 *param0) { BOOL v0 = 0; int v1; @@ -2478,7 +2477,7 @@ static void ov23_02240758 (UnkStruct_ov23_0223EE80 * param0) } } -static int ov23_0224080C (int param0) +static int ov23_0224080C(int param0) { int v0 = 0; int v1 = param0; @@ -2505,11 +2504,11 @@ static int ov23_0224080C (int param0) return v0; } -static void ov23_022408A0 (int param0, int param1) +static void ov23_022408A0(int param0, int param1) { int v0 = param0; - SecretBaseRecord * v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); - UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); + SecretBaseRecord *v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); + UndergroundData *v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); if (ov23_02241CF4(v0)) { ov23_0224F6E0(v0, param1); @@ -2519,9 +2518,9 @@ static void ov23_022408A0 (int param0, int param1) } } -static BOOL ov23_022408EC (int param0) +static BOOL ov23_022408EC(int param0) { - UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); + UndergroundData *v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); if (ov23_02241CF4(param0)) { if (40 == sub_02028C3C(v0)) { @@ -2538,7 +2537,7 @@ static BOOL ov23_022408EC (int param0) } } -static BOOL ov23_02240934 (UnkStruct_ov23_0223EE80 * param0) +static BOOL ov23_02240934(UnkStruct_ov23_0223EE80 *param0) { int v0, v1, v2; BOOL v3[4]; @@ -2572,7 +2571,7 @@ static BOOL ov23_02240934 (UnkStruct_ov23_0223EE80 * param0) return v4; } -static BOOL ov23_022409F0 (UnkStruct_ov23_0223EE80 * param0) +static BOOL ov23_022409F0(UnkStruct_ov23_0223EE80 *param0) { int v0, v1; @@ -2598,11 +2597,11 @@ static BOOL ov23_022409F0 (UnkStruct_ov23_0223EE80 * param0) return 0; } -static BOOL ov23_02240A90 (UnkStruct_ov23_0223EE80 * param0) +static BOOL ov23_02240A90(UnkStruct_ov23_0223EE80 *param0) { int v0, v1, v2; - SecretBaseRecord * v3 = SaveData_SecretBaseRecord((Unk_ov23_02257740->fieldSystem->saveData)); - UndergroundData * v4 = sub_020298B0((Unk_ov23_02257740->fieldSystem->saveData)); + SecretBaseRecord *v3 = SaveData_SecretBaseRecord(Unk_ov23_02257740->fieldSystem->saveData); + UndergroundData *v4 = sub_020298B0(Unk_ov23_02257740->fieldSystem->saveData); for (v0 = 0; v0 < param0->unk_0C; v0++) { if (Unk_ov23_02257740->unk_874[v0].unk_08 == 1) { @@ -2618,7 +2617,7 @@ static BOOL ov23_02240A90 (UnkStruct_ov23_0223EE80 * param0) if ((v2 >= 23) && ((28 + 1) > v2) || (v2 == 36) || (v2 == 37)) { sub_02029644(v3, 1); { - VarsFlags * v5 = SaveData_GetVarsFlags(Unk_ov23_02257740->fieldSystem->saveData); + VarsFlags *v5 = SaveData_GetVarsFlags(Unk_ov23_02257740->fieldSystem->saveData); sub_0206B41C(v5, sub_0206B40C(v5) + 1); } @@ -2640,7 +2639,7 @@ static BOOL ov23_02240A90 (UnkStruct_ov23_0223EE80 * param0) return 0; } -static void ov23_02240B84 (BGL * param0) +static void ov23_02240B84(BGL *param0) { int v0, v1, v2; VecFx32 v3; @@ -2669,7 +2668,7 @@ static void ov23_02240B84 (BGL * param0) sub_02021C50(Unk_ov23_02257740->unk_24C[1], &v3); } -static void ov23_02240C94 (BGL * param0) +static void ov23_02240C94(BGL *param0) { int v0, v1, v2; VecFx32 v3; @@ -2690,11 +2689,11 @@ static void ov23_02240C94 (BGL * param0) } } -static BOOL ov23_02240CFC (UnkStruct_ov23_0223EE80 * param0) +static BOOL ov23_02240CFC(UnkStruct_ov23_0223EE80 *param0) { u8 v0[2]; int v1; - UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); + UndergroundData *v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->fieldSystem)); if (Unk_ov23_02257740->unk_A29 == 1) { Unk_ov23_02257740->unk_A29 = 0; @@ -2753,7 +2752,7 @@ static BOOL ov23_02240CFC (UnkStruct_ov23_0223EE80 * param0) param0->unk_08 = 25; param0->unk_50 = 1; return 1; - } else if ((Unk_ov23_02257740->unk_A2B == 0)) { + } else if (Unk_ov23_02257740->unk_A2B == 0) { sub_02029220(v2); param0->unk_50 = 0; param0->unk_08 = 45; @@ -2765,16 +2764,16 @@ static BOOL ov23_02240CFC (UnkStruct_ov23_0223EE80 * param0) return 0; } -static void ov23_02240E60 (UnkStruct_02009DC8 * param0) +static void ov23_02240E60(UnkStruct_02009DC8 *param0) { Unk_ov23_02257740->unk_1C0[Unk_ov23_02257740->unk_A2F] = param0; Unk_ov23_02257740->unk_A2F++; } -static void ov23_02240E88 (void) +static void ov23_02240E88(void) { int v0; - NARC * v1; + NARC *v1; Unk_ov23_02257740->unk_A2F = 0; @@ -2812,7 +2811,7 @@ static void ov23_02240E88 (void) NARC_dtor(v1); } -static void ov23_0224108C (void) +static void ov23_0224108C(void) { int v0, v1; UnkStruct_ov115_02261520 v2; @@ -2850,7 +2849,7 @@ static void ov23_0224108C (void) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov23_0224119C (void) +static void ov23_0224119C(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -2867,9 +2866,9 @@ static void ov23_0224119C (void) sub_02009704(NNS_G2D_VRAM_TYPE_2DMAIN); } -static void ov23_022411E8 (void * param0) +static void ov23_022411E8(void *param0) { - BGL * v0 = param0; + BGL *v0 = param0; ov23_02240C94(v0); @@ -2878,7 +2877,7 @@ static void ov23_022411E8 (void * param0) sub_0200A858(); } -BOOL ov23_02241200 (int param0, int param1) +BOOL ov23_02241200(int param0, int param1) { if (ov23_0223E88C(param0, param1)) { return 1; @@ -2887,7 +2886,7 @@ BOOL ov23_02241200 (int param0, int param1) return 0; } -int ov23_0224121C (int param0) +int ov23_0224121C(int param0) { if (Unk_ov23_02257740) { return Unk_ov23_02257740->unk_8D4[param0].unk_00; @@ -2896,7 +2895,7 @@ int ov23_0224121C (int param0) return 0; } -int ov23_0224123C (int param0) +int ov23_0224123C(int param0) { if (Unk_ov23_02257740) { return Unk_ov23_02257740->unk_8D4[param0].unk_02; @@ -2905,7 +2904,7 @@ int ov23_0224123C (int param0) return 0; } -int ov23_0224125C (int param0) +int ov23_0224125C(int param0) { if (Unk_ov23_02257740 && Unk_ov23_02257740->unk_8D0) { int v0 = Unk_ov23_02257740->unk_8D0->unk_4E4; @@ -2917,7 +2916,7 @@ int ov23_0224125C (int param0) return 0; } -int ov23_02241294 (int param0) +int ov23_02241294(int param0) { if (Unk_ov23_02257740 && Unk_ov23_02257740->unk_8D0) { int v0 = Unk_ov23_02257740->unk_8D0->unk_4E4; @@ -2929,9 +2928,9 @@ int ov23_02241294 (int param0) return 0; } -static void ov23_022412CC (SysTask * param0, void * param1) +static void ov23_022412CC(SysTask *param0, void *param1) { - UnkStruct_ov23_022412CC * v0 = param1; + UnkStruct_ov23_022412CC *v0 = param1; v0->unk_4E4++; @@ -2941,9 +2940,9 @@ static void ov23_022412CC (SysTask * param0, void * param1) } } -void ov23_022412F0 (void) +void ov23_022412F0(void) { - UnkStruct_ov23_022412CC * v0; + UnkStruct_ov23_022412CC *v0; GF_ASSERT(!Unk_ov23_02257740->unk_8D0); GF_ASSERT(!Unk_ov23_02257740->unk_8C4); @@ -2959,7 +2958,7 @@ void ov23_022412F0 (void) Unk_ov23_02257740->unk_8C4 = SysTask_Start(ov23_022412CC, v0, 100); } -void ov23_02241364 (void) +void ov23_02241364(void) { if (Unk_ov23_02257740->unk_8C4) { SysTask_Done(Unk_ov23_02257740->unk_8C4); @@ -2969,12 +2968,12 @@ void ov23_02241364 (void) } } -void ov23_022413A0 (int param0, int param1, void * param2, void * param3) +void ov23_022413A0(int param0, int param1, void *param2, void *param3) { Unk_ov23_02257740->unk_8BC[param0] = 1; } -static void ov23_022413B4 (void) +static void ov23_022413B4(void) { int v0, v1 = 0; @@ -2983,7 +2982,7 @@ static void ov23_022413B4 (void) if (Unk_ov23_02257740->unk_8BC[v0]) { while (TRUE) { - UnkStruct_ov23_0223E6F8 * v3 = &Unk_ov23_02257740->unk_26C[v2]; + UnkStruct_ov23_0223E6F8 *v3 = &Unk_ov23_02257740->unk_26C[v2]; if ((v3->unk_00 != 0xffff) && (v3->unk_02 != 0xffff)) { UnkStruct_ov23_0224142C v4; @@ -3009,9 +3008,9 @@ static void ov23_022413B4 (void) } } -void ov23_0224142C (int param0, int param1, void * param2, void * param3) +void ov23_0224142C(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_0224142C * v0 = param2; + UnkStruct_ov23_0224142C *v0 = param2; int v1, v2; if (Unk_ov23_02257740 == NULL) { @@ -3040,14 +3039,14 @@ void ov23_0224142C (int param0, int param1, void * param2, void * param3) } } -int ov23_022414D0 (void) +int ov23_022414D0(void) { return sizeof(UnkStruct_ov23_0224142C); } -static void ov23_022414D4 (void) +static void ov23_022414D4(void) { - UnkStruct_ov23_0223E6F8 * v0; + UnkStruct_ov23_0223E6F8 *v0; int v1, v2; for (v1 = 0; v1 < (7 + 1); v1++) { @@ -3096,11 +3095,11 @@ static void ov23_022414D4 (void) } } -BOOL ov23_022415B8 (Strbuf *param0) +BOOL ov23_022415B8(Strbuf *param0) { int v0; - TrainerInfo * v1; - TrainerInfo * v2; + TrainerInfo *v1; + TrainerInfo *v2; if (!Unk_ov23_02257740) { return 0; @@ -3120,14 +3119,14 @@ BOOL ov23_022415B8 (Strbuf *param0) return 0; } -void ov23_0224160C (void) +void ov23_0224160C(void) { if (Unk_ov23_02257740) { MI_CpuClear8(Unk_ov23_02257740->unk_908, (7 + 1)); } } -BOOL ov23_0224162C (int param0) +BOOL ov23_0224162C(int param0) { if (Unk_ov23_02257740) { return Unk_ov23_02257740->unk_86C[param0]; @@ -3136,7 +3135,7 @@ BOOL ov23_0224162C (int param0) return 0; } -void ov23_02241648 (int param0) +void ov23_02241648(int param0) { if (Unk_ov23_02257740) { Unk_ov23_02257740->unk_86C[param0] = 0; @@ -3144,7 +3143,7 @@ void ov23_02241648 (int param0) } } -BOOL ov23_02241670 (void) +BOOL ov23_02241670(void) { if (Unk_ov23_02257740) { if (Unk_ov23_02257740->unk_8CC) { @@ -3155,7 +3154,7 @@ BOOL ov23_02241670 (void) return 0; } -void ov23_02241690 (int param0, int param1) +void ov23_02241690(int param0, int param1) { if (Unk_ov23_02257740) { Unk_ov23_02257740->unk_86C[param0] = param1; diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c index 7f46476ef5..60411984e9 100644 --- a/src/overlay023/ov23_022416A8.c +++ b/src/overlay023/ov23_022416A8.c @@ -1,35 +1,35 @@ +#include "overlay023/ov23_022416A8.h" + #include #include -#include "sys_task_manager.h" -#include "strbuf.h" #include "struct_decls/struct_020298B0_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021F575C.h" +#include "overlay023/ov23_0223E140.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_0224F294.h" +#include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_02241A80.h" #include "overlay023/struct_ov23_02241A88.h" #include "overlay023/struct_ov23_0224271C.h" -#include "unk_02005474.h" +#include "comm_player_manager.h" +#include "communication_system.h" +#include "field_system.h" +#include "heap.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" -#include "heap.h" -#include "strbuf.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" #include "unk_0202854C.h" #include "unk_0202CD50.h" -#include "communication_system.h" -#include "field_system.h" -#include "vars_flags.h" #include "unk_02054D00.h" -#include "comm_player_manager.h" #include "unk_0206A8DC.h" -#include "overlay005/ov5_021F575C.h" -#include "overlay023/ov23_0223E140.h" -#include "overlay023/ov23_022416A8.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_0224F294.h" -#include "overlay023/ov23_02253D40.h" +#include "vars_flags.h" typedef struct { u16 unk_00; @@ -46,12 +46,12 @@ typedef struct { typedef struct { UnkStruct_ov23_02241974 unk_00[100]; - UnkStruct_ov23_02241974 * unk_2BC[100]; + UnkStruct_ov23_02241974 *unk_2BC[100]; u8 unk_44C[8]; u8 unk_454[8]; - SysTask * unk_45C; - UnkStruct_ov23_02241E4C * unk_460; - FieldSystem * fieldSystem; + SysTask *unk_45C; + UnkStruct_ov23_02241E4C *unk_460; + FieldSystem *fieldSystem; u8 unk_468[8]; int unk_470; u8 unk_474; @@ -59,20 +59,20 @@ typedef struct { u8 unk_476; } UnkStruct_ov23_02257744; -static UnkStruct_ov23_02241974 * ov23_02241974(UnkStruct_ov23_02241974 * param0); -static UnkStruct_ov23_0224271C * ov23_02241890(UnkStruct_ov23_0224271C * param0, int param1); -static void ov23_02241C48(UnkStruct_ov23_02241974 * param0); -static void ov23_02241CAC(UnkStruct_ov23_02241974 * param0); -static void ov23_022418C0(UnkStruct_ov23_02241974 * param0); +static UnkStruct_ov23_02241974 *ov23_02241974(UnkStruct_ov23_02241974 *param0); +static UnkStruct_ov23_0224271C *ov23_02241890(UnkStruct_ov23_0224271C *param0, int param1); +static void ov23_02241C48(UnkStruct_ov23_02241974 *param0); +static void ov23_02241CAC(UnkStruct_ov23_02241974 *param0); +static void ov23_022418C0(UnkStruct_ov23_02241974 *param0); -static UnkStruct_ov23_02257744 * Unk_ov23_02257744 = NULL; +static UnkStruct_ov23_02257744 *Unk_ov23_02257744 = NULL; -static void ov23_022416A8 (int param0) +static void ov23_022416A8(int param0) { sub_02059514(); } -static void ov23_022416B0 (int param0) +static void ov23_022416B0(int param0) { if (param0 > 0) { ov23_02254154(ov23_0224219C(), 0, param0); @@ -82,10 +82,10 @@ static void ov23_022416B0 (int param0) } } -void ov23_022416E0 (void * param0, FieldSystem * fieldSystem) +void ov23_022416E0(void *param0, FieldSystem *fieldSystem) { int v0; - UndergroundData * v1; + UndergroundData *v1; if (Unk_ov23_02257744) { return; @@ -110,9 +110,9 @@ void ov23_022416E0 (void * param0, FieldSystem * fieldSystem) } } -static void ov23_02241778 (void) +static void ov23_02241778(void) { - UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257744->fieldSystem)); + UndergroundData *v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257744->fieldSystem)); int v1; for (v1 = 0; v1 < 100; v1++) { @@ -120,22 +120,22 @@ static void ov23_02241778 (void) } } -int ov23_022417C4 (void) +int ov23_022417C4(void) { return sizeof(UnkStruct_ov23_02257744); } -void ov23_022417CC (void) +void ov23_022417CC(void) { Unk_ov23_02257744->unk_476 = 1; } -void ov23_022417E0 (void) +void ov23_022417E0(void) { Unk_ov23_02257744->unk_476 = 0; } -void ov23_022417F4 (void) +void ov23_022417F4(void) { if (Unk_ov23_02257744) { Heap_FreeToHeap(Unk_ov23_02257744); @@ -143,7 +143,7 @@ void ov23_022417F4 (void) } } -void ov23_02241810 (void) +void ov23_02241810(void) { if (Unk_ov23_02257744->unk_476) { return; @@ -166,7 +166,7 @@ void ov23_02241810 (void) } } -static UnkStruct_ov23_0224271C * ov23_02241890 (UnkStruct_ov23_0224271C * param0, int param1) +static UnkStruct_ov23_0224271C *ov23_02241890(UnkStruct_ov23_0224271C *param0, int param1) { if (Unk_ov23_02257744->unk_2BC[param1] == NULL) { return NULL; @@ -178,7 +178,7 @@ static UnkStruct_ov23_0224271C * ov23_02241890 (UnkStruct_ov23_0224271C * param0 return param0; } -static void ov23_022418C0 (UnkStruct_ov23_02241974 * param0) +static void ov23_022418C0(UnkStruct_ov23_02241974 *param0) { int v0, v1; UnkStruct_ov23_0224271C v2; @@ -199,7 +199,7 @@ static void ov23_022418C0 (UnkStruct_ov23_02241974 * param0) Unk_ov23_02257744->unk_2BC[v0] = param0; } -static void ov23_02241928 (UnkStruct_ov23_02241974 * param0) +static void ov23_02241928(UnkStruct_ov23_02241974 *param0) { int v0 = -1; UnkStruct_ov23_0224271C v1; @@ -214,7 +214,7 @@ static void ov23_02241928 (UnkStruct_ov23_02241974 * param0) } } -static UnkStruct_ov23_02241974 * ov23_02241960 (UnkStruct_ov23_02241974 * param0) +static UnkStruct_ov23_02241974 *ov23_02241960(UnkStruct_ov23_02241974 *param0) { int v0; @@ -229,12 +229,12 @@ static UnkStruct_ov23_02241974 * ov23_02241960 (UnkStruct_ov23_02241974 * param0 return NULL; } -static UnkStruct_ov23_02241974 * ov23_02241974 (UnkStruct_ov23_02241974 * param0) +static UnkStruct_ov23_02241974 *ov23_02241974(UnkStruct_ov23_02241974 *param0) { return param0; } -static UnkStruct_ov23_02241974 * ov23_02241978 (int param0, int param1) +static UnkStruct_ov23_02241974 *ov23_02241978(int param0, int param1) { UnkStruct_ov23_0224271C v0; int v1; @@ -253,12 +253,12 @@ static UnkStruct_ov23_02241974 * ov23_02241978 (int param0, int param1) return Unk_ov23_02257744->unk_2BC[v1]; } -void ov23_022419B4 (int param0, int param1, void * param2, void * param3) +void ov23_022419B4(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; int v1 = CommSys_CurNetId(); int v2, v3, v4; - UnkStruct_ov23_02241974 * v5; + UnkStruct_ov23_02241974 *v5; if (v0[0] == v1) { v2 = sub_02058D88(v1); @@ -297,13 +297,13 @@ void ov23_022419B4 (int param0, int param1, void * param2, void * param3) } } -void ov23_02241A80 (UnkStruct_ov23_02241A80 * param0, int param1) +void ov23_02241A80(UnkStruct_ov23_02241A80 *param0, int param1) { param0->unk_02 = param1; param0->unk_00 = 0; } -BOOL ov23_02241A88 (UnkStruct_ov23_02241A80 * param0, UnkStruct_ov23_02241A88 * param1) +BOOL ov23_02241A88(UnkStruct_ov23_02241A80 *param0, UnkStruct_ov23_02241A88 *param1) { int v0, v1, v2, v3; @@ -342,10 +342,10 @@ BOOL ov23_02241A88 (UnkStruct_ov23_02241A80 * param0, UnkStruct_ov23_02241A88 * return 0; } -void ov23_02241AE8 (int param0, int param1, int param2, int param3) +void ov23_02241AE8(int param0, int param1, int param2, int param3) { UnkStruct_ov23_02241974 v0; - UnkStruct_ov23_02241974 * v1; + UnkStruct_ov23_02241974 *v1; BOOL v2 = 0; v0.unk_00 = param2; @@ -406,9 +406,9 @@ void ov23_02241AE8 (int param0, int param1, int param2, int param3) } } -static void ov23_02241C48 (UnkStruct_ov23_02241974 * param0) +static void ov23_02241C48(UnkStruct_ov23_02241974 *param0) { - UnkStruct_ov23_02241974 * v0; + UnkStruct_ov23_02241974 *v0; int v1 = -1, v2; for (v2 = 0; v2 < 100; v2++) { @@ -422,7 +422,7 @@ static void ov23_02241C48 (UnkStruct_ov23_02241974 * param0) GF_ASSERT(v1 != -1); - for ( ; v2 < (100 - 1); v2++) { + for (; v2 < (100 - 1); v2++) { MI_CpuCopy8(&Unk_ov23_02257744->unk_00[v2 + 1], &Unk_ov23_02257744->unk_00[v2], sizeof(UnkStruct_ov23_02241974)); } @@ -430,9 +430,9 @@ static void ov23_02241C48 (UnkStruct_ov23_02241974 * param0) ov23_02241928(param0); } -static void ov23_02241CAC (UnkStruct_ov23_02241974 * param0) +static void ov23_02241CAC(UnkStruct_ov23_02241974 *param0) { - UnkStruct_ov23_02241974 * v0 = ov23_02241960(Unk_ov23_02257744->unk_00); + UnkStruct_ov23_02241974 *v0 = ov23_02241960(Unk_ov23_02257744->unk_00); int v1; if (v0 == NULL) { @@ -449,7 +449,7 @@ static void ov23_02241CAC (UnkStruct_ov23_02241974 * param0) ov23_02241778(); } -BOOL ov23_02241CF4 (int param0) +BOOL ov23_02241CF4(int param0) { if ((param0 != 0) && (param0 < 11)) { return 1; @@ -458,7 +458,7 @@ BOOL ov23_02241CF4 (int param0) return 0; } -BOOL ov23_02241D04 (int param0, int param1) +BOOL ov23_02241D04(int param0, int param1) { if (ov23_02241978(param0, param1)) { return 1; @@ -467,7 +467,7 @@ BOOL ov23_02241D04 (int param0, int param1) return 0; } -int ov23_02241D18 (int param0) +int ov23_02241D18(int param0) { if (Unk_ov23_02257744 && (Unk_ov23_02257744->unk_00[param0].unk_06 != 0)) { return Unk_ov23_02257744->unk_00[param0].unk_00; @@ -476,7 +476,7 @@ int ov23_02241D18 (int param0) return 0; } -int ov23_02241D38 (int param0) +int ov23_02241D38(int param0) { if (Unk_ov23_02257744 && (Unk_ov23_02257744->unk_00[param0].unk_06 != 0)) { return Unk_ov23_02257744->unk_00[param0].unk_02; @@ -485,11 +485,11 @@ int ov23_02241D38 (int param0) return 0; } -BOOL ov23_02241D58 (Strbuf *param0) +BOOL ov23_02241D58(Strbuf *param0) { int v0; - StringTemplate * v1 = NULL; - Strbuf* v2 = NULL; + StringTemplate *v1 = NULL; + Strbuf *v2 = NULL; BOOL v3 = 0; if (!Unk_ov23_02257744) { @@ -523,9 +523,9 @@ BOOL ov23_02241D58 (Strbuf *param0) return v3; } -int ov23_02241DF8 (MATHRandContext16 * param0) +int ov23_02241DF8(MATHRandContext16 *param0) { - UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257744->fieldSystem)); + UndergroundData *v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257744->fieldSystem)); int v1, v2, v3; for (v3 = 0; v3 < 100; v3++) { @@ -539,9 +539,9 @@ int ov23_02241DF8 (MATHRandContext16 * param0) return v3; } -static void ov23_02241E4C (SysTask * param0, void * param1) +static void ov23_02241E4C(SysTask *param0, void *param1) { - UnkStruct_ov23_02241E4C * v0 = param1; + UnkStruct_ov23_02241E4C *v0 = param1; v0->unk_02++; @@ -551,9 +551,9 @@ static void ov23_02241E4C (SysTask * param0, void * param1) } } -void ov23_02241E6C (void) +void ov23_02241E6C(void) { - UnkStruct_ov23_02241E4C * v0; + UnkStruct_ov23_02241E4C *v0; GF_ASSERT(!Unk_ov23_02257744->unk_460); GF_ASSERT(!Unk_ov23_02257744->unk_45C); @@ -566,7 +566,7 @@ void ov23_02241E6C (void) Unk_ov23_02257744->unk_45C = SysTask_Start(ov23_02241E4C, v0, 100); } -void ov23_02241ED0 (void) +void ov23_02241ED0(void) { if (Unk_ov23_02257744->unk_45C) { SysTask_Done(Unk_ov23_02257744->unk_45C); @@ -577,7 +577,7 @@ void ov23_02241ED0 (void) } } -int ov23_02241F0C (int param0) +int ov23_02241F0C(int param0) { if (Unk_ov23_02257744 && Unk_ov23_02257744->unk_460) { int v0 = Unk_ov23_02257744->unk_460->unk_02 / 2; @@ -589,7 +589,7 @@ int ov23_02241F0C (int param0) return 0; } -int ov23_02241F40 (int param0) +int ov23_02241F40(int param0) { if (Unk_ov23_02257744 && Unk_ov23_02257744->unk_460) { int v0 = Unk_ov23_02257744->unk_460->unk_02 / 2; diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index 0ed23563cc..46742ba243 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -1,59 +1,58 @@ +#include "overlay023/ov23_02241F74.h" + #include #include -#include "core_sys.h" - -#include "sys_task_manager.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_02029894_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "savedata.h" -#include "overlay023/struct_ov23_02253598_decl.h" -#include "overlay023/struct_ov23_02253E2C_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021E779C.h" +#include "overlay005/ov5_021EAFA4.h" +#include "overlay023/funcptr_ov23_022427DC.h" +#include "overlay023/funcptr_ov23_022431EC.h" +#include "overlay023/ov23_0223E140.h" +#include "overlay023/ov23_022416A8.h" +#include "overlay023/ov23_0224340C.h" +#include "overlay023/ov23_0224A1D0.h" +#include "overlay023/ov23_0224B05C.h" +#include "overlay023/ov23_0224F294.h" +#include "overlay023/ov23_0225128C.h" +#include "overlay023/ov23_022521F0.h" +#include "overlay023/ov23_02253598.h" +#include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_02241A80.h" #include "overlay023/struct_ov23_02241A88.h" #include "overlay023/struct_ov23_0224271C.h" -#include "overlay023/funcptr_ov23_022427DC.h" -#include "overlay023/funcptr_ov23_022431EC.h" +#include "overlay023/struct_ov23_02253598_decl.h" +#include "overlay023/struct_ov23_02253E2C_decl.h" -#include "unk_02006E3C.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_system.h" +#include "game_options.h" +#include "heap.h" #include "message.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" +#include "unk_02006E3C.h" #include "unk_0200DA60.h" -#include "heap.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202854C.h" #include "unk_02030EE0.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "field_system.h" -#include "vars_flags.h" #include "unk_02054D00.h" -#include "comm_player_manager.h" #include "unk_0206A8DC.h" -#include "overlay005/ov5_021E779C.h" -#include "overlay005/ov5_021EAFA4.h" -#include "overlay023/ov23_0223E140.h" -#include "overlay023/ov23_022416A8.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_0224340C.h" -#include "overlay023/ov23_0224A1D0.h" -#include "overlay023/ov23_0224B05C.h" -#include "overlay023/ov23_0224F294.h" -#include "overlay023/ov23_0225128C.h" -#include "overlay023/ov23_022521F0.h" -#include "overlay023/ov23_02253598.h" -#include "overlay023/ov23_02253D40.h" +#include "vars_flags.h" -typedef BOOL (* UnkFuncPtr_ov23_02242540)(int, int); +typedef BOOL (*UnkFuncPtr_ov23_02242540)(int, int); typedef struct { u16 unk_00; @@ -63,12 +62,12 @@ typedef struct { } CommManUnderground_sub1; typedef struct { - void * unk_00; - SysTask * unk_04; + void *unk_00; + SysTask *unk_04; UnkFuncPtr_ov23_022431EC unk_08; - FieldSystem * fieldSystem; - UnkStruct_ov23_02253598 * unk_10; - SysTask * unk_14; + FieldSystem *fieldSystem; + UnkStruct_ov23_02253598 *unk_10; + SysTask *unk_14; UnkStruct_ov23_0224271C unk_18; UnkStruct_ov23_0224271C unk_1C; CommManUnderground_sub1 unk_20[20]; @@ -76,16 +75,16 @@ typedef struct { u8 unk_C2[8]; u8 unk_CA[8]; u8 unk_D2[8]; - Strbuf* unk_DC[8]; + Strbuf *unk_DC[8]; u8 unk_FC[8]; u8 unk_104[8]; u8 unk_10C[8]; UnkFuncPtr_ov23_022427DC unk_114; - UnkStruct_ov23_02253E2C * unk_118; - UnkStruct_ov23_02253E2C * unk_11C; - UnkStruct_ov23_02253E2C * unk_120; - UnkStruct_ov23_02253E2C * unk_124; - UnkStruct_ov23_02253E2C * unk_128; + UnkStruct_ov23_02253E2C *unk_118; + UnkStruct_ov23_02253E2C *unk_11C; + UnkStruct_ov23_02253E2C *unk_120; + UnkStruct_ov23_02253E2C *unk_124; + UnkStruct_ov23_02253E2C *unk_128; int unk_12C; int unk_130; u8 unk_134; @@ -120,11 +119,11 @@ typedef struct { } UnkStruct_ov23_02243360; static void ov23_022433F4(int param0); -static void ov23_02243310(SysTask * param0, void * param1); +static void ov23_02243310(SysTask *param0, void *param1); -static CommManUnderground * sCommManUnderground = NULL; +static CommManUnderground *sCommManUnderground = NULL; -static void CommManUnderground_Init (CommManUnderground * param0, FieldSystem * fieldSystem) +static void CommManUnderground_Init(CommManUnderground *param0, FieldSystem *fieldSystem) { u8 v0 = Options_TextFrameDelay(SaveData_Options(fieldSystem->saveData)); int v1; @@ -159,7 +158,7 @@ static void CommManUnderground_Init (CommManUnderground * param0, FieldSystem * sub_02032110(ov23_022433F4); } -static void ov23_02242108 (void) +static void ov23_02242108(void) { int v0; @@ -183,32 +182,32 @@ static void ov23_02242108 (void) sCommManUnderground = NULL; } -UnkStruct_ov23_02253E2C * ov23_0224219C (void) +UnkStruct_ov23_02253E2C *ov23_0224219C(void) { return sCommManUnderground->unk_118; } -UnkStruct_ov23_02253E2C * ov23_022421AC (void) +UnkStruct_ov23_02253E2C *ov23_022421AC(void) { return sCommManUnderground->unk_11C; } -UnkStruct_ov23_02253E2C * ov23_022421BC (void) +UnkStruct_ov23_02253E2C *ov23_022421BC(void) { return sCommManUnderground->unk_120; } -UnkStruct_ov23_02253E2C * ov23_022421CC (void) +UnkStruct_ov23_02253E2C *ov23_022421CC(void) { return sCommManUnderground->unk_124; } -UnkStruct_ov23_02253E2C * ov23_022421DC (void) +UnkStruct_ov23_02253E2C *ov23_022421DC(void) { return sCommManUnderground->unk_128; } -void ov23_022421EC (void) +void ov23_022421EC(void) { ov23_02254210(sCommManUnderground->unk_118); ov23_02254210(sCommManUnderground->unk_11C); @@ -217,10 +216,10 @@ void ov23_022421EC (void) ov23_02254210(sCommManUnderground->unk_128); } -BOOL ov23_0224223C (TrainerInfo * param0, TrainerInfo * param1, int param2, Strbuf *param3) +BOOL ov23_0224223C(TrainerInfo *param0, TrainerInfo *param1, int param2, Strbuf *param3) { - StringTemplate * v0; - Strbuf* v1; + StringTemplate *v0; + Strbuf *v1; if (param0 && param1) { v0 = StringTemplate_Default(4); @@ -239,10 +238,10 @@ BOOL ov23_0224223C (TrainerInfo * param0, TrainerInfo * param1, int param2, Strb return 0; } -BOOL ov23_022422A8 (TrainerInfo * param0, int param1, int param2, Strbuf *param3) +BOOL ov23_022422A8(TrainerInfo *param0, int param1, int param2, Strbuf *param3) { - StringTemplate * v0; - Strbuf* v1; + StringTemplate *v0; + Strbuf *v1; if (param0) { v0 = StringTemplate_Default(4); @@ -260,13 +259,13 @@ BOOL ov23_022422A8 (TrainerInfo * param0, int param1, int param2, Strbuf *param3 return 0; } -static BOOL ov23_02242308 (Strbuf *param0) +static BOOL ov23_02242308(Strbuf *param0) { int v0; - StringTemplate * v1; - Strbuf* v2; - TrainerInfo * v3; - TrainerInfo * v4; + StringTemplate *v1; + Strbuf *v2; + TrainerInfo *v3; + TrainerInfo *v4; if (!sCommManUnderground) { return 0; @@ -317,7 +316,7 @@ static BOOL ov23_02242308 (Strbuf *param0) return 0; } -BOOL ov23_0224240C (int param0, int param1) +BOOL ov23_0224240C(int param0, int param1) { UnkStruct_ov23_0224271C v0; @@ -339,10 +338,10 @@ BOOL ov23_0224240C (int param0, int param1) return 0; } -BOOL ov23_02242458 (void) +BOOL ov23_02242458(void) { VecFx32 v0; - MapObject * v1; + MapObject *v1; int v2, v3; UnkStruct_ov23_0224271C v4; @@ -387,7 +386,7 @@ BOOL ov23_02242458 (void) return 0; } -static int ov23_02242540 (u8 * param0, UnkFuncPtr_ov23_02242540 param1, UnkStruct_ov23_0224271C * param2) +static int ov23_02242540(u8 *param0, UnkFuncPtr_ov23_02242540 param1, UnkStruct_ov23_0224271C *param2) { UnkStruct_ov23_02241A80 v0; UnkStruct_ov23_02241A88 v1; @@ -418,7 +417,7 @@ static int ov23_02242540 (u8 * param0, UnkFuncPtr_ov23_02242540 param1, UnkStruc return v2; } -static void ov23_022425B8 (int param0, UnkStruct_ov23_0224271C * param1) +static void ov23_022425B8(int param0, UnkStruct_ov23_0224271C *param1) { u8 v0[8 + 1]; UnkStruct_ov23_02241A80 v1; @@ -435,9 +434,9 @@ static void ov23_022425B8 (int param0, UnkStruct_ov23_0224271C * param1) CommSys_SendDataServer(50, v0, v3); } -void ov23_022425F8 (int param0, int param1, void * param2, void * param3) +void ov23_022425F8(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_0224271C * v0 = param2; + UnkStruct_ov23_0224271C *v0 = param2; if (!sub_02059094(param0)) { return; @@ -451,10 +450,10 @@ void ov23_022425F8 (int param0, int param1, void * param2, void * param3) ov23_022425B8(param0, v0); } -void ov23_02242624 (int param0, int param1, void * param2, void * param3) +void ov23_02242624(int param0, int param1, void *param2, void *param3) { int v0; - u8 * v1 = param2; + u8 *v1 = param2; UnkStruct_ov23_0224271C v2; if (CommSys_CurNetId() != v1[0]) { @@ -465,10 +464,10 @@ void ov23_02242624 (int param0, int param1, void * param2, void * param3) sCommManUnderground->unk_148 = param1 - 1; } -void ov23_02242654 (int param0, int param1, void * param2, void * param3) +void ov23_02242654(int param0, int param1, void *param2, void *param3) { int v0; - u8 * v1 = param2; + u8 *v1 = param2; UnkStruct_ov23_0224271C v2; u8 v3[9]; @@ -486,7 +485,7 @@ void ov23_02242654 (int param0, int param1, void * param2, void * param3) ov23_022489F8(sCommManUnderground->fieldSystem, sCommManUnderground->unk_1C.unk_00, sCommManUnderground->unk_1C.unk_02, sCommManUnderground->unk_18.unk_00, sCommManUnderground->unk_18.unk_02, sCommManUnderground->unk_FC, sCommManUnderground->unk_148, sCommManUnderground->unk_104, sCommManUnderground->unk_149, sCommManUnderground->unk_10C, sCommManUnderground->unk_14A); } -static int ov23_02242704 (UnkStruct_ov23_0224271C * param0) +static int ov23_02242704(UnkStruct_ov23_0224271C *param0) { int v0 = 0, v1 = 0; @@ -500,7 +499,7 @@ static int ov23_02242704 (UnkStruct_ov23_0224271C * param0) return (v1 * 30 * 32) + v0; } -int ov23_0224271C (UnkStruct_ov23_0224271C * param0) +int ov23_0224271C(UnkStruct_ov23_0224271C *param0) { int v0; int v1 = 0; @@ -526,7 +525,7 @@ int ov23_0224271C (UnkStruct_ov23_0224271C * param0) return -1; } -int ov23_02242788 (UnkStruct_ov23_0224271C * param0) +int ov23_02242788(UnkStruct_ov23_0224271C *param0) { int v0; int v1 = 0; @@ -550,13 +549,13 @@ int ov23_02242788 (UnkStruct_ov23_0224271C * param0) return v1; } -void ov23_022427DC (int param0, UnkFuncPtr_ov23_022427DC param1) +void ov23_022427DC(int param0, UnkFuncPtr_ov23_022427DC param1) { sCommManUnderground->unk_114 = param1; sCommManUnderground->unk_12C = param0; } -void ov23_022427F8 (void) +void ov23_022427F8(void) { if (0 == CommPlayer_GetMovementTimer(CommSys_CurNetId())) { Link_Message(27); @@ -564,19 +563,19 @@ void ov23_022427F8 (void) } } -void ov23_02242814 (void) +void ov23_02242814(void) { if (sCommManUnderground->unk_146 != 0) { sCommManUnderground->unk_146--; } } -void ov23_02242830 (u8 param0) +void ov23_02242830(u8 param0) { u8 v0 = param0; UnkStruct_ov23_02242830 v1; int v2, v3; - UndergroundData * v4 = sub_020298B0(sCommManUnderground->fieldSystem->saveData); + UndergroundData *v4 = sub_020298B0(sCommManUnderground->fieldSystem->saveData); if ((sCommManUnderground->unk_146 != 0) && (sCommManUnderground->unk_134 != 0)) { return; @@ -606,15 +605,15 @@ void ov23_02242830 (u8 param0) sCommManUnderground->unk_146 = 8; } -int ov23_022428D4 (void) +int ov23_022428D4(void) { return sizeof(UnkStruct_ov23_02242830); } -void ov23_022428D8 (int param0, int param1, void * param2, void * param3) +void ov23_022428D8(int param0, int param1, void *param2, void *param3) { UnkStruct_ov23_022428D8 v0; - UnkStruct_ov23_02242830 * v1 = param2; + UnkStruct_ov23_02242830 *v1 = param2; UnkStruct_ov23_0224271C v2; int v3; u8 v4; @@ -729,7 +728,7 @@ void ov23_022428D8 (int param0, int param1, void * param2, void * param3) } } -void ov23_02242B14 (void) +void ov23_02242B14(void) { int v0; @@ -766,9 +765,9 @@ void ov23_02242B14 (void) } } -void ov23_02242BC0 (FieldSystem * fieldSystem) +void ov23_02242BC0(FieldSystem *fieldSystem) { - void * v0; + void *v0; if (sCommManUnderground == NULL) { v0 = Heap_AllocFromHeap(15, sizeof(CommManUnderground)); @@ -795,7 +794,7 @@ void ov23_02242BC0 (FieldSystem * fieldSystem) } } -void ov23_02242C78 (void) +void ov23_02242C78(void) { if (sCommManUnderground) { ov23_022535EC(); @@ -810,7 +809,7 @@ void ov23_02242C78 (void) } } -void ov23_02242CB4 (void) +void ov23_02242CB4(void) { if (sCommManUnderground) { CommPlayerMan_Restart(); @@ -824,7 +823,7 @@ void ov23_02242CB4 (void) } } -void ov23_02242D08 (void) +void ov23_02242D08(void) { if (sCommManUnderground != NULL) { sub_020287F8(sCommManUnderground->fieldSystem->saveData); @@ -839,9 +838,9 @@ void ov23_02242D08 (void) } } -void ov23_02242D44 (FieldSystem * fieldSystem) +void ov23_02242D44(FieldSystem *fieldSystem) { - void * v0; + void *v0; if (sCommManUnderground != NULL) { ov23_02243670(fieldSystem); @@ -850,7 +849,7 @@ void ov23_02242D44 (FieldSystem * fieldSystem) } } -BOOL ov23_02242D60 (Strbuf *param0) +BOOL ov23_02242D60(Strbuf *param0) { if (sCommManUnderground->unk_14C) { sCommManUnderground->unk_14C = 0; @@ -880,7 +879,7 @@ BOOL ov23_02242D60 (Strbuf *param0) return 0; } -UnkStruct_02029894 * ov23_02242E10 (SaveData * param0) +UnkStruct_02029894 *ov23_02242E10(SaveData *param0) { if (!sCommManUnderground) { return NULL; @@ -889,7 +888,7 @@ UnkStruct_02029894 * ov23_02242E10 (SaveData * param0) return ov23_0224D130(param0); } -int ov23_02242E28 (void) +int ov23_02242E28(void) { if (!sCommManUnderground) { return 0; @@ -898,7 +897,7 @@ int ov23_02242E28 (void) return ov23_0224D150(); } -int ov23_02242E40 (void) +int ov23_02242E40(void) { if (!sCommManUnderground) { return 0; @@ -907,7 +906,7 @@ int ov23_02242E40 (void) return ov23_0224D178(); } -BOOL ov23_02242E58 (int param0, int param1) +BOOL ov23_02242E58(int param0, int param1) { if ((32 < param0) && (64 < param1) && (479 > param0) && (479 > param1)) { return 0; @@ -916,7 +915,7 @@ BOOL ov23_02242E58 (int param0, int param1) return 1; } -int ov23_02242E78 (int param0) +int ov23_02242E78(int param0) { int v0, v1; @@ -939,7 +938,7 @@ int ov23_02242E78 (int param0) return ov23_0224125C(v1); } } else { - UnkStruct_02029894 * v2 = sub_02029894(sCommManUnderground->fieldSystem->saveData); + UnkStruct_02029894 *v2 = sub_02029894(sCommManUnderground->fieldSystem->saveData); return sub_02029874(v2); } } @@ -947,7 +946,7 @@ int ov23_02242E78 (int param0) return 0; } -int ov23_02242EE0 (int param0) +int ov23_02242EE0(int param0) { int v0, v1, v2; @@ -970,7 +969,7 @@ int ov23_02242EE0 (int param0) return ov23_02241294(v1); } } else { - UnkStruct_02029894 * v3 = sub_02029894(sCommManUnderground->fieldSystem->saveData); + UnkStruct_02029894 *v3 = sub_02029894(sCommManUnderground->fieldSystem->saveData); return sub_0202987C(v3); } @@ -979,7 +978,7 @@ int ov23_02242EE0 (int param0) return 0; } -int ov23_02242F48 (int param0) +int ov23_02242F48(int param0) { if (sCommManUnderground) { if (param0 < 16) { @@ -996,7 +995,7 @@ int ov23_02242F48 (int param0) return 12; } } else { - UnkStruct_02029894 * v0 = sub_02029894(sCommManUnderground->fieldSystem->saveData); + UnkStruct_02029894 *v0 = sub_02029894(sCommManUnderground->fieldSystem->saveData); if (sub_0202988C(v0)) { return 3; @@ -1007,49 +1006,49 @@ int ov23_02242F48 (int param0) return 0; } -void ov23_02242FA8 (void) +void ov23_02242FA8(void) { sCommManUnderground->unk_147 = 0; } -void ov23_02242FBC (void) +void ov23_02242FBC(void) { sCommManUnderground->unk_147 = 1; } -void ov23_02242FD0 (void) +void ov23_02242FD0(void) { sCommManUnderground->unk_147 = 2; } -void ov23_02242FE4 (void) +void ov23_02242FE4(void) { sCommManUnderground->unk_147 = 4; } -void ov23_02242FF8 (void) +void ov23_02242FF8(void) { sCommManUnderground->unk_147 = 3; } -void ov23_0224300C (int param0, int param1) +void ov23_0224300C(int param0, int param1) { if (sCommManUnderground) { sCommManUnderground->unk_C2[param0] = param1; } } -void ov23_02243020 (int param0) +void ov23_02243020(int param0) { if (sCommManUnderground) { sCommManUnderground->unk_D2[param0] = 1; } } -void UndergroundMan_SetReturnLog (int param0) +void UndergroundMan_SetReturnLog(int param0) { - StringTemplate * v0; - Strbuf* v1; + StringTemplate *v0; + Strbuf *v1; if (sCommManUnderground) { if (sCommManUnderground->unk_DC[param0] == NULL) { @@ -1067,17 +1066,17 @@ void UndergroundMan_SetReturnLog (int param0) } } -void ov23_022430B8 (int param0) +void ov23_022430B8(int param0) { sCommManUnderground->unk_13D[param0] = 1; } -void ov23_022430D0 (u16 param0) +void ov23_022430D0(u16 param0) { sCommManUnderground->unk_C0 = param0; } -void ov23_022430E0 (u16 param0, u16 param1, u16 param2) +void ov23_022430E0(u16 param0, u16 param1, u16 param2) { int v0; @@ -1108,7 +1107,7 @@ void ov23_022430E0 (u16 param0, u16 param1, u16 param2) GF_ASSERT(0); } -u16 ov23_02243154 (u16 param0) +u16 ov23_02243154(u16 param0) { int v0; @@ -1123,7 +1122,7 @@ u16 ov23_02243154 (u16 param0) return 0; } -u16 ov23_0224318C (u16 param0) +u16 ov23_0224318C(u16 param0) { int v0; @@ -1138,9 +1137,9 @@ u16 ov23_0224318C (u16 param0) return 0; } -void ov23_022431C4 (int param0, int param1, void * param2, void * param3) +void ov23_022431C4(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; int v1 = v0[0]; if (v1 == CommSys_CurNetId()) { @@ -1150,21 +1149,21 @@ void ov23_022431C4 (int param0, int param1, void * param2, void * param3) } } -void ov23_022431EC (void * param0, SysTask * param1, UnkFuncPtr_ov23_022431EC param2) +void ov23_022431EC(void *param0, SysTask *param1, UnkFuncPtr_ov23_022431EC param2) { sCommManUnderground->unk_00 = param0; sCommManUnderground->unk_04 = param1; sCommManUnderground->unk_08 = param2; } -void ov23_02243204 (void) +void ov23_02243204(void) { sCommManUnderground->unk_00 = NULL; sCommManUnderground->unk_04 = NULL; sCommManUnderground->unk_08 = NULL; } -BOOL ov23_0224321C (void) +BOOL ov23_0224321C(void) { BOOL v0 = 0; @@ -1185,7 +1184,7 @@ BOOL ov23_0224321C (void) return v0; } -BOOL ov23_02243298 (int param0) +BOOL ov23_02243298(int param0) { int v0, v1; @@ -1219,7 +1218,7 @@ BOOL ov23_02243298 (int param0) return 1; } -static void ov23_02243310 (SysTask * param0, void * param1) +static void ov23_02243310(SysTask *param0, void *param1) { ov23_02254250(sCommManUnderground->unk_118); ov23_02254250(sCommManUnderground->unk_11C); @@ -1228,7 +1227,7 @@ static void ov23_02243310 (SysTask * param0, void * param1) ov23_02254250(sCommManUnderground->unk_128); } -void ov23_02243360 (void) +void ov23_02243360(void) { UnkStruct_ov23_02243360 v0; @@ -1240,9 +1239,9 @@ void ov23_02243360 (void) CommSys_SendDataFixedSize(70, &v0); } -void ov23_02243390 (int param0, int param1, void * param2, void * param3) +void ov23_02243390(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_02243360 * v0 = param2; + UnkStruct_ov23_02243360 *v0 = param2; ov23_0224DBA0(param0, v0->unk_00); ov23_0224DBBC(param0, v0->unk_02); @@ -1250,17 +1249,17 @@ void ov23_02243390 (int param0, int param1, void * param2, void * param3) ov23_02241690(param0, v0->unk_05); } -int ov23_022433B8 (void) +int ov23_022433B8(void) { return sizeof(UnkStruct_ov23_02243360); } -void ov23_022433BC (int param0, int param1, void * param2, void * param3) +void ov23_022433BC(int param0, int param1, void *param2, void *param3) { sCommManUnderground->unk_CA[param0] = 1; } -int ov23_022433D0 (void) +int ov23_022433D0(void) { int v0, v1 = 0; @@ -1273,7 +1272,7 @@ int ov23_022433D0 (void) return v1; } -static void ov23_022433F4 (int param0) +static void ov23_022433F4(int param0) { sCommManUnderground->unk_CA[param0] = 0; ov23_0224B5CC(param0); diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index 2e61117002..19ac52a340 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -1,74 +1,74 @@ +#include "overlay023/ov23_0224340C.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "camera.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_0200C738.h" + #include "field/field_system.h" +#include "overlay005/ov5_021EAFA4.h" +#include "overlay005/ov5_021F4E08.h" +#include "overlay005/ov5_021F55CC.h" #include "overlay019/struct_ov19_021DA864.h" +#include "overlay023/ov23_0223E140.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_0224A1D0.h" +#include "overlay023/ov23_0224B05C.h" +#include "overlay023/ov23_0224F294.h" +#include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_0224271C.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay115/struct_ov115_02261520.h" +#include "camera.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_system.h" +#include "gx_layers.h" +#include "heap.h" +#include "map_object_move.h" +#include "narc.h" +#include "player_avatar.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A9DC.h" -#include "sys_task.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_0202854C.h" #include "unk_0202CD50.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "field_system.h" -#include "vars_flags.h" #include "unk_02054D00.h" -#include "comm_player_manager.h" -#include "player_avatar.h" -#include "map_object_move.h" #include "unk_0206AFE0.h" #include "unk_0206CCB0.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021EAFA4.h" -#include "overlay005/ov5_021F4E08.h" -#include "overlay005/ov5_021F55CC.h" -#include "overlay023/ov23_0223E140.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_0224340C.h" -#include "overlay023/ov23_0224A1D0.h" -#include "overlay023/ov23_0224B05C.h" -#include "overlay023/ov23_0224F294.h" -#include "overlay023/ov23_02253D40.h" +#include "vars_flags.h" -typedef void (* UnkFuncPtr_ov23_02257764)(BGL *); -typedef void (* UnkFuncPtr_ov23_02256670)(int, BOOL); -typedef void (* UnkFuncPtr_ov23_02256440)(int, BOOL, int); -typedef void (* UnkFuncPtr_ov23_022564CC)(int); +typedef void (*UnkFuncPtr_ov23_02257764)(BGL *); +typedef void (*UnkFuncPtr_ov23_02256670)(int, BOOL); +typedef void (*UnkFuncPtr_ov23_02256440)(int, BOOL, int); +typedef void (*UnkFuncPtr_ov23_022564CC)(int); typedef struct { u16 unk_00; @@ -117,28 +117,28 @@ typedef struct { } UnkStruct_ov23_02248A6C; typedef struct { - UnkStruct_ov23_02248A6C * unk_00[8]; - SysTask * unk_20[8]; - FieldSystem * fieldSystem; - GraphicElementManager * unk_44; + UnkStruct_ov23_02248A6C *unk_00[8]; + SysTask *unk_20[8]; + FieldSystem *fieldSystem; + GraphicElementManager *unk_44; UnkStruct_0200C738 unk_48; - UnkStruct_02009714 * unk_1D4[2][4]; - UnkStruct_02009DC8 * unk_1F4[2][4]; + UnkStruct_02009714 *unk_1D4[2][4]; + UnkStruct_02009DC8 *unk_1F4[2][4]; UnkStruct_ov19_021DA864 unk_214; UnkStruct_ov19_021DA864 unk_238; - GraphicElementData * unk_25C[32]; - GraphicElementData * unk_2DC[4]; - TaskManager * unk_2EC; - SysTask * unk_2F0; - SysTask * unk_2F4; - SysTask * unk_2F8; - UnkStruct_ov23_02245700 * unk_2FC; - void * unk_300; + GraphicElementData *unk_25C[32]; + GraphicElementData *unk_2DC[4]; + TaskManager *unk_2EC; + SysTask *unk_2F0; + SysTask *unk_2F4; + SysTask *unk_2F8; + UnkStruct_ov23_02245700 *unk_2FC; + void *unk_300; UnkFuncPtr_ov23_02257764 unk_304; UnkStruct_ov23_02243DA8 unk_308[16]; - UnkStruct_ov101_021D5D90 * unk_368[16]; + UnkStruct_ov101_021D5D90 *unk_368[16]; UnkStruct_ov23_02243DA8 unk_3A8[192]; - UnkStruct_ov23_02243DA8 * unk_828[192]; + UnkStruct_ov23_02243DA8 *unk_828[192]; UnkStruct_ov23_02244140 unk_B28[8]; u8 unk_B68[8]; u16 unk_B70[8]; @@ -169,7 +169,7 @@ typedef struct { u8 unk_113; u8 unk_114; int unk_118; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; } UnkStruct_ov23_02245ED4; typedef struct { @@ -179,8 +179,8 @@ typedef struct { int unk_44[15]; int unk_80[15]; int unk_BC[15]; - UnkStruct_02009DC8 * unk_F8[7]; - UnkStruct_ov101_021D5D90 * unk_114; + UnkStruct_02009DC8 *unk_F8[7]; + UnkStruct_ov101_021D5D90 *unk_114; int unk_118; int unk_11C; int unk_120; @@ -233,7 +233,7 @@ typedef struct { typedef struct { int unk_00; int unk_04; - u8 * unk_08[3]; + u8 *unk_08[3]; int unk_14[3]; int unk_20; int unk_24; @@ -257,7 +257,7 @@ typedef struct { u8 unk_0C; u8 unk_0D; int unk_10; - UnkStruct_ov101_021D5D90 * unk_14; + UnkStruct_ov101_021D5D90 *unk_14; int unk_18; int unk_1C; int unk_20; @@ -269,8 +269,8 @@ typedef struct { u16 unk_08; u16 unk_0A; int unk_0C; - BGL * unk_10; - FieldSystem * fieldSystem; + BGL *unk_10; + FieldSystem *fieldSystem; u8 unk_18; u8 unk_19; int unk_1C; @@ -279,7 +279,7 @@ typedef struct { typedef struct { int unk_00; int unk_04; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; int unk_0C; int unk_10; int unk_14; @@ -299,15 +299,15 @@ typedef struct { u8 unk_02; } UnkStruct_ov23_02245560; -static void ov23_02243DA8(UnkStruct_ov23_02243DA8 * param0); -static int ov23_0224426C(UnkStruct_ov23_02243DA8 * param0); -static UnkStruct_ov23_02243DA8 * ov23_02243A80(int param0, int param1, UnkStruct_ov23_02243DA8 * param2, int param3); +static void ov23_02243DA8(UnkStruct_ov23_02243DA8 *param0); +static int ov23_0224426C(UnkStruct_ov23_02243DA8 *param0); +static UnkStruct_ov23_02243DA8 *ov23_02243A80(int param0, int param1, UnkStruct_ov23_02243DA8 *param2, int param3); static void ov23_02243970(int param0); -static UnkStruct_ov23_02243DA8 * ov23_0224429C(int param0, int param1); -static UnkStruct_ov101_021D5D90 * ov23_02244E68(int param0, int param1, int param2, int param3); +static UnkStruct_ov23_02243DA8 *ov23_0224429C(int param0, int param1); +static UnkStruct_ov101_021D5D90 *ov23_02244E68(int param0, int param1, int param2, int param3); static void ov23_02243754(void); static void ov23_0224382C(void); -static void ov23_02243E20(UnkStruct_ov23_02243DA8 * param0); +static void ov23_02243E20(UnkStruct_ov23_02243DA8 *param0); static void ov23_022457FC(void); static void ov23_02244830(int param0, int param1); static void ov23_02244844(int param0, int param1); @@ -345,25 +345,25 @@ static void ov23_02244FD0(int param0, BOOL param1); static void ov23_02246220(int param0, BOOL param1); static void ov23_0224590C(int param0, BOOL param1); static void ov23_02245938(int param0, BOOL param1); -static UnkStruct_ov23_02243DA8 * ov23_02244EA0(UnkStruct_ov23_02243DA8 * param0); -static void ov23_02244D80(FieldSystem * fieldSystem, int param1, int param2, BOOL param3); -static void ov23_02244EA4(FieldSystem * fieldSystem, BOOL param1, int param2); -static BOOL ov23_02245064(UnkStruct_ov23_0224271C * param0, BGL * param1, UnkStruct_ov23_022451BC * param2); -static BOOL ov23_022450D4(int param0, int param1, u8 * param2); -static void ov23_022451C8(SysTask * param0, void * param1); -static void ov23_022451BC(UnkStruct_ov23_022451BC * param0); +static UnkStruct_ov23_02243DA8 *ov23_02244EA0(UnkStruct_ov23_02243DA8 *param0); +static void ov23_02244D80(FieldSystem *fieldSystem, int param1, int param2, BOOL param3); +static void ov23_02244EA4(FieldSystem *fieldSystem, BOOL param1, int param2); +static BOOL ov23_02245064(UnkStruct_ov23_0224271C *param0, BGL *param1, UnkStruct_ov23_022451BC *param2); +static BOOL ov23_022450D4(int param0, int param1, u8 *param2); +static void ov23_022451C8(SysTask *param0, void *param1); +static void ov23_022451BC(UnkStruct_ov23_022451BC *param0); static void ov23_02245A58(BOOL param0); -static void ov23_022462A8(FieldSystem * fieldSystem, BOOL param1, int param2); -static BOOL ov23_02246640(BGL * param0, UnkStruct_ov23_02245ED4 * param1); +static void ov23_022462A8(FieldSystem *fieldSystem, BOOL param1, int param2); +static BOOL ov23_02246640(BGL *param0, UnkStruct_ov23_02245ED4 *param1); static void ov23_02246324(void); static void ov23_02246370(int param0); static void ov23_0224644C(int param0); -static void ov23_022468DC(UnkStruct_ov23_022468DC * param0); -static void ov23_02246A80(SysTask * param0, void * param1); -static void ov23_02246CF0(BGL * param0, BOOL param1, int param2); -static void ov23_02246D44(UnkStruct_ov23_022468DC * param0); -static void ov23_02246E90(int param0, UnkStruct_ov23_022468DC * param1); -static BOOL ov23_02246F20(BGL * param0, UnkStruct_ov23_022468DC * param1); +static void ov23_022468DC(UnkStruct_ov23_022468DC *param0); +static void ov23_02246A80(SysTask *param0, void *param1); +static void ov23_02246CF0(BGL *param0, BOOL param1, int param2); +static void ov23_02246D44(UnkStruct_ov23_022468DC *param0); +static void ov23_02246E90(int param0, UnkStruct_ov23_022468DC *param1); +static BOOL ov23_02246F20(BGL *param0, UnkStruct_ov23_022468DC *param1); static void ov23_0224710C(int param0, BOOL param1, int param2); static void ov23_02247138(int param0); static void ov23_02247144(int param0, BOOL param1); @@ -389,7 +389,7 @@ static void ov23_0224859C(int param0); static void ov23_02248B3C(int param0, int param1); static void ov23_02248BD0(void); -static UnkStruct_ov23_02257764 * Unk_ov23_02257764 = NULL; +static UnkStruct_ov23_02257764 *Unk_ov23_02257764 = NULL; static s8 Unk_ov23_02257760 ATTRIBUTE_ALIGN(32); static const UnkFuncPtr_ov23_02256670 Unk_ov23_02256670[] = { @@ -620,10 +620,10 @@ static const UnkFuncPtr_ov23_022564CC Unk_ov23_022565E4[] = { NULL }; -static void ov23_0224340C (void) +static void ov23_0224340C(void) { int v0; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->fieldSystem)); + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->fieldSystem)); for (v0 = 0; v0 < 16; v0++) { Unk_ov23_02257764->unk_308[v0].unk_04 = sub_02029030(v1, v0); @@ -639,10 +639,10 @@ static void ov23_0224340C (void) } } -void ov23_022434BC (void * param0, FieldSystem * fieldSystem) +void ov23_022434BC(void *param0, FieldSystem *fieldSystem) { int v0; - UndergroundData * v1; + UndergroundData *v1; if (Unk_ov23_02257764) { return; @@ -666,7 +666,7 @@ void ov23_022434BC (void * param0, FieldSystem * fieldSystem) ov23_0224340C(); } -void ov23_02243520 (void) +void ov23_02243520(void) { int v0; @@ -693,7 +693,7 @@ void ov23_02243520 (void) Unk_ov23_02257764->unk_BAA = 1; } -void ov23_022435A8 (void) +void ov23_022435A8(void) { int v0; @@ -704,7 +704,7 @@ void ov23_022435A8 (void) ov23_02243754(); } -void ov23_022435DC (void) +void ov23_022435DC(void) { int v0; @@ -736,10 +736,10 @@ void ov23_022435DC (void) Unk_ov23_02257764 = NULL; } -void ov23_02243670 (FieldSystem * fieldSystem) +void ov23_02243670(FieldSystem *fieldSystem) { int v0; - UndergroundData * v1; + UndergroundData *v1; for (v0 = 0; v0 < 16; v0++) { if (Unk_ov23_02257764->unk_368[v0]) { @@ -761,9 +761,9 @@ void ov23_02243670 (FieldSystem * fieldSystem) ov23_02243CE8(); } -void ov23_022436F0 (int param0) +void ov23_022436F0(int param0) { - UnkStruct_ov23_02243DA8 * v0 = &Unk_ov23_02257764->unk_3A8[param0 * 16]; + UnkStruct_ov23_02243DA8 *v0 = &Unk_ov23_02257764->unk_3A8[param0 * 16]; int v1; for (v1 = 0; v1 < 16; v1++) { @@ -780,7 +780,7 @@ void ov23_022436F0 (int param0) } } -static void ov23_02243754 (void) +static void ov23_02243754(void) { int v0; @@ -789,7 +789,7 @@ static void ov23_02243754 (void) } { - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_DATA__UG_TRAP, 4); @@ -802,7 +802,7 @@ static void ov23_02243754 (void) } } -static void ov23_0224382C () +static void ov23_0224382C() { int v0; @@ -811,22 +811,22 @@ static void ov23_0224382C () } } -static void ov23_02243850 (int param0) +static void ov23_02243850(int param0) { sub_02059514(); } -int ov23_02243858 (void) +int ov23_02243858(void) { return sizeof(UnkStruct_ov23_02257764); } -int ov23_02243860 (void) +int ov23_02243860(void) { return sizeof(UnkStruct_ov23_02243DA8) * 16; } -static UnkStruct_ov23_0224271C * ov23_02243864 (UnkStruct_ov23_0224271C * param0, int param1) +static UnkStruct_ov23_0224271C *ov23_02243864(UnkStruct_ov23_0224271C *param0, int param1) { if (Unk_ov23_02257764->unk_828[param1] == NULL) { return NULL; @@ -838,10 +838,10 @@ static UnkStruct_ov23_0224271C * ov23_02243864 (UnkStruct_ov23_0224271C * param0 return param0; } -static void ov23_02243898 (UnkStruct_ov23_02243DA8 * param0) +static void ov23_02243898(UnkStruct_ov23_02243DA8 *param0) { int v0, v1, v2; - UnkStruct_ov23_02243DA8 * v3; + UnkStruct_ov23_02243DA8 *v3; UnkStruct_ov23_0224271C v4; v4.unk_00 = param0->unk_00; @@ -869,7 +869,7 @@ static void ov23_02243898 (UnkStruct_ov23_02243DA8 * param0) Unk_ov23_02257764->unk_828[v0] = param0; } -static void ov23_02243910 (UnkStruct_ov23_02243DA8 * param0) +static void ov23_02243910(UnkStruct_ov23_02243DA8 *param0) { int v0 = -1, v1; UnkStruct_ov23_0224271C v2; @@ -892,7 +892,7 @@ static void ov23_02243910 (UnkStruct_ov23_02243DA8 * param0) Unk_ov23_02257764->unk_828[(16 * (7 + 1) + (16 * 4)) - 1] = NULL; } -static void ov23_02243970 (int param0) +static void ov23_02243970(int param0) { int v0, v1, v2; UnkStruct_ov23_0224271C v3; @@ -908,7 +908,7 @@ static void ov23_02243970 (int param0) } } -static UnkStruct_ov23_02243DA8 * ov23_022439D0 (UnkStruct_ov23_02243DA8 * param0) +static UnkStruct_ov23_02243DA8 *ov23_022439D0(UnkStruct_ov23_02243DA8 *param0) { int v0; @@ -923,7 +923,7 @@ static UnkStruct_ov23_02243DA8 * ov23_022439D0 (UnkStruct_ov23_02243DA8 * param0 return NULL; } -static int ov23_022439E4 (UnkStruct_ov23_02243DA8 * param0) +static int ov23_022439E4(UnkStruct_ov23_02243DA8 *param0) { int v0; @@ -938,10 +938,10 @@ static int ov23_022439E4 (UnkStruct_ov23_02243DA8 * param0) return -1; } -static void ov23_02243A00 (UnkStruct_ov23_02243DA8 * param0) +static void ov23_02243A00(UnkStruct_ov23_02243DA8 *param0) { int v0; - u32 v1 = (u32) & Unk_ov23_02257764->unk_3A8[0]; + u32 v1 = (u32)&Unk_ov23_02257764->unk_3A8[0]; u32 v2 = (u32)param0; u32 v3 = (v2 - v1) / sizeof(UnkStruct_ov23_02243DA8); u32 v4 = v3 / 16; @@ -958,10 +958,10 @@ static void ov23_02243A00 (UnkStruct_ov23_02243DA8 * param0) ov23_02243970(v4); } -static UnkStruct_ov23_02243DA8 * ov23_02243A80 (int param0, int param1, UnkStruct_ov23_02243DA8 * param2, int param3) +static UnkStruct_ov23_02243DA8 *ov23_02243A80(int param0, int param1, UnkStruct_ov23_02243DA8 *param2, int param3) { int v0 = 0; - UnkStruct_ov23_02243DA8 * v1; + UnkStruct_ov23_02243DA8 *v1; if (FieldSystem_CheckCollision(Unk_ov23_02257764->fieldSystem, param0, param1)) { return NULL; @@ -984,19 +984,19 @@ static UnkStruct_ov23_02243DA8 * ov23_02243A80 (int param0, int param1, UnkStruc return v1; } -void ov23_02243AD4 (u8 param0) +void ov23_02243AD4(u8 param0) { CommSys_SendDataFixedSize(32, ¶m0); } -void ov23_02243AE8 (void) +void ov23_02243AE8(void) { int v0; ov23_022457FC(); } -void ov23_02243AF0 (void) +void ov23_02243AF0(void) { int v0; u8 v1 = 0; @@ -1004,11 +1004,11 @@ void ov23_02243AF0 (void) CommSys_WriteToQueue(35, &Unk_ov23_02257764->unk_308[0], sizeof(UnkStruct_ov23_02243DA8) * 16); } -void ov23_02243B0C (int param0, int param1, void * param2, void * param3) +void ov23_02243B0C(int param0, int param1, void *param2, void *param3) { - u8 * v0 = (u8 *)param2; + u8 *v0 = (u8 *)param2; int v1, v2; - UnkStruct_ov23_02243DA8 * v3; + UnkStruct_ov23_02243DA8 *v3; UnkStruct_ov23_02243ED4 v4; if (Unk_ov23_02257764 == NULL) { @@ -1063,12 +1063,12 @@ void ov23_02243B0C (int param0, int param1, void * param2, void * param3) CommSys_SendDataServer(34, &v4, sizeof(UnkStruct_ov23_02243ED4)); } -int ov23_02243C38 (void) +int ov23_02243C38(void) { return sizeof(UnkStruct_ov23_02243ED4); } -int ov23_02243C3C (int param0, int param1, MATHRandContext16 * param2, int param3) +int ov23_02243C3C(int param0, int param1, MATHRandContext16 *param2, int param3) { static const u8 v0[] = { 1, @@ -1100,9 +1100,9 @@ int ov23_02243C3C (int param0, int param1, MATHRandContext16 * param2, int param }; u8 v1; int v2, v3; - UnkStruct_ov23_02243DA8 * v4; - UnkStruct_ov23_02243DA8 * v5; - UndergroundData * v6 = sub_020298B0(Unk_ov23_02257764->fieldSystem->saveData); + UnkStruct_ov23_02243DA8 *v4; + UnkStruct_ov23_02243DA8 *v5; + UndergroundData *v6 = sub_020298B0(Unk_ov23_02257764->fieldSystem->saveData); if (param3 >= (16 * 4)) { return 0; @@ -1118,7 +1118,7 @@ int ov23_02243C3C (int param0, int param1, MATHRandContext16 * param2, int param v4 = ov23_022439D0(v5); if (v4 != NULL) { - UnkStruct_ov23_02243DA8 * v7 = ov23_02243A80(param0, param1, v5, v1); + UnkStruct_ov23_02243DA8 *v7 = ov23_02243A80(param0, param1, v5, v1); if (v7) { v7->unk_05 = param3; @@ -1132,10 +1132,10 @@ int ov23_02243C3C (int param0, int param1, MATHRandContext16 * param2, int param return 0; } -void ov23_02243CE8 (void) +void ov23_02243CE8(void) { int v0; - UndergroundData * v1 = sub_020298B0(Unk_ov23_02257764->fieldSystem->saveData); + UndergroundData *v1 = sub_020298B0(Unk_ov23_02257764->fieldSystem->saveData); for (v0 = 0; v0 < (16 * 4); v0++) { int v2 = sub_02028F40(v1, v0); @@ -1145,8 +1145,8 @@ void ov23_02243CE8 (void) int v4 = sub_02028F88(v1, v0); int v5 = (7 + 1) + v0 / 16; int v6 = v5 * 16; - UnkStruct_ov23_02243DA8 * v7 = &Unk_ov23_02257764->unk_3A8[v6]; - UnkStruct_ov23_02243DA8 * v8 = ov23_02243A80(v3, v4, v7, v2); + UnkStruct_ov23_02243DA8 *v7 = &Unk_ov23_02257764->unk_3A8[v6]; + UnkStruct_ov23_02243DA8 *v8 = ov23_02243A80(v3, v4, v7, v2); if (v8) { v8->unk_05 = v0; @@ -1155,9 +1155,9 @@ void ov23_02243CE8 (void) } } -static void ov23_02243D50 (void) +static void ov23_02243D50(void) { - UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->fieldSystem)); + UndergroundData *v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->fieldSystem)); int v1; for (v1 = 0; v1 < 16; v1++) { @@ -1165,9 +1165,9 @@ static void ov23_02243D50 (void) } } -static void ov23_02243DA8 (UnkStruct_ov23_02243DA8 * param0) +static void ov23_02243DA8(UnkStruct_ov23_02243DA8 *param0) { - UnkStruct_ov23_02243DA8 * v0 = ov23_022439D0(Unk_ov23_02257764->unk_308); + UnkStruct_ov23_02243DA8 *v0 = ov23_022439D0(Unk_ov23_02257764->unk_308); int v1; if (v0 == NULL) { @@ -1183,9 +1183,9 @@ static void ov23_02243DA8 (UnkStruct_ov23_02243DA8 * param0) Unk_ov23_02257764->unk_368[v1] = ov23_02244E68(v0->unk_00, v0->unk_02, 1, v0->unk_04); } -static void ov23_02243E20 (UnkStruct_ov23_02243DA8 * param0) +static void ov23_02243E20(UnkStruct_ov23_02243DA8 *param0) { - UnkStruct_ov23_02243DA8 * v0; + UnkStruct_ov23_02243DA8 *v0; int v1 = -1, v2; for (v2 = 0; v2 < 16; v2++) { @@ -1218,11 +1218,11 @@ static void ov23_02243E20 (UnkStruct_ov23_02243DA8 * param0) Unk_ov23_02257764->unk_368[16 - 1] = NULL; } -void ov23_02243ED4 (int param0, int param1, void * param2, void * param3) +void ov23_02243ED4(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_02243ED4 * v0 = (UnkStruct_ov23_02243ED4 *)param2; + UnkStruct_ov23_02243ED4 *v0 = (UnkStruct_ov23_02243ED4 *)param2; int v1; - UnkStruct_ov23_02243DA8 * v2; + UnkStruct_ov23_02243DA8 *v2; if (CommSys_CurNetId() == v0->unk_06) { sub_020594FC(); @@ -1247,23 +1247,23 @@ void ov23_02243ED4 (int param0, int param1, void * param2, void * param3) } } -void ov23_02243F78 (int param0, int param1, void * param2, void * param3) +void ov23_02243F78(int param0, int param1, void *param2, void *param3) { - u16 * v0 = param2; + u16 *v0 = param2; int v1 = v0[0]; ov23_02243A00(&Unk_ov23_02257764->unk_3A8[v1]); } -int ov23_02243F98 (void) +int ov23_02243F98(void) { return 2; } -void ov23_02243F9C (int param0, int param1, void * param2, void * param3) +void ov23_02243F9C(int param0, int param1, void *param2, void *param3) { u8 v0[2]; - UnkStruct_ov23_02243DA8 * v1 = &Unk_ov23_02257764->unk_3A8[param0 * 16]; + UnkStruct_ov23_02243DA8 *v1 = &Unk_ov23_02257764->unk_3A8[param0 * 16]; int v2; if (CommSys_CurNetId() != 0) { @@ -1294,9 +1294,9 @@ void ov23_02243F9C (int param0, int param1, void * param2, void * param3) ov23_02244638(); } -void ov23_0224401C (int param0, int param1, void * param2, void * param3) +void ov23_0224401C(int param0, int param1, void *param2, void *param3) { - u8 * v0 = (u8 *)param2; + u8 *v0 = (u8 *)param2; if (Unk_ov23_02257764) { if (CommSys_CurNetId() == v0[0]) { @@ -1305,33 +1305,33 @@ void ov23_0224401C (int param0, int param1, void * param2, void * param3) } } -int ov23_02244048 (void) +int ov23_02244048(void) { return 2; } -BOOL ov23_0224404C (void) +BOOL ov23_0224404C(void) { return Unk_ov23_02257764->unk_BA9 == 1; } -void ov23_02244068 (void) +void ov23_02244068(void) { Unk_ov23_02257764->unk_BA9 = 0; } -int ov23_0224407C (void) +int ov23_0224407C(void) { return sizeof(UnkStruct_ov23_0224271C); } -BOOL ov23_02244080 (int param0, UnkStruct_ov23_0224271C * param1, u8 param2) +BOOL ov23_02244080(int param0, UnkStruct_ov23_0224271C *param1, u8 param2) { int v0, v1; u8 v2 = param0; - UnkStruct_ov23_02243DA8 * v3; + UnkStruct_ov23_02243DA8 *v3; UnkStruct_ov23_02244140 v4; - UndergroundData * v5 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->fieldSystem)); + UndergroundData *v5 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->fieldSystem)); v0 = CommPlayer_AddXServer(param0); v1 = CommPlayer_AddZServer(param0); @@ -1354,7 +1354,7 @@ BOOL ov23_02244080 (int param0, UnkStruct_ov23_0224271C * param1, u8 param2) ov23_02243A00(v3); } - if (v4.unk_06 >= ((7 + 1))) { + if (v4.unk_06 >= (7 + 1)) { sub_02028FB4(v5, v4.unk_00.unk_05); } @@ -1367,14 +1367,14 @@ BOOL ov23_02244080 (int param0, UnkStruct_ov23_0224271C * param1, u8 param2) return 0; } -int ov23_0224413C (void) +int ov23_0224413C(void) { return sizeof(UnkStruct_ov23_02244140); } -void ov23_02244140 (int param0, int param1, void * param2, void * param3) +void ov23_02244140(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_02244140 * v0 = (UnkStruct_ov23_02244140 *)param2; + UnkStruct_ov23_02244140 *v0 = (UnkStruct_ov23_02244140 *)param2; GF_ASSERT(v0->unk_07_0 < (7 + 1)); @@ -1422,7 +1422,7 @@ void ov23_02244140 (int param0, int param1, void * param2, void * param3) } } -static int ov23_0224426C (UnkStruct_ov23_02243DA8 * param0) +static int ov23_0224426C(UnkStruct_ov23_02243DA8 *param0) { int v0; @@ -1436,7 +1436,7 @@ static int ov23_0224426C (UnkStruct_ov23_02243DA8 * param0) return 0; } -static UnkStruct_ov23_02243DA8 * ov23_0224429C (int param0, int param1) +static UnkStruct_ov23_02243DA8 *ov23_0224429C(int param0, int param1) { UnkStruct_ov23_0224271C v0; int v1; @@ -1454,7 +1454,7 @@ static UnkStruct_ov23_02243DA8 * ov23_0224429C (int param0, int param1) return Unk_ov23_02257764->unk_828[v1]; } -BOOL ov23_022442D8 (int param0, int param1) +BOOL ov23_022442D8(int param0, int param1) { if (ov23_0224429C(param0, param1) == NULL) { return 0; @@ -1463,16 +1463,16 @@ BOOL ov23_022442D8 (int param0, int param1) return 1; } -int ov23_022442EC (void) +int ov23_022442EC(void) { return sizeof(UnkStruct_ov23_02244140); } -static BOOL ov23_022442F0 (int param0) +static BOOL ov23_022442F0(int param0) { UnkStruct_ov23_02244140 v0; - UnkStruct_ov23_02243DA8 * v1; - UndergroundData * v2 = sub_020298B0(Unk_ov23_02257764->fieldSystem->saveData); + UnkStruct_ov23_02243DA8 *v1; + UndergroundData *v2 = sub_020298B0(Unk_ov23_02257764->fieldSystem->saveData); if (ov23_0224162C(param0)) { return 0; @@ -1497,7 +1497,7 @@ static BOOL ov23_022442F0 (int param0) MI_CpuCopy8(v1, &v0.unk_00, sizeof(UnkStruct_ov23_02243DA8)); - if (v0.unk_06 >= ((7 + 1))) { + if (v0.unk_06 >= (7 + 1)) { sub_02028FB4(v2, v0.unk_00.unk_05); } @@ -1508,7 +1508,7 @@ static BOOL ov23_022442F0 (int param0) return 1; } -void ov23_022443CC (int param0, int param1, int param2, int param3, int param4, int param5) +void ov23_022443CC(int param0, int param1, int param2, int param3, int param4, int param5) { UnkStruct_ov23_02244140 v0; @@ -1530,7 +1530,7 @@ void ov23_022443CC (int param0, int param1, int param2, int param3, int param4, Unk_ov23_02257764->unk_BA0[param0] = param2; } -BOOL ov23_0224444C (int param0) +BOOL ov23_0224444C(int param0) { if (Unk_ov23_02257764) { if (sub_02059094(param0)) { @@ -1541,15 +1541,15 @@ BOOL ov23_0224444C (int param0) return 0; } -BOOL ov23_02244470 (int param0) +BOOL ov23_02244470(int param0) { return Unk_ov23_02257764->unk_B28[param0].unk_07_7; } -void ov23_0224448C (int param0, int param1, void * param2, void * param3) +void ov23_0224448C(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_02244140 * v0 = (UnkStruct_ov23_02244140 *)param2; - SecretBaseRecord * v1; + UnkStruct_ov23_02244140 *v0 = (UnkStruct_ov23_02244140 *)param2; + SecretBaseRecord *v1; if (!Unk_ov23_02257764) { return; @@ -1596,7 +1596,7 @@ void ov23_0224448C (int param0, int param1, void * param2, void * param3) } { - VarsFlags * v2 = SaveData_GetVarsFlags(Unk_ov23_02257764->fieldSystem->saveData); + VarsFlags *v2 = SaveData_GetVarsFlags(Unk_ov23_02257764->fieldSystem->saveData); sub_0206B43C(v2, sub_0206B42C(v2) + 1); } @@ -1605,9 +1605,9 @@ void ov23_0224448C (int param0, int param1, void * param2, void * param3) } } -void ov23_022445E8 (int param0, int param1, void * param2, void * param3) +void ov23_022445E8(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; UnkFuncPtr_ov23_022564CC v1 = Unk_ov23_02256558[v0[0]]; if (v0[0] != Unk_ov23_02257764->unk_BA0[param0]) { @@ -1620,16 +1620,16 @@ void ov23_022445E8 (int param0, int param1, void * param2, void * param3) } } -void ov23_0224461C (int param0, int param1, void * param2, void * param3) +void ov23_0224461C(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; if (v0[0] != CommSys_CurNetId()) { CommPlayer_StartBlowAnimation(v0[0], v0[1], v0[2]); } } -void ov23_02244638 (void) +void ov23_02244638(void) { u8 v0 = 0; int v1; @@ -1645,9 +1645,9 @@ void ov23_02244638 (void) } } -void ov23_0224467C (int param0, int param1, void * param2, void * param3) +void ov23_0224467C(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; u8 v1 = v0[0]; int v2; @@ -1662,11 +1662,11 @@ void ov23_0224467C (int param0, int param1, void * param2, void * param3) } } -BOOL ov23_022446B0 (Strbuf *param0) +BOOL ov23_022446B0(Strbuf *param0) { int v0, v1; - TrainerInfo * v2; - TrainerInfo * v3; + TrainerInfo *v2; + TrainerInfo *v3; if (!Unk_ov23_02257764) { return 0; @@ -1676,7 +1676,7 @@ BOOL ov23_022446B0 (Strbuf *param0) if (Unk_ov23_02257764->unk_B28[v0].unk_07_6 == 1) { Unk_ov23_02257764->unk_B28[v0].unk_07_6 = 0; - if (Unk_ov23_02257764->unk_B28[v0].unk_06 >= ((7 + 1))) { + if (Unk_ov23_02257764->unk_B28[v0].unk_06 >= (7 + 1)) { v2 = CommInfo_TrainerInfo(v0); if (ov23_022422A8(v2, 0, 99, param0)) { @@ -1707,11 +1707,11 @@ BOOL ov23_022446B0 (Strbuf *param0) return 0; } -BOOL ov23_02244784 (Strbuf *param0) +BOOL ov23_02244784(Strbuf *param0) { int v0, v1; - TrainerInfo * v2; - TrainerInfo * v3; + TrainerInfo *v2; + TrainerInfo *v3; if (!Unk_ov23_02257764) { return 0; @@ -1750,7 +1750,7 @@ BOOL ov23_02244784 (Strbuf *param0) return 0; } -static void ov23_02244830 (int param0, int param1) +static void ov23_02244830(int param0, int param1) { UnkFuncPtr_ov23_022564CC v0 = Unk_ov23_022564CC[param1]; @@ -1759,7 +1759,7 @@ static void ov23_02244830 (int param0, int param1) } } -static void ov23_02244844 (int param0, int param1) +static void ov23_02244844(int param0, int param1) { UnkFuncPtr_ov23_022564CC v0 = Unk_ov23_022565E4[param1]; @@ -1768,7 +1768,7 @@ static void ov23_02244844 (int param0, int param1) } } -void ov23_02244858 (int param0, int param1) +void ov23_02244858(int param0, int param1) { UnkFuncPtr_ov23_02256670 v0; @@ -1795,7 +1795,7 @@ void ov23_02244858 (int param0, int param1) } } -static void ov23_022448C4 (int param0, int param1, BOOL param2, int param3) +static void ov23_022448C4(int param0, int param1, BOOL param2, int param3) { UnkFuncPtr_ov23_02256670 v0; UnkFuncPtr_ov23_02256440 v1; @@ -1810,7 +1810,7 @@ static void ov23_022448C4 (int param0, int param1, BOOL param2, int param3) } } -static void ov23_022448FC (int param0) +static void ov23_022448FC(int param0) { int v0, v1, v2; @@ -1826,7 +1826,7 @@ static void ov23_022448FC (int param0) CommPlayer_SendXZPos(0, v0, v1); } -static BOOL ov23_0224495C (int param0, BOOL param1) +static BOOL ov23_0224495C(int param0, BOOL param1) { int v0, v1, v2, v3, v4; @@ -1848,92 +1848,92 @@ static BOOL ov23_0224495C (int param0, BOOL param1) return 0; } -static void ov23_022449E0 (int param0) +static void ov23_022449E0(int param0) { ov23_0224AD7C(param0, 1); sub_02059354(param0, 30); } -static void ov23_022449F4 (int param0) +static void ov23_022449F4(int param0) { ov23_0224AD7C(param0, 1); sub_02059354(param0, 30); } -static void ov23_02244A08 (int param0) +static void ov23_02244A08(int param0) { ov23_0224AD7C(param0, 0); sub_02059378(param0); } -static void ov23_02244A1C (int param0) +static void ov23_02244A1C(int param0) { ov23_0224AD7C(param0, 2); } -static void ov23_02244A28 (int param0) +static void ov23_02244A28(int param0) { ov23_0224AD7C(param0, 2); } -static void ov23_02244A34 (int param0) +static void ov23_02244A34(int param0) { ov23_0224AD7C(param0, 3); sub_02058B94(param0); } -static void ov23_02244A48 (int param0) +static void ov23_02244A48(int param0) { sub_02058B0C(param0, 0, 0); } -static void ov23_02244A54 (int param0) +static void ov23_02244A54(int param0) { sub_02058B0C(param0, 1, 0); } -static void ov23_02244A60 (int param0) +static void ov23_02244A60(int param0) { sub_02058B0C(param0, 2, 0); } -static void ov23_02244A6C (int param0) +static void ov23_02244A6C(int param0) { sub_02058B0C(param0, 3, 0); } -static void ov23_02244A78 (int param0) +static void ov23_02244A78(int param0) { sub_02058B0C(param0, 0, 1); } -static void ov23_02244A84 (int param0) +static void ov23_02244A84(int param0) { sub_02058B0C(param0, 1, 1); } -static void ov23_02244A90 (int param0) +static void ov23_02244A90(int param0) { sub_02058B0C(param0, 2, 1); } -static void ov23_02244A9C (int param0) +static void ov23_02244A9C(int param0) { sub_02058B0C(param0, 3, 1); } -static void ov23_02244AA8 (int param0) +static void ov23_02244AA8(int param0) { ov23_0224AD7C(param0, 0); sub_02058B7C(param0); } -static void ov23_02244ABC (int param0) +static void ov23_02244ABC(int param0) { return; } -static void ov23_02244AC0 (int param0, BOOL param1, int param2) +static void ov23_02244AC0(int param0, BOOL param1, int param2) { ov23_0224AD7C(param0, 1); @@ -1942,7 +1942,7 @@ static void ov23_02244AC0 (int param0, BOOL param1, int param2) } } -static void ov23_02244ADC (int param0, BOOL param1, int param2) +static void ov23_02244ADC(int param0, BOOL param1, int param2) { ov23_0224AD7C(param0, 1); @@ -1951,7 +1951,7 @@ static void ov23_02244ADC (int param0, BOOL param1, int param2) } } -static void ov23_02244AF8 (int param0, BOOL param1, int param2) +static void ov23_02244AF8(int param0, BOOL param1, int param2) { ov23_0224AD7C(param0, 2); @@ -1960,7 +1960,7 @@ static void ov23_02244AF8 (int param0, BOOL param1, int param2) } } -static void ov23_02244B24 (int param0, BOOL param1, int param2) +static void ov23_02244B24(int param0, BOOL param1, int param2) { ov23_0224AD7C(param0, 2); @@ -1969,47 +1969,47 @@ static void ov23_02244B24 (int param0, BOOL param1, int param2) } } -static void ov23_02244B50 (int param0, BOOL param1, int param2) +static void ov23_02244B50(int param0, BOOL param1, int param2) { ov23_02244D80(Unk_ov23_02257764->fieldSystem, param0, 0, 0); } -static void ov23_02244B68 (int param0, BOOL param1, int param2) +static void ov23_02244B68(int param0, BOOL param1, int param2) { ov23_02244D80(Unk_ov23_02257764->fieldSystem, param0, 1, 0); } -static void ov23_02244B80 (int param0, BOOL param1, int param2) +static void ov23_02244B80(int param0, BOOL param1, int param2) { ov23_02244D80(Unk_ov23_02257764->fieldSystem, param0, 2, 0); } -static void ov23_02244B98 (int param0, BOOL param1, int param2) +static void ov23_02244B98(int param0, BOOL param1, int param2) { ov23_02244D80(Unk_ov23_02257764->fieldSystem, param0, 3, 0); } -static void ov23_02244BB0 (int param0, BOOL param1, int param2) +static void ov23_02244BB0(int param0, BOOL param1, int param2) { ov23_02244D80(Unk_ov23_02257764->fieldSystem, param0, 0, 1); } -static void ov23_02244BC8 (int param0, BOOL param1, int param2) +static void ov23_02244BC8(int param0, BOOL param1, int param2) { ov23_02244D80(Unk_ov23_02257764->fieldSystem, param0, 1, 1); } -static void ov23_02244BE0 (int param0, BOOL param1, int param2) +static void ov23_02244BE0(int param0, BOOL param1, int param2) { ov23_02244D80(Unk_ov23_02257764->fieldSystem, param0, 2, 1); } -static void ov23_02244BF8 (int param0, BOOL param1, int param2) +static void ov23_02244BF8(int param0, BOOL param1, int param2) { ov23_02244D80(Unk_ov23_02257764->fieldSystem, param0, 3, 1); } -static int ov23_02244C10 (void) +static int ov23_02244C10(void) { int v0, v1, v2; @@ -2025,9 +2025,9 @@ static int ov23_02244C10 (void) return v0; } -static void ov23_02244C70 (SysTask * param0, void * param1) +static void ov23_02244C70(SysTask *param0, void *param1) { - UnkStruct_ov23_02244C70 * v0 = param1; + UnkStruct_ov23_02244C70 *v0 = param1; int v1; switch (v0->unk_00) { @@ -2082,9 +2082,9 @@ static void ov23_02244C70 (SysTask * param0, void * param1) } } -static void ov23_02244D80 (FieldSystem * fieldSystem, int param1, int param2, BOOL param3) +static void ov23_02244D80(FieldSystem *fieldSystem, int param1, int param2, BOOL param3) { - UnkStruct_ov23_02244C70 * v0; + UnkStruct_ov23_02244C70 *v0; v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov23_02244C70)); MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_02244C70)); @@ -2101,12 +2101,12 @@ static void ov23_02244D80 (FieldSystem * fieldSystem, int param1, int param2, BO Unk_ov23_02257764->unk_2F0 = SysTask_Start(ov23_02244C70, v0, 100); } -static void ov23_02244DE0 (int param0, BOOL param1) +static void ov23_02244DE0(int param0, BOOL param1) { CommPlayer_StopBlowAnimation(param0); if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_02244C70 * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_02244C70 *v0 = Unk_ov23_02257764->unk_300; v0->unk_00 = 7; Unk_ov23_02257764->unk_300 = NULL; @@ -2115,12 +2115,12 @@ static void ov23_02244DE0 (int param0, BOOL param1) } } -static void ov23_02244E10 (int param0, BOOL param1) +static void ov23_02244E10(int param0, BOOL param1) { CommPlayer_StopBlowAnimation(param0); if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_02244C70 * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_02244C70 *v0 = Unk_ov23_02257764->unk_300; sub_0200AB4C(0, GX_BLEND_PLANEMASK_BG0, 1); Heap_FreeToHeap(v0); @@ -2133,14 +2133,14 @@ static void ov23_02244E10 (int param0, BOOL param1) } } -static void ov23_02244E64 (int param0, BOOL param1, int param2) +static void ov23_02244E64(int param0, BOOL param1, int param2) { return; } -static UnkStruct_ov101_021D5D90 * ov23_02244E68 (int param0, int param1, int param2, int param3) +static UnkStruct_ov101_021D5D90 *ov23_02244E68(int param0, int param1, int param2, int param3) { - UnkStruct_ov101_021D5D90 * v0; + UnkStruct_ov101_021D5D90 *v0; if (!Unk_ov23_02257764->unk_BAA) { v0 = ov5_021F4EAC(Unk_ov23_02257764->fieldSystem, param0, param1, param2, param3 - 1); @@ -2150,14 +2150,14 @@ static UnkStruct_ov101_021D5D90 * ov23_02244E68 (int param0, int param1, int par return NULL; } -static UnkStruct_ov23_02243DA8 * ov23_02244EA0 (UnkStruct_ov23_02243DA8 * param0) +static UnkStruct_ov23_02243DA8 *ov23_02244EA0(UnkStruct_ov23_02243DA8 *param0) { return param0; } -static void ov23_02244EA4 (FieldSystem * fieldSystem, BOOL param1, int param2) +static void ov23_02244EA4(FieldSystem *fieldSystem, BOOL param1, int param2) { - UnkStruct_ov23_022451BC * v0; + UnkStruct_ov23_022451BC *v0; v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov23_022451BC)); MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_022451BC)); @@ -2173,7 +2173,7 @@ static void ov23_02244EA4 (FieldSystem * fieldSystem, BOOL param1, int param2) Unk_ov23_02257764->unk_2F0 = SysTask_Start(ov23_022451C8, v0, 100); } -static void ov23_02244EF8 (int param0, int param1, int param2, int param3, u8 * param4) +static void ov23_02244EF8(int param0, int param1, int param2, int param3, u8 *param4) { int v0, v1 = param0, v2 = param1, v3, v4, v5 = abs(param0 - param2), v6 = abs(param3 - param1); BOOL v7 = 0; @@ -2216,10 +2216,10 @@ static void ov23_02244EF8 (int param0, int param1, int param2, int param3, u8 * } } -static void ov23_02244FD0 (int param0, BOOL param1) +static void ov23_02244FD0(int param0, BOOL param1) { if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_022451BC * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_022451BC *v0 = Unk_ov23_02257764->unk_300; if (v0->unk_19 && param1) { ov23_022448FC(v0->unk_18); @@ -2230,7 +2230,7 @@ static void ov23_02244FD0 (int param0, BOOL param1) { int v1; - u8 * v2 = sub_02019FE4(Unk_ov23_02257764->fieldSystem->unk_08, 2); + u8 *v2 = sub_02019FE4(Unk_ov23_02257764->fieldSystem->unk_08, 2); for (v1 = 0; v1 < 0x800; v1 += 2) { v2[v1] = 0; @@ -2249,10 +2249,10 @@ static void ov23_02244FD0 (int param0, BOOL param1) } } -static BOOL ov23_02245064 (UnkStruct_ov23_0224271C * param0, BGL * param1, UnkStruct_ov23_022451BC * param2) +static BOOL ov23_02245064(UnkStruct_ov23_0224271C *param0, BGL *param1, UnkStruct_ov23_022451BC *param2) { int v0, v1 = 0; - u8 * v2 = sub_02019FE4(param1, 2); + u8 *v2 = sub_02019FE4(param1, 2); if (v2 == NULL) { return 0; @@ -2280,10 +2280,10 @@ static BOOL ov23_02245064 (UnkStruct_ov23_0224271C * param0, BGL * param1, UnkSt return 0; } -static BOOL ov23_022450D4 (int param0, int param1, u8 * param2) +static BOOL ov23_022450D4(int param0, int param1, u8 *param2) { u16 v0 = (param0 / 8 + param1 / 8 * (256 / 8)) * 2; - s32 v1[] = {-66, -64, -62, -2, 0, 2, 62, 64, 66}; + s32 v1[] = { -66, -64, -62, -2, 0, 2, 62, 64, 66 }; int v2; BOOL v3 = 0; @@ -2333,15 +2333,15 @@ static BOOL ov23_022450D4 (int param0, int param1, u8 * param2) return v3; } -static void ov23_022451BC (UnkStruct_ov23_022451BC * param0) +static void ov23_022451BC(UnkStruct_ov23_022451BC *param0) { param0->unk_08 = 0xffff; param0->unk_0A = 0xffff; } -static void ov23_022451C8 (SysTask * param0, void * param1) +static void ov23_022451C8(SysTask *param0, void *param1) { - UnkStruct_ov23_022451BC * v0 = param1; + UnkStruct_ov23_022451BC *v0 = param1; int v1; switch (v0->unk_00) { @@ -2365,7 +2365,7 @@ static void ov23_022451C8 (SysTask * param0, void * param1) if (Unk_ov23_02257764->unk_B9F == 19) { sub_02006E60(50, 8, v0->unk_10, 2, 0, 32 * 24 * 2, 0, 4); } else { - u16 v2[] = {11, 12, 13, 14}; + u16 v2[] = { 11, 12, 13, 14 }; u16 v3 = LCRNG_Next() % 4; sub_02006E60(50, v2[v3], v0->unk_10, 2, 0, 32 * 24 * 2, 0, 4); @@ -2442,12 +2442,12 @@ static void ov23_022451C8 (SysTask * param0, void * param1) } } -int ov23_02245408 (void) +int ov23_02245408(void) { return sizeof(UnkStruct_ov23_0224540C); } -void ov23_0224540C (int param0, int param1, void * param2, void * param3) +void ov23_0224540C(int param0, int param1, void *param2, void *param3) { u8 v0 = param0; UnkStruct_ov23_0224540C v1; @@ -2467,7 +2467,7 @@ void ov23_0224540C (int param0, int param1, void * param2, void * param3) Unk_ov23_02257764->unk_BA0[param0] = 0; } -void ov23_0224546C (int param0, int param1, void * param2, void * param3) +void ov23_0224546C(int param0, int param1, void *param2, void *param3) { u8 v0 = param0; UnkStruct_ov23_0224540C v1; @@ -2484,9 +2484,9 @@ void ov23_0224546C (int param0, int param1, void * param2, void * param3) ov23_0224D87C(param0); } -void ov23_022454B4 (int param0, int param1, void * param2, void * param3) +void ov23_022454B4(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_0224540C * v0 = param2; + UnkStruct_ov23_0224540C *v0 = param2; int v1 = v0->unk_00; UnkFuncPtr_ov23_02256670 v2; @@ -2524,9 +2524,9 @@ void ov23_022454B4 (int param0, int param1, void * param2, void * param3) } } -void ov23_02245540 (int param0, int param1, void * param2, void * param3) +void ov23_02245540(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; int v1 = Unk_ov23_02257764->unk_B9F; if ((v1 == 11) || (v1 == 12)) { @@ -2534,7 +2534,7 @@ void ov23_02245540 (int param0, int param1, void * param2, void * param3) } } -void ov23_02245560 (int param0, int param1) +void ov23_02245560(int param0, int param1) { UnkStruct_ov23_02245560 v0; @@ -2550,10 +2550,10 @@ void ov23_02245560 (int param0, int param1) sub_02059058(param0, 0); } -void ov23_022455B4 (int param0, int param1, void * param2, void * param3) +void ov23_022455B4(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_02245560 * v0 = param2; - SecretBaseRecord * v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_02257764->fieldSystem)); + UnkStruct_ov23_02245560 *v0 = param2; + SecretBaseRecord *v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_02257764->fieldSystem)); ov23_0224B024(v0->unk_01); @@ -2590,12 +2590,12 @@ void ov23_022455B4 (int param0, int param1, void * param2, void * param3) Unk_ov23_02257764->unk_B68[v0->unk_00] = v0->unk_01; } -int ov23_02245694 (void) +int ov23_02245694(void) { return sizeof(UnkStruct_ov23_02245560); } -int ov23_02245698 (int param0) +int ov23_02245698(int param0) { if (Unk_ov23_02257764 && Unk_ov23_02257764->unk_2FC) { int v0 = Unk_ov23_02257764->unk_2FC->unk_192 / 2; @@ -2607,7 +2607,7 @@ int ov23_02245698 (int param0) return 0; } -int ov23_022456CC (int param0) +int ov23_022456CC(int param0) { if (Unk_ov23_02257764 && Unk_ov23_02257764->unk_2FC) { int v0 = Unk_ov23_02257764->unk_2FC->unk_192 / 2; @@ -2619,9 +2619,9 @@ int ov23_022456CC (int param0) return 0; } -static void ov23_02245700 (SysTask * param0, void * param1) +static void ov23_02245700(SysTask *param0, void *param1) { - UnkStruct_ov23_02245700 * v0 = param1; + UnkStruct_ov23_02245700 *v0 = param1; v0->unk_192++; @@ -2631,9 +2631,9 @@ static void ov23_02245700 (SysTask * param0, void * param1) } } -void ov23_02245728 (void) +void ov23_02245728(void) { - UnkStruct_ov23_02245700 * v0; + UnkStruct_ov23_02245700 *v0; if (Unk_ov23_02257764->unk_2FC) { return; @@ -2651,7 +2651,7 @@ void ov23_02245728 (void) Unk_ov23_02257764->unk_2F8 = SysTask_Start(ov23_02245700, v0, 100); } -void ov23_02245784 (void) +void ov23_02245784(void) { if (Unk_ov23_02257764->unk_2F8) { sub_0200AB4C(0, GX_BLEND_PLANEMASK_BG0, 1); @@ -2664,12 +2664,12 @@ void ov23_02245784 (void) } } -void ov23_022457E4 (int param0, int param1, void * param2, void * param3) +void ov23_022457E4(int param0, int param1, void *param2, void *param3) { Unk_ov23_02257764->unk_B70[param0] = 1; } -static void ov23_022457FC (void) +static void ov23_022457FC(void) { int v0, v1 = 0; @@ -2678,7 +2678,7 @@ static void ov23_022457FC (void) if (Unk_ov23_02257764->unk_B70[v0]) { while (TRUE) { - UnkStruct_ov23_02243DA8 * v3 = Unk_ov23_02257764->unk_828[v2]; + UnkStruct_ov23_02243DA8 *v3 = Unk_ov23_02257764->unk_828[v2]; if (v3 && (v3->unk_04 != 0)) { int v4 = ov23_0224426C(v3); @@ -2710,9 +2710,9 @@ static void ov23_022457FC (void) } } -void ov23_0224589C (int param0, int param1, void * param2, void * param3) +void ov23_0224589C(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_0224589C * v0 = param2; + UnkStruct_ov23_0224589C *v0 = param2; if (Unk_ov23_02257764->unk_2FC == NULL) { return; @@ -2728,16 +2728,16 @@ void ov23_0224589C (int param0, int param1, void * param2, void * param3) } } -int ov23_02245908 (void) +int ov23_02245908(void) { return sizeof(UnkStruct_ov23_0224589C); } -static void ov23_0224590C (int param0, BOOL param1) +static void ov23_0224590C(int param0, BOOL param1) { if (CommSys_CurNetId() == param0) { if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_0224590C * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_0224590C *v0 = Unk_ov23_02257764->unk_300; v0->unk_00 = 2; Unk_ov23_02257764->unk_300 = NULL; @@ -2745,7 +2745,7 @@ static void ov23_0224590C (int param0, BOOL param1) } } -static void ov23_02245938 (int param0, BOOL param1) +static void ov23_02245938(int param0, BOOL param1) { if (Unk_ov23_02257764->unk_300) { sub_0200AB4C(0, GX_BLEND_PLANEMASK_BG0, 1); @@ -2762,9 +2762,9 @@ static void ov23_02245938 (int param0, BOOL param1) } } -static void ov23_0224599C (SysTask * param0, void * param1) +static void ov23_0224599C(SysTask *param0, void *param1) { - UnkStruct_ov23_0224590C * v0 = param1; + UnkStruct_ov23_0224590C *v0 = param1; int v1; switch (v0->unk_00) { @@ -2810,10 +2810,10 @@ static void ov23_0224599C (SysTask * param0, void * param1) } } -static void ov23_02245A58 (BOOL param0) +static void ov23_02245A58(BOOL param0) { int v0; - UnkStruct_ov23_0224590C * v1; + UnkStruct_ov23_0224590C *v1; v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov23_0224590C)); MI_CpuClear8(v1, sizeof(UnkStruct_ov23_0224590C)); @@ -2828,11 +2828,11 @@ static void ov23_02245A58 (BOOL param0) sub_02059464(0x10); } -static void ov23_02245AA4 (int param0, BOOL param1) +static void ov23_02245AA4(int param0, BOOL param1) { if (CommSys_CurNetId() == param0) { if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_02245AA4 * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_02245AA4 *v0 = Unk_ov23_02257764->unk_300; sub_0205ED0C(Unk_ov23_02257764->fieldSystem->playerAvatar, 0); SysTask_Done(Unk_ov23_02257764->unk_2F0); @@ -2844,10 +2844,10 @@ static void ov23_02245AA4 (int param0, BOOL param1) } } -static void ov23_02245AF4 (int param0, BOOL param1) +static void ov23_02245AF4(int param0, BOOL param1) { if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_02245AA4 * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_02245AA4 *v0 = Unk_ov23_02257764->unk_300; if (v0->unk_14) { sub_0207136C(v0->unk_14); @@ -2872,11 +2872,11 @@ static void ov23_02245AF4 (int param0, BOOL param1) } } -static void ov23_02245B78 (int param0) +static void ov23_02245B78(int param0) { if (CommSys_CurNetId() == param0) { if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_02245AA4 * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_02245AA4 *v0 = Unk_ov23_02257764->unk_300; v0->unk_00 = 14; Sound_PlayEffect(1547); @@ -2884,9 +2884,9 @@ static void ov23_02245B78 (int param0) } } -static void ov23_02245BA8 (SysTask * param0, void * param1) +static void ov23_02245BA8(SysTask *param0, void *param1) { - UnkStruct_ov23_02245AA4 * v0 = param1; + UnkStruct_ov23_02245AA4 *v0 = param1; int v1, v2, v3; const s8 v4[] = { -1, @@ -2955,8 +2955,7 @@ static void ov23_02245BA8 (SysTask * param0, void * param1) } } break; - case 7: - { + case 7: { int v5 = PlayerAvatar_GetDir(Unk_ov23_02257764->fieldSystem->playerAvatar); if (v0->unk_18 != v5) { @@ -3016,10 +3015,10 @@ static void ov23_02245BA8 (SysTask * param0, void * param1) } } -static void ov23_02245DF8 (BOOL param0, BOOL param1, int param2) +static void ov23_02245DF8(BOOL param0, BOOL param1, int param2) { int v0; - UnkStruct_ov23_02245AA4 * v1; + UnkStruct_ov23_02245AA4 *v1; v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_02245AA4)); MI_CpuClear8(v1, sizeof(UnkStruct_ov23_02245AA4)); @@ -3035,7 +3034,7 @@ static void ov23_02245DF8 (BOOL param0, BOOL param1, int param2) Unk_ov23_02257764->unk_2F0 = SysTask_Start(ov23_02245BA8, v1, 100); } -static void ov23_02245E54 (int param0, BOOL param1, int param2) +static void ov23_02245E54(int param0, BOOL param1, int param2) { ov23_0224AD7C(param0, 4); @@ -3044,7 +3043,7 @@ static void ov23_02245E54 (int param0, BOOL param1, int param2) } } -static void ov23_02245E78 (int param0, BOOL param1, int param2) +static void ov23_02245E78(int param0, BOOL param1, int param2) { ov23_0224AD7C(param0, 4); @@ -3053,28 +3052,28 @@ static void ov23_02245E78 (int param0, BOOL param1, int param2) } } -static void ov23_02245E9C (int param0) +static void ov23_02245E9C(int param0) { ov23_0224AD98(param0); sub_020593B4(param0); } -static void ov23_02245EAC (int param0) +static void ov23_02245EAC(int param0) { ov23_0224AD7C(param0, 4); sub_02059390(param0, 10); } -static void ov23_02245EC0 (int param0) +static void ov23_02245EC0(int param0) { ov23_0224AD7C(param0, 4); sub_02059390(param0, 20); } -static void ov23_02245ED4 (UnkStruct_ov23_02245ED4 * param0) +static void ov23_02245ED4(UnkStruct_ov23_02245ED4 *param0) { int v0, v1, v2, v3, v4, v5; - u8 * v6 = NULL; + u8 *v6 = NULL; MATHRandContext32 v7; const int v8 = 256; const int v9 = 192; @@ -3090,9 +3089,9 @@ static void ov23_02245ED4 (UnkStruct_ov23_02245ED4 * param0) } } -static void ov23_02245F94 (SysTask * param0, void * param1) +static void ov23_02245F94(SysTask *param0, void *param1) { - UnkStruct_ov23_02245ED4 * v0 = param1; + UnkStruct_ov23_02245ED4 *v0 = param1; int v1, v2; switch (v0->unk_00) { @@ -3208,10 +3207,10 @@ static void ov23_02245F94 (SysTask * param0, void * param1) } } -static void ov23_02246220 (int param0, BOOL param1) +static void ov23_02246220(int param0, BOOL param1) { if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_02245ED4 * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_02245ED4 *v0 = Unk_ov23_02257764->unk_300; if (v0->unk_113 && param1) { ov23_022448FC(v0->unk_112); @@ -3231,10 +3230,10 @@ static void ov23_02246220 (int param0, BOOL param1) } } -static void ov23_022462A8 (FieldSystem * fieldSystem, BOOL param1, int param2) +static void ov23_022462A8(FieldSystem *fieldSystem, BOOL param1, int param2) { int v0; - UnkStruct_ov23_02245ED4 * v1; + UnkStruct_ov23_02245ED4 *v1; v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_02245ED4)); MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_02245ED4)); @@ -3254,7 +3253,7 @@ static void ov23_022462A8 (FieldSystem * fieldSystem, BOOL param1, int param2) Unk_ov23_02257764->unk_2F0 = SysTask_Start(ov23_02245F94, v1, 100); } -static void ov23_02246324 (void) +static void ov23_02246324(void) { int v0; @@ -3266,7 +3265,7 @@ static void ov23_02246324 (void) } } -static void ov23_02246370 (int param0) +static void ov23_02246370(int param0) { int v0; @@ -3308,7 +3307,7 @@ static void ov23_02246370 (int param0) Unk_ov23_02257764->unk_44 = NULL; } -static void ov23_0224644C (int param0) +static void ov23_0224644C(int param0) { sub_020093B4(&Unk_ov23_02257764->unk_238, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, Unk_ov23_02257764->unk_1D4[0][0], Unk_ov23_02257764->unk_1D4[0][1], Unk_ov23_02257764->unk_1D4[0][2], Unk_ov23_02257764->unk_1D4[0][3], NULL, NULL); @@ -3346,7 +3345,7 @@ static void ov23_0224644C (int param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov23_02246548 (int param0) +static void ov23_02246548(int param0) { if (Unk_ov23_02257764->unk_25C[param0]) { sub_02021BD4(Unk_ov23_02257764->unk_25C[param0]); @@ -3354,11 +3353,11 @@ static void ov23_02246548 (int param0) } } -static void ov23_02246574 (int param0, UnkStruct_ov23_02245ED4 * param1, int param2) +static void ov23_02246574(int param0, UnkStruct_ov23_02245ED4 *param1, int param2) { - void * v0; - Camera * camera; - void * v2; + void *v0; + Camera *camera; + void *v2; VecFx32 v3; fx32 v4, v5; int v6 = param1->unk_48[param0].unk_00; @@ -3380,14 +3379,14 @@ static void ov23_02246574 (int param0, UnkStruct_ov23_02245ED4 * param1, int par } } -static void ov23_02246624 (MICResult param0, void * param1) +static void ov23_02246624(MICResult param0, void *param1) { if (param0 == MIC_RESULT_SUCCESS) { Unk_ov23_02257764->unk_B9E = Unk_ov23_02257760; } } -static BOOL ov23_02246640 (BGL * param0, UnkStruct_ov23_02245ED4 * param1) +static BOOL ov23_02246640(BGL *param0, UnkStruct_ov23_02245ED4 *param1) { int v0; int v1 = 0, v2, v3, v4, v5; @@ -3480,14 +3479,14 @@ static BOOL ov23_02246640 (BGL * param0, UnkStruct_ov23_02245ED4 * param1) return 0; } -void ov23_022468A8 (BGL * param0) +void ov23_022468A8(BGL *param0) { if (Unk_ov23_02257764->unk_304) { Unk_ov23_02257764->unk_304(param0); } } -static int ov23_022468C0 (void) +static int ov23_022468C0(void) { int v0; @@ -3506,7 +3505,7 @@ static const int Unk_ov23_022563E8[] = { 0x18 }; -static void ov23_022468DC (UnkStruct_ov23_022468DC * param0) +static void ov23_022468DC(UnkStruct_ov23_022468DC *param0) { int v0, v1, v2, v3 = 0, v4, v5, v6, v7; MATHRandContext32 v8; @@ -3545,9 +3544,9 @@ static void ov23_022468DC (UnkStruct_ov23_022468DC * param0) } } -static void ov23_02246A80 (SysTask * param0, void * param1) +static void ov23_02246A80(SysTask *param0, void *param1) { - UnkStruct_ov23_022468DC * v0 = param1; + UnkStruct_ov23_022468DC *v0 = param1; int v1; switch (v0->unk_00) { @@ -3641,10 +3640,10 @@ static void ov23_02246A80 (SysTask * param0, void * param1) } } -static void ov23_02246CF0 (BGL * param0, BOOL param1, int param2) +static void ov23_02246CF0(BGL *param0, BOOL param1, int param2) { int v0; - UnkStruct_ov23_022468DC * v1; + UnkStruct_ov23_022468DC *v1; v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov23_022468DC)); MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_022468DC)); @@ -3656,7 +3655,7 @@ static void ov23_02246CF0 (BGL * param0, BOOL param1, int param2) v1->unk_15D = param2; } -static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0) +static void ov23_02246D44(UnkStruct_ov23_022468DC *param0) { sub_0200A450(Unk_ov23_02257764->unk_1F4[0][0]); sub_0200A640(Unk_ov23_02257764->unk_1F4[0][1]); @@ -3698,11 +3697,11 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov23_02246E90 (int param0, UnkStruct_ov23_022468DC * param1) +static void ov23_02246E90(int param0, UnkStruct_ov23_022468DC *param1) { - void * v0; - Camera * camera; - void * v2; + void *v0; + Camera *camera; + void *v2; VecFx32 v3; fx32 v4; fx16 v5; @@ -3724,7 +3723,7 @@ static void ov23_02246E90 (int param0, UnkStruct_ov23_022468DC * param1) } } -static BOOL ov23_02246F20 (BGL * param0, UnkStruct_ov23_022468DC * param1) +static BOOL ov23_02246F20(BGL *param0, UnkStruct_ov23_022468DC *param1) { int v0; int v1 = 0, v2, v3, v4, v5, v6, v7; @@ -3794,7 +3793,7 @@ static BOOL ov23_02246F20 (BGL * param0, UnkStruct_ov23_022468DC * param1) return 0; } -static void ov23_0224710C (int param0, BOOL param1, int param2) +static void ov23_0224710C(int param0, BOOL param1, int param2) { ov23_0224AD7C(param0, 2); @@ -3803,15 +3802,15 @@ static void ov23_0224710C (int param0, BOOL param1, int param2) } } -static void ov23_02247138 (int param0) +static void ov23_02247138(int param0) { ov23_0224AD7C(param0, 2); } -static void ov23_02247144 (int param0, BOOL param1) +static void ov23_02247144(int param0, BOOL param1) { if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_022468DC * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_022468DC *v0 = Unk_ov23_02257764->unk_300; sub_020057A4(1632, 0); @@ -3834,7 +3833,7 @@ static void ov23_02247144 (int param0, BOOL param1) } } -static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0) +static void ov23_022471D8(UnkStruct_ov23_022471D8 *param0) { sub_0200A450(Unk_ov23_02257764->unk_1F4[0][0]); sub_0200A640(Unk_ov23_02257764->unk_1F4[0][1]); @@ -3876,7 +3875,7 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov23_0224730C (UnkStruct_ov23_022471D8 * param0, int param1, int param2, int param3, int param4, int param5) +static void ov23_0224730C(UnkStruct_ov23_022471D8 *param0, int param1, int param2, int param3, int param4, int param5) { param0->unk_08[param1] = param2; param0->unk_80[param1] = param4; @@ -3886,7 +3885,7 @@ static void ov23_0224730C (UnkStruct_ov23_022471D8 * param0, int param1, int par sub_02021CAC(Unk_ov23_02257764->unk_25C[param1], 1); } -static void ov23_0224733C (UnkStruct_ov23_022471D8 * param0, int param1) +static void ov23_0224733C(UnkStruct_ov23_022471D8 *param0, int param1) { switch (param1) { default: @@ -3912,7 +3911,7 @@ static void ov23_0224733C (UnkStruct_ov23_022471D8 * param0, int param1) } } -static void ov23_022474D4 (UnkStruct_ov23_022471D8 * param0) +static void ov23_022474D4(UnkStruct_ov23_022471D8 *param0) { int v0; VecFx32 v1; @@ -3936,7 +3935,7 @@ static void ov23_022474D4 (UnkStruct_ov23_022471D8 * param0) } } -static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1) +static BOOL ov23_02247568(BGL *param0, UnkStruct_ov23_022471D8 *param1) { int v0; int v1 = 0, v2, v3, v4, v5, v6; @@ -4114,15 +4113,20 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1) return 0; } -static void ov23_022479F4 (UnkStruct_ov23_022471D8 * param0) +static void ov23_022479F4(UnkStruct_ov23_022471D8 *param0) { int v0[] = { - 35, 38, 41, 44, 47, 50, + 35, + 38, + 41, + 44, + 47, + 50, }; int v1 = param0->unk_124 - 1; { - NARC * v2; + NARC *v2; v2 = NARC_ctor(NARC_INDEX_DATA__UG_TRAP, 4); @@ -4134,7 +4138,7 @@ static void ov23_022479F4 (UnkStruct_ov23_022471D8 * param0) } } -static void ov23_02247A60 (UnkStruct_ov23_022471D8 * param0) +static void ov23_02247A60(UnkStruct_ov23_022471D8 *param0) { int v0; @@ -4145,9 +4149,9 @@ static void ov23_02247A60 (UnkStruct_ov23_022471D8 * param0) } } -static void ov23_02247A8C (SysTask * param0, void * param1) +static void ov23_02247A8C(SysTask *param0, void *param1) { - UnkStruct_ov23_022471D8 * v0 = param1; + UnkStruct_ov23_022471D8 *v0 = param1; int v1; switch (v0->unk_00) { @@ -4247,10 +4251,10 @@ static void ov23_02247A8C (SysTask * param0, void * param1) } } -static void ov23_02247D28 (BGL * param0, BOOL param1, int param2) +static void ov23_02247D28(BGL *param0, BOOL param1, int param2) { int v0; - UnkStruct_ov23_022471D8 * v1; + UnkStruct_ov23_022471D8 *v1; v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov23_022471D8)); MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_022471D8)); @@ -4262,7 +4266,7 @@ static void ov23_02247D28 (BGL * param0, BOOL param1, int param2) Unk_ov23_02257764->unk_2F0 = SysTask_Start(ov23_02247A8C, v1, 100); } -static void ov23_02247D78 (int param0, BOOL param1, int param2) +static void ov23_02247D78(int param0, BOOL param1, int param2) { ov23_0224AD7C(param0, 2); @@ -4271,15 +4275,15 @@ static void ov23_02247D78 (int param0, BOOL param1, int param2) } } -static void ov23_02247DA4 (int param0) +static void ov23_02247DA4(int param0) { ov23_0224AD7C(param0, 2); } -static void ov23_02247DB0 (int param0, BOOL param1) +static void ov23_02247DB0(int param0, BOOL param1) { if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_022471D8 * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_022471D8 *v0 = Unk_ov23_02257764->unk_300; if (v0->unk_114) { sub_0207136C(v0->unk_114); @@ -4303,7 +4307,7 @@ static void ov23_02247DB0 (int param0, BOOL param1) } } -static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0) +static void ov23_02247E38(UnkStruct_ov23_02247E38 *param0) { sub_0200A450(Unk_ov23_02257764->unk_1F4[0][0]); sub_0200A640(Unk_ov23_02257764->unk_1F4[0][1]); @@ -4344,7 +4348,7 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static BOOL ov23_02247F4C (BGL * param0, UnkStruct_ov23_02247E38 * param1) +static BOOL ov23_02247F4C(BGL *param0, UnkStruct_ov23_02247E38 *param1) { int v0, v1, v2, v3 = 0; float v4; @@ -4434,9 +4438,9 @@ static BOOL ov23_02247F4C (BGL * param0, UnkStruct_ov23_02247E38 * param1) return 0; } -static void ov23_022480C4 (SysTask * param0, void * param1) +static void ov23_022480C4(SysTask *param0, void *param1) { - UnkStruct_ov23_02247E38 * v0 = param1; + UnkStruct_ov23_02247E38 *v0 = param1; int v1, v2; switch (v0->unk_00) { @@ -4543,10 +4547,10 @@ static void ov23_022480C4 (SysTask * param0, void * param1) } } -static void ov23_02248318 (BGL * param0, BOOL param1, int param2) +static void ov23_02248318(BGL *param0, BOOL param1, int param2) { int v0; - UnkStruct_ov23_02247E38 * v1; + UnkStruct_ov23_02247E38 *v1; v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov23_02247E38)); MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_02247E38)); @@ -4558,7 +4562,7 @@ static void ov23_02248318 (BGL * param0, BOOL param1, int param2) Unk_ov23_02257764->unk_2F0 = SysTask_Start(ov23_022480C4, v1, 100); } -static void ov23_02248364 (int param0, BOOL param1, int param2) +static void ov23_02248364(int param0, BOOL param1, int param2) { ov23_0224AD7C(param0, 2); @@ -4567,15 +4571,15 @@ static void ov23_02248364 (int param0, BOOL param1, int param2) } } -static void ov23_02248390 (int param0) +static void ov23_02248390(int param0) { ov23_0224AD7C(param0, 2); } -static void ov23_0224839C (int param0, BOOL param1) +static void ov23_0224839C(int param0, BOOL param1) { if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_02247E38 * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_02247E38 *v0 = Unk_ov23_02257764->unk_300; if (v0->unk_2A && param1) { ov23_022448FC(v0->unk_29); @@ -4595,9 +4599,9 @@ static void ov23_0224839C (int param0, BOOL param1) } } -static void ov23_02248418 (SysTask * param0, void * param1) +static void ov23_02248418(SysTask *param0, void *param1) { - UnkStruct_ov23_02248418 * v0 = param1; + UnkStruct_ov23_02248418 *v0 = param1; int v1; switch (v0->unk_00) { @@ -4665,10 +4669,10 @@ static void ov23_02248418 (SysTask * param0, void * param1) } } -static void ov23_0224852C (BGL * param0, BOOL param1, int param2) +static void ov23_0224852C(BGL *param0, BOOL param1, int param2) { int v0; - UnkStruct_ov23_02248418 * v1; + UnkStruct_ov23_02248418 *v1; v1 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov23_02248418)); MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov23_02248418)); @@ -4680,7 +4684,7 @@ static void ov23_0224852C (BGL * param0, BOOL param1, int param2) Unk_ov23_02257764->unk_2F0 = SysTask_Start(ov23_02248418, v1, 100); } -static void ov23_02248570 (int param0, BOOL param1, int param2) +static void ov23_02248570(int param0, BOOL param1, int param2) { ov23_0224AD7C(param0, 2); @@ -4689,15 +4693,15 @@ static void ov23_02248570 (int param0, BOOL param1, int param2) } } -static void ov23_0224859C (int param0) +static void ov23_0224859C(int param0) { ov23_0224AD7C(param0, 2); } -static void ov23_022485A8 (int param0, BOOL param1) +static void ov23_022485A8(int param0, BOOL param1) { if (Unk_ov23_02257764->unk_300) { - UnkStruct_ov23_02248418 * v0 = Unk_ov23_02257764->unk_300; + UnkStruct_ov23_02248418 *v0 = Unk_ov23_02257764->unk_300; if (v0->unk_11 && param1) { ov23_022448FC(v0->unk_10); @@ -4716,7 +4720,7 @@ static void ov23_022485A8 (int param0, BOOL param1) } } -static BOOL ov23_02248614 (BGL * param0, UnkStruct_ov23_02248748 * param1) +static BOOL ov23_02248614(BGL *param0, UnkStruct_ov23_02248748 *param1) { int v0, v1; VecFx32 v2; @@ -4763,7 +4767,7 @@ static BOOL ov23_02248614 (BGL * param0, UnkStruct_ov23_02248748 * param1) return 0; } -static void ov23_02248748 (UnkStruct_ov23_02248748 * param0) +static void ov23_02248748(UnkStruct_ov23_02248748 *param0) { sub_0200A450(Unk_ov23_02257764->unk_1F4[1][0]); sub_0200A640(Unk_ov23_02257764->unk_1F4[1][1]); @@ -4810,9 +4814,9 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov23_02248884 (SysTask * param0, void * param1) +static void ov23_02248884(SysTask *param0, void *param1) { - UnkStruct_ov23_02248748 * v0 = param1; + UnkStruct_ov23_02248748 *v0 = param1; int v1; switch (v0->unk_00) { @@ -4867,10 +4871,10 @@ static void ov23_02248884 (SysTask * param0, void * param1) } } -void ov23_022489F8 (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4, u8 * param5, int param6, u8 * param7, int param8, u8 * param9, int param10) +void ov23_022489F8(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, u8 *param5, int param6, u8 *param7, int param8, u8 *param9, int param10) { int v0; - UnkStruct_ov23_02248748 * v1; + UnkStruct_ov23_02248748 *v1; if (Unk_ov23_02257764->unk_2F4) { return; @@ -4896,9 +4900,9 @@ void ov23_022489F8 (FieldSystem * fieldSystem, int param1, int param2, int param sub_02059464(0x80); } -static void ov23_02248A6C (SysTask * param0, void * param1) +static void ov23_02248A6C(SysTask *param0, void *param1) { - UnkStruct_ov23_02248A6C * v0 = param1; + UnkStruct_ov23_02248A6C *v0 = param1; int v1, v2, v3; if (!Unk_ov23_02257764) { @@ -4957,10 +4961,10 @@ static void ov23_02248A6C (SysTask * param0, void * param1) } } -static void ov23_02248B3C (int param0, int param1) +static void ov23_02248B3C(int param0, int param1) { int v0; - UnkStruct_ov23_02248A6C * v1; + UnkStruct_ov23_02248A6C *v1; if (!Unk_ov23_02257764) { return; @@ -4981,7 +4985,7 @@ static void ov23_02248B3C (int param0, int param1) v1->unk_0C = param1; } -void ov23_02248B98 (int param0) +void ov23_02248B98(int param0) { if (!Unk_ov23_02257764->unk_00[param0]) { return; @@ -4996,7 +5000,7 @@ void ov23_02248B98 (int param0) CommPlayer_StopBlowAnimation(param0); } -static void ov23_02248BD0 (void) +static void ov23_02248BD0(void) { int v0; diff --git a/src/overlay023/ov23_02248C08.c b/src/overlay023/ov23_02248C08.c index d877111a4d..bc1922d1cc 100644 --- a/src/overlay023/ov23_02248C08.c +++ b/src/overlay023/ov23_02248C08.c @@ -1,29 +1,29 @@ +#include "overlay023/ov23_02248C08.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_020298B0_decl.h" - #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0205AA50.h" -#include "overlay023/struct_ov23_02248D20.h" + #include "overlay023/funcptr_ov23_02248D20.h" +#include "overlay023/struct_ov23_02248D20.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "core_sys.h" +#include "heap.h" #include "unk_0200112C.h" #include "unk_02005474.h" #include "unk_02013A04.h" #include "unk_020149F0.h" -#include "heap.h" #include "unk_0202854C.h" -#include "overlay023/ov23_02248C08.h" -UnkStruct_ov23_02248D20 * ov23_02248C08 (UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UndergroundData * param5, BOOL param6) +UnkStruct_ov23_02248D20 *ov23_02248C08(UnkStruct_ov84_02240FA8 *param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UndergroundData *param5, BOOL param6) { - UnkStruct_ov23_02248D20 * v0 = (UnkStruct_ov23_02248D20 *)Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov23_02248D20)); + UnkStruct_ov23_02248D20 *v0 = (UnkStruct_ov23_02248D20 *)Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov23_02248D20)); MI_CpuClear8(v0, sizeof(UnkStruct_ov23_02248D20)); @@ -39,7 +39,7 @@ UnkStruct_ov23_02248D20 * ov23_02248C08 (UnkStruct_ov84_02240FA8 * param0, u16 p v0->unk_1D = param3; { - ResourceMetadata * v1 = sub_02013A04(param0->unk_10, v0->unk_1D); + ResourceMetadata *v1 = sub_02013A04(param0->unk_10, v0->unk_1D); int v2; for (v2 = 0; v2 < param0->unk_10; v2++) { @@ -57,7 +57,7 @@ UnkStruct_ov23_02248D20 * ov23_02248C08 (UnkStruct_ov84_02240FA8 * param0, u16 p return v0; } -static void ov23_02248CA4 (u16 param0, u16 param1, UnkStruct_ov23_02248D20 * param2) +static void ov23_02248CA4(u16 param0, u16 param1, UnkStruct_ov23_02248D20 *param2) { u16 v0 = param2->unk_14 + param2->unk_16; u16 v1 = sub_02001504(param2->unk_0C, 3); @@ -77,19 +77,19 @@ static void ov23_02248CA4 (u16 param0, u16 param1, UnkStruct_ov23_02248D20 * par int v2 = sub_02001504(param2->unk_0C, 7); u8 v3 = sub_02001504(param2->unk_0C, 9); int v4 = (v0 - param0) * v3 + sub_02001504(param2->unk_0C, 8); - Window * v5 = (Window *)sub_02001504(param2->unk_0C, 18); + Window *v5 = (Window *)sub_02001504(param2->unk_0C, 18); sub_02014A58(param2->unk_10, v5, v2, v4); } } -u32 ov23_02248D20 (UnkStruct_ov23_02248D20 * param0) +u32 ov23_02248D20(UnkStruct_ov23_02248D20 *param0) { - BmpList * v0 = param0->unk_0C; + BmpList *v0 = param0->unk_0C; u16 v1, v2, v3; int v4, v5; u32 v6; - ResourceMetadata * v7; + ResourceMetadata *v7; if (param0->unk_00) { int v8 = sub_02001504(v0, 2); @@ -204,9 +204,9 @@ u32 ov23_02248D20 (UnkStruct_ov23_02248D20 * param0) return v6; } -void ov23_02248EF8 (UnkStruct_ov23_02248D20 * param0, u16 * param1, u16 * param2) +void ov23_02248EF8(UnkStruct_ov23_02248D20 *param0, u16 *param1, u16 *param2) { - BmpList * v0 = param0->unk_0C; + BmpList *v0 = param0->unk_0C; sub_02001384(v0, param1, param2); diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c index 0826090ba4..c995472c02 100644 --- a/src/overlay023/ov23_02248F1C.c +++ b/src/overlay023/ov23_02248F1C.c @@ -1,3 +1,5 @@ +#include "overlay023/ov23_02248F1C.h" + #include #include @@ -7,19 +9,25 @@ #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0205E884_decl.h" -#include "overlay023/struct_ov23_0224942C_decl.h" - #include "struct_defs/struct_0200C738.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system.h" #include "overlay019/struct_ov19_021DA864.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/struct_ov23_0224942C_decl.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" -#include "unk_0200679C.h" +#include "comm_player_manager.h" +#include "communication_system.h" +#include "gx_layers.h" #include "narc.h" +#include "player_avatar.h" +#include "strbuf.h" +#include "sys_task_manager.h" +#include "unk_0200679C.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" @@ -27,23 +35,15 @@ #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "communication_system.h" -#include "comm_player_manager.h" #include "unk_0205D8CC.h" -#include "player_avatar.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_02248F1C.h" typedef struct { - Strbuf* unk_00[32]; - Strbuf* unk_80; - Strbuf* unk_84[2]; + Strbuf *unk_00[32]; + Strbuf *unk_80; + Strbuf *unk_84[2]; int unk_8C; int unk_90; u16 unk_94[80]; @@ -54,15 +54,15 @@ struct UnkStruct_ov23_0224942C_t { int unk_04[8][2]; int unk_44[8][3]; int unk_A4[17][4]; - FieldSystem * fieldSystem; - BGL * unk_1B8; - GraphicElementManager * unk_1BC; + FieldSystem *fieldSystem; + BGL *unk_1B8; + GraphicElementManager *unk_1BC; UnkStruct_0200C738 unk_1C0; - UnkStruct_02009714 * unk_34C[4]; - UnkStruct_02009DC8 * unk_35C[4]; + UnkStruct_02009714 *unk_34C[4]; + UnkStruct_02009DC8 *unk_35C[4]; UnkStruct_ov19_021DA864 unk_36C; - GraphicElementData * unk_390[8]; - GraphicElementData * unk_3B0[17]; + GraphicElementData *unk_390[8]; + GraphicElementData *unk_3B0[17]; Window unk_3F4; int unk_404; int unk_408; @@ -72,28 +72,28 @@ struct UnkStruct_ov23_0224942C_t { int Unk_ov23_0225776C[8][2]; -static void ov23_0224944C(BGL * param0, Window * param1); -static void ov23_02249584(UnkStruct_ov23_0224942C * param0); -static void ov23_02249214(PlayerAvatar * const playerAvatar, int param1[][2], int param2[][3]); +static void ov23_0224944C(BGL *param0, Window *param1); +static void ov23_02249584(UnkStruct_ov23_0224942C *param0); +static void ov23_02249214(PlayerAvatar *const playerAvatar, int param1[][2], int param2[][3]); static void ov23_022491CC(int param0[][2], int param1[][3]); -static void ov23_022492C8(int param0[][3], GraphicElementData * param1[]); -static void ov23_0224944C(BGL * param0, Window * param1); -static void ov23_02249438(BGL * param0); -static void ov23_0224966C(BGL * param0, Window * param1, int * param2, int * param3, int * param4, UnkStruct_ov23_02249724 * param5); -static void ov23_02249724(UnkStruct_ov23_02249724 * param0); -static void ov23_02249778(UnkStruct_ov23_02249724 * param0); -static int ov23_02249844(UnkStruct_ov23_02249724 * param0, Strbuf *param1); -static Strbuf* ov23_022498C4(UnkStruct_ov23_02249724 * param0); -static int ov23_02249900(UnkStruct_ov23_02249724 * param0); -static void ov23_0224937C(int param0[][4], GraphicElementData * param1[]); +static void ov23_022492C8(int param0[][3], GraphicElementData *param1[]); +static void ov23_0224944C(BGL *param0, Window *param1); +static void ov23_02249438(BGL *param0); +static void ov23_0224966C(BGL *param0, Window *param1, int *param2, int *param3, int *param4, UnkStruct_ov23_02249724 *param5); +static void ov23_02249724(UnkStruct_ov23_02249724 *param0); +static void ov23_02249778(UnkStruct_ov23_02249724 *param0); +static int ov23_02249844(UnkStruct_ov23_02249724 *param0, Strbuf *param1); +static Strbuf *ov23_022498C4(UnkStruct_ov23_02249724 *param0); +static int ov23_02249900(UnkStruct_ov23_02249724 *param0); +static void ov23_0224937C(int param0[][4], GraphicElementData *param1[]); static void ov23_02249334(int param0[][4]); -static UnkStruct_ov23_0224942C * Unk_ov23_02257768; +static UnkStruct_ov23_0224942C *Unk_ov23_02257768; -static void ov23_02248F1C (SysTask * param0, void * param1) +static void ov23_02248F1C(SysTask *param0, void *param1) { - UnkStruct_ov23_0224942C * v0 = param1; - BGL * v1 = v0->unk_1B8; + UnkStruct_ov23_0224942C *v0 = param1; + BGL *v1 = v0->unk_1B8; int v2; Unk_ov23_02257768 = v0; @@ -198,7 +198,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1) } } -static void ov23_022491CC (int param0[][2], int param1[][3]) +static void ov23_022491CC(int param0[][2], int param1[][3]) { int v0; @@ -214,7 +214,7 @@ static void ov23_022491CC (int param0[][2], int param1[][3]) } } -static void ov23_02249214 (PlayerAvatar * const playerAvatar, int param1[][2], int param2[][3]) +static void ov23_02249214(PlayerAvatar *const playerAvatar, int param1[][2], int param2[][3]) { int v0; @@ -253,7 +253,7 @@ static void ov23_02249214 (PlayerAvatar * const playerAvatar, int param1[][2], i } } -static void ov23_022492C8 (int param0[][3], GraphicElementData * param1[]) +static void ov23_022492C8(int param0[][3], GraphicElementData *param1[]) { int v0; @@ -273,7 +273,7 @@ static void ov23_022492C8 (int param0[][3], GraphicElementData * param1[]) } } -static void ov23_02249334 (int param0[][4]) +static void ov23_02249334(int param0[][4]) { int v0, v1, v2, v3; @@ -294,7 +294,7 @@ static void ov23_02249334 (int param0[][4]) } } -static void ov23_0224937C (int param0[][4], GraphicElementData * param1[]) +static void ov23_0224937C(int param0[][4], GraphicElementData *param1[]) { int v0; @@ -324,10 +324,10 @@ static void ov23_0224937C (int param0[][4], GraphicElementData * param1[]) } } -UnkStruct_ov23_0224942C * ov23_02249404 (FieldSystem * fieldSystem) +UnkStruct_ov23_0224942C *ov23_02249404(FieldSystem *fieldSystem) { - UnkStruct_ov23_0224942C * v0; - SysTask * v1; + UnkStruct_ov23_0224942C *v0; + SysTask *v1; v1 = SysTask_StartAndAllocateParam(ov23_02248F1C, sizeof(UnkStruct_ov23_0224942C), 4, 4); v0 = SysTask_GetParam(v1); @@ -338,7 +338,7 @@ UnkStruct_ov23_0224942C * ov23_02249404 (FieldSystem * fieldSystem) return v0; } -void ov23_0224942C (UnkStruct_ov23_0224942C * param0) +void ov23_0224942C(UnkStruct_ov23_0224942C *param0) { if (param0->unk_00 == 5) { param0->unk_00 = 6; @@ -347,13 +347,13 @@ void ov23_0224942C (UnkStruct_ov23_0224942C * param0) } } -static void ov23_02249438 (BGL * param0) +static void ov23_02249438(BGL *param0) { sub_02019044(param0, 4); sub_02019044(param0, 5); } -static void ov23_0224944C (BGL * param0, Window * param1) +static void ov23_0224944C(BGL *param0, Window *param1) { sub_0200F344(1, 0x0); ov23_02249438(param0); @@ -421,7 +421,7 @@ static void ov23_0224944C (BGL * param0, Window * param1) } { - NARC * v3; + NARC *v3; v3 = NARC_ctor(NARC_INDEX_DATA__UNDERG_RADAR, 4); @@ -439,7 +439,7 @@ static void ov23_0224944C (BGL * param0, Window * param1) sub_0200F338(1); } -static void ov23_02249584 (UnkStruct_ov23_0224942C * param0) +static void ov23_02249584(UnkStruct_ov23_0224942C *param0) { int v0; @@ -450,7 +450,7 @@ static void ov23_02249584 (UnkStruct_ov23_0224942C * param0) } { - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_DATA__UNDERG_RADAR, 4); @@ -466,9 +466,9 @@ static void ov23_02249584 (UnkStruct_ov23_0224942C * param0) sub_0200A640(param0->unk_35C[1]); } -static void ov23_0224966C (BGL * param0, Window * param1, int * param2, int * param3, int * param4, UnkStruct_ov23_02249724 * param5) +static void ov23_0224966C(BGL *param0, Window *param1, int *param2, int *param3, int *param4, UnkStruct_ov23_02249724 *param5) { - Strbuf* v0; + Strbuf *v0; while (ov23_02242D60(param5->unk_80)) { ov23_02249844(param5, param5->unk_80); @@ -502,7 +502,7 @@ static void ov23_0224966C (BGL * param0, Window * param1, int * param2, int * pa } } -static void ov23_02249724 (UnkStruct_ov23_02249724 * param0) +static void ov23_02249724(UnkStruct_ov23_02249724 *param0) { int v0; @@ -519,7 +519,7 @@ static void ov23_02249724 (UnkStruct_ov23_02249724 * param0) } } -static void ov23_02249778 (UnkStruct_ov23_02249724 * param0) +static void ov23_02249778(UnkStruct_ov23_02249724 *param0) { int v0; @@ -534,7 +534,7 @@ static void ov23_02249778 (UnkStruct_ov23_02249724 * param0) } } -static int ov23_022497B0 (UnkStruct_ov23_02249724 * param0, Strbuf *param1) +static int ov23_022497B0(UnkStruct_ov23_02249724 *param0, Strbuf *param1) { int v0, v1, v2; @@ -566,7 +566,7 @@ static int ov23_022497B0 (UnkStruct_ov23_02249724 * param0, Strbuf *param1) return 2; } -static int ov23_02249844 (UnkStruct_ov23_02249724 * param0, Strbuf *param1) +static int ov23_02249844(UnkStruct_ov23_02249724 *param0, Strbuf *param1) { int v0, v1, v2; @@ -595,7 +595,7 @@ static int ov23_02249844 (UnkStruct_ov23_02249724 * param0, Strbuf *param1) return 1; } -static Strbuf* ov23_022498C4 (UnkStruct_ov23_02249724 * param0) +static Strbuf *ov23_022498C4(UnkStruct_ov23_02249724 *param0) { int v0; @@ -612,7 +612,7 @@ static Strbuf* ov23_022498C4 (UnkStruct_ov23_02249724 * param0) return NULL; } -static int ov23_02249900 (UnkStruct_ov23_02249724 * param0) +static int ov23_02249900(UnkStruct_ov23_02249724 *param0) { if (param0->unk_8C != param0->unk_90) { return 0; diff --git a/src/overlay023/ov23_02249918.c b/src/overlay023/ov23_02249918.c index 13aa574723..26c6d91984 100644 --- a/src/overlay023/ov23_02249918.c +++ b/src/overlay023/ov23_02249918.c @@ -1,9 +1,10 @@ +#include "overlay023/ov23_02249918.h" + #include -#include #include +#include #include "communication_system.h" -#include "overlay023/ov23_02249918.h" typedef struct UnkStruct_ov23_02249978_t { int unk_00; @@ -17,7 +18,7 @@ typedef struct UnkStruct_ov23_0224991C_t { UnkStruct_ov23_02249978 unk_18[8]; } UnkStruct_ov23_0224991C; -static void ov23_02249978(UnkStruct_ov23_02249978 * param0, int param1); +static void ov23_02249978(UnkStruct_ov23_02249978 *param0, int param1); static int Unk_ov23_02257580[] = { 0x0, @@ -39,42 +40,42 @@ static int Unk_ov23_0225759C[] = { 0x0 }; -int ov23_02249918 (void) +int ov23_02249918(void) { return sizeof(UnkStruct_ov23_0224991C); } -void ov23_0224991C (UnkStruct_ov23_0224991C * param0) +void ov23_0224991C(UnkStruct_ov23_0224991C *param0) { int v0; CommSys_Seed(¶m0->unk_00); for (v0 = 0; v0 < (7 + 1); v0++) { - UnkStruct_ov23_02249978 * v1 = ¶m0->unk_18[v0]; + UnkStruct_ov23_02249978 *v1 = ¶m0->unk_18[v0]; v1->unk_0A = 0; v1->unk_04 = 0; } } -void ov23_02249938 (UnkStruct_ov23_0224991C * param0) +void ov23_02249938(UnkStruct_ov23_0224991C *param0) { return; } -UnkStruct_ov23_02249978 * ov23_0224993C (UnkStruct_ov23_0224991C * param0, int param1) +UnkStruct_ov23_02249978 *ov23_0224993C(UnkStruct_ov23_0224991C *param0, int param1) { GF_ASSERT(param1 < (7 + 1)); return ¶m0->unk_18[param1]; } -void ov23_02249954 (UnkStruct_ov23_0224991C * param0) +void ov23_02249954(UnkStruct_ov23_0224991C *param0) { int v0; for (v0 = 0; v0 < (7 + 1); v0++) { - UnkStruct_ov23_02249978 * v1 = ¶m0->unk_18[v0]; + UnkStruct_ov23_02249978 *v1 = ¶m0->unk_18[v0]; if (v1->unk_04 > 0) { v1->unk_04--; @@ -86,19 +87,19 @@ void ov23_02249954 (UnkStruct_ov23_0224991C * param0) } } -static void ov23_02249978 (UnkStruct_ov23_02249978 * param0, int param1) +static void ov23_02249978(UnkStruct_ov23_02249978 *param0, int param1) { param0->unk_0A = param1; param0->unk_04 = Unk_ov23_02257580[param1]; param0->unk_00 = Unk_ov23_0225759C[param1]; } -void ov23_02249994 (UnkStruct_ov23_02249978 * param0, int param1) +void ov23_02249994(UnkStruct_ov23_02249978 *param0, int param1) { ov23_02249978(param0, param1); } -BOOL ov23_0224999C (UnkStruct_ov23_02249978 * param0) +BOOL ov23_0224999C(UnkStruct_ov23_02249978 *param0) { if (0 == param0->unk_0A) { return 1; @@ -107,7 +108,7 @@ BOOL ov23_0224999C (UnkStruct_ov23_02249978 * param0) return 0; } -BOOL ov23_022499AC (UnkStruct_ov23_02249978 * param0) +BOOL ov23_022499AC(UnkStruct_ov23_02249978 *param0) { if (2 == param0->unk_0A) { return 0; diff --git a/src/overlay023/ov23_022499E4.c b/src/overlay023/ov23_022499E4.c index 3a8d3de334..00b815f73b 100644 --- a/src/overlay023/ov23_022499E4.c +++ b/src/overlay023/ov23_022499E4.c @@ -1,32 +1,33 @@ +#include "overlay023/ov23_022499E4.h" + #include #include -#include "sys_task_manager.h" +#include "struct_defs/struct_0205964C.h" #include "field/field_system.h" -#include "struct_defs/struct_0205964C.h" #include "functypes/funcptr_020598EC.h" +#include "overlay023/ov23_0223E140.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_0224340C.h" +#include "overlay023/ov23_0224A1D0.h" +#include "overlay023/ov23_0224B05C.h" -#include "sys_task.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "field_comm_manager.h" +#include "field_system.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_0202CD50.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "field_system.h" -#include "vars_flags.h" -#include "comm_player_manager.h" -#include "field_comm_manager.h" #include "unk_0206A8DC.h" -#include "overlay023/ov23_0223E140.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_0224340C.h" -#include "overlay023/ov23_022499E4.h" -#include "overlay023/ov23_0224A1D0.h" -#include "overlay023/ov23_0224B05C.h" +#include "vars_flags.h" -static void ov97_0222D19C(SysTask * param0, void * param1); +static void ov97_0222D19C(SysTask *param0, void *param1); static void ov23_02249C24(FieldCommTask param0, int param1); static void ov23_02249C34(void); static void ov23_02249C98(void); @@ -59,14 +60,14 @@ static void ov23_0224A180(void); static void ov23_0224A184(void); static void ov23_0224A024(void); static void ov23_0224A064(void); -static void ov23_022499E4 (char * param0) +static void ov23_022499E4(char *param0) { return; } -void ov23_022499E8 (FieldSystem * fieldSystem) +void ov23_022499E8(FieldSystem *fieldSystem) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (v0 != NULL) { return; @@ -83,9 +84,9 @@ void ov23_022499E8 (FieldSystem * fieldSystem) } } -void ov23_02249A2C (void) +void ov23_02249A2C(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); v0->unk_41 = 1; sub_0202CFEC(sub_0202CD88(v0->fieldSystem->saveData), 36); @@ -94,9 +95,9 @@ void ov23_02249A2C (void) ov23_02249C24(ov23_02249C34, 0); } -void ov23_02249A5C (void) +void ov23_02249A5C(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (v0 == NULL) { return; @@ -105,13 +106,13 @@ void ov23_02249A5C (void) ov23_02249C24(ov23_0224A1A0, 3); } -void ov23_02249A74 (void) +void ov23_02249A74(void) { sub_02036884(); ov23_02249C24(ov23_0224A02C, 0); } -static void ov23_02249A88 (void) +static void ov23_02249A88(void) { if (!sub_02033DFC()) { ov23_0224C198(); @@ -119,15 +120,15 @@ static void ov23_02249A88 (void) } } -void ov23_02249AA4 (void) +void ov23_02249AA4(void) { sub_020368A4(); ov23_02249C24(ov23_02249A88, 0); } -BOOL ov23_02249AB8 (void) +BOOL ov23_02249AB8(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); int v1; u32 v2 = (u32)v0->task; u32 v3 = (u32)ov23_02249E18; @@ -164,9 +165,9 @@ BOOL ov23_02249AB8 (void) return 0; } -BOOL ov23_02249B60 (void) +BOOL ov23_02249B60(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); u32 v1 = (u32)v0->task; u32 v2 = (u32)ov23_02249E98; u32 v3 = (u32)ov23_0224A0E0; @@ -190,9 +191,9 @@ BOOL ov23_02249B60 (void) return 0; } -BOOL ov23_02249BD4 (void) +BOOL ov23_02249BD4(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); int v1; u32 v2[] = { (u32)ov23_0224A09C, @@ -224,9 +225,9 @@ BOOL ov23_02249BD4 (void) return 0; } -static void ov97_0222D19C (SysTask * param0, void * param1) +static void ov97_0222D19C(SysTask *param0, void *param1) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (v0 == NULL) { SysTask_Done(param0); @@ -241,17 +242,17 @@ static void ov97_0222D19C (SysTask * param0, void * param1) } } -static void ov23_02249C24 (FieldCommTask param0, int param1) +static void ov23_02249C24(FieldCommTask param0, int param1) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); v0->task = param0; v0->timer = param1; } -static void ov23_02249C34 (void) +static void ov23_02249C34(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (v0->timer != 0) { v0->timer--; @@ -278,9 +279,9 @@ static void ov23_02249C34 (void) } } -static void ov23_02249C98 (void) +static void ov23_02249C98(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (!sub_0206ADDC(SaveData_GetVarsFlags(v0->fieldSystem->saveData))) { return; @@ -292,9 +293,9 @@ static void ov23_02249C98 (void) ov23_02249C24(ov23_02249CE4, 12 * 2); } -static void ov23_02249CC4 (void) +static void ov23_02249CC4(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (v0->timer != 0) { v0->timer--; @@ -304,7 +305,7 @@ static void ov23_02249CC4 (void) ov23_02249C24(ov23_02249CE4, 12 * 2); } -static void ov23_02249CE4 (void) +static void ov23_02249CE4(void) { ov23_02242B14(); sub_02059524(); @@ -319,9 +320,9 @@ static void ov23_02249CE4 (void) } } -static void ov23_02249D20 (void) +static void ov23_02249D20(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (v0->timer != 0) { v0->timer--; @@ -354,9 +355,9 @@ static void ov23_02249D20 (void) } } -static void ov23_02249DBC (void) +static void ov23_02249DBC(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); ov23_02242B14(); @@ -382,9 +383,9 @@ static void ov23_02249DBC (void) } } -static void ov23_02249E18 (void) +static void ov23_02249E18(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); ov23_02242B14(); @@ -392,7 +393,7 @@ static void ov23_02249E18 (void) return; } - if (CommSys_CheckError() || !CommServerClient_IsClientConnecting() || ((!CommSys_IsPlayerConnected(CommSys_CurNetId()) && !CommSys_IsAlone()))) { + if (CommSys_CheckError() || !CommServerClient_IsClientConnecting() || (!CommSys_IsPlayerConnected(CommSys_CurNetId()) && !CommSys_IsAlone())) { ov23_0224B5CC(0); ov23_0224AA84(); ov23_0224DA8C(); @@ -407,29 +408,29 @@ static void ov23_02249E18 (void) } } -static void ov23_02249E84 (void) +static void ov23_02249E84(void) { CommPlayerMan_Reset(); ov23_02249C24(ov23_02249E98, 0); } -static void ov23_02249E98 (void) +static void ov23_02249E98(void) { ov23_02242B14(); } -static void ov23_02249EA0 (void) +static void ov23_02249EA0(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); ov23_0224C198(); CommPlayerMan_Restart(); ov23_02249C24(ov23_02249E18, 0); } -static void ov23_02249EBC (void) +static void ov23_02249EBC(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (v0->timer == 9) { CommInfo_SendBattleRegulation(); @@ -455,9 +456,9 @@ static void ov23_02249EBC (void) ov23_0224A09C(); } -static void ov23_02249F14 (void) +static void ov23_02249F14(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (ov23_0224AC3C()) { ov23_02243AF0(); @@ -473,7 +474,7 @@ static void ov23_02249F14 (void) } } -static void ov23_02249F4C (void) +static void ov23_02249F4C(void) { if (ov23_0224404C()) { ov23_022499E4("\u0090\u0065\u008B\u0040\u00E3\u00A9\u0083\u0066\u0081\u005B\u0083\u005E\u0093\u00CD\u0082\u00A2\u0082\u00BD\u0082\u00E7\u0082\u00B5\u0082\u00A2"); @@ -486,7 +487,7 @@ static void ov23_02249F4C (void) ov23_0224A09C(); } -static void ov23_02249F7C (void) +static void ov23_02249F7C(void) { if (ov23_0224C420()) { ov23_022499E4("\u0094\u00E9\u0096\u00A7\u008A\u00EE\u0092\u006E\u0082\u00CC\u0088\u00CA\u0092\u0075\u0082\u00AA\u0082\u00AB\u0082\u00BD"); @@ -500,7 +501,7 @@ static void ov23_02249F7C (void) ov23_0224A09C(); } -static void ov23_02249FB4 (void) +static void ov23_02249FB4(void) { if (!CommSys_IsAlone()) { return; @@ -510,9 +511,9 @@ static void ov23_02249FB4 (void) ov23_02249C24(ov23_02249FD4, 30); } -static void ov23_02249FD4 (void) +static void ov23_02249FD4(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (v0->timer != 0) { v0->timer--; @@ -524,9 +525,9 @@ static void ov23_02249FD4 (void) } } -static void ov23_02249FFC (void) +static void ov23_02249FFC(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (v0->timer != 0) { v0->timer--; @@ -538,14 +539,14 @@ static void ov23_02249FFC (void) } } -static void ov23_0224A024 (void) +static void ov23_0224A024(void) { ov23_02242B14(); } -static void ov23_0224A02C (void) +static void ov23_0224A02C(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (CommSys_CurNetId() == 0) { ov23_02242D44(v0->fieldSystem); @@ -557,7 +558,7 @@ static void ov23_0224A02C (void) } } -static void ov23_0224A064 (void) +static void ov23_0224A064(void) { ov23_02244858(CommSys_CurNetId(), 1); ov23_0224D9AC(CommSys_CurNetId(), 1); @@ -569,9 +570,9 @@ static void ov23_0224A064 (void) ov23_02249C24(ov23_02249FFC, 0); } -static void ov23_0224A09C (void) +static void ov23_0224A09C(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); ov23_02242B14(); sub_02059524(); @@ -585,20 +586,20 @@ static void ov23_0224A09C (void) } } -static void ov23_0224A0CC (void) +static void ov23_0224A0CC(void) { CommPlayerMan_Reset(); ov23_02249C24(ov23_0224A0E0, 0); } -static void ov23_0224A0E0 (void) +static void ov23_0224A0E0(void) { ov23_0224DAB4(); } -static void ov23_0224A0E8 (void) +static void ov23_0224A0E8(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); ov23_0224C198(); CommPlayerMan_Restart(); @@ -615,49 +616,49 @@ static void ov23_0224A0E8 (void) } } -static void ov23_0224A138 (void) +static void ov23_0224A138(void) { CommPlayerMan_Reset(); ov23_02249C24(ov23_0224A14C, 0); } -static void ov23_0224A14C (void) +static void ov23_0224A14C(void) { return; } -static void ov23_0224A150 (void) +static void ov23_0224A150(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); ov23_0224C198(); CommPlayerMan_Restart(); ov23_02249C24(ov23_02249CE4, 0); } -static void ov23_0224A16C (void) +static void ov23_0224A16C(void) { ov23_0224A1D0(); ov23_02249C24(ov23_0224A180, 0); } -static void ov23_0224A180 (void) +static void ov23_0224A180(void) { return; } -static void ov23_0224A184 (void) +static void ov23_0224A184(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); ov23_0224C198(); CommPlayerMan_Restart(); ov23_02249C24(ov23_0224A024, 0); } -static void ov23_0224A1A0 (void) +static void ov23_0224A1A0(void) { - FieldCommunicationManager * v0 = FieldCommMan_Get(); + FieldCommunicationManager *v0 = FieldCommMan_Get(); if (v0->timer != 0) { v0->timer--; diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c index 592812dcdb..89b95a9ad6 100644 --- a/src/overlay023/ov23_0224A1D0.c +++ b/src/overlay023/ov23_0224A1D0.c @@ -1,47 +1,46 @@ +#include "overlay023/ov23_0224A1D0.h" + #include -#include #include +#include -#include "sys_task_manager.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" +#include "struct_defs/struct_02057B48.h" #include "field/field_system.h" -#include "struct_defs/struct_02057B48.h" +#include "overlay005/ov5_021F50BC.h" +#include "overlay005/ov5_021F5284.h" +#include "overlay005/ov5_021F5428.h" +#include "overlay005/ov5_021F55CC.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_02249918.h" +#include "overlay023/ov23_0224B05C.h" +#include "overlay023/ov23_0224DC40.h" +#include "overlay023/ov23_0224F294.h" +#include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_0224A5CC.h" #include "overlay023/struct_ov23_0224ABC4.h" -#include "unk_020041CC.h" -#include "unk_02005474.h" -#include "sys_task.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "field_system.h" #include "heap.h" +#include "map_object_move.h" +#include "player_avatar.h" #include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "trainer_info.h" +#include "unk_020041CC.h" +#include "unk_02005474.h" #include "unk_0202854C.h" #include "unk_0202CD50.h" -#include "communication_information.h" -#include "communication_system.h" -#include "field_system.h" -#include "vars_flags.h" -#include "comm_player_manager.h" -#include "player_avatar.h" -#include "map_object_move.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_0206CCB0.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021F50BC.h" -#include "overlay005/ov5_021F5284.h" -#include "overlay005/ov5_021F5428.h" -#include "overlay005/ov5_021F55CC.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_02249918.h" -#include "overlay023/ov23_0224A1D0.h" -#include "overlay023/ov23_0224B05C.h" -#include "overlay023/ov23_0224DC40.h" -#include "overlay023/ov23_0224F294.h" -#include "overlay023/ov23_02253D40.h" +#include "vars_flags.h" typedef struct { u8 unk_00; @@ -55,12 +54,12 @@ typedef struct { u8 unk_02; } UnkStruct_ov23_0224A570; -CommPlayerManager * CommPlayerMan_Get(void); +CommPlayerManager *CommPlayerMan_Get(void); -void ov23_0224A1D0 (void) +void ov23_0224A1D0(void) { int v0; - CommPlayerManager * v1 = CommPlayerMan_Get(); + CommPlayerManager *v1 = CommPlayerMan_Get(); if (v1 == NULL) { return; @@ -74,10 +73,10 @@ void ov23_0224A1D0 (void) v1->isResetting = 1; } -static void ov23_0224A204 (int param0) +static void ov23_0224A204(int param0) { int v0; - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); if (param0 == CommSys_CurNetId()) { if (commPlayerMan->unk_290[param0] != NULL) { @@ -102,9 +101,9 @@ static void ov23_0224A204 (int param0) } } -static BOOL ov23_0224A294 (int param0, int param1) +static BOOL ov23_0224A294(int param0, int param1) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if ((v0->unk_290[param0] == NULL) && (v0->unk_290[param1] != NULL)) { v0->unk_290[param0] = v0->unk_290[param1]; @@ -120,44 +119,44 @@ static BOOL ov23_0224A294 (int param0, int param1) return 0; } -static void ov23_0224A300 (int param0) +static void ov23_0224A300(int param0) { sub_02059514(); } -static void ov23_0224A308 (int param0) +static void ov23_0224A308(int param0) { sub_02059514(); } -static void ov23_0224A310 (int param0) +static void ov23_0224A310(int param0) { sub_0205948C(0x2); } -static void ov23_0224A31C (int param0) +static void ov23_0224A31C(int param0) { sub_0205948C(0x20); } -static void ov23_0224A328 (int param0) +static void ov23_0224A328(int param0) { sub_0205948C(0x1); } -static void ov23_0224A334 (int param0) +static void ov23_0224A334(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (v0) { v0->unk_2B8 = 0; } } -void ov23_0224A348 (int param0, int param1, void * param2, void * param3) +void ov23_0224A348(int param0, int param1, void *param2, void *param3) { UnkStruct_ov23_0224A348 v0; - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); v0.unk_00 = 2; v0.unk_01 = param0; @@ -177,10 +176,10 @@ void ov23_0224A348 (int param0, int param1, void * param2, void * param3) } } -void ov23_0224A3A8 (int param0, int param1, void * param2, void * param3) +void ov23_0224A3A8(int param0, int param1, void *param2, void *param3) { - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); - UnkStruct_ov23_0224A348 * v1 = param2; + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); + UnkStruct_ov23_0224A348 *v1 = param2; if (!CommSys_IsSendingMovementData()) { return; @@ -200,11 +199,11 @@ void ov23_0224A3A8 (int param0, int param1, void * param2, void * param3) } } -void ov23_0224A410 (int param0, int param1, void * param2, void * param3) +void ov23_0224A410(int param0, int param1, void *param2, void *param3) { - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); - UnkStruct_ov23_0224A348 * v1 = param2; - VarsFlags * v2 = SaveData_GetVarsFlags(commPlayerMan->fieldSystem->saveData); + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); + UnkStruct_ov23_0224A348 *v1 = param2; + VarsFlags *v2 = SaveData_GetVarsFlags(commPlayerMan->fieldSystem->saveData); GF_ASSERT(v1->unk_01 < (7 + 1)); @@ -248,14 +247,14 @@ void ov23_0224A410 (int param0, int param1, void * param2, void * param3) } } -int ov23_0224A56C (void) +int ov23_0224A56C(void) { return sizeof(UnkStruct_ov23_0224A570); } -void ov23_0224A570 (int param0, int param1, void * param2, void * param3) +void ov23_0224A570(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; UnkStruct_ov23_0224A570 v1; v1.unk_01 = param0; @@ -273,7 +272,7 @@ void ov23_0224A570 (int param0, int param1, void * param2, void * param3) } } -static void ov23_0224A5B0 (int param0) +static void ov23_0224A5B0(int param0) { ov23_0224B040(CommSys_CurNetId()); ov23_02254044(ov23_022421AC()); @@ -281,10 +280,10 @@ static void ov23_0224A5B0 (int param0) sub_0205948C(0x4); } -static void ov23_0224A5CC (SysTask * param0, void * param1) +static void ov23_0224A5CC(SysTask *param0, void *param1) { - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); - UnkStruct_ov23_0224A5CC * v1 = param1; + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); + UnkStruct_ov23_0224A5CC *v1 = param1; u8 v2 = v1->unk_04; u8 v3 = 0; @@ -307,10 +306,10 @@ static void ov23_0224A5CC (SysTask * param0, void * param1) } } -static void ov23_0224A620 (int param0) +static void ov23_0224A620(int param0) { - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); - UnkStruct_ov23_0224A5CC * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov23_0224A5CC)); + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); + UnkStruct_ov23_0224A5CC *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov23_0224A5CC)); v1->unk_00 = 0; v1->unk_04 = param0; @@ -320,7 +319,7 @@ static void ov23_0224A620 (int param0) sub_02059058(param0, 0); } -BOOL ov23_0224A658 (int param0, int param1, BOOL param2) +BOOL ov23_0224A658(int param0, int param1, BOOL param2) { UnkStruct_ov23_0224A570 v0; @@ -348,7 +347,7 @@ BOOL ov23_0224A658 (int param0, int param1, BOOL param2) return 1; } -BOOL ov23_0224A6B8 (int param0) +BOOL ov23_0224A6B8(int param0) { UnkStruct_ov23_0224A570 v0; @@ -364,9 +363,9 @@ BOOL ov23_0224A6B8 (int param0) return 1; } -static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, SecretBaseRecord * param2) +static void ov23_0224A6E4(UnkStruct_ov23_0224A570 *param0, BOOL param1, SecretBaseRecord *param2) { - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); ov23_0224321C(); @@ -388,13 +387,13 @@ static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, Secret Sound_PlayEffect(1526); } -void ov23_0224A77C (int param0, int param1, void * param2, void * param3) +void ov23_0224A77C(int param0, int param1, void *param2, void *param3) { - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); - UnkStruct_ov23_0224A570 * v1 = param2; + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); + UnkStruct_ov23_0224A570 *v1 = param2; BOOL v2; int v3 = 0; - SecretBaseRecord * v4 = SaveData_SecretBaseRecord(FieldSystem_SaveData(commPlayerMan->fieldSystem)); + SecretBaseRecord *v4 = SaveData_SecretBaseRecord(FieldSystem_SaveData(commPlayerMan->fieldSystem)); switch (v1->unk_00) { case 0: @@ -468,7 +467,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3) ov23_0224B040(v1->unk_01); if (v1->unk_01 == CommSys_CurNetId()) { - SecretBaseRecord * v5 = SaveData_SecretBaseRecord(FieldSystem_SaveData(commPlayerMan->fieldSystem)); + SecretBaseRecord *v5 = SaveData_SecretBaseRecord(FieldSystem_SaveData(commPlayerMan->fieldSystem)); u8 v6 = sub_0202958C(v5); sub_020295C0(v5); @@ -505,33 +504,33 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3) } } -void ov23_0224AA84 (void) +void ov23_0224AA84(void) { int v0; - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); for (v0 = 0; v0 < (7 + 1); v0++) { commPlayerMan->unk_14A[v0].unk_20 = 0xff; } } -u8 * ov23_0224AAA0 (int param0, void * param1, int param2) +u8 *ov23_0224AAA0(int param0, void *param1, int param2) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); return (u8 *)&v0->unk_14A[(7 + 1)]; } -void ov23_0224AAB0 (void) +void ov23_0224AAB0(void) { - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); commPlayerMan->unk_2B9 = 0; if (commPlayerMan->unk_290[CommSys_CurNetId()]) { CommSys_SendDataFixedSize(91, commPlayerMan->unk_290[CommSys_CurNetId()]); } else { - TrainerInfo * v0 = TrainerInfo_New(15); - Strbuf* v1 = Strbuf_Init(20, 15); + TrainerInfo *v0 = TrainerInfo_New(15); + Strbuf *v1 = Strbuf_Init(20, 15); GF_ASSERT(v0); GF_ASSERT(v1); @@ -543,17 +542,17 @@ void ov23_0224AAB0 (void) } } -int ov23_0224AB2C (void) +int ov23_0224AB2C(void) { return 32; } -void ov23_0224AB30 (int param0, int param1, void * param2, void * param3) +void ov23_0224AB30(int param0, int param1, void *param2, void *param3) { - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); int v1; - const TrainerInfo * v2 = param2; - Strbuf* v3; + const TrainerInfo *v2 = param2; + Strbuf *v3; u8 v4 = param0; if (commPlayerMan) { @@ -581,10 +580,10 @@ void ov23_0224AB30 (int param0, int param1, void * param2, void * param3) } } -void ov23_0224ABC4 (int param0, int param1, void * param2, void * param3) +void ov23_0224ABC4(int param0, int param1, void *param2, void *param3) { - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); - UnkStruct_ov23_0224ABC4 * v1 = param2; + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); + UnkStruct_ov23_0224ABC4 *v1 = param2; int v2, v3; if (commPlayerMan) { @@ -600,15 +599,15 @@ void ov23_0224ABC4 (int param0, int param1, void * param2, void * param3) } } -int ov23_0224AC0C (void) +int ov23_0224AC0C(void) { return sizeof(UnkStruct_ov23_0224ABC4); } -void ov23_0224AC10 (int param0, int param1, void * param2, void * param3) +void ov23_0224AC10(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); + u8 *v0 = param2; + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); if (v0[0] == CommSys_CurNetId()) { commPlayerMan->unk_2B9 = 1; @@ -617,18 +616,18 @@ void ov23_0224AC10 (int param0, int param1, void * param2, void * param3) commPlayerMan->unk_2C2 = 0; } -BOOL ov23_0224AC3C (void) +BOOL ov23_0224AC3C(void) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); return v0->unk_2B9; } -void ov23_0224AC4C (void) +void ov23_0224AC4C(void) { - TrainerInfo * v0 = NULL; + TrainerInfo *v0 = NULL; int v1, v2; int v3 = CommSys_CurNetId(); - CommPlayerManager * commPlayerMan = CommPlayerMan_Get(); + CommPlayerManager *commPlayerMan = CommPlayerMan_Get(); if (commPlayerMan->unk_290[v3]) { v0 = commPlayerMan->unk_290[v3]; @@ -651,9 +650,9 @@ void ov23_0224AC4C (void) } } -BOOL ov23_0224ACC0 (int param0) +BOOL ov23_0224ACC0(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (v0->unk_04) { return !ov23_0224999C( @@ -663,21 +662,21 @@ BOOL ov23_0224ACC0 (int param0) return 0; } -void ov23_0224ACE8 (int param0, int param1, void * param2, void * param3) +void ov23_0224ACE8(int param0, int param1, void *param2, void *param3) { u8 v0 = param0; sub_02035B48(26, &v0); } -void ov23_0224ACF8 (int param0, int param1, void * param2, void * param3) +void ov23_0224ACF8(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; ov23_02243020(v0[0]); } -int ov23_0224AD04 (int param0) +int ov23_0224AD04(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (!v0) { return 0xffff; @@ -690,9 +689,9 @@ int ov23_0224AD04 (int param0) return v0->playerLocation[param0].x; } -int ov23_0224AD40 (int param0) +int ov23_0224AD40(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (!v0) { return 0xffff; @@ -705,32 +704,32 @@ int ov23_0224AD40 (int param0) return v0->playerLocation[param0].z; } -void ov23_0224AD7C (int param0, int param1) +void ov23_0224AD7C(int param0, int param1) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); ov23_02249994(ov23_0224993C(v0->unk_04, param0), param1); } -void ov23_0224AD98 (int param0) +void ov23_0224AD98(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); ov23_02249994(ov23_0224993C(v0->unk_04, param0), 0); } -void ov23_0224ADB0 (int param0, int param1, int param2, int param3) +void ov23_0224ADB0(int param0, int param1, int param2, int param3) { - CommPlayerManager * v0 = CommPlayerMan_Get(); - CommPlayerLocation * v1 = &v0->playerLocationServer[param0]; + CommPlayerManager *v0 = CommPlayerMan_Get(); + CommPlayerLocation *v1 = &v0->playerLocationServer[param0]; v1->x = param1 + MapObject_GetDxFromDir(param3); v1->z = param2 + MapObject_GetDyFromDir(param3); v1->dir = param3; } -void ov23_0224ADE8 (int param0, int param1, int param2, int param3) +void ov23_0224ADE8(int param0, int param1, int param2, int param3) { - CommPlayerManager * v0 = CommPlayerMan_Get(); - CommPlayerLocation * v1; + CommPlayerManager *v0 = CommPlayerMan_Get(); + CommPlayerLocation *v1; if (!v0) { return; @@ -759,9 +758,9 @@ void ov23_0224ADE8 (int param0, int param1, int param2, int param3) } } -BOOL ov23_0224AE60 (int param0) +BOOL ov23_0224AE60(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (v0->unk_290[param0] != NULL) { Heap_FreeToHeap(v0->unk_290[param0]); @@ -776,9 +775,9 @@ BOOL ov23_0224AE60 (int param0) return 0; } -BOOL ov23_0224AEA4 (int param0) +BOOL ov23_0224AEA4(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (v0->unk_290[param0] != NULL) { return 1; @@ -787,12 +786,12 @@ BOOL ov23_0224AEA4 (int param0) return 0; } -BOOL ov23_0224AEC4 (int param0, int param1) +BOOL ov23_0224AEC4(int param0, int param1) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (v0->unk_290[param0] == NULL) { - TrainerInfo * v1 = CommInfo_TrainerInfo(param1); + TrainerInfo *v1 = CommInfo_TrainerInfo(param1); if (v1) { v0->unk_290[param0] = TrainerInfo_New(15); @@ -804,7 +803,7 @@ BOOL ov23_0224AEC4 (int param0, int param1) TrainerInfo_Copy(v1, (TrainerInfo *)&v0->unk_14A[param0].unk_00); if (param1 == CommSys_CurNetId()) { - SecretBaseRecord * v2 = SaveData_SecretBaseRecord(v0->fieldSystem->saveData); + SecretBaseRecord *v2 = SaveData_SecretBaseRecord(v0->fieldSystem->saveData); sub_020297B4(v2); } @@ -815,9 +814,9 @@ BOOL ov23_0224AEC4 (int param0, int param1) return 0; } -void ov23_0224AF4C (int param0) +void ov23_0224AF4C(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (v0->unk_28[param0] != NULL) { if (sub_020714F0(v0->unk_28[param0])) { @@ -830,9 +829,9 @@ void ov23_0224AF4C (int param0) } } -void ov23_0224AF7C (int param0) +void ov23_0224AF7C(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (!v0->isResetting) { if (v0->playerAvatar[param0]) { @@ -862,18 +861,18 @@ void ov23_0224AF7C (int param0) } } -void ov23_0224B00C (int param0) +void ov23_0224B00C(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (v0->unk_FA[param0] != 1) { v0->unk_FA[param0] = 2; } } -void ov23_0224B024 (int param0) +void ov23_0224B024(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (v0->unk_FA[param0] != 1) { v0->unk_FA[param0] = 3; @@ -882,9 +881,9 @@ void ov23_0224B024 (int param0) ov23_0224AF4C(param0); } -void ov23_0224B040 (int param0) +void ov23_0224B040(int param0) { - CommPlayerManager * v0 = CommPlayerMan_Get(); + CommPlayerManager *v0 = CommPlayerMan_Get(); if (v0->unk_FA[param0] != 1) { v0->unk_FA[param0] = 0; diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index a9d91f8625..5b502878fc 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -1,72 +1,72 @@ +#include "overlay023/ov23_0224B05C.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_02029894_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "savedata.h" -#include "overlay005/struct_ov5_021E1890_decl.h" - #include "struct_defs/struct_02013A04_t.h" -#include "field/field_system.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_02081CF4.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021F55CC.h" +#include "overlay005/ov5_021F5894.h" +#include "overlay005/struct_ov5_021E1890_decl.h" +#include "overlay023/ov23_022416A8.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_0224340C.h" +#include "overlay023/ov23_02248F1C.h" +#include "overlay023/ov23_022499E4.h" +#include "overlay023/ov23_0224A1D0.h" +#include "overlay023/ov23_0224DC40.h" +#include "overlay023/ov23_0224F294.h" +#include "overlay023/ov23_02253598.h" +#include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_0224271C.h" #include "overlay061/struct_ov61_0222C884.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_map_change.h" +#include "field_system.h" +#include "heap.h" +#include "journal.h" +#include "map_object_move.h" +#include "message.h" +#include "player_avatar.h" +#include "savedata.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0202854C.h" -#include "journal.h" #include "unk_0202CD50.h" #include "unk_02030EE0.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "field_system.h" -#include "vars_flags.h" #include "unk_020508D4.h" -#include "field_map_change.h" #include "unk_02054D00.h" #include "unk_020573FC.h" -#include "comm_player_manager.h" -#include "player_avatar.h" #include "unk_0205F180.h" -#include "map_object_move.h" #include "unk_020655F4.h" #include "unk_0206A8DC.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021F55CC.h" -#include "overlay005/ov5_021F5894.h" -#include "overlay023/ov23_022416A8.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_0224340C.h" -#include "overlay023/ov23_02248F1C.h" -#include "overlay023/ov23_022499E4.h" -#include "overlay023/ov23_0224A1D0.h" -#include "overlay023/ov23_0224B05C.h" -#include "overlay023/ov23_0224DC40.h" -#include "overlay023/ov23_0224F294.h" -#include "overlay023/ov23_02253598.h" -#include "overlay023/ov23_02253D40.h" +#include "vars_flags.h" typedef struct { u8 unk_00; @@ -89,10 +89,10 @@ typedef struct { } UnkStruct_ov23_0224B844; typedef struct { - FieldSystem * fieldSystem; - SysTask * unk_04; + FieldSystem *fieldSystem; + SysTask *unk_04; UnkStruct_ov23_0224B144 unk_08[17]; - UnkStruct_ov23_0224B144 * unk_A00; + UnkStruct_ov23_0224B144 *unk_A00; u32 unk_A04[17][32]; UnkStruct_ov23_0224B098 unk_1284[8]; UnkStruct_ov23_0224B098 unk_12AC[8]; @@ -125,9 +125,9 @@ typedef struct { } UnkStruct_ov23_022577AC; typedef struct { - FieldSystem * fieldSystem; - UIControlData * unk_04; - SysTask * unk_08; + FieldSystem *fieldSystem; + UIControlData *unk_04; + SysTask *unk_08; int unk_0C; int unk_10; int unk_14; @@ -145,9 +145,9 @@ typedef struct { } UnkStruct_ov23_0224BA48; typedef struct { - FieldSystem * fieldSystem; - SysTask * unk_04; - UIControlData * unk_08; + FieldSystem *fieldSystem; + SysTask *unk_04; + UIControlData *unk_08; int unk_0C; u8 unk_10; u8 unk_11; @@ -180,22 +180,22 @@ typedef struct { u8 unk_05; } UnkStruct_ov23_0224D54C; -static void ov23_0224B39C(UnkStruct_02029894 * param0, u32 * param1); +static void ov23_0224B39C(UnkStruct_02029894 *param0, u32 *param1); static void ov23_0224C448(void); static void ov23_0224C6E8(void); static void ov23_0224C588(int param0, int param1, int param2, int param3); -static void ov23_0224CAF0(FieldSystem * fieldSystem, int param1, int param2, int param3, int param4, BOOL param5); -static void ov23_0224BC5C(FieldSystem * fieldSystem, int param1, int param2, int param3, int param4, int param5); -static void ov23_0224C090(FieldSystem * fieldSystem, int param1, int param2, int param3, int param4, int param5); +static void ov23_0224CAF0(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, BOOL param5); +static void ov23_0224BC5C(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, int param5); +static void ov23_0224C090(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, int param5); static BOOL ov23_0224B79C(int param0, int param1); static void ov23_0224B844(int param0, int param1, BOOL param2); static void ov23_0224D238(void); static void ov23_0224C6AC(int param0); -static void ov23_0224C5B4(SysTask * param0, void * param1); +static void ov23_0224C5B4(SysTask *param0, void *param1); static void ov23_0224DC08(void); static void ov23_0224DC24(void); -static UnkStruct_ov23_022577AC * Unk_ov23_022577AC = NULL; +static UnkStruct_ov23_022577AC *Unk_ov23_022577AC = NULL; static const UnkStruct_ov61_0222C884 Unk_ov23_02256864 = { 0x3, @@ -257,7 +257,7 @@ static u8 Unk_ov23_02257620[] = { 0x0 }; -static int ov23_0224B05C (int param0, int param1) +static int ov23_0224B05C(int param0, int param1) { int v0; int v1 = param0 / 32; @@ -272,9 +272,9 @@ static int ov23_0224B05C (int param0, int param1) return 16; } -static BOOL ov23_0224B098 (int param0, int param1) +static BOOL ov23_0224B098(int param0, int param1) { - const UnkStruct_ov23_0224B098 v0 = {15, 24, 0}; + const UnkStruct_ov23_0224B098 v0 = { 15, 24, 0 }; const int v1 = 32; int v2; int v3; @@ -288,9 +288,9 @@ static BOOL ov23_0224B098 (int param0, int param1) return 0; } -static void ov23_0224B0DC (int param0, UnkStruct_ov23_0224B098 * param1) +static void ov23_0224B0DC(int param0, UnkStruct_ov23_0224B098 *param1) { - const UnkStruct_ov23_0224B098 v0 = {15, 24, 0}; + const UnkStruct_ov23_0224B098 v0 = { 15, 24, 0 }; const int v1 = 32; int v2; @@ -310,7 +310,7 @@ static void ov23_0224B0DC (int param0, UnkStruct_ov23_0224B098 * param1) param1->unk_02 = v0.unk_02; } -static void ov23_0224B128 (int param0, UnkStruct_ov23_0224B098 * param1) +static void ov23_0224B128(int param0, UnkStruct_ov23_0224B098 *param1) { int v0 = param0; @@ -321,11 +321,11 @@ static void ov23_0224B128 (int param0, UnkStruct_ov23_0224B098 * param1) ov23_0224B0DC(v0, param1); } -void ov23_0224B144 (void * param0, FieldSystem * fieldSystem) +void ov23_0224B144(void *param0, FieldSystem *fieldSystem) { int v0; - UnkStruct_ov23_0224B144 * v1; - UnkStruct_02029894 * v2; + UnkStruct_ov23_0224B144 *v1; + UnkStruct_02029894 *v2; if (Unk_ov23_022577AC) { return; @@ -376,10 +376,10 @@ void ov23_0224B144 (void * param0, FieldSystem * fieldSystem) Unk_ov23_022577AC->unk_04 = SysTask_Start(ov23_0224C5B4, NULL, 100); } -void ov23_0224B2C8 (FieldSystem * fieldSystem) +void ov23_0224B2C8(FieldSystem *fieldSystem) { - UnkStruct_02029894 * v0; - SecretBaseRecord * v1; + UnkStruct_02029894 *v0; + SecretBaseRecord *v1; v0 = sub_02029894(FieldSystem_SaveData(fieldSystem)); v1 = sub_020298AC(v0); @@ -393,7 +393,7 @@ void ov23_0224B2C8 (FieldSystem * fieldSystem) ov23_0224B39C(v0, Unk_ov23_022577AC->unk_A04[0]); } -static void ov23_0224B33C (int param0, int param1, const u8 * param2, u32 * param3) +static void ov23_0224B33C(int param0, int param1, const u8 *param2, u32 *param3) { int v0, v1; @@ -410,12 +410,12 @@ static void ov23_0224B33C (int param0, int param1, const u8 * param2, u32 * para } } -static void ov23_0224B39C (UnkStruct_02029894 * param0, u32 * param1) +static void ov23_0224B39C(UnkStruct_02029894 *param0, u32 *param1) { int v0, v1, v2; - const u8 * v3; - u8 v4[] = {1, 1, 0, 0, 0, 0, 0, 0, 0}; - u8 v5[] = {1, 1, 0, 1, 1, 0, 0, 0, 0}; + const u8 *v3; + u8 v4[] = { 1, 1, 0, 0, 0, 0, 0, 0, 0 }; + u8 v5[] = { 1, 1, 0, 1, 1, 0, 0, 0, 0 }; MI_CpuFill8(param1, 0xff, 32 * (32 / 8)); @@ -441,7 +441,7 @@ static void ov23_0224B39C (UnkStruct_02029894 * param0, u32 * param1) } } -void ov23_0224B430 (void) +void ov23_0224B430(void) { ov23_0224C6E8(); @@ -453,7 +453,7 @@ void ov23_0224B430 (void) Unk_ov23_022577AC->unk_13D4 = 1; } -void ov23_0224B460 (void) +void ov23_0224B460(void) { int v0; @@ -465,7 +465,7 @@ void ov23_0224B460 (void) } for (v0 = 0; v0 < (7 + 1); v0++) { - UnkStruct_ov23_0224B098 * v1 = &Unk_ov23_022577AC->unk_1284[v0]; + UnkStruct_ov23_0224B098 *v1 = &Unk_ov23_022577AC->unk_1284[v0]; if ((0xfff != v1->unk_00) && (0xfff != v1->unk_02)) { ov23_0224C588(v1->unk_00, v1->unk_02, v1->unk_04, v0); @@ -478,7 +478,7 @@ void ov23_0224B460 (void) } } -void ov23_0224B4E4 (void) +void ov23_0224B4E4(void) { if (Unk_ov23_022577AC->unk_04) { SysTask_Done(Unk_ov23_022577AC->unk_04); @@ -494,12 +494,12 @@ void ov23_0224B4E4 (void) Unk_ov23_022577AC = NULL; } -void ov23_0224B518 (void) +void ov23_0224B518(void) { int v0; for (v0 = 0; v0 < (7 + 1); v0++) { - UnkStruct_02029894 * v1 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_08[v0].unk_02; + UnkStruct_02029894 *v1 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_08[v0].unk_02; sub_02029300(v1); @@ -513,11 +513,11 @@ void ov23_0224B518 (void) ov23_0224B2C8(Unk_ov23_022577AC->fieldSystem); } -void ov23_0224B598 (void) +void ov23_0224B598(void) { int v0; - UnkStruct_ov23_0224B144 * v1; - UnkStruct_02029894 * v2; + UnkStruct_ov23_0224B144 *v1; + UnkStruct_02029894 *v2; for (v0 = 0; v0 < 17; v0++) { v1 = &Unk_ov23_022577AC->unk_08[v0]; @@ -528,12 +528,12 @@ void ov23_0224B598 (void) ov23_0224B2C8(Unk_ov23_022577AC->fieldSystem); } -int ov23_0224B5C4 (void) +int ov23_0224B5C4(void) { return sizeof(UnkStruct_ov23_022577AC); } -void ov23_0224B5CC (int param0) +void ov23_0224B5CC(int param0) { if (Unk_ov23_022577AC) { Unk_ov23_022577AC->unk_1353[param0] = 0xff; @@ -544,7 +544,7 @@ void ov23_0224B5CC (int param0) } } -void ov23_0224B61C (int param0) +void ov23_0224B61C(int param0) { if (Unk_ov23_022577AC) { ov23_0224C6AC(param0); @@ -553,18 +553,18 @@ void ov23_0224B61C (int param0) } } -static void ov23_0224B654 (int param0) +static void ov23_0224B654(int param0) { sub_02059514(); } -static int ov23_0224B65C (int param0, int param1) +static int ov23_0224B65C(int param0, int param1) { int v0; for (v0 = 0; v0 < (7 + 1); v0++) { - UnkStruct_ov23_0224B144 * v1 = &Unk_ov23_022577AC->unk_08[v0]; - UnkStruct_02029894 * v2 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_08[v0].unk_02; + UnkStruct_ov23_0224B144 *v1 = &Unk_ov23_022577AC->unk_08[v0]; + UnkStruct_02029894 *v2 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_08[v0].unk_02; if (!sub_0202988C(v2)) { continue; @@ -582,9 +582,9 @@ static int ov23_0224B65C (int param0, int param1) return 0xff; } -void ov23_0224B6AC (int param0, int param1, void * param2, void * param3) +void ov23_0224B6AC(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_0224B6AC * v0 = param2; + UnkStruct_ov23_0224B6AC *v0 = param2; if (v0->unk_04 != CommSys_CurNetId()) { return; @@ -601,9 +601,9 @@ void ov23_0224B6AC (int param0, int param1, void * param2, void * param3) } } -void ov23_0224B700 (int param0, int param1, void * param2, void * param3) +void ov23_0224B700(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; if (CommSys_CurNetId() == v0[0]) { sub_020594FC(); @@ -613,14 +613,14 @@ void ov23_0224B700 (int param0, int param1, void * param2, void * param3) } } -int ov23_0224B72C (void) +int ov23_0224B72C(void) { return sizeof(UnkStruct_ov23_0224B6AC); } -void ov23_0224B730 (int param0, int param1, void * param2, void * param3) +void ov23_0224B730(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_0224B730 * v0 = param2; + UnkStruct_ov23_0224B730 *v0 = param2; u8 v1 = param0; if (CommSys_CurNetId() != 0) { @@ -642,17 +642,17 @@ void ov23_0224B730 (int param0, int param1, void * param2, void * param3) } } -int ov23_0224B798 (void) +int ov23_0224B798(void) { return sizeof(UnkStruct_ov23_0224B730); } -static BOOL ov23_0224B79C (int param0, int param1) +static BOOL ov23_0224B79C(int param0, int param1) { UnkStruct_ov23_0224B098 v0; int v1; - UnkStruct_ov23_0224B144 * v2 = &Unk_ov23_022577AC->unk_08[param0]; - UnkStruct_02029894 * v3 = (UnkStruct_02029894 *)v2->unk_02; + UnkStruct_ov23_0224B144 *v2 = &Unk_ov23_022577AC->unk_08[param0]; + UnkStruct_02029894 *v3 = (UnkStruct_02029894 *)v2->unk_02; if (!sub_0202988C(v3)) { return 0; @@ -682,13 +682,13 @@ static BOOL ov23_0224B79C (int param0, int param1) return 1; } -static void ov23_0224B844 (int param0, int param1, BOOL param2) +static void ov23_0224B844(int param0, int param1, BOOL param2) { UnkStruct_ov23_0224B844 v0; UnkStruct_ov23_0224B098 v1; int v2, v3, v4; - UnkStruct_ov23_0224B144 * v5 = &Unk_ov23_022577AC->unk_08[param0]; - UnkStruct_02029894 * v6 = (UnkStruct_02029894 *)v5->unk_02; + UnkStruct_ov23_0224B144 *v5 = &Unk_ov23_022577AC->unk_08[param0]; + UnkStruct_02029894 *v6 = (UnkStruct_02029894 *)v5->unk_02; ov23_0224B0DC(param0, &v1); Unk_ov23_022577AC->unk_135B[param1] = param0; @@ -718,7 +718,7 @@ static void ov23_0224B844 (int param0, int param1, BOOL param2) sub_02059058(param1, 0); } -BOOL ov23_0224B8E0 (int param0, int param1, int param2) +BOOL ov23_0224B8E0(int param0, int param1, int param2) { int v0; UnkStruct_ov23_0224B844 v1; @@ -761,8 +761,8 @@ BOOL ov23_0224B8E0 (int param0, int param1, int param2) } for (v0 = 0; v0 <= (7 + 1); v0++) { - UnkStruct_ov23_0224B144 * v6 = &Unk_ov23_022577AC->unk_08[v0]; - UnkStruct_02029894 * v7 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_08[v0].unk_02; + UnkStruct_ov23_0224B144 *v6 = &Unk_ov23_022577AC->unk_08[v0]; + UnkStruct_02029894 *v7 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_08[v0].unk_02; if (!sub_0202988C(v7)) { continue; @@ -804,9 +804,9 @@ BOOL ov23_0224B8E0 (int param0, int param1, int param2) return 0; } -static void ov23_0224BA48 (SysTask * param0, void * param1) +static void ov23_0224BA48(SysTask *param0, void *param1) { - UnkStruct_ov23_0224BA48 * v0 = param1; + UnkStruct_ov23_0224BA48 *v0 = param1; if (v0->unk_04) { sub_02002154(v0->unk_04, 4); @@ -818,9 +818,9 @@ static void ov23_0224BA48 (SysTask * param0, void * param1) ov23_02243204(); } -static void ov23_0224BA6C (SysTask * param0, void * param1) +static void ov23_0224BA6C(SysTask *param0, void *param1) { - UnkStruct_ov23_0224BA48 * v0 = param1; + UnkStruct_ov23_0224BA48 *v0 = param1; UnkStruct_ov23_0224B730 v1; if (v0->unk_04) { @@ -839,10 +839,10 @@ static void ov23_0224BA6C (SysTask * param0, void * param1) ov23_0224DC24(); } -static void ov23_0224BAAC (SysTask * param0, void * param1) +static void ov23_0224BAAC(SysTask *param0, void *param1) { - UnkStruct_ov23_0224BA48 * v0 = param1; - FieldSystem * fieldSystem = v0->fieldSystem; + UnkStruct_ov23_0224BA48 *v0 = param1; + FieldSystem *fieldSystem = v0->fieldSystem; Location v2; int v3 = 0, v4 = 0, v5, v6, v7 = 0; UnkStruct_ov23_0224B730 v8; @@ -937,9 +937,9 @@ static void ov23_0224BAAC (SysTask * param0, void * param1) } } -static void ov23_0224BC5C (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4, int param5) +static void ov23_0224BC5C(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, int param5) { - UnkStruct_ov23_0224BA48 * v0 = NULL; + UnkStruct_ov23_0224BA48 *v0 = NULL; ov23_0224DC08(); v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov23_0224BA48)); @@ -959,9 +959,9 @@ static void ov23_0224BC5C (FieldSystem * fieldSystem, int param1, int param2, in sub_020594FC(); } -static UnkStruct_ov23_0224BA48 * ov23_0224BCC4 (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4, int param5) +static UnkStruct_ov23_0224BA48 *ov23_0224BCC4(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, int param5) { - UnkStruct_ov23_0224BA48 * v0 = NULL; + UnkStruct_ov23_0224BA48 *v0 = NULL; if (fieldSystem->unk_10 == NULL) { v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov23_0224BA48)); @@ -982,7 +982,7 @@ static UnkStruct_ov23_0224BA48 * ov23_0224BCC4 (FieldSystem * fieldSystem, int p return v0; } -static int ov23_0224BD1C (int param0, BOOL param1) +static int ov23_0224BD1C(int param0, BOOL param1) { int v0, v1 = 0, v2, v3, v4; @@ -1013,11 +1013,11 @@ static int ov23_0224BD1C (int param0, BOOL param1) return v1; } -static UIControlData * ov23_0224BD90 (BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u32 param4) +static UIControlData *ov23_0224BD90(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4) { UnkStruct_02081CF4 v0; - MessageLoader * v1 = ov23_02253E3C(ov23_0224219C()); - ResourceMetadata * v2; + MessageLoader *v1 = ov23_02253E3C(ov23_0224219C()); + ResourceMetadata *v2; v2 = sub_02013A04(2, param4); @@ -1039,10 +1039,10 @@ static UIControlData * ov23_0224BD90 (BGL * param0, const UnkStruct_ov61_0222C88 return sub_02001B7C(&v0, 8, 0, 0, param4, PAD_BUTTON_B); } -static void ov23_0224BE28 (SysTask * param0, void * param1) +static void ov23_0224BE28(SysTask *param0, void *param1) { - UnkStruct_ov23_0224BA48 * v0 = param1; - FieldSystem * fieldSystem = v0->fieldSystem; + UnkStruct_ov23_0224BA48 *v0 = param1; + FieldSystem *fieldSystem = v0->fieldSystem; Location v2; int v3 = 0, v4 = 0, v5, v6, v7 = 0; UnkStruct_ov23_0224B730 v8; @@ -1170,9 +1170,9 @@ static void ov23_0224BE28 (SysTask * param0, void * param1) } } -static void ov23_0224C090 (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4, int param5) +static void ov23_0224C090(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, int param5) { - UnkStruct_ov23_0224BA48 * v0 = NULL; + UnkStruct_ov23_0224BA48 *v0 = NULL; v0 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov23_0224BA48)); MI_CpuClear8(v0, sizeof(UnkStruct_ov23_0224BA48)); @@ -1194,14 +1194,14 @@ static void ov23_0224C090 (FieldSystem * fieldSystem, int param1, int param2, in sub_020594FC(); } -int ov23_0224C100 (void) +int ov23_0224C100(void) { return sizeof(UnkStruct_ov23_0224B844); } -void ov23_0224C104 (int param0, int param1, void * param2, void * param3) +void ov23_0224C104(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_0224B844 * v0 = param2; + UnkStruct_ov23_0224B844 *v0 = param2; Unk_ov23_022577AC->unk_1353[v0->unk_04] = 0xff; @@ -1223,18 +1223,18 @@ void ov23_0224C104 (int param0, int param1, void * param2, void * param3) } } -void ov23_0224C198 (void) +void ov23_0224C198(void) { Link_Message(56); } -void ov23_0224C1A4 (int param0, int param1, void * param2, void * param3) +void ov23_0224C1A4(int param0, int param1, void *param2, void *param3) { Unk_ov23_022577AC->unk_135B[param0] = 0xff; Unk_ov23_022577AC->unk_1363[param0] = 0xff; } -BOOL ov23_0224C1C8 (int param0) +BOOL ov23_0224C1C8(int param0) { if (Unk_ov23_022577AC) { if (Unk_ov23_022577AC->unk_135B[param0] != 0xff) { @@ -1245,21 +1245,21 @@ BOOL ov23_0224C1C8 (int param0) return 0; } -static void ov23_0224C1EC (int param0, int param1, int param2, int param3) +static void ov23_0224C1EC(int param0, int param1, int param2, int param3) { - UnkStruct_ov23_0224B144 * v0 = &Unk_ov23_022577AC->unk_08[param3]; + UnkStruct_ov23_0224B144 *v0 = &Unk_ov23_022577AC->unk_08[param3]; if (v0) { - UnkStruct_02029894 * v1 = (UnkStruct_02029894 *)v0->unk_02; + UnkStruct_02029894 *v1 = (UnkStruct_02029894 *)v0->unk_02; sub_02029854(v1, param0, param1, CommPlayer_GetOppositeDir(param2)); v0->unk_00 = param3; } } -void ov23_0224C21C (void) +void ov23_0224C21C(void) { - UnkStruct_02029894 * v0 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_08[16].unk_02; + UnkStruct_02029894 *v0 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_08[16].unk_02; int v1; u8 v2 = 0; int v3 = CommSys_CurNetId(); @@ -1267,16 +1267,16 @@ void ov23_0224C21C (void) CommSys_WriteToQueue(53, &Unk_ov23_022577AC->unk_08[16], sizeof(UnkStruct_ov23_0224B144)); } -void ov23_0224C23C (int param0) +void ov23_0224C23C(int param0) { CommSys_WriteToQueueServer(54, &Unk_ov23_022577AC->unk_08[param0], sizeof(UnkStruct_ov23_0224B144)); } -void ov23_0224C25C (int param0, int param1, void * param2, void * param3) +void ov23_0224C25C(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; - UnkStruct_ov23_0224B144 * v1 = param2; - UnkStruct_02029894 * v2; + u8 *v0 = param2; + UnkStruct_ov23_0224B144 *v1 = param2; + UnkStruct_02029894 *v2; UnkStruct_ov23_0224B098 v3; int v4, v5; @@ -1330,11 +1330,11 @@ void ov23_0224C25C (int param0, int param1, void * param2, void * param3) } } -void ov23_0224C384 (int param0, int param1, void * param2, void * param3) +void ov23_0224C384(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; - UnkStruct_ov23_0224B144 * v1; - UnkStruct_02029894 * v2; + u8 *v0 = param2; + UnkStruct_ov23_0224B144 *v1; + UnkStruct_02029894 *v2; if (!Unk_ov23_022577AC) { return; @@ -1357,29 +1357,29 @@ void ov23_0224C384 (int param0, int param1, void * param2, void * param3) ov23_0224DAD0(param0); } -int ov23_0224C41C (void) +int ov23_0224C41C(void) { return sizeof(UnkStruct_ov23_0224B144); } -BOOL ov23_0224C420 (void) +BOOL ov23_0224C420(void) { return Unk_ov23_022577AC->unk_13D3; } -void ov23_0224C434 (void) +void ov23_0224C434(void) { Unk_ov23_022577AC->unk_13D3 = 0; } -static void ov23_0224C448 (void) +static void ov23_0224C448(void) { int v0, v1; v1 = 0; for (v0 = 0; v0 < (7 + 1); v0++) { - UnkStruct_ov23_0224B098 * v2 = &Unk_ov23_022577AC->unk_12AC[v0]; + UnkStruct_ov23_0224B098 *v2 = &Unk_ov23_022577AC->unk_12AC[v0]; Unk_ov23_022577AC->unk_137B[v1] = v2->unk_00 & 0xff; v1++; @@ -1394,12 +1394,12 @@ static void ov23_0224C448 (void) CommSys_WriteToQueueServer(55, &Unk_ov23_022577AC->unk_137B, sizeof(Unk_ov23_022577AC->unk_137B)); } -void ov23_0224C4CC (int param0, int param1, void * param2, void * param3) +void ov23_0224C4CC(int param0, int param1, void *param2, void *param3) { - u8 * v0 = (u8 *)param2; + u8 *v0 = (u8 *)param2; UnkStruct_ov23_0224B098 v1; - UnkStruct_ov23_0224B098 * v2; - UnkStruct_ov23_0224B098 * v3; + UnkStruct_ov23_0224B098 *v2; + UnkStruct_ov23_0224B098 *v3; int v4, v5; if (!Unk_ov23_022577AC) { @@ -1434,12 +1434,12 @@ void ov23_0224C4CC (int param0, int param1, void * param2, void * param3) Unk_ov23_022577AC->unk_13D3 = 1; } -int ov23_0224C584 (void) +int ov23_0224C584(void) { return sizeof(Unk_ov23_022577AC->unk_137B); } -static void ov23_0224C588 (int param0, int param1, int param2, int param3) +static void ov23_0224C588(int param0, int param1, int param2, int param3) { VecFx32 v0; int v1, v2; @@ -1449,7 +1449,7 @@ static void ov23_0224C588 (int param0, int param1, int param2, int param3) Unk_ov23_022577AC->unk_1308[param3] = param1; } -static void ov23_0224C5B4 (SysTask * param0, void * param1) +static void ov23_0224C5B4(SysTask *param0, void *param1) { int v0, v1, v2, v3, v4, v5; @@ -1502,7 +1502,7 @@ static void ov23_0224C5B4 (SysTask * param0, void * param1) } } -static void ov23_0224C6AC (int param0) +static void ov23_0224C6AC(int param0) { if (Unk_ov23_022577AC->unk_12D5[param0] != 0xff) { ov5_021E1674(Unk_ov23_022577AC->unk_12D5[param0], Unk_ov23_022577AC->fieldSystem->unk_A4); @@ -1512,7 +1512,7 @@ static void ov23_0224C6AC (int param0) } } -static void ov23_0224C6E8 (void) +static void ov23_0224C6E8(void) { int v0; @@ -1525,10 +1525,10 @@ static void ov23_0224C6E8 (void) } } -static BOOL ov23_0224C708 (TaskManager * param0) +static BOOL ov23_0224C708(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov23_0224BA48 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov23_0224BA48 *v1 = TaskManager_Environment(param0); switch (v1->unk_10) { case 0: @@ -1546,10 +1546,10 @@ static BOOL ov23_0224C708 (TaskManager * param0) return 0; } -static BOOL ov23_0224C74C (TaskManager * param0) +static BOOL ov23_0224C74C(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov23_0224BA48 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov23_0224BA48 *v1 = TaskManager_Environment(param0); switch (v1->unk_10) { case 0: @@ -1567,10 +1567,10 @@ static BOOL ov23_0224C74C (TaskManager * param0) return 0; } -static BOOL ov23_0224C790 (TaskManager * param0) +static BOOL ov23_0224C790(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov23_0224BA48 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov23_0224BA48 *v1 = TaskManager_Environment(param0); Location v2; int v3 = 0, v4 = 0; @@ -1733,9 +1733,9 @@ static BOOL ov23_0224C790 (TaskManager * param0) return 0; } -static void ov23_0224CAF0 (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4, BOOL param5) +static void ov23_0224CAF0(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, BOOL param5) { - UnkStruct_ov23_0224BA48 * v0 = ov23_0224BCC4(fieldSystem, param1, param2, param3, param4, param4); + UnkStruct_ov23_0224BA48 *v0 = ov23_0224BCC4(fieldSystem, param1, param2, param3, param4, param4); if (v0) { v0->unk_2D = param5; @@ -1743,10 +1743,10 @@ static void ov23_0224CAF0 (FieldSystem * fieldSystem, int param1, int param2, in } } -static void ov23_0224CB1C (SysTask * param0, void * param1) +static void ov23_0224CB1C(SysTask *param0, void *param1) { - UnkStruct_ov23_0224CB1C * v0 = param1; - FieldSystem * fieldSystem = v0->fieldSystem; + UnkStruct_ov23_0224CB1C *v0 = param1; + FieldSystem *fieldSystem = v0->fieldSystem; Location v2; u32 v3; BOOL v4 = 0; @@ -1754,9 +1754,8 @@ static void ov23_0224CB1C (SysTask * param0, void * param1) int v6, v7, v8; switch (v0->unk_0C) { - case 0: - { - UnkStruct_02029894 * v9 = sub_02029894(fieldSystem->saveData); + case 0: { + UnkStruct_02029894 *v9 = sub_02029894(fieldSystem->saveData); v0->unk_12 = sub_0202988C(v9); } @@ -1779,8 +1778,7 @@ static void ov23_0224CB1C (SysTask * param0, void * param1) } } break; - case 2: - { + case 2: { v6 = sub_02058D88(CommSys_CurNetId()); v7 = sub_02058DC0(CommSys_CurNetId()); v8 = CommPlayer_GetOppositeDir(PlayerAvatar_GetDir(fieldSystem->playerAvatar)); @@ -1790,8 +1788,7 @@ static void ov23_0224CB1C (SysTask * param0, void * param1) ov5_021F5634(fieldSystem, v6, 0, v7); v0->unk_0C = 3; - } - break; + } break; case 3: if (ov23_02254238(ov23_0224219C()) == 0) { if (ov23_0224BD1C(CommSys_CurNetId(), 0)) { @@ -1877,20 +1874,20 @@ static void ov23_0224CB1C (SysTask * param0, void * param1) } } -void ov23_0224CD68 (void) +void ov23_0224CD68(void) { u8 v0 = 0; CommSys_SendDataFixedSize(86, &v0); } -int ov23_0224CD7C (void) +int ov23_0224CD7C(void) { return sizeof(UnkStruct_ov23_0224CF18); } -void ov23_0224CD80 (int param0, int param1, void * param2, void * param3) +void ov23_0224CD80(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; int v1 = CommPlayer_AddXServer(param0); int v2 = CommPlayer_AddZServer(param0); int v3, v4, v5, v6; @@ -1950,9 +1947,9 @@ void ov23_0224CD80 (int param0, int param1, void * param2, void * param3) sub_02035B48(87, &v8); } -static void ov23_0224CE94 (SysTask * param0, void * param1) +static void ov23_0224CE94(SysTask *param0, void *param1) { - UnkStruct_ov23_0224CB1C * v0 = param1; + UnkStruct_ov23_0224CB1C *v0 = param1; ov23_0224C6AC(16); @@ -1968,9 +1965,9 @@ static void ov23_0224CE94 (SysTask * param0, void * param1) ov23_0224DC24(); } -static void ov23_0224CEC8 (void) +static void ov23_0224CEC8(void) { - UnkStruct_ov23_0224CB1C * v0; + UnkStruct_ov23_0224CB1C *v0; ov23_0224DC08(); @@ -1985,10 +1982,10 @@ static void ov23_0224CEC8 (void) ov23_022431EC(v0, v0->unk_04, ov23_0224CE94); } -void ov23_0224CF18 (int param0, int param1, void * param2, void * param3) +void ov23_0224CF18(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_0224CF18 * v0 = param2; - SecretBaseRecord * v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_022577AC->fieldSystem)); + UnkStruct_ov23_0224CF18 *v0 = param2; + SecretBaseRecord *v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_022577AC->fieldSystem)); if (v0->unk_00 != CommSys_CurNetId()) { return; @@ -2023,7 +2020,7 @@ void ov23_0224CF18 (int param0, int param1, void * param2, void * param3) } if ((v0->unk_01 == 3) || (v0->unk_01 == 4)) { - void * v6 = sub_0202BE20(11); + void *v6 = sub_0202BE20(11); sub_0202B758(Unk_ov23_022577AC->fieldSystem->unk_9C, v6, 1); sub_0202CFEC(sub_0202CD88(Unk_ov23_022577AC->fieldSystem->saveData), 35); @@ -2031,11 +2028,11 @@ void ov23_0224CF18 (int param0, int param1, void * param2, void * param3) } } -BOOL ov23_0224D020 (Strbuf *param0) +BOOL ov23_0224D020(Strbuf *param0) { int v0, v1; - TrainerInfo * v2; - TrainerInfo * v3; + TrainerInfo *v2; + TrainerInfo *v3; if (!Unk_ov23_022577AC) { return 0; @@ -2092,7 +2089,7 @@ BOOL ov23_0224D020 (Strbuf *param0) return 0; } -UnkStruct_02029894 * ov23_0224D130 (SaveData * param0) +UnkStruct_02029894 *ov23_0224D130(SaveData *param0) { if (Unk_ov23_022577AC) { if (Unk_ov23_022577AC->unk_A00) { @@ -2103,7 +2100,7 @@ UnkStruct_02029894 * ov23_0224D130 (SaveData * param0) return NULL; } -int ov23_0224D150 (void) +int ov23_0224D150(void) { if (Unk_ov23_022577AC) { if (Unk_ov23_022577AC->unk_A00) { @@ -2114,7 +2111,7 @@ int ov23_0224D150 (void) return 0; } -int ov23_0224D178 (void) +int ov23_0224D178(void) { if (Unk_ov23_022577AC) { if (Unk_ov23_022577AC->unk_A00) { @@ -2125,7 +2122,7 @@ int ov23_0224D178 (void) return 0; } -BOOL ov23_0224D1A0 (int param0, int param1) +BOOL ov23_0224D1A0(int param0, int param1) { int v0, v1, v2; @@ -2156,10 +2153,10 @@ BOOL ov23_0224D1A0 (int param0, int param1) return 1; } -static void ov23_0224D238 (void) +static void ov23_0224D238(void) { - UnkStruct_02029894 * v0 = sub_02029894(FieldSystem_SaveData(Unk_ov23_022577AC->fieldSystem)); - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_022577AC->fieldSystem)); + UnkStruct_02029894 *v0 = sub_02029894(FieldSystem_SaveData(Unk_ov23_022577AC->fieldSystem)); + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_022577AC->fieldSystem)); int v2 = CommPlayer_AddXServer(0); int v3 = CommPlayer_AddZServer(0); int v4 = CommPlayer_DirServer(0); @@ -2213,30 +2210,30 @@ static void ov23_0224D238 (void) ov23_0224B39C(v0, Unk_ov23_022577AC->unk_A04[16]); } -int ov23_0224D39C (int param0) +int ov23_0224D39C(int param0) { return ov23_02253F40(ov23_022421CC(), param0, 0, NULL); } -void ov23_0224D3B0 (void) +void ov23_0224D3B0(void) { ov23_02254044(ov23_022421CC()); } -void ov23_0224D3BC (int param0) +void ov23_0224D3BC(int param0) { ov23_022541C8(ov23_022421CC(), 0, param0); } -void ov23_0224D3D0 (int param0, int param1) +void ov23_0224D3D0(int param0, int param1) { ov23_02254154(ov23_022421CC(), param1, param0); } -static int ov23_0224D3E4 (UnkStruct_02029894 * param0, int param1, int param2) +static int ov23_0224D3E4(UnkStruct_02029894 *param0, int param1, int param2) { int v0, v1, v2; - const u8 * v3; + const u8 *v3; for (v0 = 0; v0 < (15 + 16 + 1); v0++) { int v4 = sub_020293B0(param0, v0); @@ -2275,12 +2272,12 @@ static int ov23_0224D3E4 (UnkStruct_02029894 * param0, int param1, int param2) return 0; } -BOOL ov23_0224D454 (int param0, UnkStruct_ov23_0224271C * param1) +BOOL ov23_0224D454(int param0, UnkStruct_ov23_0224271C *param1) { int v0 = param1->unk_00; int v1 = param1->unk_02; int v2, v3, v4; - UnkStruct_02029894 * v5; + UnkStruct_02029894 *v5; if (ov23_0224D1A0(v0, v1) == 0) { u8 v6[2]; @@ -2304,47 +2301,47 @@ BOOL ov23_0224D454 (int param0, UnkStruct_ov23_0224271C * param1) return 0; } -void ov23_0224D4CC (int param0, int param1, void * param2, void * param3) +void ov23_0224D4CC(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; - UnkStruct_02029894 * v1 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_A00->unk_02; - SecretBaseRecord * v2 = sub_020298AC(v1); + u8 *v0 = param2; + UnkStruct_02029894 *v1 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_A00->unk_02; + SecretBaseRecord *v2 = sub_020298AC(v1); if (v0[0] == CommSys_CurNetId()) { ov23_02253A00(v2, v0[1]); } } -int ov23_0224D4FC (void) +int ov23_0224D4FC(void) { return 2; } -void ov23_0224D500 (int param0, int param1) +void ov23_0224D500(int param0, int param1) { if (Unk_ov23_022577AC) { Unk_ov23_022577AC->unk_133B[param0] = param1; } } -void ov23_0224D518 (int param0, int param1) +void ov23_0224D518(int param0, int param1) { if (Unk_ov23_022577AC) { Unk_ov23_022577AC->unk_1343[param0] = param1; } } -void ov23_0224D530 (int param0) +void ov23_0224D530(int param0) { if (Unk_ov23_022577AC) { Unk_ov23_022577AC->unk_134B[param0] = 1; } } -static void ov23_0224D54C (UnkStruct_ov23_0224D54C * param0) +static void ov23_0224D54C(UnkStruct_ov23_0224D54C *param0) { VecFx32 v0; - UnkStruct_ov5_021E1890 * v1 = ov5_021E18C4(Unk_ov23_022577AC->fieldSystem->unk_A4, 0); + UnkStruct_ov5_021E1890 *v1 = ov5_021E18C4(Unk_ov23_022577AC->fieldSystem->unk_A4, 0); v0 = ov5_021E1894(v1); @@ -2352,15 +2349,15 @@ static void ov23_0224D54C (UnkStruct_ov23_0224D54C * param0) ov5_021E19CC(Unk_ov23_022577AC->fieldSystem->unk_A4, Unk_ov23_022577AC->fieldSystem->unk_30, 317 + param0->unk_05, &v0, NULL, Unk_ov23_022577AC->fieldSystem->unk_50); } -static void ov23_0224D5A8 (SysTask * param0, void * param1) +static void ov23_0224D5A8(SysTask *param0, void *param1) { Heap_FreeToHeap(param1); SysTask_Done(param0); } -static void ov23_0224D5BC (SysTask * param0, void * param1) +static void ov23_0224D5BC(SysTask *param0, void *param1) { - UnkStruct_ov23_0224D54C * v0 = param1; + UnkStruct_ov23_0224D54C *v0 = param1; switch (v0->unk_00) { case 0: @@ -2400,10 +2397,10 @@ static void ov23_0224D5BC (SysTask * param0, void * param1) } } -void ov23_0224D698 (int param0, int param1, void * param2, void * param3) +void ov23_0224D698(int param0, int param1, void *param2, void *param3) { u8 v0[2]; - u8 * v1 = param2; + u8 *v1 = param2; v0[0] = param0; v0[1] = v1[0]; @@ -2411,14 +2408,14 @@ void ov23_0224D698 (int param0, int param1, void * param2, void * param3) sub_02035B48(97, v0); } -void ov23_0224D6AC (int param0, int param1, void * param2, void * param3) +void ov23_0224D6AC(int param0, int param1, void *param2, void *param3) { int v0; - u8 * v1 = param2; - SysTask * v2; + u8 *v1 = param2; + SysTask *v2; if (v1[0] == CommSys_CurNetId()) { - UnkStruct_ov23_0224D54C * v3 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov23_0224D54C)); + UnkStruct_ov23_0224D54C *v3 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov23_0224D54C)); MI_CpuClear8(v3, sizeof(v3)); @@ -2432,15 +2429,15 @@ void ov23_0224D6AC (int param0, int param1, void * param2, void * param3) } } -int ov23_0224D6F4 (void) +int ov23_0224D6F4(void) { return 2; } -static int ov23_0224D6F8 (UnkStruct_02029894 * param0, int param1, int param2) +static int ov23_0224D6F8(UnkStruct_02029894 *param0, int param1, int param2) { int v0, v1, v2; - const u8 * v3; + const u8 *v3; for (v0 = 0; v0 < (15 + 16 + 1); v0++) { int v4 = sub_020293B0(param0, v0); @@ -2470,7 +2467,7 @@ static int ov23_0224D6F8 (UnkStruct_02029894 * param0, int param1, int param2) return 0; } -static int ov23_0224D750 (int param0) +static int ov23_0224D750(int param0) { switch (param0) { case 56: @@ -2510,11 +2507,11 @@ static int ov23_0224D750 (int param0) return 0; } -BOOL ov23_0224D7C8 (int param0) +BOOL ov23_0224D7C8(int param0) { int v0; int v1; - UnkStruct_02029894 * v2; + UnkStruct_02029894 *v2; int v3 = CommPlayer_GetXServer(param0); int v4 = CommPlayer_GetZServer(param0); int v5 = CommPlayer_DirServer(param0); @@ -2545,7 +2542,7 @@ BOOL ov23_0224D7C8 (int param0) return 0; } -BOOL ov23_0224D87C (int param0) +BOOL ov23_0224D87C(int param0) { BOOL v0 = 0; @@ -2558,7 +2555,7 @@ BOOL ov23_0224D87C (int param0) return v0; } -void Underground_SecretBaseRemovePlayer (int param0) +void Underground_SecretBaseRemovePlayer(int param0) { int v0, v1 = 0; int v2, v3; @@ -2619,12 +2616,12 @@ void Underground_SecretBaseRemovePlayer (int param0) } } -BOOL ov23_0224D9AC (int param0, BOOL param1) +BOOL ov23_0224D9AC(int param0, BOOL param1) { UnkStruct_ov23_0224B844 v0; UnkStruct_ov23_0224B098 v1; int v2, v3, v4, v5; - UnkStruct_ov23_0224B098 * v6; + UnkStruct_ov23_0224B098 *v6; if (Unk_ov23_022577AC->unk_1353[param0] == 0xff) { return 0; @@ -2665,7 +2662,7 @@ BOOL ov23_0224D9AC (int param0, BOOL param1) return 1; } -void ov23_0224DA8C (void) +void ov23_0224DA8C(void) { if (Unk_ov23_022577AC->unk_12D4 == 1) { Unk_ov23_022577AC->unk_12D4 = 2; @@ -2674,14 +2671,14 @@ void ov23_0224DA8C (void) } } -void ov23_0224DAB4 (void) +void ov23_0224DAB4(void) { if (Unk_ov23_022577AC->unk_12D4 == 5) { Unk_ov23_022577AC->unk_12D4 = 4; } } -void ov23_0224DAD0 (int param0) +void ov23_0224DAD0(int param0) { int v0, v1, v2, v3 = param0; UnkStruct_ov23_0224B730 v4; @@ -2706,7 +2703,7 @@ void ov23_0224DAD0 (int param0) } } -int ov23_0224DB48 (void) +int ov23_0224DB48(void) { if (Unk_ov23_022577AC) { return Unk_ov23_022577AC->unk_13CC; @@ -2715,7 +2712,7 @@ int ov23_0224DB48 (void) return 72; } -int ov23_0224DB64 (void) +int ov23_0224DB64(void) { if (Unk_ov23_022577AC) { return Unk_ov23_022577AC->unk_13CE; @@ -2724,7 +2721,7 @@ int ov23_0224DB64 (void) return 437; } -int ov23_0224DB84 (void) +int ov23_0224DB84(void) { if (Unk_ov23_022577AC) { return Unk_ov23_022577AC->unk_13D0; @@ -2733,33 +2730,33 @@ int ov23_0224DB84 (void) return 1; } -void ov23_0224DBA0 (int param0, int param1) +void ov23_0224DBA0(int param0, int param1) { if (Unk_ov23_022577AC) { Unk_ov23_022577AC->unk_139C[param0] = param1; } } -void ov23_0224DBBC (int param0, int param1) +void ov23_0224DBBC(int param0, int param1) { if (Unk_ov23_022577AC) { Unk_ov23_022577AC->unk_13AC[param0] = param1; } } -void ov23_0224DBD8 (int param0, int param1) +void ov23_0224DBD8(int param0, int param1) { if (Unk_ov23_022577AC) { Unk_ov23_022577AC->unk_13BC[param0] = param1; } } -void ov23_0224DBF4 (BOOL param0) +void ov23_0224DBF4(BOOL param0) { Unk_ov23_022577AC->unk_13D5 = param0; } -static void ov23_0224DC08 (void) +static void ov23_0224DC08(void) { sub_02032174(1); sub_02032138(1); @@ -2767,7 +2764,7 @@ static void ov23_0224DC08 (void) sub_020340FC(); } -static void ov23_0224DC24 (void) +static void ov23_0224DC24(void) { sub_02032174(0); sub_02032138(0); diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c index 4a842564a5..ca0699b2f2 100644 --- a/src/overlay023/ov23_0224DC40.c +++ b/src/overlay023/ov23_0224DC40.c @@ -1,48 +1,46 @@ +#include "overlay023/ov23_0224DC40.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" -#include "sys_task_manager.h" -#include "trainer_info.h" - #include "struct_defs/struct_02013A04_t.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system.h" #include "overlay023/funcptr_ov23_0224DCB8.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_0224F294.h" +#include "overlay023/ov23_02253598.h" +#include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_02250CD4.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_system.h" +#include "heap.h" +#include "message.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02005474.h" -#include "message.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "trainer_info.h" #include "unk_0202854C.h" #include "unk_0202CD50.h" -#include "communication_information.h" -#include "communication_system.h" -#include "field_system.h" -#include "vars_flags.h" #include "unk_020573FC.h" -#include "comm_player_manager.h" #include "unk_0206AFE0.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_0224DC40.h" -#include "overlay023/ov23_0224F294.h" -#include "overlay023/ov23_02253598.h" -#include "overlay023/ov23_02253D40.h" +#include "vars_flags.h" typedef struct { u8 unk_00; @@ -62,13 +60,13 @@ typedef struct { } UnkStruct_ov23_0224F184; typedef struct { - SysTask * unk_00; - UnkStruct_ov23_02250CD4 * unk_04; - FieldSystem * fieldSystem; + SysTask *unk_00; + UnkStruct_ov23_02250CD4 *unk_04; + FieldSystem *fieldSystem; Window unk_0C; - ResourceMetadata * unk_1C; - BmpList * unk_20; - UIControlData * unk_24; + ResourceMetadata *unk_1C; + BmpList *unk_20; + UIControlData *unk_24; UnkStruct_ov23_0224F184 unk_28; UnkFuncPtr_ov23_0224DCB8 unk_2C; u16 unk_30; @@ -82,15 +80,15 @@ typedef struct { u16 unk_3A; } UnkStruct_ov23_0224E280; -typedef void (* UnkFuncPtr_ov23_0224E1E0)(UnkStruct_ov23_0224E280 *); +typedef void (*UnkFuncPtr_ov23_0224E1E0)(UnkStruct_ov23_0224E280 *); typedef struct { - SysTask * unk_00; - FieldSystem * fieldSystem; + SysTask *unk_00; + FieldSystem *fieldSystem; Window unk_08; - ResourceMetadata * unk_18; - BmpList * unk_1C; - UIControlData * unk_20; + ResourceMetadata *unk_18; + BmpList *unk_1C; + UIControlData *unk_20; UnkStruct_ov23_0224F184 unk_24; UnkFuncPtr_ov23_0224DCB8 unk_28; u16 unk_2C; @@ -105,27 +103,27 @@ typedef struct { u16 unk_36; } UnkStruct_ov23_022577B0; -static void ov23_0224E2D8(SysTask * param0, void * param1); -static BOOL ov23_0224E1E0(SysTask * param0, void * param1); -static void ov23_0224E244(SysTask * param0, UnkStruct_ov23_0224E280 * param1); -static void ov23_0224E280(UnkStruct_ov23_0224E280 * param0); -static void ov23_0224E29C(UnkStruct_ov23_0224E280 * param0); -static void ov23_0224E2B0(UnkStruct_ov23_0224E280 * param0); -static void ov23_0224E8E0(UnkStruct_ov23_0224E280 * param0); -static void ov23_0224EA08(SysTask * param0, UnkStruct_ov23_022577B0 * param1); -static void ov23_0224F270(UnkStruct_ov23_0224E280 * param0); +static void ov23_0224E2D8(SysTask *param0, void *param1); +static BOOL ov23_0224E1E0(SysTask *param0, void *param1); +static void ov23_0224E244(SysTask *param0, UnkStruct_ov23_0224E280 *param1); +static void ov23_0224E280(UnkStruct_ov23_0224E280 *param0); +static void ov23_0224E29C(UnkStruct_ov23_0224E280 *param0); +static void ov23_0224E2B0(UnkStruct_ov23_0224E280 *param0); +static void ov23_0224E8E0(UnkStruct_ov23_0224E280 *param0); +static void ov23_0224EA08(SysTask *param0, UnkStruct_ov23_022577B0 *param1); +static void ov23_0224F270(UnkStruct_ov23_0224E280 *param0); -static UnkStruct_ov23_0224E280 * Unk_ov23_022577B4 = NULL; -static UnkStruct_ov23_022577B0 * Unk_ov23_022577B0 = NULL; +static UnkStruct_ov23_0224E280 *Unk_ov23_022577B4 = NULL; +static UnkStruct_ov23_022577B0 *Unk_ov23_022577B0 = NULL; static const struct { u32 unk_00; u32 unk_04; } Unk_ov23_022568B4[] = { - {0x3, (u32)ov23_0224E280}, - {0x4, (u32)ov23_0224E29C}, - {0x5, (u32)ov23_0224E2B0}, - {0x6, (u32)ov23_0224E8E0} + { 0x3, (u32)ov23_0224E280 }, + { 0x4, (u32)ov23_0224E29C }, + { 0x5, (u32)ov23_0224E2B0 }, + { 0x6, (u32)ov23_0224E8E0 } }; static const UnkStruct_ov84_02240FA8 Unk_ov23_02256894 = { @@ -160,7 +158,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov23_0225688C = { 0x21F }; -static void ov23_0224DC40 (UnkStruct_ov23_022577B0 * param0, int param1) +static void ov23_0224DC40(UnkStruct_ov23_022577B0 *param0, int param1) { UnkStruct_ov23_0224DC40 v0; @@ -170,7 +168,7 @@ static void ov23_0224DC40 (UnkStruct_ov23_022577B0 * param0, int param1) CommSys_SendDataFixedSize(74, &v0); } -static void ov23_0224DC54 (UnkStruct_ov23_0224E280 * param0, int param1) +static void ov23_0224DC54(UnkStruct_ov23_0224E280 *param0, int param1) { UnkStruct_ov23_0224DC40 v0; @@ -180,12 +178,12 @@ static void ov23_0224DC54 (UnkStruct_ov23_0224E280 * param0, int param1) CommSys_SendDataFixedSize(73, &v0); } -static void ov23_0224DC68 (UnkStruct_ov23_0224E280 * param0, int param1) +static void ov23_0224DC68(UnkStruct_ov23_0224E280 *param0, int param1) { int v0 = param1; if (param1 >= 136) { - TrainerInfo * v1 = CommInfo_TrainerInfo(param0->unk_30); + TrainerInfo *v1 = CommInfo_TrainerInfo(param0->unk_30); if (1 == TrainerInfo_Gender(v1)) { v0 = v0 - 136 + 155; @@ -195,12 +193,12 @@ static void ov23_0224DC68 (UnkStruct_ov23_0224E280 * param0, int param1) ov23_02253F40(ov23_0224219C(), v0, 0, NULL); } -static void ov23_0224DC90 (UnkStruct_ov23_022577B0 * param0, int param1) +static void ov23_0224DC90(UnkStruct_ov23_022577B0 *param0, int param1) { int v0 = param1; if (param1 >= 136) { - TrainerInfo * v1 = CommInfo_TrainerInfo(param0->unk_2C); + TrainerInfo *v1 = CommInfo_TrainerInfo(param0->unk_2C); if (1 == TrainerInfo_Gender(v1)) { v0 = v0 - 136 + 155; @@ -210,9 +208,9 @@ static void ov23_0224DC90 (UnkStruct_ov23_022577B0 * param0, int param1) ov23_02253F40(ov23_0224219C(), v0, 0, NULL); } -void ov23_0224DCB8 (int param0, UnkFuncPtr_ov23_0224DCB8 param1, FieldSystem * fieldSystem) +void ov23_0224DCB8(int param0, UnkFuncPtr_ov23_0224DCB8 param1, FieldSystem *fieldSystem) { - UnkStruct_ov23_0224E280 * v0; + UnkStruct_ov23_0224E280 *v0; UnkStruct_ov84_02240FA8 v1; v0 = Heap_AllocFromHeap(33, sizeof(UnkStruct_ov23_0224E280)); @@ -235,7 +233,7 @@ void ov23_0224DCB8 (int param0, UnkFuncPtr_ov23_0224DCB8 param1, FieldSystem * f v0->unk_00 = SysTask_Start(ov23_0224E2D8, v0, 10000); } -static void ov23_0224DD2C (UnkStruct_ov23_0224E280 * param0) +static void ov23_0224DD2C(UnkStruct_ov23_0224E280 *param0) { UnkStruct_ov84_02240FA8 v0; @@ -245,7 +243,7 @@ static void ov23_0224DD2C (UnkStruct_ov23_0224E280 * param0) Window_Show(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v1; + MessageLoader *v1; int v2; v1 = MessageLoader_Init(0, 26, 634, 4); @@ -271,7 +269,7 @@ static void ov23_0224DD2C (UnkStruct_ov23_0224E280 * param0) sub_020594FC(); } -static void ov23_0224DDE4 (SysTask * param0, UnkStruct_ov23_0224E280 * param1) +static void ov23_0224DDE4(SysTask *param0, UnkStruct_ov23_0224E280 *param1) { if (param1->unk_24) { sub_02002154(param1->unk_24, 4); @@ -296,7 +294,7 @@ static void ov23_0224DDE4 (SysTask * param0, UnkStruct_ov23_0224E280 * param1) Unk_ov23_022577B4 = NULL; } -static void ov23_0224DE3C (UnkStruct_ov23_0224E280 * param0) +static void ov23_0224DE3C(UnkStruct_ov23_0224E280 *param0) { UnkStruct_ov84_02240FA8 v0; @@ -306,7 +304,7 @@ static void ov23_0224DE3C (UnkStruct_ov23_0224E280 * param0) Window_Show(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v1; + MessageLoader *v1; int v2, v3; u8 v4[4]; @@ -316,7 +314,7 @@ static void ov23_0224DE3C (UnkStruct_ov23_0224E280 * param0) u32 v5 = MTRNG_Next() % 12; for (v3 = 0; v3 < v2; v3++) { - if ((v4[v3] == v5)) { + if (v4[v3] == v5) { break; } } @@ -342,9 +340,9 @@ static void ov23_0224DE3C (UnkStruct_ov23_0224E280 * param0) sub_0201A954(¶m0->unk_0C); } -static BOOL ov23_0224DF1C (SysTask * param0, void * param1) +static BOOL ov23_0224DF1C(SysTask *param0, void *param1) { - UnkStruct_ov23_0224E280 * v0 = param1; + UnkStruct_ov23_0224E280 *v0 = param1; u32 v1; u16 v2; @@ -384,7 +382,7 @@ static BOOL ov23_0224DF1C (SysTask * param0, void * param1) return 1; } -static void ov23_0224DFA0 (UnkStruct_ov23_0224E280 * param0) +static void ov23_0224DFA0(UnkStruct_ov23_0224E280 *param0) { UnkStruct_ov84_02240FA8 v0; @@ -394,7 +392,7 @@ static void ov23_0224DFA0 (UnkStruct_ov23_0224E280 * param0) Window_Show(¶m0->unk_0C, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v1; + MessageLoader *v1; int v2; v1 = MessageLoader_Init(0, 26, 632, 4); @@ -418,9 +416,9 @@ static void ov23_0224DFA0 (UnkStruct_ov23_0224E280 * param0) sub_0201A954(¶m0->unk_0C); } -static BOOL ov23_0224E05C (SysTask * param0, void * param1) +static BOOL ov23_0224E05C(SysTask *param0, void *param1) { - UnkStruct_ov23_0224E280 * v0 = param1; + UnkStruct_ov23_0224E280 *v0 = param1; u32 v1; UnkStruct_ov23_0224DF1C v2; @@ -461,7 +459,7 @@ static BOOL ov23_0224E05C (SysTask * param0, void * param1) return 1; } -static void ov23_0224E124 (UnkStruct_ov23_0224E280 * param0) +static void ov23_0224E124(UnkStruct_ov23_0224E280 *param0) { ov23_02254068(ov23_0224219C(), CommInfo_TrainerInfo(param0->unk_30)); ov23_022540F4(ov23_0224219C(), param0->unk_28.unk_02); @@ -472,13 +470,13 @@ static void ov23_0224E124 (UnkStruct_ov23_0224E280 * param0) Sound_PlayEffect(1507); } -static void ov23_0224E17C (UnkStruct_ov23_0224E280 * param0, int param1) +static void ov23_0224E17C(UnkStruct_ov23_0224E280 *param0, int param1) { ov23_022540F4(ov23_0224219C(), param1); ov23_02253F40(ov23_0224219C(), 12, 0, NULL); } -static void ov23_0224E19C (SysTask * param0, UnkStruct_ov23_0224E280 * param1) +static void ov23_0224E19C(SysTask *param0, UnkStruct_ov23_0224E280 *param1) { u32 v0; @@ -500,9 +498,9 @@ static void ov23_0224E19C (SysTask * param0, UnkStruct_ov23_0224E280 * param1) param1->unk_24 = NULL; } -static BOOL ov23_0224E1E0 (SysTask * param0, void * param1) +static BOOL ov23_0224E1E0(SysTask *param0, void *param1) { - UnkStruct_ov23_0224E280 * v0 = param1; + UnkStruct_ov23_0224E280 *v0 = param1; u32 v1; v1 = sub_02001288(v0->unk_20); @@ -534,7 +532,7 @@ static BOOL ov23_0224E1E0 (SysTask * param0, void * param1) return 1; } -static void ov23_0224E244 (SysTask * param0, UnkStruct_ov23_0224E280 * param1) +static void ov23_0224E244(SysTask *param0, UnkStruct_ov23_0224E280 *param1) { if (param1->unk_1C) { Window_Clear(¶m1->unk_0C, 1); @@ -546,7 +544,7 @@ static void ov23_0224E244 (SysTask * param0, UnkStruct_ov23_0224E280 * param1) } } -static void ov23_0224E280 (UnkStruct_ov23_0224E280 * param0) +static void ov23_0224E280(UnkStruct_ov23_0224E280 *param0) { ov23_0224DC54(param0, 5); ov23_0224DC68(param0, 7); @@ -554,33 +552,33 @@ static void ov23_0224E280 (UnkStruct_ov23_0224E280 * param0) param0->unk_37 = 5; } -static void ov23_0224E29C (UnkStruct_ov23_0224E280 * param0) +static void ov23_0224E29C(UnkStruct_ov23_0224E280 *param0) { ov23_0224DC54(param0, 22); param0->unk_37 = 27; } -static void ov23_0224E2B0 (UnkStruct_ov23_0224E280 * param0) +static void ov23_0224E2B0(UnkStruct_ov23_0224E280 *param0) { param0->unk_37 = 16; } -static void ov23_0224E2B8 (int param0) +static void ov23_0224E2B8(int param0) { Unk_ov23_022577B4->unk_28.unk_02 = param0; Unk_ov23_022577B4->unk_37 = 18; } -static void ov23_0224E2D0 (void * param0) +static void ov23_0224E2D0(void *param0) { - UnkStruct_ov23_0224E280 * v0 = param0; + UnkStruct_ov23_0224E280 *v0 = param0; v0->unk_37 = 11; } -static void ov23_0224E2D8 (SysTask * param0, void * param1) +static void ov23_0224E2D8(SysTask *param0, void *param1) { - UnkStruct_ov23_0224E280 * v0 = param1; + UnkStruct_ov23_0224E280 *v0 = param1; u32 v1; if (v0->unk_37 != 17) { @@ -628,7 +626,7 @@ static void ov23_0224E2D8 (SysTask * param0, void * param1) break; case 7: if (ov23_02254238(ov23_0224219C()) == 0) { - if (( PAD_BUTTON_A )&gCoreSys.pressedKeys) { + if ((PAD_BUTTON_A)&gCoreSys.pressedKeys) { v0->unk_37 = 4; } } @@ -665,7 +663,7 @@ static void ov23_0224E2D8 (SysTask * param0, void * param1) break; case 15: if (ov23_02254238(ov23_0224219C()) == 0) { - if (( PAD_BUTTON_A )&gCoreSys.pressedKeys) { + if ((PAD_BUTTON_A)&gCoreSys.pressedKeys) { v0->unk_37 = 14; } } @@ -735,7 +733,7 @@ static void ov23_0224E2D8 (SysTask * param0, void * param1) case 22: ov23_0224E124(v0); { - VarsFlags * v2 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); + VarsFlags *v2 = SaveData_GetVarsFlags(v0->fieldSystem->saveData); sub_0206B3FC(v2, sub_0206B3EC(v2) + 1); } @@ -868,7 +866,7 @@ static void ov23_0224E2D8 (SysTask * param0, void * param1) } } -static void ov23_0224E8E0 (UnkStruct_ov23_0224E280 * param0) +static void ov23_0224E8E0(UnkStruct_ov23_0224E280 *param0) { ov23_0224DC68(param0, 15); ov23_0224DC54(param0, 8); @@ -876,7 +874,7 @@ static void ov23_0224E8E0 (UnkStruct_ov23_0224E280 * param0) param0->unk_37 = 7; } -static void ov23_0224E8FC (SysTask * param0, UnkStruct_ov23_022577B0 * param1) +static void ov23_0224E8FC(SysTask *param0, UnkStruct_ov23_022577B0 *param1) { u32 v0; @@ -898,7 +896,7 @@ static void ov23_0224E8FC (SysTask * param0, UnkStruct_ov23_022577B0 * param1) param1->unk_20 = NULL; } -static void ov23_0224E93C (SysTask * param0, UnkStruct_ov23_022577B0 * param1) +static void ov23_0224E93C(SysTask *param0, UnkStruct_ov23_022577B0 *param1) { u32 v0; @@ -931,7 +929,7 @@ static void ov23_0224E93C (SysTask * param0, UnkStruct_ov23_022577B0 * param1) param1->unk_20 = NULL; } -static void ov23_0224E9C4 (SysTask * param0, UnkStruct_ov23_022577B0 * param1) +static void ov23_0224E9C4(SysTask *param0, UnkStruct_ov23_022577B0 *param1) { if (param1->unk_20) { sub_02002154(param1->unk_20, 4); @@ -951,7 +949,7 @@ static void ov23_0224E9C4 (SysTask * param0, UnkStruct_ov23_022577B0 * param1) Unk_ov23_022577B0 = NULL; } -static void ov23_0224EA08 (SysTask * param0, UnkStruct_ov23_022577B0 * param1) +static void ov23_0224EA08(SysTask *param0, UnkStruct_ov23_022577B0 *param1) { if (param1->unk_18) { Window_Clear(¶m1->unk_08, 1); @@ -964,20 +962,20 @@ static void ov23_0224EA08 (SysTask * param0, UnkStruct_ov23_022577B0 * param1) } } -static void ov23_0224EA44 (UnkStruct_ov23_022577B0 * param0, int param1, int param2) +static void ov23_0224EA44(UnkStruct_ov23_022577B0 *param0, int param1, int param2) { ov23_02254068(ov23_0224219C(), CommInfo_TrainerInfo(param1)); ov23_02253F40(ov23_0224219C(), param2, 0, NULL); } -static void ov23_0224EA70 (UnkStruct_ov23_022577B0 * param0) +static void ov23_0224EA70(UnkStruct_ov23_022577B0 *param0) { ov23_02254068(ov23_0224219C(), CommInfo_TrainerInfo(param0->unk_2C)); ov23_022540F4(ov23_0224219C(), param0->unk_24.unk_02); ov23_02253F40(ov23_0224219C(), 31, 0, NULL); } -static void ov23_0224EAA4 (UnkStruct_ov23_022577B0 * param0) +static void ov23_0224EAA4(UnkStruct_ov23_022577B0 *param0) { UnkStruct_ov84_02240FA8 v0; const int v1 = 4 + 1; @@ -987,7 +985,7 @@ static void ov23_0224EAA4 (UnkStruct_ov23_022577B0 * param0) BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_08, 3, 1, 1, 16, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (16 * v1 * 2)); Window_Show(¶m0->unk_08, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v2; + MessageLoader *v2; int v3; v2 = MessageLoader_Init(0, 26, 632, 4); @@ -1014,9 +1012,9 @@ static void ov23_0224EAA4 (UnkStruct_ov23_022577B0 * param0) sub_0201A954(¶m0->unk_08); } -static BOOL ov23_0224EB74 (SysTask * param0, void * param1) +static BOOL ov23_0224EB74(SysTask *param0, void *param1) { - UnkStruct_ov23_022577B0 * v0 = param1; + UnkStruct_ov23_022577B0 *v0 = param1; u32 v1; UnkStruct_ov23_0224DF1C v2; u16 v3; @@ -1069,15 +1067,15 @@ static BOOL ov23_0224EB74 (SysTask * param0, void * param1) return 1; } -static void ov23_0224EC48 (void * param0) +static void ov23_0224EC48(void *param0) { - UnkStruct_ov23_022577B0 * v0 = param0; + UnkStruct_ov23_022577B0 *v0 = param0; v0->unk_34 = 12; } -static void ov23_0224EC50 (SysTask * param0, void * param1) +static void ov23_0224EC50(SysTask *param0, void *param1) { - UnkStruct_ov23_022577B0 * v0 = param1; + UnkStruct_ov23_022577B0 *v0 = param1; if (!CommSys_IsPlayerConnected(v0->unk_2C)) { ov23_022535EC(); @@ -1120,7 +1118,7 @@ static void ov23_0224EC50 (SysTask * param0, void * param1) break; case 9: if (ov23_02254238(ov23_0224219C()) == 0) { - if (( PAD_BUTTON_A )&gCoreSys.pressedKeys) { + if ((PAD_BUTTON_A)&gCoreSys.pressedKeys) { v0->unk_34 = 4; } } @@ -1178,7 +1176,7 @@ static void ov23_0224EC50 (SysTask * param0, void * param1) break; case 21: if (ov23_02254238(ov23_0224219C()) == 0) { - if (( PAD_BUTTON_A )&gCoreSys.pressedKeys) { + if ((PAD_BUTTON_A)&gCoreSys.pressedKeys) { ov23_0224DC40(v0, 15); v0->unk_34 = 15; } @@ -1274,9 +1272,9 @@ static void ov23_0224EC50 (SysTask * param0, void * param1) } } -void ov23_0224F07C (int param0, int param1, FieldSystem * fieldSystem) +void ov23_0224F07C(int param0, int param1, FieldSystem *fieldSystem) { - UnkStruct_ov23_022577B0 * v0; + UnkStruct_ov23_022577B0 *v0; if (Unk_ov23_022577B0) { GF_ASSERT(FALSE); @@ -1300,19 +1298,19 @@ void ov23_0224F07C (int param0, int param1, FieldSystem * fieldSystem) v0->unk_00 = SysTask_Start(ov23_0224EC50, v0, 10000); } -void ov23_0224F0F0 (int param0, int param1, void * param2, void * param3) +void ov23_0224F0F0(int param0, int param1, void *param2, void *param3) { sub_02035B48(75, param2); } -void ov23_0224F0FC (int param0, int param1, void * param2, void * param3) +void ov23_0224F0FC(int param0, int param1, void *param2, void *param3) { sub_02035B48(76, param2); } -void ov23_0224F108 (int param0, int param1, void * param2, void * param3) +void ov23_0224F108(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_0224DC40 * v0 = param2; + UnkStruct_ov23_0224DC40 *v0 = param2; if ((CommSys_CurNetId() == v0->unk_00) && (Unk_ov23_022577B0)) { GF_ASSERT(param1 == sizeof(UnkStruct_ov23_0224DC40)); @@ -1320,9 +1318,9 @@ void ov23_0224F108 (int param0, int param1, void * param2, void * param3) } } -void ov23_0224F138 (int param0, int param1, void * param2, void * param3) +void ov23_0224F138(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_0224DC40 * v0 = param2; + UnkStruct_ov23_0224DC40 *v0 = param2; if ((CommSys_CurNetId() == v0->unk_00) && (Unk_ov23_022577B4)) { GF_ASSERT(param1 == sizeof(UnkStruct_ov23_0224DC40)); @@ -1332,20 +1330,20 @@ void ov23_0224F138 (int param0, int param1, void * param2, void * param3) } } -int ov23_0224F174 (void) +int ov23_0224F174(void) { return sizeof(UnkStruct_ov23_0224DC40); } -void ov23_0224F178 (int param0, int param1, void * param2, void * param3) +void ov23_0224F178(int param0, int param1, void *param2, void *param3) { sub_02035B48(78, param2); } -void ov23_0224F184 (int param0, int param1, void * param2, void * param3) +void ov23_0224F184(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_022577B0 * v0 = Unk_ov23_022577B0; - UnkStruct_ov23_0224F184 * v1 = param2; + UnkStruct_ov23_022577B0 *v0 = Unk_ov23_022577B0; + UnkStruct_ov23_0224F184 *v1 = param2; if (CommSys_CurNetId() != v1->unk_00) { return; @@ -1368,21 +1366,21 @@ void ov23_0224F184 (int param0, int param1, void * param2, void * param3) ov23_02253F40(ov23_0224219C(), 28, 0, NULL); } -int ov23_0224F1F8 (void) +int ov23_0224F1F8(void) { return sizeof(UnkStruct_ov23_0224F184); } -void ov23_0224F1FC (int param0, int param1, void * param2, void * param3) +void ov23_0224F1FC(int param0, int param1, void *param2, void *param3) { sub_02035B48(80, param2); } -void ov23_0224F208 (int param0, int param1, void * param2, void * param3) +void ov23_0224F208(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_022577B0 * v0 = Unk_ov23_022577B0; - UnkStruct_ov23_0224E280 * v1 = Unk_ov23_022577B4; - UnkStruct_ov23_0224DF1C * v2 = param2; + UnkStruct_ov23_022577B0 *v0 = Unk_ov23_022577B0; + UnkStruct_ov23_0224E280 *v1 = Unk_ov23_022577B4; + UnkStruct_ov23_0224DF1C *v2 = param2; if (v2->unk_01 == CommSys_CurNetId()) { switch (v2->unk_02) { @@ -1399,12 +1397,12 @@ void ov23_0224F208 (int param0, int param1, void * param2, void * param3) } } -int ov23_0224F248 (void) +int ov23_0224F248(void) { return sizeof(UnkStruct_ov23_0224DF1C); } -void ov23_0224F24C (void) +void ov23_0224F24C(void) { if (Unk_ov23_022577B4) { ov23_0224DDE4(Unk_ov23_022577B4->unk_00, Unk_ov23_022577B4); @@ -1415,7 +1413,7 @@ void ov23_0224F24C (void) } } -static void ov23_0224F270 (UnkStruct_ov23_0224E280 * param0) +static void ov23_0224F270(UnkStruct_ov23_0224E280 *param0) { u16 v0; diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c index 0df1c836e6..c05d251ec1 100644 --- a/src/overlay023/ov23_0224F294.c +++ b/src/overlay023/ov23_0224F294.c @@ -1,75 +1,72 @@ +#include "overlay023/ov23_0224F294.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_020298B0_decl.h" +#include "struct_defs/sprite_template.h" +#include "struct_defs/struct_02081CF4.h" #include "field/field_system.h" -#include "struct_defs/struct_02081CF4.h" +#include "overlay005/ov5_021D2F14.h" #include "overlay023/funcptr_ov23_02248D20.h" #include "overlay023/funcptr_ov23_0224F758.h" #include "overlay023/funcptr_ov23_0224F914.h" #include "overlay023/funcptr_ov23_0224FD84.h" #include "overlay023/funcptr_ov23_0224FE38.h" #include "overlay023/funcptr_ov23_0225021C.h" +#include "overlay023/ov23_0223E140.h" +#include "overlay023/ov23_022416A8.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_0224340C.h" +#include "overlay023/ov23_02248C08.h" +#include "overlay023/ov23_0224A1D0.h" +#include "overlay023/ov23_0224B05C.h" +#include "overlay023/ov23_0225128C.h" +#include "overlay023/ov23_022521F0.h" +#include "overlay023/ov23_02253598.h" +#include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_02250CD4.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_02241308.h" +#include "bag.h" +#include "comm_player_manager.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_map_change.h" +#include "field_system.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "player_avatar.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_0200A9DC.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202854C.h" -#include "communication_system.h" -#include "field_system.h" -#include "field_map_change.h" -#include "comm_player_manager.h" -#include "player_avatar.h" #include "unk_0206A780.h" -#include "bag.h" -#include "overlay005/ov5_021D2F14.h" -#include "overlay023/ov23_0223E140.h" -#include "overlay023/ov23_022416A8.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_0224340C.h" -#include "overlay023/ov23_02248C08.h" -#include "overlay023/ov23_0224A1D0.h" -#include "overlay023/ov23_0224B05C.h" -#include "overlay023/ov23_0224F294.h" -#include "overlay023/ov23_0225128C.h" -#include "overlay023/ov23_022521F0.h" -#include "overlay023/ov23_02253598.h" -#include "overlay023/ov23_02253D40.h" -typedef void (* UnkFuncPtr_ov23_0224FA58)(UnkStruct_ov23_02250CD4 *); +typedef void (*UnkFuncPtr_ov23_0224FA58)(UnkStruct_ov23_02250CD4 *); typedef struct { - UndergroundData * unk_00; + UndergroundData *unk_00; u8 unk_04; u8 unk_05; } UnkStruct_ov23_022577B8; @@ -79,37 +76,37 @@ typedef struct { u32 unk_04; } UnkStruct_ov23_02257644; -static void ov23_0224F460(UnkStruct_ov23_02250CD4 * param0); -static void ov23_0224F498(UnkStruct_ov23_02250CD4 * param0); -static void ov23_0224F4D0(GraphicElementData * param0, u32 param1); -static void ov23_0224F500(GraphicElementData * param0, u16 param1, u16 param2); -static void ov23_0224F52C(UnkStruct_ov23_02250CD4 * param0, u16 param1, u16 param2); -static void ov23_0224F560(GraphicElementData * param0); -static void ov23_0224F914(SysTask * param0, void * param1); -static BOOL ov23_0224FA58(SysTask * param0, void * param1); -static void ov23_0224FE38(UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_02248D20 param1); -static BOOL ov23_0224FF58(SysTask * param0, void * param1); -static void ov23_0225021C(UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_02248D20 param1); -static BOOL ov23_02250378(SysTask * param0, void * param1); -static BOOL ov23_0225044C(SysTask * param0, void * param1); -static void ov23_022501BC(UnkStruct_ov23_02250CD4 * param0); -static void ov23_022505EC(UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_02248D20 param1); -static BOOL ov23_02250704(SysTask * param0, void * param1); -static BOOL ov23_022507D8(SysTask * param0, void * param1); -static void ov23_02250930(UnkStruct_ov23_02250CD4 * param0); -static void ov23_0225093C(UnkStruct_ov23_02250CD4 * param0); -static void ov23_02250A14(UnkStruct_ov23_02250CD4 * param0); -static BOOL ov23_02250048(SysTask * param0, void * param1); -static BOOL ov23_02250F8C(SysTask * param0, void * param1); -static void ov23_02250B9C(SysTask * param0, void * param1); -static void ov23_02250D90(UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_02248D20 param1); -static BOOL ov23_02250EAC(SysTask * param0, void * param1); -static BOOL ov23_022510F0(SysTask * param0, void * param1); -static void ov23_02250998(SysTask * param0, void * param1); -static void ov23_022509D4(SysTask * param0, void * param1); -static void ov23_02250B34(SysTask * param0, UnkStruct_ov23_02250CD4 * param1, BOOL param2); - -static UnkStruct_ov23_022577B8 * Unk_ov23_022577B8 = NULL; +static void ov23_0224F460(UnkStruct_ov23_02250CD4 *param0); +static void ov23_0224F498(UnkStruct_ov23_02250CD4 *param0); +static void ov23_0224F4D0(GraphicElementData *param0, u32 param1); +static void ov23_0224F500(GraphicElementData *param0, u16 param1, u16 param2); +static void ov23_0224F52C(UnkStruct_ov23_02250CD4 *param0, u16 param1, u16 param2); +static void ov23_0224F560(GraphicElementData *param0); +static void ov23_0224F914(SysTask *param0, void *param1); +static BOOL ov23_0224FA58(SysTask *param0, void *param1); +static void ov23_0224FE38(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248D20 param1); +static BOOL ov23_0224FF58(SysTask *param0, void *param1); +static void ov23_0225021C(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248D20 param1); +static BOOL ov23_02250378(SysTask *param0, void *param1); +static BOOL ov23_0225044C(SysTask *param0, void *param1); +static void ov23_022501BC(UnkStruct_ov23_02250CD4 *param0); +static void ov23_022505EC(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248D20 param1); +static BOOL ov23_02250704(SysTask *param0, void *param1); +static BOOL ov23_022507D8(SysTask *param0, void *param1); +static void ov23_02250930(UnkStruct_ov23_02250CD4 *param0); +static void ov23_0225093C(UnkStruct_ov23_02250CD4 *param0); +static void ov23_02250A14(UnkStruct_ov23_02250CD4 *param0); +static BOOL ov23_02250048(SysTask *param0, void *param1); +static BOOL ov23_02250F8C(SysTask *param0, void *param1); +static void ov23_02250B9C(SysTask *param0, void *param1); +static void ov23_02250D90(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248D20 param1); +static BOOL ov23_02250EAC(SysTask *param0, void *param1); +static BOOL ov23_022510F0(SysTask *param0, void *param1); +static void ov23_02250998(SysTask *param0, void *param1); +static void ov23_022509D4(SysTask *param0, void *param1); +static void ov23_02250B34(SysTask *param0, UnkStruct_ov23_02250CD4 *param1, BOOL param2); + +static UnkStruct_ov23_022577B8 *Unk_ov23_022577B8 = NULL; static const UnkStruct_ov61_0222C884 Unk_ov23_022568D8 = { 0x3, @@ -125,13 +122,13 @@ static const struct { u32 unk_00; u32 unk_04; } Unk_ov23_02256924[] = { - {0x79, (u32)ov23_0224FDE0}, - {0x7A, (u32)ov23_022501BC}, - {0x7B, (u32)ov23_02250CD4}, - {0x7C, (u32)ov23_02250598}, - {0x7D, (u32)ov23_02250A14}, - {0x7E, (u32)ov23_0225093C}, - {0x7F, (u32)ov23_02250930} + { 0x79, (u32)ov23_0224FDE0 }, + { 0x7A, (u32)ov23_022501BC }, + { 0x7B, (u32)ov23_02250CD4 }, + { 0x7C, (u32)ov23_02250598 }, + { 0x7D, (u32)ov23_02250A14 }, + { 0x7E, (u32)ov23_0225093C }, + { 0x7F, (u32)ov23_02250930 } }; static const UnkStruct_ov84_02240FA8 Unk_ov23_02256904 = { @@ -165,9 +162,9 @@ static const SpriteTemplate Unk_ov23_0225695C[] = { 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x38C0, 0x38C0, 0x38C0, 0x38C0, 0x0, 0x0}, + { 0x38C0, 0x38C0, 0x38C0, 0x38C0, 0x0, 0x0 }, + 0x0, 0x0, - 0x0 }, { 0xAE, @@ -177,19 +174,19 @@ static const SpriteTemplate Unk_ov23_0225695C[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x38C1, 0x38C0, 0x38C1, 0x38C1, 0x0, 0x0}, + { 0x38C1, 0x38C0, 0x38C1, 0x38C1, 0x0, 0x0 }, 0x0, - 0x0 - } + 0x0, + }, }; -static void ov23_0224F294 (UnkStruct_ov23_02250CD4 * param0, u8 * param1, u32 param2) +static void ov23_0224F294(UnkStruct_ov23_02250CD4 *param0, u8 *param1, u32 param2) { UnkStruct_ov104_02241308 v0 = { 8, 1, 2, 2, 0, 0 }; u32 v1; - NARC * v2; + NARC *v2; v2 = NARC_ctor(NARC_INDEX_GRAPHIC__MENU_GRA, 11); @@ -219,7 +216,7 @@ static void ov23_0224F294 (UnkStruct_ov23_02250CD4 * param0, u8 * param1, u32 pa param0->unk_23C[1 + v1] = ov5_021D3584(¶m0->unk_74, &v3); { - VecFx32 v4 = {FX32_ONE, FX32_ONE, FX32_ONE}; + VecFx32 v4 = { FX32_ONE, FX32_ONE, FX32_ONE }; sub_02021C80(param0->unk_23C[1 + v1]->unk_00, &v4, 1); } } @@ -229,7 +226,7 @@ static void ov23_0224F294 (UnkStruct_ov23_02250CD4 * param0, u8 * param1, u32 pa GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov23_0224F460 (UnkStruct_ov23_02250CD4 * param0) +static void ov23_0224F460(UnkStruct_ov23_02250CD4 *param0) { u16 v0; @@ -240,7 +237,7 @@ static void ov23_0224F460 (UnkStruct_ov23_02250CD4 * param0) ov5_021D375C(¶m0->unk_74); } -static void ov23_0224F498 (UnkStruct_ov23_02250CD4 * param0) +static void ov23_0224F498(UnkStruct_ov23_02250CD4 *param0) { u16 v0; @@ -249,7 +246,7 @@ static void ov23_0224F498 (UnkStruct_ov23_02250CD4 * param0) } } -static void ov23_0224F4D0 (GraphicElementData * param0, u32 param1) +static void ov23_0224F4D0(GraphicElementData *param0, u32 param1) { VecFx32 v0; @@ -259,7 +256,7 @@ static void ov23_0224F4D0 (GraphicElementData * param0, u32 param1) sub_02021C50(param0, &v0); } -static void ov23_0224F500 (GraphicElementData * param0, u16 param1, u16 param2) +static void ov23_0224F500(GraphicElementData *param0, u16 param1, u16 param2) { u32 v0 = sub_02021E24(param0); @@ -267,13 +264,13 @@ static void ov23_0224F500 (GraphicElementData * param0, u16 param1, u16 param2) sub_02021EC4(param0, param2); } -static void ov23_0224F52C (UnkStruct_ov23_02250CD4 * param0, u16 param1, u16 param2) +static void ov23_0224F52C(UnkStruct_ov23_02250CD4 *param0, u16 param1, u16 param2) { ov23_0224F500(param0->unk_23C[1 + param1]->unk_00, 0, 0); ov23_0224F500(param0->unk_23C[1 + param2]->unk_00, 1, 1); } -static void ov23_0224F560 (GraphicElementData * param0) +static void ov23_0224F560(GraphicElementData *param0) { if ((sub_02021E24(param0) % 3) != 1) { return; @@ -284,7 +281,7 @@ static void ov23_0224F560 (GraphicElementData * param0) } } -void ov23_0224F588 (UndergroundData * param0) +void ov23_0224F588(UndergroundData *param0) { Unk_ov23_022577B8 = Heap_AllocFromHeap(15, sizeof(UnkStruct_ov23_022577B8)); MI_CpuClear8(Unk_ov23_022577B8, sizeof(UnkStruct_ov23_022577B8)); @@ -293,106 +290,106 @@ void ov23_0224F588 (UndergroundData * param0) Unk_ov23_022577B8->unk_00 = param0; } -void ov23_0224F5B8 (void) +void ov23_0224F5B8(void) { Heap_FreeToHeap(Unk_ov23_022577B8); } -static int ov23_0224F5C8 (void * param0) +static int ov23_0224F5C8(void *param0) { - UnkStruct_ov23_02250CD4 * v0 = param0; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param0; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_02028E28(v1); } -static int ov23_0224F5DC (void * param0) +static int ov23_0224F5DC(void *param0) { - UnkStruct_ov23_02250CD4 * v0 = param0; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param0; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_020289A0(v1); } -int ov23_0224F5F0 (int param0, void * param1) +int ov23_0224F5F0(int param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param1; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_020289B8(v1, param0); } -static int ov23_0224F608 (void * param0) +static int ov23_0224F608(void *param0) { - UnkStruct_ov23_02250CD4 * v0 = param0; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param0; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_02028B70(v1); } -int ov23_0224F61C (int param0, void * param1) +int ov23_0224F61C(int param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param1; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_02028B88(v1, param0); } -void ov23_0224F634 (int param0) +void ov23_0224F634(int param0) { GF_ASSERT(Unk_ov23_022577B8->unk_05 == param0); sub_02028B94(Unk_ov23_022577B8->unk_00, Unk_ov23_022577B8->unk_04); } -static int ov23_0224F658 (void * param0) +static int ov23_0224F658(void *param0) { - UnkStruct_ov23_02250CD4 * v0 = param0; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param0; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_02028C3C(v1); } -int ov23_0224F66C (int param0, void * param1) +int ov23_0224F66C(int param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param1; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_02028E44(v1, param0); } -int ov23_0224F684 (int param0, void * param1) +int ov23_0224F684(int param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param1; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_02028C54(v1, param0); } -int ov23_0224F69C (int param0, void * param1) +int ov23_0224F69C(int param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param1; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_02028C60(v1, param0); } -static int ov23_0224F6B4 (void * param0) +static int ov23_0224F6B4(void *param0) { - UnkStruct_ov23_02250CD4 * v0 = param0; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param0; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_02028D58(v1); } -int ov23_0224F6C8 (int param0, void * param1) +int ov23_0224F6C8(int param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UnkStruct_ov23_02250CD4 *v0 = param1; + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); return sub_02028D74(v1, param0); } -BOOL ov23_0224F6E0 (int param0, int param1) +BOOL ov23_0224F6E0(int param0, int param1) { int v0 = param0; @@ -409,25 +406,25 @@ BOOL ov23_0224F6E0 (int param0, int param1) return sub_02028CB0(Unk_ov23_022577B8->unk_00, v0, param1); } -BOOL ov23_0224F710 (int param0) +BOOL ov23_0224F710(int param0) { GF_ASSERT(param0 < 60); return sub_02028DB4(Unk_ov23_022577B8->unk_00, param0); } -BOOL ov23_0224F730 (int param0) +BOOL ov23_0224F730(int param0) { return sub_02028E84(Unk_ov23_022577B8->unk_00, param0); } -BOOL ov23_0224F744 (int param0) +BOOL ov23_0224F744(int param0) { return sub_02028BC8(Unk_ov23_022577B8->unk_00, param0); } -void ov23_0224F758 (UnkFuncPtr_ov23_0224F758 param0, FieldSystem * fieldSystem) +void ov23_0224F758(UnkFuncPtr_ov23_0224F758 param0, FieldSystem *fieldSystem) { - UnkStruct_ov23_02250CD4 * v0; + UnkStruct_ov23_02250CD4 *v0; UnkStruct_ov84_02240FA8 v1; Sound_PlayEffect(1533); @@ -448,7 +445,7 @@ void ov23_0224F758 (UnkFuncPtr_ov23_0224F758 param0, FieldSystem * fieldSystem) ov23_022431EC(v0, v0->unk_04, ov23_02251270); } -static u32 ov23_0224F7D4 (u8 * param0) +static u32 ov23_0224F7D4(u8 *param0) { u32 v0 = 0; @@ -476,7 +473,7 @@ static u32 ov23_0224F7D4 (u8 * param0) return v0; } -static void ov23_0224F7F4 (UnkStruct_ov23_02250CD4 * param0) +static void ov23_0224F7F4(UnkStruct_ov23_02250CD4 *param0) { UnkStruct_02081CF4 v0; const int v1 = 4; @@ -490,15 +487,15 @@ static void ov23_0224F7F4 (UnkStruct_ov23_02250CD4 * param0) Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v3; + MessageLoader *v3; int v4; v3 = ov23_02253E3C(ov23_0224219C()); for (v4 = 0; v4 < NELEMS(Unk_ov23_02256924); v4++) { if (v4 == v1) { - const TrainerInfo * v5 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); - Strbuf* v6 = TrainerInfo_NameNewStrbuf(v5, 4); + const TrainerInfo *v5 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + Strbuf *v6 = TrainerInfo_NameNewStrbuf(v5, 4); sub_02013A6C(param0->unk_40, v6, Unk_ov23_02256924[v4].unk_04); Strbuf_Free(v6); @@ -532,9 +529,9 @@ static void ov23_0224F7F4 (UnkStruct_ov23_02250CD4 * param0) sub_020594FC(); } -static void ov23_0224F914 (SysTask * param0, void * param1) +static void ov23_0224F914(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; switch (v0->unk_2AA) { @@ -619,9 +616,9 @@ static void ov23_0224F914 (SysTask * param0, void * param1) } } -static BOOL ov23_0224FA58 (SysTask * param0, void * param1) +static BOOL ov23_0224FA58(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u16 v1; v1 = sub_02001DC4(v0->unk_54); @@ -672,7 +669,7 @@ static BOOL ov23_0224FA58 (SysTask * param0, void * param1) return 1; } -void ov23_0224FB7C (UnkStruct_ov23_02250CD4 * param0) +void ov23_0224FB7C(UnkStruct_ov23_02250CD4 *param0) { if (param0->unk_4C) { ov23_02248EF8(param0->unk_4C, NULL, NULL); @@ -698,30 +695,30 @@ void ov23_0224FB7C (UnkStruct_ov23_02250CD4 * param0) } static UnkStruct_ov23_02257644 Unk_ov23_02257644[] = { - {0x86, (u32)1}, - {0x84, (u32)2}, - {0x85, (u32)0xfffffffe} + { 0x86, (u32)1 }, + { 0x84, (u32)2 }, + { 0x85, (u32)0xfffffffe } }; static UnkStruct_ov23_02257644 Unk_ov23_02257634[] = { - {0x84, (u32)2}, - {0x85, (u32)0xfffffffe} + { 0x84, (u32)2 }, + { 0x85, (u32)0xfffffffe } }; static UnkStruct_ov23_02257644 Unk_ov23_0225765C[] = { - {0x87, (u32)3}, - {0x84, (u32)2}, - {0x85, (u32)0xfffffffe} + { 0x87, (u32)3 }, + { 0x84, (u32)2 }, + { 0x85, (u32)0xfffffffe } }; -static void ov23_0224FBFC (UnkStruct_ov23_02250CD4 * param0, int param1) +static void ov23_0224FBFC(UnkStruct_ov23_02250CD4 *param0, int param1) { UnkStruct_ov84_02240FA8 v0; int v1, v2; int v3 = 11; int v4 = 6; int v5 = (31 - 6); - UnkStruct_ov23_02257644 * v6; + UnkStruct_ov23_02257644 *v6; switch (param1) { case 1: @@ -743,11 +740,11 @@ static void ov23_0224FBFC (UnkStruct_ov23_02250CD4 * param0, int param1) param0->unk_44 = sub_02013A04(v1, 4); - BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, v5, v3, v4, v1 * 2, 13, ((1024 - (18 + 12) - 9 - 11 * 22))); + BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, v5, v3, v4, v1 * 2, 13, (1024 - (18 + 12) - 9 - 11 * 22)); Window_Show(¶m0->unk_20, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v7; + MessageLoader *v7; int v8; v7 = ov23_02253E3C(ov23_0224219C()); @@ -768,7 +765,7 @@ static void ov23_0224FBFC (UnkStruct_ov23_02250CD4 * param0, int param1) param0->unk_50 = sub_0200112C(&v0, 0, 0, 4); } -static void ov23_0224FCF4 (UnkStruct_ov23_02250CD4 * param0) +static void ov23_0224FCF4(UnkStruct_ov23_02250CD4 *param0) { if (param0->unk_50) { sub_02001384(param0->unk_50, NULL, NULL); @@ -784,7 +781,7 @@ static void ov23_0224FCF4 (UnkStruct_ov23_02250CD4 * param0) } } -static void ov23_0224FD3C (UnkStruct_ov23_02250CD4 * param0) +static void ov23_0224FD3C(UnkStruct_ov23_02250CD4 *param0) { ov23_0224FB7C(param0); @@ -797,16 +794,16 @@ static void ov23_0224FD3C (UnkStruct_ov23_02250CD4 * param0) ov23_02254044(ov23_022421DC()); } -void ov23_0224FD68 (int param0) +void ov23_0224FD68(int param0) { if (Unk_ov23_022577B8->unk_05 == param0) { sub_02028E50(Unk_ov23_022577B8->unk_00, Unk_ov23_022577B8->unk_04); } } -void ov23_0224FD84 (BmpList * param0, u32 param1, u8 param2) +void ov23_0224FD84(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov23_02250CD4 * v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); + UnkStruct_ov23_02250CD4 *v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); UnkFuncPtr_ov23_0224FD84 v1 = v0->unk_268; int v2 = param1; int v3 = v1(v2, v0); @@ -820,7 +817,7 @@ void ov23_0224FD84 (BmpList * param0, u32 param1, u8 param2) ov23_02253F60(ov23_022421DC(), v2, 0, NULL); } -void ov23_0224FDBC (UnkStruct_ov23_02250CD4 * param0) +void ov23_0224FDBC(UnkStruct_ov23_02250CD4 *param0) { param0->unk_264 = ov23_0224F5C8; param0->unk_268 = ov23_0224F66C; @@ -829,7 +826,7 @@ void ov23_0224FDBC (UnkStruct_ov23_02250CD4 * param0) ov23_0224FE38(param0, NULL); } -void ov23_0224FDE0 (UnkStruct_ov23_02250CD4 * param0) +void ov23_0224FDE0(UnkStruct_ov23_02250CD4 *param0) { param0->unk_290 = ov23_0224318C(8); param0->unk_294 = ov23_02243154(8); @@ -842,7 +839,7 @@ void ov23_0224FDE0 (UnkStruct_ov23_02250CD4 * param0) ov23_0224FE38(param0, sub_02028EA8); } -static void ov23_0224FE38 (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_02248D20 param1) +static void ov23_0224FE38(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248D20 param1) { UnkFuncPtr_ov23_0224FE38 v0 = param0->unk_264; UnkFuncPtr_ov23_0224FD84 v1 = param0->unk_268; @@ -859,7 +856,7 @@ static void ov23_0224FE38 (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v5; + MessageLoader *v5; int v6 = 0; v5 = ov23_02253E3C(ov23_022421DC()); @@ -886,9 +883,9 @@ static void ov23_0224FE38 (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 param0->unk_2AA = 5; } -static BOOL ov23_0224FF58 (SysTask * param0, void * param1) +static BOOL ov23_0224FF58(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; u16 v2, v3; @@ -912,8 +909,7 @@ static BOOL ov23_0224FF58 (SysTask * param0, void * param1) case 0xfffffffe: ov23_0224FD3C(v0); break; - default: - { + default: { ov23_02254044(ov23_022421DC()); Unk_ov23_022577B8->unk_04 = v1; @@ -940,9 +936,9 @@ static BOOL ov23_0224FF58 (SysTask * param0, void * param1) return 1; } -static BOOL ov23_02250048 (SysTask * param0, void * param1) +static BOOL ov23_02250048(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; u16 v2; @@ -988,15 +984,15 @@ static BOOL ov23_02250048 (SysTask * param0, void * param1) return 1; } -void ov23_02250128 (int param0) +void ov23_02250128(int param0) { GF_ASSERT(Unk_ov23_022577B8->unk_05 == param0); sub_02028C6C(Unk_ov23_022577B8->unk_00, Unk_ov23_022577B8->unk_04); } -static void ov23_0225014C (BmpList * param0, u32 param1, u8 param2) +static void ov23_0225014C(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov23_02250CD4 * v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); + UnkStruct_ov23_02250CD4 *v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); UnkFuncPtr_ov23_0224FD84 v1 = v0->unk_268; int v2 = param1; int v3 = v1(v2, v0); @@ -1010,7 +1006,7 @@ static void ov23_0225014C (BmpList * param0, u32 param1, u8 param2) ov23_02253F60(ov23_022421DC(), v2, 0, NULL); } -void ov23_02250184 (UnkStruct_ov23_02250CD4 * param0) +void ov23_02250184(UnkStruct_ov23_02250CD4 *param0) { param0->unk_264 = ov23_0224F658; param0->unk_268 = ov23_0224F684; @@ -1020,7 +1016,7 @@ void ov23_02250184 (UnkStruct_ov23_02250CD4 * param0) ov23_0225021C(param0, sub_02028CD8); } -static void ov23_022501BC (UnkStruct_ov23_02250CD4 * param0) +static void ov23_022501BC(UnkStruct_ov23_02250CD4 *param0) { param0->unk_290 = ov23_0224318C(9); param0->unk_294 = ov23_02243154(9); @@ -1033,7 +1029,7 @@ static void ov23_022501BC (UnkStruct_ov23_02250CD4 * param0) ov23_0225021C(param0, sub_02028CD8); } -static void ov23_0225021C (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_02248D20 param1) +static void ov23_0225021C(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248D20 param1) { UnkFuncPtr_ov23_0224FE38 v0 = param0->unk_264; UnkFuncPtr_ov23_0224FD84 v1 = param0->unk_268; @@ -1051,7 +1047,7 @@ static void ov23_0225021C (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v6; + MessageLoader *v6; int v7; v6 = ov23_02253E3C(ov23_022421DC()); @@ -1081,9 +1077,9 @@ static void ov23_0225021C (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 param0->unk_2AA = 6; } -static BOOL ov23_02250378 (SysTask * param0, void * param1) +static BOOL ov23_02250378(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; u16 v2, v3; @@ -1123,9 +1119,9 @@ static BOOL ov23_02250378 (SysTask * param0, void * param1) return 1; } -static BOOL ov23_0225044C (SysTask * param0, void * param1) +static BOOL ov23_0225044C(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; u16 v2; @@ -1174,9 +1170,9 @@ static BOOL ov23_0225044C (SysTask * param0, void * param1) return 1; } -void ov23_02250540 (BmpList * param0, u32 param1, u8 param2) +void ov23_02250540(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov23_02250CD4 * v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); + UnkStruct_ov23_02250CD4 *v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); UnkFuncPtr_ov23_0224FD84 v1 = v0->unk_268; int v2 = param1; int v3 = v1(v2, v0); @@ -1190,7 +1186,7 @@ void ov23_02250540 (BmpList * param0, u32 param1, u8 param2) ov23_02253F60(ov23_022421DC(), v2, 0, NULL); } -void ov23_02250578 (UnkStruct_ov23_02250CD4 * param0) +void ov23_02250578(UnkStruct_ov23_02250CD4 *param0) { param0->unk_264 = ov23_0224F6B4; param0->unk_268 = ov23_0224F6C8; @@ -1198,7 +1194,7 @@ void ov23_02250578 (UnkStruct_ov23_02250CD4 * param0) ov23_022505EC(param0, NULL); } -void ov23_02250598 (UnkStruct_ov23_02250CD4 * param0) +void ov23_02250598(UnkStruct_ov23_02250CD4 *param0) { param0->unk_290 = ov23_0224318C(11); param0->unk_294 = ov23_02243154(11); @@ -1210,7 +1206,7 @@ void ov23_02250598 (UnkStruct_ov23_02250CD4 * param0) ov23_022505EC(param0, sub_02028DD8); } -static void ov23_022505EC (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_02248D20 param1) +static void ov23_022505EC(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248D20 param1) { UnkFuncPtr_ov23_0224FE38 v0 = param0->unk_264; UnkFuncPtr_ov23_0224FD84 v1 = param0->unk_268; @@ -1227,7 +1223,7 @@ static void ov23_022505EC (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v5; + MessageLoader *v5; int v6 = 0; v5 = ov23_02253E3C(ov23_022421DC()); @@ -1253,9 +1249,9 @@ static void ov23_022505EC (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 param0->unk_2AA = 7; } -static BOOL ov23_02250704 (SysTask * param0, void * param1) +static BOOL ov23_02250704(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; u16 v2, v3; @@ -1299,9 +1295,9 @@ static BOOL ov23_02250704 (SysTask * param0, void * param1) return 1; } -static BOOL ov23_022507D8 (SysTask * param0, void * param1) +static BOOL ov23_022507D8(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; u16 v2; @@ -1328,7 +1324,7 @@ static BOOL ov23_022507D8 (SysTask * param0, void * param1) if (v1 == 3) { int v3 = sub_02028938(Unk_ov23_022577B8->unk_05); - Bag * v4 = SaveData_GetBag(v0->fieldSystem->saveData); + Bag *v4 = SaveData_GetBag(v0->fieldSystem->saveData); Sound_PlayEffect(1500); @@ -1363,12 +1359,12 @@ static BOOL ov23_022507D8 (SysTask * param0, void * param1) return 1; } -static void ov23_02250930 (UnkStruct_ov23_02250CD4 * param0) +static void ov23_02250930(UnkStruct_ov23_02250CD4 *param0) { param0->unk_2AA = 2; } -static void ov23_0225093C (UnkStruct_ov23_02250CD4 * param0) +static void ov23_0225093C(UnkStruct_ov23_02250CD4 *param0) { ov23_0224FB7C(param0); @@ -1381,9 +1377,9 @@ static void ov23_0225093C (UnkStruct_ov23_02250CD4 * param0) } } -static void ov23_02250998 (SysTask * param0, void * param1) +static void ov23_02250998(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; if (ov23_02254238(ov23_0224219C()) == 0) { v0->unk_5C = sub_02002100(v0->fieldSystem->unk_08, &Unk_ov23_022568D8, 1024 - (18 + 12) - 9, 11, 4); @@ -1391,9 +1387,9 @@ static void ov23_02250998 (SysTask * param0, void * param1) } } -static void ov23_022509D4 (SysTask * param0, void * param1) +static void ov23_022509D4(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; int v1 = sub_02002114(v0->unk_5C, 4); if (v1 == 0xffffffff) { @@ -1408,13 +1404,13 @@ static void ov23_022509D4 (SysTask * param0, void * param1) v0->unk_5C = NULL; } -static void ov23_02250A0C (void * param0) +static void ov23_02250A0C(void *param0) { - UnkStruct_ov23_02250CD4 * v0 = param0; + UnkStruct_ov23_02250CD4 *v0 = param0; ov23_0224FD3C(v0); } -static void ov23_02250A14 (UnkStruct_ov23_02250CD4 * param0) +static void ov23_02250A14(UnkStruct_ov23_02250CD4 *param0) { ov23_0224FB7C(param0); ov23_02253968(); @@ -1422,9 +1418,9 @@ static void ov23_02250A14 (UnkStruct_ov23_02250CD4 * param0) param0->unk_2AA = 10; } -void ov23_02250A50 (UnkFuncPtr_ov23_0224F758 param0, FieldSystem * fieldSystem) +void ov23_02250A50(UnkFuncPtr_ov23_0224F758 param0, FieldSystem *fieldSystem) { - UnkStruct_ov23_02250CD4 * v0; + UnkStruct_ov23_02250CD4 *v0; UnkStruct_ov84_02240FA8 v1; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_02250CD4)); @@ -1445,7 +1441,7 @@ void ov23_02250A50 (UnkFuncPtr_ov23_0224F758 param0, FieldSystem * fieldSystem) ov23_022431EC(v0, v0->unk_04, ov23_02251270); } -static void ov23_02250ACC (UnkStruct_ov23_02250CD4 * param0) +static void ov23_02250ACC(UnkStruct_ov23_02250CD4 *param0) { if (ov23_02254238(ov23_022421AC()) == 0) { param0->unk_5C = sub_02002100(param0->fieldSystem->unk_08, &Unk_ov23_022568D8, 1024 - (18 + 12) - 9, 11, 4); @@ -1453,7 +1449,7 @@ static void ov23_02250ACC (UnkStruct_ov23_02250CD4 * param0) } } -static void ov23_02250B08 (UnkStruct_ov23_02250CD4 * param0) +static void ov23_02250B08(UnkStruct_ov23_02250CD4 *param0) { int v0 = sub_02002114(param0->unk_5C, 4); @@ -1468,7 +1464,7 @@ static void ov23_02250B08 (UnkStruct_ov23_02250CD4 * param0) param0->unk_5C = NULL; } -static void ov23_02250B34 (SysTask * param0, UnkStruct_ov23_02250CD4 * param1, BOOL param2) +static void ov23_02250B34(SysTask *param0, UnkStruct_ov23_02250CD4 *param1, BOOL param2) { if (param1->unk_5C) { sub_02002154(param1->unk_5C, 4); @@ -1500,9 +1496,9 @@ static void ov23_02250B34 (SysTask * param0, UnkStruct_ov23_02250CD4 * param1, B SysTask_Done(param0); } -static void ov23_02250B9C (SysTask * param0, void * param1) +static void ov23_02250B9C(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; if (!ov23_0224AEA4(CommSys_CurNetId())) { if ((v0->unk_2AA == 0) || (v0->unk_2AA == 1)) { @@ -1540,9 +1536,9 @@ static void ov23_02250B9C (SysTask * param0, void * param1) } } -void ov23_02250C3C (BmpList * param0, u32 param1, u8 param2) +void ov23_02250C3C(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov23_02250CD4 * v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); + UnkStruct_ov23_02250CD4 *v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); UnkFuncPtr_ov23_0224FD84 v1 = v0->unk_268; int v2 = param1; int v3 = v1(v2, v0); @@ -1556,11 +1552,11 @@ void ov23_02250C3C (BmpList * param0, u32 param1, u8 param2) ov23_02253F60(ov23_022421DC(), v2, 0, NULL); } -static void ov23_02250C74 (BmpList * param0, u32 param1, u8 param2) +static void ov23_02250C74(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov23_02250CD4 * v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); + UnkStruct_ov23_02250CD4 *v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); int v1 = param1; - UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); + UndergroundData *v2 = sub_020298B0(FieldSystem_SaveData(v0->fieldSystem)); if (!sub_02028AFC(v2, v1)) { sub_0200147C(param0, 1, 15, 2); @@ -1569,7 +1565,7 @@ static void ov23_02250C74 (BmpList * param0, u32 param1, u8 param2) } } -void ov23_02250CB0 (UnkStruct_ov23_02250CD4 * param0) +void ov23_02250CB0(UnkStruct_ov23_02250CD4 *param0) { param0->unk_264 = ov23_0224F608; param0->unk_268 = ov23_0224F61C; @@ -1578,7 +1574,7 @@ void ov23_02250CB0 (UnkStruct_ov23_02250CD4 * param0) ov23_02250D90(param0, NULL); } -void ov23_02250CD4 (UnkStruct_ov23_02250CD4 * param0) +void ov23_02250CD4(UnkStruct_ov23_02250CD4 *param0) { param0->unk_290 = ov23_0224318C(10); param0->unk_294 = ov23_02243154(10); @@ -1591,7 +1587,7 @@ void ov23_02250CD4 (UnkStruct_ov23_02250CD4 * param0) ov23_02250D90(param0, sub_02028BE8); } -void ov23_02250D2C (UnkStruct_ov23_02250CD4 * param0) +void ov23_02250D2C(UnkStruct_ov23_02250CD4 *param0) { param0->unk_264 = ov23_0224F608; param0->unk_268 = ov23_0224F61C; @@ -1601,7 +1597,7 @@ void ov23_02250D2C (UnkStruct_ov23_02250CD4 * param0) ov23_02250D90(param0, sub_02028BE8); } -void ov23_02250D5C (UnkStruct_ov23_02250CD4 * param0) +void ov23_02250D5C(UnkStruct_ov23_02250CD4 *param0) { param0->unk_264 = ov23_0224F5DC; param0->unk_268 = ov23_0224F5F0; @@ -1611,7 +1607,7 @@ void ov23_02250D5C (UnkStruct_ov23_02250CD4 * param0) ov23_02250D90(param0, sub_02028A10); } -static void ov23_02250D90 (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_02248D20 param1) +static void ov23_02250D90(UnkStruct_ov23_02250CD4 *param0, UnkFuncPtr_ov23_02248D20 param1) { UnkFuncPtr_ov23_0224FE38 v0 = param0->unk_264; UnkFuncPtr_ov23_0224FD84 v1 = param0->unk_268; @@ -1628,7 +1624,7 @@ static void ov23_02250D90 (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v5; + MessageLoader *v5; int v6 = 0; v5 = ov23_02253E3C(ov23_022421DC()); @@ -1655,9 +1651,9 @@ static void ov23_02250D90 (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 param0->unk_2AA = 8; } -static BOOL ov23_02250EAC (SysTask * param0, void * param1) +static BOOL ov23_02250EAC(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; u16 v2, v3; @@ -1702,9 +1698,9 @@ static BOOL ov23_02250EAC (SysTask * param0, void * param1) return 1; } -static BOOL ov23_02250F8C (SysTask * param0, void * param1) +static BOOL ov23_02250F8C(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; u16 v2; @@ -1746,9 +1742,9 @@ static BOOL ov23_02250F8C (SysTask * param0, void * param1) return 1; } -void ov23_02251044 (void * param0, u32 param1) +void ov23_02251044(void *param0, u32 param1) { - UnkStruct_ov23_02250CD4 * v0 = param0; + UnkStruct_ov23_02250CD4 *v0 = param0; ov23_0224FB7C(v0); ov23_02242FBC(); @@ -1797,9 +1793,9 @@ void ov23_02251044 (void * param0, u32 param1) Heap_FreeToHeap(v0); } -static BOOL ov23_022510F0 (SysTask * param0, void * param1) +static BOOL ov23_022510F0(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; v1 = ov23_02248D20(v0->unk_4C); @@ -1846,9 +1842,9 @@ static BOOL ov23_022510F0 (SysTask * param0, void * param1) return 1; } -void * ov23_022511B0 (UnkFuncPtr_ov23_0224F758 param0, FieldSystem * fieldSystem) +void *ov23_022511B0(UnkFuncPtr_ov23_0224F758 param0, FieldSystem *fieldSystem) { - UnkStruct_ov23_02250CD4 * v0; + UnkStruct_ov23_02250CD4 *v0; UnkStruct_ov84_02240FA8 v1; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_02250CD4)); @@ -1874,7 +1870,7 @@ void * ov23_022511B0 (UnkFuncPtr_ov23_0224F758 param0, FieldSystem * fieldSystem return v0; } -void ov23_02251238 (UnkStruct_ov23_02250CD4 * param0, int param1, int param2) +void ov23_02251238(UnkStruct_ov23_02250CD4 *param0, int param1, int param2) { if ((param0->unk_294 + param1) >= param2) { param0->unk_294 = param2 - param1; @@ -1893,7 +1889,7 @@ void ov23_02251238 (UnkStruct_ov23_02250CD4 * param0, int param1, int param2) } } -void ov23_02251270 (SysTask * param0, void * param1) +void ov23_02251270(SysTask *param0, void *param1) { sub_0200AB4C(0, GX_BLEND_PLANEMASK_BG0, 1); ov23_02251044(param1, 0xfffffffe); diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c index bb6ef12692..b97cc872a8 100644 --- a/src/overlay023/ov23_0225128C.c +++ b/src/overlay023/ov23_0225128C.c @@ -1,62 +1,61 @@ +#include "overlay023/ov23_0225128C.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_decls/struct_020508D4_decl.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" -#include "struct_defs/struct_02049FA8.h" +#include "overlay023/funcptr_ov23_022515D8.h" +#include "overlay023/ov23_0223E140.h" +#include "overlay023/ov23_022416A8.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_0224340C.h" +#include "overlay023/ov23_02248C08.h" +#include "overlay023/ov23_0224A1D0.h" +#include "overlay023/ov23_0224B05C.h" +#include "overlay023/ov23_0224F294.h" +#include "overlay023/ov23_022521F0.h" +#include "overlay023/ov23_02253598.h" +#include "overlay023/ov23_02253D40.h" +#include "overlay023/ov23_02254A14.h" #include "overlay023/struct_ov23_0224271C.h" #include "overlay023/struct_ov23_02250CD4.h" -#include "overlay023/funcptr_ov23_022515D8.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "camera.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_system.h" +#include "heap.h" +#include "message.h" +#include "player_avatar.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02005474.h" #include "unk_0200A9DC.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" -#include "camera.h" -#include "strbuf.h" #include "unk_02025E08.h" #include "unk_0202854C.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" -#include "field_system.h" -#include "vars_flags.h" #include "unk_020508D4.h" -#include "comm_player_manager.h" -#include "player_avatar.h" #include "unk_0206A780.h" #include "unk_0206A8DC.h" -#include "overlay023/ov23_0223E140.h" -#include "overlay023/ov23_022416A8.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_0224340C.h" -#include "overlay023/ov23_02248C08.h" -#include "overlay023/ov23_0224A1D0.h" -#include "overlay023/ov23_0224B05C.h" -#include "overlay023/ov23_0224F294.h" -#include "overlay023/ov23_0225128C.h" -#include "overlay023/ov23_022521F0.h" -#include "overlay023/ov23_02253598.h" -#include "overlay023/ov23_02253D40.h" -#include "overlay023/ov23_02254A14.h" +#include "vars_flags.h" typedef struct { u8 unk_00; @@ -72,15 +71,15 @@ typedef struct { typedef struct { int unk_00; - FieldSystem * fieldSystem; - UIControlData * unk_08; + FieldSystem *fieldSystem; + UIControlData *unk_08; UnkStruct_ov23_022513B0 unk_0C; - SysTask * unk_10; + SysTask *unk_10; } UnkStruct_ov23_02252038; -static void ov23_022520E8(FieldSystem * fieldSystem, UnkStruct_ov23_022513B0 * param1); -static void ov23_02251F94(FieldSystem * fieldSystem); -static void ov23_022521C8(UnkStruct_ov23_02250CD4 * param0); +static void ov23_022520E8(FieldSystem *fieldSystem, UnkStruct_ov23_022513B0 *param1); +static void ov23_02251F94(FieldSystem *fieldSystem); +static void ov23_022521C8(UnkStruct_ov23_02250CD4 *param0); static const UnkStruct_ov61_0222C884 Unk_ov23_022569C8 = { 0x3, @@ -92,7 +91,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov23_022569C8 = { 0x21F }; -void ov23_0225128C (UnkStruct_ov23_02250CD4 * param0, int param1, int param2, int param3) +void ov23_0225128C(UnkStruct_ov23_02250CD4 *param0, int param1, int param2, int param3) { if (param2 <= param3) { return; @@ -113,7 +112,7 @@ void ov23_0225128C (UnkStruct_ov23_02250CD4 * param0, int param1, int param2, in sub_0206A870(param0->unk_08); } -int ov23_022512D4 (UnkStruct_ov23_0224271C * param0, int param1) +int ov23_022512D4(UnkStruct_ov23_0224271C *param0, int param1) { int v0; int v1 = param0->unk_00; @@ -149,7 +148,7 @@ int ov23_022512D4 (UnkStruct_ov23_0224271C * param0, int param1) return 0xff; } -BOOL ov23_02251324 (int param0, UnkStruct_ov23_0224271C * param1) +BOOL ov23_02251324(int param0, UnkStruct_ov23_0224271C *param1) { int v0; int v1 = param1->unk_00; @@ -189,15 +188,15 @@ BOOL ov23_02251324 (int param0, UnkStruct_ov23_0224271C * param1) return 0; } -static void ov23_022513A4 (int param0) +static void ov23_022513A4(int param0) { sub_0205948C(0x40); } -void ov23_022513B0 (int param0, int param1, void * param2, void * param3) +void ov23_022513B0(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_022513B0 * v0 = param2; - FieldSystem * fieldSystem = param3; + UnkStruct_ov23_022513B0 *v0 = param2; + FieldSystem *fieldSystem = param3; if (!CommSys_IsSendingMovementData()) { return; @@ -226,14 +225,14 @@ void ov23_022513B0 (int param0, int param1, void * param2, void * param3) } } -int ov23_02251414 (void) +int ov23_02251414(void) { return sizeof(UnkStruct_ov23_022513B0); } -static BOOL ov23_02251418 (int param0, UnkStruct_ov23_02250CD4 * param1) +static BOOL ov23_02251418(int param0, UnkStruct_ov23_02250CD4 *param1) { - UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(param1->fieldSystem)); + UndergroundData *v0 = sub_020298B0(FieldSystem_SaveData(param1->fieldSystem)); int v1; v1 = sub_02028B88(v0, param0); @@ -246,9 +245,9 @@ static BOOL ov23_02251418 (int param0, UnkStruct_ov23_02250CD4 * param1) return 0; } -static int ov23_0225144C (int param0, UnkStruct_ov23_02250CD4 * param1) +static int ov23_0225144C(int param0, UnkStruct_ov23_02250CD4 *param1) { - UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(param1->fieldSystem)); + UndergroundData *v0 = sub_020298B0(FieldSystem_SaveData(param1->fieldSystem)); int v1; if (sub_02028AFC(v0, param0)) { @@ -265,9 +264,9 @@ static int ov23_0225144C (int param0, UnkStruct_ov23_02250CD4 * param1) return 0; } -static void ov23_0225148C (BmpList * param0, u32 param1, u8 param2) +static void ov23_0225148C(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov23_02250CD4 * v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); + UnkStruct_ov23_02250CD4 *v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); int v1 = param1; if (param1 == 0xfffffffe) { @@ -277,9 +276,9 @@ static void ov23_0225148C (BmpList * param0, u32 param1, u8 param2) ov23_02253F60(ov23_022421BC(), 6 + v1, 0, NULL); } -static void ov23_022514B0 (BmpList * param0, u32 param1, u8 param2) +static void ov23_022514B0(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov23_02250CD4 * v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); + UnkStruct_ov23_02250CD4 *v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); int v1 = param1; if (param1 == 0xfffffffe) { @@ -289,9 +288,9 @@ static void ov23_022514B0 (BmpList * param0, u32 param1, u8 param2) ov23_02253F60(ov23_022421BC(), 44 + v1, 0, NULL); } -static BOOL ov23_022514D8 (SysTask * param0, void * param1) +static BOOL ov23_022514D8(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; u16 v2, v3; @@ -308,9 +307,8 @@ static BOOL ov23_022514D8 (SysTask * param0, void * param1) Sound_PlayEffect(1550); v0->unk_2AA = 2; break; - case 0: - { - UndergroundData * v4 = sub_020298B0(v0->fieldSystem->saveData); + case 0: { + UndergroundData *v4 = sub_020298B0(v0->fieldSystem->saveData); if (0 == sub_020289A0(v4)) { ov23_02253F40(ov23_022421BC(), 60, 0, NULL); @@ -322,8 +320,7 @@ static BOOL ov23_022514D8 (SysTask * param0, void * param1) ov23_02253F40(ov23_022421BC(), 56, 0, NULL); v0->unk_2AA = 23; } - } - break; + } break; case 4: Sound_PlayEffect(1500); v0->unk_2AA = 8; @@ -347,7 +344,7 @@ static BOOL ov23_022514D8 (SysTask * param0, void * param1) return 1; } -static void ov23_022515D8 (UnkStruct_ov23_02250CD4 * param0, int param1, int param2, UnkFuncPtr_ov23_022515D8 param3, int param4) +static void ov23_022515D8(UnkStruct_ov23_02250CD4 *param0, int param1, int param2, UnkFuncPtr_ov23_022515D8 param3, int param4) { UnkStruct_ov84_02240FA8 v0; int v1 = param2 + 1; @@ -366,7 +363,7 @@ static void ov23_022515D8 (UnkStruct_ov23_02250CD4 * param0, int param1, int par Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v3; + MessageLoader *v3; int v4 = 0; v3 = MessageLoader_Init(0, 26, 639, 4); @@ -398,7 +395,7 @@ static void ov23_022515D8 (UnkStruct_ov23_02250CD4 * param0, int param1, int par param0->unk_48 = sub_0200112C(&v0, param0->unk_294, param0->unk_290, 4); } -static void ov23_022516E8 (UnkStruct_ov23_02250CD4 * param0, int param1, int param2, UnkFuncPtr_ov23_022515D8 param3, int param4) +static void ov23_022516E8(UnkStruct_ov23_02250CD4 *param0, int param1, int param2, UnkFuncPtr_ov23_022515D8 param3, int param4) { UnkStruct_ov84_02240FA8 v0; int v1 = param2 + 1; @@ -412,7 +409,7 @@ static void ov23_022516E8 (UnkStruct_ov23_02250CD4 * param0, int param1, int par Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v3; + MessageLoader *v3; int v4 = 0; v3 = MessageLoader_Init(0, 26, 639, 4); @@ -444,9 +441,9 @@ static void ov23_022516E8 (UnkStruct_ov23_02250CD4 * param0, int param1, int par param0->unk_48 = sub_0200112C(&v0, param0->unk_294, param0->unk_290, 4); } -static BOOL ov23_022517E0 (SysTask * param0, void * param1) +static BOOL ov23_022517E0(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; u16 v2, v3; @@ -492,9 +489,9 @@ static BOOL ov23_022517E0 (SysTask * param0, void * param1) return 1; } -static BOOL ov23_02251894 (SysTask * param0, void * param1) +static BOOL ov23_02251894(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1, v2; u16 v3, v4; @@ -534,9 +531,9 @@ static BOOL ov23_02251894 (SysTask * param0, void * param1) return 1; } -static BOOL ov23_02251960 (SysTask * param0, void * param1) +static BOOL ov23_02251960(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1, v2; u16 v3, v4; int v5; @@ -583,7 +580,7 @@ static BOOL ov23_02251960 (SysTask * param0, void * param1) return 1; } -static BOOL ov23_02251A58 (UnkStruct_ov23_02250CD4 * param0) +static BOOL ov23_02251A58(UnkStruct_ov23_02250CD4 *param0) { if (ov23_02254238(ov23_022421BC()) == 0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -595,7 +592,7 @@ static BOOL ov23_02251A58 (UnkStruct_ov23_02250CD4 * param0) return 0; } -static void ov23_02251A84 (BOOL param0, FieldSystem * fieldSystem) +static void ov23_02251A84(BOOL param0, FieldSystem *fieldSystem) { VecFx32 v0; @@ -611,10 +608,10 @@ static void ov23_02251A84 (BOOL param0, FieldSystem * fieldSystem) Camera_Move(&v0, fieldSystem->camera); } -static BOOL ov23_02251ACC (TaskManager * param0) +static BOOL ov23_02251ACC(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov23_02251ACC * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov23_02251ACC *v1 = TaskManager_Environment(param0); Location v2; u32 v3; BOOL v4 = 0; @@ -661,7 +658,7 @@ static BOOL ov23_02251ACC (TaskManager * param0) return 0; } -static void ov23_02251BB4 (SysTask * param0, UnkStruct_ov23_02250CD4 * param1) +static void ov23_02251BB4(SysTask *param0, UnkStruct_ov23_02250CD4 *param1) { Strbuf_Free(param1->unk_68); Strbuf_Free(param1->unk_6C); @@ -683,11 +680,11 @@ static void ov23_02251BB4 (SysTask * param0, UnkStruct_ov23_02250CD4 * param1) Heap_FreeToHeap(param1); } -static void ov23_02251C04 (SysTask * param0, void * param1) +static void ov23_02251C04(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1; - UnkStruct_ov23_02251ACC * v2; + UnkStruct_ov23_02251ACC *v2; switch (v0->unk_2AA) { case 0: @@ -838,10 +835,10 @@ static void ov23_02251C04 (SysTask * param0, void * param1) } } -static void ov23_02251F94 (FieldSystem * fieldSystem) +static void ov23_02251F94(FieldSystem *fieldSystem) { UnkStruct_ov84_02240FA8 v0; - UnkStruct_ov23_02250CD4 * v1; + UnkStruct_ov23_02250CD4 *v1; const int v2 = 6; ov23_022430D0(1); @@ -867,9 +864,9 @@ static void ov23_02251F94 (FieldSystem * fieldSystem) ov23_022431EC(v1, v1->unk_04, ov23_02251270); } -static void ov23_02252038 (SysTask * param0, void * param1) +static void ov23_02252038(SysTask *param0, void *param1) { - UnkStruct_ov23_02252038 * v0 = param1; + UnkStruct_ov23_02252038 *v0 = param1; int v1; switch (v0->unk_00) { @@ -902,9 +899,9 @@ static void ov23_02252038 (SysTask * param0, void * param1) } } -static void ov23_022520C8 (SysTask * param0, void * param1) +static void ov23_022520C8(SysTask *param0, void *param1) { - UnkStruct_ov23_02252038 * v0 = param1; + UnkStruct_ov23_02252038 *v0 = param1; if (v0->unk_08) { sub_02002154(v0->unk_08, 4); @@ -914,9 +911,9 @@ static void ov23_022520C8 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov23_022520E8 (FieldSystem * fieldSystem, UnkStruct_ov23_022513B0 * param1) +static void ov23_022520E8(FieldSystem *fieldSystem, UnkStruct_ov23_022513B0 *param1) { - UnkStruct_ov23_02252038 * v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_02250CD4)); + UnkStruct_ov23_02252038 *v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_02250CD4)); MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov23_02252038)); @@ -934,19 +931,19 @@ static void ov23_022520E8 (FieldSystem * fieldSystem, UnkStruct_ov23_022513B0 * ov23_022431EC(v0, v0->unk_10, ov23_022520C8); } -void ov23_0225215C (int param0, int param1, void * param2, void * param3) +void ov23_0225215C(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov23_022513B0 * v0 = param2; + UnkStruct_ov23_022513B0 *v0 = param2; if (ov23_0224AEC4(v0->unk_00, v0->unk_01)) { sub_02035B48(90, v0); } } -void ov23_02252178 (int param0, int param1, void * param2, void * param3) +void ov23_02252178(int param0, int param1, void *param2, void *param3) { - FieldSystem * fieldSystem = param3; - UnkStruct_ov23_022513B0 * v1 = param2; + FieldSystem *fieldSystem = param3; + UnkStruct_ov23_022513B0 *v1 = param2; if (CommSys_CurNetId() == v1->unk_00) { ov23_02254068(ov23_022421AC(), CommInfo_TrainerInfo(v1->unk_01)); @@ -958,7 +955,7 @@ void ov23_02252178 (int param0, int param1, void * param2, void * param3) ov23_0224D500(v1->unk_00, v1->unk_01); } -static void ov23_022521C8 (UnkStruct_ov23_02250CD4 * param0) +static void ov23_022521C8(UnkStruct_ov23_02250CD4 *param0) { u16 v0; diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index 2869caffaa..ec4ac1d02b 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -1,48 +1,47 @@ +#include "overlay023/ov23_022521F0.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" -#include "message.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "savedata.h" #include "field/field_system.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_02248C08.h" +#include "overlay023/ov23_0224F294.h" +#include "overlay023/ov23_02253D40.h" +#include "overlay023/ov23_0225426C.h" +#include "overlay023/ov23_0225429C.h" #include "overlay023/struct_ov23_02250CD4.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "unk_0200112C.h" -#include "unk_02001AF4.h" -#include "unk_02005474.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_system.h" +#include "heap.h" +#include "map_header_data.h" +#include "map_object.h" #include "message.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_0200112C.h" +#include "unk_02001AF4.h" +#include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_0202631C.h" #include "unk_0202854C.h" -#include "communication_information.h" -#include "communication_system.h" -#include "map_header_data.h" -#include "field_system.h" #include "unk_020573FC.h" -#include "comm_player_manager.h" -#include "map_object.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_02248C08.h" -#include "overlay023/ov23_0224F294.h" -#include "overlay023/ov23_022521F0.h" -#include "overlay023/ov23_02253D40.h" -#include "overlay023/ov23_0225426C.h" -#include "overlay023/ov23_0225429C.h" typedef struct { u16 unk_00; @@ -50,30 +49,30 @@ typedef struct { u16 unk_04; } UnkStruct_ov23_02257674; -static void ov23_02252D1C(UnkStruct_ov23_02250CD4 * param0); -static void ov23_02252C78(UnkStruct_ov23_02250CD4 * param0); +static void ov23_02252D1C(UnkStruct_ov23_02250CD4 *param0); +static void ov23_02252C78(UnkStruct_ov23_02250CD4 *param0); UnkStruct_ov23_02257674 Unk_ov23_02257674[] = { - {0x0, 0x48, 0x68}, - {0x0, 0x1A8, 0x57}, - {0x0, 0xC8, 0xB9}, - {0x0, 0x14F, 0x108}, - {0x0, 0xAF, 0x117}, - {0x0, 0x1A8, 0x1B7}, - {0x0, 0x57, 0x1C8}, - {0x0, 0x137, 0x166}, - {0x1, 0xE8, 0x57}, - {0x1, 0x148, 0x97}, - {0x1, 0xE8, 0xD7}, - {0x1, 0xE8, 0x12A}, - {0x1, 0x117, 0x148}, - {0x1, 0x117, 0x1C8}, - {0x1, 0xB7, 0x188}, - {0x1, 0x117, 0xF5}, - {0x2, 0x28, 0x1D7}, - {0x2, 0x1D7, 0x48}, - {0x2, 0x1D7, 0x1D7}, - {0x2, 0x28, 0x48} + { 0x0, 0x48, 0x68 }, + { 0x0, 0x1A8, 0x57 }, + { 0x0, 0xC8, 0xB9 }, + { 0x0, 0x14F, 0x108 }, + { 0x0, 0xAF, 0x117 }, + { 0x0, 0x1A8, 0x1B7 }, + { 0x0, 0x57, 0x1C8 }, + { 0x0, 0x137, 0x166 }, + { 0x1, 0xE8, 0x57 }, + { 0x1, 0x148, 0x97 }, + { 0x1, 0xE8, 0xD7 }, + { 0x1, 0xE8, 0x12A }, + { 0x1, 0x117, 0x148 }, + { 0x1, 0x117, 0x1C8 }, + { 0x1, 0xB7, 0x188 }, + { 0x1, 0x117, 0xF5 }, + { 0x2, 0x28, 0x1D7 }, + { 0x2, 0x1D7, 0x48 }, + { 0x2, 0x1D7, 0x1D7 }, + { 0x2, 0x28, 0x48 } }; static const UnkStruct_ov61_0222C884 Unk_ov23_022569D8 = { @@ -86,11 +85,11 @@ static const UnkStruct_ov61_0222C884 Unk_ov23_022569D8 = { 0x21F }; -static void ov23_022521F0 (UnkStruct_ov23_02250CD4 * param0, int param1) +static void ov23_022521F0(UnkStruct_ov23_02250CD4 *param0, int param1) { MATHRandContext16 v0; int v1, v2, v3, v4, v5; - UndergroundData * v6 = sub_020298B0(FieldSystem_SaveData(param0->fieldSystem)); + UndergroundData *v6 = sub_020298B0(FieldSystem_SaveData(param0->fieldSystem)); MATH_InitRand16(&v0, sub_02028930(v6) + param1); @@ -131,12 +130,12 @@ static void ov23_022521F0 (UnkStruct_ov23_02250CD4 * param0, int param1) } } -static void ov23_022522F0 (UnkStruct_ov23_02250CD4 * param0, int param1) +static void ov23_022522F0(UnkStruct_ov23_02250CD4 *param0, int param1) { MATHRandContext16 v0; int v1, v2, v3, v4, v5; - SaveData * v6 = FieldSystem_SaveData(param0->fieldSystem); - UndergroundData * v7 = sub_020298B0(v6); + SaveData *v6 = FieldSystem_SaveData(param0->fieldSystem); + UndergroundData *v7 = sub_020298B0(v6); BOOL v8 = sub_02027474(SaveData_Pokedex(v6)); MATH_InitRand16(&v0, sub_02028930(v7) + param1); @@ -177,10 +176,10 @@ static void ov23_022522F0 (UnkStruct_ov23_02250CD4 * param0, int param1) } } -static int ov23_02252404 (UnkStruct_ov23_02250CD4 * param0, int param1, int param2) +static int ov23_02252404(UnkStruct_ov23_02250CD4 *param0, int param1, int param2) { BOOL v0 = 0; - UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(param0->fieldSystem)); + UndergroundData *v1 = sub_020298B0(FieldSystem_SaveData(param0->fieldSystem)); if (param0->unk_279[param1] != ov23_0224F684(param2, param0)) { return 0xfffd; @@ -207,7 +206,7 @@ static int ov23_02252404 (UnkStruct_ov23_02250CD4 * param0, int param1, int para return param0->unk_274[param1]; } -static void * ov23_022524B8 (UnkStruct_ov23_02250CD4 * param0) +static void *ov23_022524B8(UnkStruct_ov23_02250CD4 *param0) { UnkStruct_ov84_02240FA8 v0; int v1 = 3; @@ -265,9 +264,9 @@ static void * ov23_022524B8 (UnkStruct_ov23_02250CD4 * param0) return param0; } -static void ov23_0225265C (BmpList * param0, u32 param1, u8 param2) +static void ov23_0225265C(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov23_02250CD4 * v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); + UnkStruct_ov23_02250CD4 *v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); u32 v1 = param1; BGL_FillWindow(&v0->unk_20, 15); @@ -299,11 +298,11 @@ static void ov23_0225265C (BmpList * param0, u32 param1, u8 param2) } } -static void ov23_02252754 (BmpList * param0, u32 param1, u8 param2) +static void ov23_02252754(BmpList *param0, u32 param1, u8 param2) { MATHRandContext16 v0; - UnkStruct_ov23_02250CD4 * v1 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); - UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(v1->fieldSystem)); + UnkStruct_ov23_02250CD4 *v1 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19); + UndergroundData *v2 = sub_020298B0(FieldSystem_SaveData(v1->fieldSystem)); int v3 = param1, v4, v5; int v6, v7 = 0, v8; @@ -383,9 +382,9 @@ static void ov23_02252754 (BmpList * param0, u32 param1, u8 param2) } } -static int ov23_02252A04 (int param0, void * param1) +static int ov23_02252A04(int param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; if (param0 >= 5) { return 0; @@ -394,7 +393,7 @@ static int ov23_02252A04 (int param0, void * param1) return v0->unk_274[param0]; } -static void ov23_02252A18 (UnkStruct_ov23_02250CD4 * param0) +static void ov23_02252A18(UnkStruct_ov23_02250CD4 *param0) { UnkStruct_ov84_02240FA8 v0; const int v1 = 5 + 1; @@ -406,7 +405,7 @@ static void ov23_02252A18 (UnkStruct_ov23_02250CD4 * param0) Window_Show(¶m0->unk_10, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v2; + MessageLoader *v2; int v3; if (param0->unk_2AC == 1) { @@ -447,7 +446,7 @@ static void ov23_02252A18 (UnkStruct_ov23_02250CD4 * param0) sub_0201A954(¶m0->unk_10); } -static void ov23_02252B90 (UnkStruct_ov23_02250CD4 * param0, BOOL param1) +static void ov23_02252B90(UnkStruct_ov23_02250CD4 *param0, BOOL param1) { if (BGL_WindowAdded(¶m0->unk_20)) { Window_Clear(¶m0->unk_20, 1); @@ -457,7 +456,7 @@ static void ov23_02252B90 (UnkStruct_ov23_02250CD4 * param0, BOOL param1) ov23_0224FB7C(param0); } -static void ov23_02252BB8 (int param0, UnkStruct_ov23_02250CD4 * param1) +static void ov23_02252BB8(int param0, UnkStruct_ov23_02250CD4 *param1) { int v0; @@ -476,9 +475,9 @@ static void ov23_02252BB8 (int param0, UnkStruct_ov23_02250CD4 * param1) ov23_02252C9C(10); } -static u32 ov23_02252C08 (UnkStruct_ov23_02250CD4 * param0) +static u32 ov23_02252C08(UnkStruct_ov23_02250CD4 *param0) { - UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(param0->fieldSystem)); + UndergroundData *v0 = sub_020298B0(FieldSystem_SaveData(param0->fieldSystem)); if (ov23_0224F6E0(param0->unk_279[0], param0->unk_27E[0])) { if (param0->unk_2AC == 1) { @@ -495,9 +494,9 @@ static u32 ov23_02252C08 (UnkStruct_ov23_02250CD4 * param0) return 0xfffc; } -int ov23_02252C70 (void * param0) +int ov23_02252C70(void *param0) { - UnkStruct_ov23_02250CD4 * v0 = param0; + UnkStruct_ov23_02250CD4 *v0 = param0; u32 v1 = 0xfffe; u32 v2 = 0xfffe; u16 v3, v4; @@ -505,7 +504,7 @@ int ov23_02252C70 (void * param0) return v2; } -static void ov23_02252C78 (UnkStruct_ov23_02250CD4 * param0) +static void ov23_02252C78(UnkStruct_ov23_02250CD4 *param0) { Strbuf_Free(param0->unk_68); Strbuf_Free(param0->unk_6C); @@ -513,13 +512,13 @@ static void ov23_02252C78 (UnkStruct_ov23_02250CD4 * param0) Heap_FreeToHeap(param0); } -void * ov23_02252C98 (int param0, FieldSystem * fieldSystem, int param2) +void *ov23_02252C98(int param0, FieldSystem *fieldSystem, int param2) { - UnkStruct_ov23_02250CD4 * v0 = NULL; + UnkStruct_ov23_02250CD4 *v0 = NULL; return v0; } -int ov23_02252C9C (int param0) +int ov23_02252C9C(int param0) { ov23_02253DFC(ov23_022421BC(), 636, 1); ov23_02254068(ov23_022421BC(), CommInfo_TrainerInfo(CommSys_CurNetId())); @@ -527,27 +526,27 @@ int ov23_02252C9C (int param0) return ov23_02253F40(ov23_022421BC(), param0, 0, NULL); } -void ov23_02252CD4 (void) +void ov23_02252CD4(void) { ov23_02254044(ov23_022421BC()); } -void ov23_02252CE0 (int param0, int param1) +void ov23_02252CE0(int param0, int param1) { ov23_022541A0(ov23_022421BC(), param0, param1); } -void ov23_02252CF4 (int param0, int param1) +void ov23_02252CF4(int param0, int param1) { ov23_022541B4(ov23_022421BC(), param0, param1); } -void ov23_02252D08 (int param0, int param1) +void ov23_02252D08(int param0, int param1) { ov23_022541C8(ov23_022421BC(), param0, param1); } -static void ov23_02252D1C (UnkStruct_ov23_02250CD4 * param0) +static void ov23_02252D1C(UnkStruct_ov23_02250CD4 *param0) { if (!BGL_WindowAdded(¶m0->unk_20)) { BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_20, 3, 1, 12, 12, 4, 13, 1); @@ -558,7 +557,7 @@ static void ov23_02252D1C (UnkStruct_ov23_02250CD4 * param0) sub_0201A954(¶m0->unk_20); } -void ov23_02252D74 (UnkStruct_ov23_02250CD4 * param0, int param1) +void ov23_02252D74(UnkStruct_ov23_02250CD4 *param0, int param1) { BGL_AddWindow(param0->fieldSystem->unk_08, ¶m0->unk_30, 3, 1, 1, 7, 4, 13, 51); Window_Show(¶m0->unk_30, 1, 1024 - (18 + 12) - 9, 11); @@ -571,7 +570,7 @@ void ov23_02252D74 (UnkStruct_ov23_02250CD4 * param0, int param1) sub_0201A9A4(¶m0->unk_30); } -void ov23_02252DF4 (UnkStruct_ov23_02250CD4 * param0) +void ov23_02252DF4(UnkStruct_ov23_02250CD4 *param0) { if (BGL_WindowAdded(¶m0->unk_30)) { Window_Clear(¶m0->unk_30, 1); @@ -579,7 +578,7 @@ void ov23_02252DF4 (UnkStruct_ov23_02250CD4 * param0) } } -void ov23_02252E18 (UnkStruct_ov23_02250CD4 * param0) +void ov23_02252E18(UnkStruct_ov23_02250CD4 *param0) { if (BGL_WindowAdded(¶m0->unk_30)) { Window_Clear(¶m0->unk_30, 0); @@ -587,7 +586,7 @@ void ov23_02252E18 (UnkStruct_ov23_02250CD4 * param0) } } -static int ov23_02252E3C (int param0, int param1, int * param2) +static int ov23_02252E3C(int param0, int param1, int *param2) { int v0, v1 = NELEMS(Unk_ov23_02257674); @@ -602,9 +601,9 @@ static int ov23_02252E3C (int param0, int param1, int * param2) return 0; } -static void ov23_02252E70 (SysTask * param0, void * param1) +static void ov23_02252E70(SysTask *param0, void *param1) { - UnkStruct_ov23_02250CD4 * v0 = param1; + UnkStruct_ov23_02250CD4 *v0 = param1; u32 v1 = 0xfffe; u32 v2 = 0xfffe; u16 v3, v4, v5; @@ -912,13 +911,13 @@ static void ov23_02252E70 (SysTask * param0, void * param1) } } -void ov23_022534A0 (FieldSystem * fieldSystem) +void ov23_022534A0(FieldSystem *fieldSystem) { UnkStruct_ov84_02240FA8 v0; int v1 = sub_02058D88(CommSys_CurNetId()); int v2 = sub_02058DC0(CommSys_CurNetId()); int v3 = CommPlayer_GetOppositeDir(CommPlayer_Dir(CommSys_CurNetId())); - UnkStruct_ov23_02250CD4 * v4; + UnkStruct_ov23_02250CD4 *v4; const int v5 = 6; int v6; int v7 = ov23_02252E3C(v1, v2, &v6); @@ -942,8 +941,8 @@ void ov23_022534A0 (FieldSystem * fieldSystem) { int v8, v9; - const ObjectEvent * v10; - MapObject * v11; + const ObjectEvent *v10; + MapObject *v11; v8 = MapHeaderData_GetNumObjectEvents(v4->fieldSystem); v10 = MapHeaderData_GetObjectEvents(v4->fieldSystem); diff --git a/src/overlay023/ov23_02253D40.c b/src/overlay023/ov23_02253D40.c index 8083aaa81c..a241b54528 100644 --- a/src/overlay023/ov23_02253D40.c +++ b/src/overlay023/ov23_02253D40.c @@ -1,38 +1,36 @@ +#include "overlay023/ov23_02253D40.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "overlay023/struct_ov23_02253E2C_decl.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay023/struct_ov23_02253E2C_decl.h" #include "overlay023/struct_ov23_02253F60.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "core_sys.h" +#include "heap.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "overlay023/ov23_02253D40.h" typedef struct UnkStruct_ov23_02253E2C_t { - Strbuf* unk_00; - Strbuf* unk_04; + Strbuf *unk_00; + Strbuf *unk_04; Window unk_08; - BGL * unk_18; + BGL *unk_18; UnkStruct_ov23_02253F60 unk_1C; - SysTask * unk_20; - MessageLoader * unk_24; - StringTemplate * unk_28; + SysTask *unk_20; + MessageLoader *unk_24; + StringTemplate *unk_28; int unk_2C; int unk_30; int unk_34; @@ -46,7 +44,7 @@ typedef struct UnkStruct_ov23_02253E2C_t { }; void ov23_022421EC(void); -static void ov23_02253FA4(UnkStruct_ov23_02253E2C * param0, BOOL param1); +static void ov23_02253FA4(UnkStruct_ov23_02253E2C *param0, BOOL param1); static const UnkStruct_ov84_02240FA8 Unk_ov23_022569E0 = { NULL, @@ -70,15 +68,15 @@ static const UnkStruct_ov84_02240FA8 Unk_ov23_022569E0 = { NULL }; -const UnkStruct_ov84_02240FA8 * ov23_02253D40 (void) +const UnkStruct_ov84_02240FA8 *ov23_02253D40(void) { return &Unk_ov23_022569E0; } -UnkStruct_ov23_02253E2C * ov23_02253D48 (int param0, int param1, BGL * param2, int param3, int param4) +UnkStruct_ov23_02253E2C *ov23_02253D48(int param0, int param1, BGL *param2, int param3, int param4) { int v0 = param4; - UnkStruct_ov23_02253E2C * v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov23_02253E2C)); + UnkStruct_ov23_02253E2C *v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov23_02253E2C)); MI_CpuClear8(v1, sizeof(UnkStruct_ov23_02253E2C)); @@ -106,7 +104,7 @@ UnkStruct_ov23_02253E2C * ov23_02253D48 (int param0, int param1, BGL * param2, i return v1; } -void ov23_02253DD8 (UnkStruct_ov23_02253E2C * param0) +void ov23_02253DD8(UnkStruct_ov23_02253E2C *param0) { Strbuf_Free(param0->unk_00); Strbuf_Free(param0->unk_04); @@ -115,7 +113,7 @@ void ov23_02253DD8 (UnkStruct_ov23_02253E2C * param0) Heap_FreeToHeap(param0); } -void ov23_02253DFC (UnkStruct_ov23_02253E2C * param0, int param1, int param2) +void ov23_02253DFC(UnkStruct_ov23_02253E2C *param0, int param1, int param2) { if (param0->unk_2C != param1) { param0->unk_2C = param1; @@ -126,21 +124,21 @@ void ov23_02253DFC (UnkStruct_ov23_02253E2C * param0, int param1, int param2) } } -void ov23_02253E2C (UnkStruct_ov23_02253E2C * param0, BGL * param1, u16 param2, u16 param3) +void ov23_02253E2C(UnkStruct_ov23_02253E2C *param0, BGL *param1, u16 param2, u16 param3) { param0->unk_18 = param1; param0->unk_42 = param2; param0->unk_40 = param3; } -MessageLoader * ov23_02253E3C (UnkStruct_ov23_02253E2C * param0) +MessageLoader *ov23_02253E3C(UnkStruct_ov23_02253E2C *param0) { return param0->unk_24; } -static void ov23_02253E40 (SysTask * param0, void * param1) +static void ov23_02253E40(SysTask *param0, void *param1) { - UnkStruct_ov23_02253E2C * v0 = param1; + UnkStruct_ov23_02253E2C *v0 = param1; if (v0->unk_30 < 8) { if (Message_Printing(v0->unk_30) != 0) { @@ -153,9 +151,9 @@ static void ov23_02253E40 (SysTask * param0, void * param1) } } -static Strbuf* ov23_02253E6C (UnkStruct_ov23_02253E2C * param0) +static Strbuf *ov23_02253E6C(UnkStruct_ov23_02253E2C *param0) { - Strbuf* v0 = param0->unk_00; + Strbuf *v0 = param0->unk_00; if (param0->unk_44_1) { StringTemplate_Format(param0->unk_28, param0->unk_04, param0->unk_00); @@ -166,9 +164,9 @@ static Strbuf* ov23_02253E6C (UnkStruct_ov23_02253E2C * param0) return v0; } -static int ov23_02253E90 (UnkStruct_ov23_02253E2C * param0, BOOL param1, UnkStruct_ov23_02253F60 param2, int param3) +static int ov23_02253E90(UnkStruct_ov23_02253E2C *param0, BOOL param1, UnkStruct_ov23_02253F60 param2, int param3) { - Strbuf* v0; + Strbuf *v0; ov23_02253FA4(param0, 0); ov23_022421EC(); @@ -196,13 +194,13 @@ static int ov23_02253E90 (UnkStruct_ov23_02253E2C * param0, BOOL param1, UnkStru return param0->unk_30; } -int ov23_02253F40 (UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3) +int ov23_02253F40(UnkStruct_ov23_02253E2C *param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3) { MessageLoader_GetStrbuf(param0->unk_24, param1, param0->unk_00); return ov23_02253E90(param0, param2, param3, 0); } -int ov23_02253F60 (UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3) +int ov23_02253F60(UnkStruct_ov23_02253E2C *param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3) { int v0, v1; @@ -216,18 +214,18 @@ int ov23_02253F60 (UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, Un return v0; } -int ov23_02253F78 (UnkStruct_ov23_02253E2C * param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3, int param4) +int ov23_02253F78(UnkStruct_ov23_02253E2C *param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3, int param4) { MessageLoader_GetStrbuf(param0->unk_24, param1, param0->unk_00); return ov23_02253E90(param0, param2, param3, param4); } -void ov23_02253F98 (UnkStruct_ov23_02253E2C * param0) +void ov23_02253F98(UnkStruct_ov23_02253E2C *param0) { param0->unk_44_2 = 1; } -static void ov23_02253FA4 (UnkStruct_ov23_02253E2C * param0, int param1) +static void ov23_02253FA4(UnkStruct_ov23_02253E2C *param0, int param1) { if (param0->unk_44_0) { param0->unk_44_0 = 0; @@ -266,119 +264,119 @@ static void ov23_02253FA4 (UnkStruct_ov23_02253E2C * param0, int param1) } } -void ov23_02254044 (UnkStruct_ov23_02253E2C * param0) +void ov23_02254044(UnkStruct_ov23_02253E2C *param0) { ov23_02253FA4(param0, 2); } -void ov23_02254050 (UnkStruct_ov23_02253E2C * param0, TrainerInfo * param1) +void ov23_02254050(UnkStruct_ov23_02253E2C *param0, TrainerInfo *param1) { StringTemplate_SetPlayerName(param0->unk_28, 1, param1); param0->unk_44_1 = 1; } -void ov23_02254068 (UnkStruct_ov23_02253E2C * param0, TrainerInfo * param1) +void ov23_02254068(UnkStruct_ov23_02253E2C *param0, TrainerInfo *param1) { StringTemplate_SetPlayerName(param0->unk_28, 0, param1); param0->unk_44_1 = 1; } -void ov23_02254080 (UnkStruct_ov23_02253E2C * param0, int param1) +void ov23_02254080(UnkStruct_ov23_02253E2C *param0, int param1) { StringTemplate_SetUndergroundItemNameWithArticle(param0->unk_28, 2, param1); param0->unk_44_1 = 1; } -void ov23_02254098 (UnkStruct_ov23_02253E2C * param0, int param1) +void ov23_02254098(UnkStruct_ov23_02253E2C *param0, int param1) { StringTemplate_SetUndergroundTrapName(param0->unk_28, 3, param1); param0->unk_44_1 = 1; } -void ov23_022540B0 (UnkStruct_ov23_02253E2C * param0, int param1) +void ov23_022540B0(UnkStruct_ov23_02253E2C *param0, int param1) { StringTemplate_SetUndergroundQuestion(param0->unk_28, 5, param1); param0->unk_44_1 = 1; } -void ov23_022540C8 (UnkStruct_ov23_02253E2C * param0, int param1) +void ov23_022540C8(UnkStruct_ov23_02253E2C *param0, int param1) { StringTemplate_SetUndergroundAnswer(param0->unk_28, 5, param1); param0->unk_44_1 = 1; } -void ov23_022540E0 (UnkStruct_ov23_02253E2C * param0, int param1, int param2) +void ov23_022540E0(UnkStruct_ov23_02253E2C *param0, int param1, int param2) { StringTemplate_SetUndergroundAnswer(param0->unk_28, param1, param2); param0->unk_44_1 = 1; } -void ov23_022540F4 (UnkStruct_ov23_02253E2C * param0, int param1) +void ov23_022540F4(UnkStruct_ov23_02253E2C *param0, int param1) { StringTemplate_SetUndergroundGoodsName(param0->unk_28, 2, param1); param0->unk_44_1 = 1; } -void ov23_0225410C (UnkStruct_ov23_02253E2C * param0, int param1, int param2) +void ov23_0225410C(UnkStruct_ov23_02253E2C *param0, int param1, int param2) { StringTemplate_SetNumber(param0->unk_28, param1, param2, 1, 0, 1); param0->unk_44_1 = 1; } -void ov23_0225412C (UnkStruct_ov23_02253E2C * param0, int param1) +void ov23_0225412C(UnkStruct_ov23_02253E2C *param0, int param1) { StringTemplate_SetNumber(param0->unk_28, 6, param1, 2, 0, 1); param0->unk_44_1 = 1; } -void ov23_02254154 (UnkStruct_ov23_02253E2C * param0, int param1, int param2) +void ov23_02254154(UnkStruct_ov23_02253E2C *param0, int param1, int param2) { StringTemplate_SetNumber(param0->unk_28, param1, param2, 2, 0, 1); param0->unk_44_1 = 1; } -void ov23_02254178 (UnkStruct_ov23_02253E2C * param0, int param1) +void ov23_02254178(UnkStruct_ov23_02253E2C *param0, int param1) { StringTemplate_SetNumber(param0->unk_28, 6, param1, 6, 0, 1); param0->unk_44_1 = 1; } -void ov23_022541A0 (UnkStruct_ov23_02253E2C * param0, int param1, int param2) +void ov23_022541A0(UnkStruct_ov23_02253E2C *param0, int param1, int param2) { StringTemplate_SetUndergroundItemName(param0->unk_28, param1, param2); param0->unk_44_1 = 1; } -void ov23_022541B4 (UnkStruct_ov23_02253E2C * param0, int param1, int param2) +void ov23_022541B4(UnkStruct_ov23_02253E2C *param0, int param1, int param2) { StringTemplate_SetUndergroundTrapName(param0->unk_28, param1, param2); param0->unk_44_1 = 1; } -void ov23_022541C8 (UnkStruct_ov23_02253E2C * param0, int param1, int param2) +void ov23_022541C8(UnkStruct_ov23_02253E2C *param0, int param1, int param2) { StringTemplate_SetUndergroundGoodsName(param0->unk_28, param1, param2); param0->unk_44_1 = 1; } -void ov23_022541DC (UnkStruct_ov23_02253E2C * param0, int param1, int param2) +void ov23_022541DC(UnkStruct_ov23_02253E2C *param0, int param1, int param2) { StringTemplate_SetUndergroundItemNameWithArticle(param0->unk_28, param1, param2); param0->unk_44_1 = 1; } -void ov23_022541F0 (UnkStruct_ov23_02253E2C * param0, int param1, int param2) +void ov23_022541F0(UnkStruct_ov23_02253E2C *param0, int param1, int param2) { StringTemplate_SetUndergroundTrapNameWithArticle(param0->unk_28, param1, param2); param0->unk_44_1 = 1; } -void ov23_02254204 (UnkStruct_ov23_02253E2C * param0, int param1) +void ov23_02254204(UnkStruct_ov23_02253E2C *param0, int param1) { StringTemplate_CapitalizeArgAtIndex(param0->unk_28, param1); } -void ov23_02254210 (UnkStruct_ov23_02253E2C * param0) +void ov23_02254210(UnkStruct_ov23_02253E2C *param0) { if (param0->unk_30 < 8) { if (Message_Printing(param0->unk_30)) { @@ -388,7 +386,7 @@ void ov23_02254210 (UnkStruct_ov23_02253E2C * param0) } } -BOOL ov23_02254238 (UnkStruct_ov23_02253E2C * param0) +BOOL ov23_02254238(UnkStruct_ov23_02253E2C *param0) { if (param0->unk_30 == 8) { return 0; @@ -397,7 +395,7 @@ BOOL ov23_02254238 (UnkStruct_ov23_02253E2C * param0) return Message_Printing(param0->unk_30); } -void ov23_02254250 (UnkStruct_ov23_02253E2C * param0) +void ov23_02254250(UnkStruct_ov23_02253E2C *param0) { if ((param0->unk_30 < 8) && (!Message_Printing(param0->unk_30))) { param0->unk_30 = 8; diff --git a/src/overlay023/ov23_0225426C.c b/src/overlay023/ov23_0225426C.c index e9bade7858..88450f9c26 100644 --- a/src/overlay023/ov23_0225426C.c +++ b/src/overlay023/ov23_0225426C.c @@ -1,87 +1,86 @@ +#include "overlay023/ov23_0225426C.h" + #include #include -#include "overlay023/ov23_0225426C.h" - typedef struct { u8 unk_00[3]; } UnkStruct_ov23_02256A00; static const UnkStruct_ov23_02256A00 Unk_ov23_02256A00[] = { - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x2, 0xF, 0x14 }, - { 0x1, 0x32, 0x3C }, - { 0x3, 0x19, 0x23 }, - { 0x2, 0x23, 0x2D }, - { 0x2, 0x19, 0x23 }, - { 0x3, 0x19, 0x23 }, - { 0x1, 0x19, 0x23 }, - { 0x2, 0x19, 0x23 }, - { 0x3, 0x19, 0x23 }, - { 0x4, 0x19, 0x23 }, - { 0x5, 0x19, 0x23 }, - { 0x4, 0x0, 0x0 }, - { 0x4, 0x1E, 0x32 }, - { 0x5, 0x1E, 0x32 }, - { 0x4, 0x1E, 0x32 }, - { 0x5, 0x1E, 0x32 }, - { 0x1, 0x1E, 0x32 }, - { 0x2, 0x19, 0x23 }, - { 0x2, 0x5, 0xA }, - { 0x2, 0x28, 0x32 }, - { 0x3, 0x14, 0x19 }, - { 0x4, 0x14, 0x19 }, - { 0x1, 0x14, 0x19 }, - { 0x5, 0x14, 0x19 }, - { 0x3, 0x5, 0xA }, - { 0x4, 0x1E, 0x32 }, - { 0x5, 0x1E, 0x32 }, - { 0x2, 0x28, 0x32 }, - { 0x1, 0x28, 0x32 }, - { 0x2, 0x23, 0x28 }, - { 0x1, 0x23, 0x28 }, - { 0x3, 0x28, 0x32 }, - { 0x4, 0x28, 0x32 }, - { 0x3, 0x46, 0x50 }, - { 0x4, 0x46, 0x50 }, - { 0x1, 0x46, 0x50 }, - { 0x5, 0x46, 0x50 }, - { 0x4, 0x46, 0x50 }, - { 0x1, 0x46, 0x50 }, - { 0x2, 0x46, 0x50 }, - { 0x5, 0x46, 0x50 }, - { 0x4, 0x46, 0x50 }, - { 0x2, 0x46, 0x50 }, - { 0x5, 0x46, 0x50 }, - { 0x1, 0x46, 0x50 }, - { 0x2, 0x46, 0x50 }, - { 0x3, 0x46, 0x50 }, - { 0x3, 0x46, 0x50 }, - { 0x1, 0x46, 0x50 } + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x2, 0xF, 0x14 }, + { 0x1, 0x32, 0x3C }, + { 0x3, 0x19, 0x23 }, + { 0x2, 0x23, 0x2D }, + { 0x2, 0x19, 0x23 }, + { 0x3, 0x19, 0x23 }, + { 0x1, 0x19, 0x23 }, + { 0x2, 0x19, 0x23 }, + { 0x3, 0x19, 0x23 }, + { 0x4, 0x19, 0x23 }, + { 0x5, 0x19, 0x23 }, + { 0x4, 0x0, 0x0 }, + { 0x4, 0x1E, 0x32 }, + { 0x5, 0x1E, 0x32 }, + { 0x4, 0x1E, 0x32 }, + { 0x5, 0x1E, 0x32 }, + { 0x1, 0x1E, 0x32 }, + { 0x2, 0x19, 0x23 }, + { 0x2, 0x5, 0xA }, + { 0x2, 0x28, 0x32 }, + { 0x3, 0x14, 0x19 }, + { 0x4, 0x14, 0x19 }, + { 0x1, 0x14, 0x19 }, + { 0x5, 0x14, 0x19 }, + { 0x3, 0x5, 0xA }, + { 0x4, 0x1E, 0x32 }, + { 0x5, 0x1E, 0x32 }, + { 0x2, 0x28, 0x32 }, + { 0x1, 0x28, 0x32 }, + { 0x2, 0x23, 0x28 }, + { 0x1, 0x23, 0x28 }, + { 0x3, 0x28, 0x32 }, + { 0x4, 0x28, 0x32 }, + { 0x3, 0x46, 0x50 }, + { 0x4, 0x46, 0x50 }, + { 0x1, 0x46, 0x50 }, + { 0x5, 0x46, 0x50 }, + { 0x4, 0x46, 0x50 }, + { 0x1, 0x46, 0x50 }, + { 0x2, 0x46, 0x50 }, + { 0x5, 0x46, 0x50 }, + { 0x4, 0x46, 0x50 }, + { 0x2, 0x46, 0x50 }, + { 0x5, 0x46, 0x50 }, + { 0x1, 0x46, 0x50 }, + { 0x2, 0x46, 0x50 }, + { 0x3, 0x46, 0x50 }, + { 0x3, 0x46, 0x50 }, + { 0x1, 0x46, 0x50 } }; - -const u8 ov23_0225426C (const int param0) +const u8 ov23_0225426C(const int param0) { return Unk_ov23_02256A00[param0].unk_00[0]; } -const u8 ov23_0225427C (const int param0) +const u8 ov23_0225427C(const int param0) { return Unk_ov23_02256A00[param0].unk_00[1]; } -const u8 ov23_0225428C (const int param0) +const u8 ov23_0225428C(const int param0) { return Unk_ov23_02256A00[param0].unk_00[2]; } diff --git a/src/overlay023/ov23_0225429C.c b/src/overlay023/ov23_0225429C.c index f4333c6046..0cac930b1a 100644 --- a/src/overlay023/ov23_0225429C.c +++ b/src/overlay023/ov23_0225429C.c @@ -1,60 +1,60 @@ +#include "overlay023/ov23_0225429C.h" + #include #include -#include "overlay023/ov23_0225429C.h" - typedef struct { u8 unk_00[3]; } UnkStruct_ov23_02256AB4; static const UnkStruct_ov23_02256AB4 Unk_ov23_02256AB4[] = { - { 0x0, 0x0, 0x0 }, - { 0x4, 0x3, 0x6 }, - { 0x3, 0x3, 0x6 }, - { 0x4, 0x3, 0x6 }, - { 0x3, 0x3, 0x6 }, - { 0x4, 0xC, 0xF }, - { 0x3, 0xC, 0xF }, - { 0x4, 0xC, 0xF }, - { 0x3, 0xC, 0xF }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x1, 0x3, 0x6 }, - { 0x1, 0xC, 0xF }, - { 0x2, 0xA, 0xC }, - { 0x2, 0xA, 0xC }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x3, 0x5, 0x7 }, - { 0x3, 0xC, 0x10 }, - { 0x4, 0x3, 0x6 }, - { 0x4, 0x8, 0xF }, - { 0x4, 0x5, 0x7 }, - { 0x4, 0xC, 0x10 }, - { 0x2, 0x5, 0x9 }, - { 0x2, 0x5, 0x9 }, - { 0x2, 0x5, 0x9 }, - { 0x2, 0x5, 0x9 }, - { 0x5, 0xF, 0x13 }, - { 0x5, 0x1E, 0x28 }, - { 0x3, 0x5, 0x9 }, - { 0x3, 0x14, 0x1E }, - { 0x0, 0x0, 0x0 }, - { 0x6, 0xF, 0x14 } + { 0x0, 0x0, 0x0 }, + { 0x4, 0x3, 0x6 }, + { 0x3, 0x3, 0x6 }, + { 0x4, 0x3, 0x6 }, + { 0x3, 0x3, 0x6 }, + { 0x4, 0xC, 0xF }, + { 0x3, 0xC, 0xF }, + { 0x4, 0xC, 0xF }, + { 0x3, 0xC, 0xF }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x1, 0x3, 0x6 }, + { 0x1, 0xC, 0xF }, + { 0x2, 0xA, 0xC }, + { 0x2, 0xA, 0xC }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + { 0x3, 0x5, 0x7 }, + { 0x3, 0xC, 0x10 }, + { 0x4, 0x3, 0x6 }, + { 0x4, 0x8, 0xF }, + { 0x4, 0x5, 0x7 }, + { 0x4, 0xC, 0x10 }, + { 0x2, 0x5, 0x9 }, + { 0x2, 0x5, 0x9 }, + { 0x2, 0x5, 0x9 }, + { 0x2, 0x5, 0x9 }, + { 0x5, 0xF, 0x13 }, + { 0x5, 0x1E, 0x28 }, + { 0x3, 0x5, 0x9 }, + { 0x3, 0x14, 0x1E }, + { 0x0, 0x0, 0x0 }, + { 0x6, 0xF, 0x14 } }; -const u8 ov23_0225429C (const int param0) +const u8 ov23_0225429C(const int param0) { return Unk_ov23_02256AB4[param0].unk_00[0]; } -const u8 ov23_022542AC (const int param0) +const u8 ov23_022542AC(const int param0) { return Unk_ov23_02256AB4[param0].unk_00[1]; } -const u8 ov23_022542BC (const int param0) +const u8 ov23_022542BC(const int param0) { return Unk_ov23_02256AB4[param0].unk_00[2]; } diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c index 2cc6b1fe85..fa3824aa06 100644 --- a/src/overlay023/ov23_022542CC.c +++ b/src/overlay023/ov23_022542CC.c @@ -1,63 +1,62 @@ +#include "overlay023/ov23_022542CC.h" + #include #include #include "struct_decls/struct_0200112C_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" -#include "strbuf.h" #include "struct_decls/struct_020298B0_decl.h" -#include "overlay023/struct_ov23_022542D8_decl.h" -#include "overlay023/struct_ov23_02254594_decl.h" - #include "struct_defs/struct_02013A04_t.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0206A844.h" + +#include "field/field_system.h" +#include "overlay023/ov23_02241F74.h" +#include "overlay023/ov23_02248C08.h" +#include "overlay023/ov23_02253D40.h" #include "overlay023/struct_ov23_02248D20.h" +#include "overlay023/struct_ov23_022542D8_decl.h" +#include "overlay023/struct_ov23_02254594_decl.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "unk_0200112C.h" -#include "unk_02005474.h" +#include "heap.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_0200112C.h" +#include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_0202854C.h" #include "unk_0206A780.h" -#include "overlay023/ov23_02241F74.h" -#include "overlay023/ov23_02248C08.h" -#include "overlay023/ov23_02253D40.h" -#include "overlay023/ov23_022542CC.h" typedef struct UnkStruct_ov23_022542D8_t { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; Window unk_04; Window unk_14; - ResourceMetadata * unk_24; - BmpList * unk_28; - Strbuf* unk_2C; - u16 * unk_30; - u16 * unk_34; + ResourceMetadata *unk_24; + BmpList *unk_28; + Strbuf *unk_2C; + u16 *unk_30; + u16 *unk_34; u8 unk_38; u32 unk_3C; u16 unk_40; }; typedef struct UnkStruct_ov23_02254594_t { - FieldSystem * fieldSystem; - UnkStruct_0206A844 * unk_04; + FieldSystem *fieldSystem; + UnkStruct_0206A844 *unk_04; Window unk_08; Window unk_18; - ResourceMetadata * unk_28; - UnkStruct_ov23_02248D20 * unk_2C; - BmpList * unk_30; - Strbuf* unk_34; - u16 * unk_38; - u16 * unk_3C; + ResourceMetadata *unk_28; + UnkStruct_ov23_02248D20 *unk_2C; + BmpList *unk_30; + Strbuf *unk_34; + u16 *unk_38; + u16 *unk_3C; u8 unk_40; u8 unk_41; u8 unk_42; @@ -65,14 +64,14 @@ typedef struct UnkStruct_ov23_02254594_t { int unk_48; }; -static void ov23_0225437C(UnkStruct_ov23_022542D8 * param0); -static void ov23_022544C0(UnkStruct_ov23_022542D8 * param0); -static void ov23_0225451C(UnkStruct_ov23_022542D8 * param0); -static void ov23_022546E0(UnkStruct_ov23_02254594 * param0); -static void ov23_0225461C(UnkStruct_ov23_02254594 * param0); -static void ov23_02254958(UnkStruct_ov23_02254594 * param0); -static void ov23_022549A8(UnkStruct_0206A844 * param0, const u16 param1, const u16 param2, const u16 param3); -static void ov23_022549EC(UnkStruct_ov23_022542D8 * param0); +static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0); +static void ov23_022544C0(UnkStruct_ov23_022542D8 *param0); +static void ov23_0225451C(UnkStruct_ov23_022542D8 *param0); +static void ov23_022546E0(UnkStruct_ov23_02254594 *param0); +static void ov23_0225461C(UnkStruct_ov23_02254594 *param0); +static void ov23_02254958(UnkStruct_ov23_02254594 *param0); +static void ov23_022549A8(UnkStruct_0206A844 *param0, const u16 param1, const u16 param2, const u16 param3); +static void ov23_022549EC(UnkStruct_ov23_022542D8 *param0); static const UnkStruct_ov84_02240FA8 Unk_ov23_02256B3C = { NULL, @@ -96,16 +95,16 @@ static const UnkStruct_ov84_02240FA8 Unk_ov23_02256B3C = { NULL }; -UnkStruct_ov23_022542D8 * ov23_022542CC (void) +UnkStruct_ov23_022542D8 *ov23_022542CC(void) { - UnkStruct_ov23_022542D8 * v0; + UnkStruct_ov23_022542D8 *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_022542D8)); return v0; } -void ov23_022542D8 (UnkStruct_ov23_022542D8 * param0, FieldSystem * fieldSystem, u16 * param2, u16 * param3) +void ov23_022542D8(UnkStruct_ov23_022542D8 *param0, FieldSystem *fieldSystem, u16 *param2, u16 *param3) { param0->fieldSystem = fieldSystem; param0->unk_38 = 0; @@ -116,17 +115,17 @@ void ov23_022542D8 (UnkStruct_ov23_022542D8 * param0, FieldSystem * fieldSystem, sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 2, 4); } -void ov23_0225430C (UnkStruct_ov23_022542D8 * param0) +void ov23_0225430C(UnkStruct_ov23_022542D8 *param0) { Heap_FreeToHeap(param0); } -const u32 ov23_02254314 (UnkStruct_ov23_022542D8 * param0) +const u32 ov23_02254314(UnkStruct_ov23_022542D8 *param0) { return param0->unk_3C; } -BOOL ov23_02254318 (UnkStruct_ov23_022542D8 * param0) +BOOL ov23_02254318(UnkStruct_ov23_022542D8 *param0) { switch (param0->unk_38) { case 0: @@ -144,16 +143,19 @@ BOOL ov23_02254318 (UnkStruct_ov23_022542D8 * param0) return 0; } -static void ov23_02254350 (BmpList * param0, u32 param1, u8 param2) +static void ov23_02254350(BmpList *param0, u32 param1, u8 param2) { const int v0[4] = { - 5, 6, 7, 8, + 5, + 6, + 7, + 8, }; ov23_02253F60(ov23_022421CC(), v0[param1], 0, NULL); } -static void ov23_0225437C (UnkStruct_ov23_022542D8 * param0) +static void ov23_0225437C(UnkStruct_ov23_022542D8 *param0) { UnkStruct_ov84_02240FA8 v0; int v1, v2; @@ -172,16 +174,19 @@ static void ov23_0225437C (UnkStruct_ov23_022542D8 * param0) Window_Show(¶m0->unk_14, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v5; + MessageLoader *v5; int v6; const int v7[3 + 1] = { - 1, 2, 3, 4, + 1, + 2, + 3, + 4, }; v5 = MessageLoader_Init(0, 26, 637, 4); { - Strbuf* v8; + Strbuf *v8; BGL_FillWindow(¶m0->unk_14, 15); v8 = MessageLoader_GetNewStrbuf(v5, 0); @@ -209,7 +214,7 @@ static void ov23_0225437C (UnkStruct_ov23_022542D8 * param0) param0->unk_38 = 1; } -static void ov23_022544C0 (UnkStruct_ov23_022542D8 * param0) +static void ov23_022544C0(UnkStruct_ov23_022542D8 *param0) { u32 v0; @@ -230,20 +235,18 @@ static void ov23_022544C0 (UnkStruct_ov23_022542D8 * param0) param0->unk_38 = 2; Sound_PlayEffect(1500); break; - default: - { + default: { Sound_PlayEffect(1500); param0->unk_3C = v0; param0->unk_38 = 2; Sound_PlayEffect(1500); - } - break; + } break; } return; } -static void ov23_0225451C (UnkStruct_ov23_022542D8 * param0) +static void ov23_0225451C(UnkStruct_ov23_022542D8 *param0) { ov23_02254044(ov23_022421CC()); @@ -256,7 +259,7 @@ static void ov23_0225451C (UnkStruct_ov23_022542D8 * param0) sub_02013A3C(param0->unk_24); } -static void ov23_02254564 (BmpList * param0, u32 param1, u8 param2) +static void ov23_02254564(BmpList *param0, u32 param1, u8 param2) { u8 v0; @@ -269,15 +272,15 @@ static void ov23_02254564 (BmpList * param0, u32 param1, u8 param2) } } -UnkStruct_ov23_02254594 * ov23_02254588 (void) +UnkStruct_ov23_02254594 *ov23_02254588(void) { - UnkStruct_ov23_02254594 * v0; + UnkStruct_ov23_02254594 *v0; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov23_02254594)); return v0; } -void ov23_02254594 (UnkStruct_ov23_02254594 * param0, FieldSystem * fieldSystem, u16 * param2, u16 * param3) +void ov23_02254594(UnkStruct_ov23_02254594 *param0, FieldSystem *fieldSystem, u16 *param2, u16 *param3) { param0->fieldSystem = fieldSystem; param0->unk_42 = 0; @@ -288,23 +291,23 @@ void ov23_02254594 (UnkStruct_ov23_02254594 * param0, FieldSystem * fieldSystem, sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 2, 4); } -void ov23_022545C4 (UnkStruct_ov23_02254594 * param0, const u8 param1, const u8 param2) +void ov23_022545C4(UnkStruct_ov23_02254594 *param0, const u8 param1, const u8 param2) { param0->unk_40 = param1; param0->unk_41 = param2; } -void ov23_022545D0 (UnkStruct_ov23_02254594 * param0) +void ov23_022545D0(UnkStruct_ov23_02254594 *param0) { Heap_FreeToHeap(param0); } -const u32 ov23_022545D8 (UnkStruct_ov23_02254594 * param0) +const u32 ov23_022545D8(UnkStruct_ov23_02254594 *param0) { return param0->unk_44; } -BOOL ov23_022545DC (UnkStruct_ov23_02254594 * param0) +BOOL ov23_022545DC(UnkStruct_ov23_02254594 *param0) { switch (param0->unk_42) { case 0: @@ -326,7 +329,7 @@ BOOL ov23_022545DC (UnkStruct_ov23_02254594 * param0) return 0; } -static void ov23_0225461C (UnkStruct_ov23_02254594 * param0) +static void ov23_0225461C(UnkStruct_ov23_02254594 *param0) { u32 v0; u32 v1; @@ -352,22 +355,20 @@ static void ov23_0225461C (UnkStruct_ov23_02254594 * param0) param0->unk_42 = 2; Sound_PlayEffect(1500); break; - default: - { + default: { param0->unk_44 = v1; param0->unk_42 = 2; Sound_PlayEffect(1500); - } - break; + } break; } return; } -static void ov23_022546A0 (BmpList * param0, u32 param1, u8 param2) +static void ov23_022546A0(BmpList *param0, u32 param1, u8 param2) { int v0; - UndergroundData * v1; + UndergroundData *v1; u32 v2; u32 v3; @@ -385,9 +386,9 @@ static void ov23_022546A0 (BmpList * param0, u32 param1, u8 param2) ov23_02253F60(ov23_022421DC(), v0, 0, NULL); } -static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0) +static void ov23_022546E0(UnkStruct_ov23_02254594 *param0) { - UndergroundData * v0; + UndergroundData *v0; UnkStruct_ov84_02240FA8 v1; int v2, v3; int v4; @@ -413,7 +414,7 @@ static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0) Window_Show(¶m0->unk_18, 1, 1024 - (18 + 12) - 9, 11); { - MessageLoader * v6; + MessageLoader *v6; int v7 = 0; int v8; BOOL v9; @@ -423,11 +424,11 @@ static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0) v6 = MessageLoader_Init(0, 26, 626, 4); { - MessageLoader * v12; - Strbuf* v13; - Strbuf* v14; - Strbuf* v15; - StringTemplate * v16; + MessageLoader *v12; + Strbuf *v13; + Strbuf *v14; + Strbuf *v15; + StringTemplate *v16; v12 = MessageLoader_Init(0, 26, 637, 4); @@ -498,7 +499,7 @@ static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0) param0->unk_42 = 1; } -static void ov23_02254958 (UnkStruct_ov23_02254594 * param0) +static void ov23_02254958(UnkStruct_ov23_02254594 *param0) { ov23_02254044(ov23_022421DC()); Window_Clear(¶m0->unk_18, 1); @@ -512,7 +513,7 @@ static void ov23_02254958 (UnkStruct_ov23_02254594 * param0) sub_0206A844(param0->unk_04); } -static void ov23_022549A8 (UnkStruct_0206A844 * param0, const u16 param1, const u16 param2, const u16 param3) +static void ov23_022549A8(UnkStruct_0206A844 *param0, const u16 param1, const u16 param2, const u16 param3) { if (param2 <= param3) { return; @@ -531,7 +532,7 @@ static void ov23_022549A8 (UnkStruct_0206A844 * param0, const u16 param1, const } } -static void ov23_022549EC (UnkStruct_ov23_022542D8 * param0) +static void ov23_022549EC(UnkStruct_ov23_022542D8 *param0) { u16 v0; diff --git a/src/overlay023/ov23_02254A14.c b/src/overlay023/ov23_02254A14.c index eb3176cd5d..e1c427556e 100644 --- a/src/overlay023/ov23_02254A14.c +++ b/src/overlay023/ov23_02254A14.c @@ -1,37 +1,37 @@ +#include "overlay023/ov23_02254A14.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02029894_decl.h" #include "struct_decls/struct_020298B0_decl.h" #include "struct_decls/struct_020508D4_decl.h" + +#include "field/field_system.h" +#include "field/field_system_sub2_t.h" +#include "overlay005/ov5_021D1A94.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021EAFA4.h" +#include "overlay005/ov5_021EF75C.h" #include "overlay005/struct_ov5_021D1BEC_decl.h" #include "overlay005/struct_ov5_021E1890_decl.h" #include "overlay005/struct_ov5_021EB0E0_decl.h" +#include "overlay006/struct_ov6_0223E6EC.h" +#include "overlay023/ov23_0224B05C.h" +#include "overlay023/ov23_022542CC.h" #include "overlay023/struct_ov23_022542D8_decl.h" #include "overlay023/struct_ov23_02254594_decl.h" -#include "field/field_system.h" -#include "field/field_system_sub2_t.h" -#include "overlay006/struct_ov6_0223E6EC.h" - +#include "core_sys.h" +#include "heap.h" #include "unk_02005474.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_0201C970.h" #include "unk_0201D670.h" #include "unk_0202854C.h" #include "unk_020508D4.h" #include "unk_020573FC.h" -#include "overlay005/ov5_021D1A94.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021EAFA4.h" -#include "overlay005/ov5_021EF75C.h" -#include "overlay023/ov23_0224B05C.h" -#include "overlay023/ov23_022542CC.h" -#include "overlay023/ov23_02254A14.h" typedef struct { int unk_00; @@ -74,7 +74,7 @@ typedef struct { typedef struct { NNSG3dRenderObj unk_00; - NNSG3dResFileHeader * unk_54; + NNSG3dResFileHeader *unk_54; VecFx32 unk_58; int unk_64; int unk_68; @@ -96,11 +96,11 @@ typedef struct { UnkStruct_ov23_02255BF4 unk_5C[32]; UnkStruct_ov23_02256228 unk_4DC; UnkStruct_ov23_02256000 unk_4F0; - UnkStruct_ov23_02255EC4 * unk_4FC; - FieldSystem * fieldSystem; - UnkStruct_ov23_022542D8 * unk_504; - UnkStruct_ov23_02254594 * unk_508; - UnkStruct_ov5_021D1BEC * unk_50C; + UnkStruct_ov23_02255EC4 *unk_4FC; + FieldSystem *fieldSystem; + UnkStruct_ov23_022542D8 *unk_504; + UnkStruct_ov23_02254594 *unk_508; + UnkStruct_ov5_021D1BEC *unk_50C; UnkStruct_ov23_02256098_sub2 unk_510; u16 unk_516; u16 unk_518; @@ -113,49 +113,49 @@ typedef struct { u8 unk_522; } UnkStruct_ov23_02256098; -static BOOL ov23_02254C84(TaskManager * param0); -static BOOL ov23_02254AD4(TaskManager * param0); -static BOOL ov23_02254DF8(TaskManager * param0); -static BOOL ov23_02255100(TaskManager * param0); -static BOOL ov23_02255580(TaskManager * param0); -static BOOL ov23_02255850(TaskManager * param0); -static void ov23_02254A14(FieldSystem * fieldSystem, const int param1, UnkStruct_ov23_02256098 * param2); -static void ov23_02254A94(FieldSystem * fieldSystem, const int param1); -static void ov23_02254AA4(const int param0, UnkStruct_ov23_02256098 * param1); -static BOOL ov23_02255A98(const UnkStruct_ov23_02255A98 * param0, const UnkStruct_ov23_02255BF4 * param1); -static BOOL ov23_02255B14(const int param0, const int param1, const UnkStruct_ov23_02255BF4 * param2, int * param3); -static int ov23_02255B78(const UnkStruct_ov23_02255A98 * param0, UnkStruct_ov23_02255BF4 * param1); -static void ov23_02255BB8(const UnkStruct_ov23_02255A98 * param0, const int param1, UnkStruct_ov23_02255BF4 * param2); -static void ov23_02255BF4(const int param0, UnkStruct_ov23_02255BF4 * param1); -static BOOL ov23_02255C30(const UnkStruct_ov23_02255C30 * param0, const UnkStruct_ov23_02255C30 * param1); -static BOOL ov23_02255C58(const UnkStruct_ov23_02255C30 * param0, const int param1, const int param2); -static BOOL ov23_02255B58(const UnkStruct_ov23_02255C30 * param0); -static void ov23_02255C78(FieldSystem * fieldSystem, UnkStruct_ov23_02256098 * param1, UnkStruct_ov23_02255BF4 * param2); -static void ov23_02255D1C(const int param0, const int param1, const int param2, const int param3, UnkStruct_ov23_02255BF4 * param4); -static void ov23_02255D78(FieldSystem * fieldSystem, UnkStruct_ov23_02255BF4 * param1); -static void ov23_02255DDC(FieldSystem * fieldSystem, const UnkStruct_ov23_02255BF4 * param1); -static const int ov23_02255E14(FieldSystem * fieldSystem, const int param1); -static void ov23_02255E2C(const int param0, UnkStruct_ov23_02256098 * param1); -static void ov23_02255E8C(UnkStruct_ov23_02256098 * param0); -static void ov23_02255EBC(const int param0, UnkStruct_ov23_02256098 * param1); -static void ov23_02255EC4(UnkStruct_ov23_02255EC4 * param0); -static void ov23_02255EF0(UnkStruct_ov23_02255EC4 * param0); -static void ov23_02255EFC(UnkStruct_ov23_02255EC4 * param0); -static void ov23_02255F04(const int param0, const int param1, UnkStruct_ov23_02255EC4 * param2); -static void ov23_02255F20(UnkStruct_ov23_02255EC4 * param0); -static BOOL ov23_02256098(UnkStruct_ov23_02256098 * param0, FieldSystem * fieldSystem, BOOL * param2); -static BOOL ov23_02256104(UnkStruct_ov23_02256098 * param0, FieldSystem * fieldSystem, BOOL * param2); -static BOOL ov23_02256174(UnkStruct_ov23_02256098 * param0, FieldSystem * fieldSystem, BOOL * param2); -static BOOL ov23_022561BC(UnkStruct_ov23_02256098 * param0, FieldSystem * fieldSystem, BOOL * param2); -static void ov23_02256228(UnkStruct_ov23_02256228 * param0); -static void ov23_0225623C(const int param0, const int param1, UnkStruct_ov23_02256228 * param2); -static void ov23_0225624C(FieldSystem * fieldSystem, UnkStruct_ov23_02256228 * param1); -static void ov23_0225628C(FieldSystem * fieldSystem, UnkStruct_ov23_02256228 * param1); -static const int ov23_022562A8(UnkStruct_ov23_02256228 * param0); -static void ov23_022562AC(UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2); -static void ov23_022562B8(UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2); -static void ov23_022562BC(UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2); -static void ov23_022562C8(UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2); +static BOOL ov23_02254C84(TaskManager *param0); +static BOOL ov23_02254AD4(TaskManager *param0); +static BOOL ov23_02254DF8(TaskManager *param0); +static BOOL ov23_02255100(TaskManager *param0); +static BOOL ov23_02255580(TaskManager *param0); +static BOOL ov23_02255850(TaskManager *param0); +static void ov23_02254A14(FieldSystem *fieldSystem, const int param1, UnkStruct_ov23_02256098 *param2); +static void ov23_02254A94(FieldSystem *fieldSystem, const int param1); +static void ov23_02254AA4(const int param0, UnkStruct_ov23_02256098 *param1); +static BOOL ov23_02255A98(const UnkStruct_ov23_02255A98 *param0, const UnkStruct_ov23_02255BF4 *param1); +static BOOL ov23_02255B14(const int param0, const int param1, const UnkStruct_ov23_02255BF4 *param2, int *param3); +static int ov23_02255B78(const UnkStruct_ov23_02255A98 *param0, UnkStruct_ov23_02255BF4 *param1); +static void ov23_02255BB8(const UnkStruct_ov23_02255A98 *param0, const int param1, UnkStruct_ov23_02255BF4 *param2); +static void ov23_02255BF4(const int param0, UnkStruct_ov23_02255BF4 *param1); +static BOOL ov23_02255C30(const UnkStruct_ov23_02255C30 *param0, const UnkStruct_ov23_02255C30 *param1); +static BOOL ov23_02255C58(const UnkStruct_ov23_02255C30 *param0, const int param1, const int param2); +static BOOL ov23_02255B58(const UnkStruct_ov23_02255C30 *param0); +static void ov23_02255C78(FieldSystem *fieldSystem, UnkStruct_ov23_02256098 *param1, UnkStruct_ov23_02255BF4 *param2); +static void ov23_02255D1C(const int param0, const int param1, const int param2, const int param3, UnkStruct_ov23_02255BF4 *param4); +static void ov23_02255D78(FieldSystem *fieldSystem, UnkStruct_ov23_02255BF4 *param1); +static void ov23_02255DDC(FieldSystem *fieldSystem, const UnkStruct_ov23_02255BF4 *param1); +static const int ov23_02255E14(FieldSystem *fieldSystem, const int param1); +static void ov23_02255E2C(const int param0, UnkStruct_ov23_02256098 *param1); +static void ov23_02255E8C(UnkStruct_ov23_02256098 *param0); +static void ov23_02255EBC(const int param0, UnkStruct_ov23_02256098 *param1); +static void ov23_02255EC4(UnkStruct_ov23_02255EC4 *param0); +static void ov23_02255EF0(UnkStruct_ov23_02255EC4 *param0); +static void ov23_02255EFC(UnkStruct_ov23_02255EC4 *param0); +static void ov23_02255F04(const int param0, const int param1, UnkStruct_ov23_02255EC4 *param2); +static void ov23_02255F20(UnkStruct_ov23_02255EC4 *param0); +static BOOL ov23_02256098(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSystem, BOOL *param2); +static BOOL ov23_02256104(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSystem, BOOL *param2); +static BOOL ov23_02256174(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSystem, BOOL *param2); +static BOOL ov23_022561BC(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSystem, BOOL *param2); +static void ov23_02256228(UnkStruct_ov23_02256228 *param0); +static void ov23_0225623C(const int param0, const int param1, UnkStruct_ov23_02256228 *param2); +static void ov23_0225624C(FieldSystem *fieldSystem, UnkStruct_ov23_02256228 *param1); +static void ov23_0225628C(FieldSystem *fieldSystem, UnkStruct_ov23_02256228 *param1); +static const int ov23_022562A8(UnkStruct_ov23_02256228 *param0); +static void ov23_022562AC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2); +static void ov23_022562B8(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2); +static void ov23_022562BC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2); +static void ov23_022562C8(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2); static const UnkStruct_ov6_0223E6EC Unk_ov23_02256B88 = { 0x0, @@ -166,9 +166,9 @@ static const UnkStruct_ov6_0223E6EC Unk_ov23_02256B88 = { ov23_022562C8 }; -static void ov23_02254A14 (FieldSystem * fieldSystem, const int param1, UnkStruct_ov23_02256098 * param2) +static void ov23_02254A14(FieldSystem *fieldSystem, const int param1, UnkStruct_ov23_02256098 *param2) { - UnkStruct_ov23_02255A98 * v0; + UnkStruct_ov23_02255A98 *v0; VecFx32 v1; GF_ASSERT(param1 != 0); @@ -190,14 +190,14 @@ static void ov23_02254A14 (FieldSystem * fieldSystem, const int param1, UnkStruc v0->unk_14 = param1; } -static void ov23_02254A94 (FieldSystem * fieldSystem, const int param1) +static void ov23_02254A94(FieldSystem *fieldSystem, const int param1) { ov5_021E1674(param1, fieldSystem->unk_A4); } -static void ov23_02254AA4 (const int param0, UnkStruct_ov23_02256098 * param1) +static void ov23_02254AA4(const int param0, UnkStruct_ov23_02256098 *param1) { - UnkStruct_ov23_02255A98 * v0; + UnkStruct_ov23_02255A98 *v0; GF_ASSERT(param1->unk_5C[param0].unk_00); @@ -205,10 +205,10 @@ static void ov23_02254AA4 (const int param0, UnkStruct_ov23_02256098 * param1) param1->unk_3C = (*v0); } -static BOOL ov23_02254AD4 (TaskManager * param0) +static BOOL ov23_02254AD4(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov23_02256098 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov23_02256098 *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { case 0: @@ -274,19 +274,18 @@ static BOOL ov23_02254AD4 (TaskManager * param0) return 0; } -static BOOL ov23_02254C84 (TaskManager * param0) +static BOOL ov23_02254C84(TaskManager *param0) { BOOL v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov23_02256098 * v2 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov23_02256098 *v2 = TaskManager_Environment(param0); v0 = ov23_02254318(v2->unk_504); if (v0) { switch (ov23_02254314(v2->unk_504)) { - case 0: - { - UndergroundData * v3; + case 0: { + UndergroundData *v3; int v4; v3 = sub_020298B0(fieldSystem->saveData); @@ -336,9 +335,9 @@ static BOOL ov23_02254C84 (TaskManager * param0) return 0; } -void ov23_02254D98 (FieldSystem * fieldSystem, TaskManager * param1) +void ov23_02254D98(FieldSystem *fieldSystem, TaskManager *param1) { - UnkStruct_ov23_02256098 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov23_02256098)); + UnkStruct_ov23_02256098 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov23_02256098)); MI_CpuClear8(v0, sizeof(UnkStruct_ov23_02256098)); ov23_02255EBC(0, v0); @@ -350,18 +349,17 @@ void ov23_02254D98 (FieldSystem * fieldSystem, TaskManager * param1) FieldTask_Start(param1, ov23_02254AD4, v0); } -static BOOL ov23_02254DF8 (TaskManager * param0) +static BOOL ov23_02254DF8(TaskManager *param0) { fx32 v0, v1; - UnkStruct_ov5_021E1890 * v2; + UnkStruct_ov5_021E1890 *v2; BOOL v3; BOOL v4; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov23_02256098 * v6 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov23_02256098 *v6 = TaskManager_Environment(param0); switch (v6->unk_04) { - case 0: - { + case 0: { BOOL v7; v7 = ov23_022545DC(v6->unk_508); @@ -369,7 +367,7 @@ static BOOL ov23_02254DF8 (TaskManager * param0) if (v7) { u32 v8; int v9; - UndergroundData * v10; + UndergroundData *v10; v10 = sub_020298B0(v6->fieldSystem->saveData); v8 = ov23_022545D8(v6->unk_508); @@ -398,8 +396,7 @@ static BOOL ov23_02254DF8 (TaskManager * param0) GF_ASSERT(FALSE); } } - } - break; + } break; case 1: ov23_02256228(&v6->unk_4DC); ov23_0225623C(v6->unk_3C.unk_10, 4, &v6->unk_4DC); @@ -473,7 +470,7 @@ static BOOL ov23_02254DF8 (TaskManager * param0) if (v15) { u32 v16; int v17; - UndergroundData * v18; + UndergroundData *v18; v18 = sub_020298B0(v6->fieldSystem->saveData); v17 = ov23_02255B78(&v6->unk_3C, v6->unk_5C); @@ -529,15 +526,15 @@ static BOOL ov23_02254DF8 (TaskManager * param0) return 0; } -static BOOL ov23_02255100 (TaskManager * param0) +static BOOL ov23_02255100(TaskManager *param0) { BOOL v0; UnkStruct_ov23_02255C30 v1; fx32 v2, v3; BOOL v4; BOOL v5; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov23_02256098 * v7 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov23_02256098 *v7 = TaskManager_Environment(param0); switch (v7->unk_04) { case 0: @@ -671,7 +668,7 @@ static BOOL ov23_02255100 (TaskManager * param0) v7->unk_04 = 2; } } else { - UndergroundData * v17; + UndergroundData *v17; v17 = sub_020298B0(v7->fieldSystem->saveData); @@ -766,15 +763,15 @@ static BOOL ov23_02255100 (TaskManager * param0) return 0; } -static BOOL ov23_02255580 (TaskManager * param0) +static BOOL ov23_02255580(TaskManager *param0) { BOOL v0; UnkStruct_ov23_02255C30 v1; fx32 v2, v3; BOOL v4; BOOL v5; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov23_02256098 * v7 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov23_02256098 *v7 = TaskManager_Environment(param0); switch (v7->unk_04) { case 0: @@ -919,14 +916,14 @@ static BOOL ov23_02255580 (TaskManager * param0) return 0; } -static BOOL ov23_02255850 (TaskManager * param0) +static BOOL ov23_02255850(TaskManager *param0) { fx32 v0, v1; - UnkStruct_ov5_021E1890 * v2; + UnkStruct_ov5_021E1890 *v2; BOOL v3; BOOL v4; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov23_02256098 * v6 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov23_02256098 *v6 = TaskManager_Environment(param0); switch (v6->unk_04) { case 0: @@ -1039,7 +1036,7 @@ static BOOL ov23_02255850 (TaskManager * param0) return 0; } -static BOOL ov23_02255A98 (const UnkStruct_ov23_02255A98 * param0, const UnkStruct_ov23_02255BF4 * param1) +static BOOL ov23_02255A98(const UnkStruct_ov23_02255A98 *param0, const UnkStruct_ov23_02255BF4 *param1) { int v0; @@ -1052,7 +1049,7 @@ static BOOL ov23_02255A98 (const UnkStruct_ov23_02255A98 * param0, const UnkStru } { - UnkStruct_ov23_02255C30 v1 = {15, 13, 16, 13}; + UnkStruct_ov23_02255C30 v1 = { 15, 13, 16, 13 }; if (ov23_02255C30(¶m0->unk_00, &v1)) { return 0; @@ -1060,7 +1057,7 @@ static BOOL ov23_02255A98 (const UnkStruct_ov23_02255A98 * param0, const UnkStru } { - UnkStruct_ov23_02255C30 v2 = {15, 23, 15, 23}; + UnkStruct_ov23_02255C30 v2 = { 15, 23, 15, 23 }; if (ov23_02255C30(¶m0->unk_00, &v2)) { return 0; @@ -1070,7 +1067,7 @@ static BOOL ov23_02255A98 (const UnkStruct_ov23_02255A98 * param0, const UnkStru return 1; } -static BOOL ov23_02255B14 (const int param0, const int param1, const UnkStruct_ov23_02255BF4 * param2, int * param3) +static BOOL ov23_02255B14(const int param0, const int param1, const UnkStruct_ov23_02255BF4 *param2, int *param3) { int v0; @@ -1087,7 +1084,7 @@ static BOOL ov23_02255B14 (const int param0, const int param1, const UnkStruct_o return 0; } -static BOOL ov23_02255B58 (const UnkStruct_ov23_02255C30 * param0) +static BOOL ov23_02255B58(const UnkStruct_ov23_02255C30 *param0) { if ((10 <= param0->unk_00) && (param0->unk_08 <= 21) && (12 <= param0->unk_04) && (param0->unk_0C <= 23)) { return 0; @@ -1096,7 +1093,7 @@ static BOOL ov23_02255B58 (const UnkStruct_ov23_02255C30 * param0) } } -static int ov23_02255B78 (const UnkStruct_ov23_02255A98 * param0, UnkStruct_ov23_02255BF4 * param1) +static int ov23_02255B78(const UnkStruct_ov23_02255A98 *param0, UnkStruct_ov23_02255BF4 *param1) { int v0; @@ -1113,19 +1110,19 @@ static int ov23_02255B78 (const UnkStruct_ov23_02255A98 * param0, UnkStruct_ov23 return 0; } -static void ov23_02255BB8 (const UnkStruct_ov23_02255A98 * param0, const int param1, UnkStruct_ov23_02255BF4 * param2) +static void ov23_02255BB8(const UnkStruct_ov23_02255A98 *param0, const int param1, UnkStruct_ov23_02255BF4 *param2) { - GF_ASSERT((param1 < 32)); - GF_ASSERT((!param2[param1].unk_00)); + GF_ASSERT(param1 < 32); + GF_ASSERT(!param2[param1].unk_00); param2[param1].unk_00 = 1; param2[param1].unk_04 = (*param0); } -static void ov23_02255BF4 (const int param0, UnkStruct_ov23_02255BF4 * param1) +static void ov23_02255BF4(const int param0, UnkStruct_ov23_02255BF4 *param1) { - GF_ASSERT((param0 < 32)); - GF_ASSERT((param0 != 0)); + GF_ASSERT(param0 < 32); + GF_ASSERT(param0 != 0); GF_ASSERT(param1[param0].unk_00); { @@ -1139,7 +1136,7 @@ static void ov23_02255BF4 (const int param0, UnkStruct_ov23_02255BF4 * param1) } } -static BOOL ov23_02255C30 (const UnkStruct_ov23_02255C30 * param0, const UnkStruct_ov23_02255C30 * param1) +static BOOL ov23_02255C30(const UnkStruct_ov23_02255C30 *param0, const UnkStruct_ov23_02255C30 *param1) { if ((param0->unk_00 <= param1->unk_08) && (param1->unk_00 <= param0->unk_08) && (param0->unk_04 <= param1->unk_0C) && (param1->unk_04 <= param0->unk_0C)) { return 1; @@ -1148,7 +1145,7 @@ static BOOL ov23_02255C30 (const UnkStruct_ov23_02255C30 * param0, const UnkStru } } -static BOOL ov23_02255C58 (const UnkStruct_ov23_02255C30 * param0, const int param1, const int param2) +static BOOL ov23_02255C58(const UnkStruct_ov23_02255C30 *param0, const int param1, const int param2) { if ((param0->unk_00 <= param1) && (param1 <= param0->unk_08) && (param0->unk_04 <= param2) && (param2 <= param0->unk_0C)) { return 1; @@ -1157,12 +1154,12 @@ static BOOL ov23_02255C58 (const UnkStruct_ov23_02255C30 * param0, const int par } } -static void ov23_02255C78 (FieldSystem * fieldSystem, UnkStruct_ov23_02256098 * param1, UnkStruct_ov23_02255BF4 * param2) +static void ov23_02255C78(FieldSystem *fieldSystem, UnkStruct_ov23_02256098 *param1, UnkStruct_ov23_02255BF4 *param2) { int v0; int v1; int v2, v3; - UnkStruct_02029894 * v4; + UnkStruct_02029894 *v4; v4 = sub_02029894(fieldSystem->saveData); @@ -1189,7 +1186,7 @@ static void ov23_02255C78 (FieldSystem * fieldSystem, UnkStruct_ov23_02256098 * } } -static void ov23_02255D1C (const int param0, const int param1, const int param2, const int param3, UnkStruct_ov23_02255BF4 * param4) +static void ov23_02255D1C(const int param0, const int param1, const int param2, const int param3, UnkStruct_ov23_02255BF4 *param4) { UnkStruct_ov23_02255A98 v0; int v1, v2; @@ -1209,13 +1206,13 @@ static void ov23_02255D1C (const int param0, const int param1, const int param2, param4[param0].unk_00 = 1; } -static void ov23_02255D78 (FieldSystem * fieldSystem, UnkStruct_ov23_02255BF4 * param1) +static void ov23_02255D78(FieldSystem *fieldSystem, UnkStruct_ov23_02255BF4 *param1) { int v0; int v1, v2; int v3; VecFx32 v4; - UnkStruct_ov23_02255A98 * v5; + UnkStruct_ov23_02255A98 *v5; ov5_021E1610(fieldSystem->unk_A4); @@ -1238,12 +1235,12 @@ static void ov23_02255D78 (FieldSystem * fieldSystem, UnkStruct_ov23_02255BF4 * } } -static void ov23_02255DDC (FieldSystem * fieldSystem, const UnkStruct_ov23_02255BF4 * param1) +static void ov23_02255DDC(FieldSystem *fieldSystem, const UnkStruct_ov23_02255BF4 *param1) { int v0; int v1; int v2, v3; - UnkStruct_02029894 * v4; + UnkStruct_02029894 *v4; v4 = sub_02029894(fieldSystem->saveData); @@ -1262,7 +1259,7 @@ static void ov23_02255DDC (FieldSystem * fieldSystem, const UnkStruct_ov23_02255 } } -static const int ov23_02255E14 (FieldSystem * fieldSystem, const int param1) +static const int ov23_02255E14(FieldSystem *fieldSystem, const int param1) { int v0; @@ -1272,10 +1269,10 @@ static const int ov23_02255E14 (FieldSystem * fieldSystem, const int param1) return v0; } -static void ov23_02255E2C (const int param0, UnkStruct_ov23_02256098 * param1) +static void ov23_02255E2C(const int param0, UnkStruct_ov23_02256098 *param1) { - UnkStruct_ov5_021E1890 * v0; - UnkStruct_ov23_02255A98 * v1; + UnkStruct_ov5_021E1890 *v0; + UnkStruct_ov23_02255A98 *v1; GF_ASSERT(param1->unk_5C[param0].unk_00); @@ -1287,10 +1284,10 @@ static void ov23_02255E2C (const int param0, UnkStruct_ov23_02256098 * param1) param1->unk_0C.unk_10 = (*v1); } -static void ov23_02255E8C (UnkStruct_ov23_02256098 * param0) +static void ov23_02255E8C(UnkStruct_ov23_02256098 *param0) { - UnkStruct_ov5_021E1890 * v0; - UnkStruct_ov23_02255A98 * v1; + UnkStruct_ov5_021E1890 *v0; + UnkStruct_ov23_02255A98 *v1; int v2; v2 = param0->unk_0C.unk_00; @@ -1302,15 +1299,15 @@ static void ov23_02255E8C (UnkStruct_ov23_02256098 * param0) ov5_021E18A4(v0, ¶m0->unk_0C.unk_04); } -static void ov23_02255EBC (const int param0, UnkStruct_ov23_02256098 * param1) +static void ov23_02255EBC(const int param0, UnkStruct_ov23_02256098 *param1) { param1->unk_00 = param0; param1->unk_04 = 0; } -static void ov23_02255EC4 (UnkStruct_ov23_02255EC4 * param0) +static void ov23_02255EC4(UnkStruct_ov23_02255EC4 *param0) { - NNSG3dResMdl * v0; + NNSG3dResMdl *v0; sub_0201CA24(4, "data/ug_base_cur.nsbmd", ¶m0->unk_00, &v0, ¶m0->unk_54); @@ -1322,31 +1319,31 @@ static void ov23_02255EC4 (UnkStruct_ov23_02255EC4 * param0) param0->unk_6C = 0; } -static void ov23_02255EF0 (UnkStruct_ov23_02255EC4 * param0) +static void ov23_02255EF0(UnkStruct_ov23_02255EC4 *param0) { Heap_FreeToHeap(param0->unk_54); } -static void ov23_02255EFC (UnkStruct_ov23_02255EC4 * param0) +static void ov23_02255EFC(UnkStruct_ov23_02255EC4 *param0) { param0->unk_6C = 1; } -static void ov23_02255F04 (const int param0, const int param1, UnkStruct_ov23_02255EC4 * param2) +static void ov23_02255F04(const int param0, const int param1, UnkStruct_ov23_02255EC4 *param2) { param2->unk_64 = param0; param2->unk_68 = param1; - param2->unk_58.x = (FX32_ONE * 16) * ((0 * 32) + param0) + ((FX32_ONE * 8)); + param2->unk_58.x = (FX32_ONE * 16) * ((0 * 32) + param0) + (FX32_ONE * 8); param2->unk_58.y = FX32_ONE; - param2->unk_58.z = (FX32_ONE * 16) * ((0 * 32) + param1) + ((FX32_ONE * 8)); + param2->unk_58.z = (FX32_ONE * 16) * ((0 * 32) + param1) + (FX32_ONE * 8); } -static void ov23_02255F20 (UnkStruct_ov23_02255EC4 * param0) +static void ov23_02255F20(UnkStruct_ov23_02255EC4 *param0) { param0->unk_6C = 0; } -static void ov23_02255F28 (const int param0, const int param1, UnkStruct_ov23_02256000 * param2) +static void ov23_02255F28(const int param0, const int param1, UnkStruct_ov23_02256000 *param2) { if (param0 != 0xffff) { param2->unk_00 = param0; @@ -1357,13 +1354,13 @@ static void ov23_02255F28 (const int param0, const int param1, UnkStruct_ov23_02 } } -static void ov23_02255F40 (FieldSystem * fieldSystem, UnkStruct_ov23_02255A98 * param1, UnkStruct_ov23_02256000 * param2) +static void ov23_02255F40(FieldSystem *fieldSystem, UnkStruct_ov23_02255A98 *param1, UnkStruct_ov23_02256000 *param2) { UnkStruct_ov23_02255C30 v0; VecFx32 v1; int v2, v3; int v4, v5; - UnkStruct_ov5_021EB0E0 * v6; + UnkStruct_ov5_021EB0E0 *v6; v6 = fieldSystem->unk_8C; @@ -1392,7 +1389,7 @@ static void ov23_02255F40 (FieldSystem * fieldSystem, UnkStruct_ov23_02255A98 * v1.y = FX32_ONE; { - UnkStruct_ov5_021E1890 * v7; + UnkStruct_ov5_021E1890 *v7; v7 = ov5_021E18E0(fieldSystem->unk_A4, param1->unk_10); ov5_021E18A4(v7, &v1); @@ -1400,12 +1397,12 @@ static void ov23_02255F40 (FieldSystem * fieldSystem, UnkStruct_ov23_02255A98 * } } -static void ov23_02256000 (FieldSystem * fieldSystem, UnkStruct_ov23_02256000 * param1, UnkStruct_ov23_02255EC4 * param2) +static void ov23_02256000(FieldSystem *fieldSystem, UnkStruct_ov23_02256000 *param1, UnkStruct_ov23_02255EC4 *param2) { UnkStruct_ov23_02255C30 v0; VecFx32 v1; int v2, v3; - UnkStruct_ov5_021EB0E0 * v4; + UnkStruct_ov5_021EB0E0 *v4; v4 = fieldSystem->unk_8C; @@ -1431,7 +1428,7 @@ static void ov23_02256000 (FieldSystem * fieldSystem, UnkStruct_ov23_02256000 * } } -static BOOL ov23_02256098 (UnkStruct_ov23_02256098 * param0, FieldSystem * fieldSystem, BOOL * param2) +static BOOL ov23_02256098(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSystem, BOOL *param2) { VecFx32 v0; BOOL v1; @@ -1462,7 +1459,7 @@ static BOOL ov23_02256098 (UnkStruct_ov23_02256098 * param0, FieldSystem * field return v1; } -static BOOL ov23_02256104 (UnkStruct_ov23_02256098 * param0, FieldSystem * fieldSystem, BOOL * param2) +static BOOL ov23_02256104(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSystem, BOOL *param2) { VecFx32 v0; BOOL v1; @@ -1493,7 +1490,7 @@ static BOOL ov23_02256104 (UnkStruct_ov23_02256098 * param0, FieldSystem * field return v1; } -static BOOL ov23_02256174 (UnkStruct_ov23_02256098 * param0, FieldSystem * fieldSystem, BOOL * param2) +static BOOL ov23_02256174(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSystem, BOOL *param2) { VecFx32 v0; BOOL v1; @@ -1516,7 +1513,7 @@ static BOOL ov23_02256174 (UnkStruct_ov23_02256098 * param0, FieldSystem * field return v1; } -static BOOL ov23_022561BC (UnkStruct_ov23_02256098 * param0, FieldSystem * fieldSystem, BOOL * param2) +static BOOL ov23_022561BC(UnkStruct_ov23_02256098 *param0, FieldSystem *fieldSystem, BOOL *param2) { VecFx32 v0; BOOL v1; @@ -1547,7 +1544,7 @@ static BOOL ov23_022561BC (UnkStruct_ov23_02256098 * param0, FieldSystem * field return v1; } -static void ov23_02256228 (UnkStruct_ov23_02256228 * param0) +static void ov23_02256228(UnkStruct_ov23_02256228 *param0) { param0->unk_04 = 0; param0->unk_08 = 0; @@ -1556,7 +1553,7 @@ static void ov23_02256228 (UnkStruct_ov23_02256228 * param0) param0->unk_10 = 0; } -static void ov23_0225623C (const int param0, const int param1, UnkStruct_ov23_02256228 * param2) +static void ov23_0225623C(const int param0, const int param1, UnkStruct_ov23_02256228 *param2) { param2->unk_04 = 0; param2->unk_08 = param1; @@ -1565,9 +1562,9 @@ static void ov23_0225623C (const int param0, const int param1, UnkStruct_ov23_02 param2->unk_10 = 1; } -static void ov23_0225624C (FieldSystem * fieldSystem, UnkStruct_ov23_02256228 * param1) +static void ov23_0225624C(FieldSystem *fieldSystem, UnkStruct_ov23_02256228 *param1) { - UnkStruct_ov5_021E1890 * v0; + UnkStruct_ov5_021E1890 *v0; if (!param1->unk_10) { return; @@ -1583,9 +1580,9 @@ static void ov23_0225624C (FieldSystem * fieldSystem, UnkStruct_ov23_02256228 * } } -static void ov23_0225628C (FieldSystem * fieldSystem, UnkStruct_ov23_02256228 * param1) +static void ov23_0225628C(FieldSystem *fieldSystem, UnkStruct_ov23_02256228 *param1) { - UnkStruct_ov5_021E1890 * v0; + UnkStruct_ov5_021E1890 *v0; if (!param1->unk_10) { return; @@ -1595,39 +1592,39 @@ static void ov23_0225628C (FieldSystem * fieldSystem, UnkStruct_ov23_02256228 * ov5_021E18B4(v0, 0); } -static const int ov23_022562A8 (UnkStruct_ov23_02256228 * param0) +static const int ov23_022562A8(UnkStruct_ov23_02256228 *param0) { return param0->unk_00; } -static void ov23_022562AC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov23_022562AC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov23_02255EC4 * v0 = (UnkStruct_ov23_02255EC4 *)(param2); + UnkStruct_ov23_02255EC4 *v0 = (UnkStruct_ov23_02255EC4 *)(param2); ov23_02255EC4(v0); } -static void ov23_022562B8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov23_022562B8(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { return; } -static void ov23_022562BC (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov23_022562BC(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov23_02255EC4 * v0 = (UnkStruct_ov23_02255EC4 *)(param2); + UnkStruct_ov23_02255EC4 *v0 = (UnkStruct_ov23_02255EC4 *)(param2); ov23_02255EF0(v0); } -static void ov23_022562C8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * fieldSystem, void * param2) +static void ov23_022562C8(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2) { - UnkStruct_ov23_02255EC4 * v0 = (UnkStruct_ov23_02255EC4 *)(param2); + UnkStruct_ov23_02255EC4 *v0 = (UnkStruct_ov23_02255EC4 *)(param2); if (!(v0->unk_6C)) { return; } { - MtxFx33 v1 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; - VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE}; + MtxFx33 v1 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; + VecFx32 v2 = { FX32_ONE, FX32_ONE, FX32_ONE }; sub_0201CA74(&v0->unk_00, &v0->unk_58, &v1, &v2); } diff --git a/src/overlay024/ov24_02253CE0.c b/src/overlay024/ov24_02253CE0.c index eea46ba036..3c46483287 100644 --- a/src/overlay024/ov24_02253CE0.c +++ b/src/overlay024/ov24_02253CE0.c @@ -1,3 +1,5 @@ +#include "overlay024/ov24_02253CE0.h" + #include #include @@ -6,13 +8,12 @@ #include "overlay097/struct_ov97_0222DB78.h" +#include "heap.h" #include "narc.h" #include "unk_02006E3C.h" -#include "heap.h" #include "unk_02018340.h" -#include "overlay024/ov24_02253CE0.h" -void ov24_02253CE0 (BGL * param0) +void ov24_02253CE0(BGL *param0) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -42,7 +43,7 @@ void ov24_02253CE0 (BGL * param0) sub_020183C4(param0, 4, &v0, 0); { - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__POKETCH, 8); @@ -56,13 +57,13 @@ void ov24_02253CE0 (BGL * param0) GXS_SetVisiblePlane(GX_PLANEMASK_BG0); } -void ov24_02253DA4 (BGL * param0) +void ov24_02253DA4(BGL *param0) { sub_02019044(param0, 4); Heap_Destroy(8); } -BOOL ov24_02253DB4 (BGL * param0) +BOOL ov24_02253DB4(BGL *param0) { return 1; } diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index a592c9e8d4..634f0c8828 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -1,41 +1,41 @@ +#include "overlay025/ov25_02254560.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "poketch_data.h" + +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" #include "overlay025/poketch_system.h" +#include "overlay025/struct_ov25_02254560_1.h" #include "overlay025/struct_ov25_02254560_decl.h" +#include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255224_decl.h" #include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" - -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02254560_1.h" -#include "overlay025/struct_ov25_0225517C.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "gx_layers.h" +#include "heap.h" +#include "poketch_data.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "sys_task.h" -#include "heap.h" #include "unk_02018340.h" -#include "gx_layers.h" -#include "poketch_data.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" typedef struct { BOOL unk_00; - UnkStruct_ov25_022555E8 * unk_04; + UnkStruct_ov25_022555E8 *unk_04; UnkStruct_ov25_02255958 unk_08; - UnkStruct_ov25_022558C4 * unk_1C[2]; + UnkStruct_ov25_022558C4 *unk_1C[2]; } UnkStruct_ov25_02254DD8; struct UnkStruct_ov25_02254560_t { - const UnkStruct_ov25_02254560_1 * unk_00; + const UnkStruct_ov25_02254560_1 *unk_00; u32 unk_04[10]; u16 unk_2C[32]; u16 unk_6C[32]; @@ -44,11 +44,11 @@ struct UnkStruct_ov25_02254560_t { u16 unk_12C[32]; u16 unk_16C[32]; NNSG2dOamManagerInstance unk_1AC; - NNSG2dOamManagerInstance * unk_1C8; - UnkStruct_ov25_022555E8 * unk_1CC; - SysTask * unk_1D0; + NNSG2dOamManagerInstance *unk_1C8; + UnkStruct_ov25_022555E8 *unk_1CC; + SysTask *unk_1D0; UnkStruct_ov25_02254DD8 unk_1D4; - BGL * unk_1F8; + BGL *unk_1F8; PoketchSystem *poketchSys; u16 unk_200[256]; u16 unk_400[16]; @@ -59,42 +59,42 @@ typedef struct { u16 unk_02; } UnkStruct_ov25_02254944; -static void ov25_02254654(SysTask * param0, void * param1); -static void ov25_02254684(UnkStruct_ov25_02254560 * param0); -static void ov25_02254798(u16 * param0, u32 param1, int param2, int param3); -static void ov25_0225480C(UnkStruct_ov25_02255224 * param0); -static void ov25_02254820(SysTask * param0, void * param1); -static void ov25_02254944(SysTask * param0, void * param1); -static void ov25_02254A5C(SysTask * param0, void * param1); -static void ov25_02254B8C(SysTask * param0, void * param1); -static void ov25_02254BF0(SysTask * param0, void * param1); -static void ov25_02254C54(void * param0, u16 * param1, int param2); -static void ov25_02254CA8(SysTask * param0, void * param1); -static void ov25_02254CCC(SysTask * param0, void * param1); -static void ov25_02254CF4(SysTask * param0, void * param1); -static void ov25_02254D0C(SysTask * param0, void * param1); -static void ov25_02254D24(SysTask * param0, void * param1); -static void ov25_02254D48(SysTask * param0, void * param1); -static void ov25_02254D70(SysTask * param0, void * param1); -static void ov25_02254D9C(SysTask * param0, void * param1); -static void ov25_02254DBC(SysTask * param0, void * param1); -static void ov25_02254DD8(UnkStruct_ov25_02254DD8 * param0, UnkStruct_ov25_022555E8 * param1); -static void ov25_02254DE0(UnkStruct_ov25_02254560 * param0, UnkStruct_ov25_02254DD8 * param1); -static void ov25_02254E84(UnkStruct_ov25_02254560 * param0, u32 param1); -static void ov25_02254EE8(UnkStruct_ov25_02254DD8 * param0, const UnkStruct_ov25_02254560_1 * param1); -static void ov25_02254F40(UnkStruct_ov25_02254DD8 * param0); -static void ov25_02254F68(SysTask * param0, void * param1); -static void ov25_02255004(SysTask * param0, void * param1); -static void ov25_02255064(SysTask * param0, void * param1); -struct PoketchSystem * FieldSystem_GetPoketchSystem(void); -SysTask * SysTask_ExecuteAfterVBlank(SysTaskFunc param0, void * param1, u32 param2); - -BOOL ov25_02254560 (UnkStruct_ov25_02254560 ** param0, const UnkStruct_ov25_02254560_1 * param1, NNSG2dOamManagerInstance * param2, PoketchSystem *poketchSys) +static void ov25_02254654(SysTask *param0, void *param1); +static void ov25_02254684(UnkStruct_ov25_02254560 *param0); +static void ov25_02254798(u16 *param0, u32 param1, int param2, int param3); +static void ov25_0225480C(UnkStruct_ov25_02255224 *param0); +static void ov25_02254820(SysTask *param0, void *param1); +static void ov25_02254944(SysTask *param0, void *param1); +static void ov25_02254A5C(SysTask *param0, void *param1); +static void ov25_02254B8C(SysTask *param0, void *param1); +static void ov25_02254BF0(SysTask *param0, void *param1); +static void ov25_02254C54(void *param0, u16 *param1, int param2); +static void ov25_02254CA8(SysTask *param0, void *param1); +static void ov25_02254CCC(SysTask *param0, void *param1); +static void ov25_02254CF4(SysTask *param0, void *param1); +static void ov25_02254D0C(SysTask *param0, void *param1); +static void ov25_02254D24(SysTask *param0, void *param1); +static void ov25_02254D48(SysTask *param0, void *param1); +static void ov25_02254D70(SysTask *param0, void *param1); +static void ov25_02254D9C(SysTask *param0, void *param1); +static void ov25_02254DBC(SysTask *param0, void *param1); +static void ov25_02254DD8(UnkStruct_ov25_02254DD8 *param0, UnkStruct_ov25_022555E8 *param1); +static void ov25_02254DE0(UnkStruct_ov25_02254560 *param0, UnkStruct_ov25_02254DD8 *param1); +static void ov25_02254E84(UnkStruct_ov25_02254560 *param0, u32 param1); +static void ov25_02254EE8(UnkStruct_ov25_02254DD8 *param0, const UnkStruct_ov25_02254560_1 *param1); +static void ov25_02254F40(UnkStruct_ov25_02254DD8 *param0); +static void ov25_02254F68(SysTask *param0, void *param1); +static void ov25_02255004(SysTask *param0, void *param1); +static void ov25_02255064(SysTask *param0, void *param1); +struct PoketchSystem *FieldSystem_GetPoketchSystem(void); +SysTask *SysTask_ExecuteAfterVBlank(SysTaskFunc param0, void *param1, u32 param2); + +BOOL ov25_02254560(UnkStruct_ov25_02254560 **param0, const UnkStruct_ov25_02254560_1 *param1, NNSG2dOamManagerInstance *param2, PoketchSystem *poketchSys) { *param0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_MAIN, sizeof(UnkStruct_ov25_02254560)); if (*param0 != NULL) { - UnkStruct_ov25_02254560 * v0 = *param0; + UnkStruct_ov25_02254560 *v0 = *param0; v0->unk_1C8 = param2; NNS_G2dResetOamManagerBuffer(v0->unk_1C8); @@ -130,28 +130,28 @@ BOOL ov25_02254560 (UnkStruct_ov25_02254560 ** param0, const UnkStruct_ov25_0225 return 0; } -static void ov25_02254654 (SysTask * param0, void * param1) +static void ov25_02254654(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = (UnkStruct_ov25_02254560 *)param1; + UnkStruct_ov25_02254560 *v0 = (UnkStruct_ov25_02254560 *)param1; ov25_02255614(v0->unk_1CC); } -UnkStruct_ov25_022555E8 * ov25_02254664 (void) +UnkStruct_ov25_022555E8 *ov25_02254664(void) { - UnkStruct_ov25_02254560 * v0 = ov25_02254418(); + UnkStruct_ov25_02254560 *v0 = ov25_02254418(); return v0->unk_1CC; } -BGL * ov25_02254674 (void) +BGL *ov25_02254674(void) { - UnkStruct_ov25_02254560 * v0 = ov25_02254418(); + UnkStruct_ov25_02254560 *v0 = ov25_02254418(); return v0->unk_1F8; } -static void ov25_02254684 (UnkStruct_ov25_02254560 * param0) +static void ov25_02254684(UnkStruct_ov25_02254560 *param0) { - NNSG2dPaletteData * v0; - void * v1; + NNSG2dPaletteData *v0; + void *v1; v1 = sub_02006F88(12, 0, &v0, 7); @@ -162,9 +162,9 @@ static void ov25_02254684 (UnkStruct_ov25_02254560 * param0) } } -void ov25_022546B8 (u32 param0, u32 param1) +void ov25_022546B8(u32 param0, u32 param1) { - UnkStruct_ov25_02254560 * v0 = ov25_02254418(); + UnkStruct_ov25_02254560 *v0 = ov25_02254418(); PoketchData *poketchData = PoketchSystem_GetPoketchData(v0->poketchSys); u32 v2 = PoketchData_CurrentScreenColor(poketchData); @@ -172,9 +172,9 @@ void ov25_022546B8 (u32 param0, u32 param1) GXS_LoadOBJPltt(&v0->unk_200[v2 * 32], param1, 0x20); } -void ov25_022546F0 (u32 param0, u32 param1) +void ov25_022546F0(u32 param0, u32 param1) { - UnkStruct_ov25_02254560 * v0 = ov25_02254418(); + UnkStruct_ov25_02254560 *v0 = ov25_02254418(); PoketchData *poketchData = PoketchSystem_GetPoketchData(v0->poketchSys); u32 v2 = PoketchData_CurrentScreenColor(poketchData); @@ -182,16 +182,16 @@ void ov25_022546F0 (u32 param0, u32 param1) GXS_LoadOBJPltt(&v0->unk_200[v2 * 32 + 16], 0, 0x20); } -void ov25_02254728 (u16 * param0) +void ov25_02254728(u16 *param0) { - UnkStruct_ov25_02254560 * v0 = ov25_02254418(); + UnkStruct_ov25_02254560 *v0 = ov25_02254418(); PoketchData *poketchData = PoketchSystem_GetPoketchData(v0->poketchSys); u32 v2 = PoketchData_CurrentScreenColor(poketchData); MI_CpuCopy16(&v0->unk_200[v2 * 32], param0, 0x20); } -void ov25_02254754 (UnkStruct_ov25_02254560 * param0) +void ov25_02254754(UnkStruct_ov25_02254560 *param0) { if (param0) { ov25_02254F40(&(param0->unk_1D4)); @@ -212,7 +212,7 @@ void ov25_02254754 (UnkStruct_ov25_02254560 * param0) } } -static void ov25_02254798 (u16 * param0, u32 param1, int param2, int param3) +static void ov25_02254798(u16 *param0, u32 param1, int param2, int param3) { int v0, v1, v2; int v3; @@ -235,49 +235,49 @@ static void ov25_02254798 (u16 * param0, u32 param1, int param2, int param3) } static const UnkStruct_ov25_0225517C Unk_ov25_02255F8C[] = { - {0x0, ov25_02254820, 0x0}, - {0x1, ov25_02254944, sizeof(UnkStruct_ov25_02254944)}, - {0x2, ov25_02254944, sizeof(UnkStruct_ov25_02254944)}, - {0x3, ov25_02254B8C, sizeof(UnkStruct_ov25_02254944)}, - {0x4, ov25_02254A5C, sizeof(UnkStruct_ov25_02254944)}, - {0x5, ov25_02254BF0, sizeof(UnkStruct_ov25_02254944)}, - {0x6, ov25_02254CA8, 0x0}, - {0x8, ov25_02254CF4, 0x0}, - {0x7, ov25_02254D24, 0x0}, - {0x9, ov25_02254CCC, 0x0}, - {0xB, ov25_02254D0C, 0x0}, - {0xA, ov25_02254D48, 0x0}, - {0xC, ov25_02254D70, 0x0}, - {0xD, ov25_02254D9C, 0x0}, - {0xE, ov25_02254DBC, 0x0}, - {0xF, ov25_02254F68, 0x0}, - {0x10, ov25_02255004, 0x0}, - {0x11, ov25_02255064, 0x0}, - {0xffffffff, NULL, 0x0} + { 0x0, ov25_02254820, 0x0 }, + { 0x1, ov25_02254944, sizeof(UnkStruct_ov25_02254944) }, + { 0x2, ov25_02254944, sizeof(UnkStruct_ov25_02254944) }, + { 0x3, ov25_02254B8C, sizeof(UnkStruct_ov25_02254944) }, + { 0x4, ov25_02254A5C, sizeof(UnkStruct_ov25_02254944) }, + { 0x5, ov25_02254BF0, sizeof(UnkStruct_ov25_02254944) }, + { 0x6, ov25_02254CA8, 0x0 }, + { 0x8, ov25_02254CF4, 0x0 }, + { 0x7, ov25_02254D24, 0x0 }, + { 0x9, ov25_02254CCC, 0x0 }, + { 0xB, ov25_02254D0C, 0x0 }, + { 0xA, ov25_02254D48, 0x0 }, + { 0xC, ov25_02254D70, 0x0 }, + { 0xD, ov25_02254D9C, 0x0 }, + { 0xE, ov25_02254DBC, 0x0 }, + { 0xF, ov25_02254F68, 0x0 }, + { 0x10, ov25_02255004, 0x0 }, + { 0x11, ov25_02255064, 0x0 }, + { 0xffffffff, NULL, 0x0 } }; -void ov25_022547D0 (UnkStruct_ov25_02254560 * param0, u32 param1) +void ov25_022547D0(UnkStruct_ov25_02254560 *param0, u32 param1) { ov25_0225517C(Unk_ov25_02255F8C, param1, param0, param0->unk_00, param0->unk_04, 2, 7); } -BOOL ov25_022547F4 (UnkStruct_ov25_02254560 * param0, u32 param1) +BOOL ov25_022547F4(UnkStruct_ov25_02254560 *param0, u32 param1) { return ov25_02255130(param0->unk_04, param1); } -BOOL ov25_02254800 (UnkStruct_ov25_02254560 * param0) +BOOL ov25_02254800(UnkStruct_ov25_02254560 *param0) { return ov25_02255154(param0->unk_04); } -static void ov25_0225480C (UnkStruct_ov25_02255224 * param0) +static void ov25_0225480C(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param0); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_04, param0); } -static void ov25_02254820 (SysTask * param0, void * param1) +static void ov25_02254820(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -309,7 +309,7 @@ static void ov25_02254820 (SysTask * param0, void * param1) 0, 0 }; - UnkStruct_ov25_02254560 * v2 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v2 = ov25_0225523C(param1); GXS_SetGraphicsMode(GX_BGMODE_0); GX_SetBankForSubBG(GX_VRAM_SUB_BG_32_H); @@ -334,10 +334,10 @@ static void ov25_02254820 (SysTask * param0, void * param1) ov25_0225480C(param1); } -static void ov25_02254944 (SysTask * param0, void * param1) +static void ov25_02254944(SysTask *param0, void *param1) { - UnkStruct_ov25_02254944 * v0; - UnkStruct_ov25_02254560 * v1; + UnkStruct_ov25_02254944 *v0; + UnkStruct_ov25_02254560 *v1; u32 v2; v0 = ov25_02255244(param1); @@ -383,10 +383,10 @@ static void ov25_02254944 (SysTask * param0, void * param1) } } -static void ov25_02254A5C (SysTask * param0, void * param1) +static void ov25_02254A5C(SysTask *param0, void *param1) { - UnkStruct_ov25_02254944 * v0; - UnkStruct_ov25_02254560 * v1; + UnkStruct_ov25_02254944 *v0; + UnkStruct_ov25_02254560 *v1; u32 v2; v0 = ov25_02255244(param1); @@ -435,10 +435,10 @@ static void ov25_02254A5C (SysTask * param0, void * param1) } } -static void ov25_02254B8C (SysTask * param0, void * param1) +static void ov25_02254B8C(SysTask *param0, void *param1) { - UnkStruct_ov25_02254944 * v0; - UnkStruct_ov25_02254560 * v1; + UnkStruct_ov25_02254944 *v0; + UnkStruct_ov25_02254560 *v1; u32 v2; v0 = ov25_02255244(param1); @@ -454,10 +454,10 @@ static void ov25_02254B8C (SysTask * param0, void * param1) } } -static void ov25_02254BF0 (SysTask * param0, void * param1) +static void ov25_02254BF0(SysTask *param0, void *param1) { - UnkStruct_ov25_02254944 * v0; - UnkStruct_ov25_02254560 * v1; + UnkStruct_ov25_02254944 *v0; + UnkStruct_ov25_02254560 *v1; u32 v2; v0 = ov25_02255244(param1); @@ -473,9 +473,9 @@ static void ov25_02254BF0 (SysTask * param0, void * param1) } } -static void ov25_02254C54 (void * param0, u16 * param1, int param2) +static void ov25_02254C54(void *param0, u16 *param1, int param2) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param0); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param0); int v1, v2; if (param2 == 0) { @@ -492,86 +492,86 @@ static void ov25_02254C54 (void * param0, u16 * param1, int param2) ov25_0225480C(param0); } -static void ov25_02254CA8 (SysTask * param0, void * param1) +static void ov25_02254CA8(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); ov25_02254C54(param1, v0->unk_6C, 0); Sound_PlayEffect(1649); } -static void ov25_02254CCC (SysTask * param0, void * param1) +static void ov25_02254CCC(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); ov25_02254C54(param1, v0->unk_12C, 1); Sound_PlayEffect(1649); } -static void ov25_02254CF4 (SysTask * param0, void * param1) +static void ov25_02254CF4(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); ov25_02254C54(param1, v0->unk_2C, 0); } -static void ov25_02254D0C (SysTask * param0, void * param1) +static void ov25_02254D0C(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); ov25_02254C54(param1, v0->unk_EC, 1); } -static void ov25_02254D24 (SysTask * param0, void * param1) +static void ov25_02254D24(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); ov25_02254C54(param1, v0->unk_AC, 0); Sound_PlayEffect(1647); } -static void ov25_02254D48 (SysTask * param0, void * param1) +static void ov25_02254D48(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); ov25_02254C54(param1, v0->unk_16C, 1); Sound_PlayEffect(1647); } -static void ov25_02254D70 (SysTask * param0, void * param1) +static void ov25_02254D70(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); ov25_02254DE0(v0, &v0->unk_1D4); ov25_02254EE8(&v0->unk_1D4, v0->unk_00); ov25_0225480C(param1); } -static void ov25_02254D9C (SysTask * param0, void * param1) +static void ov25_02254D9C(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); ov25_02254EE8(&v0->unk_1D4, v0->unk_00); ov25_0225480C(param1); } -static void ov25_02254DBC (SysTask * param0, void * param1) +static void ov25_02254DBC(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); ov25_02254F40(&v0->unk_1D4); ov25_0225480C(param1); } -static void ov25_02254DD8 (UnkStruct_ov25_02254DD8 * param0, UnkStruct_ov25_022555E8 * param1) +static void ov25_02254DD8(UnkStruct_ov25_02254DD8 *param0, UnkStruct_ov25_022555E8 *param1) { param0->unk_00 = 0; param0->unk_04 = param1; } -static void ov25_02254DE0 (UnkStruct_ov25_02254560 * param0, UnkStruct_ov25_02254DD8 * param1) +static void ov25_02254DE0(UnkStruct_ov25_02254560 *param0, UnkStruct_ov25_02254DD8 *param1) { if (ov25_02255958(¶m1->unk_08, 12, 3, 4, 7)) { static const UnkStruct_ov25_02255810 v0 = { - {(176 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (176 << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 0, @@ -605,7 +605,7 @@ static void ov25_02254DE0 (UnkStruct_ov25_02254560 * param0, UnkStruct_ov25_0225 } } -static void ov25_02254E84 (UnkStruct_ov25_02254560 * param0, u32 param1) +static void ov25_02254E84(UnkStruct_ov25_02254560 *param0, u32 param1) { PoketchData *poketchData = PoketchSystem_GetPoketchData(param0->poketchSys); u32 v2 = PoketchData_CurrentScreenColor(poketchData); @@ -628,7 +628,7 @@ static void ov25_02254E84 (UnkStruct_ov25_02254560 * param0, u32 param1) GXS_LoadOBJPltt(param0->unk_400, param1 * 0x20, sizeof(param0->unk_400)); } -static void ov25_02254EE8 (UnkStruct_ov25_02254DD8 * param0, const UnkStruct_ov25_02254560_1 * param1) +static void ov25_02254EE8(UnkStruct_ov25_02254DD8 *param0, const UnkStruct_ov25_02254560_1 *param1) { if (param0->unk_00) { u32 v0, v1; @@ -643,7 +643,7 @@ static void ov25_02254EE8 (UnkStruct_ov25_02254DD8 * param0, const UnkStruct_ov2 } } -static void ov25_02254F40 (UnkStruct_ov25_02254DD8 * param0) +static void ov25_02254F40(UnkStruct_ov25_02254DD8 *param0) { if (param0->unk_00) { ov25_022558B0(param0->unk_04, param0->unk_1C[0]); @@ -654,11 +654,11 @@ static void ov25_02254F40 (UnkStruct_ov25_02254DD8 * param0) } } -static void ov25_02254F68 (SysTask * param0, void * param1) +static void ov25_02254F68(SysTask *param0, void *param1) { u32 v0; - UnkStruct_ov25_02254944 * v1; - UnkStruct_ov25_02254560 * v2 = ov25_0225523C(param1); + UnkStruct_ov25_02254944 *v1; + UnkStruct_ov25_02254560 *v2 = ov25_0225523C(param1); v1 = ov25_02255244(param1); v0 = ov25_02255248(param1); @@ -682,9 +682,9 @@ static void ov25_02254F68 (SysTask * param0, void * param1) } } -static void ov25_02255004 (SysTask * param0, void * param1) +static void ov25_02255004(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); sub_02019CB8(v0->unk_1F8, 5, 64, 2, 2, 24, 20, 15); sub_02019448(v0->unk_1F8, 4); @@ -694,9 +694,9 @@ static void ov25_02255004 (SysTask * param0, void * param1) ov25_0225480C(param1); } -static void ov25_02255064 (SysTask * param0, void * param1) +static void ov25_02255064(SysTask *param0, void *param1) { - UnkStruct_ov25_02254560 * v0 = ov25_0225523C(param1); + UnkStruct_ov25_02254560 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_1F8, 4); sub_02019044(v0->unk_1F8, 5); diff --git a/src/overlay025/ov25_02255090.c b/src/overlay025/ov25_02255090.c index 1337b2f0d6..990fa2c27e 100644 --- a/src/overlay025/ov25_02255090.c +++ b/src/overlay025/ov25_02255090.c @@ -1,35 +1,36 @@ +#include "overlay025/ov25_02255090.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/ov25_02254560.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "heap.h" #include "narc.h" -#include "unk_02006E3C.h" +#include "pokemon_icon.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "pokemon_icon.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" struct UnkStruct_ov25_02255224_t { u32 unk_00; u32 unk_04; - void * unk_08; - void * unk_0C; - const void * unk_10; - SysTask * unk_14; + void *unk_08; + void *unk_0C; + const void *unk_10; + SysTask *unk_14; }; -static BOOL ov25_022550B0(u32 * param0, u32 param1); -static void ov25_022550F0(u32 * param0, u32 param1); +static BOOL ov25_022550B0(u32 *param0, u32 param1); +static void ov25_022550F0(u32 *param0, u32 param1); -void ov25_02255090 (u32 * param0, u32 param1) +void ov25_02255090(u32 *param0, u32 param1) { u32 v0; @@ -41,7 +42,7 @@ void ov25_02255090 (u32 * param0, u32 param1) } } -static BOOL ov25_022550B0 (u32 * param0, u32 param1) +static BOOL ov25_022550B0(u32 *param0, u32 param1) { u32 v0; @@ -57,7 +58,7 @@ static BOOL ov25_022550B0 (u32 * param0, u32 param1) return 0; } -static void ov25_022550F0 (u32 * param0, u32 param1) +static void ov25_022550F0(u32 *param0, u32 param1) { u32 v0; @@ -73,7 +74,7 @@ static void ov25_022550F0 (u32 * param0, u32 param1) GF_ASSERT(0); } -BOOL ov25_02255130 (u32 * param0, u32 param1) +BOOL ov25_02255130(u32 *param0, u32 param1) { u32 v0; @@ -86,7 +87,7 @@ BOOL ov25_02255130 (u32 * param0, u32 param1) return 1; } -BOOL ov25_02255154 (u32 * param0) +BOOL ov25_02255154(u32 *param0) { u32 v0; @@ -99,13 +100,13 @@ BOOL ov25_02255154 (u32 * param0) return 1; } -void ov25_0225517C (const UnkStruct_ov25_0225517C * param0, u32 param1, void * param2, const void * param3, u32 * param4, u32 param5, u32 param6) +void ov25_0225517C(const UnkStruct_ov25_0225517C *param0, u32 param1, void *param2, const void *param3, u32 *param4, u32 param5, u32 param6) { u32 v0; for (v0 = 0; param0[v0].unk_00 != 0xffffffff; v0++) { if (param0[v0].unk_00 == param1) { - UnkStruct_ov25_02255224 * v1; + UnkStruct_ov25_02255224 *v1; u32 v2; v2 = sizeof(UnkStruct_ov25_02255224) + param0[v0].unk_08; @@ -143,7 +144,7 @@ void ov25_0225517C (const UnkStruct_ov25_0225517C * param0, u32 param1, void * p GF_ASSERT(0); } -void ov25_02255224 (u32 * param0, UnkStruct_ov25_02255224 * param1) +void ov25_02255224(u32 *param0, UnkStruct_ov25_02255224 *param1) { ov25_022550F0(param0, param1->unk_00); @@ -151,37 +152,37 @@ void ov25_02255224 (u32 * param0, UnkStruct_ov25_02255224 * param1) Heap_FreeToHeap(param1); } -void * ov25_0225523C (UnkStruct_ov25_02255224 * param0) +void *ov25_0225523C(UnkStruct_ov25_02255224 *param0) { return param0->unk_08; } -const void * ov25_02255240 (UnkStruct_ov25_02255224 * param0) +const void *ov25_02255240(UnkStruct_ov25_02255224 *param0) { return param0->unk_10; } -void * ov25_02255244 (UnkStruct_ov25_02255224 * param0) +void *ov25_02255244(UnkStruct_ov25_02255224 *param0) { return param0->unk_0C; } -u32 ov25_02255248 (UnkStruct_ov25_02255224 * param0) +u32 ov25_02255248(UnkStruct_ov25_02255224 *param0) { return param0->unk_04; } -void ov25_0225524C (UnkStruct_ov25_02255224 * param0) +void ov25_0225524C(UnkStruct_ov25_02255224 *param0) { param0->unk_04++; } -void ov25_02255254 (UnkStruct_ov25_02255224 * param0, u32 param1) +void ov25_02255254(UnkStruct_ov25_02255224 *param0, u32 param1) { param0->unk_04 = param1; } -void ov25_02255258 (u16 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6) +void ov25_02255258(u16 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6) { param6 <<= 12; param0 += ((param3 * param2) + param1); @@ -191,9 +192,9 @@ void ov25_02255258 (u16 * param0, u32 param1, u32 param2, u32 param3, u32 param4 param0[param3 + 1] = param6 | (param4 + param5 + 1); } -void ov25_02255290 (u16 * param0, u32 param1) +void ov25_02255290(u16 *param0, u32 param1) { - u16 * v0; + u16 *v0; v0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20); @@ -223,14 +224,14 @@ void ov25_02255290 (u16 * param0, u32 param1) } } -void ov25_02255308 (u32 param0, u32 param1) +void ov25_02255308(u32 param0, u32 param1) { - u16 * v0; + u16 *v0; v0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20); if (v0) { - u16 * v1 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20); + u16 *v1 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20); ov25_02254728(v0); @@ -250,10 +251,10 @@ void ov25_02255308 (u32 param0, u32 param1) } } -void ov25_02255360 (u32 param0) +void ov25_02255360(u32 param0) { - void * v0; - NNSG2dPaletteData * v1; + void *v0; + NNSG2dPaletteData *v1; v0 = sub_02006F88(19, PokeIconPalettesFileIndex(), &v1, 8); @@ -265,19 +266,19 @@ void ov25_02255360 (u32 param0) } } -void ov25_022553A0 (u32 param0, const u32 * param1, u32 param2, BOOL param3) +void ov25_022553A0(u32 param0, const u32 *param1, u32 param2, BOOL param3) { - static const u16 v0[2] = {512, 1024}; - static const u16 v1[2] = {640, 1152}; - u8 * v2; + static const u16 v0[2] = { 512, 1024 }; + static const u16 v1[2] = { 640, 1152 }; + u8 *v2; v2 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, v1[param3]); if (v2) { - NARC * v3 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 8); + NARC *v3 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 8); if (v3) { - NNSG2dCharacterData * v4; + NNSG2dCharacterData *v4; u32 v5; for (v5 = 0; v5 < param2; v5++) { @@ -294,7 +295,7 @@ void ov25_022553A0 (u32 param0, const u32 * param1, u32 param2, BOOL param3) } } -void ov25_02255440 (BGL * param0, u32 param1, u32 param2) +void ov25_02255440(BGL *param0, u32 param1, u32 param2) { u16 v0[4]; u32 v1; diff --git a/src/overlay025/ov25_02255540.c b/src/overlay025/ov25_02255540.c index 97846aed63..201888a6ca 100644 --- a/src/overlay025/ov25_02255540.c +++ b/src/overlay025/ov25_02255540.c @@ -1,24 +1,24 @@ +#include "overlay025/ov25_02255540.h" + #include #include #include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" - #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" -#include "unk_02006E3C.h" #include "heap.h" -#include "overlay025/ov25_02255540.h" +#include "unk_02006E3C.h" struct UnkStruct_ov25_022558C4_t { - const NNSG2dCellDataBank * unk_00; - const NNSG2dAnimBankData * unk_04; + const NNSG2dCellDataBank *unk_00; + const NNSG2dAnimBankData *unk_04; NNSG2dCellAnimation unk_08; - struct UnkStruct_ov25_022558C4_t * unk_60; - struct UnkStruct_ov25_022558C4_t * unk_64; + struct UnkStruct_ov25_022558C4_t *unk_60; + struct UnkStruct_ov25_022558C4_t *unk_64; NNSG2dFVec2 unk_68; - MtxFx22 * unk_70; + MtxFx22 *unk_70; MtxFx22 unk_74; union { struct { @@ -38,26 +38,26 @@ struct UnkStruct_ov25_022558C4_t { }; struct UnkStruct_ov25_022555E8_t { - NNSG2dOamManagerInstance * unk_00; - UnkStruct_ov25_022558C4 ** unk_04; - UnkStruct_ov25_022558C4 * unk_08; - UnkStruct_ov25_022558C4 * unk_0C; + NNSG2dOamManagerInstance *unk_00; + UnkStruct_ov25_022558C4 **unk_04; + UnkStruct_ov25_022558C4 *unk_08; + UnkStruct_ov25_022558C4 *unk_0C; u16 unk_10; u16 unk_12; - GXOamAttr * unk_14; + GXOamAttr *unk_14; u32 unk_18; }; -static void ov25_022559D8(UnkStruct_ov25_022558C4 ** param0, UnkStruct_ov25_022558C4 * param1, u32 param2); -static void ov25_022559FC(UnkStruct_ov25_022558C4 * param0); -static UnkStruct_ov25_022558C4 * ov25_02255A04(UnkStruct_ov25_022555E8 * param0); -static void ov25_02255A1C(UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_022558C4 * param1); -static void ov25_02255A40(UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_022558C4 * param1); -static void ov25_02255A98(UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_022558C4 * param1); +static void ov25_022559D8(UnkStruct_ov25_022558C4 **param0, UnkStruct_ov25_022558C4 *param1, u32 param2); +static void ov25_022559FC(UnkStruct_ov25_022558C4 *param0); +static UnkStruct_ov25_022558C4 *ov25_02255A04(UnkStruct_ov25_022555E8 *param0); +static void ov25_02255A1C(UnkStruct_ov25_022555E8 *param0, UnkStruct_ov25_022558C4 *param1); +static void ov25_02255A40(UnkStruct_ov25_022555E8 *param0, UnkStruct_ov25_022558C4 *param1); +static void ov25_02255A98(UnkStruct_ov25_022555E8 *param0, UnkStruct_ov25_022558C4 *param1); -UnkStruct_ov25_022555E8 * ov25_02255540 (NNSG2dOamManagerInstance * param0, u32 param1) +UnkStruct_ov25_022555E8 *ov25_02255540(NNSG2dOamManagerInstance *param0, u32 param1) { - UnkStruct_ov25_022555E8 * v0; + UnkStruct_ov25_022555E8 *v0; BOOL v1 = 0; do { @@ -122,7 +122,7 @@ UnkStruct_ov25_022555E8 * ov25_02255540 (NNSG2dOamManagerInstance * param0, u32 return v0; } -void ov25_022555E8 (UnkStruct_ov25_022555E8 * param0) +void ov25_022555E8(UnkStruct_ov25_022555E8 *param0) { if (param0) { if (param0->unk_14) { @@ -141,11 +141,11 @@ void ov25_022555E8 (UnkStruct_ov25_022555E8 * param0) } } -void ov25_02255614 (UnkStruct_ov25_022555E8 * param0) +void ov25_02255614(UnkStruct_ov25_022555E8 *param0) { if (param0->unk_12) { - UnkStruct_ov25_022558C4 * v0 = param0->unk_08; - GXOamAttr * v1 = param0->unk_14; + UnkStruct_ov25_022558C4 *v0 = param0->unk_08; + GXOamAttr *v1 = param0->unk_14; s32 v2 = param0->unk_10; u32 v3; @@ -153,7 +153,7 @@ void ov25_02255614 (UnkStruct_ov25_022555E8 * param0) NNS_G2dTickCellAnimation(&v0->unk_08, FX32_ONE * 2); if (v0->unk_8A == 0) { - const NNSG2dSRTControl * v4 = &(v0->unk_08.srtCtrl); + const NNSG2dSRTControl *v4 = &(v0->unk_08.srtCtrl); NNSG2dFVec2 v5; v5.x = v0->unk_68.x + (fx32)(v4->srtData.trans.x << FX32_SHIFT); @@ -204,9 +204,9 @@ void ov25_02255614 (UnkStruct_ov25_022555E8 * param0) } } -UnkStruct_ov25_022558C4 * ov25_02255810 (UnkStruct_ov25_022555E8 * param0, const UnkStruct_ov25_02255810 * param1, const UnkStruct_ov25_02255958 * param2) +UnkStruct_ov25_022558C4 *ov25_02255810(UnkStruct_ov25_022555E8 *param0, const UnkStruct_ov25_02255810 *param1, const UnkStruct_ov25_02255958 *param2) { - UnkStruct_ov25_022558C4 * v0 = ov25_02255A04(param0); + UnkStruct_ov25_022558C4 *v0 = ov25_02255A04(param0); if (v0 != NULL) { v0->unk_84_val1_unk_02 = param1->unk_0B; @@ -234,74 +234,74 @@ UnkStruct_ov25_022558C4 * ov25_02255810 (UnkStruct_ov25_022555E8 * param0, const return v0; } -void ov25_022558B0 (UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_022558C4 * param1) +void ov25_022558B0(UnkStruct_ov25_022555E8 *param0, UnkStruct_ov25_022558C4 *param1) { ov25_02255A98(param0, param1); ov25_02255A1C(param0, param1); } -void ov25_022558C4 (UnkStruct_ov25_022558C4 * param0, u32 param1) +void ov25_022558C4(UnkStruct_ov25_022558C4 *param0, u32 param1) { NNS_G2dInitCellAnimation(&(param0->unk_08), NNS_G2dGetAnimSequenceByIdx(param0->unk_04, param1), param0->unk_00); } -BOOL ov25_022558E0 (UnkStruct_ov25_022558C4 * param0) +BOOL ov25_022558E0(UnkStruct_ov25_022558C4 *param0) { - NNSG2dAnimController * v0 = NNS_G2dGetCellAnimationAnimCtrl(&(param0->unk_08)); + NNSG2dAnimController *v0 = NNS_G2dGetCellAnimationAnimCtrl(&(param0->unk_08)); return NNS_G2dIsAnimCtrlActive(v0) == 0; } -void ov25_022558F0 (UnkStruct_ov25_022558C4 * param0, fx32 param1, fx32 param2) +void ov25_022558F0(UnkStruct_ov25_022558C4 *param0, fx32 param1, fx32 param2) { param0->unk_68.x += param1; param0->unk_68.y += param2; } -void ov25_02255900 (UnkStruct_ov25_022558C4 * param0, fx32 param1, fx32 param2) +void ov25_02255900(UnkStruct_ov25_022558C4 *param0, fx32 param1, fx32 param2) { param0->unk_68.x = param1; param0->unk_68.y = param2; } -void ov25_02255908 (const UnkStruct_ov25_022558C4 * param0, fx32 * param1, fx32 * param2) +void ov25_02255908(const UnkStruct_ov25_022558C4 *param0, fx32 *param1, fx32 *param2) { *param1 = param0->unk_68.x; *param2 = param0->unk_68.y; } -void ov25_02255914 (UnkStruct_ov25_022558C4 * param0, BOOL param1) +void ov25_02255914(UnkStruct_ov25_022558C4 *param0, BOOL param1) { param0->unk_8A = param1; } -void ov25_0225591C (UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_022558C4 * param1, u32 param2) +void ov25_0225591C(UnkStruct_ov25_022555E8 *param0, UnkStruct_ov25_022558C4 *param1, u32 param2) { ov25_02255A98(param0, param1); param1->unk_84_val1_unk_00 = param2; ov25_02255A40(param0, param1); } -void ov25_02255938 (UnkStruct_ov25_022558C4 * param0, u32 param1) +void ov25_02255938(UnkStruct_ov25_022558C4 *param0, u32 param1) { param0->unk_88 = param1; } -void ov25_02255940 (UnkStruct_ov25_022558C4 * param0, u32 param1) +void ov25_02255940(UnkStruct_ov25_022558C4 *param0, u32 param1) { param0->unk_8C = param1; } -void ov25_02255948 (UnkStruct_ov25_022558C4 * param0, BOOL param1) +void ov25_02255948(UnkStruct_ov25_022558C4 *param0, BOOL param1) { param0->unk_92 = param1; } -void ov25_02255950 (UnkStruct_ov25_022558C4 * param0, u16 param1) +void ov25_02255950(UnkStruct_ov25_022558C4 *param0, u16 param1) { param0->unk_90 = param1; } -BOOL ov25_02255958 (UnkStruct_ov25_02255958 * param0, u32 param1, u32 param2, u32 param3, int param4) +BOOL ov25_02255958(UnkStruct_ov25_02255958 *param0, u32 param1, u32 param2, u32 param3, int param4) { param0->unk_10 = param4; param0->unk_00 = sub_02006FD8(param1, param2, param4); @@ -320,7 +320,7 @@ BOOL ov25_02255958 (UnkStruct_ov25_02255958 * param0, u32 param1, u32 param2, u3 return 1; } -void ov25_022559B0 (UnkStruct_ov25_02255958 * param0) +void ov25_022559B0(UnkStruct_ov25_02255958 *param0) { if (param0->unk_00 != NULL) { Heap_FreeToHeapExplicit(param0->unk_10, param0->unk_00); @@ -333,7 +333,7 @@ void ov25_022559B0 (UnkStruct_ov25_02255958 * param0) } } -static void ov25_022559D8 (UnkStruct_ov25_022558C4 ** param0, UnkStruct_ov25_022558C4 * param1, u32 param2) +static void ov25_022559D8(UnkStruct_ov25_022558C4 **param0, UnkStruct_ov25_022558C4 *param1, u32 param2) { while (param2--) { *param0 = param1; @@ -343,13 +343,13 @@ static void ov25_022559D8 (UnkStruct_ov25_022558C4 ** param0, UnkStruct_ov25_022 } } -static void ov25_022559FC (UnkStruct_ov25_022558C4 * param0) +static void ov25_022559FC(UnkStruct_ov25_022558C4 *param0) { param0->unk_60 = NULL; param0->unk_64 = NULL; } -static UnkStruct_ov25_022558C4 * ov25_02255A04 (UnkStruct_ov25_022555E8 * param0) +static UnkStruct_ov25_022558C4 *ov25_02255A04(UnkStruct_ov25_022555E8 *param0) { if (param0->unk_12 < param0->unk_10) { return param0->unk_04[param0->unk_12++]; @@ -358,7 +358,7 @@ static UnkStruct_ov25_022558C4 * ov25_02255A04 (UnkStruct_ov25_022555E8 * param0 return NULL; } -static void ov25_02255A1C (UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_022558C4 * param1) +static void ov25_02255A1C(UnkStruct_ov25_022555E8 *param0, UnkStruct_ov25_022558C4 *param1) { if (param0->unk_12 == 0) { return; @@ -370,14 +370,14 @@ static void ov25_02255A1C (UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_0225 param0->unk_04[param0->unk_12] = param1; } -static void ov25_02255A40 (UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_022558C4 * param1) +static void ov25_02255A40(UnkStruct_ov25_022555E8 *param0, UnkStruct_ov25_022558C4 *param1) { if (param0->unk_08 == NULL) { param0->unk_08 = param1; param1->unk_60 = NULL; param1->unk_64 = NULL; } else { - UnkStruct_ov25_022558C4 * v0 = param0->unk_08; + UnkStruct_ov25_022558C4 *v0 = param0->unk_08; while (TRUE) { if (param1->unk_84_val2 < v0->unk_84_val2) { @@ -410,7 +410,7 @@ static void ov25_02255A40 (UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_0225 } } -static void ov25_02255A98 (UnkStruct_ov25_022555E8 * param0, UnkStruct_ov25_022558C4 * param1) +static void ov25_02255A98(UnkStruct_ov25_022555E8 *param0, UnkStruct_ov25_022558C4 *param1) { if (param1->unk_64 != NULL) { if (param1->unk_60 != NULL) { diff --git a/src/overlay025/ov25_02255DBC.c b/src/overlay025/ov25_02255DBC.c index dca41b9754..d0bcd7d317 100644 --- a/src/overlay025/ov25_02255DBC.c +++ b/src/overlay025/ov25_02255DBC.c @@ -1,8 +1,8 @@ +#include "overlay025/ov25_02255DBC.h" + #include #include -#include "overlay025/ov25_02255DBC.h" - static const u16 Unk_ov25_022560B0[] = { 0x1A, 0x20, @@ -72,7 +72,7 @@ static const u16 Unk_ov25_022560EC[] = { 0xBA }; -void ov25_02255DBC (u32 param0, u32 param1, u32 * param2, u32 * param3) +void ov25_02255DBC(u32 param0, u32 param1, u32 *param2, u32 *param3) { GF_ASSERT(param0 < NELEMS(Unk_ov25_022560B0)); GF_ASSERT(param1 < NELEMS(Unk_ov25_022560EC)); @@ -89,16 +89,16 @@ void ov25_02255DBC (u32 param0, u32 param1, u32 * param2, u32 * param3) *param3 = Unk_ov25_022560EC[param1]; } -void ov25_02255DFC (int param0, u32 * param1, u32 * param2) +void ov25_02255DFC(int param0, u32 *param1, u32 *param2) { static const struct { u32 unk_00; u32 unk_04; } v0[] = { - {32, 42}, - {50, 42}, - {168, 122}, - {194, 58}, + { 32, 42 }, + { 50, 42 }, + { 168, 122 }, + { 194, 58 }, }; GF_ASSERT(param0 < NELEMS(v0)); @@ -107,42 +107,42 @@ void ov25_02255DFC (int param0, u32 * param1, u32 * param2) *param2 = v0[param0].unk_04; } -BOOL ov25_02255E24 (int param0, u32 * param1, u32 * param2) +BOOL ov25_02255E24(int param0, u32 *param1, u32 *param2) { static const struct { u16 unk_00; u8 unk_02; u8 unk_03; } v0[] = { - {342, 47, 150}, - {343, 56, 144}, - {344, 65, 132}, - {345, 50, 126}, - {346, 50, 120}, - {347, 62, 108}, - {349, 74, 90}, - {350, 80, 111}, - {353, 83, 126}, - {354, 101, 126}, - {356, 125, 126}, - {362, 128, 102}, - {363, 122, 90}, - {365, 92, 90}, - {366, 104, 90}, - {367, 110, 138}, - {371, 119, 150}, - {373, 152, 147}, - {380, 152, 120}, - {382, 140, 102}, - {383, 86, 66}, - {385, 80, 51}, - {388, 41, 132}, - {391, 56, 156}, - {467, 59, 162}, - {392, 74, 162}, - {395, 170, 138}, - {200, 68, 114}, - {204, 56, 102} + { 342, 47, 150 }, + { 343, 56, 144 }, + { 344, 65, 132 }, + { 345, 50, 126 }, + { 346, 50, 120 }, + { 347, 62, 108 }, + { 349, 74, 90 }, + { 350, 80, 111 }, + { 353, 83, 126 }, + { 354, 101, 126 }, + { 356, 125, 126 }, + { 362, 128, 102 }, + { 363, 122, 90 }, + { 365, 92, 90 }, + { 366, 104, 90 }, + { 367, 110, 138 }, + { 371, 119, 150 }, + { 373, 152, 147 }, + { 380, 152, 120 }, + { 382, 140, 102 }, + { 383, 86, 66 }, + { 385, 80, 51 }, + { 388, 41, 132 }, + { 391, 56, 156 }, + { 467, 59, 162 }, + { 392, 74, 162 }, + { 395, 170, 138 }, + { 200, 68, 114 }, + { 204, 56, 102 } }; int v1; diff --git a/src/overlay025/poketch_button.c b/src/overlay025/poketch_button.c index 8a9ffb2d36..f10d973421 100644 --- a/src/overlay025/poketch_button.c +++ b/src/overlay025/poketch_button.c @@ -1,11 +1,10 @@ -#include -#include - #include "overlay025/poketch_button.h" -#include "touch_screen.h" +#include +#include #include "heap.h" +#include "touch_screen.h" static void PoketchButton_Init(PoketchButton *button); static void PoketchButton_ChangeState(PoketchButton *button, enum ButtonEventState state); @@ -17,7 +16,7 @@ static u32 Button_OnCheckDoubleTap(PoketchButton *button, BOOL touched, BOOL tap static u32 Button_OnDoubleTap(PoketchButton *button, BOOL touched, BOOL tapped); static u32 Button_OnReset(PoketchButton *button, BOOL touched, BOOL tapped); -PoketchButtonManager* PoketchButtonManager_New(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID) +PoketchButtonManager *PoketchButtonManager_New(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID) { GF_ASSERT(numButtons > 0); @@ -52,7 +51,7 @@ void PoketchButtonManager_Free(PoketchButtonManager *buttonManager) } // These functions all return ButtonManagerState values. -typedef u32(*const ButtonEvent[])(PoketchButton *button, BOOL touched, BOOL tapped); +typedef u32 (*const ButtonEvent[])(PoketchButton *button, BOOL touched, BOOL tapped); static ButtonEvent sButtonEvents = { Button_OnIdle, Button_OnPressed, @@ -81,7 +80,7 @@ void PoketchButtonManager_Update(PoketchButtonManager *buttonManager) buttonManager->buttons[i].screenTouched = TouchScreen_LocationPressed(&buttonManager->hitTable[i]); } } - // Didn't touch the screen--just update the button states + // Didn't touch the screen--just update the button states } else { tapped = FALSE; diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index 34fa91db03..56c72ddaf2 100644 --- a/src/overlay025/poketch_system.c +++ b/src/overlay025/poketch_system.c @@ -1,33 +1,32 @@ -#include "enums.h" +#include "overlay025/poketch_system.h" #include #include -#include "inlines.h" +#include "consts/sdat.h" #include "struct_decls/struct_02018340_decl.h" -#include "trainer_info.h" + #include "field/field_system_decl.h" -#include "savedata.h" -#include "overlay025/poketch_system.h" -#include "overlay025/struct_ov25_02254560_decl.h" +#include "overlay025/ov25_02254560.h" #include "overlay025/poketch_button.h" +#include "overlay025/struct_ov25_02254560_decl.h" -#include "touch_screen.h" - -#include "unk_02005474.h" +#include "enums.h" +#include "field_system.h" #include "game_overlay.h" -#include "sys_task.h" +#include "gender.h" #include "heap.h" +#include "inlines.h" +#include "savedata.h" +#include "sys_task.h" +#include "touch_screen.h" +#include "trainer_info.h" +#include "unk_02005474.h" #include "unk_0201E3D8.h" #include "unk_02025E08.h" -#include "field_system.h" -#include "trainer_info.h" #include "unk_020508D4.h" #include "unk_02099D44.h" -#include "overlay025/ov25_02254560.h" -#include "consts/sdat.h" -#include "gender.h" FS_EXTERN_OVERLAY(overlay26); FS_EXTERN_OVERLAY(overlay27); @@ -79,7 +78,7 @@ static BOOL PoketchSystem_ButtonInit(PoketchSystem *poketchSys); static void PoketchSystem_ButtonShutdown(PoketchSystem *poketchSys); static void PoketchSystem_ButtonUpdate(PoketchSystem *poketchSys); static void PoketchSystem_OnButtonEvent(u32 buttonID, u32 buttonEvent, u32 touchEvent, void *system); -static BOOL ov25_022543EC(UnkStruct_ov25_02254560 * param0, u32 param1); +static BOOL ov25_022543EC(UnkStruct_ov25_02254560 *param0, u32 param1); static inline BOOL PoketchSystem_InsideScreenBounds(u32 x, u32 y); // the order of this array determines the app order in the poketch. @@ -87,39 +86,38 @@ static const struct { int appID; FSOverlayID overlayID; } sAppOverlayIDs[] = { - {POKETCH_APPID_DIGITALWATCH, FS_OVERLAY_ID(overlay26)}, - {POKETCH_APPID_STOPWATCH, FS_OVERLAY_ID(overlay27)}, - {POKETCH_APPID_CALCULATOR, FS_OVERLAY_ID(overlay28)}, - {POKETCH_APPID_MEMOPAD, FS_OVERLAY_ID(overlay29)}, - {POKETCH_APPID_ANALOGWATCH, FS_OVERLAY_ID(overlay30)}, - {POKETCH_APPID_DOTART, FS_OVERLAY_ID(overlay31)}, - {POKETCH_APPID_PARTYSTATUS, FS_OVERLAY_ID(overlay32)}, - {POKETCH_APPID_FRIENDSHIPCHECKER, FS_OVERLAY_ID(overlay33)}, - {POKETCH_APPID_DOWSINGMACHINE, FS_OVERLAY_ID(overlay34)}, - {POKETCH_APPID_COUNTER, FS_OVERLAY_ID(overlay35)}, - {POKETCH_APPID_PEDOMETER, FS_OVERLAY_ID(overlay36)}, - {POKETCH_APPID_DAYCARECHECKER, FS_OVERLAY_ID(overlay40)}, - {POKETCH_APPID_ROULETTE, FS_OVERLAY_ID(overlay41)}, - {POKETCH_APPID_COINTOSS, FS_OVERLAY_ID(overlay42)}, - {POKETCH_APPID_MOVETESTER, FS_OVERLAY_ID(overlay43)}, - {POKETCH_APPID_MATCHUPCHECKER, FS_OVERLAY_ID(overlay44)}, - {POKETCH_APPID_ALARMCLOCK, FS_OVERLAY_ID(overlay45)}, - {POKETCH_APPID_KITCHENTIMER, FS_OVERLAY_ID(overlay46)}, - {POKETCH_APPID_MARKINGMAP, FS_OVERLAY_ID(overlay47)}, - {POKETCH_APPID_BERRYSEARCHER, FS_OVERLAY_ID(overlay48)}, - {POKETCH_APPID_COLORCHANGER, FS_OVERLAY_ID(overlay49)}, - {POKETCH_APPID_CALENDAR, FS_OVERLAY_ID(overlay50)}, - {POKETCH_APPID_LINKSEARCHER, FS_OVERLAY_ID(overlay52)}, - {POKETCH_APPID_RADARCHAINCOUNTER, FS_OVERLAY_ID(overlay53)}, - {POKETCH_APPID_POKEMONHISTORY, FS_OVERLAY_ID(overlay54)} + { POKETCH_APPID_DIGITALWATCH, FS_OVERLAY_ID(overlay26) }, + { POKETCH_APPID_STOPWATCH, FS_OVERLAY_ID(overlay27) }, + { POKETCH_APPID_CALCULATOR, FS_OVERLAY_ID(overlay28) }, + { POKETCH_APPID_MEMOPAD, FS_OVERLAY_ID(overlay29) }, + { POKETCH_APPID_ANALOGWATCH, FS_OVERLAY_ID(overlay30) }, + { POKETCH_APPID_DOTART, FS_OVERLAY_ID(overlay31) }, + { POKETCH_APPID_PARTYSTATUS, FS_OVERLAY_ID(overlay32) }, + { POKETCH_APPID_FRIENDSHIPCHECKER, FS_OVERLAY_ID(overlay33) }, + { POKETCH_APPID_DOWSINGMACHINE, FS_OVERLAY_ID(overlay34) }, + { POKETCH_APPID_COUNTER, FS_OVERLAY_ID(overlay35) }, + { POKETCH_APPID_PEDOMETER, FS_OVERLAY_ID(overlay36) }, + { POKETCH_APPID_DAYCARECHECKER, FS_OVERLAY_ID(overlay40) }, + { POKETCH_APPID_ROULETTE, FS_OVERLAY_ID(overlay41) }, + { POKETCH_APPID_COINTOSS, FS_OVERLAY_ID(overlay42) }, + { POKETCH_APPID_MOVETESTER, FS_OVERLAY_ID(overlay43) }, + { POKETCH_APPID_MATCHUPCHECKER, FS_OVERLAY_ID(overlay44) }, + { POKETCH_APPID_ALARMCLOCK, FS_OVERLAY_ID(overlay45) }, + { POKETCH_APPID_KITCHENTIMER, FS_OVERLAY_ID(overlay46) }, + { POKETCH_APPID_MARKINGMAP, FS_OVERLAY_ID(overlay47) }, + { POKETCH_APPID_BERRYSEARCHER, FS_OVERLAY_ID(overlay48) }, + { POKETCH_APPID_COLORCHANGER, FS_OVERLAY_ID(overlay49) }, + { POKETCH_APPID_CALENDAR, FS_OVERLAY_ID(overlay50) }, + { POKETCH_APPID_LINKSEARCHER, FS_OVERLAY_ID(overlay52) }, + { POKETCH_APPID_RADARCHAINCOUNTER, FS_OVERLAY_ID(overlay53) }, + { POKETCH_APPID_POKEMONHISTORY, FS_OVERLAY_ID(overlay54) } }; -static PoketchSystem* PoketchSystem_GetFromFieldSystem(void) +static PoketchSystem *PoketchSystem_GetFromFieldSystem(void) { return FieldSystem_GetPoketchSystem(); } - void PoketchSystem_Create(FieldSystem *fieldSystem, PoketchSystem **poketchSys, SaveData *saveData, BGL *bgl, NNSG2dOamManagerInstance *oamManager) { Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_POKETCH_MAIN, HEAP_SIZE_POKETCH_MAIN); @@ -148,7 +146,7 @@ void PoketchSystem_Create(FieldSystem *fieldSystem, PoketchSystem **poketchSys, } } -void PoketchSystem_StartShutdown (PoketchSystem *poketchSys) +void PoketchSystem_StartShutdown(PoketchSystem *poketchSys) { if (poketchSys->systemState != POKETCH_SYSTEM_SHUTDOWN && poketchSys->systemState != POKETCH_SYSTEM_UNLOAD) { PoketchSystem_SetState(poketchSys, POKETCH_SYSTEM_SHUTDOWN); @@ -168,7 +166,7 @@ void PoketchSystem_SendEvent(PoketchSystem *poketchSys, enum PoketchEventID even case POKETCH_EVENT_PLAYER_MOVED: poketchSys->playerMoving = TRUE; break; - case POKETCH_EVENT_PEDOMETER:{ + case POKETCH_EVENT_PEDOMETER: { u32 step_count = PoketchData_StepCount(poketchSys->poketchData); if (++step_count > POKETCH_PEDOMETER_MAX) { @@ -177,8 +175,7 @@ void PoketchSystem_SendEvent(PoketchSystem *poketchSys, enum PoketchEventID even PoketchData_SetStepCount(poketchSys->poketchData, step_count); poketchSys->pedometerUpdated = TRUE; - } - break; + } break; case POKETCH_EVENT_SAVE: if (poketchSys->appState == POKETCH_APP_STATE_UPDATE && poketchSys->currAppSave) { poketchSys->currAppSave(poketchSys->appSaveData); @@ -395,8 +392,7 @@ static void PoketchEvent_UpdateApp(PoketchSystem *poketchSys) static void PoketchEvent_OnAppChange(PoketchSystem *poketchSys) { switch (poketchSys->subState) { - case 0: - { + case 0: { u32 v0; poketchSys->unk_06 = 1; @@ -406,8 +402,7 @@ static void PoketchEvent_OnAppChange(PoketchSystem *poketchSys) PoketchSystem_InitApp(poketchSys, v0); poketchSys->subState++; - } - break; + } break; case 1: if (PoketchSystem_IsAppInitialized(poketchSys)) { ov25_022547D0(poketchSys->unk_1C, 2); @@ -544,11 +539,13 @@ void PoketchSystem_SetSaveFunction(PoketchAppSaveFunction saveFunction, void *sa poketchSys->appSaveData = saveData; } +// clang-format off static const TouchScreenHitTable sMainPoketchButtons[] = { [POKETCH_SYSTEM_MAIN_BUTTON_UP] = {POKETCH_BUTTON_TOP_MIN_Y, POKETCH_BUTTON_TOP_MAX_Y, POKETCH_BUTTON_TOP_MIN_X, POKETCH_BUTTON_TOP_MAX_X}, // Top button [POKETCH_SYSTEM_MAIN_BUTTON_DOWN] = {POKETCH_BUTTON_BOTTOM_MIN_Y, POKETCH_BUTTON_BOTTOM_MAX_Y, POKETCH_BUTTON_BOTTOM_MIN_X, POKETCH_BUTTON_BOTTOM_MAX_X}, // Bottom Button [POKETCH_SYSTEM_MAIN_BUTTON_SCREEN] = {POKETCH_SCREEN_MIN_Y, POKETCH_SCREEN_MAX_Y, POKETCH_SCREEN_MIN_X, POKETCH_SCREEN_MAX_X} // Screen }; +// clang-format on static BOOL PoketchSystem_ButtonInit(PoketchSystem *poketchSys) { @@ -649,9 +646,9 @@ static void PoketchSystem_OnButtonEvent(u32 buttonID, u32 buttonEvent, u32 touch } } -static BOOL ov25_022543EC (UnkStruct_ov25_02254560 * param0, u32 param1) +static BOOL ov25_022543EC(UnkStruct_ov25_02254560 *param0, u32 param1) { - for (u32 i = 0; i < 6; i++) { + for (u32 i = 0; i < 6; i++) { if (ov25_022547F4(param0, param1) == FALSE) { return FALSE; } @@ -661,7 +658,7 @@ static BOOL ov25_022543EC (UnkStruct_ov25_02254560 * param0, u32 param1) return TRUE; } -UnkStruct_ov25_02254560 * ov25_02254418 (void) +UnkStruct_ov25_02254560 *ov25_02254418(void) { PoketchSystem *poketchSys = PoketchSystem_GetFromFieldSystem(); return poketchSys->unk_1C; @@ -676,7 +673,7 @@ void PoketchSystem_PlaySoundEffect(u32 soundID) } } -void ov25_02254444 (u32 param0, u32 param1) +void ov25_02254444(u32 param0, u32 param1) { PoketchSystem *poketchSys = PoketchSystem_GetFromFieldSystem(); @@ -720,12 +717,12 @@ BOOL PoketchSystem_GetDisplayTappedCoords(u32 *x, u32 *y) return FALSE; } -BOOL ov25_0225450C (const PoketchSystem *poketchSys) +BOOL ov25_0225450C(const PoketchSystem *poketchSys) { return sub_020509A4(poketchSys->fieldSystem); } -void ov25_02254518 (const PoketchSystem *poketchSys, PoketchButtonManager *buttonManager) +void ov25_02254518(const PoketchSystem *poketchSys, PoketchButtonManager *buttonManager) { if (ov25_0225450C(poketchSys) == 0 && poketchSys->appChanging == FALSE) { PoketchButtonManager_Update(buttonManager); @@ -742,17 +739,17 @@ BOOL PoketchSystem_PedometerUpdated(const PoketchSystem *poketchSys) return poketchSys->pedometerUpdated; } -FieldSystem* PoketchSystem_GetFieldSystem(const PoketchSystem *poketchSys) +FieldSystem *PoketchSystem_GetFieldSystem(const PoketchSystem *poketchSys) { return poketchSys->fieldSystem; } -PoketchData* PoketchSystem_GetPoketchData(const PoketchSystem *poketchSys) +PoketchData *PoketchSystem_GetPoketchData(const PoketchSystem *poketchSys) { return poketchSys->poketchData; } -SaveData* PoketchSystem_GetSaveData(const PoketchSystem *poketchSys) +SaveData *PoketchSystem_GetSaveData(const PoketchSystem *poketchSys) { return poketchSys->saveData; } diff --git a/src/overlay026/ov26_022561C0.c b/src/overlay026/ov26_022561C0.c index 935957ba48..28a6fdb323 100644 --- a/src/overlay026/ov26_022561C0.c +++ b/src/overlay026/ov26_022561C0.c @@ -1,20 +1,20 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay026/struct_ov26_02256404_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay026/ov26_02256404.h" #include "overlay026/struct_ov26_02256404_1.h" +#include "overlay026/struct_ov26_02256404_decl.h" -#include "sys_task.h" -#include "rtc.h" #include "heap.h" -#include "overlay026/ov26_02256404.h" +#include "rtc.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; @@ -29,35 +29,35 @@ typedef struct { u32 unk_0C; PoketchButtonManager *buttonManager; UnkStruct_ov26_02256404_1 unk_14; - UnkStruct_ov26_02256404 * unk_24; + UnkStruct_ov26_02256404 *unk_24; PoketchSystem *poketchSys; } UnkStruct_ov26_0225621C; static void NitroStaticInit(void); -static BOOL ov26_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov26_0225621C(UnkStruct_ov26_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov26_022562A4(UnkStruct_ov26_0225621C * param0); -static void ov26_022562BC(SysTask * param0, void * param1); -static void ov26_022562F8(void * param0); -static void ov26_02256300(u32 param0, u32 param1, u32 param2, void * param3); -static void ov26_0225631C(UnkStruct_ov26_0225621C * param0, u32 param1); -static BOOL ov26_02256330(UnkStruct_ov26_0225621C * param0); -static BOOL ov26_02256370(UnkStruct_ov26_0225621C * param0); -static BOOL ov26_022563D0(UnkStruct_ov26_0225621C * param0); +static BOOL ov26_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov26_0225621C(UnkStruct_ov26_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov26_022562A4(UnkStruct_ov26_0225621C *param0); +static void ov26_022562BC(SysTask *param0, void *param1); +static void ov26_022562F8(void *param0); +static void ov26_02256300(u32 param0, u32 param1, u32 param2, void *param3); +static void ov26_0225631C(UnkStruct_ov26_0225621C *param0, u32 param1); +static BOOL ov26_02256330(UnkStruct_ov26_0225621C *param0); +static BOOL ov26_02256370(UnkStruct_ov26_0225621C *param0); +static BOOL ov26_022563D0(UnkStruct_ov26_0225621C *param0); static const TouchScreenHitTable Unk_ov26_02256718[] = { - {0x10, 0xAF, 0x10, 0xCF} + { 0x10, 0xAF, 0x10, 0xCF } }; -static void NitroStaticInit (void) +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov26_022561D4, ov26_022562F8); } -static BOOL ov26_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov26_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov26_0225621C * v0 = (UnkStruct_ov26_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov26_0225621C)); + UnkStruct_ov26_0225621C *v0 = (UnkStruct_ov26_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov26_0225621C)); if (v0 != NULL) { if (ov26_0225621C(v0, poketchSys, param2, param3)) { @@ -73,7 +73,7 @@ static BOOL ov26_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov26_0225621C (UnkStruct_ov26_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov26_0225621C(UnkStruct_ov26_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { if (ov26_02256404(&(param0->unk_24), &(param0->unk_14), param2)) { param0->unk_00 = 0; @@ -109,20 +109,22 @@ static BOOL ov26_0225621C (UnkStruct_ov26_0225621C * param0, PoketchSystem *poke return 0; } -static void ov26_022562A4 (UnkStruct_ov26_0225621C * param0) +static void ov26_022562A4(UnkStruct_ov26_0225621C *param0) { ov26_0225649C(param0->unk_24); PoketchButtonManager_Free(param0->buttonManager); Heap_FreeToHeap(param0); } -static void ov26_022562BC (SysTask * param0, void * param1) +static void ov26_022562BC(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov26_0225621C *) = { - ov26_02256330, ov26_02256370, ov26_022563D0, + static BOOL (*const v0[])(UnkStruct_ov26_0225621C *) = { + ov26_02256330, + ov26_02256370, + ov26_022563D0, }; - UnkStruct_ov26_0225621C * v1 = (UnkStruct_ov26_0225621C *)param1; + UnkStruct_ov26_0225621C *v1 = (UnkStruct_ov26_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -136,14 +138,14 @@ static void ov26_022562BC (SysTask * param0, void * param1) } } -static void ov26_022562F8 (void * param0) +static void ov26_022562F8(void *param0) { ((UnkStruct_ov26_0225621C *)param0)->unk_02 = 1; } -static void ov26_02256300 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov26_02256300(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov26_0225621C * v0 = (UnkStruct_ov26_0225621C *)param3; + UnkStruct_ov26_0225621C *v0 = (UnkStruct_ov26_0225621C *)param3; switch (param2) { case 1: @@ -157,7 +159,7 @@ static void ov26_02256300 (u32 param0, u32 param1, u32 param2, void * param3) } } -static void ov26_0225631C (UnkStruct_ov26_0225621C * param0, u32 param1) +static void ov26_0225631C(UnkStruct_ov26_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -168,7 +170,7 @@ static void ov26_0225631C (UnkStruct_ov26_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov26_02256330 (UnkStruct_ov26_0225621C * param0) +static BOOL ov26_02256330(UnkStruct_ov26_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -186,7 +188,7 @@ static BOOL ov26_02256330 (UnkStruct_ov26_0225621C * param0) return 0; } -static BOOL ov26_02256370 (UnkStruct_ov26_0225621C * param0) +static BOOL ov26_02256370(UnkStruct_ov26_0225621C *param0) { if (param0->unk_02) { ov26_0225631C(param0, 2); @@ -211,7 +213,7 @@ static BOOL ov26_02256370 (UnkStruct_ov26_0225621C * param0) return 0; } -static BOOL ov26_022563D0 (UnkStruct_ov26_0225621C * param0) +static BOOL ov26_022563D0(UnkStruct_ov26_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay026/ov26_02256404.c b/src/overlay026/ov26_02256404.c index f232bcbd19..3eb694ab3f 100644 --- a/src/overlay026/ov26_02256404.c +++ b/src/overlay026/ov26_02256404.c @@ -1,44 +1,45 @@ +#include "overlay026/ov26_02256404.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay026/struct_ov26_02256404_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" #include "overlay026/struct_ov26_02256404_1.h" +#include "overlay026/struct_ov26_02256404_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay026/ov26_02256404.h" struct UnkStruct_ov26_02256404_t { - const UnkStruct_ov26_02256404_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov26_02256404_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; u16 unk_30[360]; }; -static void ov26_0225646C(const u16 * param0, u16 * param1); -static void ov26_022564E4(UnkStruct_ov25_02255224 * param0); -static void ov26_022564F8(SysTask * param0, void * param1); -static void ov26_0225658C(SysTask * param0, void * param1); -static void ov26_022565AC(SysTask * param0, void * param1); -static void ov26_022565D8(SysTask * param0, void * param1); -static void ov26_022565F4(UnkStruct_ov26_02256404 * param0); +static void ov26_0225646C(const u16 *param0, u16 *param1); +static void ov26_022564E4(UnkStruct_ov25_02255224 *param0); +static void ov26_022564F8(SysTask *param0, void *param1); +static void ov26_0225658C(SysTask *param0, void *param1); +static void ov26_022565AC(SysTask *param0, void *param1); +static void ov26_022565D8(SysTask *param0, void *param1); +static void ov26_022565F4(UnkStruct_ov26_02256404 *param0); -BOOL ov26_02256404 (UnkStruct_ov26_02256404 ** param0, const UnkStruct_ov26_02256404_1 * param1, BGL * param2) +BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_02256404_1 *param1, BGL *param2) { - UnkStruct_ov26_02256404 * v0 = (UnkStruct_ov26_02256404 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov26_02256404)); + UnkStruct_ov26_02256404 *v0 = (UnkStruct_ov26_02256404 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov26_02256404)); if (v0 != NULL) { - NNSG2dScreenData * v1; - void * v2; + NNSG2dScreenData *v1; + void *v2; ov25_02255090(v0->unk_08, 8); @@ -62,7 +63,7 @@ BOOL ov26_02256404 (UnkStruct_ov26_02256404 ** param0, const UnkStruct_ov26_0225 return 0; } -static void ov26_0225646C (const u16 * param0, u16 * param1) +static void ov26_0225646C(const u16 *param0, u16 *param1) { int v0, v1; @@ -79,7 +80,7 @@ static void ov26_0225646C (const u16 * param0, u16 * param1) } } -void ov26_0225649C (UnkStruct_ov26_02256404 * param0) +void ov26_0225649C(UnkStruct_ov26_02256404 *param0) { if (param0 != NULL) { Heap_FreeToHeap(param0); @@ -87,35 +88,35 @@ void ov26_0225649C (UnkStruct_ov26_02256404 * param0) } static const UnkStruct_ov25_0225517C Unk_ov26_02256744[] = { - {0x0, ov26_022564F8, 0x0}, - {0x1, ov26_0225658C, 0x0}, - {0x2, ov26_022565AC, 0x0}, - {0x3, ov26_022565D8, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov26_022564F8, 0x0 }, + { 0x1, ov26_0225658C, 0x0 }, + { 0x2, ov26_022565AC, 0x0 }, + { 0x3, ov26_022565D8, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov26_022564A8 (UnkStruct_ov26_02256404 * param0, u32 param1) +void ov26_022564A8(UnkStruct_ov26_02256404 *param0, u32 param1) { ov25_0225517C(Unk_ov26_02256744, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov26_022564CC (UnkStruct_ov26_02256404 * param0, u32 param1) +BOOL ov26_022564CC(UnkStruct_ov26_02256404 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov26_022564D8 (UnkStruct_ov26_02256404 * param0) +BOOL ov26_022564D8(UnkStruct_ov26_02256404 *param0) { return ov25_02255154(param0->unk_08); } -static void ov26_022564E4 (UnkStruct_ov25_02255224 * param0) +static void ov26_022564E4(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov26_02256404 * v0 = ov25_0225523C(param0); + UnkStruct_ov26_02256404 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov26_022564F8 (SysTask * param0, void * param1) +static void ov26_022564F8(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -133,7 +134,7 @@ static void ov26_022564F8 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov26_02256404 * v2; + UnkStruct_ov26_02256404 *v2; v2 = ov25_0225523C(param1); @@ -151,18 +152,18 @@ static void ov26_022564F8 (SysTask * param0, void * param1) ov26_022564E4(param1); } -static void ov26_0225658C (SysTask * param0, void * param1) +static void ov26_0225658C(SysTask *param0, void *param1) { - UnkStruct_ov26_02256404 * v0 = ov25_0225523C(param1); + UnkStruct_ov26_02256404 *v0 = ov25_0225523C(param1); ov26_022565F4(v0); sub_02019448(v0->unk_04, 6); ov26_022564E4(param1); } -static void ov26_022565AC (SysTask * param0, void * param1) +static void ov26_022565AC(SysTask *param0, void *param1) { - UnkStruct_ov26_02256404 * v0 = ov25_0225523C(param1); + UnkStruct_ov26_02256404 *v0 = ov25_0225523C(param1); if (v0->unk_00->unk_0C) { ov25_022546F0(0, 0); @@ -173,15 +174,15 @@ static void ov26_022565AC (SysTask * param0, void * param1) ov26_022564E4(param1); } -static void ov26_022565D8 (SysTask * param0, void * param1) +static void ov26_022565D8(SysTask *param0, void *param1) { - UnkStruct_ov26_02256404 * v0 = ov25_0225523C(param1); + UnkStruct_ov26_02256404 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov26_022564E4(param1); } -static void ov26_022565F4 (UnkStruct_ov26_02256404 * param0) +static void ov26_022565F4(UnkStruct_ov26_02256404 *param0) { u32 v0, v1; diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c index 45bb8d71ed..1f5bfab8e1 100644 --- a/src/overlay027/ov27_022561C0.c +++ b/src/overlay027/ov27_022561C0.c @@ -1,21 +1,21 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay027/struct_ov27_0225680C_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay027/ov27_0225680C.h" #include "overlay027/struct_ov27_0225680C_1.h" +#include "overlay027/struct_ov27_0225680C_decl.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02022844.h" #include "unk_02099D44.h" -#include "overlay027/ov27_0225680C.h" typedef struct { BOOL unk_00; @@ -40,40 +40,40 @@ typedef struct { UnkStruct_ov27_0225680C_1 unk_1C; UnkStruct_ov27_0225621C_sub1 unk_38; PoketchButtonManager *buttonManager; - UnkStruct_ov27_0225680C * unk_60; + UnkStruct_ov27_0225680C *unk_60; PoketchSystem *poketchSys; } UnkStruct_ov27_0225621C; static void NitroStaticInit(void); -static BOOL ov27_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov27_0225621C(UnkStruct_ov27_0225621C * param0, BGL * param1, u32 param2); -static void ov27_022562AC(UnkStruct_ov27_0225621C * param0); -static void ov27_022562FC(SysTask * param0, void * param1); -static void ov27_02256358(void * param0); -static void ov27_02256360(UnkStruct_ov27_0225621C * param0, u32 param1); -static BOOL ov27_0225637C(UnkStruct_ov27_0225621C * param0); -static BOOL ov27_022563CC(UnkStruct_ov27_0225621C * param0); -static BOOL ov27_0225644C(UnkStruct_ov27_0225621C * param0); -static BOOL ov27_022564D0(UnkStruct_ov27_0225621C * param0); -static BOOL ov27_02256534(UnkStruct_ov27_0225621C * param0); -static BOOL ov27_022565D0(UnkStruct_ov27_0225621C * param0); -static BOOL ov27_02256608(UnkStruct_ov27_0225621C * param0); -static void ov27_02256654(UnkStruct_ov27_0225621C * param0); -static void ov27_02256660(u32 param0, u32 param1, u32 param2, void * param3); -static void ov27_02256664(UnkStruct_ov27_0225621C * param0); -static void ov27_02256680(UnkStruct_ov27_0225621C * param0); -static void ov27_022566C4(UnkStruct_ov27_0225621C * param0); -static void ov27_022566D8(UnkStruct_ov27_0225621C * param0, UnkStruct_ov27_0225680C_1 * param1); - -static void NitroStaticInit (void) +static BOOL ov27_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov27_0225621C(UnkStruct_ov27_0225621C *param0, BGL *param1, u32 param2); +static void ov27_022562AC(UnkStruct_ov27_0225621C *param0); +static void ov27_022562FC(SysTask *param0, void *param1); +static void ov27_02256358(void *param0); +static void ov27_02256360(UnkStruct_ov27_0225621C *param0, u32 param1); +static BOOL ov27_0225637C(UnkStruct_ov27_0225621C *param0); +static BOOL ov27_022563CC(UnkStruct_ov27_0225621C *param0); +static BOOL ov27_0225644C(UnkStruct_ov27_0225621C *param0); +static BOOL ov27_022564D0(UnkStruct_ov27_0225621C *param0); +static BOOL ov27_02256534(UnkStruct_ov27_0225621C *param0); +static BOOL ov27_022565D0(UnkStruct_ov27_0225621C *param0); +static BOOL ov27_02256608(UnkStruct_ov27_0225621C *param0); +static void ov27_02256654(UnkStruct_ov27_0225621C *param0); +static void ov27_02256660(u32 param0, u32 param1, u32 param2, void *param3); +static void ov27_02256664(UnkStruct_ov27_0225621C *param0); +static void ov27_02256680(UnkStruct_ov27_0225621C *param0); +static void ov27_022566C4(UnkStruct_ov27_0225621C *param0); +static void ov27_022566D8(UnkStruct_ov27_0225621C *param0, UnkStruct_ov27_0225680C_1 *param1); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov27_022561D4, ov27_02256358); } -static BOOL ov27_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov27_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov27_0225621C * v0 = (UnkStruct_ov27_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225621C)); + UnkStruct_ov27_0225621C *v0 = (UnkStruct_ov27_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225621C)); if (v0 != NULL) { if (ov27_0225621C(v0, param2, param3)) { @@ -92,7 +92,7 @@ static BOOL ov27_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov27_0225621C (UnkStruct_ov27_0225621C * param0, BGL * param1, u32 param2) +static BOOL ov27_0225621C(UnkStruct_ov27_0225621C *param0, BGL *param1, u32 param2) { param0->unk_08 = param2; @@ -129,7 +129,7 @@ static BOOL ov27_0225621C (UnkStruct_ov27_0225621C * param0, BGL * param1, u32 p return 0; } -static void ov27_022562AC (UnkStruct_ov27_0225621C * param0) +static void ov27_022562AC(UnkStruct_ov27_0225621C *param0) { param0->unk_38.unk_14 = param0->unk_0C; param0->unk_38.unk_1C = param0->unk_14; @@ -147,9 +147,9 @@ static void ov27_022562AC (UnkStruct_ov27_0225621C * param0) Heap_FreeToHeap(param0); } -static void ov27_022562FC (SysTask * param0, void * param1) +static void ov27_022562FC(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov27_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov27_0225621C *) = { ov27_0225637C, ov27_022563CC, ov27_0225644C, @@ -158,7 +158,7 @@ static void ov27_022562FC (SysTask * param0, void * param1) ov27_022565D0 }; - UnkStruct_ov27_0225621C * v1 = (UnkStruct_ov27_0225621C *)param1; + UnkStruct_ov27_0225621C *v1 = (UnkStruct_ov27_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v1->unk_02 && (v1->unk_00 != 5)) { @@ -178,12 +178,12 @@ static void ov27_022562FC (SysTask * param0, void * param1) } } -static void ov27_02256358 (void * param0) +static void ov27_02256358(void *param0) { ((UnkStruct_ov27_0225621C *)param0)->unk_02 = 1; } -static void ov27_02256360 (UnkStruct_ov27_0225621C * param0, u32 param1) +static void ov27_02256360(UnkStruct_ov27_0225621C *param0, u32 param1) { param0->unk_03 = param0->unk_00; @@ -197,7 +197,7 @@ static void ov27_02256360 (UnkStruct_ov27_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov27_0225637C (UnkStruct_ov27_0225621C * param0) +static BOOL ov27_0225637C(UnkStruct_ov27_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -220,7 +220,7 @@ static BOOL ov27_0225637C (UnkStruct_ov27_0225621C * param0) return 0; } -static BOOL ov27_022563CC (UnkStruct_ov27_0225621C * param0) +static BOOL ov27_022563CC(UnkStruct_ov27_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -255,7 +255,7 @@ static BOOL ov27_022563CC (UnkStruct_ov27_0225621C * param0) return 0; } -static BOOL ov27_0225644C (UnkStruct_ov27_0225621C * param0) +static BOOL ov27_0225644C(UnkStruct_ov27_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -290,7 +290,7 @@ static BOOL ov27_0225644C (UnkStruct_ov27_0225621C * param0) return 0; } -static BOOL ov27_022564D0 (UnkStruct_ov27_0225621C * param0) +static BOOL ov27_022564D0(UnkStruct_ov27_0225621C *param0) { switch (param0->unk_04) { case 3: @@ -316,7 +316,7 @@ static BOOL ov27_022564D0 (UnkStruct_ov27_0225621C * param0) return 0; } -static BOOL ov27_02256534 (UnkStruct_ov27_0225621C * param0) +static BOOL ov27_02256534(UnkStruct_ov27_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -351,7 +351,7 @@ static BOOL ov27_02256534 (UnkStruct_ov27_0225621C * param0) return 0; } -static BOOL ov27_022565D0 (UnkStruct_ov27_0225621C * param0) +static BOOL ov27_022565D0(UnkStruct_ov27_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -369,10 +369,10 @@ static BOOL ov27_022565D0 (UnkStruct_ov27_0225621C * param0) return 0; } -static BOOL ov27_02256608 (UnkStruct_ov27_0225621C * param0) +static BOOL ov27_02256608(UnkStruct_ov27_0225621C *param0) { static const TouchScreenHitTable v0[] = { - {0xfe, 112, 112, 39}, + { 0xfe, 112, 112, 39 }, }; param0->buttonManager = PoketchButtonManager_New(v0, NELEMS(v0), ov27_02256660, param0, 8); @@ -387,18 +387,18 @@ static BOOL ov27_02256608 (UnkStruct_ov27_0225621C * param0) return 0; } -static void ov27_02256654 (UnkStruct_ov27_0225621C * param0) +static void ov27_02256654(UnkStruct_ov27_0225621C *param0) { PoketchButtonManager_Free(param0->buttonManager); } -static void ov27_02256660 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov27_02256660(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov27_0225621C * v0 = (UnkStruct_ov27_0225621C *)param3; + UnkStruct_ov27_0225621C *v0 = (UnkStruct_ov27_0225621C *)param3; v0->unk_04 = param1; } -static void ov27_02256664 (UnkStruct_ov27_0225621C * param0) +static void ov27_02256664(UnkStruct_ov27_0225621C *param0) { param0->unk_1C.unk_00 = 0; param0->unk_1C.unk_04 = 1; @@ -410,7 +410,7 @@ static void ov27_02256664 (UnkStruct_ov27_0225621C * param0) param0->unk_14 = 0; } -static void ov27_02256680 (UnkStruct_ov27_0225621C * param0) +static void ov27_02256680(UnkStruct_ov27_0225621C *param0) { if (param0->unk_0C) { param0->unk_0C += (sub_0202293C() - param0->unk_14); @@ -422,13 +422,13 @@ static void ov27_02256680 (UnkStruct_ov27_0225621C * param0) param0->unk_1C.unk_04 = 0; } -static void ov27_022566C4 (UnkStruct_ov27_0225621C * param0) +static void ov27_022566C4(UnkStruct_ov27_0225621C *param0) { param0->unk_14 = sub_0202293C(); param0->unk_1C.unk_00 = 0; } -static void ov27_022566D8 (UnkStruct_ov27_0225621C * param0, UnkStruct_ov27_0225680C_1 * param1) +static void ov27_022566D8(UnkStruct_ov27_0225621C *param0, UnkStruct_ov27_0225680C_1 *param1) { if (param1->unk_00) { u64 v0, v1, v2; diff --git a/src/overlay027/ov27_0225680C.c b/src/overlay027/ov27_0225680C.c index 280807bed4..96b17c6113 100644 --- a/src/overlay027/ov27_0225680C.c +++ b/src/overlay027/ov27_0225680C.c @@ -1,28 +1,29 @@ +#include "overlay027/ov27_0225680C.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay027/struct_ov27_0225680C_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay027/struct_ov27_0225680C_1.h" +#include "overlay027/struct_ov27_0225680C_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" -#include "sys_task.h" #include "heap.h" -#include "unk_02018340.h" +#include "sys_task.h" #include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay027/ov27_0225680C.h" +#include "unk_02006E3C.h" +#include "unk_02018340.h" typedef struct { u16 unk_00; @@ -31,40 +32,40 @@ typedef struct { } UnkStruct_ov27_02256E90; struct UnkStruct_ov27_0225680C_t { - const UnkStruct_ov27_0225680C_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov27_0225680C_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; - NNSG2dOamManagerInstance * unk_30; + NNSG2dOamManagerInstance *unk_30; UnkStruct_ov25_02255958 unk_34; UnkStruct_ov25_02255958 unk_48; - UnkStruct_ov25_022555E8 * unk_5C; - UnkStruct_ov25_022558C4 * unk_60[9]; - SysTask * unk_84; + UnkStruct_ov25_022555E8 *unk_5C; + UnkStruct_ov25_022558C4 *unk_60[9]; + SysTask *unk_84; }; -static void ov27_022568A8(SysTask * param0, void * param1); -static void ov27_022568B4(UnkStruct_ov27_0225680C * param0); -static void ov27_02256A04(UnkStruct_ov25_02255224 * param0); -static void ov27_02256A18(SysTask * param0, void * param1); -static BOOL ov27_02256AEC(UnkStruct_ov27_0225680C * param0); -static void ov27_02256B24(UnkStruct_ov27_0225680C * param0, const UnkStruct_ov27_0225680C_1 * param1); -static void ov27_02256B80(SysTask * param0, void * param1); -static void ov27_02256BB0(SysTask * param0, void * param1); -static void ov27_02256BE8(SysTask * param0, void * param1); -static void ov27_02256C2C(SysTask * param0, void * param1); -static void ov27_02256C80(SysTask * param0, void * param1); -static void ov27_02256D00(SysTask * param0, void * param1); -static void ov27_02256D80(SysTask * param0, void * param1); -static void ov27_02256E1C(SysTask * param0, void * param1); -static BOOL ov27_02256E90(UnkStruct_ov27_02256E90 * param0, u32 param1); -static void ov27_02256EC4(BGL * param0, u32 param1); -static void ov27_02256F24(SysTask * param0, void * param1); -static void ov27_02256F7C(UnkStruct_ov27_0225680C * param0); -struct PoketchSystem * FieldSystem_GetPoketchSystem(void); - -BOOL ov27_0225680C (UnkStruct_ov27_0225680C ** param0, const UnkStruct_ov27_0225680C_1 * param1, BGL * param2) +static void ov27_022568A8(SysTask *param0, void *param1); +static void ov27_022568B4(UnkStruct_ov27_0225680C *param0); +static void ov27_02256A04(UnkStruct_ov25_02255224 *param0); +static void ov27_02256A18(SysTask *param0, void *param1); +static BOOL ov27_02256AEC(UnkStruct_ov27_0225680C *param0); +static void ov27_02256B24(UnkStruct_ov27_0225680C *param0, const UnkStruct_ov27_0225680C_1 *param1); +static void ov27_02256B80(SysTask *param0, void *param1); +static void ov27_02256BB0(SysTask *param0, void *param1); +static void ov27_02256BE8(SysTask *param0, void *param1); +static void ov27_02256C2C(SysTask *param0, void *param1); +static void ov27_02256C80(SysTask *param0, void *param1); +static void ov27_02256D00(SysTask *param0, void *param1); +static void ov27_02256D80(SysTask *param0, void *param1); +static void ov27_02256E1C(SysTask *param0, void *param1); +static BOOL ov27_02256E90(UnkStruct_ov27_02256E90 *param0, u32 param1); +static void ov27_02256EC4(BGL *param0, u32 param1); +static void ov27_02256F24(SysTask *param0, void *param1); +static void ov27_02256F7C(UnkStruct_ov27_0225680C *param0); +struct PoketchSystem *FieldSystem_GetPoketchSystem(void); + +BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_0225680C_1 *param1, BGL *param2) { - UnkStruct_ov27_0225680C * v0 = (UnkStruct_ov27_0225680C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225680C)); + UnkStruct_ov27_0225680C *v0 = (UnkStruct_ov27_0225680C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov27_0225680C)); if (v0 != NULL) { v0->unk_00 = param1; @@ -90,7 +91,7 @@ BOOL ov27_0225680C (UnkStruct_ov27_0225680C ** param0, const UnkStruct_ov27_0225 return 0; } -void ov27_02256890 (UnkStruct_ov27_0225680C * param0) +void ov27_02256890(UnkStruct_ov27_0225680C *param0) { if (param0) { if (param0->unk_04) { @@ -101,13 +102,13 @@ void ov27_02256890 (UnkStruct_ov27_0225680C * param0) } } -static void ov27_022568A8 (SysTask * param0, void * param1) +static void ov27_022568A8(SysTask *param0, void *param1) { - UnkStruct_ov27_0225680C * v0 = (UnkStruct_ov27_0225680C *)param1; + UnkStruct_ov27_0225680C *v0 = (UnkStruct_ov27_0225680C *)param1; ov27_022568B4(v0); } -static void ov27_022568B4 (UnkStruct_ov27_0225680C * param0) +static void ov27_022568B4(UnkStruct_ov27_0225680C *param0) { u32 v0, v1; @@ -145,34 +146,34 @@ static void ov27_022568B4 (UnkStruct_ov27_0225680C * param0) } static const UnkStruct_ov25_0225517C Unk_ov27_02256FF0[] = { - {0x0, ov27_02256A18, 0x0}, - {0x1, ov27_02256B80, sizeof(UnkStruct_ov27_02256E90)}, - {0x3, ov27_02256F24, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov27_02256A18, 0x0 }, + { 0x1, ov27_02256B80, sizeof(UnkStruct_ov27_02256E90) }, + { 0x3, ov27_02256F24, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov27_022569C8 (UnkStruct_ov27_0225680C * param0, u32 param1) +void ov27_022569C8(UnkStruct_ov27_0225680C *param0, u32 param1) { ov25_0225517C(Unk_ov27_02256FF0, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov27_022569EC (UnkStruct_ov27_0225680C * param0, u32 param1) +BOOL ov27_022569EC(UnkStruct_ov27_0225680C *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov27_022569F8 (UnkStruct_ov27_0225680C * param0) +BOOL ov27_022569F8(UnkStruct_ov27_0225680C *param0) { return ov25_02255154(param0->unk_08); } -static void ov27_02256A04 (UnkStruct_ov25_02255224 * param0) +static void ov27_02256A04(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov27_0225680C * v0 = ov25_0225523C(param0); + UnkStruct_ov27_0225680C *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov27_02256A18 (SysTask * param0, void * param1) +static void ov27_02256A18(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -190,7 +191,7 @@ static void ov27_02256A18 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov27_0225680C * v2 = ov25_0225523C(param1); + UnkStruct_ov27_0225680C *v2 = ov25_0225523C(param1); sub_020183C4(v2->unk_04, 6, &v0, 0); sub_02006E3C(12, 21, v2->unk_04, 6, 0, 0, 1, 8); @@ -200,8 +201,8 @@ static void ov27_02256A18 (SysTask * param0, void * param1) sub_02019448(v2->unk_04, 6); { - UnkStruct_ov27_0225680C * v3 = ov25_0225523C(param1); - const UnkStruct_ov27_0225680C_1 * v4 = ov25_02255240(param1); + UnkStruct_ov27_0225680C *v3 = ov25_0225523C(param1); + const UnkStruct_ov27_0225680C_1 *v4 = ov25_02255240(param1); ov27_02256AEC(v3); ov27_02256B24(v3, v4); @@ -221,7 +222,7 @@ static void ov27_02256A18 (SysTask * param0, void * param1) ov27_02256A04(param1); } -static BOOL ov27_02256AEC (UnkStruct_ov27_0225680C * param0) +static BOOL ov27_02256AEC(UnkStruct_ov27_0225680C *param0) { sub_02006EC0(12, 2, 1, 0, 0, 1, 8); sub_02006EC0(12, 22, 1, 80 * 0x20, 0, 1, 8); @@ -229,81 +230,81 @@ static BOOL ov27_02256AEC (UnkStruct_ov27_0225680C * param0) return 1; } -static void ov27_02256B24 (UnkStruct_ov27_0225680C * param0, const UnkStruct_ov27_0225680C_1 * param1) +static void ov27_02256B24(UnkStruct_ov27_0225680C *param0, const UnkStruct_ov27_0225680C_1 *param1) { static const UnkStruct_ov25_02255810 v0[] = { { - {32 << FX32_SHIFT, 40 << FX32_SHIFT}, + { 32 << FX32_SHIFT, 40 << FX32_SHIFT }, 0, 0, 2, 0, - 0 + 0, }, { - {(32 + 16) << FX32_SHIFT, 40 << FX32_SHIFT}, + { (32 + 16) << FX32_SHIFT, 40 << FX32_SHIFT }, 0, 0, 2, 0, - 0 + 0, }, { - {80 << FX32_SHIFT, 40 << FX32_SHIFT}, + { 80 << FX32_SHIFT, 40 << FX32_SHIFT }, 0, 0, 2, 0, - 0 + 0, }, { - {(80 + 16) << FX32_SHIFT, 40 << FX32_SHIFT}, + { (80 + 16) << FX32_SHIFT, 40 << FX32_SHIFT }, 0, 0, 2, 0, - 0 + 0, }, { - {128 << FX32_SHIFT, 40 << FX32_SHIFT}, + { 128 << FX32_SHIFT, 40 << FX32_SHIFT }, 0, 0, 2, 0, - 0 + 0, }, { - {(128 + 16) << FX32_SHIFT, 40 << FX32_SHIFT}, + { (128 + 16) << FX32_SHIFT, 40 << FX32_SHIFT }, 0, 0, 2, 0, - 0 + 0, }, { - {176 << FX32_SHIFT, 40 << FX32_SHIFT}, + { 176 << FX32_SHIFT, 40 << FX32_SHIFT }, 0, 0, 2, 0, - 0 + 0, }, { - {(176 + 16) << FX32_SHIFT, 40 << FX32_SHIFT}, + { (176 + 16) << FX32_SHIFT, 40 << FX32_SHIFT }, 0, 0, 2, 0, - 0 + 0, }, { - {112 << FX32_SHIFT, 96 << FX32_SHIFT}, + { 112 << FX32_SHIFT, 96 << FX32_SHIFT }, 10, 0, 2, 2, - 0 - } + 0, + }, }; u32 v1; @@ -318,9 +319,9 @@ static void ov27_02256B24 (UnkStruct_ov27_0225680C * param0, const UnkStruct_ov2 } } -static void ov27_02256B80 (SysTask * param0, void * param1) +static void ov27_02256B80(SysTask *param0, void *param1) { - static void(*const v0[])(SysTask *, void *) = { + static void (*const v0[])(SysTask *, void *) = { ov27_02256BB0, ov27_02256BE8, ov27_02256C2C, @@ -330,16 +331,16 @@ static void ov27_02256B80 (SysTask * param0, void * param1) ov27_02256E1C }; - const UnkStruct_ov27_0225680C_1 * v1 = ov25_02255240(param1); + const UnkStruct_ov27_0225680C_1 *v1 = ov25_02255240(param1); SysTask_SetCallback(param0, v0[v1->unk_18]); v0[v1->unk_18](param0, param1); } -static void ov27_02256BB0 (SysTask * param0, void * param1) +static void ov27_02256BB0(SysTask *param0, void *param1) { - UnkStruct_ov27_0225680C * v0 = ov25_0225523C(param1); - const UnkStruct_ov27_0225680C_1 * v1 = ov25_02255240(param1); + UnkStruct_ov27_0225680C *v0 = ov25_0225523C(param1); + const UnkStruct_ov27_0225680C_1 *v1 = ov25_02255240(param1); ov25_02255914(v0->unk_60[8], 1); ov27_02256EC4(v0->unk_04, 0); @@ -347,9 +348,9 @@ static void ov27_02256BB0 (SysTask * param0, void * param1) ov27_02256A04(param1); } -static void ov27_02256BE8 (SysTask * param0, void * param1) +static void ov27_02256BE8(SysTask *param0, void *param1) { - UnkStruct_ov27_0225680C * v0 = ov25_0225523C(param1); + UnkStruct_ov27_0225680C *v0 = ov25_0225523C(param1); ov25_02255914(v0->unk_60[8], 0); ov25_022558C4(v0->unk_60[8], 11); @@ -361,10 +362,10 @@ static void ov27_02256BE8 (SysTask * param0, void * param1) ov27_02256A04(param1); } -static void ov27_02256C2C (SysTask * param0, void * param1) +static void ov27_02256C2C(SysTask *param0, void *param1) { - const UnkStruct_ov27_0225680C_1 * v0 = ov25_02255240(param1); - UnkStruct_ov27_0225680C * v1 = ov25_0225523C(param1); + const UnkStruct_ov27_0225680C_1 *v0 = ov25_02255240(param1); + UnkStruct_ov27_0225680C *v1 = ov25_0225523C(param1); if (v0->unk_18 != 2) { ov27_02256A04(param1); @@ -383,11 +384,11 @@ static void ov27_02256C2C (SysTask * param0, void * param1) } } -static void ov27_02256C80 (SysTask * param0, void * param1) +static void ov27_02256C80(SysTask *param0, void *param1) { - const UnkStruct_ov27_0225680C_1 * v0; - UnkStruct_ov27_0225680C * v1; - UnkStruct_ov27_02256E90 * v2; + const UnkStruct_ov27_0225680C_1 *v0; + UnkStruct_ov27_0225680C *v1; + UnkStruct_ov27_02256E90 *v2; v0 = ov25_02255240(param1); v1 = ov25_0225523C(param1); @@ -416,11 +417,11 @@ static void ov27_02256C80 (SysTask * param0, void * param1) } } -static void ov27_02256D00 (SysTask * param0, void * param1) +static void ov27_02256D00(SysTask *param0, void *param1) { - const UnkStruct_ov27_0225680C_1 * v0; - UnkStruct_ov27_0225680C * v1; - UnkStruct_ov27_02256E90 * v2; + const UnkStruct_ov27_0225680C_1 *v0; + UnkStruct_ov27_0225680C *v1; + UnkStruct_ov27_02256E90 *v2; v0 = ov25_02255240(param1); v1 = ov25_0225523C(param1); @@ -449,11 +450,11 @@ static void ov27_02256D00 (SysTask * param0, void * param1) } } -static void ov27_02256D80 (SysTask * param0, void * param1) +static void ov27_02256D80(SysTask *param0, void *param1) { - const UnkStruct_ov27_0225680C_1 * v0; - UnkStruct_ov27_0225680C * v1; - UnkStruct_ov27_02256E90 * v2; + const UnkStruct_ov27_0225680C_1 *v0; + UnkStruct_ov27_0225680C *v1; + UnkStruct_ov27_02256E90 *v2; v0 = ov25_02255240(param1); v1 = ov25_0225523C(param1); @@ -485,11 +486,11 @@ static void ov27_02256D80 (SysTask * param0, void * param1) } } -static void ov27_02256E1C (SysTask * param0, void * param1) +static void ov27_02256E1C(SysTask *param0, void *param1) { - const UnkStruct_ov27_0225680C_1 * v0; - UnkStruct_ov27_0225680C * v1; - UnkStruct_ov27_02256E90 * v2; + const UnkStruct_ov27_0225680C_1 *v0; + UnkStruct_ov27_0225680C *v1; + UnkStruct_ov27_02256E90 *v2; v0 = ov25_02255240(param1); v1 = ov25_0225523C(param1); @@ -515,10 +516,12 @@ static void ov27_02256E1C (SysTask * param0, void * param1) } } -static BOOL ov27_02256E90 (UnkStruct_ov27_02256E90 * param0, u32 param1) +static BOOL ov27_02256E90(UnkStruct_ov27_02256E90 *param0, u32 param1) { static const u8 v0[] = { - 2, 3, 4, + 2, + 3, + 4, }; if (++(param0->unk_00) > param1) { @@ -535,9 +538,9 @@ static BOOL ov27_02256E90 (UnkStruct_ov27_02256E90 * param0, u32 param1) return 0; } -static void ov27_02256EC4 (BGL * param0, u32 param1) +static void ov27_02256EC4(BGL *param0, u32 param1) { - u16 * v0; + u16 *v0; u32 v1, v2; u16 v3; @@ -556,9 +559,9 @@ static void ov27_02256EC4 (BGL * param0, u32 param1) } } -static void ov27_02256F24 (SysTask * param0, void * param1) +static void ov27_02256F24(SysTask *param0, void *param1) { - UnkStruct_ov27_0225680C * v0 = ov25_0225523C(param1); + UnkStruct_ov27_0225680C *v0 = ov25_0225523C(param1); u32 v1 = ov25_02255248(param1); switch (v1) { @@ -576,7 +579,7 @@ static void ov27_02256F24 (SysTask * param0, void * param1) } } -static void ov27_02256F7C (UnkStruct_ov27_0225680C * param0) +static void ov27_02256F7C(UnkStruct_ov27_0225680C *param0) { u32 v0; diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index 0618976386..2e9f32b169 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/src/overlay028/ov28_022561C0.c @@ -1,25 +1,26 @@ #include -#include #include +#include + +#include "constants/species.h" -#include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/pokedexdata_decl.h" -#include "overlay025/poketch_system.h" +#include "struct_decls/struct_02018340_decl.h" + #include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay028/ov28_0225697C.h" +#include "overlay028/ov28_02256E9C.h" +#include "overlay028/struct_ov28_0225697C_1.h" #include "overlay028/struct_ov28_0225697C_decl.h" #include "overlay028/struct_ov28_02256E9C_decl.h" -#include "touch_screen.h" -#include "overlay028/struct_ov28_0225697C_1.h" - -#include "constants/species.h" -#include "sys_task.h" #include "heap.h" -#include "unk_0202631C.h" #include "pokemon.h" -#include "overlay028/ov28_0225697C.h" -#include "overlay028/ov28_02256E9C.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" +#include "unk_0202631C.h" typedef struct { u8 unk_00; @@ -32,58 +33,58 @@ typedef struct { u32 unk_08; PoketchButtonManager *buttonManager; PoketchSystem *poketchSys; - UnkStruct_ov28_0225697C * unk_14; + UnkStruct_ov28_0225697C *unk_14; UnkStruct_ov28_0225697C_1 unk_18; } UnkStruct_ov28_02256210; static void NitroStaticInit(void); -static BOOL ov28_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov28_02256210(UnkStruct_ov28_02256210 * param0, u32 param1, BGL * param2); -static void ov28_02256298(UnkStruct_ov28_02256210 * param0); -static void ov28_022562CC(SysTask * param0, void * param1); -static void ov28_02256324(void * param0); -static void ov28_0225632C(UnkStruct_ov28_02256210 * param0, u32 param1); -static void ov28_02256344(u32 param0, u32 param1, u32 param2, void * param3); -static BOOL ov28_02256374(UnkStruct_ov28_02256210 * param0); -static BOOL ov28_022563B4(UnkStruct_ov28_02256210 * param0); -static BOOL ov28_0225648C(UnkStruct_ov28_02256210 * param0); -static BOOL ov28_02256588(UnkStruct_ov28_02256210 * param0); -static BOOL ov28_022566A0(UnkStruct_ov28_02256210 * param0); -static BOOL ov28_022567A8(UnkStruct_ov28_02256210 * param0); -static void ov28_02256868(UnkStruct_ov28_02256210 * param0); -static BOOL ov28_02256888(UnkStruct_ov28_02256210 * param0, u32 param1); -static BOOL ov28_022568E0(UnkStruct_ov28_02256210 * param0); -static void ov28_02256914(UnkStruct_ov28_02256210 * param0, const UnkStruct_ov28_02256E9C * param1); +static BOOL ov28_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov28_02256210(UnkStruct_ov28_02256210 *param0, u32 param1, BGL *param2); +static void ov28_02256298(UnkStruct_ov28_02256210 *param0); +static void ov28_022562CC(SysTask *param0, void *param1); +static void ov28_02256324(void *param0); +static void ov28_0225632C(UnkStruct_ov28_02256210 *param0, u32 param1); +static void ov28_02256344(u32 param0, u32 param1, u32 param2, void *param3); +static BOOL ov28_02256374(UnkStruct_ov28_02256210 *param0); +static BOOL ov28_022563B4(UnkStruct_ov28_02256210 *param0); +static BOOL ov28_0225648C(UnkStruct_ov28_02256210 *param0); +static BOOL ov28_02256588(UnkStruct_ov28_02256210 *param0); +static BOOL ov28_022566A0(UnkStruct_ov28_02256210 *param0); +static BOOL ov28_022567A8(UnkStruct_ov28_02256210 *param0); +static void ov28_02256868(UnkStruct_ov28_02256210 *param0); +static BOOL ov28_02256888(UnkStruct_ov28_02256210 *param0, u32 param1); +static BOOL ov28_022568E0(UnkStruct_ov28_02256210 *param0); +static void ov28_02256914(UnkStruct_ov28_02256210 *param0, const UnkStruct_ov28_02256E9C *param1); static const TouchScreenHitTable Unk_ov28_02257658[] = { - {0x90, 0xAF, 0x20, 0x5F}, - {0x70, 0x8F, 0x20, 0x3F}, - {0x70, 0x8F, 0x40, 0x5F}, - {0x70, 0x8F, 0x60, 0x7F}, - {0x50, 0x6F, 0x20, 0x3F}, - {0x50, 0x6F, 0x40, 0x5F}, - {0x50, 0x6F, 0x60, 0x7F}, - {0x30, 0x4F, 0x20, 0x3F}, - {0x30, 0x4F, 0x40, 0x5F}, - {0x30, 0x4F, 0x60, 0x7F}, - {0x90, 0xAF, 0x60, 0x7F}, - {0x50, 0x6F, 0xA0, 0xBF}, - {0x50, 0x6F, 0x80, 0x9F}, - {0x70, 0x8F, 0x80, 0x9F}, - {0x70, 0x8F, 0xA0, 0xBF}, - {0x90, 0xAF, 0x80, 0xBF}, - {0x30, 0x4F, 0x80, 0xBF} + { 0x90, 0xAF, 0x20, 0x5F }, + { 0x70, 0x8F, 0x20, 0x3F }, + { 0x70, 0x8F, 0x40, 0x5F }, + { 0x70, 0x8F, 0x60, 0x7F }, + { 0x50, 0x6F, 0x20, 0x3F }, + { 0x50, 0x6F, 0x40, 0x5F }, + { 0x50, 0x6F, 0x60, 0x7F }, + { 0x30, 0x4F, 0x20, 0x3F }, + { 0x30, 0x4F, 0x40, 0x5F }, + { 0x30, 0x4F, 0x60, 0x7F }, + { 0x90, 0xAF, 0x60, 0x7F }, + { 0x50, 0x6F, 0xA0, 0xBF }, + { 0x50, 0x6F, 0x80, 0x9F }, + { 0x70, 0x8F, 0x80, 0x9F }, + { 0x70, 0x8F, 0xA0, 0xBF }, + { 0x90, 0xAF, 0x80, 0xBF }, + { 0x30, 0x4F, 0x80, 0xBF } }; -static void NitroStaticInit (void) +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov28_022561D4, ov28_02256324); } -static BOOL ov28_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov28_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov28_02256210 * v0 = (UnkStruct_ov28_02256210 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_02256210)); + UnkStruct_ov28_02256210 *v0 = (UnkStruct_ov28_02256210 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_02256210)); if (v0 != NULL) { if (ov28_02256210(v0, param3, param2)) { @@ -98,7 +99,7 @@ static BOOL ov28_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov28_02256210 (UnkStruct_ov28_02256210 * param0, u32 param1, BGL * param2) +static BOOL ov28_02256210(UnkStruct_ov28_02256210 *param0, u32 param1, BGL *param2) { if (ov28_0225697C(&(param0->unk_14), &(param0->unk_18), param2)) { param0->unk_00 = 0; @@ -127,7 +128,7 @@ static BOOL ov28_02256210 (UnkStruct_ov28_02256210 * param0, u32 param1, BGL * p return 1; } -static void ov28_02256298 (UnkStruct_ov28_02256210 * param0) +static void ov28_02256298(UnkStruct_ov28_02256210 *param0) { if (param0->unk_18.unk_04) { ov28_02256EC0(param0->unk_18.unk_04); @@ -148,9 +149,9 @@ static void ov28_02256298 (UnkStruct_ov28_02256210 * param0) ov28_022569AC(param0->unk_14); } -static void ov28_022562CC (SysTask * param0, void * param1) +static void ov28_022562CC(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov28_02256210 *) = { + static BOOL (*const v0[])(UnkStruct_ov28_02256210 *) = { ov28_02256374, ov28_022563B4, ov28_0225648C, @@ -160,7 +161,7 @@ static void ov28_022562CC (SysTask * param0, void * param1) ov28_022568E0 }; - UnkStruct_ov28_02256210 * v1 = (UnkStruct_ov28_02256210 *)param1; + UnkStruct_ov28_02256210 *v1 = (UnkStruct_ov28_02256210 *)param1; if (v1->unk_03) { ov28_0225632C(v1, 6); @@ -181,12 +182,12 @@ static void ov28_022562CC (SysTask * param0, void * param1) } } -static void ov28_02256324 (void * param0) +static void ov28_02256324(void *param0) { ((UnkStruct_ov28_02256210 *)param0)->unk_03 = 1; } -static void ov28_0225632C (UnkStruct_ov28_02256210 * param0, u32 param1) +static void ov28_0225632C(UnkStruct_ov28_02256210 *param0, u32 param1) { if (param0->unk_03 == 0) { param0->unk_00 = param1; @@ -198,9 +199,9 @@ static void ov28_0225632C (UnkStruct_ov28_02256210 * param0, u32 param1) param0->unk_01 = 0; } -static void ov28_02256344 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov28_02256344(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov28_02256210 * v0 = (UnkStruct_ov28_02256210 *)param3; + UnkStruct_ov28_02256210 *v0 = (UnkStruct_ov28_02256210 *)param3; switch (param2) { case 0: @@ -218,7 +219,7 @@ static void ov28_02256344 (u32 param0, u32 param1, u32 param2, void * param3) } } -static BOOL ov28_02256374 (UnkStruct_ov28_02256210 * param0) +static BOOL ov28_02256374(UnkStruct_ov28_02256210 *param0) { switch (param0->unk_01) { case 0: @@ -236,7 +237,7 @@ static BOOL ov28_02256374 (UnkStruct_ov28_02256210 * param0) return 0; } -static BOOL ov28_022563B4 (UnkStruct_ov28_02256210 * param0) +static BOOL ov28_022563B4(UnkStruct_ov28_02256210 *param0) { switch (param0->unk_01) { case 0: @@ -298,7 +299,7 @@ static BOOL ov28_022563B4 (UnkStruct_ov28_02256210 * param0) return 0; } -static BOOL ov28_0225648C (UnkStruct_ov28_02256210 * param0) +static BOOL ov28_0225648C(UnkStruct_ov28_02256210 *param0) { switch (param0->unk_01) { case 0: @@ -368,7 +369,7 @@ static BOOL ov28_0225648C (UnkStruct_ov28_02256210 * param0) return 0; } -static BOOL ov28_02256588 (UnkStruct_ov28_02256210 * param0) +static BOOL ov28_02256588(UnkStruct_ov28_02256210 *param0) { switch (param0->unk_01) { case 0: @@ -445,7 +446,7 @@ static BOOL ov28_02256588 (UnkStruct_ov28_02256210 * param0) return 0; } -static BOOL ov28_022566A0 (UnkStruct_ov28_02256210 * param0) +static BOOL ov28_022566A0(UnkStruct_ov28_02256210 *param0) { switch (param0->unk_01) { case 0: @@ -519,7 +520,7 @@ static BOOL ov28_022566A0 (UnkStruct_ov28_02256210 * param0) return 0; } -static BOOL ov28_022567A8 (UnkStruct_ov28_02256210 * param0) +static BOOL ov28_022567A8(UnkStruct_ov28_02256210 *param0) { switch (param0->unk_01) { case 0: @@ -577,7 +578,7 @@ static BOOL ov28_022567A8 (UnkStruct_ov28_02256210 * param0) return 0; } -static void ov28_02256868 (UnkStruct_ov28_02256210 * param0) +static void ov28_02256868(UnkStruct_ov28_02256210 *param0) { ov28_02256EC8(param0->unk_18.unk_04); ov28_02256EC8(param0->unk_18.unk_08); @@ -587,7 +588,7 @@ static void ov28_02256868 (UnkStruct_ov28_02256210 * param0) param0->unk_04 = 0; } -static BOOL ov28_02256888 (UnkStruct_ov28_02256210 * param0, u32 param1) +static BOOL ov28_02256888(UnkStruct_ov28_02256210 *param0, u32 param1) { BOOL v0 = 0; @@ -609,7 +610,7 @@ static BOOL ov28_02256888 (UnkStruct_ov28_02256210 * param0, u32 param1) return ov28_02257240(param0->unk_18.unk_0C, 10); } -static BOOL ov28_022568E0 (UnkStruct_ov28_02256210 * param0) +static BOOL ov28_022568E0(UnkStruct_ov28_02256210 *param0) { switch (param0->unk_01) { case 0: @@ -626,12 +627,12 @@ static BOOL ov28_022568E0 (UnkStruct_ov28_02256210 * param0) return 0; } -static void ov28_02256914 (UnkStruct_ov28_02256210 * param0, const UnkStruct_ov28_02256E9C * param1) +static void ov28_02256914(UnkStruct_ov28_02256210 *param0, const UnkStruct_ov28_02256E9C *param1) { s64 v0 = ov28_02257468(param1); if ((v0 > 0) && (v0 <= NATIONAL_DEX_COUNT)) { - PokedexData * v1; + PokedexData *v1; u16 v2; v1 = SaveData_Pokedex(PoketchSystem_GetSaveData(param0->poketchSys)); diff --git a/src/overlay028/ov28_0225697C.c b/src/overlay028/ov28_0225697C.c index 946f6e34c6..58a954c5d6 100644 --- a/src/overlay028/ov28_0225697C.c +++ b/src/overlay028/ov28_0225697C.c @@ -1,49 +1,50 @@ +#include "overlay028/ov28_0225697C.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay028/struct_ov28_0225697C_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay028/ov28_02256E9C.h" #include "overlay028/struct_ov28_0225697C_1.h" +#include "overlay028/struct_ov28_0225697C_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay028/ov28_0225697C.h" -#include "overlay028/ov28_02256E9C.h" struct UnkStruct_ov28_0225697C_t { - const UnkStruct_ov28_0225697C_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov28_0225697C_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; u16 unk_30[14]; u16 unk_4C[17][32]; }; -static void ov28_022569F4(UnkStruct_ov25_02255224 * param0); -static void ov28_02256A08(SysTask * param0, void * param1); -static void ov28_02256AA4(UnkStruct_ov28_0225697C * param0); -static void ov28_02256B24(SysTask * param0, void * param1); -static void ov28_02256B90(SysTask * param0, void * param1); -static void ov28_02256BF0(SysTask * param0, void * param1); -static void ov28_02256C28(SysTask * param0, void * param1); -static void ov28_02256C68(SysTask * param0, void * param1); -static void ov28_02256CA0(SysTask * param0, void * param1); -static void ov28_02256CE0(SysTask * param0, void * param1); -static void ov28_02256D20(SysTask * param0, void * param1); -static void ov28_02256D64(SysTask * param0, void * param1); -static void ov28_02256D90(BGL * param0, const UnkStruct_ov28_0225697C_1 * param1); -static void ov28_02256DCC(BGL * param0); -static void ov28_02256DF0(SysTask * param0, void * param1); -static void ov28_02256E0C(BGL * param0, const u16 * param1); -struct PoketchSystem * FieldSystem_GetPoketchSystem(void); +static void ov28_022569F4(UnkStruct_ov25_02255224 *param0); +static void ov28_02256A08(SysTask *param0, void *param1); +static void ov28_02256AA4(UnkStruct_ov28_0225697C *param0); +static void ov28_02256B24(SysTask *param0, void *param1); +static void ov28_02256B90(SysTask *param0, void *param1); +static void ov28_02256BF0(SysTask *param0, void *param1); +static void ov28_02256C28(SysTask *param0, void *param1); +static void ov28_02256C68(SysTask *param0, void *param1); +static void ov28_02256CA0(SysTask *param0, void *param1); +static void ov28_02256CE0(SysTask *param0, void *param1); +static void ov28_02256D20(SysTask *param0, void *param1); +static void ov28_02256D64(SysTask *param0, void *param1); +static void ov28_02256D90(BGL *param0, const UnkStruct_ov28_0225697C_1 *param1); +static void ov28_02256DCC(BGL *param0); +static void ov28_02256DF0(SysTask *param0, void *param1); +static void ov28_02256E0C(BGL *param0, const u16 *param1); +struct PoketchSystem *FieldSystem_GetPoketchSystem(void); static const u16 Unk_ov28_022578F8[32] = { 0xFB, @@ -414,7 +415,7 @@ static const u16 Unk_ov28_022578B8[32] = { 0x153 }; -static const u16 * const Unk_ov28_0225797C[] = { +static const u16 *const Unk_ov28_0225797C[] = { Unk_ov28_022578F8, Unk_ov28_022576B8, Unk_ov28_02257798, @@ -440,28 +441,28 @@ static const struct { u8 unk_02; u8 unk_03; } Unk_ov28_02257938[] = { - {0x4, 0x12, 0x8, 0x4}, - {0x4, 0xE, 0x4, 0x4}, - {0x8, 0xE, 0x4, 0x4}, - {0xC, 0xE, 0x4, 0x4}, - {0x4, 0xA, 0x4, 0x4}, - {0x8, 0xA, 0x4, 0x4}, - {0xC, 0xA, 0x4, 0x4}, - {0x4, 0x6, 0x4, 0x4}, - {0x8, 0x6, 0x4, 0x4}, - {0xC, 0x6, 0x4, 0x4}, - {0xC, 0x12, 0x4, 0x4}, - {0x14, 0xA, 0x4, 0x4}, - {0x10, 0xA, 0x4, 0x4}, - {0x10, 0xE, 0x4, 0x4}, - {0x14, 0xE, 0x4, 0x4}, - {0x10, 0x12, 0x8, 0x4}, - {0x10, 0x6, 0x8, 0x4} + { 0x4, 0x12, 0x8, 0x4 }, + { 0x4, 0xE, 0x4, 0x4 }, + { 0x8, 0xE, 0x4, 0x4 }, + { 0xC, 0xE, 0x4, 0x4 }, + { 0x4, 0xA, 0x4, 0x4 }, + { 0x8, 0xA, 0x4, 0x4 }, + { 0xC, 0xA, 0x4, 0x4 }, + { 0x4, 0x6, 0x4, 0x4 }, + { 0x8, 0x6, 0x4, 0x4 }, + { 0xC, 0x6, 0x4, 0x4 }, + { 0xC, 0x12, 0x4, 0x4 }, + { 0x14, 0xA, 0x4, 0x4 }, + { 0x10, 0xA, 0x4, 0x4 }, + { 0x10, 0xE, 0x4, 0x4 }, + { 0x14, 0xE, 0x4, 0x4 }, + { 0x10, 0x12, 0x8, 0x4 }, + { 0x10, 0x6, 0x8, 0x4 } }; -BOOL ov28_0225697C (UnkStruct_ov28_0225697C ** param0, const UnkStruct_ov28_0225697C_1 * param1, BGL * param2) +BOOL ov28_0225697C(UnkStruct_ov28_0225697C **param0, const UnkStruct_ov28_0225697C_1 *param1, BGL *param2) { - UnkStruct_ov28_0225697C * v0 = (UnkStruct_ov28_0225697C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_0225697C)); + UnkStruct_ov28_0225697C *v0 = (UnkStruct_ov28_0225697C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_0225697C)); if (v0 != NULL) { v0->unk_00 = param1; @@ -475,7 +476,7 @@ BOOL ov28_0225697C (UnkStruct_ov28_0225697C ** param0, const UnkStruct_ov28_0225 return 0; } -void ov28_022569AC (UnkStruct_ov28_0225697C * param0) +void ov28_022569AC(UnkStruct_ov28_0225697C *param0) { if (param0) { Heap_FreeToHeap(param0); @@ -483,42 +484,42 @@ void ov28_022569AC (UnkStruct_ov28_0225697C * param0) } static const UnkStruct_ov25_0225517C Unk_ov28_022579C0[] = { - {0x0, ov28_02256A08, 0x0}, - {0x1, ov28_02256B24, 0x0}, - {0x2, ov28_02256B90, 0x0}, - {0x3, ov28_02256BF0, 0x0}, - {0x4, ov28_02256C28, 0x0}, - {0x5, ov28_02256C68, 0x0}, - {0x6, ov28_02256CA0, 0x0}, - {0x7, ov28_02256CE0, 0x0}, - {0x9, ov28_02256D20, 0x0}, - {0x8, ov28_02256D64, 0x0}, - {0xA, ov28_02256DF0, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov28_02256A08, 0x0 }, + { 0x1, ov28_02256B24, 0x0 }, + { 0x2, ov28_02256B90, 0x0 }, + { 0x3, ov28_02256BF0, 0x0 }, + { 0x4, ov28_02256C28, 0x0 }, + { 0x5, ov28_02256C68, 0x0 }, + { 0x6, ov28_02256CA0, 0x0 }, + { 0x7, ov28_02256CE0, 0x0 }, + { 0x9, ov28_02256D20, 0x0 }, + { 0x8, ov28_02256D64, 0x0 }, + { 0xA, ov28_02256DF0, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov28_022569B8 (UnkStruct_ov28_0225697C * param0, u32 param1) +void ov28_022569B8(UnkStruct_ov28_0225697C *param0, u32 param1) { ov25_0225517C(Unk_ov28_022579C0, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov28_022569DC (UnkStruct_ov28_0225697C * param0, u32 param1) +BOOL ov28_022569DC(UnkStruct_ov28_0225697C *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov28_022569E8 (UnkStruct_ov28_0225697C * param0) +BOOL ov28_022569E8(UnkStruct_ov28_0225697C *param0) { return ov25_02255154(param0->unk_08); } -static void ov28_022569F4 (UnkStruct_ov25_02255224 * param0) +static void ov28_022569F4(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov28_0225697C * v0 = ov25_0225523C(param0); + UnkStruct_ov28_0225697C *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov28_02256A08 (SysTask * param0, void * param1) +static void ov28_02256A08(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -536,8 +537,8 @@ static void ov28_02256A08 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - const UnkStruct_ov28_0225697C_1 * v2; - UnkStruct_ov28_0225697C * v3; + const UnkStruct_ov28_0225697C_1 *v2; + UnkStruct_ov28_0225697C *v3; u32 v4; v2 = ov25_02255240(param1); @@ -558,9 +559,9 @@ static void ov28_02256A08 (SysTask * param0, void * param1) ov28_022569F4(param1); } -static void ov28_02256AA4 (UnkStruct_ov28_0225697C * param0) +static void ov28_02256AA4(UnkStruct_ov28_0225697C *param0) { - u16 * v0; + u16 *v0; u32 v1, v2, v3, v4; v0 = sub_02019FE4(param0->unk_04, 6); @@ -576,10 +577,10 @@ static void ov28_02256AA4 (UnkStruct_ov28_0225697C * param0) } } -static void ov28_02256B24 (SysTask * param0, void * param1) +static void ov28_02256B24(SysTask *param0, void *param1) { - const UnkStruct_ov28_0225697C_1 * v0; - UnkStruct_ov28_0225697C * v1; + const UnkStruct_ov28_0225697C_1 *v0; + UnkStruct_ov28_0225697C *v1; u32 v2; v0 = ov25_02255240(param1); @@ -594,10 +595,10 @@ static void ov28_02256B24 (SysTask * param0, void * param1) ov28_022569F4(param1); } -static void ov28_02256B90 (SysTask * param0, void * param1) +static void ov28_02256B90(SysTask *param0, void *param1) { - const UnkStruct_ov28_0225697C_1 * v0; - UnkStruct_ov28_0225697C * v1; + const UnkStruct_ov28_0225697C_1 *v0; + UnkStruct_ov28_0225697C *v1; u32 v2; v0 = ov25_02255240(param1); @@ -610,10 +611,10 @@ static void ov28_02256B90 (SysTask * param0, void * param1) ov28_022569F4(param1); } -static void ov28_02256BF0 (SysTask * param0, void * param1) +static void ov28_02256BF0(SysTask *param0, void *param1) { - const UnkStruct_ov28_0225697C_1 * v0; - UnkStruct_ov28_0225697C * v1; + const UnkStruct_ov28_0225697C_1 *v0; + UnkStruct_ov28_0225697C *v1; v0 = ov25_02255240(param1); v1 = ov25_0225523C(param1); @@ -624,10 +625,10 @@ static void ov28_02256BF0 (SysTask * param0, void * param1) ov28_022569F4(param1); } -static void ov28_02256C28 (SysTask * param0, void * param1) +static void ov28_02256C28(SysTask *param0, void *param1) { - const UnkStruct_ov28_0225697C_1 * v0; - UnkStruct_ov28_0225697C * v1; + const UnkStruct_ov28_0225697C_1 *v0; + UnkStruct_ov28_0225697C *v1; v0 = ov25_02255240(param1); v1 = ov25_0225523C(param1); @@ -639,10 +640,10 @@ static void ov28_02256C28 (SysTask * param0, void * param1) ov28_022569F4(param1); } -static void ov28_02256C68 (SysTask * param0, void * param1) +static void ov28_02256C68(SysTask *param0, void *param1) { - const UnkStruct_ov28_0225697C_1 * v0; - UnkStruct_ov28_0225697C * v1; + const UnkStruct_ov28_0225697C_1 *v0; + UnkStruct_ov28_0225697C *v1; v0 = ov25_02255240(param1); v1 = ov25_0225523C(param1); @@ -653,10 +654,10 @@ static void ov28_02256C68 (SysTask * param0, void * param1) ov28_022569F4(param1); } -static void ov28_02256CA0 (SysTask * param0, void * param1) +static void ov28_02256CA0(SysTask *param0, void *param1) { - const UnkStruct_ov28_0225697C_1 * v0; - UnkStruct_ov28_0225697C * v1; + const UnkStruct_ov28_0225697C_1 *v0; + UnkStruct_ov28_0225697C *v1; v0 = ov25_02255240(param1); v1 = ov25_0225523C(param1); @@ -668,10 +669,10 @@ static void ov28_02256CA0 (SysTask * param0, void * param1) ov28_022569F4(param1); } -static void ov28_02256CE0 (SysTask * param0, void * param1) +static void ov28_02256CE0(SysTask *param0, void *param1) { - const UnkStruct_ov28_0225697C_1 * v0; - UnkStruct_ov28_0225697C * v1; + const UnkStruct_ov28_0225697C_1 *v0; + UnkStruct_ov28_0225697C *v1; v0 = ov25_02255240(param1); v1 = ov25_0225523C(param1); @@ -683,9 +684,9 @@ static void ov28_02256CE0 (SysTask * param0, void * param1) ov28_022569F4(param1); } -static void ov28_02256D20 (SysTask * param0, void * param1) +static void ov28_02256D20(SysTask *param0, void *param1) { - UnkStruct_ov28_0225697C * v0; + UnkStruct_ov28_0225697C *v0; u32 v1; v0 = ov25_0225523C(param1); @@ -702,10 +703,10 @@ static void ov28_02256D20 (SysTask * param0, void * param1) ov28_022569F4(param1); } -static void ov28_02256D64 (SysTask * param0, void * param1) +static void ov28_02256D64(SysTask *param0, void *param1) { - const UnkStruct_ov28_0225697C_1 * v0; - UnkStruct_ov28_0225697C * v1; + const UnkStruct_ov28_0225697C_1 *v0; + UnkStruct_ov28_0225697C *v1; v1 = ov25_0225523C(param1); v0 = ov25_02255240(param1); @@ -715,9 +716,9 @@ static void ov28_02256D64 (SysTask * param0, void * param1) ov28_022569F4(param1); } -static void ov28_02256D90 (BGL * param0, const UnkStruct_ov28_0225697C_1 * param1) +static void ov28_02256D90(BGL *param0, const UnkStruct_ov28_0225697C_1 *param1) { - u16 * v0; + u16 *v0; v0 = sub_02019FE4(param0, 6); @@ -729,25 +730,25 @@ static void ov28_02256D90 (BGL * param0, const UnkStruct_ov28_0225697C_1 * param } } -static void ov28_02256DCC (BGL * param0) +static void ov28_02256DCC(BGL *param0) { - u16 * v0 = sub_02019FE4(param0, 6); + u16 *v0 = sub_02019FE4(param0, 6); ov25_02255258(v0, 3, 3, 32, 41, 40, 0); } -static void ov28_02256DF0 (SysTask * param0, void * param1) +static void ov28_02256DF0(SysTask *param0, void *param1) { - UnkStruct_ov28_0225697C * v0; + UnkStruct_ov28_0225697C *v0; v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov28_022569F4(param1); } -static void ov28_02256E0C (BGL * param0, const u16 * param1) +static void ov28_02256E0C(BGL *param0, const u16 *param1) { u32 v0, v1, v2; - u16 * v3; + u16 *v3; v3 = sub_02019FE4(param0, 6); diff --git a/src/overlay028/ov28_02256E9C.c b/src/overlay028/ov28_02256E9C.c index 37b4b84355..b6aaa6dad4 100644 --- a/src/overlay028/ov28_02256E9C.c +++ b/src/overlay028/ov28_02256E9C.c @@ -1,11 +1,12 @@ +#include "overlay028/ov28_02256E9C.h" + #include -#include #include +#include #include "overlay028/struct_ov28_02256E9C_decl.h" #include "heap.h" -#include "overlay028/ov28_02256E9C.h" struct UnkStruct_ov28_02256E9C_t { u64 unk_00; @@ -29,12 +30,12 @@ static const u64 Unk_ov28_02257A50[] = { 0x2540BE400 }; -static u32 ov28_02257498(const UnkStruct_ov28_02256E9C * param0); -static u32 ov28_022574E8(const UnkStruct_ov28_02256E9C * param0); -static void ov28_022574FC(UnkStruct_ov28_02256E9C * param0); -static void ov28_022575EC(const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1, UnkStruct_ov28_02256E9C * param2, UnkStruct_ov28_02256E9C * param3); +static u32 ov28_02257498(const UnkStruct_ov28_02256E9C *param0); +static u32 ov28_022574E8(const UnkStruct_ov28_02256E9C *param0); +static void ov28_022574FC(UnkStruct_ov28_02256E9C *param0); +static void ov28_022575EC(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1, UnkStruct_ov28_02256E9C *param2, UnkStruct_ov28_02256E9C *param3); -BOOL ov28_02256E9C (UnkStruct_ov28_02256E9C ** param0, u32 param1) +BOOL ov28_02256E9C(UnkStruct_ov28_02256E9C **param0, u32 param1) { *param0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov28_02256E9C)); @@ -47,12 +48,12 @@ BOOL ov28_02256E9C (UnkStruct_ov28_02256E9C ** param0, u32 param1) return 0; } -void ov28_02256EC0 (UnkStruct_ov28_02256E9C * param0) +void ov28_02256EC0(UnkStruct_ov28_02256E9C *param0) { Heap_FreeToHeap(param0); } -void ov28_02256EC8 (UnkStruct_ov28_02256E9C * param0) +void ov28_02256EC8(UnkStruct_ov28_02256E9C *param0) { param0->unk_00 = 0; param0->unk_09 = 0; @@ -60,12 +61,12 @@ void ov28_02256EC8 (UnkStruct_ov28_02256E9C * param0) param0->unk_0B = 0; } -void ov28_02256ED8 (UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1) +void ov28_02256ED8(UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1) { *param0 = *param1; } -void ov28_02256EE8 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1, UnkStruct_ov28_02256E9C * param2) +void ov28_02256EE8(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1, UnkStruct_ov28_02256E9C *param2) { if ((param0->unk_09 == 0) && (param1->unk_09 == 1)) { UnkStruct_ov28_02256E9C v0 = *param1; @@ -96,7 +97,7 @@ void ov28_02256EE8 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28 } } -void ov28_02256F74 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1, UnkStruct_ov28_02256E9C * param2) +void ov28_02256F74(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1, UnkStruct_ov28_02256E9C *param2) { if (((param0->unk_09 == 0) && (param1->unk_09 == 1)) || ((param0->unk_09 == 1) && (param1->unk_09 == 0))) { UnkStruct_ov28_02256E9C v0 = *param1; @@ -120,7 +121,7 @@ void ov28_02256F74 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28 param1 = &v2; if ((param0->unk_00 < param1->unk_00) ^ (param0->unk_09)) { - const UnkStruct_ov28_02256E9C * v3 = param0; + const UnkStruct_ov28_02256E9C *v3 = param0; param0 = param1; param1 = v3; param2->unk_09 = param0->unk_09 ^ 1; @@ -135,7 +136,7 @@ void ov28_02256F74 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28 } } -void ov28_02257028 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1, UnkStruct_ov28_02256E9C * param2) +void ov28_02257028(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1, UnkStruct_ov28_02256E9C *param2) { param2->unk_00 = param0->unk_00 * param1->unk_00; param2->unk_08 = param0->unk_08 + param1->unk_08; @@ -144,7 +145,7 @@ void ov28_02257028 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28 ov28_022574FC(param2); } -void ov28_02257058 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1, UnkStruct_ov28_02256E9C * param2) +void ov28_02257058(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1, UnkStruct_ov28_02256E9C *param2) { UnkStruct_ov28_02256E9C v0, v1; u64 v2; @@ -187,7 +188,7 @@ void ov28_02257058 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28 param2->unk_09 = param0->unk_09 ^ param1->unk_09; } -BOOL ov28_0225717C (UnkStruct_ov28_02256E9C * param0, u32 param1) +BOOL ov28_0225717C(UnkStruct_ov28_02256E9C *param0, u32 param1) { if (ov28_022574E8(param0) >= param0->unk_0A) { return 0; @@ -201,7 +202,7 @@ BOOL ov28_0225717C (UnkStruct_ov28_02256E9C * param0, u32 param1) return 1; } -BOOL ov28_022571B8 (UnkStruct_ov28_02256E9C * param0, u32 param1) +BOOL ov28_022571B8(UnkStruct_ov28_02256E9C *param0, u32 param1) { if (ov28_022574E8(param0) >= param0->unk_0A) { return 0; @@ -214,7 +215,7 @@ BOOL ov28_022571B8 (UnkStruct_ov28_02256E9C * param0, u32 param1) return 1; } -BOOL ov28_022571F4 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1) +BOOL ov28_022571F4(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1) { if (param0->unk_00 != param1->unk_00) { return 0; @@ -233,7 +234,7 @@ BOOL ov28_022571F4 (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28 return 1; } -BOOL ov28_02257240 (const UnkStruct_ov28_02256E9C * param0, u32 param1) +BOOL ov28_02257240(const UnkStruct_ov28_02256E9C *param0, u32 param1) { u32 v0; @@ -254,12 +255,12 @@ BOOL ov28_02257240 (const UnkStruct_ov28_02256E9C * param0, u32 param1) return 1; } -BOOL ov28_0225726C (const UnkStruct_ov28_02256E9C * param0, u16 * param1) +BOOL ov28_0225726C(const UnkStruct_ov28_02256E9C *param0, u16 *param1) { u64 v0; u32 v1, v2; s32 v3; - u16 * v4; + u16 *v4; if (param0->unk_0B) { return 0; @@ -342,7 +343,7 @@ BOOL ov28_0225726C (const UnkStruct_ov28_02256E9C * param0, u16 * param1) return 1; } -s64 ov28_02257468 (const UnkStruct_ov28_02256E9C * param0) +s64 ov28_02257468(const UnkStruct_ov28_02256E9C *param0) { s64 v0 = param0->unk_00; @@ -355,7 +356,7 @@ s64 ov28_02257468 (const UnkStruct_ov28_02256E9C * param0) return v0; } -static u32 ov28_02257498 (const UnkStruct_ov28_02256E9C * param0) +static u32 ov28_02257498(const UnkStruct_ov28_02256E9C *param0) { u64 v0 = 10; u32 v1 = 1; @@ -379,7 +380,7 @@ static u32 ov28_02257498 (const UnkStruct_ov28_02256E9C * param0) return v1; } -static u32 ov28_022574E8 (const UnkStruct_ov28_02256E9C * param0) +static u32 ov28_022574E8(const UnkStruct_ov28_02256E9C *param0) { u32 v0 = ov28_02257498(param0); @@ -390,7 +391,7 @@ static u32 ov28_022574E8 (const UnkStruct_ov28_02256E9C * param0) return v0; } -static void ov28_022574FC (UnkStruct_ov28_02256E9C * param0) +static void ov28_022574FC(UnkStruct_ov28_02256E9C *param0) { u32 v0; @@ -424,13 +425,13 @@ static void ov28_022574FC (UnkStruct_ov28_02256E9C * param0) } } -static void ov28_022575EC (const UnkStruct_ov28_02256E9C * param0, const UnkStruct_ov28_02256E9C * param1, UnkStruct_ov28_02256E9C * param2, UnkStruct_ov28_02256E9C * param3) +static void ov28_022575EC(const UnkStruct_ov28_02256E9C *param0, const UnkStruct_ov28_02256E9C *param1, UnkStruct_ov28_02256E9C *param2, UnkStruct_ov28_02256E9C *param3) { *param2 = *param0; *param3 = *param1; if (param2->unk_08 < param3->unk_08) { - UnkStruct_ov28_02256E9C * v0 = param2; + UnkStruct_ov28_02256E9C *v0 = param2; param2 = param3; param3 = v0; diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c index 7437f16f76..71f1ce8e92 100644 --- a/src/overlay029/ov29_022561C0.c +++ b/src/overlay029/ov29_022561C0.c @@ -1,19 +1,19 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay029/struct_ov29_022566C8_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay029/ov29_022566C8.h" #include "overlay029/struct_ov29_022566C8_1.h" +#include "overlay029/struct_ov29_022566C8_decl.h" -#include "sys_task.h" #include "heap.h" -#include "overlay029/ov29_022566C8.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; @@ -22,40 +22,40 @@ typedef struct { u8 unk_03; u32 unk_04; UnkStruct_ov29_022566C8_1 unk_08; - UnkStruct_ov29_022566C8 * unk_16F4; + UnkStruct_ov29_022566C8 *unk_16F4; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; } UnkStruct_ov29_0225621C; static void NitroStaticInit(void); -static BOOL ov29_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov29_0225621C(UnkStruct_ov29_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov29_02256288(UnkStruct_ov29_0225621C * param0); -static void ov29_022562AC(SysTask * param0, void * param1); -static void ov29_022562F4(u32 param0, u32 param1, u32 param2, void * param3); -static void ov29_02256324(void * param0); -static void ov29_0225632C(UnkStruct_ov29_0225621C * param0, u32 param1); -static BOOL ov29_02256340(UnkStruct_ov29_0225621C * param0); -static BOOL ov29_0225638C(UnkStruct_ov29_0225621C * param0); -static BOOL ov29_02256404(UnkStruct_ov29_0225621C * param0); -static BOOL ov29_02256460(UnkStruct_ov29_0225621C * param0); -static void ov29_022564F4(UnkStruct_ov29_0225621C * param0, u32 param1, u32 param2, u32 param3, u32 param4); -static BOOL ov29_0225668C(UnkStruct_ov29_0225621C * param0); +static BOOL ov29_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov29_0225621C(UnkStruct_ov29_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov29_02256288(UnkStruct_ov29_0225621C *param0); +static void ov29_022562AC(SysTask *param0, void *param1); +static void ov29_022562F4(u32 param0, u32 param1, u32 param2, void *param3); +static void ov29_02256324(void *param0); +static void ov29_0225632C(UnkStruct_ov29_0225621C *param0, u32 param1); +static BOOL ov29_02256340(UnkStruct_ov29_0225621C *param0); +static BOOL ov29_0225638C(UnkStruct_ov29_0225621C *param0); +static BOOL ov29_02256404(UnkStruct_ov29_0225621C *param0); +static BOOL ov29_02256460(UnkStruct_ov29_0225621C *param0); +static void ov29_022564F4(UnkStruct_ov29_0225621C *param0, u32 param1, u32 param2, u32 param3, u32 param4); +static BOOL ov29_0225668C(UnkStruct_ov29_0225621C *param0); static const TouchScreenHitTable Unk_ov29_02256B3C[] = { - {0x18, 0x58, 0xB4, 0xCC}, - {0x68, 0xA8, 0xB4, 0xCC} + { 0x18, 0x58, 0xB4, 0xCC }, + { 0x68, 0xA8, 0xB4, 0xCC } }; -static void NitroStaticInit (void) +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov29_022561D4, ov29_02256324); } -static BOOL ov29_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov29_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov29_0225621C * v0 = (UnkStruct_ov29_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_0225621C)); + UnkStruct_ov29_0225621C *v0 = (UnkStruct_ov29_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_0225621C)); if (v0 != NULL) { if (ov29_0225621C(v0, poketchSys, param2, param3)) { @@ -71,7 +71,7 @@ static BOOL ov29_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov29_0225621C (UnkStruct_ov29_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov29_0225621C(UnkStruct_ov29_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { memset(param0->unk_08.unk_0C, 0, sizeof(u8) * (78 * 75)); @@ -94,22 +94,22 @@ static BOOL ov29_0225621C (UnkStruct_ov29_0225621C * param0, PoketchSystem *poke return 0; } -static void ov29_02256288 (UnkStruct_ov29_0225621C * param0) +static void ov29_02256288(UnkStruct_ov29_0225621C *param0) { PoketchButtonManager_Free(param0->buttonManager); ov29_02256770(param0->unk_16F4); Heap_FreeToHeap(param0); } -static void ov29_022562AC (SysTask * param0, void * param1) +static void ov29_022562AC(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov29_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov29_0225621C *) = { ov29_02256340, ov29_0225638C, ov29_0225668C }; - UnkStruct_ov29_0225621C * v1 = (UnkStruct_ov29_0225621C *)param1; + UnkStruct_ov29_0225621C *v1 = (UnkStruct_ov29_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -123,9 +123,9 @@ static void ov29_022562AC (SysTask * param0, void * param1) } } -static void ov29_022562F4 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov29_022562F4(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov29_0225621C * v0 = (UnkStruct_ov29_0225621C *)param3; + UnkStruct_ov29_0225621C *v0 = (UnkStruct_ov29_0225621C *)param3; if (param2 == 1) { if (((v0->unk_08.unk_00 == 1) && (param0 == 0)) || ((v0->unk_08.unk_00 == 0) && (param0 == 1))) { @@ -135,12 +135,12 @@ static void ov29_022562F4 (u32 param0, u32 param1, u32 param2, void * param3) } } -static void ov29_02256324 (void * param0) +static void ov29_02256324(void *param0) { ((UnkStruct_ov29_0225621C *)param0)->unk_02 = 1; } -static void ov29_0225632C (UnkStruct_ov29_0225621C * param0, u32 param1) +static void ov29_0225632C(UnkStruct_ov29_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -151,7 +151,7 @@ static void ov29_0225632C (UnkStruct_ov29_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov29_02256340 (UnkStruct_ov29_0225621C * param0) +static BOOL ov29_02256340(UnkStruct_ov29_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -169,7 +169,7 @@ static BOOL ov29_02256340 (UnkStruct_ov29_0225621C * param0) return 0; } -static BOOL ov29_0225638C (UnkStruct_ov29_0225621C * param0) +static BOOL ov29_0225638C(UnkStruct_ov29_0225621C *param0) { if (param0->unk_02) { ov29_0225632C(param0, 2); @@ -204,7 +204,7 @@ static BOOL ov29_0225638C (UnkStruct_ov29_0225621C * param0) return 0; } -static BOOL ov29_02256404 (UnkStruct_ov29_0225621C * param0) +static BOOL ov29_02256404(UnkStruct_ov29_0225621C *param0) { u32 v0, v1; @@ -224,7 +224,7 @@ static BOOL ov29_02256404 (UnkStruct_ov29_0225621C * param0) return 0; } -static BOOL ov29_02256460 (UnkStruct_ov29_0225621C * param0) +static BOOL ov29_02256460(UnkStruct_ov29_0225621C *param0) { u32 v0, v1; @@ -243,7 +243,7 @@ static BOOL ov29_02256460 (UnkStruct_ov29_0225621C * param0) return 0; } -static void ov29_022564AC (UnkStruct_ov29_0225621C * param0, u32 param1, u32 param2) +static void ov29_022564AC(UnkStruct_ov29_0225621C *param0, u32 param1, u32 param2) { int v0, v1, v2, v3, v4, v5; @@ -278,7 +278,7 @@ static void ov29_022564AC (UnkStruct_ov29_0225621C * param0, u32 param1, u32 par } } -static void ov29_022564F4 (UnkStruct_ov29_0225621C * param0, u32 param1, u32 param2, u32 param3, u32 param4) +static void ov29_022564F4(UnkStruct_ov29_0225621C *param0, u32 param1, u32 param2, u32 param3, u32 param4) { u32 v0, v1, v2, v3; fx32 v4, v5; @@ -370,7 +370,7 @@ static void ov29_022564F4 (UnkStruct_ov29_0225621C * param0, u32 param1, u32 par } } -static BOOL ov29_0225668C (UnkStruct_ov29_0225621C * param0) +static BOOL ov29_0225668C(UnkStruct_ov29_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index 91f7e9726e..f7d15de52b 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -1,55 +1,56 @@ +#include "overlay029/ov29_022566C8.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay029/struct_ov29_022566C8_decl.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay029/struct_ov29_022566C8_1.h" +#include "overlay029/struct_ov29_022566C8_decl.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" #include "unk_02099D44.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay029/ov29_022566C8.h" struct UnkStruct_ov29_022566C8_t { - const UnkStruct_ov29_022566C8_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov29_022566C8_1 *unk_00; + BGL *unk_04; u32 unk_08[18]; - UnkStruct_ov25_022555E8 * unk_50; + UnkStruct_ov25_022555E8 *unk_50; UnkStruct_ov25_02255958 unk_54; - UnkStruct_ov25_022558C4 * unk_68[2]; - Window * unk_70; + UnkStruct_ov25_022558C4 *unk_68[2]; + Window *unk_70; }; -static BOOL ov29_02256728(UnkStruct_ov29_022566C8 * param0); -static void ov29_022567F0(UnkStruct_ov25_02255224 * param0); -static void ov29_02256804(SysTask * param0, void * param1); -static void ov29_02256908(SysTask * param0, void * param1); -static void ov29_02256950(SysTask * param0, void * param1); -static void ov29_022569DC(SysTask * param0, void * param1); -static void ov29_02256A7C(SysTask * param0, void * param1); -static void ov29_02256A94(SysTask * param0, void * param1); -static void ov29_02256ABC(UnkStruct_ov29_022566C8 * param0); -static void ov29_02256B18(UnkStruct_ov29_022566C8 * param0); - -BOOL ov29_022566C8 (UnkStruct_ov29_022566C8 ** param0, const UnkStruct_ov29_022566C8_1 * param1, BGL * param2) +static BOOL ov29_02256728(UnkStruct_ov29_022566C8 *param0); +static void ov29_022567F0(UnkStruct_ov25_02255224 *param0); +static void ov29_02256804(SysTask *param0, void *param1); +static void ov29_02256908(SysTask *param0, void *param1); +static void ov29_02256950(SysTask *param0, void *param1); +static void ov29_022569DC(SysTask *param0, void *param1); +static void ov29_02256A7C(SysTask *param0, void *param1); +static void ov29_02256A94(SysTask *param0, void *param1); +static void ov29_02256ABC(UnkStruct_ov29_022566C8 *param0); +static void ov29_02256B18(UnkStruct_ov29_022566C8 *param0); + +BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566C8_1 *param1, BGL *param2) { - UnkStruct_ov29_022566C8 * v0 = (UnkStruct_ov29_022566C8 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_022566C8)); + UnkStruct_ov29_022566C8 *v0 = (UnkStruct_ov29_022566C8 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov29_022566C8)); if (v0 != NULL) { GF_ASSERT(GF_heap_c_dummy_return_true(7)); @@ -68,7 +69,7 @@ BOOL ov29_022566C8 (UnkStruct_ov29_022566C8 ** param0, const UnkStruct_ov29_0225 return 0; } -static BOOL ov29_02256728 (UnkStruct_ov29_022566C8 * param0) +static BOOL ov29_02256728(UnkStruct_ov29_022566C8 *param0) { static const UnkStruct_ov61_0222C884 v0 = { 7, 2, 2, 20, 19, 0, 12 @@ -89,7 +90,7 @@ static BOOL ov29_02256728 (UnkStruct_ov29_022566C8 * param0) return 0; } -void ov29_02256770 (UnkStruct_ov29_022566C8 * param0) +void ov29_02256770(UnkStruct_ov29_022566C8 *param0) { if (param0 != NULL) { GF_ASSERT(GF_heap_c_dummy_return_true(7)); @@ -105,37 +106,37 @@ void ov29_02256770 (UnkStruct_ov29_022566C8 * param0) } static const UnkStruct_ov25_0225517C Unk_ov29_02256BB0[] = { - {0x0, ov29_02256804, 0x0}, - {0x1, ov29_02256908, 0x0}, - {0x2, ov29_02256950, 0x0}, - {0x3, ov29_022569DC, 0x0}, - {0x4, ov29_02256A7C, 0x0}, - {0x5, ov29_02256A94, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov29_02256804, 0x0 }, + { 0x1, ov29_02256908, 0x0 }, + { 0x2, ov29_02256950, 0x0 }, + { 0x3, ov29_022569DC, 0x0 }, + { 0x4, ov29_02256A7C, 0x0 }, + { 0x5, ov29_02256A94, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov29_022567B4 (UnkStruct_ov29_022566C8 * param0, u32 param1) +void ov29_022567B4(UnkStruct_ov29_022566C8 *param0, u32 param1) { ov25_0225517C(Unk_ov29_02256BB0, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov29_022567D8 (UnkStruct_ov29_022566C8 * param0, u32 param1) +BOOL ov29_022567D8(UnkStruct_ov29_022566C8 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov29_022567E4 (UnkStruct_ov29_022566C8 * param0) +BOOL ov29_022567E4(UnkStruct_ov29_022566C8 *param0) { return ov25_02255154(param0->unk_08); } -static void ov29_022567F0 (UnkStruct_ov25_02255224 * param0) +static void ov29_022567F0(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov29_022566C8 * v0 = ov25_0225523C(param0); + UnkStruct_ov29_022566C8 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov29_02256804 (SysTask * param0, void * param1) +static void ov29_02256804(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -168,7 +169,7 @@ static void ov29_02256804 (SysTask * param0, void * param1) 0 }; GXSDispCnt v2; - UnkStruct_ov29_022566C8 * v3; + UnkStruct_ov29_022566C8 *v3; GF_ASSERT(GF_heap_c_dummy_return_true(8)); @@ -203,9 +204,9 @@ static void ov29_02256804 (SysTask * param0, void * param1) GF_ASSERT(GF_heap_c_dummy_return_true(8)); } -static void ov29_02256908 (SysTask * param0, void * param1) +static void ov29_02256908(SysTask *param0, void *param1) { - UnkStruct_ov29_022566C8 * v0; + UnkStruct_ov29_022566C8 *v0; v0 = ov25_0225523C(param1); @@ -221,16 +222,16 @@ static void ov29_02256908 (SysTask * param0, void * param1) ov29_022567F0(param1); } -static void ov29_02256950 (SysTask * param0, void * param1) +static void ov29_02256950(SysTask *param0, void *param1) { - UnkStruct_ov29_022566C8 * v0; + UnkStruct_ov29_022566C8 *v0; v0 = ov25_0225523C(param1); sub_0201ACCC(v0->unk_70); ov29_022567F0(param1); } -static void ov29_02256968 (u8 * param0, int param1, int param2, int param3, int param4) +static void ov29_02256968(u8 *param0, int param1, int param2, int param3, int param4) { int v0, v1, v2, v3, v4; @@ -250,10 +251,10 @@ static void ov29_02256968 (u8 * param0, int param1, int param2, int param3, int } } -static void ov29_022569DC (SysTask * param0, void * param1) +static void ov29_022569DC(SysTask *param0, void *param1) { s32 v0, v1; - UnkStruct_ov29_022566C8 * v2; + UnkStruct_ov29_022566C8 *v2; v2 = ov25_0225523C(param1); @@ -287,9 +288,9 @@ static void ov29_022569DC (SysTask * param0, void * param1) ov29_022567F0(param1); } -static void ov29_02256A7C (SysTask * param0, void * param1) +static void ov29_02256A7C(SysTask *param0, void *param1) { - UnkStruct_ov29_022566C8 * v0; + UnkStruct_ov29_022566C8 *v0; v0 = ov25_0225523C(param1); @@ -297,9 +298,9 @@ static void ov29_02256A7C (SysTask * param0, void * param1) ov29_022567F0(param1); } -static void ov29_02256A94 (SysTask * param0, void * param1) +static void ov29_02256A94(SysTask *param0, void *param1) { - UnkStruct_ov29_022566C8 * v0 = ov25_0225523C(param1); + UnkStruct_ov29_022566C8 *v0 = ov25_0225523C(param1); ov29_02256B18(v0); sub_02019044(v0->unk_04, 6); @@ -307,24 +308,24 @@ static void ov29_02256A94 (SysTask * param0, void * param1) ov29_022567F0(param1); } -static void ov29_02256ABC (UnkStruct_ov29_022566C8 * param0) +static void ov29_02256ABC(UnkStruct_ov29_022566C8 *param0) { static const UnkStruct_ov25_02255810 v0[] = { { - {192 << FX32_SHIFT, 56 << FX32_SHIFT}, + { 192 << FX32_SHIFT, 56 << FX32_SHIFT }, 0, 0, 2, 0, - 0 + 0, }, { - {192 << FX32_SHIFT, 136 << FX32_SHIFT}, + { 192 << FX32_SHIFT, 136 << FX32_SHIFT }, 3, 0, 2, 0, - 0 + 0, }, }; @@ -339,7 +340,7 @@ static void ov29_02256ABC (UnkStruct_ov29_022566C8 * param0) } } -static void ov29_02256B18 (UnkStruct_ov29_022566C8 * param0) +static void ov29_02256B18(UnkStruct_ov29_022566C8 *param0) { u32 v0; diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c index ca2f17b2fc..ec0ca2ab50 100644 --- a/src/overlay030/ov30_022561C0.c +++ b/src/overlay030/ov30_022561C0.c @@ -1,20 +1,20 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay030/struct_ov30_022563EC_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay030/ov30_022563EC.h" #include "overlay030/struct_ov30_022563EC_1.h" +#include "overlay030/struct_ov30_022563EC_decl.h" -#include "sys_task.h" -#include "rtc.h" #include "heap.h" -#include "overlay030/ov30_022563EC.h" +#include "rtc.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; @@ -28,35 +28,35 @@ typedef struct { u32 unk_0C; PoketchButtonManager *buttonManager; UnkStruct_ov30_022563EC_1 unk_14; - UnkStruct_ov30_022563EC * unk_24; + UnkStruct_ov30_022563EC *unk_24; PoketchSystem *poketchSys; } UnkStruct_ov30_0225621C; static void NitroStaticInit(void); -static BOOL ov30_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov30_0225621C(UnkStruct_ov30_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov30_02256298(UnkStruct_ov30_0225621C * param0); -static void ov30_022562B0(SysTask * param0, void * param1); -static void ov30_022562EC(void * param0); -static void ov30_022562F4(u32 param0, u32 param1, u32 param2, void * param3); -static void ov30_02256310(UnkStruct_ov30_0225621C * param0, u32 param1); -static BOOL ov30_02256324(UnkStruct_ov30_0225621C * param0); -static BOOL ov30_02256364(UnkStruct_ov30_0225621C * param0); -static BOOL ov30_022563B8(UnkStruct_ov30_0225621C * param0); +static BOOL ov30_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov30_0225621C(UnkStruct_ov30_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov30_02256298(UnkStruct_ov30_0225621C *param0); +static void ov30_022562B0(SysTask *param0, void *param1); +static void ov30_022562EC(void *param0); +static void ov30_022562F4(u32 param0, u32 param1, u32 param2, void *param3); +static void ov30_02256310(UnkStruct_ov30_0225621C *param0, u32 param1); +static BOOL ov30_02256324(UnkStruct_ov30_0225621C *param0); +static BOOL ov30_02256364(UnkStruct_ov30_0225621C *param0); +static BOOL ov30_022563B8(UnkStruct_ov30_0225621C *param0); static const TouchScreenHitTable Unk_ov30_02256678[] = { - {0x10, 0xAF, 0x10, 0xCF} + { 0x10, 0xAF, 0x10, 0xCF } }; -static void NitroStaticInit (void) +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov30_022561D4, ov30_022562EC); } -static BOOL ov30_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov30_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov30_0225621C * v0 = (UnkStruct_ov30_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_0225621C)); + UnkStruct_ov30_0225621C *v0 = (UnkStruct_ov30_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_0225621C)); if (v0 != NULL) { if (ov30_0225621C(v0, poketchSys, param2, param3)) { @@ -72,7 +72,7 @@ static BOOL ov30_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov30_0225621C (UnkStruct_ov30_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov30_0225621C(UnkStruct_ov30_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { if (ov30_022563EC(&(param0->unk_24), &(param0->unk_14), param2)) { param0->unk_00 = 0; @@ -106,22 +106,22 @@ static BOOL ov30_0225621C (UnkStruct_ov30_0225621C * param0, PoketchSystem *poke return 0; } -static void ov30_02256298 (UnkStruct_ov30_0225621C * param0) +static void ov30_02256298(UnkStruct_ov30_0225621C *param0) { ov30_02256444(param0->unk_24); PoketchButtonManager_Free(param0->buttonManager); Heap_FreeToHeap(param0); } -static void ov30_022562B0 (SysTask * param0, void * param1) +static void ov30_022562B0(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov30_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov30_0225621C *) = { ov30_02256324, ov30_02256364, ov30_022563B8 }; - UnkStruct_ov30_0225621C * v1 = (UnkStruct_ov30_0225621C *)param1; + UnkStruct_ov30_0225621C *v1 = (UnkStruct_ov30_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -135,14 +135,14 @@ static void ov30_022562B0 (SysTask * param0, void * param1) } } -static void ov30_022562EC (void * param0) +static void ov30_022562EC(void *param0) { ((UnkStruct_ov30_0225621C *)param0)->unk_02 = 1; } -static void ov30_022562F4 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov30_022562F4(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov30_0225621C * v0 = (UnkStruct_ov30_0225621C *)param3; + UnkStruct_ov30_0225621C *v0 = (UnkStruct_ov30_0225621C *)param3; switch (param2) { case 1: @@ -156,7 +156,7 @@ static void ov30_022562F4 (u32 param0, u32 param1, u32 param2, void * param3) } } -static void ov30_02256310 (UnkStruct_ov30_0225621C * param0, u32 param1) +static void ov30_02256310(UnkStruct_ov30_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -167,7 +167,7 @@ static void ov30_02256310 (UnkStruct_ov30_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov30_02256324 (UnkStruct_ov30_0225621C * param0) +static BOOL ov30_02256324(UnkStruct_ov30_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -185,7 +185,7 @@ static BOOL ov30_02256324 (UnkStruct_ov30_0225621C * param0) return 0; } -static BOOL ov30_02256364 (UnkStruct_ov30_0225621C * param0) +static BOOL ov30_02256364(UnkStruct_ov30_0225621C *param0) { if (param0->unk_02) { ov30_02256310(param0, 2); @@ -209,7 +209,7 @@ static BOOL ov30_02256364 (UnkStruct_ov30_0225621C * param0) return 0; } -static BOOL ov30_022563B8 (UnkStruct_ov30_0225621C * param0) +static BOOL ov30_022563B8(UnkStruct_ov30_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay030/ov30_022563EC.c b/src/overlay030/ov30_022563EC.c index ab7d3e317f..2156743f08 100644 --- a/src/overlay030/ov30_022563EC.c +++ b/src/overlay030/ov30_022563EC.c @@ -1,55 +1,56 @@ +#include "overlay030/ov30_022563EC.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay030/struct_ov30_022563EC_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay030/struct_ov30_022563EC_1.h" +#include "overlay030/struct_ov30_022563EC_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay030/ov30_022563EC.h" struct UnkStruct_ov30_022563EC_t { - const UnkStruct_ov30_022563EC_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov30_022563EC_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; - SysTask * unk_30; + SysTask *unk_30; UnkStruct_ov25_02255958 unk_34; - UnkStruct_ov25_022555E8 * unk_48; - UnkStruct_ov25_022558C4 * unk_4C[2]; + UnkStruct_ov25_022555E8 *unk_48; + UnkStruct_ov25_022558C4 *unk_4C[2]; }; -static void ov30_02256460(SysTask * param0, void * param1); -static void ov30_022564A0(UnkStruct_ov25_02255224 * param0); -static void ov30_022564B4(SysTask * param0, void * param1); -static void ov30_02256548(SysTask * param0, void * param1); -static void ov30_02256568(SysTask * param0, void * param1); -static void ov30_02256594(SysTask * param0, void * param1); -static void ov30_022565B0(UnkStruct_ov30_022563EC * param0); -static BOOL ov30_022565F4(UnkStruct_ov30_022563EC * param0); -static void ov30_02256658(UnkStruct_ov30_022563EC * param0); - -BOOL ov30_022563EC (UnkStruct_ov30_022563EC ** param0, const UnkStruct_ov30_022563EC_1 * param1, BGL * param2) +static void ov30_02256460(SysTask *param0, void *param1); +static void ov30_022564A0(UnkStruct_ov25_02255224 *param0); +static void ov30_022564B4(SysTask *param0, void *param1); +static void ov30_02256548(SysTask *param0, void *param1); +static void ov30_02256568(SysTask *param0, void *param1); +static void ov30_02256594(SysTask *param0, void *param1); +static void ov30_022565B0(UnkStruct_ov30_022563EC *param0); +static BOOL ov30_022565F4(UnkStruct_ov30_022563EC *param0); +static void ov30_02256658(UnkStruct_ov30_022563EC *param0); + +BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563EC_1 *param1, BGL *param2) { - UnkStruct_ov30_022563EC * v0 = (UnkStruct_ov30_022563EC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_022563EC)); + UnkStruct_ov30_022563EC *v0 = (UnkStruct_ov30_022563EC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov30_022563EC)); if (v0 != NULL) { - NNSG2dScreenData * v1; - void * v2; + NNSG2dScreenData *v1; + void *v2; ov25_02255090(v0->unk_08, 8); @@ -71,7 +72,7 @@ BOOL ov30_022563EC (UnkStruct_ov30_022563EC ** param0, const UnkStruct_ov30_0225 return 0; } -void ov30_02256444 (UnkStruct_ov30_022563EC * param0) +void ov30_02256444(UnkStruct_ov30_022563EC *param0) { if (param0 != NULL) { ov30_02256658(param0); @@ -84,42 +85,42 @@ void ov30_02256444 (UnkStruct_ov30_022563EC * param0) } } -static void ov30_02256460 (SysTask * param0, void * param1) +static void ov30_02256460(SysTask *param0, void *param1) { return; } static const UnkStruct_ov25_0225517C Unk_ov30_022566C4[] = { - {0x0, ov30_022564B4, 0x0}, - {0x1, ov30_02256548, 0x0}, - {0x2, ov30_02256568, 0x0}, - {0x3, ov30_02256594, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov30_022564B4, 0x0 }, + { 0x1, ov30_02256548, 0x0 }, + { 0x2, ov30_02256568, 0x0 }, + { 0x3, ov30_02256594, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov30_02256464 (UnkStruct_ov30_022563EC * param0, u32 param1) +void ov30_02256464(UnkStruct_ov30_022563EC *param0, u32 param1) { ov25_0225517C(Unk_ov30_022566C4, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov30_02256488 (UnkStruct_ov30_022563EC * param0, u32 param1) +BOOL ov30_02256488(UnkStruct_ov30_022563EC *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov30_02256494 (UnkStruct_ov30_022563EC * param0) +BOOL ov30_02256494(UnkStruct_ov30_022563EC *param0) { return ov25_02255154(param0->unk_08); } -static void ov30_022564A0 (UnkStruct_ov25_02255224 * param0) +static void ov30_022564A0(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov30_022563EC * v0 = ov25_0225523C(param0); + UnkStruct_ov30_022563EC *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov30_022564B4 (SysTask * param0, void * param1) +static void ov30_022564B4(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -137,7 +138,7 @@ static void ov30_022564B4 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov30_022563EC * v2; + UnkStruct_ov30_022563EC *v2; v2 = ov25_0225523C(param1); @@ -155,18 +156,18 @@ static void ov30_022564B4 (SysTask * param0, void * param1) ov30_022564A0(param1); } -static void ov30_02256548 (SysTask * param0, void * param1) +static void ov30_02256548(SysTask *param0, void *param1) { - UnkStruct_ov30_022563EC * v0 = ov25_0225523C(param1); + UnkStruct_ov30_022563EC *v0 = ov25_0225523C(param1); ov30_022565B0(v0); sub_02019448(v0->unk_04, 6); ov30_022564A0(param1); } -static void ov30_02256568 (SysTask * param0, void * param1) +static void ov30_02256568(SysTask *param0, void *param1) { - UnkStruct_ov30_022563EC * v0 = ov25_0225523C(param1); + UnkStruct_ov30_022563EC *v0 = ov25_0225523C(param1); if (v0->unk_00->unk_0C) { ov25_022546F0(0, 0); @@ -177,15 +178,15 @@ static void ov30_02256568 (SysTask * param0, void * param1) ov30_022564A0(param1); } -static void ov30_02256594 (SysTask * param0, void * param1) +static void ov30_02256594(SysTask *param0, void *param1) { - UnkStruct_ov30_022563EC * v0 = ov25_0225523C(param1); + UnkStruct_ov30_022563EC *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov30_022564A0(param1); } -static void ov30_022565B0 (UnkStruct_ov30_022563EC * param0) +static void ov30_022565B0(UnkStruct_ov30_022563EC *param0) { u32 v0; @@ -198,24 +199,24 @@ static void ov30_022565B0 (UnkStruct_ov30_022563EC * param0) ov25_022558C4(param0->unk_4C[1], v0); } -static BOOL ov30_022565F4 (UnkStruct_ov30_022563EC * param0) +static BOOL ov30_022565F4(UnkStruct_ov30_022563EC *param0) { static const UnkStruct_ov25_02255810 v0[] = { { - {116 << FX32_SHIFT, 100 << FX32_SHIFT}, + { 116 << FX32_SHIFT, 100 << FX32_SHIFT }, 60, 0, 2, 0, - 1 + 1, }, { - {116 << FX32_SHIFT, 100 << FX32_SHIFT}, + { 116 << FX32_SHIFT, 100 << FX32_SHIFT }, 0, 0, 2, 0, - 1 + 1, }, }; @@ -234,7 +235,7 @@ static BOOL ov30_022565F4 (UnkStruct_ov30_022563EC * param0) return 0; } -static void ov30_02256658 (UnkStruct_ov30_022563EC * param0) +static void ov30_02256658(UnkStruct_ov30_022563EC *param0) { int v0; diff --git a/src/overlay031/ov31_022561C0.c b/src/overlay031/ov31_022561C0.c index c2c0ad10be..8b5e5f86bb 100644 --- a/src/overlay031/ov31_022561C0.c +++ b/src/overlay031/ov31_022561C0.c @@ -1,21 +1,20 @@ #include -#include #include - -#include "inlines.h" +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay031/struct_ov31_02256554_decl.h" +#include "overlay025/poketch_system.h" +#include "overlay031/ov31_02256554.h" #include "overlay031/struct_ov31_02256554_1.h" +#include "overlay031/struct_ov31_02256554_decl.h" -#include "sys_task.h" #include "heap.h" -#include "touch_screen.h" +#include "inlines.h" #include "poketch_data.h" -#include "overlay031/ov31_02256554.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; @@ -24,38 +23,38 @@ typedef struct { u32 unk_04; u32 unk_08; UnkStruct_ov31_02256554_1 unk_0C; - UnkStruct_ov31_02256554 * unk_1EC; + UnkStruct_ov31_02256554 *unk_1EC; PoketchSystem *poketchSys; u8 unk_1F4[120]; } UnkStruct_ov31_02256228; static void NitroStaticInit(void); -static BOOL ov31_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov31_02256228(UnkStruct_ov31_02256228 * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov31_02256268(UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1); -static inline u8 inline_ov31_02256298(const u8 * param0, int param1); -static inline void inline_ov31_022562EC(u8 * param0, int param1, int param2); -static void ov31_02256298(UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData *poketchData); -static void ov31_022562EC(UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData *poketchData); -static void ov31_0225635C(UnkStruct_ov31_02256554_1 * param0); -static void ov31_02256384(UnkStruct_ov31_02256228 * param0); -static void ov31_022563B0(void * param0); -static void ov31_022563CC(SysTask * param0, void * param1); -static void ov31_02256404(void * param0); -static void ov31_0225640C(UnkStruct_ov31_02256228 * param0, u32 param1); -static BOOL ov31_02256420(UnkStruct_ov31_02256228 * param0); -static BOOL ov31_0225646C(UnkStruct_ov31_02256228 * param0); -static BOOL ov31_02256518(UnkStruct_ov31_02256228 * param0); - -static void NitroStaticInit (void) +static BOOL ov31_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov31_02256228(UnkStruct_ov31_02256228 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov31_02256268(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1); +static inline u8 inline_ov31_02256298(const u8 *param0, int param1); +static inline void inline_ov31_022562EC(u8 *param0, int param1, int param2); +static void ov31_02256298(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, PoketchData *poketchData); +static void ov31_022562EC(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, PoketchData *poketchData); +static void ov31_0225635C(UnkStruct_ov31_02256554_1 *param0); +static void ov31_02256384(UnkStruct_ov31_02256228 *param0); +static void ov31_022563B0(void *param0); +static void ov31_022563CC(SysTask *param0, void *param1); +static void ov31_02256404(void *param0); +static void ov31_0225640C(UnkStruct_ov31_02256228 *param0, u32 param1); +static BOOL ov31_02256420(UnkStruct_ov31_02256228 *param0); +static BOOL ov31_0225646C(UnkStruct_ov31_02256228 *param0); +static BOOL ov31_02256518(UnkStruct_ov31_02256228 *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov31_022561D4, ov31_02256404); } -static BOOL ov31_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov31_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov31_02256228 * v0 = (UnkStruct_ov31_02256228 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256228)); + UnkStruct_ov31_02256228 *v0 = (UnkStruct_ov31_02256228 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256228)); if (v0 != NULL) { if (ov31_02256228(v0, poketchSys, param2, param3)) { @@ -72,7 +71,7 @@ static BOOL ov31_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov31_02256228 (UnkStruct_ov31_02256228 * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov31_02256228(UnkStruct_ov31_02256228 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { param0->poketchSys = poketchSys; ov31_02256268(param0, &(param0->unk_0C)); @@ -90,7 +89,7 @@ static BOOL ov31_02256228 (UnkStruct_ov31_02256228 * param0, PoketchSystem *poke return 0; } -static void ov31_02256268 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1) +static void ov31_02256268(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1) { PoketchData *poketchData = PoketchSystem_GetPoketchData(param0->poketchSys); @@ -101,17 +100,17 @@ static void ov31_02256268 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_0225 } } -static inline u8 inline_ov31_02256298 (const u8 * param0, int param1) +static inline u8 inline_ov31_02256298(const u8 *param0, int param1) { return (param0[(param1 / 4)] >> ((param1 & 3) * 2)) & 3; } -static inline void inline_ov31_022562EC (u8 * param0, int param1, int param2) +static inline void inline_ov31_022562EC(u8 *param0, int param1, int param2) { param0[(param1 / 4)] |= ((param2 & 3) << ((param1 & 3) * 2)); } -static void ov31_02256298 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData *poketchData) +static void ov31_02256298(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, PoketchData *poketchData) { int v0, v1, v2; @@ -126,7 +125,7 @@ static void ov31_02256298 (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_0225 } } -static void ov31_022562EC (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_02256554_1 * param1, PoketchData *poketchData) +static void ov31_022562EC(UnkStruct_ov31_02256228 *param0, UnkStruct_ov31_02256554_1 *param1, PoketchData *poketchData) { int v0, v1, v2; @@ -143,29 +142,29 @@ static void ov31_022562EC (UnkStruct_ov31_02256228 * param0, UnkStruct_ov31_0225 PoketchData_ModifyDotArtData(poketchData, param0->unk_1F4); } -static void ov31_0225635C (UnkStruct_ov31_02256554_1 * param0) +static void ov31_0225635C(UnkStruct_ov31_02256554_1 *param0) { static const u8 v0[20][24] = { - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1}, - {1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1}, - {1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 4, 1}, - {1, 1, 1, 4, 1, 1, 4, 4, 4, 1, 4, 1, 4, 1, 4, 4, 4, 1, 4, 4, 4, 1, 4, 1}, - {1, 1, 1, 4, 1, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 1, 1, 4, 1, 4, 1, 1, 1}, - {1, 1, 1, 4, 1, 1, 4, 4, 4, 1, 4, 4, 4, 1, 4, 4, 4, 1, 4, 1, 4, 1, 4, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1 }, + { 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1 }, + { 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 4, 1 }, + { 1, 1, 1, 4, 1, 1, 4, 4, 4, 1, 4, 1, 4, 1, 4, 4, 4, 1, 4, 4, 4, 1, 4, 1 }, + { 1, 1, 1, 4, 1, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 1, 1, 4, 1, 4, 1, 1, 1 }, + { 1, 1, 1, 4, 1, 1, 4, 4, 4, 1, 4, 4, 4, 1, 4, 4, 4, 1, 4, 1, 4, 1, 4, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, + { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }, }; int v1, v2; @@ -176,7 +175,7 @@ static void ov31_0225635C (UnkStruct_ov31_02256554_1 * param0) } } -static void ov31_02256384 (UnkStruct_ov31_02256228 * param0) +static void ov31_02256384(UnkStruct_ov31_02256228 *param0) { ov31_022562EC(param0, ¶m0->unk_0C, PoketchSystem_GetPoketchData(param0->poketchSys)); ov31_02256584(param0->unk_1EC); @@ -184,21 +183,21 @@ static void ov31_02256384 (UnkStruct_ov31_02256228 * param0) Heap_FreeToHeap(param0); } -static void ov31_022563B0 (void * param0) +static void ov31_022563B0(void *param0) { - UnkStruct_ov31_02256228 * v0 = param0; + UnkStruct_ov31_02256228 *v0 = param0; ov31_022562EC(v0, &v0->unk_0C, PoketchSystem_GetPoketchData(v0->poketchSys)); } -static void ov31_022563CC (SysTask * param0, void * param1) +static void ov31_022563CC(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov31_02256228 *) = { + static BOOL (*const v0[])(UnkStruct_ov31_02256228 *) = { ov31_02256420, ov31_0225646C, ov31_02256518 }; - UnkStruct_ov31_02256228 * v1 = (UnkStruct_ov31_02256228 *)param1; + UnkStruct_ov31_02256228 *v1 = (UnkStruct_ov31_02256228 *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -210,12 +209,12 @@ static void ov31_022563CC (SysTask * param0, void * param1) } } -static void ov31_02256404 (void * param0) +static void ov31_02256404(void *param0) { ((UnkStruct_ov31_02256228 *)param0)->unk_02 = 1; } -static void ov31_0225640C (UnkStruct_ov31_02256228 * param0, u32 param1) +static void ov31_0225640C(UnkStruct_ov31_02256228 *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -226,7 +225,7 @@ static void ov31_0225640C (UnkStruct_ov31_02256228 * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov31_02256420 (UnkStruct_ov31_02256228 * param0) +static BOOL ov31_02256420(UnkStruct_ov31_02256228 *param0) { switch (param0->unk_01) { case 0: @@ -244,7 +243,7 @@ static BOOL ov31_02256420 (UnkStruct_ov31_02256228 * param0) return 0; } -static BOOL ov31_0225646C (UnkStruct_ov31_02256228 * param0) +static BOOL ov31_0225646C(UnkStruct_ov31_02256228 *param0) { if (param0->unk_02) { ov31_0225640C(param0, 2); @@ -280,7 +279,7 @@ static BOOL ov31_0225646C (UnkStruct_ov31_02256228 * param0) return 0; } -static BOOL ov31_02256518 (UnkStruct_ov31_02256228 * param0) +static BOOL ov31_02256518(UnkStruct_ov31_02256228 *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay031/ov31_02256554.c b/src/overlay031/ov31_02256554.c index 95001628a0..4af7452af7 100644 --- a/src/overlay031/ov31_02256554.c +++ b/src/overlay031/ov31_02256554.c @@ -1,37 +1,38 @@ +#include "overlay031/ov31_02256554.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay031/struct_ov31_02256554_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" #include "overlay031/struct_ov31_02256554_1.h" +#include "overlay031/struct_ov31_02256554_decl.h" #include "overlay097/struct_ov97_0222DB78.h" #include "heap.h" +#include "sys_task_manager.h" #include "unk_02018340.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay031/ov31_02256554.h" struct UnkStruct_ov31_02256554_t { - const UnkStruct_ov31_02256554_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov31_02256554_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; }; -static void ov31_022565CC(UnkStruct_ov25_02255224 * param0); -static void ov31_022565E0(SysTask * param0, void * param1); -static void ov31_02256644(BGL * param0); -static void ov31_022566EC(SysTask * param0, void * param1); -static void ov31_02256710(SysTask * param0, void * param1); -static void ov31_0225672C(BGL * param0, const UnkStruct_ov31_02256554_1 * param1); +static void ov31_022565CC(UnkStruct_ov25_02255224 *param0); +static void ov31_022565E0(SysTask *param0, void *param1); +static void ov31_02256644(BGL *param0); +static void ov31_022566EC(SysTask *param0, void *param1); +static void ov31_02256710(SysTask *param0, void *param1); +static void ov31_0225672C(BGL *param0, const UnkStruct_ov31_02256554_1 *param1); -BOOL ov31_02256554 (UnkStruct_ov31_02256554 ** param0, const UnkStruct_ov31_02256554_1 * param1, BGL * param2) +BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_02256554_1 *param1, BGL *param2) { - UnkStruct_ov31_02256554 * v0 = (UnkStruct_ov31_02256554 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256554)); + UnkStruct_ov31_02256554 *v0 = (UnkStruct_ov31_02256554 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov31_02256554)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); @@ -48,7 +49,7 @@ BOOL ov31_02256554 (UnkStruct_ov31_02256554 ** param0, const UnkStruct_ov31_0225 return 0; } -void ov31_02256584 (UnkStruct_ov31_02256554 * param0) +void ov31_02256584(UnkStruct_ov31_02256554 *param0) { if (param0 != NULL) { Heap_FreeToHeap(param0); @@ -56,34 +57,34 @@ void ov31_02256584 (UnkStruct_ov31_02256554 * param0) } static const UnkStruct_ov25_0225517C Unk_ov31_02256970[] = { - {0x0, ov31_022565E0, 0x0}, - {0x1, ov31_022566EC, 0x0}, - {0x2, ov31_02256710, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov31_022565E0, 0x0 }, + { 0x1, ov31_022566EC, 0x0 }, + { 0x2, ov31_02256710, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov31_02256590 (UnkStruct_ov31_02256554 * param0, u32 param1) +void ov31_02256590(UnkStruct_ov31_02256554 *param0, u32 param1) { ov25_0225517C(Unk_ov31_02256970, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov31_022565B4 (UnkStruct_ov31_02256554 * param0, u32 param1) +BOOL ov31_022565B4(UnkStruct_ov31_02256554 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov31_022565C0 (UnkStruct_ov31_02256554 * param0) +BOOL ov31_022565C0(UnkStruct_ov31_02256554 *param0) { return ov25_02255154(param0->unk_08); } -static void ov31_022565CC (UnkStruct_ov25_02255224 * param0) +static void ov31_022565CC(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov31_02256554 * v0 = ov25_0225523C(param0); + UnkStruct_ov31_02256554 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov31_022565E0 (SysTask * param0, void * param1) +static void ov31_022565E0(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -101,7 +102,7 @@ static void ov31_022565E0 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov31_02256554 * v2; + UnkStruct_ov31_02256554 *v2; v2 = ov25_0225523C(param1); @@ -118,9 +119,9 @@ static void ov31_022565E0 (SysTask * param0, void * param1) ov31_022565CC(param1); } -static void ov31_02256644 (BGL * param0) +static void ov31_02256644(BGL *param0) { - u8 * v0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20 * 16); + u8 *v0 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20 * 16); if (v0) { int v1; @@ -136,9 +137,9 @@ static void ov31_02256644 (BGL * param0) } } -static void ov31_022566EC (SysTask * param0, void * param1) +static void ov31_022566EC(SysTask *param0, void *param1) { - UnkStruct_ov31_02256554 * v0; + UnkStruct_ov31_02256554 *v0; v0 = ov25_0225523C(param1); @@ -147,21 +148,21 @@ static void ov31_022566EC (SysTask * param0, void * param1) ov31_022565CC(param1); } -static void ov31_02256710 (SysTask * param0, void * param1) +static void ov31_02256710(SysTask *param0, void *param1) { - UnkStruct_ov31_02256554 * v0 = ov25_0225523C(param1); + UnkStruct_ov31_02256554 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov31_022565CC(param1); } -static void ov31_0225672C (BGL * param0, const UnkStruct_ov31_02256554_1 * param1) +static void ov31_0225672C(BGL *param0, const UnkStruct_ov31_02256554_1 *param1) { static const u8 v0[] = { 4, 15, 8, 1 }; int v1, v2, v3; - u16 * v4 = sub_02019FE4(param0, 6); + u16 *v4 = sub_02019FE4(param0, 6); v4 += ((2 * 32) + 2); diff --git a/src/overlay032/ov32_022561C0.c b/src/overlay032/ov32_022561C0.c index 94c45e8668..c52c0fedf6 100644 --- a/src/overlay032/ov32_022561C0.c +++ b/src/overlay032/ov32_022561C0.c @@ -1,54 +1,53 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "overlay025/poketch_system.h" -#include "overlay032/struct_ov32_02256470_decl.h" +#include "overlay025/poketch_system.h" +#include "overlay032/ov32_02256470.h" #include "overlay032/struct_ov32_02256470_1.h" +#include "overlay032/struct_ov32_02256470_decl.h" -#include "sys_task.h" #include "heap.h" -#include "touch_screen.h" +#include "party.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "party.h" -#include "overlay032/ov32_02256470.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov32_02256470_1 unk_04; - UnkStruct_ov32_02256470 * unk_74; + UnkStruct_ov32_02256470 *unk_74; PoketchSystem *poketchSys; } UnkStruct_ov32_0225621C; static void NitroStaticInit(void); -static BOOL ov32_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov32_0225621C(UnkStruct_ov32_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov32_02256264(UnkStruct_ov32_0225621C * param0); -static void ov32_02256278(SysTask * param0, void * param1); -static void ov32_022562AC(void * param0); -static void ov32_022562B4(UnkStruct_ov32_0225621C * param0, u32 param1); -static BOOL ov32_022562C8(UnkStruct_ov32_0225621C * param0); -static BOOL ov32_02256308(UnkStruct_ov32_0225621C * param0); -static BOOL ov32_02256394(UnkStruct_ov32_0225621C * param0); -static void ov32_022563C8(UnkStruct_ov32_02256470_1 * param0, Party * param1); - -static void NitroStaticInit (void) +static BOOL ov32_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov32_0225621C(UnkStruct_ov32_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov32_02256264(UnkStruct_ov32_0225621C *param0); +static void ov32_02256278(SysTask *param0, void *param1); +static void ov32_022562AC(void *param0); +static void ov32_022562B4(UnkStruct_ov32_0225621C *param0, u32 param1); +static BOOL ov32_022562C8(UnkStruct_ov32_0225621C *param0); +static BOOL ov32_02256308(UnkStruct_ov32_0225621C *param0); +static BOOL ov32_02256394(UnkStruct_ov32_0225621C *param0); +static void ov32_022563C8(UnkStruct_ov32_02256470_1 *param0, Party *param1); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov32_022561D4, ov32_022562AC); } -static BOOL ov32_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov32_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov32_0225621C * v0 = (UnkStruct_ov32_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov32_0225621C)); + UnkStruct_ov32_0225621C *v0 = (UnkStruct_ov32_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov32_0225621C)); if (v0 != NULL) { if (ov32_0225621C(v0, poketchSys, param2, param3)) { @@ -64,7 +63,7 @@ static BOOL ov32_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov32_0225621C (UnkStruct_ov32_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov32_0225621C(UnkStruct_ov32_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { if (ov32_02256470(&(param0->unk_74), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -85,21 +84,21 @@ static BOOL ov32_0225621C (UnkStruct_ov32_0225621C * param0, PoketchSystem *poke return 0; } -static void ov32_02256264 (UnkStruct_ov32_0225621C * param0) +static void ov32_02256264(UnkStruct_ov32_0225621C *param0) { ov32_02256508(param0->unk_74); Heap_FreeToHeap(param0); } -static void ov32_02256278 (SysTask * param0, void * param1) +static void ov32_02256278(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov32_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov32_0225621C *) = { ov32_022562C8, ov32_02256308, ov32_02256394 }; - UnkStruct_ov32_0225621C * v1 = (UnkStruct_ov32_0225621C *)param1; + UnkStruct_ov32_0225621C *v1 = (UnkStruct_ov32_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -111,12 +110,12 @@ static void ov32_02256278 (SysTask * param0, void * param1) } } -static void ov32_022562AC (void * param0) +static void ov32_022562AC(void *param0) { ((UnkStruct_ov32_0225621C *)param0)->unk_02 = 1; } -static void ov32_022562B4 (UnkStruct_ov32_0225621C * param0, u32 param1) +static void ov32_022562B4(UnkStruct_ov32_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -127,7 +126,7 @@ static void ov32_022562B4 (UnkStruct_ov32_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov32_022562C8 (UnkStruct_ov32_0225621C * param0) +static BOOL ov32_022562C8(UnkStruct_ov32_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -145,7 +144,7 @@ static BOOL ov32_022562C8 (UnkStruct_ov32_0225621C * param0) return 0; } -static BOOL ov32_02256308 (UnkStruct_ov32_0225621C * param0) +static BOOL ov32_02256308(UnkStruct_ov32_0225621C *param0) { if (param0->unk_02) { ov32_022562B4(param0, 2); @@ -178,7 +177,7 @@ static BOOL ov32_02256308 (UnkStruct_ov32_0225621C * param0) return 0; } -static BOOL ov32_02256394 (UnkStruct_ov32_0225621C * param0) +static BOOL ov32_02256394(UnkStruct_ov32_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -195,9 +194,9 @@ static BOOL ov32_02256394 (UnkStruct_ov32_0225621C * param0) return 0; } -static void ov32_022563C8 (UnkStruct_ov32_02256470_1 * param0, Party * param1) +static void ov32_022563C8(UnkStruct_ov32_02256470_1 *param0, Party *param1) { - Pokemon * v0; + Pokemon *v0; int v1; BOOL v2; diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c index c72bd4b0c9..b37fd9589c 100644 --- a/src/overlay032/ov32_02256470.c +++ b/src/overlay032/ov32_02256470.c @@ -1,37 +1,38 @@ +#include "overlay032/ov32_02256470.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay032/struct_ov32_02256470_decl.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay032/struct_ov32_02256470_1.h" +#include "overlay032/struct_ov32_02256470_decl.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "heap.h" +#include "item.h" #include "narc.h" -#include "unk_02006E3C.h" +#include "pokemon_icon.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "pokemon_icon.h" -#include "item.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay032/ov32_02256470.h" typedef struct { - UnkStruct_ov32_02256470 * unk_00; - const UnkStruct_ov32_02256470_1 * unk_04; + UnkStruct_ov32_02256470 *unk_00; + const UnkStruct_ov32_02256470_1 *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; @@ -42,51 +43,51 @@ typedef struct { } UnkStruct_ov32_02256A78; struct UnkStruct_ov32_02256470_t { - const UnkStruct_ov32_02256470_1 * unk_00; - BGL * unk_04; - UnkStruct_ov25_022555E8 * unk_08; + const UnkStruct_ov32_02256470_1 *unk_00; + BGL *unk_04; + UnkStruct_ov25_022555E8 *unk_08; u32 unk_0C[10]; u32 unk_34; u32 unk_38; Window unk_3C[6]; - UnkStruct_ov25_022558C4 * unk_9C[6]; - UnkStruct_ov25_022558C4 * unk_B4[6]; + UnkStruct_ov25_022558C4 *unk_9C[6]; + UnkStruct_ov25_022558C4 *unk_B4[6]; UnkStruct_ov25_02255958 unk_CC; UnkStruct_ov25_02255958 unk_E0; - SysTask * unk_F4; + SysTask *unk_F4; UnkStruct_ov32_02256A78 unk_F8; u8 unk_10A[640]; }; -static void ov32_02256574(UnkStruct_ov25_02255224 * param0); -static void ov32_02256588(SysTask * param0, void * param1); -static void ov32_02256648(UnkStruct_ov32_02256470 * param0, const UnkStruct_ov32_02256470_1 * param1, u32 param2); -static void ov32_022566E0(Window * param0, UnkStruct_ov32_02256470 * param1); -static void ov32_0225682C(Window * param0, u32 param1); +static void ov32_02256574(UnkStruct_ov25_02255224 *param0); +static void ov32_02256588(SysTask *param0, void *param1); +static void ov32_02256648(UnkStruct_ov32_02256470 *param0, const UnkStruct_ov32_02256470_1 *param1, u32 param2); +static void ov32_022566E0(Window *param0, UnkStruct_ov32_02256470 *param1); +static void ov32_0225682C(Window *param0, u32 param1); static u32 ov32_0225686C(u32 param0, u32 param1); -static void ov32_02256898(UnkStruct_ov32_02256470 * param0, const UnkStruct_ov32_02256470_1 * param1); -static void ov32_0225692C(UnkStruct_ov32_02256470 * param0, const UnkStruct_ov32_02256470_1 * param1); -static void ov32_02256A48(UnkStruct_ov32_02256470 * param0); -static void ov32_02256A78(SysTask * param0, void * param1); -static void ov32_02256BD4(UnkStruct_ov32_02256470 * param0); -static void ov32_02256C38(SysTask * param0, void * param1); -static void ov32_02256C54(SysTask * param0, void * param1); +static void ov32_02256898(UnkStruct_ov32_02256470 *param0, const UnkStruct_ov32_02256470_1 *param1); +static void ov32_0225692C(UnkStruct_ov32_02256470 *param0, const UnkStruct_ov32_02256470_1 *param1); +static void ov32_02256A48(UnkStruct_ov32_02256470 *param0); +static void ov32_02256A78(SysTask *param0, void *param1); +static void ov32_02256BD4(UnkStruct_ov32_02256470 *param0); +static void ov32_02256C38(SysTask *param0, void *param1); +static void ov32_02256C54(SysTask *param0, void *param1); static const struct { u16 unk_00; u16 unk_02; } Unk_ov32_02256CCC[] = { - {0x40, 0x24}, - {0xA0, 0x24}, - {0x40, 0x54}, - {0xA0, 0x54}, - {0x40, 0x84}, - {0xA0, 0x84} + { 0x40, 0x24 }, + { 0xA0, 0x24 }, + { 0x40, 0x54 }, + { 0xA0, 0x54 }, + { 0x40, 0x84 }, + { 0xA0, 0x84 } }; -BOOL ov32_02256470 (UnkStruct_ov32_02256470 ** param0, const UnkStruct_ov32_02256470_1 * param1, BGL * param2) +BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_02256470_1 *param1, BGL *param2) { - UnkStruct_ov32_02256470 * v0 = (UnkStruct_ov32_02256470 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov32_02256470)); + UnkStruct_ov32_02256470 *v0 = (UnkStruct_ov32_02256470 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov32_02256470)); if (v0 != NULL) { int v1; @@ -114,7 +115,7 @@ BOOL ov32_02256470 (UnkStruct_ov32_02256470 ** param0, const UnkStruct_ov32_0225 return 0; } -void ov32_02256508 (UnkStruct_ov32_02256470 * param0) +void ov32_02256508(UnkStruct_ov32_02256470 *param0) { if (param0 != NULL) { ov32_02256BD4(param0); @@ -130,34 +131,34 @@ void ov32_02256508 (UnkStruct_ov32_02256470 * param0) } static const UnkStruct_ov25_0225517C Unk_ov32_02256D18[] = { - {0x0, ov32_02256588, 0x0}, - {0x1, ov32_02256C38, 0x0}, - {0x2, ov32_02256C54, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov32_02256588, 0x0 }, + { 0x1, ov32_02256C38, 0x0 }, + { 0x2, ov32_02256C54, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov32_02256538 (UnkStruct_ov32_02256470 * param0, u32 param1) +void ov32_02256538(UnkStruct_ov32_02256470 *param0, u32 param1) { ov25_0225517C(Unk_ov32_02256D18, param1, param0, param0->unk_00, param0->unk_0C, 2, 8); } -BOOL ov32_0225655C (UnkStruct_ov32_02256470 * param0, u32 param1) +BOOL ov32_0225655C(UnkStruct_ov32_02256470 *param0, u32 param1) { return ov25_02255130(param0->unk_0C, param1); } -BOOL ov32_02256568 (UnkStruct_ov32_02256470 * param0) +BOOL ov32_02256568(UnkStruct_ov32_02256470 *param0) { return ov25_02255154(param0->unk_0C); } -static void ov32_02256574 (UnkStruct_ov25_02255224 * param0) +static void ov32_02256574(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov32_02256470 * v0 = ov25_0225523C(param0); + UnkStruct_ov32_02256470 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_0C, param0); } -static void ov32_02256588 (SysTask * param0, void * param1) +static void ov32_02256588(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -175,7 +176,7 @@ static void ov32_02256588 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov32_02256470 * v2; + UnkStruct_ov32_02256470 *v2; u32 v3; v2 = ov25_0225523C(param1); @@ -202,18 +203,18 @@ static void ov32_02256588 (SysTask * param0, void * param1) ov32_02256574(param1); } -static void ov32_02256648 (UnkStruct_ov32_02256470 * param0, const UnkStruct_ov32_02256470_1 * param1, u32 param2) +static void ov32_02256648(UnkStruct_ov32_02256470 *param0, const UnkStruct_ov32_02256470_1 *param1, u32 param2) { static const struct { u16 unk_00; u16 unk_02; } v0[] = { - {4, 8}, - {16, 8}, - {4, 14}, - {16, 14}, - {4, 20}, - {16, 20} + { 4, 8 }, + { 16, 8 }, + { 4, 14 }, + { 16, 14 }, + { 4, 20 }, + { 16, 20 } }; int v1; @@ -229,7 +230,7 @@ static void ov32_02256648 (UnkStruct_ov32_02256470 * param0, const UnkStruct_ov3 param0->unk_38 = param1->unk_00; } -static void ov32_022566E0 (Window * param0, UnkStruct_ov32_02256470 * param1) +static void ov32_022566E0(Window *param0, UnkStruct_ov32_02256470 *param1) { sub_02019CB8(param1->unk_04, 6, 1, param0->unk_05 - 1, param0->unk_06 - 1, 1, 1, 0); sub_02019CB8(param1->unk_04, 6, 2, param0->unk_05, param0->unk_06 - 1, param0->unk_07, 1, 0); @@ -243,7 +244,7 @@ static void ov32_022566E0 (Window * param0, UnkStruct_ov32_02256470 * param1) sub_02019CB8(param1->unk_04, 6, 3073, param0->unk_05 + param0->unk_07, param0->unk_06 + param0->unk_08, 1, 1, 0); } -static void ov32_0225682C (Window * param0, u32 param1) +static void ov32_0225682C(Window *param0, u32 param1) { BGL_WindowColor(param0, 4, 0, 0, 64, 8); @@ -254,7 +255,7 @@ static void ov32_0225682C (Window * param0, u32 param1) sub_0201ACCC(param0); } -static u32 ov32_0225686C (u32 param0, u32 param1) +static u32 ov32_0225686C(u32 param0, u32 param1) { u32 v0; @@ -277,7 +278,7 @@ static u32 ov32_0225686C (u32 param0, u32 param1) return v0 * 2; } -static void ov32_02256898 (UnkStruct_ov32_02256470 * param0, const UnkStruct_ov32_02256470_1 * param1) +static void ov32_02256898(UnkStruct_ov32_02256470 *param0, const UnkStruct_ov32_02256470_1 *param1) { int v0; UnkStruct_ov25_02255810 v1; @@ -300,15 +301,15 @@ static void ov32_02256898 (UnkStruct_ov32_02256470 * param0, const UnkStruct_ov3 } } -static void ov32_0225692C (UnkStruct_ov32_02256470 * param0, const UnkStruct_ov32_02256470_1 * param1) +static void ov32_0225692C(UnkStruct_ov32_02256470 *param0, const UnkStruct_ov32_02256470_1 *param1) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 8); if (v0) { UnkStruct_ov25_02255810 v1; - NNSG2dCharacterData * v2; + NNSG2dCharacterData *v2; int v3; v1.unk_08 = 0; @@ -324,8 +325,8 @@ static void ov32_0225692C (UnkStruct_ov32_02256470 * param0, const UnkStruct_ov3 DC_FlushRange(v2->pRawData, (16 * 0x20)); GXS_LoadOBJ(v2->pRawData, (0 + 8) * 0x20 + (16 * 0x20) * v3, (16 * 0x20)); - v1.unk_00.x = (((Unk_ov32_02256CCC[v3].unk_00)) << FX32_SHIFT); - v1.unk_00.y = (((Unk_ov32_02256CCC[v3].unk_02)) << FX32_SHIFT); + v1.unk_00.x = ((Unk_ov32_02256CCC[v3].unk_00) << FX32_SHIFT); + v1.unk_00.y = ((Unk_ov32_02256CCC[v3].unk_02) << FX32_SHIFT); param0->unk_9C[v3] = ov25_02255810(param0->unk_08, &v1, ¶m0->unk_CC); @@ -344,7 +345,7 @@ static void ov32_0225692C (UnkStruct_ov32_02256470 * param0, const UnkStruct_ov3 } } -static void ov32_02256A48 (UnkStruct_ov32_02256470 * param0) +static void ov32_02256A48(UnkStruct_ov32_02256470 *param0) { param0->unk_F8.unk_08 = 0; param0->unk_F8.unk_00 = param0; @@ -352,11 +353,11 @@ static void ov32_02256A48 (UnkStruct_ov32_02256470 * param0) param0->unk_F4 = SysTask_Start(ov32_02256A78, &(param0->unk_F8), 1); } -static void ov32_02256A78 (SysTask * param0, void * param1) +static void ov32_02256A78(SysTask *param0, void *param1) { - UnkStruct_ov32_02256A78 * v0 = param1; - const UnkStruct_ov32_02256470_1 * v1 = v0->unk_04; - UnkStruct_ov32_02256470 * v2 = v0->unk_00; + UnkStruct_ov32_02256A78 *v0 = param1; + const UnkStruct_ov32_02256470_1 *v1 = v0->unk_04; + UnkStruct_ov32_02256470 *v2 = v0->unk_00; switch (v0->unk_08) { case 0: @@ -414,7 +415,7 @@ static void ov32_02256A78 (SysTask * param0, void * param1) } } -u32 ov32_02256B78 (u32 param0, u32 param1, u32 param2) +u32 ov32_02256B78(u32 param0, u32 param1, u32 param2) { u32 v0, v1, v2, v3, v4; @@ -432,7 +433,7 @@ u32 ov32_02256B78 (u32 param0, u32 param1, u32 param2) return param2; } -static void ov32_02256BD4 (UnkStruct_ov32_02256470 * param0) +static void ov32_02256BD4(UnkStruct_ov32_02256470 *param0) { int v0; @@ -455,18 +456,18 @@ static void ov32_02256BD4 (UnkStruct_ov32_02256470 * param0) param0->unk_38 = 0; } -static void ov32_02256C38 (SysTask * param0, void * param1) +static void ov32_02256C38(SysTask *param0, void *param1) { - UnkStruct_ov32_02256470 * v0 = ov25_0225523C(param1); + UnkStruct_ov32_02256470 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov32_02256574(param1); } -static void ov32_02256C54 (SysTask * param0, void * param1) +static void ov32_02256C54(SysTask *param0, void *param1) { - UnkStruct_ov32_02256470 * v0 = ov25_0225523C(param1); - const UnkStruct_ov32_02256470_1 * v1 = ov25_02255240(param1); + UnkStruct_ov32_02256470 *v0 = ov25_0225523C(param1); + const UnkStruct_ov32_02256470_1 *v1 = ov25_02255240(param1); ov32_02256BD4(v0); diff --git a/src/overlay033/ov33_022561C0.c b/src/overlay033/ov33_022561C0.c index 8c4ee78c33..307b8f8fe3 100644 --- a/src/overlay033/ov33_022561C0.c +++ b/src/overlay033/ov33_022561C0.c @@ -1,55 +1,54 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "overlay025/poketch_system.h" -#include "overlay033/struct_ov33_02256474_decl.h" +#include "overlay025/poketch_system.h" +#include "overlay033/ov33_02256474.h" #include "overlay033/struct_ov33_02256474_1.h" +#include "overlay033/struct_ov33_02256474_decl.h" -#include "sys_task.h" #include "heap.h" -#include "touch_screen.h" -#include "savedata.h" +#include "party.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "party.h" -#include "overlay033/ov33_02256474.h" +#include "savedata.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov33_02256474_1 unk_04; - UnkStruct_ov33_02256474 * unk_5C; + UnkStruct_ov33_02256474 *unk_5C; PoketchSystem *poketchSys; } UnkStruct_ov33_0225621C; static void NitroStaticInit(void); -static BOOL ov33_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov33_0225621C(UnkStruct_ov33_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); +static BOOL ov33_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov33_0225621C(UnkStruct_ov33_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); static u32 ov33_0225630C(u32 param0); -static void ov33_0225632C(UnkStruct_ov33_0225621C * param0); -static void ov33_02256340(SysTask * param0, void * param1); -static void ov33_02256374(void * param0); -static void ov33_0225637C(UnkStruct_ov33_0225621C * param0, u32 param1); -static BOOL ov33_02256390(UnkStruct_ov33_0225621C * param0); -static BOOL ov33_022563D0(UnkStruct_ov33_0225621C * param0); -static BOOL ov33_02256440(UnkStruct_ov33_0225621C * param0); - -static void NitroStaticInit (void) +static void ov33_0225632C(UnkStruct_ov33_0225621C *param0); +static void ov33_02256340(SysTask *param0, void *param1); +static void ov33_02256374(void *param0); +static void ov33_0225637C(UnkStruct_ov33_0225621C *param0, u32 param1); +static BOOL ov33_02256390(UnkStruct_ov33_0225621C *param0); +static BOOL ov33_022563D0(UnkStruct_ov33_0225621C *param0); +static BOOL ov33_02256440(UnkStruct_ov33_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov33_022561D4, ov33_02256374); } -static BOOL ov33_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov33_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov33_0225621C * v0 = (UnkStruct_ov33_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_0225621C)); + UnkStruct_ov33_0225621C *v0 = (UnkStruct_ov33_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_0225621C)); if (v0 != NULL) { if (ov33_0225621C(v0, poketchSys, param2, param3)) { @@ -65,7 +64,7 @@ static BOOL ov33_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov33_0225621C (UnkStruct_ov33_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov33_0225621C(UnkStruct_ov33_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { if (ov33_02256474(&(param0->unk_5C), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -74,8 +73,8 @@ static BOOL ov33_0225621C (UnkStruct_ov33_0225621C * param0, PoketchSystem *poke param0->poketchSys = poketchSys; { - Party * v0 = Party_GetFromSavedata(SaveData_Ptr()); - Pokemon * v1; + Party *v0 = Party_GetFromSavedata(SaveData_Ptr()); + Pokemon *v1; int v2; int v3; int v4; @@ -129,10 +128,15 @@ static BOOL ov33_0225621C (UnkStruct_ov33_0225621C * param0, PoketchSystem *poke return 0; } -static u32 ov33_0225630C (u32 param0) +static u32 ov33_0225630C(u32 param0) { static const u8 v0[] = { - 1, 35, 70, 150, 200, 255, + 1, + 35, + 70, + 150, + 200, + 255, }; u32 v1; @@ -145,19 +149,21 @@ static u32 ov33_0225630C (u32 param0) return NELEMS(v0); } -static void ov33_0225632C (UnkStruct_ov33_0225621C * param0) +static void ov33_0225632C(UnkStruct_ov33_0225621C *param0) { ov33_022564F0(param0->unk_5C); Heap_FreeToHeap(param0); } -static void ov33_02256340 (SysTask * param0, void * param1) +static void ov33_02256340(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov33_0225621C *) = { - ov33_02256390, ov33_022563D0, ov33_02256440, + static BOOL (*const v0[])(UnkStruct_ov33_0225621C *) = { + ov33_02256390, + ov33_022563D0, + ov33_02256440, }; - UnkStruct_ov33_0225621C * v1 = (UnkStruct_ov33_0225621C *)param1; + UnkStruct_ov33_0225621C *v1 = (UnkStruct_ov33_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -169,12 +175,12 @@ static void ov33_02256340 (SysTask * param0, void * param1) } } -static void ov33_02256374 (void * param0) +static void ov33_02256374(void *param0) { ((UnkStruct_ov33_0225621C *)param0)->unk_02 = 1; } -static void ov33_0225637C (UnkStruct_ov33_0225621C * param0, u32 param1) +static void ov33_0225637C(UnkStruct_ov33_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -185,7 +191,7 @@ static void ov33_0225637C (UnkStruct_ov33_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov33_02256390 (UnkStruct_ov33_0225621C * param0) +static BOOL ov33_02256390(UnkStruct_ov33_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -203,7 +209,7 @@ static BOOL ov33_02256390 (UnkStruct_ov33_0225621C * param0) return 0; } -static BOOL ov33_022563D0 (UnkStruct_ov33_0225621C * param0) +static BOOL ov33_022563D0(UnkStruct_ov33_0225621C *param0) { if (param0->unk_02) { ov33_0225637C(param0, 2); @@ -228,7 +234,7 @@ static BOOL ov33_022563D0 (UnkStruct_ov33_0225621C * param0) return 0; } -static BOOL ov33_02256440 (UnkStruct_ov33_0225621C * param0) +static BOOL ov33_02256440(UnkStruct_ov33_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index 79d1065879..60955a6a46 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -1,40 +1,40 @@ +#include "overlay033/ov33_02256474.h" + #include #include -#include "inlines.h" -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay033/struct_ov33_02256474_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay033/struct_ov33_02256474_1.h" +#include "overlay033/struct_ov33_02256474_decl.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "heap.h" +#include "inlines.h" #include "narc.h" -#include "unk_02006E3C.h" +#include "pokemon.h" +#include "pokemon_icon.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "pokemon.h" -#include "pokemon_icon.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay033/ov33_02256474.h" typedef struct { - UnkStruct_ov25_022558C4 * unk_00; - UnkStruct_ov25_022558C4 * unk_04; + UnkStruct_ov25_022558C4 *unk_00; + UnkStruct_ov25_022558C4 *unk_04; VecFx32 unk_08; VecFx32 unk_14; VecFx32 unk_20; @@ -53,16 +53,16 @@ typedef struct { } UnkStruct_ov33_02256474_sub1; struct UnkStruct_ov33_02256474_t { - const UnkStruct_ov33_02256474_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov33_02256474_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; - UnkStruct_ov25_022555E8 * unk_30; + UnkStruct_ov25_022555E8 *unk_30; UnkStruct_ov25_02255958 unk_34; UnkStruct_ov25_02255958 unk_48; VecFx32 unk_5C[6]; VecFx32 unk_A4; - SysTask * unk_B0; - void * unused_B4[6]; + SysTask *unk_B0; + void *unused_B4[6]; int unk_CC[6]; u32 unk_E4; u32 unk_E8; @@ -79,46 +79,46 @@ struct UnkStruct_ov33_02256474_t { u32 unk_284; }; -static inline void inline_ov33_0225681C(UnkStruct_ov33_02256474_sub1 * param0); -static inline BOOL inline_ov33_022572A0(const VecFx32 * param0); -static inline void inline_ov33_022572A0_1(VecFx32 * param0); -static void ov33_02256584(UnkStruct_ov25_02255224 * param0); -static void ov33_02256598(SysTask * param0, void * param1); -static void ov33_02256634(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1); -static void ov33_022567D4(VecFx32 * param0); -static void ov33_0225681C(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1); -static void ov33_02256898(SysTask * param0, void * param1); -static void ov33_022568B4(UnkStruct_ov33_02256474 * param0); -static void ov33_022568F4(UnkStruct_ov33_02256474 * param0, int param1); -static void ov33_02256904(SysTask * param0, void * param1); -static u32 ov33_022569C0(UnkStruct_ov33_02256474 * param0); -static BOOL ov33_02256A14(u32 param0, u32 param1, u32 param2, const VecFx32 * param3); -static void ov33_02256A44(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1); -static void ov33_02256A64(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1); -static void ov33_02256AA8(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1); -static void ov33_02256ABC(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1); -static void ov33_02256B08(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1); -static void ov33_02256B3C(const char * param0, ...); -static void ov33_02256B44(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1); -static void ov33_02256BAC(UnkStruct_ov33_02256474 * param0, int param1, int param2); -static void ov33_02256C08(UnkStruct_ov33_02256474 * param0); -static BOOL ov33_02256C40(UnkStruct_ov33_02256474 * param0); -static void ov33_02256C54(UnkStruct_ov33_02256474 * param0, int param1); -static void ov33_02256C98(UnkStruct_ov33_02256474 * param0, int param1); -static void ov33_02256CC4(UnkStruct_ov33_02256474 * param0, int param1); -static void ov33_02256CDC(fx32 param0, u32 param1, VecFx32 * param2); -static BOOL ov33_02256D20(const VecFx32 * param0); -static void ov33_02256D34(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2); -static void ov33_02256E1C(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2); -static void ov33_02256F34(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2); -static void ov33_02257010(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2); -static void ov33_022570E8(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2); -static void ov33_0225718C(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2); -static void ov33_022572A0(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1); - -BOOL ov33_02256474 (UnkStruct_ov33_02256474 ** param0, const UnkStruct_ov33_02256474_1 * param1, BGL * param2) -{ - UnkStruct_ov33_02256474 * v0 = (UnkStruct_ov33_02256474 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_02256474)); +static inline void inline_ov33_0225681C(UnkStruct_ov33_02256474_sub1 *param0); +static inline BOOL inline_ov33_022572A0(const VecFx32 *param0); +static inline void inline_ov33_022572A0_1(VecFx32 *param0); +static void ov33_02256584(UnkStruct_ov25_02255224 *param0); +static void ov33_02256598(SysTask *param0, void *param1); +static void ov33_02256634(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1); +static void ov33_022567D4(VecFx32 *param0); +static void ov33_0225681C(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1); +static void ov33_02256898(SysTask *param0, void *param1); +static void ov33_022568B4(UnkStruct_ov33_02256474 *param0); +static void ov33_022568F4(UnkStruct_ov33_02256474 *param0, int param1); +static void ov33_02256904(SysTask *param0, void *param1); +static u32 ov33_022569C0(UnkStruct_ov33_02256474 *param0); +static BOOL ov33_02256A14(u32 param0, u32 param1, u32 param2, const VecFx32 *param3); +static void ov33_02256A44(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1); +static void ov33_02256A64(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1); +static void ov33_02256AA8(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1); +static void ov33_02256ABC(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1); +static void ov33_02256B08(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1); +static void ov33_02256B3C(const char *param0, ...); +static void ov33_02256B44(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1); +static void ov33_02256BAC(UnkStruct_ov33_02256474 *param0, int param1, int param2); +static void ov33_02256C08(UnkStruct_ov33_02256474 *param0); +static BOOL ov33_02256C40(UnkStruct_ov33_02256474 *param0); +static void ov33_02256C54(UnkStruct_ov33_02256474 *param0, int param1); +static void ov33_02256C98(UnkStruct_ov33_02256474 *param0, int param1); +static void ov33_02256CC4(UnkStruct_ov33_02256474 *param0, int param1); +static void ov33_02256CDC(fx32 param0, u32 param1, VecFx32 *param2); +static BOOL ov33_02256D20(const VecFx32 *param0); +static void ov33_02256D34(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2); +static void ov33_02256E1C(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2); +static void ov33_02256F34(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2); +static void ov33_02257010(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2); +static void ov33_022570E8(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2); +static void ov33_0225718C(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2); +static void ov33_022572A0(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1); + +BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_02256474_1 *param1, BGL *param2) +{ + UnkStruct_ov33_02256474 *v0 = (UnkStruct_ov33_02256474 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov33_02256474)); if (v0 != NULL) { int v1; @@ -144,7 +144,7 @@ BOOL ov33_02256474 (UnkStruct_ov33_02256474 ** param0, const UnkStruct_ov33_0225 return 0; } -void ov33_022564F0 (UnkStruct_ov33_02256474 * param0) +void ov33_022564F0(UnkStruct_ov33_02256474 *param0) { if (param0 != NULL) { int v0; @@ -171,34 +171,34 @@ void ov33_022564F0 (UnkStruct_ov33_02256474 * param0) } static const UnkStruct_ov25_0225517C Unk_ov33_02257878[] = { - {0x0, ov33_02256598, 0x0}, - {0x1, ov33_02256898, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov33_02256598, 0x0 }, + { 0x1, ov33_02256898, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov33_02256548 (UnkStruct_ov33_02256474 * param0, u32 param1) +void ov33_02256548(UnkStruct_ov33_02256474 *param0, u32 param1) { ov25_0225517C(Unk_ov33_02257878, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov33_0225656C (UnkStruct_ov33_02256474 * param0, u32 param1) +BOOL ov33_0225656C(UnkStruct_ov33_02256474 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov33_02256578 (UnkStruct_ov33_02256474 * param0) +BOOL ov33_02256578(UnkStruct_ov33_02256474 *param0) { return ov25_02255154(param0->unk_08); } -static void ov33_02256584 (UnkStruct_ov25_02255224 * param0) +static void ov33_02256584(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov33_02256474 * v0 = ov25_0225523C(param0); + UnkStruct_ov33_02256474 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov33_02256598 (SysTask * param0, void * param1) +static void ov33_02256598(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -216,7 +216,7 @@ static void ov33_02256598 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov33_02256474 * v2; + UnkStruct_ov33_02256474 *v2; v2 = ov25_0225523C(param1); @@ -235,20 +235,20 @@ static void ov33_02256598 (SysTask * param0, void * param1) ov33_02256584(param1); } -static void ov33_02256634 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1) +static void ov33_02256634(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1) { static const struct { u16 x; u16 y; } v0[] = { - {48, 44}, - {176, 44}, - {48, 92}, - {176, 92}, - {48, 140}, - {176, 140} + { 48, 44 }, + { 176, 44 }, + { 48, 92 }, + { 176, 92 }, + { 48, 140 }, + { 176, 140 } }; - NARC * v1; + NARC *v1; ov25_02255360(1); sub_02006EC0(12, 35, 1, ((4 * 4 * 2) * 6) * 0x20, 0, 1, 8); @@ -257,8 +257,8 @@ static void ov33_02256634 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 if (v1) { UnkStruct_ov25_02255810 v2; - NNSG2dCharacterData * v3; - void * v4; + NNSG2dCharacterData *v3; + void *v4; int v5; v2.unk_08 = 0; @@ -273,8 +273,8 @@ static void ov33_02256634 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 GXS_LoadOBJ(v3->pRawData, ((4 * 4 * 2) * 0x20) * v5, ((4 * 4 * 2) * 0x20)); Heap_FreeToHeap(v4); - v2.unk_00.x = (((v0[v5].x)) << FX32_SHIFT); - v2.unk_00.y = (((v0[v5].y)) << FX32_SHIFT); + v2.unk_00.x = ((v0[v5].x) << FX32_SHIFT); + v2.unk_00.y = ((v0[v5].y) << FX32_SHIFT); v2.unk_0C = 1; param0->unk_134[v5].unk_00 = ov25_02255810(param0->unk_30, &v2, ¶m0->unk_34); @@ -305,7 +305,7 @@ static void ov33_02256634 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } } -static void ov33_022567D4 (VecFx32 * param0) +static void ov33_022567D4(VecFx32 *param0) { fx32 v0, v1; @@ -319,7 +319,7 @@ static void ov33_022567D4 (VecFx32 * param0) param0->y /= 16; } -static inline void inline_ov33_0225681C (UnkStruct_ov33_02256474_sub1 * param0) +static inline void inline_ov33_0225681C(UnkStruct_ov33_02256474_sub1 *param0) { if (param0->unk_30) { ov25_022558C4(param0->unk_00, 6); @@ -328,7 +328,7 @@ static inline void inline_ov33_0225681C (UnkStruct_ov33_02256474_sub1 * param0) } } -static void ov33_0225681C (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1) +static void ov33_0225681C(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1) { int v0; @@ -341,15 +341,15 @@ static void ov33_0225681C (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 param0->unk_B0 = SysTask_Start(ov33_02256904, param0, 1); } -static void ov33_02256898 (SysTask * param0, void * param1) +static void ov33_02256898(SysTask *param0, void *param1) { - UnkStruct_ov33_02256474 * v0 = ov25_0225523C(param1); + UnkStruct_ov33_02256474 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov33_02256584(param1); } -static void ov33_022568B4 (UnkStruct_ov33_02256474 * param0) +static void ov33_022568B4(UnkStruct_ov33_02256474 *param0) { int v0; @@ -364,15 +364,15 @@ static void ov33_022568B4 (UnkStruct_ov33_02256474 * param0) param0->unk_F0 = param0->unk_EC; } -static void ov33_022568F4 (UnkStruct_ov33_02256474 * param0, int param1) +static void ov33_022568F4(UnkStruct_ov33_02256474 *param0, int param1) { param0->unk_E4 = param1; param0->unk_E8 = 0; } -static void ov33_02256904 (SysTask * param0, void * param1) +static void ov33_02256904(SysTask *param0, void *param1) { - static void(*const v0[])(UnkStruct_ov33_02256474 *, const UnkStruct_ov33_02256474_1 *) = { + static void (*const v0[])(UnkStruct_ov33_02256474 *, const UnkStruct_ov33_02256474_1 *) = { ov33_02256A44, ov33_02256A64, ov33_02256AA8, @@ -380,8 +380,8 @@ static void ov33_02256904 (SysTask * param0, void * param1) ov33_02256B08 }; - UnkStruct_ov33_02256474 * v1 = param1; - const UnkStruct_ov33_02256474_1 * v2 = v1->unk_00; + UnkStruct_ov33_02256474 *v1 = param1; + const UnkStruct_ov33_02256474_1 *v2 = v1->unk_00; int v3; if (v2->unk_4C) { @@ -409,7 +409,7 @@ static void ov33_02256904 (SysTask * param0, void * param1) } } -static u32 ov33_022569C0 (UnkStruct_ov33_02256474 * param0) +static u32 ov33_022569C0(UnkStruct_ov33_02256474 *param0) { int v0; int v1, v2; @@ -428,7 +428,7 @@ static u32 ov33_022569C0 (UnkStruct_ov33_02256474 * param0) return param0->unk_00->unk_00; } -static BOOL ov33_02256A14 (u32 param0, u32 param1, u32 param2, const VecFx32 * param3) +static BOOL ov33_02256A14(u32 param0, u32 param1, u32 param2, const VecFx32 *param3) { int v0, v1; int v2; @@ -449,7 +449,7 @@ static BOOL ov33_02256A14 (u32 param0, u32 param1, u32 param2, const VecFx32 * p return 0; } -static void ov33_02256A44 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1) +static void ov33_02256A44(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1) { if (param1->unk_4E) { param0->unk_FC = param0->unk_F8; @@ -457,7 +457,7 @@ static void ov33_02256A44 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } } -static void ov33_02256A64 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1) +static void ov33_02256A64(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1) { if (param1->unk_4C) { param0->unk_E8++; @@ -474,14 +474,14 @@ static void ov33_02256A64 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } } -static void ov33_02256AA8 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1) +static void ov33_02256AA8(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1) { if (param1->unk_4C == 0) { ov33_022568F4(param0, 0); } } -static void ov33_02256ABC (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1) +static void ov33_02256ABC(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1) { if (param1->unk_4E == 0) { param0->unk_E8++; @@ -499,7 +499,7 @@ static void ov33_02256ABC (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } } -static void ov33_02256B08 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1) +static void ov33_02256B08(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1) { if (param0->unk_E8 == 0) { ov33_02256C08(param0); @@ -511,7 +511,7 @@ static void ov33_02256B08 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } } -static void ov33_02256B3C (const char * param0, ...) +static void ov33_02256B3C(const char *param0, ...) { if (gCoreSys.heldKeys & PAD_BUTTON_B) { va_list v0; @@ -520,9 +520,9 @@ static void ov33_02256B3C (const char * param0, ...) } } -static void ov33_02256B44 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1) +static void ov33_02256B44(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1) { - static void(*const v0[])(UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int) = { + static void (*const v0[])(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int) = { ov33_02256D34, ov33_02256E1C, ov33_02256F34, @@ -545,7 +545,7 @@ static void ov33_02256B44 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 ov33_02256B3C("------------\n"); } -static void ov33_02256BAC (UnkStruct_ov33_02256474 * param0, int param1, int param2) +static void ov33_02256BAC(UnkStruct_ov33_02256474 *param0, int param1, int param2) { switch (param0->unk_134[param1].unk_2C) { case 3: @@ -565,7 +565,7 @@ static void ov33_02256BAC (UnkStruct_ov33_02256474 * param0, int param1, int par } } -static void ov33_02256C08 (UnkStruct_ov33_02256474 * param0) +static void ov33_02256C08(UnkStruct_ov33_02256474 *param0) { int v0; @@ -577,12 +577,12 @@ static void ov33_02256C08 (UnkStruct_ov33_02256474 * param0) param0->unk_100 = param0->unk_00->unk_00; } -static BOOL ov33_02256C40 (UnkStruct_ov33_02256474 * param0) +static BOOL ov33_02256C40(UnkStruct_ov33_02256474 *param0) { return param0->unk_100 == 0; } -static void ov33_02256C54 (UnkStruct_ov33_02256474 * param0, int param1) +static void ov33_02256C54(UnkStruct_ov33_02256474 *param0, int param1) { if (param0->unk_00->unk_04[param1].unk_0A == 0) { ov25_0225591C(param0->unk_30, param0->unk_134[param1].unk_04, 0); @@ -591,19 +591,19 @@ static void ov33_02256C54 (UnkStruct_ov33_02256474 * param0, int param1) } } -static void ov33_02256C98 (UnkStruct_ov33_02256474 * param0, int param1) +static void ov33_02256C98(UnkStruct_ov33_02256474 *param0, int param1) { ov25_0225591C(param0->unk_30, param0->unk_134[param1].unk_04, 2); ov25_022558C4(param0->unk_134[param1].unk_04, 3); ov25_02255914(param0->unk_134[param1].unk_04, 0); } -static void ov33_02256CC4 (UnkStruct_ov33_02256474 * param0, int param1) +static void ov33_02256CC4(UnkStruct_ov33_02256474 *param0, int param1) { ov25_02255914(param0->unk_134[param1].unk_04, 1); } -static void ov33_02256CDC (fx32 param0, u32 param1, VecFx32 * param2) +static void ov33_02256CDC(fx32 param0, u32 param1, VecFx32 *param2) { fx32 v0 = VEC_Mag(param2); @@ -618,12 +618,12 @@ static void ov33_02256CDC (fx32 param0, u32 param1, VecFx32 * param2) } } -static BOOL ov33_02256D20 (const VecFx32 * param0) +static BOOL ov33_02256D20(const VecFx32 *param0) { return (param0->x == 0) && (param0->y == 0); } -static void ov33_02256D34 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2) +static void ov33_02256D34(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2) { ov33_02256B3C(" icon[%d] Default\n", param2); @@ -652,12 +652,12 @@ static void ov33_02256D34 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } } -static void ov33_02256E1C (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2) +static void ov33_02256E1C(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2) { ov33_02256B3C(" icon[%d] ReaLike\n", param2); if (param1->unk_4C && ov33_02256A14(param0->unk_280, param0->unk_284, 64, ¶m0->unk_134[param2].unk_14)) { - static const u8 v0 [] = { + static const u8 v0[] = { 100, 150, 175, 200 }; @@ -684,12 +684,12 @@ static void ov33_02256E1C (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } } -static void ov33_02256F34 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2) +static void ov33_02256F34(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2) { ov33_02256B3C(" icon[%d] ReaHate\n", param2); if (param1->unk_4C && ov33_02256A14(param0->unk_280, param0->unk_284, 64, ¶m0->unk_134[param2].unk_14)) { - static const u8 v0 [] = { + static const u8 v0[] = { 100, 150, 175, 200 }; VecFx32 v1; @@ -708,7 +708,7 @@ static void ov33_02256F34 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } } -static void ov33_02257010 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2) +static void ov33_02257010(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2) { ov33_02256B3C(" icon[%d] TcgLike\n", param2); @@ -741,7 +741,7 @@ static void ov33_02257010 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 ov33_02256BAC(param0, param2, 0); } -static void ov33_022570E8 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2) +static void ov33_022570E8(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2) { ov33_02256B3C(" icon[%d] TchHate\n", param2); @@ -766,9 +766,9 @@ static void ov33_022570E8 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 ov33_02256BAC(param0, param2, 0); } -static void ov33_0225718C (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1, int param2) +static void ov33_0225718C(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1, int param2) { - UnkStruct_ov33_02256474_sub1 * v0 = ¶m0->unk_134[param2]; + UnkStruct_ov33_02256474_sub1 *v0 = ¶m0->unk_134[param2]; ov33_02256B3C(" icon[%d] Reset!!\n", param2); @@ -808,7 +808,7 @@ static void ov33_0225718C (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } } -static void ov33_022572A0 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov33_02256474_1 * param1) +static void ov33_022572A0(UnkStruct_ov33_02256474 *param0, const UnkStruct_ov33_02256474_1 *param1) { VecFx32 v0; fx32 v1, v2; @@ -901,10 +901,9 @@ static void ov33_022572A0 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } switch (v6) { - case 1: - { + case 1: { if (param0->unk_134[v4].unk_2C == 3) { - VecFx32 * v17 = ¶m0->unk_134[v5].unk_08; + VecFx32 *v17 = ¶m0->unk_134[v5].unk_08; if (inline_ov33_022572A0(v17) || param0->unk_134[v5].unk_32) { VEC_Subtract(¶m0->unk_134[v5].unk_14, ¶m0->unk_134[v4].unk_14, &v0); @@ -928,7 +927,7 @@ static void ov33_022572A0 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 param0->unk_134[v5].unk_2F = 20; } else if (param0->unk_134[v5].unk_2C == 3) { - VecFx32 * v18 = ¶m0->unk_134[v4].unk_08; + VecFx32 *v18 = ¶m0->unk_134[v4].unk_08; if (inline_ov33_022572A0(v18) || param0->unk_134[v4].unk_32) { VEC_Subtract(¶m0->unk_134[v4].unk_14, ¶m0->unk_134[v5].unk_14, &v0); @@ -972,8 +971,7 @@ static void ov33_022572A0 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 (void)0; } } - } - break; + } break; case 2: case 3: param0->unk_134[v4].unk_08.x *= -1; @@ -1001,12 +999,12 @@ static void ov33_022572A0 (UnkStruct_ov33_02256474 * param0, const UnkStruct_ov3 } } -static inline BOOL inline_ov33_022572A0 (const VecFx32 * param0) +static inline BOOL inline_ov33_022572A0(const VecFx32 *param0) { return (param0->x == 0) && (param0->y == 0); } -static inline void inline_ov33_022572A0_1 (VecFx32 * param0) +static inline void inline_ov33_022572A0_1(VecFx32 *param0) { param0->x *= -1; param0->y *= -1; diff --git a/src/overlay034/ov34_022561C0.c b/src/overlay034/ov34_022561C0.c index e4c10a9269..527a081ac3 100644 --- a/src/overlay034/ov34_022561C0.c +++ b/src/overlay034/ov34_022561C0.c @@ -1,54 +1,54 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay034/struct_ov34_02256540_decl.h" - #include "struct_defs/struct_0203F478.h" + +#include "overlay025/poketch_system.h" +#include "overlay034/ov34_02256540.h" #include "overlay034/struct_ov34_02256540_1.h" +#include "overlay034/struct_ov34_02256540_decl.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "touch_screen.h" #include "unk_0203E880.h" -#include "overlay034/ov34_02256540.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov34_02256540_1 unk_04; - UnkStruct_ov34_02256540 * unk_48; + UnkStruct_ov34_02256540 *unk_48; PoketchSystem *poketchSys; - UnkStruct_0203F478 * unk_50; + UnkStruct_0203F478 *unk_50; } UnkStruct_ov34_0225621C; static void NitroStaticInit(void); -static BOOL ov34_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov34_0225621C(UnkStruct_ov34_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov34_02256244(UnkStruct_ov34_0225621C * param0); -static void ov34_02256260(SysTask * param0, void * param1); -static void ov34_02256294(void * param0); -static void ov34_0225629C(UnkStruct_ov34_0225621C * param0, u32 param1); -static BOOL ov34_022562B0(UnkStruct_ov34_0225621C * param0); -static BOOL ov34_022562F0(UnkStruct_ov34_0225621C * param0); -static BOOL ov34_022563E4(UnkStruct_ov34_0225621C * param0, u32 * param1, u32 * param2); -static void ov34_02256428(UnkStruct_ov34_0225621C * param0, int param1, int param2); -static void ov34_022564F0(int param0, int param1, int * param2, int * param3); -static BOOL ov34_0225650C(UnkStruct_ov34_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov34_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov34_0225621C(UnkStruct_ov34_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov34_02256244(UnkStruct_ov34_0225621C *param0); +static void ov34_02256260(SysTask *param0, void *param1); +static void ov34_02256294(void *param0); +static void ov34_0225629C(UnkStruct_ov34_0225621C *param0, u32 param1); +static BOOL ov34_022562B0(UnkStruct_ov34_0225621C *param0); +static BOOL ov34_022562F0(UnkStruct_ov34_0225621C *param0); +static BOOL ov34_022563E4(UnkStruct_ov34_0225621C *param0, u32 *param1, u32 *param2); +static void ov34_02256428(UnkStruct_ov34_0225621C *param0, int param1, int param2); +static void ov34_022564F0(int param0, int param1, int *param2, int *param3); +static BOOL ov34_0225650C(UnkStruct_ov34_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov34_022561D4, ov34_02256294); } -static BOOL ov34_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov34_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov34_0225621C * v0 = (UnkStruct_ov34_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_0225621C)); + UnkStruct_ov34_0225621C *v0 = (UnkStruct_ov34_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_0225621C)); if (v0 != NULL) { if (ov34_0225621C(v0, poketchSys, param2, param3)) { @@ -64,7 +64,7 @@ static BOOL ov34_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov34_0225621C (UnkStruct_ov34_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov34_0225621C(UnkStruct_ov34_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { if (ov34_02256540(&(param0->unk_48), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -79,7 +79,7 @@ static BOOL ov34_0225621C (UnkStruct_ov34_0225621C * param0, PoketchSystem *poke return 0; } -static void ov34_02256244 (UnkStruct_ov34_0225621C * param0) +static void ov34_02256244(UnkStruct_ov34_0225621C *param0) { if (param0->unk_50) { Heap_FreeToHeap(param0->unk_50); @@ -89,15 +89,15 @@ static void ov34_02256244 (UnkStruct_ov34_0225621C * param0) Heap_FreeToHeap(param0); } -static void ov34_02256260 (SysTask * param0, void * param1) +static void ov34_02256260(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov34_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov34_0225621C *) = { ov34_022562B0, ov34_022562F0, ov34_0225650C }; - UnkStruct_ov34_0225621C * v1 = (UnkStruct_ov34_0225621C *)param1; + UnkStruct_ov34_0225621C *v1 = (UnkStruct_ov34_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -109,12 +109,12 @@ static void ov34_02256260 (SysTask * param0, void * param1) } } -static void ov34_02256294 (void * param0) +static void ov34_02256294(void *param0) { ((UnkStruct_ov34_0225621C *)param0)->unk_02 = 1; } -static void ov34_0225629C (UnkStruct_ov34_0225621C * param0, u32 param1) +static void ov34_0225629C(UnkStruct_ov34_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -125,7 +125,7 @@ static void ov34_0225629C (UnkStruct_ov34_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov34_022562B0 (UnkStruct_ov34_0225621C * param0) +static BOOL ov34_022562B0(UnkStruct_ov34_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -143,7 +143,7 @@ static BOOL ov34_022562B0 (UnkStruct_ov34_0225621C * param0) return 0; } -static BOOL ov34_022562F0 (UnkStruct_ov34_0225621C * param0) +static BOOL ov34_022562F0(UnkStruct_ov34_0225621C *param0) { u32 v0, v1; @@ -198,7 +198,7 @@ static BOOL ov34_022562F0 (UnkStruct_ov34_0225621C * param0) return 0; } -static BOOL ov34_022563E4 (UnkStruct_ov34_0225621C * param0, u32 * param1, u32 * param2) +static BOOL ov34_022563E4(UnkStruct_ov34_0225621C *param0, u32 *param1, u32 *param2) { if (ov25_0225450C(param0->poketchSys) == 0) { if (TouchScreen_GetTapState(param1, param2)) { @@ -211,13 +211,15 @@ static BOOL ov34_022563E4 (UnkStruct_ov34_0225621C * param0, u32 * param1, u32 * return 0; } -static void ov34_02256428 (UnkStruct_ov34_0225621C * param0, int param1, int param2) +static void ov34_02256428(UnkStruct_ov34_0225621C *param0, int param1, int param2) { static const fx32 v0[] = { - 8 << FX32_SHIFT, 24 << FX32_SHIFT, 48 << FX32_SHIFT, + 8 << FX32_SHIFT, + 24 << FX32_SHIFT, + 48 << FX32_SHIFT, }; - UnkStruct_0203F478 * v1 = sub_0203F478(PoketchSystem_GetFieldSystem(param0->poketchSys), 8); - UnkStruct_ov34_02256540_1 * v2 = &(param0->unk_04); + UnkStruct_0203F478 *v1 = sub_0203F478(PoketchSystem_GetFieldSystem(param0->poketchSys), 8); + UnkStruct_ov34_02256540_1 *v2 = &(param0->unk_04); v2->unk_08 = 0; v2->unk_00 = param1; @@ -252,7 +254,7 @@ static void ov34_02256428 (UnkStruct_ov34_0225621C * param0, int param1, int par } } -static void ov34_022564F0 (int param0, int param1, int * param2, int * param3) +static void ov34_022564F0(int param0, int param1, int *param2, int *param3) { fx32 v0, v1; fx32 v2, v3; @@ -264,7 +266,7 @@ static void ov34_022564F0 (int param0, int param1, int * param2, int * param3) *param3 = 101 + (param1 * 11); } -static BOOL ov34_0225650C (UnkStruct_ov34_0225621C * param0) +static BOOL ov34_0225650C(UnkStruct_ov34_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay034/ov34_02256540.c b/src/overlay034/ov34_02256540.c index 71e5912910..b7fe405cb1 100644 --- a/src/overlay034/ov34_02256540.c +++ b/src/overlay034/ov34_02256540.c @@ -1,55 +1,56 @@ +#include "overlay034/ov34_02256540.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay034/struct_ov34_02256540_decl.h" -#include "sys_task_manager.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay034/struct_ov34_02256540_1.h" +#include "overlay034/struct_ov34_02256540_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay034/ov34_02256540.h" struct UnkStruct_ov34_02256540_t { - const UnkStruct_ov34_02256540_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov34_02256540_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; - UnkStruct_ov25_022555E8 * unk_30; - UnkStruct_ov25_022558C4 * unk_34; - UnkStruct_ov25_022558C4 * unk_38[8]; + UnkStruct_ov25_022555E8 *unk_30; + UnkStruct_ov25_022558C4 *unk_34; + UnkStruct_ov25_022558C4 *unk_38[8]; UnkStruct_ov25_02255958 unk_58; BOOL unk_6C; u16 unk_70[16]; }; -static BOOL ov34_02256588(UnkStruct_ov34_02256540 * param0); -static void ov34_0225667C(UnkStruct_ov25_02255224 * param0); -static void ov34_02256690(SysTask * param0, void * param1); -static void ov34_02256774(SysTask * param0, void * param1); -static void ov34_02256790(SysTask * param0, void * param1); -static void ov34_022567D4(SysTask * param0, void * param1); -static void ov34_0225684C(SysTask * param0, void * param1); -static void ov34_022568C0(SysTask * param0, void * param1); -static void ov34_02256974(UnkStruct_ov34_02256540 * param0, const UnkStruct_ov34_02256540_1 * param1); -static void ov34_022569A0(UnkStruct_ov34_02256540 * param0, const UnkStruct_ov34_02256540_1 * param1); -static BOOL ov34_022569DC(UnkStruct_ov34_02256540 * param0); -static void ov34_022569E8(UnkStruct_ov34_02256540 * param0); - -BOOL ov34_02256540 (UnkStruct_ov34_02256540 ** param0, const UnkStruct_ov34_02256540_1 * param1, BGL * param2) +static BOOL ov34_02256588(UnkStruct_ov34_02256540 *param0); +static void ov34_0225667C(UnkStruct_ov25_02255224 *param0); +static void ov34_02256690(SysTask *param0, void *param1); +static void ov34_02256774(SysTask *param0, void *param1); +static void ov34_02256790(SysTask *param0, void *param1); +static void ov34_022567D4(SysTask *param0, void *param1); +static void ov34_0225684C(SysTask *param0, void *param1); +static void ov34_022568C0(SysTask *param0, void *param1); +static void ov34_02256974(UnkStruct_ov34_02256540 *param0, const UnkStruct_ov34_02256540_1 *param1); +static void ov34_022569A0(UnkStruct_ov34_02256540 *param0, const UnkStruct_ov34_02256540_1 *param1); +static BOOL ov34_022569DC(UnkStruct_ov34_02256540 *param0); +static void ov34_022569E8(UnkStruct_ov34_02256540 *param0); + +BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_02256540_1 *param1, BGL *param2) { - UnkStruct_ov34_02256540 * v0 = (UnkStruct_ov34_02256540 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_02256540)); + UnkStruct_ov34_02256540 *v0 = (UnkStruct_ov34_02256540 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov34_02256540)); if (v0 != NULL) { int v1; @@ -73,13 +74,23 @@ BOOL ov34_02256540 (UnkStruct_ov34_02256540 ** param0, const UnkStruct_ov34_0225 return 0; } -static BOOL ov34_02256588 (UnkStruct_ov34_02256540 * param0) +static BOOL ov34_02256588(UnkStruct_ov34_02256540 *param0) { static const UnkStruct_ov25_02255810 v0 = { - {0, 0}, 0, 0, 2, 0, 1, + { 0, 0 }, + 0, + 0, + 2, + 0, + 1, }; static const UnkStruct_ov25_02255810 v1 = { - {0, 0}, 1, 0, 2, 1, 0, + { 0, 0 }, + 1, + 0, + 2, + 1, + 0, }; if (ov25_02255958(¶m0->unk_58, 12, 40, 41, 8)) { @@ -100,7 +111,7 @@ static BOOL ov34_02256588 (UnkStruct_ov34_02256540 * param0) return 0; } -void ov34_02256604 (UnkStruct_ov34_02256540 * param0) +void ov34_02256604(UnkStruct_ov34_02256540 *param0) { if (param0 != NULL) { int v0; @@ -121,34 +132,34 @@ void ov34_02256604 (UnkStruct_ov34_02256540 * param0) } static const UnkStruct_ov25_0225517C Unk_ov34_02256A7C[] = { - {0x0, ov34_02256690, 0x0}, - {0x1, ov34_02256774, 0x0}, - {0x2, ov34_02256790, sizeof(u32)}, - {0x0, NULL, 0x0} + { 0x0, ov34_02256690, 0x0 }, + { 0x1, ov34_02256774, 0x0 }, + { 0x2, ov34_02256790, sizeof(u32) }, + { 0x0, NULL, 0x0 } }; -void ov34_02256640 (UnkStruct_ov34_02256540 * param0, u32 param1) +void ov34_02256640(UnkStruct_ov34_02256540 *param0, u32 param1) { ov25_0225517C(Unk_ov34_02256A7C, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov34_02256664 (UnkStruct_ov34_02256540 * param0, u32 param1) +BOOL ov34_02256664(UnkStruct_ov34_02256540 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov34_02256670 (UnkStruct_ov34_02256540 * param0) +BOOL ov34_02256670(UnkStruct_ov34_02256540 *param0) { return ov25_02255154(param0->unk_08); } -static void ov34_0225667C (UnkStruct_ov25_02255224 * param0) +static void ov34_0225667C(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov34_02256540 * v0 = ov25_0225523C(param0); + UnkStruct_ov34_02256540 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov34_02256690 (SysTask * param0, void * param1) +static void ov34_02256690(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -166,9 +177,9 @@ static void ov34_02256690 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov34_02256540 * v2; - void * v3; - NNSG2dPaletteData * v4; + UnkStruct_ov34_02256540 *v2; + void *v3; + NNSG2dPaletteData *v4; v2 = ov25_0225523C(param1); @@ -199,24 +210,24 @@ static void ov34_02256690 (SysTask * param0, void * param1) ov34_0225667C(param1); } -static void ov34_02256774 (SysTask * param0, void * param1) +static void ov34_02256774(SysTask *param0, void *param1) { - UnkStruct_ov34_02256540 * v0 = ov25_0225523C(param1); + UnkStruct_ov34_02256540 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov34_0225667C(param1); } -static void ov34_02256790 (SysTask * param0, void * param1) +static void ov34_02256790(SysTask *param0, void *param1) { static const SysTaskFunc v0[] = { ov34_022567D4, ov34_0225684C, ov34_022568C0 }; - UnkStruct_ov34_02256540 * v1 = ov25_0225523C(param1); - const UnkStruct_ov34_02256540_1 * v2 = ov25_02255240(param1); - u32 * v3 = ov25_02255244(param1); + UnkStruct_ov34_02256540 *v1 = ov25_0225523C(param1); + const UnkStruct_ov34_02256540_1 *v2 = ov25_02255240(param1); + u32 *v3 = ov25_02255244(param1); if (ov25_02255248(param1) == 0) { v1->unk_6C = 1; @@ -226,10 +237,10 @@ static void ov34_02256790 (SysTask * param0, void * param1) v0[*v3](param0, param1); } -static void ov34_022567D4 (SysTask * param0, void * param1) +static void ov34_022567D4(SysTask *param0, void *param1) { - UnkStruct_ov34_02256540 * v0 = ov25_0225523C(param1); - const UnkStruct_ov34_02256540_1 * v1 = ov25_02255240(param1); + UnkStruct_ov34_02256540 *v0 = ov25_0225523C(param1); + const UnkStruct_ov34_02256540_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: @@ -253,10 +264,10 @@ static void ov34_022567D4 (SysTask * param0, void * param1) } } -static void ov34_0225684C (SysTask * param0, void * param1) +static void ov34_0225684C(SysTask *param0, void *param1) { - UnkStruct_ov34_02256540 * v0 = ov25_0225523C(param1); - const UnkStruct_ov34_02256540_1 * v1 = ov25_02255240(param1); + UnkStruct_ov34_02256540 *v0 = ov25_0225523C(param1); + const UnkStruct_ov34_02256540_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: @@ -279,10 +290,10 @@ static void ov34_0225684C (SysTask * param0, void * param1) } } -static void ov34_022568C0 (SysTask * param0, void * param1) +static void ov34_022568C0(SysTask *param0, void *param1) { - UnkStruct_ov34_02256540 * v0 = ov25_0225523C(param1); - const UnkStruct_ov34_02256540_1 * v1 = ov25_02255240(param1); + UnkStruct_ov34_02256540 *v0 = ov25_0225523C(param1); + const UnkStruct_ov34_02256540_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: @@ -319,7 +330,7 @@ static void ov34_022568C0 (SysTask * param0, void * param1) } } -static void ov34_02256974 (UnkStruct_ov34_02256540 * param0, const UnkStruct_ov34_02256540_1 * param1) +static void ov34_02256974(UnkStruct_ov34_02256540 *param0, const UnkStruct_ov34_02256540_1 *param1) { u32 v0; @@ -328,7 +339,7 @@ static void ov34_02256974 (UnkStruct_ov34_02256540 * param0, const UnkStruct_ov3 } } -static void ov34_022569A0 (UnkStruct_ov34_02256540 * param0, const UnkStruct_ov34_02256540_1 * param1) +static void ov34_022569A0(UnkStruct_ov34_02256540 *param0, const UnkStruct_ov34_02256540_1 *param1) { u32 v0, v1; @@ -344,12 +355,12 @@ static void ov34_022569A0 (UnkStruct_ov34_02256540 * param0, const UnkStruct_ov3 } } -static BOOL ov34_022569DC (UnkStruct_ov34_02256540 * param0) +static BOOL ov34_022569DC(UnkStruct_ov34_02256540 *param0) { return ov25_022558E0(param0->unk_38[0]); } -static void ov34_022569E8 (UnkStruct_ov34_02256540 * param0) +static void ov34_022569E8(UnkStruct_ov34_02256540 *param0) { int v0; @@ -360,7 +371,7 @@ static void ov34_022569E8 (UnkStruct_ov34_02256540 * param0) } } -void ov34_02256A0C (UnkStruct_ov34_02256540 * param0) +void ov34_02256A0C(UnkStruct_ov34_02256540 *param0) { ov34_022569E8(param0); param0->unk_6C = 0; diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c index b468c605c8..259f328156 100644 --- a/src/overlay035/ov35_022561C0.c +++ b/src/overlay035/ov35_022561C0.c @@ -1,20 +1,20 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay035/struct_ov35_02256410_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay035/ov35_02256410.h" #include "overlay035/struct_ov35_02256410_1.h" +#include "overlay035/struct_ov35_02256410_decl.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02099D44.h" -#include "overlay035/ov35_02256410.h" typedef struct { u8 unk_00; @@ -22,7 +22,7 @@ typedef struct { u8 unk_02; u32 unk_04; UnkStruct_ov35_02256410_1 unk_08; - UnkStruct_ov35_02256410 * unk_10; + UnkStruct_ov35_02256410 *unk_10; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u32 unk_1C; @@ -30,25 +30,25 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov35_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov35_0225621C(UnkStruct_ov35_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov35_02256284(u32 param0, u32 param1, u32 param2, void * param3); -static void ov35_0225628C(UnkStruct_ov35_0225621C * param0); -static void ov35_022562B0(SysTask * param0, void * param1); -static void ov35_022562EC(void * param0); -static void ov35_022562F4(UnkStruct_ov35_0225621C * param0, u32 param1); -static BOOL ov35_02256308(UnkStruct_ov35_0225621C * param0); -static BOOL ov35_02256348(UnkStruct_ov35_0225621C * param0); -static BOOL ov35_022563DC(UnkStruct_ov35_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov35_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov35_0225621C(UnkStruct_ov35_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov35_02256284(u32 param0, u32 param1, u32 param2, void *param3); +static void ov35_0225628C(UnkStruct_ov35_0225621C *param0); +static void ov35_022562B0(SysTask *param0, void *param1); +static void ov35_022562EC(void *param0); +static void ov35_022562F4(UnkStruct_ov35_0225621C *param0, u32 param1); +static BOOL ov35_02256308(UnkStruct_ov35_0225621C *param0); +static BOOL ov35_02256348(UnkStruct_ov35_0225621C *param0); +static BOOL ov35_022563DC(UnkStruct_ov35_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov35_022561D4, ov35_022562EC); } -static BOOL ov35_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov35_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov35_0225621C * v0 = (UnkStruct_ov35_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_0225621C)); + UnkStruct_ov35_0225621C *v0 = (UnkStruct_ov35_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_0225621C)); if (v0 != NULL) { if (ov35_0225621C(v0, poketchSys, param2, param3)) { @@ -64,15 +64,13 @@ static BOOL ov35_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov35_0225621C (UnkStruct_ov35_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov35_0225621C(UnkStruct_ov35_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { static const TouchScreenHitTable v0[] = { - { - 128 - (56 / 2), + { 128 - (56 / 2), 128 + (56 / 2), 114 - (64 / 2), - 114 + (64 / 2) - }, + 114 + (64 / 2) }, }; param0->unk_08.unk_04 = 1; @@ -97,16 +95,16 @@ static BOOL ov35_0225621C (UnkStruct_ov35_0225621C * param0, PoketchSystem *poke return 0; } -static void ov35_02256284 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov35_02256284(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov35_0225621C * v0 = (UnkStruct_ov35_0225621C *)param3; + UnkStruct_ov35_0225621C *v0 = (UnkStruct_ov35_0225621C *)param3; if (param0 == 0) { v0->unk_1C = param1; } } -static void ov35_0225628C (UnkStruct_ov35_0225621C * param0) +static void ov35_0225628C(UnkStruct_ov35_0225621C *param0) { sub_02099D54(param0->unk_04, (u8 *)(&(param0->unk_08.unk_00)), sizeof(u32)); PoketchButtonManager_Free(param0->buttonManager); @@ -114,13 +112,13 @@ static void ov35_0225628C (UnkStruct_ov35_0225621C * param0) Heap_FreeToHeap(param0); } -static void ov35_022562B0 (SysTask * param0, void * param1) +static void ov35_022562B0(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov35_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov35_0225621C *) = { ov35_02256308, ov35_02256348, ov35_022563DC }; - UnkStruct_ov35_0225621C * v1 = (UnkStruct_ov35_0225621C *)param1; + UnkStruct_ov35_0225621C *v1 = (UnkStruct_ov35_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -134,12 +132,12 @@ static void ov35_022562B0 (SysTask * param0, void * param1) } } -static void ov35_022562EC (void * param0) +static void ov35_022562EC(void *param0) { ((UnkStruct_ov35_0225621C *)param0)->unk_02 = 1; } -static void ov35_022562F4 (UnkStruct_ov35_0225621C * param0, u32 param1) +static void ov35_022562F4(UnkStruct_ov35_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -150,7 +148,7 @@ static void ov35_022562F4 (UnkStruct_ov35_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov35_02256308 (UnkStruct_ov35_0225621C * param0) +static BOOL ov35_02256308(UnkStruct_ov35_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -168,9 +166,9 @@ static BOOL ov35_02256308 (UnkStruct_ov35_0225621C * param0) return 0; } -static BOOL ov35_02256348 (UnkStruct_ov35_0225621C * param0) +static BOOL ov35_02256348(UnkStruct_ov35_0225621C *param0) { - UnkStruct_ov35_02256410_1 * v0 = &(param0->unk_08); + UnkStruct_ov35_02256410_1 *v0 = &(param0->unk_08); if (param0->unk_02) { ov35_022562F4(param0, 2); @@ -214,7 +212,7 @@ static BOOL ov35_02256348 (UnkStruct_ov35_0225621C * param0) return 0; } -static BOOL ov35_022563DC (UnkStruct_ov35_0225621C * param0) +static BOOL ov35_022563DC(UnkStruct_ov35_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay035/ov35_02256410.c b/src/overlay035/ov35_02256410.c index b81f1dc2d6..0c6fce5f6d 100644 --- a/src/overlay035/ov35_02256410.c +++ b/src/overlay035/ov35_02256410.c @@ -1,51 +1,52 @@ +#include "overlay035/ov35_02256410.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay035/struct_ov35_02256410_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay035/struct_ov35_02256410_1.h" +#include "overlay035/struct_ov35_02256410_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay035/ov35_02256410.h" struct UnkStruct_ov35_02256410_t { - const UnkStruct_ov35_02256410_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov35_02256410_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24; - UnkStruct_ov25_022558C4 * unk_28[4]; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24; + UnkStruct_ov25_022558C4 *unk_28[4]; UnkStruct_ov25_02255958 unk_38; UnkStruct_ov25_02255958 unk_4C; }; -static void ov35_02256460(UnkStruct_ov35_02256410 * param0, const UnkStruct_ov35_02256410_1 * param1); -static void ov35_02256514(UnkStruct_ov35_02256410 * param0); -static void ov35_02256584(UnkStruct_ov25_02255224 * param0); -static void ov35_02256598(SysTask * param0, void * param1); -static void ov35_02256628(SysTask * param0, void * param1); -static void ov35_02256644(SysTask * param0, void * param1); -static void ov35_02256684(SysTask * param0, void * param1); -static void ov35_022566A8(UnkStruct_ov35_02256410 * param0, const UnkStruct_ov35_02256410_1 * param1); +static void ov35_02256460(UnkStruct_ov35_02256410 *param0, const UnkStruct_ov35_02256410_1 *param1); +static void ov35_02256514(UnkStruct_ov35_02256410 *param0); +static void ov35_02256584(UnkStruct_ov25_02255224 *param0); +static void ov35_02256598(SysTask *param0, void *param1); +static void ov35_02256628(SysTask *param0, void *param1); +static void ov35_02256644(SysTask *param0, void *param1); +static void ov35_02256684(SysTask *param0, void *param1); +static void ov35_022566A8(UnkStruct_ov35_02256410 *param0, const UnkStruct_ov35_02256410_1 *param1); -BOOL ov35_02256410 (UnkStruct_ov35_02256410 ** param0, const UnkStruct_ov35_02256410_1 * param1, BGL * param2) +BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_02256410_1 *param1, BGL *param2) { - UnkStruct_ov35_02256410 * v0 = (UnkStruct_ov35_02256410 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_02256410)); + UnkStruct_ov35_02256410 *v0 = (UnkStruct_ov35_02256410 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov35_02256410)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -63,7 +64,7 @@ BOOL ov35_02256410 (UnkStruct_ov35_02256410 ** param0, const UnkStruct_ov35_0225 return 0; } -void ov35_0225644C (UnkStruct_ov35_02256410 * param0) +void ov35_0225644C(UnkStruct_ov35_02256410 *param0) { if (param0 != NULL) { ov35_02256514(param0); @@ -71,13 +72,23 @@ void ov35_0225644C (UnkStruct_ov35_02256410 * param0) } } -static void ov35_02256460 (UnkStruct_ov35_02256410 * param0, const UnkStruct_ov35_02256410_1 * param1) +static void ov35_02256460(UnkStruct_ov35_02256410 *param0, const UnkStruct_ov35_02256410_1 *param1) { static const UnkStruct_ov25_02255810 v0 = { - {(114 << FX32_SHIFT), (128 << FX32_SHIFT)}, 0, 0, 2, 0, 0, + { (114 << FX32_SHIFT), (128 << FX32_SHIFT) }, + 0, + 0, + 2, + 0, + 0, }; static const UnkStruct_ov25_02255810 v1 = { - {(0 << FX32_SHIFT), (0 << FX32_SHIFT)}, 0, 0, 2, 0, 0, + { (0 << FX32_SHIFT), (0 << FX32_SHIFT) }, + 0, + 0, + 2, + 0, + 0, }; int v2; @@ -99,7 +110,7 @@ static void ov35_02256460 (UnkStruct_ov35_02256410 * param0, const UnkStruct_ov3 ov35_022566A8(param0, param1); } -static void ov35_02256514 (UnkStruct_ov35_02256410 * param0) +static void ov35_02256514(UnkStruct_ov35_02256410 *param0) { int v0; @@ -114,36 +125,36 @@ static void ov35_02256514 (UnkStruct_ov35_02256410 * param0) } static const UnkStruct_ov25_0225517C Unk_ov35_0225676C[] = { - {0x0, ov35_02256598, 0x0}, - {0x1, ov35_02256628, 0x0}, - {0x2, ov35_02256644, 0x0}, - {0x3, ov35_02256684, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov35_02256598, 0x0 }, + { 0x1, ov35_02256628, 0x0 }, + { 0x2, ov35_02256644, 0x0 }, + { 0x3, ov35_02256684, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov35_02256548 (UnkStruct_ov35_02256410 * param0, u32 param1) +void ov35_02256548(UnkStruct_ov35_02256410 *param0, u32 param1) { ov25_0225517C(Unk_ov35_0225676C, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov35_0225656C (UnkStruct_ov35_02256410 * param0, u32 param1) +BOOL ov35_0225656C(UnkStruct_ov35_02256410 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov35_02256578 (UnkStruct_ov35_02256410 * param0) +BOOL ov35_02256578(UnkStruct_ov35_02256410 *param0) { return ov25_02255154(param0->unk_08); } -static void ov35_02256584 (UnkStruct_ov25_02255224 * param0) +static void ov35_02256584(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov35_02256410 * v0 = ov25_0225523C(param0); + UnkStruct_ov35_02256410 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov35_02256598 (SysTask * param0, void * param1) +static void ov35_02256598(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -161,9 +172,9 @@ static void ov35_02256598 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov35_02256410 * v2; - void * v3; - NNSG2dPaletteData * v4; + UnkStruct_ov35_02256410 *v2; + void *v3; + NNSG2dPaletteData *v4; v2 = ov25_0225523C(param1); @@ -180,17 +191,17 @@ static void ov35_02256598 (SysTask * param0, void * param1) ov35_02256584(param1); } -static void ov35_02256628 (SysTask * param0, void * param1) +static void ov35_02256628(SysTask *param0, void *param1) { - UnkStruct_ov35_02256410 * v0 = ov25_0225523C(param1); + UnkStruct_ov35_02256410 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov35_02256584(param1); } -static void ov35_02256644 (SysTask * param0, void * param1) +static void ov35_02256644(SysTask *param0, void *param1) { - UnkStruct_ov35_02256410 * v0 = ov25_0225523C(param1); + UnkStruct_ov35_02256410 *v0 = ov25_0225523C(param1); switch (v0->unk_00->unk_04) { case 0: @@ -205,16 +216,16 @@ static void ov35_02256644 (SysTask * param0, void * param1) ov35_02256584(param1); } -static void ov35_02256684 (SysTask * param0, void * param1) +static void ov35_02256684(SysTask *param0, void *param1) { - UnkStruct_ov35_02256410 * v0 = ov25_0225523C(param1); - const UnkStruct_ov35_02256410_1 * v1 = ov25_02255240(param1); + UnkStruct_ov35_02256410 *v0 = ov25_0225523C(param1); + const UnkStruct_ov35_02256410_1 *v1 = ov25_02255240(param1); ov35_022566A8(v0, v1); ov35_02256584(param1); } -static void ov35_022566A8 (UnkStruct_ov35_02256410 * param0, const UnkStruct_ov35_02256410_1 * param1) +static void ov35_022566A8(UnkStruct_ov35_02256410 *param0, const UnkStruct_ov35_02256410_1 *param1) { int v0; u32 v1, v2; diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index e2a412584d..c2fa36ce45 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/src/overlay036/ov36_022561C0.c @@ -1,25 +1,25 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" + #include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" #include "overlay036/poketch_app_pedometer.h" -#include "touch_screen.h" - -#include "sys_task.h" #include "heap.h" #include "poketch_data.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov36_02256404_1 unk_04; - UnkStruct_ov36_02256404 * unk_0C; + UnkStruct_ov36_02256404 *unk_0C; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u32 unk_18; @@ -28,25 +28,25 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov36_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov36_0225621C(UnkStruct_ov36_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov36_02256278(u32 param0, u32 param1, u32 param2, void * param3); -static void ov36_02256280(UnkStruct_ov36_0225621C * param0); -static void ov36_02256298(SysTask * param0, void * param1); -static void ov36_022562D4(void * param0); -static void ov36_022562DC(UnkStruct_ov36_0225621C * param0, u32 param1); -static BOOL ov36_022562F0(UnkStruct_ov36_0225621C * param0); -static BOOL ov36_02256330(UnkStruct_ov36_0225621C * param0); -static BOOL ov36_022563D0(UnkStruct_ov36_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov36_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov36_0225621C(UnkStruct_ov36_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov36_02256278(u32 param0, u32 param1, u32 param2, void *param3); +static void ov36_02256280(UnkStruct_ov36_0225621C *param0); +static void ov36_02256298(SysTask *param0, void *param1); +static void ov36_022562D4(void *param0); +static void ov36_022562DC(UnkStruct_ov36_0225621C *param0, u32 param1); +static BOOL ov36_022562F0(UnkStruct_ov36_0225621C *param0); +static BOOL ov36_02256330(UnkStruct_ov36_0225621C *param0); +static BOOL ov36_022563D0(UnkStruct_ov36_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov36_022561D4, ov36_022562D4); } -static BOOL ov36_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov36_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov36_0225621C * v0 = (UnkStruct_ov36_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_0225621C)); + UnkStruct_ov36_0225621C *v0 = (UnkStruct_ov36_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_0225621C)); if (v0 != NULL) { if (ov36_0225621C(v0, poketchSys, param2, param3)) { @@ -62,15 +62,13 @@ static BOOL ov36_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov36_0225621C (UnkStruct_ov36_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov36_0225621C(UnkStruct_ov36_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { static const TouchScreenHitTable v0[] = { - { - 128 - (56 / 2), + { 128 - (56 / 2), 128 + (56 / 2), 114 - (64 / 2), - 114 + (64 / 2) - }, + 114 + (64 / 2) }, }; param0->poketchSys = poketchSys; @@ -91,16 +89,16 @@ static BOOL ov36_0225621C (UnkStruct_ov36_0225621C * param0, PoketchSystem *poke return 0; } -static void ov36_02256278 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov36_02256278(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov36_0225621C * v0 = (UnkStruct_ov36_0225621C *)param3; + UnkStruct_ov36_0225621C *v0 = (UnkStruct_ov36_0225621C *)param3; if (param0 == 0) { v0->unk_18 = param1; } } -static void ov36_02256280 (UnkStruct_ov36_0225621C * param0) +static void ov36_02256280(UnkStruct_ov36_0225621C *param0) { PoketchButtonManager_Free(param0->buttonManager); ov36_02256440(param0->unk_0C); @@ -108,15 +106,15 @@ static void ov36_02256280 (UnkStruct_ov36_0225621C * param0) Heap_FreeToHeap(param0); } -static void ov36_02256298 (SysTask * param0, void * param1) +static void ov36_02256298(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov36_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov36_0225621C *) = { ov36_022562F0, ov36_02256330, ov36_022563D0 }; - UnkStruct_ov36_0225621C * v1 = (UnkStruct_ov36_0225621C *)param1; + UnkStruct_ov36_0225621C *v1 = (UnkStruct_ov36_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -130,12 +128,12 @@ static void ov36_02256298 (SysTask * param0, void * param1) } } -static void ov36_022562D4 (void * param0) +static void ov36_022562D4(void *param0) { ((UnkStruct_ov36_0225621C *)param0)->unk_02 = 1; } -static void ov36_022562DC (UnkStruct_ov36_0225621C * param0, u32 param1) +static void ov36_022562DC(UnkStruct_ov36_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -146,7 +144,7 @@ static void ov36_022562DC (UnkStruct_ov36_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov36_022562F0 (UnkStruct_ov36_0225621C * param0) +static BOOL ov36_022562F0(UnkStruct_ov36_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -164,9 +162,9 @@ static BOOL ov36_022562F0 (UnkStruct_ov36_0225621C * param0) return 0; } -static BOOL ov36_02256330 (UnkStruct_ov36_0225621C * param0) +static BOOL ov36_02256330(UnkStruct_ov36_0225621C *param0) { - UnkStruct_ov36_02256404_1 * v0 = &(param0->unk_04); + UnkStruct_ov36_02256404_1 *v0 = &(param0->unk_04); if (param0->unk_02) { ov36_022562DC(param0, 2); @@ -220,7 +218,7 @@ static BOOL ov36_02256330 (UnkStruct_ov36_0225621C * param0) return 0; } -static BOOL ov36_022563D0 (UnkStruct_ov36_0225621C * param0) +static BOOL ov36_022563D0(UnkStruct_ov36_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay036/ov36_02256404.c b/src/overlay036/ov36_02256404.c index f4b47bf1db..7f05502037 100644 --- a/src/overlay036/ov36_02256404.c +++ b/src/overlay036/ov36_02256404.c @@ -2,48 +2,48 @@ #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay036/poketch_app_pedometer.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" +#include "overlay036/poketch_app_pedometer.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" struct UnkStruct_ov36_02256404_t { - const UnkStruct_ov36_02256404_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov36_02256404_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24; - UnkStruct_ov25_022558C4 * unk_28[5]; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24; + UnkStruct_ov25_022558C4 *unk_28[5]; UnkStruct_ov25_02255958 unk_3C; UnkStruct_ov25_02255958 unk_50; }; -static void ov36_02256454(UnkStruct_ov36_02256404 * param0, const UnkStruct_ov36_02256404_1 * param1); -static void ov36_02256508(UnkStruct_ov36_02256404 * param0); -static void ov36_02256578(UnkStruct_ov25_02255224 * param0); -static void ov36_0225658C(SysTask * param0, void * param1); -static void ov36_0225661C(SysTask * param0, void * param1); -static void ov36_02256638(SysTask * param0, void * param1); -static void ov36_02256678(SysTask * param0, void * param1); -static void ov36_0225669C(UnkStruct_ov36_02256404 * param0, const UnkStruct_ov36_02256404_1 * param1); +static void ov36_02256454(UnkStruct_ov36_02256404 *param0, const UnkStruct_ov36_02256404_1 *param1); +static void ov36_02256508(UnkStruct_ov36_02256404 *param0); +static void ov36_02256578(UnkStruct_ov25_02255224 *param0); +static void ov36_0225658C(SysTask *param0, void *param1); +static void ov36_0225661C(SysTask *param0, void *param1); +static void ov36_02256638(SysTask *param0, void *param1); +static void ov36_02256678(SysTask *param0, void *param1); +static void ov36_0225669C(UnkStruct_ov36_02256404 *param0, const UnkStruct_ov36_02256404_1 *param1); -BOOL ov36_02256404 (UnkStruct_ov36_02256404 ** param0, const UnkStruct_ov36_02256404_1 * param1, BGL * param2) +BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_02256404_1 *param1, BGL *param2) { - UnkStruct_ov36_02256404 * v0 = (UnkStruct_ov36_02256404 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_02256404)); + UnkStruct_ov36_02256404 *v0 = (UnkStruct_ov36_02256404 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov36_02256404)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -59,7 +59,7 @@ BOOL ov36_02256404 (UnkStruct_ov36_02256404 ** param0, const UnkStruct_ov36_0225 return 0; } -void ov36_02256440 (UnkStruct_ov36_02256404 * param0) +void ov36_02256440(UnkStruct_ov36_02256404 *param0) { if (param0 != NULL) { ov36_02256508(param0); @@ -67,10 +67,10 @@ void ov36_02256440 (UnkStruct_ov36_02256404 * param0) } } -static void ov36_02256454 (UnkStruct_ov36_02256404 * param0, const UnkStruct_ov36_02256404_1 * param1) +static void ov36_02256454(UnkStruct_ov36_02256404 *param0, const UnkStruct_ov36_02256404_1 *param1) { static const UnkStruct_ov25_02255810 v0 = { - {(114 << FX32_SHIFT), (128 << FX32_SHIFT)}, + { (114 << FX32_SHIFT), (128 << FX32_SHIFT) }, 0, 0, 2, @@ -78,7 +78,7 @@ static void ov36_02256454 (UnkStruct_ov36_02256404 * param0, const UnkStruct_ov3 0 }; static const UnkStruct_ov25_02255810 v1 = { - {(0 << FX32_SHIFT), (0 << FX32_SHIFT)}, + { (0 << FX32_SHIFT), (0 << FX32_SHIFT) }, 0, 0, 2, @@ -104,7 +104,7 @@ static void ov36_02256454 (UnkStruct_ov36_02256404 * param0, const UnkStruct_ov3 ov36_0225669C(param0, param1); } -static void ov36_02256508 (UnkStruct_ov36_02256404 * param0) +static void ov36_02256508(UnkStruct_ov36_02256404 *param0) { int v0; @@ -119,35 +119,35 @@ static void ov36_02256508 (UnkStruct_ov36_02256404 * param0) } static const UnkStruct_ov25_0225517C Unk_ov36_02256764[] = { - {0x0, ov36_0225658C, 0x0}, - {0x1, ov36_0225661C, 0x0}, - {0x2, ov36_02256638, 0x0}, - {0x3, ov36_02256678, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov36_0225658C, 0x0 }, + { 0x1, ov36_0225661C, 0x0 }, + { 0x2, ov36_02256638, 0x0 }, + { 0x3, ov36_02256678, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov36_0225653C (UnkStruct_ov36_02256404 * param0, u32 param1) +void ov36_0225653C(UnkStruct_ov36_02256404 *param0, u32 param1) { ov25_0225517C(Unk_ov36_02256764, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov36_02256560 (UnkStruct_ov36_02256404 * param0, u32 param1) +BOOL ov36_02256560(UnkStruct_ov36_02256404 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov36_0225656C (UnkStruct_ov36_02256404 * param0) +BOOL ov36_0225656C(UnkStruct_ov36_02256404 *param0) { return ov25_02255154(param0->unk_08); } -static void ov36_02256578 (UnkStruct_ov25_02255224 * param0) +static void ov36_02256578(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov36_02256404 * v0 = ov25_0225523C(param0); + UnkStruct_ov36_02256404 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov36_0225658C (SysTask * param0, void * param1) +static void ov36_0225658C(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -165,9 +165,9 @@ static void ov36_0225658C (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov36_02256404 * v2; - void * v3; - NNSG2dPaletteData * v4; + UnkStruct_ov36_02256404 *v2; + void *v3; + NNSG2dPaletteData *v4; v2 = ov25_0225523C(param1); @@ -184,17 +184,17 @@ static void ov36_0225658C (SysTask * param0, void * param1) ov36_02256578(param1); } -static void ov36_0225661C (SysTask * param0, void * param1) +static void ov36_0225661C(SysTask *param0, void *param1) { - UnkStruct_ov36_02256404 * v0 = ov25_0225523C(param1); + UnkStruct_ov36_02256404 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov36_02256578(param1); } -static void ov36_02256638 (SysTask * param0, void * param1) +static void ov36_02256638(SysTask *param0, void *param1) { - UnkStruct_ov36_02256404 * v0 = ov25_0225523C(param1); + UnkStruct_ov36_02256404 *v0 = ov25_0225523C(param1); switch (v0->unk_00->unk_04) { case 0: @@ -209,16 +209,16 @@ static void ov36_02256638 (SysTask * param0, void * param1) ov36_02256578(param1); } -static void ov36_02256678 (SysTask * param0, void * param1) +static void ov36_02256678(SysTask *param0, void *param1) { - UnkStruct_ov36_02256404 * v0 = ov25_0225523C(param1); - const UnkStruct_ov36_02256404_1 * v1 = ov25_02255240(param1); + UnkStruct_ov36_02256404 *v0 = ov25_0225523C(param1); + const UnkStruct_ov36_02256404_1 *v1 = ov25_02255240(param1); ov36_0225669C(v0, v1); ov36_02256578(param1); } -static void ov36_0225669C (UnkStruct_ov36_02256404 * param0, const UnkStruct_ov36_02256404_1 * param1) +static void ov36_0225669C(UnkStruct_ov36_02256404 *param0, const UnkStruct_ov36_02256404_1 *param1) { int v0; u32 v1, v2; diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c index e28734ab4b..1e3ea32811 100644 --- a/src/overlay037/ov37_022561C0.c +++ b/src/overlay037/ov37_022561C0.c @@ -1,26 +1,26 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay037/struct_ov37_022563D4_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay037/ov37_022563D4.h" #include "overlay037/struct_ov37_022563D4_1.h" +#include "overlay037/struct_ov37_022563D4_decl.h" -#include "sys_task.h" #include "heap.h" -#include "overlay037/ov37_022563D4.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov37_022563D4_1 unk_04; - UnkStruct_ov37_022563D4 * unk_08; + UnkStruct_ov37_022563D4 *unk_08; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u32 unk_14; @@ -29,25 +29,25 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov37_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov37_0225621C(UnkStruct_ov37_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov37_02256280(UnkStruct_ov37_0225621C * param0); -static void ov37_02256298(u32 param0, u32 param1, u32 param2, void * param3); -static void ov37_022562A0(SysTask * param0, void * param1); -static void ov37_022562DC(void * param0); -static void ov37_022562E4(UnkStruct_ov37_0225621C * param0, u32 param1); -static BOOL ov37_022562F8(UnkStruct_ov37_0225621C * param0); -static BOOL ov37_02256338(UnkStruct_ov37_0225621C * param0); -static BOOL ov37_022563A0(UnkStruct_ov37_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov37_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov37_0225621C(UnkStruct_ov37_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov37_02256280(UnkStruct_ov37_0225621C *param0); +static void ov37_02256298(u32 param0, u32 param1, u32 param2, void *param3); +static void ov37_022562A0(SysTask *param0, void *param1); +static void ov37_022562DC(void *param0); +static void ov37_022562E4(UnkStruct_ov37_0225621C *param0, u32 param1); +static BOOL ov37_022562F8(UnkStruct_ov37_0225621C *param0); +static BOOL ov37_02256338(UnkStruct_ov37_0225621C *param0); +static BOOL ov37_022563A0(UnkStruct_ov37_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov37_022561D4, ov37_022562DC); } -static BOOL ov37_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov37_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov37_0225621C * v0 = (UnkStruct_ov37_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_0225621C)); + UnkStruct_ov37_0225621C *v0 = (UnkStruct_ov37_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_0225621C)); if (v0 != NULL) { if (ov37_0225621C(v0, poketchSys, param2, param3)) { @@ -63,11 +63,11 @@ static BOOL ov37_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov37_0225621C(UnkStruct_ov37_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { static const TouchScreenHitTable v0[] = { - {72, 104, 92, 132}, - {104, 136, 92, 132}, + { 72, 104, 92, 132 }, + { 104, 136, 92, 132 }, }; PMBackLightSwitch v1; @@ -88,30 +88,30 @@ static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, PoketchSystem *poke return 0; } -static void ov37_02256280 (UnkStruct_ov37_0225621C * param0) +static void ov37_02256280(UnkStruct_ov37_0225621C *param0) { PoketchButtonManager_Free(param0->buttonManager); ov37_02256410(param0->unk_08); Heap_FreeToHeap(param0); } -static void ov37_02256298 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov37_02256298(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov37_0225621C * v0 = (UnkStruct_ov37_0225621C *)param3; + UnkStruct_ov37_0225621C *v0 = (UnkStruct_ov37_0225621C *)param3; v0->unk_18 = param0; v0->unk_14 = param1; } -static void ov37_022562A0 (SysTask * param0, void * param1) +static void ov37_022562A0(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov37_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov37_0225621C *) = { ov37_022562F8, ov37_02256338, ov37_022563A0 }; - UnkStruct_ov37_0225621C * v1 = (UnkStruct_ov37_0225621C *)param1; + UnkStruct_ov37_0225621C *v1 = (UnkStruct_ov37_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -125,12 +125,12 @@ static void ov37_022562A0 (SysTask * param0, void * param1) } } -static void ov37_022562DC (void * param0) +static void ov37_022562DC(void *param0) { ((UnkStruct_ov37_0225621C *)param0)->unk_02 = 1; } -static void ov37_022562E4 (UnkStruct_ov37_0225621C * param0, u32 param1) +static void ov37_022562E4(UnkStruct_ov37_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -141,7 +141,7 @@ static void ov37_022562E4 (UnkStruct_ov37_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov37_022562F8 (UnkStruct_ov37_0225621C * param0) +static BOOL ov37_022562F8(UnkStruct_ov37_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -159,9 +159,9 @@ static BOOL ov37_022562F8 (UnkStruct_ov37_0225621C * param0) return 0; } -static BOOL ov37_02256338 (UnkStruct_ov37_0225621C * param0) +static BOOL ov37_02256338(UnkStruct_ov37_0225621C *param0) { - UnkStruct_ov37_022563D4_1 * v0 = &(param0->unk_04); + UnkStruct_ov37_022563D4_1 *v0 = &(param0->unk_04); if (param0->unk_02) { ov37_022562E4(param0, 2); @@ -190,7 +190,7 @@ static BOOL ov37_02256338 (UnkStruct_ov37_0225621C * param0) return 0; } -static BOOL ov37_022563A0 (UnkStruct_ov37_0225621C * param0) +static BOOL ov37_022563A0(UnkStruct_ov37_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay037/ov37_022563D4.c b/src/overlay037/ov37_022563D4.c index bb12b75629..c6adbb4bf7 100644 --- a/src/overlay037/ov37_022563D4.c +++ b/src/overlay037/ov37_022563D4.c @@ -1,47 +1,48 @@ +#include "overlay037/ov37_022563D4.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay037/struct_ov37_022563D4_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay037/struct_ov37_022563D4_1.h" +#include "overlay037/struct_ov37_022563D4_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay037/ov37_022563D4.h" struct UnkStruct_ov37_022563D4_t { - const UnkStruct_ov37_022563D4_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov37_022563D4_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24; UnkStruct_ov25_02255958 unk_28; }; -static void ov37_0225641C(UnkStruct_ov37_022563D4 * param0, const UnkStruct_ov37_022563D4_1 * param1); -static void ov37_02256470(UnkStruct_ov37_022563D4 * param0); -static void ov37_022564C4(UnkStruct_ov25_02255224 * param0); -static void ov37_022564D8(SysTask * param0, void * param1); -static void ov37_02256568(SysTask * param0, void * param1); -static void ov37_02256588(SysTask * param0, void * param1); +static void ov37_0225641C(UnkStruct_ov37_022563D4 *param0, const UnkStruct_ov37_022563D4_1 *param1); +static void ov37_02256470(UnkStruct_ov37_022563D4 *param0); +static void ov37_022564C4(UnkStruct_ov25_02255224 *param0); +static void ov37_022564D8(SysTask *param0, void *param1); +static void ov37_02256568(SysTask *param0, void *param1); +static void ov37_02256588(SysTask *param0, void *param1); -BOOL ov37_022563D4 (UnkStruct_ov37_022563D4 ** param0, const UnkStruct_ov37_022563D4_1 * param1, BGL * param2) +BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563D4_1 *param1, BGL *param2) { - UnkStruct_ov37_022563D4 * v0 = (UnkStruct_ov37_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_022563D4)); + UnkStruct_ov37_022563D4 *v0 = (UnkStruct_ov37_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov37_022563D4)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -57,17 +58,17 @@ BOOL ov37_022563D4 (UnkStruct_ov37_022563D4 ** param0, const UnkStruct_ov37_0225 return 0; } -void ov37_02256410 (UnkStruct_ov37_022563D4 * param0) +void ov37_02256410(UnkStruct_ov37_022563D4 *param0) { if (param0 != NULL) { Heap_FreeToHeap(param0); } } -static void ov37_0225641C (UnkStruct_ov37_022563D4 * param0, const UnkStruct_ov37_022563D4_1 * param1) +static void ov37_0225641C(UnkStruct_ov37_022563D4 *param0, const UnkStruct_ov37_022563D4_1 *param1) { static const UnkStruct_ov25_02255810 v0 = { - {(112 << FX32_SHIFT), (104 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (104 << FX32_SHIFT) }, 0, 0, 2, @@ -86,42 +87,42 @@ static void ov37_0225641C (UnkStruct_ov37_022563D4 * param0, const UnkStruct_ov3 } } -static void ov37_02256470 (UnkStruct_ov37_022563D4 * param0) +static void ov37_02256470(UnkStruct_ov37_022563D4 *param0) { ov25_022558B0(param0->unk_20, param0->unk_24); ov25_022559B0(&(param0->unk_28)); } static const UnkStruct_ov25_0225517C Unk_ov37_02256614[] = { - {0x0, ov37_022564D8, 0x0}, - {0x1, ov37_02256568, 0x0}, - {0x2, ov37_02256588, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov37_022564D8, 0x0 }, + { 0x1, ov37_02256568, 0x0 }, + { 0x2, ov37_02256588, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov37_02256488 (UnkStruct_ov37_022563D4 * param0, u32 param1) +void ov37_02256488(UnkStruct_ov37_022563D4 *param0, u32 param1) { ov25_0225517C(Unk_ov37_02256614, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov37_022564AC (UnkStruct_ov37_022563D4 * param0, u32 param1) +BOOL ov37_022564AC(UnkStruct_ov37_022563D4 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov37_022564B8 (UnkStruct_ov37_022563D4 * param0) +BOOL ov37_022564B8(UnkStruct_ov37_022563D4 *param0) { return ov25_02255154(param0->unk_08); } -static void ov37_022564C4 (UnkStruct_ov25_02255224 * param0) +static void ov37_022564C4(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov37_022563D4 * v0 = ov25_0225523C(param0); + UnkStruct_ov37_022563D4 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov37_022564D8 (SysTask * param0, void * param1) +static void ov37_022564D8(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -139,9 +140,9 @@ static void ov37_022564D8 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov37_022563D4 * v2; - void * v3; - NNSG2dPaletteData * v4; + UnkStruct_ov37_022563D4 *v2; + void *v3; + NNSG2dPaletteData *v4; v2 = ov25_0225523C(param1); @@ -158,19 +159,19 @@ static void ov37_022564D8 (SysTask * param0, void * param1) ov37_022564C4(param1); } -static void ov37_02256568 (SysTask * param0, void * param1) +static void ov37_02256568(SysTask *param0, void *param1) { - UnkStruct_ov37_022563D4 * v0 = ov25_0225523C(param1); + UnkStruct_ov37_022563D4 *v0 = ov25_0225523C(param1); ov37_02256470(v0); sub_02019044(v0->unk_04, 6); ov37_022564C4(param1); } -static void ov37_02256588 (SysTask * param0, void * param1) +static void ov37_02256588(SysTask *param0, void *param1) { - UnkStruct_ov37_022563D4 * v0 = ov25_0225523C(param1); - const UnkStruct_ov37_022563D4_1 * v1 = ov25_02255240(param1); + UnkStruct_ov37_022563D4 *v0 = ov25_0225523C(param1); + const UnkStruct_ov37_022563D4_1 *v1 = ov25_02255240(param1); PoketchSystem_PlaySoundEffect(1635); diff --git a/src/overlay038/ov38_022561C0.c b/src/overlay038/ov38_022561C0.c index de8673929c..db62fe2a93 100644 --- a/src/overlay038/ov38_022561C0.c +++ b/src/overlay038/ov38_022561C0.c @@ -1,47 +1,47 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay038/struct_ov38_0225632C_decl.h" +#include "overlay025/poketch_system.h" +#include "overlay038/ov38_0225632C.h" #include "overlay038/struct_ov38_0225632C_1.h" +#include "overlay038/struct_ov38_0225632C_decl.h" -#include "sys_task.h" #include "heap.h" -#include "overlay038/ov38_0225632C.h" +#include "sys_task.h" +#include "sys_task_manager.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov38_0225632C_1 unk_04; - UnkStruct_ov38_0225632C * unk_08; + UnkStruct_ov38_0225632C *unk_08; PoketchSystem *poketchSys; } UnkStruct_ov38_0225621C; static void NitroStaticInit(void); -static BOOL ov38_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov38_02256254(SysTask * param0, void * param1); -static void ov38_02256288(void * param0); -static BOOL ov38_0225621C(UnkStruct_ov38_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov38_02256240(UnkStruct_ov38_0225621C * param0); -static void ov38_02256290(UnkStruct_ov38_0225621C * param0, u32 param1); -static BOOL ov38_022562A4(UnkStruct_ov38_0225621C * param0); -static BOOL ov38_022562E4(UnkStruct_ov38_0225621C * param0); -static BOOL ov38_022562F8(UnkStruct_ov38_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov38_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov38_02256254(SysTask *param0, void *param1); +static void ov38_02256288(void *param0); +static BOOL ov38_0225621C(UnkStruct_ov38_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov38_02256240(UnkStruct_ov38_0225621C *param0); +static void ov38_02256290(UnkStruct_ov38_0225621C *param0, u32 param1); +static BOOL ov38_022562A4(UnkStruct_ov38_0225621C *param0); +static BOOL ov38_022562E4(UnkStruct_ov38_0225621C *param0); +static BOOL ov38_022562F8(UnkStruct_ov38_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov38_022561D4, ov38_02256288); } -static BOOL ov38_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov38_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov38_0225621C * v0 = (UnkStruct_ov38_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225621C)); + UnkStruct_ov38_0225621C *v0 = (UnkStruct_ov38_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225621C)); if (v0 != NULL) { if (ov38_0225621C(v0, poketchSys, param2, param3)) { @@ -57,7 +57,7 @@ static BOOL ov38_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov38_0225621C (UnkStruct_ov38_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov38_0225621C(UnkStruct_ov38_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { if (ov38_0225632C(&(param0->unk_08), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -71,21 +71,21 @@ static BOOL ov38_0225621C (UnkStruct_ov38_0225621C * param0, PoketchSystem *poke return 0; } -static void ov38_02256240 (UnkStruct_ov38_0225621C * param0) +static void ov38_02256240(UnkStruct_ov38_0225621C *param0) { ov38_0225635C(param0->unk_08); Heap_FreeToHeap(param0); } -static void ov38_02256254 (SysTask * param0, void * param1) +static void ov38_02256254(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov38_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov38_0225621C *) = { ov38_022562A4, ov38_022562E4, ov38_022562F8 }; - UnkStruct_ov38_0225621C * v1 = (UnkStruct_ov38_0225621C *)param1; + UnkStruct_ov38_0225621C *v1 = (UnkStruct_ov38_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -97,12 +97,12 @@ static void ov38_02256254 (SysTask * param0, void * param1) } } -static void ov38_02256288 (void * param0) +static void ov38_02256288(void *param0) { ((UnkStruct_ov38_0225621C *)param0)->unk_02 = 1; } -static void ov38_02256290 (UnkStruct_ov38_0225621C * param0, u32 param1) +static void ov38_02256290(UnkStruct_ov38_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -113,7 +113,7 @@ static void ov38_02256290 (UnkStruct_ov38_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov38_022562A4 (UnkStruct_ov38_0225621C * param0) +static BOOL ov38_022562A4(UnkStruct_ov38_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -131,7 +131,7 @@ static BOOL ov38_022562A4 (UnkStruct_ov38_0225621C * param0) return 0; } -static BOOL ov38_022562E4 (UnkStruct_ov38_0225621C * param0) +static BOOL ov38_022562E4(UnkStruct_ov38_0225621C *param0) { if (param0->unk_02) { ov38_02256290(param0, 2); @@ -140,7 +140,7 @@ static BOOL ov38_022562E4 (UnkStruct_ov38_0225621C * param0) return 0; } -static BOOL ov38_022562F8 (UnkStruct_ov38_0225621C * param0) +static BOOL ov38_022562F8(UnkStruct_ov38_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay038/ov38_0225632C.c b/src/overlay038/ov38_0225632C.c index e193c65ec7..fce4f164fd 100644 --- a/src/overlay038/ov38_0225632C.c +++ b/src/overlay038/ov38_0225632C.c @@ -1,35 +1,36 @@ +#include "overlay038/ov38_0225632C.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay038/struct_ov38_0225632C_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" #include "overlay038/struct_ov38_0225632C_1.h" +#include "overlay038/struct_ov38_0225632C_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay038/ov38_0225632C.h" struct UnkStruct_ov38_0225632C_t { - const UnkStruct_ov38_0225632C_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov38_0225632C_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; }; -static void ov38_022563A4(UnkStruct_ov25_02255224 * param0); -static void ov38_022563B8(SysTask * param0, void * param1); -static void ov38_02256458(SysTask * param0, void * param1); +static void ov38_022563A4(UnkStruct_ov25_02255224 *param0); +static void ov38_022563B8(SysTask *param0, void *param1); +static void ov38_02256458(SysTask *param0, void *param1); -BOOL ov38_0225632C (UnkStruct_ov38_0225632C ** param0, const UnkStruct_ov38_0225632C_1 * param1, BGL * param2) +BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_0225632C_1 *param1, BGL *param2) { - UnkStruct_ov38_0225632C * v0 = (UnkStruct_ov38_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225632C)); + UnkStruct_ov38_0225632C *v0 = (UnkStruct_ov38_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov38_0225632C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); @@ -46,7 +47,7 @@ BOOL ov38_0225632C (UnkStruct_ov38_0225632C ** param0, const UnkStruct_ov38_0225 return 0; } -void ov38_0225635C (UnkStruct_ov38_0225632C * param0) +void ov38_0225635C(UnkStruct_ov38_0225632C *param0) { if (param0 != NULL) { Heap_FreeToHeap(param0); @@ -54,33 +55,33 @@ void ov38_0225635C (UnkStruct_ov38_0225632C * param0) } static const UnkStruct_ov25_0225517C Unk_ov38_0225649C[] = { - {0x0, ov38_022563B8, 0x0}, - {0x1, ov38_02256458, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov38_022563B8, 0x0 }, + { 0x1, ov38_02256458, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov38_02256368 (UnkStruct_ov38_0225632C * param0, u32 param1) +void ov38_02256368(UnkStruct_ov38_0225632C *param0, u32 param1) { ov25_0225517C(Unk_ov38_0225649C, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov38_0225638C (UnkStruct_ov38_0225632C * param0, u32 param1) +BOOL ov38_0225638C(UnkStruct_ov38_0225632C *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov38_02256398 (UnkStruct_ov38_0225632C * param0) +BOOL ov38_02256398(UnkStruct_ov38_0225632C *param0) { return ov25_02255154(param0->unk_08); } -static void ov38_022563A4 (UnkStruct_ov25_02255224 * param0) +static void ov38_022563A4(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov38_0225632C * v0 = ov25_0225523C(param0); + UnkStruct_ov38_0225632C *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov38_022563B8 (SysTask * param0, void * param1) +static void ov38_022563B8(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -98,7 +99,7 @@ static void ov38_022563B8 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov38_0225632C * v2; + UnkStruct_ov38_0225632C *v2; v2 = ov25_0225523C(param1); @@ -116,9 +117,9 @@ static void ov38_022563B8 (SysTask * param0, void * param1) ov38_022563A4(param1); } -static void ov38_02256458 (SysTask * param0, void * param1) +static void ov38_02256458(SysTask *param0, void *param1) { - UnkStruct_ov38_0225632C * v0 = ov25_0225523C(param1); + UnkStruct_ov38_0225632C *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov38_022563A4(param1); diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c index eb445f9003..c8dc55e4d2 100644 --- a/src/overlay039/ov39_022561C0.c +++ b/src/overlay039/ov39_022561C0.c @@ -1,26 +1,26 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay039/struct_ov39_022563DC_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay039/ov39_022563DC.h" #include "overlay039/struct_ov39_022563DC_1.h" +#include "overlay039/struct_ov39_022563DC_decl.h" -#include "sys_task.h" #include "heap.h" -#include "overlay039/ov39_022563DC.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov39_022563DC_1 unk_04; - UnkStruct_ov39_022563DC * unk_24; + UnkStruct_ov39_022563DC *unk_24; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u32 unk_30; @@ -29,25 +29,25 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov39_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov39_0225621C(UnkStruct_ov39_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov39_02256268(UnkStruct_ov39_0225621C * param0); -static void ov39_02256284(u32 param0, u32 param1, u32 param2, void * param3); -static void ov39_0225628C(SysTask * param0, void * param1); -static void ov39_022562C8(void * param0); -static void ov39_022562D0(UnkStruct_ov39_0225621C * param0, u32 param1); -static BOOL ov39_022562E4(UnkStruct_ov39_0225621C * param0); -static BOOL ov39_02256324(UnkStruct_ov39_0225621C * param0); -static BOOL ov39_022563A8(UnkStruct_ov39_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov39_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov39_0225621C(UnkStruct_ov39_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov39_02256268(UnkStruct_ov39_0225621C *param0); +static void ov39_02256284(u32 param0, u32 param1, u32 param2, void *param3); +static void ov39_0225628C(SysTask *param0, void *param1); +static void ov39_022562C8(void *param0); +static void ov39_022562D0(UnkStruct_ov39_0225621C *param0, u32 param1); +static BOOL ov39_022562E4(UnkStruct_ov39_0225621C *param0); +static BOOL ov39_02256324(UnkStruct_ov39_0225621C *param0); +static BOOL ov39_022563A8(UnkStruct_ov39_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov39_022561D4, ov39_022562C8); } -static BOOL ov39_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov39_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov39_0225621C * v0 = (UnkStruct_ov39_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_0225621C)); + UnkStruct_ov39_0225621C *v0 = (UnkStruct_ov39_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_0225621C)); if (v0 != NULL) { if (ov39_0225621C(v0, poketchSys, param2, param3)) { @@ -63,16 +63,16 @@ static BOOL ov39_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov39_0225621C(UnkStruct_ov39_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { if (ov39_022563DC(&(param0->unk_24), &(param0->unk_04), param2)) { static const TouchScreenHitTable v0[] = { - {16, 64, 16, 64}, - {16, 64, 160, 208}, - {72, 120, 16, 64}, - {72, 120, 160, 208}, - {128, 176, 16, 64}, - {128, 176, 160, 208}, + { 16, 64, 16, 64 }, + { 16, 64, 160, 208 }, + { 72, 120, 16, 64 }, + { 72, 120, 160, 208 }, + { 128, 176, 16, 64 }, + { 128, 176, 160, 208 }, }; int v1; @@ -93,7 +93,7 @@ static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, PoketchSystem *poke return 0; } -static void ov39_02256268 (UnkStruct_ov39_0225621C * param0) +static void ov39_02256268(UnkStruct_ov39_0225621C *param0) { if (param0->buttonManager) { PoketchButtonManager_Free(param0->buttonManager); @@ -103,23 +103,23 @@ static void ov39_02256268 (UnkStruct_ov39_0225621C * param0) Heap_FreeToHeap(param0); } -static void ov39_02256284 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov39_02256284(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov39_0225621C * v0 = param3; + UnkStruct_ov39_0225621C *v0 = param3; v0->unk_30 = param1; v0->unk_34 = param0; } -static void ov39_0225628C (SysTask * param0, void * param1) +static void ov39_0225628C(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov39_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov39_0225621C *) = { ov39_022562E4, ov39_02256324, ov39_022563A8 }; - UnkStruct_ov39_0225621C * v1 = (UnkStruct_ov39_0225621C *)param1; + UnkStruct_ov39_0225621C *v1 = (UnkStruct_ov39_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -133,12 +133,12 @@ static void ov39_0225628C (SysTask * param0, void * param1) } } -static void ov39_022562C8 (void * param0) +static void ov39_022562C8(void *param0) { ((UnkStruct_ov39_0225621C *)param0)->unk_02 = 1; } -static void ov39_022562D0 (UnkStruct_ov39_0225621C * param0, u32 param1) +static void ov39_022562D0(UnkStruct_ov39_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -149,7 +149,7 @@ static void ov39_022562D0 (UnkStruct_ov39_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov39_022562E4 (UnkStruct_ov39_0225621C * param0) +static BOOL ov39_022562E4(UnkStruct_ov39_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -167,7 +167,7 @@ static BOOL ov39_022562E4 (UnkStruct_ov39_0225621C * param0) return 0; } -static BOOL ov39_02256324 (UnkStruct_ov39_0225621C * param0) +static BOOL ov39_02256324(UnkStruct_ov39_0225621C *param0) { if (param0->unk_02) { ov39_022562D0(param0, 2); @@ -205,7 +205,7 @@ static BOOL ov39_02256324 (UnkStruct_ov39_0225621C * param0) return 0; } -static BOOL ov39_022563A8 (UnkStruct_ov39_0225621C * param0) +static BOOL ov39_022563A8(UnkStruct_ov39_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay039/ov39_022563DC.c b/src/overlay039/ov39_022563DC.c index 3226e6381f..e0e684fb03 100644 --- a/src/overlay039/ov39_022563DC.c +++ b/src/overlay039/ov39_022563DC.c @@ -1,38 +1,39 @@ +#include "overlay039/ov39_022563DC.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay039/struct_ov39_022563DC_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" #include "overlay039/struct_ov39_022563DC_1.h" +#include "overlay039/struct_ov39_022563DC_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay039/ov39_022563DC.h" struct UnkStruct_ov39_022563DC_t { - const UnkStruct_ov39_022563DC_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov39_022563DC_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; }; -static void ov39_02256454(UnkStruct_ov25_02255224 * param0); -static void ov39_02256468(SysTask * param0, void * param1); -static void ov39_02256518(SysTask * param0, void * param1); -static void ov39_02256534(SysTask * param0, void * param1); -static void ov39_02256568(SysTask * param0, void * param1); -static void ov39_0225659C(UnkStruct_ov39_022563DC * param0, u32 param1, BOOL param2, BOOL param3); +static void ov39_02256454(UnkStruct_ov25_02255224 *param0); +static void ov39_02256468(SysTask *param0, void *param1); +static void ov39_02256518(SysTask *param0, void *param1); +static void ov39_02256534(SysTask *param0, void *param1); +static void ov39_02256568(SysTask *param0, void *param1); +static void ov39_0225659C(UnkStruct_ov39_022563DC *param0, u32 param1, BOOL param2, BOOL param3); -BOOL ov39_022563DC (UnkStruct_ov39_022563DC ** param0, const UnkStruct_ov39_022563DC_1 * param1, BGL * param2) +BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563DC_1 *param1, BGL *param2) { - UnkStruct_ov39_022563DC * v0 = (UnkStruct_ov39_022563DC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_022563DC)); + UnkStruct_ov39_022563DC *v0 = (UnkStruct_ov39_022563DC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov39_022563DC)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -49,7 +50,7 @@ BOOL ov39_022563DC (UnkStruct_ov39_022563DC ** param0, const UnkStruct_ov39_0225 return 0; } -void ov39_0225640C (UnkStruct_ov39_022563DC * param0) +void ov39_0225640C(UnkStruct_ov39_022563DC *param0) { if (param0 != NULL) { Heap_FreeToHeap(param0); @@ -57,35 +58,35 @@ void ov39_0225640C (UnkStruct_ov39_022563DC * param0) } static const UnkStruct_ov25_0225517C Unk_ov39_0225663C[] = { - {0x0, ov39_02256468, 0x0}, - {0x1, ov39_02256518, 0x0}, - {0x2, ov39_02256534, 0x0}, - {0x3, ov39_02256568, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov39_02256468, 0x0 }, + { 0x1, ov39_02256518, 0x0 }, + { 0x2, ov39_02256534, 0x0 }, + { 0x3, ov39_02256568, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov39_02256418 (UnkStruct_ov39_022563DC * param0, u32 param1) +void ov39_02256418(UnkStruct_ov39_022563DC *param0, u32 param1) { ov25_0225517C(Unk_ov39_0225663C, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov39_0225643C (UnkStruct_ov39_022563DC * param0, u32 param1) +BOOL ov39_0225643C(UnkStruct_ov39_022563DC *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov39_02256448 (UnkStruct_ov39_022563DC * param0) +BOOL ov39_02256448(UnkStruct_ov39_022563DC *param0) { return ov25_02255154(param0->unk_08); } -static void ov39_02256454 (UnkStruct_ov25_02255224 * param0) +static void ov39_02256454(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov39_022563DC * v0 = ov25_0225523C(param0); + UnkStruct_ov39_022563DC *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov39_02256468 (SysTask * param0, void * param1) +static void ov39_02256468(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -103,10 +104,10 @@ static void ov39_02256468 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov39_022563DC * v2; - const UnkStruct_ov39_022563DC_1 * v3; - void * v4; - NNSG2dPaletteData * v5; + UnkStruct_ov39_022563DC *v2; + const UnkStruct_ov39_022563DC_1 *v3; + void *v4; + NNSG2dPaletteData *v5; int v6; v2 = ov25_0225523C(param1); @@ -130,40 +131,45 @@ static void ov39_02256468 (SysTask * param0, void * param1) ov39_02256454(param1); } -static void ov39_02256518 (SysTask * param0, void * param1) +static void ov39_02256518(SysTask *param0, void *param1) { - UnkStruct_ov39_022563DC * v0 = ov25_0225523C(param1); + UnkStruct_ov39_022563DC *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov39_02256454(param1); } -static void ov39_02256534 (SysTask * param0, void * param1) +static void ov39_02256534(SysTask *param0, void *param1) { - UnkStruct_ov39_022563DC * v0 = ov25_0225523C(param1); - const UnkStruct_ov39_022563DC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov39_022563DC *v0 = ov25_0225523C(param1); + const UnkStruct_ov39_022563DC_1 *v1 = ov25_02255240(param1); ov39_0225659C(v0, v1->unk_1C, v1->unk_04[v1->unk_1C], 1); sub_02019448(v0->unk_04, 6); ov39_02256454(param1); } -static void ov39_02256568 (SysTask * param0, void * param1) +static void ov39_02256568(SysTask *param0, void *param1) { - UnkStruct_ov39_022563DC * v0 = ov25_0225523C(param1); - const UnkStruct_ov39_022563DC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov39_022563DC *v0 = ov25_0225523C(param1); + const UnkStruct_ov39_022563DC_1 *v1 = ov25_02255240(param1); ov39_0225659C(v0, v1->unk_1C, v1->unk_04[v1->unk_1C], 0); sub_02019448(v0->unk_04, 6); ov39_02256454(param1); } -static void ov39_0225659C (UnkStruct_ov39_022563DC * param0, u32 param1, BOOL param2, BOOL param3) +static void ov39_0225659C(UnkStruct_ov39_022563DC *param0, u32 param1, BOOL param2, BOOL param3) { static const u16 v0[] = { - 66, 84, 290, 308, 514, 532, + 66, + 84, + 290, + 308, + 514, + 532, }; - u16 * v1; + u16 *v1; int v2, v3, v4; v1 = sub_02019FE4(param0->unk_04, 6); diff --git a/src/overlay040/ov40_022561C0.c b/src/overlay040/ov40_022561C0.c index 352d6412cd..5296c8cb05 100644 --- a/src/overlay040/ov40_022561C0.c +++ b/src/overlay040/ov40_022561C0.c @@ -1,58 +1,57 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02026218_decl.h" #include "struct_decls/struct_02026310_decl.h" -#include "pokemon.h" -#include "overlay025/poketch_system.h" -#include "overlay040/struct_ov40_0225645C_decl.h" +#include "overlay005/ov5_021E622C.h" +#include "overlay025/poketch_system.h" +#include "overlay040/ov40_0225645C.h" #include "overlay040/struct_ov40_0225645C_1.h" +#include "overlay040/struct_ov40_0225645C_decl.h" -#include "sys_task.h" #include "heap.h" -#include "touch_screen.h" -#include "unk_020261E4.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "overlay005/ov5_021E622C.h" -#include "overlay040/ov40_0225645C.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" +#include "unk_020261E4.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov40_0225645C_1 unk_04; - UnkStruct_ov40_0225645C * unk_28; + UnkStruct_ov40_0225645C *unk_28; PoketchSystem *poketchSys; - UnkStruct_02026310 * unk_30; + UnkStruct_02026310 *unk_30; } UnkStruct_ov40_0225621C; static void NitroStaticInit(void); -static BOOL ov40_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov40_0225621C(UnkStruct_ov40_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov40_0225625C(UnkStruct_ov40_0225621C * param0); -static void ov40_02256270(SysTask * param0, void * param1); -static void ov40_022562A4(void * param0); -static void ov40_022562AC(UnkStruct_ov40_0225621C * param0, u32 param1); -static BOOL ov40_022562C0(UnkStruct_ov40_0225621C * param0); -static BOOL ov40_02256300(UnkStruct_ov40_0225621C * param0); -static BOOL ov40_02256354(UnkStruct_ov40_0225621C * param0); -static BOOL ov40_02256388(UnkStruct_ov40_0225621C * param0); -static void ov40_022563D0(UnkStruct_ov40_0225645C_1 * param0, UnkStruct_02026310 * param1); - -static void NitroStaticInit (void) +static BOOL ov40_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov40_0225621C(UnkStruct_ov40_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov40_0225625C(UnkStruct_ov40_0225621C *param0); +static void ov40_02256270(SysTask *param0, void *param1); +static void ov40_022562A4(void *param0); +static void ov40_022562AC(UnkStruct_ov40_0225621C *param0, u32 param1); +static BOOL ov40_022562C0(UnkStruct_ov40_0225621C *param0); +static BOOL ov40_02256300(UnkStruct_ov40_0225621C *param0); +static BOOL ov40_02256354(UnkStruct_ov40_0225621C *param0); +static BOOL ov40_02256388(UnkStruct_ov40_0225621C *param0); +static void ov40_022563D0(UnkStruct_ov40_0225645C_1 *param0, UnkStruct_02026310 *param1); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov40_022561D4, ov40_022562A4); } -static BOOL ov40_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov40_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov40_0225621C * v0 = (UnkStruct_ov40_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225621C)); + UnkStruct_ov40_0225621C *v0 = (UnkStruct_ov40_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225621C)); if (v0 != NULL) { if (ov40_0225621C(v0, poketchSys, param2, param3)) { @@ -68,7 +67,7 @@ static BOOL ov40_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov40_0225621C (UnkStruct_ov40_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov40_0225621C(UnkStruct_ov40_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { param0->unk_30 = sub_02026310(PoketchSystem_GetSaveData(poketchSys)); @@ -86,21 +85,21 @@ static BOOL ov40_0225621C (UnkStruct_ov40_0225621C * param0, PoketchSystem *poke return 0; } -static void ov40_0225625C (UnkStruct_ov40_0225621C * param0) +static void ov40_0225625C(UnkStruct_ov40_0225621C *param0) { ov40_022564B8(param0->unk_28); Heap_FreeToHeap(param0); } -static void ov40_02256270 (SysTask * param0, void * param1) +static void ov40_02256270(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov40_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov40_0225621C *) = { ov40_022562C0, ov40_02256300, ov40_02256354 }; - UnkStruct_ov40_0225621C * v1 = (UnkStruct_ov40_0225621C *)param1; + UnkStruct_ov40_0225621C *v1 = (UnkStruct_ov40_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -112,12 +111,12 @@ static void ov40_02256270 (SysTask * param0, void * param1) } } -static void ov40_022562A4 (void * param0) +static void ov40_022562A4(void *param0) { ((UnkStruct_ov40_0225621C *)param0)->unk_02 = 1; } -static void ov40_022562AC (UnkStruct_ov40_0225621C * param0, u32 param1) +static void ov40_022562AC(UnkStruct_ov40_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -128,7 +127,7 @@ static void ov40_022562AC (UnkStruct_ov40_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov40_022562C0 (UnkStruct_ov40_0225621C * param0) +static BOOL ov40_022562C0(UnkStruct_ov40_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -146,7 +145,7 @@ static BOOL ov40_022562C0 (UnkStruct_ov40_0225621C * param0) return 0; } -static BOOL ov40_02256300 (UnkStruct_ov40_0225621C * param0) +static BOOL ov40_02256300(UnkStruct_ov40_0225621C *param0) { if (param0->unk_02) { ov40_022562AC(param0, 2); @@ -171,7 +170,7 @@ static BOOL ov40_02256300 (UnkStruct_ov40_0225621C * param0) return 0; } -static BOOL ov40_02256354 (UnkStruct_ov40_0225621C * param0) +static BOOL ov40_02256354(UnkStruct_ov40_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -188,7 +187,7 @@ static BOOL ov40_02256354 (UnkStruct_ov40_0225621C * param0) return 0; } -static BOOL ov40_02256388 (UnkStruct_ov40_0225621C * param0) +static BOOL ov40_02256388(UnkStruct_ov40_0225621C *param0) { if (ov25_0225450C(param0->poketchSys) == 0) { u32 v0, v1; @@ -203,10 +202,10 @@ static BOOL ov40_02256388 (UnkStruct_ov40_0225621C * param0) return 0; } -static void ov40_022563D0 (UnkStruct_ov40_0225645C_1 * param0, UnkStruct_02026310 * param1) +static void ov40_022563D0(UnkStruct_ov40_0225645C_1 *param0, UnkStruct_02026310 *param1) { - UnkStruct_02026218 * v0; - BoxPokemon * v1; + UnkStruct_02026218 *v0; + BoxPokemon *v1; int v2; BOOL v3; diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c index 2b8c9f004f..50bd218ecf 100644 --- a/src/overlay040/ov40_0225645C.c +++ b/src/overlay040/ov40_0225645C.c @@ -1,37 +1,38 @@ +#include "overlay040/ov40_0225645C.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay040/struct_ov40_0225645C_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay040/struct_ov40_0225645C_1.h" +#include "overlay040/struct_ov40_0225645C_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" -#include "sys_task.h" #include "heap.h" -#include "unk_02018340.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay040/ov40_0225645C.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" +#include "unk_02018340.h" struct UnkStruct_ov40_0225645C_t { - const UnkStruct_ov40_0225645C_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov40_0225645C_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24[11]; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24[11]; UnkStruct_ov25_02255958 unk_50; UnkStruct_ov25_02255958 unk_64; u32 unk_78; @@ -39,25 +40,25 @@ struct UnkStruct_ov40_0225645C_t { u32 unk_80; BOOL unk_84; BOOL unk_88; - SysTask * unk_8C; + SysTask *unk_8C; }; -static void ov40_022564D4(UnkStruct_ov40_0225645C * param0, const UnkStruct_ov40_0225645C_1 * param1); -static void ov40_02256598(UnkStruct_ov40_0225645C * param0); -static void ov40_02256604(UnkStruct_ov25_02255224 * param0); -static void ov40_02256618(SysTask * param0, void * param1); -static void ov40_022566B0(SysTask * param0, void * param1); -static void ov40_02256704(SysTask * param0, void * param1); -static void ov40_022567D8(UnkStruct_ov40_0225645C * param0); -static void ov40_022567E0(SysTask * param0, void * param1); -static void ov40_02256808(u32 param0, const UnkStruct_ov40_0225645C_1 * param1); -static void ov40_02256848(UnkStruct_ov40_0225645C * param0, const UnkStruct_ov40_0225645C_1 * param1); -static void ov40_02256958(UnkStruct_ov25_022558C4 ** param0, u32 param1); -static void ov40_02256A14(UnkStruct_ov25_022558C4 * param0, u32 param1); - -BOOL ov40_0225645C (UnkStruct_ov40_0225645C ** param0, const UnkStruct_ov40_0225645C_1 * param1, BGL * param2) +static void ov40_022564D4(UnkStruct_ov40_0225645C *param0, const UnkStruct_ov40_0225645C_1 *param1); +static void ov40_02256598(UnkStruct_ov40_0225645C *param0); +static void ov40_02256604(UnkStruct_ov25_02255224 *param0); +static void ov40_02256618(SysTask *param0, void *param1); +static void ov40_022566B0(SysTask *param0, void *param1); +static void ov40_02256704(SysTask *param0, void *param1); +static void ov40_022567D8(UnkStruct_ov40_0225645C *param0); +static void ov40_022567E0(SysTask *param0, void *param1); +static void ov40_02256808(u32 param0, const UnkStruct_ov40_0225645C_1 *param1); +static void ov40_02256848(UnkStruct_ov40_0225645C *param0, const UnkStruct_ov40_0225645C_1 *param1); +static void ov40_02256958(UnkStruct_ov25_022558C4 **param0, u32 param1); +static void ov40_02256A14(UnkStruct_ov25_022558C4 *param0, u32 param1); + +BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_0225645C_1 *param1, BGL *param2) { - UnkStruct_ov40_0225645C * v0 = (UnkStruct_ov40_0225645C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225645C)); + UnkStruct_ov40_0225645C *v0 = (UnkStruct_ov40_0225645C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov40_0225645C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -79,7 +80,7 @@ BOOL ov40_0225645C (UnkStruct_ov40_0225645C ** param0, const UnkStruct_ov40_0225 return 0; } -void ov40_022564B8 (UnkStruct_ov40_0225645C * param0) +void ov40_022564B8(UnkStruct_ov40_0225645C *param0) { if (param0 != NULL) { ov40_02256598(param0); @@ -88,96 +89,96 @@ void ov40_022564B8 (UnkStruct_ov40_0225645C * param0) } } -static void ov40_022564D4 (UnkStruct_ov40_0225645C * param0, const UnkStruct_ov40_0225645C_1 * param1) +static void ov40_022564D4(UnkStruct_ov40_0225645C *param0, const UnkStruct_ov40_0225645C_1 *param1) { static const UnkStruct_ov25_02255810 v0[] = { { - {(56 << FX32_SHIFT), (128 << FX32_SHIFT)}, + { (56 << FX32_SHIFT), (128 << FX32_SHIFT) }, 7, 0, 2, 0, - 1 + 1, }, { - {(168 << FX32_SHIFT), (128 << FX32_SHIFT)}, + { (168 << FX32_SHIFT), (128 << FX32_SHIFT) }, 6, 0, 2, 0, - 1 + 1, }, { - {(112 << FX32_SHIFT), (136 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (136 << FX32_SHIFT) }, 4, 0, 2, 0, - 1 + 1, }, { - {(48 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (48 << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(64 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (64 << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(80 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (80 << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(152 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (152 << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(168 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (168 << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(184 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (184 << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(96 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (96 << FX32_SHIFT), (40 << FX32_SHIFT) }, 10, 0, 2, 0, - 0 + 0, }, { - {(200 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (200 << FX32_SHIFT), (40 << FX32_SHIFT) }, 10, 0, 2, 0, - 0 + 0, }, }; int v1; @@ -208,7 +209,7 @@ static void ov40_022564D4 (UnkStruct_ov40_0225645C * param0, const UnkStruct_ov4 ov40_02256848(param0, param1); } -static void ov40_02256598 (UnkStruct_ov40_0225645C * param0) +static void ov40_02256598(UnkStruct_ov40_0225645C *param0) { int v0; @@ -223,34 +224,34 @@ static void ov40_02256598 (UnkStruct_ov40_0225645C * param0) } static const UnkStruct_ov25_0225517C Unk_ov40_02256A60[] = { - {0x0, ov40_02256618, 0x0}, - {0x1, ov40_022566B0, 0x0}, - {0x2, ov40_02256704, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov40_02256618, 0x0 }, + { 0x1, ov40_022566B0, 0x0 }, + { 0x2, ov40_02256704, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov40_022565C8 (UnkStruct_ov40_0225645C * param0, u32 param1) +void ov40_022565C8(UnkStruct_ov40_0225645C *param0, u32 param1) { ov25_0225517C(Unk_ov40_02256A60, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov40_022565EC (UnkStruct_ov40_0225645C * param0, u32 param1) +BOOL ov40_022565EC(UnkStruct_ov40_0225645C *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov40_022565F8 (UnkStruct_ov40_0225645C * param0) +BOOL ov40_022565F8(UnkStruct_ov40_0225645C *param0) { return ov25_02255154(param0->unk_08); } -static void ov40_02256604 (UnkStruct_ov25_02255224 * param0) +static void ov40_02256604(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov40_0225645C * v0 = ov25_0225523C(param0); + UnkStruct_ov40_0225645C *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov40_02256618 (SysTask * param0, void * param1) +static void ov40_02256618(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -268,7 +269,7 @@ static void ov40_02256618 (SysTask * param0, void * param1) 1 }; GXSDispCnt v1; - UnkStruct_ov40_0225645C * v2; + UnkStruct_ov40_0225645C *v2; v2 = ov25_0225523C(param1); @@ -288,9 +289,9 @@ static void ov40_02256618 (SysTask * param0, void * param1) ov40_02256604(param1); } -static void ov40_022566B0 (SysTask * param0, void * param1) +static void ov40_022566B0(SysTask *param0, void *param1) { - UnkStruct_ov40_0225645C * v0 = ov25_0225523C(param1); + UnkStruct_ov40_0225645C *v0 = ov25_0225523C(param1); switch (ov25_02255248(param1)) { case 0: @@ -308,10 +309,10 @@ static void ov40_022566B0 (SysTask * param0, void * param1) } } -static void ov40_02256704 (SysTask * param0, void * param1) +static void ov40_02256704(SysTask *param0, void *param1) { - UnkStruct_ov40_0225645C * v0 = ov25_0225523C(param1); - const UnkStruct_ov40_0225645C_1 * v1 = ov25_02255240(param1); + UnkStruct_ov40_0225645C *v0 = ov25_0225523C(param1); + const UnkStruct_ov40_0225645C_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: @@ -352,14 +353,14 @@ static void ov40_02256704 (SysTask * param0, void * param1) } } -static void ov40_022567D8 (UnkStruct_ov40_0225645C * param0) +static void ov40_022567D8(UnkStruct_ov40_0225645C *param0) { param0->unk_88 = 1; } -static void ov40_022567E0 (SysTask * param0, void * param1) +static void ov40_022567E0(SysTask *param0, void *param1) { - UnkStruct_ov40_0225645C * v0 = param1; + UnkStruct_ov40_0225645C *v0 = param1; if (v0->unk_88) { G2S_SetBGMosaicSize(v0->unk_7C, v0->unk_7C); @@ -368,7 +369,7 @@ static void ov40_022567E0 (SysTask * param0, void * param1) } } -static void ov40_02256808 (u32 param0, const UnkStruct_ov40_0225645C_1 * param1) +static void ov40_02256808(u32 param0, const UnkStruct_ov40_0225645C_1 *param1) { u32 v0; u32 v1[3]; @@ -382,7 +383,7 @@ static void ov40_02256808 (u32 param0, const UnkStruct_ov40_0225645C_1 * param1) ov25_022553A0(param0, v1, NELEMS(v1), 1); } -static void ov40_02256848 (UnkStruct_ov40_0225645C * param0, const UnkStruct_ov40_0225645C_1 * param1) +static void ov40_02256848(UnkStruct_ov40_0225645C *param0, const UnkStruct_ov40_0225645C_1 *param1) { int v0; BOOL v1; @@ -425,7 +426,7 @@ static void ov40_02256848 (UnkStruct_ov40_0225645C * param0, const UnkStruct_ov4 ov25_02255914(param0->unk_24[2], (param1->unk_01 == 0)); } -static void ov40_02256958 (UnkStruct_ov25_022558C4 ** param0, u32 param1) +static void ov40_02256958(UnkStruct_ov25_022558C4 **param0, u32 param1) { u32 v0[3]; int v1; @@ -449,7 +450,7 @@ static void ov40_02256958 (UnkStruct_ov25_022558C4 ** param0, u32 param1) ov25_02255914(param0[1], (param1 < 10)); } -static void ov40_02256A14 (UnkStruct_ov25_022558C4 * param0, u32 param1) +static void ov40_02256A14(UnkStruct_ov25_022558C4 *param0, u32 param1) { switch (param1) { case 0: diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c index a610eae603..7124efca92 100644 --- a/src/overlay041/ov41_022561C0.c +++ b/src/overlay041/ov41_022561C0.c @@ -1,19 +1,19 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay041/struct_ov41_022567B0_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay041/ov41_022567B0.h" #include "overlay041/struct_ov41_022567B0_1.h" +#include "overlay041/struct_ov41_022567B0_decl.h" -#include "sys_task.h" #include "heap.h" -#include "overlay041/ov41_022567B0.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; @@ -21,7 +21,7 @@ typedef struct { u8 unk_02; u8 unk_03; UnkStruct_ov41_022567B0_1 unk_04; - UnkStruct_ov41_022567B0 * unk_5B7C; + UnkStruct_ov41_022567B0 *unk_5B7C; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u32 unk_5B88; @@ -30,29 +30,29 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov41_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov41_02256220(UnkStruct_ov41_02256220 * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov41_02256294(UnkStruct_ov41_02256220 * param0); -static void ov41_022562B8(SysTask * param0, void * param1); -static void ov41_02256300(u32 param0, u32 param1, u32 param2, void * param3); -static void ov41_02256310(void * param0); -static void ov41_02256318(UnkStruct_ov41_02256220 * param0, u32 param1); -static BOOL ov41_0225632C(UnkStruct_ov41_02256220 * param0); -static BOOL ov41_02256378(UnkStruct_ov41_02256220 * param0); -static BOOL ov41_02256564(UnkStruct_ov41_02256220 * param0); -static BOOL ov41_022565C4(UnkStruct_ov41_02256220 * param0); -static void ov41_02256610(UnkStruct_ov41_02256220 * param0, u32 param1, u32 param2, u32 param3, u32 param4); -static BOOL ov41_02256754(UnkStruct_ov41_02256220 * param0); -static void ov41_02256790(UnkStruct_ov41_022567B0_1 * param0); - -static void NitroStaticInit (void) +static BOOL ov41_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov41_02256220(UnkStruct_ov41_02256220 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov41_02256294(UnkStruct_ov41_02256220 *param0); +static void ov41_022562B8(SysTask *param0, void *param1); +static void ov41_02256300(u32 param0, u32 param1, u32 param2, void *param3); +static void ov41_02256310(void *param0); +static void ov41_02256318(UnkStruct_ov41_02256220 *param0, u32 param1); +static BOOL ov41_0225632C(UnkStruct_ov41_02256220 *param0); +static BOOL ov41_02256378(UnkStruct_ov41_02256220 *param0); +static BOOL ov41_02256564(UnkStruct_ov41_02256220 *param0); +static BOOL ov41_022565C4(UnkStruct_ov41_02256220 *param0); +static void ov41_02256610(UnkStruct_ov41_02256220 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +static BOOL ov41_02256754(UnkStruct_ov41_02256220 *param0); +static void ov41_02256790(UnkStruct_ov41_022567B0_1 *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov41_022561D4, ov41_02256310); } -static BOOL ov41_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov41_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov41_02256220 * v0 = (UnkStruct_ov41_02256220 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_02256220)); + UnkStruct_ov41_02256220 *v0 = (UnkStruct_ov41_02256220 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_02256220)); if (v0 != NULL) { if (ov41_02256220(v0, poketchSys, param2, param3)) { @@ -68,12 +68,12 @@ static BOOL ov41_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov41_02256220(UnkStruct_ov41_02256220 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { static const TouchScreenHitTable v0[] = { - {34, 66, 167, 207}, - {80, 112, 167, 207}, - {126, 158, 167, 207} + { 34, 66, 167, 207 }, + { 80, 112, 167, 207 }, + { 126, 158, 167, 207 } }; param0->unk_04.unk_08 = param3; @@ -99,22 +99,22 @@ static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, PoketchSystem *poke return 0; } -static void ov41_02256294 (UnkStruct_ov41_02256220 * param0) +static void ov41_02256294(UnkStruct_ov41_02256220 *param0) { PoketchButtonManager_Free(param0->buttonManager); ov41_022567F8(param0->unk_5B7C); Heap_FreeToHeap(param0); } -static void ov41_022562B8 (SysTask * param0, void * param1) +static void ov41_022562B8(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov41_02256220 *) = { + static BOOL (*const v0[])(UnkStruct_ov41_02256220 *) = { ov41_0225632C, ov41_02256378, ov41_02256754 }; - UnkStruct_ov41_02256220 * v1 = (UnkStruct_ov41_02256220 *)param1; + UnkStruct_ov41_02256220 *v1 = (UnkStruct_ov41_02256220 *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -128,20 +128,20 @@ static void ov41_022562B8 (SysTask * param0, void * param1) } } -static void ov41_02256300 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov41_02256300(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov41_02256220 * v0 = (UnkStruct_ov41_02256220 *)param3; + UnkStruct_ov41_02256220 *v0 = (UnkStruct_ov41_02256220 *)param3; v0->unk_5B88 = param1; v0->unk_5B8C = param0; } -static void ov41_02256310 (void * param0) +static void ov41_02256310(void *param0) { ((UnkStruct_ov41_02256220 *)param0)->unk_02 = 1; } -static void ov41_02256318 (UnkStruct_ov41_02256220 * param0, u32 param1) +static void ov41_02256318(UnkStruct_ov41_02256220 *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -152,7 +152,7 @@ static void ov41_02256318 (UnkStruct_ov41_02256220 * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov41_0225632C (UnkStruct_ov41_02256220 * param0) +static BOOL ov41_0225632C(UnkStruct_ov41_02256220 *param0) { switch (param0->unk_01) { case 0: @@ -170,7 +170,7 @@ static BOOL ov41_0225632C (UnkStruct_ov41_02256220 * param0) return 0; } -static BOOL ov41_02256378 (UnkStruct_ov41_02256220 * param0) +static BOOL ov41_02256378(UnkStruct_ov41_02256220 *param0) { if (param0->unk_02) { ov41_02256318(param0, 2); @@ -279,7 +279,7 @@ static BOOL ov41_02256378 (UnkStruct_ov41_02256220 * param0) return 0; } -static BOOL ov41_02256564 (UnkStruct_ov41_02256220 * param0) +static BOOL ov41_02256564(UnkStruct_ov41_02256220 *param0) { u32 v0, v1; @@ -300,7 +300,7 @@ static BOOL ov41_02256564 (UnkStruct_ov41_02256220 * param0) return 0; } -static BOOL ov41_022565C4 (UnkStruct_ov41_02256220 * param0) +static BOOL ov41_022565C4(UnkStruct_ov41_02256220 *param0) { u32 v0, v1; @@ -319,7 +319,7 @@ static BOOL ov41_022565C4 (UnkStruct_ov41_02256220 * param0) return 0; } -static void ov41_02256610 (UnkStruct_ov41_02256220 * param0, u32 param1, u32 param2, u32 param3, u32 param4) +static void ov41_02256610(UnkStruct_ov41_02256220 *param0, u32 param1, u32 param2, u32 param3, u32 param4) { u32 v0, v1, v2, v3; fx32 v4, v5; @@ -396,7 +396,7 @@ static void ov41_02256610 (UnkStruct_ov41_02256220 * param0, u32 param1, u32 par } } -static BOOL ov41_02256754 (UnkStruct_ov41_02256220 * param0) +static BOOL ov41_02256754(UnkStruct_ov41_02256220 *param0) { switch (param0->unk_01) { case 0: @@ -413,7 +413,7 @@ static BOOL ov41_02256754 (UnkStruct_ov41_02256220 * param0) return 0; } -static void ov41_02256790 (UnkStruct_ov41_022567B0_1 * param0) +static void ov41_02256790(UnkStruct_ov41_022567B0_1 *param0) { int v0, v1; diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index b29a8eccdb..0083707e7d 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -1,38 +1,39 @@ +#include "overlay041/ov41_022567B0.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay041/struct_ov41_022567B0_decl.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay041/struct_ov41_022567B0_1.h" +#include "overlay041/struct_ov41_022567B0_decl.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_02099D44.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay041/ov41_022567B0.h" struct UnkStruct_ov41_022567B0_t { - const UnkStruct_ov41_022567B0_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov41_022567B0_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24[4]; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24[4]; UnkStruct_ov25_02255958 unk_34; Window unk_48; u32 unk_58; @@ -44,23 +45,23 @@ struct UnkStruct_ov41_022567B0_t { u32 unk_6C; }; -static void ov41_0225680C(UnkStruct_ov41_022567B0 * param0, const UnkStruct_ov41_022567B0_1 * param1); -static void ov41_02256864(UnkStruct_ov41_022567B0 * param0); -static void ov41_022568C8(UnkStruct_ov25_02255224 * param0); -static void ov41_022568DC(SysTask * param0, void * param1); -static void ov41_022569BC(UnkStruct_ov41_022567B0 * param0, u32 param1); -static void ov41_02256A1C(SysTask * param0, void * param1); -static void ov41_02256A74(SysTask * param0, void * param1); -static void ov41_02256A8C(SysTask * param0, void * param1); -static void ov41_02256AE4(SysTask * param0, void * param1); -static void ov41_02256AFC(SysTask * param0, void * param1); -static void ov41_02256B60(SysTask * param0, void * param1); -static void ov41_02256B8C(SysTask * param0, void * param1); -static void ov41_02256D1C(SysTask * param0, void * param1); - -BOOL ov41_022567B0 (UnkStruct_ov41_022567B0 ** param0, const UnkStruct_ov41_022567B0_1 * param1, BGL * param2) +static void ov41_0225680C(UnkStruct_ov41_022567B0 *param0, const UnkStruct_ov41_022567B0_1 *param1); +static void ov41_02256864(UnkStruct_ov41_022567B0 *param0); +static void ov41_022568C8(UnkStruct_ov25_02255224 *param0); +static void ov41_022568DC(SysTask *param0, void *param1); +static void ov41_022569BC(UnkStruct_ov41_022567B0 *param0, u32 param1); +static void ov41_02256A1C(SysTask *param0, void *param1); +static void ov41_02256A74(SysTask *param0, void *param1); +static void ov41_02256A8C(SysTask *param0, void *param1); +static void ov41_02256AE4(SysTask *param0, void *param1); +static void ov41_02256AFC(SysTask *param0, void *param1); +static void ov41_02256B60(SysTask *param0, void *param1); +static void ov41_02256B8C(SysTask *param0, void *param1); +static void ov41_02256D1C(SysTask *param0, void *param1); + +BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567B0_1 *param1, BGL *param2) { - UnkStruct_ov41_022567B0 * v0 = (UnkStruct_ov41_022567B0 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_022567B0)); + UnkStruct_ov41_022567B0 *v0 = (UnkStruct_ov41_022567B0 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov41_022567B0)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -81,7 +82,7 @@ BOOL ov41_022567B0 (UnkStruct_ov41_022567B0 ** param0, const UnkStruct_ov41_0225 return 0; } -void ov41_022567F8 (UnkStruct_ov41_022567B0 * param0) +void ov41_022567F8(UnkStruct_ov41_022567B0 *param0) { if (param0 != NULL) { ov41_02256864(param0); @@ -89,41 +90,41 @@ void ov41_022567F8 (UnkStruct_ov41_022567B0 * param0) } } -static void ov41_0225680C (UnkStruct_ov41_022567B0 * param0, const UnkStruct_ov41_022567B0_1 * param1) +static void ov41_0225680C(UnkStruct_ov41_022567B0 *param0, const UnkStruct_ov41_022567B0_1 *param1) { static const UnkStruct_ov25_02255810 v0[] = { { - {(96 << FX32_SHIFT), (96 << FX32_SHIFT)}, + { (96 << FX32_SHIFT), (96 << FX32_SHIFT) }, 0, 0, 2, 0, - 1 + 1, }, { - {(187 << FX32_SHIFT), (50 << FX32_SHIFT)}, + { (187 << FX32_SHIFT), (50 << FX32_SHIFT) }, 1, 0, 2, 0, - 0 + 0, }, { - {(187 << FX32_SHIFT), (96 << FX32_SHIFT)}, + { (187 << FX32_SHIFT), (96 << FX32_SHIFT) }, 4, 0, 2, 0, - 0 + 0, }, { - {(187 << FX32_SHIFT), (142 << FX32_SHIFT)}, + { (187 << FX32_SHIFT), (142 << FX32_SHIFT) }, 5, 0, 2, 0, - 0 - } + 0, + }, }; int v1; @@ -135,7 +136,7 @@ static void ov41_0225680C (UnkStruct_ov41_022567B0 * param0, const UnkStruct_ov4 } } -static void ov41_02256864 (UnkStruct_ov41_022567B0 * param0) +static void ov41_02256864(UnkStruct_ov41_022567B0 *param0) { int v0; @@ -149,40 +150,40 @@ static void ov41_02256864 (UnkStruct_ov41_022567B0 * param0) } static const UnkStruct_ov25_0225517C Unk_ov41_02256E00[] = { - {0x0, ov41_022568DC, 0x0}, - {0x1, ov41_02256A1C, 0x0}, - {0x2, ov41_02256A74, 0x0}, - {0x3, ov41_02256A8C, 0x0}, - {0x4, ov41_02256AE4, 0x0}, - {0x5, ov41_02256AFC, 0x0}, - {0x6, ov41_02256B60, 0x0}, - {0x7, ov41_02256B8C, 0x0}, - {0x8, ov41_02256D1C, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov41_022568DC, 0x0 }, + { 0x1, ov41_02256A1C, 0x0 }, + { 0x2, ov41_02256A74, 0x0 }, + { 0x3, ov41_02256A8C, 0x0 }, + { 0x4, ov41_02256AE4, 0x0 }, + { 0x5, ov41_02256AFC, 0x0 }, + { 0x6, ov41_02256B60, 0x0 }, + { 0x7, ov41_02256B8C, 0x0 }, + { 0x8, ov41_02256D1C, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov41_0225688C (UnkStruct_ov41_022567B0 * param0, u32 param1) +void ov41_0225688C(UnkStruct_ov41_022567B0 *param0, u32 param1) { ov25_0225517C(Unk_ov41_02256E00, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov41_022568B0 (UnkStruct_ov41_022567B0 * param0, u32 param1) +BOOL ov41_022568B0(UnkStruct_ov41_022567B0 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov41_022568BC (UnkStruct_ov41_022567B0 * param0) +BOOL ov41_022568BC(UnkStruct_ov41_022567B0 *param0) { return ov25_02255154(param0->unk_08); } -static void ov41_022568C8 (UnkStruct_ov25_02255224 * param0) +static void ov41_022568C8(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov41_022567B0 * v0 = ov25_0225523C(param0); + UnkStruct_ov41_022567B0 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov41_022568DC (SysTask * param0, void * param1) +static void ov41_022568DC(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -215,7 +216,7 @@ static void ov41_022568DC (SysTask * param0, void * param1) 0 }; GXSDispCnt v2; - UnkStruct_ov41_022567B0 * v3; + UnkStruct_ov41_022567B0 *v3; u32 v4; GF_ASSERT(GF_heap_c_dummy_return_true(8)); @@ -244,7 +245,7 @@ static void ov41_022568DC (SysTask * param0, void * param1) GF_ASSERT(GF_heap_c_dummy_return_true(8)); } -static void ov41_022569BC (UnkStruct_ov41_022567B0 * param0, u32 param1) +static void ov41_022569BC(UnkStruct_ov41_022567B0 *param0, u32 param1) { UnkStruct_ov61_0222C884 v0 = { 7, 2, 2, 20, 19, 0, 0 @@ -263,9 +264,9 @@ static void ov41_022569BC (UnkStruct_ov41_022567B0 * param0, u32 param1) sub_0201ACCC(¶m0->unk_48); } -static void ov41_02256A1C (SysTask * param0, void * param1) +static void ov41_02256A1C(SysTask *param0, void *param1) { - UnkStruct_ov41_022567B0 * v0 = ov25_0225523C(param1); + UnkStruct_ov41_022567B0 *v0 = ov25_0225523C(param1); switch (ov25_02255248(param1)) { case 0: @@ -281,19 +282,19 @@ static void ov41_02256A1C (SysTask * param0, void * param1) } } -static void ov41_02256A74 (SysTask * param0, void * param1) +static void ov41_02256A74(SysTask *param0, void *param1) { - UnkStruct_ov41_022567B0 * v0; + UnkStruct_ov41_022567B0 *v0; v0 = ov25_0225523C(param1); sub_0201ACCC(&v0->unk_48); ov41_022568C8(param1); } -static void ov41_02256A8C (SysTask * param0, void * param1) +static void ov41_02256A8C(SysTask *param0, void *param1) { s32 v0, v1, v2, v3; - UnkStruct_ov41_022567B0 * v4; + UnkStruct_ov41_022567B0 *v4; v4 = ov25_0225523C(param1); v0 = v4->unk_00->unk_00 * 2; @@ -305,40 +306,40 @@ static void ov41_02256A8C (SysTask * param0, void * param1) ov41_022568C8(param1); } -static void ov41_02256AE4 (SysTask * param0, void * param1) +static void ov41_02256AE4(SysTask *param0, void *param1) { - UnkStruct_ov41_022567B0 * v0; + UnkStruct_ov41_022567B0 *v0; v0 = ov25_0225523C(param1); sub_0201ACCC(&v0->unk_48); ov41_022568C8(param1); } -static void ov41_02256AFC (SysTask * param0, void * param1) +static void ov41_02256AFC(SysTask *param0, void *param1) { - UnkStruct_ov41_022567B0 * v0 = ov25_0225523C(param1); - const UnkStruct_ov41_022567B0_1 * v1 = ov25_02255240(param1); + UnkStruct_ov41_022567B0 *v0 = ov25_0225523C(param1); + const UnkStruct_ov41_022567B0_1 *v1 = ov25_02255240(param1); ov25_022558C4(v0->unk_24[1], (v1->unk_5B74) ? 2 : 1); - ov25_022558C4(v0->unk_24[2], (v1->unk_5B75) ? 4 : 3); + ov25_022558C4(v0->unk_24[2], (v1->unk_5B75) ? 4 : 3); ov25_022558C4(v0->unk_24[3], (v1->unk_5B76) ? 6 : 5); ov41_022568C8(param1); } -static void ov41_02256B60 (SysTask * param0, void * param1) +static void ov41_02256B60(SysTask *param0, void *param1) { - UnkStruct_ov41_022567B0 * v0 = ov25_0225523C(param1); - const UnkStruct_ov41_022567B0_1 * v1 = ov25_02255240(param1); + UnkStruct_ov41_022567B0 *v0 = ov25_0225523C(param1); + const UnkStruct_ov41_022567B0_1 *v1 = ov25_02255240(param1); BGL_FillWindow(&v0->unk_48, 0x4); sub_0201ACCC(&v0->unk_48); ov41_022568C8(param1); } -static void ov41_02256B8C (SysTask * param0, void * param1) +static void ov41_02256B8C(SysTask *param0, void *param1) { - UnkStruct_ov41_022567B0 * v0 = ov25_0225523C(param1); - const UnkStruct_ov41_022567B0_1 * v1 = ov25_02255240(param1); + UnkStruct_ov41_022567B0 *v0 = ov25_0225523C(param1); + const UnkStruct_ov41_022567B0_1 *v1 = ov25_02255240(param1); u32 v2; v2 = ov25_02255248(param1); @@ -406,10 +407,10 @@ static void ov41_02256B8C (SysTask * param0, void * param1) } } -static void ov41_02256D1C (SysTask * param0, void * param1) +static void ov41_02256D1C(SysTask *param0, void *param1) { - UnkStruct_ov41_022567B0 * v0 = ov25_0225523C(param1); - const UnkStruct_ov41_022567B0_1 * v1 = ov25_02255240(param1); + UnkStruct_ov41_022567B0 *v0 = ov25_0225523C(param1); + const UnkStruct_ov41_022567B0_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: diff --git a/src/overlay042/ov42_022561C0.c b/src/overlay042/ov42_022561C0.c index 959f047992..6f77293de3 100644 --- a/src/overlay042/ov42_022561C0.c +++ b/src/overlay042/ov42_022561C0.c @@ -1,19 +1,19 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay042/struct_ov42_022563D4_decl.h" +#include "overlay025/poketch_system.h" +#include "overlay042/ov42_022563D4.h" #include "overlay042/struct_ov42_022563D4_1.h" +#include "overlay042/struct_ov42_022563D4_decl.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_0201D15C.h" #include "unk_02099D44.h" -#include "overlay042/ov42_022563D4.h" typedef struct { u8 unk_00; @@ -21,31 +21,31 @@ typedef struct { u8 unk_02; u32 unk_04; UnkStruct_ov42_022563D4_1 unk_08; - UnkStruct_ov42_022563D4 * unk_0C; + UnkStruct_ov42_022563D4 *unk_0C; PoketchSystem *poketchSys; } UnkStruct_ov42_0225621C; static void NitroStaticInit(void); -static BOOL ov42_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov42_0225621C(UnkStruct_ov42_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov42_02256260(UnkStruct_ov42_0225621C * param0); -static void ov42_02256280(SysTask * param0, void * param1); -static void ov42_022562B4(void * param0); -static void ov42_022562BC(UnkStruct_ov42_0225621C * param0, u32 param1); -static BOOL ov42_022562D0(UnkStruct_ov42_0225621C * param0); -static BOOL ov42_02256310(UnkStruct_ov42_0225621C * param0); -static BOOL ov42_02256364(UnkStruct_ov42_0225621C * param0); +static BOOL ov42_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov42_0225621C(UnkStruct_ov42_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov42_02256260(UnkStruct_ov42_0225621C *param0); +static void ov42_02256280(SysTask *param0, void *param1); +static void ov42_022562B4(void *param0); +static void ov42_022562BC(UnkStruct_ov42_0225621C *param0, u32 param1); +static BOOL ov42_022562D0(UnkStruct_ov42_0225621C *param0); +static BOOL ov42_02256310(UnkStruct_ov42_0225621C *param0); +static BOOL ov42_02256364(UnkStruct_ov42_0225621C *param0); static BOOL ov42_02256398(void); -static void NitroStaticInit (void) +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov42_022561D4, ov42_022562B4); } -static BOOL ov42_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov42_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov42_0225621C * v0 = (UnkStruct_ov42_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_0225621C)); + UnkStruct_ov42_0225621C *v0 = (UnkStruct_ov42_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_0225621C)); if (v0 != NULL) { if (ov42_0225621C(v0, poketchSys, param2, param3)) { @@ -61,7 +61,7 @@ static BOOL ov42_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov42_0225621C (UnkStruct_ov42_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov42_0225621C(UnkStruct_ov42_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { param0->unk_04 = param3; @@ -80,22 +80,22 @@ static BOOL ov42_0225621C (UnkStruct_ov42_0225621C * param0, PoketchSystem *poke return 0; } -static void ov42_02256260 (UnkStruct_ov42_0225621C * param0) +static void ov42_02256260(UnkStruct_ov42_0225621C *param0) { sub_02099D54(param0->unk_04, &(param0->unk_08), sizeof(param0->unk_08)); ov42_0225648C(param0->unk_0C); Heap_FreeToHeap(param0); } -static void ov42_02256280 (SysTask * param0, void * param1) +static void ov42_02256280(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov42_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov42_0225621C *) = { ov42_022562D0, ov42_02256310, ov42_02256364 }; - UnkStruct_ov42_0225621C * v1 = (UnkStruct_ov42_0225621C *)param1; + UnkStruct_ov42_0225621C *v1 = (UnkStruct_ov42_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -107,12 +107,12 @@ static void ov42_02256280 (SysTask * param0, void * param1) } } -static void ov42_022562B4 (void * param0) +static void ov42_022562B4(void *param0) { ((UnkStruct_ov42_0225621C *)param0)->unk_02 = 1; } -static void ov42_022562BC (UnkStruct_ov42_0225621C * param0, u32 param1) +static void ov42_022562BC(UnkStruct_ov42_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -123,7 +123,7 @@ static void ov42_022562BC (UnkStruct_ov42_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov42_022562D0 (UnkStruct_ov42_0225621C * param0) +static BOOL ov42_022562D0(UnkStruct_ov42_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -141,7 +141,7 @@ static BOOL ov42_022562D0 (UnkStruct_ov42_0225621C * param0) return 0; } -static BOOL ov42_02256310 (UnkStruct_ov42_0225621C * param0) +static BOOL ov42_02256310(UnkStruct_ov42_0225621C *param0) { if (param0->unk_02) { ov42_022562BC(param0, 2); @@ -166,7 +166,7 @@ static BOOL ov42_02256310 (UnkStruct_ov42_0225621C * param0) return 0; } -static BOOL ov42_02256364 (UnkStruct_ov42_0225621C * param0) +static BOOL ov42_02256364(UnkStruct_ov42_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -183,7 +183,7 @@ static BOOL ov42_02256364 (UnkStruct_ov42_0225621C * param0) return 0; } -static BOOL ov42_02256398 (void) +static BOOL ov42_02256398(void) { u32 x, y; diff --git a/src/overlay042/ov42_022563D4.c b/src/overlay042/ov42_022563D4.c index 8bfc3ac133..251eead7b8 100644 --- a/src/overlay042/ov42_022563D4.c +++ b/src/overlay042/ov42_022563D4.c @@ -1,53 +1,54 @@ +#include "overlay042/ov42_022563D4.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay042/struct_ov42_022563D4_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay042/struct_ov42_022563D4_1.h" +#include "overlay042/struct_ov42_022563D4_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay042/ov42_022563D4.h" static fx32 Unk_ov42_02256720 = 0; static fx32 Unk_ov42_02256724 = 0; struct UnkStruct_ov42_022563D4_t { - const UnkStruct_ov42_022563D4_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov42_022563D4_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24; UnkStruct_ov25_02255958 unk_28; fx32 unk_3C; fx32 unk_40; BOOL unk_44; }; -static void ov42_02256420(UnkStruct_ov42_022563D4 * param0); -static void ov42_02256474(UnkStruct_ov42_022563D4 * param0); -static void ov42_022564DC(UnkStruct_ov25_02255224 * param0); -static void ov42_022564F0(SysTask * param0, void * param1); -static void ov42_02256580(SysTask * param0, void * param1); -static void ov42_022565C4(SysTask * param0, void * param1); +static void ov42_02256420(UnkStruct_ov42_022563D4 *param0); +static void ov42_02256474(UnkStruct_ov42_022563D4 *param0); +static void ov42_022564DC(UnkStruct_ov25_02255224 *param0); +static void ov42_022564F0(SysTask *param0, void *param1); +static void ov42_02256580(SysTask *param0, void *param1); +static void ov42_022565C4(SysTask *param0, void *param1); -BOOL ov42_022563D4 (UnkStruct_ov42_022563D4 ** param0, const UnkStruct_ov42_022563D4_1 * param1, BGL * param2) +BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563D4_1 *param1, BGL *param2) { - UnkStruct_ov42_022563D4 * v0 = (UnkStruct_ov42_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_022563D4)); + UnkStruct_ov42_022563D4 *v0 = (UnkStruct_ov42_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov42_022563D4)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -66,10 +67,10 @@ BOOL ov42_022563D4 (UnkStruct_ov42_022563D4 ** param0, const UnkStruct_ov42_0225 return 0; } -static void ov42_02256420 (UnkStruct_ov42_022563D4 * param0) +static void ov42_02256420(UnkStruct_ov42_022563D4 *param0) { static const UnkStruct_ov25_02255810 v0 = { - {(112 << FX32_SHIFT), (144 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (144 << FX32_SHIFT) }, 1, 0, 2, @@ -87,13 +88,13 @@ static void ov42_02256420 (UnkStruct_ov42_022563D4 * param0) } } -static void ov42_02256474 (UnkStruct_ov42_022563D4 * param0) +static void ov42_02256474(UnkStruct_ov42_022563D4 *param0) { ov25_022558B0(param0->unk_20, param0->unk_24); ov25_022559B0(&(param0->unk_28)); } -void ov42_0225648C (UnkStruct_ov42_022563D4 * param0) +void ov42_0225648C(UnkStruct_ov42_022563D4 *param0) { if (param0 != NULL) { ov42_02256474(param0); @@ -102,34 +103,34 @@ void ov42_0225648C (UnkStruct_ov42_022563D4 * param0) } static const UnkStruct_ov25_0225517C Unk_ov42_022566E0[] = { - {0x0, ov42_022564F0, 0x0}, - {0x1, ov42_02256580, 0x0}, - {0x2, ov42_022565C4, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov42_022564F0, 0x0 }, + { 0x1, ov42_02256580, 0x0 }, + { 0x2, ov42_022565C4, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov42_022564A0 (UnkStruct_ov42_022563D4 * param0, u32 param1) +void ov42_022564A0(UnkStruct_ov42_022563D4 *param0, u32 param1) { ov25_0225517C(Unk_ov42_022566E0, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov42_022564C4 (UnkStruct_ov42_022563D4 * param0, u32 param1) +BOOL ov42_022564C4(UnkStruct_ov42_022563D4 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov42_022564D0 (UnkStruct_ov42_022563D4 * param0) +BOOL ov42_022564D0(UnkStruct_ov42_022563D4 *param0) { return ov25_02255154(param0->unk_08); } -static void ov42_022564DC (UnkStruct_ov25_02255224 * param0) +static void ov42_022564DC(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov42_022563D4 * v0 = ov25_0225523C(param0); + UnkStruct_ov42_022563D4 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov42_022564F0 (SysTask * param0, void * param1) +static void ov42_022564F0(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -147,9 +148,9 @@ static void ov42_022564F0 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov42_022563D4 * v2; - void * v3; - NNSG2dPaletteData * v4; + UnkStruct_ov42_022563D4 *v2; + void *v3; + NNSG2dPaletteData *v4; v2 = ov25_0225523C(param1); @@ -166,9 +167,9 @@ static void ov42_022564F0 (SysTask * param0, void * param1) ov42_022564DC(param1); } -static void ov42_02256580 (SysTask * param0, void * param1) +static void ov42_02256580(SysTask *param0, void *param1) { - UnkStruct_ov42_022563D4 * v0 = ov25_0225523C(param1); + UnkStruct_ov42_022563D4 *v0 = ov25_0225523C(param1); switch (ov25_02255248(param1)) { case 0: @@ -183,10 +184,10 @@ static void ov42_02256580 (SysTask * param0, void * param1) } } -static void ov42_022565C4 (SysTask * param0, void * param1) +static void ov42_022565C4(SysTask *param0, void *param1) { - UnkStruct_ov42_022563D4 * v0 = ov25_0225523C(param1); - const UnkStruct_ov42_022563D4_1 * v1 = ov25_02255240(param1); + UnkStruct_ov42_022563D4 *v0 = ov25_0225523C(param1); + const UnkStruct_ov42_022563D4_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: diff --git a/src/overlay043/ov43_022561C0.c b/src/overlay043/ov43_022561C0.c index c0d37672d2..4d98f78ee0 100644 --- a/src/overlay043/ov43_022561C0.c +++ b/src/overlay043/ov43_022561C0.c @@ -1,20 +1,20 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay043/struct_ov43_02256544_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay043/ov43_02256544.h" #include "overlay043/struct_ov43_02256544_1.h" +#include "overlay043/struct_ov43_02256544_decl.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02099D44.h" -#include "overlay043/ov43_02256544.h" typedef struct { u8 unk_00; @@ -22,7 +22,7 @@ typedef struct { u8 unk_02; u32 unk_04; UnkStruct_ov43_02256544_1 unk_08; - UnkStruct_ov43_02256544 * unk_14; + UnkStruct_ov43_02256544 *unk_14; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u32 unk_20; @@ -30,28 +30,28 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov43_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov43_0225621C(UnkStruct_ov43_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov43_02256288(UnkStruct_ov43_02256544_1 * param0); -static void ov43_022562A8(UnkStruct_ov43_0225621C * param0); -static void ov43_022562CC(SysTask * param0, void * param1); -static void ov43_02256308(u32 param0, u32 param1, u32 param2, void * param3); -static void ov43_02256310(void * param0); -static void ov43_02256318(UnkStruct_ov43_0225621C * param0, u32 param1); -static BOOL ov43_0225632C(UnkStruct_ov43_0225621C * param0); -static BOOL ov43_0225636C(UnkStruct_ov43_0225621C * param0); -static BOOL ov43_02256478(UnkStruct_ov43_0225621C * param0); +static BOOL ov43_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov43_0225621C(UnkStruct_ov43_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov43_02256288(UnkStruct_ov43_02256544_1 *param0); +static void ov43_022562A8(UnkStruct_ov43_0225621C *param0); +static void ov43_022562CC(SysTask *param0, void *param1); +static void ov43_02256308(u32 param0, u32 param1, u32 param2, void *param3); +static void ov43_02256310(void *param0); +static void ov43_02256318(UnkStruct_ov43_0225621C *param0, u32 param1); +static BOOL ov43_0225632C(UnkStruct_ov43_0225621C *param0); +static BOOL ov43_0225636C(UnkStruct_ov43_0225621C *param0); +static BOOL ov43_02256478(UnkStruct_ov43_0225621C *param0); static u32 ov43_022564AC(u32 param0, u32 param1, u32 param2); static u32 ov43_022564EC(s32 param0, s32 param1, BOOL param2); -static void NitroStaticInit (void) +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov43_022561D4, ov43_02256310); } -static BOOL ov43_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov43_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov43_0225621C * v0 = (UnkStruct_ov43_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov43_0225621C)); + UnkStruct_ov43_0225621C *v0 = (UnkStruct_ov43_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov43_0225621C)); if (v0 != NULL) { if (ov43_0225621C(v0, poketchSys, param2, param3)) { @@ -67,15 +67,15 @@ static BOOL ov43_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov43_0225621C (UnkStruct_ov43_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov43_0225621C(UnkStruct_ov43_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { static const TouchScreenHitTable v0[] = { - {112, 144, 16, 40}, - {112, 144, 104, 128}, - {24, 56, 96, 120}, - {24, 56, 184, 208}, - {56, 88, 96, 120}, - {56, 88, 184, 208} + { 112, 144, 16, 40 }, + { 112, 144, 104, 128 }, + { 24, 56, 96, 120 }, + { 24, 56, 184, 208 }, + { 56, 88, 96, 120 }, + { 56, 88, 184, 208 } }; param0->unk_04 = param3; @@ -98,7 +98,7 @@ static BOOL ov43_0225621C (UnkStruct_ov43_0225621C * param0, PoketchSystem *poke return 0; } -static void ov43_02256288 (UnkStruct_ov43_02256544_1 * param0) +static void ov43_02256288(UnkStruct_ov43_02256544_1 *param0) { param0->unk_00 = 0; param0->unk_06 = 0; @@ -107,7 +107,7 @@ static void ov43_02256288 (UnkStruct_ov43_02256544_1 * param0) param0->unk_04 = ov43_022564AC(param0->unk_06, param0->unk_08, param0->unk_0A); } -static void ov43_022562A8 (UnkStruct_ov43_0225621C * param0) +static void ov43_022562A8(UnkStruct_ov43_0225621C *param0) { sub_02099D54(param0->unk_04, &(param0->unk_08), sizeof(param0->unk_08)); PoketchButtonManager_Free(param0->buttonManager); @@ -115,15 +115,15 @@ static void ov43_022562A8 (UnkStruct_ov43_0225621C * param0) Heap_FreeToHeap(param0); } -static void ov43_022562CC (SysTask * param0, void * param1) +static void ov43_022562CC(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov43_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov43_0225621C *) = { ov43_0225632C, ov43_0225636C, ov43_02256478 }; - UnkStruct_ov43_0225621C * v1 = (UnkStruct_ov43_0225621C *)param1; + UnkStruct_ov43_0225621C *v1 = (UnkStruct_ov43_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -137,20 +137,20 @@ static void ov43_022562CC (SysTask * param0, void * param1) } } -static void ov43_02256308 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov43_02256308(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov43_0225621C * v0 = (UnkStruct_ov43_0225621C *)param3; + UnkStruct_ov43_0225621C *v0 = (UnkStruct_ov43_0225621C *)param3; v0->unk_08.unk_00 = param0; v0->unk_20 = param1; } -static void ov43_02256310 (void * param0) +static void ov43_02256310(void *param0) { ((UnkStruct_ov43_0225621C *)param0)->unk_02 = 1; } -static void ov43_02256318 (UnkStruct_ov43_0225621C * param0, u32 param1) +static void ov43_02256318(UnkStruct_ov43_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -161,7 +161,7 @@ static void ov43_02256318 (UnkStruct_ov43_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov43_0225632C (UnkStruct_ov43_0225621C * param0) +static BOOL ov43_0225632C(UnkStruct_ov43_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -179,7 +179,7 @@ static BOOL ov43_0225632C (UnkStruct_ov43_0225621C * param0) return 0; } -static BOOL ov43_0225636C (UnkStruct_ov43_0225621C * param0) +static BOOL ov43_0225636C(UnkStruct_ov43_0225621C *param0) { if (param0->unk_02) { if (ov43_022566E0(param0->unk_14)) { @@ -242,7 +242,7 @@ static BOOL ov43_0225636C (UnkStruct_ov43_0225621C * param0) return 0; } -static BOOL ov43_02256478 (UnkStruct_ov43_0225621C * param0) +static BOOL ov43_02256478(UnkStruct_ov43_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -259,27 +259,27 @@ static BOOL ov43_02256478 (UnkStruct_ov43_0225621C * param0) return 0; } -static u32 ov43_022564AC (u32 param0, u32 param1, u32 param2) +static u32 ov43_022564AC(u32 param0, u32 param1, u32 param2) { static const s8 v0[][18] = { - {0, 0, 0, 0, 0, -1, 0, -10, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - {1, 0, -1, -1, 0, 1, -1, -10, 1, 0, 0, 0, 0, 0, -1, 1, 0, 1}, - {0, 1, 0, 0, 0, -1, 1, 0, -1, 0, 0, 0, 1, -1, 0, 0, 0, 0}, - {0, 0, 0, -1, -1, -1, 0, -1, -10, 0, 0, 0, 1, 0, 0, 0, 0, 0}, - {0, 0, -10, 1, 0, 1, -1, 0, 1, 0, 1, 0, -1, 1, 0, 0, 0, 0}, - {0, -1, 1, 0, -1, 0, 1, 0, -1, 0, 1, 0, 0, 0, 0, 1, 0, 0}, - {0, -1, -1, -1, 0, 0, 0, -1, -1, 0, -1, 0, 1, 0, 1, 0, 0, 1}, - {-10, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 1, 0, 0, -1}, - {0, 0, 0, 0, 0, 1, 0, 0, -1, 0, -1, -1, 0, -1, 0, 1, 0, 0}, - {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, -1, 1, 0, 1, 0, -1, -1, 1, 0, 0, 1, -1, 0}, - {0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, -1, -1, 0, 0, 0, -1, 0}, - {0, 0, -1, -1, 1, 1, -1, 0, -1, 0, -1, 1, -1, 0, 0, 0, -1, 0}, - {0, 0, 1, 0, -10, 0, 0, 0, 0, 0, 0, 1, -1, -1, 0, 0, -1, 0}, - {0, 1, 0, 1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, -1, 0, 0, -10}, - {0, 0, 1, 0, 1, 0, 0, 0, -1, 0, -1, -1, 1, 0, 0, -1, 1, 0}, - {0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 1, 0}, - {0, -1, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 1, 0, 0, -1} + { 0, 0, 0, 0, 0, -1, 0, -10, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 1, 0, -1, -1, 0, 1, -1, -10, 1, 0, 0, 0, 0, 0, -1, 1, 0, 1 }, + { 0, 1, 0, 0, 0, -1, 1, 0, -1, 0, 0, 0, 1, -1, 0, 0, 0, 0 }, + { 0, 0, 0, -1, -1, -1, 0, -1, -10, 0, 0, 0, 1, 0, 0, 0, 0, 0 }, + { 0, 0, -10, 1, 0, 1, -1, 0, 1, 0, 1, 0, -1, 1, 0, 0, 0, 0 }, + { 0, -1, 1, 0, -1, 0, 1, 0, -1, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, + { 0, -1, -1, -1, 0, 0, 0, -1, -1, 0, -1, 0, 1, 0, 1, 0, 0, 1 }, + { -10, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 1, 0, 0, -1 }, + { 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, -1, -1, 0, -1, 0, 1, 0, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, -1, 1, 0, 1, 0, -1, -1, 1, 0, 0, 1, -1, 0 }, + { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, -1, -1, 0, 0, 0, -1, 0 }, + { 0, 0, -1, -1, 1, 1, -1, 0, -1, 0, -1, 1, -1, 0, 0, 0, -1, 0 }, + { 0, 0, 1, 0, -10, 0, 0, 0, 0, 0, 0, 1, -1, -1, 0, 0, -1, 0 }, + { 0, 1, 0, 1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, -1, 0, 0, -10 }, + { 0, 0, 1, 0, 1, 0, 0, 0, -1, 0, -1, -1, 1, 0, 0, -1, 1, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 1, 0 }, + { 0, -1, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 1, 0, 0, -1 } }; if ((v0[param0][param1] == -10) || ((param2 != 18) && (v0[param0][param2] == -10))) { @@ -297,7 +297,7 @@ static u32 ov43_022564AC (u32 param0, u32 param1, u32 param2) } } -static u32 ov43_022564EC (s32 param0, s32 param1, BOOL param2) +static u32 ov43_022564EC(s32 param0, s32 param1, BOOL param2) { static const u8 v0[] = { 0, diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index e2576f71ca..7ccb08cba0 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -1,70 +1,69 @@ +#include "overlay043/ov43_02256544.h" + #include #include -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay043/struct_ov43_02256544_decl.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay043/struct_ov43_02256544_1.h" +#include "overlay043/struct_ov43_02256544_decl.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02006E3C.h" -#include "message.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay043/ov43_02256544.h" struct UnkStruct_ov43_02256544_t { - const UnkStruct_ov43_02256544_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov43_02256544_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; - UnkStruct_ov25_022555E8 * unk_30; - UnkStruct_ov25_022558C4 * unk_34[6]; - UnkStruct_ov25_022558C4 * unk_4C[5]; + UnkStruct_ov25_022555E8 *unk_30; + UnkStruct_ov25_022558C4 *unk_34[6]; + UnkStruct_ov25_022558C4 *unk_4C[5]; UnkStruct_ov25_02255958 unk_60; Window unk_74; Window unk_84; Window unk_94; Window unk_A4; - MessageLoader * unk_B4; - MessageLoader * unk_B8; - Strbuf* unk_BC; + MessageLoader *unk_B4; + MessageLoader *unk_B8; + Strbuf *unk_BC; }; -static void ov43_022565B4(UnkStruct_ov43_02256544 * param0); -static void ov43_02256640(UnkStruct_ov43_02256544 * param0); -static void ov43_022566EC(UnkStruct_ov25_02255224 * param0); -static void ov43_02256700(SysTask * param0, void * param1); -static void ov43_022567A4(UnkStruct_ov43_02256544 * param0, const UnkStruct_ov43_02256544_1 * param1, u32 param2); -static void ov43_02256870(UnkStruct_ov43_02256544 * param0); -static void ov43_02256894(SysTask * param0, void * param1); -static void ov43_022568B4(SysTask * param0, void * param1); -static void ov43_022568F0(SysTask * param0, void * param1); -static void ov43_02256924(SysTask * param0, void * param1); -static void ov43_02256948(UnkStruct_ov43_02256544 * param0, const UnkStruct_ov43_02256544_1 * param1); -static void ov43_02256988(UnkStruct_ov43_02256544 * param0, Window * param1, u32 param2); -static void ov43_02256A00(UnkStruct_ov43_02256544 * param0, Window * param1, u32 param2); -static void ov43_02256A4C(UnkStruct_ov43_02256544 * param0, u32 param1); - -BOOL ov43_02256544 (UnkStruct_ov43_02256544 ** param0, const UnkStruct_ov43_02256544_1 * param1, BGL * param2) +static void ov43_022565B4(UnkStruct_ov43_02256544 *param0); +static void ov43_02256640(UnkStruct_ov43_02256544 *param0); +static void ov43_022566EC(UnkStruct_ov25_02255224 *param0); +static void ov43_02256700(SysTask *param0, void *param1); +static void ov43_022567A4(UnkStruct_ov43_02256544 *param0, const UnkStruct_ov43_02256544_1 *param1, u32 param2); +static void ov43_02256870(UnkStruct_ov43_02256544 *param0); +static void ov43_02256894(SysTask *param0, void *param1); +static void ov43_022568B4(SysTask *param0, void *param1); +static void ov43_022568F0(SysTask *param0, void *param1); +static void ov43_02256924(SysTask *param0, void *param1); +static void ov43_02256948(UnkStruct_ov43_02256544 *param0, const UnkStruct_ov43_02256544_1 *param1); +static void ov43_02256988(UnkStruct_ov43_02256544 *param0, Window *param1, u32 param2); +static void ov43_02256A00(UnkStruct_ov43_02256544 *param0, Window *param1, u32 param2); +static void ov43_02256A4C(UnkStruct_ov43_02256544 *param0, u32 param1); + +BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_02256544_1 *param1, BGL *param2) { - UnkStruct_ov43_02256544 * v0 = (UnkStruct_ov43_02256544 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov43_02256544)); + UnkStruct_ov43_02256544 *v0 = (UnkStruct_ov43_02256544 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov43_02256544)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); @@ -83,60 +82,60 @@ BOOL ov43_02256544 (UnkStruct_ov43_02256544 ** param0, const UnkStruct_ov43_0225 return 0; } -static void ov43_022565B4 (UnkStruct_ov43_02256544 * param0) +static void ov43_022565B4(UnkStruct_ov43_02256544 *param0) { static const UnkStruct_ov25_02255810 v0[] = { { - {(28 << FX32_SHIFT), (128 << FX32_SHIFT)}, + { (28 << FX32_SHIFT), (128 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(116 << FX32_SHIFT), (128 << FX32_SHIFT)}, + { (116 << FX32_SHIFT), (128 << FX32_SHIFT) }, 2, 0, 2, 0, - 0 + 0, }, { - {(108 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (108 << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(196 << FX32_SHIFT), (40 << FX32_SHIFT)}, + { (196 << FX32_SHIFT), (40 << FX32_SHIFT) }, 2, 0, 2, 0, - 0 + 0, }, { - {(108 << FX32_SHIFT), (72 << FX32_SHIFT)}, + { (108 << FX32_SHIFT), (72 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(196 << FX32_SHIFT), (72 << FX32_SHIFT)}, + { (196 << FX32_SHIFT), (72 << FX32_SHIFT) }, 2, 0, 2, 0, - 0 + 0, }, }; static const UnkStruct_ov25_02255810 v1 = { - {(44 << FX32_SHIFT), (48 << FX32_SHIFT)}, + { (44 << FX32_SHIFT), (48 << FX32_SHIFT) }, 5, 0, 2, @@ -158,7 +157,7 @@ static void ov43_022565B4 (UnkStruct_ov43_02256544 * param0) } } -static void ov43_02256640 (UnkStruct_ov43_02256544 * param0) +static void ov43_02256640(UnkStruct_ov43_02256544 *param0) { int v0; @@ -177,7 +176,7 @@ static void ov43_02256640 (UnkStruct_ov43_02256544 * param0) ov25_022559B0(¶m0->unk_60); } -void ov43_02256680 (UnkStruct_ov43_02256544 * param0) +void ov43_02256680(UnkStruct_ov43_02256544 *param0) { if (param0 != NULL) { Strbuf_Free(param0->unk_BC); @@ -189,36 +188,36 @@ void ov43_02256680 (UnkStruct_ov43_02256544 * param0) } static const UnkStruct_ov25_0225517C Unk_ov43_02256C34[] = { - {0x0, ov43_02256700, 0x0}, - {0x1, ov43_02256894, 0x0}, - {0x2, ov43_022568B4, 0x0}, - {0x3, ov43_022568F0, 0x0}, - {0x4, ov43_02256924, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov43_02256700, 0x0 }, + { 0x1, ov43_02256894, 0x0 }, + { 0x2, ov43_022568B4, 0x0 }, + { 0x3, ov43_022568F0, 0x0 }, + { 0x4, ov43_02256924, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov43_022566B0 (UnkStruct_ov43_02256544 * param0, u32 param1) +void ov43_022566B0(UnkStruct_ov43_02256544 *param0, u32 param1) { ov25_0225517C(Unk_ov43_02256C34, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov43_022566D4 (UnkStruct_ov43_02256544 * param0, u32 param1) +BOOL ov43_022566D4(UnkStruct_ov43_02256544 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov43_022566E0 (UnkStruct_ov43_02256544 * param0) +BOOL ov43_022566E0(UnkStruct_ov43_02256544 *param0) { return ov25_02255154(param0->unk_08); } -static void ov43_022566EC (UnkStruct_ov25_02255224 * param0) +static void ov43_022566EC(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov43_02256544 * v0 = ov25_0225523C(param0); + UnkStruct_ov43_02256544 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov43_02256700 (SysTask * param0, void * param1) +static void ov43_02256700(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -236,10 +235,10 @@ static void ov43_02256700 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov43_02256544 * v2; - const UnkStruct_ov43_02256544_1 * v3; - void * v4; - NNSG2dPaletteData * v5; + UnkStruct_ov43_02256544 *v2; + const UnkStruct_ov43_02256544_1 *v3; + void *v4; + NNSG2dPaletteData *v5; u32 v6; v2 = ov25_0225523C(param1); @@ -261,7 +260,7 @@ static void ov43_02256700 (SysTask * param0, void * param1) ov43_022566EC(param1); } -static void ov43_022567A4 (UnkStruct_ov43_02256544 * param0, const UnkStruct_ov43_02256544_1 * param1, u32 param2) +static void ov43_022567A4(UnkStruct_ov43_02256544 *param0, const UnkStruct_ov43_02256544_1 *param1, u32 param2) { BGL_AddWindow(param0->unk_04, &(param0->unk_74), 6, 6, 15, 6, 2, 0, param2); param2 += 12; @@ -282,7 +281,7 @@ static void ov43_022567A4 (UnkStruct_ov43_02256544 * param0, const UnkStruct_ov4 ov43_02256948(param0, param1); } -static void ov43_02256870 (UnkStruct_ov43_02256544 * param0) +static void ov43_02256870(UnkStruct_ov43_02256544 *param0) { BGL_DeleteWindow(&(param0->unk_74)); BGL_DeleteWindow(&(param0->unk_84)); @@ -290,50 +289,50 @@ static void ov43_02256870 (UnkStruct_ov43_02256544 * param0) BGL_DeleteWindow(&(param0->unk_A4)); } -static void ov43_02256894 (SysTask * param0, void * param1) +static void ov43_02256894(SysTask *param0, void *param1) { - UnkStruct_ov43_02256544 * v0 = ov25_0225523C(param1); + UnkStruct_ov43_02256544 *v0 = ov25_0225523C(param1); ov43_02256870(v0); sub_02019044(v0->unk_04, 6); ov43_022566EC(param1); } -static void ov43_022568B4 (SysTask * param0, void * param1) +static void ov43_022568B4(SysTask *param0, void *param1) { - UnkStruct_ov43_02256544 * v0 = ov25_0225523C(param1); - const UnkStruct_ov43_02256544_1 * v1 = ov25_02255240(param1); + UnkStruct_ov43_02256544 *v0 = ov25_0225523C(param1); + const UnkStruct_ov43_02256544_1 *v1 = ov25_02255240(param1); u32 v2; - v2 = (v1->unk_00 & 1) ? 3 : 1; + v2 = (v1->unk_00 & 1) ? 3 : 1; ov25_022558C4(v0->unk_34[v1->unk_00], v2); PoketchSystem_PlaySoundEffect(1635); ov43_022566EC(param1); } -static void ov43_022568F0 (SysTask * param0, void * param1) +static void ov43_022568F0(SysTask *param0, void *param1) { - UnkStruct_ov43_02256544 * v0 = ov25_0225523C(param1); - const UnkStruct_ov43_02256544_1 * v1 = ov25_02255240(param1); + UnkStruct_ov43_02256544 *v0 = ov25_0225523C(param1); + const UnkStruct_ov43_02256544_1 *v1 = ov25_02255240(param1); u32 v2; - v2 = (v1->unk_00 & 1) ? 2 : 0; + v2 = (v1->unk_00 & 1) ? 2 : 0; ov25_022558C4(v0->unk_34[v1->unk_00], v2); ov43_022566EC(param1); } -static void ov43_02256924 (SysTask * param0, void * param1) +static void ov43_02256924(SysTask *param0, void *param1) { - UnkStruct_ov43_02256544 * v0 = ov25_0225523C(param1); - const UnkStruct_ov43_02256544_1 * v1 = ov25_02255240(param1); + UnkStruct_ov43_02256544 *v0 = ov25_0225523C(param1); + const UnkStruct_ov43_02256544_1 *v1 = ov25_02255240(param1); ov43_02256948(v0, v1); ov43_022566EC(param1); } -static void ov43_02256948 (UnkStruct_ov43_02256544 * param0, const UnkStruct_ov43_02256544_1 * param1) +static void ov43_02256948(UnkStruct_ov43_02256544 *param0, const UnkStruct_ov43_02256544_1 *param1) { ov43_02256988(param0, &(param0->unk_74), param1->unk_06); ov43_02256988(param0, &(param0->unk_84), param1->unk_08); @@ -342,7 +341,7 @@ static void ov43_02256948 (UnkStruct_ov43_02256544 * param0, const UnkStruct_ov4 ov43_02256A4C(param0, param1->unk_04); } -static void ov43_02256988 (UnkStruct_ov43_02256544 * param0, Window * param1, u32 param2) +static void ov43_02256988(UnkStruct_ov43_02256544 *param0, Window *param1, u32 param2) { u32 v0; @@ -360,7 +359,7 @@ static void ov43_02256988 (UnkStruct_ov43_02256544 * param0, Window * param1, u3 sub_0201ACCC(param1); } -static void ov43_02256A00 (UnkStruct_ov43_02256544 * param0, Window * param1, u32 param2) +static void ov43_02256A00(UnkStruct_ov43_02256544 *param0, Window *param1, u32 param2) { BGL_FillWindow(param1, 4); MessageLoader_GetStrbuf(param0->unk_B8, param2, param0->unk_BC); @@ -368,7 +367,7 @@ static void ov43_02256A00 (UnkStruct_ov43_02256544 * param0, Window * param1, u3 sub_0201ACCC(param1); } -static void ov43_02256A4C (UnkStruct_ov43_02256544 * param0, u32 param1) +static void ov43_02256A4C(UnkStruct_ov43_02256544 *param0, u32 param1) { u32 v0; @@ -376,7 +375,7 @@ static void ov43_02256A4C (UnkStruct_ov43_02256544 * param0, u32 param1) ov25_022558C4(param0->unk_4C[v0], 4); } - for ( ; v0 < 5; v0++) { + for (; v0 < 5; v0++) { ov25_022558C4(param0->unk_4C[v0], 5); } } diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c index 73d8963a7b..53f3ec31ba 100644 --- a/src/overlay044/ov44_022561C0.c +++ b/src/overlay044/ov44_022561C0.c @@ -1,63 +1,62 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay044/struct_ov44_022565BC_decl.h" -#include "touch_screen.h" +#include "overlay005/ov5_021E622C.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay044/ov44_022565BC.h" #include "overlay044/struct_ov44_022565BC_1.h" +#include "overlay044/struct_ov44_022565BC_decl.h" -#include "sys_task.h" #include "heap.h" +#include "party.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "party.h" -#include "overlay005/ov5_021E622C.h" -#include "overlay044/ov44_022565BC.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov44_022565BC_1 unk_04; - UnkStruct_ov44_022565BC * unk_38; + UnkStruct_ov44_022565BC *unk_38; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u16 unk_44; u16 unk_46; - BoxPokemon * unk_48[6]; - BoxPokemon * unk_60[2]; + BoxPokemon *unk_48[6]; + BoxPokemon *unk_60[2]; } UnkStruct_ov44_0225621C; static void NitroStaticInit(void); -static BOOL ov44_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov44_0225621C(UnkStruct_ov44_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov44_02256314(UnkStruct_ov44_0225621C * param0); -static void ov44_0225632C(u32 param0, u32 param1, u32 param2, void * param3); -static void ov44_02256338(SysTask * param0, void * param1); -static void ov44_02256374(void * param0); -static void ov44_0225637C(UnkStruct_ov44_0225621C * param0, u32 param1); -static BOOL ov44_02256390(UnkStruct_ov44_0225621C * param0); -static BOOL ov44_022563D0(UnkStruct_ov44_0225621C * param0); -static BOOL ov44_022564F0(UnkStruct_ov44_0225621C * param0); -static BOOL ov44_0225653C(UnkStruct_ov44_0225621C * param0); -static BOOL ov44_02256588(UnkStruct_ov44_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov44_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov44_0225621C(UnkStruct_ov44_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov44_02256314(UnkStruct_ov44_0225621C *param0); +static void ov44_0225632C(u32 param0, u32 param1, u32 param2, void *param3); +static void ov44_02256338(SysTask *param0, void *param1); +static void ov44_02256374(void *param0); +static void ov44_0225637C(UnkStruct_ov44_0225621C *param0, u32 param1); +static BOOL ov44_02256390(UnkStruct_ov44_0225621C *param0); +static BOOL ov44_022563D0(UnkStruct_ov44_0225621C *param0); +static BOOL ov44_022564F0(UnkStruct_ov44_0225621C *param0); +static BOOL ov44_0225653C(UnkStruct_ov44_0225621C *param0); +static BOOL ov44_02256588(UnkStruct_ov44_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov44_022561D4, ov44_02256374); } -static BOOL ov44_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov44_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov44_0225621C * v0 = (UnkStruct_ov44_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_0225621C)); + UnkStruct_ov44_0225621C *v0 = (UnkStruct_ov44_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_0225621C)); if (v0 != NULL) { if (ov44_0225621C(v0, poketchSys, param2, param3)) { @@ -73,10 +72,10 @@ static BOOL ov44_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov44_0225621C(UnkStruct_ov44_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - Party * v0 = Party_GetFromSavedata(PoketchSystem_GetSaveData(poketchSys)); - Pokemon * v1; + Party *v0 = Party_GetFromSavedata(PoketchSystem_GetSaveData(poketchSys)); + Pokemon *v1; int v2; int v3 = 0; @@ -102,9 +101,9 @@ static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem *poke if (ov44_022565BC(&(param0->unk_38), &(param0->unk_04), param2)) { static const TouchScreenHitTable v4[] = { - {128, 168, 92, 132}, - {130, 164, 24, 72}, - {130, 164, 152, 200} + { 128, 168, 92, 132 }, + { 130, 164, 24, 72 }, + { 130, 164, 152, 200 } }; param0->unk_00 = 0; @@ -120,28 +119,30 @@ static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem *poke return 0; } -static void ov44_02256314 (UnkStruct_ov44_0225621C * param0) +static void ov44_02256314(UnkStruct_ov44_0225621C *param0) { PoketchButtonManager_Free(param0->buttonManager); ov44_022565F8(param0->unk_38); Heap_FreeToHeap(param0); } -static void ov44_0225632C (u32 param0, u32 param1, u32 param2, void * param3) +static void ov44_0225632C(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov44_0225621C * v0 = (UnkStruct_ov44_0225621C *)param3; + UnkStruct_ov44_0225621C *v0 = (UnkStruct_ov44_0225621C *)param3; v0->unk_44 = param0; v0->unk_46 = param1; } -static void ov44_02256338 (SysTask * param0, void * param1) +static void ov44_02256338(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov44_0225621C *) = { - ov44_02256390, ov44_022563D0, ov44_02256588, + static BOOL (*const v0[])(UnkStruct_ov44_0225621C *) = { + ov44_02256390, + ov44_022563D0, + ov44_02256588, }; - UnkStruct_ov44_0225621C * v1 = (UnkStruct_ov44_0225621C *)param1; + UnkStruct_ov44_0225621C *v1 = (UnkStruct_ov44_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -155,12 +156,12 @@ static void ov44_02256338 (SysTask * param0, void * param1) } } -static void ov44_02256374 (void * param0) +static void ov44_02256374(void *param0) { ((UnkStruct_ov44_0225621C *)param0)->unk_02 = 1; } -static void ov44_0225637C (UnkStruct_ov44_0225621C * param0, u32 param1) +static void ov44_0225637C(UnkStruct_ov44_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -171,7 +172,7 @@ static void ov44_0225637C (UnkStruct_ov44_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov44_02256390 (UnkStruct_ov44_0225621C * param0) +static BOOL ov44_02256390(UnkStruct_ov44_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -189,7 +190,7 @@ static BOOL ov44_02256390 (UnkStruct_ov44_0225621C * param0) return 0; } -static BOOL ov44_022563D0 (UnkStruct_ov44_0225621C * param0) +static BOOL ov44_022563D0(UnkStruct_ov44_0225621C *param0) { if (param0->unk_02) { ov44_0225637C(param0, 2); @@ -255,7 +256,7 @@ static BOOL ov44_022563D0 (UnkStruct_ov44_0225621C * param0) return 0; } -static BOOL ov44_022564F0 (UnkStruct_ov44_0225621C * param0) +static BOOL ov44_022564F0(UnkStruct_ov44_0225621C *param0) { if (param0->unk_04.unk_30 > 2) { do { @@ -270,7 +271,7 @@ static BOOL ov44_022564F0 (UnkStruct_ov44_0225621C * param0) return 0; } -static BOOL ov44_0225653C (UnkStruct_ov44_0225621C * param0) +static BOOL ov44_0225653C(UnkStruct_ov44_0225621C *param0) { if (param0->unk_04.unk_30 > 2) { do { @@ -285,7 +286,7 @@ static BOOL ov44_0225653C (UnkStruct_ov44_0225621C * param0) return 0; } -static BOOL ov44_02256588 (UnkStruct_ov44_0225621C * param0) +static BOOL ov44_02256588(UnkStruct_ov44_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c index b1dfa3b9ac..923089def3 100644 --- a/src/overlay044/ov44_022565BC.c +++ b/src/overlay044/ov44_022565BC.c @@ -1,41 +1,42 @@ +#include "overlay044/ov44_022565BC.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay044/struct_ov44_022565BC_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay044/struct_ov44_022565BC_1.h" +#include "overlay044/struct_ov44_022565BC_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" -#include "unk_02018340.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay044/ov44_022565BC.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" +#include "unk_02018340.h" struct UnkStruct_ov44_022565BC_t { - const UnkStruct_ov44_022565BC_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov44_022565BC_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24[6]; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24[6]; UnkStruct_ov25_02255958 unk_3C; UnkStruct_ov25_02255958 unk_50; u32 unk_64; BOOL unk_68; - const int * unk_6C; + const int *unk_6C; u32 unk_70; u32 unk_74; fx32 unk_78; @@ -44,24 +45,24 @@ struct UnkStruct_ov44_022565BC_t { u32 unk_84; }; -static void ov44_0225660C(UnkStruct_ov44_022565BC * param0, const UnkStruct_ov44_022565BC_1 * param1); -static void ov44_02256718(UnkStruct_ov44_022565BC * param0); -static void ov44_02256780(UnkStruct_ov25_02255224 * param0); -static void ov44_02256794(SysTask * param0, void * param1); -static void ov44_02256828(SysTask * param0, void * param1); -static void ov44_0225686C(SysTask * param0, void * param1); -static void ov44_02256898(SysTask * param0, void * param1); -static void ov44_022568BC(SysTask * param0, void * param1); -static void ov44_02256908(SysTask * param0, void * param1); -static void ov44_02256954(UnkStruct_ov44_022565BC * param0, u32 param1, u32 param2, u16 param3, u16 param4); -static void ov44_022569AC(UnkStruct_ov44_022565BC * param0); -static void ov44_022569E4(SysTask * param0, void * param1); -static void ov44_02256A50(UnkStruct_ov44_022565BC * param0, const UnkStruct_ov44_022565BC_1 * param1); -static BOOL ov44_02256AC8(UnkStruct_ov44_022565BC * param0, const UnkStruct_ov44_022565BC_1 * param1); - -BOOL ov44_022565BC (UnkStruct_ov44_022565BC ** param0, const UnkStruct_ov44_022565BC_1 * param1, BGL * param2) +static void ov44_0225660C(UnkStruct_ov44_022565BC *param0, const UnkStruct_ov44_022565BC_1 *param1); +static void ov44_02256718(UnkStruct_ov44_022565BC *param0); +static void ov44_02256780(UnkStruct_ov25_02255224 *param0); +static void ov44_02256794(SysTask *param0, void *param1); +static void ov44_02256828(SysTask *param0, void *param1); +static void ov44_0225686C(SysTask *param0, void *param1); +static void ov44_02256898(SysTask *param0, void *param1); +static void ov44_022568BC(SysTask *param0, void *param1); +static void ov44_02256908(SysTask *param0, void *param1); +static void ov44_02256954(UnkStruct_ov44_022565BC *param0, u32 param1, u32 param2, u16 param3, u16 param4); +static void ov44_022569AC(UnkStruct_ov44_022565BC *param0); +static void ov44_022569E4(SysTask *param0, void *param1); +static void ov44_02256A50(UnkStruct_ov44_022565BC *param0, const UnkStruct_ov44_022565BC_1 *param1); +static BOOL ov44_02256AC8(UnkStruct_ov44_022565BC *param0, const UnkStruct_ov44_022565BC_1 *param1); + +BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565BC_1 *param1, BGL *param2) { - UnkStruct_ov44_022565BC * v0 = (UnkStruct_ov44_022565BC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_022565BC)); + UnkStruct_ov44_022565BC *v0 = (UnkStruct_ov44_022565BC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov44_022565BC)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -77,7 +78,7 @@ BOOL ov44_022565BC (UnkStruct_ov44_022565BC ** param0, const UnkStruct_ov44_0225 return 0; } -void ov44_022565F8 (UnkStruct_ov44_022565BC * param0) +void ov44_022565F8(UnkStruct_ov44_022565BC *param0) { if (param0 != NULL) { ov44_02256718(param0); @@ -85,57 +86,57 @@ void ov44_022565F8 (UnkStruct_ov44_022565BC * param0) } } -static void ov44_0225660C (UnkStruct_ov44_022565BC * param0, const UnkStruct_ov44_022565BC_1 * param1) +static void ov44_0225660C(UnkStruct_ov44_022565BC *param0, const UnkStruct_ov44_022565BC_1 *param1) { static const UnkStruct_ov25_02255810 v0[] = { { - {(112 << FX32_SHIFT), (148 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (148 << FX32_SHIFT) }, 9, 0, 2, 0, - 0 + 0, }, { - {(112 << FX32_SHIFT), (32 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (32 << FX32_SHIFT) }, 0, 0, 2, 1, - 0 + 0, }, { - {(48 << FX32_SHIFT), (88 << FX32_SHIFT)}, + { (48 << FX32_SHIFT), (88 << FX32_SHIFT) }, 5, 0, 2, 0, - 0 + 0, }, { - {(176 << FX32_SHIFT), (88 << FX32_SHIFT)}, + { (176 << FX32_SHIFT), (88 << FX32_SHIFT) }, 6, 0, 2, 0, - 0 + 0, }, { - {(48 << FX32_SHIFT), (140 << FX32_SHIFT)}, + { (48 << FX32_SHIFT), (140 << FX32_SHIFT) }, 5, 0, 2, 0, - 1 + 1, }, { - {(176 << FX32_SHIFT), (140 << FX32_SHIFT)}, + { (176 << FX32_SHIFT), (140 << FX32_SHIFT) }, 4, 0, 2, 0, - 1 - } + 1, + }, }; int v1; u32 v2; @@ -168,7 +169,7 @@ static void ov44_0225660C (UnkStruct_ov44_022565BC * param0, const UnkStruct_ov4 } } -static void ov44_02256718 (UnkStruct_ov44_022565BC * param0) +static void ov44_02256718(UnkStruct_ov44_022565BC *param0) { int v0; @@ -183,38 +184,38 @@ static void ov44_02256718 (UnkStruct_ov44_022565BC * param0) } static const UnkStruct_ov25_0225517C Unk_ov44_02256D5C[] = { - {0x0, ov44_02256794, 0x0}, - {0x1, ov44_02256828, 0x0}, - {0x2, ov44_0225686C, 0x0}, - {0x3, ov44_02256898, 0x0}, - {0x4, ov44_022568BC, 0x0}, - {0x5, ov44_02256908, 0x0}, - {0x6, ov44_022569E4, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov44_02256794, 0x0 }, + { 0x1, ov44_02256828, 0x0 }, + { 0x2, ov44_0225686C, 0x0 }, + { 0x3, ov44_02256898, 0x0 }, + { 0x4, ov44_022568BC, 0x0 }, + { 0x5, ov44_02256908, 0x0 }, + { 0x6, ov44_022569E4, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov44_02256744 (UnkStruct_ov44_022565BC * param0, u32 param1) +void ov44_02256744(UnkStruct_ov44_022565BC *param0, u32 param1) { ov25_0225517C(Unk_ov44_02256D5C, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov44_02256768 (UnkStruct_ov44_022565BC * param0, u32 param1) +BOOL ov44_02256768(UnkStruct_ov44_022565BC *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov44_02256774 (UnkStruct_ov44_022565BC * param0) +BOOL ov44_02256774(UnkStruct_ov44_022565BC *param0) { return ov25_02255154(param0->unk_08); } -static void ov44_02256780 (UnkStruct_ov25_02255224 * param0) +static void ov44_02256780(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov44_022565BC * v0 = ov25_0225523C(param0); + UnkStruct_ov44_022565BC *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov44_02256794 (SysTask * param0, void * param1) +static void ov44_02256794(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -232,10 +233,10 @@ static void ov44_02256794 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov44_022565BC * v2; - const UnkStruct_ov44_022565BC_1 * v3; - void * v4; - NNSG2dPaletteData * v5; + UnkStruct_ov44_022565BC *v2; + const UnkStruct_ov44_022565BC_1 *v3; + void *v4; + NNSG2dPaletteData *v5; v2 = ov25_0225523C(param1); v3 = ov25_02255240(param1); @@ -253,9 +254,9 @@ static void ov44_02256794 (SysTask * param0, void * param1) ov44_02256780(param1); } -static void ov44_02256828 (SysTask * param0, void * param1) +static void ov44_02256828(SysTask *param0, void *param1) { - UnkStruct_ov44_022565BC * v0 = ov25_0225523C(param1); + UnkStruct_ov44_022565BC *v0 = ov25_0225523C(param1); switch (ov25_02255248(param1)) { case 0: @@ -271,10 +272,10 @@ static void ov44_02256828 (SysTask * param0, void * param1) } } -static void ov44_0225686C (SysTask * param0, void * param1) +static void ov44_0225686C(SysTask *param0, void *param1) { - UnkStruct_ov44_022565BC * v0; - const UnkStruct_ov44_022565BC_1 * v1; + UnkStruct_ov44_022565BC *v0; + const UnkStruct_ov44_022565BC_1 *v1; v0 = ov25_0225523C(param1); v1 = ov25_02255240(param1); @@ -284,10 +285,10 @@ static void ov44_0225686C (SysTask * param0, void * param1) ov44_02256780(param1); } -static void ov44_02256898 (SysTask * param0, void * param1) +static void ov44_02256898(SysTask *param0, void *param1) { - UnkStruct_ov44_022565BC * v0; - const UnkStruct_ov44_022565BC_1 * v1; + UnkStruct_ov44_022565BC *v0; + const UnkStruct_ov44_022565BC_1 *v1; v0 = ov25_0225523C(param1); v1 = ov25_02255240(param1); @@ -296,10 +297,10 @@ static void ov44_02256898 (SysTask * param0, void * param1) ov44_02256780(param1); } -static void ov44_022568BC (SysTask * param0, void * param1) +static void ov44_022568BC(SysTask *param0, void *param1) { - UnkStruct_ov44_022565BC * v0 = ov25_0225523C(param1); - const UnkStruct_ov44_022565BC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov44_022565BC *v0 = ov25_0225523C(param1); + const UnkStruct_ov44_022565BC_1 *v1 = ov25_02255240(param1); int v2; v2 = v1->unk_32; @@ -310,10 +311,10 @@ static void ov44_022568BC (SysTask * param0, void * param1) ov44_02256780(param1); } -static void ov44_02256908 (SysTask * param0, void * param1) +static void ov44_02256908(SysTask *param0, void *param1) { - UnkStruct_ov44_022565BC * v0 = ov25_0225523C(param1); - const UnkStruct_ov44_022565BC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov44_022565BC *v0 = ov25_0225523C(param1); + const UnkStruct_ov44_022565BC_1 *v1 = ov25_02255240(param1); int v2 = v1->unk_33; ov25_02254444(v1->unk_18[v2], v1->unk_24[v2]); @@ -322,9 +323,9 @@ static void ov44_02256908 (SysTask * param0, void * param1) ov44_02256780(param1); } -static void ov44_02256954 (UnkStruct_ov44_022565BC * param0, u32 param1, u32 param2, u16 param3, u16 param4) +static void ov44_02256954(UnkStruct_ov44_022565BC *param0, u32 param1, u32 param2, u16 param3, u16 param4) { - UnkStruct_ov25_022558C4 * v0 = param0->unk_24[param1]; + UnkStruct_ov25_022558C4 *v0 = param0->unk_24[param1]; u32 v1; if (param1 == 5) { @@ -342,7 +343,7 @@ static void ov44_02256954 (UnkStruct_ov44_022565BC * param0, u32 param1, u32 par ov25_02255938(v0, 1 + PokeIconPaletteIndex(param3, param4, 0)); } -static void ov44_022569AC (UnkStruct_ov44_022565BC * param0) +static void ov44_022569AC(UnkStruct_ov44_022565BC *param0) { ov25_02255900(param0->unk_24[2], (48 << FX32_SHIFT), (88 << FX32_SHIFT)); ov25_02255900(param0->unk_24[3], (176 << FX32_SHIFT), (88 << FX32_SHIFT)); @@ -351,10 +352,10 @@ static void ov44_022569AC (UnkStruct_ov44_022565BC * param0) ov25_022558C4(param0->unk_24[1], 0); } -static void ov44_022569E4 (SysTask * param0, void * param1) +static void ov44_022569E4(SysTask *param0, void *param1) { - UnkStruct_ov44_022565BC * v0 = ov25_0225523C(param1); - const UnkStruct_ov44_022565BC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov44_022565BC *v0 = ov25_0225523C(param1); + const UnkStruct_ov44_022565BC_1 *v1 = ov25_02255240(param1); u32 v2 = ov25_02255248(param1); if ((v2 != 0) && v0->unk_68) { @@ -449,7 +450,7 @@ static const int Unk_ov44_02256E1C[] = { -1 }; -static void ov44_02256A50 (UnkStruct_ov44_022565BC * param0, const UnkStruct_ov44_022565BC_1 * param1) +static void ov44_02256A50(UnkStruct_ov44_022565BC *param0, const UnkStruct_ov44_022565BC_1 *param1) { param0->unk_70 = 0; param0->unk_74 = 0; @@ -477,9 +478,9 @@ static void ov44_02256A50 (UnkStruct_ov44_022565BC * param0, const UnkStruct_ov4 ov44_02256AC8(param0, param1); } -static BOOL ov44_02256AC8 (UnkStruct_ov44_022565BC * param0, const UnkStruct_ov44_022565BC_1 * param1) +static BOOL ov44_02256AC8(UnkStruct_ov44_022565BC *param0, const UnkStruct_ov44_022565BC_1 *param1) { - func_start: +func_start: switch (param0->unk_70) { case 0: while (param0->unk_70 == 0) { @@ -514,13 +515,11 @@ static BOOL ov44_02256AC8 (UnkStruct_ov44_022565BC * param0, const UnkStruct_ov4 ov25_022558C4(param0->unk_24[2], 6); ov25_022558C4(param0->unk_24[3], 5); break; - case -7: - { + case -7: { u32 v0 = param0->unk_6C[(param0->unk_74)++]; u32 v1 = param0->unk_6C[(param0->unk_74)++]; ov25_022558C4(param0->unk_24[v0], v1); - } - break; + } break; } } break; diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index 18ad2c3331..f7eee417b8 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/src/overlay045/ov45_022561C0.c @@ -1,28 +1,28 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay045/struct_ov45_022566EC_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay045/ov45_022566EC.h" #include "overlay045/struct_ov45_022566EC_1.h" +#include "overlay045/struct_ov45_022566EC_decl.h" -#include "sys_task.h" -#include "rtc.h" #include "heap.h" #include "poketch_data.h" -#include "overlay045/ov45_022566EC.h" +#include "rtc.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov45_022566EC_1 unk_03; - UnkStruct_ov45_022566EC * unk_08; + UnkStruct_ov45_022566EC *unk_08; PoketchSystem *poketchSys; PoketchData *poketchData; PoketchButtonManager *buttonManager; @@ -35,32 +35,32 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov45_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov45_022562C0(UnkStruct_ov45_022566EC_1 * param0); -static void ov45_022562F8(UnkStruct_ov45_022561D4 * param0); -static void ov45_02256310(u32 param0, u32 param1, u32 param2, void * param3); -static void ov45_02256318(SysTask * param0, void * param1); -static void ov45_02256354(void * param0); -static void ov45_0225635C(UnkStruct_ov45_022561D4 * param0, u32 param1); -static BOOL ov45_02256370(UnkStruct_ov45_022561D4 * param0); -static BOOL ov45_022563C0(UnkStruct_ov45_022561D4 * param0); -static BOOL ov45_022564D0(UnkStruct_ov45_022561D4 * param0); -static BOOL ov45_0225659C(UnkStruct_ov45_022561D4 * param0); -static BOOL ov45_02256664(UnkStruct_ov45_022561D4 * param0); -static void ov45_02256668(UnkStruct_ov45_022561D4 * param0); -static BOOL ov45_02256680(UnkStruct_ov45_022561D4 * param0, u32 * param1, u32 * param2); -static BOOL ov45_02256698(UnkStruct_ov45_022561D4 * param0); -static BOOL ov45_022566CC(UnkStruct_ov45_022566EC_1 * param0); - -static void NitroStaticInit (void) +static BOOL ov45_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov45_022562C0(UnkStruct_ov45_022566EC_1 *param0); +static void ov45_022562F8(UnkStruct_ov45_022561D4 *param0); +static void ov45_02256310(u32 param0, u32 param1, u32 param2, void *param3); +static void ov45_02256318(SysTask *param0, void *param1); +static void ov45_02256354(void *param0); +static void ov45_0225635C(UnkStruct_ov45_022561D4 *param0, u32 param1); +static BOOL ov45_02256370(UnkStruct_ov45_022561D4 *param0); +static BOOL ov45_022563C0(UnkStruct_ov45_022561D4 *param0); +static BOOL ov45_022564D0(UnkStruct_ov45_022561D4 *param0); +static BOOL ov45_0225659C(UnkStruct_ov45_022561D4 *param0); +static BOOL ov45_02256664(UnkStruct_ov45_022561D4 *param0); +static void ov45_02256668(UnkStruct_ov45_022561D4 *param0); +static BOOL ov45_02256680(UnkStruct_ov45_022561D4 *param0, u32 *param1, u32 *param2); +static BOOL ov45_02256698(UnkStruct_ov45_022561D4 *param0); +static BOOL ov45_022566CC(UnkStruct_ov45_022566EC_1 *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov45_022561D4, ov45_02256354); } -static BOOL ov45_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov45_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov45_022561D4 * v0 = (UnkStruct_ov45_022561D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022561D4)); + UnkStruct_ov45_022561D4 *v0 = (UnkStruct_ov45_022561D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022561D4)); if (v0 != NULL) { if (ov45_0225621C(v0, poketchSys, param2, param3)) { @@ -76,15 +76,45 @@ static BOOL ov45_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov45_0225621C (UnkStruct_ov45_022561D4 * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov45_0225621C(UnkStruct_ov45_022561D4 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { static const TouchScreenHitTable v0[] = { - {72, 104, 176, 208, }, - {104, 136, 176, 208, }, - {112, 128, 64, 80, }, - {160, 176, 64, 80, }, - {112, 128, 112, 128, }, - {160, 176, 112, 128, } + { + 72, + 104, + 176, + 208, + }, + { + 104, + 136, + 176, + 208, + }, + { + 112, + 128, + 64, + 80, + }, + { + 160, + 176, + 64, + 80, + }, + { + 112, + 128, + 112, + 128, + }, + { + 160, + 176, + 112, + 128, + } }; u32 v1, v2; @@ -120,7 +150,7 @@ static BOOL ov45_0225621C (UnkStruct_ov45_022561D4 * param0, PoketchSystem *poke return 0; } -static void ov45_022562C0 (UnkStruct_ov45_022566EC_1 * param0) +static void ov45_022562C0(UnkStruct_ov45_022566EC_1 *param0) { RTCTime v0; @@ -138,7 +168,7 @@ static void ov45_022562C0 (UnkStruct_ov45_022566EC_1 * param0) param0->unk_02 = v0.minute; } -static void ov45_022562F8 (UnkStruct_ov45_022561D4 * param0) +static void ov45_022562F8(UnkStruct_ov45_022561D4 *param0) { PoketchButtonManager_Free(param0->buttonManager); ov45_02256728(param0->unk_08); @@ -146,17 +176,17 @@ static void ov45_022562F8 (UnkStruct_ov45_022561D4 * param0) Heap_FreeToHeap(param0); } -static void ov45_02256310 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov45_02256310(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov45_022561D4 * v0 = param3; + UnkStruct_ov45_022561D4 *v0 = param3; v0->unk_18 = param0; v0->unk_1C = param1; } -static void ov45_02256318 (SysTask * param0, void * param1) +static void ov45_02256318(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov45_022561D4 *) = { + static BOOL (*const v0[])(UnkStruct_ov45_022561D4 *) = { ov45_02256370, ov45_022563C0, ov45_022564D0, @@ -164,7 +194,7 @@ static void ov45_02256318 (SysTask * param0, void * param1) ov45_02256698 }; - UnkStruct_ov45_022561D4 * v1 = (UnkStruct_ov45_022561D4 *)param1; + UnkStruct_ov45_022561D4 *v1 = (UnkStruct_ov45_022561D4 *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -178,12 +208,12 @@ static void ov45_02256318 (SysTask * param0, void * param1) } } -static void ov45_02256354 (void * param0) +static void ov45_02256354(void *param0) { ((UnkStruct_ov45_022561D4 *)param0)->unk_02 = 1; } -static void ov45_0225635C (UnkStruct_ov45_022561D4 * param0, u32 param1) +static void ov45_0225635C(UnkStruct_ov45_022561D4 *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -194,7 +224,7 @@ static void ov45_0225635C (UnkStruct_ov45_022561D4 * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov45_02256370 (UnkStruct_ov45_022561D4 * param0) +static BOOL ov45_02256370(UnkStruct_ov45_022561D4 *param0) { switch (param0->unk_01) { case 0: @@ -217,7 +247,7 @@ static BOOL ov45_02256370 (UnkStruct_ov45_022561D4 * param0) return 0; } -static BOOL ov45_022563C0 (UnkStruct_ov45_022561D4 * param0) +static BOOL ov45_022563C0(UnkStruct_ov45_022561D4 *param0) { if (param0->unk_02) { ov45_0225635C(param0, 4); @@ -281,7 +311,7 @@ static BOOL ov45_022563C0 (UnkStruct_ov45_022561D4 * param0) return 0; } -static BOOL ov45_022564D0 (UnkStruct_ov45_022561D4 * param0) +static BOOL ov45_022564D0(UnkStruct_ov45_022561D4 *param0) { if (param0->unk_02) { ov45_0225635C(param0, 4); @@ -337,7 +367,7 @@ static BOOL ov45_022564D0 (UnkStruct_ov45_022561D4 * param0) return 0; } -static BOOL ov45_0225659C (UnkStruct_ov45_022561D4 * param0) +static BOOL ov45_0225659C(UnkStruct_ov45_022561D4 *param0) { if (param0->unk_02) { ov45_0225635C(param0, 4); @@ -387,12 +417,12 @@ static BOOL ov45_0225659C (UnkStruct_ov45_022561D4 * param0) return 0; } -static BOOL ov45_02256664 (UnkStruct_ov45_022561D4 * param0) +static BOOL ov45_02256664(UnkStruct_ov45_022561D4 *param0) { return param0->unk_2C; } -static void ov45_02256668 (UnkStruct_ov45_022561D4 * param0) +static void ov45_02256668(UnkStruct_ov45_022561D4 *param0) { if (param0->unk_2C == 0) { GetCurrentTime(&(param0->unk_20)); @@ -400,7 +430,7 @@ static void ov45_02256668 (UnkStruct_ov45_022561D4 * param0) } } -static BOOL ov45_02256680 (UnkStruct_ov45_022561D4 * param0, u32 * param1, u32 * param2) +static BOOL ov45_02256680(UnkStruct_ov45_022561D4 *param0, u32 *param1, u32 *param2) { if (param0->unk_30) { *param1 = param0->unk_20.hour; @@ -411,7 +441,7 @@ static BOOL ov45_02256680 (UnkStruct_ov45_022561D4 * param0, u32 * param1, u32 * return 0; } -static BOOL ov45_02256698 (UnkStruct_ov45_022561D4 * param0) +static BOOL ov45_02256698(UnkStruct_ov45_022561D4 *param0) { switch (param0->unk_01) { case 0: @@ -428,7 +458,7 @@ static BOOL ov45_02256698 (UnkStruct_ov45_022561D4 * param0) return 0; } -static BOOL ov45_022566CC (UnkStruct_ov45_022566EC_1 * param0) +static BOOL ov45_022566CC(UnkStruct_ov45_022566EC_1 *param0) { return (param0->unk_01 == param0->unk_03) && (param0->unk_02 == param0->unk_04); } diff --git a/src/overlay045/ov45_022566EC.c b/src/overlay045/ov45_022566EC.c index 8a07232c9f..c967ac854d 100644 --- a/src/overlay045/ov45_022566EC.c +++ b/src/overlay045/ov45_022566EC.c @@ -1,35 +1,36 @@ +#include "overlay045/ov45_022566EC.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay045/struct_ov45_022566EC_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay045/struct_ov45_022566EC_1.h" +#include "overlay045/struct_ov45_022566EC_decl.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "heap.h" +#include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "heap.h" #include "unk_02018340.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay045/ov45_022566EC.h" struct UnkStruct_ov45_022566EC_t { - const UnkStruct_ov45_022566EC_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov45_022566EC_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; - UnkStruct_ov25_022555E8 * unk_30; - UnkStruct_ov25_022558C4 * unk_34[13]; + UnkStruct_ov25_022555E8 *unk_30; + UnkStruct_ov25_022558C4 *unk_34[13]; UnkStruct_ov25_02255958 unk_68; UnkStruct_ov25_02255958 unk_7C; BOOL unk_90; @@ -37,20 +38,20 @@ struct UnkStruct_ov45_022566EC_t { u32 unk_98; }; -static void ov45_0225673C(UnkStruct_ov45_022566EC * param0, const UnkStruct_ov45_022566EC_1 * param1); -static void ov45_02256864(UnkStruct_ov45_022566EC * param0); -static void ov45_02256894(UnkStruct_ov45_022566EC * param0, u32 param1, u32 param2); -static void ov45_02256954(UnkStruct_ov25_02255224 * param0); -static void ov45_02256968(SysTask * param0, void * param1); -static void ov45_022569F8(SysTask * param0, void * param1); -static void ov45_02256A40(SysTask * param0, void * param1); -static void ov45_02256ABC(SysTask * param0, void * param1); -static void ov45_02256B38(SysTask * param0, void * param1); -static void ov45_02256B78(SysTask * param0, void * param1); - -BOOL ov45_022566EC (UnkStruct_ov45_022566EC ** param0, const UnkStruct_ov45_022566EC_1 * param1, BGL * param2) +static void ov45_0225673C(UnkStruct_ov45_022566EC *param0, const UnkStruct_ov45_022566EC_1 *param1); +static void ov45_02256864(UnkStruct_ov45_022566EC *param0); +static void ov45_02256894(UnkStruct_ov45_022566EC *param0, u32 param1, u32 param2); +static void ov45_02256954(UnkStruct_ov25_02255224 *param0); +static void ov45_02256968(SysTask *param0, void *param1); +static void ov45_022569F8(SysTask *param0, void *param1); +static void ov45_02256A40(SysTask *param0, void *param1); +static void ov45_02256ABC(SysTask *param0, void *param1); +static void ov45_02256B38(SysTask *param0, void *param1); +static void ov45_02256B78(SysTask *param0, void *param1); + +BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566EC_1 *param1, BGL *param2) { - UnkStruct_ov45_022566EC * v0 = (UnkStruct_ov45_022566EC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022566EC)); + UnkStruct_ov45_022566EC *v0 = (UnkStruct_ov45_022566EC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov45_022566EC)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); @@ -65,7 +66,7 @@ BOOL ov45_022566EC (UnkStruct_ov45_022566EC ** param0, const UnkStruct_ov45_0225 return 0; } -void ov45_02256728 (UnkStruct_ov45_022566EC * param0) +void ov45_02256728(UnkStruct_ov45_022566EC *param0) { if (param0 != NULL) { ov45_02256864(param0); @@ -73,113 +74,113 @@ void ov45_02256728 (UnkStruct_ov45_022566EC * param0) } } -static void ov45_0225673C (UnkStruct_ov45_022566EC * param0, const UnkStruct_ov45_022566EC_1 * param1) +static void ov45_0225673C(UnkStruct_ov45_022566EC *param0, const UnkStruct_ov45_022566EC_1 *param1) { static const UnkStruct_ov25_02255810 v0[] = { { - {(192 << FX32_SHIFT), (104 << FX32_SHIFT)}, + { (192 << FX32_SHIFT), (104 << FX32_SHIFT) }, 3, 0, 2, 0, - 0 + 0, }, { - {(48 << FX32_SHIFT), (48 << FX32_SHIFT)}, + { (48 << FX32_SHIFT), (48 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(144 << FX32_SHIFT), (48 << FX32_SHIFT)}, + { (144 << FX32_SHIFT), (48 << FX32_SHIFT) }, 0, 1, 2, 0, - 0 + 0, }, { - {(56 << FX32_SHIFT), (80 << FX32_SHIFT)}, + { (56 << FX32_SHIFT), (80 << FX32_SHIFT) }, 4, 0, 2, 0, - 0 + 0, }, { - {(136 << FX32_SHIFT), (80 << FX32_SHIFT)}, + { (136 << FX32_SHIFT), (80 << FX32_SHIFT) }, 4, 1, 2, 0, - 0 + 0, }, { - {(72 << FX32_SHIFT), (120 << FX32_SHIFT)}, + { (72 << FX32_SHIFT), (120 << FX32_SHIFT) }, 6, 0, 2, 0, - 0 + 0, }, { - {(72 << FX32_SHIFT), (164 << FX32_SHIFT)}, + { (72 << FX32_SHIFT), (164 << FX32_SHIFT) }, 6, 2, 2, 0, - 0 + 0, }, { - {(120 << FX32_SHIFT), (120 << FX32_SHIFT)}, + { (120 << FX32_SHIFT), (120 << FX32_SHIFT) }, 6, 0, 2, 0, - 0 + 0, }, { - {(120 << FX32_SHIFT), (164 << FX32_SHIFT)}, + { (120 << FX32_SHIFT), (164 << FX32_SHIFT) }, 6, 2, 2, 0, - 0 + 0, }, { - {(64 << FX32_SHIFT), (144 << FX32_SHIFT)}, + { (64 << FX32_SHIFT), (144 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(80 << FX32_SHIFT), (144 << FX32_SHIFT)}, + { (80 << FX32_SHIFT), (144 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(112 << FX32_SHIFT), (144 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (144 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(128 << FX32_SHIFT), (144 << FX32_SHIFT)}, + { (128 << FX32_SHIFT), (144 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 - } + 0, + }, }; int v1; @@ -215,7 +216,7 @@ static void ov45_0225673C (UnkStruct_ov45_022566EC * param0, const UnkStruct_ov4 } } -static void ov45_02256864 (UnkStruct_ov45_022566EC * param0) +static void ov45_02256864(UnkStruct_ov45_022566EC *param0) { int v0; @@ -229,7 +230,7 @@ static void ov45_02256864 (UnkStruct_ov45_022566EC * param0) ov25_022559B0(¶m0->unk_7C); } -static void ov45_02256894 (UnkStruct_ov45_022566EC * param0, u32 param1, u32 param2) +static void ov45_02256894(UnkStruct_ov45_022566EC *param0, u32 param1, u32 param2) { CP_SetDiv32_32(param1, 10); @@ -243,37 +244,37 @@ static void ov45_02256894 (UnkStruct_ov45_022566EC * param0, u32 param1, u32 par } static const UnkStruct_ov25_0225517C Unk_ov45_02256CE0[] = { - {0x0, ov45_02256968, 0x0}, - {0x1, ov45_022569F8, 0x0}, - {0x2, ov45_02256A40, 0x0}, - {0x3, ov45_02256ABC, 0x0}, - {0x4, ov45_02256B38, 0x0}, - {0x5, ov45_02256B78, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov45_02256968, 0x0 }, + { 0x1, ov45_022569F8, 0x0 }, + { 0x2, ov45_02256A40, 0x0 }, + { 0x3, ov45_02256ABC, 0x0 }, + { 0x4, ov45_02256B38, 0x0 }, + { 0x5, ov45_02256B78, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov45_02256918 (UnkStruct_ov45_022566EC * param0, u32 param1) +void ov45_02256918(UnkStruct_ov45_022566EC *param0, u32 param1) { ov25_0225517C(Unk_ov45_02256CE0, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov45_0225693C (UnkStruct_ov45_022566EC * param0, u32 param1) +BOOL ov45_0225693C(UnkStruct_ov45_022566EC *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov45_02256948 (UnkStruct_ov45_022566EC * param0) +BOOL ov45_02256948(UnkStruct_ov45_022566EC *param0) { return ov25_02255154(param0->unk_08); } -static void ov45_02256954 (UnkStruct_ov25_02255224 * param0) +static void ov45_02256954(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov45_022566EC * v0 = ov25_0225523C(param0); + UnkStruct_ov45_022566EC *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov45_02256968 (SysTask * param0, void * param1) +static void ov45_02256968(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -291,9 +292,9 @@ static void ov45_02256968 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov45_022566EC * v2; - void * v3; - NNSG2dPaletteData * v4; + UnkStruct_ov45_022566EC *v2; + void *v3; + NNSG2dPaletteData *v4; v2 = ov25_0225523C(param1); @@ -310,9 +311,9 @@ static void ov45_02256968 (SysTask * param0, void * param1) ov45_02256954(param1); } -static void ov45_022569F8 (SysTask * param0, void * param1) +static void ov45_022569F8(SysTask *param0, void *param1) { - UnkStruct_ov45_022566EC * v0 = ov25_0225523C(param1); + UnkStruct_ov45_022566EC *v0 = ov25_0225523C(param1); switch (ov25_02255248(param1)) { case 0: @@ -328,10 +329,10 @@ static void ov45_022569F8 (SysTask * param0, void * param1) } } -static void ov45_02256A40 (SysTask * param0, void * param1) +static void ov45_02256A40(SysTask *param0, void *param1) { - UnkStruct_ov45_022566EC * v0 = ov25_0225523C(param1); - const UnkStruct_ov45_022566EC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov45_022566EC *v0 = ov25_0225523C(param1); + const UnkStruct_ov45_022566EC_1 *v1 = ov25_02255240(param1); PoketchSystem_PlaySoundEffect(1635); @@ -349,10 +350,10 @@ static void ov45_02256A40 (SysTask * param0, void * param1) ov45_02256954(param1); } -static void ov45_02256ABC (SysTask * param0, void * param1) +static void ov45_02256ABC(SysTask *param0, void *param1) { - UnkStruct_ov45_022566EC * v0 = ov25_0225523C(param1); - const UnkStruct_ov45_022566EC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov45_022566EC *v0 = ov25_0225523C(param1); + const UnkStruct_ov45_022566EC_1 *v1 = ov25_02255240(param1); PoketchSystem_PlaySoundEffect(1635); @@ -370,10 +371,10 @@ static void ov45_02256ABC (SysTask * param0, void * param1) ov45_02256954(param1); } -static void ov45_02256B38 (SysTask * param0, void * param1) +static void ov45_02256B38(SysTask *param0, void *param1) { - UnkStruct_ov45_022566EC * v0 = ov25_0225523C(param1); - const UnkStruct_ov45_022566EC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov45_022566EC *v0 = ov25_0225523C(param1); + const UnkStruct_ov45_022566EC_1 *v1 = ov25_02255240(param1); if (v1->unk_00) { ov45_02256894(v0, v1->unk_01, v1->unk_02); @@ -384,10 +385,10 @@ static void ov45_02256B38 (SysTask * param0, void * param1) ov45_02256954(param1); } -static void ov45_02256B78 (SysTask * param0, void * param1) +static void ov45_02256B78(SysTask *param0, void *param1) { - UnkStruct_ov45_022566EC * v0 = ov25_0225523C(param1); - const UnkStruct_ov45_022566EC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov45_022566EC *v0 = ov25_0225523C(param1); + const UnkStruct_ov45_022566EC_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: @@ -429,7 +430,7 @@ static void ov45_02256B78 (SysTask * param0, void * param1) } } -void ov45_02256C90 (UnkStruct_ov45_022566EC * param0) +void ov45_02256C90(UnkStruct_ov45_022566EC *param0) { param0->unk_90 = 1; } diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c index 0e168f3b0b..19feccda62 100644 --- a/src/overlay046/ov46_022561C0.c +++ b/src/overlay046/ov46_022561C0.c @@ -1,23 +1,22 @@ -#include "enums.h" - #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay046/struct_ov46_02256BCC_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay046/ov46_02256BCC.h" #include "overlay046/struct_ov46_02256BCC_1.h" +#include "overlay046/struct_ov46_02256BCC_decl.h" -#include "sys_task.h" +#include "enums.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02022844.h" #include "unk_02099D44.h" -#include "overlay046/ov46_02256BCC.h" typedef struct { UnkStruct_ov46_02256BCC_1 unk_00; @@ -36,7 +35,7 @@ typedef struct { u8 unk_02; u8 unk_03; u32 unk_04; - UnkStruct_ov46_02256BCC * unk_08; + UnkStruct_ov46_02256BCC *unk_08; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u32 unk_14; @@ -57,42 +56,42 @@ enum { static void NitroStaticInit(void); -static BOOL ov46_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov46_0225621C(UnkStruct_ov46_0225621C * param0); -static void ov46_0225623C(UnkStruct_ov46_0225621C * param0, u32 param1, BOOL param2); -static void ov46_02256258(UnkStruct_ov46_0225621C * param0, u32 param1, u32 param2); -static void ov46_02256270(UnkStruct_ov46_0225621C * param0, UnkStruct_ov46_02256270 * param1); -static void ov46_0225628C(UnkStruct_ov46_0225621C * param0); -static void ov46_022562D4(UnkStruct_ov46_0225621C * param0); -static BOOL ov46_02256310(UnkStruct_ov46_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov46_022563B8(UnkStruct_ov46_0225621C * param0); -static void ov46_022563D8(u32 param0, u32 param1, u32 param2, void * param3); -static void ov46_02256408(SysTask * param0, void * param1); -static void ov46_02256458(void * param0); -static void ov46_02256460(UnkStruct_ov46_0225621C * param0, u32 param1); -static BOOL ov46_022564D8(UnkStruct_ov46_0225621C * param0); -static BOOL ov46_02256518(UnkStruct_ov46_0225621C * param0); -static BOOL ov46_022566A0(UnkStruct_ov46_0225621C * param0); -static BOOL ov46_0225678C(UnkStruct_ov46_0225621C * param0); -static BOOL ov46_02256838(UnkStruct_ov46_0225621C * param0); -static BOOL ov46_022568E0(UnkStruct_ov46_0225621C * param0); -static BOOL ov46_02256998(UnkStruct_ov46_0225621C * param0); -static u64 ov46_022569CC(UnkStruct_ov46_0225621C * param0); -static void ov46_02256A3C(UnkStruct_ov46_0225621C * param0); -static void ov46_02256A50(UnkStruct_ov46_0225621C * param0); -static BOOL ov46_02256A78(UnkStruct_ov46_0225621C * param0); -static BOOL ov46_02256A88(UnkStruct_ov46_0225621C * param0); -static void ov46_02256AF0(UnkStruct_ov46_0225621C * param0); -static void ov46_02256B10(UnkStruct_ov46_0225621C * param0, u64 param1); - -static void NitroStaticInit (void) +static BOOL ov46_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov46_0225621C(UnkStruct_ov46_0225621C *param0); +static void ov46_0225623C(UnkStruct_ov46_0225621C *param0, u32 param1, BOOL param2); +static void ov46_02256258(UnkStruct_ov46_0225621C *param0, u32 param1, u32 param2); +static void ov46_02256270(UnkStruct_ov46_0225621C *param0, UnkStruct_ov46_02256270 *param1); +static void ov46_0225628C(UnkStruct_ov46_0225621C *param0); +static void ov46_022562D4(UnkStruct_ov46_0225621C *param0); +static BOOL ov46_02256310(UnkStruct_ov46_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov46_022563B8(UnkStruct_ov46_0225621C *param0); +static void ov46_022563D8(u32 param0, u32 param1, u32 param2, void *param3); +static void ov46_02256408(SysTask *param0, void *param1); +static void ov46_02256458(void *param0); +static void ov46_02256460(UnkStruct_ov46_0225621C *param0, u32 param1); +static BOOL ov46_022564D8(UnkStruct_ov46_0225621C *param0); +static BOOL ov46_02256518(UnkStruct_ov46_0225621C *param0); +static BOOL ov46_022566A0(UnkStruct_ov46_0225621C *param0); +static BOOL ov46_0225678C(UnkStruct_ov46_0225621C *param0); +static BOOL ov46_02256838(UnkStruct_ov46_0225621C *param0); +static BOOL ov46_022568E0(UnkStruct_ov46_0225621C *param0); +static BOOL ov46_02256998(UnkStruct_ov46_0225621C *param0); +static u64 ov46_022569CC(UnkStruct_ov46_0225621C *param0); +static void ov46_02256A3C(UnkStruct_ov46_0225621C *param0); +static void ov46_02256A50(UnkStruct_ov46_0225621C *param0); +static BOOL ov46_02256A78(UnkStruct_ov46_0225621C *param0); +static BOOL ov46_02256A88(UnkStruct_ov46_0225621C *param0); +static void ov46_02256AF0(UnkStruct_ov46_0225621C *param0); +static void ov46_02256B10(UnkStruct_ov46_0225621C *param0, u64 param1); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov46_022561D4, ov46_02256458); } -static BOOL ov46_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov46_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov46_0225621C * v0 = (UnkStruct_ov46_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_0225621C)); + UnkStruct_ov46_0225621C *v0 = (UnkStruct_ov46_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_0225621C)); if (v0 != NULL) { if (ov46_02256310(v0, poketchSys, param2, param3)) { @@ -108,7 +107,7 @@ static BOOL ov46_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static void ov46_0225621C (UnkStruct_ov46_0225621C * param0) +static void ov46_0225621C(UnkStruct_ov46_0225621C *param0) { int v0; @@ -120,14 +119,14 @@ static void ov46_0225621C (UnkStruct_ov46_0225621C * param0) param0->unk_44 = 1; } -static void ov46_0225623C (UnkStruct_ov46_0225621C * param0, u32 param1, BOOL param2) +static void ov46_0225623C(UnkStruct_ov46_0225621C *param0, u32 param1, BOOL param2) { param0->unk_48.unk_14[param1] = param2; param0->unk_48.unk_00.unk_04[param1] = (param2) ? UnkEnum_ov46_0225623C_00 : UnkEnum_ov46_0225623C_01; param0->unk_44 = 1; } -static void ov46_02256258 (UnkStruct_ov46_0225621C * param0, u32 param1, u32 param2) +static void ov46_02256258(UnkStruct_ov46_0225621C *param0, u32 param1, u32 param2) { if (param0->unk_48.unk_14[param1]) { param0->unk_48.unk_00.unk_04[param1] = param2; @@ -135,13 +134,13 @@ static void ov46_02256258 (UnkStruct_ov46_0225621C * param0, u32 param1, u32 par } } -static void ov46_02256270 (UnkStruct_ov46_0225621C * param0, UnkStruct_ov46_02256270 * param1) +static void ov46_02256270(UnkStruct_ov46_0225621C *param0, UnkStruct_ov46_02256270 *param1) { param1->unk_00.unk_10 = ov46_0225710C(param0->unk_08); sub_02099D54(param0->unk_04, param1, sizeof(UnkStruct_ov46_02256270)); } -static void ov46_0225628C (UnkStruct_ov46_0225621C * param0) +static void ov46_0225628C(UnkStruct_ov46_0225621C *param0) { if (sub_02099D7C(param0->unk_04, ¶m0->unk_48, sizeof(UnkStruct_ov46_02256270))) { if (param0->unk_48.unk_44 == 2) { @@ -158,7 +157,7 @@ static void ov46_0225628C (UnkStruct_ov46_0225621C * param0) } } -static void ov46_022562D4 (UnkStruct_ov46_0225621C * param0) +static void ov46_022562D4(UnkStruct_ov46_0225621C *param0) { param0->unk_48.unk_44 = 1; param0->unk_48.unk_00.unk_00 = 0; @@ -173,20 +172,20 @@ static void ov46_022562D4 (UnkStruct_ov46_0225621C * param0) ov46_0225623C(param0, 1, 0); } -static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov46_02256310(UnkStruct_ov46_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { static const TouchScreenHitTable v0[] = { - {144, 176, 16, 80}, - {144, 176, 80, 144}, - {144, 176, 144, 208}, - {80, 96, 72, 88}, - {80, 96, 88, 104}, - {128, 144, 72, 88}, - {128, 144, 88, 104}, - {80, 96, 120, 136}, - {80, 96, 136, 152}, - {128, 144, 120, 136}, - {128, 144, 136, 152} + { 144, 176, 16, 80 }, + { 144, 176, 80, 144 }, + { 144, 176, 144, 208 }, + { 80, 96, 72, 88 }, + { 80, 96, 88, 104 }, + { 128, 144, 72, 88 }, + { 128, 144, 88, 104 }, + { 80, 96, 120, 136 }, + { 80, 96, 136, 152 }, + { 128, 144, 120, 136 }, + { 128, 144, 136, 152 } }; param0->unk_04 = param3; @@ -215,7 +214,7 @@ static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, PoketchSystem *poke return 0; } -static void ov46_022563B8 (UnkStruct_ov46_0225621C * param0) +static void ov46_022563B8(UnkStruct_ov46_0225621C *param0) { ov46_02256270(param0, ¶m0->unk_48); PoketchButtonManager_Free(param0->buttonManager); @@ -224,9 +223,9 @@ static void ov46_022563B8 (UnkStruct_ov46_0225621C * param0) Heap_FreeToHeap(param0); } -static void ov46_022563D8 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov46_022563D8(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov46_0225621C * v0 = param3; + UnkStruct_ov46_0225621C *v0 = param3; v0->unk_14 = param0; v0->unk_18 = param1; @@ -240,9 +239,9 @@ static void ov46_022563D8 (u32 param0, u32 param1, u32 param2, void * param3) } } -static void ov46_02256408 (SysTask * param0, void * param1) +static void ov46_02256408(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov46_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov46_0225621C *) = { ov46_022564D8, ov46_02256518, ov46_022566A0, @@ -252,7 +251,7 @@ static void ov46_02256408 (SysTask * param0, void * param1) ov46_02256998 }; - UnkStruct_ov46_0225621C * v1 = (UnkStruct_ov46_0225621C *)param1; + UnkStruct_ov46_0225621C *v1 = (UnkStruct_ov46_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -271,12 +270,12 @@ static void ov46_02256408 (SysTask * param0, void * param1) } } -static void ov46_02256458 (void * param0) +static void ov46_02256458(void *param0) { ((UnkStruct_ov46_0225621C *)param0)->unk_03 = 1; } -static void ov46_02256460 (UnkStruct_ov46_0225621C * param0, u32 param1) +static void ov46_02256460(UnkStruct_ov46_0225621C *param0, u32 param1) { u32 v0 = param0->unk_00; @@ -319,7 +318,7 @@ static void ov46_02256460 (UnkStruct_ov46_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov46_022564D8 (UnkStruct_ov46_0225621C * param0) +static BOOL ov46_022564D8(UnkStruct_ov46_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -337,7 +336,7 @@ static BOOL ov46_022564D8 (UnkStruct_ov46_0225621C * param0) return 0; } -static BOOL ov46_02256518 (UnkStruct_ov46_0225621C * param0) +static BOOL ov46_02256518(UnkStruct_ov46_0225621C *param0) { if (param0->unk_03) { ov46_02256460(param0, 6); @@ -376,7 +375,7 @@ static BOOL ov46_02256518 (UnkStruct_ov46_0225621C * param0) } if ((param0->unk_18 == 1) || (param0->unk_18 == 7)) { - UnkStruct_ov46_02256BCC_1 * v0 = &(param0->unk_48.unk_00); + UnkStruct_ov46_02256BCC_1 *v0 = &(param0->unk_48.unk_00); switch (param0->unk_14) { case 3: @@ -428,7 +427,7 @@ static BOOL ov46_02256518 (UnkStruct_ov46_0225621C * param0) return 0; } -static BOOL ov46_022566A0 (UnkStruct_ov46_0225621C * param0) +static BOOL ov46_022566A0(UnkStruct_ov46_0225621C *param0) { if (param0->unk_03) { ov46_02256460(param0, 6); @@ -477,7 +476,7 @@ static BOOL ov46_022566A0 (UnkStruct_ov46_0225621C * param0) return 0; } -static BOOL ov46_0225678C (UnkStruct_ov46_0225621C * param0) +static BOOL ov46_0225678C(UnkStruct_ov46_0225621C *param0) { if (param0->unk_03) { ov46_02256460(param0, 6); @@ -514,7 +513,7 @@ static BOOL ov46_0225678C (UnkStruct_ov46_0225621C * param0) return 0; } -static BOOL ov46_02256838 (UnkStruct_ov46_0225621C * param0) +static BOOL ov46_02256838(UnkStruct_ov46_0225621C *param0) { if (param0->unk_03) { ov46_02256460(param0, 6); @@ -550,7 +549,7 @@ static BOOL ov46_02256838 (UnkStruct_ov46_0225621C * param0) return 0; } -static BOOL ov46_022568E0 (UnkStruct_ov46_0225621C * param0) +static BOOL ov46_022568E0(UnkStruct_ov46_0225621C *param0) { if (param0->unk_03) { ov46_02256460(param0, 6); @@ -588,7 +587,7 @@ static BOOL ov46_022568E0 (UnkStruct_ov46_0225621C * param0) return 0; } -static BOOL ov46_02256998 (UnkStruct_ov46_0225621C * param0) +static BOOL ov46_02256998(UnkStruct_ov46_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -605,9 +604,9 @@ static BOOL ov46_02256998 (UnkStruct_ov46_0225621C * param0) return 0; } -static u64 ov46_022569CC (UnkStruct_ov46_0225621C * param0) +static u64 ov46_022569CC(UnkStruct_ov46_0225621C *param0) { - UnkStruct_ov46_02256BCC_1 * v0 = &(param0->unk_48.unk_00); + UnkStruct_ov46_02256BCC_1 *v0 = &(param0->unk_48.unk_00); param0->unk_48.unk_20 = sub_0202293C(); param0->unk_48.unk_28 = 0; @@ -620,24 +619,24 @@ static u64 ov46_022569CC (UnkStruct_ov46_0225621C * param0) return param0->unk_48.unk_38; } -static void ov46_02256A3C (UnkStruct_ov46_0225621C * param0) +static void ov46_02256A3C(UnkStruct_ov46_0225621C *param0) { param0->unk_48.unk_40 = 0; param0->unk_48.unk_28 = sub_0202293C(); } -static void ov46_02256A50 (UnkStruct_ov46_0225621C * param0) +static void ov46_02256A50(UnkStruct_ov46_0225621C *param0) { param0->unk_48.unk_20 += (sub_0202293C() - param0->unk_48.unk_28); param0->unk_48.unk_40 = 1; } -static BOOL ov46_02256A78 (UnkStruct_ov46_0225621C * param0) +static BOOL ov46_02256A78(UnkStruct_ov46_0225621C *param0) { return param0->unk_48.unk_40 == 0; } -static BOOL ov46_02256A88 (UnkStruct_ov46_0225621C * param0) +static BOOL ov46_02256A88(UnkStruct_ov46_0225621C *param0) { if (param0->unk_48.unk_40) { u64 v0 = sub_0202295C(sub_0202293C() - param0->unk_48.unk_20); @@ -657,7 +656,7 @@ static BOOL ov46_02256A88 (UnkStruct_ov46_0225621C * param0) return 0; } -static void ov46_02256AF0 (UnkStruct_ov46_0225621C * param0) +static void ov46_02256AF0(UnkStruct_ov46_0225621C *param0) { param0->unk_48.unk_40 = 0; param0->unk_48.unk_00.unk_00 = 0; @@ -666,7 +665,7 @@ static void ov46_02256AF0 (UnkStruct_ov46_0225621C * param0) param0->unk_48.unk_00.unk_03 = 0; } -static void ov46_02256B10 (UnkStruct_ov46_0225621C * param0, u64 param1) +static void ov46_02256B10(UnkStruct_ov46_0225621C *param0, u64 param1) { u32 v0, v1; diff --git a/src/overlay046/ov46_02256BCC.c b/src/overlay046/ov46_02256BCC.c index 9cecc23083..ab9e1b6f37 100644 --- a/src/overlay046/ov46_02256BCC.c +++ b/src/overlay046/ov46_02256BCC.c @@ -1,34 +1,35 @@ +#include "overlay046/ov46_02256BCC.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay046/struct_ov46_02256BCC_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay046/struct_ov46_02256BCC_1.h" +#include "overlay046/struct_ov46_02256BCC_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay046/ov46_02256BCC.h" struct UnkStruct_ov46_02256BCC_t { - const UnkStruct_ov46_02256BCC_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov46_02256BCC_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; - UnkStruct_ov25_022555E8 * unk_30; - UnkStruct_ov25_022558C4 * unk_34[17]; + UnkStruct_ov25_022555E8 *unk_30; + UnkStruct_ov25_022558C4 *unk_34[17]; UnkStruct_ov25_02255958 unk_78; UnkStruct_ov25_02255958 unk_8C; BOOL unk_A0; @@ -36,24 +37,24 @@ struct UnkStruct_ov46_02256BCC_t { u32 unk_A8; }; -static void ov46_02256C20(UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov46_02256BCC_1 * param1); -static void ov46_02256CF4(UnkStruct_ov46_02256BCC * param0); -static void ov46_02256D60(UnkStruct_ov25_02255224 * param0); -static void ov46_02256D74(SysTask * param0, void * param1); -static void ov46_02256E58(SysTask * param0, void * param1); -static void ov46_02256EA4(SysTask * param0, void * param1); -static void ov46_02256ED8(SysTask * param0, void * param1); -static void ov46_02256F0C(SysTask * param0, void * param1); -static void ov46_02256F30(SysTask * param0, void * param1); -static void ov46_02256F54(SysTask * param0, void * param1); -static void ov46_02257010(SysTask * param0, void * param1); -static void ov46_02257054(UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov46_02256BCC_1 * param1); -static void ov46_02257094(UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov46_02256BCC_1 * param1); -static void ov46_022570C4(UnkStruct_ov46_02256BCC * param0, BOOL param1); - -BOOL ov46_02256BCC (UnkStruct_ov46_02256BCC ** param0, const UnkStruct_ov46_02256BCC_1 * param1, BGL * param2) +static void ov46_02256C20(UnkStruct_ov46_02256BCC *param0, const UnkStruct_ov46_02256BCC_1 *param1); +static void ov46_02256CF4(UnkStruct_ov46_02256BCC *param0); +static void ov46_02256D60(UnkStruct_ov25_02255224 *param0); +static void ov46_02256D74(SysTask *param0, void *param1); +static void ov46_02256E58(SysTask *param0, void *param1); +static void ov46_02256EA4(SysTask *param0, void *param1); +static void ov46_02256ED8(SysTask *param0, void *param1); +static void ov46_02256F0C(SysTask *param0, void *param1); +static void ov46_02256F30(SysTask *param0, void *param1); +static void ov46_02256F54(SysTask *param0, void *param1); +static void ov46_02257010(SysTask *param0, void *param1); +static void ov46_02257054(UnkStruct_ov46_02256BCC *param0, const UnkStruct_ov46_02256BCC_1 *param1); +static void ov46_02257094(UnkStruct_ov46_02256BCC *param0, const UnkStruct_ov46_02256BCC_1 *param1); +static void ov46_022570C4(UnkStruct_ov46_02256BCC *param0, BOOL param1); + +BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256BCC_1 *param1, BGL *param2) { - UnkStruct_ov46_02256BCC * v0 = (UnkStruct_ov46_02256BCC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_02256BCC)); + UnkStruct_ov46_02256BCC *v0 = (UnkStruct_ov46_02256BCC *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov46_02256BCC)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); @@ -73,7 +74,7 @@ BOOL ov46_02256BCC (UnkStruct_ov46_02256BCC ** param0, const UnkStruct_ov46_0225 return 0; } -void ov46_02256C0C (UnkStruct_ov46_02256BCC * param0) +void ov46_02256C0C(UnkStruct_ov46_02256BCC *param0) { if (param0 != NULL) { ov46_02256CF4(param0); @@ -81,19 +82,19 @@ void ov46_02256C0C (UnkStruct_ov46_02256BCC * param0) } } -static void ov46_02256C20 (UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov46_02256BCC_1 * param1) +static void ov46_02256C20(UnkStruct_ov46_02256BCC *param0, const UnkStruct_ov46_02256BCC_1 *param1) { static const UnkStruct_ov25_02255810 v0[] = { { - {(48 << FX32_SHIFT), (56 << FX32_SHIFT)}, + { (48 << FX32_SHIFT), (56 << FX32_SHIFT) }, 2, 0, 2, 1, - 0 + 0, }, { - {(176 << FX32_SHIFT), (56 << FX32_SHIFT)}, + { (176 << FX32_SHIFT), (56 << FX32_SHIFT) }, 0, 0, 2, @@ -101,31 +102,31 @@ static void ov46_02256C20 (UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov4 0, }, { - {(48 << FX32_SHIFT), (160 << FX32_SHIFT)}, + { (48 << FX32_SHIFT), (160 << FX32_SHIFT) }, 5, 0, 2, 0, - 0 + 0, }, { - {(112 << FX32_SHIFT), (160 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (160 << FX32_SHIFT) }, 7, 0, 2, 0, - 0 + 0, }, { - {(176 << FX32_SHIFT), (160 << FX32_SHIFT)}, + { (176 << FX32_SHIFT), (160 << FX32_SHIFT) }, 9, 0, 2, 0, - 0 + 0, }, { - {(80 << FX32_SHIFT), (88 << FX32_SHIFT)}, + { (80 << FX32_SHIFT), (88 << FX32_SHIFT) }, 4, 0, 2, @@ -133,7 +134,7 @@ static void ov46_02256C20 (UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov4 0, }, { - {(96 << FX32_SHIFT), (88 << FX32_SHIFT)}, + { (96 << FX32_SHIFT), (88 << FX32_SHIFT) }, 4, 0, 2, @@ -141,7 +142,7 @@ static void ov46_02256C20 (UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov4 0, }, { - {(128 << FX32_SHIFT), (88 << FX32_SHIFT)}, + { (128 << FX32_SHIFT), (88 << FX32_SHIFT) }, 4, 0, 2, @@ -149,77 +150,77 @@ static void ov46_02256C20 (UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov4 0, }, { - {(144 << FX32_SHIFT), (88 << FX32_SHIFT)}, + { (144 << FX32_SHIFT), (88 << FX32_SHIFT) }, 4, 0, 2, 0, - 0 + 0, }, { - {(80 << FX32_SHIFT), (136 << FX32_SHIFT)}, + { (80 << FX32_SHIFT), (136 << FX32_SHIFT) }, 4, 2, 2, 0, - 0 + 0, }, { - {(96 << FX32_SHIFT), (136 << FX32_SHIFT)}, + { (96 << FX32_SHIFT), (136 << FX32_SHIFT) }, 4, 2, 2, 0, - 0 + 0, }, { - {(128 << FX32_SHIFT), (136 << FX32_SHIFT)}, + { (128 << FX32_SHIFT), (136 << FX32_SHIFT) }, 4, 2, 2, 0, - 0 + 0, }, { - {(144 << FX32_SHIFT), (136 << FX32_SHIFT)}, + { (144 << FX32_SHIFT), (136 << FX32_SHIFT) }, 4, 2, 2, 0, - 0 + 0, }, { - {(80 << FX32_SHIFT), (112 << FX32_SHIFT)}, + { (80 << FX32_SHIFT), (112 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(96 << FX32_SHIFT), (112 << FX32_SHIFT)}, + { (96 << FX32_SHIFT), (112 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(128 << FX32_SHIFT), (112 << FX32_SHIFT)}, + { (128 << FX32_SHIFT), (112 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 + 0, }, { - {(144 << FX32_SHIFT), (112 << FX32_SHIFT)}, + { (144 << FX32_SHIFT), (112 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 - } + 0, + }, }; int v1; @@ -245,7 +246,7 @@ static void ov46_02256C20 (UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov4 param0->unk_A8 = 0; } -static void ov46_02256CF4 (UnkStruct_ov46_02256BCC * param0) +static void ov46_02256CF4(UnkStruct_ov46_02256BCC *param0) { int v0; @@ -260,39 +261,39 @@ static void ov46_02256CF4 (UnkStruct_ov46_02256BCC * param0) } static const UnkStruct_ov25_0225517C Unk_ov46_02257178[] = { - {0x0, ov46_02256D74, 0x0}, - {0x1, ov46_02256E58, 0x0}, - {0x2, ov46_02256EA4, 0x0}, - {0x3, ov46_02256ED8, 0x0}, - {0x4, ov46_02256F0C, 0x0}, - {0x5, ov46_02256F30, 0x0}, - {0x6, ov46_02256F54, 0x0}, - {0x7, ov46_02257010, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov46_02256D74, 0x0 }, + { 0x1, ov46_02256E58, 0x0 }, + { 0x2, ov46_02256EA4, 0x0 }, + { 0x3, ov46_02256ED8, 0x0 }, + { 0x4, ov46_02256F0C, 0x0 }, + { 0x5, ov46_02256F30, 0x0 }, + { 0x6, ov46_02256F54, 0x0 }, + { 0x7, ov46_02257010, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov46_02256D24 (UnkStruct_ov46_02256BCC * param0, u32 param1) +void ov46_02256D24(UnkStruct_ov46_02256BCC *param0, u32 param1) { ov25_0225517C(Unk_ov46_02257178, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov46_02256D48 (UnkStruct_ov46_02256BCC * param0, u32 param1) +BOOL ov46_02256D48(UnkStruct_ov46_02256BCC *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov46_02256D54 (UnkStruct_ov46_02256BCC * param0) +BOOL ov46_02256D54(UnkStruct_ov46_02256BCC *param0) { return ov25_02255154(param0->unk_08); } -static void ov46_02256D60 (UnkStruct_ov25_02255224 * param0) +static void ov46_02256D60(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov46_02256BCC * v0 = ov25_0225523C(param0); + UnkStruct_ov46_02256BCC *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov46_02256D74 (SysTask * param0, void * param1) +static void ov46_02256D74(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -310,9 +311,9 @@ static void ov46_02256D74 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov46_02256BCC * v2; - void * v3; - NNSG2dPaletteData * v4; + UnkStruct_ov46_02256BCC *v2; + void *v3; + NNSG2dPaletteData *v4; v2 = ov25_0225523C(param1); @@ -349,10 +350,10 @@ static void ov46_02256D74 (SysTask * param0, void * param1) ov46_02256D60(param1); } -static void ov46_02256E58 (SysTask * param0, void * param1) +static void ov46_02256E58(SysTask *param0, void *param1) { - UnkStruct_ov46_02256BCC * v0 = ov25_0225523C(param1); - const UnkStruct_ov46_02256BCC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov46_02256BCC *v0 = ov25_0225523C(param1); + const UnkStruct_ov46_02256BCC_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: @@ -366,10 +367,10 @@ static void ov46_02256E58 (SysTask * param0, void * param1) } } -static void ov46_02256EA4 (SysTask * param0, void * param1) +static void ov46_02256EA4(SysTask *param0, void *param1) { - UnkStruct_ov46_02256BCC * v0 = ov25_0225523C(param1); - const UnkStruct_ov46_02256BCC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov46_02256BCC *v0 = ov25_0225523C(param1); + const UnkStruct_ov46_02256BCC_1 *v1 = ov25_02255240(param1); ov46_022570C4(v0, 0); ov25_022558C4(v0->unk_34[0], 2); @@ -377,10 +378,10 @@ static void ov46_02256EA4 (SysTask * param0, void * param1) ov46_02256D60(param1); } -static void ov46_02256ED8 (SysTask * param0, void * param1) +static void ov46_02256ED8(SysTask *param0, void *param1) { - UnkStruct_ov46_02256BCC * v0 = ov25_0225523C(param1); - const UnkStruct_ov46_02256BCC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov46_02256BCC *v0 = ov25_0225523C(param1); + const UnkStruct_ov46_02256BCC_1 *v1 = ov25_02255240(param1); ov46_022570C4(v0, 1); ov25_022558C4(v0->unk_34[0], 3); @@ -388,28 +389,28 @@ static void ov46_02256ED8 (SysTask * param0, void * param1) ov46_02256D60(param1); } -static void ov46_02256F0C (SysTask * param0, void * param1) +static void ov46_02256F0C(SysTask *param0, void *param1) { - UnkStruct_ov46_02256BCC * v0 = ov25_0225523C(param1); - const UnkStruct_ov46_02256BCC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov46_02256BCC *v0 = ov25_0225523C(param1); + const UnkStruct_ov46_02256BCC_1 *v1 = ov25_02255240(param1); ov46_02257054(v0, v1); ov46_02256D60(param1); } -static void ov46_02256F30 (SysTask * param0, void * param1) +static void ov46_02256F30(SysTask *param0, void *param1) { - UnkStruct_ov46_02256BCC * v0 = ov25_0225523C(param1); - const UnkStruct_ov46_02256BCC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov46_02256BCC *v0 = ov25_0225523C(param1); + const UnkStruct_ov46_02256BCC_1 *v1 = ov25_02255240(param1); ov46_02257094(v0, v1); ov46_02256D60(param1); } -static void ov46_02256F54 (SysTask * param0, void * param1) +static void ov46_02256F54(SysTask *param0, void *param1) { - UnkStruct_ov46_02256BCC * v0 = ov25_0225523C(param1); - const UnkStruct_ov46_02256BCC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov46_02256BCC *v0 = ov25_0225523C(param1); + const UnkStruct_ov46_02256BCC_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: @@ -442,10 +443,10 @@ static void ov46_02256F54 (SysTask * param0, void * param1) } } -static void ov46_02257010 (SysTask * param0, void * param1) +static void ov46_02257010(SysTask *param0, void *param1) { - UnkStruct_ov46_02256BCC * v0 = ov25_0225523C(param1); - const UnkStruct_ov46_02256BCC_1 * v1 = ov25_02255240(param1); + UnkStruct_ov46_02256BCC *v0 = ov25_0225523C(param1); + const UnkStruct_ov46_02256BCC_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: @@ -460,14 +461,14 @@ static void ov46_02257010 (SysTask * param0, void * param1) } } -static void ov46_02257054 (UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov46_02256BCC_1 * param1) +static void ov46_02257054(UnkStruct_ov46_02256BCC *param0, const UnkStruct_ov46_02256BCC_1 *param1) { ov25_022558C4(param0->unk_34[2], (param1->unk_04[0]) ? 6 : 5); - ov25_022558C4(param0->unk_34[3], (param1->unk_04[1]) ? 8 : 7); + ov25_022558C4(param0->unk_34[3], (param1->unk_04[1]) ? 8 : 7); ov25_022558C4(param0->unk_34[4], (param1->unk_04[2]) ? 10 : 9); } -static void ov46_02257094 (UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov46_02256BCC_1 * param1) +static void ov46_02257094(UnkStruct_ov46_02256BCC *param0, const UnkStruct_ov46_02256BCC_1 *param1) { ov25_022558C4(param0->unk_34[13], param1->unk_00); ov25_022558C4(param0->unk_34[14], param1->unk_01); @@ -475,7 +476,7 @@ static void ov46_02257094 (UnkStruct_ov46_02256BCC * param0, const UnkStruct_ov4 ov25_022558C4(param0->unk_34[16], param1->unk_03); } -static void ov46_022570C4 (UnkStruct_ov46_02256BCC * param0, BOOL param1) +static void ov46_022570C4(UnkStruct_ov46_02256BCC *param0, BOOL param1) { ov25_02255914(param0->unk_34[5], param1); ov25_02255914(param0->unk_34[6], param1); @@ -487,7 +488,7 @@ static void ov46_022570C4 (UnkStruct_ov46_02256BCC * param0, BOOL param1) ov25_02255914(param0->unk_34[12], param1); } -u32 ov46_0225710C (UnkStruct_ov46_02256BCC * param0) +u32 ov46_0225710C(UnkStruct_ov46_02256BCC *param0) { return param0->unk_A8; } diff --git a/src/overlay047/ov47_022561C0.c b/src/overlay047/ov47_022561C0.c index b81e8260ee..561b57853a 100644 --- a/src/overlay047/ov47_022561C0.c +++ b/src/overlay047/ov47_022561C0.c @@ -1,62 +1,61 @@ #include -#include #include - -#include "inlines.h" +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay047/struct_ov47_02256634_decl.h" - #include "struct_defs/struct_0202D7B0.h" #include "struct_defs/struct_0206C638.h" + +#include "overlay025/poketch_system.h" +#include "overlay047/ov47_02256634.h" #include "overlay047/struct_ov47_02256634_1.h" +#include "overlay047/struct_ov47_02256634_decl.h" -#include "sys_task.h" #include "heap.h" -#include "unk_0202D7A8.h" -#include "vars_flags.h" +#include "inlines.h" #include "poketch_data.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_0202D7A8.h" #include "unk_0206AFE0.h" -#include "overlay047/ov47_02256634.h" +#include "vars_flags.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov47_02256634_1 unk_04; - UnkStruct_ov47_02256634 * unk_70; + UnkStruct_ov47_02256634 *unk_70; PoketchSystem *poketchSys; PoketchData *poketchData; - UnkStruct_0206C638 * unk_7C[6]; + UnkStruct_0206C638 *unk_7C[6]; u8 unk_94[6]; u8 unk_9A; } UnkStruct_ov47_0225621C; static void NitroStaticInit(void); -static BOOL ov47_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov47_0225621C(UnkStruct_ov47_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov47_0225634C(UnkStruct_ov47_0225621C * param0); -static void ov47_02256384(SysTask * param0, void * param1); -static void ov47_022563B8(void * param0); -static void ov47_022563C0(UnkStruct_ov47_0225621C * param0, u32 param1); -static BOOL ov47_022563D4(UnkStruct_ov47_0225621C * param0); -static BOOL ov47_02256414(UnkStruct_ov47_0225621C * param0); -static BOOL ov47_022564A8(UnkStruct_ov47_0225621C * param0); -static BOOL ov47_02256500(UnkStruct_ov47_0225621C * param0); -static void ov47_02256534(UnkStruct_ov47_0225621C * param0, int param1); -static BOOL ov47_02256584(UnkStruct_ov47_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov47_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov47_0225621C(UnkStruct_ov47_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov47_0225634C(UnkStruct_ov47_0225621C *param0); +static void ov47_02256384(SysTask *param0, void *param1); +static void ov47_022563B8(void *param0); +static void ov47_022563C0(UnkStruct_ov47_0225621C *param0, u32 param1); +static BOOL ov47_022563D4(UnkStruct_ov47_0225621C *param0); +static BOOL ov47_02256414(UnkStruct_ov47_0225621C *param0); +static BOOL ov47_022564A8(UnkStruct_ov47_0225621C *param0); +static BOOL ov47_02256500(UnkStruct_ov47_0225621C *param0); +static void ov47_02256534(UnkStruct_ov47_0225621C *param0, int param1); +static BOOL ov47_02256584(UnkStruct_ov47_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov47_022561D4, ov47_022563B8); } -static BOOL ov47_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov47_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov47_0225621C * v0 = (UnkStruct_ov47_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_0225621C)); + UnkStruct_ov47_0225621C *v0 = (UnkStruct_ov47_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_0225621C)); if (v0 != NULL) { if (ov47_0225621C(v0, poketchSys, param2, param3)) { @@ -72,7 +71,7 @@ static BOOL ov47_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov47_0225621C(UnkStruct_ov47_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { int v0; @@ -95,7 +94,7 @@ static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, PoketchSystem *poke param0->unk_04.unk_08 = 0; { - VarsFlags * v1 = SaveData_GetVarsFlags(PoketchSystem_GetSaveData(poketchSys)); + VarsFlags *v1 = SaveData_GetVarsFlags(PoketchSystem_GetSaveData(poketchSys)); for (v0 = 0; v0 < 4; v0++) { param0->unk_04.unk_2C[v0] = sub_0206B1F0(v1, v0); @@ -103,7 +102,7 @@ static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, PoketchSystem *poke } { - UnkStruct_0202D7B0 * v2 = sub_0202D834(PoketchSystem_GetSaveData(poketchSys)); + UnkStruct_0202D7B0 *v2 = sub_0202D834(PoketchSystem_GetSaveData(poketchSys)); for (v0 = 0; v0 < 6; v0++) { param0->unk_7C[v0] = sub_0202D924(v2, v0); @@ -125,7 +124,7 @@ static BOOL ov47_0225621C (UnkStruct_ov47_0225621C * param0, PoketchSystem *poke return 0; } -static void ov47_0225634C (UnkStruct_ov47_0225621C * param0) +static void ov47_0225634C(UnkStruct_ov47_0225621C *param0) { int v0; @@ -137,16 +136,16 @@ static void ov47_0225634C (UnkStruct_ov47_0225621C * param0) Heap_FreeToHeap(param0); } -static void ov47_02256384 (SysTask * param0, void * param1) +static void ov47_02256384(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov47_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov47_0225621C *) = { ov47_022563D4, ov47_02256414, ov47_022564A8, ov47_02256500 }; - UnkStruct_ov47_0225621C * v1 = (UnkStruct_ov47_0225621C *)param1; + UnkStruct_ov47_0225621C *v1 = (UnkStruct_ov47_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -158,12 +157,12 @@ static void ov47_02256384 (SysTask * param0, void * param1) } } -static void ov47_022563B8 (void * param0) +static void ov47_022563B8(void *param0) { ((UnkStruct_ov47_0225621C *)param0)->unk_02 = 1; } -static void ov47_022563C0 (UnkStruct_ov47_0225621C * param0, u32 param1) +static void ov47_022563C0(UnkStruct_ov47_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -174,7 +173,7 @@ static void ov47_022563C0 (UnkStruct_ov47_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov47_022563D4 (UnkStruct_ov47_0225621C * param0) +static BOOL ov47_022563D4(UnkStruct_ov47_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -192,7 +191,7 @@ static BOOL ov47_022563D4 (UnkStruct_ov47_0225621C * param0) return 0; } -static BOOL ov47_02256414 (UnkStruct_ov47_0225621C * param0) +static BOOL ov47_02256414(UnkStruct_ov47_0225621C *param0) { u32 v0, v1; @@ -231,7 +230,7 @@ static BOOL ov47_02256414 (UnkStruct_ov47_0225621C * param0) return 0; } -static BOOL ov47_022564A8 (UnkStruct_ov47_0225621C * param0) +static BOOL ov47_022564A8(UnkStruct_ov47_0225621C *param0) { u32 v0, v1; @@ -253,7 +252,7 @@ static BOOL ov47_022564A8 (UnkStruct_ov47_0225621C * param0) return 0; } -static BOOL ov47_02256500 (UnkStruct_ov47_0225621C * param0) +static BOOL ov47_02256500(UnkStruct_ov47_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -270,7 +269,7 @@ static BOOL ov47_02256500 (UnkStruct_ov47_0225621C * param0) return 0; } -static void ov47_02256534 (UnkStruct_ov47_0225621C * param0, int param1) +static void ov47_02256534(UnkStruct_ov47_0225621C *param0, int param1) { if (param0->unk_94[0] != param1) { int v0, v1; @@ -295,7 +294,7 @@ static void ov47_02256534 (UnkStruct_ov47_0225621C * param0, int param1) } } -static BOOL ov47_02256584 (UnkStruct_ov47_0225621C * param0) +static BOOL ov47_02256584(UnkStruct_ov47_0225621C *param0) { BOOL v0 = 0; diff --git a/src/overlay047/ov47_02256634.c b/src/overlay047/ov47_02256634.c index 7a1a8f1164..27b73c4d21 100644 --- a/src/overlay047/ov47_02256634.c +++ b/src/overlay047/ov47_02256634.c @@ -1,52 +1,53 @@ +#include "overlay047/ov47_02256634.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay047/struct_ov47_02256634_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/ov25_02255DBC.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay047/struct_ov47_02256634_1.h" +#include "overlay047/struct_ov47_02256634_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay025/ov25_02255DBC.h" -#include "overlay047/ov47_02256634.h" struct UnkStruct_ov47_02256634_t { - const UnkStruct_ov47_02256634_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov47_02256634_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24[6]; - UnkStruct_ov25_022558C4 * unk_3C[4]; - UnkStruct_ov25_022558C4 * unk_4C[6]; - UnkStruct_ov25_022558C4 * unk_64; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24[6]; + UnkStruct_ov25_022558C4 *unk_3C[4]; + UnkStruct_ov25_022558C4 *unk_4C[6]; + UnkStruct_ov25_022558C4 *unk_64; UnkStruct_ov25_02255958 unk_68; - SysTask * unk_7C; + SysTask *unk_7C; }; -static void ov47_02256684(UnkStruct_ov47_02256634 * param0, const UnkStruct_ov47_02256634_1 * param1); -static void ov47_022567FC(UnkStruct_ov47_02256634 * param0); -static void ov47_022568A8(UnkStruct_ov25_02255224 * param0); -static void ov47_022568BC(SysTask * param0, void * param1); -static void ov47_0225694C(SysTask * param0, void * param1); -static void ov47_02256968(SysTask * param0, void * param1); +static void ov47_02256684(UnkStruct_ov47_02256634 *param0, const UnkStruct_ov47_02256634_1 *param1); +static void ov47_022567FC(UnkStruct_ov47_02256634 *param0); +static void ov47_022568A8(UnkStruct_ov25_02255224 *param0); +static void ov47_022568BC(SysTask *param0, void *param1); +static void ov47_0225694C(SysTask *param0, void *param1); +static void ov47_02256968(SysTask *param0, void *param1); -BOOL ov47_02256634 (UnkStruct_ov47_02256634 ** param0, const UnkStruct_ov47_02256634_1 * param1, BGL * param2) +BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_02256634_1 *param1, BGL *param2) { - UnkStruct_ov47_02256634 * v0 = (UnkStruct_ov47_02256634 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_02256634)); + UnkStruct_ov47_02256634 *v0 = (UnkStruct_ov47_02256634 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov47_02256634)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -64,7 +65,7 @@ BOOL ov47_02256634 (UnkStruct_ov47_02256634 ** param0, const UnkStruct_ov47_0225 return 0; } -void ov47_02256670 (UnkStruct_ov47_02256634 * param0) +void ov47_02256670(UnkStruct_ov47_02256634 *param0) { if (param0 != NULL) { ov47_022567FC(param0); @@ -72,7 +73,7 @@ void ov47_02256670 (UnkStruct_ov47_02256634 * param0) } } -static void ov47_02256684 (UnkStruct_ov47_02256634 * param0, const UnkStruct_ov47_02256634_1 * param1) +static void ov47_02256684(UnkStruct_ov47_02256634 *param0, const UnkStruct_ov47_02256634_1 *param1) { UnkStruct_ov25_02255810 v0; int v1, v2; @@ -88,16 +89,16 @@ static void ov47_02256684 (UnkStruct_ov47_02256634 * param0, const UnkStruct_ov4 ov25_02255DBC(param1->unk_00, param1->unk_04, &v3, &v4); - v0.unk_00.x = (((v3)) << FX32_SHIFT); - v0.unk_00.y = (((v4)) << FX32_SHIFT); + v0.unk_00.x = ((v3) << FX32_SHIFT); + v0.unk_00.y = ((v4) << FX32_SHIFT); v0.unk_0C = 1; v0.unk_08 = 0; param0->unk_64 = ov25_02255810(param0->unk_20, &v0, &(param0->unk_68)); v0.unk_0D = 1; for (v1 = 0; v1 < 6; v1++) { - v0.unk_00.x = (((param1->unk_0C[v1].unk_00)) << FX32_SHIFT); - v0.unk_00.y = (((param1->unk_0C[v1].unk_01)) << FX32_SHIFT); + v0.unk_00.x = ((param1->unk_0C[v1].unk_00) << FX32_SHIFT); + v0.unk_00.y = ((param1->unk_0C[v1].unk_01) << FX32_SHIFT); v0.unk_0C = 2 + param1->unk_0C[v1].unk_02; v0.unk_08 = 1 + v1; param0->unk_24[v1] = ov25_02255810(param0->unk_20, &v0, &(param0->unk_68)); @@ -106,8 +107,8 @@ static void ov47_02256684 (UnkStruct_ov47_02256634 * param0, const UnkStruct_ov4 for (v1 = 0; v1 < 4; v1++) { ov25_02255DFC(v1, &v3, &v4); - v0.unk_00.x = (((v3)) << FX32_SHIFT); - v0.unk_00.y = (((v4)) << FX32_SHIFT); + v0.unk_00.x = ((v3) << FX32_SHIFT); + v0.unk_00.y = ((v4) << FX32_SHIFT); v0.unk_0C = 9; v0.unk_08 = 14 + v1; @@ -121,8 +122,8 @@ static void ov47_02256684 (UnkStruct_ov47_02256634 * param0, const UnkStruct_ov4 for (v1 = 0; v1 < 6; v1++) { v2 = ov25_02255E24(param1->unk_3C[v1].unk_04, &v3, &v4); - v0.unk_00.x = (((v3)) << FX32_SHIFT); - v0.unk_00.y = (((v4)) << FX32_SHIFT); + v0.unk_00.x = ((v3) << FX32_SHIFT); + v0.unk_00.y = ((v4) << FX32_SHIFT); v0.unk_0C = 8; v0.unk_08 = 18; @@ -136,7 +137,7 @@ static void ov47_02256684 (UnkStruct_ov47_02256634 * param0, const UnkStruct_ov4 param0->unk_7C = SysTask_Start(ov47_02256968, param0, 3); } -static void ov47_022567FC (UnkStruct_ov47_02256634 * param0) +static void ov47_022567FC(UnkStruct_ov47_02256634 *param0) { int v0; @@ -168,34 +169,34 @@ static void ov47_022567FC (UnkStruct_ov47_02256634 * param0) } static const UnkStruct_ov25_0225517C Unk_ov47_02256A78[] = { - {0x0, ov47_022568BC, 0x0}, - {0x1, ov47_0225694C, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov47_022568BC, 0x0 }, + { 0x1, ov47_0225694C, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov47_0225686C (UnkStruct_ov47_02256634 * param0, u32 param1) +void ov47_0225686C(UnkStruct_ov47_02256634 *param0, u32 param1) { ov25_0225517C(Unk_ov47_02256A78, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov47_02256890 (UnkStruct_ov47_02256634 * param0, u32 param1) +BOOL ov47_02256890(UnkStruct_ov47_02256634 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov47_0225689C (UnkStruct_ov47_02256634 * param0) +BOOL ov47_0225689C(UnkStruct_ov47_02256634 *param0) { return ov25_02255154(param0->unk_08); } -static void ov47_022568A8 (UnkStruct_ov25_02255224 * param0) +static void ov47_022568A8(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov47_02256634 * v0 = ov25_0225523C(param0); + UnkStruct_ov47_02256634 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov47_022568BC (SysTask * param0, void * param1) +static void ov47_022568BC(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -213,8 +214,8 @@ static void ov47_022568BC (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov47_02256634 * v2; - NNSG2dPaletteData * v3; + UnkStruct_ov47_02256634 *v2; + NNSG2dPaletteData *v3; v2 = ov25_0225523C(param1); @@ -232,18 +233,18 @@ static void ov47_022568BC (SysTask * param0, void * param1) ov47_022568A8(param1); } -static void ov47_0225694C (SysTask * param0, void * param1) +static void ov47_0225694C(SysTask *param0, void *param1) { - UnkStruct_ov47_02256634 * v0 = ov25_0225523C(param1); + UnkStruct_ov47_02256634 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov47_022568A8(param1); } -static void ov47_02256968 (SysTask * param0, void * param1) +static void ov47_02256968(SysTask *param0, void *param1) { - UnkStruct_ov47_02256634 * v0 = param1; - const UnkStruct_ov47_02256634_1 * v1 = v0->unk_00; + UnkStruct_ov47_02256634 *v0 = param1; + const UnkStruct_ov47_02256634_1 *v1 = v0->unk_00; int v2; if (v1->unk_28) { @@ -257,19 +258,19 @@ static void ov47_02256968 (SysTask * param0, void * param1) ov25_022558C4(v0->unk_24[v3], 1 + v3); } - ov25_02255900(v0->unk_24[v3], (((v1->unk_0C[v3].unk_00)) << FX32_SHIFT), (((v1->unk_0C[v3].unk_01)) << FX32_SHIFT)); + ov25_02255900(v0->unk_24[v3], ((v1->unk_0C[v3].unk_00) << FX32_SHIFT), ((v1->unk_0C[v3].unk_01) << FX32_SHIFT)); } if (v1->unk_08) { u32 v4, v5, v6; ov25_02255DBC(v1->unk_00, v1->unk_04, &v4, &v5); - ov25_02255900(v0->unk_64, (((v4)) << FX32_SHIFT), (((v5)) << FX32_SHIFT)); + ov25_02255900(v0->unk_64, ((v4) << FX32_SHIFT), ((v5) << FX32_SHIFT)); for (v6 = 0; v6 < 6; v6++) { if (v1->unk_3C[v6].unk_00) { if (ov25_02255E24(v1->unk_3C[v6].unk_04, &v4, &v5)) { - ov25_02255900(v0->unk_4C[v6], (((v4)) << FX32_SHIFT), (((v5)) << FX32_SHIFT)); + ov25_02255900(v0->unk_4C[v6], ((v4) << FX32_SHIFT), ((v5) << FX32_SHIFT)); ov25_02255914(v0->unk_4C[v6], 0); } else { ov25_02255914(v0->unk_4C[v6], 1); diff --git a/src/overlay048/ov48_022561C0.c b/src/overlay048/ov48_022561C0.c index 17429b8b2a..3f48ae9056 100644 --- a/src/overlay048/ov48_022561C0.c +++ b/src/overlay048/ov48_022561C0.c @@ -1,147 +1,146 @@ #include -#include #include - -#include "inlines.h" +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02027854_decl.h" -#include "overlay025/poketch_system.h" -#include "overlay048/struct_ov48_0225650C_decl.h" +#include "overlay025/poketch_system.h" +#include "overlay048/ov48_0225650C.h" #include "overlay048/struct_ov48_0225650C_1.h" +#include "overlay048/struct_ov48_0225650C_decl.h" -#include "sys_task.h" #include "heap.h" +#include "inlines.h" #include "savedata_misc.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02027B70.h" -#include "vars_flags.h" #include "unk_0206AFE0.h" -#include "overlay048/ov48_0225650C.h" +#include "vars_flags.h" static const struct { - u8 unk_00; - u8 unk_01; + u8 unk_00; + u8 unk_01; } Unk_ov48_02256A38[] = { - { 0x5, 0x14 }, - { 0x5, 0x14 }, - { 0x6, 0x14 }, - { 0x6, 0x14 }, - { 0x6, 0x13 }, - { 0x6, 0x13 }, - { 0x7, 0x11 }, - { 0x7, 0x11 }, - { 0x7, 0x11 }, - { 0x7, 0x11 }, - { 0x5, 0x12 }, - { 0x5, 0x12 }, - { 0x5, 0x12 }, - { 0x5, 0x12 }, - { 0x8, 0x10 }, - { 0x8, 0x10 }, - { 0x8, 0x10 }, - { 0x8, 0x10 }, - { 0x9, 0x13 }, - { 0x9, 0x13 }, - { 0x9, 0x15 }, - { 0x9, 0x15 }, - { 0x9, 0x16 }, - { 0x9, 0x16 }, - { 0x9, 0x16 }, - { 0x9, 0x16 }, - { 0xD, 0x16 }, - { 0xD, 0x16 }, - { 0xD, 0x16 }, - { 0xD, 0x16 }, - { 0x10, 0x16 }, - { 0x10, 0x16 }, - { 0x11, 0x15 }, - { 0x11, 0x15 }, - { 0x11, 0x14 }, - { 0x11, 0x14 }, - { 0x11, 0x14 }, - { 0x11, 0x14 }, - { 0x11, 0x13 }, - { 0x11, 0x13 }, - { 0x11, 0x13 }, - { 0x11, 0x13 }, - { 0xF, 0x10 }, - { 0xF, 0x10 }, - { 0xF, 0x10 }, - { 0xF, 0x10 }, - { 0xD, 0x10 }, - { 0xD, 0x10 }, - { 0xD, 0x10 }, - { 0xD, 0x10 }, - { 0xE, 0x18 }, - { 0xE, 0x18 }, - { 0xE, 0x19 }, - { 0xE, 0x19 }, - { 0x11, 0x1A }, - { 0x11, 0x1A }, - { 0x11, 0x1A }, - { 0x11, 0x1A }, - { 0x13, 0x19 }, - { 0x13, 0x19 }, - { 0x13, 0x19 }, - { 0x13, 0x19 }, - { 0x14, 0x19 }, - { 0x14, 0x19 }, - { 0x14, 0x19 }, - { 0x14, 0x19 }, - { 0x16, 0x14 }, - { 0x16, 0x14 }, - { 0x16, 0x14 }, - { 0x16, 0x14 }, - { 0x13, 0x12 }, - { 0x13, 0x12 }, - { 0x14, 0x12 }, - { 0x14, 0x12 }, - { 0x2, 0x17 }, - { 0x2, 0x17 }, - { 0x2, 0x17 }, - { 0x2, 0x17 }, - { 0x8, 0x1C }, - { 0x8, 0x1C }, - { 0x8, 0x1C }, - { 0x8, 0x1C }, - { 0x17, 0x18 }, - { 0x17, 0x18 }, - { 0x17, 0x18 }, - { 0x17, 0x18 }, - { 0x1C, 0x10 }, - { 0x1C, 0x10 }, - { 0x1C, 0x10 }, - { 0x1C, 0x10 }, - { 0x13, 0xD }, - { 0x14, 0xD }, - { 0x14, 0xD }, - { 0x14, 0xD }, - { 0x13, 0xA }, - { 0x13, 0xA }, - { 0x13, 0xA }, - { 0x13, 0xA }, - { 0x15, 0xA }, - { 0x15, 0xA }, - { 0x15, 0xA }, - { 0x15, 0xA }, - { 0x18, 0xC }, - { 0x18, 0xC }, - { 0x18, 0xC }, - { 0x18, 0xC }, - { 0x19, 0xD }, - { 0x19, 0xD }, - { 0x19, 0xD }, - { 0x19, 0xD }, - { 0x19, 0xE }, - { 0x19, 0xE }, - { 0x19, 0xE }, - { 0x19, 0xE }, - { 0x15, 0xD }, - { 0x15, 0xD }, - { 0x15, 0xD }, - { 0x15, 0xD } + { 0x5, 0x14 }, + { 0x5, 0x14 }, + { 0x6, 0x14 }, + { 0x6, 0x14 }, + { 0x6, 0x13 }, + { 0x6, 0x13 }, + { 0x7, 0x11 }, + { 0x7, 0x11 }, + { 0x7, 0x11 }, + { 0x7, 0x11 }, + { 0x5, 0x12 }, + { 0x5, 0x12 }, + { 0x5, 0x12 }, + { 0x5, 0x12 }, + { 0x8, 0x10 }, + { 0x8, 0x10 }, + { 0x8, 0x10 }, + { 0x8, 0x10 }, + { 0x9, 0x13 }, + { 0x9, 0x13 }, + { 0x9, 0x15 }, + { 0x9, 0x15 }, + { 0x9, 0x16 }, + { 0x9, 0x16 }, + { 0x9, 0x16 }, + { 0x9, 0x16 }, + { 0xD, 0x16 }, + { 0xD, 0x16 }, + { 0xD, 0x16 }, + { 0xD, 0x16 }, + { 0x10, 0x16 }, + { 0x10, 0x16 }, + { 0x11, 0x15 }, + { 0x11, 0x15 }, + { 0x11, 0x14 }, + { 0x11, 0x14 }, + { 0x11, 0x14 }, + { 0x11, 0x14 }, + { 0x11, 0x13 }, + { 0x11, 0x13 }, + { 0x11, 0x13 }, + { 0x11, 0x13 }, + { 0xF, 0x10 }, + { 0xF, 0x10 }, + { 0xF, 0x10 }, + { 0xF, 0x10 }, + { 0xD, 0x10 }, + { 0xD, 0x10 }, + { 0xD, 0x10 }, + { 0xD, 0x10 }, + { 0xE, 0x18 }, + { 0xE, 0x18 }, + { 0xE, 0x19 }, + { 0xE, 0x19 }, + { 0x11, 0x1A }, + { 0x11, 0x1A }, + { 0x11, 0x1A }, + { 0x11, 0x1A }, + { 0x13, 0x19 }, + { 0x13, 0x19 }, + { 0x13, 0x19 }, + { 0x13, 0x19 }, + { 0x14, 0x19 }, + { 0x14, 0x19 }, + { 0x14, 0x19 }, + { 0x14, 0x19 }, + { 0x16, 0x14 }, + { 0x16, 0x14 }, + { 0x16, 0x14 }, + { 0x16, 0x14 }, + { 0x13, 0x12 }, + { 0x13, 0x12 }, + { 0x14, 0x12 }, + { 0x14, 0x12 }, + { 0x2, 0x17 }, + { 0x2, 0x17 }, + { 0x2, 0x17 }, + { 0x2, 0x17 }, + { 0x8, 0x1C }, + { 0x8, 0x1C }, + { 0x8, 0x1C }, + { 0x8, 0x1C }, + { 0x17, 0x18 }, + { 0x17, 0x18 }, + { 0x17, 0x18 }, + { 0x17, 0x18 }, + { 0x1C, 0x10 }, + { 0x1C, 0x10 }, + { 0x1C, 0x10 }, + { 0x1C, 0x10 }, + { 0x13, 0xD }, + { 0x14, 0xD }, + { 0x14, 0xD }, + { 0x14, 0xD }, + { 0x13, 0xA }, + { 0x13, 0xA }, + { 0x13, 0xA }, + { 0x13, 0xA }, + { 0x15, 0xA }, + { 0x15, 0xA }, + { 0x15, 0xA }, + { 0x15, 0xA }, + { 0x18, 0xC }, + { 0x18, 0xC }, + { 0x18, 0xC }, + { 0x18, 0xC }, + { 0x19, 0xD }, + { 0x19, 0xD }, + { 0x19, 0xD }, + { 0x19, 0xD }, + { 0x19, 0xE }, + { 0x19, 0xE }, + { 0x19, 0xE }, + { 0x19, 0xE }, + { 0x15, 0xD }, + { 0x15, 0xD }, + { 0x15, 0xD }, + { 0x15, 0xD } }; typedef struct { @@ -149,33 +148,33 @@ typedef struct { u8 unk_01; u8 unk_02; UnkStruct_ov48_0225650C_1 unk_04; - UnkStruct_ov48_0225650C * unk_A8; + UnkStruct_ov48_0225650C *unk_A8; PoketchSystem *poketchSys; } UnkStruct_ov48_0225621C; static void NitroStaticInit(void); -static BOOL ov48_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov48_0225621C(UnkStruct_ov48_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov48_022562A8(UnkStruct_ov48_0225621C * param0); -static void ov48_022562BC(SysTask * param0, void * param1); -static void ov48_022562F0(void * param0); -static void ov48_022562F8(UnkStruct_ov48_0225621C * param0, u32 param1); -static BOOL ov48_0225630C(UnkStruct_ov48_0225621C * param0); -static BOOL ov48_02256358(UnkStruct_ov48_0225621C * param0); -static BOOL ov48_022563D0(UnkStruct_ov48_0225621C * param0); -static int ov48_02256408(UnkStruct_ov48_0225621C * param0); -static BOOL ov48_02256478(UnkStruct_ov48_0225621C * param0); -static void ov48_022564E0(UnkStruct_ov48_0225621C * param0, PoketchSystem *poketchSys); - -static void NitroStaticInit (void) +static BOOL ov48_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov48_0225621C(UnkStruct_ov48_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov48_022562A8(UnkStruct_ov48_0225621C *param0); +static void ov48_022562BC(SysTask *param0, void *param1); +static void ov48_022562F0(void *param0); +static void ov48_022562F8(UnkStruct_ov48_0225621C *param0, u32 param1); +static BOOL ov48_0225630C(UnkStruct_ov48_0225621C *param0); +static BOOL ov48_02256358(UnkStruct_ov48_0225621C *param0); +static BOOL ov48_022563D0(UnkStruct_ov48_0225621C *param0); +static int ov48_02256408(UnkStruct_ov48_0225621C *param0); +static BOOL ov48_02256478(UnkStruct_ov48_0225621C *param0); +static void ov48_022564E0(UnkStruct_ov48_0225621C *param0, PoketchSystem *poketchSys); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov48_022561D4, ov48_022562F0); } -static BOOL ov48_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov48_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov48_0225621C * v0 = (UnkStruct_ov48_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225621C)); + UnkStruct_ov48_0225621C *v0 = (UnkStruct_ov48_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225621C)); if (v0 != NULL) { if (ov48_0225621C(v0, poketchSys, param2, param3)) { @@ -191,7 +190,7 @@ static BOOL ov48_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov48_0225621C (UnkStruct_ov48_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov48_0225621C(UnkStruct_ov48_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { param0->poketchSys = poketchSys; param0->unk_04.unk_08 = ov48_02256408(param0); @@ -210,21 +209,21 @@ static BOOL ov48_0225621C (UnkStruct_ov48_0225621C * param0, PoketchSystem *poke return 0; } -static void ov48_022562A8 (UnkStruct_ov48_0225621C * param0) +static void ov48_022562A8(UnkStruct_ov48_0225621C *param0) { ov48_0225654C(param0->unk_A8); Heap_FreeToHeap(param0); } -static void ov48_022562BC (SysTask * param0, void * param1) +static void ov48_022562BC(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov48_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov48_0225621C *) = { ov48_0225630C, ov48_02256358, ov48_022563D0 }; - UnkStruct_ov48_0225621C * v1 = (UnkStruct_ov48_0225621C *)param1; + UnkStruct_ov48_0225621C *v1 = (UnkStruct_ov48_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -236,12 +235,12 @@ static void ov48_022562BC (SysTask * param0, void * param1) } } -static void ov48_022562F0 (void * param0) +static void ov48_022562F0(void *param0) { ((UnkStruct_ov48_0225621C *)param0)->unk_02 = 1; } -static void ov48_022562F8 (UnkStruct_ov48_0225621C * param0, u32 param1) +static void ov48_022562F8(UnkStruct_ov48_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -252,7 +251,7 @@ static void ov48_022562F8 (UnkStruct_ov48_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov48_0225630C (UnkStruct_ov48_0225621C * param0) +static BOOL ov48_0225630C(UnkStruct_ov48_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -270,7 +269,7 @@ static BOOL ov48_0225630C (UnkStruct_ov48_0225621C * param0) return 0; } -static BOOL ov48_02256358 (UnkStruct_ov48_0225621C * param0) +static BOOL ov48_02256358(UnkStruct_ov48_0225621C *param0) { if (param0->unk_02) { ov48_022562F8(param0, 2); @@ -293,7 +292,7 @@ static BOOL ov48_02256358 (UnkStruct_ov48_0225621C * param0) return 0; } -static BOOL ov48_022563D0 (UnkStruct_ov48_0225621C * param0) +static BOOL ov48_022563D0(UnkStruct_ov48_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -310,9 +309,9 @@ static BOOL ov48_022563D0 (UnkStruct_ov48_0225621C * param0) return 0; } -static int ov48_02256408 (UnkStruct_ov48_0225621C * param0) +static int ov48_02256408(UnkStruct_ov48_0225621C *param0) { - UnkStruct_02027854 * v0 = sub_02027854(PoketchSystem_GetSaveData(param0->poketchSys)); + UnkStruct_02027854 *v0 = sub_02027854(PoketchSystem_GetSaveData(param0->poketchSys)); int v1, v2; for (v1 = 0, v2 = 0; v1 < (NELEMS(Unk_ov48_02256A38)); v1++) { @@ -333,7 +332,7 @@ static int ov48_02256408 (UnkStruct_ov48_0225621C * param0) return v2; } -static BOOL ov48_02256478 (UnkStruct_ov48_0225621C * param0) +static BOOL ov48_02256478(UnkStruct_ov48_0225621C *param0) { BOOL v0 = 0; @@ -352,9 +351,9 @@ static BOOL ov48_02256478 (UnkStruct_ov48_0225621C * param0) return v0; } -static void ov48_022564E0 (UnkStruct_ov48_0225621C * param0, PoketchSystem *poketchSys) +static void ov48_022564E0(UnkStruct_ov48_0225621C *param0, PoketchSystem *poketchSys) { - VarsFlags * v0 = SaveData_GetVarsFlags(PoketchSystem_GetSaveData(poketchSys)); + VarsFlags *v0 = SaveData_GetVarsFlags(PoketchSystem_GetSaveData(poketchSys)); int v1; for (v1 = 0; v1 < 4; v1++) { diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index cbd1597a99..adb6f65627 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -1,64 +1,64 @@ +#include "overlay048/ov48_0225650C.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay048/struct_ov48_0225650C_decl.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/ov25_02255DBC.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay048/struct_ov48_0225650C_1.h" +#include "overlay048/struct_ov48_0225650C_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" +#include "heap.h" #include "message.h" +#include "strbuf.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay025/ov25_02255DBC.h" -#include "overlay048/ov48_0225650C.h" struct UnkStruct_ov48_0225650C_t { - const UnkStruct_ov48_0225650C_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov48_0225650C_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24; - UnkStruct_ov25_022558C4 * unk_28[64]; - UnkStruct_ov25_022558C4 * unk_128[4]; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24; + UnkStruct_ov25_022558C4 *unk_28[64]; + UnkStruct_ov25_022558C4 *unk_128[4]; UnkStruct_ov25_02255958 unk_138; - SysTask * unk_14C; + SysTask *unk_14C; BOOL unk_150; int unk_154; int unk_158; BOOL unk_15C; }; -static void ov48_02256594(UnkStruct_ov25_02255224 * param0); -static void ov48_022565A8(SysTask * param0, void * param1); -static void ov48_02256650(UnkStruct_ov48_0225650C * param0, u32 param1); -static void ov48_022566D0(SysTask * param0, void * param1); -static void ov48_0225672C(SysTask * param0, void * param1); -static void ov48_022567FC(UnkStruct_ov48_0225650C * param0); -static void ov48_02256920(UnkStruct_ov48_0225650C * param0); -static void ov48_02256984(UnkStruct_ov48_0225650C * param0); -static void ov48_022569FC(SysTask * param0, void * param1); - -BOOL ov48_0225650C (UnkStruct_ov48_0225650C ** param0, const UnkStruct_ov48_0225650C_1 * param1, BGL * param2) +static void ov48_02256594(UnkStruct_ov25_02255224 *param0); +static void ov48_022565A8(SysTask *param0, void *param1); +static void ov48_02256650(UnkStruct_ov48_0225650C *param0, u32 param1); +static void ov48_022566D0(SysTask *param0, void *param1); +static void ov48_0225672C(SysTask *param0, void *param1); +static void ov48_022567FC(UnkStruct_ov48_0225650C *param0); +static void ov48_02256920(UnkStruct_ov48_0225650C *param0); +static void ov48_02256984(UnkStruct_ov48_0225650C *param0); +static void ov48_022569FC(SysTask *param0, void *param1); + +BOOL ov48_0225650C(UnkStruct_ov48_0225650C **param0, const UnkStruct_ov48_0225650C_1 *param1, BGL *param2) { - UnkStruct_ov48_0225650C * v0 = (UnkStruct_ov48_0225650C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225650C)); + UnkStruct_ov48_0225650C *v0 = (UnkStruct_ov48_0225650C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov48_0225650C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -73,7 +73,7 @@ BOOL ov48_0225650C (UnkStruct_ov48_0225650C ** param0, const UnkStruct_ov48_0225 return 0; } -void ov48_0225654C (UnkStruct_ov48_0225650C * param0) +void ov48_0225654C(UnkStruct_ov48_0225650C *param0) { if (param0 != NULL) { Heap_FreeToHeap(param0); @@ -81,34 +81,34 @@ void ov48_0225654C (UnkStruct_ov48_0225650C * param0) } static const UnkStruct_ov25_0225517C Unk_ov48_02256B40[] = { - {0x0, ov48_022565A8, 0x0}, - {0x1, ov48_022566D0, 0x0}, - {0x2, ov48_0225672C, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov48_022565A8, 0x0 }, + { 0x1, ov48_022566D0, 0x0 }, + { 0x2, ov48_0225672C, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov48_02256558 (UnkStruct_ov48_0225650C * param0, u32 param1) +void ov48_02256558(UnkStruct_ov48_0225650C *param0, u32 param1) { ov25_0225517C(Unk_ov48_02256B40, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov48_0225657C (UnkStruct_ov48_0225650C * param0, u32 param1) +BOOL ov48_0225657C(UnkStruct_ov48_0225650C *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov48_02256588 (UnkStruct_ov48_0225650C * param0) +BOOL ov48_02256588(UnkStruct_ov48_0225650C *param0) { return ov25_02255154(param0->unk_08); } -static void ov48_02256594 (UnkStruct_ov25_02255224 * param0) +static void ov48_02256594(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov48_0225650C * v0 = ov25_0225523C(param0); + UnkStruct_ov48_0225650C *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov48_022565A8 (SysTask * param0, void * param1) +static void ov48_022565A8(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -126,8 +126,8 @@ static void ov48_022565A8 (SysTask * param0, void * param1) 1 }; GXSDispCnt v1; - UnkStruct_ov48_0225650C * v2; - NNSG2dPaletteData * v3; + UnkStruct_ov48_0225650C *v2; + NNSG2dPaletteData *v3; u32 v4; v2 = ov25_0225523C(param1); @@ -154,10 +154,10 @@ static void ov48_022565A8 (SysTask * param0, void * param1) ov48_02256594(param1); } -static void ov48_02256650 (UnkStruct_ov48_0225650C * param0, u32 param1) +static void ov48_02256650(UnkStruct_ov48_0225650C *param0, u32 param1) { Window v0; - Strbuf* v1; + Strbuf *v1; v1 = MessageBank_GetNewStrbufFromNARC(26, 459, 0, 8); @@ -172,9 +172,9 @@ static void ov48_02256650 (UnkStruct_ov48_0225650C * param0, u32 param1) } } -static void ov48_022566D0 (SysTask * param0, void * param1) +static void ov48_022566D0(SysTask *param0, void *param1) { - UnkStruct_ov48_0225650C * v0 = ov25_0225523C(param1); + UnkStruct_ov48_0225650C *v0 = ov25_0225523C(param1); switch (ov25_02255248(param1)) { case 0: @@ -193,10 +193,10 @@ static void ov48_022566D0 (SysTask * param0, void * param1) } } -static void ov48_0225672C (SysTask * param0, void * param1) +static void ov48_0225672C(SysTask *param0, void *param1) { - UnkStruct_ov48_0225650C * v0 = ov25_0225523C(param1); - const UnkStruct_ov48_0225650C_1 * v1 = ov25_02255240(param1); + UnkStruct_ov48_0225650C *v0 = ov25_0225523C(param1); + const UnkStruct_ov48_0225650C_1 *v1 = ov25_02255240(param1); switch (ov25_02255248(param1)) { case 0: @@ -234,9 +234,9 @@ static void ov48_0225672C (SysTask * param0, void * param1) } } -static void ov48_022567FC (UnkStruct_ov48_0225650C * param0) +static void ov48_022567FC(UnkStruct_ov48_0225650C *param0) { - const UnkStruct_ov48_0225650C_1 * v0; + const UnkStruct_ov48_0225650C_1 *v0; UnkStruct_ov25_02255810 v1; u32 v2, v3; int v4; @@ -253,8 +253,8 @@ static void ov48_022567FC (UnkStruct_ov48_0225650C * param0) ov25_02255DBC(v0->unk_00, v0->unk_04, &v2, &v3); - v1.unk_00.x = (((v2)) << FX32_SHIFT); - v1.unk_00.y = (((v3)) << FX32_SHIFT); + v1.unk_00.x = ((v2) << FX32_SHIFT); + v1.unk_00.y = ((v3) << FX32_SHIFT); v1.unk_0C = 0; v1.unk_08 = 0; param0->unk_24 = ov25_02255810(param0->unk_20, &v1, &(param0->unk_138)); @@ -275,8 +275,8 @@ static void ov48_022567FC (UnkStruct_ov48_0225650C * param0) for (v4 = 0; v4 < 4; v4++) { ov25_02255DFC(v4, &v2, &v3); - v1.unk_00.x = (((v2)) << FX32_SHIFT); - v1.unk_00.y = (((v3)) << FX32_SHIFT); + v1.unk_00.x = ((v2) << FX32_SHIFT); + v1.unk_00.y = ((v3) << FX32_SHIFT); v1.unk_0C = 2; v1.unk_08 = 14 + v4; param0->unk_128[v4] = ov25_02255810(param0->unk_20, &v1, &(param0->unk_138)); @@ -291,23 +291,23 @@ static void ov48_022567FC (UnkStruct_ov48_0225650C * param0) param0->unk_14C = SysTask_Start(ov48_022569FC, param0, 3); } -static void ov48_02256920 (UnkStruct_ov48_0225650C * param0) +static void ov48_02256920(UnkStruct_ov48_0225650C *param0) { u32 v0, v1; int v2; for (v2 = 0; v2 < param0->unk_00->unk_08; v2++) { ov25_02255DBC(param0->unk_00->unk_0C[v2].unk_00, param0->unk_00->unk_0C[v2].unk_01, &v0, &v1); - ov25_02255900(param0->unk_28[v2], (((v0)) << FX32_SHIFT), (((v1)) << FX32_SHIFT)); + ov25_02255900(param0->unk_28[v2], ((v0) << FX32_SHIFT), ((v1) << FX32_SHIFT)); ov25_02255914(param0->unk_28[v2], 0); } - for ( ; v2 < 64; v2++) { + for (; v2 < 64; v2++) { ov25_02255914(param0->unk_28[v2], 1); } } -static void ov48_02256984 (UnkStruct_ov48_0225650C * param0) +static void ov48_02256984(UnkStruct_ov48_0225650C *param0) { int v0; @@ -338,15 +338,15 @@ static void ov48_02256984 (UnkStruct_ov48_0225650C * param0) ov25_022559B0(¶m0->unk_138); } -static void ov48_022569FC (SysTask * param0, void * param1) +static void ov48_022569FC(SysTask *param0, void *param1) { - UnkStruct_ov48_0225650C * v0 = param1; - const UnkStruct_ov48_0225650C_1 * v1 = v0->unk_00; + UnkStruct_ov48_0225650C *v0 = param1; + const UnkStruct_ov48_0225650C_1 *v1 = v0->unk_00; if (v1->unk_90) { u32 v2, v3; ov25_02255DBC(v1->unk_00, v1->unk_04, &v2, &v3); - ov25_02255900(v0->unk_24, (((v2)) << FX32_SHIFT), (((v3)) << FX32_SHIFT)); + ov25_02255900(v0->unk_24, ((v2) << FX32_SHIFT), ((v3) << FX32_SHIFT)); } } diff --git a/src/overlay049/ov49_022561C0.c b/src/overlay049/ov49_022561C0.c index 1c7c0a87e6..470a4c4b61 100644 --- a/src/overlay049/ov49_022561C0.c +++ b/src/overlay049/ov49_022561C0.c @@ -1,19 +1,19 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay049/struct_ov49_022563D4_decl.h" +#include "overlay025/poketch_system.h" +#include "overlay049/ov49_022563D4.h" #include "overlay049/struct_ov49_022563D4_1.h" +#include "overlay049/struct_ov49_022563D4_decl.h" -#include "sys_task.h" #include "heap.h" -#include "touch_screen.h" #include "poketch_data.h" -#include "overlay049/ov49_022563D4.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; @@ -21,32 +21,32 @@ typedef struct { u8 unk_02; u8 unk_03; UnkStruct_ov49_022563D4_1 unk_04; - UnkStruct_ov49_022563D4 * unk_08; + UnkStruct_ov49_022563D4 *unk_08; PoketchSystem *poketchSys; PoketchData *poketchData; } UnkStruct_ov49_0225621C; static void NitroStaticInit(void); -static BOOL ov49_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov49_0225621C(UnkStruct_ov49_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov49_02256258(UnkStruct_ov49_0225621C * param0); -static void ov49_0225626C(SysTask * param0, void * param1); -static void ov49_022562A0(void * param0); -static void ov49_022562A8(UnkStruct_ov49_0225621C * param0, u32 param1); -static BOOL ov49_022562BC(UnkStruct_ov49_0225621C * param0); -static BOOL ov49_022562FC(UnkStruct_ov49_0225621C * param0); -static BOOL ov49_02256348(UnkStruct_ov49_0225621C * param0); -static BOOL ov49_022563A0(UnkStruct_ov49_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov49_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov49_0225621C(UnkStruct_ov49_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov49_02256258(UnkStruct_ov49_0225621C *param0); +static void ov49_0225626C(SysTask *param0, void *param1); +static void ov49_022562A0(void *param0); +static void ov49_022562A8(UnkStruct_ov49_0225621C *param0, u32 param1); +static BOOL ov49_022562BC(UnkStruct_ov49_0225621C *param0); +static BOOL ov49_022562FC(UnkStruct_ov49_0225621C *param0); +static BOOL ov49_02256348(UnkStruct_ov49_0225621C *param0); +static BOOL ov49_022563A0(UnkStruct_ov49_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov49_022561D4, ov49_022562A0); } -static BOOL ov49_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov49_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov49_0225621C * v0 = (UnkStruct_ov49_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_0225621C)); + UnkStruct_ov49_0225621C *v0 = (UnkStruct_ov49_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_0225621C)); if (v0 != NULL) { if (ov49_0225621C(v0, poketchSys, param2, param3)) { @@ -62,7 +62,7 @@ static BOOL ov49_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov49_0225621C (UnkStruct_ov49_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov49_0225621C(UnkStruct_ov49_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { param0->poketchData = PoketchSystem_GetPoketchData(poketchSys); param0->unk_04.unk_00 = PoketchData_CurrentScreenColor(param0->poketchData); @@ -79,21 +79,21 @@ static BOOL ov49_0225621C (UnkStruct_ov49_0225621C * param0, PoketchSystem *poke return 0; } -static void ov49_02256258 (UnkStruct_ov49_0225621C * param0) +static void ov49_02256258(UnkStruct_ov49_0225621C *param0) { ov49_02256480(param0->unk_08); Heap_FreeToHeap(param0); } -static void ov49_0225626C (SysTask * param0, void * param1) +static void ov49_0225626C(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov49_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov49_0225621C *) = { ov49_022562BC, ov49_022562FC, ov49_022563A0 }; - UnkStruct_ov49_0225621C * v1 = (UnkStruct_ov49_0225621C *)param1; + UnkStruct_ov49_0225621C *v1 = (UnkStruct_ov49_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -105,12 +105,12 @@ static void ov49_0225626C (SysTask * param0, void * param1) } } -static void ov49_022562A0 (void * param0) +static void ov49_022562A0(void *param0) { ((UnkStruct_ov49_0225621C *)param0)->unk_02 = 1; } -static void ov49_022562A8 (UnkStruct_ov49_0225621C * param0, u32 param1) +static void ov49_022562A8(UnkStruct_ov49_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -121,7 +121,7 @@ static void ov49_022562A8 (UnkStruct_ov49_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov49_022562BC (UnkStruct_ov49_0225621C * param0) +static BOOL ov49_022562BC(UnkStruct_ov49_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -139,7 +139,7 @@ static BOOL ov49_022562BC (UnkStruct_ov49_0225621C * param0) return 0; } -static BOOL ov49_022562FC (UnkStruct_ov49_0225621C * param0) +static BOOL ov49_022562FC(UnkStruct_ov49_0225621C *param0) { if (param0->unk_02) { ov49_022562A8(param0, 2); @@ -163,7 +163,7 @@ static BOOL ov49_022562FC (UnkStruct_ov49_0225621C * param0) return 0; } -static BOOL ov49_02256348 (UnkStruct_ov49_0225621C * param0) +static BOOL ov49_02256348(UnkStruct_ov49_0225621C *param0) { if (ov25_0225450C(param0->poketchSys) == 0) { u32 v0, v1; @@ -189,7 +189,7 @@ static BOOL ov49_02256348 (UnkStruct_ov49_0225621C * param0) return 0; } -static BOOL ov49_022563A0 (UnkStruct_ov49_0225621C * param0) +static BOOL ov49_022563A0(UnkStruct_ov49_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay049/ov49_022563D4.c b/src/overlay049/ov49_022563D4.c index 0d3318d4fa..c896405287 100644 --- a/src/overlay049/ov49_022563D4.c +++ b/src/overlay049/ov49_022563D4.c @@ -1,47 +1,48 @@ +#include "overlay049/ov49_022563D4.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay049/struct_ov49_022563D4_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay049/struct_ov49_022563D4_1.h" +#include "overlay049/struct_ov49_022563D4_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay049/ov49_022563D4.h" struct UnkStruct_ov49_022563D4_t { - const UnkStruct_ov49_022563D4_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov49_022563D4_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24; UnkStruct_ov25_02255958 unk_28; }; -static void ov49_02256410(UnkStruct_ov49_022563D4 * param0, const UnkStruct_ov49_022563D4_1 * param1); -static void ov49_02256464(UnkStruct_ov49_022563D4 * param0); -static void ov49_022564D0(UnkStruct_ov25_02255224 * param0); -static void ov49_022564E4(SysTask * param0, void * param1); -static void ov49_02256578(SysTask * param0, void * param1); -static void ov49_02256594(SysTask * param0, void * param1); +static void ov49_02256410(UnkStruct_ov49_022563D4 *param0, const UnkStruct_ov49_022563D4_1 *param1); +static void ov49_02256464(UnkStruct_ov49_022563D4 *param0); +static void ov49_022564D0(UnkStruct_ov25_02255224 *param0); +static void ov49_022564E4(SysTask *param0, void *param1); +static void ov49_02256578(SysTask *param0, void *param1); +static void ov49_02256594(SysTask *param0, void *param1); -BOOL ov49_022563D4 (UnkStruct_ov49_022563D4 ** param0, const UnkStruct_ov49_022563D4_1 * param1, BGL * param2) +BOOL ov49_022563D4(UnkStruct_ov49_022563D4 **param0, const UnkStruct_ov49_022563D4_1 *param1, BGL *param2) { - UnkStruct_ov49_022563D4 * v0 = (UnkStruct_ov49_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_022563D4)); + UnkStruct_ov49_022563D4 *v0 = (UnkStruct_ov49_022563D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov49_022563D4)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -57,10 +58,10 @@ BOOL ov49_022563D4 (UnkStruct_ov49_022563D4 ** param0, const UnkStruct_ov49_0225 return 0; } -static void ov49_02256410 (UnkStruct_ov49_022563D4 * param0, const UnkStruct_ov49_022563D4_1 * param1) +static void ov49_02256410(UnkStruct_ov49_022563D4 *param0, const UnkStruct_ov49_022563D4_1 *param1) { static const UnkStruct_ov25_02255810 v0 = { - {(56 << FX32_SHIFT), (148 << FX32_SHIFT)}, + { (56 << FX32_SHIFT), (148 << FX32_SHIFT) }, 0, 0, 2, @@ -75,7 +76,7 @@ static void ov49_02256410 (UnkStruct_ov49_022563D4 * param0, const UnkStruct_ov4 ov25_02255900(param0->unk_24, (56 + (16 * param1->unk_00)) << FX32_SHIFT, (148 << FX32_SHIFT)); } -static void ov49_02256464 (UnkStruct_ov49_022563D4 * param0) +static void ov49_02256464(UnkStruct_ov49_022563D4 *param0) { int v0; @@ -86,7 +87,7 @@ static void ov49_02256464 (UnkStruct_ov49_022563D4 * param0) ov25_022559B0(¶m0->unk_28); } -void ov49_02256480 (UnkStruct_ov49_022563D4 * param0) +void ov49_02256480(UnkStruct_ov49_022563D4 *param0) { if (param0 != NULL) { ov49_02256464(param0); @@ -95,34 +96,34 @@ void ov49_02256480 (UnkStruct_ov49_022563D4 * param0) } static const UnkStruct_ov25_0225517C Unk_ov49_0225660C[] = { - {0x0, ov49_022564E4, 0x0}, - {0x1, ov49_02256578, 0x0}, - {0x2, ov49_02256594}, - {0x0, NULL, 0x0} + { 0x0, ov49_022564E4, 0x0 }, + { 0x1, ov49_02256578, 0x0 }, + { 0x2, ov49_02256594 }, + { 0x0, NULL, 0x0 } }; -void ov49_02256494 (UnkStruct_ov49_022563D4 * param0, u32 param1) +void ov49_02256494(UnkStruct_ov49_022563D4 *param0, u32 param1) { ov25_0225517C(Unk_ov49_0225660C, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov49_022564B8 (UnkStruct_ov49_022563D4 * param0, u32 param1) +BOOL ov49_022564B8(UnkStruct_ov49_022563D4 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov49_022564C4 (UnkStruct_ov49_022563D4 * param0) +BOOL ov49_022564C4(UnkStruct_ov49_022563D4 *param0) { return ov25_02255154(param0->unk_08); } -static void ov49_022564D0 (UnkStruct_ov25_02255224 * param0) +static void ov49_022564D0(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov49_022563D4 * v0 = ov25_0225523C(param0); + UnkStruct_ov49_022563D4 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov49_022564E4 (SysTask * param0, void * param1) +static void ov49_022564E4(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -140,10 +141,10 @@ static void ov49_022564E4 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov49_022563D4 * v2; - const UnkStruct_ov49_022563D4_1 * v3; - void * v4; - NNSG2dPaletteData * v5; + UnkStruct_ov49_022563D4 *v2; + const UnkStruct_ov49_022563D4_1 *v3; + void *v4; + NNSG2dPaletteData *v5; v2 = ov25_0225523C(param1); v3 = ov25_02255240(param1); @@ -161,18 +162,18 @@ static void ov49_022564E4 (SysTask * param0, void * param1) ov49_022564D0(param1); } -static void ov49_02256578 (SysTask * param0, void * param1) +static void ov49_02256578(SysTask *param0, void *param1) { - UnkStruct_ov49_022563D4 * v0 = ov25_0225523C(param1); + UnkStruct_ov49_022563D4 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov49_022564D0(param1); } -static void ov49_02256594 (SysTask * param0, void * param1) +static void ov49_02256594(SysTask *param0, void *param1) { - UnkStruct_ov49_022563D4 * v0 = ov25_0225523C(param1); - const UnkStruct_ov49_022563D4_1 * v1 = ov25_02255240(param1); + UnkStruct_ov49_022563D4 *v0 = ov25_0225523C(param1); + const UnkStruct_ov49_022563D4_1 *v1 = ov25_02255240(param1); PoketchSystem_PlaySoundEffect(1635); ov25_022546B8(0, 0); diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index a54ec6d0a2..985e046f1f 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/src/overlay050/ov50_022561C0.c @@ -1,28 +1,28 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay050/struct_ov50_02256510_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay050/ov50_02256510.h" #include "overlay050/struct_ov50_02256510_1.h" +#include "overlay050/struct_ov50_02256510_decl.h" -#include "sys_task.h" -#include "rtc.h" #include "heap.h" #include "poketch_data.h" -#include "overlay050/ov50_02256510.h" +#include "rtc.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov50_02256510_1 unk_04; - UnkStruct_ov50_02256510 * unk_90; + UnkStruct_ov50_02256510 *unk_90; PoketchSystem *poketchSys; PoketchData *poketchData; PoketchButtonManager *buttonManager; @@ -34,26 +34,26 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov50_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov50_0225621C(UnkStruct_ov50_022561D4 * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov50_022562AC(UnkStruct_ov50_02256510_1 * param0, UnkStruct_ov50_022561D4 * param1, const RTCDate * param2); -static void ov50_02256340(UnkStruct_ov50_022561D4 * param0); -static void ov50_02256360(u32 param0, u32 param1, u32 param2, void * param3); -static void ov50_0225636C(SysTask * param0, void * param1); -static void ov50_022563B0(void * param0); -static void ov50_022563B8(UnkStruct_ov50_022561D4 * param0, u32 param1); -static BOOL ov50_022563CC(UnkStruct_ov50_022561D4 * param0); -static BOOL ov50_02256418(UnkStruct_ov50_022561D4 * param0); -static BOOL ov50_022564D8(UnkStruct_ov50_022561D4 * param0); - -static void NitroStaticInit (void) +static BOOL ov50_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov50_0225621C(UnkStruct_ov50_022561D4 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov50_022562AC(UnkStruct_ov50_02256510_1 *param0, UnkStruct_ov50_022561D4 *param1, const RTCDate *param2); +static void ov50_02256340(UnkStruct_ov50_022561D4 *param0); +static void ov50_02256360(u32 param0, u32 param1, u32 param2, void *param3); +static void ov50_0225636C(SysTask *param0, void *param1); +static void ov50_022563B0(void *param0); +static void ov50_022563B8(UnkStruct_ov50_022561D4 *param0, u32 param1); +static BOOL ov50_022563CC(UnkStruct_ov50_022561D4 *param0); +static BOOL ov50_02256418(UnkStruct_ov50_022561D4 *param0); +static BOOL ov50_022564D8(UnkStruct_ov50_022561D4 *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov50_022561D4, ov50_022563B0); } -static BOOL ov50_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov50_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov50_022561D4 * v0 = (UnkStruct_ov50_022561D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_022561D4)); + UnkStruct_ov50_022561D4 *v0 = (UnkStruct_ov50_022561D4 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_022561D4)); if (v0 != NULL) { if (ov50_0225621C(v0, poketchSys, param2, param3)) { @@ -69,46 +69,46 @@ static BOOL ov50_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov50_0225621C (UnkStruct_ov50_022561D4 * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov50_0225621C(UnkStruct_ov50_022561D4 *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { static const TouchScreenHitTable v0[] = { - {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8)}, - {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8)}, - {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8)}, - {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 3) * 8), ((4 + 3 * 3 + 2) * 8)}, - {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 4) * 8), ((4 + 3 * 4 + 2) * 8)}, - {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 5) * 8), ((4 + 3 * 5 + 2) * 8)}, - {((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 6) * 8), ((4 + 3 * 6 + 2) * 8)}, - {((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8)}, - {((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8)}, - {((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8)}, - {((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 3) * 8), ((4 + 3 * 3 + 2) * 8)}, - {((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 4) * 8), ((4 + 3 * 4 + 2) * 8)}, - {((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 5) * 8), ((4 + 3 * 5 + 2) * 8)}, - {((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 6) * 8), ((4 + 3 * 6 + 2) * 8)}, - {((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8)}, - {((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8)}, - {((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8)}, - {((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 3) * 8), ((4 + 3 * 3 + 2) * 8)}, - {((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 4) * 8), ((4 + 3 * 4 + 2) * 8)}, - {((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 5) * 8), ((4 + 3 * 5 + 2) * 8)}, - {((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 6) * 8), ((4 + 3 * 6 + 2) * 8)}, - {((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8)}, - {((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8)}, - {((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8)}, - {((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 3) * 8), ((4 + 3 * 3 + 2) * 8)}, - {((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 4) * 8), ((4 + 3 * 4 + 2) * 8)}, - {((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 5) * 8), ((4 + 3 * 5 + 2) * 8)}, - {((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 6) * 8), ((4 + 3 * 6 + 2) * 8)}, - {((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8)}, - {((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8)}, - {((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8)}, - {((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 3) * 8), ((4 + 3 * 3 + 2) * 8)}, - {((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 4) * 8), ((4 + 3 * 4 + 2) * 8)}, - {((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 5) * 8), ((4 + 3 * 5 + 2) * 8)}, - {((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 6) * 8), ((4 + 3 * 6 + 2) * 8)}, - {((5 + 3 * 5) * 8), ((5 + 3 * 5 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8)}, - {((5 + 3 * 5) * 8), ((5 + 3 * 5 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8)} + { ((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8) }, + { ((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8) }, + { ((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8) }, + { ((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 3) * 8), ((4 + 3 * 3 + 2) * 8) }, + { ((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 4) * 8), ((4 + 3 * 4 + 2) * 8) }, + { ((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 5) * 8), ((4 + 3 * 5 + 2) * 8) }, + { ((5 + 3 * 0) * 8), ((5 + 3 * 0 + 2) * 8), ((4 + 3 * 6) * 8), ((4 + 3 * 6 + 2) * 8) }, + { ((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8) }, + { ((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8) }, + { ((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8) }, + { ((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 3) * 8), ((4 + 3 * 3 + 2) * 8) }, + { ((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 4) * 8), ((4 + 3 * 4 + 2) * 8) }, + { ((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 5) * 8), ((4 + 3 * 5 + 2) * 8) }, + { ((5 + 3 * 1) * 8), ((5 + 3 * 1 + 2) * 8), ((4 + 3 * 6) * 8), ((4 + 3 * 6 + 2) * 8) }, + { ((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8) }, + { ((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8) }, + { ((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8) }, + { ((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 3) * 8), ((4 + 3 * 3 + 2) * 8) }, + { ((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 4) * 8), ((4 + 3 * 4 + 2) * 8) }, + { ((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 5) * 8), ((4 + 3 * 5 + 2) * 8) }, + { ((5 + 3 * 2) * 8), ((5 + 3 * 2 + 2) * 8), ((4 + 3 * 6) * 8), ((4 + 3 * 6 + 2) * 8) }, + { ((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8) }, + { ((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8) }, + { ((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8) }, + { ((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 3) * 8), ((4 + 3 * 3 + 2) * 8) }, + { ((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 4) * 8), ((4 + 3 * 4 + 2) * 8) }, + { ((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 5) * 8), ((4 + 3 * 5 + 2) * 8) }, + { ((5 + 3 * 3) * 8), ((5 + 3 * 3 + 2) * 8), ((4 + 3 * 6) * 8), ((4 + 3 * 6 + 2) * 8) }, + { ((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8) }, + { ((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8) }, + { ((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 2) * 8), ((4 + 3 * 2 + 2) * 8) }, + { ((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 3) * 8), ((4 + 3 * 3 + 2) * 8) }, + { ((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 4) * 8), ((4 + 3 * 4 + 2) * 8) }, + { ((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 5) * 8), ((4 + 3 * 5 + 2) * 8) }, + { ((5 + 3 * 4) * 8), ((5 + 3 * 4 + 2) * 8), ((4 + 3 * 6) * 8), ((4 + 3 * 6 + 2) * 8) }, + { ((5 + 3 * 5) * 8), ((5 + 3 * 5 + 2) * 8), ((4 + 3 * 0) * 8), ((4 + 3 * 0 + 2) * 8) }, + { ((5 + 3 * 5) * 8), ((5 + 3 * 5 + 2) * 8), ((4 + 3 * 1) * 8), ((4 + 3 * 1 + 2) * 8) } }; RTCDate v1; @@ -133,10 +133,21 @@ static BOOL ov50_0225621C (UnkStruct_ov50_022561D4 * param0, PoketchSystem *poke return 0; } -static void ov50_022562AC (UnkStruct_ov50_02256510_1 * param0, UnkStruct_ov50_022561D4 * param1, const RTCDate * param2) +static void ov50_022562AC(UnkStruct_ov50_02256510_1 *param0, UnkStruct_ov50_022561D4 *param1, const RTCDate *param2) { static const u8 v0[12] = { - 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, + 31, + 28, + 31, + 30, + 31, + 30, + 31, + 31, + 30, + 31, + 30, + 31, }; u32 v1, v2; @@ -163,7 +174,7 @@ static void ov50_022562AC (UnkStruct_ov50_02256510_1 * param0, UnkStruct_ov50_02 } } -static void ov50_02256340 (UnkStruct_ov50_022561D4 * param0) +static void ov50_02256340(UnkStruct_ov50_022561D4 *param0) { PoketchButtonManager_Free(param0->buttonManager); ov50_0225654C(param0->unk_90); @@ -171,23 +182,23 @@ static void ov50_02256340 (UnkStruct_ov50_022561D4 * param0) Heap_FreeToHeap(param0); } -static void ov50_02256360 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov50_02256360(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov50_022561D4 * v0 = (UnkStruct_ov50_022561D4 *)param3; + UnkStruct_ov50_022561D4 *v0 = (UnkStruct_ov50_022561D4 *)param3; v0->unk_A4 = param0; v0->unk_A0 = param1; } -static void ov50_0225636C (SysTask * param0, void * param1) +static void ov50_0225636C(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov50_022561D4 *) = { + static BOOL (*const v0[])(UnkStruct_ov50_022561D4 *) = { ov50_022563CC, ov50_02256418, ov50_022564D8 }; - UnkStruct_ov50_022561D4 * v1 = (UnkStruct_ov50_022561D4 *)param1; + UnkStruct_ov50_022561D4 *v1 = (UnkStruct_ov50_022561D4 *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -201,12 +212,12 @@ static void ov50_0225636C (SysTask * param0, void * param1) } } -static void ov50_022563B0 (void * param0) +static void ov50_022563B0(void *param0) { ((UnkStruct_ov50_022561D4 *)param0)->unk_02 = 1; } -static void ov50_022563B8 (UnkStruct_ov50_022561D4 * param0, u32 param1) +static void ov50_022563B8(UnkStruct_ov50_022561D4 *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -217,7 +228,7 @@ static void ov50_022563B8 (UnkStruct_ov50_022561D4 * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov50_022563CC (UnkStruct_ov50_022561D4 * param0) +static BOOL ov50_022563CC(UnkStruct_ov50_022561D4 *param0) { switch (param0->unk_01) { case 0: @@ -235,7 +246,7 @@ static BOOL ov50_022563CC (UnkStruct_ov50_022561D4 * param0) return 0; } -static BOOL ov50_02256418 (UnkStruct_ov50_022561D4 * param0) +static BOOL ov50_02256418(UnkStruct_ov50_022561D4 *param0) { if (param0->unk_02) { ov50_022563B8(param0, 2); @@ -273,7 +284,7 @@ static BOOL ov50_02256418 (UnkStruct_ov50_022561D4 * param0) return 0; } -static BOOL ov50_022564D8 (UnkStruct_ov50_022561D4 * param0) +static BOOL ov50_022564D8(UnkStruct_ov50_022561D4 *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay050/ov50_02256510.c b/src/overlay050/ov50_02256510.c index bc6d7bef06..dbf3715e54 100644 --- a/src/overlay050/ov50_02256510.c +++ b/src/overlay050/ov50_02256510.c @@ -1,52 +1,53 @@ +#include "overlay050/ov50_02256510.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay050/struct_ov50_02256510_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay050/struct_ov50_02256510_1.h" +#include "overlay050/struct_ov50_02256510_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay050/ov50_02256510.h" struct UnkStruct_ov50_02256510_t { - const UnkStruct_ov50_02256510_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov50_02256510_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24; UnkStruct_ov25_02255958 unk_28; }; -static void ov50_02256560(UnkStruct_ov50_02256510 * param0, const UnkStruct_ov50_02256510_1 * param1); -static void ov50_022565B0(UnkStruct_ov25_022558C4 * param0, u32 param1); -static void ov50_022565E4(UnkStruct_ov50_02256510 * param0); -static void ov50_02256638(UnkStruct_ov25_02255224 * param0); -static void ov50_0225664C(SysTask * param0, void * param1); -static void ov50_022566F0(SysTask * param0, void * param1); -static void ov50_02256714(SysTask * param0, void * param1); -static void ov50_0225675C(UnkStruct_ov50_02256510 * param0, const UnkStruct_ov50_02256510_1 * param1); -static void ov50_022567A8(BGL * param0, u16 param1, u32 param2); -static void ov50_022567F4(UnkStruct_ov50_02256510 * param0, const UnkStruct_ov50_02256510_1 * param1); -static void ov50_0225683C(BGL * param0, u32 param1); -static void ov50_02256894(BGL * param0, u32 param1, u32 param2); - -BOOL ov50_02256510 (UnkStruct_ov50_02256510 ** param0, const UnkStruct_ov50_02256510_1 * param1, BGL * param2) +static void ov50_02256560(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_02256510_1 *param1); +static void ov50_022565B0(UnkStruct_ov25_022558C4 *param0, u32 param1); +static void ov50_022565E4(UnkStruct_ov50_02256510 *param0); +static void ov50_02256638(UnkStruct_ov25_02255224 *param0); +static void ov50_0225664C(SysTask *param0, void *param1); +static void ov50_022566F0(SysTask *param0, void *param1); +static void ov50_02256714(SysTask *param0, void *param1); +static void ov50_0225675C(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_02256510_1 *param1); +static void ov50_022567A8(BGL *param0, u16 param1, u32 param2); +static void ov50_022567F4(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_02256510_1 *param1); +static void ov50_0225683C(BGL *param0, u32 param1); +static void ov50_02256894(BGL *param0, u32 param1, u32 param2); + +BOOL ov50_02256510(UnkStruct_ov50_02256510 **param0, const UnkStruct_ov50_02256510_1 *param1, BGL *param2) { - UnkStruct_ov50_02256510 * v0 = (UnkStruct_ov50_02256510 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_02256510)); + UnkStruct_ov50_02256510 *v0 = (UnkStruct_ov50_02256510 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov50_02256510)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -62,7 +63,7 @@ BOOL ov50_02256510 (UnkStruct_ov50_02256510 ** param0, const UnkStruct_ov50_0225 return 0; } -void ov50_0225654C (UnkStruct_ov50_02256510 * param0) +void ov50_0225654C(UnkStruct_ov50_02256510 *param0) { if (param0 != NULL) { ov50_022565E4(param0); @@ -70,10 +71,15 @@ void ov50_0225654C (UnkStruct_ov50_02256510 * param0) } } -static void ov50_02256560 (UnkStruct_ov50_02256510 * param0, const UnkStruct_ov50_02256510_1 * param1) +static void ov50_02256560(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_02256510_1 *param1) { static const UnkStruct_ov25_02255810 v0 = { - {(0 << FX32_SHIFT), (0 << FX32_SHIFT)}, 0, 0, 2, 0, 0, + { (0 << FX32_SHIFT), (0 << FX32_SHIFT) }, + 0, + 0, + 2, + 0, + 0, }; sub_02006EC0(12, 114, 1, 0, 0, 1, 8); @@ -83,7 +89,7 @@ static void ov50_02256560 (UnkStruct_ov50_02256510 * param0, const UnkStruct_ov5 ov50_022565B0(param0->unk_24, param1->unk_0C[param1->unk_08 - 1].unk_02); } -static void ov50_022565B0 (UnkStruct_ov25_022558C4 * param0, u32 param1) +static void ov50_022565B0(UnkStruct_ov25_022558C4 *param0, u32 param1) { fx32 v0, v1; @@ -93,41 +99,41 @@ static void ov50_022565B0 (UnkStruct_ov25_022558C4 * param0, u32 param1) ov25_02255900(param0, v0, v1); } -static void ov50_022565E4 (UnkStruct_ov50_02256510 * param0) +static void ov50_022565E4(UnkStruct_ov50_02256510 *param0) { ov25_022558B0(param0->unk_20, param0->unk_24); ov25_022559B0(&(param0->unk_28)); } static const UnkStruct_ov25_0225517C Unk_ov50_02256AC0[] = { - {0x0, ov50_0225664C, 0x0}, - {0x1, ov50_022566F0, 0x0}, - {0x2, ov50_02256714, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov50_0225664C, 0x0 }, + { 0x1, ov50_022566F0, 0x0 }, + { 0x2, ov50_02256714, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov50_022565FC (UnkStruct_ov50_02256510 * param0, u32 param1) +void ov50_022565FC(UnkStruct_ov50_02256510 *param0, u32 param1) { ov25_0225517C(Unk_ov50_02256AC0, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov50_02256620 (UnkStruct_ov50_02256510 * param0, u32 param1) +BOOL ov50_02256620(UnkStruct_ov50_02256510 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov50_0225662C (UnkStruct_ov50_02256510 * param0) +BOOL ov50_0225662C(UnkStruct_ov50_02256510 *param0) { return ov25_02255154(param0->unk_08); } -static void ov50_02256638 (UnkStruct_ov25_02255224 * param0) +static void ov50_02256638(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov50_02256510 * v0 = ov25_0225523C(param0); + UnkStruct_ov50_02256510 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov50_0225664C (SysTask * param0, void * param1) +static void ov50_0225664C(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -160,8 +166,8 @@ static void ov50_0225664C (SysTask * param0, void * param1) 0 }; GXSDispCnt v2; - UnkStruct_ov50_02256510 * v3; - const UnkStruct_ov50_02256510_1 * v4; + UnkStruct_ov50_02256510 *v3; + const UnkStruct_ov50_02256510_1 *v4; v3 = ov25_0225523C(param1); v4 = ov25_02255240(param1); @@ -183,9 +189,9 @@ static void ov50_0225664C (SysTask * param0, void * param1) ov50_02256638(param1); } -static void ov50_022566F0 (SysTask * param0, void * param1) +static void ov50_022566F0(SysTask *param0, void *param1) { - UnkStruct_ov50_02256510 * v0 = ov25_0225523C(param1); + UnkStruct_ov50_02256510 *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); sub_02019044(v0->unk_04, 7); @@ -193,10 +199,10 @@ static void ov50_022566F0 (SysTask * param0, void * param1) ov50_02256638(param1); } -static void ov50_02256714 (SysTask * param0, void * param1) +static void ov50_02256714(SysTask *param0, void *param1) { - UnkStruct_ov50_02256510 * v0; - const UnkStruct_ov50_02256510_1 * v1; + UnkStruct_ov50_02256510 *v0; + const UnkStruct_ov50_02256510_1 *v1; u32 v2; v0 = ov25_0225523C(param1); @@ -208,7 +214,7 @@ static void ov50_02256714 (SysTask * param0, void * param1) ov50_02256638(param1); } -static void ov50_0225675C (UnkStruct_ov50_02256510 * param0, const UnkStruct_ov50_02256510_1 * param1) +static void ov50_0225675C(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_02256510_1 *param1) { u32 v0; @@ -221,7 +227,7 @@ static void ov50_0225675C (UnkStruct_ov50_02256510 * param0, const UnkStruct_ov5 } } -static void ov50_022567A8 (BGL * param0, u16 param1, u32 param2) +static void ov50_022567A8(BGL *param0, u16 param1, u32 param2) { u32 v0, v1; @@ -231,7 +237,7 @@ static void ov50_022567A8 (BGL * param0, u16 param1, u32 param2) sub_02019CB8(param0, 7, param1, v0, v1, 2, 2, 0); } -static void ov50_022567F4 (UnkStruct_ov50_02256510 * param0, const UnkStruct_ov50_02256510_1 * param1) +static void ov50_022567F4(UnkStruct_ov50_02256510 *param0, const UnkStruct_ov50_02256510_1 *param1) { u32 v0; @@ -243,7 +249,7 @@ static void ov50_022567F4 (UnkStruct_ov50_02256510 * param0, const UnkStruct_ov5 } } -static void ov50_0225683C (BGL * param0, u32 param1) +static void ov50_0225683C(BGL *param0, u32 param1) { static const u16 v0[12] = { 0x0, 0x4, 0x8, 0x18, 0x1c, 0x20, 0x30, 0x34, 0x38, 0x48, 0x4c, 0x50 @@ -260,11 +266,11 @@ static void ov50_0225683C (BGL * param0, u32 param1) } } -static void ov50_02256894 (BGL * param0, u32 param1, u32 param2) +static void ov50_02256894(BGL *param0, u32 param1, u32 param2) { static const u16 v0[2][10] = { - {0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69}, - {0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81} + { 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69 }, + { 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81 } }; u32 v1, v2, v3, v4; int v5; diff --git a/src/overlay051/ov51_022561C0.c b/src/overlay051/ov51_022561C0.c index 7c6eca89dc..27929e59c9 100644 --- a/src/overlay051/ov51_022561C0.c +++ b/src/overlay051/ov51_022561C0.c @@ -1,47 +1,47 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay051/struct_ov51_0225632C_decl.h" +#include "overlay025/poketch_system.h" +#include "overlay051/ov51_0225632C.h" #include "overlay051/struct_ov51_0225632C_1.h" +#include "overlay051/struct_ov51_0225632C_decl.h" -#include "sys_task.h" #include "heap.h" -#include "overlay051/ov51_0225632C.h" +#include "sys_task.h" +#include "sys_task_manager.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov51_0225632C_1 unk_04; - UnkStruct_ov51_0225632C * unk_08; + UnkStruct_ov51_0225632C *unk_08; PoketchSystem *poketchSys; } UnkStruct_ov51_0225621C; static void NitroStaticInit(void); -static BOOL ov51_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov51_02256254(SysTask * param0, void * param1); -static void ov51_02256288(void * param0); -static BOOL ov51_0225621C(UnkStruct_ov51_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov51_02256240(UnkStruct_ov51_0225621C * param0); -static void ov51_02256290(UnkStruct_ov51_0225621C * param0, u32 param1); -static BOOL ov51_022562A4(UnkStruct_ov51_0225621C * param0); -static BOOL ov51_022562E4(UnkStruct_ov51_0225621C * param0); -static BOOL ov51_022562F8(UnkStruct_ov51_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov51_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov51_02256254(SysTask *param0, void *param1); +static void ov51_02256288(void *param0); +static BOOL ov51_0225621C(UnkStruct_ov51_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov51_02256240(UnkStruct_ov51_0225621C *param0); +static void ov51_02256290(UnkStruct_ov51_0225621C *param0, u32 param1); +static BOOL ov51_022562A4(UnkStruct_ov51_0225621C *param0); +static BOOL ov51_022562E4(UnkStruct_ov51_0225621C *param0); +static BOOL ov51_022562F8(UnkStruct_ov51_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov51_022561D4, ov51_02256288); } -static BOOL ov51_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov51_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov51_0225621C * v0 = (UnkStruct_ov51_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225621C)); + UnkStruct_ov51_0225621C *v0 = (UnkStruct_ov51_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225621C)); if (v0 != NULL) { if (ov51_0225621C(v0, poketchSys, param2, param3)) { @@ -57,7 +57,7 @@ static BOOL ov51_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov51_0225621C (UnkStruct_ov51_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov51_0225621C(UnkStruct_ov51_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { if (ov51_0225632C(&(param0->unk_08), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -71,21 +71,21 @@ static BOOL ov51_0225621C (UnkStruct_ov51_0225621C * param0, PoketchSystem *poke return 0; } -static void ov51_02256240 (UnkStruct_ov51_0225621C * param0) +static void ov51_02256240(UnkStruct_ov51_0225621C *param0) { ov51_0225635C(param0->unk_08); Heap_FreeToHeap(param0); } -static void ov51_02256254 (SysTask * param0, void * param1) +static void ov51_02256254(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov51_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov51_0225621C *) = { ov51_022562A4, ov51_022562E4, ov51_022562F8 }; - UnkStruct_ov51_0225621C * v1 = (UnkStruct_ov51_0225621C *)param1; + UnkStruct_ov51_0225621C *v1 = (UnkStruct_ov51_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -97,12 +97,12 @@ static void ov51_02256254 (SysTask * param0, void * param1) } } -static void ov51_02256288 (void * param0) +static void ov51_02256288(void *param0) { ((UnkStruct_ov51_0225621C *)param0)->unk_02 = 1; } -static void ov51_02256290 (UnkStruct_ov51_0225621C * param0, u32 param1) +static void ov51_02256290(UnkStruct_ov51_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -113,7 +113,7 @@ static void ov51_02256290 (UnkStruct_ov51_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov51_022562A4 (UnkStruct_ov51_0225621C * param0) +static BOOL ov51_022562A4(UnkStruct_ov51_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -131,7 +131,7 @@ static BOOL ov51_022562A4 (UnkStruct_ov51_0225621C * param0) return 0; } -static BOOL ov51_022562E4 (UnkStruct_ov51_0225621C * param0) +static BOOL ov51_022562E4(UnkStruct_ov51_0225621C *param0) { if (param0->unk_02) { ov51_02256290(param0, 2); @@ -140,7 +140,7 @@ static BOOL ov51_022562E4 (UnkStruct_ov51_0225621C * param0) return 0; } -static BOOL ov51_022562F8 (UnkStruct_ov51_0225621C * param0) +static BOOL ov51_022562F8(UnkStruct_ov51_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay051/ov51_0225632C.c b/src/overlay051/ov51_0225632C.c index a9a6b69461..c5f9b60de5 100644 --- a/src/overlay051/ov51_0225632C.c +++ b/src/overlay051/ov51_0225632C.c @@ -1,35 +1,36 @@ +#include "overlay051/ov51_0225632C.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay051/struct_ov51_0225632C_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" #include "overlay051/struct_ov51_0225632C_1.h" +#include "overlay051/struct_ov51_0225632C_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay051/ov51_0225632C.h" struct UnkStruct_ov51_0225632C_t { - const UnkStruct_ov51_0225632C_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov51_0225632C_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; }; -static void ov51_022563A4(UnkStruct_ov25_02255224 * param0); -static void ov51_022563B8(SysTask * param0, void * param1); -static void ov51_02256458(SysTask * param0, void * param1); +static void ov51_022563A4(UnkStruct_ov25_02255224 *param0); +static void ov51_022563B8(SysTask *param0, void *param1); +static void ov51_02256458(SysTask *param0, void *param1); -BOOL ov51_0225632C (UnkStruct_ov51_0225632C ** param0, const UnkStruct_ov51_0225632C_1 * param1, BGL * param2) +BOOL ov51_0225632C(UnkStruct_ov51_0225632C **param0, const UnkStruct_ov51_0225632C_1 *param1, BGL *param2) { - UnkStruct_ov51_0225632C * v0 = (UnkStruct_ov51_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225632C)); + UnkStruct_ov51_0225632C *v0 = (UnkStruct_ov51_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov51_0225632C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); @@ -46,7 +47,7 @@ BOOL ov51_0225632C (UnkStruct_ov51_0225632C ** param0, const UnkStruct_ov51_0225 return 0; } -void ov51_0225635C (UnkStruct_ov51_0225632C * param0) +void ov51_0225635C(UnkStruct_ov51_0225632C *param0) { if (param0 != NULL) { Heap_FreeToHeap(param0); @@ -54,33 +55,33 @@ void ov51_0225635C (UnkStruct_ov51_0225632C * param0) } static const UnkStruct_ov25_0225517C Unk_ov51_0225649C[] = { - {0x0, ov51_022563B8, 0x0}, - {0x1, ov51_02256458, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov51_022563B8, 0x0 }, + { 0x1, ov51_02256458, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov51_02256368 (UnkStruct_ov51_0225632C * param0, u32 param1) +void ov51_02256368(UnkStruct_ov51_0225632C *param0, u32 param1) { ov25_0225517C(Unk_ov51_0225649C, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov51_0225638C (UnkStruct_ov51_0225632C * param0, u32 param1) +BOOL ov51_0225638C(UnkStruct_ov51_0225632C *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov51_02256398 (UnkStruct_ov51_0225632C * param0) +BOOL ov51_02256398(UnkStruct_ov51_0225632C *param0) { return ov25_02255154(param0->unk_08); } -static void ov51_022563A4 (UnkStruct_ov25_02255224 * param0) +static void ov51_022563A4(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov51_0225632C * v0 = ov25_0225523C(param0); + UnkStruct_ov51_0225632C *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov51_022563B8 (SysTask * param0, void * param1) +static void ov51_022563B8(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -98,7 +99,7 @@ static void ov51_022563B8 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov51_0225632C * v2; + UnkStruct_ov51_0225632C *v2; v2 = ov25_0225523C(param1); @@ -116,9 +117,9 @@ static void ov51_022563B8 (SysTask * param0, void * param1) ov51_022563A4(param1); } -static void ov51_02256458 (SysTask * param0, void * param1) +static void ov51_02256458(SysTask *param0, void *param1) { - UnkStruct_ov51_0225632C * v0 = ov25_0225523C(param1); + UnkStruct_ov51_0225632C *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov51_022563A4(param1); diff --git a/src/overlay052/ov52_022561C0.c b/src/overlay052/ov52_022561C0.c index e0de8ca046..1044f9ce21 100644 --- a/src/overlay052/ov52_022561C0.c +++ b/src/overlay052/ov52_022561C0.c @@ -1,30 +1,30 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay052/struct_ov52_02256694_decl.h" #include "field/field_system.h" +#include "overlay025/poketch_system.h" +#include "overlay052/ov52_02256694.h" #include "overlay052/struct_ov52_02256694_1.h" +#include "overlay052/struct_ov52_02256694_decl.h" -#include "sys_task.h" +#include "communication_system.h" #include "heap.h" +#include "map_header.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "touch_screen.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "map_header.h" -#include "overlay052/ov52_02256694.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov52_02256694_1 unk_04; - UnkStruct_ov52_02256694 * unk_14; + UnkStruct_ov52_02256694 *unk_14; PoketchSystem *poketchSys; u32 unk_1C; u8 unk_20; @@ -33,35 +33,35 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov52_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov52_0225621C(UnkStruct_ov52_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov52_0225624C(UnkStruct_ov52_0225621C * param0); -static void ov52_02256260(SysTask * param0, void * param1); -static void ov52_0225629C(void * param0); -static void ov52_022562A4(UnkStruct_ov52_0225621C * param0, u32 param1); -static BOOL ov52_022562B8(UnkStruct_ov52_0225621C * param0); -static BOOL ov52_022562F8(UnkStruct_ov52_0225621C * param0); -static BOOL ov52_02256364(UnkStruct_ov52_0225621C * param0); -static BOOL ov52_02256430(UnkStruct_ov52_0225621C * param0); -static BOOL ov52_02256454(UnkStruct_ov52_0225621C * param0); -static BOOL ov52_022564B8(UnkStruct_ov52_0225621C * param0); -static BOOL ov52_02256508(UnkStruct_ov52_0225621C * param0); -static BOOL ov52_02256554(UnkStruct_ov52_0225621C * param0); -static BOOL ov52_0225659C(UnkStruct_ov52_0225621C * param0); -static void ov52_022565EC(UnkStruct_ov52_0225621C * param0); -static void ov52_0225664C(UnkStruct_ov52_0225621C * param0); -static BOOL ov52_0225666C(UnkStruct_ov52_0225621C * param0); -static void ov52_0225667C(UnkStruct_ov52_0225621C * param0); -static BOOL ov52_02256684(UnkStruct_ov52_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov52_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov52_0225621C(UnkStruct_ov52_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov52_0225624C(UnkStruct_ov52_0225621C *param0); +static void ov52_02256260(SysTask *param0, void *param1); +static void ov52_0225629C(void *param0); +static void ov52_022562A4(UnkStruct_ov52_0225621C *param0, u32 param1); +static BOOL ov52_022562B8(UnkStruct_ov52_0225621C *param0); +static BOOL ov52_022562F8(UnkStruct_ov52_0225621C *param0); +static BOOL ov52_02256364(UnkStruct_ov52_0225621C *param0); +static BOOL ov52_02256430(UnkStruct_ov52_0225621C *param0); +static BOOL ov52_02256454(UnkStruct_ov52_0225621C *param0); +static BOOL ov52_022564B8(UnkStruct_ov52_0225621C *param0); +static BOOL ov52_02256508(UnkStruct_ov52_0225621C *param0); +static BOOL ov52_02256554(UnkStruct_ov52_0225621C *param0); +static BOOL ov52_0225659C(UnkStruct_ov52_0225621C *param0); +static void ov52_022565EC(UnkStruct_ov52_0225621C *param0); +static void ov52_0225664C(UnkStruct_ov52_0225621C *param0); +static BOOL ov52_0225666C(UnkStruct_ov52_0225621C *param0); +static void ov52_0225667C(UnkStruct_ov52_0225621C *param0); +static BOOL ov52_02256684(UnkStruct_ov52_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov52_022561D4, ov52_0225629C); } -static BOOL ov52_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov52_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov52_0225621C * v0 = (UnkStruct_ov52_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_0225621C)); + UnkStruct_ov52_0225621C *v0 = (UnkStruct_ov52_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_0225621C)); if (v0 != NULL) { if (ov52_0225621C(v0, poketchSys, param2, param3)) { @@ -77,7 +77,7 @@ static BOOL ov52_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov52_0225621C (UnkStruct_ov52_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov52_0225621C(UnkStruct_ov52_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { if (ov52_02256694(&(param0->unk_14), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -93,15 +93,15 @@ static BOOL ov52_0225621C (UnkStruct_ov52_0225621C * param0, PoketchSystem *poke return 0; } -static void ov52_0225624C (UnkStruct_ov52_0225621C * param0) +static void ov52_0225624C(UnkStruct_ov52_0225621C *param0) { ov52_022566EC(param0->unk_14); Heap_FreeToHeap(param0); } -static void ov52_02256260 (SysTask * param0, void * param1) +static void ov52_02256260(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov52_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov52_0225621C *) = { ov52_022562B8, ov52_022562F8, ov52_02256364, @@ -110,7 +110,7 @@ static void ov52_02256260 (SysTask * param0, void * param1) ov52_02256508 }; - UnkStruct_ov52_0225621C * v1 = (UnkStruct_ov52_0225621C *)param1; + UnkStruct_ov52_0225621C *v1 = (UnkStruct_ov52_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov52_022565EC(v1); @@ -124,12 +124,12 @@ static void ov52_02256260 (SysTask * param0, void * param1) } } -static void ov52_0225629C (void * param0) +static void ov52_0225629C(void *param0) { ((UnkStruct_ov52_0225621C *)param0)->unk_02 = 1; } -static void ov52_022562A4 (UnkStruct_ov52_0225621C * param0, u32 param1) +static void ov52_022562A4(UnkStruct_ov52_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -140,7 +140,7 @@ static void ov52_022562A4 (UnkStruct_ov52_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov52_022562B8 (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_022562B8(UnkStruct_ov52_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -158,7 +158,7 @@ static BOOL ov52_022562B8 (UnkStruct_ov52_0225621C * param0) return 0; } -static BOOL ov52_022562F8 (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_022562F8(UnkStruct_ov52_0225621C *param0) { if (param0->unk_02) { ov52_022562A4(param0, 5); @@ -169,7 +169,7 @@ static BOOL ov52_022562F8 (UnkStruct_ov52_0225621C * param0) case 0: if (ov52_02256554(param0)) { if (ov52_02256684(param0)) { - FieldSystem * fieldSystem = PoketchSystem_GetFieldSystem(param0->poketchSys); + FieldSystem *fieldSystem = PoketchSystem_GetFieldSystem(param0->poketchSys); ov52_022567A4(param0->unk_14, 3); @@ -188,7 +188,7 @@ static BOOL ov52_022562F8 (UnkStruct_ov52_0225621C * param0) return 0; } -static BOOL ov52_02256364 (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_02256364(UnkStruct_ov52_0225621C *param0) { if (param0->unk_02) { ov52_022562A4(param0, 5); @@ -239,7 +239,7 @@ static BOOL ov52_02256364 (UnkStruct_ov52_0225621C * param0) return 0; } -static BOOL ov52_02256430 (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_02256430(UnkStruct_ov52_0225621C *param0) { if (ov25_0225450C(param0->poketchSys)) { return 1; @@ -252,7 +252,7 @@ static BOOL ov52_02256430 (UnkStruct_ov52_0225621C * param0) return 0; } -static BOOL ov52_02256454 (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_02256454(UnkStruct_ov52_0225621C *param0) { if (param0->unk_02) { ov52_022562A4(param0, 5); @@ -280,7 +280,7 @@ static BOOL ov52_02256454 (UnkStruct_ov52_0225621C * param0) return 0; } -static BOOL ov52_022564B8 (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_022564B8(UnkStruct_ov52_0225621C *param0) { if (param0->unk_02) { ov52_022562A4(param0, 5); @@ -304,7 +304,7 @@ static BOOL ov52_022564B8 (UnkStruct_ov52_0225621C * param0) return 0; } -static BOOL ov52_02256508 (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_02256508(UnkStruct_ov52_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -326,7 +326,7 @@ static BOOL ov52_02256508 (UnkStruct_ov52_0225621C * param0) return 0; } -static BOOL ov52_02256554 (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_02256554(UnkStruct_ov52_0225621C *param0) { if (ov25_0225450C(param0->poketchSys) == 0) { u32 v0, v1; @@ -341,7 +341,7 @@ static BOOL ov52_02256554 (UnkStruct_ov52_0225621C * param0) return 0; } -static BOOL ov52_0225659C (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_0225659C(UnkStruct_ov52_0225621C *param0) { static const u8 v0[] = { 9, 13, 7, 18, 26 @@ -356,13 +356,13 @@ static BOOL ov52_0225659C (UnkStruct_ov52_0225621C * param0) 0, 6, 8, 11, 12, 14, 16, 27, 28, 30, 31, 32 }; static const struct { - const u8 * unk_00; + const u8 *unk_00; u32 unk_04; } v4[] = { - {v0, NELEMS(v0)}, - {v1, NELEMS(v1)}, - {v2, NELEMS(v2)}, - {v3, NELEMS(v3)} + { v0, NELEMS(v0) }, + { v1, NELEMS(v1) }, + { v2, NELEMS(v2) }, + { v3, NELEMS(v3) } }; int v5, v6, v7; BOOL v8 = 0; @@ -381,7 +381,7 @@ static BOOL ov52_0225659C (UnkStruct_ov52_0225621C * param0) return v8; } -static void ov52_022565EC (UnkStruct_ov52_0225621C * param0) +static void ov52_022565EC(UnkStruct_ov52_0225621C *param0) { switch (param0->unk_20) { case 0: @@ -406,7 +406,7 @@ static void ov52_022565EC (UnkStruct_ov52_0225621C * param0) } } -static void ov52_0225664C (UnkStruct_ov52_0225621C * param0) +static void ov52_0225664C(UnkStruct_ov52_0225621C *param0) { if (param0->unk_20 == 0) { sub_02037BC0(PoketchSystem_GetSaveData(param0->poketchSys)); @@ -414,17 +414,17 @@ static void ov52_0225664C (UnkStruct_ov52_0225621C * param0) } } -static BOOL ov52_0225666C (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_0225666C(UnkStruct_ov52_0225621C *param0) { return param0->unk_20 == 2; } -static void ov52_0225667C (UnkStruct_ov52_0225621C * param0) +static void ov52_0225667C(UnkStruct_ov52_0225621C *param0) { param0->unk_21 = 1; } -static BOOL ov52_02256684 (UnkStruct_ov52_0225621C * param0) +static BOOL ov52_02256684(UnkStruct_ov52_0225621C *param0) { return param0->unk_20 == 0; } diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index 690d74765f..63d2c42f0f 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -1,67 +1,66 @@ +#include "overlay052/ov52_02256694.h" + #include #include -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay052/struct_ov52_02256694_decl.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay052/struct_ov52_02256694_1.h" +#include "overlay052/struct_ov52_02256694_decl.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02006E3C.h" -#include "message.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay052/ov52_02256694.h" struct UnkStruct_ov52_02256694_t { - const UnkStruct_ov52_02256694_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov52_02256694_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; Window unk_20; - UnkStruct_ov25_022555E8 * unk_30; - UnkStruct_ov25_022558C4 * unk_34[4]; + UnkStruct_ov25_022555E8 *unk_30; + UnkStruct_ov25_022558C4 *unk_34[4]; UnkStruct_ov25_02255958 unk_44; - MessageLoader * unk_58; - Strbuf* unk_5C; + MessageLoader *unk_58; + Strbuf *unk_5C; }; -static void ov52_0225670C(UnkStruct_ov52_02256694 * param0, const UnkStruct_ov52_02256694_1 * param1); -static void ov52_0225677C(UnkStruct_ov52_02256694 * param0); -static void ov52_022567E0(UnkStruct_ov25_02255224 * param0); -static void ov52_022567F4(SysTask * param0, void * param1); -static void ov52_022568B4(SysTask * param0, void * param1); -static void ov52_022568D8(SysTask * param0, void * param1); -static void ov52_0225691C(SysTask * param0, void * param1); -static void ov52_02256968(SysTask * param0, void * param1); -static void ov52_022569B4(SysTask * param0, void * param1); -static void ov52_02256A00(SysTask * param0, void * param1); -static void ov52_02256A58(SysTask * param0, void * param1); -static void ov52_02256A7C(UnkStruct_ov52_02256694 * param0); -static void ov52_02256B10(UnkStruct_ov52_02256694 * param0); -static void ov52_02256B64(UnkStruct_ov52_02256694 * param0); -static void ov52_02256BDC(UnkStruct_ov52_02256694 * param0); -static void ov52_02256C64(UnkStruct_ov52_02256694 * param0, const UnkStruct_ov52_02256694_1 * param1); - -BOOL ov52_02256694 (UnkStruct_ov52_02256694 ** param0, const UnkStruct_ov52_02256694_1 * param1, BGL * param2) +static void ov52_0225670C(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_02256694_1 *param1); +static void ov52_0225677C(UnkStruct_ov52_02256694 *param0); +static void ov52_022567E0(UnkStruct_ov25_02255224 *param0); +static void ov52_022567F4(SysTask *param0, void *param1); +static void ov52_022568B4(SysTask *param0, void *param1); +static void ov52_022568D8(SysTask *param0, void *param1); +static void ov52_0225691C(SysTask *param0, void *param1); +static void ov52_02256968(SysTask *param0, void *param1); +static void ov52_022569B4(SysTask *param0, void *param1); +static void ov52_02256A00(SysTask *param0, void *param1); +static void ov52_02256A58(SysTask *param0, void *param1); +static void ov52_02256A7C(UnkStruct_ov52_02256694 *param0); +static void ov52_02256B10(UnkStruct_ov52_02256694 *param0); +static void ov52_02256B64(UnkStruct_ov52_02256694 *param0); +static void ov52_02256BDC(UnkStruct_ov52_02256694 *param0); +static void ov52_02256C64(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_02256694_1 *param1); + +BOOL ov52_02256694(UnkStruct_ov52_02256694 **param0, const UnkStruct_ov52_02256694_1 *param1, BGL *param2) { - UnkStruct_ov52_02256694 * v0 = (UnkStruct_ov52_02256694 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_02256694)); + UnkStruct_ov52_02256694 *v0 = (UnkStruct_ov52_02256694 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov52_02256694)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -79,7 +78,7 @@ BOOL ov52_02256694 (UnkStruct_ov52_02256694 ** param0, const UnkStruct_ov52_0225 return 0; } -void ov52_022566EC (UnkStruct_ov52_02256694 * param0) +void ov52_022566EC(UnkStruct_ov52_02256694 *param0) { if (param0 != NULL) { Strbuf_Free(param0->unk_5C); @@ -89,41 +88,41 @@ void ov52_022566EC (UnkStruct_ov52_02256694 * param0) } } -static void ov52_0225670C (UnkStruct_ov52_02256694 * param0, const UnkStruct_ov52_02256694_1 * param1) +static void ov52_0225670C(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_02256694_1 *param1) { static const UnkStruct_ov25_02255810 v0[] = { { - {(112 << FX32_SHIFT), (150 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (150 << FX32_SHIFT) }, 3, 0, 2, 0, - 0 + 0, }, { - {(112 << FX32_SHIFT), (102 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (102 << FX32_SHIFT) }, 1, 0, 2, 0, - 0 + 0, }, { - {(112 << FX32_SHIFT), (102 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (102 << FX32_SHIFT) }, 2, 0, 2, 0, - 0 + 0, }, { - {(112 << FX32_SHIFT), (150 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (150 << FX32_SHIFT) }, 0, 0, 2, 0, - 0 - } + 0, + }, }; int v1; @@ -139,7 +138,7 @@ static void ov52_0225670C (UnkStruct_ov52_02256694 * param0, const UnkStruct_ov5 ov25_02255914(param0->unk_34[3], 1); } -static void ov52_0225677C (UnkStruct_ov52_02256694 * param0) +static void ov52_0225677C(UnkStruct_ov52_02256694 *param0) { int v0; @@ -153,39 +152,39 @@ static void ov52_0225677C (UnkStruct_ov52_02256694 * param0) } static const UnkStruct_ov25_0225517C Unk_ov52_02256DE4[] = { - {0x0, ov52_022567F4, 0x0}, - {0x1, ov52_022568B4, 0x0}, - {0x2, ov52_022568D8, 0x0}, - {0x3, ov52_0225691C, 0x0}, - {0x4, ov52_02256968, 0x0}, - {0x5, ov52_022569B4, 0x0}, - {0x6, ov52_02256A00, 0x0}, - {0x7, ov52_02256A58, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov52_022567F4, 0x0 }, + { 0x1, ov52_022568B4, 0x0 }, + { 0x2, ov52_022568D8, 0x0 }, + { 0x3, ov52_0225691C, 0x0 }, + { 0x4, ov52_02256968, 0x0 }, + { 0x5, ov52_022569B4, 0x0 }, + { 0x6, ov52_02256A00, 0x0 }, + { 0x7, ov52_02256A58, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov52_022567A4 (UnkStruct_ov52_02256694 * param0, u32 param1) +void ov52_022567A4(UnkStruct_ov52_02256694 *param0, u32 param1) { ov25_0225517C(Unk_ov52_02256DE4, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov52_022567C8 (UnkStruct_ov52_02256694 * param0, u32 param1) +BOOL ov52_022567C8(UnkStruct_ov52_02256694 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov52_022567D4 (UnkStruct_ov52_02256694 * param0) +BOOL ov52_022567D4(UnkStruct_ov52_02256694 *param0) { return ov25_02255154(param0->unk_08); } -static void ov52_022567E0 (UnkStruct_ov25_02255224 * param0) +static void ov52_022567E0(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov52_02256694 * v0 = ov25_0225523C(param0); + UnkStruct_ov52_02256694 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov52_022567F4 (SysTask * param0, void * param1) +static void ov52_022567F4(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -203,9 +202,9 @@ static void ov52_022567F4 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov52_02256694 * v2; - void * v3; - NNSG2dPaletteData * v4; + UnkStruct_ov52_02256694 *v2; + void *v3; + NNSG2dPaletteData *v4; u32 v5; v2 = ov25_0225523C(param1); @@ -230,9 +229,9 @@ static void ov52_022567F4 (SysTask * param0, void * param1) ov52_022567E0(param1); } -static void ov52_022568B4 (SysTask * param0, void * param1) +static void ov52_022568B4(SysTask *param0, void *param1) { - UnkStruct_ov52_02256694 * v0 = ov25_0225523C(param1); + UnkStruct_ov52_02256694 *v0 = ov25_0225523C(param1); BGL_DeleteWindow(&v0->unk_20); sub_02019044(v0->unk_04, 6); @@ -240,9 +239,9 @@ static void ov52_022568B4 (SysTask * param0, void * param1) ov52_022567E0(param1); } -static void ov52_022568D8 (SysTask * param0, void * param1) +static void ov52_022568D8(SysTask *param0, void *param1) { - UnkStruct_ov52_02256694 * v0 = ov25_0225523C(param1); + UnkStruct_ov52_02256694 *v0 = ov25_0225523C(param1); ov25_02255914(v0->unk_34[0], 0); ov25_02255914(v0->unk_34[1], 1); @@ -254,9 +253,9 @@ static void ov52_022568D8 (SysTask * param0, void * param1) ov52_022567E0(param1); } -static void ov52_0225691C (SysTask * param0, void * param1) +static void ov52_0225691C(SysTask *param0, void *param1) { - UnkStruct_ov52_02256694 * v0 = ov25_0225523C(param1); + UnkStruct_ov52_02256694 *v0 = ov25_0225523C(param1); ov25_02255914(v0->unk_34[0], 0); ov25_02255914(v0->unk_34[1], 0); @@ -269,9 +268,9 @@ static void ov52_0225691C (SysTask * param0, void * param1) ov52_022567E0(param1); } -static void ov52_02256968 (SysTask * param0, void * param1) +static void ov52_02256968(SysTask *param0, void *param1) { - UnkStruct_ov52_02256694 * v0 = ov25_0225523C(param1); + UnkStruct_ov52_02256694 *v0 = ov25_0225523C(param1); ov25_02255914(v0->unk_34[0], 0); ov25_02255914(v0->unk_34[1], 1); @@ -283,9 +282,9 @@ static void ov52_02256968 (SysTask * param0, void * param1) ov52_022567E0(param1); } -static void ov52_022569B4 (SysTask * param0, void * param1) +static void ov52_022569B4(SysTask *param0, void *param1) { - UnkStruct_ov52_02256694 * v0 = ov25_0225523C(param1); + UnkStruct_ov52_02256694 *v0 = ov25_0225523C(param1); ov25_02255914(v0->unk_34[0], 0); ov25_02255914(v0->unk_34[1], 1); @@ -297,10 +296,10 @@ static void ov52_022569B4 (SysTask * param0, void * param1) ov52_022567E0(param1); } -static void ov52_02256A00 (SysTask * param0, void * param1) +static void ov52_02256A00(SysTask *param0, void *param1) { - UnkStruct_ov52_02256694 * v0 = ov25_0225523C(param1); - const UnkStruct_ov52_02256694_1 * v1 = ov25_02255240(param1); + UnkStruct_ov52_02256694 *v0 = ov25_0225523C(param1); + const UnkStruct_ov52_02256694_1 *v1 = ov25_02255240(param1); ov25_02255914(v0->unk_34[0], 1); ov25_02255914(v0->unk_34[1], 1); @@ -313,16 +312,16 @@ static void ov52_02256A00 (SysTask * param0, void * param1) ov52_022567E0(param1); } -static void ov52_02256A58 (SysTask * param0, void * param1) +static void ov52_02256A58(SysTask *param0, void *param1) { - UnkStruct_ov52_02256694 * v0 = ov25_0225523C(param1); - const UnkStruct_ov52_02256694_1 * v1 = ov25_02255240(param1); + UnkStruct_ov52_02256694 *v0 = ov25_0225523C(param1); + const UnkStruct_ov52_02256694_1 *v1 = ov25_02255240(param1); ov52_02256C64(v0, v1); ov52_022567E0(param1); } -static void ov52_02256A7C (UnkStruct_ov52_02256694 * param0) +static void ov52_02256A7C(UnkStruct_ov52_02256694 *param0) { u32 v0; @@ -346,7 +345,7 @@ static void ov52_02256A7C (UnkStruct_ov52_02256694 * param0) sub_0201ACCC(¶m0->unk_20); } -static void ov52_02256B10 (UnkStruct_ov52_02256694 * param0) +static void ov52_02256B10(UnkStruct_ov52_02256694 *param0) { BGL_FillWindow(¶m0->unk_20, 4); MessageLoader_GetStrbuf(param0->unk_58, 1, param0->unk_5C); @@ -359,7 +358,7 @@ static void ov52_02256B10 (UnkStruct_ov52_02256694 * param0) sub_0201ACCC(¶m0->unk_20); } -static void ov52_02256B64 (UnkStruct_ov52_02256694 * param0) +static void ov52_02256B64(UnkStruct_ov52_02256694 *param0) { u32 v0; @@ -374,11 +373,11 @@ static void ov52_02256B64 (UnkStruct_ov52_02256694 * param0) sub_0201ACCC(¶m0->unk_20); } -static void ov52_02256BDC (UnkStruct_ov52_02256694 * param0) +static void ov52_02256BDC(UnkStruct_ov52_02256694 *param0) { u32 v0; u32 v1; - + BGL_FillWindow(¶m0->unk_20, 4); MessageLoader_GetStrbuf(param0->unk_58, 2, param0->unk_5C); @@ -392,10 +391,13 @@ static void ov52_02256BDC (UnkStruct_ov52_02256694 * param0) sub_0201ACCC(¶m0->unk_20); } -static void ov52_02256C64 (UnkStruct_ov52_02256694 * param0, const UnkStruct_ov52_02256694_1 * param1) +static void ov52_02256C64(UnkStruct_ov52_02256694 *param0, const UnkStruct_ov52_02256694_1 *param1) { static const u8 v0[] = { - 6, 7, 8, 9, + 6, + 7, + 8, + 9, }; u32 v1; int v2; diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c index b896adc948..8ed8a81e3c 100644 --- a/src/overlay053/ov53_022561C0.c +++ b/src/overlay053/ov53_022561C0.c @@ -1,28 +1,28 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" + #include "field/field_system_decl.h" -#include "overlay025/poketch_system.h" +#include "overlay006/ov6_022430C4.h" #include "overlay025/poketch_button.h" -#include "overlay053/struct_ov53_02256420_decl.h" - -#include "touch_screen.h" +#include "overlay025/poketch_system.h" +#include "overlay053/ov53_02256420.h" #include "overlay053/struct_ov53_02256420_1.h" +#include "overlay053/struct_ov53_02256420_decl.h" -#include "sys_task.h" #include "heap.h" -#include "overlay006/ov6_022430C4.h" -#include "overlay053/ov53_02256420.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov53_02256420_1 unk_04; - UnkStruct_ov53_02256420 * unk_2C; + UnkStruct_ov53_02256420 *unk_2C; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u32 unk_38; @@ -31,25 +31,25 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov53_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov53_0225621C(UnkStruct_ov53_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov53_022562B8(UnkStruct_ov53_0225621C * param0); -static void ov53_022562D0(SysTask * param0, void * param1); -static void ov53_0225630C(void * param0); -static void ov53_02256314(u32 param0, u32 param1, u32 param2, void * param3); -static void ov53_0225631C(UnkStruct_ov53_0225621C * param0, u32 param1); -static BOOL ov53_02256330(UnkStruct_ov53_0225621C * param0); -static BOOL ov53_02256370(UnkStruct_ov53_0225621C * param0); -static BOOL ov53_022563EC(UnkStruct_ov53_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov53_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov53_0225621C(UnkStruct_ov53_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov53_022562B8(UnkStruct_ov53_0225621C *param0); +static void ov53_022562D0(SysTask *param0, void *param1); +static void ov53_0225630C(void *param0); +static void ov53_02256314(u32 param0, u32 param1, u32 param2, void *param3); +static void ov53_0225631C(UnkStruct_ov53_0225621C *param0, u32 param1); +static BOOL ov53_02256330(UnkStruct_ov53_0225621C *param0); +static BOOL ov53_02256370(UnkStruct_ov53_0225621C *param0); +static BOOL ov53_022563EC(UnkStruct_ov53_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov53_022561D4, ov53_0225630C); } -static BOOL ov53_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov53_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov53_0225621C * v0 = (UnkStruct_ov53_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_0225621C)); + UnkStruct_ov53_0225621C *v0 = (UnkStruct_ov53_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_0225621C)); if (v0 != NULL) { if (ov53_0225621C(v0, poketchSys, param2, param3)) { @@ -65,29 +65,29 @@ static BOOL ov53_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov53_0225621C(UnkStruct_ov53_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { (80 - (36 / 2)), (80 + (36 / 2)), (112 - (48 / 2)), - (112 + (48 / 2)) + (112 + (48 / 2)), }, { (96 - (36 / 2)), (96 + (36 / 2)), (176 - (48 / 2)), - (176 + (48 / 2)) + (176 + (48 / 2)), }, { (104 - (36 / 2)), (104 + (36 / 2)), (48 - (48 / 2)), - (48 + (48 / 2)) - } + (48 + (48 / 2)), + }, }; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; int v2; fieldSystem = PoketchSystem_GetFieldSystem(poketchSys); @@ -121,7 +121,7 @@ static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, PoketchSystem *poke return 0; } -static void ov53_022562B8 (UnkStruct_ov53_0225621C * param0) +static void ov53_022562B8(UnkStruct_ov53_0225621C *param0) { PoketchButtonManager_Free(param0->buttonManager); ov53_02256454(param0->unk_2C); @@ -129,15 +129,15 @@ static void ov53_022562B8 (UnkStruct_ov53_0225621C * param0) Heap_FreeToHeap(param0); } -static void ov53_022562D0 (SysTask * param0, void * param1) +static void ov53_022562D0(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov53_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov53_0225621C *) = { ov53_02256330, ov53_02256370, ov53_022563EC }; - UnkStruct_ov53_0225621C * v1 = (UnkStruct_ov53_0225621C *)param1; + UnkStruct_ov53_0225621C *v1 = (UnkStruct_ov53_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -151,20 +151,20 @@ static void ov53_022562D0 (SysTask * param0, void * param1) } } -static void ov53_0225630C (void * param0) +static void ov53_0225630C(void *param0) { ((UnkStruct_ov53_0225621C *)param0)->unk_02 = 1; } -static void ov53_02256314 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov53_02256314(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov53_0225621C * v0 = (UnkStruct_ov53_0225621C *)param3; + UnkStruct_ov53_0225621C *v0 = (UnkStruct_ov53_0225621C *)param3; v0->unk_3C = param0; v0->unk_38 = param1; } -static void ov53_0225631C (UnkStruct_ov53_0225621C * param0, u32 param1) +static void ov53_0225631C(UnkStruct_ov53_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -175,7 +175,7 @@ static void ov53_0225631C (UnkStruct_ov53_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov53_02256330 (UnkStruct_ov53_0225621C * param0) +static BOOL ov53_02256330(UnkStruct_ov53_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -193,7 +193,7 @@ static BOOL ov53_02256330 (UnkStruct_ov53_0225621C * param0) return 0; } -static BOOL ov53_02256370 (UnkStruct_ov53_0225621C * param0) +static BOOL ov53_02256370(UnkStruct_ov53_0225621C *param0) { if (param0->unk_02) { ov53_0225631C(param0, 2); @@ -201,7 +201,7 @@ static BOOL ov53_02256370 (UnkStruct_ov53_0225621C * param0) } { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; int v1; fieldSystem = PoketchSystem_GetFieldSystem(param0->poketchSys); @@ -238,7 +238,7 @@ static BOOL ov53_02256370 (UnkStruct_ov53_0225621C * param0) return 0; } -static BOOL ov53_022563EC (UnkStruct_ov53_0225621C * param0) +static BOOL ov53_022563EC(UnkStruct_ov53_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay053/ov53_02256420.c b/src/overlay053/ov53_02256420.c index 066c4b092e..effab8a425 100644 --- a/src/overlay053/ov53_02256420.c +++ b/src/overlay053/ov53_02256420.c @@ -1,58 +1,59 @@ +#include "overlay053/ov53_02256420.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay053/struct_ov53_02256420_decl.h" +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" +#include "overlay025/poketch_system.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay053/struct_ov53_02256420_1.h" +#include "overlay053/struct_ov53_02256420_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "pokemon_icon.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "pokemon_icon.h" -#include "overlay025/poketch_system.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay053/ov53_02256420.h" struct UnkStruct_ov53_02256420_t { - const UnkStruct_ov53_02256420_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov53_02256420_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24[16]; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24[16]; UnkStruct_ov25_02255958 unk_64; UnkStruct_ov25_02255958 unk_78; u32 unk_8C[4]; - UnkStruct_ov25_022558C4 * unk_9C; + UnkStruct_ov25_022558C4 *unk_9C; fx32 unk_A0; fx32 unk_A4; fx32 unk_A8; u32 unk_AC; }; -static void ov53_0225649C(UnkStruct_ov25_02255224 * param0); -static void ov53_022564B0(SysTask * param0, void * param1); -static void ov53_02256548(SysTask * param0, void * param1); -static void ov53_02256568(SysTask * param0, void * param1); -static void ov53_022565E0(SysTask * param0, void * param1); -static void ov53_022566AC(UnkStruct_ov53_02256420 * param0, const UnkStruct_ov53_02256420_1 * param1); -static void ov53_02256840(UnkStruct_ov53_02256420 * param0); -static void ov53_02256874(UnkStruct_ov25_022558C4 ** param0, u32 param1); +static void ov53_0225649C(UnkStruct_ov25_02255224 *param0); +static void ov53_022564B0(SysTask *param0, void *param1); +static void ov53_02256548(SysTask *param0, void *param1); +static void ov53_02256568(SysTask *param0, void *param1); +static void ov53_022565E0(SysTask *param0, void *param1); +static void ov53_022566AC(UnkStruct_ov53_02256420 *param0, const UnkStruct_ov53_02256420_1 *param1); +static void ov53_02256840(UnkStruct_ov53_02256420 *param0); +static void ov53_02256874(UnkStruct_ov25_022558C4 **param0, u32 param1); -BOOL ov53_02256420 (UnkStruct_ov53_02256420 ** param0, const UnkStruct_ov53_02256420_1 * param1, BGL * param2) +BOOL ov53_02256420(UnkStruct_ov53_02256420 **param0, const UnkStruct_ov53_02256420_1 *param1, BGL *param2) { - UnkStruct_ov53_02256420 * v0 = (UnkStruct_ov53_02256420 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_02256420)); + UnkStruct_ov53_02256420 *v0 = (UnkStruct_ov53_02256420 *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov53_02256420)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -67,7 +68,7 @@ BOOL ov53_02256420 (UnkStruct_ov53_02256420 ** param0, const UnkStruct_ov53_0225 return 0; } -void ov53_02256454 (UnkStruct_ov53_02256420 * param0) +void ov53_02256454(UnkStruct_ov53_02256420 *param0) { if (param0 != NULL) { Heap_FreeToHeap(param0); @@ -75,35 +76,35 @@ void ov53_02256454 (UnkStruct_ov53_02256420 * param0) } static const UnkStruct_ov25_0225517C Unk_ov53_02256914[] = { - {0x0, ov53_022564B0, 0x0}, - {0x1, ov53_02256548, 0x0}, - {0x2, ov53_02256568, 0x0}, - {0x3, ov53_022565E0, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov53_022564B0, 0x0 }, + { 0x1, ov53_02256548, 0x0 }, + { 0x2, ov53_02256568, 0x0 }, + { 0x3, ov53_022565E0, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov53_02256460 (UnkStruct_ov53_02256420 * param0, u32 param1) +void ov53_02256460(UnkStruct_ov53_02256420 *param0, u32 param1) { ov25_0225517C(Unk_ov53_02256914, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov53_02256484 (UnkStruct_ov53_02256420 * param0, u32 param1) +BOOL ov53_02256484(UnkStruct_ov53_02256420 *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov53_02256490 (UnkStruct_ov53_02256420 * param0) +BOOL ov53_02256490(UnkStruct_ov53_02256420 *param0) { return ov25_02255154(param0->unk_08); } -static void ov53_0225649C (UnkStruct_ov25_02255224 * param0) +static void ov53_0225649C(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov53_02256420 * v0 = ov25_0225523C(param0); + UnkStruct_ov53_02256420 *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov53_022564B0 (SysTask * param0, void * param1) +static void ov53_022564B0(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -121,8 +122,8 @@ static void ov53_022564B0 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov53_02256420 * v2; - const UnkStruct_ov53_02256420_1 * v3; + UnkStruct_ov53_02256420 *v2; + const UnkStruct_ov53_02256420_1 *v3; v2 = ov25_0225523C(param1); v3 = ov25_02255240(param1); @@ -139,19 +140,19 @@ static void ov53_022564B0 (SysTask * param0, void * param1) ov53_0225649C(param1); } -static void ov53_02256548 (SysTask * param0, void * param1) +static void ov53_02256548(SysTask *param0, void *param1) { - UnkStruct_ov53_02256420 * v0 = ov25_0225523C(param1); + UnkStruct_ov53_02256420 *v0 = ov25_0225523C(param1); ov53_02256840(v0); sub_02019044(v0->unk_04, 6); ov53_0225649C(param1); } -static void ov53_02256568 (SysTask * param0, void * param1) +static void ov53_02256568(SysTask *param0, void *param1) { - UnkStruct_ov53_02256420 * v0 = ov25_0225523C(param1); - const UnkStruct_ov53_02256420_1 * v1 = ov25_02255240(param1); + UnkStruct_ov53_02256420 *v0 = ov25_0225523C(param1); + const UnkStruct_ov53_02256420_1 *v1 = ov25_02255240(param1); if (v1->unk_00) { u32 v2 = PokeIconSpriteIndex(v1->unk_00, 0, 0); @@ -172,10 +173,10 @@ static void ov53_02256568 (SysTask * param0, void * param1) ov53_0225649C(param1); } -static void ov53_022565E0 (SysTask * param0, void * param1) +static void ov53_022565E0(SysTask *param0, void *param1) { - UnkStruct_ov53_02256420 * v0; - const UnkStruct_ov53_02256420_1 * v1; + UnkStruct_ov53_02256420 *v0; + const UnkStruct_ov53_02256420_1 *v1; int v2; v0 = ov25_0225523C(param1); @@ -183,8 +184,7 @@ static void ov53_022565E0 (SysTask * param0, void * param1) v2 = ov25_02255248(param1); switch (v2) { - case 0: - { + case 0: { v0->unk_9C = v0->unk_24[1 + v1->unk_24]; ov25_02255908(v0->unk_9C, &(v0->unk_A4), &(v0->unk_A0)); } @@ -193,8 +193,7 @@ static void ov53_022565E0 (SysTask * param0, void * param1) ov25_022558C4(v0->unk_9C, 6); ov25_0225524C(param1); v2++; - default: - { + default: { int v3; fx32 v4; @@ -212,136 +211,136 @@ static void ov53_022565E0 (SysTask * param0, void * param1) } } -static void ov53_022566AC (UnkStruct_ov53_02256420 * param0, const UnkStruct_ov53_02256420_1 * param1) +static void ov53_022566AC(UnkStruct_ov53_02256420 *param0, const UnkStruct_ov53_02256420_1 *param1) { static const UnkStruct_ov25_02255810 v0[] = { { - {(96 << FX32_SHIFT), (32 << FX32_SHIFT)}, + { (96 << FX32_SHIFT), (32 << FX32_SHIFT) }, 4, 0, 2, 10, - 1 + 1, }, { - {(112 << FX32_SHIFT), (80 << FX32_SHIFT)}, + { (112 << FX32_SHIFT), (80 << FX32_SHIFT) }, 4, 0, 2, 0, - 1 + 1, }, { - {(176 << FX32_SHIFT), (96 << FX32_SHIFT)}, + { (176 << FX32_SHIFT), (96 << FX32_SHIFT) }, 4, 0, 2, 1, - 1 + 1, }, { - {(48 << FX32_SHIFT), (104 << FX32_SHIFT)}, + { (48 << FX32_SHIFT), (104 << FX32_SHIFT) }, 4, 0, 2, 2, - 1 + 1, }, { - {(((144 + 8 * 0)) << FX32_SHIFT), (40 << FX32_SHIFT)}, + { ((144 + 8 * 0) << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((144 + 8 * 1)) << FX32_SHIFT), (40 << FX32_SHIFT)}, + { ((144 + 8 * 1) << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((144 + 8 * 2)) << FX32_SHIFT), (40 << FX32_SHIFT)}, + { ((144 + 8 * 2) << FX32_SHIFT), (40 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((100 + 8 * 0)) << FX32_SHIFT), (144 << FX32_SHIFT)}, + { ((100 + 8 * 0) << FX32_SHIFT), (144 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((100 + 8 * 1)) << FX32_SHIFT), (144 << FX32_SHIFT)}, + { ((100 + 8 * 1) << FX32_SHIFT), (144 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((100 + 8 * 2)) << FX32_SHIFT), (144 << FX32_SHIFT)}, + { ((100 + 8 * 2) << FX32_SHIFT), (144 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((164 + 8 * 0)) << FX32_SHIFT), (160 << FX32_SHIFT)}, + { ((164 + 8 * 0) << FX32_SHIFT), (160 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((164 + 8 * 1)) << FX32_SHIFT), (160 << FX32_SHIFT)}, + { ((164 + 8 * 1) << FX32_SHIFT), (160 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((164 + 8 * 2)) << FX32_SHIFT), (160 << FX32_SHIFT)}, + { ((164 + 8 * 2) << FX32_SHIFT), (160 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((36 + 8 * 0)) << FX32_SHIFT), (168 << FX32_SHIFT)}, + { ((36 + 8 * 0) << FX32_SHIFT), (168 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((36 + 8 * 1)) << FX32_SHIFT), (168 << FX32_SHIFT)}, + { ((36 + 8 * 1) << FX32_SHIFT), (168 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, { - {(((36 + 8 * 2)) << FX32_SHIFT), (168 << FX32_SHIFT)}, + { ((36 + 8 * 2) << FX32_SHIFT), (168 << FX32_SHIFT) }, 0, 0, 2, 3, - 0 + 0, }, }; u32 v1; @@ -395,7 +394,7 @@ static void ov53_022566AC (UnkStruct_ov53_02256420 * param0, const UnkStruct_ov5 } } -static void ov53_02256840 (UnkStruct_ov53_02256420 * param0) +static void ov53_02256840(UnkStruct_ov53_02256420 *param0) { int v0; @@ -410,7 +409,7 @@ static void ov53_02256840 (UnkStruct_ov53_02256420 * param0) ov25_022559B0(¶m0->unk_64); } -static void ov53_02256874 (UnkStruct_ov25_022558C4 ** param0, u32 param1) +static void ov53_02256874(UnkStruct_ov25_022558C4 **param0, u32 param1) { int v0, v1, v2; BOOL v3 = 0; diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index 85bdc4a923..6c01f01c3a 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/src/overlay054/ov54_022561C0.c @@ -1,27 +1,27 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay025/poketch_button.h" -#include "overlay054/struct_ov54_0225642C_decl.h" -#include "touch_screen.h" +#include "overlay025/poketch_button.h" +#include "overlay025/poketch_system.h" +#include "overlay054/ov54_0225642C.h" #include "overlay054/struct_ov54_0225642C_1.h" +#include "overlay054/struct_ov54_0225642C_decl.h" -#include "sys_task.h" #include "heap.h" #include "poketch_data.h" -#include "overlay054/ov54_0225642C.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov54_0225642C_1 unk_04; - UnkStruct_ov54_0225642C * unk_98; + UnkStruct_ov54_0225642C *unk_98; PoketchSystem *poketchSys; PoketchButtonManager *buttonManager; u32 unk_A4; @@ -30,25 +30,25 @@ typedef struct { static void NitroStaticInit(void); -static BOOL ov54_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static BOOL ov54_0225621C(UnkStruct_ov54_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov54_022562D4(UnkStruct_ov54_0225621C * param0); -static void ov54_022562F4(SysTask * param0, void * param1); -static void ov54_02256338(void * param0); -static void ov54_02256340(u32 param0, u32 param1, u32 param2, void * param3); -static void ov54_0225634C(UnkStruct_ov54_0225621C * param0, u32 param1); -static BOOL ov54_02256360(UnkStruct_ov54_0225621C * param0); -static BOOL ov54_022563AC(UnkStruct_ov54_0225621C * param0); -static BOOL ov54_022563F4(UnkStruct_ov54_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov54_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static BOOL ov54_0225621C(UnkStruct_ov54_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov54_022562D4(UnkStruct_ov54_0225621C *param0); +static void ov54_022562F4(SysTask *param0, void *param1); +static void ov54_02256338(void *param0); +static void ov54_02256340(u32 param0, u32 param1, u32 param2, void *param3); +static void ov54_0225634C(UnkStruct_ov54_0225621C *param0, u32 param1); +static BOOL ov54_02256360(UnkStruct_ov54_0225621C *param0); +static BOOL ov54_022563AC(UnkStruct_ov54_0225621C *param0); +static BOOL ov54_022563F4(UnkStruct_ov54_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov54_022561D4, ov54_02256338); } -static BOOL ov54_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov54_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov54_0225621C * v0 = (UnkStruct_ov54_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225621C)); + UnkStruct_ov54_0225621C *v0 = (UnkStruct_ov54_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225621C)); if (v0 != NULL) { if (ov54_0225621C(v0, poketchSys, param2, param3)) { @@ -64,81 +64,81 @@ static BOOL ov54_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov54_0225621C(UnkStruct_ov54_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { static const TouchScreenHitTable v0[] = { { ((48 + 48 * 2) - (36 / 2)), ((48 + 48 * 2) + (36 / 2)), ((48 + 40 * 3) - (48 / 2)), - ((48 + 40 * 3) + (48 / 2)) + ((48 + 40 * 3) + (48 / 2)), }, { ((48 + 48 * 2) - (36 / 2)), ((48 + 48 * 2) + (36 / 2)), ((48 + 40 * 2) - (48 / 2)), - ((48 + 40 * 2) + (48 / 2)) + ((48 + 40 * 2) + (48 / 2)), }, { ((48 + 48 * 2) - (36 / 2)), ((48 + 48 * 2) + (36 / 2)), ((48 + 40 * 1) - (48 / 2)), - ((48 + 40 * 1) + (48 / 2)) + ((48 + 40 * 1) + (48 / 2)), }, { ((48 + 48 * 2) - (36 / 2)), ((48 + 48 * 2) + (36 / 2)), ((48 + 40 * 0) - (48 / 2)), - ((48 + 40 * 0) + (48 / 2)) + ((48 + 40 * 0) + (48 / 2)), }, { ((48 + 48 * 1) - (36 / 2)), ((48 + 48 * 1) + (36 / 2)), ((48 + 40 * 3) - (48 / 2)), - ((48 + 40 * 3) + (48 / 2)) + ((48 + 40 * 3) + (48 / 2)), }, { ((48 + 48 * 1) - (36 / 2)), ((48 + 48 * 1) + (36 / 2)), ((48 + 40 * 2) - (48 / 2)), - ((48 + 40 * 2) + (48 / 2)) + ((48 + 40 * 2) + (48 / 2)), }, { ((48 + 48 * 1) - (36 / 2)), ((48 + 48 * 1) + (36 / 2)), ((48 + 40 * 1) - (48 / 2)), - ((48 + 40 * 1) + (48 / 2)) + ((48 + 40 * 1) + (48 / 2)), }, { ((48 + 48 * 1) - (36 / 2)), ((48 + 48 * 1) + (36 / 2)), ((48 + 40 * 0) - (48 / 2)), - ((48 + 40 * 0) + (48 / 2)) + ((48 + 40 * 0) + (48 / 2)), }, { ((48 + 48 * 0) - (36 / 2)), ((48 + 48 * 0) + (36 / 2)), ((48 + 40 * 3) - (48 / 2)), - ((48 + 40 * 3) + (48 / 2)) + ((48 + 40 * 3) + (48 / 2)), }, { ((48 + 48 * 0) - (36 / 2)), ((48 + 48 * 0) + (36 / 2)), ((48 + 40 * 2) - (48 / 2)), - ((48 + 40 * 2) + (48 / 2)) + ((48 + 40 * 2) + (48 / 2)), }, { ((48 + 48 * 0) - (36 / 2)), ((48 + 48 * 0) + (36 / 2)), ((48 + 40 * 1) - (48 / 2)), - ((48 + 40 * 1) + (48 / 2)) + ((48 + 40 * 1) + (48 / 2)), }, { ((48 + 48 * 0) - (36 / 2)), ((48 + 48 * 0) + (36 / 2)), ((48 + 40 * 0) - (48 / 2)), - ((48 + 40 * 0) + (48 / 2)) - } + ((48 + 40 * 0) + (48 / 2)), + }, }; PoketchData *poketchData; int v2; @@ -166,7 +166,7 @@ static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem *poke return 0; } -static void ov54_022562D4 (UnkStruct_ov54_0225621C * param0) +static void ov54_022562D4(UnkStruct_ov54_0225621C *param0) { PoketchButtonManager_Free(param0->buttonManager); ov54_02256460(param0->unk_98); @@ -174,15 +174,15 @@ static void ov54_022562D4 (UnkStruct_ov54_0225621C * param0) Heap_FreeToHeap(param0); } -static void ov54_022562F4 (SysTask * param0, void * param1) +static void ov54_022562F4(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov54_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov54_0225621C *) = { ov54_02256360, ov54_022563AC, ov54_022563F4 }; - UnkStruct_ov54_0225621C * v1 = (UnkStruct_ov54_0225621C *)param1; + UnkStruct_ov54_0225621C *v1 = (UnkStruct_ov54_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { ov25_02254518(v1->poketchSys, v1->buttonManager); @@ -196,20 +196,20 @@ static void ov54_022562F4 (SysTask * param0, void * param1) } } -static void ov54_02256338 (void * param0) +static void ov54_02256338(void *param0) { ((UnkStruct_ov54_0225621C *)param0)->unk_02 = 1; } -static void ov54_02256340 (u32 param0, u32 param1, u32 param2, void * param3) +static void ov54_02256340(u32 param0, u32 param1, u32 param2, void *param3) { - UnkStruct_ov54_0225621C * v0 = (UnkStruct_ov54_0225621C *)param3; + UnkStruct_ov54_0225621C *v0 = (UnkStruct_ov54_0225621C *)param3; v0->unk_A8 = param0; v0->unk_A4 = param1; } -static void ov54_0225634C (UnkStruct_ov54_0225621C * param0, u32 param1) +static void ov54_0225634C(UnkStruct_ov54_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -220,7 +220,7 @@ static void ov54_0225634C (UnkStruct_ov54_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov54_02256360 (UnkStruct_ov54_0225621C * param0) +static BOOL ov54_02256360(UnkStruct_ov54_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -238,7 +238,7 @@ static BOOL ov54_02256360 (UnkStruct_ov54_0225621C * param0) return 0; } -static BOOL ov54_022563AC (UnkStruct_ov54_0225621C * param0) +static BOOL ov54_022563AC(UnkStruct_ov54_0225621C *param0) { if (param0->unk_02) { ov54_0225634C(param0, 2); @@ -258,7 +258,7 @@ static BOOL ov54_022563AC (UnkStruct_ov54_0225621C * param0) return 0; } -static BOOL ov54_022563F4 (UnkStruct_ov54_0225621C * param0) +static BOOL ov54_022563F4(UnkStruct_ov54_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c index 65264098d5..7d0b30781f 100644 --- a/src/overlay054/ov54_0225642C.c +++ b/src/overlay054/ov54_0225642C.c @@ -1,52 +1,52 @@ +#include "overlay054/ov54_0225642C.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay025/struct_ov25_022555E8_decl.h" -#include "overlay025/struct_ov25_022558C4_decl.h" -#include "overlay054/struct_ov54_0225642C_decl.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay025/ov25_02254560.h" +#include "overlay025/ov25_02255090.h" +#include "overlay025/ov25_02255540.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" +#include "overlay025/struct_ov25_022555E8_decl.h" #include "overlay025/struct_ov25_02255810.h" +#include "overlay025/struct_ov25_022558C4_decl.h" #include "overlay025/struct_ov25_02255958.h" #include "overlay054/struct_ov54_0225642C_1.h" +#include "overlay054/struct_ov54_0225642C_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02002B7C.h" -#include "message.h" #include "heap.h" +#include "message.h" +#include "pokemon_icon.h" +#include "strbuf.h" +#include "sys_task_manager.h" +#include "unk_02002B7C.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "pokemon_icon.h" -#include "overlay025/ov25_02254560.h" -#include "overlay025/ov25_02255090.h" -#include "overlay025/ov25_02255540.h" -#include "overlay054/ov54_0225642C.h" struct UnkStruct_ov54_0225642C_t { - const UnkStruct_ov54_0225642C_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov54_0225642C_1 *unk_00; + BGL *unk_04; u32 unk_08[6]; - UnkStruct_ov25_022555E8 * unk_20; - UnkStruct_ov25_022558C4 * unk_24[12]; + UnkStruct_ov25_022555E8 *unk_20; + UnkStruct_ov25_022558C4 *unk_24[12]; UnkStruct_ov25_02255958 unk_54; u32 unk_68[12]; }; -static void ov54_022564A8(UnkStruct_ov25_02255224 * param0); -static void ov54_022564BC(SysTask * param0, void * param1); -static void ov54_022565CC(SysTask * param0, void * param1); -static void ov54_022565EC(UnkStruct_ov54_0225642C * param0, const UnkStruct_ov54_0225642C_1 * param1); -static void ov54_022566A8(UnkStruct_ov54_0225642C * param0); +static void ov54_022564A8(UnkStruct_ov25_02255224 *param0); +static void ov54_022564BC(SysTask *param0, void *param1); +static void ov54_022565CC(SysTask *param0, void *param1); +static void ov54_022565EC(UnkStruct_ov54_0225642C *param0, const UnkStruct_ov54_0225642C_1 *param1); +static void ov54_022566A8(UnkStruct_ov54_0225642C *param0); -BOOL ov54_0225642C (UnkStruct_ov54_0225642C ** param0, const UnkStruct_ov54_0225642C_1 * param1, BGL * param2) +BOOL ov54_0225642C(UnkStruct_ov54_0225642C **param0, const UnkStruct_ov54_0225642C_1 *param1, BGL *param2) { - UnkStruct_ov54_0225642C * v0 = (UnkStruct_ov54_0225642C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225642C)); + UnkStruct_ov54_0225642C *v0 = (UnkStruct_ov54_0225642C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov54_0225642C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 4); @@ -61,7 +61,7 @@ BOOL ov54_0225642C (UnkStruct_ov54_0225642C ** param0, const UnkStruct_ov54_0225 return 0; } -void ov54_02256460 (UnkStruct_ov54_0225642C * param0) +void ov54_02256460(UnkStruct_ov54_0225642C *param0) { if (param0 != NULL) { Heap_FreeToHeap(param0); @@ -69,33 +69,33 @@ void ov54_02256460 (UnkStruct_ov54_0225642C * param0) } static const UnkStruct_ov25_0225517C Unk_ov54_0225672C[] = { - {0x0, ov54_022564BC, 0x0}, - {0x1, ov54_022565CC, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov54_022564BC, 0x0 }, + { 0x1, ov54_022565CC, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov54_0225646C (UnkStruct_ov54_0225642C * param0, u32 param1) +void ov54_0225646C(UnkStruct_ov54_0225642C *param0, u32 param1) { ov25_0225517C(Unk_ov54_0225672C, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov54_02256490 (UnkStruct_ov54_0225642C * param0, u32 param1) +BOOL ov54_02256490(UnkStruct_ov54_0225642C *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov54_0225649C (UnkStruct_ov54_0225642C * param0) +BOOL ov54_0225649C(UnkStruct_ov54_0225642C *param0) { return ov25_02255154(param0->unk_08); } -static void ov54_022564A8 (UnkStruct_ov25_02255224 * param0) +static void ov54_022564A8(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov54_0225642C * v0 = ov25_0225523C(param0); + UnkStruct_ov54_0225642C *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov54_022564BC (SysTask * param0, void * param1) +static void ov54_022564BC(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -113,8 +113,8 @@ static void ov54_022564BC (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov54_0225642C * v2; - const UnkStruct_ov54_0225642C_1 * v3; + UnkStruct_ov54_0225642C *v2; + const UnkStruct_ov54_0225642C_1 *v3; Window v4; v2 = ov25_0225523C(param1); @@ -131,7 +131,7 @@ static void ov54_022564BC (SysTask * param0, void * param1) sub_0201A9F4(&v4); { - Strbuf* v5 = MessageBank_GetNewStrbufFromNARC(26, 458, 0, 8); + Strbuf *v5 = MessageBank_GetNewStrbufFromNARC(26, 458, 0, 8); if (v5) { sub_0201D78C(&v4, 0, v5, (192 - sub_02002D7C(0, v5, 0)) / 2, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((8 & 0xff) << 8) | ((4 & 0xff) << 0)), NULL); @@ -150,61 +150,114 @@ static void ov54_022564BC (SysTask * param0, void * param1) ov54_022564A8(param1); } -static void ov54_022565CC (SysTask * param0, void * param1) +static void ov54_022565CC(SysTask *param0, void *param1) { - UnkStruct_ov54_0225642C * v0 = ov25_0225523C(param1); + UnkStruct_ov54_0225642C *v0 = ov25_0225523C(param1); ov54_022566A8(v0); sub_02019044(v0->unk_04, 6); ov54_022564A8(param1); } -static void ov54_022565EC (UnkStruct_ov54_0225642C * param0, const UnkStruct_ov54_0225642C_1 * param1) +static void ov54_022565EC(UnkStruct_ov54_0225642C *param0, const UnkStruct_ov54_0225642C_1 *param1) { static const UnkStruct_ov25_02255810 v0[] = { { - {(((48 + 40 * 0)) << FX32_SHIFT), (((48 + 48 * 0)) << FX32_SHIFT)}, + { ((48 + 40 * 0) << FX32_SHIFT), ((48 + 48 * 0) << FX32_SHIFT) }, 4, 0, 2, 12, - 1 + 1, }, { - {(((48 + 40 * 1)) << FX32_SHIFT), (((48 + 48 * 0)) << FX32_SHIFT)}, + { ((48 + 40 * 1) << FX32_SHIFT), ((48 + 48 * 0) << FX32_SHIFT) }, 4, 0, 2, 11, - 1 + 1, }, { - {(((48 + 40 * 2)) << FX32_SHIFT), (((48 + 48 * 0)) << FX32_SHIFT)}, + { ((48 + 40 * 2) << FX32_SHIFT), ((48 + 48 * 0) << FX32_SHIFT) }, 4, 0, 2, 10, - 1 + 1, }, { - {(((48 + 40 * 3)) << FX32_SHIFT), (((48 + 48 * 0)) << FX32_SHIFT)}, + { ((48 + 40 * 3) << FX32_SHIFT), ((48 + 48 * 0) << FX32_SHIFT) }, 4, 0, 2, 9, - 1 + 1, }, { - {(((48 + 40 * 0)) << FX32_SHIFT), (((48 + 48 * 1)) << FX32_SHIFT)}, + { ((48 + 40 * 0) << FX32_SHIFT), ((48 + 48 * 1) << FX32_SHIFT) }, 4, 0, 2, 8, - 1 + 1, + }, + { + { ((48 + 40 * 1) << FX32_SHIFT), ((48 + 48 * 1) << FX32_SHIFT) }, + 4, + 0, + 2, + 7, + 1, }, { - {(((48 + 40 * 1)) << FX32_SHIFT), (((48 + 48 * 1)) << FX32_SHIFT)}, 4, 0, 2, 7, 1 - }, {{(((48 + 40 * 2)) << FX32_SHIFT), (((48 + 48 * 1)) << FX32_SHIFT)}, 4, 0, 2, 6, 1}, {{(((48 + 40 * 3)) << FX32_SHIFT), (((48 + 48 * 1)) << FX32_SHIFT)}, 4, 0, 2, 5, 1}, {{(((48 + 40 * 0)) << FX32_SHIFT), (((48 + 48 * 2)) << FX32_SHIFT)}, 4, 0, 2, 4, 1}, {{(((48 + 40 * 1)) << FX32_SHIFT), (((48 + 48 * 2)) << FX32_SHIFT)}, 4, 0, 2, 3, 1}, {{(((48 + 40 * 2)) << FX32_SHIFT), (((48 + 48 * 2)) << FX32_SHIFT)}, 4, 0, 2, 2, 1}, {{(((48 + 40 * 3)) << FX32_SHIFT), (((48 + 48 * 2)) << FX32_SHIFT)}, 4, 0, 2, 1, 1}, + { ((48 + 40 * 2) << FX32_SHIFT), ((48 + 48 * 1) << FX32_SHIFT) }, + 4, + 0, + 2, + 6, + 1, + }, + { + { ((48 + 40 * 3) << FX32_SHIFT), ((48 + 48 * 1) << FX32_SHIFT) }, + 4, + 0, + 2, + 5, + 1, + }, + { + { ((48 + 40 * 0) << FX32_SHIFT), ((48 + 48 * 2) << FX32_SHIFT) }, + 4, + 0, + 2, + 4, + 1, + }, + { + { ((48 + 40 * 1) << FX32_SHIFT), ((48 + 48 * 2) << FX32_SHIFT) }, + 4, + 0, + 2, + 3, + 1, + }, + { + { ((48 + 40 * 2) << FX32_SHIFT), ((48 + 48 * 2) << FX32_SHIFT) }, + 4, + 0, + 2, + 2, + 1, + }, + { + { ((48 + 40 * 3) << FX32_SHIFT), ((48 + 48 * 2) << FX32_SHIFT) }, + 4, + 0, + 2, + 1, + 1, + }, }; int v1; @@ -219,14 +272,14 @@ static void ov54_022565EC (UnkStruct_ov54_0225642C * param0, const UnkStruct_ov5 ov25_02255938(param0->unk_24[v1], PokeIconPaletteIndex(param1->unk_00[v1].unk_00, param1->unk_00[v1].unk_08, 0)); } - for ( ; v1 < 12; v1++) { + for (; v1 < 12; v1++) { param0->unk_24[v1] = NULL; } ov25_022553A0(0, param0->unk_68, param1->unk_90, 0); } -static void ov54_022566A8 (UnkStruct_ov54_0225642C * param0) +static void ov54_022566A8(UnkStruct_ov54_0225642C *param0) { int v0; diff --git a/src/overlay055/ov55_022561C0.c b/src/overlay055/ov55_022561C0.c index 98a47d275c..0deb1a7900 100644 --- a/src/overlay055/ov55_022561C0.c +++ b/src/overlay055/ov55_022561C0.c @@ -1,47 +1,47 @@ #include -#include #include +#include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/poketch_system.h" -#include "overlay055/struct_ov55_0225632C_decl.h" +#include "overlay025/poketch_system.h" +#include "overlay055/ov55_0225632C.h" #include "overlay055/struct_ov55_0225632C_1.h" +#include "overlay055/struct_ov55_0225632C_decl.h" -#include "sys_task.h" #include "heap.h" -#include "overlay055/ov55_0225632C.h" +#include "sys_task.h" +#include "sys_task_manager.h" typedef struct { u8 unk_00; u8 unk_01; u8 unk_02; UnkStruct_ov55_0225632C_1 unk_04; - UnkStruct_ov55_0225632C * unk_08; + UnkStruct_ov55_0225632C *unk_08; PoketchSystem *poketchSys; } UnkStruct_ov55_0225621C; static void NitroStaticInit(void); -static BOOL ov55_022561D4(void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov55_02256254(SysTask * param0, void * param1); -static void ov55_02256288(void * param0); -static BOOL ov55_0225621C(UnkStruct_ov55_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3); -static void ov55_02256240(UnkStruct_ov55_0225621C * param0); -static void ov55_02256290(UnkStruct_ov55_0225621C * param0, u32 param1); -static BOOL ov55_022562A4(UnkStruct_ov55_0225621C * param0); -static BOOL ov55_022562E4(UnkStruct_ov55_0225621C * param0); -static BOOL ov55_022562F8(UnkStruct_ov55_0225621C * param0); - -static void NitroStaticInit (void) +static BOOL ov55_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov55_02256254(SysTask *param0, void *param1); +static void ov55_02256288(void *param0); +static BOOL ov55_0225621C(UnkStruct_ov55_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3); +static void ov55_02256240(UnkStruct_ov55_0225621C *param0); +static void ov55_02256290(UnkStruct_ov55_0225621C *param0, u32 param1); +static BOOL ov55_022562A4(UnkStruct_ov55_0225621C *param0); +static BOOL ov55_022562E4(UnkStruct_ov55_0225621C *param0); +static BOOL ov55_022562F8(UnkStruct_ov55_0225621C *param0); + +static void NitroStaticInit(void) { PoketchSystem_SetAppFunctions(ov55_022561D4, ov55_02256288); } -static BOOL ov55_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov55_022561D4(void **param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { - UnkStruct_ov55_0225621C * v0 = (UnkStruct_ov55_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225621C)); + UnkStruct_ov55_0225621C *v0 = (UnkStruct_ov55_0225621C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225621C)); if (v0 != NULL) { if (ov55_0225621C(v0, poketchSys, param2, param3)) { @@ -58,7 +58,7 @@ static BOOL ov55_022561D4 (void ** param0, PoketchSystem *poketchSys, BGL * para return 0; } -static BOOL ov55_0225621C (UnkStruct_ov55_0225621C * param0, PoketchSystem *poketchSys, BGL * param2, u32 param3) +static BOOL ov55_0225621C(UnkStruct_ov55_0225621C *param0, PoketchSystem *poketchSys, BGL *param2, u32 param3) { if (ov55_0225632C(&(param0->unk_08), &(param0->unk_04), param2)) { param0->unk_00 = 0; @@ -72,21 +72,21 @@ static BOOL ov55_0225621C (UnkStruct_ov55_0225621C * param0, PoketchSystem *poke return 0; } -static void ov55_02256240 (UnkStruct_ov55_0225621C * param0) +static void ov55_02256240(UnkStruct_ov55_0225621C *param0) { ov55_02256360(param0->unk_08); Heap_FreeToHeap(param0); } -static void ov55_02256254 (SysTask * param0, void * param1) +static void ov55_02256254(SysTask *param0, void *param1) { - static BOOL(*const v0[])(UnkStruct_ov55_0225621C *) = { + static BOOL (*const v0[])(UnkStruct_ov55_0225621C *) = { ov55_022562A4, ov55_022562E4, ov55_022562F8 }; - UnkStruct_ov55_0225621C * v1 = (UnkStruct_ov55_0225621C *)param1; + UnkStruct_ov55_0225621C *v1 = (UnkStruct_ov55_0225621C *)param1; if (v1->unk_00 < NELEMS(v0)) { if (v0[v1->unk_00](v1)) { @@ -98,12 +98,12 @@ static void ov55_02256254 (SysTask * param0, void * param1) } } -static void ov55_02256288 (void * param0) +static void ov55_02256288(void *param0) { ((UnkStruct_ov55_0225621C *)param0)->unk_02 = 1; } -static void ov55_02256290 (UnkStruct_ov55_0225621C * param0, u32 param1) +static void ov55_02256290(UnkStruct_ov55_0225621C *param0, u32 param1) { if (param0->unk_02 == 0) { param0->unk_00 = param1; @@ -114,7 +114,7 @@ static void ov55_02256290 (UnkStruct_ov55_0225621C * param0, u32 param1) param0->unk_01 = 0; } -static BOOL ov55_022562A4 (UnkStruct_ov55_0225621C * param0) +static BOOL ov55_022562A4(UnkStruct_ov55_0225621C *param0) { switch (param0->unk_01) { case 0: @@ -132,7 +132,7 @@ static BOOL ov55_022562A4 (UnkStruct_ov55_0225621C * param0) return 0; } -static BOOL ov55_022562E4 (UnkStruct_ov55_0225621C * param0) +static BOOL ov55_022562E4(UnkStruct_ov55_0225621C *param0) { if (param0->unk_02) { ov55_02256290(param0, 2); @@ -141,7 +141,7 @@ static BOOL ov55_022562E4 (UnkStruct_ov55_0225621C * param0) return 0; } -static BOOL ov55_022562F8 (UnkStruct_ov55_0225621C * param0) +static BOOL ov55_022562F8(UnkStruct_ov55_0225621C *param0) { switch (param0->unk_01) { case 0: diff --git a/src/overlay055/ov55_0225632C.c b/src/overlay055/ov55_0225632C.c index 29ae12aff6..8541a3ab0e 100644 --- a/src/overlay055/ov55_0225632C.c +++ b/src/overlay055/ov55_0225632C.c @@ -1,34 +1,35 @@ +#include "overlay055/ov55_0225632C.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay025/struct_ov25_02255224_decl.h" -#include "overlay055/struct_ov55_0225632C_decl.h" +#include "overlay025/ov25_02255090.h" #include "overlay025/struct_ov25_0225517C.h" +#include "overlay025/struct_ov25_02255224_decl.h" #include "overlay055/struct_ov55_0225632C_1.h" +#include "overlay055/struct_ov55_0225632C_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay025/ov25_02255090.h" -#include "overlay055/ov55_0225632C.h" struct UnkStruct_ov55_0225632C_t { - const UnkStruct_ov55_0225632C_1 * unk_00; - BGL * unk_04; + const UnkStruct_ov55_0225632C_1 *unk_00; + BGL *unk_04; u32 unk_08[10]; }; -static void ov55_022563B4(UnkStruct_ov25_02255224 * param0); -static void ov55_022563C8(SysTask * param0, void * param1); -static void ov55_02256468(SysTask * param0, void * param1); +static void ov55_022563B4(UnkStruct_ov25_02255224 *param0); +static void ov55_022563C8(SysTask *param0, void *param1); +static void ov55_02256468(SysTask *param0, void *param1); -BOOL ov55_0225632C (UnkStruct_ov55_0225632C ** param0, const UnkStruct_ov55_0225632C_1 * param1, BGL * param2) +BOOL ov55_0225632C(UnkStruct_ov55_0225632C **param0, const UnkStruct_ov55_0225632C_1 *param1, BGL *param2) { - UnkStruct_ov55_0225632C * v0 = (UnkStruct_ov55_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225632C)); + UnkStruct_ov55_0225632C *v0 = (UnkStruct_ov55_0225632C *)Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, sizeof(UnkStruct_ov55_0225632C)); if (v0 != NULL) { ov25_02255090(v0->unk_08, 8); @@ -44,7 +45,7 @@ BOOL ov55_0225632C (UnkStruct_ov55_0225632C ** param0, const UnkStruct_ov55_0225 return 0; } -void ov55_02256360 (UnkStruct_ov55_0225632C * param0) +void ov55_02256360(UnkStruct_ov55_0225632C *param0) { if (param0 != NULL) { if (param0->unk_04 != NULL) { @@ -56,34 +57,34 @@ void ov55_02256360 (UnkStruct_ov55_0225632C * param0) } static const UnkStruct_ov25_0225517C Unk_ov55_022564AC[] = { - {0x0, ov55_022563C8, 0x0}, - {0x1, ov55_02256468, 0x0}, - {0x0, NULL, 0x0} + { 0x0, ov55_022563C8, 0x0 }, + { 0x1, ov55_02256468, 0x0 }, + { 0x0, NULL, 0x0 } }; -void ov55_02256378 (UnkStruct_ov55_0225632C * param0, u32 param1) +void ov55_02256378(UnkStruct_ov55_0225632C *param0, u32 param1) { ov25_0225517C(Unk_ov55_022564AC, param1, param0, param0->unk_00, param0->unk_08, 2, 8); } -BOOL ov55_0225639C (UnkStruct_ov55_0225632C * param0, u32 param1) +BOOL ov55_0225639C(UnkStruct_ov55_0225632C *param0, u32 param1) { return ov25_02255130(param0->unk_08, param1); } -BOOL ov55_022563A8 (UnkStruct_ov55_0225632C * param0) +BOOL ov55_022563A8(UnkStruct_ov55_0225632C *param0) { return ov25_02255154(param0->unk_08); } -static void ov55_022563B4 (UnkStruct_ov25_02255224 * param0) +static void ov55_022563B4(UnkStruct_ov25_02255224 *param0) { - UnkStruct_ov55_0225632C * v0 = ov25_0225523C(param0); + UnkStruct_ov55_0225632C *v0 = ov25_0225523C(param0); ov25_02255224(v0->unk_08, param0); } -static void ov55_022563C8 (SysTask * param0, void * param1) +static void ov55_022563C8(SysTask *param0, void *param1) { static const UnkStruct_ov97_0222DB78 v0 = { 0, @@ -101,7 +102,7 @@ static void ov55_022563C8 (SysTask * param0, void * param1) 0 }; GXSDispCnt v1; - UnkStruct_ov55_0225632C * v2; + UnkStruct_ov55_0225632C *v2; v2 = ov25_0225523C(param1); @@ -119,9 +120,9 @@ static void ov55_022563C8 (SysTask * param0, void * param1) ov55_022563B4(param1); } -static void ov55_02256468 (SysTask * param0, void * param1) +static void ov55_02256468(SysTask *param0, void *param1) { - UnkStruct_ov55_0225632C * v0 = ov25_0225523C(param1); + UnkStruct_ov55_0225632C *v0 = ov25_0225523C(param1); sub_02019044(v0->unk_04, 6); ov55_022563B4(param1); diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 7b9d223f60..b9ad91152c 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -1,33 +1,39 @@ +#include "overlay056/ov56_022561C0.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0205B43C_decl.h" -#include "overlay056/struct_ov56_02256468_decl.h" - -#include "struct_defs/struct_0200C738.h" #include "struct_defs/sentence.h" -#include "touch_screen.h" +#include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0203330C.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0205C22C.h" #include "struct_defs/struct_0205C924.h" #include "struct_defs/struct_0205C95C.h" + +#include "field/field_system.h" #include "overlay019/struct_ov19_021DA864.h" +#include "overlay056/struct_ov56_02256468_decl.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" +#include "touch_screen.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_02005474.h" #include "unk_0200679C.h" @@ -35,26 +41,17 @@ #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" #include "unk_02014A84.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_02027F84.h" #include "unk_02033200.h" #include "unk_020508D4.h" #include "unk_0205B33C.h" #include "unk_0205D8CC.h" -#include "overlay056/ov56_022561C0.h" FS_EXTERN_OVERLAY(overlay56); @@ -75,27 +72,27 @@ typedef struct { struct UnkStruct_ov56_02256468_t { int unk_00; - UnkStruct_0205C22C * unk_04; - UnkStruct_0205B43C * unk_08; - FieldSystem * fieldSystem; - TrainerInfo * unk_10; - BGL * unk_14; - StringTemplate * unk_18; - MessageLoader * unk_1C; - u16 * unk_20; - NNSG2dScreenData * unk_24; - GraphicElementManager * unk_28; + UnkStruct_0205C22C *unk_04; + UnkStruct_0205B43C *unk_08; + FieldSystem *fieldSystem; + TrainerInfo *unk_10; + BGL *unk_14; + StringTemplate *unk_18; + MessageLoader *unk_1C; + u16 *unk_20; + NNSG2dScreenData *unk_24; + GraphicElementManager *unk_28; UnkStruct_0200C738 unk_2C; - UnkStruct_02009714 * unk_1B8[4]; - UnkStruct_02009DC8 * unk_1C8[4]; + UnkStruct_02009714 *unk_1B8[4]; + UnkStruct_02009DC8 *unk_1C8[4]; UnkStruct_ov19_021DA864 unk_1D8; - GraphicElementData * unk_1FC[8]; + GraphicElementData *unk_1FC[8]; int unk_21C; int unk_220; int unk_224; int unk_228; UnkStruct_ov56_022562EC unk_22C[3]; - UnkStruct_0205C95C * unk_2D4; + UnkStruct_0205C95C *unk_2D4; UnkStruct_ov56_02256294 unk_2D8; int unk_2E0; int unk_2E4; @@ -106,44 +103,44 @@ struct UnkStruct_ov56_02256468_t { u8 unk_2EF; BOOL unk_2F0; u16 unk_2F4[2]; - SysTask * unk_2F8; + SysTask *unk_2F8; }; -static void ov56_02256294(UnkStruct_ov56_02256468 * param0); -static void ov56_022564E4(BGL * param0); -static void ov56_02256508(BGL * param0); -static void ov56_02256634(UnkStruct_ov56_02256468 * param0); -static void ov56_02256704(UnkStruct_ov56_02256468 * param0); -static void ov56_022562EC(BGL * param0, UnkStruct_ov56_022562EC * param1); -static void ov56_022563E8(UnkStruct_ov56_022562EC * param0); -static void ov56_022568E0(UnkStruct_ov56_02256468 * param0); -static void ov56_022567FC(UnkStruct_ov56_02256468 * param0, int param1, UnkStruct_0205C924 * param2); -static void ov56_02256D04(UnkStruct_ov56_02256468 * param0); -static void ov56_022569E0(UnkStruct_ov56_02256468 * param0); -static void ov56_02256994(GraphicElementData * param0, int param1); -static void ov56_02257098(UnkStruct_ov56_02256468 * param0); -static void ov56_02256EE8(UnkStruct_ov56_02256468 * param0, u32 param1, Sentence * param2, TrainerInfo * param3); -static int ov56_02256FC8(UnkStruct_ov56_02256468 * param0, Sentence * param1, int param2); -static int ov56_022567E4(UnkStruct_0205C95C * param0, int param1); +static void ov56_02256294(UnkStruct_ov56_02256468 *param0); +static void ov56_022564E4(BGL *param0); +static void ov56_02256508(BGL *param0); +static void ov56_02256634(UnkStruct_ov56_02256468 *param0); +static void ov56_02256704(UnkStruct_ov56_02256468 *param0); +static void ov56_022562EC(BGL *param0, UnkStruct_ov56_022562EC *param1); +static void ov56_022563E8(UnkStruct_ov56_022562EC *param0); +static void ov56_022568E0(UnkStruct_ov56_02256468 *param0); +static void ov56_022567FC(UnkStruct_ov56_02256468 *param0, int param1, UnkStruct_0205C924 *param2); +static void ov56_02256D04(UnkStruct_ov56_02256468 *param0); +static void ov56_022569E0(UnkStruct_ov56_02256468 *param0); +static void ov56_02256994(GraphicElementData *param0, int param1); +static void ov56_02257098(UnkStruct_ov56_02256468 *param0); +static void ov56_02256EE8(UnkStruct_ov56_02256468 *param0, u32 param1, Sentence *param2, TrainerInfo *param3); +static int ov56_02256FC8(UnkStruct_ov56_02256468 *param0, Sentence *param1, int param2); +static int ov56_022567E4(UnkStruct_0205C95C *param0, int param1); static int ov56_022567F0(int param0, int param1); -static int ov56_02256A68(UnkStruct_ov56_02256468 * param0); -static int ov56_02256BC0(UnkStruct_ov56_02256468 * param0); -static void ov56_02257100(UnkStruct_ov56_02256468 * param0); -static void ov56_02257048(UnkStruct_ov56_02256468 * param0, TrainerInfo * param1, Sentence * param2, u32 param3); -static Strbuf* ov56_02256E5C(UnkStruct_02027F8C * param0, u32 param1, StringTemplate * param2, MessageLoader * param3, TrainerInfo * param4); -static void ov56_02256D64(BGL * param0, NNSG2dScreenData * param1, UnkStruct_ov56_022562EC * param2, int param3, int param4, int * param5); -static void ov56_0225710C(UnkStruct_ov56_02256468 * param0); -static void ov56_0225712C(UnkStruct_ov56_02256468 * param0); -static BOOL ov56_02257174(const UnkStruct_ov56_02256468 * param0); -static void ov56_0225717C(UnkStruct_ov56_02256468 * param0, BOOL param1); -static BOOL ov56_02257184(const UnkStruct_ov56_02256468 * param0); -static void ov56_0225718C(UnkStruct_ov56_02256468 * param0, int param1); -static void ov56_022571D0(UnkStruct_ov56_02256468 * param0); - -static void ov56_022561C0 (SysTask * param0, void * param1) -{ - UnkStruct_ov56_02256468 * v0 = param1; - BGL * v1 = v0->unk_14; +static int ov56_02256A68(UnkStruct_ov56_02256468 *param0); +static int ov56_02256BC0(UnkStruct_ov56_02256468 *param0); +static void ov56_02257100(UnkStruct_ov56_02256468 *param0); +static void ov56_02257048(UnkStruct_ov56_02256468 *param0, TrainerInfo *param1, Sentence *param2, u32 param3); +static Strbuf *ov56_02256E5C(UnkStruct_02027F8C *param0, u32 param1, StringTemplate *param2, MessageLoader *param3, TrainerInfo *param4); +static void ov56_02256D64(BGL *param0, NNSG2dScreenData *param1, UnkStruct_ov56_022562EC *param2, int param3, int param4, int *param5); +static void ov56_0225710C(UnkStruct_ov56_02256468 *param0); +static void ov56_0225712C(UnkStruct_ov56_02256468 *param0); +static BOOL ov56_02257174(const UnkStruct_ov56_02256468 *param0); +static void ov56_0225717C(UnkStruct_ov56_02256468 *param0, BOOL param1); +static BOOL ov56_02257184(const UnkStruct_ov56_02256468 *param0); +static void ov56_0225718C(UnkStruct_ov56_02256468 *param0, int param1); +static void ov56_022571D0(UnkStruct_ov56_02256468 *param0); + +static void ov56_022561C0(SysTask *param0, void *param1) +{ + UnkStruct_ov56_02256468 *v0 = param1; + BGL *v1 = v0->unk_14; int v2; if (v0->fieldSystem->unk_80 == NULL) { @@ -186,7 +183,7 @@ static void ov56_022561C0 (SysTask * param0, void * param1) } } -static void ov56_02256294 (UnkStruct_ov56_02256468 * param0) +static void ov56_02256294(UnkStruct_ov56_02256468 *param0) { int v0; @@ -200,7 +197,7 @@ static void ov56_02256294 (UnkStruct_ov56_02256468 * param0) param0->unk_20 = sub_02006F6C(74, 3, 1, &(param0->unk_24), 4); } -static void ov56_022562EC (BGL * param0, UnkStruct_ov56_022562EC * param1) +static void ov56_022562EC(BGL *param0, UnkStruct_ov56_022562EC *param1) { int v0; @@ -220,7 +217,7 @@ static void ov56_022562EC (BGL * param0, UnkStruct_ov56_022562EC * param1) } } -static void ov56_022563E8 (UnkStruct_ov56_022562EC * param0) +static void ov56_022563E8(UnkStruct_ov56_022562EC *param0) { int v0; @@ -231,10 +228,10 @@ static void ov56_022563E8 (UnkStruct_ov56_022562EC * param0) } } -UnkStruct_ov56_02256468 * ov56_02256410 (FieldSystem * fieldSystem) +UnkStruct_ov56_02256468 *ov56_02256410(FieldSystem *fieldSystem) { - UnkStruct_ov56_02256468 * v0; - SysTask * v1; + UnkStruct_ov56_02256468 *v0; + SysTask *v1; v1 = SysTask_StartAndAllocateParam(ov56_022561C0, sizeof(UnkStruct_ov56_02256468), 4, 4); v0 = SysTask_GetParam(v1); @@ -251,10 +248,10 @@ UnkStruct_ov56_02256468 * ov56_02256410 (FieldSystem * fieldSystem) return v0; } -void ov56_02256468 (UnkStruct_ov56_02256468 * param0) +void ov56_02256468(UnkStruct_ov56_02256468 *param0) { if (param0->unk_00 == 2) { - BGL * v0 = param0->unk_14; + BGL *v0 = param0->unk_14; int v1; param0->unk_00 = 3; @@ -281,7 +278,7 @@ void ov56_02256468 (UnkStruct_ov56_02256468 * param0) } } -static void ov56_022564E4 (BGL * param0) +static void ov56_022564E4(BGL *param0) { sub_02019044(param0, 4); sub_02019044(param0, 5); @@ -289,7 +286,7 @@ static void ov56_022564E4 (BGL * param0) sub_02019044(param0, 7); } -static void ov56_02256508 (BGL * param0) +static void ov56_02256508(BGL *param0) { ov56_022564E4(param0); @@ -386,7 +383,7 @@ static void ov56_02256508 (BGL * param0) sub_0205D8CC(4, 0); } -static void ov56_02256634 (UnkStruct_ov56_02256468 * param0) +static void ov56_02256634(UnkStruct_ov56_02256468 *param0) { int v0; @@ -411,7 +408,7 @@ static const int Unk_ov56_02257238[] = { 0x60 }; -static void ov56_02256704 (UnkStruct_ov56_02256468 * param0) +static void ov56_02256704(UnkStruct_ov56_02256468 *param0) { int v0; @@ -432,7 +429,7 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0) v1.unk_2C = 4; for (v0 = 0; v0 < 3; v0++) { - v1.unk_08.x = FX32_CONST((256 - 24)); + v1.unk_08.x = FX32_CONST(256 - 24); v1.unk_08.y = FX32_CONST(Unk_ov56_02257238[v0]) + (192 << FX32_SHIFT); param0->unk_1FC[v0] = sub_02021AA0(&v1); @@ -443,7 +440,7 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0) } } -static int ov56_022567E4 (UnkStruct_0205C95C * param0, int param1) +static int ov56_022567E4(UnkStruct_0205C95C *param0, int param1) { param1++; @@ -454,7 +451,7 @@ static int ov56_022567E4 (UnkStruct_0205C95C * param0, int param1) return param1; } -static int ov56_022567F0 (int param0, int param1) +static int ov56_022567F0(int param0, int param1) { int v0 = param0 + param1; @@ -465,7 +462,7 @@ static int ov56_022567F0 (int param0, int param1) return v0; } -static void ov56_022567FC (UnkStruct_ov56_02256468 * param0, int param1, UnkStruct_0205C924 * param2) +static void ov56_022567FC(UnkStruct_ov56_02256468 *param0, int param1, UnkStruct_0205C924 *param2) { param0->unk_22C[param1].unk_30 = param2->unk_10; @@ -485,7 +482,7 @@ static void ov56_022567FC (UnkStruct_ov56_02256468 * param0, int param1, UnkStru sub_0201A9A4(¶m0->unk_22C[param1].unk_20); } -static void ov56_022568E0 (UnkStruct_ov56_02256468 * param0) +static void ov56_022568E0(UnkStruct_ov56_02256468 *param0) { int v0, v1; int v2 = ov56_022567F0(param0->unk_2D4->unk_34C, param0->unk_2D8.unk_04); @@ -514,35 +511,35 @@ static void ov56_022568E0 (UnkStruct_ov56_02256468 * param0) } static const TouchScreenRect Unk_ov56_02257264[] = { - {0x0, 0x20, 0xE8, 0xF8}, - {0xA0, 0x20, 0xE8, 0xF8}, - {0x0, 0x40, 0x0, 0xE8}, - {0x40, 0x80, 0x0, 0xE8}, - {0x80, 0xC0, 0x0, 0xE8}, - {0x30, 0x90, 0xE8, 0x100}, - {0xff, 0x0, 0x0, 0x0} + { 0x0, 0x20, 0xE8, 0xF8 }, + { 0xA0, 0x20, 0xE8, 0xF8 }, + { 0x0, 0x40, 0x0, 0xE8 }, + { 0x40, 0x80, 0x0, 0xE8 }, + { 0x80, 0xC0, 0x0, 0xE8 }, + { 0x30, 0x90, 0xE8, 0x100 }, + { 0xff, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov56_02257250[] = { - {0x30, 0x90, 0xE8, 0x100}, - {0x0, 0x40, 0x0, 0xE8}, - {0x40, 0x80, 0x0, 0xE8}, - {0x80, 0xC0, 0x0, 0xE8}, - {0xff, 0x0, 0x0, 0x0} + { 0x30, 0x90, 0xE8, 0x100 }, + { 0x0, 0x40, 0x0, 0xE8 }, + { 0x40, 0x80, 0x0, 0xE8 }, + { 0x80, 0xC0, 0x0, 0xE8 }, + { 0xff, 0x0, 0x0, 0x0 } }; -static void ov56_02256994 (GraphicElementData * param0, int param1) +static void ov56_02256994(GraphicElementData *param0, int param1) { VecFx32 v0; - v0.x = FX32_CONST((256 - 24)); + v0.x = FX32_CONST(256 - 24); v0.y = FX32_CONST(param1) + (192 << FX32_SHIFT); v0.z = 0; sub_02021C50(param0, &v0); } -static void ov56_022569E0 (UnkStruct_ov56_02256468 * param0) +static void ov56_022569E0(UnkStruct_ov56_02256468 *param0) { param0->unk_2D8.unk_00 = param0->unk_2D4->unk_348; @@ -565,16 +562,16 @@ static void ov56_022569E0 (UnkStruct_ov56_02256468 * param0) param0->unk_2D8.unk_02 = param0->unk_2D8.unk_00; } -static int ov56_02256A68 (UnkStruct_ov56_02256468 * param0) +static int ov56_02256A68(UnkStruct_ov56_02256468 *param0) { int v0, v1, v2, v3; - WMBssDesc * v4; - UnkStruct_0203330C * v5; + WMBssDesc *v4; + UnkStruct_0203330C *v5; v0 = sub_02022644(Unk_ov56_02257264); v3 = ov56_02257174(param0); - if ((v0 != 0xffffffff)) { + if (v0 != 0xffffffff) { switch (v0) { case 0: ov56_0225718C(param0, v0); @@ -626,7 +623,7 @@ static int ov56_02256A68 (UnkStruct_ov56_02256468 * param0) } { - TrainerInfo * v6 = sub_02033F9C(); + TrainerInfo *v6 = sub_02033F9C(); if (param0->unk_2D4->unk_00[v2].unk_0C == TrainerInfo_ID(v6)) { Sound_PlayEffect(1509); @@ -643,7 +640,7 @@ static int ov56_02256A68 (UnkStruct_ov56_02256468 * param0) return v0; } -static int ov56_02256BC0 (UnkStruct_ov56_02256468 * param0) +static int ov56_02256BC0(UnkStruct_ov56_02256468 *param0) { int v0; @@ -688,7 +685,7 @@ static int ov56_02256BC0 (UnkStruct_ov56_02256468 * param0) return v0; } -static void ov56_02256C84 (UnkStruct_ov56_02256468 * param0) +static void ov56_02256C84(UnkStruct_ov56_02256468 *param0) { if (gCoreSys.heldKeys & PAD_BUTTON_L) { ov56_0225718C(param0, 0); @@ -711,7 +708,7 @@ static void ov56_02256C84 (UnkStruct_ov56_02256468 * param0) } } -static void ov56_02256D04 (UnkStruct_ov56_02256468 * param0) +static void ov56_02256D04(UnkStruct_ov56_02256468 *param0) { int v0 = 0xffffffff; @@ -735,7 +732,7 @@ static const int Unk_ov56_02257244[] = { 0x5 }; -static void ov56_02256D64 (BGL * param0, NNSG2dScreenData * param1, UnkStruct_ov56_022562EC * param2, int param3, int param4, int * param5) +static void ov56_02256D64(BGL *param0, NNSG2dScreenData *param1, UnkStruct_ov56_022562EC *param2, int param3, int param4, int *param5) { int v0, v1 = 0; @@ -771,10 +768,10 @@ static void ov56_02256D64 (BGL * param0, NNSG2dScreenData * param1, UnkStruct_ov sub_02019460(param0, 7, sub_02019FE4(param0, 7), 32 * 24 * 2, 0); } -static Strbuf* ov56_02256E5C (UnkStruct_02027F8C * param0, u32 param1, StringTemplate * param2, MessageLoader * param3, TrainerInfo * param4) +static Strbuf *ov56_02256E5C(UnkStruct_02027F8C *param0, u32 param1, StringTemplate *param2, MessageLoader *param3, TrainerInfo *param4) { - Strbuf* v0 = NULL; - Strbuf* v1; + Strbuf *v0 = NULL; + Strbuf *v1; int v2 = 0; if (param1 != TrainerInfo_ID(param4)) { @@ -800,11 +797,11 @@ static Strbuf* ov56_02256E5C (UnkStruct_02027F8C * param0, u32 param1, StringTem return v0; } -static void ov56_02256EE8 (UnkStruct_ov56_02256468 * param0, u32 param1, Sentence * param2, TrainerInfo * param3) +static void ov56_02256EE8(UnkStruct_ov56_02256468 *param0, u32 param1, Sentence *param2, TrainerInfo *param3) { - UnkStruct_0205C95C * v0 = param0->unk_2D4; - UnkStruct_02027F8C * v1 = param0->unk_04->unk_474; - int * v2; + UnkStruct_0205C95C *v0 = param0->unk_2D4; + UnkStruct_02027F8C *v1 = param0->unk_04->unk_474; + int *v2; if (v0->unk_348 == 30) { v2 = &v0->unk_34C; @@ -835,7 +832,7 @@ static void ov56_02256EE8 (UnkStruct_ov56_02256468 * param0, u32 param1, Sentenc } } -static int ov56_02256FC8 (UnkStruct_ov56_02256468 * param0, Sentence * param1, int param2) +static int ov56_02256FC8(UnkStruct_ov56_02256468 *param0, Sentence *param1, int param2) { int v0, v1; @@ -864,7 +861,7 @@ static int ov56_02256FC8 (UnkStruct_ov56_02256468 * param0, Sentence * param1, i return 1; } -static void ov56_02257048 (UnkStruct_ov56_02256468 * param0, TrainerInfo * param1, Sentence * param2, u32 param3) +static void ov56_02257048(UnkStruct_ov56_02256468 *param0, TrainerInfo *param1, Sentence *param2, u32 param3) { int v0 = 0; @@ -883,13 +880,13 @@ static void ov56_02257048 (UnkStruct_ov56_02256468 * param0, TrainerInfo * param ov56_02257100(param0); } -static void ov56_02257098 (UnkStruct_ov56_02256468 * param0) +static void ov56_02257098(UnkStruct_ov56_02256468 *param0) { int v0, v1; - WMBssDesc * v2; - UnkStruct_0203330C * v3; - Sentence * v4; - TrainerInfo * v5; + WMBssDesc *v2; + UnkStruct_0203330C *v3; + Sentence *v4; + TrainerInfo *v5; Sentence v6; if (sub_020509A4(param0->fieldSystem)) { @@ -915,12 +912,12 @@ static void ov56_02257098 (UnkStruct_ov56_02256468 * param0) } } -static void ov56_02257100 (UnkStruct_ov56_02256468 * param0) +static void ov56_02257100(UnkStruct_ov56_02256468 *param0) { param0->unk_2E8 = 1; } -static void ov56_0225710C (UnkStruct_ov56_02256468 * param0) +static void ov56_0225710C(UnkStruct_ov56_02256468 *param0) { param0->unk_2EC = 0; param0->unk_2EE = 8; @@ -928,7 +925,7 @@ static void ov56_0225710C (UnkStruct_ov56_02256468 * param0) param0->unk_2ED = param0->unk_2EE; } -static void ov56_0225712C (UnkStruct_ov56_02256468 * param0) +static void ov56_0225712C(UnkStruct_ov56_02256468 *param0) { param0->unk_2EC = 0; @@ -948,22 +945,22 @@ static void ov56_0225712C (UnkStruct_ov56_02256468 * param0) } } -static BOOL ov56_02257174 (const UnkStruct_ov56_02256468 * param0) +static BOOL ov56_02257174(const UnkStruct_ov56_02256468 *param0) { return param0->unk_2EC; } -static void ov56_0225717C (UnkStruct_ov56_02256468 * param0, BOOL param1) +static void ov56_0225717C(UnkStruct_ov56_02256468 *param0, BOOL param1) { param0->unk_2F0 = param1; } -static BOOL ov56_02257184 (const UnkStruct_ov56_02256468 * param0) +static BOOL ov56_02257184(const UnkStruct_ov56_02256468 *param0) { return param0->unk_2F0; } -static void ov56_0225718C (UnkStruct_ov56_02256468 * param0, int param1) +static void ov56_0225718C(UnkStruct_ov56_02256468 *param0, int param1) { u16 v0; u16 v1; @@ -978,7 +975,7 @@ static void ov56_0225718C (UnkStruct_ov56_02256468 * param0, int param1) param0->unk_2F4[param1] = 1; } -static void ov56_022571D0 (UnkStruct_ov56_02256468 * param0) +static void ov56_022571D0(UnkStruct_ov56_02256468 *param0) { int v0; u16 v1; diff --git a/src/overlay057/ov57_021D0D80.c b/src/overlay057/ov57_021D0D80.c index 474248b908..ef829208c3 100644 --- a/src/overlay057/ov57_021D0D80.c +++ b/src/overlay057/ov57_021D0D80.c @@ -1,51 +1,51 @@ #include #include +#include "constants/game_options.h" + #include "struct_decls/struct_02025CCC_decl.h" -#include "trainer_info.h" #include "struct_decls/struct_02027854_decl.h" #include "struct_decls/struct_0202B4A0_decl.h" -#include "savedata.h" - -#include "overlay057/const_ov57_021D0F90.h" -#include "constdata/const_020F6824.h" -#include "constdata/const_020EA11C.h" -#include "constdata/const_020EA10C.h" -#include "overlay057/const_ov57_021D0F80.h" -#include "overlay057/const_ov57_021D0F70.h" - #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_02055BA8.h" -#include "unk_02000C88.h" +#include "overlay057/const_ov57_021D0F70.h" +#include "overlay057/const_ov57_021D0F80.h" +#include "overlay057/const_ov57_021D0F90.h" +#include "overlay057/ov57_021D0F30.h" + +#include "game_options.h" +#include "heap.h" #include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "savedata_misc.h" +#include "trainer_info.h" +#include "unk_02000C88.h" #include "unk_02017428.h" -#include "heap.h" #include "unk_0201D15C.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "savedata_misc.h" -#include "game_options.h" #include "unk_02027B70.h" #include "unk_0202B37C.h" #include "unk_0205C980.h" #include "unk_0206B9D8.h" -#include "pokemon.h" -#include "party.h" -#include "overlay057/ov57_021D0F30.h" -#include "constants/game_options.h" -static int ov57_021D0D80(OverlayManager * param0, int * param1); -static int ov57_021D0D98(OverlayManager * param0, int * param1); -static int ov57_021D0DAC(OverlayManager * param0, int * param1); -static int ov57_021D0DC8(OverlayManager * param0, int * param1); -static int ov57_021D0DE0(OverlayManager * param0, int * param1); -static int ov57_021D0E00(OverlayManager * param0, int * param1); -static int ov57_021D0E1C(OverlayManager * param0, int * param1); -static int ov57_021D0E34(OverlayManager * param0, int * param1); -static int ov57_021D0E90(OverlayManager * param0, int * param1); -static void ov57_021D0EAC(int param0, SaveData * param1, BOOL param2); +#include "constdata/const_020EA10C.h" +#include "constdata/const_020EA11C.h" +#include "constdata/const_020F6824.h" + +static int ov57_021D0D80(OverlayManager *param0, int *param1); +static int ov57_021D0D98(OverlayManager *param0, int *param1); +static int ov57_021D0DAC(OverlayManager *param0, int *param1); +static int ov57_021D0DC8(OverlayManager *param0, int *param1); +static int ov57_021D0DE0(OverlayManager *param0, int *param1); +static int ov57_021D0E00(OverlayManager *param0, int *param1); +static int ov57_021D0E1C(OverlayManager *param0, int *param1); +static int ov57_021D0E34(OverlayManager *param0, int *param1); +static int ov57_021D0E90(OverlayManager *param0, int *param1); +static void ov57_021D0EAC(int param0, SaveData *param1, BOOL param2); const OverlayManagerTemplate Unk_ov57_021D0F90 = { ov57_021D0D80, @@ -68,7 +68,7 @@ const OverlayManagerTemplate Unk_ov57_021D0F70 = { 0xffffffff }; -static int ov57_021D0D80 (OverlayManager * param0, int * param1) +static int ov57_021D0D80(OverlayManager *param0, int *param1) { Heap_Create(3, 77, 131072); InitRNG(); @@ -76,15 +76,15 @@ static int ov57_021D0D80 (OverlayManager * param0, int * param1) return 1; } -static int ov57_021D0D98 (OverlayManager * param0, int * param1) +static int ov57_021D0D98(OverlayManager *param0, int *param1) { - SaveData * v0 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; + SaveData *v0 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; ov57_021D0F44(77, v0); return 1; } -static int ov57_021D0DAC (OverlayManager * param0, int * param1) +static int ov57_021D0DAC(OverlayManager *param0, int *param1) { Heap_Destroy(77); sub_02000EC4(0xffffffff, &Unk_020F6824); @@ -92,7 +92,7 @@ static int ov57_021D0DAC (OverlayManager * param0, int * param1) return 1; } -static int ov57_021D0DC8 (OverlayManager * param0, int * param1) +static int ov57_021D0DC8(OverlayManager *param0, int *param1) { Heap_Create(3, 77, 131072); InitRNG(); @@ -100,9 +100,9 @@ static int ov57_021D0DC8 (OverlayManager * param0, int * param1) return 1; } -static int ov57_021D0DE0 (OverlayManager * param0, int * param1) +static int ov57_021D0DE0(OverlayManager *param0, int *param1) { - SaveData * v0 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; + SaveData *v0 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; ov57_021D0EAC(77, v0, 1); sub_02017434(SaveData_GetPlayTime(v0)); @@ -110,14 +110,14 @@ static int ov57_021D0DE0 (OverlayManager * param0, int * param1) return 1; } -static int ov57_021D0E00 (OverlayManager * param0, int * param1) +static int ov57_021D0E00(OverlayManager *param0, int *param1) { Heap_Destroy(77); sub_02000EC4(0xffffffff, &gFieldSystemNewGameTemplate); return 1; } -static int ov57_021D0E1C (OverlayManager * param0, int * param1) +static int ov57_021D0E1C(OverlayManager *param0, int *param1) { Heap_Create(3, 77, 131072); InitRNG(); @@ -125,10 +125,10 @@ static int ov57_021D0E1C (OverlayManager * param0, int * param1) return 1; } -static int ov57_021D0E34 (OverlayManager * param0, int * param1) +static int ov57_021D0E34(OverlayManager *param0, int *param1) { - SaveData * v0 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; - UnkStruct_02025CCC * v1 = sub_02025CCC(v0); + SaveData *v0 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; + UnkStruct_02025CCC *v1 = sub_02025CCC(v0); ov57_021D0F30(77, v0); Options_SetSystemButtonMode(v0, OPTIONS_BUTTON_MODE_NORMAL); @@ -143,7 +143,7 @@ static int ov57_021D0E34 (OverlayManager * param0, int * param1) return 1; } -static int ov57_021D0E90 (OverlayManager * param0, int * param1) +static int ov57_021D0E90(OverlayManager *param0, int *param1) { Heap_Destroy(77); sub_02000EC4(0xffffffff, &gFieldSystemContinueTemplate); @@ -152,13 +152,13 @@ static int ov57_021D0E90 (OverlayManager * param0, int * param1) #include "data/berry_init.h" -static void ov57_021D0EAC (int param0, SaveData * param1, BOOL param2) +static void ov57_021D0EAC(int param0, SaveData *param1, BOOL param2) { u32 v0; - UnkStruct_02027854 * v1; - TrainerInfo * v2; - UnkStruct_02055BA8 * v3; - UnkStruct_0202B4A0 * v4; + UnkStruct_02027854 *v1; + TrainerInfo *v2; + UnkStruct_02055BA8 *v3; + UnkStruct_0202B4A0 *v4; sub_02025CE4(sub_02025CCC(param1)); diff --git a/src/overlay057/ov57_021D0F30.c b/src/overlay057/ov57_021D0F30.c index 5caef3f0b4..4190c98529 100644 --- a/src/overlay057/ov57_021D0F30.c +++ b/src/overlay057/ov57_021D0F30.c @@ -1,27 +1,25 @@ +#include "overlay057/ov57_021D0F30.h" + #include #include -#include "trainer_info.h" -#include "savedata.h" - #include "savedata.h" -#include "unk_02025E08.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0203D178.h" -#include "vars_flags.h" #include "unk_0206A8DC.h" -#include "overlay057/ov57_021D0F30.h" +#include "vars_flags.h" -void ov57_021D0F30 (int param0, SaveData * param1) +void ov57_021D0F30(int param0, SaveData *param1) { if (!SaveData_Load(param1)) { OS_ResetSystem(0); } } -void ov57_021D0F44 (int param0, SaveData * param1) +void ov57_021D0F44(int param0, SaveData *param1) { - TrainerInfo * v0; + TrainerInfo *v0; SaveData_Clear(param1); sub_0203D1A8(param1); diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 9fd2783e5e..23abc62bea 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -1,22 +1,19 @@ +#include "overlay058/ov58_021D0D80.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_02095EAC_decl.h" - #include "struct_defs/struct_02015958.h" -#include "touch_screen.h" #include "struct_defs/struct_0203DDFC.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02095EAC_t.h" #include "struct_defs/struct_02095FE4.h" #include "struct_defs/struct_02099F80.h" + #include "overlay022/struct_ov22_022559F8.h" #include "overlay058/struct_ov58_021D2754.h" #include "overlay058/struct_ov58_021D2820.h" @@ -25,23 +22,32 @@ #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "journal.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "string_template.h" +#include "touch_screen.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" @@ -49,123 +55,115 @@ #include "unk_0201E3D8.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" -#include "journal.h" #include "unk_02030EE0.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" #include "unk_0205B33C.h" #include "unk_0205C22C.h" #include "unk_02095E98.h" -#include "overlay058/ov58_021D0D80.h" typedef struct { - int (* unk_00)(UnkStruct_02095EAC *, int); + int (*unk_00)(UnkStruct_02095EAC *, int); int unk_04; } UnkStruct_ov58_021D3180; -static void ov58_021D115C(void * param0); +static void ov58_021D115C(void *param0); static void ov58_021D1184(void); -static void ov58_021D11A4(BGL * param0); -static void ov58_021D12C4(UnkStruct_02095EAC * param0); -static void ov58_021D13B4(UnkStruct_02095EAC * param0); -static void ov58_021D13F0(BGL * param0); -static void ov58_021D142C(UnkStruct_02095EAC * param0, NARC * param1); +static void ov58_021D11A4(BGL *param0); +static void ov58_021D12C4(UnkStruct_02095EAC *param0); +static void ov58_021D13B4(UnkStruct_02095EAC *param0); +static void ov58_021D13F0(BGL *param0); +static void ov58_021D142C(UnkStruct_02095EAC *param0, NARC *param1); static void ov58_021D1524(void); -static void ov58_021D1554(UnkStruct_02095EAC * param0, NARC * param1); -static void ov58_021D16D8(UnkStruct_02095EAC * param0); -static void ov58_021D18AC(UnkStruct_02095EAC * param0, OverlayManager * param1); -static void ov58_021D19D4(UnkStruct_02095EAC * param0); -static void ov58_021D1A10(GraphicElementData * param0, int param1, int param2); -static void ov58_021D1A80(UnkStruct_02095EAC * param0); -static int ov58_021D1CF4(UnkStruct_02095EAC * param0, int param1); -static void ov58_021D1D40(UnkStruct_02095EAC * param0); -static int ov58_021D1DFC(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D1E4C(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D1FB0(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D1FD4(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D206C(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D20A8(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D20C8(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D20F4(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D2130(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D2180(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D223C(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D2270(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D2298(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D22DC(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D22FC(UnkStruct_02095EAC * param0, int param1); -static void ov58_021D25A8(Window * param0, const u8 * param1, int param2, int param3, int * param4, int * param5, int param6, int param7); -static void ov58_021D2720(UnkStruct_ov58_021D2820 * param0, UnkStruct_ov58_021D2754 * param1); -static void ov58_021D2754(Window * param0, UnkStruct_ov58_021D2820 * param1, UnkStruct_ov58_021D2754 * param2, int param3); -static void ov58_021D2820(UnkStruct_02095EAC * param0); -static void ov58_021D2888(u16 * param0); -static void ov58_021D28E4(Window * param0, int param1, u32 param2, UnkStruct_02095EAC * param3); -static void ov58_021D29C8(UnkStruct_02095EAC * param0); -static int ov58_021D2A54(UnkStruct_02095EAC * param0); -static void ov58_021D2A98(UnkStruct_02095EAC * param0, int param1, int param2); +static void ov58_021D1554(UnkStruct_02095EAC *param0, NARC *param1); +static void ov58_021D16D8(UnkStruct_02095EAC *param0); +static void ov58_021D18AC(UnkStruct_02095EAC *param0, OverlayManager *param1); +static void ov58_021D19D4(UnkStruct_02095EAC *param0); +static void ov58_021D1A10(GraphicElementData *param0, int param1, int param2); +static void ov58_021D1A80(UnkStruct_02095EAC *param0); +static int ov58_021D1CF4(UnkStruct_02095EAC *param0, int param1); +static void ov58_021D1D40(UnkStruct_02095EAC *param0); +static int ov58_021D1DFC(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D1E4C(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D1FB0(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D1FD4(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D206C(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D20A8(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D20C8(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D20F4(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D2130(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D2180(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D223C(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D2270(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D2298(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D22DC(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D22FC(UnkStruct_02095EAC *param0, int param1); +static void ov58_021D25A8(Window *param0, const u8 *param1, int param2, int param3, int *param4, int *param5, int param6, int param7); +static void ov58_021D2720(UnkStruct_ov58_021D2820 *param0, UnkStruct_ov58_021D2754 *param1); +static void ov58_021D2754(Window *param0, UnkStruct_ov58_021D2820 *param1, UnkStruct_ov58_021D2754 *param2, int param3); +static void ov58_021D2820(UnkStruct_02095EAC *param0); +static void ov58_021D2888(u16 *param0); +static void ov58_021D28E4(Window *param0, int param1, u32 param2, UnkStruct_02095EAC *param3); +static void ov58_021D29C8(UnkStruct_02095EAC *param0); +static int ov58_021D2A54(UnkStruct_02095EAC *param0); +static void ov58_021D2A98(UnkStruct_02095EAC *param0, int param1, int param2); static int ov58_021D2B0C(int param0); -static void ov58_021D2B2C(UnkStruct_02095EAC * param0); +static void ov58_021D2B2C(UnkStruct_02095EAC *param0); static int ov58_021D28C8(void); -static int ov58_021D2320(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D23C8(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D2380(UnkStruct_02095EAC * param0, int param1); +static int ov58_021D2320(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D23C8(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D2380(UnkStruct_02095EAC *param0, int param1); static int ov58_021D2A30(void); -static int ov58_021D1DBC(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D1D64(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D1DC8(UnkStruct_02095EAC * param0, int param1); -static void ov58_021D1CAC(GraphicElementData ** param0, int param1); -static void ov58_021D1CDC(GraphicElementData ** param0, BOOL param1); -static void ov58_021D2528(Window * param0, void * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); -static void ov58_021D2B3C(UnkStruct_02095EAC * param0, int param1); -static int ov58_021D2B5C(UnkStruct_02095EAC * param0); -static int ov58_021D22D8(UnkStruct_02095EAC * param0, int param1); -static void ov58_021D2CB0(UnkStruct_02095EAC * param0, int param1); -static void ov58_021D2CB8(UnkStruct_02095EAC * param0, int param1); -static BOOL ov58_021D2CEC(UnkStruct_02095EAC * param0, UnkStruct_02015958 * param1); -static void ov58_021D2D10(UnkStruct_02095EAC * param0); -static int ov58_021D2D30(UnkStruct_02095EAC * param0); -static void ov58_021D2D4C(UnkStruct_ov58_021D2820 * param0, UnkStruct_ov72_0223E2A8 * param1, int param2, int param3); +static int ov58_021D1DBC(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D1D64(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D1DC8(UnkStruct_02095EAC *param0, int param1); +static void ov58_021D1CAC(GraphicElementData **param0, int param1); +static void ov58_021D1CDC(GraphicElementData **param0, BOOL param1); +static void ov58_021D2528(Window *param0, void *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); +static void ov58_021D2B3C(UnkStruct_02095EAC *param0, int param1); +static int ov58_021D2B5C(UnkStruct_02095EAC *param0); +static int ov58_021D22D8(UnkStruct_02095EAC *param0, int param1); +static void ov58_021D2CB0(UnkStruct_02095EAC *param0, int param1); +static void ov58_021D2CB8(UnkStruct_02095EAC *param0, int param1); +static BOOL ov58_021D2CEC(UnkStruct_02095EAC *param0, UnkStruct_02015958 *param1); +static void ov58_021D2D10(UnkStruct_02095EAC *param0); +static int ov58_021D2D30(UnkStruct_02095EAC *param0); +static void ov58_021D2D4C(UnkStruct_ov58_021D2820 *param0, UnkStruct_ov72_0223E2A8 *param1, int param2, int param3); static UnkStruct_ov58_021D3180 Unk_ov58_021D3180[] = { - {NULL, 0x1}, - {ov58_021D1D64, 0x0}, - {ov58_021D1DBC, 0x0}, - {ov58_021D1DC8, 0x0}, - {ov58_021D1CF4, 0x0}, - {ov58_021D1DFC, 0x1}, - {ov58_021D1E4C, 0x1}, - {ov58_021D1FB0, 0x1}, - {ov58_021D1FD4, 0x1}, - {ov58_021D206C, 0x1}, - {ov58_021D20A8, 0x1}, - {ov58_021D20C8, 0x1}, - {ov58_021D20F4, 0x1}, - {ov58_021D2130, 0x1}, - {ov58_021D2180, 0x1}, - {ov58_021D223C, 0x1}, - {ov58_021D2270, 0x1}, - {ov58_021D2298, 0x1}, - {ov58_021D22D8, 0x1}, - {ov58_021D22DC, 0x1}, - {ov58_021D22FC, 0x1}, - {ov58_021D2320, 0x1}, - {ov58_021D2380, 0x1}, - {ov58_021D23C8, 0x1} + { NULL, 0x1 }, + { ov58_021D1D64, 0x0 }, + { ov58_021D1DBC, 0x0 }, + { ov58_021D1DC8, 0x0 }, + { ov58_021D1CF4, 0x0 }, + { ov58_021D1DFC, 0x1 }, + { ov58_021D1E4C, 0x1 }, + { ov58_021D1FB0, 0x1 }, + { ov58_021D1FD4, 0x1 }, + { ov58_021D206C, 0x1 }, + { ov58_021D20A8, 0x1 }, + { ov58_021D20C8, 0x1 }, + { ov58_021D20F4, 0x1 }, + { ov58_021D2130, 0x1 }, + { ov58_021D2180, 0x1 }, + { ov58_021D223C, 0x1 }, + { ov58_021D2270, 0x1 }, + { ov58_021D2298, 0x1 }, + { ov58_021D22D8, 0x1 }, + { ov58_021D22DC, 0x1 }, + { ov58_021D22FC, 0x1 }, + { ov58_021D2320, 0x1 }, + { ov58_021D2380, 0x1 }, + { ov58_021D23C8, 0x1 } }; -int ov58_021D0D80 (OverlayManager * param0, int * param1) +int ov58_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_02095EAC * v0; - NARC * v1; + UnkStruct_02095EAC *v0; + NARC *v1; switch (*param1) { case 0: @@ -196,7 +194,7 @@ int ov58_021D0D80 (OverlayManager * param0, int * param1) sub_0200F174(0, 17, 17, 0x0, 16, 1, 39); { - UnkStruct_0203DDFC * v2 = (UnkStruct_0203DDFC *)OverlayManager_Args(param0); + UnkStruct_0203DDFC *v2 = (UnkStruct_0203DDFC *)OverlayManager_Args(param0); v0->unk_08 = v2; } @@ -245,9 +243,9 @@ int ov58_021D0D80 (OverlayManager * param0, int * param1) return 0; } -int ov58_021D0F08 (OverlayManager * param0, int * param1) +int ov58_021D0F08(OverlayManager *param0, int *param1) { - UnkStruct_02095EAC * v0 = OverlayManager_Data(param0); + UnkStruct_02095EAC *v0 = OverlayManager_Data(param0); if ((CommSys_CurNetId() == 0) && (v0->unk_9418 != 0)) { v0->unk_9418 &= sub_020318EC(); @@ -261,7 +259,7 @@ int ov58_021D0F08 (OverlayManager * param0, int * param1) case 0: if (ScreenWipe_Done()) { if (CommSys_CurNetId() != 0) { - if ((ov58_021D2A30() >= 2)) { + if (ov58_021D2A30() >= 2) { CommSys_SendData(128, NULL, 0); *param1 = 1; } @@ -305,12 +303,12 @@ int ov58_021D0F08 (OverlayManager * param0, int * param1) return 0; } -int ov58_021D1018 (OverlayManager * param0, int * param1) +int ov58_021D1018(OverlayManager *param0, int *param1) { - UnkStruct_02095EAC * v0 = OverlayManager_Data(param0); - UnkStruct_0203DDFC * v1 = (UnkStruct_0203DDFC *)OverlayManager_Args(param0); + UnkStruct_02095EAC *v0 = OverlayManager_Data(param0); + UnkStruct_0203DDFC *v1 = (UnkStruct_0203DDFC *)OverlayManager_Args(param0); int v2; - void * v3; + void *v3; switch (*param1) { case 0: @@ -377,7 +375,7 @@ int ov58_021D1018 (OverlayManager * param0, int * param1) return 0; } -static void ov58_021D115C (void * param0) +static void ov58_021D115C(void *param0) { sub_0201DCAC(); sub_0200A858(); @@ -386,7 +384,7 @@ static void ov58_021D115C (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov58_021D1184 (void) +static void ov58_021D1184(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -404,7 +402,7 @@ static void ov58_021D1184 (void) GXLayers_SetBanks(&v0); } -static void ov58_021D11A4 (BGL * param0) +static void ov58_021D11A4(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -526,7 +524,7 @@ static void ov58_021D11A4 (BGL * param0) sub_02019690(5, 32, 0, 39); } -static void ov58_021D12C4 (UnkStruct_02095EAC * param0) +static void ov58_021D12C4(UnkStruct_02095EAC *param0) { int v0; @@ -565,7 +563,7 @@ static void ov58_021D12C4 (UnkStruct_02095EAC * param0) param0->unk_378 = 0; } -static void ov58_021D13B4 (UnkStruct_02095EAC * param0) +static void ov58_021D13B4(UnkStruct_02095EAC *param0) { int v0; @@ -580,7 +578,7 @@ static void ov58_021D13B4 (UnkStruct_02095EAC * param0) Strbuf_Free(param0->unk_28); } -static void ov58_021D13F0 (BGL * param0) +static void ov58_021D13F0(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -591,9 +589,9 @@ static void ov58_021D13F0 (BGL * param0) Heap_FreeToHeap(param0); } -static void ov58_021D142C (UnkStruct_02095EAC * param0, NARC * param1) +static void ov58_021D142C(UnkStruct_02095EAC *param0, NARC *param1) { - BGL * v0 = param0->unk_00; + BGL *v0 = param0->unk_00; sub_02007130(param1, 0, 0, 0, 16 * 2 * 2, 39); sub_02007130(param1, 1, 4, 0, 16 * 2 * 2, 39); @@ -607,7 +605,7 @@ static void ov58_021D142C (UnkStruct_02095EAC * param0, NARC * param1) sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 39); } -static void ov58_021D1524 (void) +static void ov58_021D1524(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -622,7 +620,7 @@ static void ov58_021D1524 (void) sub_0201F8E4(); } -static void ov58_021D1554 (UnkStruct_02095EAC * param0, NARC * param1) +static void ov58_021D1554(UnkStruct_02095EAC *param0, NARC *param1) { int v0; @@ -653,21 +651,21 @@ static void ov58_021D1554 (UnkStruct_02095EAC * param0, NARC * param1) } static const u16 Unk_ov58_021D2EEC[][3] = { - {0xD, 0xAB, 0x5}, - {0x25, 0xAB, 0x7}, - {0x3D, 0xAB, 0x9}, - {0x55, 0xAB, 0xB}, - {0x6D, 0xAB, 0xD}, - {0x85, 0xAB, 0xF}, - {0x9D, 0xAB, 0x11}, - {0xB5, 0xAB, 0x13}, - {0xE1, 0xAB, 0x15}, - {0x14, 0x9, 0x1D}, - {0x24, 0x9, 0x20}, - {0x34, 0x9, 0x21} + { 0xD, 0xAB, 0x5 }, + { 0x25, 0xAB, 0x7 }, + { 0x3D, 0xAB, 0x9 }, + { 0x55, 0xAB, 0xB }, + { 0x6D, 0xAB, 0xD }, + { 0x85, 0xAB, 0xF }, + { 0x9D, 0xAB, 0x11 }, + { 0xB5, 0xAB, 0x13 }, + { 0xE1, 0xAB, 0x15 }, + { 0x14, 0x9, 0x1D }, + { 0x24, 0x9, 0x20 }, + { 0x34, 0x9, 0x21 } }; -static void ov58_021D16D8 (UnkStruct_02095EAC * param0) +static void ov58_021D16D8(UnkStruct_02095EAC *param0) { int v0; @@ -734,7 +732,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov58_021D18AC (UnkStruct_02095EAC * param0, OverlayManager * param1) +static void ov58_021D18AC(UnkStruct_02095EAC *param0, OverlayManager *param1) { BGL_AddWindow(param0->unk_00, ¶m0->unk_33C, 0, 2, 1, 27, 4, 13, 1 + (18 + 12) + 9); BGL_FillWindow(¶m0->unk_33C, 0xf0f); @@ -760,7 +758,7 @@ static void ov58_021D18AC (UnkStruct_02095EAC * param0, OverlayManager * param1) } } -static void ov58_021D19D4 (UnkStruct_02095EAC * param0) +static void ov58_021D19D4(UnkStruct_02095EAC *param0) { int v0; @@ -773,7 +771,7 @@ static void ov58_021D19D4 (UnkStruct_02095EAC * param0) BGL_DeleteWindow(¶m0->unk_33C); } -static void ov58_021D1A10 (GraphicElementData * param0, int param1, int param2) +static void ov58_021D1A10(GraphicElementData *param0, int param1, int param2) { VecFx32 v0; @@ -785,32 +783,32 @@ static void ov58_021D1A10 (GraphicElementData * param0, int param1, int param2) } static const TouchScreenRect Unk_ov58_021D2EB8[] = { - {0x96, 0xBD, 0x0, 0x17}, - {0x96, 0xBD, 0x18, 0x2F}, - {0x96, 0xBD, 0x30, 0x47}, - {0x96, 0xBD, 0x48, 0x5F}, - {0x96, 0xBD, 0x60, 0x77}, - {0x96, 0xBD, 0x78, 0x8F}, - {0x96, 0xBD, 0x90, 0xA7}, - {0x96, 0xBD, 0xA8, 0xBF}, - {0x96, 0xBD, 0xC0, 0xFF}, - {0x1, 0xD, 0xE, 0x1A}, - {0x1, 0xD, 0x1E, 0x2A}, - {0x1, 0xD, 0x2E, 0x3A}, - {0xFF, 0x0, 0x0, 0x0} + { 0x96, 0xBD, 0x0, 0x17 }, + { 0x96, 0xBD, 0x18, 0x2F }, + { 0x96, 0xBD, 0x30, 0x47 }, + { 0x96, 0xBD, 0x48, 0x5F }, + { 0x96, 0xBD, 0x60, 0x77 }, + { 0x96, 0xBD, 0x78, 0x8F }, + { 0x96, 0xBD, 0x90, 0xA7 }, + { 0x96, 0xBD, 0xA8, 0xBF }, + { 0x96, 0xBD, 0xC0, 0xFF }, + { 0x1, 0xD, 0xE, 0x1A }, + { 0x1, 0xD, 0x1E, 0x2A }, + { 0x1, 0xD, 0x2E, 0x3A }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov58_021D2DD4[] = { - {0x30, 0x70, 0xC8, 0xF8}, - {0xFF, 0x0, 0x0, 0x0} + { 0x30, 0x70, 0xC8, 0xF8 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov58_021D2DDC[] = { - {0x10, 0x88, 0x8, 0xF8}, - {0xFF, 0x0, 0x0, 0x0} + { 0x10, 0x88, 0x8, 0xF8 }, + { 0xFF, 0x0, 0x0, 0x0 } }; -static void ov58_021D1A80 (UnkStruct_02095EAC * param0) +static void ov58_021D1A80(UnkStruct_02095EAC *param0) { int v0 = -1, v1; int v2 = 0; @@ -863,8 +861,7 @@ static void ov58_021D1A80 (UnkStruct_02095EAC * param0) break; case 9: case 10: - case 11: - { + case 11: { int v3; for (v3 = 0; v3 < 3; v3++) { @@ -879,8 +876,7 @@ static void ov58_021D1A80 (UnkStruct_02095EAC * param0) param0->unk_43DB = 0 + v0 - 9; Sound_PlayEffect(1509); } - } - break; + } break; } } @@ -906,7 +902,7 @@ static void ov58_021D1A80 (UnkStruct_02095EAC * param0) } } -static void ov58_021D1CAC (GraphicElementData ** param0, int param1) +static void ov58_021D1CAC(GraphicElementData **param0, int param1) { int v0; @@ -919,7 +915,7 @@ static void ov58_021D1CAC (GraphicElementData ** param0, int param1) } } -static void ov58_021D1CDC (GraphicElementData ** param0, BOOL param1) +static void ov58_021D1CDC(GraphicElementData **param0, BOOL param1) { if (param1 == 1) { SpriteActor_SetSpriteAnimActive(param0[8], Unk_ov58_021D2EEC[8][2] + 1); @@ -928,7 +924,7 @@ static void ov58_021D1CDC (GraphicElementData ** param0, BOOL param1) } } -static int ov58_021D1CF4 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D1CF4(UnkStruct_02095EAC *param0, int param1) { ov58_021D1A80(param0); @@ -946,13 +942,13 @@ static int ov58_021D1CF4 (UnkStruct_02095EAC * param0, int param1) return param1; } -static void ov58_021D1D40 (UnkStruct_02095EAC * param0) +static void ov58_021D1D40(UnkStruct_02095EAC *param0) { ov58_021D2820(param0); ov58_021D2754(¶m0->unk_32C, param0->unk_43E6, param0->unk_4418, 0); } -static int ov58_021D1D64 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D1D64(UnkStruct_02095EAC *param0, int param1) { if (CommSys_CurNetId() == param0->unk_384) { ov58_021D2A98(param0, 13, 0); @@ -970,13 +966,13 @@ static int ov58_021D1D64 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D1DBC (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D1DBC(UnkStruct_02095EAC *param0, int param1) { ov58_021D1D40(param0); return param1; } -static int ov58_021D1DC8 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D1DC8(UnkStruct_02095EAC *param0, int param1) { G2_BlendNone(); @@ -989,7 +985,7 @@ static int ov58_021D1DC8 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D1DFC (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D1DFC(UnkStruct_02095EAC *param0, int param1) { if (ov58_021D2B0C(param0->unk_30)) { UnkStruct_02015958 v0; @@ -1012,7 +1008,7 @@ static int ov58_021D1DFC (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D1E4C (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D1E4C(UnkStruct_02095EAC *param0, int param1) { int v0; @@ -1083,7 +1079,7 @@ static int ov58_021D1E4C (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D1FB0 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D1FB0(UnkStruct_02095EAC *param0, int param1) { param0->unk_43DC.unk_08_3 = 0; param0->unk_941E = 0; @@ -1093,7 +1089,7 @@ static int ov58_021D1FB0 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D1FD4 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D1FD4(UnkStruct_02095EAC *param0, int param1) { param0->unk_43DC.unk_08_3 = 0; @@ -1126,7 +1122,7 @@ static int ov58_021D1FD4 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D206C (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D206C(UnkStruct_02095EAC *param0, int param1) { param0->unk_43DC.unk_08_3 = 0; param0->unk_9420 = 0; @@ -1138,7 +1134,7 @@ static int ov58_021D206C (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D20A8 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D20A8(UnkStruct_02095EAC *param0, int param1) { u8 v0; @@ -1149,7 +1145,7 @@ static int ov58_021D20A8 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D20C8 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D20C8(UnkStruct_02095EAC *param0, int param1) { if (ov58_021D2B0C(param0->unk_30)) { param0->unk_374 = 0; @@ -1161,7 +1157,7 @@ static int ov58_021D20C8 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D20F4 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D20F4(UnkStruct_02095EAC *param0, int param1) { if (++param0->unk_374 > 60) { sub_0200F174(0, 16, 16, 0x0, 16, 1, 39); @@ -1172,7 +1168,7 @@ static int ov58_021D20F4 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D2130 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D2130(UnkStruct_02095EAC *param0, int param1) { if (ov58_021D2B0C(param0->unk_30)) { UnkStruct_02015958 v0; @@ -1195,7 +1191,7 @@ static int ov58_021D2130 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D2180 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D2180(UnkStruct_02095EAC *param0, int param1) { int v0 = sub_020159FC(param0->unk_9454); @@ -1229,7 +1225,7 @@ static int ov58_021D2180 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D223C (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D223C(UnkStruct_02095EAC *param0, int param1) { StringTemplate_SetPlayerName(param0->unk_0C, 0, CommInfo_TrainerInfo(0)); @@ -1240,7 +1236,7 @@ static int ov58_021D223C (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D2270 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D2270(UnkStruct_02095EAC *param0, int param1) { if (ov58_021D2B0C(param0->unk_30)) { ov58_021D2CB0(param0, 17); @@ -1251,7 +1247,7 @@ static int ov58_021D2270 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D2298 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D2298(UnkStruct_02095EAC *param0, int param1) { if (CommTiming_IsSyncState(200) || (CommSys_ConnectedCount() == 1)) { sub_0200F174(0, 16, 16, 0x0, 16, 1, 39); @@ -1262,12 +1258,12 @@ static int ov58_021D2298 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D22D8 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D22D8(UnkStruct_02095EAC *param0, int param1) { return param1; } -static int ov58_021D22DC (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D22DC(UnkStruct_02095EAC *param0, int param1) { ov58_021D2A98(param0, 5, 1); ov58_021D2CB0(param0, 20); @@ -1276,7 +1272,7 @@ static int ov58_021D22DC (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D22FC (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D22FC(UnkStruct_02095EAC *param0, int param1) { if (ov58_021D2B0C(param0->unk_30)) { ov58_021D2CB0(param0, 12); @@ -1286,7 +1282,7 @@ static int ov58_021D22FC (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D2320 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D2320(UnkStruct_02095EAC *param0, int param1) { if ((param0->unk_30 != 0xff) && (ov58_021D2B0C(param0->unk_30) == 0)) { PrintString_ForceStop(param0->unk_30); @@ -1306,7 +1302,7 @@ static int ov58_021D2320 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D2380 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D2380(UnkStruct_02095EAC *param0, int param1) { if ((param0->unk_9414 != 0) && (CommSys_ConnectedCount() != param0->unk_9414)) { param0->unk_9414 = 0; @@ -1321,7 +1317,7 @@ static int ov58_021D2380 (UnkStruct_02095EAC * param0, int param1) return param1; } -static int ov58_021D23C8 (UnkStruct_02095EAC * param0, int param1) +static int ov58_021D23C8(UnkStruct_02095EAC *param0, int param1) { if ((param0->unk_9414 != 0) && (CommSys_ConnectedCount() != param0->unk_9414)) { param0->unk_9414 = 0; @@ -1341,7 +1337,7 @@ static int ov58_021D23C8 (UnkStruct_02095EAC * param0, int param1) return param1; } -void ov58_021D2434 (UnkStruct_02095EAC * param0, int param1, u8 param2) +void ov58_021D2434(UnkStruct_02095EAC *param0, int param1, u8 param2) { switch (param1) { case 1: @@ -1397,38 +1393,38 @@ void ov58_021D2434 (UnkStruct_02095EAC * param0, int param1, u8 param2) static const u8 Unk_ov58_021D2F34[3][8][24] = { { - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x11, 0x0, 0x0, 0x0, 0x11, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x22, 0x0, 0x0, 0x0, 0x22, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x33, 0x0, 0x0, 0x0, 0x33, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x44, 0x0, 0x0, 0x0, 0x44, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x55, 0x0, 0x0, 0x0, 0x55, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x77, 0x0, 0x0, 0x0, 0x77, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x11, 0x0, 0x0, 0x0, 0x11, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x22, 0x0, 0x0, 0x0, 0x22, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x33, 0x0, 0x0, 0x0, 0x33, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x44, 0x0, 0x0, 0x0, 0x44, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x55, 0x0, 0x0, 0x0, 0x55, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x77, 0x0, 0x0, 0x0, 0x77, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, }, { - {0x0, 0x0, 0x0, 0x0, 0x0, 0x11, 0x0, 0x0, 0x10, 0x11, 0x1, 0x0, 0x10, 0x11, 0x1, 0x0, 0x0, 0x11, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x22, 0x0, 0x0, 0x20, 0x22, 0x2, 0x0, 0x20, 0x22, 0x2, 0x0, 0x0, 0x22, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x33, 0x0, 0x0, 0x30, 0x33, 0x3, 0x0, 0x30, 0x33, 0x3, 0x0, 0x0, 0x33, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x44, 0x0, 0x0, 0x40, 0x44, 0x4, 0x0, 0x40, 0x44, 0x4, 0x0, 0x0, 0x44, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x55, 0x0, 0x0, 0x50, 0x55, 0x5, 0x0, 0x50, 0x55, 0x5, 0x0, 0x0, 0x55, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x60, 0x66, 0x6, 0x0, 0x60, 0x66, 0x6, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x77, 0x0, 0x0, 0x70, 0x77, 0x7, 0x0, 0x70, 0x77, 0x7, 0x0, 0x0, 0x77, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x80, 0x88, 0x8, 0x0, 0x80, 0x88, 0x8, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x11, 0x0, 0x0, 0x10, 0x11, 0x1, 0x0, 0x10, 0x11, 0x1, 0x0, 0x0, 0x11, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x22, 0x0, 0x0, 0x20, 0x22, 0x2, 0x0, 0x20, 0x22, 0x2, 0x0, 0x0, 0x22, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x33, 0x0, 0x0, 0x30, 0x33, 0x3, 0x0, 0x30, 0x33, 0x3, 0x0, 0x0, 0x33, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x44, 0x0, 0x0, 0x40, 0x44, 0x4, 0x0, 0x40, 0x44, 0x4, 0x0, 0x0, 0x44, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x55, 0x0, 0x0, 0x50, 0x55, 0x5, 0x0, 0x50, 0x55, 0x5, 0x0, 0x0, 0x55, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x60, 0x66, 0x6, 0x0, 0x60, 0x66, 0x6, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x77, 0x0, 0x0, 0x70, 0x77, 0x7, 0x0, 0x70, 0x77, 0x7, 0x0, 0x0, 0x77, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x80, 0x88, 0x8, 0x0, 0x80, 0x88, 0x8, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, }, { - {0x10, 0x11, 0x1, 0x0, 0x11, 0x11, 0x11, 0x0, 0x11, 0x11, 0x11, 0x0, 0x11, 0x11, 0x11, 0x0, 0x11, 0x11, 0x11, 0x0, 0x10, 0x11, 0x1, 0x0}, - {0x20, 0x22, 0x2, 0x0, 0x22, 0x22, 0x22, 0x0, 0x22, 0x22, 0x22, 0x0, 0x22, 0x22, 0x22, 0x0, 0x22, 0x22, 0x22, 0x0, 0x20, 0x22, 0x2, 0x0}, - {0x30, 0x33, 0x3, 0x0, 0x33, 0x33, 0x33, 0x0, 0x33, 0x33, 0x33, 0x0, 0x33, 0x33, 0x33, 0x0, 0x33, 0x33, 0x33, 0x0, 0x30, 0x33, 0x3, 0x0}, - {0x40, 0x44, 0x4, 0x0, 0x44, 0x44, 0x44, 0x0, 0x44, 0x44, 0x44, 0x0, 0x44, 0x44, 0x44, 0x0, 0x44, 0x44, 0x44, 0x0, 0x40, 0x44, 0x4, 0x0}, - {0x50, 0x55, 0x5, 0x0, 0x55, 0x55, 0x55, 0x0, 0x55, 0x55, 0x55, 0x0, 0x55, 0x55, 0x55, 0x0, 0x55, 0x55, 0x55, 0x0, 0x50, 0x55, 0x5, 0x0}, - {0x60, 0x66, 0x6, 0x0, 0x66, 0x66, 0x66, 0x0, 0x66, 0x66, 0x66, 0x0, 0x66, 0x66, 0x66, 0x0, 0x66, 0x66, 0x66, 0x0, 0x60, 0x66, 0x6, 0x0}, - {0x70, 0x77, 0x7, 0x0, 0x77, 0x77, 0x77, 0x0, 0x77, 0x77, 0x77, 0x0, 0x77, 0x77, 0x77, 0x0, 0x77, 0x77, 0x77, 0x0, 0x70, 0x77, 0x7, 0x0}, - {0x80, 0x88, 0x8, 0x0, 0x88, 0x88, 0x88, 0x0, 0x88, 0x88, 0x88, 0x0, 0x88, 0x88, 0x88, 0x0, 0x88, 0x88, 0x88, 0x0, 0x80, 0x88, 0x8, 0x0} - } + { 0x10, 0x11, 0x1, 0x0, 0x11, 0x11, 0x11, 0x0, 0x11, 0x11, 0x11, 0x0, 0x11, 0x11, 0x11, 0x0, 0x11, 0x11, 0x11, 0x0, 0x10, 0x11, 0x1, 0x0 }, + { 0x20, 0x22, 0x2, 0x0, 0x22, 0x22, 0x22, 0x0, 0x22, 0x22, 0x22, 0x0, 0x22, 0x22, 0x22, 0x0, 0x22, 0x22, 0x22, 0x0, 0x20, 0x22, 0x2, 0x0 }, + { 0x30, 0x33, 0x3, 0x0, 0x33, 0x33, 0x33, 0x0, 0x33, 0x33, 0x33, 0x0, 0x33, 0x33, 0x33, 0x0, 0x33, 0x33, 0x33, 0x0, 0x30, 0x33, 0x3, 0x0 }, + { 0x40, 0x44, 0x4, 0x0, 0x44, 0x44, 0x44, 0x0, 0x44, 0x44, 0x44, 0x0, 0x44, 0x44, 0x44, 0x0, 0x44, 0x44, 0x44, 0x0, 0x40, 0x44, 0x4, 0x0 }, + { 0x50, 0x55, 0x5, 0x0, 0x55, 0x55, 0x55, 0x0, 0x55, 0x55, 0x55, 0x0, 0x55, 0x55, 0x55, 0x0, 0x55, 0x55, 0x55, 0x0, 0x50, 0x55, 0x5, 0x0 }, + { 0x60, 0x66, 0x6, 0x0, 0x66, 0x66, 0x66, 0x0, 0x66, 0x66, 0x66, 0x0, 0x66, 0x66, 0x66, 0x0, 0x66, 0x66, 0x66, 0x0, 0x60, 0x66, 0x6, 0x0 }, + { 0x70, 0x77, 0x7, 0x0, 0x77, 0x77, 0x77, 0x0, 0x77, 0x77, 0x77, 0x0, 0x77, 0x77, 0x77, 0x0, 0x77, 0x77, 0x77, 0x0, 0x70, 0x77, 0x7, 0x0 }, + { 0x80, 0x88, 0x8, 0x0, 0x88, 0x88, 0x88, 0x0, 0x88, 0x88, 0x88, 0x0, 0x88, 0x88, 0x88, 0x0, 0x88, 0x88, 0x88, 0x0, 0x80, 0x88, 0x8, 0x0 }, + }, }; -static void ov58_021D2528 (Window * param0, void * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) +static void ov58_021D2528(Window *param0, void *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) { if (param6 < 0) { int v0; @@ -1463,7 +1459,7 @@ static void ov58_021D2528 (Window * param0, void * param1, int param2, int param sub_0201ADDC(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9); } -static void ov58_021D25A8 (Window * param0, const u8 * param1, int param2, int param3, int * param4, int * param5, int param6, int param7) +static void ov58_021D25A8(Window *param0, const u8 *param1, int param2, int param3, int *param4, int *param5, int param6, int param7) { int v0, v1, v2, v3; int v4 = *param4; @@ -1472,16 +1468,21 @@ static void ov58_021D25A8 (Window * param0, const u8 * param1, int param2, int p int v7 = param3; if ((param6 == 0) && (param7 == 0)) { - *param4 = param2; *param5 = param3; + *param4 = param2; + *param5 = param3; return; } - v0 = MATH_IAbs(v6 - v4); v1 = MATH_IAbs(v7 - v5); + v0 = MATH_IAbs(v6 - v4); + v1 = MATH_IAbs(v7 - v5); if (v0 > v1) { if (v4 > v6) { v3 = (v5 > v7) ? 1 : -1; - v2 = v4; v4 = v6; v6 = v2; v5 = v7; + v2 = v4; + v4 = v6; + v6 = v2; + v5 = v7; } else { v3 = (v5 < v7) ? 1 : -1; } @@ -1491,7 +1492,8 @@ static void ov58_021D25A8 (Window * param0, const u8 * param1, int param2, int p while (++v4 <= v6) { if ((v2 -= v1) < 0) { - v2 += v0; v5 += v3; + v2 += v0; + v5 += v3; } ov58_021D2528(param0, (void *)param1, 0, 0, 6, 6, v4, v5, 6, 6); @@ -1499,7 +1501,10 @@ static void ov58_021D25A8 (Window * param0, const u8 * param1, int param2, int p } else { if (v5 > v7) { v3 = (v4 > v6) ? 1 : -1; - v2 = v5; v5 = v7; v7 = v2; v4 = v6; + v2 = v5; + v5 = v7; + v7 = v2; + v4 = v6; } else { v3 = (v4 < v6) ? 1 : -1; } @@ -1509,7 +1514,8 @@ static void ov58_021D25A8 (Window * param0, const u8 * param1, int param2, int p while (++v5 <= v7) { if ((v2 -= v0) < 0) { - v2 += v1; v4 += v3; + v2 += v1; + v4 += v3; } ov58_021D2528(param0, (void *)param1, 0, 0, 6, 6, v4, v5, 6, 6); @@ -1520,7 +1526,7 @@ static void ov58_021D25A8 (Window * param0, const u8 * param1, int param2, int p *param5 = param3; } -static void ov58_021D2720 (UnkStruct_ov58_021D2820 * param0, UnkStruct_ov58_021D2754 * param1) +static void ov58_021D2720(UnkStruct_ov58_021D2820 *param0, UnkStruct_ov58_021D2754 *param1) { int v0; @@ -1534,7 +1540,7 @@ static void ov58_021D2720 (UnkStruct_ov58_021D2820 * param0, UnkStruct_ov58_021D } } -static void ov58_021D2754 (Window * param0, UnkStruct_ov58_021D2820 * param1, UnkStruct_ov58_021D2754 * param2, int param3) +static void ov58_021D2754(Window *param0, UnkStruct_ov58_021D2820 *param1, UnkStruct_ov58_021D2754 *param2, int param3) { int v0, v1, v2, v3, v4 = 0, v5, v6; u32 v7; @@ -1568,10 +1574,10 @@ static void ov58_021D2754 (Window * param0, UnkStruct_ov58_021D2820 * param1, Un } } -static void ov58_021D2820 (UnkStruct_02095EAC * param0) +static void ov58_021D2820(UnkStruct_02095EAC *param0) { int v0; - UnkStruct_ov58_021D2820 * v1 = param0->unk_43E6; + UnkStruct_ov58_021D2820 *v1 = param0->unk_43E6; for (v0 = 0; v0 < 5; v0++) { if (v0 != CommSys_CurNetId()) { @@ -1585,7 +1591,7 @@ static void ov58_021D2820 (UnkStruct_02095EAC * param0) } } -static void ov58_021D2888 (u16 * param0) +static void ov58_021D2888(u16 *param0) { fx32 v0; GXRgb v1; @@ -1604,10 +1610,10 @@ static void ov58_021D2888 (u16 * param0) GX_LoadOBJPltt((u16 *)&v1, 12 * 2, 2); } -static int ov58_021D28C8 (void) +static int ov58_021D28C8(void) { int v0, v1; - TrainerInfo * v2; + TrainerInfo *v2; v1 = 0; @@ -1622,7 +1628,7 @@ static int ov58_021D28C8 (void) return v1; } -static void ov58_021D28E4 (Window * param0, int param1, u32 param2, UnkStruct_02095EAC * param3) +static void ov58_021D28E4(Window *param0, int param1, u32 param2, UnkStruct_02095EAC *param3) { int v0, v1 = CommSys_CurNetId(); int v2; @@ -1658,7 +1664,7 @@ static void ov58_021D28E4 (Window * param0, int param1, u32 param2, UnkStruct_02 } } -static void ov58_021D29C8 (UnkStruct_02095EAC * param0) +static void ov58_021D29C8(UnkStruct_02095EAC *param0) { if (CommSys_CurNetId() == 0) { if (sub_02036284()) { @@ -1673,7 +1679,7 @@ static void ov58_021D29C8 (UnkStruct_02095EAC * param0) } } -static int ov58_021D2A30 (void) +static int ov58_021D2A30(void) { int i, v0; @@ -1686,12 +1692,12 @@ static int ov58_021D2A30 (void) return v0; } -int ov58_021D2A4C (void) +int ov58_021D2A4C(void) { return ov58_021D2A30(); } -static int ov58_021D2A54 (UnkStruct_02095EAC * param0) +static int ov58_021D2A54(UnkStruct_02095EAC *param0) { int v0, v1 = 0; @@ -1709,9 +1715,9 @@ static int ov58_021D2A54 (UnkStruct_02095EAC * param0) return v1; } -static void ov58_021D2A98 (UnkStruct_02095EAC * param0, int param1, int param2) +static void ov58_021D2A98(UnkStruct_02095EAC *param0, int param1, int param2) { - Strbuf* v0; + Strbuf *v0; v0 = Strbuf_Init((40 * 2), 39); @@ -1733,7 +1739,7 @@ static void ov58_021D2A98 (UnkStruct_02095EAC * param0, int param1, int param2) } } -static int ov58_021D2B0C (int param0) +static int ov58_021D2B0C(int param0) { if (param0 == 0xff) { return 1; @@ -1746,12 +1752,12 @@ static int ov58_021D2B0C (int param0) return 0; } -static void ov58_021D2B2C (UnkStruct_02095EAC * param0) +static void ov58_021D2B2C(UnkStruct_02095EAC *param0) { sub_0200E084(¶m0->unk_33C, 0); } -static void ov58_021D2B3C (UnkStruct_02095EAC * param0, int param1) +static void ov58_021D2B3C(UnkStruct_02095EAC *param0, int param1) { if (CommSys_CurNetId() == 0) { int v0 = CommSys_ConnectedCount() + param1; @@ -1764,7 +1770,7 @@ static void ov58_021D2B3C (UnkStruct_02095EAC * param0, int param1) } } -static int ov58_021D2B5C (UnkStruct_02095EAC * param0) +static int ov58_021D2B5C(UnkStruct_02095EAC *param0) { int v0; @@ -1833,12 +1839,12 @@ static int ov58_021D2B5C (UnkStruct_02095EAC * param0) return 1; } -static void ov58_021D2CB0 (UnkStruct_02095EAC * param0, int param1) +static void ov58_021D2CB0(UnkStruct_02095EAC *param0, int param1) { param0->unk_36C = param1; } -static void ov58_021D2CB8 (UnkStruct_02095EAC * param0, int param1) +static void ov58_021D2CB8(UnkStruct_02095EAC *param0, int param1) { if (param0->unk_368 != param0->unk_36C) { if (param1 != 2) { @@ -1851,7 +1857,7 @@ static void ov58_021D2CB8 (UnkStruct_02095EAC * param0, int param1) } } -static BOOL ov58_021D2CEC (UnkStruct_02095EAC * param0, UnkStruct_02015958 * param1) +static BOOL ov58_021D2CEC(UnkStruct_02095EAC *param0, UnkStruct_02015958 *param1) { if (!param0->unk_945C) { sub_02015958(param0->unk_9454, param1); @@ -1862,7 +1868,7 @@ static BOOL ov58_021D2CEC (UnkStruct_02095EAC * param0, UnkStruct_02015958 * par } } -static void ov58_021D2D10 (UnkStruct_02095EAC * param0) +static void ov58_021D2D10(UnkStruct_02095EAC *param0) { if (param0->unk_945C) { sub_02015A54(param0->unk_9454); @@ -1870,7 +1876,7 @@ static void ov58_021D2D10 (UnkStruct_02095EAC * param0) } } -static int ov58_021D2D30 (UnkStruct_02095EAC * param0) +static int ov58_021D2D30(UnkStruct_02095EAC *param0) { int v0 = sub_02022664(Unk_ov58_021D2DD4); @@ -1881,7 +1887,7 @@ static int ov58_021D2D30 (UnkStruct_02095EAC * param0) return 0; } -static void ov58_021D2D4C (UnkStruct_ov58_021D2820 * param0, UnkStruct_ov72_0223E2A8 * param1, int param2, int param3) +static void ov58_021D2D4C(UnkStruct_ov58_021D2820 *param0, UnkStruct_ov72_0223E2A8 *param1, int param2, int param3) { int v0, v1; diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index 2b7d29de2e..b349f67bc5 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -1,62 +1,62 @@ +#include "overlay059/ov59_021D0D80.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_020961E8_decl.h" - #include "struct_defs/struct_0203DE34.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020961E8_t.h" #include "struct_defs/struct_02096274.h" #include "struct_defs/struct_02099F80.h" + #include "overlay022/struct_ov22_022559F8.h" +#include "overlay059/ov59_021D2F88.h" #include "overlay059/struct_ov59_021D109C.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "journal.h" +#include "message.h" +#include "message_util.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" -#include "journal.h" #include "unk_0202CD50.h" #include "unk_02030EE0.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_02038ED4.h" @@ -65,75 +65,73 @@ #include "unk_0205C22C.h" #include "unk_0205C980.h" #include "unk_020961E8.h" -#include "overlay059/ov59_021D0D80.h" -#include "overlay059/ov59_021D2F88.h" -static void ov59_021D1100(void * param0); +static void ov59_021D1100(void *param0); static void ov59_021D1128(void); -static void ov59_021D1148(BGL * param0); -static void ov59_021D1250(UnkStruct_020961E8 * param0, NARC * param1); -static void ov59_021D131C(UnkStruct_020961E8 * param0); -static void ov59_021D1354(BGL * param0); -static void ov59_021D1388(UnkStruct_020961E8 * param0, NARC * param1); +static void ov59_021D1148(BGL *param0); +static void ov59_021D1250(UnkStruct_020961E8 *param0, NARC *param1); +static void ov59_021D131C(UnkStruct_020961E8 *param0); +static void ov59_021D1354(BGL *param0); +static void ov59_021D1388(UnkStruct_020961E8 *param0, NARC *param1); static void ov59_021D1474(void); -static void ov59_021D14A4(UnkStruct_020961E8 * param0, NARC * param1); -static void ov59_021D1598(UnkStruct_020961E8 * param0); -static void ov59_021D16A0(UnkStruct_020961E8 * param0, OverlayManager * param1); -static void ov59_021D17C8(UnkStruct_020961E8 * param0); -static void ov59_021D1994(UnkStruct_020961E8 * param0); -static void ov59_021D23B0(u16 * param0); -static BOOL ov59_021D2418(Window * param0, int param1, u32 param2, UnkStruct_020961E8 * param3); -static BOOL ov59_021D254C(UnkStruct_020961E8 * param0); -static void ov59_021D2628(UnkStruct_020961E8 * param0, int param1, int param2); +static void ov59_021D14A4(UnkStruct_020961E8 *param0, NARC *param1); +static void ov59_021D1598(UnkStruct_020961E8 *param0); +static void ov59_021D16A0(UnkStruct_020961E8 *param0, OverlayManager *param1); +static void ov59_021D17C8(UnkStruct_020961E8 *param0); +static void ov59_021D1994(UnkStruct_020961E8 *param0); +static void ov59_021D23B0(u16 *param0); +static BOOL ov59_021D2418(Window *param0, int param1, u32 param2, UnkStruct_020961E8 *param3); +static BOOL ov59_021D254C(UnkStruct_020961E8 *param0); +static void ov59_021D2628(UnkStruct_020961E8 *param0, int param1, int param2); static int ov59_021D26B8(int param0); -static void ov59_021D26D8(UnkStruct_020961E8 * param0); +static void ov59_021D26D8(UnkStruct_020961E8 *param0); static int ov59_021D23FC(void); static int ov59_021D2528(void); -static void ov59_021D2524(UnkStruct_020961E8 * param0); -static void ov59_021D1784(Window * param0, Strbuf *param1, int param2); -static void ov59_021D19B0(UnkStruct_020961E8 * param0, int param1); -static void ov59_021D26E8(UnkStruct_020961E8 * param0); -static void ov59_021D27FC(UnkStruct_020961E8 * param0, NARC * param1); -static void ov59_021D28A4(UnkStruct_020961E8 * param0); -static void ov59_021D2860(NNSG2dCharacterData * param0[2], NNSG2dPaletteData * param1[2], int param2, int param3, int param4); -static void ov59_021D109C(SysTask * param0, void * param1); -static int ov59_021D28D4(UnkStruct_020961E8 * param0); -static void ov59_021D28D8(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D292C(UnkStruct_020961E8 * param0, int param1); -static void ov59_021D1864(UnkStruct_020961E8 * param0); -static int ov59_021D17F8(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1838(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1D14(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1D70(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1DA0(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1C64(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1C34(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1A14(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1A44(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1B74(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1B8C(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1C14(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1E98(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1EB8(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1EF4(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1F24(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1FD0(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D2044(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D2064(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D20A4(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D20D0(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D19C0(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D20F4(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D2190(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D2154(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1998(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D19E4(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1DC8(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1E0C(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D1E7C(UnkStruct_020961E8 * param0, int param1); -static int ov59_021D2020(UnkStruct_020961E8 * param0, int param1); - -static int (* Unk_ov59_021D3480[])(UnkStruct_020961E8 *, int) = { +static void ov59_021D2524(UnkStruct_020961E8 *param0); +static void ov59_021D1784(Window *param0, Strbuf *param1, int param2); +static void ov59_021D19B0(UnkStruct_020961E8 *param0, int param1); +static void ov59_021D26E8(UnkStruct_020961E8 *param0); +static void ov59_021D27FC(UnkStruct_020961E8 *param0, NARC *param1); +static void ov59_021D28A4(UnkStruct_020961E8 *param0); +static void ov59_021D2860(NNSG2dCharacterData *param0[2], NNSG2dPaletteData *param1[2], int param2, int param3, int param4); +static void ov59_021D109C(SysTask *param0, void *param1); +static int ov59_021D28D4(UnkStruct_020961E8 *param0); +static void ov59_021D28D8(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D292C(UnkStruct_020961E8 *param0, int param1); +static void ov59_021D1864(UnkStruct_020961E8 *param0); +static int ov59_021D17F8(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1838(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1D14(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1D70(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1DA0(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1C64(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1C34(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1A14(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1A44(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1B74(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1B8C(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1C14(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1E98(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1EB8(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1EF4(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1F24(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1FD0(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D2044(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D2064(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D20A4(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D20D0(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D19C0(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D20F4(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D2190(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D2154(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1998(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D19E4(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1DC8(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1E0C(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D1E7C(UnkStruct_020961E8 *param0, int param1); +static int ov59_021D2020(UnkStruct_020961E8 *param0, int param1); + +static int (*Unk_ov59_021D3480[])(UnkStruct_020961E8 *, int) = { ov59_021D17F8, ov59_021D1998, ov59_021D19E4, @@ -167,10 +165,10 @@ static int (* Unk_ov59_021D3480[])(UnkStruct_020961E8 *, int) = { ov59_021D19C0, }; -int ov59_021D0D80 (OverlayManager * param0, int * param1) +int ov59_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_020961E8 * v0; - NARC * v1; + UnkStruct_020961E8 *v0; + NARC *v1; switch (*param1) { case 0: @@ -240,9 +238,9 @@ int ov59_021D0D80 (OverlayManager * param0, int * param1) return 0; } -int ov59_021D0F00 (OverlayManager * param0, int * param1) +int ov59_021D0F00(OverlayManager *param0, int *param1) { - UnkStruct_020961E8 * v0 = OverlayManager_Data(param0); + UnkStruct_020961E8 *v0 = OverlayManager_Data(param0); if ((CommSys_CurNetId() == 0) && (v0->unk_4AB4 != 0)) { v0->unk_4AB4 &= sub_020318EC(); @@ -296,9 +294,9 @@ int ov59_021D0F00 (OverlayManager * param0, int * param1) return 0; } -int ov59_021D0FF4 (OverlayManager * param0, int * param1) +int ov59_021D0FF4(OverlayManager *param0, int *param1) { - UnkStruct_020961E8 * v0 = OverlayManager_Data(param0); + UnkStruct_020961E8 *v0 = OverlayManager_Data(param0); int v1; SysTask_Done(v0->unk_20); @@ -336,21 +334,21 @@ int ov59_021D0FF4 (OverlayManager * param0, int * param1) } static const u8 Unk_ov59_021D329A[][2] = { - {0x8, 0x2}, - {0x8, 0x3}, - {0x8, 0x4}, - {0x18, 0x0}, - {0x0, 0xFF} + { 0x8, 0x2 }, + { 0x8, 0x3 }, + { 0x8, 0x4 }, + { 0x18, 0x0 }, + { 0x0, 0xFF } }; -static void ov59_021D109C (SysTask * param0, void * param1) +static void ov59_021D109C(SysTask *param0, void *param1) { - UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param1; - UnkStruct_ov59_021D109C * v1 = &v0->unk_0C; + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param1; + UnkStruct_ov59_021D109C *v1 = &v0->unk_0C; if (v1->unk_00) { if (v1->unk_08 > Unk_ov59_021D329A[v1->unk_04][0]) { - u16 * v2; + u16 *v2; v1->unk_08 = 0; v1->unk_04++; @@ -369,7 +367,7 @@ static void ov59_021D109C (SysTask * param0, void * param1) } } -static void ov59_021D1100 (void * param0) +static void ov59_021D1100(void *param0) { sub_0201DCAC(); sub_0200A858(); @@ -378,7 +376,7 @@ static void ov59_021D1100 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov59_021D1128 (void) +static void ov59_021D1128(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -396,7 +394,7 @@ static void ov59_021D1128 (void) GXLayers_SetBanks(&v0); } -static void ov59_021D1148 (BGL * param0) +static void ov59_021D1148(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -516,7 +514,7 @@ static void ov59_021D1148 (BGL * param0) sub_02019690(4, 32, 0, 51); } -static void ov59_021D1250 (UnkStruct_020961E8 * param0, NARC * param1) +static void ov59_021D1250(UnkStruct_020961E8 *param0, NARC *param1) { int v0; @@ -546,7 +544,7 @@ static void ov59_021D1250 (UnkStruct_020961E8 * param0, NARC * param1) param0->unk_4AAC = 2; } -static void ov59_021D131C (UnkStruct_020961E8 * param0) +static void ov59_021D131C(UnkStruct_020961E8 *param0) { int v0; @@ -563,7 +561,7 @@ static void ov59_021D131C (UnkStruct_020961E8 * param0) Strbuf_Free(param0->unk_44); } -static void ov59_021D1354 (BGL * param0) +static void ov59_021D1354(BGL *param0) { sub_02019044(param0, 6); sub_02019044(param0, 5); @@ -573,9 +571,9 @@ static void ov59_021D1354 (BGL * param0) Heap_FreeToHeap(param0); } -static void ov59_021D1388 (UnkStruct_020961E8 * param0, NARC * param1) +static void ov59_021D1388(UnkStruct_020961E8 *param0, NARC *param1) { - BGL * v0 = param0->unk_00; + BGL *v0 = param0->unk_00; sub_02007130(param1, 0, 0, 0, 16 * 16 * 2, 51); sub_02006E84(12, 12, 4, 0, 16 * 2, 51); @@ -589,7 +587,7 @@ static void ov59_021D1388 (UnkStruct_020961E8 * param0, NARC * param1) sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 51); } -static void ov59_021D1474 (void) +static void ov59_021D1474(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -604,7 +602,7 @@ static void ov59_021D1474 (void) sub_0201F8E4(); } -static void ov59_021D14A4 (UnkStruct_020961E8 * param0, NARC * param1) +static void ov59_021D14A4(UnkStruct_020961E8 *param0, NARC *param1) { int v0; @@ -629,15 +627,15 @@ static void ov59_021D14A4 (UnkStruct_020961E8 * param0, NARC * param1) } static const u16 Unk_ov59_021D32C4[][2] = { - {0xCC, 0x54}, - {0xCC, 0x35}, - {0xE9, 0x48}, - {0xDF, 0x67}, - {0xB8, 0x67}, - {0xAE, 0x48} + { 0xCC, 0x54 }, + { 0xCC, 0x35 }, + { 0xE9, 0x48 }, + { 0xDF, 0x67 }, + { 0xB8, 0x67 }, + { 0xAE, 0x48 } }; -static void ov59_021D1598 (UnkStruct_020961E8 * param0) +static void ov59_021D1598(UnkStruct_020961E8 *param0) { int v0; @@ -685,7 +683,7 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov59_021D16A0 (UnkStruct_020961E8 * param0, OverlayManager * param1) +static void ov59_021D16A0(UnkStruct_020961E8 *param0, OverlayManager *param1) { BGL_AddWindow(param0->unk_00, ¶m0->unk_35C, 5, 26, 20, 6, 2, 13, 1 + 30 * 15); BGL_FillWindow(¶m0->unk_35C, 0x0); @@ -705,7 +703,7 @@ static void ov59_021D16A0 (UnkStruct_020961E8 * param0, OverlayManager * param1) } } -static void ov59_021D1784 (Window * param0, Strbuf *param1, int param2) +static void ov59_021D1784(Window *param0, Strbuf *param1, int param2) { int v0 = sub_02002D7C(1, param1, 0); int v1 = (26 * 8 - v0) / 2; @@ -714,7 +712,7 @@ static void ov59_021D1784 (Window * param0, Strbuf *param1, int param2) sub_0201D78C(param0, 1, param1, v1, 1, param2, (u32)(((1 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } -static void ov59_021D17C8 (UnkStruct_020961E8 * param0) +static void ov59_021D17C8(UnkStruct_020961E8 *param0) { int v0; @@ -724,7 +722,7 @@ static void ov59_021D17C8 (UnkStruct_020961E8 * param0) BGL_DeleteWindow(¶m0->unk_34C); } -static int ov59_021D17F8 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D17F8(UnkStruct_020961E8 *param0, int param1) { CommMan_SetErrorHandling(0, 1); @@ -741,7 +739,7 @@ static int ov59_021D17F8 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1838 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1838(UnkStruct_020961E8 *param0, int param1) { ov59_021D1864(param0); @@ -756,7 +754,7 @@ static int ov59_021D1838 (UnkStruct_020961E8 * param0, int param1) return param1; } -static void ov59_021D1864 (UnkStruct_020961E8 * param0) +static void ov59_021D1864(UnkStruct_020961E8 *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_A) { if (CommSys_CurNetId() == 0) { @@ -804,12 +802,12 @@ static void ov59_021D1864 (UnkStruct_020961E8 * param0) } } -static void ov59_021D1994 (UnkStruct_020961E8 * param0) +static void ov59_021D1994(UnkStruct_020961E8 *param0) { return; } -static int ov59_021D1998 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1998(UnkStruct_020961E8 *param0, int param1) { ov59_021D19B0(param0, 2); ov59_021D1994(param0); @@ -817,13 +815,13 @@ static int ov59_021D1998 (UnkStruct_020961E8 * param0, int param1) return param1; } -static void ov59_021D19B0 (UnkStruct_020961E8 * param0, int param1) +static void ov59_021D19B0(UnkStruct_020961E8 *param0, int param1) { param0->unk_3A8 = 30; param0->unk_3AC = param1; } -static int ov59_021D19C0 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D19C0(UnkStruct_020961E8 *param0, int param1) { if (ov59_021D26B8(param0->unk_4C)) { param0->unk_3A8 = param0->unk_3AC; @@ -834,7 +832,7 @@ static int ov59_021D19C0 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D19E4 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D19E4(UnkStruct_020961E8 *param0, int param1) { if (CommSys_CurNetId() == 0) { int v0 = 0; @@ -858,7 +856,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov59_021D3288 = { 0x178 }; -static int ov59_021D1A14 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1A14(UnkStruct_020961E8 *param0, int param1) { param0->unk_384 = sub_02002100(param0->unk_00, &Unk_ov59_021D3288, (1 + (18 + 12)), 11, 51); param0->unk_3A8 = 5; @@ -868,7 +866,7 @@ static int ov59_021D1A14 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1A44 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1A44(UnkStruct_020961E8 *param0, int param1) { int v0; u32 v1; @@ -938,7 +936,7 @@ static int ov59_021D1A44 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1B74 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1B74(UnkStruct_020961E8 *param0, int param1) { param0->unk_4AC2 = 0; ov59_021D1994(param0); @@ -946,7 +944,7 @@ static int ov59_021D1B74 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1B8C (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1B8C(UnkStruct_020961E8 *param0, int param1) { if ((param0->unk_4AC0 != CommSys_ConnectedCount()) || (param0->unk_4AC0 != ov59_021D2528())) { param0->unk_4AC2 = 0; @@ -975,7 +973,7 @@ static int ov59_021D1B8C (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1C14 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1C14(UnkStruct_020961E8 *param0, int param1) { param0->unk_4AB8 = 0; @@ -985,7 +983,7 @@ static int ov59_021D1C14 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1C34 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1C34(UnkStruct_020961E8 *param0, int param1) { param0->unk_384 = sub_02002100(param0->unk_00, &Unk_ov59_021D3288, (1 + (18 + 12)), 11, 51); param0->unk_3A8 = 23; @@ -995,7 +993,7 @@ static int ov59_021D1C34 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1C64 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1C64(UnkStruct_020961E8 *param0, int param1) { int v0; u32 v1; @@ -1035,7 +1033,7 @@ static int ov59_021D1C64 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1D14 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1D14(UnkStruct_020961E8 *param0, int param1) { if (param0->unk_4ABB == 0) { if (CommSys_SendData(115, NULL, 0) == 1) { @@ -1046,7 +1044,7 @@ static int ov59_021D1D14 (UnkStruct_020961E8 * param0, int param1) return param1; } -void ov59_021D1D40 (UnkStruct_020961E8 * param0) +void ov59_021D1D40(UnkStruct_020961E8 *param0) { MessageLoader_GetStrbuf(param0->unk_28, 18, param0->unk_48); ov59_021D1784(¶m0->unk_36C, param0->unk_48, 0); @@ -1055,7 +1053,7 @@ void ov59_021D1D40 (UnkStruct_020961E8 * param0) param0->unk_0C.unk_00 = 1; } -static int ov59_021D1D70 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1D70(UnkStruct_020961E8 *param0, int param1) { int v0, v1; @@ -1076,7 +1074,7 @@ static int ov59_021D1D70 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1DA0 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1DA0(UnkStruct_020961E8 *param0, int param1) { ov59_021D313C(param0->unk_4A9C, param0->unk_FD8); @@ -1085,9 +1083,9 @@ static int ov59_021D1DA0 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1DC8 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1DC8(UnkStruct_020961E8 *param0, int param1) { - void * v0; + void *v0; gCoreSys.inhibitReset = 1; v0 = sub_0202C1B4(51); @@ -1100,7 +1098,7 @@ static int ov59_021D1DC8 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1E0C (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1E0C(UnkStruct_020961E8 *param0, int param1) { if ((CommSys_CurNetId() == 0) && (CommSys_ConnectedCount() != param0->unk_4ABA)) { (void)0; @@ -1121,7 +1119,7 @@ static int ov59_021D1E0C (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1E7C (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1E7C(UnkStruct_020961E8 *param0, int param1) { if (param0->unk_3B4++ > 60) { param0->unk_3A8 = 15; @@ -1130,7 +1128,7 @@ static int ov59_021D1E7C (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1E98 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1E98(UnkStruct_020961E8 *param0, int param1) { u8 v0; @@ -1144,7 +1142,7 @@ static int ov59_021D1E98 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1EB8 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1EB8(UnkStruct_020961E8 *param0, int param1) { if (++param0->unk_3B4 > 60) { sub_0200F174(0, 16, 16, 0x0, 16, 1, 51); @@ -1155,7 +1153,7 @@ static int ov59_021D1EB8 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1EF4 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1EF4(UnkStruct_020961E8 *param0, int param1) { param0->unk_384 = sub_02002100(param0->unk_00, &Unk_ov59_021D3288, (1 + (18 + 12)), 11, 51); param0->unk_3A8 = 12; @@ -1165,7 +1163,7 @@ static int ov59_021D1EF4 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1F24 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1F24(UnkStruct_020961E8 *param0, int param1) { int v0; @@ -1201,7 +1199,7 @@ static int ov59_021D1F24 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D1FD0 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D1FD0(UnkStruct_020961E8 *param0, int param1) { if (CommSys_CurNetId() == 0) { ov59_021D2628(param0, 5, 0); @@ -1218,7 +1216,7 @@ static int ov59_021D1FD0 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D2020 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D2020(UnkStruct_020961E8 *param0, int param1) { param0->unk_3B4++; @@ -1230,7 +1228,7 @@ static int ov59_021D2020 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D2044 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D2044(UnkStruct_020961E8 *param0, int param1) { CommTiming_StartSync(201); param0->unk_3A8 = 16; @@ -1239,7 +1237,7 @@ static int ov59_021D2044 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D2064 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D2064(UnkStruct_020961E8 *param0, int param1) { if (CommTiming_IsSyncState(201)) { CommMan_SetErrorHandling(0, 0); @@ -1252,7 +1250,7 @@ static int ov59_021D2064 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D20A4 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D20A4(UnkStruct_020961E8 *param0, int param1) { if (ov59_021D26B8(param0->unk_4C)) { ov59_021D2628(param0, 9, 0); @@ -1264,7 +1262,7 @@ static int ov59_021D20A4 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D20D0 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D20D0(UnkStruct_020961E8 *param0, int param1) { if (ov59_021D26B8(param0->unk_4C)) { param0->unk_3A8 = 10; @@ -1274,7 +1272,7 @@ static int ov59_021D20D0 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D20F4 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D20F4(UnkStruct_020961E8 *param0, int param1) { if ((param0->unk_4C != 0xff) && (ov59_021D26B8(param0->unk_4C) == 0)) { PrintString_ForceStop(param0->unk_4C); @@ -1295,7 +1293,7 @@ static int ov59_021D20F4 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D2154 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D2154(UnkStruct_020961E8 *param0, int param1) { if ((param0->unk_4ABC != 0) && (CommSys_ConnectedCount() != param0->unk_4ABC)) { param0->unk_4ABC = 0; @@ -1308,7 +1306,7 @@ static int ov59_021D2154 (UnkStruct_020961E8 * param0, int param1) return param1; } -static int ov59_021D2190 (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D2190(UnkStruct_020961E8 *param0, int param1) { if ((param0->unk_4ABC != 0) && (CommSys_ConnectedCount() != param0->unk_4ABC)) { param0->unk_4ABC = 0; @@ -1332,7 +1330,7 @@ static int ov59_021D2190 (UnkStruct_020961E8 * param0, int param1) return param1; } -void ov59_021D2204 (UnkStruct_020961E8 * param0, int param1, u8 param2) +void ov59_021D2204(UnkStruct_020961E8 *param0, int param1, u8 param2) { switch (param1) { case 2: @@ -1389,7 +1387,7 @@ void ov59_021D2204 (UnkStruct_020961E8 * param0, int param1, u8 param2) param0->unk_3A8 = param1; } -void ov59_021D22EC (UnkStruct_020961E8 * param0, int param1, u8 param2) +void ov59_021D22EC(UnkStruct_020961E8 *param0, int param1, u8 param2) { if (param0->unk_3A8 == 3) { switch (param1) { @@ -1429,7 +1427,7 @@ void ov59_021D22EC (UnkStruct_020961E8 * param0, int param1, u8 param2) } } -static void ov59_021D23B0 (u16 * param0) +static void ov59_021D23B0(u16 *param0) { fx32 v0; GXRgb v1; @@ -1449,10 +1447,10 @@ static void ov59_021D23B0 (u16 * param0) GX_LoadOBJPltt((u16 *)&v1, (5 + 16) * 2, 2); } -static int ov59_021D23FC (void) +static int ov59_021D23FC(void) { int v0, v1; - TrainerInfo * v2; + TrainerInfo *v2; v1 = 0; @@ -1467,10 +1465,10 @@ static int ov59_021D23FC (void) return v1; } -static BOOL ov59_021D2418 (Window * param0, int param1, u32 param2, UnkStruct_020961E8 * param3) +static BOOL ov59_021D2418(Window *param0, int param1, u32 param2, UnkStruct_020961E8 *param3) { int v0, v1 = CommSys_CurNetId(); - Strbuf* v2 = NULL; + Strbuf *v2 = NULL; if (!ov59_021D254C(param3)) { return 0; @@ -1504,12 +1502,12 @@ static BOOL ov59_021D2418 (Window * param0, int param1, u32 param2, UnkStruct_02 return 1; } -static void ov59_021D2524 (UnkStruct_020961E8 * param0) +static void ov59_021D2524(UnkStruct_020961E8 *param0) { return; } -static int ov59_021D2528 (void) +static int ov59_021D2528(void) { int v0, v1; @@ -1522,12 +1520,12 @@ static int ov59_021D2528 (void) return v1; } -int ov59_021D2544 (void) +int ov59_021D2544(void) { return ov59_021D2528(); } -static BOOL ov59_021D254C (UnkStruct_020961E8 * param0) +static BOOL ov59_021D254C(UnkStruct_020961E8 *param0) { int v0, v1 = 0; @@ -1569,9 +1567,9 @@ static BOOL ov59_021D254C (UnkStruct_020961E8 * param0) return v1; } -static void ov59_021D2628 (UnkStruct_020961E8 * param0, int param1, int param2) +static void ov59_021D2628(UnkStruct_020961E8 *param0, int param1, int param2) { - Strbuf* v0; + Strbuf *v0; v0 = Strbuf_Init((90 * 2), 51); @@ -1589,7 +1587,7 @@ static void ov59_021D2628 (UnkStruct_020961E8 * param0, int param1, int param2) } } -static int ov59_021D26B8 (int param0) +static int ov59_021D26B8(int param0) { if (param0 == 0xff) { return 1; @@ -1602,12 +1600,12 @@ static int ov59_021D26B8 (int param0) return 0; } -static void ov59_021D26D8 (UnkStruct_020961E8 * param0) +static void ov59_021D26D8(UnkStruct_020961E8 *param0) { sub_0200E084(¶m0->unk_34C, 0); } -static void ov59_021D26E8 (UnkStruct_020961E8 * param0) +static void ov59_021D26E8(UnkStruct_020961E8 *param0) { int v0, v1 = 0; @@ -1615,8 +1613,7 @@ static void ov59_021D26E8 (UnkStruct_020961E8 * param0) switch (param0->unk_3F0[v0]) { case 0: break; - case 1: - { + case 1: { int v2, v3; GF_ASSERT(param0->unk_3C8[v0][0] != NULL); @@ -1655,7 +1652,7 @@ static void ov59_021D26E8 (UnkStruct_020961E8 * param0) } } -static void ov59_021D27FC (UnkStruct_020961E8 * param0, NARC * param1) +static void ov59_021D27FC(UnkStruct_020961E8 *param0, NARC *param1) { param0->unk_398[0] = sub_02006F88(104, 8, &(param0->unk_3A0[0]), 51); param0->unk_398[1] = sub_020071EC(param1, 7, &(param0->unk_3A0[1]), 51); @@ -1671,10 +1668,10 @@ static const u16 Unk_ov59_021D3290[] = { 0x19A0 }; -static void ov59_021D2860 (NNSG2dCharacterData * param0[2], NNSG2dPaletteData * param1[2], int param2, int param3, int param4) +static void ov59_021D2860(NNSG2dCharacterData *param0[2], NNSG2dPaletteData *param1[2], int param2, int param3, int param4) { int v0; - u8 * v1, * v2; + u8 *v1, *v2; v0 = sub_0205CA0C(param4, param3); @@ -1685,7 +1682,7 @@ static void ov59_021D2860 (NNSG2dCharacterData * param0[2], NNSG2dPaletteData * GX_LoadOBJPltt(&v2[v0 * 32], (param2 + 7) * 32, 32); } -static void ov59_021D28A4 (UnkStruct_020961E8 * param0) +static void ov59_021D28A4(UnkStruct_020961E8 *param0) { Heap_FreeToHeap(param0->unk_398[0]); Heap_FreeToHeap(param0->unk_398[1]); @@ -1694,12 +1691,12 @@ static void ov59_021D28A4 (UnkStruct_020961E8 * param0) Heap_FreeToHeap(param0->unk_388[1]); } -static int ov59_021D28D4 (UnkStruct_020961E8 * param0) +static int ov59_021D28D4(UnkStruct_020961E8 *param0) { return 1; } -static void ov59_021D28D8 (UnkStruct_020961E8 * param0, int param1) +static void ov59_021D28D8(UnkStruct_020961E8 *param0, int param1) { if (CommSys_CurNetId() == 0) { if (param1 == -1) { @@ -1724,7 +1721,7 @@ static void ov59_021D28D8 (UnkStruct_020961E8 * param0, int param1) } } -static int ov59_021D292C (UnkStruct_020961E8 * param0, int param1) +static int ov59_021D292C(UnkStruct_020961E8 *param0, int param1) { int v0; diff --git a/src/overlay059/ov59_021D2A2C.c b/src/overlay059/ov59_021D2A2C.c index 40b1cae5b2..a099f466c6 100644 --- a/src/overlay059/ov59_021D2A2C.c +++ b/src/overlay059/ov59_021D2A2C.c @@ -1,3 +1,5 @@ +#include "overlay059/ov59_021D2A2C.h" + #include #include @@ -5,22 +7,21 @@ #include "struct_defs/struct_0202B510.h" #include "unk_0202B37C.h" -#include "overlay059/ov59_021D2A2C.h" -static void ov59_021D2A78(UnkStruct_0202B4A0 * param0, int param1); -static void ov59_021D2A34(UnkStruct_0202B4A0 * param0, const UnkStruct_0202B510 * param1); +static void ov59_021D2A78(UnkStruct_0202B4A0 *param0, int param1); +static void ov59_021D2A34(UnkStruct_0202B4A0 *param0, const UnkStruct_0202B510 *param1); -u32 ov59_021D2A2C (UnkStruct_0202B4A0 * param0) +u32 ov59_021D2A2C(UnkStruct_0202B4A0 *param0) { return sizeof(UnkStruct_0202B510); } -void * ov59_021D2A30 (UnkStruct_0202B4A0 * param0) +void *ov59_021D2A30(UnkStruct_0202B4A0 *param0) { return ¶m0->unk_00[1]; } -static void ov59_021D2A34 (UnkStruct_0202B4A0 * param0, const UnkStruct_0202B510 * param1) +static void ov59_021D2A34(UnkStruct_0202B4A0 *param0, const UnkStruct_0202B510 *param1) { int v0; @@ -31,10 +32,10 @@ static void ov59_021D2A34 (UnkStruct_0202B4A0 * param0, const UnkStruct_0202B510 param0->unk_00[2] = *param1; } -static void ov59_021D2A78 (UnkStruct_0202B4A0 * param0, int param1) +static void ov59_021D2A78(UnkStruct_0202B4A0 *param0, int param1) { int v0; - UnkStruct_0202B510 * v1; + UnkStruct_0202B510 *v1; GF_ASSERT(2 <= param1 && param1 <= 5); @@ -48,10 +49,10 @@ static void ov59_021D2A78 (UnkStruct_0202B4A0 * param0, int param1) v1->unk_10[0] = 0xffff; } -void ov59_021D2AC4 (int param0, int param1, UnkStruct_0202B4A0 * param2, const void ** param3) +void ov59_021D2AC4(int param0, int param1, UnkStruct_0202B4A0 *param2, const void **param3) { int v0, v1; - UnkStruct_0202B510 * v2; + UnkStruct_0202B510 *v2; for (v0 = 0; v0 < param0; v0++) { v2 = (UnkStruct_0202B510 *)param3[v0]; diff --git a/src/overlay059/ov59_021D2B44.c b/src/overlay059/ov59_021D2B44.c index f39b39c898..052058ee9d 100644 --- a/src/overlay059/ov59_021D2B44.c +++ b/src/overlay059/ov59_021D2B44.c @@ -1,21 +1,20 @@ +#include "overlay059/ov59_021D2B44.h" + #include #include -#include "trainer_info.h" -#include "savedata.h" - #include "struct_defs/struct_0202440C.h" #include "struct_defs/struct_0202E768.h" #include "struct_defs/struct_0202E794.h" -#include "unk_020021B0.h" -#include "heap.h" #include "savedata/save_table.h" + +#include "communication_information.h" +#include "heap.h" #include "savedata.h" -#include "unk_02025E08.h" #include "trainer_info.h" -#include "communication_information.h" -#include "overlay059/ov59_021D2B44.h" +#include "unk_020021B0.h" +#include "unk_02025E08.h" __attribute__((aligned(4))) static const u8 Unk_ov59_021D33B0[] = { 0x2, @@ -111,7 +110,7 @@ __attribute__((aligned(4))) static const u8 Unk_ov59_021D3390[] = { 0xff }; -static const u8 * const Unk_ov59_021D33E4[] = { +static const u8 *const Unk_ov59_021D33E4[] = { Unk_ov59_021D33B0, Unk_ov59_021D33D0, Unk_ov59_021D3398, @@ -120,22 +119,22 @@ static const u8 * const Unk_ov59_021D33E4[] = { Unk_ov59_021D3390 }; -u32 ov59_021D2B44 (const SaveData * param0) +u32 ov59_021D2B44(const SaveData *param0) { return sizeof(UnkStruct_0202E794) * 4; } -u32 ov59_021D2B4C (const SaveData * param0) +u32 ov59_021D2B4C(const SaveData *param0) { return sizeof(UnkStruct_0202E794) * 4; } -u32 ov59_021D2B54 (const SaveData * param0) +u32 ov59_021D2B54(const SaveData *param0) { return sizeof(UnkStruct_0202E794) * 4; } -static BOOL ov59_021D2B5C (int param0, int param1) +static BOOL ov59_021D2B5C(int param0, int param1) { int v0; @@ -148,10 +147,10 @@ static BOOL ov59_021D2B5C (int param0, int param1) return 0; } -static void ov59_021D2B90 (SaveData * param0, UnkStruct_0202E794 * param1, UnkStruct_0202E768 * param2, int param3, int param4, int param5) +static void ov59_021D2B90(SaveData *param0, UnkStruct_0202E794 *param1, UnkStruct_0202E768 *param2, int param3, int param4, int param5) { int v0; - TrainerInfo * v1 = SaveData_GetTrainerInfo(param0); + TrainerInfo *v1 = SaveData_GetTrainerInfo(param0); for (v0 = 0; v0 < param3; v0++, param1++) { MI_CpuClearFast(param1, sizeof(UnkStruct_0202E794)); @@ -172,10 +171,10 @@ static void ov59_021D2B90 (SaveData * param0, UnkStruct_0202E794 * param1, UnkSt } } -UnkStruct_0202E794 * ov59_021D2C28 (SaveData * param0, int param1, u32 param2) +UnkStruct_0202E794 *ov59_021D2C28(SaveData *param0, int param1, u32 param2) { - UnkStruct_0202E794 * v0; - TVBroadcast * v1; + UnkStruct_0202E794 *v0; + TVBroadcast *v1; v0 = Heap_AllocFromHeapAtEnd(param1, param2); v1 = SaveData_TVBroadcast(param0); @@ -186,10 +185,10 @@ UnkStruct_0202E794 * ov59_021D2C28 (SaveData * param0, int param1, u32 param2) return v0; } -UnkStruct_0202E794 * ov59_021D2C70 (SaveData * param0, int param1, u32 param2) +UnkStruct_0202E794 *ov59_021D2C70(SaveData *param0, int param1, u32 param2) { - UnkStruct_0202E794 * v0; - TVBroadcast * v1; + UnkStruct_0202E794 *v0; + TVBroadcast *v1; v0 = Heap_AllocFromHeapAtEnd(param1, param2); v1 = SaveData_TVBroadcast(param0); @@ -200,10 +199,10 @@ UnkStruct_0202E794 * ov59_021D2C70 (SaveData * param0, int param1, u32 param2) return v0; } -UnkStruct_0202E794 * ov59_021D2CB4 (SaveData * param0, int param1, u32 param2) +UnkStruct_0202E794 *ov59_021D2CB4(SaveData *param0, int param1, u32 param2) { - UnkStruct_0202E794 * v0; - TVBroadcast * v1; + UnkStruct_0202E794 *v0; + TVBroadcast *v1; v0 = Heap_AllocFromHeapAtEnd(param1, param2); v1 = SaveData_TVBroadcast(param0); @@ -214,10 +213,10 @@ UnkStruct_0202E794 * ov59_021D2CB4 (SaveData * param0, int param1, u32 param2) return v0; } -UnkStruct_0202E794 * ov59_021D2CF8 (SaveData * param0, int param1, u32 param2) +UnkStruct_0202E794 *ov59_021D2CF8(SaveData *param0, int param1, u32 param2) { - UnkStruct_0202E794 * v0; - TVBroadcast * v1; + UnkStruct_0202E794 *v0; + TVBroadcast *v1; v0 = Heap_AllocFromHeapAtEnd(param1, param2); v1 = SaveData_TVBroadcast(param0); @@ -228,10 +227,10 @@ UnkStruct_0202E794 * ov59_021D2CF8 (SaveData * param0, int param1, u32 param2) return v0; } -UnkStruct_0202E794 * ov59_021D2D3C (SaveData * param0, int param1, u32 param2) +UnkStruct_0202E794 *ov59_021D2D3C(SaveData *param0, int param1, u32 param2) { - UnkStruct_0202E794 * v0; - TVBroadcast * v1; + UnkStruct_0202E794 *v0; + TVBroadcast *v1; v0 = Heap_AllocFromHeapAtEnd(param1, param2); v1 = SaveData_TVBroadcast(param0); @@ -242,10 +241,10 @@ UnkStruct_0202E794 * ov59_021D2D3C (SaveData * param0, int param1, u32 param2) return v0; } -UnkStruct_0202E794 * ov59_021D2D80 (SaveData * param0, int param1, u32 param2) +UnkStruct_0202E794 *ov59_021D2D80(SaveData *param0, int param1, u32 param2) { - UnkStruct_0202E794 * v0; - TVBroadcast * v1; + UnkStruct_0202E794 *v0; + TVBroadcast *v1; v0 = Heap_AllocFromHeapAtEnd(param1, param2); v1 = SaveData_TVBroadcast(param0); @@ -256,7 +255,7 @@ UnkStruct_0202E794 * ov59_021D2D80 (SaveData * param0, int param1, u32 param2) return v0; } -static BOOL ov59_021D2DC4 (UnkStruct_0202E794 * param0, int param1, const UnkStruct_0202E794 * param2, int param3) +static BOOL ov59_021D2DC4(UnkStruct_0202E794 *param0, int param1, const UnkStruct_0202E794 *param2, int param3) { int v0; @@ -285,9 +284,9 @@ static BOOL ov59_021D2DC4 (UnkStruct_0202E794 * param0, int param1, const UnkStr return 0; } -static const void ** ov59_021D2E40 (int param0, const void ** param1, const void ** param2) +static const void **ov59_021D2E40(int param0, const void **param1, const void **param2) { - TrainerInfo * v0; + TrainerInfo *v0; v0 = CommInfo_TrainerInfo(param0); @@ -302,11 +301,11 @@ static const void ** ov59_021D2E40 (int param0, const void ** param1, const void return param1; } -static void ov59_021D2E60 (UnkStruct_0202E794 * param0, int param1, int param2, int param3, const void ** param4, const void ** param5, int param6) +static void ov59_021D2E60(UnkStruct_0202E794 *param0, int param1, int param2, int param3, const void **param4, const void **param5, int param6) { u8 v0[16]; int v1, v2, v3; - const void ** v4; + const void **v4; for (v2 = 0; v2 < param2; v2++) { (void)0; @@ -342,17 +341,17 @@ static void ov59_021D2E60 (UnkStruct_0202E794 * param0, int param1, int param2, SaveData_SetChecksum(27); } -void ov59_021D2F10 (TVBroadcast * param0, int param1, int param2, const void ** param3, const void ** param4) +void ov59_021D2F10(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4) { ov59_021D2E60(param0->unk_234, 16, param1, param2, param3, param4, 1); } -void ov59_021D2F38 (TVBroadcast * param0, int param1, int param2, const void ** param3, const void ** param4) +void ov59_021D2F38(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4) { ov59_021D2E60(param0->unk_684, 8, param1, param2, param3, param4, 2); } -void ov59_021D2F60 (TVBroadcast * param0, int param1, int param2, const void ** param3, const void ** param4) +void ov59_021D2F60(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4) { ov59_021D2E60(param0->unk_8AC, 8, param1, param2, param3, param4, 0); } diff --git a/src/overlay059/ov59_021D2F88.c b/src/overlay059/ov59_021D2F88.c index be75fcf8f8..3ec7769404 100644 --- a/src/overlay059/ov59_021D2F88.c +++ b/src/overlay059/ov59_021D2F88.c @@ -1,3 +1,5 @@ +#include "overlay059/ov59_021D2F88.h" + #include #include @@ -6,37 +8,36 @@ #include "struct_decls/struct_0202A750_decl.h" #include "struct_decls/struct_0202B4A0_decl.h" #include "struct_decls/struct_0202E8C0_decl.h" -#include "savedata.h" +#include "overlay059/ov59_021D2A2C.h" +#include "overlay059/ov59_021D2B44.h" #include "overlay059/struct_ov59_021D30E0.h" #include "overlay096/struct_ov96_0223B450_sub1.h" +#include "savedata/save_table.h" +#include "communication_information.h" +#include "communication_system.h" #include "heap.h" -#include "savedata/save_table.h" +#include "savedata.h" #include "unk_020298BC.h" #include "unk_0202B37C.h" #include "unk_0202D05C.h" #include "unk_0202E2CC.h" #include "unk_0202E840.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_02073700.h" -#include "overlay059/ov59_021D2A2C.h" -#include "overlay059/ov59_021D2B44.h" -#include "overlay059/ov59_021D2F88.h" typedef struct { int unk_00; - SaveData * unk_04; + SaveData *unk_04; int unk_08; int unk_0C; - const void ** unk_10; - const void ** unk_14; + const void **unk_10; + const void **unk_14; } UnkStruct_ov59_021D2FBC; -typedef u32 (* UnkFuncPtr_ov59_021D33FC)(SaveData *); -typedef void *(* UnkFuncPtr_ov59_021D33FC_1)(SaveData *, int, u32); -typedef void (* UnkFuncPtr_ov59_021D33FC_2)(const UnkStruct_ov59_021D2FBC *); +typedef u32 (*UnkFuncPtr_ov59_021D33FC)(SaveData *); +typedef void *(*UnkFuncPtr_ov59_021D33FC_1)(SaveData *, int, u32); +typedef void (*UnkFuncPtr_ov59_021D33FC_2)(const UnkStruct_ov59_021D2FBC *); typedef struct { UnkFuncPtr_ov59_021D33FC unk_00; @@ -44,39 +45,39 @@ typedef struct { UnkFuncPtr_ov59_021D33FC_2 unk_08; } UnkStruct_ov59_021D33FC; -static u32 ov59_021D2F88 (SaveData * param0) +static u32 ov59_021D2F88(SaveData *param0) { - UnkStruct_0202B4A0 * v0 = sub_0202B4A0(param0); + UnkStruct_0202B4A0 *v0 = sub_0202B4A0(param0); return ov59_021D2A2C(v0); } -static void * ov59_021D2F94 (SaveData * param0, int param1, u32 param2) +static void *ov59_021D2F94(SaveData *param0, int param1, u32 param2) { - UnkStruct_0202B4A0 * v0 = sub_0202B4A0(param0); - void * v1 = Heap_AllocFromHeapAtEnd(param1, param2); + UnkStruct_0202B4A0 *v0 = sub_0202B4A0(param0); + void *v1 = Heap_AllocFromHeapAtEnd(param1, param2); MI_CpuCopyFast(ov59_021D2A30(v0), v1, param2); return v1; } -static void ov59_021D2FBC (const UnkStruct_ov59_021D2FBC * param0) +static void ov59_021D2FBC(const UnkStruct_ov59_021D2FBC *param0) { - UnkStruct_0202B4A0 * v0 = sub_0202B4A0(param0->unk_04); + UnkStruct_0202B4A0 *v0 = sub_0202B4A0(param0->unk_04); ov59_021D2AC4(param0->unk_08, param0->unk_0C, v0, param0->unk_10); } -static u32 ov59_021D2FD4 (SaveData * param0) +static u32 ov59_021D2FD4(SaveData *param0) { - UnkStruct_0202A750 * v0 = sub_0202A750(param0); + UnkStruct_0202A750 *v0 = sub_0202A750(param0); return sub_02029C60(); } -static void * ov59_021D2FE0 (SaveData * param0, int param1, u32 param2) +static void *ov59_021D2FE0(SaveData *param0, int param1, u32 param2) { - UnkStruct_02029C68 * v0; - UnkStruct_0202A750 * v1 = sub_0202A750(param0); - void * v2 = Heap_AllocFromHeapAtEnd(param1, param2); + UnkStruct_02029C68 *v0; + UnkStruct_0202A750 *v1 = sub_0202A750(param0); + void *v2 = Heap_AllocFromHeapAtEnd(param1, param2); v0 = sub_02029CA8(v1, 0); MI_CpuCopyFast(v0, v2, param2); @@ -84,45 +85,45 @@ static void * ov59_021D2FE0 (SaveData * param0, int param1, u32 param2) return v2; } -static void ov59_021D300C (const UnkStruct_ov59_021D2FBC * param0) +static void ov59_021D300C(const UnkStruct_ov59_021D2FBC *param0) { - UnkStruct_0202A750 * v0 = sub_0202A750(param0->unk_04); + UnkStruct_0202A750 *v0 = sub_0202A750(param0->unk_04); sub_0202A6A8(param0->unk_08, param0->unk_0C, v0, param0->unk_10); } -static void ov59_021D3028 (const UnkStruct_ov59_021D2FBC * param0) +static void ov59_021D3028(const UnkStruct_ov59_021D2FBC *param0) { - TVBroadcast * v0 = SaveData_TVBroadcast(param0->unk_04); + TVBroadcast *v0 = SaveData_TVBroadcast(param0->unk_04); ov59_021D2F10(v0, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_14); } -static void ov59_021D3048 (const UnkStruct_ov59_021D2FBC * param0) +static void ov59_021D3048(const UnkStruct_ov59_021D2FBC *param0) { - TVBroadcast * v0 = SaveData_TVBroadcast(param0->unk_04); + TVBroadcast *v0 = SaveData_TVBroadcast(param0->unk_04); ov59_021D2F38(v0, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_14); } -static void ov59_021D3068 (const UnkStruct_ov59_021D2FBC * param0) +static void ov59_021D3068(const UnkStruct_ov59_021D2FBC *param0) { - TVBroadcast * v0 = SaveData_TVBroadcast(param0->unk_04); + TVBroadcast *v0 = SaveData_TVBroadcast(param0->unk_04); ov59_021D2F60(v0, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_14); } -static void * ov59_021D3088 (SaveData * param0, int param1, u32 param2) +static void *ov59_021D3088(SaveData *param0, int param1, u32 param2) { return sub_0202E9FC(param0, param1); } -static void ov59_021D3090 (const UnkStruct_ov59_021D2FBC * param0) +static void ov59_021D3090(const UnkStruct_ov59_021D2FBC *param0) { - UnkStruct_0202E8C0 * v0 = sub_0202E8C0(param0->unk_04); + UnkStruct_0202E8C0 *v0 = sub_0202E8C0(param0->unk_04); sub_0202ED0C(param0->unk_04, param0->unk_0C, param0->unk_08, param0->unk_10, param0->unk_00); } -static void * ov59_021D30B4 (SaveData * param0, int param1, u32 param2) +static void *ov59_021D30B4(SaveData *param0, int param1, u32 param2) { - UnkStruct_ov96_0223B450_sub1 * v0; + UnkStruct_ov96_0223B450_sub1 *v0; v0 = Heap_AllocFromHeapAtEnd(param1, param2); MI_CpuClear8(v0, param2); @@ -131,32 +132,32 @@ static void * ov59_021D30B4 (SaveData * param0, int param1, u32 param2) return v0; } -static void ov59_021D30DC (const UnkStruct_ov59_021D2FBC * param0) +static void ov59_021D30DC(const UnkStruct_ov59_021D2FBC *param0) { return; } static const UnkStruct_ov59_021D33FC Unk_ov59_021D33FC[] = { - {ov59_021D2F88, ov59_021D2F94, ov59_021D2FBC}, - {ov59_021D2FD4, ov59_021D2FE0, ov59_021D300C}, - {(UnkFuncPtr_ov59_021D33FC)ov59_021D2B4C, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2C70, NULL}, - {(UnkFuncPtr_ov59_021D33FC)ov59_021D2B54, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2CB4, NULL}, - {(UnkFuncPtr_ov59_021D33FC)ov59_021D2B44, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2C28, NULL}, - {(UnkFuncPtr_ov59_021D33FC)sub_0202E91C, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D3088, ov59_021D3090}, - {(UnkFuncPtr_ov59_021D33FC)sub_0202D05C, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D30B4, ov59_021D30DC}, - {(UnkFuncPtr_ov59_021D33FC)ov59_021D2B4C, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2D3C, ov59_021D3028}, - {(UnkFuncPtr_ov59_021D33FC)ov59_021D2B54, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2D80, ov59_021D3048}, - {(UnkFuncPtr_ov59_021D33FC)ov59_021D2B44, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2CF8, ov59_021D3068} + { ov59_021D2F88, ov59_021D2F94, ov59_021D2FBC }, + { ov59_021D2FD4, ov59_021D2FE0, ov59_021D300C }, + { (UnkFuncPtr_ov59_021D33FC)ov59_021D2B4C, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2C70, NULL }, + { (UnkFuncPtr_ov59_021D33FC)ov59_021D2B54, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2CB4, NULL }, + { (UnkFuncPtr_ov59_021D33FC)ov59_021D2B44, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2C28, NULL }, + { (UnkFuncPtr_ov59_021D33FC)sub_0202E91C, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D3088, ov59_021D3090 }, + { (UnkFuncPtr_ov59_021D33FC)sub_0202D05C, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D30B4, ov59_021D30DC }, + { (UnkFuncPtr_ov59_021D33FC)ov59_021D2B4C, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2D3C, ov59_021D3028 }, + { (UnkFuncPtr_ov59_021D33FC)ov59_021D2B54, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2D80, ov59_021D3048 }, + { (UnkFuncPtr_ov59_021D33FC)ov59_021D2B44, (UnkFuncPtr_ov59_021D33FC_1)ov59_021D2CF8, ov59_021D3068 } }; -void ov59_021D30E0 (SaveData * param0, UnkStruct_ov59_021D30E0 * param1) +void ov59_021D30E0(SaveData *param0, UnkStruct_ov59_021D30E0 *param1) { u32 v0; - void * v1; + void *v1; int v2, v3; u32 v4 = 3000; - u8 * v5 = param1->unk_00; - const UnkStruct_ov59_021D33FC * v6 = Unk_ov59_021D33FC; + u8 *v5 = param1->unk_00; + const UnkStruct_ov59_021D33FC *v6 = Unk_ov59_021D33FC; v3 = NELEMS(Unk_ov59_021D33FC); @@ -174,15 +175,15 @@ void ov59_021D30E0 (SaveData * param0, UnkStruct_ov59_021D30E0 * param1) } } -void ov59_021D313C (SaveData * param0, const UnkStruct_ov59_021D30E0 * param1) +void ov59_021D313C(SaveData *param0, const UnkStruct_ov59_021D30E0 *param1) { UnkStruct_ov59_021D2FBC v0; u32 v1; u32 v2 = 0; u32 v3 = 3000; int v4, v5, v6; - const void * v7[5]; - const void * v8[5]; + const void *v7[5]; + const void *v8[5]; u32 v9[4 - 2 + 1]; v0.unk_00 = 51; @@ -243,7 +244,7 @@ void ov59_021D313C (SaveData * param0, const UnkStruct_ov59_021D30E0 * param1) } { - TVBroadcast * v10 = SaveData_TVBroadcast(param0); + TVBroadcast *v10 = SaveData_TVBroadcast(param0); sub_0202E2EC(v10); sub_0202E35C(v10); } diff --git a/src/overlay060/ov60_0221F800.c b/src/overlay060/ov60_0221F800.c index 5f67bd97fe..4dc261df2d 100644 --- a/src/overlay060/ov60_0221F800.c +++ b/src/overlay060/ov60_0221F800.c @@ -1,26 +1,26 @@ -#include -#include +#include "overlay060/ov60_0221F800.h" + #include #include - -#include "overlay060/ov60_0221F800.h" +#include +#include static int Unk_ov60_02229E20; -static void ov60_0221F800 (unsigned long param0) +static void ov60_0221F800(unsigned long param0) { Unk_ov60_02229E20 = (int)(param0 | (param0 << 16)); } -static unsigned char ov60_0221F810 (void) +static unsigned char ov60_0221F810(void) { Unk_ov60_02229E20 = (int)((69 * Unk_ov60_02229E20 + 4369) % 0x80000000); return (unsigned char)((Unk_ov60_02229E20 >> 16) & 0xff); } -int ov60_0221F838 (u32 param0, const u8 * param1, int param2, u8 * param3, int param4) +int ov60_0221F838(u32 param0, const u8 *param1, int param2, u8 *param3, int param4) { - unsigned char * v0; + unsigned char *v0; u32 v1 = 0; int v2; @@ -70,7 +70,7 @@ int ov60_0221F838 (u32 param0, const u8 * param1, int param2, u8 * param3, int p return 0; } -u32 ov60_0221F944 (u32 param0) +u32 ov60_0221F944(u32 param0) { u32 v0; diff --git a/src/overlay060/ov60_0221F968.c b/src/overlay060/ov60_0221F968.c index fb1f81829e..01f0f65a45 100644 --- a/src/overlay060/ov60_0221F968.c +++ b/src/overlay060/ov60_0221F968.c @@ -1,6 +1,8 @@ +#include "overlay060/ov60_0221F968.h" + #include + #include "overlay060/ov60_0221F800.h" -#include "overlay060/ov60_0221F968.h" struct { int unk_00; @@ -8,17 +10,17 @@ struct { int unk_08; int unk_0C; int unk_10; - void * unk_14; + void *unk_14; int unk_18; - void * unk_1C; + void *unk_1C; int unk_20; - char * unk_24; - char * unk_28; - char * unk_2C; + char *unk_24; + char *unk_28; + char *unk_2C; int unk_30; -} Unk_ov60_02228E40 = {1, 0, 0, 0}; +} Unk_ov60_02228E40 = { 1, 0, 0, 0 }; -static void ov60_0221F968 (int param0) +static void ov60_0221F968(int param0) { switch (param0) { case DWC_GHTTP_IN_ERROR: @@ -47,7 +49,7 @@ static void ov60_0221F968 (int param0) } } -static void ov60_0221F9D0 (const char * param0, int param1, DWCGHTTPResult param2, void * param3) +static void ov60_0221F9D0(const char *param0, int param1, DWCGHTTPResult param2, void *param3) { #pragma unused(param3) @@ -63,7 +65,7 @@ static void ov60_0221F9D0 (const char * param0, int param1, DWCGHTTPResult param if (param1 == 32) { int v0; - u8 * v1 = (u8 *)(Unk_ov60_02228E40.unk_28 + 20); + u8 *v1 = (u8 *)(Unk_ov60_02228E40.unk_28 + 20); char v2[(32 + 20 + 1)]; int v3; const char v4[] = "0123456789abcdef"; @@ -193,7 +195,7 @@ static void ov60_0221F9D0 (const char * param0, int param1, DWCGHTTPResult param } } -void ov60_0221FC84 (void) +void ov60_0221FC84(void) { Unk_ov60_02228E40.unk_00 = 2; Unk_ov60_02228E40.unk_04 = -1; @@ -205,7 +207,7 @@ void ov60_0221FC84 (void) return; } -int ov60_0221FCA8 (const u8 * param0, int param1, const void * param2, int param3, u8 * param4, int param5) +int ov60_0221FCA8(const u8 *param0, int param1, const void *param2, int param3, u8 *param4, int param5) { if (Unk_ov60_02228E40.unk_00 != 2) { return 1; @@ -232,7 +234,7 @@ int ov60_0221FCA8 (const u8 * param0, int param1, const void * param2, int param return 0; } -int ov60_0221FD48 (void) +int ov60_0221FD48(void) { BOOL v0; @@ -286,7 +288,7 @@ int ov60_0221FD48 (void) return Unk_ov60_02228E40.unk_00; } -void ov60_0221FDEC (void) +void ov60_0221FDEC(void) { if (Unk_ov60_02228E40.unk_24 != NULL) { DWC_Free((DWCAllocType)10, Unk_ov60_02228E40.unk_24, (u32)0); @@ -299,12 +301,12 @@ void ov60_0221FDEC (void) return; } -int ov60_0221FE14 (void) +int ov60_0221FE14(void) { return (int)Unk_ov60_02228E40.unk_08; } -int ov60_0221FE20 (void) +int ov60_0221FE20(void) { return Unk_ov60_02228E40.unk_0C; } diff --git a/src/overlay061/ov61_0222AE60.c b/src/overlay061/ov61_0222AE60.c index 42099c67d6..2fac69aa76 100644 --- a/src/overlay061/ov61_0222AE60.c +++ b/src/overlay061/ov61_0222AE60.c @@ -1,39 +1,39 @@ +#include "overlay061/ov61_0222AE60.h" + #include #include -#include "strbuf.h" +#include "constants/species.h" + #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_020797DC_decl.h" -#include "savedata.h" - #include "struct_defs/struct_02030A80.h" + #include "overlay061/struct_ov61_0222AE80.h" #include "overlay061/struct_ov61_0222AFC0.h" #include "overlay061/struct_ov61_0222AFCC.h" #include "overlay062/struct_ov62_02239DA4.h" #include "overlay062/struct_ov62_02239DA4_sub1.h" -#include "strbuf.h" #include "savedata.h" +#include "strbuf.h" #include "unk_020298BC.h" #include "unk_020797C8.h" -#include "overlay061/ov61_0222AE60.h" -#include "constants/species.h" -void ov61_0222AE60 (SaveData * param0, const UnkStruct_02029C68 * param1, UnkStruct_ov61_0222AE80 * param2) +void ov61_0222AE60(SaveData *param0, const UnkStruct_02029C68 *param1, UnkStruct_ov61_0222AE80 *param2) { sub_0202A75C(param1, param2); param2->unk_5C.unk_00 = SaveData_CalculateChecksum(param0, param2, sizeof(UnkStruct_ov61_0222AE80) - (sizeof(UnkStruct_ov62_02239DA4_sub1))); } -void ov61_0222AE80 (const UnkStruct_ov61_0222AE80 * param0, UnkStruct_02029C68 * param1) +void ov61_0222AE80(const UnkStruct_ov61_0222AE80 *param0, UnkStruct_02029C68 *param1) { sub_0202A824(param0, param1); } -void ov61_0222AE88 (SaveData * param0, const PCBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3, int param4) +void ov61_0222AE88(SaveData *param0, const PCBoxes *param1, int param2, UnkStruct_ov62_02239DA4 *param3, int param4) { - Strbuf* v0; + Strbuf *v0; int v1; MI_CpuClear8(param3, sizeof(UnkStruct_ov62_02239DA4)); @@ -60,26 +60,26 @@ void ov61_0222AE88 (SaveData * param0, const PCBoxes * param1, int param2, UnkSt param3->unk_198.unk_00 = SaveData_CalculateChecksum(param0, param3, sizeof(UnkStruct_ov62_02239DA4) - (sizeof(UnkStruct_ov62_02239DA4_sub1))); } -void ov61_0222AF88 (SaveData * param0, UnkStruct_ov62_02239DA4 * param1, int param2) +void ov61_0222AF88(SaveData *param0, UnkStruct_ov62_02239DA4 *param1, int param2) { param1->unk_177 = param2; param1->unk_198.unk_00 = SaveData_CalculateChecksum(param0, param1, sizeof(UnkStruct_ov62_02239DA4) - (sizeof(UnkStruct_ov62_02239DA4_sub1))); } -void ov61_0222AFA4 (SaveData * param0, const UnkStruct_02030A80 * param1, UnkStruct_ov61_0222AFC0 * param2) +void ov61_0222AFA4(SaveData *param0, const UnkStruct_02030A80 *param1, UnkStruct_ov61_0222AFC0 *param2) { GF_ASSERT(sizeof(UnkStruct_ov61_0222AFC0) == sizeof(UnkStruct_02030A80)); MI_CpuClear8(param2, sizeof(UnkStruct_ov61_0222AFC0)); MI_CpuCopy8(param1, param2, sizeof(UnkStruct_ov61_0222AFC0)); } -void ov61_0222AFC0 (const UnkStruct_ov61_0222AFC0 * param0, UnkStruct_02030A80 * param1) +void ov61_0222AFC0(const UnkStruct_ov61_0222AFC0 *param0, UnkStruct_02030A80 *param1) { GF_ASSERT(sizeof(UnkStruct_ov61_0222AFC0) == sizeof(UnkStruct_02030A80)); MI_CpuCopy8(param0, param1, sizeof(UnkStruct_ov61_0222AFC0)); } -void ov61_0222AFCC (SaveData * param0, const UnkStruct_02030A80 * param1, UnkStruct_ov61_0222AFCC * param2) +void ov61_0222AFCC(SaveData *param0, const UnkStruct_02030A80 *param1, UnkStruct_ov61_0222AFCC *param2) { MI_CpuClear8(param2, sizeof(UnkStruct_ov61_0222AFCC)); diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index cb0e8673c5..d01d0e1147 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -1,21 +1,23 @@ +#include "overlay061/ov61_0222B008.h" + +#include #include #include -#include -#include "core_sys.h" - -#include "strbuf.h" -#include "play_time.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_020797DC_decl.h" - #include "struct_defs/struct_02030A80.h" + +#include "overlay004/ov4_021D0D80.h" +#include "overlay061/ov61_0222AE60.h" +#include "overlay061/ov61_0222BC4C.h" #include "overlay061/struct_ov61_0222AFC0.h" #include "overlay061/struct_ov61_0222B138.h" #include "overlay061/struct_ov61_0222B2D8.h" #include "overlay061/struct_ov61_0222B920.h" #include "overlay061/struct_ov61_0222B960.h" #include "overlay061/struct_ov61_0222BDC8.h" +#include "overlay062/ov62_02248408.h" #include "overlay062/struct_ov62_022349A8.h" #include "overlay062/struct_ov62_022349A8_sub3_sub3.h" #include "overlay062/struct_ov62_022349A8_sub3_sub4.h" @@ -24,40 +26,37 @@ #include "overlay062/struct_ov62_0223D518_sub1_sub1.h" #include "overlay062/struct_ov62_02241130.h" -#include "message.h" -#include "string_template.h" +#include "core_sys.h" +#include "gds.h" #include "heap.h" +#include "message.h" +#include "play_time.h" #include "strbuf.h" +#include "string_template.h" #include "unk_02025E08.h" #include "unk_0202F1D4.h" #include "unk_020366A0.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay061/ov61_0222AE60.h" -#include "overlay061/ov61_0222B008.h" -#include "overlay061/ov61_0222BC4C.h" -#include "overlay062/ov62_02248408.h" -#include "gds.h" -typedef int (* UnkFuncPtr_ov61_0222E48C)(UnkStruct_ov62_022349A8 *, UnkStruct_ov61_0222B138 *); - -static int ov61_0222B138(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B138 * param1); -static int ov61_0222B14C(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B138 * param1); -static int ov61_0222B168(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B138 * param1); -static int ov61_0222B190(UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B138 * param1); -static int ov61_0222B6D8(UnkStruct_ov62_022349A8 * param0); -static int ov61_0222B860(UnkStruct_ov62_022349A8 * param0); -static int ov61_0222BBE8(UnkStruct_ov62_022349A8 * param0); -static void ov61_0222BB54(UnkStruct_ov62_022349A8 * param0, Strbuf *param1); -static void ov61_0222BB60(UnkStruct_ov62_022349A8 * param0, int param1, int param2); -static int ov61_0222B960(UnkStruct_ov62_022349A8 * param0); -static void * ov61_0222BBF0(int param0); +typedef int (*UnkFuncPtr_ov61_0222E48C)(UnkStruct_ov62_022349A8 *, UnkStruct_ov61_0222B138 *); + +static int ov61_0222B138(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B138 *param1); +static int ov61_0222B14C(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B138 *param1); +static int ov61_0222B168(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B138 *param1); +static int ov61_0222B190(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B138 *param1); +static int ov61_0222B6D8(UnkStruct_ov62_022349A8 *param0); +static int ov61_0222B860(UnkStruct_ov62_022349A8 *param0); +static int ov61_0222BBE8(UnkStruct_ov62_022349A8 *param0); +static void ov61_0222BB54(UnkStruct_ov62_022349A8 *param0, Strbuf *param1); +static void ov61_0222BB60(UnkStruct_ov62_022349A8 *param0, int param1, int param2); +static int ov61_0222B960(UnkStruct_ov62_022349A8 *param0); +static void *ov61_0222BBF0(int param0); static void ov61_0222BC40(void); -static BOOL ov61_0222B920(void * param0, void * param1); -static BOOL ov61_0222B924(void * param0, void * param1); -static BOOL ov61_0222B928(void * param0, void * param1); -static BOOL ov61_0222B954(void * param0, void * param1); -static BOOL ov61_0222B958(void * param0, void * param1); -static BOOL ov61_0222B95C(void * param0, void * param1); +static BOOL ov61_0222B920(void *param0, void *param1); +static BOOL ov61_0222B924(void *param0, void *param1); +static BOOL ov61_0222B928(void *param0, void *param1); +static BOOL ov61_0222B954(void *param0, void *param1); +static BOOL ov61_0222B958(void *param0, void *param1); +static BOOL ov61_0222B95C(void *param0, void *param1); static const UnkFuncPtr_ov61_0222E48C Unk_ov61_0222E48C[] = { ov61_0222B14C, @@ -71,13 +70,13 @@ static const UnkFuncPtr_ov61_0222E48C Unk_ov61_0222E47C[] = { NULL }; -static const UnkFuncPtr_ov61_0222E48C * const Unk_ov61_0222E480[] = { +static const UnkFuncPtr_ov61_0222E48C *const Unk_ov61_0222E480[] = { NULL, Unk_ov61_0222E48C, Unk_ov61_0222E47C }; -int ov61_0222B008 (UnkStruct_ov62_022349A8 * param0, const UnkStruct_ov62_02241130 * param1) +int ov61_0222B008(UnkStruct_ov62_022349A8 *param0, const UnkStruct_ov62_02241130 *param1) { int v0; @@ -112,7 +111,7 @@ int ov61_0222B008 (UnkStruct_ov62_022349A8 * param0, const UnkStruct_ov62_022411 return 1; } -void ov61_0222B0F0 (UnkStruct_ov62_022349A8 * param0) +void ov61_0222B0F0(UnkStruct_ov62_022349A8 *param0) { ov61_0222DCFC(); @@ -126,14 +125,14 @@ void ov61_0222B0F0 (UnkStruct_ov62_022349A8 * param0) Heap_FreeToHeap(param0->unk_18C); } -static int ov61_0222B138 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B138 * param1) +static int ov61_0222B138(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B138 *param1) { ov61_0222DCFC(); param0->unk_3C4 = 0; return 1; } -static int ov61_0222B14C (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B138 * param1) +static int ov61_0222B14C(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B138 *param1) { DWC_ClearError(); DWC_CleanupInet(); @@ -144,7 +143,7 @@ static int ov61_0222B14C (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B return 1; } -static int ov61_0222B168 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B138 * param1) +static int ov61_0222B168(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B138 *param1) { int v0, v1; @@ -154,7 +153,7 @@ static int ov61_0222B168 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B return 1; } -static int ov61_0222B190 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B138 * param1) +static int ov61_0222B190(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B138 *param1) { if ((gCoreSys.pressedKeys & PAD_BUTTON_A) || (gCoreSys.pressedKeys & PAD_BUTTON_B)) { ov61_0222BB54(param0, NULL); @@ -164,7 +163,7 @@ static int ov61_0222B190 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B return 0; } -int ov61_0222B1B4 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1, UnkStruct_02029C68 * param2) +int ov61_0222B1B4(UnkStruct_ov62_022349A8 *param0, UnkStruct_02030A80 *param1, UnkStruct_02029C68 *param2) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -179,7 +178,7 @@ int ov61_0222B1B4 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1 return 1; } -int ov61_0222B1FC (UnkStruct_ov62_022349A8 * param0, int param1) +int ov61_0222B1FC(UnkStruct_ov62_022349A8 *param0, int param1) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -191,7 +190,7 @@ int ov61_0222B1FC (UnkStruct_ov62_022349A8 * param0, int param1) return 1; } -int ov61_0222B224 (UnkStruct_ov62_022349A8 * param0, int param1, UnkStruct_02030A80 * param2, const PCBoxes * param3, int param4) +int ov61_0222B224(UnkStruct_ov62_022349A8 *param0, int param1, UnkStruct_02030A80 *param2, const PCBoxes *param3, int param4) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -210,7 +209,7 @@ int ov61_0222B224 (UnkStruct_ov62_022349A8 * param0, int param1, UnkStruct_02030 return 1; } -int ov61_0222B290 (UnkStruct_ov62_022349A8 * param0, int param1) +int ov61_0222B290(UnkStruct_ov62_022349A8 *param0, int param1) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -222,7 +221,7 @@ int ov61_0222B290 (UnkStruct_ov62_022349A8 * param0, int param1) return 1; } -int ov61_0222B2B8 (UnkStruct_ov62_022349A8 * param0) +int ov61_0222B2B8(UnkStruct_ov62_022349A8 *param0) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -232,9 +231,9 @@ int ov61_0222B2B8 (UnkStruct_ov62_022349A8 * param0) return 1; } -int ov61_0222B2D8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1, UnkStruct_ov61_0222B2D8 param2[]) +int ov61_0222B2D8(UnkStruct_ov62_022349A8 *param0, UnkStruct_02030A80 *param1, UnkStruct_ov61_0222B2D8 param2[]) { - PlayTime * playTime; + PlayTime *playTime; int v1; if (ov61_0222BBBC(param0) == 0) { @@ -253,9 +252,9 @@ int ov61_0222B2D8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1 return 1; } -int ov61_0222B338 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1) +int ov61_0222B338(UnkStruct_ov62_022349A8 *param0, UnkStruct_02030A80 *param1) { - UnkStruct_02030A80 * v0; + UnkStruct_02030A80 *v0; if (ov61_0222BBBC(param0) == 0) { return 0; @@ -277,7 +276,7 @@ int ov61_0222B338 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1 return 1; } -int ov61_0222B394 (UnkStruct_ov62_022349A8 * param0, u16 param1, u8 param2, u8 param3, u8 param4) +int ov61_0222B394(UnkStruct_ov62_022349A8 *param0, u16 param1, u8 param2, u8 param3, u8 param4) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -296,7 +295,7 @@ int ov61_0222B394 (UnkStruct_ov62_022349A8 * param0, u16 param1, u8 param2, u8 p return 1; } -int ov61_0222B3EC (UnkStruct_ov62_022349A8 * param0) +int ov61_0222B3EC(UnkStruct_ov62_022349A8 *param0) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -315,7 +314,7 @@ int ov61_0222B3EC (UnkStruct_ov62_022349A8 * param0) return 1; } -int ov61_0222B44C (UnkStruct_ov62_022349A8 * param0) +int ov61_0222B44C(UnkStruct_ov62_022349A8 *param0) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -334,7 +333,7 @@ int ov61_0222B44C (UnkStruct_ov62_022349A8 * param0) return 1; } -int ov61_0222B4A8 (UnkStruct_ov62_022349A8 * param0) +int ov61_0222B4A8(UnkStruct_ov62_022349A8 *param0) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -348,7 +347,7 @@ int ov61_0222B4A8 (UnkStruct_ov62_022349A8 * param0) return 1; } -int ov61_0222B4E4 (UnkStruct_ov62_022349A8 * param0) +int ov61_0222B4E4(UnkStruct_ov62_022349A8 *param0) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -363,7 +362,7 @@ int ov61_0222B4E4 (UnkStruct_ov62_022349A8 * param0) return 1; } -int ov61_0222B524 (UnkStruct_ov62_022349A8 * param0, u64 param1) +int ov61_0222B524(UnkStruct_ov62_022349A8 *param0, u64 param1) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -375,7 +374,7 @@ int ov61_0222B524 (UnkStruct_ov62_022349A8 * param0, u64 param1) return 1; } -int ov61_0222B550 (UnkStruct_ov62_022349A8 * param0, u64 param1) +int ov61_0222B550(UnkStruct_ov62_022349A8 *param0, u64 param1) { if (ov61_0222BBBC(param0) == 0) { return 0; @@ -387,7 +386,7 @@ int ov61_0222B550 (UnkStruct_ov62_022349A8 * param0, u64 param1) return 1; } -int ov61_0222B57C (UnkStruct_ov62_022349A8 * param0) +int ov61_0222B57C(UnkStruct_ov62_022349A8 *param0) { int v0; @@ -458,7 +457,7 @@ int ov61_0222B57C (UnkStruct_ov62_022349A8 * param0) return 1; } -static int ov61_0222B6D8 (UnkStruct_ov62_022349A8 * param0) +static int ov61_0222B6D8(UnkStruct_ov62_022349A8 *param0) { int v0 = 0; @@ -550,7 +549,7 @@ static int ov61_0222B6D8 (UnkStruct_ov62_022349A8 * param0) return v0; } -static int ov61_0222B860 (UnkStruct_ov62_022349A8 * param0) +static int ov61_0222B860(UnkStruct_ov62_022349A8 *param0) { if (param0->unk_3EC == 23004) { return 1; @@ -600,24 +599,24 @@ static int ov61_0222B860 (UnkStruct_ov62_022349A8 * param0) return 1; } -static BOOL ov61_0222B920 (void * param0, void * param1) +static BOOL ov61_0222B920(void *param0, void *param1) { - UnkStruct_ov62_022349A8 * v0 = param0; - UnkStruct_ov61_0222B920 * v1 = param1; + UnkStruct_ov62_022349A8 *v0 = param0; + UnkStruct_ov61_0222B920 *v1 = param1; return 1; } -static BOOL ov61_0222B924 (void * param0, void * param1) +static BOOL ov61_0222B924(void *param0, void *param1) { return 1; } -static BOOL ov61_0222B928 (void * param0, void * param1) +static BOOL ov61_0222B928(void *param0, void *param1) { - UnkStruct_ov62_022349A8 * v0 = param0; - UnkStruct_ov61_0222B920 * v1 = param1; - UnkStruct_ov61_0222B960 * v2; - UnkStruct_ov61_0222BDC8 * v3; + UnkStruct_ov62_022349A8 *v0 = param0; + UnkStruct_ov61_0222B920 *v1 = param1; + UnkStruct_ov61_0222B960 *v2; + UnkStruct_ov61_0222BDC8 *v3; int v4; v2 = ov61_0222DE80(); @@ -631,27 +630,27 @@ static BOOL ov61_0222B928 (void * param0, void * param1) return 0; } -static BOOL ov61_0222B954 (void * param0, void * param1) +static BOOL ov61_0222B954(void *param0, void *param1) { return 1; } -static BOOL ov61_0222B958 (void * param0, void * param1) +static BOOL ov61_0222B958(void *param0, void *param1) { return 1; } -static BOOL ov61_0222B95C (void * param0, void * param1) +static BOOL ov61_0222B95C(void *param0, void *param1) { - UnkStruct_ov62_022349A8 * v0 = param0; - UnkStruct_ov61_0222B920 * v1 = param1; + UnkStruct_ov62_022349A8 *v0 = param0; + UnkStruct_ov61_0222B920 *v1 = param1; return 1; } -static int ov61_0222B960 (UnkStruct_ov62_022349A8 * param0) +static int ov61_0222B960(UnkStruct_ov62_022349A8 *param0) { - UnkStruct_ov61_0222B960 * v0; + UnkStruct_ov61_0222B960 *v0; int v1; int v2 = 1; @@ -734,21 +733,21 @@ static int ov61_0222B960 (UnkStruct_ov62_022349A8 * param0) return v2; } -BOOL ov61_0222BB48 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov62_0223CAA4 ** param1) +BOOL ov61_0222BB48(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov62_0223CAA4 **param1) { *param1 = ¶m0->unk_17C; return param0->unk_17C.unk_00; } -static void ov61_0222BB54 (UnkStruct_ov62_022349A8 * param0, Strbuf *param1) +static void ov61_0222BB54(UnkStruct_ov62_022349A8 *param0, Strbuf *param1) { param0->unk_04(param0->unk_08, param1); } -static void ov61_0222BB60 (UnkStruct_ov62_022349A8 * param0, int param1, int param2) +static void ov61_0222BB60(UnkStruct_ov62_022349A8 *param0, int param1, int param2) { int v0; - Strbuf* v1; + Strbuf *v1; if (param1 != -1) { v0 = 0 + param1; @@ -763,7 +762,7 @@ static void ov61_0222BB60 (UnkStruct_ov62_022349A8 * param0, int param1, int par ov61_0222BB54(param0, param0->unk_3FC); } -BOOL ov61_0222BBBC (UnkStruct_ov62_022349A8 * param0) +BOOL ov61_0222BBBC(UnkStruct_ov62_022349A8 *param0) { if ((ov61_0222BBE8(param0) == 0) && (param0->unk_3E8 == 23004) && (param0->unk_3EC == 23004)) { return 1; @@ -772,18 +771,18 @@ BOOL ov61_0222BBBC (UnkStruct_ov62_022349A8 * param0) return 0; } -static int ov61_0222BBE8 (UnkStruct_ov62_022349A8 * param0) +static int ov61_0222BBE8(UnkStruct_ov62_022349A8 *param0) { return param0->unk_3BC; } static OSHeapHandle Unk_ov61_0222E760; -static void * ov61_0222BBF0 (int param0) +static void *ov61_0222BBF0(int param0) { - void * v0; - void * v1; - void * v2; + void *v0; + void *v1; + void *v2; int v3 = 0x2000; v0 = Heap_AllocFromHeap(param0, v3); @@ -802,7 +801,7 @@ static void * ov61_0222BBF0 (int param0) return v2; } -static void ov61_0222BC40 (void) +static void ov61_0222BC40(void) { OS_ClearAlloc(OS_ARENA_MAIN); } diff --git a/src/overlay061/ov61_0222BC4C.c b/src/overlay061/ov61_0222BC4C.c index e93a6f3f9d..f5ea039d39 100644 --- a/src/overlay061/ov61_0222BC4C.c +++ b/src/overlay061/ov61_0222BC4C.c @@ -1,6 +1,8 @@ +#include "overlay061/ov61_0222BC4C.h" + +#include #include #include -#include #include "overlay061/struct_ov61_0222B960.h" #include "overlay061/struct_ov61_0222BC4C.h" @@ -26,13 +28,12 @@ #include "overlay062/struct_ov62_02239DA4_sub1.h" #include "overlay062/struct_ov62_0223DF10.h" -#include "savedata.h" -#include "overlay061/ov61_0222BC4C.h" #include "gds.h" +#include "savedata.h" -int ov61_0222BC4C (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1) +int ov61_0222BC4C(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1) { - UnkStruct_ov61_0222BC4C * v0; + UnkStruct_ov61_0222BC4C *v0; int v1 = 0; switch (param1->unk_02) { @@ -56,9 +57,9 @@ int ov61_0222BC4C (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * p return v1; } -int ov61_0222BC70 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1) +int ov61_0222BC70(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1) { - UnkStruct_ov61_0222BC4C_1 * v0; + UnkStruct_ov61_0222BC4C_1 *v0; int v1 = 0; switch (param1->unk_02) { @@ -78,11 +79,11 @@ int ov61_0222BC70 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * p return v1; } -int ov61_0222BC90 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BC90 ** param1, int param2) +int ov61_0222BC90(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222BC90 **param1, int param2) { - UnkStruct_ov61_0222B960 * v0; - UnkStruct_ov61_0222BC4C_1 * v1; - UnkStruct_ov61_0222BC4C_2 * v2; + UnkStruct_ov61_0222B960 *v0; + UnkStruct_ov61_0222BC4C_1 *v1; + UnkStruct_ov61_0222BC4C_2 *v2; int v3, v4; v0 = ov61_0222DE80(); @@ -99,16 +100,16 @@ int ov61_0222BC90 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BC90 ** param1[v3] = &v2[v3].unk_0C; } - for ( ; v3 < param2; v3++) { + for (; v3 < param2; v3++) { param1[v3] = NULL; } return v4; } -int ov61_0222BCD0 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1) +int ov61_0222BCD0(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1) { - UnkStruct_ov61_0222BCD0 * v0; + UnkStruct_ov61_0222BCD0 *v0; int v1 = 0; switch (param1->unk_02) { @@ -134,9 +135,9 @@ int ov61_0222BCD0 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * p return v1; } -int ov61_0222BCF8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1) +int ov61_0222BCF8(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1) { - UnkStruct_ov61_0222BCF8 * v0; + UnkStruct_ov61_0222BCF8 *v0; int v1 = 0; switch (param1->unk_02) { @@ -156,11 +157,11 @@ int ov61_0222BCF8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * p return v1; } -int ov61_0222BD18 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BCF8_sub1_sub1 ** param1, int param2) +int ov61_0222BD18(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222BCF8_sub1_sub1 **param1, int param2) { - UnkStruct_ov61_0222B960 * v0; - UnkStruct_ov61_0222BCF8 * v1; - UnkStruct_ov61_0222BCF8_sub1 * v2; + UnkStruct_ov61_0222B960 *v0; + UnkStruct_ov61_0222BCF8 *v1; + UnkStruct_ov61_0222BCF8_sub1 *v2; int v3, v4; v0 = ov61_0222DE80(); @@ -179,16 +180,16 @@ int ov61_0222BD18 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BCF8_sub param1[v3] = &v2[v3].unk_10; } - for ( ; v3 < param2; v3++) { + for (; v3 < param2; v3++) { param1[v3] = NULL; } return v4; } -int ov61_0222BD64 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1) +int ov61_0222BD64(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1) { - UnkStruct_ov61_0222BD64 * v0; + UnkStruct_ov61_0222BD64 *v0; int v1 = 0; switch (param1->unk_02) { @@ -206,10 +207,10 @@ int ov61_0222BD64 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * p return v1; } -void ov61_0222BD78 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov62_0223DF10 ** param1) +void ov61_0222BD78(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov62_0223DF10 **param1) { - UnkStruct_ov61_0222B960 * v0; - UnkStruct_ov61_0222BD64 * v1; + UnkStruct_ov61_0222B960 *v0; + UnkStruct_ov61_0222BD64 *v1; v0 = ov61_0222DE80(); v1 = (UnkStruct_ov61_0222BD64 *)(v0->unk_04); @@ -217,9 +218,9 @@ void ov61_0222BD78 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov62_0223DF10 ** *param1 = &v1->unk_00; } -int ov61_0222BD88 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1) +int ov61_0222BD88(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1) { - UnkStruct_ov61_0222BD88 * v0; + UnkStruct_ov61_0222BD88 *v0; int v1 = 0; switch (param1->unk_02) { @@ -243,10 +244,10 @@ int ov61_0222BD88 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * p return v1; } -void ov61_0222BDAC (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BDAC ** param1, UnkStruct_ov61_0222BDAC_1 ** param2) +void ov61_0222BDAC(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222BDAC **param1, UnkStruct_ov61_0222BDAC_1 **param2) { - UnkStruct_ov61_0222B960 * v0; - UnkStruct_ov61_0222BD88 * v1; + UnkStruct_ov61_0222B960 *v0; + UnkStruct_ov61_0222BD88 *v1; v0 = ov61_0222DE80(); v1 = (UnkStruct_ov61_0222BD88 *)(v0->unk_04); @@ -255,9 +256,9 @@ void ov61_0222BDAC (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BDAC ** *param2 = &v1->unk_558; } -int ov61_0222BDC8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1) +int ov61_0222BDC8(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1) { - UnkStruct_ov61_0222BDC8 * v0; + UnkStruct_ov61_0222BDC8 *v0; int v1 = 0; switch (param1->unk_02) { @@ -285,10 +286,10 @@ int ov61_0222BDC8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * p return v1; } -u64 ov61_0222BDF0 (UnkStruct_ov62_022349A8 * param0) +u64 ov61_0222BDF0(UnkStruct_ov62_022349A8 *param0) { - UnkStruct_ov61_0222B960 * v0; - UnkStruct_ov61_0222BDC8 * v1; + UnkStruct_ov61_0222B960 *v0; + UnkStruct_ov61_0222BDC8 *v1; v0 = ov61_0222DE80(); v1 = (UnkStruct_ov61_0222BDC8 *)(v0->unk_04); @@ -296,9 +297,9 @@ u64 ov61_0222BDF0 (UnkStruct_ov62_022349A8 * param0) return v1->unk_00; } -int ov61_0222BE00 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1) +int ov61_0222BE00(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1) { - UnkStruct_ov61_0222BE00 * v0; + UnkStruct_ov61_0222BE00 *v0; int v1 = 0; switch (param1->unk_02) { @@ -318,11 +319,11 @@ int ov61_0222BE00 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * p return v1; } -int ov61_0222BE20 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BE20 ** param1, int param2) +int ov61_0222BE20(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222BE20 **param1, int param2) { - UnkStruct_ov61_0222B960 * v0; - UnkStruct_ov61_0222BE00 * v1; - UnkStruct_ov61_0222BE00_sub1 * v2; + UnkStruct_ov61_0222B960 *v0; + UnkStruct_ov61_0222BE00 *v1; + UnkStruct_ov61_0222BE00_sub1 *v2; int v3, v4; v0 = ov61_0222DE80(); @@ -346,16 +347,16 @@ int ov61_0222BE20 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BE20 ** } } - for ( ; v3 < param2; v3++) { + for (; v3 < param2; v3++) { param1[v3] = NULL; } return v4; } -int ov61_0222BEB8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1) +int ov61_0222BEB8(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1) { - UnkStruct_ov61_0222BEB8 * v0; + UnkStruct_ov61_0222BEB8 *v0; int v1 = 0; switch (param1->unk_02) { @@ -375,10 +376,10 @@ int ov61_0222BEB8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * p return v1; } -int ov61_0222BED8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BED8 ** param1) +int ov61_0222BED8(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222BED8 **param1) { - UnkStruct_ov61_0222B960 * v0; - UnkStruct_ov61_0222BEB8 * v1; + UnkStruct_ov61_0222B960 *v0; + UnkStruct_ov61_0222BEB8 *v1; v0 = ov61_0222DE80(); v1 = (UnkStruct_ov61_0222BEB8 *)(v0->unk_04); @@ -393,7 +394,7 @@ int ov61_0222BED8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222BED8 ** return v1->unk_04; } -int ov61_0222BF24 (UnkStruct_ov62_022349A8 * param0, UnkStruct_ov61_0222B960 * param1) +int ov61_0222BF24(UnkStruct_ov62_022349A8 *param0, UnkStruct_ov61_0222B960 *param1) { int v0 = 0; diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 8e1acb3a40..d083eca05a 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -1,126 +1,124 @@ +#include "overlay061/ov61_0222BF44.h" + +#include #include #include -#include - -#include "inlines.h" -#include "core_sys.h" #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02025CCC_decl.h" #include "struct_decls/struct_0202B370_decl.h" - #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_02017498.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay004/ov4_021D0D80.h" #include "overlay061/struct_ov61_0222C3B0.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202ACE0.h" #include "unk_020366A0.h" #include "unk_02038FFC.h" #include "unk_020393C8.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay061/ov61_0222BF44.h" typedef struct { - UnkStruct_02017498 * unk_00; - BGL * unk_04; + UnkStruct_02017498 *unk_00; + BGL *unk_04; int unk_08; int unk_0C; int unk_10; int unk_14; int unk_18; int unk_1C; - StringTemplate * unk_20; - MessageLoader * unk_24; - MessageLoader * unk_28; - MessageLoader * unk_2C; - MessageLoader * unk_30; - Strbuf* unk_34; - Strbuf* unk_38; - Strbuf* unk_3C; + StringTemplate *unk_20; + MessageLoader *unk_24; + MessageLoader *unk_28; + MessageLoader *unk_2C; + MessageLoader *unk_30; + Strbuf *unk_34; + Strbuf *unk_38; + Strbuf *unk_3C; int unk_40; Window unk_44; Window unk_54; Window unk_64; Window unk_74; - UIControlData * unk_84; - void * unk_88; + UIControlData *unk_84; + void *unk_88; int unk_8C; int unk_90; int unk_94; int unk_98; - ResourceMetadata * unk_9C; - BmpList * unk_A0; + ResourceMetadata *unk_9C; + BmpList *unk_A0; UnkStruct_ov61_0222C3B0 unk_A4; } UnkStruct_ov61_0222C664; -int ov61_0222BF44(OverlayManager * param0, int * param1); -int ov61_0222C0F8(OverlayManager * param0, int * param1); -int ov61_0222C160(OverlayManager * param0, int * param1); -static void ov61_0222C1FC(void * param0); -static void ov61_0222C224(BGL * param0); -static void ov61_0222C38C(BGL * param0); -static void ov61_0222C3B0(UnkStruct_ov61_0222C664 * param0); -static void ov61_0222C664(UnkStruct_ov61_0222C664 * param0); -static void ov61_0222C70C(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222C728(Window * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); -void ov61_0222C760(Window * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); -static void ov61_0222C794(UnkStruct_ov61_0222C664 * param0, int param1); -static void ov61_0222C7F8(UnkStruct_ov61_0222C664 * param0, int param1, int param2); +int ov61_0222BF44(OverlayManager *param0, int *param1); +int ov61_0222C0F8(OverlayManager *param0, int *param1); +int ov61_0222C160(OverlayManager *param0, int *param1); +static void ov61_0222C1FC(void *param0); +static void ov61_0222C224(BGL *param0); +static void ov61_0222C38C(BGL *param0); +static void ov61_0222C3B0(UnkStruct_ov61_0222C664 *param0); +static void ov61_0222C664(UnkStruct_ov61_0222C664 *param0); +static void ov61_0222C70C(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222C728(Window *param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); +void ov61_0222C760(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5); +static void ov61_0222C794(UnkStruct_ov61_0222C664 *param0, int param1); +static void ov61_0222C7F8(UnkStruct_ov61_0222C664 *param0, int param1, int param2); static int ov61_0222C834(int param0); -static void ov61_0222C850(UnkStruct_ov61_0222C664 * param0); -static void ov61_0222C86C(UnkStruct_ov61_0222C664 * param0); -static UIControlData * ov61_0222C884(BGL * param0, int param1, int param2); -static void ov61_0222C8B8(UnkStruct_ov61_0222C664 * param0, MessageLoader * param1, int param2, int param3, u16 param4); -static void ov61_0222C920(UnkStruct_ov61_0222C664 * param0, int param1, int param2); +static void ov61_0222C850(UnkStruct_ov61_0222C664 *param0); +static void ov61_0222C86C(UnkStruct_ov61_0222C664 *param0); +static UIControlData *ov61_0222C884(BGL *param0, int param1, int param2); +static void ov61_0222C8B8(UnkStruct_ov61_0222C664 *param0, MessageLoader *param1, int param2, int param3, u16 param4); +static void ov61_0222C920(UnkStruct_ov61_0222C664 *param0, int param1, int param2); static BOOL ov61_0222C928(int param0, int param1); -static int ov61_0222C960(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CA20(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CAA8(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CB2C(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CB3C(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CBF0(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CC40(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CC64(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CCAC(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CCE8(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CD58(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CE14(UnkStruct_ov61_0222C664 * param0); -static int ov61_0222CE2C(UnkStruct_ov61_0222C664 * param0); - -static int (* Unk_ov61_0222E600[])(UnkStruct_ov61_0222C664 *) = { +static int ov61_0222C960(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CA20(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CAA8(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CB2C(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CB3C(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CBF0(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CC40(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CC64(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CCAC(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CCE8(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CD58(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CE14(UnkStruct_ov61_0222C664 *param0); +static int ov61_0222CE2C(UnkStruct_ov61_0222C664 *param0); + +static int (*Unk_ov61_0222E600[])(UnkStruct_ov61_0222C664 *) = { ov61_0222C960, ov61_0222CA20, ov61_0222CAA8, @@ -147,9 +145,9 @@ static const UnkStruct_ov61_0222C884 Unk_ov61_0222E4A0 = { 0x0 }; -int ov61_0222BF44 (OverlayManager * param0, int * param1) +int ov61_0222BF44(OverlayManager *param0, int *param1) { - UnkStruct_ov61_0222C664 * v0; + UnkStruct_ov61_0222C664 *v0; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -217,9 +215,9 @@ int ov61_0222BF44 (OverlayManager * param0, int * param1) return 1; } -int ov61_0222C0F8 (OverlayManager * param0, int * param1) +int ov61_0222C0F8(OverlayManager *param0, int *param1) { - UnkStruct_ov61_0222C664 * v0 = OverlayManager_Data(param0); + UnkStruct_ov61_0222C664 *v0 = OverlayManager_Data(param0); int v1, v2; switch (*param1) { @@ -253,9 +251,9 @@ int ov61_0222C0F8 (OverlayManager * param0, int * param1) return 0; } -int ov61_0222C160 (OverlayManager * param0, int * param1) +int ov61_0222C160(OverlayManager *param0, int *param1) { - UnkStruct_ov61_0222C664 * v0 = OverlayManager_Data(param0); + UnkStruct_ov61_0222C664 *v0 = OverlayManager_Data(param0); inline_ov61_0222C160(&v0->unk_A4); @@ -283,9 +281,9 @@ int ov61_0222C160 (OverlayManager * param0, int * param1) return 1; } -static void ov61_0222C1FC (void * param0) +static void ov61_0222C1FC(void *param0) { - UnkStruct_ov61_0222C664 * v0 = param0; + UnkStruct_ov61_0222C664 *v0 = param0; sub_0201DCAC(); sub_0200A858(); @@ -296,7 +294,7 @@ static void ov61_0222C1FC (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov61_0222C224 (BGL * param0) +static void ov61_0222C224(BGL *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -349,7 +347,7 @@ static void ov61_0222C224 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -364,7 +362,7 @@ static void ov61_0222C224 (BGL * param0) 1, 0, 0, - 0 + 0, }, }; @@ -380,8 +378,7 @@ static void ov61_0222C224 (BGL * param0) { UnkStruct_ov97_0222DB78 v3[] = { - { - 0, + { 0, 0, 0x800, 0, @@ -393,10 +390,8 @@ static void ov61_0222C224 (BGL * param0) 0, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -408,8 +403,7 @@ static void ov61_0222C224 (BGL * param0) 2, 0, 0, - 0 - }, + 0 }, }; sub_020183C4(param0, 4, &v3[0], 0); @@ -426,7 +420,7 @@ static void ov61_0222C224 (BGL * param0) sub_02019690(4, 32, 0, 117); } -static void ov61_0222C38C (BGL * param0) +static void ov61_0222C38C(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -434,10 +428,10 @@ static void ov61_0222C38C (BGL * param0) sub_02019044(param0, 0); } -static void ov61_0222C3B0 (UnkStruct_ov61_0222C664 * param0) +static void ov61_0222C3B0(UnkStruct_ov61_0222C664 *param0) { - BGL * v0 = param0->unk_04; - NARC * v1; + BGL *v0 = param0->unk_04; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 117); @@ -459,7 +453,7 @@ static void ov61_0222C3B0 (UnkStruct_ov61_0222C664 * param0) NARC_dtor(v1); } -static void ov61_0222C664 (UnkStruct_ov61_0222C664 * param0) +static void ov61_0222C664(UnkStruct_ov61_0222C664 *param0) { BGL_AddWindow(param0->unk_04, ¶m0->unk_64, 0, 4, 4, 23, 16, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); BGL_FillWindow(¶m0->unk_64, 0x0); @@ -472,14 +466,14 @@ static void ov61_0222C664 (UnkStruct_ov61_0222C664 * param0) BGL_FillWindow(¶m0->unk_44, 0x0); } -static void ov61_0222C70C (UnkStruct_ov61_0222C664 * param0) +static void ov61_0222C70C(UnkStruct_ov61_0222C664 *param0) { BGL_DeleteWindow(¶m0->unk_44); BGL_DeleteWindow(¶m0->unk_54); BGL_DeleteWindow(¶m0->unk_64); } -static int ov61_0222C728 (Window * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) +static int ov61_0222C728(Window *param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) { int v0 = 0, v1; @@ -497,15 +491,15 @@ static int ov61_0222C728 (Window * param0, Strbuf *param1, int param2, int param return param2; } -void ov61_0222C760 (Window * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) +void ov61_0222C760(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov61_0222C728(param0, param1, param2, param4, param5, 1); sub_0201D78C(param0, 1, param1, param2, param3, 0, param5, NULL); } -static void ov61_0222C794 (UnkStruct_ov61_0222C664 * param0, int param1) +static void ov61_0222C794(UnkStruct_ov61_0222C664 *param0, int param1) { - Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 117); + Strbuf *v0 = Strbuf_Init((16 * 8 * 2), 117); MessageLoader_GetStrbuf(param0->unk_2C, param1, v0); StringTemplate_Format(param0->unk_20, param0->unk_3C, v0); @@ -518,7 +512,7 @@ static void ov61_0222C794 (UnkStruct_ov61_0222C664 * param0, int param1) Strbuf_Free(v0); } -static void ov61_0222C7F8 (UnkStruct_ov61_0222C664 * param0, int param1, int param2) +static void ov61_0222C7F8(UnkStruct_ov61_0222C664 *param0, int param1, int param2) { int v0; @@ -534,7 +528,7 @@ static void ov61_0222C7F8 (UnkStruct_ov61_0222C664 * param0, int param1, int par ov61_0222C794(param0, v0); } -static int ov61_0222C834 (int param0) +static int ov61_0222C834(int param0) { if ((param0 == 0xff) || (Message_Printing(param0) == 0)) { return 0; @@ -543,14 +537,14 @@ static int ov61_0222C834 (int param0) return 1; } -static void ov61_0222C850 (UnkStruct_ov61_0222C664 * param0) +static void ov61_0222C850(UnkStruct_ov61_0222C664 *param0) { if (param0->unk_88 == NULL) { param0->unk_88 = sub_0200E7FC(¶m0->unk_44, 1); } } -static void ov61_0222C86C (UnkStruct_ov61_0222C664 * param0) +static void ov61_0222C86C(UnkStruct_ov61_0222C664 *param0) { if (param0->unk_88 != NULL) { DeleteWaitDial(param0->unk_88); @@ -558,7 +552,7 @@ static void ov61_0222C86C (UnkStruct_ov61_0222C664 * param0) } } -static UIControlData * ov61_0222C884 (BGL * param0, int param1, int param2) +static UIControlData *ov61_0222C884(BGL *param0, int param1, int param2) { UnkStruct_ov61_0222C884 v0; @@ -569,9 +563,9 @@ static UIControlData * ov61_0222C884 (BGL * param0, int param1, int param2) return sub_02002100(param0, &v0, (1 + (18 + 12)), 11, 117); } -static void ov61_0222C8B8 (UnkStruct_ov61_0222C664 * param0, MessageLoader * param1, int param2, int param3, u16 param4) +static void ov61_0222C8B8(UnkStruct_ov61_0222C664 *param0, MessageLoader *param1, int param2, int param3, u16 param4) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param1, param2); @@ -588,13 +582,13 @@ static void ov61_0222C8B8 (UnkStruct_ov61_0222C664 * param0, MessageLoader * par } } -static void ov61_0222C920 (UnkStruct_ov61_0222C664 * param0, int param1, int param2) +static void ov61_0222C920(UnkStruct_ov61_0222C664 *param0, int param1, int param2) { param0->unk_08 = param1; param0->unk_0C = param2; } -static BOOL ov61_0222C928 (int param0, int param1) +static BOOL ov61_0222C928(int param0, int param1) { int v0; BOOL v1; @@ -624,7 +618,7 @@ static BOOL ov61_0222C928 (int param0, int param1) return v1; } -static int ov61_0222C960 (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222C960(UnkStruct_ov61_0222C664 *param0) { if (ov61_0222C834(param0->unk_40) == 1) { return 0; @@ -642,8 +636,7 @@ static int ov61_0222C960 (UnkStruct_ov61_0222C664 * param0) param0->unk_84 = ov61_0222C884(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16) + 24 * 2)); param0->unk_90++; break; - case 3: - { + case 3: { int v0 = sub_02002114(param0->unk_84, 117); if (v0 != 0xffffffff) { @@ -653,8 +646,7 @@ static int ov61_0222C960 (UnkStruct_ov61_0222C664 * param0) param0->unk_90++; } } - } - break; + } break; case 4: param0->unk_08 = 1; break; @@ -663,7 +655,7 @@ static int ov61_0222C960 (UnkStruct_ov61_0222C664 * param0) return 0; } -static int ov61_0222CA20 (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CA20(UnkStruct_ov61_0222C664 *param0) { switch (param0->unk_90) { case 0: @@ -680,7 +672,7 @@ static int ov61_0222CA20 (UnkStruct_ov61_0222C664 * param0) break; case 2: DWC_InitInetEx(¶m0->unk_00->unk_20, 2, 1, 20); - DWC_SetAuthServer((DWC_CONNECTINET_AUTH_RELEASE)); + DWC_SetAuthServer(DWC_CONNECTINET_AUTH_RELEASE); DWC_ConnectInetAsync(); param0->unk_08 = 2; break; @@ -689,14 +681,13 @@ static int ov61_0222CA20 (UnkStruct_ov61_0222C664 * param0) return 0; } -static int ov61_0222CAA8 (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CAA8(UnkStruct_ov61_0222C664 *param0) { DWC_ProcessInet(); if (DWC_CheckInet()) { switch (DWC_GetInetStatus()) { - case DWC_CONNECTINET_STATE_ERROR: - { + case DWC_CONNECTINET_STATE_ERROR: { DWCError v0; int v1; DWCErrorType v2; @@ -718,8 +709,7 @@ static int ov61_0222CAA8 (UnkStruct_ov61_0222C664 * param0) case DWC_CONNECTINET_STATE_DISCONNECTING: case DWC_CONNECTINET_STATE_DISCONNECTED: default: - case DWC_CONNECTINET_STATE_FATAL_ERROR: - { + case DWC_CONNECTINET_STATE_FATAL_ERROR: { DWCError v3; int v4; @@ -728,10 +718,8 @@ static int ov61_0222CAA8 (UnkStruct_ov61_0222C664 * param0) ov61_0222C86C(param0); param0->unk_08 = 10; param0->unk_10 = -2; - } - break; - case DWC_CONNECTINET_STATE_CONNECTED: - { + } break; + case DWC_CONNECTINET_STATE_CONNECTED: { DWCApInfo v5; DWC_GetApInfo(&v5); @@ -749,18 +737,17 @@ static int ov61_0222CAA8 (UnkStruct_ov61_0222C664 * param0) return 0; } -static int ov61_0222CB2C (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CB2C(UnkStruct_ov61_0222C664 *param0) { DWC_NASLoginAsync(); param0->unk_08 = 4; return 0; } -static int ov61_0222CB3C (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CB3C(UnkStruct_ov61_0222C664 *param0) { switch (DWC_NASLoginProcess()) { - case DWC_NASLOGIN_STATE_SUCCESS: - ; + case DWC_NASLOGIN_STATE_SUCCESS:; param0->unk_08 = 5; break; case DWC_NASLOGIN_STATE_ERROR: @@ -814,12 +801,12 @@ static int ov61_0222CB3C (UnkStruct_ov61_0222C664 * param0) return 0; } -static int ov61_0222CBF0 (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CBF0(UnkStruct_ov61_0222C664 *param0) { - DWCUserData * v0; + DWCUserData *v0; s32 v1; - UnkStruct_02025CCC * v2; - UnkStruct_0202B370 * v3; + UnkStruct_02025CCC *v2; + UnkStruct_0202B370 *v3; v3 = sub_0202B370(param0->unk_00->unk_00->unk_04); v2 = sub_02025CCC(param0->unk_00->unk_00->unk_04); @@ -838,7 +825,7 @@ static int ov61_0222CBF0 (UnkStruct_ov61_0222C664 * param0) return 0; } -static int ov61_0222CC40 (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CC40(UnkStruct_ov61_0222C664 *param0) { int v0; @@ -849,7 +836,7 @@ static int ov61_0222CC40 (UnkStruct_ov61_0222C664 * param0) return 0; } -static int ov61_0222CC64 (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CC64(UnkStruct_ov61_0222C664 *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_A || gCoreSys.pressedKeys & PAD_BUTTON_B) { Window_Clear(¶m0->unk_64, 0); @@ -865,7 +852,7 @@ static int ov61_0222CC64 (UnkStruct_ov61_0222C664 * param0) return 0; } -static int ov61_0222CCAC (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CCAC(UnkStruct_ov61_0222C664 *param0) { if (param0->unk_08 != 9) { sub_0203848C(); @@ -879,7 +866,7 @@ static int ov61_0222CCAC (UnkStruct_ov61_0222C664 * param0) return 1; } -static int ov61_0222CCE8 (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CCE8(UnkStruct_ov61_0222C664 *param0) { int v0 = 0; @@ -909,7 +896,7 @@ static int ov61_0222CCE8 (UnkStruct_ov61_0222C664 * param0) return 0; } -static int ov61_0222CD58 (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CD58(UnkStruct_ov61_0222C664 *param0) { switch (param0->unk_90) { case 0: @@ -945,7 +932,7 @@ static int ov61_0222CD58 (UnkStruct_ov61_0222C664 * param0) return 0; } -static int ov61_0222CE14 (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CE14(UnkStruct_ov61_0222C664 *param0) { if (ov61_0222C834(param0->unk_40) == 0) { param0->unk_08 = param0->unk_0C; @@ -954,7 +941,7 @@ static int ov61_0222CE14 (UnkStruct_ov61_0222C664 * param0) return 0; } -static int ov61_0222CE2C (UnkStruct_ov61_0222C664 * param0) +static int ov61_0222CE2C(UnkStruct_ov61_0222C664 *param0) { if (ov61_0222C834(param0->unk_40) == 1) { return 0; diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c index e38e22491a..8e1d1393ee 100644 --- a/src/overlay062/ov62_0222F2C0.c +++ b/src/overlay062/ov62_0222F2C0.c @@ -1,55 +1,55 @@ +#include "overlay062/ov62_0222F2C0.h" + #include #include -#include "overlay062/ov62_const_funcptr_tables.h" -#include "core_sys.h" - #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02029C68_decl.h" - #include "struct_defs/struct_0208B284.h" #include "struct_defs/struct_0208C06C.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay062/ov62_022300D8.h" +#include "overlay062/ov62_02231690.h" +#include "overlay062/ov62_0224112C.h" +#include "overlay062/ov62_const_funcptr_tables.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "savedata_misc.h" +#include "sys_task.h" #include "unk_02002328.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_0200762C.h" #include "unk_020093B4.h" -#include "message.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_02012744.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" #include "unk_02023FCC.h" #include "unk_0202419C.h" #include "unk_02024220.h" -#include "savedata_misc.h" #include "unk_020298BC.h" #include "unk_020393C8.h" #include "unk_0208B284.h" #include "unk_0208BA78.h" #include "unk_0208C010.h" -#include "overlay062/ov62_0222F2C0.h" -#include "overlay062/ov62_022300D8.h" -#include "overlay062/ov62_02231690.h" -#include "overlay062/ov62_0224112C.h" -static void ov62_0222F670(BGL * param0); -static void ov62_0222F848(UnkStruct_0208C06C * param0); +static void ov62_0222F670(BGL *param0); +static void ov62_0222F848(UnkStruct_0208C06C *param0); -void ov62_0222F2C0 (UnkStruct_0208C06C * param0) +void ov62_0222F2C0(UnkStruct_0208C06C *param0) { SetMainCallback(NULL, NULL); DisableHBlank(); @@ -97,8 +97,8 @@ void ov62_0222F2C0 (UnkStruct_0208C06C * param0) sub_020397C8(1, 102); { - NNSG2dPaletteData * v0; - void * v1 = sub_020394A8(102); + NNSG2dPaletteData *v0; + void *v1 = sub_020394A8(102); NNS_G2dGetUnpackedPaletteData(v1, &v0); sub_02002FBC(param0->unk_14.unk_14, v0->pRawData, 2, 14 * 16, 32); @@ -142,7 +142,7 @@ void ov62_0222F2C0 (UnkStruct_0208C06C * param0) ov62_022337D4(param0); } -void ov62_0222F514 (UnkStruct_0208C06C * param0) +void ov62_0222F514(UnkStruct_0208C06C *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); @@ -168,7 +168,7 @@ void ov62_0222F514 (UnkStruct_0208C06C * param0) sub_02002F54(param0->unk_14.unk_14); if (param0->unk_00 == 0) { - MiscSaveBlock * v0 = SaveData_MiscSaveBlock(param0->unk_830); + MiscSaveBlock *v0 = SaveData_MiscSaveBlock(param0->unk_830); MiscSaveBlock_SetVsRecorderColor(v0, param0->unk_14.unk_48); } @@ -216,20 +216,20 @@ void ov62_0222F514 (UnkStruct_0208C06C * param0) } static const UnkStruct_ov97_0222DB78 Unk_ov62_022487B0[] = { - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x2000, GX_BG_CHARBASE_0x10000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x2800, GX_BG_CHARBASE_0x14000, GX_BG_EXTPLTT_01, 0x3, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x3000, GX_BG_CHARBASE_0x18000, GX_BG_EXTPLTT_01, 0x2, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x3800, GX_BG_CHARBASE_0x1c000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0} + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x2000, GX_BG_CHARBASE_0x10000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x2800, GX_BG_CHARBASE_0x14000, GX_BG_EXTPLTT_01, 0x3, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x3000, GX_BG_CHARBASE_0x18000, GX_BG_EXTPLTT_01, 0x2, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x3800, GX_BG_CHARBASE_0x1c000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0 } }; static const UnkStruct_ov97_0222DB78 Unk_ov62_02248820[] = { - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xc000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xc800, GX_BG_CHARBASE_0x04000, GX_BG_EXTPLTT_01, 0x3, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xd000, GX_BG_CHARBASE_0x08000, GX_BG_EXTPLTT_01, 0x2, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xd800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0} + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xc000, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xc800, GX_BG_CHARBASE_0x04000, GX_BG_EXTPLTT_01, 0x3, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xd000, GX_BG_CHARBASE_0x08000, GX_BG_EXTPLTT_01, 0x2, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x800, 0x0, 0x1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0xd800, GX_BG_CHARBASE_0x00000, GX_BG_EXTPLTT_01, 0x1, 0x0, 0x0, 0x0 } }; -static void ov62_0222F670 (BGL * param0) +static void ov62_0222F670(BGL *param0) { GXLayers_DisableEngineALayers(); @@ -305,23 +305,30 @@ static void ov62_0222F670 (BGL * param0) G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ, 7, 8); } -void ov62_0222F824 (int param0) +void ov62_0222F824(int param0) { gCoreSys.unk_65 = param0; GXLayers_SwapDisplay(); } -void ov62_0222F834 (UnkStruct_0208C06C * param0) +void ov62_0222F834(UnkStruct_0208C06C *param0) { sub_020183C4(param0->unk_14.unk_10, 2, &Unk_ov62_022487B0[2], 0); } -static void ov62_0222F848 (UnkStruct_0208C06C * param0) +static void ov62_0222F848(UnkStruct_0208C06C *param0) { param0->unk_14.unk_04 = sub_0200C6E4(102); { const UnkStruct_ov104_0224133C v0 = { - 0, 128, 0, 32, 4, 124, 0, 32, + 0, + 128, + 0, + 32, + 4, + 124, + 0, + 32, }; const UnkStruct_ov104_022412F4 v1 = { @@ -334,7 +341,12 @@ static void ov62_0222F848 (UnkStruct_0208C06C * param0) { BOOL v2; const UnkStruct_ov104_02241308 v3 = { - 128, 32, 128, 128, 16, 16, + 128, + 32, + 128, + 128, + 16, + 16, }; param0->unk_14.unk_08 = sub_0200C704(param0->unk_14.unk_04); @@ -349,9 +361,9 @@ static void ov62_0222F848 (UnkStruct_0208C06C * param0) sub_0200964C(sub_0200C738(param0->unk_14.unk_04), 0, (256 * FX32_ONE)); } -void ov62_0222F8E4 (void * param0) +void ov62_0222F8E4(void *param0) { - UnkStruct_0208C06C * v0 = param0; + UnkStruct_0208C06C *v0 = param0; sub_0201DCAC(); sub_02003694(v0->unk_14.unk_14); @@ -360,7 +372,7 @@ void ov62_0222F8E4 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -BOOL ov62_0222F910 (UnkStruct_0208C06C * param0, int * param1) +BOOL ov62_0222F910(UnkStruct_0208C06C *param0, int *param1) { BOOL v0 = 0; @@ -454,7 +466,7 @@ BOOL ov62_0222F910 (UnkStruct_0208C06C * param0, int * param1) return 0; } -void ov62_0222FB44 (UnkStruct_0208C06C * param0, int param1, BOOL param2, int * param3) +void ov62_0222FB44(UnkStruct_0208C06C *param0, int param1, BOOL param2, int *param3) { if (param2) { (*param3) = param1; @@ -463,20 +475,20 @@ void ov62_0222FB44 (UnkStruct_0208C06C * param0, int param1, BOOL param2, int * } } -void ov62_0222FB60 (UnkStruct_0208C06C * param0, int param1) +void ov62_0222FB60(UnkStruct_0208C06C *param0, int param1) { param0->unk_04 = param1; param0->unk_08 = 0; param0->unk_0C = 0; } -void ov62_0222FB6C (UnkStruct_0208C06C * param0, int param1) +void ov62_0222FB6C(UnkStruct_0208C06C *param0, int param1) { param0->unk_08 = param1; param0->unk_0C = 0; } -void ov62_0222FB74 (UnkStruct_0208C06C * param0) +void ov62_0222FB74(UnkStruct_0208C06C *param0) { sub_0208C06C(param0); ov62_02230A5C(param0); @@ -484,7 +496,7 @@ void ov62_0222FB74 (UnkStruct_0208C06C * param0) param0->unk_534.unk_1B0 = 0; } -BOOL ov62_0222FB90 (UnkStruct_0208C06C * param0) +BOOL ov62_0222FB90(UnkStruct_0208C06C *param0) { param0->unk_81C[param0->unk_534.unk_1A4] = param0->unk_818; param0->unk_534.unk_190[param0->unk_534.unk_1A4] = ¶m0->unk_818[param0->unk_534.unk_1B0]; @@ -501,7 +513,7 @@ BOOL ov62_0222FB90 (UnkStruct_0208C06C * param0) return 1; } -BOOL ov62_0222FBF8 (UnkStruct_0208C06C * param0) +BOOL ov62_0222FBF8(UnkStruct_0208C06C *param0) { param0->unk_818 = param0->unk_81C[param0->unk_534.unk_1A4]; @@ -510,7 +522,7 @@ BOOL ov62_0222FBF8 (UnkStruct_0208C06C * param0) return 1; } -void ov62_0222FC1C (UnkStruct_0208C06C * param0) +void ov62_0222FC1C(UnkStruct_0208C06C *param0) { int v0 = param0->unk_818[param0->unk_534.unk_1B0].unk_10; @@ -572,7 +584,7 @@ void ov62_0222FC1C (UnkStruct_0208C06C * param0) } } -BOOL ov62_0222FD3C (UnkStruct_0208C06C * param0) +BOOL ov62_0222FD3C(UnkStruct_0208C06C *param0) { int v0 = param0->unk_818[param0->unk_534.unk_1B0].unk_18; BOOL v1 = 1; @@ -588,7 +600,7 @@ BOOL ov62_0222FD3C (UnkStruct_0208C06C * param0) break; case 5: if (v0 == 0) { - UnkStruct_02029C68 * v2 = sub_02029CA8(sub_0202A750(param0->unk_830), v0); + UnkStruct_02029C68 *v2 = sub_02029CA8(sub_0202A750(param0->unk_830), v0); v1 = sub_02029F34(v2); if (v1 == 0) { @@ -626,9 +638,9 @@ BOOL ov62_0222FD3C (UnkStruct_0208C06C * param0) return v1; } -static void ov62_0222FE1C (u32 param0, u32 param1, void * param2) +static void ov62_0222FE1C(u32 param0, u32 param1, void *param2) { - UnkStruct_0208C06C * v0 = param2; + UnkStruct_0208C06C *v0 = param2; if (param1 != 0) { return; @@ -674,7 +686,7 @@ static void ov62_0222FE1C (u32 param0, u32 param1, void * param2) } } -void ov62_0222FF40 (UnkStruct_0208C06C * param0) +void ov62_0222FF40(UnkStruct_0208C06C *param0) { int v0; @@ -685,7 +697,7 @@ void ov62_0222FF40 (UnkStruct_0208C06C * param0) param0->unk_14.unk_18 = sub_02023FCC(param0->unk_14.unk_1C, 5, ov62_0222FE1C, param0, 102); } -void ov62_0222FF7C (UnkStruct_0208C06C * param0) +void ov62_0222FF7C(UnkStruct_0208C06C *param0) { int v0; s16 v1, v2; @@ -712,7 +724,7 @@ void ov62_0222FF7C (UnkStruct_0208C06C * param0) } } -void ov62_02230014 (UnkStruct_0208C06C * param0) +void ov62_02230014(UnkStruct_0208C06C *param0) { int v0; s16 v1, v2; @@ -726,12 +738,12 @@ void ov62_02230014 (UnkStruct_0208C06C * param0) } } -void ov62_02230054 (UnkStruct_0208C06C * param0) +void ov62_02230054(UnkStruct_0208C06C *param0) { sub_0202404C(param0->unk_14.unk_18); } -void ov62_02230060 (UnkStruct_0208C06C * param0) +void ov62_02230060(UnkStruct_0208C06C *param0) { if (param0->unk_534.unk_1A4 > 0) { param0->unk_534.unk_1A4--; @@ -745,7 +757,7 @@ void ov62_02230060 (UnkStruct_0208C06C * param0) param0->unk_818 = param0->unk_81C[param0->unk_534.unk_1A4]; } -void ov62_02230098 (UnkStruct_0208C06C * param0) +void ov62_02230098(UnkStruct_0208C06C *param0) { param0->unk_838.unk_00 = 0; param0->unk_838.unk_04 = 0xFF; @@ -759,12 +771,12 @@ void ov62_02230098 (UnkStruct_0208C06C * param0) } } -BOOL ov62_022300BC (UnkStruct_0208C06C * param0) +BOOL ov62_022300BC(UnkStruct_0208C06C *param0) { return param0->unk_838.unk_00; } -void ov62_022300C8 (UnkStruct_0208C06C * param0, int param1) +void ov62_022300C8(UnkStruct_0208C06C *param0, int param1) { param0->unk_838.unk_00 = 1; param0->unk_838.unk_04 = param1; diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index 8c45b5997f..1610be0da7 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -1,57 +1,56 @@ +#include "overlay062/ov62_022300D8.h" + #include #include #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" #include "struct_defs/struct_020F3DCC.h" + +#include "overlay062/ov62_0222F2C0.h" +#include "overlay062/ov62_02231690.h" #include "overlay062/struct_ov62_022307C0.h" #include "overlay062/struct_ov62_022307C0_sub1.h" #include "overlay062/struct_ov62_02230C28.h" #include "overlay062/struct_ov62_0223118C.h" #include "overlay062/struct_ov62_022312B0.h" -#include "struct_defs/sprite_template.h" -#include "unk_02002F38.h" -#include "unk_02006E3C.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" -#include "unk_0200C6E4.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02002F38.h" +#include "unk_02006E3C.h" +#include "unk_0200C6E4.h" #include "unk_02012744.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" -#include "strbuf.h" #include "unk_02030A80.h" #include "unk_0208C010.h" -#include "overlay062/ov62_0222F2C0.h" -#include "overlay062/ov62_022300D8.h" -#include "overlay062/ov62_02231690.h" static const u8 Unk_ov62_022488A8[][5] = { - {0x5, 0xA, 0xF, 0x14, 0x19}, - {0x19, 0x14, 0xF, 0xA, 0x5} + { 0x5, 0xA, 0xF, 0x14, 0x19 }, + { 0x19, 0x14, 0xF, 0xA, 0x5 } }; -void ov62_022300D8 (UnkStruct_0208C06C * param0) +void ov62_022300D8(UnkStruct_0208C06C *param0) { - NARC * v0 = param0->unk_14.unk_00; - BGL * v1 = param0->unk_14.unk_10; - SpriteRenderer * v2 = param0->unk_14.unk_04; - SpriteGfxHandler * v3 = param0->unk_14.unk_08; - PaletteData * v4 = param0->unk_14.unk_14; + NARC *v0 = param0->unk_14.unk_00; + BGL *v1 = param0->unk_14.unk_10; + SpriteRenderer *v2 = param0->unk_14.unk_04; + SpriteGfxHandler *v3 = param0->unk_14.unk_08; + PaletteData *v4 = param0->unk_14.unk_14; if (param0->unk_00 == 0) { sub_020070E8(v0, 67, v1, 1, 0, 0, 0, 102); @@ -76,13 +75,13 @@ void ov62_022300D8 (UnkStruct_0208C06C * param0) sub_02003A2C(v4, 1, 0x2, 16, param0->unk_14.unk_44); } -void ov62_022302A8 (UnkStruct_0208C06C * param0, int param1, BOOL param2) +void ov62_022302A8(UnkStruct_0208C06C *param0, int param1, BOOL param2) { - NARC * v0 = param0->unk_14.unk_00; - BGL * v1 = param0->unk_14.unk_10; - SpriteRenderer * v2 = param0->unk_14.unk_04; - SpriteGfxHandler * v3 = param0->unk_14.unk_08; - PaletteData * v4 = param0->unk_14.unk_14; + NARC *v0 = param0->unk_14.unk_00; + BGL *v1 = param0->unk_14.unk_10; + SpriteRenderer *v2 = param0->unk_14.unk_04; + SpriteGfxHandler *v3 = param0->unk_14.unk_08; + PaletteData *v4 = param0->unk_14.unk_14; int v5 = 2; if (param2) { @@ -93,26 +92,26 @@ void ov62_022302A8 (UnkStruct_0208C06C * param0, int param1, BOOL param2) sub_0200710C(v0, v5, v1, param1, 0, 0, 0, 102); } -void ov62_022302F0 (UnkStruct_0208C06C * param0, int param1) +void ov62_022302F0(UnkStruct_0208C06C *param0, int param1) { - NARC * v0 = param0->unk_14.unk_00; - BGL * v1 = param0->unk_14.unk_10; - SpriteRenderer * v2 = param0->unk_14.unk_04; - SpriteGfxHandler * v3 = param0->unk_14.unk_08; - PaletteData * v4 = param0->unk_14.unk_14; + NARC *v0 = param0->unk_14.unk_00; + BGL *v1 = param0->unk_14.unk_10; + SpriteRenderer *v2 = param0->unk_14.unk_04; + SpriteGfxHandler *v3 = param0->unk_14.unk_08; + PaletteData *v4 = param0->unk_14.unk_14; int v5 = 1; sub_020070E8(v0, 45, v1, param1, 0, 0, 0, 102); sub_0200710C(v0, v5, v1, param1, 0, 0, 0, 102); } -void ov62_02230330 (UnkStruct_0208C06C * param0) +void ov62_02230330(UnkStruct_0208C06C *param0) { - NARC * v0 = param0->unk_14.unk_00; - BGL * v1 = param0->unk_14.unk_10; - SpriteRenderer * v2 = param0->unk_14.unk_04; - SpriteGfxHandler * v3 = param0->unk_14.unk_08; - PaletteData * v4 = param0->unk_14.unk_14; + NARC *v0 = param0->unk_14.unk_00; + BGL *v1 = param0->unk_14.unk_10; + SpriteRenderer *v2 = param0->unk_14.unk_04; + SpriteGfxHandler *v3 = param0->unk_14.unk_08; + PaletteData *v4 = param0->unk_14.unk_14; if (param0->unk_00 == 0) { SpriteRenderer_LoadPalette(v4, 2, v2, v3, v0, ov62_02231710(param0, 2), 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 9999); @@ -130,12 +129,12 @@ void ov62_02230330 (UnkStruct_0208C06C * param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(v2, v3, v0, 47, 0, 10000); } -void ov62_02230464 (UnkStruct_0208C06C * param0) +void ov62_02230464(UnkStruct_0208C06C *param0) { SpriteTemplate v0; - SpriteRenderer * v1 = param0->unk_14.unk_04; - SpriteGfxHandler * v2 = param0->unk_14.unk_08; - PaletteData * v3 = param0->unk_14.unk_14; + SpriteRenderer *v1 = param0->unk_14.unk_04; + SpriteGfxHandler *v2 = param0->unk_14.unk_08; + PaletteData *v3 = param0->unk_14.unk_14; v0.x = 0; v0.y = 0; @@ -156,16 +155,31 @@ void ov62_02230464 (UnkStruct_0208C06C * param0) { int v4, v5; const s16 v6[] = { - 82, 178, 118, 42, 150, 210, + 82, + 178, + 118, + 42, + 150, + 210, }; const f32 v7[] = { - 1.4f, 1.8f, 2.0f, 1.6f, 1.4f, 1.6f, + 1.4f, + 1.8f, + 2.0f, + 1.6f, + 1.4f, + 1.6f, }; const s8 v8[] = { - -1, -3, +2, -1, -3, +2, + -1, + -3, + +2, + -1, + -3, + +2, }; - for (v5 = 0; v5 < ((3 * 2)); v5++) { + for (v5 = 0; v5 < (3 * 2); v5++) { for (v4 = 0; v4 < 2; v4++) { if (v4 == 0) { v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN; @@ -218,7 +232,7 @@ void ov62_02230464 (UnkStruct_0208C06C * param0) do { v9 = 0; - for (v5 = 0; v5 < ((3 * 2)); v5++) { + for (v5 = 0; v5 < (3 * 2); v5++) { if (param0->unk_6F8[v5].unk_2C == 3) { continue; } @@ -231,33 +245,33 @@ void ov62_02230464 (UnkStruct_0208C06C * param0) } } -void ov62_0223066C (UnkStruct_0208C06C * param0) +void ov62_0223066C(UnkStruct_0208C06C *param0) { int v0, v1; - for (v1 = 0; v1 < ((3 * 2)); v1++) { + for (v1 = 0; v1 < (3 * 2); v1++) { for (v0 = 0; v0 < 2; v0++) { sub_0200D0F4(param0->unk_6F8[v1].unk_00[v0]); } } } -void ov62_0223069C (UnkStruct_0208C06C * param0) +void ov62_0223069C(UnkStruct_0208C06C *param0) { int v0; - for (v0 = 0; v0 < ((3 * 2)); v0++) { + for (v0 = 0; v0 < (3 * 2); v0++) { SysTask_Done(param0->unk_6F8[v0].unk_08); } } -void ov62_022306B8 (UnkStruct_0208C06C * param0) +void ov62_022306B8(UnkStruct_0208C06C *param0) { - NARC * v0 = param0->unk_14.unk_00; - BGL * v1 = param0->unk_14.unk_10; - SpriteRenderer * v2 = param0->unk_14.unk_04; - SpriteGfxHandler * v3 = param0->unk_14.unk_08; - PaletteData * v4 = param0->unk_14.unk_14; + NARC *v0 = param0->unk_14.unk_00; + BGL *v1 = param0->unk_14.unk_10; + SpriteRenderer *v2 = param0->unk_14.unk_04; + SpriteGfxHandler *v3 = param0->unk_14.unk_08; + PaletteData *v4 = param0->unk_14.unk_14; int v5; int v6; int v7; @@ -304,16 +318,16 @@ void ov62_022306B8 (UnkStruct_0208C06C * param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(v2, v3, v0, v7, 0, 10002); } -void ov62_022307A0 (UnkStruct_0208C06C * param0) +void ov62_022307A0(UnkStruct_0208C06C *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_14.unk_08, 10001); SpriteGfxHandler_UnloadCharObjById(param0->unk_14.unk_08, 10002); } -void ov62_022307C0 (UnkStruct_0208C06C * param0) +void ov62_022307C0(UnkStruct_0208C06C *param0) { int v0; - UnkStruct_ov62_022307C0 * v1 = ¶m0->unk_534; + UnkStruct_ov62_022307C0 *v1 = ¶m0->unk_534; for (v0 = 0; v0 < 5; v0++) { ov62_02230E68(v1->unk_00[v0].unk_00, 42 + 8, (25 + (36 * 4) + (16 * (5 - (param0->unk_534.unk_1AC)))) + 48); @@ -347,14 +361,14 @@ void ov62_022307C0 (UnkStruct_0208C06C * param0) } while (v0 < param0->unk_534.unk_1A4); } -void ov62_0223088C (UnkStruct_0208C06C * param0) +void ov62_0223088C(UnkStruct_0208C06C *param0) { int v0; - UnkStruct_ov62_022307C0 * v1 = ¶m0->unk_534; + UnkStruct_ov62_022307C0 *v1 = ¶m0->unk_534; SpriteTemplate v2; - SpriteRenderer * v3 = param0->unk_14.unk_04; - SpriteGfxHandler * v4 = param0->unk_14.unk_08; - PaletteData * v5 = param0->unk_14.unk_14; + SpriteRenderer *v3 = param0->unk_14.unk_04; + SpriteGfxHandler *v4 = param0->unk_14.unk_08; + PaletteData *v5 = param0->unk_14.unk_14; v2.x = 42; v2.y = (25 + (36 * 4) + (16 * (5 - (param0->unk_534.unk_1AC)))) + 32; @@ -432,7 +446,7 @@ void ov62_0223088C (UnkStruct_0208C06C * param0) sub_02003A2C(v5, 2, 0xC, 16, param0->unk_14.unk_44); } -void ov62_02230A5C (UnkStruct_0208C06C * param0) +void ov62_02230A5C(UnkStruct_0208C06C *param0) { int v0; @@ -448,7 +462,7 @@ void ov62_02230A5C (UnkStruct_0208C06C * param0) } } -void ov62_02230AB8 (UnkStruct_0208C06C * param0) +void ov62_02230AB8(UnkStruct_0208C06C *param0) { int v0; @@ -458,7 +472,7 @@ void ov62_02230AB8 (UnkStruct_0208C06C * param0) } } -void ov62_02230AF0 (UnkStruct_0208C06C * param0) +void ov62_02230AF0(UnkStruct_0208C06C *param0) { int v0; @@ -475,10 +489,10 @@ void ov62_02230AF0 (UnkStruct_0208C06C * param0) } } -void ov62_02230B74 (UnkStruct_0208C06C * param0) +void ov62_02230B74(UnkStruct_0208C06C *param0) { int v0; - UnkStruct_ov62_022307C0 * v1 = ¶m0->unk_534; + UnkStruct_ov62_022307C0 *v1 = ¶m0->unk_534; for (v0 = 0; v0 < 5; v0++) { sub_0200D0F4(v1->unk_00[v0].unk_00); @@ -486,7 +500,7 @@ void ov62_02230B74 (UnkStruct_0208C06C * param0) } } -void ov62_02230B9C (UnkStruct_0208C06C * param0, BOOL param1) +void ov62_02230B9C(UnkStruct_0208C06C *param0, BOOL param1) { int v0; @@ -509,9 +523,9 @@ void ov62_02230B9C (UnkStruct_0208C06C * param0, BOOL param1) } } -void ov62_02230C28 (SysTask * param0, void * param1) +void ov62_02230C28(SysTask *param0, void *param1) { - UnkStruct_ov62_02230C28 * v0 = param1; + UnkStruct_ov62_02230C28 *v0 = param1; v0->unk_1C++; v0->unk_1C %= 2; @@ -521,18 +535,15 @@ void ov62_02230C28 (SysTask * param0, void * param1) } switch (v0->unk_2C) { - case 0: - { + case 0: { if (v0->unk_28 == 3) { v0->unk_2C++; v0->unk_28 = 0; } else { v0->unk_28++; } - } - break; - case 1: - { + } break; + case 1: { fx32 v1, v2; fx32 v3, v4; @@ -543,7 +554,7 @@ void ov62_02230C28 (SysTask * param0, void * param1) sub_0200D638(v0->unk_00[0], &v1, &v2); sub_0200D638(v0->unk_00[1], &v3, &v4); - v1 = v1 + ((sub_0201D250(((v0->unk_20 * 0xffff) / 360)) * 1) * (v0->unk_18 * -1)); + v1 = v1 + ((sub_0201D250((v0->unk_20 * 0xffff) / 360) * 1) * (v0->unk_18 * -1)); v3 = v1; v0->unk_20 += 32; @@ -554,14 +565,17 @@ void ov62_02230C28 (SysTask * param0, void * param1) v0->unk_28++; } - } - break; + } break; - case 2: - { + case 2: { s16 v5, v6, v7; int v8[] = { - 90, 135, 270, 45, 225, 0, + 90, + 135, + 270, + 45, + 225, + 0, }; SpriteActor_GetSpritePositionXY(v0->unk_00[0], &v5, &v6); @@ -583,10 +597,8 @@ void ov62_02230C28 (SysTask * param0, void * param1) SpriteActor_SetSpritePositionXY(v0->unk_00[0], v5, v6); SpriteActor_SetSpritePositionXY(v0->unk_00[1], v5, v7); - } - break; - case 3: - { + } break; + case 3: { fx32 v9, v10; fx32 v11, v12; @@ -598,7 +610,7 @@ void ov62_02230C28 (SysTask * param0, void * param1) sub_0200D638(v0->unk_00[0], &v9, &v10); sub_0200D638(v0->unk_00[1], &v11, &v12); - v9 = v0->unk_0C + ((sub_0201D250(((v0->unk_20 * 0xffff) / 360)) * 3) * (v0->unk_18 * -1)); + v9 = v0->unk_0C + ((sub_0201D250((v0->unk_20 * 0xffff) / 360) * 3) * (v0->unk_18 * -1)); v11 = v9; if (v0->unk_19 % 2) { @@ -611,8 +623,7 @@ void ov62_02230C28 (SysTask * param0, void * param1) sub_0200D614(v0->unk_00[0], v9, v10); sub_0200D614(v0->unk_00[1], v11, v12); - } - break; + } break; } if ((v0->unk_2C >= 2) && (v0->unk_10 > 0.1f)) { @@ -623,27 +634,27 @@ void ov62_02230C28 (SysTask * param0, void * param1) } } -void ov62_02230E68 (CellActorData * param0, s16 param1, s16 param2) +void ov62_02230E68(CellActorData *param0, s16 param1, s16 param2) { sub_0200D500(param0, param1, param2, (256 * FX32_ONE)); } -void ov62_02230E74 (CellActorData * param0, s16 * param1, s16 * param2) +void ov62_02230E74(CellActorData *param0, s16 *param1, s16 *param2) { sub_0200D5A0(param0, param1, param2, (256 * FX32_ONE)); } -void ov62_02230E80 (UnkStruct_0208C06C * param0) +void ov62_02230E80(UnkStruct_0208C06C *param0) { s16 v0, v1; UnkStruct_020127E8 v2; - Strbuf* v3; + Strbuf *v3; int v4; - MessageLoader * v5; + MessageLoader *v5; Window v6; - UnkStruct_ov62_022307C0_sub1 * v7[2]; - int v8[2] = {NNS_G2D_VRAM_TYPE_2DMAIN, NNS_G2D_VRAM_TYPE_2DSUB}; - int v9[2] = {9999, 10000}; + UnkStruct_ov62_022307C0_sub1 *v7[2]; + int v8[2] = { NNS_G2D_VRAM_TYPE_2DMAIN, NNS_G2D_VRAM_TYPE_2DSUB }; + int v9[2] = { 9999, 10000 }; int v10, v11; for (v10 = 0; v10 < 5; v10++) { @@ -681,14 +692,14 @@ void ov62_02230E80 (UnkStruct_0208C06C * param0) } } -void ov62_02230FC8 (UnkStruct_0208C06C * param0, UnkStruct_ov62_022307C0_sub1 * param1, int param2, const UnkStruct_020F3DCC * param3) +void ov62_02230FC8(UnkStruct_0208C06C *param0, UnkStruct_ov62_022307C0_sub1 *param1, int param2, const UnkStruct_020F3DCC *param3) { - Strbuf* v0; - MessageLoader * v1; + Strbuf *v0; + MessageLoader *v1; Window v2; - StringTemplate * v3; - Strbuf* v4; - Strbuf* v5; + StringTemplate *v3; + Strbuf *v4; + Strbuf *v5; v1 = param0->unk_14.unk_34; @@ -736,10 +747,10 @@ void ov62_02230FC8 (UnkStruct_0208C06C * param0, UnkStruct_ov62_022307C0_sub1 * BGL_DeleteWindow(&v2); } -void ov62_0223113C (UnkStruct_0208C06C * param0) +void ov62_0223113C(UnkStruct_0208C06C *param0) { int v0, v1; - UnkStruct_ov62_022307C0_sub1 * v2[2]; + UnkStruct_ov62_022307C0_sub1 *v2[2]; for (v0 = 0; v0 < 5; v0++) { v2[0] = ¶m0->unk_534.unk_C8[v0]; @@ -753,13 +764,13 @@ void ov62_0223113C (UnkStruct_0208C06C * param0) } } -void ov62_0223118C (UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * param1, int param2) +void ov62_0223118C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *param1, int param2) { s16 v0, v1; UnkStruct_020127E8 v2; - Strbuf* v3; + Strbuf *v3; int v4; - MessageLoader * v5; + MessageLoader *v5; Window v6; int v7 = 9999; @@ -796,10 +807,10 @@ void ov62_0223118C (UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * sub_020129D0(param0->unk_0C, 0); } -void ov62_0223124C (UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * param1, int param2) +void ov62_0223124C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *param1, int param2) { - Strbuf* v0; - MessageLoader * v1; + Strbuf *v0; + MessageLoader *v1; Window v2; v1 = param1->unk_34; @@ -813,46 +824,46 @@ void ov62_0223124C (UnkStruct_ov62_022312B0 * param0, UnkStruct_ov62_0223118C * BGL_DeleteWindow(&v2); } -void ov62_022312B0 (UnkStruct_ov62_022312B0 * param0) +void ov62_022312B0(UnkStruct_ov62_022312B0 *param0) { sub_02012B48(param0->unk_10); sub_02012BD8(param0->unk_0C); sub_0201EE28(¶m0->unk_14); } -void ov62_022312CC (UnkStruct_0208C06C * param0, int param1) +void ov62_022312CC(UnkStruct_0208C06C *param0, int param1) { - NARC * v0 = param0->unk_14.unk_00; - BGL * v1 = param0->unk_14.unk_10; - SpriteRenderer * v2 = param0->unk_14.unk_04; - SpriteGfxHandler * v3 = param0->unk_14.unk_08; - PaletteData * v4 = param0->unk_14.unk_14; + NARC *v0 = param0->unk_14.unk_00; + BGL *v1 = param0->unk_14.unk_10; + SpriteRenderer *v2 = param0->unk_14.unk_04; + SpriteGfxHandler *v3 = param0->unk_14.unk_08; + PaletteData *v4 = param0->unk_14.unk_14; SpriteRenderer_LoadCharResObjFromOpenNarc(v2, v3, v0, 49, 0, param1, 11924); SpriteRenderer_LoadCellResObjFromOpenNarc(v2, v3, v0, 26, 0, 11924); SpriteRenderer_LoadAnimResObjFromOpenNarc(v2, v3, v0, 27, 0, 11924); } -void ov62_0223131C (UnkStruct_0208C06C * param0, int param1) +void ov62_0223131C(UnkStruct_0208C06C *param0, int param1) { - NARC * v0 = param0->unk_14.unk_00; - BGL * v1 = param0->unk_14.unk_10; - SpriteRenderer * v2 = param0->unk_14.unk_04; - SpriteGfxHandler * v3 = param0->unk_14.unk_08; - PaletteData * v4 = param0->unk_14.unk_14; + NARC *v0 = param0->unk_14.unk_00; + BGL *v1 = param0->unk_14.unk_10; + SpriteRenderer *v2 = param0->unk_14.unk_04; + SpriteGfxHandler *v3 = param0->unk_14.unk_08; + PaletteData *v4 = param0->unk_14.unk_14; SpriteRenderer_LoadCharResObjFromOpenNarc(v2, v3, v0, 122, 0, param1, 11924); SpriteRenderer_LoadCellResObjFromOpenNarc(v2, v3, v0, 123, 0, 11924); SpriteRenderer_LoadAnimResObjFromOpenNarc(v2, v3, v0, 124, 0, 11924); } -void ov62_0223136C (UnkStruct_0208C06C * param0, int param1) +void ov62_0223136C(UnkStruct_0208C06C *param0, int param1) { - NARC * v0 = param0->unk_14.unk_00; - BGL * v1 = param0->unk_14.unk_10; - SpriteRenderer * v2 = param0->unk_14.unk_04; - SpriteGfxHandler * v3 = param0->unk_14.unk_08; - PaletteData * v4 = param0->unk_14.unk_14; + NARC *v0 = param0->unk_14.unk_00; + BGL *v1 = param0->unk_14.unk_10; + SpriteRenderer *v2 = param0->unk_14.unk_04; + SpriteGfxHandler *v3 = param0->unk_14.unk_08; + PaletteData *v4 = param0->unk_14.unk_14; int v5 = 30; int v6 = 32; int v7 = 31; @@ -862,16 +873,16 @@ void ov62_0223136C (UnkStruct_0208C06C * param0, int param1) SpriteRenderer_LoadAnimResObjFromOpenNarc(v2, v3, v0, v7, 0, 11924); } -void ov62_022313BC (UnkStruct_0208C06C * param0) +void ov62_022313BC(UnkStruct_0208C06C *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_14.unk_08, 11924); SpriteGfxHandler_UnloadCellObjById(param0->unk_14.unk_08, 11924); SpriteGfxHandler_UnloadAnimObjById(param0->unk_14.unk_08, 11924); } -CellActorData * ov62_022313E0 (UnkStruct_0208C06C * param0, int param1) +CellActorData *ov62_022313E0(UnkStruct_0208C06C *param0, int param1) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; v1.x = 128; @@ -904,14 +915,14 @@ CellActorData * ov62_022313E0 (UnkStruct_0208C06C * param0, int param1) return v0; } -void ov62_02231454 (UnkStruct_0208C06C * param0) +void ov62_02231454(UnkStruct_0208C06C *param0) { ov62_02230B9C(param0, 0); ov62_02230B74(param0); ov62_022307A0(param0); } -void ov62_0223146C (UnkStruct_0208C06C * param0) +void ov62_0223146C(UnkStruct_0208C06C *param0) { ov62_022306B8(param0); ov62_02230060(param0); @@ -924,7 +935,7 @@ void ov62_0223146C (UnkStruct_0208C06C * param0) ov62_02230AF0(param0); } -void ov62_022314A8 (UnkStruct_0208C06C * param0) +void ov62_022314A8(UnkStruct_0208C06C *param0) { ov62_022306B8(param0); ov62_02230060(param0); @@ -939,7 +950,7 @@ void ov62_022314A8 (UnkStruct_0208C06C * param0) param0->unk_534.unk_1A4 += 1; } -void ov62_022314F0 (int * param0, int * param1, int param2, int param3, int param4, int param5, int param6) +void ov62_022314F0(int *param0, int *param1, int param2, int param3, int param4, int param5, int param6) { *param0 = 0; *param1 = 31; @@ -958,7 +969,7 @@ void ov62_022314F0 (int * param0, int * param1, int param2, int param3, int para } } -void ov62_02231560 (int * param0, int * param1, int param2, int param3, int param4, int param5, int param6) +void ov62_02231560(int *param0, int *param1, int param2, int param3, int param4, int param5, int param6) { if (param6 == 0) { G2_SetBlendAlpha(param2, param3, *param0, *param1); @@ -974,12 +985,12 @@ void ov62_02231560 (int * param0, int * param1, int param2, int param3, int para } } -void ov62_022315C8 (int * param0, int * param1, int param2) +void ov62_022315C8(int *param0, int *param1, int param2) { ov62_022314F0(param0, param1, (GX_BLEND_PLANEMASK_BG3), (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ), (GX_BLEND_PLANEMASK_BG3), (GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_OBJ), param2); } -BOOL ov62_022315E0 (int * param0, int * param1, int param2, int param3) +BOOL ov62_022315E0(int *param0, int *param1, int param2, int param3) { BOOL v0 = 1; @@ -1019,7 +1030,7 @@ BOOL ov62_022315E0 (int * param0, int * param1, int param2, int param3) return v0; } -BOOL ov62_02231664 (int * param0, int param1) +BOOL ov62_02231664(int *param0, int param1) { BOOL v0 = 1; @@ -1038,7 +1049,7 @@ BOOL ov62_02231664 (int * param0, int param1) return v0; } -void ov62_02231688 (int * param0) +void ov62_02231688(int *param0) { *param0 = 16; } diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c index 13e1ba8a88..d6cd2d5e30 100644 --- a/src/overlay062/ov62_02234A10.c +++ b/src/overlay062/ov62_02234A10.c @@ -1,47 +1,46 @@ +#include "overlay062/ov62_02234A10.h" + #include #include -#include "overlay062/ov62_const_funcptr_tables.h" - -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" + +#include "overlay062/ov62_0222F2C0.h" +#include "overlay062/ov62_022300D8.h" +#include "overlay062/ov62_02231690.h" +#include "overlay062/ov62_const_funcptr_tables.h" #include "overlay062/struct_ov62_02235008.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" +#include "touch_screen.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "message.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "touch_screen.h" -#include "strbuf.h" #include "unk_0208B284.h" -#include "overlay062/ov62_0222F2C0.h" -#include "overlay062/ov62_022300D8.h" -#include "overlay062/ov62_02231690.h" -#include "overlay062/ov62_02234A10.h" -static void ov62_02234A10(UnkStruct_0208C06C * param0); -static void ov62_02234A90(UnkStruct_0208C06C * param0); -static BOOL ov62_02234AB4(UnkStruct_0208C06C * param0); -static BOOL ov62_02234CDC(UnkStruct_0208C06C * param0); -static BOOL ov62_02234EF8(UnkStruct_0208C06C * param0); -static BOOL ov62_02234FCC(UnkStruct_0208C06C * param0); -BOOL ov62_02235008(UnkStruct_0208C06C * param0); +static void ov62_02234A10(UnkStruct_0208C06C *param0); +static void ov62_02234A90(UnkStruct_0208C06C *param0); +static BOOL ov62_02234AB4(UnkStruct_0208C06C *param0); +static BOOL ov62_02234CDC(UnkStruct_0208C06C *param0); +static BOOL ov62_02234EF8(UnkStruct_0208C06C *param0); +static BOOL ov62_02234FCC(UnkStruct_0208C06C *param0); +BOOL ov62_02235008(UnkStruct_0208C06C *param0); -static void ov62_02234A10 (UnkStruct_0208C06C * param0) +static void ov62_02234A10(UnkStruct_0208C06C *param0) { - Strbuf* v0; + Strbuf *v0; int v1; - Window * v2 = ¶m0->unk_8A4; + Window *v2 = ¶m0->unk_8A4; Window_Init(v2); BGL_AddWindow(param0->unk_14.unk_10, v2, 2, 8, 16, 16, 2, 14, 300); @@ -56,14 +55,14 @@ static void ov62_02234A10 (UnkStruct_0208C06C * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); } -static void ov62_02234A90 (UnkStruct_0208C06C * param0) +static void ov62_02234A90(UnkStruct_0208C06C *param0) { sub_0201ACF4(¶m0->unk_8A4); BGL_DeleteWindow(¶m0->unk_8A4); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } -static BOOL ov62_02234AB4 (UnkStruct_0208C06C * param0) +static BOOL ov62_02234AB4(UnkStruct_0208C06C *param0) { switch (param0->unk_08) { case 0: @@ -149,7 +148,7 @@ static BOOL ov62_02234AB4 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02234CDC (UnkStruct_0208C06C * param0) +static BOOL ov62_02234CDC(UnkStruct_0208C06C *param0) { switch (param0->unk_08) { case 0: @@ -223,7 +222,7 @@ static BOOL ov62_02234CDC (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02234EF8 (UnkStruct_0208C06C * param0) +static BOOL ov62_02234EF8(UnkStruct_0208C06C *param0) { switch (param0->unk_08) { case 0: @@ -259,7 +258,7 @@ static BOOL ov62_02234EF8 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02234FCC (UnkStruct_0208C06C * param0) +static BOOL ov62_02234FCC(UnkStruct_0208C06C *param0) { BOOL v0 = ov62_02235008(param0); @@ -273,9 +272,9 @@ static BOOL ov62_02234FCC (UnkStruct_0208C06C * param0) return v0; } -BOOL ov62_02235008 (UnkStruct_0208C06C * param0) +BOOL ov62_02235008(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235008 * v0; + UnkStruct_ov62_02235008 *v0; switch (param0->unk_08) { case 0: @@ -338,7 +337,7 @@ BOOL ov62_02235008 (UnkStruct_0208C06C * param0) } v8 = v6 * FX32_ONE; - v7 = v0->unk_00[v3].unk_0C + (sub_0201D250(((v0->unk_00[v3].unk_04 * 0xffff) / 360)) * 16); + v7 = v0->unk_00[v3].unk_0C + (sub_0201D250((v0->unk_00[v3].unk_04 * 0xffff) / 360) * 16); v0->unk_00[v3].unk_04 += (-4 * 1); sub_0200D614(param0->unk_534.unk_C8[v3].unk_00, v7, v8); @@ -367,9 +366,11 @@ BOOL ov62_02235008 (UnkStruct_0208C06C * param0) return 0; } +// clang-format off BOOL(*const Unk_ov62_02248BD8[])(UnkStruct_0208C06C *) = { ov62_02234AB4, ov62_02234CDC, ov62_02234EF8, ov62_02234FCC, }; +// clang-format on diff --git a/src/overlay062/ov62_02235278.c b/src/overlay062/ov62_02235278.c index f4a4aa979f..4578229557 100644 --- a/src/overlay062/ov62_02235278.c +++ b/src/overlay062/ov62_02235278.c @@ -1,41 +1,41 @@ +#include "overlay062/ov62_02235278.h" + #include #include -#include "overlay062/ov62_const_funcptr_tables.h" - -#include "sys_task_manager.h" - -#include "touch_screen.h" #include "struct_defs/struct_0208C06C.h" + +#include "overlay062/ov62_0222F2C0.h" +#include "overlay062/ov62_022300D8.h" +#include "overlay062/ov62_02231690.h" +#include "overlay062/ov62_02234A10.h" +#include "overlay062/ov62_const_funcptr_tables.h" #include "overlay062/struct_ov62_022354A4.h" #include "overlay062/struct_ov62_02235580.h" +#include "gx_layers.h" +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_02012744.h" -#include "heap.h" -#include "gx_layers.h" #include "unk_0208B284.h" -#include "overlay062/ov62_0222F2C0.h" -#include "overlay062/ov62_022300D8.h" -#include "overlay062/ov62_02231690.h" -#include "overlay062/ov62_02234A10.h" -#include "overlay062/ov62_02235278.h" -static BOOL ov62_02235278(UnkStruct_0208C06C * param0); -static BOOL ov62_02235308(UnkStruct_0208C06C * param0); -static BOOL ov62_02235324(UnkStruct_0208C06C * param0); -static BOOL ov62_02235444(UnkStruct_0208C06C * param0); -static BOOL ov62_02235580(UnkStruct_0208C06C * param0); -static BOOL ov62_02235854(UnkStruct_0208C06C * param0); -static BOOL ov62_02235A80(UnkStruct_0208C06C * param0); -static BOOL ov62_02235C70(UnkStruct_0208C06C * param0); +static BOOL ov62_02235278(UnkStruct_0208C06C *param0); +static BOOL ov62_02235308(UnkStruct_0208C06C *param0); +static BOOL ov62_02235324(UnkStruct_0208C06C *param0); +static BOOL ov62_02235444(UnkStruct_0208C06C *param0); +static BOOL ov62_02235580(UnkStruct_0208C06C *param0); +static BOOL ov62_02235854(UnkStruct_0208C06C *param0); +static BOOL ov62_02235A80(UnkStruct_0208C06C *param0); +static BOOL ov62_02235C70(UnkStruct_0208C06C *param0); static int ov62_022352DC(void); -static BOOL ov62_02235278 (UnkStruct_0208C06C * param0) +static BOOL ov62_02235278(UnkStruct_0208C06C *param0) { if (TouchScreen_Tapped() && (param0->unk_89C == 0)) { ov62_02231A1C(param0); @@ -63,11 +63,11 @@ static BOOL ov62_02235278 (UnkStruct_0208C06C * param0) return 0; } -static int ov62_022352DC (void) +static int ov62_022352DC(void) { static const TouchScreenHitTable v0[] = { - {0, 192, 0, 8}, - {0, 192, 248, 256}, + { 0, 192, 0, 8 }, + { 0, 192, 248, 256 }, }; if (TouchScreen_LocationHeld(&v0[0])) { @@ -81,7 +81,7 @@ static int ov62_022352DC (void) return 0; } -static BOOL ov62_02235308 (UnkStruct_0208C06C * param0) +static BOOL ov62_02235308(UnkStruct_0208C06C *param0) { BOOL v0 = 0; @@ -93,7 +93,7 @@ static BOOL ov62_02235308 (UnkStruct_0208C06C * param0) return ov62_02235278(param0); } -static BOOL ov62_02235324 (UnkStruct_0208C06C * param0) +static BOOL ov62_02235324(UnkStruct_0208C06C *param0) { switch (param0->unk_08) { case 0: @@ -138,7 +138,7 @@ static BOOL ov62_02235324 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02235444 (UnkStruct_0208C06C * param0) +static BOOL ov62_02235444(UnkStruct_0208C06C *param0) { BOOL v0; @@ -156,7 +156,7 @@ static BOOL ov62_02235444 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02235478 (UnkStruct_0208C06C * param0) +static BOOL ov62_02235478(UnkStruct_0208C06C *param0) { BOOL v0; @@ -178,17 +178,16 @@ static BOOL ov62_02235478 (UnkStruct_0208C06C * param0) return 0; } -void ov62_022354A4 (SysTask * param0, void * param1) +void ov62_022354A4(SysTask *param0, void *param1) { - UnkStruct_ov62_022354A4 * v0 = param1; + UnkStruct_ov62_022354A4 *v0 = param1; switch (v0->unk_1D) { case 0: v0->unk_08 = (v0->unk_04 - v0->unk_00) / v0->unk_1C; v0->unk_0A = (v0->unk_06 - v0->unk_02) / v0->unk_1C; v0->unk_1D++; - case 1: - { + case 1: { s16 v1, v2; ov62_02230E74(v0->unk_20, &v1, &v2); @@ -215,8 +214,7 @@ void ov62_022354A4 (SysTask * param0, void * param1) sub_020128C4(v0->unk_24, 36, -8); *(v0->unk_2C) = 1; - } - break; + } break; default: Heap_FreeToHeap(v0); SysTask_Done(param0); @@ -224,16 +222,15 @@ void ov62_022354A4 (SysTask * param0, void * param1) } } -static BOOL ov62_02235580 (UnkStruct_0208C06C * param0) +static BOOL ov62_02235580(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235580 * v0; + UnkStruct_ov62_02235580 *v0; switch (param0->unk_08) { - case 0: - { + case 0: { int v1; - UnkStruct_ov62_022354A4 * v2; - UnkStruct_ov62_02235580 * v3 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02235580)); + UnkStruct_ov62_022354A4 *v2; + UnkStruct_ov62_02235580 *v3 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02235580)); MI_CpuFill8(v3, 0, sizeof(UnkStruct_ov62_02235580)); param0->unk_860 = v3; @@ -283,7 +280,7 @@ static BOOL ov62_02235580 (UnkStruct_0208C06C * param0) { int v4; - UnkStruct_ov62_022354A4 * v5; + UnkStruct_ov62_022354A4 *v5; if (v0->unk_0C == 1) { v4 = 0; @@ -340,8 +337,7 @@ static BOOL ov62_02235580 (UnkStruct_0208C06C * param0) v0->unk_04 = 0; break; - case 2: - { + case 2: { if (param0->unk_818[param0->unk_534.unk_1B0].unk_20 == NULL) { ov62_0222FC1C(param0); } else { @@ -351,8 +347,7 @@ static BOOL ov62_02235580 (UnkStruct_0208C06C * param0) ov62_0222FB90(param0); v0 = param0->unk_860; Heap_FreeToHeap(v0); - } - break; + } break; default: break; } @@ -360,15 +355,14 @@ static BOOL ov62_02235580 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02235854 (UnkStruct_0208C06C * param0) +static BOOL ov62_02235854(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235580 * v0; + UnkStruct_ov62_02235580 *v0; switch (param0->unk_08) { - case 0: - { + case 0: { int v1; - UnkStruct_ov62_022354A4 * v2; + UnkStruct_ov62_022354A4 *v2; v0 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02235580)); MI_CpuFill8(v0, 0, sizeof(UnkStruct_ov62_02235580)); @@ -408,7 +402,7 @@ static BOOL ov62_02235854 (UnkStruct_0208C06C * param0) v0 = param0->unk_860; { int v3; - UnkStruct_ov62_022354A4 * v4; + UnkStruct_ov62_022354A4 *v4; if (v0->unk_0C == 1) { for (v3 = 0; v3 < param0->unk_534.unk_1AC; v3++) { @@ -461,8 +455,7 @@ static BOOL ov62_02235854 (UnkStruct_0208C06C * param0) v0->unk_04 = 0; break; - default: - { + default: { BOOL v5; v5 = ov62_0222FBF8(param0); @@ -470,14 +463,14 @@ static BOOL ov62_02235854 (UnkStruct_0208C06C * param0) Heap_FreeToHeap(v0); ov62_0222FB60(param0, 5); - } - break; + } break; } return 0; } -BOOL(*const Unk_ov62_02248BF0[])(UnkStruct_0208C06C * wk) = { +// clang-format off +BOOL(*const Unk_ov62_02248BF0[])(UnkStruct_0208C06C *wk) = { ov62_02235278, ov62_02235308, ov62_02235324, @@ -488,8 +481,9 @@ BOOL(*const Unk_ov62_02248BF0[])(UnkStruct_0208C06C * wk) = { ov62_02235A80, ov62_02235C70, }; +// clang-format on -static BOOL ov62_02235A80 (UnkStruct_0208C06C * param0) +static BOOL ov62_02235A80(UnkStruct_0208C06C *param0) { switch (param0->unk_08) { case 0: @@ -547,7 +541,7 @@ static BOOL ov62_02235A80 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02235C70 (UnkStruct_0208C06C * param0) +static BOOL ov62_02235C70(UnkStruct_0208C06C *param0) { switch (param0->unk_08) { case 0: diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c index b365cbe3d6..ab56899c9a 100644 --- a/src/overlay062/ov62_02235E64.c +++ b/src/overlay062/ov62_02235E64.c @@ -1,37 +1,35 @@ #include #include -#include "overlay062/ov62_const_funcptr_tables.h" - -#include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" + +#include "overlay062/ov62_0222F2C0.h" +#include "overlay062/ov62_022300D8.h" +#include "overlay062/ov62_02231690.h" +#include "overlay062/ov62_02248408.h" +#include "overlay062/ov62_const_funcptr_tables.h" #include "overlay062/struct_ov62_022312B0.h" #include "overlay062/struct_ov62_022323B8.h" #include "overlay062/struct_ov62_02233F74.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "savedata.h" +#include "strbuf.h" +#include "touch_screen.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" -#include "message.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02023FCC.h" -#include "savedata.h" #include "unk_0202F1D4.h" #include "unk_0208BA78.h" -#include "overlay062/ov62_0222F2C0.h" -#include "overlay062/ov62_022300D8.h" -#include "overlay062/ov62_02231690.h" -#include "overlay062/ov62_02248408.h" typedef struct { int unk_00; @@ -41,29 +39,30 @@ typedef struct { UnkStruct_ov62_022323B8 unk_10; UnkStruct_ov62_02233F74 unk_9C; UnkStruct_ov62_022312B0 unk_158[1]; - UnkStruct_02023FCC * unk_174[1]; + UnkStruct_02023FCC *unk_174[1]; Window unk_178[2]; int unk_198; } UnkStruct_ov62_02235E64; -static BOOL ov62_02235E64(UnkStruct_0208C06C * param0); -static BOOL ov62_02235EBC(UnkStruct_0208C06C * param0); -static BOOL ov62_0223604C(UnkStruct_0208C06C * param0); -static BOOL ov62_02236174(UnkStruct_0208C06C * param0); -static BOOL ov62_0223618C(UnkStruct_0208C06C * param0); -static BOOL ov62_022363CC(UnkStruct_0208C06C * param0); -static BOOL ov62_02236624(UnkStruct_0208C06C * param0); -static BOOL ov62_022366D4(UnkStruct_0208C06C * param0); -static BOOL ov62_022367B4(UnkStruct_0208C06C * param0); -static BOOL ov62_02236920(UnkStruct_0208C06C * param0); -static void ov62_02236AB0(u32 param0, u32 param1, void * param2); -static void ov62_02236B2C(UnkStruct_0208C06C * param0); -static void ov62_02236B64(UnkStruct_0208C06C * param0); -static void ov62_02236BA8(UnkStruct_0208C06C * param0); -static void ov62_02236BC8(UnkStruct_0208C06C * param0, int param1); -static void ov62_02236C20(UnkStruct_0208C06C * param0); -static void ov62_02236C94(UnkStruct_0208C06C * param0); - +static BOOL ov62_02235E64(UnkStruct_0208C06C *param0); +static BOOL ov62_02235EBC(UnkStruct_0208C06C *param0); +static BOOL ov62_0223604C(UnkStruct_0208C06C *param0); +static BOOL ov62_02236174(UnkStruct_0208C06C *param0); +static BOOL ov62_0223618C(UnkStruct_0208C06C *param0); +static BOOL ov62_022363CC(UnkStruct_0208C06C *param0); +static BOOL ov62_02236624(UnkStruct_0208C06C *param0); +static BOOL ov62_022366D4(UnkStruct_0208C06C *param0); +static BOOL ov62_022367B4(UnkStruct_0208C06C *param0); +static BOOL ov62_02236920(UnkStruct_0208C06C *param0); +static void ov62_02236AB0(u32 param0, u32 param1, void *param2); +static void ov62_02236B2C(UnkStruct_0208C06C *param0); +static void ov62_02236B64(UnkStruct_0208C06C *param0); +static void ov62_02236BA8(UnkStruct_0208C06C *param0); +static void ov62_02236BC8(UnkStruct_0208C06C *param0, int param1); +static void ov62_02236C20(UnkStruct_0208C06C *param0); +static void ov62_02236C94(UnkStruct_0208C06C *param0); + +// clang-format off BOOL(*const Unk_ov62_02248C28[])(UnkStruct_0208C06C *) = { ov62_02235E64, ov62_02235EBC, @@ -76,16 +75,17 @@ BOOL(*const Unk_ov62_02248C28[])(UnkStruct_0208C06C *) = { ov62_022367B4, ov62_02236920, }; +// clang-format on static const TouchScreenRect Unk_ov62_02248C1C[] = { - {0x10, 0x30, 0x40, 0xC8}, - {0x40, 0x70, 0x58, 0xA8}, - {0x98, 0xB8, 0x50, 0xB0} + { 0x10, 0x30, 0x40, 0xC8 }, + { 0x40, 0x70, 0x58, 0xA8 }, + { 0x98, 0xB8, 0x50, 0xB0 } }; -static BOOL ov62_02235E64 (UnkStruct_0208C06C * param0) +static BOOL ov62_02235E64(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02235E64)); + UnkStruct_ov62_02235E64 *v0 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02235E64)); memset(v0, 0, sizeof(UnkStruct_ov62_02235E64)); param0->unk_860 = v0; @@ -101,9 +101,9 @@ static BOOL ov62_02235E64 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02235EBC (UnkStruct_0208C06C * param0) +static BOOL ov62_02235EBC(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -162,9 +162,9 @@ static BOOL ov62_02235EBC (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223604C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223604C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -210,17 +210,17 @@ static BOOL ov62_0223604C (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02236174 (UnkStruct_0208C06C * param0) +static BOOL ov62_02236174(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; sub_0202404C(v0->unk_174[0]); return 0; } -static BOOL ov62_0223618C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223618C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -278,15 +278,15 @@ static BOOL ov62_0223618C (UnkStruct_0208C06C * param0) } static const TouchScreenRect Unk_ov62_02248C14[] = { - {0x28, 0x48, 0x20, 0x78}, - {0x28, 0x48, 0x90, 0xE8} + { 0x28, 0x48, 0x20, 0x78 }, + { 0x28, 0x48, 0x90, 0xE8 } }; -static void ov62_022362B8 (UnkStruct_0208C06C * param0) +static void ov62_022362B8(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; - Window * v1; - Strbuf* v2; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; + Window *v1; + Strbuf *v2; int v3 = 1; int v4; @@ -317,9 +317,9 @@ static void ov62_022362B8 (UnkStruct_0208C06C * param0) sub_0201A9A4(v1); } -static void ov62_02236398 (UnkStruct_0208C06C * param0) +static void ov62_02236398(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; sub_0201ACF4(&v0->unk_178[0]); BGL_DeleteWindow(&v0->unk_178[0]); @@ -327,9 +327,9 @@ static void ov62_02236398 (UnkStruct_0208C06C * param0) BGL_DeleteWindow(&v0->unk_178[1]); } -static BOOL ov62_022363CC (UnkStruct_0208C06C * param0) +static BOOL ov62_022363CC(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -432,9 +432,9 @@ static BOOL ov62_022363CC (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02236624 (UnkStruct_0208C06C * param0) +static BOOL ov62_02236624(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -474,9 +474,9 @@ static BOOL ov62_02236624 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_022366D4 (UnkStruct_0208C06C * param0) +static BOOL ov62_022366D4(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -519,9 +519,9 @@ static BOOL ov62_022366D4 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_022367B4 (UnkStruct_0208C06C * param0) +static BOOL ov62_022367B4(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -582,9 +582,9 @@ static BOOL ov62_022367B4 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02236920 (UnkStruct_0208C06C * param0) +static BOOL ov62_02236920(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -650,10 +650,10 @@ static BOOL ov62_02236920 (UnkStruct_0208C06C * param0) return 0; } -static void ov62_02236AB0 (u32 param0, u32 param1, void * param2) +static void ov62_02236AB0(u32 param0, u32 param1, void *param2) { - UnkStruct_0208C06C * v0 = param2; - UnkStruct_ov62_02235E64 * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param2; + UnkStruct_ov62_02235E64 *v1 = v0->unk_860; if (param1 != 0) { return; @@ -680,19 +680,19 @@ static void ov62_02236AB0 (u32 param0, u32 param1, void * param2) } } -static void ov62_02236B2C (UnkStruct_0208C06C * param0) +static void ov62_02236B2C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; v0->unk_10.unk_00 = param0->unk_88C[param0->unk_86C]; v0->unk_9C.unk_00 = v0->unk_10.unk_00; v0->unk_9C.unk_04 = param0->unk_87C[param0->unk_86C]; } -static void ov62_02236B64 (UnkStruct_0208C06C * param0) +static void ov62_02236B64(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; - Window * v1; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; + Window *v1; int v2 = 1; v1 = &v0->unk_178[0]; @@ -701,19 +701,19 @@ static void ov62_02236B64 (UnkStruct_0208C06C * param0) ov62_02236BC8(param0, 121); } -static void ov62_02236BA8 (UnkStruct_0208C06C * param0) +static void ov62_02236BA8(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; sub_0201ACF4(&v0->unk_178[0]); BGL_DeleteWindow(&v0->unk_178[0]); } -static void ov62_02236BC8 (UnkStruct_0208C06C * param0, int param1) +static void ov62_02236BC8(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; - Window * v1; - Strbuf* v2; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; + Window *v1; + Strbuf *v2; int v3; v1 = &v0->unk_178[0]; @@ -728,9 +728,9 @@ static void ov62_02236BC8 (UnkStruct_0208C06C * param0, int param1) sub_0201A9A4(v1); } -static void ov62_02236C20 (UnkStruct_0208C06C * param0) +static void ov62_02236C20(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; ov62_022312CC(param0, NNS_G2D_VRAM_TYPE_2DSUB); @@ -745,9 +745,9 @@ static void ov62_02236C20 (UnkStruct_0208C06C * param0) sub_020129D0(v0->unk_158[0].unk_0C, 1); } -static void ov62_02236C94 (UnkStruct_0208C06C * param0) +static void ov62_02236C94(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02235E64 * v0 = param0->unk_860; + UnkStruct_ov62_02235E64 *v0 = param0->unk_860; ov62_022312B0(&v0->unk_158[0]); sub_0200D0F4(v0->unk_158[0].unk_08); diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c index 1aba9635ad..7962273ba9 100644 --- a/src/overlay062/ov62_02236CBC.c +++ b/src/overlay062/ov62_02236CBC.c @@ -1,79 +1,80 @@ #include #include -#include "overlay062/ov62_const_funcptr_tables.h" - #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202D750_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0208C06C.h" + +#include "overlay062/ov62_0222F2C0.h" +#include "overlay062/ov62_022300D8.h" +#include "overlay062/ov62_02231690.h" +#include "overlay062/ov62_const_funcptr_tables.h" #include "overlay062/struct_ov62_022312B0.h" -#include "struct_defs/sprite_template.h" +#include "gx_layers.h" +#include "heap.h" +#include "touch_screen.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "gx_layers.h" -#include "touch_screen.h" #include "unk_0202D05C.h" #include "unk_02030A80.h" -#include "vars_flags.h" #include "unk_0206AFE0.h" #include "unk_0208B284.h" -#include "overlay062/ov62_0222F2C0.h" -#include "overlay062/ov62_022300D8.h" -#include "overlay062/ov62_02231690.h" +#include "vars_flags.h" typedef struct { int unk_00; f32 unk_04[5]; int unk_18[5]; int unk_2C[5]; - CellActorData * unk_40[5]; - CellActorData * unk_54[5]; - CellActorData * unk_68[5]; - CellActorData * unk_7C[5]; + CellActorData *unk_40[5]; + CellActorData *unk_54[5]; + CellActorData *unk_68[5]; + CellActorData *unk_7C[5]; int unk_90; - CellActorData * unk_94[2]; + CellActorData *unk_94[2]; UnkStruct_ov62_022312B0 unk_9C[2]; int unk_D4; int unk_D8; } UnkStruct_ov62_02236CBC; -static void ov62_02236CBC(UnkStruct_0208C06C * param0, int param1); -static void ov62_02236CF8(UnkStruct_0208C06C * param0, int param1); -static void ov62_02236D48(UnkStruct_0208C06C * param0); -static void ov62_02236DE8(UnkStruct_0208C06C * param0); -static void ov62_02236E14(UnkStruct_0208C06C * param0); -static void ov62_022370D4(u16 * param0, u16 param1, u16 param2); -static void ov62_022371CC(UnkStruct_0208C06C * param0); -static void ov62_022374A8(UnkStruct_0208C06C * param0); -static BOOL ov62_022375A4(UnkStruct_0208C06C * param0); -static BOOL ov62_022376C4(UnkStruct_0208C06C * param0); -static void ov62_02237814(UnkStruct_0208C06C * param0); -static BOOL ov62_02237884(UnkStruct_0208C06C * param0); -static BOOL ov62_02237AC0(UnkStruct_0208C06C * param0); -static BOOL ov62_02237B00(UnkStruct_0208C06C * param0); - +static void ov62_02236CBC(UnkStruct_0208C06C *param0, int param1); +static void ov62_02236CF8(UnkStruct_0208C06C *param0, int param1); +static void ov62_02236D48(UnkStruct_0208C06C *param0); +static void ov62_02236DE8(UnkStruct_0208C06C *param0); +static void ov62_02236E14(UnkStruct_0208C06C *param0); +static void ov62_022370D4(u16 *param0, u16 param1, u16 param2); +static void ov62_022371CC(UnkStruct_0208C06C *param0); +static void ov62_022374A8(UnkStruct_0208C06C *param0); +static BOOL ov62_022375A4(UnkStruct_0208C06C *param0); +static BOOL ov62_022376C4(UnkStruct_0208C06C *param0); +static void ov62_02237814(UnkStruct_0208C06C *param0); +static BOOL ov62_02237884(UnkStruct_0208C06C *param0); +static BOOL ov62_02237AC0(UnkStruct_0208C06C *param0); +static BOOL ov62_02237B00(UnkStruct_0208C06C *param0); + +// clang-format off BOOL(*const Unk_ov62_02248C50[])(UnkStruct_0208C06C *) = { ov62_02237884, ov62_02237AC0, ov62_02237B00, }; +// clang-format on -static void ov62_02236CBC (UnkStruct_0208C06C * param0, int param1) +static void ov62_02236CBC(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02236CBC * v0 = param0->unk_860; + UnkStruct_ov62_02236CBC *v0 = param0->unk_860; if (param1 == 0) { SpriteActor_SetSpritePositionXY(v0->unk_9C[1].unk_08, 128, 232); @@ -84,22 +85,22 @@ static void ov62_02236CBC (UnkStruct_0208C06C * param0, int param1) sub_020128C4(v0->unk_9C[1].unk_0C, 36, -8); } -static void ov62_02236CF8 (UnkStruct_0208C06C * param0, int param1) +static void ov62_02236CF8(UnkStruct_0208C06C *param0, int param1) { - NARC * v0 = param0->unk_14.unk_00; - BGL * v1 = param0->unk_14.unk_10; - SpriteRenderer * v2 = param0->unk_14.unk_04; - SpriteGfxHandler * v3 = param0->unk_14.unk_08; - PaletteData * v4 = param0->unk_14.unk_14; + NARC *v0 = param0->unk_14.unk_00; + BGL *v1 = param0->unk_14.unk_10; + SpriteRenderer *v2 = param0->unk_14.unk_04; + SpriteGfxHandler *v3 = param0->unk_14.unk_08; + PaletteData *v4 = param0->unk_14.unk_14; SpriteRenderer_LoadCharResObjFromOpenNarc(v2, v3, v0, 50, 0, param1, 11924); SpriteRenderer_LoadCellResObjFromOpenNarc(v2, v3, v0, 28, 0, 11924); SpriteRenderer_LoadAnimResObjFromOpenNarc(v2, v3, v0, 29, 0, 11924); } -static void ov62_02236D48 (UnkStruct_0208C06C * param0) +static void ov62_02236D48(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02236CBC * v0 = param0->unk_860; + UnkStruct_ov62_02236CBC *v0 = param0->unk_860; ov62_02236CF8(param0, NNS_G2D_VRAM_TYPE_2DSUB); @@ -121,9 +122,9 @@ static void ov62_02236D48 (UnkStruct_0208C06C * param0) ov62_02236CBC(param0, 1); } -static void ov62_02236DE8 (UnkStruct_0208C06C * param0) +static void ov62_02236DE8(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02236CBC * v0 = param0->unk_860; + UnkStruct_ov62_02236CBC *v0 = param0->unk_860; ov62_022312B0(&v0->unk_9C[1]); sub_0200D0F4(v0->unk_9C[1].unk_08); @@ -131,14 +132,14 @@ static void ov62_02236DE8 (UnkStruct_0208C06C * param0) ov62_022313BC(param0); } -static void ov62_02236E14 (UnkStruct_0208C06C * param0) +static void ov62_02236E14(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02236CBC * v0 = param0->unk_860; - NARC * v1 = param0->unk_14.unk_00; - BGL * v2 = param0->unk_14.unk_10; - SpriteRenderer * v3 = param0->unk_14.unk_04; - SpriteGfxHandler * v4 = param0->unk_14.unk_08; - PaletteData * v5 = param0->unk_14.unk_14; + UnkStruct_ov62_02236CBC *v0 = param0->unk_860; + NARC *v1 = param0->unk_14.unk_00; + BGL *v2 = param0->unk_14.unk_10; + SpriteRenderer *v3 = param0->unk_14.unk_04; + SpriteGfxHandler *v4 = param0->unk_14.unk_08; + PaletteData *v5 = param0->unk_14.unk_14; sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 6, 0, 0, 0, 102); sub_0200710C(v1, 68, v2, 6, 0, 0, 0, 102); @@ -153,8 +154,8 @@ static void ov62_02236E14 (UnkStruct_0208C06C * param0) { int v6; - int v7[5] = {125, 291, 297, 295, 293}; - int v8[5] = {126, 292, 298, 296, 294}; + int v7[5] = { 125, 291, 297, 295, 293 }; + int v8[5] = { 126, 292, 298, 296, 294 }; int v9 = 9; int v10 = 10; @@ -197,7 +198,7 @@ static void ov62_02236E14 (UnkStruct_0208C06C * param0) } } -static void ov62_022370D4 (u16 * param0, u16 param1, u16 param2) +static void ov62_022370D4(u16 *param0, u16 param1, u16 param2) { int v0, v1, v2, v3; u32 v4; @@ -206,7 +207,7 @@ static void ov62_022370D4 (u16 * param0, u16 param1, u16 param2) param0++; } - for ( ; v0 < param1 + param2; v0++) { + for (; v0 < param1 + param2; v0++) { v1 = ((*param0) & 0x1f); v2 = (((*param0) >> 5) & 0x1f); v3 = (((*param0) >> 10) & 0x1f); @@ -218,18 +219,18 @@ static void ov62_022370D4 (u16 * param0, u16 param1, u16 param2) } } -static void ov62_0223712C (UnkStruct_0208C06C * param0) +static void ov62_0223712C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02236CBC * v0 = param0->unk_860; - BGL * v1 = param0->unk_14.unk_10; - SpriteRenderer * v2 = param0->unk_14.unk_04; - SpriteGfxHandler * v3 = param0->unk_14.unk_08; - PaletteData * v4 = param0->unk_14.unk_14; + UnkStruct_ov62_02236CBC *v0 = param0->unk_860; + BGL *v1 = param0->unk_14.unk_10; + SpriteRenderer *v2 = param0->unk_14.unk_04; + SpriteGfxHandler *v3 = param0->unk_14.unk_08; + PaletteData *v4 = param0->unk_14.unk_14; int v5; int v6[5]; { - VarsFlags * v7 = SaveData_GetVarsFlags(param0->unk_830); + VarsFlags *v7 = SaveData_GetVarsFlags(param0->unk_830); v6[0] = sub_0206B5C8(v7); v6[1] = sub_0206B588(v7); @@ -240,11 +241,11 @@ static void ov62_0223712C (UnkStruct_0208C06C * param0) for (v5 = 0; v5 < 5; v5++) { if (v6[v5] != 0) { - int v8[] = {0, 1, 4, 3, 2}; + int v8[] = { 0, 1, 4, 3, 2 }; if (v6[v5] == 2) { - PaletteData * v9 = param0->unk_14.unk_14; - u16 * v10; + PaletteData *v9 = param0->unk_14.unk_14; + u16 *v10; v10 = sub_0200316C(v9, 2); ov62_022370D4(v10, (4 + v8[v5]) * 16, 16); @@ -255,17 +256,17 @@ static void ov62_0223712C (UnkStruct_0208C06C * param0) sub_02003858(v4, 1); } -static void ov62_022371CC (UnkStruct_0208C06C * param0) +static void ov62_022371CC(UnkStruct_0208C06C *param0) { int v0; int v1 = 0; int v2[4 + 1]; int v3[5]; - UnkStruct_ov62_02236CBC * v4 = param0->unk_860; - BGL * v5 = param0->unk_14.unk_10; - SpriteRenderer * v6 = param0->unk_14.unk_04; - SpriteGfxHandler * v7 = param0->unk_14.unk_08; - PaletteData * v8 = param0->unk_14.unk_14; + UnkStruct_ov62_02236CBC *v4 = param0->unk_860; + BGL *v5 = param0->unk_14.unk_10; + SpriteRenderer *v6 = param0->unk_14.unk_04; + SpriteGfxHandler *v7 = param0->unk_14.unk_08; + PaletteData *v8 = param0->unk_14.unk_14; SpriteTemplate v9; v9.x = 0; @@ -325,7 +326,7 @@ static void ov62_022371CC (UnkStruct_0208C06C * param0) v9.priority = 20; { - VarsFlags * v10 = SaveData_GetVarsFlags(param0->unk_830); + VarsFlags *v10 = SaveData_GetVarsFlags(param0->unk_830); v3[0] = sub_0206B5C8(v10); v3[1] = sub_0206B588(v10); @@ -343,7 +344,7 @@ static void ov62_022371CC (UnkStruct_0208C06C * param0) SpriteActor_EnableObject(v4->unk_54[v0], 0); SpriteActor_EnableObject(v4->unk_40[v0], 0); } else { - int v11[] = {0, 1, 4, 3, 2}; + int v11[] = { 0, 1, 4, 3, 2 }; sub_0200D364(v4->unk_68[v0], v11[v0]); sub_0200D41C(v4->unk_68[v0], 4 + v11[v0]); @@ -406,10 +407,10 @@ static void ov62_022371CC (UnkStruct_0208C06C * param0) } } -static void ov62_022374A8 (UnkStruct_0208C06C * param0) +static void ov62_022374A8(UnkStruct_0208C06C *param0) { int v0; - UnkStruct_ov62_02236CBC * v1 = param0->unk_860; + UnkStruct_ov62_02236CBC *v1 = param0->unk_860; for (v0 = 0; v0 < 5; v0++) { SpriteGfxHandler_UnloadCharObjById(param0->unk_14.unk_08, 18181 + v0); @@ -450,9 +451,9 @@ static void ov62_022374A8 (UnkStruct_0208C06C * param0) SpriteGfxHandler_UnloadAnimObjById(param0->unk_14.unk_08, 29292); } -static BOOL ov62_022375A4 (UnkStruct_0208C06C * param0) +static BOOL ov62_022375A4(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02236CBC * v0 = param0->unk_860; + UnkStruct_ov62_02236CBC *v0 = param0->unk_860; int v1; s16 v2, v3; fx32 v4, v5; @@ -493,9 +494,9 @@ static BOOL ov62_022375A4 (UnkStruct_0208C06C * param0) return 1; } -static BOOL ov62_022376C4 (UnkStruct_0208C06C * param0) +static BOOL ov62_022376C4(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02236CBC * v0 = param0->unk_860; + UnkStruct_ov62_02236CBC *v0 = param0->unk_860; int v1; s16 v2, v3; fx32 v4, v5; @@ -543,19 +544,19 @@ static BOOL ov62_022376C4 (UnkStruct_0208C06C * param0) return 1; } -static void ov62_02237814 (UnkStruct_0208C06C * param0) +static void ov62_02237814(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02236CBC * v0 = param0->unk_860; + UnkStruct_ov62_02236CBC *v0 = param0->unk_860; int v1; int v2 = 0; s16 v3, v4; fx32 v5, v6; static s16 v7[][2] = { - {128, 32 + 10}, - {189, 77 + 10}, - {172, 124 + 10}, - {83, 124 + 10}, - {66, 77 + 10}, + { 128, 32 + 10 }, + { 189, 77 + 10 }, + { 172, 124 + 10 }, + { 83, 124 + 10 }, + { 66, 77 + 10 }, }; for (v1 = 0; v1 < 5; v1++) { @@ -569,9 +570,9 @@ static void ov62_02237814 (UnkStruct_0208C06C * param0) } } -static BOOL ov62_02237884 (UnkStruct_0208C06C * param0) +static BOOL ov62_02237884(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02236CBC * v0; + UnkStruct_ov62_02236CBC *v0; if (param0->unk_08 == 0) { v0 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02236CBC)); @@ -608,7 +609,7 @@ static BOOL ov62_02237884 (UnkStruct_0208C06C * param0) switch (param0->unk_08) { case 1: if (ov62_02231664(&v0->unk_00, 1)) { - UnkStruct_0202D750 * v2 = sub_0202D750(param0->unk_830); + UnkStruct_0202D750 *v2 = sub_0202D750(param0->unk_830); v0->unk_90 = sub_0202D230(v2, 0, 0); param0->unk_08++; @@ -645,8 +646,7 @@ static BOOL ov62_02237884 (UnkStruct_0208C06C * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1); param0->unk_08++; break; - case 4: - { + case 4: { BOOL v3 = ov62_022375A4(param0); ov62_022315E0(&v0->unk_D4, &v0->unk_D8, 0, 0); @@ -658,8 +658,7 @@ static BOOL ov62_02237884 (UnkStruct_0208C06C * param0) } sub_02003A2C(param0->unk_14.unk_14, 3, 0xC | 0x10, v0->unk_00, param0->unk_14.unk_44); - } - break; + } break; default: ov62_0222FB60(param0, 1); break; @@ -668,9 +667,9 @@ static BOOL ov62_02237884 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02237AC0 (UnkStruct_0208C06C * param0) +static BOOL ov62_02237AC0(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02236CBC * v0 = param0->unk_860; + UnkStruct_ov62_02236CBC *v0 = param0->unk_860; { u32 v1, v2; @@ -689,9 +688,9 @@ static BOOL ov62_02237AC0 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02237B00 (UnkStruct_0208C06C * param0) +static BOOL ov62_02237B00(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02236CBC * v0 = param0->unk_860; + UnkStruct_ov62_02236CBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index 191ac47df1..cbce2648c0 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -1,70 +1,70 @@ +#include "overlay062/ov62_02239D60.h" + #include #include -#include "overlay062/ov62_const_funcptr_tables.h" +#include "constants/species.h" -#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" #include "struct_decls/struct_020797DC_decl.h" -#include "savedata.h" - #include "struct_defs/archived_sprite.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "touch_screen.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" + +#include "overlay061/ov61_0222AE60.h" +#include "overlay061/ov61_0222B008.h" +#include "overlay061/ov61_0222BC4C.h" #include "overlay061/struct_ov61_0222BCF8_sub1_sub1.h" +#include "overlay062/ov62_0222F2C0.h" +#include "overlay062/ov62_022300D8.h" +#include "overlay062/ov62_02231690.h" +#include "overlay062/ov62_0224112C.h" +#include "overlay062/ov62_const_funcptr_tables.h" #include "overlay062/struct_ov62_022312B0.h" #include "overlay062/struct_ov62_022323B8.h" #include "overlay062/struct_ov62_02239DA4.h" #include "overlay062/struct_ov62_0223CAA4.h" #include "overlay062/struct_ov62_02248CDC.h" -#include "struct_defs/sprite_template.h" +#include "savedata/save_table.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "touch_screen.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02023FCC.h" -#include "savedata/save_table.h" #include "unk_02030A80.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "pokemon_icon.h" #include "unk_0208B284.h" -#include "overlay061/ov61_0222AE60.h" -#include "overlay061/ov61_0222B008.h" -#include "overlay061/ov61_0222BC4C.h" -#include "overlay062/ov62_0222F2C0.h" -#include "overlay062/ov62_022300D8.h" -#include "overlay062/ov62_02231690.h" -#include "overlay062/ov62_02239D60.h" -#include "overlay062/ov62_0224112C.h" -#include "constants/species.h" typedef struct { int unk_00; - UnkStruct_02030A80 * unk_04; + UnkStruct_02030A80 *unk_04; int unk_08; } UnkStruct_ov62_02239DBC_sub1; typedef struct { - PCBoxes * unk_00; + PCBoxes *unk_00; UnkStruct_ov62_02239DA4 unk_04; int unk_1A0; int unk_1A4; @@ -73,15 +73,15 @@ typedef struct { int unk_1B0; Window unk_1B4[8]; Window unk_234[8]; - CellActorData * unk_2B4[30]; - Sprite * unk_32C; - UnkStruct_02023FCC * unk_330[5]; - UnkStruct_02023FCC * unk_344; + CellActorData *unk_2B4[30]; + Sprite *unk_32C; + UnkStruct_02023FCC *unk_330[5]; + UnkStruct_02023FCC *unk_344; UnkStruct_ov62_022312B0 unk_348[2]; UnkStruct_ov62_02239DBC_sub1 unk_380; - UnkStruct_ov61_0222BCF8_sub1_sub1 * unk_38C[20]; + UnkStruct_ov61_0222BCF8_sub1_sub1 *unk_38C[20]; UnkStruct_ov61_0222BCF8_sub1_sub1 unk_3DC[20]; - Strbuf* unk_2E0C[20][2]; + Strbuf *unk_2E0C[20][2]; UnkStruct_ov62_02248CDC unk_2EAC; UnkStruct_ov62_022323B8 unk_2ED8; int unk_2F64; @@ -89,99 +89,99 @@ typedef struct { int unk_2F6C; } UnkStruct_ov62_02239DBC; -static void ov62_02239D60(UnkStruct_0208C06C * param0, int param1); -static void ov62_02239D8C(UnkStruct_0208C06C * param0); -static BOOL ov62_02239DA4(UnkStruct_ov62_02239DA4 * param0); -static void ov62_02239DBC(UnkStruct_ov62_02239DBC * param0); -static void ov62_02239E0C(u32 param0, u32 param1, void * param2); -static void ov62_02239EC0(u32 param0, u32 param1, void * param2); -static void ov62_02239EFC(u32 param0, u32 param1, void * param2); -static void ov62_02239F38(u32 param0, u32 param1, void * param2); -static void ov62_02239F98(u32 param0, u32 param1, void * param2); -static void ov62_0223A0AC(UnkStruct_0208C06C * param0); -static void ov62_0223A110(UnkStruct_0208C06C * param0); -static void ov62_0223A138(UnkStruct_ov62_02239DBC * param0); -static void ov62_0223A154(SaveData * param0, const PCBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3); -static BOOL ov62_0223A17C(UnkStruct_0208C06C * param0); -static BOOL ov62_0223A2A8(UnkStruct_0208C06C * param0); -static BOOL ov62_0223A394(UnkStruct_0208C06C * param0); -static void ov62_0223A4C8(UnkStruct_0208C06C * param0, int param1); -static BOOL ov62_0223A544(UnkStruct_0208C06C * param0); -static BOOL ov62_0223A634(UnkStruct_0208C06C * param0); -static BOOL ov62_0223A64C(UnkStruct_0208C06C * param0); -static BOOL ov62_0223A840(UnkStruct_0208C06C * param0); -static BOOL ov62_0223A93C(UnkStruct_0208C06C * param0); -static BOOL ov62_0223A9F4(UnkStruct_0208C06C * param0); -static void ov62_0223AA90(UnkStruct_0208C06C * param0); -static void ov62_0223AB14(UnkStruct_0208C06C * param0); -static void ov62_0223ABBC(UnkStruct_0208C06C * param0); -static void ov62_0223ABE4(UnkStruct_0208C06C * param0); -static void ov62_0223AC0C(UnkStruct_0208C06C * param0, int param1); -static void ov62_0223AC58(UnkStruct_0208C06C * param0, int param1); -static void ov62_0223AD20(UnkStruct_0208C06C * param0); -static void ov62_0223AD7C(UnkStruct_0208C06C * param0); +static void ov62_02239D60(UnkStruct_0208C06C *param0, int param1); +static void ov62_02239D8C(UnkStruct_0208C06C *param0); +static BOOL ov62_02239DA4(UnkStruct_ov62_02239DA4 *param0); +static void ov62_02239DBC(UnkStruct_ov62_02239DBC *param0); +static void ov62_02239E0C(u32 param0, u32 param1, void *param2); +static void ov62_02239EC0(u32 param0, u32 param1, void *param2); +static void ov62_02239EFC(u32 param0, u32 param1, void *param2); +static void ov62_02239F38(u32 param0, u32 param1, void *param2); +static void ov62_02239F98(u32 param0, u32 param1, void *param2); +static void ov62_0223A0AC(UnkStruct_0208C06C *param0); +static void ov62_0223A110(UnkStruct_0208C06C *param0); +static void ov62_0223A138(UnkStruct_ov62_02239DBC *param0); +static void ov62_0223A154(SaveData *param0, const PCBoxes *param1, int param2, UnkStruct_ov62_02239DA4 *param3); +static BOOL ov62_0223A17C(UnkStruct_0208C06C *param0); +static BOOL ov62_0223A2A8(UnkStruct_0208C06C *param0); +static BOOL ov62_0223A394(UnkStruct_0208C06C *param0); +static void ov62_0223A4C8(UnkStruct_0208C06C *param0, int param1); +static BOOL ov62_0223A544(UnkStruct_0208C06C *param0); +static BOOL ov62_0223A634(UnkStruct_0208C06C *param0); +static BOOL ov62_0223A64C(UnkStruct_0208C06C *param0); +static BOOL ov62_0223A840(UnkStruct_0208C06C *param0); +static BOOL ov62_0223A93C(UnkStruct_0208C06C *param0); +static BOOL ov62_0223A9F4(UnkStruct_0208C06C *param0); +static void ov62_0223AA90(UnkStruct_0208C06C *param0); +static void ov62_0223AB14(UnkStruct_0208C06C *param0); +static void ov62_0223ABBC(UnkStruct_0208C06C *param0); +static void ov62_0223ABE4(UnkStruct_0208C06C *param0); +static void ov62_0223AC0C(UnkStruct_0208C06C *param0, int param1); +static void ov62_0223AC58(UnkStruct_0208C06C *param0, int param1); +static void ov62_0223AD20(UnkStruct_0208C06C *param0); +static void ov62_0223AD7C(UnkStruct_0208C06C *param0); static BOOL ov62_0223ADB0(int param0, int param1); -static void ov62_0223ADC0(UnkStruct_0208C06C * param0, int param1); -static void ov62_0223AE60(UnkStruct_0208C06C * param0); -static void ov62_0223AFC0(UnkStruct_0208C06C * param0, int param1); -static void ov62_0223AFEC(UnkStruct_0208C06C * param0); -static void ov62_0223B050(UnkStruct_0208C06C * param0); -static void ov62_0223B124(UnkStruct_0208C06C * param0, int param1); -static void ov62_0223B140(UnkStruct_0208C06C * param0); -static void ov62_0223B158(UnkStruct_0208C06C * param0); -static void ov62_0223B230(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B2E8(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B40C(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B424(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B564(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B694(UnkStruct_0208C06C * param0); -static void ov62_0223B6AC(UnkStruct_0208C06C * param0); -static void ov62_0223B768(UnkStruct_0208C06C * param0, int param1); -static void ov62_0223B7C0(UnkStruct_0208C06C * param0); -static void ov62_0223B840(UnkStruct_0208C06C * param0); -static void ov62_0223B860(UnkStruct_0208C06C * param0); -static void ov62_0223B888(UnkStruct_0208C06C * param0); -static void ov62_0223B958(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B980(UnkStruct_0208C06C * param0); -static void ov62_0223BE7C(UnkStruct_0208C06C * param0); -static void ov62_0223BEF0(UnkStruct_0208C06C * param0); -static BOOL ov62_0223BF44(UnkStruct_0208C06C * param0); -static BOOL ov62_0223BFB4(UnkStruct_0208C06C * param0); -static BOOL ov62_0223C138(UnkStruct_0208C06C * param0); -static BOOL ov62_0223C40C(UnkStruct_0208C06C * param0); -static BOOL ov62_0223C424(UnkStruct_0208C06C * param0); -static BOOL ov62_0223C63C(UnkStruct_0208C06C * param0); -static BOOL ov62_0223C79C(UnkStruct_0208C06C * param0); -static BOOL ov62_0223C948(UnkStruct_0208C06C * param0); -void ov62_0223CAA4(void * param0, const UnkStruct_ov62_0223CAA4 * param1); -void ov62_0223CAA8(void * param0, const UnkStruct_ov62_0223CAA4 * param1); -static BOOL ov62_0223B2E8(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B40C(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B424(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B564(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B694(UnkStruct_0208C06C * param0); -static BOOL ov62_0223C948(UnkStruct_0208C06C * param0); -static BOOL ov62_0223B980(UnkStruct_0208C06C * param0); -static BOOL ov62_0223BF44(UnkStruct_0208C06C * param0); -static BOOL ov62_0223BFB4(UnkStruct_0208C06C * param0); -static BOOL ov62_0223C63C(UnkStruct_0208C06C * param0); -static BOOL ov62_0223C79C(UnkStruct_0208C06C * param0); - -static void ov62_02239D60 (UnkStruct_0208C06C * param0, int param1) -{ - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; +static void ov62_0223ADC0(UnkStruct_0208C06C *param0, int param1); +static void ov62_0223AE60(UnkStruct_0208C06C *param0); +static void ov62_0223AFC0(UnkStruct_0208C06C *param0, int param1); +static void ov62_0223AFEC(UnkStruct_0208C06C *param0); +static void ov62_0223B050(UnkStruct_0208C06C *param0); +static void ov62_0223B124(UnkStruct_0208C06C *param0, int param1); +static void ov62_0223B140(UnkStruct_0208C06C *param0); +static void ov62_0223B158(UnkStruct_0208C06C *param0); +static void ov62_0223B230(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B2E8(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B40C(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B424(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B564(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B694(UnkStruct_0208C06C *param0); +static void ov62_0223B6AC(UnkStruct_0208C06C *param0); +static void ov62_0223B768(UnkStruct_0208C06C *param0, int param1); +static void ov62_0223B7C0(UnkStruct_0208C06C *param0); +static void ov62_0223B840(UnkStruct_0208C06C *param0); +static void ov62_0223B860(UnkStruct_0208C06C *param0); +static void ov62_0223B888(UnkStruct_0208C06C *param0); +static void ov62_0223B958(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B980(UnkStruct_0208C06C *param0); +static void ov62_0223BE7C(UnkStruct_0208C06C *param0); +static void ov62_0223BEF0(UnkStruct_0208C06C *param0); +static BOOL ov62_0223BF44(UnkStruct_0208C06C *param0); +static BOOL ov62_0223BFB4(UnkStruct_0208C06C *param0); +static BOOL ov62_0223C138(UnkStruct_0208C06C *param0); +static BOOL ov62_0223C40C(UnkStruct_0208C06C *param0); +static BOOL ov62_0223C424(UnkStruct_0208C06C *param0); +static BOOL ov62_0223C63C(UnkStruct_0208C06C *param0); +static BOOL ov62_0223C79C(UnkStruct_0208C06C *param0); +static BOOL ov62_0223C948(UnkStruct_0208C06C *param0); +void ov62_0223CAA4(void *param0, const UnkStruct_ov62_0223CAA4 *param1); +void ov62_0223CAA8(void *param0, const UnkStruct_ov62_0223CAA4 *param1); +static BOOL ov62_0223B2E8(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B40C(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B424(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B564(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B694(UnkStruct_0208C06C *param0); +static BOOL ov62_0223C948(UnkStruct_0208C06C *param0); +static BOOL ov62_0223B980(UnkStruct_0208C06C *param0); +static BOOL ov62_0223BF44(UnkStruct_0208C06C *param0); +static BOOL ov62_0223BFB4(UnkStruct_0208C06C *param0); +static BOOL ov62_0223C63C(UnkStruct_0208C06C *param0); +static BOOL ov62_0223C79C(UnkStruct_0208C06C *param0); + +static void ov62_02239D60(UnkStruct_0208C06C *param0, int param1) +{ + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; v0->unk_2ED8.unk_00 = sub_02030A80(102); ov61_0222AFC0(&v0->unk_38C[param1]->unk_00, v0->unk_2ED8.unk_00); } -static void ov62_02239D8C (UnkStruct_0208C06C * param0) +static void ov62_02239D8C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; sub_02030A98(v0->unk_2ED8.unk_00); } -static BOOL ov62_02239DA4 (UnkStruct_ov62_02239DA4 * param0) +static BOOL ov62_02239DA4(UnkStruct_ov62_02239DA4 *param0) { int v0; int v1; @@ -197,7 +197,7 @@ static BOOL ov62_02239DA4 (UnkStruct_ov62_02239DA4 * param0) return 0; } -static void ov62_02239DBC (UnkStruct_ov62_02239DBC * param0) +static void ov62_02239DBC(UnkStruct_ov62_02239DBC *param0) { int v0; @@ -217,37 +217,37 @@ static void ov62_02239DBC (UnkStruct_ov62_02239DBC * param0) } static const TouchScreenRect Unk_ov62_02248DB4[] = { - {0x20, 0x40, 0x18, 0x48}, - {0x20, 0x40, 0xB8, 0xE0}, - {0x98, 0xB8, 0x20, 0x80}, - {0x98, 0xB8, 0x80, 0xE0} + { 0x20, 0x40, 0x18, 0x48 }, + { 0x20, 0x40, 0xB8, 0xE0 }, + { 0x98, 0xB8, 0x20, 0x80 }, + { 0x98, 0xB8, 0x80, 0xE0 } }; static const TouchScreenRect Unk_ov62_02248DDC[] = { - {0x18, 0x28, 0x18, 0x68}, - {0x18, 0x28, 0x90, 0xD0}, - {0x40, 0x50, 0x18, 0x68}, - {0x40, 0x50, 0x90, 0xD0}, - {0x68, 0x78, 0x18, 0x68}, - {0x68, 0x78, 0x90, 0xD0}, - {0x98, 0xB8, 0x50, 0xB0} + { 0x18, 0x28, 0x18, 0x68 }, + { 0x18, 0x28, 0x90, 0xD0 }, + { 0x40, 0x50, 0x18, 0x68 }, + { 0x40, 0x50, 0x90, 0xD0 }, + { 0x68, 0x78, 0x18, 0x68 }, + { 0x68, 0x78, 0x90, 0xD0 }, + { 0x98, 0xB8, 0x50, 0xB0 } }; static const TouchScreenRect Unk_ov62_02248D6C[] = { - {0x10, 0x30, 0x58, 0xA8}, - {0x40, 0x70, 0x58, 0xA8}, - {0x98, 0xB8, 0x50, 0xB0} + { 0x10, 0x30, 0x58, 0xA8 }, + { 0x40, 0x70, 0x58, 0xA8 }, + { 0x98, 0xB8, 0x50, 0xB0 } }; static const TouchScreenRect Unk_ov62_02248D54[] = { - {0x20, 0x60, 0x48, 0xB8}, - {0x98, 0xB8, 0x50, 0xB0} + { 0x20, 0x60, 0x48, 0xB8 }, + { 0x98, 0xB8, 0x50, 0xB0 } }; -static void ov62_02239E0C (u32 param0, u32 param1, void * param2) +static void ov62_02239E0C(u32 param0, u32 param1, void *param2) { - UnkStruct_0208C06C * v0 = param2; - UnkStruct_ov62_02239DBC * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param2; + UnkStruct_ov62_02239DBC *v1 = v0->unk_860; switch (param0) { case 0: @@ -299,10 +299,10 @@ static void ov62_02239E0C (u32 param0, u32 param1, void * param2) } } -static void ov62_02239EC0 (u32 param0, u32 param1, void * param2) +static void ov62_02239EC0(u32 param0, u32 param1, void *param2) { - UnkStruct_0208C06C * v0 = param2; - UnkStruct_ov62_02239DBC * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param2; + UnkStruct_ov62_02239DBC *v1 = v0->unk_860; if (param1 != 0) { return; @@ -321,10 +321,10 @@ static void ov62_02239EC0 (u32 param0, u32 param1, void * param2) } } -static void ov62_02239EFC (u32 param0, u32 param1, void * param2) +static void ov62_02239EFC(u32 param0, u32 param1, void *param2) { - UnkStruct_0208C06C * v0 = param2; - UnkStruct_ov62_02239DBC * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param2; + UnkStruct_ov62_02239DBC *v1 = v0->unk_860; if (param1 != 0) { return; @@ -343,10 +343,10 @@ static void ov62_02239EFC (u32 param0, u32 param1, void * param2) } } -static void ov62_02239F38 (u32 param0, u32 param1, void * param2) +static void ov62_02239F38(u32 param0, u32 param1, void *param2) { - UnkStruct_0208C06C * v0 = param2; - UnkStruct_ov62_02239DBC * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param2; + UnkStruct_ov62_02239DBC *v1 = v0->unk_860; if (param1 != 0) { return; @@ -373,10 +373,10 @@ static void ov62_02239F38 (u32 param0, u32 param1, void * param2) } } -static void ov62_02239F98 (u32 param0, u32 param1, void * param2) +static void ov62_02239F98(u32 param0, u32 param1, void *param2) { - UnkStruct_0208C06C * v0 = param2; - UnkStruct_ov62_02239DBC * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param2; + UnkStruct_ov62_02239DBC *v1 = v0->unk_860; if (param1 != 0) { return; @@ -415,25 +415,25 @@ static void ov62_02239F98 (u32 param0, u32 param1, void * param2) } } -static void ov62_0223A0AC (UnkStruct_0208C06C * param0) +static void ov62_0223A0AC(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; ov62_0223131C(param0, NNS_G2D_VRAM_TYPE_2DSUB); ov62_0223454C(param0, &v0->unk_348[0], NNS_G2D_VRAM_TYPE_2DSUB, 3, 32, 232, 36, -8, 0, 1); ov62_0223454C(param0, &v0->unk_348[1], NNS_G2D_VRAM_TYPE_2DSUB, 53, 128, 232, 36, -8, 1, 1); } -static void ov62_0223A110 (UnkStruct_0208C06C * param0) +static void ov62_0223A110(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; ov62_022345A8(&v0->unk_348[0]); ov62_022345A8(&v0->unk_348[1]); ov62_022313BC(param0); } -static void ov62_0223A138 (UnkStruct_ov62_02239DBC * param0) +static void ov62_0223A138(UnkStruct_ov62_02239DBC *param0) { int v0; @@ -445,15 +445,15 @@ static void ov62_0223A138 (UnkStruct_ov62_02239DBC * param0) } } -static void ov62_0223A154 (SaveData * param0, const PCBoxes * param1, int param2, UnkStruct_ov62_02239DA4 * param3) +static void ov62_0223A154(SaveData *param0, const PCBoxes *param1, int param2, UnkStruct_ov62_02239DA4 *param3) { memset(param3, 0, sizeof(UnkStruct_ov62_02239DA4)); ov61_0222AE88(param0, param1, param2, param3, 102); } -static BOOL ov62_0223A17C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223A17C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02239DBC)); + UnkStruct_ov62_02239DBC *v0 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02239DBC)); memset(v0, 0, sizeof(UnkStruct_ov62_02239DBC)); @@ -482,9 +482,9 @@ static BOOL ov62_0223A17C (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223A2A8 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223A2A8(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -523,9 +523,9 @@ static BOOL ov62_0223A2A8 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223A394 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223A394(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -545,16 +545,14 @@ static BOOL ov62_0223A394 (UnkStruct_0208C06C * param0) } break; - case 2: - { + case 2: { ov62_02234540(param0, 1); ov62_0223B230(param0); ov62_0223B124(param0, 1); ov62_0223AFC0(param0, 0); ov62_02234540(param0, 0); param0->unk_08++; - } - break; + } break; case 3: if (ov62_022315E0(&v0->unk_1A4, &v0->unk_1A8, 0, 1)) { @@ -576,9 +574,9 @@ static BOOL ov62_0223A394 (UnkStruct_0208C06C * param0) return 0; } -static void ov62_0223A4C8 (UnkStruct_0208C06C * param0, int param1) +static void ov62_0223A4C8(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; if (param1 == 0) { SpriteActor_EnableObject(v0->unk_348[1].unk_08, 1); @@ -594,9 +592,9 @@ static void ov62_0223A4C8 (UnkStruct_0208C06C * param0, int param1) sub_020128C4(v0->unk_348[1].unk_0C, 36, -8); } -static BOOL ov62_0223A544 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223A544(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -629,18 +627,18 @@ static BOOL ov62_0223A544 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223A634 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223A634(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; sub_0202404C(v0->unk_330[1]); return 0; } -static BOOL ov62_0223A64C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223A64C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - UnkStruct_ov62_0223CAA4 * v1; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + UnkStruct_ov62_0223CAA4 *v1; if (ov62_022411B8(param0) == 0) { return 0; @@ -714,9 +712,9 @@ static BOOL ov62_0223A64C (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223A840 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223A840(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -752,9 +750,9 @@ static BOOL ov62_0223A840 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223A93C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223A93C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -775,11 +773,9 @@ static BOOL ov62_0223A93C (UnkStruct_0208C06C * param0) sub_02003A2C(param0->unk_14.unk_14, 3, 0xC, v0->unk_1AC, param0->unk_14.unk_44); break; - case 2: - { + case 2: { ov62_0222FB60(param0, 10); - } - break; + } break; default: break; } @@ -787,9 +783,9 @@ static BOOL ov62_0223A93C (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223A9F4 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223A9F4(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -806,11 +802,9 @@ static BOOL ov62_0223A9F4 (UnkStruct_0208C06C * param0) sub_02003A2C(param0->unk_14.unk_14, 3, 0xC, v0->unk_1AC, param0->unk_14.unk_44); break; - case 2: - { + case 2: { ov62_0222FB60(param0, 13); - } - break; + } break; default: break; } @@ -818,6 +812,7 @@ static BOOL ov62_0223A9F4 (UnkStruct_0208C06C * param0) return 0; } +// clang-format off BOOL(*const Unk_ov62_02248E24[])(UnkStruct_0208C06C *) = { ov62_0223A17C, ov62_0223A2A8, @@ -831,7 +826,9 @@ BOOL(*const Unk_ov62_02248E24[])(UnkStruct_0208C06C *) = { ov62_0223A93C, ov62_0223B424, }; +// clang-format on +// clang-format off BOOL(*const Unk_ov62_02248E50[])(UnkStruct_0208C06C *) = { ov62_0223A17C, ov62_0223A2A8, @@ -848,11 +845,12 @@ BOOL(*const Unk_ov62_02248E50[])(UnkStruct_0208C06C *) = { ov62_0223A9F4, ov62_0223C948, }; +// clang-format on static const u8 Unk_ov62_02248D9C[][4] = { - {0x1, 0x2, 0x9, 0x3}, - {0xF, 0x1, 0xD, 0x3}, - {0x1, 0x15, 0x1E, 0x2} + { 0x1, 0x2, 0x9, 0x3 }, + { 0xF, 0x1, 0xD, 0x3 }, + { 0x1, 0x15, 0x1E, 0x2 } }; static const u32 Unk_ov62_02248D90[] = { @@ -873,10 +871,10 @@ static const u32 Unk_ov62_02248D78[] = { 0xCC }; -static void ov62_0223AA90 (UnkStruct_0208C06C * param0) +static void ov62_0223AA90(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; int v2 = 256 + 1; int v3; @@ -893,22 +891,22 @@ static void ov62_0223AA90 (UnkStruct_0208C06C * param0) } static const u8 Unk_ov62_02248DC4[][4] = { - {0x3, 0x3, 0xB, 0x2}, - {0x12, 0x3, 0xB, 0x2}, - {0x3, 0x8, 0xB, 0x2}, - {0x12, 0x8, 0xB, 0x2}, - {0x3, 0xD, 0xB, 0x2}, - {0x12, 0xD, 0xB, 0x2} + { 0x3, 0x3, 0xB, 0x2 }, + { 0x12, 0x3, 0xB, 0x2 }, + { 0x3, 0x8, 0xB, 0x2 }, + { 0x12, 0x8, 0xB, 0x2 }, + { 0x3, 0xD, 0xB, 0x2 }, + { 0x12, 0xD, 0xB, 0x2 } }; -static void ov62_0223AB14 (UnkStruct_0208C06C * param0) +static void ov62_0223AB14(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; int v2 = 1; int v3; int v4; - Strbuf* v5; + Strbuf *v5; for (v3 = 0; v3 < NELEMS(Unk_ov62_02248DC4); v3++) { v1 = &v0->unk_234[v3]; @@ -927,10 +925,10 @@ static void ov62_0223AB14 (UnkStruct_0208C06C * param0) } } -static void ov62_0223ABBC (UnkStruct_0208C06C * param0) +static void ov62_0223ABBC(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; int v2; for (v2 = 0; v2 < NELEMS(Unk_ov62_02248DC4); v2++) { @@ -941,10 +939,10 @@ static void ov62_0223ABBC (UnkStruct_0208C06C * param0) } } -static void ov62_0223ABE4 (UnkStruct_0208C06C * param0) +static void ov62_0223ABE4(UnkStruct_0208C06C *param0) { int v0; - UnkStruct_ov62_02239DBC * v1 = param0->unk_860; + UnkStruct_ov62_02239DBC *v1 = param0->unk_860; for (v0 = 0; v0 < 3; v0++) { sub_0201ACF4(&v1->unk_1B4[v0]); @@ -952,11 +950,11 @@ static void ov62_0223ABE4 (UnkStruct_0208C06C * param0) } } -static void ov62_0223AC0C (UnkStruct_0208C06C * param0, int param1) +static void ov62_0223AC0C(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; - Strbuf* v2; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; + Strbuf *v2; v1 = &v0->unk_1B4[2]; v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); @@ -967,14 +965,14 @@ static void ov62_0223AC0C (UnkStruct_0208C06C * param0, int param1) Strbuf_Free(v2); } -static void ov62_0223AC58 (UnkStruct_0208C06C * param0, int param1) +static void ov62_0223AC58(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; - Strbuf* v2; - Strbuf* v3; - Strbuf* v4; - StringTemplate * v5; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; + Strbuf *v2; + Strbuf *v3; + Strbuf *v4; + StringTemplate *v5; int v6 = 28 + v0->unk_380.unk_00; v1 = &v0->unk_1B4[2]; @@ -996,11 +994,11 @@ static void ov62_0223AC58 (UnkStruct_0208C06C * param0, int param1) StringTemplate_Free(v5); } -static void ov62_0223AD20 (UnkStruct_0208C06C * param0) +static void ov62_0223AD20(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; - Strbuf* v2; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; + Strbuf *v2; int v3; v1 = &v0->unk_1B4[1]; @@ -1016,11 +1014,11 @@ static void ov62_0223AD20 (UnkStruct_0208C06C * param0) Strbuf_Free(v2); } -static void ov62_0223AD7C (UnkStruct_0208C06C * param0) +static void ov62_0223AD7C(UnkStruct_0208C06C *param0) { int v0; - Window * v1; - UnkStruct_ov62_02239DBC * v2 = param0->unk_860; + Window *v1; + UnkStruct_ov62_02239DBC *v2 = param0->unk_860; for (v0 = 0; v0 < 2; v0++) { v1 = &v2->unk_1B4[v0]; @@ -1030,16 +1028,16 @@ static void ov62_0223AD7C (UnkStruct_0208C06C * param0) } } -static BOOL ov62_0223ADB0 (int param0, int param1) +static BOOL ov62_0223ADB0(int param0, int param1) { return (param0 & param1) == param1; } -static void ov62_0223ADC0 (UnkStruct_0208C06C * param0, int param1) +static void ov62_0223ADC0(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; - Strbuf* v2; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; + Strbuf *v2; int v3; int v4; u16 v5[255]; @@ -1069,12 +1067,12 @@ static void ov62_0223ADC0 (UnkStruct_0208C06C * param0, int param1) Strbuf_Free(v2); } -static void ov62_0223AE60 (UnkStruct_0208C06C * param0) +static void ov62_0223AE60(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - SpriteRenderer * v1; - SpriteGfxHandler * v2; - PaletteData * v3; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + SpriteRenderer *v1; + SpriteGfxHandler *v2; + PaletteData *v3; SpriteTemplate v4; v1 = param0->unk_14.unk_04; @@ -1129,9 +1127,9 @@ static void ov62_0223AE60 (UnkStruct_0208C06C * param0) } } -static void ov62_0223AFC0 (UnkStruct_0208C06C * param0, int param1) +static void ov62_0223AFC0(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; int v1; int v2; @@ -1146,9 +1144,9 @@ static void ov62_0223AFC0 (UnkStruct_0208C06C * param0, int param1) } } -static void ov62_0223AFEC (UnkStruct_0208C06C * param0) +static void ov62_0223AFEC(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; int v1; int v2; @@ -1173,10 +1171,10 @@ static void ov62_0223AFEC (UnkStruct_0208C06C * param0) } } -static void ov62_0223B050 (UnkStruct_0208C06C * param0) +static void ov62_0223B050(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - PokemonPersonalData * v1; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + PokemonPersonalData *v1; ArchivedSprite v2; u8 v3; u8 v4; @@ -1213,30 +1211,30 @@ static void ov62_0223B050 (UnkStruct_0208C06C * param0) PokemonPersonalData_Free(v1); } -static void ov62_0223B124 (UnkStruct_0208C06C * param0, int param1) +static void ov62_0223B124(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; if (v0->unk_32C) { sub_02007DEC(v0->unk_32C, 6, param1); } } -static void ov62_0223B140 (UnkStruct_0208C06C * param0) +static void ov62_0223B140(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; if (v0->unk_32C) { sub_02007DC8(v0->unk_32C); } } -static void ov62_0223B158 (UnkStruct_0208C06C * param0) +static void ov62_0223B158(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; { - PCBoxes * v1 = SaveData_PCBoxes(param0->unk_830); + PCBoxes *v1 = SaveData_PCBoxes(param0->unk_830); if ((v0->unk_04.unk_176 >= 16) && (v0->unk_04.unk_176 < (16 + 8))) { v0->unk_04.unk_176 = 0; @@ -1263,12 +1261,12 @@ static void ov62_0223B158 (UnkStruct_0208C06C * param0) ov62_0223AC0C(param0, 270); } -static void ov62_0223B230 (UnkStruct_0208C06C * param0) +static void ov62_0223B230(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; { - PCBoxes * v1 = SaveData_PCBoxes(param0->unk_830); + PCBoxes *v1 = SaveData_PCBoxes(param0->unk_830); if ((v0->unk_04.unk_176 >= 16) && (v0->unk_04.unk_176 < (16 + 8))) { v0->unk_04.unk_176 = 0; @@ -1289,9 +1287,9 @@ static void ov62_0223B230 (UnkStruct_0208C06C * param0) ov62_0223AE60(param0); } -static BOOL ov62_0223B2E8 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223B2E8(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -1337,17 +1335,17 @@ static BOOL ov62_0223B2E8 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223B40C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223B40C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; sub_0202404C(v0->unk_344); return 0; } -static BOOL ov62_0223B424 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223B424(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -1404,13 +1402,12 @@ static BOOL ov62_0223B424 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223B564 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223B564(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { - case 0: - { + case 0: { ov62_02234540(param0, 1); ov62_022302F0(param0, 2); ov62_0223AA90(param0); @@ -1453,28 +1450,28 @@ static BOOL ov62_0223B564 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223B694 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223B694(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; sub_0202404C(v0->unk_330[2]); return 0; } static const u8 Unk_ov62_02248D5C[][4] = { - {0x8, 0x3, 0x10, 0x2}, - {0x9, 0xA, 0xE, 0x2} + { 0x8, 0x3, 0x10, 0x2 }, + { 0x9, 0xA, 0xE, 0x2 } }; -static void ov62_0223B6AC (UnkStruct_0208C06C * param0) +static void ov62_0223B6AC(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; int v2 = 1; int v3; int v4; - int v5[] = {121, 59}; - Strbuf* v6; + int v5[] = { 121, 59 }; + Strbuf *v6; for (v3 = 0; v3 < 2; v3++) { v1 = &v0->unk_234[v3]; @@ -1485,18 +1482,18 @@ static void ov62_0223B6AC (UnkStruct_0208C06C * param0) v6 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, v5[v3]); v4 = ov62_0223429C(v1, v6); - sub_0201D78C(v1, 0, v6, v4, 0, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(v1, 0, v6, v4, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(v1); v2 += (Unk_ov62_02248D5C[v3][2] * Unk_ov62_02248D5C[v3][3]); Strbuf_Free(v6); } } -static void ov62_0223B768 (UnkStruct_0208C06C * param0, int param1) +static void ov62_0223B768(UnkStruct_0208C06C *param0, int param1) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; - Strbuf* v2; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; + Strbuf *v2; int v3; v1 = &v0->unk_234[0]; @@ -1506,19 +1503,19 @@ static void ov62_0223B768 (UnkStruct_0208C06C * param0, int param1) v2 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); v3 = ov62_0223429C(v1, v2); - sub_0201D78C(v1, 0, v2, v3, 0, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(v1, 0, v2, v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v2); sub_0201A9A4(v1); } -static void ov62_0223B7C0 (UnkStruct_0208C06C * param0) +static void ov62_0223B7C0(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; int v2 = 1; int v3; int v4; - Strbuf* v5; + Strbuf *v5; for (v3 = 0; v3 < 1; v3++) { v1 = &v0->unk_234[v3]; @@ -1531,7 +1528,7 @@ static void ov62_0223B7C0 (UnkStruct_0208C06C * param0) { u32 v6 = (64 - sub_02002EB4(0, v5, 0)) / 2; - sub_0201D78C(v1, 0, v5, v6, 0, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(v1, 0, v5, v6, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } sub_0201A9A4(v1); @@ -1539,17 +1536,17 @@ static void ov62_0223B7C0 (UnkStruct_0208C06C * param0) } } -static void ov62_0223B840 (UnkStruct_0208C06C * param0) +static void ov62_0223B840(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; sub_0201ACF4(&v0->unk_234[0]); BGL_DeleteWindow(&v0->unk_234[0]); } -static void ov62_0223B860 (UnkStruct_0208C06C * param0) +static void ov62_0223B860(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; int v1; for (v1 = 0; v1 < 2; v1++) { @@ -1559,19 +1556,19 @@ static void ov62_0223B860 (UnkStruct_0208C06C * param0) } static const u8 Unk_ov62_02248D50[][4] = { - {0x4, 0x3, 0x18, 0x2} + { 0x4, 0x3, 0x18, 0x2 } }; -static void ov62_0223B888 (UnkStruct_0208C06C * param0) +static void ov62_0223B888(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; int v2 = 1; int v3; int v4; int v5; - int v6[] = {27, 19, 26}; - Strbuf* v7; + int v6[] = { 27, 19, 26 }; + Strbuf *v7; for (v3 = 0; v3 < NELEMS(Unk_ov62_02248D50); v3++) { v1 = &v0->unk_1B4[v3]; @@ -1587,7 +1584,7 @@ static void ov62_0223B888 (UnkStruct_0208C06C * param0) } if (v7) { - sub_0201D78C(v1, 0, v7, v4, v5, 0xff, (((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(v1, 0, v7, v4, v5, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v7); } @@ -1596,10 +1593,10 @@ static void ov62_0223B888 (UnkStruct_0208C06C * param0) } } -static void ov62_0223B958 (UnkStruct_0208C06C * param0) +static void ov62_0223B958(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - Window * v1; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + Window *v1; int v2; for (v2 = 0; v2 < NELEMS(Unk_ov62_02248D50); v2++) { @@ -1622,10 +1619,10 @@ static const UnkStruct_ov62_02248CDC Unk_ov62_02248DF8 = { NULL }; -static BOOL ov62_0223B980 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223B980(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; - UnkStruct_ov62_0223CAA4 * v1; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; + UnkStruct_ov62_0223CAA4 *v1; if (ov62_022411B8(param0) == 0) { return 0; @@ -1792,10 +1789,10 @@ static BOOL ov62_0223B980 (UnkStruct_0208C06C * param0) return 0; } -static void ov62_0223BE7C (UnkStruct_0208C06C * param0) +static void ov62_0223BE7C(UnkStruct_0208C06C *param0) { int v0; - UnkStruct_ov62_02239DBC * v1 = param0->unk_860; + UnkStruct_ov62_02239DBC *v1 = param0->unk_860; for (v0 = 0; v0 < v1->unk_380.unk_08; v0++) { v1->unk_2E0C[v0][1] = Strbuf_Init(20, 102); @@ -1807,10 +1804,10 @@ static void ov62_0223BE7C (UnkStruct_0208C06C * param0) } } -static void ov62_0223BEF0 (UnkStruct_0208C06C * param0) +static void ov62_0223BEF0(UnkStruct_0208C06C *param0) { int v0; - UnkStruct_ov62_02239DBC * v1 = param0->unk_860; + UnkStruct_ov62_02239DBC *v1 = param0->unk_860; for (v0 = 0; v0 < v1->unk_380.unk_08; v0++) { if (v1->unk_2E0C[v0][0]) { @@ -1825,9 +1822,9 @@ static void ov62_0223BEF0 (UnkStruct_0208C06C * param0) } } -static BOOL ov62_0223BF44 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223BF44(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; if (v0->unk_2F64 == 0) { ov62_02233664(¶m0->unk_14.unk_46C); @@ -1841,9 +1838,9 @@ static BOOL ov62_0223BF44 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223BFB4 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223BFB4(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -1901,9 +1898,9 @@ static BOOL ov62_0223BFB4 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223C138 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223C138(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -1934,8 +1931,7 @@ static BOOL ov62_0223C138 (UnkStruct_0208C06C * param0) param0->unk_08++; } break; - case 2: - { + case 2: { ov62_02234540(param0, 1); v0->unk_04 = v0->unk_38C[param0->unk_14.unk_48C.unk_38.unk_00]->unk_80; ov62_0223A138(v0); @@ -1994,17 +1990,17 @@ static BOOL ov62_0223C138 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223C40C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223C40C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; sub_0202404C(v0->unk_330[4]); return 0; } -static BOOL ov62_0223C424 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223C424(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -2070,9 +2066,9 @@ static BOOL ov62_0223C424 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223C63C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223C63C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -2123,9 +2119,9 @@ static BOOL ov62_0223C63C (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223C79C (UnkStruct_0208C06C * param0) +static BOOL ov62_0223C79C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -2179,9 +2175,9 @@ static BOOL ov62_0223C79C (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_0223C948 (UnkStruct_0208C06C * param0) +static BOOL ov62_0223C948(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02239DBC * v0 = param0->unk_860; + UnkStruct_ov62_02239DBC *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -2243,9 +2239,9 @@ static BOOL ov62_0223C948 (UnkStruct_0208C06C * param0) return 0; } -void ov62_0223CAA4 (void * param0, const UnkStruct_ov62_0223CAA4 * param1) +void ov62_0223CAA4(void *param0, const UnkStruct_ov62_0223CAA4 *param1) { - UnkStruct_ov62_02239DBC * v0 = param0; + UnkStruct_ov62_02239DBC *v0 = param0; if (param1->unk_00 == 1) { (void)0; @@ -2254,10 +2250,10 @@ void ov62_0223CAA4 (void * param0, const UnkStruct_ov62_0223CAA4 * param1) } } -void ov62_0223CAA8 (void * param0, const UnkStruct_ov62_0223CAA4 * param1) +void ov62_0223CAA8(void *param0, const UnkStruct_ov62_0223CAA4 *param1) { - UnkStruct_0208C06C * v0 = param0; - UnkStruct_ov62_02239DBC * v1 = v0->unk_860; + UnkStruct_0208C06C *v0 = param0; + UnkStruct_ov62_02239DBC *v1 = v0->unk_860; if (param1->unk_00 == 1) { v1->unk_380.unk_08 = 0; diff --git a/src/overlay062/ov62_0224112C.c b/src/overlay062/ov62_0224112C.c index 1d4aa52393..b9c22087b6 100644 --- a/src/overlay062/ov62_0224112C.c +++ b/src/overlay062/ov62_0224112C.c @@ -1,34 +1,35 @@ +#include "overlay062/ov62_0224112C.h" + #include #include -#include "inlines.h" - #include "struct_defs/struct_0208C06C.h" -#include "overlay062/struct_ov62_022349A8.h" -#include "overlay062/struct_ov62_02241130.h" -#include "unk_02025CB0.h" #include "overlay061/ov61_0222B008.h" #include "overlay062/ov62_02231690.h" #include "overlay062/ov62_02237D24.h" #include "overlay062/ov62_02239D60.h" #include "overlay062/ov62_0223CAEC.h" -#include "overlay062/ov62_0224112C.h" #include "overlay062/ov62_02241204.h" +#include "overlay062/struct_ov62_022349A8.h" +#include "overlay062/struct_ov62_02241130.h" + +#include "inlines.h" +#include "unk_02025CB0.h" -static inline BOOL inline_ov62_022411B8(UnkStruct_0208C06C * param0); +static inline BOOL inline_ov62_022411B8(UnkStruct_0208C06C *param0); -static inline BOOL inline_ov62_022411B8 (UnkStruct_0208C06C * param0) +static inline BOOL inline_ov62_022411B8(UnkStruct_0208C06C *param0) { return param0->unk_14.unk_54.unk_3B8; } -UnkStruct_ov62_022349A8 * ov62_0224112C (UnkStruct_0208C06C * param0) +UnkStruct_ov62_022349A8 *ov62_0224112C(UnkStruct_0208C06C *param0) { return ¶m0->unk_14.unk_54; } -void ov62_02241130 (UnkStruct_0208C06C * param0) +void ov62_02241130(UnkStruct_0208C06C *param0) { UnkStruct_ov62_02241130 v0; @@ -52,7 +53,7 @@ void ov62_02241130 (UnkStruct_0208C06C * param0) ov61_0222B008(¶m0->unk_14.unk_54, &v0); } -BOOL ov62_022411B8 (UnkStruct_0208C06C * param0) +BOOL ov62_022411B8(UnkStruct_0208C06C *param0) { if (inline_ov62_022411B8(param0) == 0) { return 0; @@ -61,7 +62,7 @@ BOOL ov62_022411B8 (UnkStruct_0208C06C * param0) return ov61_0222BBBC(ov62_0224112C(param0)); } -void ov62_022411D4 (UnkStruct_0208C06C * param0) +void ov62_022411D4(UnkStruct_0208C06C *param0) { if (inline_ov62_022411B8(param0) == 0) { return; @@ -70,7 +71,7 @@ void ov62_022411D4 (UnkStruct_0208C06C * param0) ov61_0222B57C(ov62_0224112C(param0)); } -void ov62_022411EC (UnkStruct_0208C06C * param0) +void ov62_022411EC(UnkStruct_0208C06C *param0) { if (inline_ov62_022411B8(param0) == 0) { return; diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c index 076db6b5df..ac6a50fb9e 100644 --- a/src/overlay062/ov62_02246B00.c +++ b/src/overlay062/ov62_02246B00.c @@ -1,36 +1,35 @@ +#include "overlay062/ov62_02246B00.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "game_options.h" + #include "overlay062/struct_ov62_02246B00.h" #include "overlay062/struct_ov62_02246BF4.h" #include "overlay062/struct_ov62_02246BF4_sub1.h" -#include "struct_defs/sprite_template.h" +#include "game_options.h" +#include "heap.h" +#include "inlines.h" +#include "strbuf.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" -#include "heap.h" -#include "strbuf.h" #include "unk_02023FCC.h" -#include "overlay062/ov62_02246B00.h" -static inline void inline_ov62_02247CE0(UnkStruct_ov62_02246BF4 * param0, int param1, s16 param2, s16 param3); +static inline void inline_ov62_02247CE0(UnkStruct_ov62_02246BF4 *param0, int param1, s16 param2, s16 param3); -UnkStruct_ov62_02246B00 * ov62_02246B00 (int param0, int param1, int param2[], Options * param3) +UnkStruct_ov62_02246B00 *ov62_02246B00(int param0, int param1, int param2[], Options *param3) { int v0; - UnkStruct_ov62_02246B00 * v1 = NULL; + UnkStruct_ov62_02246B00 *v1 = NULL; v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov62_02246B00)); MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov62_02246B00)); @@ -47,7 +46,7 @@ UnkStruct_ov62_02246B00 * ov62_02246B00 (int param0, int param1, int param2[], O return v1; } -void ov62_02246B4C (UnkStruct_ov62_02246B00 * param0) +void ov62_02246B4C(UnkStruct_ov62_02246B00 *param0) { GF_ASSERT(param0->unk_18 != NULL); GF_ASSERT(param0 != NULL); @@ -56,7 +55,7 @@ void ov62_02246B4C (UnkStruct_ov62_02246B00 * param0) Heap_FreeToHeap(param0); } -void ov62_02246B70 (UnkStruct_ov62_02246BF4 * param0, int param1) +void ov62_02246B70(UnkStruct_ov62_02246BF4 *param0, int param1) { int v0; @@ -78,7 +77,7 @@ void ov62_02246B70 (UnkStruct_ov62_02246BF4 * param0, int param1) } } -void ov62_02246BF4 (UnkStruct_ov62_02246BF4 * param0) +void ov62_02246BF4(UnkStruct_ov62_02246BF4 *param0) { int v0; @@ -102,8 +101,8 @@ void ov62_02246BF4 (UnkStruct_ov62_02246BF4 * param0) { int v1 = 0; const v2[][3] = { - {56, 20, 8}, - {56, 12, 0}, + { 56, 20, 8 }, + { 56, 12, 0 }, }; if (param0->unk_2A8.unk_04[0] != 4) { @@ -143,7 +142,7 @@ void ov62_02246BF4 (UnkStruct_ov62_02246BF4 * param0) } } -void ov62_02246D60 (UnkStruct_ov62_02246BF4 * param0, int param1) +void ov62_02246D60(UnkStruct_ov62_02246BF4 *param0, int param1) { param0->unk_1F4 = param1; param0->unk_1F8 = 0; @@ -151,7 +150,7 @@ void ov62_02246D60 (UnkStruct_ov62_02246BF4 * param0, int param1) param0->unk_200 = 0; } -BOOL ov62_02246D78 (UnkStruct_ov62_02246BF4 * param0) +BOOL ov62_02246D78(UnkStruct_ov62_02246BF4 *param0) { ov62_02246BF4(param0); ov62_02247220(param0); @@ -166,7 +165,7 @@ BOOL ov62_02246D78 (UnkStruct_ov62_02246BF4 * param0) return 0; } -BOOL ov62_02246DB8 (UnkStruct_ov62_02246BF4 * param0) +BOOL ov62_02246DB8(UnkStruct_ov62_02246BF4 *param0) { sub_02024034(param0->unk_220.unk_14); ov62_02247694(param0); @@ -174,7 +173,7 @@ BOOL ov62_02246DB8 (UnkStruct_ov62_02246BF4 * param0) return 1; } -BOOL ov62_02246DD0 (UnkStruct_ov62_02246BF4 * param0) +BOOL ov62_02246DD0(UnkStruct_ov62_02246BF4 *param0) { switch (param0->unk_1FC) { case 0: @@ -189,7 +188,7 @@ BOOL ov62_02246DD0 (UnkStruct_ov62_02246BF4 * param0) return 0; } -BOOL ov62_02246DF8 (UnkStruct_ov62_02246BF4 * param0) +BOOL ov62_02246DF8(UnkStruct_ov62_02246BF4 *param0) { int v0; static f32 v1[] = { @@ -296,14 +295,14 @@ BOOL ov62_02246DF8 (UnkStruct_ov62_02246BF4 * param0) return 0; } -static BOOL(*const Unk_ov62_02249700[])(UnkStruct_ov62_02246BF4 * wk) = { +static BOOL (*const Unk_ov62_02249700[])(UnkStruct_ov62_02246BF4 *wk) = { ov62_02246D78, ov62_02246DD0, ov62_02246DF8, ov62_02246DB8, }; -BOOL ov62_02247084 (UnkStruct_ov62_02246BF4 * param0) +BOOL ov62_02247084(UnkStruct_ov62_02246BF4 *param0) { BOOL v0; @@ -316,11 +315,11 @@ BOOL ov62_02247084 (UnkStruct_ov62_02246BF4 * param0) return v0; } -void ov62_022470A8 (UnkStruct_ov62_02246BF4 * param0) +void ov62_022470A8(UnkStruct_ov62_02246BF4 *param0) { int v0; u32 v1 = 0; - Strbuf* v2 = Strbuf_Init(100, 102); + Strbuf *v2 = Strbuf_Init(100, 102); param0->unk_2C8 = 1; param0->unk_2CC = 0; @@ -347,7 +346,7 @@ void ov62_022470A8 (UnkStruct_ov62_02246BF4 * param0) ov62_02246D60(param0, 3); } -void ov62_02247160 (UnkStruct_ov62_02246BF4 * param0) +void ov62_02247160(UnkStruct_ov62_02246BF4 *param0) { int v0; int v1; @@ -388,7 +387,7 @@ void ov62_02247160 (UnkStruct_ov62_02246BF4 * param0) } } -void ov62_02247220 (UnkStruct_ov62_02246BF4 * param0) +void ov62_02247220(UnkStruct_ov62_02246BF4 *param0) { int v0; @@ -398,21 +397,21 @@ void ov62_02247220 (UnkStruct_ov62_02246BF4 * param0) { const s16 v1[][4] = { - {32, 80, 20, 20}, - {80, 80, 20, 20}, - {128, 80, 20, 20}, - {176, 80, 20, 20}, - {224, 80, 20, 20}, - {32, 128, 20, 20}, - {80, 128, 20, 20}, - {128, 128, 20, 20}, - {176, 128, 20, 20}, - {224, 128, 20, 20}, - {64 + 12, 176, 60, 12}, - {192, 176, 60, 12}, + { 32, 80, 20, 20 }, + { 80, 80, 20, 20 }, + { 128, 80, 20, 20 }, + { 176, 80, 20, 20 }, + { 224, 80, 20, 20 }, + { 32, 128, 20, 20 }, + { 80, 128, 20, 20 }, + { 128, 128, 20, 20 }, + { 176, 128, 20, 20 }, + { 224, 128, 20, 20 }, + { 64 + 12, 176, 60, 12 }, + { 192, 176, 60, 12 }, }; - for ( ; v0 < 24; v0++) { + for (; v0 < 24; v0++) { param0->unk_220.unk_18[v0].rect.top = v1[v0 - 12][1] - v1[v0 - 12][3]; param0->unk_220.unk_18[v0].rect.left = v1[v0 - 12][0] - v1[v0 - 12][2]; param0->unk_220.unk_18[v0].rect.bottom = v1[v0 - 12][1] + v1[v0 - 12][3]; @@ -432,9 +431,9 @@ void ov62_02247220 (UnkStruct_ov62_02246BF4 * param0) param0->unk_220.unk_14 = sub_02023FCC(param0->unk_220.unk_18, 24, ov62_0224730C, param0, 102); } -void ov62_0224730C (u32 param0, u32 param1, void * param2) +void ov62_0224730C(u32 param0, u32 param1, void *param2) { - UnkStruct_ov62_02246BF4 * v0 = param2; + UnkStruct_ov62_02246BF4 *v0 = param2; if (v0->unk_1F4 != 1) { return; @@ -521,7 +520,7 @@ void ov62_0224730C (u32 param0, u32 param1, void * param2) } } -void ov62_022474A8 (UnkStruct_ov62_02246BF4 * param0) +void ov62_022474A8(UnkStruct_ov62_02246BF4 *param0) { switch (param0->unk_29C.unk_00) { case 0: @@ -542,14 +541,14 @@ void ov62_022474A8 (UnkStruct_ov62_02246BF4 * param0) } } -void ov62_02247504 (UnkStruct_ov62_02246BF4 * param0) +void ov62_02247504(UnkStruct_ov62_02246BF4 *param0) { param0->unk_29C.unk_00 = 0; param0->unk_29C.unk_04 = 0; param0->unk_29C.unk_08 = 0; } -int ov62_02247518 (UnkStruct_ov62_02246BF4 * param0, int param1) +int ov62_02247518(UnkStruct_ov62_02246BF4 *param0, int param1) { int v0; @@ -562,7 +561,7 @@ int ov62_02247518 (UnkStruct_ov62_02246BF4 * param0, int param1) return 0; } -int ov62_02247540 (UnkStruct_ov62_02246BF4 * param0, int param1) +int ov62_02247540(UnkStruct_ov62_02246BF4 *param0, int param1) { int v0; int v1 = 0; @@ -581,13 +580,13 @@ int ov62_02247540 (UnkStruct_ov62_02246BF4 * param0, int param1) return param0->unk_204 - 1; } -void ov62_02247574 (UnkStruct_ov62_02246BF4 * param0) +void ov62_02247574(UnkStruct_ov62_02246BF4 *param0) { - NARC * v0; - BGL * v1; - SpriteRenderer * v2; - SpriteGfxHandler * v3; - PaletteData * v4; + NARC *v0; + BGL *v1; + SpriteRenderer *v2; + SpriteGfxHandler *v3; + PaletteData *v4; v2 = param0->unk_220.unk_04; v3 = param0->unk_220.unk_08; @@ -607,7 +606,7 @@ void ov62_02247574 (UnkStruct_ov62_02246BF4 * param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(v2, v3, v0, 86, 0, 1001); } -void ov62_02247694 (UnkStruct_ov62_02246BF4 * param0) +void ov62_02247694(UnkStruct_ov62_02246BF4 *param0) { int v0; @@ -633,15 +632,15 @@ void ov62_02247694 (UnkStruct_ov62_02246BF4 * param0) SpriteGfxHandler_UnloadAnimObjById(param0->unk_220.unk_08, 1001); } -void ov62_02247754 (UnkStruct_ov62_02246BF4 * param0) +void ov62_02247754(UnkStruct_ov62_02246BF4 *param0) { int v0; int v1 = 0; int v2 = 0; SpriteTemplate v3; - SpriteRenderer * v4; - SpriteGfxHandler * v5; - PaletteData * v6; + SpriteRenderer *v4; + SpriteGfxHandler *v5; + PaletteData *v6; v4 = param0->unk_220.unk_04; v5 = param0->unk_220.unk_08; @@ -681,12 +680,12 @@ void ov62_02247754 (UnkStruct_ov62_02246BF4 * param0) } } -void ov62_0224784C (UnkStruct_ov62_02246BF4 * param0) +void ov62_0224784C(UnkStruct_ov62_02246BF4 *param0) { SpriteTemplate v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; - PaletteData * v3; + SpriteRenderer *v1; + SpriteGfxHandler *v2; + PaletteData *v3; v1 = param0->unk_220.unk_04; v2 = param0->unk_220.unk_08; @@ -737,7 +736,7 @@ void ov62_0224784C (UnkStruct_ov62_02246BF4 * param0) ov62_02247968(param0, 2, 0); } -void ov62_02247968 (UnkStruct_ov62_02246BF4 * param0, int param1, BOOL param2) +void ov62_02247968(UnkStruct_ov62_02246BF4 *param0, int param1, BOOL param2) { if (param2 == 1) { SpriteActor_EnableObject(param0->unk_188[param1].unk_0C, 1); @@ -746,10 +745,10 @@ void ov62_02247968 (UnkStruct_ov62_02246BF4 * param0, int param1, BOOL param2) } } -void ov62_02247998 (UnkStruct_ov62_02246BF4 * param0, int param1) +void ov62_02247998(UnkStruct_ov62_02246BF4 *param0, int param1) { s16 v0, v1; - CellActorData * v2; + CellActorData *v2; v2 = param0->unk_00[param1].unk_0C; param0->unk_188[0].unk_00 = param1; @@ -758,7 +757,7 @@ void ov62_02247998 (UnkStruct_ov62_02246BF4 * param0, int param1) SpriteActor_SetSpritePositionXY(param0->unk_188[0].unk_0C, v0, v1 + 16); } -void ov62_022479D4 (UnkStruct_ov62_02246BF4 * param0, int param1) +void ov62_022479D4(UnkStruct_ov62_02246BF4 *param0, int param1) { s16 v0, v1; @@ -768,7 +767,7 @@ void ov62_022479D4 (UnkStruct_ov62_02246BF4 * param0, int param1) SpriteActor_SetSpritePositionXY(param0->unk_188[1].unk_0C, v0 - 0, v1 - 8); } -void ov62_02247A20 (UnkStruct_ov62_02246BF4 * param0, int param1, int param2) +void ov62_02247A20(UnkStruct_ov62_02246BF4 *param0, int param1, int param2) { s16 v0, v1; @@ -778,7 +777,7 @@ void ov62_02247A20 (UnkStruct_ov62_02246BF4 * param0, int param1, int param2) SpriteActor_SetSpritePositionXY(param0->unk_188[param2].unk_0C, v0 - 0, v1 - 8); } -void ov62_02247A70 (UnkStruct_ov62_02246BF4 * param0) +void ov62_02247A70(UnkStruct_ov62_02246BF4 *param0) { sub_0200D330(param0->unk_188[0].unk_0C); sub_0200D330(param0->unk_188[1].unk_0C); @@ -827,7 +826,7 @@ void ov62_02247A70 (UnkStruct_ov62_02246BF4 * param0) } } -int ov62_02247B3C (int param0, BOOL param1) +int ov62_02247B3C(int param0, BOOL param1) { int v0 = 0; @@ -839,7 +838,7 @@ int ov62_02247B3C (int param0, BOOL param1) return v0; } -void ov62_02247B48 (UnkStruct_ov62_02246BF4 * param0) +void ov62_02247B48(UnkStruct_ov62_02246BF4 *param0) { int v0; @@ -852,7 +851,7 @@ void ov62_02247B48 (UnkStruct_ov62_02246BF4 * param0) } } -void ov62_02247B88 (UnkStruct_ov62_02246BF4 * param0, int param1) +void ov62_02247B88(UnkStruct_ov62_02246BF4 *param0, int param1) { int v0; int v1; @@ -914,10 +913,10 @@ void ov62_02247B88 (UnkStruct_ov62_02246BF4 * param0, int param1) } } -static inline void inline_ov62_02247CE0 (UnkStruct_ov62_02246BF4 * param0, int param1, s16 param2, s16 param3) +static inline void inline_ov62_02247CE0(UnkStruct_ov62_02246BF4 *param0, int param1, s16 param2, s16 param3) { s16 v0, v1; - UnkStruct_ov62_02246BF4_sub1 * v2; + UnkStruct_ov62_02246BF4_sub1 *v2; v2 = ¶m0->unk_00[param1]; @@ -933,7 +932,7 @@ static inline void inline_ov62_02247CE0 (UnkStruct_ov62_02246BF4 * param0, int p } } -void ov62_02247CE0 (UnkStruct_ov62_02246BF4 * param0) +void ov62_02247CE0(UnkStruct_ov62_02246BF4 *param0) { int v0; s16 v1; diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index b67aefc906..8d560fb660 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -1,28 +1,26 @@ #include #include -#include "overlay062/ov62_const_funcptr_tables.h" - -#include "strbuf.h" - -#include "touch_screen.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208C06C.h" -#include "unk_02002F38.h" -#include "unk_02006E3C.h" +#include "overlay062/ov62_0222F2C0.h" +#include "overlay062/ov62_022300D8.h" +#include "overlay062/ov62_02231690.h" +#include "overlay062/ov62_const_funcptr_tables.h" + +#include "gx_layers.h" +#include "heap.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" -#include "heap.h" +#include "touch_screen.h" +#include "unk_02002F38.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02030A80.h" -#include "overlay062/ov62_0222F2C0.h" -#include "overlay062/ov62_022300D8.h" -#include "overlay062/ov62_02231690.h" typedef struct { int unk_00; @@ -32,42 +30,42 @@ typedef struct { Window unk_10[2]; } UnkStruct_ov62_02247F7C; -static void ov62_02247D74(UnkStruct_0208C06C * param0, BOOL param1); -static void ov62_02247DB4(UnkStruct_0208C06C * param0); -static void ov62_02247DD8(UnkStruct_0208C06C * param0, int param1, int param2); -static void ov62_02247E9C(UnkStruct_0208C06C * param0); -static void ov62_02247F7C(UnkStruct_0208C06C * param0); -static BOOL ov62_02247FA8(UnkStruct_0208C06C * param0); -static BOOL ov62_02247FFC(UnkStruct_0208C06C * param0); -static BOOL ov62_02248114(UnkStruct_0208C06C * param0); -static BOOL ov62_02248324(UnkStruct_0208C06C * param0); - -static void ov62_02247D74 (UnkStruct_0208C06C * param0, BOOL param1) +static void ov62_02247D74(UnkStruct_0208C06C *param0, BOOL param1); +static void ov62_02247DB4(UnkStruct_0208C06C *param0); +static void ov62_02247DD8(UnkStruct_0208C06C *param0, int param1, int param2); +static void ov62_02247E9C(UnkStruct_0208C06C *param0); +static void ov62_02247F7C(UnkStruct_0208C06C *param0); +static BOOL ov62_02247FA8(UnkStruct_0208C06C *param0); +static BOOL ov62_02247FFC(UnkStruct_0208C06C *param0); +static BOOL ov62_02248114(UnkStruct_0208C06C *param0); +static BOOL ov62_02248324(UnkStruct_0208C06C *param0); + +static void ov62_02247D74(UnkStruct_0208C06C *param0, BOOL param1) { - Window * v0 = ¶m0->unk_8A4; + Window *v0 = ¶m0->unk_8A4; ov62_022302A8(param0, 2, param1); Window_Init(v0); BGL_AddWindow(param0->unk_14.unk_10, v0, 2, 1, 19, 30, 4, 14, 300); } -static void ov62_02247DB4 (UnkStruct_0208C06C * param0) +static void ov62_02247DB4(UnkStruct_0208C06C *param0) { sub_0201ACF4(¶m0->unk_8A4); BGL_DeleteWindow(¶m0->unk_8A4); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } -static void ov62_02247DD8 (UnkStruct_0208C06C * param0, int param1, int param2) +static void ov62_02247DD8(UnkStruct_0208C06C *param0, int param1, int param2) { - Strbuf* v0; - Window * v1 = ¶m0->unk_8A4; + Strbuf *v0; + Window *v1 = ¶m0->unk_8A4; if (param1 == 282) { - StringTemplate * v2; - Strbuf* v3; - Strbuf* v4; - UnkStruct_02030A80 * v5 = param0->unk_88C[param2]; + StringTemplate *v2; + Strbuf *v3; + Strbuf *v4; + UnkStruct_02030A80 *v5 = param0->unk_88C[param2]; v2 = ov62_02231690(102); v0 = Strbuf_Init(255, 102); @@ -91,11 +89,11 @@ static void ov62_02247DD8 (UnkStruct_0208C06C * param0, int param1, int param2) Strbuf_Free(v0); } -static void ov62_02247E9C (UnkStruct_0208C06C * param0) +static void ov62_02247E9C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02247F7C * v0 = param0->unk_860; - Window * v1; - Strbuf* v2; + UnkStruct_ov62_02247F7C *v0 = param0->unk_860; + Window *v1; + Strbuf *v2; int v3 = 1; int v4; @@ -127,9 +125,9 @@ static void ov62_02247E9C (UnkStruct_0208C06C * param0) sub_0201A9A4(v1); } -static void ov62_02247F7C (UnkStruct_0208C06C * param0) +static void ov62_02247F7C(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02247F7C * v0 = param0->unk_860; + UnkStruct_ov62_02247F7C *v0 = param0->unk_860; sub_0201ACF4(&v0->unk_10[0]); BGL_DeleteWindow(&v0->unk_10[0]); @@ -137,9 +135,9 @@ static void ov62_02247F7C (UnkStruct_0208C06C * param0) BGL_DeleteWindow(&v0->unk_10[1]); } -static BOOL ov62_02247FA8 (UnkStruct_0208C06C * param0) +static BOOL ov62_02247FA8(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02247F7C * v0 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02247F7C)); + UnkStruct_ov62_02247F7C *v0 = Heap_AllocFromHeap(102, sizeof(UnkStruct_ov62_02247F7C)); memset(v0, 0, sizeof(UnkStruct_ov62_02247F7C)); param0->unk_860 = v0; @@ -154,9 +152,9 @@ static BOOL ov62_02247FA8 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02247FFC (UnkStruct_0208C06C * param0) +static BOOL ov62_02247FFC(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02247F7C * v0 = param0->unk_860; + UnkStruct_ov62_02247F7C *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -194,13 +192,13 @@ static BOOL ov62_02247FFC (UnkStruct_0208C06C * param0) } static const TouchScreenRect Unk_ov62_02249788[] = { - {0x28, 0x48, 0x20, 0x78}, - {0x28, 0x48, 0x90, 0xE8} + { 0x28, 0x48, 0x20, 0x78 }, + { 0x28, 0x48, 0x90, 0xE8 } }; -static BOOL ov62_02248114 (UnkStruct_0208C06C * param0) +static BOOL ov62_02248114(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02247F7C * v0 = param0->unk_860; + UnkStruct_ov62_02247F7C *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -291,9 +289,9 @@ static BOOL ov62_02248114 (UnkStruct_0208C06C * param0) return 0; } -static BOOL ov62_02248324 (UnkStruct_0208C06C * param0) +static BOOL ov62_02248324(UnkStruct_0208C06C *param0) { - UnkStruct_ov62_02247F7C * v0 = param0->unk_860; + UnkStruct_ov62_02247F7C *v0 = param0->unk_860; switch (param0->unk_08) { case 0: @@ -331,9 +329,11 @@ static BOOL ov62_02248324 (UnkStruct_0208C06C * param0) return 0; } +// clang-format off BOOL(*const Unk_ov62_02249790[])(UnkStruct_0208C06C *) = { ov62_02247FA8, ov62_02247FFC, ov62_02248114, ov62_02248324, }; +// clang-format on diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c index 7155bdfa20..4040b4059a 100644 --- a/src/overlay062/ov62_02248408.c +++ b/src/overlay062/ov62_02248408.c @@ -1,41 +1,40 @@ +#include "overlay062/ov62_02248408.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0202F264.h" #include "struct_defs/struct_0202F298.h" #include "struct_defs/struct_0202F298_sub1.h" #include "struct_defs/struct_0202F41C.h" -#include "pokemon.h" + #include "overlay006/battle_params.h" +#include "savedata/save_table.h" -#include "unk_02002B7C.h" -#include "message.h" -#include "unk_02017728.h" #include "heap.h" -#include "strbuf.h" -#include "savedata/save_table.h" +#include "message.h" +#include "party.h" +#include "pokemon.h" #include "savedata.h" +#include "strbuf.h" +#include "unk_02002B7C.h" +#include "unk_02017728.h" #include "unk_0202F1D4.h" -#include "pokemon.h" -#include "party.h" -#include "overlay062/ov62_02248408.h" static void ov62_0224856C(Strbuf *param0, int param1); -extern BattleRecording * Unk_021C07A4; +extern BattleRecording *Unk_021C07A4; -void ov62_02248408 (BattleRecording * param0, BattleParams * param1, int param2) +void ov62_02248408(BattleRecording *param0, BattleParams *param1, int param2) { - UnkStruct_0202F298 * v0 = ¶m0->unk_E8; - UnkStruct_0202F41C * v1 = ¶m0->unk_84; + UnkStruct_0202F298 *v0 = ¶m0->unk_E8; + UnkStruct_0202F41C *v1 = ¶m0->unk_84; int v2, v3, v4, v5; - Strbuf* v6, * v7; - u16 * v8; + Strbuf *v6, *v7; + u16 *v8; int v9 = 64; int v10, v11, v12; - Pokemon * v13; + Pokemon *v13; sub_0202F4C0(v1->unk_26, &v2, &v3); v6 = Strbuf_Init(v9, param2); @@ -93,9 +92,9 @@ void ov62_02248408 (BattleRecording * param0, BattleParams * param1, int param2) Heap_FreeToHeap(v8); } -static void ov62_0224856C (Strbuf *param0, int param1) +static void ov62_0224856C(Strbuf *param0, int param1) { - MessageLoader * v0; + MessageLoader *v0; Strbuf_Clear(param0); @@ -105,7 +104,7 @@ static void ov62_0224856C (Strbuf *param0, int param1) MessageLoader_Free(v0); } -int ov62_02248598 (SaveData * param0, int param1, u8 param2, u16 * param3, u16 * param4) +int ov62_02248598(SaveData *param0, int param1, u8 param2, u16 *param3, u16 *param4) { int v0; @@ -131,13 +130,13 @@ int ov62_02248598 (SaveData * param0, int param1, u8 param2, u16 * param3, u16 * return 0; } -void ov62_02248624 (SaveData * param0) +void ov62_02248624(SaveData *param0) { GF_ASSERT(Unk_021C07A4); sub_0202F858(&Unk_021C07A4->unk_E8, sizeof(UnkStruct_0202F298) - (sizeof(UnkStruct_0202F298_sub1)), Unk_021C07A4->unk_E8.unk_1BEC.unk_00 + ((Unk_021C07A4->unk_E8.unk_1BEC.unk_00 ^ 0xffff) << 16)); } -int ov62_02248658 (SaveData * param0, u64 param1, u16 * param2, u16 * param3) +int ov62_02248658(SaveData *param0, u64 param1, u16 *param2, u16 *param3) { int v0; @@ -156,7 +155,7 @@ int ov62_02248658 (SaveData * param0, u64 param1, u16 * param2, u16 * param3) return 0; } -int ov62_022486A4 (SaveData * param0, int param1) +int ov62_022486A4(SaveData *param0, int param1) { int v0; diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c index ce0ba0b9d8..96aa2fecfc 100644 --- a/src/overlay063/ov63_0222AE60.c +++ b/src/overlay063/ov63_0222AE60.c @@ -1,3 +1,5 @@ +#include "overlay063/ov63_0222AE60.h" + #include #include @@ -12,31 +14,30 @@ #include "overlay064/struct_ov64_022302EC.h" #include "overlay115/struct_ov115_02261520.h" -#include "unk_02002F38.h" +#include "heap.h" #include "narc.h" +#include "unk_02002F38.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "heap.h" #include "unk_020218BC.h" -#include "overlay063/ov63_0222AE60.h" typedef struct { int unk_00; - UnkStruct_02009DC8 * unk_04[2]; + UnkStruct_02009DC8 *unk_04[2]; u32 unk_0C; int unk_10; UnkStruct_ov19_021DA864 unk_14; } UnkStruct_ov63_0222BB38_sub1; typedef struct { - UnkStruct_02009DC8 * unk_00[4]; + UnkStruct_02009DC8 *unk_00[4]; } UnkStruct_ov63_0222AE60_sub1; typedef struct UnkStruct_ov63_0222BB38_t { - const UnkStruct_ov63_0222BB38_sub1 * unk_00; - GraphicElementData * unk_04; - GraphicElementData * unk_08; + const UnkStruct_ov63_0222BB38_sub1 *unk_00; + GraphicElementData *unk_04; + GraphicElementData *unk_08; int unk_0C; int unk_10; s16 unk_14; @@ -44,23 +45,23 @@ typedef struct UnkStruct_ov63_0222BB38_t { } UnkStruct_ov63_0222BB38; typedef struct { - UnkStruct_02009DC8 * unk_00[4]; + UnkStruct_02009DC8 *unk_00[4]; UnkStruct_ov19_021DA864 unk_10; } UnkStruct_ov63_0222B96C; typedef struct UnkStruct_ov63_0222AE60_t { - GraphicElementManager * unk_00; - PaletteData * unk_04; - UnkStruct_ov63_0222BB38 * unk_08; + GraphicElementManager *unk_00; + PaletteData *unk_04; + UnkStruct_ov63_0222BB38 *unk_08; u32 unk_0C; UnkStruct_ov63_0222BB38_sub1 unk_10[151]; UnkStruct_ov63_0222AE60_sub1 unk_2118[3]; UnkStruct_ov63_0222AE60_sub1 unk_2148[16]; UnkStruct_ov63_0222B96C unk_2248; u32 unk_227C; - UnkStruct_02009714 * unk_2280[4]; - UnkStruct_02009DC8 * unk_2290; - NARC * unk_2294[2]; + UnkStruct_02009714 *unk_2280[4]; + UnkStruct_02009DC8 *unk_2290; + NARC *unk_2294[2]; } UnkStruct_ov63_0222AE60; typedef struct { @@ -68,46 +69,46 @@ typedef struct { u16 unk_02; } UnkStruct_ov63_0222D9A0; -static void ov63_0222BC80(UnkStruct_ov63_0222AE60 * param0, UnkStruct_02009DC8 * param1, u32 param2); -static void ov63_0222B374(UnkStruct_ov63_0222AE60 * param0, int param1, u32 param2); -static void ov63_0222B404(UnkStruct_ov63_0222AE60 * param0, int param1); +static void ov63_0222BC80(UnkStruct_ov63_0222AE60 *param0, UnkStruct_02009DC8 *param1, u32 param2); +static void ov63_0222B374(UnkStruct_ov63_0222AE60 *param0, int param1, u32 param2); +static void ov63_0222B404(UnkStruct_ov63_0222AE60 *param0, int param1); static u32 ov63_0222B450(u32 param0); static BOOL ov63_0222B47C(u32 param0, int param1); static u32 ov63_0222B49C(int param0, u32 param1, BOOL param2); -static void ov63_0222B4CC(UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, int param3, u32 param4, int param5); -static void ov63_0222B510(UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, int param3, u32 param4); -static void ov63_0222B664(UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, int param3, u32 param4); -static void ov63_0222B738(UnkStruct_ov63_0222AE60 * param0, u32 param1); -static void ov63_0222B76C(UnkStruct_ov63_0222AE60 * param0, u32 param1); -static void ov63_0222B7AC(UnkStruct_ov63_0222AE60 * param0, u32 param1); -static BOOL ov63_0222B7D4(const UnkStruct_ov63_0222AE60 * param0, u32 param1); -static void ov63_0222B7E8(UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2); -static void ov63_0222B914(UnkStruct_ov63_0222AE60 * param0); -static BOOL ov63_0222B96C(const UnkStruct_ov63_0222B96C * param0); -static void ov63_0222B97C(UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2); -static void ov63_0222B9EC(UnkStruct_ov63_0222AE60 * param0); -static void ov63_0222BA20(UnkStruct_ov63_0222AE60 * param0, u32 param1); -static void ov63_0222BAB0(UnkStruct_ov63_0222AE60 * param0); -static UnkStruct_ov63_0222BB38 * ov63_0222BB00(UnkStruct_ov63_0222AE60 * param0); -static BOOL ov63_0222BC70(const UnkStruct_ov63_0222BB38 * param0); -static void ov63_0222BB38(UnkStruct_ov63_0222BB38 * param0); -static void ov63_0222BB50(UnkStruct_ov63_0222BB38 * param0, int param1); -static void ov63_0222BB5C(UnkStruct_ov63_0222BB38 * param0, int param1); -static void ov63_0222BB6C(UnkStruct_ov63_0222BB38 * param0, int param1); -static void ov63_0222BB7C(UnkStruct_ov63_0222BB38 * param0, int param1); -static void ov63_0222BB90(UnkStruct_ov63_0222BB38 * param0, int param1); -static void ov63_0222BBA0(UnkStruct_ov63_0222BB38 * param0, int param1); -static void ov63_0222BBB0(UnkStruct_ov63_0222BB38 * param0, int param1); -static void ov63_0222BBC0(UnkStruct_ov63_0222BB38 * param0, int param1); -static void ov63_0222BBD0(UnkStruct_ov63_0222BB38 * param0, int param1); -static void ov63_0222BBE0(UnkStruct_ov63_0222BB38 * param0); -static void ov63_0222BBF0(UnkStruct_ov63_0222BB38 * param0); -static void ov63_0222BC00(UnkStruct_ov63_0222BB38 * param0); -static void ov63_0222BC20(UnkStruct_ov63_0222BB38 * param0); -static void ov63_0222BC30(UnkStruct_ov63_0222BB38 * param0); -static void ov63_0222BC40(UnkStruct_ov63_0222BB38 * param0); -static void ov63_0222BC50(UnkStruct_ov63_0222BB38 * param0); -static void ov63_0222BC60(UnkStruct_ov63_0222BB38 * param0); +static void ov63_0222B4CC(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4, int param5); +static void ov63_0222B510(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4); +static void ov63_0222B664(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4); +static void ov63_0222B738(UnkStruct_ov63_0222AE60 *param0, u32 param1); +static void ov63_0222B76C(UnkStruct_ov63_0222AE60 *param0, u32 param1); +static void ov63_0222B7AC(UnkStruct_ov63_0222AE60 *param0, u32 param1); +static BOOL ov63_0222B7D4(const UnkStruct_ov63_0222AE60 *param0, u32 param1); +static void ov63_0222B7E8(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2); +static void ov63_0222B914(UnkStruct_ov63_0222AE60 *param0); +static BOOL ov63_0222B96C(const UnkStruct_ov63_0222B96C *param0); +static void ov63_0222B97C(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2); +static void ov63_0222B9EC(UnkStruct_ov63_0222AE60 *param0); +static void ov63_0222BA20(UnkStruct_ov63_0222AE60 *param0, u32 param1); +static void ov63_0222BAB0(UnkStruct_ov63_0222AE60 *param0); +static UnkStruct_ov63_0222BB38 *ov63_0222BB00(UnkStruct_ov63_0222AE60 *param0); +static BOOL ov63_0222BC70(const UnkStruct_ov63_0222BB38 *param0); +static void ov63_0222BB38(UnkStruct_ov63_0222BB38 *param0); +static void ov63_0222BB50(UnkStruct_ov63_0222BB38 *param0, int param1); +static void ov63_0222BB5C(UnkStruct_ov63_0222BB38 *param0, int param1); +static void ov63_0222BB6C(UnkStruct_ov63_0222BB38 *param0, int param1); +static void ov63_0222BB7C(UnkStruct_ov63_0222BB38 *param0, int param1); +static void ov63_0222BB90(UnkStruct_ov63_0222BB38 *param0, int param1); +static void ov63_0222BBA0(UnkStruct_ov63_0222BB38 *param0, int param1); +static void ov63_0222BBB0(UnkStruct_ov63_0222BB38 *param0, int param1); +static void ov63_0222BBC0(UnkStruct_ov63_0222BB38 *param0, int param1); +static void ov63_0222BBD0(UnkStruct_ov63_0222BB38 *param0, int param1); +static void ov63_0222BBE0(UnkStruct_ov63_0222BB38 *param0); +static void ov63_0222BBF0(UnkStruct_ov63_0222BB38 *param0); +static void ov63_0222BC00(UnkStruct_ov63_0222BB38 *param0); +static void ov63_0222BC20(UnkStruct_ov63_0222BB38 *param0); +static void ov63_0222BC30(UnkStruct_ov63_0222BB38 *param0); +static void ov63_0222BC40(UnkStruct_ov63_0222BB38 *param0); +static void ov63_0222BC50(UnkStruct_ov63_0222BB38 *param0); +static void ov63_0222BC60(UnkStruct_ov63_0222BB38 *param0); static const u8 Unk_ov63_0222D900[4] = { 0x0, @@ -136,157 +137,157 @@ static const u8 Unk_ov63_0222D910[16] = { }; static const UnkStruct_ov63_0222D9A0 Unk_ov63_0222D9A0[151] = { - {0x0, 0x0}, - {0x3, 0x2}, - {0x5, 0x3}, - {0xB, 0x4}, - {0x1F, 0x5}, - {0x32, 0x6}, - {0x33, 0x7}, - {0x3E, 0x8}, - {0x46, 0x9}, - {0x61, 0x1}, - {0x6, 0xA}, - {0x7, 0xB}, - {0xD, 0xC}, - {0xE, 0xD}, - {0x23, 0xE}, - {0x25, 0xF}, - {0x2A, 0x10}, - {0x3F, 0x11}, - {0x4, 0x12}, - {0x8, 0x13}, - {0x34, 0x14}, - {0x35, 0x15}, - {0x2, 0x16}, - {0xF, 0x17}, - {0x10, 0x18}, - {0x3B, 0x19}, - {0x3C, 0x1A}, - {0x9, 0x1B}, - {0xC, 0x1C}, - {0x17, 0x1D}, - {0x16, 0x1E}, - {0x29, 0x1F}, - {0x26, 0x20}, - {0x27, 0x21}, - {0x11, 0x22}, - {0x44, 0x23}, - {0x45, 0x24}, - {0x1, 0x25}, - {0x2D, 0x26}, - {0x36, 0x27}, - {0x38, 0x28}, - {0x14, 0x29}, - {0xA, 0x2A}, - {0x13, 0x2B}, - {0x1D, 0x2C}, - {0x24, 0x2D}, - {0x28, 0x2E}, - {0x2B, 0x2F}, - {0x22, 0x30}, - {0x37, 0x31}, - {0x47, 0x32}, - {0x8D, 0x33}, - {0x8E, 0x34}, - {0x8F, 0x35}, - {0x90, 0x36}, - {0x91, 0x37}, - {0xA9, 0x38}, - {0x4E, 0x39}, - {0x2C, 0x3A}, - {0x1E, 0x3B}, - {0x51, 0x3C}, - {0xAE, 0x3D}, - {0xB9, 0x3E}, - {0x31, 0x3F}, - {0x30, 0x40}, - {0x86, 0x41}, - {0x87, 0x42}, - {0x88, 0x43}, - {0x89, 0x44}, - {0xAD, 0x45}, - {0x40, 0x46}, - {0x8A, 0x47}, - {0x63, 0x48}, - {0xC2, 0x49}, - {0x4F, 0x4A}, - {0xBF, 0x4B}, - {0x78, 0x4C}, - {0x7C, 0x4D}, - {0x7D, 0x4E}, - {0x41, 0x4F}, - {0x79, 0x50}, - {0x7A, 0x51}, - {0x7B, 0x52}, - {0xCD, 0x53}, - {0x4A, 0x54}, - {0xC3, 0x55}, - {0x7E, 0x56}, - {0x7F, 0x57}, - {0x80, 0x58}, - {0x81, 0x59}, - {0x82, 0x5A}, - {0x83, 0x5B}, - {0x84, 0x5C}, - {0x85, 0x5D}, - {0xAF, 0x5E}, - {0x8C, 0x5F}, - {0x52, 0x60}, - {0x53, 0x61}, - {0xA7, 0x62}, - {0xCE, 0x63}, - {0x4C, 0x64}, - {0xBE, 0x65}, - {0xA4, 0x66}, - {0x12, 0x67}, - {0xA5, 0x68}, - {0xA6, 0x69}, - {0xCC, 0x6A}, - {0x1A, 0x6B}, - {0x1B, 0x6C}, - {0x1C, 0x6D}, - {0x48, 0x6E}, - {0xC0, 0x6F}, - {0x4B, 0x70}, - {0x49, 0x71}, - {0x94, 0x72}, - {0x54, 0x73}, - {0x18, 0x74}, - {0x19, 0x75}, - {0x20, 0x76}, - {0x21, 0x77}, - {0x97, 0x78}, - {0xA0, 0x79}, - {0xA1, 0x7A}, - {0xB8, 0x7B}, - {0x98, 0x7C}, - {0x99, 0x7D}, - {0x9A, 0x7E}, - {0x9B, 0x7F}, - {0x9C, 0x80}, - {0x9D, 0x81}, - {0x9E, 0x82}, - {0x9F, 0x83}, - {0xA8, 0x84}, - {0x2E, 0x85}, - {0x2F, 0x86}, - {0x56, 0x87}, - {0xB6, 0x88}, - {0xD0, 0x89}, - {0xA3, 0x8A}, - {0xD7, 0x8B}, - {0xD8, 0x8C}, - {0xD9, 0x8D}, - {0xDA, 0x8E}, - {0xDB, 0x8F}, - {0xE7, 0x90}, - {0xE8, 0x91}, - {0xE9, 0x92}, - {0xEA, 0x93}, - {0xEB, 0x94}, - {0xFC, 0x95}, - {0xFD, 0x96} + { 0x0, 0x0 }, + { 0x3, 0x2 }, + { 0x5, 0x3 }, + { 0xB, 0x4 }, + { 0x1F, 0x5 }, + { 0x32, 0x6 }, + { 0x33, 0x7 }, + { 0x3E, 0x8 }, + { 0x46, 0x9 }, + { 0x61, 0x1 }, + { 0x6, 0xA }, + { 0x7, 0xB }, + { 0xD, 0xC }, + { 0xE, 0xD }, + { 0x23, 0xE }, + { 0x25, 0xF }, + { 0x2A, 0x10 }, + { 0x3F, 0x11 }, + { 0x4, 0x12 }, + { 0x8, 0x13 }, + { 0x34, 0x14 }, + { 0x35, 0x15 }, + { 0x2, 0x16 }, + { 0xF, 0x17 }, + { 0x10, 0x18 }, + { 0x3B, 0x19 }, + { 0x3C, 0x1A }, + { 0x9, 0x1B }, + { 0xC, 0x1C }, + { 0x17, 0x1D }, + { 0x16, 0x1E }, + { 0x29, 0x1F }, + { 0x26, 0x20 }, + { 0x27, 0x21 }, + { 0x11, 0x22 }, + { 0x44, 0x23 }, + { 0x45, 0x24 }, + { 0x1, 0x25 }, + { 0x2D, 0x26 }, + { 0x36, 0x27 }, + { 0x38, 0x28 }, + { 0x14, 0x29 }, + { 0xA, 0x2A }, + { 0x13, 0x2B }, + { 0x1D, 0x2C }, + { 0x24, 0x2D }, + { 0x28, 0x2E }, + { 0x2B, 0x2F }, + { 0x22, 0x30 }, + { 0x37, 0x31 }, + { 0x47, 0x32 }, + { 0x8D, 0x33 }, + { 0x8E, 0x34 }, + { 0x8F, 0x35 }, + { 0x90, 0x36 }, + { 0x91, 0x37 }, + { 0xA9, 0x38 }, + { 0x4E, 0x39 }, + { 0x2C, 0x3A }, + { 0x1E, 0x3B }, + { 0x51, 0x3C }, + { 0xAE, 0x3D }, + { 0xB9, 0x3E }, + { 0x31, 0x3F }, + { 0x30, 0x40 }, + { 0x86, 0x41 }, + { 0x87, 0x42 }, + { 0x88, 0x43 }, + { 0x89, 0x44 }, + { 0xAD, 0x45 }, + { 0x40, 0x46 }, + { 0x8A, 0x47 }, + { 0x63, 0x48 }, + { 0xC2, 0x49 }, + { 0x4F, 0x4A }, + { 0xBF, 0x4B }, + { 0x78, 0x4C }, + { 0x7C, 0x4D }, + { 0x7D, 0x4E }, + { 0x41, 0x4F }, + { 0x79, 0x50 }, + { 0x7A, 0x51 }, + { 0x7B, 0x52 }, + { 0xCD, 0x53 }, + { 0x4A, 0x54 }, + { 0xC3, 0x55 }, + { 0x7E, 0x56 }, + { 0x7F, 0x57 }, + { 0x80, 0x58 }, + { 0x81, 0x59 }, + { 0x82, 0x5A }, + { 0x83, 0x5B }, + { 0x84, 0x5C }, + { 0x85, 0x5D }, + { 0xAF, 0x5E }, + { 0x8C, 0x5F }, + { 0x52, 0x60 }, + { 0x53, 0x61 }, + { 0xA7, 0x62 }, + { 0xCE, 0x63 }, + { 0x4C, 0x64 }, + { 0xBE, 0x65 }, + { 0xA4, 0x66 }, + { 0x12, 0x67 }, + { 0xA5, 0x68 }, + { 0xA6, 0x69 }, + { 0xCC, 0x6A }, + { 0x1A, 0x6B }, + { 0x1B, 0x6C }, + { 0x1C, 0x6D }, + { 0x48, 0x6E }, + { 0xC0, 0x6F }, + { 0x4B, 0x70 }, + { 0x49, 0x71 }, + { 0x94, 0x72 }, + { 0x54, 0x73 }, + { 0x18, 0x74 }, + { 0x19, 0x75 }, + { 0x20, 0x76 }, + { 0x21, 0x77 }, + { 0x97, 0x78 }, + { 0xA0, 0x79 }, + { 0xA1, 0x7A }, + { 0xB8, 0x7B }, + { 0x98, 0x7C }, + { 0x99, 0x7D }, + { 0x9A, 0x7E }, + { 0x9B, 0x7F }, + { 0x9C, 0x80 }, + { 0x9D, 0x81 }, + { 0x9E, 0x82 }, + { 0x9F, 0x83 }, + { 0xA8, 0x84 }, + { 0x2E, 0x85 }, + { 0x2F, 0x86 }, + { 0x56, 0x87 }, + { 0xB6, 0x88 }, + { 0xD0, 0x89 }, + { 0xA3, 0x8A }, + { 0xD7, 0x8B }, + { 0xD8, 0x8C }, + { 0xD9, 0x8D }, + { 0xDA, 0x8E }, + { 0xDB, 0x8F }, + { 0xE7, 0x90 }, + { 0xE8, 0x91 }, + { 0xE9, 0x92 }, + { 0xEA, 0x93 }, + { 0xEB, 0x94 }, + { 0xFC, 0x95 }, + { 0xFD, 0x96 } }; static const u8 Unk_ov63_0222D904[10] = { @@ -302,9 +303,9 @@ static const u8 Unk_ov63_0222D904[10] = { 0x0 }; -UnkStruct_ov63_0222AE60 * ov63_0222AE60 (GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3) +UnkStruct_ov63_0222AE60 *ov63_0222AE60(GraphicElementManager *param0, PaletteData *param1, u32 param2, u32 param3) { - UnkStruct_ov63_0222AE60 * v0; + UnkStruct_ov63_0222AE60 *v0; int v1; v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov63_0222AE60)); @@ -334,7 +335,7 @@ UnkStruct_ov63_0222AE60 * ov63_0222AE60 (GraphicElementManager * param0, Palette return v0; } -void ov63_0222AF14 (UnkStruct_ov63_0222AE60 * param0) +void ov63_0222AF14(UnkStruct_ov63_0222AE60 *param0) { int v0; @@ -360,7 +361,7 @@ void ov63_0222AF14 (UnkStruct_ov63_0222AE60 * param0) Heap_FreeToHeap(param0); } -void ov63_0222AF94 (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, int param3, u32 param4) +void ov63_0222AF94(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4) { u32 v0; BOOL v1; @@ -372,7 +373,7 @@ void ov63_0222AF94 (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, in ov63_0222B4CC(param0, v0, param2, param3, param4, 0); } -void ov63_0222AFD0 (UnkStruct_ov63_0222AE60 * param0, u32 param1) +void ov63_0222AFD0(UnkStruct_ov63_0222AE60 *param0, u32 param1) { u32 v0; @@ -380,7 +381,7 @@ void ov63_0222AFD0 (UnkStruct_ov63_0222AE60 * param0, u32 param1) ov63_0222B738(param0, v0); } -BOOL ov63_0222AFE4 (const UnkStruct_ov63_0222AE60 * param0, u32 param1) +BOOL ov63_0222AFE4(const UnkStruct_ov63_0222AE60 *param0, u32 param1) { u32 v0; @@ -388,7 +389,7 @@ BOOL ov63_0222AFE4 (const UnkStruct_ov63_0222AE60 * param0, u32 param1) return ov63_0222B7D4(param0, v0); } -void ov63_0222AFF8 (UnkStruct_ov63_0222AE60 * param0) +void ov63_0222AFF8(UnkStruct_ov63_0222AE60 *param0) { int v0; @@ -403,7 +404,7 @@ void ov63_0222AFF8 (UnkStruct_ov63_0222AE60 * param0) } } -void ov63_0222B02C (UnkStruct_ov63_0222AE60 * param0, u32 param1, int param2, u32 param3) +void ov63_0222B02C(UnkStruct_ov63_0222AE60 *param0, u32 param1, int param2, u32 param3) { int v0; @@ -417,7 +418,7 @@ void ov63_0222B02C (UnkStruct_ov63_0222AE60 * param0, u32 param1, int param2, u3 } } -void ov63_0222B078 (UnkStruct_ov63_0222AE60 * param0) +void ov63_0222B078(UnkStruct_ov63_0222AE60 *param0) { int v0; @@ -429,20 +430,20 @@ void ov63_0222B078 (UnkStruct_ov63_0222AE60 * param0) } } -void ov63_0222B0A0 (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, u32 param3) +void ov63_0222B0A0(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, u32 param3) { ov63_0222B7E8(param0, param1, param3); param0->unk_227C = param2; } -void ov63_0222B0B8 (UnkStruct_ov63_0222AE60 * param0) +void ov63_0222B0B8(UnkStruct_ov63_0222AE60 *param0) { ov63_0222B914(param0); } -UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const UnkStruct_ov64_022302EC * param1, u32 param2, u32 param3) +UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const UnkStruct_ov64_022302EC *param1, u32 param2, u32 param3) { - UnkStruct_ov63_0222BB38 * v0; + UnkStruct_ov63_0222BB38 *v0; UnkStruct_ov115_02261520 v1; u32 v2; @@ -511,7 +512,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const return v0; } -void ov63_0222B210 (UnkStruct_ov63_0222BB38 * param0) +void ov63_0222B210(UnkStruct_ov63_0222BB38 *param0) { if (param0->unk_08 != NULL) { sub_02021BD4(param0->unk_08); @@ -521,12 +522,12 @@ void ov63_0222B210 (UnkStruct_ov63_0222BB38 * param0) memset(param0, 0, sizeof(UnkStruct_ov63_0222BB38)); } -const GraphicElementData * ov63_0222B234 (const UnkStruct_ov63_0222BB38 * param0) +const GraphicElementData *ov63_0222B234(const UnkStruct_ov63_0222BB38 *param0) { return param0->unk_04; } -void ov63_0222B238 (UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2) +void ov63_0222B238(UnkStruct_ov63_0222BB38 *param0, s16 param1, s16 param2) { VecFx32 v0; @@ -544,17 +545,17 @@ void ov63_0222B238 (UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2) } } -void ov63_0222B278 (UnkStruct_ov63_0222BB38 * param0, u16 param1) +void ov63_0222B278(UnkStruct_ov63_0222BB38 *param0, u16 param1) { sub_02021F58(param0->unk_04, param1); } -u16 ov63_0222B284 (const UnkStruct_ov63_0222BB38 * param0) +u16 ov63_0222B284(const UnkStruct_ov63_0222BB38 *param0) { return sub_02021F74(param0->unk_04); } -void ov63_0222B294 (UnkStruct_ov63_0222BB38 * param0, BOOL param1) +void ov63_0222B294(UnkStruct_ov63_0222BB38 *param0, BOOL param1) { sub_02021CAC(param0->unk_04, param1); @@ -563,32 +564,32 @@ void ov63_0222B294 (UnkStruct_ov63_0222BB38 * param0, BOOL param1) } } -BOOL ov63_0222B2B0 (const UnkStruct_ov63_0222BB38 * param0) +BOOL ov63_0222B2B0(const UnkStruct_ov63_0222BB38 *param0) { return sub_02021D34(param0->unk_04); } -int ov63_0222B2BC (const UnkStruct_ov63_0222BB38 * param0) +int ov63_0222B2BC(const UnkStruct_ov63_0222BB38 *param0) { return param0->unk_00->unk_10; } -int ov63_0222B2C4 (const UnkStruct_ov63_0222BB38 * param0) +int ov63_0222B2C4(const UnkStruct_ov63_0222BB38 *param0) { return param0->unk_0C; } -void ov63_0222B2C8 (UnkStruct_ov63_0222BB38 * param0, u16 param1) +void ov63_0222B2C8(UnkStruct_ov63_0222BB38 *param0, u16 param1) { SpriteActor_SetAnimFrame(param0->unk_04, param1); } -u16 ov63_0222B2D4 (const UnkStruct_ov63_0222BB38 * param0) +u16 ov63_0222B2D4(const UnkStruct_ov63_0222BB38 *param0) { return sub_02021E74(param0->unk_04); } -void ov63_0222B2E0 (UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2) +void ov63_0222B2E0(UnkStruct_ov63_0222BB38 *param0, s16 param1, s16 param2) { VecFx32 v0; @@ -601,9 +602,9 @@ void ov63_0222B2E0 (UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2) } } -void ov63_0222B308 (UnkStruct_ov63_0222BB38 * param0, int param1, int param2) +void ov63_0222B308(UnkStruct_ov63_0222BB38 *param0, int param1, int param2) { - static void(*const v0[])(UnkStruct_ov63_0222BB38 *, int) = { + static void (*const v0[])(UnkStruct_ov63_0222BB38 *, int) = { ov63_0222BB50, ov63_0222BB5C, ov63_0222BB6C, @@ -627,7 +628,7 @@ void ov63_0222B308 (UnkStruct_ov63_0222BB38 * param0, int param1, int param2) } } -void ov63_0222B33C (UnkStruct_ov63_0222BB38 * param0) +void ov63_0222B33C(UnkStruct_ov63_0222BB38 *param0) { BOOL v0 = 0; @@ -645,15 +646,25 @@ void ov63_0222B33C (UnkStruct_ov63_0222BB38 * param0) } } -static void ov63_0222B374 (UnkStruct_ov63_0222AE60 * param0, int param1, u32 param2) +static void ov63_0222B374(UnkStruct_ov63_0222AE60 *param0, int param1, u32 param2) { int v0; u32 v1; u32 v2; static const u32 v3[3][4] = { - {3, 4, 3, 4, }, - {5, 6, 7, 8, }, - {9, 10, 11, 12} + { + 3, + 4, + 3, + 4, + }, + { + 5, + 6, + 7, + 8, + }, + { 9, 10, 11, 12 } }; GF_ASSERT(param0->unk_2118[param1].unk_00[0] == NULL); @@ -665,7 +676,7 @@ static void ov63_0222B374 (UnkStruct_ov63_0222AE60 * param0, int param1, u32 par } } -static void ov63_0222B404 (UnkStruct_ov63_0222AE60 * param0, int param1) +static void ov63_0222B404(UnkStruct_ov63_0222AE60 *param0, int param1) { int v0; u32 v1; @@ -680,7 +691,7 @@ static void ov63_0222B404 (UnkStruct_ov63_0222AE60 * param0, int param1) } } -static u32 ov63_0222B450 (u32 param0) +static u32 ov63_0222B450(u32 param0) { int v0; @@ -694,7 +705,7 @@ static u32 ov63_0222B450 (u32 param0) return 0; } -static BOOL ov63_0222B47C (u32 param0, int param1) +static BOOL ov63_0222B47C(u32 param0, int param1) { if (param1 == 0) { if ((param0 == 0x0) || (param0 == 0x61) || (param0 == 0xfc) || (param0 == 0xfd)) { @@ -707,7 +718,7 @@ static BOOL ov63_0222B47C (u32 param0, int param1) return 1; } -u32 ov63_0222B49C (int param0, u32 param1, BOOL param2) +u32 ov63_0222B49C(int param0, u32 param1, BOOL param2) { u32 v0; @@ -721,7 +732,7 @@ u32 ov63_0222B49C (int param0, u32 param1, BOOL param2) return 0x100 + (param0 * 2) + Unk_ov63_0222D900[v0]; } -static void ov63_0222B4CC (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, int param3, u32 param4, int param5) +static void ov63_0222B4CC(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4, int param5) { GF_ASSERT(param0->unk_10[param1].unk_04[0] == NULL); @@ -732,9 +743,9 @@ static void ov63_0222B4CC (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 par } } -static void ov63_0222B510 (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, int param3, u32 param4) +static void ov63_0222B510(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4) { - NNSG2dCharacterData * v0; + NNSG2dCharacterData *v0; BOOL v1; BOOL v2; u32 v3, v4; @@ -787,15 +798,15 @@ static void ov63_0222B510 (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 par sub_020093B4(¶m0->unk_10[param1].unk_14, 0x200 + param1, 0x200 + param1, v3, v4, 0xffffffff, 0xffffffff, 0, 0, param0->unk_2280[0], param0->unk_2280[1], param0->unk_2280[2], param0->unk_2280[3], NULL, NULL); } -static void ov63_0222B664 (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, int param3, u32 param4) +static void ov63_0222B664(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2, int param3, u32 param4) { - NNSG2dCharacterData * v0; + NNSG2dCharacterData *v0; BOOL v1; u32 v2; v2 = param1 - 2; - param0->unk_10[param1].unk_04[0] = sub_02009A4C(param0->unk_2280[0], param0->unk_2294[1], (1 + ((param1) - 2)), 0, 0x200 + param1, param2, param4); + param0->unk_10[param1].unk_04[0] = sub_02009A4C(param0->unk_2280[0], param0->unk_2294[1], (1 + ((param1)-2)), 0, 0x200 + param1, param2, param4); if (param3 == 2) { v0 = sub_02009E1C(param0->unk_10[param1].unk_04[0]); @@ -817,7 +828,7 @@ static void ov63_0222B664 (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 par sub_020093B4(¶m0->unk_10[param1].unk_14, 0x200 + param1, 0x402, 0x180 + v2, 0x180 + v2, 0xffffffff, 0xffffffff, 0, 0, param0->unk_2280[0], param0->unk_2280[1], param0->unk_2280[2], param0->unk_2280[3], NULL, NULL); } -static void ov63_0222B738 (UnkStruct_ov63_0222AE60 * param0, u32 param1) +static void ov63_0222B738(UnkStruct_ov63_0222AE60 *param0, u32 param1) { GF_ASSERT(param0->unk_10[param1].unk_04[0] != NULL); @@ -828,7 +839,7 @@ static void ov63_0222B738 (UnkStruct_ov63_0222AE60 * param0, u32 param1) } } -static void ov63_0222B76C (UnkStruct_ov63_0222AE60 * param0, u32 param1) +static void ov63_0222B76C(UnkStruct_ov63_0222AE60 *param0, u32 param1) { sub_0200A4E4(param0->unk_10[param1].unk_04[0]); sub_0200A6DC(param0->unk_10[param1].unk_04[1]); @@ -840,7 +851,7 @@ static void ov63_0222B76C (UnkStruct_ov63_0222AE60 * param0, u32 param1) param0->unk_10[param1].unk_04[1] = NULL; } -static void ov63_0222B7AC (UnkStruct_ov63_0222AE60 * param0, u32 param1) +static void ov63_0222B7AC(UnkStruct_ov63_0222AE60 *param0, u32 param1) { sub_0200A4E4(param0->unk_10[param1].unk_04[0]); sub_02009D68(param0->unk_2280[0], param0->unk_10[param1].unk_04[0]); @@ -848,7 +859,7 @@ static void ov63_0222B7AC (UnkStruct_ov63_0222AE60 * param0, u32 param1) param0->unk_10[param1].unk_04[0] = NULL; } -static BOOL ov63_0222B7D4 (const UnkStruct_ov63_0222AE60 * param0, u32 param1) +static BOOL ov63_0222B7D4(const UnkStruct_ov63_0222AE60 *param0, u32 param1) { if (param0->unk_10[param1].unk_04[0] == NULL) { return 0; @@ -857,7 +868,7 @@ static BOOL ov63_0222B7D4 (const UnkStruct_ov63_0222AE60 * param0, u32 param1) return 1; } -static void ov63_0222B7E8 (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2) +static void ov63_0222B7E8(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2) { int v0; BOOL v1; @@ -897,7 +908,7 @@ static void ov63_0222B7E8 (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 par sub_020093B4(¶m0->unk_2248.unk_10, 0x120, 0x200 + v3, 0x120, 0x120, 0xffffffff, 0xffffffff, 0, 0, param0->unk_2280[0], param0->unk_2280[1], param0->unk_2280[2], param0->unk_2280[3], NULL, NULL); } -static void ov63_0222B914 (UnkStruct_ov63_0222AE60 * param0) +static void ov63_0222B914(UnkStruct_ov63_0222AE60 *param0) { int v0; @@ -915,7 +926,7 @@ static void ov63_0222B914 (UnkStruct_ov63_0222AE60 * param0) } } -static BOOL ov63_0222B96C (const UnkStruct_ov63_0222B96C * param0) +static BOOL ov63_0222B96C(const UnkStruct_ov63_0222B96C *param0) { if (param0->unk_00[0] != NULL) { return 1; @@ -924,7 +935,7 @@ static BOOL ov63_0222B96C (const UnkStruct_ov63_0222B96C * param0) return 0; } -static void ov63_0222B97C (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2) +static void ov63_0222B97C(UnkStruct_ov63_0222AE60 *param0, u32 param1, u32 param2) { BOOL v0; @@ -942,7 +953,7 @@ static void ov63_0222B97C (UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 par sub_02009D4C(param0->unk_2290); } -static void ov63_0222B9EC (UnkStruct_ov63_0222AE60 * param0) +static void ov63_0222B9EC(UnkStruct_ov63_0222AE60 *param0) { GF_ASSERT(param0->unk_2290 != NULL); @@ -952,7 +963,7 @@ static void ov63_0222B9EC (UnkStruct_ov63_0222AE60 * param0) param0->unk_2290 = NULL; } -static void ov63_0222BA20 (UnkStruct_ov63_0222AE60 * param0, u32 param1) +static void ov63_0222BA20(UnkStruct_ov63_0222AE60 *param0, u32 param1) { int v0; @@ -964,7 +975,7 @@ static void ov63_0222BA20 (UnkStruct_ov63_0222AE60 * param0, u32 param1) } } -static void ov63_0222BAB0 (UnkStruct_ov63_0222AE60 * param0) +static void ov63_0222BAB0(UnkStruct_ov63_0222AE60 *param0) { int v0; @@ -979,7 +990,7 @@ static void ov63_0222BAB0 (UnkStruct_ov63_0222AE60 * param0) } } -static UnkStruct_ov63_0222BB38 * ov63_0222BB00 (UnkStruct_ov63_0222AE60 * param0) +static UnkStruct_ov63_0222BB38 *ov63_0222BB00(UnkStruct_ov63_0222AE60 *param0) { int v0; @@ -993,9 +1004,9 @@ static UnkStruct_ov63_0222BB38 * ov63_0222BB00 (UnkStruct_ov63_0222AE60 * param0 return NULL; } -static void ov63_0222BB38 (UnkStruct_ov63_0222BB38 * param0) +static void ov63_0222BB38(UnkStruct_ov63_0222BB38 *param0) { - static void(*const v0[])(UnkStruct_ov63_0222BB38 *) = { + static void (*const v0[])(UnkStruct_ov63_0222BB38 *) = { NULL, ov63_0222BBE0, ov63_0222BBF0, @@ -1013,71 +1024,71 @@ static void ov63_0222BB38 (UnkStruct_ov63_0222BB38 * param0) } } -static void ov63_0222BB50 (UnkStruct_ov63_0222BB38 * param0, int param1) +static void ov63_0222BB50(UnkStruct_ov63_0222BB38 *param0, int param1) { param0->unk_10 = param1; sub_02021DCC(param0->unk_04, param0->unk_10); } -static void ov63_0222BB5C (UnkStruct_ov63_0222BB38 * param0, int param1) +static void ov63_0222BB5C(UnkStruct_ov63_0222BB38 *param0, int param1) { param0->unk_10 = param1; sub_02021DCC(param0->unk_04, 4); } -static void ov63_0222BB6C (UnkStruct_ov63_0222BB38 * param0, int param1) +static void ov63_0222BB6C(UnkStruct_ov63_0222BB38 *param0, int param1) { param0->unk_10 = param1; sub_02021DCC(param0->unk_04, 5 + param0->unk_10); } -static void ov63_0222BB7C (UnkStruct_ov63_0222BB38 * param0, int param1) +static void ov63_0222BB7C(UnkStruct_ov63_0222BB38 *param0, int param1) { sub_02021DCC(param0->unk_04, 5 + param0->unk_10); param0->unk_10 = param1; } -static void ov63_0222BB90 (UnkStruct_ov63_0222BB38 * param0, int param1) +static void ov63_0222BB90(UnkStruct_ov63_0222BB38 *param0, int param1) { param0->unk_10 = param1; sub_02021DCC(param0->unk_04, 9 + param0->unk_10); } -static void ov63_0222BBA0 (UnkStruct_ov63_0222BB38 * param0, int param1) +static void ov63_0222BBA0(UnkStruct_ov63_0222BB38 *param0, int param1) { param0->unk_10 = param1; sub_02021DCC(param0->unk_04, 5 + param0->unk_10); } -static void ov63_0222BBB0 (UnkStruct_ov63_0222BB38 * param0, int param1) +static void ov63_0222BBB0(UnkStruct_ov63_0222BB38 *param0, int param1) { param0->unk_10 = param1; sub_02021DCC(param0->unk_04, 5 + param0->unk_10); } -static void ov63_0222BBC0 (UnkStruct_ov63_0222BB38 * param0, int param1) +static void ov63_0222BBC0(UnkStruct_ov63_0222BB38 *param0, int param1) { param0->unk_10 = param1; sub_02021DCC(param0->unk_04, 5 + param0->unk_10); } -static void ov63_0222BBD0 (UnkStruct_ov63_0222BB38 * param0, int param1) +static void ov63_0222BBD0(UnkStruct_ov63_0222BB38 *param0, int param1) { param0->unk_10 = param1; sub_02021DCC(param0->unk_04, 5 + param0->unk_10); } -static void ov63_0222BBE0 (UnkStruct_ov63_0222BB38 * param0) +static void ov63_0222BBE0(UnkStruct_ov63_0222BB38 *param0) { sub_02021E2C(param0->unk_04, (2 * FX32_ONE)); } -static void ov63_0222BBF0 (UnkStruct_ov63_0222BB38 * param0) +static void ov63_0222BBF0(UnkStruct_ov63_0222BB38 *param0) { sub_02021E2C(param0->unk_04, (2 * FX32_ONE)); } -static void ov63_0222BC00 (UnkStruct_ov63_0222BB38 * param0) +static void ov63_0222BC00(UnkStruct_ov63_0222BB38 *param0) { if (param0->unk_14 == 0) { SpriteActor_SetAnimFrame(param0->unk_04, 1); @@ -1086,32 +1097,32 @@ static void ov63_0222BC00 (UnkStruct_ov63_0222BB38 * param0) } } -static void ov63_0222BC20 (UnkStruct_ov63_0222BB38 * param0) +static void ov63_0222BC20(UnkStruct_ov63_0222BB38 *param0) { sub_02021E2C(param0->unk_04, (2 * FX32_ONE)); } -static void ov63_0222BC30 (UnkStruct_ov63_0222BB38 * param0) +static void ov63_0222BC30(UnkStruct_ov63_0222BB38 *param0) { sub_02021E2C(param0->unk_04, (FX32_ONE)); } -static void ov63_0222BC40 (UnkStruct_ov63_0222BB38 * param0) +static void ov63_0222BC40(UnkStruct_ov63_0222BB38 *param0) { sub_02021E2C(param0->unk_04, (FX32_ONE)); } -static void ov63_0222BC50 (UnkStruct_ov63_0222BB38 * param0) +static void ov63_0222BC50(UnkStruct_ov63_0222BB38 *param0) { sub_02021E2C(param0->unk_04, (8 * FX32_ONE)); } -static void ov63_0222BC60 (UnkStruct_ov63_0222BB38 * param0) +static void ov63_0222BC60(UnkStruct_ov63_0222BB38 *param0) { sub_02021E2C(param0->unk_04, (6 * FX32_ONE)); } -static BOOL ov63_0222BC70 (const UnkStruct_ov63_0222BB38 * param0) +static BOOL ov63_0222BC70(const UnkStruct_ov63_0222BB38 *param0) { if (param0->unk_04 == NULL) { return 1; @@ -1120,9 +1131,9 @@ static BOOL ov63_0222BC70 (const UnkStruct_ov63_0222BB38 * param0) return 0; } -static void ov63_0222BC80 (UnkStruct_ov63_0222AE60 * param0, UnkStruct_02009DC8 * param1, u32 param2) +static void ov63_0222BC80(UnkStruct_ov63_0222AE60 *param0, UnkStruct_02009DC8 *param1, u32 param2) { - NNSG2dPaletteData * v0; + NNSG2dPaletteData *v0; u32 v1[2]; v0 = sub_02009E34(param1); diff --git a/src/overlay063/ov63_0222BCE8.c b/src/overlay063/ov63_0222BCE8.c index 775e18d638..e7831db827 100644 --- a/src/overlay063/ov63_0222BCE8.c +++ b/src/overlay063/ov63_0222BCE8.c @@ -1,20 +1,21 @@ +#include "overlay063/ov63_0222BCE8.h" + #include #include #include "overlay063/union_ov63_0222BDAC.h" #include "heap.h" -#include "overlay063/ov63_0222BCE8.h" typedef struct UnkStruct_ov63_0222BCE8_t { u16 unk_00; u16 unk_02; - UnkUnion_ov63_0222BDAC * unk_04; + UnkUnion_ov63_0222BDAC *unk_04; } UnkStruct_ov63_0222BCE8; -UnkStruct_ov63_0222BCE8 * ov63_0222BCE8 (u16 param0, u16 param1, u32 param2) +UnkStruct_ov63_0222BCE8 *ov63_0222BCE8(u16 param0, u16 param1, u32 param2) { - UnkStruct_ov63_0222BCE8 * v0; + UnkStruct_ov63_0222BCE8 *v0; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov63_0222BCE8)); GF_ASSERT(v0); @@ -29,32 +30,32 @@ UnkStruct_ov63_0222BCE8 * ov63_0222BCE8 (u16 param0, u16 param1, u32 param2) return v0; } -void ov63_0222BD30 (UnkStruct_ov63_0222BCE8 * param0) +void ov63_0222BD30(UnkStruct_ov63_0222BCE8 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0->unk_04); Heap_FreeToHeap(param0); } -u16 ov63_0222BD48 (const UnkStruct_ov63_0222BCE8 * param0) +u16 ov63_0222BD48(const UnkStruct_ov63_0222BCE8 *param0) { return param0->unk_00; } -u16 ov63_0222BD4C (const UnkStruct_ov63_0222BCE8 * param0) +u16 ov63_0222BD4C(const UnkStruct_ov63_0222BCE8 *param0) { return param0->unk_02; } -void ov63_0222BD50 (UnkStruct_ov63_0222BCE8 * param0, const UnkUnion_ov63_0222BDAC * param1) +void ov63_0222BD50(UnkStruct_ov63_0222BCE8 *param0, const UnkUnion_ov63_0222BDAC *param1) { GF_ASSERT(param0); memcpy(param0->unk_04, param1, sizeof(UnkUnion_ov63_0222BDAC) * (param0->unk_00 * param0->unk_02)); } -UnkUnion_ov63_0222BDAC ov63_0222BD70 (const UnkStruct_ov63_0222BCE8 * param0, u16 param1, u16 param2) +UnkUnion_ov63_0222BDAC ov63_0222BD70(const UnkStruct_ov63_0222BCE8 *param0, u16 param1, u16 param2) { - UnkUnion_ov63_0222BDAC v0 = {0xffffffff}; + UnkUnion_ov63_0222BDAC v0 = { 0xffffffff }; GF_ASSERT(param0); @@ -65,7 +66,7 @@ UnkUnion_ov63_0222BDAC ov63_0222BD70 (const UnkStruct_ov63_0222BCE8 * param0, u1 return v0; } -BOOL ov63_0222BDAC (const UnkStruct_ov63_0222BCE8 * param0, u16 param1, u16 param2) +BOOL ov63_0222BDAC(const UnkStruct_ov63_0222BCE8 *param0, u16 param1, u16 param2) { UnkUnion_ov63_0222BDAC v0; @@ -80,7 +81,7 @@ BOOL ov63_0222BDAC (const UnkStruct_ov63_0222BCE8 * param0, u16 param1, u16 para return v0.val2_0; } -u32 ov63_0222BDE4 (const UnkStruct_ov63_0222BCE8 * param0, u16 param1, u16 param2) +u32 ov63_0222BDE4(const UnkStruct_ov63_0222BCE8 *param0, u16 param1, u16 param2) { UnkUnion_ov63_0222BDAC v0; diff --git a/src/overlay063/ov63_0222BE18.c b/src/overlay063/ov63_0222BE18.c index 1c6ff71066..61ec42fe8d 100644 --- a/src/overlay063/ov63_0222BE18.c +++ b/src/overlay063/ov63_0222BE18.c @@ -1,3 +1,5 @@ +#include "overlay063/ov63_0222BE18.h" + #include #include @@ -6,7 +8,6 @@ #include "overlay065/struct_ov65_022376D0.h" #include "heap.h" -#include "overlay063/ov63_0222BE18.h" typedef struct UnkStruct_ov63_0222BEC0_t { BOOL unk_00; @@ -22,39 +23,39 @@ typedef struct UnkStruct_ov63_0222BEC0_t { } UnkStruct_ov63_0222BEC0; typedef struct UnkStruct_ov63_0222BE18_t { - UnkStruct_ov63_0222BEC0 * unk_00; + UnkStruct_ov63_0222BEC0 *unk_00; u32 unk_04; } UnkStruct_ov63_0222BE18; -static UnkStruct_ov63_0222BEC0 * ov63_0222C0B8(UnkStruct_ov63_0222BE18 * param0); -static void ov63_0222C350(UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222CCB8 * param1); -static void ov63_0222C37C(UnkStruct_ov63_0222BEC0 * param0); -static void ov63_0222C3AC(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C404(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C470(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C508(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C5A0(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C5F8(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C664(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C6FC(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C794(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C800(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C86C(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static void ov63_0222C8D8(UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2); -static BOOL ov63_0222C944(UnkStruct_ov63_0222BEC0 * param0); -static BOOL ov63_0222C948(UnkStruct_ov63_0222BEC0 * param0); -static BOOL ov63_0222C950(UnkStruct_ov63_0222BEC0 * param0); -static BOOL ov63_0222C990(UnkStruct_ov63_0222BEC0 * param0); -static BOOL ov63_0222C9D0(UnkStruct_ov63_0222BEC0 * param0); -static BOOL ov63_0222C9D4(UnkStruct_ov63_0222BEC0 * param0); -static BOOL ov63_0222C9DC(UnkStruct_ov63_0222BEC0 * param0); -static void ov63_0222CA48(UnkStruct_ov63_0222BEC0 * param0); +static UnkStruct_ov63_0222BEC0 *ov63_0222C0B8(UnkStruct_ov63_0222BE18 *param0); +static void ov63_0222C350(UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222CCB8 *param1); +static void ov63_0222C37C(UnkStruct_ov63_0222BEC0 *param0); +static void ov63_0222C3AC(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C404(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C470(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C508(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C5A0(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C5F8(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C664(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C6FC(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C794(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C800(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C86C(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static void ov63_0222C8D8(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2); +static BOOL ov63_0222C944(UnkStruct_ov63_0222BEC0 *param0); +static BOOL ov63_0222C948(UnkStruct_ov63_0222BEC0 *param0); +static BOOL ov63_0222C950(UnkStruct_ov63_0222BEC0 *param0); +static BOOL ov63_0222C990(UnkStruct_ov63_0222BEC0 *param0); +static BOOL ov63_0222C9D0(UnkStruct_ov63_0222BEC0 *param0); +static BOOL ov63_0222C9D4(UnkStruct_ov63_0222BEC0 *param0); +static BOOL ov63_0222C9DC(UnkStruct_ov63_0222BEC0 *param0); +static void ov63_0222CA48(UnkStruct_ov63_0222BEC0 *param0); static UnkStruct_ov63_0222CC3C ov63_0222C9E4(UnkStruct_ov63_0222CC3C param0, int param1); -static BOOL ov63_0222CA14(UnkStruct_ov63_0222BEC0 * param0); +static BOOL ov63_0222CA14(UnkStruct_ov63_0222BEC0 *param0); -UnkStruct_ov63_0222BE18 * ov63_0222BE18 (u32 param0, u32 param1) +UnkStruct_ov63_0222BE18 *ov63_0222BE18(u32 param0, u32 param1) { - UnkStruct_ov63_0222BE18 * v0; + UnkStruct_ov63_0222BE18 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov63_0222BE18)); GF_ASSERT(v0); @@ -68,25 +69,25 @@ UnkStruct_ov63_0222BE18 * ov63_0222BE18 (u32 param0, u32 param1) return v0; } -void ov63_0222BE58 (UnkStruct_ov63_0222BE18 * param0) +void ov63_0222BE58(UnkStruct_ov63_0222BE18 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0->unk_00); Heap_FreeToHeap(param0); } -void ov63_0222BE70 (UnkStruct_ov63_0222BE18 * param0, const UnkStruct_ov63_0222CCB8 * param1) +void ov63_0222BE70(UnkStruct_ov63_0222BE18 *param0, const UnkStruct_ov63_0222CCB8 *param1) { - UnkStruct_ov63_0222BEC0 * v0; + UnkStruct_ov63_0222BEC0 *v0; v0 = ov63_0222BF18(param0, param1->unk_07); ov63_0222C350(v0, param1); } -void ov63_0222BE84 (UnkStruct_ov63_0222BE18 * param0) +void ov63_0222BE84(UnkStruct_ov63_0222BE18 *param0) { int v0; - UnkStruct_ov63_0222BEC0 * v1; + UnkStruct_ov63_0222BEC0 *v1; u32 v2; v2 = ov63_0222BEB0(param0); @@ -100,15 +101,15 @@ void ov63_0222BE84 (UnkStruct_ov63_0222BE18 * param0) } } -u32 ov63_0222BEB0 (const UnkStruct_ov63_0222BE18 * param0) +u32 ov63_0222BEB0(const UnkStruct_ov63_0222BE18 *param0) { GF_ASSERT(param0); return param0->unk_04; } -UnkStruct_ov63_0222BEC0 * ov63_0222BEC0 (UnkStruct_ov63_0222BE18 * param0, const UnkStruct_ov65_022376D0 * param1) +UnkStruct_ov63_0222BEC0 *ov63_0222BEC0(UnkStruct_ov63_0222BE18 *param0, const UnkStruct_ov65_022376D0 *param1) { - UnkStruct_ov63_0222BEC0 * v0; + UnkStruct_ov63_0222BEC0 *v0; GF_ASSERT(param0); GF_ASSERT(param1); @@ -128,12 +129,12 @@ UnkStruct_ov63_0222BEC0 * ov63_0222BEC0 (UnkStruct_ov63_0222BE18 * param0, const return v0; } -void ov63_0222BF08 (UnkStruct_ov63_0222BEC0 * param0) +void ov63_0222BF08(UnkStruct_ov63_0222BEC0 *param0) { memset(param0, 0, sizeof(UnkStruct_ov63_0222BEC0)); } -UnkStruct_ov63_0222BEC0 * ov63_0222BF18 (UnkStruct_ov63_0222BE18 * param0, u16 param1) +UnkStruct_ov63_0222BEC0 *ov63_0222BF18(UnkStruct_ov63_0222BE18 *param0, u16 param1) { int v0; @@ -148,7 +149,7 @@ UnkStruct_ov63_0222BEC0 * ov63_0222BF18 (UnkStruct_ov63_0222BE18 * param0, u16 p return NULL; } -UnkStruct_ov63_0222BEC0 * ov63_0222BF50 (UnkStruct_ov63_0222BE18 * param0, u16 param1) +UnkStruct_ov63_0222BEC0 *ov63_0222BF50(UnkStruct_ov63_0222BE18 *param0, u16 param1) { GF_ASSERT(param0); GF_ASSERT(param1 < param0->unk_04); @@ -160,17 +161,17 @@ UnkStruct_ov63_0222BEC0 * ov63_0222BF50 (UnkStruct_ov63_0222BE18 * param0, u16 p return NULL; } -const UnkStruct_ov63_0222BEC0 * ov63_0222BF80 (const UnkStruct_ov63_0222BE18 * param0, u16 param1) +const UnkStruct_ov63_0222BEC0 *ov63_0222BF80(const UnkStruct_ov63_0222BE18 *param0, u16 param1) { return ov63_0222BF18((UnkStruct_ov63_0222BE18 *)param0, param1); } -const UnkStruct_ov63_0222BEC0 * ov63_0222BF88 (const UnkStruct_ov63_0222BE18 * param0, u16 param1) +const UnkStruct_ov63_0222BEC0 *ov63_0222BF88(const UnkStruct_ov63_0222BE18 *param0, u16 param1) { return ov63_0222BF50((UnkStruct_ov63_0222BE18 *)param0, param1); } -s32 ov63_0222BF90 (const UnkStruct_ov63_0222BEC0 * param0, int param1) +s32 ov63_0222BF90(const UnkStruct_ov63_0222BEC0 *param0, int param1) { s32 v0; @@ -218,7 +219,7 @@ s32 ov63_0222BF90 (const UnkStruct_ov63_0222BEC0 * param0, int param1) return v0; } -void ov63_0222C000 (UnkStruct_ov63_0222BEC0 * param0, int param1, s32 param2) +void ov63_0222C000(UnkStruct_ov63_0222BEC0 *param0, int param1, s32 param2) { GF_ASSERT(param0); @@ -264,13 +265,13 @@ void ov63_0222C000 (UnkStruct_ov63_0222BEC0 * param0, int param1, s32 param2) } } -UnkStruct_ov63_0222CC3C ov63_0222C078 (UnkStruct_ov63_0222CC3C param0, int param1) +UnkStruct_ov63_0222CC3C ov63_0222C078(UnkStruct_ov63_0222CC3C param0, int param1) { static const s8 v0[4][2] = { - {0, -16}, - {0, 16}, - {-16, 0}, - {16, 0}, + { 0, -16 }, + { 0, 16 }, + { -16, 0 }, + { 16, 0 }, }; param0.unk_00 += v0[param1][0]; @@ -279,16 +280,19 @@ UnkStruct_ov63_0222CC3C ov63_0222C078 (UnkStruct_ov63_0222CC3C param0, int param return param0; } -int ov63_0222C0AC (int param0) +int ov63_0222C0AC(int param0) { static const u8 v0[4] = { - 1, 0, 3, 2, + 1, + 0, + 3, + 2, }; return v0[param0]; } -static UnkStruct_ov63_0222BEC0 * ov63_0222C0B8 (UnkStruct_ov63_0222BE18 * param0) +static UnkStruct_ov63_0222BEC0 *ov63_0222C0B8(UnkStruct_ov63_0222BE18 *param0) { int v0; @@ -302,17 +306,17 @@ static UnkStruct_ov63_0222BEC0 * ov63_0222C0B8 (UnkStruct_ov63_0222BE18 * param0 return NULL; } -UnkStruct_ov63_0222CC3C ov63_0222C0E4 (const UnkStruct_ov63_0222BEC0 * param0) +UnkStruct_ov63_0222CC3C ov63_0222C0E4(const UnkStruct_ov63_0222BEC0 *param0) { return param0->unk_04; } -UnkStruct_ov63_0222CC3C ov63_0222C0F0 (const UnkStruct_ov63_0222BEC0 * param0) +UnkStruct_ov63_0222CC3C ov63_0222C0F0(const UnkStruct_ov63_0222BEC0 *param0) { return param0->unk_08; } -UnkStruct_ov63_0222CC3C ov63_0222C0FC (const UnkStruct_ov63_0222BEC0 * param0) +UnkStruct_ov63_0222CC3C ov63_0222C0FC(const UnkStruct_ov63_0222BEC0 *param0) { s32 v0; s32 v1; @@ -340,23 +344,23 @@ UnkStruct_ov63_0222CC3C ov63_0222C0FC (const UnkStruct_ov63_0222BEC0 * param0) return v2; } -void ov63_0222C1A4 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1) +void ov63_0222C1A4(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1) { param0->unk_04 = param1; } -void ov63_0222C1B4 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1) +void ov63_0222C1B4(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1) { param0->unk_08 = param1; } -const UnkStruct_ov63_0222BEC0 * ov63_0222C1C4 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BE18 * param1, int param2) +const UnkStruct_ov63_0222BEC0 *ov63_0222C1C4(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BE18 *param1, int param2) { int v0; u32 v1; UnkStruct_ov63_0222CC3C v2, v3; u32 v4, v5; - const UnkStruct_ov63_0222BEC0 * v6; + const UnkStruct_ov63_0222BEC0 *v6; v2 = ov63_0222C0E4(param0); v2 = ov63_0222C078(v2, param2); @@ -390,12 +394,12 @@ const UnkStruct_ov63_0222BEC0 * ov63_0222C1C4 (const UnkStruct_ov63_0222BEC0 * p return NULL; } -const UnkStruct_ov63_0222BEC0 * ov63_0222C2AC (const UnkStruct_ov63_0222BE18 * param0, UnkStruct_ov63_0222CC3C param1) +const UnkStruct_ov63_0222BEC0 *ov63_0222C2AC(const UnkStruct_ov63_0222BE18 *param0, UnkStruct_ov63_0222CC3C param1) { int v0; u32 v1; UnkStruct_ov63_0222CC3C v2; - const UnkStruct_ov63_0222BEC0 * v3; + const UnkStruct_ov63_0222BEC0 *v3; v1 = ov63_0222BEB0(param0); @@ -422,11 +426,11 @@ const UnkStruct_ov63_0222BEC0 * ov63_0222C2AC (const UnkStruct_ov63_0222BE18 * p return NULL; } -static void ov63_0222C350 (UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222CCB8 * param1) +static void ov63_0222C350(UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222CCB8 *param1) { int v0; - static void(*const v1[12])(UnkStruct_ov63_0222BEC0 *, UnkStruct_ov63_0222CC3C, int) = { + static void (*const v1[12])(UnkStruct_ov63_0222BEC0 *, UnkStruct_ov63_0222CC3C, int) = { ov63_0222C3AC, ov63_0222C404, ov63_0222C470, @@ -445,9 +449,9 @@ static void ov63_0222C350 (UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov6 param0->unk_16 = 0; } -static void ov63_0222C37C (UnkStruct_ov63_0222BEC0 * param0) +static void ov63_0222C37C(UnkStruct_ov63_0222BEC0 *param0) { - static BOOL(*const v0[12])(UnkStruct_ov63_0222BEC0 *) = { + static BOOL (*const v0[12])(UnkStruct_ov63_0222BEC0 *) = { ov63_0222C944, ov63_0222C948, ov63_0222C950, @@ -474,7 +478,7 @@ static void ov63_0222C37C (UnkStruct_ov63_0222BEC0 * param0) } } -static void ov63_0222C3AC (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C3AC(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { GF_ASSERT(param0); @@ -484,7 +488,7 @@ static void ov63_0222C3AC (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 5, 0); } -static void ov63_0222C404 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C404(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { GF_ASSERT(param0); @@ -496,7 +500,7 @@ static void ov63_0222C404 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 9, 2); } -static void ov63_0222C470 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C470(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { UnkStruct_ov63_0222CC3C v0; @@ -511,7 +515,7 @@ static void ov63_0222C470 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 9, 8); } -static void ov63_0222C508 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C508(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { UnkStruct_ov63_0222CC3C v0; @@ -526,7 +530,7 @@ static void ov63_0222C508 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 9, 4); } -static void ov63_0222C5A0 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C5A0(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { GF_ASSERT(param0); @@ -536,7 +540,7 @@ static void ov63_0222C5A0 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 5, 4); } -static void ov63_0222C5F8 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C5F8(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { GF_ASSERT(param0); @@ -548,7 +552,7 @@ static void ov63_0222C5F8 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 9, 16); } -static void ov63_0222C664 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C664(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { UnkStruct_ov63_0222CC3C v0; @@ -563,7 +567,7 @@ static void ov63_0222C664 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 9, 16); } -static void ov63_0222C6FC (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C6FC(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { UnkStruct_ov63_0222CC3C v0; @@ -578,7 +582,7 @@ static void ov63_0222C6FC (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 9, 4); } -static void ov63_0222C794 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C794(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { GF_ASSERT(param0); @@ -590,7 +594,7 @@ static void ov63_0222C794 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 9, 2); } -static void ov63_0222C800 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C800(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { GF_ASSERT(param0); @@ -602,7 +606,7 @@ static void ov63_0222C800 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 9, 4); } -static void ov63_0222C86C (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C86C(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { GF_ASSERT(param0); @@ -614,7 +618,7 @@ static void ov63_0222C86C (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 9, 8); } -static void ov63_0222C8D8 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +static void ov63_0222C8D8(UnkStruct_ov63_0222BEC0 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { GF_ASSERT(param0); @@ -626,17 +630,17 @@ static void ov63_0222C8D8 (UnkStruct_ov63_0222BEC0 * param0, UnkStruct_ov63_0222 ov63_0222C000(param0, 9, 16); } -static BOOL ov63_0222C944 (UnkStruct_ov63_0222BEC0 * param0) +static BOOL ov63_0222C944(UnkStruct_ov63_0222BEC0 *param0) { return 0; } -static BOOL ov63_0222C948 (UnkStruct_ov63_0222BEC0 * param0) +static BOOL ov63_0222C948(UnkStruct_ov63_0222BEC0 *param0) { return ov63_0222CA14(param0); } -static BOOL ov63_0222C950 (UnkStruct_ov63_0222BEC0 * param0) +static BOOL ov63_0222C950(UnkStruct_ov63_0222BEC0 *param0) { BOOL v0; UnkStruct_ov63_0222CC3C v1; @@ -651,7 +655,7 @@ static BOOL ov63_0222C950 (UnkStruct_ov63_0222BEC0 * param0) return v0; } -static BOOL ov63_0222C990 (UnkStruct_ov63_0222BEC0 * param0) +static BOOL ov63_0222C990(UnkStruct_ov63_0222BEC0 *param0) { BOOL v0; UnkStruct_ov63_0222CC3C v1; @@ -666,27 +670,27 @@ static BOOL ov63_0222C990 (UnkStruct_ov63_0222BEC0 * param0) return v0; } -static BOOL ov63_0222C9D0 (UnkStruct_ov63_0222BEC0 * param0) +static BOOL ov63_0222C9D0(UnkStruct_ov63_0222BEC0 *param0) { return 0; } -static BOOL ov63_0222C9D4 (UnkStruct_ov63_0222BEC0 * param0) +static BOOL ov63_0222C9D4(UnkStruct_ov63_0222BEC0 *param0) { return ov63_0222CA14(param0); } -static BOOL ov63_0222C9DC (UnkStruct_ov63_0222BEC0 * param0) +static BOOL ov63_0222C9DC(UnkStruct_ov63_0222BEC0 *param0) { return ov63_0222CA14(param0); } -static UnkStruct_ov63_0222CC3C ov63_0222C9E4 (UnkStruct_ov63_0222CC3C param0, int param1) +static UnkStruct_ov63_0222CC3C ov63_0222C9E4(UnkStruct_ov63_0222CC3C param0, int param1) { return ov63_0222C078(param0, param1); } -static BOOL ov63_0222CA14 (UnkStruct_ov63_0222BEC0 * param0) +static BOOL ov63_0222CA14(UnkStruct_ov63_0222BEC0 *param0) { s32 v0; s32 v1; @@ -706,7 +710,7 @@ static BOOL ov63_0222CA14 (UnkStruct_ov63_0222BEC0 * param0) return 1; } -static void ov63_0222CA48 (UnkStruct_ov63_0222BEC0 * param0) +static void ov63_0222CA48(UnkStruct_ov63_0222BEC0 *param0) { UnkStruct_ov63_0222CC3C v0; int v1; diff --git a/src/overlay063/ov63_0222CA88.c b/src/overlay063/ov63_0222CA88.c index 9579191327..a28ce95126 100644 --- a/src/overlay063/ov63_0222CA88.c +++ b/src/overlay063/ov63_0222CA88.c @@ -1,34 +1,33 @@ +#include "overlay063/ov63_0222CA88.h" + #include #include +#include "overlay063/ov63_0222BCE8.h" +#include "overlay063/ov63_0222BE18.h" #include "overlay063/struct_ov63_0222BCE8_decl.h" #include "overlay063/struct_ov63_0222BE18_decl.h" #include "overlay063/struct_ov63_0222BEC0_decl.h" - #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222CCB8.h" #include "overlay063/struct_ov63_0222D894.h" -#include "overlay063/ov63_0222BCE8.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay063/ov63_0222CA88.h" - -static BOOL ov63_0222CAE4(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4); -static BOOL ov63_0222CB10(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4); -static BOOL ov63_0222CB4C(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4); -static BOOL ov63_0222CBC0(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4); -static BOOL ov63_0222CBD0(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4); -static BOOL ov63_0222CBF8(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4); -static BOOL ov63_0222CC04(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4); -static BOOL ov63_0222CC14(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4); -static BOOL ov63_0222CC3C(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, int param2); -static BOOL ov63_0222CCA4(const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BE18 * param1, int param2); -static void ov63_0222CCB8(UnkStruct_ov63_0222CCB8 * param0, const UnkStruct_ov63_0222BEC0 * param1, int param2, u32 param3, int param4); - -BOOL ov63_0222CA88 (const UnkStruct_ov63_0222BCE8 * param0, const UnkStruct_ov63_0222BE18 * param1, const UnkStruct_ov63_0222D894 * param2, UnkStruct_ov63_0222CCB8 * param3) +static BOOL ov63_0222CAE4(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4); +static BOOL ov63_0222CB10(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4); +static BOOL ov63_0222CB4C(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4); +static BOOL ov63_0222CBC0(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4); +static BOOL ov63_0222CBD0(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4); +static BOOL ov63_0222CBF8(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4); +static BOOL ov63_0222CC04(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4); +static BOOL ov63_0222CC14(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4); +static BOOL ov63_0222CC3C(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, int param2); +static BOOL ov63_0222CCA4(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BE18 *param1, int param2); +static void ov63_0222CCB8(UnkStruct_ov63_0222CCB8 *param0, const UnkStruct_ov63_0222BEC0 *param1, int param2, u32 param3, int param4); + +BOOL ov63_0222CA88(const UnkStruct_ov63_0222BCE8 *param0, const UnkStruct_ov63_0222BE18 *param1, const UnkStruct_ov63_0222D894 *param2, UnkStruct_ov63_0222CCB8 *param3) { - const UnkStruct_ov63_0222BEC0 * v0; - static BOOL(*const v1[12])(const UnkStruct_ov63_0222BEC0 *, const UnkStruct_ov63_0222BCE8 *, const UnkStruct_ov63_0222BE18 *, const UnkStruct_ov63_0222D894 *, UnkStruct_ov63_0222CCB8 *) = { + const UnkStruct_ov63_0222BEC0 *v0; + static BOOL (*const v1[12])(const UnkStruct_ov63_0222BEC0 *, const UnkStruct_ov63_0222BCE8 *, const UnkStruct_ov63_0222BE18 *, const UnkStruct_ov63_0222D894 *, UnkStruct_ov63_0222CCB8 *) = { ov63_0222CAE4, ov63_0222CB10, ov63_0222CB4C, @@ -57,7 +56,7 @@ BOOL ov63_0222CA88 (const UnkStruct_ov63_0222BCE8 * param0, const UnkStruct_ov63 return v2; } -static BOOL ov63_0222CAE4 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4) +static BOOL ov63_0222CAE4(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4) { s32 v0; @@ -71,7 +70,7 @@ static BOOL ov63_0222CAE4 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStru return 0; } -static BOOL ov63_0222CB10 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4) +static BOOL ov63_0222CB10(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4) { s32 v0; s32 v1; @@ -79,7 +78,7 @@ static BOOL ov63_0222CB10 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStru v0 = ov63_0222BF90(param0, 5); v1 = ov63_0222BF90(param0, 6); - if ((v0 == 0)) { + if (v0 == 0) { if (v1 != param3->unk_02) { ov63_0222CCB8(param4, param0, param3->unk_00, param3->unk_03, param3->unk_02); return 1; @@ -89,7 +88,7 @@ static BOOL ov63_0222CB10 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStru return 0; } -static BOOL ov63_0222CB4C (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4) +static BOOL ov63_0222CB4C(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4) { s32 v0; BOOL v1; @@ -98,7 +97,7 @@ static BOOL ov63_0222CB4C (const UnkStruct_ov63_0222BEC0 * param0, const UnkStru do { v0 = ov63_0222BF90(param0, 5); - if ((v0 != 0)) { + if (v0 != 0) { break; } @@ -118,7 +117,7 @@ static BOOL ov63_0222CB4C (const UnkStruct_ov63_0222BEC0 * param0, const UnkStru return 1; } while (0); - if ((v0 == 0)) { + if (v0 == 0) { v2 = ov63_0222BF90(param0, 10); if (v2 >= 8) { @@ -130,18 +129,18 @@ static BOOL ov63_0222CB4C (const UnkStruct_ov63_0222BEC0 * param0, const UnkStru return 0; } -static BOOL ov63_0222CBC0 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4) +static BOOL ov63_0222CBC0(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4) { return ov63_0222CB4C(param0, param1, param2, param3, param4); } -static BOOL ov63_0222CBD0 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4) +static BOOL ov63_0222CBD0(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4) { s32 v0; v0 = ov63_0222BF90(param0, 5); - if ((v0 == 0)) { + if (v0 == 0) { ov63_0222CCB8(param4, param0, param3->unk_00, param3->unk_03, param3->unk_02); return 1; } @@ -149,24 +148,24 @@ static BOOL ov63_0222CBD0 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStru return 0; } -static BOOL ov63_0222CBF8 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4) +static BOOL ov63_0222CBF8(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4) { GF_ASSERT(0); return 0; } -static BOOL ov63_0222CC04 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4) +static BOOL ov63_0222CC04(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4) { return ov63_0222CB4C(param0, param1, param2, param3, param4); } -static BOOL ov63_0222CC14 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, const UnkStruct_ov63_0222BE18 * param2, const UnkStruct_ov63_0222D894 * param3, UnkStruct_ov63_0222CCB8 * param4) +static BOOL ov63_0222CC14(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, const UnkStruct_ov63_0222BE18 *param2, const UnkStruct_ov63_0222D894 *param3, UnkStruct_ov63_0222CCB8 *param4) { s32 v0; v0 = ov63_0222BF90(param0, 5); - if ((v0 == 0)) { + if (v0 == 0) { ov63_0222CCB8(param4, param0, param3->unk_00, param3->unk_03, param3->unk_02); return 1; } @@ -174,7 +173,7 @@ static BOOL ov63_0222CC14 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStru return 0; } -static BOOL ov63_0222CC3C (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BCE8 * param1, int param2) +static BOOL ov63_0222CC3C(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BCE8 *param1, int param2) { UnkStruct_ov63_0222CC3C v0; @@ -184,9 +183,9 @@ static BOOL ov63_0222CC3C (const UnkStruct_ov63_0222BEC0 * param0, const UnkStru return ov63_0222BDAC(param1, (v0.unk_00) / 16, (v0.unk_02) / 16); } -static BOOL ov63_0222CCA4 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStruct_ov63_0222BE18 * param1, int param2) +static BOOL ov63_0222CCA4(const UnkStruct_ov63_0222BEC0 *param0, const UnkStruct_ov63_0222BE18 *param1, int param2) { - const UnkStruct_ov63_0222BEC0 * v0; + const UnkStruct_ov63_0222BEC0 *v0; v0 = ov63_0222C1C4(param0, param1, param2); @@ -197,7 +196,7 @@ static BOOL ov63_0222CCA4 (const UnkStruct_ov63_0222BEC0 * param0, const UnkStru return 1; } -static void ov63_0222CCB8 (UnkStruct_ov63_0222CCB8 * param0, const UnkStruct_ov63_0222BEC0 * param1, int param2, u32 param3, int param4) +static void ov63_0222CCB8(UnkStruct_ov63_0222CCB8 *param0, const UnkStruct_ov63_0222BEC0 *param1, int param2, u32 param3, int param4) { param0->unk_00 = ov63_0222C0E4(param1); param0->unk_04 = param2; diff --git a/src/overlay063/ov63_0222CCE4.c b/src/overlay063/ov63_0222CCE4.c index a217a1f9c9..5d61b56748 100644 --- a/src/overlay063/ov63_0222CCE4.c +++ b/src/overlay063/ov63_0222CCE4.c @@ -1,11 +1,15 @@ +#include "overlay063/ov63_0222CCE4.h" + #include #include #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_020218BC_decl.h" + +#include "overlay063/ov63_0222AE60.h" +#include "overlay063/ov63_0222BE18.h" #include "overlay063/struct_ov63_0222BB38_decl.h" #include "overlay063/struct_ov63_0222BEC0_decl.h" - #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222CD2C.h" #include "overlay063/struct_ov63_0222CE44.h" @@ -13,19 +17,16 @@ #include "heap.h" #include "unk_020218BC.h" -#include "overlay063/ov63_0222AE60.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay063/ov63_0222CCE4.h" -static BOOL ov63_0222D07C(const UnkStruct_ov63_0222CE44 * param0); -static UnkStruct_ov63_0222CE44 * ov63_0222D08C(UnkStruct_ov63_0222CD2C * param0); -static int ov63_0222D0C4(const UnkStruct_ov63_0222BB38 * param0, int param1); -static void ov63_0222D0E0(const UnkStruct_ov63_0222CE44 * param0, s16 * param1, s16 * param2); -static void ov63_0222D110(UnkStruct_ov63_0222CE44 * param0, int param1, int param2); +static BOOL ov63_0222D07C(const UnkStruct_ov63_0222CE44 *param0); +static UnkStruct_ov63_0222CE44 *ov63_0222D08C(UnkStruct_ov63_0222CD2C *param0); +static int ov63_0222D0C4(const UnkStruct_ov63_0222BB38 *param0, int param1); +static void ov63_0222D0E0(const UnkStruct_ov63_0222CE44 *param0, s16 *param1, s16 *param2); +static void ov63_0222D110(UnkStruct_ov63_0222CE44 *param0, int param1, int param2); -UnkStruct_ov63_0222CD2C * ov63_0222CCE4 (GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3, u32 param4) +UnkStruct_ov63_0222CD2C *ov63_0222CCE4(GraphicElementManager *param0, PaletteData *param1, u32 param2, u32 param3, u32 param4) { - UnkStruct_ov63_0222CD2C * v0; + UnkStruct_ov63_0222CD2C *v0; v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov63_0222CD2C)); v0->unk_00 = ov63_0222AE60(param0, param1, param2, param4); @@ -40,9 +41,9 @@ UnkStruct_ov63_0222CD2C * ov63_0222CCE4 (GraphicElementManager * param0, Palette return v0; } -UnkStruct_ov63_0222CD2C * ov63_0222CD2C (GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6) +UnkStruct_ov63_0222CD2C *ov63_0222CD2C(GraphicElementManager *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6) { - UnkStruct_ov63_0222CD2C * v0; + UnkStruct_ov63_0222CD2C *v0; v0 = Heap_AllocFromHeap(param6, sizeof(UnkStruct_ov63_0222CD2C)); v0->unk_00 = ov63_0222AE60(param0, param1, param2, param6); @@ -60,7 +61,7 @@ UnkStruct_ov63_0222CD2C * ov63_0222CD2C (GraphicElementManager * param0, Palette return v0; } -void ov63_0222CD9C (UnkStruct_ov63_0222CD2C * param0) +void ov63_0222CD9C(UnkStruct_ov63_0222CD2C *param0) { int v0; @@ -78,36 +79,36 @@ void ov63_0222CD9C (UnkStruct_ov63_0222CD2C * param0) Heap_FreeToHeap(param0); } -void ov63_0222CDE8 (UnkStruct_ov63_0222CD2C * param0, u32 param1, int param2, u32 param3) +void ov63_0222CDE8(UnkStruct_ov63_0222CD2C *param0, u32 param1, int param2, u32 param3) { if (ov63_0222AFE4(param0->unk_00, param1) == 0) { ov63_0222AF94(param0->unk_00, param1, param0->unk_0B, param2, param3); } } -void ov63_0222CE0C (UnkStruct_ov63_0222CD2C * param0, u32 param1) +void ov63_0222CE0C(UnkStruct_ov63_0222CD2C *param0, u32 param1) { ov63_0222AFD0(param0->unk_00, param1); } -BOOL ov63_0222CE18 (const UnkStruct_ov63_0222CD2C * param0, u32 param1) +BOOL ov63_0222CE18(const UnkStruct_ov63_0222CD2C *param0, u32 param1) { return ov63_0222AFE4(param0->unk_00, param1); } -void ov63_0222CE24 (UnkStruct_ov63_0222CD2C * param0) +void ov63_0222CE24(UnkStruct_ov63_0222CD2C *param0) { ov63_0222AFF8(param0->unk_00); } -void ov63_0222CE30 (UnkStruct_ov63_0222CD2C * param0, int param1, u32 param2) +void ov63_0222CE30(UnkStruct_ov63_0222CD2C *param0, int param1, u32 param2) { ov63_0222B02C(param0->unk_00, param0->unk_0B, param1, param2); } -UnkStruct_ov63_0222CE44 * ov63_0222CE44 (UnkStruct_ov63_0222CD2C * param0, const UnkStruct_ov63_0222BEC0 * param1, BOOL param2, u32 param3) +UnkStruct_ov63_0222CE44 *ov63_0222CE44(UnkStruct_ov63_0222CD2C *param0, const UnkStruct_ov63_0222BEC0 *param1, BOOL param2, u32 param3) { - UnkStruct_ov63_0222CE44 * v0; + UnkStruct_ov63_0222CE44 *v0; UnkStruct_ov64_022302EC v1; s32 v2; @@ -135,13 +136,13 @@ UnkStruct_ov63_0222CE44 * ov63_0222CE44 (UnkStruct_ov63_0222CD2C * param0, const return v0; } -void ov63_0222CECC (UnkStruct_ov63_0222CE44 * param0) +void ov63_0222CECC(UnkStruct_ov63_0222CE44 *param0) { ov63_0222B210(param0->unk_04); memset(param0, 0, sizeof(UnkStruct_ov63_0222CE44)); } -void ov63_0222CEE4 (UnkStruct_ov63_0222CD2C * param0) +void ov63_0222CEE4(UnkStruct_ov63_0222CD2C *param0) { int v0; @@ -152,7 +153,7 @@ void ov63_0222CEE4 (UnkStruct_ov63_0222CD2C * param0) } } -void ov63_0222CF14 (UnkStruct_ov63_0222CE44 * param0) +void ov63_0222CF14(UnkStruct_ov63_0222CE44 *param0) { s32 v0; s32 v1; @@ -186,22 +187,22 @@ void ov63_0222CF14 (UnkStruct_ov63_0222CE44 * param0) ov63_0222B33C(param0->unk_04); } -void ov63_0222CFA4 (UnkStruct_ov63_0222CE44 * param0, BOOL param1) +void ov63_0222CFA4(UnkStruct_ov63_0222CE44 *param0, BOOL param1) { param0->unk_13 = param1; } -void ov63_0222CFA8 (UnkStruct_ov63_0222CE44 * param0) +void ov63_0222CFA8(UnkStruct_ov63_0222CE44 *param0) { ov63_0222D110(param0, 1, param0->unk_0A); } -void ov63_0222CFB4 (UnkStruct_ov63_0222CE44 * param0) +void ov63_0222CFB4(UnkStruct_ov63_0222CE44 *param0) { ov63_0222B33C(param0->unk_04); } -void ov63_0222CFC0 (UnkStruct_ov63_0222CE44 * param0) +void ov63_0222CFC0(UnkStruct_ov63_0222CE44 *param0) { int v0; @@ -211,52 +212,52 @@ void ov63_0222CFC0 (UnkStruct_ov63_0222CE44 * param0) ov63_0222CF14(param0); } -void ov63_0222CFE0 (UnkStruct_ov63_0222CE44 * param0, UnkStruct_ov63_0222CC3C param1) +void ov63_0222CFE0(UnkStruct_ov63_0222CE44 *param0, UnkStruct_ov63_0222CC3C param1) { ov63_0222B238(param0->unk_04, param1.unk_00, param1.unk_02); } -BOOL ov63_0222CFFC (const UnkStruct_ov63_0222CE44 * param0) +BOOL ov63_0222CFFC(const UnkStruct_ov63_0222CE44 *param0) { return ov63_0222B2B0(param0->unk_04); } -void ov63_0222D008 (UnkStruct_ov63_0222CE44 * param0, BOOL param1) +void ov63_0222D008(UnkStruct_ov63_0222CE44 *param0, BOOL param1) { ov63_0222B294(param0->unk_04, param1); } -u16 ov63_0222D014 (const UnkStruct_ov63_0222CE44 * param0) +u16 ov63_0222D014(const UnkStruct_ov63_0222CE44 *param0) { return ov63_0222B284(param0->unk_04); } -void ov63_0222D020 (UnkStruct_ov63_0222CE44 * param0, int param1) +void ov63_0222D020(UnkStruct_ov63_0222CE44 *param0, int param1) { ov63_0222D110(param0, 0, param1); ov63_0222B33C(param0->unk_04); } -u32 ov63_0222D034 (s16 param0, BOOL param1) +u32 ov63_0222D034(s16 param0, BOOL param1) { if (param1 == 1) { - return(20000 - (param0 * 2) + 20000); + return 20000 - (param0 * 2) + 20000; } - return((20000 - (param0 * 2) + 20000) + 1); + return (20000 - (param0 * 2) + 20000) + 1; } -u32 ov63_0222D050 (const UnkStruct_ov63_0222CE44 * param0) +u32 ov63_0222D050(const UnkStruct_ov63_0222CE44 *param0) { return sub_02021F48(ov63_0222B234(param0->unk_04)); } -void ov63_0222D060 (UnkStruct_ov63_0222CE44 * param0, UnkStruct_ov63_0222CC3C param1) +void ov63_0222D060(UnkStruct_ov63_0222CE44 *param0, UnkStruct_ov63_0222CC3C param1) { ov63_0222B2E0(param0->unk_04, param1.unk_00, param1.unk_02); } -static BOOL ov63_0222D07C (const UnkStruct_ov63_0222CE44 * param0) +static BOOL ov63_0222D07C(const UnkStruct_ov63_0222CE44 *param0) { if (param0->unk_04 == NULL) { return 1; @@ -265,7 +266,7 @@ static BOOL ov63_0222D07C (const UnkStruct_ov63_0222CE44 * param0) return 0; } -static UnkStruct_ov63_0222CE44 * ov63_0222D08C (UnkStruct_ov63_0222CD2C * param0) +static UnkStruct_ov63_0222CE44 *ov63_0222D08C(UnkStruct_ov63_0222CD2C *param0) { int v0; @@ -279,10 +280,21 @@ static UnkStruct_ov63_0222CE44 * ov63_0222D08C (UnkStruct_ov63_0222CD2C * param0 return NULL; } -static int ov63_0222D0C4 (const UnkStruct_ov63_0222BB38 * param0, int param1) +static int ov63_0222D0C4(const UnkStruct_ov63_0222BB38 *param0, int param1) { static const u8 v0[12] = { - 0, 3, 2, 4, 0, 5, 6, 8, 7, 8, 2, 6, + 0, + 3, + 2, + 4, + 0, + 5, + 6, + 8, + 7, + 8, + 2, + 6, }; int v1; @@ -295,7 +307,7 @@ static int ov63_0222D0C4 (const UnkStruct_ov63_0222BB38 * param0, int param1) return v0[param1]; } -static void ov63_0222D0E0 (const UnkStruct_ov63_0222CE44 * param0, s16 * param1, s16 * param2) +static void ov63_0222D0E0(const UnkStruct_ov63_0222CE44 *param0, s16 *param1, s16 *param2) { UnkStruct_ov63_0222CC3C v0; @@ -305,12 +317,21 @@ static void ov63_0222D0E0 (const UnkStruct_ov63_0222CE44 * param0, s16 * param1, *param2 = v0.unk_02; } -static void ov63_0222D110 (UnkStruct_ov63_0222CE44 * param0, int param1, int param2) +static void ov63_0222D110(UnkStruct_ov63_0222CE44 *param0, int param1, int param2) { u16 v0; u16 v1; static const u8 v2[10] = { - 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, + 0, + 0, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 0, }; v0 = ov63_0222B2D4(param0->unk_04); diff --git a/src/overlay063/ov63_0222D160.c b/src/overlay063/ov63_0222D160.c index 9a711abb05..bf53f7384e 100644 --- a/src/overlay063/ov63_0222D160.c +++ b/src/overlay063/ov63_0222D160.c @@ -1,15 +1,14 @@ +#include "overlay063/ov63_0222D160.h" + #include #include +#include "overlay063/ov63_0222BE18.h" #include "overlay063/struct_ov63_0222BEC0_decl.h" - #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222D160.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay063/ov63_0222D160.h" - -void ov63_0222D160 (UnkStruct_ov63_0222D160 * param0, const UnkStruct_ov63_0222BEC0 * param1) +void ov63_0222D160(UnkStruct_ov63_0222D160 *param0, const UnkStruct_ov63_0222BEC0 *param1) { UnkStruct_ov63_0222CC3C v0; @@ -17,23 +16,23 @@ void ov63_0222D160 (UnkStruct_ov63_0222D160 * param0, const UnkStruct_ov63_0222B ov63_0222D1A8(param0, v0.unk_02 - 96, v0.unk_00 - 112); } -void ov63_0222D19C (UnkStruct_ov63_0222D160 * param0) +void ov63_0222D19C(UnkStruct_ov63_0222D160 *param0) { memset(param0, 0, sizeof(UnkStruct_ov63_0222D160)); } -void ov63_0222D1A8 (UnkStruct_ov63_0222D160 * param0, s16 param1, s16 param2) +void ov63_0222D1A8(UnkStruct_ov63_0222D160 *param0, s16 param1, s16 param2) { param0->unk_00 = param1; param0->unk_02 = param2; } -s16 ov63_0222D1B0 (const UnkStruct_ov63_0222D160 * param0) +s16 ov63_0222D1B0(const UnkStruct_ov63_0222D160 *param0) { return param0->unk_00; } -s16 ov63_0222D1B8 (const UnkStruct_ov63_0222D160 * param0) +s16 ov63_0222D1B8(const UnkStruct_ov63_0222D160 *param0) { return param0->unk_02; } diff --git a/src/overlay063/ov63_0222D1C0.c b/src/overlay063/ov63_0222D1C0.c index 2475bcd102..ea85edcbe4 100644 --- a/src/overlay063/ov63_0222D1C0.c +++ b/src/overlay063/ov63_0222D1C0.c @@ -1,42 +1,43 @@ +#include "overlay063/ov63_0222D1C0.h" + #include #include #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_0200C738.h" + +#include "overlay063/ov63_0222D160.h" #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222D160.h" #include "overlay065/struct_ov65_0223582C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "heap.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" -#include "heap.h" #include "unk_02018340.h" -#include "overlay063/ov63_0222D160.h" -#include "overlay063/ov63_0222D1C0.h" typedef struct UnkStruct_ov63_0222D1C0_t { - UnkStruct_0200C738 * unk_00; - BGL * unk_04; - void * unk_08; - NNSG2dScreenData * unk_0C; + UnkStruct_0200C738 *unk_00; + BGL *unk_04; + void *unk_08; + NNSG2dScreenData *unk_0C; u32 unk_10; u32 unk_14; u16 unk_18; u16 unk_1A; } UnkStruct_ov63_0222D1C0; -static void ov63_0222D31C(BGL * param0, int param1, const UnkStruct_ov65_0223582C * param2); -static void ov63_0222D378(UnkStruct_ov63_0222D1C0 * param0, s16 param1, s16 param2); -static void ov63_0222D408(BGL * param0, int param1, const NNSG2dScreenData * param2, s16 param3, s16 param4); -static void ov63_0222D4F8(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void * param6, u8 param7, u8 param8, u8 param9, u8 param10); +static void ov63_0222D31C(BGL *param0, int param1, const UnkStruct_ov65_0223582C *param2); +static void ov63_0222D378(UnkStruct_ov63_0222D1C0 *param0, s16 param1, s16 param2); +static void ov63_0222D408(BGL *param0, int param1, const NNSG2dScreenData *param2, s16 param3, s16 param4); +static void ov63_0222D4F8(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10); static u8 ov63_0222D688(u8 param0, u8 param1); -static const void * ov63_0222D6BC(const u8 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, UnkStruct_ov63_0222CC3C * param6); +static const void *ov63_0222D6BC(const u8 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, UnkStruct_ov63_0222CC3C *param6); -UnkStruct_ov63_0222D1C0 * ov63_0222D1C0 (UnkStruct_0200C738 * param0, BGL * param1, const UnkStruct_ov65_0223582C * param2, u32 param3) +UnkStruct_ov63_0222D1C0 *ov63_0222D1C0(UnkStruct_0200C738 *param0, BGL *param1, const UnkStruct_ov65_0223582C *param2, u32 param3) { - UnkStruct_ov63_0222D1C0 * v0; + UnkStruct_ov63_0222D1C0 *v0; v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov63_0222D1C0)); memset(v0, 0, sizeof(UnkStruct_ov63_0222D1C0)); @@ -53,13 +54,13 @@ UnkStruct_ov63_0222D1C0 * ov63_0222D1C0 (UnkStruct_0200C738 * param0, BGL * para return v0; } -void ov63_0222D214 (UnkStruct_ov63_0222D1C0 * param0) +void ov63_0222D214(UnkStruct_ov63_0222D1C0 *param0) { Heap_FreeToHeap(param0->unk_08); Heap_FreeToHeap(param0); } -void ov63_0222D228 (UnkStruct_ov63_0222D1C0 * param0, const UnkStruct_ov63_0222D160 * param1) +void ov63_0222D228(UnkStruct_ov63_0222D1C0 *param0, const UnkStruct_ov63_0222D160 *param1) { s16 v0; s16 v1; @@ -76,10 +77,14 @@ void ov63_0222D228 (UnkStruct_ov63_0222D1C0 * param0, const UnkStruct_ov63_0222D ov63_0222D378(param0, v0, v1); } -static void ov63_0222D31C (BGL * param0, int param1, const UnkStruct_ov65_0223582C * param2) +static void ov63_0222D31C(BGL *param0, int param1, const UnkStruct_ov65_0223582C *param2) { UnkStruct_ov97_0222DB78 v0 = { - 0, 0, 0x1000, 0, 3, + 0, + 0, + 0x1000, + 0, + 3, }; v0.unk_11 = param2->unk_02; @@ -94,7 +99,7 @@ static void ov63_0222D31C (BGL * param0, int param1, const UnkStruct_ov65_022358 sub_020183C4(param0, param1, &v0, 0); } -static void ov63_0222D378 (UnkStruct_ov63_0222D1C0 * param0, s16 param1, s16 param2) +static void ov63_0222D378(UnkStruct_ov63_0222D1C0 *param0, s16 param1, s16 param2) { s16 v0; s16 v1; @@ -118,7 +123,7 @@ static void ov63_0222D378 (UnkStruct_ov63_0222D1C0 * param0, s16 param1, s16 par sub_0201C63C(param0->unk_04, param0->unk_14, 3, v3); } -static void ov63_0222D408 (BGL * param0, int param1, const NNSG2dScreenData * param2, s16 param3, s16 param4) +static void ov63_0222D408(BGL *param0, int param1, const NNSG2dScreenData *param2, s16 param3, s16 param4) { s16 v0, v1; s16 v2, v3; @@ -167,11 +172,11 @@ static void ov63_0222D408 (BGL * param0, int param1, const NNSG2dScreenData * pa ov63_0222D4F8(param0, param1, v4, v5, v0, v1, param2->rawData, v2, v3, v6, v7); } -static void ov63_0222D4F8 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void * param6, u8 param7, u8 param8, u8 param9, u8 param10) +static void ov63_0222D4F8(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) { s8 v0, v1; s8 v2, v3; - const u16 * v4; + const u16 *v4; UnkStruct_ov63_0222CC3C v5; s8 v6, v7; u8 v8; @@ -223,7 +228,7 @@ static void ov63_0222D4F8 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 par } } -static u8 ov63_0222D688 (u8 param0, u8 param1) +static u8 ov63_0222D688(u8 param0, u8 param1) { GF_ASSERT(param0 <= 64); GF_ASSERT(param1 <= 64); @@ -246,7 +251,7 @@ static u8 ov63_0222D688 (u8 param0, u8 param1) return 0; } -static const void * ov63_0222D6BC (const u8 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, UnkStruct_ov63_0222CC3C * param6) +static const void *ov63_0222D6BC(const u8 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, UnkStruct_ov63_0222CC3C *param6) { s16 v0; u16 v1; diff --git a/src/overlay063/ov63_0222D77C.c b/src/overlay063/ov63_0222D77C.c index 014ce07472..71223598d6 100644 --- a/src/overlay063/ov63_0222D77C.c +++ b/src/overlay063/ov63_0222D77C.c @@ -1,3 +1,5 @@ +#include "overlay063/ov63_0222D77C.h" + #include #include @@ -5,25 +7,24 @@ #include "overlay063/struct_ov63_0222D894.h" #include "heap.h" -#include "overlay063/ov63_0222D77C.h" typedef struct UnkStruct_ov63_0222D77C_t { - UnkStruct_ov63_0222CCB8 * unk_00; + UnkStruct_ov63_0222CCB8 *unk_00; u32 unk_04; u16 unk_08; u16 unk_0A; } UnkStruct_ov63_0222D77C; typedef struct UnkStruct_ov63_0222D848_t { - UnkStruct_ov63_0222D894 * unk_00; + UnkStruct_ov63_0222D894 *unk_00; u32 unk_04; u16 unk_08; u16 unk_0A; } UnkStruct_ov63_0222D848; -UnkStruct_ov63_0222D77C * ov63_0222D77C (u32 param0, u32 param1) +UnkStruct_ov63_0222D77C *ov63_0222D77C(u32 param0, u32 param1) { - UnkStruct_ov63_0222D77C * v0; + UnkStruct_ov63_0222D77C *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov63_0222D77C)); GF_ASSERT(v0); @@ -39,13 +40,13 @@ UnkStruct_ov63_0222D77C * ov63_0222D77C (u32 param0, u32 param1) return v0; } -void ov63_0222D7B4 (UnkStruct_ov63_0222D77C * param0) +void ov63_0222D7B4(UnkStruct_ov63_0222D77C *param0) { Heap_FreeToHeap(param0->unk_00); Heap_FreeToHeap(param0); } -void ov63_0222D7C8 (UnkStruct_ov63_0222D77C * param0, const UnkStruct_ov63_0222CCB8 * param1) +void ov63_0222D7C8(UnkStruct_ov63_0222D77C *param0, const UnkStruct_ov63_0222CCB8 *param1) { if (((param0->unk_0A + 1) % param0->unk_04) == param0->unk_08) { UnkStruct_ov63_0222CCB8 v0; @@ -56,7 +57,7 @@ void ov63_0222D7C8 (UnkStruct_ov63_0222D77C * param0, const UnkStruct_ov63_0222C param0->unk_0A = (param0->unk_0A + 1) % param0->unk_04; } -BOOL ov63_0222D810 (UnkStruct_ov63_0222D77C * param0, UnkStruct_ov63_0222CCB8 * param1) +BOOL ov63_0222D810(UnkStruct_ov63_0222D77C *param0, UnkStruct_ov63_0222CCB8 *param1) { if (param0->unk_0A == param0->unk_08) { return 0; @@ -68,9 +69,9 @@ BOOL ov63_0222D810 (UnkStruct_ov63_0222D77C * param0, UnkStruct_ov63_0222CCB8 * return 1; } -UnkStruct_ov63_0222D848 * ov63_0222D848 (u32 param0, u32 param1) +UnkStruct_ov63_0222D848 *ov63_0222D848(u32 param0, u32 param1) { - UnkStruct_ov63_0222D848 * v0; + UnkStruct_ov63_0222D848 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov63_0222D848)); GF_ASSERT(v0); @@ -86,13 +87,13 @@ UnkStruct_ov63_0222D848 * ov63_0222D848 (u32 param0, u32 param1) return v0; } -void ov63_0222D880 (UnkStruct_ov63_0222D848 * param0) +void ov63_0222D880(UnkStruct_ov63_0222D848 *param0) { Heap_FreeToHeap(param0->unk_00); Heap_FreeToHeap(param0); } -void ov63_0222D894 (UnkStruct_ov63_0222D848 * param0, const UnkStruct_ov63_0222D894 * param1) +void ov63_0222D894(UnkStruct_ov63_0222D848 *param0, const UnkStruct_ov63_0222D894 *param1) { if (((param0->unk_0A + 1) % param0->unk_04) == param0->unk_08) { UnkStruct_ov63_0222D894 v0; @@ -103,7 +104,7 @@ void ov63_0222D894 (UnkStruct_ov63_0222D848 * param0, const UnkStruct_ov63_0222D param0->unk_0A = (param0->unk_0A + 1) % param0->unk_04; } -BOOL ov63_0222D8D0 (UnkStruct_ov63_0222D848 * param0, UnkStruct_ov63_0222D894 * param1) +BOOL ov63_0222D8D0(UnkStruct_ov63_0222D848 *param0, UnkStruct_ov63_0222D894 *param1) { if (param0->unk_0A == param0->unk_08) { return 0; diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c index 6e808a620b..1b9c21e745 100644 --- a/src/overlay065/ov65_02235060.c +++ b/src/overlay065/ov65_02235060.c @@ -1,15 +1,23 @@ +#include "overlay065/ov65_02235060.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "overlay063/struct_ov63_0222BEC0_decl.h" +#include "overlay063/ov63_0222BCE8.h" +#include "overlay063/ov63_0222BE18.h" +#include "overlay063/ov63_0222CA88.h" +#include "overlay063/ov63_0222CCE4.h" +#include "overlay063/ov63_0222D160.h" +#include "overlay063/ov63_0222D1C0.h" +#include "overlay063/ov63_0222D77C.h" +#include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222CCB8.h" #include "overlay063/struct_ov63_0222D894.h" +#include "overlay065/ov65_02236474.h" #include "overlay065/struct_ov65_02235130.h" #include "overlay065/struct_ov65_022354D8.h" #include "overlay065/struct_ov65_0223582C.h" @@ -18,24 +26,16 @@ #include "overlay065/struct_ov65_022376D0.h" #include "overlay115/struct_ov115_02261520.h" +#include "core_sys.h" +#include "heap.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_020218BC.h" -#include "overlay063/ov63_0222BCE8.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay063/ov63_0222CA88.h" -#include "overlay063/ov63_0222CCE4.h" -#include "overlay063/ov63_0222D160.h" -#include "overlay063/ov63_0222D1C0.h" -#include "overlay063/ov63_0222D77C.h" -#include "overlay065/ov65_02235060.h" -#include "overlay065/ov65_02236474.h" #define MCR_PCANM_DESTPL(x) ((7 * 32) + (((x) + 1) * 2)) @@ -51,78 +51,78 @@ typedef struct { s16 unk_02; } UnkStruct_ov65_02235C64; -static void ov65_0223560C(UnkStruct_ov65_02235130 * param0); -static BOOL ov65_02235634(const UnkStruct_ov65_02235130 * param0); -static BOOL ov65_02235654(const UnkStruct_ov65_02235130 * param0); -static void ov65_022356E8(UnkStruct_ov65_02235130 * param0); -static void ov65_0223573C(UnkStruct_ov65_02235130 * param0); -static void ov65_02235778(UnkStruct_ov65_02235130 * param0); -static const UnkStruct_ov65_022354D8 * ov65_022357A8(const UnkStruct_ov65_02235130 * param0, const UnkStruct_ov65_022354D8 * param1, int param2); -static void ov65_022357E8(UnkStruct_ov65_02235130 * param0, u32 param1, u32 param2); -static void ov65_0223581C(UnkStruct_ov65_02235130 * param0); -static void ov65_0223582C(UnkStruct_ov65_02235130 * param0, u32 param1, NARC * param2, u32 param3); -static void ov65_0223586C(UnkStruct_ov65_02235130 * param0); -static void ov65_0223587C(UnkStruct_ov65_022358CC * param0, u32 param1, NARC * param2); -static void ov65_022358CC(UnkStruct_ov65_022358CC * param0); -static void ov65_022358F8(UnkStruct_ov65_022358CC * param0, u32 param1, NARC * param2); -static void ov65_02235900(UnkStruct_ov65_022358CC * param0); -static void ov65_02235908(UnkStruct_ov65_022358CC * param0, u32 param1); -static void ov65_02235910(UnkStruct_ov65_022358CC * param0); -static void ov65_02235918(BGL * param0, u32 param1); -static void ov65_0223591C(BGL * param0); -static void ov65_02235920(BGL * param0, u32 param1, NARC * param2); -static BOOL ov65_02235BE8(UnkStruct_ov65_02235130 * param0); -static void ov65_02235960(UnkStruct_ov65_022358CC * param0, u32 param1, NARC * param2); -static void ov65_02235A60(UnkStruct_ov65_022358CC * param0); -static void ov65_02235A94(UnkStruct_ov65_022358CC * param0, u32 param1); -static void ov65_02235B14(UnkStruct_ov65_022358CC * param0); -static void ov65_02235B30(UnkStruct_ov65_02235130 * param0); -static void ov65_02235B78(UnkStruct_ov65_02235130 * param0); -static void ov65_02235B88(UnkStruct_ov65_02235130 * param0, UnkStruct_ov63_0222CC3C param1, u32 param2); -static void ov65_02235BD8(UnkStruct_ov65_02235130 * param0); -static void ov65_02235C64(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_02235C64 * param1, u32 param2); -static void ov65_02235D08(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_02235C64 * param1); -static UnkStruct_ov65_022354D8 * ov65_02235D7C(UnkStruct_ov65_02235130 * param0); -static void ov65_02235DAC(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1, BOOL param2); -static void ov65_02235DE4(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1, const UnkStruct_ov65_02235C64 * param2, u32 param3, u16 param4, u8 param5, int param6); -static BOOL ov65_02235E1C(const UnkStruct_ov65_022354D8 * param0); -static void ov65_02235E48(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static void ov65_02235E68(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static void ov65_02235E84(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static void ov65_02235EC8(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static void ov65_02235EF4(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static void ov65_02235EF8(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static void ov65_02235F94(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static BOOL ov65_02236044(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static BOOL ov65_02236158(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static BOOL ov65_022361B0(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static BOOL ov65_022361C8(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static BOOL ov65_02236214(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static BOOL ov65_0223622C(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1); -static void ov65_02236230(UnkStruct_ov65_02235130 * param0, s32 param1, s32 param2, s32 param3); -static void ov65_02236250(UnkStruct_ov65_02235130 * param0, s32 param1, const UnkStruct_ov65_022354D8 * param2); -static BOOL ov65_02236278(const UnkStruct_ov65_022354D8 * param0); -static void ov65_0223628C(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1, int param2); -static void ov65_022362B0(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_02236318 * param1, NARC * param2); -static void ov65_022362EC(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_02236318 * param1); -static void ov65_02236304(UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_02236318 * param1); -static void ov65_02236318(UnkStruct_ov65_02236318 * param0); -static void ov65_02236384(UnkStruct_ov65_02236318 * param0); -static void * ov65_02236410(UnkStruct_ov65_02236318 * param0, u32 param1); -static void ov65_0223641C(UnkStruct_ov65_02236318 * param0); -static void ov65_02236438(UnkStruct_ov65_02236318 * param0); -static void ov65_02236440(UnkStruct_ov65_02236318 * param0, u8 param1); -static void ov65_02236464(UnkStruct_ov65_02236318 * param0); +static void ov65_0223560C(UnkStruct_ov65_02235130 *param0); +static BOOL ov65_02235634(const UnkStruct_ov65_02235130 *param0); +static BOOL ov65_02235654(const UnkStruct_ov65_02235130 *param0); +static void ov65_022356E8(UnkStruct_ov65_02235130 *param0); +static void ov65_0223573C(UnkStruct_ov65_02235130 *param0); +static void ov65_02235778(UnkStruct_ov65_02235130 *param0); +static const UnkStruct_ov65_022354D8 *ov65_022357A8(const UnkStruct_ov65_02235130 *param0, const UnkStruct_ov65_022354D8 *param1, int param2); +static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, u32 param2); +static void ov65_0223581C(UnkStruct_ov65_02235130 *param0); +static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, u32 param3); +static void ov65_0223586C(UnkStruct_ov65_02235130 *param0); +static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2); +static void ov65_022358CC(UnkStruct_ov65_022358CC *param0); +static void ov65_022358F8(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2); +static void ov65_02235900(UnkStruct_ov65_022358CC *param0); +static void ov65_02235908(UnkStruct_ov65_022358CC *param0, u32 param1); +static void ov65_02235910(UnkStruct_ov65_022358CC *param0); +static void ov65_02235918(BGL *param0, u32 param1); +static void ov65_0223591C(BGL *param0); +static void ov65_02235920(BGL *param0, u32 param1, NARC *param2); +static BOOL ov65_02235BE8(UnkStruct_ov65_02235130 *param0); +static void ov65_02235960(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2); +static void ov65_02235A60(UnkStruct_ov65_022358CC *param0); +static void ov65_02235A94(UnkStruct_ov65_022358CC *param0, u32 param1); +static void ov65_02235B14(UnkStruct_ov65_022358CC *param0); +static void ov65_02235B30(UnkStruct_ov65_02235130 *param0); +static void ov65_02235B78(UnkStruct_ov65_02235130 *param0); +static void ov65_02235B88(UnkStruct_ov65_02235130 *param0, UnkStruct_ov63_0222CC3C param1, u32 param2); +static void ov65_02235BD8(UnkStruct_ov65_02235130 *param0); +static void ov65_02235C64(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_02235C64 *param1, u32 param2); +static void ov65_02235D08(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_02235C64 *param1); +static UnkStruct_ov65_022354D8 *ov65_02235D7C(UnkStruct_ov65_02235130 *param0); +static void ov65_02235DAC(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, BOOL param2); +static void ov65_02235DE4(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, const UnkStruct_ov65_02235C64 *param2, u32 param3, u16 param4, u8 param5, int param6); +static BOOL ov65_02235E1C(const UnkStruct_ov65_022354D8 *param0); +static void ov65_02235E48(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static void ov65_02235E68(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static void ov65_02235E84(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static void ov65_02235EC8(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static void ov65_02235EF4(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static void ov65_02235EF8(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static void ov65_02235F94(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static BOOL ov65_02236044(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static BOOL ov65_02236158(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static BOOL ov65_022361B0(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static BOOL ov65_022361C8(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static BOOL ov65_02236214(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static BOOL ov65_0223622C(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1); +static void ov65_02236230(UnkStruct_ov65_02235130 *param0, s32 param1, s32 param2, s32 param3); +static void ov65_02236250(UnkStruct_ov65_02235130 *param0, s32 param1, const UnkStruct_ov65_022354D8 *param2); +static BOOL ov65_02236278(const UnkStruct_ov65_022354D8 *param0); +static void ov65_0223628C(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, int param2); +static void ov65_022362B0(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_02236318 *param1, NARC *param2); +static void ov65_022362EC(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_02236318 *param1); +static void ov65_02236304(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_02236318 *param1); +static void ov65_02236318(UnkStruct_ov65_02236318 *param0); +static void ov65_02236384(UnkStruct_ov65_02236318 *param0); +static void *ov65_02236410(UnkStruct_ov65_02236318 *param0, u32 param1); +static void ov65_0223641C(UnkStruct_ov65_02236318 *param0); +static void ov65_02236438(UnkStruct_ov65_02236318 *param0); +static void ov65_02236440(UnkStruct_ov65_02236318 *param0, u8 param1); +static void ov65_02236464(UnkStruct_ov65_02236318 *param0); static const UnkStruct_ov65_02238BD7 Unk_ov65_02238BD7[8] = { - {0x0, 0x0, 0x0, 0x1}, - {0x1, 0x2, 0x1, 0x0}, - {0x1, 0x4, 0x1, 0x1}, - {0x1, 0x2, 0x1, 0x0}, - {0x0, 0x0, 0x0, 0x1}, - {0x1, 0x2, 0x1, 0x1}, - {0x1, 0x4, 0x1, 0x0}, - {0x1, 0x3, 0x1, 0x1} + { 0x0, 0x0, 0x0, 0x1 }, + { 0x1, 0x2, 0x1, 0x0 }, + { 0x1, 0x4, 0x1, 0x1 }, + { 0x1, 0x2, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x1 }, + { 0x1, 0x2, 0x1, 0x1 }, + { 0x1, 0x4, 0x1, 0x0 }, + { 0x1, 0x3, 0x1, 0x1 } }; static const u16 Unk_ov65_02238BC8[2] = { @@ -130,7 +130,7 @@ static const u16 Unk_ov65_02238BC8[2] = { 0x2 }; -void ov65_02235060 (UnkStruct_ov65_02235130 * param0, u32 param1, NARC * param2, BGL * param3, u32 param4, u32 param5) +void ov65_02235060(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, BGL *param3, u32 param4, u32 param5) { UnkStruct_ov63_0222CC3C v0; u32 v1; @@ -160,7 +160,7 @@ void ov65_02235060 (UnkStruct_ov65_02235130 * param0, u32 param1, NARC * param2, param0->unk_00 = 1; } -void ov65_02235130 (UnkStruct_ov65_02235130 * param0) +void ov65_02235130(UnkStruct_ov65_02235130 *param0) { ov63_0222D880(param0->unk_75C); ov65_0223586C(param0); @@ -175,12 +175,12 @@ void ov65_02235130 (UnkStruct_ov65_02235130 * param0) memset(param0, 0, sizeof(UnkStruct_ov65_02235130)); } -BOOL ov65_02235194 (const UnkStruct_ov65_02235130 * param0) +BOOL ov65_02235194(const UnkStruct_ov65_02235130 *param0) { return param0->unk_00; } -u32 ov65_02235198 (UnkStruct_ov65_02235130 * param0) +u32 ov65_02235198(UnkStruct_ov65_02235130 *param0) { BOOL v0; @@ -216,20 +216,20 @@ u32 ov65_02235198 (UnkStruct_ov65_02235130 * param0) return 0; } -void ov65_02235244 (UnkStruct_ov65_02235130 * param0) +void ov65_02235244(UnkStruct_ov65_02235130 *param0) { if (param0->unk_00) { sub_020219F8(param0->unk_14.unk_00); } } -u8 ov65_02235254 (const UnkStruct_ov65_02235130 * param0) +u8 ov65_02235254(const UnkStruct_ov65_02235130 *param0) { GF_ASSERT(param0->unk_730 != NULL); return param0->unk_730->unk_0A; } -u32 ov65_02235270 (const UnkStruct_ov65_02235130 * param0) +u32 ov65_02235270(const UnkStruct_ov65_02235130 *param0) { UnkStruct_ov63_0222CC3C v0; @@ -239,7 +239,7 @@ u32 ov65_02235270 (const UnkStruct_ov65_02235130 * param0) return ov63_0222BDE4(param0->unk_748, (v0.unk_00) / 16, (v0.unk_02) / 16); } -u32 ov65_022352CC (const UnkStruct_ov65_02235130 * param0) +u32 ov65_022352CC(const UnkStruct_ov65_02235130 *param0) { UnkStruct_ov63_0222CC3C v0; @@ -249,7 +249,7 @@ u32 ov65_022352CC (const UnkStruct_ov65_02235130 * param0) return ov63_0222BDE4(param0->unk_748, (v0.unk_00) / 16, ((v0.unk_02) / 16) + 1); } -void ov65_0223532C (UnkStruct_ov65_02235130 * param0, const UnkStruct_ov65_022354D8 * param1) +void ov65_0223532C(UnkStruct_ov65_02235130 *param0, const UnkStruct_ov65_022354D8 *param1) { UnkStruct_ov63_0222CC3C v0; u32 v1; @@ -261,24 +261,24 @@ void ov65_0223532C (UnkStruct_ov65_02235130 * param0, const UnkStruct_ov65_02235 ov65_02235B88(param0, v0, v1 - 1); } -void ov65_02235370 (UnkStruct_ov65_02235130 * param0) +void ov65_02235370(UnkStruct_ov65_02235130 *param0) { ov65_02235BD8(param0); } -void ov65_02235378 (UnkStruct_ov65_02235130 * param0, BOOL param1) +void ov65_02235378(UnkStruct_ov65_02235130 *param0, BOOL param1) { param0->unk_0C = param1; } -BOOL ov65_0223537C (const UnkStruct_ov65_02235130 * param0) +BOOL ov65_0223537C(const UnkStruct_ov65_02235130 *param0) { return param0->unk_0C; } -UnkStruct_ov65_022354D8 * ov65_02235380 (UnkStruct_ov65_02235130 * param0, u32 param1) +UnkStruct_ov65_022354D8 *ov65_02235380(UnkStruct_ov65_02235130 *param0, u32 param1) { - UnkStruct_ov65_022354D8 * v0; + UnkStruct_ov65_022354D8 *v0; UnkStruct_ov65_02235C64 v1; v0 = ov65_02235D7C(param0); @@ -295,9 +295,9 @@ UnkStruct_ov65_022354D8 * ov65_02235380 (UnkStruct_ov65_02235130 * param0, u32 p return v0; } -UnkStruct_ov65_022354D8 * ov65_022353EC (UnkStruct_ov65_02235130 * param0, u32 param1, u8 param2) +UnkStruct_ov65_022354D8 *ov65_022353EC(UnkStruct_ov65_02235130 *param0, u32 param1, u8 param2) { - UnkStruct_ov65_022354D8 * v0; + UnkStruct_ov65_022354D8 *v0; UnkStruct_ov65_02235C64 v1; UnkStruct_ov63_0222CC3C v2; @@ -320,7 +320,7 @@ UnkStruct_ov65_022354D8 * ov65_022353EC (UnkStruct_ov65_02235130 * param0, u32 p return v0; } -void ov65_02235478 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +void ov65_02235478(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { s32 v0; @@ -336,7 +336,7 @@ void ov65_02235478 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * ov65_02236250(param0, 4, param1); } -void ov65_022354B8 (UnkStruct_ov65_022354D8 * param0) +void ov65_022354B8(UnkStruct_ov65_022354D8 *param0) { ov63_0222CECC(param0->unk_04); ov63_0222BF08(param0->unk_00); @@ -344,12 +344,12 @@ void ov65_022354B8 (UnkStruct_ov65_022354D8 * param0) memset(param0, 0, sizeof(UnkStruct_ov65_022354D8)); } -u8 ov65_022354D8 (const UnkStruct_ov65_022354D8 * param0) +u8 ov65_022354D8(const UnkStruct_ov65_022354D8 *param0) { return ov63_0222BF90(param0->unk_00, 4); } -int ov65_022354E8 (const UnkStruct_ov65_022354D8 * param0) +int ov65_022354E8(const UnkStruct_ov65_022354D8 *param0) { int v0; @@ -357,7 +357,7 @@ int ov65_022354E8 (const UnkStruct_ov65_022354D8 * param0) return ov63_0222C0AC(v0); } -void ov65_022354F8 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1, int param2) +void ov65_022354F8(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, int param2) { u32 v0; UnkStruct_ov63_0222CC3C v1; @@ -379,7 +379,7 @@ void ov65_022354F8 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * ov63_0222CFE0(param1->unk_04, v1); } -void ov65_0223556C (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +void ov65_0223556C(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { if (param1 == NULL) { return; @@ -396,7 +396,7 @@ void ov65_0223556C (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * ov63_0222CFA4(param1->unk_04, 1); } -void ov65_0223558C (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1, int param2) +void ov65_0223558C(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, int param2) { BOOL v0; @@ -409,7 +409,7 @@ void ov65_0223558C (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * } } -void ov65_022355B0 (UnkStruct_ov65_02235130 * param0) +void ov65_022355B0(UnkStruct_ov65_02235130 *param0) { s8 v0; @@ -426,17 +426,17 @@ void ov65_022355B0 (UnkStruct_ov65_02235130 * param0) GF_ASSERT(0); } -void ov65_022355EC (UnkStruct_ov65_02235130 * param0) +void ov65_022355EC(UnkStruct_ov65_02235130 *param0) { ov65_02236464(¶m0->unk_734); } -void ov65_022355FC (UnkStruct_ov65_02235130 * param0) +void ov65_022355FC(UnkStruct_ov65_02235130 *param0) { ov65_02236304(param0, ¶m0->unk_734); } -static void ov65_0223560C (UnkStruct_ov65_02235130 * param0) +static void ov65_0223560C(UnkStruct_ov65_02235130 *param0) { int v0; @@ -447,7 +447,7 @@ static void ov65_0223560C (UnkStruct_ov65_02235130 * param0) } } -static BOOL ov65_02235634 (const UnkStruct_ov65_02235130 * param0) +static BOOL ov65_02235634(const UnkStruct_ov65_02235130 *param0) { s32 v0; @@ -460,7 +460,7 @@ static BOOL ov65_02235634 (const UnkStruct_ov65_02235130 * param0) return 0; } -static BOOL ov65_02235654 (const UnkStruct_ov65_02235130 * param0) +static BOOL ov65_02235654(const UnkStruct_ov65_02235130 *param0) { u32 v0; UnkStruct_ov63_0222CC3C v1; @@ -480,7 +480,7 @@ static BOOL ov65_02235654 (const UnkStruct_ov65_02235130 * param0) return 0; } -static void ov65_022356E8 (UnkStruct_ov65_02235130 * param0) +static void ov65_022356E8(UnkStruct_ov65_02235130 *param0) { UnkStruct_ov63_0222D894 v0; UnkStruct_ov63_0222CCB8 v1; @@ -495,7 +495,7 @@ static void ov65_022356E8 (UnkStruct_ov65_02235130 * param0) } } -static void ov65_0223573C (UnkStruct_ov65_02235130 * param0) +static void ov65_0223573C(UnkStruct_ov65_02235130 *param0) { int v0; BOOL v1; @@ -511,7 +511,7 @@ static void ov65_0223573C (UnkStruct_ov65_02235130 * param0) } } -static void ov65_02235778 (UnkStruct_ov65_02235130 * param0) +static void ov65_02235778(UnkStruct_ov65_02235130 *param0) { int v0; @@ -522,9 +522,9 @@ static void ov65_02235778 (UnkStruct_ov65_02235130 * param0) } } -static const UnkStruct_ov65_022354D8 * ov65_022357A8 (const UnkStruct_ov65_02235130 * param0, const UnkStruct_ov65_022354D8 * param1, int param2) +static const UnkStruct_ov65_022354D8 *ov65_022357A8(const UnkStruct_ov65_02235130 *param0, const UnkStruct_ov65_022354D8 *param1, int param2) { - const UnkStruct_ov63_0222BEC0 * v0; + const UnkStruct_ov63_0222BEC0 *v0; int v1; v0 = ov63_0222C1C4(param1->unk_00, param0->unk_74C, param2); @@ -540,7 +540,7 @@ static const UnkStruct_ov65_022354D8 * ov65_022357A8 (const UnkStruct_ov65_02235 return NULL; } -static void ov65_022357E8 (UnkStruct_ov65_02235130 * param0, u32 param1, u32 param2) +static void ov65_022357E8(UnkStruct_ov65_02235130 *param0, u32 param1, u32 param2) { int v0; @@ -549,12 +549,12 @@ static void ov65_022357E8 (UnkStruct_ov65_02235130 * param0, u32 param1, u32 par ov63_0222CE30(param0->unk_750, 2, param2); } -static void ov65_0223581C (UnkStruct_ov65_02235130 * param0) +static void ov65_0223581C(UnkStruct_ov65_02235130 *param0) { ov63_0222CD9C(param0->unk_750); } -static void ov65_0223582C (UnkStruct_ov65_02235130 * param0, u32 param1, NARC * param2, u32 param3) +static void ov65_0223582C(UnkStruct_ov65_02235130 *param0, u32 param1, NARC *param2, u32 param3) { UnkStruct_ov65_0223582C v0 = { 0, @@ -574,12 +574,12 @@ static void ov65_0223582C (UnkStruct_ov65_02235130 * param0, u32 param1, NARC * param0->unk_758 = ov63_0222D1C0(¶m0->unk_14.unk_04, param0->unk_10, &v0, param1); } -static void ov65_0223586C (UnkStruct_ov65_02235130 * param0) +static void ov65_0223586C(UnkStruct_ov65_02235130 *param0) { ov63_0222D214(param0->unk_758); } -static void ov65_0223587C (UnkStruct_ov65_022358CC * param0, u32 param1, NARC * param2) +static void ov65_0223587C(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2) { int v0; @@ -594,7 +594,7 @@ static void ov65_0223587C (UnkStruct_ov65_022358CC * param0, u32 param1, NARC * ov65_02235908(param0, param1); } -static void ov65_022358CC (UnkStruct_ov65_022358CC * param0) +static void ov65_022358CC(UnkStruct_ov65_022358CC *param0) { int v0; @@ -608,44 +608,44 @@ static void ov65_022358CC (UnkStruct_ov65_022358CC * param0) sub_02021964(param0->unk_00); } -static void ov65_022358F8 (UnkStruct_ov65_022358CC * param0, u32 param1, NARC * param2) +static void ov65_022358F8(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2) { ov65_02235960(param0, param1, param2); } -static void ov65_02235900 (UnkStruct_ov65_022358CC * param0) +static void ov65_02235900(UnkStruct_ov65_022358CC *param0) { ov65_02235A60(param0); } -static void ov65_02235908 (UnkStruct_ov65_022358CC * param0, u32 param1) +static void ov65_02235908(UnkStruct_ov65_022358CC *param0, u32 param1) { ov65_02235A94(param0, param1); } -static void ov65_02235910 (UnkStruct_ov65_022358CC * param0) +static void ov65_02235910(UnkStruct_ov65_022358CC *param0) { ov65_02235B14(param0); } -static void ov65_02235918 (BGL * param0, u32 param1) +static void ov65_02235918(BGL *param0, u32 param1) { return; } -static void ov65_0223591C (BGL * param0) +static void ov65_0223591C(BGL *param0) { return; } -static void ov65_02235920 (BGL * param0, u32 param1, NARC * param2) +static void ov65_02235920(BGL *param0, u32 param1, NARC *param2) { sub_02007130(param2, 30, 0, 0, 8 * 32, param1); sub_0201975C(0, 0); sub_020070E8(param2, 29, param0, 0, 0, 0, 0, param1); } -static void ov65_02235960 (UnkStruct_ov65_022358CC * param0, u32 param1, NARC * param2) +static void ov65_02235960(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2) { BOOL v0; @@ -665,7 +665,7 @@ static void ov65_02235960 (UnkStruct_ov65_022358CC * param0, u32 param1, NARC * sub_020093B4(¶m0->unk_1A0.unk_10, 50, 50, 50, 50, 0xffffffff, 0xffffffff, 0, 2, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL); } -static void ov65_02235A60 (UnkStruct_ov65_022358CC * param0) +static void ov65_02235A60(UnkStruct_ov65_022358CC *param0) { int v0; @@ -677,7 +677,7 @@ static void ov65_02235A60 (UnkStruct_ov65_022358CC * param0) } } -static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1) +static void ov65_02235A94(UnkStruct_ov65_022358CC *param0, u32 param1) { UnkStruct_ov115_02261520 v0; @@ -700,13 +700,13 @@ static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1) SpriteActor_SetSpriteAnimActive(param0->unk_1A0.unk_38, 1); } -static void ov65_02235B14 (UnkStruct_ov65_022358CC * param0) +static void ov65_02235B14(UnkStruct_ov65_022358CC *param0) { sub_02021BD4(param0->unk_1A0.unk_34); sub_02021BD4(param0->unk_1A0.unk_38); } -static void ov65_02235B30 (UnkStruct_ov65_02235130 * param0) +static void ov65_02235B30(UnkStruct_ov65_02235130 *param0) { UnkStruct_ov65_02235C64 v0; VecFx32 v1; @@ -723,12 +723,12 @@ static void ov65_02235B30 (UnkStruct_ov65_02235130 * param0) sub_02021CAC(param0->unk_14.unk_1A0.unk_34, 1); } -static void ov65_02235B78 (UnkStruct_ov65_02235130 * param0) +static void ov65_02235B78(UnkStruct_ov65_02235130 *param0) { sub_02021CAC(param0->unk_14.unk_1A0.unk_34, 0); } -static void ov65_02235B88 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov63_0222CC3C param1, u32 param2) +static void ov65_02235B88(UnkStruct_ov65_02235130 *param0, UnkStruct_ov63_0222CC3C param1, u32 param2) { VecFx32 v0; @@ -743,12 +743,12 @@ static void ov65_02235B88 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov63_0222 sub_02021CAC(param0->unk_14.unk_1A0.unk_38, 1); } -static void ov65_02235BD8 (UnkStruct_ov65_02235130 * param0) +static void ov65_02235BD8(UnkStruct_ov65_02235130 *param0) { sub_02021CAC(param0->unk_14.unk_1A0.unk_38, 0); } -static BOOL ov65_02235BE8 (UnkStruct_ov65_02235130 * param0) +static BOOL ov65_02235BE8(UnkStruct_ov65_02235130 *param0) { UnkStruct_ov63_0222CC3C v0; u32 v1; @@ -769,7 +769,7 @@ static BOOL ov65_02235BE8 (UnkStruct_ov65_02235130 * param0) return 0; } -static void ov65_02235C64 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_02235C64 * param1, u32 param2) +static void ov65_02235C64(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_02235C64 *param1, u32 param2) { u32 v0; u32 v1; @@ -802,7 +802,7 @@ static void ov65_02235C64 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 GF_ASSERT(0); } -static void ov65_02235D08 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_02235C64 * param1) +static void ov65_02235D08(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_02235C64 *param1) { int v0, v1; u32 v2, v3; @@ -827,7 +827,7 @@ static void ov65_02235D08 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 GF_ASSERT(0); } -static UnkStruct_ov65_022354D8 * ov65_02235D7C (UnkStruct_ov65_02235130 * param0) +static UnkStruct_ov65_022354D8 *ov65_02235D7C(UnkStruct_ov65_02235130 *param0) { int v0; @@ -841,7 +841,7 @@ static UnkStruct_ov65_022354D8 * ov65_02235D7C (UnkStruct_ov65_02235130 * param0 return NULL; } -static void ov65_02235DAC (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1, BOOL param2) +static void ov65_02235DAC(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, BOOL param2) { param1->unk_04 = ov63_0222CE44(param0->unk_750, param1->unk_00, param2, param0->unk_04); @@ -852,7 +852,7 @@ static void ov65_02235DAC (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 } } -static void ov65_02235DE4 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1, const UnkStruct_ov65_02235C64 * param2, u32 param3, u16 param4, u8 param5, int param6) +static void ov65_02235DE4(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, const UnkStruct_ov65_02235C64 *param2, u32 param3, u16 param4, u8 param5, int param6) { UnkStruct_ov65_022376D0 v0; @@ -866,7 +866,7 @@ static void ov65_02235DE4 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 param1->unk_00 = ov63_0222BEC0(param0->unk_74C, &v0); } -static BOOL ov65_02235E1C (const UnkStruct_ov65_022354D8 * param0) +static BOOL ov65_02235E1C(const UnkStruct_ov65_022354D8 *param0) { switch (param0->unk_0C) { case 0: @@ -884,7 +884,7 @@ static BOOL ov65_02235E1C (const UnkStruct_ov65_022354D8 * param0) return 0; } -static void ov65_02235E48 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static void ov65_02235E48(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { param1->unk_10 = ov65_02236044; param1->unk_18 = ov65_02235EF4; @@ -893,7 +893,7 @@ static void ov65_02235E48 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 ov65_02236250(param0, 0, param1); } -static void ov65_02235E68 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static void ov65_02235E68(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { param1->unk_10 = ov65_02236158; param1->unk_18 = ov65_02235EF8; @@ -901,7 +901,7 @@ static void ov65_02235E68 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 param1->unk_0C = 1; } -static void ov65_02235E84 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static void ov65_02235E84(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { param1->unk_10 = ov65_022361C8; param1->unk_18 = ov65_02235EF4; @@ -912,7 +912,7 @@ static void ov65_02235E84 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 ov63_0222CFA4(param1->unk_04, 1); } -static void ov65_02235EC8 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static void ov65_02235EC8(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { param1->unk_10 = ov65_02236214; param1->unk_18 = ov65_02235F94; @@ -923,12 +923,12 @@ static void ov65_02235EC8 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 ov63_0222CFA4(param1->unk_04, 0); } -static void ov65_02235EF4 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static void ov65_02235EF4(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { return; } -static void ov65_02235EF8 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static void ov65_02235EF8(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { UnkStruct_ov63_0222CC3C v0, v1; @@ -948,7 +948,7 @@ static void ov65_02235EF8 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 ov63_0222D060(param1->unk_04, v1); } -static void ov65_02235F94 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static void ov65_02235F94(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { u32 v0; UnkStruct_ov63_0222CC3C v1, v2; @@ -971,13 +971,13 @@ static void ov65_02235F94 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 ov63_0222D020(param1->unk_04, 1); } -static BOOL ov65_02236044 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static BOOL ov65_02236044(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { s32 v0; s32 v1; s32 v2; s32 v3; - const UnkStruct_ov65_022354D8 * v4; + const UnkStruct_ov65_022354D8 *v4; v0 = ov63_0222BF90(param1->unk_00, 6); v1 = ov63_0222BF90(param1->unk_00, 4); @@ -1040,7 +1040,7 @@ static BOOL ov65_02236044 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 return 0; } -static BOOL ov65_02236158 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static BOOL ov65_02236158(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { s32 v0; u32 v1, v2; @@ -1064,7 +1064,7 @@ static BOOL ov65_02236158 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 return 0; } -static BOOL ov65_022361B0 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static BOOL ov65_022361B0(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { param1->unk_08++; @@ -1075,7 +1075,7 @@ static BOOL ov65_022361B0 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 return 0; } -static BOOL ov65_022361C8 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static BOOL ov65_022361C8(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { u32 v0; u32 v1; @@ -1094,7 +1094,7 @@ static BOOL ov65_022361C8 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 return 0; } -static BOOL ov65_02236214 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static BOOL ov65_02236214(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { param1->unk_08--; @@ -1105,12 +1105,12 @@ static BOOL ov65_02236214 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 return 0; } -static BOOL ov65_0223622C (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1) +static BOOL ov65_0223622C(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1) { return 0; } -static void ov65_02236230 (UnkStruct_ov65_02235130 * param0, s32 param1, s32 param2, s32 param3) +static void ov65_02236230(UnkStruct_ov65_02235130 *param0, s32 param1, s32 param2, s32 param3) { UnkStruct_ov63_0222D894 v0; @@ -1121,7 +1121,7 @@ static void ov65_02236230 (UnkStruct_ov65_02235130 * param0, s32 param1, s32 par ov63_0222D894(param0->unk_75C, &v0); } -static void ov65_02236250 (UnkStruct_ov65_02235130 * param0, s32 param1, const UnkStruct_ov65_022354D8 * param2) +static void ov65_02236250(UnkStruct_ov65_02235130 *param0, s32 param1, const UnkStruct_ov65_022354D8 *param2) { s32 v0; s32 v1; @@ -1132,7 +1132,7 @@ static void ov65_02236250 (UnkStruct_ov65_02235130 * param0, s32 param1, const U ov65_02236230(param0, param1, v0, v1); } -static BOOL ov65_02236278 (const UnkStruct_ov65_022354D8 * param0) +static BOOL ov65_02236278(const UnkStruct_ov65_022354D8 *param0) { if ((u32)param0->unk_18 == (u32)ov65_02235EF8) { return 0; @@ -1141,7 +1141,7 @@ static BOOL ov65_02236278 (const UnkStruct_ov65_022354D8 * param0) return 1; } -static void ov65_0223628C (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_022354D8 * param1, int param2) +static void ov65_0223628C(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_022354D8 *param1, int param2) { switch (param2) { case 0: @@ -1158,7 +1158,7 @@ static void ov65_0223628C (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 param1->unk_0B = param2; } -static void ov65_022362B0 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_02236318 * param1, NARC * param2) +static void ov65_022362B0(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_02236318 *param1, NARC *param2) { memset(param1, 0, sizeof(UnkStruct_ov65_02236318)); @@ -1168,19 +1168,19 @@ static void ov65_022362B0 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_0223 param1->unk_0A = Unk_ov65_02238BC8[param1->unk_09]; } -static void ov65_022362EC (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_02236318 * param1) +static void ov65_022362EC(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_02236318 *param1) { Heap_FreeToHeap(param1->unk_00); memset(param1, 0, sizeof(UnkStruct_ov65_02236318)); } -static void ov65_02236304 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov65_02236318 * param1) +static void ov65_02236304(UnkStruct_ov65_02235130 *param0, UnkStruct_ov65_02236318 *param1) { ov65_02236318(param1); ov65_02236384(param1); } -static void ov65_02236318 (UnkStruct_ov65_02236318 * param0) +static void ov65_02236318(UnkStruct_ov65_02236318 *param0) { int v0; u32 v1; @@ -1205,7 +1205,7 @@ static void ov65_02236318 (UnkStruct_ov65_02236318 * param0) } } -static void ov65_02236384 (UnkStruct_ov65_02236318 * param0) +static void ov65_02236384(UnkStruct_ov65_02236318 *param0) { BOOL v0 = 0; u32 v1 = 0; @@ -1243,15 +1243,15 @@ static void ov65_02236384 (UnkStruct_ov65_02236318 * param0) } } -static void * ov65_02236410 (UnkStruct_ov65_02236318 * param0, u32 param1) +static void *ov65_02236410(UnkStruct_ov65_02236318 *param0, u32 param1) { - u16 * v0; + u16 *v0; v0 = (u16 *)param0->unk_04->pRawData; return &v0[param1 + 1]; } -static void ov65_0223641C (UnkStruct_ov65_02236318 * param0) +static void ov65_0223641C(UnkStruct_ov65_02236318 *param0) { param0->unk_08 |= 1 << param0->unk_0C; param0->unk_0C = 0; @@ -1260,12 +1260,12 @@ static void ov65_0223641C (UnkStruct_ov65_02236318 * param0) param0->unk_10 = 0; } -static void ov65_02236438 (UnkStruct_ov65_02236318 * param0) +static void ov65_02236438(UnkStruct_ov65_02236318 *param0) { param0->unk_10 = 1; } -static void ov65_02236440 (UnkStruct_ov65_02236318 * param0, u8 param1) +static void ov65_02236440(UnkStruct_ov65_02236318 *param0, u8 param1) { if (param0->unk_0D != 0) { ov65_0223641C(param0); @@ -1277,7 +1277,7 @@ static void ov65_02236440 (UnkStruct_ov65_02236318 * param0, u8 param1) ov65_02236438(param0); } -static void ov65_02236464 (UnkStruct_ov65_02236318 * param0) +static void ov65_02236464(UnkStruct_ov65_02236318 *param0) { if (param0->unk_0D != 0) { ov65_02236438(param0); diff --git a/src/overlay065/ov65_02236474.c b/src/overlay065/ov65_02236474.c index c215d1c45b..f34728209b 100644 --- a/src/overlay065/ov65_02236474.c +++ b/src/overlay065/ov65_02236474.c @@ -1,10 +1,10 @@ +#include "overlay065/ov65_02236474.h" + #include #include -#include "overlay063/union_ov63_0222BDAC.h" #include "overlay063/struct_ov63_0222CC3C.h" - -#include "overlay065/ov65_02236474.h" +#include "overlay063/union_ov63_0222BDAC.h" static const UnkUnion_ov63_0222BDAC Unk_ov65_02238C08[176] = { 0x3, @@ -920,21 +920,21 @@ static const UnkUnion_ov63_0222BDAC Unk_ov65_02239550[308] = { 0x3 }; -UnkStruct_ov63_0222CC3C ov65_02236474 (u32 param0) +UnkStruct_ov63_0222CC3C ov65_02236474(u32 param0) { static const UnkStruct_ov63_0222CC3C v0[4] = { - {16, 11}, - {16, 11}, - {22, 11}, - {28, 11} + { 16, 11 }, + { 16, 11 }, + { 22, 11 }, + { 28, 11 } }; return v0[param0]; } -const UnkUnion_ov63_0222BDAC * ov65_02236480 (u32 param0) +const UnkUnion_ov63_0222BDAC *ov65_02236480(u32 param0) { - static const UnkUnion_ov63_0222BDAC * v0[4] = { + static const UnkUnion_ov63_0222BDAC *v0[4] = { Unk_ov65_02238C08, Unk_ov65_02238EC8, Unk_ov65_02239188, diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 519485920e..90215872cf 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -1,83 +1,78 @@ -#include "enums.h" +#include "overlay065/ov65_0223648C.h" #include #include -#include "core_sys.h" - #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "journal.h" -#include "overlay063/struct_ov63_0222BE18_decl.h" -#include "overlay063/struct_ov63_0222BEC0_decl.h" -#include "overlay065/struct_ov65_02236744_decl.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207DE04.h" #include "struct_defs/struct_0207DFAC.h" #include "struct_defs/struct_0207E060.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay004/ov4_021D0D80.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay061/struct_ov61_0222C884.h" +#include "overlay063/ov63_0222BE18.h" +#include "overlay063/ov63_0222CCE4.h" +#include "overlay063/struct_ov63_0222BE18_decl.h" +#include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CD2C.h" #include "overlay063/struct_ov63_0222CE44.h" #include "overlay065/struct_ov65_022366E4.h" +#include "overlay065/struct_ov65_02236744_decl.h" #include "overlay065/struct_ov65_02236760.h" #include "overlay065/struct_ov65_022376D0.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "enums.h" +#include "game_options.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "journal.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "game_overlay.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "game_options.h" -#include "journal.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" #include "unk_0209C390.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay063/ov63_0222CCE4.h" -#include "overlay065/ov65_0223648C.h" FS_EXTERN_OVERLAY(overlay63); typedef struct { - UnkStruct_0207DFAC * unk_00; + UnkStruct_0207DFAC *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; @@ -102,38 +97,38 @@ typedef struct { } UnkStruct_ov65_02236794; typedef struct { - UnkStruct_ov63_0222BEC0 * unk_00; - UnkStruct_ov63_0222CE44 * unk_04; + UnkStruct_ov63_0222BEC0 *unk_00; + UnkStruct_ov63_0222CE44 *unk_04; u16 unk_08; s16 unk_0A; } UnkStruct_ov65_02237908; typedef struct { - BGL * unk_00; - StringTemplate * unk_04; - MessageLoader * unk_08; - Strbuf* unk_0C; - Strbuf* unk_10; + BGL *unk_00; + StringTemplate *unk_04; + MessageLoader *unk_08; + Strbuf *unk_0C; + Strbuf *unk_10; u8 unk_14; u8 unk_15; u16 unk_16; - GraphicElementManager * unk_18; + GraphicElementManager *unk_18; UnkStruct_0200C738 unk_1C; - UnkStruct_02009714 * unk_1A8[4]; - UnkStruct_ov63_0222BE18 * unk_1B8; - UnkStruct_ov63_0222CD2C * unk_1BC; + UnkStruct_02009714 *unk_1A8[4]; + UnkStruct_ov63_0222BE18 *unk_1B8; + UnkStruct_ov63_0222CD2C *unk_1BC; UnkStruct_ov65_02237908 unk_1C0[4]; Window unk_1F0; Window unk_200; Window unk_210; Window unk_220; Window unk_230; - UIControlData * unk_240; - void * unk_244; - NNSG2dScreenData * unk_248; - void * unk_24C; - void * unk_250; - NNSG2dPaletteData * unk_254; + UIControlData *unk_240; + void *unk_244; + NNSG2dScreenData *unk_248; + void *unk_24C; + void *unk_250; + NNSG2dPaletteData *unk_254; s16 unk_258; s16 unk_25A; } UnkStruct_ov65_02236840; @@ -143,134 +138,134 @@ typedef struct UnkStruct_ov65_02236744_t { UnkStruct_ov65_02236840 unk_30; } UnkStruct_ov65_022367A8; -static void ov65_02236780(void * param0); -static BOOL ov65_02236794(const UnkStruct_ov65_02236794 * param0); -static void ov65_022367A8(UnkStruct_ov65_022367A8 * param0, const UnkStruct_0207DE04 * param1, u32 param2); -static void ov65_022367F8(UnkStruct_ov65_022367A8 * param0, u32 param1); +static void ov65_02236780(void *param0); +static BOOL ov65_02236794(const UnkStruct_ov65_02236794 *param0); +static void ov65_022367A8(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2); +static void ov65_022367F8(UnkStruct_ov65_022367A8 *param0, u32 param1); static void ov65_02236820(void); -static void ov65_02236840(UnkStruct_ov65_02236840 * param0, u32 param1); -static void ov65_022369F0(UnkStruct_ov65_02236840 * param0); -static void ov65_02236A28(UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2); -static void ov65_02236B90(UnkStruct_ov65_02236840 * param0, u32 param1); -static void ov65_02236C10(UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2); -static void ov65_02236C5C(UnkStruct_ov65_02236840 * param0); -static void ov65_02236C7C(UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2); -static void ov65_02236D50(UnkStruct_ov65_02236840 * param0, u32 param1); -static void ov65_02236E04(UnkStruct_ov65_02236840 * param0); -static void ov65_02236E44(UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2, u32 param3); -static void ov65_02236E50(UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2, u8 param3, u32 param4); -static BOOL ov65_02236EF8(UnkStruct_ov65_02236840 * param0); -static void ov65_02236F38(UnkStruct_ov65_02236840 * param0); -static void ov65_02236F70(UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, int param2, u32 param3); -static void ov65_02237018(UnkStruct_ov65_02236840 * param0); -static void ov65_02237034(UnkStruct_ov65_022367A8 * param0, const UnkStruct_0207DE04 * param1, u32 param2); -static void ov65_0223709C(UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02236840 * param1, const UnkStruct_0207DE04 * param2, int param3, u32 param4); -static void ov65_022371FC(UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, int param2, u32 param3); -static void ov65_0223726C(UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, int param2, int param3, u32 param4); -static void ov65_02237284(UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, int param2, int param3, u32 param4); -static void ov65_022372B0(UnkStruct_ov65_02236840 * param0); -static void ov65_022372EC(UnkStruct_ov65_02236840 * param0, u32 param1); -static BOOL ov65_0223731C(UnkStruct_ov65_022367A8 * param0, u32 param1); -static void ov65_02237370(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static void ov65_0223742C(UnkStruct_ov65_022367A8 * param0); -static BOOL ov65_02237450(const UnkStruct_ov65_022367A8 * param0); +static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1); +static void ov65_022369F0(UnkStruct_ov65_02236840 *param0); +static void ov65_02236A28(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2); +static void ov65_02236B90(UnkStruct_ov65_02236840 *param0, u32 param1); +static void ov65_02236C10(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2); +static void ov65_02236C5C(UnkStruct_ov65_02236840 *param0); +static void ov65_02236C7C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2); +static void ov65_02236D50(UnkStruct_ov65_02236840 *param0, u32 param1); +static void ov65_02236E04(UnkStruct_ov65_02236840 *param0); +static void ov65_02236E44(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u32 param3); +static void ov65_02236E50(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u8 param3, u32 param4); +static BOOL ov65_02236EF8(UnkStruct_ov65_02236840 *param0); +static void ov65_02236F38(UnkStruct_ov65_02236840 *param0); +static void ov65_02236F70(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 param3); +static void ov65_02237018(UnkStruct_ov65_02236840 *param0); +static void ov65_02237034(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2); +static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02236840 *param1, const UnkStruct_0207DE04 *param2, int param3, u32 param4); +static void ov65_022371FC(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 param3); +static void ov65_0223726C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 param4); +static void ov65_02237284(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 param4); +static void ov65_022372B0(UnkStruct_ov65_02236840 *param0); +static void ov65_022372EC(UnkStruct_ov65_02236840 *param0, u32 param1); +static BOOL ov65_0223731C(UnkStruct_ov65_022367A8 *param0, u32 param1); +static void ov65_02237370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static void ov65_0223742C(UnkStruct_ov65_022367A8 *param0); +static BOOL ov65_02237450(const UnkStruct_ov65_022367A8 *param0); static BOOL ov65_02237464(u32 param0, u32 param1); -static void ov65_02237498(UnkStruct_ov65_022367A8 * param0, const UnkStruct_0207DE04 * param1); -static BOOL ov65_022374DC(UnkStruct_ov65_022367A8 * param0); -static BOOL ov65_02237504(UnkStruct_ov65_022367A8 * param0); -static void ov65_02237520(UnkStruct_ov65_022367A8 * param0); -static void ov65_02237534(UnkStruct_ov65_022367A8 * param0); -static int ov65_02237548(UnkStruct_ov65_022367A8 * param0); -static BOOL ov65_02237550(UnkStruct_ov65_022367A8 * param0, u32 param1); -static void ov65_0223758C(UnkStruct_ov65_022367A8 * param0); -static void ov65_022375CC(UnkStruct_ov65_022367A8 * param0); -static void ov65_0223760C(UnkStruct_ov65_022367A8 * param0); -static void ov65_0223761C(UnkStruct_ov65_022367A8 * param0); -static BOOL ov65_02237628(UnkStruct_ov65_022367A8 * param0); -static void ov65_02237654(u16 param0, void * param1); -static BOOL ov65_02237660(UnkStruct_ov65_022367A8 * param0); -static void ov65_02237698(UnkStruct_ov65_022367A8 * param0); -static void ov65_022376A0(UnkStruct_ov65_022367A8 * param0, u32 param1, u32 param2); -static void ov65_022376D0(UnkStruct_ov65_022367A8 * param0, u32 param1, u32 param2); -static void ov65_022377A4(UnkStruct_ov65_022367A8 * param0); -static void ov65_022377E8(UnkStruct_ov65_022367A8 * param0); -static void ov65_02237808(UnkStruct_ov65_022367A8 * param0, u32 param1); -static void ov65_0223782C(UnkStruct_ov65_022367A8 * param0); -static void ov65_02237860(UnkStruct_ov65_022367A8 * param0, u32 param1); -static void ov65_0223789C(UnkStruct_ov65_022367A8 * param0); -static void ov65_022378C4(UnkStruct_ov65_022367A8 * param0, const UnkStruct_0207DE04 * param1, u32 param2); -static void ov65_02237908(UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02237908 * param1); -static void ov65_0223790C(UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02237908 * param1); -static void ov65_02237940(UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02237908 * param1); -static void ov65_0223796C(UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02237908 * param1); -static void ov65_02237970(UnkStruct_ov65_022367A8 * param0); -static BOOL ov65_02237A10(UnkStruct_ov65_022367A8 * param0); -static void ov65_02237A24(UnkStruct_0207DE04 * param0, u32 param1); -static void ov65_02237A44(UnkStruct_ov65_022367A8 * param0); -static BOOL ov65_02237A54(UnkStruct_ov65_022367A8 * param0); -static BOOL ov65_02237A70(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237AA8(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237B9C(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237BC4(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237C98(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237CB0(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237CCC(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237CE4(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237D18(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237D60(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237D98(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237DD0(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237DF8(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237E24(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237E54(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237EA4(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237EC0(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237EF0(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237F08(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237F48(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237FA0(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237FB8(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02237FF8(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238050(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_0223806C(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022380AC(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022380E8(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238104(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238134(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_0223815C(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238190(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022381CC(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022381E4(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238210(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238250(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022382B0(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022382F0(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238314(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238350(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238370(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022383AC(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_0223846C(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022384BC(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_0223850C(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238528(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238558(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238594(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022385AC(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022385D4(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238608(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238660(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022386D0(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238728(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_0223875C(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_0223878C(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022387AC(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022387E8(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238838(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); -static BOOL ov65_02238910(UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2); +static void ov65_02237498(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1); +static BOOL ov65_022374DC(UnkStruct_ov65_022367A8 *param0); +static BOOL ov65_02237504(UnkStruct_ov65_022367A8 *param0); +static void ov65_02237520(UnkStruct_ov65_022367A8 *param0); +static void ov65_02237534(UnkStruct_ov65_022367A8 *param0); +static int ov65_02237548(UnkStruct_ov65_022367A8 *param0); +static BOOL ov65_02237550(UnkStruct_ov65_022367A8 *param0, u32 param1); +static void ov65_0223758C(UnkStruct_ov65_022367A8 *param0); +static void ov65_022375CC(UnkStruct_ov65_022367A8 *param0); +static void ov65_0223760C(UnkStruct_ov65_022367A8 *param0); +static void ov65_0223761C(UnkStruct_ov65_022367A8 *param0); +static BOOL ov65_02237628(UnkStruct_ov65_022367A8 *param0); +static void ov65_02237654(u16 param0, void *param1); +static BOOL ov65_02237660(UnkStruct_ov65_022367A8 *param0); +static void ov65_02237698(UnkStruct_ov65_022367A8 *param0); +static void ov65_022376A0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 param2); +static void ov65_022376D0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 param2); +static void ov65_022377A4(UnkStruct_ov65_022367A8 *param0); +static void ov65_022377E8(UnkStruct_ov65_022367A8 *param0); +static void ov65_02237808(UnkStruct_ov65_022367A8 *param0, u32 param1); +static void ov65_0223782C(UnkStruct_ov65_022367A8 *param0); +static void ov65_02237860(UnkStruct_ov65_022367A8 *param0, u32 param1); +static void ov65_0223789C(UnkStruct_ov65_022367A8 *param0); +static void ov65_022378C4(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2); +static void ov65_02237908(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1); +static void ov65_0223790C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1); +static void ov65_02237940(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1); +static void ov65_0223796C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1); +static void ov65_02237970(UnkStruct_ov65_022367A8 *param0); +static BOOL ov65_02237A10(UnkStruct_ov65_022367A8 *param0); +static void ov65_02237A24(UnkStruct_0207DE04 *param0, u32 param1); +static void ov65_02237A44(UnkStruct_ov65_022367A8 *param0); +static BOOL ov65_02237A54(UnkStruct_ov65_022367A8 *param0); +static BOOL ov65_02237A70(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237AA8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237B9C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237BC4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237C98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237CB0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237CCC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237CE4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237D18(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237D60(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237D98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237DD0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237DF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237E24(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237E54(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237EA4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237EC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237EF0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237F08(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237F48(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237FA0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237FB8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02237FF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238050(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_0223806C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022380AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022380E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238104(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238134(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_0223815C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238190(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022381CC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022381E4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238210(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238250(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022382B0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022382F0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238314(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238350(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022383AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_0223846C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022384BC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_0223850C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238528(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238558(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238594(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022385AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022385D4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238608(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238660(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022386D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238728(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_0223875C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_0223878C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022387AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022387E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); +static BOOL ov65_02238910(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2); static const u8 Unk_ov65_02239A20[4] = { 0x8, @@ -318,13 +313,13 @@ static u8 Unk_ov65_02239E5C[4] = { }; static const UnkStruct_ov65_022376D0 Unk_ov65_02239AD8[4] = { - {0xD0, 0x30, 0x0, 0x0, 0x1, 0x0}, - {0xE8, 0x48, 0x1, 0x0, 0x2, 0x0}, - {0xD0, 0x60, 0x2, 0x0, 0x0, 0x0}, - {0xB8, 0x48, 0x3, 0x0, 0x3, 0x0} + { 0xD0, 0x30, 0x0, 0x0, 0x1, 0x0 }, + { 0xE8, 0x48, 0x1, 0x0, 0x2, 0x0 }, + { 0xD0, 0x60, 0x2, 0x0, 0x0, 0x0 }, + { 0xB8, 0x48, 0x3, 0x0, 0x3, 0x0 } }; -static BOOL(*const Unk_ov65_02239B80[33])(UnkStruct_ov65_022367A8 *, UnkStruct_0207DE04 *, u32) = { +static BOOL (*const Unk_ov65_02239B80[33])(UnkStruct_ov65_022367A8 *, UnkStruct_0207DE04 *, u32) = { ov65_02237A70, ov65_02237AA8, ov65_02237AC0, @@ -360,7 +355,7 @@ static BOOL(*const Unk_ov65_02239B80[33])(UnkStruct_ov65_022367A8 *, UnkStruct_0 ov65_02238190 }; -static BOOL(*const Unk_ov65_02239B08[30])(UnkStruct_ov65_022367A8 *, UnkStruct_0207DE04 *, u32) = { +static BOOL (*const Unk_ov65_02239B08[30])(UnkStruct_ov65_022367A8 *, UnkStruct_0207DE04 *, u32) = { ov65_022381CC, ov65_022381E4, ov65_02238210, @@ -393,17 +388,17 @@ static BOOL(*const Unk_ov65_02239B08[30])(UnkStruct_ov65_022367A8 *, UnkStruct_0 ov65_02238910 }; -static void(*const Unk_ov65_02239A2C[4])(UnkStruct_ov65_022367A8 *, UnkStruct_ov65_02237908 *) = { +static void (*const Unk_ov65_02239A2C[4])(UnkStruct_ov65_022367A8 *, UnkStruct_ov65_02237908 *) = { ov65_02237908, ov65_0223790C, ov65_02237940, ov65_0223796C, }; -int ov65_0223648C (OverlayManager * param0, int * param1) +int ov65_0223648C(OverlayManager *param0, int *param1) { - UnkStruct_ov65_022367A8 * v0; - UnkStruct_0207DE04 * v1 = OverlayManager_Args(param0); + UnkStruct_ov65_022367A8 *v0; + UnkStruct_0207DE04 *v1 = OverlayManager_Args(param0); BOOL v2; Overlay_LoadByID(FS_OVERLAY_ID(overlay63), 2); @@ -440,10 +435,10 @@ int ov65_0223648C (OverlayManager * param0, int * param1) return 1; } -int ov65_02236548 (OverlayManager * param0, int * param1) +int ov65_02236548(OverlayManager *param0, int *param1) { - UnkStruct_ov65_022367A8 * v0 = OverlayManager_Data(param0); - UnkStruct_0207DE04 * v1 = OverlayManager_Args(param0); + UnkStruct_ov65_022367A8 *v0 = OverlayManager_Data(param0); + UnkStruct_0207DE04 *v1 = OverlayManager_Args(param0); BOOL v2; switch (*param1) { @@ -507,10 +502,10 @@ int ov65_02236548 (OverlayManager * param0, int * param1) return 0; } -int ov65_0223668C (OverlayManager * param0, int * param1) +int ov65_0223668C(OverlayManager *param0, int *param1) { - UnkStruct_ov65_022367A8 * v0 = OverlayManager_Data(param0); - UnkStruct_0207DE04 * v1 = OverlayManager_Args(param0); + UnkStruct_ov65_022367A8 *v0 = OverlayManager_Data(param0); + UnkStruct_0207DE04 *v1 = OverlayManager_Args(param0); SetMainCallback(NULL, NULL); @@ -528,7 +523,7 @@ int ov65_0223668C (OverlayManager * param0, int * param1) return 1; } -void ov65_022366E4 (UnkStruct_ov65_02236744 * param0, const UnkStruct_ov65_022366E4 * param1) +void ov65_022366E4(UnkStruct_ov65_02236744 *param0, const UnkStruct_ov65_022366E4 *param1) { if (param0->unk_00.unk_04 == 0) { if (param1->unk_00 == CommSys_CurNetId()) { @@ -560,7 +555,7 @@ void ov65_022366E4 (UnkStruct_ov65_02236744 * param0, const UnkStruct_ov65_02236 } } -void ov65_02236744 (UnkStruct_ov65_02236744 * param0) +void ov65_02236744(UnkStruct_ov65_02236744 *param0) { if (param0->unk_00.unk_2C == 0) { param0->unk_00.unk_2C = 1; @@ -569,32 +564,32 @@ void ov65_02236744 (UnkStruct_ov65_02236744 * param0) } } -void ov65_02236760 (UnkStruct_ov65_02236744 * param0, const UnkStruct_ov65_02236760 * param1) +void ov65_02236760(UnkStruct_ov65_02236744 *param0, const UnkStruct_ov65_02236760 *param1) { if (param0->unk_00.unk_04 != 1) { memcpy(param0->unk_00.unk_20, param1->unk_00, sizeof(u8) * 4); } } -static void ov65_02236780 (void * param0) +static void ov65_02236780(void *param0) { - UnkStruct_ov65_022367A8 * v0 = param0; + UnkStruct_ov65_022367A8 *v0 = param0; sub_0201C2B8(v0->unk_30.unk_00); sub_0201DCAC(); sub_0200A858(); } -static BOOL ov65_02236794 (const UnkStruct_ov65_02236794 * param0) +static BOOL ov65_02236794(const UnkStruct_ov65_02236794 *param0) { - if ((CommSys_CurNetId() == 0)) { + if (CommSys_CurNetId() == 0) { return 1; } return 0; } -static void ov65_022367A8 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_0207DE04 * param1, u32 param2) +static void ov65_022367A8(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236820(); ov65_02236840(¶m0->unk_30, param2); @@ -605,7 +600,7 @@ static void ov65_022367A8 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_020 ov65_02236D50(¶m0->unk_30, param2); } -static void ov65_022367F8 (UnkStruct_ov65_022367A8 * param0, u32 param1) +static void ov65_022367F8(UnkStruct_ov65_022367A8 *param0, u32 param1) { ov65_02236E04(¶m0->unk_30); ov65_02236C5C(¶m0->unk_30); @@ -613,7 +608,7 @@ static void ov65_022367F8 (UnkStruct_ov65_022367A8 * param0, u32 param1) ov65_022369F0(¶m0->unk_30); } -static void ov65_02236820 (void) +static void ov65_02236820(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -631,9 +626,9 @@ static void ov65_02236820 (void) GXLayers_SetBanks(&v0); } -static void ov65_02236840 (UnkStruct_ov65_02236840 * param0, u32 param1) +static void ov65_02236840(UnkStruct_ov65_02236840 *param0, u32 param1) { - NARC * v0; + NARC *v0; param0->unk_00 = sub_02018340(param1); @@ -743,7 +738,7 @@ static void ov65_02236840 (UnkStruct_ov65_02236840 * param0, u32 param1) NARC_dtor(v0); } -static void ov65_022369F0 (UnkStruct_ov65_02236840 * param0) +static void ov65_022369F0(UnkStruct_ov65_02236840 *param0) { Heap_FreeToHeap(param0->unk_244); Heap_FreeToHeap(param0->unk_250); @@ -753,7 +748,7 @@ static void ov65_022369F0 (UnkStruct_ov65_02236840 * param0) Heap_FreeToHeap(param0->unk_00); } -static void ov65_02236A28 (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2) +static void ov65_02236A28(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2) { int v0; @@ -779,7 +774,7 @@ static void ov65_02236A28 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 BGL_FillWindow(¶m0->unk_230, 15); } -static void ov65_02236B90 (UnkStruct_ov65_02236840 * param0, u32 param1) +static void ov65_02236B90(UnkStruct_ov65_02236840 *param0, u32 param1) { ov65_02236F38(param0); @@ -798,7 +793,7 @@ static void ov65_02236B90 (UnkStruct_ov65_02236840 * param0, u32 param1) } } -static void ov65_02236C10 (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2) +static void ov65_02236C10(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2) { param0->unk_04 = StringTemplate_Default(param2); param0->unk_08 = MessageLoader_Init(0, 26, 674, param2); @@ -808,7 +803,7 @@ static void ov65_02236C10 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 param0->unk_16 = Options_TextFrameDelay(SaveData_Options(param1->unk_08)); } -static void ov65_02236C5C (UnkStruct_ov65_02236840 * param0) +static void ov65_02236C5C(UnkStruct_ov65_02236840 *param0) { Strbuf_Free(param0->unk_10); Strbuf_Free(param0->unk_0C); @@ -816,7 +811,7 @@ static void ov65_02236C5C (UnkStruct_ov65_02236840 * param0) StringTemplate_Free(param0->unk_04); } -static void ov65_02236C7C (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2) +static void ov65_02236C7C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2) { switch (param1->unk_00) { case 0: @@ -843,7 +838,7 @@ static void ov65_02236C7C (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 sub_0201A9A4(¶m0->unk_1F0); } -static void ov65_02236D50 (UnkStruct_ov65_02236840 * param0, u32 param1) +static void ov65_02236D50(UnkStruct_ov65_02236840 *param0, u32 param1) { int v0; @@ -875,7 +870,7 @@ static void ov65_02236D50 (UnkStruct_ov65_02236840 * param0, u32 param1) param0->unk_1BC = ov63_0222CCE4(param0->unk_18, NULL, 4, NNS_G2D_VRAM_TYPE_2DMAIN, param1); } -static void ov65_02236E04 (UnkStruct_ov65_02236840 * param0) +static void ov65_02236E04(UnkStruct_ov65_02236840 *param0) { int v0; @@ -893,14 +888,14 @@ static void ov65_02236E04 (UnkStruct_ov65_02236840 * param0) sub_0200A878(); } -static void ov65_02236E44 (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2, u32 param3) +static void ov65_02236E44(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u32 param3) { ov65_02236E50(param0, param1, param2, 0, param3); } -static void ov65_02236E50 (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, u32 param2, u8 param3, u32 param4) +static void ov65_02236E50(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, u32 param2, u8 param3, u32 param4) { - Strbuf* v0; + Strbuf *v0; int v1; if (param0->unk_14 != 0xff) { @@ -928,7 +923,7 @@ static void ov65_02236E50 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 param0->unk_15 = param3; } -static BOOL ov65_02236EF8 (UnkStruct_ov65_02236840 * param0) +static BOOL ov65_02236EF8(UnkStruct_ov65_02236840 *param0) { if (param0->unk_14 == 0xff) { if (param0->unk_15 > 0) { @@ -950,7 +945,7 @@ static BOOL ov65_02236EF8 (UnkStruct_ov65_02236840 * param0) return 0; } -static void ov65_02236F38 (UnkStruct_ov65_02236840 * param0) +static void ov65_02236F38(UnkStruct_ov65_02236840 *param0) { if (param0->unk_14 != 0xff) { if (Message_Printing(param0->unk_14) != 0) { @@ -966,10 +961,10 @@ static void ov65_02236F38 (UnkStruct_ov65_02236840 * param0) param0->unk_15 = 0; } -static void ov65_02236F70 (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, int param2, u32 param3) +static void ov65_02236F70(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 param3) { - Strbuf* v0; - Strbuf* v1; + Strbuf *v0; + Strbuf *v1; v0 = Strbuf_Init(256, param3); v1 = Strbuf_Init(256, param3); @@ -989,13 +984,13 @@ static void ov65_02236F70 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 Strbuf_Free(v1); } -static void ov65_02237018 (UnkStruct_ov65_02236840 * param0) +static void ov65_02237018(UnkStruct_ov65_02236840 *param0) { Window_Clear(¶m0->unk_230, 1); sub_0201AD10(¶m0->unk_230); } -static void ov65_02237034 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_0207DE04 * param1, u32 param2) +static void ov65_02237034(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2) { int v0; int v1 = 4; @@ -1008,7 +1003,7 @@ static void ov65_02237034 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_020 if ((v0 == 0) && (sub_02032DE0(v0) == 1)) { ov65_0223709C(param0, ¶m0->unk_30, param1, v0, param2); } else { - if ((sub_02032E00(v0) == 1)) { + if (sub_02032E00(v0) == 1) { ov65_0223709C(param0, ¶m0->unk_30, param1, v0, param2); } else { ov65_022371FC(¶m0->unk_30, param1, v0, param2); @@ -1017,10 +1012,10 @@ static void ov65_02237034 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_020 } } -static void ov65_0223709C (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02236840 * param1, const UnkStruct_0207DE04 * param2, int param3, u32 param4) +static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02236840 *param1, const UnkStruct_0207DE04 *param2, int param3, u32 param4) { - Strbuf* v0; - Strbuf* v1; + Strbuf *v0; + Strbuf *v1; u8 v2; u8 v3; @@ -1064,7 +1059,7 @@ static void ov65_0223709C (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_0223 Strbuf_Free(v1); } -static void ov65_022371FC (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, int param2, u32 param3) +static void ov65_022371FC(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 param3) { BGL_WindowColor(¶m0->unk_220, 15, 0, param2 * (2 * 8), (20 * 8), (2 * 8)); sub_020198E8(param0->unk_00, 2, 18, 5 + param2 * 2, 2, 2, param0->unk_248->rawData, 0 * 2, 0, param0->unk_248->screenWidth / 8, param0->unk_248->screenHeight / 8); @@ -1072,17 +1067,17 @@ static void ov65_022371FC (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 sub_0201A9A4(¶m0->unk_220); } -static void ov65_0223726C (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, int param2, int param3, u32 param4) +static void ov65_0223726C(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 param4) { - TrainerInfo * v0; + TrainerInfo *v0; v0 = CommInfo_TrainerInfo(param2); StringTemplate_SetPlayerName(param0->unk_04, param3, v0); } -static void ov65_02237284 (UnkStruct_ov65_02236840 * param0, const UnkStruct_0207DE04 * param1, int param2, int param3, u32 param4) +static void ov65_02237284(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, int param3, u32 param4) { - TrainerInfo * v0; + TrainerInfo *v0; u16 v1; v0 = CommInfo_TrainerInfo(param2); @@ -1091,7 +1086,7 @@ static void ov65_02237284 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 StringTemplate_SetNumber(param0->unk_04, param3, v1, 5, 2, 1); } -static void ov65_022372B0 (UnkStruct_ov65_02236840 * param0) +static void ov65_022372B0(UnkStruct_ov65_02236840 *param0) { if (param0->unk_258 <= 0) { ov65_022372EC(param0, param0->unk_25A); @@ -1102,10 +1097,10 @@ static void ov65_022372B0 (UnkStruct_ov65_02236840 * param0) } } -static void ov65_022372EC (UnkStruct_ov65_02236840 * param0, u32 param1) +static void ov65_022372EC(UnkStruct_ov65_02236840 *param0, u32 param1) { BOOL v0; - u16 * v1; + u16 *v1; u32 v2; v2 = Unk_ov65_02239C04[param1]; @@ -1115,7 +1110,7 @@ static void ov65_022372EC (UnkStruct_ov65_02236840 * param0, u32 param1) GF_ASSERT(v0); } -static BOOL ov65_0223731C (UnkStruct_ov65_022367A8 * param0, u32 param1) +static BOOL ov65_0223731C(UnkStruct_ov65_022367A8 *param0, u32 param1) { param0->unk_00.unk_00->unk_00.unk_22 = 1 - param0->unk_00.unk_00->unk_00.unk_22; param0->unk_00.unk_00->unk_00.unk_21 = param0->unk_00.unk_00->unk_00.unk_22; @@ -1132,7 +1127,7 @@ static BOOL ov65_0223731C (UnkStruct_ov65_022367A8 * param0, u32 param1) return param0->unk_00.unk_00->unk_00.unk_22; } -static void ov65_02237370 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static void ov65_02237370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; BOOL v1; @@ -1172,14 +1167,14 @@ static void ov65_02237370 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 } } -static void ov65_0223742C (UnkStruct_ov65_022367A8 * param0) +static void ov65_0223742C(UnkStruct_ov65_022367A8 *param0) { if ((sub_020380E4() > 3) || sub_02038284() || (sub_020383E8())) { param0->unk_00.unk_05 = 15; } } -static BOOL ov65_02237450 (const UnkStruct_ov65_022367A8 * param0) +static BOOL ov65_02237450(const UnkStruct_ov65_022367A8 *param0) { if (CommSys_ConnectedCount() > 0) { return 1; @@ -1188,7 +1183,7 @@ static BOOL ov65_02237450 (const UnkStruct_ov65_022367A8 * param0) return 0; } -static BOOL ov65_02237464 (u32 param0, u32 param1) +static BOOL ov65_02237464(u32 param0, u32 param1) { BOOL v0; @@ -1210,7 +1205,7 @@ static BOOL ov65_02237464 (u32 param0, u32 param1) return v0; } -static void ov65_02237498 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_0207DE04 * param1) +static void ov65_02237498(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1) { switch (param1->unk_00) { case 0: @@ -1230,7 +1225,7 @@ static void ov65_02237498 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_020 ov4_021D222C(&(param0->unk_00.unk_00->unk_00), sizeof(UnkStruct_0207E060)); } -static BOOL ov65_022374DC (UnkStruct_ov65_022367A8 * param0) +static BOOL ov65_022374DC(UnkStruct_ov65_022367A8 *param0) { if (param0->unk_00.unk_11 == 1) { return 0; @@ -1245,7 +1240,7 @@ static BOOL ov65_022374DC (UnkStruct_ov65_022367A8 * param0) return 0; } -static BOOL ov65_02237504 (UnkStruct_ov65_022367A8 * param0) +static BOOL ov65_02237504(UnkStruct_ov65_022367A8 *param0) { if (param0->unk_00.unk_11 == 0) { return 0; @@ -1257,21 +1252,21 @@ static BOOL ov65_02237504 (UnkStruct_ov65_022367A8 * param0) return 1; } -static void ov65_02237520 (UnkStruct_ov65_022367A8 * param0) +static void ov65_02237520(UnkStruct_ov65_022367A8 *param0) { if (ov65_022374DC(param0)) { sub_02004A84(sub_020041FC()); } } -static void ov65_02237534 (UnkStruct_ov65_022367A8 * param0) +static void ov65_02237534(UnkStruct_ov65_022367A8 *param0) { if (ov65_02237504(param0)) { sub_02004A68(0, 120); } } -static int ov65_02237548 (UnkStruct_ov65_022367A8 * param0) +static int ov65_02237548(UnkStruct_ov65_022367A8 *param0) { if (param0->unk_00.unk_04) { return CommInfo_CountReceived(); @@ -1280,7 +1275,7 @@ static int ov65_02237548 (UnkStruct_ov65_022367A8 * param0) } } -static BOOL ov65_02237550 (UnkStruct_ov65_022367A8 * param0, u32 param1) +static BOOL ov65_02237550(UnkStruct_ov65_022367A8 *param0, u32 param1) { int v0; int v1; @@ -1300,7 +1295,7 @@ static BOOL ov65_02237550 (UnkStruct_ov65_022367A8 * param0, u32 param1) return v2; } -static void ov65_0223758C (UnkStruct_ov65_022367A8 * param0) +static void ov65_0223758C(UnkStruct_ov65_022367A8 *param0) { int v0; UnkStruct_ov65_022366E4 v1; @@ -1318,7 +1313,7 @@ static void ov65_0223758C (UnkStruct_ov65_022367A8 * param0) } } -static void ov65_022375CC (UnkStruct_ov65_022367A8 * param0) +static void ov65_022375CC(UnkStruct_ov65_022367A8 *param0) { int v0; UnkStruct_ov65_022366E4 v1; @@ -1336,17 +1331,17 @@ static void ov65_022375CC (UnkStruct_ov65_022367A8 * param0) } } -static void ov65_0223760C (UnkStruct_ov65_022367A8 * param0) +static void ov65_0223760C(UnkStruct_ov65_022367A8 *param0) { ov4_021D1120(ov65_02237654, param0); } -static void ov65_0223761C (UnkStruct_ov65_022367A8 * param0) +static void ov65_0223761C(UnkStruct_ov65_022367A8 *param0) { ov4_021D1120(NULL, NULL); } -static BOOL ov65_02237628 (UnkStruct_ov65_022367A8 * param0) +static BOOL ov65_02237628(UnkStruct_ov65_022367A8 *param0) { int v0; BOOL v1 = 0; @@ -1365,15 +1360,15 @@ static BOOL ov65_02237628 (UnkStruct_ov65_022367A8 * param0) return v1; } -static void ov65_02237654 (u16 param0, void * param1) +static void ov65_02237654(u16 param0, void *param1) { - UnkStruct_ov65_022367A8 * v0 = param1; + UnkStruct_ov65_022367A8 *v0 = param1; v0->unk_00.unk_14[param0] = 1; v0->unk_00.unk_18[param0] = param0; } -static BOOL ov65_02237660 (UnkStruct_ov65_022367A8 * param0) +static BOOL ov65_02237660(UnkStruct_ov65_022367A8 *param0) { int v0; BOOL v1 = 0; @@ -1394,12 +1389,12 @@ static BOOL ov65_02237660 (UnkStruct_ov65_022367A8 * param0) return v1; } -static void ov65_02237698 (UnkStruct_ov65_022367A8 * param0) +static void ov65_02237698(UnkStruct_ov65_022367A8 *param0) { param0->unk_00.unk_24 = 1; } -static void ov65_022376A0 (UnkStruct_ov65_022367A8 * param0, u32 param1, u32 param2) +static void ov65_022376A0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 param2) { if (sub_02032E00(param1) == 0) { sub_02032E1C(param1); @@ -1411,10 +1406,10 @@ static void ov65_022376A0 (UnkStruct_ov65_022367A8 * param0, u32 param1, u32 par } } -static void ov65_022376D0 (UnkStruct_ov65_022367A8 * param0, u32 param1, u32 param2) +static void ov65_022376D0(UnkStruct_ov65_022367A8 *param0, u32 param1, u32 param2) { UnkStruct_ov65_022376D0 v0; - TrainerInfo * v1; + TrainerInfo *v1; if (param0->unk_30.unk_1C0[param1].unk_00 != NULL) { return; @@ -1445,7 +1440,7 @@ static void ov65_022376D0 (UnkStruct_ov65_022367A8 * param0, u32 param1, u32 par param0->unk_30.unk_1C0[param1].unk_08++; } -static void ov65_022377A4 (UnkStruct_ov65_022367A8 * param0) +static void ov65_022377A4(UnkStruct_ov65_022367A8 *param0) { int v0; @@ -1457,13 +1452,13 @@ static void ov65_022377A4 (UnkStruct_ov65_022367A8 * param0) ov63_0222CEE4(param0->unk_30.unk_1BC); } -static void ov65_022377E8 (UnkStruct_ov65_022367A8 * param0) +static void ov65_022377E8(UnkStruct_ov65_022367A8 *param0) { ov63_0222CE24(param0->unk_30.unk_1BC); memset(param0->unk_30.unk_1C0, 0, sizeof(UnkStruct_ov65_02237908) * 4); } -static void ov65_02237808 (UnkStruct_ov65_022367A8 * param0, u32 param1) +static void ov65_02237808(UnkStruct_ov65_022367A8 *param0, u32 param1) { UnkStruct_ov65_022366E4 v0; BOOL v1; @@ -1475,7 +1470,7 @@ static void ov65_02237808 (UnkStruct_ov65_022367A8 * param0, u32 param1) GF_ASSERT(v1 == 1); } -static void ov65_0223782C (UnkStruct_ov65_022367A8 * param0) +static void ov65_0223782C(UnkStruct_ov65_022367A8 *param0) { int v0; @@ -1489,7 +1484,7 @@ static void ov65_0223782C (UnkStruct_ov65_022367A8 * param0) } } -static void ov65_02237860 (UnkStruct_ov65_022367A8 * param0, u32 param1) +static void ov65_02237860(UnkStruct_ov65_022367A8 *param0, u32 param1) { int v0; @@ -1504,13 +1499,13 @@ static void ov65_02237860 (UnkStruct_ov65_022367A8 * param0, u32 param1) } } -static void ov65_0223789C (UnkStruct_ov65_022367A8 * param0) +static void ov65_0223789C(UnkStruct_ov65_022367A8 *param0) { GF_ASSERT(param0->unk_30.unk_24C == NULL); param0->unk_30.unk_24C = sub_0200E7FC(¶m0->unk_30.unk_1F0, 1); } -static void ov65_022378C4 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_0207DE04 * param1, u32 param2) +static void ov65_022378C4(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207DE04 *param1, u32 param2) { int v0; @@ -1526,12 +1521,12 @@ static void ov65_022378C4 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_020 sub_0200DD0C(param0->unk_30.unk_00, 1, 1, 2, v0, param2); } -static void ov65_02237908 (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02237908 * param1) +static void ov65_02237908(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1) { return; } -static void ov65_0223790C (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02237908 * param1) +static void ov65_0223790C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1) { u32 v0; @@ -1544,7 +1539,7 @@ static void ov65_0223790C (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_0223 param1->unk_0A = 16 + Unk_ov65_02239A20[v0]; } -static void ov65_02237940 (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02237908 * param1) +static void ov65_02237940(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1) { ov63_0222CFB4(param1->unk_04); @@ -1557,12 +1552,12 @@ static void ov65_02237940 (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_0223 } } -static void ov65_0223796C (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_02237908 * param1) +static void ov65_0223796C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02237908 *param1) { return; } -static void ov65_02237970 (UnkStruct_ov65_022367A8 * param0) +static void ov65_02237970(UnkStruct_ov65_022367A8 *param0) { int v0; int v1; @@ -1607,7 +1602,7 @@ static void ov65_02237970 (UnkStruct_ov65_022367A8 * param0) } } -static BOOL ov65_02237A10 (UnkStruct_ov65_022367A8 * param0) +static BOOL ov65_02237A10(UnkStruct_ov65_022367A8 *param0) { if (CommTiming_IsSyncState(13)) { return 1; @@ -1616,11 +1611,11 @@ static BOOL ov65_02237A10 (UnkStruct_ov65_022367A8 * param0) return 0; } -static void ov65_02237A24 (UnkStruct_0207DE04 * param0, u32 param1) +static void ov65_02237A24(UnkStruct_0207DE04 *param0, u32 param1) { - void * v0; - Journal * v1; - UnkStruct_0207E060 * v2; + void *v0; + Journal *v1; + UnkStruct_0207E060 *v2; v1 = SaveData_GetJournal(param0->unk_08); v0 = sub_0202C244(param1, 29); @@ -1628,13 +1623,13 @@ static void ov65_02237A24 (UnkStruct_0207DE04 * param0, u32 param1) sub_0202B758(v1, v0, 4); } -static void ov65_02237A44 (UnkStruct_ov65_022367A8 * param0) +static void ov65_02237A44(UnkStruct_ov65_022367A8 *param0) { param0->unk_00.unk_10 = 1; param0->unk_00.unk_0C = (60 * 30); } -static BOOL ov65_02237A54 (UnkStruct_ov65_022367A8 * param0) +static BOOL ov65_02237A54(UnkStruct_ov65_022367A8 *param0) { if (param0->unk_00.unk_10 == 0) { return 0; @@ -1648,7 +1643,7 @@ static BOOL ov65_02237A54 (UnkStruct_ov65_022367A8 * param0) return 1; } -static BOOL ov65_02237A70 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237A70(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { if (param0->unk_00.unk_00->unk_00.unk_21 == 1) { ov65_02237520(param0); @@ -1663,7 +1658,7 @@ static BOOL ov65_02237A70 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237AA8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237AA8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236E44(¶m0->unk_30, param1, 107, param2); @@ -1671,7 +1666,7 @@ static BOOL ov65_02237AA8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237AC0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237AC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -1745,7 +1740,7 @@ static BOOL ov65_02237AC0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237B9C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237B9C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236F70(¶m0->unk_30, param1, param0->unk_00.unk_06, param2); ov65_02236E44(¶m0->unk_30, param1, 108, param2); @@ -1755,7 +1750,7 @@ static BOOL ov65_02237B9C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237BC4 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237BC4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -1771,7 +1766,7 @@ static BOOL ov65_02237BC4 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237BF8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237BF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; UnkStruct_ov65_022366E4 v1; @@ -1816,7 +1811,7 @@ static BOOL ov65_02237BF8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237C98 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237C98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236E44(¶m0->unk_30, param1, 119, param2); @@ -1824,7 +1819,7 @@ static BOOL ov65_02237C98 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237CB0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237CB0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -1838,7 +1833,7 @@ static BOOL ov65_02237CB0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237CCC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237CCC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236E44(¶m0->unk_30, param1, 111, param2); @@ -1846,7 +1841,7 @@ static BOOL ov65_02237CCC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237CE4 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237CE4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -1862,7 +1857,7 @@ static BOOL ov65_02237CE4 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237D18 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237D18(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; @@ -1885,7 +1880,7 @@ static BOOL ov65_02237D18 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237D60 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237D60(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { param0->unk_00.unk_08 = 30; @@ -1900,7 +1895,7 @@ static BOOL ov65_02237D60 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237D98 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237D98(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; @@ -1921,7 +1916,7 @@ static BOOL ov65_02237D98 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237DD0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237DD0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -1938,7 +1933,7 @@ static BOOL ov65_02237DD0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237DF8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237DF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { if (CommTiming_IsSyncState(13)) { ov65_02237498(param0, param1); @@ -1951,7 +1946,7 @@ static BOOL ov65_02237DF8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237E24 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237E24(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { if (CommTiming_IsSyncState(14)) { u16 v0 = param0->unk_00.unk_00->unk_00.unk_1B; @@ -1967,12 +1962,12 @@ static BOOL ov65_02237E24 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237E54 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237E54(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; int v1; int v2; - const u16 * v3; + const u16 *v3; int v4; v1 = ov65_02237548(param0); @@ -2002,7 +1997,7 @@ static BOOL ov65_02237E54 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237EA4 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237EA4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { CommMan_SetErrorHandling(1, 1); CommTiming_StartSync(18); @@ -2012,7 +2007,7 @@ static BOOL ov65_02237EA4 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237EC0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237EC0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { if (CommTiming_IsSyncState(18)) { param0->unk_00.unk_07 = 1; @@ -2026,7 +2021,7 @@ static BOOL ov65_02237EC0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237EF0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237EF0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236E44(¶m0->unk_30, param1, 120, param2); param0->unk_00.unk_05 = 20; @@ -2034,7 +2029,7 @@ static BOOL ov65_02237EF0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237F08 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237F08(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2050,7 +2045,7 @@ static BOOL ov65_02237F08 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237F48 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237F48(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; @@ -2077,7 +2072,7 @@ static BOOL ov65_02237F48 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237FA0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237FA0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236E44(¶m0->unk_30, param1, 121, param2); @@ -2085,7 +2080,7 @@ static BOOL ov65_02237FA0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237FB8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237FB8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2101,7 +2096,7 @@ static BOOL ov65_02237FB8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02237FF8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02237FF8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; @@ -2128,7 +2123,7 @@ static BOOL ov65_02237FF8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238050 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238050(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236E44(¶m0->unk_30, param1, 122, param2); @@ -2138,7 +2133,7 @@ static BOOL ov65_02238050 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_0223806C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_0223806C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2164,7 +2159,7 @@ static BOOL ov65_0223806C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 1; } -static BOOL ov65_022380AC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022380AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { if (param0->unk_30.unk_240 != NULL) { sub_02002154(param0->unk_30.unk_240, param2); @@ -2178,7 +2173,7 @@ static BOOL ov65_022380AC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022380E8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022380E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236E44(¶m0->unk_30, param1, 118, param2); param0->unk_00.unk_05 = 29; @@ -2187,7 +2182,7 @@ static BOOL ov65_022380E8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238104 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238104(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2206,7 +2201,7 @@ static BOOL ov65_02238104 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 1; } -static BOOL ov65_02238134 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238134(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { u32 v0; @@ -2222,7 +2217,7 @@ static BOOL ov65_02238134 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_0223815C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_0223815C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2238,7 +2233,7 @@ static BOOL ov65_0223815C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238190 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238190(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; @@ -2258,7 +2253,7 @@ static BOOL ov65_02238190 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022381CC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022381CC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { CommInfo_SendBattleRegulation(); CommMan_SetErrorHandling(0, 1); @@ -2266,7 +2261,7 @@ static BOOL ov65_022381CC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022381E4 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022381E4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02237550(param0, param2); @@ -2281,7 +2276,7 @@ static BOOL ov65_022381E4 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238210 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238210(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02237550(param0, param2); ov65_0223726C(¶m0->unk_30, param1, 0, 0, param2); @@ -2293,7 +2288,7 @@ static BOOL ov65_02238210 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238250 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238250(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2327,7 +2322,7 @@ static BOOL ov65_02238250 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022382B0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022382B0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_0223726C(¶m0->unk_30, param1, 0, 0, param2); ov65_02236E50(¶m0->unk_30, param1, 115, 30, param2); @@ -2337,7 +2332,7 @@ static BOOL ov65_022382B0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022382F0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022382F0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2354,7 +2349,7 @@ static BOOL ov65_022382F0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238314 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238314(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_0223726C(¶m0->unk_30, param1, 0, 0, param2); ov65_02236E44(¶m0->unk_30, param1, param0->unk_00.unk_2D, param2); @@ -2367,7 +2362,7 @@ static BOOL ov65_02238314 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238350 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238350(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2383,7 +2378,7 @@ static BOOL ov65_02238350 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 1; } -static BOOL ov65_02238370 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238370(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02237550(param0, param2); ov65_02236E44(¶m0->unk_30, param1, 123, param2); @@ -2398,7 +2393,7 @@ static BOOL ov65_02238370 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022383AC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022383AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2414,7 +2409,7 @@ static BOOL ov65_022383AC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022383D0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022383D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02237550(param0, param2); @@ -2450,7 +2445,7 @@ static BOOL ov65_022383D0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_0223846C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_0223846C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; @@ -2480,12 +2475,12 @@ static BOOL ov65_0223846C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022384BC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022384BC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; int v1; int v2; - const u16 * v3; + const u16 *v3; int v4; v1 = ov65_02237548(param0); @@ -2515,7 +2510,7 @@ static BOOL ov65_022384BC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_0223850C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_0223850C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { CommMan_SetErrorHandling(1, 1); CommTiming_StartSync(18); @@ -2525,7 +2520,7 @@ static BOOL ov65_0223850C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238528 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238528(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { if (CommTiming_IsSyncState(18)) { ov65_022378C4(param0, param1, param2); @@ -2538,7 +2533,7 @@ static BOOL ov65_02238528 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238558 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238558(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { if (param0->unk_30.unk_240 != NULL) { sub_02002154(param0->unk_30.unk_240, param2); @@ -2553,7 +2548,7 @@ static BOOL ov65_02238558 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238594 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238594(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236E44(¶m0->unk_30, param1, 118, param2); @@ -2562,7 +2557,7 @@ static BOOL ov65_02238594 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022385AC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022385AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2582,7 +2577,7 @@ static BOOL ov65_022385AC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 1; } -static BOOL ov65_022385D4 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022385D4(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { u32 v0; @@ -2600,7 +2595,7 @@ static BOOL ov65_022385D4 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238608 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238608(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2624,7 +2619,7 @@ static BOOL ov65_02238608 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238660 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238660(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; @@ -2654,7 +2649,7 @@ static BOOL ov65_02238660 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022386D0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022386D0(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { param0->unk_00.unk_26 = sub_02032F40(0); @@ -2670,7 +2665,7 @@ static BOOL ov65_022386D0 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238728 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238728(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2686,7 +2681,7 @@ static BOOL ov65_02238728 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_0223875C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_0223875C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { int v0; @@ -2705,7 +2700,7 @@ static BOOL ov65_0223875C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_0223878C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_0223878C(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_02236E44(¶m0->unk_30, param1, 17, param2); ov65_0223789C(param0); @@ -2716,7 +2711,7 @@ static BOOL ov65_0223878C (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022387AC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022387AC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { BOOL v0; @@ -2738,7 +2733,7 @@ static BOOL ov65_022387AC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022387E8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022387E8(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { ov65_0223742C(param0); @@ -2752,7 +2747,7 @@ static BOOL ov65_022387E8 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238838 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238838(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { if (ScreenWipe_Done()) { CommInfo_Init(param1->unk_08, NULL); @@ -2794,7 +2789,7 @@ static BOOL ov65_02238838 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_022388FC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_022388FC(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { if (ScreenWipe_Done()) { param0->unk_00.unk_05 = 0; @@ -2803,7 +2798,7 @@ static BOOL ov65_022388FC (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 return 0; } -static BOOL ov65_02238910 (UnkStruct_ov65_022367A8 * param0, UnkStruct_0207DE04 * param1, u32 param2) +static BOOL ov65_02238910(UnkStruct_ov65_022367A8 *param0, UnkStruct_0207DE04 *param1, u32 param2) { sub_02038378(); sub_02038B60(); diff --git a/src/overlay066/ov66_0222DCE0.c b/src/overlay066/ov66_0222DCE0.c index 3553f0ea54..dc8f0447a5 100644 --- a/src/overlay066/ov66_0222DCE0.c +++ b/src/overlay066/ov66_0222DCE0.c @@ -1,39 +1,39 @@ +#include "overlay066/ov66_0222DCE0.h" + #include -#include #include +#include -#include "sys_task_manager.h" -#include "savedata.h" +#include "overlay066/ov66_0222DDF0.h" +#include "overlay066/ov66_02230C44.h" +#include "overlay066/struct_ov66_0222DCE0.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay066/struct_ov66_02230C90_decl.h" -#include "overlay066/struct_ov66_0222DCE0.h" - #include "game_overlay.h" +#include "heap.h" #include "overlay_manager.h" +#include "savedata.h" #include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02099550.h" -#include "overlay066/ov66_0222DCE0.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_02230C44.h" FS_EXTERN_OVERLAY(overlay63); typedef struct { - SaveData * unk_00; - UnkStruct_ov66_0222DFF8 * unk_04; - UnkStruct_ov66_02230C90 * unk_08; - SysTask * unk_0C; + SaveData *unk_00; + UnkStruct_ov66_0222DFF8 *unk_04; + UnkStruct_ov66_02230C90 *unk_08; + SysTask *unk_0C; } UnkStruct_ov66_0222DD90; -static void ov66_0222DDDC(SysTask * param0, void * param1); +static void ov66_0222DDDC(SysTask *param0, void *param1); -int ov66_0222DCE0 (OverlayManager * param0, int * param1) +int ov66_0222DCE0(OverlayManager *param0, int *param1) { - UnkStruct_ov66_0222DD90 * v0; - UnkStruct_ov66_0222DCE0 * v1; + UnkStruct_ov66_0222DD90 *v0; + UnkStruct_ov66_0222DCE0 *v1; { FS_EXTERN_OVERLAY(overlay63); @@ -63,9 +63,9 @@ int ov66_0222DCE0 (OverlayManager * param0, int * param1) return 1; } -int ov66_0222DD6C (OverlayManager * param0, int * param1) +int ov66_0222DD6C(OverlayManager *param0, int *param1) { - UnkStruct_ov66_0222DD90 * v0; + UnkStruct_ov66_0222DD90 *v0; int v1; v0 = OverlayManager_Data(param0); @@ -80,9 +80,9 @@ int ov66_0222DD6C (OverlayManager * param0, int * param1) return 0; } -int ov66_0222DD90 (OverlayManager * param0, int * param1) +int ov66_0222DD90(OverlayManager *param0, int *param1) { - UnkStruct_ov66_0222DD90 * v0; + UnkStruct_ov66_0222DD90 *v0; v0 = OverlayManager_Data(param0); @@ -106,9 +106,9 @@ int ov66_0222DD90 (OverlayManager * param0, int * param1) return 1; } -static void ov66_0222DDDC (SysTask * param0, void * param1) +static void ov66_0222DDDC(SysTask *param0, void *param1) { - UnkStruct_ov66_0222DD90 * v0; + UnkStruct_ov66_0222DD90 *v0; v0 = param1; diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index effadf27c1..6e1898c629 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -1,34 +1,32 @@ -#include "enums.h" +#include "overlay066/ov66_0222DDF0.h" +#include #include -#include #include -#include +#include -#include "inlines.h" +#include "constants/species.h" -#include "message.h" -#include "struct_decls/struct_02014FB0_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "journal.h" +#include "struct_decls/struct_02014FB0_decl.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_02030EC4_decl.h" -#include "pokemon.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207E060_decl.h" -#include "savedata.h" -#include "overlay066/struct_ov66_0223177C_decl.h" - +#include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_02055BA8.h" + +#include "overlay066/ov66_02231428.h" +#include "overlay066/ov66_0223177C.h" +#include "overlay066/ov66_022324F0.h" +#include "overlay066/ov66_02234EA8.h" #include "overlay066/struct_ov66_0222E294.h" #include "overlay066/struct_ov66_0222E908.h" #include "overlay066/struct_ov66_0222E990.h" #include "overlay066/struct_ov66_02230914.h" #include "overlay066/struct_ov66_02231428.h" #include "overlay066/struct_ov66_02231560.h" +#include "overlay066/struct_ov66_0223177C_decl.h" #include "overlay066/struct_ov66_0223185C.h" #include "overlay066/struct_ov66_022318AC.h" #include "overlay066/struct_ov66_02231908.h" @@ -44,32 +42,28 @@ #include "overlay066/struct_ov66_022589B4.h" #include "overlay068/struct_ov68_0225DC74.h" +#include "enums.h" +#include "heap.h" +#include "inlines.h" +#include "journal.h" +#include "message.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "message.h" #include "unk_02014D38.h" -#include "heap.h" #include "unk_0201D15C.h" -#include "strbuf.h" -#include "savedata.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" -#include "journal.h" #include "unk_0202C858.h" #include "unk_0202CD50.h" #include "unk_02030EA4.h" -#include "pokemon.h" -#include "constants/species.h" -#include "party.h" #include "unk_0207E060.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_02231428.h" -#include "overlay066/ov66_0223177C.h" -#include "overlay066/ov66_022324F0.h" -#include "overlay066/ov66_02234EA8.h" typedef struct UnkStruct_ov66_0222E71C_t { s32 unk_00; @@ -156,13 +150,13 @@ typedef struct { } UnkStruct_ov66_0222FB64; typedef struct { - UnkStruct_ov66_0223177C * unk_00; + UnkStruct_ov66_0223177C *unk_00; BOOL unk_04; UnkStruct_ov66_02231560 unk_08; UnkStruct_ov66_02231428 unk_D0; s64 unk_D4; s64 unk_DC; - TrainerInfo * unk_E4[4]; + TrainerInfo *unk_E4[4]; } UnkStruct_ov66_0222DFF8_sub1; typedef struct { @@ -202,7 +196,7 @@ typedef struct { typedef struct { u8 unk_00[20]; UnkStruct_ov66_02230914 unk_14[20]; - UnkStruct_02014FB0 * unk_B4; + UnkStruct_02014FB0 *unk_B4; } UnkStruct_ov66_022308A0; typedef union { @@ -216,13 +210,13 @@ typedef struct { u8 unk_41; u8 unk_42; u8 unk_43; - const SaveData * unk_44; + const SaveData *unk_44; u16 unk_48; u16 unk_4A; } UnkStruct_ov66_02230A6C; typedef struct { - TrainerInfo * unk_00; + TrainerInfo *unk_00; BOOL unk_04; } UnkStruct_ov66_0222FBF0; @@ -232,7 +226,7 @@ typedef struct { } UnkStruct_ov66_0222DFF8_sub3; typedef struct UnkStruct_ov66_0222DFF8_t { - SaveData * unk_00; + SaveData *unk_00; UnkStruct_ov66_0222DFF8_sub1 unk_04; UnkStruct_ov66_0222FA80 unk_F8; UnkStruct_ov66_0222F6C4 unk_108; @@ -247,7 +241,7 @@ typedef struct UnkStruct_ov66_0222DFF8_t { UnkStruct_ov66_0222E294 unk_3DF; UnkStruct_ov66_022308A0 unk_3E4; UnkStruct_ov66_022309A4 unk_49C; - UnkStruct_0207E060 * unk_4B8; + UnkStruct_0207E060 *unk_4B8; UnkStruct_ov66_02230A6C unk_4BC; UnkStruct_ov66_0222FBF0 unk_508; UnkStruct_ov66_0222DFF8_sub3 unk_510; @@ -265,106 +259,106 @@ typedef struct { u16 unk_02; } UnkStruct_ov66_02258918; -static BOOL ov66_0222F1B4(const u16 * param0, u32 param1); -static void ov66_0222F1DC(s32 param0, const void * param1, void * param2, BOOL param3); -static void ov66_0222F398(s32 param0, void * param1); -static void ov66_0222F458(s32 param0, const void * param1, void * param2); -static void ov66_0222F4C8(PPW_LOBBY_TIME_EVENT param0, void * param1); -static void ov66_0222F684(const void * param0, u32 param1, void * param2); -static void ov66_0222F6C4(UnkStruct_ov66_0222F6C4 * param0, UnkStruct_ov66_02231560 * param1); -static void ov66_0222F768(UnkStruct_ov66_0222DFF8 * param0); -static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 * param0, SaveData * param1, u32 param2); -static void ov66_0222F964(UnkStruct_ov66_0222DFF8 * param0); -static void ov66_0222F9EC(UnkStruct_ov66_0222F6C4 * param0, const SaveData * param1); -static BOOL ov66_0222FA04(const UnkStruct_ov66_0222F6C4 * param0, const SaveData * param1); -static void ov66_0222FA28(UnkStruct_ov66_0222F6C4 * param0, const UnkStruct_ov66_0222E71C * param1, u32 param2); -static void ov66_0222FA80(UnkStruct_ov66_0222FA80 * param0); -static void ov66_0222FA88(UnkStruct_ov66_0222FB64 * param0, UnkStruct_ov66_0222FA80 * param1, UnkStruct_ov66_022302B0 * param2, UnkStruct_ov66_022309A4 * param3); -static void ov66_0222FB64(UnkStruct_ov66_0222FB64 * param0); -static void ov66_0222FBAC(const UnkStruct_ov66_0222FB64 * param0); -static void ov66_0222FBC8(UnkStruct_ov66_0222FBC8 * param0); -static BOOL ov66_0222FBD0(const UnkStruct_ov66_0222FBC8 * param0); -static void ov66_0222FBE0(UnkStruct_ov66_0222FBC8 * param0); -static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 * param0, u32 param1); -static void ov66_0222FC00(UnkStruct_ov66_0222FBF0 * param0); -static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 * param0, const UnkStruct_ov66_0222F6C4 * param1, u32 param2); -static void ov66_0222FC4C(UnkStruct_ov66_0222FBC8 * param0); -static BOOL ov66_0222FC54(const UnkStruct_ov66_0222FBC8 * param0); -static void ov66_0222FC58(UnkStruct_ov66_0222FC58 * param0); -static void ov66_0222FC68(UnkStruct_ov66_0222FC68 * param0); -static void ov66_0222FC74(UnkStruct_ov66_0222FC68 * param0); -static void ov66_0222FC84(UnkStruct_ov66_0222FC68 * param0); -static BOOL ov66_0222FC9C(const UnkStruct_ov66_0222FC68 * param0, u32 param1); -static void ov66_0222FCBC(UnkStruct_ov66_0222FC68 * param0, u32 param1); -static void ov66_0222FCD8(UnkStruct_ov66_0222FC68 * param0, u32 param1); -static void ov66_0222FCF4(UnkStruct_ov66_0222FC68 * param0, u32 param1); -static void ov66_0222FD10(UnkStruct_ov66_0222FC68 * param0, u32 param1); -static void ov66_0222FD28(UnkStruct_ov66_0222FC68 * param0, u16 param1); -static void ov66_0222FD30(UnkStruct_ov66_0222DFF8 * param0, s32 param1, BOOL param2); -static void ov66_0222FD50(UnkStruct_ov66_0222DFF8 * param0, s32 param1); -static void ov66_0222FD70(UnkStruct_ov66_0222FC68 * param0); -static void ov66_0222FD7C(UnkStruct_ov66_0222FC68 * param0); -static void ov66_0222FD84(UnkStruct_ov66_0222FC68 * param0); -static BOOL ov66_0222FD9C(const UnkStruct_ov66_0222FC68 * param0); -static s16 ov66_0222FDBC(const UnkStruct_ov66_0222FC68 * param0); -static void ov66_0222FDC4(UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1); -static void ov66_0222FE40(UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1); -static void ov66_0222FEC0(UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1); -static void ov66_0222FFF4(UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1); -static void ov66_02230058(UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1); -static void ov66_02230114(UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1); -static void ov66_022301D0(UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1); -static void ov66_02230294(UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1); -static void ov66_02230298(UnkStruct_ov66_0222DFF8 * param0, int param1); -static void ov66_022302B0(UnkStruct_ov66_022302B0 * param0); -static void ov66_022302D0(UnkStruct_ov66_022302B0 * param0); -static void ov66_022302D8(UnkStruct_ov66_022302B0 * param0); -static inline void inline_ov66_0222EC04(u32 param0, u32 * param1, u32 * param2); -static u32 ov66_02230330(UnkStruct_ov66_022302B0 * param0, u32 param1, int param2); -static void ov66_022303A8(UnkStruct_ov66_022302B0 * param0, u32 param1); -static u32 ov66_022303DC(const UnkStruct_ov66_022302B0 * param0, u32 param1); -static int ov66_0223040C(const UnkStruct_ov66_022302B0 * param0, u32 param1); -static u32 ov66_02230424(const UnkStruct_ov66_022302B0 * param0, u32 param1); -static void ov66_0223043C(UnkStruct_ov66_022302B0 * param0, u32 param1); -static BOOL ov66_02230474(const UnkStruct_ov66_022302B0 * param0, u32 param1); -static void ov66_022304A8(UnkStruct_ov66_022302B0 * param0, u32 param1); -static u32 ov66_022304DC(const UnkStruct_ov66_022302B0 * param0, u32 param1); -static void ov66_02230510(UnkStruct_ov66_022302B0 * param0, u32 param1, int param2); -static BOOL ov66_02230544(const UnkStruct_ov66_022302B0 * param0, u32 param1, int param2); -static int ov66_02230580(const UnkStruct_ov66_022302B0 * param0, u32 param1); -static void ov66_022305B0(s32 param0, const void * param1, u32 param2, void * param3); -static void ov66_02230664(s32 param0, const void * param1, u32 param2, void * param3); -static void ov66_022306C4(s32 param0, const void * param1, u32 param2, void * param3); -static void ov66_02230728(s32 param0, const void * param1, u32 param2, void * param3); -static void ov66_02230750(s32 param0, const void * param1, u32 param2, void * param3); -static void ov66_02230764(s32 param0, const void * param1, u32 param2, void * param3); -static void ov66_02230780(s32 param0, const void * param1, u32 param2, void * param3); -static void ov66_022307B4(s32 param0, const void * param1, u32 param2, void * param3); -static void ov66_022307D4(UnkStruct_ov66_022307D4 * param0); -static void ov66_022307F0(UnkStruct_ov66_022307D4 * param0, u32 param1, u32 param2); -static u32 ov66_02230828(const UnkStruct_ov66_022307D4 * param0); -static void ov66_0223086C(UnkStruct_ov66_02232068 * param0, u32 param1, BOOL param2); -static BOOL ov66_02230884(const UnkStruct_ov66_02232068 * param0, u32 param1); -static void ov66_022308A0(UnkStruct_ov66_022308A0 * param0, u32 param1); -static void ov66_022308BC(UnkStruct_ov66_022308A0 * param0); -static void ov66_022308C8(UnkStruct_ov66_022308A0 * param0, u32 param1, BOOL param2, u32 param3); -static BOOL ov66_022308F8(const UnkStruct_ov66_022308A0 * param0, u32 param1); -static const UnkStruct_ov66_02230914 * ov66_02230914(const UnkStruct_ov66_022308A0 * param0, u32 param1); -static void ov66_02230938(UnkStruct_02014FB0 * param0, u32 param1, UnkStruct_ov66_02230914 * param2); -static void ov66_022309A4(UnkStruct_ov66_022309A4 * param0, u32 param1, u32 param2); -static void ov66_022309B4(UnkStruct_ov66_022309A4 * param0); -static void ov66_022309C8(UnkStruct_ov66_022309A4 * param0); -static u32 ov66_02230A64(const UnkStruct_ov66_022309A4 * param0); -static int ov66_02230A68(const UnkStruct_ov66_022309A4 * param0); -static void ov66_02230A6C(UnkStruct_ov66_02230A6C * param0, const SaveData * param1); -static void ov66_02230A9C(UnkStruct_ov66_02230A6C * param0, int param1, s32 param2); -static BOOL ov66_02230AF8(UnkStruct_ov66_02230A6C * param0, s32 param1, s32 param2); -static int ov66_02230B28(UnkStruct_ov66_02230A6C * param0); -static int ov66_02230B78(UnkStruct_ov66_02230A6C * param0, u32 param1); -static s32 ov66_02230BA4(UnkStruct_ov66_02230A6C * param0, u32 param1); -static void ov66_02230BCC(UnkStruct_ov66_02230A6C * param0); -static void ov66_02230BE0(UnkStruct_ov66_02230A6C * param0); -static BOOL ov66_02230C04(const UnkStruct_ov66_02230A6C * param0); +static BOOL ov66_0222F1B4(const u16 *param0, u32 param1); +static void ov66_0222F1DC(s32 param0, const void *param1, void *param2, BOOL param3); +static void ov66_0222F398(s32 param0, void *param1); +static void ov66_0222F458(s32 param0, const void *param1, void *param2); +static void ov66_0222F4C8(PPW_LOBBY_TIME_EVENT param0, void *param1); +static void ov66_0222F684(const void *param0, u32 param1, void *param2); +static void ov66_0222F6C4(UnkStruct_ov66_0222F6C4 *param0, UnkStruct_ov66_02231560 *param1); +static void ov66_0222F768(UnkStruct_ov66_0222DFF8 *param0); +static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *param1, u32 param2); +static void ov66_0222F964(UnkStruct_ov66_0222DFF8 *param0); +static void ov66_0222F9EC(UnkStruct_ov66_0222F6C4 *param0, const SaveData *param1); +static BOOL ov66_0222FA04(const UnkStruct_ov66_0222F6C4 *param0, const SaveData *param1); +static void ov66_0222FA28(UnkStruct_ov66_0222F6C4 *param0, const UnkStruct_ov66_0222E71C *param1, u32 param2); +static void ov66_0222FA80(UnkStruct_ov66_0222FA80 *param0); +static void ov66_0222FA88(UnkStruct_ov66_0222FB64 *param0, UnkStruct_ov66_0222FA80 *param1, UnkStruct_ov66_022302B0 *param2, UnkStruct_ov66_022309A4 *param3); +static void ov66_0222FB64(UnkStruct_ov66_0222FB64 *param0); +static void ov66_0222FBAC(const UnkStruct_ov66_0222FB64 *param0); +static void ov66_0222FBC8(UnkStruct_ov66_0222FBC8 *param0); +static BOOL ov66_0222FBD0(const UnkStruct_ov66_0222FBC8 *param0); +static void ov66_0222FBE0(UnkStruct_ov66_0222FBC8 *param0); +static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, u32 param1); +static void ov66_0222FC00(UnkStruct_ov66_0222FBF0 *param0); +static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, u32 param2); +static void ov66_0222FC4C(UnkStruct_ov66_0222FBC8 *param0); +static BOOL ov66_0222FC54(const UnkStruct_ov66_0222FBC8 *param0); +static void ov66_0222FC58(UnkStruct_ov66_0222FC58 *param0); +static void ov66_0222FC68(UnkStruct_ov66_0222FC68 *param0); +static void ov66_0222FC74(UnkStruct_ov66_0222FC68 *param0); +static void ov66_0222FC84(UnkStruct_ov66_0222FC68 *param0); +static BOOL ov66_0222FC9C(const UnkStruct_ov66_0222FC68 *param0, u32 param1); +static void ov66_0222FCBC(UnkStruct_ov66_0222FC68 *param0, u32 param1); +static void ov66_0222FCD8(UnkStruct_ov66_0222FC68 *param0, u32 param1); +static void ov66_0222FCF4(UnkStruct_ov66_0222FC68 *param0, u32 param1); +static void ov66_0222FD10(UnkStruct_ov66_0222FC68 *param0, u32 param1); +static void ov66_0222FD28(UnkStruct_ov66_0222FC68 *param0, u16 param1); +static void ov66_0222FD30(UnkStruct_ov66_0222DFF8 *param0, s32 param1, BOOL param2); +static void ov66_0222FD50(UnkStruct_ov66_0222DFF8 *param0, s32 param1); +static void ov66_0222FD70(UnkStruct_ov66_0222FC68 *param0); +static void ov66_0222FD7C(UnkStruct_ov66_0222FC68 *param0); +static void ov66_0222FD84(UnkStruct_ov66_0222FC68 *param0); +static BOOL ov66_0222FD9C(const UnkStruct_ov66_0222FC68 *param0); +static s16 ov66_0222FDBC(const UnkStruct_ov66_0222FC68 *param0); +static void ov66_0222FDC4(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1); +static void ov66_0222FE40(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1); +static void ov66_0222FEC0(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1); +static void ov66_0222FFF4(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1); +static void ov66_02230058(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1); +static void ov66_02230114(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1); +static void ov66_022301D0(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1); +static void ov66_02230294(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1); +static void ov66_02230298(UnkStruct_ov66_0222DFF8 *param0, int param1); +static void ov66_022302B0(UnkStruct_ov66_022302B0 *param0); +static void ov66_022302D0(UnkStruct_ov66_022302B0 *param0); +static void ov66_022302D8(UnkStruct_ov66_022302B0 *param0); +static inline void inline_ov66_0222EC04(u32 param0, u32 *param1, u32 *param2); +static u32 ov66_02230330(UnkStruct_ov66_022302B0 *param0, u32 param1, int param2); +static void ov66_022303A8(UnkStruct_ov66_022302B0 *param0, u32 param1); +static u32 ov66_022303DC(const UnkStruct_ov66_022302B0 *param0, u32 param1); +static int ov66_0223040C(const UnkStruct_ov66_022302B0 *param0, u32 param1); +static u32 ov66_02230424(const UnkStruct_ov66_022302B0 *param0, u32 param1); +static void ov66_0223043C(UnkStruct_ov66_022302B0 *param0, u32 param1); +static BOOL ov66_02230474(const UnkStruct_ov66_022302B0 *param0, u32 param1); +static void ov66_022304A8(UnkStruct_ov66_022302B0 *param0, u32 param1); +static u32 ov66_022304DC(const UnkStruct_ov66_022302B0 *param0, u32 param1); +static void ov66_02230510(UnkStruct_ov66_022302B0 *param0, u32 param1, int param2); +static BOOL ov66_02230544(const UnkStruct_ov66_022302B0 *param0, u32 param1, int param2); +static int ov66_02230580(const UnkStruct_ov66_022302B0 *param0, u32 param1); +static void ov66_022305B0(s32 param0, const void *param1, u32 param2, void *param3); +static void ov66_02230664(s32 param0, const void *param1, u32 param2, void *param3); +static void ov66_022306C4(s32 param0, const void *param1, u32 param2, void *param3); +static void ov66_02230728(s32 param0, const void *param1, u32 param2, void *param3); +static void ov66_02230750(s32 param0, const void *param1, u32 param2, void *param3); +static void ov66_02230764(s32 param0, const void *param1, u32 param2, void *param3); +static void ov66_02230780(s32 param0, const void *param1, u32 param2, void *param3); +static void ov66_022307B4(s32 param0, const void *param1, u32 param2, void *param3); +static void ov66_022307D4(UnkStruct_ov66_022307D4 *param0); +static void ov66_022307F0(UnkStruct_ov66_022307D4 *param0, u32 param1, u32 param2); +static u32 ov66_02230828(const UnkStruct_ov66_022307D4 *param0); +static void ov66_0223086C(UnkStruct_ov66_02232068 *param0, u32 param1, BOOL param2); +static BOOL ov66_02230884(const UnkStruct_ov66_02232068 *param0, u32 param1); +static void ov66_022308A0(UnkStruct_ov66_022308A0 *param0, u32 param1); +static void ov66_022308BC(UnkStruct_ov66_022308A0 *param0); +static void ov66_022308C8(UnkStruct_ov66_022308A0 *param0, u32 param1, BOOL param2, u32 param3); +static BOOL ov66_022308F8(const UnkStruct_ov66_022308A0 *param0, u32 param1); +static const UnkStruct_ov66_02230914 *ov66_02230914(const UnkStruct_ov66_022308A0 *param0, u32 param1); +static void ov66_02230938(UnkStruct_02014FB0 *param0, u32 param1, UnkStruct_ov66_02230914 *param2); +static void ov66_022309A4(UnkStruct_ov66_022309A4 *param0, u32 param1, u32 param2); +static void ov66_022309B4(UnkStruct_ov66_022309A4 *param0); +static void ov66_022309C8(UnkStruct_ov66_022309A4 *param0); +static u32 ov66_02230A64(const UnkStruct_ov66_022309A4 *param0); +static int ov66_02230A68(const UnkStruct_ov66_022309A4 *param0); +static void ov66_02230A6C(UnkStruct_ov66_02230A6C *param0, const SaveData *param1); +static void ov66_02230A9C(UnkStruct_ov66_02230A6C *param0, int param1, s32 param2); +static BOOL ov66_02230AF8(UnkStruct_ov66_02230A6C *param0, s32 param1, s32 param2); +static int ov66_02230B28(UnkStruct_ov66_02230A6C *param0); +static int ov66_02230B78(UnkStruct_ov66_02230A6C *param0, u32 param1); +static s32 ov66_02230BA4(UnkStruct_ov66_02230A6C *param0, u32 param1); +static void ov66_02230BCC(UnkStruct_ov66_02230A6C *param0); +static void ov66_02230BE0(UnkStruct_ov66_02230A6C *param0); +static BOOL ov66_02230C04(const UnkStruct_ov66_02230A6C *param0); static u32 ov66_02230C0C(u32 param0); static u32 ov66_02230C2C(u32 param0); @@ -381,46 +375,46 @@ static const s32 Unk_ov66_0225892C[9] = { }; static const UnkStruct_ov66_02258974 Unk_ov66_02258974[16] = { - {0x3, 0x0}, - {0x5, 0x0}, - {0xB, 0x0}, - {0x1F, 0x0}, - {0x32, 0x0}, - {0x33, 0x0}, - {0x3E, 0x0}, - {0x46, 0x0}, - {0x6, 0x1}, - {0x7, 0x1}, - {0xD, 0x1}, - {0xE, 0x1}, - {0x23, 0x1}, - {0x25, 0x1}, - {0x2A, 0x1}, - {0x3F, 0x1} + { 0x3, 0x0 }, + { 0x5, 0x0 }, + { 0xB, 0x0 }, + { 0x1F, 0x0 }, + { 0x32, 0x0 }, + { 0x33, 0x0 }, + { 0x3E, 0x0 }, + { 0x46, 0x0 }, + { 0x6, 0x1 }, + { 0x7, 0x1 }, + { 0xD, 0x1 }, + { 0xE, 0x1 }, + { 0x23, 0x1 }, + { 0x25, 0x1 }, + { 0x2A, 0x1 }, + { 0x3F, 0x1 } }; static const UnkStruct_ov66_02258918 Unk_ov66_02258918[] = { - {0x2, 0x50}, - {0x1, 0x2}, - {0x3, 0x8E}, - {0x1, 0x2}, - {0x4, 0x1E} + { 0x2, 0x50 }, + { 0x1, 0x2 }, + { 0x3, 0x8E }, + { 0x1, 0x2 }, + { 0x4, 0x1E } }; static const UnkStruct_ov66_022589B4 Unk_ov66_022589B4[8] = { - {ov66_022305B0, sizeof(UnkStruct_ov66_022305B0)}, - {ov66_02230664, sizeof(UnkStruct_ov66_022305B0)}, - {ov66_022306C4, sizeof(UnkStruct_ov66_022305B0)}, - {ov66_02230728, sizeof(UnkStruct_ov66_022305B0)}, - {ov66_02230750, sizeof(UnkStruct_ov66_0222E990)}, - {ov66_02230764, sizeof(u32)}, - {ov66_02230780, sizeof(u32)}, - {ov66_022307B4, sizeof(u32)} + { ov66_022305B0, sizeof(UnkStruct_ov66_022305B0) }, + { ov66_02230664, sizeof(UnkStruct_ov66_022305B0) }, + { ov66_022306C4, sizeof(UnkStruct_ov66_022305B0) }, + { ov66_02230728, sizeof(UnkStruct_ov66_022305B0) }, + { ov66_02230750, sizeof(UnkStruct_ov66_0222E990) }, + { ov66_02230764, sizeof(u32) }, + { ov66_02230780, sizeof(u32) }, + { ov66_022307B4, sizeof(u32) } }; -UnkStruct_ov66_0222DFF8 * ov66_0222DDF0 (SaveData * param0, u32 param1) +UnkStruct_ov66_0222DFF8 *ov66_0222DDF0(SaveData *param0, u32 param1) { - UnkStruct_ov66_0222DFF8 * v0; + UnkStruct_ov66_0222DFF8 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov66_0222DFF8)); memset(v0, 0, sizeof(UnkStruct_ov66_0222DFF8)); @@ -464,10 +458,10 @@ UnkStruct_ov66_0222DFF8 * ov66_0222DDF0 (SaveData * param0, u32 param1) return v0; } -void ov66_0222DEEC (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222DEEC(UnkStruct_ov66_0222DFF8 *param0) { { - UnkStruct_02030EC4 * v0; + UnkStruct_02030EC4 *v0; UnkStruct_ov66_0222E908 v1; ov66_0222E908(¶m0->unk_108.unk_20, &v1); @@ -499,7 +493,7 @@ void ov66_0222DEEC (UnkStruct_ov66_0222DFF8 * param0) Heap_FreeToHeap(param0); } -void ov66_0222DF58 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222DF58(UnkStruct_ov66_0222DFF8 *param0) { ov66_022317C0(param0->unk_04.unk_00); @@ -537,39 +531,39 @@ void ov66_0222DF58 (UnkStruct_ov66_0222DFF8 * param0) } } -void ov66_0222DFF4 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222DFF4(UnkStruct_ov66_0222DFF8 *param0) { return; } -int ov66_0222DFF8 (const UnkStruct_ov66_0222DFF8 * param0) +int ov66_0222DFF8(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_52C; } -BOOL ov66_0222E004 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E004(const UnkStruct_ov66_0222DFF8 *param0) { return ov66_022328CC(); } -UnkStruct_ov66_0223177C * ov66_0222E00C (UnkStruct_ov66_0222DFF8 * param0) +UnkStruct_ov66_0223177C *ov66_0222E00C(UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_04.unk_00; } -const UnkStruct_ov66_02231560 * ov66_0222E010 (UnkStruct_ov66_0222DFF8 * param0) +const UnkStruct_ov66_02231560 *ov66_0222E010(UnkStruct_ov66_0222DFF8 *param0) { ov66_0222F6C4(¶m0->unk_108, ¶m0->unk_04.unk_08); return ¶m0->unk_04.unk_08; } -const UnkStruct_ov66_02231428 * ov66_0222E028 (const UnkStruct_ov66_0222DFF8 * param0) +const UnkStruct_ov66_02231428 *ov66_0222E028(const UnkStruct_ov66_0222DFF8 *param0) { return ¶m0->unk_04.unk_D0; } -BOOL ov66_0222E02C (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +BOOL ov66_0222E02C(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { if (param0->unk_F8.unk_00 & (1 << param1)) { param0->unk_F8.unk_00 &= ~(1 << param1); @@ -579,7 +573,7 @@ BOOL ov66_0222E02C (UnkStruct_ov66_0222DFF8 * param0, u32 param1) return 0; } -BOOL ov66_0222E058 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +BOOL ov66_0222E058(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { if (param0->unk_F8.unk_04 & (1 << param1)) { param0->unk_F8.unk_04 &= ~(1 << param1); @@ -589,7 +583,7 @@ BOOL ov66_0222E058 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) return 0; } -BOOL ov66_0222E084 (UnkStruct_ov66_0222DFF8 * param0, int param1) +BOOL ov66_0222E084(UnkStruct_ov66_0222DFF8 *param0, int param1) { if (param0->unk_F8.unk_08 & (1 << param1)) { return 1; @@ -598,7 +592,7 @@ BOOL ov66_0222E084 (UnkStruct_ov66_0222DFF8 * param0, int param1) return 0; } -BOOL ov66_0222E09C (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +BOOL ov66_0222E09C(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { if (param0->unk_F8.unk_0C & (1 << param1)) { param0->unk_F8.unk_0C &= ~(1 << param1); @@ -608,46 +602,46 @@ BOOL ov66_0222E09C (UnkStruct_ov66_0222DFF8 * param0, u32 param1) return 0; } -SaveData * ov66_0222E0C4 (UnkStruct_ov66_0222DFF8 * param0) +SaveData *ov66_0222E0C4(UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_00; } -BOOL ov66_0222E0C8 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E0C8(const UnkStruct_ov66_0222DFF8 *param0) { GF_ASSERT(param0); return ov66_02232BEC(UnkEnum_ov66_02232BEC_04); } -BOOL ov66_0222E0DC (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E0DC(const UnkStruct_ov66_0222DFF8 *param0) { GF_ASSERT(param0); return param0->unk_1FC.unk_0F_0; } -BOOL ov66_0222E0F4 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E0F4(const UnkStruct_ov66_0222DFF8 *param0) { GF_ASSERT(param0); return param0->unk_1FC.unk_0F_4; } -void ov66_0222E10C (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222E10C(UnkStruct_ov66_0222DFF8 *param0) { param0->unk_1FC.unk_0F_4 = 1; } -BOOL ov66_0222E120 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E120(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_1FC.unk_00_0; } -BOOL ov66_0222E12C (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E12C(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_1FC.unk_00_7; } -BOOL ov66_0222E138 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E138(const UnkStruct_ov66_0222DFF8 *param0) { if ((param0->unk_1FC.unk_00_1 == 1) && (param0->unk_1FC.unk_04 <= 0)) { return 1; @@ -656,16 +650,16 @@ BOOL ov66_0222E138 (const UnkStruct_ov66_0222DFF8 * param0) } } -int ov66_0222E158 (const UnkStruct_ov66_0222DFF8 * param0) +int ov66_0222E158(const UnkStruct_ov66_0222DFF8 *param0) { - if ((param0->unk_1FC.unk_08 <= 0)) { + if (param0->unk_1FC.unk_08 <= 0) { return param0->unk_1FC.unk_00_2; } return 0; } -BOOL ov66_0222E170 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E170(const UnkStruct_ov66_0222DFF8 *param0) { if ((param0->unk_1FC.unk_00_4 == 1) && (param0->unk_1FC.unk_0A <= 0)) { return 1; @@ -674,12 +668,12 @@ BOOL ov66_0222E170 (const UnkStruct_ov66_0222DFF8 * param0) return 0; } -BOOL ov66_0222E190 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E190(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_1FC.unk_00_5; } -BOOL ov66_0222E19C (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E19C(const UnkStruct_ov66_0222DFF8 *param0) { if ((param0->unk_04.unk_04 == 1) && (param0->unk_1FC.unk_06 <= 0)) { return 1; @@ -688,59 +682,59 @@ BOOL ov66_0222E19C (const UnkStruct_ov66_0222DFF8 * param0) return 0; } -PPW_LOBBY_TIME_EVENT ov66_0222E1B8 (const UnkStruct_ov66_0222DFF8 * param0) +PPW_LOBBY_TIME_EVENT ov66_0222E1B8(const UnkStruct_ov66_0222DFF8 *param0) { - if ((param0->unk_1FC.unk_06 <= 0)) { + if (param0->unk_1FC.unk_06 <= 0) { return param0->unk_1FC.unk_01; } return PPW_LOBBY_TIME_EVENT_NEON_A0; } -PPW_LOBBY_TIME_EVENT ov66_0222E1D0 (const UnkStruct_ov66_0222DFF8 * param0) +PPW_LOBBY_TIME_EVENT ov66_0222E1D0(const UnkStruct_ov66_0222DFF8 *param0) { - if ((param0->unk_1FC.unk_06 <= 0)) { + if (param0->unk_1FC.unk_06 <= 0) { return param0->unk_1FC.unk_02; } return PPW_LOBBY_TIME_EVENT_NEON_B0; } -PPW_LOBBY_TIME_EVENT ov66_0222E1E8 (const UnkStruct_ov66_0222DFF8 * param0) +PPW_LOBBY_TIME_EVENT ov66_0222E1E8(const UnkStruct_ov66_0222DFF8 *param0) { - if ((param0->unk_1FC.unk_06 <= 0)) { + if (param0->unk_1FC.unk_06 <= 0) { return param0->unk_1FC.unk_03; } return PPW_LOBBY_TIME_EVENT_NEON_C0; } -void ov66_0222E200 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222E200(UnkStruct_ov66_0222DFF8 *param0) { ov66_0222FBC8(¶m0->unk_3A0); } -BOOL ov66_0222E210 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E210(const UnkStruct_ov66_0222DFF8 *param0) { return ov66_0222FBD0(¶m0->unk_3A0); } -BOOL ov66_0222E220 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E220(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_508.unk_04; } -void ov66_0222E22C (UnkStruct_ov66_0222DFF8 * param0, BOOL param1) +void ov66_0222E22C(UnkStruct_ov66_0222DFF8 *param0, BOOL param1) { param0->unk_508.unk_04 = param1; } -void ov66_0222E238 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222E238(UnkStruct_ov66_0222DFF8 *param0) { MI_CpuClear32(¶m0->unk_3DF, sizeof(UnkStruct_ov66_0222E294)); } -void ov66_0222E24C (UnkStruct_ov66_0222DFF8 * param0, s32 param1, u32 param2) +void ov66_0222E24C(UnkStruct_ov66_0222DFF8 *param0, s32 param1, u32 param2) { u32 v0; @@ -751,7 +745,7 @@ void ov66_0222E24C (UnkStruct_ov66_0222DFF8 * param0, s32 param1, u32 param2) param0->unk_3DF.unk_00[param2] = v0; } -void ov66_0222E27C (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +void ov66_0222E27C(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { s32 v0; @@ -759,27 +753,27 @@ void ov66_0222E27C (UnkStruct_ov66_0222DFF8 * param0, u32 param1) ov66_0222E24C(param0, v0, param1); } -void ov66_0222E294 (const UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov66_0222E294 * param1) +void ov66_0222E294(const UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov66_0222E294 *param1) { MI_CpuCopy8(¶m0->unk_3DF, param1, sizeof(UnkStruct_ov66_0222E294)); } -void ov66_0222E2A4 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222E2A4(UnkStruct_ov66_0222DFF8 *param0) { ov66_0222FC4C(¶m0->unk_3A0); } -BOOL ov66_0222E2B4 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222E2B4(const UnkStruct_ov66_0222DFF8 *param0) { return ov66_0222FC54(¶m0->unk_3A0); } -void ov66_0222E2C4 (UnkStruct_ov66_0222DFF8 * param0, BOOL param1) +void ov66_0222E2C4(UnkStruct_ov66_0222DFF8 *param0, BOOL param1) { param0->unk_1FC.unk_0C = param1; } -void ov66_0222E2CC (const UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222E2CC(const UnkStruct_ov66_0222DFF8 *param0) { if ((param0->unk_1FC.unk_00_4 == 1) && (param0->unk_1FC.unk_0A <= 0)) { sub_02004550(21, 1213, 0); @@ -790,26 +784,26 @@ void ov66_0222E2CC (const UnkStruct_ov66_0222DFF8 * param0) } } -void ov66_0222E31C (UnkStruct_ov66_0222DFF8 * param0, BOOL param1) +void ov66_0222E31C(UnkStruct_ov66_0222DFF8 *param0, BOOL param1) { - if ((param1 != param0->unk_1FC.unk_0D)) { + if (param1 != param0->unk_1FC.unk_0D) { param0->unk_1FC.unk_0D = param1; ov66_0222FBAC(¶m0->unk_1FC); } } -u32 ov66_0222E338 (const UnkStruct_ov66_0222DFF8 * param0) +u32 ov66_0222E338(const UnkStruct_ov66_0222DFF8 *param0) { s32 v0 = ov66_022328F0(); return ov66_02232B78(v0); } -s32 ov66_0222E344 (const UnkStruct_ov66_0222DFF8 * param0) +s32 ov66_0222E344(const UnkStruct_ov66_0222DFF8 *param0) { return ov66_022328F0(); } -BOOL ov66_0222E34C (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +BOOL ov66_0222E34C(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { UnkStruct_ov66_02232B20 v0; @@ -822,11 +816,11 @@ BOOL ov66_0222E34C (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) return 0; } -const UnkStruct_ov66_0222E71C * ov66_0222E374 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +const UnkStruct_ov66_0222E71C *ov66_0222E374(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { s32 v0; UnkStruct_ov66_02232B20 v1; - const UnkStruct_ov66_0222E71C * v2; + const UnkStruct_ov66_0222E71C *v2; GF_ASSERT(param1 < 20); @@ -847,7 +841,7 @@ const UnkStruct_ov66_0222E71C * ov66_0222E374 (const UnkStruct_ov66_0222DFF8 * p return v2; } -UnkStruct_ov66_0222E71C * ov66_0222E3BC (UnkStruct_ov66_0222DFF8 * param0) +UnkStruct_ov66_0222E71C *ov66_0222E3BC(UnkStruct_ov66_0222DFF8 *param0) { if (ov66_0222FA04(¶m0->unk_108, param0->unk_00) == 0) { param0->unk_52C = 1; @@ -856,7 +850,7 @@ UnkStruct_ov66_0222E71C * ov66_0222E3BC (UnkStruct_ov66_0222DFF8 * param0) return ¶m0->unk_108.unk_20; } -void ov66_0222E3E4 (UnkStruct_ov66_0222DFF8 * param0, int param1) +void ov66_0222E3E4(UnkStruct_ov66_0222DFF8 *param0, int param1) { s32 v0; @@ -915,7 +909,7 @@ void ov66_0222E3E4 (UnkStruct_ov66_0222DFF8 * param0, int param1) ov66_0222F964(param0); } -void ov66_0222E500 (UnkStruct_ov66_0222DFF8 * param0, int param1, s32 param2) +void ov66_0222E500(UnkStruct_ov66_0222DFF8 *param0, int param1, s32 param2) { GF_ASSERT(param1 < 24); @@ -923,7 +917,7 @@ void ov66_0222E500 (UnkStruct_ov66_0222DFF8 * param0, int param1, s32 param2) ov66_0222F964(param0); } -void ov66_0222E528 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +void ov66_0222E528(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { GF_ASSERT(param1 < 27); @@ -938,7 +932,7 @@ void ov66_0222E528 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) ov66_0222F964(param0); } -void ov66_0222E56C (UnkStruct_ov66_0222DFF8 * param0, int param1, int param2) +void ov66_0222E56C(UnkStruct_ov66_0222DFF8 *param0, int param1, int param2) { GF_ASSERT(param1 < 18); GF_ASSERT(param2 < 18); @@ -968,7 +962,7 @@ void ov66_0222E56C (UnkStruct_ov66_0222DFF8 * param0, int param1, int param2) ov66_0222F964(param0); } -void ov66_0222E5D8 (UnkStruct_ov66_0222DFF8 * param0, u32 param1, u32 param2) +void ov66_0222E5D8(UnkStruct_ov66_0222DFF8 *param0, u32 param1, u32 param2) { GF_ASSERT(param2 < 3); @@ -990,7 +984,7 @@ void ov66_0222E5D8 (UnkStruct_ov66_0222DFF8 * param0, u32 param1, u32 param2) ov66_0222F964(param0); } -void ov66_0222E640 (const UnkStruct_ov66_0222E71C * param0, TrainerInfo * param1, u32 param2) +void ov66_0222E640(const UnkStruct_ov66_0222E71C *param0, TrainerInfo *param1, u32 param2) { BOOL v0; BOOL v1; @@ -1002,8 +996,8 @@ void ov66_0222E640 (const UnkStruct_ov66_0222E71C * param0, TrainerInfo * param1 TrainerInfo_SetName(param1, param0->unk_08); { - Strbuf* v2; - Strbuf* v3; + Strbuf *v2; + Strbuf *v3; v3 = Strbuf_Init((7 + 1) * 4, param2); v2 = Strbuf_Init((7 + 1) * 4, param2); @@ -1022,8 +1016,8 @@ void ov66_0222E640 (const UnkStruct_ov66_0222E71C * param0, TrainerInfo * param1 } if (v1) { - MessageLoader * v4; - Strbuf* v5; + MessageLoader *v4; + Strbuf *v5; v4 = MessageLoader_Init(1, 26, 673, param2); v5 = MessageLoader_GetNewStrbuf(v4, 64); @@ -1040,7 +1034,7 @@ void ov66_0222E640 (const UnkStruct_ov66_0222E71C * param0, TrainerInfo * param1 TrainerInfo_SetMainStoryCleared(param1); } -u32 ov66_0222E71C (const UnkStruct_ov66_0222E71C * param0) +u32 ov66_0222E71C(const UnkStruct_ov66_0222E71C *param0) { if (param0->unk_43 >= 14) { return 14; @@ -1049,7 +1043,7 @@ u32 ov66_0222E71C (const UnkStruct_ov66_0222E71C * param0) return param0->unk_43; } -int ov66_0222E728 (const UnkStruct_ov66_0222E71C * param0, u32 param1) +int ov66_0222E728(const UnkStruct_ov66_0222E71C *param0, u32 param1) { int v0; int v1; @@ -1071,7 +1065,7 @@ int ov66_0222E728 (const UnkStruct_ov66_0222E71C * param0, u32 param1) return 24; } -s32 ov66_0222E760 (const UnkStruct_ov66_0222E71C * param0, u32 param1) +s32 ov66_0222E760(const UnkStruct_ov66_0222E71C *param0, u32 param1) { int v0; int v1; @@ -1093,17 +1087,17 @@ s32 ov66_0222E760 (const UnkStruct_ov66_0222E71C * param0, u32 param1) return DWC_LOBBY_INVALID_USER_ID; } -s32 ov66_0222E798 (const UnkStruct_ov66_0222E71C * param0) +s32 ov66_0222E798(const UnkStruct_ov66_0222E71C *param0) { return param0->unk_00; } -u32 ov66_0222E79C (const UnkStruct_ov66_0222E71C * param0) +u32 ov66_0222E79C(const UnkStruct_ov66_0222E71C *param0) { return param0->unk_04; } -int ov66_0222E7A0 (const UnkStruct_ov66_0222E71C * param0) +int ov66_0222E7A0(const UnkStruct_ov66_0222E71C *param0) { u32 v0; int v1; @@ -1119,12 +1113,12 @@ int ov66_0222E7A0 (const UnkStruct_ov66_0222E71C * param0) return 24; } -UnkStruct_ov66_02231428 ov66_0222E7C4 (const UnkStruct_ov66_0222E71C * param0) +UnkStruct_ov66_02231428 ov66_0222E7C4(const UnkStruct_ov66_0222E71C *param0) { return param0->unk_1C; } -u32 ov66_0222E7C8 (const UnkStruct_ov66_0222E71C * param0) +u32 ov66_0222E7C8(const UnkStruct_ov66_0222E71C *param0) { u32 v0; int v1; @@ -1149,7 +1143,7 @@ u32 ov66_0222E7C8 (const UnkStruct_ov66_0222E71C * param0) return v0; } -u32 ov66_0222E80C (const UnkStruct_ov66_0222E71C * param0) +u32 ov66_0222E80C(const UnkStruct_ov66_0222E71C *param0) { u32 v0; @@ -1162,7 +1156,7 @@ u32 ov66_0222E80C (const UnkStruct_ov66_0222E71C * param0) return v0; } -BOOL ov66_0222E824 (const UnkStruct_ov66_0222E71C * param0) +BOOL ov66_0222E824(const UnkStruct_ov66_0222E71C *param0) { switch (param0->unk_39) { case 1: @@ -1179,12 +1173,12 @@ BOOL ov66_0222E824 (const UnkStruct_ov66_0222E71C * param0) return 0; } -u32 ov66_0222E850 (const UnkStruct_ov66_0222E71C * param0) +u32 ov66_0222E850(const UnkStruct_ov66_0222E71C *param0) { return param0->unk_39; } -u32 ov66_0222E858 (const UnkStruct_ov66_0222E71C * param0) +u32 ov66_0222E858(const UnkStruct_ov66_0222E71C *param0) { u32 v0; @@ -1201,7 +1195,7 @@ u32 ov66_0222E858 (const UnkStruct_ov66_0222E71C * param0) return 0x6; } -u32 ov66_0222E880 (const UnkStruct_ov66_0222E71C * param0) +u32 ov66_0222E880(const UnkStruct_ov66_0222E71C *param0) { u32 v0; @@ -1209,7 +1203,7 @@ u32 ov66_0222E880 (const UnkStruct_ov66_0222E71C * param0) v0 = 0; } else { if (ov66_022316C4(param0->unk_3C, param0->unk_3E) == 0) { - return(0); + return 0; } v0 = param0->unk_3C; @@ -1218,7 +1212,7 @@ u32 ov66_0222E880 (const UnkStruct_ov66_0222E71C * param0) return v0; } -u32 ov66_0222E8A4 (const UnkStruct_ov66_0222E71C * param0) +u32 ov66_0222E8A4(const UnkStruct_ov66_0222E71C *param0) { u32 v0; @@ -1231,7 +1225,7 @@ u32 ov66_0222E8A4 (const UnkStruct_ov66_0222E71C * param0) return v0; } -u32 ov66_0222E8C4 (const UnkStruct_ov66_0222E71C * param0) +u32 ov66_0222E8C4(const UnkStruct_ov66_0222E71C *param0) { u32 v0; @@ -1248,7 +1242,7 @@ u32 ov66_0222E8C4 (const UnkStruct_ov66_0222E71C * param0) return v0; } -BOOL ov66_0222E8D8 (const UnkStruct_ov66_0222E71C * param0) +BOOL ov66_0222E8D8(const UnkStruct_ov66_0222E71C *param0) { if (param0->unk_41 == 0xff) { return 0; @@ -1257,7 +1251,7 @@ BOOL ov66_0222E8D8 (const UnkStruct_ov66_0222E71C * param0) return 1; } -int ov66_0222E8E8 (const UnkStruct_ov66_0222E71C * param0, u32 param1) +int ov66_0222E8E8(const UnkStruct_ov66_0222E71C *param0, u32 param1) { GF_ASSERT(param1 < 2); @@ -1268,39 +1262,39 @@ int ov66_0222E8E8 (const UnkStruct_ov66_0222E71C * param0, u32 param1) return param0->unk_88[param1]; } -void ov66_0222E908 (const UnkStruct_ov66_0222E71C * param0, UnkStruct_ov66_0222E908 * param1) +void ov66_0222E908(const UnkStruct_ov66_0222E71C *param0, UnkStruct_ov66_0222E908 *param1) { *param1 = param0->unk_8C; } -TrainerInfo * ov66_0222E918 (const UnkStruct_ov66_0222DFF8 * param0) +TrainerInfo *ov66_0222E918(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_508.unk_00; } -BOOL ov66_0222E924 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +BOOL ov66_0222E924(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { return ov66_02230884(¶m0->unk_3CB, param1); } -void ov66_0222E934 (const UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov66_02232068 * param1) +void ov66_0222E934(const UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov66_02232068 *param1) { - UnkStruct_ov66_02232068 * v0; + UnkStruct_ov66_02232068 *v0; MI_CpuCopy8(¶m0->unk_3CB, param1, sizeof(UnkStruct_ov66_02232068)); } -BOOL ov66_0222E944 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +BOOL ov66_0222E944(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { return ov66_022308F8(¶m0->unk_3E4, param1); } -const UnkStruct_ov66_02230914 * ov66_0222E954 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +const UnkStruct_ov66_02230914 *ov66_0222E954(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { return ov66_02230914(¶m0->unk_3E4, param1); } -u32 ov66_0222E964 (const UnkStruct_ov66_0222DFF8 * param0) +u32 ov66_0222E964(const UnkStruct_ov66_0222DFF8 *param0) { UnkStruct_ov66_02232B20 v0; @@ -1308,7 +1302,7 @@ u32 ov66_0222E964 (const UnkStruct_ov66_0222DFF8 * param0) return v0.unk_00; } -u32 ov66_0222E974 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +u32 ov66_0222E974(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { u32 v0; @@ -1321,9 +1315,9 @@ u32 ov66_0222E974 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) return ov66_02232B78(v0); } -void ov66_0222E990 (UnkStruct_ov66_0222DFF8 * param0, u32 param1, u32 param2) +void ov66_0222E990(UnkStruct_ov66_0222DFF8 *param0, u32 param1, u32 param2) { - UnkStruct_ov66_0222E990 v0 = {0}; + UnkStruct_ov66_0222E990 v0 = { 0 }; v0.unk_11 = 0; v0.unk_00[0] = ov66_02232BA0(param1); @@ -1333,9 +1327,9 @@ void ov66_0222E990 (UnkStruct_ov66_0222DFF8 * param0, u32 param1, u32 param2) ov66_02232E00(4, &v0, sizeof(UnkStruct_ov66_0222E990)); } -void ov66_0222E9CC (UnkStruct_ov66_0222DFF8 * param0, u32 param1, u32 param2, u32 param3) +void ov66_0222E9CC(UnkStruct_ov66_0222DFF8 *param0, u32 param1, u32 param2, u32 param3) { - UnkStruct_ov66_0222E990 v0 = {0}; + UnkStruct_ov66_0222E990 v0 = { 0 }; v0.unk_11 = 1; v0.unk_00[0] = ov66_02232BA0(param2); @@ -1346,9 +1340,9 @@ void ov66_0222E9CC (UnkStruct_ov66_0222DFF8 * param0, u32 param1, u32 param2, u3 ov66_02232E00(4, &v0, sizeof(UnkStruct_ov66_0222E990)); } -void ov66_0222EA10 (UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7) +void ov66_0222EA10(UnkStruct_ov66_0222DFF8 *param0, enum PlazaMinigame param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7) { - UnkStruct_ov66_0222E990 v0 = {0}; + UnkStruct_ov66_0222E990 v0 = { 0 }; u32 v1; switch (param1) { @@ -1383,9 +1377,9 @@ void ov66_0222EA10 (UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1, ov66_02232E00(4, &v0, sizeof(UnkStruct_ov66_0222E990)); } -void ov66_0222EAB4 (UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6) +void ov66_0222EAB4(UnkStruct_ov66_0222DFF8 *param0, enum PlazaMinigame param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6) { - UnkStruct_ov66_0222E990 v0 = {0}; + UnkStruct_ov66_0222E990 v0 = { 0 }; u32 v1; switch (param1) { @@ -1409,7 +1403,7 @@ void ov66_0222EAB4 (UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1, ov66_02232E00(4, &v0, sizeof(UnkStruct_ov66_0222E990)); } -u32 ov66_0222EB28 (const UnkStruct_ov66_0222DFF8 * param0) +u32 ov66_0222EB28(const UnkStruct_ov66_0222DFF8 *param0) { u32 v0; @@ -1422,7 +1416,7 @@ u32 ov66_0222EB28 (const UnkStruct_ov66_0222DFF8 * param0) return v0; } -u32 ov66_0222EB38 (const UnkStruct_ov66_0222DFF8 * param0) +u32 ov66_0222EB38(const UnkStruct_ov66_0222DFF8 *param0) { u32 v0; @@ -1435,7 +1429,7 @@ u32 ov66_0222EB38 (const UnkStruct_ov66_0222DFF8 * param0) return v0; } -u32 ov66_0222EB48 (const UnkStruct_ov66_0222DFF8 * param0) +u32 ov66_0222EB48(const UnkStruct_ov66_0222DFF8 *param0) { u32 v0; @@ -1445,13 +1439,13 @@ u32 ov66_0222EB48 (const UnkStruct_ov66_0222DFF8 * param0) return v0; } -BOOL ov66_0222EB54 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +BOOL ov66_0222EB54(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { GF_ASSERT(param1 < 20); return param0->unk_1E8.unk_00[param1]; } -void ov66_0222EB6C (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +void ov66_0222EB6C(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { u32 v0; @@ -1459,86 +1453,86 @@ void ov66_0222EB6C (UnkStruct_ov66_0222DFF8 * param0, u32 param1) ov66_02232E00(5, &v0, sizeof(u32)); } -int ov66_0222EB7C (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +int ov66_0222EB7C(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { return ov66_0223040C(¶m0->unk_20C, param1); } -u32 ov66_0222EB8C (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +u32 ov66_0222EB8C(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { return ov66_02230424(¶m0->unk_20C, param1); } -u32 ov66_0222EB9C (const UnkStruct_ov66_0222DFF8 * param0) +u32 ov66_0222EB9C(const UnkStruct_ov66_0222DFF8 *param0) { return 40 * 30; } -u32 ov66_0222EBA4 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +u32 ov66_0222EBA4(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { return ov66_022304DC(¶m0->unk_20C, param1); } -u32 ov66_0222EBB4 (UnkStruct_ov66_0222DFF8 * param0, u32 param1, int param2) +u32 ov66_0222EBB4(UnkStruct_ov66_0222DFF8 *param0, u32 param1, int param2) { return ov66_02230330(¶m0->unk_20C, param1, param2); } -void ov66_0222EBC4 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +void ov66_0222EBC4(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { ov66_022303A8(¶m0->unk_20C, param1); } -void ov66_0222EBD4 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +void ov66_0222EBD4(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { ov66_0223043C(¶m0->unk_20C, param1); } -BOOL ov66_0222EBE4 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +BOOL ov66_0222EBE4(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { return ov66_02230474(¶m0->unk_20C, param1); } -void ov66_0222EBF4 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +void ov66_0222EBF4(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { ov66_022304A8(¶m0->unk_20C, param1); } -void ov66_0222EC04 (u32 param0, u32 * param1, u32 * param2) +void ov66_0222EC04(u32 param0, u32 *param1, u32 *param2) { inline_ov66_0222EC04(param0, param1, param2); } -void ov66_0222EC20 (UnkStruct_ov66_0222DFF8 * param0, u32 param1, int param2) +void ov66_0222EC20(UnkStruct_ov66_0222DFF8 *param0, u32 param1, int param2) { ov66_02230510(¶m0->unk_20C, param1, param2); } -int ov66_0222EC30 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +int ov66_0222EC30(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { return ov66_02230580(¶m0->unk_20C, param1); } -void ov66_0222EC40 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222EC40(UnkStruct_ov66_0222DFF8 *param0) { u32 v0; ov66_02232E00(6, &v0, sizeof(u32)); } -void ov66_0222EC50 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222EC50(UnkStruct_ov66_0222DFF8 *param0) { u32 v0; ov66_02232E00(7, &v0, sizeof(u32)); } -void ov66_0222EC60 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222EC60(UnkStruct_ov66_0222DFF8 *param0) { ov66_0222FC74(¶m0->unk_1C0); } -BOOL ov66_0222EC70 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +BOOL ov66_0222EC70(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { s32 v0; @@ -1547,7 +1541,7 @@ BOOL ov66_0222EC70 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) } { - const UnkStruct_ov66_0222E71C * v1 = ov66_0222E374(param0, param1); + const UnkStruct_ov66_0222E71C *v1 = ov66_0222E374(param0, param1); u32 v2 = ov66_0222E71C(v1); if (v2 != 1) { @@ -1567,17 +1561,17 @@ BOOL ov66_0222EC70 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) return 1; } -void ov66_0222ECD4 (UnkStruct_ov66_0222DFF8 * param0, u16 param1) +void ov66_0222ECD4(UnkStruct_ov66_0222DFF8 *param0, u16 param1) { BOOL v0 = 0; s32 v1; - if ((param0->unk_1C0.unk_0A == 1)) { + if (param0->unk_1C0.unk_0A == 1) { if (param0->unk_1C0.unk_06 != 2) { v0 = 1; } } else { - if ((param0->unk_1C0.unk_0A == 2)) { + if (param0->unk_1C0.unk_0A == 2) { if (param0->unk_1C0.unk_06 != 3) { v0 = 1; } @@ -1609,7 +1603,7 @@ void ov66_0222ECD4 (UnkStruct_ov66_0222DFF8 * param0, u16 param1) ov66_0222FD70(¶m0->unk_1C0); } -void ov66_0222ED7C (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222ED7C(UnkStruct_ov66_0222DFF8 *param0) { s32 v0; @@ -1628,7 +1622,7 @@ void ov66_0222ED7C (UnkStruct_ov66_0222DFF8 * param0) ov66_0222FC74(¶m0->unk_1C0); } -void ov66_0222EDC0 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222EDC0(UnkStruct_ov66_0222DFF8 *param0) { s32 v0; @@ -1644,7 +1638,7 @@ void ov66_0222EDC0 (UnkStruct_ov66_0222DFF8 * param0) ov66_02232E5C(2, v0, ¶m0->unk_1C0.unk_20, sizeof(UnkStruct_ov66_022305B0)); } -BOOL ov66_0222EDF4 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222EDF4(const UnkStruct_ov66_0222DFF8 *param0) { if (param0->unk_1C0.unk_0A != 0) { return 1; @@ -1653,7 +1647,7 @@ BOOL ov66_0222EDF4 (const UnkStruct_ov66_0222DFF8 * param0) return 0; } -BOOL ov66_0222EE08 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222EE08(const UnkStruct_ov66_0222DFF8 *param0) { if (param0->unk_1C0.unk_0A == 2) { return 1; @@ -1662,27 +1656,27 @@ BOOL ov66_0222EE08 (const UnkStruct_ov66_0222DFF8 * param0) return 0; } -u32 ov66_0222EE1C (const UnkStruct_ov66_0222DFF8 * param0) +u32 ov66_0222EE1C(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_1C0.unk_04; } -BOOL ov66_0222EE24 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222EE24(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_1C0.unk_0B; } -int ov66_0222EE30 (const UnkStruct_ov66_0222DFF8 * param0) +int ov66_0222EE30(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_1C0.unk_06; } -u16 ov66_0222EE3C (const UnkStruct_ov66_0222DFF8 * param0) +u16 ov66_0222EE3C(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_1C0.unk_08; } -BOOL ov66_0222EE44 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) +BOOL ov66_0222EE44(const UnkStruct_ov66_0222DFF8 *param0, u32 param1) { GF_ASSERT(param1 < 20); @@ -1693,7 +1687,7 @@ BOOL ov66_0222EE44 (const UnkStruct_ov66_0222DFF8 * param0, u32 param1) return 1; } -BOOL ov66_0222EE68 (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222EE68(const UnkStruct_ov66_0222DFF8 *param0) { if (param0->unk_1C0.unk_06 == 4) { return 1; @@ -1706,44 +1700,44 @@ BOOL ov66_0222EE68 (const UnkStruct_ov66_0222DFF8 * param0) return 0; } -s16 ov66_0222EE90 (const UnkStruct_ov66_0222DFF8 * param0) +s16 ov66_0222EE90(const UnkStruct_ov66_0222DFF8 *param0) { return ov66_0222FDBC(¶m0->unk_1C0); } -void ov66_0222EEA0 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222EEA0(UnkStruct_ov66_0222DFF8 *param0) { param0->unk_1C0.unk_07 = 1; } -BOOL ov66_0222EEAC (const UnkStruct_ov66_0222DFF8 * param0) +BOOL ov66_0222EEAC(const UnkStruct_ov66_0222DFF8 *param0) { return param0->unk_1C0.unk_07; } -void ov66_0222EEB8 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222EEB8(UnkStruct_ov66_0222DFF8 *param0) { if (ov66_0222EDF4(param0) == 1) { ov66_0222FCF4(¶m0->unk_1C0, param0->unk_1C0.unk_04); } } -void ov66_0222EED4 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +void ov66_0222EED4(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { ov66_0222FCF4(¶m0->unk_1C0, param1); } -void ov66_0222EEE4 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +void ov66_0222EEE4(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { ov66_0222FCBC(¶m0->unk_1C0, param1); } -void ov66_0222EEF4 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +void ov66_0222EEF4(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { - UnkStruct_ov66_0222E71C * v0; - TrainerInfo * v1; - void * v2; - Journal * v3; + UnkStruct_ov66_0222E71C *v0; + TrainerInfo *v1; + void *v2; + Journal *v3; v3 = SaveData_GetJournal(param0->unk_00); v0 = (UnkStruct_ov66_0222E71C *)ov66_0222E374(param0, param1); @@ -1758,12 +1752,12 @@ void ov66_0222EEF4 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) } } -void ov66_0222EF44 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) +void ov66_0222EF44(UnkStruct_ov66_0222DFF8 *param0, u32 param1) { - UnkStruct_ov66_0222E71C * v0; - TrainerInfo * v1; - void * v2; - Journal * v3; + UnkStruct_ov66_0222E71C *v0; + TrainerInfo *v1; + void *v2; + Journal *v3; v3 = SaveData_GetJournal(param0->unk_00); v0 = (UnkStruct_ov66_0222E71C *)ov66_0222E374(param0, param1); @@ -1779,10 +1773,10 @@ void ov66_0222EF44 (UnkStruct_ov66_0222DFF8 * param0, u32 param1) } } -void ov66_0222EF94 (UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1) +void ov66_0222EF94(UnkStruct_ov66_0222DFF8 *param0, enum PlazaMinigame param1) { - void * v0; - Journal * v1; + void *v0; + Journal *v1; v1 = SaveData_GetJournal(param0->unk_00); @@ -1812,10 +1806,10 @@ void ov66_0222EF94 (UnkStruct_ov66_0222DFF8 * param0, enum PlazaMinigame param1) } } -void ov66_0222F000 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222F000(UnkStruct_ov66_0222DFF8 *param0) { - void * v0; - Journal * v1; + void *v0; + Journal *v1; v1 = SaveData_GetJournal(param0->unk_00); v0 = sub_0202C244(112, 28); @@ -1823,29 +1817,29 @@ void ov66_0222F000 (UnkStruct_ov66_0222DFF8 * param0) sub_0202B758(v1, v0, 4); } -void ov66_0222F020 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222F020(UnkStruct_ov66_0222DFF8 *param0) { - UnkStruct_0202CD88 * v0; + UnkStruct_0202CD88 *v0; v0 = sub_0202CD88(param0->unk_00); sub_0202CF28(v0, (1 + 45)); } -void ov66_0222F030 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222F030(UnkStruct_ov66_0222DFF8 *param0) { - UnkStruct_0202CD88 * v0; + UnkStruct_0202CD88 *v0; v0 = sub_0202CD88(param0->unk_00); - sub_0202CF28(v0, (((70 + 1)) + 47)); + sub_0202CF28(v0, ((70 + 1) + 47)); } -void ov66_0222F040 (UnkStruct_ov66_0222DFF8 * param0, int param1) +void ov66_0222F040(UnkStruct_ov66_0222DFF8 *param0, int param1) { GF_ASSERT(param1 < 8); param0->unk_3A3.unk_00[param1] = 1; } -int ov66_0222F05C (const UnkStruct_ov66_0222DFF8 * param0) +int ov66_0222F05C(const UnkStruct_ov66_0222DFF8 *param0) { int v0; BOOL v1; @@ -1893,7 +1887,7 @@ int ov66_0222F05C (const UnkStruct_ov66_0222DFF8 * param0) return 8; } -u32 ov66_0222F0DC (const UnkStruct_ov66_0222DFF8 * param0) +u32 ov66_0222F0DC(const UnkStruct_ov66_0222DFF8 *param0) { u32 v0; @@ -1906,23 +1900,23 @@ u32 ov66_0222F0DC (const UnkStruct_ov66_0222DFF8 * param0) return v0; } -int ov66_0222F104 (const UnkStruct_ov66_0222DFF8 * param0) +int ov66_0222F104(const UnkStruct_ov66_0222DFF8 *param0) { return ov66_02230A68(¶m0->unk_49C); } -u32 ov66_0222F114 (const UnkStruct_ov66_0222DFF8 * param0) +u32 ov66_0222F114(const UnkStruct_ov66_0222DFF8 *param0) { return ov66_02230A64(¶m0->unk_49C); } -void ov66_0222F124 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov68_0225DC74 * param1) +void ov66_0222F124(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov68_0225DC74 *param1) { param0->unk_510.unk_14 = 1; param0->unk_510.unk_00 = *param1; } -BOOL ov66_0222F144 (const UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov68_0225DC74 * param1) +BOOL ov66_0222F144(const UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov68_0225DC74 *param1) { if (param0->unk_510.unk_14 == 1) { *param1 = param0->unk_510.unk_00; @@ -1932,9 +1926,9 @@ BOOL ov66_0222F144 (const UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov68_0225D return 0; } -void ov66_0222F16C (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222F16C(UnkStruct_ov66_0222DFF8 *param0) { - TrainerInfo * v0; + TrainerInfo *v0; GF_ASSERT(param0->unk_4B8 == NULL); @@ -1942,7 +1936,7 @@ void ov66_0222F16C (UnkStruct_ov66_0222DFF8 * param0) param0->unk_4B8 = sub_0207E060(v0, param0->unk_528); } -void ov66_0222F198 (UnkStruct_ov66_0222DFF8 * param0) +void ov66_0222F198(UnkStruct_ov66_0222DFF8 *param0) { if (param0->unk_4B8 != NULL) { sub_0207E0B0(param0->unk_4B8); @@ -1950,7 +1944,7 @@ void ov66_0222F198 (UnkStruct_ov66_0222DFF8 * param0) } } -static BOOL ov66_0222F1B4 (const u16 * param0, u32 param1) +static BOOL ov66_0222F1B4(const u16 *param0, u32 param1) { int v0; @@ -1963,11 +1957,11 @@ static BOOL ov66_0222F1B4 (const u16 * param0, u32 param1) return 0; } -static void ov66_0222F1DC (s32 param0, const void * param1, void * param2, BOOL param3) +static void ov66_0222F1DC(s32 param0, const void *param1, void *param2, BOOL param3) { - UnkStruct_ov66_0222DFF8 * v0; + UnkStruct_ov66_0222DFF8 *v0; u32 v1; - const UnkStruct_ov66_0222E71C * v2; + const UnkStruct_ov66_0222E71C *v2; s32 v3; u32 v4; @@ -2054,9 +2048,9 @@ static void ov66_0222F1DC (s32 param0, const void * param1, void * param2, BOOL } } -static void ov66_0222F398 (s32 param0, void * param1) +static void ov66_0222F398(s32 param0, void *param1) { - UnkStruct_ov66_0222DFF8 * v0; + UnkStruct_ov66_0222DFF8 *v0; u32 v1, v2; BOOL v3; s32 v4; @@ -2098,11 +2092,11 @@ static void ov66_0222F398 (s32 param0, void * param1) v0->unk_F8.unk_04 |= 1 << v1; } -static void ov66_0222F458 (s32 param0, const void * param1, void * param2) +static void ov66_0222F458(s32 param0, const void *param1, void *param2) { - UnkStruct_ov66_0222DFF8 * v0; + UnkStruct_ov66_0222DFF8 *v0; u32 v1; - const UnkStruct_ov66_0222E71C * v2; + const UnkStruct_ov66_0222E71C *v2; u32 v3; v0 = param2; @@ -2132,9 +2126,9 @@ static void ov66_0222F458 (s32 param0, const void * param1, void * param2) } } -static void ov66_0222F4C8 (PPW_LOBBY_TIME_EVENT param0, void * param1) +static void ov66_0222F4C8(PPW_LOBBY_TIME_EVENT param0, void *param1) { - UnkStruct_ov66_0222DFF8 * v0; + UnkStruct_ov66_0222DFF8 *v0; BOOL v1 = 0; int v2; @@ -2246,10 +2240,10 @@ static void ov66_0222F4C8 (PPW_LOBBY_TIME_EVENT param0, void * param1) } } -static void ov66_0222F684 (const void * param0, u32 param1, void * param2) +static void ov66_0222F684(const void *param0, u32 param1, void *param2) { - UnkStruct_ov66_0222DFF8 * v0; - const UnkStruct_ov66_0222E71C * v1; + UnkStruct_ov66_0222DFF8 *v0; + const UnkStruct_ov66_0222E71C *v1; v0 = param2; v1 = param0; @@ -2263,12 +2257,12 @@ static void ov66_0222F684 (const void * param0, u32 param1, void * param2) ov66_0222F9EC(&v0->unk_108, v0->unk_00); } -static void ov66_0222F6C4 (UnkStruct_ov66_0222F6C4 * param0, UnkStruct_ov66_02231560 * param1) +static void ov66_0222F6C4(UnkStruct_ov66_0222F6C4 *param0, UnkStruct_ov66_02231560 *param1) { int v0; UnkStruct_ov66_02232B20 v1; - const UnkStruct_ov66_0222E71C * v2; - UnkStruct_ov66_02231560 * v3; + const UnkStruct_ov66_0222E71C *v2; + UnkStruct_ov66_02231560 *v3; u8 v4; u8 v5; @@ -2294,7 +2288,7 @@ static void ov66_0222F6C4 (UnkStruct_ov66_0222F6C4 * param0, UnkStruct_ov66_0223 } } -static void ov66_0222F768 (UnkStruct_ov66_0222DFF8 * param0) +static void ov66_0222F768(UnkStruct_ov66_0222DFF8 *param0) { s64 v0; s64 v1; @@ -2312,13 +2306,13 @@ static void ov66_0222F768 (UnkStruct_ov66_0222DFF8 * param0) } } -static void ov66_0222F7C8 (UnkStruct_ov66_0222F6C4 * param0, SaveData * param1, u32 param2) +static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *param1, u32 param2) { - TrainerInfo * v0; - Party * v1; - UnkStruct_0202C878 * v2; - PokedexData * v3; - UnkStruct_02055BA8 * v4; + TrainerInfo *v0; + Party *v1; + UnkStruct_0202C878 *v2; + PokedexData *v3; + UnkStruct_02055BA8 *v4; { v0 = SaveData_GetTrainerInfo(param1); @@ -2329,7 +2323,7 @@ static void ov66_0222F7C8 (UnkStruct_ov66_0222F6C4 * param0, SaveData * param1, } { - Strbuf* v5; + Strbuf *v5; v5 = TrainerInfo_NameNewStrbuf(v0, param2); @@ -2342,7 +2336,7 @@ static void ov66_0222F7C8 (UnkStruct_ov66_0222F6C4 * param0, SaveData * param1, param0->unk_20.unk_04 = TrainerInfo_ID(v0); { - Pokemon * v6; + Pokemon *v6; int v7; int v8; @@ -2395,10 +2389,10 @@ static void ov66_0222F7C8 (UnkStruct_ov66_0222F6C4 * param0, SaveData * param1, ov66_0222F9EC(param0, param1); } -static void ov66_0222F964 (UnkStruct_ov66_0222DFF8 * param0) +static void ov66_0222F964(UnkStruct_ov66_0222DFF8 *param0) { int v0; - const UnkStruct_ov66_0222E71C * v1; + const UnkStruct_ov66_0222E71C *v1; if (ov66_0222FA04(¶m0->unk_108, param0->unk_00) == 0) { param0->unk_52C = 1; @@ -2417,12 +2411,12 @@ static void ov66_0222F964 (UnkStruct_ov66_0222DFF8 * param0) ov66_0222F9EC(¶m0->unk_108, param0->unk_00); } -static void ov66_0222F9EC (UnkStruct_ov66_0222F6C4 * param0, const SaveData * param1) +static void ov66_0222F9EC(UnkStruct_ov66_0222F6C4 *param0, const SaveData *param1) { param0->unk_B4 = SaveData_CalculateChecksum(param1, ¶m0->unk_20, sizeof(UnkStruct_ov66_0222E71C)); } -static BOOL ov66_0222FA04 (const UnkStruct_ov66_0222F6C4 * param0, const SaveData * param1) +static BOOL ov66_0222FA04(const UnkStruct_ov66_0222F6C4 *param0, const SaveData *param1) { u32 v0; @@ -2436,7 +2430,7 @@ static BOOL ov66_0222FA04 (const UnkStruct_ov66_0222F6C4 * param0, const SaveDat return 1; } -static void ov66_0222FA28 (UnkStruct_ov66_0222F6C4 * param0, const UnkStruct_ov66_0222E71C * param1, u32 param2) +static void ov66_0222FA28(UnkStruct_ov66_0222F6C4 *param0, const UnkStruct_ov66_0222E71C *param1, u32 param2) { param0->unk_20 = *param1; @@ -2450,12 +2444,12 @@ static void ov66_0222FA28 (UnkStruct_ov66_0222F6C4 * param0, const UnkStruct_ov6 MI_CpuCopy8(param0->unk_00, param0->unk_20.unk_08, sizeof(u16) * (7 + 1)); } -static void ov66_0222FA80 (UnkStruct_ov66_0222FA80 * param0) +static void ov66_0222FA80(UnkStruct_ov66_0222FA80 *param0) { param0->unk_08 = 0; } -static void ov66_0222FA88 (UnkStruct_ov66_0222FB64 * param0, UnkStruct_ov66_0222FA80 * param1, UnkStruct_ov66_022302B0 * param2, UnkStruct_ov66_022309A4 * param3) +static void ov66_0222FA88(UnkStruct_ov66_0222FB64 *param0, UnkStruct_ov66_0222FA80 *param1, UnkStruct_ov66_022302B0 *param2, UnkStruct_ov66_022309A4 *param3) { if ((param0->unk_04 - 1) >= 0) { param0->unk_04--; @@ -2503,7 +2497,7 @@ static void ov66_0222FA88 (UnkStruct_ov66_0222FB64 * param0, UnkStruct_ov66_0222 } } -static void ov66_0222FB64 (UnkStruct_ov66_0222FB64 * param0) +static void ov66_0222FB64(UnkStruct_ov66_0222FB64 *param0) { param0->unk_00_0 = 0; param0->unk_00_1 = 0; @@ -2520,7 +2514,7 @@ static void ov66_0222FB64 (UnkStruct_ov66_0222FB64 * param0) param0->unk_0A = -1; } -static void ov66_0222FBAC (const UnkStruct_ov66_0222FB64 * param0) +static void ov66_0222FBAC(const UnkStruct_ov66_0222FB64 *param0) { if (param0->unk_0D == 1) { sub_0200544C(7, (127 / 3)); @@ -2529,12 +2523,12 @@ static void ov66_0222FBAC (const UnkStruct_ov66_0222FB64 * param0) } } -static void ov66_0222FBC8 (UnkStruct_ov66_0222FBC8 * param0) +static void ov66_0222FBC8(UnkStruct_ov66_0222FBC8 *param0) { param0->unk_00 = (30 * 30); } -static BOOL ov66_0222FBD0 (const UnkStruct_ov66_0222FBC8 * param0) +static BOOL ov66_0222FBD0(const UnkStruct_ov66_0222FBC8 *param0) { if (param0->unk_00 > 0) { return 1; @@ -2543,26 +2537,26 @@ static BOOL ov66_0222FBD0 (const UnkStruct_ov66_0222FBC8 * param0) return 0; } -static void ov66_0222FBE0 (UnkStruct_ov66_0222FBC8 * param0) +static void ov66_0222FBE0(UnkStruct_ov66_0222FBC8 *param0) { if (param0->unk_00 > 0) { param0->unk_00--; } } -static void ov66_0222FBF0 (UnkStruct_ov66_0222FBF0 * param0, u32 param1) +static void ov66_0222FBF0(UnkStruct_ov66_0222FBF0 *param0, u32 param1) { param0->unk_00 = TrainerInfo_New(param1); } -static void ov66_0222FC00 (UnkStruct_ov66_0222FBF0 * param0) +static void ov66_0222FC00(UnkStruct_ov66_0222FBF0 *param0) { Heap_FreeToHeap(param0->unk_00); } -static void ov66_0222FC0C (UnkStruct_ov66_0222FBF0 * param0, const UnkStruct_ov66_0222F6C4 * param1, u32 param2) +static void ov66_0222FC0C(UnkStruct_ov66_0222FBF0 *param0, const UnkStruct_ov66_0222F6C4 *param1, u32 param2) { - UnkStruct_ov66_0222E71C * v0; + UnkStruct_ov66_0222E71C *v0; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_0222E71C)); @@ -2573,27 +2567,27 @@ static void ov66_0222FC0C (UnkStruct_ov66_0222FBF0 * param0, const UnkStruct_ov6 Heap_FreeToHeap(v0); } -static void ov66_0222FC4C (UnkStruct_ov66_0222FBC8 * param0) +static void ov66_0222FC4C(UnkStruct_ov66_0222FBC8 *param0) { param0->unk_02 = 1; } -static BOOL ov66_0222FC54 (const UnkStruct_ov66_0222FBC8 * param0) +static BOOL ov66_0222FC54(const UnkStruct_ov66_0222FBC8 *param0) { return param0->unk_02; } -static void ov66_0222FC58 (UnkStruct_ov66_0222FC58 * param0) +static void ov66_0222FC58(UnkStruct_ov66_0222FC58 *param0) { memset(param0, 0, sizeof(UnkStruct_ov66_0222FC58)); } -static void ov66_0222FC68 (UnkStruct_ov66_0222FC68 * param0) +static void ov66_0222FC68(UnkStruct_ov66_0222FC68 *param0) { memset(param0, 0, sizeof(UnkStruct_ov66_0222FC68)); } -static void ov66_0222FC74 (UnkStruct_ov66_0222FC68 * param0) +static void ov66_0222FC74(UnkStruct_ov66_0222FC68 *param0) { param0->unk_04 = 0; param0->unk_06 = 0; @@ -2602,7 +2596,7 @@ static void ov66_0222FC74 (UnkStruct_ov66_0222FC68 * param0) ov66_0222FD7C(param0); } -static void ov66_0222FC84 (UnkStruct_ov66_0222FC68 * param0) +static void ov66_0222FC84(UnkStruct_ov66_0222FC68 *param0) { param0->unk_04 = 0; param0->unk_06 = 4; @@ -2612,7 +2606,7 @@ static void ov66_0222FC84 (UnkStruct_ov66_0222FC68 * param0) param0->unk_0A = 0; } -static BOOL ov66_0222FC9C (const UnkStruct_ov66_0222FC68 * param0, u32 param1) +static BOOL ov66_0222FC9C(const UnkStruct_ov66_0222FC68 *param0, u32 param1) { GF_ASSERT(param1 < 20); @@ -2623,19 +2617,19 @@ static BOOL ov66_0222FC9C (const UnkStruct_ov66_0222FC68 * param0, u32 param1) return 0; } -static void ov66_0222FCBC (UnkStruct_ov66_0222FC68 * param0, u32 param1) +static void ov66_0222FCBC(UnkStruct_ov66_0222FC68 *param0, u32 param1) { GF_ASSERT(param1 < 20); param0->unk_00 |= (1 << param1); } -static void ov66_0222FCD8 (UnkStruct_ov66_0222FC68 * param0, u32 param1) +static void ov66_0222FCD8(UnkStruct_ov66_0222FC68 *param0, u32 param1) { GF_ASSERT(param1 < 20); param0->unk_00 &= ~(1 << param1); } -static void ov66_0222FCF4 (UnkStruct_ov66_0222FC68 * param0, u32 param1) +static void ov66_0222FCF4(UnkStruct_ov66_0222FC68 *param0, u32 param1) { GF_ASSERT(param1 < 20); @@ -2644,19 +2638,19 @@ static void ov66_0222FCF4 (UnkStruct_ov66_0222FC68 * param0, u32 param1) } } -static void ov66_0222FD10 (UnkStruct_ov66_0222FC68 * param0, u32 param1) +static void ov66_0222FD10(UnkStruct_ov66_0222FC68 *param0, u32 param1) { GF_ASSERT(param1 < 20); param0->unk_0C[param1] = 0; } -static void ov66_0222FD28 (UnkStruct_ov66_0222FC68 * param0, u16 param1) +static void ov66_0222FD28(UnkStruct_ov66_0222FC68 *param0, u16 param1) { param0->unk_20.unk_02 = param0->unk_06; param0->unk_20.unk_00 = param1; } -static void ov66_0222FD30 (UnkStruct_ov66_0222DFF8 * param0, s32 param1, BOOL param2) +static void ov66_0222FD30(UnkStruct_ov66_0222DFF8 *param0, s32 param1, BOOL param2) { param0->unk_1C0.unk_20.unk_02 = 2; param0->unk_1C0.unk_20.unk_00 = param2; @@ -2664,7 +2658,7 @@ static void ov66_0222FD30 (UnkStruct_ov66_0222DFF8 * param0, s32 param1, BOOL pa ov66_02232E5C(1, param1, ¶m0->unk_1C0.unk_20, sizeof(UnkStruct_ov66_022305B0)); } -static void ov66_0222FD50 (UnkStruct_ov66_0222DFF8 * param0, s32 param1) +static void ov66_0222FD50(UnkStruct_ov66_0222DFF8 *param0, s32 param1) { param0->unk_1C0.unk_06 = 4; param0->unk_1C0.unk_20.unk_02 = 4; @@ -2672,19 +2666,19 @@ static void ov66_0222FD50 (UnkStruct_ov66_0222DFF8 * param0, s32 param1) ov66_02232E5C(2, param1, ¶m0->unk_1C0.unk_20, sizeof(UnkStruct_ov66_022305B0)); } -static void ov66_0222FD70 (UnkStruct_ov66_0222FC68 * param0) +static void ov66_0222FD70(UnkStruct_ov66_0222FC68 *param0) { param0->unk_24 = 1; param0->unk_26 = 0; } -static void ov66_0222FD7C (UnkStruct_ov66_0222FC68 * param0) +static void ov66_0222FD7C(UnkStruct_ov66_0222FC68 *param0) { param0->unk_24 = 0; param0->unk_26 = 0; } -static void ov66_0222FD84 (UnkStruct_ov66_0222FC68 * param0) +static void ov66_0222FD84(UnkStruct_ov66_0222FC68 *param0) { if (param0->unk_24 == 1) { if ((param0->unk_26 + 1) <= 900) { @@ -2693,7 +2687,7 @@ static void ov66_0222FD84 (UnkStruct_ov66_0222FC68 * param0) } } -static BOOL ov66_0222FD9C (const UnkStruct_ov66_0222FC68 * param0) +static BOOL ov66_0222FD9C(const UnkStruct_ov66_0222FC68 *param0) { if (param0->unk_24 == 0) { return 1; @@ -2706,14 +2700,14 @@ static BOOL ov66_0222FD9C (const UnkStruct_ov66_0222FC68 * param0) return 1; } -static s16 ov66_0222FDBC (const UnkStruct_ov66_0222FC68 * param0) +static s16 ov66_0222FDBC(const UnkStruct_ov66_0222FC68 *param0) { return param0->unk_26; } -static void ov66_0222FDC4 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1) +static void ov66_0222FDC4(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1) { - const UnkStruct_ov66_0222E71C * v0; + const UnkStruct_ov66_0222E71C *v0; int v1; u32 v2; UnkStruct_ov66_0223185C v3; @@ -2741,9 +2735,9 @@ static void ov66_0222FDC4 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov6 ov66_0223185C(param0->unk_04.unk_00, &v3); } -static void ov66_0222FE40 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1) +static void ov66_0222FE40(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1) { - const UnkStruct_ov66_0222E71C * v0; + const UnkStruct_ov66_0222E71C *v0; int v1; u32 v2; UnkStruct_ov66_022318AC v3; @@ -2772,11 +2766,11 @@ static void ov66_0222FE40 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov6 ov66_022318AC(param0->unk_04.unk_00, &v3); } -static void ov66_0222FEC0 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1) +static void ov66_0222FEC0(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1) { - const UnkStruct_ov66_0222E71C * v0; + const UnkStruct_ov66_0222E71C *v0; int v1; - TrainerInfo * v2[4]; + TrainerInfo *v2[4]; u32 v3; UnkStruct_ov66_02231908 v4; @@ -2833,9 +2827,9 @@ static void ov66_0222FEC0 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov6 ov66_02231908(param0->unk_04.unk_00, &v4); } -static void ov66_0222FFF4 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1) +static void ov66_0222FFF4(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1) { - const UnkStruct_ov66_0222E71C * v0; + const UnkStruct_ov66_0222E71C *v0; int v1; u32 v2; UnkStruct_ov66_0223199C v3; @@ -2861,11 +2855,11 @@ static void ov66_0222FFF4 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov6 ov66_0223199C(param0->unk_04.unk_00, &v3); } -static void ov66_02230058 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1) +static void ov66_02230058(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1) { - const UnkStruct_ov66_0222E71C * v0; + const UnkStruct_ov66_0222E71C *v0; int v1; - TrainerInfo * v2[4]; + TrainerInfo *v2[4]; u32 v3; UnkStruct_ov66_022319FC v4; @@ -2902,11 +2896,11 @@ static void ov66_02230058 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov6 ov66_022319FC(param0->unk_04.unk_00, &v4); } -static void ov66_02230114 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1) +static void ov66_02230114(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1) { - const UnkStruct_ov66_0222E71C * v0; + const UnkStruct_ov66_0222E71C *v0; int v1; - TrainerInfo * v2[4]; + TrainerInfo *v2[4]; u32 v3; UnkStruct_ov66_02231A58 v4; @@ -2943,11 +2937,11 @@ static void ov66_02230114 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov6 ov66_02231A58(param0->unk_04.unk_00, &v4); } -static void ov66_022301D0 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1) +static void ov66_022301D0(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1) { - const UnkStruct_ov66_0222E71C * v0; + const UnkStruct_ov66_0222E71C *v0; int v1; - TrainerInfo * v2[4]; + TrainerInfo *v2[4]; u32 v3; UnkStruct_ov66_02231B80 v4; @@ -2985,12 +2979,12 @@ static void ov66_022301D0 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov6 ov66_02231B80(param0->unk_04.unk_00, &v4); } -static void ov66_02230294 (UnkStruct_ov66_0222DFF8 * param0, const UnkStruct_ov66_0222E990 * param1) +static void ov66_02230294(UnkStruct_ov66_0222DFF8 *param0, const UnkStruct_ov66_0222E990 *param1) { return; } -static void ov66_02230298 (UnkStruct_ov66_0222DFF8 * param0, int param1) +static void ov66_02230298(UnkStruct_ov66_0222DFF8 *param0, int param1) { UnkStruct_ov66_02231AB4 v0; @@ -3000,18 +2994,18 @@ static void ov66_02230298 (UnkStruct_ov66_0222DFF8 * param0, int param1) ov66_02231AB4(param0->unk_04.unk_00, &v0); } -static void ov66_022302B0 (UnkStruct_ov66_022302B0 * param0) +static void ov66_022302B0(UnkStruct_ov66_022302B0 *param0) { memset(param0, 0, sizeof(UnkStruct_ov66_022302B0)); MI_CpuFill32(param0->unk_50, 0xffffffff, sizeof(u32) * (9 * 3)); } -static void ov66_022302D0 (UnkStruct_ov66_022302B0 * param0) +static void ov66_022302D0(UnkStruct_ov66_022302B0 *param0) { param0->unk_00 = 1; } -static void ov66_022302D8 (UnkStruct_ov66_022302B0 * param0) +static void ov66_022302D8(UnkStruct_ov66_022302B0 *param0) { int v0; @@ -3038,13 +3032,13 @@ static void ov66_022302D8 (UnkStruct_ov66_022302B0 * param0) } } -static inline void inline_ov66_0222EC04 (u32 param0, u32 * param1, u32 * param2) +static inline void inline_ov66_0222EC04(u32 param0, u32 *param1, u32 *param2) { *param1 = param0 / 3; *param2 = param0 % 3; } -static u32 ov66_02230330 (UnkStruct_ov66_022302B0 * param0, u32 param1, int param2) +static u32 ov66_02230330(UnkStruct_ov66_022302B0 *param0, u32 param1, int param2) { u32 v0; int v1, v2; @@ -3077,7 +3071,7 @@ static u32 ov66_02230330 (UnkStruct_ov66_022302B0 * param0, u32 param1, int para return 0xffffffff; } -static void ov66_022303A8 (UnkStruct_ov66_022302B0 * param0, u32 param1) +static void ov66_022303A8(UnkStruct_ov66_022302B0 *param0, u32 param1) { u32 v0; u32 v1, v2; @@ -3090,7 +3084,7 @@ static void ov66_022303A8 (UnkStruct_ov66_022302B0 * param0, u32 param1) } } -static u32 ov66_022303DC (const UnkStruct_ov66_022302B0 * param0, u32 param1) +static u32 ov66_022303DC(const UnkStruct_ov66_022302B0 *param0, u32 param1) { u32 v0; u32 v1; @@ -3102,19 +3096,19 @@ static u32 ov66_022303DC (const UnkStruct_ov66_022302B0 * param0, u32 param1) return param0->unk_50[v0][v1]; } -static int ov66_0223040C (const UnkStruct_ov66_022302B0 * param0, u32 param1) +static int ov66_0223040C(const UnkStruct_ov66_022302B0 *param0, u32 param1) { GF_ASSERT(param1 < 9); return param0->unk_2C[param1]; } -static u32 ov66_02230424 (const UnkStruct_ov66_022302B0 * param0, u32 param1) +static u32 ov66_02230424(const UnkStruct_ov66_022302B0 *param0, u32 param1) { GF_ASSERT(param1 < 9); return param0->unk_08[param1]; } -static void ov66_0223043C (UnkStruct_ov66_022302B0 * param0, u32 param1) +static void ov66_0223043C(UnkStruct_ov66_022302B0 *param0, u32 param1) { u32 v0; u32 v1; @@ -3128,7 +3122,7 @@ static void ov66_0223043C (UnkStruct_ov66_022302B0 * param0, u32 param1) } } -static BOOL ov66_02230474 (const UnkStruct_ov66_022302B0 * param0, u32 param1) +static BOOL ov66_02230474(const UnkStruct_ov66_022302B0 *param0, u32 param1) { u32 v0; u32 v1; @@ -3139,7 +3133,7 @@ static BOOL ov66_02230474 (const UnkStruct_ov66_022302B0 * param0, u32 param1) return param0->unk_128[v0][v1]; } -static void ov66_022304A8 (UnkStruct_ov66_022302B0 * param0, u32 param1) +static void ov66_022304A8(UnkStruct_ov66_022302B0 *param0, u32 param1) { u32 v0; u32 v1; @@ -3150,7 +3144,7 @@ static void ov66_022304A8 (UnkStruct_ov66_022302B0 * param0, u32 param1) param0->unk_128[v0][v1] = 0; } -static u32 ov66_022304DC (const UnkStruct_ov66_022302B0 * param0, u32 param1) +static u32 ov66_022304DC(const UnkStruct_ov66_022302B0 *param0, u32 param1) { int v0, v1; @@ -3165,7 +3159,7 @@ static u32 ov66_022304DC (const UnkStruct_ov66_022302B0 * param0, u32 param1) return 0xffffffff; } -static void ov66_02230510 (UnkStruct_ov66_022302B0 * param0, u32 param1, int param2) +static void ov66_02230510(UnkStruct_ov66_022302B0 *param0, u32 param1, int param2) { u32 v0; u32 v1; @@ -3176,7 +3170,7 @@ static void ov66_02230510 (UnkStruct_ov66_022302B0 * param0, u32 param1, int par param0->unk_BC[v0][v1] = param2 + 1; } -static BOOL ov66_02230544 (const UnkStruct_ov66_022302B0 * param0, u32 param1, int param2) +static BOOL ov66_02230544(const UnkStruct_ov66_022302B0 *param0, u32 param1, int param2) { u32 v0; u32 v1; @@ -3192,7 +3186,7 @@ static BOOL ov66_02230544 (const UnkStruct_ov66_022302B0 * param0, u32 param1, i return 1; } -static int ov66_02230580 (const UnkStruct_ov66_022302B0 * param0, u32 param1) +static int ov66_02230580(const UnkStruct_ov66_022302B0 *param0, u32 param1) { u32 v0; u32 v1; @@ -3204,11 +3198,11 @@ static int ov66_02230580 (const UnkStruct_ov66_022302B0 * param0, u32 param1) return param0->unk_BC[v0][v1]; } -static void ov66_022305B0 (s32 param0, const void * param1, u32 param2, void * param3) +static void ov66_022305B0(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov66_0222DFF8 * v0 = param3; + UnkStruct_ov66_0222DFF8 *v0 = param3; u32 v1; - const UnkStruct_ov66_022305B0 * v2; + const UnkStruct_ov66_022305B0 *v2; u32 v3; BOOL v4; @@ -3243,11 +3237,11 @@ static void ov66_022305B0 (s32 param0, const void * param1, u32 param2, void * p ov66_0222FD70(&v0->unk_1C0); } -static void ov66_02230664 (s32 param0, const void * param1, u32 param2, void * param3) +static void ov66_02230664(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov66_0222DFF8 * v0 = param3; + UnkStruct_ov66_0222DFF8 *v0 = param3; u32 v1; - const UnkStruct_ov66_022305B0 * v2; + const UnkStruct_ov66_022305B0 *v2; v2 = param1; v1 = ov66_02232B78(param0); @@ -3275,11 +3269,11 @@ static void ov66_02230664 (s32 param0, const void * param1, u32 param2, void * p } } -static void ov66_022306C4 (s32 param0, const void * param1, u32 param2, void * param3) +static void ov66_022306C4(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov66_0222DFF8 * v0 = param3; + UnkStruct_ov66_0222DFF8 *v0 = param3; u32 v1; - const UnkStruct_ov66_022305B0 * v2; + const UnkStruct_ov66_022305B0 *v2; if (v0->unk_1C0.unk_0A == 0) { return; @@ -3305,9 +3299,9 @@ static void ov66_022306C4 (s32 param0, const void * param1, u32 param2, void * p } } -static void ov66_02230728 (s32 param0, const void * param1, u32 param2, void * param3) +static void ov66_02230728(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov66_0222DFF8 * v0 = param3; + UnkStruct_ov66_0222DFF8 *v0 = param3; u32 v1; if (v0->unk_1C0.unk_06 == 0) { @@ -3321,12 +3315,12 @@ static void ov66_02230728 (s32 param0, const void * param1, u32 param2, void * p } } -static void ov66_02230750 (s32 param0, const void * param1, u32 param2, void * param3) +static void ov66_02230750(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov66_0222DFF8 * v0 = param3; - const UnkStruct_ov66_0222E990 * v1 = param1; + UnkStruct_ov66_0222DFF8 *v0 = param3; + const UnkStruct_ov66_0222E990 *v1 = param1; - static void(*const v2[])(UnkStruct_ov66_0222DFF8 *, const UnkStruct_ov66_0222E990 *) = { + static void (*const v2[])(UnkStruct_ov66_0222DFF8 *, const UnkStruct_ov66_0222E990 *) = { ov66_0222FDC4, ov66_0222FE40, ov66_0222FEC0, @@ -3341,9 +3335,9 @@ static void ov66_02230750 (s32 param0, const void * param1, u32 param2, void * p v2[v1->unk_11](v0, v1); } -static void ov66_02230764 (s32 param0, const void * param1, u32 param2, void * param3) +static void ov66_02230764(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov66_0222DFF8 * v0 = param3; + UnkStruct_ov66_0222DFF8 *v0 = param3; u32 v1; v1 = ov66_02232B78(param0); @@ -3353,9 +3347,9 @@ static void ov66_02230764 (s32 param0, const void * param1, u32 param2, void * p } } -static void ov66_02230780 (s32 param0, const void * param1, u32 param2, void * param3) +static void ov66_02230780(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov66_0222DFF8 * v0 = param3; + UnkStruct_ov66_0222DFF8 *v0 = param3; u32 v1; u32 v2; int v3; @@ -3373,9 +3367,9 @@ static void ov66_02230780 (s32 param0, const void * param1, u32 param2, void * p } } -static void ov66_022307B4 (s32 param0, const void * param1, u32 param2, void * param3) +static void ov66_022307B4(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov66_0222DFF8 * v0 = param3; + UnkStruct_ov66_0222DFF8 *v0 = param3; u32 v1; v1 = ov66_02232B78(param0); @@ -3385,7 +3379,7 @@ static void ov66_022307B4 (s32 param0, const void * param1, u32 param2, void * p } } -static void ov66_022307D4 (UnkStruct_ov66_022307D4 * param0) +static void ov66_022307D4(UnkStruct_ov66_022307D4 *param0) { int v0; @@ -3396,7 +3390,7 @@ static void ov66_022307D4 (UnkStruct_ov66_022307D4 * param0) } } -static void ov66_022307F0 (UnkStruct_ov66_022307D4 * param0, u32 param1, u32 param2) +static void ov66_022307F0(UnkStruct_ov66_022307D4 *param0, u32 param1, u32 param2) { u32 v0; int v1; @@ -3411,7 +3405,7 @@ static void ov66_022307F0 (UnkStruct_ov66_022307D4 * param0, u32 param1, u32 par } } -static u32 ov66_02230828 (const UnkStruct_ov66_022307D4 * param0) +static u32 ov66_02230828(const UnkStruct_ov66_022307D4 *param0) { int v0; u32 v1; @@ -3439,7 +3433,7 @@ static u32 ov66_02230828 (const UnkStruct_ov66_022307D4 * param0) return 0; } -static void ov66_0223086C (UnkStruct_ov66_02232068 * param0, u32 param1, BOOL param2) +static void ov66_0223086C(UnkStruct_ov66_02232068 *param0, u32 param1, BOOL param2) { GF_ASSERT(param1 < 20); @@ -3448,7 +3442,7 @@ static void ov66_0223086C (UnkStruct_ov66_02232068 * param0, u32 param1, BOOL pa } } -static BOOL ov66_02230884 (const UnkStruct_ov66_02232068 * param0, u32 param1) +static BOOL ov66_02230884(const UnkStruct_ov66_02232068 *param0, u32 param1) { GF_ASSERT(param1 < 20); @@ -3459,18 +3453,18 @@ static BOOL ov66_02230884 (const UnkStruct_ov66_02232068 * param0, u32 param1) return 0; } -static void ov66_022308A0 (UnkStruct_ov66_022308A0 * param0, u32 param1) +static void ov66_022308A0(UnkStruct_ov66_022308A0 *param0, u32 param1) { MI_CpuClear8(param0, sizeof(UnkStruct_ov66_022308A0)); param0->unk_B4 = sub_02014FB0(param1); } -static void ov66_022308BC (UnkStruct_ov66_022308A0 * param0) +static void ov66_022308BC(UnkStruct_ov66_022308A0 *param0) { sub_02014FF0(param0->unk_B4); } -static void ov66_022308C8 (UnkStruct_ov66_022308A0 * param0, u32 param1, BOOL param2, u32 param3) +static void ov66_022308C8(UnkStruct_ov66_022308A0 *param0, u32 param1, BOOL param2, u32 param3) { GF_ASSERT(param1 < 20); @@ -3483,7 +3477,7 @@ static void ov66_022308C8 (UnkStruct_ov66_022308A0 * param0, u32 param1, BOOL pa } } -static BOOL ov66_022308F8 (const UnkStruct_ov66_022308A0 * param0, u32 param1) +static BOOL ov66_022308F8(const UnkStruct_ov66_022308A0 *param0, u32 param1) { GF_ASSERT(param1 < 20); @@ -3494,7 +3488,7 @@ static BOOL ov66_022308F8 (const UnkStruct_ov66_022308A0 * param0, u32 param1) return 0; } -static const UnkStruct_ov66_02230914 * ov66_02230914 (const UnkStruct_ov66_022308A0 * param0, u32 param1) +static const UnkStruct_ov66_02230914 *ov66_02230914(const UnkStruct_ov66_022308A0 *param0, u32 param1) { GF_ASSERT(param1 < 20); @@ -3507,7 +3501,7 @@ static const UnkStruct_ov66_02230914 * ov66_02230914 (const UnkStruct_ov66_02230 return NULL; } -static void ov66_02230938 (UnkStruct_02014FB0 * param0, u32 param1, UnkStruct_ov66_02230914 * param2) +static void ov66_02230938(UnkStruct_02014FB0 *param0, u32 param1, UnkStruct_ov66_02230914 *param2) { UnkStruct_ov66_02230938 v0; u32 v1; @@ -3530,14 +3524,14 @@ static void ov66_02230938 (UnkStruct_02014FB0 * param0, u32 param1, UnkStruct_ov param2->unk_00[3] = sub_02015008(param0, v2); } -static void ov66_022309A4 (UnkStruct_ov66_022309A4 * param0, u32 param1, u32 param2) +static void ov66_022309A4(UnkStruct_ov66_022309A4 *param0, u32 param1, u32 param2) { param0->unk_00 = 0; param0->unk_0C = 0; param0->unk_10 = (param2 - param1) * 30; } -static void ov66_022309B4 (UnkStruct_ov66_022309A4 * param0) +static void ov66_022309B4(UnkStruct_ov66_022309A4 *param0) { param0->unk_00 = 1; param0->unk_0C = 0; @@ -3545,7 +3539,7 @@ static void ov66_022309B4 (UnkStruct_ov66_022309A4 * param0) ov66_02232BC8(¶m0->unk_04); } -static void ov66_022309C8 (UnkStruct_ov66_022309A4 * param0) +static void ov66_022309C8(UnkStruct_ov66_022309A4 *param0) { s64 v0; s64 v1; @@ -3588,7 +3582,7 @@ static void ov66_022309C8 (UnkStruct_ov66_022309A4 * param0) param0->unk_18 = 0; } - if ((param0->unk_18 >= 120)) { + if (param0->unk_18 >= 120) { param0->unk_14 = 0; param0->unk_00 = 0; } @@ -3598,17 +3592,17 @@ static void ov66_022309C8 (UnkStruct_ov66_022309A4 * param0) } } -static u32 ov66_02230A64 (const UnkStruct_ov66_022309A4 * param0) +static u32 ov66_02230A64(const UnkStruct_ov66_022309A4 *param0) { return param0->unk_18; } -static int ov66_02230A68 (const UnkStruct_ov66_022309A4 * param0) +static int ov66_02230A68(const UnkStruct_ov66_022309A4 *param0) { return param0->unk_14; } -static void ov66_02230A6C (UnkStruct_ov66_02230A6C * param0, const SaveData * param1) +static void ov66_02230A6C(UnkStruct_ov66_02230A6C *param0, const SaveData *param1) { int v0; @@ -3624,7 +3618,7 @@ static void ov66_02230A6C (UnkStruct_ov66_02230A6C * param0, const SaveData * pa ov66_02230BCC(param0); } -static void ov66_02230A9C (UnkStruct_ov66_02230A6C * param0, int param1, s32 param2) +static void ov66_02230A9C(UnkStruct_ov66_02230A6C *param0, int param1, s32 param2) { ov66_02230BE0(param0); @@ -3639,7 +3633,7 @@ static void ov66_02230A9C (UnkStruct_ov66_02230A6C * param0, int param1, s32 par ov66_02230BCC(param0); } -static BOOL ov66_02230AF8 (UnkStruct_ov66_02230A6C * param0, s32 param1, s32 param2) +static BOOL ov66_02230AF8(UnkStruct_ov66_02230A6C *param0, s32 param1, s32 param2) { int v0; BOOL v1 = 0; @@ -3658,7 +3652,7 @@ static BOOL ov66_02230AF8 (UnkStruct_ov66_02230A6C * param0, s32 param1, s32 par return v1; } -static int ov66_02230B28 (UnkStruct_ov66_02230A6C * param0) +static int ov66_02230B28(UnkStruct_ov66_02230A6C *param0) { u8 v0; @@ -3679,7 +3673,7 @@ static int ov66_02230B28 (UnkStruct_ov66_02230A6C * param0) return v0; } -static int ov66_02230B78 (UnkStruct_ov66_02230A6C * param0, u32 param1) +static int ov66_02230B78(UnkStruct_ov66_02230A6C *param0, u32 param1) { s32 v0; @@ -3697,7 +3691,7 @@ static int ov66_02230B78 (UnkStruct_ov66_02230A6C * param0, u32 param1) return param0->unk_34[v0]; } -static s32 ov66_02230BA4 (UnkStruct_ov66_02230A6C * param0, u32 param1) +static s32 ov66_02230BA4(UnkStruct_ov66_02230A6C *param0, u32 param1) { s32 v0; @@ -3715,12 +3709,12 @@ static s32 ov66_02230BA4 (UnkStruct_ov66_02230A6C * param0, u32 param1) return param0->unk_00[v0]; } -static void ov66_02230BCC (UnkStruct_ov66_02230A6C * param0) +static void ov66_02230BCC(UnkStruct_ov66_02230A6C *param0) { param0->unk_48 = SaveData_CalculateChecksum(param0->unk_44, param0, (sizeof(UnkStruct_ov66_02230A6C) - 8)); } -static void ov66_02230BE0 (UnkStruct_ov66_02230A6C * param0) +static void ov66_02230BE0(UnkStruct_ov66_02230A6C *param0) { u32 v0; @@ -3732,12 +3726,12 @@ static void ov66_02230BE0 (UnkStruct_ov66_02230A6C * param0) } } -static BOOL ov66_02230C04 (const UnkStruct_ov66_02230A6C * param0) +static BOOL ov66_02230C04(const UnkStruct_ov66_02230A6C *param0) { return param0->unk_4A; } -static u32 ov66_02230C0C (u32 param0) +static u32 ov66_02230C0C(u32 param0) { int v0; @@ -3750,7 +3744,7 @@ static u32 ov66_02230C0C (u32 param0) return 16; } -static u32 ov66_02230C2C (u32 param0) +static u32 ov66_02230C2C(u32 param0) { if (param0 < 16) { return Unk_ov66_02258974[param0].unk_00; diff --git a/src/overlay066/ov66_02230C44.c b/src/overlay066/ov66_02230C44.c index 4d31b4de7a..5c39e49e4f 100644 --- a/src/overlay066/ov66_02230C44.c +++ b/src/overlay066/ov66_02230C44.c @@ -1,11 +1,12 @@ +#include "overlay066/ov66_02230C44.h" + #include #include -#include "savedata.h" +#include "overlay066/ov66_0222DDF0.h" +#include "overlay066/struct_ov66_0222DCE0_sub1.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay066/struct_ov66_0222E71C_decl.h" - -#include "overlay066/struct_ov66_0222DCE0_sub1.h" #include "overlay066/struct_ov66_02230DBC.h" #include "overlay066/struct_ov66_02230E68.h" #include "overlay066/struct_ov66_02230F50.h" @@ -15,15 +16,6 @@ #include "overlay066/struct_ov66_0223127C.h" #include "overlay066/struct_ov66_02231300.h" #include "overlay066/struct_ov66_02231374.h" -#include "overlay115/struct_ov115_02260440.h" -#include "overlay117/struct_ov117_02260440.h" - -#include "game_overlay.h" -#include "overlay_manager.h" -#include "heap.h" -#include "trainer_info.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_02230C44.h" #include "overlay067/ov67_0225C700.h" #include "overlay068/ov68_0225C700.h" #include "overlay069/ov69_0225C700.h" @@ -31,8 +23,16 @@ #include "overlay112/ov112_0225C700.h" #include "overlay113/ov113_0225C700.h" #include "overlay115/ov115_02260440.h" +#include "overlay115/struct_ov115_02260440.h" #include "overlay116/ov116_022604C4.h" #include "overlay117/ov117_02260440.h" +#include "overlay117/struct_ov117_02260440.h" + +#include "game_overlay.h" +#include "heap.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "trainer_info.h" FS_EXTERN_OVERLAY(overlay67); FS_EXTERN_OVERLAY(overlay68); @@ -46,76 +46,76 @@ FS_EXTERN_OVERLAY(overlay116); FS_EXTERN_OVERLAY(overlay117); typedef struct { - void * unk_00; + void *unk_00; } UnkStruct_ov66_02230E4C; typedef struct UnkStruct_ov66_02230C90_t { - OverlayManager * unk_00; + OverlayManager *unk_00; UnkStruct_ov66_02230E4C unk_04[13]; u8 unk_38; u8 unk_39; u16 unk_3A; - UnkStruct_ov66_0222DFF8 * unk_3C; - SaveData * unk_40; - UnkStruct_ov66_0222DCE0_sub1 * unk_44; + UnkStruct_ov66_0222DFF8 *unk_3C; + SaveData *unk_40; + UnkStruct_ov66_0222DCE0_sub1 *unk_44; } UnkStruct_ov66_02230C90; -static void ov66_02230CEC(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, const OverlayManagerTemplate * param2); -static void ov66_02230D0C(UnkStruct_ov66_02230C90 * param0, u32 param1, u32 param2); -static void ov66_02230D34(UnkStruct_ov66_02230C90 * param0, u32 param1); -static void ov66_02230D54(UnkStruct_ov66_02230C90 * param0, u32 param1); -static int ov66_02230D7C(UnkStruct_ov66_02230C90 * param0, u32 param1); -static void ov66_02230DA0(UnkStruct_ov66_02230DBC * param0, u32 param1); -static void ov66_02230DBC(UnkStruct_ov66_02230DBC * param0); -static void ov66_02230DD8(UnkStruct_ov66_02230DBC * param0, UnkStruct_ov66_0222DFF8 * param1, u32 param2); -static void ov66_02230E28(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_02230E4C(UnkStruct_ov66_02230E4C * param0); -static void ov66_02230E68(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static int ov66_02230E90(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_02230F1C(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_02230F44(UnkStruct_ov66_02230E4C * param0); -static void ov66_02230F50(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static int ov66_02230F7C(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_02230FA0(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_02230FE4(UnkStruct_ov66_02230E4C * param0); -static void ov66_02230FF0(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static int ov66_02231000(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_02231024(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_02231058(UnkStruct_ov66_02230E4C * param0); -static void ov66_02231064(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static int ov66_02231074(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_0223108C(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_022310C4(UnkStruct_ov66_02230E4C * param0); -static void ov66_022310D8(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static int ov66_02231104(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_02231134(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_02231164(UnkStruct_ov66_02230E4C * param0); -static void ov66_02231178(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static int ov66_022311A4(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_022311D4(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_0223120C(UnkStruct_ov66_02230E4C * param0); -static void ov66_02231220(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static int ov66_0223124C(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_0223127C(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_022312A8(UnkStruct_ov66_02230E4C * param0); -static int ov66_022312B4(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_022312D8(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_022312EC(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_02231300(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_02231338(UnkStruct_ov66_02230E4C * param0); -static int ov66_02231370(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_02231344(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_02231350(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static void ov66_0223135C(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, BOOL param2); -static void ov66_02231374(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_022313AC(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2); -static void ov66_022313E8(UnkStruct_ov66_02230E4C * param0); -static void ov66_022313F4(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); -static int ov66_02231404(UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1); - -UnkStruct_ov66_02230C90 * ov66_02230C44 (BOOL param0, SaveData * param1, UnkStruct_ov66_0222DCE0_sub1 * param2, UnkStruct_ov66_0222DFF8 * param3, u32 param4) -{ - UnkStruct_ov66_02230C90 * v0; +static void ov66_02230CEC(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, const OverlayManagerTemplate *param2); +static void ov66_02230D0C(UnkStruct_ov66_02230C90 *param0, u32 param1, u32 param2); +static void ov66_02230D34(UnkStruct_ov66_02230C90 *param0, u32 param1); +static void ov66_02230D54(UnkStruct_ov66_02230C90 *param0, u32 param1); +static int ov66_02230D7C(UnkStruct_ov66_02230C90 *param0, u32 param1); +static void ov66_02230DA0(UnkStruct_ov66_02230DBC *param0, u32 param1); +static void ov66_02230DBC(UnkStruct_ov66_02230DBC *param0); +static void ov66_02230DD8(UnkStruct_ov66_02230DBC *param0, UnkStruct_ov66_0222DFF8 *param1, u32 param2); +static void ov66_02230E28(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_02230E4C(UnkStruct_ov66_02230E4C *param0); +static void ov66_02230E68(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static int ov66_02230E90(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_02230F1C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_02230F44(UnkStruct_ov66_02230E4C *param0); +static void ov66_02230F50(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static int ov66_02230F7C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_02230FA0(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_02230FE4(UnkStruct_ov66_02230E4C *param0); +static void ov66_02230FF0(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static int ov66_02231000(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_02231024(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_02231058(UnkStruct_ov66_02230E4C *param0); +static void ov66_02231064(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static int ov66_02231074(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_0223108C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_022310C4(UnkStruct_ov66_02230E4C *param0); +static void ov66_022310D8(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static int ov66_02231104(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_02231134(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_02231164(UnkStruct_ov66_02230E4C *param0); +static void ov66_02231178(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static int ov66_022311A4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_022311D4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_0223120C(UnkStruct_ov66_02230E4C *param0); +static void ov66_02231220(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static int ov66_0223124C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_0223127C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_022312A8(UnkStruct_ov66_02230E4C *param0); +static int ov66_022312B4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_022312D8(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_022312EC(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_02231300(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_02231338(UnkStruct_ov66_02230E4C *param0); +static int ov66_02231370(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_02231344(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_02231350(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static void ov66_0223135C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, BOOL param2); +static void ov66_02231374(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_022313AC(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2); +static void ov66_022313E8(UnkStruct_ov66_02230E4C *param0); +static void ov66_022313F4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); +static int ov66_02231404(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1); + +UnkStruct_ov66_02230C90 *ov66_02230C44(BOOL param0, SaveData *param1, UnkStruct_ov66_0222DCE0_sub1 *param2, UnkStruct_ov66_0222DFF8 *param3, u32 param4) +{ + UnkStruct_ov66_02230C90 *v0; v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov66_02230C90)); memset(v0, 0, sizeof(UnkStruct_ov66_02230C90)); @@ -137,7 +137,7 @@ UnkStruct_ov66_02230C90 * ov66_02230C44 (BOOL param0, SaveData * param1, UnkStru return v0; } -void ov66_02230C90 (UnkStruct_ov66_02230C90 * param0) +void ov66_02230C90(UnkStruct_ov66_02230C90 *param0) { { int v0; @@ -150,12 +150,12 @@ void ov66_02230C90 (UnkStruct_ov66_02230C90 * param0) Heap_FreeToHeap(param0); } -void ov66_02230CAC (UnkStruct_ov66_02230C90 * param0) +void ov66_02230CAC(UnkStruct_ov66_02230C90 *param0) { ov66_02230D54(param0, 5); } -int ov66_02230CB8 (UnkStruct_ov66_02230C90 * param0) +int ov66_02230CB8(UnkStruct_ov66_02230C90 *param0) { BOOL v0; u32 v1 = 0; @@ -173,20 +173,20 @@ int ov66_02230CB8 (UnkStruct_ov66_02230C90 * param0) return v1; } -void ov66_02230CE8 (UnkStruct_ov66_02230C90 * param0) +void ov66_02230CE8(UnkStruct_ov66_02230C90 *param0) { return; } -static void ov66_02230CEC (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, const OverlayManagerTemplate * param2) +static void ov66_02230CEC(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, const OverlayManagerTemplate *param2) { GF_ASSERT(param0->unk_00 == NULL); param0->unk_00 = OverlayManager_New(param2, param1->unk_00, param0->unk_3A); } -static void ov66_02230D0C (UnkStruct_ov66_02230C90 * param0, u32 param1, u32 param2) +static void ov66_02230D0C(UnkStruct_ov66_02230C90 *param0, u32 param1, u32 param2) { - static void (* v0[])(UnkStruct_ov66_02230C90 *, UnkStruct_ov66_02230E4C *, u32) = { + static void (*v0[])(UnkStruct_ov66_02230C90 *, UnkStruct_ov66_02230E4C *, u32) = { ov66_02230E28, ov66_02230F1C, ov66_02230FA0, @@ -206,9 +206,9 @@ static void ov66_02230D0C (UnkStruct_ov66_02230C90 * param0, u32 param1, u32 par v0[param1](param0, ¶m0->unk_04[param1], param2); } -static void ov66_02230D34 (UnkStruct_ov66_02230C90 * param0, u32 param1) +static void ov66_02230D34(UnkStruct_ov66_02230C90 *param0, u32 param1) { - static void (* v0[])(UnkStruct_ov66_02230E4C *) = { + static void (*v0[])(UnkStruct_ov66_02230E4C *) = { ov66_02230E4C, ov66_02230F44, ov66_02230FE4, @@ -228,9 +228,9 @@ static void ov66_02230D34 (UnkStruct_ov66_02230C90 * param0, u32 param1) v0[param1](¶m0->unk_04[param1]); } -static void ov66_02230D54 (UnkStruct_ov66_02230C90 * param0, u32 param1) +static void ov66_02230D54(UnkStruct_ov66_02230C90 *param0, u32 param1) { - static void (* v0[])(UnkStruct_ov66_02230C90 *, UnkStruct_ov66_02230E4C *) = { + static void (*v0[])(UnkStruct_ov66_02230C90 *, UnkStruct_ov66_02230E4C *) = { ov66_02230E68, ov66_02230F50, ov66_02230FF0, @@ -252,9 +252,9 @@ static void ov66_02230D54 (UnkStruct_ov66_02230C90 * param0, u32 param1) param0->unk_38 = param1; } -static int ov66_02230D7C (UnkStruct_ov66_02230C90 * param0, u32 param1) +static int ov66_02230D7C(UnkStruct_ov66_02230C90 *param0, u32 param1) { - static int (* v0[])(UnkStruct_ov66_02230C90 *, UnkStruct_ov66_02230E4C *) = { + static int (*v0[])(UnkStruct_ov66_02230C90 *, UnkStruct_ov66_02230E4C *) = { ov66_02230E90, ov66_02230F7C, ov66_02231000, @@ -274,7 +274,7 @@ static int ov66_02230D7C (UnkStruct_ov66_02230C90 * param0, u32 param1) return v0[param1](param0, ¶m0->unk_04[param1]); } -static void ov66_02230DA0 (UnkStruct_ov66_02230DBC * param0, u32 param1) +static void ov66_02230DA0(UnkStruct_ov66_02230DBC *param0, u32 param1) { int v0; @@ -283,7 +283,7 @@ static void ov66_02230DA0 (UnkStruct_ov66_02230DBC * param0, u32 param1) } } -static void ov66_02230DBC (UnkStruct_ov66_02230DBC * param0) +static void ov66_02230DBC(UnkStruct_ov66_02230DBC *param0) { int v0; @@ -293,10 +293,10 @@ static void ov66_02230DBC (UnkStruct_ov66_02230DBC * param0) } } -static void ov66_02230DD8 (UnkStruct_ov66_02230DBC * param0, UnkStruct_ov66_0222DFF8 * param1, u32 param2) +static void ov66_02230DD8(UnkStruct_ov66_02230DBC *param0, UnkStruct_ov66_0222DFF8 *param1, u32 param2) { - const UnkStruct_ov66_0222E71C * v0; - const UnkStruct_ov66_0222E71C * v1; + const UnkStruct_ov66_0222E71C *v0; + const UnkStruct_ov66_0222E71C *v1; int v2; v0 = ov66_0222E3BC(param1); @@ -317,9 +317,9 @@ static void ov66_02230DD8 (UnkStruct_ov66_02230DBC * param0, UnkStruct_ov66_0222 } } -static void ov66_02230E28 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_02230E28(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov66_02230E68 * v0; + UnkStruct_ov66_02230E68 *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02230E68)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02230E68)); @@ -329,16 +329,16 @@ static void ov66_02230E28 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 v0->unk_1C = param0->unk_3C; } -static void ov66_02230E4C (UnkStruct_ov66_02230E4C * param0) +static void ov66_02230E4C(UnkStruct_ov66_02230E4C *param0) { GF_ASSERT(param0->unk_00); Heap_FreeToHeap(param0->unk_00); param0->unk_00 = NULL; } -static void ov66_02230E68 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_02230E68(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { - UnkStruct_ov66_02230E68 * v0; + UnkStruct_ov66_02230E68 *v0; FS_EXTERN_OVERLAY(overlay70); @@ -353,9 +353,9 @@ static void ov66_02230E68 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v1); } -static int ov66_02230E90 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static int ov66_02230E90(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { - UnkStruct_ov66_02230E68 * v0; + UnkStruct_ov66_02230E68 *v0; v0 = param1->unk_00; @@ -401,9 +401,9 @@ static int ov66_02230E90 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230 return 0; } -static void ov66_02230F1C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_02230F1C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov66_02230F50 * v0; + UnkStruct_ov66_02230F50 *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02230F50)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02230F50)); @@ -414,14 +414,14 @@ static void ov66_02230F1C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 v0->unk_0C = param0->unk_3C; } -static void ov66_02230F44 (UnkStruct_ov66_02230E4C * param0) +static void ov66_02230F44(UnkStruct_ov66_02230E4C *param0) { Heap_FreeToHeap(param0->unk_00); } -static void ov66_02230F50 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_02230F50(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { - UnkStruct_ov66_02230F50 * v0; + UnkStruct_ov66_02230F50 *v0; FS_EXTERN_OVERLAY(overlay69); @@ -437,7 +437,7 @@ static void ov66_02230F50 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v1); } -static int ov66_02230F7C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static int ov66_02230F7C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { if (ov66_0222E138(param0->unk_3C)) { ov66_02230D54(param0, 10); @@ -448,9 +448,9 @@ static int ov66_02230F7C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230 return 0; } -static void ov66_02230FA0 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_02230FA0(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov66_02230FA0 * v0; + UnkStruct_ov66_02230FA0 *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02230FA0)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02230FA0)); @@ -462,12 +462,12 @@ static void ov66_02230FA0 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 v0->unk_08 = param0->unk_3C; } -static void ov66_02230FE4 (UnkStruct_ov66_02230E4C * param0) +static void ov66_02230FE4(UnkStruct_ov66_02230E4C *param0) { Heap_FreeToHeap(param0->unk_00); } -static void ov66_02230FF0 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_02230FF0(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { FS_EXTERN_OVERLAY(overlay112); @@ -478,7 +478,7 @@ static void ov66_02230FF0 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v0); } -static int ov66_02231000 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static int ov66_02231000(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { if (ov66_0222E138(param0->unk_3C)) { ov66_02230D54(param0, 10); @@ -489,9 +489,9 @@ static int ov66_02231000 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230 return 0; } -static void ov66_02231024 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_02231024(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov66_02231024 * v0; + UnkStruct_ov66_02231024 *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02231024)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231024)); @@ -504,15 +504,15 @@ static void ov66_02231024 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 v0->unk_0C = param0->unk_44; } -static void ov66_02231058 (UnkStruct_ov66_02230E4C * param0) +static void ov66_02231058(UnkStruct_ov66_02230E4C *param0) { - UnkStruct_ov66_02231024 * v0; + UnkStruct_ov66_02231024 *v0; v0 = param0->unk_00; Heap_FreeToHeap(param0->unk_00); } -static void ov66_02231064 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_02231064(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { FS_EXTERN_OVERLAY(overlay67); @@ -523,9 +523,9 @@ static void ov66_02231064 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v0); } -static int ov66_02231074 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static int ov66_02231074(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { - UnkStruct_ov66_02231024 * v0; + UnkStruct_ov66_02231024 *v0; v0 = param1->unk_00; @@ -537,9 +537,9 @@ static int ov66_02231074 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230 return 0; } -static void ov66_0223108C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_0223108C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov115_02260440 * v0; + UnkStruct_ov115_02260440 *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov115_02260440)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov115_02260440)); @@ -553,9 +553,9 @@ static void ov66_0223108C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230DA0(&v0->unk_00, param2); } -static void ov66_022310C4 (UnkStruct_ov66_02230E4C * param0) +static void ov66_022310C4(UnkStruct_ov66_02230E4C *param0) { - UnkStruct_ov115_02260440 * v0; + UnkStruct_ov115_02260440 *v0; v0 = param0->unk_00; @@ -563,19 +563,22 @@ static void ov66_022310C4 (UnkStruct_ov66_02230E4C * param0) Heap_FreeToHeap(param0->unk_00); } -static void ov66_022310D8 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_022310D8(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { FS_EXTERN_OVERLAY(overlay115); FS_EXTERN_OVERLAY(overlay114); static const OverlayManagerTemplate v0 = { - ov115_02260440, ov115_0226048C, ov115_022608E4, FS_OVERLAY_ID(overlay115), + ov115_02260440, + ov115_0226048C, + ov115_022608E4, + FS_OVERLAY_ID(overlay115), }; Overlay_LoadByID(FS_OVERLAY_ID(overlay114), 2); { - UnkStruct_ov115_02260440 * v1; + UnkStruct_ov115_02260440 *v1; v1 = param1->unk_00; ov66_02230DD8(&v1->unk_00, param0->unk_3C, param0->unk_3A); @@ -584,13 +587,13 @@ static void ov66_022310D8 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v0); } -static int ov66_02231104 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static int ov66_02231104(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { FS_EXTERN_OVERLAY(overlay114); Overlay_UnloadByID(FS_OVERLAY_ID(overlay114)); { - UnkStruct_ov115_02260440 * v0; + UnkStruct_ov115_02260440 *v0; v0 = param1->unk_00; @@ -603,9 +606,9 @@ static int ov66_02231104 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230 return 0; } -static void ov66_02231134 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_02231134(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov66_02231134 * v0; + UnkStruct_ov66_02231134 *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02231134)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231134)); @@ -619,9 +622,9 @@ static void ov66_02231134 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230DA0(&v0->unk_00, param2); } -static void ov66_02231164 (UnkStruct_ov66_02230E4C * param0) +static void ov66_02231164(UnkStruct_ov66_02230E4C *param0) { - UnkStruct_ov66_02231134 * v0; + UnkStruct_ov66_02231134 *v0; v0 = param0->unk_00; @@ -629,19 +632,22 @@ static void ov66_02231164 (UnkStruct_ov66_02230E4C * param0) Heap_FreeToHeap(param0->unk_00); } -static void ov66_02231178 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_02231178(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { FS_EXTERN_OVERLAY(overlay116); FS_EXTERN_OVERLAY(overlay114); static const OverlayManagerTemplate v0 = { - ov116_022609B4, ov116_02260CF4, ov116_0226126C, FS_OVERLAY_ID(overlay116), + ov116_022609B4, + ov116_02260CF4, + ov116_0226126C, + FS_OVERLAY_ID(overlay116), }; Overlay_LoadByID(FS_OVERLAY_ID(overlay114), 2); { - UnkStruct_ov66_02231134 * v1; + UnkStruct_ov66_02231134 *v1; v1 = param1->unk_00; ov66_02230DD8(&v1->unk_00, param0->unk_3C, param0->unk_3A); @@ -650,13 +656,13 @@ static void ov66_02231178 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v0); } -static int ov66_022311A4 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static int ov66_022311A4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { FS_EXTERN_OVERLAY(overlay114); Overlay_UnloadByID(FS_OVERLAY_ID(overlay114)); { - UnkStruct_ov66_02231134 * v0; + UnkStruct_ov66_02231134 *v0; v0 = param1->unk_00; @@ -669,9 +675,9 @@ static int ov66_022311A4 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230 return 0; } -static void ov66_022311D4 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_022311D4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov117_02260440 * v0; + UnkStruct_ov117_02260440 *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov117_02260440)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov117_02260440)); @@ -684,9 +690,9 @@ static void ov66_022311D4 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230DA0(&v0->unk_00, param2); } -static void ov66_0223120C (UnkStruct_ov66_02230E4C * param0) +static void ov66_0223120C(UnkStruct_ov66_02230E4C *param0) { - UnkStruct_ov117_02260440 * v0; + UnkStruct_ov117_02260440 *v0; v0 = param0->unk_00; @@ -694,19 +700,22 @@ static void ov66_0223120C (UnkStruct_ov66_02230E4C * param0) Heap_FreeToHeap(param0->unk_00); } -static void ov66_02231220 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_02231220(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { FS_EXTERN_OVERLAY(overlay117); FS_EXTERN_OVERLAY(overlay114); static const OverlayManagerTemplate v0 = { - ov117_02260440, ov117_02260474, ov117_022605C0, FS_OVERLAY_ID(overlay117), + ov117_02260440, + ov117_02260474, + ov117_022605C0, + FS_OVERLAY_ID(overlay117), }; Overlay_LoadByID(FS_OVERLAY_ID(overlay114), 2); { - UnkStruct_ov117_02260440 * v1; + UnkStruct_ov117_02260440 *v1; v1 = param1->unk_00; ov66_02230DD8(&v1->unk_00, param0->unk_3C, param0->unk_3A); @@ -715,13 +724,13 @@ static void ov66_02231220 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v0); } -static int ov66_0223124C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static int ov66_0223124C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { FS_EXTERN_OVERLAY(overlay114); Overlay_UnloadByID(FS_OVERLAY_ID(overlay114)); { - UnkStruct_ov117_02260440 * v0; + UnkStruct_ov117_02260440 *v0; v0 = param1->unk_00; @@ -734,9 +743,9 @@ static int ov66_0223124C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230 return 0; } -static void ov66_0223127C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_0223127C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov66_0223127C * v0; + UnkStruct_ov66_0223127C *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_0223127C)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_0223127C)); @@ -745,12 +754,12 @@ static void ov66_0223127C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 v0->unk_00 = param0->unk_3C; } -static void ov66_022312A8 (UnkStruct_ov66_02230E4C * param0) +static void ov66_022312A8(UnkStruct_ov66_02230E4C *param0) { Heap_FreeToHeap(param0->unk_00); } -static int ov66_022312B4 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static int ov66_022312B4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { if (ov66_0222E138(param0->unk_3C)) { ov66_02230D54(param0, 10); @@ -761,14 +770,17 @@ static int ov66_022312B4 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230 return 0; } -static void ov66_022312D8 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_022312D8(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { - UnkStruct_ov66_0223127C * v0; + UnkStruct_ov66_0223127C *v0; FS_EXTERN_OVERLAY(overlay113); static const OverlayManagerTemplate v1 = { - ov113_0225C700, ov113_0225CA04, ov113_0225CDFC, FS_OVERLAY_ID(overlay113), + ov113_0225C700, + ov113_0225CA04, + ov113_0225CDFC, + FS_OVERLAY_ID(overlay113), }; v0 = param1->unk_00; @@ -777,14 +789,17 @@ static void ov66_022312D8 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v1); } -static void ov66_022312EC (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_022312EC(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { - UnkStruct_ov66_0223127C * v0; + UnkStruct_ov66_0223127C *v0; FS_EXTERN_OVERLAY(overlay113); static const OverlayManagerTemplate v1 = { - ov113_0225C700, ov113_0225CA04, ov113_0225CDFC, FS_OVERLAY_ID(overlay113), + ov113_0225C700, + ov113_0225CA04, + ov113_0225CDFC, + FS_OVERLAY_ID(overlay113), }; v0 = param1->unk_00; @@ -793,9 +808,9 @@ static void ov66_022312EC (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v1); } -static void ov66_02231300 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_02231300(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov66_02231300 * v0; + UnkStruct_ov66_02231300 *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02231300)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231300)); @@ -805,22 +820,22 @@ static void ov66_02231300 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 v0->unk_04 = param0->unk_3C; } -static void ov66_02231338 (UnkStruct_ov66_02230E4C * param0) +static void ov66_02231338(UnkStruct_ov66_02230E4C *param0) { Heap_FreeToHeap(param0->unk_00); } -static void ov66_02231344 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_02231344(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { ov66_0223135C(param0, param1, 0); } -static void ov66_02231350 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_02231350(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { ov66_0223135C(param0, param1, 1); } -static void ov66_0223135C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, BOOL param2) +static void ov66_0223135C(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, BOOL param2) { FS_EXTERN_OVERLAY(overlay67); @@ -829,7 +844,7 @@ static void ov66_0223135C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 }; { - UnkStruct_ov66_02231300 * v1; + UnkStruct_ov66_02231300 *v1; v1 = param1->unk_00; v1->unk_08 = param2; @@ -838,14 +853,14 @@ static void ov66_0223135C (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v0); } -static int ov66_02231370 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static int ov66_02231370(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { return 1; } -static void ov66_02231374 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_02231374(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov66_02231374 * v0; + UnkStruct_ov66_02231374 *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02231374)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231374)); @@ -856,9 +871,9 @@ static void ov66_02231374 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 v0->unk_08 = 0; } -static void ov66_022313AC (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1, u32 param2) +static void ov66_022313AC(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1, u32 param2) { - UnkStruct_ov66_02231374 * v0; + UnkStruct_ov66_02231374 *v0; param1->unk_00 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02231374)); memset(param1->unk_00, 0, sizeof(UnkStruct_ov66_02231374)); @@ -869,12 +884,12 @@ static void ov66_022313AC (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 v0->unk_08 = 1; } -static void ov66_022313E8 (UnkStruct_ov66_02230E4C * param0) +static void ov66_022313E8(UnkStruct_ov66_02230E4C *param0) { Heap_FreeToHeap(param0->unk_00); } -static void ov66_022313F4 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static void ov66_022313F4(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { FS_EXTERN_OVERLAY(overlay68); @@ -885,7 +900,7 @@ static void ov66_022313F4 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_0223 ov66_02230CEC(param0, param1, &v0); } -static int ov66_02231404 (UnkStruct_ov66_02230C90 * param0, UnkStruct_ov66_02230E4C * param1) +static int ov66_02231404(UnkStruct_ov66_02230C90 *param0, UnkStruct_ov66_02230E4C *param1) { if (ov66_0222E138(param0->unk_3C)) { ov66_02230D54(param0, 10); diff --git a/src/overlay066/ov66_02231428.c b/src/overlay066/ov66_02231428.c index 3996dac52e..d25c76efb6 100644 --- a/src/overlay066/ov66_02231428.c +++ b/src/overlay066/ov66_02231428.c @@ -1,16 +1,17 @@ +#include "overlay066/ov66_02231428.h" + +#include #include #include -#include +#include "overlay004/ov4_021D0D80.h" #include "overlay066/struct_ov66_02231428.h" #include "overlay066/struct_ov66_02231560.h" #include "unk_020366A0.h" #include "unk_020996D0.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay066/ov66_02231428.h" -void ov66_02231428 (UnkStruct_ov66_02231428 * param0, const s64 * param1) +void ov66_02231428(UnkStruct_ov66_02231428 *param0, const s64 *param1) { RTCDate v0; RTCTime v1; @@ -22,7 +23,7 @@ void ov66_02231428 (UnkStruct_ov66_02231428 * param0, const s64 * param1) param0->unk_00_val2_unk_02 = v1.second; } -void ov66_0223144C (const UnkStruct_ov66_02231428 * param0, const UnkStruct_ov66_02231428 * param1, UnkStruct_ov66_02231428 * param2) +void ov66_0223144C(const UnkStruct_ov66_02231428 *param0, const UnkStruct_ov66_02231428 *param1, UnkStruct_ov66_02231428 *param2) { u32 v0; UnkStruct_ov66_02231428 v1; @@ -47,7 +48,7 @@ void ov66_0223144C (const UnkStruct_ov66_02231428 * param0, const UnkStruct_ov66 param2->unk_00_val2_unk_00 = v1.unk_00_val2_unk_00 % 24; } -void ov66_022314BC (const UnkStruct_ov66_02231428 * param0, const UnkStruct_ov66_02231428 * param1, UnkStruct_ov66_02231428 * param2) +void ov66_022314BC(const UnkStruct_ov66_02231428 *param0, const UnkStruct_ov66_02231428 *param1, UnkStruct_ov66_02231428 *param2) { u32 v0; s32 v1; @@ -86,7 +87,7 @@ void ov66_022314BC (const UnkStruct_ov66_02231428 * param0, const UnkStruct_ov66 param2->unk_00_val2_unk_00 = v2.unk_00_val2_unk_00 - v3.unk_00_val2_unk_00; } -void ov66_02231560 (UnkStruct_ov66_02231560 * param0, u16 param1, u8 param2, BOOL param3) +void ov66_02231560(UnkStruct_ov66_02231560 *param0, u16 param1, u8 param2, BOOL param3) { int v0; BOOL v1; @@ -127,7 +128,7 @@ void ov66_02231560 (UnkStruct_ov66_02231560 * param0, u16 param1, u8 param2, BOO } } -u16 ov66_022315D8 (const UnkStruct_ov66_02231560 * param0, u8 param1) +u16 ov66_022315D8(const UnkStruct_ov66_02231560 *param0, u8 param1) { GF_ASSERT(param1 < 50); GF_ASSERT(param0->unk_00[param1].unk_03_4 == 1); @@ -135,7 +136,7 @@ u16 ov66_022315D8 (const UnkStruct_ov66_02231560 * param0, u8 param1) return param0->unk_00[param1].unk_00; } -u8 ov66_022315FC (const UnkStruct_ov66_02231560 * param0, u8 param1) +u8 ov66_022315FC(const UnkStruct_ov66_02231560 *param0, u8 param1) { GF_ASSERT(param1 < 50); GF_ASSERT(param0->unk_00[param1].unk_03_4 == 1); @@ -143,7 +144,7 @@ u8 ov66_022315FC (const UnkStruct_ov66_02231560 * param0, u8 param1) return param0->unk_00[param1].unk_02; } -BOOL ov66_02231624 (const UnkStruct_ov66_02231560 * param0, u8 param1) +BOOL ov66_02231624(const UnkStruct_ov66_02231560 *param0, u8 param1) { GF_ASSERT(param1 < 50); GF_ASSERT(param0->unk_00[param1].unk_03_4 == 1); @@ -151,17 +152,17 @@ BOOL ov66_02231624 (const UnkStruct_ov66_02231560 * param0, u8 param1) return param0->unk_00[param1].unk_03_0; } -BOOL ov66_0223164C (const UnkStruct_ov66_02231560 * param0, u8 param1) +BOOL ov66_0223164C(const UnkStruct_ov66_02231560 *param0, u8 param1) { GF_ASSERT(param1 < 50); return param0->unk_00[param1].unk_03_4; } -void ov66_02231668 (void * param0) +void ov66_02231668(void *param0) { - NNSG3dResMdlSet * v0; - NNSG3dResMdl * v1; + NNSG3dResMdlSet *v0; + NNSG3dResMdl *v1; v0 = NNS_G3dGetMdlSet(param0); v1 = NNS_G3dGetMdlByIdx(v0, 0); @@ -172,7 +173,7 @@ void ov66_02231668 (void * param0) NNS_G3dMdlUseGlbEmi(v1); } -BOOL ov66_022316C4 (u16 param0, u16 param1) +BOOL ov66_022316C4(u16 param0, u16 param1) { u32 v0; @@ -191,25 +192,42 @@ BOOL ov66_022316C4 (u16 param0, u16 param1) return 0; } -u32 ov66_022316E8 (int param0) +u32 ov66_022316E8(int param0) { static const u8 v0[18] = { - 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17, + 9, + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, }; return v0[param0]; } -int ov66_022316F4 (int param0, int param1) +int ov66_022316F4(int param0, int param1) { int v0; int v1; v0 = ov4_021D1F3C(param0, param1); - if ((v0 == 11) || (param0 == ((DWC_ERROR_NUM)+5))) { + if ((v0 == 11) || (param0 == ((DWC_ERROR_NUM) + 5))) { v1 = 14; - } else if (param0 == ((DWC_ERROR_NUM)+6)) { + } else if (param0 == ((DWC_ERROR_NUM) + 6)) { v1 = 13; } else { if (v0 >= 0) { @@ -222,16 +240,16 @@ int ov66_022316F4 (int param0, int param1) return v1; } -int ov66_02231718 (int param0, int param1) +int ov66_02231718(int param0, int param1) { int v0; int v1; v0 = ov4_021D1F3C(param0, param1); - if (param0 == ((DWC_ERROR_NUM)+5)) { + if (param0 == ((DWC_ERROR_NUM) + 5)) { v0 = 11; - } else if (param0 == ((DWC_ERROR_NUM)+6)) { + } else if (param0 == ((DWC_ERROR_NUM) + 6)) { v0 = 12; } @@ -258,7 +276,7 @@ int ov66_02231718 (int param0, int param1) return v1; } -BOOL ov66_02231760 (void) +BOOL ov66_02231760(void) { if (sub_020383E8() || sub_0203881C()) { return 1; diff --git a/src/overlay066/ov66_0223177C.c b/src/overlay066/ov66_0223177C.c index 348f4f28e3..8f5e20f332 100644 --- a/src/overlay066/ov66_0223177C.c +++ b/src/overlay066/ov66_0223177C.c @@ -1,12 +1,8 @@ -#include "enums.h" +#include "overlay066/ov66_0223177C.h" #include #include -#include "message.h" -#include "strbuf.h" -#include "trainer_info.h" - #include "overlay066/struct_ov66_02231428.h" #include "overlay066/struct_ov66_0223185C.h" #include "overlay066/struct_ov66_022318AC.h" @@ -19,12 +15,12 @@ #include "overlay066/struct_ov66_02231B80.h" #include "overlay066/struct_ov66_02232068.h" -#include "message.h" -#include "string_template.h" +#include "enums.h" #include "heap.h" +#include "message.h" #include "strbuf.h" +#include "string_template.h" #include "trainer_info.h" -#include "overlay066/ov66_0223177C.h" typedef struct { u16 unk_00; @@ -40,12 +36,12 @@ typedef struct { typedef struct UnkStruct_ov66_02231FB0_t { u8 unk_00; u32 unk_04[3]; - Strbuf* unk_10[4]; + Strbuf *unk_10[4]; u16 unk_20[4]; u16 unk_28; s16 unk_2A; - struct UnkStruct_ov66_02231FB0_t * unk_2C; - struct UnkStruct_ov66_02231FB0_t * unk_30; + struct UnkStruct_ov66_02231FB0_t *unk_2C; + struct UnkStruct_ov66_02231FB0_t *unk_30; } UnkStruct_ov66_02231FB0; typedef struct { @@ -60,50 +56,50 @@ typedef struct UnkStruct_ov66_0223177C_t { UnkStruct_ov66_02231E94 unk_5C; } UnkStruct_ov66_0223177C; -static void ov66_02231D38(UnkStruct_ov66_02231D38 * param0); -static void ov66_02231D58(UnkStruct_ov66_02231D38 * param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3); -static void ov66_02231D74(UnkStruct_ov66_02231D38 * param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3); -static void ov66_02231D90(UnkStruct_ov66_02231D38 * param0, u32 param1); -static void ov66_02231DA8(UnkStruct_ov66_02231D38 * param0, u32 param1, UnkEnum_ov66_02231E54 param2); -static void ov66_02231DC0(UnkStruct_ov66_02231D38 * param0, UnkEnum_ov66_02231E6C param1); -static void ov66_02231DD4(UnkStruct_ov66_02231D38 * param0, u32 param1); -static BOOL ov66_02231DE8(const UnkStruct_ov66_02231D38 * param0, u32 param1); -static u32 ov66_02231DFC(const UnkStruct_ov66_02231D38 * param0, u32 param1); -static BOOL ov66_02231E10(const UnkStruct_ov66_02231D38 * param0, u32 param1); -static BOOL ov66_02231E30(const UnkStruct_ov66_02231D38 * param0, u32 param1); -static UnkEnum_ov66_02231E54 ov66_02231E54(const UnkStruct_ov66_02231D38 * param0, u32 param1); -static UnkEnum_ov66_02231E6C ov66_02231E6C(const UnkStruct_ov66_02231D38 * param0); -static BOOL ov66_02231E74(const UnkStruct_ov66_02231D38 * param0, u32 param1); -static void ov66_02231E94(UnkStruct_ov66_02231E94 * param0, u32 param1); -static void ov66_02231EEC(UnkStruct_ov66_02231E94 * param0); -static void ov66_02231F1C(UnkStruct_ov66_02231E94 * param0); -static void ov66_02231F58(UnkStruct_ov66_02231E94 * param0); -static UnkStruct_ov66_02231FB0 * ov66_02231F68(UnkStruct_ov66_02231E94 * param0, u16 param1); -static void ov66_02231FB0(UnkStruct_ov66_02231FB0 * param0, UnkStruct_ov66_02231FB0 * param1); -static void ov66_02231FC0(UnkStruct_ov66_02231E94 * param0, UnkStruct_ov66_02231FB0 * param1); -static void ov66_02231FE8(UnkStruct_ov66_02231E94 * param0, UnkStruct_ov66_02231FB0 * param1); -static void ov66_02231FFC(UnkStruct_ov66_02231FB0 * param0, u32 param1, u32 param2, u32 param3, const TrainerInfo * param4, const TrainerInfo * param5, const TrainerInfo * param6, const TrainerInfo * param7, u16 param8, u16 param9, u16 param10, u16 param11, u32 param12, u32 param13, u32 param14); -static BOOL ov66_02232068(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5); -static BOOL ov66_022320BC(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5); -static BOOL ov66_0223211C(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5); -static BOOL ov66_02232258(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5); -static BOOL ov66_022322B8(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5); -static BOOL ov66_02232330(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5); -static BOOL ov66_022323A0(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5); -static BOOL ov66_022323C4(UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5); -static u32 ov66_0223245C(const UnkStruct_ov66_02231FB0 * param0, u32 param1); -static u32 ov66_0223246C(const UnkStruct_ov66_02231FB0 * param0, u32 param1); -static u32 ov66_0223247C(const UnkStruct_ov66_02231FB0 * param0, u32 param1); -static u32 ov66_02232490(const UnkStruct_ov66_02231FB0 * param0, u32 param1); -static u32 ov66_022324A0(const UnkStruct_ov66_02231FB0 * param0, u32 param1); -static u32 ov66_022324B4(const UnkStruct_ov66_02231FB0 * param0, u32 param1); -static u32 ov66_022324B8(const UnkStruct_ov66_02231FB0 * param0, u32 param1); -static u32 ov66_022324BC(const UnkStruct_ov66_02231FB0 * param0, u32 param1); +static void ov66_02231D38(UnkStruct_ov66_02231D38 *param0); +static void ov66_02231D58(UnkStruct_ov66_02231D38 *param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3); +static void ov66_02231D74(UnkStruct_ov66_02231D38 *param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3); +static void ov66_02231D90(UnkStruct_ov66_02231D38 *param0, u32 param1); +static void ov66_02231DA8(UnkStruct_ov66_02231D38 *param0, u32 param1, UnkEnum_ov66_02231E54 param2); +static void ov66_02231DC0(UnkStruct_ov66_02231D38 *param0, UnkEnum_ov66_02231E6C param1); +static void ov66_02231DD4(UnkStruct_ov66_02231D38 *param0, u32 param1); +static BOOL ov66_02231DE8(const UnkStruct_ov66_02231D38 *param0, u32 param1); +static u32 ov66_02231DFC(const UnkStruct_ov66_02231D38 *param0, u32 param1); +static BOOL ov66_02231E10(const UnkStruct_ov66_02231D38 *param0, u32 param1); +static BOOL ov66_02231E30(const UnkStruct_ov66_02231D38 *param0, u32 param1); +static UnkEnum_ov66_02231E54 ov66_02231E54(const UnkStruct_ov66_02231D38 *param0, u32 param1); +static UnkEnum_ov66_02231E6C ov66_02231E6C(const UnkStruct_ov66_02231D38 *param0); +static BOOL ov66_02231E74(const UnkStruct_ov66_02231D38 *param0, u32 param1); +static void ov66_02231E94(UnkStruct_ov66_02231E94 *param0, u32 param1); +static void ov66_02231EEC(UnkStruct_ov66_02231E94 *param0); +static void ov66_02231F1C(UnkStruct_ov66_02231E94 *param0); +static void ov66_02231F58(UnkStruct_ov66_02231E94 *param0); +static UnkStruct_ov66_02231FB0 *ov66_02231F68(UnkStruct_ov66_02231E94 *param0, u16 param1); +static void ov66_02231FB0(UnkStruct_ov66_02231FB0 *param0, UnkStruct_ov66_02231FB0 *param1); +static void ov66_02231FC0(UnkStruct_ov66_02231E94 *param0, UnkStruct_ov66_02231FB0 *param1); +static void ov66_02231FE8(UnkStruct_ov66_02231E94 *param0, UnkStruct_ov66_02231FB0 *param1); +static void ov66_02231FFC(UnkStruct_ov66_02231FB0 *param0, u32 param1, u32 param2, u32 param3, const TrainerInfo *param4, const TrainerInfo *param5, const TrainerInfo *param6, const TrainerInfo *param7, u16 param8, u16 param9, u16 param10, u16 param11, u32 param12, u32 param13, u32 param14); +static BOOL ov66_02232068(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5); +static BOOL ov66_022320BC(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5); +static BOOL ov66_0223211C(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5); +static BOOL ov66_02232258(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5); +static BOOL ov66_022322B8(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5); +static BOOL ov66_02232330(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5); +static BOOL ov66_022323A0(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5); +static BOOL ov66_022323C4(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5); +static u32 ov66_0223245C(const UnkStruct_ov66_02231FB0 *param0, u32 param1); +static u32 ov66_0223246C(const UnkStruct_ov66_02231FB0 *param0, u32 param1); +static u32 ov66_0223247C(const UnkStruct_ov66_02231FB0 *param0, u32 param1); +static u32 ov66_02232490(const UnkStruct_ov66_02231FB0 *param0, u32 param1); +static u32 ov66_022324A0(const UnkStruct_ov66_02231FB0 *param0, u32 param1); +static u32 ov66_022324B4(const UnkStruct_ov66_02231FB0 *param0, u32 param1); +static u32 ov66_022324B8(const UnkStruct_ov66_02231FB0 *param0, u32 param1); +static u32 ov66_022324BC(const UnkStruct_ov66_02231FB0 *param0, u32 param1); static BOOL ov66_022324D0(enum PlazaMinigame param0, u32 param1); -UnkStruct_ov66_0223177C * ov66_0223177C (u32 param0) +UnkStruct_ov66_0223177C *ov66_0223177C(u32 param0) { - UnkStruct_ov66_0223177C * v0; + UnkStruct_ov66_0223177C *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov66_0223177C)); memset(v0, 0, sizeof(UnkStruct_ov66_0223177C)); @@ -114,30 +110,30 @@ UnkStruct_ov66_0223177C * ov66_0223177C (u32 param0) return v0; } -void ov66_022317AC (UnkStruct_ov66_0223177C * param0) +void ov66_022317AC(UnkStruct_ov66_0223177C *param0) { ov66_02231EEC(¶m0->unk_5C); Heap_FreeToHeap(param0); } -void ov66_022317C0 (UnkStruct_ov66_0223177C * param0) +void ov66_022317C0(UnkStruct_ov66_0223177C *param0) { ov66_02231F1C(¶m0->unk_5C); ov66_02231DC0(¶m0->unk_08, UnkEnum_ov66_02231E6C_00); } -void ov66_022317D8 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231428 * param1) +void ov66_022317D8(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231428 *param1) { param0->unk_00 = *param1; param0->unk_04 = 1; } -void ov66_022317E4 (UnkStruct_ov66_0223177C * param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3) +void ov66_022317E4(UnkStruct_ov66_0223177C *param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3) { ov66_02231D74(¶m0->unk_08, param1, param2, param3); } -BOOL ov66_022317F0 (UnkStruct_ov66_0223177C * param0, u32 param1) +BOOL ov66_022317F0(UnkStruct_ov66_0223177C *param0, u32 param1) { BOOL v0; @@ -147,7 +143,7 @@ BOOL ov66_022317F0 (UnkStruct_ov66_0223177C * param0, u32 param1) return v0; } -void ov66_0223180C (UnkStruct_ov66_0223177C * param0, u32 param1) +void ov66_0223180C(UnkStruct_ov66_0223177C *param0, u32 param1) { u32 v0; int v1; @@ -165,9 +161,9 @@ void ov66_0223180C (UnkStruct_ov66_0223177C * param0, u32 param1) ov66_02231DA8(¶m0->unk_08, param1, v0 | UnkEnum_ov66_02231E54_02); } -void ov66_0223185C (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_0223185C * param1) +void ov66_0223185C(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_0223185C *param1) { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; v0 = ov66_02231F68(¶m0->unk_5C, 8); @@ -179,9 +175,9 @@ void ov66_0223185C (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231 ov66_02231FC0(¶m0->unk_5C, v0); } -void ov66_022318AC (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_022318AC * param1) +void ov66_022318AC(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_022318AC *param1) { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; if (param1->unk_0C >= 27) { return; @@ -197,12 +193,14 @@ void ov66_022318AC (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231 ov66_02231FC0(¶m0->unk_5C, v0); } -void ov66_02231908 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231908 * param1) +void ov66_02231908(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231908 *param1) { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; u32 v1; static const sc_NEWS_DSET_MINIGAME_PRI[UnkEnum_ov66_022324D0_12] = { - 4, 3, 2, + 4, + 3, + 2, }; if ((param1->unk_00 != UnkEnum_ov66_022324D0_00) && (param1->unk_00 != UnkEnum_ov66_022324D0_01) && (param1->unk_00 != UnkEnum_ov66_022324D0_02)) { @@ -230,9 +228,9 @@ void ov66_02231908 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231 ov66_02231FC0(¶m0->unk_5C, v0); } -void ov66_0223199C (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_0223199C * param1) +void ov66_0223199C(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_0223199C *param1) { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; if ((param1->unk_00 != UnkEnum_ov66_022324D0_03) && (param1->unk_00 != UnkEnum_ov66_022324D0_04)) { return; @@ -248,9 +246,9 @@ void ov66_0223199C (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231 ov66_02231FC0(¶m0->unk_5C, v0); } -void ov66_022319FC (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_022319FC * param1) +void ov66_022319FC(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_022319FC *param1) { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; v0 = ov66_02231F68(¶m0->unk_5C, 12); @@ -262,9 +260,9 @@ void ov66_022319FC (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231 ov66_02231FC0(¶m0->unk_5C, v0); } -void ov66_02231A58 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231A58 * param1) +void ov66_02231A58(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231A58 *param1) { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; v0 = ov66_02231F68(¶m0->unk_5C, 13); @@ -276,9 +274,9 @@ void ov66_02231A58 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231 ov66_02231FC0(¶m0->unk_5C, v0); } -void ov66_02231AB4 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231AB4 * param1) +void ov66_02231AB4(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231AB4 *param1) { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; switch (param1->unk_04) { case 0: @@ -300,9 +298,9 @@ void ov66_02231AB4 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231 ov66_02231FC0(¶m0->unk_5C, v0); } -void ov66_02231B24 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231B24 * param1, const UnkStruct_ov66_02232068 * param2) +void ov66_02231B24(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231B24 *param1, const UnkStruct_ov66_02232068 *param2) { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; int v1; if (param1->unk_00 >= 20) { @@ -323,12 +321,14 @@ void ov66_02231B24 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231 ov66_02231FC0(¶m0->unk_5C, v0); } -void ov66_02231B80 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231B80 * param1) +void ov66_02231B80(UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02231B80 *param1) { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; u32 v1; static const u8 v2[3] = { - 11, 10, 9, + 11, + 10, + 9, }; if ((param1->unk_00 != UnkEnum_ov66_022324D0_00) && (param1->unk_00 != UnkEnum_ov66_022324D0_01) && (param1->unk_00 != UnkEnum_ov66_022324D0_02)) { @@ -350,48 +350,48 @@ void ov66_02231B80 (UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02231 ov66_02231FC0(¶m0->unk_5C, v0); } -void ov66_02231C04 (UnkStruct_ov66_0223177C * param0) +void ov66_02231C04(UnkStruct_ov66_0223177C *param0) { ov66_02231F58(¶m0->unk_5C); } -BOOL ov66_02231C10 (const UnkStruct_ov66_0223177C * param0, UnkStruct_ov66_02231428 * param1) +BOOL ov66_02231C10(const UnkStruct_ov66_0223177C *param0, UnkStruct_ov66_02231428 *param1) { *param1 = param0->unk_00; return param0->unk_04; } -BOOL ov66_02231C18 (const UnkStruct_ov66_0223177C * param0, u32 param1) +BOOL ov66_02231C18(const UnkStruct_ov66_0223177C *param0, u32 param1) { return ov66_02231DE8(¶m0->unk_08, param1); } -u32 ov66_02231C24 (const UnkStruct_ov66_0223177C * param0, u32 param1) +u32 ov66_02231C24(const UnkStruct_ov66_0223177C *param0, u32 param1) { return ov66_02231DFC(¶m0->unk_08, param1); } -BOOL ov66_02231C30 (const UnkStruct_ov66_0223177C * param0, u32 param1) +BOOL ov66_02231C30(const UnkStruct_ov66_0223177C *param0, u32 param1) { return ov66_02231E10(¶m0->unk_08, param1); } -BOOL ov66_02231C3C (const UnkStruct_ov66_0223177C * param0, u32 param1) +BOOL ov66_02231C3C(const UnkStruct_ov66_0223177C *param0, u32 param1) { return ov66_02231E30(¶m0->unk_08, param1); } -BOOL ov66_02231C48 (const UnkStruct_ov66_0223177C * param0, u32 param1) +BOOL ov66_02231C48(const UnkStruct_ov66_0223177C *param0, u32 param1) { return ov66_02231E74(¶m0->unk_08, param1); } -UnkEnum_ov66_02231E6C ov66_02231C54 (const UnkStruct_ov66_0223177C * param0) +UnkEnum_ov66_02231E6C ov66_02231C54(const UnkStruct_ov66_0223177C *param0) { return ov66_02231E6C(¶m0->unk_08); } -BOOL ov66_02231C60 (const UnkStruct_ov66_0223177C * param0) +BOOL ov66_02231C60(const UnkStruct_ov66_0223177C *param0) { if (param0->unk_5C.unk_188.unk_2C != ¶m0->unk_5C.unk_188) { return 1; @@ -400,20 +400,20 @@ BOOL ov66_02231C60 (const UnkStruct_ov66_0223177C * param0) return 0; } -int ov66_02231C78 (const UnkStruct_ov66_0223177C * param0) +int ov66_02231C78(const UnkStruct_ov66_0223177C *param0) { GF_ASSERT(ov66_02231C60(param0)); return param0->unk_5C.unk_188.unk_2C->unk_00; } -BOOL ov66_02231C94 (const UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66_02232068 * param1, int param2, Strbuf *param3, u32 param4) +BOOL ov66_02231C94(const UnkStruct_ov66_0223177C *param0, const UnkStruct_ov66_02232068 *param1, int param2, Strbuf *param3, u32 param4) { - StringTemplate * v0; - MessageLoader * v1; - UnkStruct_ov66_02231FB0 * v2; + StringTemplate *v0; + MessageLoader *v1; + UnkStruct_ov66_02231FB0 *v2; BOOL v3; - static BOOL(*const v4[])(UnkStruct_ov66_02231FB0 *, const UnkStruct_ov66_02232068 *, StringTemplate *, MessageLoader *, Strbuf *, u32) = { + static BOOL (*const v4[])(UnkStruct_ov66_02231FB0 *, const UnkStruct_ov66_02232068 *, StringTemplate *, MessageLoader *, Strbuf *, u32) = { ov66_02232068, ov66_022320BC, ov66_0223211C, @@ -443,12 +443,12 @@ BOOL ov66_02231C94 (const UnkStruct_ov66_0223177C * param0, const UnkStruct_ov66 return v3; } -u32 ov66_02231D00 (const UnkStruct_ov66_0223177C * param0, int param1, u32 param2) +u32 ov66_02231D00(const UnkStruct_ov66_0223177C *param0, int param1, u32 param2) { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; u32 v1; - static u32(*const v2[])(const UnkStruct_ov66_02231FB0 *, u32) = { + static u32 (*const v2[])(const UnkStruct_ov66_02231FB0 *, u32) = { ov66_0223245C, ov66_0223246C, ov66_0223247C, @@ -474,7 +474,7 @@ u32 ov66_02231D00 (const UnkStruct_ov66_0223177C * param0, int param1, u32 param return v1; } -static void ov66_02231D38 (UnkStruct_ov66_02231D38 * param0) +static void ov66_02231D38(UnkStruct_ov66_02231D38 *param0) { int v0; @@ -483,45 +483,45 @@ static void ov66_02231D38 (UnkStruct_ov66_02231D38 * param0) } } -static void ov66_02231D58 (UnkStruct_ov66_02231D38 * param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3) +static void ov66_02231D58(UnkStruct_ov66_02231D38 *param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3) { GF_ASSERT(param1 < 20); param0->unk_00[param1].unk_00 = param2; param0->unk_00[param1].unk_02 = param3; } -static void ov66_02231D74 (UnkStruct_ov66_02231D38 * param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3) +static void ov66_02231D74(UnkStruct_ov66_02231D38 *param0, u32 param1, u32 param2, UnkEnum_ov66_02231E54 param3) { ov66_02231D58(param0, param1, param2, param3); ov66_02231DC0(param0, UnkEnum_ov66_02231E6C_01); ov66_02231DD4(param0, param1); } -static void ov66_02231D90 (UnkStruct_ov66_02231D38 * param0, u32 param1) +static void ov66_02231D90(UnkStruct_ov66_02231D38 *param0, u32 param1) { ov66_02231D58(param0, param1, 2, 0); ov66_02231DC0(param0, UnkEnum_ov66_02231E6C_02); } -static void ov66_02231DA8 (UnkStruct_ov66_02231D38 * param0, u32 param1, UnkEnum_ov66_02231E54 param2) +static void ov66_02231DA8(UnkStruct_ov66_02231D38 *param0, u32 param1, UnkEnum_ov66_02231E54 param2) { GF_ASSERT(param1 < 20); param0->unk_00[param1].unk_02 = param2; } -static void ov66_02231DC0 (UnkStruct_ov66_02231D38 * param0, UnkEnum_ov66_02231E6C param1) +static void ov66_02231DC0(UnkStruct_ov66_02231D38 *param0, UnkEnum_ov66_02231E6C param1) { GF_ASSERT(param1 <= UnkEnum_ov66_02231E54_02); param0->unk_50 = param1; } -static void ov66_02231DD4 (UnkStruct_ov66_02231D38 * param0, u32 param1) +static void ov66_02231DD4(UnkStruct_ov66_02231D38 *param0, u32 param1) { GF_ASSERT(param1 < 20); param0->unk_52 = param1; } -static BOOL ov66_02231DE8 (const UnkStruct_ov66_02231D38 * param0, u32 param1) +static BOOL ov66_02231DE8(const UnkStruct_ov66_02231D38 *param0, u32 param1) { u32 v0; @@ -534,13 +534,13 @@ static BOOL ov66_02231DE8 (const UnkStruct_ov66_02231D38 * param0, u32 param1) return 1; } -static u32 ov66_02231DFC (const UnkStruct_ov66_02231D38 * param0, u32 param1) +static u32 ov66_02231DFC(const UnkStruct_ov66_02231D38 *param0, u32 param1) { GF_ASSERT(param1 < 20); return param0->unk_00[param1].unk_00; } -static BOOL ov66_02231E10 (const UnkStruct_ov66_02231D38 * param0, u32 param1) +static BOOL ov66_02231E10(const UnkStruct_ov66_02231D38 *param0, u32 param1) { GF_ASSERT(param1 < 20); @@ -551,7 +551,7 @@ static BOOL ov66_02231E10 (const UnkStruct_ov66_02231D38 * param0, u32 param1) return 0; } -static BOOL ov66_02231E30 (const UnkStruct_ov66_02231D38 * param0, u32 param1) +static BOOL ov66_02231E30(const UnkStruct_ov66_02231D38 *param0, u32 param1) { GF_ASSERT(param1 < 20); @@ -562,18 +562,18 @@ static BOOL ov66_02231E30 (const UnkStruct_ov66_02231D38 * param0, u32 param1) return 0; } -static UnkEnum_ov66_02231E54 ov66_02231E54 (const UnkStruct_ov66_02231D38 * param0, u32 param1) +static UnkEnum_ov66_02231E54 ov66_02231E54(const UnkStruct_ov66_02231D38 *param0, u32 param1) { GF_ASSERT(param1 < 20); return param0->unk_00[param1].unk_02; } -static UnkEnum_ov66_02231E6C ov66_02231E6C (const UnkStruct_ov66_02231D38 * param0) +static UnkEnum_ov66_02231E6C ov66_02231E6C(const UnkStruct_ov66_02231D38 *param0) { return param0->unk_50; } -static BOOL ov66_02231E74 (const UnkStruct_ov66_02231D38 * param0, u32 param1) +static BOOL ov66_02231E74(const UnkStruct_ov66_02231D38 *param0, u32 param1) { GF_ASSERT(param1 < 20); @@ -584,7 +584,7 @@ static BOOL ov66_02231E74 (const UnkStruct_ov66_02231D38 * param0, u32 param1) return 0; } -static void ov66_02231E94 (UnkStruct_ov66_02231E94 * param0, u32 param1) +static void ov66_02231E94(UnkStruct_ov66_02231E94 *param0, u32 param1) { int v0, v1; @@ -600,7 +600,7 @@ static void ov66_02231E94 (UnkStruct_ov66_02231E94 * param0, u32 param1) param0->unk_188.unk_30 = ¶m0->unk_188; } -static void ov66_02231EEC (UnkStruct_ov66_02231E94 * param0) +static void ov66_02231EEC(UnkStruct_ov66_02231E94 *param0) { int v0, v1; @@ -613,10 +613,10 @@ static void ov66_02231EEC (UnkStruct_ov66_02231E94 * param0) memset(param0, 0, sizeof(UnkStruct_ov66_02231E94)); } -static void ov66_02231F1C (UnkStruct_ov66_02231E94 * param0) +static void ov66_02231F1C(UnkStruct_ov66_02231E94 *param0) { - UnkStruct_ov66_02231FB0 * v0; - UnkStruct_ov66_02231FB0 * v1; + UnkStruct_ov66_02231FB0 *v0; + UnkStruct_ov66_02231FB0 *v1; v1 = param0->unk_188.unk_2C; @@ -634,15 +634,15 @@ static void ov66_02231F1C (UnkStruct_ov66_02231E94 * param0) } } -static void ov66_02231F58 (UnkStruct_ov66_02231E94 * param0) +static void ov66_02231F58(UnkStruct_ov66_02231E94 *param0) { ov66_02231FE8(param0, param0->unk_188.unk_2C); } -static UnkStruct_ov66_02231FB0 * ov66_02231F68 (UnkStruct_ov66_02231E94 * param0, u16 param1) +static UnkStruct_ov66_02231FB0 *ov66_02231F68(UnkStruct_ov66_02231E94 *param0, u16 param1) { int v0; - UnkStruct_ov66_02231FB0 * v1; + UnkStruct_ov66_02231FB0 *v1; v1 = NULL; @@ -666,7 +666,7 @@ static UnkStruct_ov66_02231FB0 * ov66_02231F68 (UnkStruct_ov66_02231E94 * param0 return v1; } -static void ov66_02231FB0 (UnkStruct_ov66_02231FB0 * param0, UnkStruct_ov66_02231FB0 * param1) +static void ov66_02231FB0(UnkStruct_ov66_02231FB0 *param0, UnkStruct_ov66_02231FB0 *param1) { param1->unk_2C = param0->unk_2C; param1->unk_30 = param0; @@ -674,10 +674,10 @@ static void ov66_02231FB0 (UnkStruct_ov66_02231FB0 * param0, UnkStruct_ov66_0223 param1->unk_2C->unk_30 = param1; } -static void ov66_02231FC0 (UnkStruct_ov66_02231E94 * param0, UnkStruct_ov66_02231FB0 * param1) +static void ov66_02231FC0(UnkStruct_ov66_02231E94 *param0, UnkStruct_ov66_02231FB0 *param1) { { - UnkStruct_ov66_02231FB0 * v0; + UnkStruct_ov66_02231FB0 *v0; v0 = param0->unk_188.unk_30; @@ -693,7 +693,7 @@ static void ov66_02231FC0 (UnkStruct_ov66_02231E94 * param0, UnkStruct_ov66_0223 } } -static void ov66_02231FE8 (UnkStruct_ov66_02231E94 * param0, UnkStruct_ov66_02231FB0 * param1) +static void ov66_02231FE8(UnkStruct_ov66_02231E94 *param0, UnkStruct_ov66_02231FB0 *param1) { param1->unk_30->unk_2C = param1->unk_2C; param1->unk_2C->unk_30 = param1->unk_30; @@ -701,7 +701,7 @@ static void ov66_02231FE8 (UnkStruct_ov66_02231E94 * param0, UnkStruct_ov66_0223 param1->unk_2C = NULL; } -static void ov66_02231FFC (UnkStruct_ov66_02231FB0 * param0, u32 param1, u32 param2, u32 param3, const TrainerInfo * param4, const TrainerInfo * param5, const TrainerInfo * param6, const TrainerInfo * param7, u16 param8, u16 param9, u16 param10, u16 param11, u32 param12, u32 param13, u32 param14) +static void ov66_02231FFC(UnkStruct_ov66_02231FB0 *param0, u32 param1, u32 param2, u32 param3, const TrainerInfo *param4, const TrainerInfo *param5, const TrainerInfo *param6, const TrainerInfo *param7, u16 param8, u16 param9, u16 param10, u16 param11, u32 param12, u32 param13, u32 param14) { GF_ASSERT(param14 < 9); param0->unk_00 = param14; @@ -732,9 +732,9 @@ static void ov66_02231FFC (UnkStruct_ov66_02231FB0 * param0, u32 param1, u32 par } } -static BOOL ov66_02232068 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5) +static BOOL ov66_02232068(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5) { - Strbuf* v0; + Strbuf *v0; StringTemplate_SetStrbuf(param2, 0, param0->unk_10[0], 0, 1, Unk_020E4C44); StringTemplate_SetStrbuf(param2, 1, param0->unk_10[1], 0, 1, Unk_020E4C44); @@ -747,9 +747,9 @@ static BOOL ov66_02232068 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_022320BC (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5) +static BOOL ov66_022320BC(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5) { - Strbuf* v0; + Strbuf *v0; StringTemplate_SetStrbuf(param2, 0, param0->unk_10[0], 0, 1, Unk_020E4C44); StringTemplate_SetStrbuf(param2, 1, param0->unk_10[1], 0, 1, Unk_020E4C44); @@ -763,9 +763,9 @@ static BOOL ov66_022320BC (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_0223211C (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5) +static BOOL ov66_0223211C(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5) { - Strbuf* v0; + Strbuf *v0; StringTemplate_SetPlazaMinigameName(param2, 0, param0->unk_04[0]); @@ -809,9 +809,9 @@ static BOOL ov66_0223211C (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_02232258 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5) +static BOOL ov66_02232258(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5) { - Strbuf* v0; + Strbuf *v0; StringTemplate_SetPlazaMinigameName(param2, 0, param0->unk_04[0]); StringTemplate_SetStrbuf(param2, 1, param0->unk_10[0], 0, 1, Unk_020E4C44); @@ -825,9 +825,9 @@ static BOOL ov66_02232258 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_022322B8 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5) +static BOOL ov66_022322B8(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5) { - Strbuf* v0; + Strbuf *v0; int v1; u32 v2; @@ -849,9 +849,9 @@ static BOOL ov66_022322B8 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_02232330 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5) +static BOOL ov66_02232330(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5) { - Strbuf* v0; + Strbuf *v0; u32 v1; switch (param0->unk_04[1]) { @@ -884,7 +884,7 @@ static BOOL ov66_02232330 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_022323A0 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5) +static BOOL ov66_022323A0(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5) { if (param0->unk_04[0] >= 20) { return 0; @@ -899,16 +899,22 @@ static BOOL ov66_022323A0 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov66_022323C4 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov66_02232068 * param1, StringTemplate * param2, MessageLoader * param3, Strbuf *param4, u32 param5) +static BOOL ov66_022323C4(UnkStruct_ov66_02231FB0 *param0, const UnkStruct_ov66_02232068 *param1, StringTemplate *param2, MessageLoader *param3, Strbuf *param4, u32 param5) { - Strbuf* v0; + Strbuf *v0; u32 v1; int v2; static const u16 v3[4] = { - 0, 27, 28, 23, + 0, + 27, + 28, + 23, }; static const u16 v4[4] = { - 22, 24, 25, 26, + 22, + 24, + 25, + 26, }; if (ov66_022324D0(param0->unk_04[0], param0->unk_04[1]) == 0) { @@ -933,7 +939,7 @@ static BOOL ov66_022323C4 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 return 1; } -static u32 ov66_0223245C (const UnkStruct_ov66_02231FB0 * param0, u32 param1) +static u32 ov66_0223245C(const UnkStruct_ov66_02231FB0 *param0, u32 param1) { if (param1 >= 2) { return 20; @@ -942,7 +948,7 @@ static u32 ov66_0223245C (const UnkStruct_ov66_02231FB0 * param0, u32 param1) return param0->unk_20[param1]; } -static u32 ov66_0223246C (const UnkStruct_ov66_02231FB0 * param0, u32 param1) +static u32 ov66_0223246C(const UnkStruct_ov66_02231FB0 *param0, u32 param1) { if (param1 >= 2) { return 20; @@ -951,7 +957,7 @@ static u32 ov66_0223246C (const UnkStruct_ov66_02231FB0 * param0, u32 param1) return param0->unk_20[param1]; } -static u32 ov66_0223247C (const UnkStruct_ov66_02231FB0 * param0, u32 param1) +static u32 ov66_0223247C(const UnkStruct_ov66_02231FB0 *param0, u32 param1) { if (param0->unk_04[1] <= param1) { return 20; @@ -960,7 +966,7 @@ static u32 ov66_0223247C (const UnkStruct_ov66_02231FB0 * param0, u32 param1) return param0->unk_20[param1]; } -static u32 ov66_02232490 (const UnkStruct_ov66_02231FB0 * param0, u32 param1) +static u32 ov66_02232490(const UnkStruct_ov66_02231FB0 *param0, u32 param1) { if (param1 >= 1) { return 20; @@ -969,7 +975,7 @@ static u32 ov66_02232490 (const UnkStruct_ov66_02231FB0 * param0, u32 param1) return param0->unk_20[param1]; } -static u32 ov66_022324A0 (const UnkStruct_ov66_02231FB0 * param0, u32 param1) +static u32 ov66_022324A0(const UnkStruct_ov66_02231FB0 *param0, u32 param1) { if (param0->unk_04[0] <= param1) { return 20; @@ -978,17 +984,17 @@ static u32 ov66_022324A0 (const UnkStruct_ov66_02231FB0 * param0, u32 param1) return param0->unk_20[param1]; } -static u32 ov66_022324B4 (const UnkStruct_ov66_02231FB0 * param0, u32 param1) +static u32 ov66_022324B4(const UnkStruct_ov66_02231FB0 *param0, u32 param1) { return 20; } -static u32 ov66_022324B8 (const UnkStruct_ov66_02231FB0 * param0, u32 param1) +static u32 ov66_022324B8(const UnkStruct_ov66_02231FB0 *param0, u32 param1) { return 20; } -static u32 ov66_022324BC (const UnkStruct_ov66_02231FB0 * param0, u32 param1) +static u32 ov66_022324BC(const UnkStruct_ov66_02231FB0 *param0, u32 param1) { if (param0->unk_04[1] <= param1) { return 20; @@ -997,7 +1003,7 @@ static u32 ov66_022324BC (const UnkStruct_ov66_02231FB0 * param0, u32 param1) return param0->unk_20[param1]; } -static BOOL ov66_022324D0 (enum PlazaMinigame param0, u32 param1) +static BOOL ov66_022324D0(enum PlazaMinigame param0, u32 param1) { if ((param0 == UnkEnum_ov66_022324D0_00) || (param0 == UnkEnum_ov66_022324D0_01)) { if ((param1 < 1) || (param1 > 4)) { diff --git a/src/overlay066/ov66_022324F0.c b/src/overlay066/ov66_022324F0.c index 2776369ba3..79438198c6 100644 --- a/src/overlay066/ov66_022324F0.c +++ b/src/overlay066/ov66_022324F0.c @@ -1,23 +1,23 @@ +#include "overlay066/ov66_022324F0.h" + +#include #include -#include #include -#include - -#include "enums.h" +#include #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_0202C878_decl.h" -#include "savedata.h" +#include "overlay004/ov4_021D0D80.h" #include "overlay066/struct_ov66_02232B20.h" #include "overlay066/struct_ov66_022589B4.h" -#include "heap.h" +#include "enums.h" #include "error_handling.h" +#include "heap.h" +#include "savedata.h" #include "unk_0202ACE0.h" #include "unk_0202C858.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay066/ov66_022324F0.h" typedef struct { u16 unk_00; @@ -28,13 +28,13 @@ typedef struct { typedef struct { s16 unk_00; u16 unk_02; - s32 * unk_04; + s32 *unk_04; } UnkStruct_ov66_022336C4_sub1; typedef struct { - const UnkStruct_ov66_022589B4 * unk_00; + const UnkStruct_ov66_022589B4 *unk_00; u32 unk_04; - void * unk_08; + void *unk_08; } UnkStruct_ov66_022336C4_sub3; typedef struct { @@ -45,7 +45,7 @@ typedef struct { } UnkStruct_ov66_022336C4_sub4; typedef struct { - PPW_LobbyVipRecord * unk_00; + PPW_LobbyVipRecord *unk_00; u16 unk_04; u16 unk_06; } UnkStruct_ov66_022342F4; @@ -56,12 +56,12 @@ typedef struct { } UnkStruct_ov66_0223439C; typedef struct { - SaveData * unk_00; - UnkStruct_0202B370 * unk_04; - UnkStruct_0202C878 * unk_08; + SaveData *unk_00; + UnkStruct_0202B370 *unk_04; + UnkStruct_0202C878 *unk_08; UnkStruct_ov66_022324F0 unk_0C; - void * unk_20; - u8 * unk_24; + void *unk_20; + u8 *unk_24; u32 unk_28; PPW_LobbySystemProfile unk_2C[20]; UnkStruct_ov66_022336C4_sub1 unk_11C[2]; @@ -91,68 +91,68 @@ static BOOL ov66_0223365C(PPW_LOBBY_RESULT param0); static void ov66_0223369C(void); static UnkEnum_ov66_022336B8 ov66_022336B8(PPW_LOBBY_CHANNEL_KIND param0); static PPW_LOBBY_CHANNEL_KIND ov66_022336C0(UnkEnum_ov66_022336B8 param0); -static BOOL ov66_022336C4(UnkStruct_ov66_022336C4 * param0); -static void ov66_02233758(UnkStruct_ov66_022336C4 * param0, u32 param1, u32 param2); -static void ov66_02233788(UnkStruct_ov66_022336C4 * param0); -static void ov66_0223379C(UnkStruct_ov66_022336C4 * param0, s32 param1, const void * param2); -static void ov66_022337A8(UnkStruct_ov66_022336C4 * param0, s32 param1, const void * param2, u32 param3); -static const void * ov66_022337E8(const UnkStruct_ov66_022336C4 * param0, s32 param1); -static void ov66_0223380C(UnkStruct_ov66_022336C4 * param0, s32 param1); -static void ov66_02233838(UnkStruct_ov66_022336C4 * param0, s32 param1, const PPW_LobbySystemProfile * param2); -static const PPW_LobbySystemProfile * ov66_02233864(const UnkStruct_ov66_022336C4 * param0, s32 param1); -static void ov66_02233888(UnkStruct_ov66_022336C4 * param0, s32 param1); -static void ov66_022338C8(UnkStruct_ov66_022336C4 * param0, u32 param1, u32 param2, u32 param3); -static void ov66_02233920(UnkStruct_ov66_022336C4 * param0); -static void ov66_02233950(UnkStruct_ov66_022336C4 * param0, u32 param1); -static void ov66_02233984(UnkStruct_ov66_022336C4 * param0, s32 param1, u32 param2); -static void ov66_02233A08(UnkStruct_ov66_022336C4 * param0, s32 param1, u32 param2); -static s32 ov66_02233A34(const UnkStruct_ov66_022336C4 * param0, s32 param1, u32 param2); -static s32 ov66_02233A6C(const UnkStruct_ov66_022336C4 * param0, s32 param1, u32 param2); -static void ov66_02233A94(UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_022336B8 param1); -static BOOL ov66_02233AE8(const UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_022336B8 param1); +static BOOL ov66_022336C4(UnkStruct_ov66_022336C4 *param0); +static void ov66_02233758(UnkStruct_ov66_022336C4 *param0, u32 param1, u32 param2); +static void ov66_02233788(UnkStruct_ov66_022336C4 *param0); +static void ov66_0223379C(UnkStruct_ov66_022336C4 *param0, s32 param1, const void *param2); +static void ov66_022337A8(UnkStruct_ov66_022336C4 *param0, s32 param1, const void *param2, u32 param3); +static const void *ov66_022337E8(const UnkStruct_ov66_022336C4 *param0, s32 param1); +static void ov66_0223380C(UnkStruct_ov66_022336C4 *param0, s32 param1); +static void ov66_02233838(UnkStruct_ov66_022336C4 *param0, s32 param1, const PPW_LobbySystemProfile *param2); +static const PPW_LobbySystemProfile *ov66_02233864(const UnkStruct_ov66_022336C4 *param0, s32 param1); +static void ov66_02233888(UnkStruct_ov66_022336C4 *param0, s32 param1); +static void ov66_022338C8(UnkStruct_ov66_022336C4 *param0, u32 param1, u32 param2, u32 param3); +static void ov66_02233920(UnkStruct_ov66_022336C4 *param0); +static void ov66_02233950(UnkStruct_ov66_022336C4 *param0, u32 param1); +static void ov66_02233984(UnkStruct_ov66_022336C4 *param0, s32 param1, u32 param2); +static void ov66_02233A08(UnkStruct_ov66_022336C4 *param0, s32 param1, u32 param2); +static s32 ov66_02233A34(const UnkStruct_ov66_022336C4 *param0, s32 param1, u32 param2); +static s32 ov66_02233A6C(const UnkStruct_ov66_022336C4 *param0, s32 param1, u32 param2); +static void ov66_02233A94(UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_022336B8 param1); +static BOOL ov66_02233AE8(const UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_022336B8 param1); static void ov66_02233B54(BOOL param0, PPW_LOBBY_CHANNEL_KIND param1); -static void ov66_02233BF0(s32 param0, const PPW_LobbySystemProfile * param1, const u8 * param2, u32 param3); +static void ov66_02233BF0(s32 param0, const PPW_LobbySystemProfile *param1, const u8 *param2, u32 param3); static void ov66_02233C60(s32 param0); -static void ov66_02233CE4(s32 param0, PPW_LOBBY_CHANNEL_KIND param1, s32 param2, const char * param3); -static void ov66_02233CE8(s32 param0, PPW_LOBBY_CHANNEL_KIND param1, s32 param2, const u8 * param3, u32 param4); -static void ov66_02233D94(BOOL param0, BOOL param1, PPW_LOBBY_CHANNEL_KIND param2, s32 param3, const char * param4, const u8 * param5, u32 param6, void * param7); -static void ov66_02233DD4(s32 param0, const PPW_LobbySystemProfile * param1); -static void ov66_02233E50(s32 param0, const u8 * param1, u32 param2); -static void ov66_02233E8C(s32 param0, const PPW_LobbyRecruitInfo * param1); -static void ov66_02233F18(s32 param0, const PPW_LobbyRecruitInfo * param1); +static void ov66_02233CE4(s32 param0, PPW_LOBBY_CHANNEL_KIND param1, s32 param2, const char *param3); +static void ov66_02233CE8(s32 param0, PPW_LOBBY_CHANNEL_KIND param1, s32 param2, const u8 *param3, u32 param4); +static void ov66_02233D94(BOOL param0, BOOL param1, PPW_LOBBY_CHANNEL_KIND param2, s32 param3, const char *param4, const u8 *param5, u32 param6, void *param7); +static void ov66_02233DD4(s32 param0, const PPW_LobbySystemProfile *param1); +static void ov66_02233E50(s32 param0, const u8 *param1, u32 param2); +static void ov66_02233E8C(s32 param0, const PPW_LobbyRecruitInfo *param1); +static void ov66_02233F18(s32 param0, const PPW_LobbyRecruitInfo *param1); static void ov66_02233F60(PPW_LOBBY_TIME_EVENT param0); -static void ov66_02233F74(PPW_LOBBY_STATS_RESULT param0, const u8 * param1, u32 param2); -static BOOL ov66_02233FA0(PPW_LOBBY_STATS_RESULT param0, const PPW_LobbySchedule * param1); -static void ov66_02233FC0(PPW_LOBBY_STATS_RESULT param0, const PPW_LobbyVipRecord * param1, u32 param2); -static void ov66_02233FEC(PPW_LOBBY_STATS_RESULT param0, const PPW_LobbyQuestionnaire * param1); +static void ov66_02233F74(PPW_LOBBY_STATS_RESULT param0, const u8 *param1, u32 param2); +static BOOL ov66_02233FA0(PPW_LOBBY_STATS_RESULT param0, const PPW_LobbySchedule *param1); +static void ov66_02233FC0(PPW_LOBBY_STATS_RESULT param0, const PPW_LobbyVipRecord *param1, u32 param2); +static void ov66_02233FEC(PPW_LOBBY_STATS_RESULT param0, const PPW_LobbyQuestionnaire *param1); static void ov66_02234018(PPW_LOBBY_STATS_RESULT param0); static void ov66_02234040(u32 param0); -static void ov66_02234054(UnkStruct_ov66_022336C4 * param0); -static void ov66_02234074(UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F38 param1, s32 param2, const PPW_LobbyRecruitInfo * param3); -static BOOL ov66_022340F0(UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F38 param1, s32 param2); -static BOOL ov66_0223412C(const UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F38 param1); -static u16 ov66_0223414C(const UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F38 param1); -static const PPW_LobbyRecruitInfo * ov66_022341C0(const UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F38 param1); -static void ov66_022341F4(UnkStruct_ov66_022336C4 * param0); -static void ov66_02234288(PPW_LobbyRecruitInfo * param0, const s64 * param1); -static void ov66_02234294(const PPW_LobbyRecruitInfo * param0, s64 * param1); -static void ov66_022342A0(u16 param0, void * param1); -static void ov66_022342A4(u16 param0, void * param1); -static u32 ov66_022342CC(const PPW_LobbySchedule * param0, PPW_LOBBY_TIME_EVENT param1); -static void ov66_022342F4(UnkStruct_ov66_022342F4 * param0, u32 param1, u32 param2); -static void ov66_0223430C(UnkStruct_ov66_022342F4 * param0); -static void ov66_0223431C(UnkStruct_ov66_022342F4 * param0, const PPW_LobbyVipRecord * param1, u32 param2); -static BOOL ov66_02234344(const UnkStruct_ov66_022342F4 * param0, s32 param1); -static s32 ov66_0223436C(const UnkStruct_ov66_022342F4 * param0, s32 param1); -static void ov66_0223439C(UnkStruct_ov66_0223439C * param0, const PPW_LobbyQuestionnaire * param1); - -static const char * Unk_ov66_02258DF0[1] = { +static void ov66_02234054(UnkStruct_ov66_022336C4 *param0); +static void ov66_02234074(UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_02232F38 param1, s32 param2, const PPW_LobbyRecruitInfo *param3); +static BOOL ov66_022340F0(UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_02232F38 param1, s32 param2); +static BOOL ov66_0223412C(const UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_02232F38 param1); +static u16 ov66_0223414C(const UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_02232F38 param1); +static const PPW_LobbyRecruitInfo *ov66_022341C0(const UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_02232F38 param1); +static void ov66_022341F4(UnkStruct_ov66_022336C4 *param0); +static void ov66_02234288(PPW_LobbyRecruitInfo *param0, const s64 *param1); +static void ov66_02234294(const PPW_LobbyRecruitInfo *param0, s64 *param1); +static void ov66_022342A0(u16 param0, void *param1); +static void ov66_022342A4(u16 param0, void *param1); +static u32 ov66_022342CC(const PPW_LobbySchedule *param0, PPW_LOBBY_TIME_EVENT param1); +static void ov66_022342F4(UnkStruct_ov66_022342F4 *param0, u32 param1, u32 param2); +static void ov66_0223430C(UnkStruct_ov66_022342F4 *param0); +static void ov66_0223431C(UnkStruct_ov66_022342F4 *param0, const PPW_LobbyVipRecord *param1, u32 param2); +static BOOL ov66_02234344(const UnkStruct_ov66_022342F4 *param0, s32 param1); +static s32 ov66_0223436C(const UnkStruct_ov66_022342F4 *param0, s32 param1); +static void ov66_0223439C(UnkStruct_ov66_0223439C *param0, const PPW_LobbyQuestionnaire *param1); + +static const char *Unk_ov66_02258DF0[1] = { "b_lby_wlddata" }; -static UnkStruct_ov66_022336C4 * Unk_ov66_0225B6C0 = NULL; +static UnkStruct_ov66_022336C4 *Unk_ov66_0225B6C0 = NULL; -void ov66_022324F0 (u32 param0, SaveData * param1, u32 param2, const UnkStruct_ov66_022324F0 * param3, void * param4) +void ov66_022324F0(u32 param0, SaveData *param1, u32 param2, const UnkStruct_ov66_022324F0 *param3, void *param4) { GF_ASSERT(Unk_ov66_0225B6C0 == NULL); GF_ASSERT(param2 < PPW_LOBBY_MAX_BINARY_SIZE); @@ -172,7 +172,7 @@ void ov66_022324F0 (u32 param0, SaveData * param1, u32 param2, const UnkStruct_o ov66_022342F4(&Unk_ov66_0225B6C0->unk_6A0, 128, param0); } -void ov66_02232598 (void) +void ov66_02232598(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -184,7 +184,7 @@ void ov66_02232598 (void) Unk_ov66_0225B6C0 = NULL; } -UnkEnum_ov66_0223287C ov66_022325D8 (void) +UnkEnum_ov66_0223287C ov66_022325D8(void) { PPW_LOBBY_STATE v0; @@ -250,27 +250,28 @@ UnkEnum_ov66_0223287C ov66_022325D8 (void) return ov66_0223287C(); } -PPW_LOBBY_ERROR ov66_022326DC (void) -{ +PPW_LOBBY_ERROR ov66_022326DC(void) +{ GF_ASSERT(Unk_ov66_0225B6C0 != NULL); - - if (Unk_ov66_0225B6C0->unk_984 == 0) + + if (Unk_ov66_0225B6C0->unk_984 == 0) { return PPW_LobbyGetLastError(); - else + } else { return ov66_02237134(Unk_ov66_0225B6C0->unk_984); + } } -s32 ov66_0223270C (PPW_LOBBY_ERROR param0) +s32 ov66_0223270C(PPW_LOBBY_ERROR param0) { return PPW_LobbyToErrorCode(param0); } -BOOL ov66_02232714 (const void * param0) +BOOL ov66_02232714(const void *param0) { - return ov66_02232720(param0, ((DWC_LOBBY_CHANNEL_PREFIX_RELEASE))); + return ov66_02232720(param0, (DWC_LOBBY_CHANNEL_PREFIX_RELEASE)); } -BOOL ov66_02232720 (const void * param0, u32 param1) +BOOL ov66_02232720(const void *param0, u32 param1) { PPW_LobbyCallbacks v0; PPW_LOBBY_RESULT v1; @@ -298,7 +299,7 @@ BOOL ov66_02232720 (const void * param0, u32 param1) } { - DWCUserData * v2; + DWCUserData *v2; v2 = sub_0202AD28(Unk_ov66_0225B6C0->unk_04); Unk_ov66_0225B6C0->unk_984 = PPW_LobbyInitializeAsync(("pokemonplatds"), ("IIup73"), param1, &v0, v2, param0, Unk_ov66_0225B6C0->unk_28); @@ -307,7 +308,7 @@ BOOL ov66_02232720 (const void * param0, u32 param1) return ov66_0223365C(Unk_ov66_0225B6C0->unk_984); } -BOOL ov66_02232804 (void) +BOOL ov66_02232804(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -318,7 +319,7 @@ BOOL ov66_02232804 (void) return 0; } -void ov66_0223282C (void) +void ov66_0223282C(void) { PPW_LOBBY_RESULT v0; BOOL v1; @@ -333,7 +334,7 @@ void ov66_0223282C (void) GF_ASSERT(v1); } -BOOL ov66_02232854 (void) +BOOL ov66_02232854(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -344,7 +345,7 @@ BOOL ov66_02232854 (void) return 0; } -UnkEnum_ov66_0223287C ov66_0223287C (void) +UnkEnum_ov66_0223287C ov66_0223287C(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -365,7 +366,7 @@ UnkEnum_ov66_0223287C ov66_0223287C (void) return Unk_ov66_0225B6C0->unk_12C; } -BOOL ov66_022328CC (void) +BOOL ov66_022328CC(void) { BOOL v0; @@ -376,13 +377,13 @@ BOOL ov66_022328CC (void) return v0; } -s32 ov66_022328F0 (void) +s32 ov66_022328F0(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); return PPW_LobbyGetMyUserId(); } -void ov66_02232908 (const void * param0) +void ov66_02232908(const void *param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); ov66_0223379C(Unk_ov66_0225B6C0, PPW_LobbyGetMyUserId(), param0); @@ -390,15 +391,15 @@ void ov66_02232908 (const void * param0) PPW_LobbyUpdateMyProfile(param0, Unk_ov66_0225B6C0->unk_28, 0); } -const void * ov66_0223293C (s32 param0) +const void *ov66_0223293C(s32 param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); return ov66_022337E8(Unk_ov66_0225B6C0, param0); } -void ov66_0223295C (s32 param0, s64 * param1) +void ov66_0223295C(s32 param0, s64 *param1) { - const PPW_LobbySystemProfile * v0; + const PPW_LobbySystemProfile *v0; GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -406,7 +407,7 @@ void ov66_0223295C (s32 param0, s64 * param1) *param1 = v0->enterTime; } -s32 ov66_02232988 (void) +s32 ov66_02232988(void) { int v0; s32 v1 = DWC_LOBBY_INVALID_USER_ID; @@ -435,7 +436,7 @@ s32 ov66_02232988 (void) return v1; } -s32 ov66_022329E4 (s32 param0) +s32 ov66_022329E4(s32 param0) { int v0; s32 v1 = DWC_LOBBY_INVALID_USER_ID; @@ -464,7 +465,7 @@ s32 ov66_022329E4 (s32 param0) return v1; } -BOOL ov66_02232A48 (UnkEnum_ov66_022336B8 param0) +BOOL ov66_02232A48(UnkEnum_ov66_022336B8 param0) { BOOL v0; PPW_LOBBY_RESULT v1; @@ -482,13 +483,13 @@ BOOL ov66_02232A48 (UnkEnum_ov66_022336B8 param0) return v0; } -UnkEnum_ov66_02232A84 ov66_02232A84 (void) +UnkEnum_ov66_02232A84 ov66_02232A84(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); return Unk_ov66_0225B6C0->unk_12F; } -BOOL ov66_02232AA4 (void) +BOOL ov66_02232AA4(void) { PPW_LOBBY_RESULT v0; BOOL v1; @@ -505,7 +506,7 @@ BOOL ov66_02232AA4 (void) return v1; } -BOOL ov66_02232AD4 (void) +BOOL ov66_02232AD4(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -516,13 +517,13 @@ BOOL ov66_02232AD4 (void) return 0; } -BOOL ov66_02232B00 (UnkEnum_ov66_022336B8 param0) +BOOL ov66_02232B00(UnkEnum_ov66_022336B8 param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); return ov66_02233AE8(Unk_ov66_0225B6C0, param0); } -void ov66_02232B20 (UnkStruct_ov66_02232B20 * param0) +void ov66_02232B20(UnkStruct_ov66_02232B20 *param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -530,7 +531,7 @@ void ov66_02232B20 (UnkStruct_ov66_02232B20 * param0) param0->unk_04 = Unk_ov66_0225B6C0->unk_11C[0].unk_04; } -void ov66_02232B4C (UnkStruct_ov66_02232B20 * param0) +void ov66_02232B4C(UnkStruct_ov66_02232B20 *param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -538,36 +539,36 @@ void ov66_02232B4C (UnkStruct_ov66_02232B20 * param0) param0->unk_04 = Unk_ov66_0225B6C0->unk_11C[1].unk_04; } -u32 ov66_02232B78 (s32 param0) +u32 ov66_02232B78(s32 param0) { return ov66_02233A34(Unk_ov66_0225B6C0, param0, 0); } -u32 ov66_02232B8C (s32 param0) +u32 ov66_02232B8C(s32 param0) { return ov66_02233A34(Unk_ov66_0225B6C0, param0, 1); } -s32 ov66_02232BA0 (u32 param0) +s32 ov66_02232BA0(u32 param0) { return ov66_02233A6C(Unk_ov66_0225B6C0, param0, 0); } -s32 ov66_02232BB4 (u32 param0) +s32 ov66_02232BB4(u32 param0) { return ov66_02233A6C(Unk_ov66_0225B6C0, param0, 1); } -void ov66_02232BC8 (s64 * param0) +void ov66_02232BC8(s64 *param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); *param0 = Unk_ov66_0225B6C0->unk_19C.currentTime; } -u32 ov66_02232BEC (UnkEnum_ov66_02232BEC param0) +u32 ov66_02232BEC(UnkEnum_ov66_02232BEC param0) { u32 v0; - PPW_LobbySchedule * v1; + PPW_LobbySchedule *v1; int v2; GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -610,7 +611,7 @@ u32 ov66_02232BEC (UnkEnum_ov66_02232BEC param0) return v0; } -BOOL ov66_02232C8C (void) +BOOL ov66_02232C8C(void) { BOOL v0; @@ -625,7 +626,7 @@ BOOL ov66_02232C8C (void) return v0; } -BOOL ov66_02232CB8 (void) +BOOL ov66_02232CB8(void) { if (Unk_ov66_0225B6C0->unk_130 == 0) { return 1; @@ -634,7 +635,7 @@ BOOL ov66_02232CB8 (void) return 0; } -u16 ov66_02232CD4 (u8 param0) +u16 ov66_02232CD4(u8 param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); GF_ASSERT(param0 < 20); @@ -642,7 +643,7 @@ u16 ov66_02232CD4 (u8 param0) return Unk_ov66_0225B6C0->unk_134[param0].unk_00; } -u8 ov66_02232D00 (u8 param0) +u8 ov66_02232D00(u8 param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); GF_ASSERT(param0 < 20); @@ -650,7 +651,7 @@ u8 ov66_02232D00 (u8 param0) return Unk_ov66_0225B6C0->unk_134[param0].unk_02; } -void ov66_02232D30 (const UnkStruct_ov66_022589B4 * param0, u32 param1, void * param2) +void ov66_02232D30(const UnkStruct_ov66_022589B4 *param0, u32 param1, void *param2) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -659,7 +660,7 @@ void ov66_02232D30 (const UnkStruct_ov66_022589B4 * param0, u32 param1, void * p Unk_ov66_0225B6C0->unk_184[0].unk_08 = param2; } -void ov66_02232D60 (const UnkStruct_ov66_022589B4 * param0, u32 param1, void * param2) +void ov66_02232D60(const UnkStruct_ov66_022589B4 *param0, u32 param1, void *param2) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -668,19 +669,19 @@ void ov66_02232D60 (const UnkStruct_ov66_022589B4 * param0, u32 param1, void * p Unk_ov66_0225B6C0->unk_184[1].unk_08 = param2; } -void ov66_02232D90 (void) +void ov66_02232D90(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); memset(&Unk_ov66_0225B6C0->unk_184[0], 0, sizeof(UnkStruct_ov66_022336C4_sub3)); } -void ov66_02232DC8 (void) +void ov66_02232DC8(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); memset(&Unk_ov66_0225B6C0->unk_184[1], 0, sizeof(UnkStruct_ov66_022336C4_sub3)); } -void ov66_02232E00 (u32 param0, const void * param1, u32 param2) +void ov66_02232E00(u32 param0, const void *param1, u32 param2) { PPW_LOBBY_RESULT v0; BOOL v1; @@ -695,7 +696,7 @@ void ov66_02232E00 (u32 param0, const void * param1, u32 param2) GF_ASSERT(v1 == 1); } -void ov66_02232E5C (u32 param0, s32 param1, const void * param2, u32 param3) +void ov66_02232E5C(u32 param0, s32 param1, const void *param2, u32 param3) { PPW_LOBBY_RESULT v0; BOOL v1; @@ -710,7 +711,7 @@ void ov66_02232E5C (u32 param0, s32 param1, const void * param2, u32 param3) GF_ASSERT(v1 == 1); } -void ov66_02232EBC (u32 param0, const void * param1, u32 param2) +void ov66_02232EBC(u32 param0, const void *param1, u32 param2) { PPW_LOBBY_RESULT v0; BOOL v1; @@ -728,7 +729,7 @@ void ov66_02232EBC (u32 param0, const void * param1, u32 param2) GF_ASSERT(v1 == 1); } -BOOL ov66_02232F38 (UnkEnum_ov66_02232F38 param0, u32 param1) +BOOL ov66_02232F38(UnkEnum_ov66_02232F38 param0, u32 param1) { PPW_LOBBY_RESULT v0; BOOL v1; @@ -772,7 +773,7 @@ BOOL ov66_02232F38 (UnkEnum_ov66_02232F38 param0, u32 param1) return 1; } -void ov66_02233064 (void) +void ov66_02233064(void) { PPW_LOBBY_RESULT v0; BOOL v1; @@ -797,7 +798,7 @@ void ov66_02233064 (void) Unk_ov66_0225B6C0->unk_69E = 0; } -void ov66_022330CC (void) +void ov66_022330CC(void) { PPW_LOBBY_RESULT v0; BOOL v1; @@ -816,7 +817,7 @@ void ov66_022330CC (void) GF_ASSERT(v1); } -BOOL ov66_02233128 (void) +BOOL ov66_02233128(void) { GF_ASSERT(Unk_ov66_0225B6C0); @@ -831,19 +832,19 @@ BOOL ov66_02233128 (void) return 0; } -BOOL ov66_02233164 (void) +BOOL ov66_02233164(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); return Unk_ov66_0225B6C0->unk_69F; } -BOOL ov66_02233184 (UnkEnum_ov66_02232F38 param0) +BOOL ov66_02233184(UnkEnum_ov66_02232F38 param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); return ov66_0223412C(Unk_ov66_0225B6C0, param0); } -BOOL ov66_022331A4 (UnkEnum_ov66_02232F38 param0) +BOOL ov66_022331A4(UnkEnum_ov66_02232F38 param0) { GF_ASSERT(Unk_ov66_0225B6C0); @@ -858,9 +859,9 @@ BOOL ov66_022331A4 (UnkEnum_ov66_02232F38 param0) return 0; } -u32 ov66_022331E4 (UnkEnum_ov66_02232F38 param0) +u32 ov66_022331E4(UnkEnum_ov66_02232F38 param0) { - const PPW_LobbyRecruitInfo * v0; + const PPW_LobbyRecruitInfo *v0; GF_ASSERT(Unk_ov66_0225B6C0 != NULL); GF_ASSERT(param0 < UnkEnum_ov66_02232F38_03); @@ -873,9 +874,9 @@ u32 ov66_022331E4 (UnkEnum_ov66_02232F38 param0) return v0->maxNum - v0->currentNum; } -u32 ov66_02233224 (UnkEnum_ov66_02232F38 param0) +u32 ov66_02233224(UnkEnum_ov66_02232F38 param0) { - const PPW_LobbyRecruitInfo * v0; + const PPW_LobbyRecruitInfo *v0; GF_ASSERT(Unk_ov66_0225B6C0 != NULL); GF_ASSERT(param0 < UnkEnum_ov66_02232F38_03); @@ -888,7 +889,7 @@ u32 ov66_02233224 (UnkEnum_ov66_02232F38 param0) return v0->currentNum; } -BOOL ov66_02233260 (UnkEnum_ov66_02232F38 param0) +BOOL ov66_02233260(UnkEnum_ov66_02232F38 param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -916,7 +917,7 @@ BOOL ov66_02233260 (UnkEnum_ov66_02232F38 param0) return 1; } -s32 ov66_022332F8 (UnkEnum_ov66_02232F38 param0) +s32 ov66_022332F8(UnkEnum_ov66_02232F38 param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); GF_ASSERT(param0 < UnkEnum_ov66_02232F38_03); @@ -928,7 +929,7 @@ s32 ov66_022332F8 (UnkEnum_ov66_02232F38 param0) return Unk_ov66_0225B6C0->unk_5B8[param0].unk_46; } -s32 ov66_02233340 (void) +s32 ov66_02233340(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -939,25 +940,25 @@ s32 ov66_02233340 (void) return Unk_ov66_0225B6C0->unk_5B8[Unk_ov66_0225B6C0->unk_69C].unk_48; } -BOOL ov66_02233374 (void) +BOOL ov66_02233374(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); return Unk_ov66_0225B6C0->unk_69E; } -BOOL ov66_02233394 (s32 param0) +BOOL ov66_02233394(s32 param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); return ov66_02234344(&Unk_ov66_0225B6C0->unk_6A0, param0); } -s32 ov66_022333BC (s32 param0) +s32 ov66_022333BC(s32 param0) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); return ov66_0223436C(&Unk_ov66_0225B6C0->unk_6A0, param0); } -void ov66_022333E4 (s32 param0) +void ov66_022333E4(s32 param0) { u32 v0; BOOL v1; @@ -974,13 +975,13 @@ void ov66_022333E4 (s32 param0) Unk_ov66_0225B6C0->unk_6A8.unk_2D8 = UnkEnum_ov66_02233434_01; } -UnkEnum_ov66_02233434 ov66_02233434 (void) +UnkEnum_ov66_02233434 ov66_02233434(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); return Unk_ov66_0225B6C0->unk_6A8.unk_2D8; } -s32 ov66_02233454 (UnkEnum_ov66_02233454 param0) +s32 ov66_02233454(UnkEnum_ov66_02233454 param0) { s32 v0; @@ -1034,9 +1035,9 @@ s32 ov66_02233454 (UnkEnum_ov66_02233454 param0) return v0; } -u16 * ov66_02233538 (UnkEnum_ov66_02233538 param0) +u16 *ov66_02233538(UnkEnum_ov66_02233538 param0) { - u16 * v0 = NULL; + u16 *v0 = NULL; GF_ASSERT(Unk_ov66_0225B6C0 != NULL); GF_ASSERT(param0 < UnkEnum_ov66_02233538_08); @@ -1067,7 +1068,7 @@ u16 * ov66_02233538 (UnkEnum_ov66_02233538 param0) return v0; } -BOOL ov66_022335C0 (UnkEnum_ov66_022335C0 param0, u32 param1) +BOOL ov66_022335C0(UnkEnum_ov66_022335C0 param0, u32 param1) { BOOL v0; @@ -1092,7 +1093,7 @@ BOOL ov66_022335C0 (UnkEnum_ov66_022335C0 param0, u32 param1) return v0; } -void ov66_0223361C (void) +void ov66_0223361C(void) { GF_ASSERT(Unk_ov66_0225B6C0 != NULL); @@ -1104,7 +1105,7 @@ void ov66_0223361C (void) Unk_ov66_0225B6C0->unk_69F = 0; } -static BOOL ov66_0223365C (PPW_LOBBY_RESULT param0) +static BOOL ov66_0223365C(PPW_LOBBY_RESULT param0) { BOOL v0 = 1; @@ -1134,13 +1135,13 @@ static BOOL ov66_0223365C (PPW_LOBBY_RESULT param0) return v0; } -static void ov66_0223369C (void) +static void ov66_0223369C(void) { Unk_ov66_0225B6C0->unk_133 = 0; Unk_ov66_0225B6C0->unk_132 = 0; } -static UnkEnum_ov66_022336B8 ov66_022336B8 (PPW_LOBBY_CHANNEL_KIND param0) +static UnkEnum_ov66_022336B8 ov66_022336B8(PPW_LOBBY_CHANNEL_KIND param0) { s32 v0; @@ -1153,12 +1154,12 @@ static UnkEnum_ov66_022336B8 ov66_022336B8 (PPW_LOBBY_CHANNEL_KIND param0) return v0; } -static PPW_LOBBY_CHANNEL_KIND ov66_022336C0 (UnkEnum_ov66_022336B8 param0) +static PPW_LOBBY_CHANNEL_KIND ov66_022336C0(UnkEnum_ov66_022336B8 param0) { return param0 + 1; } -static BOOL ov66_022336C4 (UnkStruct_ov66_022336C4 * param0) +static BOOL ov66_022336C4(UnkStruct_ov66_022336C4 *param0) { u32 v0; u32 v1; @@ -1195,27 +1196,27 @@ static BOOL ov66_022336C4 (UnkStruct_ov66_022336C4 * param0) return ov66_0223365C(v3); } -static void ov66_02233758 (UnkStruct_ov66_022336C4 * param0, u32 param1, u32 param2) +static void ov66_02233758(UnkStruct_ov66_022336C4 *param0, u32 param1, u32 param2) { Unk_ov66_0225B6C0->unk_24 = Heap_AllocFromHeap(param2, param1 * PPW_LOBBY_MAX_PLAYER_NUM_MAIN); memset(Unk_ov66_0225B6C0->unk_24, 0, param1 * PPW_LOBBY_MAX_PLAYER_NUM_MAIN); Unk_ov66_0225B6C0->unk_28 = param1; } -static void ov66_02233788 (UnkStruct_ov66_022336C4 * param0) +static void ov66_02233788(UnkStruct_ov66_022336C4 *param0) { Heap_FreeToHeap(Unk_ov66_0225B6C0->unk_24); } -static void ov66_0223379C (UnkStruct_ov66_022336C4 * param0, s32 param1, const void * param2) +static void ov66_0223379C(UnkStruct_ov66_022336C4 *param0, s32 param1, const void *param2) { ov66_022337A8(param0, param1, param2, param0->unk_28); } -static void ov66_022337A8 (UnkStruct_ov66_022336C4 * param0, s32 param1, const void * param2, u32 param3) +static void ov66_022337A8(UnkStruct_ov66_022336C4 *param0, s32 param1, const void *param2, u32 param3) { s32 v0; - u8 * v1; + u8 *v1; u32 v2; v0 = ov66_02233A34(param0, param1, 0); @@ -1234,10 +1235,10 @@ static void ov66_022337A8 (UnkStruct_ov66_022336C4 * param0, s32 param1, const v memcpy(v1, param2, v2); } -static const void * ov66_022337E8 (const UnkStruct_ov66_022336C4 * param0, s32 param1) +static const void *ov66_022337E8(const UnkStruct_ov66_022336C4 *param0, s32 param1) { s32 v0; - const u8 * v1; + const u8 *v1; v0 = ov66_02233A34(param0, param1, 0); GF_ASSERT(v0 != 0xffffffff); @@ -1248,10 +1249,10 @@ static const void * ov66_022337E8 (const UnkStruct_ov66_022336C4 * param0, s32 p return v1; } -static void ov66_0223380C (UnkStruct_ov66_022336C4 * param0, s32 param1) +static void ov66_0223380C(UnkStruct_ov66_022336C4 *param0, s32 param1) { s32 v0; - u8 * v1; + u8 *v1; v0 = ov66_02233A34(param0, param1, 0); GF_ASSERT(v0 != 0xffffffff); @@ -1262,7 +1263,7 @@ static void ov66_0223380C (UnkStruct_ov66_022336C4 * param0, s32 param1) memset(v1, 0, param0->unk_28); } -static void ov66_02233838 (UnkStruct_ov66_022336C4 * param0, s32 param1, const PPW_LobbySystemProfile * param2) +static void ov66_02233838(UnkStruct_ov66_022336C4 *param0, s32 param1, const PPW_LobbySystemProfile *param2) { s32 v0; @@ -1272,7 +1273,7 @@ static void ov66_02233838 (UnkStruct_ov66_022336C4 * param0, s32 param1, const P param0->unk_2C[v0] = *param2; } -static const PPW_LobbySystemProfile * ov66_02233864 (const UnkStruct_ov66_022336C4 * param0, s32 param1) +static const PPW_LobbySystemProfile *ov66_02233864(const UnkStruct_ov66_022336C4 *param0, s32 param1) { s32 v0; @@ -1282,7 +1283,7 @@ static const PPW_LobbySystemProfile * ov66_02233864 (const UnkStruct_ov66_022336 return ¶m0->unk_2C[v0]; } -static void ov66_02233888 (UnkStruct_ov66_022336C4 * param0, s32 param1) +static void ov66_02233888(UnkStruct_ov66_022336C4 *param0, s32 param1) { s32 v0; @@ -1292,7 +1293,7 @@ static void ov66_02233888 (UnkStruct_ov66_022336C4 * param0, s32 param1) memset(¶m0->unk_2C[v0], 0, sizeof(PPW_LobbySystemProfile)); } -static void ov66_022338C8 (UnkStruct_ov66_022336C4 * param0, u32 param1, u32 param2, u32 param3) +static void ov66_022338C8(UnkStruct_ov66_022336C4 *param0, u32 param1, u32 param2, u32 param3) { int v0; int v1; @@ -1314,7 +1315,7 @@ static void ov66_022338C8 (UnkStruct_ov66_022336C4 * param0, u32 param1, u32 par } } -static void ov66_02233920 (UnkStruct_ov66_022336C4 * param0) +static void ov66_02233920(UnkStruct_ov66_022336C4 *param0) { int v0; @@ -1325,7 +1326,7 @@ static void ov66_02233920 (UnkStruct_ov66_022336C4 * param0) } } -static void ov66_02233950 (UnkStruct_ov66_022336C4 * param0, u32 param1) +static void ov66_02233950(UnkStruct_ov66_022336C4 *param0, u32 param1) { int v0; @@ -1336,7 +1337,7 @@ static void ov66_02233950 (UnkStruct_ov66_022336C4 * param0, u32 param1) } } -static void ov66_02233984 (UnkStruct_ov66_022336C4 * param0, s32 param1, u32 param2) +static void ov66_02233984(UnkStruct_ov66_022336C4 *param0, s32 param1, u32 param2) { u32 v0; int v1; @@ -1362,7 +1363,7 @@ static void ov66_02233984 (UnkStruct_ov66_022336C4 * param0, s32 param1, u32 par param0->unk_11C[param2].unk_00++; } -static void ov66_02233A08 (UnkStruct_ov66_022336C4 * param0, s32 param1, u32 param2) +static void ov66_02233A08(UnkStruct_ov66_022336C4 *param0, s32 param1, u32 param2) { u32 v0; @@ -1376,7 +1377,7 @@ static void ov66_02233A08 (UnkStruct_ov66_022336C4 * param0, s32 param1, u32 par param0->unk_11C[param2].unk_00--; } -static s32 ov66_02233A34 (const UnkStruct_ov66_022336C4 * param0, s32 param1, u32 param2) +static s32 ov66_02233A34(const UnkStruct_ov66_022336C4 *param0, s32 param1, u32 param2) { int v0; @@ -1389,13 +1390,13 @@ static s32 ov66_02233A34 (const UnkStruct_ov66_022336C4 * param0, s32 param1, u3 return 0xffffffff; } -static s32 ov66_02233A6C (const UnkStruct_ov66_022336C4 * param0, s32 param1, u32 param2) +static s32 ov66_02233A6C(const UnkStruct_ov66_022336C4 *param0, s32 param1, u32 param2) { GF_ASSERT(param1 < param0->unk_11C[param2].unk_02); return param0->unk_11C[param2].unk_04[param1]; } -static void ov66_02233A94 (UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_022336B8 param1) +static void ov66_02233A94(UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_022336B8 param1) { int v0; s32 v1; @@ -1415,7 +1416,7 @@ static void ov66_02233A94 (UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_022336 } } -static BOOL ov66_02233AE8 (const UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_022336B8 param1) +static BOOL ov66_02233AE8(const UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_022336B8 param1) { int v0; int v1; @@ -1450,7 +1451,7 @@ static BOOL ov66_02233AE8 (const UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_ return 0; } -static void ov66_02233B54 (BOOL param0, PPW_LOBBY_CHANNEL_KIND param1) +static void ov66_02233B54(BOOL param0, PPW_LOBBY_CHANNEL_KIND param1) { PPW_LOBBY_RESULT v0; @@ -1460,7 +1461,7 @@ static void ov66_02233B54 (BOOL param0, PPW_LOBBY_CHANNEL_KIND param1) GF_ASSERT(ov66_0223365C(v0)); { - PPW_LobbySchedule * v1; + PPW_LobbySchedule *v1; v1 = (PPW_LobbySchedule *)Unk_ov66_0225B6C0->unk_1B4; } @@ -1482,7 +1483,7 @@ static void ov66_02233B54 (BOOL param0, PPW_LOBBY_CHANNEL_KIND param1) } } -static void ov66_02233BF0 (s32 param0, const PPW_LobbySystemProfile * param1, const u8 * param2, u32 param3) +static void ov66_02233BF0(s32 param0, const PPW_LobbySystemProfile *param1, const u8 *param2, u32 param3) { BOOL v0; @@ -1503,7 +1504,7 @@ static void ov66_02233BF0 (s32 param0, const PPW_LobbySystemProfile * param1, co Unk_ov66_0225B6C0->unk_0C.unk_00(param0, ov66_022337E8(Unk_ov66_0225B6C0, param0), Unk_ov66_0225B6C0->unk_20, v0); } -static void ov66_02233C60 (s32 param0) +static void ov66_02233C60(s32 param0) { if (ov66_02233A34(Unk_ov66_0225B6C0, param0, 0) == 0xffffffff) { return; @@ -1528,12 +1529,12 @@ static void ov66_02233C60 (s32 param0) ov66_02233A08(Unk_ov66_0225B6C0, param0, 1); } -static void ov66_02233CE4 (s32 param0, PPW_LOBBY_CHANNEL_KIND param1, s32 param2, const char * param3) +static void ov66_02233CE4(s32 param0, PPW_LOBBY_CHANNEL_KIND param1, s32 param2, const char *param3) { return; } -static void ov66_02233CE8 (s32 param0, PPW_LOBBY_CHANNEL_KIND param1, s32 param2, const u8 * param3, u32 param4) +static void ov66_02233CE8(s32 param0, PPW_LOBBY_CHANNEL_KIND param1, s32 param2, const u8 *param3, u32 param4) { u32 v0; u32 v1; @@ -1576,7 +1577,7 @@ static void ov66_02233CE8 (s32 param0, PPW_LOBBY_CHANNEL_KIND param1, s32 param2 } } -static void ov66_02233D94 (BOOL param0, BOOL param1, PPW_LOBBY_CHANNEL_KIND param2, s32 param3, const char * param4, const u8 * param5, u32 param6, void * param7) +static void ov66_02233D94(BOOL param0, BOOL param1, PPW_LOBBY_CHANNEL_KIND param2, s32 param3, const char *param4, const u8 *param5, u32 param6, void *param7) { s32 v0; @@ -1589,10 +1590,10 @@ static void ov66_02233D94 (BOOL param0, BOOL param1, PPW_LOBBY_CHANNEL_KIND para } } -static void ov66_02233DD4 (s32 param0, const PPW_LobbySystemProfile * param1) +static void ov66_02233DD4(s32 param0, const PPW_LobbySystemProfile *param1) { u32 v0, v1, v2; - const PPW_LobbySystemProfile * v3; + const PPW_LobbySystemProfile *v3; s32 v4; v4 = ov66_02233A34(Unk_ov66_0225B6C0, param0, 0); @@ -1617,7 +1618,7 @@ static void ov66_02233DD4 (s32 param0, const PPW_LobbySystemProfile * param1) ov66_02233838(Unk_ov66_0225B6C0, param0, param1); } -static void ov66_02233E50 (s32 param0, const u8 * param1, u32 param2) +static void ov66_02233E50(s32 param0, const u8 *param1, u32 param2) { s32 v0; @@ -1632,7 +1633,7 @@ static void ov66_02233E50 (s32 param0, const u8 * param1, u32 param2) Unk_ov66_0225B6C0->unk_0C.unk_08(param0, param1, Unk_ov66_0225B6C0->unk_20); } -static void ov66_02233E8C (s32 param0, const PPW_LobbyRecruitInfo * param1) +static void ov66_02233E8C(s32 param0, const PPW_LobbyRecruitInfo *param1) { u32 v0; s64 v1; @@ -1667,7 +1668,7 @@ static void ov66_02233E8C (s32 param0, const PPW_LobbyRecruitInfo * param1) ov66_02234074(Unk_ov66_0225B6C0, param1->gameKind, param0, param1); } -static void ov66_02233F18 (s32 param0, const PPW_LobbyRecruitInfo * param1) +static void ov66_02233F18(s32 param0, const PPW_LobbyRecruitInfo *param1) { BOOL v0; s32 v1; @@ -1685,12 +1686,12 @@ static void ov66_02233F18 (s32 param0, const PPW_LobbyRecruitInfo * param1) } } -static void ov66_02233F60 (PPW_LOBBY_TIME_EVENT param0) +static void ov66_02233F60(PPW_LOBBY_TIME_EVENT param0) { Unk_ov66_0225B6C0->unk_0C.unk_0C(param0, Unk_ov66_0225B6C0->unk_20); } -static void ov66_02233F74 (PPW_LOBBY_STATS_RESULT param0, const u8 * param1, u32 param2) +static void ov66_02233F74(PPW_LOBBY_STATS_RESULT param0, const u8 *param1, u32 param2) { if (param0 != PPW_LOBBY_STATS_RESULT_SUCCESS) { Unk_ov66_0225B6C0->unk_133 = 1; @@ -1699,7 +1700,7 @@ static void ov66_02233F74 (PPW_LOBBY_STATS_RESULT param0, const u8 * param1, u32 } } -static BOOL ov66_02233FA0 (PPW_LOBBY_STATS_RESULT param0, const PPW_LobbySchedule * param1) +static BOOL ov66_02233FA0(PPW_LOBBY_STATS_RESULT param0, const PPW_LobbySchedule *param1) { if (param0 == PPW_LOBBY_STATS_RESULT_SUCCESS) { return 1; @@ -1709,7 +1710,7 @@ static BOOL ov66_02233FA0 (PPW_LOBBY_STATS_RESULT param0, const PPW_LobbySchedul return 0; } -static void ov66_02233FC0 (PPW_LOBBY_STATS_RESULT param0, const PPW_LobbyVipRecord * param1, u32 param2) +static void ov66_02233FC0(PPW_LOBBY_STATS_RESULT param0, const PPW_LobbyVipRecord *param1, u32 param2) { if (param0 == PPW_LOBBY_STATS_RESULT_SUCCESS) { ov66_0223431C(&Unk_ov66_0225B6C0->unk_6A0, param1, param2); @@ -1718,7 +1719,7 @@ static void ov66_02233FC0 (PPW_LOBBY_STATS_RESULT param0, const PPW_LobbyVipReco } } -static void ov66_02233FEC (PPW_LOBBY_STATS_RESULT param0, const PPW_LobbyQuestionnaire * param1) +static void ov66_02233FEC(PPW_LOBBY_STATS_RESULT param0, const PPW_LobbyQuestionnaire *param1) { if (param0 == PPW_LOBBY_STATS_RESULT_SUCCESS) { ov66_0223439C(&Unk_ov66_0225B6C0->unk_6A8, param1); @@ -1727,7 +1728,7 @@ static void ov66_02233FEC (PPW_LOBBY_STATS_RESULT param0, const PPW_LobbyQuestio } } -static void ov66_02234018 (PPW_LOBBY_STATS_RESULT param0) +static void ov66_02234018(PPW_LOBBY_STATS_RESULT param0) { GF_ASSERT(Unk_ov66_0225B6C0->unk_6A8.unk_2D8 == UnkEnum_ov66_02233434_01); @@ -1738,18 +1739,18 @@ static void ov66_02234018 (PPW_LOBBY_STATS_RESULT param0) } } -static void ov66_02234040 (u32 param0) +static void ov66_02234040(u32 param0) { Unk_ov66_0225B6C0->unk_131 = 1; } -static void ov66_02234054 (UnkStruct_ov66_022336C4 * param0) +static void ov66_02234054(UnkStruct_ov66_022336C4 *param0) { memset(param0->unk_5B8, 0, sizeof(UnkStruct_ov66_022336C4_sub4) * UnkEnum_ov66_02232F38_03); param0->unk_69C = UnkEnum_ov66_02232F38_03; } -static void ov66_02234074 (UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F38 param1, s32 param2, const PPW_LobbyRecruitInfo * param3) +static void ov66_02234074(UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_02232F38 param1, s32 param2, const PPW_LobbyRecruitInfo *param3) { GF_ASSERT(param1 < UnkEnum_ov66_02232F38_03); @@ -1768,7 +1769,7 @@ static void ov66_02234074 (UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F } } -static BOOL ov66_022340F0 (UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F38 param1, s32 param2) +static BOOL ov66_022340F0(UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_02232F38 param1, s32 param2) { GF_ASSERT(param1 < UnkEnum_ov66_02232F38_03); @@ -1782,17 +1783,17 @@ static BOOL ov66_022340F0 (UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F return 0; } -static BOOL ov66_0223412C (const UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F38 param1) +static BOOL ov66_0223412C(const UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_02232F38 param1) { GF_ASSERT(param1 < UnkEnum_ov66_02232F38_03); return param0->unk_5B8[param1].unk_44; } -static u16 ov66_0223414C (const UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F38 param1) +static u16 ov66_0223414C(const UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_02232F38 param1) { s64 v0; s64 v1; - const PPW_LobbyRecruitInfo * v2; + const PPW_LobbyRecruitInfo *v2; if (ov66_0223412C(param0, param1) == 0) { return 0; @@ -1811,20 +1812,20 @@ static u16 ov66_0223414C (const UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_0 return (60 - v1) * 30; } -static const PPW_LobbyRecruitInfo * ov66_022341C0 (const UnkStruct_ov66_022336C4 * param0, UnkEnum_ov66_02232F38 param1) +static const PPW_LobbyRecruitInfo *ov66_022341C0(const UnkStruct_ov66_022336C4 *param0, UnkEnum_ov66_02232F38 param1) { GF_ASSERT(param1 < UnkEnum_ov66_02232F38_03); GF_ASSERT(param0->unk_5B8[param1].unk_44 == 1); return ¶m0->unk_5B8[param1].unk_00; } -static void ov66_022341F4 (UnkStruct_ov66_022336C4 * param0) +static void ov66_022341F4(UnkStruct_ov66_022336C4 *param0) { int v0; u16 v1; if (Unk_ov66_0225B6C0->unk_69E == 1) { - UnkStruct_ov66_022336C4_sub4 * v2; + UnkStruct_ov66_022336C4_sub4 *v2; u32 v3; v3 = ov4_021D2610(); @@ -1852,30 +1853,30 @@ static void ov66_022341F4 (UnkStruct_ov66_022336C4 * param0) } } -static void ov66_02234288 (PPW_LobbyRecruitInfo * param0, const s64 * param1) +static void ov66_02234288(PPW_LobbyRecruitInfo *param0, const s64 *param1) { - s64 * v0; + s64 *v0; v0 = (s64 *)param0->paramBuf; *v0 = *param1; } -static void ov66_02234294 (const PPW_LobbyRecruitInfo * param0, s64 * param1) +static void ov66_02234294(const PPW_LobbyRecruitInfo *param0, s64 *param1) { - const s64 * v0; + const s64 *v0; v0 = (const s64 *)param0->paramBuf; *param1 = *v0; } -static void ov66_022342A0 (u16 param0, void * param1) +static void ov66_022342A0(u16 param0, void *param1) { return; } -static void ov66_022342A4 (u16 param0, void * param1) +static void ov66_022342A4(u16 param0, void *param1) { - UnkStruct_ov66_022336C4 * v0; + UnkStruct_ov66_022336C4 *v0; v0 = param1; @@ -1888,7 +1889,7 @@ static void ov66_022342A4 (u16 param0, void * param1) } } -static u32 ov66_022342CC (const PPW_LobbySchedule * param0, PPW_LOBBY_TIME_EVENT param1) +static u32 ov66_022342CC(const PPW_LobbySchedule *param0, PPW_LOBBY_TIME_EVENT param1) { u32 v0; int v1; @@ -1904,20 +1905,20 @@ static u32 ov66_022342CC (const PPW_LobbySchedule * param0, PPW_LOBBY_TIME_EVENT return v0; } -static void ov66_022342F4 (UnkStruct_ov66_022342F4 * param0, u32 param1, u32 param2) +static void ov66_022342F4(UnkStruct_ov66_022342F4 *param0, u32 param1, u32 param2) { param0->unk_00 = Heap_AllocFromHeap(param2, sizeof(PPW_LobbyVipRecord) * param1); param0->unk_04 = param1; param0->unk_06 = 0; } -static void ov66_0223430C (UnkStruct_ov66_022342F4 * param0) +static void ov66_0223430C(UnkStruct_ov66_022342F4 *param0) { Heap_FreeToHeap(param0->unk_00); param0->unk_00 = NULL; } -static void ov66_0223431C (UnkStruct_ov66_022342F4 * param0, const PPW_LobbyVipRecord * param1, u32 param2) +static void ov66_0223431C(UnkStruct_ov66_022342F4 *param0, const PPW_LobbyVipRecord *param1, u32 param2) { u32 v0; @@ -1933,7 +1934,7 @@ static void ov66_0223431C (UnkStruct_ov66_022342F4 * param0, const PPW_LobbyVipR param0->unk_06 = v0; } -static BOOL ov66_02234344 (const UnkStruct_ov66_022342F4 * param0, s32 param1) +static BOOL ov66_02234344(const UnkStruct_ov66_022342F4 *param0, s32 param1) { int v0; @@ -1946,7 +1947,7 @@ static BOOL ov66_02234344 (const UnkStruct_ov66_022342F4 * param0, s32 param1) return 0; } -static s32 ov66_0223436C (const UnkStruct_ov66_022342F4 * param0, s32 param1) +static s32 ov66_0223436C(const UnkStruct_ov66_022342F4 *param0, s32 param1) { int v0; @@ -1959,7 +1960,7 @@ static s32 ov66_0223436C (const UnkStruct_ov66_022342F4 * param0, s32 param1) return 0; } -static void ov66_0223439C (UnkStruct_ov66_0223439C * param0, const PPW_LobbyQuestionnaire * param1) +static void ov66_0223439C(UnkStruct_ov66_0223439C *param0, const PPW_LobbyQuestionnaire *param1) { memcpy(¶m0->unk_00, param1, sizeof(PPW_LobbyQuestionnaire)); } diff --git a/src/overlay066/ov66_022343A8.c b/src/overlay066/ov66_022343A8.c index 344664c767..13ef15caca 100644 --- a/src/overlay066/ov66_022343A8.c +++ b/src/overlay066/ov66_022343A8.c @@ -1,3 +1,5 @@ +#include "overlay066/ov66_022343A8.h" + #include #include @@ -8,31 +10,30 @@ #include "struct_decls/struct_02022BC0_decl.h" #include "struct_decls/struct_02022BD8_2_decl.h" #include "struct_decls/struct_02022BD8_decl.h" -#include "overlay063/struct_ov63_0222BEC0_decl.h" - #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017294.h" #include "struct_defs/struct_0201CFEC.h" #include "struct_defs/struct_020217F4.h" #include "struct_defs/struct_02024184.h" + #include "overlay005/struct_ov5_021DF7F8.h" #include "overlay005/struct_ov5_021DF84C.h" #include "overlay005/struct_ov5_021EDDAC.h" +#include "overlay063/ov63_0222BE18.h" +#include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CC3C.h" +#include "overlay066/ov66_02231428.h" +#include "overlay070/ov70_0225C700.h" +#include "heap.h" #include "narc.h" #include "unk_02006E3C.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_0201C970.h" #include "unk_0201CED8.h" #include "unk_02020AEC.h" #include "unk_0202298C.h" #include "unk_0202414C.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay066/ov66_02231428.h" -#include "overlay066/ov66_022343A8.h" -#include "overlay070/ov70_0225C700.h" typedef struct { u16 unk_00; @@ -53,8 +54,8 @@ typedef struct UnkStruct_ov66_02234798_t { u8 unk_01_1 : 7; u8 unk_02; u8 unk_03; - const UnkStruct_ov63_0222BEC0 * unk_04; - UnkStruct_020216E0 * unk_08; + const UnkStruct_ov63_0222BEC0 *unk_04; + UnkStruct_020216E0 *unk_08; UnkStruct_02017294 unk_0C; u8 unk_84; u8 unk_85; @@ -64,42 +65,42 @@ typedef struct UnkStruct_ov66_02234798_t { } UnkStruct_ov66_02234798; typedef struct UnkStruct_ov66_02234548_t { - UnkStruct_0202298C * unk_00; - UnkStruct_0202298C * unk_04; - UnkStruct_02022BD8 * unk_08; - UnkStruct_02020C44 * unk_0C; - UnkStruct_ov66_02234798 * unk_10; + UnkStruct_0202298C *unk_00; + UnkStruct_0202298C *unk_04; + UnkStruct_02022BD8 *unk_08; + UnkStruct_02020C44 *unk_0C; + UnkStruct_ov66_02234798 *unk_10; u32 unk_14; UnkStruct_ov66_02234958 unk_18; int unk_2C; } UnkStruct_ov66_02234548; -static const UnkStruct_ov66_02258B38 * ov66_022348B0(u32 param0); +static const UnkStruct_ov66_02258B38 *ov66_022348B0(u32 param0); static u32 ov66_022348D8(BOOL param0, u32 param1); static fx32 ov66_022348E4(u16 param0, u16 param1, u32 param2); -static void ov66_022348FC(UnkStruct_ov66_02234958 * param0, NARC * param1, u32 param2, u32 param3); -static void ov66_02234958(UnkStruct_ov66_02234958 * param0); -static void ov66_02234960(UnkStruct_ov66_02234958 * param0, u32 param1); -static u32 ov66_0223496C(const UnkStruct_ov66_02234958 * param0); -static void ov66_02234970(UnkStruct_ov66_02234958 * param0, UnkStruct_02017294 * param1); -static UnkStruct_ov66_02234798 * ov66_02234980(UnkStruct_ov66_02234548 * param0); -static BOOL ov66_022349B8(const UnkStruct_ov66_02234798 * param0); -static void ov66_022349C8(UnkStruct_ov66_02234798 * param0); -static void ov66_022349D4(UnkStruct_ov66_02234798 * param0); -static void ov66_022349E0(UnkStruct_ov66_02234798 * param0); -static void ov66_02234A78(UnkStruct_ov66_02234798 * param0); -static void ov66_02234AA0(UnkStruct_ov66_02234798 * param0); -static void ov66_02234B10(UnkStruct_ov66_02234798 * param0); -static void ov66_02234B54(UnkStruct_ov66_02234798 * param0); -static void ov66_02234BC4(UnkStruct_ov66_02234798 * param0); -static void ov66_02234BEC(UnkStruct_ov66_02234798 * param0); -static void ov66_02234C34(UnkStruct_ov66_02234798 * param0); -static void ov66_02234C70(UnkStruct_ov66_02234798 * param0); +static void ov66_022348FC(UnkStruct_ov66_02234958 *param0, NARC *param1, u32 param2, u32 param3); +static void ov66_02234958(UnkStruct_ov66_02234958 *param0); +static void ov66_02234960(UnkStruct_ov66_02234958 *param0, u32 param1); +static u32 ov66_0223496C(const UnkStruct_ov66_02234958 *param0); +static void ov66_02234970(UnkStruct_ov66_02234958 *param0, UnkStruct_02017294 *param1); +static UnkStruct_ov66_02234798 *ov66_02234980(UnkStruct_ov66_02234548 *param0); +static BOOL ov66_022349B8(const UnkStruct_ov66_02234798 *param0); +static void ov66_022349C8(UnkStruct_ov66_02234798 *param0); +static void ov66_022349D4(UnkStruct_ov66_02234798 *param0); +static void ov66_022349E0(UnkStruct_ov66_02234798 *param0); +static void ov66_02234A78(UnkStruct_ov66_02234798 *param0); +static void ov66_02234AA0(UnkStruct_ov66_02234798 *param0); +static void ov66_02234B10(UnkStruct_ov66_02234798 *param0); +static void ov66_02234B54(UnkStruct_ov66_02234798 *param0); +static void ov66_02234BC4(UnkStruct_ov66_02234798 *param0); +static void ov66_02234BEC(UnkStruct_ov66_02234798 *param0); +static void ov66_02234C34(UnkStruct_ov66_02234798 *param0); +static void ov66_02234C70(UnkStruct_ov66_02234798 *param0); static BOOL ov66_02234CD8(u32 param0); -static void ov66_02234D08(UnkStruct_ov66_02234798 * param0); -static void ov66_02234D3C(UnkStruct_ov66_02234798 * param0); -static void ov66_02234D78(UnkStruct_020216E0 * param0, void * param1); -static BOOL ov66_02234D8C(UnkStruct_020216E0 * param0); +static void ov66_02234D08(UnkStruct_ov66_02234798 *param0); +static void ov66_02234D3C(UnkStruct_ov66_02234798 *param0); +static void ov66_02234D78(UnkStruct_020216E0 *param0, void *param1); +static BOOL ov66_02234D8C(UnkStruct_020216E0 *param0); static const u8 Unk_ov66_02258B24[4] = { 0x1, @@ -114,43 +115,43 @@ static const u16 Unk_ov66_02258B28[2] = { }; static const UnkStruct_020217F4 Unk_ov66_02258B88[] = { - {0x0, 0xF, 0x0}, - {0x10, 0x1F, 0x0}, - {0x20, 0x2F, 0x0}, - {0x30, 0x3F, 0x0}, - {0x40, 0x4F, 0x0}, - {0x50, 0x5F, 0x0}, - {0x60, 0x6F, 0x0}, - {0x70, 0x7F, 0x0}, - {0x0, 0x0, 0x2} + { 0x0, 0xF, 0x0 }, + { 0x10, 0x1F, 0x0 }, + { 0x20, 0x2F, 0x0 }, + { 0x30, 0x3F, 0x0 }, + { 0x40, 0x4F, 0x0 }, + { 0x50, 0x5F, 0x0 }, + { 0x60, 0x6F, 0x0 }, + { 0x70, 0x7F, 0x0 }, + { 0x0, 0x0, 0x2 } }; static const UnkStruct_ov66_02258B38 Unk_ov66_02258B38[20] = { - {0x0, 0x5A, 0x1}, - {0x61, 0x5B, 0x1}, - {0x3, 0x2, 0x0}, - {0x5, 0x4, 0x0}, - {0xB, 0xA, 0x0}, - {0x1F, 0x1D, 0x0}, - {0x32, 0x30, 0x0}, - {0x33, 0x31, 0x0}, - {0x3E, 0x3C, 0x0}, - {0x46, 0x44, 0x0}, - {0x6, 0x5, 0x0}, - {0x7, 0x6, 0x0}, - {0xD, 0xC, 0x0}, - {0xE, 0xD, 0x0}, - {0x23, 0x21, 0x0}, - {0x25, 0x23, 0x0}, - {0x2A, 0x28, 0x0}, - {0x3F, 0x3D, 0x0}, - {0xEB, 0x18E, 0x0}, - {0xEA, 0x18D, 0x0} + { 0x0, 0x5A, 0x1 }, + { 0x61, 0x5B, 0x1 }, + { 0x3, 0x2, 0x0 }, + { 0x5, 0x4, 0x0 }, + { 0xB, 0xA, 0x0 }, + { 0x1F, 0x1D, 0x0 }, + { 0x32, 0x30, 0x0 }, + { 0x33, 0x31, 0x0 }, + { 0x3E, 0x3C, 0x0 }, + { 0x46, 0x44, 0x0 }, + { 0x6, 0x5, 0x0 }, + { 0x7, 0x6, 0x0 }, + { 0xD, 0xC, 0x0 }, + { 0xE, 0xD, 0x0 }, + { 0x23, 0x21, 0x0 }, + { 0x25, 0x23, 0x0 }, + { 0x2A, 0x28, 0x0 }, + { 0x3F, 0x3D, 0x0 }, + { 0xEB, 0x18E, 0x0 }, + { 0xEA, 0x18D, 0x0 } }; -UnkStruct_ov66_02234548 * ov66_022343A8 (u32 param0, u32 param1, u32 param2, u32 param3) +UnkStruct_ov66_02234548 *ov66_022343A8(u32 param0, u32 param1, u32 param2, u32 param3) { - UnkStruct_ov66_02234548 * v0; + UnkStruct_ov66_02234548 *v0; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov66_02234548)); memset(v0, 0, sizeof(UnkStruct_ov66_02234548)); @@ -181,9 +182,9 @@ UnkStruct_ov66_02234548 * ov66_022343A8 (u32 param0, u32 param1, u32 param2, u32 } { - NARC * v3; - NARC * v4; - void * v5; + NARC *v3; + NARC *v4; + void *v5; int v6; v3 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, param2); @@ -195,8 +196,8 @@ UnkStruct_ov66_02234548 * ov66_022343A8 (u32 param0, u32 param1, u32 param2, u32 ov66_02231668(v5); { - NNSG3dResMdlSet * v7; - NNSG3dResMdl * v8; + NNSG3dResMdlSet *v7; + NNSG3dResMdl *v8; v7 = NNS_G3dGetMdlSet(v5); v8 = NNS_G3dGetMdlByIdx(v7, 0); @@ -212,7 +213,7 @@ UnkStruct_ov66_02234548 * ov66_022343A8 (u32 param0, u32 param1, u32 param2, u32 } { - UnkStruct_02022BD8_2 * v9; + UnkStruct_02022BD8_2 *v9; int v10; BOOL v11; @@ -252,7 +253,7 @@ UnkStruct_ov66_02234548 * ov66_022343A8 (u32 param0, u32 param1, u32 param2, u32 return v0; } -void ov66_02234548 (UnkStruct_ov66_02234548 * param0) +void ov66_02234548(UnkStruct_ov66_02234548 *param0) { { ov66_02234958(¶m0->unk_18); @@ -273,7 +274,7 @@ void ov66_02234548 (UnkStruct_ov66_02234548 * param0) Heap_FreeToHeap(param0); } -void ov66_02234590 (UnkStruct_ov66_02234548 * param0) +void ov66_02234590(UnkStruct_ov66_02234548 *param0) { int v0; @@ -284,7 +285,7 @@ void ov66_02234590 (UnkStruct_ov66_02234548 * param0) } } -void ov66_022345C4 (UnkStruct_ov66_02234548 * param0) +void ov66_022345C4(UnkStruct_ov66_02234548 *param0) { int v0; @@ -299,38 +300,38 @@ void ov66_022345C4 (UnkStruct_ov66_02234548 * param0) } } -void ov66_02234604 (UnkStruct_ov66_02234548 * param0) +void ov66_02234604(UnkStruct_ov66_02234548 *param0) { sub_02020D68(param0->unk_0C); } -void ov66_02234610 (UnkStruct_ov66_02234548 * param0, u32 param1) +void ov66_02234610(UnkStruct_ov66_02234548 *param0, u32 param1) { ov66_02234960(¶m0->unk_18, param1); } -UnkStruct_ov66_02234798 * ov66_0223461C (UnkStruct_ov66_02234548 * param0, const UnkStruct_ov63_0222BEC0 * param1) +UnkStruct_ov66_02234798 *ov66_0223461C(UnkStruct_ov66_02234548 *param0, const UnkStruct_ov63_0222BEC0 *param1) { - UnkStruct_ov66_02234798 * v0; + UnkStruct_ov66_02234798 *v0; v0 = ov66_02234980(param0); v0->unk_04 = param1; { - const UnkStruct_ov66_02258B38 * v1; + const UnkStruct_ov66_02258B38 *v1; UnkStruct_ov5_021DF84C v2; UnkStruct_ov5_021DF7F8 v3; - UnkStruct_02022BC0 * v4; - UnkStruct_02022BD8_2 * v5; + UnkStruct_02022BC0 *v4; + UnkStruct_02022BD8_2 *v5; u32 v6; - void * v7; - const NNSG3dResTex * v8; + void *v7; + const NNSG3dResTex *v8; UnkStruct_02024184 v9; NNSGfdTexKey v10; NNSGfdTexKey v11; NNSGfdPlttKey v12; - VecFx32 v13 = {0, 0, 0}; - VecFx32 v14 = {FX32_ONE, FX32_ONE, FX32_ONE}; + VecFx32 v13 = { 0, 0, 0 }; + VecFx32 v14 = { FX32_ONE, FX32_ONE, FX32_ONE }; v6 = ov63_0222BF90(param1, 7); v1 = ov66_022348B0(v6); @@ -347,7 +348,7 @@ UnkStruct_ov66_02234798 * ov66_0223461C (UnkStruct_ov66_02234548 * param0, const { u32 v15; - const void * v16; + const void *v16; if (v1->unk_02_15 == 1) { v15 = Unk_ov66_02258B28[1]; @@ -398,28 +399,28 @@ UnkStruct_ov66_02234798 * ov66_0223461C (UnkStruct_ov66_02234548 * param0, const return v0; } -void ov66_02234798 (UnkStruct_ov66_02234798 * param0) +void ov66_02234798(UnkStruct_ov66_02234798 *param0) { sub_020211FC(param0->unk_08); memset(param0, 0, sizeof(UnkStruct_ov66_02234798)); } -void ov66_022347B0 (UnkStruct_ov66_02234798 * param0, BOOL param1) +void ov66_022347B0(UnkStruct_ov66_02234798 *param0, BOOL param1) { param0->unk_00_0 = param1; } -void ov66_022347C4 (UnkStruct_ov66_02234798 * param0, u32 param1) +void ov66_022347C4(UnkStruct_ov66_02234798 *param0, u32 param1) { param0->unk_8C = param1; } -BOOL ov66_022347CC (const UnkStruct_ov66_02234798 * param0) +BOOL ov66_022347CC(const UnkStruct_ov66_02234798 *param0) { return param0->unk_00_4; } -void ov66_022347D4 (UnkStruct_ov66_02234798 * param0, const UnkStruct_ov63_0222CC3C * param1) +void ov66_022347D4(UnkStruct_ov66_02234798 *param0, const UnkStruct_ov63_0222CC3C *param1) { VecFx32 v0; @@ -428,21 +429,21 @@ void ov66_022347D4 (UnkStruct_ov66_02234798 * param0, const UnkStruct_ov63_0222C ov66_022347F8(param0, &v0); } -void ov66_022347F8 (UnkStruct_ov66_02234798 * param0, const VecFx32 * param1) +void ov66_022347F8(UnkStruct_ov66_02234798 *param0, const VecFx32 *param1) { sub_020212A8(param0->unk_08, param1); sub_02017350(¶m0->unk_0C, param1->x + 0, ((FX32_CONST(0)) + FX32_CONST(2)), param1->z + (FX32_CONST(-8))); } -void ov66_0223481C (const UnkStruct_ov66_02234798 * param0, VecFx32 * param1) +void ov66_0223481C(const UnkStruct_ov66_02234798 *param0, VecFx32 *param1) { - const VecFx32 * v0; + const VecFx32 *v0; v0 = sub_020212C0(param0->unk_08); *param1 = *v0; } -void ov66_02234834 (UnkStruct_ov66_02234798 * param0, int param1) +void ov66_02234834(UnkStruct_ov66_02234798 *param0, int param1) { u32 v0; @@ -452,7 +453,7 @@ void ov66_02234834 (UnkStruct_ov66_02234798 * param0, int param1) sub_020213A4(param0->unk_08, 0); } -void ov66_02234850 (UnkStruct_ov66_02234798 * param0, int param1) +void ov66_02234850(UnkStruct_ov66_02234798 *param0, int param1) { param0->unk_01_0 = 1; param0->unk_01_1 = param1; @@ -460,28 +461,28 @@ void ov66_02234850 (UnkStruct_ov66_02234798 * param0, int param1) param0->unk_03 = 1; } -void ov66_0223487C (UnkStruct_ov66_02234798 * param0) +void ov66_0223487C(UnkStruct_ov66_02234798 *param0) { param0->unk_01_0 = 0; } -void ov66_02234888 (UnkStruct_ov66_02234798 * param0, u8 param1) +void ov66_02234888(UnkStruct_ov66_02234798 *param0, u8 param1) { param0->unk_03 = param1; } -void ov66_0223488C (UnkStruct_ov66_02234798 * param0, BOOL param1) +void ov66_0223488C(UnkStruct_ov66_02234798 *param0, BOOL param1) { param0->unk_00_6 = param1; ov66_02234D3C(param0); } -BOOL ov66_022348A8 (const UnkStruct_ov66_02234798 * param0) +BOOL ov66_022348A8(const UnkStruct_ov66_02234798 *param0) { return param0->unk_00_6; } -static const UnkStruct_ov66_02258B38 * ov66_022348B0 (u32 param0) +static const UnkStruct_ov66_02258B38 *ov66_022348B0(u32 param0) { int v0; @@ -495,7 +496,7 @@ static const UnkStruct_ov66_02258B38 * ov66_022348B0 (u32 param0) return NULL; } -static u32 ov66_022348D8 (BOOL param0, u32 param1) +static u32 ov66_022348D8(BOOL param0, u32 param1) { if (param0) { return 0 + param1; @@ -504,7 +505,7 @@ static u32 ov66_022348D8 (BOOL param0, u32 param1) return 4 + param1; } -static fx32 ov66_022348E4 (u16 param0, u16 param1, u32 param2) +static fx32 ov66_022348E4(u16 param0, u16 param1, u32 param2) { fx32 v0; @@ -516,9 +517,9 @@ static fx32 ov66_022348E4 (u16 param0, u16 param1, u32 param2) return v0; } -static void ov66_022348FC (UnkStruct_ov66_02234958 * param0, NARC * param1, u32 param2, u32 param3) +static void ov66_022348FC(UnkStruct_ov66_02234958 *param0, NARC *param1, u32 param2, u32 param3) { - void * v0; + void *v0; ov70_0225C730(&v0, param1, param2, param3); @@ -532,28 +533,28 @@ static void ov66_022348FC (UnkStruct_ov66_02234958 * param0, NARC * param1, u32 NNS_G3dMdlSetMdlPolygonIDAll(param0->unk_00.unk_08, 20); } -static void ov66_02234958 (UnkStruct_ov66_02234958 * param0) +static void ov66_02234958(UnkStruct_ov66_02234958 *param0) { sub_02017110(¶m0->unk_00); } -static void ov66_02234960 (UnkStruct_ov66_02234958 * param0, u32 param1) +static void ov66_02234960(UnkStruct_ov66_02234958 *param0, u32 param1) { param0->unk_10 = param1; NNS_G3dMdlSetMdlAlphaAll(param0->unk_00.unk_08, param0->unk_10); } -static u32 ov66_0223496C (const UnkStruct_ov66_02234958 * param0) +static u32 ov66_0223496C(const UnkStruct_ov66_02234958 *param0) { return param0->unk_10; } -static void ov66_02234970 (UnkStruct_ov66_02234958 * param0, UnkStruct_02017294 * param1) +static void ov66_02234970(UnkStruct_ov66_02234958 *param0, UnkStruct_02017294 *param1) { sub_02017258(param1, ¶m0->unk_00); } -static UnkStruct_ov66_02234798 * ov66_02234980 (UnkStruct_ov66_02234548 * param0) +static UnkStruct_ov66_02234798 *ov66_02234980(UnkStruct_ov66_02234548 *param0) { int v0; @@ -567,7 +568,7 @@ static UnkStruct_ov66_02234798 * ov66_02234980 (UnkStruct_ov66_02234548 * param0 return NULL; } -static BOOL ov66_022349B8 (const UnkStruct_ov66_02234798 * param0) +static BOOL ov66_022349B8(const UnkStruct_ov66_02234798 *param0) { if (param0->unk_04 == NULL) { return 0; @@ -576,22 +577,22 @@ static BOOL ov66_022349B8 (const UnkStruct_ov66_02234798 * param0) return 1; } -static void ov66_022349C8 (UnkStruct_ov66_02234798 * param0) +static void ov66_022349C8(UnkStruct_ov66_02234798 *param0) { memset(param0, 0, sizeof(UnkStruct_ov66_02234798)); } -static void ov66_022349D4 (UnkStruct_ov66_02234798 * param0) +static void ov66_022349D4(UnkStruct_ov66_02234798 *param0) { sub_02017294(¶m0->unk_0C); } -static void ov66_022349E0 (UnkStruct_ov66_02234798 * param0) +static void ov66_022349E0(UnkStruct_ov66_02234798 *param0) { u32 v0; u32 v1; UnkStruct_ov63_0222CC3C v2; - static void (* v3[12])(UnkStruct_ov66_02234798 *) = { + static void (*v3[12])(UnkStruct_ov66_02234798 *) = { ov66_02234A78, ov66_02234B10, ov66_02234AA0, @@ -629,7 +630,7 @@ static void ov66_022349E0 (UnkStruct_ov66_02234798 * param0) ov66_022347D4(param0, &v2); } -static void ov66_02234A78 (UnkStruct_ov66_02234798 * param0) +static void ov66_02234A78(UnkStruct_ov66_02234798 *param0) { u32 v0; u32 v1; @@ -641,7 +642,7 @@ static void ov66_02234A78 (UnkStruct_ov66_02234798 * param0) sub_020213A4(param0->unk_08, 0); } -static void ov66_02234AA0 (UnkStruct_ov66_02234798 * param0) +static void ov66_02234AA0(UnkStruct_ov66_02234798 *param0) { u32 v0; u32 v1; @@ -666,7 +667,7 @@ static void ov66_02234AA0 (UnkStruct_ov66_02234798 * param0) } } -static void ov66_02234B10 (UnkStruct_ov66_02234798 * param0) +static void ov66_02234B10(UnkStruct_ov66_02234798 *param0) { u32 v0; u32 v1; @@ -685,7 +686,7 @@ static void ov66_02234B10 (UnkStruct_ov66_02234798 * param0) } } -static void ov66_02234B54 (UnkStruct_ov66_02234798 * param0) +static void ov66_02234B54(UnkStruct_ov66_02234798 *param0) { u32 v0; u32 v1; @@ -710,9 +711,9 @@ static void ov66_02234B54 (UnkStruct_ov66_02234798 * param0) } } -static void ov66_02234BC4 (UnkStruct_ov66_02234798 * param0) +static void ov66_02234BC4(UnkStruct_ov66_02234798 *param0) { - static void (* v0[3])(UnkStruct_ov66_02234798 *) = { + static void (*v0[3])(UnkStruct_ov66_02234798 *) = { ov66_02234BEC, ov66_02234C34, ov66_02234C70 @@ -723,7 +724,7 @@ static void ov66_02234BC4 (UnkStruct_ov66_02234798 * param0) } } -static void ov66_02234BEC (UnkStruct_ov66_02234798 * param0) +static void ov66_02234BEC(UnkStruct_ov66_02234798 *param0) { u32 v0; u32 v1; @@ -743,7 +744,7 @@ static void ov66_02234BEC (UnkStruct_ov66_02234798 * param0) } } -static void ov66_02234C34 (UnkStruct_ov66_02234798 * param0) +static void ov66_02234C34(UnkStruct_ov66_02234798 *param0) { u32 v0; u32 v1; @@ -760,7 +761,7 @@ static void ov66_02234C34 (UnkStruct_ov66_02234798 * param0) } } -static void ov66_02234C70 (UnkStruct_ov66_02234798 * param0) +static void ov66_02234C70(UnkStruct_ov66_02234798 *param0) { u32 v0; u32 v1; @@ -782,7 +783,7 @@ static void ov66_02234C70 (UnkStruct_ov66_02234798 * param0) param0->unk_02 = (param0->unk_02 + 1) % (4 * 2); } -static BOOL ov66_02234CD8 (u32 param0) +static BOOL ov66_02234CD8(u32 param0) { switch (param0) { case 2: @@ -799,7 +800,7 @@ static BOOL ov66_02234CD8 (u32 param0) return 0; } -static void ov66_02234D08 (UnkStruct_ov66_02234798 * param0) +static void ov66_02234D08(UnkStruct_ov66_02234798 *param0) { BOOL v0; @@ -816,7 +817,7 @@ static void ov66_02234D08 (UnkStruct_ov66_02234798 * param0) } } -static void ov66_02234D3C (UnkStruct_ov66_02234798 * param0) +static void ov66_02234D3C(UnkStruct_ov66_02234798 *param0) { if ((param0->unk_00_4 == 0) && (param0->unk_00_6 == 1)) { sub_02021320(param0->unk_08, 1); @@ -827,21 +828,21 @@ static void ov66_02234D3C (UnkStruct_ov66_02234798 * param0) } } -static void ov66_02234D78 (UnkStruct_020216E0 * param0, void * param1) +static void ov66_02234D78(UnkStruct_020216E0 *param0, void *param1) { - UnkStruct_ov66_02234798 * v0 = param1; - NNSG3dResMdl * v1; + UnkStruct_ov66_02234798 *v0 = param1; + NNSG3dResMdl *v1; v1 = sub_02021430(param0); NNS_G3dMdlSetMdlLightEnableFlagAll(v1, v0->unk_8C); } -static BOOL ov66_02234D8C (UnkStruct_020216E0 * param0) +static BOOL ov66_02234D8C(UnkStruct_020216E0 *param0) { BOOL v0; VecFx32 v1; - NNSG3dResMdlInfo * v2; - NNSG3dResMdl * v3; + NNSG3dResMdlInfo *v2; + NNSG3dResMdl *v3; UnkStruct_0201CFEC v4; MtxFx33 v5; diff --git a/src/overlay066/ov66_02234EA8.c b/src/overlay066/ov66_02234EA8.c index e0989b2733..5200108329 100644 --- a/src/overlay066/ov66_02234EA8.c +++ b/src/overlay066/ov66_02234EA8.c @@ -1,29 +1,30 @@ +#include "overlay066/ov66_02234EA8.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" +#include "overlay066/ov66_02231428.h" #include "overlay066/struct_ov66_02231428.h" #include "overlay069/struct_ov69_0225C980.h" #include "overlay092/struct_ov92_021D1530.h" +#include "heap.h" #include "narc.h" #include "unk_02006E3C.h" -#include "heap.h" #include "unk_020996D0.h" -#include "overlay066/ov66_02231428.h" -#include "overlay066/ov66_02234EA8.h" -static void ov66_02234F2C(NARC * param0, u32 param1, u16 param2, u8 param3, fx32 * param4); +static void ov66_02234F2C(NARC *param0, u32 param1, u16 param2, u8 param3, fx32 *param4); -UnkStruct_ov66_02231428 ov66_02234EA8 (u16 param0, u8 param1, UnkStruct_ov66_02231428 param2, u32 param3) +UnkStruct_ov66_02231428 ov66_02234EA8(u16 param0, u8 param1, UnkStruct_ov66_02231428 param2, u32 param3) { fx32 v0; fx32 v1; u16 v2; s32 v3; UnkStruct_ov66_02231428 v4; - NARC * v5; + NARC *v5; v5 = NARC_ctor(NARC_INDEX_APPLICATION__WIFI_EARTH__WIFI_EARTH_PLACE, param3); @@ -50,13 +51,13 @@ UnkStruct_ov66_02231428 ov66_02234EA8 (u16 param0, u8 param1, UnkStruct_ov66_022 return v4; } -static void ov66_02234F2C (NARC * param0, u32 param1, u16 param2, u8 param3, fx32 * param4) +static void ov66_02234F2C(NARC *param0, u32 param1, u16 param2, u8 param3, fx32 *param4) { BOOL v0 = 0; { - void * v1; - UnkStruct_ov92_021D1530 * v2; + void *v1; + UnkStruct_ov92_021D1530 *v2; u32 v3; int v4; @@ -75,8 +76,8 @@ static void ov66_02234F2C (NARC * param0, u32 param1, u16 param2, u8 param3, fx3 } if (v0 == 0) { - void * v5; - UnkStruct_ov69_0225C980 * v6; + void *v5; + UnkStruct_ov69_0225C980 *v6; u32 v7, v8; int v9, v10; diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 8e7edf8186..587af07068 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -1,92 +1,90 @@ +#include "overlay067/ov67_0225C700.h" + #include #include -#include "inlines.h" -#include "core_sys.h" - #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "savedata.h" -#include "overlay066/struct_ov66_0222E71C_decl.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C3B0.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay065/struct_ov65_0222F6EC.h" +#include "overlay066/ov66_0222DDF0.h" +#include "overlay066/ov66_02231428.h" +#include "overlay066/ov66_022324F0.h" +#include "overlay066/struct_ov66_0222E71C_decl.h" #include "overlay066/struct_ov66_02231024.h" #include "overlay066/struct_ov66_02231300.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "rtc.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "rtc.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202CD50.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_02231428.h" -#include "overlay066/ov66_022324F0.h" -#include "overlay067/ov67_0225C700.h" typedef struct { - StringTemplate * unk_00; - MessageLoader * unk_04; + StringTemplate *unk_00; + MessageLoader *unk_04; Window unk_08; - Strbuf* unk_18; - Strbuf* unk_1C; + Strbuf *unk_18; + Strbuf *unk_1C; u32 unk_20; - void * unk_24; + void *unk_24; u32 unk_28; u32 unk_2C; } UnkStruct_ov67_0225D210; typedef struct { - SaveData * unk_00; + SaveData *unk_00; u32 unk_04; u32 unk_08; - BGL * unk_0C; + BGL *unk_0C; UnkStruct_ov67_0225D210 unk_10; UnkStruct_ov67_0225D210 unk_40; UnkStruct_ov67_0225D210 unk_70; UnkStruct_ov67_0225D210 unk_A0; - UIControlData * unk_D0; + UIControlData *unk_D0; UnkStruct_ov61_0222C3B0 unk_D4; } UnkStruct_ov67_0225D154; -static void ov67_0225CE28(void * param0); -static void ov67_0225CE30(UnkStruct_ov67_0225D154 * param0, u32 param1); -static void ov67_0225D154(UnkStruct_ov67_0225D154 * param0); -static void ov67_0225D17C(UnkStruct_ov67_0225D154 * param0); -static void ov67_0225D188(UnkStruct_ov67_0225D210 * param0, BGL * param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData * param9, u32 param10); -static void ov67_0225D210(UnkStruct_ov67_0225D210 * param0, u32 param1); -static void ov67_0225D294(UnkStruct_ov67_0225D210 * param0); -static void ov67_0225D2EC(UnkStruct_ov67_0225D210 * param0); -static void ov67_0225D310(UnkStruct_ov67_0225D210 * param0); -static void ov67_0225D3D0(UnkStruct_ov67_0225D210 * param0, u32 param1); -static void ov67_0225D330(UnkStruct_ov67_0225D210 * param0); -static void ov67_0225D37C(UnkStruct_ov67_0225D210 * param0, u32 param1); +static void ov67_0225CE28(void *param0); +static void ov67_0225CE30(UnkStruct_ov67_0225D154 *param0, u32 param1); +static void ov67_0225D154(UnkStruct_ov67_0225D154 *param0); +static void ov67_0225D17C(UnkStruct_ov67_0225D154 *param0); +static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BGL *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *param9, u32 param10); +static void ov67_0225D210(UnkStruct_ov67_0225D210 *param0, u32 param1); +static void ov67_0225D294(UnkStruct_ov67_0225D210 *param0); +static void ov67_0225D2EC(UnkStruct_ov67_0225D210 *param0); +static void ov67_0225D310(UnkStruct_ov67_0225D210 *param0); +static void ov67_0225D3D0(UnkStruct_ov67_0225D210 *param0, u32 param1); +static void ov67_0225D330(UnkStruct_ov67_0225D210 *param0); +static void ov67_0225D37C(UnkStruct_ov67_0225D210 *param0, u32 param1); static const UnkStruct_02099F80 Unk_ov67_0225D410 = { GX_VRAM_BG_128_A, @@ -128,7 +126,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov67_0225D438[3] = { 0x1, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -143,7 +141,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov67_0225D438[3] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -158,8 +156,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov67_0225D438[3] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0, + }, }; static const UnkStruct_ov61_0222C884 Unk_ov67_0225D3EC = { @@ -172,10 +170,10 @@ static const UnkStruct_ov61_0222C884 Unk_ov67_0225D3EC = { 0x204 }; -int ov67_0225C700 (OverlayManager * param0, int * param1) +int ov67_0225C700(OverlayManager *param0, int *param1) { - UnkStruct_ov67_0225D154 * v0; - UnkStruct_ov66_02231024 * v1; + UnkStruct_ov67_0225D154 *v0; + UnkStruct_ov66_02231024 *v1; Heap_Create(3, 112, 0x20000); @@ -188,10 +186,10 @@ int ov67_0225C700 (OverlayManager * param0, int * param1) v1->unk_10 = 0; ov67_0225CE30(v0, 112); - ov67_0225D188(&v0->unk_40, v0->unk_0C, 1, 674, 2, 19, 27, 4, (((1 + (18 + 12)) + 9)), v0->unk_00, 112); - ov67_0225D188(&v0->unk_70, v0->unk_0C, 1, 695, 2, 19, 27, 4, (((1 + (18 + 12)) + 9)), v0->unk_00, 112); - ov67_0225D188(&v0->unk_A0, v0->unk_0C, 0, 695, 4, 4, 23, 16, (((((1 + (18 + 12)) + 9)) + (27 * 4))), v0->unk_00, 112); - ov67_0225D188(&v0->unk_10, v0->unk_0C, 1, 674, 5, 1, 22, 2, (((((((((1 + (18 + 12)) + 9)) + (27 * 4))) + (23 * 16))) + (6 * 4))), v0->unk_00, 112); + ov67_0225D188(&v0->unk_40, v0->unk_0C, 1, 674, 2, 19, 27, 4, ((1 + (18 + 12)) + 9), v0->unk_00, 112); + ov67_0225D188(&v0->unk_70, v0->unk_0C, 1, 695, 2, 19, 27, 4, ((1 + (18 + 12)) + 9), v0->unk_00, 112); + ov67_0225D188(&v0->unk_A0, v0->unk_0C, 0, 695, 4, 4, 23, 16, (((1 + (18 + 12)) + 9) + (27 * 4)), v0->unk_00, 112); + ov67_0225D188(&v0->unk_10, v0->unk_0C, 1, 674, 5, 1, 22, 2, (((((1 + (18 + 12)) + 9) + (27 * 4)) + (23 * 16)) + (6 * 4)), v0->unk_00, 112); ov67_0225D37C(&v0->unk_10, 21); SetMainCallback(ov67_0225CE28, v0); @@ -200,10 +198,10 @@ int ov67_0225C700 (OverlayManager * param0, int * param1) return 1; } -int ov67_0225C820 (OverlayManager * param0, int * param1) +int ov67_0225C820(OverlayManager *param0, int *param1) { - UnkStruct_ov67_0225D154 * v0; - UnkStruct_ov66_02231024 * v1; + UnkStruct_ov67_0225D154 *v0; + UnkStruct_ov66_02231024 *v1; v0 = OverlayManager_Data(param0); v1 = OverlayManager_Args(param0); @@ -227,8 +225,7 @@ int ov67_0225C820 (OverlayManager * param0, int * param1) (*param1) = 4; } break; - case 3: - { + case 3: { u32 v2; v2 = sub_02002114(v0->unk_D0, 112); @@ -241,11 +238,9 @@ int ov67_0225C820 (OverlayManager * param0, int * param1) (*param1) = 7; break; } - } - break; - case 4: - { - UnkStruct_ov66_0222E71C * v3; + } break; + case 4: { + UnkStruct_ov66_0222E71C *v3; v3 = ov66_0222E3BC(v1->unk_04); sub_0203878C(v0->unk_00, v3); @@ -276,7 +271,7 @@ int ov67_0225C820 (OverlayManager * param0, int * param1) ov67_0225D310(&v0->unk_70); { - UnkStruct_0202CD88 * v4; + UnkStruct_0202CD88 *v4; v4 = sub_0202CD88(v0->unk_00); sub_0202CFEC(v4, 44); @@ -290,9 +285,8 @@ int ov67_0225C820 (OverlayManager * param0, int * param1) (*param1)++; } break; - case 9: - { - UnkStruct_ov65_0222F6EC * v5; + case 9: { + UnkStruct_ov65_0222F6EC *v5; int v6, v7; if (sub_020383E8()) { @@ -311,15 +305,14 @@ int ov67_0225C820 (OverlayManager * param0, int * param1) ov67_0225D3D0(&v0->unk_A0, v7); ov67_0225D210(&v0->unk_A0, v6); (*param1)++; - } - break; + } break; case 10: if (gCoreSys.pressedKeys & PAD_BUTTON_A) { int v8; int v9; if (sub_020383E8()) { - UnkStruct_ov65_0222F6EC * v10 = sub_020382F8(); + UnkStruct_ov65_0222F6EC *v10 = sub_020382F8(); v8 = ov66_02231718(v10->unk_00, v10->unk_04); @@ -340,8 +333,7 @@ int ov67_0225C820 (OverlayManager * param0, int * param1) v0->unk_D0 = sub_02002100(v0->unk_0C, &Unk_ov67_0225D3EC, (1 + (18 + 12)), 14, 112); (*param1)++; break; - case 12: - { + case 12: { u32 v11; v11 = sub_02002114(v0->unk_D0, 112); @@ -354,8 +346,7 @@ int ov67_0225C820 (OverlayManager * param0, int * param1) (*param1) = 14; break; } - } - break; + } break; case 13: if (CommMan_IsInitialized() == 0) { (*param1) = 4; @@ -394,9 +385,9 @@ int ov67_0225C820 (OverlayManager * param0, int * param1) return 0; } -int ov67_0225CB1C (OverlayManager * param0, int * param1) +int ov67_0225CB1C(OverlayManager *param0, int *param1) { - UnkStruct_ov67_0225D154 * v0; + UnkStruct_ov67_0225D154 *v0; v0 = OverlayManager_Data(param0); @@ -419,10 +410,10 @@ int ov67_0225CB1C (OverlayManager * param0, int * param1) return 1; } -int ov67_0225CB8C (OverlayManager * param0, int * param1) +int ov67_0225CB8C(OverlayManager *param0, int *param1) { - UnkStruct_ov67_0225D154 * v0; - UnkStruct_ov66_02231300 * v1; + UnkStruct_ov67_0225D154 *v0; + UnkStruct_ov66_02231300 *v1; Heap_Create(3, 112, 0x20000); @@ -433,9 +424,9 @@ int ov67_0225CB8C (OverlayManager * param0, int * param1) v0->unk_00 = v1->unk_00; ov67_0225CE30(v0, 112); - ov67_0225D188(&v0->unk_40, v0->unk_0C, 1, 695, 2, 19, 27, 4, (((1 + (18 + 12)) + 9)), v0->unk_00, 112); - ov67_0225D188(&v0->unk_A0, v0->unk_0C, 0, 695, 4, 4, 23, 16, (((((1 + (18 + 12)) + 9)) + (27 * 4))), v0->unk_00, 112); - ov67_0225D188(&v0->unk_10, v0->unk_0C, 1, 674, 5, 1, 22, 2, (((((((((1 + (18 + 12)) + 9)) + (27 * 4))) + (23 * 16))) + (6 * 4))), v0->unk_00, 112); + ov67_0225D188(&v0->unk_40, v0->unk_0C, 1, 695, 2, 19, 27, 4, ((1 + (18 + 12)) + 9), v0->unk_00, 112); + ov67_0225D188(&v0->unk_A0, v0->unk_0C, 0, 695, 4, 4, 23, 16, (((1 + (18 + 12)) + 9) + (27 * 4)), v0->unk_00, 112); + ov67_0225D188(&v0->unk_10, v0->unk_0C, 1, 674, 5, 1, 22, 2, (((((1 + (18 + 12)) + 9) + (27 * 4)) + (23 * 16)) + (6 * 4)), v0->unk_00, 112); ov67_0225D37C(&v0->unk_10, 21); sub_02039734(); @@ -445,10 +436,10 @@ int ov67_0225CB8C (OverlayManager * param0, int * param1) return 1; } -int ov67_0225CC6C (OverlayManager * param0, int * param1) +int ov67_0225CC6C(OverlayManager *param0, int *param1) { - UnkStruct_ov67_0225D154 * v0; - UnkStruct_ov66_02231300 * v1; + UnkStruct_ov67_0225D154 *v0; + UnkStruct_ov66_02231300 *v1; v0 = OverlayManager_Data(param0); v1 = OverlayManager_Args(param0); @@ -531,9 +522,9 @@ int ov67_0225CC6C (OverlayManager * param0, int * param1) return 0; } -int ov67_0225CDC0 (OverlayManager * param0, int * param1) +int ov67_0225CDC0(OverlayManager *param0, int *param1) { - UnkStruct_ov67_0225D154 * v0; + UnkStruct_ov67_0225D154 *v0; v0 = OverlayManager_Data(param0); @@ -555,15 +546,15 @@ int ov67_0225CDC0 (OverlayManager * param0, int * param1) return 1; } -static void ov67_0225CE28 (void * param0) +static void ov67_0225CE28(void *param0) { - UnkStruct_ov67_0225D154 * v0 = param0; + UnkStruct_ov67_0225D154 *v0 = param0; ov67_0225D17C(v0); inline_ov61_0222C1FC(&v0->unk_D4); } -static void ov67_0225CE30 (UnkStruct_ov67_0225D154 * param0, u32 param1) +static void ov67_0225CE30(UnkStruct_ov67_0225D154 *param0, u32 param1) { G2_BlendNone(); G2S_BlendNone(); @@ -588,7 +579,7 @@ static void ov67_0225CE30 (UnkStruct_ov67_0225D154 * param0, u32 param1) } { - Options * v1; + Options *v1; u8 v2; v1 = SaveData_Options(param0->unk_00); @@ -612,7 +603,7 @@ static void ov67_0225CE30 (UnkStruct_ov67_0225D154 * param0, u32 param1) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); { - NARC * v3; + NARC *v3; v3 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, param1); @@ -622,7 +613,7 @@ static void ov67_0225CE30 (UnkStruct_ov67_0225D154 * param0, u32 param1) } } -static void ov67_0225D154 (UnkStruct_ov67_0225D154 * param0) +static void ov67_0225D154(UnkStruct_ov67_0225D154 *param0) { { int v0; @@ -635,12 +626,12 @@ static void ov67_0225D154 (UnkStruct_ov67_0225D154 * param0) } } -static void ov67_0225D17C (UnkStruct_ov67_0225D154 * param0) +static void ov67_0225D17C(UnkStruct_ov67_0225D154 *param0) { sub_0201C2B8(param0->unk_0C); } -static void ov67_0225D188 (UnkStruct_ov67_0225D210 * param0, BGL * param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData * param9, u32 param10) +static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BGL *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *param9, u32 param10) { param0->unk_00 = StringTemplate_Default(param10); param0->unk_04 = MessageLoader_Init(0, 26, param3, param10); @@ -653,7 +644,7 @@ static void ov67_0225D188 (UnkStruct_ov67_0225D210 * param0, BGL * param1, u32 p BGL_AddWindow(param1, ¶m0->unk_08, Unk_ov67_0225D3F4[1], param4, param5, param6, param7, 11, param8); } -static void ov67_0225D210 (UnkStruct_ov67_0225D210 * param0, u32 param1) +static void ov67_0225D210(UnkStruct_ov67_0225D210 *param0, u32 param1) { if (Message_Printing(param0->unk_2C)) { PrintString_ForceStop(param0->unk_2C); @@ -673,7 +664,7 @@ static void ov67_0225D210 (UnkStruct_ov67_0225D210 * param0, u32 param1) sub_0201A9A4(¶m0->unk_08); } -static void ov67_0225D294 (UnkStruct_ov67_0225D210 * param0) +static void ov67_0225D294(UnkStruct_ov67_0225D210 *param0) { if (Message_Printing(param0->unk_2C)) { PrintString_ForceStop(param0->unk_2C); @@ -692,7 +683,7 @@ static void ov67_0225D294 (UnkStruct_ov67_0225D210 * param0) } } -static void ov67_0225D2EC (UnkStruct_ov67_0225D210 * param0) +static void ov67_0225D2EC(UnkStruct_ov67_0225D210 *param0) { if (param0->unk_20 == 1) { GF_ASSERT(param0->unk_24 == NULL); @@ -700,7 +691,7 @@ static void ov67_0225D2EC (UnkStruct_ov67_0225D210 * param0) } } -static void ov67_0225D310 (UnkStruct_ov67_0225D210 * param0) +static void ov67_0225D310(UnkStruct_ov67_0225D210 *param0) { if (param0->unk_20 == 1) { GF_ASSERT(param0->unk_24 != NULL); @@ -709,7 +700,7 @@ static void ov67_0225D310 (UnkStruct_ov67_0225D210 * param0) } } -static void ov67_0225D330 (UnkStruct_ov67_0225D210 * param0) +static void ov67_0225D330(UnkStruct_ov67_0225D210 *param0) { if (Message_Printing(param0->unk_2C)) { PrintString_ForceStop(param0->unk_2C); @@ -726,7 +717,7 @@ static void ov67_0225D330 (UnkStruct_ov67_0225D210 * param0) StringTemplate_Free(param0->unk_00); } -static void ov67_0225D37C (UnkStruct_ov67_0225D210 * param0, u32 param1) +static void ov67_0225D37C(UnkStruct_ov67_0225D210 *param0, u32 param1) { BGL_FillWindow(¶m0->unk_08, 0); MessageLoader_GetStrbuf(param0->unk_04, param1, param0->unk_1C); @@ -734,7 +725,7 @@ static void ov67_0225D37C (UnkStruct_ov67_0225D210 * param0, u32 param1) sub_0201D78C(¶m0->unk_08, 1, param0->unk_18, sub_02002EEC(0, param0->unk_18, 0, 0xB0), 0, 0, 0xF0E00, 0); } -static void ov67_0225D3D0 (UnkStruct_ov67_0225D210 * param0, u32 param1) +static void ov67_0225D3D0(UnkStruct_ov67_0225D210 *param0, u32 param1) { StringTemplate_SetNumber(param0->unk_00, 0, param1, 5, 2, 1); } diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index a08a832cd8..2850f0d088 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -1,31 +1,30 @@ -#include -#include +#include "overlay068/ov68_0225C700.h" + #include +#include #include - -#include "core_sys.h" +#include #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_02030EC4_decl.h" -#include "savedata.h" -#include "overlay066/struct_ov66_0222DFF8_decl.h" -#include "overlay066/struct_ov66_0222E71C_decl.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay061/struct_ov61_0222C884.h" +#include "overlay066/ov66_0222DDF0.h" +#include "overlay066/ov66_02231428.h" +#include "overlay066/ov66_022324F0.h" +#include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "overlay066/struct_ov66_0222E71C_decl.h" #include "overlay066/struct_ov66_0222E908.h" #include "overlay066/struct_ov66_02231374.h" #include "overlay068/struct_ov68_0225DC74.h" @@ -33,54 +32,52 @@ #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_02030EA4.h" #include "unk_020393C8.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_02231428.h" -#include "overlay066/ov66_022324F0.h" -#include "overlay068/ov68_0225C700.h" typedef struct { u32 unk_00; u32 unk_04; BOOL unk_08; BOOL unk_0C; - Strbuf* unk_10; - Strbuf* unk_14[3]; + Strbuf *unk_10; + Strbuf *unk_14[3]; } UnkStruct_ov68_0225DB8C; typedef struct { Window unk_00[1]; s32 unk_10; - GraphicElementData * unk_14; - UnkStruct_02009DC8 * unk_18[4]; + GraphicElementData *unk_14; + UnkStruct_02009DC8 *unk_18[4]; u16 unk_28; u16 unk_2A; UnkStruct_ov68_0225DB8C unk_2C; @@ -93,8 +90,8 @@ typedef struct { s32 unk_64; s32 unk_68[3]; s32 unk_74[3]; - void * unk_80; - NNSG2dCharacterData * unk_84; + void *unk_80; + NNSG2dCharacterData *unk_84; UnkStruct_ov68_0225DB8C unk_88; UnkStruct_ov68_0225DB8C unk_A8; UnkStruct_ov68_0225DC74 unk_C8; @@ -110,25 +107,25 @@ typedef struct { u32 unk_00; s32 unk_04; Window unk_08; - Strbuf* unk_18; - void * unk_1C; - UIControlData * unk_20; + Strbuf *unk_18; + void *unk_1C; + UIControlData *unk_20; } UnkStruct_ov68_0225D128; typedef struct { - MessageLoader * unk_00[9]; - StringTemplate * unk_24; - Strbuf* unk_28; - Strbuf* unk_2C; - UnkStruct_ov66_0222DFF8 * unk_30; + MessageLoader *unk_00[9]; + StringTemplate *unk_24; + Strbuf *unk_28; + Strbuf *unk_2C; + UnkStruct_ov66_0222DFF8 *unk_30; } UnkStruct_ov68_0225CB70; typedef struct { - BGL * unk_00; - GraphicElementManager * unk_04; + BGL *unk_00; + GraphicElementManager *unk_04; UnkStruct_0200C738 unk_08; - UnkStruct_02009714 * unk_194[4]; - NARC * unk_1A4; + UnkStruct_02009714 *unk_194[4]; + NARC *unk_1A4; } UnkStruct_ov68_0225C91C; typedef struct { @@ -138,59 +135,59 @@ typedef struct { UnkStruct_ov68_0225D128 unk_2CC; } UnkStruct_ov68_0225C700; -static void ov68_0225C914(void * param0); -static void ov68_0225C91C(UnkStruct_ov68_0225C91C * param0, SaveData * param1, u32 param2); -static void ov68_0225C960(UnkStruct_ov68_0225C91C * param0); -static void ov68_0225C980(UnkStruct_ov68_0225C91C * param0); -static void ov68_0225C98C(UnkStruct_ov68_0225C91C * param0); -static void ov68_0225C9A0(UnkStruct_ov68_0225C91C * param0, Options * param1, u32 param2); -static void ov68_0225CA8C(UnkStruct_ov68_0225C91C * param0); -static void ov68_0225CAB4(UnkStruct_ov68_0225C91C * param0, u32 param1); -static void ov68_0225CB44(UnkStruct_ov68_0225C91C * param0); -static void ov68_0225CB70(UnkStruct_ov68_0225CB70 * param0, UnkStruct_ov66_0222DFF8 * param1, u32 param2); -static void ov68_0225CBC0(UnkStruct_ov68_0225CB70 * param0); -static Strbuf* ov68_0225CBEC(UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2); -static Strbuf* ov68_0225CC18(UnkStruct_ov68_0225CB70 * param0, u32 param1); -static Strbuf* ov68_0225CC44(UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2); -static void ov68_0225CC78(UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2); -static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C * param0, BOOL param1, u32 param2); -static void ov68_0225DC24(UnkStruct_ov68_0225DB8C * param0); -static Strbuf* ov68_0225DC40(const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1); -static Strbuf* ov68_0225DC58(const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1, u32 param2); -static void ov68_0225DC74(UnkStruct_ov68_0225DC74 * param0); -static u32 ov68_0225DCA4(const UnkStruct_ov68_0225DC74 * param0, u32 param1, u32 param2); -static void ov68_0225DCCC(UnkStruct_ov68_0225DC74 * param0, const UnkStruct_ov66_0222DFF8 * param1); -static void ov68_0225CCA8(UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov66_02231374 * param3, u32 param4); -static BOOL ov68_0225CCB4(UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov68_0225D128 * param3, UnkStruct_ov66_02231374 * param4, u32 param5); -static void ov68_0225CCC8(UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2); -static void ov68_0225CCD0(UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, u32 param3); -static BOOL ov68_0225CE48(UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov68_0225D128 * param3, UnkStruct_ov66_02231374 * param4, u32 param5); -static void ov68_0225D02C(UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2); -static void ov68_0225D06C(UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2); -static void ov68_0225D0F8(UnkStruct_ov68_0225D0F8 * param0); -static void ov68_0225D11C(UnkStruct_ov68_0225D0F8 * param0); -static void ov68_0225D35C(UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov66_02231374 * param3, u32 param4); -static BOOL ov68_0225D36C(UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov68_0225D128 * param3, UnkStruct_ov66_02231374 * param4, u32 param5); -static void ov68_0225D380(UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2); -static void ov68_0225D388(UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov66_02231374 * param3, u32 param4); -static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov68_0225D128 * param3, UnkStruct_ov66_02231374 * param4, u32 param5); -static void ov68_0225D868(UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2); -static void ov68_0225D89C(UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, u32 param2, u32 param3); -static void ov68_0225D8F0(UnkStruct_ov68_0225D388 * param0, const UnkStruct_ov68_0225DB8C * param1, UnkStruct_ov68_0225CB70 * param2, UnkStruct_ov68_0225C91C * param3, const UnkStruct_ov66_0222E908 * param4, u32 param5, u32 param6, u32 param7, BOOL param8); -static void ov68_0225DA30(UnkStruct_ov68_0225D388 * param0, const UnkStruct_ov68_0225DC74 * param1, UnkStruct_ov68_0225C91C * param2, u32 param3); -static BOOL ov68_0225DA74(UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225C91C * param1); -static void ov68_0225DB3C(UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, u32 param3); -static void ov68_0225D128(UnkStruct_ov68_0225D128 * param0, UnkStruct_ov68_0225C91C * param1, SaveData * param2, u32 param3); -static void ov68_0225D178(UnkStruct_ov68_0225D128 * param0, u32 param1); -static void ov68_0225D1B4(UnkStruct_ov68_0225D128 * param0, const Strbuf *param1); -static void ov68_0225D218(UnkStruct_ov68_0225D128 * param0, const Strbuf *param1); -static void ov68_0225D284(UnkStruct_ov68_0225D128 * param0); -static void ov68_0225D2A0(UnkStruct_ov68_0225D128 * param0); -static BOOL ov68_0225D2B4(const UnkStruct_ov68_0225D128 * param0); -static void ov68_0225D2CC(UnkStruct_ov68_0225D128 * param0); -static void ov68_0225D304(UnkStruct_ov68_0225D128 * param0, UnkStruct_ov68_0225C91C * param1, u32 param2); -static u32 ov68_0225D330(UnkStruct_ov68_0225D128 * param0, u32 param1); -static void ov68_0225D348(UnkStruct_ov68_0225D128 * param0, u32 param1); +static void ov68_0225C914(void *param0); +static void ov68_0225C91C(UnkStruct_ov68_0225C91C *param0, SaveData *param1, u32 param2); +static void ov68_0225C960(UnkStruct_ov68_0225C91C *param0); +static void ov68_0225C980(UnkStruct_ov68_0225C91C *param0); +static void ov68_0225C98C(UnkStruct_ov68_0225C91C *param0); +static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 param2); +static void ov68_0225CA8C(UnkStruct_ov68_0225C91C *param0); +static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, u32 param1); +static void ov68_0225CB44(UnkStruct_ov68_0225C91C *param0); +static void ov68_0225CB70(UnkStruct_ov68_0225CB70 *param0, UnkStruct_ov66_0222DFF8 *param1, u32 param2); +static void ov68_0225CBC0(UnkStruct_ov68_0225CB70 *param0); +static Strbuf *ov68_0225CBEC(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2); +static Strbuf *ov68_0225CC18(UnkStruct_ov68_0225CB70 *param0, u32 param1); +static Strbuf *ov68_0225CC44(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2); +static void ov68_0225CC78(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2); +static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C *param0, BOOL param1, u32 param2); +static void ov68_0225DC24(UnkStruct_ov68_0225DB8C *param0); +static Strbuf *ov68_0225DC40(const UnkStruct_ov68_0225DB8C *param0, UnkStruct_ov68_0225CB70 *param1); +static Strbuf *ov68_0225DC58(const UnkStruct_ov68_0225DB8C *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2); +static void ov68_0225DC74(UnkStruct_ov68_0225DC74 *param0); +static u32 ov68_0225DCA4(const UnkStruct_ov68_0225DC74 *param0, u32 param1, u32 param2); +static void ov68_0225DCCC(UnkStruct_ov68_0225DC74 *param0, const UnkStruct_ov66_0222DFF8 *param1); +static void ov68_0225CCA8(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4); +static BOOL ov68_0225CCB4(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5); +static void ov68_0225CCC8(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2); +static void ov68_0225CCD0(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3); +static BOOL ov68_0225CE48(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5); +static void ov68_0225D02C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2); +static void ov68_0225D06C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2); +static void ov68_0225D0F8(UnkStruct_ov68_0225D0F8 *param0); +static void ov68_0225D11C(UnkStruct_ov68_0225D0F8 *param0); +static void ov68_0225D35C(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4); +static BOOL ov68_0225D36C(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5); +static void ov68_0225D380(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2); +static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4); +static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5); +static void ov68_0225D868(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2); +static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2, u32 param3); +static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, u32 param5, u32 param6, u32 param7, BOOL param8); +static void ov68_0225DA30(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DC74 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3); +static BOOL ov68_0225DA74(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225C91C *param1); +static void ov68_0225DB3C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3); +static void ov68_0225D128(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C91C *param1, SaveData *param2, u32 param3); +static void ov68_0225D178(UnkStruct_ov68_0225D128 *param0, u32 param1); +static void ov68_0225D1B4(UnkStruct_ov68_0225D128 *param0, const Strbuf *param1); +static void ov68_0225D218(UnkStruct_ov68_0225D128 *param0, const Strbuf *param1); +static void ov68_0225D284(UnkStruct_ov68_0225D128 *param0); +static void ov68_0225D2A0(UnkStruct_ov68_0225D128 *param0); +static BOOL ov68_0225D2B4(const UnkStruct_ov68_0225D128 *param0); +static void ov68_0225D2CC(UnkStruct_ov68_0225D128 *param0); +static void ov68_0225D304(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C91C *param1, u32 param2); +static u32 ov68_0225D330(UnkStruct_ov68_0225D128 *param0, u32 param1); +static void ov68_0225D348(UnkStruct_ov68_0225D128 *param0, u32 param1); static const UnkStruct_ov22_022559F8 Unk_ov68_0225DD58 = { 0x20, @@ -210,22 +207,22 @@ static const UnkStruct_ov61_0222C884 Unk_ov68_0225DD38 = { }; static const UnkStruct_ov61_0222C884 Unk_ov68_0225DD40[1] = { - {0x2, 0xB, 0x7, 0xF, 0x8, 0x3, 0x1} + { 0x2, 0xB, 0x7, 0xF, 0x8, 0x3, 0x1 } }; static const VecFx32 Unk_ov68_0225DD78[] = { - {FX32_CONST(72), FX32_CONST(64), 0x0}, - {FX32_CONST(72), FX32_CONST(88), 0x0}, - {FX32_CONST(72), FX32_CONST(112), 0x0} + { FX32_CONST(72), FX32_CONST(64), 0x0 }, + { FX32_CONST(72), FX32_CONST(88), 0x0 }, + { FX32_CONST(72), FX32_CONST(112), 0x0 } }; static const UnkStruct_ov61_0222C884 Unk_ov68_0225DDE8[6] = { - {0x2, 0x7, 0x1, 0x12, 0x3, 0x3, 0x1}, - {0x2, 0x5, 0x5, 0xC, 0x9, 0x3, 0x37}, - {0x2, 0x11, 0x5, 0xB, 0x2, 0x4, 0xA3}, - {0x2, 0x11, 0x8, 0xB, 0x2, 0x4, 0xB9}, - {0x2, 0x11, 0xB, 0xB, 0x2, 0x4, 0xCF}, - {0x2, 0x3, 0xF, 0x19, 0x2, 0x3, 0xE5} + { 0x2, 0x7, 0x1, 0x12, 0x3, 0x3, 0x1 }, + { 0x2, 0x5, 0x5, 0xC, 0x9, 0x3, 0x37 }, + { 0x2, 0x11, 0x5, 0xB, 0x2, 0x4, 0xA3 }, + { 0x2, 0x11, 0x8, 0xB, 0x2, 0x4, 0xB9 }, + { 0x2, 0x11, 0xB, 0xB, 0x2, 0x4, 0xCF }, + { 0x2, 0x3, 0xF, 0x19, 0x2, 0x3, 0xE5 } }; static const UnkStruct_02099F80 Unk_ov68_0225DDC0 = { @@ -269,7 +266,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov68_0225DE18[4] = { 0x3, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -284,7 +281,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov68_0225DE18[4] = { 0x1, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -299,7 +296,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov68_0225DE18[4] = { 0x2, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -314,29 +311,29 @@ static const UnkStruct_ov97_0222DB78 Unk_ov68_0225DE18[4] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0, + }, }; -static void (* Unk_ov68_0225DEB0[2])(UnkUnion_ov68_0225CCA8 *, UnkStruct_ov68_0225CB70 *, UnkStruct_ov68_0225C91C *, UnkStruct_ov66_02231374 *, u32) = { +static void (*Unk_ov68_0225DEB0[2])(UnkUnion_ov68_0225CCA8 *, UnkStruct_ov68_0225CB70 *, UnkStruct_ov68_0225C91C *, UnkStruct_ov66_02231374 *, u32) = { ov68_0225CCA8, ov68_0225D35C }; -static BOOL (* Unk_ov68_0225DEA8[2])(UnkUnion_ov68_0225CCA8 *, UnkStruct_ov68_0225CB70 *, UnkStruct_ov68_0225C91C *, UnkStruct_ov68_0225D128 *, UnkStruct_ov66_02231374 *, u32) = { +static BOOL (*Unk_ov68_0225DEA8[2])(UnkUnion_ov68_0225CCA8 *, UnkStruct_ov68_0225CB70 *, UnkStruct_ov68_0225C91C *, UnkStruct_ov68_0225D128 *, UnkStruct_ov66_02231374 *, u32) = { ov68_0225CCB4, ov68_0225D36C }; -static void (* Unk_ov68_0225DEA0[2])(UnkUnion_ov68_0225CCA8 *, UnkStruct_ov68_0225CB70 *, UnkStruct_ov68_0225C91C *) = { +static void (*Unk_ov68_0225DEA0[2])(UnkUnion_ov68_0225CCA8 *, UnkStruct_ov68_0225CB70 *, UnkStruct_ov68_0225C91C *) = { ov68_0225CCC8, ov68_0225D380 }; -int ov68_0225C700 (OverlayManager * param0, int * param1) +int ov68_0225C700(OverlayManager *param0, int *param1) { - UnkStruct_ov68_0225C700 * v0; - UnkStruct_ov66_02231374 * v1; + UnkStruct_ov68_0225C700 *v0; + UnkStruct_ov66_02231374 *v1; v1 = OverlayManager_Args(param0); @@ -358,16 +355,16 @@ int ov68_0225C700 (OverlayManager * param0, int * param1) return 1; } -int ov68_0225C798 (OverlayManager * param0, int * param1) +int ov68_0225C798(OverlayManager *param0, int *param1) { - UnkStruct_ov68_0225C700 * v0; - UnkStruct_ov66_02231374 * v1; + UnkStruct_ov68_0225C700 *v0; + UnkStruct_ov66_02231374 *v1; BOOL v2; v0 = OverlayManager_Data(param0); v1 = OverlayManager_Args(param0); - switch ((*param1)) { + switch (*param1) { case 0: sub_0200F174(0, 1, 1, 0x0, 6, 1, 122); ov66_0222E31C(v1->unk_04, 1); @@ -418,10 +415,10 @@ int ov68_0225C798 (OverlayManager * param0, int * param1) return 0; } -int ov68_0225C8A8 (OverlayManager * param0, int * param1) +int ov68_0225C8A8(OverlayManager *param0, int *param1) { - UnkStruct_ov68_0225C700 * v0; - UnkStruct_ov66_02231374 * v1; + UnkStruct_ov68_0225C700 *v0; + UnkStruct_ov66_02231374 *v1; v0 = OverlayManager_Data(param0); v1 = OverlayManager_Args(param0); @@ -442,15 +439,15 @@ int ov68_0225C8A8 (OverlayManager * param0, int * param1) return 1; } -static void ov68_0225C914 (void * param0) +static void ov68_0225C914(void *param0) { - UnkStruct_ov68_0225C700 * v0 = param0; + UnkStruct_ov68_0225C700 *v0 = param0; ov68_0225C98C(&v0->unk_00); } -static void ov68_0225C91C (UnkStruct_ov68_0225C91C * param0, SaveData * param1, u32 param2) +static void ov68_0225C91C(UnkStruct_ov68_0225C91C *param0, SaveData *param1, u32 param2) { - Options * v0; + Options *v0; v0 = SaveData_Options(param1); param0->unk_1A4 = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_LOBBY_OTHER, param2); @@ -461,7 +458,7 @@ static void ov68_0225C91C (UnkStruct_ov68_0225C91C * param0, SaveData * param1, ov68_0225CAB4(param0, param2); } -static void ov68_0225C960 (UnkStruct_ov68_0225C91C * param0) +static void ov68_0225C960(UnkStruct_ov68_0225C91C *param0) { NARC_dtor(param0->unk_1A4); sub_0201DC3C(); @@ -470,19 +467,19 @@ static void ov68_0225C960 (UnkStruct_ov68_0225C91C * param0) ov68_0225CB44(param0); } -static void ov68_0225C980 (UnkStruct_ov68_0225C91C * param0) +static void ov68_0225C980(UnkStruct_ov68_0225C91C *param0) { sub_020219F8(param0->unk_04); } -static void ov68_0225C98C (UnkStruct_ov68_0225C91C * param0) +static void ov68_0225C98C(UnkStruct_ov68_0225C91C *param0) { sub_0201C2B8(param0->unk_00); sub_0200A858(); sub_0201DCAC(); } -static void ov68_0225C9A0 (UnkStruct_ov68_0225C91C * param0, Options * param1, u32 param2) +static void ov68_0225C9A0(UnkStruct_ov68_0225C91C *param0, Options *param1, u32 param2) { sub_02018368(&Unk_ov68_0225DD48); @@ -508,7 +505,7 @@ static void ov68_0225C9A0 (UnkStruct_ov68_0225C91C * param0, Options * param1, u sub_0200DD0C(param0->unk_00, 1, 1, 5, v1, param2); } - sub_0200DAA4(param0->unk_00, 1, ((1 + (18 + 12))), 6, 0, param2); + sub_0200DAA4(param0->unk_00, 1, (1 + (18 + 12)), 6, 0, param2); { sub_02006E3C(169, 2, param0->unk_00, 4, 0, 0, 0, param2); @@ -517,7 +514,7 @@ static void ov68_0225C9A0 (UnkStruct_ov68_0225C91C * param0, Options * param1, u } } -static void ov68_0225CA8C (UnkStruct_ov68_0225C91C * param0) +static void ov68_0225CA8C(UnkStruct_ov68_0225C91C *param0) { { int v0; @@ -530,7 +527,7 @@ static void ov68_0225CA8C (UnkStruct_ov68_0225C91C * param0) Heap_FreeToHeap(param0->unk_00); } -static void ov68_0225CAB4 (UnkStruct_ov68_0225C91C * param0, u32 param1) +static void ov68_0225CAB4(UnkStruct_ov68_0225C91C *param0, u32 param1) { int v0; @@ -555,7 +552,7 @@ static void ov68_0225CAB4 (UnkStruct_ov68_0225C91C * param0, u32 param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov68_0225CB44 (UnkStruct_ov68_0225C91C * param0) +static void ov68_0225CB44(UnkStruct_ov68_0225C91C *param0) { int v0; @@ -570,11 +567,19 @@ static void ov68_0225CB44 (UnkStruct_ov68_0225C91C * param0) sub_0200A878(); } -static void ov68_0225CB70 (UnkStruct_ov68_0225CB70 * param0, UnkStruct_ov66_0222DFF8 * param1, u32 param2) +static void ov68_0225CB70(UnkStruct_ov68_0225CB70 *param0, UnkStruct_ov66_0222DFF8 *param1, u32 param2) { int v0; static const v1[9] = { - 673, 657, 661, 654, 655, 656, 658, 659, 660, + 673, + 657, + 661, + 654, + 655, + 656, + 658, + 659, + 660, }; param0->unk_30 = param1; @@ -588,7 +593,7 @@ static void ov68_0225CB70 (UnkStruct_ov68_0225CB70 * param0, UnkStruct_ov66_0222 param0->unk_2C = Strbuf_Init(256, param2); } -static void ov68_0225CBC0 (UnkStruct_ov68_0225CB70 * param0) +static void ov68_0225CBC0(UnkStruct_ov68_0225CB70 *param0) { int v0; @@ -601,7 +606,7 @@ static void ov68_0225CBC0 (UnkStruct_ov68_0225CB70 * param0) Strbuf_Free(param0->unk_2C); } -static Strbuf* ov68_0225CBEC (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2) +static Strbuf *ov68_0225CBEC(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2) { GF_ASSERT(param1 < 9); @@ -611,7 +616,7 @@ static Strbuf* ov68_0225CBEC (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 return param0->unk_28; } -static Strbuf* ov68_0225CC18 (UnkStruct_ov68_0225CB70 * param0, u32 param1) +static Strbuf *ov68_0225CC18(UnkStruct_ov68_0225CB70 *param0, u32 param1) { if (param1 >= (50 + 10)) { GF_ASSERT(param1 >= (50 + 10)); @@ -625,7 +630,7 @@ static Strbuf* ov68_0225CC18 (UnkStruct_ov68_0225CB70 * param0, u32 param1) return ov68_0225CBEC(param0, 2, param1 - 50); } -static Strbuf* ov68_0225CC44 (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2) +static Strbuf *ov68_0225CC44(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2) { if (param1 >= (50 + 10)) { GF_ASSERT(param1 >= (50 + 10)); @@ -639,10 +644,10 @@ static Strbuf* ov68_0225CC44 (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 return ov68_0225CBEC(param0, 6 + param2, param1 - 50); } -static void ov68_0225CC78 (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 param2) +static void ov68_0225CC78(UnkStruct_ov68_0225CB70 *param0, u32 param1, u32 param2) { - TrainerInfo * v0; - const UnkStruct_ov66_0222E71C * v1; + TrainerInfo *v0; + const UnkStruct_ov66_0222E71C *v1; v0 = TrainerInfo_New(param2); v1 = ov66_0222E3BC(param0->unk_30); @@ -652,22 +657,22 @@ static void ov68_0225CC78 (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 par Heap_FreeToHeap(v0); } -static void ov68_0225CCA8 (UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov66_02231374 * param3, u32 param4) +static void ov68_0225CCA8(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4) { ov68_0225CCD0(¶m0->val1, param1, param2, param4); } -static BOOL ov68_0225CCB4 (UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov68_0225D128 * param3, UnkStruct_ov66_02231374 * param4, u32 param5) +static BOOL ov68_0225CCB4(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5) { return ov68_0225CE48(¶m0->val1, param1, param2, param3, param4, param5); } -static void ov68_0225CCC8 (UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2) +static void ov68_0225CCC8(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2) { ov68_0225D02C(¶m0->val1, param1, param2); } -static void ov68_0225CCD0 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, u32 param3) +static void ov68_0225CCD0(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3) { { sub_02007130(param2->unk_1A4, 199, 0, 0, 4 * 32, param3); @@ -696,7 +701,7 @@ static void ov68_0225CCD0 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225 { UnkStruct_ov19_021DA864 v1; - UnkStruct_ov83_0223D9A8 v2 = {0}; + UnkStruct_ov83_0223D9A8 v2 = { 0 }; sub_020093B4(&v1, 20, 20, 20, 20, 0xffffffff, 0xffffffff, 0, 0, param2->unk_194[0], param2->unk_194[1], param2->unk_194[2], param2->unk_194[3], NULL, NULL); @@ -721,10 +726,10 @@ static void ov68_0225CCD0 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225 ov68_0225DB8C(¶m0->unk_2C, 1, param3); } -static BOOL ov68_0225CE48 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov68_0225D128 * param3, UnkStruct_ov66_02231374 * param4, u32 param5) +static BOOL ov68_0225CE48(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5) { u32 v0; - Strbuf* v1; + Strbuf *v1; switch (param0->unk_28) { case 0: @@ -737,8 +742,7 @@ static BOOL ov68_0225CE48 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225 ov68_0225D304(param3, param2, param5); param0->unk_28 = 2; break; - case 2: - { + case 2: { u32 v2; v2 = ov68_0225D330(param3, param5); @@ -751,8 +755,7 @@ static BOOL ov68_0225CE48 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225 param0->unk_28 = 9; break; } - } - break; + } break; case 3: if (param0->unk_2C.unk_08 == 0) { v0 = 92; @@ -809,8 +812,7 @@ static BOOL ov68_0225CE48 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225 Sound_PlayEffect(1381); param0->unk_28 = 7; break; - case 7: - { + case 7: { u32 v3; v3 = ov66_02233434(); @@ -824,8 +826,7 @@ static BOOL ov68_0225CE48 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225 param0->unk_2A = 8; param0->unk_28 = 10; } - } - break; + } break; case 8: if (param0->unk_2C.unk_08 == 0) { v0 = 98; @@ -854,7 +855,7 @@ static BOOL ov68_0225CE48 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225 return 0; } -static void ov68_0225D02C (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2) +static void ov68_0225D02C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2) { ov68_0225DC24(¶m0->unk_2C); @@ -882,50 +883,50 @@ static void ov68_0225D02C (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225 } } -static void ov68_0225D06C (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2) +static void ov68_0225D06C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2) { - Strbuf* v0; + Strbuf *v0; BGL_FillWindow(¶m0->unk_00[0], 0); v0 = ov68_0225DC58(¶m0->unk_2C, param1, 0); - sub_0201D78C(¶m0->unk_00[0], 1, v0, 0, 0, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_00[0], 1, v0, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); v0 = ov68_0225DC58(¶m0->unk_2C, param1, 1); - sub_0201D78C(¶m0->unk_00[0], 1, v0, 0, 24, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_00[0], 1, v0, 0, 24, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); v0 = ov68_0225DC58(¶m0->unk_2C, param1, 2); - sub_0201D78C(¶m0->unk_00[0], 1, v0, 0, 48, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_00[0], 1, v0, 0, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_00[0]); } -static void ov68_0225D0F8 (UnkStruct_ov68_0225D0F8 * param0) +static void ov68_0225D0F8(UnkStruct_ov68_0225D0F8 *param0) { sub_02021CAC(param0->unk_14, 1); sub_02021C50(param0->unk_14, &Unk_ov68_0225DD78[param0->unk_10]); } -static void ov68_0225D11C (UnkStruct_ov68_0225D0F8 * param0) +static void ov68_0225D11C(UnkStruct_ov68_0225D0F8 *param0) { sub_02021CC8(param0->unk_14, 1); } -static void ov68_0225D128 (UnkStruct_ov68_0225D128 * param0, UnkStruct_ov68_0225C91C * param1, SaveData * param2, u32 param3) +static void ov68_0225D128(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C91C *param1, SaveData *param2, u32 param3) { - BGL_AddWindow(param1->unk_00, ¶m0->unk_08, 1, 2, 19, 27, 4, 4, ((((1 + (18 + 12))) + 9))); + BGL_AddWindow(param1->unk_00, ¶m0->unk_08, 1, 2, 19, 27, 4, 4, ((1 + (18 + 12)) + 9)); BGL_FillWindow(¶m0->unk_08, 15); param0->unk_18 = Strbuf_Init(256, param3); { - Options * v0; + Options *v0; v0 = SaveData_Options(param2); param0->unk_04 = Options_TextFrameDelay(v0); } } -static void ov68_0225D178 (UnkStruct_ov68_0225D128 * param0, u32 param1) +static void ov68_0225D178(UnkStruct_ov68_0225D128 *param0, u32 param1) { if (Message_Printing(param0->unk_00)) { PrintString_ForceStop(param0->unk_00); @@ -939,7 +940,7 @@ static void ov68_0225D178 (UnkStruct_ov68_0225D128 * param0, u32 param1) ov68_0225D348(param0, param1); } -static void ov68_0225D1B4 (UnkStruct_ov68_0225D128 * param0, const Strbuf *param1) +static void ov68_0225D1B4(UnkStruct_ov68_0225D128 *param0, const Strbuf *param1) { if (Message_Printing(param0->unk_00)) { PrintString_ForceStop(param0->unk_00); @@ -951,7 +952,7 @@ static void ov68_0225D1B4 (UnkStruct_ov68_0225D128 * param0, const Strbuf *param sub_0200E060(¶m0->unk_08, 1, 1, 5); } -static void ov68_0225D218 (UnkStruct_ov68_0225D128 * param0, const Strbuf *param1) +static void ov68_0225D218(UnkStruct_ov68_0225D128 *param0, const Strbuf *param1) { if (Message_Printing(param0->unk_00)) { PrintString_ForceStop(param0->unk_00); @@ -964,13 +965,13 @@ static void ov68_0225D218 (UnkStruct_ov68_0225D128 * param0, const Strbuf *param sub_0201A9A4(¶m0->unk_08); } -static void ov68_0225D284 (UnkStruct_ov68_0225D128 * param0) +static void ov68_0225D284(UnkStruct_ov68_0225D128 *param0) { GF_ASSERT(param0->unk_1C == NULL); param0->unk_1C = sub_0200E7FC(¶m0->unk_08, 1); } -static void ov68_0225D2A0 (UnkStruct_ov68_0225D128 * param0) +static void ov68_0225D2A0(UnkStruct_ov68_0225D128 *param0) { if (param0->unk_1C != NULL) { DeleteWaitDial(param0->unk_1C); @@ -978,7 +979,7 @@ static void ov68_0225D2A0 (UnkStruct_ov68_0225D128 * param0) } } -static BOOL ov68_0225D2B4 (const UnkStruct_ov68_0225D128 * param0) +static BOOL ov68_0225D2B4(const UnkStruct_ov68_0225D128 *param0) { if (Message_Printing(param0->unk_00) == 0) { return 1; @@ -987,7 +988,7 @@ static BOOL ov68_0225D2B4 (const UnkStruct_ov68_0225D128 * param0) return 0; } -static void ov68_0225D2CC (UnkStruct_ov68_0225D128 * param0) +static void ov68_0225D2CC(UnkStruct_ov68_0225D128 *param0) { if (Message_Printing(param0->unk_00)) { PrintString_ForceStop(param0->unk_00); @@ -999,13 +1000,13 @@ static void ov68_0225D2CC (UnkStruct_ov68_0225D128 * param0) sub_0201AD10(¶m0->unk_08); } -static void ov68_0225D304 (UnkStruct_ov68_0225D128 * param0, UnkStruct_ov68_0225C91C * param1, u32 param2) +static void ov68_0225D304(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C91C *param1, u32 param2) { GF_ASSERT(param0->unk_20 == NULL); - param0->unk_20 = sub_02002100(param1->unk_00, &Unk_ov68_0225DD38, ((1 + (18 + 12))), 6, param2); + param0->unk_20 = sub_02002100(param1->unk_00, &Unk_ov68_0225DD38, (1 + (18 + 12)), 6, param2); } -static u32 ov68_0225D330 (UnkStruct_ov68_0225D128 * param0, u32 param1) +static u32 ov68_0225D330(UnkStruct_ov68_0225D128 *param0, u32 param1) { u32 v0; @@ -1018,7 +1019,7 @@ static u32 ov68_0225D330 (UnkStruct_ov68_0225D128 * param0, u32 param1) return v0; } -static void ov68_0225D348 (UnkStruct_ov68_0225D128 * param0, u32 param1) +static void ov68_0225D348(UnkStruct_ov68_0225D128 *param0, u32 param1) { if (param0->unk_20 != NULL) { sub_02002154(param0->unk_20, param1); @@ -1026,22 +1027,22 @@ static void ov68_0225D348 (UnkStruct_ov68_0225D128 * param0, u32 param1) } } -static void ov68_0225D35C (UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov66_02231374 * param3, u32 param4) +static void ov68_0225D35C(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4) { ov68_0225D388(¶m0->val2, param1, param2, param3, param4); } -static BOOL ov68_0225D36C (UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov68_0225D128 * param3, UnkStruct_ov66_02231374 * param4, u32 param5) +static BOOL ov68_0225D36C(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5) { return ov68_0225D478(¶m0->val2, param1, param2, param3, param4, param5); } -static void ov68_0225D380 (UnkUnion_ov68_0225CCA8 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2) +static void ov68_0225D380(UnkUnion_ov68_0225CCA8 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2) { ov68_0225D868(¶m0->val2, param1, param2); } -static void ov68_0225D388 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov66_02231374 * param3, u32 param4) +static void ov68_0225D388(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov66_02231374 *param3, u32 param4) { { sub_02007130(param2->unk_1A4, 199, 0, 0, 4 * 32, param4); @@ -1076,9 +1077,9 @@ static void ov68_0225D388 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 } } -static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, UnkStruct_ov68_0225D128 * param3, UnkStruct_ov66_02231374 * param4, u32 param5) +static BOOL ov68_0225D478(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, UnkStruct_ov68_0225D128 *param3, UnkStruct_ov66_02231374 *param4, u32 param5) { - Strbuf* v0; + Strbuf *v0; u32 v1; switch (param0->unk_60) { @@ -1120,10 +1121,9 @@ static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 param0->unk_62 = 4; param0->unk_60 = 22; break; - case 4: - { + case 4: { UnkStruct_ov66_0222E908 v2; - const UnkStruct_ov66_0222E71C * v3; + const UnkStruct_ov66_0222E71C *v3; BOOL v4; v3 = ov66_0222E3BC(param4->unk_04); @@ -1138,8 +1138,7 @@ static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 param0->unk_60 = 5; break; - case 5: - { + case 5: { BOOL v5; v5 = ov68_0225DA74(param0, param2); @@ -1147,8 +1146,7 @@ static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 if (v5 == 1) { param0->unk_60 = 6; } - } - break; + } break; case 6: if (gCoreSys.pressedKeys & PAD_BUTTON_A) { if (param0->unk_A8.unk_00 != (PPW_LOBBY_INVALID_QUESTION_NO)) { @@ -1167,8 +1165,7 @@ static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 ov68_0225D304(param3, param2, param5); param0->unk_60 = 8; break; - case 8: - { + case 8: { u32 v6; v6 = ov68_0225D330(param3, param5); @@ -1181,8 +1178,7 @@ static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 param0->unk_60 = 20; break; } - } - break; + } break; case 9: sub_0200F174(0, 0, 0, 0x0, 6, 1, param5); param0->unk_60 = 10; @@ -1240,10 +1236,9 @@ static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 param0->unk_62 = 17; param0->unk_60 = 22; break; - case 17: - { + case 17: { UnkStruct_ov66_0222E908 v7; - UnkStruct_02030EC4 * v8; + UnkStruct_02030EC4 *v8; BOOL v9; v8 = sub_02030EC4(param4->unk_00); @@ -1257,8 +1252,7 @@ static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 } param0->unk_60 = 18; break; - case 18: - { + case 18: { BOOL v10; v10 = ov68_0225DA74(param0, param2); @@ -1266,8 +1260,7 @@ static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 if (v10 == 1) { param0->unk_60 = 19; } - } - break; + } break; case 19: if (gCoreSys.pressedKeys & PAD_BUTTON_A) { param0->unk_60 = 20; @@ -1295,7 +1288,7 @@ static BOOL ov68_0225D478 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 return 0; } -static void ov68_0225D868 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2) +static void ov68_0225D868(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2) { { ov68_0225DC24(¶m0->unk_88); @@ -1314,9 +1307,9 @@ static void ov68_0225D868 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 } } -static void ov68_0225D89C (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, u32 param2, u32 param3) +static void ov68_0225D89C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2, u32 param3) { - Strbuf* v0; + Strbuf *v0; u32 v1; s32 v2; @@ -1330,9 +1323,9 @@ static void ov68_0225D89C (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 sub_0201A9A4(¶m0->unk_00[0]); } -static void ov68_0225D8F0 (UnkStruct_ov68_0225D388 * param0, const UnkStruct_ov68_0225DB8C * param1, UnkStruct_ov68_0225CB70 * param2, UnkStruct_ov68_0225C91C * param3, const UnkStruct_ov66_0222E908 * param4, u32 param5, u32 param6, u32 param7, BOOL param8) +static void ov68_0225D8F0(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DB8C *param1, UnkStruct_ov68_0225CB70 *param2, UnkStruct_ov68_0225C91C *param3, const UnkStruct_ov66_0222E908 *param4, u32 param5, u32 param6, u32 param7, BOOL param8) { - Strbuf* v0; + Strbuf *v0; BGL_FillWindow(¶m0->unk_00[1], 0); BGL_FillWindow(¶m0->unk_00[5], 0); @@ -1376,7 +1369,7 @@ static void ov68_0225D8F0 (UnkStruct_ov68_0225D388 * param0, const UnkStruct_ov6 sub_0201A9A4(¶m0->unk_00[1]); } -static void ov68_0225DA30 (UnkStruct_ov68_0225D388 * param0, const UnkStruct_ov68_0225DC74 * param1, UnkStruct_ov68_0225C91C * param2, u32 param3) +static void ov68_0225DA30(UnkStruct_ov68_0225D388 *param0, const UnkStruct_ov68_0225DC74 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3) { int v0; @@ -1391,7 +1384,7 @@ static void ov68_0225DA30 (UnkStruct_ov68_0225D388 * param0, const UnkStruct_ov6 } } -static BOOL ov68_0225DA74 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225C91C * param1) +static BOOL ov68_0225DA74(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225C91C *param1) { s32 v0; s32 v1; @@ -1438,7 +1431,7 @@ static BOOL ov68_0225DA74 (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 return 0; } -static void ov68_0225DB3C (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225CB70 * param1, UnkStruct_ov68_0225C91C * param2, u32 param3) +static void ov68_0225DB3C(UnkStruct_ov68_0225D388 *param0, UnkStruct_ov68_0225CB70 *param1, UnkStruct_ov68_0225C91C *param2, u32 param3) { { sub_0200710C(param2->unk_1A4, 203, param2->unk_00, 0, 0, 0, 0, param3); @@ -1456,11 +1449,11 @@ static void ov68_0225DB3C (UnkStruct_ov68_0225D388 * param0, UnkStruct_ov68_0225 ov68_0225D89C(param0, param1, 119, ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0)))); } -static void ov68_0225DB8C (UnkStruct_ov68_0225DB8C * param0, BOOL param1, u32 param2) +static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C *param0, BOOL param1, u32 param2) { u32 v0; u32 v1; - u16 * v2; + u16 *v2; int v3; param0->unk_10 = Strbuf_Init(256, param2); @@ -1495,7 +1488,7 @@ static void ov68_0225DB8C (UnkStruct_ov68_0225DB8C * param0, BOOL param1, u32 pa } } -static void ov68_0225DC24 (UnkStruct_ov68_0225DB8C * param0) +static void ov68_0225DC24(UnkStruct_ov68_0225DB8C *param0) { int v0; @@ -1506,7 +1499,7 @@ static void ov68_0225DC24 (UnkStruct_ov68_0225DB8C * param0) } } -static Strbuf* ov68_0225DC40 (const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1) +static Strbuf *ov68_0225DC40(const UnkStruct_ov68_0225DB8C *param0, UnkStruct_ov68_0225CB70 *param1) { if (param0->unk_0C == 0) { return ov68_0225CC18(param1, param0->unk_00); @@ -1515,7 +1508,7 @@ static Strbuf* ov68_0225DC40 (const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ return param0->unk_10; } -static Strbuf* ov68_0225DC58 (const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ov68_0225CB70 * param1, u32 param2) +static Strbuf *ov68_0225DC58(const UnkStruct_ov68_0225DB8C *param0, UnkStruct_ov68_0225CB70 *param1, u32 param2) { if (param0->unk_0C == 0) { return ov68_0225CC44(param1, param0->unk_00, param2); @@ -1524,7 +1517,7 @@ static Strbuf* ov68_0225DC58 (const UnkStruct_ov68_0225DB8C * param0, UnkStruct_ return param0->unk_14[param2]; } -static void ov68_0225DC74 (UnkStruct_ov68_0225DC74 * param0) +static void ov68_0225DC74(UnkStruct_ov68_0225DC74 *param0) { int v0; @@ -1536,7 +1529,7 @@ static void ov68_0225DC74 (UnkStruct_ov68_0225DC74 * param0) } } -static u32 ov68_0225DCA4 (const UnkStruct_ov68_0225DC74 * param0, u32 param1, u32 param2) +static u32 ov68_0225DCA4(const UnkStruct_ov68_0225DC74 *param0, u32 param1, u32 param2) { u64 v0, v1; @@ -1548,9 +1541,9 @@ static u32 ov68_0225DCA4 (const UnkStruct_ov68_0225DC74 * param0, u32 param1, u3 return (u32)(((u64)(v0 * v1)) / param0->unk_0C); } -static void ov68_0225DCCC (UnkStruct_ov68_0225DC74 * param0, const UnkStruct_ov66_0222DFF8 * param1) +static void ov68_0225DCCC(UnkStruct_ov68_0225DC74 *param0, const UnkStruct_ov66_0222DFF8 *param1) { - const UnkStruct_ov66_0222E71C * v0; + const UnkStruct_ov66_0222E71C *v0; UnkStruct_ov66_0222E908 v1; int v2; u32 v3; diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 6ab3a0819c..b61678061a 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -1,21 +1,16 @@ +#include "overlay069/ov69_0225C700.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202C878_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_020170F4.h" @@ -23,8 +18,11 @@ #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" +#include "overlay066/ov66_0222DDF0.h" +#include "overlay066/ov66_02231428.h" #include "overlay066/struct_ov66_02230F50.h" #include "overlay066/struct_ov66_02231428.h" #include "overlay066/struct_ov66_02231560.h" @@ -35,44 +33,44 @@ #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02015920.h" #include "unk_020170BC.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_02024220.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202C858.h" #include "unk_020393C8.h" #include "unk_020996D0.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_02231428.h" -#include "overlay069/ov69_0225C700.h" typedef struct { s16 unk_00; @@ -115,18 +113,18 @@ typedef struct { typedef struct { u32 unk_00_0 : 1; u32 unk_00_1 : 1; - u32 : 30; + u32 : 30; u32 unk_04_0 : 31; - u32 : 1; + u32 : 1; } UnkStruct_ov69_0225DA74; typedef struct { - BGL * unk_00; - GraphicElementManager * unk_04; + BGL *unk_00; + GraphicElementManager *unk_04; UnkStruct_0200C738 unk_08; - UnkStruct_02009714 * unk_194[4]; - GenericPointerData * unk_1A4; - NARC * unk_1A8; + UnkStruct_02009714 *unk_194[4]; + GenericPointerData *unk_1A4; + NARC *unk_1A8; } UnkStruct_ov69_0225D35C; typedef struct { @@ -145,7 +143,7 @@ typedef struct { } UnkStruct_ov69_0225CA7C; typedef struct { - Camera * camera; + Camera *camera; CameraAngle unk_04; fx32 unk_0C; u16 unk_10; @@ -162,12 +160,12 @@ typedef struct { u16 unk_00; u16 unk_02; u8 unk_04[4]; - void * unk_08[2]; - NNSG2dScreenData * unk_10[2]; + void *unk_08[2]; + NNSG2dScreenData *unk_10[2]; u16 unk_18; u16 unk_1A; - void * unk_1C; - NNSG2dPaletteData * unk_20; + void *unk_1C; + NNSG2dPaletteData *unk_20; u8 unk_24; u8 unk_25; u8 unk_26; @@ -187,7 +185,7 @@ typedef struct { s16 unk_06; u16 unk_08; u16 unk_0A; - const UnkStruct_ov69_0225ECF0 * unk_0C; + const UnkStruct_ov69_0225ECF0 *unk_0C; } UnkStruct_ov69_0225ED90; typedef struct { @@ -196,8 +194,8 @@ typedef struct { s16 unk_32; u8 unk_34[4]; u8 unk_38[4]; - GraphicElementData * unk_3C[12]; - UnkStruct_02009DC8 * unk_6C[12][4]; + GraphicElementData *unk_3C[12]; + UnkStruct_02009DC8 *unk_6C[12][4]; } UnkStruct_ov69_0225EB60; typedef struct { @@ -207,7 +205,7 @@ typedef struct { s16 unk_06; s16 unk_08; s16 unk_0A; - SysTask * unk_0C; + SysTask *unk_0C; } UnkStruct_ov69_0225E478; typedef struct { @@ -220,8 +218,8 @@ typedef struct { u16 unk_3E; UnkStruct_ov69_0225E084_sub1 unk_40[18]; u32 unk_88[3]; - void * unk_94; - NNSG2dScreenData * unk_98; + void *unk_94; + NNSG2dScreenData *unk_98; u16 unk_9C; u16 unk_9E; UnkStruct_ov69_0225E7DC unk_A0[5]; @@ -247,24 +245,24 @@ typedef struct { u32 unk_00; u32 unk_04; u32 unk_08; - Strbuf* unk_0C; + Strbuf *unk_0C; Window unk_10; - UnkStruct_02015920 * unk_20; + UnkStruct_02015920 *unk_20; } UnkStruct_ov69_0225DDC8; typedef struct { - MessageLoader * unk_00; - StringTemplate * unk_04; - Strbuf* unk_08; - Strbuf* unk_0C; + MessageLoader *unk_00; + StringTemplate *unk_04; + Strbuf *unk_08; + Strbuf *unk_0C; } UnkStruct_ov69_0225EF54; typedef struct { u16 unk_00; u16 unk_02; UnkStruct_ov69_0225DA74 unk_04; - UnkStruct_0202C878 * unk_0C; - Options * unk_10; + UnkStruct_0202C878 *unk_0C; + Options *unk_10; int unk_14; int unk_18; UnkStruct_ov66_02231428 unk_1C; @@ -278,135 +276,135 @@ typedef struct { UnkStruct_ov69_0225DDC8 unk_BF64; } UnkStruct_ov69_0225CE64; -static void ov69_0225C980(UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov66_02231560 * param1, u32 param2); -static void ov69_0225CA7C(UnkStruct_ov69_0225CA7C * param0, u32 param1, s16 param2, s16 param3, u16 param4, u16 param5, const UnkStruct_ov66_02231560 * param6); -static void ov69_0225CAF4(MtxFx33 * param0, const VecFx32 * param1); -static void ov69_0225CB6C(MtxFx33 * param0, const VecFx32 * param1); -static void ov69_0225CBE4(int param0, int param1, int * param2, int * param3, int * param4, int * param5); -static u32 ov69_0225CC54(UnkStruct_ov69_0225CE64 * param0, int param1, int param2); -static void ov69_0225CE0C(VecFx32 * param0); -static BOOL ov69_0225CE64(UnkStruct_ov69_0225CE64 * param0); -static void ov69_0225CF30(UnkStruct_ov69_0225CE64 * param0); -static void ov69_0225CF50(UnkStruct_ov69_0225CE64 * param0); -static void ov69_0225CF90(void * param0); -static u32 ov69_0225CF9C(UnkStruct_ov69_0225CE64 * param0); -static void ov69_0225D030(UnkStruct_ov69_0225CE64 * param0, const UnkStruct_ov66_02230F50 * param1); -static BOOL ov69_0225D088(const UnkStruct_ov69_0225CE64 * param0, UnkStruct_ov69_0225E0C0 * param1); -static u32 ov69_0225D0D8(const UnkStruct_ov69_0225CE64 * param0); -static u32 ov69_0225D194(const VecFx32 * param0, const VecFx32 * param1); -static u32 ov69_0225D1E0(const UnkStruct_ov69_0225CE64 * param0, u32 param1, UnkStruct_ov66_02231428 param2); -static BOOL ov69_0225D268(UnkStruct_ov69_0225CE64 * param0, u8 param1, u8 param2); -static void ov69_0225D2A8(UnkStruct_ov69_0225CE64 * param0, const UnkStruct_ov66_02230F50 * param1); -static void ov69_0225D318(UnkStruct_ov69_0225D35C * param0, Options * param1, u32 param2); -static void ov69_0225D35C(UnkStruct_ov69_0225D35C * param0); -static void ov69_0225D384(UnkStruct_ov69_0225D35C * param0); -static void ov69_0225D390(UnkStruct_ov69_0225D35C * param0); -static void ov69_0225D3A4(UnkStruct_ov69_0225D35C * param0, Options * param1, u32 param2); -static void ov69_0225D504(UnkStruct_ov69_0225D35C * param0); -static void ov69_0225D53C(UnkStruct_ov69_0225D35C * param0, u32 param1); -static void ov69_0225D5D8(UnkStruct_ov69_0225D35C * param0); -static void ov69_0225D604(UnkStruct_ov69_0225D35C * param0, u32 param1); -static void ov69_0225D63C(UnkStruct_ov69_0225D35C * param0); +static void ov69_0225C980(UnkStruct_ov69_0225CA7C *param0, const UnkStruct_ov66_02231560 *param1, u32 param2); +static void ov69_0225CA7C(UnkStruct_ov69_0225CA7C *param0, u32 param1, s16 param2, s16 param3, u16 param4, u16 param5, const UnkStruct_ov66_02231560 *param6); +static void ov69_0225CAF4(MtxFx33 *param0, const VecFx32 *param1); +static void ov69_0225CB6C(MtxFx33 *param0, const VecFx32 *param1); +static void ov69_0225CBE4(int param0, int param1, int *param2, int *param3, int *param4, int *param5); +static u32 ov69_0225CC54(UnkStruct_ov69_0225CE64 *param0, int param1, int param2); +static void ov69_0225CE0C(VecFx32 *param0); +static BOOL ov69_0225CE64(UnkStruct_ov69_0225CE64 *param0); +static void ov69_0225CF30(UnkStruct_ov69_0225CE64 *param0); +static void ov69_0225CF50(UnkStruct_ov69_0225CE64 *param0); +static void ov69_0225CF90(void *param0); +static u32 ov69_0225CF9C(UnkStruct_ov69_0225CE64 *param0); +static void ov69_0225D030(UnkStruct_ov69_0225CE64 *param0, const UnkStruct_ov66_02230F50 *param1); +static BOOL ov69_0225D088(const UnkStruct_ov69_0225CE64 *param0, UnkStruct_ov69_0225E0C0 *param1); +static u32 ov69_0225D0D8(const UnkStruct_ov69_0225CE64 *param0); +static u32 ov69_0225D194(const VecFx32 *param0, const VecFx32 *param1); +static u32 ov69_0225D1E0(const UnkStruct_ov69_0225CE64 *param0, u32 param1, UnkStruct_ov66_02231428 param2); +static BOOL ov69_0225D268(UnkStruct_ov69_0225CE64 *param0, u8 param1, u8 param2); +static void ov69_0225D2A8(UnkStruct_ov69_0225CE64 *param0, const UnkStruct_ov66_02230F50 *param1); +static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2); +static void ov69_0225D35C(UnkStruct_ov69_0225D35C *param0); +static void ov69_0225D384(UnkStruct_ov69_0225D35C *param0); +static void ov69_0225D390(UnkStruct_ov69_0225D35C *param0); +static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2); +static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0); +static void ov69_0225D53C(UnkStruct_ov69_0225D35C *param0, u32 param1); +static void ov69_0225D5D8(UnkStruct_ov69_0225D35C *param0); +static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 param1); +static void ov69_0225D63C(UnkStruct_ov69_0225D35C *param0); static void ov69_0225D64C(void); -static void ov69_0225D6D8(UnkStruct_ov69_0225D71C * param0, UnkStruct_ov69_0225D35C * param1, u32 param2); -static void ov69_0225D71C(UnkStruct_ov69_0225D71C * param0); -static void ov69_0225D728(UnkStruct_ov69_0225D71C * param0); -static void ov69_0225D760(const UnkStruct_ov69_0225D71C * param0, VecFx32 * param1); -static void ov69_0225D770(const UnkStruct_ov69_0225D71C * param0, MtxFx33 * param1); -static void ov69_0225D780(const UnkStruct_ov69_0225D71C * param0, VecFx32 * param1); -static void ov69_0225D790(UnkStruct_ov69_0225D71C * param0, const VecFx32 * param1); -static void ov69_0225D7A0(UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov66_02231560 * param1, UnkStruct_ov69_0225D35C * param2, UnkStruct_ov69_0225DA74 param3, u32 param4); -static void ov69_0225D838(UnkStruct_ov69_0225CA7C * param0); -static void ov69_0225D854(UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov69_0225D71C * param1); -static u32 ov69_0225D91C(const UnkStruct_ov66_02231560 * param0, u16 param1, u16 param2); -static u32 ov69_0225D984(const UnkStruct_ov69_0225CA7C * param0, u16 param1, u16 param2, VecFx32 * param3); -static u32 ov69_0225D9C4(const UnkStruct_ov69_0225CA7C * param0, u16 param1, u16 param2); -static void ov69_0225D9F0(const UnkStruct_ov69_0225CA7C * param0, VecFx32 * param1, int param2); -static u32 ov69_0225DA1C(const UnkStruct_ov69_0225CA7C * param0, int param1); -static u32 ov69_0225DA38(const UnkStruct_ov69_0225CA7C * param0, int param1); -static u32 ov69_0225DA54(const UnkStruct_ov69_0225CA7C * param0, int param1); -static u32 ov69_0225DA70(const UnkStruct_ov69_0225CA7C * param0); -static void ov69_0225DA74(UnkStruct_ov69_0225DAEC * param0, UnkStruct_ov69_0225DA74 param1, u32 param2); -static void ov69_0225DAEC(UnkStruct_ov69_0225DAEC * param0); -static void ov69_0225DAF8(const UnkStruct_ov69_0225DAEC * param0); -static void ov69_0225DB00(UnkStruct_ov69_0225DAEC * param0); -static BOOL ov69_0225DB2C(UnkStruct_ov69_0225DAEC * param0, UnkStruct_ov69_0225CA7C * param1); -static u32 ov69_0225DBB0(const UnkStruct_ov69_0225DAEC * param0); -static void ov69_0225DBB4(UnkStruct_ov69_0225DC48 * param0, UnkStruct_ov69_0225D35C * param1, UnkStruct_ov69_0225EF54 * param2, u32 param3); -static void ov69_0225DC48(UnkStruct_ov69_0225DC48 * param0); -static void ov69_0225DC54(UnkStruct_ov69_0225DC48 * param0); -static int ov69_0225DD10(const UnkStruct_ov69_0225DC48 * param0, u32 param1); -static void ov69_0225DD2C(UnkStruct_ov69_0225DC48 * param0); -static void ov69_0225DD44(UnkStruct_ov69_0225DC48 * param0); -static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 * param0, UnkStruct_ov69_0225D35C * param1, UnkStruct_ov69_0225EF54 * param2, SaveData * param3, u32 param4); -static void ov69_0225DDC8(UnkStruct_ov69_0225DDC8 * param0); -static void ov69_0225DDFC(UnkStruct_ov69_0225DDC8 * param0); -static u32 ov69_0225DE40(UnkStruct_ov69_0225DDC8 * param0); -static void ov69_0225DEA0(UnkStruct_ov69_0225DDC8 * param0); -static void ov69_0225DEC0(UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1, UnkStruct_ov69_0225EF54 * param2, u32 param3); -static void ov69_0225DFBC(UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1); -static void ov69_0225E00C(UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225EF54 * param1, UnkStruct_ov69_0225D35C * param2); -static void ov69_0225E084(UnkStruct_ov69_0225E084 * param0); -static void ov69_0225E0A0(UnkStruct_ov69_0225E084 * param0); -static BOOL ov69_0225E0C0(UnkStruct_ov69_0225E084 * param0, const UnkStruct_ov69_0225E0C0 * param1); -static BOOL ov69_0225E0F8(const UnkStruct_ov69_0225E084 * param0, const UnkStruct_ov69_0225E0C0 * param1); -static void ov69_0225E13C(UnkStruct_ov69_0225E084 * param0); -static void ov69_0225E148(UnkStruct_ov69_0225E084 * param0); -static void ov69_0225E154(UnkStruct_ov69_0225E084 * param0, const UnkStruct_ov69_0225E0C0 * param1); -static void ov69_0225E1A0(UnkStruct_ov69_0225E084 * param0); -static BOOL ov69_0225E1C0(const UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225E0C0 * param1, u32 param2); -static void ov69_0225E1EC(UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1); -static void ov69_0225E208(UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225EF54 * param1, UnkStruct_ov69_0225D35C * param2); -static BOOL ov69_0225E2D0(UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1); -static void ov69_0225E2DC(UnkStruct_ov69_0225E084 * param0); -static BOOL ov69_0225E2E4(UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1); -static BOOL ov69_0225E2F0(UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1, int param2); -static void ov69_0225E368(UnkStruct_ov69_0225E084 * param0, u32 param1); -static BOOL ov69_0225E374(UnkStruct_ov69_0225E084 * param0, u32 param1, UnkStruct_ov69_0225D35C * param2); -static void ov69_0225E430(UnkStruct_ov69_0225E084 * param0, u32 param1, UnkStruct_ov69_0225D35C * param2); -static void ov69_0225E478(UnkStruct_ov69_0225E478 * param0); -static void ov69_0225E4E8(UnkStruct_ov69_0225E478 * param0); -static void ov69_0225E504(UnkStruct_ov69_0225E478 * param0, s16 param1, s16 param2); -static void ov69_0225E51C(UnkStruct_ov69_0225E478 * param0, s16 param1, s16 param2); -static void ov69_0225E534(SysTask * param0, void * param1); -static void ov69_0225E590(UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1, u32 param2); -static void ov69_0225E61C(UnkStruct_ov69_0225E084 * param0); -static void ov69_0225E644(UnkStruct_ov69_0225E084 * param0, u32 param1, const UnkStruct_ov69_0225E0C0 * param2, UnkStruct_ov69_0225EF54 * param3); -static u8 * ov69_0225E6E8(UnkStruct_ov69_0225E084 * param0, u32 param1, u32 param2); -static u8 * ov69_0225E70C(UnkStruct_ov69_0225E084 * param0, u32 param1); -static void ov69_0225E71C(UnkStruct_ov69_0225E084 * param0, u32 param1, u32 param2, const u8 * param3); -static void ov69_0225E748(UnkStruct_ov69_0225E7DC * param0, UnkStruct_ov69_0225D35C * param1, const UnkStruct_ov69_0225F118 * param2, u16 param3, u32 param4); -static void ov69_0225E7DC(UnkStruct_ov69_0225E7DC * param0); -static void ov69_0225E810(UnkStruct_ov69_0225E7DC * param0, UnkStruct_ov69_0225D35C * param1); -static void ov69_0225E8EC(UnkStruct_ov69_0225E7DC * param0, u32 param1, BOOL param2); -static void ov69_0225E904(UnkStruct_ov69_0225E7DC * param0); -static void ov69_0225E910(UnkStruct_ov69_0225E7DC * param0, u32 param1, UnkStruct_ov69_0225D35C * param2); -static void ov69_0225E960(UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225D35C * param1, UnkStruct_ov69_0225E478 * param2, u32 param3); -static void ov69_0225EAE8(UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225D35C * param1); -static void ov69_0225EB60(UnkStruct_ov69_0225EB60 * param0); -static void ov69_0225EB8C(UnkStruct_ov69_0225EB60 * param0, u8 param1, u8 param2, u8 param3); -static void ov69_0225EBEC(UnkStruct_ov69_0225EB60 * param0); -static void ov69_0225EC08(UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225E478 * param1); -static BOOL ov69_0225EC70(UnkStruct_ov69_0225EB60 * param0, u32 param1, UnkStruct_ov69_0225E478 * param2); -static BOOL ov69_0225ECAC(UnkStruct_ov69_0225EB60 * param0, u32 param1, UnkStruct_ov69_0225E478 * param2); -static void ov69_0225ECF0(UnkStruct_ov69_0225ED90 * param0, const UnkStruct_ov69_0225ECF0 * param1); -static void ov69_0225ED0C(UnkStruct_ov69_0225ED90 * param0, BOOL param1); -static void ov69_0225ED10(UnkStruct_ov69_0225ED90 * param0, BOOL param1); -static BOOL ov69_0225ED14(UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov69_0225E478 * param1); -static void ov69_0225ED5C(UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov69_0225E478 * param1); -static void ov69_0225ED78(const UnkStruct_ov69_0225ED90 * param0, VecFx32 * param1); -static void ov69_0225ED90(UnkStruct_ov69_0225ED90 * param0); -static void ov69_0225EE68(const UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov69_0225E478 * param1); -static void ov69_0225EEC4(UnkStruct_ov69_0225EB60 * param0, u32 param1); +static void ov69_0225D6D8(UnkStruct_ov69_0225D71C *param0, UnkStruct_ov69_0225D35C *param1, u32 param2); +static void ov69_0225D71C(UnkStruct_ov69_0225D71C *param0); +static void ov69_0225D728(UnkStruct_ov69_0225D71C *param0); +static void ov69_0225D760(const UnkStruct_ov69_0225D71C *param0, VecFx32 *param1); +static void ov69_0225D770(const UnkStruct_ov69_0225D71C *param0, MtxFx33 *param1); +static void ov69_0225D780(const UnkStruct_ov69_0225D71C *param0, VecFx32 *param1); +static void ov69_0225D790(UnkStruct_ov69_0225D71C *param0, const VecFx32 *param1); +static void ov69_0225D7A0(UnkStruct_ov69_0225CA7C *param0, const UnkStruct_ov66_02231560 *param1, UnkStruct_ov69_0225D35C *param2, UnkStruct_ov69_0225DA74 param3, u32 param4); +static void ov69_0225D838(UnkStruct_ov69_0225CA7C *param0); +static void ov69_0225D854(UnkStruct_ov69_0225CA7C *param0, const UnkStruct_ov69_0225D71C *param1); +static u32 ov69_0225D91C(const UnkStruct_ov66_02231560 *param0, u16 param1, u16 param2); +static u32 ov69_0225D984(const UnkStruct_ov69_0225CA7C *param0, u16 param1, u16 param2, VecFx32 *param3); +static u32 ov69_0225D9C4(const UnkStruct_ov69_0225CA7C *param0, u16 param1, u16 param2); +static void ov69_0225D9F0(const UnkStruct_ov69_0225CA7C *param0, VecFx32 *param1, int param2); +static u32 ov69_0225DA1C(const UnkStruct_ov69_0225CA7C *param0, int param1); +static u32 ov69_0225DA38(const UnkStruct_ov69_0225CA7C *param0, int param1); +static u32 ov69_0225DA54(const UnkStruct_ov69_0225CA7C *param0, int param1); +static u32 ov69_0225DA70(const UnkStruct_ov69_0225CA7C *param0); +static void ov69_0225DA74(UnkStruct_ov69_0225DAEC *param0, UnkStruct_ov69_0225DA74 param1, u32 param2); +static void ov69_0225DAEC(UnkStruct_ov69_0225DAEC *param0); +static void ov69_0225DAF8(const UnkStruct_ov69_0225DAEC *param0); +static void ov69_0225DB00(UnkStruct_ov69_0225DAEC *param0); +static BOOL ov69_0225DB2C(UnkStruct_ov69_0225DAEC *param0, UnkStruct_ov69_0225CA7C *param1); +static u32 ov69_0225DBB0(const UnkStruct_ov69_0225DAEC *param0); +static void ov69_0225DBB4(UnkStruct_ov69_0225DC48 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, u32 param3); +static void ov69_0225DC48(UnkStruct_ov69_0225DC48 *param0); +static void ov69_0225DC54(UnkStruct_ov69_0225DC48 *param0); +static int ov69_0225DD10(const UnkStruct_ov69_0225DC48 *param0, u32 param1); +static void ov69_0225DD2C(UnkStruct_ov69_0225DC48 *param0); +static void ov69_0225DD44(UnkStruct_ov69_0225DC48 *param0); +static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, SaveData *param3, u32 param4); +static void ov69_0225DDC8(UnkStruct_ov69_0225DDC8 *param0); +static void ov69_0225DDFC(UnkStruct_ov69_0225DDC8 *param0); +static u32 ov69_0225DE40(UnkStruct_ov69_0225DDC8 *param0); +static void ov69_0225DEA0(UnkStruct_ov69_0225DDC8 *param0); +static void ov69_0225DEC0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, u32 param3); +static void ov69_0225DFBC(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1); +static void ov69_0225E00C(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225EF54 *param1, UnkStruct_ov69_0225D35C *param2); +static void ov69_0225E084(UnkStruct_ov69_0225E084 *param0); +static void ov69_0225E0A0(UnkStruct_ov69_0225E084 *param0); +static BOOL ov69_0225E0C0(UnkStruct_ov69_0225E084 *param0, const UnkStruct_ov69_0225E0C0 *param1); +static BOOL ov69_0225E0F8(const UnkStruct_ov69_0225E084 *param0, const UnkStruct_ov69_0225E0C0 *param1); +static void ov69_0225E13C(UnkStruct_ov69_0225E084 *param0); +static void ov69_0225E148(UnkStruct_ov69_0225E084 *param0); +static void ov69_0225E154(UnkStruct_ov69_0225E084 *param0, const UnkStruct_ov69_0225E0C0 *param1); +static void ov69_0225E1A0(UnkStruct_ov69_0225E084 *param0); +static BOOL ov69_0225E1C0(const UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225E0C0 *param1, u32 param2); +static void ov69_0225E1EC(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1); +static void ov69_0225E208(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225EF54 *param1, UnkStruct_ov69_0225D35C *param2); +static BOOL ov69_0225E2D0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1); +static void ov69_0225E2DC(UnkStruct_ov69_0225E084 *param0); +static BOOL ov69_0225E2E4(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1); +static BOOL ov69_0225E2F0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, int param2); +static void ov69_0225E368(UnkStruct_ov69_0225E084 *param0, u32 param1); +static BOOL ov69_0225E374(UnkStruct_ov69_0225E084 *param0, u32 param1, UnkStruct_ov69_0225D35C *param2); +static void ov69_0225E430(UnkStruct_ov69_0225E084 *param0, u32 param1, UnkStruct_ov69_0225D35C *param2); +static void ov69_0225E478(UnkStruct_ov69_0225E478 *param0); +static void ov69_0225E4E8(UnkStruct_ov69_0225E478 *param0); +static void ov69_0225E504(UnkStruct_ov69_0225E478 *param0, s16 param1, s16 param2); +static void ov69_0225E51C(UnkStruct_ov69_0225E478 *param0, s16 param1, s16 param2); +static void ov69_0225E534(SysTask *param0, void *param1); +static void ov69_0225E590(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, u32 param2); +static void ov69_0225E61C(UnkStruct_ov69_0225E084 *param0); +static void ov69_0225E644(UnkStruct_ov69_0225E084 *param0, u32 param1, const UnkStruct_ov69_0225E0C0 *param2, UnkStruct_ov69_0225EF54 *param3); +static u8 *ov69_0225E6E8(UnkStruct_ov69_0225E084 *param0, u32 param1, u32 param2); +static u8 *ov69_0225E70C(UnkStruct_ov69_0225E084 *param0, u32 param1); +static void ov69_0225E71C(UnkStruct_ov69_0225E084 *param0, u32 param1, u32 param2, const u8 *param3); +static void ov69_0225E748(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D35C *param1, const UnkStruct_ov69_0225F118 *param2, u16 param3, u32 param4); +static void ov69_0225E7DC(UnkStruct_ov69_0225E7DC *param0); +static void ov69_0225E810(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D35C *param1); +static void ov69_0225E8EC(UnkStruct_ov69_0225E7DC *param0, u32 param1, BOOL param2); +static void ov69_0225E904(UnkStruct_ov69_0225E7DC *param0); +static void ov69_0225E910(UnkStruct_ov69_0225E7DC *param0, u32 param1, UnkStruct_ov69_0225D35C *param2); +static void ov69_0225E960(UnkStruct_ov69_0225EB60 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225E478 *param2, u32 param3); +static void ov69_0225EAE8(UnkStruct_ov69_0225EB60 *param0, UnkStruct_ov69_0225D35C *param1); +static void ov69_0225EB60(UnkStruct_ov69_0225EB60 *param0); +static void ov69_0225EB8C(UnkStruct_ov69_0225EB60 *param0, u8 param1, u8 param2, u8 param3); +static void ov69_0225EBEC(UnkStruct_ov69_0225EB60 *param0); +static void ov69_0225EC08(UnkStruct_ov69_0225EB60 *param0, UnkStruct_ov69_0225E478 *param1); +static BOOL ov69_0225EC70(UnkStruct_ov69_0225EB60 *param0, u32 param1, UnkStruct_ov69_0225E478 *param2); +static BOOL ov69_0225ECAC(UnkStruct_ov69_0225EB60 *param0, u32 param1, UnkStruct_ov69_0225E478 *param2); +static void ov69_0225ECF0(UnkStruct_ov69_0225ED90 *param0, const UnkStruct_ov69_0225ECF0 *param1); +static void ov69_0225ED0C(UnkStruct_ov69_0225ED90 *param0, BOOL param1); +static void ov69_0225ED10(UnkStruct_ov69_0225ED90 *param0, BOOL param1); +static BOOL ov69_0225ED14(UnkStruct_ov69_0225ED90 *param0, UnkStruct_ov69_0225E478 *param1); +static void ov69_0225ED5C(UnkStruct_ov69_0225ED90 *param0, UnkStruct_ov69_0225E478 *param1); +static void ov69_0225ED78(const UnkStruct_ov69_0225ED90 *param0, VecFx32 *param1); +static void ov69_0225ED90(UnkStruct_ov69_0225ED90 *param0); +static void ov69_0225EE68(const UnkStruct_ov69_0225ED90 *param0, UnkStruct_ov69_0225E478 *param1); +static void ov69_0225EEC4(UnkStruct_ov69_0225EB60 *param0, u32 param1); static u16 ov69_0225EEEC(u32 param0); static u16 ov69_0225EF04(u32 param0); -static void ov69_0225EF1C(UnkStruct_ov69_0225EF54 * param0, u32 param1); -static void ov69_0225EF54(UnkStruct_ov69_0225EF54 * param0); -static Strbuf* ov69_0225EF74(UnkStruct_ov69_0225EF54 * param0, u32 param1); -static Strbuf* ov69_0225EF90(UnkStruct_ov69_0225EF54 * param0, u32 param1); -static Strbuf* ov69_0225EFB8(UnkStruct_ov69_0225EF54 * param0, u32 param1, u32 param2); -static void ov69_0225EF84(UnkStruct_ov69_0225EF54 * param0, u32 param1, Strbuf *param2); -static u32 ov69_0225EFEC(const UnkStruct_ov66_02231560 * param0); +static void ov69_0225EF1C(UnkStruct_ov69_0225EF54 *param0, u32 param1); +static void ov69_0225EF54(UnkStruct_ov69_0225EF54 *param0); +static Strbuf *ov69_0225EF74(UnkStruct_ov69_0225EF54 *param0, u32 param1); +static Strbuf *ov69_0225EF90(UnkStruct_ov69_0225EF54 *param0, u32 param1); +static Strbuf *ov69_0225EFB8(UnkStruct_ov69_0225EF54 *param0, u32 param1, u32 param2); +static void ov69_0225EF84(UnkStruct_ov69_0225EF54 *param0, u32 param1, Strbuf *param2); +static u32 ov69_0225EFEC(const UnkStruct_ov66_02231560 *param0); static const u32 Unk_ov69_0225F028[3] = { 0x0, @@ -456,7 +454,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov69_0225F154[5] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -471,7 +469,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov69_0225F154[5] = { 0x2, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -486,7 +484,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov69_0225F154[5] = { 0x3, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -501,7 +499,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov69_0225F154[5] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -516,8 +514,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov69_0225F154[5] = { 0x1, 0x0, 0x0, - 0x0 - } + 0x0, + }, }; static const UnkStruct_ov22_022559F8 Unk_ov69_0225F050 = { @@ -540,30 +538,30 @@ static const VecFx32 Unk_ov69_0225F01C = { }; static const UnkStruct_ov69_0225F0E8 Unk_ov69_0225F0E8[24] = { - {0x0, 0x0}, - {0x0, 0x0}, - {0x0, 0x1}, - {0x0, 0x1}, - {0x0, 0x2}, - {0x0, 0x2}, - {0x1, 0x3}, - {0x1, 0x3}, - {0x1, 0x4}, - {0x1, 0x4}, - {0x1, 0x5}, - {0x1, 0x5}, - {0x2, 0x6}, - {0x2, 0x6}, - {0x2, 0x7}, - {0x2, 0x7}, - {0x3, 0x8}, - {0x3, 0x8}, - {0x3, 0x9}, - {0x3, 0x9}, - {0x4, 0xA}, - {0x4, 0xA}, - {0x4, 0xB}, - {0x4, 0xB} + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0x0, 0x1 }, + { 0x0, 0x1 }, + { 0x0, 0x2 }, + { 0x0, 0x2 }, + { 0x1, 0x3 }, + { 0x1, 0x3 }, + { 0x1, 0x4 }, + { 0x1, 0x4 }, + { 0x1, 0x5 }, + { 0x1, 0x5 }, + { 0x2, 0x6 }, + { 0x2, 0x6 }, + { 0x2, 0x7 }, + { 0x2, 0x7 }, + { 0x3, 0x8 }, + { 0x3, 0x8 }, + { 0x3, 0x9 }, + { 0x3, 0x9 }, + { 0x4, 0xA }, + { 0x4, 0xA }, + { 0x4, 0xB }, + { 0x4, 0xB } }; static const u8 Unk_ov69_0225F014[5] = { @@ -584,65 +582,65 @@ static const u32 Unk_ov69_0225F088[5] = { static const UnkStruct_ov69_0225ECF0 Unk_ov69_0225F1E0[12][3] = { { - {0xA0, 0x30, 0xBE, 0x0, 0x13F, 0x8, 0x50}, - {0xCE, 0x60, 0xA0, 0x30, 0x13F, 0x8, 0x50}, - {0x96, 0x90, 0xCE, 0x60, 0x13F, 0x8, 0x50} + { 0xA0, 0x30, 0xBE, 0x0, 0x13F, 0x8, 0x50 }, + { 0xCE, 0x60, 0xA0, 0x30, 0x13F, 0x8, 0x50 }, + { 0x96, 0x90, 0xCE, 0x60, 0x13F, 0x8, 0x50 }, }, { - {0xBE, 0x30, 0x8C, 0x0, 0xDC, 0xC, 0x36}, - {0x96, 0x60, 0xBE, 0x30, 0xDC, 0xC, 0x36}, - {0xC8, 0x90, 0x96, 0x60, 0xDC, 0xC, 0x36} + { 0xBE, 0x30, 0x8C, 0x0, 0xDC, 0xC, 0x36 }, + { 0x96, 0x60, 0xBE, 0x30, 0xDC, 0xC, 0x36 }, + { 0xC8, 0x90, 0x96, 0x60, 0xDC, 0xC, 0x36 }, }, { - {0x80, 0x30, 0xA0, 0x0, 0xDC, 0xC, 0x36}, - {0xD2, 0x60, 0x80, 0x30, 0xDC, 0xC, 0x36}, - {0xA0, 0x90, 0xD2, 0x60, 0xDC, 0xC, 0x36} + { 0x80, 0x30, 0xA0, 0x0, 0xDC, 0xC, 0x36 }, + { 0xD2, 0x60, 0x80, 0x30, 0xDC, 0xC, 0x36 }, + { 0xA0, 0x90, 0xD2, 0x60, 0xDC, 0xC, 0x36 }, }, { - {0xB4, 0x30, 0x8A, 0x0, 0xDC, 0xC, 0x36}, - {0x8A, 0x60, 0xB4, 0x30, 0xDC, 0xC, 0x36}, - {0xB4, 0x90, 0x8A, 0x60, 0xDC, 0xC, 0x36} + { 0xB4, 0x30, 0x8A, 0x0, 0xDC, 0xC, 0x36 }, + { 0x8A, 0x60, 0xB4, 0x30, 0xDC, 0xC, 0x36 }, + { 0xB4, 0x90, 0x8A, 0x60, 0xDC, 0xC, 0x36 }, }, { - {0xB4, 0x30, 0xA0, 0x0, 0x18F, 0x4, 0x64}, - {0x82, 0x60, 0xB4, 0x30, 0x18F, 0x4, 0x64}, - {0x80, 0x90, 0x82, 0x60, 0x18F, 0x4, 0x64} + { 0xB4, 0x30, 0xA0, 0x0, 0x18F, 0x4, 0x64 }, + { 0x82, 0x60, 0xB4, 0x30, 0x18F, 0x4, 0x64 }, + { 0x80, 0x90, 0x82, 0x60, 0x18F, 0x4, 0x64 }, }, { - {0xB4, 0x30, 0x74, 0x0, 0x13F, 0x8, 0x50}, - {0x74, 0x60, 0xB4, 0x30, 0x13F, 0x8, 0x50}, - {0xB4, 0x90, 0x74, 0x60, 0x13F, 0x8, 0x50} + { 0xB4, 0x30, 0x74, 0x0, 0x13F, 0x8, 0x50 }, + { 0x74, 0x60, 0xB4, 0x30, 0x13F, 0x8, 0x50 }, + { 0xB4, 0x90, 0x74, 0x60, 0x13F, 0x8, 0x50 }, }, { - {0xB4, 0x30, 0xF0, 0x0, 0xDC, 0xC, 0x36}, - {0xA0, 0x60, 0xB4, 0x30, 0xDC, 0xC, 0x36}, - {0x60, 0x90, 0xA0, 0x60, 0xDC, 0xC, 0x36} + { 0xB4, 0x30, 0xF0, 0x0, 0xDC, 0xC, 0x36 }, + { 0xA0, 0x60, 0xB4, 0x30, 0xDC, 0xC, 0x36 }, + { 0x60, 0x90, 0xA0, 0x60, 0xDC, 0xC, 0x36 }, }, { - {0x90, 0x30, 0xDA, 0x0, 0xDC, 0xC, 0x36}, - {0xDA, 0x60, 0x90, 0x30, 0xDC, 0xC, 0x36}, - {0x90, 0x90, 0xDA, 0x60, 0xDC, 0xC, 0x36} + { 0x90, 0x30, 0xDA, 0x0, 0xDC, 0xC, 0x36 }, + { 0xDA, 0x60, 0x90, 0x30, 0xDC, 0xC, 0x36 }, + { 0x90, 0x90, 0xDA, 0x60, 0xDC, 0xC, 0x36 }, }, { - {0xA0, 0x30, 0xC0, 0x0, 0x18F, 0x4, 0x64}, - {0xC0, 0x60, 0xA0, 0x30, 0x18F, 0x4, 0x64}, - {0xA0, 0x90, 0xC0, 0x60, 0x18F, 0x4, 0x64} + { 0xA0, 0x30, 0xC0, 0x0, 0x18F, 0x4, 0x64 }, + { 0xC0, 0x60, 0xA0, 0x30, 0x18F, 0x4, 0x64 }, + { 0xA0, 0x90, 0xC0, 0x60, 0x18F, 0x4, 0x64 }, }, { - {0x8C, 0x30, 0x60, 0x0, 0x13F, 0x8, 0x50}, - {0xBE, 0x60, 0x8C, 0x30, 0x13F, 0x8, 0x50}, - {0xF0, 0x90, 0xBE, 0x60, 0x13F, 0x8, 0x50} + { 0x8C, 0x30, 0x60, 0x0, 0x13F, 0x8, 0x50 }, + { 0xBE, 0x60, 0x8C, 0x30, 0x13F, 0x8, 0x50 }, + { 0xF0, 0x90, 0xBE, 0x60, 0x13F, 0x8, 0x50 }, }, { - {0xD4, 0x30, 0xA0, 0x0, 0x18F, 0x4, 0x64}, - {0xD4, 0x60, 0xD4, 0x30, 0x18F, 0x4, 0x64}, - {0xA0, 0x90, 0xD4, 0x60, 0x18F, 0x4, 0x64} + { 0xD4, 0x30, 0xA0, 0x0, 0x18F, 0x4, 0x64 }, + { 0xD4, 0x60, 0xD4, 0x30, 0x18F, 0x4, 0x64 }, + { 0xA0, 0x90, 0xD4, 0x60, 0x18F, 0x4, 0x64 }, }, { - {0x7B, 0x30, 0xAA, 0x0, 0x13F, 0x8, 0x50}, - {0xC6, 0x60, 0x7B, 0x30, 0x13F, 0x8, 0x50}, - {0x85, 0x90, 0xC6, 0x60, 0x13F, 0x8, 0x50} - } + { 0x7B, 0x30, 0xAA, 0x0, 0x13F, 0x8, 0x50 }, + { 0xC6, 0x60, 0x7B, 0x30, 0x13F, 0x8, 0x50 }, + { 0x85, 0x90, 0xC6, 0x60, 0x13F, 0x8, 0x50 }, + }, }; static const UnkStruct_02015958 Unk_ov69_0225F074 = { @@ -656,46 +654,46 @@ static const UnkStruct_02015958 Unk_ov69_0225F074 = { static const UnkStruct_ov69_0225F118 Unk_ov69_0225F118[5] = { { - {0x6}, + { 0x6 }, 0x1, 0xD, 0x4, - 0x0 + 0x0, }, { - {0x10, 0x11}, + { 0x10, 0x11 }, 0x2, 0x0, 0x0, - 0x1 + 0x1, }, { - {0x8}, + { 0x8 }, 0x1, 0xE, 0x4, - 0x2 + 0x2, }, { - {0x9}, + { 0x9 }, 0x1, 0xF, 0x10, - 0x3 + 0x3, }, { - {0xA}, + { 0xA }, 0x1, 0xF, 0x10, - 0x3 - } + 0x3, + }, }; -int ov69_0225C700 (OverlayManager * param0, int * param1) +int ov69_0225C700(OverlayManager *param0, int *param1) { - UnkStruct_ov69_0225CE64 * v0; - UnkStruct_ov66_02230F50 * v1; + UnkStruct_ov69_0225CE64 *v0; + UnkStruct_ov66_02230F50 *v1; v1 = OverlayManager_Args(param0); Heap_Create(3, 105, 0x50000); @@ -726,10 +724,10 @@ int ov69_0225C700 (OverlayManager * param0, int * param1) return 1; } -int ov69_0225C820 (OverlayManager * param0, int * param1) +int ov69_0225C820(OverlayManager *param0, int *param1) { - UnkStruct_ov69_0225CE64 * v0; - UnkStruct_ov66_02230F50 * v1; + UnkStruct_ov69_0225CE64 *v0; + UnkStruct_ov66_02230F50 *v1; BOOL v2; v0 = OverlayManager_Data(param0); @@ -783,10 +781,10 @@ int ov69_0225C820 (OverlayManager * param0, int * param1) return 0; } -int ov69_0225C8FC (OverlayManager * param0, int * param1) +int ov69_0225C8FC(OverlayManager *param0, int *param1) { - UnkStruct_ov69_0225CE64 * v0; - UnkStruct_ov66_02230F50 * v1; + UnkStruct_ov69_0225CE64 *v0; + UnkStruct_ov66_02230F50 *v1; v0 = OverlayManager_Data(param0); v1 = OverlayManager_Args(param0); @@ -809,15 +807,15 @@ int ov69_0225C8FC (OverlayManager * param0, int * param1) return 1; } -static void ov69_0225C980 (UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov66_02231560 * param1, u32 param2) +static void ov69_0225C980(UnkStruct_ov69_0225CA7C *param0, const UnkStruct_ov66_02231560 *param1, u32 param2) { - NARC * v0 = NARC_ctor(NARC_INDEX_APPLICATION__WIFI_EARTH__WIFI_EARTH_PLACE, param2); + NARC *v0 = NARC_ctor(NARC_INDEX_APPLICATION__WIFI_EARTH__WIFI_EARTH_PLACE, param2); param0->unk_00.unk_00 = 0; { - void * v1; - UnkStruct_ov92_021D1530 * v2; + void *v1; + UnkStruct_ov92_021D1530 *v2; u32 v3; int v4, v5; @@ -839,8 +837,8 @@ static void ov69_0225C980 (UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov6 Heap_FreeToHeap(v1); } { - void * v6; - UnkStruct_ov69_0225C980 * v7; + void *v6; + UnkStruct_ov69_0225C980 *v7; u32 v8, v9; int v10, v11, v12, v13; @@ -869,9 +867,9 @@ static void ov69_0225C980 (UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov6 NARC_dtor(v0); } -static void ov69_0225CA7C (UnkStruct_ov69_0225CA7C * param0, u32 param1, s16 param2, s16 param3, u16 param4, u16 param5, const UnkStruct_ov66_02231560 * param6) +static void ov69_0225CA7C(UnkStruct_ov69_0225CA7C *param0, u32 param1, s16 param2, s16 param3, u16 param4, u16 param5, const UnkStruct_ov66_02231560 *param6) { - MtxFx33 v0 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + MtxFx33 v0 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; VecFx32 v1; param0->unk_00.unk_04[param1].unk_00 = param2; @@ -893,7 +891,7 @@ static void ov69_0225CA7C (UnkStruct_ov69_0225CA7C * param0, u32 param1, s16 par param0->unk_00.unk_04[param1].unk_2C = param5; } -static void ov69_0225CAF4 (MtxFx33 * param0, const VecFx32 * param1) +static void ov69_0225CAF4(MtxFx33 *param0, const VecFx32 *param1) { MtxFx33 v0; @@ -904,18 +902,18 @@ static void ov69_0225CAF4 (MtxFx33 * param0, const VecFx32 * param1) MTX_Concat33(param0, &v0, param0); } -static void ov69_0225CB6C (MtxFx33 * param0, const VecFx32 * param1) +static void ov69_0225CB6C(MtxFx33 *param0, const VecFx32 *param1) { MtxFx33 v0; MTX_RotY33(param0, FX_SinIdx((u16)param1->x), FX_CosIdx((u16)param1->x)); - MTX_RotX33(&v0, FX_SinIdx((u16) - param1->y), FX_CosIdx((u16) - param1->y)); + MTX_RotX33(&v0, FX_SinIdx((u16)-param1->y), FX_CosIdx((u16)-param1->y)); MTX_Concat33(param0, &v0, param0); MTX_RotZ33(&v0, FX_CosIdx((u16)param1->z), FX_SinIdx((u16)param1->z)); MTX_Concat33(param0, &v0, param0); } -static void ov69_0225CBE4 (int param0, int param1, int * param2, int * param3, int * param4, int * param5) +static void ov69_0225CBE4(int param0, int param1, int *param2, int *param3, int *param4, int *param5) { int v0 = 0; int v1 = 0; @@ -959,7 +957,7 @@ static void ov69_0225CBE4 (int param0, int param1, int * param2, int * param3, i *param5 = v3; } -static u32 ov69_0225CC54 (UnkStruct_ov69_0225CE64 * param0, int param1, int param2) +static u32 ov69_0225CC54(UnkStruct_ov69_0225CE64 *param0, int param1, int param2) { u16 v0; u16 v1; @@ -1059,7 +1057,7 @@ static u32 ov69_0225CC54 (UnkStruct_ov69_0225CE64 * param0, int param1, int para return v4; } -static void ov69_0225CE0C (VecFx32 * param0) +static void ov69_0225CE0C(VecFx32 *param0) { if (param0->x >= 0) { param0->x = param0->x % 0xffff; @@ -1074,7 +1072,7 @@ static void ov69_0225CE0C (VecFx32 * param0) } } -static BOOL ov69_0225CE64 (UnkStruct_ov69_0225CE64 * param0) +static BOOL ov69_0225CE64(UnkStruct_ov69_0225CE64 *param0) { u32 v0; @@ -1107,8 +1105,7 @@ static BOOL ov69_0225CE64 (UnkStruct_ov69_0225CE64 * param0) ov69_0225DD2C(¶m0->unk_BC44); param0->unk_00++; break; - case 3: - { + case 3: { u32 v1; v1 = ov69_0225DE40(¶m0->unk_BF64); @@ -1126,8 +1123,7 @@ static BOOL ov69_0225CE64 (UnkStruct_ov69_0225CE64 * param0) case 1: return 1; } - } - break; + } break; default: GF_ASSERT(0); break; @@ -1136,7 +1132,7 @@ static BOOL ov69_0225CE64 (UnkStruct_ov69_0225CE64 * param0) return 0; } -static void ov69_0225CF30 (UnkStruct_ov69_0225CE64 * param0) +static void ov69_0225CF30(UnkStruct_ov69_0225CE64 *param0) { switch (param0->unk_02) { case 0: @@ -1145,7 +1141,7 @@ static void ov69_0225CF30 (UnkStruct_ov69_0225CE64 * param0) } } -static void ov69_0225CF50 (UnkStruct_ov69_0225CE64 * param0) +static void ov69_0225CF50(UnkStruct_ov69_0225CE64 *param0) { sub_020241B4(); @@ -1157,24 +1153,24 @@ static void ov69_0225CF50 (UnkStruct_ov69_0225CE64 * param0) G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_W); } -static void ov69_0225CF90 (void * param0) +static void ov69_0225CF90(void *param0) { - UnkStruct_ov69_0225CE64 * v0 = param0; + UnkStruct_ov69_0225CE64 *v0 = param0; ov69_0225D390(&v0->unk_20); } -static u32 ov69_0225CF9C (UnkStruct_ov69_0225CE64 * param0) +static u32 ov69_0225CF9C(UnkStruct_ov69_0225CE64 *param0) { u32 v0; BOOL v1; ov69_0225DC54(¶m0->unk_BC44); - if ((param0->unk_BC44.unk_00 & PAD_BUTTON_B)) { + if (param0->unk_BC44.unk_00 & PAD_BUTTON_B) { Sound_PlayEffect(1501); return 2; } else { - if ((gCoreSys.pressedKeys & PAD_BUTTON_X)) { + if (gCoreSys.pressedKeys & PAD_BUTTON_X) { { UnkStruct_ov69_0225E0C0 v2; @@ -1203,7 +1199,7 @@ static u32 ov69_0225CF9C (UnkStruct_ov69_0225CE64 * param0) return v0; } -static void ov69_0225D030 (UnkStruct_ov69_0225CE64 * param0, const UnkStruct_ov66_02230F50 * param1) +static void ov69_0225D030(UnkStruct_ov69_0225CE64 *param0, const UnkStruct_ov66_02230F50 *param1) { int v0; int v1; @@ -1227,7 +1223,7 @@ static void ov69_0225D030 (UnkStruct_ov69_0225CE64 * param0, const UnkStruct_ov6 } } -static BOOL ov69_0225D088 (const UnkStruct_ov69_0225CE64 * param0, UnkStruct_ov69_0225E0C0 * param1) +static BOOL ov69_0225D088(const UnkStruct_ov69_0225CE64 *param0, UnkStruct_ov69_0225E0C0 *param1) { u32 v0; @@ -1244,7 +1240,7 @@ static BOOL ov69_0225D088 (const UnkStruct_ov69_0225CE64 * param0, UnkStruct_ov6 return 1; } -static u32 ov69_0225D0D8 (const UnkStruct_ov69_0225CE64 * param0) +static u32 ov69_0225D0D8(const UnkStruct_ov69_0225CE64 *param0) { int v0; s16 v1; @@ -1292,7 +1288,7 @@ static u32 ov69_0225D0D8 (const UnkStruct_ov69_0225CE64 * param0) return v11; } -static u32 ov69_0225D194 (const VecFx32 * param0, const VecFx32 * param1) +static u32 ov69_0225D194(const VecFx32 *param0, const VecFx32 *param1) { s32 v0, v1; u32 v2; @@ -1313,7 +1309,7 @@ static u32 ov69_0225D194 (const VecFx32 * param0, const VecFx32 * param1) return v2; } -static u32 ov69_0225D1E0 (const UnkStruct_ov69_0225CE64 * param0, u32 param1, UnkStruct_ov66_02231428 param2) +static u32 ov69_0225D1E0(const UnkStruct_ov69_0225CE64 *param0, u32 param1, UnkStruct_ov66_02231428 param2) { s32 v0; u16 v1; @@ -1343,7 +1339,7 @@ static u32 ov69_0225D1E0 (const UnkStruct_ov69_0225CE64 * param0, u32 param1, Un return v0; } -static BOOL ov69_0225D268 (UnkStruct_ov69_0225CE64 * param0, u8 param1, u8 param2) +static BOOL ov69_0225D268(UnkStruct_ov69_0225CE64 *param0, u8 param1, u8 param2) { VecFx32 v0; VecFx32 v1; @@ -1361,7 +1357,7 @@ static BOOL ov69_0225D268 (UnkStruct_ov69_0225CE64 * param0, u8 param1, u8 param return 0; } -static void ov69_0225D2A8 (UnkStruct_ov69_0225CE64 * param0, const UnkStruct_ov66_02230F50 * param1) +static void ov69_0225D2A8(UnkStruct_ov69_0225CE64 *param0, const UnkStruct_ov66_02230F50 *param1) { int v0; @@ -1387,7 +1383,7 @@ static void ov69_0225D2A8 (UnkStruct_ov69_0225CE64 * param0, const UnkStruct_ov6 } } -static void ov69_0225D318 (UnkStruct_ov69_0225D35C * param0, Options * param1, u32 param2) +static void ov69_0225D318(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2) { param0->unk_1A8 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTIMER, param2); @@ -1399,7 +1395,7 @@ static void ov69_0225D318 (UnkStruct_ov69_0225D35C * param0, Options * param1, u ov69_0225D604(param0, param2); } -static void ov69_0225D35C (UnkStruct_ov69_0225D35C * param0) +static void ov69_0225D35C(UnkStruct_ov69_0225D35C *param0) { NARC_dtor(param0->unk_1A8); sub_0201DC3C(); @@ -1409,19 +1405,19 @@ static void ov69_0225D35C (UnkStruct_ov69_0225D35C * param0) ov69_0225D63C(param0); } -static void ov69_0225D384 (UnkStruct_ov69_0225D35C * param0) +static void ov69_0225D384(UnkStruct_ov69_0225D35C *param0) { sub_020219F8(param0->unk_04); } -static void ov69_0225D390 (UnkStruct_ov69_0225D35C * param0) +static void ov69_0225D390(UnkStruct_ov69_0225D35C *param0) { sub_0201C2B8(param0->unk_00); sub_0200A858(); sub_0201DCAC(); } -static void ov69_0225D3A4 (UnkStruct_ov69_0225D35C * param0, Options * param1, u32 param2) +static void ov69_0225D3A4(UnkStruct_ov69_0225D35C *param0, Options *param1, u32 param2) { sub_02018368(&Unk_ov69_0225F040); @@ -1454,8 +1450,8 @@ static void ov69_0225D3A4 (UnkStruct_ov69_0225D35C * param0, Options * param1, u sub_02002E98(0, 1 * 0x20, param2); sub_02002E98(4, 11 * 0x20, param2); - sub_0200DAA4(param0->unk_00, 1, ((1 + (18 + 12))), 0, 0, param2); - sub_0200DAA4(param0->unk_00, 1, ((1 + (18 + 12))), 0, 0, param2); + sub_0200DAA4(param0->unk_00, 1, (1 + (18 + 12)), 0, 0, param2); + sub_0200DAA4(param0->unk_00, 1, (1 + (18 + 12)), 0, 0, param2); { u8 v1 = Options_Frame(param1); @@ -1467,7 +1463,7 @@ static void ov69_0225D3A4 (UnkStruct_ov69_0225D35C * param0, Options * param1, u sub_0201975C(0, 0x72ca); } -static void ov69_0225D504 (UnkStruct_ov69_0225D35C * param0) +static void ov69_0225D504(UnkStruct_ov69_0225D35C *param0) { { int v0; @@ -1482,7 +1478,7 @@ static void ov69_0225D504 (UnkStruct_ov69_0225D35C * param0) GXLayers_SwapDisplay(); } -static void ov69_0225D53C (UnkStruct_ov69_0225D35C * param0, u32 param1) +static void ov69_0225D53C(UnkStruct_ov69_0225D35C *param0, u32 param1) { int v0; @@ -1509,7 +1505,7 @@ static void ov69_0225D53C (UnkStruct_ov69_0225D35C * param0, u32 param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov69_0225D5D8 (UnkStruct_ov69_0225D35C * param0) +static void ov69_0225D5D8(UnkStruct_ov69_0225D35C *param0) { int v0; @@ -1524,18 +1520,18 @@ static void ov69_0225D5D8 (UnkStruct_ov69_0225D35C * param0) sub_0200A878(); } -static void ov69_0225D604 (UnkStruct_ov69_0225D35C * param0, u32 param1) +static void ov69_0225D604(UnkStruct_ov69_0225D35C *param0, u32 param1) { param0->unk_1A4 = sub_02024220(param1, 0, 2, 0, 4, ov69_0225D64C); NNS_G3dGlbLightVector(0, 0, 0, (-(FX32_ONE - 1))); } -static void ov69_0225D63C (UnkStruct_ov69_0225D35C * param0) +static void ov69_0225D63C(UnkStruct_ov69_0225D35C *param0) { sub_020242C4(param0->unk_1A4); } -static void ov69_0225D64C (void) +static void ov69_0225D64C(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -1550,7 +1546,7 @@ static void ov69_0225D64C (void) G3_ViewPort(0, 0, 255, 191); } -static void ov69_0225D6D8 (UnkStruct_ov69_0225D71C * param0, UnkStruct_ov69_0225D35C * param1, u32 param2) +static void ov69_0225D6D8(UnkStruct_ov69_0225D71C *param0, UnkStruct_ov69_0225D35C *param1, u32 param2) { { VEC_Set(¶m0->unk_00, 0, 0, 0); @@ -1564,14 +1560,14 @@ static void ov69_0225D6D8 (UnkStruct_ov69_0225D71C * param0, UnkStruct_ov69_0225 } } -static void ov69_0225D71C (UnkStruct_ov69_0225D71C * param0) +static void ov69_0225D71C(UnkStruct_ov69_0225D71C *param0) { { sub_02017110(¶m0->unk_9C); } } -static void ov69_0225D728 (UnkStruct_ov69_0225D71C * param0) +static void ov69_0225D728(UnkStruct_ov69_0225D71C *param0) { MtxFx33 v0; @@ -1583,27 +1579,27 @@ static void ov69_0225D728 (UnkStruct_ov69_0225D71C * param0) sub_02017330(¶m0->unk_24, &v0); } -static void ov69_0225D760 (const UnkStruct_ov69_0225D71C * param0, VecFx32 * param1) +static void ov69_0225D760(const UnkStruct_ov69_0225D71C *param0, VecFx32 *param1) { *param1 = param0->unk_00; } -static void ov69_0225D770 (const UnkStruct_ov69_0225D71C * param0, MtxFx33 * param1) +static void ov69_0225D770(const UnkStruct_ov69_0225D71C *param0, MtxFx33 *param1) { ov69_0225CAF4(param1, ¶m0->unk_18); } -static void ov69_0225D780 (const UnkStruct_ov69_0225D71C * param0, VecFx32 * param1) +static void ov69_0225D780(const UnkStruct_ov69_0225D71C *param0, VecFx32 *param1) { *param1 = param0->unk_18; } -static void ov69_0225D790 (UnkStruct_ov69_0225D71C * param0, const VecFx32 * param1) +static void ov69_0225D790(UnkStruct_ov69_0225D71C *param0, const VecFx32 *param1) { param0->unk_18 = *param1; } -static void ov69_0225D7A0 (UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov66_02231560 * param1, UnkStruct_ov69_0225D35C * param2, UnkStruct_ov69_0225DA74 param3, u32 param4) +static void ov69_0225D7A0(UnkStruct_ov69_0225CA7C *param0, const UnkStruct_ov66_02231560 *param1, UnkStruct_ov69_0225D35C *param2, UnkStruct_ov69_0225DA74 param3, u32 param4) { int v0; @@ -1621,7 +1617,7 @@ static void ov69_0225D7A0 (UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov6 } } -static void ov69_0225D838 (UnkStruct_ov69_0225CA7C * param0) +static void ov69_0225D838(UnkStruct_ov69_0225CA7C *param0) { int v0; @@ -1630,7 +1626,7 @@ static void ov69_0225D838 (UnkStruct_ov69_0225CA7C * param0) } } -static void ov69_0225D854 (UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov69_0225D71C * param1) +static void ov69_0225D854(UnkStruct_ov69_0225CA7C *param0, const UnkStruct_ov69_0225D71C *param1) { MtxFx33 v0; int v1; @@ -1666,7 +1662,7 @@ static void ov69_0225D854 (UnkStruct_ov69_0225CA7C * param0, const UnkStruct_ov6 } } -static u32 ov69_0225D91C (const UnkStruct_ov66_02231560 * param0, u16 param1, u16 param2) +static u32 ov69_0225D91C(const UnkStruct_ov66_02231560 *param0, u16 param1, u16 param2) { int v0; BOOL v1; @@ -1694,7 +1690,7 @@ static u32 ov69_0225D91C (const UnkStruct_ov66_02231560 * param0, u16 param1, u1 return 3; } -static u32 ov69_0225D984 (const UnkStruct_ov69_0225CA7C * param0, u16 param1, u16 param2, VecFx32 * param3) +static u32 ov69_0225D984(const UnkStruct_ov69_0225CA7C *param0, u16 param1, u16 param2, VecFx32 *param3) { u32 v0 = 3; int v1; @@ -1712,7 +1708,7 @@ static u32 ov69_0225D984 (const UnkStruct_ov69_0225CA7C * param0, u16 param1, u1 return v0; } -static u32 ov69_0225D9C4 (const UnkStruct_ov69_0225CA7C * param0, u16 param1, u16 param2) +static u32 ov69_0225D9C4(const UnkStruct_ov69_0225CA7C *param0, u16 param1, u16 param2) { int v0; @@ -1725,7 +1721,7 @@ static u32 ov69_0225D9C4 (const UnkStruct_ov69_0225CA7C * param0, u16 param1, u1 return param0->unk_00.unk_00; } -static void ov69_0225D9F0 (const UnkStruct_ov69_0225CA7C * param0, VecFx32 * param1, int param2) +static void ov69_0225D9F0(const UnkStruct_ov69_0225CA7C *param0, VecFx32 *param1, int param2) { GF_ASSERT(param2 < param0->unk_00.unk_00); @@ -1734,30 +1730,30 @@ static void ov69_0225D9F0 (const UnkStruct_ov69_0225CA7C * param0, VecFx32 * par param1->z = 0; } -static u32 ov69_0225DA1C (const UnkStruct_ov69_0225CA7C * param0, int param1) +static u32 ov69_0225DA1C(const UnkStruct_ov69_0225CA7C *param0, int param1) { GF_ASSERT(param1 < param0->unk_00.unk_00); return param0->unk_00.unk_04[param1].unk_28; } -static u32 ov69_0225DA38 (const UnkStruct_ov69_0225CA7C * param0, int param1) +static u32 ov69_0225DA38(const UnkStruct_ov69_0225CA7C *param0, int param1) { GF_ASSERT(param1 < param0->unk_00.unk_00); return param0->unk_00.unk_04[param1].unk_2A; } -static u32 ov69_0225DA54 (const UnkStruct_ov69_0225CA7C * param0, int param1) +static u32 ov69_0225DA54(const UnkStruct_ov69_0225CA7C *param0, int param1) { GF_ASSERT(param1 < param0->unk_00.unk_00); return param0->unk_00.unk_04[param1].unk_2C; } -static u32 ov69_0225DA70 (const UnkStruct_ov69_0225CA7C * param0) +static u32 ov69_0225DA70(const UnkStruct_ov69_0225CA7C *param0) { return param0->unk_00.unk_00; } -static void ov69_0225DA74 (UnkStruct_ov69_0225DAEC * param0, UnkStruct_ov69_0225DA74 param1, u32 param2) +static void ov69_0225DA74(UnkStruct_ov69_0225DAEC *param0, UnkStruct_ov69_0225DA74 param1, u32 param2) { param0->camera = Camera_Alloc(param2); @@ -1777,17 +1773,17 @@ static void ov69_0225DA74 (UnkStruct_ov69_0225DAEC * param0, UnkStruct_ov69_0225 Camera_SetDistance(param0->unk_0C, param0->camera); } -static void ov69_0225DAEC (UnkStruct_ov69_0225DAEC * param0) +static void ov69_0225DAEC(UnkStruct_ov69_0225DAEC *param0) { Camera_Delete(param0->camera); } -static void ov69_0225DAF8 (const UnkStruct_ov69_0225DAEC * param0) +static void ov69_0225DAF8(const UnkStruct_ov69_0225DAEC *param0) { Camera_ComputeViewMatrix(); } -static void ov69_0225DB00 (UnkStruct_ov69_0225DAEC * param0) +static void ov69_0225DB00(UnkStruct_ov69_0225DAEC *param0) { if (param0->unk_10 == 0) { param0->unk_10 = 1; @@ -1800,7 +1796,7 @@ static void ov69_0225DB00 (UnkStruct_ov69_0225DAEC * param0) param0->unk_12 = 1; } -static BOOL ov69_0225DB2C (UnkStruct_ov69_0225DAEC * param0, UnkStruct_ov69_0225CA7C * param1) +static BOOL ov69_0225DB2C(UnkStruct_ov69_0225DAEC *param0, UnkStruct_ov69_0225CA7C *param1) { if (param0->unk_12 == 0) { return 1; @@ -1834,20 +1830,20 @@ static BOOL ov69_0225DB2C (UnkStruct_ov69_0225DAEC * param0, UnkStruct_ov69_0225 return 0; } -static u32 ov69_0225DBB0 (const UnkStruct_ov69_0225DAEC * param0) +static u32 ov69_0225DBB0(const UnkStruct_ov69_0225DAEC *param0) { return param0->unk_10; } -static void ov69_0225DBB4 (UnkStruct_ov69_0225DC48 * param0, UnkStruct_ov69_0225D35C * param1, UnkStruct_ov69_0225EF54 * param2, u32 param3) +static void ov69_0225DBB4(UnkStruct_ov69_0225DC48 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, u32 param3) { memset(param0, 0, sizeof(UnkStruct_ov69_0225DC48)); - BGL_AddWindow(param1->unk_00, ¶m0->unk_1C, 1, 25, 21, 6, 2, 1, ((((1 + (18 + 12))) + 9))); + BGL_AddWindow(param1->unk_00, ¶m0->unk_1C, 1, 25, 21, 6, 2, 1, ((1 + (18 + 12)) + 9)); BGL_FillWindow(¶m0->unk_1C, 15); { - Strbuf* v0; + Strbuf *v0; v0 = ov69_0225EF74(param2, 1); @@ -1860,15 +1856,15 @@ static void ov69_0225DBB4 (UnkStruct_ov69_0225DC48 * param0, UnkStruct_ov69_0225 sub_02002C60(2); } - Window_Show(¶m0->unk_1C, 0, ((1 + (18 + 12))), 0); + Window_Show(¶m0->unk_1C, 0, (1 + (18 + 12)), 0); } -static void ov69_0225DC48 (UnkStruct_ov69_0225DC48 * param0) +static void ov69_0225DC48(UnkStruct_ov69_0225DC48 *param0) { BGL_DeleteWindow(¶m0->unk_1C); } -static void ov69_0225DC54 (UnkStruct_ov69_0225DC48 * param0) +static void ov69_0225DC54(UnkStruct_ov69_0225DC48 *param0) { int v0, v1, v2, v3; @@ -1920,7 +1916,7 @@ static void ov69_0225DC54 (UnkStruct_ov69_0225DC48 * param0) } } -static int ov69_0225DD10 (const UnkStruct_ov69_0225DC48 * param0, u32 param1) +static int ov69_0225DD10(const UnkStruct_ov69_0225DC48 *param0, u32 param1) { int v0; @@ -1941,24 +1937,24 @@ static int ov69_0225DD10 (const UnkStruct_ov69_0225DC48 * param0, u32 param1) return v0; } -static void ov69_0225DD2C (UnkStruct_ov69_0225DC48 * param0) +static void ov69_0225DD2C(UnkStruct_ov69_0225DC48 *param0) { Window_Clear(¶m0->unk_1C, 1); sub_0201AD10(¶m0->unk_1C); } -static void ov69_0225DD44 (UnkStruct_ov69_0225DC48 * param0) +static void ov69_0225DD44(UnkStruct_ov69_0225DC48 *param0) { sub_0201A9A4(¶m0->unk_1C); - Window_Show(¶m0->unk_1C, 0, ((1 + (18 + 12))), 0); + Window_Show(¶m0->unk_1C, 0, (1 + (18 + 12)), 0); } -static void ov69_0225DD60 (UnkStruct_ov69_0225DDC8 * param0, UnkStruct_ov69_0225D35C * param1, UnkStruct_ov69_0225EF54 * param2, SaveData * param3, u32 param4) +static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, SaveData *param3, u32 param4) { memset(param0, 0, sizeof(UnkStruct_ov69_0225DC48)); { - Options * v0; + Options *v0; v0 = SaveData_Options(param3); param0->unk_08 = Options_TextFrameDelay(v0); @@ -1966,7 +1962,7 @@ static void ov69_0225DD60 (UnkStruct_ov69_0225DDC8 * param0, UnkStruct_ov69_0225 param0->unk_0C = Strbuf_Init(128, param4); - BGL_AddWindow(param1->unk_00, ¶m0->unk_10, 1, 2, 1, 27, 4, 1, ((((((1 + (18 + 12))) + 9)) + (6 * 2)))); + BGL_AddWindow(param1->unk_00, ¶m0->unk_10, 1, 2, 1, 27, 4, 1, (((1 + (18 + 12)) + 9) + (6 * 2))); BGL_FillWindow(¶m0->unk_10, 15); ov69_0225EF84(param2, 5, param0->unk_0C); @@ -1974,7 +1970,7 @@ static void ov69_0225DD60 (UnkStruct_ov69_0225DDC8 * param0, UnkStruct_ov69_0225 param0->unk_20 = sub_02015920(param4); } -static void ov69_0225DDC8 (UnkStruct_ov69_0225DDC8 * param0) +static void ov69_0225DDC8(UnkStruct_ov69_0225DDC8 *param0) { if (Message_Printing(param0->unk_04) != 0) { PrintString_ForceStop(param0->unk_04); @@ -1985,7 +1981,7 @@ static void ov69_0225DDC8 (UnkStruct_ov69_0225DDC8 * param0) BGL_DeleteWindow(¶m0->unk_10); } -static void ov69_0225DDFC (UnkStruct_ov69_0225DDC8 * param0) +static void ov69_0225DDFC(UnkStruct_ov69_0225DDC8 *param0) { BGL_FillWindow(¶m0->unk_10, 15); sub_0200E060(¶m0->unk_10, 1, 1, 2); @@ -1995,7 +1991,7 @@ static void ov69_0225DDFC (UnkStruct_ov69_0225DDC8 * param0) param0->unk_00 = 0; } -static u32 ov69_0225DE40 (UnkStruct_ov69_0225DDC8 * param0) +static u32 ov69_0225DE40(UnkStruct_ov69_0225DDC8 *param0) { u32 v0; @@ -2020,14 +2016,14 @@ static u32 ov69_0225DE40 (UnkStruct_ov69_0225DDC8 * param0) return v0; } -static void ov69_0225DEA0 (UnkStruct_ov69_0225DDC8 * param0) +static void ov69_0225DEA0(UnkStruct_ov69_0225DDC8 *param0) { sub_02015A54(param0->unk_20); sub_0200E084(¶m0->unk_10, 1); sub_0201AD10(¶m0->unk_10); } -static void ov69_0225DEC0 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1, UnkStruct_ov69_0225EF54 * param2, u32 param3) +static void ov69_0225DEC0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225EF54 *param2, u32 param3) { param0->unk_00 = 0; @@ -2042,9 +2038,9 @@ static void ov69_0225DEC0 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225 } { - Strbuf* v1; + Strbuf *v1; - BGL_AddWindow(param1->unk_00, ¶m0->unk_1A8, 4, 2, 19, 27, 4, 11, ((10 + (18 + 12)))); + BGL_AddWindow(param1->unk_00, ¶m0->unk_1A8, 4, 2, 19, 27, 4, 11, (10 + (18 + 12))); BGL_FillWindow(¶m0->unk_1A8, 15); v1 = ov69_0225EF74(param2, 0); @@ -2063,7 +2059,7 @@ static void ov69_0225DEC0 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225 ov69_0225E478(¶m0->unk_2E4); } -static void ov69_0225DFBC (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1) +static void ov69_0225DFBC(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1) { ov69_0225E4E8(¶m0->unk_2E4); ov69_0225EAE8(¶m0->unk_1B8, param1); @@ -2082,7 +2078,7 @@ static void ov69_0225DFBC (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225 } } -static void ov69_0225E00C (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225EF54 * param1, UnkStruct_ov69_0225D35C * param2) +static void ov69_0225E00C(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225EF54 *param1, UnkStruct_ov69_0225D35C *param2) { BOOL v0; @@ -2117,19 +2113,19 @@ static void ov69_0225E00C (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225 } } -static void ov69_0225E084 (UnkStruct_ov69_0225E084 * param0) +static void ov69_0225E084(UnkStruct_ov69_0225E084 *param0) { sub_0200E084(¶m0->unk_1A8, 1); sub_0201AD10(¶m0->unk_1A8); } -static void ov69_0225E0A0 (UnkStruct_ov69_0225E084 * param0) +static void ov69_0225E0A0(UnkStruct_ov69_0225E084 *param0) { sub_0201A9A4(¶m0->unk_1A8); sub_0200E060(¶m0->unk_1A8, 1, 10, 10); } -static BOOL ov69_0225E0C0 (UnkStruct_ov69_0225E084 * param0, const UnkStruct_ov69_0225E0C0 * param1) +static BOOL ov69_0225E0C0(UnkStruct_ov69_0225E084 *param0, const UnkStruct_ov69_0225E0C0 *param1) { switch (param0->unk_00) { case 0: @@ -2149,7 +2145,7 @@ static BOOL ov69_0225E0C0 (UnkStruct_ov69_0225E084 * param0, const UnkStruct_ov6 return 1; } -static BOOL ov69_0225E0F8 (const UnkStruct_ov69_0225E084 * param0, const UnkStruct_ov69_0225E0C0 * param1) +static BOOL ov69_0225E0F8(const UnkStruct_ov69_0225E084 *param0, const UnkStruct_ov69_0225E0C0 *param1) { int v0; UnkStruct_ov69_0225E0C0 v1; @@ -2170,21 +2166,21 @@ static BOOL ov69_0225E0F8 (const UnkStruct_ov69_0225E084 * param0, const UnkStru return 0; } -static void ov69_0225E13C (UnkStruct_ov69_0225E084 * param0) +static void ov69_0225E13C(UnkStruct_ov69_0225E084 *param0) { param0->unk_34 = 0; param0->unk_36 = 0; param0->unk_38 = 0; } -static void ov69_0225E148 (UnkStruct_ov69_0225E084 * param0) +static void ov69_0225E148(UnkStruct_ov69_0225E084 *param0) { param0->unk_34 = 0; param0->unk_36 = 0; param0->unk_38 = 0; } -static void ov69_0225E154 (UnkStruct_ov69_0225E084 * param0, const UnkStruct_ov69_0225E0C0 * param1) +static void ov69_0225E154(UnkStruct_ov69_0225E084 *param0, const UnkStruct_ov69_0225E0C0 *param1) { if (((param0->unk_36 + 1) % 4) == param0->unk_34) { ov69_0225E1A0(param0); @@ -2195,7 +2191,7 @@ static void ov69_0225E154 (UnkStruct_ov69_0225E084 * param0, const UnkStruct_ov6 param0->unk_38++; } -static void ov69_0225E1A0 (UnkStruct_ov69_0225E084 * param0) +static void ov69_0225E1A0(UnkStruct_ov69_0225E084 *param0) { if (param0->unk_36 == param0->unk_34) { return; @@ -2205,7 +2201,7 @@ static void ov69_0225E1A0 (UnkStruct_ov69_0225E084 * param0) param0->unk_38--; } -static BOOL ov69_0225E1C0 (const UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225E0C0 * param1, u32 param2) +static BOOL ov69_0225E1C0(const UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225E0C0 *param1, u32 param2) { s32 v0; @@ -2224,7 +2220,7 @@ static BOOL ov69_0225E1C0 (const UnkStruct_ov69_0225E084 * param0, UnkStruct_ov6 return 1; } -static void ov69_0225E1EC (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1) +static void ov69_0225E1EC(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1) { int v0; @@ -2233,7 +2229,7 @@ static void ov69_0225E1EC (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225 } } -static void ov69_0225E208 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225EF54 * param1, UnkStruct_ov69_0225D35C * param2) +static void ov69_0225E208(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225EF54 *param1, UnkStruct_ov69_0225D35C *param2) { memset(param0->unk_40, 0, sizeof(UnkStruct_ov69_0225E084_sub1) * (3 * 6)); @@ -2279,12 +2275,12 @@ static void ov69_0225E208 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225 } } -static BOOL ov69_0225E2D0 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1) +static BOOL ov69_0225E2D0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1) { return ov69_0225E2F0(param0, param1, 2); } -static void ov69_0225E2DC (UnkStruct_ov69_0225E084 * param0) +static void ov69_0225E2DC(UnkStruct_ov69_0225E084 *param0) { int v0; @@ -2292,12 +2288,12 @@ static void ov69_0225E2DC (UnkStruct_ov69_0225E084 * param0) param0->unk_3C = v0 * 1; } -static BOOL ov69_0225E2E4 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1) +static BOOL ov69_0225E2E4(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1) { return ov69_0225E2F0(param0, param1, 1); } -static BOOL ov69_0225E2F0 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1, int param2) +static BOOL ov69_0225E2F0(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, int param2) { u32 v0; int v1; @@ -2329,12 +2325,12 @@ static BOOL ov69_0225E2F0 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225 return v3; } -static void ov69_0225E368 (UnkStruct_ov69_0225E084 * param0, u32 param1) +static void ov69_0225E368(UnkStruct_ov69_0225E084 *param0, u32 param1) { param0->unk_40[param1].unk_00 = 1; } -static BOOL ov69_0225E374 (UnkStruct_ov69_0225E084 * param0, u32 param1, UnkStruct_ov69_0225D35C * param2) +static BOOL ov69_0225E374(UnkStruct_ov69_0225E084 *param0, u32 param1, UnkStruct_ov69_0225D35C *param2) { u32 v0; u32 v1; @@ -2355,9 +2351,8 @@ static BOOL ov69_0225E374 (UnkStruct_ov69_0225E084 * param0, u32 param1, UnkStru v3 = param0->unk_88[v2]; switch (param0->unk_40[param1].unk_01) { - case 0: - { - u8 * v4; + case 0: { + u8 *v4; v4 = ov69_0225E70C(param0, v1); ov69_0225E71C(param0, v2, v1, v4); @@ -2371,9 +2366,8 @@ static BOOL ov69_0225E374 (UnkStruct_ov69_0225E084 * param0, u32 param1, UnkStru ov69_0225E51C(¶m0->unk_2E4, v0 * 8, (3 * 6) * 8); } break; - case 1: - { - u8 * v5; + case 1: { + u8 *v5; v5 = ov69_0225E6E8(param0, v2, v1); ov69_0225E71C(param0, v2, v1, v5); @@ -2390,13 +2384,13 @@ static BOOL ov69_0225E374 (UnkStruct_ov69_0225E084 * param0, u32 param1, UnkStru return 0; } -static void ov69_0225E430 (UnkStruct_ov69_0225E084 * param0, u32 param1, UnkStruct_ov69_0225D35C * param2) +static void ov69_0225E430(UnkStruct_ov69_0225E084 *param0, u32 param1, UnkStruct_ov69_0225D35C *param2) { sub_020198E8(param2->unk_00, 6, 0, 0 + param1, 32, 1, param0->unk_98->rawData, 0, 0 + param1, param0->unk_98->screenWidth / 8, param0->unk_98->screenHeight / 8); sub_0201C3C0(param2->unk_00, 6); } -static void ov69_0225E478 (UnkStruct_ov69_0225E478 * param0) +static void ov69_0225E478(UnkStruct_ov69_0225E478 *param0) { GXS_SetVisibleWnd(GX_WNDMASK_W0 | GX_WNDMASK_W1); G2S_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 0); @@ -2409,13 +2403,13 @@ static void ov69_0225E478 (UnkStruct_ov69_0225E478 * param0) param0->unk_0C = SysTask_ExecuteAfterVBlank(ov69_0225E534, param0, 0); } -static void ov69_0225E4E8 (UnkStruct_ov69_0225E478 * param0) +static void ov69_0225E4E8(UnkStruct_ov69_0225E478 *param0) { SysTask_Done(param0->unk_0C); GXS_SetVisibleWnd(GX_WNDMASK_NONE); } -static void ov69_0225E504 (UnkStruct_ov69_0225E478 * param0, s16 param1, s16 param2) +static void ov69_0225E504(UnkStruct_ov69_0225E478 *param0, s16 param1, s16 param2) { if (param1 < 0) { param1 = 0; @@ -2430,7 +2424,7 @@ static void ov69_0225E504 (UnkStruct_ov69_0225E478 * param0, s16 param1, s16 par param0->unk_06 = param2; } -static void ov69_0225E51C (UnkStruct_ov69_0225E478 * param0, s16 param1, s16 param2) +static void ov69_0225E51C(UnkStruct_ov69_0225E478 *param0, s16 param1, s16 param2) { if (param1 < 0) { param1 = 0; @@ -2445,9 +2439,9 @@ static void ov69_0225E51C (UnkStruct_ov69_0225E478 * param0, s16 param1, s16 par param0->unk_0A = param2; } -static void ov69_0225E534 (SysTask * param0, void * param1) +static void ov69_0225E534(SysTask *param0, void *param1) { - UnkStruct_ov69_0225E478 * v0 = param1; + UnkStruct_ov69_0225E478 *v0 = param1; if (v0->unk_00) { G2S_SetWnd0Position(0, v0->unk_04, 255, v0->unk_06); @@ -2460,12 +2454,12 @@ static void ov69_0225E534 (SysTask * param0, void * param1) } } -static void ov69_0225E590 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225D35C * param1, u32 param2) +static void ov69_0225E590(UnkStruct_ov69_0225E084 *param0, UnkStruct_ov69_0225D35C *param1, u32 param2) { int v0; int v1; - v1 = (((10 + (18 + 12))) + (27 * 4)); + v1 = ((10 + (18 + 12)) + (27 * 4)); for (v0 = 0; v0 < 3; v0++) { BGL_AddWindow(param1->unk_00, ¶m0->unk_168[v0], 5, 0, 0 + (6 * v0), 27, 6, 14, v1); @@ -2476,11 +2470,11 @@ static void ov69_0225E590 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225 sub_0201A954(¶m0->unk_168[v0]); } - BGL_AddWindow(param1->unk_00, ¶m0->unk_198, 5, 0, 0, 27, 6, 14, (((10 + (18 + 12))) + (27 * 4))); + BGL_AddWindow(param1->unk_00, ¶m0->unk_198, 5, 0, 0, 27, 6, 14, ((10 + (18 + 12)) + (27 * 4))); BGL_FillWindow(¶m0->unk_198, 0); } -static void ov69_0225E61C (UnkStruct_ov69_0225E084 * param0) +static void ov69_0225E61C(UnkStruct_ov69_0225E084 *param0) { int v0; @@ -2491,10 +2485,10 @@ static void ov69_0225E61C (UnkStruct_ov69_0225E084 * param0) BGL_DeleteWindow(¶m0->unk_198); } -static void ov69_0225E644 (UnkStruct_ov69_0225E084 * param0, u32 param1, const UnkStruct_ov69_0225E0C0 * param2, UnkStruct_ov69_0225EF54 * param3) +static void ov69_0225E644(UnkStruct_ov69_0225E084 *param0, u32 param1, const UnkStruct_ov69_0225E0C0 *param2, UnkStruct_ov69_0225EF54 *param3) { - Strbuf* v0; - Window * v1; + Strbuf *v0; + Window *v1; u32 v2; GF_ASSERT(param1 < 3); @@ -2519,9 +2513,9 @@ static void ov69_0225E644 (UnkStruct_ov69_0225E084 * param0, u32 param1, const U } } -static u8 * ov69_0225E6E8 (UnkStruct_ov69_0225E084 * param0, u32 param1, u32 param2) +static u8 *ov69_0225E6E8(UnkStruct_ov69_0225E084 *param0, u32 param1, u32 param2) { - u8 * v0; + u8 *v0; GF_ASSERT(param1 < 3); v0 = param0->unk_168[param1].unk_0C; @@ -2529,15 +2523,15 @@ static u8 * ov69_0225E6E8 (UnkStruct_ov69_0225E084 * param0, u32 param1, u32 par return &v0[((27 * param2) * 32)]; } -static u8 * ov69_0225E70C (UnkStruct_ov69_0225E084 * param0, u32 param1) +static u8 *ov69_0225E70C(UnkStruct_ov69_0225E084 *param0, u32 param1) { - u8 * v0; + u8 *v0; v0 = param0->unk_198.unk_0C; return &v0[((27 * param1) * 32)]; } -static void ov69_0225E71C (UnkStruct_ov69_0225E084 * param0, u32 param1, u32 param2, const u8 * param3) +static void ov69_0225E71C(UnkStruct_ov69_0225E084 *param0, u32 param1, u32 param2, const u8 *param3) { u16 v0; @@ -2547,7 +2541,7 @@ static void ov69_0225E71C (UnkStruct_ov69_0225E084 * param0, u32 param1, u32 par sub_0201DC68(NNS_GFD_DST_2D_BG1_CHAR_SUB, v0 * 32, (void *)param3, 27 * 32); } -static void ov69_0225E748 (UnkStruct_ov69_0225E7DC * param0, UnkStruct_ov69_0225D35C * param1, const UnkStruct_ov69_0225F118 * param2, u16 param3, u32 param4) +static void ov69_0225E748(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D35C *param1, const UnkStruct_ov69_0225F118 *param2, u16 param3, u32 param4) { int v0; @@ -2570,7 +2564,7 @@ static void ov69_0225E748 (UnkStruct_ov69_0225E7DC * param0, UnkStruct_ov69_0225 } } -static void ov69_0225E7DC (UnkStruct_ov69_0225E7DC * param0) +static void ov69_0225E7DC(UnkStruct_ov69_0225E7DC *param0) { int v0; @@ -2585,7 +2579,7 @@ static void ov69_0225E7DC (UnkStruct_ov69_0225E7DC * param0) } } -static void ov69_0225E810 (UnkStruct_ov69_0225E7DC * param0, UnkStruct_ov69_0225D35C * param1) +static void ov69_0225E810(UnkStruct_ov69_0225E7DC *param0, UnkStruct_ov69_0225D35C *param1) { int v0; u32 v1, v2; @@ -2608,7 +2602,7 @@ static void ov69_0225E810 (UnkStruct_ov69_0225E7DC * param0, UnkStruct_ov69_0225 if ((param0->unk_24 > 0) && (v1 != param0->unk_25)) { BOOL v3; - u8 * v4; + u8 *v4; param0->unk_25 = v1; @@ -2618,18 +2612,18 @@ static void ov69_0225E810 (UnkStruct_ov69_0225E7DC * param0, UnkStruct_ov69_0225 } } -static void ov69_0225E8EC (UnkStruct_ov69_0225E7DC * param0, u32 param1, BOOL param2) +static void ov69_0225E8EC(UnkStruct_ov69_0225E7DC *param0, u32 param1, BOOL param2) { GF_ASSERT(param1 < 3); param0->unk_04[param1] = param2; } -static void ov69_0225E904 (UnkStruct_ov69_0225E7DC * param0) +static void ov69_0225E904(UnkStruct_ov69_0225E7DC *param0) { memset(param0->unk_04, 0, sizeof(u8) * 4); } -static void ov69_0225E910 (UnkStruct_ov69_0225E7DC * param0, u32 param1, UnkStruct_ov69_0225D35C * param2) +static void ov69_0225E910(UnkStruct_ov69_0225E7DC *param0, u32 param1, UnkStruct_ov69_0225D35C *param2) { if (param0->unk_18 > 0) { sub_020198E8(param2->unk_00, 6, 0, 0 + param1, 32, 1, param0->unk_10[param0->unk_1A]->rawData, 0, 0 + param1, param0->unk_10[param0->unk_1A]->screenWidth / 8, param0->unk_10[param0->unk_1A]->screenHeight / 8); @@ -2637,12 +2631,12 @@ static void ov69_0225E910 (UnkStruct_ov69_0225E7DC * param0, u32 param1, UnkStru } } -static void ov69_0225E960 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225D35C * param1, UnkStruct_ov69_0225E478 * param2, u32 param3) +static void ov69_0225E960(UnkStruct_ov69_0225EB60 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225E478 *param2, u32 param3) { int v0; UnkStruct_ov19_021DA864 v1; BOOL v2; - UnkStruct_ov83_0223D9A8 v3 = {NULL}; + UnkStruct_ov83_0223D9A8 v3 = { NULL }; memset(param0, 0, sizeof(UnkStruct_ov69_0225EB60)); @@ -2681,7 +2675,7 @@ static void ov69_0225E960 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225 ov69_0225E51C(param2, 0, 0); } -static void ov69_0225EAE8 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225D35C * param1) +static void ov69_0225EAE8(UnkStruct_ov69_0225EB60 *param0, UnkStruct_ov69_0225D35C *param1) { int v0, v1; @@ -2704,7 +2698,7 @@ static void ov69_0225EAE8 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225 } } -static void ov69_0225EB60 (UnkStruct_ov69_0225EB60 * param0) +static void ov69_0225EB60(UnkStruct_ov69_0225EB60 *param0) { memset(param0->unk_34, 0, sizeof(u8) * 4); memset(param0->unk_38, 0, sizeof(u8) * 4); @@ -2713,7 +2707,7 @@ static void ov69_0225EB60 (UnkStruct_ov69_0225EB60 * param0) param0->unk_32 = 128; } -static void ov69_0225EB8C (UnkStruct_ov69_0225EB60 * param0, u8 param1, u8 param2, u8 param3) +static void ov69_0225EB8C(UnkStruct_ov69_0225EB60 *param0, u8 param1, u8 param2, u8 param3) { int v0; @@ -2734,7 +2728,7 @@ static void ov69_0225EB8C (UnkStruct_ov69_0225EB60 * param0, u8 param1, u8 param } } -static void ov69_0225EBEC (UnkStruct_ov69_0225EB60 * param0) +static void ov69_0225EBEC(UnkStruct_ov69_0225EB60 *param0) { int v0; @@ -2743,7 +2737,7 @@ static void ov69_0225EBEC (UnkStruct_ov69_0225EB60 * param0) } } -static void ov69_0225EC08 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225E478 * param1) +static void ov69_0225EC08(UnkStruct_ov69_0225EB60 *param0, UnkStruct_ov69_0225E478 *param1) { BOOL v0; @@ -2775,7 +2769,7 @@ static void ov69_0225EC08 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225 } } -static BOOL ov69_0225EC70 (UnkStruct_ov69_0225EB60 * param0, u32 param1, UnkStruct_ov69_0225E478 * param2) +static BOOL ov69_0225EC70(UnkStruct_ov69_0225EB60 *param0, u32 param1, UnkStruct_ov69_0225E478 *param2) { if (param0->unk_34[param1] == 0) { return 0; @@ -2788,7 +2782,7 @@ static BOOL ov69_0225EC70 (UnkStruct_ov69_0225EB60 * param0, u32 param1, UnkStru return 1; } -static BOOL ov69_0225ECAC (UnkStruct_ov69_0225EB60 * param0, u32 param1, UnkStruct_ov69_0225E478 * param2) +static BOOL ov69_0225ECAC(UnkStruct_ov69_0225EB60 *param0, u32 param1, UnkStruct_ov69_0225E478 *param2) { BOOL v0; @@ -2806,7 +2800,7 @@ static BOOL ov69_0225ECAC (UnkStruct_ov69_0225EB60 * param0, u32 param1, UnkStru return v0; } -static void ov69_0225ECF0 (UnkStruct_ov69_0225ED90 * param0, const UnkStruct_ov69_0225ECF0 * param1) +static void ov69_0225ECF0(UnkStruct_ov69_0225ED90 *param0, const UnkStruct_ov69_0225ECF0 *param1) { param0->unk_0C = param1; param0->unk_00 = param1->unk_00; @@ -2817,17 +2811,17 @@ static void ov69_0225ECF0 (UnkStruct_ov69_0225ED90 * param0, const UnkStruct_ov6 param0->unk_0A = 0; } -static void ov69_0225ED0C (UnkStruct_ov69_0225ED90 * param0, BOOL param1) +static void ov69_0225ED0C(UnkStruct_ov69_0225ED90 *param0, BOOL param1) { param0->unk_08 = param1; } -static void ov69_0225ED10 (UnkStruct_ov69_0225ED90 * param0, BOOL param1) +static void ov69_0225ED10(UnkStruct_ov69_0225ED90 *param0, BOOL param1) { param0->unk_0A = param1; } -static BOOL ov69_0225ED14 (UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov69_0225E478 * param1) +static BOOL ov69_0225ED14(UnkStruct_ov69_0225ED90 *param0, UnkStruct_ov69_0225E478 *param1) { if (param0->unk_04 > param0->unk_0C->unk_08) { return 1; @@ -2847,7 +2841,7 @@ static BOOL ov69_0225ED14 (UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov69_0225 return 0; } -static void ov69_0225ED5C (UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov69_0225E478 * param1) +static void ov69_0225ED5C(UnkStruct_ov69_0225ED90 *param0, UnkStruct_ov69_0225E478 *param1) { param0->unk_04 = 0; param0->unk_06 = 0; @@ -2856,13 +2850,13 @@ static void ov69_0225ED5C (UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov69_0225 ov69_0225EE68(param0, param1); } -static void ov69_0225ED78 (const UnkStruct_ov69_0225ED90 * param0, VecFx32 * param1) +static void ov69_0225ED78(const UnkStruct_ov69_0225ED90 *param0, VecFx32 *param1) { param1->x = param0->unk_00 << FX32_SHIFT; param1->y = (param0->unk_02 << FX32_SHIFT) + (FX32_CONST(256)); } -static void ov69_0225ED90 (UnkStruct_ov69_0225ED90 * param0) +static void ov69_0225ED90(UnkStruct_ov69_0225ED90 *param0) { u16 v0; s16 v1, v2; @@ -2886,7 +2880,7 @@ static void ov69_0225ED90 (UnkStruct_ov69_0225ED90 * param0) param0->unk_00 += FX_Mul(FX32_CONST(param0->unk_0C->unk_0A), FX_SinIdx(v0)) >> FX32_SHIFT; } -static void ov69_0225EE68 (const UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov69_0225E478 * param1) +static void ov69_0225EE68(const UnkStruct_ov69_0225ED90 *param0, UnkStruct_ov69_0225E478 *param1) { ov69_0225E504(param1, 0, 0); @@ -2903,10 +2897,10 @@ static void ov69_0225EE68 (const UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov6 } } -static void ov69_0225EEC4 (UnkStruct_ov69_0225EB60 * param0, u32 param1) +static void ov69_0225EEC4(UnkStruct_ov69_0225EB60 *param0, u32 param1) { VecFx32 v0; - GraphicElementData * v1; + GraphicElementData *v1; ov69_0225ED78(¶m0->unk_00[param1], &v0); @@ -2914,19 +2908,19 @@ static void ov69_0225EEC4 (UnkStruct_ov69_0225EB60 * param0, u32 param1) sub_02021C50(v1, &v0); } -static u16 ov69_0225EEEC (u32 param0) +static u16 ov69_0225EEEC(u32 param0) { GF_ASSERT(param0 < 24); return Unk_ov69_0225F0E8[param0].unk_00; } -static u16 ov69_0225EF04 (u32 param0) +static u16 ov69_0225EF04(u32 param0) { GF_ASSERT(param0 < 24); return Unk_ov69_0225F0E8[param0].unk_01; } -static void ov69_0225EF1C (UnkStruct_ov69_0225EF54 * param0, u32 param1) +static void ov69_0225EF1C(UnkStruct_ov69_0225EF54 *param0, u32 param1) { { param0->unk_00 = MessageLoader_Init(0, 26, 696, param1); @@ -2940,7 +2934,7 @@ static void ov69_0225EF1C (UnkStruct_ov69_0225EF54 * param0, u32 param1) param0->unk_0C = Strbuf_Init(128, param1); } -static void ov69_0225EF54 (UnkStruct_ov69_0225EF54 * param0) +static void ov69_0225EF54(UnkStruct_ov69_0225EF54 *param0) { { MessageLoader_Free(param0->unk_00); @@ -2954,18 +2948,18 @@ static void ov69_0225EF54 (UnkStruct_ov69_0225EF54 * param0) Strbuf_Free(param0->unk_0C); } -static Strbuf* ov69_0225EF74 (UnkStruct_ov69_0225EF54 * param0, u32 param1) +static Strbuf *ov69_0225EF74(UnkStruct_ov69_0225EF54 *param0, u32 param1) { MessageLoader_GetStrbuf(param0->unk_00, param1, param0->unk_08); return param0->unk_08; } -static void ov69_0225EF84 (UnkStruct_ov69_0225EF54 * param0, u32 param1, Strbuf *param2) +static void ov69_0225EF84(UnkStruct_ov69_0225EF54 *param0, u32 param1, Strbuf *param2) { MessageLoader_GetStrbuf(param0->unk_00, param1, param2); } -static Strbuf* ov69_0225EF90 (UnkStruct_ov69_0225EF54 * param0, u32 param1) +static Strbuf *ov69_0225EF90(UnkStruct_ov69_0225EF54 *param0, u32 param1) { MessageLoader_GetStrbuf(param0->unk_00, 3, param0->unk_0C); StringTemplate_SetCountryName(param0->unk_04, 0, param1); @@ -2974,7 +2968,7 @@ static Strbuf* ov69_0225EF90 (UnkStruct_ov69_0225EF54 * param0, u32 param1) return param0->unk_08; } -static Strbuf* ov69_0225EFB8 (UnkStruct_ov69_0225EF54 * param0, u32 param1, u32 param2) +static Strbuf *ov69_0225EFB8(UnkStruct_ov69_0225EF54 *param0, u32 param1, u32 param2) { StringTemplate_ClearArgs(param0->unk_04); MessageLoader_GetStrbuf(param0->unk_00, 3, param0->unk_0C); @@ -2984,7 +2978,7 @@ static Strbuf* ov69_0225EFB8 (UnkStruct_ov69_0225EF54 * param0, u32 param1, u32 return param0->unk_08; } -static u32 ov69_0225EFEC (const UnkStruct_ov66_02231560 * param0) +static u32 ov69_0225EFEC(const UnkStruct_ov66_02231560 *param0) { int v0; u8 v1; diff --git a/src/overlay070/ov70_0225C700.c b/src/overlay070/ov70_0225C700.c index c424897ada..0be45abed6 100644 --- a/src/overlay070/ov70_0225C700.c +++ b/src/overlay070/ov70_0225C700.c @@ -1,41 +1,42 @@ +#include "overlay070/ov70_0225C700.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" - #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017294.h" + #include "overlay063/struct_ov63_0222CC3C.h" +#include "heap.h" #include "unk_02006E3C.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_0201C970.h" #include "unk_0201CED8.h" #include "unk_0202298C.h" -#include "overlay070/ov70_0225C700.h" -void ov70_0225C700 (const UnkStruct_ov63_0222CC3C * param0, VecFx32 * param1) +void ov70_0225C700(const UnkStruct_ov63_0222CC3C *param0, VecFx32 *param1) { param1->x = param0->unk_00 * (FX32_ONE); param1->z = param0->unk_02 * (FX32_ONE); param1->y = (FX32_CONST(0)); } -void ov70_0225C714 (const VecFx32 * param0, UnkStruct_ov63_0222CC3C * param1) +void ov70_0225C714(const VecFx32 *param0, UnkStruct_ov63_0222CC3C *param1) { param1->unk_00 = param0->x / (FX32_ONE); param1->unk_02 = param0->z / (FX32_ONE); } -void ov70_0225C730 (void ** param0, NARC * param1, u32 param2, u32 param3) +void ov70_0225C730(void **param0, NARC *param1, u32 param2, u32 param3) { u32 v0; - void * v1; + void *v1; NNSGfdTexKey v2; NNSGfdTexKey v3; NNSGfdPlttKey v4; - NNSG3dResTex * v5; + NNSG3dResTex *v5; v1 = sub_0200723C(param1, param2, 0, param3, 1); @@ -64,7 +65,7 @@ void ov70_0225C730 (void ** param0, NARC * param1, u32 param2, u32 param3) Heap_FreeToHeap(v1); } -BOOL ov70_0225C7A0 (const UnkStruct_020170F4 * param0, const UnkStruct_02017294 * param1) +BOOL ov70_0225C7A0(const UnkStruct_020170F4 *param0, const UnkStruct_02017294 *param1) { VecFx32 v0; VecFx32 v1; diff --git a/src/overlay070/ov70_0225C858.c b/src/overlay070/ov70_0225C858.c index 05f86caf58..6f3f08e6d5 100644 --- a/src/overlay070/ov70_0225C858.c +++ b/src/overlay070/ov70_0225C858.c @@ -1,21 +1,22 @@ +#include "overlay070/ov70_0225C858.h" + #include #include +#include "overlay063/ov63_0222BCE8.h" #include "overlay063/struct_ov63_0222BCE8_decl.h" -#include "unk_02006E3C.h" #include "heap.h" -#include "overlay063/ov63_0222BCE8.h" -#include "overlay070/ov70_0225C858.h" +#include "unk_02006E3C.h" typedef struct UnkStruct_ov70_0225C894_t { - UnkStruct_ov63_0222BCE8 * unk_00; + UnkStruct_ov63_0222BCE8 *unk_00; } UnkStruct_ov70_0225C894; -UnkStruct_ov70_0225C894 * ov70_0225C858 (u32 param0) +UnkStruct_ov70_0225C894 *ov70_0225C858(u32 param0) { - UnkStruct_ov70_0225C894 * v0; - void * v1; + UnkStruct_ov70_0225C894 *v0; + void *v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov70_0225C894)); v0->unk_00 = ov63_0222BCE8(35, 42, param0); @@ -28,23 +29,23 @@ UnkStruct_ov70_0225C894 * ov70_0225C858 (u32 param0) return v0; } -void ov70_0225C894 (UnkStruct_ov70_0225C894 * param0) +void ov70_0225C894(UnkStruct_ov70_0225C894 *param0) { ov63_0222BD30(param0->unk_00); Heap_FreeToHeap(param0); } -u16 ov70_0225C8A8 (const UnkStruct_ov70_0225C894 * param0) +u16 ov70_0225C8A8(const UnkStruct_ov70_0225C894 *param0) { return 35; } -BOOL ov70_0225C8AC (const UnkStruct_ov70_0225C894 * param0, u16 param1, u16 param2) +BOOL ov70_0225C8AC(const UnkStruct_ov70_0225C894 *param0, u16 param1, u16 param2) { return ov63_0222BDAC(param0->unk_00, param1, param2); } -u32 ov70_0225C8B8 (const UnkStruct_ov70_0225C894 * param0, u16 param1, u16 param2) +u32 ov70_0225C8B8(const UnkStruct_ov70_0225C894 *param0, u16 param1, u16 param2) { u32 v0; @@ -52,7 +53,7 @@ u32 ov70_0225C8B8 (const UnkStruct_ov70_0225C894 * param0, u16 param1, u16 param return v0 >> 15; } -u32 ov70_0225C8C4 (const UnkStruct_ov70_0225C894 * param0, u16 param1, u16 param2) +u32 ov70_0225C8C4(const UnkStruct_ov70_0225C894 *param0, u16 param1, u16 param2) { u32 v0; @@ -62,7 +63,7 @@ u32 ov70_0225C8C4 (const UnkStruct_ov70_0225C894 * param0, u16 param1, u16 param return v0; } -BOOL ov70_0225C8D8 (const UnkStruct_ov70_0225C894 * param0, u32 param1, u16 * param2, u16 * param3, u32 param4) +BOOL ov70_0225C8D8(const UnkStruct_ov70_0225C894 *param0, u32 param1, u16 *param2, u16 *param3, u32 param4) { int v0, v1, v2; u32 v3; @@ -88,7 +89,7 @@ BOOL ov70_0225C8D8 (const UnkStruct_ov70_0225C894 * param0, u32 param1, u16 * pa return 0; } -BOOL ov70_0225C930 (u32 param0) +BOOL ov70_0225C930(u32 param0) { static const u8 v0[] = { 1, @@ -135,10 +136,12 @@ BOOL ov70_0225C930 (u32 param0) return 0; } -BOOL ov70_0225C950 (u32 param0) +BOOL ov70_0225C950(u32 param0) { static const u8 v0[] = { - 39, 40, 41, + 39, + 40, + 41, }; int v1; @@ -151,7 +154,7 @@ BOOL ov70_0225C950 (u32 param0) return 0; } -BOOL ov70_0225C970 (u32 param0) +BOOL ov70_0225C970(u32 param0) { static const u8 v0[] = { 36, 37, 38, 39, 40, 41, 43 @@ -167,10 +170,13 @@ BOOL ov70_0225C970 (u32 param0) return 0; } -BOOL ov70_0225C990 (u32 param0) +BOOL ov70_0225C990(u32 param0) { static const u8 v0[] = { - 2, 3, 4, 5, + 2, + 3, + 4, + 5, }; int v1; @@ -183,7 +189,7 @@ BOOL ov70_0225C990 (u32 param0) return 0; } -const UnkStruct_ov63_0222BCE8 * ov70_0225C9B0 (const UnkStruct_ov70_0225C894 * param0) +const UnkStruct_ov63_0222BCE8 *ov70_0225C9B0(const UnkStruct_ov70_0225C894 *param0) { return param0->unk_00; } diff --git a/src/overlay070/ov70_0225C9B4.c b/src/overlay070/ov70_0225C9B4.c index b9c4ac1301..a656eae9b4 100644 --- a/src/overlay070/ov70_0225C9B4.c +++ b/src/overlay070/ov70_0225C9B4.c @@ -1,30 +1,29 @@ +#include "overlay070/ov70_0225C9B4.h" + #include #include -#include "core_sys.h" - +#include "overlay063/ov63_0222BE18.h" +#include "overlay063/ov63_0222CA88.h" +#include "overlay063/ov63_0222D77C.h" #include "overlay063/struct_ov63_0222BCE8_decl.h" #include "overlay063/struct_ov63_0222BE18_decl.h" #include "overlay063/struct_ov63_0222BEC0_decl.h" -#include "overlay063/struct_ov63_0222D848_decl.h" -#include "overlay066/struct_ov66_02234548_decl.h" -#include "overlay066/struct_ov66_02234798_decl.h" -#include "overlay070/struct_ov70_0225C894_decl.h" - #include "overlay063/struct_ov63_0222CC3C.h" #include "overlay063/struct_ov63_0222CCB8.h" +#include "overlay063/struct_ov63_0222D848_decl.h" #include "overlay063/struct_ov63_0222D894.h" #include "overlay065/struct_ov65_022376D0.h" +#include "overlay066/ov66_022343A8.h" +#include "overlay066/struct_ov66_02234548_decl.h" +#include "overlay066/struct_ov66_02234798_decl.h" +#include "overlay070/ov70_0225C858.h" +#include "overlay070/struct_ov70_0225C894_decl.h" -#include "unk_02005474.h" +#include "core_sys.h" #include "heap.h" +#include "unk_02005474.h" #include "unk_0201D15C.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay063/ov63_0222CA88.h" -#include "overlay063/ov63_0222D77C.h" -#include "overlay066/ov66_022343A8.h" -#include "overlay070/ov70_0225C858.h" -#include "overlay070/ov70_0225C9B4.h" typedef struct { fx32 unk_00; @@ -63,28 +62,28 @@ typedef union { } UnkStruct_ov70_0225CC54_sub1; typedef struct UnkStruct_ov70_0225CC54_t { - UnkStruct_ov63_0222BEC0 * unk_00; - UnkStruct_ov66_02234798 * unk_04; + UnkStruct_ov63_0222BEC0 *unk_00; + UnkStruct_ov66_02234798 *unk_04; u16 unk_08; u8 unk_0A; u8 unk_0B; UnkStruct_ov70_0225CC54_sub1 unk_0C; - void (* unk_24)(struct UnkStruct_ov70_0225CC54_t *, UnkStruct_ov70_0225CA20 *); + void (*unk_24)(struct UnkStruct_ov70_0225CC54_t *, UnkStruct_ov70_0225CA20 *); } UnkStruct_ov70_0225CC54; -typedef void (* UnkFuncPtr_ov70_0226D558)(struct UnkStruct_ov70_0225CC54_t *, UnkStruct_ov70_0225CA20 *); +typedef void (*UnkFuncPtr_ov70_0226D558)(struct UnkStruct_ov70_0225CC54_t *, UnkStruct_ov70_0225CA20 *); typedef struct UnkStruct_ov70_0225CA20_t { - UnkStruct_ov63_0222BE18 * unk_00; - UnkStruct_ov66_02234548 * unk_04; - UnkStruct_ov70_0225CC54 * unk_08; + UnkStruct_ov63_0222BE18 *unk_00; + UnkStruct_ov66_02234548 *unk_04; + UnkStruct_ov70_0225CC54 *unk_08; u16 unk_0C; u16 unk_0E; - UnkStruct_ov63_0222D848 * unk_10; - const UnkStruct_ov70_0225C894 * unk_14; + UnkStruct_ov63_0222D848 *unk_10; + const UnkStruct_ov70_0225C894 *unk_14; UnkStruct_ov70_0225D93C unk_18; - UnkStruct_ov70_0225CC54 * unk_20; - UnkStruct_ov70_0225CC54 * unk_24; + UnkStruct_ov70_0225CC54 *unk_20; + UnkStruct_ov70_0225CC54 *unk_24; } UnkStruct_ov70_0225CA20; typedef struct { @@ -94,30 +93,30 @@ typedef struct { u8 unk_03; } UnkStruct_ov70_0226D508; -static void ov70_0225D0D8(UnkStruct_ov70_0225CA20 * param0); -static void ov70_0225D17C(UnkStruct_ov70_0225CA20 * param0, s32 param1, s32 param2, s32 param3); -static u8 ov70_0225D194(const u8 * param0, u32 param1); -static BOOL ov70_0225D1A8(const UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225CC54 * param1, int param2, u32 param3); -static void ov70_0225D220(UnkStruct_ov70_0225D220 * param0, fx32 param1, fx32 param2, u32 param3); -static BOOL ov70_0225D22C(UnkStruct_ov70_0225D220 * param0, u32 param1); -static fx32 ov70_0225D2BC(const UnkStruct_ov70_0225D220 * param0); -static UnkStruct_ov70_0225CC54 * ov70_0225D2C0(UnkStruct_ov70_0225CA20 * param0); -static BOOL ov70_0225D2FC(const UnkStruct_ov70_0225CC54 * param0); -static void ov70_0225D30C(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D310(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D3D8(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D4CC(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D57C(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D634(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D640(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D64C(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D658(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D664(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1, int param2); -static void ov70_0225D81C(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D8F8(UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1); -static void ov70_0225D920(UnkStruct_ov70_0225D93C * param0, UnkStruct_ov66_02234548 * param1, u32 param2); -static void ov70_0225D93C(UnkStruct_ov70_0225D93C * param0, u32 param1); -static BOOL ov70_0225D954(UnkStruct_ov70_0225D93C * param0, UnkStruct_ov66_02234548 * param1); +static void ov70_0225D0D8(UnkStruct_ov70_0225CA20 *param0); +static void ov70_0225D17C(UnkStruct_ov70_0225CA20 *param0, s32 param1, s32 param2, s32 param3); +static u8 ov70_0225D194(const u8 *param0, u32 param1); +static BOOL ov70_0225D1A8(const UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov70_0225CC54 *param1, int param2, u32 param3); +static void ov70_0225D220(UnkStruct_ov70_0225D220 *param0, fx32 param1, fx32 param2, u32 param3); +static BOOL ov70_0225D22C(UnkStruct_ov70_0225D220 *param0, u32 param1); +static fx32 ov70_0225D2BC(const UnkStruct_ov70_0225D220 *param0); +static UnkStruct_ov70_0225CC54 *ov70_0225D2C0(UnkStruct_ov70_0225CA20 *param0); +static BOOL ov70_0225D2FC(const UnkStruct_ov70_0225CC54 *param0); +static void ov70_0225D30C(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D310(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D3D8(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D4CC(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D57C(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D634(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D640(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D64C(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D658(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D664(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1, int param2); +static void ov70_0225D81C(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D8F8(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1); +static void ov70_0225D920(UnkStruct_ov70_0225D93C *param0, UnkStruct_ov66_02234548 *param1, u32 param2); +static void ov70_0225D93C(UnkStruct_ov70_0225D93C *param0, u32 param1); +static BOOL ov70_0225D954(UnkStruct_ov70_0225D93C *param0, UnkStruct_ov66_02234548 *param1); static const u8 Unk_ov70_0226D500[] = { 0x20, @@ -134,10 +133,10 @@ static const u8 Unk_ov70_0226D4FC[] = { }; static const UnkStruct_ov70_0226D508 Unk_ov70_0226D508[] = { - {0x40, 0x2, 0xEB, 0xFF}, - {0x41, 0x1, 0xEB, 0xFF}, - {0x42, 0x1, 0xEA, 0xFF}, - {0x61, 0x1, 0xEA, 0xFE} + { 0x40, 0x2, 0xEB, 0xFF }, + { 0x41, 0x1, 0xEB, 0xFF }, + { 0x42, 0x1, 0xEA, 0xFF }, + { 0x61, 0x1, 0xEA, 0xFE } }; static const UnkFuncPtr_ov70_0226D558 Unk_ov70_0226D558[10] = { @@ -167,17 +166,17 @@ static const UnkFuncPtr_ov70_0226D558 Unk_ov70_0226D530[10] = { }; static const u32 Unk_ov70_0226D518[6] = { - {0x10}, - {0xC}, - {0x8}, - {0x6}, - {0x0}, - {0x0} + { 0x10 }, + { 0xC }, + { 0x8 }, + { 0x6 }, + { 0x0 }, + { 0x0 } }; -UnkStruct_ov70_0225CA20 * ov70_0225C9B4 (u32 param0, u32 param1, const UnkStruct_ov70_0225C894 * param2, u32 param3, u32 param4) +UnkStruct_ov70_0225CA20 *ov70_0225C9B4(u32 param0, u32 param1, const UnkStruct_ov70_0225C894 *param2, u32 param3, u32 param4) { - UnkStruct_ov70_0225CA20 * v0; + UnkStruct_ov70_0225CA20 *v0; v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov70_0225CA20)); memset(v0, 0, sizeof(UnkStruct_ov70_0225CA20)); @@ -198,7 +197,7 @@ UnkStruct_ov70_0225CA20 * ov70_0225C9B4 (u32 param0, u32 param1, const UnkStruct return v0; } -void ov70_0225CA20 (UnkStruct_ov70_0225CA20 * param0) +void ov70_0225CA20(UnkStruct_ov70_0225CA20 *param0) { Heap_FreeToHeap(param0->unk_08); @@ -209,13 +208,13 @@ void ov70_0225CA20 (UnkStruct_ov70_0225CA20 * param0) Heap_FreeToHeap(param0); } -void ov70_0225CA44 (UnkStruct_ov70_0225CA20 * param0) +void ov70_0225CA44(UnkStruct_ov70_0225CA20 *param0) { ov63_0222BE84(param0->unk_00); ov70_0225D954(¶m0->unk_18, param0->unk_04); } -void ov70_0225CA5C (UnkStruct_ov70_0225CA20 * param0) +void ov70_0225CA5C(UnkStruct_ov70_0225CA20 *param0) { { int v0; @@ -231,7 +230,7 @@ void ov70_0225CA5C (UnkStruct_ov70_0225CA20 * param0) UnkStruct_ov63_0222D894 v1; UnkStruct_ov63_0222CCB8 v2; BOOL v3; - const UnkStruct_ov63_0222BCE8 * v4; + const UnkStruct_ov63_0222BCE8 *v4; v4 = ov70_0225C9B0(param0->unk_14); @@ -247,32 +246,32 @@ void ov70_0225CA5C (UnkStruct_ov70_0225CA20 * param0) ov66_02234590(param0->unk_04); } -void ov70_0225CAD4 (UnkStruct_ov70_0225CA20 * param0) +void ov70_0225CAD4(UnkStruct_ov70_0225CA20 *param0) { ov66_022345C4(param0->unk_04); } -void ov70_0225CAE0 (UnkStruct_ov70_0225CA20 * param0) +void ov70_0225CAE0(UnkStruct_ov70_0225CA20 *param0) { ov66_02234604(param0->unk_04); } -void ov70_0225CAEC (UnkStruct_ov70_0225CA20 * param0, int param1) +void ov70_0225CAEC(UnkStruct_ov70_0225CA20 *param0, int param1) { ov70_0225D920(¶m0->unk_18, param0->unk_04, Unk_ov70_0226D518[param1]); } -void ov70_0225CB08 (UnkStruct_ov70_0225CA20 * param0, int param1) +void ov70_0225CB08(UnkStruct_ov70_0225CA20 *param0, int param1) { ov70_0225D93C(¶m0->unk_18, Unk_ov70_0226D518[param1]); } -void ov70_0225CB1C (UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov63_0222D894 * param1) +void ov70_0225CB1C(UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov63_0222D894 *param1) { ov63_0222D894(param0->unk_10, param1); } -UnkStruct_ov70_0225CC54 * ov70_0225CB28 (UnkStruct_ov70_0225CA20 * param0, u32 param1) +UnkStruct_ov70_0225CC54 *ov70_0225CB28(UnkStruct_ov70_0225CA20 *param0, u32 param1) { u16 v0, v1; BOOL v2; @@ -282,9 +281,9 @@ UnkStruct_ov70_0225CC54 * ov70_0225CB28 (UnkStruct_ov70_0225CA20 * param0, u32 p return ov70_0225CB5C(param0, param1, v0, v1); } -UnkStruct_ov70_0225CC54 * ov70_0225CB5C (UnkStruct_ov70_0225CA20 * param0, u32 param1, u32 param2, u32 param3) +UnkStruct_ov70_0225CC54 *ov70_0225CB5C(UnkStruct_ov70_0225CA20 *param0, u32 param1, u32 param2, u32 param3) { - UnkStruct_ov70_0225CC54 * v0; + UnkStruct_ov70_0225CC54 *v0; v0 = ov70_0225D2C0(param0); @@ -316,9 +315,9 @@ UnkStruct_ov70_0225CC54 * ov70_0225CB5C (UnkStruct_ov70_0225CA20 * param0, u32 p return v0; } -UnkStruct_ov70_0225CC54 * ov70_0225CBB8 (UnkStruct_ov70_0225CA20 * param0, u32 param1, u32 param2) +UnkStruct_ov70_0225CC54 *ov70_0225CBB8(UnkStruct_ov70_0225CA20 *param0, u32 param1, u32 param2) { - UnkStruct_ov70_0225CC54 * v0; + UnkStruct_ov70_0225CC54 *v0; v0 = ov70_0225D2C0(param0); @@ -327,7 +326,7 @@ UnkStruct_ov70_0225CC54 * ov70_0225CBB8 (UnkStruct_ov70_0225CA20 * param0, u32 p u16 v2, v3, v4; BOOL v5; BOOL v6 = 0; - UnkStruct_ov70_0225CC54 * v7; + UnkStruct_ov70_0225CC54 *v7; v4 = 0; @@ -369,14 +368,14 @@ UnkStruct_ov70_0225CC54 * ov70_0225CBB8 (UnkStruct_ov70_0225CA20 * param0, u32 p return v0; } -void ov70_0225CC54 (UnkStruct_ov70_0225CC54 * param0) +void ov70_0225CC54(UnkStruct_ov70_0225CC54 *param0) { ov66_02234798(param0->unk_04); ov63_0222BF08(param0->unk_00); memset(param0, 0, sizeof(UnkStruct_ov70_0225CC54)); } -UnkStruct_ov70_0225CC54 * ov70_0225CC70 (UnkStruct_ov70_0225CA20 * param0, u32 param1) +UnkStruct_ov70_0225CC54 *ov70_0225CC70(UnkStruct_ov70_0225CA20 *param0, u32 param1) { int v0; u32 v1; @@ -394,17 +393,17 @@ UnkStruct_ov70_0225CC54 * ov70_0225CC70 (UnkStruct_ov70_0225CA20 * param0, u32 p return NULL; } -UnkStruct_ov70_0225CC54 * ov70_0225CCAC (UnkStruct_ov70_0225CA20 * param0) +UnkStruct_ov70_0225CC54 *ov70_0225CCAC(UnkStruct_ov70_0225CA20 *param0) { return param0->unk_20; } -UnkStruct_ov70_0225CC54 * ov70_0225CCB0 (UnkStruct_ov70_0225CA20 * param0) +UnkStruct_ov70_0225CC54 *ov70_0225CCB0(UnkStruct_ov70_0225CA20 *param0) { return param0->unk_24; } -void ov70_0225CCB4 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov63_0222CC3C param1) +void ov70_0225CCB4(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov63_0222CC3C param1) { GF_ASSERT(param0->unk_00); ov63_0222C1A4(param0->unk_00, param1); @@ -412,25 +411,25 @@ void ov70_0225CCB4 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov63_0222CC3C pa ov63_0222C000(param0->unk_00, 5, 0); } -void ov70_0225CD04 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov63_0222CC3C param1, int param2) +void ov70_0225CD04(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov63_0222CC3C param1, int param2) { ov70_0225CCB4(param0, param1); ov63_0222C000(param0->unk_00, 6, param2); } -UnkStruct_ov63_0222CC3C ov70_0225CD34 (const UnkStruct_ov70_0225CC54 * param0) +UnkStruct_ov63_0222CC3C ov70_0225CD34(const UnkStruct_ov70_0225CC54 *param0) { GF_ASSERT(param0->unk_00); return ov63_0222C0FC(param0->unk_00); } -u32 ov70_0225CD60 (const UnkStruct_ov70_0225CC54 * param0, int param1) +u32 ov70_0225CD60(const UnkStruct_ov70_0225CC54 *param0, int param1) { GF_ASSERT(param0->unk_00); return ov63_0222BF90(param0->unk_00, param1); } -void ov70_0225CD7C (UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225CC54 * param1, int param2, int param3) +void ov70_0225CD7C(UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov70_0225CC54 *param1, int param2, int param3) { u32 v0; u32 v1; @@ -441,7 +440,7 @@ void ov70_0225CD7C (UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225C ov70_0225D17C(param0, param2, param3, v1); } -void ov70_0225CDAC (UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225CC54 * param1, int param2, int param3) +void ov70_0225CDAC(UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov70_0225CC54 *param1, int param2, int param3) { UnkStruct_ov63_0222CCB8 v0; @@ -453,7 +452,7 @@ void ov70_0225CDAC (UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225C ov63_0222BE70(param0->unk_00, &v0); } -void ov70_0225CDEC (UnkStruct_ov70_0225CA20 * param0, UnkStruct_ov70_0225CC54 * param1, int param2) +void ov70_0225CDEC(UnkStruct_ov70_0225CA20 *param0, UnkStruct_ov70_0225CC54 *param1, int param2) { GF_ASSERT(param2 < 10); @@ -470,19 +469,19 @@ void ov70_0225CDEC (UnkStruct_ov70_0225CA20 * param0, UnkStruct_ov70_0225CC54 * param1->unk_24 = Unk_ov70_0226D558[param2]; } -BOOL ov70_0225CE38 (const UnkStruct_ov70_0225CC54 * param0) +BOOL ov70_0225CE38(const UnkStruct_ov70_0225CC54 *param0) { return param0->unk_0A; } -int ov70_0225CE3C (const UnkStruct_ov70_0225CC54 * param0) +int ov70_0225CE3C(const UnkStruct_ov70_0225CC54 *param0) { return param0->unk_0B; } -UnkStruct_ov70_0225CC54 * ov70_0225CE40 (UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225CC54 * param1) +UnkStruct_ov70_0225CC54 *ov70_0225CE40(UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov70_0225CC54 *param1) { - const UnkStruct_ov63_0222BEC0 * v0; + const UnkStruct_ov63_0222BEC0 *v0; u32 v1; u32 v2; @@ -497,14 +496,14 @@ UnkStruct_ov70_0225CC54 * ov70_0225CE40 (UnkStruct_ov70_0225CA20 * param0, const return ov70_0225CC70(param0, v2); } -BOOL ov70_0225CE70 (const UnkStruct_ov70_0225CC54 * param0) +BOOL ov70_0225CE70(const UnkStruct_ov70_0225CC54 *param0) { return ov66_022347CC(param0->unk_04); } -const UnkStruct_ov70_0225CC54 * ov70_0225CE7C (const UnkStruct_ov70_0225CA20 * param0, u16 param1, u16 param2) +const UnkStruct_ov70_0225CC54 *ov70_0225CE7C(const UnkStruct_ov70_0225CA20 *param0, u16 param1, u16 param2) { - const UnkStruct_ov63_0222BEC0 * v0; + const UnkStruct_ov63_0222BEC0 *v0; int v1; UnkStruct_ov63_0222CC3C v2; @@ -527,7 +526,7 @@ const UnkStruct_ov70_0225CC54 * ov70_0225CE7C (const UnkStruct_ov70_0225CA20 * p return NULL; } -BOOL ov70_0225CEDC (const UnkStruct_ov70_0225CC54 * param0, u16 param1, u16 param2) +BOOL ov70_0225CEDC(const UnkStruct_ov70_0225CC54 *param0, u16 param1, u16 param2) { UnkStruct_ov63_0222CC3C v0; UnkStruct_ov63_0222CC3C v1; @@ -546,17 +545,20 @@ BOOL ov70_0225CEDC (const UnkStruct_ov70_0225CC54 * param0, u16 param1, u16 para return 0; } -BOOL ov70_0225CF4C (UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225CC54 * param1, u32 * param2, UnkStruct_ov63_0222CC3C * param3) +BOOL ov70_0225CF4C(UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov70_0225CC54 *param1, u32 *param2, UnkStruct_ov63_0222CC3C *param3) { static const u8 v0[4] = { - 3, 2, 1, 0, + 3, + 2, + 1, + 0, }; int v1; UnkStruct_ov63_0222CC3C v2; UnkStruct_ov63_0222CC3C v3; BOOL v4; u32 v5; - const UnkStruct_ov63_0222BEC0 * v6; + const UnkStruct_ov63_0222BEC0 *v6; v2 = ov63_0222C0E4(param1->unk_00); @@ -589,32 +591,32 @@ BOOL ov70_0225CF4C (UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225C return 0; } -void ov70_0225D030 (UnkStruct_ov70_0225CC54 * param0, BOOL param1) +void ov70_0225D030(UnkStruct_ov70_0225CC54 *param0, BOOL param1) { ov66_022347B0(param0->unk_04, param1); } -void ov70_0225D03C (UnkStruct_ov70_0225CC54 * param0, const UnkStruct_ov63_0222CC3C * param1) +void ov70_0225D03C(UnkStruct_ov70_0225CC54 *param0, const UnkStruct_ov63_0222CC3C *param1) { ov66_022347D4(param0->unk_04, param1); } -void ov70_0225D048 (UnkStruct_ov70_0225CC54 * param0, const VecFx32 * param1) +void ov70_0225D048(UnkStruct_ov70_0225CC54 *param0, const VecFx32 *param1) { ov66_022347F8(param0->unk_04, param1); } -void ov70_0225D054 (const UnkStruct_ov70_0225CC54 * param0, VecFx32 * param1) +void ov70_0225D054(const UnkStruct_ov70_0225CC54 *param0, VecFx32 *param1) { ov66_0223481C(param0->unk_04, param1); } -void ov70_0225D060 (UnkStruct_ov70_0225CC54 * param0, int param1) +void ov70_0225D060(UnkStruct_ov70_0225CC54 *param0, int param1) { ov66_02234834(param0->unk_04, param1); } -void ov70_0225D06C (UnkStruct_ov70_0225CC54 * param0, BOOL param1) +void ov70_0225D06C(UnkStruct_ov70_0225CC54 *param0, BOOL param1) { if (param1) { ov66_02234850(param0->unk_04, 1); @@ -623,7 +625,7 @@ void ov70_0225D06C (UnkStruct_ov70_0225CC54 * param0, BOOL param1) } } -void ov70_0225D084 (UnkStruct_ov70_0225CC54 * param0, BOOL param1) +void ov70_0225D084(UnkStruct_ov70_0225CC54 *param0, BOOL param1) { if (param1) { ov66_02234850(param0->unk_04, 0); @@ -632,7 +634,7 @@ void ov70_0225D084 (UnkStruct_ov70_0225CC54 * param0, BOOL param1) } } -void ov70_0225D09C (UnkStruct_ov70_0225CC54 * param0, BOOL param1) +void ov70_0225D09C(UnkStruct_ov70_0225CC54 *param0, BOOL param1) { if (param1) { ov66_02234850(param0->unk_04, 2); @@ -641,25 +643,25 @@ void ov70_0225D09C (UnkStruct_ov70_0225CC54 * param0, BOOL param1) } } -void ov70_0225D0B4 (UnkStruct_ov70_0225CC54 * param0, u32 param1) +void ov70_0225D0B4(UnkStruct_ov70_0225CC54 *param0, u32 param1) { ov66_022347C4(param0->unk_04, param1); } -void ov70_0225D0C0 (UnkStruct_ov70_0225CC54 * param0, BOOL param1) +void ov70_0225D0C0(UnkStruct_ov70_0225CC54 *param0, BOOL param1) { ov66_0223488C(param0->unk_04, param1); } -BOOL ov70_0225D0CC (const UnkStruct_ov70_0225CC54 * param0) +BOOL ov70_0225D0CC(const UnkStruct_ov70_0225CC54 *param0) { return ov66_022348A8(param0->unk_04); } -static void ov70_0225D0D8 (UnkStruct_ov70_0225CA20 * param0) +static void ov70_0225D0D8(UnkStruct_ov70_0225CA20 *param0) { int v0; - UnkStruct_ov70_0225CC54 * v1; + UnkStruct_ov70_0225CC54 *v1; u16 v2, v3; BOOL v4; u16 v5; @@ -697,7 +699,7 @@ static void ov70_0225D0D8 (UnkStruct_ov70_0225CA20 * param0) } } -static void ov70_0225D17C (UnkStruct_ov70_0225CA20 * param0, s32 param1, s32 param2, s32 param3) +static void ov70_0225D17C(UnkStruct_ov70_0225CA20 *param0, s32 param1, s32 param2, s32 param3) { UnkStruct_ov63_0222D894 v0; @@ -708,7 +710,7 @@ static void ov70_0225D17C (UnkStruct_ov70_0225CA20 * param0, s32 param1, s32 par ov70_0225CB1C(param0, &v0); } -static u8 ov70_0225D194 (const u8 * param0, u32 param1) +static u8 ov70_0225D194(const u8 *param0, u32 param1) { int v0; @@ -716,7 +718,7 @@ static u8 ov70_0225D194 (const u8 * param0, u32 param1) return param0[v0]; } -static BOOL ov70_0225D1A8 (const UnkStruct_ov70_0225CA20 * param0, const UnkStruct_ov70_0225CC54 * param1, int param2, u32 param3) +static BOOL ov70_0225D1A8(const UnkStruct_ov70_0225CA20 *param0, const UnkStruct_ov70_0225CC54 *param1, int param2, u32 param3) { UnkStruct_ov63_0222CC3C v0; u32 v1; @@ -732,7 +734,7 @@ static BOOL ov70_0225D1A8 (const UnkStruct_ov70_0225CA20 * param0, const UnkStru return 0; } -static void ov70_0225D220 (UnkStruct_ov70_0225D220 * param0, fx32 param1, fx32 param2, u32 param3) +static void ov70_0225D220(UnkStruct_ov70_0225D220 *param0, fx32 param1, fx32 param2, u32 param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -740,7 +742,7 @@ static void ov70_0225D220 (UnkStruct_ov70_0225D220 * param0, fx32 param1, fx32 p param0->unk_0C = param3; } -static BOOL ov70_0225D22C (UnkStruct_ov70_0225D220 * param0, u32 param1) +static BOOL ov70_0225D22C(UnkStruct_ov70_0225D220 *param0, u32 param1) { fx32 v0; @@ -756,12 +758,12 @@ static BOOL ov70_0225D22C (UnkStruct_ov70_0225D220 * param0, u32 param1) return 0; } -static fx32 ov70_0225D2BC (const UnkStruct_ov70_0225D220 * param0) +static fx32 ov70_0225D2BC(const UnkStruct_ov70_0225D220 *param0) { return param0->unk_00; } -static UnkStruct_ov70_0225CC54 * ov70_0225D2C0 (UnkStruct_ov70_0225CA20 * param0) +static UnkStruct_ov70_0225CC54 *ov70_0225D2C0(UnkStruct_ov70_0225CA20 *param0) { int v0; @@ -775,7 +777,7 @@ static UnkStruct_ov70_0225CC54 * ov70_0225D2C0 (UnkStruct_ov70_0225CA20 * param0 return ¶m0->unk_08[v0]; } -static BOOL ov70_0225D2FC (const UnkStruct_ov70_0225CC54 * param0) +static BOOL ov70_0225D2FC(const UnkStruct_ov70_0225CC54 *param0) { if (param0->unk_00 == NULL) { return 1; @@ -784,18 +786,18 @@ static BOOL ov70_0225D2FC (const UnkStruct_ov70_0225CC54 * param0) return 0; } -static void ov70_0225D30C (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D30C(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { return; } -static void ov70_0225D310 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D310(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { s32 v0; s32 v1; s32 v2; s32 v3; - const UnkStruct_ov63_0222BEC0 * v4; + const UnkStruct_ov63_0222BEC0 *v4; v0 = ov63_0222BF90(param0->unk_00, 6); v1 = ov63_0222BF90(param0->unk_00, 4); @@ -838,7 +840,7 @@ static void ov70_0225D310 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 } } -static void ov70_0225D3D8 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D3D8(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { switch (param0->unk_08) { case 0: @@ -852,8 +854,7 @@ static void ov70_0225D3D8 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 param0->unk_08++; } break; - case 2: - { + case 2: { u32 v0; u32 v1; @@ -874,10 +875,8 @@ static void ov70_0225D3D8 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 ov70_0225CD7C(param1, param0, 1, param0->unk_0C.val1.unk_02); param0->unk_08 = 4; } - } - break; - case 3: - { + } break; + case 3: { u32 v2; v2 = ov63_0222BF90(param0->unk_00, 5); @@ -886,10 +885,8 @@ static void ov70_0225D3D8 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 ov70_0225CD7C(param1, param0, 2, param0->unk_0C.val1.unk_02); param0->unk_08++; } - } - break; - case 4: - { + } break; + case 4: { u32 v3; v3 = ov63_0222BF90(param0->unk_00, 5); @@ -897,12 +894,11 @@ static void ov70_0225D3D8 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 if (v3 == 0) { param0->unk_08 = 0; } - } - break; + } break; } } -static void ov70_0225D4CC (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D4CC(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { switch (param0->unk_08) { case 0: @@ -921,8 +917,7 @@ static void ov70_0225D4CC (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 Sound_PlayEffect(1615); } break; - case 2: - { + case 2: { BOOL v0; VecFx32 v1; @@ -939,14 +934,13 @@ static void ov70_0225D4CC (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 ov66_0223487C(param0->unk_04); param0->unk_0A = 1; } - } - break; + } break; case 3: break; } } -static void ov70_0225D57C (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D57C(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { switch (param0->unk_08) { case 0: @@ -958,8 +952,7 @@ static void ov70_0225D57C (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 param0->unk_08++; Sound_PlayEffect(1615); - case 1: - { + case 1: { BOOL v0; VecFx32 v1; @@ -975,8 +968,7 @@ static void ov70_0225D57C (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 param0->unk_0C.val2.unk_10 = 32; param0->unk_08++; } - } - break; + } break; case 2: param0->unk_0C.val2.unk_10--; @@ -993,34 +985,34 @@ static void ov70_0225D57C (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 } } -static void ov70_0225D634 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D634(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { ov70_0225D664(param0, param1, 2); } -static void ov70_0225D640 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D640(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { ov70_0225D664(param0, param1, 3); } -static void ov70_0225D64C (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D64C(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { ov70_0225D664(param0, param1, 0); } -static void ov70_0225D658 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D658(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { ov70_0225D664(param0, param1, 1); } -static void ov70_0225D664 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1, int param2) +static void ov70_0225D664(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1, int param2) { switch (param0->unk_08) { case 0: ov66_022347B0(param0->unk_04, 0); ov66_02234850(param0->unk_04, 0); ov66_02234888(param0->unk_04, 2); - ov70_0225D220(¶m0->unk_0C.val3.unk_00, 0, ((16 * FX32_ONE)), 4); + ov70_0225D220(¶m0->unk_0C.val3.unk_00, 0, (16 * FX32_ONE), 4); { VecFx32 v0; @@ -1040,8 +1032,7 @@ static void ov70_0225D664 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 } param0->unk_0C.val3.unk_10 = 0; param0->unk_08++; - case 1: - { + case 1: { BOOL v1; VecFx32 v2; @@ -1085,8 +1076,7 @@ static void ov70_0225D664 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 param0->unk_08++; } - } - break; + } break; case 2: param0->unk_0C.val3.unk_10--; @@ -1115,7 +1105,7 @@ static void ov70_0225D664 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 } } -static void ov70_0225D81C (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D81C(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { switch (param0->unk_08) { case 0: @@ -1154,7 +1144,7 @@ static void ov70_0225D81C (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 } } -static void ov70_0225D8F8 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225CA20 * param1) +static void ov70_0225D8F8(UnkStruct_ov70_0225CC54 *param0, UnkStruct_ov70_0225CA20 *param1) { VecFx32 v0; @@ -1166,7 +1156,7 @@ static void ov70_0225D8F8 (UnkStruct_ov70_0225CC54 * param0, UnkStruct_ov70_0225 ov66_022347F8(param0->unk_04, &v0); } -static void ov70_0225D920 (UnkStruct_ov70_0225D93C * param0, UnkStruct_ov66_02234548 * param1, u32 param2) +static void ov70_0225D920(UnkStruct_ov70_0225D93C *param0, UnkStruct_ov66_02234548 *param1, u32 param2) { param0->unk_01 = param2; param0->unk_02 = param2; @@ -1178,7 +1168,7 @@ static void ov70_0225D920 (UnkStruct_ov70_0225D93C * param0, UnkStruct_ov66_0223 ov66_02234610(param1, param2); } -static void ov70_0225D93C (UnkStruct_ov70_0225D93C * param0, u32 param1) +static void ov70_0225D93C(UnkStruct_ov70_0225D93C *param0, u32 param1) { param0->unk_00 = 1; param0->unk_02 = param0->unk_01; @@ -1187,7 +1177,7 @@ static void ov70_0225D93C (UnkStruct_ov70_0225D93C * param0, u32 param1) param0->unk_06 = 60; } -static BOOL ov70_0225D954 (UnkStruct_ov70_0225D93C * param0, UnkStruct_ov66_02234548 * param1) +static BOOL ov70_0225D954(UnkStruct_ov70_0225D93C *param0, UnkStruct_ov66_02234548 *param1) { if (param0->unk_00 == 0) { return 1; diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 4112972552..da68ef8c9c 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -1,104 +1,100 @@ -#include "enums.h" +#include "overlay070/ov70_0225D9A4.h" +#include #include #include -#include - -#include "core_sys.h" #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "trainer_info.h" -#include "savedata.h" -#include "overlay066/struct_ov66_0222DFF8_decl.h" -#include "overlay066/struct_ov66_0222E71C_decl.h" -#include "overlay070/struct_ov70_0225C894_decl.h" -#include "overlay070/struct_ov70_0225CA20_decl.h" -#include "overlay070/struct_ov70_02260AD4_decl.h" -#include "overlay070/struct_ov70_02261E10_decl.h" -#include "overlay070/struct_ov70_022630A4_decl.h" -#include "overlay070/struct_ov70_02269204_decl.h" -#include "overlay070/struct_ov70_0226C6F8_decl.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" + #include "overlay005/struct_ov5_021DE5D0.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay065/struct_ov65_0222F6EC.h" +#include "overlay066/ov66_0222DDF0.h" +#include "overlay066/ov66_02231428.h" +#include "overlay066/ov66_022324F0.h" +#include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "overlay066/struct_ov66_0222E71C_decl.h" #include "overlay066/struct_ov66_02230914.h" #include "overlay066/struct_ov66_02230E68.h" +#include "overlay070/ov70_0225C858.h" +#include "overlay070/ov70_0225C9B4.h" +#include "overlay070/ov70_02260A70.h" +#include "overlay070/ov70_02261E10.h" +#include "overlay070/ov70_02262DA8.h" +#include "overlay070/ov70_022630A4.h" +#include "overlay070/ov70_02269190.h" +#include "overlay070/ov70_0226C60C.h" +#include "overlay070/struct_ov70_0225C894_decl.h" +#include "overlay070/struct_ov70_0225CA20_decl.h" +#include "overlay070/struct_ov70_02260AD4_decl.h" +#include "overlay070/struct_ov70_02261E10_decl.h" +#include "overlay070/struct_ov70_022630A4_decl.h" #include "overlay070/struct_ov70_02263910.h" +#include "overlay070/struct_ov70_02269204_decl.h" +#include "overlay070/struct_ov70_0226C6F8_decl.h" #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "enums.h" +#include "error_handling.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" +#include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "error_handling.h" -#include "strbuf.h" #include "unk_02023FCC.h" #include "unk_0202419C.h" #include "unk_02024220.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "pokemon.h" #include "unk_0207C908.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_02231428.h" -#include "overlay066/ov66_022324F0.h" -#include "overlay070/ov70_0225C858.h" -#include "overlay070/ov70_0225C9B4.h" -#include "overlay070/ov70_0225D9A4.h" -#include "overlay070/ov70_02260A70.h" -#include "overlay070/ov70_02261E10.h" -#include "overlay070/ov70_02262DA8.h" -#include "overlay070/ov70_022630A4.h" -#include "overlay070/ov70_02269190.h" -#include "overlay070/ov70_0226C60C.h" typedef struct { u16 unk_00; @@ -116,36 +112,36 @@ typedef struct { } UnkStruct_ov70_0226D844; typedef struct { - BGL * unk_00; - GraphicElementManager * unk_04; + BGL *unk_00; + GraphicElementManager *unk_04; UnkStruct_0200C738 unk_08; - UnkStruct_02009714 * unk_194[4]; - NNSG2dCellTransferState * unk_1A4; - GenericPointerData * unk_1A8; + UnkStruct_02009714 *unk_194[4]; + NNSG2dCellTransferState *unk_1A4; + GenericPointerData *unk_1A8; } UnkStruct_ov70_0225E4EC; typedef struct { Window unk_00; u32 unk_10; u32 unk_14; - Strbuf* unk_18; - void * unk_1C; + Strbuf *unk_18; + void *unk_1C; } UnkStruct_ov70_0225E9C8; typedef struct { UnkStruct_ov84_02240FA8 unk_00; Window unk_20; - BmpList * unk_30; - ResourceMetadata * unk_34; + BmpList *unk_30; + ResourceMetadata *unk_34; u16 unk_38; u16 unk_3A; BOOL unk_3C; - UnkStruct_02009DC8 * unk_40[4]; - GraphicElementData * unk_50[2]; + UnkStruct_02009DC8 *unk_40[4]; + GraphicElementData *unk_50[2]; } UnkStruct_ov70_0225EC20; typedef struct { - ResourceMetadata * unk_00; + ResourceMetadata *unk_00; UnkStruct_ov84_02240FA8 unk_04; } UnkStruct_ov70_0225F098; @@ -158,10 +154,10 @@ typedef struct { } UnkStruct_ov70_0225EFD4; typedef struct { - StringTemplate * unk_00; - MessageLoader * unk_04[4]; - Strbuf* unk_14; - Strbuf* unk_18; + StringTemplate *unk_00; + MessageLoader *unk_04[4]; + Strbuf *unk_14; + Strbuf *unk_18; } UnkStruct_ov70_0225F208; typedef struct { @@ -173,23 +169,23 @@ typedef struct { u16 unk_08; u16 unk_0A; Window unk_0C; - UnkStruct_02023FCC * unk_1C; - void * unk_20[3]; - NNSG2dScreenData * unk_2C[3]; + UnkStruct_02023FCC *unk_1C; + void *unk_20[3]; + NNSG2dScreenData *unk_2C[3]; } UnkStruct_ov70_02260744; typedef struct { u32 unk_00; Window unk_04[5]; - GraphicElementData * unk_54; - UnkStruct_02009DC8 * unk_58[4]; - GraphicElementData * unk_68; - UnkStruct_02009DC8 * unk_6C[4]; - GraphicElementData * unk_7C[12]; - UnkStruct_02009DC8 * unk_AC[4]; - UnkStruct_02009DC8 * unk_BC[12]; - UnkStruct_02009DC8 * unk_EC[4]; - UnkStruct_02009DC8 * unk_FC[4]; + GraphicElementData *unk_54; + UnkStruct_02009DC8 *unk_58[4]; + GraphicElementData *unk_68; + UnkStruct_02009DC8 *unk_6C[4]; + GraphicElementData *unk_7C[12]; + UnkStruct_02009DC8 *unk_AC[4]; + UnkStruct_02009DC8 *unk_BC[12]; + UnkStruct_02009DC8 *unk_EC[4]; + UnkStruct_02009DC8 *unk_FC[4]; } UnkStruct_ov70_0225FA84; typedef struct { @@ -201,7 +197,7 @@ typedef struct { u16 unk_06; UnkStruct_ov70_0225FA84 unk_08; UnkStruct_ov70_02260744 unk_114; - NARC * unk_14C; + NARC *unk_14C; u16 unk_150; u8 unk_152; u8 unk_153; @@ -226,8 +222,8 @@ typedef struct UnkStruct_ov70_0225DEE8_t { u8 unk_07; s32 unk_08; UnkStruct_ov70_0225DEE8_sub1 unk_0C; - UnkStruct_ov66_0222DFF8 * unk_34; - UnkStruct_ov70_02263910 * unk_38; + UnkStruct_ov66_0222DFF8 *unk_34; + UnkStruct_ov70_02263910 *unk_38; UnkStruct_ov70_0225E4EC unk_3C; UnkStruct_ov70_0225F350 unk_1E8; UnkStruct_ov70_0225F208 unk_340; @@ -237,135 +233,135 @@ typedef struct UnkStruct_ov70_0225DEE8_t { UnkStruct_ov70_0225F114 unk_3F4; UnkStruct_ov70_0225F098 unk_404; UnkStruct_ov70_0225EFD4 unk_428; - UnkStruct_ov70_02269204 * unk_438; + UnkStruct_ov70_02269204 *unk_438; BOOL unk_43C; - UnkStruct_ov70_0226C6F8 * unk_440; - UnkStruct_ov70_0225CA20 * unk_444; - UnkStruct_ov70_02261E10 * unk_448; - UnkStruct_ov70_0225C894 * unk_44C; - UnkStruct_ov70_02260AD4 * unk_450; - UnkStruct_ov70_022630A4 * unk_454; - TrainerInfo * unk_458; + UnkStruct_ov70_0226C6F8 *unk_440; + UnkStruct_ov70_0225CA20 *unk_444; + UnkStruct_ov70_02261E10 *unk_448; + UnkStruct_ov70_0225C894 *unk_44C; + UnkStruct_ov70_02260AD4 *unk_450; + UnkStruct_ov70_022630A4 *unk_454; + TrainerInfo *unk_458; } UnkStruct_ov70_0225DEE8; -static void ov70_0225E4C8(void * param0); -static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC * param0, SaveData * param1, u32 param2); -static void ov70_0225E6C0(UnkStruct_ov70_0225E4EC * param0); -static void ov70_0225E6D0(UnkStruct_ov70_0225E4EC * param0); -static void ov70_0225E740(UnkStruct_ov70_0225E4EC * param0); +static void ov70_0225E4C8(void *param0); +static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 param2); +static void ov70_0225E6C0(UnkStruct_ov70_0225E4EC *param0); +static void ov70_0225E6D0(UnkStruct_ov70_0225E4EC *param0); +static void ov70_0225E740(UnkStruct_ov70_0225E4EC *param0); static void ov70_0225E754(void); -static void ov70_0225E88C(UnkStruct_ov70_0225DEE8 * param0); -static void ov70_0225E92C(UnkStruct_ov70_0225DEE8 * param0); -static void ov70_0225E970(UnkStruct_ov70_0225DEE8 * param0); -static void ov70_0225E9C8(UnkStruct_ov70_0225E9C8 * param0, UnkStruct_ov70_0225E4EC * param1, SaveData * param2, u32 param3); -static void ov70_0225EA14(UnkStruct_ov70_0225E9C8 * param0); -static void ov70_0225EA44(UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1); -static void ov70_0225EAA4(UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1); -static void ov70_0225EB08(UnkStruct_ov70_0225E9C8 * param0); -static void ov70_0225EB24(UnkStruct_ov70_0225E9C8 * param0); -static void ov70_0225EB38(UnkStruct_ov70_0225E9C8 * param0); -static BOOL ov70_0225EB4C(const UnkStruct_ov70_0225E9C8 * param0); -static BOOL ov70_0225EB5C(const UnkStruct_ov70_0225E9C8 * param0); -static void ov70_0225EB74(UnkStruct_ov70_0225E9C8 * param0); -static void ov70_0225EBA8(UnkStruct_ov70_0225E9C8 * param0, UnkStruct_ov70_0225E4EC * param1, SaveData * param2, u32 param3); -static void ov70_0225EBBC(UnkStruct_ov70_0225E9C8 * param0); -static void ov70_0225EBC4(UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1); -static void ov70_0225EC20(UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2); -static void ov70_0225ED4C(UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225E4EC * param1); -static void ov70_0225EDA8(UnkStruct_ov70_0225EC20 * param0, u32 param1, u32 param2, u32 param3); -static void ov70_0225EDE0(UnkStruct_ov70_0225EC20 * param0); -static void ov70_0225EDF8(UnkStruct_ov70_0225EC20 * param0, const Strbuf *param1, u32 param2); -static const ResourceMetadata * ov70_0225EE04(const UnkStruct_ov70_0225EC20 * param0); -static BOOL ov70_0225EE08(const UnkStruct_ov70_0225EC20 * param0, u32 param1); -static void ov70_0225EE30(UnkStruct_ov70_0225EC20 * param0, const UnkStruct_ov84_02240FA8 * param1, UnkStruct_ov70_0225E4EC * param2, u16 param3, u16 param4, u32 param5, u8 param6, u8 param7, u8 param8); -static u32 ov70_0225EED8(UnkStruct_ov70_0225EC20 * param0); -static void ov70_0225EF14(UnkStruct_ov70_0225EC20 * param0, u16 * param1, u16 * param2); -static void ov70_0225EF58(BmpList * param0, u32 param1, u8 param2); -static void ov70_0225EF6C(UnkStruct_ov70_0225EC20 * param0, BOOL param1); -static void ov70_0225EF70(UnkStruct_ov70_0225EC20 * param0); -static void ov70_0225EFD4(UnkStruct_ov70_0225EFD4 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2); -static void ov70_0225EFD8(UnkStruct_ov70_0225EFD4 * param0); -static void ov70_0225EFE0(UnkStruct_ov70_0225EFD4 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, u8 param3, u8 param4, u8 param5, u8 param6); -static void ov70_0225F024(UnkStruct_ov70_0225EFD4 * param0); -static void ov70_0225F048(UnkStruct_ov70_0225EFD4 * param0, const Strbuf *param1, u8 param2, u8 param3); -static void ov70_0225F078(UnkStruct_ov70_0225EFD4 * param0, u16 param1, u16 param2, u16 param3, u16 param4); -static void ov70_0225F098(UnkStruct_ov70_0225F098 * param0, UnkStruct_ov70_0225F208 * param1, u32 param2); -static void ov70_0225F100(UnkStruct_ov70_0225F098 * param0); -static void ov70_0225F114(UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2); -static void ov70_0225F144(UnkStruct_ov70_0225F114 * param0); -static void ov70_0225F14C(UnkStruct_ov70_0225F114 * param0, const Strbuf *param1); -static void ov70_0225F184(UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1); -static void ov70_0225F1C0(UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1, int param2); -static void ov70_0225F1F0(UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1, int param2); -static void ov70_0225F208(UnkStruct_ov70_0225F208 * param0, u32 param1); -static void ov70_0225F25C(UnkStruct_ov70_0225F208 * param0); -static Strbuf* ov70_0225F288(UnkStruct_ov70_0225F208 * param0, int param1, u32 param2); -static void ov70_0225F2A8(UnkStruct_ov70_0225F208 * param0, u32 param1, u32 param2, u32 param3, int param4); -static void ov70_0225F2C8(UnkStruct_ov70_0225F208 * param0, const TrainerInfo * param1, u32 param2); -static void ov70_0225F2D8(UnkStruct_ov70_0225F208 * param0, enum PlazaMinigame param1, u32 param2); -static void ov70_0225F2E8(UnkStruct_ov70_0225F208 * param0, int param1, u32 param2); -static void ov70_0225F2F8(UnkStruct_ov70_0225F208 * param0, u32 param1, u32 param2); -static void ov70_0225F308(UnkStruct_ov70_0225F208 * param0, u32 param1, u32 param2); -static void ov70_0225F318(UnkStruct_ov70_0225F208 * param0, u32 param1, u32 param2, u32 param3); -static void ov70_0225F32C(UnkStruct_ov70_0225F208 * param0, u32 param1, u16 param2); -static void ov70_0225F338(UnkStruct_ov70_0225F208 * param0); -static void ov70_0225F344(UnkStruct_ov70_0225DEE8 * param0); -static void ov70_0225F350(UnkStruct_ov70_0225F350 * param0, const UnkStruct_ov70_02263910 * param1, UnkStruct_ov70_0225E4EC * param2, const TrainerInfo * param3, u32 param4); -static void ov70_0225F3E4(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225E4EC * param2); -static void ov70_0225F418(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225DEE8 * param1, BOOL param2, u32 param3); -static u32 ov70_0225F798(const UnkStruct_ov70_0225F350 * param0); -static void ov70_0225F79C(UnkStruct_ov70_0225F350 * param0, u32 param1, BOOL param2); -static void ov70_0225F7A8(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, u32 param3); -static void ov70_0225F7E0(UnkStruct_ov70_0225F350 * param0); -static void ov70_0225F7EC(UnkStruct_ov70_0225F350 * param0); -static u32 ov70_0225F7F8(const UnkStruct_ov70_0225F350 * param0); -static BOOL ov70_0225F7FC(const UnkStruct_ov70_0225F350 * param0); -static BOOL ov70_0225F814(const UnkStruct_ov70_0225F350 * param0); -static BOOL ov70_0225F828(const UnkStruct_ov70_0225F350 * param0); -static BOOL ov70_0225F834(const UnkStruct_ov70_0225F350 * param0); -static void ov70_0225F844(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225E4EC * param2, UnkStruct_ov70_0225F208 * param3, BOOL param4, u32 param5, const UnkStruct_ov66_0222E71C * param6, const UnkStruct_ov66_0222E71C * param7, BOOL param8, BOOL param9, const UnkStruct_ov66_02230914 * param10, BOOL param11); -static void ov70_0225F89C(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225E4EC * param2); -static void ov70_0225F8AC(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1, UnkStruct_ov70_0225F208 * param2, u32 param3, const UnkStruct_ov66_0222E71C * param4); -static void ov70_0225F8F0(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, u32 param3); -static void ov70_0225F920(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1); -static void ov70_0225F934(UnkStruct_ov70_0225F350 * param0, BOOL param1); -static void ov70_0225F940(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, u32 param3); -static void ov70_0225F95C(SysTask * param0, void * param1); -static void ov70_0225F9BC(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3, u32 param4); -static void ov70_0225FA10(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1); -static void ov70_0225FA14(UnkStruct_ov70_0225E4EC * param0, NARC * param1, u32 param2, u32 param3, u32 param4, u32 param5); -static void ov70_0225FA84(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3); -static void ov70_0225FAA8(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225E4EC * param2); -static void ov70_0225FACC(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E9C8 * param1); -static void ov70_0225FAD0(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225FA84 * param2, UnkStruct_ov70_0225E4EC * param3, UnkStruct_ov70_0225F208 * param4, BOOL param5, NARC * param6, u32 param7, const UnkStruct_ov66_0222E71C * param8, const UnkStruct_ov66_0222E71C * param9, BOOL param10, BOOL param11, const UnkStruct_ov66_02230914 * param12, BOOL param13); -static void ov70_0225FDA0(UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225FA84 * param1, UnkStruct_ov70_0225E4EC * param2, u32 param3, const UnkStruct_ov66_0222E71C * param4); -static void ov70_0225FE80(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225E4EC * param2); -static void ov70_0225FEC4(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3, u32 param4); -static BOOL ov70_0225FEEC(const UnkStruct_ov70_0225FA84 * param0); -static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3, u32 param4, BOOL param5); -static void ov70_02260048(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1); -static void ov70_02260080(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3, u32 param4); -static void ov70_02260228(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1); -static void ov70_02260268(NNSG2dPaletteData * param0); -static void ov70_022602C0(UnkStruct_ov70_0225FA84 * param0); -static void ov70_022602DC(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6); -static void ov70_02260314(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6); -static void ov70_02260360(UnkStruct_ov70_0225FA84 * param0, u32 param1); -static void ov70_02260370(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, const TrainerInfo * param2); -static void ov70_02260380(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, const UnkStruct_ov66_0222E71C * param2); -static void ov70_022603B0(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, const UnkStruct_ov66_02230914 * param2); -static void ov70_022603CC(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3, const UnkStruct_ov66_0222E71C * param4, const UnkStruct_ov66_0222E71C * param5); -static void ov70_0226068C(UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1); -static const UnkStruct_ov70_0226D844 * ov70_02260728(int param0, s32 param1, s32 param2, u32 param3); -static void ov70_02260744(UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3); -static void ov70_022607A8(UnkStruct_ov70_02260744 * param0); -static BOOL ov70_022607D4(UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3); -static void ov70_02260870(UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1, UnkStruct_ov70_0225F208 * param2, const UnkStruct_ov66_0222E71C * param3, NARC * param4, u32 param5); -static void ov70_02260930(UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, NARC * param3, u32 param4); -static void ov70_022609A8(UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1); -static void ov70_022609D4(UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, NARC * param3, u32 param4); -static void ov70_02260A50(u32 param0, u32 param1, void * param2); -static void ov70_02260A68(UnkStruct_ov70_02260744 * param0); +static void ov70_0225E88C(UnkStruct_ov70_0225DEE8 *param0); +static void ov70_0225E92C(UnkStruct_ov70_0225DEE8 *param0); +static void ov70_0225E970(UnkStruct_ov70_0225DEE8 *param0); +static void ov70_0225E9C8(UnkStruct_ov70_0225E9C8 *param0, UnkStruct_ov70_0225E4EC *param1, SaveData *param2, u32 param3); +static void ov70_0225EA14(UnkStruct_ov70_0225E9C8 *param0); +static void ov70_0225EA44(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1); +static void ov70_0225EAA4(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1); +static void ov70_0225EB08(UnkStruct_ov70_0225E9C8 *param0); +static void ov70_0225EB24(UnkStruct_ov70_0225E9C8 *param0); +static void ov70_0225EB38(UnkStruct_ov70_0225E9C8 *param0); +static BOOL ov70_0225EB4C(const UnkStruct_ov70_0225E9C8 *param0); +static BOOL ov70_0225EB5C(const UnkStruct_ov70_0225E9C8 *param0); +static void ov70_0225EB74(UnkStruct_ov70_0225E9C8 *param0); +static void ov70_0225EBA8(UnkStruct_ov70_0225E9C8 *param0, UnkStruct_ov70_0225E4EC *param1, SaveData *param2, u32 param3); +static void ov70_0225EBBC(UnkStruct_ov70_0225E9C8 *param0); +static void ov70_0225EBC4(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1); +static void ov70_0225EC20(UnkStruct_ov70_0225EC20 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2); +static void ov70_0225ED4C(UnkStruct_ov70_0225EC20 *param0, UnkStruct_ov70_0225E4EC *param1); +static void ov70_0225EDA8(UnkStruct_ov70_0225EC20 *param0, u32 param1, u32 param2, u32 param3); +static void ov70_0225EDE0(UnkStruct_ov70_0225EC20 *param0); +static void ov70_0225EDF8(UnkStruct_ov70_0225EC20 *param0, const Strbuf *param1, u32 param2); +static const ResourceMetadata *ov70_0225EE04(const UnkStruct_ov70_0225EC20 *param0); +static BOOL ov70_0225EE08(const UnkStruct_ov70_0225EC20 *param0, u32 param1); +static void ov70_0225EE30(UnkStruct_ov70_0225EC20 *param0, const UnkStruct_ov84_02240FA8 *param1, UnkStruct_ov70_0225E4EC *param2, u16 param3, u16 param4, u32 param5, u8 param6, u8 param7, u8 param8); +static u32 ov70_0225EED8(UnkStruct_ov70_0225EC20 *param0); +static void ov70_0225EF14(UnkStruct_ov70_0225EC20 *param0, u16 *param1, u16 *param2); +static void ov70_0225EF58(BmpList *param0, u32 param1, u8 param2); +static void ov70_0225EF6C(UnkStruct_ov70_0225EC20 *param0, BOOL param1); +static void ov70_0225EF70(UnkStruct_ov70_0225EC20 *param0); +static void ov70_0225EFD4(UnkStruct_ov70_0225EFD4 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2); +static void ov70_0225EFD8(UnkStruct_ov70_0225EFD4 *param0); +static void ov70_0225EFE0(UnkStruct_ov70_0225EFD4 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u8 param3, u8 param4, u8 param5, u8 param6); +static void ov70_0225F024(UnkStruct_ov70_0225EFD4 *param0); +static void ov70_0225F048(UnkStruct_ov70_0225EFD4 *param0, const Strbuf *param1, u8 param2, u8 param3); +static void ov70_0225F078(UnkStruct_ov70_0225EFD4 *param0, u16 param1, u16 param2, u16 param3, u16 param4); +static void ov70_0225F098(UnkStruct_ov70_0225F098 *param0, UnkStruct_ov70_0225F208 *param1, u32 param2); +static void ov70_0225F100(UnkStruct_ov70_0225F098 *param0); +static void ov70_0225F114(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2); +static void ov70_0225F144(UnkStruct_ov70_0225F114 *param0); +static void ov70_0225F14C(UnkStruct_ov70_0225F114 *param0, const Strbuf *param1); +static void ov70_0225F184(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225F208 *param1); +static void ov70_0225F1C0(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225F208 *param1, int param2); +static void ov70_0225F1F0(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225F208 *param1, int param2); +static void ov70_0225F208(UnkStruct_ov70_0225F208 *param0, u32 param1); +static void ov70_0225F25C(UnkStruct_ov70_0225F208 *param0); +static Strbuf *ov70_0225F288(UnkStruct_ov70_0225F208 *param0, int param1, u32 param2); +static void ov70_0225F2A8(UnkStruct_ov70_0225F208 *param0, u32 param1, u32 param2, u32 param3, int param4); +static void ov70_0225F2C8(UnkStruct_ov70_0225F208 *param0, const TrainerInfo *param1, u32 param2); +static void ov70_0225F2D8(UnkStruct_ov70_0225F208 *param0, enum PlazaMinigame param1, u32 param2); +static void ov70_0225F2E8(UnkStruct_ov70_0225F208 *param0, int param1, u32 param2); +static void ov70_0225F2F8(UnkStruct_ov70_0225F208 *param0, u32 param1, u32 param2); +static void ov70_0225F308(UnkStruct_ov70_0225F208 *param0, u32 param1, u32 param2); +static void ov70_0225F318(UnkStruct_ov70_0225F208 *param0, u32 param1, u32 param2, u32 param3); +static void ov70_0225F32C(UnkStruct_ov70_0225F208 *param0, u32 param1, u16 param2); +static void ov70_0225F338(UnkStruct_ov70_0225F208 *param0); +static void ov70_0225F344(UnkStruct_ov70_0225DEE8 *param0); +static void ov70_0225F350(UnkStruct_ov70_0225F350 *param0, const UnkStruct_ov70_02263910 *param1, UnkStruct_ov70_0225E4EC *param2, const TrainerInfo *param3, u32 param4); +static void ov70_0225F3E4(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2); +static void ov70_0225F418(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225DEE8 *param1, BOOL param2, u32 param3); +static u32 ov70_0225F798(const UnkStruct_ov70_0225F350 *param0); +static void ov70_0225F79C(UnkStruct_ov70_0225F350 *param0, u32 param1, BOOL param2); +static void ov70_0225F7A8(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3); +static void ov70_0225F7E0(UnkStruct_ov70_0225F350 *param0); +static void ov70_0225F7EC(UnkStruct_ov70_0225F350 *param0); +static u32 ov70_0225F7F8(const UnkStruct_ov70_0225F350 *param0); +static BOOL ov70_0225F7FC(const UnkStruct_ov70_0225F350 *param0); +static BOOL ov70_0225F814(const UnkStruct_ov70_0225F350 *param0); +static BOOL ov70_0225F828(const UnkStruct_ov70_0225F350 *param0); +static BOOL ov70_0225F834(const UnkStruct_ov70_0225F350 *param0); +static void ov70_0225F844(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2, UnkStruct_ov70_0225F208 *param3, BOOL param4, u32 param5, const UnkStruct_ov66_0222E71C *param6, const UnkStruct_ov66_0222E71C *param7, BOOL param8, BOOL param9, const UnkStruct_ov66_02230914 *param10, BOOL param11); +static void ov70_0225F89C(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2); +static void ov70_0225F8AC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, UnkStruct_ov70_0225F208 *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4); +static void ov70_0225F8F0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3); +static void ov70_0225F920(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1); +static void ov70_0225F934(UnkStruct_ov70_0225F350 *param0, BOOL param1); +static void ov70_0225F940(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3); +static void ov70_0225F95C(SysTask *param0, void *param1); +static void ov70_0225F9BC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4); +static void ov70_0225FA10(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1); +static void ov70_0225FA14(UnkStruct_ov70_0225E4EC *param0, NARC *param1, u32 param2, u32 param3, u32 param4, u32 param5); +static void ov70_0225FA84(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3); +static void ov70_0225FAA8(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2); +static void ov70_0225FACC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1); +static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225FA84 *param2, UnkStruct_ov70_0225E4EC *param3, UnkStruct_ov70_0225F208 *param4, BOOL param5, NARC *param6, u32 param7, const UnkStruct_ov66_0222E71C *param8, const UnkStruct_ov66_0222E71C *param9, BOOL param10, BOOL param11, const UnkStruct_ov66_02230914 *param12, BOOL param13); +static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA84 *param1, UnkStruct_ov70_0225E4EC *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4); +static void ov70_0225FE80(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2); +static void ov70_0225FEC4(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4); +static BOOL ov70_0225FEEC(const UnkStruct_ov70_0225FA84 *param0); +static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4, BOOL param5); +static void ov70_02260048(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1); +static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4); +static void ov70_02260228(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1); +static void ov70_02260268(NNSG2dPaletteData *param0); +static void ov70_022602C0(UnkStruct_ov70_0225FA84 *param0); +static void ov70_022602DC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6); +static void ov70_02260314(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6); +static void ov70_02260360(UnkStruct_ov70_0225FA84 *param0, u32 param1); +static void ov70_02260370(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, const TrainerInfo *param2); +static void ov70_02260380(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, const UnkStruct_ov66_0222E71C *param2); +static void ov70_022603B0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, const UnkStruct_ov66_02230914 *param2); +static void ov70_022603CC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4, const UnkStruct_ov66_0222E71C *param5); +static void ov70_0226068C(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1); +static const UnkStruct_ov70_0226D844 *ov70_02260728(int param0, s32 param1, s32 param2, u32 param3); +static void ov70_02260744(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3); +static void ov70_022607A8(UnkStruct_ov70_02260744 *param0); +static BOOL ov70_022607D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3); +static void ov70_02260870(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, UnkStruct_ov70_0225F208 *param2, const UnkStruct_ov66_0222E71C *param3, NARC *param4, u32 param5); +static void ov70_02260930(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 param4); +static void ov70_022609A8(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1); +static void ov70_022609D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 param4); +static void ov70_02260A50(u32 param0, u32 param1, void *param2); +static void ov70_02260A68(UnkStruct_ov70_02260744 *param0); static const u8 Unk_ov70_0226D580[2] = { 0x14, @@ -379,89 +375,89 @@ static const u16 Unk_ov70_0226D590[2] = { static const u16 Unk_ov70_0226D624[2][2][4] = { { - {0x2E4, 0x2E5, 0x2E6, 0x2E7}, - {0x2E8, 0x2E9, 0x2EA, 0x2EB} + { 0x2E4, 0x2E5, 0x2E6, 0x2E7 }, + { 0x2E8, 0x2E9, 0x2EA, 0x2EB }, }, { - {0x2EC, 0x2ED, 0x2EE, 0x2EF}, - {0x2F0, 0x2F1, 0x2F2, 0x2F3} - } + { 0x2EC, 0x2ED, 0x2EE, 0x2EF }, + { 0x2F0, 0x2F1, 0x2F2, 0x2F3 }, + }, }; static const UnkStruct_ov61_0222C884 Unk_ov70_0226D68C[5] = { - {0x6, 0x8, 0x2, 0x10, 0x4, 0x5, 0x140}, - {0x6, 0x1, 0x7, 0x1E, 0x6, 0x5, 0x180}, - {0x6, 0x1, 0xE, 0x13, 0x4, 0x5, 0x234}, - {0x6, 0x1, 0x13, 0x13, 0x4, 0x5, 0x280}, - {0x6, 0x0, 0xE, 0x16, 0x8, 0x5, 0x234} + { 0x6, 0x8, 0x2, 0x10, 0x4, 0x5, 0x140 }, + { 0x6, 0x1, 0x7, 0x1E, 0x6, 0x5, 0x180 }, + { 0x6, 0x1, 0xE, 0x13, 0x4, 0x5, 0x234 }, + { 0x6, 0x1, 0x13, 0x13, 0x4, 0x5, 0x280 }, + { 0x6, 0x0, 0xE, 0x16, 0x8, 0x5, 0x234 } }; static const UnkStruct_ov70_0226D724 Unk_ov70_0226D724[18] = { - {0x0, 0x0, 0x21, 0x23}, - {0x61, 0x1, 0x26, 0x24}, - {0x3, 0x3C, 0x26, 0x19}, - {0x5, 0x6, 0x2C, 0x20}, - {0xB, 0x18, 0x26, 0x2C}, - {0x1F, 0x39, 0x28, 0x28}, - {0x32, 0x30, 0x2C, 0x1A}, - {0x33, 0xE, 0x2C, 0x25}, - {0x3E, 0x20, 0x1D, 0x28}, - {0x46, 0x31, 0x2A, 0x2C}, - {0x6, 0x3, 0x27, 0x22}, - {0x7, 0xA, 0x28, 0x24}, - {0xD, 0x24, 0x26, 0x29}, - {0xE, 0x19, 0x24, 0x2A}, - {0x23, 0x55, 0x26, 0x26}, - {0x25, 0x23, 0x26, 0x27}, - {0x2A, 0x12, 0x26, 0x23}, - {0x3F, 0x21, 0x28, 0x2C} + { 0x0, 0x0, 0x21, 0x23 }, + { 0x61, 0x1, 0x26, 0x24 }, + { 0x3, 0x3C, 0x26, 0x19 }, + { 0x5, 0x6, 0x2C, 0x20 }, + { 0xB, 0x18, 0x26, 0x2C }, + { 0x1F, 0x39, 0x28, 0x28 }, + { 0x32, 0x30, 0x2C, 0x1A }, + { 0x33, 0xE, 0x2C, 0x25 }, + { 0x3E, 0x20, 0x1D, 0x28 }, + { 0x46, 0x31, 0x2A, 0x2C }, + { 0x6, 0x3, 0x27, 0x22 }, + { 0x7, 0xA, 0x28, 0x24 }, + { 0xD, 0x24, 0x26, 0x29 }, + { 0xE, 0x19, 0x24, 0x2A }, + { 0x23, 0x55, 0x26, 0x26 }, + { 0x25, 0x23, 0x26, 0x27 }, + { 0x2A, 0x12, 0x26, 0x23 }, + { 0x3F, 0x21, 0x28, 0x2C } }; static const UnkStruct_ov70_0226D844 Unk_ov70_0226D844[24] = { - {0x0, 0x0, 0x1, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x6, 0x4, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x1, 0x7, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x2, 0xA, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x6, 0xD, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x5, 0x10, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x3, 0x13, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x4, 0x16, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x0, 0x19, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x7, 0x1C, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x4, 0x1F, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x1, 0x22, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x5, 0x25, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x5, 0x28, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x2, 0x2B, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x0, 0x3, 0x2E, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x1, 0x0, 0x67, 0x0, 0x0}, - {0x1, 0x1, 0x6A, 0x0, 0x0}, - {0x1, 0x0, 0x6D, 0x0, 0x0}, - {0x1, 0x0, 0x76, 0x0, 0x0}, - {0x1, 0x1, 0x73, 0x0, 0x0}, - {0x1, 0x0, 0x70, 0x0, 0x0}, - {0x1, 0x1, 0x79, 0x0, 0x0}, - {0x1, 0x0, 0x7C, 0x0, 0x0} + { 0x0, 0x0, 0x1, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x6, 0x4, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x1, 0x7, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x2, 0xA, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x6, 0xD, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x5, 0x10, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x3, 0x13, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x4, 0x16, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x0, 0x19, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x7, 0x1C, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x4, 0x1F, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x1, 0x22, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x5, 0x25, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x5, 0x28, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x2, 0x2B, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x0, 0x3, 0x2E, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x1, 0x0, 0x67, 0x0, 0x0 }, + { 0x1, 0x1, 0x6A, 0x0, 0x0 }, + { 0x1, 0x0, 0x6D, 0x0, 0x0 }, + { 0x1, 0x0, 0x76, 0x0, 0x0 }, + { 0x1, 0x1, 0x73, 0x0, 0x0 }, + { 0x1, 0x0, 0x70, 0x0, 0x0 }, + { 0x1, 0x1, 0x79, 0x0, 0x0 }, + { 0x1, 0x0, 0x7C, 0x0, 0x0 } }; static const UnkStruct_ov70_0226D844 Unk_ov70_0226D5FC[2] = { - {0x2, 0x0, 0x32, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA}, - {0x3, 0x0, 0x36, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA} + { 0x2, 0x0, 0x32, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA }, + { 0x3, 0x0, 0x36, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFFA } }; static const VecFx32 Unk_ov70_0226D7B4[12] = { - {FX32_CONST(32), FX32_CONST(144) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(56), FX32_CONST(144) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(80), FX32_CONST(144) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(104), FX32_CONST(144) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(128), FX32_CONST(144) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(152), FX32_CONST(144) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(32), FX32_CONST(176) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(56), FX32_CONST(176) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(80), FX32_CONST(176) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(104), FX32_CONST(176) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(128), FX32_CONST(176) + (256 * FX32_ONE), 0x0}, - {FX32_CONST(152), FX32_CONST(176) + (256 * FX32_ONE), 0x0} + { FX32_CONST(32), FX32_CONST(144) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(56), FX32_CONST(144) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(80), FX32_CONST(144) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(104), FX32_CONST(144) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(128), FX32_CONST(144) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(152), FX32_CONST(144) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(32), FX32_CONST(176) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(56), FX32_CONST(176) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(80), FX32_CONST(176) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(104), FX32_CONST(176) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(128), FX32_CONST(176) + (256 * FX32_ONE), 0x0 }, + { FX32_CONST(152), FX32_CONST(176) + (256 * FX32_ONE), 0x0 } }; static const UnkStruct_ov61_0222C884 Unk_ov70_0226D5A4 = { @@ -526,7 +522,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov70_0226D6B4[4] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -541,7 +537,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov70_0226D6B4[4] = { 0x2, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -556,7 +552,7 @@ static const UnkStruct_ov97_0222DB78 Unk_ov70_0226D6B4[4] = { 0x1, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -571,8 +567,8 @@ static const UnkStruct_ov97_0222DB78 Unk_ov70_0226D6B4[4] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0, + }, }; static const UnkStruct_ov22_022559F8 Unk_ov70_0226D5DC = { @@ -604,10 +600,10 @@ static const UnkStruct_ov84_02240FA8 Unk_ov70_0226D644 = { NULL }; -int ov70_0225D9A4 (OverlayManager * param0, int * param1) +int ov70_0225D9A4(OverlayManager *param0, int *param1) { - UnkStruct_ov70_0225DEE8 * v0; - UnkStruct_ov66_02230E68 * v1; + UnkStruct_ov70_0225DEE8 *v0; + UnkStruct_ov66_02230E68 *v1; v1 = OverlayManager_Args(param0); @@ -651,7 +647,7 @@ int ov70_0225D9A4 (OverlayManager * param0, int * param1) ov70_0225F350(&v0->unk_1E8, v0->unk_38, &v0->unk_3C, v0->unk_458, 112); { - const UnkStruct_ov66_0222E71C * v3; + const UnkStruct_ov66_0222E71C *v3; v3 = ov66_0222E3BC(v0->unk_34); @@ -674,10 +670,10 @@ int ov70_0225D9A4 (OverlayManager * param0, int * param1) return 1; } -int ov70_0225DB90 (OverlayManager * param0, int * param1) +int ov70_0225DB90(OverlayManager *param0, int *param1) { - UnkStruct_ov70_0225DEE8 * v0; - UnkStruct_ov66_02230E68 * v1; + UnkStruct_ov70_0225DEE8 *v0; + UnkStruct_ov66_02230E68 *v1; BOOL v2; v0 = OverlayManager_Data(param0); @@ -721,8 +717,7 @@ int ov70_0225DB90 (OverlayManager * param0, int * param1) } } break; - case 3: - { + case 3: { ov70_0225EB74(&v0->unk_35C); ov70_0225EF14(&v0->unk_39C, NULL, NULL); ov70_0225F024(&v0->unk_428); @@ -736,15 +731,13 @@ int ov70_0225DB90 (OverlayManager * param0, int * param1) ov70_0225F1F0(&v0->unk_3F4, &v0->unk_340, ov66_0222DFF8(v0->unk_34)); } (*param1) = 4; - } - break; + } break; case 4: if (gCoreSys.pressedKeys & PAD_BUTTON_A) { (*param1) = 7; } break; - case 5: - { + case 5: { ov70_0225EB74(&v0->unk_35C); ov70_0225EF14(&v0->unk_39C, NULL, NULL); ov70_0225F024(&v0->unk_428); @@ -752,8 +745,7 @@ int ov70_0225DB90 (OverlayManager * param0, int * param1) ov70_0225EA44(&v0->unk_35C, ov70_0225F288(&v0->unk_340, 1, 70)); (*param1) = 6; v0->unk_08 = 60; - } - break; + } break; case 6: if (ov70_0225EB5C(&v0->unk_35C)) { v0->unk_08--; @@ -763,8 +755,7 @@ int ov70_0225DB90 (OverlayManager * param0, int * param1) } } break; - case 7: - { + case 7: { u32 v3; v3 = ov70_0225F798(&v0->unk_1E8); @@ -782,8 +773,7 @@ int ov70_0225DB90 (OverlayManager * param0, int * param1) (*param1)++; break; } - } - break; + } break; case 8: v2 = ScreenWipe_Done(); @@ -800,10 +790,10 @@ int ov70_0225DB90 (OverlayManager * param0, int * param1) return 0; } -int ov70_0225DDF8 (OverlayManager * param0, int * param1) +int ov70_0225DDF8(OverlayManager *param0, int *param1) { - UnkStruct_ov70_0225DEE8 * v0; - UnkStruct_ov66_02230E68 * v1; + UnkStruct_ov70_0225DEE8 *v0; + UnkStruct_ov66_02230E68 *v1; v0 = OverlayManager_Data(param0); v1 = OverlayManager_Args(param0); @@ -841,229 +831,229 @@ int ov70_0225DDF8 (OverlayManager * param0, int * param1) return 1; } -UnkStruct_ov66_0222DFF8 * ov70_0225DEE8 (UnkStruct_ov70_0225DEE8 * param0) +UnkStruct_ov66_0222DFF8 *ov70_0225DEE8(UnkStruct_ov70_0225DEE8 *param0) { return param0->unk_34; } -UnkStruct_ov70_02263910 * ov70_0225DEEC (UnkStruct_ov70_0225DEE8 * param0) +UnkStruct_ov70_02263910 *ov70_0225DEEC(UnkStruct_ov70_0225DEE8 *param0) { return param0->unk_38; } -UnkStruct_ov70_0225CA20 * ov70_0225DEF0 (UnkStruct_ov70_0225DEE8 * param0) +UnkStruct_ov70_0225CA20 *ov70_0225DEF0(UnkStruct_ov70_0225DEE8 *param0) { return param0->unk_444; } -UnkStruct_ov70_02261E10 * ov70_0225DEF8 (UnkStruct_ov70_0225DEE8 * param0) +UnkStruct_ov70_02261E10 *ov70_0225DEF8(UnkStruct_ov70_0225DEE8 *param0) { return param0->unk_448; } -UnkStruct_ov70_0225C894 * ov70_0225DF00 (UnkStruct_ov70_0225DEE8 * param0) +UnkStruct_ov70_0225C894 *ov70_0225DF00(UnkStruct_ov70_0225DEE8 *param0) { return param0->unk_44C; } -UnkStruct_ov70_02260AD4 * ov70_0225DF08 (UnkStruct_ov70_0225DEE8 * param0) +UnkStruct_ov70_02260AD4 *ov70_0225DF08(UnkStruct_ov70_0225DEE8 *param0) { return param0->unk_450; } -UnkStruct_ov70_022630A4 * ov70_0225DF10 (UnkStruct_ov70_0225DEE8 * param0) +UnkStruct_ov70_022630A4 *ov70_0225DF10(UnkStruct_ov70_0225DEE8 *param0) { return param0->unk_454; } -void ov70_0225DF18 (UnkStruct_ov70_0225DEE8 * param0, BOOL param1) +void ov70_0225DF18(UnkStruct_ov70_0225DEE8 *param0, BOOL param1) { param0->unk_04_0 = param1; } -u32 ov70_0225DF2C (const UnkStruct_ov70_0225DEE8 * param0) +u32 ov70_0225DF2C(const UnkStruct_ov70_0225DEE8 *param0) { return param0->unk_02; } -BOOL ov70_0225DF30 (const UnkStruct_ov70_0225DEE8 * param0) +BOOL ov70_0225DF30(const UnkStruct_ov70_0225DEE8 *param0) { return param0->unk_03; } -void ov70_0225DF34 (UnkStruct_ov70_0225DEE8 * param0, BOOL param1) +void ov70_0225DF34(UnkStruct_ov70_0225DEE8 *param0, BOOL param1) { param0->unk_00 = param1; } -void ov70_0225DF38 (UnkStruct_ov70_0225DEE8 * param0, u8 param1) +void ov70_0225DF38(UnkStruct_ov70_0225DEE8 *param0, u8 param1) { param0->unk_01 = param1; } -void ov70_0225DF3C (UnkStruct_ov70_0225DEE8 * param0, u8 param1) +void ov70_0225DF3C(UnkStruct_ov70_0225DEE8 *param0, u8 param1) { param0->unk_05 = param1; } -u8 ov70_0225DF40 (const UnkStruct_ov70_0225DEE8 * param0) +u8 ov70_0225DF40(const UnkStruct_ov70_0225DEE8 *param0) { return param0->unk_05; } -void ov70_0225DF44 (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225DF44(UnkStruct_ov70_0225DEE8 *param0) { param0->unk_07 = 1; } -void ov70_0225DF4C (UnkStruct_ov70_0225DEE8 * param0, u8 param1, BOOL param2) +void ov70_0225DF4C(UnkStruct_ov70_0225DEE8 *param0, u8 param1, BOOL param2) { GF_ASSERT(param1 < 20); param0->unk_0C.unk_00[param1] = param2; } -BOOL ov70_0225DF64 (const UnkStruct_ov70_0225DEE8 * param0, u8 param1) +BOOL ov70_0225DF64(const UnkStruct_ov70_0225DEE8 *param0, u8 param1) { return param0->unk_0C.unk_00[param1]; } -void ov70_0225DF6C (UnkStruct_ov70_0225DEE8 * param0, u8 param1, BOOL param2) +void ov70_0225DF6C(UnkStruct_ov70_0225DEE8 *param0, u8 param1, BOOL param2) { GF_ASSERT(param1 < 20); param0->unk_0C.unk_14[param1] = param2; } -BOOL ov70_0225DF84 (const UnkStruct_ov70_0225DEE8 * param0, u8 param1) +BOOL ov70_0225DF84(const UnkStruct_ov70_0225DEE8 *param0, u8 param1) { return param0->unk_0C.unk_14[param1]; } -void ov70_0225DF8C (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1) +void ov70_0225DF8C(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1) { ov70_0225EA44(¶m0->unk_35C, param1); } -void ov70_0225DF9C (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1) +void ov70_0225DF9C(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1) { ov70_0225EAA4(¶m0->unk_35C, param1); } -BOOL ov70_0225DFAC (const UnkStruct_ov70_0225DEE8 * param0) +BOOL ov70_0225DFAC(const UnkStruct_ov70_0225DEE8 *param0) { return ov70_0225EB5C(¶m0->unk_35C); } -void ov70_0225DFBC (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225DFBC(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225EB08(¶m0->unk_35C); } -void ov70_0225DFCC (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225DFCC(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225EB24(¶m0->unk_35C); } -BOOL ov70_0225DFDC (const UnkStruct_ov70_0225DEE8 * param0) +BOOL ov70_0225DFDC(const UnkStruct_ov70_0225DEE8 *param0) { return ov70_0225EB4C(¶m0->unk_35C); } -void ov70_0225DFEC (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225DFEC(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225EB74(¶m0->unk_35C); } -void ov70_0225DFFC (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1) +void ov70_0225DFFC(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1) { ov70_0225EBC4(¶m0->unk_37C, param1); } -void ov70_0225E00C (UnkStruct_ov70_0225DEE8 * param0, u32 param1) +void ov70_0225E00C(UnkStruct_ov70_0225DEE8 *param0, u32 param1) { ov70_0225EDA8(¶m0->unk_39C, param1, 113, 0); } -void ov70_0225E020 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +void ov70_0225E020(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { ov70_0225EDA8(¶m0->unk_39C, param1, 113, param2); } -void ov70_0225E034 (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225E034(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225EDE0(¶m0->unk_39C); } -void ov70_0225E044 (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1, u32 param2) +void ov70_0225E044(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1, u32 param2) { ov70_0225EDF8(¶m0->unk_39C, param1, param2); } -const ResourceMetadata * ov70_0225E054 (const UnkStruct_ov70_0225DEE8 * param0) +const ResourceMetadata *ov70_0225E054(const UnkStruct_ov70_0225DEE8 *param0) { return ov70_0225EE04(¶m0->unk_39C); } -BOOL ov70_0225E064 (const UnkStruct_ov70_0225DEE8 * param0, u32 param1) +BOOL ov70_0225E064(const UnkStruct_ov70_0225DEE8 *param0, u32 param1) { return ov70_0225EE08(¶m0->unk_39C, param1); } -void ov70_0225E074 (UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_ov84_02240FA8 * param1, u16 param2, u16 param3) +void ov70_0225E074(UnkStruct_ov70_0225DEE8 *param0, const UnkStruct_ov84_02240FA8 *param1, u16 param2, u16 param3) { ov70_0225EE30(¶m0->unk_39C, param1, ¶m0->unk_3C, param2, param3, 112, 16, 3, 15); } -extern void ov70_0225E0A4 (UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_ov84_02240FA8 * param1, u16 param2, u16 param3, u8 param4, u8 param5, u8 param6) +extern void ov70_0225E0A4(UnkStruct_ov70_0225DEE8 *param0, const UnkStruct_ov84_02240FA8 *param1, u16 param2, u16 param3, u8 param4, u8 param5, u8 param6) { ov70_0225EE30(¶m0->unk_39C, param1, ¶m0->unk_3C, param2, param3, 112, param4, param5, param6); } -u32 ov70_0225E0D4 (UnkStruct_ov70_0225DEE8 * param0) +u32 ov70_0225E0D4(UnkStruct_ov70_0225DEE8 *param0) { return ov70_0225EED8(¶m0->unk_39C); } -void ov70_0225E0E4 (UnkStruct_ov70_0225DEE8 * param0, u16 * param1, u16 * param2) +void ov70_0225E0E4(UnkStruct_ov70_0225DEE8 *param0, u16 *param1, u16 *param2) { ov70_0225EF14(¶m0->unk_39C, param1, param2); } -void ov70_0225E0F4 (UnkStruct_ov70_0225DEE8 * param0, BOOL param1) +void ov70_0225E0F4(UnkStruct_ov70_0225DEE8 *param0, BOOL param1) { ov70_0225EF6C(¶m0->unk_39C, param1); } -void ov70_0225E104 (UnkStruct_ov70_0225DEE8 * param0, u8 param1, u8 param2, u8 param3, u8 param4) +void ov70_0225E104(UnkStruct_ov70_0225DEE8 *param0, u8 param1, u8 param2, u8 param3, u8 param4) { ov70_0225EFE0(¶m0->unk_428, ¶m0->unk_3C, 112, param1, param2, param3, param4); } -void ov70_0225E12C (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225E12C(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225F024(¶m0->unk_428); } -void ov70_0225E13C (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1, u8 param2, u8 param3) +void ov70_0225E13C(UnkStruct_ov70_0225DEE8 *param0, const Strbuf *param1, u8 param2, u8 param3) { ov70_0225F048(¶m0->unk_428, param1, param2, param3); } -void ov70_0225E14C (UnkStruct_ov70_0225DEE8 * param0, u16 param1, u16 param2, u16 param3, u16 param4) +void ov70_0225E14C(UnkStruct_ov70_0225DEE8 *param0, u16 param1, u16 param2, u16 param3, u16 param4) { ov70_0225F078(¶m0->unk_428, param1, param2, param3, param4); } -void ov70_0225E164 (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225E164(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225EE30(¶m0->unk_39C, ¶m0->unk_404.unk_04, ¶m0->unk_3C, 0, 0, 112, 25, 13, 6); } -void ov70_0225E194 (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225E194(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225EE30(¶m0->unk_39C, ¶m0->unk_404.unk_04, ¶m0->unk_3C, 0, 1, 112, 25, 13, 6); } -int ov70_0225E1C4 (UnkStruct_ov70_0225DEE8 * param0) +int ov70_0225E1C4(UnkStruct_ov70_0225DEE8 *param0) { u32 v0; @@ -1083,25 +1073,25 @@ int ov70_0225E1C4 (UnkStruct_ov70_0225DEE8 * param0) return 2; } -void ov70_0225E1F8 (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225E1F8(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225EF14(¶m0->unk_39C, NULL, NULL); } -Strbuf* ov70_0225E20C (UnkStruct_ov70_0225DEE8 * param0, int param1, u32 param2) +Strbuf *ov70_0225E20C(UnkStruct_ov70_0225DEE8 *param0, int param1, u32 param2) { return ov70_0225F288(¶m0->unk_340, param1, param2); } -void ov70_0225E21C (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2, u32 param3, int param4) +void ov70_0225E21C(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2, u32 param3, int param4) { ov70_0225F2A8(¶m0->unk_340, param1, param2, param3, param4); } -void ov70_0225E234 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +void ov70_0225E234(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { - TrainerInfo * v0; - const UnkStruct_ov66_0222E71C * v1; + TrainerInfo *v0; + const UnkStruct_ov66_0222E71C *v1; v0 = TrainerInfo_New(112); @@ -1116,58 +1106,58 @@ void ov70_0225E234 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) Heap_FreeToHeap(v0); } -void ov70_0225E27C (UnkStruct_ov70_0225DEE8 * param0, enum PlazaMinigame param1, u32 param2) +void ov70_0225E27C(UnkStruct_ov70_0225DEE8 *param0, enum PlazaMinigame param1, u32 param2) { ov70_0225F2D8(¶m0->unk_340, param1, param2); } -void ov70_0225E28C (UnkStruct_ov70_0225DEE8 * param0, int param1, u32 param2) +void ov70_0225E28C(UnkStruct_ov70_0225DEE8 *param0, int param1, u32 param2) { ov70_0225F2E8(¶m0->unk_340, param1, param2); } -void ov70_0225E29C (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +void ov70_0225E29C(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { ov70_0225F2F8(¶m0->unk_340, param1, param2); } -void ov70_0225E2AC (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +void ov70_0225E2AC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { StringTemplate_SetJPGreeting(param0->unk_340.unk_00, param1, param2); } -void ov70_0225E2BC (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +void ov70_0225E2BC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { StringTemplate_SetENGreeting(param0->unk_340.unk_00, param1, param2); } -void ov70_0225E2CC (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +void ov70_0225E2CC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { StringTemplate_SetFRGreeting(param0->unk_340.unk_00, param1, param2); } -void ov70_0225E2DC (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +void ov70_0225E2DC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { StringTemplate_SetITGreeting(param0->unk_340.unk_00, param1, param2); } -void ov70_0225E2EC (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +void ov70_0225E2EC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { StringTemplate_SetDEGreeting(param0->unk_340.unk_00, param1, param2); } -void ov70_0225E2FC (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +void ov70_0225E2FC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { StringTemplate_SetESGreeting(param0->unk_340.unk_00, param1, param2); } -void ov70_0225E30C (UnkStruct_ov70_0225DEE8 * param0, u32 param1, int param2) +void ov70_0225E30C(UnkStruct_ov70_0225DEE8 *param0, u32 param1, int param2) { param2 = ov66_022316E8(param2); StringTemplate_SetPokemonTypeName(param0->unk_340.unk_00, param1, param2); } -void ov70_0225E328 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, BOOL param2) +void ov70_0225E328(UnkStruct_ov70_0225DEE8 *param0, u32 param1, BOOL param2) { if ((ov70_0225F7F8(¶m0->unk_1E8) == param1) && (ov70_0225F7FC(¶m0->unk_1E8) == 1) && (ov70_0225F834(¶m0->unk_1E8) == 0) && (ov70_0225F828(¶m0->unk_1E8) == param2)) { return; @@ -1176,17 +1166,17 @@ void ov70_0225E328 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, BOOL param2) ov70_0225F79C(¶m0->unk_1E8, param1, param2); } -void ov70_0225E378 (UnkStruct_ov70_0225DEE8 * param0, u32 param1) +void ov70_0225E378(UnkStruct_ov70_0225DEE8 *param0, u32 param1) { ov70_0225F7A8(¶m0->unk_1E8, ¶m0->unk_3C, param1, 112); } -void ov70_0225E390 (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225E390(UnkStruct_ov70_0225DEE8 *param0) { - const UnkStruct_ov66_0222E71C * v0; + const UnkStruct_ov66_0222E71C *v0; u32 v1; - if ((ov70_0225F7FC(¶m0->unk_1E8) == 0)) { + if (ov70_0225F7FC(¶m0->unk_1E8) == 0) { return; } @@ -1196,52 +1186,52 @@ void ov70_0225E390 (UnkStruct_ov70_0225DEE8 * param0) ov70_0225FDA0(¶m0->unk_1E8, ¶m0->unk_1E8.unk_08, ¶m0->unk_3C, 112, v0); } -void ov70_0225E3D0 (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225E3D0(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225F7E0(¶m0->unk_1E8); } -u32 ov70_0225E3E0 (const UnkStruct_ov70_0225DEE8 * param0) +u32 ov70_0225E3E0(const UnkStruct_ov70_0225DEE8 *param0) { return ov70_0225F7F8(¶m0->unk_1E8); } -BOOL ov70_0225E3F0 (const UnkStruct_ov70_0225DEE8 * param0) +BOOL ov70_0225E3F0(const UnkStruct_ov70_0225DEE8 *param0) { return ov70_0225F7FC(¶m0->unk_1E8); } -BOOL ov70_0225E400 (const UnkStruct_ov70_0225DEE8 * param0) +BOOL ov70_0225E400(const UnkStruct_ov70_0225DEE8 *param0) { return ov70_0225F814(¶m0->unk_1E8); } -void ov70_0225E410 (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225E410(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225F7EC(¶m0->unk_1E8); } -BOOL ov70_0225E420 (const UnkStruct_ov70_0225DEE8 * param0, u32 param1) +BOOL ov70_0225E420(const UnkStruct_ov70_0225DEE8 *param0, u32 param1) { return ov70_0226C810(param0->unk_440, param1, 1); } -void ov70_0225E430 (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225E430(UnkStruct_ov70_0225DEE8 *param0) { param0->unk_1E8.unk_06 = 1; } -void ov70_0225E43C (UnkStruct_ov70_0225DEE8 * param0, BOOL param1) +void ov70_0225E43C(UnkStruct_ov70_0225DEE8 *param0, BOOL param1) { ov70_0225F934(¶m0->unk_1E8, param1); } -void ov70_0225E44C (UnkStruct_ov70_0225DEE8 * param0) +void ov70_0225E44C(UnkStruct_ov70_0225DEE8 *param0) { ov70_02260A68(¶m0->unk_1E8.unk_114); } -BOOL ov70_0225E45C (UnkStruct_ov70_0225DEE8 * param0) +BOOL ov70_0225E45C(UnkStruct_ov70_0225DEE8 *param0) { BOOL v0; @@ -1251,9 +1241,9 @@ BOOL ov70_0225E45C (UnkStruct_ov70_0225DEE8 * param0) return v0; } -void ov70_0225E46C (UnkStruct_ov70_0225DEE8 * param0, u32 param1) +void ov70_0225E46C(UnkStruct_ov70_0225DEE8 *param0, u32 param1) { - const UnkStruct_ov66_0222E71C * v0; + const UnkStruct_ov66_0222E71C *v0; u32 v1; GF_ASSERT(param1 < 20); @@ -1268,22 +1258,22 @@ void ov70_0225E46C (UnkStruct_ov70_0225DEE8 * param0, u32 param1) } } -BOOL ov70_0225E4AC (const UnkStruct_ov70_0225DEE8 * param0, u32 param1) +BOOL ov70_0225E4AC(const UnkStruct_ov70_0225DEE8 *param0, u32 param1) { GF_ASSERT(param1 < 20); return ov70_02269298(param0->unk_438, param1); } -static void ov70_0225E4C8 (void * param0) +static void ov70_0225E4C8(void *param0) { - UnkStruct_ov70_0225DEE8 * v0 = param0; + UnkStruct_ov70_0225DEE8 *v0 = param0; ov70_022622A4(v0->unk_448); ov70_0225CAE0(v0->unk_444); ov70_0225E740(&v0->unk_3C); } -static void ov70_0225E4EC (UnkStruct_ov70_0225E4EC * param0, SaveData * param1, u32 param2) +static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32 param2) { G2_BlendNone(); G2S_BlendNone(); @@ -1311,7 +1301,7 @@ static void ov70_0225E4EC (UnkStruct_ov70_0225E4EC * param0, SaveData * param1, } { - Options * v1; + Options *v1; u8 v2; v1 = SaveData_Options(param1); @@ -1361,13 +1351,13 @@ static void ov70_0225E4EC (UnkStruct_ov70_0225E4EC * param0, SaveData * param1, } } -static void ov70_0225E6C0 (UnkStruct_ov70_0225E4EC * param0) +static void ov70_0225E6C0(UnkStruct_ov70_0225E4EC *param0) { sub_020219F8(param0->unk_04); sub_0201DCE8(); } -static void ov70_0225E6D0 (UnkStruct_ov70_0225E4EC * param0) +static void ov70_0225E6D0(UnkStruct_ov70_0225E4EC *param0) { sub_0201DC3C(); @@ -1402,14 +1392,14 @@ static void ov70_0225E6D0 (UnkStruct_ov70_0225E4EC * param0) } } -static void ov70_0225E740 (UnkStruct_ov70_0225E4EC * param0) +static void ov70_0225E740(UnkStruct_ov70_0225E4EC *param0) { sub_0201C2B8(param0->unk_00); sub_0200A858(); sub_0201DCAC(); } -static void ov70_0225E754 (void) +static void ov70_0225E754(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -1454,7 +1444,7 @@ static void ov70_0225E754 (void) } } -static void ov70_0225E88C (UnkStruct_ov70_0225DEE8 * param0) +static void ov70_0225E88C(UnkStruct_ov70_0225DEE8 *param0) { ov70_0225CA44(param0->unk_444); @@ -1493,7 +1483,7 @@ static void ov70_0225E88C (UnkStruct_ov70_0225DEE8 * param0) ov70_02269220(param0->unk_438); } -static void ov70_0225E92C (UnkStruct_ov70_0225DEE8 * param0) +static void ov70_0225E92C(UnkStruct_ov70_0225DEE8 *param0) { MtxFx44 v0; @@ -1509,7 +1499,7 @@ static void ov70_0225E92C (UnkStruct_ov70_0225DEE8 * param0) ov70_0225E6C0(¶m0->unk_3C); } -static void ov70_0225E970 (UnkStruct_ov70_0225DEE8 * param0) +static void ov70_0225E970(UnkStruct_ov70_0225DEE8 *param0) { int v0; BOOL v1; @@ -1538,22 +1528,22 @@ static void ov70_0225E970 (UnkStruct_ov70_0225DEE8 * param0) } } -static void ov70_0225E9C8 (UnkStruct_ov70_0225E9C8 * param0, UnkStruct_ov70_0225E4EC * param1, SaveData * param2, u32 param3) +static void ov70_0225E9C8(UnkStruct_ov70_0225E9C8 *param0, UnkStruct_ov70_0225E4EC *param1, SaveData *param2, u32 param3) { - BGL_AddWindow(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], 2, 19, 27, 4, 4, ((((1 + (18 + 12)) + ((18 + 12) + 24)) + 9))); + BGL_AddWindow(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], 2, 19, 27, 4, 4, (((1 + (18 + 12)) + ((18 + 12) + 24)) + 9)); BGL_FillWindow(¶m0->unk_00, 15); param0->unk_18 = Strbuf_Init(384, param3); { - Options * v0; + Options *v0; v0 = SaveData_Options(param2); param0->unk_14 = Options_TextFrameDelay(v0); } } -static void ov70_0225EA14 (UnkStruct_ov70_0225E9C8 * param0) +static void ov70_0225EA14(UnkStruct_ov70_0225E9C8 *param0) { if (Message_Printing(param0->unk_10)) { PrintString_ForceStop(param0->unk_10); @@ -1565,7 +1555,7 @@ static void ov70_0225EA14 (UnkStruct_ov70_0225E9C8 * param0) BGL_DeleteWindow(¶m0->unk_00); } -static void ov70_0225EA44 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1) +static void ov70_0225EA44(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1) { if (Message_Printing(param0->unk_10)) { PrintString_ForceStop(param0->unk_10); @@ -1579,7 +1569,7 @@ static void ov70_0225EA44 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param sub_0200E060(¶m0->unk_00, 1, 1, 1); } -static void ov70_0225EAA4 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1) +static void ov70_0225EAA4(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1) { if (Message_Printing(param0->unk_10)) { PrintString_ForceStop(param0->unk_10); @@ -1592,13 +1582,13 @@ static void ov70_0225EAA4 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param sub_0201A9A4(¶m0->unk_00); } -static void ov70_0225EB08 (UnkStruct_ov70_0225E9C8 * param0) +static void ov70_0225EB08(UnkStruct_ov70_0225E9C8 *param0) { GF_ASSERT(param0->unk_1C == NULL); param0->unk_1C = sub_0200E7FC(¶m0->unk_00, 1); } -static void ov70_0225EB24 (UnkStruct_ov70_0225E9C8 * param0) +static void ov70_0225EB24(UnkStruct_ov70_0225E9C8 *param0) { if (param0->unk_1C != NULL) { DeleteWaitDial(param0->unk_1C); @@ -1606,7 +1596,7 @@ static void ov70_0225EB24 (UnkStruct_ov70_0225E9C8 * param0) } } -static void ov70_0225EB38 (UnkStruct_ov70_0225E9C8 * param0) +static void ov70_0225EB38(UnkStruct_ov70_0225E9C8 *param0) { if (param0->unk_1C != NULL) { sub_0200EBC8(param0->unk_1C); @@ -1614,7 +1604,7 @@ static void ov70_0225EB38 (UnkStruct_ov70_0225E9C8 * param0) } } -static BOOL ov70_0225EB4C (const UnkStruct_ov70_0225E9C8 * param0) +static BOOL ov70_0225EB4C(const UnkStruct_ov70_0225E9C8 *param0) { if (param0->unk_1C != NULL) { return 1; @@ -1623,7 +1613,7 @@ static BOOL ov70_0225EB4C (const UnkStruct_ov70_0225E9C8 * param0) return 0; } -static BOOL ov70_0225EB5C (const UnkStruct_ov70_0225E9C8 * param0) +static BOOL ov70_0225EB5C(const UnkStruct_ov70_0225E9C8 *param0) { if (Message_Printing(param0->unk_10) == 0) { return 1; @@ -1632,7 +1622,7 @@ static BOOL ov70_0225EB5C (const UnkStruct_ov70_0225E9C8 * param0) return 0; } -static void ov70_0225EB74 (UnkStruct_ov70_0225E9C8 * param0) +static void ov70_0225EB74(UnkStruct_ov70_0225E9C8 *param0) { if (Message_Printing(param0->unk_10)) { PrintString_ForceStop(param0->unk_10); @@ -1644,18 +1634,18 @@ static void ov70_0225EB74 (UnkStruct_ov70_0225E9C8 * param0) sub_0201AD10(¶m0->unk_00); } -static void ov70_0225EBA8 (UnkStruct_ov70_0225E9C8 * param0, UnkStruct_ov70_0225E4EC * param1, SaveData * param2, u32 param3) +static void ov70_0225EBA8(UnkStruct_ov70_0225E9C8 *param0, UnkStruct_ov70_0225E4EC *param1, SaveData *param2, u32 param3) { ov70_0225E9C8(param0, param1, param2, param3); sub_0201C2B4(¶m0->unk_00, 2); } -static void ov70_0225EBBC (UnkStruct_ov70_0225E9C8 * param0) +static void ov70_0225EBBC(UnkStruct_ov70_0225E9C8 *param0) { ov70_0225EA14(param0); } -static void ov70_0225EBC4 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param1) +static void ov70_0225EBC4(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1) { if (Message_Printing(param0->unk_10)) { PrintString_ForceStop(param0->unk_10); @@ -1669,12 +1659,12 @@ static void ov70_0225EBC4 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param sub_0200E69C(¶m0->unk_00, 1, (1 + (18 + 12)), 2, 3); } -static void ov70_0225EC20 (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2) +static void ov70_0225EC20(UnkStruct_ov70_0225EC20 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; int v2; - NARC * v3 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2); + NARC *v3 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2); param0->unk_40[0] = sub_02009A4C(param1->unk_194[0], v3, 4, 0, 5000, NNS_G2D_VRAM_TYPE_2DMAIN, param2); param0->unk_40[1] = sub_02009B04(param1->unk_194[1], v3, 10, 0, 5000, NNS_G2D_VRAM_TYPE_2DMAIN, 1, param2); @@ -1705,7 +1695,7 @@ static void ov70_0225EC20 (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225 param0->unk_3C = 0; } -static void ov70_0225ED4C (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225E4EC * param1) +static void ov70_0225ED4C(UnkStruct_ov70_0225EC20 *param0, UnkStruct_ov70_0225E4EC *param1) { int v0; @@ -1730,18 +1720,19 @@ static void ov70_0225ED4C (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225 } } -static void ov70_0225EDA8 (UnkStruct_ov70_0225EC20 * param0, u32 param1, u32 param2, u32 param3) +static void ov70_0225EDA8(UnkStruct_ov70_0225EC20 *param0, u32 param1, u32 param2, u32 param3) { int v0; GF_ASSERT(param0->unk_34 == NULL); param0->unk_34 = sub_02013A04(param1, param2); param0->unk_38 = param1; - for (v0 = 0; v0 < param1; v0++) + for (v0 = 0; v0 < param1; v0++) { param0->unk_34[v0].unk_04 = param3; + } } -static void ov70_0225EDE0 (UnkStruct_ov70_0225EC20 * param0) +static void ov70_0225EDE0(UnkStruct_ov70_0225EC20 *param0) { if (param0->unk_34 != NULL) { sub_02013A3C(param0->unk_34); @@ -1750,17 +1741,17 @@ static void ov70_0225EDE0 (UnkStruct_ov70_0225EC20 * param0) } } -static void ov70_0225EDF8 (UnkStruct_ov70_0225EC20 * param0, const Strbuf *param1, u32 param2) +static void ov70_0225EDF8(UnkStruct_ov70_0225EC20 *param0, const Strbuf *param1, u32 param2) { sub_02013A6C(param0->unk_34, param1, param2); } -static const ResourceMetadata * ov70_0225EE04 (const UnkStruct_ov70_0225EC20 * param0) +static const ResourceMetadata *ov70_0225EE04(const UnkStruct_ov70_0225EC20 *param0) { return param0->unk_34; } -static BOOL ov70_0225EE08 (const UnkStruct_ov70_0225EC20 * param0, u32 param1) +static BOOL ov70_0225EE08(const UnkStruct_ov70_0225EC20 *param0, u32 param1) { int v0; @@ -1773,7 +1764,7 @@ static BOOL ov70_0225EE08 (const UnkStruct_ov70_0225EC20 * param0, u32 param1) return 0; } -static void ov70_0225EE30 (UnkStruct_ov70_0225EC20 * param0, const UnkStruct_ov84_02240FA8 * param1, UnkStruct_ov70_0225E4EC * param2, u16 param3, u16 param4, u32 param5, u8 param6, u8 param7, u8 param8) +static void ov70_0225EE30(UnkStruct_ov70_0225EC20 *param0, const UnkStruct_ov84_02240FA8 *param1, UnkStruct_ov70_0225E4EC *param2, u16 param3, u16 param4, u32 param5, u8 param6, u8 param7, u8 param8) { GF_ASSERT(param0->unk_30 == NULL); GF_ASSERT((param1->unk_12 * 2) < 18); @@ -1783,7 +1774,7 @@ static void ov70_0225EE30 (UnkStruct_ov70_0225EC20 * param0, const UnkStruct_ov8 param0->unk_3A = param1->unk_10; param0->unk_00.unk_04 = ov70_0225EF58; - BGL_AddWindow(param2->unk_00, ¶m0->unk_20, Unk_ov70_0226D5CC[0], param6, param7, param8, param1->unk_12 * 2, 5, ((((((1 + (18 + 12)) + ((18 + 12) + 24)) + 9)) + (27 * 4)))); + BGL_AddWindow(param2->unk_00, ¶m0->unk_20, Unk_ov70_0226D5CC[0], param6, param7, param8, param1->unk_12 * 2, 5, ((((1 + (18 + 12)) + ((18 + 12) + 24)) + 9) + (27 * 4))); BGL_FillWindow(¶m0->unk_20, 15); Window_Show(¶m0->unk_20, 1, ((1 + (18 + 12)) + ((18 + 12) + 24)), 3); @@ -1792,7 +1783,7 @@ static void ov70_0225EE30 (UnkStruct_ov70_0225EC20 * param0, const UnkStruct_ov8 sub_0201A9A4(¶m0->unk_20); } -static u32 ov70_0225EED8 (UnkStruct_ov70_0225EC20 * param0) +static u32 ov70_0225EED8(UnkStruct_ov70_0225EC20 *param0) { u32 v0; @@ -1815,7 +1806,7 @@ static u32 ov70_0225EED8 (UnkStruct_ov70_0225EC20 * param0) return v0; } -static void ov70_0225EF14 (UnkStruct_ov70_0225EC20 * param0, u16 * param1, u16 * param2) +static void ov70_0225EF14(UnkStruct_ov70_0225EC20 *param0, u16 *param1, u16 *param2) { int v0; @@ -1838,19 +1829,19 @@ static void ov70_0225EF14 (UnkStruct_ov70_0225EC20 * param0, u16 * param1, u16 * } } -static void ov70_0225EF58 (BmpList * param0, u32 param1, u8 param2) +static void ov70_0225EF58(BmpList *param0, u32 param1, u8 param2) { if (param2 == 0) { Sound_PlayEffect(1500); } } -static void ov70_0225EF6C (UnkStruct_ov70_0225EC20 * param0, BOOL param1) +static void ov70_0225EF6C(UnkStruct_ov70_0225EC20 *param0, BOOL param1) { param0->unk_3C = param1; } -static void ov70_0225EF70 (UnkStruct_ov70_0225EC20 * param0) +static void ov70_0225EF70(UnkStruct_ov70_0225EC20 *param0) { u16 v0; @@ -1862,7 +1853,7 @@ static void ov70_0225EF70 (UnkStruct_ov70_0225EC20 * param0) sub_020014DC(param0->unk_30, &v0, NULL); - if ((v0 <= 0)) { + if (v0 <= 0) { sub_02021CAC(param0->unk_50[0], 0); } else { sub_02021CAC(param0->unk_50[0], 1); @@ -1875,25 +1866,25 @@ static void ov70_0225EF70 (UnkStruct_ov70_0225EC20 * param0) } } -static void ov70_0225EFD4 (UnkStruct_ov70_0225EFD4 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2) +static void ov70_0225EFD4(UnkStruct_ov70_0225EFD4 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2) { return; } -static void ov70_0225EFD8 (UnkStruct_ov70_0225EFD4 * param0) +static void ov70_0225EFD8(UnkStruct_ov70_0225EFD4 *param0) { ov70_0225F024(param0); } -static void ov70_0225EFE0 (UnkStruct_ov70_0225EFD4 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, u8 param3, u8 param4, u8 param5, u8 param6) +static void ov70_0225EFE0(UnkStruct_ov70_0225EFD4 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u8 param3, u8 param4, u8 param5, u8 param6) { - BGL_AddWindow(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], param3, param4, param5, param6, 5, ((((((1 + (18 + 12)) + ((18 + 12) + 24)) + 9)) + (27 * 4)))); + BGL_AddWindow(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], param3, param4, param5, param6, 5, ((((1 + (18 + 12)) + ((18 + 12) + 24)) + 9) + (27 * 4))); Window_Show(¶m0->unk_00, 1, ((1 + (18 + 12)) + ((18 + 12) + 24)), 3); BGL_FillWindow(¶m0->unk_00, 15); sub_0201A9A4(¶m0->unk_00); } -static void ov70_0225F024 (UnkStruct_ov70_0225EFD4 * param0) +static void ov70_0225F024(UnkStruct_ov70_0225EFD4 *param0) { if (BGL_WindowAdded(¶m0->unk_00) == 1) { Window_Clear(¶m0->unk_00, 1); @@ -1902,20 +1893,20 @@ static void ov70_0225F024 (UnkStruct_ov70_0225EFD4 * param0) } } -static void ov70_0225F048 (UnkStruct_ov70_0225EFD4 * param0, const Strbuf *param1, u8 param2, u8 param3) +static void ov70_0225F048(UnkStruct_ov70_0225EFD4 *param0, const Strbuf *param1, u8 param2, u8 param3) { sub_0201D78C(¶m0->unk_00, 0, param1, param2, param3, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_00); } -static void ov70_0225F078 (UnkStruct_ov70_0225EFD4 * param0, u16 param1, u16 param2, u16 param3, u16 param4) +static void ov70_0225F078(UnkStruct_ov70_0225EFD4 *param0, u16 param1, u16 param2, u16 param3, u16 param4) { BGL_WindowColor(¶m0->unk_00, 15, param1, param2, param3, param4); } -static void ov70_0225F098 (UnkStruct_ov70_0225F098 * param0, UnkStruct_ov70_0225F208 * param1, u32 param2) +static void ov70_0225F098(UnkStruct_ov70_0225F098 *param0, UnkStruct_ov70_0225F208 *param1, u32 param2) { - Strbuf* v0; + Strbuf *v0; GF_ASSERT(param0->unk_00 == NULL); param0->unk_00 = sub_02013A04(2, param2); @@ -1930,7 +1921,7 @@ static void ov70_0225F098 (UnkStruct_ov70_0225F098 * param0, UnkStruct_ov70_0225 param0->unk_04.unk_00 = param0->unk_00; } -static void ov70_0225F100 (UnkStruct_ov70_0225F098 * param0) +static void ov70_0225F100(UnkStruct_ov70_0225F098 *param0) { if (param0->unk_00 != NULL) { sub_02013A3C(param0->unk_00); @@ -1938,29 +1929,29 @@ static void ov70_0225F100 (UnkStruct_ov70_0225F098 * param0) } } -static void ov70_0225F114 (UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2) +static void ov70_0225F114(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2) { - BGL_AddWindow(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], 4, 4, 23, 16, 5, ((((1 + (18 + 12)) + ((18 + 12) + 24)) + 9))); + BGL_AddWindow(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], 4, 4, 23, 16, 5, (((1 + (18 + 12)) + ((18 + 12) + 24)) + 9)); BGL_FillWindow(¶m0->unk_00, 15); } -static void ov70_0225F144 (UnkStruct_ov70_0225F114 * param0) +static void ov70_0225F144(UnkStruct_ov70_0225F114 *param0) { BGL_DeleteWindow(¶m0->unk_00); } -static void ov70_0225F14C (UnkStruct_ov70_0225F114 * param0, const Strbuf *param1) +static void ov70_0225F14C(UnkStruct_ov70_0225F114 *param0, const Strbuf *param1) { sub_0201D78C(¶m0->unk_00, 0, param1, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); Window_Show(¶m0->unk_00, 1, ((1 + (18 + 12)) + ((18 + 12) + 24)), 3); sub_0201A9A4(¶m0->unk_00); } -static void ov70_0225F184 (UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1) +static void ov70_0225F184(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225F208 *param1) { u32 v0; - Strbuf* v1; - UnkStruct_ov65_0222F6EC * v2; + Strbuf *v1; + UnkStruct_ov65_0222F6EC *v2; v2 = sub_020382F8(); v0 = ov66_022316F4(v2->unk_00, v2->unk_04); @@ -1970,11 +1961,11 @@ static void ov70_0225F184 (UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225 ov70_0225F14C(param0, v1); } -static void ov70_0225F1C0 (UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1, int param2) +static void ov70_0225F1C0(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225F208 *param1, int param2) { u32 v0; s32 v1; - Strbuf* v2; + Strbuf *v2; v1 = ov66_0223270C(param2); ov70_0225F2A8(param1, v1, 5, 0, 2); @@ -1983,15 +1974,15 @@ static void ov70_0225F1C0 (UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225 ov70_0225F14C(param0, v2); } -static void ov70_0225F1F0 (UnkStruct_ov70_0225F114 * param0, UnkStruct_ov70_0225F208 * param1, int param2) +static void ov70_0225F1F0(UnkStruct_ov70_0225F114 *param0, UnkStruct_ov70_0225F208 *param1, int param2) { - Strbuf* v0; + Strbuf *v0; v0 = ov70_0225F288(param1, 2, 14); ov70_0225F14C(param0, v0); } -static void ov70_0225F208 (UnkStruct_ov70_0225F208 * param0, u32 param1) +static void ov70_0225F208(UnkStruct_ov70_0225F208 *param0, u32 param1) { int v0; static const u32 v1[4] = { @@ -2008,7 +1999,7 @@ static void ov70_0225F208 (UnkStruct_ov70_0225F208 * param0, u32 param1) param0->unk_18 = Strbuf_Init(480, param1); } -static void ov70_0225F25C (UnkStruct_ov70_0225F208 * param0) +static void ov70_0225F25C(UnkStruct_ov70_0225F208 *param0) { int v0; @@ -2022,64 +2013,64 @@ static void ov70_0225F25C (UnkStruct_ov70_0225F208 * param0) Strbuf_Free(param0->unk_18); } -static Strbuf* ov70_0225F288 (UnkStruct_ov70_0225F208 * param0, int param1, u32 param2) +static Strbuf *ov70_0225F288(UnkStruct_ov70_0225F208 *param0, int param1, u32 param2) { MessageLoader_GetStrbuf(param0->unk_04[param1], param2, param0->unk_18); StringTemplate_Format(param0->unk_00, param0->unk_14, param0->unk_18); return param0->unk_14; } -static void ov70_0225F2A8 (UnkStruct_ov70_0225F208 * param0, u32 param1, u32 param2, u32 param3, int param4) +static void ov70_0225F2A8(UnkStruct_ov70_0225F208 *param0, u32 param1, u32 param2, u32 param3, int param4) { StringTemplate_SetNumber(param0->unk_00, param3, param1, param2, param4, 1); } -static void ov70_0225F2C8 (UnkStruct_ov70_0225F208 * param0, const TrainerInfo * param1, u32 param2) +static void ov70_0225F2C8(UnkStruct_ov70_0225F208 *param0, const TrainerInfo *param1, u32 param2) { StringTemplate_SetPlayerName(param0->unk_00, param2, param1); } -static void ov70_0225F2D8 (UnkStruct_ov70_0225F208 * param0, enum PlazaMinigame param1, u32 param2) +static void ov70_0225F2D8(UnkStruct_ov70_0225F208 *param0, enum PlazaMinigame param1, u32 param2) { StringTemplate_SetPlazaMinigameName(param0->unk_00, param2, param1); } -static void ov70_0225F2E8 (UnkStruct_ov70_0225F208 * param0, int param1, u32 param2) +static void ov70_0225F2E8(UnkStruct_ov70_0225F208 *param0, int param1, u32 param2) { StringTemplate_SetPlazaEventName(param0->unk_00, param2, param1); } -static void ov70_0225F2F8 (UnkStruct_ov70_0225F208 * param0, u32 param1, u32 param2) +static void ov70_0225F2F8(UnkStruct_ov70_0225F208 *param0, u32 param1, u32 param2) { StringTemplate_SetPlazaItemName(param0->unk_00, param2, param1); } -static void ov70_0225F308 (UnkStruct_ov70_0225F208 * param0, u32 param1, u32 param2) +static void ov70_0225F308(UnkStruct_ov70_0225F208 *param0, u32 param1, u32 param2) { StringTemplate_SetCountryName(param0->unk_00, param2, param1); } -static void ov70_0225F318 (UnkStruct_ov70_0225F208 * param0, u32 param1, u32 param2, u32 param3) +static void ov70_0225F318(UnkStruct_ov70_0225F208 *param0, u32 param1, u32 param2, u32 param3) { StringTemplate_SetCityName(param0->unk_00, param3, param1, param2); } -static void ov70_0225F32C (UnkStruct_ov70_0225F208 * param0, u32 param1, u16 param2) +static void ov70_0225F32C(UnkStruct_ov70_0225F208 *param0, u32 param1, u16 param2) { StringTemplate_SetCustomMessageWord(param0->unk_00, param1, param2); } -static void ov70_0225F338 (UnkStruct_ov70_0225F208 * param0) +static void ov70_0225F338(UnkStruct_ov70_0225F208 *param0) { StringTemplate_ClearArgs(param0->unk_00); } -static void ov70_0225F344 (UnkStruct_ov70_0225DEE8 * param0) +static void ov70_0225F344(UnkStruct_ov70_0225DEE8 *param0) { param0->unk_43C = 1; } -static void ov70_0225F350 (UnkStruct_ov70_0225F350 * param0, const UnkStruct_ov70_02263910 * param1, UnkStruct_ov70_0225E4EC * param2, const TrainerInfo * param3, u32 param4) +static void ov70_0225F350(UnkStruct_ov70_0225F350 *param0, const UnkStruct_ov70_02263910 *param1, UnkStruct_ov70_0225E4EC *param2, const TrainerInfo *param3, u32 param4) { u32 v0; @@ -2107,7 +2098,7 @@ static void ov70_0225F350 (UnkStruct_ov70_0225F350 * param0, const UnkStruct_ov7 } } -static void ov70_0225F3E4 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225E4EC * param2) +static void ov70_0225F3E4(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2) { ov70_022607A8(¶m0->unk_114); ov70_0225FAA8(¶m0->unk_08, param1, param2); @@ -2116,11 +2107,11 @@ static void ov70_0225F3E4 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 NARC_dtor(param0->unk_14C); } -static void ov70_0225F418 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225DEE8 * param1, BOOL param2, u32 param3) +static void ov70_0225F418(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225DEE8 *param1, BOOL param2, u32 param3) { - UnkStruct_ov66_0222DFF8 * v0; - UnkStruct_ov70_0225E4EC * v1; - UnkStruct_ov70_0225F208 * v2; + UnkStruct_ov66_0222DFF8 *v0; + UnkStruct_ov70_0225E4EC *v1; + UnkStruct_ov70_0225F208 *v2; BOOL v3; v0 = param1->unk_34; @@ -2140,7 +2131,7 @@ static void ov70_0225F418 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 case 2: if (ScreenWipe_Done() == 1) { { - const UnkStruct_ov66_0222E71C * v4; + const UnkStruct_ov66_0222E71C *v4; v4 = ov66_0222E3BC(v0); ov70_0225F8AC(param0, v1, ¶m1->unk_340, param3, v4); @@ -2235,12 +2226,11 @@ static void ov70_0225F418 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 param0->unk_00++; } break; - case 8: - { - const UnkStruct_ov66_0222E71C * v8; + case 8: { + const UnkStruct_ov66_0222E71C *v8; BOOL v9; BOOL v10; - const UnkStruct_ov66_02230914 * v11; + const UnkStruct_ov66_02230914 *v11; switch (param0->unk_02) { case 1: @@ -2248,10 +2238,9 @@ static void ov70_0225F418 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 v8 = ov66_0222E3BC(v0); ov70_0225F8AC(param0, v1, ¶m1->unk_340, param3, v8); break; - case 2: - { + case 2: { BOOL v12; - const UnkStruct_ov66_0222E71C * v13; + const UnkStruct_ov66_0222E71C *v13; v13 = ov66_0222E3BC(v0); @@ -2278,10 +2267,8 @@ static void ov70_0225F418 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 } ov70_0225F844(param0, ¶m1->unk_37C, v1, v2, v12, param3, v8, v13, v9, v10, v11, 1); - } - break; - case 3: - { + } break; + case 3: { u32 v14; u32 v15; u32 v16; @@ -2296,14 +2283,12 @@ static void ov70_0225F418 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 ov66_0222EC04(v14, &v15, &v16); ov70_0225F8F0(param0, v1, param3, v16); - } - break; + } break; } param0->unk_02 = 0; param0->unk_00++; - } - break; + } break; case 9: sub_0200F174(4, 1, 1, 0x0, 3, 1, param3); @@ -2321,61 +2306,61 @@ static void ov70_0225F418 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 } } -static u32 ov70_0225F798 (const UnkStruct_ov70_0225F350 * param0) +static u32 ov70_0225F798(const UnkStruct_ov70_0225F350 *param0) { return param0->unk_00; } -static void ov70_0225F79C (UnkStruct_ov70_0225F350 * param0, u32 param1, BOOL param2) +static void ov70_0225F79C(UnkStruct_ov70_0225F350 *param0, u32 param1, BOOL param2) { param0->unk_02 = 2; param0->unk_03 = param1; param0->unk_04 = param2; } -static void ov70_0225F7A8 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, u32 param3) +static void ov70_0225F7A8(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3) { GF_ASSERT(param2 < 27); GF_ASSERT(param0->unk_01 == 2); - if ((param0->unk_01 == 2)) { + if (param0->unk_01 == 2) { ov70_0225FEC4(¶m0->unk_08, param1, param0->unk_14C, param3, param2); } } -static void ov70_0225F7E0 (UnkStruct_ov70_0225F350 * param0) +static void ov70_0225F7E0(UnkStruct_ov70_0225F350 *param0) { if (param0->unk_01 != 1) { param0->unk_02 = 1; } } -static void ov70_0225F7EC (UnkStruct_ov70_0225F350 * param0) +static void ov70_0225F7EC(UnkStruct_ov70_0225F350 *param0) { if (param0->unk_01 != 3) { param0->unk_02 = 3; } } -static u32 ov70_0225F7F8 (const UnkStruct_ov70_0225F350 * param0) +static u32 ov70_0225F7F8(const UnkStruct_ov70_0225F350 *param0) { return param0->unk_03; } -static BOOL ov70_0225F7FC (const UnkStruct_ov70_0225F350 * param0) +static BOOL ov70_0225F7FC(const UnkStruct_ov70_0225F350 *param0) { - if ((param0->unk_02 == 2)) { + if (param0->unk_02 == 2) { return 1; } - if ((param0->unk_01 == 2)) { + if (param0->unk_01 == 2) { return 1; } return 0; } -static BOOL ov70_0225F814 (const UnkStruct_ov70_0225F350 * param0) +static BOOL ov70_0225F814(const UnkStruct_ov70_0225F350 *param0) { if ((param0->unk_02 == 0) && (param0->unk_01 == 2)) { return 1; @@ -2384,12 +2369,12 @@ static BOOL ov70_0225F814 (const UnkStruct_ov70_0225F350 * param0) return 0; } -static BOOL ov70_0225F828 (const UnkStruct_ov70_0225F350 * param0) +static BOOL ov70_0225F828(const UnkStruct_ov70_0225F350 *param0) { return ov70_0225FEEC(¶m0->unk_08); } -static BOOL ov70_0225F834 (const UnkStruct_ov70_0225F350 * param0) +static BOOL ov70_0225F834(const UnkStruct_ov70_0225F350 *param0) { if (param0->unk_02 != 0) { return 1; @@ -2398,7 +2383,7 @@ static BOOL ov70_0225F834 (const UnkStruct_ov70_0225F350 * param0) return 0; } -static void ov70_0225F844 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225E4EC * param2, UnkStruct_ov70_0225F208 * param3, BOOL param4, u32 param5, const UnkStruct_ov66_0222E71C * param6, const UnkStruct_ov66_0222E71C * param7, BOOL param8, BOOL param9, const UnkStruct_ov66_02230914 * param10, BOOL param11) +static void ov70_0225F844(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2, UnkStruct_ov70_0225F208 *param3, BOOL param4, u32 param5, const UnkStruct_ov66_0222E71C *param6, const UnkStruct_ov66_0222E71C *param7, BOOL param8, BOOL param9, const UnkStruct_ov66_02230914 *param10, BOOL param11) { if (param0->unk_01 == 2) { ov70_0225F89C(param0, param1, param2); @@ -2408,13 +2393,13 @@ static void ov70_0225F844 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 param0->unk_01 = 2; } -static void ov70_0225F89C (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225E4EC * param2) +static void ov70_0225F89C(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2) { ov70_0225FE80(¶m0->unk_08, param1, param2); param0->unk_01 = 0; } -static void ov70_0225F8AC (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1, UnkStruct_ov70_0225F208 * param2, u32 param3, const UnkStruct_ov66_0222E71C * param4) +static void ov70_0225F8AC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, UnkStruct_ov70_0225F208 *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4) { if ((param0->unk_01 == 1) || (param0->unk_01 == 4) || (param0->unk_01 == 3)) { ov70_0225F920(param0, param1); @@ -2424,7 +2409,7 @@ static void ov70_0225F8AC (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 param0->unk_01 = 1; } -static void ov70_0225F8F0 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, u32 param3) +static void ov70_0225F8F0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3) { if (param0->unk_01 == 3) { ov70_0225F920(param0, param1); @@ -2434,18 +2419,18 @@ static void ov70_0225F8F0 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 param0->unk_01 = 3; } -static void ov70_0225F920 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1) +static void ov70_0225F920(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1) { ov70_022609A8(¶m0->unk_114, param1); param0->unk_01 = 0; } -static void ov70_0225F934 (UnkStruct_ov70_0225F350 * param0, BOOL param1) +static void ov70_0225F934(UnkStruct_ov70_0225F350 *param0, BOOL param1) { param0->unk_114.unk_06 = param1; } -static void ov70_0225F940 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, u32 param3) +static void ov70_0225F940(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, u32 param3) { param0->unk_154 = param2; param0->unk_156 = param3; @@ -2453,9 +2438,9 @@ static void ov70_0225F940 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 SysTask_ExecuteAfterVBlank(ov70_0225F95C, param0, 0); } -static void ov70_0225F95C (SysTask * param0, void * param1) +static void ov70_0225F95C(SysTask *param0, void *param1) { - UnkStruct_ov70_0225F350 * v0 = param1; + UnkStruct_ov70_0225F350 *v0 = param1; { sub_02007130(v0->unk_14C, v0->unk_154, 4, 0, 0, v0->unk_156); @@ -2472,7 +2457,7 @@ static void ov70_0225F95C (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov70_0225F9BC (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3, u32 param4) +static void ov70_0225F9BC(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4) { { if (param3 == 0) { @@ -2489,21 +2474,21 @@ static void ov70_0225F9BC (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 } } -static void ov70_0225FA10 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E4EC * param1) +static void ov70_0225FA10(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E4EC *param1) { return; } -static void ov70_0225FA14 (UnkStruct_ov70_0225E4EC * param0, NARC * param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov70_0225FA14(UnkStruct_ov70_0225E4EC *param0, NARC *param1, u32 param2, u32 param3, u32 param4, u32 param5) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; v0 = sub_020071D0(param1, param2, 0, &v1, param5); { int v2; - u16 * v3; + u16 *v3; int v4; v4 = v1->szByte / 2; @@ -2519,7 +2504,7 @@ static void ov70_0225FA14 (UnkStruct_ov70_0225E4EC * param0, NARC * param1, u32 Heap_FreeToHeap(v0); } -static void ov70_0225FA84 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3) +static void ov70_0225FA84(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3) { { int v0; @@ -2530,7 +2515,7 @@ static void ov70_0225FA84 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 } } -static void ov70_0225FAA8 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225E4EC * param2) +static void ov70_0225FAA8(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2) { if (param0->unk_54 != NULL) { ov70_0225FE80(param0, param1, param2); @@ -2545,15 +2530,15 @@ static void ov70_0225FAA8 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 } } -static void ov70_0225FACC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E9C8 * param1) +static void ov70_0225FACC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1) { return; } -static void ov70_0225FAD0 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225FA84 * param2, UnkStruct_ov70_0225E4EC * param3, UnkStruct_ov70_0225F208 * param4, BOOL param5, NARC * param6, u32 param7, const UnkStruct_ov66_0222E71C * param8, const UnkStruct_ov66_0222E71C * param9, BOOL param10, BOOL param11, const UnkStruct_ov66_02230914 * param12, BOOL param13) +static void ov70_0225FAD0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225FA84 *param2, UnkStruct_ov70_0225E4EC *param3, UnkStruct_ov70_0225F208 *param4, BOOL param5, NARC *param6, u32 param7, const UnkStruct_ov66_0222E71C *param8, const UnkStruct_ov66_0222E71C *param9, BOOL param10, BOOL param11, const UnkStruct_ov66_02230914 *param12, BOOL param13) { u32 v0; - TrainerInfo * v1; + TrainerInfo *v1; ov70_0225F338(param4); @@ -2652,13 +2637,13 @@ static void ov70_0225FAD0 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 Heap_FreeToHeap(v1); } -static void ov70_0225FDA0 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225FA84 * param1, UnkStruct_ov70_0225E4EC * param2, u32 param3, const UnkStruct_ov66_0222E71C * param4) +static void ov70_0225FDA0(UnkStruct_ov70_0225F350 *param0, UnkStruct_ov70_0225FA84 *param1, UnkStruct_ov70_0225E4EC *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4) { u16 v0; int v1; u16 v2; - void * v3; - NNSG2dCharacterData * v4; + void *v3; + NNSG2dCharacterData *v4; for (v1 = 0; v1 < 2; v1++) { v0 = ov66_0222E8E8(param4, v1); @@ -2678,7 +2663,7 @@ static void ov70_0225FDA0 (UnkStruct_ov70_0225F350 * param0, UnkStruct_ov70_0225 } } -static void ov70_0225FE80 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E9C8 * param1, UnkStruct_ov70_0225E4EC * param2) +static void ov70_0225FE80(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E9C8 *param1, UnkStruct_ov70_0225E4EC *param2) { if (param0->unk_00 == 1) { param0->unk_00 = 0; @@ -2694,18 +2679,18 @@ static void ov70_0225FE80 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 sub_02019EBC(param2->unk_00, Unk_ov70_0226D5CC[3]); } -static void ov70_0225FEC4 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3, u32 param4) +static void ov70_0225FEC4(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4) { ov70_02260048(param0, param1); ov70_0225FEF0(param0, param1, param2, param3, param4, 1); } -static BOOL ov70_0225FEEC (const UnkStruct_ov70_0225FA84 * param0) +static BOOL ov70_0225FEEC(const UnkStruct_ov70_0225FA84 *param0) { return param0->unk_00; } -static void ov70_0225FEF0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3, u32 param4, BOOL param5) +static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4, BOOL param5) { u32 v0; u32 v1; @@ -2737,7 +2722,7 @@ static void ov70_0225FEF0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 { UnkStruct_ov19_021DA864 v3; - UnkStruct_ov83_0223D9A8 v4 = {NULL}; + UnkStruct_ov83_0223D9A8 v4 = { NULL }; sub_020093B4(&v3, 100, 100, 100, 100, 0xffffffff, 0xffffffff, 0, 0, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL); @@ -2755,7 +2740,7 @@ static void ov70_0225FEF0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 } } -static void ov70_02260048 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1) +static void ov70_02260048(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1) { sub_02021BD4(param0->unk_54); param0->unk_54 = NULL; @@ -2772,7 +2757,7 @@ static void ov70_02260048 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 } } -static void ov70_02260080 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3, u32 param4) +static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, u32 param4) { u32 v0; u16 v1, v2; @@ -2811,7 +2796,7 @@ static void ov70_02260080 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 { UnkStruct_ov19_021DA864 v6; - UnkStruct_ov83_0223D9A8 v7 = {NULL}; + UnkStruct_ov83_0223D9A8 v7 = { NULL }; sub_020093B4(&v6, 101, 101, 101, 101, 0xffffffff, 0xffffffff, 1, 3, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL); @@ -2827,7 +2812,7 @@ static void ov70_02260080 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 } } -static void ov70_02260228 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1) +static void ov70_02260228(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1) { sub_0201ED1C(SpriteActor_ImageProxy(param0->unk_68)); sub_02021BD4(param0->unk_68); @@ -2846,11 +2831,11 @@ static void ov70_02260228 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 } } -static void ov70_02260268 (NNSG2dPaletteData * param0) +static void ov70_02260268(NNSG2dPaletteData *param0) { int v0, v1, v2, v3, v4; int v5; - u16 * v6; + u16 *v6; v5 = param0->szByte / 2; v6 = param0->pRawData; @@ -2873,7 +2858,7 @@ static void ov70_02260268 (NNSG2dPaletteData * param0) } } -static void ov70_022602C0 (UnkStruct_ov70_0225FA84 * param0) +static void ov70_022602C0(UnkStruct_ov70_0225FA84 *param0) { int v0; @@ -2882,17 +2867,17 @@ static void ov70_022602C0 (UnkStruct_ov70_0225FA84 * param0) } } -static void ov70_022602DC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6) +static void ov70_022602DC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6) { - Strbuf* v0; + Strbuf *v0; v0 = ov70_0225F288(param1, 1, param3); sub_0201D78C(¶m0->unk_04[param2], 0, v0, param4, param5, 0xff, param6, NULL); } -static void ov70_02260314 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6) +static void ov70_02260314(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, u32 param2, u32 param3, u8 param4, u8 param5, u32 param6) { - Strbuf* v0; + Strbuf *v0; u32 v1; s32 v2; @@ -2907,17 +2892,17 @@ static void ov70_02260314 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 sub_0201D78C(¶m0->unk_04[param2], 0, v0, v2, param5, 0xff, param6, NULL); } -static void ov70_02260360 (UnkStruct_ov70_0225FA84 * param0, u32 param1) +static void ov70_02260360(UnkStruct_ov70_0225FA84 *param0, u32 param1) { sub_0201A9A4(¶m0->unk_04[param1]); } -static void ov70_02260370 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, const TrainerInfo * param2) +static void ov70_02260370(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, const TrainerInfo *param2) { ov70_0225F2C8(param1, param2, 0); } -static void ov70_02260380 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, const UnkStruct_ov66_0222E71C * param2) +static void ov70_02260380(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, const UnkStruct_ov66_0222E71C *param2) { u32 v0; u32 v1; @@ -2929,7 +2914,7 @@ static void ov70_02260380 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 ov70_0225F318(param1, v0, v1, 1); } -static void ov70_022603B0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225F208 * param1, const UnkStruct_ov66_02230914 * param2) +static void ov70_022603B0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225F208 *param1, const UnkStruct_ov66_02230914 *param2) { int v0; @@ -2938,11 +2923,11 @@ static void ov70_022603B0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 } } -static void ov70_022603CC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3, const UnkStruct_ov66_0222E71C * param4, const UnkStruct_ov66_0222E71C * param5) +static void ov70_022603CC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4, const UnkStruct_ov66_0222E71C *param5) { int v0; - NARC * v1; - NARC * v2; + NARC *v1; + NARC *v2; BOOL v3; u32 v4; u32 v5; @@ -2950,18 +2935,24 @@ static void ov70_022603CC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 u32 v7; UnkStruct_ov83_0223D9A8 v8; UnkStruct_ov19_021DA864 v9; - const UnkStruct_ov70_0226D844 * v10; + const UnkStruct_ov70_0226D844 *v10; static const u16 v11[4][3] = { - {192, 0, 8}, - {186, 102, 2}, - {192, 49, 1}, - {192, 53, 1}, + { 192, 0, 8 }, + { 186, 102, 2 }, + { 192, 49, 1 }, + { 192, 53, 1 }, }; static const u16 v12[4] = { - 2, 104, 51, 55, + 2, + 104, + 51, + 55, }; static const u16 v13[4] = { - 3, 105, 52, 56, + 3, + 105, + 52, + 56, }; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__UNIONOBJ2D_ONLYFRONT, param3); @@ -3043,7 +3034,7 @@ static void ov70_022603CC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 NARC_dtor(v1); } -static void ov70_0226068C (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1) +static void ov70_0226068C(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1) { int v0; @@ -3071,7 +3062,7 @@ static void ov70_0226068C (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225 } } -static const UnkStruct_ov70_0226D844 * ov70_02260728 (int param0, s32 param1, s32 param2, u32 param3) +static const UnkStruct_ov70_0226D844 *ov70_02260728(int param0, s32 param1, s32 param2, u32 param3) { if (param1 == param2) { return &Unk_ov70_0226D5FC[param3]; @@ -3080,7 +3071,7 @@ static const UnkStruct_ov70_0226D844 * ov70_02260728 (int param0, s32 param1, s3 return &Unk_ov70_0226D844[param0]; } -static void ov70_02260744 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3) +static void ov70_02260744(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3) { int v0; @@ -3091,14 +3082,14 @@ static void ov70_02260744 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225 } { - static const TouchScreenHitTable v1 = {32, 160, 40, 216}; + static const TouchScreenHitTable v1 = { 32, 160, 40, 216 }; param0->unk_1C = sub_02023FCC(&v1, 1, ov70_02260A50, param0, param3); } param0->unk_06 = 1; } -static void ov70_022607A8 (UnkStruct_ov70_02260744 * param0) +static void ov70_022607A8(UnkStruct_ov70_02260744 *param0) { int v0; @@ -3112,7 +3103,7 @@ static void ov70_022607A8 (UnkStruct_ov70_02260744 * param0) param0->unk_02 = 0; } -static BOOL ov70_022607D4 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1, NARC * param2, u32 param3) +static BOOL ov70_022607D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, NARC *param2, u32 param3) { BOOL v0 = 0; @@ -3152,7 +3143,7 @@ static BOOL ov70_022607D4 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225 return v0; } -static void ov70_02260870 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1, UnkStruct_ov70_0225F208 * param2, const UnkStruct_ov66_0222E71C * param3, NARC * param4, u32 param5) +static void ov70_02260870(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, UnkStruct_ov70_0225F208 *param2, const UnkStruct_ov66_0222E71C *param3, NARC *param4, u32 param5) { { sub_0200710C(param4, 55, param1->unk_00, Unk_ov70_0226D5CC[1], 0, 0, 0, param5); @@ -3168,7 +3159,7 @@ static void ov70_02260870 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225 } { - Strbuf* v0; + Strbuf *v0; v0 = ov70_0225F288(param2, 1, 63); @@ -3183,7 +3174,7 @@ static void ov70_02260870 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225 } } -static void ov70_02260930 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, NARC * param3, u32 param4) +static void ov70_02260930(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 param4) { GF_ASSERT(param2 < 3); @@ -3203,7 +3194,7 @@ static void ov70_02260930 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225 } } -static void ov70_022609A8 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1) +static void ov70_022609A8(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1) { sub_02019EBC(param1->unk_00, Unk_ov70_0226D5CC[1]); sub_02019EBC(param1->unk_00, Unk_ov70_0226D5CC[2]); @@ -3211,7 +3202,7 @@ static void ov70_022609A8 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225 sub_02019184(param1->unk_00, Unk_ov70_0226D5CC[3], 3, 0); } -static void ov70_022609D4 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2, NARC * param3, u32 param4) +static void ov70_022609D4(UnkStruct_ov70_02260744 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2, NARC *param3, u32 param4) { static const s8 v0[3] = { 0, 9, 6 @@ -3233,9 +3224,9 @@ static void ov70_022609D4 (UnkStruct_ov70_02260744 * param0, UnkStruct_ov70_0225 sub_0201C63C(param1->unk_00, Unk_ov70_0226D5CC[3], 3, v0[param2]); } -static void ov70_02260A50 (u32 param0, u32 param1, void * param2) +static void ov70_02260A50(u32 param0, u32 param1, void *param2) { - UnkStruct_ov70_02260744 * v0 = param2; + UnkStruct_ov70_02260744 *v0 = param2; v0->unk_03 = param1; @@ -3248,7 +3239,7 @@ static void ov70_02260A50 (u32 param0, u32 param1, void * param2) } } -static void ov70_02260A68 (UnkStruct_ov70_02260744 * param0) +static void ov70_02260A68(UnkStruct_ov70_02260744 *param0) { param0->unk_00 = 0; } diff --git a/src/overlay070/ov70_02260A70.c b/src/overlay070/ov70_02260A70.c index 14e3878915..cefa81a649 100644 --- a/src/overlay070/ov70_02260A70.c +++ b/src/overlay070/ov70_02260A70.c @@ -1,18 +1,18 @@ +#include "overlay070/ov70_02260A70.h" + #include #include +#include "overlay070/ov70_0225C9B4.h" #include "overlay070/struct_ov70_0225CC54_decl.h" - #include "overlay115/camera_angle.h" -#include "heap.h" #include "camera.h" -#include "overlay070/ov70_0225C9B4.h" -#include "overlay070/ov70_02260A70.h" +#include "heap.h" typedef struct UnkStruct_ov70_02260AD4_t { - Camera * camera; - const UnkStruct_ov70_0225CC54 * unk_04; + Camera *camera; + const UnkStruct_ov70_0225CC54 *unk_04; VecFx32 unk_08; } UnkStruct_ov70_02260AD4; @@ -22,9 +22,9 @@ static const CameraAngle Unk_ov70_0226D904 = { 0x0 }; -UnkStruct_ov70_02260AD4 * ov70_02260A70 (u32 param0) +UnkStruct_ov70_02260AD4 *ov70_02260A70(u32 param0) { - UnkStruct_ov70_02260AD4 * v0; + UnkStruct_ov70_02260AD4 *v0; VecFx32 v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov70_02260AD4)); @@ -38,14 +38,14 @@ UnkStruct_ov70_02260AD4 * ov70_02260A70 (u32 param0) return v0; } -void ov70_02260AD4 (UnkStruct_ov70_02260AD4 * param0) +void ov70_02260AD4(UnkStruct_ov70_02260AD4 *param0) { Camera_ClearActive(); Camera_Delete(param0->camera); Heap_FreeToHeap(param0); } -void ov70_02260AEC (UnkStruct_ov70_02260AD4 * param0) +void ov70_02260AEC(UnkStruct_ov70_02260AD4 *param0) { if (param0->unk_04) { ov70_0225D054(param0->unk_04, ¶m0->unk_08); @@ -57,26 +57,26 @@ void ov70_02260AEC (UnkStruct_ov70_02260AD4 * param0) Camera_ComputeViewMatrix(); } -void ov70_02260B18 (UnkStruct_ov70_02260AD4 * param0, fx32 param1, fx32 param2, fx32 param3) +void ov70_02260B18(UnkStruct_ov70_02260AD4 *param0, fx32 param1, fx32 param2, fx32 param3) { param0->unk_08.x = param1; param0->unk_08.y = param2; param0->unk_08.z = param3; } -void ov70_02260B20 (UnkStruct_ov70_02260AD4 * param0, fx32 param1, fx32 param2, fx32 param3) +void ov70_02260B20(UnkStruct_ov70_02260AD4 *param0, fx32 param1, fx32 param2, fx32 param3) { param0->unk_08.x = param1 + (FX32_CONST(8)); param0->unk_08.y = param2; param0->unk_08.z = param3 + (-FX32_CONST(32)); } -void ov70_02260B38 (UnkStruct_ov70_02260AD4 * param0, const UnkStruct_ov70_0225CC54 * param1) +void ov70_02260B38(UnkStruct_ov70_02260AD4 *param0, const UnkStruct_ov70_0225CC54 *param1) { param0->unk_04 = param1; } -void ov70_02260B3C (UnkStruct_ov70_02260AD4 * param0) +void ov70_02260B3C(UnkStruct_ov70_02260AD4 *param0) { param0->unk_04 = NULL; } diff --git a/src/overlay070/ov70_02260B44.c b/src/overlay070/ov70_02260B44.c index 404567671c..ed9c2e3e90 100644 --- a/src/overlay070/ov70_02260B44.c +++ b/src/overlay070/ov70_02260B44.c @@ -1,24 +1,25 @@ +#include "overlay070/ov70_02260B44.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" - #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017248.h" #include "struct_defs/struct_02017294.h" + #include "overlay063/struct_ov63_0222CC3C.h" -#include "overlay070/struct_ov70_02261418.h" +#include "overlay066/ov66_02231428.h" #include "overlay070/funcptr_ov70_02261C60.h" +#include "overlay070/ov70_0225C700.h" +#include "overlay070/struct_ov70_02261418.h" +#include "heap.h" #include "narc.h" #include "unk_02006E3C.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_0201C970.h" #include "unk_0201D15C.h" -#include "overlay066/ov66_02231428.h" -#include "overlay070/ov70_0225C700.h" -#include "overlay070/ov70_02260B44.h" typedef struct { BOOL unk_00; @@ -47,7 +48,7 @@ typedef struct UnkStruct_ov70_02260E8C_t { typedef struct { UnkStruct_020170F4 unk_00[2]; - void * unk_20[2][3]; + void *unk_20[2][3]; UnkStruct_02017248 unk_38[2][4]; } UnkStruct_ov70_022618C8; @@ -73,13 +74,13 @@ typedef struct UnkStruct_ov70_022610B8_t { typedef struct { UnkStruct_020170F4 unk_00[18]; - void * unk_120[18][3]; + void *unk_120[18][3]; } UnkStruct_ov70_02261BB4; typedef struct UnkStruct_ov70_02260BB8_t { UnkStruct_ov70_022615E8 unk_00; - UnkStruct_ov70_02260E8C * unk_11C; - UnkStruct_ov70_022610B8 * unk_120; + UnkStruct_ov70_02260E8C *unk_11C; + UnkStruct_ov70_022610B8 *unk_120; u8 unk_124; u8 unk_125; u8 unk_126; @@ -91,34 +92,34 @@ typedef struct UnkStruct_ov70_02260BB8_t { NNSFndAllocator unk_494; } UnkStruct_ov70_02260BB8; -static UnkStruct_ov70_02261418 * ov70_022613F4(int param0, int param1, u32 param2); -static void ov70_02261418(UnkStruct_ov70_02261418 * param0); -static void ov70_02261420(UnkStruct_020170F4 * param0, NARC * param1, u32 param2, u32 param3); -static void ov70_0226146C(UnkStruct_020170F4 * param0); -static void ov70_02261474(fx32 * param0, const UnkStruct_02017248 * param1, fx32 param2); -static BOOL ov70_02261498(fx32 * param0, const UnkStruct_02017248 * param1, fx32 param2); -static void ov70_022614C0(fx32 * param0, const UnkStruct_02017248 * param1, fx32 param2); -static BOOL ov70_022614DC(fx32 * param0, const UnkStruct_02017248 * param1, fx32 param2); -static void ov70_022614F4(UnkStruct_ov70_022615A4 * param0, NARC * param1, const UnkStruct_ov70_02261418 * param2, u32 param3, NNSFndAllocator * param4); -static void ov70_022615A4(UnkStruct_ov70_022615A4 * param0, NNSFndAllocator * param1); -static void ov70_022615E8(UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_022615A4 * param1); -static void ov70_02261664(UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_022615A4 * param1); -static void ov70_022616B0(UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_022615A4 * param1); -static void ov70_022616FC(UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_022615A4 * param1); -static UnkStruct_ov70_02260E8C * ov70_02261718(UnkStruct_ov70_02260BB8 * param0); -static void ov70_0226174C(UnkStruct_ov70_022618C8 * param0, NARC * param1, NNSFndAllocator * param2, const UnkStruct_ov70_02261418 * param3, u32 param4); -static void ov70_022618C8(UnkStruct_ov70_022618C8 * param0, NNSFndAllocator * param1); -static void ov70_02261968(UnkStruct_ov70_02260E8C * param0, UnkStruct_ov70_022618C8 * param1); -static void ov70_022619F4(UnkStruct_ov70_02260E8C * param0, UnkStruct_ov70_022618C8 * param1); -static UnkStruct_ov70_022610B8 * ov70_02261AF0(UnkStruct_ov70_02260BB8 * param0); -static void ov70_02261B24(UnkStruct_ov70_02261BB4 * param0, NARC * param1, NNSFndAllocator * param2, const UnkStruct_ov70_02261418 * param3, u32 param4); -static void ov70_02261BB4(UnkStruct_ov70_02261BB4 * param0, NNSFndAllocator * param1); -static void ov70_02261C04(UnkStruct_ov70_02261BB4 * param0, UnkStruct_ov70_022610B8 * param1); -static void ov70_02261C60(UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1); - -UnkStruct_ov70_02260BB8 * ov70_02260B44 (u32 param0, u32 param1, u32 param2, u32 param3) +static UnkStruct_ov70_02261418 *ov70_022613F4(int param0, int param1, u32 param2); +static void ov70_02261418(UnkStruct_ov70_02261418 *param0); +static void ov70_02261420(UnkStruct_020170F4 *param0, NARC *param1, u32 param2, u32 param3); +static void ov70_0226146C(UnkStruct_020170F4 *param0); +static void ov70_02261474(fx32 *param0, const UnkStruct_02017248 *param1, fx32 param2); +static BOOL ov70_02261498(fx32 *param0, const UnkStruct_02017248 *param1, fx32 param2); +static void ov70_022614C0(fx32 *param0, const UnkStruct_02017248 *param1, fx32 param2); +static BOOL ov70_022614DC(fx32 *param0, const UnkStruct_02017248 *param1, fx32 param2); +static void ov70_022614F4(UnkStruct_ov70_022615A4 *param0, NARC *param1, const UnkStruct_ov70_02261418 *param2, u32 param3, NNSFndAllocator *param4); +static void ov70_022615A4(UnkStruct_ov70_022615A4 *param0, NNSFndAllocator *param1); +static void ov70_022615E8(UnkStruct_ov70_022615E8 *param0, UnkStruct_ov70_022615A4 *param1); +static void ov70_02261664(UnkStruct_ov70_022615E8 *param0, UnkStruct_ov70_022615A4 *param1); +static void ov70_022616B0(UnkStruct_ov70_022615E8 *param0, UnkStruct_ov70_022615A4 *param1); +static void ov70_022616FC(UnkStruct_ov70_022615E8 *param0, UnkStruct_ov70_022615A4 *param1); +static UnkStruct_ov70_02260E8C *ov70_02261718(UnkStruct_ov70_02260BB8 *param0); +static void ov70_0226174C(UnkStruct_ov70_022618C8 *param0, NARC *param1, NNSFndAllocator *param2, const UnkStruct_ov70_02261418 *param3, u32 param4); +static void ov70_022618C8(UnkStruct_ov70_022618C8 *param0, NNSFndAllocator *param1); +static void ov70_02261968(UnkStruct_ov70_02260E8C *param0, UnkStruct_ov70_022618C8 *param1); +static void ov70_022619F4(UnkStruct_ov70_02260E8C *param0, UnkStruct_ov70_022618C8 *param1); +static UnkStruct_ov70_022610B8 *ov70_02261AF0(UnkStruct_ov70_02260BB8 *param0); +static void ov70_02261B24(UnkStruct_ov70_02261BB4 *param0, NARC *param1, NNSFndAllocator *param2, const UnkStruct_ov70_02261418 *param3, u32 param4); +static void ov70_02261BB4(UnkStruct_ov70_02261BB4 *param0, NNSFndAllocator *param1); +static void ov70_02261C04(UnkStruct_ov70_02261BB4 *param0, UnkStruct_ov70_022610B8 *param1); +static void ov70_02261C60(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1); + +UnkStruct_ov70_02260BB8 *ov70_02260B44(u32 param0, u32 param1, u32 param2, u32 param3) { - UnkStruct_ov70_02260BB8 * v0; + UnkStruct_ov70_02260BB8 *v0; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov70_02260BB8)); memset(v0, 0, sizeof(UnkStruct_ov70_02260BB8)); @@ -135,7 +136,7 @@ UnkStruct_ov70_02260BB8 * ov70_02260B44 (u32 param0, u32 param1, u32 param2, u32 return v0; } -void ov70_02260BB8 (UnkStruct_ov70_02260BB8 * param0) +void ov70_02260BB8(UnkStruct_ov70_02260BB8 *param0) { if (param0->unk_128) { ov70_02260D80(param0); @@ -146,7 +147,7 @@ void ov70_02260BB8 (UnkStruct_ov70_02260BB8 * param0) Heap_FreeToHeap(param0); } -void ov70_02260BE8 (UnkStruct_ov70_02260BB8 * param0) +void ov70_02260BE8(UnkStruct_ov70_02260BB8 *param0) { ov70_022616B0(¶m0->unk_00, ¶m0->unk_12C); @@ -167,7 +168,7 @@ void ov70_02260BE8 (UnkStruct_ov70_02260BB8 * param0) } } -void ov70_02260C50 (UnkStruct_ov70_02260BB8 * param0) +void ov70_02260C50(UnkStruct_ov70_02260BB8 *param0) { int v0; @@ -186,15 +187,15 @@ void ov70_02260C50 (UnkStruct_ov70_02260BB8 * param0) } } -void ov70_02260CE0 (UnkStruct_ov70_02260BB8 * param0) +void ov70_02260CE0(UnkStruct_ov70_02260BB8 *param0) { return; } -void ov70_02260CE4 (UnkStruct_ov70_02260BB8 * param0, int param1, int param2, u32 param3, u32 param4) +void ov70_02260CE4(UnkStruct_ov70_02260BB8 *param0, int param1, int param2, u32 param3, u32 param4) { - NARC * v0; - UnkStruct_ov70_02261418 * v1; + NARC *v0; + UnkStruct_ov70_02261418 *v1; param0->unk_127 = param2; param0->unk_126 = param1; @@ -216,7 +217,7 @@ void ov70_02260CE4 (UnkStruct_ov70_02260BB8 * param0, int param1, int param2, u3 param0->unk_128 = 1; } -void ov70_02260D80 (UnkStruct_ov70_02260BB8 * param0) +void ov70_02260D80(UnkStruct_ov70_02260BB8 *param0) { ov70_02261664(¶m0->unk_00, ¶m0->unk_12C); ov70_022615A4(¶m0->unk_12C, ¶m0->unk_494); @@ -226,7 +227,7 @@ void ov70_02260D80 (UnkStruct_ov70_02260BB8 * param0) param0->unk_128 = 0; } -void ov70_02260DC8 (UnkStruct_ov70_02260BB8 * param0) +void ov70_02260DC8(UnkStruct_ov70_02260BB8 *param0) { if (param0->unk_12C.unk_84[4] == 1) { if (param0->unk_00.unk_F4[4] == 0) { @@ -236,7 +237,7 @@ void ov70_02260DC8 (UnkStruct_ov70_02260BB8 * param0) } } -void ov70_02260DF4 (UnkStruct_ov70_02260BB8 * param0) +void ov70_02260DF4(UnkStruct_ov70_02260BB8 *param0) { if (param0->unk_12C.unk_84[4] == 1) { if (param0->unk_00.unk_F4[4] == 1) { @@ -246,9 +247,9 @@ void ov70_02260DF4 (UnkStruct_ov70_02260BB8 * param0) } } -UnkStruct_ov70_02260E8C * ov70_02260E20 (UnkStruct_ov70_02260BB8 * param0, int param1, int param2, const VecFx32 * param3) +UnkStruct_ov70_02260E8C *ov70_02260E20(UnkStruct_ov70_02260BB8 *param0, int param1, int param2, const VecFx32 *param3) { - UnkStruct_ov70_02260E8C * v0; + UnkStruct_ov70_02260E8C *v0; GF_ASSERT(param1 <= 2); GF_ASSERT(param2 <= 3); @@ -260,7 +261,7 @@ UnkStruct_ov70_02260E8C * ov70_02260E20 (UnkStruct_ov70_02260BB8 * param0, int p ov70_02260EA0(v0, param3); { - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; ov70_02260EE4(v0, &v1); } @@ -276,36 +277,36 @@ UnkStruct_ov70_02260E8C * ov70_02260E20 (UnkStruct_ov70_02260BB8 * param0, int p return v0; } -void ov70_02260E8C (UnkStruct_ov70_02260E8C * param0) +void ov70_02260E8C(UnkStruct_ov70_02260E8C *param0) { sub_02017348(¶m0->unk_04, 0); param0->unk_00 = 0; } -void ov70_02260EA0 (UnkStruct_ov70_02260E8C * param0, const VecFx32 * param1) +void ov70_02260EA0(UnkStruct_ov70_02260E8C *param0, const VecFx32 *param1) { param0->unk_9C = *param1; sub_02017350(¶m0->unk_04, param0->unk_9C.x + param0->unk_A8.x, param0->unk_9C.y + param0->unk_A8.y, param0->unk_9C.z + param0->unk_A8.z); } -void ov70_02260EE4 (UnkStruct_ov70_02260E8C * param0, const VecFx32 * param1) +void ov70_02260EE4(UnkStruct_ov70_02260E8C *param0, const VecFx32 *param1) { param0->unk_A8 = *param1; sub_02017350(¶m0->unk_04, param0->unk_9C.x + param0->unk_A8.x, param0->unk_9C.y + param0->unk_A8.y, param0->unk_9C.z + param0->unk_A8.z); } -void ov70_02260F28 (const UnkStruct_ov70_02260E8C * param0, VecFx32 * param1) +void ov70_02260F28(const UnkStruct_ov70_02260E8C *param0, VecFx32 *param1) { sub_02017358(¶m0->unk_04, ¶m1->x, ¶m1->y, ¶m1->z); } -void ov70_02260F38 (UnkStruct_ov70_02260E8C * param0, BOOL param1) +void ov70_02260F38(UnkStruct_ov70_02260E8C *param0, BOOL param1) { sub_02017348(¶m0->unk_04, param1); } -BOOL ov70_02260F44 (UnkStruct_ov70_02260E8C * param0) +BOOL ov70_02260F44(UnkStruct_ov70_02260E8C *param0) { if (param0->unk_7C[1] == 0) { param0->unk_7C[1] = 1; @@ -315,7 +316,7 @@ BOOL ov70_02260F44 (UnkStruct_ov70_02260E8C * param0) return 0; } -BOOL ov70_02260F5C (UnkStruct_ov70_02260E8C * param0) +BOOL ov70_02260F5C(UnkStruct_ov70_02260E8C *param0) { if (param0->unk_7C[3] == 0) { param0->unk_7C[3] = 1; @@ -325,24 +326,24 @@ BOOL ov70_02260F5C (UnkStruct_ov70_02260E8C * param0) return 0; } -void ov70_02260F74 (UnkStruct_ov70_02260E8C * param0, u16 param1) +void ov70_02260F74(UnkStruct_ov70_02260E8C *param0, u16 param1) { sub_02017388(¶m0->unk_04, param1, 0); } -BOOL ov70_02260F80 (const UnkStruct_ov70_02260E8C * param0) +BOOL ov70_02260F80(const UnkStruct_ov70_02260E8C *param0) { return param0->unk_7C[1]; } -BOOL ov70_02260F88 (const UnkStruct_ov70_02260E8C * param0) +BOOL ov70_02260F88(const UnkStruct_ov70_02260E8C *param0) { return param0->unk_7C[3]; } -UnkStruct_ov70_022610B8 * ov70_02260F90 (UnkStruct_ov70_02260BB8 * param0, int param1, u32 param2, u32 param3) +UnkStruct_ov70_022610B8 *ov70_02260F90(UnkStruct_ov70_02260BB8 *param0, int param1, u32 param2, u32 param3) { - UnkStruct_ov70_022610B8 * v0; + UnkStruct_ov70_022610B8 *v0; int v1; v0 = ov70_02261AF0(param0); @@ -377,7 +378,7 @@ UnkStruct_ov70_022610B8 * ov70_02260F90 (UnkStruct_ov70_02260BB8 * param0, int p return v0; } -void ov70_02261058 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1) +void ov70_02261058(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1) { int v0; @@ -392,12 +393,12 @@ void ov70_02261058 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1->unk_00 = 0; } -int ov70_022610B8 (const UnkStruct_ov70_022610B8 * param0) +int ov70_022610B8(const UnkStruct_ov70_022610B8 *param0) { return param0->unk_02; } -void ov70_022610BC (UnkStruct_ov70_022610B8 * param0, UnkStruct_ov63_0222CC3C param1) +void ov70_022610BC(UnkStruct_ov70_022610B8 *param0, UnkStruct_ov63_0222CC3C param1) { VecFx32 v0; @@ -405,7 +406,7 @@ void ov70_022610BC (UnkStruct_ov70_022610B8 * param0, UnkStruct_ov63_0222CC3C pa sub_02017350(¶m0->unk_04, v0.x, v0.y, v0.z); } -UnkStruct_ov63_0222CC3C ov70_022610E4 (const UnkStruct_ov70_022610B8 * param0) +UnkStruct_ov63_0222CC3C ov70_022610E4(const UnkStruct_ov70_022610B8 *param0) { VecFx32 v0; UnkStruct_ov63_0222CC3C v1; @@ -416,18 +417,18 @@ UnkStruct_ov63_0222CC3C ov70_022610E4 (const UnkStruct_ov70_022610B8 * param0) return v1; } -void ov70_0226110C (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, int param2, int param3) +void ov70_0226110C(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1, int param2, int param3) { ov70_0226111C(param0, param1, param2, param3, NULL); } -void ov70_0226111C (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, int param2, int param3, UnkFuncPtr_ov70_02261C60 param4) +void ov70_0226111C(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1, int param2, int param3, UnkFuncPtr_ov70_02261C60 param4) { GF_ASSERT(param2 < 3); GF_ASSERT(param3 < 7); GF_ASSERT(param1->unk_02 < 18); - if ((param0->unk_29C.unk_120[param1->unk_02][param2] != NULL)) { + if (param0->unk_29C.unk_120[param1->unk_02][param2] != NULL) { if (param1->unk_B8[param2] == 0) { sub_0201727C(¶m1->unk_04, ¶m1->unk_7C[param2]); } @@ -461,7 +462,7 @@ void ov70_0226111C (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * } } -void ov70_02261220 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, int param2) +void ov70_02261220(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1, int param2) { GF_ASSERT(param2 < 3); GF_ASSERT(param1->unk_02 < 18); @@ -477,7 +478,7 @@ void ov70_02261220 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * } } -void ov70_0226128C (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1) +void ov70_0226128C(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1) { int v0; @@ -488,7 +489,7 @@ void ov70_0226128C (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * } } -BOOL ov70_022612B4 (const UnkStruct_ov70_02260BB8 * param0, const UnkStruct_ov70_022610B8 * param1, int param2) +BOOL ov70_022612B4(const UnkStruct_ov70_02260BB8 *param0, const UnkStruct_ov70_022610B8 *param1, int param2) { GF_ASSERT(param2 < 3); GF_ASSERT(param1->unk_02 < 18); @@ -500,7 +501,7 @@ BOOL ov70_022612B4 (const UnkStruct_ov70_02260BB8 * param0, const UnkStruct_ov70 return 0; } -void ov70_022612F0 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, int param2, fx32 param3) +void ov70_022612F0(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1, int param2, fx32 param3) { GF_ASSERT(param2 < 3); GF_ASSERT(param1->unk_02 < 18); @@ -514,56 +515,56 @@ void ov70_022612F0 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * sub_02017240(¶m1->unk_7C[param2], param1->unk_C0[param2]); } -BOOL ov70_02261348 (const UnkStruct_ov70_022610B8 * param0, int param1) +BOOL ov70_02261348(const UnkStruct_ov70_022610B8 *param0, int param1) { GF_ASSERT(param1 < 3); GF_ASSERT(param0->unk_02 < 18); return param0->unk_B8[param1]; } -fx32 ov70_02261368 (const UnkStruct_ov70_022610B8 * param0, int param1) +fx32 ov70_02261368(const UnkStruct_ov70_022610B8 *param0, int param1) { GF_ASSERT(param1 < 3); GF_ASSERT(param0->unk_02 < 18); return param0->unk_C0[param1]; } -void ov70_0226138C (UnkStruct_ov70_022610B8 * param0, BOOL param1) +void ov70_0226138C(UnkStruct_ov70_022610B8 *param0, BOOL param1) { sub_02017348(¶m0->unk_04, param1); } -void ov70_02261398 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1, u32 param2) +void ov70_02261398(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1, u32 param2) { GF_ASSERT(param1->unk_02 < 18); NNS_G3dMdlSetMdlLightEnableFlagAll(param0->unk_29C.unk_00[param1->unk_02].unk_08, param2); } -void ov70_022613C0 (UnkStruct_ov70_022610B8 * param0, fx32 param1) +void ov70_022613C0(UnkStruct_ov70_022610B8 *param0, fx32 param1) { param0->unk_DC = param1; } -void ov70_022613C8 (UnkStruct_ov70_022610B8 * param0, u8 param1, u8 param2) +void ov70_022613C8(UnkStruct_ov70_022610B8 *param0, u8 param1, u8 param2) { param0->unk_E0 = 1; param0->unk_E1 = param1; param0->unk_E2 = param2; } -void ov70_022613E0 (UnkStruct_ov70_022610B8 * param0) +void ov70_022613E0(UnkStruct_ov70_022610B8 *param0) { param0->unk_E0 = 0; } -void ov70_022613E8 (UnkStruct_ov70_022610B8 * param0, fx32 param1, fx32 param2, fx32 param3) +void ov70_022613E8(UnkStruct_ov70_022610B8 *param0, fx32 param1, fx32 param2, fx32 param3) { sub_0201736C(¶m0->unk_04, param1, param2, param3); } -static UnkStruct_ov70_02261418 * ov70_022613F4 (int param0, int param1, u32 param2) +static UnkStruct_ov70_02261418 *ov70_022613F4(int param0, int param1, u32 param2) { - void * v0; + void *v0; u32 v1; v1 = (param1 * 5) + param0; @@ -573,12 +574,12 @@ static UnkStruct_ov70_02261418 * ov70_022613F4 (int param0, int param1, u32 para return v0; } -static void ov70_02261418 (UnkStruct_ov70_02261418 * param0) +static void ov70_02261418(UnkStruct_ov70_02261418 *param0) { Heap_FreeToHeap(param0); } -static void ov70_02261420 (UnkStruct_020170F4 * param0, NARC * param1, u32 param2, u32 param3) +static void ov70_02261420(UnkStruct_020170F4 *param0, NARC *param1, u32 param2, u32 param3) { ov70_0225C730(¶m0->unk_00, param1, param2, param3); @@ -593,12 +594,12 @@ static void ov70_02261420 (UnkStruct_020170F4 * param0, NARC * param1, u32 param } } -static void ov70_0226146C (UnkStruct_020170F4 * param0) +static void ov70_0226146C(UnkStruct_020170F4 *param0) { sub_02017110(param0); } -static void ov70_02261474 (fx32 * param0, const UnkStruct_02017248 * param1, fx32 param2) +static void ov70_02261474(fx32 *param0, const UnkStruct_02017248 *param1, fx32 param2) { fx32 v0; @@ -611,7 +612,7 @@ static void ov70_02261474 (fx32 * param0, const UnkStruct_02017248 * param1, fx3 } } -static BOOL ov70_02261498 (fx32 * param0, const UnkStruct_02017248 * param1, fx32 param2) +static BOOL ov70_02261498(fx32 *param0, const UnkStruct_02017248 *param1, fx32 param2) { fx32 v0; BOOL v1; @@ -629,7 +630,7 @@ static BOOL ov70_02261498 (fx32 * param0, const UnkStruct_02017248 * param1, fx3 return v1; } -static void ov70_022614C0 (fx32 * param0, const UnkStruct_02017248 * param1, fx32 param2) +static void ov70_022614C0(fx32 *param0, const UnkStruct_02017248 *param1, fx32 param2) { fx32 v0; @@ -642,7 +643,7 @@ static void ov70_022614C0 (fx32 * param0, const UnkStruct_02017248 * param1, fx3 } } -static BOOL ov70_022614DC (fx32 * param0, const UnkStruct_02017248 * param1, fx32 param2) +static BOOL ov70_022614DC(fx32 *param0, const UnkStruct_02017248 *param1, fx32 param2) { BOOL v0; @@ -657,7 +658,7 @@ static BOOL ov70_022614DC (fx32 * param0, const UnkStruct_02017248 * param1, fx3 return v0; } -static void ov70_022614F4 (UnkStruct_ov70_022615A4 * param0, NARC * param1, const UnkStruct_ov70_02261418 * param2, u32 param3, NNSFndAllocator * param4) +static void ov70_022614F4(UnkStruct_ov70_022615A4 *param0, NARC *param1, const UnkStruct_ov70_02261418 *param2, u32 param3, NNSFndAllocator *param4) { int v0, v1; @@ -681,7 +682,7 @@ static void ov70_022614F4 (UnkStruct_ov70_022615A4 * param0, NARC * param1, cons } } -static void ov70_022615A4 (UnkStruct_ov70_022615A4 * param0, NNSFndAllocator * param1) +static void ov70_022615A4(UnkStruct_ov70_022615A4 *param0, NNSFndAllocator *param1) { int v0; @@ -697,7 +698,7 @@ static void ov70_022615A4 (UnkStruct_ov70_022615A4 * param0, NNSFndAllocator * p } } -static void ov70_022615E8 (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_022615A4 * param1) +static void ov70_022615E8(UnkStruct_ov70_022615E8 *param0, UnkStruct_ov70_022615A4 *param1) { int v0; @@ -721,7 +722,7 @@ static void ov70_022615E8 (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_0226 } } -static void ov70_02261664 (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_022615A4 * param1) +static void ov70_02261664(UnkStruct_ov70_022615E8 *param0, UnkStruct_ov70_022615A4 *param1) { int v0; @@ -740,7 +741,7 @@ static void ov70_02261664 (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_0226 param0->unk_00 = 0; } -static void ov70_022616B0 (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_022615A4 * param1) +static void ov70_022616B0(UnkStruct_ov70_022615E8 *param0, UnkStruct_ov70_022615A4 *param1) { int v0; @@ -752,7 +753,7 @@ static void ov70_022616B0 (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_0226 } } -static void ov70_022616FC (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_022615A4 * param1) +static void ov70_022616FC(UnkStruct_ov70_022615E8 *param0, UnkStruct_ov70_022615A4 *param1) { int v0, v1; @@ -763,7 +764,7 @@ static void ov70_022616FC (UnkStruct_ov70_022615E8 * param0, UnkStruct_ov70_0226 } } -static UnkStruct_ov70_02260E8C * ov70_02261718 (UnkStruct_ov70_02260BB8 * param0) +static UnkStruct_ov70_02260E8C *ov70_02261718(UnkStruct_ov70_02260BB8 *param0) { int v0; @@ -777,7 +778,7 @@ static UnkStruct_ov70_02260E8C * ov70_02261718 (UnkStruct_ov70_02260BB8 * param0 return NULL; } -static void ov70_0226174C (UnkStruct_ov70_022618C8 * param0, NARC * param1, NNSFndAllocator * param2, const UnkStruct_ov70_02261418 * param3, u32 param4) +static void ov70_0226174C(UnkStruct_ov70_022618C8 *param0, NARC *param1, NNSFndAllocator *param2, const UnkStruct_ov70_02261418 *param3, u32 param4) { int v0, v1, v2; @@ -817,7 +818,7 @@ static void ov70_0226174C (UnkStruct_ov70_022618C8 * param0, NARC * param1, NNSF } } -static void ov70_022618C8 (UnkStruct_ov70_022618C8 * param0, NNSFndAllocator * param1) +static void ov70_022618C8(UnkStruct_ov70_022618C8 *param0, NNSFndAllocator *param1) { int v0, v1; @@ -839,7 +840,7 @@ static void ov70_022618C8 (UnkStruct_ov70_022618C8 * param0, NNSFndAllocator * p NNSG3dTexKey v2; NNSG3dTexKey v3; NNSG3dPlttKey v4; - NNSG3dResTex * v5; + NNSG3dResTex *v5; for (v0 = 0; v0 < 2; v0++) { for (v1 = 0; v1 < 3; v1++) { @@ -858,7 +859,7 @@ static void ov70_022618C8 (UnkStruct_ov70_022618C8 * param0, NNSFndAllocator * p } } -static void ov70_02261968 (UnkStruct_ov70_02260E8C * param0, UnkStruct_ov70_022618C8 * param1) +static void ov70_02261968(UnkStruct_ov70_02260E8C *param0, UnkStruct_ov70_022618C8 *param1) { int v0; @@ -873,8 +874,7 @@ static void ov70_02261968 (UnkStruct_ov70_02260E8C * param0, UnkStruct_ov70_0226 ov70_02261474(¶m0->unk_8C[v0], ¶m1->unk_38[param0->unk_02][v0], FX32_ONE); break; case 1: - case 3: - { + case 3: { BOOL v2; v2 = ov70_02261498(¶m0->unk_8C[v0], ¶m1->unk_38[param0->unk_02][v0], FX32_ONE); @@ -883,8 +883,7 @@ static void ov70_02261968 (UnkStruct_ov70_02260E8C * param0, UnkStruct_ov70_0226 param0->unk_7C[v0] = 0; param0->unk_8C[v0] = 0; } - } - break; + } break; default: GF_ASSERT(0); break; @@ -894,7 +893,7 @@ static void ov70_02261968 (UnkStruct_ov70_02260E8C * param0, UnkStruct_ov70_0226 } } -static void ov70_022619F4 (UnkStruct_ov70_02260E8C * param0, UnkStruct_ov70_022618C8 * param1) +static void ov70_022619F4(UnkStruct_ov70_02260E8C *param0, UnkStruct_ov70_022618C8 *param1) { BOOL v0; int v1; @@ -933,7 +932,7 @@ static void ov70_022619F4 (UnkStruct_ov70_02260E8C * param0, UnkStruct_ov70_0226 NNS_G3dReleaseMdlSet(param1->unk_00[param0->unk_02].unk_04); } -static UnkStruct_ov70_022610B8 * ov70_02261AF0 (UnkStruct_ov70_02260BB8 * param0) +static UnkStruct_ov70_022610B8 *ov70_02261AF0(UnkStruct_ov70_02260BB8 *param0) { int v0; @@ -947,7 +946,7 @@ static UnkStruct_ov70_022610B8 * ov70_02261AF0 (UnkStruct_ov70_02260BB8 * param0 return NULL; } -static void ov70_02261B24 (UnkStruct_ov70_02261BB4 * param0, NARC * param1, NNSFndAllocator * param2, const UnkStruct_ov70_02261418 * param3, u32 param4) +static void ov70_02261B24(UnkStruct_ov70_02261BB4 *param0, NARC *param1, NNSFndAllocator *param2, const UnkStruct_ov70_02261418 *param3, u32 param4) { int v0, v1; @@ -968,7 +967,7 @@ static void ov70_02261B24 (UnkStruct_ov70_02261BB4 * param0, NARC * param1, NNSF } } -static void ov70_02261BB4 (UnkStruct_ov70_02261BB4 * param0, NNSFndAllocator * param1) +static void ov70_02261BB4(UnkStruct_ov70_02261BB4 *param0, NNSFndAllocator *param1) { int v0, v1; @@ -984,7 +983,7 @@ static void ov70_02261BB4 (UnkStruct_ov70_02261BB4 * param0, NNSFndAllocator * p } } -static void ov70_02261C04 (UnkStruct_ov70_02261BB4 * param0, UnkStruct_ov70_022610B8 * param1) +static void ov70_02261C04(UnkStruct_ov70_02261BB4 *param0, UnkStruct_ov70_022610B8 *param1) { int v0; @@ -1007,7 +1006,7 @@ static void ov70_02261C04 (UnkStruct_ov70_02261BB4 * param0, UnkStruct_ov70_0226 } } -static void ov70_02261C60 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1) +static void ov70_02261C60(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1) { int v0; BOOL v1; diff --git a/src/overlay070/ov70_02261E10.c b/src/overlay070/ov70_02261E10.c index 5eb87d8d92..76171f4d75 100644 --- a/src/overlay070/ov70_02261E10.c +++ b/src/overlay070/ov70_02261E10.c @@ -1,35 +1,34 @@ -#include "enums.h" +#include "overlay070/ov70_02261E10.h" #include #include +#include "overlay063/struct_ov63_0222CC3C.h" +#include "overlay070/ov70_0225C858.h" +#include "overlay070/ov70_02260B44.h" #include "overlay070/struct_ov70_0225C894_decl.h" #include "overlay070/struct_ov70_02260BB8_decl.h" #include "overlay070/struct_ov70_02260E8C_decl.h" #include "overlay070/struct_ov70_022610B8_decl.h" -#include "overlay063/struct_ov63_0222CC3C.h" - -#include "unk_02005474.h" +#include "enums.h" #include "heap.h" -#include "overlay070/ov70_0225C858.h" -#include "overlay070/ov70_02260B44.h" -#include "overlay070/ov70_02261E10.h" +#include "unk_02005474.h" typedef struct { - UnkStruct_ov70_022610B8 * unk_00; + UnkStruct_ov70_022610B8 *unk_00; u16 unk_04; s16 unk_06; fx32 unk_08; } UnkStruct_ov70_022629FC; typedef struct { - UnkStruct_ov70_022610B8 * unk_00[3]; - UnkStruct_ov70_022610B8 * unk_0C[3]; + UnkStruct_ov70_022610B8 *unk_00[3]; + UnkStruct_ov70_022610B8 *unk_0C[3]; BOOL unk_18; UnkStruct_ov70_022629FC unk_1C[24]; UnkStruct_ov70_022629FC unk_13C[24]; - UnkStruct_ov70_022610B8 * unk_25C[24]; + UnkStruct_ov70_022610B8 *unk_25C[24]; UnkStruct_ov70_022629FC unk_2BC[24]; u8 unk_3DC; u8 unk_3DD; @@ -39,10 +38,10 @@ typedef struct { } UnkStruct_ov70_02261E10_sub1; typedef struct UnkStruct_ov70_02261E10_t { - const UnkStruct_ov70_0225C894 * unk_00; - UnkStruct_ov70_02260BB8 * unk_04; - UnkStruct_ov70_022610B8 * unk_08[128]; - UnkStruct_ov70_02260E8C * unk_208[9]; + const UnkStruct_ov70_0225C894 *unk_00; + UnkStruct_ov70_02260BB8 *unk_04; + UnkStruct_ov70_022610B8 *unk_08[128]; + UnkStruct_ov70_02260E8C *unk_208[9]; UnkStruct_ov70_02261E10_sub1 unk_22C; u8 unk_610; u8 unk_611; @@ -60,63 +59,63 @@ typedef struct { u16 unk_02; } UnkStruct_ov70_0226D920; -static BOOL ov70_022628C8(const UnkStruct_ov70_022610B8 * param0, u8 param1, u8 param2); -static void ov70_02262908(UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1); -static void ov70_02262938(UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1); -static void ov70_02262968(UnkStruct_ov70_02261E10 * param0, UnkStruct_ov70_022610B8 * param1); -static void ov70_022629AC(UnkStruct_ov70_02261E10 * param0, UnkStruct_ov70_022610B8 * param1); -static void ov70_022629DC(UnkStruct_ov70_02261E10 * param0, UnkStruct_ov70_022610B8 * param1); -static void ov70_022629FC(UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_022610B8 * param1); -static void ov70_02262A04(UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1); -static void ov70_02262A50(UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1, fx32 param2); -static void ov70_02262A80(UnkStruct_ov70_022629FC * param0); -static void ov70_02262AA4(UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1); -static void ov70_02262AE0(UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1); -static void ov70_02262B24(UnkStruct_ov70_022629FC * param0); -static BOOL ov70_02262B2C(UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1); -static void ov70_02262BD0(UnkStruct_ov70_022629FC * param0, fx32 param1); -static void ov70_02262BEC(UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1); -static void ov70_02262C64(UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1); -static void ov70_02262C94(UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1); -static void ov70_02262D0C(UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1); -static void ov70_02262D48(UnkStruct_ov70_022610B8 * param0, u32 param1); +static BOOL ov70_022628C8(const UnkStruct_ov70_022610B8 *param0, u8 param1, u8 param2); +static void ov70_02262908(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1); +static void ov70_02262938(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1); +static void ov70_02262968(UnkStruct_ov70_02261E10 *param0, UnkStruct_ov70_022610B8 *param1); +static void ov70_022629AC(UnkStruct_ov70_02261E10 *param0, UnkStruct_ov70_022610B8 *param1); +static void ov70_022629DC(UnkStruct_ov70_02261E10 *param0, UnkStruct_ov70_022610B8 *param1); +static void ov70_022629FC(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_022610B8 *param1); +static void ov70_02262A04(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1); +static void ov70_02262A50(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1, fx32 param2); +static void ov70_02262A80(UnkStruct_ov70_022629FC *param0); +static void ov70_02262AA4(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1); +static void ov70_02262AE0(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1); +static void ov70_02262B24(UnkStruct_ov70_022629FC *param0); +static BOOL ov70_02262B2C(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1); +static void ov70_02262BD0(UnkStruct_ov70_022629FC *param0, fx32 param1); +static void ov70_02262BEC(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1); +static void ov70_02262C64(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1); +static void ov70_02262C94(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1); +static void ov70_02262D0C(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1); +static void ov70_02262D48(UnkStruct_ov70_022610B8 *param0, u32 param1); static const UnkStruct_ov70_0226D944 Unk_ov70_0226D944[] = { - {0x18, 0x0}, - {0x19, 0x1}, - {0x1A, 0x2}, - {0x1B, 0x3}, - {0x1B, 0x3}, - {0x1C, 0x4}, - {0x21, 0x5}, - {0x46, 0x6}, - {0x47, 0x7}, - {0x48, 0x8}, - {0x4C, 0x9}, - {0x49, 0xA}, - {0x4A, 0xA}, - {0x4B, 0xA}, - {0x4D, 0xB}, - {0x4E, 0xC}, - {0x4D, 0xD}, - {0x4E, 0xD}, - {0x4D, 0xE}, - {0x4E, 0xE}, - {0x19, 0xF}, - {0x1A, 0xF}, - {0x1B, 0xF}, - {0x1B, 0xF}, - {0x1C, 0xF}, - {0x19, 0x10}, - {0x1A, 0x10}, - {0x1B, 0x10}, - {0x1B, 0x10}, - {0x1C, 0x10}, - {0x5C, 0xD}, - {0x5D, 0xD}, - {0x5C, 0xE}, - {0x5D, 0xE}, - {0x62, 0x11} + { 0x18, 0x0 }, + { 0x19, 0x1 }, + { 0x1A, 0x2 }, + { 0x1B, 0x3 }, + { 0x1B, 0x3 }, + { 0x1C, 0x4 }, + { 0x21, 0x5 }, + { 0x46, 0x6 }, + { 0x47, 0x7 }, + { 0x48, 0x8 }, + { 0x4C, 0x9 }, + { 0x49, 0xA }, + { 0x4A, 0xA }, + { 0x4B, 0xA }, + { 0x4D, 0xB }, + { 0x4E, 0xC }, + { 0x4D, 0xD }, + { 0x4E, 0xD }, + { 0x4D, 0xE }, + { 0x4E, 0xE }, + { 0x19, 0xF }, + { 0x1A, 0xF }, + { 0x1B, 0xF }, + { 0x1B, 0xF }, + { 0x1C, 0xF }, + { 0x19, 0x10 }, + { 0x1A, 0x10 }, + { 0x1B, 0x10 }, + { 0x1B, 0x10 }, + { 0x1C, 0x10 }, + { 0x5C, 0xD }, + { 0x5D, 0xD }, + { 0x5C, 0xE }, + { 0x5D, 0xE }, + { 0x62, 0x11 } }; static const s32 Unk_ov70_0226D90C[2] = { @@ -125,26 +124,26 @@ static const s32 Unk_ov70_0226D90C[2] = { }; static const UnkStruct_ov63_0222CC3C Unk_ov70_0226D914[3] = { - {0xFFFFFFFFFFFFFFFE, 0xA}, - {0xE, 0xA}, - {0x1E, 0xA} + { 0xFFFFFFFFFFFFFFFE, 0xA }, + { 0xE, 0xA }, + { 0x1E, 0xA } }; static const UnkStruct_ov70_0226D920 Unk_ov70_0226D920[9] = { - {0x0, 0x0}, - {0x0, 0x0}, - {0x1, 0x0}, - {0x0, 0x1}, - {0x0, 0x1}, - {0x1, 0x1}, - {0x0, 0x2}, - {0x0, 0x2}, - {0x1, 0x2} + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0x1, 0x0 }, + { 0x0, 0x1 }, + { 0x0, 0x1 }, + { 0x1, 0x1 }, + { 0x0, 0x2 }, + { 0x0, 0x2 }, + { 0x1, 0x2 } }; -UnkStruct_ov70_02261E10 * ov70_02261E10 (int param0, int param1, const UnkStruct_ov70_0225C894 * param2, u32 param3, u32 param4) +UnkStruct_ov70_02261E10 *ov70_02261E10(int param0, int param1, const UnkStruct_ov70_0225C894 *param2, u32 param3, u32 param4) { - UnkStruct_ov70_02261E10 * v0; + UnkStruct_ov70_02261E10 *v0; int v1; v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov70_02261E10)); @@ -256,7 +255,7 @@ UnkStruct_ov70_02261E10 * ov70_02261E10 (int param0, int param1, const UnkStruct return v0; } -void ov70_022621AC (UnkStruct_ov70_02261E10 * param0) +void ov70_022621AC(UnkStruct_ov70_02261E10 *param0) { { int v0; @@ -280,7 +279,7 @@ void ov70_022621AC (UnkStruct_ov70_02261E10 * param0) Heap_FreeToHeap(param0); } -void ov70_02262210 (UnkStruct_ov70_02261E10 * param0) +void ov70_02262210(UnkStruct_ov70_02261E10 *param0) { int v0; @@ -299,17 +298,17 @@ void ov70_02262210 (UnkStruct_ov70_02261E10 * param0) ov70_02260BE8(param0->unk_04); } -void ov70_02262298 (UnkStruct_ov70_02261E10 * param0) +void ov70_02262298(UnkStruct_ov70_02261E10 *param0) { ov70_02260C50(param0->unk_04); } -void ov70_022622A4 (UnkStruct_ov70_02261E10 * param0) +void ov70_022622A4(UnkStruct_ov70_02261E10 *param0) { ov70_02260CE0(param0->unk_04); } -void ov70_022622B0 (UnkStruct_ov70_02261E10 * param0, u32 param1, fx32 param2) +void ov70_022622B0(UnkStruct_ov70_02261E10 *param0, u32 param1, fx32 param2) { VecFx32 v0; @@ -322,13 +321,13 @@ void ov70_022622B0 (UnkStruct_ov70_02261E10 * param0, u32 param1, fx32 param2) ov70_02260EA0(param0->unk_208[param1], &v0); } -void ov70_022622EC (UnkStruct_ov70_02261E10 * param0, u32 param1, const VecFx32 * param2) +void ov70_022622EC(UnkStruct_ov70_02261E10 *param0, u32 param1, const VecFx32 *param2) { GF_ASSERT(param0->unk_613 > param1); ov70_02260EE4(param0->unk_208[param1], param2); } -void ov70_02262318 (const UnkStruct_ov70_02261E10 * param0, u32 param1, u32 param2, VecFx32 * param3) +void ov70_02262318(const UnkStruct_ov70_02261E10 *param0, u32 param1, u32 param2, VecFx32 *param3) { GF_ASSERT(param0->unk_613 > param1); GF_ASSERT(param2 < 3); @@ -340,53 +339,53 @@ void ov70_02262318 (const UnkStruct_ov70_02261E10 * param0, u32 param1, u32 para param3->y = (FX32_CONST(40)); } -BOOL ov70_02262374 (UnkStruct_ov70_02261E10 * param0, u32 param1) +BOOL ov70_02262374(UnkStruct_ov70_02261E10 *param0, u32 param1) { GF_ASSERT(param0->unk_613 > param1); return ov70_02260F44(param0->unk_208[param1]); } -BOOL ov70_0226239C (UnkStruct_ov70_02261E10 * param0, u32 param1) +BOOL ov70_0226239C(UnkStruct_ov70_02261E10 *param0, u32 param1) { GF_ASSERT(param0->unk_613 > param1); return ov70_02260F5C(param0->unk_208[param1]); } -void ov70_022623C4 (UnkStruct_ov70_02261E10 * param0, u32 param1, BOOL param2) +void ov70_022623C4(UnkStruct_ov70_02261E10 *param0, u32 param1, BOOL param2) { GF_ASSERT(param0->unk_613 > param1); ov70_02260F38(param0->unk_208[param1], param2); } -void ov70_022623F0 (UnkStruct_ov70_02261E10 * param0, u32 param1, u16 param2) +void ov70_022623F0(UnkStruct_ov70_02261E10 *param0, u32 param1, u16 param2) { GF_ASSERT(param0->unk_613 > param1); ov70_02260F74(param0->unk_208[param1], param2); } -BOOL ov70_0226241C (const UnkStruct_ov70_02261E10 * param0, u32 param1) +BOOL ov70_0226241C(const UnkStruct_ov70_02261E10 *param0, u32 param1) { GF_ASSERT(param0->unk_613 > param1); return ov70_02260F80(param0->unk_208[param1]); } -BOOL ov70_02262444 (const UnkStruct_ov70_02261E10 * param0, u32 param1) +BOOL ov70_02262444(const UnkStruct_ov70_02261E10 *param0, u32 param1) { GF_ASSERT(param0->unk_613 > param1); return ov70_02260F88(param0->unk_208[param1]); } -void ov70_0226246C (UnkStruct_ov70_02261E10 * param0) +void ov70_0226246C(UnkStruct_ov70_02261E10 *param0) { ov70_02260DC8(param0->unk_04); } -void ov70_02262478 (UnkStruct_ov70_02261E10 * param0) +void ov70_02262478(UnkStruct_ov70_02261E10 *param0) { ov70_02260DF4(param0->unk_04); } -void ov70_02262484 (UnkStruct_ov70_02261E10 * param0, u8 param1, u8 param2) +void ov70_02262484(UnkStruct_ov70_02261E10 *param0, u8 param1, u8 param2) { int v0; BOOL v1[2]; @@ -417,7 +416,7 @@ void ov70_02262484 (UnkStruct_ov70_02261E10 * param0, u8 param1, u8 param2) } } -void ov70_0226251C (UnkStruct_ov70_02261E10 * param0, BOOL param1) +void ov70_0226251C(UnkStruct_ov70_02261E10 *param0, BOOL param1) { int v0; u32 v1; @@ -454,7 +453,7 @@ void ov70_0226251C (UnkStruct_ov70_02261E10 * param0, BOOL param1) } } -void ov70_022625D8 (UnkStruct_ov70_02261E10 * param0, fx32 param1) +void ov70_022625D8(UnkStruct_ov70_02261E10 *param0, fx32 param1) { int v0; u32 v1; @@ -464,7 +463,7 @@ void ov70_022625D8 (UnkStruct_ov70_02261E10 * param0, fx32 param1) } } -void ov70_0226260C (UnkStruct_ov70_02261E10 * param0) +void ov70_0226260C(UnkStruct_ov70_02261E10 *param0) { int v0; u32 v1; @@ -485,7 +484,7 @@ void ov70_0226260C (UnkStruct_ov70_02261E10 * param0) } } -void ov70_02262658 (UnkStruct_ov70_02261E10 * param0, int param1) +void ov70_02262658(UnkStruct_ov70_02261E10 *param0, int param1) { int v0; u32 v1; @@ -525,12 +524,12 @@ void ov70_02262658 (UnkStruct_ov70_02261E10 * param0, int param1) } } -BOOL ov70_0226271C (const UnkStruct_ov70_02261E10 * param0) +BOOL ov70_0226271C(const UnkStruct_ov70_02261E10 *param0) { return param0->unk_22C.unk_18; } -void ov70_02262724 (UnkStruct_ov70_02261E10 * param0, BOOL param1, fx32 param2) +void ov70_02262724(UnkStruct_ov70_02261E10 *param0, BOOL param1, fx32 param2) { int v0; @@ -539,10 +538,10 @@ void ov70_02262724 (UnkStruct_ov70_02261E10 * param0, BOOL param1, fx32 param2) } } -BOOL ov70_02262754 (UnkStruct_ov70_02261E10 * param0, u32 param1, BOOL param2, fx32 param3) +BOOL ov70_02262754(UnkStruct_ov70_02261E10 *param0, u32 param1, BOOL param2, fx32 param3) { int v0; - UnkStruct_ov70_022629FC * v1; + UnkStruct_ov70_022629FC *v1; if (param1 < param0->unk_22C.unk_3DC) { v1 = ¶m0->unk_22C.unk_1C[param1]; @@ -559,7 +558,7 @@ BOOL ov70_02262754 (UnkStruct_ov70_02261E10 * param0, u32 param1, BOOL param2, f return 0; } -void ov70_0226278C (UnkStruct_ov70_02261E10 * param0, fx32 param1) +void ov70_0226278C(UnkStruct_ov70_02261E10 *param0, fx32 param1) { int v0; u32 v1; @@ -569,11 +568,11 @@ void ov70_0226278C (UnkStruct_ov70_02261E10 * param0, fx32 param1) } } -void ov70_022627BC (UnkStruct_ov70_02261E10 * param0, enum PlazaMinigame param1, u32 param2, BOOL param3, BOOL param4, BOOL param5) +void ov70_022627BC(UnkStruct_ov70_02261E10 *param0, enum PlazaMinigame param1, u32 param2, BOOL param3, BOOL param4, BOOL param5) { BOOL v0; - UnkStruct_ov70_022610B8 * v1; - UnkStruct_ov70_022610B8 * v2; + UnkStruct_ov70_022610B8 *v1; + UnkStruct_ov70_022610B8 *v2; u32 v3; v3 = param1 - UnkEnum_ov66_022324D0_00; @@ -608,7 +607,7 @@ void ov70_022627BC (UnkStruct_ov70_02261E10 * param0, enum PlazaMinigame param1, } } -static BOOL ov70_022628C8 (const UnkStruct_ov70_022610B8 * param0, u8 param1, u8 param2) +static BOOL ov70_022628C8(const UnkStruct_ov70_022610B8 *param0, u8 param1, u8 param2) { UnkStruct_ov63_0222CC3C v0; UnkStruct_ov63_0222CC3C v1; @@ -625,7 +624,7 @@ static BOOL ov70_022628C8 (const UnkStruct_ov70_022610B8 * param0, u8 param1, u8 return 0; } -static void ov70_02262908 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1) +static void ov70_02262908(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1) { u32 v0; @@ -637,7 +636,7 @@ static void ov70_02262908 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_0226 } } -static void ov70_02262938 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_022610B8 * param1) +static void ov70_02262938(UnkStruct_ov70_02260BB8 *param0, UnkStruct_ov70_022610B8 *param1) { u32 v0; @@ -649,7 +648,7 @@ static void ov70_02262938 (UnkStruct_ov70_02260BB8 * param0, UnkStruct_ov70_0226 } } -static void ov70_02262968 (UnkStruct_ov70_02261E10 * param0, UnkStruct_ov70_022610B8 * param1) +static void ov70_02262968(UnkStruct_ov70_02261E10 *param0, UnkStruct_ov70_022610B8 *param1) { fx32 v0; BOOL v1; @@ -673,7 +672,7 @@ static void ov70_02262968 (UnkStruct_ov70_02261E10 * param0, UnkStruct_ov70_0226 } } -static void ov70_022629AC (UnkStruct_ov70_02261E10 * param0, UnkStruct_ov70_022610B8 * param1) +static void ov70_022629AC(UnkStruct_ov70_02261E10 *param0, UnkStruct_ov70_022610B8 *param1) { BOOL v0; @@ -689,7 +688,7 @@ static void ov70_022629AC (UnkStruct_ov70_02261E10 * param0, UnkStruct_ov70_0226 } } -static void ov70_022629DC (UnkStruct_ov70_02261E10 * param0, UnkStruct_ov70_022610B8 * param1) +static void ov70_022629DC(UnkStruct_ov70_02261E10 *param0, UnkStruct_ov70_022610B8 *param1) { int v0; @@ -698,13 +697,13 @@ static void ov70_022629DC (UnkStruct_ov70_02261E10 * param0, UnkStruct_ov70_0226 } } -static void ov70_022629FC (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_022610B8 * param1) +static void ov70_022629FC(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_022610B8 *param1) { param0->unk_00 = param1; param0->unk_04 = 0; } -static void ov70_02262A04 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1) +static void ov70_02262A04(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1) { switch (param0->unk_04) { case 0: @@ -730,7 +729,7 @@ static void ov70_02262A04 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_0226 } } -static void ov70_02262A50 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1, fx32 param2) +static void ov70_02262A50(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1, fx32 param2) { if ((param0->unk_04 == 1) || (param0->unk_04 == 2)) { return; @@ -744,7 +743,7 @@ static void ov70_02262A50 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_0226 param0->unk_08 = param2; } -static void ov70_02262A80 (UnkStruct_ov70_022629FC * param0) +static void ov70_02262A80(UnkStruct_ov70_022629FC *param0) { if ((param0->unk_04 == 3) || (param0->unk_04 == 4)) { return; @@ -758,7 +757,7 @@ static void ov70_02262A80 (UnkStruct_ov70_022629FC * param0) param0->unk_04 = 3; } -static void ov70_02262AA4 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1) +static void ov70_02262AA4(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1) { ov70_022613C0(param0->unk_00, param0->unk_08); ov70_0226110C(param1, param0->unk_00, 0, 0); @@ -767,7 +766,7 @@ static void ov70_02262AA4 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_0226 ov70_0226138C(param0->unk_00, 1); } -static void ov70_02262AE0 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1) +static void ov70_02262AE0(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1) { ov70_02261220(param1, param0->unk_00, 0); ov70_02261220(param1, param0->unk_00, 1); @@ -777,12 +776,12 @@ static void ov70_02262AE0 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_0226 ov70_022613E8(param0->unk_00, FX32_ONE, FX32_ONE, FX32_ONE); } -static void ov70_02262B24 (UnkStruct_ov70_022629FC * param0) +static void ov70_02262B24(UnkStruct_ov70_022629FC *param0) { param0->unk_06 = 0; } -static BOOL ov70_02262B2C (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1) +static BOOL ov70_02262B2C(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1) { if (param0->unk_06 < 10) { param0->unk_06++; @@ -824,7 +823,7 @@ static BOOL ov70_02262B2C (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_0226 return 1; } -static void ov70_02262BD0 (UnkStruct_ov70_022629FC * param0, fx32 param1) +static void ov70_02262BD0(UnkStruct_ov70_022629FC *param0, fx32 param1) { if ((param0->unk_04 == 1) || (param0->unk_04 == 2)) { return; @@ -834,7 +833,7 @@ static void ov70_02262BD0 (UnkStruct_ov70_022629FC * param0, fx32 param1) param0->unk_08 = param1; } -static void ov70_02262BEC (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1) +static void ov70_02262BEC(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1) { switch (param0->unk_04) { case 0: @@ -867,7 +866,7 @@ static void ov70_02262BEC (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_0226 } } -static void ov70_02262C64 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1) +static void ov70_02262C64(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1) { ov70_022613C0(param0->unk_00, param0->unk_08); ov70_0226110C(param1, param0->unk_00, 0, 1); @@ -875,7 +874,7 @@ static void ov70_02262C64 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_0226 ov70_0226138C(param0->unk_00, 1); } -static void ov70_02262C94 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1) +static void ov70_02262C94(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1) { switch (param0->unk_04) { case 0: @@ -907,7 +906,7 @@ static void ov70_02262C94 (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_0226 } } -static void ov70_02262D0C (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_02260BB8 * param1) +static void ov70_02262D0C(UnkStruct_ov70_022629FC *param0, UnkStruct_ov70_02260BB8 *param1) { ov70_022613C0(param0->unk_00, param0->unk_08); ov70_0226110C(param1, param0->unk_00, 0, 1); @@ -916,7 +915,7 @@ static void ov70_02262D0C (UnkStruct_ov70_022629FC * param0, UnkStruct_ov70_0226 ov70_0226138C(param0->unk_00, 1); } -static void ov70_02262D48 (UnkStruct_ov70_022610B8 * param0, u32 param1) +static void ov70_02262D48(UnkStruct_ov70_022610B8 *param0, u32 param1) { UnkStruct_ov63_0222CC3C v0; u32 v1; diff --git a/src/overlay070/ov70_02262DA8.c b/src/overlay070/ov70_02262DA8.c index 0c39e6ddc6..02e923b0c4 100644 --- a/src/overlay070/ov70_02262DA8.c +++ b/src/overlay070/ov70_02262DA8.c @@ -1,18 +1,18 @@ +#include "overlay070/ov70_02262DA8.h" + #include #include -#include "overlay070/struct_ov70_0225DEE8_decl.h" - #include "overlay070/funcptr_ov70_0226DA18.h" +#include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_0226DA18.h" #include "heap.h" -#include "overlay070/ov70_02262DA8.h" typedef struct { - const UnkStruct_ov70_0226DA18 * unk_00; - void * unk_04; - void * unk_08; + const UnkStruct_ov70_0226DA18 *unk_00; + void *unk_04; + void *unk_08; u32 unk_0C; } UnkStruct_ov70_0226308C; @@ -26,27 +26,27 @@ typedef struct UnkStruct_ov70_02263344_t { typedef struct UnkStruct_ov70_022630A4_t { u32 unk_00; - UnkStruct_ov70_0225DEE8 * unk_04; + UnkStruct_ov70_0225DEE8 *unk_04; UnkStruct_ov70_02263344 unk_08[20]; UnkStruct_ov70_02263344 unk_2D8; } UnkStruct_ov70_022630A4; -static void ov70_02262F14(UnkStruct_ov70_022630A4 * param0, u32 param1); -static void ov70_02262F64(UnkStruct_ov70_02263344 * param0, u32 param1, u32 param2); -static void ov70_02262F70(UnkStruct_ov70_02263344 * param0); -static void ov70_02262F94(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_022630A4 * param1, u32 param2, u32 param3); -static void ov70_02262FD4(UnkStruct_ov70_02263344 * param0, const UnkStruct_ov70_0226DA18 * param1, void * param2); -static void ov70_02263008(UnkStruct_ov70_02263344 * param0, BOOL param1); -static void ov70_0226300C(UnkStruct_ov70_02263344 * param0, const UnkStruct_ov70_0226DA18 * param1, void * param2); -static void ov70_02263044(UnkStruct_ov70_02263344 * param0); -static BOOL ov70_0226306C(const UnkStruct_ov70_02263344 * param0); -static BOOL ov70_0226307C(const UnkStruct_ov70_02263344 * param0); -static void ov70_0226308C(UnkStruct_ov70_0226308C * param0, const UnkStruct_ov70_0226DA18 * param1, void * param2, u32 param3, void * param4); -static void ov70_02263098(UnkStruct_ov70_0226308C * param0); - -UnkStruct_ov70_022630A4 * ov70_02262DA8 (UnkStruct_ov70_0225DEE8 * param0, u32 param1) +static void ov70_02262F14(UnkStruct_ov70_022630A4 *param0, u32 param1); +static void ov70_02262F64(UnkStruct_ov70_02263344 *param0, u32 param1, u32 param2); +static void ov70_02262F70(UnkStruct_ov70_02263344 *param0); +static void ov70_02262F94(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_022630A4 *param1, u32 param2, u32 param3); +static void ov70_02262FD4(UnkStruct_ov70_02263344 *param0, const UnkStruct_ov70_0226DA18 *param1, void *param2); +static void ov70_02263008(UnkStruct_ov70_02263344 *param0, BOOL param1); +static void ov70_0226300C(UnkStruct_ov70_02263344 *param0, const UnkStruct_ov70_0226DA18 *param1, void *param2); +static void ov70_02263044(UnkStruct_ov70_02263344 *param0); +static BOOL ov70_0226306C(const UnkStruct_ov70_02263344 *param0); +static BOOL ov70_0226307C(const UnkStruct_ov70_02263344 *param0); +static void ov70_0226308C(UnkStruct_ov70_0226308C *param0, const UnkStruct_ov70_0226DA18 *param1, void *param2, u32 param3, void *param4); +static void ov70_02263098(UnkStruct_ov70_0226308C *param0); + +UnkStruct_ov70_022630A4 *ov70_02262DA8(UnkStruct_ov70_0225DEE8 *param0, u32 param1) { - UnkStruct_ov70_022630A4 * v0; + UnkStruct_ov70_022630A4 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov70_022630A4)); memset(v0, 0, sizeof(UnkStruct_ov70_022630A4)); @@ -67,7 +67,7 @@ UnkStruct_ov70_022630A4 * ov70_02262DA8 (UnkStruct_ov70_0225DEE8 * param0, u32 p return v0; } -void ov70_02262DF4 (UnkStruct_ov70_022630A4 * param0) +void ov70_02262DF4(UnkStruct_ov70_022630A4 *param0) { { int v0; @@ -81,22 +81,22 @@ void ov70_02262DF4 (UnkStruct_ov70_022630A4 * param0) Heap_FreeToHeap(param0); } -void ov70_02262E20 (UnkStruct_ov70_022630A4 * param0) +void ov70_02262E20(UnkStruct_ov70_022630A4 *param0) { ov70_02262F14(param0, 0); } -void ov70_02262E2C (UnkStruct_ov70_022630A4 * param0) +void ov70_02262E2C(UnkStruct_ov70_022630A4 *param0) { ov70_02262F14(param0, 1); } -void * ov70_02262E38 (UnkStruct_ov70_02263344 * param0) +void *ov70_02262E38(UnkStruct_ov70_02263344 *param0) { return param0->unk_04.unk_08; } -void * ov70_02262E3C (UnkStruct_ov70_02263344 * param0, u32 param1) +void *ov70_02262E3C(UnkStruct_ov70_02263344 *param0, u32 param1) { GF_ASSERT(param0->unk_04.unk_04 == NULL); @@ -106,34 +106,34 @@ void * ov70_02262E3C (UnkStruct_ov70_02263344 * param0, u32 param1) return param0->unk_04.unk_04; } -void ov70_02262E64 (UnkStruct_ov70_02263344 * param0) +void ov70_02262E64(UnkStruct_ov70_02263344 *param0) { GF_ASSERT(param0->unk_04.unk_04 != NULL); Heap_FreeToHeap(param0->unk_04.unk_04); param0->unk_04.unk_04 = NULL; } -void * ov70_02262E80 (UnkStruct_ov70_02263344 * param0) +void *ov70_02262E80(UnkStruct_ov70_02263344 *param0) { return param0->unk_04.unk_04; } -u32 ov70_02262E84 (const UnkStruct_ov70_02263344 * param0) +u32 ov70_02262E84(const UnkStruct_ov70_02263344 *param0) { return param0->unk_04.unk_0C; } -void ov70_02262E88 (UnkStruct_ov70_02263344 * param0, u32 param1) +void ov70_02262E88(UnkStruct_ov70_02263344 *param0, u32 param1) { param0->unk_04.unk_0C = param1; } -void ov70_02262E8C (UnkStruct_ov70_02263344 * param0) +void ov70_02262E8C(UnkStruct_ov70_02263344 *param0) { param0->unk_04.unk_0C++; } -void ov70_02262E94 (UnkStruct_ov70_022630A4 * param0, u32 param1, const UnkStruct_ov70_0226DA18 * param2, void * param3) +void ov70_02262E94(UnkStruct_ov70_022630A4 *param0, u32 param1, const UnkStruct_ov70_0226DA18 *param2, void *param3) { GF_ASSERT(param0); GF_ASSERT(param1 < 20); @@ -141,7 +141,7 @@ void ov70_02262E94 (UnkStruct_ov70_022630A4 * param0, u32 param1, const UnkStruc ov70_02262FD4(¶m0->unk_08[param1], param2, param3); } -void ov70_02262EC0 (UnkStruct_ov70_022630A4 * param0, u32 param1, const UnkStruct_ov70_0226DA18 * param2, void * param3) +void ov70_02262EC0(UnkStruct_ov70_022630A4 *param0, u32 param1, const UnkStruct_ov70_0226DA18 *param2, void *param3) { GF_ASSERT(param0); GF_ASSERT(param1 < 20); @@ -149,7 +149,7 @@ void ov70_02262EC0 (UnkStruct_ov70_022630A4 * param0, u32 param1, const UnkStruc ov70_0226300C(¶m0->unk_08[param1], param2, param3); } -void ov70_02262EEC (UnkStruct_ov70_022630A4 * param0, u32 param1, BOOL param2) +void ov70_02262EEC(UnkStruct_ov70_022630A4 *param0, u32 param1, BOOL param2) { GF_ASSERT(param0); GF_ASSERT(param1 < 20); @@ -157,7 +157,7 @@ void ov70_02262EEC (UnkStruct_ov70_022630A4 * param0, u32 param1, BOOL param2) ov70_02263008(¶m0->unk_08[param1], param2); } -static void ov70_02262F14 (UnkStruct_ov70_022630A4 * param0, u32 param1) +static void ov70_02262F14(UnkStruct_ov70_022630A4 *param0, u32 param1) { if (ov70_0226307C(¶m0->unk_2D8) == 1) { ov70_02262F94(¶m0->unk_2D8, param0, param1, 0); @@ -175,14 +175,14 @@ static void ov70_02262F14 (UnkStruct_ov70_022630A4 * param0, u32 param1) } } -static void ov70_02262F64 (UnkStruct_ov70_02263344 * param0, u32 param1, u32 param2) +static void ov70_02262F64(UnkStruct_ov70_02263344 *param0, u32 param1, u32 param2) { param0->unk_00 = param2; param0->unk_02 = 1; param0->unk_03 = param1; } -static void ov70_02262F70 (UnkStruct_ov70_02263344 * param0) +static void ov70_02262F70(UnkStruct_ov70_02263344 *param0) { if (param0->unk_04.unk_04 != NULL) { Heap_FreeToHeap(param0->unk_04.unk_04); @@ -195,7 +195,7 @@ static void ov70_02262F70 (UnkStruct_ov70_02263344 * param0) memset(param0, 0, sizeof(UnkStruct_ov70_02263344)); } -static void ov70_02262F94 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_022630A4 * param1, u32 param2, u32 param3) +static void ov70_02262F94(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_022630A4 *param1, u32 param2, u32 param3) { BOOL v0; UnkFuncPtr_ov70_0226DA18 v1; @@ -225,7 +225,7 @@ static void ov70_02262F94 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0226 } } -static void ov70_02262FD4 (UnkStruct_ov70_02263344 * param0, const UnkStruct_ov70_0226DA18 * param1, void * param2) +static void ov70_02262FD4(UnkStruct_ov70_02263344 *param0, const UnkStruct_ov70_0226DA18 *param1, void *param2) { GF_ASSERT(ov70_0226306C(param0) == 1); GF_ASSERT(param0->unk_04.unk_04 == NULL); @@ -233,12 +233,12 @@ static void ov70_02262FD4 (UnkStruct_ov70_02263344 * param0, const UnkStruct_ov7 ov70_0226308C(¶m0->unk_04, param1, param2, 0, NULL); } -static void ov70_02263008 (UnkStruct_ov70_02263344 * param0, BOOL param1) +static void ov70_02263008(UnkStruct_ov70_02263344 *param0, BOOL param1) { param0->unk_02 = param1; } -static void ov70_0226300C (UnkStruct_ov70_02263344 * param0, const UnkStruct_ov70_0226DA18 * param1, void * param2) +static void ov70_0226300C(UnkStruct_ov70_02263344 *param0, const UnkStruct_ov70_0226DA18 *param1, void *param2) { GF_ASSERT(ov70_0226306C(param0) == 1); param0->unk_14 = param0->unk_04; @@ -246,7 +246,7 @@ static void ov70_0226300C (UnkStruct_ov70_02263344 * param0, const UnkStruct_ov7 ov70_0226308C(¶m0->unk_04, param1, param2, 0, NULL); } -static void ov70_02263044 (UnkStruct_ov70_02263344 * param0) +static void ov70_02263044(UnkStruct_ov70_02263344 *param0) { GF_ASSERT(param0->unk_04.unk_04 == NULL); param0->unk_04 = param0->unk_14; @@ -254,7 +254,7 @@ static void ov70_02263044 (UnkStruct_ov70_02263344 * param0) ov70_02263098(¶m0->unk_14); } -static BOOL ov70_0226306C (const UnkStruct_ov70_02263344 * param0) +static BOOL ov70_0226306C(const UnkStruct_ov70_02263344 *param0) { if (param0->unk_14.unk_00 == NULL) { return 1; @@ -263,7 +263,7 @@ static BOOL ov70_0226306C (const UnkStruct_ov70_02263344 * param0) return 0; } -static BOOL ov70_0226307C (const UnkStruct_ov70_02263344 * param0) +static BOOL ov70_0226307C(const UnkStruct_ov70_02263344 *param0) { if (param0->unk_04.unk_00 == NULL) { return 0; @@ -272,7 +272,7 @@ static BOOL ov70_0226307C (const UnkStruct_ov70_02263344 * param0) return 1; } -static void ov70_0226308C (UnkStruct_ov70_0226308C * param0, const UnkStruct_ov70_0226DA18 * param1, void * param2, u32 param3, void * param4) +static void ov70_0226308C(UnkStruct_ov70_0226308C *param0, const UnkStruct_ov70_0226DA18 *param1, void *param2, u32 param3, void *param4) { param0->unk_00 = param1; param0->unk_0C = param3; @@ -280,7 +280,7 @@ static void ov70_0226308C (UnkStruct_ov70_0226308C * param0, const UnkStruct_ov7 param0->unk_08 = param2; } -static void ov70_02263098 (UnkStruct_ov70_0226308C * param0) +static void ov70_02263098(UnkStruct_ov70_0226308C *param0) { param0->unk_00 = NULL; param0->unk_0C = 0; diff --git a/src/overlay070/ov70_022630A4.c b/src/overlay070/ov70_022630A4.c index bac07b0578..13a9e359a4 100644 --- a/src/overlay070/ov70_022630A4.c +++ b/src/overlay070/ov70_022630A4.c @@ -1,14 +1,26 @@ -#include "enums.h" +#include "overlay070/ov70_022630A4.h" +#include #include #include -#include - -#include "core_sys.h" -#include "strbuf.h" +#include "overlay063/ov63_0222BE18.h" +#include "overlay063/struct_ov63_0222CC3C.h" +#include "overlay066/ov66_0222DDF0.h" +#include "overlay066/ov66_02231428.h" +#include "overlay066/ov66_022324F0.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay066/struct_ov66_0222E71C_decl.h" +#include "overlay070/ov70_0225C700.h" +#include "overlay070/ov70_0225C858.h" +#include "overlay070/ov70_0225C9B4.h" +#include "overlay070/ov70_0225D9A4.h" +#include "overlay070/ov70_02260A70.h" +#include "overlay070/ov70_02261E10.h" +#include "overlay070/ov70_02262DA8.h" +#include "overlay070/ov70_02265F38.h" +#include "overlay070/ov70_02266E9C.h" +#include "overlay070/ov70_0226CC74.h" #include "overlay070/struct_ov70_0225C894_decl.h" #include "overlay070/struct_ov70_0225CA20_decl.h" #include "overlay070/struct_ov70_0225CC54_decl.h" @@ -17,30 +29,16 @@ #include "overlay070/struct_ov70_02261E10_decl.h" #include "overlay070/struct_ov70_022630A4_decl.h" #include "overlay070/struct_ov70_02263344_decl.h" - -#include "overlay063/struct_ov63_0222CC3C.h" #include "overlay070/struct_ov70_02263910.h" #include "overlay070/struct_ov70_02265F38.h" #include "overlay070/struct_ov70_0226DA18.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "core_sys.h" +#include "enums.h" +#include "strbuf.h" #include "unk_02005474.h" #include "unk_0201D15C.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_02231428.h" -#include "overlay066/ov66_022324F0.h" -#include "overlay070/ov70_0225C700.h" -#include "overlay070/ov70_0225C858.h" -#include "overlay070/ov70_0225C9B4.h" -#include "overlay070/ov70_0225D9A4.h" -#include "overlay070/ov70_02260A70.h" -#include "overlay070/ov70_02261E10.h" -#include "overlay070/ov70_02262DA8.h" -#include "overlay070/ov70_022630A4.h" -#include "overlay070/ov70_02265F38.h" -#include "overlay070/ov70_02266E9C.h" -#include "overlay070/ov70_0226CC74.h" typedef struct { fx32 unk_00; @@ -86,7 +84,7 @@ typedef struct { s16 unk_08; u8 unk_0A; u8 unk_0B; - UnkStruct_ov70_0225CC54 * unk_0C; + UnkStruct_ov70_0225CC54 *unk_0C; UnkStruct_ov70_02263270 unk_10; } UnkStruct_ov70_02265104; @@ -104,7 +102,7 @@ typedef struct { } UnkStruct_ov70_0226545C; typedef struct { - UnkStruct_ov70_0225CC54 * unk_00; + UnkStruct_ov70_0225CC54 *unk_00; u32 unk_04; u32 unk_08; fx32 unk_0C; @@ -113,7 +111,7 @@ typedef struct { UnkStruct_ov70_02263270 unk_18; } UnkStruct_ov70_02265840; -typedef void (* UnkFuncPtr_ov70_0226DBB8)(UnkStruct_ov70_0226315C *, UnkStruct_ov70_0225DEE8 *, u32, u32); +typedef void (*UnkFuncPtr_ov70_0226DBB8)(UnkStruct_ov70_0226315C *, UnkStruct_ov70_0225DEE8 *, u32, u32); typedef struct { u8 unk_00[8]; @@ -123,44 +121,44 @@ typedef struct { } UnkStruct_ov70_0226DBB8; static BOOL ov70_02263120(int param0); -static UnkStruct_ov70_0225CC54 * ov70_022631F8(UnkStruct_ov70_0225DEE8 * param0, u32 param1); -static void ov70_02263230(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2, u32 param3, int param4); -static void ov70_02263270(UnkStruct_ov70_02263270 * param0); -static fx32 ov70_02263290(UnkStruct_ov70_02263270 * param0); -static void ov70_0226332C(UnkStruct_ov70_02263270 * param0); -static BOOL ov70_02263334(const UnkStruct_ov70_02263270 * param0); -static BOOL ov70_02263344(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02263414(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02263910(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02263A58(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02263BA4(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static void ov70_0226315C(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, const UnkStruct_ov70_0226DBB8 * param3, u32 param4); -static BOOL ov70_02263CC8(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_0226412C(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02264150(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02264324(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_022646C8(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02264974(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); +static UnkStruct_ov70_0225CC54 *ov70_022631F8(UnkStruct_ov70_0225DEE8 *param0, u32 param1); +static void ov70_02263230(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2, u32 param3, int param4); +static void ov70_02263270(UnkStruct_ov70_02263270 *param0); +static fx32 ov70_02263290(UnkStruct_ov70_02263270 *param0); +static void ov70_0226332C(UnkStruct_ov70_02263270 *param0); +static BOOL ov70_02263334(const UnkStruct_ov70_02263270 *param0); +static BOOL ov70_02263344(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02263414(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02263910(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02263A58(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02263BA4(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static void ov70_0226315C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2, const UnkStruct_ov70_0226DBB8 *param3, u32 param4); +static BOOL ov70_02263CC8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_0226412C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02264150(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02264324(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_022646C8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02264974(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); static u32 ov70_02264B64(u32 param0); static u32 ov70_02264BCC(u32 param0); static u32 ov70_02264C34(u32 param0); -static BOOL ov70_02264C9C(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02264D38(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static void ov70_022650E4(UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_02260AD4 * param1); -static BOOL ov70_02265104(const UnkStruct_ov70_02265104 * param0, const UnkStruct_ov70_02261E10 * param1); -static BOOL ov70_02265144(UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_02261E10 * param1, UnkStruct_ov70_02260AD4 * param2); -static BOOL ov70_022652BC(UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_02261E10 * param1); -static void ov70_02265344(UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_02261E10 * param1, UnkStruct_ov70_0225DEE8 * param2); -static void ov70_02265370(UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_02261E10 * param1, UnkStruct_ov70_0225DEE8 * param2); -static void ov70_022653DC(UnkStruct_ov70_022653DC * param0, UnkStruct_ov70_0225DEE8 * param1); -static void ov70_02265450(UnkStruct_ov70_022653DC * param0, UnkStruct_ov70_0225DEE8 * param1); -static BOOL ov70_0226545C(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02265630(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_022657D0(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02265840(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02265A84(UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2); -static BOOL ov70_02265CCC(UnkStruct_ov70_02265CCC * param0, UnkStruct_ov66_0222DFF8 * param1, UnkStruct_ov70_0225DEE8 * param2, UnkStruct_ov70_0225CC54 * param3, u8 param4, int param5); -static BOOL ov70_02265ED0(const UnkStruct_ov70_0225C894 * param0, const UnkStruct_ov70_0225CA20 * param1, const u32 * param2, u32 param3, UnkStruct_ov63_0222CC3C * param4); +static BOOL ov70_02264C9C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02264D38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static void ov70_022650E4(UnkStruct_ov70_02265104 *param0, UnkStruct_ov70_02260AD4 *param1); +static BOOL ov70_02265104(const UnkStruct_ov70_02265104 *param0, const UnkStruct_ov70_02261E10 *param1); +static BOOL ov70_02265144(UnkStruct_ov70_02265104 *param0, UnkStruct_ov70_02261E10 *param1, UnkStruct_ov70_02260AD4 *param2); +static BOOL ov70_022652BC(UnkStruct_ov70_02265104 *param0, UnkStruct_ov70_02261E10 *param1); +static void ov70_02265344(UnkStruct_ov70_02265104 *param0, UnkStruct_ov70_02261E10 *param1, UnkStruct_ov70_0225DEE8 *param2); +static void ov70_02265370(UnkStruct_ov70_02265104 *param0, UnkStruct_ov70_02261E10 *param1, UnkStruct_ov70_0225DEE8 *param2); +static void ov70_022653DC(UnkStruct_ov70_022653DC *param0, UnkStruct_ov70_0225DEE8 *param1); +static void ov70_02265450(UnkStruct_ov70_022653DC *param0, UnkStruct_ov70_0225DEE8 *param1); +static BOOL ov70_0226545C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02265630(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_022657D0(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02265840(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02265A84(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2); +static BOOL ov70_02265CCC(UnkStruct_ov70_02265CCC *param0, UnkStruct_ov66_0222DFF8 *param1, UnkStruct_ov70_0225DEE8 *param2, UnkStruct_ov70_0225CC54 *param3, u8 param4, int param5); +static BOOL ov70_02265ED0(const UnkStruct_ov70_0225C894 *param0, const UnkStruct_ov70_0225CA20 *param1, const u32 *param2, u32 param3, UnkStruct_ov63_0222CC3C *param4); static const UnkStruct_ov84_02240FA8 Unk_ov70_0226DA98 = { NULL, @@ -247,10 +245,10 @@ static const UnkStruct_ov70_0226DA18 Unk_ov70_0226DA18 = { }; static const UnkStruct_ov70_0226DA18 Unk_ov70_0226DA78[4] = { - {ov70_02263414, NULL}, - {ov70_02263910, NULL}, - {ov70_02263A58, NULL}, - {ov70_02263BA4, NULL} + { ov70_02263414, NULL }, + { ov70_02263910, NULL }, + { ov70_02263A58, NULL }, + { ov70_02263BA4, NULL } }; static const UnkStruct_ov70_0226DA18 Unk_ov70_0226D9D0 = { @@ -295,113 +293,113 @@ static const UnkStruct_ov70_0226DA18 Unk_ov70_0226D9F0 = { static const UnkStruct_ov70_0226DBB8 Unk_ov70_0226DBB8[] = { { - {0x1, 0xFF}, + { 0x1, 0xFF }, 0x0, - {ov70_02264150, NULL}, - NULL + { ov70_02264150, NULL }, + NULL, }, { - {0x16, 0x17, 0x18, 0x19, 0xFF}, + { 0x16, 0x17, 0x18, 0x19, 0xFF }, 0x0, - {ov70_02264324, NULL}, - NULL + { ov70_02264324, NULL }, + NULL, }, { - {0x1A, 0x1B, 0x1C, 0x1D, 0xFF}, + { 0x1A, 0x1B, 0x1C, 0x1D, 0xFF }, 0x0, - {ov70_02264324, NULL}, - NULL + { ov70_02264324, NULL }, + NULL, }, { - {0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD}, + { 0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD }, 0x0, - {ov70_02264324, NULL}, - NULL + { ov70_02264324, NULL }, + NULL, }, { - {0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15}, + { 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15 }, 0x0, - {ov70_02264324, NULL}, - NULL + { ov70_02264324, NULL }, + NULL, }, { - {0x21, 0x22, 0x23, 0xFF}, + { 0x21, 0x22, 0x23, 0xFF }, 0x0, - {ov70_02264D38, NULL}, - NULL + { ov70_02264D38, NULL }, + NULL, }, { - {0x1E, 0x1F, 0x20, 0xFF}, + { 0x1E, 0x1F, 0x20, 0xFF }, 0x0, - {ov70_022646C8, NULL}, - NULL + { ov70_022646C8, NULL }, + NULL, }, { - {0x2C, 0xFF}, + { 0x2C, 0xFF }, 0x0, - {ov70_02264974, NULL}, - NULL + { ov70_02264974, NULL }, + NULL, }, { - {0xFF}, + { 0xFF }, 0x3, - {NULL, NULL}, - NULL - } + { NULL, NULL }, + NULL, + }, }; static const UnkStruct_ov70_0226DBB8 Unk_ov70_0226DB28[] = { { - {0x24, 0xFF}, + { 0x24, 0xFF }, 0x1, - {ov70_02264C9C, NULL}, - NULL + { ov70_02264C9C, NULL }, + NULL, }, { - {0x25, 0xFF}, + { 0x25, 0xFF }, 0x1, - {ov70_02268390, NULL}, - NULL + { ov70_02268390, NULL }, + NULL, }, { - {0x26, 0xFF}, + { 0x26, 0xFF }, 0x1, - {ov70_0226889C, NULL}, - NULL + { ov70_0226889C, NULL }, + NULL, }, { - {0x27, 0x28, 0x29, 0xFF}, + { 0x27, 0x28, 0x29, 0xFF }, 0x1, - {ov70_022669FC, NULL}, - NULL + { ov70_022669FC, NULL }, + NULL, }, { - {0x2B, 0xFF}, + { 0x2B, 0xFF }, 0x1, - {ov70_0226CC74, NULL}, - NULL + { ov70_0226CC74, NULL }, + NULL, }, { - {0xFF}, + { 0xFF }, 0x3, - {NULL, NULL}, - NULL - } + { NULL, NULL }, + NULL, + }, }; static const UnkStruct_ov70_0226DBB8 Unk_ov70_0226DAF8[] = { { - {0x27, 0x28, 0x29, 0xFF}, + { 0x27, 0x28, 0x29, 0xFF }, 0x1, - {ov70_022669FC, NULL}, - NULL + { ov70_022669FC, NULL }, + NULL, }, { - {0xFF}, + { 0xFF }, 0x3, - {NULL, NULL}, - NULL - } + { NULL, NULL }, + NULL, + }, }; static const UnkStruct_ov70_0226DA18 Unk_ov70_0226D9F8 = { @@ -414,10 +412,10 @@ static const UnkStruct_ov70_0226DA18 Unk_ov70_0226DA08 = { NULL }; -void ov70_022630A4 (UnkStruct_ov70_0225DEE8 * param0) +void ov70_022630A4(UnkStruct_ov70_0225DEE8 *param0) { - UnkStruct_ov70_02263910 * v0; - UnkStruct_ov70_022630A4 * v1; + UnkStruct_ov70_02263910 *v0; + UnkStruct_ov70_022630A4 *v1; u32 v2; u32 v3; @@ -430,11 +428,11 @@ void ov70_022630A4 (UnkStruct_ov70_0225DEE8 * param0) ov70_02262E94(v1, v2, &Unk_ov70_0226DA78[v0->unk_06], NULL); } -void ov70_022630EC (UnkStruct_ov70_0225DEE8 * param0) +void ov70_022630EC(UnkStruct_ov70_0225DEE8 *param0) { int v0; u32 v1; - UnkStruct_ov70_022630A4 * v2; + UnkStruct_ov70_022630A4 *v2; v1 = ov70_0225DF2C(param0); v2 = ov70_0225DF10(param0); @@ -446,7 +444,7 @@ void ov70_022630EC (UnkStruct_ov70_0225DEE8 * param0) } } -static BOOL ov70_02263120 (int param0) +static BOOL ov70_02263120(int param0) { u32 v0; @@ -472,12 +470,12 @@ static BOOL ov70_02263120 (int param0) return 0; } -static void ov70_0226315C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, const UnkStruct_ov70_0226DBB8 * param3, u32 param4) +static void ov70_0226315C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2, const UnkStruct_ov70_0226DBB8 *param3, u32 param4) { int v0; int v1; - UnkStruct_ov70_0226315C * v2; - UnkStruct_ov70_022630A4 * v3; + UnkStruct_ov70_0226315C *v2; + UnkStruct_ov70_022630A4 *v3; v2 = ov70_02262E80(param0); @@ -519,11 +517,11 @@ static void ov70_0226315C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return; } -static UnkStruct_ov70_0225CC54 * ov70_022631F8 (UnkStruct_ov70_0225DEE8 * param0, u32 param1) +static UnkStruct_ov70_0225CC54 *ov70_022631F8(UnkStruct_ov70_0225DEE8 *param0, u32 param1) { - UnkStruct_ov70_0225CC54 * v0; - UnkStruct_ov70_0225CA20 * v1; - UnkStruct_ov70_02260AD4 * v2; + UnkStruct_ov70_0225CC54 *v0; + UnkStruct_ov70_0225CA20 *v1; + UnkStruct_ov70_02260AD4 *v2; VecFx32 v3; v1 = ov70_0225DEF0(param0); @@ -536,11 +534,11 @@ static UnkStruct_ov70_0225CC54 * ov70_022631F8 (UnkStruct_ov70_0225DEE8 * param0 return v0; } -static void ov70_02263230 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2, u32 param3, int param4) +static void ov70_02263230(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2, u32 param3, int param4) { - UnkStruct_ov70_0225CC54 * v0; - UnkStruct_ov70_0225CA20 * v1; - UnkStruct_ov70_02260AD4 * v2; + UnkStruct_ov70_0225CC54 *v0; + UnkStruct_ov70_0225CA20 *v1; + UnkStruct_ov70_02260AD4 *v2; v1 = ov70_0225DEF0(param0); v2 = ov70_0225DF08(param0); @@ -550,7 +548,7 @@ static void ov70_02263230 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 par ov70_02260B38(v2, v0); } -static void ov70_02263270 (UnkStruct_ov70_02263270 * param0) +static void ov70_02263270(UnkStruct_ov70_02263270 *param0) { param0->unk_00 = 0; param0->unk_04 = 0; @@ -559,7 +557,7 @@ static void ov70_02263270 (UnkStruct_ov70_02263270 * param0) param0->unk_07 = 1; } -static fx32 ov70_02263290 (UnkStruct_ov70_02263270 * param0) +static fx32 ov70_02263290(UnkStruct_ov70_02263270 *param0) { u16 v0; @@ -595,12 +593,12 @@ static fx32 ov70_02263290 (UnkStruct_ov70_02263270 * param0) return param0->unk_00; } -static void ov70_0226332C (UnkStruct_ov70_02263270 * param0) +static void ov70_0226332C(UnkStruct_ov70_02263270 *param0) { param0->unk_07 = 0; } -static BOOL ov70_02263334 (const UnkStruct_ov70_02263270 * param0) +static BOOL ov70_02263334(const UnkStruct_ov70_02263270 *param0) { if (param0->unk_05 == 0) { return 0; @@ -609,11 +607,11 @@ static BOOL ov70_02263334 (const UnkStruct_ov70_02263270 * param0) return 1; } -static BOOL ov70_02263344 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02263344(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_0225CA20 * v0; - UnkStruct_ov70_0225CC54 * v1; - UnkStruct_ov66_0222DFF8 * v2; + UnkStruct_ov70_0225CA20 *v0; + UnkStruct_ov70_0225CC54 *v1; + UnkStruct_ov66_0222DFF8 *v2; v0 = ov70_0225DEF0(param1); v1 = ov70_0225CC70(v0, param2); @@ -637,7 +635,7 @@ static BOOL ov70_02263344 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 if (param2 == ov66_0222E338(v2)) { ov70_0225CDEC(v0, v1, 1); } else { - if ((ov70_0225E3F0(param1) == 1)) { + if (ov70_0225E3F0(param1) == 1) { if (param2 != ov70_0225E3E0(param1)) { ov70_0225CDEC(v0, v1, 2); } @@ -656,13 +654,13 @@ static BOOL ov70_02263344 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02263414(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_022653DC * v0; - UnkStruct_ov70_0225CC54 * v1; - UnkStruct_ov70_0225CA20 * v2; - UnkStruct_ov66_0222DFF8 * v3; - Strbuf* v4; + UnkStruct_ov70_022653DC *v0; + UnkStruct_ov70_0225CC54 *v1; + UnkStruct_ov70_0225CA20 *v2; + UnkStruct_ov66_0222DFF8 *v3; + Strbuf *v4; v3 = ov70_0225DEE8(param1); v2 = ov70_0225DEF0(param1); @@ -691,7 +689,7 @@ static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v2, v1, 0); { - UnkStruct_ov70_02260AD4 * v5; + UnkStruct_ov70_02260AD4 *v5; v5 = ov70_0225DF08(param1); ov70_02260B38(v5, v1); @@ -747,8 +745,7 @@ static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225E0F4(param1, 1); ov70_02262E88(param0, 10); break; - case 10: - { + case 10: { u32 v6; u32 v7; BOOL v8 = 0; @@ -784,10 +781,8 @@ static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E88(param0, 17); } } - } - break; - case 11: - { + } break; + case 11: { int v9; v9 = ov70_0225E1C4(param1); @@ -807,8 +802,7 @@ static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 default: break; } - } - break; + } break; case 12: v4 = ov70_0225E20C(param1, 1, 10); ov70_0225DF9C(param1, v4); @@ -816,8 +810,7 @@ static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225E0F4(param1, 1); ov70_02262E88(param0, 13); break; - case 13: - { + case 13: { u32 v10; u32 v11; BOOL v12 = 0; @@ -853,10 +846,8 @@ static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E88(param0, 19); } } - } - break; - case 15: - { + } break; + case 15: { int v13; v13 = ov70_0225E1C4(param1); @@ -876,8 +867,7 @@ static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 default: break; } - } - break; + } break; case 16: Sound_PlayEffect(1448); ov70_0225E430(param1); @@ -952,7 +942,7 @@ static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E64(param0); { - UnkStruct_ov70_022630A4 * v15; + UnkStruct_ov70_022630A4 *v15; u32 v16; v15 = ov70_0225DF10(param1); @@ -966,12 +956,12 @@ static BOOL ov70_02263414 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02263910 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02263910(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_0225CC54 * v0; - UnkStruct_ov70_0225CA20 * v1; - UnkStruct_ov70_02263910 * v2; - UnkStruct_ov66_0222DFF8 * v3; + UnkStruct_ov70_0225CC54 *v0; + UnkStruct_ov70_0225CA20 *v1; + UnkStruct_ov70_02263910 *v2; + UnkStruct_ov66_0222DFF8 *v3; v3 = ov70_0225DEE8(param1); v2 = ov70_0225DEEC(param1); @@ -990,7 +980,7 @@ static BOOL ov70_02263910 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E8C(param0); break; case 1: - if ((ov66_02231760() == 0)) { + if (ov66_02231760() == 0) { if (ov66_02232AD4() == 0) { break; } @@ -1003,8 +993,7 @@ static BOOL ov70_02263910 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDAC(v1, v0, 2, v2->unk_04); } break; - case 2: - { + case 2: { u32 v4; v4 = ov70_0225CD60(v0, 5); @@ -1018,11 +1007,9 @@ static BOOL ov70_02263910 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E88(param0, 5); } } - } - break; - case 3: - { - Strbuf* v5; + } break; + case 3: { + Strbuf *v5; ov70_0225E27C(param1, v2->unk_08, 0); @@ -1030,8 +1017,7 @@ static BOOL ov70_02263910 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225DF8C(param1, v5); ov70_02262E8C(param0); - } - break; + } break; case 4: if (ov70_0225DFAC(param1) == 1) { ov70_0225DFEC(param1); @@ -1042,7 +1028,7 @@ static BOOL ov70_02263910 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v1, v0, 1); { - UnkStruct_ov70_022630A4 * v6; + UnkStruct_ov70_022630A4 *v6; u32 v7; v6 = ov70_0225DF10(param1); @@ -1056,13 +1042,13 @@ static BOOL ov70_02263910 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02263A58 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02263A58(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_0225CC54 * v0; - UnkStruct_ov70_0225CA20 * v1; - UnkStruct_ov70_022630A4 * v2; - UnkStruct_ov70_02263910 * v3; - UnkStruct_ov66_0222DFF8 * v4; + UnkStruct_ov70_0225CC54 *v0; + UnkStruct_ov70_0225CA20 *v1; + UnkStruct_ov70_022630A4 *v2; + UnkStruct_ov70_02263910 *v3; + UnkStruct_ov66_0222DFF8 *v4; v2 = ov70_0225DF10(param1); v1 = ov70_0225DEF0(param1); @@ -1071,19 +1057,17 @@ static BOOL ov70_02263A58 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 v3 = ov70_0225DEEC(param1); switch (ov70_02262E84(param0)) { - case 0: - { + case 0: { ov70_02263230(param1, param2, v3->unk_00, v3->unk_02, 1); ov70_02262E8C(param0); ov70_02262EC0(v2, param2, &Unk_ov70_0226DA00, NULL); ov66_0222E2C4(v4, 0); ov66_0222E2CC(v4); - } - break; + } break; case 1: { - UnkStruct_ov70_02263910 * v5; + UnkStruct_ov70_02263910 *v5; v5 = ov70_0225DEEC(param1); @@ -1091,10 +1075,8 @@ static BOOL ov70_02263A58 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E8C(param0); ov70_0225CDAC(v1, v0, 2, v5->unk_04); } - } - break; - case 2: - { + } break; + case 2: { u32 v6; v6 = ov70_0225CD60(v0, 5); @@ -1108,18 +1090,15 @@ static BOOL ov70_02263A58 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E88(param0, 5); } } - } - break; - case 3: - { - Strbuf* v7; + } break; + case 3: { + Strbuf *v7; ov70_0225E27C(param1, v3->unk_08, 0); v7 = ov70_0225E20C(param1, 0, 8); ov70_0225DF8C(param1, v7); ov70_02262E8C(param0); - } - break; + } break; case 4: if (ov70_0225DFAC(param1) == 1) { ov70_0225DFEC(param1); @@ -1130,7 +1109,7 @@ static BOOL ov70_02263A58 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v1, v0, 1); { - UnkStruct_ov70_022630A4 * v8; + UnkStruct_ov70_022630A4 *v8; u32 v9; v8 = ov70_0225DF10(param1); @@ -1144,12 +1123,12 @@ static BOOL ov70_02263A58 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02263BA4 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02263BA4(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_0225CC54 * v0; - UnkStruct_ov70_0225CA20 * v1; - UnkStruct_ov70_02263910 * v2; - UnkStruct_ov66_0222DFF8 * v3; + UnkStruct_ov70_0225CC54 *v0; + UnkStruct_ov70_0225CA20 *v1; + UnkStruct_ov70_02263910 *v2; + UnkStruct_ov66_0222DFF8 *v3; v3 = ov70_0225DEE8(param1); v2 = ov70_0225DEEC(param1); @@ -1170,8 +1149,7 @@ static BOOL ov70_02263BA4 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDAC(v1, v0, 2, v2->unk_04); } break; - case 2: - { + case 2: { u32 v4; v4 = ov70_0225CD60(v0, 5); @@ -1184,19 +1162,16 @@ static BOOL ov70_02263BA4 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E88(param0, 5); } } - } - break; + } break; - case 3: - { - Strbuf* v5; + case 3: { + Strbuf *v5; v5 = ov70_0225E20C(param1, 1, 91); ov70_0225DF8C(param1, v5); ov70_02262E8C(param0); - } - break; + } break; case 4: if (ov70_0225DFAC(param1) == 1) { ov70_0225DFEC(param1); @@ -1207,7 +1182,7 @@ static BOOL ov70_02263BA4 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v1, v0, 1); { - UnkStruct_ov70_022630A4 * v6; + UnkStruct_ov70_022630A4 *v6; u32 v7; v6 = ov70_0225DF10(param1); @@ -1221,9 +1196,9 @@ static BOOL ov70_02263BA4 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02263CC8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02263CC8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_0226315C * v0; + UnkStruct_ov70_0226315C *v0; v0 = ov70_02262E80(param0); @@ -1238,15 +1213,15 @@ static BOOL ov70_02263CC8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 { u32 v1; u32 v2; - UnkStruct_ov70_0225CC54 * v3; + UnkStruct_ov70_0225CC54 *v3; UnkStruct_ov63_0222CC3C v4, v5; u32 v6, v7; - UnkStruct_ov70_0225CA20 * v8; - UnkStruct_ov70_02261E10 * v9; - UnkStruct_ov70_0225C894 * v10; - UnkStruct_ov66_0222DFF8 * v11; - UnkStruct_ov70_022630A4 * v12; - UnkStruct_ov70_0225CC54 * v13; + UnkStruct_ov70_0225CA20 *v8; + UnkStruct_ov70_02261E10 *v9; + UnkStruct_ov70_0225C894 *v10; + UnkStruct_ov66_0222DFF8 *v11; + UnkStruct_ov70_022630A4 *v12; + UnkStruct_ov70_0225CC54 *v13; v12 = ov70_0225DF10(param1); v11 = ov70_0225DEE8(param1); @@ -1289,7 +1264,7 @@ static BOOL ov70_02263CC8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 if (v1 != 0) { if (ov70_0225E400(param1) == 1) { - UnkStruct_ov70_0225CC54 * v15; + UnkStruct_ov70_0225CC54 *v15; u32 v16; if ((v1 == 2) || (v1 == 3) || (v1 == 1)) { @@ -1335,7 +1310,7 @@ static BOOL ov70_02263CC8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 if (gCoreSys.pressedKeys & PAD_BUTTON_A) { { - UnkStruct_ov70_0225CC54 * v17; + UnkStruct_ov70_0225CC54 *v17; u32 v18; BOOL v19; u32 v20; @@ -1384,8 +1359,8 @@ static BOOL ov70_02263CC8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 } } - if ((ov70_02263120(v2) == 1)) { - if ((v2 == 0)) { + if (ov70_02263120(v2) == 1) { + if (v2 == 0) { if (ov70_0225C950(v7) == 1) { ov70_0226315C(param0, param1, param2, Unk_ov70_0226DAF8, v7); ov70_0225CDEC(v8, v3, 0); @@ -1397,7 +1372,7 @@ static BOOL ov70_02263CC8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 } { - UnkStruct_ov70_0225CC54 * v22; + UnkStruct_ov70_0225CC54 *v22; u32 v23; u32 v24; @@ -1446,11 +1421,11 @@ static BOOL ov70_02263CC8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_0226412C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_0226412C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { u32 v0; - UnkStruct_ov70_0225CC54 * v1; - UnkStruct_ov70_0225CA20 * v2; + UnkStruct_ov70_0225CC54 *v1; + UnkStruct_ov70_0225CA20 *v2; v2 = ov70_0225DEF0(param1); v1 = ov70_0225CCAC(v2); @@ -1463,14 +1438,14 @@ static BOOL ov70_0226412C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02264150 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02264150(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { switch (ov70_02262E84(param0)) { case 0: { - UnkStruct_ov70_0225CA20 * v0; - UnkStruct_ov70_0225CC54 * v1; + UnkStruct_ov70_0225CA20 *v0; + UnkStruct_ov70_0225CC54 *v1; v0 = ov70_0225DEF0(param1); v1 = ov70_0225CCAC(v0); @@ -1481,7 +1456,7 @@ static BOOL ov70_02264150 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 Sound_PlayEffect(1501); { - Strbuf* v2; + Strbuf *v2; v2 = ov70_0225E20C(param1, 1, 65); @@ -1494,16 +1469,14 @@ static BOOL ov70_02264150 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E8C(param0); } break; - case 2: - { - Strbuf* v3; + case 2: { + Strbuf *v3; v3 = ov70_0225E20C(param1, 2, 25); ov70_0225DF8C(param1, v3); ov70_02262E8C(param0); - } - break; + } break; case 3: if (ov70_0225DFAC(param1) == 1) { ov70_02262E8C(param0); @@ -1513,8 +1486,7 @@ static BOOL ov70_02264150 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225E194(param1); ov70_02262E8C(param0); break; - case 5: - { + case 5: { u32 v4; BOOL v5 = 0; @@ -1538,15 +1510,14 @@ static BOOL ov70_02264150 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225E1F8(param1); ov70_0225DFEC(param1); } - } - break; + } break; case 6: ov70_0225DF18(param1, 0); { - UnkStruct_ov70_02260AD4 * v6; - UnkStruct_ov70_0225CA20 * v7; - UnkStruct_ov70_0225CC54 * v8; + UnkStruct_ov70_02260AD4 *v6; + UnkStruct_ov70_0225CA20 *v7; + UnkStruct_ov70_0225CC54 *v8; v7 = ov70_0225DEF0(param1); v8 = ov70_0225CCAC(v7); @@ -1558,10 +1529,9 @@ static BOOL ov70_02264150 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E88(param0, 7); break; - case 7: - { - UnkStruct_ov70_0225CA20 * v9; - UnkStruct_ov70_0225CC54 * v10; + case 7: { + UnkStruct_ov70_0225CA20 *v9; + UnkStruct_ov70_0225CC54 *v10; v9 = ov70_0225DEF0(param1); v10 = ov70_0225CCAC(v9); @@ -1573,26 +1543,23 @@ static BOOL ov70_02264150 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 1; } - } - break; - case 8: - { - UnkStruct_ov70_0225CA20 * v11; - UnkStruct_ov70_0225CC54 * v12; + } break; + case 8: { + UnkStruct_ov70_0225CA20 *v11; + UnkStruct_ov70_0225CC54 *v12; v11 = ov70_0225DEF0(param1); v12 = ov70_0225CCAC(v11); ov70_0225CDAC(v11, v12, 2, 0); ov70_02262E8C(param0); - } - break; + } break; case 9: { - UnkStruct_ov70_0225CA20 * v13; - UnkStruct_ov70_0225CC54 * v14; - UnkStruct_ov70_022630A4 * v15; + UnkStruct_ov70_0225CA20 *v13; + UnkStruct_ov70_0225CC54 *v14; + UnkStruct_ov70_022630A4 *v15; u32 v16; ov66_0222E3E4(ov70_0225DEE8(param1), 1); @@ -1606,20 +1573,19 @@ static BOOL ov70_02264150 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v13, v14, 1); ov70_02262E94(v15, param2, &Unk_ov70_0226D9D0, NULL); } - } - break; + } break; } return 0; } -static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02264324(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_0225CA20 * v0; - UnkStruct_ov70_0225CC54 * v1; - UnkStruct_ov66_0222DFF8 * v2; + UnkStruct_ov70_0225CA20 *v0; + UnkStruct_ov70_0225CC54 *v1; + UnkStruct_ov66_0222DFF8 *v2; u32 v3; - UnkStruct_ov70_02264324 * v4; + UnkStruct_ov70_02264324 *v4; v0 = ov70_0225DEF0(param1); v1 = ov70_0225CC70(v0, param2); @@ -1687,8 +1653,7 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E8C(param0); } break; - case 1: - { + case 1: { UnkEnum_ov66_02232A84 v8; v8 = ov66_02232A84(); @@ -1700,10 +1665,10 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 u8 v9; u8 v10; int v11; - u8 v12[4] = {0}; + u8 v12[4] = { 0 }; u32 v13; u8 v14; - UnkStruct_ov66_0222DFF8 * v15; + UnkStruct_ov66_0222DFF8 *v15; v15 = ov70_0225DEE8(param1); v9 = ov66_0222E964(v15); @@ -1733,10 +1698,8 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 v4->unk_06 = 0; ov70_02262E88(param0, 3); } - } - break; - case 2: - { + } break; + case 2: { u32 v16; u32 v17; u32 v18; @@ -1770,7 +1733,7 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 { UnkStruct_ov63_0222CC3C v19; - UnkStruct_ov70_02263910 * v20; + UnkStruct_ov70_02263910 *v20; int v21; v21 = ov70_0225CD60(v1, 6); @@ -1788,10 +1751,8 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E64(param0); return 1; - } - break; - case 3: - { + } break; + case 3: { u8 v22; u8 v23; @@ -1817,10 +1778,8 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v0, v1, v22); ov70_02262E8C(param0); - } - break; - case 4: - { + } break; + case 4: { BOOL v24; v24 = ov70_0225CE38(v1); @@ -1829,10 +1788,8 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 v4->unk_00 = 8; ov70_02262E88(param0, 7); } - } - break; - case 5: - { + } break; + case 5: { u8 v25; v25 = ov70_0225CD60(v1, 6); @@ -1840,10 +1797,8 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDAC(v0, v1, 2, v25); ov70_02262E8C(param0); - } - break; - case 6: - { + } break; + case 6: { u32 v26; v26 = ov70_0225CD60(v1, 5); @@ -1852,13 +1807,12 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 v4->unk_00 = 8; ov70_02262E88(param0, 7); } - } - break; + } break; case 7: v4->unk_00--; if (v4->unk_00 <= 0) { - Strbuf* v27; + Strbuf *v27; ov70_0225E27C(param1, v4->unk_08, 0); v27 = ov70_0225E20C(param1, v4->unk_06, v4->unk_04); @@ -1866,8 +1820,7 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E8C(param0); } break; - case 8: - { + case 8: { BOOL v28; v28 = ov70_0225DFAC(param1); @@ -1878,26 +1831,25 @@ static BOOL ov70_02264324 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225DFEC(param1); { - UnkStruct_ov70_022630A4 * v29; + UnkStruct_ov70_022630A4 *v29; v29 = ov70_0225DF10(param1); ov70_02262E94(v29, param2, &Unk_ov70_0226D9D0, NULL); } } - } - break; + } break; } return 0; } -static BOOL ov70_022646C8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_022646C8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_022646C8 * v0; - UnkStruct_ov70_022630A4 * v1; - UnkStruct_ov70_0225CA20 * v2; - UnkStruct_ov70_0225CC54 * v3; - UnkStruct_ov66_0222DFF8 * v4; + UnkStruct_ov70_022646C8 *v0; + UnkStruct_ov70_022630A4 *v1; + UnkStruct_ov70_0225CA20 *v2; + UnkStruct_ov70_0225CC54 *v3; + UnkStruct_ov66_0222DFF8 *v4; v0 = ov70_02262E80(param0); v1 = ov70_0225DF10(param1); @@ -1951,8 +1903,7 @@ static BOOL ov70_022646C8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E88(param0, 3); } break; - case 2: - { + case 2: { u32 v6; u32 v7; u32 v8; @@ -1984,7 +1935,7 @@ static BOOL ov70_022646C8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 { UnkStruct_ov63_0222CC3C v10; - UnkStruct_ov70_02263910 * v11; + UnkStruct_ov70_02263910 *v11; int v12; v12 = ov70_0225CD60(v3, 6); @@ -2003,10 +1954,8 @@ static BOOL ov70_022646C8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E64(param0); return 1; - } - break; - case 3: - { + } break; + case 3: { UnkStruct_ov63_0222CC3C v13; int v14; @@ -2015,10 +1964,8 @@ static BOOL ov70_022646C8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDAC(v2, v3, 2, v14); ov70_02262E8C(param0); - } - break; - case 4: - { + } break; + case 4: { u32 v15; v15 = ov70_0225CD60(v3, 5); @@ -2026,11 +1973,9 @@ static BOOL ov70_022646C8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 if (v15 == 0) { ov70_02262E8C(param0); } - } - break; - case 5: - { - Strbuf* v16; + } break; + case 5: { + Strbuf *v16; u32 v17; BOOL v18 = 1; @@ -2071,8 +2016,7 @@ static BOOL ov70_022646C8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 } else { ov70_02262E88(param0, 7); } - } - break; + } break; case 6: if (ov70_0225DFAC(param1) == 1) { ov70_0225DFEC(param1); @@ -2085,7 +2029,7 @@ static BOOL ov70_022646C8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v2, v3, 1); { - UnkStruct_ov70_022630A4 * v19; + UnkStruct_ov70_022630A4 *v19; v19 = ov70_0225DF10(param1); ov70_02262E94(v19, param2, &Unk_ov70_0226D9D0, NULL); @@ -2096,14 +2040,14 @@ static BOOL ov70_022646C8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02264974 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02264974(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_02264974 * v0; - UnkStruct_ov70_022630A4 * v1; - UnkStruct_ov70_0225CA20 * v2; - UnkStruct_ov70_0225CC54 * v3; - UnkStruct_ov66_0222DFF8 * v4; - Strbuf* v5; + UnkStruct_ov70_02264974 *v0; + UnkStruct_ov70_022630A4 *v1; + UnkStruct_ov70_0225CA20 *v2; + UnkStruct_ov70_0225CC54 *v3; + UnkStruct_ov66_0222DFF8 *v4; + Strbuf *v5; v0 = ov70_02262E80(param0); v1 = ov70_0225DF10(param1); @@ -2116,13 +2060,13 @@ static BOOL ov70_02264974 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 v0 = ov70_02262E3C(param0, sizeof(UnkStruct_ov70_02264324)); ov66_0222E3E4(ov70_0225DEE8(param1), 13); - if ((ov66_0222E12C(v4) == 1)) { + if (ov66_0222E12C(v4) == 1) { v0->unk_00 = 122; ov70_02262E88(param0, 2); break; } - if ((ov66_0222E19C(v4) == 1)) { + if (ov66_0222E19C(v4) == 1) { v0->unk_02 = 10; } else { if (ov66_0222E0DC(v4) == 1) { @@ -2136,8 +2080,7 @@ static BOOL ov70_02264974 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E88(param0, 1); break; - case 1: - { + case 1: { u32 v6; u32 v7; @@ -2155,7 +2098,7 @@ static BOOL ov70_02264974 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 { UnkStruct_ov63_0222CC3C v8; - UnkStruct_ov70_02263910 * v9; + UnkStruct_ov70_02263910 *v9; int v10; v10 = ov70_0225CD60(v3, 6); @@ -2173,10 +2116,8 @@ static BOOL ov70_02264974 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E64(param0); return 1; - } - break; - case 2: - { + } break; + case 2: { UnkStruct_ov63_0222CC3C v11; int v12; @@ -2185,10 +2126,8 @@ static BOOL ov70_02264974 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDAC(v2, v3, 2, v12); ov70_02262E8C(param0); - } - break; - case 3: - { + } break; + case 3: { u32 v13; v13 = ov70_0225CD60(v3, 5); @@ -2196,8 +2135,7 @@ static BOOL ov70_02264974 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 if (v13 == 0) { ov70_02262E8C(param0); } - } - break; + } break; case 4: v5 = ov70_0225E20C(param1, 1, v0->unk_00); ov70_0225DF8C(param1, v5); @@ -2215,7 +2153,7 @@ static BOOL ov70_02264974 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v2, v3, 1); { - UnkStruct_ov70_022630A4 * v14; + UnkStruct_ov70_022630A4 *v14; v14 = ov70_0225DF10(param1); ov70_02262E94(v14, param2, &Unk_ov70_0226D9D0, NULL); @@ -2229,7 +2167,7 @@ static BOOL ov70_02264974 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static u32 ov70_02264B64 (u32 param0) +static u32 ov70_02264B64(u32 param0) { u32 v0; @@ -2275,7 +2213,7 @@ static u32 ov70_02264B64 (u32 param0) return v0; } -static u32 ov70_02264BCC (u32 param0) +static u32 ov70_02264BCC(u32 param0) { u32 v0; @@ -2321,7 +2259,7 @@ static u32 ov70_02264BCC (u32 param0) return v0; } -static u32 ov70_02264C34 (u32 param0) +static u32 ov70_02264C34(u32 param0) { u32 v0; @@ -2367,13 +2305,12 @@ static u32 ov70_02264C34 (u32 param0) return v0; } -static BOOL ov70_02264C9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02264C9C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { switch (ov70_02262E84(param0)) { - case 0: - { - Strbuf* v0; - UnkStruct_ov66_0222DFF8 * v1; + case 0: { + Strbuf *v0; + UnkStruct_ov66_0222DFF8 *v1; v1 = ov70_0225DEE8(param1); @@ -2390,14 +2327,13 @@ static BOOL ov70_02264C9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225DF8C(param1, v0); Sound_PlayEffect(1500); ov70_02262E8C(param0); - } - break; + } break; case 1: if (ov70_0225DFAC(param1)) { ov70_0225DFEC(param1); { - UnkStruct_ov70_0225CA20 * v2; - UnkStruct_ov70_0225CC54 * v3; + UnkStruct_ov70_0225CA20 *v2; + UnkStruct_ov70_0225CC54 *v3; v2 = ov70_0225DEF0(param1); v3 = ov70_0225CCAC(v2); @@ -2413,15 +2349,15 @@ static BOOL ov70_02264C9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02264D38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02264D38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_02265104 * v0; - UnkStruct_ov70_02261E10 * v1; - UnkStruct_ov70_0225CA20 * v2; - UnkStruct_ov70_02260AD4 * v3; - UnkStruct_ov66_0222DFF8 * v4; + UnkStruct_ov70_02265104 *v0; + UnkStruct_ov70_02261E10 *v1; + UnkStruct_ov70_0225CA20 *v2; + UnkStruct_ov70_02260AD4 *v3; + UnkStruct_ov66_0222DFF8 *v4; BOOL v5; - Strbuf* v6; + Strbuf *v6; v2 = ov70_0225DEF0(param1); v1 = ov70_0225DEF8(param1); @@ -2430,8 +2366,7 @@ static BOOL ov70_02264D38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 v0 = ov70_02262E80(param0); switch (ov70_02262E84(param0)) { - case 0: - { + case 0: { u32 v7; v0 = ov70_02262E3C(param0, sizeof(UnkStruct_ov70_02265104)); @@ -2531,8 +2466,7 @@ static BOOL ov70_02264D38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225E43C(param1, 0); } break; - case 5: - { + case 5: { VecFx32 v8; ov70_02265344(v0, v1, param1); @@ -2544,8 +2478,7 @@ static BOOL ov70_02264D38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 v0->unk_0B = 0; ov70_02262E88(param0, 13); } - } - break; + } break; case 6: ov70_0225CDAC(v2, v0->unk_0C, 2, 1); ov70_02262E88(param0, 7); @@ -2599,9 +2532,8 @@ static BOOL ov70_02264D38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02265344(v0, v1, param1); ov70_02265370(v0, v1, param1); break; - case 15: - { - UnkStruct_ov70_022630A4 * v9; + case 15: { + UnkStruct_ov70_022630A4 *v9; v9 = ov70_0225DF10(param1); @@ -2609,14 +2541,13 @@ static BOOL ov70_02264D38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v2, v0->unk_0C, 1); ov70_02262E64(param0); ov70_02262E94(v9, param2, &Unk_ov70_0226D9D0, NULL); - } - break; + } break; } return 0; } -static void ov70_022650E4 (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_02260AD4 * param1) +static void ov70_022650E4(UnkStruct_ov70_02265104 *param0, UnkStruct_ov70_02260AD4 *param1) { VecFx32 v0; @@ -2624,7 +2555,7 @@ static void ov70_022650E4 (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_0226 ov70_02260B18(param1, v0.x, v0.y, v0.z); } -static BOOL ov70_02265104 (const UnkStruct_ov70_02265104 * param0, const UnkStruct_ov70_02261E10 * param1) +static BOOL ov70_02265104(const UnkStruct_ov70_02265104 *param0, const UnkStruct_ov70_02261E10 *param1) { VecFx32 v0; VecFx32 v1; @@ -2641,7 +2572,7 @@ static BOOL ov70_02265104 (const UnkStruct_ov70_02265104 * param0, const UnkStru return 0; } -static BOOL ov70_02265144 (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_02261E10 * param1, UnkStruct_ov70_02260AD4 * param2) +static BOOL ov70_02265144(UnkStruct_ov70_02265104 *param0, UnkStruct_ov70_02261E10 *param1, UnkStruct_ov70_02260AD4 *param2) { VecFx32 v0; VecFx32 v1; @@ -2686,7 +2617,7 @@ static BOOL ov70_02265144 (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_0226 return v7; } -static BOOL ov70_022652BC (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_02261E10 * param1) +static BOOL ov70_022652BC(UnkStruct_ov70_02265104 *param0, UnkStruct_ov70_02261E10 *param1) { s32 v0; BOOL v1; @@ -2714,7 +2645,7 @@ static BOOL ov70_022652BC (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_0226 return v1; } -static void ov70_02265344 (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_02261E10 * param1, UnkStruct_ov70_0225DEE8 * param2) +static void ov70_02265344(UnkStruct_ov70_02265104 *param0, UnkStruct_ov70_02261E10 *param1, UnkStruct_ov70_0225DEE8 *param2) { VecFx32 v0; u32 v1; @@ -2725,7 +2656,7 @@ static void ov70_02265344 (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_0226 ov70_0225D048(param0->unk_0C, &v0); } -static void ov70_02265370 (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_02261E10 * param1, UnkStruct_ov70_0225DEE8 * param2) +static void ov70_02265370(UnkStruct_ov70_02265104 *param0, UnkStruct_ov70_02261E10 *param1, UnkStruct_ov70_0225DEE8 *param2) { VecFx32 v0; fx32 v1; @@ -2750,10 +2681,10 @@ static void ov70_02265370 (UnkStruct_ov70_02265104 * param0, UnkStruct_ov70_0226 ov70_0225D048(param0->unk_0C, &v0); } -static void ov70_022653DC (UnkStruct_ov70_022653DC * param0, UnkStruct_ov70_0225DEE8 * param1) +static void ov70_022653DC(UnkStruct_ov70_022653DC *param0, UnkStruct_ov70_0225DEE8 *param1) { int v0; - const Strbuf* v1; + const Strbuf *v1; ov70_0225E00C(param1, 18); @@ -2770,18 +2701,18 @@ static void ov70_022653DC (UnkStruct_ov70_022653DC * param0, UnkStruct_ov70_0225 param0->unk_08.unk_00 = ov70_0225E054(param1); } -static void ov70_02265450 (UnkStruct_ov70_022653DC * param0, UnkStruct_ov70_0225DEE8 * param1) +static void ov70_02265450(UnkStruct_ov70_022653DC *param0, UnkStruct_ov70_0225DEE8 *param1) { ov70_0225E034(param1); } -static BOOL ov70_0226545C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_0226545C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_0226545C * v0; - UnkStruct_ov70_0225CC54 * v1; - UnkStruct_ov66_0222DFF8 * v2; - UnkStruct_ov70_0225CA20 * v3; - UnkStruct_ov70_022630A4 * v4; + UnkStruct_ov70_0226545C *v0; + UnkStruct_ov70_0225CC54 *v1; + UnkStruct_ov66_0222DFF8 *v2; + UnkStruct_ov70_0225CA20 *v3; + UnkStruct_ov70_022630A4 *v4; v2 = ov70_0225DEE8(param1); v3 = ov70_0225DEF0(param1); @@ -2793,8 +2724,7 @@ static BOOL ov70_0226545C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 case 0: v0 = ov70_02262E3C(param0, sizeof(UnkStruct_ov70_0226545C)); ov70_02262E88(param0, 1); - case 1: - { + case 1: { BOOL v5, v6; v5 = ov66_0222E02C(v2, param2); @@ -2803,11 +2733,9 @@ static BOOL ov70_0226545C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 if ((v5 == 1) || (v6 == 1)) { ov70_02262E88(param0, 2); } - } - break; - case 2: - { - const UnkStruct_ov66_0222E71C * v7; + } break; + case 2: { + const UnkStruct_ov66_0222E71C *v7; u32 v8; v7 = ov66_0222E374(v2, param2); @@ -2826,12 +2754,10 @@ static BOOL ov70_0226545C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E88(param0, 3); } } - } - break; - case 3: - { + } break; + case 3: { u32 v9; - const UnkStruct_ov66_0222E71C * v10; + const UnkStruct_ov66_0222E71C *v10; BOOL v11; v10 = ov66_0222E374(v2, param2); @@ -2862,10 +2788,8 @@ static BOOL ov70_0226545C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225DF6C(param1, param2, 1); ov70_0225D0C0(v1, 1); } - } - break; - case 4: - { + } break; + case 4: { BOOL v12; v12 = ov70_0225CE38(v1); @@ -2873,8 +2797,7 @@ static BOOL ov70_0226545C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 if (v12 == 1) { ov70_02262E8C(param0); } - } - break; + } break; case 5: ov70_02262E64(param0); ov70_0225CDEC(v3, v1, 2); @@ -2887,14 +2810,14 @@ static BOOL ov70_0226545C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02265630 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02265630(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_0226545C * v0; - UnkStruct_ov70_0225CC54 * v1; - UnkStruct_ov70_0225CC54 * v2; - UnkStruct_ov66_0222DFF8 * v3; - UnkStruct_ov70_0225CA20 * v4; - UnkStruct_ov70_022630A4 * v5; + UnkStruct_ov70_0226545C *v0; + UnkStruct_ov70_0225CC54 *v1; + UnkStruct_ov70_0225CC54 *v2; + UnkStruct_ov66_0222DFF8 *v3; + UnkStruct_ov70_0225CA20 *v4; + UnkStruct_ov70_022630A4 *v5; v3 = ov70_0225DEE8(param1); v4 = ov70_0225DEF0(param1); @@ -2939,7 +2862,7 @@ static BOOL ov70_02265630 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 { u32 v7; - const UnkStruct_ov66_0222E71C * v8; + const UnkStruct_ov66_0222E71C *v8; BOOL v9; v8 = ov66_0222E374(v3, param2); @@ -2968,10 +2891,10 @@ static BOOL ov70_02265630 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_022657D0 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_022657D0(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_0225CC54 * v0; - UnkStruct_ov70_0225CA20 * v1; + UnkStruct_ov70_0225CC54 *v0; + UnkStruct_ov70_0225CA20 *v1; v1 = ov70_0225DEF0(param1); v0 = ov70_0225CC70(v1, param2); @@ -2981,8 +2904,7 @@ static BOOL ov70_022657D0 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v1, v0, 3); ov70_02262E8C(param0); break; - case 1: - { + case 1: { BOOL v2; v2 = ov70_0225CE38(v0); @@ -2990,13 +2912,12 @@ static BOOL ov70_022657D0 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 if (v2) { ov70_02262E8C(param0); } - } - break; + } break; case 2: ov70_0225CC54(v0); { - UnkStruct_ov70_022630A4 * v3; + UnkStruct_ov70_022630A4 *v3; v3 = ov70_0225DF10(param1); ov70_02262E94(v3, param2, &Unk_ov70_0226DA10, NULL); @@ -3007,12 +2928,12 @@ static BOOL ov70_022657D0 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02265840 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02265840(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_02265840 * v0; - UnkStruct_ov70_0225CA20 * v1; - UnkStruct_ov70_02261E10 * v2; - UnkStruct_ov66_0222DFF8 * v3; + UnkStruct_ov70_02265840 *v0; + UnkStruct_ov70_0225CA20 *v1; + UnkStruct_ov70_02261E10 *v2; + UnkStruct_ov66_0222DFF8 *v3; v3 = ov70_0225DEE8(param1); v1 = ov70_0225DEF0(param1); @@ -3020,8 +2941,7 @@ static BOOL ov70_02265840 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 v0 = ov70_02262E80(param0); switch (ov70_02262E84(param0)) { - case 0: - { + case 0: { v0 = ov70_02262E3C(param0, sizeof(UnkStruct_ov70_02265840)); v0->unk_00 = ov70_0225CC70(v1, param2); v0->unk_04 = ov66_0222EBA4(v3, param2); @@ -3031,8 +2951,7 @@ static BOOL ov70_02265840 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov66_0222EC04(v0->unk_04, &v0->unk_04, &v0->unk_08); ov70_0225CDEC(v1, v0->unk_00, 3); ov70_02262E88(param0, 1); - } - break; + } break; case 1: if (ov70_0225CE38(v0->unk_00)) { @@ -3047,7 +2966,7 @@ static BOOL ov70_02265840 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 } { - UnkStruct_ov63_0222CC3C v5 = {0}; + UnkStruct_ov63_0222CC3C v5 = { 0 }; ov70_0225CCB4(v0->unk_00, v5); } @@ -3057,8 +2976,7 @@ static BOOL ov70_02265840 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_02262E88(param0, 2); } break; - case 2: - { + case 2: { VecFx32 v6; VecFx32 v7; BOOL v8 = 0; @@ -3085,11 +3003,9 @@ static BOOL ov70_02265840 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225D060(v0->unk_00, 2); ov70_02262E88(param0, 3); } - } - break; + } break; - case 3: - { + case 3: { VecFx32 v9; fx32 v10; @@ -3111,14 +3027,13 @@ static BOOL ov70_02265840 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 if (ov66_0222EB7C(v3, v0->unk_04) == 2) { ov70_02262E88(param0, 4); } - } - break; + } break; case 4: ov70_0225CC54(v0->unk_00); ov70_02262E64(param0); { - UnkStruct_ov70_022630A4 * v11; + UnkStruct_ov70_022630A4 *v11; v11 = ov70_0225DF10(param1); ov70_02262E94(v11, param2, &Unk_ov70_0226DA10, NULL); @@ -3129,13 +3044,13 @@ static BOOL ov70_02265840 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02265A84 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +static BOOL ov70_02265A84(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_02265CCC * v0; - UnkStruct_ov70_0225CA20 * v1; - UnkStruct_ov70_0225CC54 * v2; - UnkStruct_ov70_0225CC54 * v3; - UnkStruct_ov66_0222DFF8 * v4; + UnkStruct_ov70_02265CCC *v0; + UnkStruct_ov70_0225CA20 *v1; + UnkStruct_ov70_0225CC54 *v2; + UnkStruct_ov70_0225CC54 *v3; + UnkStruct_ov66_0222DFF8 *v4; v0 = ov70_02262E38(param0); v4 = ov70_0225DEE8(param1); @@ -3157,8 +3072,7 @@ static BOOL ov70_02265A84 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 break; case 2: case 7: - case 9: - { + case 9: { BOOL v5; v5 = ov70_0225CE38(v2); @@ -3166,8 +3080,7 @@ static BOOL ov70_02265A84 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 if (v5 == 1) { ov70_02262E8C(param0); } - } - break; + } break; case 3: { @@ -3184,8 +3097,7 @@ static BOOL ov70_02265A84 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v1, v2, 4); ov70_02262E8C(param0); break; - case 4: - { + case 4: { BOOL v7; v7 = ov70_0225CE38(v2); @@ -3196,12 +3108,10 @@ static BOOL ov70_02265A84 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225DF4C(param1, param2, 0); ov70_0225DF6C(param1, param2, 0); } - } - break; - case 5: - { - const UnkStruct_ov66_0222E71C * v8; - const UnkStruct_ov66_0222E71C * v9; + } break; + case 5: { + const UnkStruct_ov66_0222E71C *v8; + const UnkStruct_ov66_0222E71C *v9; BOOL v10 = 0; if ((v0->unk_03 == 1) && (ov66_0222EEAC(v4) == 0)) { @@ -3230,7 +3140,7 @@ static BOOL ov70_02265A84 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 break; } - if ((v0->unk_03 == 1)) { + if (v0->unk_03 == 1) { if (ov66_0222EDF4(v4) == 0) { v10 = 1; break; @@ -3254,15 +3164,13 @@ static BOOL ov70_02265A84 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225DF4C(param1, param2, 1); ov70_0225DF6C(param1, param2, 1); } - } - break; + } break; case 6: ov70_0225CDEC(v1, v2, 3); ov70_02262E8C(param0); break; - case 8: - { - UnkStruct_ov70_0225CC54 * v15; + case 8: { + UnkStruct_ov70_0225CC54 *v15; UnkStruct_ov63_0222CC3C v16; v15 = ov70_0225CCAC(v1); @@ -3276,8 +3184,7 @@ static BOOL ov70_02265A84 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 ov70_0225CDEC(v1, v2, 4); ov70_02262E8C(param0); } - } - break; + } break; case 10: ov70_0225CDEC(v1, v2, 2); ov70_0225DF4C(param1, param2, 0); @@ -3289,14 +3196,14 @@ static BOOL ov70_02265A84 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225 return 0; } -static BOOL ov70_02265CCC (UnkStruct_ov70_02265CCC * param0, UnkStruct_ov66_0222DFF8 * param1, UnkStruct_ov70_0225DEE8 * param2, UnkStruct_ov70_0225CC54 * param3, u8 param4, int param5) +static BOOL ov70_02265CCC(UnkStruct_ov70_02265CCC *param0, UnkStruct_ov66_0222DFF8 *param1, UnkStruct_ov70_0225DEE8 *param2, UnkStruct_ov70_0225CC54 *param3, u8 param4, int param5) { u32 v0; u32 v1; UnkStruct_ov63_0222CC3C v2; - UnkStruct_ov70_0225CA20 * v3; - UnkStruct_ov70_0225CC54 * v4; - UnkStruct_ov70_0225C894 * v5; + UnkStruct_ov70_0225CA20 *v3; + UnkStruct_ov70_0225CC54 *v4; + UnkStruct_ov70_0225C894 *v5; BOOL v6 = 0; BOOL v7; @@ -3407,7 +3314,7 @@ static BOOL ov70_02265CCC (UnkStruct_ov70_02265CCC * param0, UnkStruct_ov66_0222 return 1; } -static BOOL ov70_02265ED0 (const UnkStruct_ov70_0225C894 * param0, const UnkStruct_ov70_0225CA20 * param1, const u32 * param2, u32 param3, UnkStruct_ov63_0222CC3C * param4) +static BOOL ov70_02265ED0(const UnkStruct_ov70_0225C894 *param0, const UnkStruct_ov70_0225CA20 *param1, const u32 *param2, u32 param3, UnkStruct_ov63_0222CC3C *param4) { u16 v0, v1; int v2; diff --git a/src/overlay070/ov70_02265F38.c b/src/overlay070/ov70_02265F38.c index 8ee81dd426..1a30fbb1d4 100644 --- a/src/overlay070/ov70_02265F38.c +++ b/src/overlay070/ov70_02265F38.c @@ -1,33 +1,31 @@ -#include "enums.h" +#include "overlay070/ov70_02265F38.h" +#include #include #include -#include -#include "core_sys.h" - -#include "strbuf.h" +#include "overlay066/ov66_0222DDF0.h" +#include "overlay066/ov66_022324F0.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "overlay066/struct_ov66_0222E294.h" +#include "overlay070/ov70_0225C9B4.h" +#include "overlay070/ov70_0225D9A4.h" +#include "overlay070/ov70_02262DA8.h" #include "overlay070/struct_ov70_0225CA20_decl.h" #include "overlay070/struct_ov70_0225CC54_decl.h" #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_02263344_decl.h" - -#include "overlay066/struct_ov66_0222E294.h" #include "overlay070/struct_ov70_02265F38.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "unk_02005474.h" #include "communication_information.h" #include "communication_system.h" +#include "core_sys.h" +#include "enums.h" +#include "strbuf.h" +#include "unk_02005474.h" #include "unk_020363E8.h" #include "unk_020366A0.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_022324F0.h" -#include "overlay070/ov70_0225C9B4.h" -#include "overlay070/ov70_0225D9A4.h" -#include "overlay070/ov70_02262DA8.h" -#include "overlay070/ov70_02265F38.h" typedef struct { u8 unk_00; @@ -60,17 +58,17 @@ typedef struct { UnkStruct_ov70_02266C68 unk_00; } UnkStruct_ov70_022669FC; -static void ov70_02266AF0(UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_02263344 * param1, UnkStruct_ov70_0225DEE8 * param2, u32 param3, u32 param4); -static void ov70_02266B18(UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_02263344 * param1, u32 param2, u32 param3); -static void ov70_02266B30(UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, u32 param3); -static void ov70_02266BA0(UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0225DEE8 * param1); -static BOOL ov70_02266BAC(UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0225DEE8 * param1, UnkStruct_ov70_02265F38 * param2, UnkStruct_ov70_02263344 * param3, u32 param4); -static void ov70_02266C68(UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, u32 param3, s32 param4); -static void ov70_02266CB0(UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1); -static void ov70_02266CCC(UnkStruct_ov70_02266C68 * param0, s32 param1); -static void ov70_02266CFC(UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1, BOOL param2); -static void ov70_02266CF0(UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1, BOOL param2); -static void ov70_02266D08(UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1, BOOL param2, BOOL param3); +static void ov70_02266AF0(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_02263344 *param1, UnkStruct_ov70_0225DEE8 *param2, u32 param3, u32 param4); +static void ov70_02266B18(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_02263344 *param1, u32 param2, u32 param3); +static void ov70_02266B30(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2, u32 param3); +static void ov70_02266BA0(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_0225DEE8 *param1); +static BOOL ov70_02266BAC(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_0225DEE8 *param1, UnkStruct_ov70_02265F38 *param2, UnkStruct_ov70_02263344 *param3, u32 param4); +static void ov70_02266C68(UnkStruct_ov70_02266C68 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2, u32 param3, s32 param4); +static void ov70_02266CB0(UnkStruct_ov70_02266C68 *param0, UnkStruct_ov70_0225DEE8 *param1); +static void ov70_02266CCC(UnkStruct_ov70_02266C68 *param0, s32 param1); +static void ov70_02266CFC(UnkStruct_ov70_02266C68 *param0, UnkStruct_ov70_0225DEE8 *param1, BOOL param2); +static void ov70_02266CF0(UnkStruct_ov70_02266C68 *param0, UnkStruct_ov70_0225DEE8 *param1, BOOL param2); +static void ov70_02266D08(UnkStruct_ov70_02266C68 *param0, UnkStruct_ov70_0225DEE8 *param1, BOOL param2, BOOL param3); static const UnkStruct_ov84_02240FA8 Unk_ov70_0226DC94 = { NULL, @@ -94,11 +92,11 @@ static const UnkStruct_ov84_02240FA8 Unk_ov70_0226DC94 = { NULL }; -BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +BOOL ov70_02265F38(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_02266AF0 * v0; - UnkStruct_ov70_02265F38 * v1; - UnkStruct_ov66_0222DFF8 * v2; + UnkStruct_ov70_02266AF0 *v0; + UnkStruct_ov70_02265F38 *v1; + UnkStruct_ov66_0222DFF8 *v2; v1 = ov70_02262E38(param0); v0 = ov70_02262E80(param0); @@ -199,8 +197,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E074(param1, &v0->unk_18, 0, 0); ov70_02262E88(param0, 4); break; - case 4: - { + case 4: { u32 v3; BOOL v4 = 0; @@ -229,8 +226,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E0E4(param1, NULL, NULL); ov70_02266BA0(v0, param1); } - } - break; + } break; case 5: ov70_0225E27C(param1, v1->unk_02, 0); ov70_02266AF0(v0, param0, param1, v1->unk_02 + 34, 2); @@ -260,7 +256,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * v0->unk_10 = (30 * 30); { - Strbuf* v5; + Strbuf *v5; if (v0->unk_00 > (11 * 30)) { v5 = ov70_0225E20C(param1, 0, 10); @@ -284,8 +280,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02266CFC(&v0->unk_3C, param1, 1); ov70_02262E88(param0, 7); break; - case 7: - { + case 7: { u32 v6; u32 v7; @@ -296,7 +291,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02266CCC(&v0->unk_3C, v0->unk_00); if ((v0->unk_00 <= (11 * 30)) && (v0->unk_14 == 0)) { - Strbuf* v8; + Strbuf *v8; ov70_0225DFCC(param1); @@ -320,7 +315,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * { u32 v9; - Strbuf* v10; + Strbuf *v10; if (v7 == 4) { v9 = 16; @@ -388,7 +383,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * if (v0->unk_00 == 0) { ov70_02262E88(param0, 8); { - Strbuf* v11; + Strbuf *v11; ov70_0225DFCC(param1); v11 = ov70_0225E20C(param1, 0, 18); @@ -397,11 +392,9 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * } break; } - } - break; + } break; - case 8: - { + case 8: { u32 v12; u32 v13; @@ -439,8 +432,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02262E88(param0, 23); break; } - } - break; + } break; case 9: ov70_02266CCC(&v0->unk_3C, 0); ov70_02266CF0(&v0->unk_3C, param1, 0); @@ -501,8 +493,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov66_0222E238(v2); ov70_02266B18(v0, param0, 13, 14); break; - case 13: - { + case 13: { BOOL v15; ov70_02266CCC(&v0->unk_3C, 0); @@ -514,8 +505,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * if (v15 == 1) { ov70_02262E88(param0, 14); } - } - break; + } break; case 14: ov70_02266CCC(&v0->unk_3C, 0); ov70_02266CF0(&v0->unk_3C, param1, 0); @@ -524,7 +514,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * int v16; int v17; int v18; - const s32 * v19; + const s32 *v19; int v20; BOOL v21; s32 v22; @@ -584,9 +574,8 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225DFCC(param1); ov70_02266B18(v0, param0, 28, 18); break; - case 16: - { - Strbuf* v25; + case 16: { + Strbuf *v25; v25 = ov70_0225E20C(param1, 0, 26); ov70_0225DF8C(param1, v25); @@ -595,8 +584,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02262E88(param0, 17); ov70_02266CB0(&v0->unk_3C, param1); break; - case 17: - { + case 17: { BOOL v26; v26 = ov70_02266BAC(v0, param1, v1, param0, param2); @@ -606,14 +594,12 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02262E88(param0, 18); } } - } - break; + } break; case 18: ov70_0225E194(param1); ov70_02262E88(param0, 19); break; - case 19: - { + case 19: { int v27; v27 = ov70_0225E1C4(param1); @@ -628,8 +614,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E1F8(param1); ov70_02262E88(param0, 20); break; - case 2: - { + case 2: { BOOL v28; v28 = ov70_02266BAC(v0, param1, v1, param0, param2); @@ -637,11 +622,9 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * if (v28 == 1) { ov70_0225E1F8(param1); } + } break; } - break; - } - } - break; + } break; case 20: v0->unk_00 = ov66_022332F8(v1->unk_01); @@ -649,7 +632,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02266CFC(&v0->unk_3C, param1, 1); { - Strbuf* v29; + Strbuf *v29; if (v0->unk_00 > (11 * 30)) { v29 = ov70_0225E20C(param1, 0, 10); @@ -663,8 +646,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * } ov70_02262E88(param0, 7); break; - case 21: - { + case 21: { u32 v30; v30 = ov66_02233224(v1->unk_01); @@ -672,7 +654,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * { u32 v31; - Strbuf* v32; + Strbuf *v32; if (v30 == 4) { v31 = 16; @@ -689,11 +671,9 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02266C68(&v0->unk_3C, param1, v1->unk_02, 1, 0); ov70_02266CFC(&v0->unk_3C, param1, 1); - } - break; - case 22: - { - Strbuf* v33; + } break; + case 22: { + Strbuf *v33; v33 = ov70_0225E20C(param1, 0, 18); @@ -703,15 +683,13 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02266CCC(&v0->unk_3C, 0); ov70_02266CF0(&v0->unk_3C, param1, 1); ov70_02262E88(param0, 8); - } - break; + } break; case 23: CommInfo_Delete(); sub_0203888C(); ov70_02262E88(param0, 24); break; - case 24: - { + case 24: { u32 v34; v34 = sub_020388AC(); @@ -719,8 +697,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * if (v34 == 0) { ov70_02262E88(param0, 28); } - } - break; + } break; case 25: if (ov70_0225DFAC(param1) == 1) { ov70_02262E88(param0, v0->unk_04); @@ -748,8 +725,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02262E88(param0, v0->unk_04); } break; - case 28: - { + case 28: { ov70_0225DFEC(param1); ov70_02266BA0(v0, param1); ov70_02266CB0(&v0->unk_3C, param1); @@ -762,7 +738,7 @@ BOOL ov70_02265F38 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * return 0; } -BOOL ov70_022669B8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +BOOL ov70_022669B8(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { switch (ov70_02262E84(param0)) { case 0: @@ -785,16 +761,15 @@ BOOL ov70_022669B8 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * return 0; } -BOOL ov70_022669FC (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +BOOL ov70_022669FC(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_022669FC * v0; + UnkStruct_ov70_022669FC *v0; v0 = ov70_02262E80(param0); switch (ov70_02262E84(param0)) { - case 0: - { - Strbuf* v1; + case 0: { + Strbuf *v1; u32 v2; u32 v3; u32 v4; @@ -828,16 +803,15 @@ BOOL ov70_022669FC (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02266C68(&v0->unk_00, param1, v4, 0, 0); ov70_02266CFC(&v0->unk_00, param1, 1); ov70_02262E8C(param0); - } - break; + } break; case 1: if ((gCoreSys.pressedKeys & PAD_BUTTON_A) || (gCoreSys.pressedKeys & PAD_KEY_RIGHT) || (gCoreSys.pressedKeys & PAD_KEY_LEFT) || (gCoreSys.pressedKeys & PAD_KEY_DOWN)) { ov70_02266CB0(&v0->unk_00, param1); ov70_0225DFEC(param1); { - UnkStruct_ov70_0225CA20 * v5; - UnkStruct_ov70_0225CC54 * v6; + UnkStruct_ov70_0225CA20 *v5; + UnkStruct_ov70_0225CC54 *v6; v5 = ov70_0225DEF0(param1); v6 = ov70_0225CCAC(v5); @@ -856,9 +830,9 @@ BOOL ov70_022669FC (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * return 0; } -static void ov70_02266AF0 (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_02263344 * param1, UnkStruct_ov70_0225DEE8 * param2, u32 param3, u32 param4) +static void ov70_02266AF0(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_02263344 *param1, UnkStruct_ov70_0225DEE8 *param2, u32 param3, u32 param4) { - Strbuf* v0; + Strbuf *v0; v0 = ov70_0225E20C(param2, 0, param3); ov70_0225DF8C(param2, v0); @@ -866,7 +840,7 @@ static void ov70_02266AF0 (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0226 ov70_02262E88(param1, 25); } -static void ov70_02266B18 (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_02263344 * param1, u32 param2, u32 param3) +static void ov70_02266B18(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_02263344 *param1, u32 param2, u32 param3) { param0->unk_04 = param2; param0->unk_06 = param3; @@ -876,10 +850,10 @@ static void ov70_02266B18 (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0226 ov70_02262E88(param1, 26); } -static void ov70_02266B30 (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, u32 param3) +static void ov70_02266B30(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2, u32 param3) { int v0; - Strbuf* v1; + Strbuf *v1; ov70_0225E00C(param1, param2); @@ -900,16 +874,16 @@ static void ov70_02266B30 (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0225 param0->unk_18.unk_00 = ov70_0225E054(param1); } -static void ov70_02266BA0 (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0225DEE8 * param1) +static void ov70_02266BA0(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_0225DEE8 *param1) { ov70_0225E034(param1); } -static BOOL ov70_02266BAC (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0225DEE8 * param1, UnkStruct_ov70_02265F38 * param2, UnkStruct_ov70_02263344 * param3, u32 param4) +static BOOL ov70_02266BAC(UnkStruct_ov70_02266AF0 *param0, UnkStruct_ov70_0225DEE8 *param1, UnkStruct_ov70_02265F38 *param2, UnkStruct_ov70_02263344 *param3, u32 param4) { u32 v0; u32 v1; - UnkStruct_ov66_0222DFF8 * v2; + UnkStruct_ov66_0222DFF8 *v2; v2 = ov70_0225DEE8(param1); v0 = sub_020388AC(); @@ -956,10 +930,11 @@ static BOOL ov70_02266BAC (UnkStruct_ov70_02266AF0 * param0, UnkStruct_ov70_0225 return 0; } -static void ov70_02266C68 (UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, u32 param3, s32 param4) +static void ov70_02266C68(UnkStruct_ov70_02266C68 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2, u32 param3, s32 param4) { static const u8 v0[2] = { - 8, 10, + 8, + 10, }; GF_ASSERT(param3 < 2); @@ -973,13 +948,13 @@ static void ov70_02266C68 (UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225 ov70_0225E104(param1, 18, 3, 13, v0[param3]); } -static void ov70_02266CB0 (UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1) +static void ov70_02266CB0(UnkStruct_ov70_02266C68 *param0, UnkStruct_ov70_0225DEE8 *param1) { memset(param0, 0, sizeof(UnkStruct_ov70_02266C68)); ov70_0225E12C(param1); } -static void ov70_02266CCC (UnkStruct_ov70_02266C68 * param0, s32 param1) +static void ov70_02266CCC(UnkStruct_ov70_02266C68 *param0, s32 param1) { s16 v0; @@ -991,19 +966,19 @@ static void ov70_02266CCC (UnkStruct_ov70_02266C68 * param0, s32 param1) } } -static void ov70_02266CF0 (UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1, BOOL param2) +static void ov70_02266CF0(UnkStruct_ov70_02266C68 *param0, UnkStruct_ov70_0225DEE8 *param1, BOOL param2) { ov70_02266D08(param0, param1, param2, 0); } -static void ov70_02266CFC (UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1, BOOL param2) +static void ov70_02266CFC(UnkStruct_ov70_02266C68 *param0, UnkStruct_ov70_0225DEE8 *param1, BOOL param2) { ov70_02266D08(param0, param1, param2, 1); } -static void ov70_02266D08 (UnkStruct_ov70_02266C68 * param0, UnkStruct_ov70_0225DEE8 * param1, BOOL param2, BOOL param3) +static void ov70_02266D08(UnkStruct_ov70_02266C68 *param0, UnkStruct_ov70_0225DEE8 *param1, BOOL param2, BOOL param3) { - Strbuf* v0; + Strbuf *v0; u32 v1; BOOL v2; BOOL v3; diff --git a/src/overlay070/ov70_02266E9C.c b/src/overlay070/ov70_02266E9C.c index 7aece198f7..c955218fdc 100644 --- a/src/overlay070/ov70_02266E9C.c +++ b/src/overlay070/ov70_02266E9C.c @@ -1,29 +1,28 @@ -#include "enums.h" +#include "overlay070/ov70_02266E9C.h" +#include #include #include -#include -#include "strbuf.h" +#include "overlay063/ov63_0222BE18.h" +#include "overlay066/ov66_0222DDF0.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" #include "overlay066/struct_ov66_0222E71C_decl.h" +#include "overlay066/struct_ov66_02231428.h" +#include "overlay070/ov70_0225C9B4.h" +#include "overlay070/ov70_0225D9A4.h" +#include "overlay070/ov70_02262DA8.h" #include "overlay070/struct_ov70_0225CA20_decl.h" #include "overlay070/struct_ov70_0225CC54_decl.h" #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_022630A4_decl.h" #include "overlay070/struct_ov70_02263344_decl.h" - -#include "overlay066/struct_ov66_02231428.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "enums.h" +#include "strbuf.h" #include "unk_02005474.h" #include "unk_0201D15C.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay070/ov70_0225C9B4.h" -#include "overlay070/ov70_0225D9A4.h" -#include "overlay070/ov70_02262DA8.h" -#include "overlay070/ov70_02266E9C.h" typedef struct { UnkStruct_ov84_02240FA8 unk_00; @@ -52,7 +51,7 @@ typedef struct { u8 unk_0C; u8 unk_0D; s16 unk_0E; - UnkStruct_ov70_0225CC54 * unk_10; + UnkStruct_ov70_0225CC54 *unk_10; UnkStruct_ov70_02268E44 unk_14; UnkStruct_ov70_02269114 unk_38; u16 unk_44; @@ -71,35 +70,35 @@ typedef struct { u16 unk_02; } UnkStruct_ov70_0226DD5C; -static u32 ov70_02268A3C(const UnkStruct_ov66_0222E71C * param0); -static Strbuf* ov70_02268AAC(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -static Strbuf* ov70_02268AF8(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2); -static BOOL ov70_02268B50(UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222DFF8 * param1, u32 param2); -static void ov70_02268BA0(UnkStruct_ov70_02268BA0 * param0); -static void ov70_02268BA4(UnkStruct_ov70_02268BA0 * param0, u8 param1, u8 param2, UnkStruct_ov70_02263344 * param3, u8 param4); -static void ov70_02268BBC(UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_02263344 * param1); -static void ov70_02268BD8(UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_02263344 * param1, UnkStruct_ov70_0225DEE8 * param2); -static void ov70_02268BF4(UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222DFF8 * param1, UnkStruct_ov70_0225DEE8 * param2, u32 param3, const UnkStruct_ov66_0222E71C * param4, const UnkStruct_ov66_0222E71C * param5); -static void ov70_02268C44(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2, const UnkStruct_ov66_0222E71C * param3); -static BOOL ov70_02268CC8(UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222DFF8 * param1, UnkStruct_ov70_0225DEE8 * param2); -static void ov70_02268D38(UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222DFF8 * param1, UnkStruct_ov70_0225DEE8 * param2, u32 param3, BOOL param4); -static void ov70_02268D70(UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_0225DEE8 * param1); -static void ov70_02268DB8(UnkStruct_ov70_02268BA0 * param0); -static void ov70_02268DC4(UnkStruct_ov70_02268BA0 * param0); -static void ov70_02268DCC(UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_0225DEE8 * param1); -static void ov70_02268E08(UnkStruct_ov70_02268BA0 * param0); -static void ov70_02268E20(UnkStruct_ov70_02268BA0 * param0, const UnkStruct_ov66_0222E71C * param1); -static void ov70_02268E44(UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, u32 param3, u32 param4); -static void ov70_02268EEC(UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, u32 param3, u32 param4, u32 param5); -static void ov70_02268FB8(UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1); -static void ov70_02269018(UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1); -static void ov70_02269090(UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1); -static void ov70_02269108(UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1); -static void ov70_02269114(UnkStruct_ov70_02269114 * param0); -static void ov70_0226911C(UnkStruct_ov70_02269114 * param0, const UnkStruct_ov66_0222DFF8 * param1, u16 param2, u16 param3); -static void ov70_02269144(UnkStruct_ov70_02269114 * param0, UnkStruct_ov66_0222DFF8 * param1); -static BOOL ov70_02269178(const UnkStruct_ov70_02269114 * param0); -static u16 ov70_02269188(const UnkStruct_ov70_02269114 * param0); +static u32 ov70_02268A3C(const UnkStruct_ov66_0222E71C *param0); +static Strbuf *ov70_02268AAC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +static Strbuf *ov70_02268AF8(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2); +static BOOL ov70_02268B50(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov66_0222DFF8 *param1, u32 param2); +static void ov70_02268BA0(UnkStruct_ov70_02268BA0 *param0); +static void ov70_02268BA4(UnkStruct_ov70_02268BA0 *param0, u8 param1, u8 param2, UnkStruct_ov70_02263344 *param3, u8 param4); +static void ov70_02268BBC(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov70_02263344 *param1); +static void ov70_02268BD8(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov70_02263344 *param1, UnkStruct_ov70_0225DEE8 *param2); +static void ov70_02268BF4(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov66_0222DFF8 *param1, UnkStruct_ov70_0225DEE8 *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4, const UnkStruct_ov66_0222E71C *param5); +static void ov70_02268C44(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2, const UnkStruct_ov66_0222E71C *param3); +static BOOL ov70_02268CC8(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov66_0222DFF8 *param1, UnkStruct_ov70_0225DEE8 *param2); +static void ov70_02268D38(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov66_0222DFF8 *param1, UnkStruct_ov70_0225DEE8 *param2, u32 param3, BOOL param4); +static void ov70_02268D70(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov70_0225DEE8 *param1); +static void ov70_02268DB8(UnkStruct_ov70_02268BA0 *param0); +static void ov70_02268DC4(UnkStruct_ov70_02268BA0 *param0); +static void ov70_02268DCC(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov70_0225DEE8 *param1); +static void ov70_02268E08(UnkStruct_ov70_02268BA0 *param0); +static void ov70_02268E20(UnkStruct_ov70_02268BA0 *param0, const UnkStruct_ov66_0222E71C *param1); +static void ov70_02268E44(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2, u32 param3, u32 param4); +static void ov70_02268EEC(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2, u32 param3, u32 param4, u32 param5); +static void ov70_02268FB8(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1); +static void ov70_02269018(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1); +static void ov70_02269090(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1); +static void ov70_02269108(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1); +static void ov70_02269114(UnkStruct_ov70_02269114 *param0); +static void ov70_0226911C(UnkStruct_ov70_02269114 *param0, const UnkStruct_ov66_0222DFF8 *param1, u16 param2, u16 param3); +static void ov70_02269144(UnkStruct_ov70_02269114 *param0, UnkStruct_ov66_0222DFF8 *param1); +static BOOL ov70_02269178(const UnkStruct_ov70_02269114 *param0); +static u16 ov70_02269188(const UnkStruct_ov70_02269114 *param0); static const UnkStruct_ov84_02240FA8 Unk_ov70_0226DCBC = { NULL, @@ -124,373 +123,373 @@ static const UnkStruct_ov84_02240FA8 Unk_ov70_0226DCBC = { }; static const UnkStruct_ov70_0226DD5C Unk_ov70_0226DD5C[] = { - {0x28, 0x225}, - {0x29, 0x226}, - {0x2B, 0x227}, - {0x2C, 0x228}, - {0x2E, 0x22A}, - {0x2F, 0x22B}, - {0x30, 0x22C}, - {0x31, 0x22D}, - {0x32, 0x22E}, - {0x33, 0x22F}, - {0x34, 0x230}, - {0x35, 0x231}, - {0x36, 0x232}, - {0x37, 0x233}, - {0x38, 0x234}, - {0x39, 0x235}, - {0x3A, 0x236}, - {0x3B, 0x237}, - {0x3C, 0x238}, - {0x3D, 0x239}, - {0x3E, 0x23A}, - {0x3F, 0x23B}, - {0x40, 0x23C}, - {0x55, 0x23D}, - {0x56, 0x23E}, - {0x57, 0x23F}, - {0x58, 0x240}, - {0x59, 0x241}, - {0x5A, 0x242}, - {0x5B, 0x243}, - {0x5C, 0x244}, - {0x5D, 0x245}, - {0x5E, 0x246}, - {0xEC, 0x247}, - {0xED, 0x248}, - {0xEE, 0x249}, - {0xEF, 0x24A}, - {0xF0, 0x24B}, - {0xF1, 0x24C}, - {0xF2, 0x24D}, - {0xF3, 0x24E}, - {0xF4, 0x24F}, - {0xF5, 0x250}, - {0xF6, 0x251}, - {0xF7, 0x252}, - {0xF8, 0x253}, - {0xF9, 0x254}, - {0xFA, 0x255}, - {0xFB, 0x256}, - {0xFC, 0x257}, - {0xFD, 0x258}, - {0xFE, 0x259}, - {0xFF, 0x25A}, - {0x100, 0x25B}, - {0x101, 0x25C}, - {0x102, 0x25D}, - {0x103, 0x25E}, - {0x104, 0x25F}, - {0x105, 0x260}, - {0x106, 0x261}, - {0x107, 0x262}, - {0x108, 0x263}, - {0x109, 0x264}, - {0x10A, 0x265}, - {0x10B, 0x266}, - {0x10C, 0x267}, - {0x10D, 0x268}, - {0x10E, 0x269}, - {0x10F, 0x26A}, - {0x110, 0x26B}, - {0x111, 0x26C}, - {0x112, 0x26D}, - {0x113, 0x26E}, - {0x164, 0x26F}, - {0x165, 0x270}, - {0x166, 0x271}, - {0x167, 0x272}, - {0x168, 0x273}, - {0x169, 0x274}, - {0x16A, 0x275}, - {0x16B, 0x276}, - {0x16C, 0x277}, - {0x16D, 0x278}, - {0x16E, 0x279}, - {0x16F, 0x27A}, - {0x170, 0x27B}, - {0x171, 0x27C}, - {0x172, 0x27D}, - {0x173, 0x27E}, - {0x174, 0x27F}, - {0x175, 0x280}, - {0x176, 0x281}, - {0x177, 0x282}, - {0x178, 0x283}, - {0x179, 0x284}, - {0x17A, 0x285}, - {0x17B, 0x286}, - {0x17C, 0x287}, - {0x17D, 0x288}, - {0x17E, 0x289}, - {0x17F, 0x28A}, - {0x180, 0x28B}, - {0x181, 0x28C}, - {0x182, 0x28D}, - {0x183, 0x28E}, - {0x184, 0x28F}, - {0x185, 0x290}, - {0x186, 0x291}, - {0x187, 0x292}, - {0x188, 0x293}, - {0x189, 0x294}, - {0x18A, 0x295}, - {0x18B, 0x296}, - {0x18C, 0x297}, - {0x1DD, 0x298}, - {0x1DE, 0x299}, - {0x1DF, 0x29A}, - {0x1E0, 0x29B}, - {0x1E1, 0x29C}, - {0x1E2, 0x29D}, - {0x1E3, 0x29E}, - {0x1E4, 0x29F}, - {0x1E5, 0x2A0}, - {0x1E6, 0x2A1}, - {0x1FB, 0x2A2}, - {0x1FC, 0x2A3}, - {0x1FD, 0x2A4}, - {0x1FE, 0x2A5}, - {0x1FF, 0x2A6}, - {0x200, 0x2A7}, - {0x201, 0x38D}, - {0x202, 0x2A8}, - {0x2AB, 0x2AD}, - {0x2AC, 0x2AE}, - {0x2AF, 0x2B0}, - {0x41, 0x2B1}, - {0x42, 0x2B2}, - {0x43, 0x2B3}, - {0x44, 0x2B4}, - {0x45, 0x2B5}, - {0x46, 0x2B6}, - {0x47, 0x2B7}, - {0x48, 0x2B8}, - {0x49, 0x2B9}, - {0x4A, 0x2BA}, - {0x4B, 0x2BB}, - {0x4C, 0x2BC}, - {0x4D, 0x2BD}, - {0x4E, 0x2BE}, - {0x4F, 0x2BF}, - {0x50, 0x2C0}, - {0x51, 0x2C1}, - {0x52, 0x2C2}, - {0x53, 0x2C3}, - {0x54, 0x2C4}, - {0x5F, 0x2C5}, - {0x60, 0x2C6}, - {0x61, 0x2C7}, - {0x62, 0x2C8}, - {0x63, 0x2C9}, - {0x64, 0x2CA}, - {0x65, 0x2CB}, - {0x66, 0x2CC}, - {0x67, 0x2CD}, - {0x68, 0x2CE}, - {0x69, 0x2CF}, - {0x6A, 0x2D0}, - {0x6B, 0x2D1}, - {0x6C, 0x2D2}, - {0x6D, 0x2D3}, - {0x6E, 0x2D4}, - {0x6F, 0x2D5}, - {0x70, 0x2D6}, - {0x71, 0x2D7}, - {0x72, 0x2D8}, - {0x114, 0x2D9}, - {0x115, 0x2DA}, - {0x116, 0x2DB}, - {0x117, 0x2DC}, - {0x118, 0x2DD}, - {0x119, 0x2DE}, - {0x11A, 0x2DF}, - {0x11B, 0x2E0}, - {0x11C, 0x2E1}, - {0x11D, 0x2E2}, - {0x11E, 0x2E3}, - {0x11F, 0x2E4}, - {0x120, 0x2E5}, - {0x121, 0x2E6}, - {0x122, 0x2E7}, - {0x123, 0x2E8}, - {0x124, 0x2E9}, - {0x125, 0x2EA}, - {0x126, 0x2EB}, - {0x127, 0x2EC}, - {0x128, 0x2ED}, - {0x129, 0x2EE}, - {0x12A, 0x2EF}, - {0x12B, 0x2F0}, - {0x12C, 0x2F1}, - {0x12D, 0x2F2}, - {0x12E, 0x2F3}, - {0x12F, 0x2F4}, - {0x130, 0x2F5}, - {0x131, 0x2F6}, - {0x132, 0x2F7}, - {0x133, 0x2F8}, - {0x134, 0x2F9}, - {0x135, 0x2FA}, - {0x136, 0x2FB}, - {0x137, 0x2FC}, - {0x138, 0x2FD}, - {0x139, 0x2FE}, - {0x13A, 0x2FF}, - {0x13B, 0x300}, - {0x13C, 0x301}, - {0x13D, 0x302}, - {0x13E, 0x303}, - {0x13F, 0x304}, - {0x140, 0x305}, - {0x141, 0x306}, - {0x142, 0x307}, - {0x143, 0x308}, - {0x144, 0x309}, - {0x145, 0x30A}, - {0x146, 0x30B}, - {0x147, 0x30C}, - {0x148, 0x30D}, - {0x149, 0x30E}, - {0x14A, 0x30F}, - {0x14B, 0x310}, - {0x14C, 0x311}, - {0x14D, 0x312}, - {0x14E, 0x313}, - {0x14F, 0x314}, - {0x150, 0x315}, - {0x151, 0x316}, - {0x152, 0x317}, - {0x153, 0x318}, - {0x154, 0x319}, - {0x155, 0x31A}, - {0x156, 0x31B}, - {0x157, 0x31C}, - {0x158, 0x31D}, - {0x159, 0x31E}, - {0x15A, 0x31F}, - {0x15B, 0x320}, - {0x15C, 0x321}, - {0x15D, 0x322}, - {0x15E, 0x323}, - {0x15F, 0x324}, - {0x160, 0x325}, - {0x161, 0x326}, - {0x162, 0x327}, - {0x163, 0x328}, - {0x18D, 0x329}, - {0x18E, 0x32A}, - {0x18F, 0x32B}, - {0x190, 0x32C}, - {0x191, 0x32D}, - {0x192, 0x32E}, - {0x193, 0x32F}, - {0x194, 0x330}, - {0x195, 0x331}, - {0x196, 0x332}, - {0x197, 0x333}, - {0x198, 0x334}, - {0x199, 0x335}, - {0x19A, 0x336}, - {0x19B, 0x337}, - {0x19C, 0x338}, - {0x19D, 0x339}, - {0x19E, 0x33A}, - {0x19F, 0x33B}, - {0x1A0, 0x33C}, - {0x1A1, 0x33D}, - {0x1A2, 0x33E}, - {0x1A3, 0x33F}, - {0x1A4, 0x340}, - {0x1A5, 0x341}, - {0x1A6, 0x342}, - {0x1A7, 0x343}, - {0x1A8, 0x344}, - {0x1A9, 0x345}, - {0x1AA, 0x346}, - {0x1AB, 0x347}, - {0x1AC, 0x348}, - {0x1AD, 0x349}, - {0x1AE, 0x34A}, - {0x1AF, 0x34B}, - {0x1B0, 0x34C}, - {0x1B1, 0x34D}, - {0x1B2, 0x34E}, - {0x1B3, 0x34F}, - {0x1B4, 0x350}, - {0x1B5, 0x351}, - {0x1B6, 0x352}, - {0x1B7, 0x353}, - {0x1B8, 0x354}, - {0x1B9, 0x355}, - {0x1BA, 0x356}, - {0x1BB, 0x357}, - {0x1BC, 0x358}, - {0x1BD, 0x359}, - {0x1BE, 0x35A}, - {0x1BF, 0x35B}, - {0x1C0, 0x35C}, - {0x1C1, 0x35D}, - {0x1C2, 0x35E}, - {0x1C3, 0x35F}, - {0x1C4, 0x360}, - {0x1C5, 0x361}, - {0x1C6, 0x362}, - {0x1C7, 0x363}, - {0x1C8, 0x364}, - {0x1C9, 0x365}, - {0x1CA, 0x366}, - {0x1CB, 0x367}, - {0x1CC, 0x368}, - {0x1CD, 0x369}, - {0x1CE, 0x36A}, - {0x1CF, 0x36B}, - {0x1D0, 0x36C}, - {0x1D1, 0x36D}, - {0x1D2, 0x36E}, - {0x1D3, 0x36F}, - {0x1D4, 0x370}, - {0x1D5, 0x371}, - {0x1D6, 0x372}, - {0x1D7, 0x373}, - {0x1D8, 0x374}, - {0x1D9, 0x375}, - {0x1DA, 0x376}, - {0x1DB, 0x377}, - {0x1DC, 0x378}, - {0x1E7, 0x379}, - {0x1E8, 0x37A}, - {0x1E9, 0x37B}, - {0x1EA, 0x37C}, - {0x1EB, 0x37D}, - {0x1EC, 0x37E}, - {0x1ED, 0x37F}, - {0x1EE, 0x380}, - {0x1EF, 0x381}, - {0x1F0, 0x382}, - {0x1F1, 0x383}, - {0x1F2, 0x384}, - {0x1F3, 0x385}, - {0x1F4, 0x386}, - {0x1F5, 0x387}, - {0x1F6, 0x388}, - {0x1F7, 0x389}, - {0x1F8, 0x38A}, - {0x1F9, 0x38B}, - {0x1FA, 0x38C} + { 0x28, 0x225 }, + { 0x29, 0x226 }, + { 0x2B, 0x227 }, + { 0x2C, 0x228 }, + { 0x2E, 0x22A }, + { 0x2F, 0x22B }, + { 0x30, 0x22C }, + { 0x31, 0x22D }, + { 0x32, 0x22E }, + { 0x33, 0x22F }, + { 0x34, 0x230 }, + { 0x35, 0x231 }, + { 0x36, 0x232 }, + { 0x37, 0x233 }, + { 0x38, 0x234 }, + { 0x39, 0x235 }, + { 0x3A, 0x236 }, + { 0x3B, 0x237 }, + { 0x3C, 0x238 }, + { 0x3D, 0x239 }, + { 0x3E, 0x23A }, + { 0x3F, 0x23B }, + { 0x40, 0x23C }, + { 0x55, 0x23D }, + { 0x56, 0x23E }, + { 0x57, 0x23F }, + { 0x58, 0x240 }, + { 0x59, 0x241 }, + { 0x5A, 0x242 }, + { 0x5B, 0x243 }, + { 0x5C, 0x244 }, + { 0x5D, 0x245 }, + { 0x5E, 0x246 }, + { 0xEC, 0x247 }, + { 0xED, 0x248 }, + { 0xEE, 0x249 }, + { 0xEF, 0x24A }, + { 0xF0, 0x24B }, + { 0xF1, 0x24C }, + { 0xF2, 0x24D }, + { 0xF3, 0x24E }, + { 0xF4, 0x24F }, + { 0xF5, 0x250 }, + { 0xF6, 0x251 }, + { 0xF7, 0x252 }, + { 0xF8, 0x253 }, + { 0xF9, 0x254 }, + { 0xFA, 0x255 }, + { 0xFB, 0x256 }, + { 0xFC, 0x257 }, + { 0xFD, 0x258 }, + { 0xFE, 0x259 }, + { 0xFF, 0x25A }, + { 0x100, 0x25B }, + { 0x101, 0x25C }, + { 0x102, 0x25D }, + { 0x103, 0x25E }, + { 0x104, 0x25F }, + { 0x105, 0x260 }, + { 0x106, 0x261 }, + { 0x107, 0x262 }, + { 0x108, 0x263 }, + { 0x109, 0x264 }, + { 0x10A, 0x265 }, + { 0x10B, 0x266 }, + { 0x10C, 0x267 }, + { 0x10D, 0x268 }, + { 0x10E, 0x269 }, + { 0x10F, 0x26A }, + { 0x110, 0x26B }, + { 0x111, 0x26C }, + { 0x112, 0x26D }, + { 0x113, 0x26E }, + { 0x164, 0x26F }, + { 0x165, 0x270 }, + { 0x166, 0x271 }, + { 0x167, 0x272 }, + { 0x168, 0x273 }, + { 0x169, 0x274 }, + { 0x16A, 0x275 }, + { 0x16B, 0x276 }, + { 0x16C, 0x277 }, + { 0x16D, 0x278 }, + { 0x16E, 0x279 }, + { 0x16F, 0x27A }, + { 0x170, 0x27B }, + { 0x171, 0x27C }, + { 0x172, 0x27D }, + { 0x173, 0x27E }, + { 0x174, 0x27F }, + { 0x175, 0x280 }, + { 0x176, 0x281 }, + { 0x177, 0x282 }, + { 0x178, 0x283 }, + { 0x179, 0x284 }, + { 0x17A, 0x285 }, + { 0x17B, 0x286 }, + { 0x17C, 0x287 }, + { 0x17D, 0x288 }, + { 0x17E, 0x289 }, + { 0x17F, 0x28A }, + { 0x180, 0x28B }, + { 0x181, 0x28C }, + { 0x182, 0x28D }, + { 0x183, 0x28E }, + { 0x184, 0x28F }, + { 0x185, 0x290 }, + { 0x186, 0x291 }, + { 0x187, 0x292 }, + { 0x188, 0x293 }, + { 0x189, 0x294 }, + { 0x18A, 0x295 }, + { 0x18B, 0x296 }, + { 0x18C, 0x297 }, + { 0x1DD, 0x298 }, + { 0x1DE, 0x299 }, + { 0x1DF, 0x29A }, + { 0x1E0, 0x29B }, + { 0x1E1, 0x29C }, + { 0x1E2, 0x29D }, + { 0x1E3, 0x29E }, + { 0x1E4, 0x29F }, + { 0x1E5, 0x2A0 }, + { 0x1E6, 0x2A1 }, + { 0x1FB, 0x2A2 }, + { 0x1FC, 0x2A3 }, + { 0x1FD, 0x2A4 }, + { 0x1FE, 0x2A5 }, + { 0x1FF, 0x2A6 }, + { 0x200, 0x2A7 }, + { 0x201, 0x38D }, + { 0x202, 0x2A8 }, + { 0x2AB, 0x2AD }, + { 0x2AC, 0x2AE }, + { 0x2AF, 0x2B0 }, + { 0x41, 0x2B1 }, + { 0x42, 0x2B2 }, + { 0x43, 0x2B3 }, + { 0x44, 0x2B4 }, + { 0x45, 0x2B5 }, + { 0x46, 0x2B6 }, + { 0x47, 0x2B7 }, + { 0x48, 0x2B8 }, + { 0x49, 0x2B9 }, + { 0x4A, 0x2BA }, + { 0x4B, 0x2BB }, + { 0x4C, 0x2BC }, + { 0x4D, 0x2BD }, + { 0x4E, 0x2BE }, + { 0x4F, 0x2BF }, + { 0x50, 0x2C0 }, + { 0x51, 0x2C1 }, + { 0x52, 0x2C2 }, + { 0x53, 0x2C3 }, + { 0x54, 0x2C4 }, + { 0x5F, 0x2C5 }, + { 0x60, 0x2C6 }, + { 0x61, 0x2C7 }, + { 0x62, 0x2C8 }, + { 0x63, 0x2C9 }, + { 0x64, 0x2CA }, + { 0x65, 0x2CB }, + { 0x66, 0x2CC }, + { 0x67, 0x2CD }, + { 0x68, 0x2CE }, + { 0x69, 0x2CF }, + { 0x6A, 0x2D0 }, + { 0x6B, 0x2D1 }, + { 0x6C, 0x2D2 }, + { 0x6D, 0x2D3 }, + { 0x6E, 0x2D4 }, + { 0x6F, 0x2D5 }, + { 0x70, 0x2D6 }, + { 0x71, 0x2D7 }, + { 0x72, 0x2D8 }, + { 0x114, 0x2D9 }, + { 0x115, 0x2DA }, + { 0x116, 0x2DB }, + { 0x117, 0x2DC }, + { 0x118, 0x2DD }, + { 0x119, 0x2DE }, + { 0x11A, 0x2DF }, + { 0x11B, 0x2E0 }, + { 0x11C, 0x2E1 }, + { 0x11D, 0x2E2 }, + { 0x11E, 0x2E3 }, + { 0x11F, 0x2E4 }, + { 0x120, 0x2E5 }, + { 0x121, 0x2E6 }, + { 0x122, 0x2E7 }, + { 0x123, 0x2E8 }, + { 0x124, 0x2E9 }, + { 0x125, 0x2EA }, + { 0x126, 0x2EB }, + { 0x127, 0x2EC }, + { 0x128, 0x2ED }, + { 0x129, 0x2EE }, + { 0x12A, 0x2EF }, + { 0x12B, 0x2F0 }, + { 0x12C, 0x2F1 }, + { 0x12D, 0x2F2 }, + { 0x12E, 0x2F3 }, + { 0x12F, 0x2F4 }, + { 0x130, 0x2F5 }, + { 0x131, 0x2F6 }, + { 0x132, 0x2F7 }, + { 0x133, 0x2F8 }, + { 0x134, 0x2F9 }, + { 0x135, 0x2FA }, + { 0x136, 0x2FB }, + { 0x137, 0x2FC }, + { 0x138, 0x2FD }, + { 0x139, 0x2FE }, + { 0x13A, 0x2FF }, + { 0x13B, 0x300 }, + { 0x13C, 0x301 }, + { 0x13D, 0x302 }, + { 0x13E, 0x303 }, + { 0x13F, 0x304 }, + { 0x140, 0x305 }, + { 0x141, 0x306 }, + { 0x142, 0x307 }, + { 0x143, 0x308 }, + { 0x144, 0x309 }, + { 0x145, 0x30A }, + { 0x146, 0x30B }, + { 0x147, 0x30C }, + { 0x148, 0x30D }, + { 0x149, 0x30E }, + { 0x14A, 0x30F }, + { 0x14B, 0x310 }, + { 0x14C, 0x311 }, + { 0x14D, 0x312 }, + { 0x14E, 0x313 }, + { 0x14F, 0x314 }, + { 0x150, 0x315 }, + { 0x151, 0x316 }, + { 0x152, 0x317 }, + { 0x153, 0x318 }, + { 0x154, 0x319 }, + { 0x155, 0x31A }, + { 0x156, 0x31B }, + { 0x157, 0x31C }, + { 0x158, 0x31D }, + { 0x159, 0x31E }, + { 0x15A, 0x31F }, + { 0x15B, 0x320 }, + { 0x15C, 0x321 }, + { 0x15D, 0x322 }, + { 0x15E, 0x323 }, + { 0x15F, 0x324 }, + { 0x160, 0x325 }, + { 0x161, 0x326 }, + { 0x162, 0x327 }, + { 0x163, 0x328 }, + { 0x18D, 0x329 }, + { 0x18E, 0x32A }, + { 0x18F, 0x32B }, + { 0x190, 0x32C }, + { 0x191, 0x32D }, + { 0x192, 0x32E }, + { 0x193, 0x32F }, + { 0x194, 0x330 }, + { 0x195, 0x331 }, + { 0x196, 0x332 }, + { 0x197, 0x333 }, + { 0x198, 0x334 }, + { 0x199, 0x335 }, + { 0x19A, 0x336 }, + { 0x19B, 0x337 }, + { 0x19C, 0x338 }, + { 0x19D, 0x339 }, + { 0x19E, 0x33A }, + { 0x19F, 0x33B }, + { 0x1A0, 0x33C }, + { 0x1A1, 0x33D }, + { 0x1A2, 0x33E }, + { 0x1A3, 0x33F }, + { 0x1A4, 0x340 }, + { 0x1A5, 0x341 }, + { 0x1A6, 0x342 }, + { 0x1A7, 0x343 }, + { 0x1A8, 0x344 }, + { 0x1A9, 0x345 }, + { 0x1AA, 0x346 }, + { 0x1AB, 0x347 }, + { 0x1AC, 0x348 }, + { 0x1AD, 0x349 }, + { 0x1AE, 0x34A }, + { 0x1AF, 0x34B }, + { 0x1B0, 0x34C }, + { 0x1B1, 0x34D }, + { 0x1B2, 0x34E }, + { 0x1B3, 0x34F }, + { 0x1B4, 0x350 }, + { 0x1B5, 0x351 }, + { 0x1B6, 0x352 }, + { 0x1B7, 0x353 }, + { 0x1B8, 0x354 }, + { 0x1B9, 0x355 }, + { 0x1BA, 0x356 }, + { 0x1BB, 0x357 }, + { 0x1BC, 0x358 }, + { 0x1BD, 0x359 }, + { 0x1BE, 0x35A }, + { 0x1BF, 0x35B }, + { 0x1C0, 0x35C }, + { 0x1C1, 0x35D }, + { 0x1C2, 0x35E }, + { 0x1C3, 0x35F }, + { 0x1C4, 0x360 }, + { 0x1C5, 0x361 }, + { 0x1C6, 0x362 }, + { 0x1C7, 0x363 }, + { 0x1C8, 0x364 }, + { 0x1C9, 0x365 }, + { 0x1CA, 0x366 }, + { 0x1CB, 0x367 }, + { 0x1CC, 0x368 }, + { 0x1CD, 0x369 }, + { 0x1CE, 0x36A }, + { 0x1CF, 0x36B }, + { 0x1D0, 0x36C }, + { 0x1D1, 0x36D }, + { 0x1D2, 0x36E }, + { 0x1D3, 0x36F }, + { 0x1D4, 0x370 }, + { 0x1D5, 0x371 }, + { 0x1D6, 0x372 }, + { 0x1D7, 0x373 }, + { 0x1D8, 0x374 }, + { 0x1D9, 0x375 }, + { 0x1DA, 0x376 }, + { 0x1DB, 0x377 }, + { 0x1DC, 0x378 }, + { 0x1E7, 0x379 }, + { 0x1E8, 0x37A }, + { 0x1E9, 0x37B }, + { 0x1EA, 0x37C }, + { 0x1EB, 0x37D }, + { 0x1EC, 0x37E }, + { 0x1ED, 0x37F }, + { 0x1EE, 0x380 }, + { 0x1EF, 0x381 }, + { 0x1F0, 0x382 }, + { 0x1F1, 0x383 }, + { 0x1F2, 0x384 }, + { 0x1F3, 0x385 }, + { 0x1F4, 0x386 }, + { 0x1F5, 0x387 }, + { 0x1F6, 0x388 }, + { 0x1F7, 0x389 }, + { 0x1F8, 0x38A }, + { 0x1F9, 0x38B }, + { 0x1FA, 0x38C } }; -BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +BOOL ov70_02266E9C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_02268BA0 * v0; - UnkStruct_ov66_0222DFF8 * v1; - UnkStruct_ov70_022630A4 * v2; + UnkStruct_ov70_02268BA0 *v0; + UnkStruct_ov66_0222DFF8 *v1; + UnkStruct_ov70_022630A4 *v2; u32 v3; u32 v4; - Strbuf* v5; - const UnkStruct_ov66_0222E71C * v6; - const UnkStruct_ov66_0222E71C * v7; + Strbuf *v5; + const UnkStruct_ov66_0222E71C *v6; + const UnkStruct_ov66_0222E71C *v7; v1 = ov70_0225DEE8(param1); v2 = ov70_0225DF10(param1); @@ -540,9 +539,9 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02269114(&v0->unk_38); { - UnkStruct_ov70_0225CC54 * v8; - UnkStruct_ov70_0225CA20 * v9; - UnkStruct_ov70_0225CC54 * v10; + UnkStruct_ov70_0225CC54 *v8; + UnkStruct_ov70_0225CA20 *v9; + UnkStruct_ov70_0225CC54 *v10; u32 v11; u32 v12; BOOL v13; @@ -581,8 +580,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * } } break; - case 1: - { + case 1: { BOOL v14; v14 = ov66_0222EC70(v1, v0->unk_03); @@ -592,8 +590,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * } else { ov70_02262E88(param0, 34); } - } - break; + } break; case 2: switch (v3) { case 2: @@ -652,8 +649,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * break; } break; - case 6: - { + case 6: { BOOL v15; v15 = ov70_02268CC8(v0, v1, param1); @@ -663,8 +659,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * } else { ov70_02262E88(param0, 7); } - } - break; + } break; case 7: ov70_0225E234(param1, v0->unk_03, 0); @@ -704,8 +699,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02268DB8(v0); ov70_02262E88(param0, 12); break; - case 12: - { + case 12: { u32 v16; BOOL v17; @@ -744,8 +738,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02269108(&v0->unk_14, param1); ov70_02268DC4(v0); } - } - break; + } break; case 13: if (ov66_0222E8C4(v6) == ov66_0222E8C4(v7)) { v0->unk_0C = 1; @@ -777,8 +770,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02268DB8(v0); ov70_02262E88(param0, 15); break; - case 15: - { + case 15: { u32 v19; BOOL v20; @@ -813,8 +805,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02269108(&v0->unk_14, param1); ov70_02268DC4(v0); } - } - break; + } break; case 16: ov70_0225E234(param1, v0->unk_03, 0); ov70_02268D38(v0, v1, param1, 1, 0); @@ -874,8 +865,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02262E88(param0, 21); ov70_02268DB8(v0); break; - case 21: - { + case 21: { u32 v23; v23 = ov70_0225E0D4(param1); @@ -892,8 +882,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02262E88(param0, 22); break; } - } - break; + } break; case 22: ov70_0225E234(param1, v0->unk_03, 0); @@ -907,8 +896,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E074(param1, &v0->unk_14.unk_00, 0, 0); ov70_02262E88(param0, 24); break; - case 24: - { + case 24: { u32 v24; v24 = ov70_0225E0D4(param1); @@ -930,8 +918,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02268DCC(v0, param1); break; } - } - break; + } break; case 25: ov70_0226911C(&v0->unk_38, v1, 6 + v0->unk_01, 2); ov70_0225E234(param1, v0->unk_03, 0); @@ -949,8 +936,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225DF8C(param1, v5); ov70_02268BA4(v0, 128, 27, param0, 37); break; - case 27: - { + case 27: { BOOL v25; u16 v26; @@ -970,8 +956,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225DFBC(param1); } } - } - break; + } break; case 28: switch (v3) { case 2: @@ -995,8 +980,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * break; } break; - case 29: - { + case 29: { u16 v27 = (v4 - 6); if ((v4 >= 126) || (v4 < 6)) { @@ -1013,8 +997,7 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * } else { ov70_02268BA4(v0, 128, 31, param0, 37); } - } - break; + } break; case 30: ov70_0225E234(param1, v0->unk_03, 0); @@ -1084,8 +1067,8 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov66_0222E3E4(v1, 1); { - UnkStruct_ov70_0225CC54 * v28; - UnkStruct_ov70_0225CA20 * v29; + UnkStruct_ov70_0225CC54 *v28; + UnkStruct_ov70_0225CA20 *v29; u32 v30; v29 = ov70_0225DEF0(param1); @@ -1115,15 +1098,15 @@ BOOL ov70_02266E9C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * return 0; } -BOOL ov70_02267A44 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +BOOL ov70_02267A44(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_02268BA0 * v0; - UnkStruct_ov66_0222DFF8 * v1; + UnkStruct_ov70_02268BA0 *v0; + UnkStruct_ov66_0222DFF8 *v1; u32 v2; u32 v3; - Strbuf* v4; - const UnkStruct_ov66_0222E71C * v5; - const UnkStruct_ov66_0222E71C * v6; + Strbuf *v4; + const UnkStruct_ov66_0222E71C *v5; + const UnkStruct_ov66_0222E71C *v6; v1 = ov70_0225DEE8(param1); v0 = ov70_02262E80(param0); @@ -1225,8 +1208,7 @@ BOOL ov70_02267A44 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * break; } break; - case 4: - { + case 4: { BOOL v9; v9 = ov70_02268CC8(v0, v1, param1); @@ -1236,8 +1218,7 @@ BOOL ov70_02267A44 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * } else { ov70_02262E88(param0, 5); } - } - break; + } break; case 5: ov70_0225E234(param1, v0->unk_03, 0); @@ -1452,8 +1433,7 @@ BOOL ov70_02267A44 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02268DB8(v0); ov70_02262E88(param0, 22); break; - case 22: - { + case 22: { u32 v11; BOOL v12; @@ -1491,8 +1471,7 @@ BOOL ov70_02267A44 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_02268DC4(v0); ov70_02268E20(v0, v6); } - } - break; + } break; case 23: ov70_0225E234(param1, v0->unk_03, 0); v4 = ov70_02268AAC(param1, v0->unk_03, 357 + v0->unk_01); @@ -1570,8 +1549,8 @@ BOOL ov70_02267A44 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov66_0222E3E4(v1, 1); { - UnkStruct_ov70_0225CC54 * v13; - UnkStruct_ov70_0225CA20 * v14; + UnkStruct_ov70_0225CC54 *v13; + UnkStruct_ov70_0225CA20 *v14; v14 = ov70_0225DEF0(param1); v13 = ov70_0225CCAC(v14); @@ -1588,11 +1567,11 @@ BOOL ov70_02267A44 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * return 0; } -BOOL ov70_02268390 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +BOOL ov70_02268390(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_02268390 * v0; - Strbuf* v1; - UnkStruct_ov66_0222DFF8 * v2; + UnkStruct_ov70_02268390 *v0; + Strbuf *v1; + UnkStruct_ov66_0222DFF8 *v2; v0 = ov70_02262E80(param0); v2 = ov70_0225DEE8(param1); @@ -1642,8 +1621,7 @@ BOOL ov70_02268390 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E0A4(param1, &v0->unk_04.unk_00, 0, 0, 16, 1, 15); ov70_02262E88(param0, 6); break; - case 6: - { + case 6: { u32 v3; BOOL v4 = 0; @@ -1692,8 +1670,7 @@ BOOL ov70_02268390 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E0E4(param1, NULL, NULL); ov70_02269108(&v0->unk_04, param1); } - } - break; + } break; case 7: v1 = ov70_0225E20C(param1, 1, 23); ov70_0225DF8C(param1, v1); @@ -1705,8 +1682,7 @@ BOOL ov70_02268390 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E074(param1, &v0->unk_04.unk_00, 0, 0); ov70_02262E88(param0, 9); break; - case 9: - { + case 9: { u32 v5; BOOL v6 = 0; @@ -1739,8 +1715,7 @@ BOOL ov70_02268390 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E0E4(param1, NULL, NULL); ov70_02269108(&v0->unk_04, param1); } - } - break; + } break; case 10: ov70_0225E27C(param1, UnkEnum_ov66_022324D0_00, 0); v1 = ov70_0225E20C(param1, 1, 24); @@ -1785,8 +1760,7 @@ BOOL ov70_02268390 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E074(param1, &v0->unk_04.unk_00, 0, 0); ov70_02262E88(param0, 17); break; - case 17: - { + case 17: { u32 v7; BOOL v8 = 0; @@ -1819,8 +1793,7 @@ BOOL ov70_02268390 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E0E4(param1, NULL, NULL); ov70_02269108(&v0->unk_04, param1); } - } - break; + } break; case 18: v1 = ov70_0225E20C(param1, 1, 27); ov70_0225DF8C(param1, v1); @@ -1861,8 +1834,8 @@ BOOL ov70_02268390 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225DFEC(param1); { - UnkStruct_ov70_0225CA20 * v9; - UnkStruct_ov70_0225CC54 * v10; + UnkStruct_ov70_0225CA20 *v9; + UnkStruct_ov70_0225CC54 *v10; v9 = ov70_0225DEF0(param1); v10 = ov70_0225CCAC(v9); @@ -1876,11 +1849,11 @@ BOOL ov70_02268390 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * return 0; } -BOOL ov70_0226889C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +BOOL ov70_0226889C(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_02268390 * v0; - UnkStruct_ov66_0222DFF8 * v1; - Strbuf* v2; + UnkStruct_ov70_02268390 *v0; + UnkStruct_ov66_0222DFF8 *v1; + Strbuf *v2; v0 = ov70_02262E80(param0); v1 = ov70_0225DEE8(param1); @@ -1960,8 +1933,8 @@ BOOL ov70_0226889C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225DFEC(param1); { - UnkStruct_ov70_0225CA20 * v4; - UnkStruct_ov70_0225CC54 * v5; + UnkStruct_ov70_0225CA20 *v4; + UnkStruct_ov70_0225CC54 *v5; v4 = ov70_0225DEF0(param1); v5 = ov70_0225CCAC(v4); @@ -1974,7 +1947,7 @@ BOOL ov70_0226889C (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * return 0; } -static u32 ov70_02268A3C (const UnkStruct_ov66_0222E71C * param0) +static u32 ov70_02268A3C(const UnkStruct_ov66_0222E71C *param0) { UnkStruct_ov66_02231428 v0; @@ -2015,10 +1988,10 @@ static u32 ov70_02268A3C (const UnkStruct_ov66_0222E71C * param0) return 1; } -static Strbuf* ov70_02268AAC (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +static Strbuf *ov70_02268AAC(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { BOOL v0; - UnkStruct_ov66_0222DFF8 * v1; + UnkStruct_ov66_0222DFF8 *v1; int v2; v1 = ov70_0225DEE8(param0); @@ -2036,10 +2009,10 @@ static Strbuf* ov70_02268AAC (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 return ov70_0225E20C(param0, 3, param2); } -static Strbuf* ov70_02268AF8 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2) +static Strbuf *ov70_02268AF8(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2) { BOOL v0, v1; - UnkStruct_ov66_0222DFF8 * v2; + UnkStruct_ov66_0222DFF8 *v2; u32 v3; v2 = ov70_0225DEE8(param0); @@ -2058,7 +2031,7 @@ static Strbuf* ov70_02268AF8 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 return ov70_0225E20C(param0, 3, v3); } -static BOOL ov70_02268B50 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222DFF8 * param1, u32 param2) +static BOOL ov70_02268B50(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov66_0222DFF8 *param1, u32 param2) { GF_ASSERT(param2 != DWC_LOBBY_INVALID_USER_ID); @@ -2067,8 +2040,8 @@ static BOOL ov70_02268B50 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222 param0->unk_0A = 1; { - const UnkStruct_ov66_0222E71C * v0; - const UnkStruct_ov66_0222E71C * v1; + const UnkStruct_ov66_0222E71C *v0; + const UnkStruct_ov66_0222E71C *v1; v0 = ov66_0222E3BC(param1); v1 = ov66_0222E374(param1, param0->unk_03); @@ -2084,12 +2057,12 @@ static BOOL ov70_02268B50 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222 return 1; } -static void ov70_02268BA0 (UnkStruct_ov70_02268BA0 * param0) +static void ov70_02268BA0(UnkStruct_ov70_02268BA0 *param0) { return; } -static void ov70_02268BA4 (UnkStruct_ov70_02268BA0 * param0, u8 param1, u8 param2, UnkStruct_ov70_02263344 * param3, u8 param4) +static void ov70_02268BA4(UnkStruct_ov70_02268BA0 *param0, u8 param1, u8 param2, UnkStruct_ov70_02263344 *param3, u8 param4) { param0->unk_06 = param1; param0->unk_07 = param2; @@ -2097,7 +2070,7 @@ static void ov70_02268BA4 (UnkStruct_ov70_02268BA0 * param0, u8 param1, u8 param ov70_02262E88(param3, param4); } -static void ov70_02268BBC (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_02263344 * param1) +static void ov70_02268BBC(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov70_02263344 *param1) { if (param0->unk_06 > 0) { param0->unk_06--; @@ -2106,26 +2079,26 @@ static void ov70_02268BBC (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_0226 } } -static void ov70_02268BD8 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_02263344 * param1, UnkStruct_ov70_0225DEE8 * param2) +static void ov70_02268BD8(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov70_02263344 *param1, UnkStruct_ov70_0225DEE8 *param2) { if (ov70_0225DFAC(param2)) { ov70_02262E88(param1, param0->unk_07); } } -static void ov70_02268BF4 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222DFF8 * param1, UnkStruct_ov70_0225DEE8 * param2, u32 param3, const UnkStruct_ov66_0222E71C * param4, const UnkStruct_ov66_0222E71C * param5) +static void ov70_02268BF4(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov66_0222DFF8 *param1, UnkStruct_ov70_0225DEE8 *param2, u32 param3, const UnkStruct_ov66_0222E71C *param4, const UnkStruct_ov66_0222E71C *param5) { u32 v0; u32 v1, v2; static const u16 v3[8][8] = { - {31, 31, 31, 31, 31, 31, 31, 31}, - {1, 0, 1, 3, 5, 7, 1, 9}, - {32, 2, 32, 11, 13, 15, 32, 17}, - {12, 4, 12, 33, 19, 21, 12, 23}, - {14, 6, 14, 20, 34, 25, 14, 27}, - {16, 8, 16, 22, 26, 35, 16, 29}, - {31, 31, 31, 31, 31, 31, 31, 31}, - {18, 10, 18, 24, 28, 30, 18, 36}, + { 31, 31, 31, 31, 31, 31, 31, 31 }, + { 1, 0, 1, 3, 5, 7, 1, 9 }, + { 32, 2, 32, 11, 13, 15, 32, 17 }, + { 12, 4, 12, 33, 19, 21, 12, 23 }, + { 14, 6, 14, 20, 34, 25, 14, 27 }, + { 16, 8, 16, 22, 26, 35, 16, 29 }, + { 31, 31, 31, 31, 31, 31, 31, 31 }, + { 18, 10, 18, 24, 28, 30, 18, 36 }, }; ov70_02268C44(param2, 0, param3, param4); @@ -2138,7 +2111,7 @@ static void ov70_02268BF4 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222 ov70_0225DF8C(param2, ov70_0225E20C(param2, 3, v0)); } -static void ov70_02268C44 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2, const UnkStruct_ov66_0222E71C * param3) +static void ov70_02268C44(UnkStruct_ov70_0225DEE8 *param0, u32 param1, u32 param2, const UnkStruct_ov66_0222E71C *param3) { switch (ov66_0222E80C(param3)) { case 1: @@ -2165,11 +2138,11 @@ static void ov70_02268C44 (UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 par } } -static BOOL ov70_02268CC8 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222DFF8 * param1, UnkStruct_ov70_0225DEE8 * param2) +static BOOL ov70_02268CC8(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov66_0222DFF8 *param1, UnkStruct_ov70_0225DEE8 *param2) { u32 v0; - const UnkStruct_ov66_0222E71C * v1; - const UnkStruct_ov66_0222E71C * v2; + const UnkStruct_ov66_0222E71C *v1; + const UnkStruct_ov66_0222E71C *v2; v1 = ov66_0222E3BC(param1); v2 = ov66_0222E374(param1, param0->unk_03); @@ -2202,11 +2175,11 @@ static BOOL ov70_02268CC8 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222 return 0; } -static void ov70_02268D38 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222DFF8 * param1, UnkStruct_ov70_0225DEE8 * param2, u32 param3, BOOL param4) +static void ov70_02268D38(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov66_0222DFF8 *param1, UnkStruct_ov70_0225DEE8 *param2, u32 param3, BOOL param4) { u32 v0; - const UnkStruct_ov66_0222E71C * v1; - const UnkStruct_ov66_0222E71C * v2; + const UnkStruct_ov66_0222E71C *v1; + const UnkStruct_ov66_0222E71C *v2; v1 = ov66_0222E3BC(param1); v2 = ov66_0222E374(param1, param0->unk_03); @@ -2220,10 +2193,10 @@ static void ov70_02268D38 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov66_0222 ov70_0225E29C(param2, v0, param3); } -static void ov70_02268D70 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_0225DEE8 * param1) +static void ov70_02268D70(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov70_0225DEE8 *param1) { - UnkStruct_ov66_0222DFF8 * v0; - Strbuf* v1; + UnkStruct_ov66_0222DFF8 *v0; + Strbuf *v1; v0 = ov70_0225DEE8(param1); @@ -2238,21 +2211,21 @@ static void ov70_02268D70 (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_0225 } } -static void ov70_02268DB8 (UnkStruct_ov70_02268BA0 * param0) +static void ov70_02268DB8(UnkStruct_ov70_02268BA0 *param0) { param0->unk_0E = 0; param0->unk_0D = 1; } -static void ov70_02268DC4 (UnkStruct_ov70_02268BA0 * param0) +static void ov70_02268DC4(UnkStruct_ov70_02268BA0 *param0) { param0->unk_0E = 0; param0->unk_0D = 0; } -static void ov70_02268DCC (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_0225DEE8 * param1) +static void ov70_02268DCC(UnkStruct_ov70_02268BA0 *param0, UnkStruct_ov70_0225DEE8 *param1) { - Strbuf* v0; + Strbuf *v0; if (param0->unk_0D == 1) { if (param0->unk_0E == 450) { @@ -2263,7 +2236,7 @@ static void ov70_02268DCC (UnkStruct_ov70_02268BA0 * param0, UnkStruct_ov70_0225 } } -static void ov70_02268E08 (UnkStruct_ov70_02268BA0 * param0) +static void ov70_02268E08(UnkStruct_ov70_02268BA0 *param0) { if (param0->unk_0D == 1) { if (param0->unk_0E <= 900) { @@ -2272,7 +2245,7 @@ static void ov70_02268E08 (UnkStruct_ov70_02268BA0 * param0) } } -static void ov70_02268E20 (UnkStruct_ov70_02268BA0 * param0, const UnkStruct_ov66_0222E71C * param1) +static void ov70_02268E20(UnkStruct_ov70_02268BA0 *param0, const UnkStruct_ov66_0222E71C *param1) { u32 v0; @@ -2283,10 +2256,10 @@ static void ov70_02268E20 (UnkStruct_ov70_02268BA0 * param0, const UnkStruct_ov6 param0->unk_48 = ov66_0222E798(param1); } -static void ov70_02268E44 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, u32 param3, u32 param4) +static void ov70_02268E44(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2, u32 param3, u32 param4) { int v0; - const Strbuf* v1; + const Strbuf *v1; ov70_0225E00C(param1, param2); param0->unk_20 = param2; @@ -2315,12 +2288,12 @@ static void ov70_02268E44 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225 param0->unk_00.unk_00 = ov70_0225E054(param1); } -static void ov70_02268EEC (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2, u32 param3, u32 param4, u32 param5) +static void ov70_02268EEC(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2, u32 param3, u32 param4, u32 param5) { int v0; u32 v1; u32 v2; - const Strbuf* v3; + const Strbuf *v3; BOOL v4; ov70_0225E020(param1, param3, param2); @@ -2358,12 +2331,19 @@ static void ov70_02268EEC (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225 param0->unk_00.unk_00 = ov70_0225E054(param1); } -static void ov70_02268FB8 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1) +static void ov70_02268FB8(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1) { int v0; - Strbuf* v1; + Strbuf *v1; static const u8 v2[8] = { - 31, 32, 33, 34, 35, 40, 36, 37, + 31, + 32, + 33, + 34, + 35, + 40, + 36, + 37, }; ov70_0225E00C(param1, 8); @@ -2380,10 +2360,10 @@ static void ov70_02268FB8 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225 param0->unk_00.unk_00 = ov70_0225E054(param1); } -static void ov70_02269018 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1) +static void ov70_02269018(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1) { int v0; - Strbuf* v1; + Strbuf *v1; ov70_0225E00C(param1, 4); param0->unk_20 = 4; @@ -2404,10 +2384,10 @@ static void ov70_02269018 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225 param0->unk_00.unk_00 = ov70_0225E054(param1); } -static void ov70_02269090 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1) +static void ov70_02269090(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1) { int v0; - Strbuf* v1; + Strbuf *v1; ov70_0225E00C(param1, 4); param0->unk_20 = 4; @@ -2428,17 +2408,17 @@ static void ov70_02269090 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225 param0->unk_00.unk_00 = ov70_0225E054(param1); } -static void ov70_02269108 (UnkStruct_ov70_02268E44 * param0, UnkStruct_ov70_0225DEE8 * param1) +static void ov70_02269108(UnkStruct_ov70_02268E44 *param0, UnkStruct_ov70_0225DEE8 *param1) { ov70_0225E034(param1); } -static void ov70_02269114 (UnkStruct_ov70_02269114 * param0) +static void ov70_02269114(UnkStruct_ov70_02269114 *param0) { param0->unk_00 = 0; } -static void ov70_0226911C (UnkStruct_ov70_02269114 * param0, const UnkStruct_ov66_0222DFF8 * param1, u16 param2, u16 param3) +static void ov70_0226911C(UnkStruct_ov70_02269114 *param0, const UnkStruct_ov66_0222DFF8 *param1, u16 param2, u16 param3) { GF_ASSERT(param0->unk_00 == 0); param0->unk_00 = 1; @@ -2447,7 +2427,7 @@ static void ov70_0226911C (UnkStruct_ov70_02269114 * param0, const UnkStruct_ov6 param0->unk_06 = ov66_0222EE30(param1); } -static void ov70_02269144 (UnkStruct_ov70_02269114 * param0, UnkStruct_ov66_0222DFF8 * param1) +static void ov70_02269144(UnkStruct_ov70_02269114 *param0, UnkStruct_ov66_0222DFF8 *param1) { u32 v0; @@ -2466,7 +2446,7 @@ static void ov70_02269144 (UnkStruct_ov70_02269114 * param0, UnkStruct_ov66_0222 } } -static BOOL ov70_02269178 (const UnkStruct_ov70_02269114 * param0) +static BOOL ov70_02269178(const UnkStruct_ov70_02269114 *param0) { if (param0->unk_00 == 1) { return 0; @@ -2475,7 +2455,7 @@ static BOOL ov70_02269178 (const UnkStruct_ov70_02269114 * param0) return 1; } -static u16 ov70_02269188 (const UnkStruct_ov70_02269114 * param0) +static u16 ov70_02269188(const UnkStruct_ov70_02269114 *param0) { return param0->unk_08; } diff --git a/src/overlay070/ov70_02269190.c b/src/overlay070/ov70_02269190.c index 04fb6b5b49..a2e70b1be0 100644 --- a/src/overlay070/ov70_02269190.c +++ b/src/overlay070/ov70_02269190.c @@ -1,30 +1,30 @@ +#include "overlay070/ov70_02269190.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" +#include "struct_defs/struct_020170F4.h" +#include "struct_defs/struct_02017248.h" +#include "struct_defs/struct_02017294.h" + +#include "overlay063/struct_ov63_0222CC3C.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "overlay070/ov70_0225C700.h" +#include "overlay070/ov70_0225C858.h" +#include "overlay070/ov70_0225C9B4.h" +#include "overlay070/ov70_02260A70.h" #include "overlay070/struct_ov70_0225C894_decl.h" #include "overlay070/struct_ov70_0225CA20_decl.h" #include "overlay070/struct_ov70_0225CC54_decl.h" #include "overlay070/struct_ov70_02260AD4_decl.h" -#include "struct_defs/struct_020170F4.h" -#include "struct_defs/struct_02017248.h" -#include "struct_defs/struct_02017294.h" -#include "overlay063/struct_ov63_0222CC3C.h" - -#include "unk_02005474.h" +#include "core_sys.h" +#include "heap.h" #include "narc.h" +#include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_020170BC.h" -#include "heap.h" -#include "overlay070/ov70_0225C700.h" -#include "overlay070/ov70_0225C858.h" -#include "overlay070/ov70_0225C9B4.h" -#include "overlay070/ov70_02260A70.h" -#include "overlay070/ov70_02269190.h" typedef struct { u16 unk_00; @@ -71,8 +71,8 @@ typedef struct { u8 unk_07; UnkStruct_ov70_022692B4 unk_08[4]; UnkStruct_ov70_0226949C unk_A8[4]; - UnkStruct_02017294 * unk_D8[4]; - const UnkStruct_ov70_0225CC54 * unk_E8; + UnkStruct_02017294 *unk_D8[4]; + const UnkStruct_ov70_0225CC54 *unk_E8; } UnkStruct_ov70_0226BD64; typedef union { @@ -119,7 +119,7 @@ typedef union { } val6; struct { UnkStruct_ov70_0226BD64 unk_00[4]; - const UnkStruct_ov70_0226E2EC * unk_3B0; + const UnkStruct_ov70_0226E2EC *unk_3B0; u16 unk_3B4; u16 unk_3B6; u16 unk_3B8; @@ -132,124 +132,124 @@ typedef struct { u8 unk_01; s16 unk_02; u32 unk_04; - UnkStruct_ov70_0225CC54 * unk_08; + UnkStruct_ov70_0225CC54 *unk_08; UnkStruct_02017294 unk_0C[18]; - const UnkStruct_ov70_0226E5A4 * unk_87C[18]; + const UnkStruct_ov70_0226E5A4 *unk_87C[18]; fx32 unk_8C4[18][2]; UnkStruct_ov70_0226BC40 unk_954; } UnkStruct_ov70_02269800; typedef struct UnkStruct_ov70_02269204_t { - UnkStruct_ov66_0222DFF8 * unk_00; - UnkStruct_ov70_0225CA20 * unk_04; - UnkStruct_ov70_02260AD4 * unk_08; - UnkStruct_ov70_0225C894 * unk_0C; + UnkStruct_ov66_0222DFF8 *unk_00; + UnkStruct_ov70_0225CA20 *unk_04; + UnkStruct_ov70_02260AD4 *unk_08; + UnkStruct_ov70_0225C894 *unk_0C; UnkStruct_ov70_02269800 unk_10[20]; UnkStruct_020170F4 unk_10550[15]; - void * unk_10640[39]; + void *unk_10640[39]; UnkStruct_02017248 unk_106DC[16]; NNSFndAllocator unk_1081C; } UnkStruct_ov70_02269204; -static void ov70_022692B4(UnkStruct_ov70_022692B4 * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, s32 param7); -static BOOL ov70_022692DC(UnkStruct_ov70_022692B4 * param0, s32 param1); -static void ov70_02269488(const UnkStruct_ov70_022692B4 * param0, fx32 * param1, fx32 * param2, fx32 * param3); -static void ov70_0226949C(UnkStruct_ov70_0226949C * param0, u16 param1, u16 param2, fx32 param3); -static void ov70_022694D0(UnkStruct_ov70_0226949C * param0); -static void ov70_02269508(const UnkStruct_ov70_0226949C * param0, fx32 * param1); -static void ov70_02269510(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2); -static void ov70_02269540(UnkStruct_ov70_02269204 * param0, NARC * param1, u32 param2); -static void ov70_022695C4(UnkStruct_ov70_02269204 * param0); -static void ov70_022695E0(UnkStruct_ov70_02269204 * param0, NARC * param1, u32 param2); -static void ov70_02269608(UnkStruct_ov70_02269204 * param0); -static void ov70_0226965C(UnkStruct_ov70_02269204 * param0, NARC * param1, u32 param2); -static void ov70_02269700(UnkStruct_ov70_02269204 * param0); -static void ov70_02269738(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, UnkStruct_ov70_0225CC54 * param2, u32 param3); -static void ov70_0226978C(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_022697C8(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_022697F0(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_02269800(const UnkStruct_ov70_02269800 * param0); -static BOOL ov70_02269810(const UnkStruct_ov70_02269800 * param0, u32 param1); -static void ov70_02269828(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, const UnkStruct_ov70_0226E5A4 * param3); -static void ov70_02269878(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2); -static void ov70_022699BC(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3); -static BOOL ov70_022699D0(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3); -static void ov70_022699E4(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3, fx32 param4); -static BOOL ov70_02269A3C(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3, fx32 param4); -static void ov70_02269A90(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3, fx32 param4); -static fx32 ov70_02269AE8(const UnkStruct_ov70_02269204 * param0, const UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3); -static void ov70_02269B10(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_02269B1C(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_02269B28(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_02269B34(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_02269B40(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_02269B4C(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_02269B58(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_02269BB8(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_02269CFC(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_02269F30(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A1FC(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A208(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A214(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A220(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A22C(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A238(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A244(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A294(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A2E4(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A334(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A384(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A3D4(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A424(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A478(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A4CC(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A520(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A5F0(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A5FC(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A608(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A614(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A6C8(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A820(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A858(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A930(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A958(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226A998(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226A9D0(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2); -static void ov70_0226AB14(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226ABAC(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226AC08(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226AC24(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226AD20(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226ADA0(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226ADBC(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226AF1C(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226AF60(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226AF7C(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static BOOL ov70_0226B1D0(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226B324(UnkStruct_ov70_02269800 * param0); -static void ov70_0226B51C(UnkStruct_ov70_02269800 * param0); -static BOOL ov70_0226B714(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3); -static void ov70_0226B744(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2); -static void ov70_0226B7B0(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2); -static BOOL ov70_0226B8C4(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2); -static void ov70_0226B92C(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2); -static BOOL ov70_0226B998(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2); -static void ov70_0226BAC8(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2); -static void ov70_0226BB34(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226BBA8(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226BBDC(UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1); -static void ov70_0226BC40(UnkStruct_ov70_0226BC40 * param0, const UnkStruct_ov70_0226E2EC * param1, u32 param2, u32 param3, u32 param4, UnkStruct_ov70_02269800 * param5); -static int ov70_0226BCC0(UnkStruct_ov70_0226BC40 * param0, u32 param1); -static void ov70_0226BD64(UnkStruct_ov70_0226BD64 * param0, UnkStruct_02017294 * param1, UnkStruct_02017294 * param2, UnkStruct_02017294 * param3, UnkStruct_02017294 * param4, const UnkStruct_ov70_0225CC54 * param5, u32 param6); -static void ov70_0226BDA0(UnkStruct_ov70_0226BD64 * param0, u32 param1); -static BOOL ov70_0226BDE8(UnkStruct_ov70_0226BD64 * param0); -static void ov70_0226BE3C(UnkStruct_ov70_0226BD64 * param0, const UnkStruct_ov70_0225CC54 * param1); -static BOOL ov70_0226BF5C(UnkStruct_ov70_0226BD64 * param0); -static void ov70_0226BFE4(UnkStruct_ov70_0226BD64 * param0, const UnkStruct_ov70_0225CC54 * param1); -static BOOL ov70_0226C0D8(UnkStruct_ov70_0226BD64 * param0); -static void ov70_0226C17C(UnkStruct_ov70_0226BD64 * param0, const UnkStruct_ov70_0225CC54 * param1); -static BOOL ov70_0226C1DC(UnkStruct_ov70_0226BD64 * param0); -static void ov70_0226C2A4(UnkStruct_ov70_0226BD64 * param0, u32 param1, const VecFx32 * param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, u32 param7); +static void ov70_022692B4(UnkStruct_ov70_022692B4 *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, s32 param7); +static BOOL ov70_022692DC(UnkStruct_ov70_022692B4 *param0, s32 param1); +static void ov70_02269488(const UnkStruct_ov70_022692B4 *param0, fx32 *param1, fx32 *param2, fx32 *param3); +static void ov70_0226949C(UnkStruct_ov70_0226949C *param0, u16 param1, u16 param2, fx32 param3); +static void ov70_022694D0(UnkStruct_ov70_0226949C *param0); +static void ov70_02269508(const UnkStruct_ov70_0226949C *param0, fx32 *param1); +static void ov70_02269510(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2); +static void ov70_02269540(UnkStruct_ov70_02269204 *param0, NARC *param1, u32 param2); +static void ov70_022695C4(UnkStruct_ov70_02269204 *param0); +static void ov70_022695E0(UnkStruct_ov70_02269204 *param0, NARC *param1, u32 param2); +static void ov70_02269608(UnkStruct_ov70_02269204 *param0); +static void ov70_0226965C(UnkStruct_ov70_02269204 *param0, NARC *param1, u32 param2); +static void ov70_02269700(UnkStruct_ov70_02269204 *param0); +static void ov70_02269738(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, UnkStruct_ov70_0225CC54 *param2, u32 param3); +static void ov70_0226978C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_022697C8(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_022697F0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_02269800(const UnkStruct_ov70_02269800 *param0); +static BOOL ov70_02269810(const UnkStruct_ov70_02269800 *param0, u32 param1); +static void ov70_02269828(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, const UnkStruct_ov70_0226E5A4 *param3); +static void ov70_02269878(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2); +static void ov70_022699BC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3); +static BOOL ov70_022699D0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3); +static void ov70_022699E4(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3, fx32 param4); +static BOOL ov70_02269A3C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3, fx32 param4); +static void ov70_02269A90(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3, fx32 param4); +static fx32 ov70_02269AE8(const UnkStruct_ov70_02269204 *param0, const UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3); +static void ov70_02269B10(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_02269B1C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_02269B28(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_02269B34(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_02269B40(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_02269B4C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_02269B58(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_02269BB8(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_02269CFC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_02269F30(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A1FC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A208(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A214(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A220(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A22C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A238(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A244(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A294(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A2E4(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A334(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A384(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A3D4(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A424(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A478(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A4CC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A520(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A5F0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A5FC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A608(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A614(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A6C8(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A820(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A858(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A930(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A958(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226A998(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226A9D0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2); +static void ov70_0226AB14(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226ABAC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226AC08(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226AC24(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226AD20(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226ADA0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226ADBC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226AF1C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226AF60(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226AF7C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static BOOL ov70_0226B1D0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226B324(UnkStruct_ov70_02269800 *param0); +static void ov70_0226B51C(UnkStruct_ov70_02269800 *param0); +static BOOL ov70_0226B714(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3); +static void ov70_0226B744(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2); +static void ov70_0226B7B0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2); +static BOOL ov70_0226B8C4(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2); +static void ov70_0226B92C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2); +static BOOL ov70_0226B998(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2); +static void ov70_0226BAC8(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2); +static void ov70_0226BB34(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226BBA8(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226BBDC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1); +static void ov70_0226BC40(UnkStruct_ov70_0226BC40 *param0, const UnkStruct_ov70_0226E2EC *param1, u32 param2, u32 param3, u32 param4, UnkStruct_ov70_02269800 *param5); +static int ov70_0226BCC0(UnkStruct_ov70_0226BC40 *param0, u32 param1); +static void ov70_0226BD64(UnkStruct_ov70_0226BD64 *param0, UnkStruct_02017294 *param1, UnkStruct_02017294 *param2, UnkStruct_02017294 *param3, UnkStruct_02017294 *param4, const UnkStruct_ov70_0225CC54 *param5, u32 param6); +static void ov70_0226BDA0(UnkStruct_ov70_0226BD64 *param0, u32 param1); +static BOOL ov70_0226BDE8(UnkStruct_ov70_0226BD64 *param0); +static void ov70_0226BE3C(UnkStruct_ov70_0226BD64 *param0, const UnkStruct_ov70_0225CC54 *param1); +static BOOL ov70_0226BF5C(UnkStruct_ov70_0226BD64 *param0); +static void ov70_0226BFE4(UnkStruct_ov70_0226BD64 *param0, const UnkStruct_ov70_0225CC54 *param1); +static BOOL ov70_0226C0D8(UnkStruct_ov70_0226BD64 *param0); +static void ov70_0226C17C(UnkStruct_ov70_0226BD64 *param0, const UnkStruct_ov70_0225CC54 *param1); +static BOOL ov70_0226C1DC(UnkStruct_ov70_0226BD64 *param0); +static void ov70_0226C2A4(UnkStruct_ov70_0226BD64 *param0, u32 param1, const VecFx32 *param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, u32 param7); static const u8 Unk_ov70_0226E2E8[3] = { 0x30, @@ -258,74 +258,74 @@ static const u8 Unk_ov70_0226E2E8[3] = { }; static const UnkStruct_ov63_0222CC3C Unk_ov70_0226E328[3] = { - {0x2, 0x38}, - {0xE, 0x38}, - {0x8, 0x3C} + { 0x2, 0x38 }, + { 0xE, 0x38 }, + { 0x8, 0x3C } }; static const UnkStruct_ov63_0222CC3C Unk_ov70_0226E340[3] = { - {0x2, 0x2C}, - {0xE, 0x2C}, - {0x8, 0x30} + { 0x2, 0x2C }, + { 0xE, 0x2C }, + { 0x8, 0x30 } }; static const VecFx32 Unk_ov70_0226E370[4] = { - {(8 * FX32_ONE), (FX32_CONST(16)), (-8 * FX32_ONE) + (10 * FX32_ONE)}, - {(8 * FX32_ONE) + (10 * FX32_ONE), (FX32_CONST(16)), (-8 * FX32_ONE)}, - {(8 * FX32_ONE), (FX32_CONST(16)), (-8 * FX32_ONE) - (10 * FX32_ONE)}, - {(8 * FX32_ONE) - (10 * FX32_ONE), (FX32_CONST(16)), (-8 * FX32_ONE)} + { (8 * FX32_ONE), (FX32_CONST(16)), (-8 * FX32_ONE) + (10 * FX32_ONE) }, + { (8 * FX32_ONE) + (10 * FX32_ONE), (FX32_CONST(16)), (-8 * FX32_ONE) }, + { (8 * FX32_ONE), (FX32_CONST(16)), (-8 * FX32_ONE) - (10 * FX32_ONE) }, + { (8 * FX32_ONE) - (10 * FX32_ONE), (FX32_CONST(16)), (-8 * FX32_ONE) } }; static const VecFx32 Unk_ov70_0226E3A0[4] = { - {0x0, (-FX32_CONST(8)), (FX32_CONST(8))}, - {(FX32_CONST(8)), (-FX32_CONST(8)), 0x0}, - {0x0, (-FX32_CONST(8)), -(FX32_CONST(8))}, - {-(FX32_CONST(8)), (-FX32_CONST(8)), 0x0} + { 0x0, (-FX32_CONST(8)), (FX32_CONST(8)) }, + { (FX32_CONST(8)), (-FX32_CONST(8)), 0x0 }, + { 0x0, (-FX32_CONST(8)), -(FX32_CONST(8)) }, + { -(FX32_CONST(8)), (-FX32_CONST(8)), 0x0 } }; static const UnkStruct_ov70_0226E514 Unk_ov70_0226E514[3][12] = { { - {0x0, 0x1}, - {0x0, 0x0}, - {0x0, 0x2}, - {0x0, 0x0}, - {0x0, 0x1}, - {0x0, 0x0}, - {0x0, 0x2}, - {0x0, 0x0}, - {0x0, 0x1}, - {0x0, 0x0}, - {0x0, 0x2}, - {0x0, 0x0} + { 0x0, 0x1 }, + { 0x0, 0x0 }, + { 0x0, 0x2 }, + { 0x0, 0x0 }, + { 0x0, 0x1 }, + { 0x0, 0x0 }, + { 0x0, 0x2 }, + { 0x0, 0x0 }, + { 0x0, 0x1 }, + { 0x0, 0x0 }, + { 0x0, 0x2 }, + { 0x0, 0x0 }, }, { - {0x1, 0x1}, - {0x1, 0x0}, - {0x0, 0x2}, - {0x0, 0x0}, - {0x1, 0x1}, - {0x1, 0x0}, - {0x0, 0x2}, - {0x0, 0x0}, - {0x1, 0x1}, - {0x1, 0x0}, - {0x0, 0x2}, - {0x0, 0x0} + { 0x1, 0x1 }, + { 0x1, 0x0 }, + { 0x0, 0x2 }, + { 0x0, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x0 }, + { 0x0, 0x2 }, + { 0x0, 0x0 }, + { 0x1, 0x1 }, + { 0x1, 0x0 }, + { 0x0, 0x2 }, + { 0x0, 0x0 }, }, { - {0x0, 0x1}, - {0x0, 0x0}, - {0x1, 0x2}, - {0x1, 0x0}, - {0x2, 0x1}, - {0x2, 0x0}, - {0x0, 0x2}, - {0x1, 0x1}, - {0x2, 0x2}, - {0x0, 0x1}, - {0x1, 0x2}, - {0x2, 0x1} - } + { 0x0, 0x1 }, + { 0x0, 0x0 }, + { 0x1, 0x2 }, + { 0x1, 0x0 }, + { 0x2, 0x1 }, + { 0x2, 0x0 }, + { 0x0, 0x2 }, + { 0x1, 0x1 }, + { 0x2, 0x2 }, + { 0x0, 0x1 }, + { 0x1, 0x2 }, + { 0x2, 0x1 }, + }, }; static const u8 Unk_ov70_0226E640[16] = { @@ -386,254 +386,254 @@ static const u8 Unk_ov70_0226E660[16] = { }; static const UnkStruct_ov70_0226E2EC Unk_ov70_0226E2EC[] = { - {0x0, 0x0, 0x2}, - {0x18, 0x2, 0x2} + { 0x0, 0x0, 0x2 }, + { 0x18, 0x2, 0x2 }, }; static const UnkStruct_ov70_0226E2EC Unk_ov70_0226E304[] = { - {0x0, 0x0, 0x3}, - {0x18, 0x2, 0x3} + { 0x0, 0x0, 0x3 }, + { 0x18, 0x2, 0x3 }, }; static const UnkStruct_ov70_0226E2EC Unk_ov70_0226E34C[] = { - {0x0, 0x0, 0x4}, - {0x10, 0x2, 0x4}, - {0x20, 0x0, 0x4} + { 0x0, 0x0, 0x4 }, + { 0x10, 0x2, 0x4 }, + { 0x20, 0x0, 0x4 }, }; static const UnkStruct_ov70_0226E2EC Unk_ov70_0226E2FC[] = { - {0x0, 0x0, 0x2}, - {0x18, 0x2, 0x2} + { 0x0, 0x0, 0x2 }, + { 0x18, 0x2, 0x2 }, }; static const UnkStruct_ov70_0226E2EC Unk_ov70_0226E334[] = { - {0x0, 0x0, 0x3}, - {0x10, 0x2, 0x3}, - {0x28, 0x0, 0x3} + { 0x0, 0x0, 0x3 }, + { 0x10, 0x2, 0x3 }, + { 0x28, 0x0, 0x3 }, }; static const UnkStruct_ov70_0226E2EC Unk_ov70_0226E358[] = { - {0x0, 0x0, 0x4}, - {0x10, 0x2, 0x4}, - {0x23, 0x0, 0x4} + { 0x0, 0x0, 0x4 }, + { 0x10, 0x2, 0x4 }, + { 0x23, 0x0, 0x4 }, }; static const UnkStruct_ov70_0226E2EC Unk_ov70_0226E314[] = { - {0x0, 0x0, 0x2}, - {0x18, 0x1, 0x2} + { 0x0, 0x0, 0x2 }, + { 0x18, 0x1, 0x2 }, }; static const UnkStruct_ov70_0226E2EC Unk_ov70_0226E2F4[] = { - {0x0, 0x0, 0x2}, - {0x18, 0x2, 0x2} + { 0x0, 0x0, 0x2 }, + { 0x18, 0x2, 0x2 }, }; static const UnkStruct_ov70_0226E2EC Unk_ov70_0226E30C[] = { - {0x0, 0x0, 0x4}, - {0x14, 0x2, 0x4} + { 0x0, 0x0, 0x4 }, + { 0x14, 0x2, 0x4 }, }; static const UnkStruct_ov70_0226E5A4 Unk_ov70_0226E5A4[39] = { { 0x0, 0x0, - {0x0, 0x11} + { 0x0, 0x11 }, }, { 0x0, 0x1, - {0x0, 0x11} + { 0x0, 0x11 }, }, { 0x0, 0x2, - {0x0, 0x11} + { 0x0, 0x11 }, }, { 0x1, 0x3, - {0x1, 0x2} + { 0x1, 0x2 }, }, { 0x1, 0x4, - {0x1, 0x2} + { 0x1, 0x2 }, }, { 0x1, 0x5, - {0x1, 0x2} + { 0x1, 0x2 }, }, { 0x1, 0x6, - {0x3, 0x11} + { 0x3, 0x11 }, }, { 0x1, 0x7, - {0x3, 0x11} + { 0x3, 0x11 }, }, { 0x1, 0x8, - {0x3, 0x11} + { 0x3, 0x11 }, }, { 0x5, 0xB, - {0x6, 0x11} + { 0x6, 0x11 }, }, { 0x3, 0x9, - {0x4, 0x11} + { 0x4, 0x11 }, }, { 0x4, 0xA, - {0x5, 0x11} + { 0x5, 0x11 }, }, { 0x6, 0xC, - {0x7, 0x11} + { 0x7, 0x11 }, }, { 0x7, 0xD, - {0x8, 0x11} + { 0x8, 0x11 }, }, { 0x8, 0xE, - {0x9, 0x11} + { 0x9, 0x11 }, }, { 0x9, 0xF, - {0xA, 0x11} + { 0xA, 0x11 }, }, { 0xA, 0x10, - {0xB, 0x11} + { 0xB, 0x11 }, }, { 0xB, 0x11, - {0xC, 0x11} + { 0xC, 0x11 }, }, { 0xC, 0x12, - {0xD, 0x11} + { 0xD, 0x11 }, }, { 0x2, 0x13, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x14, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x15, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x16, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x17, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x18, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x19, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x1A, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x1B, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x1C, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x1D, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x1E, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x1F, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x20, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x21, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x22, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x23, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0x2, 0x24, - {0x11, 0x11} + { 0x11, 0x11 }, }, { 0xD, 0x25, - {0xE, 0x11} + { 0xE, 0x11 }, }, { 0xE, 0x26, - {0xF, 0x11} - } + { 0xF, 0x11 }, + }, }; -UnkStruct_ov70_02269204 * ov70_02269190 (UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov70_0225C894 * param1, UnkStruct_ov70_02260AD4 * param2, UnkStruct_ov70_0225CA20 * param3, u32 param4, u32 param5) +UnkStruct_ov70_02269204 *ov70_02269190(UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov70_0225C894 *param1, UnkStruct_ov70_02260AD4 *param2, UnkStruct_ov70_0225CA20 *param3, u32 param4, u32 param5) { - UnkStruct_ov70_02269204 * v0; + UnkStruct_ov70_02269204 *v0; v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov70_02269204)); memset(v0, 0, sizeof(UnkStruct_ov70_02269204)); @@ -644,7 +644,7 @@ UnkStruct_ov70_02269204 * ov70_02269190 (UnkStruct_ov66_0222DFF8 * param0, UnkSt v0->unk_0C = param1; { - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_LOBBY_OTHER, param4); @@ -660,7 +660,7 @@ UnkStruct_ov70_02269204 * ov70_02269190 (UnkStruct_ov66_0222DFF8 * param0, UnkSt return v0; } -void ov70_02269204 (UnkStruct_ov70_02269204 * param0) +void ov70_02269204(UnkStruct_ov70_02269204 *param0) { { ov70_022695C4(param0); @@ -671,7 +671,7 @@ void ov70_02269204 (UnkStruct_ov70_02269204 * param0) Heap_FreeToHeap(param0); } -void ov70_02269220 (UnkStruct_ov70_02269204 * param0) +void ov70_02269220(UnkStruct_ov70_02269204 *param0) { int v0; @@ -680,11 +680,11 @@ void ov70_02269220 (UnkStruct_ov70_02269204 * param0) } } -void ov70_02269240 (UnkStruct_ov70_02269204 * param0) +void ov70_02269240(UnkStruct_ov70_02269204 *param0) { int v0; BOOL v1; - UnkStruct_ov70_0225CC54 * v2; + UnkStruct_ov70_0225CC54 *v2; v2 = ov70_0225CCAC(param0->unk_04); @@ -693,9 +693,9 @@ void ov70_02269240 (UnkStruct_ov70_02269204 * param0) } } -void ov70_02269268 (UnkStruct_ov70_02269204 * param0, u32 param1, u32 param2) +void ov70_02269268(UnkStruct_ov70_02269204 *param0, u32 param1, u32 param2) { - UnkStruct_ov70_0225CC54 * v0; + UnkStruct_ov70_0225CC54 *v0; GF_ASSERT(param1 < 20); @@ -708,7 +708,7 @@ void ov70_02269268 (UnkStruct_ov70_02269204 * param0, u32 param1, u32 param2) ov70_02269738(param0, ¶m0->unk_10[param1], v0, param2); } -BOOL ov70_02269298 (const UnkStruct_ov70_02269204 * param0, u32 param1) +BOOL ov70_02269298(const UnkStruct_ov70_02269204 *param0, u32 param1) { if (ov70_02269800(¶m0->unk_10[param1]) == 1) { return 0; @@ -717,7 +717,7 @@ BOOL ov70_02269298 (const UnkStruct_ov70_02269204 * param0, u32 param1) return 1; } -static void ov70_022692B4 (UnkStruct_ov70_022692B4 * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, s32 param7) +static void ov70_022692B4(UnkStruct_ov70_022692B4 *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, s32 param7) { param0->unk_00 = param7; param0->unk_04 = param1; @@ -731,7 +731,7 @@ static void ov70_022692B4 (UnkStruct_ov70_022692B4 * param0, fx32 param1, fx32 p param0->unk_24 = param5; } -static BOOL ov70_022692DC (UnkStruct_ov70_022692B4 * param0, s32 param1) +static BOOL ov70_022692DC(UnkStruct_ov70_022692B4 *param0, s32 param1) { s32 v0; BOOL v1 = 0; @@ -758,14 +758,14 @@ static BOOL ov70_022692DC (UnkStruct_ov70_022692B4 * param0, s32 param1) return v1; } -static void ov70_02269488 (const UnkStruct_ov70_022692B4 * param0, fx32 * param1, fx32 * param2, fx32 * param3) +static void ov70_02269488(const UnkStruct_ov70_022692B4 *param0, fx32 *param1, fx32 *param2, fx32 *param3) { *param1 = param0->unk_04; *param2 = param0->unk_08; *param3 = param0->unk_0C; } -static void ov70_0226949C (UnkStruct_ov70_0226949C * param0, u16 param1, u16 param2, fx32 param3) +static void ov70_0226949C(UnkStruct_ov70_0226949C *param0, u16 param1, u16 param2, fx32 param3) { param0->unk_00 = param1; param0->unk_02 = param2; @@ -773,18 +773,18 @@ static void ov70_0226949C (UnkStruct_ov70_0226949C * param0, u16 param1, u16 par param0->unk_08 = FX_Mul(FX_SinIdx(param1), param0->unk_04); } -static void ov70_022694D0 (UnkStruct_ov70_0226949C * param0) +static void ov70_022694D0(UnkStruct_ov70_0226949C *param0) { param0->unk_00 += param0->unk_02; param0->unk_08 = FX_Mul(FX_SinIdx(param0->unk_00), param0->unk_04); } -static void ov70_02269508 (const UnkStruct_ov70_0226949C * param0, fx32 * param1) +static void ov70_02269508(const UnkStruct_ov70_0226949C *param0, fx32 *param1) { *param1 = param0->unk_08; } -static void ov70_02269510 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2) +static void ov70_02269510(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2) { if (param1->unk_08 == ov70_0225CCAC(param0->unk_04)) { sub_02005770(param2, 5); @@ -795,7 +795,7 @@ static void ov70_02269510 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } -static void ov70_02269540 (UnkStruct_ov70_02269204 * param0, NARC * param1, u32 param2) +static void ov70_02269540(UnkStruct_ov70_02269204 *param0, NARC *param1, u32 param2) { int v0; @@ -809,7 +809,7 @@ static void ov70_02269540 (UnkStruct_ov70_02269204 * param0, NARC * param1, u32 } } -static void ov70_022695C4 (UnkStruct_ov70_02269204 * param0) +static void ov70_022695C4(UnkStruct_ov70_02269204 *param0) { int v0; @@ -818,7 +818,7 @@ static void ov70_022695C4 (UnkStruct_ov70_02269204 * param0) } } -static void ov70_022695E0 (UnkStruct_ov70_02269204 * param0, NARC * param1, u32 param2) +static void ov70_022695E0(UnkStruct_ov70_02269204 *param0, NARC *param1, u32 param2) { int v0; @@ -827,13 +827,13 @@ static void ov70_022695E0 (UnkStruct_ov70_02269204 * param0, NARC * param1, u32 } } -static void ov70_02269608 (UnkStruct_ov70_02269204 * param0) +static void ov70_02269608(UnkStruct_ov70_02269204 *param0) { int v0; NNSG3dTexKey v1; NNSG3dTexKey v2; NNSG3dPlttKey v3; - NNSG3dResTex * v4; + NNSG3dResTex *v4; for (v0 = 0; v0 < 39; v0++) { v4 = NNS_G3dGetTex(param0->unk_10640[v0]); @@ -848,7 +848,7 @@ static void ov70_02269608 (UnkStruct_ov70_02269204 * param0) } } -static void ov70_0226965C (UnkStruct_ov70_02269204 * param0, NARC * param1, u32 param2) +static void ov70_0226965C(UnkStruct_ov70_02269204 *param0, NARC *param1, u32 param2) { int v0, v1; @@ -864,7 +864,7 @@ static void ov70_0226965C (UnkStruct_ov70_02269204 * param0, NARC * param1, u32 } } -static void ov70_02269700 (UnkStruct_ov70_02269204 * param0) +static void ov70_02269700(UnkStruct_ov70_02269204 *param0) { int v0; @@ -876,9 +876,9 @@ static void ov70_02269700 (UnkStruct_ov70_02269204 * param0) } } -static void ov70_02269738 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, UnkStruct_ov70_0225CC54 * param2, u32 param3) +static void ov70_02269738(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, UnkStruct_ov70_0225CC54 *param2, u32 param3) { - static void(*const v0[27])(UnkStruct_ov70_02269204 *, UnkStruct_ov70_02269800 *) = { + static void (*const v0[27])(UnkStruct_ov70_02269204 *, UnkStruct_ov70_02269800 *) = { ov70_0226A244, ov70_0226A294, ov70_0226A2E4, @@ -951,9 +951,9 @@ static void ov70_02269738 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_02269510(param0, param1, v1[param1->unk_00]); } -static void ov70_0226978C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226978C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { - static BOOL(*const v0[27])(UnkStruct_ov70_02269204 *, UnkStruct_ov70_02269800 *) = { + static BOOL (*const v0[27])(UnkStruct_ov70_02269204 *, UnkStruct_ov70_02269800 *) = { ov70_0226A930, ov70_0226A930, ov70_0226A930, @@ -994,7 +994,7 @@ static void ov70_0226978C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } -static BOOL ov70_022697C8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_022697C8(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { if (ov70_02269800(param1) == 0) { return 0; @@ -1005,12 +1005,12 @@ static BOOL ov70_022697C8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return ov70_0226A998(param0, param1); } -static void ov70_022697F0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_022697F0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { memset(param1, 0, sizeof(UnkStruct_ov70_02269800)); } -static BOOL ov70_02269800 (const UnkStruct_ov70_02269800 * param0) +static BOOL ov70_02269800(const UnkStruct_ov70_02269800 *param0) { if (param0->unk_08 == NULL) { return 0; @@ -1019,7 +1019,7 @@ static BOOL ov70_02269800 (const UnkStruct_ov70_02269800 * param0) return 1; } -static BOOL ov70_02269810 (const UnkStruct_ov70_02269800 * param0, u32 param1) +static BOOL ov70_02269810(const UnkStruct_ov70_02269800 *param0, u32 param1) { if (param0->unk_87C[param1] == NULL) { return 0; @@ -1028,7 +1028,7 @@ static BOOL ov70_02269810 (const UnkStruct_ov70_02269800 * param0, u32 param1) return 1; } -static void ov70_02269828 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, const UnkStruct_ov70_0226E5A4 * param3) +static void ov70_02269828(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, const UnkStruct_ov70_0226E5A4 *param3) { int v0; @@ -1040,12 +1040,12 @@ static void ov70_02269828 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 sub_02017258(¶m1->unk_0C[param2], ¶m0->unk_10550[param3->unk_00]); } -static void ov70_02269878 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2) +static void ov70_02269878(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2) { BOOL v0; - void * v1; - UnkStruct_020170F4 * v2; - UnkStruct_02017248 * v3; + void *v1; + UnkStruct_020170F4 *v2; + UnkStruct_02017248 *v3; int v4; GF_ASSERT(param1->unk_87C[param2] != NULL); @@ -1091,20 +1091,20 @@ static void ov70_02269878 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 v2->unk_0C = NULL; } -static void ov70_022699BC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3) +static void ov70_022699BC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3) { ov70_022699E4(param0, param1, param2, param3, (FX32_ONE * 2)); } -static BOOL ov70_022699D0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3) +static BOOL ov70_022699D0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3) { return ov70_02269A3C(param0, param1, param2, param3, (FX32_ONE * 2)); } -static void ov70_022699E4 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3, fx32 param4) +static void ov70_022699E4(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3, fx32 param4) { fx32 v0; - UnkStruct_02017248 * v1; + UnkStruct_02017248 *v1; v1 = ¶m0->unk_106DC[param1->unk_87C[param2]->unk_02[param3]]; v0 = sub_0201724C(v1); @@ -1116,11 +1116,11 @@ static void ov70_022699E4 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } -static BOOL ov70_02269A3C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3, fx32 param4) +static BOOL ov70_02269A3C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3, fx32 param4) { fx32 v0; BOOL v1; - UnkStruct_02017248 * v2; + UnkStruct_02017248 *v2; v2 = ¶m0->unk_106DC[param1->unk_87C[param2]->unk_02[param3]]; v0 = sub_0201724C(v2); @@ -1136,10 +1136,10 @@ static BOOL ov70_02269A3C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return v1; } -static void ov70_02269A90 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3, fx32 param4) +static void ov70_02269A90(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3, fx32 param4) { fx32 v0; - UnkStruct_02017248 * v1; + UnkStruct_02017248 *v1; v1 = ¶m0->unk_106DC[param1->unk_87C[param2]->unk_02[param3]]; v0 = sub_0201724C(v1); @@ -1151,46 +1151,46 @@ static void ov70_02269A90 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } -static fx32 ov70_02269AE8 (const UnkStruct_ov70_02269204 * param0, const UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3) +static fx32 ov70_02269AE8(const UnkStruct_ov70_02269204 *param0, const UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3) { fx32 v0; - const UnkStruct_02017248 * v1; + const UnkStruct_02017248 *v1; v1 = ¶m0->unk_106DC[param1->unk_87C[param2]->unk_02[param3]]; return sub_02017248(v1); } -static void ov70_02269B10 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_02269B10(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226B92C(param0, param1, 1); } -static void ov70_02269B1C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_02269B1C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226B92C(param0, param1, 2); } -static void ov70_02269B28 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_02269B28(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226B92C(param0, param1, 3); } -static void ov70_02269B34 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_02269B34(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226BAC8(param0, param1, 1); } -static void ov70_02269B40 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_02269B40(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226BAC8(param0, param1, 2); } -static void ov70_02269B4C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_02269B4C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226BAC8(param0, param1, 3); } -static void ov70_02269B58 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_02269B58(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; VecFx32 v1; @@ -1210,7 +1210,7 @@ static void ov70_02269B58 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 param1->unk_954.val5.unk_00 = 0xff; } -static void ov70_02269BB8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_02269BB8(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { VecFx32 v0, v1; u32 v2; @@ -1260,7 +1260,7 @@ static void ov70_02269BB8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 sub_02017350(¶m1->unk_0C[0], v1.x, v1.y, v1.z); } -static void ov70_02269CFC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_02269CFC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { VecFx32 v0, v1; u32 v2; @@ -1326,7 +1326,7 @@ static void ov70_02269CFC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 sub_02017350(¶m1->unk_0C[0], v1.x, v1.y, v1.z); } -static void ov70_02269F30 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_02269F30(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { VecFx32 v0, v1; u32 v2; @@ -1404,37 +1404,37 @@ static void ov70_02269F30 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 sub_02017350(¶m1->unk_0C[0], v1.x, v1.y, v1.z); } -static void ov70_0226A1FC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A1FC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226A9D0(param0, param1, 1); } -static void ov70_0226A208 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A208(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226A9D0(param0, param1, 2); } -static void ov70_0226A214 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A214(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226A9D0(param0, param1, 3); } -static void ov70_0226A220 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A220(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226B7B0(param0, param1, 1); } -static void ov70_0226A22C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A22C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226B7B0(param0, param1, 2); } -static void ov70_0226A238 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A238(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { ov70_0226B7B0(param0, param1, 4); } -static void ov70_0226A244 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A244(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -1445,7 +1445,7 @@ static void ov70_0226A244 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_0226BC40(¶m1->unk_954, Unk_ov70_0226E2EC, NELEMS(Unk_ov70_0226E2EC), 33, 0, param1); } -static void ov70_0226A294 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A294(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -1456,7 +1456,7 @@ static void ov70_0226A294 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_0226BC40(¶m1->unk_954, Unk_ov70_0226E304, NELEMS(Unk_ov70_0226E304), 33, 0, param1); } -static void ov70_0226A2E4 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A2E4(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -1467,7 +1467,7 @@ static void ov70_0226A2E4 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_0226BC40(¶m1->unk_954, Unk_ov70_0226E34C, NELEMS(Unk_ov70_0226E34C), 33, 0, param1); } -static void ov70_0226A334 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A334(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -1478,7 +1478,7 @@ static void ov70_0226A334 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_0226BC40(¶m1->unk_954, Unk_ov70_0226E2FC, NELEMS(Unk_ov70_0226E2FC), 33, 1, param1); } -static void ov70_0226A384 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A384(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -1489,7 +1489,7 @@ static void ov70_0226A384 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_0226BC40(¶m1->unk_954, Unk_ov70_0226E334, NELEMS(Unk_ov70_0226E334), 41, 1, param1); } -static void ov70_0226A3D4 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A3D4(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -1500,7 +1500,7 @@ static void ov70_0226A3D4 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_0226BC40(¶m1->unk_954, Unk_ov70_0226E358, NELEMS(Unk_ov70_0226E358), 33, 1, param1); } -static void ov70_0226A424 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A424(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; VecFx32 v1; @@ -1513,7 +1513,7 @@ static void ov70_0226A424 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_0226BB34(param0, param1); } -static void ov70_0226A478 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A478(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; VecFx32 v1; @@ -1526,7 +1526,7 @@ static void ov70_0226A478 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_0226BB34(param0, param1); } -static void ov70_0226A4CC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226A4CC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -1538,7 +1538,7 @@ static void ov70_0226A4CC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_0226BB34(param0, param1); } -static BOOL ov70_0226A520 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A520(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; BOOL v1; @@ -1581,22 +1581,22 @@ static BOOL ov70_0226A520 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return 0; } -static BOOL ov70_0226A5F0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A5F0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { return ov70_0226B998(param0, param1, 0); } -static BOOL ov70_0226A5FC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A5FC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { return ov70_0226B998(param0, param1, 1); } -static BOOL ov70_0226A608 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A608(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { return ov70_0226B998(param0, param1, 2); } -static BOOL ov70_0226A614 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A614(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { u32 v0; int v1; @@ -1635,7 +1635,7 @@ static BOOL ov70_0226A614 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return v2; } -static BOOL ov70_0226A6C8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A6C8(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { BOOL v0; BOOL v1; @@ -1701,7 +1701,7 @@ static BOOL ov70_0226A6C8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return v1; } -static BOOL ov70_0226A820 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A820(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { BOOL v0; @@ -1726,13 +1726,13 @@ static BOOL ov70_0226A820 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return 0; } -static BOOL ov70_0226A858 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A858(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { BOOL v0; u32 v1; int v2; - if ((param1->unk_954.val3.unk_01 < param1->unk_954.val3.unk_02)) { + if (param1->unk_954.val3.unk_01 < param1->unk_954.val3.unk_02) { param1->unk_954.val3.unk_00++; if (param1->unk_954.val3.unk_00 >= 8) { @@ -1767,7 +1767,7 @@ static BOOL ov70_0226A858 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return 0; } -static BOOL ov70_0226A930 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A930(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { u32 v0; @@ -1781,7 +1781,7 @@ static BOOL ov70_0226A930 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return 0; } -static BOOL ov70_0226A958 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A958(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { u32 v0; int v1; @@ -1802,7 +1802,7 @@ static BOOL ov70_0226A958 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return 0; } -static BOOL ov70_0226A998 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226A998(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -1819,7 +1819,7 @@ static BOOL ov70_0226A998 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return 1; } -static void ov70_0226A9D0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2) +static void ov70_0226A9D0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2) { VecFx32 v0; @@ -1875,7 +1875,7 @@ static void ov70_0226A9D0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } -static void ov70_0226AB14 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226AB14(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { VecFx32 v0; @@ -1887,7 +1887,7 @@ static void ov70_0226AB14 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 param1->unk_954.val1.unk_02 = 0; } -static void ov70_0226ABAC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226ABAC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { VecFx32 v0; @@ -1899,7 +1899,7 @@ static void ov70_0226ABAC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 param1->unk_954.val1.unk_02 = 0; } -static BOOL ov70_0226AC08 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226AC08(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { BOOL v0; @@ -1912,7 +1912,7 @@ static BOOL ov70_0226AC08 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return v0; } -static BOOL ov70_0226AC24 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226AC24(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { BOOL v0; VecFx32 v1; @@ -1966,7 +1966,7 @@ static BOOL ov70_0226AC24 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return v0; } -static BOOL ov70_0226AD20 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226AD20(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { BOOL v0; VecFx32 v1; @@ -1988,7 +1988,7 @@ static BOOL ov70_0226AD20 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return v0; } -static void ov70_0226ADA0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226ADA0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { if (param1->unk_954.val1.unk_11 == 0) { ov70_0226ADBC(param0, param1); @@ -1997,7 +1997,7 @@ static void ov70_0226ADA0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } -static void ov70_0226ADBC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226ADBC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { VecFx32 v0; VecFx32 v1; @@ -2040,7 +2040,7 @@ static void ov70_0226ADBC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 param1->unk_954.val1.unk_10 = 0; } -static void ov70_0226AF1C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226AF1C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { VecFx32 v0; VecFx32 v1; @@ -2052,7 +2052,7 @@ static void ov70_0226AF1C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 param1->unk_954.val1.unk_00 = 0; } -static BOOL ov70_0226AF60 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226AF60(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { BOOL v0; @@ -2065,7 +2065,7 @@ static BOOL ov70_0226AF60 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return v0; } -static BOOL ov70_0226AF7C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226AF7C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -2098,8 +2098,7 @@ static BOOL ov70_0226AF7C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } break; - case 3: - { + case 3: { BOOL v2; VecFx32 v3; @@ -2117,10 +2116,8 @@ static BOOL ov70_0226AF7C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 ov70_02269510(param0, param1, 1451); } - } - break; - case 4: - { + } break; + case 4: { u16 v4; fx32 v5; VecFx32 v6; @@ -2145,8 +2142,7 @@ static BOOL ov70_0226AF7C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } else { param1->unk_954.val1.unk_02++; } - } - break; + } break; } param1->unk_954.val1.unk_10++; @@ -2184,7 +2180,7 @@ static BOOL ov70_0226AF7C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return 0; } -static BOOL ov70_0226B1D0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static BOOL ov70_0226B1D0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -2223,8 +2219,7 @@ static BOOL ov70_0226B1D0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } break; - case 3: - { + case 3: { BOOL v2; VecFx32 v3; @@ -2250,14 +2245,13 @@ static BOOL ov70_0226B1D0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return 1; } - } - break; + } break; } return 0; } -static void ov70_0226B324 (UnkStruct_ov70_02269800 * param0) +static void ov70_0226B324(UnkStruct_ov70_02269800 *param0) { VecFx32 v0; @@ -2280,7 +2274,7 @@ static void ov70_0226B324 (UnkStruct_ov70_02269800 * param0) } } -static void ov70_0226B51C (UnkStruct_ov70_02269800 * param0) +static void ov70_0226B51C(UnkStruct_ov70_02269800 *param0) { VecFx32 v0; @@ -2303,7 +2297,7 @@ static void ov70_0226B51C (UnkStruct_ov70_02269800 * param0) } } -static BOOL ov70_0226B714 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2, u32 param3) +static BOOL ov70_0226B714(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2, u32 param3) { if (param1->unk_954.val1.unk_0C[param2] != param3) { param1->unk_954.val1.unk_0C[param2] = param3; @@ -2315,7 +2309,7 @@ static BOOL ov70_0226B714 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return 0; } -static void ov70_0226B744 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2) +static void ov70_0226B744(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2) { fx32 v0; u32 v1; @@ -2343,7 +2337,7 @@ static void ov70_0226B744 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 param1->unk_954.val1.unk_08[param2]--; } -static void ov70_0226B7B0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2) +static void ov70_0226B7B0(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2) { int v0, v1; VecFx32 v2; @@ -2379,7 +2373,7 @@ static void ov70_0226B7B0 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 param1->unk_954.val3.unk_03 = 0; } -static BOOL ov70_0226B8C4 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2) +static BOOL ov70_0226B8C4(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2) { BOOL v0; VecFx32 v1; @@ -2395,7 +2389,7 @@ static BOOL ov70_0226B8C4 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 return v0; } -static void ov70_0226B92C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2) +static void ov70_0226B92C(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2) { int v0; VecFx32 v1; @@ -2414,7 +2408,7 @@ static void ov70_0226B92C (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 param1->unk_954.val4.unk_00 = param2; } -static BOOL ov70_0226B998 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2) +static BOOL ov70_0226B998(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2) { BOOL v0; u32 v1; @@ -2445,14 +2439,14 @@ static BOOL ov70_0226B998 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 param1->unk_02++; } - if ((param1->unk_02 >= 48)) { + if (param1->unk_02 >= 48) { return 1; } return 0; } -static void ov70_0226BAC8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1, u32 param2) +static void ov70_0226BAC8(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1, u32 param2) { int v0; VecFx32 v1; @@ -2471,7 +2465,7 @@ static void ov70_0226BAC8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 param1->unk_954.val6.unk_02 = param2; } -static void ov70_0226BB34 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226BB34(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { VecFx32 v0; int v1; @@ -2488,7 +2482,7 @@ static void ov70_0226BB34 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } -static void ov70_0226BBA8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226BBA8(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -2500,7 +2494,7 @@ static void ov70_0226BBA8 (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } -static void ov70_0226BBDC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_02269800 * param1) +static void ov70_0226BBDC(UnkStruct_ov70_02269204 *param0, UnkStruct_ov70_02269800 *param1) { int v0; @@ -2523,7 +2517,7 @@ static void ov70_0226BBDC (UnkStruct_ov70_02269204 * param0, UnkStruct_ov70_0226 } } -static void ov70_0226BC40 (UnkStruct_ov70_0226BC40 * param0, const UnkStruct_ov70_0226E2EC * param1, u32 param2, u32 param3, u32 param4, UnkStruct_ov70_02269800 * param5) +static void ov70_0226BC40(UnkStruct_ov70_0226BC40 *param0, const UnkStruct_ov70_0226E2EC *param1, u32 param2, u32 param3, u32 param4, UnkStruct_ov70_02269800 *param5) { int v0; @@ -2536,7 +2530,7 @@ static void ov70_0226BC40 (UnkStruct_ov70_0226BC40 * param0, const UnkStruct_ov7 } } -static int ov70_0226BCC0 (UnkStruct_ov70_0226BC40 * param0, u32 param1) +static int ov70_0226BCC0(UnkStruct_ov70_0226BC40 *param0, u32 param1) { int v0; UnkStruct_ov70_0226E2EC v1; @@ -2572,7 +2566,7 @@ static int ov70_0226BCC0 (UnkStruct_ov70_0226BC40 * param0, u32 param1) return v4; } -static void ov70_0226BD64 (UnkStruct_ov70_0226BD64 * param0, UnkStruct_02017294 * param1, UnkStruct_02017294 * param2, UnkStruct_02017294 * param3, UnkStruct_02017294 * param4, const UnkStruct_ov70_0225CC54 * param5, u32 param6) +static void ov70_0226BD64(UnkStruct_ov70_0226BD64 *param0, UnkStruct_02017294 *param1, UnkStruct_02017294 *param2, UnkStruct_02017294 *param3, UnkStruct_02017294 *param4, const UnkStruct_ov70_0225CC54 *param5, u32 param6) { GF_ASSERT(param6 < 3); @@ -2584,11 +2578,11 @@ static void ov70_0226BD64 (UnkStruct_ov70_0226BD64 * param0, UnkStruct_02017294 param0->unk_02 = param6; } -static void ov70_0226BDA0 (UnkStruct_ov70_0226BD64 * param0, u32 param1) +static void ov70_0226BDA0(UnkStruct_ov70_0226BD64 *param0, u32 param1) { int v0; - static void(*const v1[3])(UnkStruct_ov70_0226BD64 *, const UnkStruct_ov70_0225CC54 *) = { + static void (*const v1[3])(UnkStruct_ov70_0226BD64 *, const UnkStruct_ov70_0225CC54 *) = { ov70_0226BE3C, ov70_0226BFE4, ov70_0226C17C }; @@ -2603,12 +2597,12 @@ static void ov70_0226BDA0 (UnkStruct_ov70_0226BD64 * param0, u32 param1) v1[param0->unk_02](param0, param0->unk_E8); } -static BOOL ov70_0226BDE8 (UnkStruct_ov70_0226BD64 * param0) +static BOOL ov70_0226BDE8(UnkStruct_ov70_0226BD64 *param0) { int v0; BOOL v1; - static BOOL(*const v2[3])(UnkStruct_ov70_0226BD64 *) = { + static BOOL (*const v2[3])(UnkStruct_ov70_0226BD64 *) = { ov70_0226BF5C, ov70_0226C0D8, ov70_0226C1DC }; @@ -2631,7 +2625,7 @@ static BOOL ov70_0226BDE8 (UnkStruct_ov70_0226BD64 * param0) return v1; } -static void ov70_0226BE3C (UnkStruct_ov70_0226BD64 * param0, const UnkStruct_ov70_0225CC54 * param1) +static void ov70_0226BE3C(UnkStruct_ov70_0226BD64 *param0, const UnkStruct_ov70_0225CC54 *param1) { int v0; VecFx32 v1; @@ -2673,12 +2667,12 @@ static void ov70_0226BE3C (UnkStruct_ov70_0226BD64 * param0, const UnkStruct_ov7 } ov70_022692B4(¶m0->unk_08[v0], v1.x, v2.x, v1.y, v2.y, v1.z, v2.z, 18); - ov70_0226949C(¶m0->unk_A8[v0], v3, (((18 * 0xffff) / 360)), (FX32_CONST(6))); + ov70_0226949C(¶m0->unk_A8[v0], v3, ((18 * 0xffff) / 360), (FX32_CONST(6))); sub_02017350(param0->unk_D8[v0], v1.x, v1.y, v1.z); } } -static BOOL ov70_0226BF5C (UnkStruct_ov70_0226BD64 * param0) +static BOOL ov70_0226BF5C(UnkStruct_ov70_0226BD64 *param0) { int v0; BOOL v1; @@ -2701,7 +2695,7 @@ static BOOL ov70_0226BF5C (UnkStruct_ov70_0226BD64 * param0) return v1; } -static void ov70_0226BFE4 (UnkStruct_ov70_0226BD64 * param0, const UnkStruct_ov70_0225CC54 * param1) +static void ov70_0226BFE4(UnkStruct_ov70_0226BD64 *param0, const UnkStruct_ov70_0225CC54 *param1) { int v0; VecFx32 v1; @@ -2744,13 +2738,13 @@ static void ov70_0226BFE4 (UnkStruct_ov70_0226BD64 * param0, const UnkStruct_ov7 } ov70_022692B4(¶m0->unk_08[v0], v1.x, v2.x, v1.y, v2.y, v1.z, v2.z, 19); - ov70_0226949C(¶m0->unk_A8[v0], (((30 * 0xffff) / 360)), (((10 * 0xffff) / 360)), (FX32_CONST(32))); + ov70_0226949C(¶m0->unk_A8[v0], ((30 * 0xffff) / 360), ((10 * 0xffff) / 360), (FX32_CONST(32))); } ov70_0226C0D8(param0); } -static BOOL ov70_0226C0D8 (UnkStruct_ov70_0226BD64 * param0) +static BOOL ov70_0226C0D8(UnkStruct_ov70_0226BD64 *param0) { int v0; BOOL v1; @@ -2759,7 +2753,7 @@ static BOOL ov70_0226C0D8 (UnkStruct_ov70_0226BD64 * param0) for (v0 = 0; v0 < param0->unk_04; v0++) { if (param0->unk_00 == 14) { - ov70_0226949C(¶m0->unk_A8[v0], (((0 * 0xffff) / 360)), (((20 * 0xffff) / 360)), (FX32_CONST(12))); + ov70_0226949C(¶m0->unk_A8[v0], ((0 * 0xffff) / 360), ((20 * 0xffff) / 360), (FX32_CONST(12))); } else { ov70_022694D0(¶m0->unk_A8[v0]); } @@ -2780,7 +2774,7 @@ static BOOL ov70_0226C0D8 (UnkStruct_ov70_0226BD64 * param0) return 0; } -static void ov70_0226C17C (UnkStruct_ov70_0226BD64 * param0, const UnkStruct_ov70_0225CC54 * param1) +static void ov70_0226C17C(UnkStruct_ov70_0226BD64 *param0, const UnkStruct_ov70_0225CC54 *param1) { int v0; VecFx32 v1; @@ -2797,7 +2791,7 @@ static void ov70_0226C17C (UnkStruct_ov70_0226BD64 * param0, const UnkStruct_ov7 } } -static BOOL ov70_0226C1DC (UnkStruct_ov70_0226BD64 * param0) +static BOOL ov70_0226C1DC(UnkStruct_ov70_0226BD64 *param0) { int v0; BOOL v1; @@ -2830,7 +2824,7 @@ static BOOL ov70_0226C1DC (UnkStruct_ov70_0226BD64 * param0) return 0; } -static void ov70_0226C2A4 (UnkStruct_ov70_0226BD64 * param0, u32 param1, const VecFx32 * param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, u32 param7) +static void ov70_0226C2A4(UnkStruct_ov70_0226BD64 *param0, u32 param1, const VecFx32 *param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, u32 param7) { VecFx32 v0; diff --git a/src/overlay070/ov70_0226C338.c b/src/overlay070/ov70_0226C338.c index c5179f950d..e3711c28b2 100644 --- a/src/overlay070/ov70_0226C338.c +++ b/src/overlay070/ov70_0226C338.c @@ -1,8 +1,9 @@ +#include "overlay070/ov70_0226C338.h" + #include #include #include "heap.h" -#include "overlay070/ov70_0226C338.h" typedef struct { GXRgb unk_00; @@ -30,50 +31,42 @@ typedef struct UnkStruct_ov70_0226C39C_t { s32 unk_50[4]; } UnkStruct_ov70_0226C39C; -static void ov70_0226C4CC(const UnkStruct_ov70_0226C4CC * param0, GXRgb * param1); -static void ov70_0226C4E8(UnkStruct_ov70_0226C4CC * param0, const GXRgb * param1); -static void ov70_0226C50C(const UnkStruct_ov70_0226C4CC * param0, const UnkStruct_ov70_0226C4CC * param1, UnkStruct_ov70_0226C4CC * param2, s32 param3, s32 param4); -static void ov70_0226C568(UnkStruct_ov70_0226C568 * param0, const UnkStruct_ov70_0226E678 * param1); -static void ov70_0226C58C(UnkStruct_ov70_0226C568 * param0, const UnkStruct_ov70_0226E670 * param1); -static void ov70_0226C598(const UnkStruct_ov70_0226C568 * param0); +static void ov70_0226C4CC(const UnkStruct_ov70_0226C4CC *param0, GXRgb *param1); +static void ov70_0226C4E8(UnkStruct_ov70_0226C4CC *param0, const GXRgb *param1); +static void ov70_0226C50C(const UnkStruct_ov70_0226C4CC *param0, const UnkStruct_ov70_0226C4CC *param1, UnkStruct_ov70_0226C4CC *param2, s32 param3, s32 param4); +static void ov70_0226C568(UnkStruct_ov70_0226C568 *param0, const UnkStruct_ov70_0226E678 *param1); +static void ov70_0226C58C(UnkStruct_ov70_0226C568 *param0, const UnkStruct_ov70_0226E670 *param1); +static void ov70_0226C598(const UnkStruct_ov70_0226C568 *param0); static const UnkStruct_ov70_0226E678 Unk_ov70_0226E678[6] = { - { - GX_RGB(23, 23, 25), + { GX_RGB(23, 23, 25), { GX_RGB(16, 16, 16), GX_RGB(14, 14, 14), GX_RGB(20, 20, 20), GX_RGB(16, 16, 16), - } - }, - { - GX_RGB(10, 10, 16), + } }, + { GX_RGB(10, 10, 16), { GX_RGB(16, 16, 16), GX_RGB(14, 14, 14), GX_RGB(20, 20, 20), GX_RGB(16, 16, 16), - } - }, - { - GX_RGB(8, 8, 12), + } }, + { GX_RGB(8, 8, 12), { GX_RGB(16, 16, 16), GX_RGB(14, 14, 14), GX_RGB(20, 20, 20), GX_RGB(16, 16, 16), - } - }, - { - GX_RGB(5, 5, 8), + } }, + { GX_RGB(5, 5, 8), { GX_RGB(16, 16, 16), GX_RGB(13, 13, 14), GX_RGB(20, 20, 20), GX_RGB(16, 16, 16), - } - }, + } }, { GX_RGB(3, 3, 7), { @@ -95,15 +88,15 @@ static const UnkStruct_ov70_0226E678 Unk_ov70_0226E678[6] = { }; static const UnkStruct_ov70_0226E670 Unk_ov70_0226E670[4] = { - {GX_RGB(14, 14, 14)}, - {GX_RGB(20, 20, 20)}, - {GX_RGB(31, 31, 31)}, - {GX_RGB(8, 8, 8)}, + { GX_RGB(14, 14, 14) }, + { GX_RGB(20, 20, 20) }, + { GX_RGB(31, 31, 31) }, + { GX_RGB(8, 8, 8) }, }; -UnkStruct_ov70_0226C39C * ov70_0226C338 (u32 param0, int param1, int param2, int param3) +UnkStruct_ov70_0226C39C *ov70_0226C338(u32 param0, int param1, int param2, int param3) { - UnkStruct_ov70_0226C39C * v0; + UnkStruct_ov70_0226C39C *v0; int v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov70_0226C39C)); @@ -125,12 +118,12 @@ UnkStruct_ov70_0226C39C * ov70_0226C338 (u32 param0, int param1, int param2, int return v0; } -void ov70_0226C39C (UnkStruct_ov70_0226C39C * param0) +void ov70_0226C39C(UnkStruct_ov70_0226C39C *param0) { Heap_FreeToHeap(param0); } -void ov70_0226C3A4 (UnkStruct_ov70_0226C39C * param0) +void ov70_0226C3A4(UnkStruct_ov70_0226C39C *param0) { int v0; BOOL v1 = 0; @@ -156,7 +149,7 @@ void ov70_0226C3A4 (UnkStruct_ov70_0226C39C * param0) } } -void ov70_0226C430 (UnkStruct_ov70_0226C39C * param0, int param1) +void ov70_0226C430(UnkStruct_ov70_0226C39C *param0, int param1) { int v0; @@ -173,7 +166,7 @@ void ov70_0226C430 (UnkStruct_ov70_0226C39C * param0, int param1) } } -void ov70_0226C4A0 (UnkStruct_ov70_0226C39C * param0, int param1) +void ov70_0226C4A0(UnkStruct_ov70_0226C39C *param0, int param1) { param0->unk_18.unk_00[1] = param0->unk_00.unk_00[1]; param0->unk_48[1] = 0; @@ -181,24 +174,24 @@ void ov70_0226C4A0 (UnkStruct_ov70_0226C39C * param0, int param1) ov70_0226C4E8(¶m0->unk_30.unk_00[1], &Unk_ov70_0226E670[param1].unk_00); } -void ov70_0226C4C8 (UnkStruct_ov70_0226C39C * param0, int param1) +void ov70_0226C4C8(UnkStruct_ov70_0226C39C *param0, int param1) { return; } -static void ov70_0226C4CC (const UnkStruct_ov70_0226C4CC * param0, GXRgb * param1) +static void ov70_0226C4CC(const UnkStruct_ov70_0226C4CC *param0, GXRgb *param1) { *param1 = GX_RGB(param0->unk_00[0], param0->unk_00[1], param0->unk_00[2]); } -static void ov70_0226C4E8 (UnkStruct_ov70_0226C4CC * param0, const GXRgb * param1) +static void ov70_0226C4E8(UnkStruct_ov70_0226C4CC *param0, const GXRgb *param1) { param0->unk_00[0] = ((*param1) & GX_RGB_R_MASK) >> GX_RGB_R_SHIFT; param0->unk_00[1] = ((*param1) & GX_RGB_G_MASK) >> GX_RGB_G_SHIFT; param0->unk_00[2] = ((*param1) & GX_RGB_B_MASK) >> GX_RGB_B_SHIFT; } -static void ov70_0226C50C (const UnkStruct_ov70_0226C4CC * param0, const UnkStruct_ov70_0226C4CC * param1, UnkStruct_ov70_0226C4CC * param2, s32 param3, s32 param4) +static void ov70_0226C50C(const UnkStruct_ov70_0226C4CC *param0, const UnkStruct_ov70_0226C4CC *param1, UnkStruct_ov70_0226C4CC *param2, s32 param3, s32 param4) { s32 v0; s32 v1; @@ -213,7 +206,7 @@ static void ov70_0226C50C (const UnkStruct_ov70_0226C4CC * param0, const UnkStru param2->unk_00[2] = param0->unk_00[2] + ((param3 * v2) / param4); } -static void ov70_0226C568 (UnkStruct_ov70_0226C568 * param0, const UnkStruct_ov70_0226E678 * param1) +static void ov70_0226C568(UnkStruct_ov70_0226C568 *param0, const UnkStruct_ov70_0226E678 *param1) { int v0; @@ -224,12 +217,12 @@ static void ov70_0226C568 (UnkStruct_ov70_0226C568 * param0, const UnkStruct_ov7 } } -static void ov70_0226C58C (UnkStruct_ov70_0226C568 * param0, const UnkStruct_ov70_0226E670 * param1) +static void ov70_0226C58C(UnkStruct_ov70_0226C568 *param0, const UnkStruct_ov70_0226E670 *param1) { ov70_0226C4E8(¶m0->unk_00[1], ¶m1->unk_00); } -static void ov70_0226C598 (const UnkStruct_ov70_0226C568 * param0) +static void ov70_0226C598(const UnkStruct_ov70_0226C568 *param0) { int v0; GXRgb v1, v2; diff --git a/src/overlay070/ov70_0226C60C.c b/src/overlay070/ov70_0226C60C.c index 39798f7737..e1738d25f6 100644 --- a/src/overlay070/ov70_0226C60C.c +++ b/src/overlay070/ov70_0226C60C.c @@ -1,8 +1,17 @@ +#include "overlay070/ov70_0226C60C.h" + #include -#include #include +#include +#include "overlay066/ov66_0222DDF0.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "overlay070/ov70_0225C9B4.h" +#include "overlay070/ov70_0225D9A4.h" +#include "overlay070/ov70_02261E10.h" +#include "overlay070/ov70_0226C338.h" +#include "overlay070/ov70_0226C8B4.h" +#include "overlay070/ov70_0226CE54.h" #include "overlay070/struct_ov70_0225CA20_decl.h" #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_02261E10_decl.h" @@ -11,33 +20,25 @@ #include "overlay070/struct_ov70_0226CF38_decl.h" #include "heap.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay070/ov70_0225C9B4.h" -#include "overlay070/ov70_0225D9A4.h" -#include "overlay070/ov70_02261E10.h" -#include "overlay070/ov70_0226C338.h" -#include "overlay070/ov70_0226C60C.h" -#include "overlay070/ov70_0226C8B4.h" -#include "overlay070/ov70_0226CE54.h" typedef struct UnkStruct_ov70_0226C6F8_t { - UnkStruct_ov70_0225DEE8 * unk_00; - UnkStruct_ov66_0222DFF8 * unk_04; - UnkStruct_ov70_02261E10 * unk_08; - UnkStruct_ov70_0225CA20 * unk_0C; - UnkStruct_ov70_0226C39C * unk_10; - UnkStruct_ov70_0226CF38 * unk_14; - UnkStruct_ov70_0226C914 * unk_18; + UnkStruct_ov70_0225DEE8 *unk_00; + UnkStruct_ov66_0222DFF8 *unk_04; + UnkStruct_ov70_02261E10 *unk_08; + UnkStruct_ov70_0225CA20 *unk_0C; + UnkStruct_ov70_0226C39C *unk_10; + UnkStruct_ov70_0226CF38 *unk_14; + UnkStruct_ov70_0226C914 *unk_18; } UnkStruct_ov70_0226C6F8; static u32 ov70_0226C81C(PPW_LOBBY_TIME_EVENT param0); static u32 ov70_0226C848(PPW_LOBBY_TIME_EVENT param0); static u32 ov70_0226C87C(PPW_LOBBY_TIME_EVENT param0); -static void ov70_0226C8A8(UnkStruct_ov70_0226C6F8 * param0); +static void ov70_0226C8A8(UnkStruct_ov70_0226C6F8 *param0); -UnkStruct_ov70_0226C6F8 * ov70_0226C60C (u32 param0, UnkStruct_ov70_0225DEE8 * param1) +UnkStruct_ov70_0226C6F8 *ov70_0226C60C(u32 param0, UnkStruct_ov70_0225DEE8 *param1) { - UnkStruct_ov70_0226C6F8 * v0; + UnkStruct_ov70_0226C6F8 *v0; u32 v1, v2, v3; u32 v4, v5, v6, v7, v8, v9; @@ -95,7 +96,7 @@ UnkStruct_ov70_0226C6F8 * ov70_0226C60C (u32 param0, UnkStruct_ov70_0225DEE8 * p return v0; } -void ov70_0226C6F8 (UnkStruct_ov70_0226C6F8 * param0) +void ov70_0226C6F8(UnkStruct_ov70_0226C6F8 *param0) { ov70_0226C914(param0->unk_18); ov70_0226CF38(param0->unk_14); @@ -104,7 +105,7 @@ void ov70_0226C6F8 (UnkStruct_ov70_0226C6F8 * param0) Heap_FreeToHeap(param0); } -void ov70_0226C718 (UnkStruct_ov70_0226C6F8 * param0) +void ov70_0226C718(UnkStruct_ov70_0226C6F8 *param0) { if (ov66_0222E084(param0->unk_04, 1)) { u32 v0; @@ -161,12 +162,12 @@ void ov70_0226C718 (UnkStruct_ov70_0226C6F8 * param0) ov70_0226C924(param0->unk_18); } -BOOL ov70_0226C810 (const UnkStruct_ov70_0226C6F8 * param0, u32 param1, int param2) +BOOL ov70_0226C810(const UnkStruct_ov70_0226C6F8 *param0, u32 param1, int param2) { return ov70_0226CFFC(param0->unk_14, param1, param2); } -static u32 ov70_0226C81C (PPW_LOBBY_TIME_EVENT param0) +static u32 ov70_0226C81C(PPW_LOBBY_TIME_EVENT param0) { switch (param0) { case PPW_LOBBY_TIME_EVENT_NEON_A0: @@ -184,7 +185,7 @@ static u32 ov70_0226C81C (PPW_LOBBY_TIME_EVENT param0) return 0; } -static u32 ov70_0226C848 (PPW_LOBBY_TIME_EVENT param0) +static u32 ov70_0226C848(PPW_LOBBY_TIME_EVENT param0) { switch (param0) { case PPW_LOBBY_TIME_EVENT_NEON_B0: @@ -200,7 +201,7 @@ static u32 ov70_0226C848 (PPW_LOBBY_TIME_EVENT param0) return 0; } -static u32 ov70_0226C87C (PPW_LOBBY_TIME_EVENT param0) +static u32 ov70_0226C87C(PPW_LOBBY_TIME_EVENT param0) { switch (param0) { case PPW_LOBBY_TIME_EVENT_NEON_C0: @@ -216,7 +217,7 @@ static u32 ov70_0226C87C (PPW_LOBBY_TIME_EVENT param0) return 0; } -static void ov70_0226C8A8 (UnkStruct_ov70_0226C6F8 * param0) +static void ov70_0226C8A8(UnkStruct_ov70_0226C6F8 *param0) { NNS_G3dGlbLightColor(2, GX_RGB(0, 0, 0)); } diff --git a/src/overlay070/ov70_0226C8B4.c b/src/overlay070/ov70_0226C8B4.c index 855731e627..c89d7f2951 100644 --- a/src/overlay070/ov70_0226C8B4.c +++ b/src/overlay070/ov70_0226C8B4.c @@ -1,14 +1,15 @@ +#include "overlay070/ov70_0226C8B4.h" + #include #include +#include "overlay066/ov66_0222DDF0.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "overlay070/ov70_02261E10.h" #include "overlay070/struct_ov70_02261E10_decl.h" -#include "unk_02005474.h" #include "heap.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay070/ov70_02261E10.h" -#include "overlay070/ov70_0226C8B4.h" +#include "unk_02005474.h" typedef struct { u32 unk_00; @@ -28,34 +29,34 @@ typedef union { } UnkStruct_ov70_0226C914_sub1; typedef struct { - const u8 * unk_00; + const u8 *unk_00; u32 unk_04; } UnkStruct_ov70_0226CBB4; typedef struct UnkStruct_ov70_0226C914_t { - const UnkStruct_ov66_0222DFF8 * unk_00; - UnkStruct_ov70_02261E10 * unk_04; + const UnkStruct_ov66_0222DFF8 *unk_00; + UnkStruct_ov70_02261E10 *unk_04; u8 unk_08; u8 unk_09; u16 unk_0A; UnkStruct_ov70_0226C914_sub1 unk_0C; } UnkStruct_ov70_0226C914; -static void ov70_0226C984(UnkStruct_ov70_0226C914 * param0, u32 param1, u32 param2); -static void ov70_0226C9AC(UnkStruct_ov70_0226C914 * param0, u32 param1); -static void ov70_0226C9B0(UnkStruct_ov70_0226C914 * param0, u32 param1); -static void ov70_0226C9B4(UnkStruct_ov70_0226C914 * param0, u32 param1); -static void ov70_0226CA38(UnkStruct_ov70_0226C914 * param0, u32 param1); -static void ov70_0226CAD4(UnkStruct_ov70_0226C914 * param0, u32 param1); -static void ov70_0226CB1C(UnkStruct_ov70_0226C914 * param0, u32 param1, u32 param2); -static void ov70_0226CB54(UnkStruct_ov70_0226C914 * param0, u32 param1); -static void ov70_0226CB64(UnkStruct_ov70_0226C914 * param0, u32 param1); -static void ov70_0226CB74(UnkStruct_ov70_0226C914 * param0, u32 param1); -static void ov70_0226CB84(UnkStruct_ov70_0226C914 * param0, u32 param1); -static void ov70_0226CB94(UnkStruct_ov70_0226C914 * param0, u32 param1); -static void ov70_0226CBB4(u32 param0, UnkStruct_ov70_0226CBB4 * param1); -static void ov70_0226CC3C(UnkStruct_ov70_0226C914 * param0); -static void ov70_0226CC58(UnkStruct_ov70_0226C914 * param0); +static void ov70_0226C984(UnkStruct_ov70_0226C914 *param0, u32 param1, u32 param2); +static void ov70_0226C9AC(UnkStruct_ov70_0226C914 *param0, u32 param1); +static void ov70_0226C9B0(UnkStruct_ov70_0226C914 *param0, u32 param1); +static void ov70_0226C9B4(UnkStruct_ov70_0226C914 *param0, u32 param1); +static void ov70_0226CA38(UnkStruct_ov70_0226C914 *param0, u32 param1); +static void ov70_0226CAD4(UnkStruct_ov70_0226C914 *param0, u32 param1); +static void ov70_0226CB1C(UnkStruct_ov70_0226C914 *param0, u32 param1, u32 param2); +static void ov70_0226CB54(UnkStruct_ov70_0226C914 *param0, u32 param1); +static void ov70_0226CB64(UnkStruct_ov70_0226C914 *param0, u32 param1); +static void ov70_0226CB74(UnkStruct_ov70_0226C914 *param0, u32 param1); +static void ov70_0226CB84(UnkStruct_ov70_0226C914 *param0, u32 param1); +static void ov70_0226CB94(UnkStruct_ov70_0226C914 *param0, u32 param1); +static void ov70_0226CBB4(u32 param0, UnkStruct_ov70_0226CBB4 *param1); +static void ov70_0226CC3C(UnkStruct_ov70_0226C914 *param0); +static void ov70_0226CC58(UnkStruct_ov70_0226C914 *param0); static const u8 Unk_ov70_0226E74C[] = { 0x6, @@ -116,24 +117,24 @@ static const u8 Unk_ov70_0226E6C8[] = { }; static const u8 Unk_ov70_0226E6D4[7][2] = { - {0x0, 0x5}, - {0x1, 0x6}, - {0x2, 0x0}, - {0x3, 0x1}, - {0x4, 0x2}, - {0x5, 0x3}, - {0x6, 0x4} + { 0x0, 0x5 }, + { 0x1, 0x6 }, + { 0x2, 0x0 }, + { 0x3, 0x1 }, + { 0x4, 0x2 }, + { 0x5, 0x3 }, + { 0x6, 0x4 } }; static const UnkStruct_ov70_0226E6FC Unk_ov70_0226E6FC[3] = { - {0xA, FX32_ONE}, - {0x2D, FX32_ONE}, - {0x50, FX32_HALF} + { 0xA, FX32_ONE }, + { 0x2D, FX32_ONE }, + { 0x50, FX32_HALF } }; -UnkStruct_ov70_0226C914 * ov70_0226C8B4 (const UnkStruct_ov66_0222DFF8 * param0, UnkStruct_ov70_02261E10 * param1, u32 param2) +UnkStruct_ov70_0226C914 *ov70_0226C8B4(const UnkStruct_ov66_0222DFF8 *param0, UnkStruct_ov70_02261E10 *param1, u32 param2) { - UnkStruct_ov70_0226C914 * v0; + UnkStruct_ov70_0226C914 *v0; u32 v1; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov70_0226C914)); @@ -157,13 +158,13 @@ UnkStruct_ov70_0226C914 * ov70_0226C8B4 (const UnkStruct_ov66_0222DFF8 * param0, return v0; } -void ov70_0226C914 (UnkStruct_ov70_0226C914 * param0) +void ov70_0226C914(UnkStruct_ov70_0226C914 *param0) { ov70_0226CC58(param0); Heap_FreeToHeap(param0); } -void ov70_0226C924 (UnkStruct_ov70_0226C914 * param0) +void ov70_0226C924(UnkStruct_ov70_0226C914 *param0) { u32 v0; u32 v1; @@ -192,9 +193,9 @@ void ov70_0226C924 (UnkStruct_ov70_0226C914 * param0) } } -static void ov70_0226C984 (UnkStruct_ov70_0226C914 * param0, u32 param1, u32 param2) +static void ov70_0226C984(UnkStruct_ov70_0226C914 *param0, u32 param1, u32 param2) { - static void(*const v0[])(UnkStruct_ov70_0226C914 *, u32) = { + static void (*const v0[])(UnkStruct_ov70_0226C914 *, u32) = { ov70_0226C9AC, ov70_0226C9AC, ov70_0226C9B0, @@ -210,17 +211,17 @@ static void ov70_0226C984 (UnkStruct_ov70_0226C914 * param0, u32 param1, u32 par } } -static void ov70_0226C9AC (UnkStruct_ov70_0226C914 * param0, u32 param1) +static void ov70_0226C9AC(UnkStruct_ov70_0226C914 *param0, u32 param1) { return; } -static void ov70_0226C9B0 (UnkStruct_ov70_0226C914 * param0, u32 param1) +static void ov70_0226C9B0(UnkStruct_ov70_0226C914 *param0, u32 param1) { return; } -static void ov70_0226C9B4 (UnkStruct_ov70_0226C914 * param0, u32 param1) +static void ov70_0226C9B4(UnkStruct_ov70_0226C914 *param0, u32 param1) { BOOL v0; u32 v1; @@ -228,10 +229,10 @@ static void ov70_0226C9B4 (UnkStruct_ov70_0226C914 * param0, u32 param1) BOOL v3; u32 v4; static const u32 v5[4][2] = { - {0, 2}, - {1, 3}, - {2, 0}, - {3, 1}, + { 0, 2 }, + { 1, 3 }, + { 2, 0 }, + { 3, 1 }, }; if ((param1 % 14) == 0) { @@ -267,7 +268,7 @@ static void ov70_0226C9B4 (UnkStruct_ov70_0226C914 * param0, u32 param1) } } -static void ov70_0226CA38 (UnkStruct_ov70_0226C914 * param0, u32 param1) +static void ov70_0226CA38(UnkStruct_ov70_0226C914 *param0, u32 param1) { int v0; u32 v1, v2; @@ -296,7 +297,7 @@ static void ov70_0226CA38 (UnkStruct_ov70_0226C914 * param0, u32 param1) } } -static void ov70_0226CAD4 (UnkStruct_ov70_0226C914 * param0, u32 param1) +static void ov70_0226CAD4(UnkStruct_ov70_0226C914 *param0, u32 param1) { if (param0->unk_0C.val3.unk_00 < 3) { if (Unk_ov70_0226E6FC[param0->unk_0C.val3.unk_00].unk_00 < param1) { @@ -309,9 +310,9 @@ static void ov70_0226CAD4 (UnkStruct_ov70_0226C914 * param0, u32 param1) } } -static void ov70_0226CB1C (UnkStruct_ov70_0226C914 * param0, u32 param1, u32 param2) +static void ov70_0226CB1C(UnkStruct_ov70_0226C914 *param0, u32 param1, u32 param2) { - static void(*const v0[])(UnkStruct_ov70_0226C914 *, u32) = { + static void (*const v0[])(UnkStruct_ov70_0226C914 *, u32) = { ov70_0226CB54, ov70_0226CB54, ov70_0226CB64, @@ -330,27 +331,27 @@ static void ov70_0226CB1C (UnkStruct_ov70_0226C914 * param0, u32 param1, u32 par } } -static void ov70_0226CB54 (UnkStruct_ov70_0226C914 * param0, u32 param1) +static void ov70_0226CB54(UnkStruct_ov70_0226C914 *param0, u32 param1) { ov70_02262724(param0->unk_04, 0, FX32_ONE); } -static void ov70_0226CB64 (UnkStruct_ov70_0226C914 * param0, u32 param1) +static void ov70_0226CB64(UnkStruct_ov70_0226C914 *param0, u32 param1) { ov70_02262724(param0->unk_04, 1, FX32_ONE); } -static void ov70_0226CB74 (UnkStruct_ov70_0226C914 * param0, u32 param1) +static void ov70_0226CB74(UnkStruct_ov70_0226C914 *param0, u32 param1) { ov70_02262724(param0->unk_04, 0, FX32_ONE); } -static void ov70_0226CB84 (UnkStruct_ov70_0226C914 * param0, u32 param1) +static void ov70_0226CB84(UnkStruct_ov70_0226C914 *param0, u32 param1) { ov70_02262724(param0->unk_04, 0, FX32_ONE); } -static void ov70_0226CB94 (UnkStruct_ov70_0226C914 * param0, u32 param1) +static void ov70_0226CB94(UnkStruct_ov70_0226C914 *param0, u32 param1) { ov70_0226CC58(param0); @@ -358,7 +359,7 @@ static void ov70_0226CB94 (UnkStruct_ov70_0226C914 * param0, u32 param1) ov70_0226251C(param0->unk_04, 0); } -static void ov70_0226CBB4 (u32 param0, UnkStruct_ov70_0226CBB4 * param1) +static void ov70_0226CBB4(u32 param0, UnkStruct_ov70_0226CBB4 *param1) { switch (param0) { case 0: @@ -395,7 +396,7 @@ static void ov70_0226CBB4 (u32 param0, UnkStruct_ov70_0226CBB4 * param1) } } -static void ov70_0226CC3C (UnkStruct_ov70_0226C914 * param0) +static void ov70_0226CC3C(UnkStruct_ov70_0226C914 *param0) { if (param0->unk_09 == 0) { Sound_PlayEffect(1438); @@ -403,7 +404,7 @@ static void ov70_0226CC3C (UnkStruct_ov70_0226C914 * param0) } } -static void ov70_0226CC58 (UnkStruct_ov70_0226C914 * param0) +static void ov70_0226CC58(UnkStruct_ov70_0226C914 *param0) { if (param0->unk_09) { sub_020057A4(1438, 0); diff --git a/src/overlay070/ov70_0226CC74.c b/src/overlay070/ov70_0226CC74.c index a6bc946497..017ef99194 100644 --- a/src/overlay070/ov70_0226CC74.c +++ b/src/overlay070/ov70_0226CC74.c @@ -1,33 +1,34 @@ +#include "overlay070/ov70_0226CC74.h" + #include #include -#include "strbuf.h" +#include "overlay063/ov63_0222BE18.h" +#include "overlay066/ov66_0222DDF0.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "overlay070/ov70_0225C9B4.h" +#include "overlay070/ov70_0225D9A4.h" +#include "overlay070/ov70_02262DA8.h" #include "overlay070/struct_ov70_0225CA20_decl.h" #include "overlay070/struct_ov70_0225CC54_decl.h" #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_02263344_decl.h" +#include "strbuf.h" #include "unk_02005474.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay070/ov70_0225C9B4.h" -#include "overlay070/ov70_0225D9A4.h" -#include "overlay070/ov70_02262DA8.h" -#include "overlay070/ov70_0226CC74.h" typedef struct { u32 unk_00; } UnkStruct_ov70_0226CC74; -BOOL ov70_0226CC74 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * param1, u32 param2) +BOOL ov70_0226CC74(UnkStruct_ov70_02263344 *param0, UnkStruct_ov70_0225DEE8 *param1, u32 param2) { - UnkStruct_ov70_0226CC74 * v0; - UnkStruct_ov66_0222DFF8 * v1; - UnkStruct_ov70_0225CA20 * v2; - UnkStruct_ov70_0225CC54 * v3; - UnkStruct_ov70_0225CC54 * v4; - Strbuf* v5; + UnkStruct_ov70_0226CC74 *v0; + UnkStruct_ov66_0222DFF8 *v1; + UnkStruct_ov70_0225CA20 *v2; + UnkStruct_ov70_0225CC54 *v3; + UnkStruct_ov70_0225CC54 *v4; + Strbuf *v5; v0 = ov70_02262E80(param0); v1 = ov70_0225DEE8(param1); @@ -59,7 +60,7 @@ BOOL ov70_0226CC74 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * break; } - if ((ov66_0222E19C(v1) == 1)) { + if (ov66_0222E19C(v1) == 1) { v5 = ov70_0225E20C(param1, 1, 88); v0->unk_00 = 4; ov70_0225DF8C(param1, v5); @@ -86,8 +87,7 @@ BOOL ov70_0226CC74 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * ov70_0225E164(param1); ov70_02262E88(param0, 2); break; - case 2: - { + case 2: { int v7; v7 = ov70_0225E1C4(param1); @@ -105,8 +105,7 @@ BOOL ov70_0226CC74 (UnkStruct_ov70_02263344 * param0, UnkStruct_ov70_0225DEE8 * case 2: break; } - } - break; + } break; case 3: v5 = ov70_0225E20C(param1, 1, 85); v0->unk_00 = 4; diff --git a/src/overlay070/ov70_0226CE54.c b/src/overlay070/ov70_0226CE54.c index 9b59230e11..2b69ae6d96 100644 --- a/src/overlay070/ov70_0226CE54.c +++ b/src/overlay070/ov70_0226CE54.c @@ -1,21 +1,21 @@ +#include "overlay070/ov70_0226CE54.h" + #include #include +#include "overlay063/struct_ov63_0222CC3C.h" +#include "overlay066/ov66_0222DDF0.h" #include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "overlay070/ov70_0225C858.h" +#include "overlay070/ov70_0225D9A4.h" +#include "overlay070/ov70_02261E10.h" #include "overlay070/struct_ov70_0225C894_decl.h" #include "overlay070/struct_ov70_0225DEE8_decl.h" #include "overlay070/struct_ov70_02261E10_decl.h" -#include "overlay063/struct_ov63_0222CC3C.h" - -#include "unk_02005474.h" #include "heap.h" +#include "unk_02005474.h" #include "unk_0201D15C.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay070/ov70_0225C858.h" -#include "overlay070/ov70_0225D9A4.h" -#include "overlay070/ov70_02261E10.h" -#include "overlay070/ov70_0226CE54.h" typedef struct { u16 unk_00; @@ -32,10 +32,10 @@ typedef struct { } UnkStruct_ov70_0226D2A0; typedef struct UnkStruct_ov70_0226CF38_t { - UnkStruct_ov70_0225DEE8 * unk_00; - UnkStruct_ov66_0222DFF8 * unk_04; - UnkStruct_ov70_02261E10 * unk_08; - UnkStruct_ov70_0225C894 * unk_0C; + UnkStruct_ov70_0225DEE8 *unk_00; + UnkStruct_ov66_0222DFF8 *unk_04; + UnkStruct_ov70_02261E10 *unk_08; + UnkStruct_ov70_0225C894 *unk_0C; u8 unk_10[9][3]; u8 unk_2B; UnkStruct_ov70_0226D2A0 unk_2C[9]; @@ -55,32 +55,34 @@ typedef struct { u16 unk_0A; } UnkStruct_ov70_0226E774; -static void ov70_0226D020(UnkStruct_ov70_0226CF38 * param0, u32 param1); -static void ov70_0226D46C(UnkStruct_ov70_0226CF38 * param0, u32 param1); -static void ov70_0226D0E8(UnkStruct_ov70_0226CF38 * param0, u32 param1, BOOL param2, BOOL param3, u32 param4); +static void ov70_0226D020(UnkStruct_ov70_0226CF38 *param0, u32 param1); +static void ov70_0226D46C(UnkStruct_ov70_0226CF38 *param0, u32 param1); +static void ov70_0226D0E8(UnkStruct_ov70_0226CF38 *param0, u32 param1, BOOL param2, BOOL param3, u32 param4); static void ov70_0226D24C(BOOL param0, BOOL param1, BOOL param2, u32 param3); static void ov70_0226D27C(BOOL param0, BOOL param1, BOOL param2, u32 param3); -static BOOL ov70_0226D2A0(UnkStruct_ov70_0226D2A0 * param0, u32 param1, UnkStruct_ov70_02261E10 * param2, u32 param3); -static BOOL ov70_0226D2D8(UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_02261E10 * param1, u32 param2); -static void ov70_0226D31C(UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_02261E10 * param1, u32 param2); -static void ov70_0226D33C(UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_02261E10 * param1, u32 param2); -static BOOL ov70_0226D35C(UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_02261E10 * param1, u32 param2); +static BOOL ov70_0226D2A0(UnkStruct_ov70_0226D2A0 *param0, u32 param1, UnkStruct_ov70_02261E10 *param2, u32 param3); +static BOOL ov70_0226D2D8(UnkStruct_ov70_0226D2A0 *param0, UnkStruct_ov70_02261E10 *param1, u32 param2); +static void ov70_0226D31C(UnkStruct_ov70_0226D2A0 *param0, UnkStruct_ov70_02261E10 *param1, u32 param2); +static void ov70_0226D33C(UnkStruct_ov70_0226D2A0 *param0, UnkStruct_ov70_02261E10 *param1, u32 param2); +static BOOL ov70_0226D35C(UnkStruct_ov70_0226D2A0 *param0, UnkStruct_ov70_02261E10 *param1, u32 param2); static const UnkStruct_ov70_0226E774 Unk_ov70_0226E774[5] = { - {0xFF, 0x6, 0xFFFE, 0x5B4, 0x5B7, 0x5AE}, - {0x189, 0x82, 0x5B4, 0x5B6, 0x5B8, 0x5B4}, - {0x19, 0x1CE, 0xFFFE, 0x5B4, 0xFFFE, 0x5B9}, - {0x1, 0x1C7, 0x5BA, 0x5B5, 0x5AE, 0x5B4}, - {0x97, 0x97, 0xFFFE, 0x5B4, 0x5BB, 0x5B4} + { 0xFF, 0x6, 0xFFFE, 0x5B4, 0x5B7, 0x5AE }, + { 0x189, 0x82, 0x5B4, 0x5B6, 0x5B8, 0x5B4 }, + { 0x19, 0x1CE, 0xFFFE, 0x5B4, 0xFFFE, 0x5B9 }, + { 0x1, 0x1C7, 0x5BA, 0x5B5, 0x5AE, 0x5B4 }, + { 0x97, 0x97, 0xFFFE, 0x5B4, 0x5BB, 0x5B4 } }; -UnkStruct_ov70_0226CF38 * ov70_0226CE54 (UnkStruct_ov70_0225DEE8 * param0, u32 param1) +UnkStruct_ov70_0226CF38 *ov70_0226CE54(UnkStruct_ov70_0225DEE8 *param0, u32 param1) { - UnkStruct_ov70_0226CF38 * v0; + UnkStruct_ov70_0226CF38 *v0; int v1; u16 v2, v3; static const u8 v4[3] = { - 63, 62, 61, + 63, + 62, + 61, }; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov70_0226CF38)); @@ -113,12 +115,12 @@ UnkStruct_ov70_0226CF38 * ov70_0226CE54 (UnkStruct_ov70_0225DEE8 * param0, u32 p return v0; } -void ov70_0226CF38 (UnkStruct_ov70_0226CF38 * param0) +void ov70_0226CF38(UnkStruct_ov70_0226CF38 *param0) { Heap_FreeToHeap(param0); } -void ov70_0226CF40 (UnkStruct_ov70_0226CF38 * param0) +void ov70_0226CF40(UnkStruct_ov70_0226CF38 *param0) { int v0; BOOL v1; @@ -170,14 +172,14 @@ void ov70_0226CF40 (UnkStruct_ov70_0226CF38 * param0) } } -BOOL ov70_0226CFFC (const UnkStruct_ov70_0226CF38 * param0, u32 param1, int param2) +BOOL ov70_0226CFFC(const UnkStruct_ov70_0226CF38 *param0, u32 param1, int param2) { GF_ASSERT(param1 < 9); GF_ASSERT(param2 < 3); return param0->unk_10[param1][param2]; } -static void ov70_0226D020 (UnkStruct_ov70_0226CF38 * param0, u32 param1) +static void ov70_0226D020(UnkStruct_ov70_0226CF38 *param0, u32 param1) { s32 v0; s32 v1; @@ -194,7 +196,7 @@ static void ov70_0226D020 (UnkStruct_ov70_0226CF38 * param0, u32 param1) ov70_022622B0(param0->unk_08, param1, v2); } -static void ov70_0226D0E8 (UnkStruct_ov70_0226CF38 * param0, u32 param1, BOOL param2, BOOL param3, u32 param4) +static void ov70_0226D0E8(UnkStruct_ov70_0226CF38 *param0, u32 param1, BOOL param2, BOOL param3, u32 param4) { int v0; BOOL v1; @@ -239,8 +241,7 @@ static void ov70_0226D0E8 (UnkStruct_ov70_0226CF38 * param0, u32 param1, BOOL pa ov66_0222EBF4(param0->unk_04, (param1 * 3) + v0); } break; - case 1: - { + case 1: { u32 v6; if ((param1 % 3) == 2) { @@ -255,8 +256,7 @@ static void ov70_0226D0E8 (UnkStruct_ov70_0226CF38 * param0, u32 param1, BOOL pa ov66_0222EBF4(param0->unk_04, (param1 * 3) + v0); ov70_0226D24C(param2, param3, v5, 1455); } - } - break; + } break; case 2: v2 = ov70_0226239C(param0->unk_08, param1); @@ -275,7 +275,7 @@ static void ov70_0226D0E8 (UnkStruct_ov70_0226CF38 * param0, u32 param1, BOOL pa } } -static void ov70_0226D24C (BOOL param0, BOOL param1, BOOL param2, u32 param3) +static void ov70_0226D24C(BOOL param0, BOOL param1, BOOL param2, u32 param3) { if (param0) { if (param1) { @@ -290,7 +290,7 @@ static void ov70_0226D24C (BOOL param0, BOOL param1, BOOL param2, u32 param3) } } -static void ov70_0226D27C (BOOL param0, BOOL param1, BOOL param2, u32 param3) +static void ov70_0226D27C(BOOL param0, BOOL param1, BOOL param2, u32 param3) { if (param0) { if (param1) { @@ -301,9 +301,9 @@ static void ov70_0226D27C (BOOL param0, BOOL param1, BOOL param2, u32 param3) } } -static BOOL ov70_0226D2A0 (UnkStruct_ov70_0226D2A0 * param0, u32 param1, UnkStruct_ov70_02261E10 * param2, u32 param3) +static BOOL ov70_0226D2A0(UnkStruct_ov70_0226D2A0 *param0, u32 param1, UnkStruct_ov70_02261E10 *param2, u32 param3) { - static void(*const v0[])(UnkStruct_ov70_0226D2A0 *, UnkStruct_ov70_02261E10 *, u32) = { + static void (*const v0[])(UnkStruct_ov70_0226D2A0 *, UnkStruct_ov70_02261E10 *, u32) = { ov70_0226D31C, ov70_0226D33C }; @@ -320,11 +320,11 @@ static BOOL ov70_0226D2A0 (UnkStruct_ov70_0226D2A0 * param0, u32 param1, UnkStru return 1; } -static BOOL ov70_0226D2D8 (UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_02261E10 * param1, u32 param2) +static BOOL ov70_0226D2D8(UnkStruct_ov70_0226D2A0 *param0, UnkStruct_ov70_02261E10 *param1, u32 param2) { BOOL v0; - static BOOL(*const v1[])(UnkStruct_ov70_0226D2A0 *, UnkStruct_ov70_02261E10 *, u32) = { + static BOOL (*const v1[])(UnkStruct_ov70_0226D2A0 *, UnkStruct_ov70_02261E10 *, u32) = { ov70_0226D35C, ov70_0226D35C }; @@ -342,7 +342,7 @@ static BOOL ov70_0226D2D8 (UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_0226 return 0; } -static void ov70_0226D31C (UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_02261E10 * param1, u32 param2) +static void ov70_0226D31C(UnkStruct_ov70_0226D2A0 *param0, UnkStruct_ov70_02261E10 *param1, u32 param2) { param0->unk_04.val1.unk_00 = 0; param0->unk_04.val1.unk_02 = 8; @@ -351,7 +351,7 @@ static void ov70_0226D31C (UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_0226 param0->unk_04.val1.unk_08 = 4; } -static void ov70_0226D33C (UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_02261E10 * param1, u32 param2) +static void ov70_0226D33C(UnkStruct_ov70_0226D2A0 *param0, UnkStruct_ov70_02261E10 *param1, u32 param2) { param0->unk_04.val1.unk_00 = 0; param0->unk_04.val1.unk_02 = 16; @@ -360,9 +360,9 @@ static void ov70_0226D33C (UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_0226 param0->unk_04.val1.unk_08 = 2; } -static BOOL ov70_0226D35C (UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_02261E10 * param1, u32 param2) +static BOOL ov70_0226D35C(UnkStruct_ov70_0226D2A0 *param0, UnkStruct_ov70_02261E10 *param1, u32 param2) { - VecFx32 v0 = {0}; + VecFx32 v0 = { 0 }; u16 v1; u16 v2; BOOL v3 = 0; @@ -390,7 +390,7 @@ static BOOL ov70_0226D35C (UnkStruct_ov70_0226D2A0 * param0, UnkStruct_ov70_0226 return v3; } -static void ov70_0226D46C (UnkStruct_ov70_0226CF38 * param0, u32 param1) +static void ov70_0226D46C(UnkStruct_ov70_0226CF38 *param0, u32 param1) { int v0, v1; u32 v2; diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c index 334cb5de4d..b47ca1b3e6 100644 --- a/src/overlay071/ov71_0223B140.c +++ b/src/overlay071/ov71_0223B140.c @@ -1,77 +1,76 @@ +#include "overlay071/ov71_0223B140.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay071/ov71_0223C69C.h" +#include "overlay071/ov71_0223CF0C.h" +#include "overlay071/ov71_0223D324.h" #include "overlay071/struct_ov71_0223B620.h" #include "overlay071/struct_ov71_0223C444.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "touch_screen.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200A784.h" -#include "message.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_020393C8.h" -#include "overlay071/ov71_0223B140.h" -#include "overlay071/ov71_0223C69C.h" -#include "overlay071/ov71_0223CF0C.h" -#include "overlay071/ov71_0223D324.h" typedef struct { - const TouchScreenRect * unk_00[2]; + const TouchScreenRect *unk_00[2]; } UnkStruct_ov71_0223D4D0; -static void ov71_0223B620(UnkStruct_ov71_0223B620 * param0); -static void ov71_0223B668(UnkStruct_ov71_0223B620 * param0); +static void ov71_0223B620(UnkStruct_ov71_0223B620 *param0); +static void ov71_0223B668(UnkStruct_ov71_0223B620 *param0); static void ov71_0223B688(void); -static void ov71_0223B858(BGL * param0); -static void ov71_0223B968(UnkStruct_ov71_0223B620 * param0, NARC * param1); -static void ov71_0223BBDC(BGL * param0); -static BOOL ov71_0223BC20(UnkStruct_ov71_0223B620 * param0); -static BOOL ov71_0223BDF8(UnkStruct_ov71_0223B620 * param0); -static BOOL ov71_0223C334(UnkStruct_ov71_0223B620 * param0, const u8 * param1); -static int ov71_0223BEF8(UnkStruct_ov71_0223B620 * param0); -static void ov71_0223BFBC(UnkStruct_ov71_0223B620 * param0); -static void ov71_0223B6A8(const u8 param0, const u8 param1, NARC * param2); -static void ov71_0223B768(const u8 param0, NARC * param1); -static void ov71_0223B820(const u8 param0, NARC * param1); -static void ov71_0223C0D8(UnkStruct_ov71_0223B620 * param0, const u8 param1); -static void ov71_0223C128(UnkStruct_ov71_0223B620 * param0, const u8 param1); -static void ov71_0223C18C(void * param0); -static void ov71_0223C390(UnkStruct_ov71_0223B620 * param0); -static void ov71_0223C3E8(UnkStruct_ov71_0223B620 * param0); -static void ov71_0223C1AC(UnkStruct_ov71_0223B620 * param0, const u8 param1); +static void ov71_0223B858(BGL *param0); +static void ov71_0223B968(UnkStruct_ov71_0223B620 *param0, NARC *param1); +static void ov71_0223BBDC(BGL *param0); +static BOOL ov71_0223BC20(UnkStruct_ov71_0223B620 *param0); +static BOOL ov71_0223BDF8(UnkStruct_ov71_0223B620 *param0); +static BOOL ov71_0223C334(UnkStruct_ov71_0223B620 *param0, const u8 *param1); +static int ov71_0223BEF8(UnkStruct_ov71_0223B620 *param0); +static void ov71_0223BFBC(UnkStruct_ov71_0223B620 *param0); +static void ov71_0223B6A8(const u8 param0, const u8 param1, NARC *param2); +static void ov71_0223B768(const u8 param0, NARC *param1); +static void ov71_0223B820(const u8 param0, NARC *param1); +static void ov71_0223C0D8(UnkStruct_ov71_0223B620 *param0, const u8 param1); +static void ov71_0223C128(UnkStruct_ov71_0223B620 *param0, const u8 param1); +static void ov71_0223C18C(void *param0); +static void ov71_0223C390(UnkStruct_ov71_0223B620 *param0); +static void ov71_0223C3E8(UnkStruct_ov71_0223B620 *param0); +static void ov71_0223C1AC(UnkStruct_ov71_0223B620 *param0, const u8 param1); static void ov71_0223C288(void); -static void ov71_0223C2F4(UnkStruct_ov71_0223B620 * param0); +static void ov71_0223C2F4(UnkStruct_ov71_0223B620 *param0); static const u8 ov71_0223C40C(const int param0); -static void ov71_0223C444(UnkStruct_ov71_0223C444 * param0); -static void ov71_0223C44C(UnkStruct_ov71_0223C444 * param0); -static void ov71_0223C45C(UnkStruct_ov71_0223C444 * param0); -static void ov71_0223C4DC(const u8 * param0, u8 * param1); -static void ov71_0223C530(BGL * param0, const int param1, const u8 * param2); +static void ov71_0223C444(UnkStruct_ov71_0223C444 *param0); +static void ov71_0223C44C(UnkStruct_ov71_0223C444 *param0); +static void ov71_0223C45C(UnkStruct_ov71_0223C444 *param0); +static void ov71_0223C4DC(const u8 *param0, u8 *param1); +static void ov71_0223C530(BGL *param0, const int param1, const u8 *param2); static void ov71_0223C594(const int param0); -static void ov71_0223C5A4(UnkStruct_ov71_0223B620 * param0, const u8 param1); -static int ov71_0223C60C(BGL * param0, const TouchScreenRect *rect); -static int ov71_0223C654(BGL * param0, const TouchScreenRect *rect); +static void ov71_0223C5A4(UnkStruct_ov71_0223B620 *param0, const u8 param1); +static int ov71_0223C60C(BGL *param0, const TouchScreenRect *rect); +static int ov71_0223C654(BGL *param0, const TouchScreenRect *rect); static const u8 Unk_ov71_0223D4B0[5] = { 0x1, @@ -82,26 +81,26 @@ static const u8 Unk_ov71_0223D4B0[5] = { }; static const TouchScreenRect Unk_ov71_0223D5A4[] = { - {0x98, 0xB7, 0x78, 0x97}, - {0x28, 0x4F, 0x18, 0x3F}, - {0x28, 0x4F, 0x50, 0x77}, - {0x28, 0x4F, 0x88, 0xA7}, - {0x28, 0x4F, 0xC0, 0xE7}, - {0x60, 0x87, 0x18, 0x3F}, - {0x60, 0x87, 0x50, 0x77}, - {0x60, 0x87, 0x88, 0xA7}, - {0x60, 0x87, 0xC0, 0xE7}, - {0xFF, 0x0, 0x0, 0x0} + { 0x98, 0xB7, 0x78, 0x97 }, + { 0x28, 0x4F, 0x18, 0x3F }, + { 0x28, 0x4F, 0x50, 0x77 }, + { 0x28, 0x4F, 0x88, 0xA7 }, + { 0x28, 0x4F, 0xC0, 0xE7 }, + { 0x60, 0x87, 0x18, 0x3F }, + { 0x60, 0x87, 0x50, 0x77 }, + { 0x60, 0x87, 0x88, 0xA7 }, + { 0x60, 0x87, 0xC0, 0xE7 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov71_0223D4C0[] = { - {0x98, 0xB7, 0x78, 0x97}, - {0xFF, 0x0, 0x0, 0x0} + { 0x98, 0xB7, 0x78, 0x97 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const UnkStruct_ov71_0223D4D0 Unk_ov71_0223D4D0[] = { - {Unk_ov71_0223D4C0, Unk_ov71_0223D4C0}, - {Unk_ov71_0223D4C0, Unk_ov71_0223D5A4} + { Unk_ov71_0223D4C0, Unk_ov71_0223D4C0 }, + { Unk_ov71_0223D4C0, Unk_ov71_0223D5A4 } }; static const u8 Unk_ov71_0223D4A8[] = { @@ -118,7 +117,7 @@ static const u8 Unk_ov71_0223D4AC[] = { 0x0 }; -static const u8 * const Unk_ov71_0223D4C8[] = { +static const u8 *const Unk_ov71_0223D4C8[] = { Unk_ov71_0223D4A8, Unk_ov71_0223D4AC }; @@ -142,10 +141,10 @@ static const int Unk_ov71_0223D604[16] = { 0x3F }; -int ov71_0223B140 (OverlayManager * param0, int * param1) +int ov71_0223B140(OverlayManager *param0, int *param1) { - UnkStruct_ov71_0223B620 * v0; - NARC * v1; + UnkStruct_ov71_0223B620 *v0; + NARC *v1; SetMainCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); @@ -257,9 +256,9 @@ int ov71_0223B140 (OverlayManager * param0, int * param1) return 1; } -int ov71_0223B388 (OverlayManager * param0, int * param1) +int ov71_0223B388(OverlayManager *param0, int *param1) { - UnkStruct_ov71_0223B620 * v0 = OverlayManager_Data(param0); + UnkStruct_ov71_0223B620 *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -269,8 +268,7 @@ int ov71_0223B388 (OverlayManager * param0, int * param1) break; - case 1: - { + case 1: { int v1; v1 = ov71_0223BEF8(v0); @@ -328,8 +326,7 @@ int ov71_0223B388 (OverlayManager * param0, int * param1) } ov71_0223C5A4(v0, v0->unk_B4->unk_04_1); - } - break; + } break; case 2: if (ScreenWipe_Done()) { return 1; @@ -383,9 +380,9 @@ int ov71_0223B388 (OverlayManager * param0, int * param1) return 0; } -int ov71_0223B5B8 (OverlayManager * param0, int * param1) +int ov71_0223B5B8(OverlayManager *param0, int *param1) { - UnkStruct_ov71_0223B620 * v0 = OverlayManager_Data(param0); + UnkStruct_ov71_0223B620 *v0 = OverlayManager_Data(param0); ov71_0223C288(); ov71_0223B668(v0); @@ -406,13 +403,13 @@ int ov71_0223B5B8 (OverlayManager * param0, int * param1) return 1; } -static void ov71_0223B620 (UnkStruct_ov71_0223B620 * param0) +static void ov71_0223B620(UnkStruct_ov71_0223B620 *param0) { param0->unk_336C = Strbuf_Init(3 + 1, 25); param0->unk_3370 = Strbuf_Init(5, 25); { - MessageLoader * v0; + MessageLoader *v0; v0 = MessageLoader_Init(0, 26, 616, 25); @@ -421,13 +418,13 @@ static void ov71_0223B620 (UnkStruct_ov71_0223B620 * param0) } } -static void ov71_0223B668 (UnkStruct_ov71_0223B620 * param0) +static void ov71_0223B668(UnkStruct_ov71_0223B620 *param0) { Strbuf_Free(param0->unk_336C); Strbuf_Free(param0->unk_3370); } -static void ov71_0223B688 (void) +static void ov71_0223B688(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_64_E, @@ -445,11 +442,11 @@ static void ov71_0223B688 (void) GXLayers_SetBanks(&v0); } -static void ov71_0223B6A8 (const u8 param0, const u8 param1, NARC * param2) +static void ov71_0223B6A8(const u8 param0, const u8 param1, NARC *param2) { { - void * v0; - NNSG2dPaletteData * v1; + void *v0; + NNSG2dPaletteData *v1; if (param1) { switch (param0) { @@ -477,7 +474,7 @@ static void ov71_0223B6A8 (const u8 param0, const u8 param1, NARC * param2) } { - u16 * v2; + u16 *v2; DC_FlushRange(v1->pRawData, 2 * 16 * 16); v2 = v1->pRawData; @@ -490,10 +487,10 @@ static void ov71_0223B6A8 (const u8 param0, const u8 param1, NARC * param2) } } -static void ov71_0223B768 (const u8 param0, NARC * param1) +static void ov71_0223B768(const u8 param0, NARC *param1) { - void * v0; - NNSG2dPaletteData * v1; + void *v0; + NNSG2dPaletteData *v1; switch (param0) { case 10: @@ -524,11 +521,11 @@ static void ov71_0223B768 (const u8 param0, NARC * param1) Heap_FreeToHeap(v0); } -static void ov71_0223B820 (const u8 param0, NARC * param1) +static void ov71_0223B820(const u8 param0, NARC *param1) { - void * v0; - u8 * v1; - NNSG2dPaletteData * v2; + void *v0; + u8 *v1; + NNSG2dPaletteData *v2; v0 = sub_020071EC(param1, 48, &v2, 25); v1 = (u8 *)(v2->pRawData); @@ -539,7 +536,7 @@ static void ov71_0223B820 (const u8 param0, NARC * param1) Heap_FreeToHeap(v0); } -static void ov71_0223B858 (BGL * param0) +static void ov71_0223B858(BGL *param0) { GX_SetDispSelect(GX_DISP_SELECT_SUB_MAIN); @@ -660,11 +657,11 @@ static void ov71_0223B858 (BGL * param0) } } -static void ov71_0223B968 (UnkStruct_ov71_0223B620 * param0, NARC * param1) +static void ov71_0223B968(UnkStruct_ov71_0223B620 *param0, NARC *param1) { { - void * v0; - NNSG2dPaletteData * v1; + void *v0; + NNSG2dPaletteData *v1; v0 = sub_020071EC(param1, 0, &v1, 25); @@ -676,8 +673,8 @@ static void ov71_0223B968 (UnkStruct_ov71_0223B620 * param0, NARC * param1) ov71_0223B6A8(param0->unk_B4->unk_03, param0->unk_B4->unk_04_3, param1); { - void * v2; - NNSG2dPaletteData * v3; + void *v2; + NNSG2dPaletteData *v3; v2 = sub_020071EC(param1, 13, &v3, 25); @@ -757,7 +754,7 @@ static void ov71_0223B968 (UnkStruct_ov71_0223B620 * param0, NARC * param1) ov71_0223C4DC(param0->unk_B4->unk_68, param0->unk_B8); } -static void ov71_0223BBDC (BGL * param0) +static void ov71_0223BBDC(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_OBJ, 0); @@ -769,7 +766,7 @@ static void ov71_0223BBDC (BGL * param0) Heap_FreeToHeap(param0); } -static BOOL ov71_0223BC20 (UnkStruct_ov71_0223B620 * param0) +static BOOL ov71_0223BC20(UnkStruct_ov71_0223B620 *param0) { BOOL v0; MtxFx22 v1; @@ -790,7 +787,7 @@ static BOOL ov71_0223BC20 (UnkStruct_ov71_0223B620 * param0) param0->unk_337E++; break; case 1: - param0->unk_30C8 -= 2 << ((FX32_SHIFT - param0->unk_3348)); + param0->unk_30C8 -= 2 << (FX32_SHIFT - param0->unk_3348); if (param0->unk_30C8 <= 0) { param0->unk_30C8 = 0x24; @@ -830,7 +827,7 @@ static BOOL ov71_0223BC20 (UnkStruct_ov71_0223B620 * param0) param0->unk_3348 = 8; } - param0->unk_30C8 += 2 << ((FX32_SHIFT - param0->unk_3348)); + param0->unk_30C8 += 2 << (FX32_SHIFT - param0->unk_3348); if (param0->unk_30C8 >= (1 << FX32_SHIFT)) { param0->unk_30C8 = 1 << FX32_SHIFT; @@ -859,22 +856,22 @@ static BOOL ov71_0223BC20 (UnkStruct_ov71_0223B620 * param0) static const fx32 Unk_ov71_0223D5CC[] = { 2 << (FX32_SHIFT - 6), - 2 << (FX32_SHIFT - 6), - 2 << (FX32_SHIFT - 6), - 2 << (FX32_SHIFT - 6), - 2 << (FX32_SHIFT - 6), - 2 << (FX32_SHIFT - 5), - 2 << (FX32_SHIFT - 5), - 2 << (FX32_SHIFT - 5), - 2 << (FX32_SHIFT - 5), - 2 << (FX32_SHIFT - 5), - 2 << (FX32_SHIFT - 4), - 2 << (FX32_SHIFT - 4), - 2 << (FX32_SHIFT - 4), - 2 << (FX32_SHIFT - 4) + 2 << (FX32_SHIFT - 6), + 2 << (FX32_SHIFT - 6), + 2 << (FX32_SHIFT - 6), + 2 << (FX32_SHIFT - 6), + 2 << (FX32_SHIFT - 5), + 2 << (FX32_SHIFT - 5), + 2 << (FX32_SHIFT - 5), + 2 << (FX32_SHIFT - 5), + 2 << (FX32_SHIFT - 5), + 2 << (FX32_SHIFT - 4), + 2 << (FX32_SHIFT - 4), + 2 << (FX32_SHIFT - 4), + 2 << (FX32_SHIFT - 4) }; -static BOOL ov71_0223BDF8 (UnkStruct_ov71_0223B620 * param0) +static BOOL ov71_0223BDF8(UnkStruct_ov71_0223B620 *param0) { MtxFx22 v0; fx32 v1, v2; @@ -927,7 +924,7 @@ static BOOL ov71_0223BDF8 (UnkStruct_ov71_0223B620 * param0) return 0; } -static int ov71_0223BEF8 (UnkStruct_ov71_0223B620 * param0) +static int ov71_0223BEF8(UnkStruct_ov71_0223B620 *param0) { int v0; BOOL v1; @@ -968,7 +965,7 @@ static int ov71_0223BEF8 (UnkStruct_ov71_0223B620 * param0) return v0; } -static void ov71_0223BFBC (UnkStruct_ov71_0223B620 * param0) +static void ov71_0223BFBC(UnkStruct_ov71_0223B620 *param0) { BOOL v0; int v1; @@ -1029,9 +1026,9 @@ static void ov71_0223BFBC (UnkStruct_ov71_0223B620 * param0) param0->unk_30E0 = gCoreSys.touchY; } -static void ov71_0223C0D8 (UnkStruct_ov71_0223B620 * param0, const u8 param1) +static void ov71_0223C0D8(UnkStruct_ov71_0223B620 *param0, const u8 param1) { - u16 * v0; + u16 *v0; u16 v1; u8 v2, v3; @@ -1047,9 +1044,9 @@ static void ov71_0223C0D8 (UnkStruct_ov71_0223B620 * param0, const u8 param1) sub_02019448(param0->unk_00, 2); } -static void ov71_0223C128 (UnkStruct_ov71_0223B620 * param0, const u8 param1) +static void ov71_0223C128(UnkStruct_ov71_0223B620 *param0, const u8 param1) { - u8 * v0; + u8 *v0; u16 v1; u8 v2, v3; u8 v4, v5; @@ -1073,7 +1070,7 @@ static void ov71_0223C128 (UnkStruct_ov71_0223B620 * param0, const u8 param1) } } -static void ov71_0223C18C (void * param0) +static void ov71_0223C18C(void *param0) { sub_0201DCAC(); sub_0200A858(); @@ -1081,7 +1078,7 @@ static void ov71_0223C18C (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov71_0223C1AC (UnkStruct_ov71_0223B620 * param0, const u8 param1) +static void ov71_0223C1AC(UnkStruct_ov71_0223B620 *param0, const u8 param1) { int v0; u8 v1, v2; @@ -1120,13 +1117,13 @@ static void ov71_0223C1AC (UnkStruct_ov71_0223B620 * param0, const u8 param1) } } -static void ov71_0223C288 (void) +static void ov71_0223C288(void) { MtxFx22 v0; fx32 v1, v2; - v1 = FX_Inv((1 << FX32_SHIFT)); - v2 = FX_Inv((1 << FX32_SHIFT)); + v1 = FX_Inv(1 << FX32_SHIFT); + v2 = FX_Inv(1 << FX32_SHIFT); v0._00 = v1; v0._01 = 0; v0._10 = 0; @@ -1142,7 +1139,7 @@ static void ov71_0223C288 (void) G2_SetBG3Affine(&v0, 128, 0, 0, 0); } -static void ov71_0223C2F4 (UnkStruct_ov71_0223B620 * param0) +static void ov71_0223C2F4(UnkStruct_ov71_0223B620 *param0) { if (param0->unk_3381 == 1) { if (ov71_0223C334(param0, Unk_ov71_0223D4C8[0])) { @@ -1155,7 +1152,7 @@ static void ov71_0223C2F4 (UnkStruct_ov71_0223B620 * param0) } } -static BOOL ov71_0223C334 (UnkStruct_ov71_0223B620 * param0, const u8 * param1) +static BOOL ov71_0223C334(UnkStruct_ov71_0223B620 *param0, const u8 *param1) { u8 v0, v1; @@ -1181,7 +1178,7 @@ static BOOL ov71_0223C334 (UnkStruct_ov71_0223B620 * param0, const u8 * param1) return 0; } -static void ov71_0223C390 (UnkStruct_ov71_0223B620 * param0) +static void ov71_0223C390(UnkStruct_ov71_0223B620 *param0) { u32 v0; @@ -1196,12 +1193,12 @@ static void ov71_0223C390 (UnkStruct_ov71_0223B620 * param0) sub_02019460(param0->unk_00, 7, param0->unk_3360->rawData, v0, 0); } -static void ov71_0223C3E8 (UnkStruct_ov71_0223B620 * param0) +static void ov71_0223C3E8(UnkStruct_ov71_0223B620 *param0) { sub_02019CB8(param0->unk_00, 7, 0, 20, 6, 6, 9, 16); } -static const u8 ov71_0223C40C (const int param0) +static const u8 ov71_0223C40C(const int param0) { u8 v0; @@ -1223,13 +1220,13 @@ static const u8 ov71_0223C40C (const int param0) return v0; } -static void ov71_0223C444 (UnkStruct_ov71_0223C444 * param0) +static void ov71_0223C444(UnkStruct_ov71_0223C444 *param0) { param0->unk_02 = 0; param0->unk_03 = 0; } -static void ov71_0223C44C (UnkStruct_ov71_0223C444 * param0) +static void ov71_0223C44C(UnkStruct_ov71_0223C444 *param0) { param0->unk_00 = 0; param0->unk_01 = 0; @@ -1238,7 +1235,7 @@ static void ov71_0223C44C (UnkStruct_ov71_0223C444 * param0) param0->unk_04 = 0; } -static void ov71_0223C45C (UnkStruct_ov71_0223C444 * param0) +static void ov71_0223C45C(UnkStruct_ov71_0223C444 *param0) { int v0[2] = { 1682, 1683 @@ -1259,7 +1256,7 @@ static void ov71_0223C45C (UnkStruct_ov71_0223C444 * param0) param0->unk_03 = 0; } -static void ov71_0223C4DC (const u8 * param0, u8 * param1) +static void ov71_0223C4DC(const u8 *param0, u8 *param1) { int v0, v1; u8 v2; @@ -1274,9 +1271,9 @@ static void ov71_0223C4DC (const u8 * param0, u8 * param1) } } -static void ov71_0223C530 (BGL * param0, const int param1, const u8 * param2) +static void ov71_0223C530(BGL *param0, const int param1, const u8 *param2) { - u16 * v0; + u16 *v0; u8 v1, v2; u16 v3; @@ -1295,7 +1292,7 @@ static void ov71_0223C530 (BGL * param0, const int param1, const u8 * param2) sub_02019448(param0, param1); } -static void ov71_0223C594 (const int param0) +static void ov71_0223C594(const int param0) { if (param0 == 1) { Sound_PlayEffect(1689); @@ -1304,7 +1301,7 @@ static void ov71_0223C594 (const int param0) } } -static void ov71_0223C5A4 (UnkStruct_ov71_0223B620 * param0, const u8 param1) +static void ov71_0223C5A4(UnkStruct_ov71_0223B620 *param0, const u8 param1) { if (!param1) { return; @@ -1323,7 +1320,7 @@ static void ov71_0223C5A4 (UnkStruct_ov71_0223B620 * param0, const u8 param1) param0->unk_3382 = (param0->unk_3382 + 1) % 30; } -static int ov71_0223C60C (BGL * param0, const TouchScreenRect *rect) +static int ov71_0223C60C(BGL *param0, const TouchScreenRect *rect) { int v0 = sub_02022664(rect); @@ -1342,7 +1339,7 @@ static int ov71_0223C60C (BGL * param0, const TouchScreenRect *rect) return v0; } -static int ov71_0223C654 (BGL * param0, const TouchScreenRect *rect) +static int ov71_0223C654(BGL *param0, const TouchScreenRect *rect) { int v0 = sub_02022644(rect); diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c index ec930c7ed4..0ba6392655 100644 --- a/src/overlay071/ov71_0223CF0C.c +++ b/src/overlay071/ov71_0223CF0C.c @@ -1,3 +1,5 @@ +#include "overlay071/ov71_0223CF0C.h" + #include #include @@ -8,17 +10,16 @@ #include "overlay071/struct_ov71_0223D238.h" #include "overlay115/struct_ov115_02261520.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "heap.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "overlay071/ov71_0223CF0C.h" typedef struct { int unk_00; @@ -33,30 +34,30 @@ static const u8 Unk_ov71_0223D6C8[4] = { }; static const UnkStruct_ov71_0223D73C Unk_ov71_0223D73C[] = { - {0x18, 0x28}, - {0x50, 0x28}, - {0x88, 0x28}, - {0xC0, 0x28}, - {0x18, 0x48}, - {0x50, 0x48}, - {0x88, 0x48}, - {0xC0, 0x48} + { 0x18, 0x28 }, + { 0x50, 0x28 }, + { 0x88, 0x28 }, + { 0xC0, 0x28 }, + { 0x18, 0x48 }, + { 0x50, 0x48 }, + { 0x88, 0x48 }, + { 0xC0, 0x48 } }; static const UnkStruct_ov71_0223D73C Unk_ov71_0223D6FC[] = { - {0x18, 0x28}, - {0x50, 0x28}, - {0x88, 0x28}, - {0xC0, 0x28}, - {0x18, 0x60}, - {0x50, 0x60}, - {0x88, 0x60}, - {0xC0, 0x60} + { 0x18, 0x28 }, + { 0x50, 0x28 }, + { 0x88, 0x28 }, + { 0xC0, 0x28 }, + { 0x18, 0x60 }, + { 0x50, 0x60 }, + { 0x88, 0x60 }, + { 0xC0, 0x60 } }; static void ov71_0223D2F4(void); -void ov71_0223CF0C (UnkStruct_ov71_0223D238 * param0, NARC * param1) +void ov71_0223CF0C(UnkStruct_ov71_0223D238 *param0, NARC *param1) { int v0; @@ -101,7 +102,7 @@ void ov71_0223CF0C (UnkStruct_ov71_0223D238 * param0, NARC * param1) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1) +void ov71_0223D070(UnkStruct_ov71_0223D238 *param0, const u8 *param1) { int v0; UnkStruct_ov19_021DA864 v1; @@ -177,7 +178,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1) } } -void ov71_0223D238 (UnkStruct_ov71_0223D238 * param0) +void ov71_0223D238(UnkStruct_ov71_0223D238 *param0) { u8 v0; @@ -198,12 +199,12 @@ void ov71_0223D238 (UnkStruct_ov71_0223D238 * param0) sub_0201F8B4(); } -void ov71_0223D298 (UnkStruct_ov71_0223D238 * param0, const u8 param1, const u8 param2) +void ov71_0223D298(UnkStruct_ov71_0223D238 *param0, const u8 param1, const u8 param2) { - NNSG2dImagePaletteProxy * v0; + NNSG2dImagePaletteProxy *v0; u32 v1; u32 v2; - u8 * v3; + u8 *v3; GF_ASSERT(param1 < 8); GF_ASSERT(param2 <= 3); @@ -217,7 +218,7 @@ void ov71_0223D298 (UnkStruct_ov71_0223D238 * param0, const u8 param1, const u8 GX_LoadOBJPltt(&v3[param2 * 16 * 2], v1, 16 * 2); } -static void ov71_0223D2F4 (void) +static void ov71_0223D2F4(void) { { UnkStruct_ov22_022559F8 v0 = { diff --git a/src/overlay071/ov71_0223D324.c b/src/overlay071/ov71_0223D324.c index fbf6ab1e8b..b49ed4ef39 100644 --- a/src/overlay071/ov71_0223D324.c +++ b/src/overlay071/ov71_0223D324.c @@ -1,17 +1,18 @@ +#include "overlay071/ov71_0223D324.h" + #include #include #include "overlay071/struct_ov71_0223D324.h" #include "unk_020041CC.h" -#include "overlay071/ov71_0223D324.h" -static void ov71_0223D370(UnkStruct_ov71_0223D324 * param0); -static BOOL ov71_0223D3A0(UnkStruct_ov71_0223D324 * param0, const int param1, const u8 param2); -static BOOL ov71_0223D3D8(UnkStruct_ov71_0223D324 * param0, const int param1, const u8 param2); -static BOOL ov71_0223D410(UnkStruct_ov71_0223D324 * param0, const int param1, const u8 param2); -static void ov71_0223D454(UnkStruct_ov71_0223D324 * param0); -static void ov71_0223D42C(UnkStruct_ov71_0223D324 * param0, int param1, int param2, int param3); +static void ov71_0223D370(UnkStruct_ov71_0223D324 *param0); +static BOOL ov71_0223D3A0(UnkStruct_ov71_0223D324 *param0, const int param1, const u8 param2); +static BOOL ov71_0223D3D8(UnkStruct_ov71_0223D324 *param0, const int param1, const u8 param2); +static BOOL ov71_0223D410(UnkStruct_ov71_0223D324 *param0, const int param1, const u8 param2); +static void ov71_0223D454(UnkStruct_ov71_0223D324 *param0); +static void ov71_0223D42C(UnkStruct_ov71_0223D324 *param0, int param1, int param2, int param3); static void ov71_0223D470(int param0, const int param1, const u8 param2); static const u16 Unk_ov71_0223D77C[8] = { @@ -25,7 +26,7 @@ static const u16 Unk_ov71_0223D77C[8] = { 0x300 }; -void ov71_0223D324 (UnkStruct_ov71_0223D324 * param0) +void ov71_0223D324(UnkStruct_ov71_0223D324 *param0) { int v0, v1; @@ -37,7 +38,7 @@ void ov71_0223D324 (UnkStruct_ov71_0223D324 * param0) return; } -void ov71_0223D338 (UnkStruct_ov71_0223D324 * param0, const int param1, const u8 param2) +void ov71_0223D338(UnkStruct_ov71_0223D324 *param0, const int param1, const u8 param2) { int v0; @@ -58,13 +59,13 @@ void ov71_0223D338 (UnkStruct_ov71_0223D324 * param0, const int param1, const u8 return; } -static void ov71_0223D370 (UnkStruct_ov71_0223D324 * param0) +static void ov71_0223D370(UnkStruct_ov71_0223D324 *param0) { int v0; for (v0 = 0; v0 < 4; v0++) { if (param0->unk_00[v0][1] != 0xff) { - if (sub_02004B04((3 + param0->unk_00[v0][0])) == 0) { + if (sub_02004B04(3 + param0->unk_00[v0][0]) == 0) { param0->unk_00[v0][1] = 0xff; } } @@ -74,7 +75,7 @@ static void ov71_0223D370 (UnkStruct_ov71_0223D324 * param0) return; } -static BOOL ov71_0223D3A0 (UnkStruct_ov71_0223D324 * param0, const int param1, const u8 param2) +static BOOL ov71_0223D3A0(UnkStruct_ov71_0223D324 *param0, const int param1, const u8 param2) { int v0; @@ -89,7 +90,7 @@ static BOOL ov71_0223D3A0 (UnkStruct_ov71_0223D324 * param0, const int param1, c return 0; } -static BOOL ov71_0223D3D8 (UnkStruct_ov71_0223D324 * param0, const int param1, const u8 param2) +static BOOL ov71_0223D3D8(UnkStruct_ov71_0223D324 *param0, const int param1, const u8 param2) { int v0, v1; @@ -105,7 +106,7 @@ static BOOL ov71_0223D3D8 (UnkStruct_ov71_0223D324 * param0, const int param1, c return 0; } -static BOOL ov71_0223D410 (UnkStruct_ov71_0223D324 * param0, const int param1, const u8 param2) +static BOOL ov71_0223D410(UnkStruct_ov71_0223D324 *param0, const int param1, const u8 param2) { int v0; @@ -117,7 +118,7 @@ static BOOL ov71_0223D410 (UnkStruct_ov71_0223D324 * param0, const int param1, c return 1; } -static void ov71_0223D42C (UnkStruct_ov71_0223D324 * param0, int param1, int param2, int param3) +static void ov71_0223D42C(UnkStruct_ov71_0223D324 *param0, int param1, int param2, int param3) { int v0; @@ -132,7 +133,7 @@ static void ov71_0223D42C (UnkStruct_ov71_0223D324 * param0, int param1, int par return; } -static void ov71_0223D454 (UnkStruct_ov71_0223D324 * param0) +static void ov71_0223D454(UnkStruct_ov71_0223D324 *param0) { int v0; @@ -146,7 +147,7 @@ static void ov71_0223D454 (UnkStruct_ov71_0223D324 * param0) return; } -static void ov71_0223D470 (int param0, const int param1, const u8 param2) +static void ov71_0223D470(int param0, const int param1, const u8 param2) { int v0 = 152 * (4 - param2); diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 2bc8feb516..069eae8002 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -1,24 +1,19 @@ +#include "overlay072/ov72_0223D7A0.h" + #include #include -#include "core_sys.h" -#include "assert.h" -#include "inlines.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "savedata.h" -#include "overlay072/struct_ov72_0223DB98_decl.h" - #include "struct_defs/struct_02015958.h" -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay022/struct_ov22_022559F8.h" +#include "overlay072/struct_ov72_0223DB98_decl.h" #include "overlay072/struct_ov72_0223DB98_t.h" #include "overlay072/struct_ov72_0223E2A8.h" #include "overlay072/struct_ov72_0223E7D8.h" @@ -28,24 +23,32 @@ #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "assert.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "touch_screen.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" @@ -53,56 +56,52 @@ #include "unk_0201E3D8.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202C7FC.h" #include "unk_0202CD50.h" -#include "overlay072/ov72_0223D7A0.h" -static void inline_ov72_0223E2A4(UnkStruct_ov72_0223DB98 * param0, int param1); -static void ov72_0223DA48(void * param0); +static void inline_ov72_0223E2A4(UnkStruct_ov72_0223DB98 *param0, int param1); +static void ov72_0223DA48(void *param0); static void ov72_0223DA70(void); -static void ov72_0223DA90(BGL * param0); -static void ov72_0223DB98(UnkStruct_ov72_0223DB98 * param0); -static void ov72_0223DC34(UnkStruct_ov72_0223DB98 * param0); -static void ov72_0223DC6C(BGL * param0); -static void ov72_0223DCA8(UnkStruct_ov72_0223DB98 * param0, NARC * param1); +static void ov72_0223DA90(BGL *param0); +static void ov72_0223DB98(UnkStruct_ov72_0223DB98 *param0); +static void ov72_0223DC34(UnkStruct_ov72_0223DB98 *param0); +static void ov72_0223DC6C(BGL *param0); +static void ov72_0223DCA8(UnkStruct_ov72_0223DB98 *param0, NARC *param1); static void ov72_0223DDA8(void); -static void ov72_0223DDD8(UnkStruct_ov72_0223DB98 * param0, NARC * param1); -static void ov72_0223DF58(UnkStruct_ov72_0223DB98 * param0); -static void ov72_0223E0A0(UnkStruct_ov72_0223DB98 * param0, OverlayManager * param1); -static void ov72_0223E260(UnkStruct_ov72_0223DB98 * param0); -static void ov72_0223E2A4(UnkStruct_ov72_0223DB98 * param0); -static void ov72_0223E2A8(UnkStruct_ov72_0223DB98 * param0); -static int ov72_0223E3C0(UnkStruct_ov72_0223DB98 * param0, int param1); -static void ov72_0223E408(UnkStruct_ov72_0223DB98 * param0); -static int ov72_0223E458(UnkStruct_ov72_0223DB98 * param0, int param1); -static int ov72_0223E488(UnkStruct_ov72_0223DB98 * param0, int param1); -static int ov72_0223E590(UnkStruct_ov72_0223DB98 * param0, int param1); -static int ov72_0223E5B0(UnkStruct_ov72_0223DB98 * param0, int param1); -static void ov72_0223E660(Window * param0, const u8 * param1, int param2, int param3, int * param4, int * param5, int param6, int param7); -static void ov72_0223E7D8(UnkStruct_ov72_0223E7D8 * param0, UnkStruct_ov72_0223E80C * param1); -static void ov72_0223E80C(Window * param0, UnkStruct_ov72_0223E7D8 * param1, UnkStruct_ov72_0223E80C * param2, int param3); -static void ov72_0223E8CC(UnkStruct_ov72_0223DB98 * param0); -static void ov72_0223E8D0(u16 * param0); -static void ov72_0223E910(Window * param0, int param1, u32 param2, UnkStruct_ov72_0223DB98 * param3); -static void ov72_0223E914(UnkStruct_ov72_0223DB98 * param0); -static void ov72_0223E930(UnkStruct_ov72_0223DB98 * param0, int param1); +static void ov72_0223DDD8(UnkStruct_ov72_0223DB98 *param0, NARC *param1); +static void ov72_0223DF58(UnkStruct_ov72_0223DB98 *param0); +static void ov72_0223E0A0(UnkStruct_ov72_0223DB98 *param0, OverlayManager *param1); +static void ov72_0223E260(UnkStruct_ov72_0223DB98 *param0); +static void ov72_0223E2A4(UnkStruct_ov72_0223DB98 *param0); +static void ov72_0223E2A8(UnkStruct_ov72_0223DB98 *param0); +static int ov72_0223E3C0(UnkStruct_ov72_0223DB98 *param0, int param1); +static void ov72_0223E408(UnkStruct_ov72_0223DB98 *param0); +static int ov72_0223E458(UnkStruct_ov72_0223DB98 *param0, int param1); +static int ov72_0223E488(UnkStruct_ov72_0223DB98 *param0, int param1); +static int ov72_0223E590(UnkStruct_ov72_0223DB98 *param0, int param1); +static int ov72_0223E5B0(UnkStruct_ov72_0223DB98 *param0, int param1); +static void ov72_0223E660(Window *param0, const u8 *param1, int param2, int param3, int *param4, int *param5, int param6, int param7); +static void ov72_0223E7D8(UnkStruct_ov72_0223E7D8 *param0, UnkStruct_ov72_0223E80C *param1); +static void ov72_0223E80C(Window *param0, UnkStruct_ov72_0223E7D8 *param1, UnkStruct_ov72_0223E80C *param2, int param3); +static void ov72_0223E8CC(UnkStruct_ov72_0223DB98 *param0); +static void ov72_0223E8D0(u16 *param0); +static void ov72_0223E910(Window *param0, int param1, u32 param2, UnkStruct_ov72_0223DB98 *param3); +static void ov72_0223E914(UnkStruct_ov72_0223DB98 *param0); +static void ov72_0223E930(UnkStruct_ov72_0223DB98 *param0, int param1); static int ov72_0223E99C(int param0); -static void ov72_0223E388(GraphicElementData ** param0, int param1); -static void ov72_0223E3A8(GraphicElementData ** param0, BOOL param1); -static int ov72_0223E528(UnkStruct_ov72_0223DB98 * param0, int param1); -static void ov72_0223E430(BGL * param0, UnkStruct_02015920 * param1); -static void ov72_0223E9B4(u8 * param0, u8 * param1); -static void * ov72_0223E060(Window * param0, Strbuf *param1, int param2, u8 param3, const u32 param4); -static void ov72_0223EA18(UnkStruct_ov72_0223DB98 * param0); -static void ov72_0223EAD8(UnkStruct_ov72_0223EAD8 * param0); -static void ov72_0223E5E0(Window * param0, void * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); - -static int (* Unk_ov72_0223ED40[])(UnkStruct_ov72_0223DB98 *, int) = { +static void ov72_0223E388(GraphicElementData **param0, int param1); +static void ov72_0223E3A8(GraphicElementData **param0, BOOL param1); +static int ov72_0223E528(UnkStruct_ov72_0223DB98 *param0, int param1); +static void ov72_0223E430(BGL *param0, UnkStruct_02015920 *param1); +static void ov72_0223E9B4(u8 *param0, u8 *param1); +static void *ov72_0223E060(Window *param0, Strbuf *param1, int param2, u8 param3, const u32 param4); +static void ov72_0223EA18(UnkStruct_ov72_0223DB98 *param0); +static void ov72_0223EAD8(UnkStruct_ov72_0223EAD8 *param0); +static void ov72_0223E5E0(Window *param0, void *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); + +static int (*Unk_ov72_0223ED40[])(UnkStruct_ov72_0223DB98 *, int) = { NULL, ov72_0223E3C0, ov72_0223E458, @@ -112,10 +111,10 @@ static int (* Unk_ov72_0223ED40[])(UnkStruct_ov72_0223DB98 *, int) = { ov72_0223E528, }; -int ov72_0223D7A0 (OverlayManager * param0, int * param1) +int ov72_0223D7A0(OverlayManager *param0, int *param1) { - UnkStruct_ov72_0223DB98 * v0; - NARC * v1; + UnkStruct_ov72_0223DB98 *v0; + NARC *v1; switch (*param1) { case 0: @@ -144,7 +143,7 @@ int ov72_0223D7A0 (OverlayManager * param0, int * param1) sub_0200F174(0, 1, 1, 0x0, 16, 1, 39); { - SaveData * v2 = (SaveData *)OverlayManager_Args(param0); + SaveData *v2 = (SaveData *)OverlayManager_Args(param0); v0->unk_5BFC = (u8 *)sub_0202C840(sub_0202C834(v2)); v0->unk_08 = (UnkStruct_0202CD88 *)sub_0202CD88((SaveData *)OverlayManager_Args(param0)); @@ -179,9 +178,9 @@ int ov72_0223D7A0 (OverlayManager * param0, int * param1) return 0; } -int ov72_0223D920 (OverlayManager * param0, int * param1) +int ov72_0223D920(OverlayManager *param0, int *param1) { - UnkStruct_ov72_0223DB98 * v0 = OverlayManager_Data(param0); + UnkStruct_ov72_0223DB98 *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -209,9 +208,9 @@ int ov72_0223D920 (OverlayManager * param0, int * param1) return 0; } -int ov72_0223D984 (OverlayManager * param0, int * param1) +int ov72_0223D984(OverlayManager *param0, int *param1) { - UnkStruct_ov72_0223DB98 * v0 = OverlayManager_Data(param0); + UnkStruct_ov72_0223DB98 *v0 = OverlayManager_Data(param0); int v1; ov72_0223E9B4(v0->unk_5BFC, v0->unk_328.unk_0C); @@ -248,7 +247,7 @@ int ov72_0223D984 (OverlayManager * param0, int * param1) return 1; } -static void ov72_0223DA48 (void * param0) +static void ov72_0223DA48(void *param0) { sub_0201DCAC(); sub_0200A858(); @@ -257,7 +256,7 @@ static void ov72_0223DA48 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov72_0223DA70 (void) +static void ov72_0223DA70(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -275,7 +274,7 @@ static void ov72_0223DA70 (void) GXLayers_SetBanks(&v0); } -static void ov72_0223DA90 (BGL * param0) +static void ov72_0223DA90(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -395,7 +394,7 @@ static void ov72_0223DA90 (BGL * param0) sub_02019690(4, 32, 0, 39); } -static void ov72_0223DB98 (UnkStruct_ov72_0223DB98 * param0) +static void ov72_0223DB98(UnkStruct_ov72_0223DB98 *param0) { int v0; @@ -419,7 +418,7 @@ static void ov72_0223DB98 (UnkStruct_ov72_0223DB98 * param0) MI_CpuClearFast(¶m0->unk_5D04, sizeof(UnkStruct_ov72_0223EAD8)); } -static void ov72_0223DC34 (UnkStruct_ov72_0223DB98 * param0) +static void ov72_0223DC34(UnkStruct_ov72_0223DB98 *param0) { int v0; @@ -434,7 +433,7 @@ static void ov72_0223DC34 (UnkStruct_ov72_0223DB98 * param0) Strbuf_Free(param0->unk_2C); } -static void ov72_0223DC6C (BGL * param0) +static void ov72_0223DC6C(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -445,9 +444,9 @@ static void ov72_0223DC6C (BGL * param0) Heap_FreeToHeap(param0); } -static void ov72_0223DCA8 (UnkStruct_ov72_0223DB98 * param0, NARC * param1) +static void ov72_0223DCA8(UnkStruct_ov72_0223DB98 *param0, NARC *param1) { - BGL * v0 = param0->unk_00; + BGL *v0 = param0->unk_00; sub_02007130(param1, 0, 0, 0, 16 * 2 * 3, 39); sub_02007130(param1, 2, 4, 0, 16 * 2 * 2, 39); @@ -462,7 +461,7 @@ static void ov72_0223DCA8 (UnkStruct_ov72_0223DB98 * param0, NARC * param1) sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 39); } -static void ov72_0223DDA8 (void) +static void ov72_0223DDA8(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -477,7 +476,7 @@ static void ov72_0223DDA8 (void) sub_0201F8E4(); } -static void ov72_0223DDD8 (UnkStruct_ov72_0223DB98 * param0, NARC * param1) +static void ov72_0223DDD8(UnkStruct_ov72_0223DB98 *param0, NARC *param1) { int v0; @@ -508,10 +507,10 @@ static void ov72_0223DDD8 (UnkStruct_ov72_0223DB98 * param0, NARC * param1) } static const u16 Unk_ov72_0223EB3C[1][3] = { - {0xE0, 0xAF, 0x0} + { 0xE0, 0xAF, 0x0 } }; -static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0) +static void ov72_0223DF58(UnkStruct_ov72_0223DB98 *param0) { int v0; @@ -553,7 +552,7 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void * ov72_0223E060 (Window * param0, Strbuf *param1, int param2, u8 param3, const u32 param4) +static void *ov72_0223E060(Window *param0, Strbuf *param1, int param2, u8 param3, const u32 param4) { int v0, v1; @@ -565,7 +564,7 @@ static void * ov72_0223E060 (Window * param0, Strbuf *param1, int param2, u8 par return param0->unk_0C; } -static void ov72_0223E0A0 (UnkStruct_ov72_0223DB98 * param0, OverlayManager * param1) +static void ov72_0223E0A0(UnkStruct_ov72_0223DB98 *param0, OverlayManager *param1) { BGL_AddWindow(param0->unk_00, ¶m0->unk_338, 0, 2, 1, 27, 4, 13, 1 + (18 + 12) + 9); BGL_FillWindow(¶m0->unk_338, 0xf0f); @@ -575,7 +574,7 @@ static void ov72_0223E0A0 (UnkStruct_ov72_0223DB98 * param0, OverlayManager * pa BGL_FillWindow(¶m0->unk_348, 0x0); { - void * v0; + void *v0; int v1; v0 = ov72_0223E060(¶m0->unk_348, param0->unk_2C, 1, 2, (u32)(((0xe & 0xff) << 16) | ((7 & 0xff) << 8) | ((2 & 0xff) << 0))); @@ -611,7 +610,7 @@ static void ov72_0223E0A0 (UnkStruct_ov72_0223DB98 * param0, OverlayManager * pa } } -static void ov72_0223E260 (UnkStruct_ov72_0223DB98 * param0) +static void ov72_0223E260(UnkStruct_ov72_0223DB98 *param0) { int v0; @@ -625,7 +624,7 @@ static void ov72_0223E260 (UnkStruct_ov72_0223DB98 * param0) BGL_DeleteWindow(¶m0->unk_338); } -static void ov72_0223E2A4 (UnkStruct_ov72_0223DB98 * param0) +static void ov72_0223E2A4(UnkStruct_ov72_0223DB98 *param0) { int v0 = 0; int v1 = 0; @@ -635,24 +634,24 @@ static void ov72_0223E2A4 (UnkStruct_ov72_0223DB98 * param0) } } -static void inline_ov72_0223E2A4 (UnkStruct_ov72_0223DB98 * param0, int param1) +static void inline_ov72_0223E2A4(UnkStruct_ov72_0223DB98 *param0, int param1) { VecFx32 v0; } static const TouchScreenRect Unk_ov72_0223EB4A[] = { - {0x96, 0xBD, 0xC0, 0xFF}, - {0xFF, 0x0, 0x0, 0x0}, - {0x96, 0xBD, 0x0, 0x5F}, - {0x96, 0xBD, 0x60, 0xBF} + { 0x96, 0xBD, 0xC0, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 }, + { 0x96, 0xBD, 0x0, 0x5F }, + { 0x96, 0xBD, 0x60, 0xBF } }; static const TouchScreenRect Unk_ov72_0223EB42[] = { - {0x48, 0x88, 0x20, 0xE0}, - {0xFF, 0x0, 0x0, 0x0} + { 0x48, 0x88, 0x20, 0xE0 }, + { 0xFF, 0x0, 0x0, 0x0 } }; -static void ov72_0223E2A8 (UnkStruct_ov72_0223DB98 * param0) +static void ov72_0223E2A8(UnkStruct_ov72_0223DB98 *param0) { int v0 = -1, v1; @@ -694,7 +693,7 @@ static void ov72_0223E2A8 (UnkStruct_ov72_0223DB98 * param0) } } -static void ov72_0223E388 (GraphicElementData ** param0, int param1) +static void ov72_0223E388(GraphicElementData **param0, int param1) { int v0; @@ -707,7 +706,7 @@ static void ov72_0223E388 (GraphicElementData ** param0, int param1) } } -static void ov72_0223E3A8 (GraphicElementData ** param0, BOOL param1) +static void ov72_0223E3A8(GraphicElementData **param0, BOOL param1) { if (param1 == 1) { SpriteActor_SetSpriteAnimActive(param0[0], Unk_ov72_0223EB3C[0][2] + 1); @@ -716,7 +715,7 @@ static void ov72_0223E3A8 (GraphicElementData ** param0, BOOL param1) } } -static int ov72_0223E3C0 (UnkStruct_ov72_0223DB98 * param0, int param1) +static int ov72_0223E3C0(UnkStruct_ov72_0223DB98 *param0, int param1) { ov72_0223E2A8(param0); ov72_0223E910(param0->unk_2D8, 0, (u32)(((0xe & 0xff) << 16) | ((0xc & 0xff) << 8) | ((0xf & 0xff) << 0)), param0); @@ -727,14 +726,14 @@ static int ov72_0223E3C0 (UnkStruct_ov72_0223DB98 * param0, int param1) return param1; } -static void ov72_0223E408 (UnkStruct_ov72_0223DB98 * param0) +static void ov72_0223E408(UnkStruct_ov72_0223DB98 *param0) { ov72_0223E2A4(param0); ov72_0223E8CC(param0); ov72_0223E80C(¶m0->unk_328, param0->unk_4391, param0->unk_43E6, 0); } -static void ov72_0223E430 (BGL * param0, UnkStruct_02015920 * param1) +static void ov72_0223E430(BGL *param0, UnkStruct_02015920 *param1) { UnkStruct_02015958 v0; @@ -748,7 +747,7 @@ static void ov72_0223E430 (BGL * param0, UnkStruct_02015920 * param1) sub_02015958(param1, &v0); } -static int ov72_0223E458 (UnkStruct_ov72_0223DB98 * param0, int param1) +static int ov72_0223E458(UnkStruct_ov72_0223DB98 *param0, int param1) { if (ov72_0223E99C(param0->unk_38)) { UnkStruct_02015958 v0; @@ -762,7 +761,7 @@ static int ov72_0223E458 (UnkStruct_ov72_0223DB98 * param0, int param1) return param1; } -static int ov72_0223E488 (UnkStruct_ov72_0223DB98 * param0, int param1) +static int ov72_0223E488(UnkStruct_ov72_0223DB98 *param0, int param1) { int v0; @@ -771,7 +770,7 @@ static int ov72_0223E488 (UnkStruct_ov72_0223DB98 * param0, int param1) switch (v0) { case 1: sub_0202CFEC(param0->unk_08, 4); - sub_0202CF28(param0->unk_08, (((70 + 1)) + 43)); + sub_0202CF28(param0->unk_08, ((70 + 1) + 43)); sub_0200E084(¶m0->unk_338, 1); sub_02015A54(param0->unk_5D00); sub_0200F174(0, 0, 0, 0x0, 16, 1, 39); @@ -791,7 +790,7 @@ static int ov72_0223E488 (UnkStruct_ov72_0223DB98 * param0, int param1) return param1; } -static int ov72_0223E528 (UnkStruct_ov72_0223DB98 * param0, int param1) +static int ov72_0223E528(UnkStruct_ov72_0223DB98 *param0, int param1) { int v0 = sub_020159FC(param0->unk_5D00); @@ -814,7 +813,7 @@ static int ov72_0223E528 (UnkStruct_ov72_0223DB98 * param0, int param1) return param1; } -static int ov72_0223E590 (UnkStruct_ov72_0223DB98 * param0, int param1) +static int ov72_0223E590(UnkStruct_ov72_0223DB98 *param0, int param1) { ov72_0223E930(param0, 11); param0->unk_370 = 5; @@ -823,7 +822,7 @@ static int ov72_0223E590 (UnkStruct_ov72_0223DB98 * param0, int param1) return param1; } -static int ov72_0223E5B0 (UnkStruct_ov72_0223DB98 * param0, int param1) +static int ov72_0223E5B0(UnkStruct_ov72_0223DB98 *param0, int param1) { if (ov72_0223E99C(param0->unk_38)) { param0->unk_370 = 6; @@ -852,7 +851,7 @@ static const u8 Unk_ov72_0223EC30[2][8][16] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -870,8 +869,8 @@ static const u8 Unk_ov72_0223EC30[2][8][16] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0, + }, }, { { @@ -888,7 +887,7 @@ static const u8 Unk_ov72_0223EC30[2][8][16] = { 0x11, 0x11, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -904,12 +903,12 @@ static const u8 Unk_ov72_0223EC30[2][8][16] = { 0x22, 0x22, 0x0, - 0x0 - } - } + 0x0, + }, + }, }; -static void ov72_0223E5E0 (Window * param0, void * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) +static void ov72_0223E5E0(Window *param0, void *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) { if (param6 < 0) { int v0; @@ -944,7 +943,7 @@ static void ov72_0223E5E0 (Window * param0, void * param1, int param2, int param sub_0201ADDC(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9); } -static void ov72_0223E660 (Window * param0, const u8 * param1, int param2, int param3, int * param4, int * param5, int param6, int param7) +static void ov72_0223E660(Window *param0, const u8 *param1, int param2, int param3, int *param4, int *param5, int param6, int param7) { int v0, v1, v2, v3; int v4 = *param4; @@ -953,16 +952,21 @@ static void ov72_0223E660 (Window * param0, const u8 * param1, int param2, int p int v7 = param3; if ((param6 == 0) && (param7 == 0)) { - *param4 = param2; *param5 = param3; + *param4 = param2; + *param5 = param3; return; } - v0 = MATH_IAbs(v6 - v4); v1 = MATH_IAbs(v7 - v5); + v0 = MATH_IAbs(v6 - v4); + v1 = MATH_IAbs(v7 - v5); if (v0 > v1) { if (v4 > v6) { v3 = (v5 > v7) ? 1 : -1; - v2 = v4; v4 = v6; v6 = v2; v5 = v7; + v2 = v4; + v4 = v6; + v6 = v2; + v5 = v7; } else { v3 = (v5 < v7) ? 1 : -1; } @@ -972,7 +976,8 @@ static void ov72_0223E660 (Window * param0, const u8 * param1, int param2, int p while (++v4 <= v6) { if ((v2 -= v1) < 0) { - v2 += v0; v5 += v3; + v2 += v0; + v5 += v3; } ov72_0223E5E0(param0, (void *)param1, 0, 0, 4, 4, v4, v5, 4, 4); @@ -980,7 +985,10 @@ static void ov72_0223E660 (Window * param0, const u8 * param1, int param2, int p } else { if (v5 > v7) { v3 = (v4 > v6) ? 1 : -1; - v2 = v5; v5 = v7; v7 = v2; v4 = v6; + v2 = v5; + v5 = v7; + v7 = v2; + v4 = v6; } else { v3 = (v4 < v6) ? 1 : -1; } @@ -990,7 +998,8 @@ static void ov72_0223E660 (Window * param0, const u8 * param1, int param2, int p while (++v5 <= v7) { if ((v2 -= v0) < 0) { - v2 += v1; v4 += v3; + v2 += v1; + v4 += v3; } ov72_0223E5E0(param0, (void *)param1, 0, 0, 4, 4, v4, v5, 4, 4); @@ -1001,7 +1010,7 @@ static void ov72_0223E660 (Window * param0, const u8 * param1, int param2, int p *param5 = param3; } -static void ov72_0223E7D8 (UnkStruct_ov72_0223E7D8 * param0, UnkStruct_ov72_0223E80C * param1) +static void ov72_0223E7D8(UnkStruct_ov72_0223E7D8 *param0, UnkStruct_ov72_0223E80C *param1) { int v0; @@ -1015,7 +1024,7 @@ static void ov72_0223E7D8 (UnkStruct_ov72_0223E7D8 * param0, UnkStruct_ov72_0223 } } -static void ov72_0223E80C (Window * param0, UnkStruct_ov72_0223E7D8 * param1, UnkStruct_ov72_0223E80C * param2, int param3) +static void ov72_0223E80C(Window *param0, UnkStruct_ov72_0223E7D8 *param1, UnkStruct_ov72_0223E80C *param2, int param3) { int v0, v1, v2, v3, v4 = 0, v5, v6; @@ -1048,13 +1057,13 @@ static void ov72_0223E80C (Window * param0, UnkStruct_ov72_0223E7D8 * param1, Un } } -static void ov72_0223E8CC (UnkStruct_ov72_0223DB98 * param0) +static void ov72_0223E8CC(UnkStruct_ov72_0223DB98 *param0) { int v0; - UnkStruct_ov72_0223E7D8 * v1 = param0->unk_4391; + UnkStruct_ov72_0223E7D8 *v1 = param0->unk_4391; } -static void ov72_0223E8D0 (u16 * param0) +static void ov72_0223E8D0(u16 *param0) { fx32 v0; GXRgb v1; @@ -1073,7 +1082,7 @@ static void ov72_0223E8D0 (u16 * param0) GX_LoadOBJPltt((u16 *)&v1, 12 * 2, 2); } -static void ov72_0223E910 (Window * param0, int param1, u32 param2, UnkStruct_ov72_0223DB98 * param3) +static void ov72_0223E910(Window *param0, int param1, u32 param2, UnkStruct_ov72_0223DB98 *param3) { int v0, v1; @@ -1089,14 +1098,14 @@ static void ov72_0223E910 (Window * param0, int param1, u32 param2, UnkStruct_ov } } -static void ov72_0223E914 (UnkStruct_ov72_0223DB98 * param0) +static void ov72_0223E914(UnkStruct_ov72_0223DB98 *param0) { param0->unk_4391[0] = param0->unk_4380; } -static void ov72_0223E930 (UnkStruct_ov72_0223DB98 * param0, int param1) +static void ov72_0223E930(UnkStruct_ov72_0223DB98 *param0, int param1) { - Strbuf* v0; + Strbuf *v0; v0 = Strbuf_Init((40 * 2), 39); @@ -1109,7 +1118,7 @@ static void ov72_0223E930 (UnkStruct_ov72_0223DB98 * param0, int param1) param0->unk_38 = PrintStringSimple(¶m0->unk_338, 1, param0->unk_34, 0, 0, Options_TextFrameDelay(param0->unk_0C), NULL); } -static int ov72_0223E99C (int param0) +static int ov72_0223E99C(int param0) { if (Message_Printing(param0) == 0) { return 1; @@ -1118,7 +1127,7 @@ static int ov72_0223E99C (int param0) return 0; } -static void ov72_0223E9B4 (u8 * param0, u8 * param1) +static void ov72_0223E9B4(u8 *param0, u8 *param1) { int v0, v1, v2 = 0; @@ -1156,7 +1165,7 @@ static void ov72_0223E9B4 (u8 * param0, u8 * param1) } } -static void ov72_0223EA18 (UnkStruct_ov72_0223DB98 * param0) +static void ov72_0223EA18(UnkStruct_ov72_0223DB98 *param0) { BOOL v0; int v1; @@ -1209,7 +1218,7 @@ static void ov72_0223EA18 (UnkStruct_ov72_0223DB98 * param0) param0->unk_5D10 = gCoreSys.touchY; } -static void ov72_0223EAD8 (UnkStruct_ov72_0223EAD8 * param0) +static void ov72_0223EAD8(UnkStruct_ov72_0223EAD8 *param0) { if ((param0->unk_00 == 0) && (param0->unk_01 == 0)) { if (!Sound_IsEffectPlaying(1690)) { diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index cd819b9e07..034bbd0722 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -1,20 +1,10 @@ #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "savedata.h" - -#include "overlay057/const_ov57_021D0F80.h" -#include "constdata/const_020F2DAC.h" - #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_02015958.h" @@ -22,11 +12,26 @@ #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208737C.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay057/const_ov57_021D0F80.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "savedata.h" +#include "savedata_misc.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02000C88.h" #include "unk_0200112C.h" #include "unk_02002328.h" @@ -34,11 +39,8 @@ #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" #include "unk_02006E3C.h" #include "unk_0200A9DC.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_020131EC.h" @@ -46,45 +48,40 @@ #include "unk_0201567C.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "savedata_misc.h" -#include "game_options.h" -#include "pokemon.h" #include "unk_0208694C.h" +#include "constdata/const_020F2DAC.h" + FS_EXTERN_OVERLAY(overlay57); typedef struct { int unk_00; - SaveData * unk_04; - Options * unk_08; + SaveData *unk_04; + Options *unk_08; int unk_0C; int unk_10; - OverlayManager * unk_14; - BGL * unk_18; + OverlayManager *unk_14; + BGL *unk_18; Window unk_1C; int unk_2C; Window unk_30; - BmpList * unk_40; - ResourceMetadata * unk_44; + BmpList *unk_40; + ResourceMetadata *unk_44; int unk_48; - MessageLoader * unk_4C; + MessageLoader *unk_4C; int unk_50; int unk_54; int unk_58; - Strbuf* unk_5C; - void * unk_60; - StringTemplate * unk_64; - UnkStruct_02015920 * unk_68; - SysTask * unk_6C; - UnkStruct_0208737C * unk_70; - UnkStruct_0208737C * unk_74; + Strbuf *unk_5C; + void *unk_60; + StringTemplate *unk_64; + UnkStruct_02015920 *unk_68; + SysTask *unk_6C; + UnkStruct_0208737C *unk_70; + UnkStruct_0208737C *unk_74; int unk_78; int unk_7C; int unk_80; @@ -99,30 +96,30 @@ typedef struct { u8 unk_8F; int unk_90; int unk_94[9]; - u16 * unk_B8; - u16 * unk_BC; + u16 *unk_B8; + u16 *unk_BC; } UnkStruct_ov73_021D1058; -void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate * param1); -int ov73_021D0D80(OverlayManager * param0, int * param1); -int ov73_021D0E20(OverlayManager * param0, int * param1); -int ov73_021D0F7C(OverlayManager * param0, int * param1); -static void ov73_021D0FF0(void * param0); -static void ov73_021D1058(UnkStruct_ov73_021D1058 * param0); -static void ov73_021D1238(UnkStruct_ov73_021D1058 * param0); -static void ov73_021D12C4(UnkStruct_ov73_021D1058 * param0); -static void ov73_021D1300(UnkStruct_ov73_021D1058 * param0); -static void ov73_021D1318(UnkStruct_ov73_021D1058 * param0); -static void ov73_021D1328(UnkStruct_ov73_021D1058 * param0); -static void ov73_021D1930(UnkStruct_ov73_021D1058 * param0); -static void ov73_021D19DC(UnkStruct_ov73_021D1058 * param0); -static void ov73_021D1A20(UnkStruct_ov73_021D1058 * param0); -static void ov73_021D1B14(UnkStruct_ov73_021D1058 * param0); -static void ov73_021D1CE0(UnkStruct_ov73_021D1058 * param0); -static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 * param0); -int ov73_021D3250(OverlayManager * param0, int * param1); -int ov73_021D3280(OverlayManager * param0, int * param1); -int ov73_021D3404(OverlayManager * param0, int * param1); +void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); +int ov73_021D0D80(OverlayManager *param0, int *param1); +int ov73_021D0E20(OverlayManager *param0, int *param1); +int ov73_021D0F7C(OverlayManager *param0, int *param1); +static void ov73_021D0FF0(void *param0); +static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0); +static void ov73_021D1238(UnkStruct_ov73_021D1058 *param0); +static void ov73_021D12C4(UnkStruct_ov73_021D1058 *param0); +static void ov73_021D1300(UnkStruct_ov73_021D1058 *param0); +static void ov73_021D1318(UnkStruct_ov73_021D1058 *param0); +static void ov73_021D1328(UnkStruct_ov73_021D1058 *param0); +static void ov73_021D1930(UnkStruct_ov73_021D1058 *param0); +static void ov73_021D19DC(UnkStruct_ov73_021D1058 *param0); +static void ov73_021D1A20(UnkStruct_ov73_021D1058 *param0); +static void ov73_021D1B14(UnkStruct_ov73_021D1058 *param0); +static void ov73_021D1CE0(UnkStruct_ov73_021D1058 *param0); +static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0); +int ov73_021D3250(OverlayManager *param0, int *param1); +int ov73_021D3280(OverlayManager *param0, int *param1); +int ov73_021D3404(OverlayManager *param0, int *param1); const OverlayManagerTemplate dummy_OverlayManagerTemplate = { ov73_021D0D80, @@ -138,9 +135,9 @@ static const OverlayManagerTemplate Unk_ov72_021D3820 = { 0xffffffff }; -int ov73_021D0D80 (OverlayManager * param0, int * param1) +int ov73_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov73_021D1058 * v0; + UnkStruct_ov73_021D1058 *v0; int v1 = 82; Heap_Create(3, v1, 0x40000); @@ -167,9 +164,9 @@ int ov73_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov73_021D0E20 (OverlayManager * param0, int * param1) +int ov73_021D0E20(OverlayManager *param0, int *param1) { - UnkStruct_ov73_021D1058 * v0 = OverlayManager_Data(param0); + UnkStruct_ov73_021D1058 *v0 = OverlayManager_Data(param0); int v1 = 0; switch (*param1) { @@ -241,9 +238,9 @@ int ov73_021D0E20 (OverlayManager * param0, int * param1) return v1; } -int ov73_021D0F7C (OverlayManager * param0, int * param1) +int ov73_021D0F7C(OverlayManager *param0, int *param1) { - UnkStruct_ov73_021D1058 * v0 = OverlayManager_Data(param0); + UnkStruct_ov73_021D1058 *v0 = OverlayManager_Data(param0); int v1 = v0->unk_00; Heap_FreeToHeap(v0->unk_B8); @@ -253,7 +250,7 @@ int ov73_021D0F7C (OverlayManager * param0, int * param1) TrainerInfo_SetGender(SaveData_GetTrainerInfo(v0->unk_04), v0->unk_70->unk_04); { - MiscSaveBlock * v2 = SaveData_MiscSaveBlock(v0->unk_04); + MiscSaveBlock *v2 = SaveData_MiscSaveBlock(v0->unk_04); MiscSaveBlock_SetRivalName(v2, v0->unk_74->unk_18); } @@ -267,13 +264,13 @@ int ov73_021D0F7C (OverlayManager * param0, int * param1) return 1; } -static void ov73_021D0FF0 (void * param0) +static void ov73_021D0FF0(void *param0) { - UnkStruct_ov73_021D1058 * v0 = param0; + UnkStruct_ov73_021D1058 *v0 = param0; sub_0201C2B8(v0->unk_18); } -static BOOL ov73_021D0FFC (void) +static BOOL ov73_021D0FFC(void) { BOOL v0 = 0; u16 v1, v2; @@ -301,7 +298,7 @@ static BOOL ov73_021D0FFC (void) return v0; } -static void ov73_021D1058 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1058(UnkStruct_ov73_021D1058 *param0) { { UnkStruct_02099F80 v0 = { @@ -371,8 +368,8 @@ static void ov73_021D1058 (UnkStruct_ov73_021D1058 * param0) sub_020183C4(param0->unk_18, 3, &v2, 0); sub_02019EBC(param0->unk_18, 3); - sub_0200DD0C(param0->unk_18, 0, (0x400 - ((18 + 12))), 4, 0, param0->unk_00); - sub_0200DAA4(param0->unk_18, 0, ((0x400 - ((18 + 12))) - 9), 3, 0, param0->unk_00); + sub_0200DD0C(param0->unk_18, 0, (0x400 - (18 + 12)), 4, 0, param0->unk_00); + sub_0200DAA4(param0->unk_18, 0, ((0x400 - (18 + 12)) - 9), 3, 0, param0->unk_00); sub_02002E7C(0, 5 * (2 * 16), param0->unk_00); sub_02002E98(0, 6 * (2 * 16), param0->unk_00); } @@ -428,7 +425,7 @@ static void ov73_021D1058 (UnkStruct_ov73_021D1058 * param0) param0->unk_78 = 0; } -static void ov73_021D1238 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1238(UnkStruct_ov73_021D1058 *param0) { sub_02019120(0, 0); sub_02019120(1, 0); @@ -453,7 +450,7 @@ static void ov73_021D1238 (UnkStruct_ov73_021D1058 * param0) Heap_FreeToHeap(param0->unk_18); } -static void ov73_021D12C4 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D12C4(UnkStruct_ov73_021D1058 *param0) { param0->unk_4C = MessageLoader_Init(1, 26, 389, param0->unk_00); @@ -466,24 +463,24 @@ static void ov73_021D12C4 (UnkStruct_ov73_021D1058 * param0) param0->unk_2C = 0; } -static void ov73_021D1300 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1300(UnkStruct_ov73_021D1058 *param0) { StringTemplate_Free(param0->unk_64); sub_02015760(param0->unk_60); MessageLoader_Free(param0->unk_4C); } -static void ov73_021D1318 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1318(UnkStruct_ov73_021D1058 *param0) { param0->unk_68 = sub_02015920(param0->unk_00); } -static void ov73_021D1328 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1328(UnkStruct_ov73_021D1058 *param0) { sub_02015938(param0->unk_68); } -static BOOL ov73_021D1334 (UnkStruct_ov73_021D1058 * param0, int param1, int param2) +static BOOL ov73_021D1334(UnkStruct_ov73_021D1058 *param0, int param1, int param2) { BOOL v0 = 0; GXBlendPlaneMask v1; @@ -525,9 +522,9 @@ static BOOL ov73_021D1334 (UnkStruct_ov73_021D1058 * param0, int param1, int par param0->unk_78 = 1; if (v2 == 0) { - G2_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); \ + G2_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); } else { - G2S_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); \ + G2S_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); } sub_02019120(param1, 1); @@ -543,9 +540,9 @@ static BOOL ov73_021D1334 (UnkStruct_ov73_021D1058 * param0, int param1, int par param0->unk_80--; if (v2 == 0) { - G2_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); \ + G2_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); } else { - G2S_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); \ + G2S_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); } } else { param0->unk_78 = 3; @@ -557,9 +554,9 @@ static BOOL ov73_021D1334 (UnkStruct_ov73_021D1058 * param0, int param1, int par param0->unk_80++; if (v2 == 0) { - G2_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); \ + G2_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); } else { - G2S_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); \ + G2S_SetBlendAlpha(v1, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, param0->unk_7C, param0->unk_80); } } else { param0->unk_78 = 3; @@ -577,7 +574,7 @@ static BOOL ov73_021D1334 (UnkStruct_ov73_021D1058 * param0, int param1, int par return v0; } -static BOOL ov73_021D14B8 (UnkStruct_ov73_021D1058 * param0, int param1) +static BOOL ov73_021D14B8(UnkStruct_ov73_021D1058 *param0, int param1) { if (param0->unk_90 < param1) { param0->unk_90++; @@ -588,7 +585,7 @@ static BOOL ov73_021D14B8 (UnkStruct_ov73_021D1058 * param0, int param1) } } -static void ov73_021D14DC (UnkStruct_ov73_021D1058 * param0, int param1, int param2) +static void ov73_021D14DC(UnkStruct_ov73_021D1058 *param0, int param1, int param2) { sub_02019E2C(param0->unk_18, param1, 0, 0, 32, 24, param2); sub_02019448(param0->unk_18, param1); @@ -676,33 +673,33 @@ static const UnkStruct_ov84_02240FA8 Unk_ov72_021D390C = { }; static const UnkStruct_ov72_021D3840 Unk_ov72_021D3840[] = { - {0x22, 0x1}, - {0x23, 0x2} + { 0x22, 0x1 }, + { 0x23, 0x2 } }; static const UnkStruct_ov72_021D3840 Unk_ov72_021D38A4[] = { - {0x1F, 0x1}, - {0x20, 0x2}, - {0x21, 0x3} + { 0x1F, 0x1 }, + { 0x20, 0x2 }, + { 0x21, 0x3 } }; static const UnkStruct_ov72_021D3840 Unk_ov72_021D3954[] = { - {0x24, 0x1}, - {0x25, 0x2}, - {0x26, 0x3}, - {0x27, 0x4}, - {0x28, 0x5} + { 0x24, 0x1 }, + { 0x25, 0x2 }, + { 0x26, 0x3 }, + { 0x27, 0x4 }, + { 0x28, 0x5 } }; static const UnkStruct_ov72_021D3840 Unk_ov73_021D1648[] = { - {0x24, 0x1}, - {0x29, 0x2}, - {0x2A, 0x3}, - {0x2B, 0x4}, - {0x2C, 0x5} + { 0x24, 0x1 }, + { 0x29, 0x2 }, + { 0x2A, 0x3 }, + { 0x2B, 0x4 }, + { 0x2C, 0x5 } }; -static BOOL ov73_021D1510 (UnkStruct_ov73_021D1058 * param0, u32 param1, int param2) +static BOOL ov73_021D1510(UnkStruct_ov73_021D1058 *param0, u32 param1, int param2) { BOOL v0 = 0; @@ -710,12 +707,12 @@ static BOOL ov73_021D1510 (UnkStruct_ov73_021D1058 * param0, u32 param1, int par case 0: sub_0201A8D4(param0->unk_18, ¶m0->unk_1C, &Unk_ov72_021D37EC); BGL_WindowColor(¶m0->unk_1C, 15, 0, 0, 27 * 8, 4 * 8); - sub_0200E060(¶m0->unk_1C, 0, (0x400 - ((18 + 12))), 4); + sub_0200E060(¶m0->unk_1C, 0, (0x400 - (18 + 12)), 4); sub_02002AC8(1); sub_02002AE4(0); { - Strbuf* v1 = Strbuf_Init(0x400, param0->unk_00); + Strbuf *v1 = Strbuf_Init(0x400, param0->unk_00); param0->unk_5C = Strbuf_Init(0x400, param0->unk_00); @@ -746,19 +743,19 @@ static BOOL ov73_021D1510 (UnkStruct_ov73_021D1058 * param0, u32 param1, int par return v0; } -static void ov73_021D1634 (BmpList * param0, u32 param1, u8 param2) +static void ov73_021D1634(BmpList *param0, u32 param1, u8 param2) { if (param2 == 0) { Sound_PlayEffect(1500); } } -static BOOL ov73_021D1648 (UnkStruct_ov73_021D1058 * param0, int param1, int param2) +static BOOL ov73_021D1648(UnkStruct_ov73_021D1058 *param0, int param1, int param2) { BOOL v0 = 0; UnkStruct_ov84_02240FA8 v1; - const UnkStruct_ov61_0222C884 * v2; - const UnkStruct_ov72_021D3840 * v3; + const UnkStruct_ov61_0222C884 *v2; + const UnkStruct_ov72_021D3840 *v3; int v4, v5; switch (param0->unk_2C) { @@ -805,7 +802,7 @@ static BOOL ov73_021D1648 (UnkStruct_ov73_021D1058 * param0, int param1, int par param0->unk_40 = sub_0200112C(&v1, 0, 0, param0->unk_00); - Window_Show(v1.unk_0C, 1, ((0x400 - ((18 + 12))) - 9), 3); + Window_Show(v1.unk_0C, 1, ((0x400 - (18 + 12)) - 9), 3); sub_0201A954(¶m0->unk_30); param0->unk_2C = 1; @@ -835,7 +832,7 @@ static BOOL ov73_021D1648 (UnkStruct_ov73_021D1058 * param0, int param1, int par return v0; } -static BOOL ov73_021D1784 (UnkStruct_ov73_021D1058 * param0, u32 param1, int param2, int param3, int param4) +static BOOL ov73_021D1784(UnkStruct_ov73_021D1058 *param0, u32 param1, int param2, int param3, int param4) { BOOL v0 = 0; UnkStruct_ov61_0222C884 v1; @@ -911,7 +908,7 @@ static BOOL ov73_021D1784 (UnkStruct_ov73_021D1058 * param0, u32 param1, int par return v0; } -static void ov73_021D1930 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1930(UnkStruct_ov73_021D1058 *param0) { sub_02006E3C(125, 0, param0->unk_18, 3, 0, 0, 0, param0->unk_00); sub_02019690(0, 32, 0, param0->unk_00); @@ -943,9 +940,9 @@ static void ov73_021D1930 (UnkStruct_ov73_021D1058 * param0) sub_0201975C(4, 0x0); } -static void ov73_021D19DC (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D19DC(UnkStruct_ov73_021D1058 *param0) { - int v0[] = {4, 5, 6, 7, 8}; + int v0[] = { 4, 5, 6, 7, 8 }; if (param0->unk_88 >= 5) { return; @@ -954,20 +951,20 @@ static void ov73_021D19DC (UnkStruct_ov73_021D1058 * param0) sub_02006E60(125, v0[param0->unk_88], param0->unk_18, 3, 0, 0, 0, param0->unk_00); } -static void ov73_021D1A20 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1A20(UnkStruct_ov73_021D1058 *param0) { int v0[][2] = { - {0, 0}, - {19, 20}, - {9, 13}, - {10, 13}, - {11, 13}, - {12, 13}, - {14, 18}, - {15, 18}, - {16, 18}, - {17, 18}, - {21, 22} + { 0, 0 }, + { 19, 20 }, + { 9, 13 }, + { 10, 13 }, + { 11, 13 }, + { 12, 13 }, + { 14, 18 }, + { 15, 18 }, + { 16, 18 }, + { 17, 18 }, + { 21, 22 } }; if ((param0->unk_89 != 0) && (param0->unk_89 < 12)) { @@ -985,9 +982,9 @@ static void ov73_021D1A20 (UnkStruct_ov73_021D1058 * param0) } } -static void ov73_021D1B14 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1B14(UnkStruct_ov73_021D1058 *param0) { - int v0[] = {28, 29, 29, 30, 31}; + int v0[] = { 28, 29, 29, 30, 31 }; if (param0->unk_8B >= 5) { return; @@ -1105,12 +1102,12 @@ static const u8 Unk_ov72_021D39D4[] = { 0x63 }; -static void ov73_021D1B80 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1B80(UnkStruct_ov73_021D1058 *param0) { ArchivedSprite v0; - void * v1; - void * v2; - void * v3; + void *v1; + void *v2; + void *v3; int v4 = 2; int v5 = 5; int v6 = 8; @@ -1155,7 +1152,7 @@ static void ov73_021D1B80 (UnkStruct_ov73_021D1058 * param0) Heap_FreeToHeap(v1); } -static void ov73_021D1CE0 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1CE0(UnkStruct_ov73_021D1058 *param0) { sub_02006E60(125, 40, param0->unk_18, 6, 0, 0, 0, param0->unk_00); ov73_021D14DC(param0, 6, 9); @@ -1165,7 +1162,7 @@ static void ov73_021D1CE0 (UnkStruct_ov73_021D1058 * param0) sub_02006E3C(125, 32, param0->unk_18, 6, 0x20, 0, 0, param0->unk_00); } -static BOOL ov73_021D1D44 (UnkStruct_ov73_021D1058 * param0, int param1, int param2) +static BOOL ov73_021D1D44(UnkStruct_ov73_021D1058 *param0, int param1, int param2) { BOOL v0 = 0; GXBlendPlaneMask v1; @@ -1201,7 +1198,7 @@ static BOOL ov73_021D1D44 (UnkStruct_ov73_021D1058 * param0, int param1, int par return v0; } -static void ov73_021D1DCC (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1DCC(UnkStruct_ov73_021D1058 *param0) { param0->unk_8C = 0; param0->unk_8D = 0; @@ -1209,7 +1206,7 @@ static void ov73_021D1DCC (UnkStruct_ov73_021D1058 * param0) param0->unk_8F = 0; } -static void ov73_021D1DE8 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1DE8(UnkStruct_ov73_021D1058 *param0) { if (param0->unk_84 == 0) { if (param0->unk_8D) { @@ -1223,7 +1220,7 @@ static void ov73_021D1DE8 (UnkStruct_ov73_021D1058 * param0) G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, 6, 10); { - int v0[] = {9, 10, 11, 12}; + int v0[] = { 9, 10, 11, 12 }; sub_02006E3C(125, v0[param0->unk_8C], param0->unk_18, 1, 0, 0, 0, param0->unk_00); } } else { @@ -1238,24 +1235,24 @@ static void ov73_021D1DE8 (UnkStruct_ov73_021D1058 * param0) G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_PLANEMASK_BG3, 6, 10); { - int v1[] = {14, 15, 16, 17}; + int v1[] = { 14, 15, 16, 17 }; sub_02006E3C(125, v1[param0->unk_8E], param0->unk_18, 2, 0, 0, 0, param0->unk_00); } } } -static void ov73_021D1EFC (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1EFC(UnkStruct_ov73_021D1058 *param0) { G2_BlendNone(); } -static void ov73_021D1F08 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1F08(UnkStruct_ov73_021D1058 *param0) { param0->unk_94[0] = 0; param0->unk_94[1] = 0; } -static BOOL ov73_021D1F18 (UnkStruct_ov73_021D1058 * param0) +static BOOL ov73_021D1F18(UnkStruct_ov73_021D1058 *param0) { BOOL v0 = 0; int v1; @@ -1269,12 +1266,12 @@ static BOOL ov73_021D1F18 (UnkStruct_ov73_021D1058 * param0) if (param0->unk_84 == 0) { { - int v2[] = {9, 42, 43, 44, 45, 0xff}; + int v2[] = { 9, 42, 43, 44, 45, 0xff }; v1 = v2[param0->unk_94[0]]; } } else { { - int v3[] = {14, 46, 47, 48, 49, 0xff}; + int v3[] = { 14, 46, 47, 48, 49, 0xff }; v1 = v3[param0->unk_94[0]]; } } @@ -1288,7 +1285,7 @@ static BOOL ov73_021D1F18 (UnkStruct_ov73_021D1058 * param0) return v0; } -static void ov73_021D1FA0 (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D1FA0(UnkStruct_ov73_021D1058 *param0) { if (param0->unk_94[8] > 0) { param0->unk_94[8]--; @@ -1299,7 +1296,7 @@ static void ov73_021D1FA0 (UnkStruct_ov73_021D1058 * param0) } } -static BOOL ov73_021D200C (UnkStruct_ov73_021D1058 * param0, int * param1) +static BOOL ov73_021D200C(UnkStruct_ov73_021D1058 *param0, int *param1) { BOOL v0 = 0; @@ -1316,8 +1313,7 @@ static BOOL ov73_021D200C (UnkStruct_ov73_021D1058 * param0, int * param1) param0->unk_94[8] = (16 * 3); *param1 = 1; break; - case 1: - { + case 1: { int v1 = sub_020192EC(param0->unk_18, 2); int v2 = sub_020192F8(param0->unk_18, 5); int v3 = param0->unk_94[6] * 9 * param0->unk_94[7]; @@ -1334,8 +1330,7 @@ static BOOL ov73_021D200C (UnkStruct_ov73_021D1058 * param0, int * param1) param0->unk_94[7] = 0; *param1 = 2; } - } - break; + } break; case 2: if (param0->unk_94[7]) { param0->unk_94[7]--; @@ -1347,8 +1342,7 @@ static BOOL ov73_021D200C (UnkStruct_ov73_021D1058 * param0, int * param1) *param1 = 3; } break; - case 3: - { + case 3: { int v6 = sub_020192EC(param0->unk_18, 2); int v7 = sub_020192F8(param0->unk_18, 2); int v8 = param0->unk_94[6] * 9 * param0->unk_94[7]; @@ -1373,10 +1367,8 @@ static BOOL ov73_021D200C (UnkStruct_ov73_021D1058 * param0, int * param1) sub_02019184(param0->unk_18, 2, 3, v10); } - } - break; - case 4: - { + } break; + case 4: { int v11 = sub_020192EC(param0->unk_18, 2); int v12 = sub_020192F8(param0->unk_18, 2); int v13 = param0->unk_94[6] * 9 * param0->unk_94[7]; @@ -1395,10 +1387,8 @@ static BOOL ov73_021D200C (UnkStruct_ov73_021D1058 * param0, int * param1) sub_02019184(param0->unk_18, 2, 3, v15); param0->unk_94[5] = v15; } - } - break; - case 5: - { + } break; + case 5: { int v16 = sub_020192EC(param0->unk_18, 2); int v17 = sub_020192F8(param0->unk_18, 2); int v18 = param0->unk_94[6] * 9 * param0->unk_94[7]; @@ -1414,8 +1404,7 @@ static BOOL ov73_021D200C (UnkStruct_ov73_021D1058 * param0, int * param1) sub_02019184(param0->unk_18, 2, 3, v20); param0->unk_94[5] = v20; } - } - break; + } break; case 6: sub_02005844(427, 0); v0 = 1; @@ -1427,12 +1416,12 @@ static BOOL ov73_021D200C (UnkStruct_ov73_021D1058 * param0, int * param1) return v0; } -static void ov73_021D230C (UnkStruct_ov73_021D1058 * param0) +static void ov73_021D230C(UnkStruct_ov73_021D1058 *param0) { BGL_SetPriority(2, 1); } -static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) +static BOOL ov73_021D2318(UnkStruct_ov73_021D1058 *param0) { BOOL v0 = 0; @@ -1511,7 +1500,9 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) break; case 9: if (ScreenWipe_Done() == 1) { - {sub_02019EBC(param0->unk_18, 0);} + { + sub_02019EBC(param0->unk_18, 0); + } sub_02019120(1, 0); { param0->unk_0C = param0->unk_10; @@ -1578,9 +1569,8 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) param0->unk_0C = 21; } break; - case 21: - { - UnkStruct_02015958 v1 = {NULL, 6, 1, 12, 12, 8}; + case 21: { + UnkStruct_02015958 v1 = { NULL, 6, 1, 12, 12, 8 }; v1.unk_00 = param0->unk_18; sub_02015958(param0->unk_68, &v1); @@ -1623,13 +1613,17 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) break; case 25: if (ScreenWipe_Done() == 1) { - {sub_02019EBC(param0->unk_18, 0);} + { + sub_02019EBC(param0->unk_18, 0); + } param0->unk_0C = 28; } break; case 26: if (ov73_021D1334(param0, 6, 1) == 1) { - {sub_02019EBC(param0->unk_18, 0);} + { + sub_02019EBC(param0->unk_18, 0); + } sub_02015A54(param0->unk_68); param0->unk_88 = 1; ov73_021D19DC(param0); @@ -1712,7 +1706,9 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) break; case 40: if (ScreenWipe_Done() == 1) { - {sub_02019EBC(param0->unk_18, 0);} + { + sub_02019EBC(param0->unk_18, 0); + } sub_02019120(0, 1); param0->unk_0C = 28; } @@ -1755,7 +1751,9 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) if (ov73_021D0FFC() == 1) { param0->unk_94[0] = 0; param0->unk_94[1] = 0; - {sub_02019EBC(param0->unk_18, 0);} + { + sub_02019EBC(param0->unk_18, 0); + } param0->unk_0C = 48; } else if (gCoreSys.pressedKeys) { param0->unk_0C = 49; @@ -1766,7 +1764,7 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) param0->unk_94[1]--; } else { { - int v3[] = {33, 34, 0xffff}; + int v3[] = { 33, 34, 0xffff }; if (v3[param0->unk_94[0]] == 0xffff) { Sound_PlayEffect(1798); @@ -1839,7 +1837,9 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) break; case 58: if (ov73_021D1510(param0, 19, 1) == 1) { - {sub_02019EBC(param0->unk_18, 0);} + { + sub_02019EBC(param0->unk_18, 0); + } param0->unk_0C = 59; } break; @@ -1937,8 +1937,7 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) param0->unk_0C = 72; } break; - case 72: - { + case 72: { u32 v4; if (param0->unk_84 == 0) { @@ -1950,8 +1949,7 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) if (ov73_021D1510(param0, v4, 1) == 1) { param0->unk_0C = 73; } - } - break; + } break; case 73: if (ov73_021D1648(param0, 0, 0) == 1) { switch (param0->unk_48) { @@ -1959,15 +1957,15 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) param0->unk_0C = 75; break; case 2: - case 0xfffffffe: - {sub_02019EBC(param0->unk_18, 0);} + case 0xfffffffe: { + sub_02019EBC(param0->unk_18, 0); + } param0->unk_0C = 74; break; } } break; - case 74: - { + case 74: { int v5; if (param0->unk_84 == 0) { @@ -1979,8 +1977,7 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) if (ov73_021D1334(param0, v5, 1) == 1) { param0->unk_0C = 63; } - } - break; + } break; case 75: if (ov73_021D1510(param0, 24, 1) == 1) { param0->unk_0C = 76; @@ -2012,8 +2009,7 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) param0->unk_0C = 79; } break; - case 79: - { + case 79: { u32 v6; int v7; @@ -2026,11 +2022,12 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) if (ov73_021D1510(param0, v6, 1) == 1) { param0->unk_0C = 80; } - } - break; + } break; case 80: if (ov73_021D1648(param0, 0, 0) == 1) { - {sub_02019EBC(param0->unk_18, 0);} + { + sub_02019EBC(param0->unk_18, 0); + } switch (param0->unk_48) { case 1: @@ -2046,8 +2043,7 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) } } break; - case 81: - { + case 81: { int v8; if (param0->unk_84 == 0) { @@ -2057,10 +2053,11 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) } if (ov73_021D1334(param0, v8, 1) == 1) { - {param0->unk_0C = param0->unk_10;} + { + param0->unk_0C = param0->unk_10; + } } - } - break; + } break; case 82: param0->unk_89 = 1; param0->unk_8A = 0; @@ -2112,8 +2109,7 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) case 2: case 3: case 4: - case 5: - { + case 5: { u32 v9; if ((Unk_020E4C40 == 10) || (GAME_VERSION == 12)) { @@ -2123,7 +2119,7 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) } { - Strbuf* v10 = MessageLoader_GetNewStrbuf(param0->unk_4C, v9); + Strbuf *v10 = MessageLoader_GetNewStrbuf(param0->unk_4C, v9); Strbuf_Copy(param0->unk_74->unk_18, v10); Strbuf_Free(v10); @@ -2165,8 +2161,9 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) case 96: if (ov73_021D1648(param0, 0, 0) == 1) { switch (param0->unk_48) { - case 1: - {sub_02019EBC(param0->unk_18, 0);} + case 1: { + sub_02019EBC(param0->unk_18, 0); + } param0->unk_0C = 97; break; case 2: @@ -2206,7 +2203,9 @@ static BOOL ov73_021D2318 (UnkStruct_ov73_021D1058 * param0) break; case 102: if (ov73_021D1334(param0, 1, 1) == 1) { - {sub_02019EBC(param0->unk_18, 0);} + { + sub_02019EBC(param0->unk_18, 0); + } param0->unk_0C = 103; } break; diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c index 506ccf95dc..bdd799efda 100644 --- a/src/overlay074/ov74_021D0D80.c +++ b/src/overlay074/ov74_021D0D80.c @@ -1,52 +1,50 @@ +#include "overlay074/ov74_021D0D80.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0203D8EC.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" -#include "message.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_020393C8.h" -#include "overlay074/ov74_021D0D80.h" #define WINCLR_COL(col) (((col) << 4) | (col)) typedef struct UnkStruct_ov74_021D1720_t { u16 unk_00; u16 unk_02; - Strbuf* unk_04[20]; + Strbuf *unk_04[20]; } UnkStruct_ov74_021D1720; typedef struct UnkStruct_ov74_021D0D80_t { @@ -59,49 +57,49 @@ typedef struct UnkStruct_ov74_021D0D80_t { u32 unk_10_5 : 16; u32 unk_10_21 : 1; u32 unk_10_22 : 10; - BGL * unk_14; + BGL *unk_14; UnkStruct_0203D8EC unk_18; - Options * unk_1C; - MessageLoader * unk_20; - void * unk_24; - NNSG2dScreenData * unk_28; + Options *unk_1C; + MessageLoader *unk_20; + void *unk_24; + NNSG2dScreenData *unk_28; Window unk_2C[3]; UnkStruct_ov74_021D1720 unk_5C[7]; - UIControlData * unk_2A8; + UIControlData *unk_2A8; u32 unk_2AC; - SpriteRenderer * unk_2B0; - SpriteGfxHandler * unk_2B4; - CellActorData * unk_2B8; + SpriteRenderer *unk_2B0; + SpriteGfxHandler *unk_2B4; + CellActorData *unk_2B8; } UnkStruct_ov74_021D0D80; -int ov74_021D0D80(OverlayManager * param0, int * param1); -int ov74_021D0F60(OverlayManager * param0, int * param1); -int ov74_021D0E58(OverlayManager * param0, int * param1); -static void ov74_021D1118(void * param0); +int ov74_021D0D80(OverlayManager *param0, int *param1); +int ov74_021D0F60(OverlayManager *param0, int *param1); +int ov74_021D0E58(OverlayManager *param0, int *param1); +static void ov74_021D1118(void *param0); static void ov74_021D10F8(void); -static int ov74_021D1178(UnkStruct_ov74_021D0D80 * param0); -static int ov74_021D122C(UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D12D4(UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D135C(UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D1390(UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D14E8(UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D14F4(UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D1624(UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D1668(UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D17CC(UnkStruct_ov74_021D0D80 * param0, u16 param1); -static void ov74_021D1BE4(UnkStruct_ov74_021D0D80 * param0, u16 param1, BOOL param2); -static void ov74_021D1968(UnkStruct_ov74_021D0D80 * param0, u16 param1, BOOL param2); -static BOOL ov74_021D1A08(const UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D1720(UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D1A24(UnkStruct_ov74_021D0D80 * param0); -static BOOL ov74_021D1B44(UnkStruct_ov74_021D0D80 * param0); -static void ov74_021D1BA8(UnkStruct_ov74_021D0D80 * param0); -static u32 ov74_021D1BD0(UnkStruct_ov74_021D0D80 * param0); - -int ov74_021D0D80 (OverlayManager * param0, int * param1) +static int ov74_021D1178(UnkStruct_ov74_021D0D80 *param0); +static int ov74_021D122C(UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D12D4(UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D135C(UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D1390(UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D14E8(UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D14F4(UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D1624(UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D1668(UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D17CC(UnkStruct_ov74_021D0D80 *param0, u16 param1); +static void ov74_021D1BE4(UnkStruct_ov74_021D0D80 *param0, u16 param1, BOOL param2); +static void ov74_021D1968(UnkStruct_ov74_021D0D80 *param0, u16 param1, BOOL param2); +static BOOL ov74_021D1A08(const UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D1720(UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D1A24(UnkStruct_ov74_021D0D80 *param0); +static BOOL ov74_021D1B44(UnkStruct_ov74_021D0D80 *param0); +static void ov74_021D1BA8(UnkStruct_ov74_021D0D80 *param0); +static u32 ov74_021D1BD0(UnkStruct_ov74_021D0D80 *param0); + +int ov74_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov74_021D0D80 * v0 = NULL; - Options * v1; + UnkStruct_ov74_021D0D80 *v0 = NULL; + Options *v1; v1 = (Options *)OverlayManager_Args(param0); @@ -124,9 +122,9 @@ int ov74_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov74_021D0E58 (OverlayManager * param0, int * param1) +int ov74_021D0E58(OverlayManager *param0, int *param1) { - UnkStruct_ov74_021D0D80 * v0 = OverlayManager_Data(param0); + UnkStruct_ov74_021D0D80 *v0 = OverlayManager_Data(param0); if (v0->unk_10_0 == 1) { v0->unk_18.unk_00_0 = v0->unk_5C[0].unk_02; @@ -152,9 +150,9 @@ int ov74_021D0E58 (OverlayManager * param0, int * param1) return 1; } -int ov74_021D0F60 (OverlayManager * param0, int * param1) +int ov74_021D0F60(OverlayManager *param0, int *param1) { - UnkStruct_ov74_021D0D80 * v0 = OverlayManager_Data(param0); + UnkStruct_ov74_021D0D80 *v0 = OverlayManager_Data(param0); BOOL v1; u32 v2; @@ -240,7 +238,7 @@ int ov74_021D0F60 (OverlayManager * param0, int * param1) return 0; } -static void ov74_021D10F8 (void) +static void ov74_021D10F8(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, GX_VRAM_BGEXTPLTT_NONE, GX_VRAM_SUB_BG_128_C, GX_VRAM_SUB_BGEXTPLTT_NONE, GX_VRAM_OBJ_16_G, GX_VRAM_OBJEXTPLTT_NONE, GX_VRAM_SUB_OBJ_16_I, GX_VRAM_SUB_OBJEXTPLTT_NONE, GX_VRAM_TEX_NONE, GX_VRAM_TEXPLTT_NONE @@ -249,9 +247,9 @@ static void ov74_021D10F8 (void) GXLayers_SetBanks(&v0); } -static void ov74_021D1118 (void * param0) +static void ov74_021D1118(void *param0) { - UnkStruct_ov74_021D0D80 * v0 = param0; + UnkStruct_ov74_021D0D80 *v0 = param0; if (v0->unk_10_21) { sub_0200DD0C(v0->unk_14, 1, ((((10 + 12 * 2) + 30 * 14) + 27 * 4) + 9), 15, v0->unk_5C[5].unk_02, v0->unk_00); @@ -264,7 +262,7 @@ static void ov74_021D1118 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static int ov74_021D1178 (UnkStruct_ov74_021D0D80 * param0) +static int ov74_021D1178(UnkStruct_ov74_021D0D80 *param0) { switch (param0->unk_08) { case 0: @@ -301,7 +299,7 @@ static int ov74_021D1178 (UnkStruct_ov74_021D0D80 * param0) return 0; } -static int ov74_021D122C (UnkStruct_ov74_021D0D80 * param0) +static int ov74_021D122C(UnkStruct_ov74_021D0D80 *param0) { int v0 = 0, v1 = 0; @@ -336,7 +334,7 @@ static int ov74_021D122C (UnkStruct_ov74_021D0D80 * param0) return 0; } -static void ov74_021D12D4 (UnkStruct_ov74_021D0D80 * param0) +static void ov74_021D12D4(UnkStruct_ov74_021D0D80 *param0) { int v0; @@ -347,7 +345,7 @@ static void ov74_021D12D4 (UnkStruct_ov74_021D0D80 * param0) GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, - GX_BG0_AS_2D + GX_BG0_AS_2D, }; sub_02018368(&v1); @@ -368,7 +366,7 @@ static void ov74_021D12D4 (UnkStruct_ov74_021D0D80 * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -383,7 +381,7 @@ static void ov74_021D12D4 (UnkStruct_ov74_021D0D80 * param0) 2, 0, 0, - 0 + 0, }, { 0, @@ -398,7 +396,7 @@ static void ov74_021D12D4 (UnkStruct_ov74_021D0D80 * param0) 3, 0, 0, - 0 + 0, }, { 0, @@ -413,7 +411,7 @@ static void ov74_021D12D4 (UnkStruct_ov74_021D0D80 * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -428,7 +426,7 @@ static void ov74_021D12D4 (UnkStruct_ov74_021D0D80 * param0) 0, 0, 0, - 0 + 0, }, }; @@ -445,7 +443,7 @@ static void ov74_021D12D4 (UnkStruct_ov74_021D0D80 * param0) sub_02019690(4, 32, 0, param0->unk_00); } -static void ov74_021D135C (UnkStruct_ov74_021D0D80 * param0) +static void ov74_021D135C(UnkStruct_ov74_021D0D80 *param0) { sub_02019044(param0->unk_14, 4); sub_02019044(param0->unk_14, 3); @@ -455,14 +453,14 @@ static void ov74_021D135C (UnkStruct_ov74_021D0D80 * param0) Heap_FreeToHeap(param0->unk_14); } -static void ov74_021D1390 (UnkStruct_ov74_021D0D80 * param0) +static void ov74_021D1390(UnkStruct_ov74_021D0D80 *param0) { - void * v0; + void *v0; u32 v1; - NARC * v2; - void * v3; - NNSG2dCharacterData * v4; - NNSG2dPaletteData * v5; + NARC *v2; + void *v3; + NNSG2dCharacterData *v4; + NNSG2dPaletteData *v5; v2 = NARC_ctor(NARC_INDEX_GRAPHIC__CONFIG_GRA, param0->unk_00); v1 = NARC_GetMemberSize(v2, 1); @@ -498,12 +496,12 @@ static void ov74_021D1390 (UnkStruct_ov74_021D0D80 * param0) sub_0201C3C0(param0->unk_14, 4); } -static void ov74_021D14E8 (UnkStruct_ov74_021D0D80 * param0) +static void ov74_021D14E8(UnkStruct_ov74_021D0D80 *param0) { Heap_FreeToHeap(param0->unk_24); } -static void ov74_021D14F4 (UnkStruct_ov74_021D0D80 * param0) +static void ov74_021D14F4(UnkStruct_ov74_021D0D80 *param0) { BGL_AddWindow(param0->unk_14, ¶m0->unk_2C[0], 1, 1, 0, 12, 2, 13, 10); BGL_AddWindow(param0->unk_14, ¶m0->unk_2C[1], 1, 1, 3, 30, 14, 13, (10 + 12 * 2)); @@ -527,7 +525,7 @@ static void ov74_021D14F4 (UnkStruct_ov74_021D0D80 * param0) sub_0200E060(¶m0->unk_2C[2], 1, ((((10 + 12 * 2) + 30 * 14) + 27 * 4) + 9), 15); } -static void ov74_021D1624 (UnkStruct_ov74_021D0D80 * param0) +static void ov74_021D1624(UnkStruct_ov74_021D0D80 *param0) { u16 v0; @@ -542,20 +540,26 @@ static void ov74_021D1624 (UnkStruct_ov74_021D0D80 * param0) } } -static void ov74_021D1668 (UnkStruct_ov74_021D0D80 * param0) +static void ov74_021D1668(UnkStruct_ov74_021D0D80 *param0) { u32 v0, v1; u16 v2; u32 v3, v4, v5; - Strbuf* v6; - Strbuf* v7; + Strbuf *v6; + Strbuf *v7; static const u8 v8[7] = { - 3, 6, 4, 5, 7, 8, 42, + 3, + 6, + 4, + 5, + 7, + 8, + 42, }; - v5 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0))); - v3 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0))); - v4 = (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((15 & 0xff) << 0))); + v5 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)); + v3 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)); + v4 = (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((15 & 0xff) << 0)); v6 = Strbuf_Init(256, param0->unk_00); MessageLoader_GetStrbuf(param0->unk_20, 0, v6); @@ -583,14 +587,20 @@ static void ov74_021D1668 (UnkStruct_ov74_021D0D80 * param0) Strbuf_Free(v6); } -static void ov74_021D1720 (UnkStruct_ov74_021D0D80 * param0) +static void ov74_021D1720(UnkStruct_ov74_021D0D80 *param0) { u16 v0, v1; static const int v3[7] = { 3, 2, 2, 2, 3, 20, 0 }; static const u8 v2[7] = { - 10, 17, 13, 15, 19, 22, 0, + 10, + 17, + 13, + 15, + 19, + 22, + 0, }; for (v0 = 0; v0 < 7; v0++) { @@ -609,16 +619,16 @@ static void ov74_021D1720 (UnkStruct_ov74_021D0D80 * param0) param0->unk_5C[5].unk_02 = param0->unk_18.unk_00_10; } -static void ov74_021D17CC (UnkStruct_ov74_021D0D80 * param0, u16 param1) +static void ov74_021D17CC(UnkStruct_ov74_021D0D80 *param0, u16 param1) { u32 v0, v1, v2; u16 v3; u8 v4; s8 v5 = 0; - static const s8 v6[] = {0, 0, 0, 0, 0, 0, 0}; + static const s8 v6[] = { 0, 0, 0, 0, 0, 0, 0 }; - v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0))); - v1 = (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((15 & 0xff) << 0))); + v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)); + v1 = (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((15 & 0xff) << 0)); BGL_WindowColor(&(param0->unk_2C[1]), WINCLR_COL(15), (12 * 8 + 4) + v6[param1], 0 + param1 * 16, (48 * 8), 16); @@ -664,10 +674,10 @@ static void ov74_021D17CC (UnkStruct_ov74_021D0D80 * param0, u16 param1) sub_0201A954(¶m0->unk_2C[1]); } -static void ov74_021D1968 (UnkStruct_ov74_021D0D80 * param0, u16 param1, BOOL param2) +static void ov74_021D1968(UnkStruct_ov74_021D0D80 *param0, u16 param1, BOOL param2) { u32 v0; - Strbuf* v1; + Strbuf *v1; u8 v2; if (ov74_021D1A08(param0) == 0) { @@ -678,7 +688,7 @@ static void ov74_021D1968 (UnkStruct_ov74_021D0D80 * param0, u16 param1, BOOL pa BGL_FillWindow(&(param0->unk_2C[2]), 15); - v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0))); + v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)); v1 = Strbuf_Init(256, param0->unk_00); MessageLoader_GetStrbuf(param0->unk_20, param1, v1); @@ -693,7 +703,7 @@ static void ov74_021D1968 (UnkStruct_ov74_021D0D80 * param0, u16 param1, BOOL pa Strbuf_Free(v1); } -static BOOL ov74_021D1A08 (const UnkStruct_ov74_021D0D80 * param0) +static BOOL ov74_021D1A08(const UnkStruct_ov74_021D0D80 *param0) { if (Message_Printing(param0->unk_2AC) == 0) { return 1; @@ -702,9 +712,9 @@ static BOOL ov74_021D1A08 (const UnkStruct_ov74_021D0D80 * param0) return 0; } -static void ov74_021D1A24 (UnkStruct_ov74_021D0D80 * param0) +static void ov74_021D1A24(UnkStruct_ov74_021D0D80 *param0) { - UnkStruct_ov74_021D1720 * v0; + UnkStruct_ov74_021D1720 *v0; v0 = &(param0->unk_5C[param0->unk_10_2]); @@ -733,7 +743,7 @@ static void ov74_021D1A24 (UnkStruct_ov74_021D0D80 * param0) } } -static BOOL ov74_021D1B44 (UnkStruct_ov74_021D0D80 * param0) +static BOOL ov74_021D1B44(UnkStruct_ov74_021D0D80 *param0) { if ((param0->unk_18.unk_00_0 != param0->unk_5C[0].unk_02) || (param0->unk_18.unk_00_6 != param0->unk_5C[2].unk_02) || (param0->unk_18.unk_00_7 != param0->unk_5C[3].unk_02) || (param0->unk_18.unk_00_4 != param0->unk_5C[1].unk_02) || (param0->unk_18.unk_00_8 != param0->unk_5C[4].unk_02) || (param0->unk_18.unk_00_10 != param0->unk_5C[5].unk_02)) { return 1; @@ -742,7 +752,7 @@ static BOOL ov74_021D1B44 (UnkStruct_ov74_021D0D80 * param0) return 0; } -static void ov74_021D1BA8 (UnkStruct_ov74_021D0D80 * param0) +static void ov74_021D1BA8(UnkStruct_ov74_021D0D80 *param0) { static const UnkStruct_ov61_0222C884 v0 = { 3, 25, 13, 6, 4, 13, (((((10 + 12 * 2) + 30 * 14) + 27 * 4) + 9) + (18 + 12)) @@ -751,15 +761,21 @@ static void ov74_021D1BA8 (UnkStruct_ov74_021D0D80 * param0) param0->unk_2A8 = sub_02002100(param0->unk_14, &v0, (((10 + 12 * 2) + 30 * 14) + 27 * 4), 14, param0->unk_00); } -static u32 ov74_021D1BD0 (UnkStruct_ov74_021D0D80 * param0) +static u32 ov74_021D1BD0(UnkStruct_ov74_021D0D80 *param0) { return sub_02002114(param0->unk_2A8, param0->unk_00); } -static void ov74_021D1BE4 (UnkStruct_ov74_021D0D80 * param0, u16 param1, BOOL param2) +static void ov74_021D1BE4(UnkStruct_ov74_021D0D80 *param0, u16 param1, BOOL param2) { static const u8 v0[7] = { - 43, 46, 44, 45, 47, 48, 52, + 43, + 46, + 44, + 45, + 47, + 48, + 52, }; ov74_021D1968(param0, v0[param1], param2); diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 2881c179e5..4161daf485 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -1,57 +1,54 @@ -#include "enums.h" +#include "overlay075/ov75_021D0D80.h" #include #include -#include "core_sys.h" - #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020978D8.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "core_sys.h" +#include "enums.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "pokemon_icon.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_0200A784.h" -#include "message.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02014A84.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_020393C8.h" -#include "pokemon_icon.h" -#include "overlay075/ov75_021D0D80.h" enum { UnkEnum_ov75_021D1598_00, @@ -88,50 +85,50 @@ typedef struct { u8 unk_15; u8 unk_16; u8 unk_17; - BGL * unk_18; - UnkStruct_020978D8 * unk_1C; - MessageLoader * unk_20; - Strbuf* unk_24[3]; - PaletteData * unk_30; - void * unk_34; - void * unk_38; - NNSG2dScreenData * unk_3C; - NNSG2dScreenData * unk_40; + BGL *unk_18; + UnkStruct_020978D8 *unk_1C; + MessageLoader *unk_20; + Strbuf *unk_24[3]; + PaletteData *unk_30; + void *unk_34; + void *unk_38; + NNSG2dScreenData *unk_3C; + NNSG2dScreenData *unk_40; Window unk_44[6]; - UIControlData * unk_A4; - SpriteRenderer * unk_A8; - SpriteGfxHandler * unk_AC; - CellActorData * unk_B0[3]; + UIControlData *unk_A4; + SpriteRenderer *unk_A8; + SpriteGfxHandler *unk_AC; + CellActorData *unk_B0[3]; } UnkStruct_ov75_021D1184; -typedef int (* UnkFuncPtr_ov75_021D1184)(UnkStruct_ov75_021D1184 *); +typedef int (*UnkFuncPtr_ov75_021D1184)(UnkStruct_ov75_021D1184 *); -static int ov75_021D1184(UnkStruct_ov75_021D1184 * param0); -static int ov75_021D0E5C(UnkStruct_ov75_021D1184 * param0); -static int ov75_021D0E80(UnkStruct_ov75_021D1184 * param0); -static int ov75_021D108C(UnkStruct_ov75_021D1184 * param0); -static void ov75_021D1358(SysTask * param0, void * param1); -static int ov75_021D13E8(UnkStruct_ov75_021D1184 * param0); -static int ov75_021D1434(UnkStruct_ov75_021D1184 * param0); -static void ov75_021D131C(void * param0); +static int ov75_021D1184(UnkStruct_ov75_021D1184 *param0); +static int ov75_021D0E5C(UnkStruct_ov75_021D1184 *param0); +static int ov75_021D0E80(UnkStruct_ov75_021D1184 *param0); +static int ov75_021D108C(UnkStruct_ov75_021D1184 *param0); +static void ov75_021D1358(SysTask *param0, void *param1); +static int ov75_021D13E8(UnkStruct_ov75_021D1184 *param0); +static int ov75_021D1434(UnkStruct_ov75_021D1184 *param0); +static void ov75_021D131C(void *param0); static void ov75_021D1460(void); -static void ov75_021D1480(UnkStruct_ov75_021D1184 * param0); -static void ov75_021D1564(UnkStruct_ov75_021D1184 * param0); -static void ov75_021D1598(UnkStruct_ov75_021D1184 * param0); -static void ov75_021D1868(UnkStruct_ov75_021D1184 * param0); -static void ov75_021D18A8(UnkStruct_ov75_021D1184 * param0); -static void ov75_021D19A8(UnkStruct_ov75_021D1184 * param0); -static void ov75_021D19C8(UnkStruct_ov75_021D1184 * param0); -static void ov75_021D1ADC(UnkStruct_ov75_021D1184 * param0); -static void ov75_021D1CB8(UnkStruct_ov75_021D1184 * param0); -int ov75_021D0D80(OverlayManager * param0, int * param1); -int ov75_021D0DF8(OverlayManager * param0, int * param1); -int ov75_021D0E10(OverlayManager * param0, int * param1); - -int ov75_021D0D80 (OverlayManager * param0, int * param1) +static void ov75_021D1480(UnkStruct_ov75_021D1184 *param0); +static void ov75_021D1564(UnkStruct_ov75_021D1184 *param0); +static void ov75_021D1598(UnkStruct_ov75_021D1184 *param0); +static void ov75_021D1868(UnkStruct_ov75_021D1184 *param0); +static void ov75_021D18A8(UnkStruct_ov75_021D1184 *param0); +static void ov75_021D19A8(UnkStruct_ov75_021D1184 *param0); +static void ov75_021D19C8(UnkStruct_ov75_021D1184 *param0); +static void ov75_021D1ADC(UnkStruct_ov75_021D1184 *param0); +static void ov75_021D1CB8(UnkStruct_ov75_021D1184 *param0); +int ov75_021D0D80(OverlayManager *param0, int *param1); +int ov75_021D0DF8(OverlayManager *param0, int *param1); +int ov75_021D0E10(OverlayManager *param0, int *param1); + +int ov75_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_020978D8 * v0; - UnkStruct_ov75_021D1184 * v1 = (UnkStruct_ov75_021D1184 *)OverlayManager_Data(param0); + UnkStruct_020978D8 *v0; + UnkStruct_ov75_021D1184 *v1 = (UnkStruct_ov75_021D1184 *)OverlayManager_Data(param0); Heap_Create(3, 41, 0x20000); v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov75_021D1184), 41); @@ -152,9 +149,9 @@ int ov75_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov75_021D0DF8 (OverlayManager * param0, int * param1) +int ov75_021D0DF8(OverlayManager *param0, int *param1) { - UnkStruct_ov75_021D1184 * v0 = (UnkStruct_ov75_021D1184 *)OverlayManager_Data(param0); + UnkStruct_ov75_021D1184 *v0 = (UnkStruct_ov75_021D1184 *)OverlayManager_Data(param0); if (ov75_021D1184(v0)) { return 1; @@ -163,9 +160,9 @@ int ov75_021D0DF8 (OverlayManager * param0, int * param1) return 0; } -int ov75_021D0E10 (OverlayManager * param0, int * param1) +int ov75_021D0E10(OverlayManager *param0, int *param1) { - UnkStruct_ov75_021D1184 * v0 = (UnkStruct_ov75_021D1184 *)OverlayManager_Data(param0); + UnkStruct_ov75_021D1184 *v0 = (UnkStruct_ov75_021D1184 *)OverlayManager_Data(param0); int v1; sub_02002AC8(0); @@ -178,7 +175,7 @@ int ov75_021D0E10 (OverlayManager * param0, int * param1) return 1; } -static BOOL ov75_021D0E34 (UnkStruct_ov75_021D1184 * param0) +static BOOL ov75_021D0E34(UnkStruct_ov75_021D1184 *param0) { int v0 = 0; @@ -191,7 +188,7 @@ static BOOL ov75_021D0E34 (UnkStruct_ov75_021D1184 * param0) return 1; } -static int ov75_021D0E5C (UnkStruct_ov75_021D1184 * param0) +static int ov75_021D0E5C(UnkStruct_ov75_021D1184 *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1507); @@ -201,7 +198,7 @@ static int ov75_021D0E5C (UnkStruct_ov75_021D1184 * param0) return 0; } -static int ov75_021D0E80 (UnkStruct_ov75_021D1184 * param0) +static int ov75_021D0E80(UnkStruct_ov75_021D1184 *param0) { u8 v0 = 0; @@ -270,9 +267,9 @@ static int ov75_021D0E80 (UnkStruct_ov75_021D1184 * param0) return 0; } -static int ov75_021D0FA0 (UnkStruct_ov75_021D1184 * param0) +static int ov75_021D0FA0(UnkStruct_ov75_021D1184 *param0) { - Strbuf* v0 = NULL; + Strbuf *v0 = NULL; switch (param0->unk_08) { case 0: @@ -282,7 +279,7 @@ static int ov75_021D0FA0 (UnkStruct_ov75_021D1184 * param0) v0 = Strbuf_Init((19 * 2 * 2), param0->unk_00); MessageLoader_GetStrbuf(param0->unk_20, 2, v0); - sub_0201D78C(¶m0->unk_44[5], 1, v0, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_44[5], 1, v0, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); Strbuf_Free(v0); break; case 1: @@ -304,7 +301,7 @@ static int ov75_021D0FA0 (UnkStruct_ov75_021D1184 * param0) return 0; } -static void ov75_021D1040 (UnkStruct_ov75_021D1184 * param0) +static void ov75_021D1040(UnkStruct_ov75_021D1184 *param0) { static const UnkStruct_ov61_0222C884 v0 = { 0, 25, 13, 6, 4, UnkEnum_ov75_021D1598_03, 555 @@ -313,7 +310,7 @@ static void ov75_021D1040 (UnkStruct_ov75_021D1184 * param0) param0->unk_A4 = sub_02002100(param0->unk_18, &v0, 1, UnkEnum_ov75_021D1598_05, param0->unk_00); } -static int ov75_021D1064 (UnkStruct_ov75_021D1184 * param0) +static int ov75_021D1064(UnkStruct_ov75_021D1184 *param0) { switch (sub_02002114(param0->unk_A4, param0->unk_00)) { case 0: @@ -325,10 +322,10 @@ static int ov75_021D1064 (UnkStruct_ov75_021D1184 * param0) return -1; } -static int ov75_021D108C (UnkStruct_ov75_021D1184 * param0) +static int ov75_021D108C(UnkStruct_ov75_021D1184 *param0) { int v0; - Strbuf* v1 = NULL; + Strbuf *v1 = NULL; switch (param0->unk_08) { case 0: @@ -339,7 +336,7 @@ static int ov75_021D108C (UnkStruct_ov75_021D1184 * param0) v1 = Strbuf_Init((19 * 2 * 2), param0->unk_00); MessageLoader_GetStrbuf(param0->unk_20, 3, v1); - param0->unk_0F = sub_0201D78C(¶m0->unk_44[5], 1, v1, 0, 0, param0->unk_10, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + param0->unk_0F = sub_0201D78C(¶m0->unk_44[5], 1, v1, 0, 0, param0->unk_10, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); Strbuf_Free(v1); sub_020039B0(param0->unk_30, 0, 34 + param0->unk_17, 1, 0, 0x7FFF); @@ -380,7 +377,7 @@ static int ov75_021D108C (UnkStruct_ov75_021D1184 * param0) return 0; } -static int ov75_021D1184 (UnkStruct_ov75_021D1184 * param0) +static int ov75_021D1184(UnkStruct_ov75_021D1184 *param0) { switch (param0->unk_04) { case 0: @@ -419,10 +416,12 @@ static int ov75_021D1184 (UnkStruct_ov75_021D1184 * param0) return 0; } break; - case 3: - { + case 3: { static const UnkFuncPtr_ov75_021D1184 v0[] = { - ov75_021D0E5C, ov75_021D0E80, ov75_021D0FA0, ov75_021D108C, + ov75_021D0E5C, + ov75_021D0E80, + ov75_021D0FA0, + ov75_021D108C, }; if (param0->unk_AC != NULL) { @@ -434,8 +433,7 @@ static int ov75_021D1184 (UnkStruct_ov75_021D1184 * param0) } sub_02003178(param0->unk_30, (0x1 | 0x4), 0xFFFF, -1, 0, 16, 0x0); - } - break; + } break; case 4: if (sub_0200384C(param0->unk_30)) { if (param0->unk_AC != NULL) { @@ -466,9 +464,9 @@ static int ov75_021D1184 (UnkStruct_ov75_021D1184 * param0) return 0; } -static void ov75_021D131C (void * param0) +static void ov75_021D131C(void *param0) { - UnkStruct_ov75_021D1184 * v0 = (UnkStruct_ov75_021D1184 *)param0; + UnkStruct_ov75_021D1184 *v0 = (UnkStruct_ov75_021D1184 *)param0; if (v0->unk_30 != NULL) { sub_02003694(v0->unk_30); @@ -484,9 +482,9 @@ static void ov75_021D131C (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov75_021D1358 (SysTask * param0, void * param1) +static void ov75_021D1358(SysTask *param0, void *param1) { - UnkStruct_ov75_021D1184 * v0 = (UnkStruct_ov75_021D1184 *)param1; + UnkStruct_ov75_021D1184 *v0 = (UnkStruct_ov75_021D1184 *)param1; if (v0->unk_30 == NULL) { SysTask_Done(param0); @@ -517,7 +515,7 @@ static void ov75_021D1358 (SysTask * param0, void * param1) } } -static int ov75_021D13E8 (UnkStruct_ov75_021D1184 * param0) +static int ov75_021D13E8(UnkStruct_ov75_021D1184 *param0) { switch (param0->unk_08) { case 0: @@ -540,7 +538,7 @@ static int ov75_021D13E8 (UnkStruct_ov75_021D1184 * param0) return 0; } -static int ov75_021D1434 (UnkStruct_ov75_021D1184 * param0) +static int ov75_021D1434(UnkStruct_ov75_021D1184 *param0) { ov75_021D1CB8(param0); @@ -555,7 +553,7 @@ static int ov75_021D1434 (UnkStruct_ov75_021D1184 * param0) return 1; } -static void ov75_021D1460 (void) +static void ov75_021D1460(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -573,7 +571,7 @@ static void ov75_021D1460 (void) GXLayers_SetBanks(&v0); } -static void ov75_021D1480 (UnkStruct_ov75_021D1184 * param0) +static void ov75_021D1480(UnkStruct_ov75_021D1184 *param0) { int v0, v1; @@ -607,7 +605,7 @@ static void ov75_021D1480 (UnkStruct_ov75_021D1184 * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -622,7 +620,7 @@ static void ov75_021D1480 (UnkStruct_ov75_021D1184 * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -637,7 +635,7 @@ static void ov75_021D1480 (UnkStruct_ov75_021D1184 * param0) 2, 0, 0, - 0 + 0, }, { 0, @@ -652,7 +650,7 @@ static void ov75_021D1480 (UnkStruct_ov75_021D1184 * param0) 3, 0, 0, - 0 + 0, }, { 0, @@ -667,7 +665,7 @@ static void ov75_021D1480 (UnkStruct_ov75_021D1184 * param0) 0, 0, 0, - 0 + 0, }, }; @@ -690,7 +688,7 @@ static void ov75_021D1480 (UnkStruct_ov75_021D1184 * param0) sub_02019690(4, 32, 0, param0->unk_00); } -static void ov75_021D1564 (UnkStruct_ov75_021D1184 * param0) +static void ov75_021D1564(UnkStruct_ov75_021D1184 *param0) { sub_02019044(param0->unk_18, 4); sub_02019044(param0->unk_18, 3); @@ -700,14 +698,14 @@ static void ov75_021D1564 (UnkStruct_ov75_021D1184 * param0) Heap_FreeToHeap(param0->unk_18); } -static void ov75_021D1598 (UnkStruct_ov75_021D1184 * param0) +static void ov75_021D1598(UnkStruct_ov75_021D1184 *param0) { - void * v0; + void *v0; u32 v1; - void * v2; - NNSG2dCharacterData * v3; - NNSG2dPaletteData * v4; - NARC * v5; + void *v2; + NNSG2dCharacterData *v3; + NNSG2dPaletteData *v4; + NARC *v5; int v6, v7, v8; v6 = 12 + param0->unk_1C->unk_0F; @@ -782,7 +780,7 @@ static void ov75_021D1598 (UnkStruct_ov75_021D1184 * param0) } } -static void ov75_021D1868 (UnkStruct_ov75_021D1184 * param0) +static void ov75_021D1868(UnkStruct_ov75_021D1184 *param0) { Heap_FreeToHeap(param0->unk_38); Heap_FreeToHeap(param0->unk_34); @@ -795,7 +793,7 @@ static void ov75_021D1868 (UnkStruct_ov75_021D1184 * param0) G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_NONE, 31, 0); } -static void ov75_021D18A8 (UnkStruct_ov75_021D1184 * param0) +static void ov75_021D18A8(UnkStruct_ov75_021D1184 *param0) { int v0 = 0; @@ -815,7 +813,7 @@ static void ov75_021D18A8 (UnkStruct_ov75_021D1184 * param0) } } -static void ov75_021D19A8 (UnkStruct_ov75_021D1184 * param0) +static void ov75_021D19A8(UnkStruct_ov75_021D1184 *param0) { int v0 = 0; @@ -825,10 +823,10 @@ static void ov75_021D19A8 (UnkStruct_ov75_021D1184 * param0) } } -static void ov75_021D19C8 (UnkStruct_ov75_021D1184 * param0) +static void ov75_021D19C8(UnkStruct_ov75_021D1184 *param0) { int v0 = 0; - Strbuf* v1; + Strbuf *v1; for (v0 = 0; v0 < 3; v0++) { if (!sub_02014BBC(¶m0->unk_1C->unk_1A[v0])) { @@ -837,13 +835,13 @@ static void ov75_021D19C8 (UnkStruct_ov75_021D1184 * param0) v1 = sub_02014B34(¶m0->unk_1C->unk_1A[v0], param0->unk_00); - sub_0201D78C(¶m0->unk_44[0 + v0], 1, v1, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_44[0 + v0], 1, v1, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); sub_0201A954(¶m0->unk_44[0 + v0]); } if (param0->unk_0C == 1) { - Strbuf* v2; + Strbuf *v2; int v3; param0->unk_20 = MessageLoader_Init(1, 26, 409, param0->unk_00); @@ -857,18 +855,18 @@ static void ov75_021D19C8 (UnkStruct_ov75_021D1184 * param0) v3 = (8 * 8) - sub_02002D7C(1, v2, 0); v3 /= 2; - sub_0201D78C(¶m0->unk_44[3 + v0], 1, v2, v3, 2, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_44[3 + v0], 1, v2, v3, 2, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A954(¶m0->unk_44[3 + v0]); } Strbuf_Free(v2); } else { - sub_0201D78C(¶m0->unk_44[3], 1, param0->unk_1C->unk_10, 0, 2, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_44[3], 1, param0->unk_1C->unk_10, 0, 2, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A954(¶m0->unk_44[3]); } } -static void ov75_021D1ADC (UnkStruct_ov75_021D1184 * param0) +static void ov75_021D1ADC(UnkStruct_ov75_021D1184 *param0) { int v0 = 0, v1 = 0; SpriteTemplate v2; @@ -886,13 +884,29 @@ static void ov75_021D1ADC (UnkStruct_ov75_021D1184 * param0) { UnkStruct_ov104_0224133C v3 = { - 0, 7, 1, 1, 0, 1, 1, 1, + 0, + 7, + 1, + 1, + 0, + 1, + 1, + 1, }; UnkStruct_ov104_022412F4 v4 = { - 3, 1024, 0, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K, + 3, + 1024, + 0, + GX_OBJVRAMMODE_CHAR_1D_32K, + GX_OBJVRAMMODE_CHAR_1D_32K, }; const UnkStruct_ov104_02241308 v5 = { - 3, 1, 1, 1, 0, 0, + 3, + 1, + 1, + 1, + 0, + 0, }; sub_0200C73C(param0->unk_A8, &v3, &v4, 32); @@ -938,7 +952,7 @@ static void ov75_021D1ADC (UnkStruct_ov75_021D1184 * param0) } } -static void ov75_021D1CB8 (UnkStruct_ov75_021D1184 * param0) +static void ov75_021D1CB8(UnkStruct_ov75_021D1184 *param0) { int v0 = 0; diff --git a/src/overlay076/ov76_0223B140.c b/src/overlay076/ov76_0223B140.c index 5ece854f06..3f05b7bc20 100644 --- a/src/overlay076/ov76_0223B140.c +++ b/src/overlay076/ov76_0223B140.c @@ -1,37 +1,37 @@ +#include "overlay076/ov76_0223B140.h" + #include -#include #include - -#include "core_sys.h" +#include #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" -#include "touch_screen.h" #include "struct_defs/struct_0202CA28.h" + +#include "overlay012/ov12_02237E54.h" #include "overlay076/struct_ov76_0223B52C.h" #include "overlay076/struct_ov76_0223DE00.h" -#include "struct_defs/sprite_template.h" +#include "core_sys.h" #include "game_overlay.h" +#include "touch_screen.h" #include "unk_0200C6E4.h" #include "unk_0202C9F4.h" #include "unk_02097B18.h" -#include "overlay012/ov12_02237E54.h" -#include "overlay076/ov76_0223B140.h" FS_EXTERN_OVERLAY(overlay11); FS_EXTERN_OVERLAY(overlay12); -static void NitroStaticInit (void) +static void NitroStaticInit(void) { Overlay_LoadByID(FS_OVERLAY_ID(overlay11), 2); Overlay_LoadByID(FS_OVERLAY_ID(overlay12), 2); } -static void ov76_0223B15C (TouchScreenRect *rect, u8 param1, u8 param2) +static void ov76_0223B15C(TouchScreenRect *rect, u8 param1, u8 param2) { rect->rect.top = param2 - 10; rect->rect.left = param1 - 10; @@ -39,7 +39,7 @@ static void ov76_0223B15C (TouchScreenRect *rect, u8 param1, u8 param2) rect->rect.right = param1 + 10; } -static void ov76_0223B174 (TouchScreenRect *rect) +static void ov76_0223B174(TouchScreenRect *rect) { rect->rect.top = 0; rect->rect.left = 0; @@ -47,7 +47,7 @@ static void ov76_0223B174 (TouchScreenRect *rect) rect->rect.right = 255; } -void ov76_0223B184 (TouchScreenRect *rect, CellActorData * param1, BOOL param2) +void ov76_0223B184(TouchScreenRect *rect, CellActorData *param1, BOOL param2) { s16 v0, v1; @@ -65,7 +65,7 @@ void ov76_0223B184 (TouchScreenRect *rect, CellActorData * param1, BOOL param2) } } -void ov76_0223B1E0 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223B1E0(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -78,10 +78,10 @@ void ov76_0223B1E0 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223B208 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223B208(UnkStruct_ov76_0223DE00 *param0) { int v0; - UnkStruct_0202CA28 * v1; + UnkStruct_0202CA28 *v1; v1 = param0->unk_04[param0->unk_3C4[0]].unk_04; @@ -102,7 +102,7 @@ void ov76_0223B208 (UnkStruct_ov76_0223DE00 * param0) } } -int ov76_0223B278 (UnkStruct_ov76_0223DE00 * param0, u8 param1) +int ov76_0223B278(UnkStruct_ov76_0223DE00 *param0, u8 param1) { int v0; u32 v1, v2; @@ -132,7 +132,7 @@ int ov76_0223B278 (UnkStruct_ov76_0223DE00 * param0, u8 param1) return 0xFF; } -BOOL ov76_0223B2F8 (UnkStruct_ov76_0223DE00 * param0) +BOOL ov76_0223B2F8(UnkStruct_ov76_0223DE00 *param0) { int v0; u32 v1, v2; @@ -148,7 +148,7 @@ BOOL ov76_0223B2F8 (UnkStruct_ov76_0223DE00 * param0) return 0; } -void ov76_0223B314 (UnkStruct_ov76_0223DE00 * param0, u8 param1) +void ov76_0223B314(UnkStruct_ov76_0223DE00 *param0, u8 param1) { int v0; @@ -171,13 +171,13 @@ void ov76_0223B314 (UnkStruct_ov76_0223DE00 * param0, u8 param1) } } -void ov76_0223B36C (UnkStruct_ov76_0223DE00 * param0, u8 param1, u8 param2) +void ov76_0223B36C(UnkStruct_ov76_0223DE00 *param0, u8 param1, u8 param2) { int v0; int v1; - SpriteRenderer * v2; - SpriteGfxHandler * v3; - PaletteData * v4; + SpriteRenderer *v2; + SpriteGfxHandler *v3; + PaletteData *v4; v2 = param0->unk_D4.unk_08; v3 = param0->unk_D4.unk_0C; @@ -193,7 +193,7 @@ void ov76_0223B36C (UnkStruct_ov76_0223DE00 * param0, u8 param1, u8 param2) sub_0200CE3C(v2, v3, 91, 1, 1, 23000 + 1); } -void ov76_0223B400 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223B400(UnkStruct_ov76_0223DE00 *param0) { int v0, v1; int v2; @@ -270,15 +270,15 @@ void ov76_0223B400 (UnkStruct_ov76_0223DE00 * param0) } } -BOOL ov76_0223B52C (UnkStruct_ov76_0223DE00 * param0, u8 param1) +BOOL ov76_0223B52C(UnkStruct_ov76_0223DE00 *param0, u8 param1) { int v0; int v1; - UnkStruct_ov76_0223B52C * v2; + UnkStruct_ov76_0223B52C *v2; SpriteTemplate v3; - SpriteRenderer * v4; - SpriteGfxHandler * v5; - PaletteData * v6; + SpriteRenderer *v4; + SpriteGfxHandler *v5; + PaletteData *v6; v4 = param0->unk_D4.unk_08; v5 = param0->unk_D4.unk_0C; @@ -318,7 +318,7 @@ BOOL ov76_0223B52C (UnkStruct_ov76_0223DE00 * param0, u8 param1) return 1; } -BOOL ov76_0223B5C4 (UnkStruct_ov76_0223DE00 * param0, u32 param1, u8 param2) +BOOL ov76_0223B5C4(UnkStruct_ov76_0223DE00 *param0, u32 param1, u8 param2) { if (param0->unk_324[param2].unk_00 == 0) { return 1; @@ -331,8 +331,7 @@ BOOL ov76_0223B5C4 (UnkStruct_ov76_0223DE00 * param0, u32 param1, u8 param2) ov76_0223B314(param0, param2); } break; - case 2: - { + case 2: { s16 v0, v1; if (param0->unk_D4.unk_00 == param2) { @@ -340,11 +339,9 @@ BOOL ov76_0223B5C4 (UnkStruct_ov76_0223DE00 * param0, u32 param1, u8 param2) ov76_0223B758(param0, param2); ov76_0223B7D4(param0, param2); } - } - break; + } break; case 3: - case 1: - { + case 1: { BOOL v2; if (param0->unk_D4.unk_00 == 0xFF) { @@ -357,8 +354,7 @@ BOOL ov76_0223B5C4 (UnkStruct_ov76_0223DE00 * param0, u32 param1, u8 param2) param0->unk_D4.unk_00 = 0xFF; } - } - break; + } break; default: GF_ASSERT(0); break; @@ -367,7 +363,7 @@ BOOL ov76_0223B5C4 (UnkStruct_ov76_0223DE00 * param0, u32 param1, u8 param2) return 1; } -void ov76_0223B678 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223B678(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -380,7 +376,7 @@ void ov76_0223B678 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223B69C (UnkStruct_ov76_0223DE00 * param0, int param1) +void ov76_0223B69C(UnkStruct_ov76_0223DE00 *param0, int param1) { int v0; @@ -393,7 +389,7 @@ void ov76_0223B69C (UnkStruct_ov76_0223DE00 * param0, int param1) } } -BOOL ov76_0223B6C4 (UnkStruct_ov76_0223DE00 * param0, int param1) +BOOL ov76_0223B6C4(UnkStruct_ov76_0223DE00 *param0, int param1) { int v0; s16 v1, v2; @@ -412,7 +408,7 @@ BOOL ov76_0223B6C4 (UnkStruct_ov76_0223DE00 * param0, int param1) return 1; } -void ov76_0223B704 (UnkStruct_ov76_0223DE00 * param0, int param1) +void ov76_0223B704(UnkStruct_ov76_0223DE00 *param0, int param1) { int v0; int v1; @@ -432,7 +428,7 @@ void ov76_0223B704 (UnkStruct_ov76_0223DE00 * param0, int param1) ov76_0223B15C(param0->unk_324[param1].unk_0C, 0, 0); } -void ov76_0223B758 (UnkStruct_ov76_0223DE00 * param0, int param1) +void ov76_0223B758(UnkStruct_ov76_0223DE00 *param0, int param1) { BOOL v0; @@ -445,11 +441,11 @@ void ov76_0223B758 (UnkStruct_ov76_0223DE00 * param0, int param1) } } -BOOL ov76_0223B78C (UnkStruct_ov76_0223DE00 * param0) +BOOL ov76_0223B78C(UnkStruct_ov76_0223DE00 *param0) { int v0; int v1; - UnkStruct_0202CA28 * v2; + UnkStruct_0202CA28 *v2; v1 = param0->unk_3C4[0]; v2 = param0->unk_04[v1].unk_04; @@ -463,7 +459,7 @@ BOOL ov76_0223B78C (UnkStruct_ov76_0223DE00 * param0) return 0; } -void ov76_0223B7D4 (UnkStruct_ov76_0223DE00 * param0, int param1) +void ov76_0223B7D4(UnkStruct_ov76_0223DE00 *param0, int param1) { s16 v0, v1; @@ -473,7 +469,7 @@ void ov76_0223B7D4 (UnkStruct_ov76_0223DE00 * param0, int param1) param0->unk_324[param1].unk_06 = (u8)v1; } -void ov76_0223B808 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223B808(UnkStruct_ov76_0223DE00 *param0) { int v0; UnkStruct_0202CA28 v1; @@ -487,7 +483,7 @@ void ov76_0223B808 (UnkStruct_ov76_0223DE00 * param0) sub_0202CA40(param0->unk_00->unk_20, &v1, param0->unk_3C4[0]); } -void ov76_0223B848 (UnkStruct_0202CA28 * param0, UnkStruct_ov76_0223DE00 * param1) +void ov76_0223B848(UnkStruct_0202CA28 *param0, UnkStruct_ov76_0223DE00 *param1) { int v0; diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index e8a288d015..c81d71ed43 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -1,106 +1,103 @@ +#include "overlay076/ov76_0223B870.h" + #include #include #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "pokemon.h" - -#include "overlay076/const_ov76_0223EF3C.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "touch_screen.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02081CF4.h" + +#include "overlay012/ov12_02225864.h" #include "overlay012/struct_ov12_02225F6C.h" +#include "overlay076/const_ov76_0223EF3C.h" +#include "overlay076/ov76_0223D338.h" #include "overlay076/struct_ov76_0223BBAC.h" #include "overlay076/struct_ov76_0223C398.h" #include "overlay076/struct_ov76_0223DE00.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" -#include "message.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02013A04.h" #include "unk_02014000.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_02024220.h" #include "unk_0202C9F4.h" -#include "pokemon.h" -#include "pokemon_icon.h" #include "unk_02097B18.h" -#include "overlay012/ov12_02225864.h" -#include "overlay076/ov76_0223B870.h" -#include "overlay076/ov76_0223D338.h" typedef struct { UnkStruct_ov12_02225F6C unk_00[9]; - CellActorData * unk_144[8]; - BGL * unk_164; + CellActorData *unk_144[8]; + BGL *unk_164; int unk_168; - BOOL * unk_16C; + BOOL *unk_16C; } UnkStruct_ov76_0223BCA0; -void ov76_0223BF74(BGL * param0, Window * param1, int param2, UnkStruct_ov76_0223DE00 * param3, int param4); -void ov76_0223C0EC(int param0, s16 * param1, s16 * param2); -void ov76_0223C110(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C188(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C288(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C304(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C32C(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C354(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C398(UnkStruct_ov76_0223C398 * param0); -void ov76_0223C424(UnkStruct_ov76_0223C398 * param0); -void ov76_0223C5A4(SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10); -void ov76_0223C61C(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223C7E0(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C80C(UnkStruct_ov76_0223DE00 * param0, int param1, int param2); -void ov76_0223C88C(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C8BC(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223C8EC(BGL * param0, PaletteData * param1, int param2); -void ov76_0223C974(BGL * param0, PaletteData * param1, int param2); -void ov76_0223CA30(Window * param0, int param1); -void ov76_0223CA98(BGL * param0, Window * param1, int param2, int param3, int param4, int param5, int param6, int param7); -void ov76_0223CB58(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223CDA4(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223CDC4(Window * param0, int param1); +void ov76_0223BF74(BGL *param0, Window *param1, int param2, UnkStruct_ov76_0223DE00 *param3, int param4); +void ov76_0223C0EC(int param0, s16 *param1, s16 *param2); +void ov76_0223C110(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C188(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C288(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C304(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C32C(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C354(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C398(UnkStruct_ov76_0223C398 *param0); +void ov76_0223C424(UnkStruct_ov76_0223C398 *param0); +void ov76_0223C5A4(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC *param10); +void ov76_0223C61C(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223C7E0(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C80C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2); +void ov76_0223C88C(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C8BC(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223C8EC(BGL *param0, PaletteData *param1, int param2); +void ov76_0223C974(BGL *param0, PaletteData *param1, int param2); +void ov76_0223CA30(Window *param0, int param1); +void ov76_0223CA98(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7); +void ov76_0223CB58(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223CDA4(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223CDC4(Window *param0, int param1); void ov76_0223CE2C(void); void ov76_0223CE44(void); void ov76_0223CE64(void); -void ov76_0223CE84(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223CF24(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223CF88(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223CFEC(UnkStruct_ov76_0223DE00 * param0, NARC * param1); -void ov76_0223D16C(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223D318(UnkStruct_ov76_0223DE00 * param0); -void ov76_0223D31C(UnkStruct_ov76_0223DE00 * param0); - -static void ov76_0223B870 (TouchScreenRect *rect, CellActorData * param1, int param2, int param3) +void ov76_0223CE84(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223CF24(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223CF88(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223CFEC(UnkStruct_ov76_0223DE00 *param0, NARC *param1); +void ov76_0223D16C(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223D318(UnkStruct_ov76_0223DE00 *param0); +void ov76_0223D31C(UnkStruct_ov76_0223DE00 *param0); + +static void ov76_0223B870(TouchScreenRect *rect, CellActorData *param1, int param2, int param3) { s16 v0, v1; @@ -112,13 +109,13 @@ static void ov76_0223B870 (TouchScreenRect *rect, CellActorData * param1, int pa rect->rect.right = v0 + param2; } -void ov76_0223B8A8 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223B8A8(UnkStruct_ov76_0223DE00 *param0) { param0->unk_D4.unk_160 = sub_02012744(2, 53); sub_02002BB8(2, 53); } -void ov76_0223B8C4 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223B8C4(UnkStruct_ov76_0223DE00 *param0) { sub_02002C60(2); sub_02012870(param0->unk_D4.unk_164[0]); @@ -128,31 +125,31 @@ void ov76_0223B8C4 (UnkStruct_ov76_0223DE00 * param0) sub_020127BC(param0->unk_D4.unk_160); } -void ov76_0223B904 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223B904(UnkStruct_ov76_0223DE00 *param0) { sub_0200CD7C(param0->unk_D4.unk_14, 3, param0->unk_D4.unk_08, param0->unk_D4.unk_0C, 14, 7, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 30000); } -void ov76_0223B940 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223B940(UnkStruct_ov76_0223DE00 *param0) { ov76_0223B904(param0); ov76_0223B98C(param0, 0, 104, 165, 0); ov76_0223B98C(param0, 1, 192, 165, 0); } -void ov76_0223B96C (UnkStruct_ov76_0223DE00 * param0, BOOL param1) +void ov76_0223B96C(UnkStruct_ov76_0223DE00 *param0, BOOL param1) { sub_020129D0(param0->unk_D4.unk_164[0], param1); sub_020129D0(param0->unk_D4.unk_164[1], param1); } -void ov76_0223B98C (UnkStruct_ov76_0223DE00 * param0, int param1, int param2, int param3, int param4) +void ov76_0223B98C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2, int param3, int param4) { UnkStruct_020127E8 v0; - Strbuf* v1; + Strbuf *v1; int v2; int v3; - MessageLoader * v4; + MessageLoader *v4; Window v5; v4 = MessageLoader_Init(0, 26, 8, 53); @@ -188,7 +185,7 @@ void ov76_0223B98C (UnkStruct_ov76_0223DE00 * param0, int param1, int param2, in BGL_DeleteWindow(&v5); } -void ov76_0223BA90 (UnkStruct_ov76_0223DE00 * param0, int param1) +void ov76_0223BA90(UnkStruct_ov76_0223DE00 *param0, int param1) { int v0, v1; int v2; @@ -234,13 +231,13 @@ void ov76_0223BA90 (UnkStruct_ov76_0223DE00 * param0, int param1) } } -void ov76_0223BB04 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223BB04(UnkStruct_ov76_0223DE00 *param0) { int v0; int v1; - SpriteRenderer * v2; - SpriteGfxHandler * v3; - PaletteData * v4; + SpriteRenderer *v2; + SpriteGfxHandler *v3; + PaletteData *v4; v2 = param0->unk_D4.unk_08; v3 = param0->unk_D4.unk_0C; @@ -256,14 +253,14 @@ void ov76_0223BB04 (UnkStruct_ov76_0223DE00 * param0) sub_0200CE3C(v2, v3, 91, 88, 1, 28000 + 88); } -void ov76_0223BBAC (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223BBAC(UnkStruct_ov76_0223DE00 *param0) { int v0; - UnkStruct_ov76_0223BBAC * v1; + UnkStruct_ov76_0223BBAC *v1; SpriteTemplate v2; - SpriteRenderer * v3; - SpriteGfxHandler * v4; - PaletteData * v5; + SpriteRenderer *v3; + SpriteGfxHandler *v4; + PaletteData *v5; v3 = param0->unk_D4.unk_08; v4 = param0->unk_D4.unk_0C; @@ -292,14 +289,14 @@ void ov76_0223BBAC (UnkStruct_ov76_0223DE00 * param0) { const s16 v6[][2] = { - {19, 23}, - {75, 23}, - {19, 47}, - {75, 47}, - {19, 71}, - {75, 71}, - {19, 95}, - {75, 95}, + { 19, 23 }, + { 75, 23 }, + { 19, 47 }, + { 75, 47 }, + { 19, 71 }, + { 75, 71 }, + { 19, 95 }, + { 75, 95 }, }; for (v0 = 0; v0 < 8; v0++) { @@ -310,7 +307,7 @@ void ov76_0223BBAC (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223BC70 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223BC70(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -320,9 +317,9 @@ void ov76_0223BC70 (UnkStruct_ov76_0223DE00 * param0) } } -static void ov76_0223BCA0 (SysTask * param0, void * param1) +static void ov76_0223BCA0(SysTask *param0, void *param1) { - UnkStruct_ov76_0223BCA0 * v0 = (UnkStruct_ov76_0223BCA0 *)param1; + UnkStruct_ov76_0223BCA0 *v0 = (UnkStruct_ov76_0223BCA0 *)param1; BOOL v1 = 0; { int v2; @@ -351,9 +348,9 @@ static void ov76_0223BCA0 (SysTask * param0, void * param1) } } -void ov76_0223BD30 (UnkStruct_ov76_0223DE00 * param0, s8 param1, int param2) +void ov76_0223BD30(UnkStruct_ov76_0223DE00 *param0, s8 param1, int param2) { - UnkStruct_ov76_0223BCA0 * v0; + UnkStruct_ov76_0223BCA0 *v0; v0 = Heap_AllocFromHeap(53, sizeof(UnkStruct_ov76_0223BCA0)); v0->unk_164 = param0->unk_D4.unk_10; @@ -389,15 +386,15 @@ void ov76_0223BD30 (UnkStruct_ov76_0223DE00 * param0, s8 param1, int param2) SysTask_Start(ov76_0223BCA0, v0, 0x1000); } -GenericPointerData * ov76_0223BE6C (void) +GenericPointerData *ov76_0223BE6C(void) { - GenericPointerData * v0; + GenericPointerData *v0; v0 = sub_02024220(53, 0, 2, 0, 2, ov76_0223BE8C); return v0; } -void ov76_0223BE8C (void) +void ov76_0223BE8C(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -412,7 +409,7 @@ void ov76_0223BE8C (void) G3_ViewPort(0, 0, 255, 191); } -void ov76_0223BF10 (void) +void ov76_0223BF10(void) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -430,10 +427,10 @@ void ov76_0223BF10 (void) sub_02014000(); } -void ov76_0223BF50 (void) +void ov76_0223BF50(void) { int v0; - const MtxFx43 * v1; + const MtxFx43 *v1; sub_020241B4(); @@ -448,7 +445,7 @@ void ov76_0223BF50 (void) G3_RequestSwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } -void ov76_0223BF74 (BGL * param0, Window * param1, int param2, UnkStruct_ov76_0223DE00 * param3, int param4) +void ov76_0223BF74(BGL *param0, Window *param1, int param2, UnkStruct_ov76_0223DE00 *param3, int param4) { UnkStruct_02081CF4 v0; int v1; @@ -503,8 +500,8 @@ void ov76_0223BF74 (BGL * param0, Window * param1, int param2, UnkStruct_ov76_02 { int v9; - Strbuf* v10; - MessageLoader * v11 = MessageLoader_Init(0, 26, 8, 53); + Strbuf *v10; + MessageLoader *v11 = MessageLoader_Init(0, 26, 8, 53); for (v9 = 0; v9 < v7; v9++) { v10 = MessageLoader_GetNewStrbuf(v11, Unk_ov76_0223EF3C[v8[v9]].unk_00); @@ -529,7 +526,7 @@ void ov76_0223BF74 (BGL * param0, Window * param1, int param2, UnkStruct_ov76_02 param3->unk_D4.unk_CC = sub_02001B7C(&v0, 8, 0, 0, 53, PAD_BUTTON_B); } -void ov76_0223C0EC (int param0, s16 * param1, s16 * param2) +void ov76_0223C0EC(int param0, s16 *param1, s16 *param2) { int v0; @@ -539,11 +536,11 @@ void ov76_0223C0EC (int param0, s16 * param1, s16 * param2) *param2 = 27 + (v0 * 53); } -void ov76_0223C110 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C110(UnkStruct_ov76_0223DE00 *param0) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - PaletteData * v2; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + PaletteData *v2; v0 = param0->unk_D4.unk_08; v1 = param0->unk_D4.unk_0C; @@ -562,14 +559,14 @@ void ov76_0223C110 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223C188 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C188(UnkStruct_ov76_0223DE00 *param0) { int v0; int v1; int v2; int v3; int v4; - Pokemon * v5; + Pokemon *v5; SpriteTemplate v6; for (v0 = 0; v0 < param0->unk_00->unk_00; v0++) { @@ -605,7 +602,7 @@ void ov76_0223C188 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223C288 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C288(UnkStruct_ov76_0223DE00 *param0) { int v0; int v1; @@ -626,7 +623,7 @@ void ov76_0223C288 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223C304 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C304(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -635,7 +632,7 @@ void ov76_0223C304 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223C32C (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C32C(UnkStruct_ov76_0223DE00 *param0) { int v0; int v1; @@ -645,12 +642,12 @@ void ov76_0223C32C (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223C354 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C354(UnkStruct_ov76_0223DE00 *param0) { int v0; int v1; int v2 = 0; - UnkStruct_0202CA28 * v3; + UnkStruct_0202CA28 *v3; for (v0 = 0; v0 < 12; v0++) { v3 = param0->unk_04[v0].unk_04; @@ -663,12 +660,19 @@ void ov76_0223C354 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223C398 (UnkStruct_ov76_0223C398 * param0) +void ov76_0223C398(UnkStruct_ov76_0223C398 *param0) { param0->unk_08 = sub_0200C6E4(53); { const UnkStruct_ov104_0224133C v0 = { - 0, 128, 0, 32, 0, 128, 0, 32, + 0, + 128, + 0, + 32, + 0, + 128, + 0, + 32, }; const UnkStruct_ov104_022412F4 v1 = { 48 + 48, 1024 * 0x40, 512 * 0x20, GX_OBJVRAMMODE_CHAR_1D_64K, GX_OBJVRAMMODE_CHAR_1D_32K @@ -680,7 +684,12 @@ void ov76_0223C398 (UnkStruct_ov76_0223C398 * param0) { BOOL v2; const UnkStruct_ov104_02241308 v3 = { - 48 + 48, 16 + 16, 64, 64, 16, 16, + 48 + 48, + 16 + 16, + 64, + 64, + 16, + 16, }; param0->unk_0C = sub_0200C704(param0->unk_08); @@ -692,28 +701,28 @@ void ov76_0223C398 (UnkStruct_ov76_0223C398 * param0) } } -void ov76_0223C424 (UnkStruct_ov76_0223C398 * param0) +void ov76_0223C424(UnkStruct_ov76_0223C398 *param0) { sub_0200D0B0(param0->unk_08, param0->unk_0C); sub_0200C8D4(param0->unk_08); } -void ov76_0223C438 (UnkStruct_ov76_0223DE00 * param0, NARC * param1) +void ov76_0223C438(UnkStruct_ov76_0223DE00 *param0, NARC *param1) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_D4.unk_08, param0->unk_D4.unk_0C, param1, 265, 1, 2, 45000); SpriteRenderer_LoadCellResObjFromOpenNarc(param0->unk_D4.unk_08, param0->unk_D4.unk_0C, param1, 173, 1, 47000); SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_D4.unk_08, param0->unk_D4.unk_0C, param1, 81, 1, 48000); } -void ov76_0223C4AC (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C4AC(UnkStruct_ov76_0223DE00 *param0) { int v0; SpriteTemplate v1; int v2[][3] = { - {136, 16, 1}, - {136, 128, 3}, - {240, 16, 0}, - {240, 128, 2}, + { 136, 16, 1 }, + { 136, 128, 3 }, + { 240, 16, 0 }, + { 240, 128, 2 }, }; for (v0 = 0; v0 < 4; v0++) { @@ -738,7 +747,7 @@ void ov76_0223C4AC (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223C544 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C544(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -751,7 +760,7 @@ void ov76_0223C544 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223C568 (UnkStruct_ov76_0223DE00 * param0, int param1) +void ov76_0223C568(UnkStruct_ov76_0223DE00 *param0, int param1) { int v0; @@ -760,7 +769,7 @@ void ov76_0223C568 (UnkStruct_ov76_0223DE00 * param0, int param1) } } -void ov76_0223C588 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C588(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -769,7 +778,7 @@ void ov76_0223C588 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223C5A4 (SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteData * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10) +void ov76_0223C5A4(SpriteRenderer *param0, SpriteGfxHandler *param1, PaletteData *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC *param10) { SpriteRenderer_LoadCharResObjFromOpenNarc(param0, param1, param10, param3, 1, param7, (param3 + 11000)); SpriteRenderer_LoadPalette(param2, param8, param0, param1, param10, param4, 0, param9, param7, (param4 + 11000)); @@ -777,7 +786,7 @@ void ov76_0223C5A4 (SpriteRenderer * param0, SpriteGfxHandler * param1, PaletteD SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param10, param6, 1, (param6 + 11000)); } -void ov76_0223C61C (UnkStruct_ov76_0223DE00 * param0, NARC * param1) +void ov76_0223C61C(UnkStruct_ov76_0223DE00 *param0, NARC *param1) { ov76_0223C5A4(param0->unk_D4.unk_08, param0->unk_D4.unk_0C, param0->unk_D4.unk_14, 266, 286, 174, 82, NNS_G2D_VRAM_TYPE_2DMAIN, 2, 1, param1); ov76_0223C5A4(param0->unk_D4.unk_08, param0->unk_D4.unk_0C, param0->unk_D4.unk_14, 275, 291, 179, 87, NNS_G2D_VRAM_TYPE_2DMAIN, 2, 1, param1); @@ -843,7 +852,7 @@ void ov76_0223C61C (UnkStruct_ov76_0223DE00 * param0, NARC * param1) } } -void ov76_0223C7E0 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C7E0(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -859,7 +868,7 @@ void ov76_0223C7E0 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223C80C (UnkStruct_ov76_0223DE00 * param0, int param1, int param2) +void ov76_0223C80C(UnkStruct_ov76_0223DE00 *param0, int param1, int param2) { int v0; int v1; @@ -891,7 +900,7 @@ void ov76_0223C80C (UnkStruct_ov76_0223DE00 * param0, int param1, int param2) ov76_0223C7E0(param0); } -void ov76_0223C88C (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C88C(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -903,7 +912,7 @@ void ov76_0223C88C (UnkStruct_ov76_0223DE00 * param0) sub_0200D330(param0->unk_2F4[1]); } -void ov76_0223C8BC (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223C8BC(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -915,7 +924,7 @@ void ov76_0223C8BC (UnkStruct_ov76_0223DE00 * param0) sub_0200D0F4(param0->unk_2F4[1]); } -void ov76_0223C8EC (BGL * param0, PaletteData * param1, int param2) +void ov76_0223C8EC(BGL *param0, PaletteData *param1, int param2) { sub_0200DD0C(param0, 1, 1, 15, param2, 53); PaletteSys_LoadPalette(param1, 38, sub_0200DD08(param2), 53, 0, 0x20, 12 * 16); @@ -924,7 +933,7 @@ void ov76_0223C8EC (BGL * param0, PaletteData * param1, int param2) PaletteSys_LoadPalette(param1, 14, 7, 53, 0, 0x20, 14 * 16); } -void ov76_0223C974 (BGL * param0, PaletteData * param1, int param2) +void ov76_0223C974(BGL *param0, PaletteData *param1, int param2) { sub_0200DD0C(param0, 4, 1, 15, param2, 53); PaletteSys_LoadPalette(param1, 38, sub_0200DD08(param2), 53, 1, 0x20, 12 * 16); @@ -935,10 +944,10 @@ void ov76_0223C974 (BGL * param0, PaletteData * param1, int param2) PaletteSys_LoadPalette(param1, 91, 294, 53, 1, 0x20, 11 * 16); } -void ov76_0223CA30 (Window * param0, int param1) +void ov76_0223CA30(Window *param0, int param1) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; if (param1 == 0xFFFF) { BGL_FillWindow(param0, 15); @@ -956,7 +965,7 @@ void ov76_0223CA30 (Window * param0, int param1) MessageLoader_Free(v0); } -void ov76_0223CA98 (BGL * param0, Window * param1, int param2, int param3, int param4, int param5, int param6, int param7) +void ov76_0223CA98(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7) { Window_Init(param1); BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, 14, param7); @@ -965,7 +974,7 @@ void ov76_0223CA98 (BGL * param0, Window * param1, int param2, int param3, int p sub_0201A954(param1); } -static void ov76_0223CAFC (BGL * param0, Window * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) +static void ov76_0223CAFC(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { Window_Init(param1); BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, param8, param7); @@ -973,26 +982,26 @@ static void ov76_0223CAFC (BGL * param0, Window * param1, int param2, int param3 sub_0201A954(param1); } -void ov76_0223CB58 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223CB58(UnkStruct_ov76_0223DE00 *param0) { - ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[3], 6, ((4 - 1)), 2, ((3 + 1)), 2, ((27 * 4) + (0 + ((1 + (18 + 12)) + 9))), 11); - ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[4], 6, ((11 - 1)), 2, ((3 + 1)), 2, ((((3 + 1)) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9)))), 11); - ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[5], 6, ((4 - 1)), 5, ((3 + 1)), 2, ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9))))), 11); - ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[6], 6, ((11 - 1)), 5, ((3 + 1)), 2, ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9)))))), 11); - ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[7], 6, ((4 - 1)), 8, ((3 + 1)), 2, ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9))))))), 11); - ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[8], 6, ((11 - 1)), 8, ((3 + 1)), 2, ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9)))))))), 11); - ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[9], 6, ((4 - 1)), 11, ((3 + 1)), 2, ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9))))))))), 11); - ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[10], 6, ((11 - 1)), 11, ((3 + 1)), 2, ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9)))))))))), 11); + ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[3], 6, (4 - 1), 2, (3 + 1), 2, ((27 * 4) + (0 + ((1 + (18 + 12)) + 9))), 11); + ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[4], 6, (11 - 1), 2, (3 + 1), 2, (((3 + 1) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9)))), 11); + ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[5], 6, (4 - 1), 5, (3 + 1), 2, (((3 + 1) * 2) + (((3 + 1) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9))))), 11); + ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[6], 6, (11 - 1), 5, (3 + 1), 2, (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9)))))), 11); + ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[7], 6, (4 - 1), 8, (3 + 1), 2, (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9))))))), 11); + ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[8], 6, (11 - 1), 8, (3 + 1), 2, (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9)))))))), 11); + ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[9], 6, (4 - 1), 11, (3 + 1), 2, (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9))))))))), 11); + ov76_0223CAFC(param0->unk_D4.unk_10, ¶m0->unk_D4.unk_18[10], 6, (11 - 1), 11, (3 + 1), 2, (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9)))))))))), 11); } -void ov76_0223CC8C (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223CC8C(UnkStruct_ov76_0223DE00 *param0) { int v0; int v1; int v2; int v3; - Strbuf* v4; - Window * v5; + Strbuf *v4; + Window *v5; for (v0 = 3; v0 < 11; v0++) { v5 = ¶m0->unk_D4.unk_18[v0]; @@ -1017,14 +1026,14 @@ void ov76_0223CC8C (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223CD20 (UnkStruct_ov76_0223DE00 * param0, int param1) +void ov76_0223CD20(UnkStruct_ov76_0223DE00 *param0, int param1) { int v0; int v1; int v2; int v3; - Strbuf* v4; - Window * v5; + Strbuf *v4; + Window *v5; v5 = ¶m0->unk_D4.unk_18[param1 + 3]; v1 = param1; @@ -1047,7 +1056,7 @@ void ov76_0223CD20 (UnkStruct_ov76_0223DE00 * param0, int param1) Strbuf_Free(v4); } -void ov76_0223CDA4 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223CDA4(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -1057,10 +1066,10 @@ void ov76_0223CDA4 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223CDC4 (Window * param0, int param1) +void ov76_0223CDC4(Window *param0, int param1) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; if (param1 == 0xFFFF) { BGL_FillWindow(param0, 15); @@ -1078,24 +1087,24 @@ void ov76_0223CDC4 (Window * param0, int param1) MessageLoader_Free(v0); } -void ov76_0223CE2C (void) +void ov76_0223CE2C(void) { GXLayers_TurnBothDispOn(); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -void ov76_0223CE44 (void) +void ov76_0223CE44(void) { sub_0200F174(0, 1, 1, 0x0, 6, 1, 53); } -void ov76_0223CE64 (void) +void ov76_0223CE64(void) { sub_0200F174(0, 0, 0, 0x0, 6, 1, 53); } -void ov76_0223CE84 (UnkStruct_ov76_0223DE00 * param0, NARC * param1) +void ov76_0223CE84(UnkStruct_ov76_0223DE00 *param0, NARC *param1) { int v0 = 91; int v1 = 268; @@ -1115,7 +1124,7 @@ void ov76_0223CE84 (UnkStruct_ov76_0223DE00 * param0, NARC * param1) sub_0200710C(param1, v2, param0->unk_D4.unk_10, v4, 0, 0, 1, 53); } -void ov76_0223CF24 (UnkStruct_ov76_0223DE00 * param0, NARC * param1) +void ov76_0223CF24(UnkStruct_ov76_0223DE00 *param0, NARC *param1) { int v0 = 91; int v1 = 267; @@ -1128,7 +1137,7 @@ void ov76_0223CF24 (UnkStruct_ov76_0223DE00 * param0, NARC * param1) PaletteSys_LoadPalette(param0->unk_D4.unk_14, v0, v3, 53, 1, 0x20 * 2, 0); } -void ov76_0223CF88 (UnkStruct_ov76_0223DE00 * param0, NARC * param1) +void ov76_0223CF88(UnkStruct_ov76_0223DE00 *param0, NARC *param1) { int v0 = 91; int v1 = 267; @@ -1141,11 +1150,11 @@ void ov76_0223CF88 (UnkStruct_ov76_0223DE00 * param0, NARC * param1) PaletteSys_LoadPalette(param0->unk_D4.unk_14, v0, v3, 53, 1, 0x20 * 2, 0); } -void ov76_0223CFEC (UnkStruct_ov76_0223DE00 * param0, NARC * param1) +void ov76_0223CFEC(UnkStruct_ov76_0223DE00 *param0, NARC *param1) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - PaletteData * v2; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + PaletteData *v2; v0 = param0->unk_D4.unk_08; v1 = param0->unk_D4.unk_0C; @@ -1166,14 +1175,14 @@ void ov76_0223CFEC (UnkStruct_ov76_0223DE00 * param0, NARC * param1) SpriteRenderer_LoadAnimResObjFromOpenNarc(v0, v1, param1, 84, 1, 28000 + 84); } -void ov76_0223D16C (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223D16C(UnkStruct_ov76_0223DE00 *param0) { int v0; - UnkStruct_ov76_0223BBAC * v1; + UnkStruct_ov76_0223BBAC *v1; SpriteTemplate v2; - SpriteRenderer * v3; - SpriteGfxHandler * v4; - PaletteData * v5; + SpriteRenderer *v3; + SpriteGfxHandler *v4; + PaletteData *v5; v3 = param0->unk_D4.unk_08; v4 = param0->unk_D4.unk_0C; @@ -1225,34 +1234,34 @@ void ov76_0223D16C (UnkStruct_ov76_0223DE00 * param0) { const s16 v6[][2] = { - {20, 23}, - {20, 47}, - {20, 71}, - {20, 95}, - {76, 23}, - {76, 47}, - {76, 71}, - {76, 95}, - {27, 124}, - {67, 124}, - {32, 171}, - {104, 171}, - {192, 171}, + { 20, 23 }, + { 20, 47 }, + { 20, 71 }, + { 20, 95 }, + { 76, 23 }, + { 76, 47 }, + { 76, 71 }, + { 76, 95 }, + { 27, 124 }, + { 67, 124 }, + { 32, 171 }, + { 104, 171 }, + { 192, 171 }, }; const s16 v7[][2] = { - {0xFF, 0xFF}, - {0xFF, 0xFF}, - {0xFF, 0xFF}, - {0xFF, 0xFF}, - {0xFF, 0xFF}, - {0xFF, 0xFF}, - {0xFF, 0xFF}, - {0xFF, 0xFF}, - {13, 10}, - {13, 10}, - {16, 12}, - {28, 12}, - {28, 12}, + { 0xFF, 0xFF }, + { 0xFF, 0xFF }, + { 0xFF, 0xFF }, + { 0xFF, 0xFF }, + { 0xFF, 0xFF }, + { 0xFF, 0xFF }, + { 0xFF, 0xFF }, + { 0xFF, 0xFF }, + { 13, 10 }, + { 13, 10 }, + { 16, 12 }, + { 28, 12 }, + { 28, 12 }, }; for (v0 = 8; v0 < 13; v0++) { @@ -1264,7 +1273,7 @@ void ov76_0223D16C (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223D2F4 (UnkStruct_ov76_0223DE00 * param0, int param1) +void ov76_0223D2F4(UnkStruct_ov76_0223DE00 *param0, int param1) { int v0; @@ -1277,7 +1286,7 @@ void ov76_0223D2F4 (UnkStruct_ov76_0223DE00 * param0, int param1) } } -void ov76_0223D318 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223D318(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -1286,7 +1295,7 @@ void ov76_0223D318 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223D31C (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223D31C(UnkStruct_ov76_0223DE00 *param0) { int v0; diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index 67b24c3f6f..1a1591808b 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -1,40 +1,45 @@ +#include "overlay076/ov76_0223D338.h" + #include #include -#include "core_sys.h" - -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/font_oam.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "pokemon.h" - -#include "overlay076/const_ov76_0223EF3C.h" - -#include "struct_defs/sprite_animation_frame.h" #include "struct_defs/archived_sprite.h" +#include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02015958.h" -#include "touch_screen.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0202CA64.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay012/ov12_02235E94.h" #include "overlay012/struct_ov12_02236030.h" #include "overlay012/struct_ov12_02237728.h" -#include "overlay076/struct_ov76_0223BF74.h" +#include "overlay076/const_ov76_0223EF3C.h" #include "overlay076/funcptr_ov76_0223D674.h" +#include "overlay076/ov76_0223B140.h" +#include "overlay076/ov76_0223B870.h" +#include "overlay076/struct_ov76_0223BF74.h" #include "overlay076/struct_ov76_0223DE00.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "narc.h" +#include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02001AF4.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_0200762C.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02012744.h" @@ -42,44 +47,37 @@ #include "unk_02015920.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_02023FCC.h" #include "unk_0202C9F4.h" #include "unk_0202CD50.h" -#include "pokemon.h" #include "unk_02097B18.h" -#include "overlay012/ov12_02235E94.h" -#include "overlay076/ov76_0223B140.h" -#include "overlay076/ov76_0223B870.h" -#include "overlay076/ov76_0223D338.h" typedef struct { int unk_00; - CellActorData * unk_04; - FontOAM * unk_08; + CellActorData *unk_04; + FontOAM *unk_08; } UnkStruct_ov76_0223D9AC; -static BOOL ov76_0223D674(UnkStruct_ov76_0223DE00 * param0); -static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 * param0); -static BOOL ov76_0223E8A4(UnkStruct_ov76_0223DE00 * param0); -static BOOL ov76_0223E950(UnkStruct_ov76_0223DE00 * param0); -static BOOL ov76_0223E9C4(UnkStruct_ov76_0223DE00 * param0); -static BOOL ov76_0223EB1C(UnkStruct_ov76_0223DE00 * param0); +static BOOL ov76_0223D674(UnkStruct_ov76_0223DE00 *param0); +static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0); +static BOOL ov76_0223E8A4(UnkStruct_ov76_0223DE00 *param0); +static BOOL ov76_0223E950(UnkStruct_ov76_0223DE00 *param0); +static BOOL ov76_0223E9C4(UnkStruct_ov76_0223DE00 *param0); +static BOOL ov76_0223EB1C(UnkStruct_ov76_0223DE00 *param0); -void ov76_0223D338 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223D338(UnkStruct_ov76_0223DE00 *param0) { sub_0202CA10(param0->unk_04[param0->unk_3C4[0]].unk_04, ¶m0->unk_68); } -void ov76_0223D350 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223D350(UnkStruct_ov76_0223DE00 *param0) { sub_0202CA10(¶m0->unk_68, param0->unk_04[param0->unk_3C4[0]].unk_04); } -void ov76_0223D368 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223D368(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -88,7 +86,7 @@ void ov76_0223D368 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223D384 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223D384(UnkStruct_ov76_0223DE00 *param0) { int v0; @@ -97,17 +95,17 @@ void ov76_0223D384 (UnkStruct_ov76_0223DE00 * param0) } } -void ov76_0223D3A0 (void) +void ov76_0223D3A0(void) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2, 11, 7); G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8); } -void ov76_0223D3CC (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223D3CC(UnkStruct_ov76_0223DE00 *param0) { int v0; int v1; - Pokemon * v2; + Pokemon *v2; if (param0->unk_04[param0->unk_3C4[0]].unk_00 != 0xff) { v2 = param0->unk_00->unk_04[param0->unk_04[param0->unk_3C4[0]].unk_00]; @@ -129,12 +127,12 @@ void ov76_0223D3CC (UnkStruct_ov76_0223DE00 * param0) } } -int ov76_0223D430 (UnkStruct_0202CA28 * param0) +int ov76_0223D430(UnkStruct_0202CA28 *param0) { int v0; int v1 = 0; int v2; - UnkStruct_0202CA64 * v3; + UnkStruct_0202CA64 *v3; v2 = 0; @@ -153,7 +151,7 @@ int ov76_0223D430 (UnkStruct_0202CA28 * param0) return v1; } -int ov76_0223D45C (UnkStruct_ov76_0223DE00 * param0, int param1) +int ov76_0223D45C(UnkStruct_ov76_0223DE00 *param0, int param1) { int v0; int v1; @@ -175,7 +173,7 @@ int ov76_0223D45C (UnkStruct_ov76_0223DE00 * param0, int param1) return v2; } -static void ov76_0223D494 (UnkStruct_ov76_0223DE00 * param0, int param1, int param2, int param3) +static void ov76_0223D494(UnkStruct_ov76_0223DE00 *param0, int param1, int param2, int param3) { if (param2 == 0xff) { param0->unk_3D4 = param0->unk_3D8; @@ -188,7 +186,7 @@ static void ov76_0223D494 (UnkStruct_ov76_0223DE00 * param0, int param1, int par param0->unk_3DC = 0; } -static int ov76_0223D4C4 (UnkStruct_ov76_0223DE00 * param0) +static int ov76_0223D4C4(UnkStruct_ov76_0223DE00 *param0) { Window_Clear(¶m0->unk_D4.unk_18[1], 1); sub_0201ACF4(¶m0->unk_D4.unk_18[1]); @@ -199,13 +197,13 @@ static int ov76_0223D4C4 (UnkStruct_ov76_0223DE00 * param0) return 1; } -static int ov76_0223D4FC (UnkStruct_ov76_0223DE00 * param0) +static int ov76_0223D4FC(UnkStruct_ov76_0223DE00 *param0) { ov76_0223D494(param0, 1, 0, 3); return 0; } -static int ov76_0223D50C (UnkStruct_ov76_0223DE00 * param0) +static int ov76_0223D50C(UnkStruct_ov76_0223DE00 *param0) { ov76_0223B400(param0); ov76_0223B808(param0); @@ -215,27 +213,27 @@ static int ov76_0223D50C (UnkStruct_ov76_0223DE00 * param0) return 0; } -static int ov76_0223D530 (UnkStruct_ov76_0223DE00 * param0) +static int ov76_0223D530(UnkStruct_ov76_0223DE00 *param0) { ov76_0223D494(param0, 3, 0, 3); return 0; } -static int ov76_0223D540 (UnkStruct_ov76_0223DE00 * param0) +static int ov76_0223D540(UnkStruct_ov76_0223DE00 *param0) { ov76_0223D494(param0, 4, 0, 3); return 0; } const UnkStruct_ov76_0223BF74 Unk_ov76_0223EF3C[] = { - {0, (const u32)ov76_0223D4FC}, - {1, (const u32)ov76_0223D4C4}, - {2, (const u32)ov76_0223D50C}, - {3, (const u32)ov76_0223D530}, - {4, (const u32)ov76_0223D540}, + { 0, (const u32)ov76_0223D4FC }, + { 1, (const u32)ov76_0223D4C4 }, + { 2, (const u32)ov76_0223D50C }, + { 3, (const u32)ov76_0223D530 }, + { 4, (const u32)ov76_0223D540 }, }; -static BOOL(*const Unk_ov76_0223EE04[])(UnkStruct_ov76_0223DE00 * cbmw) = { +static BOOL (*const Unk_ov76_0223EE04[])(UnkStruct_ov76_0223DE00 *cbmw) = { ov76_0223D674, ov76_0223DF94, ov76_0223E8A4, @@ -244,7 +242,7 @@ static BOOL(*const Unk_ov76_0223EE04[])(UnkStruct_ov76_0223DE00 * cbmw) = { ov76_0223EB1C, }; -BOOL ov76_0223D550 (UnkStruct_ov76_0223DE00 * param0) +BOOL ov76_0223D550(UnkStruct_ov76_0223DE00 *param0) { BOOL v0; @@ -254,9 +252,9 @@ BOOL ov76_0223D550 (UnkStruct_ov76_0223DE00 * param0) return v0; } -static BOOL ov76_0223D574 (int * param0) +static BOOL ov76_0223D574(int *param0) { - int * v0 = param0; + int *v0 = param0; if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) { (*v0)++; @@ -288,7 +286,7 @@ static BOOL ov76_0223D574 (int * param0) return 1; } -static void ov76_0223D600 (UnkStruct_ov76_0223DE00 * param0, int param1, BOOL param2) +static void ov76_0223D600(UnkStruct_ov76_0223DE00 *param0, int param1, BOOL param2) { s16 v0, v1; int v2 = 0; @@ -307,12 +305,11 @@ static void ov76_0223D600 (UnkStruct_ov76_0223DE00 * param0, int param1, BOOL pa } } -static BOOL ov76_0223D674 (UnkStruct_ov76_0223DE00 * param0) +static BOOL ov76_0223D674(UnkStruct_ov76_0223DE00 *param0) { switch (param0->unk_3D4) { - case 0: - { - NARC * v0; + case 0: { + NARC *v0; v0 = NARC_ctor(NARC_INDEX_APPLICATION__CUSTOM_BALL__DATA__CB_DATA, 53); @@ -362,8 +359,7 @@ static BOOL ov76_0223D674 (UnkStruct_ov76_0223DE00 * param0) param0->unk_3D4++; - case 3: - { + case 3: { BOOL v1; int v2; int v3; @@ -401,10 +397,8 @@ static BOOL ov76_0223D674 (UnkStruct_ov76_0223DE00 * param0) param0->unk_3D4 = 5; Sound_PlayEffect(1501); } - } - break; - case 4: - { + } break; + case 4: { UnkFuncPtr_ov76_0223D674 v4; u32 v5 = sub_02001BE0(param0->unk_D4.unk_CC); @@ -432,8 +426,7 @@ static BOOL ov76_0223D674 (UnkStruct_ov76_0223DE00 * param0) } break; } - } - break; + } break; case 5: ov76_0223CE64(); param0->unk_3D4++; @@ -458,7 +451,7 @@ static BOOL ov76_0223D674 (UnkStruct_ov76_0223DE00 * param0) return 1; } -void ov76_0223D94C (CellActorData * param0, int param1) +void ov76_0223D94C(CellActorData *param0, int param1) { switch (param1) { case 0: @@ -477,7 +470,7 @@ void ov76_0223D94C (CellActorData * param0, int param1) } } -static void ov76_0223D984 (FontOAM * param0, int param1, int param2) +static void ov76_0223D984(FontOAM *param0, int param1, int param2) { int v0; int v1; @@ -488,9 +481,9 @@ static void ov76_0223D984 (FontOAM * param0, int param1, int param2) } } -static void ov76_0223D9AC (SysTask * param0, void * param1) +static void ov76_0223D9AC(SysTask *param0, void *param1) { - UnkStruct_ov76_0223D9AC * v0 = param1; + UnkStruct_ov76_0223D9AC *v0 = param1; switch (v0->unk_00) { case 3: @@ -510,9 +503,9 @@ static void ov76_0223D9AC (SysTask * param0, void * param1) } } -static void ov76_0223DA00 (CellActorData * param0, FontOAM * param1) +static void ov76_0223DA00(CellActorData *param0, FontOAM *param1) { - UnkStruct_ov76_0223D9AC * v0; + UnkStruct_ov76_0223D9AC *v0; v0 = Heap_AllocFromHeap(53, sizeof(UnkStruct_ov76_0223D9AC)); @@ -524,9 +517,9 @@ static void ov76_0223DA00 (CellActorData * param0, FontOAM * param1) SysTask_Start(ov76_0223D9AC, v0, 1000); } -void ov76_0223DA34 (u32 param0, u32 param1, void * param2) +void ov76_0223DA34(u32 param0, u32 param1, void *param2) { - UnkStruct_ov76_0223DE00 * v0 = (UnkStruct_ov76_0223DE00 *)param2; + UnkStruct_ov76_0223DE00 *v0 = (UnkStruct_ov76_0223DE00 *)param2; if (v0->unk_D4.unk_04 == 0) { return; @@ -610,8 +603,7 @@ void ov76_0223DA34 (u32 param0, u32 param1, void * param2) case 4: case 5: case 6: - case 7: - { + case 7: { int v1; if (param1 == 0) { @@ -635,8 +627,7 @@ void ov76_0223DA34 (u32 param0, u32 param1, void * param2) } } } - } - break; + } break; case 13: case 14: case 15: @@ -644,8 +635,7 @@ void ov76_0223DA34 (u32 param0, u32 param1, void * param2) case 17: case 18: case 19: - case 20: - { + case 20: { int v2; int v3; @@ -657,50 +647,49 @@ void ov76_0223DA34 (u32 param0, u32 param1, void * param2) ov76_0223CDC4(&v0->unk_D4.unk_18[0], v3); Sound_PlayEffect(1515); } - } - break; + } break; default: GF_ASSERT(0); break; } } -BOOL ov76_0223DCB0 (UnkStruct_ov76_0223DE00 * param0) +BOOL ov76_0223DCB0(UnkStruct_ov76_0223DE00 *param0) { return param0->unk_D4.unk_184; } -void ov76_0223DCB8 (UnkStruct_ov76_0223DE00 * param0, BOOL param1) +void ov76_0223DCB8(UnkStruct_ov76_0223DE00 *param0, BOOL param1) { param0->unk_D4.unk_04 = param1; } static const TouchScreenRect Unk_ov76_0223EE44[] = { - {16, 32, 8, 24}, - {16, 32, 64, 80}, - {40, 56, 8, 24}, - {40, 56, 64, 80}, - {64, 80, 8, 24}, - {64, 80, 64, 80}, - {88, 104, 8, 24}, - {88, 104, 64, 80}, - {104, 128, 8, 48}, - {104, 128, 56, 96}, - {168, 188, 18, 77}, - {168, 188, 97, 156}, - {168, 188, 178, 237}, + { 16, 32, 8, 24 }, + { 16, 32, 64, 80 }, + { 40, 56, 8, 24 }, + { 40, 56, 64, 80 }, + { 64, 80, 8, 24 }, + { 64, 80, 64, 80 }, + { 88, 104, 8, 24 }, + { 88, 104, 64, 80 }, + { 104, 128, 8, 48 }, + { 104, 128, 56, 96 }, + { 168, 188, 18, 77 }, + { 168, 188, 97, 156 }, + { 168, 188, 178, 237 }, }; -void ov76_0223DCC0 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223DCC0(UnkStruct_ov76_0223DE00 *param0) { int v0; - const TouchScreenRect v1 = {0, 0, 0, 0}; + const TouchScreenRect v1 = { 0, 0, 0, 0 }; for (v0 = 0; v0 < 13; v0++) { param0->unk_D4.unk_FC[v0] = Unk_ov76_0223EE44[v0]; } - for ( ; v0 < 21; v0++) { + for (; v0 < 21; v0++) { param0->unk_D4.unk_FC[v0] = v1; param0->unk_324[v0 - 13].unk_0C = ¶m0->unk_D4.unk_FC[v0]; } @@ -708,7 +697,7 @@ void ov76_0223DCC0 (UnkStruct_ov76_0223DE00 * param0) param0->unk_D4.unk_F8 = sub_02023FCC(param0->unk_D4.unk_FC, 21, ov76_0223DA34, param0, 53); } -void ov76_0223DD88 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223DD88(UnkStruct_ov76_0223DE00 *param0) { ArchivedSprite v0; SpriteAnimationFrame v1[10]; @@ -725,7 +714,7 @@ void ov76_0223DD88 (UnkStruct_ov76_0223DE00 * param0) param0->unk_D4.unk_D4 = sub_02007C34(param0->unk_D4.unk_D0, &v0, (256 - 64), 48 + v3, -0x280, 0, &v1[0], NULL); } -static void ov76_0223DE00 (UnkStruct_ov76_0223DE00 * param0) +static void ov76_0223DE00(UnkStruct_ov76_0223DE00 *param0) { int v0; int v1; @@ -737,13 +726,13 @@ static void ov76_0223DE00 (UnkStruct_ov76_0223DE00 * param0) PokeSprite_LoadAnimation(param0->unk_42C, param0->unk_D4.unk_188, param0->unk_D4.unk_D4, v0, 2, 0, 0); } -static void ov76_0223DE54 (UnkStruct_ov76_0223DE00 * param0) +static void ov76_0223DE54(UnkStruct_ov76_0223DE00 *param0) { sub_02007DEC(param0->unk_D4.unk_D4, 12, 0x0); sub_02007DEC(param0->unk_D4.unk_D4, 13, 0x0); } -static BOOL ov76_0223DE78 (UnkStruct_ov76_0223DE00 * param0) +static BOOL ov76_0223DE78(UnkStruct_ov76_0223DE00 *param0) { if (sub_020080C0(param0->unk_D4.unk_D4, 12) == 0x100) { return 0; @@ -760,7 +749,7 @@ static BOOL ov76_0223DE78 (UnkStruct_ov76_0223DE00 * param0) return 1; } -static BOOL ov76_0223DEF4 (UnkStruct_ov76_0223DE00 * param0) +static BOOL ov76_0223DEF4(UnkStruct_ov76_0223DE00 *param0) { if (sub_020080C0(param0->unk_D4.unk_D4, 12) == 0x0) { return 0; @@ -777,17 +766,17 @@ static BOOL ov76_0223DEF4 (UnkStruct_ov76_0223DE00 * param0) return 1; } -void ov76_0223DF70 (UnkStruct_ov76_0223DE00 * param0, int param1) +void ov76_0223DF70(UnkStruct_ov76_0223DE00 *param0, int param1) { sub_02007DEC(param0->unk_D4.unk_D4, 6, param1); } -void ov76_0223DF84 (UnkStruct_ov76_0223DE00 * param0) +void ov76_0223DF84(UnkStruct_ov76_0223DE00 *param0) { sub_02007DC8(param0->unk_D4.unk_D4); } -static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) +static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0) { switch (param0->unk_3D4) { case 0: @@ -833,8 +822,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) break; case 4: break; - case 5: - { + case 5: { switch (param0->unk_3DC) { case 0: GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -870,11 +858,10 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) param0->unk_3DC++; } break; - case 2: - { + case 2: { int v1; UnkStruct_0202CA28 v2; - UnkStruct_ov12_02236030 v3 = {0}; + UnkStruct_ov12_02236030 v3 = { 0 }; v3.unk_00 = 1; v3.unk_08 = param0->unk_428; @@ -904,8 +891,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) param0->unk_3DC++; } break; - case 4: - { + case 4: { BOOL v4 = ov76_0223DE78(param0); if (ov12_022377F8(param0->unk_D4.unk_158) != 0) { @@ -919,8 +905,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) param0->unk_3E0 = 0; param0->unk_3DC++; } - } - break; + } break; case 5: if (ov12_022363C4(param0->unk_D4.unk_154) != 0) { break; @@ -964,8 +949,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) param0->unk_3DC++; } break; - case 7: - { + case 7: { BOOL v6 = ov76_0223DEF4(param0); if ((ov12_022377F8(param0->unk_D4.unk_158) == 0) && (v6 == 0)) { @@ -976,8 +960,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) ov12_0223783C(param0->unk_D4.unk_158); param0->unk_3DC++; } - } - break; + } break; default: if (sub_0200384C(param0->unk_D4.unk_14) != 0) { break; @@ -990,8 +973,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) ov76_0223CA30(¶m0->unk_D4.unk_18[0], 0xFFFF); break; } - } - break; + } break; case 6: ov76_0223CA30(¶m0->unk_D4.unk_18[0], 12); @@ -1002,14 +984,14 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) ov76_0223B808(param0); ov76_0223C7E0(param0); { - UnkStruct_0202CD88 * v7; + UnkStruct_0202CD88 *v7; v7 = sub_0202CD88(param0->unk_00->unk_28); sub_0202CFEC(v7, 6); } { - Pokemon * v8; + Pokemon *v8; if (param0->unk_264[param0->unk_3C4[0]].unk_00 != 0xff) { v8 = param0->unk_00->unk_04[param0->unk_264[param0->unk_3C4[0]].unk_00]; @@ -1019,8 +1001,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) } param0->unk_3D4 = 8; break; - case 7: - { + case 7: { switch (param0->unk_3DC) { case 0: if (ov76_0223B78C(param0) == 0) { @@ -1047,7 +1028,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) v9.unk_00 = param0->unk_D4.unk_10; v9.unk_04 = 4; - v9.unk_08 = (((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((((3 + 1)) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9)))))))))))); + v9.unk_08 = (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + (((3 + 1) * 2) + ((27 * 4) + (0 + ((1 + (18 + 12)) + 9))))))))))); v9.unk_0C = 5; v9.unk_10 = 25; v9.unk_11 = 6; @@ -1062,8 +1043,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) case 2: GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); param0->unk_3DC++; - case 3: - { + case 3: { u32 v10; v10 = sub_020159FC(param0->unk_D4.unk_150); @@ -1083,8 +1063,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) default: break; } - } - break; + } break; case 4: sub_02003178(param0->unk_D4.unk_14, 0x2, (1 << 0) | (1 << 1) | (1 << 3) | (1 << 11), 0, 10, 0, 0); sub_02003178(param0->unk_D4.unk_14, 0x8, 0xFFFF, 0, 10, 0, 0); @@ -1116,8 +1095,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) ov76_0223DCB8(param0, 1); param0->unk_3DC = 0; } - } - break; + } break; case 8: GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); sub_02003178(param0->unk_D4.unk_14, 0x1, (1 << 1), 0, 0, 16, 0); @@ -1202,7 +1180,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) return 1; } -static BOOL ov76_0223E8A4 (UnkStruct_ov76_0223DE00 * param0) +static BOOL ov76_0223E8A4(UnkStruct_ov76_0223DE00 *param0) { switch (param0->unk_3D4) { case 0: @@ -1233,7 +1211,7 @@ static BOOL ov76_0223E8A4 (UnkStruct_ov76_0223DE00 * param0) return 1; } -void ov76_0223E91C (UnkStruct_ov76_0223DE00 * param0, int param1) +void ov76_0223E91C(UnkStruct_ov76_0223DE00 *param0, int param1) { int v0; int v1; @@ -1250,7 +1228,7 @@ void ov76_0223E91C (UnkStruct_ov76_0223DE00 * param0, int param1) ov76_0223C7E0(param0); } -static BOOL ov76_0223E950 (UnkStruct_ov76_0223DE00 * param0) +static BOOL ov76_0223E950(UnkStruct_ov76_0223DE00 *param0) { switch (param0->unk_3D4) { case 0: @@ -1275,7 +1253,7 @@ static BOOL ov76_0223E950 (UnkStruct_ov76_0223DE00 * param0) return 1; } -static BOOL ov76_0223E9C4 (UnkStruct_ov76_0223DE00 * param0) +static BOOL ov76_0223E9C4(UnkStruct_ov76_0223DE00 *param0) { switch (param0->unk_3D4) { case 0: @@ -1285,8 +1263,7 @@ static BOOL ov76_0223E9C4 (UnkStruct_ov76_0223DE00 * param0) ov76_0223CA30(¶m0->unk_D4.unk_18[0], 10); SpriteActor_EnableObject(param0->unk_2F4[1], 1); param0->unk_3D4++; - case 1: - { + case 1: { BOOL v0; v0 = ov76_0223D574(&(param0->unk_3C4[1])); @@ -1307,8 +1284,7 @@ static BOOL ov76_0223E9C4 (UnkStruct_ov76_0223DE00 * param0) param0->unk_3D4 = 3; Sound_PlayEffect(1501); } - } - break; + } break; case 2: if (gCoreSys.pressedKeys & (0x1 | 0x2 | 0x400 | 0x800 | 0x40 | 0x80 | 0x20 | 0x10)) { param0->unk_3D4 = 3; @@ -1329,12 +1305,12 @@ static BOOL ov76_0223E9C4 (UnkStruct_ov76_0223DE00 * param0) return 1; } -static BOOL ov76_0223EB1C (UnkStruct_ov76_0223DE00 * param0) +static BOOL ov76_0223EB1C(UnkStruct_ov76_0223DE00 *param0) { return 0; } -void ov76_0223EB20 (int param0) +void ov76_0223EB20(int param0) { SetMainCallback(NULL, NULL); DisableHBlank(); @@ -1345,13 +1321,13 @@ void ov76_0223EB20 (int param0) GXS_SetVisiblePlane(0); } -void ov76_0223EB54 (int param0) +void ov76_0223EB54(int param0) { SetMainCallback(NULL, NULL); DisableHBlank(); } -void ov76_0223EB64 (BGL * param0) +void ov76_0223EB64(BGL *param0) { GXLayers_DisableEngineALayers(); @@ -1403,7 +1379,7 @@ void ov76_0223EB64 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -1418,7 +1394,7 @@ void ov76_0223EB64 (BGL * param0) 2, 0, 0, - 0 + 0, }, { 0, @@ -1433,7 +1409,7 @@ void ov76_0223EB64 (BGL * param0) 3, 0, 0, - 0 + 0, }, }; @@ -1450,8 +1426,7 @@ void ov76_0223EB64 (BGL * param0) { UnkStruct_ov97_0222DB78 v3[] = { - { - 0, + { 0, 0, 0x800, 0, @@ -1463,10 +1438,8 @@ void ov76_0223EB64 (BGL * param0) 0, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -1478,10 +1451,8 @@ void ov76_0223EB64 (BGL * param0) 2, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -1493,10 +1464,8 @@ void ov76_0223EB64 (BGL * param0) 1, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -1508,8 +1477,7 @@ void ov76_0223EB64 (BGL * param0) 3, 0, 0, - 0 - }, + 0 }, }; sub_020183C4(param0, 4, &v3[0], 0); @@ -1524,9 +1492,9 @@ void ov76_0223EB64 (BGL * param0) } } -void ov76_0223ECB0 (void * param0) +void ov76_0223ECB0(void *param0) { - UnkStruct_ov76_0223DE00 * v0 = param0; + UnkStruct_ov76_0223DE00 *v0 = param0; sub_02008A94(v0->unk_D4.unk_D0); sub_0201DCAC(); diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c index f886dc149d..c75885137e 100644 --- a/src/overlay077/ov77_021D0D80.c +++ b/src/overlay077/ov77_021D0D80.c @@ -1,47 +1,43 @@ #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - -#include "overlay077/const_ov77_021D742C.h" - #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017248.h" #include "struct_defs/struct_02017294.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" +#include "overlay077/const_ov77_021D742C.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" #include "unk_02000C88.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200F174.h" #include "unk_020170BC.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201C970.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201E190.h" -#include "gx_layers.h" -#include "camera.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_02024220.h" @@ -53,18 +49,18 @@ FS_EXTERN_OVERLAY(d_startmenu); typedef struct { int unk_00; NNSG3dRenderObj unk_04; - NNSG3dResMdl * unk_58; - NNSG3dResFileHeader * unk_5C; - void * unk_60; - void * unk_64; - NNSG3dAnmObj * unk_68; - NNSG3dAnmObj * unk_6C; + NNSG3dResMdl *unk_58; + NNSG3dResFileHeader *unk_5C; + void *unk_60; + void *unk_64; + NNSG3dAnmObj *unk_68; + NNSG3dAnmObj *unk_6C; NNSFndAllocator unk_70; VecFx32 unk_80; VecFx32 unk_8C; VecFx32 unk_98; - Camera * camera1; - Camera * camera2; + Camera *camera1; + Camera *camera2; int unk_AC; UnkStruct_02017294 unk_B0; UnkStruct_02017248 unk_128; @@ -114,8 +110,8 @@ typedef struct { typedef struct { int unk_00; - BGL * unk_04; - GenericPointerData * unk_08; + BGL *unk_04; + GenericPointerData *unk_08; UnkStruct_ov77_021D17B4_sub1 unk_0C; UnkStruct_ov77_021D1568 unk_238; u16 unk_4E8; @@ -126,39 +122,38 @@ typedef struct { int unk_4FC; } UnkStruct_ov77_021D17B4; - extern const OverlayManagerTemplate Unk_020F8A48; extern const OverlayManagerTemplate Unk_020F8AB4; extern const OverlayManagerTemplate Unk_ov77_021D788C; -static void ov77_021D1D48(BGL * param0, int param1); -void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate * param1); -static int ov77_021D0D80(OverlayManager * param0, int * param1); -static int ov77_021D0E3C(OverlayManager * param0, int * param1); -static int ov77_021D10FC(OverlayManager * param0, int * param1); -static void ov77_021D1178(void * param0); +static void ov77_021D1D48(BGL *param0, int param1); +void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); +static int ov77_021D0D80(OverlayManager *param0, int *param1); +static int ov77_021D0E3C(OverlayManager *param0, int *param1); +static int ov77_021D10FC(OverlayManager *param0, int *param1); +static void ov77_021D1178(void *param0); static void ov77_021D1184(void); -static void ov77_021D17B4(UnkStruct_ov77_021D17B4 * param0); -static void ov77_021D1908(UnkStruct_ov77_021D17B4 * param0); -static void ov77_021D11CC(UnkStruct_ov77_021D17B4 * param0); -static void ov77_021D11FC(UnkStruct_ov77_021D17B4 * param0); -static void ov77_021D1208(UnkStruct_ov77_021D1208 * param0, int param1, int param2, int param3); -static void ov77_021D14E4(UnkStruct_ov77_021D1208 * param0); -static void ov77_021D1568(UnkStruct_ov77_021D1568 * param0, UnkStruct_ov77_021D1208 * param1); +static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0); +static void ov77_021D1908(UnkStruct_ov77_021D17B4 *param0); +static void ov77_021D11CC(UnkStruct_ov77_021D17B4 *param0); +static void ov77_021D11FC(UnkStruct_ov77_021D17B4 *param0); +static void ov77_021D1208(UnkStruct_ov77_021D1208 *param0, int param1, int param2, int param3); +static void ov77_021D14E4(UnkStruct_ov77_021D1208 *param0); +static void ov77_021D1568(UnkStruct_ov77_021D1568 *param0, UnkStruct_ov77_021D1208 *param1); static BOOL ov77_021D11A4(void); -static BOOL ov77_021D1A60(UnkStruct_ov77_021D1568 * param0, BGL * param1, int param2); -static BOOL ov77_021D1DF0(UnkStruct_ov77_021D1568 * param0, BGL * param1, int param2); -static BOOL ov77_021D20E4(UnkStruct_ov77_021D1568 * param0, BGL * param1, int param2); -static BOOL ov77_021D21C0(UnkStruct_ov77_021D1568 * param0, BGL * param1, int param2); -static void ov77_021D1300(UnkStruct_ov77_021D1208 * param0, int param1); -static void ov77_021D1514(UnkStruct_ov77_021D1208 * param0); -static void ov77_021D1704(UnkStruct_ov77_021D1208 * param0); -static void ov77_021D1984(UnkStruct_ov77_021D1568 * param0, UnkStruct_ov77_021D1208 * param1); -static void ov77_021D25AC(Camera * camera); -static void ov77_021D2214(BGL * param0, int param1, UnkStruct_ov77_021D1568 * param2); -static void ov77_021D2428(BGL * param0, int param1, UnkStruct_ov77_021D1568 * param2); -static void ov77_021D24C8(UnkStruct_ov77_021D1568 * param0); -static void ov77_021D2438(UnkStruct_ov77_021D1568 * param0); +static BOOL ov77_021D1A60(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2); +static BOOL ov77_021D1DF0(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2); +static BOOL ov77_021D20E4(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2); +static BOOL ov77_021D21C0(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2); +static void ov77_021D1300(UnkStruct_ov77_021D1208 *param0, int param1); +static void ov77_021D1514(UnkStruct_ov77_021D1208 *param0); +static void ov77_021D1704(UnkStruct_ov77_021D1208 *param0); +static void ov77_021D1984(UnkStruct_ov77_021D1568 *param0, UnkStruct_ov77_021D1208 *param1); +static void ov77_021D25AC(Camera *camera); +static void ov77_021D2214(BGL *param0, int param1, UnkStruct_ov77_021D1568 *param2); +static void ov77_021D2428(BGL *param0, int param1, UnkStruct_ov77_021D1568 *param2); +static void ov77_021D24C8(UnkStruct_ov77_021D1568 *param0); +static void ov77_021D2438(UnkStruct_ov77_021D1568 *param0); const OverlayManagerTemplate Unk_ov77_021D742C = { ov77_021D0D80, @@ -167,9 +162,9 @@ const OverlayManagerTemplate Unk_ov77_021D742C = { 0xffffffff }; -static int ov77_021D0D80 (OverlayManager * param0, int * param1) +static int ov77_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov77_021D17B4 * v0; + UnkStruct_ov77_021D17B4 *v0; int v1; v1 = 30; @@ -209,9 +204,9 @@ static int ov77_021D0D80 (OverlayManager * param0, int * param1) return 1; } -static int ov77_021D0E3C (OverlayManager * param0, int * param1) +static int ov77_021D0E3C(OverlayManager *param0, int *param1) { - UnkStruct_ov77_021D17B4 * v0 = OverlayManager_Data(param0); + UnkStruct_ov77_021D17B4 *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -265,7 +260,7 @@ static int ov77_021D0E3C (OverlayManager * param0, int * param1) break; } - if (((gCoreSys.heldKeys & (PAD_BUTTON_B | PAD_KEY_UP | PAD_BUTTON_SELECT)) == (PAD_BUTTON_B | PAD_KEY_UP | PAD_BUTTON_SELECT))) { + if ((gCoreSys.heldKeys & (PAD_BUTTON_B | PAD_KEY_UP | PAD_BUTTON_SELECT)) == (PAD_BUTTON_B | PAD_KEY_UP | PAD_BUTTON_SELECT)) { v0->unk_4E8 = 2; sub_0200F174(0, 0, 0, 0x0, 6, 1, v0->unk_00); *param1 = 6; @@ -275,7 +270,9 @@ static int ov77_021D0E3C (OverlayManager * param0, int * param1) if (v0->unk_4F8 > 30 * 30) { v0->unk_4E8 = 3; gCoreSys.unk_6C = 1; - {GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0);} + { + GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); + } sub_0200564C(0, 60); *param1 = 5; break; @@ -326,9 +323,9 @@ static int ov77_021D0E3C (OverlayManager * param0, int * param1) return 0; } -static int ov77_021D10FC (OverlayManager * param0, int * param1) +static int ov77_021D10FC(OverlayManager *param0, int *param1) { - UnkStruct_ov77_021D17B4 * v0 = OverlayManager_Data(param0); + UnkStruct_ov77_021D17B4 *v0 = OverlayManager_Data(param0); int v1 = v0->unk_00; int v2 = v0->unk_4E8; @@ -357,13 +354,13 @@ static int ov77_021D10FC (OverlayManager * param0, int * param1) return 1; } -static void ov77_021D1178 (void * param0) +static void ov77_021D1178(void *param0) { - UnkStruct_ov77_021D17B4 * v0 = param0; + UnkStruct_ov77_021D17B4 *v0 = param0; sub_0201C2B8(v0->unk_04); } -static void ov77_021D1184 (void) +static void ov77_021D1184(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -381,7 +378,7 @@ static void ov77_021D1184 (void) GXLayers_SetBanks(&v0); } -static BOOL ov77_021D11A4 (void) +static BOOL ov77_021D11A4(void) { if (((gCoreSys.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gCoreSys.pressedKeys & PAD_BUTTON_START) == PAD_BUTTON_START) || ((gCoreSys.pressedKeys & PAD_BUTTON_SELECT) == PAD_BUTTON_SELECT)) { return 1; @@ -390,22 +387,22 @@ static BOOL ov77_021D11A4 (void) return 0; } -static void ov77_021D11CC (UnkStruct_ov77_021D17B4 * param0) +static void ov77_021D11CC(UnkStruct_ov77_021D17B4 *param0) { param0->unk_08 = sub_02024220(param0->unk_00, 0, 1, 0, 4, NULL); G2_SetBG0Priority(1); } -static void ov77_021D11FC (UnkStruct_ov77_021D17B4 * param0) +static void ov77_021D11FC(UnkStruct_ov77_021D17B4 *param0) { sub_020242C4(param0->unk_08); } -static void ov77_021D1208 (UnkStruct_ov77_021D1208 * param0, int param1, int param2, int param3) +static void ov77_021D1208(UnkStruct_ov77_021D1208 *param0, int param1, int param2, int param3) { - void * v0; - void * v1; - NNSG3dResTex * v2; + void *v0; + void *v1; + NNSG3dResTex *v2; Heap_FndInitAllocatorForExpHeap(¶m0->unk_70, param3, 4); @@ -429,9 +426,9 @@ static void ov77_021D1208 (UnkStruct_ov77_021D1208 * param0, int param1, int par NNS_G3dRenderObjAddAnmObj(¶m0->unk_04, param0->unk_6C); { - VecFx32 v3 = {0, 0, 0}; - VecFx32 v4 = {FX32_ONE, FX32_ONE, FX32_ONE}; - VecFx32 v5 = {0, 0, 0}; + VecFx32 v3 = { 0, 0, 0 }; + VecFx32 v4 = { FX32_ONE, FX32_ONE, FX32_ONE }; + VecFx32 v5 = { 0, 0, 0 }; param0->unk_80 = v3; param0->unk_8C = v4; @@ -443,9 +440,9 @@ static void ov77_021D1208 (UnkStruct_ov77_021D1208 * param0, int param1, int par ov77_021D1300(param0, param3); } -static void ov77_021D1300 (UnkStruct_ov77_021D1208 * param0, int param1) +static void ov77_021D1300(UnkStruct_ov77_021D1208 *param0, int param1) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_DEMO__TITLE__TITLEDEMO, param1); @@ -500,7 +497,7 @@ static void ov77_021D1300 (UnkStruct_ov77_021D1208 * param0, int param1) param0->unk_220 = (120 << 8); } -static void ov77_021D14E4 (UnkStruct_ov77_021D1208 * param0) +static void ov77_021D14E4(UnkStruct_ov77_021D1208 *param0) { ov77_021D1514(param0); @@ -512,7 +509,7 @@ static void ov77_021D14E4 (UnkStruct_ov77_021D1208 * param0) Heap_FreeToHeap(param0->unk_5C); } -static void ov77_021D1514 (UnkStruct_ov77_021D1208 * param0) +static void ov77_021D1514(UnkStruct_ov77_021D1208 *param0) { sub_02017110(¶m0->unk_150); sub_020171A0(¶m0->unk_128, ¶m0->unk_70); @@ -523,9 +520,9 @@ static void ov77_021D1514 (UnkStruct_ov77_021D1208 * param0) sub_020171A0(¶m0->unk_1EC, ¶m0->unk_70); } -static void ov77_021D1568 (UnkStruct_ov77_021D1568 * param0, UnkStruct_ov77_021D1208 * param1) +static void ov77_021D1568(UnkStruct_ov77_021D1568 *param0, UnkStruct_ov77_021D1208 *param1) { - MtxFx33 v0 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + MtxFx33 v0 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; if ((param0->unk_29C == 0) && (param0->unk_2A0 == 1)) { ov77_021D25AC(param1->camera2); @@ -542,7 +539,7 @@ static void ov77_021D1568 (UnkStruct_ov77_021D1568 * param0, UnkStruct_ov77_021D param0->unk_2A8 += 2; param0->unk_2A8 %= 360; - v1 = sub_0201D250(((param0->unk_2A8 * 0xffff) / 360)); + v1 = sub_0201D250((param0->unk_2A8 * 0xffff) / 360); v1 *= 0.30; param1->unk_80.y -= v1; @@ -601,7 +598,7 @@ static void ov77_021D1568 (UnkStruct_ov77_021D1568 * param0, UnkStruct_ov77_021D } } -static void ov77_021D1704 (UnkStruct_ov77_021D1208 * param0) +static void ov77_021D1704(UnkStruct_ov77_021D1208 *param0) { if (param0->unk_224 == 1) { if (sub_02017204(¶m0->unk_128, FX32_ONE) == 1) { @@ -633,7 +630,7 @@ static void ov77_021D1704 (UnkStruct_ov77_021D1208 * param0) NNS_G3dGePopMtx(1); } -static void ov77_021D17B4 (UnkStruct_ov77_021D17B4 * param0) +static void ov77_021D17B4(UnkStruct_ov77_021D17B4 *param0) { param0->unk_04 = sub_02018340(param0->unk_00); @@ -776,7 +773,7 @@ static void ov77_021D17B4 (UnkStruct_ov77_021D17B4 * param0) sub_0201975C(4, 0x0); } -static void ov77_021D1908 (UnkStruct_ov77_021D17B4 * param0) +static void ov77_021D1908(UnkStruct_ov77_021D17B4 *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); @@ -795,10 +792,10 @@ static void ov77_021D1908 (UnkStruct_ov77_021D17B4 * param0) Heap_FreeToHeap(param0->unk_04); } -static void ov77_021D1984 (UnkStruct_ov77_021D1568 * param0, UnkStruct_ov77_021D1208 * param1) +static void ov77_021D1984(UnkStruct_ov77_021D1568 *param0, UnkStruct_ov77_021D1208 *param1) { - VecFx32 v0 = {0, 0, 0}; - CameraAngle v1 = {0, 0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; + CameraAngle v1 = { 0, 0, 0, 0 }; int v2; if (param0->unk_29C == 1) { @@ -823,7 +820,7 @@ static void ov77_021D1984 (UnkStruct_ov77_021D1568 * param0, UnkStruct_ov77_021D param1->unk_218 += param1->unk_214; - if (param1->unk_218 < ((0x10000 - 0x3fef))) { + if (param1->unk_218 < (0x10000 - 0x3fef)) { param1->unk_218 = (0x10000 - 0x3fef); Camera_AdjustFOV(-(param1->unk_220 >> 8), param1->camera2); @@ -835,7 +832,7 @@ static void ov77_021D1984 (UnkStruct_ov77_021D1568 * param0, UnkStruct_ov77_021D } } - if (param1->unk_218 >= ((0x10000 - 0x3fef))) { + if (param1->unk_218 >= (0x10000 - 0x3fef)) { (void)0; } @@ -852,7 +849,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov77_021D72D0 = { 0x1 }; -static BOOL ov77_021D1A60 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int param2) +static BOOL ov77_021D1A60(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2) { ov77_021D24C8(param0); ov77_021D2214(param1, param2, param0); @@ -881,15 +878,15 @@ static BOOL ov77_021D1A60 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p ((0 * 0xffff) / 360), ((0 * 0xffff) / 360), }; - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; param0->unk_04.camera2 = Camera_Alloc(param2); - Camera_InitWithTarget(&v1, (160 << FX32_SHIFT), &v0, (((22 * 0xffff) / 360)), 0, 0, param0->unk_04.camera2); + Camera_InitWithTarget(&v1, (160 << FX32_SHIFT), &v0, ((22 * 0xffff) / 360), 0, 0, param0->unk_04.camera2); Camera_SetClipping(0, (FX32_ONE * 300), param0->unk_04.camera2); { - VecFx32 v2 = {0, 0, (0xa00 * 60)}; + VecFx32 v2 = { 0, 0, (0xa00 * 60) }; Camera_Move(&v2, param0->unk_04.camera2); } @@ -912,7 +909,7 @@ static BOOL ov77_021D1A60 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p return 1; } -static void ov77_021D1C10 (UnkStruct_ov77_021D1568 * param0) +static void ov77_021D1C10(UnkStruct_ov77_021D1568 *param0) { BOOL v0 = 1; fx32 v1; @@ -937,7 +934,7 @@ static void ov77_021D1C10 (UnkStruct_ov77_021D1568 * param0) param0->unk_248.z += (v1); } -static void ov77_021D1CC0 (BGL * param0, int param1) +static void ov77_021D1CC0(BGL *param0, int param1) { sub_02019044(param0, 5); { @@ -969,7 +966,7 @@ static void ov77_021D1CC0 (BGL * param0, int param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); } -static void ov77_021D1D48 (BGL * param0, int param1) +static void ov77_021D1D48(BGL *param0, int param1) { sub_02019044(param0, 4); @@ -1008,7 +1005,7 @@ static void ov77_021D1D48 (BGL * param0, int param1) GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); } -static BOOL ov77_021D1DF0 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int param2) +static BOOL ov77_021D1DF0(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2) { BOOL v0 = 0; @@ -1039,7 +1036,7 @@ static BOOL ov77_021D1DF0 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p } break; case 2: - if (((sub_0200AC1C(1) == 1) && (sub_0200AC1C(2) == 1))) { + if ((sub_0200AC1C(1) == 1) && (sub_0200AC1C(2) == 1)) { if (param0->unk_22A) { sub_0200AAE0(10, 16, 0, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2), 1); sub_0200AAE0(10, 16, 0, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BD), 2); @@ -1053,7 +1050,7 @@ static BOOL ov77_021D1DF0 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p } break; case 3: - if (((sub_0200AC1C(1) == 1) && (sub_0200AC1C(2) == 1))) { + if ((sub_0200AC1C(1) == 1) && (sub_0200AC1C(2) == 1)) { sub_0200AAE0(10, 0, 16, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2), 1); sub_0200AAE0(10, 0, 16, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BD), 2); param0->unk_296 = 3; @@ -1086,7 +1083,9 @@ static BOOL ov77_021D1DF0 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p case 6: if (ScreenWipe_Done() == 1) { param0->unk_2A0 = 0; - {GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1);} + { + GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG1, 1); + } param0->unk_04.unk_AC = 2; sub_0200F174(3, 1, 1, 0x7fff, 16, 3, param2); param0->unk_00 = 5; @@ -1105,8 +1104,7 @@ static BOOL ov77_021D1DF0 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p param0->unk_00 = 9; param0->unk_2A4 = 0; break; - case 9: - { + case 9: { ov77_021D1C10(param0); Camera_SetTarget(¶m0->unk_23C, param0->unk_04.camera1); Camera_SetPosition(¶m0->unk_248, param0->unk_04.camera1); @@ -1114,7 +1112,9 @@ static BOOL ov77_021D1DF0 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p param0->unk_2A4++; if (param0->unk_2A4 >= 60) { - {GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1);} + { + GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG2, 1); + } { ov77_021D1CC0(param1, param2); } @@ -1124,8 +1124,7 @@ static BOOL ov77_021D1DF0 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p param0->unk_22A = 90; param0->unk_00 = 10; } - } - break; + } break; case 10: if (param0->unk_22A) { param0->unk_22A--; @@ -1144,7 +1143,7 @@ static BOOL ov77_021D1DF0 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p return v0; } -static BOOL ov77_021D20E4 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int param2) +static BOOL ov77_021D20E4(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2) { BOOL v0 = 0; @@ -1180,9 +1179,13 @@ static BOOL ov77_021D20E4 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p case 1: if (param0->unk_254 == 1) { if (param0->unk_22A == 0) { - {GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1);} + { + GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 1); + } } else if (param0->unk_22A == 0x10) { - {GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0);} + { + GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0); + } } } else { (void)0; @@ -1200,7 +1203,7 @@ static BOOL ov77_021D20E4 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p return v0; } -static BOOL ov77_021D21C0 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int param2) +static BOOL ov77_021D21C0(UnkStruct_ov77_021D1568 *param0, BGL *param1, int param2) { Camera_Delete(param0->unk_04.camera1); Camera_Delete(param0->unk_04.camera2); @@ -1217,7 +1220,7 @@ static BOOL ov77_021D21C0 (UnkStruct_ov77_021D1568 * param0, BGL * param1, int p return 1; } -static void ov77_021D2214 (BGL * param0, int param1, UnkStruct_ov77_021D1568 * param2) +static void ov77_021D2214(BGL *param0, int param1, UnkStruct_ov77_021D1568 *param2) { { int v0, v1; @@ -1258,8 +1261,8 @@ static void ov77_021D2214 (BGL * param0, int param1, UnkStruct_ov77_021D1568 * p sub_0201975C(4, 0x0); { - MessageLoader * v4; - Strbuf* v5; + MessageLoader *v4; + Strbuf *v5; u32 v6; sub_02019690(4, 32, 0, param1); @@ -1273,7 +1276,7 @@ static void ov77_021D2214 (BGL * param0, int param1, UnkStruct_ov77_021D1568 * p v6 = sub_02002EEC(0, v5, 1, param2->unk_22C.unk_07 * 8); - PrintStringWithColorAndMargins(¶m2->unk_22C, 0, v5, v6, 0, 0, (u32)(((1 & 0xff) << 16) | ((1 & 0xff) << 8) | (((0 & 0xff) << 0))), 1, 0, NULL); + PrintStringWithColorAndMargins(¶m2->unk_22C, 0, v5, v6, 0, 0, (u32)(((1 & 0xff) << 16) | ((1 & 0xff) << 8) | ((0 & 0xff) << 0)), 1, 0, NULL); Strbuf_Free(v5); MessageLoader_Free(v4); @@ -1287,12 +1290,12 @@ static void ov77_021D2214 (BGL * param0, int param1, UnkStruct_ov77_021D1568 * p } } -static void ov77_021D2428 (BGL * param0, int param1, UnkStruct_ov77_021D1568 * param2) +static void ov77_021D2428(BGL *param0, int param1, UnkStruct_ov77_021D1568 *param2) { BGL_DeleteWindow(¶m2->unk_22C); } -static void ov77_021D2438 (UnkStruct_ov77_021D1568 * param0) +static void ov77_021D2438(UnkStruct_ov77_021D1568 *param0) { switch (param0->unk_296) { case 0: @@ -1322,7 +1325,7 @@ static void ov77_021D2438 (UnkStruct_ov77_021D1568 * param0) NNS_G3dGlbLightColor(1, (((param0->unk_294 << 0) & 0x1f) | ((param0->unk_294 << 5) & 0x3e0) | ((param0->unk_294 << 10) & 0x7c00))); } -static void ov77_021D24C8 (UnkStruct_ov77_021D1568 * param0) +static void ov77_021D24C8(UnkStruct_ov77_021D1568 *param0) { param0->unk_258.x = (((fx32)0x00001000L) * 0); param0->unk_258.y = (((fx32)0x00001000L) * 192); @@ -1361,7 +1364,7 @@ static void ov77_021D24C8 (UnkStruct_ov77_021D1568 * param0) } } -static void ov77_021D25AC (Camera * camera) +static void ov77_021D25AC(Camera *camera) { return; } diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c index 8b18253749..6e2b5cacae 100644 --- a/src/overlay077/ov77_021D25B0.c +++ b/src/overlay077/ov77_021D25B0.c @@ -1,58 +1,57 @@ #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" +#include "struct_defs/struct_0207C690.h" +#include "struct_defs/struct_02099F80.h" + +#include "overlay009/struct_ov9_02249FF4.h" +#include "overlay077/ov77_021D54B0.h" +#include "overlay077/ov77_021D6670.h" +#include "overlay077/ov77_021D6C70.h" #include "overlay077/struct_ov77_021D5564_decl.h" #include "overlay077/struct_ov77_021D670C_decl.h" #include "overlay077/struct_ov77_021D6734_decl.h" #include "overlay077/struct_ov77_021D6CFC_decl.h" - -#include "struct_defs/struct_0207C690.h" -#include "struct_defs/struct_02099F80.h" -#include "overlay009/struct_ov9_02249FF4.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "narc.h" +#include "overlay_manager.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02000C88.h" #include "unk_020041CC.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200A784.h" #include "unk_0200A9DC.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201C970.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_0202419C.h" #include "unk_02024220.h" -#include "overlay077/ov77_021D54B0.h" -#include "overlay077/ov77_021D6670.h" -#include "overlay077/ov77_021D6C70.h" FS_EXTERN_OVERLAY(overlay77); typedef struct { NNSG3dRenderObj unk_00; - NNSG3dResFileHeader * unk_54; + NNSG3dResFileHeader *unk_54; } UnkStruct_ov77_021D37C0_sub1_sub1; typedef struct { - void * unk_00; - NNSG3dResTex * unk_04; - Camera * camera; + void *unk_00; + NNSG3dResTex *unk_04; + Camera *camera; UnkStruct_ov77_021D37C0_sub1_sub1 unk_0C[6]; int unk_21C; } UnkStruct_ov77_021D37C0_sub1; @@ -73,10 +72,10 @@ typedef struct { u8 unk_06; u8 unk_07; u8 unk_08; - BGL * unk_0C; - SysTask * unk_10; - UnkStruct_ov77_021D670C * unk_14; - u8 * unk_18; + BGL *unk_0C; + SysTask *unk_10; + UnkStruct_ov77_021D670C *unk_14; + u8 *unk_18; } UnkStruct_ov77_021D2F38; typedef struct { @@ -91,12 +90,12 @@ typedef struct { u8 unk_08; u8 unk_09; int unk_0C; - BGL * unk_10; - UnkStruct_ov77_021D5564 * unk_14; - UnkStruct_ov77_021D6734 * unk_18; - UnkStruct_ov77_021D6CFC * unk_1C; + BGL *unk_10; + UnkStruct_ov77_021D5564 *unk_14; + UnkStruct_ov77_021D6734 *unk_18; + UnkStruct_ov77_021D6CFC *unk_1C; UnkStruct_ov77_021D37C0_sub1 unk_20; - u16 * unk_240; + u16 *unk_240; u8 unk_244; u8 unk_245; u8 unk_246; @@ -124,7 +123,7 @@ typedef struct { u8 unk_02; u8 unk_03; fx32 unk_04; - BGL * unk_08; + BGL *unk_08; UnkStruct_ov77_021D5308_sub1 unk_0C; } UnkStruct_ov77_021D5308; @@ -132,8 +131,8 @@ typedef struct { int unk_00; int unk_04; BOOL unk_08; - BGL * unk_0C; - GenericPointerData * unk_10; + BGL *unk_0C; + GenericPointerData *unk_10; u32 unk_14; UnkStruct_ov77_021D2F38 unk_18; UnkStruct_ov77_021D37C0 unk_34; @@ -141,48 +140,47 @@ typedef struct { u8 unk_2A8; } UnkStruct_ov77_021D2E9C; - -void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate * param1); -static int ov77_021D2D08(OverlayManager * param0, int * param1); -static int ov77_021D2D94(OverlayManager * param0, int * param1); -static int ov77_021D2E60(OverlayManager * param0, int * param1); -static BOOL ov77_021D2E9C(UnkStruct_ov77_021D2E9C * param0); -static BOOL ov77_021D33F0(UnkStruct_ov77_021D2E9C * param0); -static BOOL ov77_021D5254(UnkStruct_ov77_021D2E9C * param0); +void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); +static int ov77_021D2D08(OverlayManager *param0, int *param1); +static int ov77_021D2D94(OverlayManager *param0, int *param1); +static int ov77_021D2E60(OverlayManager *param0, int *param1); +static BOOL ov77_021D2E9C(UnkStruct_ov77_021D2E9C *param0); +static BOOL ov77_021D33F0(UnkStruct_ov77_021D2E9C *param0); +static BOOL ov77_021D5254(UnkStruct_ov77_021D2E9C *param0); static void ov77_021D2AA0(void); static void ov77_021D2C80(void); static void ov77_021D2CE8(void); -static void ov77_021D35B8(UnkStruct_ov77_021D2E9C * param0); -static void ov77_021D361C(UnkStruct_ov77_021D2E9C * param0, BOOL param1); -static void ov77_021D2F0C(UnkStruct_ov77_021D2E9C * param0); -static void ov77_021D2F38(UnkStruct_ov77_021D2F38 * param0); -static BOOL ov77_021D30D0(UnkStruct_ov77_021D2F38 * param0, const int param1); -static void ov77_021D3234(UnkStruct_ov77_021D2E9C * param0); -static void ov77_021D32A4(SysTask * param0, void * param1); -static void ov77_021D3300(SysTask * param0, void * param1); -static void ov77_021D3360(SysTask * param0, void * param1); -static void ov77_021D33A8(SysTask * param0, void * param1); -static void ov77_021D34A8(UnkStruct_ov77_021D2E9C * param0); -static void ov77_021D37C0(UnkStruct_ov77_021D37C0 * param0); -static void ov77_021D3A10(UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D37C0 * param1); -static void ov77_021D3DC4(UnkStruct_ov77_021D37C0 * param0); -static void ov77_021D3B5C(UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D37C0 * param1); -static void ov77_021D40B8(UnkStruct_ov77_021D37C0 * param0, int param1); -static BOOL ov77_021D40DC(UnkStruct_ov77_021D37C0 * param0, int param1); -static void ov77_021D4188(UnkStruct_ov77_021D37C0 * param0); -static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D37C0 * param1, const int param2); -static void ov77_021D4B70(UnkStruct_ov77_021D37C0 * param0); -static void ov77_021D4BE4(UnkStruct_ov77_021D37C0 * param0); -static void ov77_021D4C04(UnkStruct_ov77_021D37C0 * param0, int param1); -static void ov77_021D4DC8(UnkStruct_ov77_021D37C0 * param0, int param1); -static void ov77_021D4E90(UnkStruct_ov77_021D37C0 * param0); -static void ov77_021D4F38(UnkStruct_ov77_021D37C0 * param0, const int param1); -static void ov77_021D513C(UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D37C0 * param1, int param2); -static void ov77_021D36F8(UnkStruct_ov77_021D2E9C * param0); -static void ov77_021D52C8(UnkStruct_ov77_021D2E9C * param0); -static void ov77_021D5308(UnkStruct_ov77_021D5308 * param0); -static BOOL ov77_021D5390(UnkStruct_ov77_021D5308 * param0, const int param1); -static void ov77_021D5478(UnkStruct_ov77_021D2E9C * param0); +static void ov77_021D35B8(UnkStruct_ov77_021D2E9C *param0); +static void ov77_021D361C(UnkStruct_ov77_021D2E9C *param0, BOOL param1); +static void ov77_021D2F0C(UnkStruct_ov77_021D2E9C *param0); +static void ov77_021D2F38(UnkStruct_ov77_021D2F38 *param0); +static BOOL ov77_021D30D0(UnkStruct_ov77_021D2F38 *param0, const int param1); +static void ov77_021D3234(UnkStruct_ov77_021D2E9C *param0); +static void ov77_021D32A4(SysTask *param0, void *param1); +static void ov77_021D3300(SysTask *param0, void *param1); +static void ov77_021D3360(SysTask *param0, void *param1); +static void ov77_021D33A8(SysTask *param0, void *param1); +static void ov77_021D34A8(UnkStruct_ov77_021D2E9C *param0); +static void ov77_021D37C0(UnkStruct_ov77_021D37C0 *param0); +static void ov77_021D3A10(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37C0 *param1); +static void ov77_021D3DC4(UnkStruct_ov77_021D37C0 *param0); +static void ov77_021D3B5C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37C0 *param1); +static void ov77_021D40B8(UnkStruct_ov77_021D37C0 *param0, int param1); +static BOOL ov77_021D40DC(UnkStruct_ov77_021D37C0 *param0, int param1); +static void ov77_021D4188(UnkStruct_ov77_021D37C0 *param0); +static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37C0 *param1, const int param2); +static void ov77_021D4B70(UnkStruct_ov77_021D37C0 *param0); +static void ov77_021D4BE4(UnkStruct_ov77_021D37C0 *param0); +static void ov77_021D4C04(UnkStruct_ov77_021D37C0 *param0, int param1); +static void ov77_021D4DC8(UnkStruct_ov77_021D37C0 *param0, int param1); +static void ov77_021D4E90(UnkStruct_ov77_021D37C0 *param0); +static void ov77_021D4F38(UnkStruct_ov77_021D37C0 *param0, const int param1); +static void ov77_021D513C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37C0 *param1, int param2); +static void ov77_021D36F8(UnkStruct_ov77_021D2E9C *param0); +static void ov77_021D52C8(UnkStruct_ov77_021D2E9C *param0); +static void ov77_021D5308(UnkStruct_ov77_021D5308 *param0); +static BOOL ov77_021D5390(UnkStruct_ov77_021D5308 *param0, const int param1); +static void ov77_021D5478(UnkStruct_ov77_021D2E9C *param0); extern const OverlayManagerTemplate Unk_ov77_021D742C; @@ -200,14 +198,14 @@ static const int Unk_ov77_021D7458[] = { }; const int Unk_ov77_021D779C[][6] = { - {0x64, 0x65, 0x0, 0x0, 0x0, 0x0}, - {0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C}, - {0x6E, 0x6F, 0x0, 0x0, 0x0, 0x0} + { 0x64, 0x65, 0x0, 0x0, 0x0, 0x0 }, + { 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C }, + { 0x6E, 0x6F, 0x0, 0x0, 0x0, 0x0 } }; static const UnkStruct_ov9_02249FF4 Unk_ov77_021D74FC = { 0x29AEC1, - {-0x29fe, 0x0, 0x0}, + { -0x29fe, 0x0, 0x0 }, 0x0, 0x5C1, 0x0 @@ -225,10 +223,10 @@ static const GXRgb Unk_ov77_021D74EC[8] = { }; const VecFx32 Unk_ov77_021D776C[4] = { - {-2043, -3548, 0x6E}, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x1000}, - {0x0, 0x0, 0x1000} + { -2043, -3548, 0x6E }, + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x1000 }, + { 0x0, 0x0, 0x1000 } }; const GXRgb Unk_ov77_021D7444[4] = { @@ -238,7 +236,7 @@ const GXRgb Unk_ov77_021D7444[4] = { GX_RGB(31, 31, 31), }; -static void ov77_021D25B0 (void) +static void ov77_021D25B0(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -256,7 +254,7 @@ static void ov77_021D25B0 (void) GXLayers_SetBanks(&v0); } -static void ov77_021D25D0 (void) +static void ov77_021D25D0(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -274,7 +272,7 @@ static void ov77_021D25D0 (void) GXLayers_SetBanks(&v0); } -static void ov77_021D25F0 (void) +static void ov77_021D25F0(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_256_AB, @@ -292,7 +290,7 @@ static void ov77_021D25F0 (void) GXLayers_SetBanks(&v0); } -static void ov77_021D2610 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D2610(UnkStruct_ov77_021D2E9C *param0) { param0->unk_0C = sub_02018340(param0->unk_00); @@ -431,7 +429,7 @@ static void ov77_021D2610 (UnkStruct_ov77_021D2E9C * param0) sub_0201975C(4, 0x0); } -static void ov77_021D2724 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D2724(UnkStruct_ov77_021D2E9C *param0) { param0->unk_0C = sub_02018340(param0->unk_00); @@ -541,7 +539,7 @@ static void ov77_021D2724 (UnkStruct_ov77_021D2E9C * param0) 3, 0, 0, - 0 + 0, }, { 0, @@ -556,7 +554,7 @@ static void ov77_021D2724 (UnkStruct_ov77_021D2E9C * param0) 3, 0, 0, - 0 + 0, }, { 0, @@ -571,7 +569,7 @@ static void ov77_021D2724 (UnkStruct_ov77_021D2E9C * param0) 3, 0, 0, - 0 + 0, }, }; @@ -584,7 +582,7 @@ static void ov77_021D2724 (UnkStruct_ov77_021D2E9C * param0) sub_0201975C(4, 0x0); } -static void ov77_021D2828 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D2828(UnkStruct_ov77_021D2E9C *param0) { ov77_021D361C(param0, 0); @@ -663,7 +661,7 @@ static void ov77_021D2828 (UnkStruct_ov77_021D2E9C * param0) 3, 0, 0, - 0 + 0, }, { 0, @@ -678,7 +676,7 @@ static void ov77_021D2828 (UnkStruct_ov77_021D2E9C * param0) 3, 0, 0, - 0 + 0, }, { 0, @@ -693,7 +691,7 @@ static void ov77_021D2828 (UnkStruct_ov77_021D2E9C * param0) 3, 0, 0, - 0 + 0, }, }; @@ -709,7 +707,7 @@ static void ov77_021D2828 (UnkStruct_ov77_021D2E9C * param0) param0->unk_34.unk_25A = 1; } -static void ov77_021D2900 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D2900(UnkStruct_ov77_021D2E9C *param0) { ov77_021D35B8(param0); ov77_021D2828(param0); @@ -784,7 +782,7 @@ static void ov77_021D2900 (UnkStruct_ov77_021D2E9C * param0) param0->unk_34.unk_25A = 2; } -static void ov77_021D2A00 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D2A00(UnkStruct_ov77_021D2E9C *param0) { param0->unk_0C = sub_02018340(param0->unk_00); @@ -822,7 +820,7 @@ static void ov77_021D2A00 (UnkStruct_ov77_021D2E9C * param0) sub_0201975C(2, 0x0); } -static void ov77_021D2A58 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D2A58(UnkStruct_ov77_021D2E9C *param0) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -836,7 +834,7 @@ static void ov77_021D2A58 (UnkStruct_ov77_021D2E9C * param0) v3 = NNS_GfdGetPlttKeyAddr(v1); } -static void ov77_021D2AA0 (void) +static void ov77_021D2AA0(void) { NNS_G3dGeFlushBuffer(); @@ -852,17 +850,17 @@ static void ov77_021D2AA0 (void) G3_ViewPort(0, 0, 255, 191); } -static void ov77_021D2B30 (void * param0) +static void ov77_021D2B30(void *param0) { - UnkStruct_ov77_021D2E9C * v0 = param0; + UnkStruct_ov77_021D2E9C *v0 = param0; sub_0200A858(); } -static void ov77_021D2B38 (void * param0) +static void ov77_021D2B38(void *param0) { int v0; - UnkStruct_ov77_021D2E9C * v1 = param0; - UnkStruct_ov77_021D37C0 * v2 = &v1->unk_34; + UnkStruct_ov77_021D2E9C *v1 = param0; + UnkStruct_ov77_021D37C0 *v2 = &v1->unk_34; if (v2->unk_25B == 1) { gCoreSys.unk_65 = 1; @@ -914,7 +912,7 @@ static void ov77_021D2B38 (void * param0) ov77_021D6E40(v1->unk_34.unk_1C); } -static void ov77_021D2C80 (void) +static void ov77_021D2C80(void) { GX_SetVisibleWnd(GX_WNDMASK_W0); G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); @@ -924,15 +922,15 @@ static void ov77_021D2C80 (void) G2S_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_OBJ, 1); } -static void ov77_021D2CE8 (void) +static void ov77_021D2CE8(void) { GX_SetVisibleWnd(0); GXS_SetVisibleWnd(0); } -static int ov77_021D2D08 (OverlayManager * param0, int * param1) +static int ov77_021D2D08(OverlayManager *param0, int *param1) { - UnkStruct_ov77_021D2E9C * v0; + UnkStruct_ov77_021D2E9C *v0; int v1; v1 = 76; @@ -963,9 +961,9 @@ static int ov77_021D2D08 (OverlayManager * param0, int * param1) return 1; } -static int ov77_021D2D94 (OverlayManager * param0, int * param1) +static int ov77_021D2D94(OverlayManager *param0, int *param1) { - UnkStruct_ov77_021D2E9C * v0 = OverlayManager_Data(param0); + UnkStruct_ov77_021D2E9C *v0 = OverlayManager_Data(param0); if ((v0->unk_2A8) && ((gCoreSys.pressedKeys & PAD_BUTTON_A) || (gCoreSys.pressedKeys & PAD_BUTTON_START))) { v0->unk_08 = 1; @@ -1012,9 +1010,9 @@ static int ov77_021D2D94 (OverlayManager * param0, int * param1) return 0; } -static int ov77_021D2E60 (OverlayManager * param0, int * param1) +static int ov77_021D2E60(OverlayManager *param0, int *param1) { - UnkStruct_ov77_021D2E9C * v0 = OverlayManager_Data(param0); + UnkStruct_ov77_021D2E9C *v0 = OverlayManager_Data(param0); if (ScreenWipe_Done() == 0) { sub_0200F2C0(); @@ -1028,9 +1026,9 @@ static int ov77_021D2E60 (OverlayManager * param0, int * param1) return 1; } -static BOOL ov77_021D2E9C (UnkStruct_ov77_021D2E9C * param0) +static BOOL ov77_021D2E9C(UnkStruct_ov77_021D2E9C *param0) { - u8 * v0 = &(param0->unk_18.unk_00); + u8 *v0 = &(param0->unk_18.unk_00); if (param0->unk_08) { (*v0) = 3; @@ -1058,7 +1056,7 @@ static BOOL ov77_021D2E9C (UnkStruct_ov77_021D2E9C * param0) return 0; } -static void ov77_021D2F0C (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D2F0C(UnkStruct_ov77_021D2E9C *param0) { ov77_021D25B0(); ov77_021D2610(param0); @@ -1071,7 +1069,7 @@ static void ov77_021D2F0C (UnkStruct_ov77_021D2E9C * param0) param0->unk_18.unk_02 = 1; } -static void ov77_021D2F38 (UnkStruct_ov77_021D2F38 * param0) +static void ov77_021D2F38(UnkStruct_ov77_021D2F38 *param0) { sub_02006E3C(128, 16, param0->unk_0C, 2, 0, 0, 0, 76); sub_02006E3C(128, 16, param0->unk_0C, 6, 0, 0, 0, 76); @@ -1106,9 +1104,9 @@ static void ov77_021D2F38 (UnkStruct_ov77_021D2F38 * param0) GXLayers_TurnBothDispOn(); } -static BOOL ov77_021D30D0 (UnkStruct_ov77_021D2F38 * param0, const int param1) +static BOOL ov77_021D30D0(UnkStruct_ov77_021D2F38 *param0, const int param1) { - u8 * v0 = &(param0->unk_01); + u8 *v0 = &(param0->unk_01); ov77_021D69C0(param0->unk_14, param1); @@ -1149,7 +1147,7 @@ static BOOL ov77_021D30D0 (UnkStruct_ov77_021D2F38 * param0, const int param1) } break; case 3: - if ((param0->unk_08)) { + if (param0->unk_08) { param0->unk_07 = 0; param0->unk_06 = 0; param0->unk_08 = 0; @@ -1172,7 +1170,7 @@ static BOOL ov77_021D30D0 (UnkStruct_ov77_021D2F38 * param0, const int param1) return 0; } -static void ov77_021D3234 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D3234(UnkStruct_ov77_021D2E9C *param0) { SetMainCallback(NULL, NULL); @@ -1197,9 +1195,9 @@ static void ov77_021D3234 (UnkStruct_ov77_021D2E9C * param0) } } -static void ov77_021D32A4 (SysTask * param0, void * param1) +static void ov77_021D32A4(SysTask *param0, void *param1) { - UnkStruct_ov77_021D2F38 * v0 = param1; + UnkStruct_ov77_021D2F38 *v0 = param1; v0->unk_07++; @@ -1218,9 +1216,9 @@ static void ov77_021D32A4 (SysTask * param0, void * param1) G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_PLANEMASK_BG3), v0->unk_06, 16); } -static void ov77_021D3300 (SysTask * param0, void * param1) +static void ov77_021D3300(SysTask *param0, void *param1) { - UnkStruct_ov77_021D2F38 * v0 = param1; + UnkStruct_ov77_021D2F38 *v0 = param1; v0->unk_07++; @@ -1240,9 +1238,9 @@ static void ov77_021D3300 (SysTask * param0, void * param1) G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG1), (GX_BLEND_PLANEMASK_BG3), v0->unk_06, 16); } -static void ov77_021D3360 (SysTask * param0, void * param1) +static void ov77_021D3360(SysTask *param0, void *param1) { - UnkStruct_ov77_021D2F38 * v0 = param1; + UnkStruct_ov77_021D2F38 *v0 = param1; v0->unk_07++; @@ -1260,9 +1258,9 @@ static void ov77_021D3360 (SysTask * param0, void * param1) G2_SetBlendAlpha((GX_BLEND_PLANEMASK_BG2), (GX_BLEND_PLANEMASK_BG3), v0->unk_06, 16); } -static void ov77_021D33A8 (SysTask * param0, void * param1) +static void ov77_021D33A8(SysTask *param0, void *param1) { - UnkStruct_ov77_021D2F38 * v0 = param1; + UnkStruct_ov77_021D2F38 *v0 = param1; v0->unk_07++; @@ -1280,9 +1278,9 @@ static void ov77_021D33A8 (SysTask * param0, void * param1) G2S_SetBlendAlpha((GX_BLEND_PLANEMASK_BG2), (GX_BLEND_PLANEMASK_BG3), v0->unk_06, 16); } -static BOOL ov77_021D33F0 (UnkStruct_ov77_021D2E9C * param0) +static BOOL ov77_021D33F0(UnkStruct_ov77_021D2E9C *param0) { - u8 * v0 = &(param0->unk_34.unk_00); + u8 *v0 = &(param0->unk_34.unk_00); if (param0->unk_08) { (*v0) = 4; @@ -1326,7 +1324,7 @@ static BOOL ov77_021D33F0 (UnkStruct_ov77_021D2E9C * param0) return 0; } -static void ov77_021D34A8 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D34A8(UnkStruct_ov77_021D2E9C *param0) { u8 v0; int v1; @@ -1368,7 +1366,7 @@ static void ov77_021D34A8 (UnkStruct_ov77_021D2E9C * param0) param0->unk_34.unk_02 = 1; } -static void ov77_021D35B8 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D35B8(UnkStruct_ov77_021D2E9C *param0) { int v0; @@ -1389,7 +1387,7 @@ static void ov77_021D35B8 (UnkStruct_ov77_021D2E9C * param0) } } -static void ov77_021D361C (UnkStruct_ov77_021D2E9C * param0, BOOL param1) +static void ov77_021D361C(UnkStruct_ov77_021D2E9C *param0, BOOL param1) { if (param0->unk_34.unk_02 && (param0->unk_0C != NULL)) { if (param0->unk_34.unk_25A == 0) { @@ -1426,7 +1424,7 @@ static void ov77_021D361C (UnkStruct_ov77_021D2E9C * param0, BOOL param1) } } -static void ov77_021D36F8 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D36F8(UnkStruct_ov77_021D2E9C *param0) { u8 v0; @@ -1475,10 +1473,10 @@ static void ov77_021D36F8 (UnkStruct_ov77_021D2E9C * param0) SetMainCallback(NULL, NULL); } -static void ov77_021D37C0 (UnkStruct_ov77_021D37C0 * param0) +static void ov77_021D37C0(UnkStruct_ov77_021D37C0 *param0) { u8 v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_DEMO__TITLE__OP_DEMO, 76); @@ -1492,7 +1490,7 @@ static void ov77_021D37C0 (UnkStruct_ov77_021D37C0 * param0) sub_0200710C(v1, 12, param0->unk_10, 2, 0, 0, 0, 76); { - NARC * v2; + NARC *v2; v2 = NARC_ctor(NARC_INDEX_DATA__WEATHER_SYS, 76); @@ -1537,10 +1535,10 @@ static void ov77_021D37C0 (UnkStruct_ov77_021D37C0 * param0) param0->unk_03 = 1; } -static void ov77_021D3A10 (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D37C0 * param1) +static void ov77_021D3A10(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37C0 *param1) { u8 v0; - NARC * v1; + NARC *v1; sub_02018898(param1->unk_10, 2, 0, GX_BG_COLORMODE_16); sub_02018898(param1->unk_10, 3, 0, GX_BG_COLORMODE_16); @@ -1572,10 +1570,10 @@ static void ov77_021D3A10 (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D NARC_dtor(v1); } -static void ov77_021D3B5C (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D37C0 * param1) +static void ov77_021D3B5C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37C0 *param1) { u8 v0; - NARC * v1; + NARC *v1; ov77_021D2828(param0); @@ -1617,10 +1615,10 @@ static void ov77_021D3B5C (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D NARC_dtor(v1); } -static void ov77_021D3D4C (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D37C0 * param1) +static void ov77_021D3D4C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37C0 *param1) { u8 v0; - NARC * v1; + NARC *v1; ov77_021D2900(param0); @@ -1634,7 +1632,7 @@ static void ov77_021D3D4C (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D NARC_dtor(v1); } -static void ov77_021D3DC4 (UnkStruct_ov77_021D37C0 * param0) +static void ov77_021D3DC4(UnkStruct_ov77_021D37C0 *param0) { if (gCoreSys.unk_65 == 0) { sub_02019184(param0->unk_10, 1, 3, 0); @@ -1669,7 +1667,7 @@ static void ov77_021D3DC4 (UnkStruct_ov77_021D37C0 * param0) ov77_021D636C(param0->unk_14, 0); } -static void ov77_021D3EDC (UnkStruct_ov77_021D37C0 * param0, int param1) +static void ov77_021D3EDC(UnkStruct_ov77_021D37C0 *param0, int param1) { param0->unk_20.unk_00 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_DEMO__TITLE__OP_DEMO, Unk_ov77_021D7458[param1], 76); param0->unk_20.unk_04 = NNS_G3dGetTex((NNSG3dResFileHeader *)param0->unk_20.unk_00); @@ -1682,7 +1680,7 @@ static void ov77_021D3EDC (UnkStruct_ov77_021D37C0 * param0, int param1) } { - u8 * v1; + u8 *v1; u32 v2; GF_ASSERT(param0->unk_20.unk_04->texInfo.ofsTex != 0); @@ -1694,13 +1692,13 @@ static void ov77_021D3EDC (UnkStruct_ov77_021D37C0 * param0, int param1) } } -static void ov77_021D3F24 (UnkStruct_ov77_021D37C0 * param0, int param1, int param2, int param3) +static void ov77_021D3F24(UnkStruct_ov77_021D37C0 *param0, int param1, int param2, int param3) { u8 v0; - NARC * v1; + NARC *v1; BOOL v2; - NNSG3dResMdlSet * v3; - NNSG3dResMdl * v4; + NNSG3dResMdlSet *v3; + NNSG3dResMdl *v4; if (param3 > 6) { param3 = 6; @@ -1737,18 +1735,18 @@ static void ov77_021D3F24 (UnkStruct_ov77_021D37C0 * param0, int param1, int par NARC_dtor(v1); } -static void ov77_021D4044 (UnkStruct_ov77_021D37C0 * param0, int param1) +static void ov77_021D4044(UnkStruct_ov77_021D37C0 *param0, int param1) { param0->unk_20.camera = Camera_Alloc(76); { - VecFx32 v0 = {0, 0, FX32_ONE * 16 * 6}; + VecFx32 v0 = { 0, 0, FX32_ONE * 16 * 6 }; Camera_InitWithTarget(&v0, Unk_ov77_021D74FC.unk_00, &Unk_ov77_021D74FC.cameraAngle, Unk_ov77_021D74FC.unk_0E, Unk_ov77_021D74FC.unk_0C, 0, param0->unk_20.camera); Camera_SetFOV(0x981, param0->unk_20.camera); { - VecFx32 v1 = {0, (FX32_ONE * 16 * 5), 0}; + VecFx32 v1 = { 0, (FX32_ONE * 16 * 5), 0 }; Camera_Move(&v1, param0->unk_20.camera); } @@ -1756,7 +1754,7 @@ static void ov77_021D4044 (UnkStruct_ov77_021D37C0 * param0, int param1) } } -static void ov77_021D40B8 (UnkStruct_ov77_021D37C0 * param0, int param1) +static void ov77_021D40B8(UnkStruct_ov77_021D37C0 *param0, int param1) { ov77_021D3EDC(param0, param1); ov77_021D3F24(param0, param1, 0, 6); @@ -1765,7 +1763,7 @@ static void ov77_021D40B8 (UnkStruct_ov77_021D37C0 * param0, int param1) param0->unk_04 = 1; } -static BOOL ov77_021D40DC (UnkStruct_ov77_021D37C0 * param0, int param1) +static BOOL ov77_021D40DC(UnkStruct_ov77_021D37C0 *param0, int param1) { if (param1 == 0) { switch (param0->unk_09) { @@ -1812,12 +1810,12 @@ static BOOL ov77_021D40DC (UnkStruct_ov77_021D37C0 * param0, int param1) return 0; } -static void ov77_021D4188 (UnkStruct_ov77_021D37C0 * param0) +static void ov77_021D4188(UnkStruct_ov77_021D37C0 *param0) { u8 v0; - MtxFx33 v1 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; - VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE}; - VecFx32 v3 = {0, 0, 0}; + MtxFx33 v1 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; + VecFx32 v2 = { FX32_ONE, FX32_ONE, FX32_ONE }; + VecFx32 v3 = { 0, 0, 0 }; NNS_G3dGeFlushBuffer(); @@ -1841,9 +1839,9 @@ static void ov77_021D4188 (UnkStruct_ov77_021D37C0 * param0) G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_W); } -static BOOL ov77_021D4230 (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D37C0 * param1, const int param2) +static BOOL ov77_021D4230(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37C0 *param1, const int param2) { - u8 * v0 = &(param1->unk_01); + u8 *v0 = &(param1->unk_01); if (!param1->unk_07) { ov77_021D6BA0(param1->unk_18, param1->unk_244); @@ -1899,7 +1897,7 @@ static BOOL ov77_021D4230 (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } - if ((param2 >= 975)) { + if (param2 >= 975) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); sub_0200F174(3, 1, 1, 0x7fff, 18, 1, 76); param1->unk_08 = 16; @@ -1912,7 +1910,7 @@ static BOOL ov77_021D4230 (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D ov77_021D4F38(param1, param2); ov77_021D6530(param1->unk_14, param2); - if (param2 == (((40 * 30 - 15) + 6))) { + if (param2 == ((40 * 30 - 15) + 6)) { (void)0; } @@ -2195,7 +2193,7 @@ static BOOL ov77_021D4230 (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D return 0; } -static void ov77_021D4B70 (UnkStruct_ov77_021D37C0 * param0) +static void ov77_021D4B70(UnkStruct_ov77_021D37C0 *param0) { param0->unk_260 += 0x280; param0->unk_264 += 0x110; @@ -2209,13 +2207,13 @@ static void ov77_021D4B70 (UnkStruct_ov77_021D37C0 * param0) param0->unk_0C = 0; } -static void ov77_021D4BE4 (UnkStruct_ov77_021D37C0 * param0) +static void ov77_021D4BE4(UnkStruct_ov77_021D37C0 *param0) { sub_0201C63C(param0->unk_10, 3, 1, 16); sub_0201C63C(param0->unk_10, 7, 1, -16); } -static void ov77_021D4C04 (UnkStruct_ov77_021D37C0 * param0, int param1) +static void ov77_021D4C04(UnkStruct_ov77_021D37C0 *param0, int param1) { if (param1 == (65 * 30 - 15 - 15 - 45 - 15)) { G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); @@ -2256,7 +2254,7 @@ static void ov77_021D4C04 (UnkStruct_ov77_021D37C0 * param0, int param1) } } -static void ov77_021D4DC8 (UnkStruct_ov77_021D37C0 * param0, int param1) +static void ov77_021D4DC8(UnkStruct_ov77_021D37C0 *param0, int param1) { int v0, v1; @@ -2312,7 +2310,7 @@ static void ov77_021D4DC8 (UnkStruct_ov77_021D37C0 * param0, int param1) } } -static void ov77_021D4E90 (UnkStruct_ov77_021D37C0 * param0) +static void ov77_021D4E90(UnkStruct_ov77_021D37C0 *param0) { int v0, v1; @@ -2360,9 +2358,9 @@ static void ov77_021D4E90 (UnkStruct_ov77_021D37C0 * param0) sub_0201C63C(param0->unk_10, 7, 0, v0); } -static void ov77_021D4F38 (UnkStruct_ov77_021D37C0 * param0, const int param1) +static void ov77_021D4F38(UnkStruct_ov77_021D37C0 *param0, const int param1) { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; if (param1 < ((40 * 30 - 15) + 6)) { { @@ -2379,11 +2377,11 @@ static void ov77_021D4F38 (UnkStruct_ov77_021D37C0 * param0, const int param1) v0.z -= FX32_ONE * 2; Camera_Move(&v0, param0->unk_20.camera); } else if (param1 == ((40 * 30 - 15) + 6)) { - VecFx32 v2 = {-(FX32_ONE * 16 * 4), 0, -FX32_ONE * 16 * 3}; + VecFx32 v2 = { -(FX32_ONE * 16 * 4), 0, -FX32_ONE * 16 * 3 }; Camera_InitWithTarget(&v2, Unk_ov77_021D74FC.unk_00, &Unk_ov77_021D74FC.cameraAngle, Unk_ov77_021D74FC.unk_0E, Unk_ov77_021D74FC.unk_0C, 0, param0->unk_20.camera); { - VecFx32 v3 = {0, (FX32_ONE * 16 * 5), 0}; + VecFx32 v3 = { 0, (FX32_ONE * 16 * 5), 0 }; Camera_Move(&v3, param0->unk_20.camera); } @@ -2415,15 +2413,15 @@ static void ov77_021D4F38 (UnkStruct_ov77_021D37C0 * param0, const int param1) Camera_Move(&v0, param0->unk_20.camera); sub_0201C63C(param0->unk_10, 1, 1, 4); } else if (param1 == ((47 * 30 - 15) + 6)) { - VecFx32 v6 = {FX32_ONE * 16 * 30, 0, FX32_ONE * 0 - 0x70000}; + VecFx32 v6 = { FX32_ONE * 16 * 30, 0, FX32_ONE * 0 - 0x70000 }; Camera_InitWithTarget(&v6, Unk_ov77_021D74FC.unk_00, &Unk_ov77_021D74FC.cameraAngle, Unk_ov77_021D74FC.unk_0E, Unk_ov77_021D74FC.unk_0C, 0, param0->unk_20.camera); { - VecFx32 v7 = {0, (FX32_ONE * 16 * 5), 0}; + VecFx32 v7 = { 0, (FX32_ONE * 16 * 5), 0 }; Camera_Move(&v7, param0->unk_20.camera); } { - CameraAngle v8 = {0, 0x680, 0, 0}; + CameraAngle v8 = { 0, 0x680, 0, 0 }; Camera_AdjustAngleAroundSelf(&v8, param0->unk_20.camera); } @@ -2452,7 +2450,7 @@ static void ov77_021D4F38 (UnkStruct_ov77_021D37C0 * param0, const int param1) } } -static void ov77_021D513C (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D37C0 * param1, int param2) +static void ov77_021D513C(UnkStruct_ov77_021D2E9C *param0, UnkStruct_ov77_021D37C0 *param1, int param2) { BOOL v0; @@ -2488,9 +2486,9 @@ static void ov77_021D513C (UnkStruct_ov77_021D2E9C * param0, UnkStruct_ov77_021D } } -static BOOL ov77_021D5254 (UnkStruct_ov77_021D2E9C * param0) +static BOOL ov77_021D5254(UnkStruct_ov77_021D2E9C *param0) { - u8 * v0 = &(param0->unk_298.unk_00); + u8 *v0 = &(param0->unk_298.unk_00); if (param0->unk_08) { (*v0) = 3; @@ -2518,7 +2516,7 @@ static BOOL ov77_021D5254 (UnkStruct_ov77_021D2E9C * param0) return 0; } -static void ov77_021D52C8 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D52C8(UnkStruct_ov77_021D2E9C *param0) { int v0; int v1; @@ -2536,7 +2534,7 @@ static void ov77_021D52C8 (UnkStruct_ov77_021D2E9C * param0) param0->unk_298.unk_02 = 1; } -static void ov77_021D5308 (UnkStruct_ov77_021D5308 * param0) +static void ov77_021D5308(UnkStruct_ov77_021D5308 *param0) { sub_02006E84(128, 99, 0, 0, 0, 76); sub_02006E3C(128, 98, param0->unk_08, 2, 0, 0, 0, 76); @@ -2554,9 +2552,9 @@ static void ov77_021D5308 (UnkStruct_ov77_021D5308 * param0) param0->unk_03 = 1; } -static BOOL ov77_021D5390 (UnkStruct_ov77_021D5308 * param0, const int param1) +static BOOL ov77_021D5390(UnkStruct_ov77_021D5308 *param0, const int param1) { - u8 * v0 = &(param0->unk_01); + u8 *v0 = &(param0->unk_01); switch (*v0) { case 0: @@ -2578,7 +2576,7 @@ static BOOL ov77_021D5390 (UnkStruct_ov77_021D5308 * param0, const int param1) } break; case 3: - if (param1 >= ((2500 - 15 - 65))) { + if (param1 >= (2500 - 15 - 65)) { sub_0200F174(0, 0, 0, 0x0, 8, 1, 76); (*v0)++; @@ -2596,7 +2594,7 @@ static BOOL ov77_021D5390 (UnkStruct_ov77_021D5308 * param0, const int param1) return 0; } -static void ov77_021D5478 (UnkStruct_ov77_021D2E9C * param0) +static void ov77_021D5478(UnkStruct_ov77_021D2E9C *param0) { if (param0->unk_298.unk_02) { sub_02019044(param0->unk_0C, 2); diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c index dcb18eb126..2a6c4eef36 100644 --- a/src/overlay077/ov77_021D54B0.c +++ b/src/overlay077/ov77_021D54B0.c @@ -1,19 +1,22 @@ +#include "overlay077/ov77_021D54B0.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay077/struct_ov77_021D6734_decl.h" - #include "struct_defs/struct_0200C738.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" +#include "overlay077/ov77_021D6670.h" +#include "overlay077/struct_ov77_021D6734_decl.h" #include "overlay115/struct_ov115_02261520.h" +#include "core_sys.h" +#include "gx_layers.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" @@ -21,23 +24,20 @@ #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "overlay077/ov77_021D54B0.h" -#include "overlay077/ov77_021D6670.h" SDK_COMPILER_ASSERT(((3 + 1 + 1 + 2 + 4) + 6) == 17); void include_data_ov77_021D79B8(void); typedef struct UnkStruct_ov77_021D5564_t { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; - UnkStruct_02009DC8 * unk_1A0[11][4]; - GraphicElementData * unk_250[17]; + UnkStruct_02009714 *unk_190[4]; + UnkStruct_02009DC8 *unk_1A0[11][4]; + GraphicElementData *unk_250[17]; UnkStruct_ov19_021DA864 unk_294[3]; - NNSG2dCellTransferState * unk_300; + NNSG2dCellTransferState *unk_300; } UnkStruct_ov77_021D5564; static const u8 Unk_ov77_021D7914[4] = { @@ -95,7 +95,7 @@ static fx32 Unk_ov77_021D79A4[2] = { (FX32_ONE / 2) * 11 }; -static void ov77_021D54B0 () +static void ov77_021D54B0() { const int v0 = 76; @@ -113,7 +113,7 @@ static void ov77_021D54B0 () sub_0201DBEC((3 * 2), v0); } -static void ov77_021D54E8 (const int param0, UnkStruct_ov77_021D5564 * param1, const int param2, UnkStruct_ov115_02261520 * param3, UnkStruct_ov19_021DA864 * param4, int param5, int param6) +static void ov77_021D54E8(const int param0, UnkStruct_ov77_021D5564 *param1, const int param2, UnkStruct_ov115_02261520 *param3, UnkStruct_ov19_021DA864 *param4, int param5, int param6) { sub_020093B4(param4, param0, param0, param0, param0, 0xffffffff, 0xffffffff, param5, param2, param1->unk_190[0], param1->unk_190[1], param1->unk_190[2], param1->unk_190[3], NULL, NULL); @@ -133,12 +133,12 @@ static void ov77_021D54E8 (const int param0, UnkStruct_ov77_021D5564 * param1, c } } -const int ov77_021D555C (void) +const int ov77_021D555C(void) { return sizeof(UnkStruct_ov77_021D5564); } -void ov77_021D5564 (UnkStruct_ov77_021D5564 * param0) +void ov77_021D5564(UnkStruct_ov77_021D5564 *param0) { int v0; const int v1 = 76; @@ -210,7 +210,7 @@ void ov77_021D5564 (UnkStruct_ov77_021D5564 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -void ov77_021D5BAC (UnkStruct_ov77_021D5564 * param0) +void ov77_021D5BAC(UnkStruct_ov77_021D5564 *param0) { u8 v0; @@ -240,13 +240,18 @@ void ov77_021D5BAC (UnkStruct_ov77_021D5564 * param0) sub_0201DC3C(); } -void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0) +void ov77_021D5C3C(UnkStruct_ov77_021D5564 *param0) { int v0; UnkStruct_ov19_021DA864 v1; UnkStruct_ov115_02261520 v2; const int v3[6] = { - 4, 5, 6, 7, 8, 9, + 4, + 5, + 6, + 7, + 8, + 9, }; const int v4[6] = { (256 + 8), @@ -372,12 +377,12 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0) } } -void ov77_021D5FB4 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 * param1) +void ov77_021D5FB4(UnkStruct_ov77_021D5564 *param0, UnkStruct_ov77_021D6734 *param1) { int v0; UnkStruct_ov19_021DA864 v1; UnkStruct_ov115_02261520 v2; - GraphicElementData ** v3; + GraphicElementData **v3; { ov77_021D54E8(5, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DSUB); @@ -391,10 +396,10 @@ void ov77_021D5FB4 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 * } } -void ov77_021D6000 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 * param1) +void ov77_021D6000(UnkStruct_ov77_021D5564 *param0, UnkStruct_ov77_021D6734 *param1) { int v0; - GraphicElementData ** v1; + GraphicElementData **v1; for (v0 = 0; v0 < 16; v0++) { v1 = ov77_021D6794(param1, v0); @@ -402,7 +407,7 @@ void ov77_021D6000 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 * } } -void ov77_021D6020 (UnkStruct_ov77_021D5564 * param0) +void ov77_021D6020(UnkStruct_ov77_021D5564 *param0) { sub_020219F8(param0->unk_00); @@ -411,19 +416,19 @@ void ov77_021D6020 (UnkStruct_ov77_021D5564 * param0) } } -void ov77_021D603C (UnkStruct_ov77_021D5564 * param0, const u8 param1, const u8 param2) +void ov77_021D603C(UnkStruct_ov77_021D5564 *param0, const u8 param1, const u8 param2) { sub_02021CAC(param0->unk_250[param1], param2); } -void ov77_021D6050 (UnkStruct_ov77_021D5564 * param0, const u8 param1) +void ov77_021D6050(UnkStruct_ov77_021D5564 *param0, const u8 param1) { sub_02021CC8(param0->unk_250[0], param1); sub_02021CC8(param0->unk_250[2], param1); sub_02021CC8(param0->unk_250[1], param1); } -void ov77_021D607C (UnkStruct_ov77_021D5564 * param0) +void ov77_021D607C(UnkStruct_ov77_021D5564 *param0) { VecFx32 v0; @@ -438,7 +443,7 @@ void ov77_021D607C (UnkStruct_ov77_021D5564 * param0) sub_02021C50(param0->unk_250[2], &v0); } -BOOL ov77_021D60E0 (UnkStruct_ov77_021D5564 * param0, int param1) +BOOL ov77_021D60E0(UnkStruct_ov77_021D5564 *param0, int param1) { VecFx32 v0; @@ -454,8 +459,8 @@ BOOL ov77_021D60E0 (UnkStruct_ov77_021D5564 * param0, int param1) v0 = *sub_02021D28(param0->unk_250[3]); v0.x += (FX32_ONE * 18); - if (v0.x >= (FX32_ONE * ((128 + 48)))) { - v0.x = (FX32_ONE * ((128 + 48))); + if (v0.x >= (FX32_ONE * (128 + 48))) { + v0.x = (FX32_ONE * (128 + 48)); sub_02021C50(param0->unk_250[3], &v0); return 1; } @@ -478,7 +483,7 @@ BOOL ov77_021D60E0 (UnkStruct_ov77_021D5564 * param0, int param1) } } -BOOL ov77_021D61B8 (UnkStruct_ov77_021D5564 * param0, int param1) +BOOL ov77_021D61B8(UnkStruct_ov77_021D5564 *param0, int param1) { VecFx32 v0; @@ -490,12 +495,12 @@ BOOL ov77_021D61B8 (UnkStruct_ov77_021D5564 * param0, int param1) ov77_021D603C(param0, 10, 1); } - if (param1 < ((53 * 30 - 15))) { + if (param1 < (53 * 30 - 15)) { v0 = *sub_02021D28(param0->unk_250[10]); v0.x += (-(FX32_ONE * 18)); - if (v0.x <= (FX32_ONE * ((128 - 48)))) { - v0.x = (FX32_ONE * ((128 - 48))); + if (v0.x <= (FX32_ONE * (128 - 48))) { + v0.x = (FX32_ONE * (128 - 48)); sub_02021C50(param0->unk_250[10], &v0); return 1; } @@ -518,9 +523,9 @@ BOOL ov77_021D61B8 (UnkStruct_ov77_021D5564 * param0, int param1) } } -void ov77_021D6290 (UnkStruct_ov77_021D5564 * param0, fx32 param1) +void ov77_021D6290(UnkStruct_ov77_021D5564 *param0, fx32 param1) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; int v2, v3; @@ -557,9 +562,9 @@ void ov77_021D6290 (UnkStruct_ov77_021D5564 * param0, fx32 param1) sub_02021C50(param0->unk_250[v3 + 1], &v1); } -void ov77_021D636C (UnkStruct_ov77_021D5564 * param0, int param1) +void ov77_021D636C(UnkStruct_ov77_021D5564 *param0, int param1) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; if (param1 == 0) { @@ -594,10 +599,10 @@ void ov77_021D636C (UnkStruct_ov77_021D5564 * param0, int param1) sub_02021C50(param0->unk_250[15], &v1); } -void ov77_021D6470 (UnkStruct_ov77_021D5564 * param0, int param1) +void ov77_021D6470(UnkStruct_ov77_021D5564 *param0, int param1) { u16 v0; - const VecFx32 * v1; + const VecFx32 *v1; VecFx32 v2; s32 v3; @@ -630,24 +635,27 @@ void ov77_021D6470 (UnkStruct_ov77_021D5564 * param0, int param1) } } -void include_data_ov77_021D79B8 (void) +void include_data_ov77_021D79B8(void) { dummy[0]; Unk_ov77_021D79B8[0]; } -void ov77_021D6530 (UnkStruct_ov77_021D5564 * param0, const int param1) +void ov77_021D6530(UnkStruct_ov77_021D5564 *param0, const int param1) { u8 v0; VecFx32 v1; const int v2[3] = { - 4, 5, 6, + 4, + 5, + 6, }; const int v3[1] = { 7, }; const int v4[] = { - 8, 9, + 8, + 9, }; if (param1 >= (1460 - 15)) { diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c index 229ab50585..5162cb0da1 100644 --- a/src/overlay077/ov77_021D6670.c +++ b/src/overlay077/ov77_021D6670.c @@ -1,40 +1,41 @@ +#include "overlay077/ov77_021D6670.h" + #include #include #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" - #include "struct_defs/struct_0200C738.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay115/struct_ov115_02261520.h" +#include "gx_layers.h" +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "sys_task.h" -#include "heap.h" #include "unk_0201D15C.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "overlay077/ov77_021D6670.h" typedef struct { u8 unk_00; u8 unk_01; - GraphicElementData * unk_04; - SysTask * unk_08; + GraphicElementData *unk_04; + SysTask *unk_08; } UnkStruct_ov77_021D6ADC; typedef struct UnkStruct_ov77_021D6734_t { int unk_00; - UnkStruct_ov77_021D6ADC * unk_04; + UnkStruct_ov77_021D6ADC *unk_04; } UnkStruct_ov77_021D6734; typedef struct { @@ -49,15 +50,15 @@ typedef struct { typedef struct { UnkStruct_ov77_021D6B0C unk_00; - SysTask * unk_08; - UnkStruct_ov77_021D6ADC * unk_0C; + SysTask *unk_08; + UnkStruct_ov77_021D6ADC *unk_0C; } UnkStruct_ov77_021D6A0C; typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; - UnkStruct_02009714 * unk_190[4]; - UnkStruct_02009DC8 * unk_1A0[4]; + UnkStruct_02009714 *unk_190[4]; + UnkStruct_02009DC8 *unk_1A0[4]; UnkStruct_ov77_021D6ADC unk_1B0[10]; } UnkStruct_ov77_021D6800; @@ -66,16 +67,16 @@ typedef struct UnkStruct_ov77_021D670C_t { UnkStruct_ov77_021D6A0C unk_214[3]; } UnkStruct_ov77_021D670C; -static void ov77_021D6800(UnkStruct_ov77_021D6800 * param0); -static void ov77_021D691C(UnkStruct_ov77_021D6800 * param0); -static void ov77_021D6964(UnkStruct_ov77_021D6800 * param0); -static void ov77_021D69B4(UnkStruct_ov77_021D6800 * param0); -static void ov77_021D6A0C(UnkStruct_ov77_021D6A0C * param0, UnkStruct_ov77_021D670C * param1, const u8 param2, const u8 param3, const u8 param4, const u8 param5); -static void ov77_021D6B0C(SysTask * param0, void * param1); -static UnkStruct_ov77_021D6ADC * ov77_021D6ADC(UnkStruct_ov77_021D6ADC * param0, const int param1); -static void ov77_021D6B48(SysTask * param0, void * param1); -static void ov77_021D6BAC(UnkStruct_ov77_021D6734 * param0, const u8 param1, int param2); -static void ov77_021D6C44(SysTask * param0, void * param1); +static void ov77_021D6800(UnkStruct_ov77_021D6800 *param0); +static void ov77_021D691C(UnkStruct_ov77_021D6800 *param0); +static void ov77_021D6964(UnkStruct_ov77_021D6800 *param0); +static void ov77_021D69B4(UnkStruct_ov77_021D6800 *param0); +static void ov77_021D6A0C(UnkStruct_ov77_021D6A0C *param0, UnkStruct_ov77_021D670C *param1, const u8 param2, const u8 param3, const u8 param4, const u8 param5); +static void ov77_021D6B0C(SysTask *param0, void *param1); +static UnkStruct_ov77_021D6ADC *ov77_021D6ADC(UnkStruct_ov77_021D6ADC *param0, const int param1); +static void ov77_021D6B48(SysTask *param0, void *param1); +static void ov77_021D6BAC(UnkStruct_ov77_021D6734 *param0, const u8 param1, int param2); +static void ov77_021D6C44(SysTask *param0, void *param1); static const u8 Unk_ov77_021D7930[4] = { 0x1, @@ -84,7 +85,7 @@ static const u8 Unk_ov77_021D7930[4] = { 0x1 }; -static void ov77_021D6670 () +static void ov77_021D6670() { const int v0 = 76; @@ -101,7 +102,7 @@ static void ov77_021D6670 () sub_0201F8E4(); } -static void ov77_021D66A0 (UnkStruct_ov77_021D6800 * param0, UnkStruct_ov115_02261520 * param1, UnkStruct_ov19_021DA864 * param2) +static void ov77_021D66A0(UnkStruct_ov77_021D6800 *param0, UnkStruct_ov115_02261520 *param1, UnkStruct_ov19_021DA864 *param2) { sub_020093B4(param2, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL); @@ -121,10 +122,10 @@ static void ov77_021D66A0 (UnkStruct_ov77_021D6800 * param0, UnkStruct_ov115_022 } } -UnkStruct_ov77_021D670C * ov77_021D670C (void) +UnkStruct_ov77_021D670C *ov77_021D670C(void) { int v0 = sizeof(UnkStruct_ov77_021D670C); - UnkStruct_ov77_021D670C * v1 = Heap_AllocFromHeap(76, v0); + UnkStruct_ov77_021D670C *v1 = Heap_AllocFromHeap(76, v0); memset(v1, 0, v0); @@ -134,10 +135,10 @@ UnkStruct_ov77_021D670C * ov77_021D670C (void) return v1; } -UnkStruct_ov77_021D6734 * ov77_021D6734 (const int param0) +UnkStruct_ov77_021D6734 *ov77_021D6734(const int param0) { int v0; - UnkStruct_ov77_021D6734 * v1; + UnkStruct_ov77_021D6734 *v1; v1 = Heap_AllocFromHeap(76, sizeof(UnkStruct_ov77_021D6734)); v0 = sizeof(UnkStruct_ov77_021D6ADC) * param0; @@ -149,7 +150,7 @@ UnkStruct_ov77_021D6734 * ov77_021D6734 (const int param0) return v1; } -void ov77_021D6760 (UnkStruct_ov77_021D6734 * param0) +void ov77_021D6760(UnkStruct_ov77_021D6734 *param0) { int v0; @@ -163,13 +164,13 @@ void ov77_021D6760 (UnkStruct_ov77_021D6734 * param0) Heap_FreeToHeap(param0); } -GraphicElementData ** ov77_021D6794 (UnkStruct_ov77_021D6734 * param0, const int param1) +GraphicElementData **ov77_021D6794(UnkStruct_ov77_021D6734 *param0, const int param1) { GF_ASSERT(param1 < param0->unk_00); return ¶m0->unk_04[param1].unk_04; } -void ov77_021D67B0 (UnkStruct_ov77_021D670C * param0) +void ov77_021D67B0(UnkStruct_ov77_021D670C *param0) { u8 v0; @@ -190,7 +191,7 @@ void ov77_021D67B0 (UnkStruct_ov77_021D670C * param0) Heap_FreeToHeap(param0); } -static void ov77_021D6800 (UnkStruct_ov77_021D6800 * param0) +static void ov77_021D6800(UnkStruct_ov77_021D6800 *param0) { int v0; const int v1 = 76; @@ -221,7 +222,7 @@ static void ov77_021D6800 (UnkStruct_ov77_021D6800 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov77_021D691C (UnkStruct_ov77_021D6800 * param0) +static void ov77_021D691C(UnkStruct_ov77_021D6800 *param0) { u8 v0; @@ -238,7 +239,7 @@ static void ov77_021D691C (UnkStruct_ov77_021D6800 * param0) sub_0201F8B4(); } -static void ov77_021D6964 (UnkStruct_ov77_021D6800 * param0) +static void ov77_021D6964(UnkStruct_ov77_021D6800 *param0) { int v0; UnkStruct_ov19_021DA864 v1; @@ -256,12 +257,12 @@ static void ov77_021D6964 (UnkStruct_ov77_021D6800 * param0) } } -static void ov77_021D69B4 (UnkStruct_ov77_021D6800 * param0) +static void ov77_021D69B4(UnkStruct_ov77_021D6800 *param0) { sub_020219F8(param0->unk_00); } -void ov77_021D69C0 (UnkStruct_ov77_021D670C * param0, const int param1) +void ov77_021D69C0(UnkStruct_ov77_021D670C *param0, const int param1) { if (param1 == 180) { ov77_021D6A0C(¶m0->unk_214[0], param0, 3, 3, 3, 0); @@ -272,7 +273,7 @@ void ov77_021D69C0 (UnkStruct_ov77_021D670C * param0, const int param1) ov77_021D69B4(¶m0->unk_00); } -static void ov77_021D6A0C (UnkStruct_ov77_021D6A0C * param0, UnkStruct_ov77_021D670C * param1, const u8 param2, const u8 param3, const u8 param4, const u8 param5) +static void ov77_021D6A0C(UnkStruct_ov77_021D6A0C *param0, UnkStruct_ov77_021D670C *param1, const u8 param2, const u8 param3, const u8 param4, const u8 param5) { param0->unk_00.unk_00 = param2; param0->unk_00.unk_01 = param3; @@ -284,10 +285,10 @@ static void ov77_021D6A0C (UnkStruct_ov77_021D6A0C * param0, UnkStruct_ov77_021D param0->unk_08 = SysTask_Start(ov77_021D6B0C, param0, 10); } -static void ov77_021D6A44 (UnkStruct_ov77_021D6ADC * param0, const u8 param1, const u8 param2) +static void ov77_021D6A44(UnkStruct_ov77_021D6ADC *param0, const u8 param1, const u8 param2) { u8 v0; - UnkStruct_ov77_021D6ADC * v1; + UnkStruct_ov77_021D6ADC *v1; int v2; if (param2 == 0) { @@ -316,10 +317,10 @@ static void ov77_021D6A44 (UnkStruct_ov77_021D6ADC * param0, const u8 param1, co } } -static UnkStruct_ov77_021D6ADC * ov77_021D6ADC (UnkStruct_ov77_021D6ADC * param0, const int param1) +static UnkStruct_ov77_021D6ADC *ov77_021D6ADC(UnkStruct_ov77_021D6ADC *param0, const int param1) { u8 v0; - UnkStruct_ov77_021D6ADC * v1; + UnkStruct_ov77_021D6ADC *v1; for (v0 = 0; v0 < 10; v0++) { if (!param0[v0].unk_00) { @@ -334,10 +335,10 @@ static UnkStruct_ov77_021D6ADC * ov77_021D6ADC (UnkStruct_ov77_021D6ADC * param0 return NULL; } -static void ov77_021D6B0C (SysTask * param0, void * param1) +static void ov77_021D6B0C(SysTask *param0, void *param1) { - UnkStruct_ov77_021D6A0C * v0 = param1; - UnkStruct_ov77_021D6B0C * v1 = &v0->unk_00; + UnkStruct_ov77_021D6A0C *v0 = param1; + UnkStruct_ov77_021D6B0C *v1 = &v0->unk_00; if (v1->unk_04++ >= v1->unk_01) { ov77_021D6A44(v0->unk_0C, v1->unk_00, v1->unk_05); @@ -350,9 +351,9 @@ static void ov77_021D6B0C (SysTask * param0, void * param1) } } -static void ov77_021D6B48 (SysTask * param0, void * param1) +static void ov77_021D6B48(SysTask *param0, void *param1) { - UnkStruct_ov77_021D6ADC * v0 = param1; + UnkStruct_ov77_021D6ADC *v0 = param1; { VecFx32 v1; @@ -374,16 +375,16 @@ static void ov77_021D6B48 (SysTask * param0, void * param1) } } -void ov77_021D6BA0 (UnkStruct_ov77_021D6734 * param0, int param1) +void ov77_021D6BA0(UnkStruct_ov77_021D6734 *param0, int param1) { ov77_021D6BAC(param0, 2, param1); } -static void ov77_021D6BAC (UnkStruct_ov77_021D6734 * param0, const u8 param1, int param2) +static void ov77_021D6BAC(UnkStruct_ov77_021D6734 *param0, const u8 param1, int param2) { u8 v0; - UnkStruct_ov77_021D6ADC * v1; - UnkStruct_ov77_021D6ADC * v2; + UnkStruct_ov77_021D6ADC *v1; + UnkStruct_ov77_021D6ADC *v2; v1 = param0->unk_04; @@ -412,9 +413,9 @@ static void ov77_021D6BAC (UnkStruct_ov77_021D6734 * param0, const u8 param1, in } } -static void ov77_021D6C44 (SysTask * param0, void * param1) +static void ov77_021D6C44(SysTask *param0, void *param1) { - UnkStruct_ov77_021D6ADC * v0 = param1; + UnkStruct_ov77_021D6ADC *v0 = param1; v0->unk_01++; diff --git a/src/overlay077/ov77_021D6C70.c b/src/overlay077/ov77_021D6C70.c index 5207af1608..37415708a8 100644 --- a/src/overlay077/ov77_021D6C70.c +++ b/src/overlay077/ov77_021D6C70.c @@ -1,29 +1,28 @@ +#include "overlay077/ov77_021D6C70.h" + #include #include -#include "struct_decls/struct_02007768_decl.h" #include "struct_decls/sprite_decl.h" +#include "struct_decls/struct_02007768_decl.h" #include "struct_decls/struct_02014014_decl.h" - #include "struct_defs/archived_sprite.h" +#include "camera.h" +#include "heap.h" +#include "pokemon.h" +#include "rtc.h" #include "spl.h" - #include "unk_0200762C.h" -#include "rtc.h" #include "unk_02014000.h" -#include "heap.h" -#include "camera.h" #include "unk_0202419C.h" -#include "pokemon.h" -#include "overlay077/ov77_021D6C70.h" typedef struct UnkStruct_ov77_021D6CFC_t { - UnkStruct_02007768 * unk_00; - Sprite * unk_04[3]; + UnkStruct_02007768 *unk_00; + Sprite *unk_04[3]; BOOL unk_10; - void * unk_14; - UnkStruct_02014014 * unk_18; + void *unk_14; + UnkStruct_02014014 *unk_18; int unk_1C[3]; u8 unk_28; u8 unk_29; @@ -34,7 +33,7 @@ typedef struct { int unk_04; } UnkStruct_ov77_021D7958; -typedef BOOL (* UnkFuncPtr_ov77_021D7940)(UnkStruct_ov77_021D6CFC *, const u8); +typedef BOOL (*UnkFuncPtr_ov77_021D7940)(UnkStruct_ov77_021D6CFC *, const u8); typedef struct { UnkFuncPtr_ov77_021D7940 unk_00; @@ -42,21 +41,21 @@ typedef struct { } UnkStruct_ov77_021D7940; static void ov77_021D725C(void); -static void ov77_021D7268(UnkSPLStruct6 * param0); -static BOOL ov77_021D7004(UnkStruct_ov77_021D6CFC * param0, const u8 param1); -static BOOL ov77_021D7074(UnkStruct_ov77_021D6CFC * param0, const u8 param1); -static BOOL ov77_021D70CC(UnkStruct_ov77_021D6CFC * param0, const u8 param1); -static BOOL ov77_021D713C(UnkStruct_ov77_021D6CFC * param0, const u8 param1); -static BOOL ov77_021D7194(UnkStruct_ov77_021D6CFC * param0, const u8 param1); -static BOOL ov77_021D7204(UnkStruct_ov77_021D6CFC * param0, const u8 param1); +static void ov77_021D7268(UnkSPLStruct6 *param0); +static BOOL ov77_021D7004(UnkStruct_ov77_021D6CFC *param0, const u8 param1); +static BOOL ov77_021D7074(UnkStruct_ov77_021D6CFC *param0, const u8 param1); +static BOOL ov77_021D70CC(UnkStruct_ov77_021D6CFC *param0, const u8 param1); +static BOOL ov77_021D713C(UnkStruct_ov77_021D6CFC *param0, const u8 param1); +static BOOL ov77_021D7194(UnkStruct_ov77_021D6CFC *param0, const u8 param1); +static BOOL ov77_021D7204(UnkStruct_ov77_021D6CFC *param0, const u8 param1); static const UnkStruct_ov77_021D7958 Unk_ov77_021D7958[3] = { - {0x5C, 0xC0}, - {0xE0, 0xC0}, - {0x50, 0xC0} + { 0x5C, 0xC0 }, + { 0xE0, 0xC0 }, + { 0x50, 0xC0 } }; -static u32 ov77_021D6C70 (u32 param0, BOOL param1) +static u32 ov77_021D6C70(u32 param0, BOOL param1) { u32 v0; NNSGfdTexKey v1; @@ -71,7 +70,7 @@ static u32 ov77_021D6C70 (u32 param0, BOOL param1) return v0; } -static u32 ov77_021D6C94 (u32 param0, BOOL param1) +static u32 ov77_021D6C94(u32 param0, BOOL param1) { NNSGfdPlttKey v0; u32 v1; @@ -89,18 +88,18 @@ static u32 ov77_021D6C94 (u32 param0, BOOL param1) return v1; } -const int ov77_021D6CB8 (void) +const int ov77_021D6CB8(void) { return sizeof(UnkStruct_ov77_021D6CFC); } -UnkStruct_02014014 * ov77_021D6CBC (UnkStruct_ov77_021D6CFC * param0) +UnkStruct_02014014 *ov77_021D6CBC(UnkStruct_ov77_021D6CFC *param0) { GF_ASSERT(param0 != NULL && param0->unk_18 != NULL); return param0->unk_18; } -UnkSPLStruct6 * ov77_021D6CD0 (UnkStruct_ov77_021D6CFC * param0, int param1) +UnkSPLStruct6 *ov77_021D6CD0(UnkStruct_ov77_021D6CFC *param0, int param1) { GF_ASSERT(param0 != NULL && param0->unk_18 != NULL); @@ -108,13 +107,13 @@ UnkSPLStruct6 * ov77_021D6CD0 (UnkStruct_ov77_021D6CFC * param0, int param1) return sub_020146F4(param0->unk_18, param1, NULL, NULL); } -void ov77_021D6CFC (UnkStruct_ov77_021D6CFC * param0) +void ov77_021D6CFC(UnkStruct_ov77_021D6CFC *param0) { u8 v0; ArchivedSprite v1; - Camera * camera; - void * v3; - int v4[3] = {389, 392, 395}; + Camera *camera; + void *v3; + int v4[3] = { 389, 392, 395 }; int v5[3]; int v6, v7; RTCTime v8; @@ -163,21 +162,21 @@ void ov77_021D6CFC (UnkStruct_ov77_021D6CFC * param0) sub_020144CC(param0->unk_18, v3, (1 << 1) | (1 << 3), 1); } -void ov77_021D6E28 (UnkStruct_ov77_021D6CFC * param0) +void ov77_021D6E28(UnkStruct_ov77_021D6CFC *param0) { sub_0201411C(param0->unk_18); Heap_FreeToHeap(param0->unk_14); sub_02007B6C(param0->unk_00); } -void ov77_021D6E40 (UnkStruct_ov77_021D6CFC * param0) +void ov77_021D6E40(UnkStruct_ov77_021D6CFC *param0) { if (param0 != NULL) { sub_02008A94(param0->unk_00); } } -void ov77_021D6E50 (UnkStruct_ov77_021D6CFC * param0) +void ov77_021D6E50(UnkStruct_ov77_021D6CFC *param0) { if (param0 != NULL) { NNS_G3dGeFlushBuffer(); @@ -190,20 +189,20 @@ void ov77_021D6E50 (UnkStruct_ov77_021D6CFC * param0) } static const UnkStruct_ov77_021D7940 Unk_ov77_021D7940[3] = { - {ov77_021D7004, ov77_021D7074}, - {ov77_021D70CC, ov77_021D713C}, - {ov77_021D7194, ov77_021D7204} + { ov77_021D7004, ov77_021D7074 }, + { ov77_021D70CC, ov77_021D713C }, + { ov77_021D7194, ov77_021D7204 } }; static const int Unk_ov77_021D7970[3][3] = { - {0x6, 0x7, 0x8}, - {0x3, 0x4, 0x5}, - {0x0, 0x1, 0x2} + { 0x6, 0x7, 0x8 }, + { 0x3, 0x4, 0x5 }, + { 0x0, 0x1, 0x2 } }; -BOOL ov77_021D6E78 (UnkStruct_ov77_021D6CFC * param0, const u8 param1, const int param2) +BOOL ov77_021D6E78(UnkStruct_ov77_021D6CFC *param0, const u8 param1, const int param2) { - u8 * v0 = ¶m0->unk_28; + u8 *v0 = ¶m0->unk_28; switch (*v0) { case 0: @@ -251,9 +250,9 @@ BOOL ov77_021D6E78 (UnkStruct_ov77_021D6CFC * param0, const u8 param1, const int return 0; } -static BOOL ov77_021D7004 (UnkStruct_ov77_021D6CFC * param0, const u8 param1) +static BOOL ov77_021D7004(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { - Sprite * v0 = param0->unk_04[param1]; + Sprite *v0 = param0->unk_04[param1]; sub_02008274(v0, 0, 6); sub_02008274(v0, 1, -16); @@ -272,9 +271,9 @@ static BOOL ov77_021D7004 (UnkStruct_ov77_021D6CFC * param0, const u8 param1) return 0; } -static BOOL ov77_021D7074 (UnkStruct_ov77_021D6CFC * param0, const u8 param1) +static BOOL ov77_021D7074(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { - Sprite * v0 = param0->unk_04[param1]; + Sprite *v0 = param0->unk_04[param1]; sub_02008274(v0, 0, -3); sub_02008274(v0, 1, -18); @@ -290,9 +289,9 @@ static BOOL ov77_021D7074 (UnkStruct_ov77_021D6CFC * param0, const u8 param1) return 0; } -static BOOL ov77_021D70CC (UnkStruct_ov77_021D6CFC * param0, const u8 param1) +static BOOL ov77_021D70CC(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { - Sprite * v0 = param0->unk_04[param1]; + Sprite *v0 = param0->unk_04[param1]; sub_02008274(v0, 0, -16); sub_02008274(v0, 1, -16); @@ -311,9 +310,9 @@ static BOOL ov77_021D70CC (UnkStruct_ov77_021D6CFC * param0, const u8 param1) return 0; } -static BOOL ov77_021D713C (UnkStruct_ov77_021D6CFC * param0, const u8 param1) +static BOOL ov77_021D713C(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { - Sprite * v0 = param0->unk_04[param1]; + Sprite *v0 = param0->unk_04[param1]; sub_02008274(v0, 0, -6); sub_02008274(v0, 1, -16); @@ -329,9 +328,9 @@ static BOOL ov77_021D713C (UnkStruct_ov77_021D6CFC * param0, const u8 param1) return 0; } -static BOOL ov77_021D7194 (UnkStruct_ov77_021D6CFC * param0, const u8 param1) +static BOOL ov77_021D7194(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { - Sprite * v0 = param0->unk_04[param1]; + Sprite *v0 = param0->unk_04[param1]; sub_02008274(v0, 0, 8); sub_02008274(v0, 1, -16); @@ -350,9 +349,9 @@ static BOOL ov77_021D7194 (UnkStruct_ov77_021D6CFC * param0, const u8 param1) return 0; } -static BOOL ov77_021D7204 (UnkStruct_ov77_021D6CFC * param0, const u8 param1) +static BOOL ov77_021D7204(UnkStruct_ov77_021D6CFC *param0, const u8 param1) { - Sprite * v0 = param0->unk_04[param1]; + Sprite *v0 = param0->unk_04[param1]; sub_02008274(v0, 0, 6); sub_02008274(v0, 1, -20); @@ -368,7 +367,7 @@ static BOOL ov77_021D7204 (UnkStruct_ov77_021D6CFC * param0, const u8 param1) return 0; } -static void ov77_021D725C (void) +static void ov77_021D725C(void) { int v0; @@ -377,10 +376,10 @@ static void ov77_021D725C (void) sub_020146C0(); } -static void ov77_021D7268 (UnkSPLStruct6 * param0) +static void ov77_021D7268(UnkSPLStruct6 *param0) { - Sprite * v0 = sub_02014764(); - VecFx32 v1 = {0, 0, 0}; + Sprite *v0 = sub_02014764(); + VecFx32 v1 = { 0, 0, 0 }; v1.x = 172 * (sub_020080C0(v0, 0) - 128); v1.y = 172 * (sub_020080C0(v0, 1) - 96); diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c index f71533f0d2..fbc8925b14 100644 --- a/src/overlay079/ov79_021D0D80.c +++ b/src/overlay079/ov79_021D0D80.c @@ -1,71 +1,71 @@ +#include "overlay079/ov79_021D0D80.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_02099F80.h" + #include "overlay007/struct_ov7_0224F358.h" +#include "overlay079/ov79_021D183C.h" +#include "overlay079/ov79_021D20F4.h" #include "overlay079/struct_ov79_021D0E1C.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "string_template.h" +#include "touch_screen.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_020158A8.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_0208C098.h" #include "unk_02098FFC.h" -#include "overlay079/ov79_021D0D80.h" -#include "overlay079/ov79_021D183C.h" -#include "overlay079/ov79_021D20F4.h" -typedef int (* UnkFuncPtr_ov79_021D394C)(UnkStruct_ov79_021D0E1C *); +typedef int (*UnkFuncPtr_ov79_021D394C)(UnkStruct_ov79_021D0E1C *); -int ov79_021D0D80(OverlayManager * param0, int * param1); -int ov79_021D0DC4(OverlayManager * param0, int * param1); -int ov79_021D0DDC(OverlayManager * param0, int * param1); -static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C * param0); -static int ov79_021D122C(UnkStruct_ov79_021D0E1C * param0); -static int ov79_021D12A0(UnkStruct_ov79_021D0E1C * param0); +int ov79_021D0D80(OverlayManager *param0, int *param1); +int ov79_021D0DC4(OverlayManager *param0, int *param1); +int ov79_021D0DDC(OverlayManager *param0, int *param1); +static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C *param0); +static int ov79_021D122C(UnkStruct_ov79_021D0E1C *param0); +static int ov79_021D12A0(UnkStruct_ov79_021D0E1C *param0); static void ov79_021D130C(void); -static void ov79_021D132C(UnkStruct_ov79_021D0E1C * param0); -static void ov79_021D13A4(UnkStruct_ov79_021D0E1C * param0); -static void ov79_021D13C4(UnkStruct_ov79_021D0E1C * param0); -static void ov79_021D14A0(UnkStruct_ov79_021D0E1C * param0); -static void ov79_021D14A4(UnkStruct_ov79_021D0E1C * param0); -static void ov79_021D1548(UnkStruct_ov79_021D0E1C * param0); -static void ov79_021D1568(UnkStruct_ov79_021D0E1C * param0); -static void ov79_021D1618(UnkStruct_ov79_021D0E1C * param0); -static void ov79_021D167C(UnkStruct_ov79_021D0E1C * param0); -static void ov79_021D17E8(UnkStruct_ov79_021D0E1C * param0); -static int ov79_021D0FEC(UnkStruct_ov79_021D0E1C * param0); -static int ov79_021D10A0(UnkStruct_ov79_021D0E1C * param0); -static int ov79_021D10B8(UnkStruct_ov79_021D0E1C * param0); -static int ov79_021D114C(UnkStruct_ov79_021D0E1C * param0); -static int ov79_021D116C(UnkStruct_ov79_021D0E1C * param0); -static int ov79_021D11C0(UnkStruct_ov79_021D0E1C * param0); +static void ov79_021D132C(UnkStruct_ov79_021D0E1C *param0); +static void ov79_021D13A4(UnkStruct_ov79_021D0E1C *param0); +static void ov79_021D13C4(UnkStruct_ov79_021D0E1C *param0); +static void ov79_021D14A0(UnkStruct_ov79_021D0E1C *param0); +static void ov79_021D14A4(UnkStruct_ov79_021D0E1C *param0); +static void ov79_021D1548(UnkStruct_ov79_021D0E1C *param0); +static void ov79_021D1568(UnkStruct_ov79_021D0E1C *param0); +static void ov79_021D1618(UnkStruct_ov79_021D0E1C *param0); +static void ov79_021D167C(UnkStruct_ov79_021D0E1C *param0); +static void ov79_021D17E8(UnkStruct_ov79_021D0E1C *param0); +static int ov79_021D0FEC(UnkStruct_ov79_021D0E1C *param0); +static int ov79_021D10A0(UnkStruct_ov79_021D0E1C *param0); +static int ov79_021D10B8(UnkStruct_ov79_021D0E1C *param0); +static int ov79_021D114C(UnkStruct_ov79_021D0E1C *param0); +static int ov79_021D116C(UnkStruct_ov79_021D0E1C *param0); +static int ov79_021D11C0(UnkStruct_ov79_021D0E1C *param0); static const UnkFuncPtr_ov79_021D394C Unk_ov79_021D394C[] = { ov79_021D0FEC, @@ -76,10 +76,10 @@ static const UnkFuncPtr_ov79_021D394C Unk_ov79_021D394C[] = { ov79_021D11C0 }; -int ov79_021D0D80 (OverlayManager * param0, int * param1) +int ov79_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov79_021D0E1C * v0 = NULL; - UnkStruct_0203D9B8 * v1 = OverlayManager_Args(param0); + UnkStruct_ov79_021D0E1C *v0 = NULL; + UnkStruct_0203D9B8 *v1 = OverlayManager_Args(param0); Heap_Create(3, 45, 0x20000); @@ -94,9 +94,9 @@ int ov79_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov79_021D0DC4 (OverlayManager * param0, int * param1) +int ov79_021D0DC4(OverlayManager *param0, int *param1) { - UnkStruct_ov79_021D0E1C * v0 = (UnkStruct_ov79_021D0E1C *)OverlayManager_Data(param0); + UnkStruct_ov79_021D0E1C *v0 = (UnkStruct_ov79_021D0E1C *)OverlayManager_Data(param0); if (ov79_021D0E1C(v0)) { return 1; @@ -105,9 +105,9 @@ int ov79_021D0DC4 (OverlayManager * param0, int * param1) return 0; } -int ov79_021D0DDC (OverlayManager * param0, int * param1) +int ov79_021D0DDC(OverlayManager *param0, int *param1) { - UnkStruct_ov79_021D0E1C * v0 = (UnkStruct_ov79_021D0E1C *)OverlayManager_Data(param0); + UnkStruct_ov79_021D0E1C *v0 = (UnkStruct_ov79_021D0E1C *)OverlayManager_Data(param0); v0->unk_20->unk_01 = v0->unk_1A; v0->unk_20->unk_02 = v0->unk_10; @@ -121,7 +121,7 @@ int ov79_021D0DDC (OverlayManager * param0, int * param1) return 1; } -static int ov79_021D0E1C (UnkStruct_ov79_021D0E1C * param0) +static int ov79_021D0E1C(UnkStruct_ov79_021D0E1C *param0) { switch (param0->unk_04) { case 0: @@ -196,9 +196,9 @@ static int ov79_021D0E1C (UnkStruct_ov79_021D0E1C * param0) return 0; } -static void ov79_021D0F7C (void * param0) +static void ov79_021D0F7C(void *param0) { - UnkStruct_ov79_021D0E1C * v0 = (UnkStruct_ov79_021D0E1C *)param0; + UnkStruct_ov79_021D0E1C *v0 = (UnkStruct_ov79_021D0E1C *)param0; if (v0->unk_1B8 != NULL) { sub_0200C800(); @@ -210,18 +210,18 @@ static void ov79_021D0F7C (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static int ov79_021D0FB0 (UnkStruct_ov79_021D0E1C * param0) +static int ov79_021D0FB0(UnkStruct_ov79_021D0E1C *param0) { int v0; u16 v1; static const TouchScreenRect v2[] = { - {0x22, 0x3E, 0x60, 0xA0}, - {0x52, 0x6E, 0xA0, 0xE0}, - {0x94, 0xB0, 0x88, 0xC8}, - {0x96, 0xB2, 0x38, 0x78}, - {0x52, 0x6E, 0x20, 0x60}, - {0x66, 0x82, 0x60, 0xA0}, - {0xFF, 0x0, 0x0, 0x0} + { 0x22, 0x3E, 0x60, 0xA0 }, + { 0x52, 0x6E, 0xA0, 0xE0 }, + { 0x94, 0xB0, 0x88, 0xC8 }, + { 0x96, 0xB2, 0x38, 0x78 }, + { 0x52, 0x6E, 0x20, 0x60 }, + { 0x66, 0x82, 0x60, 0xA0 }, + { 0xFF, 0x0, 0x0, 0x0 } }; v0 = sub_02022664(v2); @@ -241,7 +241,7 @@ static int ov79_021D0FB0 (UnkStruct_ov79_021D0E1C * param0) return -1; } -static int ov79_021D0FEC (UnkStruct_ov79_021D0E1C * param0) +static int ov79_021D0FEC(UnkStruct_ov79_021D0E1C *param0) { u32 v0 = 0xffffffff; int v1 = 0; @@ -294,7 +294,7 @@ static int ov79_021D0FEC (UnkStruct_ov79_021D0E1C * param0) return 0; } -static int ov79_021D10A0 (UnkStruct_ov79_021D0E1C * param0) +static int ov79_021D10A0(UnkStruct_ov79_021D0E1C *param0) { u32 v0; @@ -306,7 +306,7 @@ static int ov79_021D10A0 (UnkStruct_ov79_021D0E1C * param0) return 0; } -static int ov79_021D10B8 (UnkStruct_ov79_021D0E1C * param0) +static int ov79_021D10B8(UnkStruct_ov79_021D0E1C *param0) { u32 v0; @@ -345,7 +345,7 @@ static int ov79_021D10B8 (UnkStruct_ov79_021D0E1C * param0) return 0; } -static int ov79_021D114C (UnkStruct_ov79_021D0E1C * param0) +static int ov79_021D114C(UnkStruct_ov79_021D0E1C *param0) { if (Message_Printing(param0->unk_1F)) { return 0; @@ -356,7 +356,7 @@ static int ov79_021D114C (UnkStruct_ov79_021D0E1C * param0) return 0; } -static int ov79_021D116C (UnkStruct_ov79_021D0E1C * param0) +static int ov79_021D116C(UnkStruct_ov79_021D0E1C *param0) { switch (sub_02002114(param0->unk_D4, param0->unk_00)) { case 0: @@ -374,7 +374,7 @@ static int ov79_021D116C (UnkStruct_ov79_021D0E1C * param0) return 0; } -static int ov79_021D11C0 (UnkStruct_ov79_021D0E1C * param0) +static int ov79_021D11C0(UnkStruct_ov79_021D0E1C *param0) { if (Message_Printing(param0->unk_1F)) { return 0; @@ -398,7 +398,7 @@ static int ov79_021D11C0 (UnkStruct_ov79_021D0E1C * param0) return 0; } -static int ov79_021D122C (UnkStruct_ov79_021D0E1C * param0) +static int ov79_021D122C(UnkStruct_ov79_021D0E1C *param0) { switch (param0->unk_08) { case 0: @@ -429,7 +429,7 @@ static int ov79_021D122C (UnkStruct_ov79_021D0E1C * param0) return 0; } -static int ov79_021D12A0 (UnkStruct_ov79_021D0E1C * param0) +static int ov79_021D12A0(UnkStruct_ov79_021D0E1C *param0) { switch (param0->unk_08) { case 0: @@ -461,7 +461,7 @@ static int ov79_021D12A0 (UnkStruct_ov79_021D0E1C * param0) return 0; } -static void ov79_021D130C (void) +static void ov79_021D130C(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -479,7 +479,7 @@ static void ov79_021D130C (void) GXLayers_SetBanks(&v0); } -static void ov79_021D132C (UnkStruct_ov79_021D0E1C * param0) +static void ov79_021D132C(UnkStruct_ov79_021D0E1C *param0) { int v0, v1; @@ -513,7 +513,7 @@ static void ov79_021D132C (UnkStruct_ov79_021D0E1C * param0) 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -528,7 +528,7 @@ static void ov79_021D132C (UnkStruct_ov79_021D0E1C * param0) 0x1, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -543,7 +543,7 @@ static void ov79_021D132C (UnkStruct_ov79_021D0E1C * param0) 0x3, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -558,7 +558,7 @@ static void ov79_021D132C (UnkStruct_ov79_021D0E1C * param0) 0x3, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -573,7 +573,7 @@ static void ov79_021D132C (UnkStruct_ov79_021D0E1C * param0) 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -588,8 +588,8 @@ static void ov79_021D132C (UnkStruct_ov79_021D0E1C * param0) 0x1, 0x0, 0x0, - 0x0 - } + 0x0, + }, }; v1 = 0; @@ -603,7 +603,7 @@ static void ov79_021D132C (UnkStruct_ov79_021D0E1C * param0) } } -static void ov79_021D13A4 (UnkStruct_ov79_021D0E1C * param0) +static void ov79_021D13A4(UnkStruct_ov79_021D0E1C *param0) { int v0; @@ -614,9 +614,9 @@ static void ov79_021D13A4 (UnkStruct_ov79_021D0E1C * param0) Heap_FreeToHeap(param0->unk_24); } -static void ov79_021D13C4 (UnkStruct_ov79_021D0E1C * param0) +static void ov79_021D13C4(UnkStruct_ov79_021D0E1C *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PORU_GRA, param0->unk_00); @@ -631,31 +631,31 @@ static void ov79_021D13C4 (UnkStruct_ov79_021D0E1C * param0) sub_0201C3C0(param0->unk_24, 5); } -static void ov79_021D14A0 (UnkStruct_ov79_021D0E1C * param0) +static void ov79_021D14A0(UnkStruct_ov79_021D0E1C *param0) { return; } -static void ov79_021D14A4 (UnkStruct_ov79_021D0E1C * param0) +static void ov79_021D14A4(UnkStruct_ov79_021D0E1C *param0) { int v0; static const struct { u8 unk_00, unk_01, unk_02, unk_03, unk_04, unk_05; u16 unk_06; } v1[] = { - {0x2, 0x2, 0x4, 0x16, 0xC, 0xD, 0x28}, - {0x2, 0xB, 0x14, 0xA, 0x2, 0xD, 0x131}, - {0x1, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x145}, - {0x1, 0x1A, 0x11, 0x5, 0x6, 0xD, 0x1B1}, - {0x1, 0x1A, 0xD, 0x5, 0x4, 0xD, 0x1CF}, - {0x1, 0x0, 0x0, 0x10, 0x2, 0xD, 0x1E3}, - {0x4, 0x6, 0x0, 0x14, 0x3, 0xD, 0x1}, - {0x4, 0xC, 0x5, 0x8, 0x3, 0x5, 0x41}, - {0x4, 0x14, 0xA, 0x8, 0x3, 0x6, 0x59}, - {0x4, 0x11, 0x13, 0x8, 0x3, 0x7, 0x71}, - {0x4, 0x7, 0x13, 0x8, 0x3, 0x8, 0x89}, - {0x4, 0x4, 0xA, 0x8, 0x3, 0x9, 0xA1}, - {0x4, 0xC, 0xD, 0x8, 0x3, 0xA, 0xB9} + { 0x2, 0x2, 0x4, 0x16, 0xC, 0xD, 0x28 }, + { 0x2, 0xB, 0x14, 0xA, 0x2, 0xD, 0x131 }, + { 0x1, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x145 }, + { 0x1, 0x1A, 0x11, 0x5, 0x6, 0xD, 0x1B1 }, + { 0x1, 0x1A, 0xD, 0x5, 0x4, 0xD, 0x1CF }, + { 0x1, 0x0, 0x0, 0x10, 0x2, 0xD, 0x1E3 }, + { 0x4, 0x6, 0x0, 0x14, 0x3, 0xD, 0x1 }, + { 0x4, 0xC, 0x5, 0x8, 0x3, 0x5, 0x41 }, + { 0x4, 0x14, 0xA, 0x8, 0x3, 0x6, 0x59 }, + { 0x4, 0x11, 0x13, 0x8, 0x3, 0x7, 0x71 }, + { 0x4, 0x7, 0x13, 0x8, 0x3, 0x8, 0x89 }, + { 0x4, 0x4, 0xA, 0x8, 0x3, 0x9, 0xA1 }, + { 0x4, 0xC, 0xD, 0x8, 0x3, 0xA, 0xB9 } }; sub_0200DAA4(param0->unk_24, 1, 1 + 18 + 12, 15, 0, param0->unk_00); @@ -672,7 +672,7 @@ static void ov79_021D14A4 (UnkStruct_ov79_021D0E1C * param0) ov79_021D2078(param0); } -static void ov79_021D1548 (UnkStruct_ov79_021D0E1C * param0) +static void ov79_021D1548(UnkStruct_ov79_021D0E1C *param0) { int v0 = 0; @@ -682,7 +682,7 @@ static void ov79_021D1548 (UnkStruct_ov79_021D0E1C * param0) } } -static void ov79_021D1568 (UnkStruct_ov79_021D0E1C * param0) +static void ov79_021D1568(UnkStruct_ov79_021D0E1C *param0) { int v0 = 0; @@ -712,7 +712,7 @@ static void ov79_021D1568 (UnkStruct_ov79_021D0E1C * param0) param0->unk_30.unk_4C = Options_TextFrameDelay(param0->unk_20->unk_18); } -static void ov79_021D1618 (UnkStruct_ov79_021D0E1C * param0) +static void ov79_021D1618(UnkStruct_ov79_021D0E1C *param0) { int v0 = 0; @@ -739,15 +739,15 @@ static void ov79_021D1618 (UnkStruct_ov79_021D0E1C * param0) sub_02002C60(2); } -static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0) +static void ov79_021D167C(UnkStruct_ov79_021D0E1C *param0) { int v0; static const UnkStruct_ov7_0224F358 v1[] = { - {0x0, 0x69, 0x28, 0x0, 0x0, 0x1, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x50, 0x12, 0x0, 0x1, 0x2, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x50, 0x8C, 0x0, 0x2, 0x2, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0xA, 0x64, 0x0, 0x3, 0x3, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1, 0xA, 0x64, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DSUB, 0x0, 0x0, 0x0, 0x0} + { 0x0, 0x69, 0x28, 0x0, 0x0, 0x1, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x50, 0x12, 0x0, 0x1, 0x2, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x50, 0x8C, 0x0, 0x2, 0x2, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0xA, 0x64, 0x0, 0x3, 0x3, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0xA, 0x64, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DSUB, 0x0, 0x0, 0x0, 0x0 } }; for (v0 = 0; v0 < 3; v0++) { @@ -763,11 +763,11 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0) static const struct { u16 unk_00, unk_02; } v2[] = { - {0x28, 0x9C}, - {0x36, 0xA5}, - {0x31, 0xB4}, - {0x1F, 0xB4}, - {0x1A, 0xA5} + { 0x28, 0x9C }, + { 0x36, 0xA5 }, + { 0x31, 0xB4 }, + { 0x1F, 0xB4 }, + { 0x1A, 0xA5 } }; param0->unk_1CC[v0] = sub_0200CA08(param0->unk_1B8, param0->unk_1BC, &v1[3]); @@ -781,12 +781,12 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0) static const struct { u16 unk_00, unk_02; } v3[] = { - {0x80, 0x30}, - {0xC0, 0x60}, - {0xA8, 0xA2}, - {0x58, 0xA4}, - {0x40, 0x60}, - {0x80, 0x74} + { 0x80, 0x30 }, + { 0xC0, 0x60 }, + { 0xA8, 0xA2 }, + { 0x58, 0xA4 }, + { 0x40, 0x60 }, + { 0x80, 0x74 } }; param0->unk_1E0[v0] = sub_0200CA08(param0->unk_1B8, param0->unk_1BC, &v1[4]); @@ -804,7 +804,7 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0) SpriteActor_EnableObject(param0->unk_1FC->unk_04, 0); } -static void ov79_021D17E8 (UnkStruct_ov79_021D0E1C * param0) +static void ov79_021D17E8(UnkStruct_ov79_021D0E1C *param0) { int v0; diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c index 20b3344380..acdc4a7fe4 100644 --- a/src/overlay079/ov79_021D183C.c +++ b/src/overlay079/ov79_021D183C.c @@ -1,21 +1,23 @@ +#include "overlay079/ov79_021D183C.h" + #include #include #include "struct_decls/struct_0200112C_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_020989DC.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay079/struct_ov79_021D0E1C.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "string_template.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" @@ -23,13 +25,11 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02098FFC.h" -#include "overlay079/ov79_021D183C.h" -static void ov79_021D1D88(BmpList * param0, u32 param1, u8 param2); -static void ov79_021D1D94(BmpList * param0, u32 param1, u8 param2); -static void ov79_021D1FA8(BmpList * param0, u32 param1, u8 param2); +static void ov79_021D1D88(BmpList *param0, u32 param1, u8 param2); +static void ov79_021D1D94(BmpList *param0, u32 param1, u8 param2); +static void ov79_021D1FA8(BmpList *param0, u32 param1, u8 param2); static const UnkStruct_ov84_02240FA8 Unk_ov79_021D3BB0 = { NULL, @@ -75,15 +75,15 @@ static const UnkStruct_ov84_02240FA8 Unk_ov79_021D3B90 = { NULL }; -static void ov79_021D183C (UnkStruct_020989DC * param0) +static void ov79_021D183C(UnkStruct_020989DC *param0) { param0->unk_04_val1_5 = 0; param0->unk_07 = param0->unk_06 = 0xFF; } -static void ov79_021D1850 (UnkStruct_ov79_021D0E1C * param0, Strbuf *param1, u8 param2, u8 param3) +static void ov79_021D1850(UnkStruct_ov79_021D0E1C *param0, Strbuf *param1, u8 param2, u8 param3) { - u32 v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0))); + u32 v0 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)); if (param3) { sub_0200E060(¶m0->unk_E8[2], 1, 1, 14); @@ -96,11 +96,11 @@ static void ov79_021D1850 (UnkStruct_ov79_021D0E1C * param0, Strbuf *param1, u8 param0->unk_1F = sub_0201D78C(¶m0->unk_E8[2], 1, param1, 0, 0, param2, v0, NULL); } -static u16 ov79_021D18B4 (UnkStruct_0203D9B8 * param0, UnkStruct_ov79_021D0E1C * param1) +static u16 ov79_021D18B4(UnkStruct_0203D9B8 *param0, UnkStruct_ov79_021D0E1C *param1) { u16 v0, v1 = 0; u8 v2, v3; - UnkStruct_020989DC * v4; + UnkStruct_020989DC *v4; param1->unk_1D = param1->unk_1E = 0xFF; @@ -146,10 +146,10 @@ static u16 ov79_021D18B4 (UnkStruct_0203D9B8 * param0, UnkStruct_ov79_021D0E1C * return v1; } -void ov79_021D196C (UnkStruct_ov79_021D0E1C * param0) +void ov79_021D196C(UnkStruct_ov79_021D0E1C *param0) { u8 v0 = 0, v1 = 0; - UnkStruct_020989DC * v2; + UnkStruct_020989DC *v2; param0->unk_1C = ov79_021D18B4(param0->unk_20, param0); param0->unk_CC = sub_02013A04(param0->unk_1C, param0->unk_00); @@ -193,7 +193,7 @@ void ov79_021D196C (UnkStruct_ov79_021D0E1C * param0) param0->unk_16 = 1; } -void ov79_021D1AB8 (UnkStruct_ov79_021D0E1C * param0, BOOL param1) +void ov79_021D1AB8(UnkStruct_ov79_021D0E1C *param0, BOOL param1) { BGL_WindowColor(&(param0->unk_E8[0]), ((0 << 4) | 0), 0, 0, 22 * 8, 12 * 8); @@ -211,7 +211,7 @@ void ov79_021D1AB8 (UnkStruct_ov79_021D0E1C * param0, BOOL param1) param0->unk_CC = NULL; } -void ov79_021D1B24 (UnkStruct_ov79_021D0E1C * param0, u8 param1, u8 param2) +void ov79_021D1B24(UnkStruct_ov79_021D0E1C *param0, u8 param1, u8 param2) { switch (param2) { case 0: @@ -247,10 +247,10 @@ void ov79_021D1B24 (UnkStruct_ov79_021D0E1C * param0, u8 param1, u8 param2) sub_0201A954(¶m0->unk_E8[7 + param1]); } -void ov79_021D1C44 (UnkStruct_ov79_021D0E1C * param0, u8 param1) +void ov79_021D1C44(UnkStruct_ov79_021D0E1C *param0, u8 param1) { int v0; - u32 v1 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0))); + u32 v1 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)); Sound_PlayEffect(1508); @@ -283,7 +283,7 @@ void ov79_021D1C44 (UnkStruct_ov79_021D0E1C * param0, u8 param1) sub_0201D78C(¶m0->unk_E8[6], 0, param0->unk_30.unk_38[param0->unk_1B], v0 / 2, 3, 0, v1, NULL); } -static void ov79_021D1D20 (UnkStruct_ov79_021D0E1C * param0, UnkStruct_020989DC * param1) +static void ov79_021D1D20(UnkStruct_ov79_021D0E1C *param0, UnkStruct_020989DC *param1) { u8 v0 = 0, v1 = 0x1; @@ -305,22 +305,22 @@ static void ov79_021D1D20 (UnkStruct_ov79_021D0E1C * param0, UnkStruct_020989DC } } -static void ov79_021D1D88 (BmpList * param0, u32 param1, u8 param2) +static void ov79_021D1D88(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov79_021D0E1C * v0 = (UnkStruct_ov79_021D0E1C *)sub_02001504(param0, 19); + UnkStruct_ov79_021D0E1C *v0 = (UnkStruct_ov79_021D0E1C *)sub_02001504(param0, 19); u32 v1; - v1 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0))); + v1 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)); } -static void ov79_021D1D94 (BmpList * param0, u32 param1, u8 param2) +static void ov79_021D1D94(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov79_021D0E1C * v0 = (UnkStruct_ov79_021D0E1C *)sub_02001504(param0, 19); + UnkStruct_ov79_021D0E1C *v0 = (UnkStruct_ov79_021D0E1C *)sub_02001504(param0, 19); u32 v1; u16 v2, v3; u8 v4 = 0; - v1 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0))); + v1 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)); if (!param2) { Sound_PlayEffect(1500); @@ -366,7 +366,7 @@ static void ov79_021D1D94 (BmpList * param0, u32 param1, u8 param2) SpriteActor_EnableObject(v0->unk_1FC->unk_04, 1); } -void ov79_021D1ED8 (UnkStruct_ov79_021D0E1C * param0) +void ov79_021D1ED8(UnkStruct_ov79_021D0E1C *param0) { u8 v0 = 0; @@ -388,7 +388,7 @@ void ov79_021D1ED8 (UnkStruct_ov79_021D0E1C * param0) param0->unk_C8 = sub_0200112C(¶m0->unk_A4, 0, 0, param0->unk_00); } -void ov79_021D1F60 (UnkStruct_ov79_021D0E1C * param0) +void ov79_021D1F60(UnkStruct_ov79_021D0E1C *param0) { u16 v0, v1; @@ -402,14 +402,14 @@ void ov79_021D1F60 (UnkStruct_ov79_021D0E1C * param0) param0->unk_D0 = NULL; } -static void ov79_021D1FA8 (BmpList * param0, u32 param1, u8 param2) +static void ov79_021D1FA8(BmpList *param0, u32 param1, u8 param2) { if (!param2) { Sound_PlayEffect(1500); } } -void ov79_021D1FBC (UnkStruct_ov79_021D0E1C * param0) +void ov79_021D1FBC(UnkStruct_ov79_021D0E1C *param0) { Strbuf_Clear(param0->unk_30.unk_04); StringTemplate_SetStrbuf(param0->unk_30.unk_00, 0, sub_02015918(param0->unk_28, param0->unk_20->unk_1C[param0->unk_1A].unk_02), 2, 1, GAME_LANGUAGE); @@ -418,7 +418,7 @@ void ov79_021D1FBC (UnkStruct_ov79_021D0E1C * param0) ov79_021D1850(param0, param0->unk_30.unk_04, param0->unk_30.unk_4C, 1); } -void ov79_021D2008 (UnkStruct_ov79_021D0E1C * param0) +void ov79_021D2008(UnkStruct_ov79_021D0E1C *param0) { Strbuf_Clear(param0->unk_30.unk_04); StringTemplate_SetStrbuf(param0->unk_30.unk_00, 0, sub_02015918(param0->unk_28, param0->unk_20->unk_1C[param0->unk_1A].unk_02), 2, 1, GAME_LANGUAGE); @@ -427,7 +427,7 @@ void ov79_021D2008 (UnkStruct_ov79_021D0E1C * param0) ov79_021D1850(param0, param0->unk_30.unk_04, param0->unk_30.unk_4C, 0); } -void ov79_021D2054 (UnkStruct_ov79_021D0E1C * param0) +void ov79_021D2054(UnkStruct_ov79_021D0E1C *param0) { static const UnkStruct_ov61_0222C884 v0 = { 1, 26, 13, 5, 4, 13, 463 @@ -436,16 +436,16 @@ void ov79_021D2054 (UnkStruct_ov79_021D0E1C * param0) param0->unk_D4 = sub_02002100(param0->unk_24, &v0, 1 + 18 + 12, 15, param0->unk_00); } -void ov79_021D2078 (UnkStruct_ov79_021D0E1C * param0) +void ov79_021D2078(UnkStruct_ov79_021D0E1C *param0) { int v0, v1; - u32 v2 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0))); + u32 v2 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)); u32 v3 = (u32)(((2 & 0xff) << 16) | ((3 & 0xff) << 8) | ((1 & 0xff) << 0)); sub_0201D78C(¶m0->unk_E8[5], 0, param0->unk_30.unk_1C, 4, 0, 0, v2, NULL); for (v1 = 0; v1 < 6; v1++) { - static const u8 v4[] = {2, 10, 4, 6, 10, 6}; + static const u8 v4[] = { 2, 10, 4, 6, 10, 6 }; v0 = (8 * 8) - sub_02002D7C(2, param0->unk_30.unk_20[v1], 0); sub_0201D78C(¶m0->unk_E8[7 + v1], 2, param0->unk_30.unk_20[v1], v0 / 2, v4[v1], 0, v3, NULL); diff --git a/src/overlay079/ov79_021D20F4.c b/src/overlay079/ov79_021D20F4.c index 194676880c..8cfb366fef 100644 --- a/src/overlay079/ov79_021D20F4.c +++ b/src/overlay079/ov79_021D20F4.c @@ -1,3 +1,5 @@ +#include "overlay079/ov79_021D20F4.h" + #include #include @@ -6,21 +8,20 @@ #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_0224133C.h" +#include "communication_system.h" +#include "gx_layers.h" #include "unk_0200A784.h" #include "unk_0200C6E4.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "communication_system.h" #include "unk_020393C8.h" #include "unk_02098FFC.h" -#include "overlay079/ov79_021D20F4.h" -void ov79_021D20F4(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D21CC(UnkStruct_ov79_021D0E1C * param0); -void ov79_021D21F8(UnkStruct_ov79_021D0E1C * param0); +void ov79_021D20F4(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D21CC(UnkStruct_ov79_021D0E1C *param0); +void ov79_021D21F8(UnkStruct_ov79_021D0E1C *param0); -void ov79_021D20F4 (UnkStruct_ov79_021D0E1C * param0) +void ov79_021D20F4(UnkStruct_ov79_021D0E1C *param0) { sub_0201DBEC(32, param0->unk_00); @@ -29,10 +30,21 @@ void ov79_021D20F4 (UnkStruct_ov79_021D0E1C * param0) { UnkStruct_ov104_0224133C v0 = { - 0, 128, 0, 32, 0, 128, 0, 32, + 0, + 128, + 0, + 32, + 0, + 128, + 0, + 32, }; UnkStruct_ov104_022412F4 v1 = { - 3, 1024, 1024, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K, + 3, + 1024, + 1024, + GX_OBJVRAMMODE_CHAR_1D_32K, + GX_OBJVRAMMODE_CHAR_1D_32K, }; sub_0200C73C(param0->unk_1B8, &v0, &v1, 32); @@ -66,7 +78,7 @@ void ov79_021D20F4 (UnkStruct_ov79_021D0E1C * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -void ov79_021D21CC (UnkStruct_ov79_021D0E1C * param0) +void ov79_021D21CC(UnkStruct_ov79_021D0E1C *param0) { sub_0209903C(param0->unk_1F8); sub_0200C8B0(param0->unk_1B8, param0->unk_1BC); @@ -74,13 +86,13 @@ void ov79_021D21CC (UnkStruct_ov79_021D0E1C * param0) sub_0201DC3C(); } -void ov79_021D21F8 (UnkStruct_ov79_021D0E1C * param0) +void ov79_021D21F8(UnkStruct_ov79_021D0E1C *param0) { sub_0200C7EC(param0->unk_1BC); sub_02099160(param0->unk_1F8); } -void ov79_021D2214 (UnkStruct_ov79_021D0E1C * param0, BOOL param1) +void ov79_021D2214(UnkStruct_ov79_021D0E1C *param0, BOOL param1) { if (param1 == 0) { sub_02021E90(param0->unk_1C0[0], 0); diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index 2e2a972200..8c8a90e66c 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -1,16 +1,13 @@ +#include "overlay079/ov79_021D2268.h" + #include #include -#include "core_sys.h" - -#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/sprite_decl.h" -#include "message.h" +#include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020158A8.h" #include "struct_defs/struct_0205AA50.h" @@ -18,7 +15,9 @@ #include "struct_defs/struct_0209903C.h" #include "struct_defs/struct_0209916C.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" +#include "overlay079/ov79_021D3768.h" #include "overlay079/struct_ov79_021D3820.h" #include "overlay079/struct_ov79_021D38D0.h" #include "overlay084/struct_ov84_0223BA5C.h" @@ -26,41 +25,40 @@ #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_0224133C.h" +#include "communication_system.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_0200762C.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "communication_system.h" #include "unk_020393C8.h" -#include "pokemon.h" #include "unk_0208C098.h" #include "unk_020989DC.h" #include "unk_02098FFC.h" -#include "overlay079/ov79_021D2268.h" -#include "overlay079/ov79_021D3768.h" typedef struct { - StringTemplate * unk_00; - Strbuf* unk_04; - Strbuf* unk_08[3]; + StringTemplate *unk_00; + Strbuf *unk_04; + Strbuf *unk_08[3]; } UnkStruct_ov79_021D2928_sub1; typedef struct { @@ -86,8 +84,8 @@ typedef struct { int unk_08; fx32 unk_0C; fx32 unk_10; - UnkStruct_ov79_021D29B4 * unk_14; - SysTask * unk_18; + UnkStruct_ov79_021D29B4 *unk_14; + SysTask *unk_18; } UnkStruct_ov79_021D29E4; struct UnkStruct_ov79_021D29B4_t { @@ -96,8 +94,8 @@ struct UnkStruct_ov79_021D29B4_t { int unk_08; UnkStruct_ov79_021D2C50 unk_0C; UnkStruct_ov79_021D2C50 unk_68; - GraphicElementData * unk_C4; - Sprite * unk_C8; + GraphicElementData *unk_C4; + Sprite *unk_C8; UnkStruct_ov79_021D29E4 unk_CC[4]; }; @@ -107,68 +105,68 @@ typedef struct { int unk_08; u16 unk_0C; u16 unk_0E; - UnkStruct_02098DE8 * unk_10; - UnkStruct_020158A8 * unk_14; - MessageLoader * unk_18; + UnkStruct_02098DE8 *unk_10; + UnkStruct_020158A8 *unk_14; + MessageLoader *unk_18; UnkStruct_ov79_021D2928_sub1 unk_1C; UnkStruct_ov79_021D38D0 unk_30; UnkStruct_ov79_021D3820 unk_40; - UnkStruct_0209903C * unk_5C; - UnkStruct_0209916C * unk_60[2]; - BGL * unk_68; + UnkStruct_0209903C *unk_5C; + UnkStruct_0209916C *unk_60[2]; + BGL *unk_68; Window unk_6C; - SpriteRenderer * unk_7C; + SpriteRenderer *unk_7C; UnkStruct_ov79_021D29B4 unk_80; } UnkStruct_ov79_021D2928; -int ov79_021D22AC(OverlayManager * param0, int * param1); -int ov79_021D22E4(OverlayManager * param0, int * param1); -int ov79_021D2460(OverlayManager * param0, int * param1); -static int ov79_021D2928(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D252C(void * param0); -static int ov79_021D247C(UnkStruct_ov79_021D2928 * param0); -static int ov79_021D24D4(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D257C(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D260C(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D2634(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D270C(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D2754(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D2768(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D27AC(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D27D8(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D2858(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D2864(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D2908(UnkStruct_ov79_021D2928 * param0); -static int ov79_021D2A04(UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1); -static int ov79_021D2AE0(UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1); -static int ov79_021D2AF0(UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1); -static int ov79_021D2B3C(UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1); -static int ov79_021D2B54(UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1); -static int ov79_021D2B84(UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1); -static int ov79_021D2B94(UnkStruct_ov79_021D2928 * param0); -static int ov79_021D2C08(UnkStruct_ov79_021D2928 * param0); -static void ov79_021D2C50(SysTask * param0, void * param1); -static void ov79_021D2CEC(SysTask * param0, void * param1); -static void ov79_021D2D7C(SysTask * param0, void * param1); -static void ov79_021D2E74(SysTask * param0, void * param1); -static void ov79_021D2F4C(SysTask * param0, void * param1); -static void ov79_021D2FE0(SysTask * param0, void * param1); -static void ov79_021D3094(SysTask * param0, void * param1); -static void ov79_021D312C(SysTask * param0, void * param1); -static void ov79_021D326C(SysTask * param0, void * param1); -static void ov79_021D3290(SysTask * param0, void * param1); -static void ov79_021D3324(SysTask * param0, void * param1); -static void ov79_021D33DC(SysTask * param0, void * param1); -static void ov79_021D34A8(SysTask * param0, void * param1); -static void ov79_021D35B0(SysTask * param0, void * param1); -static void ov79_021D35EC(SysTask * param0, void * param1); -static void ov79_021D3610(SysTask * param0, void * param1); -static void ov79_021D36CC(SysTask * param0, void * param1); -static void ov79_021D36F0(SysTask * param0, void * param1); - -static VecFx32 ov79_021D2268 (VecFx32 * param0, VecFx32 * param1, fx32 param2) +int ov79_021D22AC(OverlayManager *param0, int *param1); +int ov79_021D22E4(OverlayManager *param0, int *param1); +int ov79_021D2460(OverlayManager *param0, int *param1); +static int ov79_021D2928(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D252C(void *param0); +static int ov79_021D247C(UnkStruct_ov79_021D2928 *param0); +static int ov79_021D24D4(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D257C(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D260C(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D2634(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D270C(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D2754(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D2768(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D27AC(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D27D8(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D2858(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D2864(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D2908(UnkStruct_ov79_021D2928 *param0); +static int ov79_021D2A04(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1); +static int ov79_021D2AE0(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1); +static int ov79_021D2AF0(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1); +static int ov79_021D2B3C(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1); +static int ov79_021D2B54(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1); +static int ov79_021D2B84(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1); +static int ov79_021D2B94(UnkStruct_ov79_021D2928 *param0); +static int ov79_021D2C08(UnkStruct_ov79_021D2928 *param0); +static void ov79_021D2C50(SysTask *param0, void *param1); +static void ov79_021D2CEC(SysTask *param0, void *param1); +static void ov79_021D2D7C(SysTask *param0, void *param1); +static void ov79_021D2E74(SysTask *param0, void *param1); +static void ov79_021D2F4C(SysTask *param0, void *param1); +static void ov79_021D2FE0(SysTask *param0, void *param1); +static void ov79_021D3094(SysTask *param0, void *param1); +static void ov79_021D312C(SysTask *param0, void *param1); +static void ov79_021D326C(SysTask *param0, void *param1); +static void ov79_021D3290(SysTask *param0, void *param1); +static void ov79_021D3324(SysTask *param0, void *param1); +static void ov79_021D33DC(SysTask *param0, void *param1); +static void ov79_021D34A8(SysTask *param0, void *param1); +static void ov79_021D35B0(SysTask *param0, void *param1); +static void ov79_021D35EC(SysTask *param0, void *param1); +static void ov79_021D3610(SysTask *param0, void *param1); +static void ov79_021D36CC(SysTask *param0, void *param1); +static void ov79_021D36F0(SysTask *param0, void *param1); + +static VecFx32 ov79_021D2268(VecFx32 *param0, VecFx32 *param1, fx32 param2) { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; param0->x = FX_Div(param1->x, param2); param0->y = FX_Div(param1->y, param2); @@ -177,10 +175,10 @@ static VecFx32 ov79_021D2268 (VecFx32 * param0, VecFx32 * param1, fx32 param2) return v0; } -int ov79_021D22AC (OverlayManager * param0, int * param1) +int ov79_021D22AC(OverlayManager *param0, int *param1) { - UnkStruct_02098DE8 * v0 = OverlayManager_Args(param0); - UnkStruct_ov79_021D2928 * v1; + UnkStruct_02098DE8 *v0 = OverlayManager_Args(param0); + UnkStruct_ov79_021D2928 *v1; Heap_Create(3, 46, 0x10000); @@ -193,9 +191,9 @@ int ov79_021D22AC (OverlayManager * param0, int * param1) return 1; } -int ov79_021D22E4 (OverlayManager * param0, int * param1) +int ov79_021D22E4(OverlayManager *param0, int *param1) { - UnkStruct_ov79_021D2928 * v0 = (UnkStruct_ov79_021D2928 *)OverlayManager_Data(param0); + UnkStruct_ov79_021D2928 *v0 = (UnkStruct_ov79_021D2928 *)OverlayManager_Data(param0); if ((*param1 >= 2) && (*param1 <= 5)) { ov79_021D3820(&v0->unk_40); @@ -276,9 +274,9 @@ int ov79_021D22E4 (OverlayManager * param0, int * param1) return 0; } -int ov79_021D2460 (OverlayManager * param0, int * param1) +int ov79_021D2460(OverlayManager *param0, int *param1) { - UnkStruct_ov79_021D2928 * v0 = (UnkStruct_ov79_021D2928 *)OverlayManager_Data(param0); + UnkStruct_ov79_021D2928 *v0 = (UnkStruct_ov79_021D2928 *)OverlayManager_Data(param0); OverlayManager_FreeData(param0); @@ -286,7 +284,7 @@ int ov79_021D2460 (OverlayManager * param0, int * param1) return 1; } -static int ov79_021D247C (UnkStruct_ov79_021D2928 * param0) +static int ov79_021D247C(UnkStruct_ov79_021D2928 *param0) { switch (param0->unk_04) { case 0: @@ -310,7 +308,7 @@ static int ov79_021D247C (UnkStruct_ov79_021D2928 * param0) return 0; } -static int ov79_021D24D4 (UnkStruct_ov79_021D2928 * param0) +static int ov79_021D24D4(UnkStruct_ov79_021D2928 *param0) { switch (param0->unk_04) { case 0: @@ -334,9 +332,9 @@ static int ov79_021D24D4 (UnkStruct_ov79_021D2928 * param0) return 0; } -static void ov79_021D252C (void * param0) +static void ov79_021D252C(void *param0) { - UnkStruct_ov79_021D2928 * v0 = param0; + UnkStruct_ov79_021D2928 *v0 = param0; sub_0201C2B8(v0->unk_68); sub_02008A94(v0->unk_40.unk_04); @@ -347,7 +345,7 @@ static void ov79_021D252C (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov79_021D255C (void) +static void ov79_021D255C(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_C, @@ -365,7 +363,7 @@ static void ov79_021D255C (void) GXLayers_SetBanks(&v0); } -static void ov79_021D257C (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D257C(UnkStruct_ov79_021D2928 *param0) { int v0 = 0, v1; @@ -399,7 +397,7 @@ static void ov79_021D257C (UnkStruct_ov79_021D2928 * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -414,7 +412,7 @@ static void ov79_021D257C (UnkStruct_ov79_021D2928 * param0) 2, 0, 0, - 0 + 0, }, { 0, @@ -429,10 +427,10 @@ static void ov79_021D257C (UnkStruct_ov79_021D2928 * param0) 0, 0, 0, - 0 + 0, }, }; - u8 v4[] = {1, 2, 4}; + u8 v4[] = { 1, 2, 4 }; for (v0 = 0; v0 < 3; v0++) { v1 = v4[v0]; @@ -443,7 +441,7 @@ static void ov79_021D257C (UnkStruct_ov79_021D2928 * param0) } } -static void ov79_021D260C (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D260C(UnkStruct_ov79_021D2928 *param0) { int v0; @@ -455,9 +453,9 @@ static void ov79_021D260C (UnkStruct_ov79_021D2928 * param0) Heap_FreeToHeap(param0->unk_68); } -static void ov79_021D2634 (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D2634(UnkStruct_ov79_021D2928 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PORUDEMO, param0->unk_00); @@ -476,7 +474,7 @@ static void ov79_021D2634 (UnkStruct_ov79_021D2928 * param0) sub_0201C3C0(param0->unk_68, 4); } -static void ov79_021D270C (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D270C(UnkStruct_ov79_021D2928 *param0) { static const UnkStruct_ov61_0222C884 v0 = { 1, 2, 19, 27, 4, 15, (1 + (18 + 12)) @@ -488,13 +486,13 @@ static void ov79_021D270C (UnkStruct_ov79_021D2928 * param0) sub_02002E98(0, 15 * 32, param0->unk_00); } -static void ov79_021D2754 (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D2754(UnkStruct_ov79_021D2928 *param0) { sub_0201ACF4(¶m0->unk_6C); BGL_DeleteWindow(¶m0->unk_6C); } -static void ov79_021D2768 (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D2768(UnkStruct_ov79_021D2928 *param0) { int v0 = 0; @@ -507,7 +505,7 @@ static void ov79_021D2768 (UnkStruct_ov79_021D2928 * param0) } } -static void ov79_021D27AC (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D27AC(UnkStruct_ov79_021D2928 *param0) { int v0 = 0; @@ -520,7 +518,7 @@ static void ov79_021D27AC (UnkStruct_ov79_021D2928 * param0) MessageLoader_Free(param0->unk_18); } -static void ov79_021D27D8 (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D27D8(UnkStruct_ov79_021D2928 *param0) { param0->unk_30.unk_00 = param0->unk_10->unk_00; param0->unk_30.unk_04 = Pokemon_GetValue(param0->unk_10->unk_00, MON_DATA_SPECIES, NULL); @@ -534,12 +532,12 @@ static void ov79_021D27D8 (UnkStruct_ov79_021D2928 * param0) param0->unk_30.unk_09 = sub_02098EAC(param0->unk_10->unk_04, param0->unk_30.unk_06); } -static void ov79_021D2858 (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D2858(UnkStruct_ov79_021D2928 *param0) { Strbuf_Free(param0->unk_30.unk_0C); } -static void ov79_021D2864 (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D2864(UnkStruct_ov79_021D2928 *param0) { sub_0201DBEC(32, param0->unk_00); @@ -547,10 +545,21 @@ static void ov79_021D2864 (UnkStruct_ov79_021D2928 * param0) { UnkStruct_ov104_0224133C v0 = { - 0, 128, 0, 31, 0, 1, 0, 31, + 0, + 128, + 0, + 31, + 0, + 1, + 0, + 31, }; UnkStruct_ov104_022412F4 v1 = { - 3, 0, 0, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K, + 3, + 0, + 0, + GX_OBJVRAMMODE_CHAR_1D_32K, + GX_OBJVRAMMODE_CHAR_1D_32K, }; sub_0200C73C(param0->unk_7C, &v0, &v1, 32); @@ -569,7 +578,7 @@ static void ov79_021D2864 (UnkStruct_ov79_021D2928 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov79_021D2908 (UnkStruct_ov79_021D2928 * param0) +static void ov79_021D2908(UnkStruct_ov79_021D2928 *param0) { sub_02099370(param0->unk_5C, param0->unk_60[0]); sub_0209903C(param0->unk_5C); @@ -577,7 +586,7 @@ static void ov79_021D2908 (UnkStruct_ov79_021D2928 * param0) sub_0201DC3C(); } -static int ov79_021D2928 (UnkStruct_ov79_021D2928 * param0) +static int ov79_021D2928(UnkStruct_ov79_021D2928 *param0) { switch (param0->unk_04) { case 0: @@ -613,9 +622,9 @@ static int ov79_021D2928 (UnkStruct_ov79_021D2928 * param0) return 0; } -static int ov79_021D29B4 (UnkStruct_ov79_021D29B4 * param0, int param1, SysTaskFunc param2) +static int ov79_021D29B4(UnkStruct_ov79_021D29B4 *param0, int param1, SysTaskFunc param2) { - UnkStruct_ov79_021D29E4 * v0 = &(param0->unk_CC[param1]); + UnkStruct_ov79_021D29E4 *v0 = &(param0->unk_CC[param1]); MI_CpuClear8(v0, sizeof(UnkStruct_ov79_021D29E4)); @@ -626,7 +635,7 @@ static int ov79_021D29B4 (UnkStruct_ov79_021D29B4 * param0, int param1, SysTaskF return param0->unk_04; } -static int ov79_021D29E4 (UnkStruct_ov79_021D29E4 * param0) +static int ov79_021D29E4(UnkStruct_ov79_021D29E4 *param0) { SysTask_Done(param0->unk_18); param0->unk_14->unk_04--; @@ -635,7 +644,7 @@ static int ov79_021D29E4 (UnkStruct_ov79_021D29E4 * param0) return 0; } -static int ov79_021D2A04 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1) +static int ov79_021D2A04(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1) { VecFx32 v0; @@ -646,7 +655,7 @@ static int ov79_021D2A04 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D2 param1->unk_08 = param0->unk_30.unk_09; param1->unk_00 = 24; param1->unk_0C.unk_00.x = FX32_CONST(128); - param1->unk_0C.unk_00.y = FX32_CONST((192 + 32)); + param1->unk_0C.unk_00.y = FX32_CONST(192 + 32); param1->unk_0C.unk_0C.x = FX32_CONST(128); param1->unk_0C.unk_0C.y = FX32_CONST(96); param1->unk_0C.unk_24.x = 0x1000; @@ -671,7 +680,7 @@ static int ov79_021D2A04 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D2 return 1; } -static int ov79_021D2AE0 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1) +static int ov79_021D2AE0(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1) { int v0, v1 = 0; @@ -682,7 +691,7 @@ static int ov79_021D2AE0 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D2 return 2; } -static int ov79_021D2AF0 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1) +static int ov79_021D2AF0(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1) { u32 v0; @@ -700,7 +709,7 @@ static int ov79_021D2AF0 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D2 return 3; } -static int ov79_021D2B3C (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1) +static int ov79_021D2B3C(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1) { if (sub_0200598C()) { return 3; @@ -710,7 +719,7 @@ static int ov79_021D2B3C (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D2 return 4; } -static int ov79_021D2B54 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1) +static int ov79_021D2B54(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1) { MI_CpuClear8(¶m1->unk_68, sizeof(UnkStruct_ov79_021D2C50)); ov79_021D29B4(param1, 0, ov79_021D3290); @@ -719,7 +728,7 @@ static int ov79_021D2B54 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D2 return 5; } -static int ov79_021D2B84 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D29B4 * param1) +static int ov79_021D2B84(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B4 *param1) { if (param1->unk_04) { return 5; @@ -728,7 +737,7 @@ static int ov79_021D2B84 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D2 return 6; } -static int ov79_021D2B94 (UnkStruct_ov79_021D2928 * param0) +static int ov79_021D2B94(UnkStruct_ov79_021D2928 *param0) { sub_0200E060(¶m0->unk_6C, 1, 1, 14); BGL_FillWindow(¶m0->unk_6C, ((15 << 4) | 15)); @@ -736,13 +745,13 @@ static int ov79_021D2B94 (UnkStruct_ov79_021D2928 * param0) StringTemplate_SetStrbuf(param0->unk_1C.unk_00, 0, param0->unk_30.unk_0C, 2, 1, GAME_LANGUAGE); StringTemplate_Format(param0->unk_1C.unk_00, param0->unk_1C.unk_04, param0->unk_1C.unk_08[param0->unk_30.unk_09]); - param0->unk_0C = sub_0201D78C(¶m0->unk_6C, 1, param0->unk_1C.unk_04, 0, 0, param0->unk_10->unk_0A, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + param0->unk_0C = sub_0201D78C(¶m0->unk_6C, 1, param0->unk_1C.unk_04, 0, 0, param0->unk_10->unk_0A, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); param0->unk_0E = 0; return 7; } -static int ov79_021D2C08 (UnkStruct_ov79_021D2928 * param0) +static int ov79_021D2C08(UnkStruct_ov79_021D2928 *param0) { if (Message_Printing(param0->unk_0C)) { return 7; @@ -758,11 +767,11 @@ static int ov79_021D2C08 (UnkStruct_ov79_021D2928 * param0) return 8; } -static void ov79_021D2C50 (SysTask * param0, void * param1) +static void ov79_021D2C50(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_0C; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_0C; VecFx32 v3; v0->unk_04 = 24; @@ -781,12 +790,12 @@ static void ov79_021D2C50 (SysTask * param0, void * param1) SysTask_SetCallback(param0, ov79_021D2CEC); } -static void ov79_021D2CEC (SysTask * param0, void * param1) +static void ov79_021D2CEC(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_0C; - VecFx32 v3 = {0, 0, 0}; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_0C; + VecFx32 v3 = { 0, 0, 0 }; v3.x = v2->unk_24.x - FX_Mul(v2->unk_3C.x, v0->unk_0C); v3.y = v2->unk_24.y - FX_Mul(v2->unk_3C.y, v0->unk_0C); @@ -802,17 +811,17 @@ static void ov79_021D2CEC (SysTask * param0, void * param1) } } -static void ov79_021D2D7C (SysTask * param0, void * param1) +static void ov79_021D2D7C(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_0C; - VecFx32 v3 = {0, 0, 0}; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_0C; + VecFx32 v3 = { 0, 0, 0 }; v0->unk_04 = 24; v2->unk_00.x = FX32_CONST(128); - v2->unk_00.y = FX32_CONST((192 + 32)); + v2->unk_00.y = FX32_CONST(192 + 32); v2->unk_0C.x = FX32_CONST(128); v2->unk_0C.y = FX32_CONST(96); @@ -826,11 +835,11 @@ static void ov79_021D2D7C (SysTask * param0, void * param1) SysTask_SetCallback(param0, ov79_021D2E74); } -static void ov79_021D2E74 (SysTask * param0, void * param1) +static void ov79_021D2E74(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_0C; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_0C; VecFx32 v3; fx32 v4, v5; @@ -854,11 +863,11 @@ static void ov79_021D2E74 (SysTask * param0, void * param1) ov79_021D29E4(v0); } -static void ov79_021D2F4C (SysTask * param0, void * param1) +static void ov79_021D2F4C(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; v0->unk_04 = 24; @@ -876,11 +885,11 @@ static void ov79_021D2F4C (SysTask * param0, void * param1) SysTask_SetCallback(param0, ov79_021D2FE0); } -static void ov79_021D2FE0 (SysTask * param0, void * param1) +static void ov79_021D2FE0(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; v3.x = v2->unk_24.x + FX_Mul(v2->unk_3C.x, v0->unk_0C); @@ -899,11 +908,11 @@ static void ov79_021D2FE0 (SysTask * param0, void * param1) } } -static void ov79_021D3094 (SysTask * param0, void * param1) +static void ov79_021D3094(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; v0->unk_04 = 24; @@ -921,11 +930,11 @@ static void ov79_021D3094 (SysTask * param0, void * param1) SysTask_SetCallback(param0, ov79_021D312C); } -static void ov79_021D312C (SysTask * param0, void * param1) +static void ov79_021D312C(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; fx32 v4; int v5; @@ -961,11 +970,11 @@ static void ov79_021D312C (SysTask * param0, void * param1) SysTask_SetCallback(param0, ov79_021D326C); } -static void ov79_021D326C (SysTask * param0, void * param1) +static void ov79_021D326C(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; if (v2->unk_50++ < 4) { return; @@ -974,11 +983,11 @@ static void ov79_021D326C (SysTask * param0, void * param1) ov79_021D29E4(v0); } -static void ov79_021D3290 (SysTask * param0, void * param1) +static void ov79_021D3290(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; v0->unk_04 = 24 / 3; @@ -996,11 +1005,11 @@ static void ov79_021D3290 (SysTask * param0, void * param1) SysTask_SetCallback(param0, ov79_021D3324); } -static void ov79_021D3324 (SysTask * param0, void * param1) +static void ov79_021D3324(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; v3.x = v2->unk_24.x + FX_Mul(v2->unk_3C.x, v0->unk_0C); @@ -1021,11 +1030,11 @@ static void ov79_021D3324 (SysTask * param0, void * param1) ov79_021D29E4(v0); } -static void ov79_021D33DC (SysTask * param0, void * param1) +static void ov79_021D33DC(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; v0->unk_04 = 24 / 3; @@ -1045,11 +1054,11 @@ static void ov79_021D33DC (SysTask * param0, void * param1) SysTask_SetCallback(param0, ov79_021D34A8); } -static void ov79_021D34A8 (SysTask * param0, void * param1) +static void ov79_021D34A8(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; fx32 v4; int v5; @@ -1076,9 +1085,9 @@ static void ov79_021D34A8 (SysTask * param0, void * param1) SysTask_SetCallback(param0, ov79_021D35B0); } -static void ov79_021D35B0 (SysTask * param0, void * param1) +static void ov79_021D35B0(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; if (v0->unk_04++ < 4) { return; @@ -1097,11 +1106,11 @@ static void ov79_021D35B0 (SysTask * param0, void * param1) } } -static void ov79_021D35EC (SysTask * param0, void * param1) +static void ov79_021D35EC(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; MI_CpuClear8(v2, sizeof(UnkStruct_ov79_021D2C50)); @@ -1109,11 +1118,11 @@ static void ov79_021D35EC (SysTask * param0, void * param1) SysTask_SetCallback(param0, ov79_021D3610); } -static void ov79_021D3610 (SysTask * param0, void * param1) +static void ov79_021D3610(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; fx32 v4, v5; int v6; @@ -1139,11 +1148,11 @@ static void ov79_021D3610 (SysTask * param0, void * param1) } } -static void ov79_021D36CC (SysTask * param0, void * param1) +static void ov79_021D36CC(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; MI_CpuClear8(v2, sizeof(UnkStruct_ov79_021D2C50)); @@ -1151,11 +1160,11 @@ static void ov79_021D36CC (SysTask * param0, void * param1) SysTask_SetCallback(param0, ov79_021D36F0); } -static void ov79_021D36F0 (SysTask * param0, void * param1) +static void ov79_021D36F0(SysTask *param0, void *param1) { - UnkStruct_ov79_021D29E4 * v0 = (UnkStruct_ov79_021D29E4 *)param1; - UnkStruct_ov79_021D29B4 * v1 = v0->unk_14; - UnkStruct_ov79_021D2C50 * v2 = &v1->unk_68; + UnkStruct_ov79_021D29E4 *v0 = (UnkStruct_ov79_021D29E4 *)param1; + UnkStruct_ov79_021D29B4 *v1 = v0->unk_14; + UnkStruct_ov79_021D2C50 *v2 = &v1->unk_68; VecFx32 v3; fx32 v4, v5; diff --git a/src/overlay079/ov79_021D3768.c b/src/overlay079/ov79_021D3768.c index 71d1370c06..6c4e2ccfa9 100644 --- a/src/overlay079/ov79_021D3768.c +++ b/src/overlay079/ov79_021D3768.c @@ -1,24 +1,25 @@ +#include "overlay079/ov79_021D3768.h" + #include #include #include "struct_decls/sprite_decl.h" - #include "struct_defs/archived_sprite.h" + #include "overlay079/struct_ov79_021D3820.h" #include "overlay079/struct_ov79_021D38D0.h" #include "overlay115/camera_angle.h" -#include "unk_0200762C.h" -#include "gx_layers.h" #include "camera.h" -#include "unk_0202419C.h" +#include "gx_layers.h" #include "pokemon.h" -#include "overlay079/ov79_021D3768.h" +#include "unk_0200762C.h" +#include "unk_0202419C.h" -static void ov79_021D3870(UnkStruct_ov79_021D3820 * param0, int param1); -static void ov79_021D38D0(UnkStruct_ov79_021D3820 * param0, UnkStruct_ov79_021D38D0 * param1, int param2); +static void ov79_021D3870(UnkStruct_ov79_021D3820 *param0, int param1); +static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int param2); -void ov79_021D3768 (UnkStruct_ov79_021D3820 * param0, UnkStruct_ov79_021D38D0 * param1, int param2) +void ov79_021D3768(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int param2) { MI_CpuClear8(param0, sizeof(UnkStruct_ov79_021D3820)); @@ -42,7 +43,7 @@ void ov79_021D3768 (UnkStruct_ov79_021D3820 * param0, UnkStruct_ov79_021D38D0 * G2_SetBG0Priority(1); } -void ov79_021D3820 (UnkStruct_ov79_021D3820 * param0) +void ov79_021D3820(UnkStruct_ov79_021D3820 *param0) { sub_020241B4(); Camera_ComputeViewMatrix(); @@ -59,16 +60,16 @@ void ov79_021D3820 (UnkStruct_ov79_021D3820 * param0) G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } -void ov79_021D385C (UnkStruct_ov79_021D3820 * param0) +void ov79_021D385C(UnkStruct_ov79_021D3820 *param0) { Camera_Delete(param0->camera); sub_02007B6C(param0->unk_04); } -static void ov79_021D3870 (UnkStruct_ov79_021D3820 * param0, int param1) +static void ov79_021D3870(UnkStruct_ov79_021D3820 *param0, int param1) { - VecFx32 v0 = {0, 0, 0x10000}; - CameraAngle v1 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0x10000 }; + CameraAngle v1 = { 0, 0, 0 }; fx32 v2 = 0x10000; u16 v3 = 0x5c1; @@ -80,10 +81,10 @@ static void ov79_021D3870 (UnkStruct_ov79_021D3820 * param0, int param1) Camera_SetAsActive(param0->camera); } -static void ov79_021D38D0 (UnkStruct_ov79_021D3820 * param0, UnkStruct_ov79_021D38D0 * param1, int param2) +static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int param2) { ArchivedSprite v0; - Sprite * v1; + Sprite *v1; param0->unk_04 = sub_0200762C(param2); diff --git a/src/overlay080/ov80_021D0D80.c b/src/overlay080/ov80_021D0D80.c index f8c3accea8..947917ae9b 100644 --- a/src/overlay080/ov80_021D0D80.c +++ b/src/overlay080/ov80_021D0D80.c @@ -1,64 +1,65 @@ +#include "overlay080/ov80_021D0D80.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_0203D8AC.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay080/ov80_021D2A08.h" +#include "overlay080/ov80_021D2AF4.h" #include "overlay080/struct_ov80_021D2A08.h" #include "overlay080/struct_ov80_021D2E94.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" -#include "overlay_manager.h" -#include "narc.h" -#include "message.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02039C80.h" #include "unk_0208C098.h" -#include "overlay080/ov80_021D0D80.h" -#include "overlay080/ov80_021D2A08.h" -#include "overlay080/ov80_021D2AF4.h" -int ov80_021D0D80(OverlayManager * param0, int * param1); -int ov80_021D0DD8(OverlayManager * param0, int * param1); -int ov80_021D0E50(OverlayManager * param0, int * param1); -static void ov80_021D0E68(void * param0); +int ov80_021D0D80(OverlayManager *param0, int *param1); +int ov80_021D0DD8(OverlayManager *param0, int *param1); +int ov80_021D0E50(OverlayManager *param0, int *param1); +static void ov80_021D0E68(void *param0); static void ov80_021D0EA8(void); -static int ov80_021D0EC8(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D1088(UnkStruct_ov80_021D2A08 * param0, BGL * param1); -static void ov80_021D1158(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D12D8(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D0FF4(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D1068(UnkStruct_ov80_021D2A08 * param0); -static int ov80_021D132C(UnkStruct_ov80_021D2A08 * param0); -static int ov80_021D1354(UnkStruct_ov80_021D2A08 * param0); -static int ov80_021D138C(UnkStruct_ov80_021D2A08 * param0); -static int ov80_021D13A0(UnkStruct_ov80_021D2A08 * param0); -static int ov80_021D13DC(UnkStruct_ov80_021D2A08 * param0); -static int ov80_021D1438(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1458(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D14A8(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1550(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D159C(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D163C(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D16F8(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1744(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1478(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1758(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1678(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D15C8(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1610(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D16D0(UnkStruct_ov80_021D2A08 * param0); +static int ov80_021D0EC8(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D1088(UnkStruct_ov80_021D2A08 *param0, BGL *param1); +static void ov80_021D1158(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D12D8(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D0FF4(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D1068(UnkStruct_ov80_021D2A08 *param0); +static int ov80_021D132C(UnkStruct_ov80_021D2A08 *param0); +static int ov80_021D1354(UnkStruct_ov80_021D2A08 *param0); +static int ov80_021D138C(UnkStruct_ov80_021D2A08 *param0); +static int ov80_021D13A0(UnkStruct_ov80_021D2A08 *param0); +static int ov80_021D13DC(UnkStruct_ov80_021D2A08 *param0); +static int ov80_021D1438(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1458(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D14A8(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1550(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D159C(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D163C(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D16F8(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1744(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1478(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1758(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1678(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D15C8(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1610(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D16D0(UnkStruct_ov80_021D2A08 *param0); const UnkStruct_ov80_021D2E94 Unk_ov80_021D2E94[3] = { { @@ -70,7 +71,7 @@ const UnkStruct_ov80_021D2E94 Unk_ov80_021D2E94[3] = { ov80_021D16F8, ov80_021D1744, ov80_021D1478, - ov80_021D1758 + ov80_021D1758, }, { ov80_021D1458, @@ -81,7 +82,7 @@ const UnkStruct_ov80_021D2E94 Unk_ov80_021D2E94[3] = { ov80_021D16F8, ov80_021D1744, ov80_021D1478, - ov80_021D1758 + ov80_021D1758, }, { ov80_021D1458, @@ -92,14 +93,14 @@ const UnkStruct_ov80_021D2E94 Unk_ov80_021D2E94[3] = { ov80_021D16F8, ov80_021D1744, ov80_021D1478, - ov80_021D1758 - } + ov80_021D1758, + }, }; -int ov80_021D0D80 (OverlayManager * param0, int * param1) +int ov80_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov80_021D2A08 * v0 = NULL; - UnkStruct_0203D8AC * v1 = (UnkStruct_0203D8AC *)OverlayManager_Args(param0); + UnkStruct_ov80_021D2A08 *v0 = NULL; + UnkStruct_0203D8AC *v1 = (UnkStruct_0203D8AC *)OverlayManager_Args(param0); Heap_Create(3, 17, 0x20000); @@ -121,9 +122,9 @@ int ov80_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov80_021D0DD8 (OverlayManager * param0, int * param1) +int ov80_021D0DD8(OverlayManager *param0, int *param1) { - UnkStruct_ov80_021D2A08 * v0 = OverlayManager_Data(param0); + UnkStruct_ov80_021D2A08 *v0 = OverlayManager_Data(param0); switch (v0->unk_08) { case 0: @@ -154,10 +155,10 @@ int ov80_021D0DD8 (OverlayManager * param0, int * param1) return 0; } -int ov80_021D0E50 (OverlayManager * param0, int * param1) +int ov80_021D0E50(OverlayManager *param0, int *param1) { int v0 = 0; - UnkStruct_ov80_021D2A08 * v1 = OverlayManager_Data(param0); + UnkStruct_ov80_021D2A08 *v1 = OverlayManager_Data(param0); OverlayManager_FreeData(param0); Heap_Destroy(17); @@ -165,9 +166,9 @@ int ov80_021D0E50 (OverlayManager * param0, int * param1) return 1; } -static void ov80_021D0E68 (void * param0) +static void ov80_021D0E68(void *param0) { - UnkStruct_ov80_021D2A08 * v0 = param0; + UnkStruct_ov80_021D2A08 *v0 = param0; if (Unk_ov80_021D2E94[v0->unk_00].unk_20 != NULL) { (Unk_ov80_021D2E94[v0->unk_00].unk_20)(v0); @@ -181,7 +182,7 @@ static void ov80_021D0E68 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov80_021D0EA8 (void) +static void ov80_021D0EA8(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -199,7 +200,7 @@ static void ov80_021D0EA8 (void) GXLayers_SetBanks(&v0); } -static int ov80_021D0EC8 (UnkStruct_ov80_021D2A08 * param0) +static int ov80_021D0EC8(UnkStruct_ov80_021D2A08 *param0) { switch (param0->unk_0C) { case 0: @@ -247,7 +248,7 @@ static int ov80_021D0EC8 (UnkStruct_ov80_021D2A08 * param0) return 0; } -static void ov80_021D0FF4 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D0FF4(UnkStruct_ov80_021D2A08 *param0) { int v0; @@ -272,13 +273,13 @@ static void ov80_021D0FF4 (UnkStruct_ov80_021D2A08 * param0) MessageLoader_Free(param0->unk_80); } -static void ov80_021D1068 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D1068(UnkStruct_ov80_021D2A08 *param0) { (Unk_ov80_021D2E94[param0->unk_00].unk_18)(param0); ov80_021D2AE0(param0); } -static void ov80_021D1088 (UnkStruct_ov80_021D2A08 * param0, BGL * param1) +static void ov80_021D1088(UnkStruct_ov80_021D2A08 *param0, BGL *param1) { int v0, v1; @@ -308,7 +309,7 @@ static void ov80_021D1088 (UnkStruct_ov80_021D2A08 * param0, BGL * param1) 0, 0, 0, - 0 + 0, }, { 0, @@ -323,7 +324,7 @@ static void ov80_021D1088 (UnkStruct_ov80_021D2A08 * param0, BGL * param1) 1, 0, 0, - 0 + 0, }, { 0, @@ -338,7 +339,7 @@ static void ov80_021D1088 (UnkStruct_ov80_021D2A08 * param0, BGL * param1) 2, 0, 0, - 0 + 0, }, { 0, @@ -353,7 +354,7 @@ static void ov80_021D1088 (UnkStruct_ov80_021D2A08 * param0, BGL * param1) 3, 0, 0, - 0 + 0, }, { 0, @@ -368,7 +369,7 @@ static void ov80_021D1088 (UnkStruct_ov80_021D2A08 * param0, BGL * param1) 0, 0, 0, - 0 + 0, }, { 0, @@ -383,7 +384,7 @@ static void ov80_021D1088 (UnkStruct_ov80_021D2A08 * param0, BGL * param1) 1, 0, 0, - 0 + 0, }, { 0, @@ -398,7 +399,7 @@ static void ov80_021D1088 (UnkStruct_ov80_021D2A08 * param0, BGL * param1) 2, 0, 0, - 0 + 0, }, { 0, @@ -413,7 +414,7 @@ static void ov80_021D1088 (UnkStruct_ov80_021D2A08 * param0, BGL * param1) 3, 0, 0, - 0 + 0, }, }; @@ -435,11 +436,11 @@ static void ov80_021D1088 (UnkStruct_ov80_021D2A08 * param0, BGL * param1) sub_02019690(7, 32, 0, param0->unk_04); } -static void ov80_021D1158 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D1158(UnkStruct_ov80_021D2A08 *param0) { - void * v0; + void *v0; u32 v1, v2; - NARC * v3; + NARC *v3; v2 = 17; v3 = NARC_ctor(NARC_INDEX_GRAPHIC__TMAP_GRA, param0->unk_04); @@ -465,7 +466,7 @@ static void ov80_021D1158 (UnkStruct_ov80_021D2A08 * param0) sub_02002E7C(4, 15 * 32, param0->unk_04); } -static void ov80_021D12D8 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D12D8(UnkStruct_ov80_021D2A08 *param0) { Heap_FreeToHeap(param0->unk_B4); Heap_FreeToHeap(param0->unk_B0); @@ -477,7 +478,7 @@ static void ov80_021D12D8 (UnkStruct_ov80_021D2A08 * param0) Heap_FreeToHeap(param0->unk_98); } -static int ov80_021D132C (UnkStruct_ov80_021D2A08 * param0) +static int ov80_021D132C(UnkStruct_ov80_021D2A08 *param0) { if (ov80_021D0EC8(param0) != 1) { return 0; @@ -487,7 +488,7 @@ static int ov80_021D132C (UnkStruct_ov80_021D2A08 * param0) return 1; } -static int ov80_021D1354 (UnkStruct_ov80_021D2A08 * param0) +static int ov80_021D1354(UnkStruct_ov80_021D2A08 *param0) { if ((Unk_ov80_021D2E94[param0->unk_00].unk_04)(param0) != 1) { return 1; @@ -497,7 +498,7 @@ static int ov80_021D1354 (UnkStruct_ov80_021D2A08 * param0) return 3; } -static int ov80_021D138C (UnkStruct_ov80_021D2A08 * param0) +static int ov80_021D138C(UnkStruct_ov80_021D2A08 *param0) { if (!ScreenWipe_Done()) { return 3; @@ -506,7 +507,7 @@ static int ov80_021D138C (UnkStruct_ov80_021D2A08 * param0) return 4; } -static int ov80_021D13A0 (UnkStruct_ov80_021D2A08 * param0) +static int ov80_021D13A0(UnkStruct_ov80_021D2A08 *param0) { if ((param0->unk_38)(param0) != 1) { Unk_ov80_021D2E94[param0->unk_00].unk_14(param0); @@ -517,7 +518,7 @@ static int ov80_021D13A0 (UnkStruct_ov80_021D2A08 * param0) return 6; } -static int ov80_021D13DC (UnkStruct_ov80_021D2A08 * param0) +static int ov80_021D13DC(UnkStruct_ov80_021D2A08 *param0) { if (ScreenWipe_Done()) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_NONE, 31, 0); @@ -532,7 +533,7 @@ static int ov80_021D13DC (UnkStruct_ov80_021D2A08 * param0) return 6; } -static int ov80_021D1438 (UnkStruct_ov80_021D2A08 * param0) +static int ov80_021D1438(UnkStruct_ov80_021D2A08 *param0) { (Unk_ov80_021D2E94[param0->unk_00].unk_1C)(param0); diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c index 2105e737d7..5e4e902676 100644 --- a/src/overlay080/ov80_021D1458.c +++ b/src/overlay080/ov80_021D1458.c @@ -1,16 +1,12 @@ #include #include -#include "core_sys.h" - -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02039EBC_decl.h" - -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay007/struct_ov7_0224F358.h" +#include "overlay080/ov80_021D2AF4.h" #include "overlay080/struct_ov80_021D1478_sub1.h" #include "overlay080/struct_ov80_021D259C.h" #include "overlay080/struct_ov80_021D2A08.h" @@ -18,21 +14,23 @@ #include "overlay080/struct_ov80_021D2C1C.h" #include "overlay080/struct_ov80_021D2C5C.h" +#include "core_sys.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "message.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02039C80.h" #include "unk_02071CFC.h" -#include "overlay080/ov80_021D2AF4.h" void sub_02071D10(const int param0, const u32 param1, Strbuf *param2); @@ -42,12 +40,12 @@ typedef struct { u16 unk_08; u8 unk_0A; u8 unk_0B; - GraphicElementData * unk_0C; + GraphicElementData *unk_0C; } UnkStruct_ov80_021D1744; typedef struct { int unk_00; - SysTask * unk_04; + SysTask *unk_04; u16 unk_08; u8 unk_0A; u8 unk_0B; @@ -72,16 +70,16 @@ typedef struct { int unk_20; int unk_24; Window unk_28[5]; - Window * unk_78; + Window *unk_78; UnkStruct_ov80_021D1478_sub1 unk_7C; UnkStruct_ov80_021D1478_sub1 unk_8C; - UnkStruct_ov80_021D2C1C * unk_9C; - UnkStruct_ov80_021D2AF4 * unk_A0; + UnkStruct_ov80_021D2C1C *unk_9C; + UnkStruct_ov80_021D2AF4 *unk_A0; UnkStruct_ov80_021D2570 unk_A4; - GraphicElementData * unk_100; - GraphicElementData * unk_104; - GraphicElementData * unk_108; - SysTask * unk_10C; + GraphicElementData *unk_100; + GraphicElementData *unk_104; + GraphicElementData *unk_108; + SysTask *unk_10C; } UnkStruct_ov80_021D1478; typedef struct { @@ -99,47 +97,47 @@ typedef struct { u8 unk_05; } UnkStruct_ov80_021D1FB0; -int ov80_021D1458(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D14A8(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D163C(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1678(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D16D0(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D16F8(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1744(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1478(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1758(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1550(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D159C(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D15C8(UnkStruct_ov80_021D2A08 * param0); -int ov80_021D1610(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D1D24(UnkStruct_ov80_021D2A08 * param0, UnkStruct_ov80_021D2AF4 * param1, int param2); -static void ov80_021D1D38(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D1D6C(UnkStruct_ov80_021D2A08 * param0, Window * param1); -static void ov80_021D1DF8(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D1F14(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D1F30(UnkStruct_ov80_021D2A08 * param0, u8 param1, u8 param2); -static void ov80_021D20DC(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D225C(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D2398(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D259C(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D26AC(SysTask * param0, void * param1); -static void ov80_021D2700(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D18F8(UnkStruct_ov80_021D2A08 * param0, int param1); -static void ov80_021D1A58(UnkStruct_ov80_021D2A08 * param0, int param1, int param2, int param3); -static void ov80_021D1AB0(UnkStruct_ov80_021D2A08 * param0, Window * param1, int param2, int param3, int param4); -static void ov80_021D1B5C(UnkStruct_ov80_021D2A08 * param0, Window * param1, UnkStruct_ov80_021D2AF4 * param2); -static void ov80_021D19E4(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D1A30(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D1C24(UnkStruct_ov80_021D2A08 * param0); -static void ov80_021D24BC(UnkStruct_ov80_021D2A08 * param0, int param1, int param2); -static void ov80_021D273C(UnkStruct_ov80_021D2A08 * param0, int param1); -static void ov80_021D2774(SysTask * param0, void * param1); -static void ov80_021D28EC(SysTask * param0, void * param1); -static int ov80_021D29BC(UnkStruct_ov80_021D2A08 * param0); - -int ov80_021D1458 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D1458(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D14A8(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D163C(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1678(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D16D0(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D16F8(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1744(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1478(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1758(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1550(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D159C(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D15C8(UnkStruct_ov80_021D2A08 *param0); +int ov80_021D1610(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D1D24(UnkStruct_ov80_021D2A08 *param0, UnkStruct_ov80_021D2AF4 *param1, int param2); +static void ov80_021D1D38(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D1D6C(UnkStruct_ov80_021D2A08 *param0, Window *param1); +static void ov80_021D1DF8(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D1F14(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D1F30(UnkStruct_ov80_021D2A08 *param0, u8 param1, u8 param2); +static void ov80_021D20DC(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D225C(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D2398(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D259C(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D26AC(SysTask *param0, void *param1); +static void ov80_021D2700(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D18F8(UnkStruct_ov80_021D2A08 *param0, int param1); +static void ov80_021D1A58(UnkStruct_ov80_021D2A08 *param0, int param1, int param2, int param3); +static void ov80_021D1AB0(UnkStruct_ov80_021D2A08 *param0, Window *param1, int param2, int param3, int param4); +static void ov80_021D1B5C(UnkStruct_ov80_021D2A08 *param0, Window *param1, UnkStruct_ov80_021D2AF4 *param2); +static void ov80_021D19E4(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D1A30(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D1C24(UnkStruct_ov80_021D2A08 *param0); +static void ov80_021D24BC(UnkStruct_ov80_021D2A08 *param0, int param1, int param2); +static void ov80_021D273C(UnkStruct_ov80_021D2A08 *param0, int param1); +static void ov80_021D2774(SysTask *param0, void *param1); +static void ov80_021D28EC(SysTask *param0, void *param1); +static int ov80_021D29BC(UnkStruct_ov80_021D2A08 *param0); + +int ov80_021D1458(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0; + UnkStruct_ov80_021D1478 *v0; param0->unk_34 = Heap_AllocFromHeap(param0->unk_04, sizeof(UnkStruct_ov80_021D1478)); v0 = (UnkStruct_ov80_021D1478 *)param0->unk_34; @@ -149,9 +147,9 @@ int ov80_021D1458 (UnkStruct_ov80_021D2A08 * param0) return 1; } -int ov80_021D1478 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D1478(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; ov80_021D225C(param0); @@ -166,9 +164,9 @@ int ov80_021D1478 (UnkStruct_ov80_021D2A08 * param0) return 1; } -int ov80_021D14A8 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D14A8(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; switch (v0->unk_00) { case 0: @@ -199,7 +197,7 @@ int ov80_021D14A8 (UnkStruct_ov80_021D2A08 * param0) return 0; } -int ov80_021D1550 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D1550(UnkStruct_ov80_021D2A08 *param0) { param0->unk_14 = 0; @@ -212,7 +210,7 @@ int ov80_021D1550 (UnkStruct_ov80_021D2A08 * param0) return 0; } -int ov80_021D159C (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D159C(UnkStruct_ov80_021D2A08 *param0) { param0->unk_14 = 0; sub_0200F174(2, 16, 36, 0x0, 6, 1, param0->unk_04); @@ -220,7 +218,7 @@ int ov80_021D159C (UnkStruct_ov80_021D2A08 * param0) return 0; } -int ov80_021D15C8 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D15C8(UnkStruct_ov80_021D2A08 *param0) { param0->unk_14 = 0; @@ -232,7 +230,7 @@ int ov80_021D15C8 (UnkStruct_ov80_021D2A08 * param0) return 0; } -int ov80_021D1610 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D1610(UnkStruct_ov80_021D2A08 *param0) { param0->unk_14 = 0; @@ -242,9 +240,9 @@ int ov80_021D1610 (UnkStruct_ov80_021D2A08 * param0) return 0; } -int ov80_021D163C (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D163C(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; if ((v0->unk_14 <= 1) && gCoreSys.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1501); @@ -260,9 +258,9 @@ int ov80_021D163C (UnkStruct_ov80_021D2A08 * param0) return 0; } -int ov80_021D1678 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D1678(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; if (v0->unk_14 <= 1) { if (gCoreSys.pressedKeys & PAD_BUTTON_A) { @@ -286,9 +284,9 @@ int ov80_021D1678 (UnkStruct_ov80_021D2A08 * param0) return 0; } -int ov80_021D16D0 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D16D0(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; if (gCoreSys.pressedKeys & (PAD_BUTTON_B)) { Sound_PlayEffect(1501); @@ -299,9 +297,9 @@ int ov80_021D16D0 (UnkStruct_ov80_021D2A08 * param0) return 0; } -int ov80_021D16F8 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D16F8(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; if (v0->unk_12 & 0x1) { if (v0->unk_15_0 >= 2) { @@ -318,10 +316,10 @@ int ov80_021D16F8 (UnkStruct_ov80_021D2A08 * param0) return 0; } -int ov80_021D1744 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D1744(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; - UnkStruct_ov80_021D1744 * v1; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; + UnkStruct_ov80_021D1744 *v1; int v2; for (v2 = 0; v2 < v0->unk_A4.unk_00; v2++) { @@ -332,11 +330,11 @@ int ov80_021D1744 (UnkStruct_ov80_021D2A08 * param0) return 0; } -int ov80_021D1758 (UnkStruct_ov80_021D2A08 * param0) +int ov80_021D1758(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; - Window * v1; - UnkStruct_ov80_021D2AF4 * v2 = param0->unk_94; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; + Window *v1; + UnkStruct_ov80_021D2AF4 *v2 = param0->unk_94; int v3 = param0->unk_90; u32 v4; u32 v5; @@ -377,14 +375,14 @@ int ov80_021D1758 (UnkStruct_ov80_021D2A08 * param0) return 0; } -static int ov80_021D1848 (UnkStruct_ov80_021D2A08 * param0, int param1) +static int ov80_021D1848(UnkStruct_ov80_021D2A08 *param0, int param1) { int v0; u16 v1; static const TouchScreenRect v2[] = { - {0, 191, 0, 255}, - {10 * 8, (10 + 7) * 8, 13 * 8, (13 + 6) * 8}, - {0xff, 0, 0, 0} + { 0, 191, 0, 255 }, + { 10 * 8, (10 + 7) * 8, 13 * 8, (13 + 6) * 8 }, + { 0xff, 0, 0, 0 } }; v0 = sub_02022664(&(v2[1 - param1])); @@ -402,9 +400,9 @@ static int ov80_021D1848 (UnkStruct_ov80_021D2A08 * param0, int param1) return 0xffffffff; } -static BOOL ov80_021D18A0 (UnkStruct_ov80_021D2A08 * param0) +static BOOL ov80_021D18A0(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; if (param0->unk_2C->unk_139 == 2) { return 0; @@ -423,9 +421,9 @@ static BOOL ov80_021D18A0 (UnkStruct_ov80_021D2A08 * param0) return 0; } -static void ov80_021D18F8 (UnkStruct_ov80_021D2A08 * param0, int param1) +static void ov80_021D18F8(UnkStruct_ov80_021D2A08 *param0, int param1) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; if (v0->unk_11) { if (!(param1 & (PAD_KEY_UP | PAD_KEY_DOWN | PAD_KEY_RIGHT | PAD_KEY_LEFT))) { @@ -492,9 +490,9 @@ static void ov80_021D18F8 (UnkStruct_ov80_021D2A08 * param0, int param1) return; } -static void ov80_021D19E4 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D19E4(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; ov80_021D1AB0(param0, &(v0->unk_28[0]), v0->unk_20, v0->unk_18, v0->unk_1C); ov80_021D2CC0(v0->unk_9C, v0->unk_20, v0->unk_18, v0->unk_1C); @@ -506,32 +504,32 @@ static void ov80_021D19E4 (UnkStruct_ov80_021D2A08 * param0) } } -static void ov80_021D1A30 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D1A30(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; v0->unk_24 = v0->unk_20; v0->unk_20 = sub_02039F04((const UnkStruct_02039EBC *)param0->unk_30, v0->unk_18, v0->unk_1C); v0->unk_A0 = ov80_021D2E24(param0->unk_40, v0->unk_18, v0->unk_1C, param0->unk_02); } -static void ov80_021D1A58 (UnkStruct_ov80_021D2A08 * param0, int param1, int param2, int param3) +static void ov80_021D1A58(UnkStruct_ov80_021D2A08 *param0, int param1, int param2, int param3) { int v0; static const UnkStruct_ov80_021D1A58 v1[] = { - {11, 19, 207}, - {11, 20, 207}, - {11, 21, 207}, - {11, 22, 207}, - {12, 12, 207}, - {12, 13, 207}, - {12, 14, 207}, - {12, 15, 207}, - {12, 16, 207}, - {12, 17, 207}, - {12, 18, 207}, - {12, 19, 207}, - {20, 12, 560}, + { 11, 19, 207 }, + { 11, 20, 207 }, + { 11, 21, 207 }, + { 11, 22, 207 }, + { 12, 12, 207 }, + { 12, 13, 207 }, + { 12, 14, 207 }, + { 12, 15, 207 }, + { 12, 16, 207 }, + { 12, 17, 207 }, + { 12, 18, 207 }, + { 12, 19, 207 }, + { 20, 12, 560 }, }; if (param1 != 0) { @@ -552,11 +550,11 @@ static void ov80_021D1A58 (UnkStruct_ov80_021D2A08 * param0, int param1, int par return; } -static void ov80_021D1AB0 (UnkStruct_ov80_021D2A08 * param0, Window * param1, int param2, int param3, int param4) +static void ov80_021D1AB0(UnkStruct_ov80_021D2A08 *param0, Window *param1, int param2, int param3, int param4) { u32 v0; u32 v1; - UnkStruct_ov80_021D1478 * v2 = param0->unk_34; + UnkStruct_ov80_021D1478 *v2 = param0->unk_34; Strbuf_Clear(param0->unk_88); BGL_FillWindow(param1, 0); @@ -577,7 +575,7 @@ static void ov80_021D1AB0 (UnkStruct_ov80_021D2A08 * param0, Window * param1, in } if (param0->unk_00 == 1) { - Strbuf* v3 = MessageLoader_GetNewStrbuf(param0->unk_84, 0); + Strbuf *v3 = MessageLoader_GetNewStrbuf(param0->unk_84, 0); sub_0201D78C(param1, 0, v3, 0, 6, 0xff, v1, NULL); Strbuf_Free(v3); @@ -586,12 +584,12 @@ static void ov80_021D1AB0 (UnkStruct_ov80_021D2A08 * param0, Window * param1, in sub_0201A954(param1); } -static void ov80_021D1B5C (UnkStruct_ov80_021D2A08 * param0, Window * param1, UnkStruct_ov80_021D2AF4 * param2) +static void ov80_021D1B5C(UnkStruct_ov80_021D2A08 *param0, Window *param1, UnkStruct_ov80_021D2AF4 *param2) { u32 v0; u32 v1; - Strbuf* v2; - Strbuf* v3; + Strbuf *v2; + Strbuf *v3; if (param2 == NULL) { BGL_FillWindow(param1, 0); @@ -616,10 +614,10 @@ static void ov80_021D1B5C (UnkStruct_ov80_021D2A08 * param0, Window * param1, Un } } -static void ov80_021D1C24 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D1C24(UnkStruct_ov80_021D2A08 *param0) { int v0 = 5; - UnkStruct_ov80_021D1478 * v1 = param0->unk_34; + UnkStruct_ov80_021D1478 *v1 = param0->unk_34; if (!v1->unk_13) { return; @@ -664,12 +662,12 @@ static void ov80_021D1C24 (UnkStruct_ov80_021D2A08 * param0) } } -static void ov80_021D1D24 (UnkStruct_ov80_021D2A08 * param0, UnkStruct_ov80_021D2AF4 * param1, int param2) +static void ov80_021D1D24(UnkStruct_ov80_021D2A08 *param0, UnkStruct_ov80_021D2AF4 *param1, int param2) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; u32 v1; u32 v2; - Strbuf* v3; + Strbuf *v3; param0->unk_90 = param2; param0->unk_94 = param1; @@ -678,10 +676,10 @@ static void ov80_021D1D24 (UnkStruct_ov80_021D2A08 * param0, UnkStruct_ov80_021D return; } -static void ov80_021D1D38 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D1D38(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; - Window * v1; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; + Window *v1; v1 = v0->unk_78; v0->unk_78 = NULL; @@ -696,11 +694,11 @@ static void ov80_021D1D38 (UnkStruct_ov80_021D2A08 * param0) sub_0201C3C0(param0->unk_28, 4); } -static void ov80_021D1D6C (UnkStruct_ov80_021D2A08 * param0, Window * param1) +static void ov80_021D1D6C(UnkStruct_ov80_021D2A08 *param0, Window *param1) { u32 v0; u32 v1; - Strbuf* v2; + Strbuf *v2; sub_02019964(param0->unk_28, 5, 10, 0, 12, 2, param0->unk_CC->rawData, 0, 7, param0->unk_CC->screenWidth / 8, param0->unk_CC->screenHeight / 8); @@ -715,9 +713,9 @@ static void ov80_021D1D6C (UnkStruct_ov80_021D2A08 * param0, Window * param1) Strbuf_Free(v2); } -static void ov80_021D1DF8 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D1DF8(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; BGL_AddWindow(param0->unk_28, &v0->unk_28[0], 1, 3, 21, 29, 3, 15, 1023 - 29 * 3); BGL_AddWindow(param0->unk_28, &v0->unk_28[1], 4, 9, 3, 21, 4, (15 - 1), (1023 - (21 * 4))); @@ -736,9 +734,9 @@ static void ov80_021D1DF8 (UnkStruct_ov80_021D2A08 * param0) sub_0201ACF4(&v0->unk_28[4]); } -static void ov80_021D1F14 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D1F14(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; u16 v1; for (v1 = 0; v1 < 5; v1++) { @@ -746,7 +744,7 @@ static void ov80_021D1F14 (UnkStruct_ov80_021D2A08 * param0) } } -static void ov80_021D1F30 (UnkStruct_ov80_021D2A08 * param0, u8 param1, u8 param2) +static void ov80_021D1F30(UnkStruct_ov80_021D2A08 *param0, u8 param1, u8 param2) { if (param2) { sub_020198E8(param0->unk_28, 5, 0, 0, 32, 24, param0->unk_D0->rawData, 0, 0, param0->unk_D0->screenWidth / 8, param0->unk_D0->screenHeight / 8); @@ -755,28 +753,28 @@ static void ov80_021D1F30 (UnkStruct_ov80_021D2A08 * param0, u8 param1, u8 param sub_02019964(param0->unk_28, 5, 13, 10, 6, 7, param0->unk_CC->rawData, param1 * 6 + 0, 0, param0->unk_CC->screenWidth / 8, param0->unk_CC->screenHeight / 8); } -static void ov80_021D1FB0 (UnkStruct_ov80_021D2A08 * param0, int param1) +static void ov80_021D1FB0(UnkStruct_ov80_021D2A08 *param0, int param1) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; static const UnkStruct_ov80_021D1FB0 v1[] = { - {5, 0, 3, 1, 2, 3}, - {5, 3, 3, 2, 2, 2}, - {8, 0, 3, 16, 4, 4}, - {8, 4, 3, 16, 4, 4}, - {0, 0, 6, 1, 2, 3}, - {0, 3, 6, 2, 2, 2}, - {0, 0, 8, 16, 4, 4}, - {0, 4, 8, 16, 4, 4}, - {0, 0, 0, 0, 0, 0}, - {4, 5, 22, 13, 3, 3}, - {0, 0, 0, 0, 0, 0}, - {8, 8, 48, 42, 5, 6}, - {2, 0, 26, 0, 3, 3}, - {2, 3, 27, 0, 2, 9}, - {4, 0, 57, 12, 4, 4}, - {4, 4, 57, 12, 4, 19}, + { 5, 0, 3, 1, 2, 3 }, + { 5, 3, 3, 2, 2, 2 }, + { 8, 0, 3, 16, 4, 4 }, + { 8, 4, 3, 16, 4, 4 }, + { 0, 0, 6, 1, 2, 3 }, + { 0, 3, 6, 2, 2, 2 }, + { 0, 0, 8, 16, 4, 4 }, + { 0, 4, 8, 16, 4, 4 }, + { 0, 0, 0, 0, 0, 0 }, + { 4, 5, 22, 13, 3, 3 }, + { 0, 0, 0, 0, 0, 0 }, + { 8, 8, 48, 42, 5, 6 }, + { 2, 0, 26, 0, 3, 3 }, + { 2, 3, 27, 0, 2, 9 }, + { 4, 0, 57, 12, 4, 4 }, + { 4, 4, 57, 12, 4, 19 }, }; - UnkStruct_ov80_021D1FB0 * v2, * v3, * v4, * v5; + UnkStruct_ov80_021D1FB0 *v2, *v3, *v4, *v5; v2 = (UnkStruct_ov80_021D1FB0 *)&(v1[param1 * 4 + 0]); v3 = (UnkStruct_ov80_021D1FB0 *)&(v1[param1 * 4 + 1]); @@ -794,9 +792,9 @@ static void ov80_021D1FB0 (UnkStruct_ov80_021D2A08 * param0, int param1) sub_02019964(param0->unk_28, 7, v4->unk_02, v4->unk_03, v4->unk_04, v4->unk_05, param0->unk_D4->rawData, v4->unk_00, v4->unk_01, ((param0->unk_D4)->screenWidth / 8), ((param0->unk_D4)->screenHeight / 8)); } -static void ov80_021D20DC (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D20DC(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; int v1 = 0; sub_020198E8(param0->unk_28, 2, 0, 0, 32, 24, param0->unk_B8->rawData, 0, 0, ((param0->unk_B8)->screenWidth / 8), ((param0->unk_B8)->screenHeight / 8)); @@ -835,9 +833,9 @@ static void ov80_021D20DC (UnkStruct_ov80_021D2A08 * param0) sub_0201C3C0(param0->unk_28, 7); } -static void ov80_021D225C (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D225C(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; sub_02019184(param0->unk_28, 6, 3, 0); sub_02019184(param0->unk_28, 7, 3, 0); @@ -877,7 +875,7 @@ static const UnkStruct_ov7_0224F358 Unk_ov80_021D30E8[] = { 0, 0, 0, - 0 + 0, }, { 1, @@ -891,7 +889,7 @@ static const UnkStruct_ov7_0224F358 Unk_ov80_021D30E8[] = { 0, 0, 0, - 0 + 0, }, { 2, @@ -905,13 +903,13 @@ static const UnkStruct_ov7_0224F358 Unk_ov80_021D30E8[] = { 0, 0, 0, - 0 + 0, }, }; -static void ov80_021D2398 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D2398(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; UnkStruct_ov7_0224F358 v1 = Unk_ov80_021D30E8[2]; v0->unk_100 = sub_0200CA08(param0->unk_D8, param0->unk_DC, &Unk_ov80_021D30E8[0]); @@ -940,7 +938,7 @@ static void ov80_021D2398 (UnkStruct_ov80_021D2A08 * param0) SpriteActor_SetPositionXY(v0->unk_108, v0->unk_18 * 7 + (48 - 23), v0->unk_1C * 7 + (6 - 40)); } -static void ov80_021D24BC (UnkStruct_ov80_021D2A08 * param0, int param1, int param2) +static void ov80_021D24BC(UnkStruct_ov80_021D2A08 *param0, int param1, int param2) { if (param1 < 8) { sub_0201C63C(param0->unk_28, 6, 0, 8); @@ -965,7 +963,7 @@ static void ov80_021D24BC (UnkStruct_ov80_021D2A08 * param0, int param1, int par } } -static int ov80_021D2570 (UnkStruct_ov80_021D2570 * param0, int param1, int param2) +static int ov80_021D2570(UnkStruct_ov80_021D2570 *param0, int param1, int param2) { int v0 = 0; @@ -978,13 +976,13 @@ static int ov80_021D2570 (UnkStruct_ov80_021D2570 * param0, int param1, int para return -1; } -static void ov80_021D259C (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D259C(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; - UnkStruct_ov80_021D259C * v1; - UnkStruct_ov80_021D1744 * v2; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; + UnkStruct_ov80_021D259C *v1; + UnkStruct_ov80_021D1744 *v2; int v3 = 0, v4, v5; - static const u16 v6[4] = {0, 2, 3, 1}; + static const u16 v6[4] = { 0, 2, 3, 1 }; static const UnkStruct_ov7_0224F358 Unk_ov80_021D30E8 = { 3, 0, 0, 0, 0, 2, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0 }; @@ -1039,9 +1037,9 @@ static void ov80_021D259C (UnkStruct_ov80_021D2A08 * param0) v0->unk_A4.unk_04 = SysTask_Start(ov80_021D26AC, &v0->unk_A4, 1); } -static void ov80_021D26AC (SysTask * param0, void * param1) +static void ov80_021D26AC(SysTask *param0, void *param1) { - UnkStruct_ov80_021D2570 * v0 = (UnkStruct_ov80_021D2570 *)param1; + UnkStruct_ov80_021D2570 *v0 = (UnkStruct_ov80_021D2570 *)param1; if (v0->unk_08++ % 26 > 0) { return; @@ -1058,10 +1056,10 @@ static void ov80_021D26AC (SysTask * param0, void * param1) } } -static void ov80_021D2700 (UnkStruct_ov80_021D2A08 * param0) +static void ov80_021D2700(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; - UnkStruct_ov80_021D1744 * v1; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; + UnkStruct_ov80_021D1744 *v1; int v2 = 0, v3; if (v0->unk_A4.unk_04 != NULL) { @@ -1074,9 +1072,9 @@ static void ov80_021D2700 (UnkStruct_ov80_021D2A08 * param0) } } -static void ov80_021D273C (UnkStruct_ov80_021D2A08 * param0, int param1) +static void ov80_021D273C(UnkStruct_ov80_021D2A08 *param0, int param1) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; v0->unk_04 = 0; v0->unk_08 = 0; @@ -1088,11 +1086,11 @@ static void ov80_021D273C (UnkStruct_ov80_021D2A08 * param0, int param1) } } -static void ov80_021D2774 (SysTask * param0, void * param1) +static void ov80_021D2774(SysTask *param0, void *param1) { - UnkStruct_ov80_021D2A08 * v0 = (UnkStruct_ov80_021D2A08 *)param1; - UnkStruct_ov80_021D1478 * v1 = v0->unk_34; - static const u8 v2[] = {1, 2, 1, 0}; + UnkStruct_ov80_021D2A08 *v0 = (UnkStruct_ov80_021D2A08 *)param1; + UnkStruct_ov80_021D1478 *v1 = v0->unk_34; + static const u8 v2[] = { 1, 2, 1, 0 }; switch (v1->unk_04) { case 0: @@ -1155,10 +1153,10 @@ static void ov80_021D2774 (SysTask * param0, void * param1) } } -static void ov80_021D28EC (SysTask * param0, void * param1) +static void ov80_021D28EC(SysTask *param0, void *param1) { - UnkStruct_ov80_021D2A08 * v0 = (UnkStruct_ov80_021D2A08 *)param1; - UnkStruct_ov80_021D1478 * v1 = v0->unk_34; + UnkStruct_ov80_021D2A08 *v0 = (UnkStruct_ov80_021D2A08 *)param1; + UnkStruct_ov80_021D1478 *v1 = v0->unk_34; switch (v1->unk_04) { case 0: @@ -1197,10 +1195,10 @@ static void ov80_021D28EC (SysTask * param0, void * param1) return; } -static int ov80_021D29BC (UnkStruct_ov80_021D2A08 * param0) +static int ov80_021D29BC(UnkStruct_ov80_021D2A08 *param0) { - UnkStruct_ov80_021D1478 * v0 = param0->unk_34; - UnkStruct_ov80_021D2C5C * v1 = NULL; + UnkStruct_ov80_021D1478 *v0 = param0->unk_34; + UnkStruct_ov80_021D2C5C *v1 = NULL; u8 v2 = 1; if (v0->unk_A0 == NULL) { diff --git a/src/overlay080/ov80_021D2A08.c b/src/overlay080/ov80_021D2A08.c index 400d347f17..9652087291 100644 --- a/src/overlay080/ov80_021D2A08.c +++ b/src/overlay080/ov80_021D2A08.c @@ -6,16 +6,16 @@ #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_0224133C.h" +#include "gx_layers.h" #include "unk_0200C6E4.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" -void ov80_021D2A08(UnkStruct_ov80_021D2A08 * param0); -void ov80_021D2AC0(UnkStruct_ov80_021D2A08 * param0); -void ov80_021D2AE0(UnkStruct_ov80_021D2A08 * param0); -void ov80_021D2AEC(UnkStruct_ov80_021D2A08 * param0); +void ov80_021D2A08(UnkStruct_ov80_021D2A08 *param0); +void ov80_021D2AC0(UnkStruct_ov80_021D2A08 *param0); +void ov80_021D2AE0(UnkStruct_ov80_021D2A08 *param0); +void ov80_021D2AEC(UnkStruct_ov80_021D2A08 *param0); -void ov80_021D2A08 (UnkStruct_ov80_021D2A08 * param0) +void ov80_021D2A08(UnkStruct_ov80_021D2A08 *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -26,10 +26,21 @@ void ov80_021D2A08 (UnkStruct_ov80_021D2A08 * param0) { UnkStruct_ov104_0224133C v0 = { - 0, 128, 0, 32, 0, 128, 0, 32, + 0, + 128, + 0, + 32, + 0, + 128, + 0, + 32, }; UnkStruct_ov104_022412F4 v1 = { - 5, 1024, 1024, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K, + 5, + 1024, + 1024, + GX_OBJVRAMMODE_CHAR_1D_32K, + GX_OBJVRAMMODE_CHAR_1D_32K, }; sub_0200C73C(param0->unk_D8, &v0, &v1, 32); @@ -51,19 +62,19 @@ void ov80_021D2A08 (UnkStruct_ov80_021D2A08 * param0) } } -void ov80_021D2AC0 (UnkStruct_ov80_021D2A08 * param0) +void ov80_021D2AC0(UnkStruct_ov80_021D2A08 *param0) { sub_0200C8B0(param0->unk_D8, param0->unk_DC); sub_0200C8D4(param0->unk_D8); sub_0201DC3C(); } -void ov80_021D2AE0 (UnkStruct_ov80_021D2A08 * param0) +void ov80_021D2AE0(UnkStruct_ov80_021D2A08 *param0) { sub_0200C7EC(param0->unk_DC); } -void ov80_021D2AEC (UnkStruct_ov80_021D2A08 * param0) +void ov80_021D2AEC(UnkStruct_ov80_021D2A08 *param0) { sub_0200C800(); } diff --git a/src/overlay080/ov80_021D2AF4.c b/src/overlay080/ov80_021D2AF4.c index 1fadf53dff..faf6b0e63e 100644 --- a/src/overlay080/ov80_021D2AF4.c +++ b/src/overlay080/ov80_021D2AF4.c @@ -1,3 +1,5 @@ +#include "overlay080/ov80_021D2AF4.h" + #include #include @@ -11,41 +13,38 @@ #include "overlay080/struct_ov80_021D2C5C_sub1.h" #include "overlay080/struct_ov80_021D2E10.h" -#include "unk_0200C6E4.h" #include "heap.h" +#include "unk_0200C6E4.h" #include "unk_020218BC.h" -#include "overlay080/ov80_021D2AF4.h" - -#include "overlay080/struct_ov80_021D2C5C_sub1.h" const UnkStruct_ov80_021D2C5C_sub1 Unk_ov80_021D31D8[20] = { - { 0x19B, 0x0, 0x0, 0x0, 0x0, 0x15, 0xBD }, - { 0x1A2, 0x1, 0x0, 0x0, 0x0, 0x23, 0xB6 }, - { 0x1AA, 0x2, 0x1, 0x0, 0x0, 0x23, 0x88 }, - { 0x1B1, 0x3, 0x5, 0x0, 0x0, 0x7A, 0x8C }, - { 0x1BA, 0x4, 0x0, 0x0, 0x0, 0x62, 0x70 }, - { 0x1C2, 0x5, 0x0, 0x0, 0x0, 0x8C, 0x46 }, - { 0x1C9, 0x6, 0x0, 0x0, 0x0, 0xAF, 0x62 }, - { 0x3, 0x7, 0x2, 0x1, 0x0, 0x1F, 0xA4 }, - { 0x21, 0x8, 0x1, 0x1, 0x0, 0x7, 0x9D }, - { 0x2D, 0x9, 0x4, 0x1, 0x0, 0x3C, 0xA4 }, - { 0x41, 0xA, 0x3, 0x1, 0x0, 0x42, 0x73 }, - { 0x56, 0xB, 0x2, 0x1, 0x0, 0x65, 0x96 }, - { 0x78, 0xC, 0x2, 0x1, 0x0, 0x81, 0xB2 }, - { 0x84, 0xD, 0x2, 0x1, 0x0, 0x96, 0x81 }, - { 0x96, 0xE, 0x2, 0x1, 0x0, 0xB9, 0xA4 }, - { 0xA5, 0xF, 0x1, 0x1, 0x0, 0x4D, 0x2D }, - { 0xBC, 0x11, 0x5, 0x1, 0x0, 0x89, 0x5B }, - { 0x188, 0x43, 0x6, 0x1, 0x1, 0x3F, 0xC4 }, - { 0xAC, 0x10, 0x6, 0x1, 0x2, 0xB6, 0x7E }, - { 0xAC, 0x44, 0x0, 0x1, 0x3, 0xB6, 0x77 } + { 0x19B, 0x0, 0x0, 0x0, 0x0, 0x15, 0xBD }, + { 0x1A2, 0x1, 0x0, 0x0, 0x0, 0x23, 0xB6 }, + { 0x1AA, 0x2, 0x1, 0x0, 0x0, 0x23, 0x88 }, + { 0x1B1, 0x3, 0x5, 0x0, 0x0, 0x7A, 0x8C }, + { 0x1BA, 0x4, 0x0, 0x0, 0x0, 0x62, 0x70 }, + { 0x1C2, 0x5, 0x0, 0x0, 0x0, 0x8C, 0x46 }, + { 0x1C9, 0x6, 0x0, 0x0, 0x0, 0xAF, 0x62 }, + { 0x3, 0x7, 0x2, 0x1, 0x0, 0x1F, 0xA4 }, + { 0x21, 0x8, 0x1, 0x1, 0x0, 0x7, 0x9D }, + { 0x2D, 0x9, 0x4, 0x1, 0x0, 0x3C, 0xA4 }, + { 0x41, 0xA, 0x3, 0x1, 0x0, 0x42, 0x73 }, + { 0x56, 0xB, 0x2, 0x1, 0x0, 0x65, 0x96 }, + { 0x78, 0xC, 0x2, 0x1, 0x0, 0x81, 0xB2 }, + { 0x84, 0xD, 0x2, 0x1, 0x0, 0x96, 0x81 }, + { 0x96, 0xE, 0x2, 0x1, 0x0, 0xB9, 0xA4 }, + { 0xA5, 0xF, 0x1, 0x1, 0x0, 0x4D, 0x2D }, + { 0xBC, 0x11, 0x5, 0x1, 0x0, 0x89, 0x5B }, + { 0x188, 0x43, 0x6, 0x1, 0x1, 0x3F, 0xC4 }, + { 0xAC, 0x10, 0x6, 0x1, 0x2, 0xB6, 0x7E }, + { 0xAC, 0x44, 0x0, 0x1, 0x3, 0xB6, 0x77 } }; -UnkStruct_ov80_021D2C1C * ov80_021D2AF4 (SpriteRenderer * param0, SpriteGfxHandler * param1, u8 * param2, short param3, int param4) +UnkStruct_ov80_021D2C1C *ov80_021D2AF4(SpriteRenderer *param0, SpriteGfxHandler *param1, u8 *param2, short param3, int param4) { - UnkStruct_ov80_021D2C1C * v0; - UnkStruct_ov80_021D2C5C * v1; - const UnkStruct_ov80_021D2C5C_sub1 * v2; + UnkStruct_ov80_021D2C1C *v0; + UnkStruct_ov80_021D2C5C *v1; + const UnkStruct_ov80_021D2C5C_sub1 *v2; short v3; static const UnkStruct_ov7_0224F358 v4 = { 4, 0, 0, 0, 0, 10, 5, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0 @@ -88,9 +87,9 @@ UnkStruct_ov80_021D2C1C * ov80_021D2AF4 (SpriteRenderer * param0, SpriteGfxHandl return v0; } -void ov80_021D2C1C (UnkStruct_ov80_021D2C1C * param0) +void ov80_021D2C1C(UnkStruct_ov80_021D2C1C *param0) { - UnkStruct_ov80_021D2C5C * v0; + UnkStruct_ov80_021D2C5C *v0; short v1; for (v1 = 0; v1 < param0->unk_00; v1++) { @@ -103,9 +102,9 @@ void ov80_021D2C1C (UnkStruct_ov80_021D2C1C * param0) Heap_FreeToHeap(param0); } -UnkStruct_ov80_021D2C5C * ov80_021D2C5C (UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int param3) +UnkStruct_ov80_021D2C5C *ov80_021D2C5C(UnkStruct_ov80_021D2C1C *param0, int param1, int param2, int param3) { - UnkStruct_ov80_021D2C5C * v0; + UnkStruct_ov80_021D2C5C *v0; short v1, v2; for (v1 = 0; v1 < param0->unk_00; v1++) { @@ -139,9 +138,9 @@ UnkStruct_ov80_021D2C5C * ov80_021D2C5C (UnkStruct_ov80_021D2C1C * param0, int p return NULL; } -int ov80_021D2CC0 (UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int param3) +int ov80_021D2CC0(UnkStruct_ov80_021D2C1C *param0, int param1, int param2, int param3) { - UnkStruct_ov80_021D2C5C * v0; + UnkStruct_ov80_021D2C5C *v0; short v1, v2; v2 = 0; @@ -174,10 +173,10 @@ int ov80_021D2CC0 (UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int return 1; } -void ov80_021D2D28 (UnkStruct_ov80_021D2C1C * param0, int param1) +void ov80_021D2D28(UnkStruct_ov80_021D2C1C *param0, int param1) { short v0; - UnkStruct_ov80_021D2C5C * v1; + UnkStruct_ov80_021D2C5C *v1; if ((param0->unk_04 == NULL) || (param1 != 1)) { return; @@ -197,13 +196,13 @@ void ov80_021D2D28 (UnkStruct_ov80_021D2C1C * param0, int param1) } } -UnkStruct_ov80_021D2E10 * ov80_021D2D70 (const char * param0, int param1) +UnkStruct_ov80_021D2E10 *ov80_021D2D70(const char *param0, int param1) { FSFile v0; int v1, v2; int v3; - UnkStruct_ov80_021D2E10 * v4; - UnkStruct_ov80_021D2AF4 * v5; + UnkStruct_ov80_021D2E10 *v4; + UnkStruct_ov80_021D2AF4 *v5; FS_InitFile(&v0); @@ -234,16 +233,16 @@ UnkStruct_ov80_021D2E10 * ov80_021D2D70 (const char * param0, int param1) return v4; } -void ov80_021D2E10 (UnkStruct_ov80_021D2E10 * param0) +void ov80_021D2E10(UnkStruct_ov80_021D2E10 *param0) { Heap_FreeToHeap(param0->unk_04); Heap_FreeToHeap(param0); } -UnkStruct_ov80_021D2AF4 * ov80_021D2E24 (UnkStruct_ov80_021D2E10 * param0, int param1, int param2, u16 param3) +UnkStruct_ov80_021D2AF4 *ov80_021D2E24(UnkStruct_ov80_021D2E10 *param0, int param1, int param2, u16 param3) { int v0; - UnkStruct_ov80_021D2AF4 * v1; + UnkStruct_ov80_021D2AF4 *v1; for (v0 = 0; v0 < param0->unk_00; v0++) { v1 = &(param0->unk_04[v0]); diff --git a/src/overlay081/ov81_021D0D80.c b/src/overlay081/ov81_021D0D80.c index 3e37eb07e9..9b60e0cf7f 100644 --- a/src/overlay081/ov81_021D0D80.c +++ b/src/overlay081/ov81_021D0D80.c @@ -1,75 +1,75 @@ +#include "overlay081/ov81_021D0D80.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0202BC58.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay081/ov81_021D1610.h" #include "overlay081/struct_ov81_021D1610.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "journal.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "journal.h" #include "unk_020393C8.h" #include "unk_0208C098.h" -#include "overlay081/ov81_021D0D80.h" -#include "overlay081/ov81_021D1610.h" -static void ov81_021D0F00(void * param0); +static void ov81_021D0F00(void *param0); static void ov81_021D0F20(void); -static void ov81_021D0F40(BGL * param0); -static void ov81_021D101C(BGL * param0); -static void ov81_021D1050(UnkStruct_ov81_021D1610 * param0); -static void ov81_021D1130(UnkStruct_ov81_021D1610 * param0); -static void ov81_021D115C(UnkStruct_ov81_021D1610 * param0); -static int ov81_021D1174(UnkStruct_ov81_021D1610 * param0); -static int ov81_021D1188(UnkStruct_ov81_021D1610 * param0); -static int ov81_021D120C(UnkStruct_ov81_021D1610 * param0); -static int ov81_021D12E8(UnkStruct_ov81_021D1610 * param0); -static int ov81_021D1358(UnkStruct_ov81_021D1610 * param0); -static u8 ov81_021D13CC(UnkStruct_ov81_021D1610 * param0, s8 param1); -static void ov81_021D1360(UnkStruct_ov81_021D1610 * param0); -static void ov81_021D140C(UnkStruct_ov81_021D1610 * param0, u8 param1, u8 param2); -static void ov81_021D1434(UnkStruct_ov81_021D1610 * param0); -static u8 ov81_021D14E0(UnkStruct_ov81_021D1610 * param0); -static u8 ov81_021D156C(UnkStruct_ov81_021D1610 * param0); +static void ov81_021D0F40(BGL *param0); +static void ov81_021D101C(BGL *param0); +static void ov81_021D1050(UnkStruct_ov81_021D1610 *param0); +static void ov81_021D1130(UnkStruct_ov81_021D1610 *param0); +static void ov81_021D115C(UnkStruct_ov81_021D1610 *param0); +static int ov81_021D1174(UnkStruct_ov81_021D1610 *param0); +static int ov81_021D1188(UnkStruct_ov81_021D1610 *param0); +static int ov81_021D120C(UnkStruct_ov81_021D1610 *param0); +static int ov81_021D12E8(UnkStruct_ov81_021D1610 *param0); +static int ov81_021D1358(UnkStruct_ov81_021D1610 *param0); +static u8 ov81_021D13CC(UnkStruct_ov81_021D1610 *param0, s8 param1); +static void ov81_021D1360(UnkStruct_ov81_021D1610 *param0); +static void ov81_021D140C(UnkStruct_ov81_021D1610 *param0, u8 param1, u8 param2); +static void ov81_021D1434(UnkStruct_ov81_021D1610 *param0); +static u8 ov81_021D14E0(UnkStruct_ov81_021D1610 *param0); +static u8 ov81_021D156C(UnkStruct_ov81_021D1610 *param0); static const u8 Unk_ov81_021D33E8[9][32] = { - {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F}, - {0x0, 0x1, 0x2, 0x3, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0xFF, 0xFF, 0xFF, 0xFF}, - {0x0, 0x1, 0x2, 0x3, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, - {0x0, 0x1, 0x2, 0x3, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x1C, 0x1D, 0x1E, 0x1F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, - {0x0, 0x1, 0x2, 0x3, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, - {0x0, 0x1, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, - {0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, - {0x1C, 0x1D, 0x1E, 0x1F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, - {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF} + { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F }, + { 0x0, 0x1, 0x2, 0x3, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0x0, 0x1, 0x2, 0x3, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0x0, 0x1, 0x2, 0x3, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x1C, 0x1D, 0x1E, 0x1F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0x0, 0x1, 0x2, 0x3, 0x8, 0x9, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0x0, 0x1, 0xA, 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0x1C, 0x1D, 0x1E, 0x1F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } }; -int ov81_021D0D80 (OverlayManager * param0, int * param1) +int ov81_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov81_021D1610 * v0; - SaveData * v1; + UnkStruct_ov81_021D1610 *v0; + SaveData *v1; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -113,9 +113,9 @@ int ov81_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov81_021D0E70 (OverlayManager * param0, int * param1) +int ov81_021D0E70(OverlayManager *param0, int *param1) { - UnkStruct_ov81_021D1610 * v0 = OverlayManager_Data(param0); + UnkStruct_ov81_021D1610 *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -139,9 +139,9 @@ int ov81_021D0E70 (OverlayManager * param0, int * param1) return 0; } -int ov81_021D0EC4 (OverlayManager * param0, int * param1) +int ov81_021D0EC4(OverlayManager *param0, int *param1) { - UnkStruct_ov81_021D1610 * v0 = OverlayManager_Data(param0); + UnkStruct_ov81_021D1610 *v0 = OverlayManager_Data(param0); SetMainCallback(NULL, NULL); @@ -156,15 +156,15 @@ int ov81_021D0EC4 (OverlayManager * param0, int * param1) return 1; } -static void ov81_021D0F00 (void * param0) +static void ov81_021D0F00(void *param0) { - UnkStruct_ov81_021D1610 * v0 = param0; + UnkStruct_ov81_021D1610 *v0 = param0; sub_0201C2B8(v0->unk_00); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov81_021D0F20 (void) +static void ov81_021D0F20(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_256_AB, @@ -182,7 +182,7 @@ static void ov81_021D0F20 (void) GXLayers_SetBanks(&v0); } -static void ov81_021D0F40 (BGL * param0) +static void ov81_021D0F40(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -278,7 +278,7 @@ static void ov81_021D0F40 (BGL * param0) sub_02019690(1, 32, 0, 42); } -static void ov81_021D101C (BGL * param0) +static void ov81_021D101C(BGL *param0) { GXLayers_DisableEngineALayers(); sub_02019044(param0, 3); @@ -288,10 +288,10 @@ static void ov81_021D101C (BGL * param0) Heap_FreeToHeapExplicit(42, param0); } -static void ov81_021D1050 (UnkStruct_ov81_021D1610 * param0) +static void ov81_021D1050(UnkStruct_ov81_021D1610 *param0) { - u16 * v0; - NARC * v1; + u16 *v0; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__F_NOTE_GRA, 42); @@ -315,21 +315,21 @@ static void ov81_021D1050 (UnkStruct_ov81_021D1610 * param0) sub_0201975C(4, 0); } -static void ov81_021D1130 (UnkStruct_ov81_021D1610 * param0) +static void ov81_021D1130(UnkStruct_ov81_021D1610 *param0) { param0->unk_50 = MessageLoader_Init(0, 26, 366, 42); param0->unk_54 = StringTemplate_Default(42); param0->unk_58 = Strbuf_Init(128, 42); } -static void ov81_021D115C (UnkStruct_ov81_021D1610 * param0) +static void ov81_021D115C(UnkStruct_ov81_021D1610 *param0) { MessageLoader_Free(param0->unk_50); StringTemplate_Free(param0->unk_54); Strbuf_Free(param0->unk_58); } -static int ov81_021D1174 (UnkStruct_ov81_021D1610 * param0) +static int ov81_021D1174(UnkStruct_ov81_021D1610 *param0) { if (ScreenWipe_Done() == 1) { return 1; @@ -338,7 +338,7 @@ static int ov81_021D1174 (UnkStruct_ov81_021D1610 * param0) return 0; } -static int ov81_021D1188 (UnkStruct_ov81_021D1610 * param0) +static int ov81_021D1188(UnkStruct_ov81_021D1610 *param0) { if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { if (ov81_021D13CC(param0, -1) == 1) { @@ -375,7 +375,7 @@ static int ov81_021D1188 (UnkStruct_ov81_021D1610 * param0) return 1; } -static int ov81_021D120C (UnkStruct_ov81_021D1610 * param0) +static int ov81_021D120C(UnkStruct_ov81_021D1610 *param0) { switch (param0->unk_105E) { case 0: @@ -404,7 +404,7 @@ static int ov81_021D120C (UnkStruct_ov81_021D1610 * param0) return 2; } -static int ov81_021D12E8 (UnkStruct_ov81_021D1610 * param0) +static int ov81_021D12E8(UnkStruct_ov81_021D1610 *param0) { switch (param0->unk_105E) { case 0: @@ -427,12 +427,12 @@ static int ov81_021D12E8 (UnkStruct_ov81_021D1610 * param0) return 3; } -static int ov81_021D1358 (UnkStruct_ov81_021D1610 * param0) +static int ov81_021D1358(UnkStruct_ov81_021D1610 *param0) { return ScreenWipe_Done(); } -static void ov81_021D1360 (UnkStruct_ov81_021D1610 * param0) +static void ov81_021D1360(UnkStruct_ov81_021D1610 *param0) { if (param0->unk_1060 == 0) { param0->unk_1062 = 0; @@ -447,7 +447,7 @@ static void ov81_021D1360 (UnkStruct_ov81_021D1610 * param0) } } -static u8 ov81_021D13A0 (UnkStruct_ov81_021D1610 * param0, u8 param1) +static u8 ov81_021D13A0(UnkStruct_ov81_021D1610 *param0, u8 param1) { UnkStruct_0202BC58 v0; @@ -460,7 +460,7 @@ static u8 ov81_021D13A0 (UnkStruct_ov81_021D1610 * param0, u8 param1) return 1; } -static u8 ov81_021D13CC (UnkStruct_ov81_021D1610 * param0, s8 param1) +static u8 ov81_021D13CC(UnkStruct_ov81_021D1610 *param0, s8 param1) { if (param1 == 1) { if (param0->unk_105C != 9) { @@ -479,23 +479,23 @@ static u8 ov81_021D13CC (UnkStruct_ov81_021D1610 * param0, s8 param1) return 0; } -static void ov81_021D140C (UnkStruct_ov81_021D1610 * param0, u8 param1, u8 param2) +static void ov81_021D140C(UnkStruct_ov81_021D1610 *param0, u8 param1, u8 param2) { sub_02019E2C(param0->unk_00, param1, 0, 0, 32, 32, param2); sub_0201C3C0(param0->unk_00, param1); } -static void ov81_021D1434 (UnkStruct_ov81_021D1610 * param0) +static void ov81_021D1434(UnkStruct_ov81_021D1610 *param0) { - u16 * v0; + u16 *v0; v0 = sub_02019FE4(param0->unk_00, 0); MI_CpuCopy16(v0, param0->unk_85C, 0x800); } -static void ov81_021D1450 (UnkStruct_ov81_021D1610 * param0, u16 * param1, u16 param2, u16 param3) +static void ov81_021D1450(UnkStruct_ov81_021D1610 *param0, u16 *param1, u16 param2, u16 param3) { - u16 * v0; + u16 *v0; u16 v1, v2; v0 = sub_02019FE4(param0->unk_00, param2); @@ -514,7 +514,7 @@ static void ov81_021D1450 (UnkStruct_ov81_021D1610 * param0, u16 * param1, u16 p sub_0201C3C0(param0->unk_00, param2); } -static u8 ov81_021D14E0 (UnkStruct_ov81_021D1610 * param0) +static u8 ov81_021D14E0(UnkStruct_ov81_021D1610 *param0) { ov81_021D1450(param0, param0->unk_85C, param0->unk_1062, param0->unk_105F); ov81_021D1450(param0, param0->unk_5C, param0->unk_1061, param0->unk_105F); @@ -533,7 +533,7 @@ static u8 ov81_021D14E0 (UnkStruct_ov81_021D1610 * param0) return 0; } -static u8 ov81_021D156C (UnkStruct_ov81_021D1610 * param0) +static u8 ov81_021D156C(UnkStruct_ov81_021D1610 *param0) { ov81_021D1450(param0, param0->unk_85C, param0->unk_1064, 8 - param0->unk_105F); ov81_021D1450(param0, param0->unk_5C, param0->unk_1063, 8 - param0->unk_105F); diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c index 939f08ca65..fbf5956a8c 100644 --- a/src/overlay081/ov81_021D1610.c +++ b/src/overlay081/ov81_021D1610.c @@ -1,105 +1,104 @@ +#include "overlay081/ov81_021D1610.h" + #include #include -#include "strbuf.h" -#include "pokemon.h" - #include "struct_defs/struct_0202BC58.h" #include "struct_defs/struct_0202BCC8.h" #include "struct_defs/struct_0202BE38.h" #include "struct_defs/struct_0202BF4C.h" #include "struct_defs/struct_0202BFCC.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay081/struct_ov81_021D1610.h" -#include "unk_02002B7C.h" -#include "message.h" -#include "string_template.h" #include "heap.h" -#include "unk_02018340.h" -#include "unk_0201D670.h" -#include "strbuf.h" #include "journal.h" #include "map_header.h" +#include "message.h" #include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" #include "trainer_data.h" -#include "overlay081/ov81_021D1610.h" +#include "unk_02002B7C.h" +#include "unk_02018340.h" +#include "unk_0201D670.h" -static u8 ov81_021D16B0(UnkStruct_ov81_021D1610 * param0, Window * param1, Window * param2); -static void ov81_021D17C8(UnkStruct_ov81_021D1610 * param0, Window * param1); -static void ov81_021D1A90(UnkStruct_ov81_021D1610 * param0, Window * param1); -static void ov81_021D1AD4(UnkStruct_ov81_021D1610 * param0, Window * param1); -static void ov81_021D1C10(UnkStruct_ov81_021D1610 * param0, Window * param1); -static void ov81_021D1E04(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D1E40(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D1E7C(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D1EB8(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D1EF4(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D1F30(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D1F6C(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D1FA8(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D1FE4(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2038(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2098(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D20EC(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2140(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D219C(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2208(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2270(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D22AC(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D22E8(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D233C(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2398(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D23F4(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2450(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D24AC(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2508(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2564(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D25C0(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D261C(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2678(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D26D4(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2730(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D276C(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D27A8(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D27E4(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D2820(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3); -static void ov81_021D285C(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3, int param4); -static void ov81_021D2908(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BE38 * param2); -static void ov81_021D29B4(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BE38 * param2); -static void ov81_021D2A9C(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2B20(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2BA4(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2C38(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2CBC(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2D50(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2DAC(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2E18(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2E54(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2EB0(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2EEC(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2F70(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D2FAC(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D300C(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D3048(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D30B4(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D30F0(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D312C(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3, int param4); -static void ov81_021D3190(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D31EC(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D3248(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); -static void ov81_021D32A0(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3, int param4); -static void ov81_021D3304(UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3); +static u8 ov81_021D16B0(UnkStruct_ov81_021D1610 *param0, Window *param1, Window *param2); +static void ov81_021D17C8(UnkStruct_ov81_021D1610 *param0, Window *param1); +static void ov81_021D1A90(UnkStruct_ov81_021D1610 *param0, Window *param1); +static void ov81_021D1AD4(UnkStruct_ov81_021D1610 *param0, Window *param1); +static void ov81_021D1C10(UnkStruct_ov81_021D1610 *param0, Window *param1); +static void ov81_021D1E04(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D1E40(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D1E7C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D1EB8(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D1EF4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D1F30(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D1F6C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D1FA8(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D1FE4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2038(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2098(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D20EC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2140(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D219C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2208(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2270(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D22AC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D22E8(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D233C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2398(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D23F4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2450(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D24AC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2508(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2564(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D25C0(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D261C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2678(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D26D4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2730(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D276C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D27A8(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D27E4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D2820(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3); +static void ov81_021D285C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3, int param4); +static void ov81_021D2908(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BE38 *param2); +static void ov81_021D29B4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BE38 *param2); +static void ov81_021D2A9C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2B20(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2BA4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2C38(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2CBC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2D50(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2DAC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2E18(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2E54(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2EB0(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2EEC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2F70(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D2FAC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D300C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D3048(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D30B4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D30F0(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D312C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3, int param4); +static void ov81_021D3190(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D31EC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D3248(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); +static void ov81_021D32A0(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3, int param4); +static void ov81_021D3304(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3); static const UnkStruct_ov61_0222C884 Unk_ov81_021D3508[] = { - {0x0, 0x2, 0x2, 0x18, 0x2, 0xF, 0x1}, - {0x0, 0x4, 0x4, 0x1B, 0x12, 0xF, 0x31}, - {0x1, 0x2, 0x2, 0x18, 0x2, 0xF, 0x1}, - {0x1, 0x4, 0x4, 0x1B, 0x12, 0xF, 0x31} + { 0x0, 0x2, 0x2, 0x18, 0x2, 0xF, 0x1 }, + { 0x0, 0x4, 0x4, 0x1B, 0x12, 0xF, 0x31 }, + { 0x1, 0x2, 0x2, 0x18, 0x2, 0xF, 0x1 }, + { 0x1, 0x4, 0x4, 0x1B, 0x12, 0xF, 0x31 } }; -void ov81_021D1610 (UnkStruct_ov81_021D1610 * param0) +void ov81_021D1610(UnkStruct_ov81_021D1610 *param0) { u32 v0; @@ -108,7 +107,7 @@ void ov81_021D1610 (UnkStruct_ov81_021D1610 * param0) } } -void ov81_021D1634 (UnkStruct_ov81_021D1610 * param0) +void ov81_021D1634(UnkStruct_ov81_021D1610 *param0) { u32 v0; @@ -117,10 +116,10 @@ void ov81_021D1634 (UnkStruct_ov81_021D1610 * param0) } } -void ov81_021D164C (UnkStruct_ov81_021D1610 * param0, u32 param1) +void ov81_021D164C(UnkStruct_ov81_021D1610 *param0, u32 param1) { - Window * v0; - Window * v1; + Window *v0; + Window *v1; if (param1 == 0) { v0 = ¶m0->unk_04[0]; @@ -144,10 +143,10 @@ void ov81_021D164C (UnkStruct_ov81_021D1610 * param0, u32 param1) sub_0201A9A4(v1); } -static u8 ov81_021D16B0 (UnkStruct_ov81_021D1610 * param0, Window * param1, Window * param2) +static u8 ov81_021D16B0(UnkStruct_ov81_021D1610 *param0, Window *param1, Window *param2) { UnkStruct_0202BC58 v0; - Strbuf* v1; + Strbuf *v1; u32 v2; sub_0202C2A4(param0->unk_44, &v0, 0, param0->unk_105C); @@ -179,7 +178,7 @@ static u8 ov81_021D16B0 (UnkStruct_ov81_021D1610 * param0, Window * param1, Wind return 1; } -static void ov81_021D17C8 (UnkStruct_ov81_021D1610 * param0, Window * param1) +static void ov81_021D17C8(UnkStruct_ov81_021D1610 *param0, Window *param1) { UnkStruct_0202BCC8 v0[4]; u32 v1; @@ -303,7 +302,7 @@ static void ov81_021D17C8 (UnkStruct_ov81_021D1610 * param0, Window * param1) } } -static void ov81_021D1A90 (UnkStruct_ov81_021D1610 * param0, Window * param1) +static void ov81_021D1A90(UnkStruct_ov81_021D1610 *param0, Window *param1) { UnkStruct_0202BE38 v0; @@ -323,10 +322,10 @@ static void ov81_021D1A90 (UnkStruct_ov81_021D1610 * param0, Window * param1) } } -static void ov81_021D1AD4 (UnkStruct_ov81_021D1610 * param0, Window * param1) +static void ov81_021D1AD4(UnkStruct_ov81_021D1610 *param0, Window *param1) { UnkStruct_0202BF4C v0; - Strbuf* v1; + Strbuf *v1; u32 v2; sub_0202C2A4(param0->unk_44, &v0, 3, param0->unk_105C); @@ -336,7 +335,7 @@ static void ov81_021D1AD4 (UnkStruct_ov81_021D1610 * param0, Window * param1) } { - Strbuf* v3; + Strbuf *v3; v3 = MessageBank_GetNewStrbufFromNARC(26, 433, MapHeader_GetMapLabelTextID(v0.unk_02), 42); v2 = Strbuf_Length(v3); @@ -372,7 +371,7 @@ static void ov81_021D1AD4 (UnkStruct_ov81_021D1610 * param0, Window * param1) Strbuf_Free(v1); } -static void ov81_021D1C10 (UnkStruct_ov81_021D1610 * param0, Window * param1) +static void ov81_021D1C10(UnkStruct_ov81_021D1610 *param0, Window *param1) { UnkStruct_0202BFCC v0[2]; u32 v1; @@ -462,73 +461,73 @@ static void ov81_021D1C10 (UnkStruct_ov81_021D1610 * param0, Window * param1) } } -static void ov81_021D1E04 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D1E04(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 9); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 9); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D1E40 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D1E40(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 10); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 10); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D1E7C (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D1E7C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 11); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 11); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D1EB8 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D1EB8(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 12); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 12); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D1EF4 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D1EF4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 13); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 13); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D1F30 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D1F30(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 14); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 14); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D1F6C (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D1F6C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 15); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 15); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D1FA8 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D1FA8(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 16); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 16); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D1FE4 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D1FE4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 17); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 17); StringTemplate_SetGymName(param0->unk_54, 0, param2->unk_02); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -536,9 +535,9 @@ static void ov81_021D1FE4 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2038 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2038(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 18); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 18); StringTemplate_SetGymName(param0->unk_54, 0, param2->unk_02); StringTemplate_SetTrainerName(param0->unk_54, 1, param2->unk_04); @@ -547,9 +546,9 @@ static void ov81_021D2038 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2098 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2098(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 19); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 19); StringTemplate_SetTrainerName(param0->unk_54, 0, param2->unk_04); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -557,9 +556,9 @@ static void ov81_021D2098 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D20EC (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D20EC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 20); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 20); StringTemplate_SetTrainerName(param0->unk_54, 0, param2->unk_04); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -567,9 +566,9 @@ static void ov81_021D20EC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2140 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2140(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 21); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 21); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -577,9 +576,9 @@ static void ov81_021D2140 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D219C (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D219C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0; + Strbuf *v0; u32 v1; v1 = param2->unk_02; @@ -596,9 +595,9 @@ static void ov81_021D219C (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2208 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2208(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0; + Strbuf *v0; u32 v1; v1 = param2->unk_02; @@ -615,25 +614,25 @@ static void ov81_021D2208 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2270 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2270(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 30); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 30); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D22AC (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D22AC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 31); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 31); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D22E8 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D22E8(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 34); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 34); StringTemplate_SetItemName(param0->unk_54, 0, param2->unk_06); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -641,9 +640,9 @@ static void ov81_021D22E8 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D233C (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D233C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 40); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 40); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -651,9 +650,9 @@ static void ov81_021D233C (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2398 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2398(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 35); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 35); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -661,9 +660,9 @@ static void ov81_021D2398 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D23F4 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D23F4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 36); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 36); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -671,9 +670,9 @@ static void ov81_021D23F4 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2450 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2450(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 43); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 43); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -681,9 +680,9 @@ static void ov81_021D2450 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D24AC (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D24AC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 38); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 38); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -691,9 +690,9 @@ static void ov81_021D24AC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2508 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2508(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 37); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 37); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -701,9 +700,9 @@ static void ov81_021D2508 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2564 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2564(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 42); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 42); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -711,9 +710,9 @@ static void ov81_021D2564 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D25C0 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D25C0(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 41); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 41); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -721,9 +720,9 @@ static void ov81_021D25C0 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D261C (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D261C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 39); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 39); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -731,9 +730,9 @@ static void ov81_021D261C (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2678 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2678(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 46); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 46); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -741,9 +740,9 @@ static void ov81_021D2678 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D26D4 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D26D4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 44); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 44); StringTemplate_SetLocationName(param0->unk_54, 0, MapHeader_GetMapLabelTextID(param2->unk_02)); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -751,50 +750,50 @@ static void ov81_021D26D4 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2730 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2730(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 45); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 45); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D276C (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D276C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 47); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 47); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D27A8 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D27A8(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 48); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 48); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D27E4 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D27E4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 32); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 32); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D2820 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3) +static void ov81_021D2820(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 33); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 33); sub_0201D78C(param1, 0, v0, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D285C (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BCC8 * param2, u8 param3, int param4) +static void ov81_021D285C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BCC8 *param2, u8 param3, int param4) { u32 v0; - Strbuf* v1; + Strbuf *v1; switch (param4) { case 36: @@ -820,18 +819,18 @@ static void ov81_021D285C (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v1); } -static void ov81_021D28C8 (UnkStruct_ov81_021D1610 * param0, u16 param1, u8 param2, u8 param3) +static void ov81_021D28C8(UnkStruct_ov81_021D1610 *param0, u16 param1, u8 param2, u8 param3) { - Pokemon * v0 = Pokemon_New(42); + Pokemon *v0 = Pokemon_New(42); sub_02074088(v0, param1, 1, 32, param2, 0, 0); StringTemplate_SetSpeciesName(param0->unk_54, param3, Pokemon_GetBoxPokemon(v0)); Heap_FreeToHeap(v0); } -static void ov81_021D2908 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BE38 * param2) +static void ov81_021D2908(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BE38 *param2) { - Strbuf* v0; + Strbuf *v0; switch (param2->unk_01_0) { case 0: @@ -858,9 +857,9 @@ static void ov81_021D2908 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D29B4 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BE38 * param2) +static void ov81_021D29B4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BE38 *param2) { - Strbuf* v0; + Strbuf *v0; switch (param2->unk_01_0) { case 0: @@ -887,18 +886,18 @@ static void ov81_021D29B4 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2A60 (UnkStruct_ov81_021D1610 * param0, u16 * param1, u8 param2, u8 param3) +static void ov81_021D2A60(UnkStruct_ov81_021D1610 *param0, u16 *param1, u8 param2, u8 param3) { - Strbuf* v0 = Strbuf_Init(32, 42); + Strbuf *v0 = Strbuf_Init(32, 42); Strbuf_CopyChars(v0, param1); StringTemplate_SetStrbuf(param0->unk_54, param3, v0, param2, 1, GAME_LANGUAGE); Strbuf_Free(v0); } -static void ov81_021D2A9C (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2A9C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0; + Strbuf *v0; switch (param2->unk_01_0) { case 0: @@ -919,9 +918,9 @@ static void ov81_021D2A9C (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2B20 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2B20(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0; + Strbuf *v0; switch (param2->unk_01_0) { case 0: @@ -942,9 +941,9 @@ static void ov81_021D2B20 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2BA4 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2BA4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0; + Strbuf *v0; switch (param2->unk_01_0) { case 0: @@ -966,9 +965,9 @@ static void ov81_021D2BA4 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2C38 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2C38(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0; + Strbuf *v0; switch (param2->unk_01_0) { case 0: @@ -989,9 +988,9 @@ static void ov81_021D2C38 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2CBC (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2CBC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0; + Strbuf *v0; switch (param2->unk_01_0) { case 0: @@ -1013,9 +1012,9 @@ static void ov81_021D2CBC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2D50 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2D50(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 77); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 77); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -1023,9 +1022,9 @@ static void ov81_021D2D50 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2DAC (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2DAC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 78); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 78); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); ov81_021D2A60(param0, param2->unk_22, param2->unk_01_6, 1); @@ -1034,17 +1033,17 @@ static void ov81_021D2DAC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2E18 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2E18(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 79); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 79); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D2E54 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2E54(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 80); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 80); ov81_021D2A60(param0, param2->unk_22, param2->unk_01_6, 0); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -1052,17 +1051,17 @@ static void ov81_021D2E54 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2EB0 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2EB0(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 81); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 81); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D2EEC (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2EEC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0; + Strbuf *v0; switch (param2->unk_01_0) { case 0: @@ -1083,17 +1082,17 @@ static void ov81_021D2EEC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D2F70 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2F70(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 85); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 85); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D2FAC (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D2FAC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 87); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 87); StringTemplate_SetNumber(param0->unk_54, 0, param2->unk_01_0, 1, 0, 1); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -1101,17 +1100,17 @@ static void ov81_021D2FAC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D300C (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D300C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 88); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 88); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D3048 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D3048(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 89); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 89); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); ov81_021D2A60(param0, param2->unk_22, param2->unk_01_6, 1); @@ -1120,25 +1119,25 @@ static void ov81_021D3048 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D30B4 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D30B4(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 94); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 94); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D30F0 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D30F0(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 86); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 86); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov81_021D312C (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3, int param4) +static void ov81_021D312C(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3, int param4) { - Strbuf* v0; + Strbuf *v0; u32 v1; switch (param4) { @@ -1162,9 +1161,9 @@ static void ov81_021D312C (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D3190 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D3190(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 95); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 95); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -1172,9 +1171,9 @@ static void ov81_021D3190 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D31EC (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D31EC(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 96); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 96); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -1182,9 +1181,9 @@ static void ov81_021D31EC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D3248 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D3248(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 97); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 97); StringTemplate_SetPlazaMinigameName(param0->unk_54, 0, param2->unk_01_0); StringTemplate_Format(param0->unk_54, param0->unk_58, v0); @@ -1192,9 +1191,9 @@ static void ov81_021D3248 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D32A0 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3, int param4) +static void ov81_021D32A0(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3, int param4) { - Strbuf* v0; + Strbuf *v0; u32 v1; switch (param4) { @@ -1218,9 +1217,9 @@ static void ov81_021D32A0 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf_Free(v0); } -static void ov81_021D3304 (UnkStruct_ov81_021D1610 * param0, Window * param1, UnkStruct_0202BFCC * param2, u8 param3) +static void ov81_021D3304(UnkStruct_ov81_021D1610 *param0, Window *param1, UnkStruct_0202BFCC *param2, u8 param3) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 102); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 102); sub_0201D78C(param1, 0, v0, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); diff --git a/src/overlay082/ov82_0223B140.c b/src/overlay082/ov82_0223B140.c index ea5f973f18..ef5754c876 100644 --- a/src/overlay082/ov82_0223B140.c +++ b/src/overlay082/ov82_0223B140.c @@ -1,22 +1,22 @@ +#include "overlay082/ov82_0223B140.h" + #include #include - +#include "overlay004/ov4_021D0D80.h" +#include "overlay082/ov82_0223B2E0.h" #include "overlay082/struct_ov82_0223B164.h" #include "overlay083/struct_ov83_0223C344.h" -#include "overlay_manager.h" -#include "heap.h" +#include "bag.h" #include "communication_information.h" #include "communication_system.h" +#include "heap.h" +#include "overlay_manager.h" #include "unk_020363E8.h" #include "unk_020366A0.h" -#include "bag.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay082/ov82_0223B140.h" -#include "overlay082/ov82_0223B2E0.h" -BOOL ov82_0223B140 (OverlayManager ** param0) +BOOL ov82_0223B140(OverlayManager **param0) { if (*param0) { if (OverlayManager_Exec(*param0)) { @@ -29,10 +29,10 @@ BOOL ov82_0223B140 (OverlayManager ** param0) return 0; } -int ov82_0223B164 (OverlayManager * param0, int * param1) +int ov82_0223B164(OverlayManager *param0, int *param1) { - UnkStruct_ov83_0223C344 * v0 = NULL; - UnkStruct_ov82_0223B164 * v1 = (UnkStruct_ov82_0223B164 *)OverlayManager_Args(param0); + UnkStruct_ov83_0223C344 *v0 = NULL; + UnkStruct_ov82_0223B164 *v1 = (UnkStruct_ov82_0223B164 *)OverlayManager_Args(param0); Heap_Create(3, 55, 0x20000); v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov83_0223C344), 55); @@ -56,11 +56,11 @@ int ov82_0223B164 (OverlayManager * param0, int * param1) return 1; } -int ov82_0223B1D4 (OverlayManager * param0, int * param1) +int ov82_0223B1D4(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov83_0223C344 * v1 = OverlayManager_Data(param0); - UnkStruct_ov82_0223B164 * v2 = (UnkStruct_ov82_0223B164 *)OverlayManager_Args(param0); + UnkStruct_ov83_0223C344 *v1 = OverlayManager_Data(param0); + UnkStruct_ov82_0223B164 *v2 = (UnkStruct_ov82_0223B164 *)OverlayManager_Args(param0); v0 = *param1; @@ -88,11 +88,11 @@ int ov82_0223B1D4 (OverlayManager * param0, int * param1) return 0; } -int ov82_0223B24C (OverlayManager * param0, int * param1) +int ov82_0223B24C(OverlayManager *param0, int *param1) { int v0 = 0; - UnkStruct_ov83_0223C344 * v1 = OverlayManager_Data(param0); - UnkStruct_ov82_0223B164 * v2 = (UnkStruct_ov82_0223B164 *)OverlayManager_Args(param0); + UnkStruct_ov83_0223C344 *v1 = OverlayManager_Data(param0); + UnkStruct_ov82_0223B164 *v2 = (UnkStruct_ov82_0223B164 *)OverlayManager_Args(param0); switch (*param1) { case 0: diff --git a/src/overlay082/ov82_0223B2E0.c b/src/overlay082/ov82_0223B2E0.c index 84ac57301d..68dd4ca1e9 100644 --- a/src/overlay082/ov82_0223B2E0.c +++ b/src/overlay082/ov82_0223B2E0.c @@ -1,36 +1,36 @@ +#include "overlay082/ov82_0223B2E0.h" + #include #include #include "struct_decls/struct_0207CB08_decl.h" -#include "overlay084/const_ov84_02241130.h" - +#include "overlay082/ov82_0223B140.h" #include "overlay083/struct_ov83_0223C344.h" +#include "overlay084/const_ov84_02241130.h" +#include "overlay084/ov84_0223B5A0.h" +#include "overlay085/ov85_02241440.h" -#include "overlay_manager.h" +#include "bag.h" #include "heap.h" -#include "unk_0207CB08.h" #include "item.h" -#include "bag.h" +#include "overlay_manager.h" +#include "unk_0207CB08.h" #include "unk_020972FC.h" -#include "overlay082/ov82_0223B140.h" -#include "overlay082/ov82_0223B2E0.h" -#include "overlay084/ov84_0223B5A0.h" -#include "overlay085/ov85_02241440.h" FS_EXTERN_OVERLAY(overlay83); FS_EXTERN_OVERLAY(overlay84); FS_EXTERN_OVERLAY(overlay85); -static int ov82_0223B380(UnkStruct_ov83_0223C344 * param0); -static int ov82_0223B3DC(UnkStruct_ov83_0223C344 * param0); -static int ov82_0223B470(UnkStruct_ov83_0223C344 * param0); -static int ov82_0223B510(UnkStruct_ov83_0223C344 * param0); -int ov83_0223B5B0(OverlayManager * param0, int * param1); -int ov83_0223B65C(OverlayManager * param0, int * param1); -int ov83_0223B710(OverlayManager * param0, int * param1); +static int ov82_0223B380(UnkStruct_ov83_0223C344 *param0); +static int ov82_0223B3DC(UnkStruct_ov83_0223C344 *param0); +static int ov82_0223B470(UnkStruct_ov83_0223C344 *param0); +static int ov82_0223B510(UnkStruct_ov83_0223C344 *param0); +int ov83_0223B5B0(OverlayManager *param0, int *param1); +int ov83_0223B65C(OverlayManager *param0, int *param1); +int ov83_0223B710(OverlayManager *param0, int *param1); -int ov82_0223B2E0 (UnkStruct_ov83_0223C344 * param0, int * param1) +int ov82_0223B2E0(UnkStruct_ov83_0223C344 *param0, int *param1) { switch (*param1) { case 0: @@ -54,7 +54,7 @@ int ov82_0223B2E0 (UnkStruct_ov83_0223C344 * param0, int * param1) return 0; } -int ov82_0223B330 (UnkStruct_ov83_0223C344 * param0, int * param1) +int ov82_0223B330(UnkStruct_ov83_0223C344 *param0, int *param1) { FS_EXTERN_OVERLAY(overlay83); @@ -69,7 +69,7 @@ int ov82_0223B330 (UnkStruct_ov83_0223C344 * param0, int * param1) return 2; } -int ov82_0223B35C (UnkStruct_ov83_0223C344 * param0, int * param1) +int ov82_0223B35C(UnkStruct_ov83_0223C344 *param0, int *param1) { if (ov82_0223B140(¶m0->unk_1C) == 0) { return 2; @@ -82,14 +82,14 @@ int ov82_0223B35C (UnkStruct_ov83_0223C344 * param0, int * param1) } } -int ov82_0223B37C (UnkStruct_ov83_0223C344 * param0, int * param1) +int ov82_0223B37C(UnkStruct_ov83_0223C344 *param0, int *param1) { return 4; } -static int ov82_0223B380 (UnkStruct_ov83_0223C344 * param0) +static int ov82_0223B380(UnkStruct_ov83_0223C344 *param0) { - void * v0; + void *v0; u32 v1; FS_EXTERN_OVERLAY(overlay84); @@ -117,9 +117,9 @@ static int ov82_0223B380 (UnkStruct_ov83_0223C344 * param0) return 1; } -static int ov82_0223B3DC (UnkStruct_ov83_0223C344 * param0) +static int ov82_0223B3DC(UnkStruct_ov83_0223C344 *param0) { - UnkStruct_0207CB08 * v0 = NULL; + UnkStruct_0207CB08 *v0 = NULL; BOOL v1; if (!ov82_0223B140(¶m0->unk_1C)) { @@ -157,11 +157,11 @@ static int ov82_0223B3DC (UnkStruct_ov83_0223C344 * param0) return 4; } -static int ov82_0223B470 (UnkStruct_ov83_0223C344 * param0) +static int ov82_0223B470(UnkStruct_ov83_0223C344 *param0) { u8 v0; u8 v1, v2, v3, v4; - Bag * v5 = param0->unk_10->unk_14; + Bag *v5 = param0->unk_10->unk_14; FS_EXTERN_OVERLAY(overlay85); @@ -190,7 +190,7 @@ static int ov82_0223B470 (UnkStruct_ov83_0223C344 * param0) return 3; } -static int ov82_0223B510 (UnkStruct_ov83_0223C344 * param0) +static int ov82_0223B510(UnkStruct_ov83_0223C344 *param0) { u8 v0, v1; diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c index 5b1f751c8c..6d190d2cb0 100644 --- a/src/overlay083/ov83_0223B5A0.c +++ b/src/overlay083/ov83_0223B5A0.c @@ -1,111 +1,111 @@ +#include "overlay083/ov83_0223B5A0.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_0202CD88_decl.h" - #include "struct_defs/struct_0202A93C.h" + +#include "overlay004/ov4_021D0D80.h" +#include "overlay083/ov83_0223C958.h" +#include "overlay083/ov83_0223D150.h" +#include "overlay083/ov83_0223D4CC.h" +#include "overlay083/ov83_0223D6A8.h" +#include "overlay083/ov83_0223F7F4.h" #include "overlay083/struct_ov83_0223B784.h" #include "overlay083/struct_ov83_0223C344.h" #include "overlay083/struct_ov83_0223FCE8.h" +#include "savedata/save_table.h" +#include "bag.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "journal.h" +#include "overlay_manager.h" +#include "poffin.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "savedata/save_table.h" -#include "game_options.h" -#include "poffin.h" #include "unk_0202ACE0.h" -#include "journal.h" #include "unk_0202CD50.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_0203909C.h" #include "unk_020393C8.h" #include "unk_0206CCB0.h" -#include "bag.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay083/ov83_0223B5A0.h" -#include "overlay083/ov83_0223C958.h" -#include "overlay083/ov83_0223D150.h" -#include "overlay083/ov83_0223D4CC.h" -#include "overlay083/ov83_0223D6A8.h" -#include "overlay083/ov83_0223F7F4.h" -typedef int (* UnkFuncPtr_ov83_0224024C)(UnkStruct_ov83_0223C344 *, UnkStruct_ov83_0223B784 *, int *); +typedef int (*UnkFuncPtr_ov83_0224024C)(UnkStruct_ov83_0223C344 *, UnkStruct_ov83_0223B784 *, int *); typedef struct { UnkFuncPtr_ov83_0224024C unk_00; int unk_04; } UnkStruct_ov83_0224024C; -int ov83_0223B5B0(OverlayManager * param0, int * param1); -int ov83_0223B65C(OverlayManager * param0, int * param1); -int ov83_0223B710(OverlayManager * param0, int * param1); -static int ov83_0223C344(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static int ov83_0223B78C(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static int ov83_0223B920(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static int ov83_0223B950(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static int ov83_0223B964(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static int ov83_0223B9EC(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static int ov83_0223BB40(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static int ov83_0223BCEC(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static int ov83_0223BF74(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static int ov83_0223C24C(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static int ov83_0223C258(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2); -static void ov83_0223C3E8(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223C480(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223C558(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223C600(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223C6D4(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223C758(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223C7FC(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223C90C(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223C82C(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1); -static void ov83_0223C87C(UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1); -static BOOL ov83_0223C8B0(UnkStruct_ov83_0223C344 * param0, Poffin * param1, int param2); +int ov83_0223B5B0(OverlayManager *param0, int *param1); +int ov83_0223B65C(OverlayManager *param0, int *param1); +int ov83_0223B710(OverlayManager *param0, int *param1); +static int ov83_0223C344(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static int ov83_0223B78C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static int ov83_0223B920(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static int ov83_0223B950(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static int ov83_0223B964(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static int ov83_0223B9EC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static int ov83_0223BB40(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static int ov83_0223C24C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static int ov83_0223C258(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2); +static void ov83_0223C3E8(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223C480(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223C558(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223C600(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223C6D4(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223C758(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223C7FC(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223C90C(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223C82C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1); +static void ov83_0223C87C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1); +static BOOL ov83_0223C8B0(UnkStruct_ov83_0223C344 *param0, Poffin *param1, int param2); static const UnkStruct_ov83_0224024C Unk_ov83_0224024C[] = { - {ov83_0223B78C, 0x1}, - {ov83_0223B920, 0x0}, - {ov83_0223B950, 0x0}, - {ov83_0223B964, 0x0}, - {ov83_0223B950, 0x0}, - {ov83_0223C24C, 0x2}, - {ov83_0223B9EC, 0x0}, - {ov83_0223BB40, 0x0}, - {ov83_0223BCEC, 0x0}, - {ov83_0223B950, 0x0}, - {ov83_0223BF74, 0x0}, - {ov83_0223B950, 0x0}, - {ov83_0223C258, 0x3}, - {ov83_0223C344, 0x0} + { ov83_0223B78C, 0x1 }, + { ov83_0223B920, 0x0 }, + { ov83_0223B950, 0x0 }, + { ov83_0223B964, 0x0 }, + { ov83_0223B950, 0x0 }, + { ov83_0223C24C, 0x2 }, + { ov83_0223B9EC, 0x0 }, + { ov83_0223BB40, 0x0 }, + { ov83_0223BCEC, 0x0 }, + { ov83_0223B950, 0x0 }, + { ov83_0223BF74, 0x0 }, + { ov83_0223B950, 0x0 }, + { ov83_0223C258, 0x3 }, + { ov83_0223C344, 0x0 } }; -static void ov83_0223B5A0 (void * param0) +static void ov83_0223B5A0(void *param0) { - UnkStruct_ov83_0223C344 * v0 = (UnkStruct_ov83_0223C344 *)param0; - UnkStruct_ov83_0223B784 * v1 = (v0->unk_18); + UnkStruct_ov83_0223C344 *v0 = (UnkStruct_ov83_0223C344 *)param0; + UnkStruct_ov83_0223B784 *v1 = (v0->unk_18); ov83_0223CBFC(v1); sub_0201DCAC(); } -int ov83_0223B5B0 (OverlayManager * param0, int * param1) +int ov83_0223B5B0(OverlayManager *param0, int *param1) { - UnkStruct_ov83_0223C344 * v0 = OverlayManager_Args(param0); - UnkStruct_ov83_0223B784 * v1; + UnkStruct_ov83_0223C344 *v0 = OverlayManager_Args(param0); + UnkStruct_ov83_0223B784 *v1; Heap_Create(3, 56, 0x20000); v1 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov83_0223B784), 56); @@ -139,12 +139,12 @@ int ov83_0223B5B0 (OverlayManager * param0, int * param1) return 1; } -int ov83_0223B65C (OverlayManager * param0, int * param1) +int ov83_0223B65C(OverlayManager *param0, int *param1) { int v0, v1; - UnkStruct_ov83_0223C344 * v2 = OverlayManager_Args(param0); - UnkStruct_ov83_0223B784 * v3 = (UnkStruct_ov83_0223B784 *)OverlayManager_Data(param0); - const UnkStruct_ov83_0224024C * v4; + UnkStruct_ov83_0223C344 *v2 = OverlayManager_Args(param0); + UnkStruct_ov83_0223B784 *v3 = (UnkStruct_ov83_0223B784 *)OverlayManager_Data(param0); + const UnkStruct_ov83_0224024C *v4; v0 = v3->unk_0C; v4 = &(Unk_ov83_0224024C[v0]); @@ -204,11 +204,11 @@ int ov83_0223B65C (OverlayManager * param0, int * param1) } } -int ov83_0223B710 (OverlayManager * param0, int * param1) +int ov83_0223B710(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov83_0223C344 * v1 = OverlayManager_Args(param0); - UnkStruct_ov83_0223B784 * v2 = (UnkStruct_ov83_0223B784 *)OverlayManager_Data(param0); + UnkStruct_ov83_0223C344 *v1 = OverlayManager_Args(param0); + UnkStruct_ov83_0223B784 *v2 = (UnkStruct_ov83_0223B784 *)OverlayManager_Data(param0); v0 = v2->unk_00; @@ -232,24 +232,24 @@ int ov83_0223B710 (OverlayManager * param0, int * param1) return 1; } -void ov83_0223B774 (UnkStruct_ov83_0223B784 * param0, int param1) +void ov83_0223B774(UnkStruct_ov83_0223B784 *param0, int param1) { param0->unk_18 = param1; param0->unk_14 = 1; } -void ov83_0223B77C (UnkStruct_ov83_0223B784 * param0, int param1) +void ov83_0223B77C(UnkStruct_ov83_0223B784 *param0, int param1) { param0->unk_1A = param1; param0->unk_19 = 1; } -void ov83_0223B784 (UnkStruct_ov83_0223B784 * param0) +void ov83_0223B784(UnkStruct_ov83_0223B784 *param0) { param0->unk_04 = 1; } -static int ov83_0223B78C (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223B78C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { switch (*param2) { case 0: @@ -300,7 +300,7 @@ static int ov83_0223B78C (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B return param1->unk_0C; } -static int ov83_0223B920 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223B920(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { BOOL v0; @@ -315,7 +315,7 @@ static int ov83_0223B920 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B return param1->unk_0C + 1; } -static int ov83_0223B950 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223B950(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { if (param1->unk_14) { param1->unk_0C = param1->unk_18; @@ -325,7 +325,7 @@ static int ov83_0223B950 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B return param1->unk_0C; } -static int ov83_0223B964 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223B964(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { BOOL v0; @@ -363,7 +363,7 @@ static int ov83_0223B964 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B return param1->unk_0C; } -static int ov83_0223B9EC (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223B9EC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { u32 v0; int v1; @@ -436,7 +436,7 @@ static int ov83_0223B9EC (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B return param1->unk_0C; } -static int ov83_0223BB40 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223BB40(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { BOOL v0; @@ -515,9 +515,9 @@ static int ov83_0223BB40 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B return param1->unk_0C; } -static int ov83_0223BCEC (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223BCEC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { - Poffin * v0; + Poffin *v0; BOOL v1; ov83_0223EDA4(¶m1->unk_6D8, ¶m1->unk_1494); @@ -558,9 +558,8 @@ static int ov83_0223BCEC (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B (*param2)++; } break; - case 3: - { - UnkStruct_0202CD88 * v2 = sub_0202CD88(param0->unk_10->unk_0C); + case 3: { + UnkStruct_0202CD88 *v2 = sub_0202CD88(param0->unk_10->unk_0C); if (param1->unk_1490 == 0) { sub_0202CFEC(v2, 12); @@ -572,11 +571,11 @@ static int ov83_0223BCEC (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B } if (param1->unk_1490 != 0) { - UnkStruct_0202B370 * v3 = sub_0202B370(param0->unk_10->unk_0C); + UnkStruct_0202B370 *v3 = sub_0202B370(param0->unk_10->unk_0C); int v4; int v5, v6; int v7; - DWCFriendData * v8; + DWCFriendData *v8; for (v4 = 0; v4 < param1->unk_1488; v4++) { v5 = param1->unk_1494.unk_130[v4]; @@ -632,7 +631,7 @@ static int ov83_0223BCEC (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B return param1->unk_0C; } -static int ov83_0223BF74 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223BF74(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { u32 v0; BOOL v1; @@ -681,7 +680,7 @@ static int ov83_0223BF74 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B case 4: param1->unk_1C--; - if ((param1->unk_1C < 0) || (gCoreSys.touchPressed) || (gCoreSys.pressedKeys & ((PAD_BUTTON_A | PAD_BUTTON_B)))) { + if ((param1->unk_1C < 0) || (gCoreSys.touchPressed) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { (*param2)++; break; } @@ -699,7 +698,7 @@ static int ov83_0223BF74 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B case 6: param1->unk_1C--; - if ((gCoreSys.touchPressed) || (param1->unk_1C < 0) || (gCoreSys.pressedKeys & ((PAD_BUTTON_A | PAD_BUTTON_B)))) { + if ((gCoreSys.touchPressed) || (param1->unk_1C < 0) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { (*param2)++; } break; @@ -749,7 +748,7 @@ static int ov83_0223BF74 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B case 10: param1->unk_1C--; - if ((gCoreSys.touchPressed) || (param1->unk_1C < 0) || (gCoreSys.pressedKeys & ((PAD_BUTTON_A | PAD_BUTTON_B)))) { + if ((gCoreSys.touchPressed) || (param1->unk_1C < 0) || (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { if (param1->unk_1488 > 1) { ov83_0223EC8C(¶m1->unk_6A0, 6); ov83_0223E9BC(¶m1->unk_6A0); @@ -773,12 +772,12 @@ static int ov83_0223BF74 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B return param1->unk_0C; } -static int ov83_0223C24C (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223C24C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { return ov83_0223CB5C(param1, param2); } -static int ov83_0223C258 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223C258(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { switch (*param2) { case 0: @@ -796,7 +795,7 @@ static int ov83_0223C258 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B } { - void * v0; + void *v0; if (param1->unk_1490 == 1) { v0 = sub_0202C1E0(param1->unk_00); @@ -811,7 +810,7 @@ static int ov83_0223C258 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B case 1: param1->unk_1C--; - if ((param1->unk_1C < 0)) { + if (param1->unk_1C < 0) { (*param2)++; } break; @@ -834,7 +833,7 @@ static int ov83_0223C258 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B return param1->unk_0C; } -static int ov83_0223C344 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1, int * param2) +static int ov83_0223C344(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1, int *param2) { ov83_0223DB30(¶m1->unk_3C0); ov83_0223DEC4(¶m1->unk_5B0); @@ -854,9 +853,9 @@ static int ov83_0223C344 (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B return param1->unk_0C; } -static void ov83_0223C3E8 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223C3E8(UnkStruct_ov83_0223B784 *param0) { - UnkStruct_ov83_0223FCE8 * v0 = ¶m0->unk_1494.unk_90[0].unk_08; + UnkStruct_ov83_0223FCE8 *v0 = ¶m0->unk_1494.unk_90[0].unk_08; fx32 v1; if (v0->unk_0C == 0) { @@ -888,13 +887,13 @@ static void ov83_0223C3E8 (UnkStruct_ov83_0223B784 * param0) } } -static void ov83_0223C480 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223C480(UnkStruct_ov83_0223B784 *param0) { - UnkStruct_ov83_0223FCE8 * v0 = ¶m0->unk_1494.unk_90[0].unk_08; + UnkStruct_ov83_0223FCE8 *v0 = ¶m0->unk_1494.unk_90[0].unk_08; static const u8 v1[3][7] = { - {1, 1, 0, 1, 0, 0, 5}, - {0, 1, 1, 0, 1, 0, 6}, - {0, 0, 1, 0, 0, 1, 8}, + { 1, 1, 0, 1, 0, 0, 5 }, + { 0, 1, 1, 0, 1, 0, 6 }, + { 0, 0, 1, 0, 0, 1, 8 }, }; ov83_0223E484(¶m0->unk_608, 5, v1[v0->unk_0D][0]); @@ -913,9 +912,9 @@ static void ov83_0223C480 (UnkStruct_ov83_0223B784 * param0) } } -static void ov83_0223C558 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223C558(UnkStruct_ov83_0223B784 *param0) { - UnkStruct_ov83_0223FCE8 * v0 = ¶m0->unk_1494.unk_90[0].unk_08; + UnkStruct_ov83_0223FCE8 *v0 = ¶m0->unk_1494.unk_90[0].unk_08; if ((v0->unk_11 == v0->unk_0C) || (v0->unk_0A == 0) || (param0->unk_324 != 0)) { ov83_0223F3D0(¶m0->unk_AEC, 1); @@ -940,9 +939,9 @@ static void ov83_0223C558 (UnkStruct_ov83_0223B784 * param0) } } -static void ov83_0223C600 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223C600(UnkStruct_ov83_0223B784 *param0) { - UnkStruct_ov83_0223FCE8 * v0 = ¶m0->unk_1494.unk_90[0].unk_08; + UnkStruct_ov83_0223FCE8 *v0 = ¶m0->unk_1494.unk_90[0].unk_08; static const u8 v1[3] = { 1, 3, 0 }; @@ -983,9 +982,9 @@ static void ov83_0223C600 (UnkStruct_ov83_0223B784 * param0) } } -static void ov83_0223C6D4 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223C6D4(UnkStruct_ov83_0223B784 *param0) { - UnkStruct_ov83_0223FCE8 * v0 = ¶m0->unk_1494.unk_90[0].unk_08; + UnkStruct_ov83_0223FCE8 *v0 = ¶m0->unk_1494.unk_90[0].unk_08; static const u32 v1[3] = { 1714, 1720, 1720 }; @@ -1010,9 +1009,9 @@ static void ov83_0223C6D4 (UnkStruct_ov83_0223B784 * param0) } } -static void ov83_0223C758 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223C758(UnkStruct_ov83_0223B784 *param0) { - UnkStruct_ov83_0223FCE8 * v0 = ¶m0->unk_1494.unk_90[0].unk_08; + UnkStruct_ov83_0223FCE8 *v0 = ¶m0->unk_1494.unk_90[0].unk_08; BOOL v1; if (v0->unk_0E) { @@ -1044,9 +1043,9 @@ static void ov83_0223C758 (UnkStruct_ov83_0223B784 * param0) } } -static void ov83_0223C7FC (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223C7FC(UnkStruct_ov83_0223B784 *param0) { - UnkStruct_ov83_0223FCE8 * v0 = ¶m0->unk_1494.unk_90[0].unk_08; + UnkStruct_ov83_0223FCE8 *v0 = ¶m0->unk_1494.unk_90[0].unk_08; int v1 = param0->unk_1494.unk_04.unk_00.unk_00; int v2 = param0->unk_1494.unk_04.unk_00.unk_01; @@ -1056,7 +1055,7 @@ static void ov83_0223C7FC (UnkStruct_ov83_0223B784 * param0) } } -static void ov83_0223C82C (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1) +static void ov83_0223C82C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1) { int v0; @@ -1073,7 +1072,7 @@ static void ov83_0223C82C (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223 } } -static void ov83_0223C87C (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B784 * param1) +static void ov83_0223C87C(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B784 *param1) { GF_ASSERT(param1->unk_1494.unk_100); @@ -1085,13 +1084,13 @@ static void ov83_0223C87C (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223 } } -static BOOL ov83_0223C8B0 (UnkStruct_ov83_0223C344 * param0, Poffin * param1, int param2) +static BOOL ov83_0223C8B0(UnkStruct_ov83_0223C344 *param0, Poffin *param1, int param2) { int v0; u16 v1; int v2; BOOL v3 = 1; - TVBroadcast * v4 = SaveData_TVBroadcast(param0->unk_10->unk_0C); + TVBroadcast *v4 = SaveData_TVBroadcast(param0->unk_10->unk_0C); for (v0 = 0; v0 < param2; v0++) { v1 = sub_0202AB74(param0->unk_10->unk_08, param1); @@ -1110,11 +1109,13 @@ static BOOL ov83_0223C8B0 (UnkStruct_ov83_0223C344 * param0, Poffin * param1, in return v3; } -static void ov83_0223C90C (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223C90C(UnkStruct_ov83_0223B784 *param0) { - UnkStruct_ov83_0223FCE8 * v0 = ¶m0->unk_1494.unk_90[0].unk_08; + UnkStruct_ov83_0223FCE8 *v0 = ¶m0->unk_1494.unk_90[0].unk_08; static const u32 v1[3] = { - 1713, 1718, 1722, + 1713, + 1718, + 1722, }; if (((v0->unk_0C == 0) && (param0->unk_3B8 > v0->unk_08)) || ((v0->unk_0C == 1) && (param0->unk_3B8 < v0->unk_08))) { diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index d0a7e0da0b..a4c7125d05 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -1,52 +1,52 @@ +#include "overlay083/ov83_0223C958.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_02099F80.h" + #include "overlay022/struct_ov22_022550D4.h" #include "overlay022/struct_ov22_022559F8.h" +#include "overlay083/ov83_0223D6A8.h" #include "overlay083/struct_ov83_0223B784.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "narc.h" -#include "unk_0200A784.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" #include "message.h" +#include "narc.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_0200A784.h" #include "unk_02015064.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" -#include "overlay083/ov83_0223C958.h" -#include "overlay083/ov83_0223D6A8.h" -static void ov83_0223CC30(BGL ** param0, int param1); -static void ov83_0223CCCC(BGL ** param0); -static void ov83_0223CCF8(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223CD1C(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223CD28(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223CD54(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223CD64(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223CDC0(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223CDD0(UnkStruct_ov83_0223B784 * param0, NARC * param1); -static void ov83_0223CE7C(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223CE9C(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223CF20(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223CF2C(UnkStruct_ov83_0223B784 * param0); -static void ov83_0223D068(UnkStruct_ov83_0223B784 * param0); - -void ov83_0223C958 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CC30(BGL **param0, int param1); +static void ov83_0223CCCC(BGL **param0); +static void ov83_0223CCF8(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223CD1C(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223CD28(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223CD54(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223CD64(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223CDC0(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223CDD0(UnkStruct_ov83_0223B784 *param0, NARC *param1); +static void ov83_0223CE7C(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223CE9C(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223CF20(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223CF2C(UnkStruct_ov83_0223B784 *param0); +static void ov83_0223D068(UnkStruct_ov83_0223B784 *param0); + +void ov83_0223C958(UnkStruct_ov83_0223B784 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__NUTMIXER, param0->unk_00); @@ -77,7 +77,7 @@ void ov83_0223C958 (UnkStruct_ov83_0223B784 * param0) GXLayers_SwapDisplay(); } -void ov83_0223CAA4 (UnkStruct_ov83_0223B784 * param0) +void ov83_0223CAA4(UnkStruct_ov83_0223B784 *param0) { ov83_0223E760(¶m0->unk_6A0); ov83_0223DF10(¶m0->unk_5B0); @@ -102,19 +102,19 @@ void ov83_0223CAA4 (UnkStruct_ov83_0223B784 * param0) GXLayers_SwapDisplay(); } -int ov83_0223CB5C (UnkStruct_ov83_0223B784 * param0, int * param1) +int ov83_0223CB5C(UnkStruct_ov83_0223B784 *param0, int *param1) { ov83_0223DB4C(¶m0->unk_3C0, ¶m0->unk_1494.unk_6C, ¶m0->unk_2C, param0->unk_1CC, param0->unk_00); return param0->unk_0C + 1; } -int ov83_0223CB8C (UnkStruct_ov83_0223B784 * param0, int * param1) +int ov83_0223CB8C(UnkStruct_ov83_0223B784 *param0, int *param1) { ov83_0223DC1C(¶m0->unk_3C0, ¶m0->unk_2C); return param0->unk_0C + 1; } -void ov83_0223CBA4 (UnkStruct_ov83_0223B784 * param0) +void ov83_0223CBA4(UnkStruct_ov83_0223B784 *param0) { sub_020241B4(); @@ -139,7 +139,7 @@ void ov83_0223CBA4 (UnkStruct_ov83_0223B784 * param0) } } -void ov83_0223CBFC (UnkStruct_ov83_0223B784 * param0) +void ov83_0223CBFC(UnkStruct_ov83_0223B784 *param0) { sub_0200A858(); @@ -148,7 +148,7 @@ void ov83_0223CBFC (UnkStruct_ov83_0223B784 * param0) } } -static void ov83_0223CC10 (void) +static void ov83_0223CC10(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_64_E, @@ -166,7 +166,7 @@ static void ov83_0223CC10 (void) GXLayers_SetBanks(&v0); } -static void ov83_0223CC30 (BGL ** param0, int param1) +static void ov83_0223CC30(BGL **param0, int param1) { int v0 = 0, v1; @@ -203,7 +203,7 @@ static void ov83_0223CC30 (BGL ** param0, int param1) 1, 0, 0, - 0 + 0, }, { 0, @@ -218,7 +218,7 @@ static void ov83_0223CC30 (BGL ** param0, int param1) 0, 0, 0, - 0 + 0, }, { 0, @@ -233,7 +233,7 @@ static void ov83_0223CC30 (BGL ** param0, int param1) 0, 0, 0, - 0 + 0, }, { 0, @@ -248,12 +248,12 @@ static void ov83_0223CC30 (BGL ** param0, int param1) 1, 0, 0, - 0 + 0, }, }; for (v0 = 0; v0 < 4; v0++) { - const u8 v4[4] = {1, 2, 4, 5}; + const u8 v4[4] = { 1, 2, 4, 5 }; sub_020183C4(*param0, v4[v0], &(v3[v0]), 0); sub_02019EBC(*param0, v4[v0]); @@ -262,7 +262,7 @@ static void ov83_0223CC30 (BGL ** param0, int param1) } } -static void ov83_0223CCCC (BGL ** param0) +static void ov83_0223CCCC(BGL **param0) { sub_02019044(*param0, 5); sub_02019044(*param0, 4); @@ -271,19 +271,19 @@ static void ov83_0223CCCC (BGL ** param0) Heap_FreeToHeap(*param0); } -static void ov83_0223CCF8 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CCF8(UnkStruct_ov83_0223B784 *param0) { ov83_0223D754(¶m0->unk_2C, 72, 16, param0->unk_00); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov83_0223CD1C (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CD1C(UnkStruct_ov83_0223B784 *param0) { ov83_0223D784(¶m0->unk_2C); } -static void ov83_0223CD28 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CD28(UnkStruct_ov83_0223B784 *param0) { UnkStruct_ov22_022550D4 v0 = { 48, 32, 32, 0 @@ -293,19 +293,21 @@ static void ov83_0223CD28 (UnkStruct_ov83_0223B784 * param0) param0->unk_320 = sub_02015064(&v0); } -static void ov83_0223CD54 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CD54(UnkStruct_ov83_0223B784 *param0) { sub_020150A8(param0->unk_320); } -static void ov83_0223CD64 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CD64(UnkStruct_ov83_0223B784 *param0) { NNS_G2dInitOamManagerModule(); sub_0200A784(0, 128, 0, 32, 0, 128, 0, 32, param0->unk_00); { UnkStruct_ov22_022559F8 v0 = { - 32, 0x20000, 0x0, + 32, + 0x20000, + 0x0, }; v0.unk_0C = param0->unk_00; @@ -318,18 +320,23 @@ static void ov83_0223CD64 (UnkStruct_ov83_0223B784 * param0) sub_0201F8E4(); } -static void ov83_0223CDC0 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CDC0(UnkStruct_ov83_0223B784 *param0) { sub_0200A878(); sub_0201E958(); sub_0201F8B4(); } -static void ov83_0223CDD0 (UnkStruct_ov83_0223B784 * param0, NARC * param1) +static void ov83_0223CDD0(UnkStruct_ov83_0223B784 *param0, NARC *param1) { int v0; static const u8 v1[6] = { - 8, 8, 9, 10, 11, 8, + 8, + 8, + 9, + 10, + 11, + 8, }; for (v0 = 0; v0 < 6; v0++) { @@ -341,7 +348,7 @@ static void ov83_0223CDD0 (UnkStruct_ov83_0223B784 * param0, NARC * param1) } } -static void ov83_0223CE7C (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CE7C(UnkStruct_ov83_0223B784 *param0) { int v0; @@ -350,7 +357,7 @@ static void ov83_0223CE7C (UnkStruct_ov83_0223B784 * param0) } } -static void ov83_0223CE9C (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CE9C(UnkStruct_ov83_0223B784 *param0) { NNS_G3dInit(); @@ -368,13 +375,13 @@ static void ov83_0223CE9C (UnkStruct_ov83_0223B784 * param0) NNS_GfdInitFrmPlttVramManager(0x8000, 1); } -static void ov83_0223CF20 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CF20(UnkStruct_ov83_0223B784 *param0) { NNS_GfdResetFrmTexVramState(); NNS_GfdResetFrmPlttVramState(); } -static void ov83_0223CF2C (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223CF2C(UnkStruct_ov83_0223B784 *param0) { int v0; @@ -402,7 +409,7 @@ static void ov83_0223CF2C (UnkStruct_ov83_0223B784 * param0) } } -static void ov83_0223D068 (UnkStruct_ov83_0223B784 * param0) +static void ov83_0223D068(UnkStruct_ov83_0223B784 *param0) { int v0; diff --git a/src/overlay083/ov83_0223D144.c b/src/overlay083/ov83_0223D144.c index e02092dc63..2e8104ada0 100644 --- a/src/overlay083/ov83_0223D144.c +++ b/src/overlay083/ov83_0223D144.c @@ -1,32 +1,34 @@ +#include "overlay083/ov83_0223D144.h" + #include #include #include "struct_defs/struct_02039A58.h" -#include "poffin.h" -#include "overlay083/ov83_0223D144.h" #include "overlay083/ov83_0223D150.h" +#include "poffin.h" + static const CommCmdTable Unk_ov83_02240390[] = { - {ov83_0223D204, ov83_0223D4AC, NULL}, - {ov83_0223D210, ov83_0223D4AC, NULL}, - {ov83_0223D21C, ov83_0223D4B4, NULL}, - {ov83_0223D258, ov83_0223D4B8, NULL}, - {ov83_0223D2E8, ov83_0223D4BC, NULL}, - {ov83_0223D3D8, ov83_0223D4C0, NULL}, - {ov83_0223D3F8, Poffin_sizeof, NULL}, - {ov83_0223D410, ov83_0223D4B0, NULL}, - {ov83_0223D430, ov83_0223D4B0, NULL}, - {ov83_0223D354, ov83_0223D4C4, NULL}, - {ov83_0223D3A8, ov83_0223D4C8, NULL} + { ov83_0223D204, ov83_0223D4AC, NULL }, + { ov83_0223D210, ov83_0223D4AC, NULL }, + { ov83_0223D21C, ov83_0223D4B4, NULL }, + { ov83_0223D258, ov83_0223D4B8, NULL }, + { ov83_0223D2E8, ov83_0223D4BC, NULL }, + { ov83_0223D3D8, ov83_0223D4C0, NULL }, + { ov83_0223D3F8, Poffin_sizeof, NULL }, + { ov83_0223D410, ov83_0223D4B0, NULL }, + { ov83_0223D430, ov83_0223D4B0, NULL }, + { ov83_0223D354, ov83_0223D4C4, NULL }, + { ov83_0223D3A8, ov83_0223D4C8, NULL } }; -const CommCmdTable * ov83_0223D144 (void) +const CommCmdTable *ov83_0223D144(void) { return Unk_ov83_02240390; } -int ov83_0223D14C (void) +int ov83_0223D14C(void) { return sizeof(Unk_ov83_02240390) / sizeof(CommCmdTable); } diff --git a/src/overlay083/ov83_0223D150.c b/src/overlay083/ov83_0223D150.c index b621b0c41d..7c00c21eab 100644 --- a/src/overlay083/ov83_0223D150.c +++ b/src/overlay083/ov83_0223D150.c @@ -1,8 +1,12 @@ +#include "overlay083/ov83_0223D150.h" + #include #include -#include "trainer_info.h" - +#include "overlay083/ov83_0223B5A0.h" +#include "overlay083/ov83_0223D144.h" +#include "overlay083/ov83_0223D4CC.h" +#include "overlay083/ov83_0223F7F4.h" #include "overlay083/struct_ov83_0223B784.h" #include "overlay083/struct_ov83_0223D2E8.h" #include "overlay083/struct_ov83_0223DB4C.h" @@ -13,13 +17,9 @@ #include "communication_information.h" #include "communication_system.h" -#include "overlay083/ov83_0223B5A0.h" -#include "overlay083/ov83_0223D144.h" -#include "overlay083/ov83_0223D150.h" -#include "overlay083/ov83_0223D4CC.h" -#include "overlay083/ov83_0223F7F4.h" +#include "trainer_info.h" -void ov83_0223D150 (UnkStruct_ov83_0223B784 * param0, TrainerInfo * param1) +void ov83_0223D150(UnkStruct_ov83_0223B784 *param0, TrainerInfo *param1) { int v0; int v1; @@ -50,36 +50,36 @@ void ov83_0223D150 (UnkStruct_ov83_0223B784 * param0, TrainerInfo * param1) } } -void ov83_0223D1EC (UnkStruct_ov83_0223B784 * param0) +void ov83_0223D1EC(UnkStruct_ov83_0223B784 *param0) { ov83_0223D558(param0->unk_148C); param0->unk_148C = NULL; } -void ov83_0223D204 (int param0, int param1, void * param2, void * param3) +void ov83_0223D204(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; + UnkStruct_ov83_0223B784 *v0 = param3; ov83_0223B774(v0, 3); } -void ov83_0223D210 (int param0, int param1, void * param2, void * param3) +void ov83_0223D210(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; + UnkStruct_ov83_0223B784 *v0 = param3; ov83_0223B77C(v0, 8); } -void ov83_0223D21C (int param0, int param1, void * param2, void * param3) +void ov83_0223D21C(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; + UnkStruct_ov83_0223B784 *v0 = param3; memcpy(&v0->unk_1494.unk_6C, param2, param1); v0->unk_1494.unk_90[0].unk_08 = v0->unk_1494.unk_6C.unk_10; ov83_0223B774(v0, 5); } -void ov83_0223D258 (int param0, int param1, void * param2, void * param3) +void ov83_0223D258(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; + UnkStruct_ov83_0223B784 *v0 = param3; int v1; int v2; @@ -102,11 +102,11 @@ void ov83_0223D258 (int param0, int param1, void * param2, void * param3) } } -void ov83_0223D2E8 (int param0, int param1, void * param2, void * param3) +void ov83_0223D2E8(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; - UnkStruct_ov83_0223D2E8 * v1; - UnkStruct_ov83_0223FCE8 * v2; + UnkStruct_ov83_0223B784 *v0 = param3; + UnkStruct_ov83_0223D2E8 *v1; + UnkStruct_ov83_0223FCE8 *v2; BOOL v3; u8 v4; @@ -130,10 +130,10 @@ void ov83_0223D2E8 (int param0, int param1, void * param2, void * param3) v0->unk_1666++; } -void ov83_0223D354 (int param0, int param1, void * param2, void * param3) +void ov83_0223D354(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; - UnkStruct_ov83_0223FCE8 * v1; + UnkStruct_ov83_0223B784 *v0 = param3; + UnkStruct_ov83_0223FCE8 *v1; BOOL v2; u8 v3; @@ -154,39 +154,39 @@ void ov83_0223D354 (int param0, int param1, void * param2, void * param3) } } -void ov83_0223D3A8 (int param0, int param1, void * param2, void * param3) +void ov83_0223D3A8(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; + UnkStruct_ov83_0223B784 *v0 = param3; memcpy(&v0->unk_1494.unk_90[param0].unk_00, param2, param1); v0->unk_165C[param0]++; } -void ov83_0223D3D8 (int param0, int param1, void * param2, void * param3) +void ov83_0223D3D8(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; + UnkStruct_ov83_0223B784 *v0 = param3; memcpy(&v0->unk_1494.unk_58, param2, param1); ov83_0223B774(v0, 10); } -void ov83_0223D3F8 (int param0, int param1, void * param2, void * param3) +void ov83_0223D3F8(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; + UnkStruct_ov83_0223B784 *v0 = param3; memcpy(v0->unk_1494.unk_100, param2, param1); } -void ov83_0223D410 (int param0, int param1, void * param2, void * param3) +void ov83_0223D410(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; + UnkStruct_ov83_0223B784 *v0 = param3; memcpy(&v0->unk_1494.unk_145, param2, param1); ov83_0223B774(v0, 12); } -void ov83_0223D430 (int param0, int param1, void * param2, void * param3) +void ov83_0223D430(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov83_0223B784 * v0 = param3; + UnkStruct_ov83_0223B784 *v0 = param3; int v1; int v2; u8 v3; @@ -211,42 +211,42 @@ void ov83_0223D430 (int param0, int param1, void * param2, void * param3) } } -int ov83_0223D4AC (void) +int ov83_0223D4AC(void) { return 0; } -int ov83_0223D4B0 (void) +int ov83_0223D4B0(void) { return 1; } -int ov83_0223D4B4 (void) +int ov83_0223D4B4(void) { return sizeof(UnkStruct_ov83_0223DB4C); } -int ov83_0223D4B8 (void) +int ov83_0223D4B8(void) { return sizeof(UnkStruct_ov83_0223DB4C_sub1); } -int ov83_0223D4BC (void) +int ov83_0223D4BC(void) { return sizeof(UnkStruct_ov83_0223D2E8); } -int ov83_0223D4C0 (void) +int ov83_0223D4C0(void) { return sizeof(UnkStruct_ov83_022401AC); } -int ov83_0223D4C4 (void) +int ov83_0223D4C4(void) { return sizeof(UnkStruct_ov83_0223FCE8); } -int ov83_0223D4C8 (void) +int ov83_0223D4C8(void) { return sizeof(UnkStruct_ov83_0223F88C); } diff --git a/src/overlay083/ov83_0223D4CC.c b/src/overlay083/ov83_0223D4CC.c index f17cc9827e..564cbc8169 100644 --- a/src/overlay083/ov83_0223D4CC.c +++ b/src/overlay083/ov83_0223D4CC.c @@ -1,17 +1,18 @@ +#include "overlay083/ov83_0223D4CC.h" + #include #include -#include "sys_task_manager.h" - #include "struct_defs/struct_02039A58.h" -#include "sys_task.h" +#include "overlay004/ov4_021D0D80.h" + +#include "communication_system.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02032798.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay083/ov83_0223D4CC.h" typedef struct { BOOL unk_00; @@ -22,25 +23,25 @@ typedef struct { typedef struct { UnkStruct_ov83_0223D5CC unk_00[8]; - const CommCmdTable * unk_190; + const CommCmdTable *unk_190; int unk_194; - void * unk_198; - SysTask * unk_19C; + void *unk_198; + SysTask *unk_19C; } UnkStruct_ov83_0223D584; typedef struct UnkStruct_ov83_0223D4CC_t { int unk_00; - void * unk_04; + void *unk_04; } UnkStruct_ov83_0223D4CC; -static UnkStruct_ov83_0223D584 * ov83_0223D584(const CommCmdTable * param0, int param1, void * param2, int param3); -static void ov83_0223D5CC(SysTask * param0, void * param1); -static void ov83_0223D620(UnkStruct_ov83_0223D584 * param0); -static BOOL ov83_0223D638(UnkStruct_ov83_0223D584 * param0, int param1, const void * param2, int param3); +static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, int param3); +static void ov83_0223D5CC(SysTask *param0, void *param1); +static void ov83_0223D620(UnkStruct_ov83_0223D584 *param0); +static BOOL ov83_0223D638(UnkStruct_ov83_0223D584 *param0, int param1, const void *param2, int param3); -UnkStruct_ov83_0223D4CC * ov83_0223D4CC (const CommCmdTable * param0, int param1, void * param2, int param3, int param4) +UnkStruct_ov83_0223D4CC *ov83_0223D4CC(const CommCmdTable *param0, int param1, void *param2, int param3, int param4) { - UnkStruct_ov83_0223D4CC * v0; + UnkStruct_ov83_0223D4CC *v0; v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov83_0223D4CC)); v0->unk_00 = param3; @@ -55,7 +56,7 @@ UnkStruct_ov83_0223D4CC * ov83_0223D4CC (const CommCmdTable * param0, int param1 return v0; } -BOOL ov83_0223D508 (int param0, const void * param1, int param2, UnkStruct_ov83_0223D4CC * param3) +BOOL ov83_0223D508(int param0, const void *param1, int param2, UnkStruct_ov83_0223D4CC *param3) { if (param3->unk_00 == 1) { if (sub_0203895C() == 29) { @@ -80,7 +81,7 @@ BOOL ov83_0223D508 (int param0, const void * param1, int param2, UnkStruct_ov83_ } } -void ov83_0223D558 (UnkStruct_ov83_0223D4CC * param0) +void ov83_0223D558(UnkStruct_ov83_0223D4CC *param0) { if (param0->unk_00 == 0) { ov83_0223D620(param0->unk_04); @@ -89,18 +90,18 @@ void ov83_0223D558 (UnkStruct_ov83_0223D4CC * param0) Heap_FreeToHeap(param0); } -int ov83_0223D570 (UnkStruct_ov83_0223D4CC * param0) +int ov83_0223D570(UnkStruct_ov83_0223D4CC *param0) { if (param0->unk_00 == 1) { return CommSys_CurNetId(); } else { - return(0); + return 0; } } -static UnkStruct_ov83_0223D584 * ov83_0223D584 (const CommCmdTable * param0, int param1, void * param2, int param3) +static UnkStruct_ov83_0223D584 *ov83_0223D584(const CommCmdTable *param0, int param1, void *param2, int param3) { - UnkStruct_ov83_0223D584 * v0; + UnkStruct_ov83_0223D584 *v0; v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov83_0223D584)); memset(v0, 0, sizeof(UnkStruct_ov83_0223D584)); @@ -113,9 +114,9 @@ static UnkStruct_ov83_0223D584 * ov83_0223D584 (const CommCmdTable * param0, int return v0; } -static void ov83_0223D5CC (SysTask * param0, void * param1) +static void ov83_0223D5CC(SysTask *param0, void *param1) { - UnkStruct_ov83_0223D584 * v0 = param1; + UnkStruct_ov83_0223D584 *v0 = param1; int v1; for (v1 = 0; v1 < 8; v1++) { @@ -128,17 +129,17 @@ static void ov83_0223D5CC (SysTask * param0, void * param1) } } -static void ov83_0223D620 (UnkStruct_ov83_0223D584 * param0) +static void ov83_0223D620(UnkStruct_ov83_0223D584 *param0) { SysTask_Done(param0->unk_19C); Heap_FreeToHeap(param0); } -static BOOL ov83_0223D638 (UnkStruct_ov83_0223D584 * param0, int param1, const void * param2, int param3) +static BOOL ov83_0223D638(UnkStruct_ov83_0223D584 *param0, int param1, const void *param2, int param3) { int v0; int v1; - UnkStruct_ov83_0223D5CC * v2; + UnkStruct_ov83_0223D5CC *v2; v2 = NULL; diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c index a9c6644cdb..abeac57438 100644 --- a/src/overlay083/ov83_0223D6A8.c +++ b/src/overlay083/ov83_0223D6A8.c @@ -1,3 +1,5 @@ +#include "overlay083/ov83_0223D6A8.h" + #include #include @@ -8,16 +10,15 @@ #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02015214_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "overlay083/struct_ov83_0223D4CC_decl.h" - #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay021/struct_ov21_021E7F40.h" #include "overlay022/struct_ov22_022557A0.h" #include "overlay022/struct_ov22_02255800.h" +#include "overlay083/ov83_0223D4CC.h" +#include "overlay083/struct_ov83_0223D4CC_decl.h" #include "overlay083/struct_ov83_0223D784.h" #include "overlay083/struct_ov83_0223D95C.h" #include "overlay083/struct_ov83_0223D9A8.h" @@ -42,28 +43,28 @@ #include "overlay083/struct_ov83_0223FCE8.h" #include "overlay083/struct_ov83_0223FE50.h" +#include "gx_layers.h" +#include "heap.h" +#include "narc.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_02015064.h" #include "unk_02015920.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201E3BC.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_02098FFC.h" -#include "overlay083/ov83_0223D4CC.h" -#include "overlay083/ov83_0223D6A8.h" typedef struct { fx32 unk_00; @@ -94,31 +95,31 @@ typedef struct { u8 unk_1A; } UnkStruct_ov83_022404B0; -static void ov83_0223E09C(UnkStruct_ov83_0223E138 * param0, u32 param1); -static void ov83_0223E138(UnkStruct_ov83_0223E138 * param0); -static void ov83_0223E15C(UnkStruct_ov83_0223E138 * param0, u32 param1, NARC * param2); -static void ov83_0223E208(UnkStruct_ov83_0223E138 * param0); -static void ov83_0223E21C(Window * param0, Strbuf *param1, int param2, int param3); -static void ov83_0223E77C(UnkStruct_ov83_0223E824 * param0, u32 param1); -static void ov83_0223E824(UnkStruct_ov83_0223E824 * param0); -static void ov83_0223E844(UnkStruct_ov83_0223E824 * param0, u32 param1, NARC * param2); -static UnkStruct_ov83_0223F054 * ov83_0223EFF4(UnkStruct_ov83_0223ED3C * param0); -static UnkStruct_ov83_0223F054 * ov83_0223F018(UnkStruct_ov83_0223ED3C * param0); -static void ov83_0223F054(UnkStruct_ov83_0223F054 * param0); -static void ov83_0223F074(UnkStruct_ov83_0223F054 * param0); -static void ov83_0223F0F4(UnkStruct_ov83_0223F054 * param0, UnkStruct_ov83_0223FE50 * param1); -static void ov83_0223F1C0(UnkStruct_ov83_0223F054 * param0, int param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, fx32 param8, fx32 param9, fx32 param10, BOOL param11, int param12, UnkStruct_ov83_0223D95C * param13, int param14, UnkStruct_ov83_0223D784 * param15, u32 param16, BOOL param17, u8 param18); -static void ov83_0223F268(UnkStruct_ov83_0223F054 * param0); -static void ov83_0223F410(UnkStruct_ov83_0223F410 * param0); -static void ov83_0223F420(UnkStruct_ov83_0223F410 * param0); -static void ov83_0223F44C(UnkStruct_ov83_0223F410 * param0); -static void ov83_0223F458(UnkStruct_ov83_0223F410 * param0); -static UnkStruct_ov83_0223F670 * ov83_0223F650(UnkStruct_ov83_0223F4AC * param0); -static void ov83_0223F670(UnkStruct_ov83_0223F670 * param0); -static void ov83_0223F6B4(UnkStruct_ov83_0223F670 * param0); -static void ov83_0223F6CC(UnkStruct_ov83_0223F670 * param0, int param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7); - -static int ov83_0223D6A8 (int param0, const Strbuf *param1, int param2) +static void ov83_0223E09C(UnkStruct_ov83_0223E138 *param0, u32 param1); +static void ov83_0223E138(UnkStruct_ov83_0223E138 *param0); +static void ov83_0223E15C(UnkStruct_ov83_0223E138 *param0, u32 param1, NARC *param2); +static void ov83_0223E208(UnkStruct_ov83_0223E138 *param0); +static void ov83_0223E21C(Window *param0, Strbuf *param1, int param2, int param3); +static void ov83_0223E77C(UnkStruct_ov83_0223E824 *param0, u32 param1); +static void ov83_0223E824(UnkStruct_ov83_0223E824 *param0); +static void ov83_0223E844(UnkStruct_ov83_0223E824 *param0, u32 param1, NARC *param2); +static UnkStruct_ov83_0223F054 *ov83_0223EFF4(UnkStruct_ov83_0223ED3C *param0); +static UnkStruct_ov83_0223F054 *ov83_0223F018(UnkStruct_ov83_0223ED3C *param0); +static void ov83_0223F054(UnkStruct_ov83_0223F054 *param0); +static void ov83_0223F074(UnkStruct_ov83_0223F054 *param0); +static void ov83_0223F0F4(UnkStruct_ov83_0223F054 *param0, UnkStruct_ov83_0223FE50 *param1); +static void ov83_0223F1C0(UnkStruct_ov83_0223F054 *param0, int param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, fx32 param8, fx32 param9, fx32 param10, BOOL param11, int param12, UnkStruct_ov83_0223D95C *param13, int param14, UnkStruct_ov83_0223D784 *param15, u32 param16, BOOL param17, u8 param18); +static void ov83_0223F268(UnkStruct_ov83_0223F054 *param0); +static void ov83_0223F410(UnkStruct_ov83_0223F410 *param0); +static void ov83_0223F420(UnkStruct_ov83_0223F410 *param0); +static void ov83_0223F44C(UnkStruct_ov83_0223F410 *param0); +static void ov83_0223F458(UnkStruct_ov83_0223F410 *param0); +static UnkStruct_ov83_0223F670 *ov83_0223F650(UnkStruct_ov83_0223F4AC *param0); +static void ov83_0223F670(UnkStruct_ov83_0223F670 *param0); +static void ov83_0223F6B4(UnkStruct_ov83_0223F670 *param0); +static void ov83_0223F6CC(UnkStruct_ov83_0223F670 *param0, int param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7); + +static int ov83_0223D6A8(int param0, const Strbuf *param1, int param2) { u32 v0; @@ -129,12 +130,12 @@ static int ov83_0223D6A8 (int param0, const Strbuf *param1, int param2) return param0; } -static UnkStruct_02015128 * ov83_0223D6BC (UnkStruct_02015064 * param0, u32 param1, u32 param2, NARC * param3) +static UnkStruct_02015128 *ov83_0223D6BC(UnkStruct_02015064 *param0, u32 param1, u32 param2, NARC *param3) { UnkStruct_ov22_022557A0 v0; - void * v1; - NNSG2dCharacterData * v2; - UnkStruct_02015128 * v3; + void *v1; + NNSG2dCharacterData *v2; + UnkStruct_02015128 *v3; v1 = sub_020071B4(param3, param1, 0, &v2, param2); v0.unk_00 = param0; @@ -146,12 +147,12 @@ static UnkStruct_02015128 * ov83_0223D6BC (UnkStruct_02015064 * param0, u32 para return v3; } -static UnkStruct_020151A4 * ov83_0223D6EC (UnkStruct_02015064 * param0, u32 param1, u32 param2, NARC * param3) +static UnkStruct_020151A4 *ov83_0223D6EC(UnkStruct_02015064 *param0, u32 param1, u32 param2, NARC *param3) { UnkStruct_ov22_02255800 v0; - void * v1; - NNSG2dPaletteData * v2; - UnkStruct_020151A4 * v3; + void *v1; + NNSG2dPaletteData *v2; + UnkStruct_020151A4 *v3; v1 = sub_020071EC(param3, param1, &v2, param2); v0.unk_00 = param0; @@ -164,10 +165,10 @@ static UnkStruct_020151A4 * ov83_0223D6EC (UnkStruct_02015064 * param0, u32 para return v3; } -static UnkStruct_02015214 * ov83_0223D720 (UnkStruct_02015064 * param0, UnkStruct_02015128 * param1, UnkStruct_020151A4 * param2, int param3, int param4, int param5) +static UnkStruct_02015214 *ov83_0223D720(UnkStruct_02015064 *param0, UnkStruct_02015128 *param1, UnkStruct_020151A4 *param2, int param3, int param4, int param5) { UnkStruct_ov21_021E7F40 v0; - UnkStruct_02015214 * v1; + UnkStruct_02015214 *v1; v0.unk_00 = param0; v0.unk_04 = param1; @@ -185,7 +186,7 @@ static UnkStruct_02015214 * ov83_0223D720 (UnkStruct_02015064 * param0, UnkStruc return v1; } -void ov83_0223D754 (UnkStruct_ov83_0223D784 * param0, int param1, int param2, int param3) +void ov83_0223D754(UnkStruct_ov83_0223D784 *param0, int param1, int param2, int param3) { int v0; @@ -196,7 +197,7 @@ void ov83_0223D754 (UnkStruct_ov83_0223D784 * param0, int param1, int param2, in } } -void ov83_0223D784 (UnkStruct_ov83_0223D784 * param0) +void ov83_0223D784(UnkStruct_ov83_0223D784 *param0) { int v0; @@ -208,7 +209,7 @@ void ov83_0223D784 (UnkStruct_ov83_0223D784 * param0) } } -void ov83_0223D7A8 (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, NARC * param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9) +void ov83_0223D7A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, NARC *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9) { BOOL v0; @@ -229,7 +230,7 @@ void ov83_0223D7A8 (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * sub_020093B4(¶m1->unk_14, param8, param8, param8, param8, 0xffffffff, 0xffffffff, 0, 0, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL); } -void ov83_0223D894 (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, NARC * param2, UnkStruct_02009DC8 * param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +void ov83_0223D894(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, NARC *param2, UnkStruct_02009DC8 *param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { BOOL v0; u32 v1; @@ -250,7 +251,7 @@ void ov83_0223D894 (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * sub_020093B4(¶m1->unk_14, param7, v1, param7, param7, 0xffffffff, 0xffffffff, 0, 0, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL); } -void ov83_0223D95C (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1) +void ov83_0223D95C(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1) { int v0; @@ -271,10 +272,10 @@ void ov83_0223D95C (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * } } -GraphicElementData * ov83_0223D9A8 (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6) +GraphicElementData *ov83_0223D9A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6) { UnkStruct_ov83_0223D9A8 v0; - GraphicElementData * v1; + GraphicElementData *v1; v0.unk_00 = param0->unk_00; v0.unk_04 = ¶m1->unk_14; @@ -291,7 +292,7 @@ GraphicElementData * ov83_0223D9A8 (UnkStruct_ov83_0223D784 * param0, UnkStruct_ return v1; } -void ov83_0223D9DC (UnkStruct_ov83_0223D9EC * param0, fx32 param1, fx32 param2, int param3) +void ov83_0223D9DC(UnkStruct_ov83_0223D9EC *param0, fx32 param1, fx32 param2, int param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -300,7 +301,7 @@ void ov83_0223D9DC (UnkStruct_ov83_0223D9EC * param0, fx32 param1, fx32 param2, param0->unk_0C = 0; } -BOOL ov83_0223D9EC (UnkStruct_ov83_0223D9EC * param0) +BOOL ov83_0223D9EC(UnkStruct_ov83_0223D9EC *param0) { fx32 v0; @@ -319,7 +320,7 @@ BOOL ov83_0223D9EC (UnkStruct_ov83_0223D9EC * param0) return 1; } -void ov83_0223DA34 (UnkStruct_ov83_0223DA94 * param0, fx32 param1, fx32 param2, fx32 param3, int param4) +void ov83_0223DA34(UnkStruct_ov83_0223DA94 *param0, fx32 param1, fx32 param2, fx32 param3, int param4) { fx32 v0; fx32 v1; @@ -342,7 +343,7 @@ void ov83_0223DA34 (UnkStruct_ov83_0223DA94 * param0, fx32 param1, fx32 param2, param0->unk_14 = param4; } -BOOL ov83_0223DA94 (UnkStruct_ov83_0223DA94 * param0) +BOOL ov83_0223DA94(UnkStruct_ov83_0223DA94 *param0) { fx32 v0; fx32 v1; @@ -366,7 +367,7 @@ BOOL ov83_0223DA94 (UnkStruct_ov83_0223DA94 * param0) return 1; } -VecFx32 ov83_0223DAFC (fx32 param0, fx32 param1, fx32 param2) +VecFx32 ov83_0223DAFC(fx32 param0, fx32 param1, fx32 param2) { VecFx32 v0; @@ -377,29 +378,29 @@ VecFx32 ov83_0223DAFC (fx32 param0, fx32 param1, fx32 param2) } static const UnkStruct_ov83_02240460 Unk_ov83_02240460[4] = { - {FX32_CONST(0), FX32_CONST(0), 0x40, 0x60, 0xFFFFFFFFFFFFFFE0, 0x58, 0x20, 0xA}, - {FX32_CONST(0), FX32_CONST(0), 0x118, 0x9C, 0xC0, 0x80, 0x20, 0x20}, - {FX32_CONST(0), FX32_CONST(0), 0xFFFFFFFFFFFFFFE0, 0x80, 0x20, 0x60, 0x20, 0x20}, - {FX32_CONST(0), FX32_CONST(0), 0x80, 0x74, 0xFFFFFFFFFFFFFFE0, 0x60, 0x20, 0x20} + { FX32_CONST(0), FX32_CONST(0), 0x40, 0x60, 0xFFFFFFFFFFFFFFE0, 0x58, 0x20, 0xA }, + { FX32_CONST(0), FX32_CONST(0), 0x118, 0x9C, 0xC0, 0x80, 0x20, 0x20 }, + { FX32_CONST(0), FX32_CONST(0), 0xFFFFFFFFFFFFFFE0, 0x80, 0x20, 0x60, 0x20, 0x20 }, + { FX32_CONST(0), FX32_CONST(0), 0x80, 0x74, 0xFFFFFFFFFFFFFFE0, 0x60, 0x20, 0x20 } }; -void ov83_0223DB18 (UnkStruct_ov83_0223DB30 * param0, int param1) +void ov83_0223DB18(UnkStruct_ov83_0223DB30 *param0, int param1) { memset(param0, 0, sizeof(UnkStruct_ov83_0223DB30)); param0->unk_108 = param1; } -void ov83_0223DB30 (UnkStruct_ov83_0223DB30 * param0) +void ov83_0223DB30(UnkStruct_ov83_0223DB30 *param0) { GF_ASSERT(param0->unk_00 == 0); memset(param0, 0, sizeof(UnkStruct_ov83_0223DB30)); } -void ov83_0223DB4C (UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223DB4C * param1, UnkStruct_ov83_0223D784 * param2, UnkStruct_ov83_0223D95C * param3, u32 param4) +void ov83_0223DB4C(UnkStruct_ov83_0223DB30 *param0, UnkStruct_ov83_0223DB4C *param1, UnkStruct_ov83_0223D784 *param2, UnkStruct_ov83_0223D95C *param3, u32 param4) { int v0; int v1; - NARC * v2; + NARC *v2; v2 = NARC_ctor(NARC_INDEX_GRAPHIC__NTAG_GRA, param4); v1 = 0; @@ -427,7 +428,7 @@ void ov83_0223DB4C (UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223DB4C * param0->unk_00 = 1; } -void ov83_0223DC1C (UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223D784 * param1) +void ov83_0223DC1C(UnkStruct_ov83_0223DB30 *param0, UnkStruct_ov83_0223D784 *param1) { int v0; @@ -442,7 +443,7 @@ void ov83_0223DC1C (UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223D784 * param0->unk_00 = 0; } -void ov83_0223DC68 (UnkStruct_ov83_0223DB30 * param0) +void ov83_0223DC68(UnkStruct_ov83_0223DB30 *param0) { int v0; VecFx32 v1; @@ -464,7 +465,7 @@ void ov83_0223DC68 (UnkStruct_ov83_0223DB30 * param0) param0->unk_04 = 1; } -u32 ov83_0223DD30 (UnkStruct_ov83_0223DB30 * param0) +u32 ov83_0223DD30(UnkStruct_ov83_0223DB30 *param0) { int v0; BOOL v1; @@ -529,7 +530,7 @@ u32 ov83_0223DD30 (UnkStruct_ov83_0223DB30 * param0) return v3; } -void ov83_0223DEA0 (UnkStruct_ov83_0223E138 * param0, int param1, UnkStruct_ov83_0223DEA0 * param2, UnkStruct_ov83_0223FE50 * param3, int param4, u32 param5) +void ov83_0223DEA0(UnkStruct_ov83_0223E138 *param0, int param1, UnkStruct_ov83_0223DEA0 *param2, UnkStruct_ov83_0223FE50 *param3, int param4, u32 param5) { memset(param0, 0, sizeof(UnkStruct_ov83_0223E138)); param0->unk_18 = param2; @@ -539,13 +540,13 @@ void ov83_0223DEA0 (UnkStruct_ov83_0223E138 * param0, int param1, UnkStruct_ov83 param0->unk_10 = param4; } -void ov83_0223DEC4 (UnkStruct_ov83_0223E138 * param0) +void ov83_0223DEC4(UnkStruct_ov83_0223E138 *param0) { GF_ASSERT(param0->unk_30 == 0); memset(param0, 0, sizeof(UnkStruct_ov83_0223E138)); } -void ov83_0223DEE0 (UnkStruct_ov83_0223E138 * param0, BGL * param1, u32 param2, NARC * param3) +void ov83_0223DEE0(UnkStruct_ov83_0223E138 *param0, BGL *param1, u32 param2, NARC *param3) { GF_ASSERT(param0->unk_30 == 0); @@ -557,7 +558,7 @@ void ov83_0223DEE0 (UnkStruct_ov83_0223E138 * param0, BGL * param1, u32 param2, param0->unk_30 = 1; } -void ov83_0223DF10 (UnkStruct_ov83_0223E138 * param0) +void ov83_0223DF10(UnkStruct_ov83_0223E138 *param0) { GF_ASSERT(param0->unk_30 == 1); @@ -567,7 +568,7 @@ void ov83_0223DF10 (UnkStruct_ov83_0223E138 * param0) param0->unk_30 = 0; } -void ov83_0223DF30 (UnkStruct_ov83_0223E138 * param0, int param1) +void ov83_0223DF30(UnkStruct_ov83_0223E138 *param0, int param1) { StringTemplate_SetItemName(param0->unk_18->unk_04, 0, param1); StringTemplate_Format(param0->unk_18->unk_04, param0->unk_18->unk_08, param0->unk_18->unk_10); @@ -576,20 +577,20 @@ void ov83_0223DF30 (UnkStruct_ov83_0223E138 * param0, int param1) sub_0200E060(param0->unk_08, 0, 1, 0); } -void ov83_0223DF70 (UnkStruct_ov83_0223E138 * param0) +void ov83_0223DF70(UnkStruct_ov83_0223E138 *param0) { sub_0201ACF4(param0->unk_08); sub_02019EBC(param0->unk_04, 4); } -void ov83_0223DF84 (UnkStruct_ov83_0223E138 * param0) +void ov83_0223DF84(UnkStruct_ov83_0223E138 *param0) { BGL_FillWindow(param0->unk_08, 15); ov83_0223E21C(param0->unk_08, param0->unk_18->unk_0C, 0, 0); sub_0200E060(param0->unk_08, 0, 1, 0); } -void ov83_0223DFAC (UnkStruct_ov83_0223E138 * param0) +void ov83_0223DFAC(UnkStruct_ov83_0223E138 *param0) { int v0; int v1; @@ -627,7 +628,7 @@ void ov83_0223DFAC (UnkStruct_ov83_0223E138 * param0) sub_0201C3C0(param0->unk_04, 5); } -static void ov83_0223E09C (UnkStruct_ov83_0223E138 * param0, u32 param1) +static void ov83_0223E09C(UnkStruct_ov83_0223E138 *param0, u32 param1) { param0->unk_08 = sub_0201A778(param1, 1); param0->unk_0C = sub_0201A778(param1, 1); @@ -641,7 +642,7 @@ static void ov83_0223E09C (UnkStruct_ov83_0223E138 * param0, u32 param1) sub_0200E060(param0->unk_08, 1, 1, 0); } -static void ov83_0223E138 (UnkStruct_ov83_0223E138 * param0) +static void ov83_0223E138(UnkStruct_ov83_0223E138 *param0) { BGL_DeleteWindow(param0->unk_08); sub_0201A928(param0->unk_08, 1); @@ -649,7 +650,7 @@ static void ov83_0223E138 (UnkStruct_ov83_0223E138 * param0) sub_0201A928(param0->unk_0C, 1); } -static void ov83_0223E15C (UnkStruct_ov83_0223E138 * param0, u32 param1, NARC * param2) +static void ov83_0223E15C(UnkStruct_ov83_0223E138 *param0, u32 param1, NARC *param2) { int v0; @@ -672,29 +673,29 @@ static void ov83_0223E15C (UnkStruct_ov83_0223E138 * param0, u32 param1, NARC * sub_0201C3C0(param0->unk_04, 5); } -static void ov83_0223E208 (UnkStruct_ov83_0223E138 * param0) +static void ov83_0223E208(UnkStruct_ov83_0223E138 *param0) { Heap_FreeToHeap(param0->unk_20); Heap_FreeToHeap(param0->unk_28); } -static void ov83_0223E21C (Window * param0, Strbuf *param1, int param2, int param3) +static void ov83_0223E21C(Window *param0, Strbuf *param1, int param2, int param3) { sub_0201D78C(param0, 1, param1, param2, param3, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); } -void ov83_0223E244 (UnkStruct_ov83_0223E244 * param0) +void ov83_0223E244(UnkStruct_ov83_0223E244 *param0) { memset(param0, 0, sizeof(UnkStruct_ov83_0223E244)); } -void ov83_0223E260 (UnkStruct_ov83_0223E244 * param0) +void ov83_0223E260(UnkStruct_ov83_0223E244 *param0) { GF_ASSERT(param0->unk_00 == 0); memset(param0, 0, sizeof(UnkStruct_ov83_0223E244)); } -void ov83_0223E28C (UnkStruct_ov83_0223E244 * param0, UnkStruct_ov83_0223D784 * param1, UnkStruct_ov83_0223D95C * param2, u32 param3, u32 param4, u32 param5) +void ov83_0223E28C(UnkStruct_ov83_0223E244 *param0, UnkStruct_ov83_0223D784 *param1, UnkStruct_ov83_0223D95C *param2, u32 param3, u32 param4, u32 param5) { param0->unk_08 = ov83_0223D9A8(param1, ¶m2[param4], (128 * FX32_ONE), (96 * FX32_ONE), 0, 0, param3); sub_02021CAC(param0->unk_08, 0); @@ -702,20 +703,20 @@ void ov83_0223E28C (UnkStruct_ov83_0223E244 * param0, UnkStruct_ov83_0223D784 * param0->unk_00 = 1; } -void ov83_0223E2C8 (UnkStruct_ov83_0223E244 * param0) +void ov83_0223E2C8(UnkStruct_ov83_0223E244 *param0) { GF_ASSERT(param0->unk_00 == 1); sub_02021BD4(param0->unk_08); param0->unk_00 = 0; } -void ov83_0223E2E4 (UnkStruct_ov83_0223E244 * param0) +void ov83_0223E2E4(UnkStruct_ov83_0223E244 *param0) { sub_02021CAC(param0->unk_08, 1); sub_02021CC8(param0->unk_08, 1); } -void ov83_0223E2FC (UnkStruct_ov83_0223E244 * param0) +void ov83_0223E2FC(UnkStruct_ov83_0223E244 *param0) { VecFx32 v0; @@ -728,7 +729,7 @@ void ov83_0223E2FC (UnkStruct_ov83_0223E244 * param0) sub_02021C50(param0->unk_08, &v0); } -BOOL ov83_0223E32C (UnkStruct_ov83_0223E244 * param0) +BOOL ov83_0223E32C(UnkStruct_ov83_0223E244 *param0) { if (sub_02021FD0(param0->unk_08) == 0) { return 1; @@ -755,37 +756,77 @@ static const fx32 Unk_ov83_02240454[3] = { FX32_CONST(1.0f) }; -void ov83_0223E340 (UnkStruct_ov83_0223E340 * param0) +void ov83_0223E340(UnkStruct_ov83_0223E340 *param0) { memset(param0, 0, sizeof(UnkStruct_ov83_0223E340)); } -void ov83_0223E34C (UnkStruct_ov83_0223E340 * param0) +void ov83_0223E34C(UnkStruct_ov83_0223E340 *param0) { GF_ASSERT(param0->unk_74 == 0); memset(param0, 0, sizeof(UnkStruct_ov83_0223E340)); } -void ov83_0223E368 (UnkStruct_ov83_0223E340 * param0, UnkStruct_02015064 * param1, u32 param2, NARC * param3) +void ov83_0223E368(UnkStruct_ov83_0223E340 *param0, UnkStruct_02015064 *param1, u32 param2, NARC *param3) { int v0; static const u8 v1[] = { - 34, 38, 40, 42, 44, 46, + 34, + 38, + 40, + 42, + 44, + 46, }; static const u8 v2[] = { - 35, 36, 37, 39, 41, 43, 45, 47, + 35, + 36, + 37, + 39, + 41, + 43, + 45, + 47, }; static const u8 v3[] = { - 0, 0, 0, 1, 2, 3, 4, 5, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, }; static const u8 v4[] = { - 3, 2, 1, 7, 0, 6, 5, 4, + 3, + 2, + 1, + 7, + 0, + 6, + 5, + 4, }; static const u8 v5[] = { - 0, 0, 0, 0, 0, 64, 64, 64, + 0, + 0, + 0, + 0, + 0, + 64, + 64, + 64, }; static const u8 v6[] = { - 0, 0, 0, 0, 0, 32, 32, 32, + 0, + 0, + 0, + 0, + 0, + 32, + 32, + 32, }; GF_ASSERT(param0->unk_74 == 0); @@ -806,7 +847,7 @@ void ov83_0223E368 (UnkStruct_ov83_0223E340 * param0, UnkStruct_02015064 * param param0->unk_74 = 1; } -void ov83_0223E438 (UnkStruct_ov83_0223E340 * param0) +void ov83_0223E438(UnkStruct_ov83_0223E340 *param0) { int v0; @@ -827,13 +868,13 @@ void ov83_0223E438 (UnkStruct_ov83_0223E340 * param0) param0->unk_74 = 0; } -void ov83_0223E484 (UnkStruct_ov83_0223E340 * param0, u32 param1, BOOL param2) +void ov83_0223E484(UnkStruct_ov83_0223E340 *param0, u32 param1, BOOL param2) { GF_ASSERT(param1 < 8); sub_02015240(param0->unk_38[param1], param2); } -void ov83_0223E4A4 (UnkStruct_ov83_0223E340 * param0, u16 param1) +void ov83_0223E4A4(UnkStruct_ov83_0223E340 *param0, u16 param1) { int v0; @@ -842,7 +883,7 @@ void ov83_0223E4A4 (UnkStruct_ov83_0223E340 * param0, u16 param1) } } -void ov83_0223E4C0 (UnkStruct_ov83_0223E340 * param0, fx32 param1) +void ov83_0223E4C0(UnkStruct_ov83_0223E340 *param0, fx32 param1) { int v0; @@ -851,13 +892,13 @@ void ov83_0223E4C0 (UnkStruct_ov83_0223E340 * param0, fx32 param1) } } -void ov83_0223E4E0 (UnkStruct_ov83_0223E340 * param0, u32 param1, u32 param2) +void ov83_0223E4E0(UnkStruct_ov83_0223E340 *param0, u32 param1, u32 param2) { GF_ASSERT(param1 < 8); sub_02015294(param0->unk_38[param1], param2); } -void ov83_0223E500 (UnkStruct_ov83_0223E340 * param0) +void ov83_0223E500(UnkStruct_ov83_0223E340 *param0) { param0->unk_6C = 1; param0->unk_70 = 0; @@ -865,7 +906,7 @@ void ov83_0223E500 (UnkStruct_ov83_0223E340 * param0) ov83_0223D9DC(¶m0->unk_58, FX32_ONE, Unk_ov83_02240448[0], Unk_ov83_02240414[0]); } -void ov83_0223E51C (UnkStruct_ov83_0223E340 * param0, int param1) +void ov83_0223E51C(UnkStruct_ov83_0223E340 *param0, int param1) { BOOL v0; int v1; @@ -897,7 +938,7 @@ void ov83_0223E51C (UnkStruct_ov83_0223E340 * param0, int param1) } } -void ov83_0223E5A4 (UnkStruct_ov83_0223E5C0 * param0, const UnkStruct_ov83_0223FE50 * param1, u32 param2, UnkStruct_ov83_0223D4CC * param3) +void ov83_0223E5A4(UnkStruct_ov83_0223E5C0 *param0, const UnkStruct_ov83_0223FE50 *param1, u32 param2, UnkStruct_ov83_0223D4CC *param3) { memset(param0, 0, sizeof(UnkStruct_ov83_0223E5C0)); param0->unk_14 = param1; @@ -905,13 +946,13 @@ void ov83_0223E5A4 (UnkStruct_ov83_0223E5C0 * param0, const UnkStruct_ov83_0223F param0->unk_1C = param3; } -void ov83_0223E5C0 (UnkStruct_ov83_0223E5C0 * param0) +void ov83_0223E5C0(UnkStruct_ov83_0223E5C0 *param0) { GF_ASSERT(param0->unk_00 == 0); memset(param0, 0, sizeof(UnkStruct_ov83_0223E5C0)); } -void ov83_0223E5DC (UnkStruct_ov83_0223E5C0 * param0, UnkStruct_ov83_0223D784 * param1, UnkStruct_ov83_0223D95C * param2, u32 param3) +void ov83_0223E5DC(UnkStruct_ov83_0223E5C0 *param0, UnkStruct_ov83_0223D784 *param1, UnkStruct_ov83_0223D95C *param2, u32 param3) { int v0; VecFx32 v1; @@ -929,7 +970,7 @@ void ov83_0223E5DC (UnkStruct_ov83_0223E5C0 * param0, UnkStruct_ov83_0223D784 * param0->unk_00 = 1; } -void ov83_0223E63C (UnkStruct_ov83_0223E5C0 * param0) +void ov83_0223E63C(UnkStruct_ov83_0223E5C0 *param0) { int v0; @@ -940,12 +981,12 @@ void ov83_0223E63C (UnkStruct_ov83_0223E5C0 * param0) param0->unk_00 = 0; } -void ov83_0223E658 (UnkStruct_ov83_0223E5C0 * param0) +void ov83_0223E658(UnkStruct_ov83_0223E5C0 *param0) { int v0; int v1; VecFx32 v2; - const UnkStruct_ov83_0223FCE8 * v3 = ¶m0->unk_14->unk_90[0].unk_08; + const UnkStruct_ov83_0223FCE8 *v3 = ¶m0->unk_14->unk_90[0].unk_08; for (v0 = 0; v0 < param0->unk_18; v0++) { v1 = param0->unk_14->unk_130[v0]; @@ -955,7 +996,7 @@ void ov83_0223E658 (UnkStruct_ov83_0223E5C0 * param0) } } -void ov83_0223E69C (UnkStruct_ov83_0223E5C0 * param0, BOOL param1) +void ov83_0223E69C(UnkStruct_ov83_0223E5C0 *param0, BOOL param1) { int v0; int v1; @@ -969,7 +1010,7 @@ void ov83_0223E69C (UnkStruct_ov83_0223E5C0 * param0, BOOL param1) } } -void ov83_0223E6D4 (UnkStruct_ov83_0223E824 * param0, int param1, UnkStruct_ov83_0223DEA0 * param2, UnkStruct_ov83_0223FE50 * param3, int param4, u32 param5) +void ov83_0223E6D4(UnkStruct_ov83_0223E824 *param0, int param1, UnkStruct_ov83_0223DEA0 *param2, UnkStruct_ov83_0223FE50 *param3, int param4, u32 param5) { memset(param0, 0, sizeof(UnkStruct_ov83_0223E824)); param0->unk_1C = param2; @@ -979,7 +1020,7 @@ void ov83_0223E6D4 (UnkStruct_ov83_0223E824 * param0, int param1, UnkStruct_ov83 param0->unk_18 = param4; } -void ov83_0223E6F8 (UnkStruct_ov83_0223E824 * param0) +void ov83_0223E6F8(UnkStruct_ov83_0223E824 *param0) { GF_ASSERT(param0->unk_28 == 0); @@ -989,7 +1030,7 @@ void ov83_0223E6F8 (UnkStruct_ov83_0223E824 * param0) memset(param0, 0, sizeof(UnkStruct_ov83_0223E824)); } -void ov83_0223E720 (UnkStruct_ov83_0223E824 * param0, BGL * param1, u32 param2, NARC * param3) +void ov83_0223E720(UnkStruct_ov83_0223E824 *param0, BGL *param1, u32 param2, NARC *param3) { GF_ASSERT(param0->unk_28 == 0); @@ -1004,7 +1045,7 @@ void ov83_0223E720 (UnkStruct_ov83_0223E824 * param0, BGL * param1, u32 param2, param0->unk_28 = 1; } -void ov83_0223E760 (UnkStruct_ov83_0223E824 * param0) +void ov83_0223E760(UnkStruct_ov83_0223E824 *param0) { GF_ASSERT(param0->unk_28 == 1); @@ -1013,14 +1054,14 @@ void ov83_0223E760 (UnkStruct_ov83_0223E824 * param0) param0->unk_28 = 0; } -static void ov83_0223E77C (UnkStruct_ov83_0223E824 * param0, u32 param1) +static void ov83_0223E77C(UnkStruct_ov83_0223E824 *param0, u32 param1) { int v0; static u16 v1[4][6] = { - {8, 11, 16, 4, 2, 40}, - {2, 1, 28, 15, 3, 40}, - {2, 18, 28, 5, 3, 460}, - {2, 2, 27, 5, 2, 40} + { 8, 11, 16, 4, 2, 40 }, + { 2, 1, 28, 15, 3, 40 }, + { 2, 18, 28, 5, 3, 460 }, + { 2, 2, 27, 5, 2, 40 } }; sub_0200DD0C(param0->unk_04, 2, 1, 0, param0->unk_18, param1); @@ -1035,7 +1076,7 @@ static void ov83_0223E77C (UnkStruct_ov83_0223E824 * param0, u32 param1) } } -static void ov83_0223E824 (UnkStruct_ov83_0223E824 * param0) +static void ov83_0223E824(UnkStruct_ov83_0223E824 *param0) { int v0; @@ -1045,10 +1086,10 @@ static void ov83_0223E824 (UnkStruct_ov83_0223E824 * param0) } } -static void ov83_0223E844 (UnkStruct_ov83_0223E824 * param0, u32 param1, NARC * param2) +static void ov83_0223E844(UnkStruct_ov83_0223E824 *param0, u32 param1, NARC *param2) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; sub_02007130(param2, 6, 0, 4 * 32, 1 * 32, param1); sub_020070E8(param2, 5, param0->unk_04, 1, 0, 0, 0, param1); @@ -1061,9 +1102,9 @@ static void ov83_0223E844 (UnkStruct_ov83_0223E824 * param0, u32 param1, NARC * sub_0201C3C0(param0->unk_04, 1); } -static void ov83_0223E8DC (SysTask * param0, void * param1) +static void ov83_0223E8DC(SysTask *param0, void *param1) { - UnkStruct_ov83_0223E824 * v0 = param1; + UnkStruct_ov83_0223E824 *v0 = param1; v0->unk_30++; @@ -1075,7 +1116,7 @@ static void ov83_0223E8DC (SysTask * param0, void * param1) } } -void ov83_0223E908 (UnkStruct_ov83_0223E824 * param0, u32 param1) +void ov83_0223E908(UnkStruct_ov83_0223E824 *param0, u32 param1) { GF_ASSERT(param0->unk_2C == NULL); @@ -1094,7 +1135,7 @@ void ov83_0223E908 (UnkStruct_ov83_0223E824 * param0, u32 param1) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1); } -BOOL ov83_0223E984 (const UnkStruct_ov83_0223E824 * param0) +BOOL ov83_0223E984(const UnkStruct_ov83_0223E824 *param0) { if (param0->unk_2C == NULL) { return 1; @@ -1103,7 +1144,7 @@ BOOL ov83_0223E984 (const UnkStruct_ov83_0223E824 * param0) return 0; } -void ov83_0223E994 (UnkStruct_ov83_0223E824 * param0) +void ov83_0223E994(UnkStruct_ov83_0223E824 *param0) { if (param0->unk_2C == NULL) { return; @@ -1116,13 +1157,13 @@ void ov83_0223E994 (UnkStruct_ov83_0223E824 * param0) param0->unk_2C = NULL; } -void ov83_0223E9BC (UnkStruct_ov83_0223E824 * param0) +void ov83_0223E9BC(UnkStruct_ov83_0223E824 *param0) { ov83_0223E9D0(param0); param0->unk_34 = sub_0200E7FC(param0->unk_08[3], 1); } -void ov83_0223E9D0 (UnkStruct_ov83_0223E824 * param0) +void ov83_0223E9D0(UnkStruct_ov83_0223E824 *param0) { if (param0->unk_34 != NULL) { DeleteWaitDial(param0->unk_34); @@ -1130,7 +1171,7 @@ void ov83_0223E9D0 (UnkStruct_ov83_0223E824 * param0) } } -static void ov83_0223E9E4 (UnkStruct_ov83_0223E824 * param0) +static void ov83_0223E9E4(UnkStruct_ov83_0223E824 *param0) { sub_02019EBC(param0->unk_04, 2); BGL_FillWindow(param0->unk_08[1], 15); @@ -1148,7 +1189,7 @@ static void ov83_0223E9E4 (UnkStruct_ov83_0223E824 * param0) sub_0201A9A4(param0->unk_08[2]); } -static void ov83_0223EA6C (UnkStruct_ov83_0223E824 * param0) +static void ov83_0223EA6C(UnkStruct_ov83_0223E824 *param0) { sub_0201D78C(param0->unk_08[1], 0, param0->unk_1C->unk_4C[0], 0, 24, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); StringTemplate_SetNumber(param0->unk_1C->unk_04, 0, param0->unk_24->unk_58.unk_0E, 2, 2, 1); @@ -1177,7 +1218,7 @@ static void ov83_0223EA6C (UnkStruct_ov83_0223E824 * param0) sub_0201A9A4(param0->unk_08[1]); } -static void ov83_0223EBD8 (UnkStruct_ov83_0223E824 * param0) +static void ov83_0223EBD8(UnkStruct_ov83_0223E824 *param0) { StringTemplate_SetPoffinName(param0->unk_1C->unk_04, 3, param0->unk_24->unk_58.unk_0C); StringTemplate_SetNumber(param0->unk_1C->unk_04, 1, param0->unk_24->unk_58.unk_0D, 2, 2, 1); @@ -1187,7 +1228,7 @@ static void ov83_0223EBD8 (UnkStruct_ov83_0223E824 * param0) sub_0201A9A4(param0->unk_08[2]); } -void ov83_0223EC4C (UnkStruct_ov83_0223E824 * param0, u32 param1) +void ov83_0223EC4C(UnkStruct_ov83_0223E824 *param0, u32 param1) { switch (param1) { case 0: @@ -1202,16 +1243,16 @@ void ov83_0223EC4C (UnkStruct_ov83_0223E824 * param0, u32 param1) } } -void ov83_0223EC70 (UnkStruct_ov83_0223E824 * param0) +void ov83_0223EC70(UnkStruct_ov83_0223E824 *param0) { sub_02019EBC(param0->unk_04, 2); sub_0201ACF4(param0->unk_08[1]); sub_0201ACF4(param0->unk_08[2]); } -void ov83_0223EC8C (UnkStruct_ov83_0223E824 * param0, u32 param1) +void ov83_0223EC8C(UnkStruct_ov83_0223E824 *param0, u32 param1) { - Strbuf* v0; + Strbuf *v0; int v1; ov83_0223E9D0(param0); @@ -1249,28 +1290,28 @@ void ov83_0223EC8C (UnkStruct_ov83_0223E824 * param0, u32 param1) } static const UnkStruct_ov83_022404B0 Unk_ov83_022404B0[8] = { - {FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x20, 0x40, 0x0, 0x0, 0x20, 0x2, 0x1, 0x0, 0x0, 0x0, 0x5}, - {FX32_CONST(0.50f), FX32_CONST(1.0f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x0, 0x8, 0x0, 0x18, 0x10, 0x2, 0x2, 0x1, 0x1, 0x1, 0xA}, - {FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(2.0f), 0x20, 0x40, 0x20, 0x40, 0x10, 0x2, 0x0, 0x0, 0x0, 0x0, 0x5}, - {FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x20, 0x40, 0x0, 0x0, 0x20, 0x3, 0x1, 0x0, 0x0, 0x0, 0x5}, - {FX32_CONST(0.50f), FX32_CONST(1.0f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x0, 0x8, 0x0, 0x18, 0x10, 0x3, 0x2, 0x1, 0x1, 0x1, 0xA}, - {FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(4.0f), 0x20, 0x40, 0x20, 0x40, 0x10, 0x3, 0x0, 0x0, 0x0, 0x0, 0x5}, - {FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x20, 0x40, 0x0, 0x0, 0x20, 0x4, 0x0, 0x0, 0x0, 0x0, 0x5}, - {FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x20, 0x40, 0x0, 0x0, 0x20, 0x4, 0x1, 0x0, 0x0, 0x0, 0x5} + { FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x20, 0x40, 0x0, 0x0, 0x20, 0x2, 0x1, 0x0, 0x0, 0x0, 0x5 }, + { FX32_CONST(0.50f), FX32_CONST(1.0f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x0, 0x8, 0x0, 0x18, 0x10, 0x2, 0x2, 0x1, 0x1, 0x1, 0xA }, + { FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(2.0f), 0x20, 0x40, 0x20, 0x40, 0x10, 0x2, 0x0, 0x0, 0x0, 0x0, 0x5 }, + { FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x20, 0x40, 0x0, 0x0, 0x20, 0x3, 0x1, 0x0, 0x0, 0x0, 0x5 }, + { FX32_CONST(0.50f), FX32_CONST(1.0f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x0, 0x8, 0x0, 0x18, 0x10, 0x3, 0x2, 0x1, 0x1, 0x1, 0xA }, + { FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(4.0f), 0x20, 0x40, 0x20, 0x40, 0x10, 0x3, 0x0, 0x0, 0x0, 0x0, 0x5 }, + { FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x20, 0x40, 0x0, 0x0, 0x20, 0x4, 0x0, 0x0, 0x0, 0x0, 0x5 }, + { FX32_CONST(0.50f), FX32_CONST(1.50f), FX32_CONST(0.0f), FX32_CONST(0.0f), 0x20, 0x40, 0x0, 0x0, 0x20, 0x4, 0x1, 0x0, 0x0, 0x0, 0x5 } }; -void ov83_0223ED3C (UnkStruct_ov83_0223ED3C * param0) +void ov83_0223ED3C(UnkStruct_ov83_0223ED3C *param0) { memset(param0, 0, sizeof(UnkStruct_ov83_0223ED3C)); } -void ov83_0223ED4C (UnkStruct_ov83_0223ED3C * param0) +void ov83_0223ED4C(UnkStruct_ov83_0223ED3C *param0) { GF_ASSERT(param0->unk_00 == 0); memset(param0, 0, sizeof(UnkStruct_ov83_0223ED3C)); } -void ov83_0223ED6C (UnkStruct_ov83_0223ED3C * param0, UnkStruct_ov83_0223D784 * param1, UnkStruct_ov83_0223D95C * param2, u32 param3) +void ov83_0223ED6C(UnkStruct_ov83_0223ED3C *param0, UnkStruct_ov83_0223D784 *param1, UnkStruct_ov83_0223D95C *param2, u32 param3) { param0->unk_04 = param1; param0->unk_08 = param2; @@ -1278,7 +1319,7 @@ void ov83_0223ED6C (UnkStruct_ov83_0223ED3C * param0, UnkStruct_ov83_0223D784 * param0->unk_00 = 1; } -void ov83_0223ED78 (UnkStruct_ov83_0223ED3C * param0) +void ov83_0223ED78(UnkStruct_ov83_0223ED3C *param0) { int v0; @@ -1291,7 +1332,7 @@ void ov83_0223ED78 (UnkStruct_ov83_0223ED3C * param0) param0->unk_00 = 0; } -void ov83_0223EDA4 (UnkStruct_ov83_0223ED3C * param0, UnkStruct_ov83_0223FE50 * param1) +void ov83_0223EDA4(UnkStruct_ov83_0223ED3C *param0, UnkStruct_ov83_0223FE50 *param1) { int v0; @@ -1306,9 +1347,9 @@ void ov83_0223EDA4 (UnkStruct_ov83_0223ED3C * param0, UnkStruct_ov83_0223FE50 * } } -void ov83_0223EDDC (UnkStruct_ov83_0223ED3C * param0, int param1, int param2) +void ov83_0223EDDC(UnkStruct_ov83_0223ED3C *param0, int param1, int param2) { - UnkStruct_ov83_0223F054 * v0; + UnkStruct_ov83_0223F054 *v0; u16 v1; fx32 v2, v3, v4, v5, v6, v7, v8; UnkStruct_ov83_022404B0 v9 = Unk_ov83_022404B0[param1 * 3 + param2]; @@ -1351,7 +1392,7 @@ void ov83_0223EDDC (UnkStruct_ov83_0223ED3C * param0, int param1, int param2) param0->unk_410++; } -void ov83_0223EFCC (UnkStruct_ov83_0223ED3C * param0) +void ov83_0223EFCC(UnkStruct_ov83_0223ED3C *param0) { int v0; @@ -1362,7 +1403,7 @@ void ov83_0223EFCC (UnkStruct_ov83_0223ED3C * param0) } } -static UnkStruct_ov83_0223F054 * ov83_0223EFF4 (UnkStruct_ov83_0223ED3C * param0) +static UnkStruct_ov83_0223F054 *ov83_0223EFF4(UnkStruct_ov83_0223ED3C *param0) { int v0; @@ -1375,10 +1416,10 @@ static UnkStruct_ov83_0223F054 * ov83_0223EFF4 (UnkStruct_ov83_0223ED3C * param0 return NULL; } -static UnkStruct_ov83_0223F054 * ov83_0223F018 (UnkStruct_ov83_0223ED3C * param0) +static UnkStruct_ov83_0223F054 *ov83_0223F018(UnkStruct_ov83_0223ED3C *param0) { int v0; - UnkStruct_ov83_0223F054 * v1 = NULL; + UnkStruct_ov83_0223F054 *v1 = NULL; for (v0 = 0; v0 < 8; v0++) { if (param0->unk_10[v0].unk_78 != NULL) { @@ -1395,7 +1436,7 @@ static UnkStruct_ov83_0223F054 * ov83_0223F018 (UnkStruct_ov83_0223ED3C * param0 return v1; } -static void ov83_0223F054 (UnkStruct_ov83_0223F054 * param0) +static void ov83_0223F054(UnkStruct_ov83_0223F054 *param0) { GF_ASSERT(param0->unk_78); @@ -1403,7 +1444,7 @@ static void ov83_0223F054 (UnkStruct_ov83_0223F054 * param0) memset(param0, 0, sizeof(UnkStruct_ov83_0223F054)); } -static void ov83_0223F074 (UnkStruct_ov83_0223F054 * param0) +static void ov83_0223F074(UnkStruct_ov83_0223F054 *param0) { BOOL v0; @@ -1439,7 +1480,7 @@ static void ov83_0223F074 (UnkStruct_ov83_0223F054 * param0) } } -static void ov83_0223F0F4 (UnkStruct_ov83_0223F054 * param0, UnkStruct_ov83_0223FE50 * param1) +static void ov83_0223F0F4(UnkStruct_ov83_0223F054 *param0, UnkStruct_ov83_0223FE50 *param1) { VecFx32 v0; u32 v1; @@ -1469,7 +1510,7 @@ static void ov83_0223F0F4 (UnkStruct_ov83_0223F054 * param0, UnkStruct_ov83_0223 } } -static void ov83_0223F1C0 (UnkStruct_ov83_0223F054 * param0, int param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, fx32 param8, fx32 param9, fx32 param10, BOOL param11, int param12, UnkStruct_ov83_0223D95C * param13, int param14, UnkStruct_ov83_0223D784 * param15, u32 param16, BOOL param17, u8 param18) +static void ov83_0223F1C0(UnkStruct_ov83_0223F054 *param0, int param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, fx32 param8, fx32 param9, fx32 param10, BOOL param11, int param12, UnkStruct_ov83_0223D95C *param13, int param14, UnkStruct_ov83_0223D784 *param15, u32 param16, BOOL param17, u8 param18) { param0->unk_00 = param1; @@ -1497,7 +1538,7 @@ static void ov83_0223F1C0 (UnkStruct_ov83_0223F054 * param0, int param1, fx32 pa sub_02021E80(param0->unk_78, 2); } -static void ov83_0223F268 (UnkStruct_ov83_0223F054 * param0) +static void ov83_0223F268(UnkStruct_ov83_0223F054 *param0) { if (param0->unk_00 != 1) { return; @@ -1511,18 +1552,18 @@ static void ov83_0223F268 (UnkStruct_ov83_0223F054 * param0) sub_02021CF8(param0->unk_78, 2); } -void ov83_0223F29C (UnkStruct_ov83_0223F29C * param0) +void ov83_0223F29C(UnkStruct_ov83_0223F29C *param0) { memset(param0, 0, sizeof(UnkStruct_ov83_0223F29C)); } -void ov83_0223F2A8 (UnkStruct_ov83_0223F29C * param0) +void ov83_0223F2A8(UnkStruct_ov83_0223F29C *param0) { GF_ASSERT(param0->unk_7C == 0); memset(param0, 0, sizeof(UnkStruct_ov83_0223F29C)); } -void ov83_0223F2C4 (UnkStruct_ov83_0223F29C * param0, UnkStruct_ov83_0223D784 * param1, u32 param2, NARC * param3) +void ov83_0223F2C4(UnkStruct_ov83_0223F29C *param0, UnkStruct_ov83_0223D784 *param1, u32 param2, NARC *param3) { int v0; @@ -1545,7 +1586,7 @@ void ov83_0223F2C4 (UnkStruct_ov83_0223F29C * param0, UnkStruct_ov83_0223D784 * param0->unk_7C = 1; } -void ov83_0223F348 (UnkStruct_ov83_0223F29C * param0) +void ov83_0223F348(UnkStruct_ov83_0223F29C *param0) { int v0; @@ -1560,7 +1601,7 @@ void ov83_0223F348 (UnkStruct_ov83_0223F29C * param0) param0->unk_7C = 0; } -void ov83_0223F378 (UnkStruct_ov83_0223F29C * param0) +void ov83_0223F378(UnkStruct_ov83_0223F29C *param0) { int v0; @@ -1573,7 +1614,7 @@ void ov83_0223F378 (UnkStruct_ov83_0223F29C * param0) } } -void ov83_0223F3A0 (UnkStruct_ov83_0223F29C * param0, int param1) +void ov83_0223F3A0(UnkStruct_ov83_0223F29C *param0, int param1) { GF_ASSERT(param1 < 4); @@ -1584,7 +1625,7 @@ void ov83_0223F3A0 (UnkStruct_ov83_0223F29C * param0, int param1) } } -void ov83_0223F3D0 (UnkStruct_ov83_0223F29C * param0, int param1) +void ov83_0223F3D0(UnkStruct_ov83_0223F29C *param0, int param1) { GF_ASSERT(param1 < 4); @@ -1593,7 +1634,7 @@ void ov83_0223F3D0 (UnkStruct_ov83_0223F29C * param0, int param1) sub_02021CAC(param0->unk_3C[param1].unk_00, 0); } -BOOL ov83_0223F3F0 (const UnkStruct_ov83_0223F29C * param0, int param1) +BOOL ov83_0223F3F0(const UnkStruct_ov83_0223F29C *param0, int param1) { GF_ASSERT(param1 < 4); @@ -1604,14 +1645,14 @@ BOOL ov83_0223F3F0 (const UnkStruct_ov83_0223F29C * param0, int param1) return 0; } -static void ov83_0223F410 (UnkStruct_ov83_0223F410 * param0) +static void ov83_0223F410(UnkStruct_ov83_0223F410 *param0) { param0->unk_04 = 0; param0->unk_08 = 3; param0->unk_0C = 1; } -static void ov83_0223F420 (UnkStruct_ov83_0223F410 * param0) +static void ov83_0223F420(UnkStruct_ov83_0223F410 *param0) { if (param0->unk_0C == 0) { return; @@ -1630,13 +1671,13 @@ static void ov83_0223F420 (UnkStruct_ov83_0223F410 * param0) } } -static void ov83_0223F44C (UnkStruct_ov83_0223F410 * param0) +static void ov83_0223F44C(UnkStruct_ov83_0223F410 *param0) { param0->unk_04 = 0; param0->unk_0C = 1; } -static void ov83_0223F458 (UnkStruct_ov83_0223F410 * param0) +static void ov83_0223F458(UnkStruct_ov83_0223F410 *param0) { if (param0->unk_0C == 0) { return; @@ -1654,19 +1695,19 @@ static void ov83_0223F458 (UnkStruct_ov83_0223F410 * param0) param0->unk_04++; } -void ov83_0223F494 (UnkStruct_ov83_0223F4AC * param0, int param1) +void ov83_0223F494(UnkStruct_ov83_0223F4AC *param0, int param1) { memset(param0, 0, sizeof(UnkStruct_ov83_0223F4AC)); param0->unk_04 = param1; } -void ov83_0223F4AC (UnkStruct_ov83_0223F4AC * param0) +void ov83_0223F4AC(UnkStruct_ov83_0223F4AC *param0) { GF_ASSERT(param0->unk_00 == 0); memset(param0, 0, sizeof(UnkStruct_ov83_0223F4AC)); } -void ov83_0223F4CC (UnkStruct_ov83_0223F4AC * param0, UnkStruct_ov83_0223D784 * param1, UnkStruct_ov83_0223D95C * param2, u32 param3) +void ov83_0223F4CC(UnkStruct_ov83_0223F4AC *param0, UnkStruct_ov83_0223D784 *param1, UnkStruct_ov83_0223D95C *param2, u32 param3) { int v0; @@ -1678,7 +1719,7 @@ void ov83_0223F4CC (UnkStruct_ov83_0223F4AC * param0, UnkStruct_ov83_0223D784 * param0->unk_00 = 1; } -void ov83_0223F510 (UnkStruct_ov83_0223F4AC * param0) +void ov83_0223F510(UnkStruct_ov83_0223F4AC *param0) { int v0; @@ -1689,7 +1730,7 @@ void ov83_0223F510 (UnkStruct_ov83_0223F4AC * param0) param0->unk_00 = 0; } -void ov83_0223F52C (UnkStruct_ov83_0223F4AC * param0) +void ov83_0223F52C(UnkStruct_ov83_0223F4AC *param0) { int v0; @@ -1698,9 +1739,9 @@ void ov83_0223F52C (UnkStruct_ov83_0223F4AC * param0) } } -void ov83_0223F544 (UnkStruct_ov83_0223F4AC * param0, int param1, int param2) +void ov83_0223F544(UnkStruct_ov83_0223F4AC *param0, int param1, int param2) { - UnkStruct_ov83_0223F670 * v0; + UnkStruct_ov83_0223F670 *v0; u32 v1; fx32 v2, v3; fx32 v4, v5; @@ -1726,7 +1767,7 @@ void ov83_0223F544 (UnkStruct_ov83_0223F4AC * param0, int param1, int param2) param0->unk_08 = (param0->unk_08 + 1) % param0->unk_04; } -static UnkStruct_ov83_0223F670 * ov83_0223F650 (UnkStruct_ov83_0223F4AC * param0) +static UnkStruct_ov83_0223F670 *ov83_0223F650(UnkStruct_ov83_0223F4AC *param0) { int v0; @@ -1739,7 +1780,7 @@ static UnkStruct_ov83_0223F670 * ov83_0223F650 (UnkStruct_ov83_0223F4AC * param0 return NULL; } -static void ov83_0223F670 (UnkStruct_ov83_0223F670 * param0) +static void ov83_0223F670(UnkStruct_ov83_0223F670 *param0) { BOOL v0; @@ -1760,7 +1801,7 @@ static void ov83_0223F670 (UnkStruct_ov83_0223F670 * param0) } } -static void ov83_0223F6B4 (UnkStruct_ov83_0223F670 * param0) +static void ov83_0223F6B4(UnkStruct_ov83_0223F670 *param0) { if (param0->unk_00 == 0) { return; @@ -1770,7 +1811,7 @@ static void ov83_0223F6B4 (UnkStruct_ov83_0223F670 * param0) param0->unk_00 = 0; } -static void ov83_0223F6CC (UnkStruct_ov83_0223F670 * param0, int param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7) +static void ov83_0223F6CC(UnkStruct_ov83_0223F670 *param0, int param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7) { ov83_0223DA34(¶m0->unk_14, param2, param4, param6, 16); ov83_0223DA34(¶m0->unk_2C, param3, param5, param7, 16); @@ -1788,35 +1829,35 @@ static void ov83_0223F6CC (UnkStruct_ov83_0223F670 * param0, int param1, fx32 pa param0->unk_04 = 0; } -void ov83_0223F730 (UnkStruct_ov83_0223F770 * param0, int param1, int param2, int param3, int param4) +void ov83_0223F730(UnkStruct_ov83_0223F770 *param0, int param1, int param2, int param3, int param4) { param0->unk_00 = sub_02098FFC(param4, 1, 1, (NNS_G2D_VRAM_TYPE_2DMAIN), 2); param0->unk_04 = sub_0209916C(param0->unk_00, param3, param1, param2, 0, 0, 0, 0); } -void ov83_0223F770 (UnkStruct_ov83_0223F770 * param0) +void ov83_0223F770(UnkStruct_ov83_0223F770 *param0) { sub_02099370(param0->unk_00, param0->unk_04); sub_0209903C(param0->unk_00); } -void ov83_0223F784 (UnkStruct_ov83_0223F770 * param0) +void ov83_0223F784(UnkStruct_ov83_0223F770 *param0) { sub_02099160(param0->unk_00); } -void ov83_0223F790 (UnkStruct_ov83_0223F7A4 * param0, int param1, BGL * param2) +void ov83_0223F790(UnkStruct_ov83_0223F7A4 *param0, int param1, BGL *param2) { param0->unk_00 = sub_02015920(param1); param0->unk_04 = param2; } -void ov83_0223F7A4 (UnkStruct_ov83_0223F7A4 * param0) +void ov83_0223F7A4(UnkStruct_ov83_0223F7A4 *param0) { sub_02015938(param0->unk_00); } -void ov83_0223F7B0 (UnkStruct_ov83_0223F7A4 * param0) +void ov83_0223F7B0(UnkStruct_ov83_0223F7A4 *param0) { UnkStruct_02015958 v0; @@ -1830,7 +1871,7 @@ void ov83_0223F7B0 (UnkStruct_ov83_0223F7A4 * param0) sub_02015958(param0->unk_00, &v0); } -u32 ov83_0223F7DC (UnkStruct_ov83_0223F7A4 * param0) +u32 ov83_0223F7DC(UnkStruct_ov83_0223F7A4 *param0) { u32 v0; diff --git a/src/overlay083/ov83_0223F7F4.c b/src/overlay083/ov83_0223F7F4.c index ff920a358b..1112f98f23 100644 --- a/src/overlay083/ov83_0223F7F4.c +++ b/src/overlay083/ov83_0223F7F4.c @@ -1,11 +1,11 @@ +#include "overlay083/ov83_0223F7F4.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_berry_data_decl.h" - #include "struct_defs/struct_0202A93C.h" + #include "overlay083/struct_ov83_0223DB4C_sub1.h" #include "overlay083/struct_ov83_0223F820.h" #include "overlay083/struct_ov83_0223F88C.h" @@ -19,14 +19,14 @@ #include "overlay083/struct_ov83_0223FE50.h" #include "overlay083/struct_ov83_022401AC.h" +#include "berry_data.h" +#include "core_sys.h" #include "heap.h" +#include "poffin.h" #include "unk_0201D15C.h" #include "unk_0201E3BC.h" -#include "poffin.h" -#include "berry_data.h" -#include "overlay083/ov83_0223F7F4.h" -s32 ov83_0223F7F4 (int param0, int param1, int param2, int param3, int param4, int param5) +s32 ov83_0223F7F4(int param0, int param1, int param2, int param3, int param4, int param5) { int v0; int v1; @@ -44,7 +44,7 @@ s32 ov83_0223F7F4 (int param0, int param1, int param2, int param3, int param4, i return v3; } -void ov83_0223F820 (UnkStruct_ov83_0223F820 * param0) +void ov83_0223F820(UnkStruct_ov83_0223F820 *param0) { memset(param0, 0, sizeof(UnkStruct_ov83_0223F820)); @@ -54,7 +54,7 @@ void ov83_0223F820 (UnkStruct_ov83_0223F820 * param0) param0->unk_0C = 96; } -void ov83_0223F83C (UnkStruct_ov83_0223F820 * param0) +void ov83_0223F83C(UnkStruct_ov83_0223F820 *param0) { s32 v0; @@ -74,7 +74,7 @@ void ov83_0223F83C (UnkStruct_ov83_0223F820 * param0) param0->unk_14 = gCoreSys.touchHeld; } -void ov83_0223F88C (UnkStruct_ov83_0223F88C * param0, UnkStruct_ov83_0223F820 * param1) +void ov83_0223F88C(UnkStruct_ov83_0223F88C *param0, UnkStruct_ov83_0223F820 *param1) { param0->unk_00 = param1->unk_00; param0->unk_01 = param1->unk_04; @@ -100,7 +100,7 @@ static const u16 Unk_ov83_0224059C[3] = { 80, }; -static u32 ov83_0223F8AC (UnkStruct_ov83_0223F8AC * param0, int param1, int param2) +static u32 ov83_0223F8AC(UnkStruct_ov83_0223F8AC *param0, int param1, int param2) { fx32 v0; u32 v1; @@ -120,16 +120,16 @@ static u32 ov83_0223F8AC (UnkStruct_ov83_0223F8AC * param0, int param1, int para v2 = FX_Mul(v0, 64 * FX32_ONE) >> FX32_SHIFT; v2 += 8; - if ((v3 < 16)) { + if (v3 < 16) { return 1; - } else if ((v3 > v2)) { + } else if (v3 > v2) { return 2; } return 0; } -u16 ov83_0223F900 (UnkStruct_ov83_0223F8AC * param0, const UnkStruct_ov83_0223FE50 * param1, u32 param2, u32 param3) +u16 ov83_0223F900(UnkStruct_ov83_0223F8AC *param0, const UnkStruct_ov83_0223FE50 *param1, u32 param2, u32 param3) { int v0; s32 v1; @@ -213,29 +213,29 @@ u16 ov83_0223F900 (UnkStruct_ov83_0223F8AC * param0, const UnkStruct_ov83_0223FE return param0->unk_08 & 0xffff; } -u16 ov83_0223FA84 (const UnkStruct_ov83_0223F8AC * param0) +u16 ov83_0223FA84(const UnkStruct_ov83_0223F8AC *param0) { return param0->unk_08 & 0xffff; } -u32 ov83_0223FA8C (const UnkStruct_ov83_0223F8AC * param0) +u32 ov83_0223FA8C(const UnkStruct_ov83_0223F8AC *param0) { return param0->unk_04; } -void ov83_0223FA90 (UnkStruct_ov83_0223F8AC * param0, int param1) +void ov83_0223FA90(UnkStruct_ov83_0223F8AC *param0, int param1) { GF_ASSERT(param1 < 3); param0->unk_00 = param1; param0->unk_04 = 0; } -s32 ov83_0223FAA8 (const UnkStruct_ov83_0223F8AC * param0) +s32 ov83_0223FAA8(const UnkStruct_ov83_0223F8AC *param0) { return param0->unk_0C; } -void ov83_0223FAAC (UnkStruct_ov83_0223FAAC * param0, s32 param1, int param2) +void ov83_0223FAAC(UnkStruct_ov83_0223FAAC *param0, s32 param1, int param2) { param0->unk_18 = 0; param0->unk_10 = 0; @@ -275,7 +275,7 @@ void ov83_0223FAAC (UnkStruct_ov83_0223FAAC * param0, s32 param1, int param2) } } -BOOL ov83_0223FB30 (s32 param0, int param1) +BOOL ov83_0223FB30(s32 param0, int param1) { int v0 = MATH_IAbs(param0); @@ -290,7 +290,7 @@ BOOL ov83_0223FB30 (s32 param0, int param1) return 0; } -BOOL ov83_0223FB50 (s32 param0, int param1) +BOOL ov83_0223FB50(s32 param0, int param1) { int v0 = MATH_IAbs(param0); @@ -301,7 +301,7 @@ BOOL ov83_0223FB50 (s32 param0, int param1) return 0; } -fx32 ov83_0223FB68 (u16 param0, int param1) +fx32 ov83_0223FB68(u16 param0, int param1) { fx32 v0; fx32 v1; @@ -319,22 +319,22 @@ fx32 ov83_0223FB68 (u16 param0, int param1) return v1 + FX32_ONE; } -void ov83_0223FBA4 (UnkStruct_ov83_0223FBA4 * param0) +void ov83_0223FBA4(UnkStruct_ov83_0223FBA4 *param0) { memset(param0, 0, sizeof(UnkStruct_ov83_0223FBA4)); param0->unk_08 = 2; param0->unk_04 = -1; } -void ov83_0223FBBC (UnkStruct_ov83_0223FBA4 * param0, int param1, s32 param2, BOOL param3) +void ov83_0223FBBC(UnkStruct_ov83_0223FBA4 *param0, int param1, s32 param2, BOOL param3) { int v0; u32 v1; u32 v2; static u8 v3[3] = { - {30 * 5}, - {30 * 4}, - {30 * 3}, + { 30 * 5 }, + { 30 * 4 }, + { 30 * 3 }, }; param0->unk_0C = 0; @@ -376,7 +376,7 @@ void ov83_0223FBBC (UnkStruct_ov83_0223FBA4 * param0, int param1, s32 param2, BO param0->unk_04--; } -BOOL ov83_0223FC3C (const UnkStruct_ov83_0223FBA4 * param0, s32 param1) +BOOL ov83_0223FC3C(const UnkStruct_ov83_0223FBA4 *param0, s32 param1) { if (((param1 < 0) && (param0->unk_00 == 0)) || ((param1 > 0) && (param0->unk_00 == 1))) { return 1; @@ -385,7 +385,7 @@ BOOL ov83_0223FC3C (const UnkStruct_ov83_0223FBA4 * param0, s32 param1) return 0; } -BOOL ov83_0223FC58 (UnkStruct_ov83_0223FC58 * param0, UnkStruct_ov83_0223F8AC * param1) +BOOL ov83_0223FC58(UnkStruct_ov83_0223FC58 *param0, UnkStruct_ov83_0223F8AC *param1) { static const u8 v0[3] = { 16, 16, 16 @@ -438,11 +438,11 @@ BOOL ov83_0223FC58 (UnkStruct_ov83_0223FC58 * param0, UnkStruct_ov83_0223F8AC * return 0; } -void ov83_0223FCE8 (UnkStruct_ov83_0223FDB0_sub1 * param0, const UnkStruct_ov83_0223FE50 * param1, int param2, s32 param3, int param4, BOOL param5, BOOL param6) +void ov83_0223FCE8(UnkStruct_ov83_0223FDB0_sub1 *param0, const UnkStruct_ov83_0223FE50 *param1, int param2, s32 param3, int param4, BOOL param5, BOOL param6) { u32 v0; - const UnkStruct_ov83_0223FCE8 * v1 = ¶m1->unk_90[0].unk_08; - const UnkStruct_ov83_0223F88C * v2; + const UnkStruct_ov83_0223FCE8 *v1 = ¶m1->unk_90[0].unk_08; + const UnkStruct_ov83_0223F88C *v2; int v3; int v4; @@ -496,7 +496,7 @@ void ov83_0223FCE8 (UnkStruct_ov83_0223FDB0_sub1 * param0, const UnkStruct_ov83_ } } -void ov83_0223FDB0 (UnkStruct_ov83_0223FDB0 * param0) +void ov83_0223FDB0(UnkStruct_ov83_0223FDB0 *param0) { memset(param0, 0, sizeof(UnkStruct_ov83_0223FDB0)); ov83_0223FBA4(¶m0->unk_0C); @@ -504,7 +504,7 @@ void ov83_0223FDB0 (UnkStruct_ov83_0223FDB0 * param0) ov83_0223FBBC(¶m0->unk_0C, 0, 0, 0); } -BOOL ov83_0223FDD8 (UnkStruct_ov83_0223FDB0 * param0, const UnkStruct_ov83_0223FE50 * param1, u32 param2) +BOOL ov83_0223FDD8(UnkStruct_ov83_0223FDB0 *param0, const UnkStruct_ov83_0223FE50 *param1, u32 param2) { s32 v0; BOOL v1; @@ -526,10 +526,10 @@ BOOL ov83_0223FDD8 (UnkStruct_ov83_0223FDB0 * param0, const UnkStruct_ov83_0223F return 0; } -void ov83_0223FE50 (UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FE50 * param1, int param2) +void ov83_0223FE50(UnkStruct_ov83_0223FDB0 *param0, UnkStruct_ov83_0223FE50 *param1, int param2) { int v0; - UnkStruct_ov83_0223FCE8 * v1 = ¶m1->unk_04.unk_08; + UnkStruct_ov83_0223FCE8 *v1 = ¶m1->unk_04.unk_08; s32 v2; for (v0 = 0; v0 < 4; v0++) { @@ -563,10 +563,10 @@ void ov83_0223FE50 (UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FE50 * v1->unk_0F = param0->unk_58.unk_0C; } -void ov83_0223FEC0 (UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FE50 * param1, int param2) +void ov83_0223FEC0(UnkStruct_ov83_0223FDB0 *param0, UnkStruct_ov83_0223FE50 *param1, int param2) { int v0; - UnkStruct_ov83_0223FCE8 * v1 = ¶m1->unk_04.unk_08; + UnkStruct_ov83_0223FCE8 *v1 = ¶m1->unk_04.unk_08; s32 v2; for (v0 = 0; v0 < 4; v0++) { @@ -612,7 +612,7 @@ void ov83_0223FEC0 (UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FE50 * } } -void ov83_0223FF44 (UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FCE8 * param1, int param2) +void ov83_0223FF44(UnkStruct_ov83_0223FDB0 *param0, UnkStruct_ov83_0223FCE8 *param1, int param2) { int v0; s32 v1; @@ -642,7 +642,7 @@ void ov83_0223FF44 (UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FCE8 * param1->unk_0F = param0->unk_58.unk_0C; } -void ov83_0223FFA0 (UnkStruct_ov83_0223FDB0 * param0) +void ov83_0223FFA0(UnkStruct_ov83_0223FDB0 *param0) { param0->unk_00++; } @@ -654,7 +654,7 @@ static const u8 Unk_ov83_02240598[4] = { 10 }; -static int ov83_0223FFA8 (u32 param0, u32 param1) +static int ov83_0223FFA8(u32 param0, u32 param1) { int v0; @@ -667,12 +667,12 @@ static int ov83_0223FFA8 (u32 param0, u32 param1) return v0; } -void ov83_0223FFD4 (UnkStruct_ov83_0223FDB0 * param0, Poffin * param1, const UnkStruct_ov83_0223FE50 * param2, u32 param3, u32 param4) +void ov83_0223FFD4(UnkStruct_ov83_0223FDB0 *param0, Poffin *param1, const UnkStruct_ov83_0223FE50 *param2, u32 param3, u32 param4) { - BerryData * v0; + BerryData *v0; int v1, v2; - const UnkStruct_ov83_0223DB4C_sub1 * v3 = param2->unk_34.unk_00; - s32 v4[5] = {0, 0, 0, 0, 0}; + const UnkStruct_ov83_0223DB4C_sub1 *v3 = param2->unk_34.unk_00; + s32 v4[5] = { 0, 0, 0, 0, 0 }; s32 v5 = 0; s32 v6[5]; s32 v7; @@ -787,9 +787,9 @@ void ov83_0223FFD4 (UnkStruct_ov83_0223FDB0 * param0, Poffin * param1, const Unk param0->unk_08 = Poffin_CalcLevel(param1); } -void ov83_022401AC (UnkStruct_ov83_0223FDB0 * param0, UnkStruct_ov83_0223FE50 * param1, int param2) +void ov83_022401AC(UnkStruct_ov83_0223FDB0 *param0, UnkStruct_ov83_0223FE50 *param1, int param2) { - UnkStruct_ov83_022401AC * v0 = ¶m1->unk_20; + UnkStruct_ov83_022401AC *v0 = ¶m1->unk_20; int v1; v0->unk_00 = param0->unk_30.unk_04; diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index b8657f3771..b01e72d240 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -1,165 +1,162 @@ +#include "overlay084/ov84_0223B5A0.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - -#include "overlay084/const_ov84_02241130.h" - -#include "touch_screen.h" #include "struct_defs/struct_0202D7B0.h" -#include "functypes/funcptr_02069238.h" #include "struct_defs/struct_0207CB08.h" #include "struct_defs/struct_02099F80.h" + +#include "functypes/funcptr_02069238.h" +#include "overlay084/const_ov84_02241130.h" +#include "overlay084/funcptr_ov84_0223D730.h" +#include "overlay084/ov84_0223F040.h" +#include "overlay084/ov84_022403F4.h" #include "overlay084/struct_ov84_0223B5A0.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_0223BE5C.h" #include "overlay084/struct_ov84_0223C920.h" -#include "overlay084/funcptr_ov84_0223D730.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "bag.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "string_template.h" +#include "touch_screen.h" +#include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_0202D7A8.h" #include "unk_020393C8.h" #include "unk_020683F4.h" #include "unk_0207CB08.h" -#include "item.h" -#include "bag.h" #include "unk_0208C098.h" -#include "overlay084/ov84_0223B5A0.h" -#include "overlay084/ov84_0223F040.h" -#include "overlay084/ov84_022403F4.h" typedef struct { - const u8 * unk_00; - const TouchScreenRect * unk_04; + const u8 *unk_00; + const TouchScreenRect *unk_04; } UnkStruct_ov84_022410C8; -typedef int (* UnkFuncPtr_ov84_0223DA04)(UnkStruct_ov84_0223B5A0 *); +typedef int (*UnkFuncPtr_ov84_0223DA04)(UnkStruct_ov84_0223B5A0 *); -static void ov84_0223B9AC(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223BA14(void * param0); +static void ov84_0223B9AC(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223BA14(void *param0); static void ov84_0223BA3C(void); -static void ov84_0223BA5C(BGL * param0); -static void ov84_0223BBC4(BGL * param0); -static void ov84_0223BC1C(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_0223C5B8(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_0223C750(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223D730(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223BFBC(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223C194(u16 * param0, u16 * param1, u8 param2); -static void ov84_0223C1D0(u16 * param0, u16 * param1, u8 param2, u8 param3); -static void ov84_0223C224(UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2); -static void ov84_0223C2AC(BmpList * param0, u32 param1, u8 param2); -static void ov84_0223C3B8(BmpList * param0, u32 param1, u8 param2); -static void ov84_0223C4E0(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223BE24(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_02240C30(UnkStruct_ov84_0223B5A0 * param0, u8 param1); -static void ov84_0223C720(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223CDB0(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223D0FC(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223CF20(UnkStruct_ov84_0223B5A0 * param0, u8 param1, u8 param2); -static u8 ov84_0223CD40(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223CE08(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_0223CBD8(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223CF20(UnkStruct_ov84_0223B5A0 * param0, u8 param1, u8 param2); -static void ov84_0223D0BC(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_0223D244(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223D2A0(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_0223D2F8(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223D42C(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223D484(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223D4E8(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223C848(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223C868(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223C89C(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_0223C920(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_0223CA5C(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_0223CE60(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_0223CBD8(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223BDB4(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223D5AC(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223C158(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223C178(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223D858(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223C51C(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E3BC(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E9B0(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E588(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E5C4(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E7A8(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E7CC(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E920(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223D8EC(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223DE78(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223DE98(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223DEB8(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223DF0C(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223DFF8(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E01C(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E158(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E18C(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E254(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E1E4(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E220(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E27C(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223E36C(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223EA18(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223BEAC(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223BF68(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223D94C(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223DA04(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223DA14(UnkStruct_ov84_0223B5A0 * param0); -static BOOL ov84_0223DBF4(UnkStruct_ov84_0223B5A0 * param0, u16 param1); -static Strbuf* ov84_0223DC9C(UnkStruct_ov84_0223B5A0 * param0, u16 param1); -static void ov84_0223DCF8(UnkStruct_ov84_0223B5A0 * param0); -static int ov84_0223DDD0(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223DCF8(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223D7E8(UnkStruct_ov84_0223B5A0 * param0, u8 param1); -static BOOL ov84_0223D1F4(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223CFB0(UnkStruct_ov84_0223B5A0 * param0, u8 param1); -static void ov84_0223D014(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_0223EB08(UnkStruct_ov84_0223B5A0 * param0, s8 param1); -static BOOL ov84_0223EF4C(UnkStruct_ov84_0223B5A0 * param0); -static BOOL ov84_0223EB84(UnkStruct_ov84_0223B5A0 * param0, u16 param1); -static BOOL ov84_0223ED14(UnkStruct_ov84_0223B5A0 * param0); -static BOOL ov84_0223EE30(UnkStruct_ov84_0223B5A0 * param0); -static BOOL ov84_0223EFD0(UnkStruct_ov84_0223B5A0 * param0, s16 * param1, u16 param2); -static BOOL ov84_0223ED64(UnkStruct_ov84_0223B5A0 * param0, u16 param1); -static BOOL ov84_0223EE80(UnkStruct_ov84_0223B5A0 * param0, u16 param1); -static BOOL ov84_0223EF9C(UnkStruct_ov84_0223B5A0 * param0, u8 param1); +static void ov84_0223BA5C(BGL *param0); +static void ov84_0223BBC4(BGL *param0); +static void ov84_0223BC1C(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_0223C5B8(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_0223C750(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223D730(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223BFBC(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223C194(u16 *param0, u16 *param1, u8 param2); +static void ov84_0223C1D0(u16 *param0, u16 *param1, u8 param2, u8 param3); +static void ov84_0223C224(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u16 param2); +static void ov84_0223C2AC(BmpList *param0, u32 param1, u8 param2); +static void ov84_0223C3B8(BmpList *param0, u32 param1, u8 param2); +static void ov84_0223C4E0(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223BE24(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_02240C30(UnkStruct_ov84_0223B5A0 *param0, u8 param1); +static void ov84_0223C720(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223CDB0(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223D0FC(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223CF20(UnkStruct_ov84_0223B5A0 *param0, u8 param1, u8 param2); +static u8 ov84_0223CD40(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223CE08(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_0223CBD8(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223CF20(UnkStruct_ov84_0223B5A0 *param0, u8 param1, u8 param2); +static void ov84_0223D0BC(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_0223D244(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223D2A0(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_0223D2F8(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223D42C(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223D484(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223D4E8(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223C848(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223C868(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223C89C(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_0223C920(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_0223CA5C(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_0223CE60(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_0223CBD8(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223BDB4(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223D5AC(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223C158(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223C178(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223D858(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223C51C(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E3BC(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E9B0(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E588(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E5C4(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E7A8(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E7CC(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E920(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223D8EC(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223DE78(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223DE98(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223DEB8(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223DF0C(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223DFF8(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E01C(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E158(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E18C(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E254(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E1E4(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E220(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E27C(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223E36C(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223EA18(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223BEAC(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223BF68(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223D94C(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223DA04(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223DA14(UnkStruct_ov84_0223B5A0 *param0); +static BOOL ov84_0223DBF4(UnkStruct_ov84_0223B5A0 *param0, u16 param1); +static Strbuf *ov84_0223DC9C(UnkStruct_ov84_0223B5A0 *param0, u16 param1); +static void ov84_0223DCF8(UnkStruct_ov84_0223B5A0 *param0); +static int ov84_0223DDD0(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223DCF8(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223D7E8(UnkStruct_ov84_0223B5A0 *param0, u8 param1); +static BOOL ov84_0223D1F4(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223CFB0(UnkStruct_ov84_0223B5A0 *param0, u8 param1); +static void ov84_0223D014(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_0223EB08(UnkStruct_ov84_0223B5A0 *param0, s8 param1); +static BOOL ov84_0223EF4C(UnkStruct_ov84_0223B5A0 *param0); +static BOOL ov84_0223EB84(UnkStruct_ov84_0223B5A0 *param0, u16 param1); +static BOOL ov84_0223ED14(UnkStruct_ov84_0223B5A0 *param0); +static BOOL ov84_0223EE30(UnkStruct_ov84_0223B5A0 *param0); +static BOOL ov84_0223EFD0(UnkStruct_ov84_0223B5A0 *param0, s16 *param1, u16 param2); +static BOOL ov84_0223ED64(UnkStruct_ov84_0223B5A0 *param0, u16 param1); +static BOOL ov84_0223EE80(UnkStruct_ov84_0223B5A0 *param0, u16 param1); +static BOOL ov84_0223EF9C(UnkStruct_ov84_0223B5A0 *param0, u8 param1); const OverlayManagerTemplate Unk_ov84_02241130 = { ov84_0223B5A0, @@ -210,15 +207,15 @@ static const u8 Unk_ov84_02241140[] = { }; static const TouchScreenRect Unk_ov84_02240FE8[] = { - {0x20, 0x47, 0x8, 0x2F}, - {0x50, 0x77, 0x10, 0x37}, - {0x78, 0x9F, 0x28, 0x4F}, - {0x90, 0xB7, 0x50, 0x77}, - {0x90, 0xB7, 0x88, 0xAF}, - {0x78, 0x9F, 0xB0, 0xD7}, - {0x50, 0x77, 0xC8, 0xEF}, - {0x20, 0x47, 0xD0, 0xF7}, - {0xFF, 0x0, 0x0, 0x0} + { 0x20, 0x47, 0x8, 0x2F }, + { 0x50, 0x77, 0x10, 0x37 }, + { 0x78, 0x9F, 0x28, 0x4F }, + { 0x90, 0xB7, 0x50, 0x77 }, + { 0x90, 0xB7, 0x88, 0xAF }, + { 0x78, 0x9F, 0xB0, 0xD7 }, + { 0x50, 0x77, 0xC8, 0xEF }, + { 0x20, 0x47, 0xD0, 0xF7 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const u8 Unk_ov84_02241110[] = { @@ -233,11 +230,11 @@ static const u8 Unk_ov84_02241110[] = { }; static const TouchScreenRect Unk_ov84_02240ED0[] = { - {0x20, 0x47, 0x8, 0x2F}, - {0x78, 0x9F, 0x28, 0x4F}, - {0x78, 0x9F, 0xB0, 0xD7}, - {0x20, 0x47, 0xD0, 0xF7}, - {0xFF, 0x0, 0x0, 0x0} + { 0x20, 0x47, 0x8, 0x2F }, + { 0x78, 0x9F, 0x28, 0x4F }, + { 0x78, 0x9F, 0xB0, 0xD7 }, + { 0x20, 0x47, 0xD0, 0xF7 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const u8 Unk_ov84_02240E94[] = { @@ -246,8 +243,8 @@ static const u8 Unk_ov84_02240E94[] = { }; static const TouchScreenRect Unk_ov84_02240EA0[] = { - {0x90, 0xB7, 0x88, 0xAF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x90, 0xB7, 0x88, 0xAF }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const u8 Unk_ov84_02241120[] = { @@ -268,26 +265,26 @@ static const u8 Unk_ov84_02241120[] = { }; static const TouchScreenRect Unk_ov84_02240FC8[] = { - {0x50, 0x77, 0x10, 0x37}, - {0x78, 0x9F, 0x28, 0x4F}, - {0x90, 0xB7, 0x50, 0x77}, - {0x90, 0xB7, 0x88, 0xAF}, - {0x78, 0x9F, 0xB0, 0xD7}, - {0x50, 0x77, 0xC8, 0xEF}, - {0x20, 0x47, 0xD0, 0xF7}, - {0xFF, 0x0, 0x0, 0x0} + { 0x50, 0x77, 0x10, 0x37 }, + { 0x78, 0x9F, 0x28, 0x4F }, + { 0x90, 0xB7, 0x50, 0x77 }, + { 0x90, 0xB7, 0x88, 0xAF }, + { 0x78, 0x9F, 0xB0, 0xD7 }, + { 0x50, 0x77, 0xC8, 0xEF }, + { 0x20, 0x47, 0xD0, 0xF7 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const UnkStruct_ov84_022410C8 Unk_ov84_022410C8[] = { - {NULL, NULL}, - {Unk_ov84_02240E94, Unk_ov84_02240EA0}, - {NULL, NULL}, - {NULL, NULL}, - {Unk_ov84_02241110, Unk_ov84_02240ED0}, - {NULL, NULL}, - {NULL, NULL}, - {Unk_ov84_02241120, Unk_ov84_02240FC8}, - {Unk_ov84_02241140, Unk_ov84_02240FE8} + { NULL, NULL }, + { Unk_ov84_02240E94, Unk_ov84_02240EA0 }, + { NULL, NULL }, + { NULL, NULL }, + { Unk_ov84_02241110, Unk_ov84_02240ED0 }, + { NULL, NULL }, + { NULL, NULL }, + { Unk_ov84_02241120, Unk_ov84_02240FC8 }, + { Unk_ov84_02241140, Unk_ov84_02240FE8 } }; static const u8 Unk_ov84_02241118[] = { @@ -373,25 +370,25 @@ static const u16 Unk_ov84_02241096[] = { }; static const TouchScreenRect Unk_ov84_02240E98[] = { - {0x38, 0x67, 0x68, 0x97}, - {0xFF, 0x0, 0x0, 0x0} + { 0x38, 0x67, 0x68, 0x97 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenHitTable Unk_ov84_02240EA8[] = { - {0xFE, 0x80, 0x50, 0x1A}, - {0xFE, 0x80, 0x50, 0x40}, - {0xFF, 0x0, 0x0, 0x0} + { 0xFE, 0x80, 0x50, 0x1A }, + { 0xFE, 0x80, 0x50, 0x40 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenHitTable Unk_ov84_02240EB4[] = { - {0xFE, 0x80, 0x50, 0x10}, - {0xFE, 0x80, 0x50, 0x50}, - {0xFF, 0x0, 0x0, 0x0} + { 0xFE, 0x80, 0x50, 0x10 }, + { 0xFE, 0x80, 0x50, 0x50 }, + { 0xFF, 0x0, 0x0, 0x0 } }; -int ov84_0223B5A0 (OverlayManager * param0, int * param1) +int ov84_0223B5A0(OverlayManager *param0, int *param1) { - UnkStruct_ov84_0223B5A0 * v0; + UnkStruct_ov84_0223B5A0 *v0; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -455,9 +452,9 @@ int ov84_0223B5A0 (OverlayManager * param0, int * param1) return 1; } -int ov84_0223B76C (OverlayManager * param0, int * param1) +int ov84_0223B76C(OverlayManager *param0, int *param1) { - UnkStruct_ov84_0223B5A0 * v0 = OverlayManager_Data(param0); + UnkStruct_ov84_0223B5A0 *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -568,9 +565,9 @@ int ov84_0223B76C (OverlayManager * param0, int * param1) return 0; } -int ov84_0223B900 (OverlayManager * param0, int * param1) +int ov84_0223B900(OverlayManager *param0, int *param1) { - UnkStruct_ov84_0223B5A0 * v0 = OverlayManager_Data(param0); + UnkStruct_ov84_0223B5A0 *v0 = OverlayManager_Data(param0); ov84_02240A88(v0); ov84_0223C4E0(v0); @@ -601,34 +598,34 @@ int ov84_0223B900 (OverlayManager * param0, int * param1) return 1; } -static void ov84_0223B9AC (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223B9AC(UnkStruct_ov84_0223B5A0 *param0) { param0->unk_C8 = SaveData_GetBag(param0->unk_C4->unk_00); param0->unk_CC = SaveData_GetTrainerInfo(param0->unk_C4->unk_00); param0->unk_D0 = SaveData_Options(param0->unk_C4->unk_00); } -static UnkStruct_0202D7B0 * ov84_0223B9E4 (UnkStruct_ov84_0223B5A0 * param0) +static UnkStruct_0202D7B0 *ov84_0223B9E4(UnkStruct_ov84_0223B5A0 *param0) { return sub_0202D834(param0->unk_C4->unk_00); } -static void ov84_0223B9F4 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +static void ov84_0223B9F4(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { - u8 * v0; + u8 *v0; v0 = sub_0202D9CC(ov84_0223B9E4(param0)); *v0 = param1; } -static void ov84_0223BA04 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +static void ov84_0223BA04(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { sub_0202D9EC(ov84_0223B9E4(param0), param1); } -static void ov84_0223BA14 (void * param0) +static void ov84_0223BA14(void *param0) { - UnkStruct_ov84_0223B5A0 * v0 = param0; + UnkStruct_ov84_0223B5A0 *v0 = param0; sub_0201C2B8(v0->unk_00); sub_0201DCAC(); @@ -636,7 +633,7 @@ static void ov84_0223BA14 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov84_0223BA3C (void) +static void ov84_0223BA3C(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -654,7 +651,7 @@ static void ov84_0223BA3C (void) GXLayers_SetBanks(&v0); } -static void ov84_0223BA5C (BGL * param0) +static void ov84_0223BA5C(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -802,7 +799,7 @@ static void ov84_0223BA5C (BGL * param0) sub_02019690(4, 32, 0, 6); } -static void ov84_0223BBC4 (BGL * param0) +static void ov84_0223BBC4(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); @@ -816,7 +813,7 @@ static void ov84_0223BBC4 (BGL * param0) Heap_FreeToHeapExplicit(6, param0); } -static void ov84_0223BC1C (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223BC1C(UnkStruct_ov84_0223B5A0 *param0) { param0->unk_D4 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_BAG_GRA, 6); @@ -837,7 +834,7 @@ static void ov84_0223BC1C (UnkStruct_ov84_0223B5A0 * param0) sub_02007130(param0->unk_D4, 18, 4, 16 * 2 * 2, 0x20 * 2, 6); } -static void ov84_0223BDB4 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223BDB4(UnkStruct_ov84_0223B5A0 *param0) { param0->unk_114 = MessageLoader_Init(0, 26, 7, 6); param0->unk_110 = sub_0200C440(1, 2, 0, 6); @@ -847,7 +844,7 @@ static void ov84_0223BDB4 (UnkStruct_ov84_0223B5A0 * param0) param0->unk_3F8 = Strbuf_Init(256, 6); } -static void ov84_0223BE24 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223BE24(UnkStruct_ov84_0223B5A0 *param0) { u8 v0; @@ -860,9 +857,9 @@ static void ov84_0223BE24 (UnkStruct_ov84_0223B5A0 * param0) } } -u16 ov84_0223BE5C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2) +u16 ov84_0223BE5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u16 param2) { - UnkStruct_ov84_0223BE5C * v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; + UnkStruct_ov84_0223BE5C *v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; if (param2 == 0) { return v0->unk_00[param1].item; @@ -871,19 +868,19 @@ u16 ov84_0223BE5C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2) return v0->unk_00[param1].quantity; } -static void ov84_0223BE84 (MessageLoader * param0, Strbuf *param1, u16 param2, u32 param3) +static void ov84_0223BE84(MessageLoader *param0, Strbuf *param1, u16 param2, u32 param3) { MessageLoader_GetStrbuf(param0, param2, param1); } -static void ov84_0223BE94 (MessageLoader * param0, Strbuf *param1, u16 param2, u32 param3) +static void ov84_0223BE94(MessageLoader *param0, Strbuf *param1, u16 param2, u32 param3) { MessageLoader_GetStrbuf(param0, Item_MoveForTMHM(param2), param1); } -static void ov84_0223BEAC (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223BEAC(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0; + UnkStruct_ov84_0223BE5C *v0; u16 v1, v2; param0->unk_C4->unk_64 = 0; @@ -932,9 +929,9 @@ static void ov84_0223BEAC (UnkStruct_ov84_0223B5A0 * param0) } } -static void ov84_0223BF68 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223BF68(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0; + UnkStruct_ov84_0223BE5C *v0; u32 v1; if (param0->unk_C4->unk_6C == NULL) { @@ -954,9 +951,9 @@ static void ov84_0223BF68 (UnkStruct_ov84_0223B5A0 * param0) sub_0207D9D4(param0->unk_C4->unk_6C, v0[param0->unk_C4->unk_64].unk_08); } -static void ov84_0223BFBC (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223BFBC(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0; + UnkStruct_ov84_0223BE5C *v0; u32 v1; v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; @@ -1004,7 +1001,7 @@ static void ov84_0223BFBC (UnkStruct_ov84_0223B5A0 * param0) } } -static void ov84_0223C158 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223C158(UnkStruct_ov84_0223B5A0 *param0) { u32 v0; @@ -1013,7 +1010,7 @@ static void ov84_0223C158 (UnkStruct_ov84_0223B5A0 * param0) } } -static void ov84_0223C178 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223C178(UnkStruct_ov84_0223B5A0 *param0) { u32 v0; @@ -1022,7 +1019,7 @@ static void ov84_0223C178 (UnkStruct_ov84_0223B5A0 * param0) } } -static void ov84_0223C194 (u16 * param0, u16 * param1, u8 param2) +static void ov84_0223C194(u16 *param0, u16 *param1, u8 param2) { u8 v0; @@ -1045,7 +1042,7 @@ static void ov84_0223C194 (u16 * param0, u16 * param1, u8 param2) } } -static void ov84_0223C1D0 (u16 * param0, u16 * param1, u8 param2, u8 param3) +static void ov84_0223C1D0(u16 *param0, u16 *param1, u8 param2, u8 param3) { u8 v0; u8 v1; @@ -1071,7 +1068,7 @@ static void ov84_0223C1D0 (u16 * param0, u16 * param1, u8 param2, u8 param3) } } -static void ov84_0223C224 (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2) +static void ov84_0223C224(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u16 param2) { UnkStruct_ov84_02240FA8 v0; @@ -1091,9 +1088,9 @@ static void ov84_0223C224 (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 par sub_0201A9A4(¶m0->unk_04[0]); } -static void ov84_0223C2AC (BmpList * param0, u32 param1, u8 param2) +static void ov84_0223C2AC(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov84_0223B5A0 * v0 = (UnkStruct_ov84_0223B5A0 *)sub_02001504(param0, 19); + UnkStruct_ov84_0223B5A0 *v0 = (UnkStruct_ov84_0223B5A0 *)sub_02001504(param0, 19); if (param2 != 1) { switch (v0->unk_482) { @@ -1123,7 +1120,7 @@ static void ov84_0223C2AC (BmpList * param0, u32 param1, u8 param2) BGL_FillWindow(&v0->unk_04[1], 0); if (param1 != 0xfffffffe) { - UnkStruct_ov84_0223BE5C * v1; + UnkStruct_ov84_0223BE5C *v1; v1 = &v0->unk_C4->unk_04[v0->unk_C4->unk_64]; ov84_0223F528(v0, v1->unk_00[param1].item); @@ -1138,10 +1135,10 @@ static void ov84_0223C2AC (BmpList * param0, u32 param1, u8 param2) } } -static void ov84_0223C3B8 (BmpList * param0, u32 param1, u8 param2) +static void ov84_0223C3B8(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov84_0223B5A0 * v0 = (UnkStruct_ov84_0223B5A0 *)sub_02001504(param0, 19); - UnkStruct_ov84_0223BE5C * v1 = &v0->unk_C4->unk_04[v0->unk_C4->unk_64]; + UnkStruct_ov84_0223B5A0 *v0 = (UnkStruct_ov84_0223B5A0 *)sub_02001504(param0, 19); + UnkStruct_ov84_0223BE5C *v1 = &v0->unk_C4->unk_04[v0->unk_C4->unk_64]; if ((v0->unk_47A == 1) && (v0->unk_47C == param1)) { sub_0200147C(param0, 8, 0, 9); @@ -1178,14 +1175,14 @@ static void ov84_0223C3B8 (BmpList * param0, u32 param1, u8 param2) } } -static void ov84_0223C4E0 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223C4E0(UnkStruct_ov84_0223B5A0 *param0) { sub_02001384(param0->unk_15C, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04); sub_02013A3C(param0->unk_160); param0->unk_15C = NULL; } -static int ov84_0223C51C (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223C51C(UnkStruct_ov84_0223B5A0 *param0) { ov84_0223D0FC(param0); @@ -1226,9 +1223,9 @@ static int ov84_0223C51C (UnkStruct_ov84_0223B5A0 * param0) return 1; } -static u8 ov84_0223C5B8 (UnkStruct_ov84_0223B5A0 * param0) +static u8 ov84_0223C5B8(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0; + UnkStruct_ov84_0223BE5C *v0; u32 v1; u16 v2, v3; @@ -1261,8 +1258,7 @@ static u8 ov84_0223C5B8 (UnkStruct_ov84_0223B5A0 * param0) } switch (v1) { - case 0xffffffff: - { + case 0xffffffff: { u8 v4 = sub_020014F0(param0->unk_15C); if (v4 == 1) { @@ -1270,8 +1266,7 @@ static u8 ov84_0223C5B8 (UnkStruct_ov84_0223B5A0 * param0) } else if (v4 == 2) { ov84_0223EB08(param0, -36); } - } - break; + } break; case 0xfffffffe: if (param0->unk_C4->unk_65 == 5) { return 0; @@ -1292,13 +1287,13 @@ static u8 ov84_0223C5B8 (UnkStruct_ov84_0223B5A0 * param0) return 0; } -static void ov84_0223C720 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223C720(UnkStruct_ov84_0223B5A0 *param0) { param0->unk_427 = 6 + (90 - (10 * param0->unk_424)) / (param0->unk_424 + 1); param0->unk_428 = 10 + param0->unk_427 - 6; } -static u8 ov84_0223C750 (UnkStruct_ov84_0223B5A0 * param0) +static u8 ov84_0223C750(UnkStruct_ov84_0223B5A0 *param0) { if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { if (param0->unk_424 == 1) { @@ -1348,14 +1343,14 @@ static u8 ov84_0223C750 (UnkStruct_ov84_0223B5A0 * param0) return 0; } -static void ov84_0223C848 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223C848(UnkStruct_ov84_0223B5A0 *param0) { ov84_0223C89C(param0); param0->unk_429.unk_04 = 3; param0->unk_429.unk_07_7 = 0; } -static void ov84_0223C868 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223C868(UnkStruct_ov84_0223B5A0 *param0) { if (param0->unk_429.unk_01 != 2) { ov84_0223C89C(param0); @@ -1367,9 +1362,9 @@ static void ov84_0223C868 (UnkStruct_ov84_0223B5A0 * param0) param0->unk_429.unk_07_7 = 1; } -static void ov84_0223C89C (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223C89C(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223C920 * v0 = ¶m0->unk_429; + UnkStruct_ov84_0223C920 *v0 = ¶m0->unk_429; v0->unk_02 = 0; v0->unk_03 = 0; @@ -1388,9 +1383,9 @@ static void ov84_0223C89C (UnkStruct_ov84_0223B5A0 * param0) ov84_0223CF20(param0, param0->unk_C4->unk_64, 0); } -static u8 ov84_0223C920 (UnkStruct_ov84_0223B5A0 * param0) +static u8 ov84_0223C920(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223C920 * v0; + UnkStruct_ov84_0223C920 *v0; int v1; u8 v2; u8 v3; @@ -1453,9 +1448,9 @@ static u8 ov84_0223C920 (UnkStruct_ov84_0223B5A0 * param0) return 0; } -static u8 ov84_0223CA5C (UnkStruct_ov84_0223B5A0 * param0) +static u8 ov84_0223CA5C(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223C920 * v0 = ¶m0->unk_429; + UnkStruct_ov84_0223C920 *v0 = ¶m0->unk_429; if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { if (param0->unk_424 == 1) { @@ -1527,9 +1522,9 @@ static u8 ov84_0223CA5C (UnkStruct_ov84_0223B5A0 * param0) return 0; } -static u8 ov84_0223CBD8 (UnkStruct_ov84_0223B5A0 * param0) +static u8 ov84_0223CBD8(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223C920 * v0 = ¶m0->unk_429; + UnkStruct_ov84_0223C920 *v0 = ¶m0->unk_429; switch (v0->unk_02) { case 0: @@ -1570,7 +1565,7 @@ static u8 ov84_0223CBD8 (UnkStruct_ov84_0223B5A0 * param0) return 0; } -static u8 ov84_0223CD40 (UnkStruct_ov84_0223B5A0 * param0) +static u8 ov84_0223CD40(UnkStruct_ov84_0223B5A0 *param0) { int v0 = ov84_0223CDB0(param0); @@ -1599,7 +1594,7 @@ static u8 ov84_0223CD40 (UnkStruct_ov84_0223B5A0 * param0) return 1; } -static int ov84_0223CDB0 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223CDB0(UnkStruct_ov84_0223B5A0 *param0) { int v0 = sub_02022664(Unk_ov84_022410C8[param0->unk_424].unk_04); @@ -1614,7 +1609,7 @@ static int ov84_0223CDB0 (UnkStruct_ov84_0223B5A0 * param0) return v0; } -static int ov84_0223CE08 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223CE08(UnkStruct_ov84_0223B5A0 *param0) { int v0 = sub_02022644(Unk_ov84_022410C8[param0->unk_424].unk_04); @@ -1629,9 +1624,9 @@ static int ov84_0223CE08 (UnkStruct_ov84_0223B5A0 * param0) return v0; } -static u8 ov84_0223CE60 (UnkStruct_ov84_0223B5A0 * param0) +static u8 ov84_0223CE60(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223C920 * v0 = ¶m0->unk_429; + UnkStruct_ov84_0223C920 *v0 = ¶m0->unk_429; switch (v0->unk_04) { case 0: @@ -1670,10 +1665,10 @@ static u8 ov84_0223CE60 (UnkStruct_ov84_0223B5A0 * param0) return 0; } -static void ov84_0223CF20 (UnkStruct_ov84_0223B5A0 * param0, u8 param1, u8 param2) +static void ov84_0223CF20(UnkStruct_ov84_0223B5A0 *param0, u8 param1, u8 param2) { - u16 * v0; - const u8 * v1; + u16 *v0; + const u8 *v1; u16 v2; u8 v3; u8 v4, v5; @@ -1690,10 +1685,10 @@ static void ov84_0223CF20 (UnkStruct_ov84_0223B5A0 * param0, u8 param1, u8 param } } -static void ov84_0223CFB0 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +static void ov84_0223CFB0(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { - u16 * v0; - const u8 * v1; + u16 *v0; + const u8 *v1; u16 v2; u8 v3; u8 v4, v5; @@ -1710,7 +1705,7 @@ static void ov84_0223CFB0 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) sub_0201C3C0(param0->unk_00, 4); } -static void ov84_0223D014 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223D014(UnkStruct_ov84_0223B5A0 *param0) { switch (param0->unk_490) { case 0: @@ -1746,7 +1741,7 @@ static void ov84_0223D014 (UnkStruct_ov84_0223B5A0 * param0) } } -static void ov84_0223D0BC (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223D0BC(UnkStruct_ov84_0223B5A0 *param0) { u8 v0; @@ -1760,7 +1755,7 @@ static void ov84_0223D0BC (UnkStruct_ov84_0223B5A0 * param0) sub_0201C3C0(param0->unk_00, 4); } -static void ov84_0223D0FC (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223D0FC(UnkStruct_ov84_0223B5A0 *param0) { if (param0->unk_481 == 0) { s16 v0, v1; @@ -1796,7 +1791,7 @@ static void ov84_0223D0FC (UnkStruct_ov84_0223B5A0 * param0) param0->unk_481 = (param0->unk_481 + 1) & 3; } -static BOOL ov84_0223D1F4 (UnkStruct_ov84_0223B5A0 * param0) +static BOOL ov84_0223D1F4(UnkStruct_ov84_0223B5A0 *param0) { int v0 = sub_02022664(Unk_ov84_02240E98); @@ -1813,9 +1808,9 @@ static BOOL ov84_0223D1F4 (UnkStruct_ov84_0223B5A0 * param0) return 0; } -static u8 ov84_0223D244 (UnkStruct_ov84_0223B5A0 * param0) +static u8 ov84_0223D244(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; + UnkStruct_ov84_0223BE5C *v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; if (sub_020014F8(param0->unk_15C, v0->unk_06 + v0->unk_04) == 0xfffffffe) { return 0; @@ -1832,9 +1827,9 @@ static u8 ov84_0223D244 (UnkStruct_ov84_0223B5A0 * param0) return 1; } -static void ov84_0223D2A0 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223D2A0(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; + UnkStruct_ov84_0223BE5C *v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; param0->unk_47A = 1; param0->unk_47B = v0->unk_06 + v0->unk_04; @@ -1845,9 +1840,9 @@ static void ov84_0223D2A0 (UnkStruct_ov84_0223B5A0 * param0) ov84_0223D4E8(param0); } -static u8 ov84_0223D2F8 (UnkStruct_ov84_0223B5A0 * param0) +static u8 ov84_0223D2F8(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0; + UnkStruct_ov84_0223BE5C *v0; u32 v1; u16 v2, v3; @@ -1883,8 +1878,7 @@ static u8 ov84_0223D2F8 (UnkStruct_ov84_0223B5A0 * param0) v0->unk_04 = v3; switch (v1) { - case 0xffffffff: - { + case 0xffffffff: { u8 v4 = sub_020014F0(param0->unk_15C); if (v4 == 1) { @@ -1892,8 +1886,7 @@ static u8 ov84_0223D2F8 (UnkStruct_ov84_0223B5A0 * param0) } else if (v4 == 2) { ov84_0223EB08(param0, -36); } - } - break; + } break; case 0xfffffffe: Sound_PlayEffect(1500); @@ -1913,9 +1906,9 @@ static u8 ov84_0223D2F8 (UnkStruct_ov84_0223B5A0 * param0) return 0; } -static void ov84_0223D42C (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223D42C(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; + UnkStruct_ov84_0223BE5C *v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; u16 v1 = v0->unk_06 + v0->unk_04; if (!((param0->unk_47B == v1) || (param0->unk_47B == (v1 - 1)))) { @@ -1927,9 +1920,9 @@ static void ov84_0223D42C (UnkStruct_ov84_0223B5A0 * param0) ov84_0223D484(param0); } -static void ov84_0223D484 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223D484(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; + UnkStruct_ov84_0223BE5C *v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; sub_02001384(param0->unk_15C, &v0->unk_06, &v0->unk_04); param0->unk_15C = NULL; @@ -1946,9 +1939,9 @@ static void ov84_0223D484 (UnkStruct_ov84_0223B5A0 * param0) ov84_0223D4E8(param0); } -static void ov84_0223D4E8 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223D4E8(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; + UnkStruct_ov84_0223BE5C *v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; if (param0->unk_47A == 0) { SpriteActor_SetSpritePositionXY(param0->unk_E0[4], 177, 24 + (v0->unk_04 - 1) * 16); @@ -1971,9 +1964,9 @@ static void ov84_0223D4E8 (UnkStruct_ov84_0223B5A0 * param0) } } -static void ov84_0223D5AC (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223D5AC(UnkStruct_ov84_0223B5A0 *param0) { - void * v0; + void *v0; u32 v1; u8 v2; u8 v3[12]; @@ -2041,7 +2034,7 @@ static void ov84_0223D5AC (UnkStruct_ov84_0223B5A0 * param0) Heap_FreeToHeap(v0); } -static int ov84_0223D730 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223D730(UnkStruct_ov84_0223B5A0 *param0) { u32 v0; @@ -2059,8 +2052,7 @@ static int ov84_0223D730 (UnkStruct_ov84_0223B5A0 * param0) } switch (v0) { - case 0xffffffff: - { + case 0xffffffff: { u8 v1 = sub_02001DC8(param0->unk_158); if (v1 == 1) { @@ -2068,8 +2060,7 @@ static int ov84_0223D730 (UnkStruct_ov84_0223B5A0 * param0) } else if (v1 == 2) { ov84_0223EB08(param0, -18); } - } - break; + } break; case 0xfffffffe: ov84_02240B34(param0, 1); ov84_0223FD84(param0); @@ -2079,8 +2070,7 @@ static int ov84_0223D730 (UnkStruct_ov84_0223B5A0 * param0) } return 1; - default: - { + default: { UnkFuncPtr_ov84_0223D730 v2 = (UnkFuncPtr_ov84_0223D730)v0; return v2(param0); } @@ -2089,7 +2079,7 @@ static int ov84_0223D730 (UnkStruct_ov84_0223B5A0 * param0) return 4; } -static void ov84_0223D7E8 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +static void ov84_0223D7E8(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { if (param1 == 0) { sub_020198C0(param0->unk_00, 1, Unk_ov84_02241064, 0, 18, 5, 5); @@ -2102,12 +2092,12 @@ static void ov84_0223D7E8 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) sub_0201C3C0(param0->unk_00, 1); } -const u32 ov84_0223D84C (u32 param0) +const u32 ov84_0223D84C(u32 param0) { return Unk_ov84_02241034[param0]; } -static int ov84_0223D858 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223D858(UnkStruct_ov84_0223B5A0 *param0) { UnkFuncPtr_02069238 v0; s32 v1; @@ -2133,7 +2123,7 @@ static int ov84_0223D858 (UnkStruct_ov84_0223B5A0 * param0) return ov84_0223D94C(param0); } -static int ov84_0223D8EC (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223D8EC(UnkStruct_ov84_0223B5A0 *param0) { if (Message_Printing(param0->unk_426) == 0) { if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { @@ -2152,9 +2142,9 @@ static int ov84_0223D8EC (UnkStruct_ov84_0223B5A0 * param0) return 12; } -static int ov84_0223D94C (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223D94C(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; + UnkStruct_ov84_0223BE5C *v0 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; param0->unk_483 = 0; @@ -2181,17 +2171,16 @@ static int ov84_0223D94C (UnkStruct_ov84_0223B5A0 * param0) return 24; } -static int ov84_0223DA04 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223DA04(UnkStruct_ov84_0223B5A0 *param0) { UnkFuncPtr_ov84_0223DA04 v0 = (UnkFuncPtr_ov84_0223DA04)param0->unk_484; return v0(param0); } -static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223DA14(UnkStruct_ov84_0223B5A0 *param0) { switch (param0->unk_483) { - case 0: - { + case 0: { u16 v0 = Item_MoveForTMHM(param0->unk_C4->unk_66); StringTemplate_SetMoveName(param0->unk_118, 0, v0); @@ -2214,7 +2203,7 @@ static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0) } if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { - Strbuf* v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 60); + Strbuf *v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 60); BGL_FillWindow(¶m0->unk_04[6], 15); StringTemplate_Format(param0->unk_118, param0->unk_3F8, v1); @@ -2232,8 +2221,7 @@ static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0) ov84_02240120(param0); param0->unk_483 = 3; break; - case 3: - { + case 3: { u32 v2; if (ov84_0223EF4C(param0) == 1) { @@ -2253,8 +2241,7 @@ static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0) ov84_0223D7E8(param0, 0); param0->unk_C4->unk_68 = 0; return 24; - case 0xffffffff: - { + case 0xffffffff: { u8 v3 = sub_02001DC8(param0->unk_158); if (v3 == 1) { @@ -2262,8 +2249,7 @@ static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0) } else if (v3 == 2) { ov84_0223EB08(param0, -18); } - } - break; + } break; case 0xfffffffe: sub_0200E084(¶m0->unk_04[6], 0); sub_0201A9A4(¶m0->unk_04[1]); @@ -2271,16 +2257,15 @@ static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0) ov84_0223D7E8(param0, 0); return 1; } - } - break; + } break; } return 13; } -static BOOL ov84_0223DBF4 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) +static BOOL ov84_0223DBF4(UnkStruct_ov84_0223B5A0 *param0, u16 param1) { - Strbuf* v0; + Strbuf *v0; StringTemplate_SetPlayerName(param0->unk_118, 0, param0->unk_CC); StringTemplate_SetItemName(param0->unk_118, 1, param1); @@ -2304,10 +2289,10 @@ static BOOL ov84_0223DBF4 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) return 1; } -static Strbuf* ov84_0223DC9C (UnkStruct_ov84_0223B5A0 * param0, u16 param1) +static Strbuf *ov84_0223DC9C(UnkStruct_ov84_0223B5A0 *param0, u16 param1) { s32 v0; - u8 * v1; + u8 *v1; if (sub_0202D9D8(ov84_0223B9E4(param0)) == 0) { param0->unk_488 = 0; @@ -2322,7 +2307,7 @@ static Strbuf* ov84_0223DC9C (UnkStruct_ov84_0223B5A0 * param0, u16 param1) return MessageLoader_GetNewStrbuf(param0->unk_114, 61); } -static void ov84_0223DCF8 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_0223DCF8(UnkStruct_ov84_0223B5A0 *param0) { Pocket_TryRemoveItem(param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_00, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_09 - 3, param0->unk_C4->unk_66, param0->unk_488, 6); sub_02001384(param0->unk_15C, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06, ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04); @@ -2334,7 +2319,7 @@ static void ov84_0223DCF8 (UnkStruct_ov84_0223B5A0 * param0) ov84_0223C224(param0, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04); } -static int ov84_0223DDD0 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223DDD0(UnkStruct_ov84_0223B5A0 *param0) { switch (param0->unk_483) { case 0: @@ -2368,7 +2353,7 @@ static int ov84_0223DDD0 (UnkStruct_ov84_0223B5A0 * param0) return 13; } -static int ov84_0223DE78 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223DE78(UnkStruct_ov84_0223B5A0 *param0) { ov84_0223FD84(param0); sub_0208C120(1, 6); @@ -2377,7 +2362,7 @@ static int ov84_0223DE78 (UnkStruct_ov84_0223B5A0 * param0) return 24; } -static int ov84_0223DE98 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223DE98(UnkStruct_ov84_0223B5A0 *param0) { ov84_0223FD84(param0); sub_0208C120(1, 6); @@ -2386,7 +2371,7 @@ static int ov84_0223DE98 (UnkStruct_ov84_0223B5A0 * param0) return 24; } -static int ov84_0223DEB8 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223DEB8(UnkStruct_ov84_0223B5A0 *param0) { ov84_0223FD84(param0); param0->unk_488 = 1; @@ -2401,7 +2386,7 @@ static int ov84_0223DEB8 (UnkStruct_ov84_0223B5A0 * param0) return 7; } -static int ov84_0223DF0C (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223DF0C(UnkStruct_ov84_0223B5A0 *param0) { if (ov84_0223EFD0(param0, ¶m0->unk_488, param0->unk_48A) == 1) { ov84_0223FF44(param0); @@ -2447,7 +2432,7 @@ static int ov84_0223DF0C (UnkStruct_ov84_0223B5A0 * param0) return 7; } -static int ov84_0223DFF8 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223DFF8(UnkStruct_ov84_0223B5A0 *param0) { if (Message_Printing(param0->unk_426) == 0) { ov84_02240120(param0); @@ -2457,7 +2442,7 @@ static int ov84_0223DFF8 (UnkStruct_ov84_0223B5A0 * param0) return 8; } -static int ov84_0223E01C (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E01C(UnkStruct_ov84_0223B5A0 *param0) { u32 v0; @@ -2473,9 +2458,8 @@ static int ov84_0223E01C (UnkStruct_ov84_0223B5A0 * param0) } switch (v0) { - case 0: - { - Strbuf* v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 53); + case 0: { + Strbuf *v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 53); if (param0->unk_488 == 1) { StringTemplate_SetItemName(param0->unk_118, 0, param0->unk_C4->unk_66); @@ -2491,8 +2475,7 @@ static int ov84_0223E01C (UnkStruct_ov84_0223B5A0 * param0) param0->unk_426 = ov84_022400A0(param0); return 10; - case 0xffffffff: - { + case 0xffffffff: { u8 v2 = sub_02001DC8(param0->unk_158); if (v2 == 1) { @@ -2500,8 +2483,7 @@ static int ov84_0223E01C (UnkStruct_ov84_0223B5A0 * param0) } else if (v2 == 2) { ov84_0223EB08(param0, -18); } - } - break; + } break; case 0xfffffffe: sub_0200E084(¶m0->unk_04[6], 0); sub_0201A9A4(¶m0->unk_04[1]); @@ -2512,7 +2494,7 @@ static int ov84_0223E01C (UnkStruct_ov84_0223B5A0 * param0) return 9; } -static int ov84_0223E158 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E158(UnkStruct_ov84_0223B5A0 *param0) { if (Message_Printing(param0->unk_426) != 0) { return 10; @@ -2525,7 +2507,7 @@ static int ov84_0223E158 (UnkStruct_ov84_0223B5A0 * param0) return 11; } -static int ov84_0223E18C (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E18C(UnkStruct_ov84_0223B5A0 *param0) { if (Message_Printing(param0->unk_426) == 0) { if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { @@ -2541,7 +2523,7 @@ static int ov84_0223E18C (UnkStruct_ov84_0223B5A0 * param0) return 11; } -static int ov84_0223E1E4 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E1E4(UnkStruct_ov84_0223B5A0 *param0) { Bag_RegisterItem(param0->unk_C8, param0->unk_C4->unk_66); sub_020013AC(param0->unk_15C); @@ -2552,7 +2534,7 @@ static int ov84_0223E1E4 (UnkStruct_ov84_0223B5A0 * param0) return 1; } -static int ov84_0223E220 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E220(UnkStruct_ov84_0223B5A0 *param0) { Bag_RegisterItem(param0->unk_C8, 0); sub_020013AC(param0->unk_15C); @@ -2563,7 +2545,7 @@ static int ov84_0223E220 (UnkStruct_ov84_0223B5A0 * param0) return 1; } -static int ov84_0223E254 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E254(UnkStruct_ov84_0223B5A0 *param0) { ov84_0223FD84(param0); sub_0208C120(1, 6); @@ -2573,7 +2555,7 @@ static int ov84_0223E254 (UnkStruct_ov84_0223B5A0 * param0) return 24; } -static int ov84_0223E27C (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E27C(UnkStruct_ov84_0223B5A0 *param0) { ov84_0223D0FC(param0); if (ov84_0223ED14(param0) == 1) { @@ -2593,7 +2575,7 @@ static int ov84_0223E27C (UnkStruct_ov84_0223B5A0 * param0) if (v0 == 1) { if (Item_LoadParam(param0->unk_C4->unk_66, 3, 6) != 0) { - Strbuf* v1; + Strbuf *v1; BGL_FillWindow(¶m0->unk_04[6], 15); sub_0200E060(¶m0->unk_04[6], 0, 1024 - 9 - (18 + 12), 12); @@ -2621,7 +2603,7 @@ static int ov84_0223E27C (UnkStruct_ov84_0223B5A0 * param0) return 14; } -static int ov84_0223E36C (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E36C(UnkStruct_ov84_0223B5A0 *param0) { if (Message_Printing(param0->unk_426) == 0) { if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { @@ -2636,7 +2618,7 @@ static int ov84_0223E36C (UnkStruct_ov84_0223B5A0 * param0) return 15; } -static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E3BC(UnkStruct_ov84_0223B5A0 *param0) { ov84_0223D0FC(param0); if (ov84_0223ED14(param0) == 1) { @@ -2655,7 +2637,7 @@ static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0) u8 v0 = ov84_0223C5B8(param0); if (v0 == 1) { - Strbuf* v1; + Strbuf *v1; ov84_02240248(param0, 0); BGL_FillWindow(¶m0->unk_04[6], 15); @@ -2701,7 +2683,7 @@ static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0) return 16; } -static int ov84_0223E588 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E588(UnkStruct_ov84_0223B5A0 *param0) { if (Message_Printing(param0->unk_426) == 0) { if (param0->unk_48A > 99) { @@ -2716,14 +2698,14 @@ static int ov84_0223E588 (UnkStruct_ov84_0223B5A0 * param0) return 17; } -static int ov84_0223E5C4 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E5C4(UnkStruct_ov84_0223B5A0 *param0) { if (ov84_0223EFD0(param0, ¶m0->unk_488, param0->unk_48A) == 1) { ov84_02240148(param0, 1); return 18; } if (ov84_0223D1F4(param0) == 1) { - Strbuf* v0; + Strbuf *v0; ov84_02240D3C(param0, 0); Window_Clear(¶m0->unk_04[7], 1); @@ -2753,7 +2735,7 @@ static int ov84_0223E5C4 (UnkStruct_ov84_0223B5A0 * param0) return 18; } if (gCoreSys.pressedKeys & PAD_BUTTON_A) { - Strbuf* v1; + Strbuf *v1; ov84_02240D3C(param0, 0); Window_Clear(¶m0->unk_04[7], 1); @@ -2786,7 +2768,7 @@ static int ov84_0223E5C4 (UnkStruct_ov84_0223B5A0 * param0) return 18; } -static int ov84_0223E7A8 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E7A8(UnkStruct_ov84_0223B5A0 *param0) { if (Message_Printing(param0->unk_426) == 0) { ov84_02240120(param0); @@ -2797,7 +2779,7 @@ static int ov84_0223E7A8 (UnkStruct_ov84_0223B5A0 * param0) return 19; } -static int ov84_0223E7CC (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E7CC(UnkStruct_ov84_0223B5A0 *param0) { u32 v0; @@ -2813,9 +2795,8 @@ static int ov84_0223E7CC (UnkStruct_ov84_0223B5A0 * param0) } switch (v0) { - case 0: - { - Strbuf* v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 77); + case 0: { + Strbuf *v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 77); if (param0->unk_488 > 1) { StringTemplate_SetItemNamePlural(param0->unk_118, 0, param0->unk_C4->unk_66); @@ -2830,8 +2811,7 @@ static int ov84_0223E7CC (UnkStruct_ov84_0223B5A0 * param0) BGL_FillWindow(¶m0->unk_04[6], 15); param0->unk_426 = ov84_022400A0(param0); return 21; - case 0xffffffff: - { + case 0xffffffff: { u8 v2 = sub_02001DC8(param0->unk_158); if (v2 == 1) { @@ -2839,8 +2819,7 @@ static int ov84_0223E7CC (UnkStruct_ov84_0223B5A0 * param0) } else if (v2 == 2) { ov84_0223EB08(param0, -18); } - } - break; + } break; case 0xfffffffe: param0->unk_48C = 0; Window_Clear(¶m0->unk_04[8], 1); @@ -2854,7 +2833,7 @@ static int ov84_0223E7CC (UnkStruct_ov84_0223B5A0 * param0) return 20; } -static int ov84_0223E920 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E920(UnkStruct_ov84_0223B5A0 *param0) { if (Message_Printing(param0->unk_426) != 0) { return 21; @@ -2879,7 +2858,7 @@ static int ov84_0223E920 (UnkStruct_ov84_0223B5A0 * param0) return 22; } -static int ov84_0223E9B0 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223E9B0(UnkStruct_ov84_0223B5A0 *param0) { if (Message_Printing(param0->unk_426) == 0) { if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || gCoreSys.touchPressed) { @@ -2898,7 +2877,7 @@ static int ov84_0223E9B0 (UnkStruct_ov84_0223B5A0 * param0) return 22; } -static int ov84_0223EA18 (UnkStruct_ov84_0223B5A0 * param0) +static int ov84_0223EA18(UnkStruct_ov84_0223B5A0 *param0) { ov84_0223D0FC(param0); @@ -2940,7 +2919,7 @@ static int ov84_0223EA18 (UnkStruct_ov84_0223B5A0 * param0) return 23; } -static void ov84_0223EB08 (UnkStruct_ov84_0223B5A0 * param0, s8 param1) +static void ov84_0223EB08(UnkStruct_ov84_0223B5A0 *param0, s8 param1) { s16 v0 = sub_02019FFC(param0->unk_00, 7); @@ -2956,7 +2935,7 @@ static void ov84_0223EB08 (UnkStruct_ov84_0223B5A0 * param0, s8 param1) param0->unk_49A = v0; } -static BOOL ov84_0223EB54 (void) +static BOOL ov84_0223EB54(void) { int v0 = sub_020226DC(Unk_ov84_02240EA8); @@ -2967,7 +2946,7 @@ static BOOL ov84_0223EB54 (void) return 0; } -static BOOL ov84_0223EB6C (void) +static BOOL ov84_0223EB6C(void) { int v0 = sub_02022684(Unk_ov84_02240EB4); @@ -2978,7 +2957,7 @@ static BOOL ov84_0223EB6C (void) return 0; } -static BOOL ov84_0223EB84 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) +static BOOL ov84_0223EB84(UnkStruct_ov84_0223B5A0 *param0, u16 param1) { if (ov84_0223EB54() == 1) { param0->unk_492 = 1; @@ -3041,7 +3020,7 @@ static BOOL ov84_0223EB84 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) return 0; } -static BOOL ov84_0223ED14 (UnkStruct_ov84_0223B5A0 * param0) +static BOOL ov84_0223ED14(UnkStruct_ov84_0223B5A0 *param0) { BOOL v0 = ov84_0223EB84(param0, 36); @@ -3066,7 +3045,7 @@ static BOOL ov84_0223ED14 (UnkStruct_ov84_0223B5A0 * param0) return v0; } -static BOOL ov84_0223ED64 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) +static BOOL ov84_0223ED64(UnkStruct_ov84_0223B5A0 *param0, u16 param1) { u16 v0, v1; @@ -3087,7 +3066,7 @@ static BOOL ov84_0223ED64 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) return 1; } -static BOOL ov84_0223EE30 (UnkStruct_ov84_0223B5A0 * param0) +static BOOL ov84_0223EE30(UnkStruct_ov84_0223B5A0 *param0) { BOOL v0 = ov84_0223EB84(param0, 36); @@ -3112,7 +3091,7 @@ static BOOL ov84_0223EE30 (UnkStruct_ov84_0223B5A0 * param0) return v0; } -static BOOL ov84_0223EE80 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) +static BOOL ov84_0223EE80(UnkStruct_ov84_0223B5A0 *param0, u16 param1) { u16 v0, v1; @@ -3133,7 +3112,7 @@ static BOOL ov84_0223EE80 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) return 1; } -static BOOL ov84_0223EF4C (UnkStruct_ov84_0223B5A0 * param0) +static BOOL ov84_0223EF4C(UnkStruct_ov84_0223B5A0 *param0) { BOOL v0 = ov84_0223EB84(param0, 18); @@ -3158,7 +3137,7 @@ static BOOL ov84_0223EF4C (UnkStruct_ov84_0223B5A0 * param0) return v0; } -static BOOL ov84_0223EF9C (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +static BOOL ov84_0223EF9C(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { u8 v0 = sub_02001DC4(param0->unk_158); @@ -3171,7 +3150,7 @@ static BOOL ov84_0223EF9C (UnkStruct_ov84_0223B5A0 * param0, u8 param1) return 1; } -static BOOL ov84_0223EFD0 (UnkStruct_ov84_0223B5A0 * param0, s16 * param1, u16 param2) +static BOOL ov84_0223EFD0(UnkStruct_ov84_0223B5A0 *param0, s16 *param1, u16 param2) { BOOL v0; s16 v1; diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c index ad7e09d347..8c32004dfe 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -1,41 +1,43 @@ +#include "overlay084/ov84_0223F040.h" + #include #include #include "struct_defs/struct_0201D738.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207CB08.h" -#include "bag.h" #include "struct_defs/struct_02081CF4.h" + #include "overlay061/struct_ov61_0222C884.h" +#include "overlay084/ov84_0223B5A0.h" +#include "overlay084/ov84_022403F4.h" #include "overlay084/struct_ov84_0223B5A0.h" #include "overlay084/struct_ov84_0223BE5C.h" #include "overlay084/struct_ov84_0223C920.h" +#include "bag.h" +#include "game_options.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "move_table.h" +#include "narc.h" +#include "poffin.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "narc.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" -#include "poffin.h" -#include "move_table.h" -#include "item.h" -#include "overlay084/ov84_0223B5A0.h" -#include "overlay084/ov84_0223F040.h" -#include "overlay084/ov84_022403F4.h" -static void ov84_0223F9B0(UnkStruct_ov84_0223B5A0 * param0, u32 param1); -static BOOL ov84_022400E0(UnkStruct_0201D738 * param0, u16 param1); +static void ov84_0223F9B0(UnkStruct_ov84_0223B5A0 *param0, u32 param1); +static BOOL ov84_022400E0(UnkStruct_0201D738 *param0, u16 param1); static const UnkStruct_ov61_0222C884 Unk_ov84_02241150 = { 0x0, @@ -47,7 +49,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov84_02241150 = { 0x31B }; -void ov84_0223F040 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223F040(UnkStruct_ov84_0223B5A0 *param0) { BGL_AddWindow(param0->unk_00, ¶m0->unk_04[0], 2, 14, 0, 17, 18, 3, 1); BGL_AddWindow(param0->unk_00, ¶m0->unk_04[1], 0, 0, 18, 32, 6, 3, 1 + 17 * 18); @@ -62,7 +64,7 @@ void ov84_0223F040 (UnkStruct_ov84_0223B5A0 * param0) BGL_AddWindow(param0->unk_00, ¶m0->unk_04[10], 0, 1, 12, 11, 4, 3, 903); } -void ov84_0223F1DC (Window * param0) +void ov84_0223F1DC(Window *param0) { u16 v0; @@ -71,9 +73,9 @@ void ov84_0223F1DC (Window * param0) } } -void ov84_0223F1F8 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223F1F8(UnkStruct_ov84_0223B5A0 *param0) { - MessageLoader * v0; + MessageLoader *v0; u16 v1; v0 = MessageLoader_Init(1, 26, 395, 6); @@ -85,7 +87,7 @@ void ov84_0223F1F8 (UnkStruct_ov84_0223B5A0 * param0) MessageLoader_Free(v0); } -void ov84_0223F238 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223F238(UnkStruct_ov84_0223B5A0 *param0) { u16 v0; @@ -94,7 +96,7 @@ void ov84_0223F238 (UnkStruct_ov84_0223B5A0 * param0) } } -void ov84_0223F25C (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223F25C(UnkStruct_ov84_0223B5A0 *param0) { u16 v0; u16 v1; @@ -107,7 +109,7 @@ void ov84_0223F25C (UnkStruct_ov84_0223B5A0 * param0) } } -static void ov84_0223F2C0 (UnkStruct_ov84_0223B5A0 * param0, Strbuf *param1, u16 param2) +static void ov84_0223F2C0(UnkStruct_ov84_0223B5A0 *param0, Strbuf *param1, u16 param2) { u32 v0; @@ -115,11 +117,11 @@ static void ov84_0223F2C0 (UnkStruct_ov84_0223B5A0 * param0, Strbuf *param1, u16 sub_0201D78C(¶m0->unk_04[2], 0, param1, param2 - v0 / 2, 2, 0xff, ((u32)((1 & 0xff) << 16 | (2 & 0xff) << 8 | (0 & 0xff) << 0)), NULL); } -void ov84_0223F2FC (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223F2FC(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223C920 * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov84_0223C920 *v0; + Strbuf *v1; + Strbuf *v2; u16 v3; BGL_FillWindow(¶m0->unk_04[2], 0); @@ -140,19 +142,19 @@ void ov84_0223F2FC (UnkStruct_ov84_0223B5A0 * param0) sub_0201ACCC(¶m0->unk_04[2]); } -static void * ov84_0223F390 (UnkStruct_ov84_0223B5A0 * param0, NNSG2dCharacterData ** param1) +static void *ov84_0223F390(UnkStruct_ov84_0223B5A0 *param0, NNSG2dCharacterData **param1) { - void * v0; + void *v0; v0 = NARC_AllocAndReadWholeMember(param0->unk_D4, 21, 6); NNS_G2dGetUnpackedBGCharacterData(v0, param1); return v0; } -void ov84_0223F3AC (UnkStruct_ov84_0223B5A0 * param0, u8 param1, u8 param2) +void ov84_0223F3AC(UnkStruct_ov84_0223B5A0 *param0, u8 param1, u8 param2) { - NNSG2dCharacterData * v0; - void * v1; + NNSG2dCharacterData *v0; + void *v1; u8 v2; v1 = ov84_0223F390(param0, &v0); @@ -167,10 +169,10 @@ void ov84_0223F3AC (UnkStruct_ov84_0223B5A0 * param0, u8 param1, u8 param2) Heap_FreeToHeapExplicit(6, v1); } -void ov84_0223F438 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223F438(UnkStruct_ov84_0223B5A0 *param0) { - NNSG2dCharacterData * v0; - void * v1; + NNSG2dCharacterData *v0; + void *v1; u8 v2; u8 v3; @@ -191,19 +193,19 @@ void ov84_0223F438 (UnkStruct_ov84_0223B5A0 * param0) Heap_FreeToHeapExplicit(6, v1); } -static void ov84_0223F4E8 (UnkStruct_ov84_0223B5A0 * param0, u32 param1, u32 param2) +static void ov84_0223F4E8(UnkStruct_ov84_0223B5A0 *param0, u32 param1, u32 param2) { StringTemplate_SetItemName(param0->unk_118, param2, ov84_0223BE5C(param0, param1, 0)); } -static void ov84_0223F508 (UnkStruct_ov84_0223B5A0 * param0, u32 param1, u32 param2) +static void ov84_0223F508(UnkStruct_ov84_0223B5A0 *param0, u32 param1, u32 param2) { StringTemplate_SetItemNamePlural(param0->unk_118, param2, ov84_0223BE5C(param0, param1, 0)); } -void ov84_0223F528 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) +void ov84_0223F528(UnkStruct_ov84_0223B5A0 *param0, u16 param1) { - Strbuf* v0; + Strbuf *v0; if (param1 != 0xffff) { v0 = Strbuf_Init(130, 6); @@ -216,10 +218,10 @@ void ov84_0223F528 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) Strbuf_Free(v0); } -void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) +void ov84_0223F584(UnkStruct_ov84_0223B5A0 *param0, u16 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u16 v2; u16 v3; @@ -279,21 +281,21 @@ void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) sub_0201D78C(v0, 0, param0->unk_3F8, 96 + 64, 32, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } -void ov84_0223F7D4 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223F7D4(UnkStruct_ov84_0223B5A0 *param0) { param0->unk_3FC = MessageLoader_GetNewStrbuf(param0->unk_114, 38); param0->unk_400 = MessageLoader_GetNewStrbuf(param0->unk_114, 37); } -void ov84_0223F800 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223F800(UnkStruct_ov84_0223B5A0 *param0) { Strbuf_Free(param0->unk_3FC); Strbuf_Free(param0->unk_400); } -void ov84_0223F81C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2, u32 param3) +void ov84_0223F81C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u16 param2, u32 param3) { - Strbuf* v0; + Strbuf *v0; u32 v1; if (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08 == 3) { @@ -313,7 +315,7 @@ void ov84_0223F81C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2, u3 Strbuf_Free(v0); } -void ov84_0223F8D0 (UnkStruct_ov84_0223B5A0 * param0, BagItem * param1, u32 param2) +void ov84_0223F8D0(UnkStruct_ov84_0223B5A0 *param0, BagItem *param1, u32 param2) { u16 v0 = param1->item; @@ -328,25 +330,25 @@ void ov84_0223F8D0 (UnkStruct_ov84_0223B5A0 * param0, BagItem * param1, u32 para } } -void ov84_0223F94C (UnkStruct_ov84_0223B5A0 * param0, BagItem * param1, u32 param2) +void ov84_0223F94C(UnkStruct_ov84_0223B5A0 *param0, BagItem *param1, u32 param2) { sub_0200C648(param0->unk_110, 2, Item_BerryNumber(param1->item) + 1, 2, 2, ¶m0->unk_04[0], 0, param2 + 5); ov84_0223F81C(param0, param1->quantity, param2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); } -static void * ov84_0223F994 (UnkStruct_ov84_0223B5A0 * param0, NNSG2dCharacterData ** param1) +static void *ov84_0223F994(UnkStruct_ov84_0223B5A0 *param0, NNSG2dCharacterData **param1) { - void * v0; + void *v0; v0 = NARC_AllocAndReadWholeMember(param0->unk_D4, 38, 6); NNS_G2dGetUnpackedBGCharacterData(v0, param1); return v0; } -static void ov84_0223F9B0 (UnkStruct_ov84_0223B5A0 * param0, u32 param1) +static void ov84_0223F9B0(UnkStruct_ov84_0223B5A0 *param0, u32 param1) { - NNSG2dCharacterData * v0; - void * v1; + NNSG2dCharacterData *v0; + void *v1; u8 v2; v1 = ov84_0223F994(param0, &v0); @@ -354,19 +356,19 @@ static void ov84_0223F9B0 (UnkStruct_ov84_0223B5A0 * param0, u32 param1) Heap_FreeToHeapExplicit(6, v1); } -void ov84_0223F9F0 (UnkStruct_ov84_0223B5A0 * param0, u32 param1) +void ov84_0223F9F0(UnkStruct_ov84_0223B5A0 *param0, u32 param1) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 41); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 41); BGL_WindowColor(¶m0->unk_04[0], 0, 0, param1, 17 * 8, 16); sub_0201D78C(¶m0->unk_04[0], 0, v0, 0, param1, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -void ov84_0223FA44 (UnkStruct_ov84_0223B5A0 * param0, u32 param1) +void ov84_0223FA44(UnkStruct_ov84_0223B5A0 *param0, u32 param1) { - NNSG2dCharacterData * v0; - void * v1; + NNSG2dCharacterData *v0; + void *v1; u8 v2; v1 = ov84_0223F994(param0, &v0); @@ -374,7 +376,7 @@ void ov84_0223FA44 (UnkStruct_ov84_0223B5A0 * param0, u32 param1) Heap_FreeToHeapExplicit(6, v1); } -void ov84_0223FA88 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223FA88(UnkStruct_ov84_0223B5A0 *param0) { param0->unk_124[0] = MessageLoader_GetNewStrbuf(param0->unk_114, 0); param0->unk_124[1] = MessageLoader_GetNewStrbuf(param0->unk_114, 6); @@ -390,7 +392,7 @@ void ov84_0223FA88 (UnkStruct_ov84_0223B5A0 * param0) param0->unk_124[11] = MessageLoader_GetNewStrbuf(param0->unk_114, 8); } -void ov84_0223FB50 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223FB50(UnkStruct_ov84_0223B5A0 *param0) { u16 v0; @@ -399,12 +401,12 @@ void ov84_0223FB50 (UnkStruct_ov84_0223B5A0 * param0) } } -void ov84_0223FB70 (UnkStruct_ov84_0223B5A0 * param0, u8 * param1, u8 param2) +void ov84_0223FB70(UnkStruct_ov84_0223B5A0 *param0, u8 *param1, u8 param2) { UnkStruct_02081CF4 v0; - UnkStruct_ov84_0223BE5C * v1; - Strbuf* v2; - Strbuf* v3; + UnkStruct_ov84_0223BE5C *v1; + Strbuf *v2; + Strbuf *v3; u16 v4; u16 v5; @@ -463,7 +465,7 @@ void ov84_0223FB70 (UnkStruct_ov84_0223B5A0 * param0, u8 * param1, u8 param2) sub_0201A9A4(¶m0->unk_B4[0]); } -void ov84_0223FD84 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223FD84(UnkStruct_ov84_0223B5A0 *param0) { u32 v0; @@ -489,10 +491,10 @@ void ov84_0223FD84 (UnkStruct_ov84_0223B5A0 * param0) ov84_02240D5C(param0, 0, 0); } -void ov84_0223FE18 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223FE18(UnkStruct_ov84_0223B5A0 *param0) { - Strbuf* v0; - Strbuf* v1; + Strbuf *v0; + Strbuf *v1; BGL_FillWindow(¶m0->unk_04[1], 0); @@ -508,11 +510,11 @@ void ov84_0223FE18 (UnkStruct_ov84_0223B5A0 * param0) Strbuf_Free(v0); } -void ov84_0223FE94 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223FE94(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0; - Strbuf* v1; - Strbuf* v2; + UnkStruct_ov84_0223BE5C *v0; + Strbuf *v1; + Strbuf *v2; u16 v3; Window_Show(¶m0->unk_04[9], 1, 1024 - 9, 14); @@ -533,10 +535,10 @@ void ov84_0223FE94 (UnkStruct_ov84_0223B5A0 * param0) Strbuf_Free(v1); } -void ov84_0223FF44 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223FF44(UnkStruct_ov84_0223B5A0 *param0) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; v0 = ¶m0->unk_04[9]; @@ -550,7 +552,7 @@ void ov84_0223FF44 (UnkStruct_ov84_0223B5A0 * param0) Strbuf_Free(v1); } -void ov84_0223FFC0 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223FFC0(UnkStruct_ov84_0223B5A0 *param0) { sub_0200E084(¶m0->unk_04[3], 1); Window_Clear(¶m0->unk_04[9], 1); @@ -559,10 +561,10 @@ void ov84_0223FFC0 (UnkStruct_ov84_0223B5A0 * param0) sub_0201A9A4(¶m0->unk_04[1]); } -void ov84_0223FFF0 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_0223FFF0(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov84_0223BE5C * v0; - Strbuf* v1; + UnkStruct_ov84_0223BE5C *v0; + Strbuf *v1; u16 v2; sub_0200E060(¶m0->unk_04[6], 1, 1024 - 9 - (18 + 12), 12); @@ -584,7 +586,7 @@ void ov84_0223FFF0 (UnkStruct_ov84_0223B5A0 * param0) param0->unk_426 = ov84_022400A0(param0); } -u8 ov84_022400A0 (UnkStruct_ov84_0223B5A0 * param0) +u8 ov84_022400A0(UnkStruct_ov84_0223B5A0 *param0) { u8 v0; @@ -595,7 +597,7 @@ u8 ov84_022400A0 (UnkStruct_ov84_0223B5A0 * param0) return v0; } -static BOOL ov84_022400E0 (UnkStruct_0201D738 * param0, u16 param1) +static BOOL ov84_022400E0(UnkStruct_0201D738 *param0, u16 param1) { switch (param1) { case 1: @@ -612,15 +614,15 @@ static BOOL ov84_022400E0 (UnkStruct_0201D738 * param0, u16 param1) return 0; } -void ov84_02240120 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_02240120(UnkStruct_ov84_0223B5A0 *param0) { param0->unk_158 = sub_02002100(param0->unk_00, &Unk_ov84_02241150, 1024 - 9, 14, 6); } -void ov84_02240148 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +void ov84_02240148(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; v0 = ¶m0->unk_04[7]; @@ -650,10 +652,10 @@ void ov84_02240148 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) Strbuf_Free(v1); } -void ov84_02240248 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +void ov84_02240248(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; v0 = ¶m0->unk_04[8]; @@ -682,10 +684,10 @@ void ov84_02240248 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) Strbuf_Free(v1); } -void ov84_02240328 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_02240328(UnkStruct_ov84_0223B5A0 *param0) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; v0 = ¶m0->unk_04[10]; diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c index 6d8c959659..b14b6138ca 100644 --- a/src/overlay084/ov84_022403F4.c +++ b/src/overlay084/ov84_022403F4.c @@ -1,29 +1,31 @@ +#include "overlay084/ov84_022403F4.h" + #include #include +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0207CB08.h" + #include "overlay084/struct_ov84_0223B5A0.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "gx_layers.h" +#include "item.h" +#include "move_table.h" #include "unk_0200C6E4.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "move_table.h" #include "unk_0207C908.h" -#include "item.h" -#include "overlay084/ov84_022403F4.h" -static void ov84_02240424(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_022404C0(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_02240950(UnkStruct_ov84_0223B5A0 * param0); -static void ov84_02240C48(UnkStruct_ov84_0223B5A0 * param0); -static u8 ov84_02240C30(UnkStruct_ov84_0223B5A0 * param0, u8 param1); -static void ov84_02240B98(UnkStruct_ov84_0223B5A0 * param0); +static void ov84_02240424(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_022404C0(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_02240950(UnkStruct_ov84_0223B5A0 *param0); +static void ov84_02240C48(UnkStruct_ov84_0223B5A0 *param0); +static u8 ov84_02240C30(UnkStruct_ov84_0223B5A0 *param0, u8 param1); +static void ov84_02240B98(UnkStruct_ov84_0223B5A0 *param0); static const SpriteTemplate Unk_ov84_022411B0[] = { { @@ -34,9 +36,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x1, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC0F9, 0xC0F9, 0xC0F9, 0xC0F9, 0x0, 0x0}, + { 0xC0F9, 0xC0F9, 0xC0F9, 0xC0F9, 0x0, 0x0 }, 0x1, - 0x0 + 0x0, }, { 0xD, @@ -46,9 +48,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC0FA, 0xC0FA, 0xC0FA, 0xC0FA, 0x0, 0x0}, + { 0xC0FA, 0xC0FA, 0xC0FA, 0xC0FA, 0x0, 0x0 }, + 0x0, 0x0, - 0x0 }, { 0x2, @@ -58,9 +60,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC0FD, 0xC0FA, 0xC0FD, 0xC0FD, 0x0, 0x0}, + { 0xC0FD, 0xC0FA, 0xC0FD, 0xC0FD, 0x0, 0x0 }, + 0x0, 0x0, - 0x0 }, { 0x62, @@ -70,9 +72,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC0FD, 0xC0FA, 0xC0FD, 0xC0FD, 0x0, 0x0}, + { 0xC0FD, 0xC0FA, 0xC0FD, 0xC0FD, 0x0, 0x0 }, + 0x0, 0x0, - 0x0 }, { 0xB1, @@ -82,9 +84,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC0FB, 0xC0FA, 0xC0FB, 0xC0FB, 0x0, 0x0}, + { 0xC0FB, 0xC0FA, 0xC0FB, 0xC0FB, 0x0, 0x0 }, 0x1, - 0x0 + 0x0, }, { 0xB1, @@ -94,9 +96,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC0FC, 0xC0FA, 0xC0FC, 0xC0FC, 0x0, 0x0}, + { 0xC0FC, 0xC0FA, 0xC0FC, 0xC0FC, 0x0, 0x0 }, 0x1, - 0x0 + 0x0, }, { 0x0, @@ -106,9 +108,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0xC0FE, 0xC0FB, 0xC0FE, 0xC0FE, 0x0, 0x0}, + { 0xC0FE, 0xC0FB, 0xC0FE, 0xC0FE, 0x0, 0x0 }, + 0x0, 0x0, - 0x0 }, { 0x16, @@ -118,9 +120,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC0FF, 0xC0FC, 0xC0FF, 0xC0FF, 0x0, 0x0}, + { 0xC0FF, 0xC0FC, 0xC0FF, 0xC0FF, 0x0, 0x0 }, 0x1, - 0x0 + 0x0, }, { 0xDC, @@ -130,9 +132,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC100, 0xC0FD, 0xC100, 0xC100, 0x0, 0x0}, + { 0xC100, 0xC0FD, 0xC100, 0xC100, 0x0, 0x0 }, + 0x0, 0x0, - 0x0 }, { 0xDC, @@ -142,9 +144,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC100, 0xC0FD, 0xC100, 0xC100, 0x0, 0x0}, + { 0xC100, 0xC0FD, 0xC100, 0xC100, 0x0, 0x0 }, + 0x0, 0x0, - 0x0 }, { 0x40, @@ -154,9 +156,9 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC101, 0xC0FE, 0xC101, 0xC101, 0x0, 0x0}, + { 0xC101, 0xC0FE, 0xC101, 0xC101, 0x0, 0x0 }, + 0x0, 0x0, - 0x0 }, { 0xA8, @@ -166,13 +168,13 @@ static const SpriteTemplate Unk_ov84_022411B0[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xC102, 0xC0FE, 0xC101, 0xC101, 0x0, 0x0}, + { 0xC102, 0xC0FE, 0xC101, 0xC101, 0x0, 0x0 }, 0x0, - 0x0 - } + 0x0, + }, }; -void ov84_022403F4 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_022403F4(UnkStruct_ov84_0223B5A0 *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -182,9 +184,9 @@ void ov84_022403F4 (UnkStruct_ov84_0223B5A0 * param0) ov84_02240950(param0); } -static void ov84_02240424 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_02240424(UnkStruct_ov84_0223B5A0 *param0) { - UnkStruct_ov104_02241308 v0 = {10, 6, 9, 9, 0, 0}; + UnkStruct_ov104_02241308 v0 = { 10, 6, 9, 9, 0, 0 }; param0->unk_D8 = sub_0200C6E4(6); param0->unk_DC = sub_0200C704(param0->unk_D8); @@ -215,7 +217,7 @@ static void ov84_02240424 (UnkStruct_ov84_0223B5A0 * param0) sub_0200CB30(param0->unk_D8, param0->unk_DC, &v0); } -static void ov84_022404C0 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_022404C0(UnkStruct_ov84_0223B5A0 *param0) { u32 v0, v1; @@ -262,7 +264,7 @@ static void ov84_022404C0 (UnkStruct_ov84_0223B5A0 * param0) sub_0207C9EC(param0->unk_D8, param0->unk_DC, 49409, 49409); } -static void ov84_02240950 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_02240950(UnkStruct_ov84_0223B5A0 *param0) { u32 v0; @@ -291,12 +293,12 @@ static void ov84_02240950 (UnkStruct_ov84_0223B5A0 * param0) SpriteActor_SetSpritePositionXY(param0->unk_E0[4], 177, 24 + (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04 - 1) * 16); { - VecFx32 v1 = {FX32_ONE, FX32_ONE, FX32_ONE}; + VecFx32 v1 = { FX32_ONE, FX32_ONE, FX32_ONE }; sub_02021C80(param0->unk_E0[0]->unk_00, &v1, 2); } } -void ov84_02240A88 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_02240A88(UnkStruct_ov84_0223B5A0 *param0) { u32 v0; @@ -308,7 +310,7 @@ void ov84_02240A88 (UnkStruct_ov84_0223B5A0 * param0) sub_0200C8D4(param0->unk_D8); } -void ov84_02240ABC (UnkStruct_ov84_0223B5A0 * param0) +void ov84_02240ABC(UnkStruct_ov84_0223B5A0 *param0) { u32 v0; @@ -317,19 +319,19 @@ void ov84_02240ABC (UnkStruct_ov84_0223B5A0 * param0) } } -void ov84_02240AD8 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) +void ov84_02240AD8(UnkStruct_ov84_0223B5A0 *param0, u16 param1) { sub_0200D948(param0->unk_D8, param0->unk_DC, 16, Item_FileID(param1, 1), 0, 49407); sub_0200D97C(param0->unk_D8, param0->unk_DC, 16, Item_FileID(param1, 2), 0, 49404); } -void ov84_02240B34 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +void ov84_02240B34(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { sub_0200D41C(param0->unk_E0[4], param1); sub_0200D41C(param0->unk_E0[1], param1); } -u8 ov84_02240B50 (UnkStruct_ov84_0223B5A0 * param0) +u8 ov84_02240B50(UnkStruct_ov84_0223B5A0 *param0) { if (param0->unk_454.unk_00 == 0) { return 1; @@ -338,7 +340,7 @@ u8 ov84_02240B50 (UnkStruct_ov84_0223B5A0 * param0) return 0; } -void ov84_02240B68 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_02240B68(UnkStruct_ov84_0223B5A0 *param0) { param0->unk_454.unk_03 = 0; param0->unk_454.unk_00 = 1; @@ -346,7 +348,7 @@ void ov84_02240B68 (UnkStruct_ov84_0223B5A0 * param0) ov84_02240C48(param0); } -void ov84_02240B80 (UnkStruct_ov84_0223B5A0 * param0) +void ov84_02240B80(UnkStruct_ov84_0223B5A0 *param0) { switch (param0->unk_454.unk_00) { case 0: @@ -357,7 +359,7 @@ void ov84_02240B80 (UnkStruct_ov84_0223B5A0 * param0) } } -static void ov84_02240B98 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_02240B98(UnkStruct_ov84_0223B5A0 *param0) { VecFx32 v0; @@ -379,12 +381,12 @@ static void ov84_02240B98 (UnkStruct_ov84_0223B5A0 * param0) } } -static u8 ov84_02240C30 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +static u8 ov84_02240C30(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { return 0 * 8 + param0->unk_427 + param0->unk_428 * param1 + 6; } -static void ov84_02240C48 (UnkStruct_ov84_0223B5A0 * param0) +static void ov84_02240C48(UnkStruct_ov84_0223B5A0 *param0) { VecFx32 v0; fx32 v1; @@ -410,7 +412,7 @@ static void ov84_02240C48 (UnkStruct_ov84_0223B5A0 * param0) param0->unk_454.unk_04[7] = 0; } -void ov84_02240CF0 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +void ov84_02240CF0(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { if (param1 == 0) { SpriteActor_SetSpritePositionXY(param0->unk_E0[8], 220, 156); @@ -423,13 +425,13 @@ void ov84_02240CF0 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) ov84_02240D3C(param0, 1); } -void ov84_02240D3C (UnkStruct_ov84_0223B5A0 * param0, u8 param1) +void ov84_02240D3C(UnkStruct_ov84_0223B5A0 *param0, u8 param1) { SpriteActor_EnableObject(param0->unk_E0[8], param1); SpriteActor_EnableObject(param0->unk_E0[9], param1); } -void ov84_02240D5C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u8 param2) +void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2) { u16 v0; u16 v1; @@ -452,7 +454,7 @@ void ov84_02240D5C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u8 param2) sub_0200D41C(param0->unk_E0[11], sub_0207CAA8(v2) + 6); } -void ov84_02240E24 (UnkStruct_ov84_0223B5A0 * param0, s16 param1, s16 param2) +void ov84_02240E24(UnkStruct_ov84_0223B5A0 *param0, s16 param1, s16 param2) { SpriteActor_EnableObject(param0->unk_E0[6], 1); SpriteActor_SetSpritePositionXY(param0->unk_E0[6], param1, param2); @@ -460,7 +462,7 @@ void ov84_02240E24 (UnkStruct_ov84_0223B5A0 * param0, s16 param1, s16 param2) sub_0200D364(param0->unk_E0[6], 0); } -void ov84_02240E5C (UnkStruct_ov84_0223B5A0 * param0) +void ov84_02240E5C(UnkStruct_ov84_0223B5A0 *param0) { if (sub_0200D408(param0->unk_E0[6]) == 1) { sub_0200D34C(param0->unk_E0[6], FX32_ONE); diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 317996538d..1c69c824ea 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -1,45 +1,43 @@ +#include "overlay085/ov85_02241440.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_decls/struct_berry_data_decl.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020972FC.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" -#include "unk_02002B7C.h" -#include "overlay_manager.h" -#include "narc.h" -#include "unk_02006E3C.h" +#include "berry_data.h" +#include "camera.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" #include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02002B7C.h" +#include "unk_02006E3C.h" #include "unk_0200C440.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "camera.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_020393C8.h" #include "unk_0208C098.h" #include "unk_020972FC.h" -#include "berry_data.h" -#include "overlay085/ov85_02241440.h" typedef struct { VecFx16 unk_00; @@ -49,18 +47,18 @@ typedef struct { } UnkStruct_ov85_022420A8; typedef struct { - BGL * unk_00; + BGL *unk_00; Window unk_04[12]; - MessageLoader * unk_C4; - StringTemplate * unk_C8; - UnkStruct_0200C440 * unk_CC; - Camera * camera; + MessageLoader *unk_C4; + StringTemplate *unk_C8; + UnkStruct_0200C440 *unk_CC; + Camera *camera; UnkStruct_ov85_022420A8 unk_D4[4]; UnkStruct_ov85_022420A8 unk_134[4]; UnkStruct_ov85_022420A8 unk_194[4]; u32 unk_1F4; - UnkStruct_020972FC * unk_1F8; - BerryData * unk_1FC; + UnkStruct_020972FC *unk_1F8; + BerryData *unk_1FC; u8 unk_200; u8 unk_201; } UnkStruct_ov85_022417E4; @@ -71,149 +69,149 @@ typedef struct { VecFx16 unk_0C; } UnkStruct_ov85_022423A0; -#define PRM_SIZ(max, min) (FX_F32_TO_FX16(FX_FX16_TO_F32(max - min) / 50)) +#define PRM_SIZ(max, min) (FX_F32_TO_FX16(FX_FX16_TO_F32(max - min) / 50)) -static void ov85_022415F4(void * param0); +static void ov85_022415F4(void *param0); static void ov85_02241614(void); -static void ov85_02241634(BGL * param0); -static void ov85_022416E8(BGL * param0); -static void ov85_02241718(UnkStruct_ov85_022417E4 * param0, NARC * param1); +static void ov85_02241634(BGL *param0); +static void ov85_022416E8(BGL *param0); +static void ov85_02241718(UnkStruct_ov85_022417E4 *param0, NARC *param1); static void ov85_022417CC(void); -static void ov85_022417E4(UnkStruct_ov85_022417E4 * param0); -static void ov85_0224181C(UnkStruct_ov85_022417E4 * param0); -static void ov85_0224183C(UnkStruct_ov85_022417E4 * param0); -static void ov85_02241860(Window * param0); -static void ov85_02241E60(UnkStruct_ov85_022417E4 * param0, NARC * param1); -static void ov85_02241C64(UnkStruct_ov85_022417E4 * param0, u8 param1); -static void ov85_02241CD0(UnkStruct_ov85_022417E4 * param0); -static int ov85_02241CE8(UnkStruct_ov85_022417E4 * param0); -static int ov85_02241D10(UnkStruct_ov85_022417E4 * param0); -static int ov85_02241DF8(UnkStruct_ov85_022417E4 * param0); -static u8 ov85_02241DEC(UnkStruct_ov85_022417E4 * param0); -static u32 ov85_02241EB8(u32 * param0, u32 param1, s32 param2); -static void ov85_02241F0C(UnkStruct_ov85_022417E4 * param0); +static void ov85_022417E4(UnkStruct_ov85_022417E4 *param0); +static void ov85_0224181C(UnkStruct_ov85_022417E4 *param0); +static void ov85_0224183C(UnkStruct_ov85_022417E4 *param0); +static void ov85_02241860(Window *param0); +static void ov85_02241E60(UnkStruct_ov85_022417E4 *param0, NARC *param1); +static void ov85_02241C64(UnkStruct_ov85_022417E4 *param0, u8 param1); +static void ov85_02241CD0(UnkStruct_ov85_022417E4 *param0); +static int ov85_02241CE8(UnkStruct_ov85_022417E4 *param0); +static int ov85_02241D10(UnkStruct_ov85_022417E4 *param0); +static int ov85_02241DF8(UnkStruct_ov85_022417E4 *param0); +static u8 ov85_02241DEC(UnkStruct_ov85_022417E4 *param0); +static u32 ov85_02241EB8(u32 *param0, u32 param1, s32 param2); +static void ov85_02241F0C(UnkStruct_ov85_022417E4 *param0); static void ov85_02241F5C(void); -static void ov85_02241FF0(UnkStruct_ov85_022417E4 * param0); -static void ov85_0224202C(UnkStruct_ov85_022417E4 * param0); -static void ov85_02242038(UnkStruct_ov85_022417E4 * param0); -static void ov85_02242218(UnkStruct_ov85_022417E4 * param0); -static void ov85_02242578(UnkStruct_ov85_022417E4 * param0); -static void ov85_02242144(UnkStruct_ov85_022417E4 * param0); -static void ov85_022420A8(UnkStruct_ov85_022420A8 * param0); -static void ov85_02242124(VecFx16 * param0, VecFx16 * param1); -static void ov85_022423FC(VecFx16 * param0, VecFx16 * param1, VecFx16 * param2); -static void ov85_022423A0(const UnkStruct_ov85_022423A0 * param0, VecFx16 * param1, u8 param2); +static void ov85_02241FF0(UnkStruct_ov85_022417E4 *param0); +static void ov85_0224202C(UnkStruct_ov85_022417E4 *param0); +static void ov85_02242038(UnkStruct_ov85_022417E4 *param0); +static void ov85_02242218(UnkStruct_ov85_022417E4 *param0); +static void ov85_02242578(UnkStruct_ov85_022417E4 *param0); +static void ov85_02242144(UnkStruct_ov85_022417E4 *param0); +static void ov85_022420A8(UnkStruct_ov85_022420A8 *param0); +static void ov85_02242124(VecFx16 *param0, VecFx16 *param1); +static void ov85_022423FC(VecFx16 *param0, VecFx16 *param1, VecFx16 *param2); +static void ov85_022423A0(const UnkStruct_ov85_022423A0 *param0, VecFx16 *param1, u8 param2); static const UnkStruct_ov61_0222C884 Unk_ov85_022428D8[] = { - {0x3, 0x1, 0x0, 0xC, 0x2, 0x2, 0x3E8}, - {0x1, 0x1, 0x3, 0xA, 0x2, 0xF, 0x41}, - {0x3, 0x12, 0x1, 0x7, 0x2, 0xF, 0x200}, - {0x3, 0x1A, 0x6, 0x6, 0x2, 0xF, 0x20E}, - {0x3, 0x17, 0xC, 0x6, 0x2, 0xF, 0x21A}, - {0x3, 0xE, 0xC, 0x6, 0x2, 0xF, 0x226}, - {0x3, 0xB, 0x6, 0x6, 0x2, 0xF, 0x232}, - {0x3, 0x2, 0xD, 0x6, 0x2, 0xF, 0x23E}, - {0x1, 0x8, 0xD, 0x6, 0x2, 0xF, 0x55}, - {0x3, 0x2, 0xF, 0x6, 0x2, 0xF, 0x24A}, - {0x1, 0x8, 0xF, 0xF, 0x2, 0xF, 0x61}, - {0x1, 0x2, 0x11, 0x1C, 0x6, 0xF, 0x7F} + { 0x3, 0x1, 0x0, 0xC, 0x2, 0x2, 0x3E8 }, + { 0x1, 0x1, 0x3, 0xA, 0x2, 0xF, 0x41 }, + { 0x3, 0x12, 0x1, 0x7, 0x2, 0xF, 0x200 }, + { 0x3, 0x1A, 0x6, 0x6, 0x2, 0xF, 0x20E }, + { 0x3, 0x17, 0xC, 0x6, 0x2, 0xF, 0x21A }, + { 0x3, 0xE, 0xC, 0x6, 0x2, 0xF, 0x226 }, + { 0x3, 0xB, 0x6, 0x6, 0x2, 0xF, 0x232 }, + { 0x3, 0x2, 0xD, 0x6, 0x2, 0xF, 0x23E }, + { 0x1, 0x8, 0xD, 0x6, 0x2, 0xF, 0x55 }, + { 0x3, 0x2, 0xF, 0x6, 0x2, 0xF, 0x24A }, + { 0x1, 0x8, 0xF, 0xF, 0x2, 0xF, 0x61 }, + { 0x1, 0x2, 0x11, 0x1C, 0x6, 0xF, 0x7F } }; static const UnkStruct_ov85_022423A0 Unk_ov85_02242938[][4] = { { { - {0x580, 0xBAA, 0x0}, - {0x580, 0x647, 0x0}, - {0x0, 0x1C, 0x0} + { 0x580, 0xBAA, 0x0 }, + { 0x580, 0x647, 0x0 }, + { 0x0, 0x1C, 0x0 }, }, { - {0x9EC, 0x740, 0x0}, - {0x60D, 0x5B9, 0x0}, - {0x14, 0x8, 0x0} + { 0x9EC, 0x740, 0x0 }, + { 0x60D, 0x5B9, 0x0 }, + { 0x14, 0x8, 0x0 }, }, { - {0x860, 0xA7, 0x0}, - {0x5DC, 0x4E7, 0x0}, - {0xD, 0xFFFFFFFFFFFFFFEA, 0x0} + { 0x860, 0xA7, 0x0 }, + { 0x5DC, 0x4E7, 0x0 }, + { 0xD, 0xFFFFFFFFFFFFFFEA, 0x0 }, }, { - {0x580, 0x582, 0x0}, - {0x580, 0x582, 0x0}, - {0x0, 0x0, 0x0} - } + { 0x580, 0x582, 0x0 }, + { 0x580, 0x582, 0x0 }, + { 0x0, 0x0, 0x0 }, + }, }, { { - {0x13F, 0x740, 0x0}, - {0x51B, 0x5B9, 0x0}, - {0xFFFFFFFFFFFFFFEC, 0x8, 0x0} + { 0x13F, 0x740, 0x0 }, + { 0x51B, 0x5B9, 0x0 }, + { 0xFFFFFFFFFFFFFFEC, 0x8, 0x0 }, }, { - {0x5A8, 0xBAA, 0x0}, - {0x5A8, 0x647, 0x0}, - {0x0, 0x1C, 0x0} + { 0x5A8, 0xBAA, 0x0 }, + { 0x5A8, 0x647, 0x0 }, + { 0x0, 0x1C, 0x0 }, }, { - {0x5A8, 0x582, 0x0}, - {0x5A8, 0x582, 0x0}, - {0x0, 0x0, 0x0} + { 0x5A8, 0x582, 0x0 }, + { 0x5A8, 0x582, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x2C0, 0xA7, 0x0}, - {0x54B, 0x4E7, 0x0}, - {0xFFFFFFFFFFFFFFF3, 0xFFFFFFFFFFFFFFEA, 0x0} - } + { 0x2C0, 0xA7, 0x0 }, + { 0x54B, 0x4E7, 0x0 }, + { 0xFFFFFFFFFFFFFFF3, 0xFFFFFFFFFFFFFFEA, 0x0 }, + }, }, { { - {0x13F, 0x740, 0x0}, - {0x51B, 0x5B9, 0x0}, - {0xFFFFFFFFFFFFFFEC, 0x8, 0x0} + { 0x13F, 0x740, 0x0 }, + { 0x51B, 0x5B9, 0x0 }, + { 0xFFFFFFFFFFFFFFEC, 0x8, 0x0 }, }, { - {0x5A8, 0x582, 0x0}, - {0x5A8, 0x582, 0x0}, - {0x0, 0x0, 0x0} + { 0x5A8, 0x582, 0x0 }, + { 0x5A8, 0x582, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x860, 0xA7, 0x0}, - {0x5FF, 0x4E7, 0x0}, - {0xC, 0xFFFFFFFFFFFFFFEA, 0x0} + { 0x860, 0xA7, 0x0 }, + { 0x5FF, 0x4E7, 0x0 }, + { 0xC, 0xFFFFFFFFFFFFFFEA, 0x0 }, }, { - {0x2C0, 0xA7, 0x0}, - {0x54B, 0x4E7, 0x0}, - {0xFFFFFFFFFFFFFFF3, 0xFFFFFFFFFFFFFFEA, 0x0} - } + { 0x2C0, 0xA7, 0x0 }, + { 0x54B, 0x4E7, 0x0 }, + { 0xFFFFFFFFFFFFFFF3, 0xFFFFFFFFFFFFFFEA, 0x0 }, + }, }, { { - {0x580, 0x582, 0x0}, - {0x580, 0x582, 0x0}, - {0x0, 0x0, 0x0} + { 0x580, 0x582, 0x0 }, + { 0x580, 0x582, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x9EC, 0x740, 0x0}, - {0x60D, 0x5B9, 0x0}, - {0x14, 0x8, 0x0} + { 0x9EC, 0x740, 0x0 }, + { 0x60D, 0x5B9, 0x0 }, + { 0x14, 0x8, 0x0 }, }, { - {0x860, 0xA7, 0x0}, - {0x5DC, 0x4E7, 0x0}, - {0xD, 0xFFFFFFFFFFFFFFEA, 0x0} + { 0x860, 0xA7, 0x0 }, + { 0x5DC, 0x4E7, 0x0 }, + { 0xD, 0xFFFFFFFFFFFFFFEA, 0x0 }, }, { - {0x2C0, 0xA7, 0x0}, - {0x528, 0x4E7, 0x0}, - {0xFFFFFFFFFFFFFFF4, 0xFFFFFFFFFFFFFFEA, 0x0} - } - } + { 0x2C0, 0xA7, 0x0 }, + { 0x528, 0x4E7, 0x0 }, + { 0xFFFFFFFFFFFFFFF4, 0xFFFFFFFFFFFFFFEA, 0x0 }, + }, + }, }; -int ov85_02241440 (OverlayManager * param0, int * param1) +int ov85_02241440(OverlayManager *param0, int *param1) { - UnkStruct_ov85_022417E4 * v0; - NARC * v1; + UnkStruct_ov85_022417E4 *v0; + NARC *v1; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -261,9 +259,9 @@ int ov85_02241440 (OverlayManager * param0, int * param1) return 1; } -int ov85_0224154C (OverlayManager * param0, int * param1) +int ov85_0224154C(OverlayManager *param0, int *param1) { - UnkStruct_ov85_022417E4 * v0 = OverlayManager_Data(param0); + UnkStruct_ov85_022417E4 *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -287,9 +285,9 @@ int ov85_0224154C (OverlayManager * param0, int * param1) return 0; } -int ov85_022415A0 (OverlayManager * param0, int * param1) +int ov85_022415A0(OverlayManager *param0, int *param1) { - UnkStruct_ov85_022417E4 * v0 = OverlayManager_Data(param0); + UnkStruct_ov85_022417E4 *v0 = OverlayManager_Data(param0); ov85_02241860(v0->unk_04); ov85_022416E8(v0->unk_00); @@ -309,16 +307,16 @@ int ov85_022415A0 (OverlayManager * param0, int * param1) return 1; } -static void ov85_022415F4 (void * param0) +static void ov85_022415F4(void *param0) { - UnkStruct_ov85_022417E4 * v0 = param0; + UnkStruct_ov85_022417E4 *v0 = param0; sub_0201C2B8(v0->unk_00); OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov85_02241614 (void) +static void ov85_02241614(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -336,7 +334,7 @@ static void ov85_02241614 (void) GXLayers_SetBanks(&v0); } -static void ov85_02241634 (BGL * param0) +static void ov85_02241634(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -416,7 +414,7 @@ static void ov85_02241634 (BGL * param0) sub_02019690(1, 32, 0, 36); } -static void ov85_022416E8 (BGL * param0) +static void ov85_022416E8(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 0); sub_02019044(param0, 3); @@ -425,7 +423,7 @@ static void ov85_022416E8 (BGL * param0) Heap_FreeToHeapExplicit(36, param0); } -static void ov85_02241718 (UnkStruct_ov85_022417E4 * param0, NARC * param1) +static void ov85_02241718(UnkStruct_ov85_022417E4 *param0, NARC *param1) { sub_020070E8(param1, 2, param0->unk_00, 2, 0, 0, 0, 36); sub_0200710C(param1, 0, param0->unk_00, 2, 0, 0, 0, 36); @@ -433,7 +431,7 @@ static void ov85_02241718 (UnkStruct_ov85_022417E4 * param0, NARC * param1) sub_02007130(param1, 3, 0, 0, 0, 36); { - u16 * v0; + u16 *v0; u32 v1; v0 = (u16 *)Heap_AllocFromHeap(36, 8 * 8 * 2); @@ -450,26 +448,26 @@ static void ov85_02241718 (UnkStruct_ov85_022417E4 * param0, NARC * param1) sub_02002E7C(0, 15 * 0x20, 36); } -static void ov85_022417CC (void) +static void ov85_022417CC(void) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 23, 8); } -static void ov85_022417E4 (UnkStruct_ov85_022417E4 * param0) +static void ov85_022417E4(UnkStruct_ov85_022417E4 *param0) { param0->unk_C4 = MessageLoader_Init(0, 26, 398, 36); param0->unk_CC = sub_0200C440(15, 2, 0, 36); param0->unk_C8 = StringTemplate_Default(36); } -static void ov85_0224181C (UnkStruct_ov85_022417E4 * param0) +static void ov85_0224181C(UnkStruct_ov85_022417E4 *param0) { MessageLoader_Free(param0->unk_C4); sub_0200C560(param0->unk_CC); StringTemplate_Free(param0->unk_C8); } -static void ov85_0224183C (UnkStruct_ov85_022417E4 * param0) +static void ov85_0224183C(UnkStruct_ov85_022417E4 *param0) { u32 v0; @@ -478,7 +476,7 @@ static void ov85_0224183C (UnkStruct_ov85_022417E4 * param0) } } -static void ov85_02241860 (Window * param0) +static void ov85_02241860(Window *param0) { u32 v0; @@ -487,10 +485,10 @@ static void ov85_02241860 (Window * param0) } } -static void ov85_02241878 (UnkStruct_ov85_022417E4 * param0, u32 param1, u32 param2, u32 param3) +static void ov85_02241878(UnkStruct_ov85_022417E4 *param0, u32 param1, u32 param2, u32 param3) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; v0 = ¶m0->unk_04[param1]; @@ -502,47 +500,47 @@ static void ov85_02241878 (UnkStruct_ov85_022417E4 * param0, u32 param1, u32 par sub_0201A9A4(v0); } -static void ov85_022418CC (UnkStruct_ov85_022417E4 * param0) +static void ov85_022418CC(UnkStruct_ov85_022417E4 *param0) { BGL_FillWindow(¶m0->unk_04[0], 4); - ov85_02241878(param0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((4 & 0xff) << 0))))); + ov85_02241878(param0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((4 & 0xff) << 0)))); } -static void ov85_022418EC (UnkStruct_ov85_022417E4 * param0) +static void ov85_022418EC(UnkStruct_ov85_022417E4 *param0) { BGL_FillWindow(¶m0->unk_04[2], 0); ov85_02241878(param0, 2, 1, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); } -static void ov85_0224190C (UnkStruct_ov85_022417E4 * param0) +static void ov85_0224190C(UnkStruct_ov85_022417E4 *param0) { BGL_FillWindow(¶m0->unk_04[3], 0); ov85_02241878(param0, 3, 2, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); } -static void ov85_0224192C (UnkStruct_ov85_022417E4 * param0) +static void ov85_0224192C(UnkStruct_ov85_022417E4 *param0) { BGL_FillWindow(¶m0->unk_04[4], 0); ov85_02241878(param0, 4, 3, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); } -static void ov85_0224194C (UnkStruct_ov85_022417E4 * param0) +static void ov85_0224194C(UnkStruct_ov85_022417E4 *param0) { BGL_FillWindow(¶m0->unk_04[5], 0); ov85_02241878(param0, 5, 4, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); } -static void ov85_0224196C (UnkStruct_ov85_022417E4 * param0) +static void ov85_0224196C(UnkStruct_ov85_022417E4 *param0) { BGL_FillWindow(¶m0->unk_04[6], 0); ov85_02241878(param0, 6, 5, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))); } -static void ov85_0224198C (UnkStruct_ov85_022417E4 * param0) +static void ov85_0224198C(UnkStruct_ov85_022417E4 *param0) { - Window * v0; - Strbuf* v1; - Strbuf* v2; + Window *v0; + Strbuf *v1; + Strbuf *v2; v0 = ¶m0->unk_04[1]; @@ -565,10 +563,10 @@ static void ov85_0224198C (UnkStruct_ov85_022417E4 * param0) sub_0201A9A4(v0); } -static void ov85_02241A58 (UnkStruct_ov85_022417E4 * param0) +static void ov85_02241A58(UnkStruct_ov85_022417E4 *param0) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_04[11]; @@ -581,10 +579,10 @@ static void ov85_02241A58 (UnkStruct_ov85_022417E4 * param0) sub_0201A9A4(v0); } -static void ov85_02241AA8 (UnkStruct_ov85_022417E4 * param0) +static void ov85_02241AA8(UnkStruct_ov85_022417E4 *param0) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_04[9]; BGL_FillWindow(v0, 0); @@ -595,10 +593,10 @@ static void ov85_02241AA8 (UnkStruct_ov85_022417E4 * param0) sub_0201A9A4(v0); } -static void ov85_02241AF4 (UnkStruct_ov85_022417E4 * param0) +static void ov85_02241AF4(UnkStruct_ov85_022417E4 *param0) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; v0 = ¶m0->unk_04[10]; @@ -618,10 +616,10 @@ static void ov85_02241AF4 (UnkStruct_ov85_022417E4 * param0) sub_0201A9A4(v0); } -static void ov85_02241B50 (UnkStruct_ov85_022417E4 * param0) +static void ov85_02241B50(UnkStruct_ov85_022417E4 *param0) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_04[7]; BGL_FillWindow(v0, 0); @@ -632,11 +630,11 @@ static void ov85_02241B50 (UnkStruct_ov85_022417E4 * param0) sub_0201A9A4(v0); } -static void ov85_02241B9C (UnkStruct_ov85_022417E4 * param0) +static void ov85_02241B9C(UnkStruct_ov85_022417E4 *param0) { - Window * v0; - Strbuf* v1; - Strbuf* v2; + Window *v0; + Strbuf *v1; + Strbuf *v2; u32 v3; v0 = ¶m0->unk_04[8]; @@ -657,7 +655,7 @@ static void ov85_02241B9C (UnkStruct_ov85_022417E4 * param0) sub_0201A9A4(v0); } -static void ov85_02241C64 (UnkStruct_ov85_022417E4 * param0, u8 param1) +static void ov85_02241C64(UnkStruct_ov85_022417E4 *param0, u8 param1) { switch (param1) { case 0: @@ -691,7 +689,7 @@ static void ov85_02241C64 (UnkStruct_ov85_022417E4 * param0, u8 param1) } } -static void ov85_02241CD0 (UnkStruct_ov85_022417E4 * param0) +static void ov85_02241CD0(UnkStruct_ov85_022417E4 *param0) { u32 v0; @@ -700,7 +698,7 @@ static void ov85_02241CD0 (UnkStruct_ov85_022417E4 * param0) } } -static int ov85_02241CE8 (UnkStruct_ov85_022417E4 * param0) +static int ov85_02241CE8(UnkStruct_ov85_022417E4 *param0) { if (ScreenWipe_Done() == 1) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_PLANEMASK_BG2, 16, 0); @@ -710,7 +708,7 @@ static int ov85_02241CE8 (UnkStruct_ov85_022417E4 * param0) return 0; } -static int ov85_02241D10 (UnkStruct_ov85_022417E4 * param0) +static int ov85_02241D10(UnkStruct_ov85_022417E4 *param0) { u32 v0; @@ -762,12 +760,12 @@ static int ov85_02241D10 (UnkStruct_ov85_022417E4 * param0) return 1; } -static u8 ov85_02241DEC (UnkStruct_ov85_022417E4 * param0) +static u8 ov85_02241DEC(UnkStruct_ov85_022417E4 *param0) { return ScreenWipe_Done(); } -static int ov85_02241DF8 (UnkStruct_ov85_022417E4 * param0) +static int ov85_02241DF8(UnkStruct_ov85_022417E4 *param0) { int v0 = 2; @@ -794,23 +792,23 @@ static int ov85_02241DF8 (UnkStruct_ov85_022417E4 * param0) return v0; } -static void ov85_02241E60 (UnkStruct_ov85_022417E4 * param0, NARC * param1) +static void ov85_02241E60(UnkStruct_ov85_022417E4 *param0, NARC *param1) { sub_020070E8(param1, ov85_02241EB0(param0->unk_1F8->unk_08), param0->unk_00, 1, 1, 0, 0, 36); sub_02007130(param1, ov85_02241EB4(param0->unk_1F8->unk_08), 0, 3 * 0x20, 0x20, 36); } -u32 ov85_02241EB0 (u32 param0) +u32 ov85_02241EB0(u32 param0) { return 6 + param0; } -u32 ov85_02241EB4 (u32 param0) +u32 ov85_02241EB4(u32 param0) { return 70 + param0; } -static u32 ov85_02241EB8 (u32 * param0, u32 param1, s32 param2) +static u32 ov85_02241EB8(u32 *param0, u32 param1, s32 param2) { s32 v0 = (s32)param1; @@ -857,9 +855,9 @@ static u32 ov85_02241EB8 (u32 * param0, u32 param1, s32 param2) return param1; } -static void ov85_02241F0C (UnkStruct_ov85_022417E4 * param0) +static void ov85_02241F0C(UnkStruct_ov85_022417E4 *param0) { - NARC * v0; + NARC *v0; Heap_FreeToHeap(param0->unk_1FC); param0->unk_1FC = BerryData_LoadDataByNarcMemberIndex(param0->unk_1F8->unk_08, 36); @@ -872,7 +870,7 @@ static void ov85_02241F0C (UnkStruct_ov85_022417E4 * param0) sub_02019448(param0->unk_00, 1); } -static void ov85_02241F5C (void) +static void ov85_02241F5C(void) { G3X_Init(); G3X_InitMtxStack(); @@ -891,7 +889,7 @@ static void ov85_02241F5C (void) G2_SetBG0Priority(0); } -static void ov85_02241FF0 (UnkStruct_ov85_022417E4 * param0) +static void ov85_02241FF0(UnkStruct_ov85_022417E4 *param0) { sub_020241B4(); Camera_ComputeViewMatrix(); @@ -907,15 +905,15 @@ static void ov85_02241FF0 (UnkStruct_ov85_022417E4 * param0) G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } -static void ov85_0224202C (UnkStruct_ov85_022417E4 * param0) +static void ov85_0224202C(UnkStruct_ov85_022417E4 *param0) { Camera_Delete(param0->camera); } -static void ov85_02242038 (UnkStruct_ov85_022417E4 * param0) +static void ov85_02242038(UnkStruct_ov85_022417E4 *param0) { - VecFx32 v0 = {0, 0, 0x10000}; - CameraAngle v1 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0x10000 }; + CameraAngle v1 = { 0, 0, 0 }; fx32 v2 = 0x10000; u16 v3 = 0x5c1; @@ -927,7 +925,7 @@ static void ov85_02242038 (UnkStruct_ov85_022417E4 * param0) Camera_SetAsActive(param0->camera); } -static void ov85_022420A8 (UnkStruct_ov85_022420A8 * param0) +static void ov85_022420A8(UnkStruct_ov85_022420A8 *param0) { G3_PolygonAttr(GX_LIGHTMASK_NONE, GX_POLYGONMODE_MODULATE, GX_CULL_NONE, 18, 24, 0); G3_Begin(GX_BEGIN_QUADS); @@ -950,14 +948,14 @@ static void ov85_022420A8 (UnkStruct_ov85_022420A8 * param0) G3_End(); } -static void ov85_02242124 (VecFx16 * param0, VecFx16 * param1) +static void ov85_02242124(VecFx16 *param0, VecFx16 *param1) { param0->x += param1->x; param0->y += param1->y; param0->z += param1->z; } -static void ov85_02242144 (UnkStruct_ov85_022417E4 * param0) +static void ov85_02242144(UnkStruct_ov85_022417E4 *param0) { u32 v0; @@ -981,7 +979,7 @@ static void ov85_02242144 (UnkStruct_ov85_022417E4 * param0) param0->unk_1F4++; } -static void ov85_02242218 (UnkStruct_ov85_022417E4 * param0) +static void ov85_02242218(UnkStruct_ov85_022417E4 *param0) { u32 v0; @@ -1008,7 +1006,7 @@ static void ov85_02242218 (UnkStruct_ov85_022417E4 * param0) ov85_02242578(param0); } -static void ov85_022423A0 (const UnkStruct_ov85_022423A0 * param0, VecFx16 * param1, u8 param2) +static void ov85_022423A0(const UnkStruct_ov85_022423A0 *param0, VecFx16 *param1, u8 param2) { if (param2 == 0xff) { *param1 = param0->unk_00; @@ -1021,14 +1019,14 @@ static void ov85_022423A0 (const UnkStruct_ov85_022423A0 * param0, VecFx16 * par } } -static void ov85_022423FC (VecFx16 * param0, VecFx16 * param1, VecFx16 * param2) +static void ov85_022423FC(VecFx16 *param0, VecFx16 *param1, VecFx16 *param2) { param2->x = FX_F32_TO_FX16(FX_FX16_TO_F32(param1->x - param0->x) / 4); param2->y = FX_F32_TO_FX16(FX_FX16_TO_F32(param1->y - param0->y) / 4); param2->z = FX_F32_TO_FX16(FX_FX16_TO_F32(param1->z - param0->z) / 4); } -static void ov85_02242578 (UnkStruct_ov85_022417E4 * param0) +static void ov85_02242578(UnkStruct_ov85_022417E4 *param0) { u32 v0; diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index fccc8c1ad5..b892b5ceb6 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -1,23 +1,21 @@ +#include "overlay086/ov86_0223B140.h" + #include #include -#include "core_sys.h" -#include "inlines.h" -#include "enums.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" - +#include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_02008900.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013610.h" #include "struct_defs/struct_0203E234.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay005/struct_ov5_021DE5D0.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay083/struct_ov83_0223D9A8.h" @@ -25,35 +23,37 @@ #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "core_sys.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "play_time.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "play_time.h" -#include "pokemon.h" -#include "party.h" -#include "overlay086/ov86_0223B140.h" typedef struct { fx32 unk_00; @@ -67,32 +67,32 @@ typedef struct { int unk_00; int unk_04; int unk_08; - UnkStruct_0203E234 * unk_0C; - BGL * unk_10; + UnkStruct_0203E234 *unk_0C; + BGL *unk_10; Window unk_14; - GraphicElementManager * unk_24; + GraphicElementManager *unk_24; UnkStruct_0200C738 unk_28; - GraphicElementData * unk_1B4[6]; - GraphicElementData * unk_1CC; - void * unk_1D0; - void * unk_1D4; + GraphicElementData *unk_1B4[6]; + GraphicElementData *unk_1CC; + void *unk_1D0; + void *unk_1D4; SpriteAnimationFrame unk_1D8[6][10]; int unk_2C8[6]; int unk_2E0[6]; u32 unk_2F8[6]; u8 unk_310[6400]; - Camera * camera; + Camera *camera; VecFx32 unk_1C14; CameraAngle cameraAngle; - SysTask * unk_1C28; - SysTask * unk_1C2C; - SysTask * unk_1C30; - SysTask * unk_1C34[4]; - StringTemplate * unk_1C44; - Strbuf* unk_1C48; - Strbuf* unk_1C4C; - MessageLoader * unk_1C50; - NARC * unk_1C54; + SysTask *unk_1C28; + SysTask *unk_1C2C; + SysTask *unk_1C30; + SysTask *unk_1C34[4]; + StringTemplate *unk_1C44; + Strbuf *unk_1C48; + Strbuf *unk_1C4C; + MessageLoader *unk_1C50; + NARC *unk_1C54; } UnkStruct_ov86_0223B3C8; typedef struct { @@ -117,20 +117,20 @@ typedef struct { } UnkStruct_ov86_0223CD94; typedef struct { - void * unk_00; - SysTask ** unk_04; + void *unk_00; + SysTask **unk_04; } UnkStruct_ov86_0223BDAC; typedef struct { UnkStruct_ov86_0223BDAC unk_00; - GraphicElementData * unk_08; + GraphicElementData *unk_08; VecFx32 unk_0C; UnkStruct_ov86_0223D264 unk_18; } UnkStruct_ov86_0223BDE0; typedef struct { UnkStruct_ov86_0223BDAC unk_00; - GraphicElementData * unk_08; + GraphicElementData *unk_08; VecFx32 unk_0C; UnkStruct_ov86_0223D264 unk_18; } UnkStruct_ov86_0223BEA0; @@ -166,8 +166,8 @@ typedef struct { typedef struct { UnkStruct_ov86_0223BDAC unk_00; - GraphicElementData * unk_08; - const SpriteAnimationFrame * unk_0C; + GraphicElementData *unk_08; + const SpriteAnimationFrame *unk_0C; UnkStruct_02008900 unk_10; NNSG2dImageProxy unk_24[2]; BOOL unk_6C; @@ -177,15 +177,15 @@ typedef struct { typedef struct { UnkStruct_ov86_0223BDAC unk_00; - UnkStruct_ov86_0223B3C8 * unk_08; - BGL * unk_0C; - Window * unk_10; - StringTemplate * unk_14; - Strbuf* unk_18; - Strbuf* unk_1C; - MessageLoader * unk_20; - Pokemon * unk_24; - const TrainerInfo * unk_28; + UnkStruct_ov86_0223B3C8 *unk_08; + BGL *unk_0C; + Window *unk_10; + StringTemplate *unk_14; + Strbuf *unk_18; + Strbuf *unk_1C; + MessageLoader *unk_20; + Pokemon *unk_24; + const TrainerInfo *unk_28; int unk_2C; int unk_30; int unk_34; @@ -193,9 +193,9 @@ typedef struct { typedef struct { UnkStruct_ov86_0223BDAC unk_00; - UnkStruct_ov86_0223B3C8 * unk_08; - BGL * unk_0C; - Window * unk_10; + UnkStruct_ov86_0223B3C8 *unk_08; + BGL *unk_0C; + Window *unk_10; UnkStruct_ov86_0223D264 unk_14; int unk_28; int unk_2C; @@ -203,8 +203,8 @@ typedef struct { typedef struct { UnkStruct_ov86_0223BDAC unk_00; - GraphicElementData ** unk_08; - UnkStruct_ov86_0223B3C8 * unk_0C; + GraphicElementData **unk_08; + UnkStruct_ov86_0223B3C8 *unk_0C; int unk_10; int unk_14; int unk_18; @@ -216,14 +216,14 @@ typedef struct { GXDLInfo unk_00; u32 unk_14[512]; u32 unk_814; - SysTask * unk_818[8]; - SysTask * unk_838; + SysTask *unk_818[8]; + SysTask *unk_838; int unk_83C; - UnkStruct_ov86_0223B3C8 * unk_840; + UnkStruct_ov86_0223B3C8 *unk_840; } UnkStruct_ov86_0223C9B0; typedef struct { - GXDLInfo * unk_00; + GXDLInfo *unk_00; u32 unk_04[512]; u32 unk_804; fx32 unk_808; @@ -235,70 +235,70 @@ typedef struct { VecFx16 unk_820; VecFx16 unk_826; VecFx16 unk_82C; - UnkStruct_ov86_0223B3C8 * unk_834; + UnkStruct_ov86_0223B3C8 *unk_834; } UnkStruct_ov86_0223CAE4; -static void inline inline_ov86_0223CB74(UnkStruct_ov86_0223CAE4 * wk); -static BOOL ov86_0223B3C8(UnkStruct_ov86_0223B3C8 * param0); -static BOOL ov86_0223B40C(UnkStruct_ov86_0223B3C8 * param0); -static BOOL ov86_0223B464(UnkStruct_ov86_0223B3C8 * param0); -static BOOL ov86_0223B574(UnkStruct_ov86_0223B3C8 * param0); -static BOOL ov86_0223B684(UnkStruct_ov86_0223B3C8 * param0); -static BOOL ov86_0223B6B4(UnkStruct_ov86_0223B3C8 * param0, int param1); -static void ov86_0223B6CC(SysTask * param0, void * param1); -static SysTask * ov86_0223B744(SysTaskFunc param0, void * param1, int param2); -static void ov86_0223B74C(UnkStruct_ov86_0223B3C8 * param0); -static void ov86_0223B8C4(UnkStruct_ov86_0223B3C8 * param0); -static void ov86_0223B900(UnkStruct_ov86_0223B3C8 * param0); -static void ov86_0223B9A8(UnkStruct_ov86_0223B3C8 * param0); -static void ov86_0223BA34(UnkStruct_ov86_0223B3C8 * param0); -static void ov86_0223BA44(UnkStruct_ov86_0223B3C8 * param0); -static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank * param1, NNSG2dAnimBankData * param2, NARC * param3); -static void ov86_0223BD68(UnkStruct_ov86_0223B3C8 * param0); -static void ov86_0223BDE0(UnkStruct_ov86_0223B3C8 * param0, int param1, int param2); -static void ov86_0223BE6C(SysTask * param0, void * param1); -static void ov86_0223BEA0(UnkStruct_ov86_0223B3C8 * param0, int param1); -static void ov86_0223BF10(SysTask * param0, void * param1); -static void ov86_0223BF44(SysTask * param0, void * param1); -static void ov86_0223BFAC(SysTask * param0, void * param1); -static void ov86_0223C01C(SysTask * param0, void * param1); -static void ov86_0223C090(SysTask * param0, void * param1); -static void ov86_0223C104(UnkStruct_ov86_0223B3C8 * param0, int param1, int param2); -static void ov86_0223C158(UnkStruct_ov86_0223B3C8 * param0, int param1, int param2); -static void ov86_0223C1B8(UnkStruct_ov86_0223B3C8 * param0, int param1); -static void ov86_0223C20C(UnkStruct_ov86_0223B3C8 * param0, int param1); -static void ov86_0223C26C(UnkStruct_ov86_0223B3C8 * param0, int param1); -static void ov86_0223C2CC(UnkStruct_ov86_0223B3C8 * param0, int param1, BOOL param2, int param3); -static void ov86_0223C398(SysTask * param0, void * param1); -static void ov86_0223C3E4(UnkStruct_ov86_0223B3C8 * param0, int param1, int param2); -static void ov86_0223C58C(SysTask * param0, void * param1); -static void ov86_0223C664(UnkStruct_ov86_0223B3C8 * param0, int param1); -static void ov86_0223C6B4(SysTask * param0, void * param1); -static void ov86_0223C72C(UnkStruct_ov86_0223B3C8 * param0); -static void ov86_0223C840(UnkStruct_ov86_0223B3C8 * param0, int param1); -static void ov86_0223C914(SysTask * param0, void * param1); -static SysTask * ov86_0223C9B0(UnkStruct_ov86_0223B3C8 * param0); -static void ov86_0223CA10(SysTask * param0, void * param1); -static void ov86_0223CA64(SysTask * param0, void * param1); -static void ov86_0223CAA0(SysTask * param0, fx16 param1, fx32 param2); -static void ov86_0223CB74(SysTask * param0, void * param1); -static void ov86_0223CD00(SysTask * param0); -static void ov86_0223CD34(SysTask * param0); +static void inline inline_ov86_0223CB74(UnkStruct_ov86_0223CAE4 *wk); +static BOOL ov86_0223B3C8(UnkStruct_ov86_0223B3C8 *param0); +static BOOL ov86_0223B40C(UnkStruct_ov86_0223B3C8 *param0); +static BOOL ov86_0223B464(UnkStruct_ov86_0223B3C8 *param0); +static BOOL ov86_0223B574(UnkStruct_ov86_0223B3C8 *param0); +static BOOL ov86_0223B684(UnkStruct_ov86_0223B3C8 *param0); +static BOOL ov86_0223B6B4(UnkStruct_ov86_0223B3C8 *param0, int param1); +static void ov86_0223B6CC(SysTask *param0, void *param1); +static SysTask *ov86_0223B744(SysTaskFunc param0, void *param1, int param2); +static void ov86_0223B74C(UnkStruct_ov86_0223B3C8 *param0); +static void ov86_0223B8C4(UnkStruct_ov86_0223B3C8 *param0); +static void ov86_0223B900(UnkStruct_ov86_0223B3C8 *param0); +static void ov86_0223B9A8(UnkStruct_ov86_0223B3C8 *param0); +static void ov86_0223BA34(UnkStruct_ov86_0223B3C8 *param0); +static void ov86_0223BA44(UnkStruct_ov86_0223B3C8 *param0); +static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *param1, NNSG2dAnimBankData *param2, NARC *param3); +static void ov86_0223BD68(UnkStruct_ov86_0223B3C8 *param0); +static void ov86_0223BDE0(UnkStruct_ov86_0223B3C8 *param0, int param1, int param2); +static void ov86_0223BE6C(SysTask *param0, void *param1); +static void ov86_0223BEA0(UnkStruct_ov86_0223B3C8 *param0, int param1); +static void ov86_0223BF10(SysTask *param0, void *param1); +static void ov86_0223BF44(SysTask *param0, void *param1); +static void ov86_0223BFAC(SysTask *param0, void *param1); +static void ov86_0223C01C(SysTask *param0, void *param1); +static void ov86_0223C090(SysTask *param0, void *param1); +static void ov86_0223C104(UnkStruct_ov86_0223B3C8 *param0, int param1, int param2); +static void ov86_0223C158(UnkStruct_ov86_0223B3C8 *param0, int param1, int param2); +static void ov86_0223C1B8(UnkStruct_ov86_0223B3C8 *param0, int param1); +static void ov86_0223C20C(UnkStruct_ov86_0223B3C8 *param0, int param1); +static void ov86_0223C26C(UnkStruct_ov86_0223B3C8 *param0, int param1); +static void ov86_0223C2CC(UnkStruct_ov86_0223B3C8 *param0, int param1, BOOL param2, int param3); +static void ov86_0223C398(SysTask *param0, void *param1); +static void ov86_0223C3E4(UnkStruct_ov86_0223B3C8 *param0, int param1, int param2); +static void ov86_0223C58C(SysTask *param0, void *param1); +static void ov86_0223C664(UnkStruct_ov86_0223B3C8 *param0, int param1); +static void ov86_0223C6B4(SysTask *param0, void *param1); +static void ov86_0223C72C(UnkStruct_ov86_0223B3C8 *param0); +static void ov86_0223C840(UnkStruct_ov86_0223B3C8 *param0, int param1); +static void ov86_0223C914(SysTask *param0, void *param1); +static SysTask *ov86_0223C9B0(UnkStruct_ov86_0223B3C8 *param0); +static void ov86_0223CA10(SysTask *param0, void *param1); +static void ov86_0223CA64(SysTask *param0, void *param1); +static void ov86_0223CAA0(SysTask *param0, fx16 param1, fx32 param2); +static void ov86_0223CB74(SysTask *param0, void *param1); +static void ov86_0223CD00(SysTask *param0); +static void ov86_0223CD34(SysTask *param0); static BOOL ov86_0223CD80(void); -static SysTask * ov86_0223CD94(UnkStruct_ov86_0223B3C8 * param0); -static void ov86_0223CF44(SysTask * param0); -static void ov86_0223CF5C(SysTask * param0); -static void ov86_0223CF6C(SysTask * param0, void * param1); -static void ov86_0223D220(SysTask * param0); -static void ov86_0223D264(UnkStruct_ov86_0223D264 * param0, fx32 param1, fx32 param2, int param3); -static fx32 ov86_0223D284(UnkStruct_ov86_0223D264 * param0); -static BOOL ov86_0223D2A4(UnkStruct_ov86_0223D264 * param0); -static int ov86_0223D2A8(UnkStruct_ov86_0223B3C8 * param0, Pokemon * param1, const TrainerInfo * param2); -static SysTask * ov86_0223CAE4(UnkStruct_ov86_0223C9B0 * param0, fx16 param1, fx32 param2, int param3); +static SysTask *ov86_0223CD94(UnkStruct_ov86_0223B3C8 *param0); +static void ov86_0223CF44(SysTask *param0); +static void ov86_0223CF5C(SysTask *param0); +static void ov86_0223CF6C(SysTask *param0, void *param1); +static void ov86_0223D220(SysTask *param0); +static void ov86_0223D264(UnkStruct_ov86_0223D264 *param0, fx32 param1, fx32 param2, int param3); +static fx32 ov86_0223D284(UnkStruct_ov86_0223D264 *param0); +static BOOL ov86_0223D2A4(UnkStruct_ov86_0223D264 *param0); +static int ov86_0223D2A8(UnkStruct_ov86_0223B3C8 *param0, Pokemon *param1, const TrainerInfo *param2); +static SysTask *ov86_0223CAE4(UnkStruct_ov86_0223C9B0 *param0, fx16 param1, fx32 param2, int param3); -int ov86_0223B140 (OverlayManager * param0, int * param1) +int ov86_0223B140(OverlayManager *param0, int *param1) { - UnkStruct_ov86_0223B3C8 * v0; + UnkStruct_ov86_0223B3C8 *v0; SetMainCallback(NULL, NULL); Heap_Create(3, 63, 196608); @@ -352,12 +352,11 @@ int ov86_0223B140 (OverlayManager * param0, int * param1) return 1; } -int ov86_0223B2E4 (OverlayManager * param0, int * param1) +int ov86_0223B2E4(OverlayManager *param0, int *param1) { switch (*param1) { - case 0: - { - UnkStruct_ov86_0223B3C8 * v0 = OverlayManager_Data(param0); + case 0: { + UnkStruct_ov86_0223B3C8 *v0 = OverlayManager_Data(param0); SysTask_Done(v0->unk_1C28); @@ -386,9 +385,9 @@ int ov86_0223B2E4 (OverlayManager * param0, int * param1) return 0; } -int ov86_0223B394 (OverlayManager * param0, int * param1) +int ov86_0223B394(OverlayManager *param0, int *param1) { - static BOOL(*const v0[])(UnkStruct_ov86_0223B3C8 *) = { + static BOOL (*const v0[])(UnkStruct_ov86_0223B3C8 *) = { ov86_0223B3C8, ov86_0223B464, ov86_0223B574, @@ -396,7 +395,7 @@ int ov86_0223B394 (OverlayManager * param0, int * param1) ov86_0223B40C }; - UnkStruct_ov86_0223B3C8 * v1 = OverlayManager_Data(param0); + UnkStruct_ov86_0223B3C8 *v1 = OverlayManager_Data(param0); if ((*param1) < NELEMS(v0)) { if (v0[(*param1)](v1)) { @@ -411,7 +410,7 @@ int ov86_0223B394 (OverlayManager * param0, int * param1) return 1; } -static BOOL ov86_0223B3C8 (UnkStruct_ov86_0223B3C8 * param0) +static BOOL ov86_0223B3C8(UnkStruct_ov86_0223B3C8 *param0) { switch (param0->unk_00) { case 0: @@ -427,7 +426,7 @@ static BOOL ov86_0223B3C8 (UnkStruct_ov86_0223B3C8 * param0) return 0; } -static BOOL ov86_0223B40C (UnkStruct_ov86_0223B3C8 * param0) +static BOOL ov86_0223B40C(UnkStruct_ov86_0223B3C8 *param0) { switch (param0->unk_00) { case 0: @@ -444,7 +443,7 @@ static BOOL ov86_0223B40C (UnkStruct_ov86_0223B3C8 * param0) return 0; } -static BOOL ov86_0223B464 (UnkStruct_ov86_0223B3C8 * param0) +static BOOL ov86_0223B464(UnkStruct_ov86_0223B3C8 *param0) { static int v0 = 0; @@ -501,7 +500,7 @@ static BOOL ov86_0223B464 (UnkStruct_ov86_0223B3C8 * param0) return 0; } -static BOOL ov86_0223B574 (UnkStruct_ov86_0223B3C8 * param0) +static BOOL ov86_0223B574(UnkStruct_ov86_0223B3C8 *param0) { if (param0->unk_08) { param0->unk_08--; @@ -560,7 +559,7 @@ static BOOL ov86_0223B574 (UnkStruct_ov86_0223B3C8 * param0) return 0; } -static BOOL ov86_0223B684 (UnkStruct_ov86_0223B3C8 * param0) +static BOOL ov86_0223B684(UnkStruct_ov86_0223B3C8 *param0) { switch (param0->unk_00) { case 0: @@ -576,14 +575,14 @@ static BOOL ov86_0223B684 (UnkStruct_ov86_0223B3C8 * param0) return 0; } -static BOOL ov86_0223B6B4 (UnkStruct_ov86_0223B3C8 * param0, int param1) +static BOOL ov86_0223B6B4(UnkStruct_ov86_0223B3C8 *param0, int param1) { return param0->unk_1C34[param1] == NULL; } -static void ov86_0223B6CC (SysTask * param0, void * param1) +static void ov86_0223B6CC(SysTask *param0, void *param1) { - UnkStruct_ov86_0223B3C8 * v0 = param1; + UnkStruct_ov86_0223B3C8 *v0 = param1; if (G3X_IsGeometryBusy()) { return; @@ -610,14 +609,14 @@ static void ov86_0223B6CC (SysTask * param0, void * param1) sub_0200A858(); } -static SysTask * ov86_0223B744 (SysTaskFunc param0, void * param1, int param2) +static SysTask *ov86_0223B744(SysTaskFunc param0, void *param1, int param2) { return SysTask_ExecuteOnVBlank(param0, param1, param2); } -static void ov86_0223B74C (UnkStruct_ov86_0223B3C8 * param0) +static void ov86_0223B74C(UnkStruct_ov86_0223B3C8 *param0) { - NARC * v0; + NARC *v0; static const UnkStruct_02099F80 v1 = { GX_VRAM_BG_128_B, GX_VRAM_BGEXTPLTT_NONE, @@ -714,7 +713,7 @@ static void ov86_0223B74C (UnkStruct_ov86_0223B3C8 * param0) NARC_dtor(v0); } -static void ov86_0223B8C4 (UnkStruct_ov86_0223B3C8 * param0) +static void ov86_0223B8C4(UnkStruct_ov86_0223B3C8 *param0) { GX_SetVisibleWnd(GX_WNDMASK_NONE); @@ -725,7 +724,7 @@ static void ov86_0223B8C4 (UnkStruct_ov86_0223B3C8 * param0) Heap_FreeToHeap(param0->unk_10); } -static void ov86_0223B900 (UnkStruct_ov86_0223B3C8 * param0) +static void ov86_0223B900(UnkStruct_ov86_0223B3C8 *param0) { NNS_G3dInit(); @@ -750,7 +749,7 @@ static void ov86_0223B900 (UnkStruct_ov86_0223B3C8 * param0) ov86_0223B9A8(param0); } -static void ov86_0223B9A8 (UnkStruct_ov86_0223B3C8 * param0) +static void ov86_0223B9A8(UnkStruct_ov86_0223B3C8 *param0) { VecFx32 v0; @@ -773,16 +772,16 @@ static void ov86_0223B9A8 (UnkStruct_ov86_0223B3C8 * param0) Camera_SetClipping((1 << FX32_SHIFT), (500 << FX32_SHIFT), param0->camera); } -static void ov86_0223BA34 (UnkStruct_ov86_0223B3C8 * param0) +static void ov86_0223BA34(UnkStruct_ov86_0223B3C8 *param0) { Camera_Delete(param0->camera); } -static void ov86_0223BA44 (UnkStruct_ov86_0223B3C8 * param0) +static void ov86_0223BA44(UnkStruct_ov86_0223B3C8 *param0) { - NNSG2dCellDataBank * v0; - NNSG2dAnimBankData * v1; - NARC * v2; + NNSG2dCellDataBank *v0; + NNSG2dAnimBankData *v1; + NARC *v2; v2 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 63); @@ -799,11 +798,11 @@ static void ov86_0223BA44 (UnkStruct_ov86_0223B3C8 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank * param1, NNSG2dAnimBankData * param2, NARC * param3) +static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *param1, NNSG2dAnimBankData *param2, NARC *param3) { static const UnkStruct_02013610 v0[2] = { - {0, 0, 10, 10}, - {0 + 10, 0, 10, 10} + { 0, 0, 10, 10 }, + { 0 + 10, 0, 10, 10 } }; ArchivedSprite v1; UnkStruct_ov19_021DA864 v2; @@ -811,11 +810,11 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank UnkStruct_ov5_021DE5D0 v4; NNSG2dImageProxy v5; NNSG2dImagePaletteProxy v6; - NNSG2dCharacterData * v7; - NNSG2dPaletteData * v8; - void * v9; - void * v10; - const Pokemon * v11; + NNSG2dCharacterData *v7; + NNSG2dPaletteData *v8; + void *v9; + void *v10; + const Pokemon *v11; int v12, v13; v2.unk_04 = NULL; @@ -890,7 +889,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank Heap_FreeToHeap(v9); } -static void ov86_0223BD68 (UnkStruct_ov86_0223B3C8 * param0) +static void ov86_0223BD68(UnkStruct_ov86_0223B3C8 *param0) { int v0; @@ -904,9 +903,9 @@ static void ov86_0223BD68 (UnkStruct_ov86_0223B3C8 * param0) sub_0200A878(); } -static void ov86_0223BDAC (SysTask * param0, void * param1) +static void ov86_0223BDAC(SysTask *param0, void *param1) { - UnkStruct_ov86_0223BDAC * v0 = param1; + UnkStruct_ov86_0223BDAC *v0 = param1; *(v0->unk_04) = NULL; @@ -914,27 +913,27 @@ static void ov86_0223BDAC (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov86_0223BDC4 (UnkStruct_ov86_0223BDAC * param0, void * param1, SysTask ** param2) +static void ov86_0223BDC4(UnkStruct_ov86_0223BDAC *param0, void *param1, SysTask **param2) { param0->unk_00 = param1; param0->unk_04 = param2; } -static void ov86_0223BDCC (UnkStruct_ov86_0223BDAC * param0) +static void ov86_0223BDCC(UnkStruct_ov86_0223BDAC *param0) { SysTask_ExecuteAfterVBlank(ov86_0223BDAC, param0, 0); } -static void ov86_0223BDE0 (UnkStruct_ov86_0223B3C8 * param0, int param1, int param2) +static void ov86_0223BDE0(UnkStruct_ov86_0223B3C8 *param0, int param1, int param2) { static const struct { fx32 unk_00; fx32 unk_04; } v0[] = { - {786432, 294912}, - {262144, 753664} + { 786432, 294912 }, + { 262144, 753664 } }; - UnkStruct_ov86_0223BDE0 * v1; + UnkStruct_ov86_0223BDE0 *v1; int v2; v1 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223BDE0)); @@ -952,9 +951,9 @@ static void ov86_0223BDE0 (UnkStruct_ov86_0223B3C8 * param0, int param1, int par param0->unk_1C34[param2] = ov86_0223B744(ov86_0223BE6C, v1, 0); } -static void ov86_0223BE6C (SysTask * param0, void * param1) +static void ov86_0223BE6C(SysTask *param0, void *param1) { - UnkStruct_ov86_0223BDE0 * v0 = param1; + UnkStruct_ov86_0223BDE0 *v0 = param1; v0->unk_0C.x = ov86_0223D284(&v0->unk_18); sub_02021C50(v0->unk_08, &v0->unk_0C); @@ -965,9 +964,9 @@ static void ov86_0223BE6C (SysTask * param0, void * param1) } } -static void ov86_0223BEA0 (UnkStruct_ov86_0223B3C8 * param0, int param1) +static void ov86_0223BEA0(UnkStruct_ov86_0223B3C8 *param0, int param1) { - UnkStruct_ov86_0223BEA0 * v0; + UnkStruct_ov86_0223BEA0 *v0; v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223BEA0)); ov86_0223BDC4(&v0->unk_00, v0, &(param0->unk_1C34[param1])); @@ -983,9 +982,9 @@ static void ov86_0223BEA0 (UnkStruct_ov86_0223B3C8 * param0, int param1) param0->unk_1C34[param1] = ov86_0223B744(ov86_0223BF10, v0, 0); } -static void ov86_0223BF10 (SysTask * param0, void * param1) +static void ov86_0223BF10(SysTask *param0, void *param1) { - UnkStruct_ov86_0223BEA0 * v0 = param1; + UnkStruct_ov86_0223BEA0 *v0 = param1; v0->unk_0C.y = ov86_0223D284(&v0->unk_18); sub_02021C50(v0->unk_08, &v0->unk_0C); @@ -996,9 +995,9 @@ static void ov86_0223BF10 (SysTask * param0, void * param1) } } -static void ov86_0223BF44 (SysTask * param0, void * param1) +static void ov86_0223BF44(SysTask *param0, void *param1) { - UnkStruct_ov86_0223BF44 * v0 = param1; + UnkStruct_ov86_0223BF44 *v0 = param1; int v1, v2; v1 = (ov86_0223D284(&(v0->unk_08)) >> FX32_SHIFT); @@ -1028,9 +1027,9 @@ static void ov86_0223BF44 (SysTask * param0, void * param1) } } -static void ov86_0223BFAC (SysTask * param0, void * param1) +static void ov86_0223BFAC(SysTask *param0, void *param1) { - UnkStruct_ov86_0223BFAC * v0 = param1; + UnkStruct_ov86_0223BFAC *v0 = param1; int v1, v2; v1 = (ov86_0223D284(&(v0->unk_08)) >> FX32_SHIFT); @@ -1060,9 +1059,9 @@ static void ov86_0223BFAC (SysTask * param0, void * param1) } } -static void ov86_0223C01C (SysTask * param0, void * param1) +static void ov86_0223C01C(SysTask *param0, void *param1) { - UnkStruct_ov86_0223C01C * v0 = param1; + UnkStruct_ov86_0223C01C *v0 = param1; int v1, v2; v1 = ov86_0223D284(&v0->unk_08) >> FX32_SHIFT; @@ -1092,9 +1091,9 @@ static void ov86_0223C01C (SysTask * param0, void * param1) } } -static void ov86_0223C090 (SysTask * param0, void * param1) +static void ov86_0223C090(SysTask *param0, void *param1) { - UnkStruct_ov86_0223C090 * v0 = param1; + UnkStruct_ov86_0223C090 *v0 = param1; int v1, v2; v1 = ov86_0223D284(&v0->unk_08) >> FX32_SHIFT; @@ -1124,16 +1123,16 @@ static void ov86_0223C090 (SysTask * param0, void * param1) } } -static void ov86_0223C104 (UnkStruct_ov86_0223B3C8 * param0, int param1, int param2) +static void ov86_0223C104(UnkStruct_ov86_0223B3C8 *param0, int param1, int param2) { static const struct { fx32 unk_00; fx32 unk_04; } v0[] = { - {FX32_CONST(-96), FX32_CONST(24)}, - {FX32_CONST(352), FX32_CONST(136)} + { FX32_CONST(-96), FX32_CONST(24) }, + { FX32_CONST(352), FX32_CONST(136) } }; - UnkStruct_ov86_0223BF44 * v1; + UnkStruct_ov86_0223BF44 *v1; int v2; v2 = param1 & 1; @@ -1145,12 +1144,13 @@ static void ov86_0223C104 (UnkStruct_ov86_0223B3C8 * param0, int param1, int par param0->unk_1C34[param2] = ov86_0223B744(ov86_0223BF44, v1, 1); } -static void ov86_0223C158 (UnkStruct_ov86_0223B3C8 * param0, int param1, int param2) +static void ov86_0223C158(UnkStruct_ov86_0223B3C8 *param0, int param1, int param2) { static const int v0[] = { - 24, 136, + 24, + 136, }; - UnkStruct_ov86_0223BFAC * v1; + UnkStruct_ov86_0223BFAC *v1; int v2; v2 = param1 & 1; @@ -1166,9 +1166,9 @@ static void ov86_0223C158 (UnkStruct_ov86_0223B3C8 * param0, int param1, int par param0->unk_1C34[param2] = ov86_0223B744(ov86_0223BFAC, v1, 1); } -static void ov86_0223C1B8 (UnkStruct_ov86_0223B3C8 * param0, int param1) +static void ov86_0223C1B8(UnkStruct_ov86_0223B3C8 *param0, int param1) { - UnkStruct_ov86_0223BFAC * v0; + UnkStruct_ov86_0223BFAC *v0; v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223BFAC)); @@ -1182,9 +1182,9 @@ static void ov86_0223C1B8 (UnkStruct_ov86_0223B3C8 * param0, int param1) param0->unk_1C34[param1] = ov86_0223B744(ov86_0223BFAC, v0, 1); } -static void ov86_0223C20C (UnkStruct_ov86_0223B3C8 * param0, int param1) +static void ov86_0223C20C(UnkStruct_ov86_0223B3C8 *param0, int param1) { - UnkStruct_ov86_0223C01C * v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223C01C)); + UnkStruct_ov86_0223C01C *v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223C01C)); ov86_0223BDC4(&v0->unk_00, v0, &(param0->unk_1C34[param1])); ov86_0223D264(&v0->unk_08, FX32_CONST(88), 0, 12); @@ -1196,9 +1196,9 @@ static void ov86_0223C20C (UnkStruct_ov86_0223B3C8 * param0, int param1) param0->unk_1C34[param1] = ov86_0223B744(ov86_0223C01C, v0, 1); } -static void ov86_0223C26C (UnkStruct_ov86_0223B3C8 * param0, int param1) +static void ov86_0223C26C(UnkStruct_ov86_0223B3C8 *param0, int param1) { - UnkStruct_ov86_0223C090 * v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223C090)); + UnkStruct_ov86_0223C090 *v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223C090)); ov86_0223BDC4(&v0->unk_00, v0, &(param0->unk_1C34[param1])); ov86_0223D264(&v0->unk_08, FX32_CONST(24), FX32_CONST(96), 24); @@ -1210,9 +1210,9 @@ static void ov86_0223C26C (UnkStruct_ov86_0223B3C8 * param0, int param1) param0->unk_1C34[param1] = ov86_0223B744(ov86_0223C090, v0, 1); } -static void ov86_0223C2CC (UnkStruct_ov86_0223B3C8 * param0, int param1, BOOL param2, int param3) +static void ov86_0223C2CC(UnkStruct_ov86_0223B3C8 *param0, int param1, BOOL param2, int param3) { - UnkStruct_ov86_0223C2CC * v0; + UnkStruct_ov86_0223C2CC *v0; int v1; v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223C2CC)); @@ -1235,9 +1235,9 @@ static void ov86_0223C2CC (UnkStruct_ov86_0223B3C8 * param0, int param1, BOOL pa param0->unk_1C34[param3] = SysTask_Start(ov86_0223C398, v0, 0); } -static void ov86_0223C398 (SysTask * param0, void * param1) +static void ov86_0223C398(SysTask *param0, void *param1) { - UnkStruct_ov86_0223C2CC * v0 = param1; + UnkStruct_ov86_0223C2CC *v0 = param1; int v1; if (v0->unk_6C) { @@ -1255,9 +1255,9 @@ static void ov86_0223C398 (SysTask * param0, void * param1) } } -static void ov86_0223C3E4 (UnkStruct_ov86_0223B3C8 * param0, int param1, int param2) +static void ov86_0223C3E4(UnkStruct_ov86_0223B3C8 *param0, int param1, int param2) { - UnkStruct_ov86_0223C3E4 * v0; + UnkStruct_ov86_0223C3E4 *v0; int v1; v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223C3E4)); @@ -1279,7 +1279,7 @@ static void ov86_0223C3E4 (UnkStruct_ov86_0223B3C8 * param0, int param1, int par param0->unk_1C34[param2] = SysTask_Start(ov86_0223C58C, v0, 0); } -static void ov86_0223C47C (UnkStruct_ov86_0223C3E4 * param0, int param1) +static void ov86_0223C47C(UnkStruct_ov86_0223C3E4 *param0, int param1) { int v0, v1, v2; @@ -1292,7 +1292,7 @@ static void ov86_0223C47C (UnkStruct_ov86_0223C3E4 * param0, int param1) } } -static void ov86_0223C4DC (UnkStruct_ov86_0223C3E4 * param0) +static void ov86_0223C4DC(UnkStruct_ov86_0223C3E4 *param0) { StringTemplate_SetSpeciesName(param0->unk_14, 0, Pokemon_GetBoxPokemon(param0->unk_24)); StringTemplate_SetNumber(param0->unk_14, 1, Pokemon_GetLevel(param0->unk_24), 3, 0, 1); @@ -1313,7 +1313,7 @@ static void ov86_0223C4DC (UnkStruct_ov86_0223C3E4 * param0) StringTemplate_Format(param0->unk_14, param0->unk_1C, param0->unk_18); } -static void ov86_0223C54C (UnkStruct_ov86_0223C3E4 * param0) +static void ov86_0223C54C(UnkStruct_ov86_0223C3E4 *param0) { int v0 = ov86_0223D2A8(param0->unk_08, param0->unk_24, param0->unk_28); @@ -1328,9 +1328,9 @@ static void ov86_0223C54C (UnkStruct_ov86_0223C3E4 * param0) StringTemplate_Format(param0->unk_14, param0->unk_1C, param0->unk_18); } -static void ov86_0223C58C (SysTask * param0, void * param1) +static void ov86_0223C58C(SysTask *param0, void *param1) { - UnkStruct_ov86_0223C3E4 * v0 = param1; + UnkStruct_ov86_0223C3E4 *v0 = param1; if (v0->unk_30) { v0->unk_30--; @@ -1371,9 +1371,9 @@ static void ov86_0223C58C (SysTask * param0, void * param1) } } -static void ov86_0223C664 (UnkStruct_ov86_0223B3C8 * param0, int param1) +static void ov86_0223C664(UnkStruct_ov86_0223B3C8 *param0, int param1) { - UnkStruct_ov86_0223C664 * v0; + UnkStruct_ov86_0223C664 *v0; int v1; v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223C664)); @@ -1390,13 +1390,12 @@ static void ov86_0223C664 (UnkStruct_ov86_0223B3C8 * param0, int param1) param0->unk_1C34[param1] = ov86_0223B744(ov86_0223C6B4, v0, 0); } -static void ov86_0223C6B4 (SysTask * param0, void * param1) +static void ov86_0223C6B4(SysTask *param0, void *param1) { - UnkStruct_ov86_0223C664 * v0 = param1; + UnkStruct_ov86_0223C664 *v0 = param1; switch (v0->unk_28) { - case 0: - { + case 0: { int v1 = ov86_0223D284(&v0->unk_14) >> FX32_SHIFT; sub_02019184(v0->unk_0C, v0->unk_2C, 3, v1); @@ -1404,8 +1403,7 @@ static void ov86_0223C6B4 (SysTask * param0, void * param1) if (ov86_0223D2A4(&v0->unk_14)) { v0->unk_28++; } - } - break; + } break; case 1: BGL_FillWindow(v0->unk_10, 0); sub_0201ACCC(v0->unk_10); @@ -1419,7 +1417,7 @@ static void ov86_0223C6B4 (SysTask * param0, void * param1) } } -static void ov86_0223C72C (UnkStruct_ov86_0223B3C8 * param0) +static void ov86_0223C72C(UnkStruct_ov86_0223B3C8 *param0) { int v0; @@ -1440,15 +1438,15 @@ static void ov86_0223C72C (UnkStruct_ov86_0223B3C8 * param0) sub_0201ACCC(¶m0->unk_14); } -static void ov86_0223C840 (UnkStruct_ov86_0223B3C8 * param0, int param1) +static void ov86_0223C840(UnkStruct_ov86_0223B3C8 *param0, int param1) { static const VecFx32 v0[] = { - {FX32_CONST(-40), FX32_CONST(104 - 8), 0}, - {FX32_CONST(296), FX32_CONST(104 - 8), 0}, - {FX32_CONST(-40), FX32_CONST(104 - 16), 0}, - {FX32_CONST(296), FX32_CONST(104 - 16), 0}, - {FX32_CONST(-40), FX32_CONST(104 - 24), 0}, - {FX32_CONST(296), FX32_CONST(104 - 24), 0} + { FX32_CONST(-40), FX32_CONST(104 - 8), 0 }, + { FX32_CONST(296), FX32_CONST(104 - 8), 0 }, + { FX32_CONST(-40), FX32_CONST(104 - 16), 0 }, + { FX32_CONST(296), FX32_CONST(104 - 16), 0 }, + { FX32_CONST(-40), FX32_CONST(104 - 24), 0 }, + { FX32_CONST(296), FX32_CONST(104 - 24), 0 } }; static const fx32 v1[] = { FX32_CONST(128 + 32), @@ -1458,7 +1456,7 @@ static void ov86_0223C840 (UnkStruct_ov86_0223B3C8 * param0, int param1) FX32_CONST(128 + 96), FX32_CONST(128 - 96) }; - UnkStruct_ov86_0223C840 * v2; + UnkStruct_ov86_0223C840 *v2; int v3; v2 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223C840)); @@ -1484,9 +1482,9 @@ static void ov86_0223C840 (UnkStruct_ov86_0223B3C8 * param0, int param1) param0->unk_1C34[param1] = SysTask_Start(ov86_0223C914, v2, 0); } -static void ov86_0223C914 (SysTask * param0, void * param1) +static void ov86_0223C914(SysTask *param0, void *param1) { - UnkStruct_ov86_0223C840 * v0 = param1; + UnkStruct_ov86_0223C840 *v0 = param1; int v1; for (v1 = 0; v1 < v0->unk_10; v1++) { @@ -1515,12 +1513,12 @@ static void ov86_0223C914 (SysTask * param0, void * param1) static u32 Unk_ov86_0223D564 = 0; static BOOL Unk_ov86_0223D540 = 1; -static SysTask * ov86_0223C9B0 (UnkStruct_ov86_0223B3C8 * param0) +static SysTask *ov86_0223C9B0(UnkStruct_ov86_0223B3C8 *param0) { - UnkStruct_ov86_0223C9B0 * v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223C9B0)); + UnkStruct_ov86_0223C9B0 *v0 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223C9B0)); if (v0) { - SysTask * v1; + SysTask *v1; Unk_ov86_0223D540 = 1; Unk_ov86_0223D564 = 2; @@ -1535,10 +1533,10 @@ static SysTask * ov86_0223C9B0 (UnkStruct_ov86_0223B3C8 * param0) return NULL; } -static void ov86_0223CA10 (SysTask * param0, void * param1) +static void ov86_0223CA10(SysTask *param0, void *param1) { if (Unk_ov86_0223D540) { - UnkStruct_ov86_0223C9B0 * v0 = param1; + UnkStruct_ov86_0223C9B0 *v0 = param1; G3_BeginMakeDL(&v0->unk_00, v0->unk_14, sizeof(v0->unk_14)); G3B_MaterialColorDiffAmb(&v0->unk_00, GX_RGB(31, 31, 31), GX_RGB(16, 16, 16), 0); @@ -1549,10 +1547,10 @@ static void ov86_0223CA10 (SysTask * param0, void * param1) } } -static void ov86_0223CA64 (SysTask * param0, void * param1) +static void ov86_0223CA64(SysTask *param0, void *param1) { if (Unk_ov86_0223D540) { - UnkStruct_ov86_0223C9B0 * v0 = param1; + UnkStruct_ov86_0223C9B0 *v0 = param1; v0->unk_814 = G3_EndMakeDL(&v0->unk_00); DC_FlushRange(v0->unk_14, v0->unk_814); } else { @@ -1561,9 +1559,9 @@ static void ov86_0223CA64 (SysTask * param0, void * param1) } } -static void ov86_0223CAA0 (SysTask * param0, fx16 param1, fx32 param2) +static void ov86_0223CAA0(SysTask *param0, fx16 param1, fx32 param2) { - UnkStruct_ov86_0223C9B0 * v0 = SysTask_GetParam(param0); + UnkStruct_ov86_0223C9B0 *v0 = SysTask_GetParam(param0); if (v0->unk_83C < 8) { v0->unk_818[v0->unk_83C] = ov86_0223CAE4(v0, param1, param2, v0->unk_83C); @@ -1572,7 +1570,7 @@ static void ov86_0223CAA0 (SysTask * param0, fx16 param1, fx32 param2) } } -static SysTask * ov86_0223CAE4 (UnkStruct_ov86_0223C9B0 * param0, fx16 param1, fx32 param2, int param3) +static SysTask *ov86_0223CAE4(UnkStruct_ov86_0223C9B0 *param0, fx16 param1, fx32 param2, int param3) { static const int v0[] = { GX_RGB(31, 31, 12), @@ -1592,7 +1590,7 @@ static SysTask * ov86_0223CAE4 (UnkStruct_ov86_0223C9B0 * param0, fx16 param1, f 0xb00, 0xa00 }; - UnkStruct_ov86_0223CAE4 * v2 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223CAE4)); + UnkStruct_ov86_0223CAE4 *v2 = Heap_AllocFromHeap(63, sizeof(UnkStruct_ov86_0223CAE4)); if (v2) { v2->unk_00 = &(param0->unk_00); @@ -1612,7 +1610,7 @@ static SysTask * ov86_0223CAE4 (UnkStruct_ov86_0223C9B0 * param0, fx16 param1, f return NULL; } -static void inline inline_ov86_0223CB74 (UnkStruct_ov86_0223CAE4 * param0) +static void inline inline_ov86_0223CB74(UnkStruct_ov86_0223CAE4 *param0) { { int v0 = param0->unk_808 >> FX32_SHIFT; @@ -1626,10 +1624,10 @@ static void inline inline_ov86_0223CB74 (UnkStruct_ov86_0223CAE4 * param0) } } -static void ov86_0223CB74 (SysTask * param0, void * param1) +static void ov86_0223CB74(SysTask *param0, void *param1) { if (Unk_ov86_0223D540) { - UnkStruct_ov86_0223CAE4 * v0 = param1; + UnkStruct_ov86_0223CAE4 *v0 = param1; v0->unk_808 += v0->unk_80C; @@ -1663,10 +1661,10 @@ static void ov86_0223CB74 (SysTask * param0, void * param1) } } -static void ov86_0223CD00 (SysTask * param0) +static void ov86_0223CD00(SysTask *param0) { if (param0 != NULL) { - UnkStruct_ov86_0223C9B0 * v0 = SysTask_GetParam(param0); + UnkStruct_ov86_0223C9B0 *v0 = SysTask_GetParam(param0); G3_PushMtx(); MI_SendGXCommand(3, v0->unk_14, v0->unk_814); @@ -1674,12 +1672,12 @@ static void ov86_0223CD00 (SysTask * param0) } } -static void ov86_0223CD34 (SysTask * param0) +static void ov86_0223CD34(SysTask *param0) { Unk_ov86_0223D540 = 0; if (param0 != NULL) { - UnkStruct_ov86_0223C9B0 * v0; + UnkStruct_ov86_0223C9B0 *v0; int v1; v0 = SysTask_GetParam(param0); @@ -1692,12 +1690,12 @@ static void ov86_0223CD34 (SysTask * param0) } } -static BOOL ov86_0223CD80 (void) +static BOOL ov86_0223CD80(void) { return Unk_ov86_0223D564 == 0; } -static SysTask * ov86_0223CD94 (UnkStruct_ov86_0223B3C8 * param0) +static SysTask *ov86_0223CD94(UnkStruct_ov86_0223B3C8 *param0) { static const int v0[] = { GX_RGB(16, 28, 21), @@ -1710,12 +1708,12 @@ static SysTask * ov86_0223CD94 (UnkStruct_ov86_0223B3C8 * param0) GX_RGB(22, 0, 31) }; static const VecFx16 v1[4] = { - {-156, -205, 0}, - {156, -205, 0}, - {156, 205, 0}, - {-156, 205, 0} + { -156, -205, 0 }, + { 156, -205, 0 }, + { 156, 205, 0 }, + { -156, 205, 0 } }; - UnkStruct_ov86_0223CD94 * v2; + UnkStruct_ov86_0223CD94 *v2; int v3, v4, v5, v6; s16 v7, v8, v9; @@ -1767,7 +1765,7 @@ static SysTask * ov86_0223CD94 (UnkStruct_ov86_0223B3C8 * param0) return SysTask_Start(ov86_0223CF6C, v2, 2); } -static void ov86_0223CF44 (SysTask * param0) +static void ov86_0223CF44(SysTask *param0) { if (param0) { Heap_FreeToHeap(SysTask_GetParam(param0)); @@ -1775,17 +1773,17 @@ static void ov86_0223CF44 (SysTask * param0) } } -static void ov86_0223CF5C (SysTask * param0) +static void ov86_0223CF5C(SysTask *param0) { if (param0) { - UnkStruct_ov86_0223CD94 * v0 = SysTask_GetParam(param0); + UnkStruct_ov86_0223CD94 *v0 = SysTask_GetParam(param0); v0->unk_00 = 1; } } -static void ov86_0223CF6C (SysTask * param0, void * param1) +static void ov86_0223CF6C(SysTask *param0, void *param1) { - UnkStruct_ov86_0223CD94 * v0 = param1; + UnkStruct_ov86_0223CD94 *v0 = param1; if (v0->unk_00) { int v1, v2; @@ -1865,10 +1863,10 @@ static void ov86_0223CF6C (SysTask * param0, void * param1) } } -static void ov86_0223D220 (SysTask * param0) +static void ov86_0223D220(SysTask *param0) { if (param0) { - UnkStruct_ov86_0223CD94 * v0 = SysTask_GetParam(param0); + UnkStruct_ov86_0223CD94 *v0 = SysTask_GetParam(param0); if (v0->unk_04) { G3_PushMtx(); @@ -1881,7 +1879,7 @@ static void ov86_0223D220 (SysTask * param0) } } -static void ov86_0223D264 (UnkStruct_ov86_0223D264 * param0, fx32 param1, fx32 param2, int param3) +static void ov86_0223D264(UnkStruct_ov86_0223D264 *param0, fx32 param1, fx32 param2, int param3) { param0->unk_00 = param1; param0->unk_08 = param2; @@ -1890,7 +1888,7 @@ static void ov86_0223D264 (UnkStruct_ov86_0223D264 * param0, fx32 param1, fx32 p param0->unk_10 = 0; } -static fx32 ov86_0223D284 (UnkStruct_ov86_0223D264 * param0) +static fx32 ov86_0223D284(UnkStruct_ov86_0223D264 *param0) { if (param0->unk_0C) { param0->unk_0C--; @@ -1902,12 +1900,12 @@ static fx32 ov86_0223D284 (UnkStruct_ov86_0223D264 * param0) } } -static BOOL ov86_0223D2A4 (UnkStruct_ov86_0223D264 * param0) +static BOOL ov86_0223D2A4(UnkStruct_ov86_0223D264 *param0) { return param0->unk_10; } -static int ov86_0223D2A8 (UnkStruct_ov86_0223B3C8 * param0, Pokemon * param1, const TrainerInfo * param2) +static int ov86_0223D2A8(UnkStruct_ov86_0223B3C8 *param0, Pokemon *param1, const TrainerInfo *param2) { BOOL v0; int v1 = 6; diff --git a/src/overlay087/ov87_021D0D80.c b/src/overlay087/ov87_021D0D80.c index 2dee1aa706..f77abdaec2 100644 --- a/src/overlay087/ov87_021D0D80.c +++ b/src/overlay087/ov87_021D0D80.c @@ -1,39 +1,39 @@ +#include "overlay087/ov87_021D0D80.h" + #include #include -#include "core_sys.h" +#include "struct_defs/struct_0202DF8C.h" +#include "overlay087/ov87_021D106C.h" #include "overlay087/struct_ov87_021D106C_decl.h" - -#include "struct_defs/struct_0202DF8C.h" #include "overlay087/struct_ov87_021D12C0.h" -#include "overlay_manager.h" +#include "core_sys.h" #include "heap.h" +#include "overlay_manager.h" #include "strbuf.h" #include "unk_0202DF8C.h" -#include "overlay087/ov87_021D0D80.h" -#include "overlay087/ov87_021D106C.h" typedef struct UnkStruct_ov87_021D0D80_t { UnkStruct_ov87_021D12C0 unk_00; - UnkStruct_ov87_021D106C * unk_C8; - HallOfFame * unk_CC; + UnkStruct_ov87_021D106C *unk_C8; + HallOfFame *unk_CC; int unk_D0; int unk_D4; BOOL unk_D8; } UnkStruct_ov87_021D0D80; -static void ov87_021D0F38(UnkStruct_ov87_021D0D80 * param0, int param1); -static BOOL ov87_021D0F4C(UnkStruct_ov87_021D0D80 * param0); -static BOOL ov87_021D0F88(UnkStruct_ov87_021D0D80 * param0); -static void ov87_021D0FC4(UnkStruct_ov87_021D12C0 * param0, HallOfFame * param1); -static void ov87_021D1000(UnkStruct_ov87_021D12C0 * param0); -static void ov87_021D101C(UnkStruct_ov87_021D12C0 * param0, HallOfFame * param1, int param2); +static void ov87_021D0F38(UnkStruct_ov87_021D0D80 *param0, int param1); +static BOOL ov87_021D0F4C(UnkStruct_ov87_021D0D80 *param0); +static BOOL ov87_021D0F88(UnkStruct_ov87_021D0D80 *param0); +static void ov87_021D0FC4(UnkStruct_ov87_021D12C0 *param0, HallOfFame *param1); +static void ov87_021D1000(UnkStruct_ov87_021D12C0 *param0); +static void ov87_021D101C(UnkStruct_ov87_021D12C0 *param0, HallOfFame *param1, int param2); -int ov87_021D0D80 (OverlayManager * param0, int * param1) +int ov87_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov87_021D0D80 * v0; + UnkStruct_ov87_021D0D80 *v0; Heap_Create(3, 60, 16384); Heap_Create(3, 61, 114688); @@ -54,9 +54,9 @@ int ov87_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov87_021D0DFC (OverlayManager * param0, int * param1) +int ov87_021D0DFC(OverlayManager *param0, int *param1) { - UnkStruct_ov87_021D0D80 * v0 = OverlayManager_Data(param0); + UnkStruct_ov87_021D0D80 *v0 = OverlayManager_Data(param0); ov87_021D1140(v0->unk_C8); ov87_021D1000(&(v0->unk_00)); @@ -67,9 +67,9 @@ int ov87_021D0DFC (OverlayManager * param0, int * param1) return 1; } -int ov87_021D0E2C (OverlayManager * param0, int * param1) +int ov87_021D0E2C(OverlayManager *param0, int *param1) { - UnkStruct_ov87_021D0D80 * v0 = OverlayManager_Data(param0); + UnkStruct_ov87_021D0D80 *v0 = OverlayManager_Data(param0); if (v0->unk_D8) { if (ov87_021D11F8(v0->unk_C8) == 0) { @@ -137,12 +137,12 @@ int ov87_021D0E2C (OverlayManager * param0, int * param1) return 0; } -static void ov87_021D0F38 (UnkStruct_ov87_021D0D80 * param0, int param1) +static void ov87_021D0F38(UnkStruct_ov87_021D0D80 *param0, int param1) { param0->unk_D8 = ov87_021D11D0(param0->unk_C8, param1); } -static BOOL ov87_021D0F4C (UnkStruct_ov87_021D0D80 * param0) +static BOOL ov87_021D0F4C(UnkStruct_ov87_021D0D80 *param0) { if (++(param0->unk_D4) >= param0->unk_D0) { param0->unk_D4 = 0; @@ -153,7 +153,7 @@ static BOOL ov87_021D0F4C (UnkStruct_ov87_021D0D80 * param0) return 1; } -static BOOL ov87_021D0F88 (UnkStruct_ov87_021D0D80 * param0) +static BOOL ov87_021D0F88(UnkStruct_ov87_021D0D80 *param0) { if (--(param0->unk_D4) < 0) { param0->unk_D4 = param0->unk_D0 - 1; @@ -164,7 +164,7 @@ static BOOL ov87_021D0F88 (UnkStruct_ov87_021D0D80 * param0) return 1; } -static void ov87_021D0FC4 (UnkStruct_ov87_021D12C0 * param0, HallOfFame * param1) +static void ov87_021D0FC4(UnkStruct_ov87_021D12C0 *param0, HallOfFame *param1) { int v0; @@ -178,7 +178,7 @@ static void ov87_021D0FC4 (UnkStruct_ov87_021D12C0 * param0, HallOfFame * param1 ov87_021D101C(param0, param1, 0); } -static void ov87_021D1000 (UnkStruct_ov87_021D12C0 * param0) +static void ov87_021D1000(UnkStruct_ov87_021D12C0 *param0) { int v0; @@ -188,7 +188,7 @@ static void ov87_021D1000 (UnkStruct_ov87_021D12C0 * param0) } } -static void ov87_021D101C (UnkStruct_ov87_021D12C0 * param0, HallOfFame * param1, int param2) +static void ov87_021D101C(UnkStruct_ov87_021D12C0 *param0, HallOfFame *param1, int param2) { int v0; diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index ae79028000..1242eb66eb 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -1,92 +1,89 @@ -#include "enums.h" +#include "overlay087/ov87_021D106C.h" #include #include -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "pokemon.h" -#include "overlay087/struct_ov87_021D0D80_decl.h" - #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013610.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay087/struct_ov87_021D0D80_decl.h" #include "overlay087/struct_ov87_021D12C0.h" #include "overlay087/struct_ov87_021D1640.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02002B7C.h" #include "unk_02005474.h" #include "unk_02006224.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "pokemon.h" -#include "overlay087/ov87_021D106C.h" typedef struct UnkStruct_ov87_021D106C_t { - UnkStruct_ov87_021D0D80 * unk_00; - const UnkStruct_ov87_021D12C0 * unk_04; + UnkStruct_ov87_021D0D80 *unk_00; + const UnkStruct_ov87_021D12C0 *unk_04; int unk_08; int unk_0C; - BGL * unk_10; + BGL *unk_10; Window unk_14[2]; - GraphicElementManager * unk_34; + GraphicElementManager *unk_34; UnkStruct_0200C738 unk_38; - GraphicElementData * unk_1C4[6]; - void * unk_1DC; - void * unk_1E0; - MessageLoader * unk_1E4; - MessageLoader * unk_1E8; - MessageLoader * unk_1EC; - StringTemplate * unk_1F0; - Strbuf* unk_1F4; - Strbuf* unk_1F8; - Pokemon * unk_1FC; + GraphicElementData *unk_1C4[6]; + void *unk_1DC; + void *unk_1E0; + MessageLoader *unk_1E4; + MessageLoader *unk_1E8; + MessageLoader *unk_1EC; + StringTemplate *unk_1F0; + Strbuf *unk_1F4; + Strbuf *unk_1F8; + Pokemon *unk_1FC; u8 unk_200[3200]; } UnkStruct_ov87_021D106C; -static void ov87_021D11AC(void * param0); -static BOOL ov87_021D1210(UnkStruct_ov87_021D106C * param0, int * param1); -static BOOL ov87_021D1260(UnkStruct_ov87_021D106C * param0, int * param1); -static BOOL ov87_021D12C0(UnkStruct_ov87_021D106C * param0, int * param1); -static BOOL ov87_021D1334(UnkStruct_ov87_021D106C * param0, int * param1); -static BOOL ov87_021D1384(UnkStruct_ov87_021D106C * param0, int * param1); -static void ov87_021D139C(UnkStruct_ov87_021D106C * param0); -static void ov87_021D14B8(UnkStruct_ov87_021D106C * param0); -static u32 ov87_021D14D4(UnkStruct_ov87_021D106C * param0, u32 param1); -static void ov87_021D1540(UnkStruct_ov87_021D106C * param0); -static void ov87_021D1558(UnkStruct_ov87_021D106C * param0); -static void ov87_021D1568(UnkStruct_ov87_021D106C * param0); -static void ov87_021D1590(UnkStruct_ov87_021D106C * param0); -static void ov87_021D1640(UnkStruct_ov87_021D106C * param0); -static void ov87_021D1818(UnkStruct_ov87_021D106C * param0); -static void ov87_021D186C(UnkStruct_ov87_021D106C * param0); -static void ov87_021D18A0(UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank * param1, NNSG2dAnimBankData * param2); -static void ov87_021D1970(UnkStruct_ov87_021D106C * param0); -static void ov87_021D1AB8(UnkStruct_ov87_021D106C * param0); - -static BOOL (* Unk_ov87_021D1BA0[])(UnkStruct_ov87_021D106C *, int *) = { +static void ov87_021D11AC(void *param0); +static BOOL ov87_021D1210(UnkStruct_ov87_021D106C *param0, int *param1); +static BOOL ov87_021D1260(UnkStruct_ov87_021D106C *param0, int *param1); +static BOOL ov87_021D12C0(UnkStruct_ov87_021D106C *param0, int *param1); +static BOOL ov87_021D1334(UnkStruct_ov87_021D106C *param0, int *param1); +static BOOL ov87_021D1384(UnkStruct_ov87_021D106C *param0, int *param1); +static void ov87_021D139C(UnkStruct_ov87_021D106C *param0); +static void ov87_021D14B8(UnkStruct_ov87_021D106C *param0); +static u32 ov87_021D14D4(UnkStruct_ov87_021D106C *param0, u32 param1); +static void ov87_021D1540(UnkStruct_ov87_021D106C *param0); +static void ov87_021D1558(UnkStruct_ov87_021D106C *param0); +static void ov87_021D1568(UnkStruct_ov87_021D106C *param0); +static void ov87_021D1590(UnkStruct_ov87_021D106C *param0); +static void ov87_021D1640(UnkStruct_ov87_021D106C *param0); +static void ov87_021D1818(UnkStruct_ov87_021D106C *param0); +static void ov87_021D186C(UnkStruct_ov87_021D106C *param0); +static void ov87_021D18A0(UnkStruct_ov87_021D106C *param0, NNSG2dCellDataBank *param1, NNSG2dAnimBankData *param2); +static void ov87_021D1970(UnkStruct_ov87_021D106C *param0); +static void ov87_021D1AB8(UnkStruct_ov87_021D106C *param0); + +static BOOL (*Unk_ov87_021D1BA0[])(UnkStruct_ov87_021D106C *, int *) = { ov87_021D1210, ov87_021D1260, ov87_021D12C0, @@ -94,9 +91,9 @@ static BOOL (* Unk_ov87_021D1BA0[])(UnkStruct_ov87_021D106C *, int *) = { ov87_021D1384, }; -UnkStruct_ov87_021D106C * ov87_021D106C (UnkStruct_ov87_021D0D80 * param0, const UnkStruct_ov87_021D12C0 * param1) +UnkStruct_ov87_021D106C *ov87_021D106C(UnkStruct_ov87_021D0D80 *param0, const UnkStruct_ov87_021D12C0 *param1) { - UnkStruct_ov87_021D106C * v0 = Heap_AllocFromHeap(61, sizeof(UnkStruct_ov87_021D106C)); + UnkStruct_ov87_021D106C *v0 = Heap_AllocFromHeap(61, sizeof(UnkStruct_ov87_021D106C)); if (v0) { v0->unk_00 = param0; @@ -121,7 +118,7 @@ UnkStruct_ov87_021D106C * ov87_021D106C (UnkStruct_ov87_021D0D80 * param0, const return v0; } -void ov87_021D1140 (UnkStruct_ov87_021D106C * param0) +void ov87_021D1140(UnkStruct_ov87_021D106C *param0) { if (param0) { SetMainCallback(NULL, NULL); @@ -139,9 +136,9 @@ void ov87_021D1140 (UnkStruct_ov87_021D106C * param0) } } -static void ov87_021D11AC (void * param0) +static void ov87_021D11AC(void *param0) { - UnkStruct_ov87_021D106C * v0 = param0; + UnkStruct_ov87_021D106C *v0 = param0; sub_020219F8(v0->unk_34); sub_0200A858(); @@ -149,19 +146,19 @@ static void ov87_021D11AC (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -BOOL ov87_021D11D0 (UnkStruct_ov87_021D106C * param0, int param1) +BOOL ov87_021D11D0(UnkStruct_ov87_021D106C *param0, int param1) { param0->unk_0C = param1; param0->unk_08 = 0; return Unk_ov87_021D1BA0[param1](param0, &(param0->unk_08)) == 0; } -BOOL ov87_021D11F8 (UnkStruct_ov87_021D106C * param0) +BOOL ov87_021D11F8(UnkStruct_ov87_021D106C *param0) { return Unk_ov87_021D1BA0[param0->unk_0C](param0, &(param0->unk_08)); } -static BOOL ov87_021D1210 (UnkStruct_ov87_021D106C * param0, int * param1) +static BOOL ov87_021D1210(UnkStruct_ov87_021D106C *param0, int *param1) { switch (*param1) { case 0: @@ -181,7 +178,7 @@ static BOOL ov87_021D1210 (UnkStruct_ov87_021D106C * param0, int * param1) return 0; } -static BOOL ov87_021D1260 (UnkStruct_ov87_021D106C * param0, int * param1) +static BOOL ov87_021D1260(UnkStruct_ov87_021D106C *param0, int *param1) { switch (*param1) { case 0: @@ -201,9 +198,9 @@ static BOOL ov87_021D1260 (UnkStruct_ov87_021D106C * param0, int * param1) return 0; } -static BOOL ov87_021D12C0 (UnkStruct_ov87_021D106C * param0, int * param1) +static BOOL ov87_021D12C0(UnkStruct_ov87_021D106C *param0, int *param1) { - const UnkStruct_ov87_021D12C0 * v0; + const UnkStruct_ov87_021D12C0 *v0; int v1; v0 = param0->unk_04; @@ -226,7 +223,7 @@ static BOOL ov87_021D12C0 (UnkStruct_ov87_021D106C * param0, int * param1) return 1; } -static BOOL ov87_021D1334 (UnkStruct_ov87_021D106C * param0, int * param1) +static BOOL ov87_021D1334(UnkStruct_ov87_021D106C *param0, int *param1) { switch (*param1) { case 0: @@ -249,14 +246,14 @@ static BOOL ov87_021D1334 (UnkStruct_ov87_021D106C * param0, int * param1) return 0; } -static BOOL ov87_021D1384 (UnkStruct_ov87_021D106C * param0, int * param1) +static BOOL ov87_021D1384(UnkStruct_ov87_021D106C *param0, int *param1) { Sound_PlayEffect(1500); ov87_021D1640(param0); return 1; } -static void ov87_021D139C (UnkStruct_ov87_021D106C * param0) +static void ov87_021D139C(UnkStruct_ov87_021D106C *param0) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -332,14 +329,14 @@ static void ov87_021D139C (UnkStruct_ov87_021D106C * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov87_021D14B8 (UnkStruct_ov87_021D106C * param0) +static void ov87_021D14B8(UnkStruct_ov87_021D106C *param0) { sub_02019044(param0->unk_10, 1); sub_02019044(param0->unk_10, 2); ov87_021D1540(param0); } -static u32 ov87_021D14D4 (UnkStruct_ov87_021D106C * param0, u32 param1) +static u32 ov87_021D14D4(UnkStruct_ov87_021D106C *param0, u32 param1) { BGL_AddWindow(param0->unk_10, &(param0->unk_14[0]), 1, 1, 1, 30, 2, 0, param1); @@ -355,7 +352,7 @@ static u32 ov87_021D14D4 (UnkStruct_ov87_021D106C * param0, u32 param1) return param1; } -static void ov87_021D1540 (UnkStruct_ov87_021D106C * param0) +static void ov87_021D1540(UnkStruct_ov87_021D106C *param0) { int v0; @@ -364,13 +361,13 @@ static void ov87_021D1540 (UnkStruct_ov87_021D106C * param0) } } -static void ov87_021D1558 (UnkStruct_ov87_021D106C * param0) +static void ov87_021D1558(UnkStruct_ov87_021D106C *param0) { ov87_021D1590(param0); ov87_021D1640(param0); } -static void ov87_021D1568 (UnkStruct_ov87_021D106C * param0) +static void ov87_021D1568(UnkStruct_ov87_021D106C *param0) { BGL_FillWindow(&(param0->unk_14[0]), 15); BGL_FillWindow(&(param0->unk_14[1]), 15); @@ -378,10 +375,10 @@ static void ov87_021D1568 (UnkStruct_ov87_021D106C * param0) sub_0201ACCC(&(param0->unk_14[1])); } -static void ov87_021D1590 (UnkStruct_ov87_021D106C * param0) +static void ov87_021D1590(UnkStruct_ov87_021D106C *param0) { - const UnkStruct_ov87_021D12C0 * v0 = param0->unk_04; - Window * v1 = &(param0->unk_14[0]); + const UnkStruct_ov87_021D12C0 *v0 = param0->unk_04; + Window *v1 = &(param0->unk_14[0]); StringTemplate_SetNumber(param0->unk_1F0, 0, v0->unk_00, 4, 0, 1); StringTemplate_SetNumber(param0->unk_1F0, 1, v0->unk_04.year + 2000, 4, 0, 1); @@ -394,11 +391,11 @@ static void ov87_021D1590 (UnkStruct_ov87_021D106C * param0) sub_0201ACCC(v1); } -static void ov87_021D1640 (UnkStruct_ov87_021D106C * param0) +static void ov87_021D1640(UnkStruct_ov87_021D106C *param0) { - const UnkStruct_ov87_021D12C0 * v0 = param0->unk_04; - const UnkStruct_ov87_021D1640 * v1 = &(v0->unk_20[v0->unk_18]); - Window * v2 = &(param0->unk_14[1]); + const UnkStruct_ov87_021D12C0 *v0 = param0->unk_04; + const UnkStruct_ov87_021D1640 *v1 = &(v0->unk_20[v0->unk_18]); + Window *v2 = &(param0->unk_14[1]); BGL_FillWindow(v2, 15); @@ -431,8 +428,7 @@ static void ov87_021D1640 (UnkStruct_ov87_021D106C * param0) PrintStringSimple(v2, 0, param0->unk_1F4, 0, 16, 0xff, NULL); PrintStringSimple(v2, 0, v1->unk_04, sub_02002D7C(0, param0->unk_1F4, 0), 16, 0xff, NULL); break; - case UnkEnum_ov87_021D12C0_1: - { + case UnkEnum_ov87_021D12C0_1: { int v3; for (v3 = 0; v3 < 4; v3++) { @@ -443,17 +439,16 @@ static void ov87_021D1640 (UnkStruct_ov87_021D106C * param0) break; } } - } - break; + } break; } sub_0201ACCC(v2); } -static void ov87_021D1818 (UnkStruct_ov87_021D106C * param0) +static void ov87_021D1818(UnkStruct_ov87_021D106C *param0) { - NNSG2dCellDataBank * v0; - NNSG2dAnimBankData * v1; + NNSG2dCellDataBank *v0; + NNSG2dAnimBankData *v1; int v2; param0->unk_1DC = sub_02006FA0(27, 77, 0, &v0, 61); @@ -465,7 +460,7 @@ static void ov87_021D1818 (UnkStruct_ov87_021D106C * param0) ov87_021D1970(param0); } -static void ov87_021D186C (UnkStruct_ov87_021D106C * param0) +static void ov87_021D186C(UnkStruct_ov87_021D106C *param0) { int v0; @@ -479,27 +474,27 @@ static void ov87_021D186C (UnkStruct_ov87_021D106C * param0) Heap_FreeToHeap(param0->unk_1E0); } -static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank * param1, NNSG2dAnimBankData * param2) +static void ov87_021D18A0(UnkStruct_ov87_021D106C *param0, NNSG2dCellDataBank *param1, NNSG2dAnimBankData *param2) { static const struct { int x; int y; } v0[] = { - {120, 56}, - {40, 56}, - {200, 56}, - {136, 112}, - {216, 112}, - {56, 112}, + { 120, 56 }, + { 40, 56 }, + { 200, 56 }, + { 136, 112 }, + { 216, 112 }, + { 56, 112 }, }; UnkStruct_ov19_021DA864 v1; UnkStruct_ov83_0223D9A8 v2; NNSG2dImageProxy v3; NNSG2dImagePaletteProxy v4; - NNSG2dCharacterData * v5; - NNSG2dPaletteData * v6; - void * v7; - void * v8; + NNSG2dCharacterData *v5; + NNSG2dPaletteData *v6; + void *v7; + void *v8; int v9; v1.unk_04 = NULL; @@ -538,13 +533,16 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank Heap_FreeToHeap(v7); } -static void ov87_021D1970 (UnkStruct_ov87_021D106C * param0) +static void ov87_021D1970(UnkStruct_ov87_021D106C *param0) { static const UnkStruct_02013610 v0 = { - 0, 0, 10, 10, + 0, + 0, + 10, + 10, }; ArchivedSprite v1; - const UnkStruct_ov87_021D12C0 * v2; + const UnkStruct_ov87_021D12C0 *v2; int v3; v2 = param0->unk_04; @@ -571,12 +569,12 @@ static void ov87_021D1970 (UnkStruct_ov87_021D106C * param0) sub_02021CAC(param0->unk_1C4[v3], 1); } - for ( ; v3 < 6; v3++) { + for (; v3 < 6; v3++) { sub_02021CAC(param0->unk_1C4[v3], 0); } } -static void ov87_021D1AB8 (UnkStruct_ov87_021D106C * param0) +static void ov87_021D1AB8(UnkStruct_ov87_021D106C *param0) { int v0; diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 48d2065e25..1d3614cc10 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -1,42 +1,57 @@ +#include "overlay088/ov88_0223B140.h" + #include #include -#include "inlines.h" -#include "core_sys.h" - #include "constants/species.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202B370_decl.h" -#include "journal.h" -#include "struct_defs/chatot_cry.h" -#include "pokemon.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_02095E80_decl.h" -#include "savedata.h" - -#include "constdata/const_020F410C.h" - +#include "struct_decls/struct_party_decl.h" #include "struct_defs/archived_sprite.h" -#include "touch_screen.h" +#include "struct_defs/chatot_cry.h" #include "struct_defs/struct_02027F8C.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02095E80_t.h" #include "struct_defs/struct_02099F80.h" + #include "overlay022/struct_ov22_022559F8.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "overlay088/ov88_0223E9C4.h" #include "overlay088/struct_ov88_0223C370.h" #include "overlay088/struct_ov88_0223C8AC.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "bag.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "inlines.h" +#include "item.h" +#include "journal.h" +#include "message.h" +#include "message_util.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "pokemon_summary_app.h" +#include "rtc.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "touch_screen.h" +#include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_020021B0.h" @@ -44,251 +59,229 @@ #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006224.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" #include "unk_0200A9DC.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_020131EC.h" -#include "rtc.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_0202ACE0.h" -#include "journal.h" #include "unk_0202CC64.h" #include "unk_0202CD50.h" #include "unk_0202D778.h" #include "unk_0202F180.h" #include "unk_0203061C.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_02038ED4.h" #include "unk_02038F8C.h" #include "unk_0203909C.h" #include "unk_020393C8.h" -#include "vars_flags.h" #include "unk_0206AFE0.h" -#include "pokemon.h" -#include "pokemon_icon.h" -#include "party.h" -#include "item.h" -#include "bag.h" -#include "pokemon_summary_app.h" #include "unk_02092494.h" #include "unk_02095CD4.h" -#include "overlay088/ov88_0223B140.h" -#include "overlay088/ov88_0223E9C4.h" +#include "vars_flags.h" -static void ov88_0223B2F0(NNSG2dCharacterData * param0, int param1, int param2, int param3, int param4, GraphicElementData * param5); -static void ov88_0223B320(UnkStruct_02095E80 * param0); -static void ov88_0223C0E0(void * param0); +#include "constdata/const_020F410C.h" + +static void ov88_0223B2F0(NNSG2dCharacterData *param0, int param1, int param2, int param3, int param4, GraphicElementData *param5); +static void ov88_0223B320(UnkStruct_02095E80 *param0); +static void ov88_0223C0E0(void *param0); static void ov88_0223C15C(void); -static void ov88_0223C17C(BGL * param0); +static void ov88_0223C17C(BGL *param0); static void ov88_0223C63C(void); -static void ov88_0223C370(UnkStruct_02095E80 * param0, OverlayManager * param1); -static void ov88_0223C44C(BGL * param0); -static void ov88_0223C4E0(BGL * param0, int param1, int param2); -static void ov88_0223C504(UnkStruct_02095E80 * param0, NARC * param1); -static void ov88_0223C66C(UnkStruct_02095E80 * param0, NARC * param1); -static void ov88_0223CBA0(UnkStruct_02095E80 * param0); -static void ov88_0223CE34(u32 * param0); -static void ov88_0223CE74(UnkStruct_02095E80 * param0); -static void ov88_0223CEF0(u16 * param0); -static int ov88_0223CF30(int param0, int param1, UnkStruct_ov88_0223C8AC * param2); -static void ov88_0223CF68(int param0, GraphicElementData * param1, int param2); -static int ov88_0223CFF4(u32 * param0, int * param1, GraphicElementData * param2, UnkStruct_ov88_0223C8AC * param3, int param4); -static int ov88_0223C800(int param0, Pokemon * param1, u8 * param2, ArchivedSprite * param3); -static void ov88_0223E7F0(Journal * param0, Pokemon * param1); -static void ov88_0223D140(ChatotCry * param0); -static void ov88_0223E894(UnkStruct_02095E80 * param0); -static void ov88_0223E8B4(UnkStruct_02095E80 * param0); -static int ov88_0223E8D0(UnkStruct_02095E80 * param0); -static int ov88_0223E914(UnkStruct_02095E80 * param0); -static void ov88_0223E984(UnkStruct_02095E80 * param0); -static void ov88_0223E998(UnkStruct_02095E80 * param0); -static void ov88_0223B710(StringTemplate * param0, Party * param1, int param2); -static void ov88_0223B748(Window * param0, StringTemplate * param1, MessageLoader * param2, Party * param3, int param4); -static void ov88_0223C8D8(Window * param0, int param1, Party * param2, int param3, UnkStruct_02095E80 * param4); -static void ov88_0223E694(Party * param0, Party * param1, int param2, int param3, UnkStruct_ov88_0223C370 * param4); -static void ov88_0223BF7C(UnkStruct_02095E80 * param0); -static void ov88_0223B4F0(UnkStruct_02095E80 * param0); -static void ov88_0223BFD8(UnkStruct_02095E80 * param0); -static void ov88_0223BE28(UnkStruct_02095E80 * param0); -static void ov88_0223CB34(Window * param0, int param1, UnkStruct_02095E80 * param2); -static void ov88_0223BD18(Pokemon * param0, UnkStruct_ov88_0223C8AC * param1); -static void ov88_0223E87C(GraphicElementData * param0, int param1, int param2); -static int ov88_0223C8AC(UnkStruct_ov88_0223C8AC * param0, Party * param1, int param2, int param3); -static void ov88_0223D0C0(SaveData * param0); -static int ov88_0223B914(UnkStruct_02095E80 * param0); -static int ov88_0223BED8(UnkStruct_02095E80 * param0); -static void ov88_0223B7A0(Party * param0, int param1, UnkStruct_02095E80 * param2); -static int ov88_0223D150(UnkStruct_02095E80 * param0); -static int ov88_0223DA00(UnkStruct_02095E80 * param0); -static int ov88_0223DA3C(UnkStruct_02095E80 * param0); -static int ov88_0223E4BC(UnkStruct_02095E80 * param0); -static int ov88_0223D318(UnkStruct_02095E80 * param0); -static int ov88_0223D2C4(UnkStruct_02095E80 * param0); -static int ov88_0223DB48(UnkStruct_02095E80 * param0); -static int ov88_0223DC84(UnkStruct_02095E80 * param0); -static int ov88_0223DCE0(UnkStruct_02095E80 * param0); -static int ov88_0223E5B8(UnkStruct_02095E80 * param0); -static int ov88_0223D434(UnkStruct_02095E80 * param0); -static int ov88_0223D3E0(UnkStruct_02095E80 * param0); -static int ov88_0223E110(UnkStruct_02095E80 * param0); -static int ov88_0223E20C(UnkStruct_02095E80 * param0); -static int ov88_0223E41C(UnkStruct_02095E80 * param0); -static int ov88_0223E478(UnkStruct_02095E80 * param0); -static int ov88_0223DD1C(UnkStruct_02095E80 * param0); -static int ov88_0223DF00(UnkStruct_02095E80 * param0); -static int ov88_0223E384(UnkStruct_02095E80 * param0); -static int ov88_0223E330(UnkStruct_02095E80 * param0); -static void ov88_0223DFF4(UnkStruct_02095E80 * param0); -static void ov88_0223E1AC(UnkStruct_02095E80 * param0); -static void ov88_0223E1C0(UnkStruct_02095E80 * param0, int param1, int param2); +static void ov88_0223C370(UnkStruct_02095E80 *param0, OverlayManager *param1); +static void ov88_0223C44C(BGL *param0); +static void ov88_0223C4E0(BGL *param0, int param1, int param2); +static void ov88_0223C504(UnkStruct_02095E80 *param0, NARC *param1); +static void ov88_0223C66C(UnkStruct_02095E80 *param0, NARC *param1); +static void ov88_0223CBA0(UnkStruct_02095E80 *param0); +static void ov88_0223CE34(u32 *param0); +static void ov88_0223CE74(UnkStruct_02095E80 *param0); +static void ov88_0223CEF0(u16 *param0); +static int ov88_0223CF30(int param0, int param1, UnkStruct_ov88_0223C8AC *param2); +static void ov88_0223CF68(int param0, GraphicElementData *param1, int param2); +static int ov88_0223CFF4(u32 *param0, int *param1, GraphicElementData *param2, UnkStruct_ov88_0223C8AC *param3, int param4); +static int ov88_0223C800(int param0, Pokemon *param1, u8 *param2, ArchivedSprite *param3); +static void ov88_0223E7F0(Journal *param0, Pokemon *param1); +static void ov88_0223D140(ChatotCry *param0); +static void ov88_0223E894(UnkStruct_02095E80 *param0); +static void ov88_0223E8B4(UnkStruct_02095E80 *param0); +static int ov88_0223E8D0(UnkStruct_02095E80 *param0); +static int ov88_0223E914(UnkStruct_02095E80 *param0); +static void ov88_0223E984(UnkStruct_02095E80 *param0); +static void ov88_0223E998(UnkStruct_02095E80 *param0); +static void ov88_0223B710(StringTemplate *param0, Party *param1, int param2); +static void ov88_0223B748(Window *param0, StringTemplate *param1, MessageLoader *param2, Party *param3, int param4); +static void ov88_0223C8D8(Window *param0, int param1, Party *param2, int param3, UnkStruct_02095E80 *param4); +static void ov88_0223E694(Party *param0, Party *param1, int param2, int param3, UnkStruct_ov88_0223C370 *param4); +static void ov88_0223BF7C(UnkStruct_02095E80 *param0); +static void ov88_0223B4F0(UnkStruct_02095E80 *param0); +static void ov88_0223BFD8(UnkStruct_02095E80 *param0); +static void ov88_0223BE28(UnkStruct_02095E80 *param0); +static void ov88_0223CB34(Window *param0, int param1, UnkStruct_02095E80 *param2); +static void ov88_0223BD18(Pokemon *param0, UnkStruct_ov88_0223C8AC *param1); +static void ov88_0223E87C(GraphicElementData *param0, int param1, int param2); +static int ov88_0223C8AC(UnkStruct_ov88_0223C8AC *param0, Party *param1, int param2, int param3); +static void ov88_0223D0C0(SaveData *param0); +static int ov88_0223B914(UnkStruct_02095E80 *param0); +static int ov88_0223BED8(UnkStruct_02095E80 *param0); +static void ov88_0223B7A0(Party *param0, int param1, UnkStruct_02095E80 *param2); +static int ov88_0223D150(UnkStruct_02095E80 *param0); +static int ov88_0223DA00(UnkStruct_02095E80 *param0); +static int ov88_0223DA3C(UnkStruct_02095E80 *param0); +static int ov88_0223E4BC(UnkStruct_02095E80 *param0); +static int ov88_0223D318(UnkStruct_02095E80 *param0); +static int ov88_0223D2C4(UnkStruct_02095E80 *param0); +static int ov88_0223DB48(UnkStruct_02095E80 *param0); +static int ov88_0223DC84(UnkStruct_02095E80 *param0); +static int ov88_0223DCE0(UnkStruct_02095E80 *param0); +static int ov88_0223E5B8(UnkStruct_02095E80 *param0); +static int ov88_0223D434(UnkStruct_02095E80 *param0); +static int ov88_0223D3E0(UnkStruct_02095E80 *param0); +static int ov88_0223E110(UnkStruct_02095E80 *param0); +static int ov88_0223E20C(UnkStruct_02095E80 *param0); +static int ov88_0223E41C(UnkStruct_02095E80 *param0); +static int ov88_0223E478(UnkStruct_02095E80 *param0); +static int ov88_0223DD1C(UnkStruct_02095E80 *param0); +static int ov88_0223DF00(UnkStruct_02095E80 *param0); +static int ov88_0223E384(UnkStruct_02095E80 *param0); +static int ov88_0223E330(UnkStruct_02095E80 *param0); +static void ov88_0223DFF4(UnkStruct_02095E80 *param0); +static void ov88_0223E1AC(UnkStruct_02095E80 *param0); +static void ov88_0223E1C0(UnkStruct_02095E80 *param0, int param1, int param2); static void ov88_0223DE68(VecFx32 param0[], int param1, int param2, int param3, int param4); -static void ov88_0223DE7C(GraphicElementData * param0, GraphicElementData * param1, GraphicElementData * param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC * param5); -static void ov88_0223BDA4(UnkStruct_02095E80 * param0, int param1); -static void ov88_0223E848(UnkStruct_02095E80 * param0); -static void ov88_0223C860(Window * param0, Party * param1, int param2, int param3, int param4); -static int ov88_0223D740(UnkStruct_02095E80 * param0); -static int ov88_0223D7AC(UnkStruct_02095E80 * param0); -static int ov88_0223D854(UnkStruct_02095E80 * param0); -static int ov88_0223D69C(UnkStruct_02095E80 * param0); -static void ov88_0223D1EC(UnkStruct_02095E80 * param0, int param1); -static void ov88_0223D0D4(TrainerInfo * param0, UnkStruct_02027F8C * param1, UnkStruct_02027F8C * param2); -static void ov88_0223C488(NARC * param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); +static void ov88_0223DE7C(GraphicElementData *param0, GraphicElementData *param1, GraphicElementData *param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC *param5); +static void ov88_0223BDA4(UnkStruct_02095E80 *param0, int param1); +static void ov88_0223E848(UnkStruct_02095E80 *param0); +static void ov88_0223C860(Window *param0, Party *param1, int param2, int param3, int param4); +static int ov88_0223D740(UnkStruct_02095E80 *param0); +static int ov88_0223D7AC(UnkStruct_02095E80 *param0); +static int ov88_0223D854(UnkStruct_02095E80 *param0); +static int ov88_0223D69C(UnkStruct_02095E80 *param0); +static void ov88_0223D1EC(UnkStruct_02095E80 *param0, int param1); +static void ov88_0223D0D4(TrainerInfo *param0, UnkStruct_02027F8C *param1, UnkStruct_02027F8C *param2); +static void ov88_0223C488(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7); static const int Unk_ov88_0223EF9C[][2] = { - {0x0, 0x20}, - {0x40, 0x20}, - {0x0, 0x48}, - {0x40, 0x48}, - {0x0, 0x70}, - {0x40, 0x70}, - {0x80, 0x20}, - {0xC0, 0x20}, - {0x80, 0x48}, - {0xC0, 0x48}, - {0x80, 0x70}, - {0xC0, 0x70}, - {0xC0, 0xA0} + { 0x0, 0x20 }, + { 0x40, 0x20 }, + { 0x0, 0x48 }, + { 0x40, 0x48 }, + { 0x0, 0x70 }, + { 0x40, 0x70 }, + { 0x80, 0x20 }, + { 0xC0, 0x20 }, + { 0x80, 0x48 }, + { 0xC0, 0x48 }, + { 0x80, 0x70 }, + { 0xC0, 0x70 }, + { 0xC0, 0xA0 } }; static const int Unk_ov88_0223EF54[][3] = { - {0x3F, 0x58, 0x0}, - {0xC0, 0x58, 0x1}, - {0x10, 0x8, 0x6}, - {0x90, 0x8, 0x6}, - {0x63, 0x8, 0x16}, - {0xE3, 0x8, 0x16} + { 0x3F, 0x58, 0x0 }, + { 0xC0, 0x58, 0x1 }, + { 0x10, 0x8, 0x6 }, + { 0x90, 0x8, 0x6 }, + { 0x63, 0x8, 0x16 }, + { 0xE3, 0x8, 0x16 } }; static const u8 Unk_ov88_0223F004[][4][6] = { { - {0x4, 0x2, 0xC, 0xC}, - {0x2, 0x4, 0xC, 0xC}, - {0x7, 0x6, 0x1, 0x0}, - {0x1, 0x6, 0x7, 0x0} + { 0x4, 0x2, 0xC, 0xC }, + { 0x2, 0x4, 0xC, 0xC }, + { 0x7, 0x6, 0x1, 0x0 }, + { 0x1, 0x6, 0x7, 0x0 }, }, { - {0x5, 0x3, 0xC, 0xC}, - {0x3, 0x5, 0xC, 0xC}, - {0x0, 0x7, 0x6, 0x1}, - {0x6, 0x7, 0x0, 0x1} + { 0x5, 0x3, 0xC, 0xC }, + { 0x3, 0x5, 0xC, 0xC }, + { 0x0, 0x7, 0x6, 0x1 }, + { 0x6, 0x7, 0x0, 0x1 }, }, { - {0x0, 0x0, 0x0, 0x0}, - {0x4, 0x0, 0x0, 0x0}, - {0x9, 0x8, 0x7, 0x6}, - {0x3, 0x1} + { 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x0, 0x0, 0x0 }, + { 0x9, 0x8, 0x7, 0x6 }, + { 0x3, 0x1 }, }, { - {0x1, 0x1, 0x1, 0x1}, - {0x5, 0x1, 0x1, 0x1}, - {0x2, 0x9, 0x8, 0x7}, - {0x8, 0x9, 0x6, 0x6} + { 0x1, 0x1, 0x1, 0x1 }, + { 0x5, 0x1, 0x1, 0x1 }, + { 0x2, 0x9, 0x8, 0x7 }, + { 0x8, 0x9, 0x6, 0x6 }, }, { - {0x2, 0x2, 0x2, 0x2}, - {0x0, 0x0, 0x0, 0x0}, - {0xB, 0xA, 0x9, 0x8, 0x7, 0x6}, - {0x5, 0x3, 0x1} + { 0x2, 0x2, 0x2, 0x2 }, + { 0x0, 0x0, 0x0, 0x0 }, + { 0xB, 0xA, 0x9, 0x8, 0x7, 0x6 }, + { 0x5, 0x3, 0x1 }, }, { - {0x3, 0x3, 0x3, 0x3}, - {0x1, 0x1, 0x1, 0x1}, - {0x4, 0x4, 0x4, 0x4}, - {0xA, 0x8, 0x6} + { 0x3, 0x3, 0x3, 0x3 }, + { 0x1, 0x1, 0x1, 0x1 }, + { 0x4, 0x4, 0x4, 0x4 }, + { 0xA, 0x8, 0x6 }, }, { - {0xA, 0x8, 0xC}, - {0x8, 0xA, 0xC}, - {0x1, 0x0}, - {0x7, 0x0, 0x1} + { 0xA, 0x8, 0xC }, + { 0x8, 0xA, 0xC }, + { 0x1, 0x0 }, + { 0x7, 0x0, 0x1 }, }, { - {0xC}, - {0x9, 0xC}, - {0x6}, - {0x0} + { 0xC }, + { 0x9, 0xC }, + { 0x6 }, + { 0x0 }, }, + { { 0x6 }, + { 0xA, 0x6 }, + { 0x3, 0x2, 0x1, 0x0 }, + { 0x9, 0x7 } }, { - {0x6}, - {0xA, 0x6}, - {0x3, 0x2, 0x1, 0x0}, - {0x9, 0x7} + { 0x7 }, + { 0xB, 0xC }, + { 0x8 }, + { 0x2, 0x0, 0x1 }, }, { - {0x7}, - {0xB, 0xC}, - {0x8}, - {0x2, 0x0, 0x1} + { 0x8 }, + { 0x6 }, + { 0x5, 0x4, 0x3, 0x2, 0x1, 0x0 }, + { 0xB, 0x9, 0x7 }, }, { - {0x8}, - {0x6}, - {0x5, 0x4, 0x3, 0x2, 0x1, 0x0}, - {0xB, 0x9, 0x7} + { 0x9 }, + { 0xC }, + { 0xA }, + { 0x4, 0x2, 0x0 }, }, { - {0x9}, - {0xC}, - {0xA}, - {0x4, 0x2, 0x0} + { 0xB, 0x9, 0x7, 0x6 }, + { 0x7, 0x6 }, + { 0xC }, + { 0xC }, }, - { - {0xB, 0x9, 0x7, 0x6}, - {0x7, 0x6}, - {0xC}, - {0xC} - } }; -int ov88_0223B140 (OverlayManager * param0, int * param1) +int ov88_0223B140(OverlayManager *param0, int *param1) { - UnkStruct_02095E80 * v0; - NARC * v1; + UnkStruct_02095E80 *v0; + NARC *v1; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -347,18 +340,18 @@ int ov88_0223B140 (OverlayManager * param0, int * param1) return 1; } -static void ov88_0223B2F0 (NNSG2dCharacterData * param0, int param1, int param2, int param3, int param4, GraphicElementData * param5) +static void ov88_0223B2F0(NNSG2dCharacterData *param0, int param1, int param2, int param3, int param4, GraphicElementData *param5) { - u8 * v0; + u8 *v0; GX_LoadOBJ(param0->pRawData, ((4 * 32 + 18) + param4 * (4 * 4)) * 0x20, ((4 * 4) * 0x20)); sub_02021EF0(param5, PokeIconPaletteIndex(param1, param2, param3) + 10); } -static void ov88_0223B320 (UnkStruct_02095E80 * param0) +static void ov88_0223B320(UnkStruct_02095E80 *param0) { - Strbuf* v0, * v1, * v2; - TrainerInfo * v3, * v4; + Strbuf *v0, *v1, *v2; + TrainerInfo *v3, *v4; v3 = CommInfo_TrainerInfo(CommSys_CurNetId()); v4 = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); @@ -375,9 +368,9 @@ static void ov88_0223B320 (UnkStruct_02095E80 * param0) Strbuf_Free(v0); } -static void ov88_0223B3C0 (UnkStruct_02095E80 * param0) +static void ov88_0223B3C0(UnkStruct_02095E80 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_DATA__TRADELIST, 26); @@ -415,7 +408,7 @@ static void ov88_0223B3C0 (UnkStruct_02095E80 * param0) NARC_dtor(v0); } -static void ov88_0223B4F0 (UnkStruct_02095E80 * param0) +static void ov88_0223B4F0(UnkStruct_02095E80 *param0) { ov88_0223B710(param0->unk_178, param0->unk_2270, 0); ov88_0223B710(param0->unk_178, param0->unk_2274, 6); @@ -424,9 +417,9 @@ static void ov88_0223B4F0 (UnkStruct_02095E80 * param0) ov88_0223C4E0(param0->unk_174, Party_GetCurrentCount(param0->unk_2270), Party_GetCurrentCount(param0->unk_2274)); } -int ov88_0223B57C (OverlayManager * param0, int * param1) +int ov88_0223B57C(OverlayManager *param0, int *param1) { - UnkStruct_02095E80 * v0 = OverlayManager_Data(param0); + UnkStruct_02095E80 *v0 = OverlayManager_Data(param0); int v1 = 0; switch (*param1) { @@ -509,7 +502,7 @@ int ov88_0223B57C (OverlayManager * param0, int * param1) return v1; } -static void ov88_0223B710 (StringTemplate * param0, Party * param1, int param2) +static void ov88_0223B710(StringTemplate *param0, Party *param1, int param2) { int v0; @@ -518,19 +511,19 @@ static void ov88_0223B710 (StringTemplate * param0, Party * param1, int param2) } } -static void ov88_0223B748 (Window * param0, StringTemplate * param1, MessageLoader * param2, Party * param3, int param4) +static void ov88_0223B748(Window *param0, StringTemplate *param1, MessageLoader *param2, Party *param3, int param4) { int v0; for (v0 = 0; v0 < Party_GetCurrentCount(param3); v0++) { - Strbuf* v1 = MessageUtil_ExpandedStrbuf(param1, param2, 1 + param4 + v0, 26); + Strbuf *v1 = MessageUtil_ExpandedStrbuf(param1, param2, 1 + param4 + v0, 26); ov88_0223EC78(¶m0[v0], v1, 8, 0, 1, 0); Strbuf_Free(v1); } } -static void ov88_0223B7A0 (Party * param0, int param1, UnkStruct_02095E80 * param2) +static void ov88_0223B7A0(Party *param0, int param1, UnkStruct_02095E80 *param2) { int v0; int v1; @@ -567,7 +560,7 @@ static void ov88_0223B7A0 (Party * param0, int param1, UnkStruct_02095E80 * para } } -static int ov88_0223B914 (UnkStruct_02095E80 * param0) +static int ov88_0223B914(UnkStruct_02095E80 *param0) { ov88_0223E998(param0); @@ -579,10 +572,10 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0) { int v0, v1, v2; - Pokemon * v3; + Pokemon *v3; for (v0 = 0; v0 < Party_GetCurrentCount(param0->unk_08->unk_08); v0++) { - Pokemon * v4 = Party_GetPokemonBySlotIndex(param0->unk_08->unk_08, v0); + Pokemon *v4 = Party_GetPokemonBySlotIndex(param0->unk_08->unk_08, v0); v2 = Pokemon_GetValue(v4, MON_DATA_SPECIES_EGG, NULL); @@ -666,8 +659,7 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0) param0->unk_4C++; ov88_0223B4F0(param0); break; - case 11: - { + case 11: { int v5, v6; for (v5 = 0; v5 < 13; v5++) { @@ -675,12 +667,12 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0) } for (v5 = 0; v5 < Party_GetCurrentCount(param0->unk_2270); v5++) { - Pokemon * v7 = Party_GetPokemonBySlotIndex(param0->unk_2270, v5); + Pokemon *v7 = Party_GetPokemonBySlotIndex(param0->unk_2270, v5); ov88_0223BD18(v7, ¶m0->unk_6F4[v5]); } for (v5 = 0; v5 < Party_GetCurrentCount(param0->unk_2274); v5++) { - Pokemon * v8 = Party_GetPokemonBySlotIndex(param0->unk_2274, v5); + Pokemon *v8 = Party_GetPokemonBySlotIndex(param0->unk_2274, v5); ov88_0223BD18(v8, ¶m0->unk_6F4[v5 + 6]); } @@ -729,7 +721,7 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0) break; case 17: if (sub_0200AC1C(1)) { - Pokemon * v10 = Party_GetPokemonBySlotIndex(param0->unk_2270, 0); + Pokemon *v10 = Party_GetPokemonBySlotIndex(param0->unk_2270, 0); param0->unk_2168 = ov88_0223C800(0, v10, param0->unk_848[0], ¶m0->unk_2148[0]); ov88_0223C8D8(param0->unk_49C, 0, param0->unk_2270, 0, param0); @@ -762,7 +754,7 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0) return 0; } -static void ov88_0223BD18 (Pokemon * param0, UnkStruct_ov88_0223C8AC * param1) +static void ov88_0223BD18(Pokemon *param0, UnkStruct_ov88_0223C8AC *param1) { int v0, v1; @@ -788,9 +780,9 @@ static void ov88_0223BD18 (Pokemon * param0, UnkStruct_ov88_0223C8AC * param1) } } -static void ov88_0223BDA4 (UnkStruct_02095E80 * param0, int param1) +static void ov88_0223BDA4(UnkStruct_02095E80 *param0, int param1) { - Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_2274, param1 % 6); + Pokemon *v0 = Party_GetPokemonBySlotIndex(param0->unk_2274, param1 % 6); param0->unk_2168 = ov88_0223C800(1, v0, param0->unk_848[param1 / 6], ¶m0->unk_2148[param1 / 6]); @@ -798,11 +790,11 @@ static void ov88_0223BDA4 (UnkStruct_02095E80 * param0, int param1) SpriteActor_SetSpriteAnimActive(param0->unk_464[3], param0->unk_6F4[param1].unk_04 + 6 - 1); } -static void ov88_0223BE28 (UnkStruct_02095E80 * param0) +static void ov88_0223BE28(UnkStruct_02095E80 *param0) { if (param0->unk_88[0] != 12) { if (param0->unk_88[0] < 6) { - Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_2270, param0->unk_88[0]); + Pokemon *v0 = Party_GetPokemonBySlotIndex(param0->unk_2270, param0->unk_88[0]); param0->unk_2168 = ov88_0223C800(0, v0, param0->unk_848[param0->unk_88[0] / 6], ¶m0->unk_2148[param0->unk_88[0] / 6]); @@ -817,7 +809,7 @@ static void ov88_0223BE28 (UnkStruct_02095E80 * param0) } } -static int ov88_0223BED8 (UnkStruct_02095E80 * param0) +static int ov88_0223BED8(UnkStruct_02095E80 *param0) { if (param0->unk_226C != NULL) { param0->unk_140 = param0->unk_226C(param0); @@ -847,7 +839,7 @@ static int ov88_0223BED8 (UnkStruct_02095E80 * param0) return 1; } -static void ov88_0223BF7C (UnkStruct_02095E80 * param0) +static void ov88_0223BF7C(UnkStruct_02095E80 *param0) { int v0; @@ -867,7 +859,7 @@ static void ov88_0223BF7C (UnkStruct_02095E80 * param0) sub_0201F8B4(); } -static void ov88_0223BFD8 (UnkStruct_02095E80 * param0) +static void ov88_0223BFD8(UnkStruct_02095E80 *param0) { int v0; @@ -880,10 +872,10 @@ static void ov88_0223BFD8 (UnkStruct_02095E80 * param0) } } -int ov88_0223C03C (OverlayManager * param0, int * param1) +int ov88_0223C03C(OverlayManager *param0, int *param1) { - UnkStruct_02095E80 * v0 = OverlayManager_Data(param0); - UnkStruct_ov88_0223C370 * v1 = OverlayManager_Args(param0); + UnkStruct_02095E80 *v0 = OverlayManager_Data(param0); + UnkStruct_ov88_0223C370 *v1 = OverlayManager_Args(param0); int v2; v1->unk_28 = v0->unk_5C; @@ -910,9 +902,9 @@ int ov88_0223C03C (OverlayManager * param0, int * param1) return 1; } -static void ov88_0223C0E0 (void * param0) +static void ov88_0223C0E0(void *param0) { - UnkStruct_02095E80 * v0 = (UnkStruct_02095E80 *)param0; + UnkStruct_02095E80 *v0 = (UnkStruct_02095E80 *)param0; sub_0201C2B8(v0->unk_174); @@ -931,7 +923,7 @@ static void ov88_0223C0E0 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov88_0223C15C (void) +static void ov88_0223C15C(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -949,7 +941,7 @@ static void ov88_0223C15C (void) GXLayers_SetBanks(&v0); } -static void ov88_0223C17C (BGL * param0) +static void ov88_0223C17C(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1132,9 +1124,9 @@ static void ov88_0223C17C (BGL * param0) GX_SetVisibleWnd(GX_WNDMASK_NONE); } -static void ov88_0223C370 (UnkStruct_02095E80 * param0, OverlayManager * param1) +static void ov88_0223C370(UnkStruct_02095E80 *param0, OverlayManager *param1) { - UnkStruct_ov88_0223C370 * v0 = OverlayManager_Args(param1); + UnkStruct_ov88_0223C370 *v0 = OverlayManager_Args(param1); param0->unk_08 = v0; param0->unk_6CC = 4; @@ -1171,7 +1163,7 @@ static void ov88_0223C370 (UnkStruct_02095E80 * param0, OverlayManager * param1) sub_02038F8C(v0->unk_14); } -static void ov88_0223C44C (BGL * param0) +static void ov88_0223C44C(BGL *param0) { sub_02019044(param0, 6); sub_02019044(param0, 5); @@ -1183,12 +1175,12 @@ static void ov88_0223C44C (BGL * param0) sub_02019044(param0, 0); } -static void ov88_0223C488 (NARC * param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +static void ov88_0223C488(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { - void * v0 = sub_0200723C(param0, param1, param6, param7, 1); + void *v0 = sub_0200723C(param0, param1, param6, param7, 1); if (v0 != NULL) { - NNSG2dScreenData * v1; + NNSG2dScreenData *v1; if (NNS_G2dGetUnpackedScreenData(v0, &v1)) { if (param5 == 0) { @@ -1204,15 +1196,15 @@ static void ov88_0223C488 (NARC * param0, u32 param1, BGL * param2, u32 param3, } } -static void ov88_0223C4E0 (BGL * param0, int param1, int param2) +static void ov88_0223C4E0(BGL *param0, int param1, int param2) { int v0; sub_02019460(param0, 2, sub_02019FE4(param0, 2), 32 * 24 * 2, 0); } -static void ov88_0223C504 (UnkStruct_02095E80 * param0, NARC * param1) +static void ov88_0223C504(UnkStruct_02095E80 *param0, NARC *param1) { - BGL * v0 = param0->unk_174; + BGL *v0 = param0->unk_174; sub_02007130(param1, 0, 4, 0, 16 * 9 * 2, 26); sub_02007130(param1, 0, 0, 0, 16 * 9 * 2, 26); @@ -1234,7 +1226,7 @@ static void ov88_0223C504 (UnkStruct_02095E80 * param0, NARC * param1) sub_02019EBC(v0, 4); } -static void ov88_0223C63C (void) +static void ov88_0223C63C(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -1249,7 +1241,7 @@ static void ov88_0223C63C (void) sub_0201F8E4(); } -static void ov88_0223C66C (UnkStruct_02095E80 * param0, NARC * param1) +static void ov88_0223C66C(UnkStruct_02095E80 *param0, NARC *param1) { int v0; @@ -1278,7 +1270,7 @@ static void ov88_0223C66C (UnkStruct_02095E80 * param0, NARC * param1) sub_02006E84(19, PokeIconPalettesFileIndex(), 1, 10 * 0x20, 0x20 * 4, 26); } -static int ov88_0223C800 (int param0, Pokemon * param1, u8 * param2, ArchivedSprite * param3) +static int ov88_0223C800(int param0, Pokemon *param1, u8 *param2, ArchivedSprite *param3) { Pokemon_BuildArchivedSprite(param3, param1, 2); @@ -1294,9 +1286,9 @@ static int ov88_0223C800 (int param0, Pokemon * param1, u8 * param2, ArchivedSpr return param0 + 1; } -static void ov88_0223C860 (Window * param0, Party * param1, int param2, int param3, int param4) +static void ov88_0223C860(Window *param0, Party *param1, int param2, int param3, int param4) { - Strbuf* v0; + Strbuf *v0; v0 = Strbuf_Init(20, 26); @@ -1306,10 +1298,10 @@ static void ov88_0223C860 (Window * param0, Party * param1, int param2, int para Strbuf_Free(v0); } -static int ov88_0223C8AC (UnkStruct_ov88_0223C8AC * param0, Party * param1, int param2, int param3) +static int ov88_0223C8AC(UnkStruct_ov88_0223C8AC *param0, Party *param1, int param2, int param3) { if ((param0->unk_00 == 29) || (param0->unk_00 == 32)) { - Pokemon * v0 = Party_GetPokemonBySlotIndex(param1, param2); + Pokemon *v0 = Party_GetPokemonBySlotIndex(param1, param2); int v1 = Pokemon_GetValue(v0, MON_DATA_HAS_NICKNAME, NULL); if (v1 == 0) { @@ -1320,12 +1312,12 @@ static int ov88_0223C8AC (UnkStruct_ov88_0223C8AC * param0, Party * param1, int return param3; } -static void ov88_0223C8D8 (Window * param0, int param1, Party * param2, int param3, UnkStruct_02095E80 * param4) +static void ov88_0223C8D8(Window *param0, int param1, Party *param2, int param3, UnkStruct_02095E80 *param4) { - Strbuf* v0, * v1; + Strbuf *v0, *v1; u16 v2, v3; int v4; - Pokemon * v5; + Pokemon *v5; v5 = Party_GetPokemonBySlotIndex(param2, param3); v4 = Pokemon_SpriteYOffset(v5, 2); @@ -1390,7 +1382,7 @@ static void ov88_0223C8D8 (Window * param0, int param1, Party * param2, int para Strbuf_Free(v1); } -static void ov88_0223CB34 (Window * param0, int param1, UnkStruct_02095E80 * param2) +static void ov88_0223CB34(Window *param0, int param1, UnkStruct_02095E80 *param2) { sub_02021CAC(param2->unk_464[param1], 0); sub_02021CAC(param2->unk_464[2 + param1], 0); @@ -1401,7 +1393,7 @@ static void ov88_0223CB34 (Window * param0, int param1, UnkStruct_02095E80 * par sub_0201ACF4(¶m0[32 + param1]); } -static void ov88_0223CBA0 (UnkStruct_02095E80 * param0) +static void ov88_0223CBA0(UnkStruct_02095E80 *param0) { sub_020093B4(¶m0->unk_354, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 2, param0->unk_324[0], param0->unk_324[1], param0->unk_324[2], param0->unk_324[3], NULL, NULL); sub_020093B4(¶m0->unk_378, 1, 1, 1, 1, 0xffffffff, 0xffffffff, 0, 0, param0->unk_324[0], param0->unk_324[1], param0->unk_324[2], param0->unk_324[3], NULL, NULL); @@ -1481,7 +1473,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0) } } -static void ov88_0223CE34 (u32 * param0) +static void ov88_0223CE34(u32 *param0) { int v0 = 0; int v1 = 0; @@ -1512,11 +1504,11 @@ static void ov88_0223CE34 (u32 * param0) } static const TouchScreenRect Unk_ov88_0223EE28[] = { - {0x38, 0x88, 0x18, 0x68}, - {0xFF, 0x0, 0x0, 0x0} + { 0x38, 0x88, 0x18, 0x68 }, + { 0xFF, 0x0, 0x0, 0x0 } }; -static void ov88_0223CE74 (UnkStruct_02095E80 * param0) +static void ov88_0223CE74(UnkStruct_02095E80 *param0) { u16 v0, v1; int v2 = -1, v3; @@ -1546,7 +1538,7 @@ static void ov88_0223CE74 (UnkStruct_02095E80 * param0) } } -static void ov88_0223CEF0 (u16 * param0) +static void ov88_0223CEF0(u16 *param0) { fx32 v0; GXRgb v1; @@ -1565,7 +1557,7 @@ static void ov88_0223CEF0 (u16 * param0) GX_LoadOBJPltt((u16 *)&v1, (16 + 13) * 2, 2); } -static int ov88_0223CF30 (int param0, int param1, UnkStruct_ov88_0223C8AC * param2) +static int ov88_0223CF30(int param0, int param1, UnkStruct_ov88_0223C8AC *param2) { int v0, v1; @@ -1582,11 +1574,11 @@ static int ov88_0223CF30 (int param0, int param1, UnkStruct_ov88_0223C8AC * para } static const int Unk_ov88_0223EE50[][3] = { - {0x0, 0x1, 0x2}, - {0x11, 0x12, 0x13} + { 0x0, 0x1, 0x2 }, + { 0x11, 0x12, 0x13 } }; -static void ov88_0223CF68 (int param0, GraphicElementData * param1, int param2) +static void ov88_0223CF68(int param0, GraphicElementData *param1, int param2) { VecFx32 v0; @@ -1609,7 +1601,7 @@ static void ov88_0223CF68 (int param0, GraphicElementData * param1, int param2) } } -static int ov88_0223CFF4 (u32 * param0, int * param1, GraphicElementData * param2, UnkStruct_ov88_0223C8AC * param3, int param4) +static int ov88_0223CFF4(u32 *param0, int *param1, GraphicElementData *param2, UnkStruct_ov88_0223C8AC *param3, int param4) { int v0 = *param0 - 1; int v1 = 0; @@ -1635,13 +1627,13 @@ static int ov88_0223CFF4 (u32 * param0, int * param1, GraphicElementData * param return v2; } -void ov88_0223D044 (int param0, int param1, int param2) +void ov88_0223D044(int param0, int param1, int param2) { u8 v0 = param2; CommSys_SendData(param1, &v0, 1); } -void ov88_0223D058 (UnkStruct_02095E80 * param0, int param1, int param2) +void ov88_0223D058(UnkStruct_02095E80 *param0, int param1, int param2) { if ((param2 != param0->unk_36F8) || (param1 != param0->unk_36FC)) { ov88_0223D044(CommSys_CurNetId(), param1, param2); @@ -1650,14 +1642,14 @@ void ov88_0223D058 (UnkStruct_02095E80 * param0, int param1, int param2) } } -static void * ov88_0223D08C (Party * param0, int param1) +static void *ov88_0223D08C(Party *param0, int param1) { u32 v0 = (u32)param0; return (void *)(v0 + param1 * (236 * 6 + 4 * 2)); } -void ov88_0223D098 (int param0, Party * param1, int param2) +void ov88_0223D098(int param0, Party *param1, int param2) { if (CommSys_IsPlayerConnected(param0)) { u8 v0 = param2; @@ -1666,15 +1658,15 @@ void ov88_0223D098 (int param0, Party * param1, int param2) } } -static void ov88_0223D0C0 (SaveData * param0) +static void ov88_0223D0C0(SaveData *param0) { - u8 * v0 = sub_0202D79C(param0); + u8 *v0 = sub_0202D79C(param0); int v1; CommSys_SendData(32, v0, 14); } -static void ov88_0223D0D4 (TrainerInfo * param0, UnkStruct_02027F8C * param1, UnkStruct_02027F8C * param2) +static void ov88_0223D0D4(TrainerInfo *param0, UnkStruct_02027F8C *param1, UnkStruct_02027F8C *param2) { int v0; @@ -1695,12 +1687,12 @@ static void ov88_0223D0D4 (TrainerInfo * param0, UnkStruct_02027F8C * param1, Un CommSys_SendDataHuge(28, param2, sizeof(UnkStruct_02027F8C)); } -static void ov88_0223D140 (ChatotCry * param0) +static void ov88_0223D140(ChatotCry *param0) { CommSys_SendDataHuge(29, param0, 1000); } -static int ov88_0223D150 (UnkStruct_02095E80 * param0) +static int ov88_0223D150(UnkStruct_02095E80 *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_B) { Sound_PlayEffect(1500); @@ -1738,7 +1730,7 @@ static const u8 Unk_ov88_0223F13C[] = { 0x8 }; -static void ov88_0223D1EC (UnkStruct_02095E80 * param0, int param1) +static void ov88_0223D1EC(UnkStruct_02095E80 *param0, int param1) { if (param1 == 0) { param0->unk_0C.monData = param0->unk_2270; @@ -1768,7 +1760,7 @@ static void ov88_0223D1EC (UnkStruct_02095E80 * param0, int param1) param0->unk_3C = param1; } -static int ov88_0223D2C4 (UnkStruct_02095E80 * param0) +static int ov88_0223D2C4(UnkStruct_02095E80 *param0) { sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 25, 1, param0->unk_184, param0->unk_178); @@ -1778,7 +1770,7 @@ static int ov88_0223D2C4 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D318 (UnkStruct_02095E80 * param0) +static int ov88_0223D318(UnkStruct_02095E80 *param0) { switch (ov88_0223ED2C(param0->unk_174, ¶m0->unk_6BC, ¶m0->unk_6C8)) { case 0: @@ -1800,7 +1792,7 @@ static int ov88_0223D318 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D3E0 (UnkStruct_02095E80 * param0) +static int ov88_0223D3E0(UnkStruct_02095E80 *param0) { sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], param0->unk_68, 1, param0->unk_184, param0->unk_178); @@ -1809,7 +1801,7 @@ static int ov88_0223D3E0 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D434 (UnkStruct_02095E80 * param0) +static int ov88_0223D434(UnkStruct_02095E80 *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_A) { sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); @@ -1821,12 +1813,12 @@ static int ov88_0223D434 (UnkStruct_02095E80 * param0) return 0; } -static void ov88_0223D49C (UnkStruct_02095E80 * param0, int param1) +static void ov88_0223D49C(UnkStruct_02095E80 *param0, int param1) { ov88_0223ECBC(¶m0->unk_49C[23], param1, 1, param0->unk_36D0, param0->unk_36CC); } -static int ov88_0223D4C4 (UnkStruct_02095E80 * param0) +static int ov88_0223D4C4(UnkStruct_02095E80 *param0) { int v0; @@ -1845,9 +1837,9 @@ static int ov88_0223D4C4 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D514 (UnkStruct_02095E80 * param0) +static int ov88_0223D514(UnkStruct_02095E80 *param0) { - TrainerInfo * v0; + TrainerInfo *v0; int v1; switch (ov88_0223ED2C(param0->unk_174, ¶m0->unk_6BC, ¶m0->unk_6C8)) { @@ -1870,10 +1862,10 @@ static int ov88_0223D514 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D5B8 (UnkStruct_02095E80 * param0) +static int ov88_0223D5B8(UnkStruct_02095E80 *param0) { int v0; - TrainerInfo * v1; + TrainerInfo *v1; v0 = sub_02001288(param0->unk_36D8); @@ -1892,7 +1884,7 @@ static int ov88_0223D5B8 (UnkStruct_02095E80 * param0) param0->unk_36C8 = v0; { - TrainerInfo * v2 = TrainerInfo_New(26); + TrainerInfo *v2 = TrainerInfo_New(26); TrainerInfo_SetName(v2, sub_0202AEF0(param0->unk_36EC, v0)); StringTemplate_SetPlayerName(param0->unk_36CC, 0, v2); @@ -1912,7 +1904,7 @@ static int ov88_0223D5B8 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D69C (UnkStruct_02095E80 * param0) +static int ov88_0223D69C(UnkStruct_02095E80 *param0) { UnkStruct_ov84_02240FA8 v0; int v1 = sub_0202AF94(param0->unk_36EC); @@ -1921,8 +1913,8 @@ static int ov88_0223D69C (UnkStruct_02095E80 * param0) param0->unk_36D4 = sub_02013A04(v1 + 1, 26); { - MessageLoader * v3; - Strbuf* v4 = Strbuf_Init(100, 26); + MessageLoader *v3; + Strbuf *v4 = Strbuf_Init(100, 26); int v5 = 0; for (v5 = 0; v5 < 32; v5++) { @@ -1942,9 +1934,9 @@ static int ov88_0223D69C (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D740 (UnkStruct_02095E80 * param0) +static int ov88_0223D740(UnkStruct_02095E80 *param0) { - TrainerInfo * v0; + TrainerInfo *v0; int v1; switch (ov88_0223ED2C(param0->unk_174, ¶m0->unk_6BC, ¶m0->unk_6C8)) { @@ -1964,7 +1956,7 @@ static int ov88_0223D740 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D7AC (UnkStruct_02095E80 * param0) +static int ov88_0223D7AC(UnkStruct_02095E80 *param0) { int v0; @@ -1996,7 +1988,7 @@ static int ov88_0223D7AC (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D840 (UnkStruct_02095E80 * param0) +static int ov88_0223D840(UnkStruct_02095E80 *param0) { if (CommTiming_IsSyncState(19)) { return 2; @@ -2005,10 +1997,10 @@ static int ov88_0223D840 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D854 (UnkStruct_02095E80 * param0) +static int ov88_0223D854(UnkStruct_02095E80 *param0) { int v0; - TrainerInfo * v1; + TrainerInfo *v1; param0->unk_36C4 = -1; @@ -2038,7 +2030,7 @@ static int ov88_0223D854 (UnkStruct_02095E80 * param0) } { - UnkStruct_0202B370 * v2 = sub_0202B370(param0->unk_04); + UnkStruct_0202B370 *v2 = sub_0202B370(param0->unk_04); for (v0 = 0; v0 < 32; v0++) { if (!sub_0202AF78(v2, v0)) { @@ -2052,7 +2044,7 @@ static int ov88_0223D854 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223D96C (UnkStruct_02095E80 * param0) +static int ov88_0223D96C(UnkStruct_02095E80 *param0) { if (0 == sub_020391DC(param0->unk_04, param0->unk_3644, 26)) { CommTiming_StartSync(19); @@ -2069,7 +2061,7 @@ static int ov88_0223D96C (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223DA00 (UnkStruct_02095E80 * param0) +static int ov88_0223DA00(UnkStruct_02095E80 *param0) { if ((param0->unk_60[0] != 0) && (param0->unk_60[1] != 0)) { if ((param0->unk_60[0] == 1) && (param0->unk_60[1] == 1)) { @@ -2086,7 +2078,7 @@ static int ov88_0223DA00 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223DA3C (UnkStruct_02095E80 * param0) +static int ov88_0223DA3C(UnkStruct_02095E80 *param0) { UnkStruct_02081CF4 v0; @@ -2118,7 +2110,7 @@ static int ov88_0223DA3C (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223DB48 (UnkStruct_02095E80 * param0) +static int ov88_0223DB48(UnkStruct_02095E80 *param0) { switch (sub_02001BE0(param0->unk_6C4)) { case 0: @@ -2136,7 +2128,8 @@ static int ov88_0223DB48 (UnkStruct_02095E80 * param0) sub_02013A3C(param0->unk_6C0); param0->unk_226C = ov88_0223DC84; break; - case 2: case 0xfffffffe: + case 2: + case 0xfffffffe: sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[21], 15, 1, param0->unk_184, param0->unk_178); sub_02001BC4(param0->unk_6C4, NULL); @@ -2148,7 +2141,7 @@ static int ov88_0223DB48 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223DC84 (UnkStruct_02095E80 * param0) +static int ov88_0223DC84(UnkStruct_02095E80 *param0) { sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 20, 1, param0->unk_184, param0->unk_178); @@ -2159,7 +2152,7 @@ static int ov88_0223DC84 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223DCE0 (UnkStruct_02095E80 * param0) +static int ov88_0223DCE0(UnkStruct_02095E80 *param0) { if ((param0->unk_60[0] != 0) && (param0->unk_60[1] != 0)) { if ((param0->unk_60[0] == 2) && (param0->unk_60[1] == 2)) { @@ -2176,7 +2169,7 @@ static int ov88_0223DCE0 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223DD1C (UnkStruct_02095E80 * param0) +static int ov88_0223DD1C(UnkStruct_02095E80 *param0) { int v0; @@ -2222,7 +2215,7 @@ static int ov88_0223DD1C (UnkStruct_02095E80 * param0) return 0; } -static void ov88_0223DE68 (VecFx32 param0[], int param1, int param2, int param3, int param4) +static void ov88_0223DE68(VecFx32 param0[], int param1, int param2, int param3, int param4) { param0[0].x = FX32_ONE * param1; param0[0].y = FX32_ONE * param2; @@ -2230,7 +2223,7 @@ static void ov88_0223DE68 (VecFx32 param0[], int param1, int param2, int param3, param0[1].y = FX32_ONE * param4; } -static void ov88_0223DE7C (GraphicElementData * param0, GraphicElementData * param1, GraphicElementData * param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC * param5) +static void ov88_0223DE7C(GraphicElementData *param0, GraphicElementData *param1, GraphicElementData *param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC *param5) { VecFx32 v0, v1, v2; @@ -2252,7 +2245,7 @@ static void ov88_0223DE7C (GraphicElementData * param0, GraphicElementData * par } } -static int ov88_0223DF00 (UnkStruct_02095E80 * param0) +static int ov88_0223DF00(UnkStruct_02095E80 *param0) { param0->unk_2314++; @@ -2270,7 +2263,7 @@ static int ov88_0223DF00 (UnkStruct_02095E80 * param0) return 0; } -static void ov88_0223DFF4 (UnkStruct_02095E80 * param0) +static void ov88_0223DFF4(UnkStruct_02095E80 *param0) { int v0; VecFx32 v1; @@ -2304,7 +2297,7 @@ static void ov88_0223DFF4 (UnkStruct_02095E80 * param0) sub_02021CAC(param0->unk_47C, 0); } -static int ov88_0223E110 (UnkStruct_02095E80 * param0) +static int ov88_0223E110(UnkStruct_02095E80 *param0) { sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); StringTemplate_SetNickname(param0->unk_17C, 0, Pokemon_GetBoxPokemon(Party_GetPokemonBySlotIndex(param0->unk_2270, param0->unk_88[0]))); @@ -2316,19 +2309,19 @@ static int ov88_0223E110 (UnkStruct_02095E80 * param0) return 0; } -static void ov88_0223E1AC (UnkStruct_02095E80 * param0) +static void ov88_0223E1AC(UnkStruct_02095E80 *param0) { ov88_0223D058(param0, 24, 3); param0->unk_5C = 1; } -static void ov88_0223E1C0 (UnkStruct_02095E80 * param0, int param1, int param2) +static void ov88_0223E1C0(UnkStruct_02095E80 *param0, int param1, int param2) { sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[param1], param2, 1, param0->unk_184, param0->unk_178); } -static int ov88_0223E20C (UnkStruct_02095E80 * param0) +static int ov88_0223E20C(UnkStruct_02095E80 *param0) { switch (ov88_0223ED2C(param0->unk_174, ¶m0->unk_6BC, ¶m0->unk_6C8)) { case 0: @@ -2374,7 +2367,7 @@ static int ov88_0223E20C (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223E330 (UnkStruct_02095E80 * param0) +static int ov88_0223E330(UnkStruct_02095E80 *param0) { sub_02019CB8(param0->unk_174, 0, 0, 0, 0, 32, 24, 0); ov88_0223ECBC(¶m0->unk_49C[23], 36, 1, param0->unk_184, param0->unk_17C); @@ -2382,7 +2375,7 @@ static int ov88_0223E330 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223E384 (UnkStruct_02095E80 * param0) +static int ov88_0223E384(UnkStruct_02095E80 *param0) { switch (ov88_0223ED2C(param0->unk_174, ¶m0->unk_6BC, ¶m0->unk_6C8)) { case 0: @@ -2403,7 +2396,7 @@ static int ov88_0223E384 (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223E41C (UnkStruct_02095E80 * param0) +static int ov88_0223E41C(UnkStruct_02095E80 *param0) { if ((param0->unk_60[0] != 0) && (param0->unk_60[1] != 0)) { if ((param0->unk_60[0] == 3) && (param0->unk_60[1] == 3)) { @@ -2426,7 +2419,7 @@ static int ov88_0223E41C (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223E478 (UnkStruct_02095E80 * param0) +static int ov88_0223E478(UnkStruct_02095E80 *param0) { CommInfo_SetTradeResult(param0->unk_04, 1); ov88_0223E694(param0->unk_2270, param0->unk_2274, param0->unk_88[0], param0->unk_88[1] - 6, param0->unk_08); @@ -2434,7 +2427,7 @@ static int ov88_0223E478 (UnkStruct_02095E80 * param0) return 2; } -static int ov88_0223E4BC (UnkStruct_02095E80 * param0) +static int ov88_0223E4BC(UnkStruct_02095E80 *param0) { UnkStruct_02081CF4 v0; @@ -2465,7 +2458,7 @@ static int ov88_0223E4BC (UnkStruct_02095E80 * param0) return 0; } -static int ov88_0223E5B8 (UnkStruct_02095E80 * param0) +static int ov88_0223E5B8(UnkStruct_02095E80 *param0) { switch (sub_02001BE0(param0->unk_6C4)) { case 0: @@ -2490,9 +2483,9 @@ static int ov88_0223E5B8 (UnkStruct_02095E80 * param0) return 0; } -static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param3, UnkStruct_ov88_0223C370 * param4) +static void ov88_0223E694(Party *param0, Party *param1, int param2, int param3, UnkStruct_ov88_0223C370 *param4) { - Pokemon * v0, * v1; + Pokemon *v0, *v1; v0 = Pokemon_New(26); v1 = Pokemon_New(26); @@ -2502,7 +2495,7 @@ static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param if (Pokemon_GetValue(v1, MON_DATA_SPECIES, NULL) == SPECIES_ARCEUS) { if (Pokemon_GetValue(v1, MON_DATA_FATEFUL_ENCOUNTER, NULL) || ((Pokemon_GetValue(v1, MON_DATA_HATCH_LOCATION, NULL) == 86) && (Pokemon_GetValue(v1, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 0))) { - VarsFlags * v2 = SaveData_GetVarsFlags(param4->unk_10); + VarsFlags *v2 = SaveData_GetVarsFlags(param4->unk_10); if (sub_0206B5F8(v2) == 0) { sub_0206B608(v2, 1); @@ -2526,7 +2519,7 @@ static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param param4->unk_2C = param2; if (Party_HasSpecies(param0, 441) == 0) { - ChatotCry * v4 = GetChatotCryDataFromSave(param4->unk_10); + ChatotCry *v4 = GetChatotCryDataFromSave(param4->unk_10); ResetChatotCryDataStatus(v4); } @@ -2539,10 +2532,10 @@ static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param Heap_FreeToHeap(v1); } -static void ov88_0223E7F0 (Journal * param0, Pokemon * param1) +static void ov88_0223E7F0(Journal *param0, Pokemon *param1) { - void * v0; - TrainerInfo * v1 = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); + void *v0; + TrainerInfo *v1 = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); u16 v2[10 + 1]; Pokemon_GetValue(param1, MON_DATA_NICKNAME, v2); @@ -2550,14 +2543,14 @@ static void ov88_0223E7F0 (Journal * param0, Pokemon * param1) sub_0202B758(param0, v0, 4); } -static void ov88_0223E848 (UnkStruct_02095E80 * param0) +static void ov88_0223E848(UnkStruct_02095E80 *param0) { param0->unk_2310 += 2; sub_02019184(param0->unk_174, 6, 0, param0->unk_2310); sub_02019184(param0->unk_174, 3, 0, param0->unk_2310); } -static void ov88_0223E87C (GraphicElementData * param0, int param1, int param2) +static void ov88_0223E87C(GraphicElementData *param0, int param1, int param2) { VecFx32 v0; @@ -2567,12 +2560,12 @@ static void ov88_0223E87C (GraphicElementData * param0, int param1, int param2) sub_02021C50(param0, &v0); } -static void ov88_0223E894 (UnkStruct_02095E80 * param0) +static void ov88_0223E894(UnkStruct_02095E80 *param0) { param0->unk_3700 = sub_0200E7FC(¶m0->unk_49C[23], (512 - (9 + (18 + 12)))); } -static void ov88_0223E8B4 (UnkStruct_02095E80 * param0) +static void ov88_0223E8B4(UnkStruct_02095E80 *param0) { if (param0->unk_3700 != NULL) { DeleteWaitDial(param0->unk_3700); @@ -2580,7 +2573,7 @@ static void ov88_0223E8B4 (UnkStruct_02095E80 * param0) } } -static int ov88_0223E8D0 (UnkStruct_02095E80 * param0) +static int ov88_0223E8D0(UnkStruct_02095E80 *param0) { int v0; int v1 = 0; @@ -2599,10 +2592,10 @@ static int ov88_0223E8D0 (UnkStruct_02095E80 * param0) return 1; } -static int ov88_0223E914 (UnkStruct_02095E80 * param0) +static int ov88_0223E914(UnkStruct_02095E80 *param0) { int v0, v1; - Pokemon * v2; + Pokemon *v2; v1 = Party_GetCurrentCount(param0->unk_2270); @@ -2627,13 +2620,13 @@ static int ov88_0223E914 (UnkStruct_02095E80 * param0) return 0; } -static void ov88_0223E984 (UnkStruct_02095E80 * param0) +static void ov88_0223E984(UnkStruct_02095E80 *param0) { param0->unk_3704 = 1; param0->unk_3708 = 0; } -static void ov88_0223E998 (UnkStruct_02095E80 * param0) +static void ov88_0223E998(UnkStruct_02095E80 *param0) { if (param0->unk_3704) { param0->unk_3708++; diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c index 0a4d770129..88fcc38677 100644 --- a/src/overlay088/ov88_0223E9C4.c +++ b/src/overlay088/ov88_0223E9C4.c @@ -1,61 +1,61 @@ +#include "overlay088/ov88_0223E9C4.h" + #include #include #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "game_options.h" +#include "message.h" +#include "message_util.h" +#include "strbuf.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "message_util.h" #include "unk_0200DA60.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "game_options.h" -#include "overlay088/ov88_0223E9C4.h" -static void ov88_0223EE14(BmpList * param0, u32 param1, u8 param2); +static void ov88_0223EE14(BmpList *param0, u32 param1, u8 param2); static const u16 Unk_ov88_0223F1A8[][5] = { - {0x4, 0x1, 0x9, 0x2, 0x1}, - {0x14, 0x1, 0x9, 0x2, 0x13}, - {0x4, 0x3, 0x8, 0x2, 0x25}, - {0x14, 0x3, 0x8, 0x2, 0x35}, - {0x2, 0x13, 0x7, 0x2, 0x45}, - {0x12, 0x13, 0x7, 0x2, 0x53}, - {0x2, 0x15, 0xC, 0x2, 0x61}, - {0x12, 0x15, 0xC, 0x2, 0x79} + { 0x4, 0x1, 0x9, 0x2, 0x1 }, + { 0x14, 0x1, 0x9, 0x2, 0x13 }, + { 0x4, 0x3, 0x8, 0x2, 0x25 }, + { 0x14, 0x3, 0x8, 0x2, 0x35 }, + { 0x2, 0x13, 0x7, 0x2, 0x45 }, + { 0x12, 0x13, 0x7, 0x2, 0x53 }, + { 0x2, 0x15, 0xC, 0x2, 0x61 }, + { 0x12, 0x15, 0xC, 0x2, 0x79 } }; static const u16 Unk_ov88_0223F170[][2] = { - {0x0, 0x7}, - {0x8, 0x7}, - {0x0, 0xC}, - {0x8, 0xC}, - {0x0, 0x11}, - {0x8, 0x11}, - {0x10, 0x7}, - {0x18, 0x7}, - {0x10, 0xC}, - {0x18, 0xC}, - {0x10, 0x11}, - {0x18, 0x11}, - {0x4, 0xA}, - {0x14, 0xA} + { 0x0, 0x7 }, + { 0x8, 0x7 }, + { 0x0, 0xC }, + { 0x8, 0xC }, + { 0x0, 0x11 }, + { 0x8, 0x11 }, + { 0x10, 0x7 }, + { 0x18, 0x7 }, + { 0x10, 0xC }, + { 0x18, 0xC }, + { 0x10, 0x11 }, + { 0x18, 0x11 }, + { 0x4, 0xA }, + { 0x14, 0xA } }; -void ov88_0223E9C4 (BGL * param0, Window * param1, Options * param2) +void ov88_0223E9C4(BGL *param0, Window *param1, Options *param2) { int v0; @@ -94,7 +94,7 @@ void ov88_0223E9C4 (BGL * param0, Window * param1, Options * param2) } } -void ov88_0223EC04 (Window * param0) +void ov88_0223EC04(Window *param0) { int v0; @@ -117,7 +117,7 @@ void ov88_0223EC04 (Window * param0) BGL_DeleteWindow(¶m0[25]); } -void ov88_0223EC78 (Window * param0, Strbuf *param1, int param2, u32 param3, int param4, int param5) +void ov88_0223EC78(Window *param0, Strbuf *param1, int param2, u32 param3, int param4, int param5) { int v0 = 0; @@ -133,9 +133,9 @@ void ov88_0223EC78 (Window * param0, Strbuf *param1, int param2, u32 param3, int sub_0201D78C(param0, 0, param1, v0, param5, param3, (u32)(((11 & 0xff) << 16) | ((12 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } -int ov88_0223ECBC (Window * param0, int param1, int param2, MessageLoader * param3, StringTemplate * param4) +int ov88_0223ECBC(Window *param0, int param1, int param2, MessageLoader *param3, StringTemplate *param4) { - Strbuf* v0; + Strbuf *v0; int v1; v0 = MessageUtil_ExpandedStrbuf(param4, param3, param1, 26); @@ -163,7 +163,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov88_0223F148 = { 0x112 }; -u32 ov88_0223ED2C (BGL * param0, UIControlData ** param1, int * param2) +u32 ov88_0223ED2C(BGL *param0, UIControlData **param1, int *param2) { u32 v0 = 0xffffffff; @@ -183,7 +183,7 @@ u32 ov88_0223ED2C (BGL * param0, UIControlData ** param1, int * param2) return v0; } -void ov88_0223ED80 (Window * param0) +void ov88_0223ED80(Window *param0) { Window_Show(param0, 0, (512 - 9), 11); } @@ -210,9 +210,9 @@ static const UnkStruct_ov84_02240FA8 Unk_ov88_0223F150 = { NULL }; -BmpList * ov88_0223ED94 (ResourceMetadata * param0, int param1, Window * param2, BGL * param3) +BmpList *ov88_0223ED94(ResourceMetadata *param0, int param1, Window *param2, BGL *param3) { - BmpList * v0; + BmpList *v0; UnkStruct_ov84_02240FA8 v1; int v2 = 5; @@ -230,7 +230,7 @@ BmpList * ov88_0223ED94 (ResourceMetadata * param0, int param1, Window * param2, return v0; } -static void ov88_0223EE14 (BmpList * param0, u32 param1, u8 param2) +static void ov88_0223EE14(BmpList *param0, u32 param1, u8 param2) { if (param2 == 0) { Sound_PlayEffect(1500); diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 3f2fea7494..b33602a9e2 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -1,25 +1,21 @@ +#include "overlay090/ov90_021D0D80.h" + #include #include -#include "core_sys.h" -#include "inlines.h" - #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_decls/struct_0202D764_decl.h" #include "struct_decls/struct_0203068C_decl.h" - #include "struct_defs/sentence.h" -#include "game_options.h" #include "struct_defs/struct_02049A68.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay061/struct_ov61_0222C884.h" @@ -30,46 +26,48 @@ #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_0224133C.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_02014A84.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" #include "unk_0202D05C.h" #include "unk_0203061C.h" #include "unk_0208C098.h" -#include "overlay090/ov90_021D0D80.h" typedef struct { - MessageLoader * unk_00; - StringTemplate * unk_04; - Strbuf* unk_08; - Strbuf* unk_0C; - Strbuf* unk_10; - Strbuf* unk_14; - Strbuf* unk_18; - Strbuf* unk_1C; - Strbuf* unk_20; - Strbuf* unk_24[6]; - Strbuf* unk_3C[2]; + MessageLoader *unk_00; + StringTemplate *unk_04; + Strbuf *unk_08; + Strbuf *unk_0C; + Strbuf *unk_10; + Strbuf *unk_14; + Strbuf *unk_18; + Strbuf *unk_1C; + Strbuf *unk_20; + Strbuf *unk_24[6]; + Strbuf *unk_3C[2]; } UnkStruct_ov90_021D0ECC_sub1; typedef struct { - Strbuf* unk_00; + Strbuf *unk_00; u8 unk_04; u8 unk_05; u8 unk_06; @@ -87,54 +85,54 @@ typedef struct { u8 unk_0D; u8 unk_0E; u8 unk_0F; - BGL * unk_10; - UnkStruct_ov90_021D0D80 * unk_14; - Options * unk_18; - UnkStruct_0203068C * unk_1C; - UnkStruct_0202D750 * unk_20; - UnkStruct_0202D764 * unk_24; + BGL *unk_10; + UnkStruct_ov90_021D0D80 *unk_14; + Options *unk_18; + UnkStruct_0203068C *unk_1C; + UnkStruct_0202D750 *unk_20; + UnkStruct_0202D764 *unk_24; UnkStruct_ov90_021D0ECC_sub1 unk_28; Window unk_6C[5]; UnkStruct_ov90_021D17F8 unk_BC[30]; - SpriteRenderer * unk_29C; - SpriteGfxHandler * unk_2A0; - GraphicElementData * unk_2A4[4]; + SpriteRenderer *unk_29C; + SpriteGfxHandler *unk_2A0; + GraphicElementData *unk_2A4[4]; } UnkStruct_ov90_021D0ECC; -static int ov90_021D0ECC(UnkStruct_ov90_021D0ECC * param0); -static int ov90_021D0F98(UnkStruct_ov90_021D0ECC * param0); +static int ov90_021D0ECC(UnkStruct_ov90_021D0ECC *param0); +static int ov90_021D0F98(UnkStruct_ov90_021D0ECC *param0); static void ov90_021D1014(void); -static void ov90_021D1034(void * param0); -static int ov90_021D105C(UnkStruct_ov90_021D0ECC * param0); -static int ov90_021D1080(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D11EC(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D1280(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D12B0(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D1340(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D13A8(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D13D8(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D146C(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D15D0(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D1750(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D17DC(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D18BC(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D17F8(UnkStruct_ov90_021D17F8 * param0, Window * param1, Strbuf *param2, u8 param3, u8 param4, u8 param5); -static void ov90_021D1984(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D1A48(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D1A9C(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D1ABC(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D1B6C(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D1B90(UnkStruct_ov90_021D0ECC * param0); +static void ov90_021D1034(void *param0); +static int ov90_021D105C(UnkStruct_ov90_021D0ECC *param0); +static int ov90_021D1080(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D11EC(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D1280(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D12B0(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D1340(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D13A8(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D13D8(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D146C(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D15D0(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D1750(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D17DC(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D18BC(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D17F8(UnkStruct_ov90_021D17F8 *param0, Window *param1, Strbuf *param2, u8 param3, u8 param4, u8 param5); +static void ov90_021D1984(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D1A48(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D1A9C(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D1ABC(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D1B6C(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D1B90(UnkStruct_ov90_021D0ECC *param0); static void ov90_021D1BA4(void); -static void ov90_021D1BAC(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D1C28(UnkStruct_ov90_021D0ECC * param0); -static void ov90_021D1C44(UnkStruct_ov90_021D0ECC * param0, BOOL param1); -static void ov90_021D1C90(UnkStruct_ov90_021D0ECC * param0, u8 param1, u8 param2, u8 param3); +static void ov90_021D1BAC(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D1C28(UnkStruct_ov90_021D0ECC *param0); +static void ov90_021D1C44(UnkStruct_ov90_021D0ECC *param0, BOOL param1); +static void ov90_021D1C90(UnkStruct_ov90_021D0ECC *param0, u8 param1, u8 param2, u8 param3); -int ov90_021D0D80 (OverlayManager * param0, int * param1) +int ov90_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov90_021D0ECC * v0 = NULL; - UnkStruct_ov90_021D0D80 * v1; + UnkStruct_ov90_021D0ECC *v0 = NULL; + UnkStruct_ov90_021D0D80 *v1; v1 = (UnkStruct_ov90_021D0D80 *)OverlayManager_Args(param0); @@ -155,9 +153,9 @@ int ov90_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov90_021D0DE8 (OverlayManager * param0, int * param1) +int ov90_021D0DE8(OverlayManager *param0, int *param1) { - UnkStruct_ov90_021D0ECC * v0 = OverlayManager_Data(param0); + UnkStruct_ov90_021D0ECC *v0 = OverlayManager_Data(param0); OverlayManager_FreeData(param0); Heap_Destroy(v0->unk_00); @@ -165,10 +163,10 @@ int ov90_021D0DE8 (OverlayManager * param0, int * param1) return 1; } -int ov90_021D0E04 (OverlayManager * param0, int * param1) +int ov90_021D0E04(OverlayManager *param0, int *param1) { int v0 = 0; - UnkStruct_ov90_021D0ECC * v1 = OverlayManager_Data(param0); + UnkStruct_ov90_021D0ECC *v1 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -222,7 +220,7 @@ int ov90_021D0E04 (OverlayManager * param0, int * param1) return 0; } -static int ov90_021D0ECC (UnkStruct_ov90_021D0ECC * param0) +static int ov90_021D0ECC(UnkStruct_ov90_021D0ECC *param0) { switch (param0->unk_04) { case 0: @@ -269,7 +267,7 @@ static int ov90_021D0ECC (UnkStruct_ov90_021D0ECC * param0) return 0; } -static int ov90_021D0F98 (UnkStruct_ov90_021D0ECC * param0) +static int ov90_021D0F98(UnkStruct_ov90_021D0ECC *param0) { switch (param0->unk_04) { case 0: @@ -299,7 +297,7 @@ static int ov90_021D0F98 (UnkStruct_ov90_021D0ECC * param0) return 0; } -static void ov90_021D1014 (void) +static void ov90_021D1014(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -317,9 +315,9 @@ static void ov90_021D1014 (void) GXLayers_SetBanks(&v0); } -static void ov90_021D1034 (void * param0) +static void ov90_021D1034(void *param0) { - UnkStruct_ov90_021D0ECC * v0 = param0; + UnkStruct_ov90_021D0ECC *v0 = param0; ov90_021D1BA4(); NNS_GfdDoVramTransfer(); @@ -327,7 +325,7 @@ static void ov90_021D1034 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static int ov90_021D105C (UnkStruct_ov90_021D0ECC * param0) +static int ov90_021D105C(UnkStruct_ov90_021D0ECC *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); @@ -337,7 +335,7 @@ static int ov90_021D105C (UnkStruct_ov90_021D0ECC * param0) return 0; } -static inline u8 inline_ov90_021D1080 (UnkStruct_ov90_021D0ECC * param0) +static inline u8 inline_ov90_021D1080(UnkStruct_ov90_021D0ECC *param0) { if (param0->unk_0B == 0) { return 0; @@ -354,7 +352,7 @@ static inline u8 inline_ov90_021D1080 (UnkStruct_ov90_021D0ECC * param0) return 1; } -static inline u8 inline_ov90_021D1080_1 (UnkStruct_ov90_021D0ECC * wk) +static inline u8 inline_ov90_021D1080_1(UnkStruct_ov90_021D0ECC *wk) { if (wk->unk_0B >= 10) { return 0; @@ -371,7 +369,7 @@ static inline u8 inline_ov90_021D1080_1 (UnkStruct_ov90_021D0ECC * wk) return 1; } -static int ov90_021D1080 (UnkStruct_ov90_021D0ECC * param0) +static int ov90_021D1080(UnkStruct_ov90_021D0ECC *param0) { int v0 = 0; @@ -449,7 +447,7 @@ static int ov90_021D1080 (UnkStruct_ov90_021D0ECC * param0) return 0; } -static void ov90_021D11EC (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D11EC(UnkStruct_ov90_021D0ECC *param0) { int v0, v1; @@ -481,7 +479,7 @@ static void ov90_021D11EC (UnkStruct_ov90_021D0ECC * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -496,7 +494,7 @@ static void ov90_021D11EC (UnkStruct_ov90_021D0ECC * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -511,7 +509,7 @@ static void ov90_021D11EC (UnkStruct_ov90_021D0ECC * param0) 2, 0, 0, - 0 + 0, }, }; @@ -530,7 +528,7 @@ static void ov90_021D11EC (UnkStruct_ov90_021D0ECC * param0) } } -static void ov90_021D1280 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1280(UnkStruct_ov90_021D0ECC *param0) { int v0, v1; @@ -543,10 +541,10 @@ static void ov90_021D1280 (UnkStruct_ov90_021D0ECC * param0) Heap_FreeToHeap(param0->unk_10); } -static void ov90_021D12B0 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D12B0(UnkStruct_ov90_021D0ECC *param0) { int v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__BTOWER, param0->unk_00); @@ -568,39 +566,39 @@ static void ov90_021D12B0 (UnkStruct_ov90_021D0ECC * param0) sub_0201C3C0(param0->unk_10, 1); } -static void ov90_021D1340 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1340(UnkStruct_ov90_021D0ECC *param0) { int v0; static const UnkStruct_ov61_0222C884 v1[] = { - {0, 4, 1, 24, 5, 2, 192}, - {0, 1, 9, 8, 5, 1, 312}, - {0, 1, 17, 8, 5, 1, 352}, - {0, 10, 9, 21, 5, 1, 392}, - {0, 10, 17, 21, 6, 1, 497}, - {0, 3, 18, 26, 5, 2, 312}, + { 0, 4, 1, 24, 5, 2, 192 }, + { 0, 1, 9, 8, 5, 1, 312 }, + { 0, 1, 17, 8, 5, 1, 352 }, + { 0, 10, 9, 21, 5, 1, 392 }, + { 0, 10, 17, 21, 6, 1, 497 }, + { 0, 3, 18, 26, 5, 2, 312 }, }; static const UnkStruct_ov61_0222C884 v2[] = { - {0, 4, 1, 24, 5, 2, 192}, - {2, 3, 7, 26, 9, 1, 1}, - {0, 3, 18, 26, 5, 2, 312}, + { 0, 4, 1, 24, 5, 2, 192 }, + { 2, 3, 7, 26, 9, 1, 1 }, + { 0, 3, 18, 26, 5, 2, 312 }, }; if (param0->unk_08 == 0) { for (v0 = 0; v0 < 5; v0++) { sub_0201A8D4(param0->unk_10, &(param0->unk_6C[v0]), &(v1[v0])); - BGL_FillWindow(¶m0->unk_6C[v0], (((0 << 4) | 0))); + BGL_FillWindow(¶m0->unk_6C[v0], ((0 << 4) | 0)); } } else { for (v0 = 0; v0 < 3; v0++) { sub_0201A8D4(param0->unk_10, &(param0->unk_6C[v0]), &(v2[v0])); - BGL_FillWindow(¶m0->unk_6C[v0], (((0 << 4) | 0))); + BGL_FillWindow(¶m0->unk_6C[v0], ((0 << 4) | 0)); } } sub_02002E7C(0, 2 * 32, param0->unk_00); } -static void ov90_021D13A8 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D13A8(UnkStruct_ov90_021D0ECC *param0) { int v0, v1; @@ -616,7 +614,7 @@ static void ov90_021D13A8 (UnkStruct_ov90_021D0ECC * param0) } } -static void ov90_021D13D8 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D13D8(UnkStruct_ov90_021D0ECC *param0) { int v0 = 0; @@ -638,7 +636,7 @@ static void ov90_021D13D8 (UnkStruct_ov90_021D0ECC * param0) param0->unk_28.unk_3C[1] = MessageLoader_GetNewStrbuf(param0->unk_28.unk_00, 23); } -static void ov90_021D146C (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D146C(UnkStruct_ov90_021D0ECC *param0) { int v0 = 0; @@ -660,7 +658,7 @@ static void ov90_021D146C (UnkStruct_ov90_021D0ECC * param0) MessageLoader_Free(param0->unk_28.unk_00); } -static void ov90_021D14C8 (UnkStruct_ov90_021D0ECC * param0, Window * param1, u8 param2, u8 param3, u8 param4) +static void ov90_021D14C8(UnkStruct_ov90_021D0ECC *param0, Window *param1, u8 param2, u8 param3, u8 param4) { u16 v0, v1, v2; int v3; @@ -669,24 +667,24 @@ static void ov90_021D14C8 (UnkStruct_ov90_021D0ECC * param0, Window * param1, u8 v2 = sub_02030698(param0->unk_1C, param3 + 1, 0xff); v0 = sub_0202D414(param0->unk_20, 8 + param2, 0); - sub_0201D78C(param1, 0, param0->unk_28.unk_24[v0], 4, param4, 0xff, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(param1, 0, param0->unk_28.unk_24[v0], 4, param4, 0xff, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); StringTemplate_SetNumber(param0->unk_28.unk_04, 0, v2, 4, 1, 1); StringTemplate_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_24[4]); v3 = 21 * 8 - sub_02002D7C(0, param0->unk_28.unk_08, 0) - 4; - sub_0201D78C(param1, 0, param0->unk_28.unk_08, v3, param4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(param1, 0, param0->unk_28.unk_08, v3, param4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); param4 += 24; - sub_0201D78C(param1, 0, param0->unk_28.unk_24[2], 4, param4, 0xff, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(param1, 0, param0->unk_28.unk_24[2], 4, param4, 0xff, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); StringTemplate_SetNumber(param0->unk_28.unk_04, 0, v1, 4, 1, 1); StringTemplate_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_24[4]); v3 = 21 * 8 - sub_02002D7C(0, param0->unk_28.unk_08, 0) - 4; - sub_0201D78C(param1, 0, param0->unk_28.unk_08, v3, param4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(param1, 0, param0->unk_28.unk_08, v3, param4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A954(param1); } -static void ov90_021D15D0 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D15D0(UnkStruct_ov90_021D0ECC *param0) { int v0; u16 v1, v2; @@ -696,11 +694,11 @@ static void ov90_021D15D0 (UnkStruct_ov90_021D0ECC * param0) v0 = sub_02002D7C(0, param0->unk_28.unk_08, 0); v0 = (24 * 8) - v0; - sub_0201D78C(¶m0->unk_6C[0], 0, param0->unk_28.unk_08, v0 / 2, 8, 0, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_6C[0], 0, param0->unk_28.unk_08, v0 / 2, 8, 0, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); MessageLoader_GetStrbuf(param0->unk_28.unk_00, 3 + param0->unk_0A, param0->unk_28.unk_08); - sub_0201D78C(¶m0->unk_6C[1], 0, param0->unk_28.unk_08, 0, 0, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_6C[1], 0, param0->unk_28.unk_08, 0, 0, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); MessageLoader_GetStrbuf(param0->unk_28.unk_00, 6 + param0->unk_0A, param0->unk_28.unk_08); - sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_08, 0, 3, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_08, 0, 3, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); switch (param0->unk_0A) { case 0: @@ -713,24 +711,24 @@ static void ov90_021D15D0 (UnkStruct_ov90_021D0ECC * param0) break; case 2: MessageLoader_GetStrbuf(param0->unk_28.unk_00, 12, param0->unk_28.unk_08); - sub_0201D78C(¶m0->unk_6C[3], 0, param0->unk_28.unk_08, 4, 10, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_6C[3], 0, param0->unk_28.unk_08, 4, 10, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); StringTemplate_SetNumber(param0->unk_28.unk_04, 0, sub_0202D2C0(param0->unk_20, 0), 2, 0, 1); StringTemplate_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_24[5]); v0 = 64 - sub_02002D7C(0, param0->unk_28.unk_08, 0); v0 = v0 / 2 + 64; - sub_0201D78C(¶m0->unk_6C[3], 0, param0->unk_28.unk_08, v0, 10, 0, ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_6C[3], 0, param0->unk_28.unk_08, v0, 10, 0, ((u32)(((5 & 0xff) << 16) | ((6 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov90_021D14C8(param0, ¶m0->unk_6C[4], 4, 8, 3); break; } } -static void ov90_021D1750 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1750(UnkStruct_ov90_021D0ECC *param0) { int v0; - UnkStruct_ov90_021D1750 * v1; - UnkStruct_ov90_021D17F8 * v2; + UnkStruct_ov90_021D1750 *v1; + UnkStruct_ov90_021D17F8 *v2; v1 = sub_0202D71C(param0->unk_24, param0->unk_00); @@ -755,7 +753,7 @@ static void ov90_021D1750 (UnkStruct_ov90_021D0ECC * param0) Heap_FreeToHeap(v1); } -static void ov90_021D17DC (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D17DC(UnkStruct_ov90_021D0ECC *param0) { int v0 = 0; @@ -764,18 +762,18 @@ static void ov90_021D17DC (UnkStruct_ov90_021D0ECC * param0) } } -static void ov90_021D17F8 (UnkStruct_ov90_021D17F8 * param0, Window * param1, Strbuf *param2, u8 param3, u8 param4, u8 param5) +static void ov90_021D17F8(UnkStruct_ov90_021D17F8 *param0, Window *param1, Strbuf *param2, u8 param3, u8 param4, u8 param5) { - UnkStruct_ov90_021D17F8 * v0; + UnkStruct_ov90_021D17F8 *v0; int v1, v2, v3, v4, v5; u32 v6; - BGL_FillWindow(param1, (((0 << 4) | 0))); + BGL_FillWindow(param1, ((0 << 4) | 0)); if (param3 >= (10 - 2)) { v4 = 2; v5 = (40 - sub_02002D7C(0, param2, 0)) / 2; - sub_0201D78C(param1, 0, param2, 2 * 72 + 16 + v5, 2 * 24 + 4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(param1, 0, param2, 2 * 72 + 16 + v5, 2 * 24 + 4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } else { v4 = 3; } @@ -787,9 +785,9 @@ static void ov90_021D17F8 (UnkStruct_ov90_021D17F8 * param0, Window * param1, St v0 = ¶m0[v1 * 3 + v2 + v3]; if (v0->unk_04) { - v6 = ((u32)(((11 & 0xff) << 16) | ((12 & 0xff) << 8) | (((0 & 0xff) << 0)))); + v6 = ((u32)(((11 & 0xff) << 16) | ((12 & 0xff) << 8) | ((0 & 0xff) << 0))); } else { - v6 = ((u32)(((9 & 0xff) << 16) | ((10 & 0xff) << 8) | (((0 & 0xff) << 0)))); + v6 = ((u32)(((9 & 0xff) << 16) | ((10 & 0xff) << 8) | ((0 & 0xff) << 0))); } sub_0201D78C(param1, 0, v0->unk_00, v2 * 72, v1 * 24 + 4, 0xff, v6, NULL); @@ -799,7 +797,7 @@ static void ov90_021D17F8 (UnkStruct_ov90_021D17F8 * param0, Window * param1, St sub_0201A954(param1); } -static void ov90_021D18BC (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D18BC(UnkStruct_ov90_021D0ECC *param0) { UnkStruct_02049A68 v0; int v1; @@ -811,57 +809,57 @@ static void ov90_021D18BC (UnkStruct_ov90_021D0ECC * param0) StringTemplate_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_10); v1 = 24 * 8 - sub_02002D7C(0, param0->unk_28.unk_08, 0); - sub_0201D78C(¶m0->unk_6C[0], 0, param0->unk_28.unk_08, v1 / 2, 4, 0xff, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_6C[0], 0, param0->unk_28.unk_08, v1 / 2, 4, 0xff, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); MessageLoader_GetStrbuf(param0->unk_28.unk_00, 16 + param0->unk_0A, param0->unk_28.unk_08); v1 = 24 * 8 - sub_02002D7C(0, param0->unk_28.unk_08, 0); - sub_0201D78C(¶m0->unk_6C[0], 0, param0->unk_28.unk_08, v1 / 2, 20, 0, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_6C[0], 0, param0->unk_28.unk_08, v1 / 2, 20, 0, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov90_021D17F8(param0->unk_BC, ¶m0->unk_6C[1], param0->unk_28.unk_0C, 0, 0, 0); } -static void ov90_021D1984 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1984(UnkStruct_ov90_021D0ECC *param0) { - UnkStruct_ov90_021D17F8 * v0 = &(param0->unk_BC[param0->unk_0B * 3 + param0->unk_0C]); + UnkStruct_ov90_021D17F8 *v0 = &(param0->unk_BC[param0->unk_0B * 3 + param0->unk_0C]); - BGL_FillWindow(¶m0->unk_6C[2], (((0 << 4) | 0))); + BGL_FillWindow(¶m0->unk_6C[2], ((0 << 4) | 0)); if (v0->unk_05 == 0) { - sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_20, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_20, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } else if (v0->unk_06 == 0) { StringTemplate_SetCountryName(param0->unk_28.unk_04, 0, v0->unk_05); StringTemplate_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_1C); - sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_08, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_08, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } else { StringTemplate_SetCountryName(param0->unk_28.unk_04, 0, v0->unk_05); StringTemplate_SetCityName(param0->unk_28.unk_04, 1, v0->unk_05, v0->unk_06); StringTemplate_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_18); - sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_08, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_08, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } sub_0201A954(¶m0->unk_6C[2]); ov90_021D1C44(param0, 0); } -static void ov90_021D1A48 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1A48(UnkStruct_ov90_021D0ECC *param0) { - Strbuf* v0; - UnkStruct_ov90_021D17F8 * v1 = &(param0->unk_BC[param0->unk_0B * 3 + param0->unk_0C]); + Strbuf *v0; + UnkStruct_ov90_021D17F8 *v1 = &(param0->unk_BC[param0->unk_0B * 3 + param0->unk_0C]); v0 = sub_02014B34(&v1->unk_08, param0->unk_00); - BGL_FillWindow(¶m0->unk_6C[2], (((0 << 4) | 0))); - sub_0201D78C(¶m0->unk_6C[2], 0, v0, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + BGL_FillWindow(¶m0->unk_6C[2], ((0 << 4) | 0)); + sub_0201D78C(¶m0->unk_6C[2], 0, v0, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } -static void ov90_021D1A9C (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1A9C(UnkStruct_ov90_021D0ECC *param0) { - BGL_FillWindow(¶m0->unk_6C[2], (((0 << 4) | 0))); + BGL_FillWindow(¶m0->unk_6C[2], ((0 << 4) | 0)); sub_0201ACF4(¶m0->unk_6C[2]); ov90_021D1C44(param0, 1); } -static void ov90_021D1ABC (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1ABC(UnkStruct_ov90_021D0ECC *param0) { sub_0201DBEC(32, param0->unk_00); @@ -870,11 +868,22 @@ static void ov90_021D1ABC (UnkStruct_ov90_021D0ECC * param0) { UnkStruct_ov104_0224133C v0 = { - 0, 128, 0, 32, 0, 128, 0, 32, + 0, + 128, + 0, + 32, + 0, + 128, + 0, + 32, }; UnkStruct_ov104_022412F4 v1 = { - 1, 2048, 2048, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K, + 1, + 2048, + 2048, + GX_OBJVRAMMODE_CHAR_1D_32K, + GX_OBJVRAMMODE_CHAR_1D_32K, }; sub_0200C73C(param0->unk_29C, &v0, &v1, 32); @@ -899,14 +908,14 @@ static void ov90_021D1ABC (UnkStruct_ov90_021D0ECC * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov90_021D1B6C (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1B6C(UnkStruct_ov90_021D0ECC *param0) { sub_0200C8B0(param0->unk_29C, param0->unk_2A0); sub_0200C8D4(param0->unk_29C); sub_0201DC3C(); } -static void ov90_021D1B90 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1B90(UnkStruct_ov90_021D0ECC *param0) { if (param0->unk_2A0 == NULL) { return; @@ -915,19 +924,19 @@ static void ov90_021D1B90 (UnkStruct_ov90_021D0ECC * param0) sub_0200C7EC(param0->unk_2A0); } -static void ov90_021D1BA4 (void) +static void ov90_021D1BA4(void) { sub_0200C800(); } -static void ov90_021D1BAC (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1BAC(UnkStruct_ov90_021D0ECC *param0) { int v0; static const UnkStruct_ov7_0224F358 v1[] = { - {0, 54, 68, 0, 0, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0}, - {0, 204, 114, 0, 1, 2, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0}, - {0, 128, 52, 0, 2, 3, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0}, - {0, 128, 132, 0, 3, 4, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0}, + { 0, 54, 68, 0, 0, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0 }, + { 0, 204, 114, 0, 1, 2, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0 }, + { 0, 128, 52, 0, 2, 3, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0 }, + { 0, 128, 132, 0, 3, 4, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0, 0, 0, 0 }, }; for (v0 = 0; v0 < 4; v0++) { @@ -942,7 +951,7 @@ static void ov90_021D1BAC (UnkStruct_ov90_021D0ECC * param0) sub_02021E80(param0->unk_2A4[1], 3); } -static void ov90_021D1C28 (UnkStruct_ov90_021D0ECC * param0) +static void ov90_021D1C28(UnkStruct_ov90_021D0ECC *param0) { int v0; @@ -951,7 +960,7 @@ static void ov90_021D1C28 (UnkStruct_ov90_021D0ECC * param0) } } -static void ov90_021D1C44 (UnkStruct_ov90_021D0ECC * param0, BOOL param1) +static void ov90_021D1C44(UnkStruct_ov90_021D0ECC *param0, BOOL param1) { BOOL v0; @@ -968,7 +977,7 @@ static void ov90_021D1C44 (UnkStruct_ov90_021D0ECC * param0, BOOL param1) sub_02021CC8(param0->unk_2A4[3], v0); } -static void ov90_021D1C90 (UnkStruct_ov90_021D0ECC * param0, u8 param1, u8 param2, u8 param3) +static void ov90_021D1C90(UnkStruct_ov90_021D0ECC *param0, u8 param1, u8 param2, u8 param3) { u16 v0, v1; diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index e69d36206e..00c5c52009 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -1,171 +1,169 @@ +#include "overlay091/ov91_021D0D80.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - -#include "constdata/const_020F410C.h" - +#include "struct_defs/pokemon_summary.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0201D738.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_020997B8.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "move_table.h" +#include "narc.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" -#include "pokemon.h" -#include "move_table.h" #include "unk_0207C908.h" #include "unk_0208C098.h" -#include "pokemon_summary_app.h" #include "unk_02094EDC.h" -#include "overlay091/ov91_021D0D80.h" + +#include "constdata/const_020F410C.h" typedef struct { - UnkStruct_020997B8 * unk_00; - BGL * unk_04; + UnkStruct_020997B8 *unk_00; + BGL *unk_04; Window unk_08[15]; - MessageLoader * unk_F8; - StringTemplate * unk_FC; - Strbuf* unk_100; - BmpList * unk_104; - ResourceMetadata * unk_108; - UIControlData * unk_10C; - SpriteRenderer * unk_110; - SpriteGfxHandler * unk_114; - CellActorData * unk_118[13]; + MessageLoader *unk_F8; + StringTemplate *unk_FC; + Strbuf *unk_100; + BmpList *unk_104; + ResourceMetadata *unk_108; + UIControlData *unk_10C; + SpriteRenderer *unk_110; + SpriteGfxHandler *unk_114; + CellActorData *unk_118[13]; PokemonSummary unk_14C; - OverlayManager * unk_17C; + OverlayManager *unk_17C; int unk_180; u8 unk_184; u8 unk_185; u8 unk_186; } UnkStruct_ov91_021D0ED8; -typedef int (* GenericFunctionPtr_1)(UnkStruct_ov91_021D0ED8 *); +typedef int (*GenericFunctionPtr_1)(UnkStruct_ov91_021D0ED8 *); typedef struct { GenericFunctionPtr_1 unk_00; GenericFunctionPtr_1 unk_04; } GameWindowLayout_1; -static void ov91_021D0ED8(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D0F6C(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D0F9C(void * param0); +static void ov91_021D0ED8(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D0F6C(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D0F9C(void *param0); static void ov91_021D0FC4(void); -static void ov91_021D0FE4(BGL * param0); -static void ov91_021D1098(BGL * param0); -static void ov91_021D10C8(UnkStruct_ov91_021D0ED8 * param0, NARC * param1); -static void ov91_021D1154(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D11A0(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D11B8(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D11F0(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1214(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D122C(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1480(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D134C(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D136C(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1394(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D13E4(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1438(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1450(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D2604(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D261C(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D26AC(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D1580(UnkStruct_ov91_021D0ED8 * param0, u32 param1, u32 param2, u32 param3, u32 param4); -static void ov91_021D1498(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D1664(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D1784(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D1868(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D188C(BmpList * param0, u32 param1, u8 param2); -static void ov91_021D18C4(BmpList * param0, u32 param1, u8 param2); -static void ov91_021D18C8(UnkStruct_ov91_021D0ED8 * param0, u32 param1); -static void ov91_021D1A68(UnkStruct_ov91_021D0ED8 * param0, u32 param1); -static void ov91_021D1BBC(UnkStruct_ov91_021D0ED8 * param0, u16 param1); -static void ov91_021D1C10(UnkStruct_ov91_021D0ED8 * param0, u32 param1); -static void ov91_021D1DF8(UnkStruct_ov91_021D0ED8 * param0, u32 param1); -static BOOL ov91_021D1E50(UnkStruct_0201D738 * param0, u16 param1); -static u16 ov91_021D1DD0(UnkStruct_ov91_021D0ED8 * param0); -static u16 ov91_021D1DE0(UnkStruct_ov91_021D0ED8 * param0); -static u8 ov91_021D1EA0(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1EC8(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1EE8(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1F38(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1F44(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1F94(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1FA0(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1FBC(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1FD8(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D1FF4(UnkStruct_ov91_021D0ED8 * param0); -static int ov91_021D2008(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D2508(UnkStruct_ov91_021D0ED8 * param0, NARC * param1); -static void ov91_021D20B4(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D20E8(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D2314(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D237C(UnkStruct_ov91_021D0ED8 * param0, u16 param1, u16 param2); -static void ov91_021D24B4(UnkStruct_ov91_021D0ED8 * param0, u16 param1); -static void ov91_021D2548(UnkStruct_ov91_021D0ED8 * param0, u8 param1, u8 param2); -static void ov91_021D2574(UnkStruct_ov91_021D0ED8 * param0, u8 param1); -static void ov91_021D2594(UnkStruct_ov91_021D0ED8 * param0); -static void ov91_021D25E4(UnkStruct_ov91_021D0ED8 * param0); +static void ov91_021D0FE4(BGL *param0); +static void ov91_021D1098(BGL *param0); +static void ov91_021D10C8(UnkStruct_ov91_021D0ED8 *param0, NARC *param1); +static void ov91_021D1154(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D11A0(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D11B8(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D11F0(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1214(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D122C(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1480(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D134C(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D136C(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1394(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D13E4(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1438(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1450(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D2604(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D261C(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D26AC(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D1580(UnkStruct_ov91_021D0ED8 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +static void ov91_021D1498(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D1664(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D1784(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D1868(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D188C(BmpList *param0, u32 param1, u8 param2); +static void ov91_021D18C4(BmpList *param0, u32 param1, u8 param2); +static void ov91_021D18C8(UnkStruct_ov91_021D0ED8 *param0, u32 param1); +static void ov91_021D1A68(UnkStruct_ov91_021D0ED8 *param0, u32 param1); +static void ov91_021D1BBC(UnkStruct_ov91_021D0ED8 *param0, u16 param1); +static void ov91_021D1C10(UnkStruct_ov91_021D0ED8 *param0, u32 param1); +static void ov91_021D1DF8(UnkStruct_ov91_021D0ED8 *param0, u32 param1); +static BOOL ov91_021D1E50(UnkStruct_0201D738 *param0, u16 param1); +static u16 ov91_021D1DD0(UnkStruct_ov91_021D0ED8 *param0); +static u16 ov91_021D1DE0(UnkStruct_ov91_021D0ED8 *param0); +static u8 ov91_021D1EA0(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1EC8(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1EE8(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1F38(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1F44(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1F94(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1FA0(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1FBC(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1FD8(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D1FF4(UnkStruct_ov91_021D0ED8 *param0); +static int ov91_021D2008(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D2508(UnkStruct_ov91_021D0ED8 *param0, NARC *param1); +static void ov91_021D20B4(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D20E8(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D2314(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D237C(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param2); +static void ov91_021D24B4(UnkStruct_ov91_021D0ED8 *param0, u16 param1); +static void ov91_021D2548(UnkStruct_ov91_021D0ED8 *param0, u8 param1, u8 param2); +static void ov91_021D2574(UnkStruct_ov91_021D0ED8 *param0, u8 param1); +static void ov91_021D2594(UnkStruct_ov91_021D0ED8 *param0); +static void ov91_021D25E4(UnkStruct_ov91_021D0ED8 *param0); static const UnkStruct_ov61_0222C884 Unk_ov91_021D2884[] = { - {0x1, 0x13, 0x0, 0xB, 0x2, 0xF, 0x28}, - {0x1, 0x13, 0x0, 0xB, 0x2, 0xF, 0x3E}, - {0x1, 0x1, 0x0, 0x6, 0x2, 0xF, 0x54}, - {0x1, 0x1, 0x2, 0x6, 0x2, 0xF, 0x60}, - {0x1, 0x1, 0x4, 0x8, 0x2, 0xF, 0x6C}, - {0x1, 0x1, 0x6, 0x3, 0x2, 0xF, 0x7C}, - {0x1, 0x2, 0x2, 0xC, 0x2, 0xF, 0x82}, - {0x1, 0xD, 0x2, 0x3, 0x2, 0xF, 0x9A}, - {0x1, 0xD, 0x4, 0x3, 0x2, 0xF, 0xA0}, - {0x1, 0xB, 0x6, 0x5, 0x2, 0xF, 0xA6}, - {0x1, 0x1, 0x8, 0xF, 0xA, 0xF, 0xB0}, - {0x1, 0x1, 0x9, 0xF, 0x6, 0xF, 0x146}, - {0x0, 0x2, 0x13, 0x1B, 0x4, 0xE, 0x1A0}, - {0x1, 0x15, 0x3, 0xB, 0xE, 0xF, 0x20C}, - {0x0, 0x17, 0xD, 0x7, 0x4, 0xE, 0x2A6} + { 0x1, 0x13, 0x0, 0xB, 0x2, 0xF, 0x28 }, + { 0x1, 0x13, 0x0, 0xB, 0x2, 0xF, 0x3E }, + { 0x1, 0x1, 0x0, 0x6, 0x2, 0xF, 0x54 }, + { 0x1, 0x1, 0x2, 0x6, 0x2, 0xF, 0x60 }, + { 0x1, 0x1, 0x4, 0x8, 0x2, 0xF, 0x6C }, + { 0x1, 0x1, 0x6, 0x3, 0x2, 0xF, 0x7C }, + { 0x1, 0x2, 0x2, 0xC, 0x2, 0xF, 0x82 }, + { 0x1, 0xD, 0x2, 0x3, 0x2, 0xF, 0x9A }, + { 0x1, 0xD, 0x4, 0x3, 0x2, 0xF, 0xA0 }, + { 0x1, 0xB, 0x6, 0x5, 0x2, 0xF, 0xA6 }, + { 0x1, 0x1, 0x8, 0xF, 0xA, 0xF, 0xB0 }, + { 0x1, 0x1, 0x9, 0xF, 0x6, 0xF, 0x146 }, + { 0x0, 0x2, 0x13, 0x1B, 0x4, 0xE, 0x1A0 }, + { 0x1, 0x15, 0x3, 0xB, 0xE, 0xF, 0x20C }, + { 0x0, 0x17, 0xD, 0x7, 0x4, 0xE, 0x2A6 } }; static const UnkStruct_ov84_02240FA8 Unk_ov91_021D27BC = { @@ -191,16 +189,16 @@ static const UnkStruct_ov84_02240FA8 Unk_ov91_021D27BC = { }; static const u32 Unk_ov91_021D282C[2][11] = { - {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA}, - {0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15} + { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA }, + { 0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15 } }; static const GameWindowLayout_1 Unk_ov91_021D27DC[] = { - {ov91_021D1EC8, ov91_021D1EE8}, - {ov91_021D1F38, ov91_021D1F44}, - {ov91_021D1F94, ov91_021D1FA0}, - {ov91_021D1FBC, ov91_021D1FD8}, - {ov91_021D1FF4, ov91_021D2008} + { ov91_021D1EC8, ov91_021D1EE8 }, + { ov91_021D1F38, ov91_021D1F44 }, + { ov91_021D1F94, ov91_021D1FA0 }, + { ov91_021D1FBC, ov91_021D1FD8 }, + { ov91_021D1FF4, ov91_021D2008 } }; static const SpriteTemplate Unk_ov91_021D28FC[] = { @@ -212,9 +210,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8A8, 0xB8A8, 0xB8A8, 0xB8A8, 0x0, 0x0}, + { 0xB8A8, 0xB8A8, 0xB8A8, 0xB8A8, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0xF6, @@ -224,9 +222,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8A8, 0xB8A8, 0xB8A8, 0xB8A8, 0x0, 0x0}, + { 0xB8A8, 0xB8A8, 0xB8A8, 0xB8A8, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0xC4, @@ -236,9 +234,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8A9, 0xB8A8, 0xB8A9, 0xB8A9, 0x0, 0x0}, + { 0xB8A9, 0xB8A8, 0xB8A9, 0xB8A9, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0xC4, @@ -248,9 +246,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8A9, 0xB8A8, 0xB8A9, 0xB8A9, 0x0, 0x0}, + { 0xB8A9, 0xB8A8, 0xB8A9, 0xB8A9, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0xC4, @@ -260,9 +258,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8AA, 0xB8A8, 0xB8AA, 0xB8AA, 0x0, 0x0}, + { 0xB8AA, 0xB8A8, 0xB8AA, 0xB8AA, 0x0, 0x0 }, 0x1, - 0x0 + 0x0, }, { 0x74, @@ -272,9 +270,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8AB, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0}, + { 0xB8AB, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0x98, @@ -284,9 +282,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8AC, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0}, + { 0xB8AC, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0x98, @@ -296,9 +294,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8AD, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0}, + { 0xB8AD, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0x98, @@ -308,9 +306,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8AE, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0}, + { 0xB8AE, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0x98, @@ -320,9 +318,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8AF, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0}, + { 0xB8AF, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0x98, @@ -332,9 +330,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8B0, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0}, + { 0xB8B0, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0x98, @@ -344,9 +342,9 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8B1, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0}, + { 0xB8B1, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0 }, 0x2, - 0x0 + 0x0, }, { 0x98, @@ -356,15 +354,15 @@ static const SpriteTemplate Unk_ov91_021D28FC[] = { 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0xB8B2, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0}, + { 0xB8B2, 0xB8A8, 0xB8AB, 0xB8AB, 0x0, 0x0 }, 0x2, - 0x0 - } + 0x0, + }, }; -int ov91_021D0D80 (OverlayManager * param0, int * param1) +int ov91_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov91_021D0ED8 * v0; + UnkStruct_ov91_021D0ED8 *v0; Heap_Create(3, 67, 0x20000); @@ -386,9 +384,9 @@ int ov91_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov91_021D0E08 (OverlayManager * param0, int * param1) +int ov91_021D0E08(OverlayManager *param0, int *param1) { - UnkStruct_ov91_021D0ED8 * v0 = OverlayManager_Data(param0); + UnkStruct_ov91_021D0ED8 *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -437,9 +435,9 @@ int ov91_021D0E08 (OverlayManager * param0, int * param1) return 0; } -int ov91_021D0EBC (OverlayManager * param0, int * param1) +int ov91_021D0EBC(OverlayManager *param0, int *param1) { - UnkStruct_ov91_021D0ED8 * v0 = OverlayManager_Data(param0); + UnkStruct_ov91_021D0ED8 *v0 = OverlayManager_Data(param0); ov91_021D0F6C(v0); @@ -449,9 +447,9 @@ int ov91_021D0EBC (OverlayManager * param0, int * param1) return 1; } -static void ov91_021D0ED8 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D0ED8(UnkStruct_ov91_021D0ED8 *param0) { - NARC * v0; + NARC *v0; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -481,7 +479,7 @@ static void ov91_021D0ED8 (UnkStruct_ov91_021D0ED8 * param0) NARC_dtor(v0); } -static void ov91_021D0F6C (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D0F6C(UnkStruct_ov91_021D0ED8 *param0) { ov91_021D1868(param0); ov91_021D11A0(param0); @@ -493,9 +491,9 @@ static void ov91_021D0F6C (UnkStruct_ov91_021D0ED8 * param0) SetMainCallback(NULL, NULL); } -static void ov91_021D0F9C (void * param0) +static void ov91_021D0F9C(void *param0) { - UnkStruct_ov91_021D0ED8 * v0 = param0; + UnkStruct_ov91_021D0ED8 *v0 = param0; sub_0201C2B8(v0->unk_04); sub_0201DCAC(); @@ -504,7 +502,7 @@ static void ov91_021D0F9C (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov91_021D0FC4 (void) +static void ov91_021D0FC4(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -522,7 +520,7 @@ static void ov91_021D0FC4 (void) GXLayers_SetBanks(&v0); } -static void ov91_021D0FE4 (BGL * param0) +static void ov91_021D0FE4(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -601,7 +599,7 @@ static void ov91_021D0FE4 (BGL * param0) sub_02019690(0, 32, 0, 67); } -static void ov91_021D1098 (BGL * param0) +static void ov91_021D1098(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_OBJ, 0); sub_02019044(param0, 2); @@ -610,7 +608,7 @@ static void ov91_021D1098 (BGL * param0) Heap_FreeToHeapExplicit(67, param0); } -static void ov91_021D10C8 (UnkStruct_ov91_021D0ED8 * param0, NARC * param1) +static void ov91_021D10C8(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) { sub_020070E8(param1, 10, param0->unk_04, 2, 0, 0, 0, 67); sub_0200710C(param1, 11, param0->unk_04, 2, 0, 0, 0, 67); @@ -620,7 +618,7 @@ static void ov91_021D10C8 (UnkStruct_ov91_021D0ED8 * param0, NARC * param1) sub_0200DD0C(param0->unk_04, 0, (1 + 9), 13, Options_Frame(param0->unk_00->unk_08), 67); } -static void ov91_021D1154 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D1154(UnkStruct_ov91_021D0ED8 *param0) { u32 v0; @@ -635,7 +633,7 @@ static void ov91_021D1154 (UnkStruct_ov91_021D0ED8 * param0) sub_0200E060(¶m0->unk_08[12], 0, (1 + 9), 13); } -static void ov91_021D11A0 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D11A0(UnkStruct_ov91_021D0ED8 *param0) { u32 v0; @@ -644,21 +642,21 @@ static void ov91_021D11A0 (UnkStruct_ov91_021D0ED8 * param0) } } -static void ov91_021D11B8 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D11B8(UnkStruct_ov91_021D0ED8 *param0) { param0->unk_F8 = MessageLoader_Init(0, 26, 645, 67); param0->unk_FC = StringTemplate_Default(67); param0->unk_100 = Strbuf_Init(256, 67); } -static void ov91_021D11F0 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D11F0(UnkStruct_ov91_021D0ED8 *param0) { MessageLoader_Free(param0->unk_F8); StringTemplate_Free(param0->unk_FC); Strbuf_Free(param0->unk_100); } -static int ov91_021D1214 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1214(UnkStruct_ov91_021D0ED8 *param0) { if (ScreenWipe_Done() == 1) { return param0->unk_180; @@ -667,7 +665,7 @@ static int ov91_021D1214 (UnkStruct_ov91_021D0ED8 * param0) return 0; } -static int ov91_021D122C (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D122C(UnkStruct_ov91_021D0ED8 *param0) { u32 v0; u16 v1, v2; @@ -722,7 +720,7 @@ static int ov91_021D122C (UnkStruct_ov91_021D0ED8 * param0) return 1; } -static int ov91_021D134C (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D134C(UnkStruct_ov91_021D0ED8 *param0) { if (Message_Printing(param0->unk_185) == 0) { return param0->unk_180; @@ -731,13 +729,13 @@ static int ov91_021D134C (UnkStruct_ov91_021D0ED8 * param0) return 2; } -static int ov91_021D136C (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D136C(UnkStruct_ov91_021D0ED8 *param0) { param0->unk_10C = sub_02002100(param0->unk_04, &Unk_ov91_021D2884[14], 1, 12, 67); return 4; } -static int ov91_021D1394 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1394(UnkStruct_ov91_021D0ED8 *param0) { switch (sub_02002114(param0->unk_10C, 67)) { case 0: @@ -749,7 +747,7 @@ static int ov91_021D1394 (UnkStruct_ov91_021D0ED8 * param0) return 4; } -static int ov91_021D13E4 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D13E4(UnkStruct_ov91_021D0ED8 *param0) { u32 v0; @@ -767,14 +765,14 @@ static int ov91_021D13E4 (UnkStruct_ov91_021D0ED8 * param0) return 8; } -static int ov91_021D1438 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1438(UnkStruct_ov91_021D0ED8 *param0) { ov91_021D1DF8(param0, 6); param0->unk_180 = 5; return 2; } -static int ov91_021D1450 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1450(UnkStruct_ov91_021D0ED8 *param0) { if (param0->unk_00->unk_17 < 4) { ov91_021D1DF8(param0, 10); @@ -789,14 +787,14 @@ static int ov91_021D1450 (UnkStruct_ov91_021D0ED8 * param0) return 2; } -static int ov91_021D1480 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1480(UnkStruct_ov91_021D0ED8 *param0) { sub_0208C120(1, 67); param0->unk_180 = 9; return 0; } -static void ov91_021D1498 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D1498(UnkStruct_ov91_021D0ED8 *param0) { u16 v0; @@ -839,7 +837,7 @@ static void ov91_021D1498 (UnkStruct_ov91_021D0ED8 * param0) ov91_021D2314(param0); } -static void ov91_021D1580 (UnkStruct_ov91_021D0ED8 * param0, u32 param1, u32 param2, u32 param3, u32 param4) +static void ov91_021D1580(UnkStruct_ov91_021D0ED8 *param0, u32 param1, u32 param2, u32 param3, u32 param4) { u8 v0; u8 v1; @@ -864,9 +862,9 @@ static void ov91_021D1580 (UnkStruct_ov91_021D0ED8 * param0, u32 param1, u32 par sub_0201D78C(¶m0->unk_08[param1], param2, param0->unk_100, v2, 0, 0xff, param3, NULL); } -static void ov91_021D1618 (UnkStruct_ov91_021D0ED8 * param0, u32 param1, u32 param2, u8 param3, u8 param4) +static void ov91_021D1618(UnkStruct_ov91_021D0ED8 *param0, u32 param1, u32 param2, u8 param3, u8 param4) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param0->unk_F8, param1); StringTemplate_SetNumber(param0->unk_FC, 0, param2, param3, param4, 1); @@ -874,7 +872,7 @@ static void ov91_021D1618 (UnkStruct_ov91_021D0ED8 * param0, u32 param1, u32 par Strbuf_Free(v0); } -static void ov91_021D1664 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D1664(UnkStruct_ov91_021D0ED8 *param0) { u32 v0; @@ -900,7 +898,7 @@ static void ov91_021D1664 (UnkStruct_ov91_021D0ED8 * param0) ov91_021D1580(param0, 6, 0, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 2); } -static u32 ov91_021D175C (UnkStruct_ov91_021D0ED8 * param0) +static u32 ov91_021D175C(UnkStruct_ov91_021D0ED8 *param0) { u32 v0; @@ -913,9 +911,9 @@ static u32 ov91_021D175C (UnkStruct_ov91_021D0ED8 * param0) return v0; } -static void ov91_021D1784 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D1784(UnkStruct_ov91_021D0ED8 *param0) { - MessageLoader * v0; + MessageLoader *v0; UnkStruct_ov84_02240FA8 v1; u32 v2; @@ -949,15 +947,15 @@ static void ov91_021D1784 (UnkStruct_ov91_021D0ED8 * param0) sub_0201A9A4(¶m0->unk_08[13]); } -static void ov91_021D1868 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D1868(UnkStruct_ov91_021D0ED8 *param0) { sub_02001384(param0->unk_104, ¶m0->unk_00->unk_12, ¶m0->unk_00->unk_10); sub_02013A3C(param0->unk_108); } -static void ov91_021D188C (BmpList * param0, u32 param1, u8 param2) +static void ov91_021D188C(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_ov91_021D0ED8 * v0 = (UnkStruct_ov91_021D0ED8 *)sub_02001504(param0, 19); + UnkStruct_ov91_021D0ED8 *v0 = (UnkStruct_ov91_021D0ED8 *)sub_02001504(param0, 19); if (param2 != 1) { Sound_PlayEffect(1501); @@ -970,12 +968,12 @@ static void ov91_021D188C (BmpList * param0, u32 param1, u8 param2) } } -static void ov91_021D18C4 (BmpList * param0, u32 param1, u8 param2) +static void ov91_021D18C4(BmpList *param0, u32 param1, u8 param2) { return; } -static void ov91_021D18C8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) +static void ov91_021D18C8(UnkStruct_ov91_021D0ED8 *param0, u32 param1) { BGL_FillWindow(¶m0->unk_08[10], 0); BGL_FillWindow(¶m0->unk_08[7], 0); @@ -984,7 +982,7 @@ static void ov91_021D18C8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) SpriteActor_EnableObject(param0->unk_118[5], 0); if (param1 != 0xfffffffe) { - MessageLoader * v0; + MessageLoader *v0; u32 v1; v1 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_POWER); @@ -1034,12 +1032,12 @@ static void ov91_021D18C8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) sub_0201A9A4(¶m0->unk_08[9]); } -static void ov91_021D1A68 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) +static void ov91_021D1A68(UnkStruct_ov91_021D0ED8 *param0, u32 param1) { BGL_FillWindow(¶m0->unk_08[11], 0); if (param1 != 0xfffffffe) { - MessageLoader * v0; + MessageLoader *v0; u32 v1; u32 v2; @@ -1060,7 +1058,7 @@ static void ov91_021D1A68 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) sub_0201A9A4(¶m0->unk_08[11]); } -static void ov91_021D1B00 (UnkStruct_ov91_021D0ED8 * param0, u16 param1, u8 param2) +static void ov91_021D1B00(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u8 param2) { sub_02019CB8(param0->unk_04, 2, param1, 34 + param2 * 2, 5, 1, 1, 16); sub_02019CB8(param0->unk_04, 2, param1 + 1, 34 + param2 * 2 + 1, 5, 1, 1, 16); @@ -1068,7 +1066,7 @@ static void ov91_021D1B00 (UnkStruct_ov91_021D0ED8 * param0, u16 param1, u8 para sub_02019CB8(param0->unk_04, 2, param1 + 33, 34 + param2 * 2 + 1, 5 + 1, 1, 1, 16); } -static void ov91_021D1B94 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D1B94(UnkStruct_ov91_021D0ED8 *param0) { u16 v0; @@ -1079,7 +1077,7 @@ static void ov91_021D1B94 (UnkStruct_ov91_021D0ED8 * param0) sub_0201C3C0(param0->unk_04, 2); } -static void ov91_021D1BBC (UnkStruct_ov91_021D0ED8 * param0, u16 param1) +static void ov91_021D1BBC(UnkStruct_ov91_021D0ED8 *param0, u16 param1) { u32 v0; u16 v1; @@ -1099,9 +1097,9 @@ static void ov91_021D1BBC (UnkStruct_ov91_021D0ED8 * param0, u16 param1) sub_0201C3C0(param0->unk_04, 2); } -static void ov91_021D1C10 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) +static void ov91_021D1C10(UnkStruct_ov91_021D0ED8 *param0, u32 param1) { - Strbuf* v0; + Strbuf *v0; switch (param1) { case 0: @@ -1149,17 +1147,17 @@ static void ov91_021D1C10 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) Strbuf_Free(v0); } -static u16 ov91_021D1DD0 (UnkStruct_ov91_021D0ED8 * param0) +static u16 ov91_021D1DD0(UnkStruct_ov91_021D0ED8 *param0) { return param0->unk_00->unk_0C[param0->unk_00->unk_12 + param0->unk_00->unk_10]; } -static u16 ov91_021D1DE0 (UnkStruct_ov91_021D0ED8 * param0) +static u16 ov91_021D1DE0(UnkStruct_ov91_021D0ED8 *param0) { return (u16)Pokemon_GetValue(param0->unk_00->unk_00, 54 + param0->unk_00->unk_17, NULL); } -static void ov91_021D1DF8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) +static void ov91_021D1DF8(UnkStruct_ov91_021D0ED8 *param0, u32 param1) { BGL_FillWindow(¶m0->unk_08[12], 15); ov91_021D1C10(param0, param1); @@ -1169,7 +1167,7 @@ static void ov91_021D1DF8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) param0->unk_185 = PrintStringSimple(¶m0->unk_08[12], 1, param0->unk_100, 0, 0, Options_TextFrameDelay(param0->unk_00->unk_08), ov91_021D1E50); } -static BOOL ov91_021D1E50 (UnkStruct_0201D738 * param0, u16 param1) +static BOOL ov91_021D1E50(UnkStruct_0201D738 *param0, u16 param1) { switch (param1) { case 1: @@ -1189,7 +1187,7 @@ static BOOL ov91_021D1E50 (UnkStruct_0201D738 * param0, u16 param1) return 0; } -static u8 ov91_021D1EA0 (UnkStruct_ov91_021D0ED8 * param0) +static u8 ov91_021D1EA0(UnkStruct_ov91_021D0ED8 *param0) { u8 v0; @@ -1202,7 +1200,7 @@ static u8 ov91_021D1EA0 (UnkStruct_ov91_021D0ED8 * param0) return v0; } -static int ov91_021D1EC8 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1EC8(UnkStruct_ov91_021D0ED8 *param0) { ov91_021D1DF8(param0, 3); @@ -1212,7 +1210,7 @@ static int ov91_021D1EC8 (UnkStruct_ov91_021D0ED8 * param0) return 2; } -static int ov91_021D1EE8 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1EE8(UnkStruct_ov91_021D0ED8 *param0) { BGL_FillWindow(¶m0->unk_08[12], 15); @@ -1227,13 +1225,13 @@ static int ov91_021D1EE8 (UnkStruct_ov91_021D0ED8 * param0) return 1; } -static int ov91_021D1F38 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1F38(UnkStruct_ov91_021D0ED8 *param0) { param0->unk_00->unk_16 = 1; return 8; } -static int ov91_021D1F44 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1F44(UnkStruct_ov91_021D0ED8 *param0) { BGL_FillWindow(¶m0->unk_08[12], 15); @@ -1248,13 +1246,13 @@ static int ov91_021D1F44 (UnkStruct_ov91_021D0ED8 * param0) return 1; } -static int ov91_021D1F94 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1F94(UnkStruct_ov91_021D0ED8 *param0) { param0->unk_180 = 10; return 0; } -static int ov91_021D1FA0 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1FA0(UnkStruct_ov91_021D0ED8 *param0) { ov91_021D1DF8(param0, 7); param0->unk_186 = 3; @@ -1262,7 +1260,7 @@ static int ov91_021D1FA0 (UnkStruct_ov91_021D0ED8 * param0) return 2; } -static int ov91_021D1FBC (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1FBC(UnkStruct_ov91_021D0ED8 *param0) { ov91_021D1DF8(param0, 8); param0->unk_180 = 8; @@ -1270,7 +1268,7 @@ static int ov91_021D1FBC (UnkStruct_ov91_021D0ED8 * param0) return 2; } -static int ov91_021D1FD8 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1FD8(UnkStruct_ov91_021D0ED8 *param0) { ov91_021D1DF8(param0, 4); param0->unk_186 = 2; @@ -1278,20 +1276,20 @@ static int ov91_021D1FD8 (UnkStruct_ov91_021D0ED8 * param0) return 2; } -static int ov91_021D1FF4 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D1FF4(UnkStruct_ov91_021D0ED8 *param0) { ov91_021D1DF8(param0, 5); param0->unk_180 = 6; return 2; } -static int ov91_021D2008 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D2008(UnkStruct_ov91_021D0ED8 *param0) { param0->unk_180 = 10; return 0; } -static void ov91_021D2014 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D2014(UnkStruct_ov91_021D0ED8 *param0) { UnkStruct_ov104_02241308 v0 = { 11, 2, 4, 4, 0, 0 @@ -1304,7 +1302,14 @@ static void ov91_021D2014 (UnkStruct_ov91_021D0ED8 * param0) { UnkStruct_ov104_0224133C v1 = { - 0, 128, 0, 32, 0, 128, 0, 32, + 0, + 128, + 0, + 32, + 0, + 128, + 0, + 32, }; UnkStruct_ov104_022412F4 v2 = { 13, 1024 * 128, 1024 * 16, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K @@ -1318,7 +1323,7 @@ static void ov91_021D2014 (UnkStruct_ov91_021D0ED8 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov91_021D20B4 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D20B4(UnkStruct_ov91_021D0ED8 *param0) { u32 v0; @@ -1330,7 +1335,7 @@ static void ov91_021D20B4 (UnkStruct_ov91_021D0ED8 * param0) sub_0200C8D4(param0->unk_110); } -static void ov91_021D20E8 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D20E8(UnkStruct_ov91_021D0ED8 *param0) { u16 v0; @@ -1339,7 +1344,7 @@ static void ov91_021D20E8 (UnkStruct_ov91_021D0ED8 * param0) } } -static void ov91_021D2110 (UnkStruct_ov91_021D0ED8 * param0, NARC * param1) +static void ov91_021D2110(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) { u32 v0; @@ -1363,7 +1368,7 @@ static void ov91_021D2110 (UnkStruct_ov91_021D0ED8 * param0, NARC * param1) sub_0207C9EC(param0->unk_110, param0->unk_114, 47275, 47275); } -static void ov91_021D22A0 (UnkStruct_ov91_021D0ED8 * param0, u16 param1, u16 param2) +static void ov91_021D22A0(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param2) { u32 v0; @@ -1377,7 +1382,7 @@ static void ov91_021D22A0 (UnkStruct_ov91_021D0ED8 * param0, u16 param1, u16 par sub_0200D41C(param0->unk_118[6 + param2], sub_0207C92C(v0) + 2); } -static void ov91_021D2314 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D2314(UnkStruct_ov91_021D0ED8 *param0) { u32 v0; @@ -1394,7 +1399,7 @@ static void ov91_021D2314 (UnkStruct_ov91_021D0ED8 * param0) } } -static void ov91_021D237C (UnkStruct_ov91_021D0ED8 * param0, u16 param1, u16 param2) +static void ov91_021D237C(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param2) { u32 v0; s16 v1, v2; @@ -1447,7 +1452,7 @@ static void ov91_021D237C (UnkStruct_ov91_021D0ED8 * param0, u16 param1, u16 par } } -static void ov91_021D24B4 (UnkStruct_ov91_021D0ED8 * param0, u16 param1) +static void ov91_021D24B4(UnkStruct_ov91_021D0ED8 *param0, u16 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); @@ -1455,7 +1460,7 @@ static void ov91_021D24B4 (UnkStruct_ov91_021D0ED8 * param0, u16 param1) sub_0200D41C(param0->unk_118[5], sub_0207CAA8(v0) + 2); } -static void ov91_021D2508 (UnkStruct_ov91_021D0ED8 * param0, NARC * param1) +static void ov91_021D2508(UnkStruct_ov91_021D0ED8 *param0, NARC *param1) { u32 v0; @@ -1467,19 +1472,19 @@ static void ov91_021D2508 (UnkStruct_ov91_021D0ED8 * param0, NARC * param1) } } -static void ov91_021D2548 (UnkStruct_ov91_021D0ED8 * param0, u8 param1, u8 param2) +static void ov91_021D2548(UnkStruct_ov91_021D0ED8 *param0, u8 param1, u8 param2) { SpriteActor_SetSpritePositionXY(param0->unk_118[4], 196, 32 + 16 * param1); sub_0200D41C(param0->unk_118[4], param2); } -static void ov91_021D2574 (UnkStruct_ov91_021D0ED8 * param0, u8 param1) +static void ov91_021D2574(UnkStruct_ov91_021D0ED8 *param0, u8 param1) { SpriteActor_EnableObject(param0->unk_118[0], param1); SpriteActor_EnableObject(param0->unk_118[1], param1); } -static void ov91_021D2594 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D2594(UnkStruct_ov91_021D0ED8 *param0) { if (param0->unk_00->unk_12 != 0) { SpriteActor_EnableObject(param0->unk_118[2], 1); @@ -1494,20 +1499,20 @@ static void ov91_021D2594 (UnkStruct_ov91_021D0ED8 * param0) } } -static void ov91_021D25E4 (UnkStruct_ov91_021D0ED8 * param0) +static void ov91_021D25E4(UnkStruct_ov91_021D0ED8 *param0) { SpriteActor_EnableObject(param0->unk_118[2], 0); SpriteActor_EnableObject(param0->unk_118[3], 0); } -static int ov91_021D2604 (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D2604(UnkStruct_ov91_021D0ED8 *param0) { sub_0208C120(1, 67); param0->unk_180 = 11; return 0; } -static int ov91_021D261C (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D261C(UnkStruct_ov91_021D0ED8 *param0) { u8 v0[] = { 3, 5, 8 @@ -1531,7 +1536,7 @@ static int ov91_021D261C (UnkStruct_ov91_021D0ED8 * param0) return 12; } -static int ov91_021D26AC (UnkStruct_ov91_021D0ED8 * param0) +static int ov91_021D26AC(UnkStruct_ov91_021D0ED8 *param0) { if (OverlayManager_Exec(param0->unk_17C)) { OverlayManager_Free(param0->unk_17C); diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 1f46247636..2d47738396 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -1,21 +1,18 @@ +#include "overlay092/ov92_021D0D80.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202C878_decl.h" -#include "savedata.h" - #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" @@ -23,34 +20,35 @@ #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201C970.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "camera.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202C858.h" #include "unk_020996D0.h" -#include "overlay092/ov92_021D0D80.h" typedef struct UnkStruct_ov92_021D1530_t { u16 unk_00; @@ -79,33 +77,33 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_0202C878 * unk_04; - Options * unk_08; + UnkStruct_0202C878 *unk_04; + Options *unk_08; UnkStruct_ov92_021D1B24_sub1 unk_0C; - BGL * unk_B810; + BGL *unk_B810; Window unk_B814; Window unk_B824; Window unk_B834; Window unk_B844; - BmpList * unk_B854; - ResourceMetadata * unk_B858; - UIControlData * unk_B85C; - MessageLoader * unk_B860; + BmpList *unk_B854; + ResourceMetadata *unk_B858; + UIControlData *unk_B85C; + MessageLoader *unk_B860; int unk_B864; int unk_B868; - Strbuf* unk_B86C; - StringTemplate * unk_B870; + Strbuf *unk_B86C; + StringTemplate *unk_B870; NNSG3dRenderObj unk_B874; - NNSG3dResMdl * unk_B8C8; - NNSG3dResFileHeader * unk_B8CC; + NNSG3dResMdl *unk_B8C8; + NNSG3dResFileHeader *unk_B8CC; NNSG3dRenderObj unk_B8D0[5]; - NNSG3dResMdl * unk_BA74[5]; - NNSG3dResFileHeader * unk_BA88[5]; + NNSG3dResMdl *unk_BA74[5]; + NNSG3dResFileHeader *unk_BA88[5]; VecFx32 unk_BA9C; VecFx32 unk_BAA8; VecFx32 unk_BAB4; VecFx32 unk_BAC0; - Camera * camera; + Camera *camera; CameraAngle unk_BAD0; u16 unk_BAD8; VecFx32 unk_BADC; @@ -136,40 +134,40 @@ typedef struct { BOOL ov92_021D27E8(int param0, int param1, Strbuf *param2, Strbuf *param3, int param4); BOOL ov92_021D2854(int param0); -int ov92_021D0D80(OverlayManager * param0, int * param1); -int ov92_021D0EB8(OverlayManager * param0, int * param1); -int ov92_021D1478(OverlayManager * param0, int * param1); +int ov92_021D0D80(OverlayManager *param0, int *param1); +int ov92_021D0EB8(OverlayManager *param0, int *param1); +int ov92_021D1478(OverlayManager *param0, int *param1); static void ov92_021D14F0(void); static void ov92_021D1510(void); -static void ov92_021D1888(UnkStruct_ov92_021D1B24 * param0, NARC * param1); -static void ov92_021D1B24(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D1530(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D1634(UnkStruct_ov92_021D1B24 * param0, u32 param1, s16 param2, s16 param3, u16 param4, u16 param5); -static void ov92_021D16A8(UnkStruct_ov92_021D1B24 * param0); -static int ov92_021D16F8(int param0); -static void ov92_021D1700(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D1818(int param0, int param1, int * param2, int * param3, int * param4, int * param5); -static BOOL ov92_021D1B70(UnkStruct_ov92_021D1B24 * param0, u32 param1, int param2); -static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 * param0, Window * param1, const UnkStruct_ov61_0222C884 * param2, const UnkStruct_ov84_02240FA8 * param3, const UnkStruct_ov92_021D2958 * param4); -static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 * param0, Window * param1, const UnkStruct_ov61_0222C884 * param2, const UnkStruct_ov84_02240FA8 * param3, u32 param4, const u8 * param5, u32 param6); -static void ov92_021D1DB4(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D1DEC(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D1EBC(UnkStruct_ov92_021D1B24 * param0, int param1, int param2); -static void ov92_021D1F74(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D1F90(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D2150(UnkStruct_ov92_021D1B24 * param0, NARC * param1); -static void ov92_021D2210(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D2254(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D22B0(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D2334(UnkStruct_ov92_021D1B24 * param0); -static BOOL ov92_021D2460(UnkStruct_ov92_021D1B24 * param0, int param1, int param2); -static BOOL ov92_021D2644(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D26D0(UnkStruct_ov92_021D1B24 * param0); -static void ov92_021D2370(MtxFx33 * param0, VecFx32 * param1); -static void ov92_021D23E8(MtxFx33 * param0, VecFx32 * param1); -static void ov92_021D2868(UnkStruct_ov92_021D28C0 * param0); -static u32 ov92_021D28C0(const UnkStruct_ov92_021D28C0 * param0, const UnkStruct_ov92_021D28C0 * param1); -void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate * param1); +static void ov92_021D1888(UnkStruct_ov92_021D1B24 *param0, NARC *param1); +static void ov92_021D1B24(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D1530(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D1634(UnkStruct_ov92_021D1B24 *param0, u32 param1, s16 param2, s16 param3, u16 param4, u16 param5); +static void ov92_021D16A8(UnkStruct_ov92_021D1B24 *param0); +static int ov92_021D16F8(int param0); +static void ov92_021D1700(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D1818(int param0, int param1, int *param2, int *param3, int *param4, int *param5); +static BOOL ov92_021D1B70(UnkStruct_ov92_021D1B24 *param0, u32 param1, int param2); +static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2, const UnkStruct_ov84_02240FA8 *param3, const UnkStruct_ov92_021D2958 *param4); +static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2, const UnkStruct_ov84_02240FA8 *param3, u32 param4, const u8 *param5, u32 param6); +static void ov92_021D1DB4(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D1DEC(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D1EBC(UnkStruct_ov92_021D1B24 *param0, int param1, int param2); +static void ov92_021D1F74(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D1F90(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D2150(UnkStruct_ov92_021D1B24 *param0, NARC *param1); +static void ov92_021D2210(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D2254(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D22B0(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D2334(UnkStruct_ov92_021D1B24 *param0); +static BOOL ov92_021D2460(UnkStruct_ov92_021D1B24 *param0, int param1, int param2); +static BOOL ov92_021D2644(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D26D0(UnkStruct_ov92_021D1B24 *param0); +static void ov92_021D2370(MtxFx33 *param0, VecFx32 *param1); +static void ov92_021D23E8(MtxFx33 *param0, VecFx32 *param1); +static void ov92_021D2868(UnkStruct_ov92_021D28C0 *param0); +static u32 ov92_021D28C0(const UnkStruct_ov92_021D28C0 *param0, const UnkStruct_ov92_021D28C0 *param1); +void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); static const UnkStruct_ov97_0222DB78 Unk_ov92_021D2970 = { 0x0, @@ -264,9 +262,9 @@ static const UnkStruct_ov61_0222C884 Unk_ov92_021D2924 = { }; static const UnkStruct_ov92_021D2958 Unk_ov92_021D2958[] = { - {0xA, 0x0}, - {0xB, 0x1}, - {0xC, 0x2} + { 0xA, 0x0 }, + { 0xB, 0x1 }, + { 0xC, 0x2 } }; static const UnkStruct_ov84_02240FA8 Unk_ov92_021D29A8 = { @@ -311,9 +309,9 @@ static const UnkStruct_ov84_02240FA8 Unk_ov92_021D29C8 = { 0x0 }; -int ov92_021D0D80 (OverlayManager * param0, int * param1) +int ov92_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov92_021D1B24 * v0; + UnkStruct_ov92_021D1B24 *v0; int v1 = 50; SetMainCallback(NULL, NULL); @@ -337,7 +335,7 @@ int ov92_021D0D80 (OverlayManager * param0, int * param1) } { - SaveData * v2 = OverlayManager_Args(param0); + SaveData *v2 = OverlayManager_Args(param0); v0->unk_04 = sub_0202C878(v2); v0->unk_BB14 = sub_0202C8C0(v0->unk_04); @@ -372,11 +370,11 @@ int ov92_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov92_021D0EB8 (OverlayManager * param0, int * param1) +int ov92_021D0EB8(OverlayManager *param0, int *param1) { - UnkStruct_ov92_021D1B24 * v0 = OverlayManager_Data(param0); + UnkStruct_ov92_021D1B24 *v0 = OverlayManager_Data(param0); int v1 = 0; - NARC * v2; + NARC *v2; switch (*param1) { case 0: @@ -416,8 +414,7 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) *param1 = 4; } break; - case 4: - { + case 4: { int v3 = sub_02001288(v0->unk_B854); if (v3 == 0xffffffff) { @@ -440,16 +437,14 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) *param1 = 17; break; } - } - break; + } break; case 5: if (ov92_021D1B70(v0, 2, 1) == 1) { - v0->unk_B85C = sub_02002100(v0->unk_B810, &Unk_ov92_021D292C, ((512 - ((18 + 12))) - 9), 7, v0->unk_00); + v0->unk_B85C = sub_02002100(v0->unk_B810, &Unk_ov92_021D292C, ((512 - (18 + 12)) - 9), 7, v0->unk_00); *param1 = 6; } break; - case 6: - { + case 6: { u32 v4 = sub_02002114(v0->unk_B85C, v0->unk_00); switch (v4) { @@ -465,8 +460,7 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) *param1 = 3; break; } - } - break; + } break; case 7: if (ov92_021D1B70(v0, 3, 1) == 1) { v0->unk_BB1C = 0; @@ -475,8 +469,7 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) *param1 = 8; } break; - case 8: - { + case 8: { int v5 = sub_02001288(v0->unk_B854); if (v5 == 0xffffffff) { @@ -491,8 +484,7 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) } switch (v5) { - default: - { + default: { v0->unk_BB1C = v5; if (ov92_021D2854(v0->unk_BB1C) == 1) { @@ -501,15 +493,13 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) v0->unk_BB20 = 0; *param1 = 11; } - } - break; + } break; case 0xfffffffe: *param1 = 3; break; } - } - break; + } break; case 9: if (ov92_021D1B70(v0, 4, 1) == 1) { v0->unk_BB20 = 0; @@ -521,8 +511,7 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) *param1 = 10; } break; - case 10: - { + case 10: { int v7 = sub_02001288(v0->unk_B854); if (v7 == 0xffffffff) { @@ -549,20 +538,18 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) *param1 = 7; } } - } - break; + } break; case 11: ov92_021D1EBC(v0, v0->unk_BB1C, v0->unk_BB20); *param1 = 12; break; case 12: if (ov92_021D1B70(v0, 5, 1) == 1) { - v0->unk_B85C = sub_02002100(v0->unk_B810, &Unk_ov92_021D292C, ((512 - ((18 + 12))) - 9), 7, v0->unk_00); + v0->unk_B85C = sub_02002100(v0->unk_B810, &Unk_ov92_021D292C, ((512 - (18 + 12)) - 9), 7, v0->unk_00); *param1 = 13; } break; - case 13: - { + case 13: { u32 v9 = sub_02002114(v0->unk_B85C, v0->unk_00); switch (v9) { @@ -579,8 +566,7 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) *param1 = 3; break; } - } - break; + } break; case 14: if ((v0->unk_BAF0 == 1) && (v0->unk_BB24 == 0)) { v0->unk_BAF4 = 0; @@ -594,7 +580,7 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) ov92_021D2334(v0); BGL_WindowColor(&v0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); - Window_Show(&v0->unk_B834, 0, ((512 - ((18 + 12))) - 9), 7); + Window_Show(&v0->unk_B834, 0, ((512 - (18 + 12)) - 9), 7); if (v0->unk_BB14 != 0) { ov92_021D1DEC(v0); @@ -606,8 +592,7 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) v0->unk_BAE8 = 1; *param1 = 15; break; - case 15: - { + case 15: { u16 v10 = v0->unk_BAD8; ov92_021D1700(v0); @@ -661,17 +646,14 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) } } } - } - break; - case 16: - { + } break; + case 16: { BOOL v12 = ov92_021D2644(v0); if (v12 == 1) { *param1 = 15; } - } - break; + } break; case 17: v0->unk_BAEC = 0; sub_0200F174(0, 0, 0, 0x0, 6, 1, v0->unk_00); @@ -695,9 +677,9 @@ int ov92_021D0EB8 (OverlayManager * param0, int * param1) return v1; } -int ov92_021D1478 (OverlayManager * param0, int * param1) +int ov92_021D1478(OverlayManager *param0, int *param1) { - UnkStruct_ov92_021D1B24 * v0 = OverlayManager_Data(param0); + UnkStruct_ov92_021D1B24 *v0 = OverlayManager_Data(param0); int v1 = v0->unk_00; GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); @@ -717,7 +699,7 @@ int ov92_021D1478 (OverlayManager * param0, int * param1) return 1; } -static void ov92_021D14F0 (void) +static void ov92_021D14F0(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_C, @@ -735,7 +717,7 @@ static void ov92_021D14F0 (void) GXLayers_SetBanks(&v0); } -static void ov92_021D1510 (void) +static void ov92_021D1510(void) { UnkStruct_ov84_0223BA5C v0 = { GX_DISPMODE_GRAPHICS, @@ -747,15 +729,15 @@ static void ov92_021D1510 (void) sub_02018368(&v0); } -static void ov92_021D1530 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D1530(UnkStruct_ov92_021D1B24 *param0) { - NARC * v0 = NARC_ctor(NARC_INDEX_APPLICATION__WIFI_EARTH__WIFI_EARTH_PLACE, param0->unk_00); + NARC *v0 = NARC_ctor(NARC_INDEX_APPLICATION__WIFI_EARTH__WIFI_EARTH_PLACE, param0->unk_00); param0->unk_0C.unk_00 = 0; { - void * v1; - UnkStruct_ov92_021D1530 * v2; + void *v1; + UnkStruct_ov92_021D1530 *v2; u32 v3; int v4, v5; @@ -777,8 +759,8 @@ static void ov92_021D1530 (UnkStruct_ov92_021D1B24 * param0) Heap_FreeToHeap(v1); } { - void * v6; - UnkStruct_ov69_0225C980 * v7; + void *v6; + UnkStruct_ov69_0225C980 *v7; u32 v8, v9; int v10, v11, v12, v13; @@ -807,9 +789,9 @@ static void ov92_021D1530 (UnkStruct_ov92_021D1B24 * param0) NARC_dtor(v0); } -static void ov92_021D1634 (UnkStruct_ov92_021D1B24 * param0, u32 param1, s16 param2, s16 param3, u16 param4, u16 param5) +static void ov92_021D1634(UnkStruct_ov92_021D1B24 *param0, u32 param1, s16 param2, s16 param3, u16 param4, u16 param5) { - MtxFx33 v0 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + MtxFx33 v0 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; VecFx32 v1; param0->unk_0C.unk_04[param1].unk_00 = param2; @@ -827,7 +809,7 @@ static void ov92_021D1634 (UnkStruct_ov92_021D1B24 * param0, u32 param1, s16 par param0->unk_0C.unk_04[param1].unk_2C = param5; } -static void ov92_021D16A8 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D16A8(UnkStruct_ov92_021D1B24 *param0) { int v0; @@ -840,12 +822,12 @@ static void ov92_021D16A8 (UnkStruct_ov92_021D1B24 * param0) } } -static int ov92_021D16F8 (int param0) +static int ov92_021D16F8(int param0) { return sub_020996D4(param0); } -static void ov92_021D1700 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D1700(UnkStruct_ov92_021D1B24 *param0) { int v0, v1, v2, v3; @@ -896,7 +878,7 @@ static void ov92_021D1700 (UnkStruct_ov92_021D1B24 * param0) } } -static void ov92_021D1818 (int param0, int param1, int * param2, int * param3, int * param4, int * param5) +static void ov92_021D1818(int param0, int param1, int *param2, int *param3, int *param4, int *param5) { int v0 = 0; int v1 = 0; @@ -938,7 +920,7 @@ static void ov92_021D1818 (int param0, int param1, int * param2, int * param3, i *param5 = v3; } -static void ov92_021D1888 (UnkStruct_ov92_021D1B24 * param0, NARC * param1) +static void ov92_021D1888(UnkStruct_ov92_021D1B24 *param0, NARC *param1) { sub_020183C4(param0->unk_B810, 6, &Unk_ov92_021D2970, 0); sub_02019EBC(param0->unk_B810, 6); @@ -946,14 +928,14 @@ static void ov92_021D1888 (UnkStruct_ov92_021D1B24 * param0, NARC * param1) sub_020070E8(param1, 5, param0->unk_B810, 7, 0, 0, 0, param0->unk_00); sub_02007130(param1, 6, 4, 0 * (2 * 16), (2 * 16) * 4, param0->unk_00); sub_0200710C(param1, 7, param0->unk_B810, 7, 0, 0, 0, param0->unk_00); - sub_0200DD0C(param0->unk_B810, 6, (512 - ((18 + 12))), 6, Options_Frame(param0->unk_08), param0->unk_00); - sub_0200DAA4(param0->unk_B810, 6, ((512 - ((18 + 12))) - 9), 7, 0, param0->unk_00); + sub_0200DD0C(param0->unk_B810, 6, (512 - (18 + 12)), 6, Options_Frame(param0->unk_08), param0->unk_00); + sub_0200DAA4(param0->unk_B810, 6, ((512 - (18 + 12)) - 9), 7, 0, param0->unk_00); sub_02002E7C(4, 4 * (2 * 16), param0->unk_00); sub_02019690(6, 32, 0, param0->unk_00); sub_0201975C(6, 0x4753); sub_0201A8D4(param0->unk_B810, ¶m0->unk_B814, &Unk_ov92_021D2934); BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); - sub_0200E060(¶m0->unk_B814, 0, (512 - ((18 + 12))), 6); + sub_0200E060(¶m0->unk_B814, 0, (512 - (18 + 12)), 6); param0->unk_B864 = 0; @@ -963,13 +945,13 @@ static void ov92_021D1888 (UnkStruct_ov92_021D1B24 * param0, NARC * param1) sub_020070E8(param1, 5, param0->unk_B810, 3, 0, 0, 0, param0->unk_00); sub_02007130(param1, 6, 0, 0 * (2 * 16), (2 * 16) * 4, param0->unk_00); sub_0200710C(param1, 7, param0->unk_B810, 3, 0, 0, 0, param0->unk_00); - sub_0200DAA4(param0->unk_B810, 2, ((512 - ((18 + 12))) - 9), 7, 0, param0->unk_00); + sub_0200DAA4(param0->unk_B810, 2, ((512 - (18 + 12)) - 9), 7, 0, param0->unk_00); sub_02002E7C(0, 4 * (2 * 16), param0->unk_00); sub_02019690(2, 32, 0, param0->unk_00); sub_0201975C(2, 0x0); { - Strbuf* v0 = Strbuf_Init(16, param0->unk_00); + Strbuf *v0 = Strbuf_Init(16, param0->unk_00); sub_02002BB8(2, param0->unk_00); { @@ -1000,7 +982,7 @@ static void ov92_021D1888 (UnkStruct_ov92_021D1B24 * param0, NARC * param1) } } -static void ov92_021D1B24 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D1B24(UnkStruct_ov92_021D1B24 *param0) { BGL_DeleteWindow(¶m0->unk_B834); BGL_DeleteWindow(¶m0->unk_B814); @@ -1010,7 +992,7 @@ static void ov92_021D1B24 (UnkStruct_ov92_021D1B24 * param0) sub_02019044(param0->unk_B810, 7); } -static BOOL ov92_021D1B70 (UnkStruct_ov92_021D1B24 * param0, u32 param1, int param2) +static BOOL ov92_021D1B70(UnkStruct_ov92_021D1B24 *param0, u32 param1, int param2) { BOOL v0 = 0; @@ -1038,14 +1020,14 @@ static BOOL ov92_021D1B70 (UnkStruct_ov92_021D1B24 * param0, u32 param1, int par return v0; } -static void ov92_021D1C38 (BmpList * param0, u32 param1, u8 param2) +static void ov92_021D1C38(BmpList *param0, u32 param1, u8 param2) { if (param2 == 0) { Sound_PlayEffect(1500); } } -static void ov92_021D1C4C (UnkStruct_ov92_021D1B24 * param0, Window * param1, const UnkStruct_ov61_0222C884 * param2, const UnkStruct_ov84_02240FA8 * param3, const UnkStruct_ov92_021D2958 * param4) +static void ov92_021D1C4C(UnkStruct_ov92_021D1B24 *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2, const UnkStruct_ov84_02240FA8 *param3, const UnkStruct_ov92_021D2958 *param4) { UnkStruct_ov84_02240FA8 v0; int v1; @@ -1063,14 +1045,14 @@ static void ov92_021D1C4C (UnkStruct_ov92_021D1B24 * param0, Window * param1, co v0.unk_04 = ov92_021D1C38; param0->unk_B854 = sub_0200112C(&v0, 0, 0, param0->unk_00); - Window_Show(v0.unk_0C, 1, ((512 - ((18 + 12))) - 9), 7); + Window_Show(v0.unk_0C, 1, ((512 - (18 + 12)) - 9), 7); sub_0201A954(param1); } -static void ov92_021D1CF4 (UnkStruct_ov92_021D1B24 * param0, Window * param1, const UnkStruct_ov61_0222C884 * param2, const UnkStruct_ov84_02240FA8 * param3, u32 param4, const u8 * param5, u32 param6) +static void ov92_021D1CF4(UnkStruct_ov92_021D1B24 *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2, const UnkStruct_ov84_02240FA8 *param3, u32 param4, const u8 *param5, u32 param6) { UnkStruct_ov84_02240FA8 v0; - MessageLoader * v1; + MessageLoader *v1; int v2; sub_0201A8D4(param0->unk_B810, param1, param2); @@ -1091,11 +1073,11 @@ static void ov92_021D1CF4 (UnkStruct_ov92_021D1B24 * param0, Window * param1, co param0->unk_B854 = sub_0200112C(&v0, 0, 0, param0->unk_00); - Window_Show(v0.unk_0C, 1, ((512 - ((18 + 12))) - 9), 7); + Window_Show(v0.unk_0C, 1, ((512 - (18 + 12)) - 9), 7); sub_0201A954(param1); } -static void ov92_021D1DB4 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D1DB4(UnkStruct_ov92_021D1B24 *param0) { Window_Clear(¶m0->unk_B824, 0); BGL_DeleteWindow(¶m0->unk_B824); @@ -1103,14 +1085,14 @@ static void ov92_021D1DB4 (UnkStruct_ov92_021D1B24 * param0) sub_02013A3C(param0->unk_B858); } -static void ov92_021D1DEC (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D1DEC(UnkStruct_ov92_021D1B24 *param0) { - Strbuf* v0 = Strbuf_Init(0x400, param0->unk_00); - Strbuf* v1 = Strbuf_Init(0x400, param0->unk_00); + Strbuf *v0 = Strbuf_Init(0x400, param0->unk_00); + Strbuf *v1 = Strbuf_Init(0x400, param0->unk_00); sub_0201A8D4(param0->unk_B810, ¶m0->unk_B844, &Unk_ov92_021D291C); BGL_WindowColor(¶m0->unk_B844, 15, 0, 0, 27 * 8, 6 * 8); - Window_Show(¶m0->unk_B844, 0, ((512 - ((18 + 12))) - 9), 7); + Window_Show(¶m0->unk_B844, 0, ((512 - (18 + 12)) - 9), 7); StringTemplate_SetCountryName(param0->unk_B870, 0, param0->unk_BB14); StringTemplate_SetCityName(param0->unk_B870, 1, param0->unk_BB14, param0->unk_BB18); @@ -1126,14 +1108,14 @@ static void ov92_021D1DEC (UnkStruct_ov92_021D1B24 * param0) sub_0201A954(¶m0->unk_B844); } -static void ov92_021D1EBC (UnkStruct_ov92_021D1B24 * param0, int param1, int param2) +static void ov92_021D1EBC(UnkStruct_ov92_021D1B24 *param0, int param1, int param2) { - Strbuf* v0 = Strbuf_Init(64, param0->unk_00); - Strbuf* v1 = Strbuf_Init(64, param0->unk_00); + Strbuf *v0 = Strbuf_Init(64, param0->unk_00); + Strbuf *v1 = Strbuf_Init(64, param0->unk_00); sub_0201A8D4(param0->unk_B810, ¶m0->unk_B844, &Unk_ov92_021D291C); BGL_WindowColor(¶m0->unk_B844, 15, 0, 0, 27 * 8, 6 * 8); - Window_Show(¶m0->unk_B844, 0, ((512 - ((18 + 12))) - 9), 7); + Window_Show(¶m0->unk_B844, 0, ((512 - (18 + 12)) - 9), 7); ov92_021D27E8(param1, param2, v0, v1, param0->unk_00); @@ -1147,17 +1129,17 @@ static void ov92_021D1EBC (UnkStruct_ov92_021D1B24 * param0, int param1, int par sub_0201A954(¶m0->unk_B844); } -static void ov92_021D1F74 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D1F74(UnkStruct_ov92_021D1B24 *param0) { Window_Clear(¶m0->unk_B844, 0); BGL_DeleteWindow(¶m0->unk_B844); } -static void ov92_021D1F90 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D1F90(UnkStruct_ov92_021D1B24 *param0) { if (param0->unk_BB28 == 0) { { - Strbuf* v0 = Strbuf_Init(0x400, param0->unk_00); + Strbuf *v0 = Strbuf_Init(0x400, param0->unk_00); BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); MessageLoader_GetStrbuf(param0->unk_B860, 14, v0); @@ -1199,8 +1181,8 @@ static void ov92_021D1F90 (UnkStruct_ov92_021D1B24 * param0) } if (v8 != param0->unk_0C.unk_00) { - Strbuf* v12 = Strbuf_Init(64, param0->unk_00); - Strbuf* v13 = Strbuf_Init(64, param0->unk_00); + Strbuf *v12 = Strbuf_Init(64, param0->unk_00); + Strbuf *v13 = Strbuf_Init(64, param0->unk_00); BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); ov92_021D27E8(param0->unk_0C.unk_04[v8].unk_2A, param0->unk_0C.unk_04[v8].unk_2C, v12, v13, param0->unk_00); @@ -1226,7 +1208,7 @@ static void ov92_021D1F90 (UnkStruct_ov92_021D1B24 * param0) } } -static void ov92_021D2150 (UnkStruct_ov92_021D1B24 * param0, NARC * param1) +static void ov92_021D2150(UnkStruct_ov92_021D1B24 *param0, NARC *param1) { param0->unk_B8CC = NARC_AllocAndReadWholeMember(param1, 0, param0->unk_00); sub_0201CA3C(¶m0->unk_B874, ¶m0->unk_B8C8, ¶m0->unk_B8CC); @@ -1244,7 +1226,7 @@ static void ov92_021D2150 (UnkStruct_ov92_021D1B24 * param0, NARC * param1) sub_0201CA3C(¶m0->unk_B8D0[2], ¶m0->unk_BA74[2], ¶m0->unk_BA88[2]); } -static void ov92_021D2210 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D2210(UnkStruct_ov92_021D1B24 *param0) { Heap_FreeToHeap(param0->unk_BA88[2]); Heap_FreeToHeap(param0->unk_BA88[1]); @@ -1253,7 +1235,7 @@ static void ov92_021D2210 (UnkStruct_ov92_021D1B24 * param0) Heap_FreeToHeap(param0->unk_B8CC); } -static void ov92_021D2254 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D2254(UnkStruct_ov92_021D1B24 *param0) { { param0->unk_BA9C.x = 0; @@ -1277,10 +1259,10 @@ static void ov92_021D2254 (UnkStruct_ov92_021D1B24 * param0) } } -static void ov92_021D22B0 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D22B0(UnkStruct_ov92_021D1B24 *param0) { - VecFx32 v0 = {0, 0, 0}; - VecFx32 v1 = {0, 0, 0x128000}; + VecFx32 v0 = { 0, 0, 0 }; + VecFx32 v1 = { 0, 0, 0x128000 }; Camera_InitWithTargetAndPosition(&v0, &v1, 0x5c1, 0, 0, param0->camera); Camera_SetClipping(0, (FX32_ONE * 100), param0->camera); @@ -1300,7 +1282,7 @@ static void ov92_021D22B0 (UnkStruct_ov92_021D1B24 * param0) } } -static void ov92_021D2334 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D2334(UnkStruct_ov92_021D1B24 *param0) { param0->unk_BADC.x = 0; param0->unk_BADC.y = 0; @@ -1309,7 +1291,7 @@ static void ov92_021D2334 (UnkStruct_ov92_021D1B24 * param0) NNS_G3dGlbLightVector(0, param0->unk_BADC.x, param0->unk_BADC.y, param0->unk_BADC.z); } -static void ov92_021D2370 (MtxFx33 * param0, VecFx32 * param1) +static void ov92_021D2370(MtxFx33 *param0, VecFx32 *param1) { MtxFx33 v0; @@ -1320,18 +1302,18 @@ static void ov92_021D2370 (MtxFx33 * param0, VecFx32 * param1) MTX_Concat33(param0, &v0, param0); } -static void ov92_021D23E8 (MtxFx33 * param0, VecFx32 * param1) +static void ov92_021D23E8(MtxFx33 *param0, VecFx32 *param1) { MtxFx33 v0; MTX_RotY33(param0, FX_SinIdx((u16)param1->x), FX_CosIdx((u16)param1->x)); - MTX_RotX33(&v0, FX_SinIdx((u16) - param1->y), FX_CosIdx((u16) - param1->y)); + MTX_RotX33(&v0, FX_SinIdx((u16)-param1->y), FX_CosIdx((u16)-param1->y)); MTX_Concat33(param0, &v0, param0); MTX_RotZ33(&v0, FX_CosIdx((u16)param1->z), FX_SinIdx((u16)param1->z)); MTX_Concat33(param0, &v0, param0); } -static BOOL ov92_021D2460 (UnkStruct_ov92_021D1B24 * param0, int param1, int param2) +static BOOL ov92_021D2460(UnkStruct_ov92_021D1B24 *param0, int param1, int param2) { u16 v0; u16 v1; @@ -1432,7 +1414,7 @@ static BOOL ov92_021D2460 (UnkStruct_ov92_021D1B24 * param0, int param1, int par return v4; } -static BOOL ov92_021D2644 (UnkStruct_ov92_021D1B24 * param0) +static BOOL ov92_021D2644(UnkStruct_ov92_021D1B24 *param0) { fx32 v0 = Camera_GetDistance(param0->camera); BOOL v1 = 0; @@ -1465,9 +1447,9 @@ static BOOL ov92_021D2644 (UnkStruct_ov92_021D1B24 * param0) return v1; } -static void ov92_021D26D0 (UnkStruct_ov92_021D1B24 * param0) +static void ov92_021D26D0(UnkStruct_ov92_021D1B24 *param0) { - MtxFx33 v0 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + MtxFx33 v0 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; switch (param0->unk_BAE8) { case 0: @@ -1486,12 +1468,12 @@ static void ov92_021D26D0 (UnkStruct_ov92_021D1B24 * param0) sub_0201CA74(¶m0->unk_B874, ¶m0->unk_BA9C, &v0, ¶m0->unk_BAA8); { - MtxFx33 v1 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + MtxFx33 v1 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; sub_0201CA74(¶m0->unk_B8D0[4], ¶m0->unk_BA9C, &v1, ¶m0->unk_BAC0); } { - MtxFx33 v2 = {FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE}; + MtxFx33 v2 = { FX32_ONE, 0, 0, 0, FX32_ONE, 0, 0, 0, FX32_ONE }; int v3; for (v3 = 0; v3 < param0->unk_0C.unk_00; v3++) { @@ -1509,9 +1491,9 @@ static void ov92_021D26D0 (UnkStruct_ov92_021D1B24 * param0) } } -BOOL ov92_021D27E8 (int param0, int param1, Strbuf *param2, Strbuf *param3, int param4) +BOOL ov92_021D27E8(int param0, int param1, Strbuf *param2, Strbuf *param3, int param4) { - MessageLoader * v0; + MessageLoader *v0; int v1 = ov92_021D16F8(param0); BOOL v2; @@ -1536,7 +1518,7 @@ BOOL ov92_021D27E8 (int param0, int param1, Strbuf *param2, Strbuf *param3, int return v2; } -BOOL ov92_021D2854 (int param0) +BOOL ov92_021D2854(int param0) { if (ov92_021D16F8(param0)) { return 1; @@ -1545,7 +1527,7 @@ BOOL ov92_021D2854 (int param0) } } -static void ov92_021D2868 (UnkStruct_ov92_021D28C0 * param0) +static void ov92_021D2868(UnkStruct_ov92_021D28C0 *param0) { if (param0->unk_00 >= 0) { param0->unk_00 = param0->unk_00 % 0xffff; @@ -1560,7 +1542,7 @@ static void ov92_021D2868 (UnkStruct_ov92_021D28C0 * param0) } } -static u32 ov92_021D28C0 (const UnkStruct_ov92_021D28C0 * param0, const UnkStruct_ov92_021D28C0 * param1) +static u32 ov92_021D28C0(const UnkStruct_ov92_021D28C0 *param0, const UnkStruct_ov92_021D28C0 *param1) { s32 v0, v1; u32 v2; diff --git a/src/overlay093/ov93_021D0D80.c b/src/overlay093/ov93_021D0D80.c index 35177bbfab..435f0a6935 100644 --- a/src/overlay093/ov93_021D0D80.c +++ b/src/overlay093/ov93_021D0D80.c @@ -1,33 +1,34 @@ +#include "overlay093/ov93_021D0D80.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" - #include "struct_defs/struct_0206C8D4.h" #include "struct_defs/struct_02099F80.h" + #include "overlay009/struct_ov9_02249FF4.h" -#include "unk_02005474.h" -#include "overlay_manager.h" +#include "camera.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" +#include "overlay_manager.h" +#include "unk_02005474.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_0201C970.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_0202419C.h" #include "unk_0208C098.h" -#include "overlay093/ov93_021D0D80.h" typedef struct { - Camera * camera; + Camera *camera; NNSG3dRenderObj unk_04; - NNSG3dResMdl * unk_58; - NNSG3dResFileHeader * unk_5C; - void * unk_60[4]; + NNSG3dResMdl *unk_58; + NNSG3dResFileHeader *unk_5C; + void *unk_60[4]; NNSFndAllocator unk_70; - NNSG3dAnmObj * unk_80[4]; + NNSG3dAnmObj *unk_80[4]; VecFx32 unk_90; u8 unk_9C; u8 unk_9D; @@ -40,11 +41,11 @@ typedef struct { static void ov93_021D0FA8(void); static void ov93_021D100C(void); -static void ov93_021D102C(UnkStruct_ov93_021D102C * param0); +static void ov93_021D102C(UnkStruct_ov93_021D102C *param0); static const UnkStruct_ov9_02249FF4 Unk_ov93_021D14B8 = { 0x29AEC1, - {-0x29fe, 0x0, 0x0}, + { -0x29fe, 0x0, 0x0 }, 0x0, 0x5C1, 0x0 @@ -64,27 +65,27 @@ static const GXRgb Unk_ov93_021D14A8[8] = { static UnkStruct_ov93_021D15A0 Unk_ov93_021D15A0[4] = { { 0x2, - {0x0, 0x1, 0x3, 0x4} + { 0x0, 0x1, 0x3, 0x4 }, }, { 0x7, - {0x5, 0x6, 0x8, 0x9} + { 0x5, 0x6, 0x8, 0x9 }, }, { 0xC, - {0xA, 0xB, 0xD, 0xE} + { 0xA, 0xB, 0xD, 0xE }, }, { 0x11, - {0xF, 0x10, 0x12, 0x13} - } + { 0xF, 0x10, 0x12, 0x13 }, + }, }; -int ov93_021D0D80 (OverlayManager * param0, int * param1) +int ov93_021D0D80(OverlayManager *param0, int *param1) { u8 v0; - UnkStruct_ov93_021D102C * v1; - UnkStruct_0206C8D4 * v2; + UnkStruct_ov93_021D102C *v1; + UnkStruct_0206C8D4 *v2; Heap_Create(3, 72, 0x20000); @@ -100,7 +101,7 @@ int ov93_021D0D80 (OverlayManager * param0, int * param1) ov93_021D102C(v1); { - VecFx32 v3 = {0, 0, 0}; + VecFx32 v3 = { 0, 0, 0 }; Camera_InitWithTarget(&v3, Unk_ov93_021D14B8.unk_00, &Unk_ov93_021D14B8.cameraAngle, Unk_ov93_021D14B8.unk_0E, Unk_ov93_021D14B8.unk_0C, 0, v1->camera); Camera_SetAsActive(v1->camera); @@ -119,7 +120,7 @@ int ov93_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov93_021D0E70 (OverlayManager * param0, int * param1) +int ov93_021D0E70(OverlayManager *param0, int *param1) { u8 v0; BOOL v1; @@ -144,7 +145,7 @@ int ov93_021D0E70 (OverlayManager * param0, int * param1) 0, 0 }; - UnkStruct_ov93_021D102C * v5 = OverlayManager_Data(param0); + UnkStruct_ov93_021D102C *v5 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -179,10 +180,10 @@ int ov93_021D0E70 (OverlayManager * param0, int * param1) return 0; } -int ov93_021D0F58 (OverlayManager * param0, int * param1) +int ov93_021D0F58(OverlayManager *param0, int *param1) { u8 v0; - UnkStruct_ov93_021D102C * v1 = OverlayManager_Data(param0); + UnkStruct_ov93_021D102C *v1 = OverlayManager_Data(param0); for (v0 = 0; v0 < 4; v0++) { NNS_G3dFreeAnmObj(&v1->unk_70, v1->unk_80[v0]); @@ -198,7 +199,7 @@ int ov93_021D0F58 (OverlayManager * param0, int * param1) return 1; } -static void ov93_021D0FA8 (void) +static void ov93_021D0FA8(void) { SetMainCallback(NULL, NULL); DisableHBlank(); @@ -217,7 +218,7 @@ static void ov93_021D0FA8 (void) GXLayers_SwapDisplay(); } -static void ov93_021D100C (void) +static void ov93_021D100C(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_C, @@ -235,12 +236,12 @@ static void ov93_021D100C (void) GXLayers_SetBanks(&v0); } -static void ov93_021D102C (UnkStruct_ov93_021D102C * param0) +static void ov93_021D102C(UnkStruct_ov93_021D102C *param0) { u8 v0; - NNSG3dResTex * v1; - void * v2; - NARC * v3; + NNSG3dResTex *v1; + void *v2; + NARC *v3; v3 = NARC_ctor(NARC_INDEX_ARC__SHIP_DEMO, 72); Heap_FndInitAllocatorForExpHeap(¶m0->unk_70, 72, 4); diff --git a/src/overlay093/ov93_021D111C.c b/src/overlay093/ov93_021D111C.c index e82663d6ac..4cb4d8ff73 100644 --- a/src/overlay093/ov93_021D111C.c +++ b/src/overlay093/ov93_021D111C.c @@ -1,33 +1,34 @@ +#include "overlay093/ov93_021D111C.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" - #include "struct_defs/struct_0206C8D4.h" #include "struct_defs/struct_02099F80.h" + #include "overlay009/struct_ov9_02249FF4.h" -#include "unk_02005474.h" -#include "overlay_manager.h" +#include "camera.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" +#include "overlay_manager.h" +#include "unk_02005474.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_0201C970.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_0202419C.h" #include "unk_0208C098.h" -#include "overlay093/ov93_021D111C.h" typedef struct { - Camera * camera; + Camera *camera; NNSG3dRenderObj unk_04; - NNSG3dResMdl * unk_58; - NNSG3dResFileHeader * unk_5C; - void * unk_60[3]; + NNSG3dResMdl *unk_58; + NNSG3dResFileHeader *unk_5C; + void *unk_60[3]; NNSFndAllocator unk_6C; - NNSG3dAnmObj * unk_7C[3]; + NNSG3dAnmObj *unk_7C[3]; VecFx32 unk_88; u8 unk_94; u8 unk_95; @@ -40,11 +41,11 @@ typedef struct { static void ov93_021D133C(void); static void ov93_021D13A0(void); -static void ov93_021D13C0(UnkStruct_ov93_021D13C0 * param0); +static void ov93_021D13C0(UnkStruct_ov93_021D13C0 *param0); static const UnkStruct_ov9_02249FF4 Unk_ov93_021D1534 = { 0x29AEC1, - {-0x29fe, 0x0, 0x0}, + { -0x29fe, 0x0, 0x0 }, 0x0, 0x5C1, 0x0 @@ -64,27 +65,27 @@ static const GXRgb Unk_ov93_021D1524[8] = { static UnkStruct_ov93_021D15C8 Unk_ov93_021D15C8[4] = { { 0x1, - {0x3, 0x2, 0x0} + { 0x3, 0x2, 0x0 }, }, { 0x5, - {0x7, 0x6, 0x4} + { 0x7, 0x6, 0x4 }, }, { 0x1, - {0x3, 0x2, 0x0} + { 0x3, 0x2, 0x0 }, }, { 0x1, - {0x3, 0x2, 0x0} - } + { 0x3, 0x2, 0x0 }, + }, }; -int ov93_021D111C (OverlayManager * param0, int * param1) +int ov93_021D111C(OverlayManager *param0, int *param1) { u8 v0; - UnkStruct_ov93_021D13C0 * v1; - UnkStruct_0206C8D4 * v2; + UnkStruct_ov93_021D13C0 *v1; + UnkStruct_0206C8D4 *v2; Heap_Create(3, 72, 0x20000); @@ -101,7 +102,7 @@ int ov93_021D111C (OverlayManager * param0, int * param1) ov93_021D13C0(v1); { - VecFx32 v3 = {0, 0, 0}; + VecFx32 v3 = { 0, 0, 0 }; Camera_InitWithTarget(&v3, Unk_ov93_021D1534.unk_00, &Unk_ov93_021D1534.cameraAngle, Unk_ov93_021D1534.unk_0E, Unk_ov93_021D1534.unk_0C, 0, v1->camera); Camera_SetAsActive(v1->camera); @@ -120,7 +121,7 @@ int ov93_021D111C (OverlayManager * param0, int * param1) return 1; } -int ov93_021D120C (OverlayManager * param0, int * param1) +int ov93_021D120C(OverlayManager *param0, int *param1) { u8 v0; BOOL v1; @@ -145,7 +146,7 @@ int ov93_021D120C (OverlayManager * param0, int * param1) 0, 0 }; - UnkStruct_ov93_021D13C0 * v5 = OverlayManager_Data(param0); + UnkStruct_ov93_021D13C0 *v5 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -179,10 +180,10 @@ int ov93_021D120C (OverlayManager * param0, int * param1) return 0; } -int ov93_021D12F0 (OverlayManager * param0, int * param1) +int ov93_021D12F0(OverlayManager *param0, int *param1) { u8 v0; - UnkStruct_ov93_021D13C0 * v1 = OverlayManager_Data(param0); + UnkStruct_ov93_021D13C0 *v1 = OverlayManager_Data(param0); for (v0 = 0; v0 < 3; v0++) { NNS_G3dFreeAnmObj(&v1->unk_6C, v1->unk_7C[v0]); @@ -198,7 +199,7 @@ int ov93_021D12F0 (OverlayManager * param0, int * param1) return 1; } -static void ov93_021D133C (void) +static void ov93_021D133C(void) { SetMainCallback(NULL, NULL); DisableHBlank(); @@ -217,7 +218,7 @@ static void ov93_021D133C (void) GXLayers_SwapDisplay(); } -static void ov93_021D13A0 (void) +static void ov93_021D13A0(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_C, @@ -235,12 +236,12 @@ static void ov93_021D13A0 (void) GXLayers_SetBanks(&v0); } -static void ov93_021D13C0 (UnkStruct_ov93_021D13C0 * param0) +static void ov93_021D13C0(UnkStruct_ov93_021D13C0 *param0) { u8 v0; - NNSG3dResTex * v1; - void * v2; - NARC * v3; + NNSG3dResTex *v1; + void *v2; + NARC *v3; v3 = NARC_ctor(NARC_INDEX_ARC__SHIP_DEMO_PL, 72); Heap_FndInitAllocatorForExpHeap(¶m0->unk_6C, 72, 4); diff --git a/src/overlay094/ov94_0223B140.c b/src/overlay094/ov94_0223B140.c index ff09690b20..de7d7a730a 100644 --- a/src/overlay094/ov94_0223B140.c +++ b/src/overlay094/ov94_0223B140.c @@ -1,17 +1,17 @@ -#include "enums.h" +#include "overlay094/ov94_0223B140.h" +#include #include #include -#include +#include "overlay060/ov60_0221F968.h" #include "overlay094/struct_ov94_0223BA24.h" #include "overlay094/struct_ov94_0223BA88.h" #include "overlay094/struct_ov94_0223BA88_sub3.h" #include "overlay096/struct_ov96_0223B574.h" #include "overlay096/struct_ov96_0223B574_1.h" -#include "overlay060/ov60_0221F968.h" -#include "overlay094/ov94_0223B140.h" +#include "enums.h" typedef enum { UnkEnum_ov94_0223B15C_00, @@ -48,15 +48,15 @@ typedef struct { u64 unk_0C; u8 unk_14[296]; u8 unk_13C[4]; - u8 * unk_140; + u8 *unk_140; } UnkStruct_ov94_02246AC0; -static BOOL ov94_0223BBE0(const u8 * param0, const void * param1, int param2, void * param3, int param4); +static BOOL ov94_0223BBE0(const u8 *param0, const void *param1, int param2, void *param3, int param4); static int ov94_0223BC18(int param0); static UnkStruct_ov94_02246AC0 Unk_ov94_02246AC0; -void ov94_0223B140 (s32 param0, u64 param1) +void ov94_0223B140(s32 param0, u64 param1) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_01; Unk_ov94_02246AC0.unk_04 = 0; @@ -64,7 +64,7 @@ void ov94_0223B140 (s32 param0, u64 param1) Unk_ov94_02246AC0.unk_0C = param1; } -void ov94_0223B15C (void) +void ov94_0223B15C(void) { switch (Unk_ov94_02246AC0.unk_00) { case UnkEnum_ov94_0223B15C_00: @@ -509,12 +509,12 @@ void ov94_0223B15C (void) } } -void ov94_0223B7AC (void) +void ov94_0223B7AC(void) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_00; } -BOOL ov94_0223B7B8 (void) +BOOL ov94_0223B7B8(void) { switch (Unk_ov94_02246AC0.unk_00) { case UnkEnum_ov94_0223B15C_01: @@ -531,18 +531,23 @@ BOOL ov94_0223B7B8 (void) return 0; } -s32 ov94_0223B7D8 (void) +s32 ov94_0223B7D8(void) { return Unk_ov94_02246AC0.unk_04; } -void ov94_0223B7E4 (const UnkStruct_ov94_0223BA88 * param0) +void ov94_0223B7E4(const UnkStruct_ov94_0223BA88 *param0) { memcpy(&Unk_ov94_02246AC0.unk_14[0], param0, sizeof(UnkStruct_ov94_0223BA88)); ov60_0221FC84(); - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/post.asp"), Unk_ov94_02246AC0.unk_14, sizeof(UnkStruct_ov94_0223BA88), Unk_ov94_02246AC0.unk_13C, 2)) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/post.asp"), + Unk_ov94_02246AC0.unk_14, + sizeof(UnkStruct_ov94_0223BA88), + Unk_ov94_02246AC0.unk_13C, + 2)) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_02; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -551,13 +556,18 @@ void ov94_0223B7E4 (const UnkStruct_ov94_0223BA88 * param0) } } -void ov94_0223B834 (void) +void ov94_0223B834(void) { memcpy(&Unk_ov94_02246AC0.unk_14[0], &Unk_ov94_02246AC0.unk_0C, 8); ov60_0221FC84(); - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/post_finish.asp"), Unk_ov94_02246AC0.unk_14, 8, Unk_ov94_02246AC0.unk_13C, 2)) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/post_finish.asp"), + Unk_ov94_02246AC0.unk_14, + 8, + Unk_ov94_02246AC0.unk_13C, + 2)) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_04; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -566,13 +576,18 @@ void ov94_0223B834 (void) } } -void ov94_0223B888 (UnkStruct_ov94_0223BA88 * param0) +void ov94_0223B888(UnkStruct_ov94_0223BA88 *param0) { Unk_ov94_02246AC0.unk_140 = (u8 *)param0; ov60_0221FC84(); - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/get.asp"), Unk_ov94_02246AC0.unk_14, 0, param0, sizeof(UnkStruct_ov94_0223BA88))) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/get.asp"), + Unk_ov94_02246AC0.unk_14, + 0, + param0, + sizeof(UnkStruct_ov94_0223BA88))) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_06; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -581,13 +596,18 @@ void ov94_0223B888 (UnkStruct_ov94_0223BA88 * param0) } } -void ov94_0223B8D8 (UnkStruct_ov94_0223BA88 * param0) +void ov94_0223B8D8(UnkStruct_ov94_0223BA88 *param0) { Unk_ov94_02246AC0.unk_140 = (u8 *)param0; ov60_0221FC84(); - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/result.asp"), Unk_ov94_02246AC0.unk_14, 0, param0, sizeof(UnkStruct_ov94_0223BA88))) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/result.asp"), + Unk_ov94_02246AC0.unk_14, + 0, + param0, + sizeof(UnkStruct_ov94_0223BA88))) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_08; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -596,11 +616,16 @@ void ov94_0223B8D8 (UnkStruct_ov94_0223BA88 * param0) } } -void ov94_0223B928 (void) +void ov94_0223B928(void) { ov60_0221FC84(); - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/delete.asp"), Unk_ov94_02246AC0.unk_14, 0, Unk_ov94_02246AC0.unk_13C, 2)) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/delete.asp"), + Unk_ov94_02246AC0.unk_14, + 0, + Unk_ov94_02246AC0.unk_13C, + 2)) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_10; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -609,11 +634,16 @@ void ov94_0223B928 (void) } } -void ov94_0223B96C (void) +void ov94_0223B96C(void) { ov60_0221FC84(); - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/return.asp"), Unk_ov94_02246AC0.unk_14, 0, Unk_ov94_02246AC0.unk_13C, 2)) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/return.asp"), + Unk_ov94_02246AC0.unk_14, + 0, + Unk_ov94_02246AC0.unk_13C, + 2)) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_12; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -622,7 +652,7 @@ void ov94_0223B96C (void) } } -void ov94_0223B9B0 (const UnkStruct_ov94_0223BA88_sub3 * param0, s32 param1, UnkStruct_ov94_0223BA88 * param2) +void ov94_0223B9B0(const UnkStruct_ov94_0223BA88_sub3 *param0, s32 param1, UnkStruct_ov94_0223BA88 *param2) { Unk_ov94_02246AC0.unk_140 = (u8 *)param2; @@ -631,7 +661,12 @@ void ov94_0223B9B0 (const UnkStruct_ov94_0223BA88_sub3 * param0, s32 param1, Unk memcpy(&Unk_ov94_02246AC0.unk_14[0], param0, sizeof(UnkStruct_ov94_0223BA88_sub3)); Unk_ov94_02246AC0.unk_14[sizeof(UnkStruct_ov94_0223BA88_sub3)] = (u8)param1; - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/search.asp"), Unk_ov94_02246AC0.unk_14, sizeof(UnkStruct_ov94_0223BA88_sub3) + 1, param2, (int)sizeof(UnkStruct_ov94_0223BA88) * param1)) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/search.asp"), + Unk_ov94_02246AC0.unk_14, + sizeof(UnkStruct_ov94_0223BA88_sub3) + 1, + param2, + (int)sizeof(UnkStruct_ov94_0223BA88) * param1)) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_14; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -640,7 +675,7 @@ void ov94_0223B9B0 (const UnkStruct_ov94_0223BA88_sub3 * param0, s32 param1, Unk } } -void ov94_0223BA24 (const UnkStruct_ov94_0223BA24 * param0, UnkStruct_ov94_0223BA88 * param1) +void ov94_0223BA24(const UnkStruct_ov94_0223BA24 *param0, UnkStruct_ov94_0223BA88 *param1) { Unk_ov94_02246AC0.unk_140 = (u8 *)param1; @@ -648,7 +683,12 @@ void ov94_0223BA24 (const UnkStruct_ov94_0223BA24 * param0, UnkStruct_ov94_0223B memcpy(&Unk_ov94_02246AC0.unk_14[0], param0, sizeof(UnkStruct_ov94_0223BA24)); - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/search.asp"), Unk_ov94_02246AC0.unk_14, sizeof(UnkStruct_ov94_0223BA24), param1, (int)sizeof(UnkStruct_ov94_0223BA88) * param0->unk_06)) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/search.asp"), + Unk_ov94_02246AC0.unk_14, + sizeof(UnkStruct_ov94_0223BA24), + param1, + (int)sizeof(UnkStruct_ov94_0223BA88) * param0->unk_06)) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_14; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -657,7 +697,7 @@ void ov94_0223BA24 (const UnkStruct_ov94_0223BA24 * param0, UnkStruct_ov94_0223B } } -void ov94_0223BA88 (s32 param0, const UnkStruct_ov94_0223BA88 * param1, UnkStruct_ov94_0223BA88 * param2) +void ov94_0223BA88(s32 param0, const UnkStruct_ov94_0223BA88 *param1, UnkStruct_ov94_0223BA88 *param2) { Unk_ov94_02246AC0.unk_140 = (u8 *)param2; @@ -667,7 +707,12 @@ void ov94_0223BA88 (s32 param0, const UnkStruct_ov94_0223BA88 * param1, UnkStruc *(s32 *)(&Unk_ov94_02246AC0.unk_14[sizeof(UnkStruct_ov94_0223BA88)]) = param0; - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/exchange.asp"), Unk_ov94_02246AC0.unk_14, sizeof(UnkStruct_ov94_0223BA88) + 4, param2, sizeof(UnkStruct_ov94_0223BA88))) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/exchange.asp"), + Unk_ov94_02246AC0.unk_14, + sizeof(UnkStruct_ov94_0223BA88) + 4, + param2, + sizeof(UnkStruct_ov94_0223BA88))) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_16; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -676,13 +721,18 @@ void ov94_0223BA88 (s32 param0, const UnkStruct_ov94_0223BA88 * param1, UnkStruc } } -void ov94_0223BAEC (void) +void ov94_0223BAEC(void) { memcpy(&Unk_ov94_02246AC0.unk_14[0], &Unk_ov94_02246AC0.unk_0C, 8); ov60_0221FC84(); - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/exchange_finish.asp"), Unk_ov94_02246AC0.unk_14, 8, Unk_ov94_02246AC0.unk_13C, 2)) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/exchange_finish.asp"), + Unk_ov94_02246AC0.unk_14, + 8, + Unk_ov94_02246AC0.unk_13C, + 2)) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_18; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -691,11 +741,16 @@ void ov94_0223BAEC (void) } } -void ov94_0223BB40 (void) +void ov94_0223BB40(void) { ov60_0221FC84(); - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "worldexchange/info.asp"), Unk_ov94_02246AC0.unk_14, 0, Unk_ov94_02246AC0.unk_13C, 2)) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "worldexchange/info.asp"), + Unk_ov94_02246AC0.unk_14, + 0, + Unk_ov94_02246AC0.unk_13C, + 2)) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_20; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -704,7 +759,7 @@ void ov94_0223BB40 (void) } } -void ov94_0223BB84 (const UnkStruct_ov96_0223B574 * param0, UnkStruct_ov96_0223B574_1 * param1) +void ov94_0223BB84(const UnkStruct_ov96_0223B574 *param0, UnkStruct_ov96_0223B574_1 *param1) { OS_GetMacAddress((u8 *)param0->unk_14); @@ -713,7 +768,12 @@ void ov94_0223BB84 (const UnkStruct_ov96_0223B574 * param0, UnkStruct_ov96_0223B ov60_0221FC84(); - if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" "common/setProfile.asp"), Unk_ov94_02246AC0.unk_14, sizeof(UnkStruct_ov96_0223B574), Unk_ov94_02246AC0.unk_140, sizeof(UnkStruct_ov96_0223B574_1))) { + if (ov94_0223BBE0(((const unsigned char *)"http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "common/setProfile.asp"), + Unk_ov94_02246AC0.unk_14, + sizeof(UnkStruct_ov96_0223B574), + Unk_ov94_02246AC0.unk_140, + sizeof(UnkStruct_ov96_0223B574_1))) { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_22; } else { Unk_ov94_02246AC0.unk_00 = UnkEnum_ov94_0223B15C_24; @@ -722,7 +782,7 @@ void ov94_0223BB84 (const UnkStruct_ov96_0223B574 * param0, UnkStruct_ov96_0223B } } -static BOOL ov94_0223BBE0 (const u8 * param0, const void * param1, int param2, void * param3, int param4) +static BOOL ov94_0223BBE0(const u8 *param0, const void *param1, int param2, void *param3, int param4) { switch (ov60_0221FCA8(param0, Unk_ov94_02246AC0.unk_08, param1, param2, (u8 *)param3, param4)) { case 0: @@ -737,7 +797,7 @@ static BOOL ov94_0223BBE0 (const u8 * param0, const void * param1, int param2, v return 0; } -static int ov94_0223BC18 (int param0) +static int ov94_0223BC18(int param0) { int v0; diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index 6e5cbbebc3..f9c4dfabfb 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -1,98 +1,98 @@ +#include "overlay094/ov94_0223BCB0.h" + +#include #include #include -#include - -#include "inlines.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" - #include "struct_defs/struct_0203E0FC.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay094/ov94_0223B140.h" +#include "overlay094/ov94_0223C610.h" +#include "overlay094/ov94_0223D0C4.h" +#include "overlay094/ov94_0223DC04.h" +#include "overlay094/ov94_0223E46C.h" +#include "overlay094/ov94_0223FB48.h" +#include "overlay094/ov94_022414B8.h" +#include "overlay094/ov94_02242AD0.h" +#include "overlay094/ov94_02243EF8.h" +#include "overlay094/ov94_022443E0.h" +#include "overlay094/ov94_022444C8.h" +#include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay115/struct_ov115_02261520.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "pokemon_icon.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_020041CC.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_02033200.h" #include "unk_020797C8.h" -#include "pokemon_icon.h" #include "unk_02099550.h" -#include "overlay094/ov94_0223B140.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_0223C610.h" -#include "overlay094/ov94_0223D0C4.h" -#include "overlay094/ov94_0223DC04.h" -#include "overlay094/ov94_0223E46C.h" -#include "overlay094/ov94_0223FB48.h" -#include "overlay094/ov94_022414B8.h" -#include "overlay094/ov94_02242AD0.h" -#include "overlay094/ov94_02243EF8.h" -#include "overlay094/ov94_022443E0.h" -#include "overlay094/ov94_022444C8.h" -#include "overlay094/ov94_02244950.h" -static void ov94_0223BFE4(void * param0); +static void ov94_0223BFE4(void *param0); static void ov94_0223C01C(void); -static void ov94_0223C03C(UnkStruct_ov94_0223FD4C * param0, OverlayManager * param1); -static void ov94_0223C0A0(UnkStruct_ov94_0223FD4C * param0); +static void ov94_0223C03C(UnkStruct_ov94_0223FD4C *param0, OverlayManager *param1); +static void ov94_0223C0A0(UnkStruct_ov94_0223FD4C *param0); static void ov94_0223C0A4(void); -static void ov94_0223C0D4(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223C32C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223C490(DWCAllocType param0, void * param1, u32 param2); -static void * ov94_0223C468(DWCAllocType param0, u32 param1, int param2); -static void ov94_0223C4E0(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223C508(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223C578(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223C598(UnkStruct_ov94_0223FD4C * param0); +static void ov94_0223C0D4(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223C32C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223C490(DWCAllocType param0, void *param1, u32 param2); +static void *ov94_0223C468(DWCAllocType param0, u32 param1, int param2); +static void ov94_0223C4E0(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223C508(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223C578(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223C598(UnkStruct_ov94_0223FD4C *param0); static NNSFndHeapHandle Unk_ov94_02246C04; -static int (* Unk_ov94_0224674C[][3])(UnkStruct_ov94_0223FD4C *, int) = { - {ov94_02244950, ov94_022449FC, ov94_02244A2C}, - {ov94_0223C610, ov94_0223C6D4, ov94_0223C6F4}, - {ov94_0223D0C4, ov94_0223D19C, ov94_0223D1B0}, - {ov94_0223DC04, ov94_0223DCE4, ov94_0223DCF8}, - {ov94_0223E46C, ov94_0223E560, ov94_0223E574}, - {ov94_0223FB48, ov94_0223FBBC, ov94_0223FBDC}, - {ov94_022414B8, ov94_02241548, ov94_02241568}, - {ov94_02242AD0, ov94_02242B14, ov94_02242B34}, - {ov94_022443E0, ov94_02244490, ov94_022444BC}, - {ov94_022444C8, ov94_02244678, ov94_0224484C}, +static int (*Unk_ov94_0224674C[][3])(UnkStruct_ov94_0223FD4C *, int) = { + { ov94_02244950, ov94_022449FC, ov94_02244A2C }, + { ov94_0223C610, ov94_0223C6D4, ov94_0223C6F4 }, + { ov94_0223D0C4, ov94_0223D19C, ov94_0223D1B0 }, + { ov94_0223DC04, ov94_0223DCE4, ov94_0223DCF8 }, + { ov94_0223E46C, ov94_0223E560, ov94_0223E574 }, + { ov94_0223FB48, ov94_0223FBBC, ov94_0223FBDC }, + { ov94_022414B8, ov94_02241548, ov94_02241568 }, + { ov94_02242AD0, ov94_02242B14, ov94_02242B34 }, + { ov94_022443E0, ov94_02244490, ov94_022444BC }, + { ov94_022444C8, ov94_02244678, ov94_0224484C }, }; -UnkStruct_ov94_0223FD4C * Unk_ov94_02246C08; +UnkStruct_ov94_0223FD4C *Unk_ov94_02246C08; -int ov94_0223BCB0 (OverlayManager * param0, int * param1) +int ov94_0223BCB0(OverlayManager *param0, int *param1) { - UnkStruct_ov94_0223FD4C * v0; + UnkStruct_ov94_0223FD4C *v0; switch (*param1) { case 0: @@ -152,9 +152,9 @@ int ov94_0223BCB0 (OverlayManager * param0, int * param1) return 0; } -int ov94_0223BE2C (OverlayManager * param0, int * param1) +int ov94_0223BE2C(OverlayManager *param0, int *param1) { - UnkStruct_ov94_0223FD4C * v0 = OverlayManager_Data(param0); + UnkStruct_ov94_0223FD4C *v0 = OverlayManager_Data(param0); DWC_UpdateConnection(); ov94_0223B15C(); @@ -209,9 +209,9 @@ int ov94_0223BE2C (OverlayManager * param0, int * param1) return 0; } -int ov94_0223BF54 (OverlayManager * param0, int * param1) +int ov94_0223BF54(OverlayManager *param0, int *param1) { - UnkStruct_ov94_0223FD4C * v0 = OverlayManager_Data(param0); + UnkStruct_ov94_0223FD4C *v0 = OverlayManager_Data(param0); int v1; Heap_FreeToHeap(v0->unk_4C); @@ -239,9 +239,9 @@ int ov94_0223BF54 (OverlayManager * param0, int * param1) return 1; } -static void ov94_0223BFE4 (void * param0) +static void ov94_0223BFE4(void *param0) { - UnkStruct_ov94_0223FD4C * v0 = param0; + UnkStruct_ov94_0223FD4C *v0 = param0; if (v0->unk_1118) { v0->unk_1118(param0); @@ -256,7 +256,7 @@ static void ov94_0223BFE4 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov94_0223C01C (void) +static void ov94_0223C01C(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -274,7 +274,7 @@ static void ov94_0223C01C (void) GXLayers_SetBanks(&v0); } -static void ov94_0223C03C (UnkStruct_ov94_0223FD4C * param0, OverlayManager * param1) +static void ov94_0223C03C(UnkStruct_ov94_0223FD4C *param0, OverlayManager *param1) { param0->unk_00 = (UnkStruct_0203E0FC *)OverlayManager_Args(param1); param0->unk_14 = 0; @@ -296,12 +296,12 @@ static void ov94_0223C03C (UnkStruct_ov94_0223FD4C * param0, OverlayManager * pa param0->unk_11B0 = 0; } -static void ov94_0223C0A0 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C0A0(UnkStruct_ov94_0223FD4C *param0) { return; } -static void ov94_0223C0A4 (void) +static void ov94_0223C0A4(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -316,10 +316,10 @@ static void ov94_0223C0A4 (void) sub_0201F8E4(); } -static void ov94_0223C0D4 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C0D4(UnkStruct_ov94_0223FD4C *param0) { int v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); @@ -349,10 +349,10 @@ static void ov94_0223C0D4 (UnkStruct_ov94_0223FD4C * param0) sub_0200A5C8(param0->unk_D84[1][1]); { - void * v2; - NNSG2dPaletteData * v3; + void *v2; + NNSG2dPaletteData *v3; int v4, v5, v6, v7; - u16 * v8; + u16 *v8; v2 = sub_02006F88(19, PokeIconPalettesFileIndex(), &v3, 62); @@ -365,7 +365,9 @@ static void ov94_0223C0D4 (UnkStruct_ov94_0223FD4C * param0) v5 = v8[v4] >> 10 & 0x1f; v6 = (v8[v4] >> 5) & 0x1f; v7 = v8[v4] & 0x1f; - v5 /= 2; v6 /= 2; v7 /= 2; + v5 /= 2; + v6 /= 2; + v7 /= 2; v8[v4] = (v5 << 10) | (v6 << 5) | v7; } @@ -378,7 +380,7 @@ static void ov94_0223C0D4 (UnkStruct_ov94_0223FD4C * param0) NARC_dtor(v1); } -void ov94_0223C300 (UnkStruct_ov115_02261520 * param0, UnkStruct_ov94_0223FD4C * param1, UnkStruct_ov19_021DA864 * param2, int param3) +void ov94_0223C300(UnkStruct_ov115_02261520 *param0, UnkStruct_ov94_0223FD4C *param1, UnkStruct_ov19_021DA864 *param2, int param3) { param0->unk_00 = param1->unk_BE4; param0->unk_04 = param2; @@ -392,7 +394,7 @@ void ov94_0223C300 (UnkStruct_ov115_02261520 * param0, UnkStruct_ov94_0223FD4C * param0->unk_2C = 62; } -static void ov94_0223C32C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C32C(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -412,7 +414,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov94_022459F8 = { 0x0 }; -UIControlData * ov94_0223C3C0 (BGL * param0, int param1, int param2) +UIControlData *ov94_0223C3C0(BGL *param0, int param1, int param2) { UnkStruct_ov61_0222C884 v0; @@ -423,13 +425,13 @@ UIControlData * ov94_0223C3C0 (BGL * param0, int param1, int param2) return sub_02002100(param0, &v0, (1 + (18 + 12)), 11, 62); } -void ov94_0223C3F4 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2) +void ov94_0223C3F4(UnkStruct_ov94_0223FD4C *param0, int param1, int param2) { param0->unk_2C = param1; param0->unk_30 = param2; } -void ov94_0223C3FC (GraphicElementData * param0, int param1, int param2) +void ov94_0223C3FC(GraphicElementData *param0, int param1, int param2) { VecFx32 v0; @@ -440,10 +442,10 @@ void ov94_0223C3FC (GraphicElementData * param0, int param1, int param2) sub_02021C50(param0, &v0); } -static void * ov94_0223C468 (DWCAllocType param0, u32 param1, int param2) +static void *ov94_0223C468(DWCAllocType param0, u32 param1, int param2) { -#pragma unused( param0 ) - void * v0; +#pragma unused(param0) + void *v0; OSIntrMode v1; v1 = OS_DisableInterrupts(); @@ -458,9 +460,9 @@ static void * ov94_0223C468 (DWCAllocType param0, u32 param1, int param2) return v0; } -static void ov94_0223C490 (DWCAllocType param0, void * param1, u32 param2) +static void ov94_0223C490(DWCAllocType param0, void *param1, u32 param2) { -#pragma unused( param0, param2 ) +#pragma unused(param0, param2) OSIntrMode v0; if (!param1) { @@ -473,29 +475,29 @@ static void ov94_0223C490 (DWCAllocType param0, void * param1, u32 param2) OS_RestoreInterrupts(v0); } -int ov94_0223C4B4 (void) +int ov94_0223C4B4(void) { return WM_LINK_LEVEL_3 - DWC_GetLinkLevel(); } -void ov94_0223C4C0 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2) +void ov94_0223C4C0(UnkStruct_ov94_0223FD4C *param0, int param1, int param2) { param0->unk_18 = param1; param0->unk_24 = param2; } -void ov94_0223C4C8 (UnkStruct_ov94_0223FD4C * param0) +void ov94_0223C4C8(UnkStruct_ov94_0223FD4C *param0) { param0->unk_20 = param0->unk_14; param0->unk_14 = param0->unk_18; } -int ov94_0223C4D4 (UnkStruct_ov94_0223FD4C * param0) +int ov94_0223C4D4(UnkStruct_ov94_0223FD4C *param0) { return Options_TextFrameDelay(param0->unk_00->unk_24); } -static void ov94_0223C4E0 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C4E0(UnkStruct_ov94_0223FD4C *param0) { ov94_0223C01C(); ov94_0223C0A4(); @@ -505,7 +507,7 @@ static void ov94_0223C4E0 (UnkStruct_ov94_0223FD4C * param0) SetMainCallback(ov94_0223BFE4, param0); } -static void ov94_0223C508 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C508(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -528,20 +530,20 @@ static void ov94_0223C508 (UnkStruct_ov94_0223FD4C * param0) sub_0201F8B4(); } -static void ov94_0223C578 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C578(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_3A) { param0->unk_3A--; } } -void ov94_0223C584 (UnkStruct_ov94_0223FD4C * param0) +void ov94_0223C584(UnkStruct_ov94_0223FD4C *param0) { param0->unk_110E = 1; param0->unk_110C = 0; } -static void ov94_0223C598 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C598(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_110E) { param0->unk_110C += sub_02079B54(param0->unk_00->unk_0C, param0->unk_110E - 1); @@ -553,12 +555,12 @@ static void ov94_0223C598 (UnkStruct_ov94_0223FD4C * param0) } } -void ov94_0223C5D8 (UnkStruct_ov94_0223FD4C * param0) +void ov94_0223C5D8(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10DC = sub_0200E7FC(¶m0->unk_F5C, 1); } -void ov94_0223C5F4 (UnkStruct_ov94_0223FD4C * param0) +void ov94_0223C5F4(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_10DC != NULL) { DeleteWaitDial(param0->unk_10DC); diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index c8601c83ad..07d984af3d 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -1,71 +1,69 @@ +#include "overlay094/ov94_0223C610.h" + +#include #include #include -#include - -#include "core_sys.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay094/ov94_0223BCB0.h" +#include "overlay094/ov94_02243EF8.h" +#include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "message.h" +#include "narc.h" +#include "strbuf.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_020393C8.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_0223C610.h" -#include "overlay094/ov94_02243EF8.h" -#include "overlay094/ov94_02244950.h" -static void ov94_0223C720(BGL * param0); -static void ov94_0223C830(BGL * param0); -static void ov94_0223C888(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223C950(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223C9B0(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223C9C0(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223CAC8(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223CB0C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223CB34(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CB50(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CB90(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CBA0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CBC4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CBD8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CBEC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CC28(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CE14(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CE5C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CE7C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CEE8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CF08(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CDD8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223CE00(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223CF3C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223CF80(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4); -static void ov94_0223CFD8(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4); -static void ov94_0223C85C(UnkStruct_ov94_0223FD4C * param0); - -static int (* Unk_ov94_022467C4[])(UnkStruct_ov94_0223FD4C *) = { +static void ov94_0223C720(BGL *param0); +static void ov94_0223C830(BGL *param0); +static void ov94_0223C888(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223C950(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223C9B0(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223C9C0(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223CAC8(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223CB0C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223CB34(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CB50(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CB90(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CBA0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CBC4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CBD8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CBEC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CC28(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CE14(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CE5C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CE7C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CEE8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CF08(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CDD8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223CE00(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223CF3C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223CF80(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4); +static void ov94_0223CFD8(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4); +static void ov94_0223C85C(UnkStruct_ov94_0223FD4C *param0); + +static int (*Unk_ov94_022467C4[])(UnkStruct_ov94_0223FD4C *) = { ov94_0223CB50, ov94_0223CB90, ov94_0223CBA0, @@ -82,7 +80,7 @@ static int (* Unk_ov94_022467C4[])(UnkStruct_ov94_0223FD4C *) = { ov94_0223CE7C }; -int ov94_0223C610 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223C610(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_0223CB0C(param0); ov94_0223C720(param0->unk_04); @@ -116,7 +114,7 @@ int ov94_0223C610 (UnkStruct_ov94_0223FD4C * param0, int param1) return 2; } -int ov94_0223C6D4 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223C6D4(UnkStruct_ov94_0223FD4C *param0, int param1) { int v0; @@ -126,7 +124,7 @@ int ov94_0223C6D4 (UnkStruct_ov94_0223FD4C * param0, int param1) return v0; } -int ov94_0223C6F4 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223C6F4(UnkStruct_ov94_0223FD4C *param0, int param1) { sub_02039794(); @@ -139,7 +137,7 @@ int ov94_0223C6F4 (UnkStruct_ov94_0223FD4C * param0, int param1) return 1; } -static void ov94_0223C720 (BGL * param0) +static void ov94_0223C720(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -261,7 +259,7 @@ static void ov94_0223C720 (BGL * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov94_0223C830 (BGL * param0) +static void ov94_0223C830(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -270,7 +268,7 @@ static void ov94_0223C830 (BGL * param0) sub_02019044(param0, 0); } -static void ov94_0223C85C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C85C(UnkStruct_ov94_0223FD4C *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); @@ -278,10 +276,10 @@ static void ov94_0223C85C (UnkStruct_ov94_0223FD4C * param0) sub_02021CAC(param0->unk_E20, 0); } -static void ov94_0223C888 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C888(UnkStruct_ov94_0223FD4C *param0) { - BGL * v0 = param0->unk_04; - NARC * v1; + BGL *v0 = param0->unk_04; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); @@ -299,12 +297,12 @@ static void ov94_0223C888 (UnkStruct_ov94_0223FD4C * param0) } static const u16 Unk_ov94_02245A48[][2] = { - {0x32, 0x38}, - {0x32, 0x60}, - {0x32, 0x88} + { 0x32, 0x38 }, + { 0x32, 0x60 }, + { 0x32, 0x88 } }; -static void ov94_0223C950 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C950(UnkStruct_ov94_0223FD4C *param0) { UnkStruct_ov115_02261520 v0; @@ -319,12 +317,12 @@ static void ov94_0223C950 (UnkStruct_ov94_0223FD4C * param0) SpriteActor_SetSpriteAnimActive(param0->unk_E20, 1); } -static void ov94_0223C9B0 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C9B0(UnkStruct_ov94_0223FD4C *param0) { sub_02021BD4(param0->unk_E20); } -static void ov94_0223C9C0 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223C9C0(UnkStruct_ov94_0223FD4C *param0) { BGL_AddWindow(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); BGL_FillWindow(¶m0->unk_F7C, 0x0); @@ -345,7 +343,7 @@ static void ov94_0223C9C0 (UnkStruct_ov94_0223FD4C * param0) BGL_FillWindow(¶m0->unk_109C, 0xf0f); } -static void ov94_0223CAC8 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223CAC8(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -359,19 +357,19 @@ static void ov94_0223CAC8 (UnkStruct_ov94_0223FD4C * param0) BGL_DeleteWindow(¶m0->unk_F7C); } -static void ov94_0223CB0C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223CB0C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_BAC = Strbuf_Init((90 * 2), 62); param0->unk_BB0 = MessageLoader_GetNewStrbuf(param0->unk_B90, 39); } -static void ov94_0223CB34 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223CB34(UnkStruct_ov94_0223FD4C *param0) { Strbuf_Free(param0->unk_BAC); Strbuf_Free(param0->unk_BB0); } -static int ov94_0223CB50 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CB50(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_10F0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); @@ -387,13 +385,13 @@ static int ov94_0223CB50 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CB90 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CB90(UnkStruct_ov94_0223FD4C *param0) { ov94_0223C3F4(param0, 10, 2); return 3; } -static int ov94_0223CBA0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CBA0(UnkStruct_ov94_0223FD4C *param0) { sub_0200F174(3, 1, 1, 0x0, 6, 1, 62); param0->unk_2C = 3; @@ -401,7 +399,7 @@ static int ov94_0223CBA0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CBC4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CBC4(UnkStruct_ov94_0223FD4C *param0) { if (ScreenWipe_Done()) { param0->unk_2C = 5; @@ -410,7 +408,7 @@ static int ov94_0223CBC4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CBD8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CBD8(UnkStruct_ov94_0223FD4C *param0) { if (ScreenWipe_Done()) { param0->unk_2C = 5; @@ -419,7 +417,7 @@ static int ov94_0223CBD8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CBEC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CBEC(UnkStruct_ov94_0223FD4C *param0) { ov94_0223CF80(param0, 4, 1, 0, 0xf0f); ov94_0223C3F4(param0, 10, 6); @@ -429,7 +427,7 @@ static int ov94_0223CBEC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CC28 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CC28(UnkStruct_ov94_0223FD4C *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_B) { ov94_0223CFD8(param0, 7, ov94_0223C4D4(param0), 0, 0xf0f); @@ -487,7 +485,7 @@ static int ov94_0223CC28 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CDD8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CDD8(UnkStruct_ov94_0223FD4C *param0) { ov94_022440B8(param0, TrainerInfo_Gender(param0->unk_00->unk_1C)); @@ -497,7 +495,7 @@ static int ov94_0223CDD8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CE00 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CE00(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_10F0) { param0->unk_2C = 9; @@ -506,7 +504,7 @@ static int ov94_0223CE00 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CE14 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CE14(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_18 == 0) { sub_0200F174(0, 0, 0, 0x0, 6, 1, 62); @@ -519,7 +517,7 @@ static int ov94_0223CE14 (UnkStruct_ov94_0223FD4C * param0) return 4; } -static int ov94_0223CE5C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CE5C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 27 * 4)); param0->unk_2C = 13; @@ -527,7 +525,7 @@ static int ov94_0223CE5C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CE7C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CE7C(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -548,7 +546,7 @@ static int ov94_0223CE7C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CEE8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CEE8(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_2C = param0->unk_30; @@ -557,7 +555,7 @@ static int ov94_0223CEE8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223CF08 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223CF08(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_10E0++; @@ -572,11 +570,11 @@ static int ov94_0223CF08 (UnkStruct_ov94_0223FD4C * param0) } static const int Unk_ov94_02245A64[][3] = { - {0x5A, 0x29, 0x2A}, - {0x28, 0x29, 0x2A} + { 0x5A, 0x29, 0x2A }, + { 0x28, 0x29, 0x2A } }; -static void ov94_0223CF3C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223CF3C(UnkStruct_ov94_0223FD4C *param0) { int v0; int v1 = param0->unk_36; @@ -587,9 +585,9 @@ static void ov94_0223CF3C (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_0223CF80 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) +static void ov94_0223CF80(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4) { - Strbuf* v0; + Strbuf *v0; MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); BGL_FillWindow(¶m0->unk_F5C, 0xf0f); @@ -598,9 +596,9 @@ static void ov94_0223CF80 (UnkStruct_ov94_0223FD4C * param0, int param1, int par param0->unk_BE0 = PrintStringSimple(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); } -static void ov94_0223CFD8 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) +static void ov94_0223CFD8(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4) { - Strbuf* v0; + Strbuf *v0; MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); BGL_FillWindow(¶m0->unk_109C, 0xf0f); @@ -609,9 +607,9 @@ static void ov94_0223CFD8 (UnkStruct_ov94_0223FD4C * param0, int param1, int par param0->unk_BE0 = PrintStringSimple(¶m0->unk_109C, 1, param0->unk_BAC, 0, 0, param2, NULL); } -void ov94_0223D030 (Window * param0, MessageLoader * param1, int param2, u16 param3) +void ov94_0223D030(Window *param0, MessageLoader *param1, int param2, u16 param3) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param1, param2); @@ -620,9 +618,9 @@ void ov94_0223D030 (Window * param0, MessageLoader * param1, int param2, u16 par Strbuf_Free(v0); } -void ov94_0223D068 (UnkStruct_ov94_0223FD4C * param0) +void ov94_0223D068(UnkStruct_ov94_0223FD4C *param0) { - BGL * v0 = param0->unk_04; + BGL *v0 = param0->unk_04; sub_02006E84(104, 5, 4, 0, 16 * 16 * 2, 62); sub_02006E3C(104, 15, v0, 5, 0, 32 * 21 * 0x40, 1, 62); diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index 7795999562..e7684cf9d8 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -1,75 +1,71 @@ +#include "overlay094/ov94_0223D0C4.h" + +#include #include #include -#include - -#include "core_sys.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "pokemon.h" - -#include "overlay094/const_ov94_02245FD8.h" - #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" + +#include "overlay094/const_ov94_02245FD8.h" +#include "overlay094/ov94_0223BCB0.h" +#include "overlay094/ov94_0223FB48.h" +#include "overlay094/ov94_022414B8.h" +#include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223BA88_sub2.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "core_sys.h" +#include "game_options.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "message_util.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "party.h" -#include "item.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_0223D0C4.h" -#include "overlay094/ov94_0223FB48.h" -#include "overlay094/ov94_022414B8.h" -#include "overlay094/ov94_02244950.h" -static void ov94_0223D1D4(BGL * param0); -static void ov94_0223D2BC(BGL * param0); -static void ov94_0223D2E8(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223D438(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223D504(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223D53C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223D57C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223D3DC(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223D428(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223DBBC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223D5B0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223D5B8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223D618(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223D838(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223D858(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223D640(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223D664(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223D6B8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223D754(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223D88C(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, Pokemon * param5); - -static int (* Unk_ov94_02246808[])(UnkStruct_ov94_0223FD4C *) = { +static void ov94_0223D1D4(BGL *param0); +static void ov94_0223D2BC(BGL *param0); +static void ov94_0223D2E8(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223D438(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223D504(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223D53C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223D57C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223D3DC(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223D428(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223DBBC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223D5B0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223D5B8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223D618(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223D838(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223D858(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223D640(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223D664(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223D6B8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223D754(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223D88C(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4, Pokemon *param5); + +static int (*Unk_ov94_02246808[])(UnkStruct_ov94_0223FD4C *) = { ov94_0223D5B0, ov94_0223D5B8, ov94_0223D618, @@ -81,9 +77,9 @@ static int (* Unk_ov94_02246808[])(UnkStruct_ov94_0223FD4C *) = { ov94_0223D754 }; -int ov94_0223D0C4 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223D0C4(UnkStruct_ov94_0223FD4C *param0, int param1) { - Pokemon * v0; + Pokemon *v0; ov94_0223D53C(param0); ov94_0223D1D4(param0->unk_04); @@ -105,7 +101,7 @@ int ov94_0223D0C4 (UnkStruct_ov94_0223FD4C * param0, int param1) return 2; } -int ov94_0223D19C (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223D19C(UnkStruct_ov94_0223FD4C *param0, int param1) { int v0; @@ -113,7 +109,7 @@ int ov94_0223D19C (UnkStruct_ov94_0223FD4C * param0, int param1) return v0; } -int ov94_0223D1B0 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223D1B0(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_0223D428(param0); ov94_0223D57C(param0); @@ -124,7 +120,7 @@ int ov94_0223D1B0 (UnkStruct_ov94_0223FD4C * param0, int param1) return 1; } -static void ov94_0223D1D4 (BGL * param0) +static void ov94_0223D1D4(BGL *param0) { { UnkStruct_ov97_0222DB78 v0 = { @@ -232,7 +228,7 @@ static void ov94_0223D1D4 (BGL * param0) sub_02019690(4, 32, 0, 62); } -static void ov94_0223D2BC (BGL * param0) +static void ov94_0223D2BC(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -241,10 +237,10 @@ static void ov94_0223D2BC (BGL * param0) sub_02019044(param0, 0); } -static void ov94_0223D2E8 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223D2E8(UnkStruct_ov94_0223FD4C *param0) { - BGL * v0 = param0->unk_04; - NARC * v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); + BGL *v0 = param0->unk_04; + NARC *v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); sub_02007130(v1, 7, 0, 0, 16 * 3 * 2, 62); sub_02007130(v1, 5, 4, 0, 16 * 8 * 2, 62); @@ -258,7 +254,7 @@ static void ov94_0223D2E8 (UnkStruct_ov94_0223FD4C * param0) NARC_dtor(v1); } -static void ov94_0223D3DC (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223D3DC(UnkStruct_ov94_0223FD4C *param0) { UnkStruct_ov115_02261520 v0; @@ -274,27 +270,27 @@ static void ov94_0223D3DC (UnkStruct_ov94_0223FD4C * param0) sub_02039734(); } -static void ov94_0223D428 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223D428(UnkStruct_ov94_0223FD4C *param0) { sub_02021BD4(param0->unk_F30); } static const int Unk_ov94_02245B94[][4] = { - {0x1, 0x2, 0xA, 0x2}, - {0xC, 0x2, 0x8, 0x2}, - {0xE, 0x4, 0x7, 0x2}, - {0x1, 0x7, 0x6, 0x2}, - {0x7, 0x7, 0xB, 0x2}, - {0x2, 0xA, 0x9, 0x2}, - {0xC, 0xA, 0x8, 0x2}, - {0x2, 0xF, 0xC, 0x2}, - {0x4, 0x11, 0xA, 0x2}, - {0x10, 0x11, 0xC, 0x2}, - {0x1, 0x5, 0x5, 0x2}, - {0x7, 0x5, 0x7, 0x2} + { 0x1, 0x2, 0xA, 0x2 }, + { 0xC, 0x2, 0x8, 0x2 }, + { 0xE, 0x4, 0x7, 0x2 }, + { 0x1, 0x7, 0x6, 0x2 }, + { 0x7, 0x7, 0xB, 0x2 }, + { 0x2, 0xA, 0x9, 0x2 }, + { 0xC, 0xA, 0x8, 0x2 }, + { 0x2, 0xF, 0xC, 0x2 }, + { 0x4, 0x11, 0xA, 0x2 }, + { 0x10, 0x11, 0xC, 0x2 }, + { 0x1, 0x5, 0x5, 0x2 }, + { 0x7, 0x5, 0x7, 0x2 } }; -static void ov94_0223D438 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223D438(UnkStruct_ov94_0223FD4C *param0) { BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, ((1 + (18 + 12)) + 9)); BGL_FillWindow(¶m0->unk_F5C, 0x0); @@ -314,7 +310,7 @@ static void ov94_0223D438 (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_0223D504 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223D504(UnkStruct_ov94_0223FD4C *param0) { BGL_DeleteWindow(¶m0->unk_F5C); BGL_DeleteWindow(¶m0->unk_F9C[0]); @@ -328,7 +324,7 @@ static void ov94_0223D504 (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_0223D53C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223D53C(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -340,7 +336,7 @@ static void ov94_0223D53C (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_0223D57C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223D57C(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -352,13 +348,13 @@ static void ov94_0223D57C (UnkStruct_ov94_0223FD4C * param0) Strbuf_Free(param0->unk_BB0); } -static int ov94_0223D5B0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223D5B0(UnkStruct_ov94_0223FD4C *param0) { param0->unk_2C = 1; return 3; } -static int ov94_0223D5B8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223D5B8(UnkStruct_ov94_0223FD4C *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_A) { ov94_0223D88C(param0, 5, 1, 0, 0xf0f, (Pokemon *)param0->unk_12C.unk_00.unk_00); @@ -373,7 +369,7 @@ static int ov94_0223D5B8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223D618 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223D618(UnkStruct_ov94_0223FD4C *param0) { sub_0200F174(3, 0, 0, 0x0, 6, 1, 62); @@ -381,7 +377,7 @@ static int ov94_0223D618 (UnkStruct_ov94_0223FD4C * param0) return 4; } -static int ov94_0223D640 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223D640(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 15, ((((1 + (18 + 12)) + 9) + 27 * 2) + (5 * 2) * 4 + 200 + 12)); param0->unk_2C = 6; @@ -389,7 +385,7 @@ static int ov94_0223D640 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223D664 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223D664(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -409,7 +405,7 @@ static int ov94_0223D664 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223D6B8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223D6B8(UnkStruct_ov94_0223FD4C *param0) { UnkStruct_02081CF4 v0; @@ -436,7 +432,7 @@ static int ov94_0223D6B8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223D754 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223D754(UnkStruct_ov94_0223FD4C *param0) { switch (sub_02001BE0(param0->unk_10D4)) { case 1: @@ -445,7 +441,7 @@ static int ov94_0223D754 (UnkStruct_ov94_0223FD4C * param0) Window_Clear(¶m0->unk_F9C[0], 0); { - Pokemon * v0 = (Pokemon *)param0->unk_12C.unk_00.unk_00; + Pokemon *v0 = (Pokemon *)param0->unk_12C.unk_00.unk_00; if (ov94_02241498(v0)) { if (Party_GetCurrentCount(param0->unk_00->unk_08) == 6) { @@ -477,7 +473,7 @@ static int ov94_0223D754 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223D838 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223D838(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_2C = param0->unk_30; @@ -486,7 +482,7 @@ static int ov94_0223D838 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223D858 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223D858(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_10E0++; @@ -500,9 +496,9 @@ static int ov94_0223D858 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static void ov94_0223D88C (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, Pokemon * param5) +static void ov94_0223D88C(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4, Pokemon *param5) { - Strbuf* v0; + Strbuf *v0; StringTemplate_SetSpeciesName(param0->unk_B8C, 0, Pokemon_GetBoxPokemon(param5)); v0 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); @@ -521,11 +517,11 @@ static u32 Unk_ov94_022467FC[] = { (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)) }; -void ov94_0223D910 (MessageLoader * param0, MessageLoader * param1, StringTemplate * param2, Window param3[], BoxPokemon * param4, UnkStruct_ov94_0223BA88_sub2 * param5) +void ov94_0223D910(MessageLoader *param0, MessageLoader *param1, StringTemplate *param2, Window param3[], BoxPokemon *param4, UnkStruct_ov94_0223BA88_sub2 *param5) { - Strbuf* v0, * v1, * v2, * v3; - Strbuf* v4 = Strbuf_Init((10 + 1) * 2, 62); - Strbuf* v5 = Strbuf_Init((8 + 1) * 2, 62); + Strbuf *v0, *v1, *v2, *v3; + Strbuf *v4 = Strbuf_Init((10 + 1) * 2, 62); + Strbuf *v5 = Strbuf_Init((8 + 1) * 2, 62); int v6, v7, v8, v9, v10; BoxPokemon_GetValue(param4, MON_DATA_NICKNAME_STRBUF, v4); @@ -567,10 +563,10 @@ void ov94_0223D910 (MessageLoader * param0, MessageLoader * param1, StringTempla Strbuf_Free(v0); } -void ov94_0223DA78 (MessageLoader * param0, Window param1[], u16 * param2, Pokemon * param3, Window param4[]) +void ov94_0223DA78(MessageLoader *param0, Window param1[], u16 *param2, Pokemon *param3, Window param4[]) { - Strbuf* v0, * v1; - Strbuf* v2, * v3; + Strbuf *v0, *v1; + Strbuf *v2, *v3; v0 = Strbuf_Init((7 + 1) * 2, 62); v3 = Strbuf_Init((7 + 1) * 2, 62); @@ -592,10 +588,10 @@ void ov94_0223DA78 (MessageLoader * param0, Window param1[], u16 * param2, Pokem Strbuf_Free(v3); } -void ov94_0223DB2C (Pokemon * param0) +void ov94_0223DB2C(Pokemon *param0) { ArchivedSprite v0; - u8 * v1 = Heap_AllocFromHeap(62, (0x20 * 10 * 10)); + u8 *v1 = Heap_AllocFromHeap(62, (0x20 * 10 * 10)); Pokemon_BuildArchivedSprite(&v0, param0, 2); @@ -613,7 +609,7 @@ void ov94_0223DB2C (Pokemon * param0) Heap_FreeToHeap(v1); } -static void ov94_0223DBBC (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223DBBC(UnkStruct_ov94_0223FD4C *param0) { ov94_02242368(param0->unk_B90, param0->unk_B94, param0->unk_B8C, ¶m0->unk_FCC[7], param0->unk_12C.unk_F0.unk_00, param0->unk_12C.unk_F0.unk_02, ov94_02242970(param0->unk_12C.unk_F0.unk_03, param0->unk_12C.unk_F0.unk_04, 0)); } diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index b027817996..6ce2d35188 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -1,67 +1,64 @@ +#include "overlay094/ov94_0223DC04.h" + +#include #include #include -#include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "pokemon.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay094/ov94_0223BCB0.h" +#include "overlay094/ov94_0223D0C4.h" +#include "overlay094/ov94_022414B8.h" +#include "overlay094/ov94_02243EF8.h" +#include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223BA88.h" #include "overlay094/struct_ov94_0223BA88_sub3.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "core_sys.h" +#include "game_options.h" +#include "message.h" +#include "message_util.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_0223D0C4.h" -#include "overlay094/ov94_0223DC04.h" -#include "overlay094/ov94_022414B8.h" -#include "overlay094/ov94_02243EF8.h" -#include "overlay094/ov94_02244950.h" -static void ov94_0223DD1C(BGL * param0); -static void ov94_0223DDE0(BGL * param0); -static void ov94_0223DE04(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223DED8(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223DFA4(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223DFDC(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223E074(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223DE7C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223DEC8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223E09C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223E0A4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223E188(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223E2E0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223E1B0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223E1D0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223E2D0(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223E240(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223E358(MessageLoader * param0, Window param1[]); -static void ov94_0223E300(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4); -static void ov94_0223E3B0(Window * param0, MessageLoader * param1, MessageLoader * param2, UnkStruct_ov94_0223BA88_sub3 * param3); -static void ov94_0223E424(Window * param0, Strbuf *param1, Strbuf *param2); - -static int (* Unk_ov94_0224682C[])(UnkStruct_ov94_0223FD4C * wk) = { +static void ov94_0223DD1C(BGL *param0); +static void ov94_0223DDE0(BGL *param0); +static void ov94_0223DE04(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223DED8(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223DFA4(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223DFDC(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223E074(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223DE7C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223DEC8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223E09C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223E0A4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223E188(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223E2E0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223E1B0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223E1D0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223E2D0(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223E240(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223E358(MessageLoader *param0, Window param1[]); +static void ov94_0223E300(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4); +static void ov94_0223E3B0(Window *param0, MessageLoader *param1, MessageLoader *param2, UnkStruct_ov94_0223BA88_sub3 *param3); +static void ov94_0223E424(Window *param0, Strbuf *param1, Strbuf *param2); + +static int (*Unk_ov94_0224682C[])(UnkStruct_ov94_0223FD4C *wk) = { ov94_0223E09C, ov94_0223E0A4, ov94_0223E188, @@ -71,9 +68,9 @@ static int (* Unk_ov94_0224682C[])(UnkStruct_ov94_0223FD4C * wk) = { ov94_0223E2D0 }; -int ov94_0223DC04 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223DC04(UnkStruct_ov94_0223FD4C *param0, int param1) { - Pokemon * v0; + Pokemon *v0; ov94_0223DFDC(param0); ov94_0223DD1C(param0->unk_04); @@ -95,7 +92,7 @@ int ov94_0223DC04 (UnkStruct_ov94_0223FD4C * param0, int param1) return 2; } -int ov94_0223DCE4 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223DCE4(UnkStruct_ov94_0223FD4C *param0, int param1) { int v0; @@ -103,7 +100,7 @@ int ov94_0223DCE4 (UnkStruct_ov94_0223FD4C * param0, int param1) return v0; } -int ov94_0223DCF8 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223DCF8(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_0223DEC8(param0); ov94_0223E074(param0); @@ -114,7 +111,7 @@ int ov94_0223DCF8 (UnkStruct_ov94_0223FD4C * param0, int param1) return 1; } -static void ov94_0223DD1C (BGL * param0) +static void ov94_0223DD1C(BGL *param0) { { UnkStruct_ov97_0222DB78 v0 = { @@ -202,7 +199,7 @@ static void ov94_0223DD1C (BGL * param0) sub_02019690(4, 32, 0, 62); } -static void ov94_0223DDE0 (BGL * param0) +static void ov94_0223DDE0(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -210,9 +207,9 @@ static void ov94_0223DDE0 (BGL * param0) sub_02019044(param0, 0); } -static void ov94_0223DE04 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223DE04(UnkStruct_ov94_0223FD4C *param0) { - BGL * v0 = param0->unk_04; + BGL *v0 = param0->unk_04; sub_02002E98(0, 13 * 0x20, 62); sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_00->unk_24), 62); @@ -221,7 +218,7 @@ static void ov94_0223DE04 (UnkStruct_ov94_0223FD4C * param0) sub_02006E84(104, 7, 0, 0, 16 * 3 * 2, 62); } -static void ov94_0223DE7C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223DE7C(UnkStruct_ov94_0223FD4C *param0) { UnkStruct_ov115_02261520 v0; @@ -237,27 +234,27 @@ static void ov94_0223DE7C (UnkStruct_ov94_0223FD4C * param0) sub_02039734(); } -static void ov94_0223DEC8 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223DEC8(UnkStruct_ov94_0223FD4C *param0) { sub_02021BD4(param0->unk_F30); } static const int Unk_ov94_02245CC4[][4] = { - {0x1, 0x2, 0xA, 0x2}, - {0xC, 0x2, 0x8, 0x2}, - {0xE, 0x4, 0x7, 0x2}, - {0x1, 0x7, 0x6, 0x2}, - {0x7, 0x7, 0xB, 0x2}, - {0x2, 0xA, 0x9, 0x2}, - {0xC, 0xA, 0x8, 0x2}, - {0x3, 0xD, 0x9, 0x2}, - {0x10, 0xD, 0xD, 0x2}, - {0x2, 0xF, 0x1C, 0x5}, - {0x1, 0x5, 0x5, 0x2}, - {0x7, 0x5, 0x7, 0x2} + { 0x1, 0x2, 0xA, 0x2 }, + { 0xC, 0x2, 0x8, 0x2 }, + { 0xE, 0x4, 0x7, 0x2 }, + { 0x1, 0x7, 0x6, 0x2 }, + { 0x7, 0x7, 0xB, 0x2 }, + { 0x2, 0xA, 0x9, 0x2 }, + { 0xC, 0xA, 0x8, 0x2 }, + { 0x3, 0xD, 0x9, 0x2 }, + { 0x10, 0xD, 0xD, 0x2 }, + { 0x2, 0xF, 0x1C, 0x5 }, + { 0x1, 0x5, 0x5, 0x2 }, + { 0x7, 0x5, 0x7, 0x2 } }; -static void ov94_0223DED8 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223DED8(UnkStruct_ov94_0223FD4C *param0) { BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 21, 27, 2, 13, ((1 + (18 + 12)) + 9)); BGL_FillWindow(¶m0->unk_F5C, 0x0); @@ -277,7 +274,7 @@ static void ov94_0223DED8 (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_0223DFA4 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223DFA4(UnkStruct_ov94_0223FD4C *param0) { BGL_DeleteWindow(¶m0->unk_F5C); BGL_DeleteWindow(¶m0->unk_F9C[0]); @@ -291,11 +288,11 @@ static void ov94_0223DFA4 (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_0223DFDC (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223DFDC(UnkStruct_ov94_0223FD4C *param0) { int v0; - MessageLoader * v1; - UnkStruct_ov94_0223BA88 * v2 = ¶m0->unk_250[param0->unk_11C]; + MessageLoader *v1; + UnkStruct_ov94_0223BA88 *v2 = ¶m0->unk_250[param0->unk_11C]; param0->unk_BAC = Strbuf_Init((90 * 2), 62); @@ -313,7 +310,7 @@ static void ov94_0223DFDC (UnkStruct_ov94_0223FD4C * param0) param0->unk_BB4[1] = MessageUtil_ExpandedStrbuf(param0->unk_B8C, param0->unk_B90, 80, 62); } -static void ov94_0223E074 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223E074(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -322,13 +319,13 @@ static void ov94_0223E074 (UnkStruct_ov94_0223FD4C * param0) Strbuf_Free(param0->unk_BAC); } -static int ov94_0223E09C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223E09C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_2C = 1; return 3; } -static int ov94_0223E0A4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223E0A4(UnkStruct_ov94_0223FD4C *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_A) { ov94_0223E300(param0, 16, 1, 0, 0xf0f); @@ -369,7 +366,7 @@ static int ov94_0223E0A4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223E188 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223E188(UnkStruct_ov94_0223FD4C *param0) { sub_0200F174(3, 0, 0, 0x0, 6, 1, 62); @@ -377,7 +374,7 @@ static int ov94_0223E188 (UnkStruct_ov94_0223FD4C * param0) return 4; } -static int ov94_0223E1B0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223E1B0(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 15, ((((1 + (18 + 12)) + 9) + 27 * 2) + (5 * 2) * 4 + 262 + 64 + 36)); param0->unk_2C = 5; @@ -385,7 +382,7 @@ static int ov94_0223E1B0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223E1D0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223E1D0(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -406,7 +403,7 @@ static int ov94_0223E1D0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static void ov94_0223E240 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223E240(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_10E == 0) { sub_02006E60(104, 27, param0->unk_04, 1, 0, 32 * 24 * 2, 1, 62); @@ -417,7 +414,7 @@ static void ov94_0223E240 (UnkStruct_ov94_0223FD4C * param0) } } -static int ov94_0223E2D0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223E2D0(UnkStruct_ov94_0223FD4C *param0) { ov94_0223E240(param0); param0->unk_2C = 1; @@ -425,7 +422,7 @@ static int ov94_0223E2D0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223E2E0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223E2E0(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_2C = param0->unk_30; @@ -434,9 +431,9 @@ static int ov94_0223E2E0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static void ov94_0223E300 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) +static void ov94_0223E300(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4) { - Strbuf* v0; + Strbuf *v0; MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); BGL_FillWindow(¶m0->unk_F5C, 0xf0f); @@ -445,9 +442,9 @@ static void ov94_0223E300 (UnkStruct_ov94_0223FD4C * param0, int param1, int par param0->unk_BE0 = PrintStringSimple(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); } -static void ov94_0223E358 (MessageLoader * param0, Window param1[]) +static void ov94_0223E358(MessageLoader *param0, Window param1[]) { - Strbuf* v0, * v1; + Strbuf *v0, *v1; v0 = MessageLoader_GetNewStrbuf(param0, 74); v1 = MessageLoader_GetNewStrbuf(param0, 78); @@ -459,7 +456,7 @@ static void ov94_0223E358 (MessageLoader * param0, Window param1[]) Strbuf_Free(v1); } -static void ov94_0223E3B0 (Window * param0, MessageLoader * param1, MessageLoader * param2, UnkStruct_ov94_0223BA88_sub3 * param3) +static void ov94_0223E3B0(Window *param0, MessageLoader *param1, MessageLoader *param2, UnkStruct_ov94_0223BA88_sub3 *param3) { BGL_FillWindow(param0, 0x0); @@ -468,7 +465,7 @@ static void ov94_0223E3B0 (Window * param0, MessageLoader * param1, MessageLoade ov94_0224226C(param0 + 1, param1, ov94_02242970(param3->unk_03, param3->unk_04, 0), 0, 19, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), 0, 8); } -static void ov94_0223E424 (Window * param0, Strbuf *param1, Strbuf *param2) +static void ov94_0223E424(Window *param0, Strbuf *param1, Strbuf *param2) { BGL_FillWindow(param0, 0x0); diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index cd8b365e75..44952913f4 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -1,18 +1,19 @@ +#include "overlay094/ov94_0223E46C.h" + +#include #include #include -#include - -#include "core_sys.h" -#include "inlines.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" +#include "struct_defs/struct_0205AA50.h" #include "overlay094/const_ov94_02245FD4.h" - -#include "struct_defs/struct_0205AA50.h" +#include "overlay094/ov94_0223B140.h" +#include "overlay094/ov94_0223BCB0.h" +#include "overlay094/ov94_022414B8.h" +#include "overlay094/ov94_02243EF8.h" +#include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223BA24.h" #include "overlay094/struct_ov94_0223BA88_sub3.h" #include "overlay094/struct_ov94_0223FD4C.h" @@ -20,81 +21,77 @@ #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "core_sys.h" +#include "game_options.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "pokemon.h" +#include "strbuf.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_0202DA40.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "overlay094/ov94_0223B140.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_0223E46C.h" -#include "overlay094/ov94_022414B8.h" -#include "overlay094/ov94_02243EF8.h" -#include "overlay094/ov94_02244950.h" -static void ov94_0223E598(BGL * param0); -static void ov94_0223E684(BGL * param0); -static void ov94_0223E6B8(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223E770(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223E7C4(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223E7D4(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223E968(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223E9B8(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223EA20(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223EA5C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223EA84(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223EBCC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223ECD4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223ED94(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223EE40(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223EF94(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223EFAC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F0A8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F0D0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F154(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F190(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F25C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F2B0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F41C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F474(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F4B0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F5A0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F5F8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F638(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F728(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F780(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F7C0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F8B4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F8D8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F920(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F928(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223F950(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223EE9C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223F9A4(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4); -static int ov94_0223EEE0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223EF1C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0223EF58(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223F9FC(Window * param0, Window * param1, MessageLoader * param2); -static int ov94_0223EC74(UnkStruct_ov94_0223FD4C * param0, int param1); -static int ov94_0223FB0C(const UnkStruct_ov94_0223BA88_sub3 * param0, const UnkStruct_ov94_0223BA88_sub3 * param1, int param2, int param3); -static int ov94_0223F970(UnkStruct_ov94_0223FD4C * param0); - -static int (* Unk_ov94_02246860[])(UnkStruct_ov94_0223FD4C *) = { +static void ov94_0223E598(BGL *param0); +static void ov94_0223E684(BGL *param0); +static void ov94_0223E6B8(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223E770(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223E7C4(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223E7D4(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223E968(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223E9B8(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223EA20(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223EA5C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223EA84(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223EBCC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223ECD4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223ED94(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223EE40(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223EF94(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223EFAC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F0A8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F0D0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F154(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F190(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F25C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F2B0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F41C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F474(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F4B0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F5A0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F5F8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F638(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F728(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F780(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F7C0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F8B4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F8D8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F920(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F928(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223F950(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223EE9C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223F9A4(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4); +static int ov94_0223EEE0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223EF1C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0223EF58(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223F9FC(Window *param0, Window *param1, MessageLoader *param2); +static int ov94_0223EC74(UnkStruct_ov94_0223FD4C *param0, int param1); +static int ov94_0223FB0C(const UnkStruct_ov94_0223BA88_sub3 *param0, const UnkStruct_ov94_0223BA88_sub3 *param1, int param2, int param3); +static int ov94_0223F970(UnkStruct_ov94_0223FD4C *param0); + +static int (*Unk_ov94_02246860[])(UnkStruct_ov94_0223FD4C *) = { ov94_0223EA5C, ov94_0223EA84, ov94_0223F0A8, @@ -129,15 +126,15 @@ static int (* Unk_ov94_02246860[])(UnkStruct_ov94_0223FD4C *) = { }; static u16 Unk_ov94_02246848[][2] = { - {0x14, 0x2F}, - {0x14, 0x47}, - {0x14, 0x5F}, - {0x14, 0x77}, - {0xB0, 0x38}, - {0xB0, 0x60} + { 0x14, 0x2F }, + { 0x14, 0x47 }, + { 0x14, 0x5F }, + { 0x14, 0x77 }, + { 0xB0, 0x38 }, + { 0xB0, 0x60 } }; -int ov94_0223E46C (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223E46C(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_0223E9B8(param0); ov94_0223E598(param0->unk_04); @@ -156,7 +153,7 @@ int ov94_0223E46C (UnkStruct_ov94_0223FD4C * param0, int param1) return 2; } -int ov94_0223E560 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223E560(UnkStruct_ov94_0223FD4C *param0, int param1) { int v0; @@ -164,7 +161,7 @@ int ov94_0223E560 (UnkStruct_ov94_0223FD4C * param0, int param1) return v0; } -int ov94_0223E574 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223E574(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_0223E7C4(param0); ov94_0223EA20(param0); @@ -175,7 +172,7 @@ int ov94_0223E574 (UnkStruct_ov94_0223FD4C * param0, int param1) return 1; } -static void ov94_0223E598 (BGL * param0) +static void ov94_0223E598(BGL *param0) { { UnkStruct_ov97_0222DB78 v0 = { @@ -267,7 +264,7 @@ static void ov94_0223E598 (BGL * param0) sub_02019690(4, 32, 0, 62); } -static void ov94_0223E684 (BGL * param0) +static void ov94_0223E684(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -277,10 +274,10 @@ static void ov94_0223E684 (BGL * param0) sub_02019044(param0, 3); } -static void ov94_0223E6B8 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223E6B8(UnkStruct_ov94_0223FD4C *param0) { - BGL * v0 = param0->unk_04; - NARC * v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); + BGL *v0 = param0->unk_04; + NARC *v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); sub_02007130(v1, 3, 0, 0, 16 * 3 * 2, 62); sub_02007130(v1, 5, 4, 0, 16 * 8 * 2, 62); @@ -292,7 +289,7 @@ static void ov94_0223E6B8 (UnkStruct_ov94_0223FD4C * param0) NARC_dtor(v1); } -static void ov94_0223E770 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223E770(UnkStruct_ov94_0223FD4C *param0) { UnkStruct_ov115_02261520 v0; @@ -309,31 +306,31 @@ static void ov94_0223E770 (UnkStruct_ov94_0223FD4C * param0) sub_02039734(); } -static void ov94_0223E7C4 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223E7C4(UnkStruct_ov94_0223FD4C *param0) { sub_02021BD4(param0->unk_E20); } static const u16 Unk_ov94_02245D94[6][2] = { - {0x3, 0x5}, - {0x9, 0x5}, - {0x3, 0x8}, - {0x9, 0x8}, - {0x3, 0xB}, - {0x9, 0xB} + { 0x3, 0x5 }, + { 0x9, 0x5 }, + { 0x3, 0x8 }, + { 0x9, 0x8 }, + { 0x3, 0xB }, + { 0x9, 0xB } }; static const u16 Unk_ov94_02245D84[][2] = { - {0x16, 0x6}, - {0x16, 0xB} + { 0x16, 0x6 }, + { 0x16, 0xB } }; static const u16 Unk_ov94_02245D8C[][2] = { - {0x3, 0xE}, - {0x2, 0x10} + { 0x3, 0xE }, + { 0x2, 0x10 } }; -static void ov94_0223E7D4 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223E7D4(UnkStruct_ov94_0223FD4C *param0) { BGL_AddWindow(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); BGL_FillWindow(¶m0->unk_F7C, 0x0); @@ -363,7 +360,7 @@ static void ov94_0223E7D4 (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_0223E968 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223E968(UnkStruct_ov94_0223FD4C *param0) { BGL_DeleteWindow(¶m0->unk_F5C); BGL_DeleteWindow(¶m0->unk_F7C); @@ -381,7 +378,7 @@ static void ov94_0223E968 (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_0223E9B8 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223E9B8(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -397,7 +394,7 @@ static void ov94_0223E9B8 (UnkStruct_ov94_0223FD4C * param0) ov94_02242AAC(¶m0->unk_111C); } -static void ov94_0223EA20 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223EA20(UnkStruct_ov94_0223FD4C *param0) { Heap_FreeToHeap(param0->unk_10E4->unk_14); Heap_FreeToHeap(param0->unk_10E4->unk_18); @@ -406,7 +403,7 @@ static void ov94_0223EA20 (UnkStruct_ov94_0223FD4C * param0) Strbuf_Free(param0->unk_BB0); } -static int ov94_0223EA5C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223EA5C(UnkStruct_ov94_0223FD4C *param0) { ov94_0223F9A4(param0, 8, 1, 0, 0xf0f); ov94_0223C3F4(param0, 23, 1); @@ -414,7 +411,7 @@ static int ov94_0223EA5C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223EA84 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223EA84(UnkStruct_ov94_0223FD4C *param0) { ov94_0223EFAC(param0); @@ -476,7 +473,7 @@ static int ov94_0223EA84 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223EBCC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223EBCC(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_B7A.unk_00 == 0) { ov94_0223F9A4(param0, 12, 1, 0, 0xf0f); @@ -499,7 +496,7 @@ static int ov94_0223EBCC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223EC74 (UnkStruct_ov94_0223FD4C * param0, int param1) +static int ov94_0223EC74(UnkStruct_ov94_0223FD4C *param0, int param1) { u32 v0; RTCDate v1, v2; @@ -524,7 +521,7 @@ static int ov94_0223EC74 (UnkStruct_ov94_0223FD4C * param0, int param1) return 0; } -static int ov94_0223ECD4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223ECD4(UnkStruct_ov94_0223FD4C *param0) { UnkStruct_ov94_0223BA88_sub3 v0; int v1 = 3; @@ -564,7 +561,7 @@ static int ov94_0223ECD4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223ED94 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223ED94(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -614,7 +611,7 @@ static int ov94_0223ED94 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223EE40 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223EE40(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_118 == 0) { ov94_0223F9A4(param0, 14, 1, 0, 0xf0f); @@ -629,7 +626,7 @@ static int ov94_0223EE40 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223EE9C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223EE9C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10E0++; @@ -642,7 +639,7 @@ static int ov94_0223EE9C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223EEE0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223EEE0(UnkStruct_ov94_0223FD4C *param0) { param0->unk_B80.unk_00 = 0; @@ -653,7 +650,7 @@ static int ov94_0223EEE0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223EF1C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223EF1C(UnkStruct_ov94_0223FD4C *param0) { ov94_0223F9A4(param0, 147, 4, 0, 0xf0f); ov94_0223C3F4(param0, 24, 30); @@ -663,7 +660,7 @@ static int ov94_0223EF1C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223EF58 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223EF58(UnkStruct_ov94_0223FD4C *param0) { ov94_0223F9A4(param0, 152, 4, 0, 0xf0f); ov94_0223C3F4(param0, 24, 2); @@ -673,7 +670,7 @@ static int ov94_0223EF58 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223EF94 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223EF94(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -686,7 +683,7 @@ static int ov94_0223EF94 (UnkStruct_ov94_0223FD4C * param0) return v0; } -static void ov94_0223EFAC (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223EFAC(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -740,7 +737,7 @@ static void ov94_0223EFAC (UnkStruct_ov94_0223FD4C * param0) } } -static int ov94_0223F0A8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F0A8(UnkStruct_ov94_0223FD4C *param0) { sub_0200F174(3, 0, 0, 0x0, 6, 1, 62); @@ -749,7 +746,7 @@ static int ov94_0223F0A8 (UnkStruct_ov94_0223FD4C * param0) return 4; } -static int ov94_0223F0D0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F0D0(UnkStruct_ov94_0223FD4C *param0) { ov94_0223F9A4(param0, 9, 1, 0, 0xf0f); ov94_0223C3F4(param0, 23, 4); @@ -763,7 +760,7 @@ static int ov94_0223F0D0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F154 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F154(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D8 = ov94_022426A8(param0, ¶m0->unk_10CC, ¶m0->unk_F9C[0], param0->unk_B90); param0->unk_108 = 0xffff; @@ -772,7 +769,7 @@ static int ov94_0223F154 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F190 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F190(UnkStruct_ov94_0223FD4C *param0) { switch (ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108)) { case 1: @@ -804,7 +801,7 @@ static int ov94_0223F190 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F25C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F25C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D8 = ov94_022427C0(param0, ¶m0->unk_10CC, ¶m0->unk_F9C[1], param0->unk_B90, param0->unk_B94, param0->unk_10E4, param0->unk_00->unk_10); param0->unk_108 = 0xffff; @@ -813,11 +810,11 @@ static int ov94_0223F25C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F2B0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F2B0(UnkStruct_ov94_0223FD4C *param0) { u32 v0; - switch ((v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108))) { + switch (v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108)) { case 0xffffffff: break; case 0xfffffffe: @@ -856,18 +853,18 @@ static int ov94_0223F2B0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F41C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F41C(UnkStruct_ov94_0223FD4C *param0) { ov94_0223F9A4(param0, 10, 1, 0, 0xf0f); ov94_0223C3F4(param0, 23, 9); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 10, 10, 8, 13, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2))); + BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 10, 10, 8, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); BGL_FillWindow(¶m0->unk_F9C[0], 0x0); return 3; } -static int ov94_0223F474 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F474(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D8 = ov94_02242840(¶m0->unk_10CC, ¶m0->unk_F9C[0], param0->unk_B90); param0->unk_108 = 0xffff; @@ -876,11 +873,11 @@ static int ov94_0223F474 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F4B0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F4B0(UnkStruct_ov94_0223FD4C *param0) { u32 v0; - switch ((v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108))) { + switch (v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108)) { case 0xfffffffe: sub_02001384(param0->unk_10D8, NULL, NULL); sub_02013A3C(param0->unk_10CC); @@ -910,18 +907,18 @@ static int ov94_0223F4B0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F5A0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F5A0(UnkStruct_ov94_0223FD4C *param0) { ov94_0223F9A4(param0, 11, 1, 0, 0xf0f); ov94_0223C3F4(param0, 23, 12); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 16, 13, 13, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2))); + BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 16, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); BGL_FillWindow(¶m0->unk_F9C[0], 0x0); return 3; } -static int ov94_0223F5F8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F5F8(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D8 = ov94_022428B0(¶m0->unk_10CC, ¶m0->unk_F9C[0], param0->unk_B90, 1); param0->unk_108 = 0xffff; @@ -930,11 +927,11 @@ static int ov94_0223F5F8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F638 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F638(UnkStruct_ov94_0223FD4C *param0) { u32 v0; - switch ((v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108))) { + switch (v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108)) { case 0xffffffff: break; case 0xfffffffe: @@ -965,18 +962,18 @@ static int ov94_0223F638 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F728 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F728(UnkStruct_ov94_0223FD4C *param0) { ov94_0223F9A4(param0, 169, 1, 0, 0xf0f); ov94_0223C3F4(param0, 23, 15); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 2, 5, 28, 13, 13, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2))); + BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 2, 5, 28, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)); BGL_FillWindow(¶m0->unk_F9C[0], 0x0); return 3; } -static int ov94_0223F780 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F780(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D8 = ov94_022429B4(¶m0->unk_10CC, ¶m0->unk_F9C[0], param0->unk_BA0, param0->unk_B90); param0->unk_108 = 0xffff; @@ -985,7 +982,7 @@ static int ov94_0223F780 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F7C0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F7C0(UnkStruct_ov94_0223FD4C *param0) { u32 v0; @@ -1017,15 +1014,15 @@ static int ov94_0223F7C0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F8B4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F8B4(UnkStruct_ov94_0223FD4C *param0) { - param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 15, (((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2)) + 16 * 13)); + param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 15, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 8 * 2 * 2) + 16 * 13)); param0->unk_2C = 26; return 3; } -static int ov94_0223F8D8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F8D8(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -1043,13 +1040,13 @@ static int ov94_0223F8D8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F920 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F920(UnkStruct_ov94_0223FD4C *param0) { param0->unk_2C = 1; return 3; } -static int ov94_0223F928 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F928(UnkStruct_ov94_0223FD4C *param0) { ov94_0223F9A4(param0, 146, 1, 0, 0xf0f); ov94_0223C3F4(param0, 23, 1); @@ -1057,7 +1054,7 @@ static int ov94_0223F928 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F950 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F950(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_2C = param0->unk_30; @@ -1066,7 +1063,7 @@ static int ov94_0223F950 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0223F970 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0223F970(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_10E0++; @@ -1080,9 +1077,9 @@ static int ov94_0223F970 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static void ov94_0223F9A4 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) +static void ov94_0223F9A4(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4) { - Strbuf* v0; + Strbuf *v0; MessageLoader_GetStrbuf(param0->unk_B90, param1, param0->unk_BAC); BGL_FillWindow(¶m0->unk_F5C, 0xf0f); @@ -1091,9 +1088,9 @@ static void ov94_0223F9A4 (UnkStruct_ov94_0223FD4C * param0, int param1, int par param0->unk_BE0 = PrintStringSimple(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); } -static void ov94_0223F9FC (Window * param0, Window * param1, MessageLoader * param2) +static void ov94_0223F9FC(Window *param0, Window *param1, MessageLoader *param2) { - Strbuf* v0, * v1, * v2; + Strbuf *v0, *v1, *v2; v0 = MessageLoader_GetNewStrbuf(param2, 59); ov94_02245900(¶m0[0], v0, 0, 0, 0, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); @@ -1130,7 +1127,7 @@ static void ov94_0223F9FC (Window * param0, Window * param1, MessageLoader * par Strbuf_Free(v0); } -static int ov94_0223FB0C (const UnkStruct_ov94_0223BA88_sub3 * param0, const UnkStruct_ov94_0223BA88_sub3 * param1, int param2, int param3) +static int ov94_0223FB0C(const UnkStruct_ov94_0223BA88_sub3 *param0, const UnkStruct_ov94_0223BA88_sub3 *param1, int param2, int param3) { if ((param0->unk_00 == param1->unk_00) && (param0->unk_02 == param1->unk_02) && (param0->unk_03 == param1->unk_03) && (param0->unk_04 == param1->unk_04) && (param2 == param3)) { return 1; diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 1d2feacbbe..ca72573655 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -1,20 +1,21 @@ +#include "overlay094/ov94_0223FB48.h" + +#include #include #include -#include - -#include "core_sys.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" + #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay094/ov94_0223BCB0.h" +#include "overlay094/ov94_022414B8.h" +#include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223BA88.h" #include "overlay094/struct_ov94_0223BA88_sub2.h" #include "overlay094/struct_ov94_0223BA88_sub3.h" @@ -23,86 +24,83 @@ #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_020393C8.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "pokemon_icon.h" -#include "party.h" -#include "item.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_0223FB48.h" -#include "overlay094/ov94_022414B8.h" -#include "overlay094/ov94_02244950.h" typedef struct { int unk_00; int unk_04; - GraphicElementData * unk_08; + GraphicElementData *unk_08; u8 unk_0C[512]; } UnkStruct_ov94_02240FA0; -static void ov94_0223FC08(BGL * param0); -static void ov94_0223FD20(BGL * param0); -static void ov94_0223FD4C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223FE24(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0223FFC8(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02240028(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02240190(UnkStruct_ov94_0223FD4C * param0); -static void ov94_022401E0(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02240268(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022402A8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022402BC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240A6C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240AC4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240AE8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240D08(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240D28(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02240D58(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, int param5); -static void ov94_02240DF8(int param0, int param1, int param2, int param3, GraphicElementData * param4, NARC * param5, UnkStruct_ov94_02240FA0 * param6); -static void ov94_02240FA0(UnkStruct_ov94_0223FD4C * param0, int param1); +static void ov94_0223FC08(BGL *param0); +static void ov94_0223FD20(BGL *param0); +static void ov94_0223FD4C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223FE24(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0223FFC8(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02240028(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02240190(UnkStruct_ov94_0223FD4C *param0); +static void ov94_022401E0(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02240268(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022402A8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022402BC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240A6C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240AC4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240AE8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240D08(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240D28(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02240D58(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4, int param5); +static void ov94_02240DF8(int param0, int param1, int param2, int param3, GraphicElementData *param4, NARC *param5, UnkStruct_ov94_02240FA0 *param6); +static void ov94_02240FA0(UnkStruct_ov94_0223FD4C *param0, int param1); static int ov94_022405CC(int param0, int param1, int param2); -static void ov94_022404F0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022405DC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240688(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240830(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022408E8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240B70(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240B4C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240B20(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240C58(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240C84(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02240CA8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241384(BoxPokemon * param0, UnkStruct_ov94_0223BA88_sub3 * param1); -static void ov94_022413BC(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1); -static void ov94_02240EAC(BoxPokemon * param0, GraphicElementData * param1, GraphicElementData * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7); -void * ov94_02240DD0(NARC * param0, u32 param1, NNSG2dCharacterData ** param2, u32 param3); -static int ov94_02241328(UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_ov94_0223BA88_sub3 * param1); -static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 * param0, GraphicElementData ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3); -static int ov94_0224121C(Party * param0, PCBoxes * param1, int param2, int param3); -static int ov94_022412F4(Party * param0, PCBoxes * param1, int param2, int param3); -static int ov94_02240BB0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224123C(BoxPokemon * param0); -static int ov94_02241278(BoxPokemon * param0); -static int ov94_022412C8(BoxPokemon * param0); - -static int (* Unk_ov94_022468DC[])(UnkStruct_ov94_0223FD4C *) = { +static void ov94_022404F0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022405DC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240688(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240830(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022408E8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240B70(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240B4C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240B20(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240C58(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240C84(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02240CA8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241384(BoxPokemon *param0, UnkStruct_ov94_0223BA88_sub3 *param1); +static void ov94_022413BC(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1); +static void ov94_02240EAC(BoxPokemon *param0, GraphicElementData *param1, GraphicElementData *param2, u16 *param3, int param4, NARC *param5, UnkStruct_ov94_0223BA88_sub2 *param6, UnkStruct_ov94_02240FA0 *param7); +void *ov94_02240DD0(NARC *param0, u32 param1, NNSG2dCharacterData **param2, u32 param3); +static int ov94_02241328(UnkStruct_ov94_0223BA88_sub2 *param0, UnkStruct_ov94_0223BA88_sub3 *param1); +static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 *param0, GraphicElementData **param1, UnkStruct_ov94_0223BA88_sub3 *param2, UnkStruct_ov94_02240FA0 *param3); +static int ov94_0224121C(Party *param0, PCBoxes *param1, int param2, int param3); +static int ov94_022412F4(Party *param0, PCBoxes *param1, int param2, int param3); +static int ov94_02240BB0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0224123C(BoxPokemon *param0); +static int ov94_02241278(BoxPokemon *param0); +static int ov94_022412C8(BoxPokemon *param0); + +static int (*Unk_ov94_022468DC[])(UnkStruct_ov94_0223FD4C *) = { ov94_022402A8, ov94_022402BC, ov94_02240A6C, @@ -122,7 +120,7 @@ static int (* Unk_ov94_022468DC[])(UnkStruct_ov94_0223FD4C *) = { ov94_02240CA8 }; -int ov94_0223FB48 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223FB48(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_022401E0(param0); ov94_0223FC08(param0->unk_04); @@ -144,7 +142,7 @@ int ov94_0223FB48 (UnkStruct_ov94_0223FD4C * param0, int param1) return 2; } -int ov94_0223FBBC (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223FBBC(UnkStruct_ov94_0223FD4C *param0, int param1) { int v0; @@ -155,7 +153,7 @@ int ov94_0223FBBC (UnkStruct_ov94_0223FD4C * param0, int param1) return v0; } -int ov94_0223FBDC (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0223FBDC(UnkStruct_ov94_0223FD4C *param0, int param1) { sub_02039794(); @@ -168,7 +166,7 @@ int ov94_0223FBDC (UnkStruct_ov94_0223FD4C * param0, int param1) return 1; } -static void ov94_0223FC08 (BGL * param0) +static void ov94_0223FC08(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -290,7 +288,7 @@ static void ov94_0223FC08 (BGL * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov94_0223FD20 (BGL * param0) +static void ov94_0223FD20(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -299,10 +297,10 @@ static void ov94_0223FD20 (BGL * param0) sub_02019044(param0, 0); } -static void ov94_0223FD4C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223FD4C(UnkStruct_ov94_0223FD4C *param0) { - BGL * v0 = param0->unk_04; - NARC * v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); + BGL *v0 = param0->unk_04; + NARC *v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 62); sub_02007130(v1, 2, 0, 0, 16 * 3 * 2, 62); sub_02007130(v1, 5, 4, 0, 16 * 8 * 2, 62); @@ -316,46 +314,46 @@ static void ov94_0223FD4C (UnkStruct_ov94_0223FD4C * param0) } static const u16 Unk_ov94_02245ED4[][2] = { - {0x19, 0x3C}, - {0x33, 0x3C}, - {0x4D, 0x3C}, - {0x67, 0x3C}, - {0x81, 0x3C}, - {0x9B, 0x3C}, - {0x19, 0x54}, - {0x33, 0x54}, - {0x4D, 0x54}, - {0x67, 0x54}, - {0x81, 0x54}, - {0x9B, 0x54}, - {0x19, 0x6C}, - {0x33, 0x6C}, - {0x4D, 0x6C}, - {0x67, 0x6C}, - {0x81, 0x6C}, - {0x9B, 0x6C}, - {0x19, 0x84}, - {0x33, 0x84}, - {0x4D, 0x84}, - {0x67, 0x84}, - {0x81, 0x84}, - {0x9B, 0x84}, - {0x19, 0x9C}, - {0x33, 0x9C}, - {0x4D, 0x9C}, - {0x67, 0x9C}, - {0x81, 0x9C}, - {0x9B, 0x9C}, - {0xE0, 0xAF}, - {0x62, 0x20} + { 0x19, 0x3C }, + { 0x33, 0x3C }, + { 0x4D, 0x3C }, + { 0x67, 0x3C }, + { 0x81, 0x3C }, + { 0x9B, 0x3C }, + { 0x19, 0x54 }, + { 0x33, 0x54 }, + { 0x4D, 0x54 }, + { 0x67, 0x54 }, + { 0x81, 0x54 }, + { 0x9B, 0x54 }, + { 0x19, 0x6C }, + { 0x33, 0x6C }, + { 0x4D, 0x6C }, + { 0x67, 0x6C }, + { 0x81, 0x6C }, + { 0x9B, 0x6C }, + { 0x19, 0x84 }, + { 0x33, 0x84 }, + { 0x4D, 0x84 }, + { 0x67, 0x84 }, + { 0x81, 0x84 }, + { 0x9B, 0x84 }, + { 0x19, 0x9C }, + { 0x33, 0x9C }, + { 0x4D, 0x9C }, + { 0x67, 0x9C }, + { 0x81, 0x9C }, + { 0x9B, 0x9C }, + { 0xE0, 0xAF }, + { 0x62, 0x20 } }; static const u16 Unk_ov94_02245E1C[][2] = { - {0xA2, 0x24}, - {0x16, 0x24} + { 0xA2, 0x24 }, + { 0x16, 0x24 } }; -static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223FE24(UnkStruct_ov94_0223FD4C *param0) { int v0; UnkStruct_ov115_02261520 v1; @@ -421,7 +419,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_0223FFC8 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0223FFC8(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -441,7 +439,7 @@ static void ov94_0223FFC8 (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_02240028 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02240028(UnkStruct_ov94_0223FD4C *param0) { BGL_AddWindow(param0->unk_04, ¶m0->unk_F7C, 0, 1, 1, 28, 2, 13, ((1 + (18 + 12)) + 9)); BGL_FillWindow(¶m0->unk_F7C, 0x0); @@ -463,7 +461,7 @@ static void ov94_02240028 (UnkStruct_ov94_0223FD4C * param0) BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 13, (5 * 2), 6, 13, (((((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13) + 27 * 2) + 2 * 19) + 6 * 2)); } -static void ov94_02240190 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02240190(UnkStruct_ov94_0223FD4C *param0) { BGL_DeleteWindow(¶m0->unk_109C); BGL_DeleteWindow(¶m0->unk_F9C[1]); @@ -473,7 +471,7 @@ static void ov94_02240190 (UnkStruct_ov94_0223FD4C * param0) BGL_DeleteWindow(¶m0->unk_F7C); } -static void ov94_022401E0 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_022401E0(UnkStruct_ov94_0223FD4C *param0) { param0->unk_BA4 = Strbuf_Init((9 * 2), 62); param0->unk_BAC = Strbuf_Init((90 * 2), 62); @@ -493,7 +491,7 @@ static void ov94_022401E0 (UnkStruct_ov94_0223FD4C * param0) param0->unk_1108 = Heap_AllocFromHeap(62, sizeof(UnkStruct_ov94_0223FD4C_sub2)); } -static void ov94_02240268 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02240268(UnkStruct_ov94_0223FD4C *param0) { Heap_FreeToHeap(param0->unk_1108); Strbuf_Free(param0->unk_BA4); @@ -502,7 +500,7 @@ static void ov94_02240268 (UnkStruct_ov94_0223FD4C * param0) Strbuf_Free(param0->unk_BB0); } -static int ov94_022402A8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022402A8(UnkStruct_ov94_0223FD4C *param0) { if (ScreenWipe_Done()) { param0->unk_2C = 1; @@ -512,41 +510,41 @@ static int ov94_022402A8 (UnkStruct_ov94_0223FD4C * param0) } static const u8 Unk_ov94_02245F54[][4] = { - {0x1F, 0x6, 0x5, 0x1}, - {0x1F, 0x7, 0x0, 0x2}, - {0x1F, 0x8, 0x1, 0x3}, - {0x1F, 0x9, 0x2, 0x4}, - {0x1F, 0xA, 0x3, 0x5}, - {0x1F, 0xB, 0x4, 0x0}, - {0x0, 0xC, 0xB, 0x7}, - {0x1, 0xD, 0x6, 0x8}, - {0x2, 0xE, 0x7, 0x9}, - {0x3, 0xF, 0x8, 0xA}, - {0x4, 0x10, 0x9, 0xB}, - {0x5, 0x11, 0xA, 0x6}, - {0x6, 0x12, 0x11, 0xD}, - {0x7, 0x13, 0xC, 0xE}, - {0x8, 0x14, 0xD, 0xF}, - {0x9, 0x15, 0xE, 0x10}, - {0xA, 0x16, 0xF, 0x11}, - {0xB, 0x17, 0x10, 0xC}, - {0xC, 0x18, 0x17, 0x13}, - {0xD, 0x19, 0x12, 0x14}, - {0xE, 0x1A, 0x13, 0x15}, - {0xF, 0x1B, 0x14, 0x16}, - {0x10, 0x1C, 0x15, 0x17}, - {0x11, 0x1D, 0x16, 0x12}, - {0x12, 0x1F, 0x1E, 0x19}, - {0x13, 0x1F, 0x18, 0x1A}, - {0x14, 0x1F, 0x19, 0x1B}, - {0x15, 0x1F, 0x1A, 0x1C}, - {0x16, 0x1F, 0x1B, 0x1D}, - {0x17, 0x1F, 0x1C, 0x1E}, - {0x1E, 0x1E, 0x1D, 0x18}, - {0x1A, 0x2, 0x63, 0x65} + { 0x1F, 0x6, 0x5, 0x1 }, + { 0x1F, 0x7, 0x0, 0x2 }, + { 0x1F, 0x8, 0x1, 0x3 }, + { 0x1F, 0x9, 0x2, 0x4 }, + { 0x1F, 0xA, 0x3, 0x5 }, + { 0x1F, 0xB, 0x4, 0x0 }, + { 0x0, 0xC, 0xB, 0x7 }, + { 0x1, 0xD, 0x6, 0x8 }, + { 0x2, 0xE, 0x7, 0x9 }, + { 0x3, 0xF, 0x8, 0xA }, + { 0x4, 0x10, 0x9, 0xB }, + { 0x5, 0x11, 0xA, 0x6 }, + { 0x6, 0x12, 0x11, 0xD }, + { 0x7, 0x13, 0xC, 0xE }, + { 0x8, 0x14, 0xD, 0xF }, + { 0x9, 0x15, 0xE, 0x10 }, + { 0xA, 0x16, 0xF, 0x11 }, + { 0xB, 0x17, 0x10, 0xC }, + { 0xC, 0x18, 0x17, 0x13 }, + { 0xD, 0x19, 0x12, 0x14 }, + { 0xE, 0x1A, 0x13, 0x15 }, + { 0xF, 0x1B, 0x14, 0x16 }, + { 0x10, 0x1C, 0x15, 0x17 }, + { 0x11, 0x1D, 0x16, 0x12 }, + { 0x12, 0x1F, 0x1E, 0x19 }, + { 0x13, 0x1F, 0x18, 0x1A }, + { 0x14, 0x1F, 0x19, 0x1B }, + { 0x15, 0x1F, 0x1A, 0x1C }, + { 0x16, 0x1F, 0x1B, 0x1D }, + { 0x17, 0x1F, 0x1C, 0x1E }, + { 0x1E, 0x1E, 0x1D, 0x18 }, + { 0x1A, 0x2, 0x63, 0x65 } }; -static int ov94_022402BC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022402BC(UnkStruct_ov94_0223FD4C *param0) { ov94_022404F0(param0); @@ -596,9 +594,8 @@ static int ov94_022402BC (UnkStruct_ov94_0223FD4C * param0) } else { if (param0->unk_112 != 31) { switch (ov94_022412F4(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112)) { - case 1: - { - BoxPokemon * v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112); + case 1: { + BoxPokemon *v0 = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112); if (ov94_02241384(v0, ¶m0->unk_250[param0->unk_11C].unk_F0)) { if (ov94_0224121C(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112)) { @@ -613,8 +610,7 @@ static int ov94_022402BC (UnkStruct_ov94_0223FD4C * param0) } else { Sound_PlayEffect(1500); } - } - break; + } break; case 2: case 0: Sound_PlayEffect(1500); @@ -628,7 +624,7 @@ static int ov94_022402BC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static void ov94_022404F0 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_022404F0(UnkStruct_ov94_0223FD4C *param0) { int v0 = 0, v1 = 0, v2 = 0; @@ -669,7 +665,7 @@ static void ov94_022404F0 (UnkStruct_ov94_0223FD4C * param0) } } -static int ov94_022405CC (int param0, int param1, int param2) +static int ov94_022405CC(int param0, int param1, int param2) { param0 += param2; @@ -684,7 +680,7 @@ static int ov94_022405CC (int param0, int param1, int param2) return param0; } -static int ov94_022405DC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022405DC(UnkStruct_ov94_0223FD4C *param0) { UnkStruct_02081CF4 v0; @@ -712,9 +708,9 @@ static int ov94_022405DC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240688 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240688(UnkStruct_ov94_0223FD4C *param0) { - BoxPokemon * v0; + BoxPokemon *v0; switch (sub_02001BE0(param0->unk_10D4)) { case 1: @@ -744,7 +740,7 @@ static int ov94_02240688 (UnkStruct_ov94_0223FD4C * param0) int v1 = 0; if (ov94_022411D0(param0->unk_110)) { - Pokemon * v2; + Pokemon *v2; v2 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112); @@ -775,7 +771,7 @@ static int ov94_02240688 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240830 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240830(UnkStruct_ov94_0223FD4C *param0) { UnkStruct_02081CF4 v0; @@ -804,9 +800,9 @@ static int ov94_02240830 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022408E8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022408E8(UnkStruct_ov94_0223FD4C *param0) { - BoxPokemon * v0; + BoxPokemon *v0; switch (sub_02001BE0(param0->unk_10D4)) { case 1: @@ -836,7 +832,7 @@ static int ov94_022408E8 (UnkStruct_ov94_0223FD4C * param0) int v1 = 0; if (ov94_022411D0(param0->unk_110)) { - Pokemon * v2; + Pokemon *v2; v2 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112); @@ -864,7 +860,7 @@ static int ov94_022408E8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240A6C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240A6C(UnkStruct_ov94_0223FD4C *param0) { if ((param0->unk_18 == 0) || (param0->unk_18 == 8)) { sub_0200F174(0, 0, 0, 0x0, 6, 1, 62); @@ -878,7 +874,7 @@ static int ov94_02240A6C (UnkStruct_ov94_0223FD4C * param0) return 4; } -static int ov94_02240AC4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240AC4(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 15, ((((((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13) + 27 * 2) + 2 * 19) + 6 * 2) + (5 * 2) * 6)); param0->unk_2C = 6; @@ -886,7 +882,7 @@ static int ov94_02240AC4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240AE8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240AE8(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -902,7 +898,7 @@ static int ov94_02240AE8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240B20 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240B20(UnkStruct_ov94_0223FD4C *param0) { ov94_02240D58(param0, 25, 1, 0, 0xf0f, 1); ov94_0223C3F4(param0, 3, 12); @@ -910,7 +906,7 @@ static int ov94_02240B20 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240B4C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240B4C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 13, ((((((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13) + 27 * 2) + 2 * 19) + 6 * 2) + (5 * 2) * 6)); param0->unk_2C = 13; @@ -918,7 +914,7 @@ static int ov94_02240B4C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240B70 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240B70(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -934,9 +930,9 @@ static int ov94_02240B70 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240BB0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240BB0(UnkStruct_ov94_0223FD4C *param0) { - Pokemon * v0; + Pokemon *v0; v0 = (Pokemon *)param0->unk_250[param0->unk_11C].unk_00.unk_00; @@ -960,7 +956,7 @@ static int ov94_02240BB0 (UnkStruct_ov94_0223FD4C * param0) return 1; } -static int ov94_02240C58 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240C58(UnkStruct_ov94_0223FD4C *param0) { ov94_02240D58(param0, 25, 1, 0, 0xf0f, 1); ov94_0223C3F4(param0, 3, 15); @@ -968,7 +964,7 @@ static int ov94_02240C58 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240C84 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240C84(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 13, ((((((((1 + (18 + 12)) + 9) + 28 * 2) + 13 * 13) + 27 * 2) + 2 * 19) + 6 * 2) + (5 * 2) * 6)); param0->unk_2C = 16; @@ -976,7 +972,7 @@ static int ov94_02240C84 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240CA8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240CA8(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -994,7 +990,7 @@ static int ov94_02240CA8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240D08 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240D08(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_2C = param0->unk_30; @@ -1003,7 +999,7 @@ static int ov94_02240D08 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02240D28 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02240D28(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { sub_0200E084(¶m0->unk_109C, 0); @@ -1013,10 +1009,10 @@ static int ov94_02240D28 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static void ov94_02240D58 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, int param5) +static void ov94_02240D58(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4, int param5) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v1 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); StringTemplate_Format(param0->unk_B8C, param0->unk_BAC, v1); @@ -1035,9 +1031,9 @@ static void ov94_02240D58 (UnkStruct_ov94_0223FD4C * param0, int param1, int par Strbuf_Free(v1); } -void * ov94_02240DD0 (NARC * param0, u32 param1, NNSG2dCharacterData ** param2, u32 param3) +void *ov94_02240DD0(NARC *param0, u32 param1, NNSG2dCharacterData **param2, u32 param3) { - void * v0 = NARC_AllocAndReadWholeMember(param0, param1, param3); + void *v0 = NARC_AllocAndReadWholeMember(param0, param1, param3); if (v0 != NULL) { if (NNS_G2dGetUnpackedBGCharacterData(v0, param2) == 0) { @@ -1049,11 +1045,11 @@ void * ov94_02240DD0 (NARC * param0, u32 param1, NNSG2dCharacterData ** param2, return v0; } -static void ov94_02240DF8 (int param0, int param1, int param2, int param3, GraphicElementData * param4, NARC * param5, UnkStruct_ov94_02240FA0 * param6) +static void ov94_02240DF8(int param0, int param1, int param2, int param3, GraphicElementData *param4, NARC *param5, UnkStruct_ov94_02240FA0 *param6) { - u8 * v0; - u8 * v1; - NNSG2dCharacterData * v2; + u8 *v0; + u8 *v1; + NNSG2dCharacterData *v2; v1 = ov94_02240DD0(param5, PokeIconSpriteIndex(param0, param2, param1), &v2, 62); @@ -1066,16 +1062,16 @@ static void ov94_02240DF8 (int param0, int param1, int param2, int param3, Graph Heap_FreeToHeap(v1); } -static void ov94_02240E50 (BoxPokemon * param0, UnkStruct_ov94_0223BA88_sub2 * param1) +static void ov94_02240E50(BoxPokemon *param0, UnkStruct_ov94_0223BA88_sub2 *param1) { param1->unk_03 = BoxPokemon_GetLevel(param0); } -static void ov94_02240E5C (void * param0) +static void ov94_02240E5C(void *param0) { - UnkStruct_ov94_0223FD4C * v0 = param0; + UnkStruct_ov94_0223FD4C *v0 = param0; int v1; - UnkStruct_ov94_02240FA0 * v2 = v0->unk_1114; + UnkStruct_ov94_02240FA0 *v2 = v0->unk_1114; for (v1 = 0; v1 < 30; v1++, v2++) { if (v2->unk_08) { @@ -1089,7 +1085,7 @@ static void ov94_02240E5C (void * param0) Heap_FreeToHeap(v0->unk_1114); } -static void ov94_02240EAC (BoxPokemon * param0, GraphicElementData * param1, GraphicElementData * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7) +static void ov94_02240EAC(BoxPokemon *param0, GraphicElementData *param1, GraphicElementData *param2, u16 *param3, int param4, NARC *param5, UnkStruct_ov94_0223BA88_sub2 *param6, UnkStruct_ov94_02240FA0 *param7) { int v0, v1, v2, v3; @@ -1134,14 +1130,14 @@ static void ov94_02240EAC (BoxPokemon * param0, GraphicElementData * param1, Gra } } -static void ov94_02240FA0 (UnkStruct_ov94_0223FD4C * param0, int param1) +static void ov94_02240FA0(UnkStruct_ov94_0223FD4C *param0, int param1) { u16 v0[30], v1, v2; - Pokemon * v3; - BoxPokemon * v4; - PCBoxes * v5 = param0->unk_00->unk_0C; - NARC * v6; - UnkStruct_ov94_02240FA0 * v7; + Pokemon *v3; + BoxPokemon *v4; + PCBoxes *v5 = param0->unk_00->unk_0C; + NARC *v6; + UnkStruct_ov94_02240FA0 *v7; param0->unk_1114 = v7 = Heap_AllocFromHeapAtEnd(3, sizeof(UnkStruct_ov94_02240FA0) * 30); v6 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 62); @@ -1204,7 +1200,7 @@ static void ov94_02240FA0 (UnkStruct_ov94_0223FD4C * param0, int param1) param0->unk_1118 = ov94_02240E5C; } -int ov94_022411D0 (int param0) +int ov94_022411D0(int param0) { if (param0 == 18) { return 1; @@ -1213,7 +1209,7 @@ int ov94_022411D0 (int param0) } } -BoxPokemon * ov94_022411DC (Party * param0, PCBoxes * param1, int param2, int param3) +BoxPokemon *ov94_022411DC(Party *param0, PCBoxes *param1, int param2, int param3) { if (ov94_022411D0(param2)) { if (param3 > (Party_GetCurrentCount(param0) - 1)) { @@ -1226,7 +1222,7 @@ BoxPokemon * ov94_022411DC (Party * param0, PCBoxes * param1, int param2, int pa return sub_02079C9C(param1, param2, param3); } -static int ov94_0224121C (Party * param0, PCBoxes * param1, int param2, int param3) +static int ov94_0224121C(Party *param0, PCBoxes *param1, int param2, int param3) { if (ov94_022411D0(param2)) { if (Party_GetCurrentCount(param0) < 2) { @@ -1250,7 +1246,7 @@ static const u16 Unk_ov94_02245E34[] = { 0x34 }; -static int ov94_0224123C (BoxPokemon * param0) +static int ov94_0224123C(BoxPokemon *param0) { int v0, v1 = 0, v2; @@ -1269,7 +1265,7 @@ static int ov94_0224123C (BoxPokemon * param0) return 0; } -static int ov94_02241278 (BoxPokemon * param0) +static int ov94_02241278(BoxPokemon *param0) { int v0; int v1, v2; @@ -1295,7 +1291,7 @@ static int ov94_02241278 (BoxPokemon * param0) return 0; } -static int ov94_022412C8 (BoxPokemon * param0) +static int ov94_022412C8(BoxPokemon *param0) { int v0; int v1; @@ -1316,9 +1312,9 @@ static int ov94_022412C8 (BoxPokemon * param0) return 0; } -static int ov94_022412F4 (Party * param0, PCBoxes * param1, int param2, int param3) +static int ov94_022412F4(Party *param0, PCBoxes *param1, int param2, int param3) { - BoxPokemon * v0 = ov94_022411DC(param0, param1, param2, param3); + BoxPokemon *v0 = ov94_022411DC(param0, param1, param2, param3); if (v0 == NULL) { return 0; @@ -1335,7 +1331,7 @@ static int ov94_022412F4 (Party * param0, PCBoxes * param1, int param2, int para return 1; } -static int ov94_02241328 (UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_ov94_0223BA88_sub3 * param1) +static int ov94_02241328(UnkStruct_ov94_0223BA88_sub2 *param0, UnkStruct_ov94_0223BA88_sub3 *param1) { if (param0->unk_00 != param1->unk_00) { return 0; @@ -1366,7 +1362,7 @@ static int ov94_02241328 (UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_ov94_ return 1; } -static int ov94_02241384 (BoxPokemon * param0, UnkStruct_ov94_0223BA88_sub3 * param1) +static int ov94_02241384(BoxPokemon *param0, UnkStruct_ov94_0223BA88_sub3 *param1) { UnkStruct_ov94_0223BA88_sub2 v0; @@ -1377,11 +1373,11 @@ static int ov94_02241384 (BoxPokemon * param0, UnkStruct_ov94_0223BA88_sub3 * pa return ov94_02241328(&v0, param1); } -static void ov94_022413BC (UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1) +static void ov94_022413BC(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1) { UnkStruct_ov94_0223BA88_sub2 v0; UnkStruct_ov94_0223BA88_sub3 v1; - BoxPokemon * v2; + BoxPokemon *v2; v0.unk_00 = BoxPokemon_GetValue(param1->unk_114, MON_DATA_SPECIES, NULL); v0.unk_02 = BoxPokemon_GetValue(param1->unk_114, MON_DATA_GENDER, NULL) + 1; @@ -1401,7 +1397,7 @@ static void ov94_022413BC (UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223 param0->unk_F0 = v1; } -static void ov94_02241464 (UnkStruct_ov94_0223BA88_sub2 * param0, GraphicElementData ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3) +static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 *param0, GraphicElementData **param1, UnkStruct_ov94_0223BA88_sub3 *param2, UnkStruct_ov94_02240FA0 *param3) { int v0, v1; @@ -1414,7 +1410,7 @@ static void ov94_02241464 (UnkStruct_ov94_0223BA88_sub2 * param0, GraphicElement } } -BOOL ov94_02241498 (Pokemon * param0) +BOOL ov94_02241498(Pokemon *param0) { int v0 = Pokemon_GetValue(param0, MON_DATA_HELD_ITEM, NULL); diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index 586ab52631..5e1a065b07 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -1,25 +1,24 @@ +#include "overlay094/ov94_022414B8.h" + +#include #include #include -#include - -#include "core_sys.h" #include "constants/species.h" +#include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0200112C_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "struct_decls/pokedexdata_decl.h" -#include "pokemon.h" - -#include "overlay094/const_ov94_02245FD8.h" -#include "overlay094/const_ov94_02245FD4.h" - #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay084/struct_ov84_02240FA8.h" +#include "overlay094/const_ov94_02245FD4.h" +#include "overlay094/const_ov94_02245FD8.h" +#include "overlay094/ov94_0223BCB0.h" +#include "overlay094/ov94_0223FB48.h" +#include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223BA88.h" #include "overlay094/struct_ov94_0223BA88_sub2.h" #include "overlay094/struct_ov94_0223BA88_sub3.h" @@ -28,32 +27,29 @@ #include "overlay094/struct_ov94_02242AAC.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "game_options.h" +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_020021B0.h" #include "unk_02002B7C.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "trainer_info.h" #include "unk_0202631C.h" -#include "game_options.h" #include "unk_0202C858.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_0223FB48.h" -#include "overlay094/ov94_022414B8.h" -#include "overlay094/ov94_02244950.h" typedef struct { int unk_00; @@ -61,37 +57,37 @@ typedef struct { s16 unk_06; } UnkStruct_ov94_022460AC; -static void ov94_0224158C(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4); -static void ov94_022415F8(BGL * param0); -static void ov94_022416E0(BGL * param0); -static void ov94_0224170C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_022417A0(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02241880(UnkStruct_ov94_0223FD4C * param0); -static void ov94_022418B8(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02241920(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224195C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241990(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241A1C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241A58(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241B2C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241BAC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022420E4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02242138(UnkStruct_ov94_0223FD4C * param0); -static void ov94_022423FC(MessageLoader * param0, StringTemplate * param1, Window param2[], BoxPokemon * param3, UnkStruct_ov94_0223BA88_sub2 * param4); -static int ov94_02241DA0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241D64(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241D08(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241E8C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241F28(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02241EE8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02242040(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02242068(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224208C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02242668(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1); -static int ov94_02242718(ResourceMetadata ** param0, MessageLoader * param1, MessageLoader * param2, u16 * param3, u8 * param4, int param5, int param6, PokedexData * param7); +static void ov94_0224158C(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4); +static void ov94_022415F8(BGL *param0); +static void ov94_022416E0(BGL *param0); +static void ov94_0224170C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_022417A0(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02241880(UnkStruct_ov94_0223FD4C *param0); +static void ov94_022418B8(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02241920(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0224195C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241990(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241A1C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241A58(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241B2C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241BAC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022420E4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02242138(UnkStruct_ov94_0223FD4C *param0); +static void ov94_022423FC(MessageLoader *param0, StringTemplate *param1, Window param2[], BoxPokemon *param3, UnkStruct_ov94_0223BA88_sub2 *param4); +static int ov94_02241DA0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241D64(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241D08(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241E8C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241F28(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02241EE8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02242040(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02242068(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0224208C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02242668(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1); +static int ov94_02242718(ResourceMetadata **param0, MessageLoader *param1, MessageLoader *param2, u16 *param3, u8 *param4, int param5, int param6, PokedexData *param7); static u32 ov94_022421E8(int param0, u32 param1); -static int (* Unk_ov94_0224695C[])(UnkStruct_ov94_0223FD4C *) = { +static int (*Unk_ov94_0224695C[])(UnkStruct_ov94_0223FD4C *) = { ov94_0224195C, ov94_02241990, ov94_022420E4, @@ -112,43 +108,43 @@ static int (* Unk_ov94_0224695C[])(UnkStruct_ov94_0223FD4C *) = { }; static const u16 Unk_ov94_02245FE8[6][2] = { - {0x1, 0x4}, - {0x3, 0x6}, - {0x1, 0x8}, - {0x1, 0xD}, - {0x3, 0xF}, - {0x1, 0x11} + { 0x1, 0x4 }, + { 0x3, 0x6 }, + { 0x1, 0x8 }, + { 0x1, 0xD }, + { 0x3, 0xF }, + { 0x1, 0x11 } }; static const UnkStruct_ov94_022460AC Unk_ov94_0224610C[] = { - {0x7A, 0x0, 0x0}, - {0x7B, 0x0, 0x9}, - {0x7C, 0xA, 0x0}, - {0x7D, 0x14, 0x0}, - {0x7E, 0x1E, 0x0}, - {0x7F, 0x28, 0x0}, - {0x80, 0x32, 0x0}, - {0x81, 0x3C, 0x0}, - {0x82, 0x46, 0x0}, - {0x83, 0x50, 0x0}, - {0x84, 0x5A, 0x0}, - {0x85, 0x64, 0x64}, - {0x86, 0x0, 0x0} + { 0x7A, 0x0, 0x0 }, + { 0x7B, 0x0, 0x9 }, + { 0x7C, 0xA, 0x0 }, + { 0x7D, 0x14, 0x0 }, + { 0x7E, 0x1E, 0x0 }, + { 0x7F, 0x28, 0x0 }, + { 0x80, 0x32, 0x0 }, + { 0x81, 0x3C, 0x0 }, + { 0x82, 0x46, 0x0 }, + { 0x83, 0x50, 0x0 }, + { 0x84, 0x5A, 0x0 }, + { 0x85, 0x64, 0x64 }, + { 0x86, 0x0, 0x0 } }; static const UnkStruct_ov94_022460AC Unk_ov94_022460AC[] = { - {0x99, 0x0, 0x0}, - {0x9A, 0x1, 0xA}, - {0x9B, 0xB, 0x14}, - {0x9C, 0x15, 0x1E}, - {0x9D, 0x1F, 0x28}, - {0x9E, 0x29, 0x32}, - {0x9F, 0x33, 0x3C}, - {0xA0, 0x3D, 0x46}, - {0xA1, 0x47, 0x50}, - {0xA2, 0x51, 0x5A}, - {0xA3, 0x5B, 0x64}, - {0xA4, 0x0, 0x0} + { 0x99, 0x0, 0x0 }, + { 0x9A, 0x1, 0xA }, + { 0x9B, 0xB, 0x14 }, + { 0x9C, 0x15, 0x1E }, + { 0x9D, 0x1F, 0x28 }, + { 0x9E, 0x29, 0x32 }, + { 0x9F, 0x33, 0x3C }, + { 0xA0, 0x3D, 0x46 }, + { 0xA1, 0x47, 0x50 }, + { 0xA2, 0x51, 0x5A }, + { 0xA3, 0x5B, 0x64 }, + { 0xA4, 0x0, 0x0 } }; __attribute__((aligned(4))) static const u16 Unk_ov94_02246174[] = { @@ -286,7 +282,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov94_02246174[] = { const u32 Unk_ov94_02245FD4 = NELEMS(Unk_ov94_02246174); -int ov94_022414B8 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_022414B8(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_022418B8(param0); ov94_022415F8(param0->unk_04); @@ -304,7 +300,7 @@ int ov94_022414B8 (UnkStruct_ov94_0223FD4C * param0, int param1) return 2; } -int ov94_02241548 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_02241548(UnkStruct_ov94_0223FD4C *param0, int param1) { int v0; @@ -314,7 +310,7 @@ int ov94_02241548 (UnkStruct_ov94_0223FD4C * param0, int param1) return v0; } -int ov94_02241568 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_02241568(UnkStruct_ov94_0223FD4C *param0, int param1) { sub_02039794(); @@ -326,9 +322,9 @@ int ov94_02241568 (UnkStruct_ov94_0223FD4C * param0, int param1) return 1; } -static void ov94_0224158C (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) +static void ov94_0224158C(UnkStruct_ov94_0223FD4C *param0, int param1, int param2, int param3, u16 param4) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); @@ -341,7 +337,7 @@ static void ov94_0224158C (UnkStruct_ov94_0223FD4C * param0, int param1, int par Strbuf_Free(v0); } -static void ov94_022415F8 (BGL * param0) +static void ov94_022415F8(BGL *param0) { { UnkStruct_ov97_0222DB78 v0 = { @@ -449,7 +445,7 @@ static void ov94_022415F8 (BGL * param0) sub_02019690(4, 32, 0, 62); } -static void ov94_022416E0 (BGL * param0) +static void ov94_022416E0(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -458,9 +454,9 @@ static void ov94_022416E0 (BGL * param0) sub_02019044(param0, 0); } -static void ov94_0224170C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0224170C(UnkStruct_ov94_0223FD4C *param0) { - BGL * v0 = param0->unk_04; + BGL *v0 = param0->unk_04; sub_02006E84(104, 1, 0, 0, 16 * 3 * 2, 62); sub_02002E98(0, 13 * 0x20, 62); @@ -470,7 +466,7 @@ static void ov94_0224170C (UnkStruct_ov94_0223FD4C * param0) sub_02006E60(104, 23, v0, 1, 0, 32 * 24 * 2, 1, 62); } -static void ov94_022417A0 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_022417A0(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -489,7 +485,7 @@ static void ov94_022417A0 (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_02241880 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02241880(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -501,7 +497,7 @@ static void ov94_02241880 (UnkStruct_ov94_0223FD4C * param0) BGL_DeleteWindow(¶m0->unk_F7C); } -static void ov94_022418B8 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_022418B8(UnkStruct_ov94_0223FD4C *param0) { param0->unk_BAC = Strbuf_Init((90 * 2), 62); param0->unk_BB0 = MessageLoader_GetNewStrbuf(param0->unk_B90, 90); @@ -515,7 +511,7 @@ static void ov94_022418B8 (UnkStruct_ov94_0223FD4C * param0) ov94_02242AAC(¶m0->unk_111C); } -static void ov94_02241920 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02241920(UnkStruct_ov94_0223FD4C *param0) { Heap_FreeToHeap(param0->unk_10E4->unk_14); Heap_FreeToHeap(param0->unk_10E4->unk_18); @@ -524,7 +520,7 @@ static void ov94_02241920 (UnkStruct_ov94_0223FD4C * param0) Strbuf_Free(param0->unk_BB0); } -static int ov94_0224195C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0224195C(UnkStruct_ov94_0223FD4C *param0) { if (ScreenWipe_Done()) { ov94_0224158C(param0, 9, 1, 0, 0xf0f); @@ -534,7 +530,7 @@ static int ov94_0224195C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02241990 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241990(UnkStruct_ov94_0223FD4C *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_B) { ov94_0223C4C0(param0, 5, 5); @@ -552,7 +548,7 @@ static int ov94_02241990 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02241A1C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241A1C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D8 = ov94_022426A8(param0, ¶m0->unk_10CC, ¶m0->unk_F9C[0], param0->unk_B90); param0->unk_108 = 0xffff; @@ -561,7 +557,7 @@ static int ov94_02241A1C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02241A58 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241A58(UnkStruct_ov94_0223FD4C *param0) { switch (ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108)) { case 1: @@ -594,7 +590,7 @@ static int ov94_02241A58 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02241B2C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241B2C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D8 = ov94_022427C0(param0, ¶m0->unk_10CC, ¶m0->unk_F9C[1], param0->unk_B90, param0->unk_B94, param0->unk_10E4, param0->unk_00->unk_10); param0->unk_108 = 0xffff; @@ -603,7 +599,7 @@ static int ov94_02241B2C (UnkStruct_ov94_0223FD4C * param0) return 3; } -int ov94_02241B80 (UnkStruct_ov94_0223BA88_sub3 * param0, int param1) +int ov94_02241B80(UnkStruct_ov94_0223BA88_sub3 *param0, int param1) { switch (param1) { case 0: @@ -623,12 +619,12 @@ int ov94_02241B80 (UnkStruct_ov94_0223BA88_sub3 * param0, int param1) return 0; } -static int ov94_02241BAC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241BAC(UnkStruct_ov94_0223FD4C *param0) { u32 v0; int v1; - switch ((v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108))) { + switch (v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108)) { case 0xffffffff: break; case 0xfffffffe: @@ -668,18 +664,18 @@ static int ov94_02241BAC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02241D08 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241D08(UnkStruct_ov94_0223FD4C *param0) { ov94_0224158C(param0, 10, 1, 0, 0xf0f); ov94_0223C3F4(param0, 16, 8); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 10, 10, 8, 13, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6))); + BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 21, 10, 10, 8, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6)); BGL_FillWindow(¶m0->unk_F9C[0], 0x0); return 3; } -static int ov94_02241D64 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241D64(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D8 = ov94_02242840(¶m0->unk_10CC, ¶m0->unk_F9C[0], param0->unk_B90); param0->unk_108 = 0xffff; @@ -688,11 +684,11 @@ static int ov94_02241D64 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02241DA0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241DA0(UnkStruct_ov94_0223FD4C *param0) { u32 v0; - switch ((v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108))) { + switch (v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108)) { case 0xfffffffe: sub_02001384(param0->unk_10D8, NULL, NULL); sub_02013A3C(param0->unk_10CC); @@ -720,18 +716,18 @@ static int ov94_02241DA0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02241E8C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241E8C(UnkStruct_ov94_0223FD4C *param0) { ov94_0224158C(param0, 11, 1, 0, 0xf0f); ov94_0223C3F4(param0, 16, 11); - BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 16, 13, 13, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6))); + BGL_AddWindow(param0->unk_04, ¶m0->unk_F9C[0], 0, 15, 5, 16, 13, 13, (((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6)); BGL_FillWindow(¶m0->unk_F9C[0], 0x0); return 3; } -static int ov94_02241EE8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241EE8(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10D8 = ov94_022428B0(¶m0->unk_10CC, ¶m0->unk_F9C[0], param0->unk_B90, 0); param0->unk_108 = 0xffff; @@ -740,11 +736,11 @@ static int ov94_02241EE8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02241F28 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02241F28(UnkStruct_ov94_0223FD4C *param0) { u32 v0; - switch ((v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108))) { + switch (v0 = ov94_02242A6C(param0->unk_10D8, ¶m0->unk_108)) { case 0xffffffff: break; case 0xfffffffe: @@ -777,7 +773,7 @@ static int ov94_02241F28 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02242040 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02242040(UnkStruct_ov94_0223FD4C *param0) { ov94_0224158C(param0, 23, 1, 0, 0xf0f); ov94_0223C3F4(param0, 16, 14); @@ -785,15 +781,15 @@ static int ov94_02242040 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02242068 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02242068(UnkStruct_ov94_0223FD4C *param0) { - param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 15, (((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6)) + 16 * 13)); + param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 15, ((((((1 + (18 + 12)) + 9) + 28 * 2) + 27 * 2) + 11 * 2 * 6) + 16 * 13)); param0->unk_2C = 15; return 3; } -static int ov94_0224208C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0224208C(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -812,7 +808,7 @@ static int ov94_0224208C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022420E4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022420E4(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_18 == 0) { sub_0200F174(0, 0, 0, 0x0, 6, 1, 62); @@ -826,7 +822,7 @@ static int ov94_022420E4 (UnkStruct_ov94_0223FD4C * param0) return 4; } -static int ov94_02242138 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02242138(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_2C = param0->unk_30; @@ -840,9 +836,9 @@ static u32 Unk_ov94_02246920[] = { (u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)) }; -void ov94_02242158 (Window * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5) +void ov94_02242158(Window *param0, MessageLoader *param1, int param2, int param3, int param4, u32 param5) { - Strbuf* v0; + Strbuf *v0; if (param2 != 0) { v0 = MessageLoader_GetNewStrbuf(param1, param2); @@ -851,9 +847,9 @@ void ov94_02242158 (Window * param0, MessageLoader * param1, int param2, int par } } -void ov94_0224218C (Window * param0, MessageLoader * param1, MessageLoader * param2, int param3, int param4, int param5, u32 param6) +void ov94_0224218C(Window *param0, MessageLoader *param1, MessageLoader *param2, int param3, int param4, int param5, u32 param6) { - Strbuf* v0; + Strbuf *v0; if (param3 != 0) { v0 = MessageLoader_GetNewStrbuf(param1, param3); @@ -866,7 +862,7 @@ void ov94_0224218C (Window * param0, MessageLoader * param1, MessageLoader * par } } -static u32 ov94_022421E8 (int param0, u32 param1) +static u32 ov94_022421E8(int param0, u32 param1) { if (param0 == 1) { return Unk_ov94_02246920[0]; @@ -884,9 +880,9 @@ const int Unk_ov94_02245FD8[] = { 0x76 }; -void ov94_02242204 (Window * param0, MessageLoader * param1, int param2, int param3, int param4, int param5, u32 param6) +void ov94_02242204(Window *param0, MessageLoader *param1, int param2, int param3, int param4, int param5, u32 param6) { - Strbuf* v0; + Strbuf *v0; if ((param3 == 0) && (param2 == 3)) { return; @@ -903,11 +899,11 @@ void ov94_02242204 (Window * param0, MessageLoader * param1, int param2, int par Strbuf_Free(v0); } -void ov94_0224226C (Window * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5, int param6, int param7) +void ov94_0224226C(Window *param0, MessageLoader *param1, int param2, int param3, int param4, u32 param5, int param6, int param7) { - Strbuf * v0; + Strbuf *v0; if (param2 != -1) { - const UnkStruct_ov94_022460AC * v1; + const UnkStruct_ov94_022460AC *v1; if (param6 == 0) { v1 = Unk_ov94_0224610C; } else { @@ -919,14 +915,14 @@ void ov94_0224226C (Window * param0, MessageLoader * param1, int param2, int par } } -void ov94_022422B8 (Window * param0, MessageLoader * param1, int param2, int param3, int param4, u32 param5, int param6) +void ov94_022422B8(Window *param0, MessageLoader *param1, int param2, int param3, int param4, u32 param5, int param6) { ov94_0224226C(param0, param1, param2, param3, param4, param5, param6, 0); } -void ov94_022422D4 (MessageLoader * param0, MessageLoader * param1, StringTemplate * param2, Window param3[], int param4, int param5, int param6) +void ov94_022422D4(MessageLoader *param0, MessageLoader *param1, StringTemplate *param2, Window param3[], int param4, int param5, int param6) { - Strbuf* v0; + Strbuf *v0; int v1; v0 = MessageLoader_GetNewStrbuf(param0, 97); @@ -948,9 +944,9 @@ void ov94_022422D4 (MessageLoader * param0, MessageLoader * param1, StringTempla Strbuf_Free(v0); } -void ov94_02242368 (MessageLoader * param0, MessageLoader * param1, StringTemplate * param2, Window param3[], int param4, int param5, int param6) +void ov94_02242368(MessageLoader *param0, MessageLoader *param1, StringTemplate *param2, Window param3[], int param4, int param5, int param6) { - Strbuf* v0; + Strbuf *v0; int v1; v0 = MessageLoader_GetNewStrbuf(param0, 97); @@ -972,11 +968,11 @@ void ov94_02242368 (MessageLoader * param0, MessageLoader * param1, StringTempla Strbuf_Free(v0); } -static void ov94_022423FC (MessageLoader * param0, StringTemplate * param1, Window param2[], BoxPokemon * param3, UnkStruct_ov94_0223BA88_sub2 * param4) +static void ov94_022423FC(MessageLoader *param0, StringTemplate *param1, Window param2[], BoxPokemon *param3, UnkStruct_ov94_0223BA88_sub2 *param4) { - Strbuf* v0, * v1; - Strbuf* v2 = Strbuf_Init(10 + 1, 62); - Strbuf* v3 = Strbuf_Init(10 + 1, 62); + Strbuf *v0, *v1; + Strbuf *v2 = Strbuf_Init(10 + 1, 62); + Strbuf *v3 = Strbuf_Init(10 + 1, 62); int v4, v5, v6; BoxPokemon_GetValue(param3, MON_DATA_NICKNAME_STRBUF, v2); @@ -1014,10 +1010,10 @@ static void ov94_022423FC (MessageLoader * param0, StringTemplate * param1, Wind Strbuf_Free(v0); } -u16 * ov94_02242524 (int param0, int param1, int * param2) +u16 *ov94_02242524(int param0, int param1, int *param2) { u32 v0; - u16 * v1; + u16 *v1; v1 = sub_02007068(75, 13, 0, param0, 0, &v0); *param2 = v0 / (sizeof(u16)); @@ -1025,10 +1021,10 @@ u16 * ov94_02242524 (int param0, int param1, int * param2) return v1; } -u8 * ov94_02242548 (int param0) +u8 *ov94_02242548(int param0) { u32 v0, v1, v2; - u16 * v3; + u16 *v3; u8 *v4 = Heap_AllocFromHeap(62, NATIONAL_DEX_COUNT + 1); MI_CpuClearFast(v4, NATIONAL_DEX_COUNT + 1); @@ -1047,9 +1043,9 @@ u8 * ov94_02242548 (int param0) return v4; } -void ov94_022425A8 (UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1) +void ov94_022425A8(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1) { - u16 * v0; + u16 *v0; if (ov94_022411D0(param1->unk_110)) { Pokemon_SetShayminForm((Pokemon *)(param1->unk_114), 0); @@ -1071,7 +1067,7 @@ void ov94_022425A8 (UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param0->unk_123 = GAME_LANGUAGE; } -static void ov94_02242668 (UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1) +static void ov94_02242668(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD4C *param1) { ov94_022425A8(param0, param1); @@ -1101,7 +1097,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov94_0224608C = { NULL }; -BmpList * ov94_022426A8 (UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3) +BmpList *ov94_022426A8(UnkStruct_ov94_0223FD4C *param0, ResourceMetadata **param1, Window *param2, MessageLoader *param3) { UnkStruct_ov84_02240FA8 v0; int v1; @@ -1134,7 +1130,7 @@ static u16 Unk_ov94_02246928[] = { 0x1ED }; -static int ov94_02242718 (ResourceMetadata ** param0, MessageLoader * param1, MessageLoader * param2, u16 * param3, u8 * param4, int param5, int param6, PokedexData * param7) +static int ov94_02242718(ResourceMetadata **param0, MessageLoader *param1, MessageLoader *param2, u16 *param3, u8 *param4, int param5, int param6, PokedexData *param7) { int v0, v1, v2 = 0; int v3 = Unk_ov94_02246928[param6 + 1] - Unk_ov94_02246928[param6]; @@ -1177,7 +1173,7 @@ static int ov94_02242718 (ResourceMetadata ** param0, MessageLoader * param1, Me return v2 + 1; } -BmpList * ov94_022427C0 (UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, PokedexData * param6) +BmpList *ov94_022427C0(UnkStruct_ov94_0223FD4C *param0, ResourceMetadata **param1, Window *param2, MessageLoader *param3, MessageLoader *param4, UnkStruct_ov94_0223FD4C_sub3 *param5, PokedexData *param6) { UnkStruct_ov84_02240FA8 v0; int v1, v2, v3; @@ -1198,13 +1194,13 @@ BmpList * ov94_022427C0 (UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** p } static Unk_ov94_0224693C[][2] = { - {0x76, 0x2}, - {0x77, 0x0}, - {0x78, 0x1}, - {0x79, 0xFFFFFFFE} + { 0x76, 0x2 }, + { 0x77, 0x0 }, + { 0x78, 0x1 }, + { 0x79, 0xFFFFFFFE } }; -BmpList * ov94_02242840 (ResourceMetadata ** param0, Window * param1, MessageLoader * param2) +BmpList *ov94_02242840(ResourceMetadata **param0, Window *param1, MessageLoader *param2) { UnkStruct_ov84_02240FA8 v0; int v1; @@ -1225,11 +1221,11 @@ BmpList * ov94_02242840 (ResourceMetadata ** param0, Window * param1, MessageLoa return sub_0200112C(&v0, 0, 0, 62); } -BmpList * ov94_022428B0 (ResourceMetadata ** param0, Window * param1, MessageLoader * param2, int param3) +BmpList *ov94_022428B0(ResourceMetadata **param0, Window *param1, MessageLoader *param2, int param3) { UnkStruct_ov84_02240FA8 v0; int v1; - const UnkStruct_ov94_022460AC * v2; + const UnkStruct_ov94_022460AC *v2; int v3; if (param3 == 0) { @@ -1256,9 +1252,9 @@ BmpList * ov94_022428B0 (ResourceMetadata ** param0, Window * param1, MessageLoa return sub_0200112C(&v0, 0, 0, 62); } -void ov94_02242934 (UnkStruct_ov94_0223BA88_sub3 * param0, int param1, int param2) +void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 *param0, int param1, int param2) { - const UnkStruct_ov94_022460AC * v0; + const UnkStruct_ov94_022460AC *v0; if (param2 == 0) { v0 = Unk_ov94_0224610C; @@ -1272,11 +1268,11 @@ void ov94_02242934 (UnkStruct_ov94_0223BA88_sub3 * param0, int param1, int param param0->unk_04 = v0[param1].unk_06; } -int ov94_02242970 (int param0, int param1, int param2) +int ov94_02242970(int param0, int param1, int param2) { int v0; int v1; - const UnkStruct_ov94_022460AC * v2; + const UnkStruct_ov94_022460AC *v2; if (param2 == 0) { v2 = Unk_ov94_0224610C; @@ -1295,7 +1291,7 @@ int ov94_02242970 (int param0, int param1, int param2) return 0; } -BmpList * ov94_022429B4 (ResourceMetadata ** param0, Window * param1, MessageLoader * param2, MessageLoader * param3) +BmpList *ov94_022429B4(ResourceMetadata **param0, Window *param1, MessageLoader *param2, MessageLoader *param3) { UnkStruct_ov84_02240FA8 v0; int v1; @@ -1321,7 +1317,7 @@ BmpList * ov94_022429B4 (ResourceMetadata ** param0, Window * param1, MessageLoa return sub_0200112C(&v0, 0, 0, 62); } -void ov94_02242A44 (UnkStruct_ov94_0223FD4C * param0, int param1) +void ov94_02242A44(UnkStruct_ov94_0223FD4C *param0, int param1) { if (param1 == 0) { param0->unk_11B0 = 0; @@ -1330,7 +1326,7 @@ void ov94_02242A44 (UnkStruct_ov94_0223FD4C * param0, int param1) } } -u32 ov94_02242A6C (BmpList * param0, u16 * param1) +u32 ov94_02242A6C(BmpList *param0, u16 *param1) { u16 v0; u32 v1 = sub_02001288(param0); @@ -1348,7 +1344,7 @@ u32 ov94_02242A6C (BmpList * param0, u16 * param1) return v1; } -void ov94_02242AAC (UnkStruct_ov94_02242AAC * param0) +void ov94_02242AAC(UnkStruct_ov94_02242AAC *param0) { int v0; @@ -1361,7 +1357,7 @@ void ov94_02242AAC (UnkStruct_ov94_02242AAC * param0) param0->unk_02 = 0; } -void ov94_02242AC4 (UnkStruct_ov94_02242AAC * param0, int param1, int param2, int param3) +void ov94_02242AC4(UnkStruct_ov94_02242AAC *param0, int param1, int param2, int param3) { param0->unk_04[param1] = param2; param0->unk_16[param1] = param3; diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index 8f32528cb5..fc801840ce 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -1,37 +1,45 @@ +#include "overlay094/ov94_02242AD0.h" + +#include #include #include -#include -#include "inlines.h" #include "constants/species.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202440C_decl.h" -#include "journal.h" #include "struct_decls/struct_0202C878_decl.h" -#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0202DA40_decl.h" -#include "pokemon.h" +#include "struct_defs/chatot_cry.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay094/ov94_0223B140.h" +#include "overlay094/ov94_0223BCB0.h" +#include "overlay094/ov94_0223C610.h" +#include "overlay094/ov94_0223FB48.h" +#include "overlay094/ov94_02243EF8.h" +#include "overlay094/ov94_02244950.h" #include "overlay094/struct_ov94_0223BA88.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "savedata/save_table.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "inlines.h" +#include "journal.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02002B7C.h" #include "unk_02006E3C.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "savedata/save_table.h" -#include "savedata.h" -#include "game_options.h" -#include "journal.h" #include "unk_0202CC64.h" #include "unk_0202CD50.h" #include "unk_0202DA40.h" @@ -40,80 +48,71 @@ #include "unk_02038F8C.h" #include "unk_020393C8.h" #include "unk_02039814.h" -#include "vars_flags.h" #include "unk_0206AFE0.h" #include "unk_0206CCB0.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "party.h" -#include "overlay094/ov94_0223B140.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_0223C610.h" -#include "overlay094/ov94_0223FB48.h" -#include "overlay094/ov94_02242AD0.h" -#include "overlay094/ov94_02243EF8.h" -#include "overlay094/ov94_02244950.h" +#include "vars_flags.h" -static void ov94_02242B54(BGL * param0); -static void ov94_02242C80(BGL * param0); -static void ov94_02242CAC(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02242D38(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02242D74(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02242D84(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02242D98(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02243E48(Journal * param0, UnkStruct_ov94_0223BA88 * param1); -static void ov94_0224362C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02243E2C(UnkStruct_0202C878 * param0, UnkStruct_ov94_0223BA88 * param1); -static void ov94_02243CE4(UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, int param2); -static void ov94_02243DE8(UnkStruct_0202DA40 * param0, int param1); -static int ov94_02243E84(UnkStruct_ov94_0223FD4C * param0, UnkStruct_ov94_0223BA88 * param1); -static void ov94_022438C8(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02243EC8(UnkStruct_ov94_0223FD4C * param0, int param1, int param2); -static int ov94_02242DA8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02242E9C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02242ED0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02242F78(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02242F98(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243778(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224377C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243794(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243920(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243948(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243A90(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243AE8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224301C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243048(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243104(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243120(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022431A4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022431F0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022432D8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022432F4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022437AC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243884(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02243B08(UnkStruct_ov94_0223FD4C * param0, int param1); -static void ov94_02243BC4(UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, int param2, int param3); -static int ov94_02243990(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243974(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243A04(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243588(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243568(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243398(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243378(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243658(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022436F0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022437C0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022439E4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022439CC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243554(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243A28(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243A44(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022436D4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022437D8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022437F4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02243ED8(UnkStruct_ov94_0223FD4C * param0); - -static int (* Unk_ov94_022469A0[])(UnkStruct_ov94_0223FD4C *) = { +static void ov94_02242B54(BGL *param0); +static void ov94_02242C80(BGL *param0); +static void ov94_02242CAC(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02242D38(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02242D74(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02242D84(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02242D98(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02243E48(Journal *param0, UnkStruct_ov94_0223BA88 *param1); +static void ov94_0224362C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02243E2C(UnkStruct_0202C878 *param0, UnkStruct_ov94_0223BA88 *param1); +static void ov94_02243CE4(UnkStruct_ov94_0223FD4C *param0, Pokemon *param1, int param2); +static void ov94_02243DE8(UnkStruct_0202DA40 *param0, int param1); +static int ov94_02243E84(UnkStruct_ov94_0223FD4C *param0, UnkStruct_ov94_0223BA88 *param1); +static void ov94_022438C8(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02243EC8(UnkStruct_ov94_0223FD4C *param0, int param1, int param2); +static int ov94_02242DA8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02242E9C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02242ED0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02242F78(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02242F98(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243778(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0224377C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243794(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243920(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243948(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243A90(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243AE8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0224301C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243048(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243104(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243120(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022431A4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022431F0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022432D8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022432F4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022437AC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243884(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02243B08(UnkStruct_ov94_0223FD4C *param0, int param1); +static void ov94_02243BC4(UnkStruct_ov94_0223FD4C *param0, Pokemon *param1, int param2, int param3); +static int ov94_02243990(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243974(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243A04(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243588(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243568(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243398(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243378(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243658(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022436F0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022437C0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022439E4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022439CC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243554(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243A28(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243A44(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022436D4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022437D8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022437F4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02243ED8(UnkStruct_ov94_0223FD4C *param0); + +static int (*Unk_ov94_022469A0[])(UnkStruct_ov94_0223FD4C *) = { ov94_02242DA8, ov94_02243778, ov94_02242E9C, @@ -156,7 +155,7 @@ static int (* Unk_ov94_022469A0[])(UnkStruct_ov94_0223FD4C *) = { ov94_02243948 }; -int ov94_02242AD0 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_02242AD0(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_02242D84(param0); ov94_02242B54(param0->unk_04); @@ -171,7 +170,7 @@ int ov94_02242AD0 (UnkStruct_ov94_0223FD4C * param0, int param1) return 2; } -int ov94_02242B14 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_02242B14(UnkStruct_ov94_0223FD4C *param0, int param1) { int v0; @@ -181,7 +180,7 @@ int ov94_02242B14 (UnkStruct_ov94_0223FD4C * param0, int param1) return v0; } -int ov94_02242B34 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_02242B34(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_02242D98(param0); ov94_02242D74(param0); @@ -191,7 +190,7 @@ int ov94_02242B34 (UnkStruct_ov94_0223FD4C * param0, int param1) return 1; } -static void ov94_02242B54 (BGL * param0) +static void ov94_02242B54(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -316,7 +315,7 @@ static void ov94_02242B54 (BGL * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov94_02242C80 (BGL * param0) +static void ov94_02242C80(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -325,9 +324,9 @@ static void ov94_02242C80 (BGL * param0) sub_02019044(param0, 0); } -static void ov94_02242CAC (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02242CAC(UnkStruct_ov94_0223FD4C *param0) { - BGL * v0 = param0->unk_04; + BGL *v0 = param0->unk_04; sub_02006E84(104, 0, 0, 0, 16 * 3 * 2, 62); sub_02002E98(0, 13 * 0x20, 62); @@ -345,28 +344,28 @@ static void ov94_02242CAC (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_02242D38 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02242D38(UnkStruct_ov94_0223FD4C *param0) { BGL_AddWindow(param0->unk_04, ¶m0->unk_F5C, 0, 2, 19, 27, 4, 13, ((1 + (18 + 12)) + 9)); BGL_FillWindow(¶m0->unk_F5C, 0x0); } -static void ov94_02242D74 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02242D74(UnkStruct_ov94_0223FD4C *param0) { BGL_DeleteWindow(¶m0->unk_F5C); } -static void ov94_02242D84 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02242D84(UnkStruct_ov94_0223FD4C *param0) { param0->unk_BAC = Strbuf_Init((90 * 2), 62); } -static void ov94_02242D98 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02242D98(UnkStruct_ov94_0223FD4C *param0) { Strbuf_Free(param0->unk_BAC); } -static int ov94_02242DA8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02242DA8(UnkStruct_ov94_0223FD4C *param0) { switch (param0->unk_24) { case 7: @@ -404,7 +403,7 @@ static int ov94_02242DA8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02242E9C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02242E9C(UnkStruct_ov94_0223FD4C *param0) { sub_0207893C((Pokemon *)param0->unk_12C.unk_00.unk_00); ov94_0223B7E4(¶m0->unk_12C); @@ -417,7 +416,7 @@ static int ov94_02242E9C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02242ED0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02242ED0(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -472,7 +471,7 @@ static int ov94_02242ED0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02242F78 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02242F78(UnkStruct_ov94_0223FD4C *param0) { ov94_0223B834(); @@ -483,7 +482,7 @@ static int ov94_02242F78 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02242F98 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02242F98(UnkStruct_ov94_0223FD4C *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -521,7 +520,7 @@ static int ov94_02242F98 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0224301C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0224301C(UnkStruct_ov94_0223FD4C *param0) { ov94_0223B888(¶m0->unk_12C); @@ -533,7 +532,7 @@ static int ov94_0224301C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243048 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243048(UnkStruct_ov94_0223FD4C *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -580,7 +579,7 @@ static int ov94_02243048 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243104 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243104(UnkStruct_ov94_0223FD4C *param0) { ov94_0223B96C(); @@ -590,7 +589,7 @@ static int ov94_02243104 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243120 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243120(UnkStruct_ov94_0223FD4C *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -627,7 +626,7 @@ static int ov94_02243120 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022431A4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022431A4(UnkStruct_ov94_0223FD4C *param0) { sub_0207893C((Pokemon *)param0->unk_12C.unk_00.unk_00); @@ -640,7 +639,7 @@ static int ov94_022431A4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022431F0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022431F0(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -661,7 +660,7 @@ static int ov94_022431F0 (UnkStruct_ov94_0223FD4C * param0) sub_0202CF28(param0->unk_00->unk_28, (1 + 23)); { - TVBroadcast * v2; + TVBroadcast *v2; v2 = SaveData_TVBroadcast(param0->unk_00->unk_20); sub_0206D104(v2); @@ -705,7 +704,7 @@ static int ov94_022431F0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022432D8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022432D8(UnkStruct_ov94_0223FD4C *param0) { ov94_0223BAEC(); @@ -715,7 +714,7 @@ static int ov94_022432D8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022432F4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022432F4(UnkStruct_ov94_0223FD4C *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -750,7 +749,7 @@ static int ov94_022432F4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243378 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243378(UnkStruct_ov94_0223FD4C *param0) { ov94_0223B8D8(¶m0->unk_12C); @@ -760,7 +759,7 @@ static int ov94_02243378 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243398 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243398(UnkStruct_ov94_0223FD4C *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -794,7 +793,7 @@ static int ov94_02243398 (UnkStruct_ov94_0223FD4C * param0) param0->unk_36 = 0; if (sub_0202DA60(param0->unk_00->unk_00)) { - Pokemon * v1 = Pokemon_New(62); + Pokemon *v1 = Pokemon_New(62); sub_0202DA70(param0->unk_00->unk_00, v1); StringTemplate_SetNickname(param0->unk_B8C, 0, Pokemon_GetBoxPokemon(v1)); @@ -814,7 +813,7 @@ static int ov94_02243398 (UnkStruct_ov94_0223FD4C * param0) param0->unk_36 = 0; if (sub_0202DA60(param0->unk_00->unk_00)) { - Pokemon * v2 = Pokemon_New(62); + Pokemon *v2 = Pokemon_New(62); sub_0202DA70(param0->unk_00->unk_00, v2); StringTemplate_SetNickname(param0->unk_B8C, 0, Pokemon_GetBoxPokemon(v2)); @@ -848,7 +847,7 @@ static int ov94_02243398 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243554 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243554(UnkStruct_ov94_0223FD4C *param0) { ov94_0223C4C0(param0, 1, 0); param0->unk_2C = 36; @@ -856,7 +855,7 @@ static int ov94_02243554 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243568 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243568(UnkStruct_ov94_0223FD4C *param0) { ov94_0223B888(¶m0->unk_12C); @@ -866,7 +865,7 @@ static int ov94_02243568 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243588 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243588(UnkStruct_ov94_0223FD4C *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -884,7 +883,7 @@ static int ov94_02243588 (UnkStruct_ov94_0223FD4C * param0) } { - UnkStruct_ov94_0223BA88 * v1 = ¶m0->unk_12C; + UnkStruct_ov94_0223BA88 *v1 = ¶m0->unk_12C; } break; case -3: @@ -916,7 +915,7 @@ static int ov94_02243588 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static void ov94_0224362C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0224362C(UnkStruct_ov94_0223FD4C *param0) { switch (param0->unk_1C) { case 1: @@ -930,7 +929,7 @@ static void ov94_0224362C (UnkStruct_ov94_0223FD4C * param0) } } -static int ov94_02243658 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243658(UnkStruct_ov94_0223FD4C *param0) { ov94_02243BC4(param0, (Pokemon *)param0->unk_12C.unk_00.unk_00, sub_0202DAAC(param0->unk_00->unk_00), param0->unk_12C.unk_121); ov94_02243E2C(param0->unk_00->unk_18, ¶m0->unk_12C); @@ -940,7 +939,7 @@ static int ov94_02243658 (UnkStruct_ov94_0223FD4C * param0) sub_0202CF28(param0->unk_00->unk_28, (1 + 23)); { - TVBroadcast * v0; + TVBroadcast *v0; v0 = SaveData_TVBroadcast(param0->unk_00->unk_20); sub_0206D104(v0); @@ -953,7 +952,7 @@ static int ov94_02243658 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022436D4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022436D4(UnkStruct_ov94_0223FD4C *param0) { ov94_0223B928(); @@ -963,7 +962,7 @@ static int ov94_022436D4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022436F0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022436F0(UnkStruct_ov94_0223FD4C *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -1000,12 +999,12 @@ static int ov94_022436F0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243778 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243778(UnkStruct_ov94_0223FD4C *param0) { return 3; } -static int ov94_0224377C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0224377C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_36 = 1; ov94_0223C4C0(param0, 9, 7); @@ -1014,7 +1013,7 @@ static int ov94_0224377C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243794 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243794(UnkStruct_ov94_0223FD4C *param0) { param0->unk_36 = 0; ov94_0223C4C0(param0, 9, 8); @@ -1023,7 +1022,7 @@ static int ov94_02243794 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022437AC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022437AC(UnkStruct_ov94_0223FD4C *param0) { ov94_0223C4C0(param0, 9, 9); param0->unk_2C = 36; @@ -1031,7 +1030,7 @@ static int ov94_022437AC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022437C0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022437C0(UnkStruct_ov94_0223FD4C *param0) { param0->unk_36 = 0; ov94_0223C4C0(param0, 9, 10); @@ -1040,7 +1039,7 @@ static int ov94_022437C0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022437D8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022437D8(UnkStruct_ov94_0223FD4C *param0) { ov94_0223B96C(); @@ -1050,7 +1049,7 @@ static int ov94_022437D8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022437F4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022437F4(UnkStruct_ov94_0223FD4C *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -1088,7 +1087,7 @@ static int ov94_022437F4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243884 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243884(UnkStruct_ov94_0223FD4C *param0) { ov94_02245824(param0, param0->unk_B90, 141, 1, 0xf0f); ov94_0223C3F4(param0, 37, 36); @@ -1099,7 +1098,7 @@ static int ov94_02243884 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static void ov94_022438C8 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_022438C8(UnkStruct_ov94_0223FD4C *param0) { int v0 = 148; @@ -1130,7 +1129,7 @@ static void ov94_022438C8 (UnkStruct_ov94_0223FD4C * param0) ov94_02245824(param0, param0->unk_B90, v0, 1, 0xf0f); } -static int ov94_02243920 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243920(UnkStruct_ov94_0223FD4C *param0) { ov94_022438C8(param0); ov94_0223C3F4(param0, 37, 36); @@ -1140,7 +1139,7 @@ static int ov94_02243920 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243948 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243948(UnkStruct_ov94_0223FD4C *param0) { ov94_022438C8(param0); ov94_0223C3F4(param0, 37, 36); @@ -1151,7 +1150,7 @@ static int ov94_02243948 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243974 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243974(UnkStruct_ov94_0223FD4C *param0) { ov94_0223C3F4(param0, 37, 30); ov94_02243EC8(param0, 33, 36); @@ -1159,7 +1158,7 @@ static int ov94_02243974 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243990 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243990(UnkStruct_ov94_0223FD4C *param0) { SaveData_SetFullSaveRequired(); SaveData_SaveStateInit(param0->unk_00->unk_20, 2); @@ -1170,7 +1169,7 @@ static int ov94_02243990 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022439CC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022439CC(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10E0--; @@ -1181,7 +1180,7 @@ static int ov94_022439CC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022439E4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022439E4(UnkStruct_ov94_0223FD4C *param0) { if (SaveData_SaveStateMain(param0->unk_00->unk_20) == 1) { param0->unk_2C = param0->unk_10E8; @@ -1190,7 +1189,7 @@ static int ov94_022439E4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243A04 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243A04(UnkStruct_ov94_0223FD4C *param0) { if (SaveData_SaveStateMain(param0->unk_00->unk_20) == 2) { param0->unk_2C = param0->unk_10EA; @@ -1200,7 +1199,7 @@ static int ov94_02243A04 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243A28 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243A28(UnkStruct_ov94_0223FD4C *param0) { SaveData_SetFullSaveRequired(); SaveData_SaveStateInit(param0->unk_00->unk_20, 2); @@ -1210,7 +1209,7 @@ static int ov94_02243A28 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243A44 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243A44(UnkStruct_ov94_0223FD4C *param0) { if (SaveData_SaveStateMain(param0->unk_00->unk_20) == 2) { ov94_0223C4C0(param0, 1, 0); @@ -1222,7 +1221,7 @@ static int ov94_02243A44 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02243A90 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243A90(UnkStruct_ov94_0223FD4C *param0) { ov94_0223C5F4(param0); sub_02039794(); @@ -1238,7 +1237,7 @@ static int ov94_02243A90 (UnkStruct_ov94_0223FD4C * param0) return 4; } -static int ov94_02243AE8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243AE8(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_2C = param0->unk_30; @@ -1247,24 +1246,24 @@ static int ov94_02243AE8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static void ov94_02243B08 (UnkStruct_ov94_0223FD4C * param0, int param1) +static void ov94_02243B08(UnkStruct_ov94_0223FD4C *param0, int param1) { if (param0->unk_110 != 18) { - Pokemon * v0 = Pokemon_New(62); + Pokemon *v0 = Pokemon_New(62); Pokemon_FromBoxPokemon(sub_02079C9C(param0->unk_00->unk_0C, param0->unk_110, param0->unk_112), v0); sub_0202DA7C(param0->unk_00->unk_00, v0, param0->unk_110); sub_02079968(param0->unk_00->unk_0C, param0->unk_110, param0->unk_112); Heap_FreeToHeap(v0); } else { - Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112); + Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112); sub_0207893C(v1); sub_0202DA7C(param0->unk_00->unk_00, v1, param0->unk_110); Party_RemovePokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112); if (Party_HasSpecies(param0->unk_00->unk_08, 441) == 0) { - ChatotCry * v2 = GetChatotCryDataFromSave(param0->unk_00->unk_20); + ChatotCry *v2 = GetChatotCryDataFromSave(param0->unk_00->unk_20); ResetChatotCryDataStatus(v2); } } @@ -1274,7 +1273,7 @@ static void ov94_02243B08 (UnkStruct_ov94_0223FD4C * param0, int param1) } } -static void ov94_02243BC4 (UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, int param2, int param3) +static void ov94_02243BC4(UnkStruct_ov94_0223FD4C *param0, Pokemon *param1, int param2, int param3) { int v0 = Pokemon_GetValue(param1, MON_DATA_HELD_ITEM, NULL); @@ -1290,7 +1289,7 @@ static void ov94_02243BC4 (UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, i if (Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL) == SPECIES_ARCEUS) { if (Pokemon_GetValue(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) || ((Pokemon_GetValue(param1, MON_DATA_HATCH_LOCATION, NULL) == 86) && (Pokemon_GetValue(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 0))) { - VarsFlags * v2 = SaveData_GetVarsFlags(param0->unk_00->unk_20); + VarsFlags *v2 = SaveData_GetVarsFlags(param0->unk_00->unk_20); if (sub_0206B5F8(v2) == 0) { sub_0206B608(v2, 1); @@ -1325,7 +1324,7 @@ static void ov94_02243BC4 (UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, i sub_0202DA68(param0->unk_00->unk_00, 0); } -static void ov94_02243CE4 (UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, int param2) +static void ov94_02243CE4(UnkStruct_ov94_0223FD4C *param0, Pokemon *param1, int param2) { sub_0202F180(param0->unk_00->unk_20, param1); @@ -1337,7 +1336,7 @@ static void ov94_02243CE4 (UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, i if (Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL) == SPECIES_ARCEUS) { if (Pokemon_GetValue(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) || ((Pokemon_GetValue(param1, MON_DATA_HATCH_LOCATION, NULL) == 86) && (Pokemon_GetValue(param1, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 0))) { - VarsFlags * v0 = SaveData_GetVarsFlags(param0->unk_00->unk_20); + VarsFlags *v0 = SaveData_GetVarsFlags(param0->unk_00->unk_20); if (sub_0206B5F8(v0) == 0) { sub_0206B608(v0, 1); @@ -1373,7 +1372,7 @@ static void ov94_02243CE4 (UnkStruct_ov94_0223FD4C * param0, Pokemon * param1, i ov94_02243DE8(param0->unk_00->unk_00, 1); } -static void ov94_02243DE8 (UnkStruct_0202DA40 * param0, int param1) +static void ov94_02243DE8(UnkStruct_0202DA40 *param0, int param1) { RTCDate v0; RTCTime v1; @@ -1390,23 +1389,23 @@ static void ov94_02243DE8 (UnkStruct_0202DA40 * param0, int param1) } } -static void ov94_02243E2C (UnkStruct_0202C878 * param0, UnkStruct_ov94_0223BA88 * param1) +static void ov94_02243E2C(UnkStruct_0202C878 *param0, UnkStruct_ov94_0223BA88 *param1) { sub_02038FDC(param0, param1->unk_11E, param1->unk_11F, param1->unk_123); } -static void ov94_02243E48 (Journal * param0, UnkStruct_ov94_0223BA88 * param1) +static void ov94_02243E48(Journal *param0, UnkStruct_ov94_0223BA88 *param1) { - void * v0; + void *v0; u16 v1[10 + 1]; - Pokemon * v2 = (Pokemon *)param1->unk_00.unk_00; + Pokemon *v2 = (Pokemon *)param1->unk_00.unk_00; Pokemon_GetValue(v2, MON_DATA_NICKNAME, v1); v0 = sub_0202C1EC(param1->unk_10C, param1->unk_F6, v1, Pokemon_GetGender(v2), 62); sub_0202B758(param0, v0, 4); } -static int ov94_02243E84 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_ov94_0223BA88 * param1) +static int ov94_02243E84(UnkStruct_ov94_0223FD4C *param0, UnkStruct_ov94_0223BA88 *param1) { if (ov94_02241498((Pokemon *)param1->unk_00.unk_00) && (Party_GetCurrentCount(param0->unk_00->unk_08) == 6)) { @@ -1420,15 +1419,15 @@ static int ov94_02243E84 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_ov94_0223B return 0; } -static void ov94_02243EC8 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2) +static void ov94_02243EC8(UnkStruct_ov94_0223FD4C *param0, int param1, int param2) { param0->unk_10E8 = param1; param0->unk_10EA = param2; } -static int ov94_02243ED8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02243ED8(UnkStruct_ov94_0223FD4C *param0) { - Pokemon * v0 = (Pokemon *)param0->unk_12C.unk_00.unk_00; + Pokemon *v0 = (Pokemon *)param0->unk_12C.unk_00.unk_00; if (sub_0202DA60(param0->unk_00->unk_00) == 0) { if (param0->unk_36) { diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c index c0d178ae71..225f83c440 100644 --- a/src/overlay094/ov94_02243EF8.c +++ b/src/overlay094/ov94_02243EF8.c @@ -1,49 +1,50 @@ +#include "overlay094/ov94_02243EF8.h" + +#include #include #include -#include #include "struct_decls/struct_02022550_decl.h" -#include "touch_screen.h" +#include "overlay094/ov94_0223BCB0.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay115/struct_ov115_02261520.h" +#include "heap.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_0200679C.h" #include "unk_02006E3C.h" -#include "heap.h" -#include "sys_task_manager.h" #include "unk_020218BC.h" #include "unk_0205C980.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_02243EF8.h" typedef struct { int unk_00; int unk_04; int unk_08; - UnkStruct_ov94_0223FD4C * unk_0C; + UnkStruct_ov94_0223FD4C *unk_0C; } UnkStruct_ov94_02243FF0; -static void ov94_0224400C(SysTask * param0, void * param1); -static void ov94_022440FC(SysTask * param0, void * param1); -static void ov94_022441A0(GraphicElementData * param0, int param1, int param2); -static void ov94_02243FF0(UnkStruct_ov94_02243FF0 * param0, int param1); -static void ov94_0224432C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02244378(NNSG2dCharacterData * param0, NNSG2dPaletteData * param1, int param2, int param3, int param4); +static void ov94_0224400C(SysTask *param0, void *param1); +static void ov94_022440FC(SysTask *param0, void *param1); +static void ov94_022441A0(GraphicElementData *param0, int param1, int param2); +static void ov94_02243FF0(UnkStruct_ov94_02243FF0 *param0, int param1); +static void ov94_0224432C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02244378(NNSG2dCharacterData *param0, NNSG2dPaletteData *param1, int param2, int param3, int param4); static int ov94_022442DC(int param0); static const u16 Unk_ov94_02246322[][2] = { - {0x80, 0x36}, - {0x60, 0x37}, - {0xA0, 0x37}, - {0x40, 0x46}, - {0xC0, 0x46}, - {0x30, 0x66}, - {0xD0, 0x66} + { 0x80, 0x36 }, + { 0x60, 0x37 }, + { 0xA0, 0x37 }, + { 0x40, 0x46 }, + { 0xC0, 0x46 }, + { 0x30, 0x66 }, + { 0xD0, 0x66 } }; -void ov94_02243EF8 (UnkStruct_ov94_0223FD4C * param0, int param1) +void ov94_02243EF8(UnkStruct_ov94_0223FD4C *param0, int param1) { UnkStruct_ov115_02261520 v0; int v1; @@ -72,12 +73,12 @@ void ov94_02243EF8 (UnkStruct_ov94_0223FD4C * param0, int param1) } } -void ov94_02243FA8 (UnkStruct_ov94_0223FD4C * param0, int param1) +void ov94_02243FA8(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_02243EF8(param0, param1); { - UnkStruct_ov94_02243FF0 * v0; + UnkStruct_ov94_02243FF0 *v0; param0->unk_10EC = SysTask_StartAndAllocateParam(ov94_0224400C, sizeof(UnkStruct_ov94_02243FF0), 5, 62); @@ -92,16 +93,16 @@ void ov94_02243FA8 (UnkStruct_ov94_0223FD4C * param0, int param1) } } -static void ov94_02243FF0 (UnkStruct_ov94_02243FF0 * param0, int param1) +static void ov94_02243FF0(UnkStruct_ov94_02243FF0 *param0, int param1) { SpriteActor_SetSpriteAnimActive(param0->unk_0C->unk_F34[0], param1 + param0->unk_08 * 7); } -static void ov94_0224400C (SysTask * param0, void * param1) +static void ov94_0224400C(SysTask *param0, void *param1) { int v0; - UnkStruct_ov94_02243FF0 * v1 = (UnkStruct_ov94_02243FF0 *)param1; - UnkStruct_ov94_0223FD4C * v2 = v1->unk_0C; + UnkStruct_ov94_02243FF0 *v1 = (UnkStruct_ov94_02243FF0 *)param1; + UnkStruct_ov94_0223FD4C *v2 = v1->unk_0C; switch (v1->unk_00) { case 0: @@ -140,10 +141,10 @@ static void ov94_0224400C (SysTask * param0, void * param1) } } -void ov94_022440B8 (UnkStruct_ov94_0223FD4C * param0, int param1) +void ov94_022440B8(UnkStruct_ov94_0223FD4C *param0, int param1) { { - UnkStruct_ov94_02243FF0 * v0; + UnkStruct_ov94_02243FF0 *v0; param0->unk_10EC = SysTask_StartAndAllocateParam(ov94_022440FC, sizeof(UnkStruct_ov94_02243FF0), 5, 62); @@ -158,11 +159,11 @@ void ov94_022440B8 (UnkStruct_ov94_0223FD4C * param0, int param1) } } -static void ov94_022440FC (SysTask * param0, void * param1) +static void ov94_022440FC(SysTask *param0, void *param1) { int v0; - UnkStruct_ov94_02243FF0 * v1 = (UnkStruct_ov94_02243FF0 *)param1; - UnkStruct_ov94_0223FD4C * v2 = v1->unk_0C; + UnkStruct_ov94_02243FF0 *v1 = (UnkStruct_ov94_02243FF0 *)param1; + UnkStruct_ov94_0223FD4C *v2 = v1->unk_0C; switch (v1->unk_00) { case 0: @@ -200,7 +201,7 @@ static void ov94_022440FC (SysTask * param0, void * param1) } } -static void ov94_022441A0 (GraphicElementData * param0, int param1, int param2) +static void ov94_022441A0(GraphicElementData *param0, int param1, int param2) { VecFx32 v0; @@ -212,17 +213,17 @@ static void ov94_022441A0 (GraphicElementData * param0, int param1, int param2) } static const TouchScreenRect Unk_ov94_0224633E[] = { - {0x26, 0x46, 0x70, 0x90}, - {0x27, 0x47, 0x50, 0x70}, - {0x27, 0x47, 0x90, 0xB0}, - {0x36, 0x56, 0x30, 0x50}, - {0x36, 0x56, 0xB0, 0xD0}, - {0x56, 0x76, 0x20, 0x40}, - {0x56, 0x76, 0xC0, 0xE0}, - {0xFF, 0x0, 0x0, 0x0} + { 0x26, 0x46, 0x70, 0x90 }, + { 0x27, 0x47, 0x50, 0x70 }, + { 0x27, 0x47, 0x90, 0xB0 }, + { 0x36, 0x56, 0x30, 0x50 }, + { 0x36, 0x56, 0xB0, 0xD0 }, + { 0x56, 0x76, 0x20, 0x40 }, + { 0x56, 0x76, 0xC0, 0xE0 }, + { 0xFF, 0x0, 0x0, 0x0 } }; -int ov94_02244214 (int param0) +int ov94_02244214(int param0) { int v0 = sub_02022664(Unk_ov94_0224633E); @@ -235,7 +236,7 @@ int ov94_02244214 (int param0) return -1; } -void ov94_02244234 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2) +void ov94_02244234(UnkStruct_ov94_0223FD4C *param0, int param1, int param2) { int v0; @@ -263,12 +264,12 @@ void ov94_02244234 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2) } } -static int ov94_022442DC (int param0) +static int ov94_022442DC(int param0) { return 14 + param0 * 4; } -void ov94_022442E4 (UnkStruct_ov94_0223FD4C * param0) +void ov94_022442E4(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -281,7 +282,7 @@ void ov94_022442E4 (UnkStruct_ov94_0223FD4C * param0) } } -static void ov94_0224432C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_0224432C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_10FC = sub_02006F88(86, 7, &(param0->unk_1100), 62); param0->unk_10F4 = sub_02006F50(86, 9, 1, &(param0->unk_10F8), 62); @@ -299,10 +300,10 @@ static const u16 Unk_ov94_02246314[] = { 0x3000 }; -static void ov94_02244378 (NNSG2dCharacterData * param0, NNSG2dPaletteData * param1, int param2, int param3, int param4) +static void ov94_02244378(NNSG2dCharacterData *param0, NNSG2dPaletteData *param1, int param2, int param3, int param4) { int v0; - u8 * v1, * v2; + u8 *v1, *v2; v0 = sub_0205CA0C(param4, param3); v1 = (u8 *)param0->pRawData; @@ -312,7 +313,7 @@ static void ov94_02244378 (NNSG2dCharacterData * param0, NNSG2dPaletteData * par GXS_LoadOBJPltt(&v2[v0 * 32], (param2 + 2) * 32, 32); } -void ov94_022443B8 (UnkStruct_ov94_0223FD4C * param0) +void ov94_022443B8(UnkStruct_ov94_0223FD4C *param0) { if (param0->unk_10F0) { Heap_FreeToHeap(param0->unk_10FC); diff --git a/src/overlay094/ov94_022443E0.c b/src/overlay094/ov94_022443E0.c index 44e20cac70..0da13f0065 100644 --- a/src/overlay094/ov94_022443E0.c +++ b/src/overlay094/ov94_022443E0.c @@ -1,17 +1,18 @@ +#include "overlay094/ov94_022443E0.h" + +#include #include #include -#include - -#include "constdata/const_020F410C.h" +#include "overlay094/ov94_0223BCB0.h" +#include "overlay094/ov94_0223FB48.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay_manager.h" -#include "unk_0202D778.h" #include "pokemon_summary_app.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_0223FB48.h" -#include "overlay094/ov94_022443E0.h" +#include "unk_0202D778.h" + +#include "constdata/const_020F410C.h" static const u8 Unk_ov94_02246360[] = { 0x0, @@ -25,7 +26,7 @@ static const u8 Unk_ov94_02246360[] = { 0x8 }; -int ov94_022443E0 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_022443E0(UnkStruct_ov94_0223FD4C *param0, int param1) { param0->unk_B8.monData = ov94_022411DC(param0->unk_00->unk_08, param0->unk_00->unk_0C, param0->unk_110, param0->unk_112); param0->unk_B8.dataType = 2; @@ -47,7 +48,7 @@ int ov94_022443E0 (UnkStruct_ov94_0223FD4C * param0, int param1) return 2; } -int ov94_02244490 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_02244490(UnkStruct_ov94_0223FD4C *param0, int param1) { int v0 = 3; @@ -61,7 +62,7 @@ int ov94_02244490 (UnkStruct_ov94_0223FD4C * param0, int param1) return v0; } -int ov94_022444BC (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_022444BC(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_0223C4C8(param0); return 1; diff --git a/src/overlay094/ov94_022444C8.c b/src/overlay094/ov94_022444C8.c index ded7258097..fd712d1e71 100644 --- a/src/overlay094/ov94_022444C8.c +++ b/src/overlay094/ov94_022444C8.c @@ -1,28 +1,29 @@ +#include "overlay094/ov94_022444C8.h" + +#include #include #include -#include +#include "overlay094/ov94_0223BCB0.h" #include "overlay094/struct_ov94_0223BA88.h" #include "overlay094/struct_ov94_0223FD4C.h" +#include "overlay095/ov95_02246C20.h" -#include "overlay_manager.h" #include "heap.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "poketch_data.h" #include "trainer_info.h" #include "unk_0202DA40.h" -#include "poketch_data.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "party.h" #include "unk_0207AE68.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_022444C8.h" -#include "overlay095/ov95_02246C20.h" FS_EXTERN_OVERLAY(overlay95); -static TrainerInfo * ov94_02244870(UnkStruct_ov94_0223BA88 * param0); -static Pokemon * ov94_022448AC(UnkStruct_ov94_0223FD4C * param0, int param1); -static void ov94_022448E8(UnkStruct_ov94_0223FD4C * param0); +static TrainerInfo *ov94_02244870(UnkStruct_ov94_0223BA88 *param0); +static Pokemon *ov94_022448AC(UnkStruct_ov94_0223FD4C *param0, int param1); +static void ov94_022448E8(UnkStruct_ov94_0223FD4C *param0); static const OverlayManagerTemplate Unk_ov94_0224636C = { ov95_02246C20, @@ -31,7 +32,7 @@ static const OverlayManagerTemplate Unk_ov94_0224636C = { FS_OVERLAY_ID(overlay95) }; -int ov94_022444C8 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_022444C8(UnkStruct_ov94_0223FD4C *param0, int param1) { param0->unk_1104 = Pokemon_New(62); @@ -79,7 +80,7 @@ int ov94_022444C8 (UnkStruct_ov94_0223FD4C * param0, int param1) return 2; } -int ov94_02244678 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_02244678(UnkStruct_ov94_0223FD4C *param0, int param1) { int v0 = 3; @@ -89,7 +90,7 @@ int ov94_02244678 (UnkStruct_ov94_0223FD4C * param0, int param1) OverlayManager_Free(param0->unk_B4); if (param0->unk_24 == 9) { - Pokemon * v1 = ov94_022448AC(param0, param0->unk_24); + Pokemon *v1 = ov94_022448AC(param0, param0->unk_24); int v2 = Pokemon_GetValue(v1, MON_DATA_HELD_ITEM, NULL); int v3; int v4; @@ -104,8 +105,8 @@ int ov94_02244678 (UnkStruct_ov94_0223FD4C * param0, int param1) v0 = 4; } } else if ((param0->unk_24 == 8) || (param0->unk_24 == 10)) { - Pokemon * v1 = ov94_022448AC(param0, param0->unk_24); - Pokemon * v5 = Pokemon_New(62); + Pokemon *v1 = ov94_022448AC(param0, param0->unk_24); + Pokemon *v5 = Pokemon_New(62); sub_0202DA70(param0->unk_00->unk_00, v5); @@ -149,7 +150,7 @@ int ov94_02244678 (UnkStruct_ov94_0223FD4C * param0, int param1) return v0; } -int ov94_0224484C (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_0224484C(UnkStruct_ov94_0223FD4C *param0, int param1) { Heap_FreeToHeap(param0->unk_1104); Heap_FreeToHeap(param0->unk_120); @@ -158,9 +159,9 @@ int ov94_0224484C (UnkStruct_ov94_0223FD4C * param0, int param1) return 1; } -static TrainerInfo * ov94_02244870 (UnkStruct_ov94_0223BA88 * param0) +static TrainerInfo *ov94_02244870(UnkStruct_ov94_0223BA88 *param0) { - TrainerInfo * v0 = TrainerInfo_New(62); + TrainerInfo *v0 = TrainerInfo_New(62); TrainerInfo_Init(v0); TrainerInfo_SetName(v0, param0->unk_10C); @@ -170,7 +171,7 @@ static TrainerInfo * ov94_02244870 (UnkStruct_ov94_0223BA88 * param0) return v0; } -static Pokemon * ov94_022448AC (UnkStruct_ov94_0223FD4C * param0, int param1) +static Pokemon *ov94_022448AC(UnkStruct_ov94_0223FD4C *param0, int param1) { if (param1 == 9) { return (Pokemon *)param0->unk_250[param0->unk_11C].unk_00.unk_00; @@ -184,9 +185,9 @@ static Pokemon * ov94_022448AC (UnkStruct_ov94_0223FD4C * param0, int param1) return NULL; } -static void ov94_022448E8 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_022448E8(UnkStruct_ov94_0223FD4C *param0) { - Pokemon * v0 = ov94_022448AC(param0, param0->unk_24); + Pokemon *v0 = ov94_022448AC(param0, param0->unk_24); if (param0->unk_124.unk_00 == 18) { Pokemon_Copy(v0, Party_GetPokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_124.unk_04)); diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index 76e47aee9a..4f4ba992ae 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -1,79 +1,77 @@ +#include "overlay094/ov94_02244950.h" + +#include #include #include -#include - -#include "inlines.h" -#include "core_sys.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" + +#include "overlay004/ov4_021D0D80.h" +#include "overlay094/ov94_0223B140.h" +#include "overlay094/ov94_0223BCB0.h" #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02025CB0.h" -#include "game_options.h" #include "unk_0202ACE0.h" #include "unk_02030CE8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay094/ov94_0223B140.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay094/ov94_02244950.h" -static void ov94_02244A7C(BGL * param0); -static void ov94_02244B68(BGL * param0); -static void ov94_02244B8C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02244E48(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02244F00(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02244F2C(UnkStruct_ov94_0223FD4C * param0); -static void ov94_02244F64(UnkStruct_ov94_0223FD4C * param0); -static void ov94_0224593C(UnkStruct_ov94_0223FD4C * param0, int param1); -static void ov94_022459B4(UnkStruct_ov94_0223FD4C * param0, int param1, int param2); -static int ov94_02244F8C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02244FC4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224505C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02245138(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02245158(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224529C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022452E4(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022453B8(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022453EC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02245594(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022455D0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224579C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022457F0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02245608(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022456CC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02245300(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224502C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022450C0(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022450EC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_0224510C(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022457BC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022451DC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_022451EC(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02245540(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02245564(UnkStruct_ov94_0223FD4C * param0); -static int ov94_02245894(Window * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); - -static int (* Unk_ov94_02246A40[])(UnkStruct_ov94_0223FD4C *) = { +static void ov94_02244A7C(BGL *param0); +static void ov94_02244B68(BGL *param0); +static void ov94_02244B8C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02244E48(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02244F00(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02244F2C(UnkStruct_ov94_0223FD4C *param0); +static void ov94_02244F64(UnkStruct_ov94_0223FD4C *param0); +static void ov94_0224593C(UnkStruct_ov94_0223FD4C *param0, int param1); +static void ov94_022459B4(UnkStruct_ov94_0223FD4C *param0, int param1, int param2); +static int ov94_02244F8C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02244FC4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0224505C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02245138(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02245158(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0224529C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022452E4(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022453B8(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022453EC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02245594(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022455D0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0224579C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022457F0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02245608(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022456CC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02245300(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0224502C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022450C0(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022450EC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_0224510C(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022457BC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022451DC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_022451EC(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02245540(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02245564(UnkStruct_ov94_0223FD4C *param0); +static int ov94_02245894(Window *param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); + +static int (*Unk_ov94_02246A40[])(UnkStruct_ov94_0223FD4C *) = { ov94_02244F8C, ov94_02244FC4, ov94_02245138, @@ -101,7 +99,7 @@ static int (* Unk_ov94_02246A40[])(UnkStruct_ov94_0223FD4C *) = { ov94_02245564 }; -int ov94_02244950 (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_02244950(UnkStruct_ov94_0223FD4C *param0, int param1) { ov94_02244F2C(param0); sub_0200F174(0, 1, 1, 0x0, 6, 1, 62); @@ -133,7 +131,7 @@ int ov94_02244950 (UnkStruct_ov94_0223FD4C * param0, int param1) return 2; } -int ov94_022449FC (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_022449FC(UnkStruct_ov94_0223FD4C *param0, int param1) { int v0, v1; @@ -152,7 +150,7 @@ int ov94_022449FC (UnkStruct_ov94_0223FD4C * param0, int param1) return v0; } -int ov94_02244A2C (UnkStruct_ov94_0223FD4C * param0, int param1) +int ov94_02244A2C(UnkStruct_ov94_0223FD4C *param0, int param1) { inline_ov61_0222C160(¶m0->unk_11B4); @@ -171,7 +169,7 @@ int ov94_02244A2C (UnkStruct_ov94_0223FD4C * param0, int param1) return 1; } -static void ov94_02244A7C (BGL * param0) +static void ov94_02244A7C(BGL *param0) { { UnkStruct_ov97_0222DB78 v0 = { @@ -264,7 +262,7 @@ static void ov94_02244A7C (BGL * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 0); } -static void ov94_02244B68 (BGL * param0) +static void ov94_02244B68(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -272,10 +270,10 @@ static void ov94_02244B68 (BGL * param0) sub_02019044(param0, 0); } -static void ov94_02244B8C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02244B8C(UnkStruct_ov94_0223FD4C *param0) { - BGL * v0 = param0->unk_04; - NARC * v1; + BGL *v0 = param0->unk_04; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 62); @@ -297,7 +295,7 @@ static void ov94_02244B8C (UnkStruct_ov94_0223FD4C * param0) NARC_dtor(v1); } -static void ov94_02244E48 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02244E48(UnkStruct_ov94_0223FD4C *param0) { BGL_AddWindow(param0->unk_04, ¶m0->unk_F8C, 0, 4, 4, 23, 16, 13, (((1 + (18 + 12)) + 9) + 27 * 4)); BGL_FillWindow(¶m0->unk_F8C, 0x0); @@ -310,28 +308,28 @@ static void ov94_02244E48 (UnkStruct_ov94_0223FD4C * param0) BGL_FillWindow(¶m0->unk_F5C, 0x0); } -static void ov94_02244F00 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02244F00(UnkStruct_ov94_0223FD4C *param0) { BGL_DeleteWindow(¶m0->unk_F5C); BGL_DeleteWindow(¶m0->unk_F7C); BGL_DeleteWindow(¶m0->unk_F8C); } -static void ov94_02244F2C (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02244F2C(UnkStruct_ov94_0223FD4C *param0) { param0->unk_BAC = Strbuf_Init((90 * 2), 62); param0->unk_BDC = Strbuf_Init((16 * 8 * 2), 62); param0->unk_BB0 = MessageLoader_GetNewStrbuf(param0->unk_B90, 31); } -static void ov94_02244F64 (UnkStruct_ov94_0223FD4C * param0) +static void ov94_02244F64(UnkStruct_ov94_0223FD4C *param0) { Strbuf_Free(param0->unk_BB0); Strbuf_Free(param0->unk_BDC); Strbuf_Free(param0->unk_BAC); } -static int ov94_02244F8C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02244F8C(UnkStruct_ov94_0223FD4C *param0) { ov94_02245824(param0, param0->unk_B9C, 17, 1, 0xf0f); ov94_0223C3F4(param0, 13, 1); @@ -341,7 +339,7 @@ static int ov94_02244F8C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02244FC4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02244FC4(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -360,7 +358,7 @@ static int ov94_02244FC4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0224502C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0224502C(UnkStruct_ov94_0223FD4C *param0) { ov94_02245824(param0, param0->unk_B90, 7, 1, 0xf0f); ov94_0223C3F4(param0, 13, 16); @@ -368,7 +366,7 @@ static int ov94_0224502C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0224505C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0224505C(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -395,7 +393,7 @@ static int ov94_0224505C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022450C0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022450C0(UnkStruct_ov94_0223FD4C *param0) { ov94_02245824(param0, param0->unk_B9C, 26, 1, 0xf0f); ov94_0223C3F4(param0, 12, 18); @@ -403,7 +401,7 @@ static int ov94_022450C0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022450EC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022450EC(UnkStruct_ov94_0223FD4C *param0) { sub_0203848C(); @@ -414,7 +412,7 @@ static int ov94_022450EC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0224510C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0224510C(UnkStruct_ov94_0223FD4C *param0) { ov94_02245824(param0, param0->unk_B9C, 27, 1, 0xf0f); ov94_0223C3F4(param0, 20, 11); @@ -422,10 +420,10 @@ static int ov94_0224510C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02245138 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02245138(UnkStruct_ov94_0223FD4C *param0) { DWC_InitInetEx(¶m0->unk_54, 2, 1, 20); - DWC_SetAuthServer((DWC_CONNECTINET_AUTH_RELEASE)); + DWC_SetAuthServer(DWC_CONNECTINET_AUTH_RELEASE); DWC_ConnectInetAsync(); param0->unk_2C = 3; @@ -433,14 +431,13 @@ static int ov94_02245138 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02245158 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02245158(UnkStruct_ov94_0223FD4C *param0) { DWC_ProcessInet(); if (DWC_CheckInet()) { switch (DWC_GetInetStatus()) { - case DWC_CONNECTINET_STATE_ERROR: - { + case DWC_CONNECTINET_STATE_ERROR: { DWCError v0; int v1; DWCErrorType v2; @@ -465,8 +462,7 @@ static int ov94_02245158 (UnkStruct_ov94_0223FD4C * param0) case DWC_CONNECTINET_STATE_DISCONNECTING: case DWC_CONNECTINET_STATE_DISCONNECTED: default: - case DWC_CONNECTINET_STATE_FATAL_ERROR: - { + case DWC_CONNECTINET_STATE_FATAL_ERROR: { DWCError v3; int v4; @@ -475,11 +471,9 @@ static int ov94_02245158 (UnkStruct_ov94_0223FD4C * param0) param0->unk_2C = 21; param0->unk_3C = -2; - } - break; + } break; - case DWC_CONNECTINET_STATE_CONNECTED: - { + case DWC_CONNECTINET_STATE_CONNECTED: { DWCApInfo v5; DWC_GetApInfo(&v5); @@ -497,7 +491,7 @@ static int ov94_02245158 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022451DC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022451DC(UnkStruct_ov94_0223FD4C *param0) { DWC_NASLoginAsync(); param0->unk_2C = 5; @@ -505,7 +499,7 @@ static int ov94_022451DC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022451EC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022451EC(UnkStruct_ov94_0223FD4C *param0) { switch (DWC_NASLoginProcess()) { case DWC_NASLOGIN_STATE_SUCCESS: @@ -563,9 +557,9 @@ static int ov94_022451EC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0224529C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0224529C(UnkStruct_ov94_0223FD4C *param0) { - DWCUserData * v0; + DWCUserData *v0; s32 v1; v0 = sub_0202AD28(param0->unk_00->unk_14); @@ -582,7 +576,7 @@ static int ov94_0224529C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022452E4 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022452E4(UnkStruct_ov94_0223FD4C *param0) { ov94_0223BB40(); @@ -592,7 +586,7 @@ static int ov94_022452E4 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02245300 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02245300(UnkStruct_ov94_0223FD4C *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -643,7 +637,7 @@ static int ov94_02245300 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022453B8 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022453B8(UnkStruct_ov94_0223FD4C *param0) { sub_02030E78(param0->unk_00->unk_20, ¶m0->unk_1144); ov94_0223BB84(¶m0->unk_1144, ¶m0->unk_11A8); @@ -654,7 +648,7 @@ static int ov94_022453B8 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022453EC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022453EC(UnkStruct_ov94_0223FD4C *param0) { if (ov94_0223B7B8()) { s32 v0 = ov94_0223B7D8(); @@ -743,7 +737,7 @@ static int ov94_022453EC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02245540 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02245540(UnkStruct_ov94_0223FD4C *param0) { int v0; @@ -754,7 +748,7 @@ static int ov94_02245540 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02245564 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02245564(UnkStruct_ov94_0223FD4C *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_A || gCoreSys.pressedKeys & PAD_BUTTON_B) { Window_Clear(¶m0->unk_F8C, 0); @@ -764,7 +758,7 @@ static int ov94_02245564 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02245594 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02245594(UnkStruct_ov94_0223FD4C *param0) { sub_02039794(); ov94_0223C5F4(param0); @@ -776,7 +770,7 @@ static int ov94_02245594 (UnkStruct_ov94_0223FD4C * param0) return 4; } -static int ov94_022455D0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022455D0(UnkStruct_ov94_0223FD4C *param0) { int v0 = sub_02002114(param0->unk_10D0, 62); @@ -792,7 +786,7 @@ static int ov94_022455D0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_02245608 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_02245608(UnkStruct_ov94_0223FD4C *param0) { int v0 = 0; @@ -838,7 +832,7 @@ static int ov94_02245608 (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022456CC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022456CC(UnkStruct_ov94_0223FD4C *param0) { switch (param0->unk_14E0) { case 0: @@ -874,7 +868,7 @@ static int ov94_022456CC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_0224579C (UnkStruct_ov94_0223FD4C * param0) +static int ov94_0224579C(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_2C = param0->unk_30; @@ -883,7 +877,7 @@ static int ov94_0224579C (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022457BC (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022457BC(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { if (param0->unk_10E0 > 30) { @@ -896,7 +890,7 @@ static int ov94_022457BC (UnkStruct_ov94_0223FD4C * param0) return 3; } -static int ov94_022457F0 (UnkStruct_ov94_0223FD4C * param0) +static int ov94_022457F0(UnkStruct_ov94_0223FD4C *param0) { if (Message_Printing(param0->unk_BE0) == 0) { param0->unk_10D0 = ov94_0223C3C0(param0->unk_04, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 23 * 16) + 24 * 2)); @@ -906,9 +900,9 @@ static int ov94_022457F0 (UnkStruct_ov94_0223FD4C * param0) return 3; } -void ov94_02245824 (UnkStruct_ov94_0223FD4C * param0, MessageLoader * param1, int param2, int param3, u16 param4) +void ov94_02245824(UnkStruct_ov94_0223FD4C *param0, MessageLoader *param1, int param2, int param3, u16 param4) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param1, param2); @@ -921,7 +915,7 @@ void ov94_02245824 (UnkStruct_ov94_0223FD4C * param0, MessageLoader * param1, in param0->unk_10E0 = 0; } -static int ov94_02245894 (Window * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) +static int ov94_02245894(Window *param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) { int v0 = 0, v1; @@ -939,26 +933,26 @@ static int ov94_02245894 (Window * param0, Strbuf *param1, int param2, int param return param2; } -void ov94_022458CC (Window * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) +void ov94_022458CC(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov94_02245894(param0, param1, param2, param4, param5, 1); sub_0201D78C(param0, 1, param1, param2, param3, 0, param5, NULL); } -void ov94_02245900 (Window * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) +void ov94_02245900(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov94_02245894(param0, param1, param2, param4, param5, 0); sub_0201D78C(param0, 0, param1, param2, param3, 0, param5, NULL); } -void ov94_02245934 (UnkStruct_ov94_0223FD4C * param0) +void ov94_02245934(UnkStruct_ov94_0223FD4C *param0) { sub_02039734(); } -static void ov94_0224593C (UnkStruct_ov94_0223FD4C * param0, int param1) +static void ov94_0224593C(UnkStruct_ov94_0223FD4C *param0, int param1) { - Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 62); + Strbuf *v0 = Strbuf_Init((16 * 8 * 2), 62); MessageLoader_GetStrbuf(param0->unk_B9C, param1, v0); StringTemplate_Format(param0->unk_B8C, param0->unk_BDC, v0); @@ -971,7 +965,7 @@ static void ov94_0224593C (UnkStruct_ov94_0223FD4C * param0, int param1) Strbuf_Free(v0); } -static void ov94_022459B4 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2) +static void ov94_022459B4(UnkStruct_ov94_0223FD4C *param0, int param1, int param2) { int v0; diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index 28cb14e033..ca38d03b1b 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -1,77 +1,75 @@ +#include "overlay095/ov95_02246C20.h" + #include #include -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "pokemon.h" -#include "overlay095/struct_ov95_02247004_decl.h" -#include "overlay095/struct_ov95_022472C4_decl.h" -#include "overlay095/struct_ov95_02247628_decl.h" - #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013610.h" + #include "overlay006/struct_ov6_02246254.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay083/struct_ov83_0223D9A8.h" +#include "overlay095/ov95_02247B6C.h" +#include "overlay095/ov95_02248590.h" +#include "overlay095/ov95_02249740.h" +#include "overlay095/ov95_02249F90.h" +#include "overlay095/ov95_0224A390.h" +#include "overlay095/ov95_0224ABC0.h" +#include "overlay095/ov95_0224B3D8.h" +#include "overlay095/struct_ov95_02247004_decl.h" +#include "overlay095/struct_ov95_022472C4_decl.h" #include "overlay095/struct_ov95_02247568.h" +#include "overlay095/struct_ov95_02247628_decl.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "overlay095/ov95_02246C20.h" -#include "overlay095/ov95_02247B6C.h" -#include "overlay095/ov95_02248590.h" -#include "overlay095/ov95_02249740.h" -#include "overlay095/ov95_02249F90.h" -#include "overlay095/ov95_0224A390.h" -#include "overlay095/ov95_0224ABC0.h" -#include "overlay095/ov95_0224B3D8.h" struct UnkStruct_ov95_02247628_t { - const UnkStruct_ov6_02246254 * unk_00; + const UnkStruct_ov6_02246254 *unk_00; int unk_04; - BGL * unk_08; - StringTemplate * unk_0C; - MessageLoader * unk_10; - Strbuf* unk_14; - GraphicElementManager * unk_18; + BGL *unk_08; + StringTemplate *unk_0C; + MessageLoader *unk_10; + Strbuf *unk_14; + GraphicElementManager *unk_18; UnkStruct_0200C738 unk_1C; - SysTask * unk_1A8; + SysTask *unk_1A8; BOOL unk_1AC; u16 unk_1B0; u16 unk_1B2; u16 unk_1B4; u16 unk_1B6; - void * unk_1B8; + void *unk_1B8; }; struct UnkStruct_ov95_02247004_t { u16 unk_00[96]; - SysTask * unk_C0; - SysTask * unk_C4[8]; - BOOL * unk_E4; + SysTask *unk_C0; + SysTask *unk_C4[8]; + BOOL *unk_E4; BOOL unk_E8; int unk_EC; int unk_F0; @@ -81,7 +79,7 @@ struct UnkStruct_ov95_02247004_t { }; typedef struct { - UnkStruct_ov95_02247004 * unk_00; + UnkStruct_ov95_02247004 *unk_00; int unk_04; int unk_08; int unk_0C; @@ -90,30 +88,30 @@ typedef struct { } UnkStruct_ov95_02247170; struct UnkStruct_ov95_022472C4_t { - BGL * unk_00; - volatile BOOL * unk_04; + BGL *unk_00; + volatile BOOL *unk_04; fx32 unk_08; fx32 unk_0C; fx32 unk_10; fx32 unk_14; int unk_18; int unk_1C; - SysTask * unk_20; + SysTask *unk_20; }; -typedef void *(* UnkFuncPtr_ov95_0224BE8C)(UnkStruct_ov95_02247628 *); -typedef BOOL (* UnkFuncPtr_ov95_0224BE8C_1)(void *, int *); -typedef void (* UnkFuncPtr_ov95_0224BE8C_2)(void *); - -static BOOL ov95_02246DEC(BoxPokemon * param0); -static void ov95_02246F0C(SysTask * param0, void * param1); -static void ov95_02247060(SysTask * param0, void * param1); -static void ov95_02247148(UnkStruct_ov95_02247004 * param0, int param1, int param2, int param3); -static void ov95_02247170(UnkStruct_ov95_02247004 * param0); -static void ov95_02247224(UnkStruct_ov95_02247004 * param0, int param1); -static void ov95_02247254(SysTask * param0, void * param1); -static void ov95_0224732C(SysTask * param0, void * param1); -static void ov95_022473A0(UnkStruct_ov95_022472C4 * param0); +typedef void *(*UnkFuncPtr_ov95_0224BE8C)(UnkStruct_ov95_02247628 *); +typedef BOOL (*UnkFuncPtr_ov95_0224BE8C_1)(void *, int *); +typedef void (*UnkFuncPtr_ov95_0224BE8C_2)(void *); + +static BOOL ov95_02246DEC(BoxPokemon *param0); +static void ov95_02246F0C(SysTask *param0, void *param1); +static void ov95_02247060(SysTask *param0, void *param1); +static void ov95_02247148(UnkStruct_ov95_02247004 *param0, int param1, int param2, int param3); +static void ov95_02247170(UnkStruct_ov95_02247004 *param0); +static void ov95_02247224(UnkStruct_ov95_02247004 *param0, int param1); +static void ov95_02247254(SysTask *param0, void *param1); +static void ov95_0224732C(SysTask *param0, void *param1); +static void ov95_022473A0(UnkStruct_ov95_022472C4 *param0); static void ov95_02247688(void); static void ov95_02247694(void); @@ -123,19 +121,19 @@ static const struct { UnkFuncPtr_ov95_0224BE8C_2 unk_08; int unk_0C; } Unk_ov95_0224BE8C[] = { - {ov95_02247B6C, ov95_02247C34, ov95_02247BC8, 1 | 2}, - {ov95_02248590, ov95_02248650, ov95_022485FC, 1 | 2}, - {ov95_02249740, ov95_022497A0, ov95_02249770, 1 | 2}, - {ov95_02249F90, ov95_02249FC8, ov95_02249FB4, 1}, - {ov95_0224A390, ov95_0224A3FC, ov95_0224A3CC, 1 | 4}, - {ov95_0224ABC0, ov95_0224AC2C, ov95_0224ABF4, 1 | 4}, - {ov95_0224B3D8, ov95_0224B49C, ov95_0224B438, 1 | 4}, + { ov95_02247B6C, ov95_02247C34, ov95_02247BC8, 1 | 2 }, + { ov95_02248590, ov95_02248650, ov95_022485FC, 1 | 2 }, + { ov95_02249740, ov95_022497A0, ov95_02249770, 1 | 2 }, + { ov95_02249F90, ov95_02249FC8, ov95_02249FB4, 1 }, + { ov95_0224A390, ov95_0224A3FC, ov95_0224A3CC, 1 | 4 }, + { ov95_0224ABC0, ov95_0224AC2C, ov95_0224ABF4, 1 | 4 }, + { ov95_0224B3D8, ov95_0224B49C, ov95_0224B438, 1 | 4 }, }; -int ov95_02246C20 (OverlayManager * param0, int * param1) +int ov95_02246C20(OverlayManager *param0, int *param1) { if (ScreenWipe_Done()) { - UnkStruct_ov95_02247628 * v0; + UnkStruct_ov95_02247628 *v0; Heap_Create(3, 57, 98304); Heap_Create(3, 58, 98304); @@ -198,7 +196,7 @@ int ov95_02246C20 (OverlayManager * param0, int * param1) return 0; } -static BOOL ov95_02246DEC (BoxPokemon * param0) +static BOOL ov95_02246DEC(BoxPokemon *param0) { int v0 = BoxPokemon_GetValue(param0, MON_DATA_SPECIES, NULL); int v1 = BoxPokemon_GetValue(param0, MON_DATA_FORM, NULL); @@ -206,10 +204,10 @@ static BOOL ov95_02246DEC (BoxPokemon * param0) return PokemonPersonalData_GetFormValue(v0, v1, 28) == 0; } -int ov95_02246E1C (OverlayManager * param0, int * param1) +int ov95_02246E1C(OverlayManager *param0, int *param1) { OSIntrMode v0; - UnkStruct_ov95_02247628 * v1; + UnkStruct_ov95_02247628 *v1; v0 = OS_DisableInterrupts(); v1 = OverlayManager_Data(param0); @@ -231,9 +229,9 @@ int ov95_02246E1C (OverlayManager * param0, int * param1) return 1; } -int ov95_02246E7C (OverlayManager * param0, int * param1) +int ov95_02246E7C(OverlayManager *param0, int *param1) { - UnkStruct_ov95_02247628 * v0 = OverlayManager_Data(param0); + UnkStruct_ov95_02247628 *v0 = OverlayManager_Data(param0); if (v0->unk_04 < NELEMS(Unk_ov95_0224BE8C)) { if (Unk_ov95_0224BE8C[v0->unk_04].unk_0C & v0->unk_00->unk_10) { @@ -261,9 +259,9 @@ int ov95_02246E7C (OverlayManager * param0, int * param1) } } -static void ov95_02246F0C (SysTask * param0, void * param1) +static void ov95_02246F0C(SysTask *param0, void *param1) { - UnkStruct_ov95_02247628 * v0 = param1; + UnkStruct_ov95_02247628 *v0 = param1; sub_020219F8(v0->unk_18); sub_0200A858(); @@ -271,15 +269,15 @@ static void ov95_02246F0C (SysTask * param0, void * param1) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -UnkStruct_ov95_02247004 * ov95_02246F30 (BOOL * param0, int param1) +UnkStruct_ov95_02247004 *ov95_02246F30(BOOL *param0, int param1) { - UnkStruct_ov95_02247004 * v0 = Heap_AllocFromHeap(57, sizeof(UnkStruct_ov95_02247004)); + UnkStruct_ov95_02247004 *v0 = Heap_AllocFromHeap(57, sizeof(UnkStruct_ov95_02247004)); *param0 = 0; if (v0) { - NNSG2dPaletteData * v1; - void * v2; + NNSG2dPaletteData *v1; + void *v2; u32 v3; int v4; @@ -315,14 +313,14 @@ UnkStruct_ov95_02247004 * ov95_02246F30 (BOOL * param0, int param1) return v0; } -void ov95_02247004 (UnkStruct_ov95_02247004 * param0) +void ov95_02247004(UnkStruct_ov95_02247004 *param0) { if (*(param0->unk_E4) == 1) { param0->unk_E8 = 1; } } -void ov95_02247018 (UnkStruct_ov95_02247004 * param0) +void ov95_02247018(UnkStruct_ov95_02247004 *param0) { if (*(param0->unk_E4) == 1) { int v0; @@ -339,9 +337,9 @@ void ov95_02247018 (UnkStruct_ov95_02247004 * param0) } } -static void ov95_02247060 (SysTask * param0, void * param1) +static void ov95_02247060(SysTask *param0, void *param1) { - UnkStruct_ov95_02247004 * v0 = param1; + UnkStruct_ov95_02247004 *v0 = param1; if (v0->unk_E8 == 0) { if (--(v0->unk_F0) <= 0) { @@ -386,7 +384,7 @@ static void ov95_02247060 (SysTask * param0, void * param1) } } -static void ov95_02247148 (UnkStruct_ov95_02247004 * param0, int param1, int param2, int param3) +static void ov95_02247148(UnkStruct_ov95_02247004 *param0, int param1, int param2, int param3) { if ((param1 >= 0) && (param1 < 96)) { param0->unk_00[param1] = 0x0; @@ -399,10 +397,10 @@ static void ov95_02247148 (UnkStruct_ov95_02247004 * param0, int param1, int par param0->unk_EC = 1; } -static void ov95_02247170 (UnkStruct_ov95_02247004 * param0) +static void ov95_02247170(UnkStruct_ov95_02247004 *param0) { if (param0->unk_C4[param0->unk_F8] == NULL) { - UnkStruct_ov95_02247170 * v0 = Heap_AllocFromHeap(57, sizeof(UnkStruct_ov95_02247170)); + UnkStruct_ov95_02247170 *v0 = Heap_AllocFromHeap(57, sizeof(UnkStruct_ov95_02247170)); if (v0) { v0->unk_00 = param0; @@ -432,7 +430,7 @@ static void ov95_02247170 (UnkStruct_ov95_02247004 * param0) } } -static void ov95_02247224 (UnkStruct_ov95_02247004 * param0, int param1) +static void ov95_02247224(UnkStruct_ov95_02247004 *param0, int param1) { if (param0->unk_C4[param1]) { Heap_FreeToHeap(SysTask_GetParam(param0->unk_C4[param1])); @@ -442,9 +440,9 @@ static void ov95_02247224 (UnkStruct_ov95_02247004 * param0, int param1) } } -static void ov95_02247254 (SysTask * param0, void * param1) +static void ov95_02247254(SysTask *param0, void *param1) { - UnkStruct_ov95_02247170 * v0 = param1; + UnkStruct_ov95_02247170 *v0 = param1; if (++(v0->unk_0C) >= v0->unk_08) { v0->unk_0C = 0; @@ -469,9 +467,9 @@ static void ov95_02247254 (SysTask * param0, void * param1) } } -UnkStruct_ov95_022472C4 * ov95_022472C4 (BGL * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, int param5, volatile BOOL * param6) +UnkStruct_ov95_022472C4 *ov95_022472C4(BGL *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, int param5, volatile BOOL *param6) { - UnkStruct_ov95_022472C4 * v0 = Heap_AllocFromHeap(57, sizeof(UnkStruct_ov95_022472C4)); + UnkStruct_ov95_022472C4 *v0 = Heap_AllocFromHeap(57, sizeof(UnkStruct_ov95_022472C4)); *param6 = 1; @@ -499,9 +497,9 @@ UnkStruct_ov95_022472C4 * ov95_022472C4 (BGL * param0, fx32 param1, fx32 param2, return v0; } -static void ov95_0224732C (SysTask * param0, void * param1) +static void ov95_0224732C(SysTask *param0, void *param1) { - UnkStruct_ov95_022472C4 * v0 = param1; + UnkStruct_ov95_022472C4 *v0 = param1; fx32 v1; v1 = ((v0->unk_08 * v0->unk_10) >> FX32_SHIFT) / 32; @@ -535,10 +533,11 @@ static void ov95_0224732C (SysTask * param0, void * param1) } } -static void ov95_022473A0 (UnkStruct_ov95_022472C4 * param0) +static void ov95_022473A0(UnkStruct_ov95_022472C4 *param0) { static const int v0[] = { - 144, 56, + 144, + 56, }; MtxFx22 v1; @@ -551,21 +550,24 @@ static void ov95_022473A0 (UnkStruct_ov95_022472C4 * param0) sub_02019348(param0->unk_00, 6, &v1, 128, v0[param0->unk_1C]); } -void ov95_022473E8 (UnkStruct_ov95_02247628 * param0, int param1, u32 param2, u32 param3, BOOL param4) +void ov95_022473E8(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 param3, BOOL param4) { ArchivedSprite v0; u32 v1; u32 v2; - void * v3; + void *v3; - v2 = (param4) ? 0x20 * 200 : 0x20 * 100; + v2 = (param4) ? 0x20 * 200 : 0x20 * 100; v3 = Heap_AllocFromHeapAtEnd(57, v2); if (v3) { UnkStruct_02013610 v4 = { - 0, 0, 10, 10, + 0, + 0, + 10, + 10, }; - BoxPokemon * v5; + BoxPokemon *v5; BOOL v6; u32 v7; u16 v8; @@ -594,10 +596,10 @@ void ov95_022473E8 (UnkStruct_ov95_02247628 * param0, int param1, u32 param2, u3 sub_02006E84(v0.archive, v0.palette, v1, param3 * 0x20, 0x20, 57); } -void ov95_022474D4 (UnkStruct_ov95_02247628 * param0, int param1, u32 param2, u32 param3, u32 param4, u32 param5) +void ov95_022474D4(UnkStruct_ov95_02247628 *param0, int param1, u32 param2, u32 param3, u32 param4, u32 param5) { - void * v0; - NNSG2dScreenData * v1; + void *v0; + NNSG2dScreenData *v1; u32 v2; if (param1 == 0) { @@ -615,13 +617,13 @@ void ov95_022474D4 (UnkStruct_ov95_02247628 * param0, int param1, u32 param2, u3 } } -void ov95_02247568 (UnkStruct_ov95_02247568 * param0, u32 param1, u32 param2, u32 param3) +void ov95_02247568(UnkStruct_ov95_02247568 *param0, u32 param1, u32 param2, u32 param3) { param0->unk_00 = sub_02006FA0(param1, param2, 1, &(param0->unk_08), 58); param0->unk_04 = sub_02006FBC(param1, param3, 1, &(param0->unk_0C), 58); } -void ov95_022475A0 (UnkStruct_ov95_02247568 * param0) +void ov95_022475A0(UnkStruct_ov95_02247568 *param0) { if (param0->unk_00) { Heap_FreeToHeap(param0->unk_00); @@ -634,7 +636,7 @@ void ov95_022475A0 (UnkStruct_ov95_02247568 * param0) } } -void ov95_022475C4 (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov95_02247568 * param1, NNSG2dImageProxy * param2, NNSG2dImagePaletteProxy * param3, u32 param4) +void ov95_022475C4(UnkStruct_ov19_021DA864 *param0, UnkStruct_ov95_02247568 *param1, NNSG2dImageProxy *param2, NNSG2dImagePaletteProxy *param3, u32 param4) { param0->unk_00 = param2; param0->unk_08 = param3; @@ -647,9 +649,9 @@ void ov95_022475C4 (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov95_02247568 * param0->unk_1C = 0; } -GraphicElementData * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5) +GraphicElementData *ov95_022475E4(UnkStruct_ov95_02247628 *param0, UnkStruct_ov19_021DA864 *param1, u32 param2, u32 param3, u32 param4, int param5) { - GraphicElementData * v0; + GraphicElementData *v0; UnkStruct_ov83_0223D9A8 v1; v1.unk_00 = param0->unk_18; @@ -671,75 +673,75 @@ GraphicElementData * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, UnkStruct_ return v0; } -BGL * ov95_02247628 (UnkStruct_ov95_02247628 * param0) +BGL *ov95_02247628(UnkStruct_ov95_02247628 *param0) { return param0->unk_08; } -StringTemplate * ov95_0224762C (UnkStruct_ov95_02247628 * param0) +StringTemplate *ov95_0224762C(UnkStruct_ov95_02247628 *param0) { return param0->unk_0C; } -MessageLoader * ov95_02247630 (UnkStruct_ov95_02247628 * param0) +MessageLoader *ov95_02247630(UnkStruct_ov95_02247628 *param0) { return param0->unk_10; } -const BoxPokemon * ov95_02247634 (UnkStruct_ov95_02247628 * param0) +const BoxPokemon *ov95_02247634(UnkStruct_ov95_02247628 *param0) { return param0->unk_00->unk_00; } -const BoxPokemon * ov95_0224763C (UnkStruct_ov95_02247628 * param0) +const BoxPokemon *ov95_0224763C(UnkStruct_ov95_02247628 *param0) { return param0->unk_00->unk_04; } -u32 ov95_02247644 (UnkStruct_ov95_02247628 * param0) +u32 ov95_02247644(UnkStruct_ov95_02247628 *param0) { return param0->unk_00->unk_0C; } -u16 ov95_0224764C (UnkStruct_ov95_02247628 * param0) +u16 ov95_0224764C(UnkStruct_ov95_02247628 *param0) { return param0->unk_1B0; } -u16 ov95_02247654 (UnkStruct_ov95_02247628 * param0) +u16 ov95_02247654(UnkStruct_ov95_02247628 *param0) { return param0->unk_1B2; } -u16 ov95_02247660 (UnkStruct_ov95_02247628 * param0) +u16 ov95_02247660(UnkStruct_ov95_02247628 *param0) { return param0->unk_1B4; } -u16 ov95_02247668 (UnkStruct_ov95_02247628 * param0) +u16 ov95_02247668(UnkStruct_ov95_02247628 *param0) { return param0->unk_1B6; } -int ov95_02247674 (UnkStruct_ov95_02247628 * param0) +int ov95_02247674(UnkStruct_ov95_02247628 *param0) { return Options_Frame(param0->unk_00->unk_14); } -int ov95_02247680 (UnkStruct_ov95_02247628 * param0) +int ov95_02247680(UnkStruct_ov95_02247628 *param0) { return param0->unk_00->unk_10; } static int Unk_ov95_0224C2E0 = 0; -static void * Unk_ov95_0224C2E4[32]; +static void *Unk_ov95_0224C2E4[32]; -static void ov95_02247688 (void) +static void ov95_02247688(void) { Unk_ov95_0224C2E0 = 0; } -static void ov95_02247694 (void) +static void ov95_02247694(void) { if (Unk_ov95_0224C2E0) { int i; @@ -752,7 +754,7 @@ static void ov95_02247694 (void) } } -void ov95_022476C8 (void * param0) +void ov95_022476C8(void *param0) { GF_ASSERT(Unk_ov95_0224C2E0 < 32); Unk_ov95_0224C2E4[Unk_ov95_0224C2E0++] = param0; diff --git a/src/overlay095/ov95_022476F0.c b/src/overlay095/ov95_022476F0.c index 9eb75aa150..76ec33670f 100644 --- a/src/overlay095/ov95_022476F0.c +++ b/src/overlay095/ov95_022476F0.c @@ -1,27 +1,26 @@ +#include "overlay095/ov95_022476F0.h" + #include #include -#include "inlines.h" - #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" - #include "overlay115/camera_angle.h" +#include "camera.h" +#include "heap.h" +#include "inlines.h" #include "narc.h" #include "unk_02006E3C.h" -#include "heap.h" #include "unk_0201C970.h" #include "unk_0201CED8.h" -#include "camera.h" -#include "overlay095/ov95_022476F0.h" struct UnkStruct_ov95_02247958_t { - void * unk_00; + void *unk_00; NNSG3dRenderObj unk_04; - NNSG3dResMdlSet * unk_58; - NNSG3dResMdl * unk_5C; - NNSG3dResTex * unk_60; + NNSG3dResMdlSet *unk_58; + NNSG3dResMdl *unk_5C; + NNSG3dResTex *unk_60; BOOL unk_64; VecFx32 unk_68; VecFx32 unk_74; @@ -30,23 +29,23 @@ struct UnkStruct_ov95_02247958_t { }; struct UnkStruct_ov95_0224773C_t { - Camera * camera; + Camera *camera; VecFx32 unk_04; CameraAngle cameraAngle; - UnkStruct_ov95_02247958 * unk_18; + UnkStruct_ov95_02247958 *unk_18; u32 unk_1C; }; -static void inline inline_ov95_022477B8(MtxFx33 * param0, const VecFx16 * param1); -static void ov95_022477B8(UnkStruct_ov95_02247958 * param0); -static void ov95_02247868(UnkStruct_ov95_02247958 * param0); -static void ov95_0224789C(UnkStruct_ov95_02247958 * param0); -static void ov95_02247AF0(UnkStruct_ov95_0224773C * param0, fx32 param1, fx32 param2, fx32 param3); -static void ov95_02247B5C(UnkStruct_ov95_0224773C * param0); +static void inline inline_ov95_022477B8(MtxFx33 *param0, const VecFx16 *param1); +static void ov95_022477B8(UnkStruct_ov95_02247958 *param0); +static void ov95_02247868(UnkStruct_ov95_02247958 *param0); +static void ov95_0224789C(UnkStruct_ov95_02247958 *param0); +static void ov95_02247AF0(UnkStruct_ov95_0224773C *param0, fx32 param1, fx32 param2, fx32 param3); +static void ov95_02247B5C(UnkStruct_ov95_0224773C *param0); -UnkStruct_ov95_0224773C * ov95_022476F0 (u32 param0, fx32 param1, fx32 param2, fx32 param3) +UnkStruct_ov95_0224773C *ov95_022476F0(u32 param0, fx32 param1, fx32 param2, fx32 param3) { - UnkStruct_ov95_0224773C * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224773C)); + UnkStruct_ov95_0224773C *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224773C)); if (v0) { u32 v1; @@ -64,7 +63,7 @@ UnkStruct_ov95_0224773C * ov95_022476F0 (u32 param0, fx32 param1, fx32 param2, f return v0; } -void ov95_0224773C (UnkStruct_ov95_0224773C * param0) +void ov95_0224773C(UnkStruct_ov95_0224773C *param0) { int v0; @@ -77,7 +76,7 @@ void ov95_0224773C (UnkStruct_ov95_0224773C * param0) Heap_FreeToHeap(param0); } -void ov95_02247770 (UnkStruct_ov95_0224773C * param0) +void ov95_02247770(UnkStruct_ov95_0224773C *param0) { NNS_G3dGePushMtx(); { @@ -95,7 +94,7 @@ void ov95_02247770 (UnkStruct_ov95_0224773C * param0) NNS_G3dGePopMtx(1); } -static void inline inline_ov95_022477B8 (MtxFx33 * param0, const VecFx16 * param1) +static void inline inline_ov95_022477B8(MtxFx33 *param0, const VecFx16 *param1) { MtxFx33 v0; @@ -108,7 +107,7 @@ static void inline inline_ov95_022477B8 (MtxFx33 * param0, const VecFx16 * param MTX_Concat33(&v0, param0, param0); } -static void ov95_022477B8 (UnkStruct_ov95_02247958 * param0) +static void ov95_022477B8(UnkStruct_ov95_02247958 *param0) { MtxFx33 v0; @@ -121,7 +120,7 @@ static void ov95_022477B8 (UnkStruct_ov95_02247958 * param0) sub_0201CA74(¶m0->unk_04, ¶m0->unk_68, &v0, ¶m0->unk_74); } -static void ov95_02247868 (UnkStruct_ov95_02247958 * param0) +static void ov95_02247868(UnkStruct_ov95_02247958 *param0) { param0->unk_64 = 0; param0->unk_00 = NULL; @@ -130,7 +129,7 @@ static void ov95_02247868 (UnkStruct_ov95_02247958 * param0) param0->unk_68.x = param0->unk_68.y = param0->unk_68.z = 0; } -static void ov95_0224789C (UnkStruct_ov95_02247958 * param0) +static void ov95_0224789C(UnkStruct_ov95_02247958 *param0) { if (param0->unk_00) { Heap_FreeToHeap(param0->unk_00); @@ -139,9 +138,9 @@ static void ov95_0224789C (UnkStruct_ov95_02247958 * param0) } } -UnkStruct_ov95_02247958 * ov95_022478B4 (UnkStruct_ov95_0224773C * param0, int param1, u32 param2, u32 param3, fx32 param4, fx32 param5, fx32 param6, BOOL param7) +UnkStruct_ov95_02247958 *ov95_022478B4(UnkStruct_ov95_0224773C *param0, int param1, u32 param2, u32 param3, fx32 param4, fx32 param5, fx32 param6, BOOL param7) { - UnkStruct_ov95_02247958 * v0 = ¶m0->unk_18[param1]; + UnkStruct_ov95_02247958 *v0 = ¶m0->unk_18[param1]; v0->unk_00 = sub_02006FE8(param2, param3, 0, 58, 1); DC_FlushRange(v0->unk_00, NARC_GetMemberSizeByIndexPair(param2, param3)); @@ -166,32 +165,32 @@ UnkStruct_ov95_02247958 * ov95_022478B4 (UnkStruct_ov95_0224773C * param0, int p return v0; } -void ov95_02247958 (const UnkStruct_ov95_02247958 * param0, VecFx32 * param1) +void ov95_02247958(const UnkStruct_ov95_02247958 *param0, VecFx32 *param1) { *param1 = param0->unk_68; } -void ov95_02247968 (UnkStruct_ov95_02247958 * param0, const VecFx32 * param1) +void ov95_02247968(UnkStruct_ov95_02247958 *param0, const VecFx32 *param1) { param0->unk_68 = *param1; } -void ov95_02247978 (const UnkStruct_ov95_02247958 * param0, VecFx16 * param1) +void ov95_02247978(const UnkStruct_ov95_02247958 *param0, VecFx16 *param1) { *param1 = param0->unk_80; } -void ov95_02247990 (UnkStruct_ov95_02247958 * param0, const VecFx16 * param1) +void ov95_02247990(UnkStruct_ov95_02247958 *param0, const VecFx16 *param1) { param0->unk_80 = *param1; } -void ov95_022479A8 (UnkStruct_ov95_02247958 * param0, BOOL param1) +void ov95_022479A8(UnkStruct_ov95_02247958 *param0, BOOL param1) { param0->unk_64 = param1; } -void ov95_022479AC (UnkStruct_ov95_02247958 * param0, int param1) +void ov95_022479AC(UnkStruct_ov95_02247958 *param0, int param1) { param0->unk_88 = param1; @@ -202,14 +201,14 @@ void ov95_022479AC (UnkStruct_ov95_02247958 * param0, int param1) } } -void ov95_022479D4 (UnkStruct_ov95_02247958 * param0, fx32 param1) +void ov95_022479D4(UnkStruct_ov95_02247958 *param0, fx32 param1) { param0->unk_74.x = param1; param0->unk_74.y = param1; param0->unk_74.z = param1; } -BOOL ov95_022479DC (UnkStruct_ov95_02247958 * param0) +BOOL ov95_022479DC(UnkStruct_ov95_02247958 *param0) { MtxFx33 v0; BOOL v1; @@ -226,32 +225,32 @@ BOOL ov95_022479DC (UnkStruct_ov95_02247958 * param0) return v1; } -void ov95_02247A90 (UnkStruct_ov95_0224773C * param0, VecFx32 * param1) +void ov95_02247A90(UnkStruct_ov95_0224773C *param0, VecFx32 *param1) { *param1 = Camera_GetPosition(param0->camera); } -void ov95_02247AB0 (UnkStruct_ov95_0224773C * param0, const CameraAngle * cameraAngle) +void ov95_02247AB0(UnkStruct_ov95_0224773C *param0, const CameraAngle *cameraAngle) { Camera_SetAngleAroundTarget(cameraAngle, param0->camera); } -void ov95_02247AC0 (UnkStruct_ov95_0224773C * param0, const CameraAngle * cameraAngle) +void ov95_02247AC0(UnkStruct_ov95_0224773C *param0, const CameraAngle *cameraAngle) { Camera_AdjustAngleAroundSelf(cameraAngle, param0->camera); } -void ov95_02247AD0 (UnkStruct_ov95_0224773C * param0, u8 param1) +void ov95_02247AD0(UnkStruct_ov95_0224773C *param0, u8 param1) { Camera_ComputeProjectionMatrix(param1, param0->camera); } -void ov95_02247AE0 (UnkStruct_ov95_0224773C * param0, u16 param1) +void ov95_02247AE0(UnkStruct_ov95_0224773C *param0, u16 param1) { Camera_SetFOV(param1, param0->camera); } -static void ov95_02247AF0 (UnkStruct_ov95_0224773C * param0, fx32 param1, fx32 param2, fx32 param3) +static void ov95_02247AF0(UnkStruct_ov95_0224773C *param0, fx32 param1, fx32 param2, fx32 param3) { CameraAngle v0; VecFx32 v1; @@ -275,7 +274,7 @@ static void ov95_02247AF0 (UnkStruct_ov95_0224773C * param0, fx32 param1, fx32 p Camera_SetClipping((0 << FX32_SHIFT), (1000 << FX32_SHIFT), param0->camera); } -static void ov95_02247B5C (UnkStruct_ov95_0224773C * param0) +static void ov95_02247B5C(UnkStruct_ov95_0224773C *param0) { Camera_ClearActive(); Camera_Delete(param0->camera); diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 0ab7a5eacc..99ca93b96c 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -1,72 +1,70 @@ +#include "overlay095/ov95_02247B6C.h" + #include #include +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "pokemon.h" -#include "overlay095/struct_ov95_02247628_decl.h" -#include "overlay095/struct_ov95_0224773C_decl.h" -#include "overlay095/struct_ov95_02247958_decl.h" - -#include "struct_defs/sprite_animation_frame.h" #include "struct_defs/archived_sprite.h" +#include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay095/ov95_02246C20.h" +#include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247568.h" +#include "overlay095/struct_ov95_02247628_decl.h" +#include "overlay095/struct_ov95_0224773C_decl.h" +#include "overlay095/struct_ov95_02247958_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02005474.h" -#include "narc.h" -#include "unk_02006E3C.h" -#include "unk_0200762C.h" +#include "gx_layers.h" +#include "heap.h" #include "message.h" +#include "narc.h" +#include "pokemon.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" +#include "unk_02006E3C.h" +#include "unk_0200762C.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "overlay095/ov95_02246C20.h" -#include "overlay095/ov95_022476F0.h" -#include "overlay095/ov95_02247B6C.h" typedef struct { - UnkStruct_ov95_02247628 * unk_00; + UnkStruct_ov95_02247628 *unk_00; int unk_04; int unk_08; - UnkStruct_02007768 * unk_0C; - Sprite * unk_10; + UnkStruct_02007768 *unk_0C; + Sprite *unk_10; SpriteAnimationFrame unk_14[10]; - GraphicElementData * unk_3C[2]; + GraphicElementData *unk_3C[2]; UnkStruct_ov95_02247568 unk_44; - BGL * unk_54; + BGL *unk_54; Window unk_58; - Strbuf* unk_68; - Strbuf* unk_6C; - UnkStruct_ov95_0224773C * unk_70; - UnkStruct_ov95_02247958 * unk_74; - SysTask * unk_78; - SysTask * unk_7C; - NARC * unk_80; + Strbuf *unk_68; + Strbuf *unk_6C; + UnkStruct_ov95_0224773C *unk_70; + UnkStruct_ov95_02247958 *unk_74; + SysTask *unk_78; + SysTask *unk_7C; + NARC *unk_80; } UnkStruct_ov95_02247C6C; typedef struct { - UnkStruct_ov95_02247C6C * unk_00; + UnkStruct_ov95_02247C6C *unk_00; fx32 unk_04; fx32 unk_08; fx32 unk_0C; @@ -74,8 +72,8 @@ typedef struct { } UnkStruct_ov95_02248364; typedef struct { - UnkStruct_ov95_02247C6C * unk_00; - UnkStruct_ov95_02247958 * unk_04; + UnkStruct_ov95_02247C6C *unk_00; + UnkStruct_ov95_02247958 *unk_04; VecFx32 unk_08; VecFx16 unk_14; fx32 unk_1C; @@ -85,28 +83,28 @@ typedef struct { fx16 unk_2C; } UnkStruct_ov95_02248420; -static void ov95_02247C6C(UnkStruct_ov95_02247C6C * param0); -static int ov95_02247CB4(UnkStruct_ov95_02247C6C * param0, int * param1); -static int ov95_02247ED8(UnkStruct_ov95_02247C6C * param0, int * param1); -static int ov95_02247F04(UnkStruct_ov95_02247C6C * param0, int * param1); -static int ov95_02248090(UnkStruct_ov95_02247C6C * param0, int * param1); -static void ov95_02248174(UnkStruct_ov95_02247C6C * param0); -static Sprite * ov95_02248240(UnkStruct_ov95_02247C6C * param0); -static void ov95_0224829C(UnkStruct_ov95_02247C6C * param0); -static void ov95_02248340(UnkStruct_ov95_02247C6C * param0); -static void ov95_02248364(UnkStruct_ov95_02247C6C * param0, int param1, int param2, int param3); -static BOOL ov95_022483B4(UnkStruct_ov95_02247C6C * param0); -static void ov95_022483C4(UnkStruct_ov95_02247C6C * param0); -static void ov95_022483E4(SysTask * param0, void * param1); -static void ov95_02248420(UnkStruct_ov95_02247C6C * param0); -static BOOL ov95_0224846C(UnkStruct_ov95_02247C6C * param0); -static int ov95_0224847C(UnkStruct_ov95_02247C6C * param0); -static void ov95_02248490(UnkStruct_ov95_02247C6C * param0); -static void ov95_022484B0(SysTask * param0, void * param1); - -void * ov95_02247B6C (UnkStruct_ov95_02247628 * param0) +static void ov95_02247C6C(UnkStruct_ov95_02247C6C *param0); +static int ov95_02247CB4(UnkStruct_ov95_02247C6C *param0, int *param1); +static int ov95_02247ED8(UnkStruct_ov95_02247C6C *param0, int *param1); +static int ov95_02247F04(UnkStruct_ov95_02247C6C *param0, int *param1); +static int ov95_02248090(UnkStruct_ov95_02247C6C *param0, int *param1); +static void ov95_02248174(UnkStruct_ov95_02247C6C *param0); +static Sprite *ov95_02248240(UnkStruct_ov95_02247C6C *param0); +static void ov95_0224829C(UnkStruct_ov95_02247C6C *param0); +static void ov95_02248340(UnkStruct_ov95_02247C6C *param0); +static void ov95_02248364(UnkStruct_ov95_02247C6C *param0, int param1, int param2, int param3); +static BOOL ov95_022483B4(UnkStruct_ov95_02247C6C *param0); +static void ov95_022483C4(UnkStruct_ov95_02247C6C *param0); +static void ov95_022483E4(SysTask *param0, void *param1); +static void ov95_02248420(UnkStruct_ov95_02247C6C *param0); +static BOOL ov95_0224846C(UnkStruct_ov95_02247C6C *param0); +static int ov95_0224847C(UnkStruct_ov95_02247C6C *param0); +static void ov95_02248490(UnkStruct_ov95_02247C6C *param0); +static void ov95_022484B0(SysTask *param0, void *param1); + +void *ov95_02247B6C(UnkStruct_ov95_02247628 *param0) { - UnkStruct_ov95_02247C6C * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02247C6C)); + UnkStruct_ov95_02247C6C *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02247C6C)); if (v0) { int v1; @@ -126,9 +124,9 @@ void * ov95_02247B6C (UnkStruct_ov95_02247628 * param0) return v0; } -void ov95_02247BC8 (void * param0) +void ov95_02247BC8(void *param0) { - UnkStruct_ov95_02247C6C * v0 = param0; + UnkStruct_ov95_02247C6C *v0 = param0; if (v0) { int v1; @@ -157,16 +155,16 @@ void ov95_02247BC8 (void * param0) } } -BOOL ov95_02247C34 (void * param0, int * param1) +BOOL ov95_02247C34(void *param0, int *param1) { - static int(*const v0[])(UnkStruct_ov95_02247C6C *, int *) = { + static int (*const v0[])(UnkStruct_ov95_02247C6C *, int *) = { ov95_02247CB4, ov95_02247ED8, ov95_02247F04, ov95_02248090, }; - UnkStruct_ov95_02247C6C * v1 = param0; + UnkStruct_ov95_02247C6C *v1 = param0; if ((*param1) < NELEMS(v0)) { if (v0[*param1](v1, &(v1->unk_04))) { @@ -182,7 +180,7 @@ BOOL ov95_02247C34 (void * param0, int * param1) return 1; } -static void ov95_02247C6C (UnkStruct_ov95_02247C6C * param0) +static void ov95_02247C6C(UnkStruct_ov95_02247C6C *param0) { G3X_Reset(); NNS_G3dGePushMtx(); @@ -201,7 +199,7 @@ static void ov95_02247C6C (UnkStruct_ov95_02247C6C * param0) G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z); } -static int ov95_02247CB4 (UnkStruct_ov95_02247C6C * param0, int * param1) +static int ov95_02247CB4(UnkStruct_ov95_02247C6C *param0, int *param1) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -285,7 +283,7 @@ static int ov95_02247CB4 (UnkStruct_ov95_02247C6C * param0, int * param1) param0->unk_74 = ov95_022478B4(param0->unk_70, 0, 93, 27, 0, 147456 + 4294928384, 245760 + 227328, 0); { - VecFx16 v4 = {0x0, 0xf000, 0x0}; + VecFx16 v4 = { 0x0, 0xf000, 0x0 }; ov95_02247990(param0->unk_74, &v4); } @@ -302,7 +300,7 @@ static int ov95_02247CB4 (UnkStruct_ov95_02247C6C * param0, int * param1) return 1; } -static int ov95_02247ED8 (UnkStruct_ov95_02247C6C * param0, int * param1) +static int ov95_02247ED8(UnkStruct_ov95_02247C6C *param0, int *param1) { switch (*param1) { case 0: @@ -317,7 +315,7 @@ static int ov95_02247ED8 (UnkStruct_ov95_02247C6C * param0, int * param1) return 0; } -static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) +static int ov95_02247F04(UnkStruct_ov95_02247C6C *param0, int *param1) { switch (*param1) { case 0: @@ -326,8 +324,8 @@ static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) break; case 1: if (++(param0->unk_08) > 10) { - MessageLoader * v0 = ov95_02247630(param0->unk_00); - StringTemplate * v1 = ov95_0224762C(param0->unk_00); + MessageLoader *v0 = ov95_02247630(param0->unk_00); + StringTemplate *v1 = ov95_0224762C(param0->unk_00); int v2, v3; if (ov95_02247680(param0->unk_00) == 1) { @@ -349,14 +347,14 @@ static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) break; case 2: if (++(param0->unk_08) > 60) { - MessageLoader * v4 = ov95_02247630(param0->unk_00); - StringTemplate * v5 = ov95_0224762C(param0->unk_00); + MessageLoader *v4 = ov95_02247630(param0->unk_00); + StringTemplate *v5 = ov95_0224762C(param0->unk_00); MessageLoader_GetStrbuf(v4, 1, param0->unk_68); StringTemplate_Format(v5, param0->unk_6C, param0->unk_68); { - const BoxPokemon * v6 = ov95_02247634(param0->unk_00); + const BoxPokemon *v6 = ov95_02247634(param0->unk_00); if (BoxPokemon_GetValue((BoxPokemon *)v6, MON_DATA_IS_EGG, NULL) == 0) { u8 v7; @@ -391,7 +389,7 @@ static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) return 0; } -static int ov95_02248090 (UnkStruct_ov95_02247C6C * param0, int * param1) +static int ov95_02248090(UnkStruct_ov95_02247C6C *param0, int *param1) { switch (*param1) { case 0: @@ -433,7 +431,7 @@ static int ov95_02248090 (UnkStruct_ov95_02247C6C * param0, int * param1) return 0; } -static void ov95_02248174 (UnkStruct_ov95_02247C6C * param0) +static void ov95_02248174(UnkStruct_ov95_02247C6C *param0) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -460,10 +458,10 @@ static void ov95_02248174 (UnkStruct_ov95_02247C6C * param0) sub_02008A84(param0->unk_0C, NNS_GfdGetPlttKeyAddr(v1), NNS_GfdGetPlttKeySize(v1)); } -static Sprite * ov95_02248240 (UnkStruct_ov95_02247C6C * param0) +static Sprite *ov95_02248240(UnkStruct_ov95_02247C6C *param0) { ArchivedSprite v0; - BoxPokemon * v1; + BoxPokemon *v1; int v2; v1 = (BoxPokemon *)ov95_02247634(param0->unk_00); @@ -476,7 +474,7 @@ static Sprite * ov95_02248240 (UnkStruct_ov95_02247C6C * param0) return sub_02007C34(param0->unk_0C, &v0, 128, v2, 0, 0, param0->unk_14, NULL); } -static void ov95_0224829C (UnkStruct_ov95_02247C6C * param0) +static void ov95_0224829C(UnkStruct_ov95_02247C6C *param0) { NNSG2dImagePaletteProxy v0; NNSG2dImageProxy v1; @@ -500,7 +498,7 @@ static void ov95_0224829C (UnkStruct_ov95_02247C6C * param0) sub_02021CAC(param0->unk_3C[1], 0); } -static void ov95_02248340 (UnkStruct_ov95_02247C6C * param0) +static void ov95_02248340(UnkStruct_ov95_02247C6C *param0) { int v0; @@ -513,9 +511,9 @@ static void ov95_02248340 (UnkStruct_ov95_02247C6C * param0) ov95_022475A0(¶m0->unk_44); } -static void ov95_02248364 (UnkStruct_ov95_02247C6C * param0, int param1, int param2, int param3) +static void ov95_02248364(UnkStruct_ov95_02247C6C *param0, int param1, int param2, int param3) { - UnkStruct_ov95_02248364 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02248364)); + UnkStruct_ov95_02248364 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02248364)); if (v0) { v0->unk_00 = param0; @@ -529,12 +527,12 @@ static void ov95_02248364 (UnkStruct_ov95_02247C6C * param0, int param1, int par } } -static BOOL ov95_022483B4 (UnkStruct_ov95_02247C6C * param0) +static BOOL ov95_022483B4(UnkStruct_ov95_02247C6C *param0) { return param0->unk_78 == NULL; } -static void ov95_022483C4 (UnkStruct_ov95_02247C6C * param0) +static void ov95_022483C4(UnkStruct_ov95_02247C6C *param0) { if (param0->unk_78) { ov95_022476C8(SysTask_GetParam(param0->unk_78)); @@ -543,9 +541,9 @@ static void ov95_022483C4 (UnkStruct_ov95_02247C6C * param0) } } -static void ov95_022483E4 (SysTask * param0, void * param1) +static void ov95_022483E4(SysTask *param0, void *param1) { - UnkStruct_ov95_02248364 * v0 = param1; + UnkStruct_ov95_02248364 *v0 = param1; int v1; if (--(v0->unk_10) > 0) { @@ -559,9 +557,9 @@ static void ov95_022483E4 (SysTask * param0, void * param1) } } -static void ov95_02248420 (UnkStruct_ov95_02247C6C * param0) +static void ov95_02248420(UnkStruct_ov95_02247C6C *param0) { - UnkStruct_ov95_02248420 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02248420)); + UnkStruct_ov95_02248420 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02248420)); if (v0) { v0->unk_00 = param0; @@ -580,22 +578,22 @@ static void ov95_02248420 (UnkStruct_ov95_02247C6C * param0) } } -static BOOL ov95_0224846C (UnkStruct_ov95_02247C6C * param0) +static BOOL ov95_0224846C(UnkStruct_ov95_02247C6C *param0) { return param0->unk_7C == NULL; } -static int ov95_0224847C (UnkStruct_ov95_02247C6C * param0) +static int ov95_0224847C(UnkStruct_ov95_02247C6C *param0) { if (param0->unk_7C) { - UnkStruct_ov95_02248420 * v0 = SysTask_GetParam(param0->unk_7C); + UnkStruct_ov95_02248420 *v0 = SysTask_GetParam(param0->unk_7C); return v0->unk_20; } return 0; } -static void ov95_02248490 (UnkStruct_ov95_02247C6C * param0) +static void ov95_02248490(UnkStruct_ov95_02247C6C *param0) { if (param0->unk_7C) { Heap_FreeToHeap(SysTask_GetParam(param0->unk_7C)); @@ -604,9 +602,9 @@ static void ov95_02248490 (UnkStruct_ov95_02247C6C * param0) } } -static void ov95_022484B0 (SysTask * param0, void * param1) +static void ov95_022484B0(SysTask *param0, void *param1) { - UnkStruct_ov95_02248420 * v0 = param1; + UnkStruct_ov95_02248420 *v0 = param1; BOOL v1 = 0; if (v0->unk_24 == 0) { diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c index 01c403f48e..a1f8564d9e 100644 --- a/src/overlay095/ov95_02248590.c +++ b/src/overlay095/ov95_02248590.c @@ -1,37 +1,37 @@ -#include "enums.h" +#include "overlay095/ov95_02248590.h" #include #include #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" +#include "struct_defs/struct_02099F80.h" + +#include "overlay019/struct_ov19_021DA864.h" +#include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay095/ov95_02246C20.h" +#include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247004_decl.h" #include "overlay095/struct_ov95_022472C4_decl.h" +#include "overlay095/struct_ov95_02247568.h" #include "overlay095/struct_ov95_02247628_decl.h" #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" - -#include "struct_defs/struct_02099F80.h" -#include "overlay019/struct_ov19_021DA864.h" -#include "overlay084/struct_ov84_0223BA5C.h" -#include "overlay095/struct_ov95_02247568.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "sys_task.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D15C.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_0202419C.h" -#include "overlay095/ov95_02246C20.h" -#include "overlay095/ov95_022476F0.h" -#include "overlay095/ov95_02248590.h" enum { UnkEnum_ov95_022488A4_00 = 0x480, @@ -98,8 +98,8 @@ typedef struct { } UnkStruct_ov95_0224922C_sub1; typedef struct { - UnkStruct_ov95_02247958 * unk_00; - UnkStruct_ov95_0224773C * unk_04; + UnkStruct_ov95_02247958 *unk_00; + UnkStruct_ov95_0224773C *unk_04; VecFx32 unk_08; VecFx32 unk_14; VecFx16 unk_20; @@ -126,28 +126,28 @@ typedef struct { } UnkStruct_ov95_0224922C; typedef struct { - UnkStruct_ov95_02247628 * unk_00; + UnkStruct_ov95_02247628 *unk_00; int unk_04; int unk_08; UnkStruct_ov95_02247568 unk_0C; - GraphicElementData * unk_1C[20][2]; + GraphicElementData *unk_1C[20][2]; u32 unk_BC; - BGL * unk_C0; - UnkStruct_ov95_02247004 * unk_C4; + BGL *unk_C0; + UnkStruct_ov95_02247004 *unk_C4; BOOL unk_C8; - UnkStruct_ov95_022472C4 * unk_CC; + UnkStruct_ov95_022472C4 *unk_CC; volatile BOOL unk_D0; - UnkStruct_ov95_0224773C * unk_D4; - UnkStruct_ov95_02247958 * unk_D8; + UnkStruct_ov95_0224773C *unk_D4; + UnkStruct_ov95_02247958 *unk_D8; UnkStruct_ov95_0224922C unk_DC; - SysTask * unk_160; - SysTask * unk_164; + SysTask *unk_160; + SysTask *unk_164; BOOL unk_168; } UnkStruct_ov95_02248688; typedef struct { - SysTask ** unk_00; - UnkStruct_ov95_02248688 * unk_04; + SysTask **unk_00; + UnkStruct_ov95_02248688 *unk_04; BOOL unk_08[20]; VecFx32 unk_58[20]; int unk_148; @@ -155,15 +155,15 @@ typedef struct { } UnkStruct_ov95_02248E5C; typedef struct { - UnkStruct_ov95_02248688 * unk_00; + UnkStruct_ov95_02248688 *unk_00; UnkStruct_ov95_02248E5C unk_04; - BGL * unk_154; + BGL *unk_154; fx32 unk_158; fx32 unk_15C; fx32 unk_160; fx32 unk_164; - SysTask ** unk_168; - SysTask * unk_16C; + SysTask **unk_168; + SysTask *unk_16C; } UnkStruct_ov95_02248FAC; typedef struct { @@ -171,48 +171,48 @@ typedef struct { fx32 unk_04; fx32 unk_08; int unk_0C; - UnkStruct_ov95_02247958 * unk_10; + UnkStruct_ov95_02247958 *unk_10; } UnkStruct_ov95_022490D0; -static void ov95_02248C98(UnkStruct_ov95_02248688 * param0); -static void ov95_02248688(UnkStruct_ov95_02248688 * param0); -static int ov95_022486AC(UnkStruct_ov95_02248688 * param0, int * param1); -static int ov95_022486E0(UnkStruct_ov95_02248688 * param0, int * param1); -static int ov95_02248728(UnkStruct_ov95_02248688 * param0, int * param1); -static int ov95_022487D4(UnkStruct_ov95_02248688 * param0, int * param1); -static void ov95_022488A4(UnkStruct_ov95_02248688 * param0); -static void ov95_02248B3C(UnkStruct_ov95_02248688 * param0); -static void ov95_02248B84(UnkStruct_ov95_02248688 * param0); -static void ov95_02248CA8(UnkStruct_ov95_02248688 * param0); -static void ov95_02248DC4(UnkStruct_ov95_02248688 * param0); -static void ov95_02248DF4(UnkStruct_ov95_02248688 * param0); -static void ov95_02248E00(SysTask * param0, void * param1); -static void ov95_02248EC4(SysTask * param0, void * param1); -static void ov95_02248F94(SysTask * param0); -static void ov95_02248FAC(UnkStruct_ov95_02248688 * param0, SysTask ** param1); -static void ov95_02249020(SysTask * param0, void * param1); -static void ov95_022490A4(SysTask * param0); -static void ov95_022490D0(UnkStruct_ov95_02247958 * param0, int param1, int param2, int param3); -static void ov95_02249118(SysTask * param0, void * param1); -static SysTask * ov95_02249154(UnkStruct_ov95_02248688 * param0); -static void ov95_0224922C(UnkStruct_ov95_0224922C * param0, fx32 param1, int param2); -static void ov95_02249268(UnkStruct_ov95_0224922C * param0, fx32 param1, fx32 param2, int param3); -static void ov95_022492A4(UnkStruct_ov95_0224922C * param0, int param1, fx32 param2, int param3); -static void ov95_022492DC(UnkStruct_ov95_0224922C * param0); -static void ov95_02249424(SysTask * param0, void * param1); -static void ov95_022494A8(SysTask * param0, void * param1); -static BOOL ov95_022494F4(SysTask * param0); -static BOOL ov95_02249500(SysTask * param0); -static void ov95_0224950C(SysTask * param0); -static void ov95_0224959C(SysTask * param0, void * param1); -static void ov95_022495F8(SysTask * param0, void * param1); -static void ov95_02249658(SysTask * param0, void * param1); -static void ov95_022496B4(SysTask * param0, void * param1); -static void ov95_02249700(SysTask * param0, void * param1); - -void * ov95_02248590 (UnkStruct_ov95_02247628 * param0) +static void ov95_02248C98(UnkStruct_ov95_02248688 *param0); +static void ov95_02248688(UnkStruct_ov95_02248688 *param0); +static int ov95_022486AC(UnkStruct_ov95_02248688 *param0, int *param1); +static int ov95_022486E0(UnkStruct_ov95_02248688 *param0, int *param1); +static int ov95_02248728(UnkStruct_ov95_02248688 *param0, int *param1); +static int ov95_022487D4(UnkStruct_ov95_02248688 *param0, int *param1); +static void ov95_022488A4(UnkStruct_ov95_02248688 *param0); +static void ov95_02248B3C(UnkStruct_ov95_02248688 *param0); +static void ov95_02248B84(UnkStruct_ov95_02248688 *param0); +static void ov95_02248CA8(UnkStruct_ov95_02248688 *param0); +static void ov95_02248DC4(UnkStruct_ov95_02248688 *param0); +static void ov95_02248DF4(UnkStruct_ov95_02248688 *param0); +static void ov95_02248E00(SysTask *param0, void *param1); +static void ov95_02248EC4(SysTask *param0, void *param1); +static void ov95_02248F94(SysTask *param0); +static void ov95_02248FAC(UnkStruct_ov95_02248688 *param0, SysTask **param1); +static void ov95_02249020(SysTask *param0, void *param1); +static void ov95_022490A4(SysTask *param0); +static void ov95_022490D0(UnkStruct_ov95_02247958 *param0, int param1, int param2, int param3); +static void ov95_02249118(SysTask *param0, void *param1); +static SysTask *ov95_02249154(UnkStruct_ov95_02248688 *param0); +static void ov95_0224922C(UnkStruct_ov95_0224922C *param0, fx32 param1, int param2); +static void ov95_02249268(UnkStruct_ov95_0224922C *param0, fx32 param1, fx32 param2, int param3); +static void ov95_022492A4(UnkStruct_ov95_0224922C *param0, int param1, fx32 param2, int param3); +static void ov95_022492DC(UnkStruct_ov95_0224922C *param0); +static void ov95_02249424(SysTask *param0, void *param1); +static void ov95_022494A8(SysTask *param0, void *param1); +static BOOL ov95_022494F4(SysTask *param0); +static BOOL ov95_02249500(SysTask *param0); +static void ov95_0224950C(SysTask *param0); +static void ov95_0224959C(SysTask *param0, void *param1); +static void ov95_022495F8(SysTask *param0, void *param1); +static void ov95_02249658(SysTask *param0, void *param1); +static void ov95_022496B4(SysTask *param0, void *param1); +static void ov95_02249700(SysTask *param0, void *param1); + +void *ov95_02248590(UnkStruct_ov95_02247628 *param0) { - UnkStruct_ov95_02248688 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02248688)); + UnkStruct_ov95_02248688 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02248688)); if (v0) { int v1; @@ -235,10 +235,10 @@ void * ov95_02248590 (UnkStruct_ov95_02247628 * param0) return v0; } -void ov95_022485FC (void * param0) +void ov95_022485FC(void *param0) { OSIntrMode v0; - UnkStruct_ov95_02248688 * v1; + UnkStruct_ov95_02248688 *v1; v0 = OS_DisableInterrupts(); v1 = param0; @@ -265,16 +265,16 @@ void ov95_022485FC (void * param0) OS_RestoreInterrupts(v0); } -BOOL ov95_02248650 (void * param0, int * param1) +BOOL ov95_02248650(void *param0, int *param1) { - static int(*const v0[])(UnkStruct_ov95_02248688 *, int *) = { + static int (*const v0[])(UnkStruct_ov95_02248688 *, int *) = { ov95_022486AC, ov95_022486E0, ov95_02248728, ov95_022487D4 }; - UnkStruct_ov95_02248688 * v1 = param0; + UnkStruct_ov95_02248688 *v1 = param0; if ((*param1) < NELEMS(v0)) { if (v0[*param1](v1, &(v1->unk_04))) { @@ -290,7 +290,7 @@ BOOL ov95_02248650 (void * param0, int * param1) return 1; } -static void ov95_02248688 (UnkStruct_ov95_02248688 * param0) +static void ov95_02248688(UnkStruct_ov95_02248688 *param0) { if (param0->unk_D4) { G3X_Reset(); @@ -300,7 +300,7 @@ static void ov95_02248688 (UnkStruct_ov95_02248688 * param0) } } -static int ov95_022486AC (UnkStruct_ov95_02248688 * param0, int * param1) +static int ov95_022486AC(UnkStruct_ov95_02248688 *param0, int *param1) { ov95_022488A4(param0); ov95_02248B84(param0); @@ -310,7 +310,7 @@ static int ov95_022486AC (UnkStruct_ov95_02248688 * param0, int * param1) return 1; } -static int ov95_022486E0 (UnkStruct_ov95_02248688 * param0, int * param1) +static int ov95_022486E0(UnkStruct_ov95_02248688 *param0, int *param1) { static int v0 = 0; @@ -336,7 +336,7 @@ static int ov95_022486E0 (UnkStruct_ov95_02248688 * param0, int * param1) return 0; } -static int ov95_02248728 (UnkStruct_ov95_02248688 * param0, int * param1) +static int ov95_02248728(UnkStruct_ov95_02248688 *param0, int *param1) { switch (*param1) { case 0: @@ -370,7 +370,7 @@ static int ov95_02248728 (UnkStruct_ov95_02248688 * param0, int * param1) return 0; } -static int ov95_022487D4 (UnkStruct_ov95_02248688 * param0, int * param1) +static int ov95_022487D4(UnkStruct_ov95_02248688 *param0, int *param1) { switch (*param1) { case 0: @@ -412,7 +412,7 @@ static int ov95_022487D4 (UnkStruct_ov95_02248688 * param0, int * param1) return 0; } -static void ov95_022488A4 (UnkStruct_ov95_02248688 * param0) +static void ov95_022488A4(UnkStruct_ov95_02248688 *param0) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -504,7 +504,7 @@ static void ov95_022488A4 (UnkStruct_ov95_02248688 * param0) sub_02006E60(93, 4, param0->unk_C0, 7, 0, 0, 1, 58); { - u8 * v7 = Heap_AllocFromHeap(58, 96); + u8 *v7 = Heap_AllocFromHeap(58, 96); if (v7) { MI_CpuClear32(v7, 96); @@ -531,7 +531,7 @@ static void ov95_022488A4 (UnkStruct_ov95_02248688 * param0) param0->unk_CC = ov95_022472C4(param0->unk_C0, UnkEnum_ov95_022488A4_00, 0x1000, UnkEnum_ov95_022488A4_01, UnkEnum_ov95_022488A4_02, 0, &(param0->unk_D0)); } -static void ov95_02248B3C (UnkStruct_ov95_02248688 * param0) +static void ov95_02248B3C(UnkStruct_ov95_02248688 *param0) { if (param0->unk_C8) { ov95_02247018(param0->unk_C4); @@ -543,7 +543,7 @@ static void ov95_02248B3C (UnkStruct_ov95_02248688 * param0) sub_02019044(param0->unk_C0, 7); } -static void ov95_02248B84 (UnkStruct_ov95_02248688 * param0) +static void ov95_02248B84(UnkStruct_ov95_02248688 *param0) { static const GXRgb v0[8] = { GX_RGB(4, 4, 4), @@ -592,14 +592,14 @@ static void ov95_02248B84 (UnkStruct_ov95_02248688 * param0) ov95_022479D4(param0->unk_D8, UnkEnum_ov95_02248B84_00); } -static void ov95_02248C98 (UnkStruct_ov95_02248688 * param0) +static void ov95_02248C98(UnkStruct_ov95_02248688 *param0) { if (param0->unk_D4) { ov95_0224773C(param0->unk_D4); } } -static void ov95_02248CA8 (UnkStruct_ov95_02248688 * param0) +static void ov95_02248CA8(UnkStruct_ov95_02248688 *param0) { NNSG2dImagePaletteProxy v0; NNSG2dImageProxy v1; @@ -633,7 +633,7 @@ static void ov95_02248CA8 (UnkStruct_ov95_02248688 * param0) } } -static void ov95_02248DC4 (UnkStruct_ov95_02248688 * param0) +static void ov95_02248DC4(UnkStruct_ov95_02248688 *param0) { int v0; @@ -650,14 +650,14 @@ static void ov95_02248DC4 (UnkStruct_ov95_02248688 * param0) ov95_022475A0(¶m0->unk_0C); } -static void ov95_02248DF4 (UnkStruct_ov95_02248688 * param0) +static void ov95_02248DF4(UnkStruct_ov95_02248688 *param0) { param0->unk_168 = 1; } -static void ov95_02248E00 (SysTask * param0, void * param1) +static void ov95_02248E00(SysTask *param0, void *param1) { - UnkStruct_ov95_02248688 * v0 = param1; + UnkStruct_ov95_02248688 *v0 = param1; if (v0->unk_168) { v0->unk_168 = 0; @@ -671,7 +671,7 @@ static void ov95_02248E00 (SysTask * param0, void * param1) } } -static void ov95_02248E5C (UnkStruct_ov95_02248688 * param0, SysTask ** param1, UnkStruct_ov95_02248E5C * param2) +static void ov95_02248E5C(UnkStruct_ov95_02248688 *param0, SysTask **param1, UnkStruct_ov95_02248E5C *param2) { int v0; @@ -692,9 +692,9 @@ static void ov95_02248E5C (UnkStruct_ov95_02248688 * param0, SysTask ** param1, } } -static void ov95_02248EC4 (SysTask * param0, void * param1) +static void ov95_02248EC4(SysTask *param0, void *param1) { - UnkStruct_ov95_02248E5C * v0 = param1; + UnkStruct_ov95_02248E5C *v0 = param1; VecFx32 v1; int v2; @@ -728,19 +728,19 @@ static void ov95_02248EC4 (SysTask * param0, void * param1) } } -static void ov95_02248F94 (SysTask * param0) +static void ov95_02248F94(SysTask *param0) { if (param0) { - UnkStruct_ov95_02248E5C * v0 = SysTask_GetParam(param0); + UnkStruct_ov95_02248E5C *v0 = SysTask_GetParam(param0); *(v0->unk_00) = NULL; SysTask_Done(param0); } } -static void ov95_02248FAC (UnkStruct_ov95_02248688 * param0, SysTask ** param1) +static void ov95_02248FAC(UnkStruct_ov95_02248688 *param0, SysTask **param1) { - UnkStruct_ov95_02248FAC * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02248FAC)); + UnkStruct_ov95_02248FAC *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02248FAC)); if (v0) { v0->unk_00 = param0; @@ -760,9 +760,9 @@ static void ov95_02248FAC (UnkStruct_ov95_02248688 * param0, SysTask ** param1) } } -static void ov95_02249020 (SysTask * param0, void * param1) +static void ov95_02249020(SysTask *param0, void *param1) { - UnkStruct_ov95_02248FAC * v0 = param1; + UnkStruct_ov95_02248FAC *v0 = param1; if (v0->unk_164 < UnkEnum_ov95_02249020_01) { v0->unk_160 += UnkEnum_ov95_02249020_00; @@ -779,10 +779,10 @@ static void ov95_02249020 (SysTask * param0, void * param1) } } -static void ov95_022490A4 (SysTask * param0) +static void ov95_022490A4(SysTask *param0) { if (param0) { - UnkStruct_ov95_02248FAC * v0 = SysTask_GetParam(param0); + UnkStruct_ov95_02248FAC *v0 = SysTask_GetParam(param0); *(v0->unk_168) = NULL; ov95_02248F94(v0->unk_16C); @@ -791,9 +791,9 @@ static void ov95_022490A4 (SysTask * param0) } } -static void ov95_022490D0 (UnkStruct_ov95_02247958 * param0, int param1, int param2, int param3) +static void ov95_022490D0(UnkStruct_ov95_02247958 *param0, int param1, int param2, int param3) { - UnkStruct_ov95_022490D0 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_022490D0)); + UnkStruct_ov95_022490D0 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_022490D0)); if (v0) { v0->unk_00 = param1 << 12; @@ -807,9 +807,9 @@ static void ov95_022490D0 (UnkStruct_ov95_02247958 * param0, int param1, int par } } -static void ov95_02249118 (SysTask * param0, void * param1) +static void ov95_02249118(SysTask *param0, void *param1) { - UnkStruct_ov95_022490D0 * v0 = param1; + UnkStruct_ov95_022490D0 *v0 = param1; if (--(v0->unk_0C) > 0) { v0->unk_00 += v0->unk_04; @@ -821,9 +821,9 @@ static void ov95_02249118 (SysTask * param0, void * param1) } } -static SysTask * ov95_02249154 (UnkStruct_ov95_02248688 * param0) +static SysTask *ov95_02249154(UnkStruct_ov95_02248688 *param0) { - UnkStruct_ov95_0224922C * v0 = &(param0->unk_DC); + UnkStruct_ov95_0224922C *v0 = &(param0->unk_DC); int v1; ov95_02247958(param0->unk_D8, &v0->unk_08); @@ -859,7 +859,7 @@ static SysTask * ov95_02249154 (UnkStruct_ov95_02248688 * param0) return SysTask_Start(ov95_02249424, v0, 0); } -static void ov95_0224922C (UnkStruct_ov95_0224922C * param0, fx32 param1, int param2) +static void ov95_0224922C(UnkStruct_ov95_0224922C *param0, fx32 param1, int param2) { if (param2) { param0->unk_5A = (int)(param1 - param0->unk_56) / param2; @@ -872,7 +872,7 @@ static void ov95_0224922C (UnkStruct_ov95_0224922C * param0, fx32 param1, int pa param0->unk_74 = param2; } -static void ov95_02249268 (UnkStruct_ov95_0224922C * param0, fx32 param1, fx32 param2, int param3) +static void ov95_02249268(UnkStruct_ov95_0224922C *param0, fx32 param1, fx32 param2, int param3) { if (param3) { param0->unk_40 = (param1 - param0->unk_38) / param3; @@ -886,7 +886,7 @@ static void ov95_02249268 (UnkStruct_ov95_0224922C * param0, fx32 param1, fx32 p param0->unk_50 = param3; } -static void ov95_022492A4 (UnkStruct_ov95_0224922C * param0, int param1, fx32 param2, int param3) +static void ov95_022492A4(UnkStruct_ov95_0224922C *param0, int param1, fx32 param2, int param3) { if (param3) { param0->unk_5C[param1].unk_02 = (param2 - param0->unk_5C[param1].unk_00) / param3; @@ -896,7 +896,7 @@ static void ov95_022492A4 (UnkStruct_ov95_0224922C * param0, int param1, fx32 pa param0->unk_5C[param1].unk_06 = param3; } -static void ov95_022492DC (UnkStruct_ov95_0224922C * param0) +static void ov95_022492DC(UnkStruct_ov95_0224922C *param0) { int v0, v1; @@ -949,9 +949,9 @@ static void ov95_022492DC (UnkStruct_ov95_0224922C * param0) param0->unk_20.z += param0->unk_5C[2].unk_00; } -static void ov95_02249424 (SysTask * param0, void * param1) +static void ov95_02249424(SysTask *param0, void *param1) { - UnkStruct_ov95_0224922C * v0 = param1; + UnkStruct_ov95_0224922C *v0 = param1; int v1; if (v0->unk_80) { @@ -974,9 +974,9 @@ static void ov95_02249424 (SysTask * param0, void * param1) ov95_02247990(v0->unk_00, &(v0->unk_20)); } -static void ov95_022494A8 (SysTask * param0, void * param1) +static void ov95_022494A8(SysTask *param0, void *param1) { - UnkStruct_ov95_0224922C * v0 = param1; + UnkStruct_ov95_0224922C *v0 = param1; if (v0->unk_78 == 0) { v0->unk_2C += v0->unk_30; @@ -994,21 +994,21 @@ static void ov95_022494A8 (SysTask * param0, void * param1) } } -static BOOL ov95_022494F4 (SysTask * param0) +static BOOL ov95_022494F4(SysTask *param0) { - UnkStruct_ov95_0224922C * v0 = SysTask_GetParam(param0); + UnkStruct_ov95_0224922C *v0 = SysTask_GetParam(param0); return v0->unk_78; } -static BOOL ov95_02249500 (SysTask * param0) +static BOOL ov95_02249500(SysTask *param0) { - UnkStruct_ov95_0224922C * v0 = SysTask_GetParam(param0); + UnkStruct_ov95_0224922C *v0 = SysTask_GetParam(param0); return v0->unk_7C; } -static void ov95_0224950C (SysTask * param0) +static void ov95_0224950C(SysTask *param0) { - UnkStruct_ov95_0224922C * v0 = SysTask_GetParam(param0); + UnkStruct_ov95_0224922C *v0 = SysTask_GetParam(param0); CameraAngle v1; v0->unk_78 = 0; @@ -1031,9 +1031,9 @@ static void ov95_0224950C (SysTask * param0) SysTask_SetCallback(param0, ov95_0224959C); } -static void ov95_0224959C (SysTask * param0, void * param1) +static void ov95_0224959C(SysTask *param0, void *param1) { - UnkStruct_ov95_0224922C * v0 = param1; + UnkStruct_ov95_0224922C *v0 = param1; ov95_022492DC(v0); @@ -1050,9 +1050,9 @@ static void ov95_0224959C (SysTask * param0, void * param1) ov95_02247990(v0->unk_00, &(v0->unk_20)); } -static void ov95_022495F8 (SysTask * param0, void * param1) +static void ov95_022495F8(SysTask *param0, void *param1) { - UnkStruct_ov95_0224922C * v0 = param1; + UnkStruct_ov95_0224922C *v0 = param1; ov95_022492DC(v0); @@ -1066,9 +1066,9 @@ static void ov95_022495F8 (SysTask * param0, void * param1) ov95_02247990(v0->unk_00, &(v0->unk_20)); } -static void ov95_02249658 (SysTask * param0, void * param1) +static void ov95_02249658(SysTask *param0, void *param1) { - UnkStruct_ov95_0224922C * v0 = param1; + UnkStruct_ov95_0224922C *v0 = param1; ov95_022492DC(v0); @@ -1085,9 +1085,9 @@ static void ov95_02249658 (SysTask * param0, void * param1) ov95_02247990(v0->unk_00, &(v0->unk_20)); } -static void ov95_022496B4 (SysTask * param0, void * param1) +static void ov95_022496B4(SysTask *param0, void *param1) { - UnkStruct_ov95_0224922C * v0 = param1; + UnkStruct_ov95_0224922C *v0 = param1; ov95_022492DC(v0); @@ -1100,9 +1100,9 @@ static void ov95_022496B4 (SysTask * param0, void * param1) ov95_02247990(v0->unk_00, &(v0->unk_20)); } -static void ov95_02249700 (SysTask * param0, void * param1) +static void ov95_02249700(SysTask *param0, void *param1) { - UnkStruct_ov95_0224922C * v0 = param1; + UnkStruct_ov95_0224922C *v0 = param1; if (v0->unk_78 == 0) { ov95_022492DC(v0); diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c index 04b1cbefa7..2db802323f 100644 --- a/src/overlay095/ov95_02249740.c +++ b/src/overlay095/ov95_02249740.c @@ -1,36 +1,36 @@ -#include "enums.h" +#include "overlay095/ov95_02249740.h" #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay095/struct_ov95_02247628_decl.h" -#include "overlay095/struct_ov95_0224773C_decl.h" -#include "overlay095/struct_ov95_02247958_decl.h" - #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay095/ov95_02246C20.h" +#include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247568.h" +#include "overlay095/struct_ov95_02247628_decl.h" +#include "overlay095/struct_ov95_0224773C_decl.h" +#include "overlay095/struct_ov95_02247958_decl.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_0202419C.h" -#include "overlay095/ov95_02246C20.h" -#include "overlay095/ov95_022476F0.h" -#include "overlay095/ov95_02249740.h" enum { UnkEnum_ov95_02249A80_00 = 0x18E3, @@ -63,10 +63,10 @@ enum { }; typedef struct { - void * unk_00; - SysTask * unk_04; - UnkStruct_ov95_0224773C * unk_08; - UnkStruct_ov95_02247958 * unk_0C; + void *unk_00; + SysTask *unk_04; + UnkStruct_ov95_0224773C *unk_08; + UnkStruct_ov95_02247958 *unk_0C; VecFx32 unk_10; VecFx32 unk_1C; VecFx32 unk_28; @@ -88,41 +88,41 @@ typedef struct { } UnkStruct_ov95_02249C28; typedef struct { - UnkStruct_ov95_02247628 * unk_00; + UnkStruct_ov95_02247628 *unk_00; int unk_04; int unk_08; BOOL unk_0C; UnkStruct_ov95_02247568 unk_10; - GraphicElementData * unk_20[1]; - BGL * unk_24; - UnkStruct_ov95_0224773C * unk_28; - UnkStruct_ov95_02247958 * unk_2C; - SysTask * unk_30; + GraphicElementData *unk_20[1]; + BGL *unk_24; + UnkStruct_ov95_0224773C *unk_28; + UnkStruct_ov95_02247958 *unk_2C; + SysTask *unk_30; UnkStruct_ov95_02249C28 unk_34; } UnkStruct_ov95_022497D8; -static void ov95_022497D8(UnkStruct_ov95_022497D8 * param0); -static int ov95_022497F8(UnkStruct_ov95_022497D8 * param0, int * param1); -static int ov95_02249840(UnkStruct_ov95_022497D8 * param0, int * param1); -static void ov95_02249910(UnkStruct_ov95_022497D8 * param0); -static void ov95_02249A68(UnkStruct_ov95_022497D8 * param0); -static void ov95_02249A80(UnkStruct_ov95_022497D8 * param0); -static void ov95_02249B80(UnkStruct_ov95_022497D8 * param0); -static void ov95_02249B90(UnkStruct_ov95_022497D8 * param0); -static void ov95_02249C10(UnkStruct_ov95_022497D8 * param0); -static void ov95_02249C28(UnkStruct_ov95_02249C28 * param0); -static void ov95_02249C30(UnkStruct_ov95_02249C28 * param0); -static void ov95_02249C44(UnkStruct_ov95_022497D8 * param0, UnkStruct_ov95_02249C28 * param1); -static BOOL ov95_02249CF0(UnkStruct_ov95_02249C28 * param0); -static void ov95_02249D00(UnkStruct_ov95_02249C28 * param0, fx32 param1, fx32 param2, fx32 param3, int param4); -static void ov95_02249D38(UnkStruct_ov95_02249C28 * param0); -static void ov95_02249E04(SysTask * param0, void * param1); -static void ov95_02249F30(UnkStruct_ov95_022497D8 * param0); -static void ov95_02249F38(SysTask * param0, void * param1); - -void * ov95_02249740 (UnkStruct_ov95_02247628 * param0) +static void ov95_022497D8(UnkStruct_ov95_022497D8 *param0); +static int ov95_022497F8(UnkStruct_ov95_022497D8 *param0, int *param1); +static int ov95_02249840(UnkStruct_ov95_022497D8 *param0, int *param1); +static void ov95_02249910(UnkStruct_ov95_022497D8 *param0); +static void ov95_02249A68(UnkStruct_ov95_022497D8 *param0); +static void ov95_02249A80(UnkStruct_ov95_022497D8 *param0); +static void ov95_02249B80(UnkStruct_ov95_022497D8 *param0); +static void ov95_02249B90(UnkStruct_ov95_022497D8 *param0); +static void ov95_02249C10(UnkStruct_ov95_022497D8 *param0); +static void ov95_02249C28(UnkStruct_ov95_02249C28 *param0); +static void ov95_02249C30(UnkStruct_ov95_02249C28 *param0); +static void ov95_02249C44(UnkStruct_ov95_022497D8 *param0, UnkStruct_ov95_02249C28 *param1); +static BOOL ov95_02249CF0(UnkStruct_ov95_02249C28 *param0); +static void ov95_02249D00(UnkStruct_ov95_02249C28 *param0, fx32 param1, fx32 param2, fx32 param3, int param4); +static void ov95_02249D38(UnkStruct_ov95_02249C28 *param0); +static void ov95_02249E04(SysTask *param0, void *param1); +static void ov95_02249F30(UnkStruct_ov95_022497D8 *param0); +static void ov95_02249F38(SysTask *param0, void *param1); + +void *ov95_02249740(UnkStruct_ov95_02247628 *param0) { - UnkStruct_ov95_022497D8 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_022497D8)); + UnkStruct_ov95_022497D8 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_022497D8)); if (v0) { int v1; @@ -138,9 +138,9 @@ void * ov95_02249740 (UnkStruct_ov95_02247628 * param0) return v0; } -void ov95_02249770 (void * param0) +void ov95_02249770(void *param0) { - UnkStruct_ov95_022497D8 * v0 = param0; + UnkStruct_ov95_022497D8 *v0 = param0; if (v0) { int v1; @@ -156,14 +156,14 @@ void ov95_02249770 (void * param0) } } -BOOL ov95_022497A0 (void * param0, int * param1) +BOOL ov95_022497A0(void *param0, int *param1) { - static int(*const v0[])(UnkStruct_ov95_022497D8 *, int *) = { + static int (*const v0[])(UnkStruct_ov95_022497D8 *, int *) = { ov95_022497F8, ov95_02249840 }; - UnkStruct_ov95_022497D8 * v1 = param0; + UnkStruct_ov95_022497D8 *v1 = param0; if ((*param1) < NELEMS(v0)) { if (v0[*param1](v1, &(v1->unk_04))) { @@ -179,7 +179,7 @@ BOOL ov95_022497A0 (void * param0, int * param1) return 1; } -static void ov95_022497D8 (UnkStruct_ov95_022497D8 * param0) +static void ov95_022497D8(UnkStruct_ov95_022497D8 *param0) { if (param0->unk_28) { G3X_Reset(); @@ -189,7 +189,7 @@ static void ov95_022497D8 (UnkStruct_ov95_022497D8 * param0) } } -static int ov95_022497F8 (UnkStruct_ov95_022497D8 * param0, int * param1) +static int ov95_022497F8(UnkStruct_ov95_022497D8 *param0, int *param1) { ov95_02249910(param0); ov95_02249A80(param0); @@ -203,7 +203,7 @@ static int ov95_022497F8 (UnkStruct_ov95_022497D8 * param0, int * param1) return 1; } -static int ov95_02249840 (UnkStruct_ov95_022497D8 * param0, int * param1) +static int ov95_02249840(UnkStruct_ov95_022497D8 *param0, int *param1) { switch (*param1) { case 0: @@ -241,7 +241,7 @@ static int ov95_02249840 (UnkStruct_ov95_022497D8 * param0, int * param1) return 0; } -static void ov95_02249910 (UnkStruct_ov95_022497D8 * param0) +static void ov95_02249910(UnkStruct_ov95_022497D8 *param0) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -330,13 +330,13 @@ static void ov95_02249910 (UnkStruct_ov95_022497D8 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov95_02249A68 (UnkStruct_ov95_022497D8 * param0) +static void ov95_02249A68(UnkStruct_ov95_022497D8 *param0) { sub_02019044(param0->unk_24, 3); sub_02019044(param0->unk_24, 7); } -static void ov95_02249A80 (UnkStruct_ov95_022497D8 * param0) +static void ov95_02249A80(UnkStruct_ov95_022497D8 *param0) { static const GXRgb v0[8] = { GX_RGB(4, 4, 4), @@ -391,14 +391,14 @@ static void ov95_02249A80 (UnkStruct_ov95_022497D8 * param0) } } -static void ov95_02249B80 (UnkStruct_ov95_022497D8 * param0) +static void ov95_02249B80(UnkStruct_ov95_022497D8 *param0) { if (param0->unk_28) { ov95_0224773C(param0->unk_28); } } -static void ov95_02249B90 (UnkStruct_ov95_022497D8 * param0) +static void ov95_02249B90(UnkStruct_ov95_022497D8 *param0) { NNSG2dImagePaletteProxy v0; NNSG2dImageProxy v1; @@ -418,7 +418,7 @@ static void ov95_02249B90 (UnkStruct_ov95_022497D8 * param0) sub_02021CAC(param0->unk_20[0], 0); } -static void ov95_02249C10 (UnkStruct_ov95_022497D8 * param0) +static void ov95_02249C10(UnkStruct_ov95_022497D8 *param0) { int v0; @@ -431,12 +431,12 @@ static void ov95_02249C10 (UnkStruct_ov95_022497D8 * param0) ov95_022475A0(¶m0->unk_10); } -static void ov95_02249C28 (UnkStruct_ov95_02249C28 * param0) +static void ov95_02249C28(UnkStruct_ov95_02249C28 *param0) { param0->unk_04 = NULL; } -static void ov95_02249C30 (UnkStruct_ov95_02249C28 * param0) +static void ov95_02249C30(UnkStruct_ov95_02249C28 *param0) { if (param0->unk_04) { SysTask_Done(param0->unk_04); @@ -444,7 +444,7 @@ static void ov95_02249C30 (UnkStruct_ov95_02249C28 * param0) } } -static void ov95_02249C44 (UnkStruct_ov95_022497D8 * param0, UnkStruct_ov95_02249C28 * param1) +static void ov95_02249C44(UnkStruct_ov95_022497D8 *param0, UnkStruct_ov95_02249C28 *param1) { param1->unk_00 = param0; param1->unk_0C = param0->unk_2C; @@ -481,12 +481,12 @@ static void ov95_02249C44 (UnkStruct_ov95_022497D8 * param0, UnkStruct_ov95_0224 param1->unk_04 = SysTask_Start(ov95_02249E04, param1, 0); } -static BOOL ov95_02249CF0 (UnkStruct_ov95_02249C28 * param0) +static BOOL ov95_02249CF0(UnkStruct_ov95_02249C28 *param0) { return param0->unk_04 == NULL; } -static void ov95_02249D00 (UnkStruct_ov95_02249C28 * param0, fx32 param1, fx32 param2, fx32 param3, int param4) +static void ov95_02249D00(UnkStruct_ov95_02249C28 *param0, fx32 param1, fx32 param2, fx32 param3, int param4) { if (param4) { param0->unk_4C = (param1 - param0->unk_44) / param4; @@ -496,7 +496,7 @@ static void ov95_02249D00 (UnkStruct_ov95_02249C28 * param0, fx32 param1, fx32 p } } -static void ov95_02249D38 (UnkStruct_ov95_02249C28 * param0) +static void ov95_02249D38(UnkStruct_ov95_02249C28 *param0) { int v0; @@ -525,9 +525,9 @@ static void ov95_02249D38 (UnkStruct_ov95_02249C28 * param0) VEC_Add(¶m0->unk_1C, ¶m0->unk_10, ¶m0->unk_28); } -static void ov95_02249E04 (SysTask * param0, void * param1) +static void ov95_02249E04(SysTask *param0, void *param1) { - UnkStruct_ov95_02249C28 * v0 = param1; + UnkStruct_ov95_02249C28 *v0 = param1; if (v0->unk_68 < UnkEnum_ov95_02249C44_08) { v0->unk_68++; @@ -588,14 +588,14 @@ static void ov95_02249E04 (SysTask * param0, void * param1) } } -static void ov95_02249F30 (UnkStruct_ov95_022497D8 * param0) +static void ov95_02249F30(UnkStruct_ov95_022497D8 *param0) { param0->unk_0C = 1; } -static void ov95_02249F38 (SysTask * param0, void * param1) +static void ov95_02249F38(SysTask *param0, void *param1) { - UnkStruct_ov95_022497D8 * v0 = param1; + UnkStruct_ov95_022497D8 *v0 = param1; if (v0->unk_0C) { CameraAngle v1; diff --git a/src/overlay095/ov95_02249F90.c b/src/overlay095/ov95_02249F90.c index e8dc194571..58913b84e0 100644 --- a/src/overlay095/ov95_02249F90.c +++ b/src/overlay095/ov95_02249F90.c @@ -1,25 +1,25 @@ -#include "enums.h" +#include "overlay095/ov95_02249F90.h" #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "overlay095/struct_ov95_02247628_decl.h" - #include "struct_defs/struct_02099F80.h" + #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay095/ov95_02246C20.h" +#include "overlay095/struct_ov95_02247628_decl.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "sys_task.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "gx_layers.h" -#include "overlay095/ov95_02246C20.h" -#include "overlay095/ov95_02249F90.h" enum { UnkEnum_ov95_0224A020_00 = 0x50, @@ -30,10 +30,10 @@ enum { }; typedef struct { - UnkStruct_ov95_02247628 * unk_00; + UnkStruct_ov95_02247628 *unk_00; int unk_04; int unk_08; - BGL * unk_0C; + BGL *unk_0C; fx32 unk_10; fx32 unk_14; fx32 unk_18; @@ -41,16 +41,16 @@ typedef struct { BOOL unk_20; } UnkStruct_ov95_02249FF8; -static int ov95_02249FF8(UnkStruct_ov95_02249FF8 * param0, int * param1); -static int ov95_0224A020(UnkStruct_ov95_02249FF8 * param0, int * param1); -static void ov95_0224A0C4(SysTask * param0, void * param1); -static void ov95_0224A10C(UnkStruct_ov95_02249FF8 * param0); -static void ov95_0224A320(UnkStruct_ov95_02249FF8 * param0); -static void ov95_0224A358(BGL * param0, int param1, int param2); +static int ov95_02249FF8(UnkStruct_ov95_02249FF8 *param0, int *param1); +static int ov95_0224A020(UnkStruct_ov95_02249FF8 *param0, int *param1); +static void ov95_0224A0C4(SysTask *param0, void *param1); +static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0); +static void ov95_0224A320(UnkStruct_ov95_02249FF8 *param0); +static void ov95_0224A358(BGL *param0, int param1, int param2); -void * ov95_02249F90 (UnkStruct_ov95_02247628 * param0) +void *ov95_02249F90(UnkStruct_ov95_02247628 *param0) { - UnkStruct_ov95_02249FF8 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02249FF8)); + UnkStruct_ov95_02249FF8 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_02249FF8)); if (v0) { int v1; @@ -63,9 +63,9 @@ void * ov95_02249F90 (UnkStruct_ov95_02247628 * param0) return v0; } -void ov95_02249FB4 (void * param0) +void ov95_02249FB4(void *param0) { - UnkStruct_ov95_02249FF8 * v0 = param0; + UnkStruct_ov95_02249FF8 *v0 = param0; if (v0) { int v1; @@ -75,14 +75,14 @@ void ov95_02249FB4 (void * param0) } } -BOOL ov95_02249FC8 (void * param0, int * param1) +BOOL ov95_02249FC8(void *param0, int *param1) { - static int(*const v0[])(UnkStruct_ov95_02249FF8 *, int *) = { + static int (*const v0[])(UnkStruct_ov95_02249FF8 *, int *) = { ov95_02249FF8, ov95_0224A020 }; - UnkStruct_ov95_02249FF8 * v1 = param0; + UnkStruct_ov95_02249FF8 *v1 = param0; if ((*param1) < NELEMS(v0)) { if (v0[*param1](v1, &(v1->unk_04))) { @@ -96,7 +96,7 @@ BOOL ov95_02249FC8 (void * param0, int * param1) return 1; } -static int ov95_02249FF8 (UnkStruct_ov95_02249FF8 * param0, int * param1) +static int ov95_02249FF8(UnkStruct_ov95_02249FF8 *param0, int *param1) { ov95_0224A10C(param0); sub_0200F174(0, 1, 1, 0x7fff, 8, 1, 58); @@ -104,7 +104,7 @@ static int ov95_02249FF8 (UnkStruct_ov95_02249FF8 * param0, int * param1) return 1; } -static int ov95_0224A020 (UnkStruct_ov95_02249FF8 * param0, int * param1) +static int ov95_0224A020(UnkStruct_ov95_02249FF8 *param0, int *param1) { switch (*param1) { case 0: @@ -136,9 +136,9 @@ static int ov95_0224A020 (UnkStruct_ov95_02249FF8 * param0, int * param1) return 0; } -static void ov95_0224A0C4 (SysTask * param0, void * param1) +static void ov95_0224A0C4(SysTask *param0, void *param1) { - UnkStruct_ov95_02249FF8 * v0 = param1; + UnkStruct_ov95_02249FF8 *v0 = param1; if (v0->unk_08) { v0->unk_08--; @@ -153,7 +153,7 @@ static void ov95_0224A0C4 (SysTask * param0, void * param1) } } -static void ov95_0224A10C (UnkStruct_ov95_02249FF8 * param0) +static void ov95_0224A10C(UnkStruct_ov95_02249FF8 *param0) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -263,7 +263,7 @@ static void ov95_0224A10C (UnkStruct_ov95_02249FF8 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov95_0224A320 (UnkStruct_ov95_02249FF8 * param0) +static void ov95_0224A320(UnkStruct_ov95_02249FF8 *param0) { sub_02019044(param0->unk_0C, 3); sub_02019044(param0->unk_0C, 7); @@ -273,7 +273,7 @@ static void ov95_0224A320 (UnkStruct_ov95_02249FF8 * param0) sub_02019044(param0->unk_0C, 5); } -static void ov95_0224A358 (BGL * param0, int param1, int param2) +static void ov95_0224A358(BGL *param0, int param1, int param2) { param2 &= 0x1ff; param1 &= 0x1ff; diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c index aa6d3c720e..8cab0a0bb6 100644 --- a/src/overlay095/ov95_0224A390.c +++ b/src/overlay095/ov95_0224A390.c @@ -1,37 +1,37 @@ -#include "enums.h" +#include "overlay095/ov95_0224A390.h" #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay095/struct_ov95_02247628_decl.h" -#include "overlay095/struct_ov95_0224773C_decl.h" -#include "overlay095/struct_ov95_02247958_decl.h" - #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay095/ov95_02246C20.h" +#include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247568.h" +#include "overlay095/struct_ov95_02247628_decl.h" +#include "overlay095/struct_ov95_0224773C_decl.h" +#include "overlay095/struct_ov95_02247958_decl.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_0202419C.h" #include "unk_020393C8.h" -#include "overlay095/ov95_02246C20.h" -#include "overlay095/ov95_022476F0.h" -#include "overlay095/ov95_0224A390.h" enum { UnkEnum_ov95_0224A690_00 = 0x18E3, @@ -56,10 +56,10 @@ enum { }; typedef struct { - void * unk_00; - SysTask * unk_04; - UnkStruct_ov95_0224773C * unk_08; - UnkStruct_ov95_02247958 * unk_0C; + void *unk_00; + SysTask *unk_04; + UnkStruct_ov95_0224773C *unk_08; + UnkStruct_ov95_02247958 *unk_0C; VecFx32 unk_10; VecFx32 unk_1C; VecFx32 unk_28; @@ -84,42 +84,42 @@ typedef struct { } UnkStruct_ov95_0224A848; typedef struct { - UnkStruct_ov95_02247628 * unk_00; + UnkStruct_ov95_02247628 *unk_00; int unk_04; int unk_08; BOOL unk_0C; UnkStruct_ov95_02247568 unk_10; - GraphicElementData * unk_20[1]; - BGL * unk_24; - UnkStruct_ov95_0224773C * unk_28; - UnkStruct_ov95_02247958 * unk_2C; - SysTask * unk_30; + GraphicElementData *unk_20[1]; + BGL *unk_24; + UnkStruct_ov95_0224773C *unk_28; + UnkStruct_ov95_02247958 *unk_2C; + SysTask *unk_30; UnkStruct_ov95_0224A848 unk_34; } UnkStruct_ov95_0224A42C; -static int ov95_0224A42C(UnkStruct_ov95_0224A42C * param0, int * param1); -static int ov95_0224A464(UnkStruct_ov95_0224A42C * param0, int * param1); -static void ov95_0224A518(UnkStruct_ov95_0224A42C * param0); -static void ov95_0224A678(UnkStruct_ov95_0224A42C * param0); -static void ov95_0224A690(UnkStruct_ov95_0224A42C * param0); -static void ov95_0224A7A0(UnkStruct_ov95_0224A42C * param0); -static void ov95_0224A7B0(UnkStruct_ov95_0224A42C * param0); -static void ov95_0224A830(UnkStruct_ov95_0224A42C * param0); -static void ov95_0224A848(UnkStruct_ov95_0224A848 * param0); -static void ov95_0224A850(UnkStruct_ov95_0224A848 * param0); -static void ov95_0224A864(UnkStruct_ov95_0224A42C * param0, UnkStruct_ov95_0224A848 * param1); -static BOOL ov95_0224A924(UnkStruct_ov95_0224A848 * param0); -static void ov95_0224A934(UnkStruct_ov95_0224A848 * param0, fx32 param1, fx32 param2, fx32 param3, int param4); -static void ov95_0224A978(UnkStruct_ov95_0224A848 * param0); -static void ov95_0224AA70(SysTask * param0, void * param1); -static void ov95_0224AB48(UnkStruct_ov95_0224A42C * param0); -static void ov95_0224AB50(void * param0); +static int ov95_0224A42C(UnkStruct_ov95_0224A42C *param0, int *param1); +static int ov95_0224A464(UnkStruct_ov95_0224A42C *param0, int *param1); +static void ov95_0224A518(UnkStruct_ov95_0224A42C *param0); +static void ov95_0224A678(UnkStruct_ov95_0224A42C *param0); +static void ov95_0224A690(UnkStruct_ov95_0224A42C *param0); +static void ov95_0224A7A0(UnkStruct_ov95_0224A42C *param0); +static void ov95_0224A7B0(UnkStruct_ov95_0224A42C *param0); +static void ov95_0224A830(UnkStruct_ov95_0224A42C *param0); +static void ov95_0224A848(UnkStruct_ov95_0224A848 *param0); +static void ov95_0224A850(UnkStruct_ov95_0224A848 *param0); +static void ov95_0224A864(UnkStruct_ov95_0224A42C *param0, UnkStruct_ov95_0224A848 *param1); +static BOOL ov95_0224A924(UnkStruct_ov95_0224A848 *param0); +static void ov95_0224A934(UnkStruct_ov95_0224A848 *param0, fx32 param1, fx32 param2, fx32 param3, int param4); +static void ov95_0224A978(UnkStruct_ov95_0224A848 *param0); +static void ov95_0224AA70(SysTask *param0, void *param1); +static void ov95_0224AB48(UnkStruct_ov95_0224A42C *param0); +static void ov95_0224AB50(void *param0); static BOOL Unk_ov95_0224C2C0 = 1; -void * ov95_0224A390 (UnkStruct_ov95_02247628 * param0) +void *ov95_0224A390(UnkStruct_ov95_02247628 *param0) { - UnkStruct_ov95_0224A42C * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224A42C)); + UnkStruct_ov95_0224A42C *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224A42C)); if (v0) { int v1; @@ -137,9 +137,9 @@ void * ov95_0224A390 (UnkStruct_ov95_02247628 * param0) return v0; } -void ov95_0224A3CC (void * param0) +void ov95_0224A3CC(void *param0) { - UnkStruct_ov95_0224A42C * v0 = param0; + UnkStruct_ov95_0224A42C *v0 = param0; if (v0) { int v1; @@ -155,13 +155,14 @@ void ov95_0224A3CC (void * param0) } } -BOOL ov95_0224A3FC (void * param0, int * param1) +BOOL ov95_0224A3FC(void *param0, int *param1) { - static int(*const v0[])(UnkStruct_ov95_0224A42C *, int *) = { - ov95_0224A42C, ov95_0224A464, + static int (*const v0[])(UnkStruct_ov95_0224A42C *, int *) = { + ov95_0224A42C, + ov95_0224A464, }; - UnkStruct_ov95_0224A42C * v1 = param0; + UnkStruct_ov95_0224A42C *v1 = param0; if ((*param1) < NELEMS(v0)) { if (v0[*param1](v1, &(v1->unk_04))) { @@ -175,7 +176,7 @@ BOOL ov95_0224A3FC (void * param0, int * param1) return 1; } -static int ov95_0224A42C (UnkStruct_ov95_0224A42C * param0, int * param1) +static int ov95_0224A42C(UnkStruct_ov95_0224A42C *param0, int *param1) { ov95_0224A518(param0); ov95_0224A690(param0); @@ -186,7 +187,7 @@ static int ov95_0224A42C (UnkStruct_ov95_0224A42C * param0, int * param1) return 1; } -static int ov95_0224A464 (UnkStruct_ov95_0224A42C * param0, int * param1) +static int ov95_0224A464(UnkStruct_ov95_0224A42C *param0, int *param1) { switch (*param1) { case 0: @@ -220,7 +221,7 @@ static int ov95_0224A464 (UnkStruct_ov95_0224A42C * param0, int * param1) return 0; } -static void ov95_0224A518 (UnkStruct_ov95_0224A42C * param0) +static void ov95_0224A518(UnkStruct_ov95_0224A42C *param0) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -311,16 +312,23 @@ static void ov95_0224A518 (UnkStruct_ov95_0224A42C * param0) sub_020397C8(1, 57); } -static void ov95_0224A678 (UnkStruct_ov95_0224A42C * param0) +static void ov95_0224A678(UnkStruct_ov95_0224A42C *param0) { sub_02019044(param0->unk_24, 3); sub_02019044(param0->unk_24, 7); } -static void ov95_0224A690 (UnkStruct_ov95_0224A42C * param0) +static void ov95_0224A690(UnkStruct_ov95_0224A42C *param0) { static const GXRgb v0[8] = { - GX_RGB(4, 4, 4), GX_RGB(4, 4, 4), GX_RGB(4, 4, 4), GX_RGB(4, 4, 4), GX_RGB(4, 4, 4), GX_RGB(4, 4, 4), GX_RGB(4, 4, 4), GX_RGB(4, 4, 4), + GX_RGB(4, 4, 4), + GX_RGB(4, 4, 4), + GX_RGB(4, 4, 4), + GX_RGB(4, 4, 4), + GX_RGB(4, 4, 4), + GX_RGB(4, 4, 4), + GX_RGB(4, 4, 4), + GX_RGB(4, 4, 4), }; int v1; @@ -366,14 +374,14 @@ static void ov95_0224A690 (UnkStruct_ov95_0224A42C * param0) } } -static void ov95_0224A7A0 (UnkStruct_ov95_0224A42C * param0) +static void ov95_0224A7A0(UnkStruct_ov95_0224A42C *param0) { if (param0->unk_28) { ov95_0224773C(param0->unk_28); } } -static void ov95_0224A7B0 (UnkStruct_ov95_0224A42C * param0) +static void ov95_0224A7B0(UnkStruct_ov95_0224A42C *param0) { NNSG2dImagePaletteProxy v0; NNSG2dImageProxy v1; @@ -393,7 +401,7 @@ static void ov95_0224A7B0 (UnkStruct_ov95_0224A42C * param0) sub_02021CAC(param0->unk_20[0], 0); } -static void ov95_0224A830 (UnkStruct_ov95_0224A42C * param0) +static void ov95_0224A830(UnkStruct_ov95_0224A42C *param0) { int v0; @@ -406,12 +414,12 @@ static void ov95_0224A830 (UnkStruct_ov95_0224A42C * param0) ov95_022475A0(¶m0->unk_10); } -static void ov95_0224A848 (UnkStruct_ov95_0224A848 * param0) +static void ov95_0224A848(UnkStruct_ov95_0224A848 *param0) { param0->unk_04 = NULL; } -static void ov95_0224A850 (UnkStruct_ov95_0224A848 * param0) +static void ov95_0224A850(UnkStruct_ov95_0224A848 *param0) { if (param0->unk_04) { SysTask_Done(param0->unk_04); @@ -419,7 +427,7 @@ static void ov95_0224A850 (UnkStruct_ov95_0224A848 * param0) } } -static void ov95_0224A864 (UnkStruct_ov95_0224A42C * param0, UnkStruct_ov95_0224A848 * param1) +static void ov95_0224A864(UnkStruct_ov95_0224A42C *param0, UnkStruct_ov95_0224A848 *param1) { param1->unk_00 = param0; param1->unk_0C = param0->unk_2C; @@ -457,12 +465,12 @@ static void ov95_0224A864 (UnkStruct_ov95_0224A42C * param0, UnkStruct_ov95_0224 param1->unk_04 = SysTask_Start(ov95_0224AA70, param1, 0); } -static BOOL ov95_0224A924 (UnkStruct_ov95_0224A848 * param0) +static BOOL ov95_0224A924(UnkStruct_ov95_0224A848 *param0) { return param0->unk_04 == NULL; } -static void ov95_0224A934 (UnkStruct_ov95_0224A848 * param0, fx32 param1, fx32 param2, fx32 param3, int param4) +static void ov95_0224A934(UnkStruct_ov95_0224A848 *param0, fx32 param1, fx32 param2, fx32 param3, int param4) { if (param4) { param0->unk_4C = (param1 - param0->unk_44) / param4; @@ -475,7 +483,7 @@ static void ov95_0224A934 (UnkStruct_ov95_0224A848 * param0, fx32 param1, fx32 p } } -static void ov95_0224A978 (UnkStruct_ov95_0224A848 * param0) +static void ov95_0224A978(UnkStruct_ov95_0224A848 *param0) { if (Unk_ov95_0224C2C0) { int v0; @@ -516,9 +524,9 @@ static void ov95_0224A978 (UnkStruct_ov95_0224A848 * param0) } } -static void ov95_0224AA70 (SysTask * param0, void * param1) +static void ov95_0224AA70(SysTask *param0, void *param1) { - UnkStruct_ov95_0224A848 * v0 = param1; + UnkStruct_ov95_0224A848 *v0 = param1; if (v0->unk_74 < UnkEnum_ov95_0224A864_12) { v0->unk_74++; @@ -567,14 +575,14 @@ static void ov95_0224AA70 (SysTask * param0, void * param1) } } -static void ov95_0224AB48 (UnkStruct_ov95_0224A42C * param0) +static void ov95_0224AB48(UnkStruct_ov95_0224A42C *param0) { param0->unk_0C = 1; } -static void ov95_0224AB50 (void * param0) +static void ov95_0224AB50(void *param0) { - UnkStruct_ov95_0224A42C * v0 = param0; + UnkStruct_ov95_0224A42C *v0 = param0; if (v0->unk_28) { G3X_Reset(); diff --git a/src/overlay095/ov95_0224ABC0.c b/src/overlay095/ov95_0224ABC0.c index f036cbc361..a3a9e01dd9 100644 --- a/src/overlay095/ov95_0224ABC0.c +++ b/src/overlay095/ov95_0224ABC0.c @@ -1,31 +1,31 @@ -#include "enums.h" +#include "overlay095/ov95_0224ABC0.h" #include #include #include "struct_decls/struct_02018340_decl.h" +#include "struct_defs/struct_02099F80.h" + +#include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay095/ov95_02246C20.h" +#include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247004_decl.h" #include "overlay095/struct_ov95_022472C4_decl.h" #include "overlay095/struct_ov95_02247628_decl.h" #include "overlay095/struct_ov95_0224773C_decl.h" #include "overlay095/struct_ov95_02247958_decl.h" - -#include "struct_defs/struct_02099F80.h" -#include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/camera_angle.h" -#include "unk_02006E3C.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" -#include "gx_layers.h" #include "unk_0202419C.h" -#include "overlay095/ov95_02246C20.h" -#include "overlay095/ov95_022476F0.h" -#include "overlay095/ov95_0224ABC0.h" enum { UnkEnum_ov95_0224AE1C_00 = -384 @@ -60,72 +60,72 @@ enum { }; typedef struct { - UnkStruct_ov95_02247628 * unk_00; + UnkStruct_ov95_02247628 *unk_00; int unk_04; int unk_08; - BGL * unk_0C; - UnkStruct_ov95_02247004 * unk_10; + BGL *unk_0C; + UnkStruct_ov95_02247004 *unk_10; BOOL unk_14; - UnkStruct_ov95_022472C4 * unk_18; + UnkStruct_ov95_022472C4 *unk_18; volatile BOOL unk_1C; - UnkStruct_ov95_0224773C * unk_20; - UnkStruct_ov95_02247958 * unk_24; + UnkStruct_ov95_0224773C *unk_20; + UnkStruct_ov95_02247958 *unk_24; VecFx16 unk_28; - SysTask * unk_30; - SysTask * unk_34; - SysTask * unk_38; + SysTask *unk_30; + SysTask *unk_34; + SysTask *unk_38; } UnkStruct_ov95_0224AC64; typedef struct { - UnkStruct_ov95_0224AC64 * unk_00; - BGL * unk_04; + UnkStruct_ov95_0224AC64 *unk_00; + BGL *unk_04; int unk_08; fx32 unk_0C; fx32 unk_10; fx32 unk_14; fx32 unk_18; - SysTask ** unk_1C; - SysTask * unk_20; + SysTask **unk_1C; + SysTask *unk_20; } UnkStruct_ov95_0224B1A8; typedef struct { - SysTask ** unk_00; + SysTask **unk_00; int unk_04; - UnkStruct_ov95_02247958 * unk_08; + UnkStruct_ov95_02247958 *unk_08; VecFx32 unk_0C; fx32 unk_18; } UnkStruct_ov95_0224B274; typedef struct { - SysTask ** unk_00; + SysTask **unk_00; fx32 unk_04; fx32 unk_08; fx32 unk_0C; int unk_10; - UnkStruct_ov95_02247958 * unk_14; + UnkStruct_ov95_02247958 *unk_14; } UnkStruct_ov95_0224B324; -static void ov95_0224AC64(UnkStruct_ov95_0224AC64 * param0); -static int ov95_0224AC98(UnkStruct_ov95_0224AC64 * param0, int * param1); -static int ov95_0224ACC8(UnkStruct_ov95_0224AC64 * param0, int * param1); -static int ov95_0224AD98(UnkStruct_ov95_0224AC64 * param0, int * param1); -static void ov95_0224AE1C(UnkStruct_ov95_0224AC64 * param0); -static void ov95_0224B050(UnkStruct_ov95_0224AC64 * param0); -static void ov95_0224B084(UnkStruct_ov95_0224AC64 * param0); -static void ov95_0224B194(UnkStruct_ov95_0224AC64 * param0); -static void ov95_0224B1A8(UnkStruct_ov95_0224AC64 * param0, SysTask ** param1); -static void ov95_0224B1F8(SysTask * param0, void * param1); -static void ov95_0224B258(SysTask * param0); -static void ov95_0224B274(UnkStruct_ov95_0224AC64 * param0, SysTask ** param1); -static void ov95_0224B2C8(SysTask * param0, void * param1); -static void ov95_0224B308(SysTask * param0); -static void ov95_0224B324(UnkStruct_ov95_02247958 * param0, int param1, int param2, int param3, SysTask ** param4); -static void ov95_0224B388(SysTask * param0, void * param1); -static void ov95_0224B3BC(SysTask * param0); - -void * ov95_0224ABC0 (UnkStruct_ov95_02247628 * param0) +static void ov95_0224AC64(UnkStruct_ov95_0224AC64 *param0); +static int ov95_0224AC98(UnkStruct_ov95_0224AC64 *param0, int *param1); +static int ov95_0224ACC8(UnkStruct_ov95_0224AC64 *param0, int *param1); +static int ov95_0224AD98(UnkStruct_ov95_0224AC64 *param0, int *param1); +static void ov95_0224AE1C(UnkStruct_ov95_0224AC64 *param0); +static void ov95_0224B050(UnkStruct_ov95_0224AC64 *param0); +static void ov95_0224B084(UnkStruct_ov95_0224AC64 *param0); +static void ov95_0224B194(UnkStruct_ov95_0224AC64 *param0); +static void ov95_0224B1A8(UnkStruct_ov95_0224AC64 *param0, SysTask **param1); +static void ov95_0224B1F8(SysTask *param0, void *param1); +static void ov95_0224B258(SysTask *param0); +static void ov95_0224B274(UnkStruct_ov95_0224AC64 *param0, SysTask **param1); +static void ov95_0224B2C8(SysTask *param0, void *param1); +static void ov95_0224B308(SysTask *param0); +static void ov95_0224B324(UnkStruct_ov95_02247958 *param0, int param1, int param2, int param3, SysTask **param4); +static void ov95_0224B388(SysTask *param0, void *param1); +static void ov95_0224B3BC(SysTask *param0); + +void *ov95_0224ABC0(UnkStruct_ov95_02247628 *param0) { - UnkStruct_ov95_0224AC64 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224AC64)); + UnkStruct_ov95_0224AC64 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224AC64)); if (v0) { int v1; @@ -145,9 +145,9 @@ void * ov95_0224ABC0 (UnkStruct_ov95_02247628 * param0) return v0; } -void ov95_0224ABF4 (void * param0) +void ov95_0224ABF4(void *param0) { - UnkStruct_ov95_0224AC64 * v0 = param0; + UnkStruct_ov95_0224AC64 *v0 = param0; if (v0) { int v1; @@ -171,15 +171,15 @@ void ov95_0224ABF4 (void * param0) } } -BOOL ov95_0224AC2C (void * param0, int * param1) +BOOL ov95_0224AC2C(void *param0, int *param1) { - static int(*const v0[])(UnkStruct_ov95_0224AC64 *, int *) = { + static int (*const v0[])(UnkStruct_ov95_0224AC64 *, int *) = { ov95_0224AC98, ov95_0224ACC8, ov95_0224AD98 }; - UnkStruct_ov95_0224AC64 * v1 = param0; + UnkStruct_ov95_0224AC64 *v1 = param0; if ((*param1) < NELEMS(v0)) { if (v0[*param1](v1, &(v1->unk_04))) { @@ -195,7 +195,7 @@ BOOL ov95_0224AC2C (void * param0, int * param1) return 1; } -static void ov95_0224AC64 (UnkStruct_ov95_0224AC64 * param0) +static void ov95_0224AC64(UnkStruct_ov95_0224AC64 *param0) { if (param0->unk_20) { param0->unk_28.y += 0x1000; @@ -207,7 +207,7 @@ static void ov95_0224AC64 (UnkStruct_ov95_0224AC64 * param0) } } -static int ov95_0224AC98 (UnkStruct_ov95_0224AC64 * param0, int * param1) +static int ov95_0224AC98(UnkStruct_ov95_0224AC64 *param0, int *param1) { ov95_0224AE1C(param0); ov95_0224B084(param0); @@ -216,7 +216,7 @@ static int ov95_0224AC98 (UnkStruct_ov95_0224AC64 * param0, int * param1) return 1; } -static int ov95_0224ACC8 (UnkStruct_ov95_0224AC64 * param0, int * param1) +static int ov95_0224ACC8(UnkStruct_ov95_0224AC64 *param0, int *param1) { switch (*param1) { case 0: @@ -249,7 +249,7 @@ static int ov95_0224ACC8 (UnkStruct_ov95_0224AC64 * param0, int * param1) } break; case 5: - if ((param0->unk_38 == NULL)) { + if (param0->unk_38 == NULL) { ov95_02247004(param0->unk_10); (*param1)++; } @@ -264,7 +264,7 @@ static int ov95_0224ACC8 (UnkStruct_ov95_0224AC64 * param0, int * param1) return 0; } -static int ov95_0224AD98 (UnkStruct_ov95_0224AC64 * param0, int * param1) +static int ov95_0224AD98(UnkStruct_ov95_0224AC64 *param0, int *param1) { switch (*param1) { case 0: @@ -288,7 +288,7 @@ static int ov95_0224AD98 (UnkStruct_ov95_0224AC64 * param0, int * param1) return 0; } -static void ov95_0224AE1C (UnkStruct_ov95_0224AC64 * param0) +static void ov95_0224AE1C(UnkStruct_ov95_0224AC64 *param0) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -339,7 +339,10 @@ static void ov95_0224AE1C (UnkStruct_ov95_0224AC64 * param0) 0 }; static const u16 v4[] = { - 0x20, 0x60, 0xa0, 0xe0, + 0x20, + 0x60, + 0xa0, + 0xe0, }; u32 v5; @@ -376,7 +379,7 @@ static void ov95_0224AE1C (UnkStruct_ov95_0224AC64 * param0) sub_02006E60(93, 4, param0->unk_0C, 7, 0, 0, 1, 58); { - u8 * v7 = Heap_AllocFromHeap(58, 96); + u8 *v7 = Heap_AllocFromHeap(58, 96); if (v7) { MI_CpuClear32(v7, 96); @@ -403,7 +406,7 @@ static void ov95_0224AE1C (UnkStruct_ov95_0224AC64 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov95_0224B050 (UnkStruct_ov95_0224AC64 * param0) +static void ov95_0224B050(UnkStruct_ov95_0224AC64 *param0) { if (param0->unk_14) { ov95_02247018(param0->unk_10); @@ -415,7 +418,7 @@ static void ov95_0224B050 (UnkStruct_ov95_0224AC64 * param0) sub_02019044(param0->unk_0C, 7); } -static void ov95_0224B084 (UnkStruct_ov95_0224AC64 * param0) +static void ov95_0224B084(UnkStruct_ov95_0224AC64 *param0) { static const GXRgb v0[8] = { GX_RGB(4, 4, 4), @@ -466,7 +469,7 @@ static void ov95_0224B084 (UnkStruct_ov95_0224AC64 * param0) ov95_02247978(param0->unk_24, ¶m0->unk_28); } -static void ov95_0224B194 (UnkStruct_ov95_0224AC64 * param0) +static void ov95_0224B194(UnkStruct_ov95_0224AC64 *param0) { if (param0->unk_20) { ov95_0224773C(param0->unk_20); @@ -474,9 +477,9 @@ static void ov95_0224B194 (UnkStruct_ov95_0224AC64 * param0) } } -static void ov95_0224B1A8 (UnkStruct_ov95_0224AC64 * param0, SysTask ** param1) +static void ov95_0224B1A8(UnkStruct_ov95_0224AC64 *param0, SysTask **param1) { - UnkStruct_ov95_0224B1A8 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224B1A8)); + UnkStruct_ov95_0224B1A8 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224B1A8)); if (v0) { v0->unk_00 = param0; @@ -494,9 +497,9 @@ static void ov95_0224B1A8 (UnkStruct_ov95_0224AC64 * param0, SysTask ** param1) } } -static void ov95_0224B1F8 (SysTask * param0, void * param1) +static void ov95_0224B1F8(SysTask *param0, void *param1) { - UnkStruct_ov95_0224B1A8 * v0 = param1; + UnkStruct_ov95_0224B1A8 *v0 = param1; if (v0->unk_08) { v0->unk_0C += v0->unk_14; @@ -511,10 +514,10 @@ static void ov95_0224B1F8 (SysTask * param0, void * param1) } } -static void ov95_0224B258 (SysTask * param0) +static void ov95_0224B258(SysTask *param0) { if (param0) { - UnkStruct_ov95_0224B1A8 * v0 = SysTask_GetParam(param0); + UnkStruct_ov95_0224B1A8 *v0 = SysTask_GetParam(param0); *(v0->unk_1C) = NULL; ov95_022476C8(v0); @@ -522,9 +525,9 @@ static void ov95_0224B258 (SysTask * param0) } } -static void ov95_0224B274 (UnkStruct_ov95_0224AC64 * param0, SysTask ** param1) +static void ov95_0224B274(UnkStruct_ov95_0224AC64 *param0, SysTask **param1) { - UnkStruct_ov95_0224B274 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224B274)); + UnkStruct_ov95_0224B274 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224B274)); if (v0) { v0->unk_00 = param1; @@ -542,9 +545,9 @@ static void ov95_0224B274 (UnkStruct_ov95_0224AC64 * param0, SysTask ** param1) } } -static void ov95_0224B2C8 (SysTask * param0, void * param1) +static void ov95_0224B2C8(SysTask *param0, void *param1) { - UnkStruct_ov95_0224B274 * v0 = param1; + UnkStruct_ov95_0224B274 *v0 = param1; if (v0->unk_04) { v0->unk_0C.y += v0->unk_18; @@ -557,10 +560,10 @@ static void ov95_0224B2C8 (SysTask * param0, void * param1) } } -static void ov95_0224B308 (SysTask * param0) +static void ov95_0224B308(SysTask *param0) { if (param0) { - UnkStruct_ov95_0224B274 * v0 = SysTask_GetParam(param0); + UnkStruct_ov95_0224B274 *v0 = SysTask_GetParam(param0); *(v0->unk_00) = NULL; @@ -569,9 +572,9 @@ static void ov95_0224B308 (SysTask * param0) } } -static void ov95_0224B324 (UnkStruct_ov95_02247958 * param0, int param1, int param2, int param3, SysTask ** param4) +static void ov95_0224B324(UnkStruct_ov95_02247958 *param0, int param1, int param2, int param3, SysTask **param4) { - UnkStruct_ov95_0224B324 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224B324)); + UnkStruct_ov95_0224B324 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224B324)); if (v0) { v0->unk_00 = param4; @@ -591,9 +594,9 @@ static void ov95_0224B324 (UnkStruct_ov95_02247958 * param0, int param1, int par } } -static void ov95_0224B388 (SysTask * param0, void * param1) +static void ov95_0224B388(SysTask *param0, void *param1) { - UnkStruct_ov95_0224B324 * v0 = param1; + UnkStruct_ov95_0224B324 *v0 = param1; if (--(v0->unk_10) > 0) { v0->unk_04 += v0->unk_08; @@ -604,10 +607,10 @@ static void ov95_0224B388 (SysTask * param0, void * param1) } } -static void ov95_0224B3BC (SysTask * param0) +static void ov95_0224B3BC(SysTask *param0) { if (param0) { - UnkStruct_ov95_0224B324 * v0 = SysTask_GetParam(param0); + UnkStruct_ov95_0224B324 *v0 = SysTask_GetParam(param0); *(v0->unk_00) = NULL; Heap_FreeToHeap(v0); diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 6ca34be5bf..9d303a5f26 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -1,50 +1,47 @@ -#include "enums.h" +#include "overlay095/ov95_0224B3D8.h" #include #include +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "pokemon.h" -#include "overlay095/struct_ov95_02247628_decl.h" -#include "overlay095/struct_ov95_0224773C_decl.h" -#include "overlay095/struct_ov95_02247958_decl.h" - -#include "struct_defs/sprite_animation_frame.h" #include "struct_defs/archived_sprite.h" +#include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay095/ov95_02246C20.h" +#include "overlay095/ov95_022476F0.h" #include "overlay095/struct_ov95_02247568.h" +#include "overlay095/struct_ov95_02247628_decl.h" +#include "overlay095/struct_ov95_0224773C_decl.h" +#include "overlay095/struct_ov95_02247958_decl.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02005474.h" -#include "narc.h" -#include "unk_02006E3C.h" -#include "unk_0200762C.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" #include "message.h" +#include "narc.h" +#include "pokemon.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" +#include "unk_02006E3C.h" +#include "unk_0200762C.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" -#include "pokemon.h" -#include "overlay095/ov95_02246C20.h" -#include "overlay095/ov95_022476F0.h" -#include "overlay095/ov95_0224B3D8.h" enum { UnkEnum_ov95_0224BD5C_00 = -0x780, @@ -62,28 +59,28 @@ enum { }; typedef struct { - UnkStruct_ov95_02247628 * unk_00; + UnkStruct_ov95_02247628 *unk_00; int unk_04; int unk_08; BOOL unk_0C; - UnkStruct_02007768 * unk_10; - Sprite * unk_14; + UnkStruct_02007768 *unk_10; + Sprite *unk_14; SpriteAnimationFrame unk_18[10]; - GraphicElementData * unk_40[2]; + GraphicElementData *unk_40[2]; UnkStruct_ov95_02247568 unk_48; - BGL * unk_58; + BGL *unk_58; Window unk_5C; - Strbuf* unk_6C; - Strbuf* unk_70; - UnkStruct_ov95_0224773C * unk_74; - UnkStruct_ov95_02247958 * unk_78; - SysTask * unk_7C; - SysTask * unk_80; - NARC * unk_84; + Strbuf *unk_6C; + Strbuf *unk_70; + UnkStruct_ov95_0224773C *unk_74; + UnkStruct_ov95_02247958 *unk_78; + SysTask *unk_7C; + SysTask *unk_80; + NARC *unk_84; } UnkStruct_ov95_0224B4D4; typedef struct { - UnkStruct_ov95_0224B4D4 * unk_00; + UnkStruct_ov95_0224B4D4 *unk_00; fx32 unk_04; fx32 unk_08; fx32 unk_0C; @@ -91,12 +88,12 @@ typedef struct { } UnkStruct_ov95_0224BBB0; typedef struct { - SysTask ** unk_00; + SysTask **unk_00; int unk_04; - void * unk_08; + void *unk_08; int unk_0C; - UnkStruct_ov95_0224773C * unk_10; - UnkStruct_ov95_02247958 * unk_14; + UnkStruct_ov95_0224773C *unk_10; + UnkStruct_ov95_02247958 *unk_14; fx32 unk_18; fx32 unk_1C; int unk_20; @@ -109,29 +106,29 @@ typedef struct { int unk_40; } UnkStruct_ov95_0224BC6C; -static void ov95_0224B4D4(UnkStruct_ov95_0224B4D4 * param0); -static int ov95_0224B520(UnkStruct_ov95_0224B4D4 * param0, int * param1); -static int ov95_0224B6F0(UnkStruct_ov95_0224B4D4 * param0, int * param1); -static int ov95_0224B71C(UnkStruct_ov95_0224B4D4 * param0, int * param1); -static int ov95_0224B81C(UnkStruct_ov95_0224B4D4 * param0, int * param1); -static BOOL ov95_0224B990(UnkStruct_ov95_0224B4D4 * param0, int param1); -static void ov95_0224B9C0(UnkStruct_ov95_0224B4D4 * param0); -static Sprite * ov95_0224BA8C(UnkStruct_ov95_0224B4D4 * param0); -static void ov95_0224BAE8(UnkStruct_ov95_0224B4D4 * param0); -static void ov95_0224BB8C(UnkStruct_ov95_0224B4D4 * param0); -static void ov95_0224BBB0(UnkStruct_ov95_0224B4D4 * param0, int param1, int param2, int param3); -static BOOL ov95_0224BC00(UnkStruct_ov95_0224B4D4 * param0); -static void ov95_0224BC10(UnkStruct_ov95_0224B4D4 * param0); -static void ov95_0224BC30(SysTask * param0, void * param1); -static void ov95_0224BC6C(UnkStruct_ov95_0224B4D4 * param0, SysTask ** param1); -static void ov95_0224BCE8(SysTask * param0); -static void ov95_0224BD04(void * param0); -static void ov95_0224BD40(void * param0, fx32 param1, int param2); -static void ov95_0224BD5C(SysTask * param0, void * param1); - -void * ov95_0224B3D8 (UnkStruct_ov95_02247628 * param0) +static void ov95_0224B4D4(UnkStruct_ov95_0224B4D4 *param0); +static int ov95_0224B520(UnkStruct_ov95_0224B4D4 *param0, int *param1); +static int ov95_0224B6F0(UnkStruct_ov95_0224B4D4 *param0, int *param1); +static int ov95_0224B71C(UnkStruct_ov95_0224B4D4 *param0, int *param1); +static int ov95_0224B81C(UnkStruct_ov95_0224B4D4 *param0, int *param1); +static BOOL ov95_0224B990(UnkStruct_ov95_0224B4D4 *param0, int param1); +static void ov95_0224B9C0(UnkStruct_ov95_0224B4D4 *param0); +static Sprite *ov95_0224BA8C(UnkStruct_ov95_0224B4D4 *param0); +static void ov95_0224BAE8(UnkStruct_ov95_0224B4D4 *param0); +static void ov95_0224BB8C(UnkStruct_ov95_0224B4D4 *param0); +static void ov95_0224BBB0(UnkStruct_ov95_0224B4D4 *param0, int param1, int param2, int param3); +static BOOL ov95_0224BC00(UnkStruct_ov95_0224B4D4 *param0); +static void ov95_0224BC10(UnkStruct_ov95_0224B4D4 *param0); +static void ov95_0224BC30(SysTask *param0, void *param1); +static void ov95_0224BC6C(UnkStruct_ov95_0224B4D4 *param0, SysTask **param1); +static void ov95_0224BCE8(SysTask *param0); +static void ov95_0224BD04(void *param0); +static void ov95_0224BD40(void *param0, fx32 param1, int param2); +static void ov95_0224BD5C(SysTask *param0, void *param1); + +void *ov95_0224B3D8(UnkStruct_ov95_02247628 *param0) { - UnkStruct_ov95_0224B4D4 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224B4D4)); + UnkStruct_ov95_0224B4D4 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224B4D4)); if (v0) { int v1; @@ -152,9 +149,9 @@ void * ov95_0224B3D8 (UnkStruct_ov95_02247628 * param0) return v0; } -void ov95_0224B438 (void * param0) +void ov95_0224B438(void *param0) { - UnkStruct_ov95_0224B4D4 * v0 = param0; + UnkStruct_ov95_0224B4D4 *v0 = param0; if (v0) { int v1; @@ -183,16 +180,16 @@ void ov95_0224B438 (void * param0) } } -BOOL ov95_0224B49C (void * param0, int * param1) +BOOL ov95_0224B49C(void *param0, int *param1) { - static int(*const v0[])(UnkStruct_ov95_0224B4D4 *, int *) = { + static int (*const v0[])(UnkStruct_ov95_0224B4D4 *, int *) = { ov95_0224B520, ov95_0224B6F0, ov95_0224B71C, ov95_0224B81C }; - UnkStruct_ov95_0224B4D4 * v1 = param0; + UnkStruct_ov95_0224B4D4 *v1 = param0; if ((*param1) < NELEMS(v0)) { if (v0[*param1](v1, &(v1->unk_04))) { @@ -208,7 +205,7 @@ BOOL ov95_0224B49C (void * param0, int * param1) return 1; } -static void ov95_0224B4D4 (UnkStruct_ov95_0224B4D4 * param0) +static void ov95_0224B4D4(UnkStruct_ov95_0224B4D4 *param0) { G3X_Reset(); @@ -231,7 +228,7 @@ static void ov95_0224B4D4 (UnkStruct_ov95_0224B4D4 * param0) G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z); } -static int ov95_0224B520 (UnkStruct_ov95_0224B4D4 * param0, int * param1) +static int ov95_0224B520(UnkStruct_ov95_0224B4D4 *param0, int *param1) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -315,7 +312,7 @@ static int ov95_0224B520 (UnkStruct_ov95_0224B4D4 * param0, int * param1) param0->unk_78 = ov95_022478B4(param0->unk_74, 0, 93, 27, 0, UnkEnum_ov95_0224B520_00, 491520, 0); { - VecFx16 v4 = {0x0, 0xf000, 0x0}; + VecFx16 v4 = { 0x0, 0xf000, 0x0 }; ov95_02247990(param0->unk_78, &v4); } @@ -330,7 +327,7 @@ static int ov95_0224B520 (UnkStruct_ov95_0224B4D4 * param0, int * param1) return 1; } -static int ov95_0224B6F0 (UnkStruct_ov95_0224B4D4 * param0, int * param1) +static int ov95_0224B6F0(UnkStruct_ov95_0224B4D4 *param0, int *param1) { switch (*param1) { case 0: @@ -345,7 +342,7 @@ static int ov95_0224B6F0 (UnkStruct_ov95_0224B4D4 * param0, int * param1) return 0; } -static int ov95_0224B71C (UnkStruct_ov95_0224B4D4 * param0, int * param1) +static int ov95_0224B71C(UnkStruct_ov95_0224B4D4 *param0, int *param1) { switch (*param1) { case 0: @@ -369,7 +366,7 @@ static int ov95_0224B71C (UnkStruct_ov95_0224B4D4 * param0, int * param1) break; case 3: if (ov95_0224BC00(param0)) { - const BoxPokemon * v0 = ov95_0224763C(param0->unk_00); + const BoxPokemon *v0 = ov95_0224763C(param0->unk_00); if (BoxPokemon_GetValue((BoxPokemon *)v0, MON_DATA_IS_EGG, NULL) == 0) { u8 v1; @@ -392,7 +389,7 @@ static int ov95_0224B71C (UnkStruct_ov95_0224B4D4 * param0, int * param1) return 0; } -static int ov95_0224B81C (UnkStruct_ov95_0224B4D4 * param0, int * param1) +static int ov95_0224B81C(UnkStruct_ov95_0224B4D4 *param0, int *param1) { switch (*param1) { case 0: @@ -401,8 +398,8 @@ static int ov95_0224B81C (UnkStruct_ov95_0224B4D4 * param0, int * param1) break; case 1: if (++(param0->unk_08) > 10) { - MessageLoader * v0 = ov95_02247630(param0->unk_00); - StringTemplate * v1 = ov95_0224762C(param0->unk_00); + MessageLoader *v0 = ov95_02247630(param0->unk_00); + StringTemplate *v1 = ov95_0224762C(param0->unk_00); int v2, v3; if (ov95_02247680(param0->unk_00) == 1) { @@ -428,8 +425,8 @@ static int ov95_0224B81C (UnkStruct_ov95_0224B4D4 * param0, int * param1) break; case 2: if (ov95_0224B990(param0, 60)) { - MessageLoader * v4 = ov95_02247630(param0->unk_00); - StringTemplate * v5 = ov95_0224762C(param0->unk_00); + MessageLoader *v4 = ov95_02247630(param0->unk_00); + StringTemplate *v5 = ov95_0224762C(param0->unk_00); MessageLoader_GetStrbuf(v4, 3, param0->unk_6C); StringTemplate_Format(v5, param0->unk_70, param0->unk_6C); @@ -463,7 +460,7 @@ static int ov95_0224B81C (UnkStruct_ov95_0224B4D4 * param0, int * param1) return 0; } -static BOOL ov95_0224B990 (UnkStruct_ov95_0224B4D4 * param0, int param1) +static BOOL ov95_0224B990(UnkStruct_ov95_0224B4D4 *param0, int param1) { if (param0->unk_0C) { param0->unk_0C = sub_020061E4(); @@ -477,7 +474,7 @@ static BOOL ov95_0224B990 (UnkStruct_ov95_0224B4D4 * param0, int param1) return param0->unk_0C == 0; } -static void ov95_0224B9C0 (UnkStruct_ov95_0224B4D4 * param0) +static void ov95_0224B9C0(UnkStruct_ov95_0224B4D4 *param0) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -504,10 +501,10 @@ static void ov95_0224B9C0 (UnkStruct_ov95_0224B4D4 * param0) sub_02008A84(param0->unk_10, NNS_GfdGetPlttKeyAddr(v1), NNS_GfdGetPlttKeySize(v1)); } -static Sprite * ov95_0224BA8C (UnkStruct_ov95_0224B4D4 * param0) +static Sprite *ov95_0224BA8C(UnkStruct_ov95_0224B4D4 *param0) { ArchivedSprite v0; - BoxPokemon * v1; + BoxPokemon *v1; int v2; v1 = (BoxPokemon *)ov95_0224763C(param0->unk_00); @@ -519,7 +516,7 @@ static Sprite * ov95_0224BA8C (UnkStruct_ov95_0224B4D4 * param0) return sub_02007C34(param0->unk_10, &v0, 128, v2, 0, 0, param0->unk_18, NULL); } -static void ov95_0224BAE8 (UnkStruct_ov95_0224B4D4 * param0) +static void ov95_0224BAE8(UnkStruct_ov95_0224B4D4 *param0) { NNSG2dImagePaletteProxy v0; NNSG2dImageProxy v1; @@ -543,7 +540,7 @@ static void ov95_0224BAE8 (UnkStruct_ov95_0224B4D4 * param0) sub_02021CAC(param0->unk_40[1], 0); } -static void ov95_0224BB8C (UnkStruct_ov95_0224B4D4 * param0) +static void ov95_0224BB8C(UnkStruct_ov95_0224B4D4 *param0) { int v0; @@ -556,9 +553,9 @@ static void ov95_0224BB8C (UnkStruct_ov95_0224B4D4 * param0) ov95_022475A0(¶m0->unk_48); } -static void ov95_0224BBB0 (UnkStruct_ov95_0224B4D4 * param0, int param1, int param2, int param3) +static void ov95_0224BBB0(UnkStruct_ov95_0224B4D4 *param0, int param1, int param2, int param3) { - UnkStruct_ov95_0224BBB0 * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224BBB0)); + UnkStruct_ov95_0224BBB0 *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224BBB0)); if (v0) { v0->unk_00 = param0; @@ -572,12 +569,12 @@ static void ov95_0224BBB0 (UnkStruct_ov95_0224B4D4 * param0, int param1, int par } } -static BOOL ov95_0224BC00 (UnkStruct_ov95_0224B4D4 * param0) +static BOOL ov95_0224BC00(UnkStruct_ov95_0224B4D4 *param0) { return param0->unk_7C == NULL; } -static void ov95_0224BC10 (UnkStruct_ov95_0224B4D4 * param0) +static void ov95_0224BC10(UnkStruct_ov95_0224B4D4 *param0) { if (param0->unk_7C) { ov95_022476C8(SysTask_GetParam(param0->unk_7C)); @@ -586,9 +583,9 @@ static void ov95_0224BC10 (UnkStruct_ov95_0224B4D4 * param0) } } -static void ov95_0224BC30 (SysTask * param0, void * param1) +static void ov95_0224BC30(SysTask *param0, void *param1) { - UnkStruct_ov95_0224BBB0 * v0 = param1; + UnkStruct_ov95_0224BBB0 *v0 = param1; int v1; if (--(v0->unk_10) > 0) { @@ -602,9 +599,9 @@ static void ov95_0224BC30 (SysTask * param0, void * param1) } } -static void ov95_0224BC6C (UnkStruct_ov95_0224B4D4 * param0, SysTask ** param1) +static void ov95_0224BC6C(UnkStruct_ov95_0224B4D4 *param0, SysTask **param1) { - UnkStruct_ov95_0224BC6C * v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224BC6C)); + UnkStruct_ov95_0224BC6C *v0 = Heap_AllocFromHeap(58, sizeof(UnkStruct_ov95_0224BC6C)); if (v0) { v0->unk_04 = 0; @@ -633,10 +630,10 @@ static void ov95_0224BC6C (UnkStruct_ov95_0224B4D4 * param0, SysTask ** param1) } } -static void ov95_0224BCE8 (SysTask * param0) +static void ov95_0224BCE8(SysTask *param0) { if (param0) { - UnkStruct_ov95_0224BC6C * v0 = SysTask_GetParam(param0); + UnkStruct_ov95_0224BC6C *v0 = SysTask_GetParam(param0); *(v0->unk_00) = NULL; Heap_FreeToHeap(v0); @@ -644,9 +641,9 @@ static void ov95_0224BCE8 (SysTask * param0) } } -static void ov95_0224BD04 (void * param0) +static void ov95_0224BD04(void *param0) { - UnkStruct_ov95_0224BC6C * v0 = param0; + UnkStruct_ov95_0224BC6C *v0 = param0; if (v0->unk_40) { v0->unk_3A += v0->unk_3C; @@ -660,19 +657,19 @@ static void ov95_0224BD04 (void * param0) ov95_02247990(v0->unk_14, &(v0->unk_34)); } -static void ov95_0224BD40 (void * param0, fx32 param1, int param2) +static void ov95_0224BD40(void *param0, fx32 param1, int param2) { if (param2) { - UnkStruct_ov95_0224BC6C * v0 = param0; + UnkStruct_ov95_0224BC6C *v0 = param0; v0->unk_3C = (param1 - v0->unk_3A) / param2; v0->unk_40 = param2; } } -static void ov95_0224BD5C (SysTask * param0, void * param1) +static void ov95_0224BD5C(SysTask *param0, void *param1) { - UnkStruct_ov95_0224BC6C * v0 = param1; + UnkStruct_ov95_0224BC6C *v0 = param1; ov95_0224BD04(v0); diff --git a/src/overlay096/ov96_0223B140.c b/src/overlay096/ov96_0223B140.c index d8fb154760..3c52a0a444 100644 --- a/src/overlay096/ov96_0223B140.c +++ b/src/overlay096/ov96_0223B140.c @@ -1,16 +1,16 @@ -#include "enums.h" +#include "overlay096/ov96_0223B140.h" +#include #include #include -#include +#include "overlay060/ov60_0221F968.h" #include "overlay096/struct_ov96_0223B450.h" #include "overlay096/struct_ov96_0223B450_sub1.h" #include "overlay096/struct_ov96_0223B574.h" #include "overlay096/struct_ov96_0223B574_1.h" -#include "overlay060/ov60_0221F968.h" -#include "overlay096/ov96_0223B140.h" +#include "enums.h" typedef enum { UnkEnum_ov96_0223B15C_00, @@ -35,15 +35,15 @@ typedef struct { u64 unk_0C; u8 unk_14[239]; u8 unk_103[2]; - u8 * unk_108; + u8 *unk_108; } UnkStruct_ov96_0223DDE0; -static BOOL ov96_0223B5D0(const u8 * param0, const void * param1, int param2, void * param3, int param4); +static BOOL ov96_0223B5D0(const u8 *param0, const void *param1, int param2, void *param3, int param4); static int ov96_0223B608(int param0); static UnkStruct_ov96_0223DDE0 Unk_ov96_0223DDE0; -void ov96_0223B140 (s32 param0, u64 param1) +void ov96_0223B140(s32 param0, u64 param1) { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_01; Unk_ov96_0223DDE0.unk_04 = 0; @@ -51,7 +51,7 @@ void ov96_0223B140 (s32 param0, u64 param1) Unk_ov96_0223DDE0.unk_0C = param1; } -void ov96_0223B15C (void) +void ov96_0223B15C(void) { switch (Unk_ov96_0223DDE0.unk_00) { case UnkEnum_ov96_0223B15C_00: @@ -225,7 +225,7 @@ void ov96_0223B15C (void) } } -BOOL ov96_0223B3D4 (void) +BOOL ov96_0223B3D4(void) { switch (Unk_ov96_0223DDE0.unk_00) { case UnkEnum_ov96_0223B15C_01: @@ -240,18 +240,23 @@ BOOL ov96_0223B3D4 (void) return 0; } -s32 ov96_0223B3F4 (void) +s32 ov96_0223B3F4(void) { return Unk_ov96_0223DDE0.unk_04; } -void ov96_0223B400 (s32 param0) +void ov96_0223B400(s32 param0) { ov60_0221FC84(); Unk_ov96_0223DDE0.unk_14[0] = (u8)(param0 - 1); - if (ov96_0223B5D0((const u8 *)("http://gamestats2.gs.nintendowifi.net/pokemondpds/" "battletower/roomnum.asp"), Unk_ov96_0223DDE0.unk_14, 1, Unk_ov96_0223DDE0.unk_103, 2)) { + if (ov96_0223B5D0((const u8 *)("http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "battletower/roomnum.asp"), + Unk_ov96_0223DDE0.unk_14, + 1, + Unk_ov96_0223DDE0.unk_103, + 2)) { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_02; } else { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_12; @@ -260,7 +265,7 @@ void ov96_0223B400 (s32 param0) } } -void ov96_0223B450 (s32 param0, s32 param1, UnkStruct_ov96_0223B450 * param2) +void ov96_0223B450(s32 param0, s32 param1, UnkStruct_ov96_0223B450 *param2) { Unk_ov96_0223DDE0.unk_108 = (u8 *)param2; @@ -269,7 +274,12 @@ void ov96_0223B450 (s32 param0, s32 param1, UnkStruct_ov96_0223B450 * param2) Unk_ov96_0223DDE0.unk_14[0] = (u8)(param0 - 1); Unk_ov96_0223DDE0.unk_14[1] = (u8)(param1 - 1); - if (ov96_0223B5D0((const u8 *)("http://gamestats2.gs.nintendowifi.net/pokemondpds/" "battletower/download.asp"), Unk_ov96_0223DDE0.unk_14, 2, param2, sizeof(UnkStruct_ov96_0223B450))) { + if (ov96_0223B5D0((const u8 *)("http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "battletower/download.asp"), + Unk_ov96_0223DDE0.unk_14, + 2, + param2, + sizeof(UnkStruct_ov96_0223B450))) { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_04; } else { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_12; @@ -278,7 +288,7 @@ void ov96_0223B450 (s32 param0, s32 param1, UnkStruct_ov96_0223B450 * param2) } } -void ov96_0223B4B0 (s32 param0, s32 param1, s32 param2, const UnkStruct_ov96_0223B450_sub1 * param3) +void ov96_0223B4B0(s32 param0, s32 param1, s32 param2, const UnkStruct_ov96_0223B450_sub1 *param3) { ov60_0221FC84(); @@ -290,7 +300,12 @@ void ov96_0223B4B0 (s32 param0, s32 param1, s32 param2, const UnkStruct_ov96_022 memcpy(&Unk_ov96_0223DDE0.unk_14[sizeof(UnkStruct_ov96_0223B450_sub1) + 3], &Unk_ov96_0223DDE0.unk_0C, 8); - if (ov96_0223B5D0((const u8 *)("http://gamestats2.gs.nintendowifi.net/pokemondpds/" "battletower/upload.asp"), Unk_ov96_0223DDE0.unk_14, sizeof(UnkStruct_ov96_0223B450_sub1) + 11, Unk_ov96_0223DDE0.unk_103, 2)) { + if (ov96_0223B5D0((const u8 *)("http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "battletower/upload.asp"), + Unk_ov96_0223DDE0.unk_14, + sizeof(UnkStruct_ov96_0223B450_sub1) + 11, + Unk_ov96_0223DDE0.unk_103, + 2)) { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_06; } else { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_12; @@ -299,11 +314,16 @@ void ov96_0223B4B0 (s32 param0, s32 param1, s32 param2, const UnkStruct_ov96_022 } } -void ov96_0223B530 (void) +void ov96_0223B530(void) { ov60_0221FC84(); - if (ov96_0223B5D0((const u8 *)("http://gamestats2.gs.nintendowifi.net/pokemondpds/" "battletower/info.asp"), Unk_ov96_0223DDE0.unk_14, 0, Unk_ov96_0223DDE0.unk_103, 2)) { + if (ov96_0223B5D0((const u8 *)("http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "battletower/info.asp"), + Unk_ov96_0223DDE0.unk_14, + 0, + Unk_ov96_0223DDE0.unk_103, + 2)) { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_08; } else { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_12; @@ -312,7 +332,7 @@ void ov96_0223B530 (void) } } -void ov96_0223B574 (const UnkStruct_ov96_0223B574 * param0, UnkStruct_ov96_0223B574_1 * param1) +void ov96_0223B574(const UnkStruct_ov96_0223B574 *param0, UnkStruct_ov96_0223B574_1 *param1) { OS_GetMacAddress((u8 *)param0->unk_14); @@ -321,7 +341,12 @@ void ov96_0223B574 (const UnkStruct_ov96_0223B574 * param0, UnkStruct_ov96_0223B ov60_0221FC84(); - if (ov96_0223B5D0((const u8 *)("http://gamestats2.gs.nintendowifi.net/pokemondpds/" "common/setProfile.asp"), Unk_ov96_0223DDE0.unk_14, sizeof(UnkStruct_ov96_0223B574), Unk_ov96_0223DDE0.unk_108, sizeof(UnkStruct_ov96_0223B574_1))) { + if (ov96_0223B5D0((const u8 *)("http://gamestats2.gs.nintendowifi.net/pokemondpds/" + "common/setProfile.asp"), + Unk_ov96_0223DDE0.unk_14, + sizeof(UnkStruct_ov96_0223B574), + Unk_ov96_0223DDE0.unk_108, + sizeof(UnkStruct_ov96_0223B574_1))) { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_10; } else { Unk_ov96_0223DDE0.unk_00 = UnkEnum_ov96_0223B15C_12; @@ -330,7 +355,7 @@ void ov96_0223B574 (const UnkStruct_ov96_0223B574 * param0, UnkStruct_ov96_0223B } } -static BOOL ov96_0223B5D0 (const u8 * param0, const void * param1, int param2, void * param3, int param4) +static BOOL ov96_0223B5D0(const u8 *param0, const void *param1, int param2, void *param3, int param4) { switch (ov60_0221FCA8(param0, Unk_ov96_0223DDE0.unk_08, param1, param2, (u8 *)param3, param4)) { case 0: @@ -345,7 +370,7 @@ static BOOL ov96_0223B5D0 (const u8 * param0, const void * param1, int param2, v return 0; } -static int ov96_0223B608 (int param0) +static int ov96_0223B608(int param0) { int v0; diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c index d9b85fd6d7..578fabe3a6 100644 --- a/src/overlay096/ov96_0223B6A0.c +++ b/src/overlay096/ov96_0223B6A0.c @@ -1,72 +1,72 @@ +#include "overlay096/ov96_0223B6A0.h" + +#include #include #include -#include - -#include "inlines.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "overlay096/struct_ov96_0223BF40_decl.h" - #include "struct_defs/struct_0206BC70.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay096/ov96_0223B140.h" +#include "overlay096/ov96_0223BCE0.h" +#include "overlay096/struct_ov96_0223BF40_decl.h" #include "overlay096/struct_ov96_0223BF40_t.h" #include "overlay115/struct_ov115_02261520.h" +#include "gx_layers.h" +#include "heap.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "string_template.h" #include "unk_02001AF4.h" #include "unk_020041CC.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_02033200.h" #include "unk_020393C8.h" #include "unk_02099550.h" -#include "overlay096/ov96_0223B140.h" -#include "overlay096/ov96_0223B6A0.h" -#include "overlay096/ov96_0223BCE0.h" -static void ov96_0223B940(void * param0); +static void ov96_0223B940(void *param0); static void ov96_0223B960(void); -static void ov96_0223B980(UnkStruct_ov96_0223BF40 * param0, OverlayManager * param1); -static void ov96_0223B99C(UnkStruct_ov96_0223BF40 * param0); +static void ov96_0223B980(UnkStruct_ov96_0223BF40 *param0, OverlayManager *param1); +static void ov96_0223B99C(UnkStruct_ov96_0223BF40 *param0); static void ov96_0223B9A0(void); -static void ov96_0223B9D0(UnkStruct_ov96_0223BF40 * param0); -static void ov96_0223BB0C(UnkStruct_ov96_0223BF40 * param0); -static void ov96_0223BC2C(DWCAllocType param0, void * param1, u32 param2); -static void * ov96_0223BC04(DWCAllocType param0, u32 param1, int param2); -static void ov96_0223BC64(UnkStruct_ov96_0223BF40 * param0); -static void ov96_0223BC8C(UnkStruct_ov96_0223BF40 * param0); +static void ov96_0223B9D0(UnkStruct_ov96_0223BF40 *param0); +static void ov96_0223BB0C(UnkStruct_ov96_0223BF40 *param0); +static void ov96_0223BC2C(DWCAllocType param0, void *param1, u32 param2); +static void *ov96_0223BC04(DWCAllocType param0, u32 param1, int param2); +static void ov96_0223BC64(UnkStruct_ov96_0223BF40 *param0); +static void ov96_0223BC8C(UnkStruct_ov96_0223BF40 *param0); static NNSFndHeapHandle Unk_ov96_0223DEF0; -static int (* Unk_ov96_0223DCD4[][3])(UnkStruct_ov96_0223BF40 *, int) = { - {ov96_0223BCE0, ov96_0223BDBC, ov96_0223BDEC} +static int (*Unk_ov96_0223DCD4[][3])(UnkStruct_ov96_0223BF40 *, int) = { + { ov96_0223BCE0, ov96_0223BDBC, ov96_0223BDEC } }; -UnkStruct_ov96_0223BF40 * Unk_ov96_0223DEEC; +UnkStruct_ov96_0223BF40 *Unk_ov96_0223DEEC; -int ov96_0223B6A0 (OverlayManager * param0, int * param1) +int ov96_0223B6A0(OverlayManager *param0, int *param1) { - UnkStruct_ov96_0223BF40 * v0; + UnkStruct_ov96_0223BF40 *v0; switch (*param1) { case 0: @@ -87,7 +87,10 @@ int ov96_0223B6A0 (OverlayManager * param0, int * param1) { UnkStruct_ov84_0223BA5C v1 = { - GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BGMODE_0, GX_BG0_AS_2D, + GX_DISPMODE_GRAPHICS, + GX_BGMODE_0, + GX_BGMODE_0, + GX_BG0_AS_2D, }; sub_02018368(&v1); @@ -122,9 +125,9 @@ int ov96_0223B6A0 (OverlayManager * param0, int * param1) return 0; } -int ov96_0223B7F8 (OverlayManager * param0, int * param1) +int ov96_0223B7F8(OverlayManager *param0, int *param1) { - UnkStruct_ov96_0223BF40 * v0 = OverlayManager_Data(param0); + UnkStruct_ov96_0223BF40 *v0 = OverlayManager_Data(param0); int v1; DWC_UpdateConnection(); @@ -167,9 +170,9 @@ int ov96_0223B7F8 (OverlayManager * param0, int * param1) return 0; } -int ov96_0223B8CC (OverlayManager * param0, int * param1) +int ov96_0223B8CC(OverlayManager *param0, int *param1) { - UnkStruct_ov96_0223BF40 * v0 = OverlayManager_Data(param0); + UnkStruct_ov96_0223BF40 *v0 = OverlayManager_Data(param0); int v1; Heap_FreeToHeap(v0->unk_24); @@ -194,9 +197,9 @@ int ov96_0223B8CC (OverlayManager * param0, int * param1) return 1; } -static void ov96_0223B940 (void * param0) +static void ov96_0223B940(void *param0) { - UnkStruct_ov96_0223BF40 * v0 = param0; + UnkStruct_ov96_0223BF40 *v0 = param0; sub_0201DCAC(); sub_0200A858(); @@ -206,7 +209,7 @@ static void ov96_0223B940 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov96_0223B960 (void) +static void ov96_0223B960(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -224,7 +227,7 @@ static void ov96_0223B960 (void) GXLayers_SetBanks(&v0); } -static void ov96_0223B980 (UnkStruct_ov96_0223BF40 * param0, OverlayManager * param1) +static void ov96_0223B980(UnkStruct_ov96_0223BF40 *param0, OverlayManager *param1) { param0->unk_00 = (UnkStruct_0206BC70 *)OverlayManager_Args(param1); param0->unk_10 = 0; @@ -232,12 +235,12 @@ static void ov96_0223B980 (UnkStruct_ov96_0223BF40 * param0, OverlayManager * pa ov96_0223BC5C(param0, 0, 0); } -static void ov96_0223B99C (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223B99C(UnkStruct_ov96_0223BF40 *param0) { return; } -static void ov96_0223B9A0 (void) +static void ov96_0223B9A0(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -252,10 +255,10 @@ static void ov96_0223B9A0 (void) sub_0201F8E4(); } -static void ov96_0223B9D0 (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223B9D0(UnkStruct_ov96_0223BF40 *param0) { int v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTRADE, 68); @@ -281,11 +284,11 @@ static void ov96_0223B9D0 (UnkStruct_ov96_0223BF40 * param0) } static const u16 Unk_ov96_0223DA80[][2] = { - {0xE0, 0x6F}, - {0xE0, 0x81} + { 0xE0, 0x6F }, + { 0xE0, 0x81 } }; -void ov96_0223BAE0 (UnkStruct_ov115_02261520 * param0, UnkStruct_ov96_0223BF40 * param1, UnkStruct_ov19_021DA864 * param2, int param3) +void ov96_0223BAE0(UnkStruct_ov115_02261520 *param0, UnkStruct_ov96_0223BF40 *param1, UnkStruct_ov19_021DA864 *param2, int param3) { param0->unk_00 = param1->unk_BF4; param0->unk_04 = param2; @@ -299,7 +302,7 @@ void ov96_0223BAE0 (UnkStruct_ov115_02261520 * param0, UnkStruct_ov96_0223BF40 * param0->unk_2C = 68; } -static void ov96_0223BB0C (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223BB0C(UnkStruct_ov96_0223BF40 *param0) { int v0; @@ -334,7 +337,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov96_0223DA78 = { 0x0 }; -UIControlData * ov96_0223BBC8 (BGL * param0, int param1, int param2) +UIControlData *ov96_0223BBC8(BGL *param0, int param1, int param2) { UnkStruct_ov61_0222C884 v0; @@ -345,16 +348,16 @@ UIControlData * ov96_0223BBC8 (BGL * param0, int param1, int param2) return sub_02002100(param0, &v0, (1 + (18 + 12)), 11, 68); } -void ov96_0223BBFC (UnkStruct_ov96_0223BF40 * param0, int param1, int param2) +void ov96_0223BBFC(UnkStruct_ov96_0223BF40 *param0, int param1, int param2) { param0->unk_1C = param1; param0->unk_20 = param2; } -static void * ov96_0223BC04 (DWCAllocType param0, u32 param1, int param2) +static void *ov96_0223BC04(DWCAllocType param0, u32 param1, int param2) { -#pragma unused( param0 ) - void * v0; +#pragma unused(param0) + void *v0; OSIntrMode v1; v1 = OS_DisableInterrupts(); @@ -369,9 +372,9 @@ static void * ov96_0223BC04 (DWCAllocType param0, u32 param1, int param2) return v0; } -static void ov96_0223BC2C (DWCAllocType param0, void * param1, u32 param2) +static void ov96_0223BC2C(DWCAllocType param0, void *param1, u32 param2) { -#pragma unused( param0, param2 ) +#pragma unused(param0, param2) OSIntrMode v0; if (!param1) { @@ -384,18 +387,18 @@ static void ov96_0223BC2C (DWCAllocType param0, void * param1, u32 param2) OS_RestoreInterrupts(v0); } -int ov96_0223BC50 (void) +int ov96_0223BC50(void) { return WM_LINK_LEVEL_3 - DWC_GetLinkLevel(); } -void ov96_0223BC5C (UnkStruct_ov96_0223BF40 * param0, int param1, int param2) +void ov96_0223BC5C(UnkStruct_ov96_0223BF40 *param0, int param1, int param2) { param0->unk_14 = param1; param0->unk_18 = param2; } -static void ov96_0223BC64 (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223BC64(UnkStruct_ov96_0223BF40 *param0) { ov96_0223B960(); ov96_0223B9A0(); @@ -405,7 +408,7 @@ static void ov96_0223BC64 (UnkStruct_ov96_0223BF40 * param0) SetMainCallback(ov96_0223B940, param0); } -static void ov96_0223BC8C (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223BC8C(UnkStruct_ov96_0223BF40 *param0) { int v0; diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index d4fa7a3241..1b3c6ac739 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -1,126 +1,124 @@ +#include "overlay096/ov96_0223BCE0.h" + +#include #include #include -#include - -#include "inlines.h" -#include "core_sys.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "overlay096/struct_ov96_0223BF40_decl.h" - #include "struct_defs/struct_02049A68.h" #include "struct_defs/struct_0205AA50.h" + +#include "overlay004/ov4_021D0D80.h" +#include "overlay096/ov96_0223B140.h" +#include "overlay096/ov96_0223B6A0.h" #include "overlay096/struct_ov96_0223B450.h" #include "overlay096/struct_ov96_0223B450_sub1.h" #include "overlay096/struct_ov96_0223B450_sub2.h" +#include "overlay096/struct_ov96_0223BF40_decl.h" #include "overlay096/struct_ov96_0223BF40_t.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "savedata.h" #include "unk_02025CB0.h" -#include "game_options.h" #include "unk_0202D05C.h" #include "unk_02030CE8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" #include "unk_02073700.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay096/ov96_0223B140.h" -#include "overlay096/ov96_0223B6A0.h" -#include "overlay096/ov96_0223BCE0.h" -static void ov96_0223BE38(BGL * param0); -static void ov96_0223BF1C(BGL * param0); -static void ov96_0223BF40(UnkStruct_ov96_0223BF40 * param0); -static void ov96_0223C1FC(UnkStruct_ov96_0223BF40 * param0); -static void ov96_0223C314(UnkStruct_ov96_0223BF40 * param0); -static void ov96_0223C358(UnkStruct_ov96_0223BF40 * param0); -static void ov96_0223C3B0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C3F0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C420(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C4B8(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C510(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C530(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C5BC(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C5CC(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C680(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C6C0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D524(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D528(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D558(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D6C8(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D71C(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D6E8(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D588(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D5FC(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C6DC(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C488(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D7B8(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D7E4(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C7B4(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C7E8(UnkStruct_ov96_0223BF40 * param0); -static void ov96_0223D814(UnkStruct_ov96_0223BF40 * param0, MessageLoader * param1, int param2, int param3, u16 param4); -static void ov96_0223D750(UnkStruct_ov96_0223BF40 * param0, MessageLoader * param1, int param2, int param3, u16 param4); -static void ov96_0223D90C(Window * param0, Strbuf *param1, int param2, int param3); -static void ov96_0223D9B8(UnkStruct_ov96_0223BF40 * param0, int param1); -static void ov96_0223DA34(UnkStruct_ov96_0223BF40 * param0, int param1, int param2); -static int ov96_0223C924(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C948(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223C9F8(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CA28(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CA70(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D3D8(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D408(UnkStruct_ov96_0223BF40 * param0); -static void ov96_0223D950(UnkStruct_ov96_0223BF40 * param0, int param1, int param2); -static int ov96_0223CB7C(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CC20(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CC50(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CD60(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CD9C(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CDD0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CE1C(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CEF0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CF2C(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CF5C(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CFAC(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D43C(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D46C(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223CBF0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D1D8(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D080(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D0B0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D100(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D240(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D270(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D35C(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D398(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D3A0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D3B8(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D4EC(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D4D0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D4A0(UnkStruct_ov96_0223BF40 * param0); -static int ov96_0223D86C(Window * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); -static void ov96_0223D978(UnkStruct_ov96_0223BF40 * param0); -static void ov96_0223D99C(UnkStruct_ov96_0223BF40 * param0); - -static int (* Unk_ov96_0223DCE0[])(UnkStruct_ov96_0223BF40 *) = { +static void ov96_0223BE38(BGL *param0); +static void ov96_0223BF1C(BGL *param0); +static void ov96_0223BF40(UnkStruct_ov96_0223BF40 *param0); +static void ov96_0223C1FC(UnkStruct_ov96_0223BF40 *param0); +static void ov96_0223C314(UnkStruct_ov96_0223BF40 *param0); +static void ov96_0223C358(UnkStruct_ov96_0223BF40 *param0); +static void ov96_0223C3B0(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C3F0(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C420(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C4B8(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C510(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C530(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C5BC(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C5CC(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C680(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C6C0(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D524(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D528(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D558(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D6C8(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D71C(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D6E8(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D588(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D5FC(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C6DC(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C488(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D7B8(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D7E4(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C7B4(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C7E8(UnkStruct_ov96_0223BF40 *param0); +static void ov96_0223D814(UnkStruct_ov96_0223BF40 *param0, MessageLoader *param1, int param2, int param3, u16 param4); +static void ov96_0223D750(UnkStruct_ov96_0223BF40 *param0, MessageLoader *param1, int param2, int param3, u16 param4); +static void ov96_0223D90C(Window *param0, Strbuf *param1, int param2, int param3); +static void ov96_0223D9B8(UnkStruct_ov96_0223BF40 *param0, int param1); +static void ov96_0223DA34(UnkStruct_ov96_0223BF40 *param0, int param1, int param2); +static int ov96_0223C924(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C948(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223C9F8(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CA28(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CA70(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D3D8(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D408(UnkStruct_ov96_0223BF40 *param0); +static void ov96_0223D950(UnkStruct_ov96_0223BF40 *param0, int param1, int param2); +static int ov96_0223CB7C(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CC20(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CC50(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CD60(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CD9C(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CDD0(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CE1C(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CEF0(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CF2C(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CF5C(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CFAC(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D43C(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D46C(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223CBF0(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D1D8(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D080(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D0B0(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D100(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D240(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D270(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D35C(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D398(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D3A0(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D3B8(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D4EC(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D4D0(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D4A0(UnkStruct_ov96_0223BF40 *param0); +static int ov96_0223D86C(Window *param0, Strbuf *param1, int param2, int param3, u32 param4, int param5); +static void ov96_0223D978(UnkStruct_ov96_0223BF40 *param0); +static void ov96_0223D99C(UnkStruct_ov96_0223BF40 *param0); + +static int (*Unk_ov96_0223DCE0[])(UnkStruct_ov96_0223BF40 *) = { ov96_0223C3F0, ov96_0223C420, ov96_0223C510, @@ -180,7 +178,7 @@ static int (* Unk_ov96_0223DCE0[])(UnkStruct_ov96_0223BF40 *) = { ov96_0223D7E4 }; -int ov96_0223BCE0 (UnkStruct_ov96_0223BF40 * param0, int param1) +int ov96_0223BCE0(UnkStruct_ov96_0223BF40 *param0, int param1) { ov96_0223C358(param0); sub_0200F174(0, 1, 1, 0x0, 8, 1, 68); @@ -214,7 +212,7 @@ int ov96_0223BCE0 (UnkStruct_ov96_0223BF40 * param0, int param1) return 2; } -int ov96_0223BDBC (UnkStruct_ov96_0223BF40 * param0, int param1) +int ov96_0223BDBC(UnkStruct_ov96_0223BF40 *param0, int param1) { int v0, v1; @@ -233,7 +231,7 @@ int ov96_0223BDBC (UnkStruct_ov96_0223BF40 * param0, int param1) return v0; } -int ov96_0223BDEC (UnkStruct_ov96_0223BF40 * param0, int param1) +int ov96_0223BDEC(UnkStruct_ov96_0223BF40 *param0, int param1) { inline_ov61_0222C160(¶m0->unk_FF8); @@ -252,7 +250,7 @@ int ov96_0223BDEC (UnkStruct_ov96_0223BF40 * param0, int param1) return 1; } -static void ov96_0223BE38 (BGL * param0) +static void ov96_0223BE38(BGL *param0) { { UnkStruct_ov97_0222DB78 v0 = { @@ -344,7 +342,7 @@ static void ov96_0223BE38 (BGL * param0) sub_02019690(4, 32, 0, 68); } -static void ov96_0223BF1C (BGL * param0) +static void ov96_0223BF1C(BGL *param0) { sub_02019044(param0, 5); sub_02019044(param0, 4); @@ -352,10 +350,10 @@ static void ov96_0223BF1C (BGL * param0) sub_02019044(param0, 0); } -static void ov96_0223BF40 (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223BF40(UnkStruct_ov96_0223BF40 *param0) { - BGL * v0 = param0->unk_04; - NARC * v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 68); + BGL *v0 = param0->unk_04; + NARC *v1 = NARC_ctor(NARC_INDEX_DATA__WIFIP2PMATCH, 68); sub_02007130(v1, 3, 0, 0, 0, 68); sub_02007130(v1, 3, 4, 0, 0, 68); @@ -375,7 +373,7 @@ static void ov96_0223BF40 (UnkStruct_ov96_0223BF40 * param0) NARC_dtor(v1); } -static void ov96_0223C1FC (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223C1FC(UnkStruct_ov96_0223BF40 *param0) { BGL_AddWindow(param0->unk_04, ¶m0->unk_E78, 0, 4, 4, 23, 16, 13, (((((1 + (18 + 12)) + 9) + 27 * 4) + 4 * 2) + 4 * 2)); BGL_FillWindow(¶m0->unk_E78, 0x0); @@ -390,7 +388,7 @@ static void ov96_0223C1FC (UnkStruct_ov96_0223BF40 * param0) BGL_FillWindow(¶m0->unk_E38, 0xf0f); } -static void ov96_0223C314 (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223C314(UnkStruct_ov96_0223BF40 *param0) { BGL_DeleteWindow(¶m0->unk_E38); BGL_DeleteWindow(¶m0->unk_E68); @@ -399,7 +397,7 @@ static void ov96_0223C314 (UnkStruct_ov96_0223BF40 * param0) BGL_DeleteWindow(¶m0->unk_E78); } -static void ov96_0223C358 (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223C358(UnkStruct_ov96_0223BF40 *param0) { param0->unk_BDC = Strbuf_Init((90 * 2), 68); param0->unk_BE4 = Strbuf_Init(4, 68); @@ -408,7 +406,7 @@ static void ov96_0223C358 (UnkStruct_ov96_0223BF40 * param0) param0->unk_BEC = Strbuf_Init((16 * 8 * 2), 68); } -static void ov96_0223C3B0 (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223C3B0(UnkStruct_ov96_0223BF40 *param0) { Strbuf_Free(param0->unk_BEC); Strbuf_Free(param0->unk_BE0); @@ -417,7 +415,7 @@ static void ov96_0223C3B0 (UnkStruct_ov96_0223BF40 * param0) Strbuf_Free(param0->unk_BDC); } -static int ov96_0223C3F0 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C3F0(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD8, 17, 1, 0xf0f); ov96_0223BBFC(param0, 48, 1); @@ -425,7 +423,7 @@ static int ov96_0223C3F0 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C420 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C420(UnkStruct_ov96_0223BF40 *param0) { int v0 = sub_02002114(param0->unk_F68, 68); @@ -444,7 +442,7 @@ static int ov96_0223C420 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C488 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C488(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD4, 12, 1, 0xf0f); ov96_0223BBFC(param0, 48, 52); @@ -452,7 +450,7 @@ static int ov96_0223C488 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C4B8 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C4B8(UnkStruct_ov96_0223BF40 *param0) { int v0 = sub_02002114(param0->unk_F68, 68); @@ -478,10 +476,10 @@ static int ov96_0223C4B8 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C510 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C510(UnkStruct_ov96_0223BF40 *param0) { DWC_InitInetEx(¶m0->unk_2C, 2, 1, 20); - DWC_SetAuthServer((DWC_CONNECTINET_AUTH_RELEASE)); + DWC_SetAuthServer(DWC_CONNECTINET_AUTH_RELEASE); DWC_ConnectInetAsync(); param0->unk_1C = 3; @@ -489,7 +487,7 @@ static int ov96_0223C510 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C530 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C530(UnkStruct_ov96_0223BF40 *param0) { DWC_ProcessInet(); @@ -497,8 +495,7 @@ static int ov96_0223C530 (UnkStruct_ov96_0223BF40 * param0) int v0 = DWC_GetInetStatus(); switch (v0) { - case DWC_CONNECTINET_STATE_ERROR: - { + case DWC_CONNECTINET_STATE_ERROR: { DWCError v1; int v2; @@ -520,8 +517,7 @@ static int ov96_0223C530 (UnkStruct_ov96_0223BF40 * param0) case DWC_CONNECTINET_STATE_DISCONNECTING: case DWC_CONNECTINET_STATE_DISCONNECTED: default: - case DWC_CONNECTINET_STATE_FATAL_ERROR: - { + case DWC_CONNECTINET_STATE_FATAL_ERROR: { DWCError v3; int v4; @@ -530,11 +526,9 @@ static int ov96_0223C530 (UnkStruct_ov96_0223BF40 * param0) ov96_0223D99C(param0); param0->unk_1C = 53; param0->unk_F7C = -2; - } - break; + } break; - case DWC_CONNECTINET_STATE_CONNECTED: - { + case DWC_CONNECTINET_STATE_CONNECTED: { DWCApInfo v5; DWC_GetApInfo(&v5); @@ -551,7 +545,7 @@ static int ov96_0223C530 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C5BC (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C5BC(UnkStruct_ov96_0223BF40 *param0) { DWC_NASLoginAsync(); param0->unk_1C = 5; @@ -559,7 +553,7 @@ static int ov96_0223C5BC (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C5CC (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C5CC(UnkStruct_ov96_0223BF40 *param0) { switch (DWC_NASLoginProcess()) { case DWC_NASLOGIN_STATE_SUCCESS: @@ -615,7 +609,7 @@ static int ov96_0223C5CC (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C680 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C680(UnkStruct_ov96_0223BF40 *param0) { s32 v0; @@ -633,7 +627,7 @@ static int ov96_0223C680 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C6C0 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C6C0(UnkStruct_ov96_0223BF40 *param0) { ov96_0223B530(); @@ -643,7 +637,7 @@ static int ov96_0223C6C0 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C6DC (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C6DC(UnkStruct_ov96_0223BF40 *param0) { if (ov96_0223B3D4()) { s32 v0 = ov96_0223B3F4(); @@ -707,7 +701,7 @@ static int ov96_0223C6DC (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C7B4 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C7B4(UnkStruct_ov96_0223BF40 *param0) { sub_02030E78(param0->unk_00->unk_0C, ¶m0->unk_F84); ov96_0223B574(¶m0->unk_F84, ¶m0->unk_FE8); @@ -718,7 +712,7 @@ static int ov96_0223C7B4 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C7E8 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C7E8(UnkStruct_ov96_0223BF40 *param0) { if (ov96_0223B3D4()) { s32 v0 = ov96_0223B3F4(); @@ -806,7 +800,7 @@ static int ov96_0223C7E8 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C924 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C924(UnkStruct_ov96_0223BF40 *param0) { ov96_0223B400(param0->unk_90); param0->unk_1C = 12; @@ -816,7 +810,7 @@ static int ov96_0223C924 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C948 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C948(UnkStruct_ov96_0223BF40 *param0) { if (ov96_0223B3D4()) { s32 v0 = ov96_0223B3F4(); @@ -869,7 +863,7 @@ static int ov96_0223C948 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223C9F8 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223C9F8(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD0, 0, 1, 0xf0f); ov96_0223BBFC(param0, 47, 14); @@ -877,7 +871,7 @@ static int ov96_0223C9F8 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CA28 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CA28(UnkStruct_ov96_0223BF40 *param0) { Window_Show(¶m0->unk_E58, 0, (1 + (18 + 12)), 14); ov96_0223D90C(¶m0->unk_E58, param0->unk_BE4, param0->unk_98, 3); @@ -889,7 +883,7 @@ static int ov96_0223CA28 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CA70 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CA70(UnkStruct_ov96_0223BF40 *param0) { if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { param0->unk_98++; @@ -934,7 +928,7 @@ static int ov96_0223CA70 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CB7C (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CB7C(UnkStruct_ov96_0223BF40 *param0) { StringTemplate_SetNumber(param0->unk_BCC, 0, param0->unk_98, 3, 2, 1); StringTemplate_SetNumber(param0->unk_BCC, 1, param0->unk_90, 2, 2, 1); @@ -947,7 +941,7 @@ static int ov96_0223CB7C (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CBF0 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CBF0(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D750(param0, param0->unk_BD0, 2, 1, 0xf0f); ov96_0223BBFC(param0, 47, 13); @@ -955,7 +949,7 @@ static int ov96_0223CBF0 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CC20 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CC20(UnkStruct_ov96_0223BF40 *param0) { ov96_0223B450(param0->unk_8C, param0->unk_98, ¶m0->unk_9C); ov96_0223D978(param0); @@ -966,7 +960,7 @@ static int ov96_0223CC20 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CC50 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CC50(UnkStruct_ov96_0223BF40 *param0) { if (ov96_0223B3D4()) { s32 v0 = ov96_0223B3F4(); @@ -1030,7 +1024,7 @@ static int ov96_0223CC50 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CD60 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CD60(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD0, 3, 1, 0xf0f); ov96_0223BBFC(param0, 47, 45); @@ -1041,7 +1035,7 @@ static int ov96_0223CD60 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CD9C (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CD9C(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD0, 7, 1, 0xf0f); ov96_0223BBFC(param0, 47, 26); @@ -1050,7 +1044,7 @@ static int ov96_0223CD9C (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CDD0 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CDD0(UnkStruct_ov96_0223BF40 *param0) { UnkStruct_02049A68 v0; int v1 = sub_0202D3A0(param0->unk_00->unk_00); @@ -1065,7 +1059,7 @@ static int ov96_0223CDD0 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CE1C (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CE1C(UnkStruct_ov96_0223BF40 *param0) { if (ov96_0223B3D4()) { s32 v0 = ov96_0223B3F4(); @@ -1121,7 +1115,7 @@ static int ov96_0223CE1C (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CEF0 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CEF0(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD0, 8, 1, 0xf0f); ov96_0223BBFC(param0, 47, 45); @@ -1132,7 +1126,7 @@ static int ov96_0223CEF0 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CF2C (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CF2C(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD0, 5, 1, 0xf0f); ov96_0223BBFC(param0, 47, 30); @@ -1140,7 +1134,7 @@ static int ov96_0223CF2C (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CF5C (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CF5C(UnkStruct_ov96_0223BF40 *param0) { param0->unk_90 = 1; @@ -1154,7 +1148,7 @@ static int ov96_0223CF5C (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223CFAC (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223CFAC(UnkStruct_ov96_0223BF40 *param0) { if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { param0->unk_90++; @@ -1187,7 +1181,7 @@ static int ov96_0223CFAC (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D080 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D080(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD0, 6, 1, 0xf0f); ov96_0223BBFC(param0, 47, 33); @@ -1195,7 +1189,7 @@ static int ov96_0223D080 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D0B0 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D0B0(UnkStruct_ov96_0223BF40 *param0) { param0->unk_98 = 1; @@ -1209,7 +1203,7 @@ static int ov96_0223D0B0 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D100 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D100(UnkStruct_ov96_0223BF40 *param0) { if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) { param0->unk_98++; @@ -1242,7 +1236,7 @@ static int ov96_0223D100 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D1D8 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D1D8(UnkStruct_ov96_0223BF40 *param0) { StringTemplate_SetNumber(param0->unk_BCC, 0, param0->unk_98, 3, 2, 1); StringTemplate_SetNumber(param0->unk_BCC, 1, param0->unk_90, 2, 2, 1); @@ -1255,7 +1249,7 @@ static int ov96_0223D1D8 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D240 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D240(UnkStruct_ov96_0223BF40 *param0) { ov96_0223B450(param0->unk_90, param0->unk_98, ¶m0->unk_9C); @@ -1267,7 +1261,7 @@ static int ov96_0223D240 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D270 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D270(UnkStruct_ov96_0223BF40 *param0) { if (ov96_0223B3D4()) { s32 v0 = ov96_0223B3F4(); @@ -1323,7 +1317,7 @@ static int ov96_0223D270 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D35C (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D35C(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD0, 3, 1, 0xf0f); ov96_0223BBFC(param0, 47, 45); @@ -1334,13 +1328,13 @@ static int ov96_0223D35C (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D398 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D398(UnkStruct_ov96_0223BF40 *param0) { param0->unk_1C = 41; return 3; } -static int ov96_0223D3A0 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D3A0(UnkStruct_ov96_0223BF40 *param0) { SaveData_SaveStateInit(param0->unk_00->unk_0C, 2); param0->unk_1C = 40; @@ -1348,7 +1342,7 @@ static int ov96_0223D3A0 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D3B8 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D3B8(UnkStruct_ov96_0223BF40 *param0) { if (SaveData_SaveStateMain(param0->unk_00->unk_0C) == 2) { param0->unk_1C = param0->unk_20; @@ -1358,7 +1352,7 @@ static int ov96_0223D3B8 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D3D8 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D3D8(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD0, 4, 1, 0xf0f); ov96_0223BBFC(param0, 48, 22); @@ -1366,7 +1360,7 @@ static int ov96_0223D3D8 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D408 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D408(UnkStruct_ov96_0223BF40 *param0) { int v0 = sub_02002114(param0->unk_F68, 68); @@ -1382,7 +1376,7 @@ static int ov96_0223D408 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D43C (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D43C(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD0, 9, 1, 0xf0f); ov96_0223BBFC(param0, 48, 24); @@ -1390,7 +1384,7 @@ static int ov96_0223D43C (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D46C (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D46C(UnkStruct_ov96_0223BF40 *param0) { int v0 = sub_02002114(param0->unk_F68, 68); @@ -1406,7 +1400,7 @@ static int ov96_0223D46C (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D4A0 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D4A0(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD8, 26, 1, 0xf0f); ov96_0223BBFC(param0, 47, 42); @@ -1414,7 +1408,7 @@ static int ov96_0223D4A0 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D4D0 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D4D0(UnkStruct_ov96_0223BF40 *param0) { DWC_CleanupInet(); ov96_0223BC5C(param0, 0, 0); @@ -1423,7 +1417,7 @@ static int ov96_0223D4D0 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D4EC (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D4EC(UnkStruct_ov96_0223BF40 *param0) { ov96_0223D814(param0, param0->unk_BD8, 27, 1, 0xf0f); ov96_0223BBFC(param0, 49, 46); @@ -1432,12 +1426,12 @@ static int ov96_0223D4EC (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D524 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D524(UnkStruct_ov96_0223BF40 *param0) { return 3; } -static int ov96_0223D528 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D528(UnkStruct_ov96_0223BF40 *param0) { sub_02039794(); sub_0203848C(); @@ -1448,7 +1442,7 @@ static int ov96_0223D528 (UnkStruct_ov96_0223BF40 * param0) return 4; } -static int ov96_0223D558 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D558(UnkStruct_ov96_0223BF40 *param0) { int v0 = sub_02002114(param0->unk_F68, 68); @@ -1463,7 +1457,7 @@ static int ov96_0223D558 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D588 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D588(UnkStruct_ov96_0223BF40 *param0) { int v0 = 0; @@ -1495,7 +1489,7 @@ static int ov96_0223D588 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D5FC (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D5FC(UnkStruct_ov96_0223BF40 *param0) { switch (param0->unk_FF0) { case 0: @@ -1531,7 +1525,7 @@ static int ov96_0223D5FC (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D6C8 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D6C8(UnkStruct_ov96_0223BF40 *param0) { if (Message_Printing(param0->unk_BF0) == 0) { param0->unk_1C = param0->unk_20; @@ -1540,7 +1534,7 @@ static int ov96_0223D6C8 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D6E8 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D6E8(UnkStruct_ov96_0223BF40 *param0) { if (Message_Printing(param0->unk_BF0) == 0) { if (param0->unk_F80 > 30) { @@ -1553,7 +1547,7 @@ static int ov96_0223D6E8 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D71C (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D71C(UnkStruct_ov96_0223BF40 *param0) { if (Message_Printing(param0->unk_BF0) == 0) { param0->unk_F68 = ov96_0223BBC8(param0->unk_04, 13, (((((((1 + (18 + 12)) + 9) + 27 * 4) + 4 * 2) + 4 * 2) + 23 * 16) + 24 * 2)); @@ -1563,9 +1557,9 @@ static int ov96_0223D71C (UnkStruct_ov96_0223BF40 * param0) return 3; } -static void ov96_0223D750 (UnkStruct_ov96_0223BF40 * param0, MessageLoader * param1, int param2, int param3, u16 param4) +static void ov96_0223D750(UnkStruct_ov96_0223BF40 *param0, MessageLoader *param1, int param2, int param3, u16 param4) { - Strbuf* v0 = MessageLoader_GetNewStrbuf(param1, param2); + Strbuf *v0 = MessageLoader_GetNewStrbuf(param1, param2); StringTemplate_Format(param0->unk_BCC, param0->unk_BDC, v0); BGL_FillWindow(¶m0->unk_E38, 0xf0f); @@ -1576,7 +1570,7 @@ static void ov96_0223D750 (UnkStruct_ov96_0223BF40 * param0, MessageLoader * par Strbuf_Free(v0); } -static int ov96_0223D7B8 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D7B8(UnkStruct_ov96_0223BF40 *param0) { int v0; @@ -1588,7 +1582,7 @@ static int ov96_0223D7B8 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static int ov96_0223D7E4 (UnkStruct_ov96_0223BF40 * param0) +static int ov96_0223D7E4(UnkStruct_ov96_0223BF40 *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_A || gCoreSys.pressedKeys & PAD_BUTTON_B) { Window_Clear(¶m0->unk_E78, 0); @@ -1598,7 +1592,7 @@ static int ov96_0223D7E4 (UnkStruct_ov96_0223BF40 * param0) return 3; } -static void ov96_0223D814 (UnkStruct_ov96_0223BF40 * param0, MessageLoader * param1, int param2, int param3, u16 param4) +static void ov96_0223D814(UnkStruct_ov96_0223BF40 *param0, MessageLoader *param1, int param2, int param3, u16 param4) { MessageLoader_GetStrbuf(param1, param2, param0->unk_BDC); BGL_FillWindow(¶m0->unk_E38, 0xf0f); @@ -1607,7 +1601,7 @@ static void ov96_0223D814 (UnkStruct_ov96_0223BF40 * param0, MessageLoader * par param0->unk_BF0 = PrintStringSimple(¶m0->unk_E38, 1, param0->unk_BDC, 0, 0, param3, NULL); } -static int ov96_0223D86C (Window * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) +static int ov96_0223D86C(Window *param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) { int v0 = 0, v1; @@ -1625,31 +1619,31 @@ static int ov96_0223D86C (Window * param0, Strbuf *param1, int param2, int param return param2; } -void ov96_0223D8A4 (Window * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) +void ov96_0223D8A4(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov96_0223D86C(param0, param1, param2, param4, param5, 1); sub_0201D78C(param0, 1, param1, param2, param3, 0, param5, NULL); } -void ov96_0223D8D8 (Window * param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) +void ov96_0223D8D8(Window *param0, Strbuf *param1, int param2, int param3, int param4, u32 param5) { param2 = ov96_0223D86C(param0, param1, param2, param4, param5, 0); sub_0201D78C(param0, 0, param1, param2, param3, 0, param5, NULL); } -static void ov96_0223D90C (Window * param0, Strbuf *param1, int param2, int param3) +static void ov96_0223D90C(Window *param0, Strbuf *param1, int param2, int param3) { BGL_FillWindow(param0, 0xf0f); Strbuf_FormatInt(param1, param2, param3, 2, 1); ov96_0223D8D8(param0, param1, 0, 1, 1, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); } -void ov96_0223D948 (UnkStruct_ov96_0223BF40 * param0) +void ov96_0223D948(UnkStruct_ov96_0223BF40 *param0) { sub_02039734(); } -static void ov96_0223D950 (UnkStruct_ov96_0223BF40 * param0, int param1, int param2) +static void ov96_0223D950(UnkStruct_ov96_0223BF40 *param0, int param1, int param2) { if ((param1 == 0) || (param1 == 1)) { sub_02021CAC(param0->unk_E30[0], param2); @@ -1657,14 +1651,14 @@ static void ov96_0223D950 (UnkStruct_ov96_0223BF40 * param0, int param1, int par } } -static void ov96_0223D978 (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223D978(UnkStruct_ov96_0223BF40 *param0) { if (param0->unk_F6C == NULL) { param0->unk_F6C = sub_0200E7FC(¶m0->unk_E38, 1); } } -static void ov96_0223D99C (UnkStruct_ov96_0223BF40 * param0) +static void ov96_0223D99C(UnkStruct_ov96_0223BF40 *param0) { if (param0->unk_F6C != NULL) { DeleteWaitDial(param0->unk_F6C); @@ -1672,9 +1666,9 @@ static void ov96_0223D99C (UnkStruct_ov96_0223BF40 * param0) } } -static void ov96_0223D9B8 (UnkStruct_ov96_0223BF40 * param0, int param1) +static void ov96_0223D9B8(UnkStruct_ov96_0223BF40 *param0, int param1) { - Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 68); + Strbuf *v0 = Strbuf_Init((16 * 8 * 2), 68); MessageLoader_GetStrbuf(param0->unk_BD8, param1, v0); StringTemplate_Format(param0->unk_BCC, param0->unk_BEC, v0); @@ -1686,7 +1680,7 @@ static void ov96_0223D9B8 (UnkStruct_ov96_0223BF40 * param0, int param1) Strbuf_Free(v0); } -static void ov96_0223DA34 (UnkStruct_ov96_0223BF40 * param0, int param1, int param2) +static void ov96_0223DA34(UnkStruct_ov96_0223BF40 *param0, int param1, int param2) { int v0; diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index c5cf27a80d..8fc6b47eda 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -1,63 +1,58 @@ #include #include -#include "core_sys.h" - -#include "message.h" +#include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202442C_decl.h" -#include "play_time.h" -#include "trainer_info.h" -#include "struct_decls/pokedexdata_decl.h" -#include "savedata.h" - -#include "overlay097/const_ov97_0223D674.h" -#include "overlay057/const_ov57_021D0F90.h" -#include "constdata/const_020E4C44.h" -#include "overlay077/const_ov77_021D742C.h" -#include "overlay057/const_ov57_021D0F70.h" - #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay057/const_ov57_021D0F70.h" +#include "overlay057/const_ov57_021D0F90.h" +#include "overlay077/const_ov77_021D742C.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay097/const_ov97_0223D674.h" +#include "overlay097/ov97_02235D18.h" +#include "overlay097/ov97_02237520.h" +#include "overlay097/ov97_02237694.h" #include "overlay097/struct_ov97_02237808.h" +#include "savedata/save_table.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "overlay_manager.h" +#include "play_time.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02000C88.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" #include "unk_02006E3C.h" #include "unk_0200A784.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02024358.h" -#include "savedata/save_table.h" -#include "savedata.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" #include "unk_0202DAB4.h" #include "unk_020366A0.h" #include "unk_0209A74C.h" -#include "overlay097/ov97_02235D18.h" -#include "overlay097/ov97_02237520.h" -#include "overlay097/ov97_02237694.h" + +#include "constdata/const_020E4C44.h" FS_EXTERN_OVERLAY(overlay57); FS_EXTERN_OVERLAY(overlay77); @@ -68,7 +63,10 @@ typedef struct { int unk_00; int unk_04; int unk_08; - BOOL (* unk_0C)(void *, int, UnkStruct_ov97_02237808 *, int); + + // clang-format off + BOOL(*unk_0C)(void *, int, UnkStruct_ov97_02237808 *, int); + // clang-format on } UnkStruct_ov97_0223E014; typedef struct { @@ -78,7 +76,7 @@ typedef struct { int unk_0C; u32 unk_10; u32 unk_14; - void (* unk_18)(void * param0); + void (*unk_18)(void *param0); } UnkStruct_ov97_0223DF54; typedef struct { @@ -90,12 +88,12 @@ typedef struct { } UnkStruct_ov97_0223DFB0; typedef struct { - BGL * unk_00; - SaveData * unk_04; - PokedexData * unk_08; - TrainerInfo * unk_0C; + BGL *unk_00; + SaveData *unk_04; + PokedexData *unk_08; + TrainerInfo *unk_0C; PlayTime *playTime; - MysteryGift * unk_14; + MysteryGift *unk_14; int unk_18; int unk_1C; int unk_20; @@ -129,34 +127,34 @@ typedef struct { int unk_150; BOOL unk_154[1]; Window unk_158; - GraphicElementData * unk_168[2]; + GraphicElementData *unk_168[2]; int unk_170; } UnkStruct_0222AE60; -static BOOL ov97_0222B768(void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3); -static BOOL ov97_0222B7DC(void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3); -static BOOL ov97_0222B888(void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3); -static BOOL ov97_0222B8E4(void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3); -static BOOL ov97_0222B934(void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3); -static BOOL ov97_0222B978(void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3); -static BOOL ov97_0222B5C0(void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3); -MysteryGift * SaveData_MysteryGift(SaveData * param0); +static BOOL ov97_0222B768(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3); +static BOOL ov97_0222B7DC(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3); +static BOOL ov97_0222B888(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3); +static BOOL ov97_0222B8E4(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3); +static BOOL ov97_0222B934(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3); +static BOOL ov97_0222B978(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3); +static BOOL ov97_0222B5C0(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3); +MysteryGift *SaveData_MysteryGift(SaveData *param0); int ov23_0224AC0C(void); int TrainerInfo_Size(void); static UnkStruct_ov97_0223DF54 Unk_ov97_0223DF54[] = { - {0x5, 0x5, 0x16, 0xE, 0x2B7, 0x10, NULL} + { 0x5, 0x5, 0x16, 0xE, 0x2B7, 0x10, NULL } }; UnkStruct_ov97_0223E014 Unk_ov97_0223E014[] = { - {0x1, 0xA, 0x0, ov97_0222B5C0}, - {0x2, 0x2, 0x1, NULL}, - {0x3, 0x2, 0x2, ov97_0222B7DC}, - {0x4, 0x2, 0x3, ov97_0222B888}, - {0x5, 0x2, NULL, ov97_0222B768}, - {0x6, 0x2, 0xA, ov97_0222B8E4}, - {0x7, 0x2, 0xB, ov97_0222B934}, - {0x8, 0x2, 0x14, ov97_0222B978} + { 0x1, 0xA, 0x0, ov97_0222B5C0 }, + { 0x2, 0x2, 0x1, NULL }, + { 0x3, 0x2, 0x2, ov97_0222B7DC }, + { 0x4, 0x2, 0x3, ov97_0222B888 }, + { 0x5, 0x2, NULL, ov97_0222B768 }, + { 0x6, 0x2, 0xA, ov97_0222B8E4 }, + { 0x7, 0x2, 0xB, ov97_0222B934 }, + { 0x8, 0x2, 0x14, ov97_0222B978 } }; static u32 Unk_ov97_0223DF40[] = { @@ -168,14 +166,14 @@ static u32 Unk_ov97_0223DF40[] = { }; UnkStruct_ov97_0223DFB0 Unk_ov97_0223DFB0[] = { - {0x4, 0x2, 0x18, 0x14, 0x1}, - {0x4, 0x4, 0x18, 0x10, 0x3}, - {0x4, 0x1, 0x18, 0x16, 0x0}, - {0x4, 0x3, 0x18, 0x12, 0x2}, - {0x2, 0x1, 0x1C, 0x16, 0x5} + { 0x4, 0x2, 0x18, 0x14, 0x1 }, + { 0x4, 0x4, 0x18, 0x10, 0x3 }, + { 0x4, 0x1, 0x18, 0x16, 0x0 }, + { 0x4, 0x3, 0x18, 0x12, 0x2 }, + { 0x2, 0x1, 0x1C, 0x16, 0x5 } }; -static int ov97_0222AE60 (UnkStruct_0222AE60 * param0) +static int ov97_0222AE60(UnkStruct_0222AE60 *param0) { int v0, v1; @@ -183,10 +181,10 @@ static int ov97_0222AE60 (UnkStruct_0222AE60 * param0) return v0; } -static BOOL ov97_0222AE64 (UnkStruct_0222AE60 * param0) +static BOOL ov97_0222AE64(UnkStruct_0222AE60 *param0) { int v0; - UnkStruct_ov97_0223DF54 * v1; + UnkStruct_ov97_0223DF54 *v1; UnkStruct_ov97_02237808 v2; if (BGL_WindowAdded(¶m0->unk_158) == 0) { @@ -214,7 +212,7 @@ static BOOL ov97_0222AE64 (UnkStruct_0222AE60 * param0) return 0; } -static void ov97_0222AF1C (UnkStruct_0222AE60 * param0) +static void ov97_0222AF1C(UnkStruct_0222AE60 *param0) { int v0; int v1 = ov97_02235D2C(NULL); @@ -260,7 +258,7 @@ static void ov97_0222AF1C (UnkStruct_0222AE60 * param0) ov97_02238440(); } -static void ov97_0222AF8C (UnkStruct_0222AE60 * param0) +static void ov97_0222AF8C(UnkStruct_0222AE60 *param0) { int v0; @@ -324,10 +322,10 @@ static void ov97_0222AF8C (UnkStruct_0222AE60 * param0) } } -static BOOL ov97_0222B07C (UnkStruct_0222AE60 * param0) +static BOOL ov97_0222B07C(UnkStruct_0222AE60 *param0) { UnkStruct_ov97_02237808 v0; - UnkStruct_ov97_0223DFB0 * v1; + UnkStruct_ov97_0223DFB0 *v1; int v2, v3; switch (param0->unk_12C) { @@ -406,8 +404,8 @@ static BOOL ov97_0222B07C (UnkStruct_0222AE60 * param0) return 1; } -#define ABS(x) (((x) ^ ((x) >> 31)) - ((x) >> 31)) -static void ov97_0222B25C (UnkStruct_0222AE60 * param0) +#define ABS(x) (((x) ^ ((x) >> 31)) - ((x) >> 31)) +static void ov97_0222B25C(UnkStruct_0222AE60 *param0) { fx32 v0; @@ -433,7 +431,7 @@ static void ov97_0222B25C (UnkStruct_0222AE60 * param0) } } -static void ov97_0222B2EC (UnkStruct_0222AE60 * param0) +static void ov97_0222B2EC(UnkStruct_0222AE60 *param0) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -482,7 +480,7 @@ static void ov97_0222B2EC (UnkStruct_0222AE60 * param0) *((u16 *)HW_BG_PLTT + 33) = ((26 & 31) << 10 | (26 & 31) << 5 | (26 & 31)); } -static void ov97_0222B404 (UnkStruct_0222AE60 * param0) +static void ov97_0222B404(UnkStruct_0222AE60 *param0) { ov97_02237A20(); ov97_02237A74(); @@ -495,15 +493,15 @@ static void ov97_0222B404 (UnkStruct_0222AE60 * param0) sub_02021CAC(param0->unk_168[1], 0); } -static void ov97_0222B46C (UnkStruct_0222AE60 * param0) +static void ov97_0222B46C(UnkStruct_0222AE60 *param0) { sub_02006E84(116, 45, 0, 4 * 32, 32 * 1, 81); sub_02006E3C(116, 44, param0->unk_00, 2, 0x380, 2 * 32 * 0x20, 0, 81); } -static void ov97_0222B4AC (UnkStruct_0222AE60 * param0, int param1, int param2, int param3) +static void ov97_0222B4AC(UnkStruct_0222AE60 *param0, int param1, int param2, int param3) { - u16 * v0 = (u16 *)sub_02019FE4(param0->unk_00, 2); + u16 *v0 = (u16 *)sub_02019FE4(param0->unk_00, 2); int v1 = ((4 << 12) + 0x380 + 0); if (param3 == 2) { @@ -521,9 +519,9 @@ static void ov97_0222B4AC (UnkStruct_0222AE60 * param0, int param1, int param2, sub_02019448(param0->unk_00, 2); } -static void ov97_0222B4FC (UnkStruct_0222AE60 * param0, int param1, int param2) +static void ov97_0222B4FC(UnkStruct_0222AE60 *param0, int param1, int param2) { - u16 * v0 = (u16 *)sub_02019FE4(param0->unk_00, 2); + u16 *v0 = (u16 *)sub_02019FE4(param0->unk_00, 2); v0[param2 * 32 + param1 + 0] = ((4 << 12) + 0x380 + 0) + 4; v0[param2 * 32 + param1 + 1] = ((4 << 12) + 0x380 + 0) + 4; @@ -536,10 +534,10 @@ static void ov97_0222B4FC (UnkStruct_0222AE60 * param0, int param1, int param2) sub_02019448(param0->unk_00, 2); } -static void ov97_0222B53C (Window * param0, MessageLoader * param1, StringTemplate * param2, u32 param3, u32 param4, int param5) +static void ov97_0222B53C(Window *param0, MessageLoader *param1, StringTemplate *param2, u32 param3, u32 param4, int param5) { int v0, v1; - Strbuf* v2; + Strbuf *v2; v2 = MessageUtil_ExpandedStrbuf(param2, param1, param4, 81); v0 = sub_02002D7C(0, v2, sub_02002DF8(0, 2)); @@ -549,28 +547,31 @@ static void ov97_0222B53C (Window * param0, MessageLoader * param1, StringTempla Strbuf_Free(v2); } -static void ov97_0222B590 (StringTemplate * param0, int param1) +static void ov97_0222B590(StringTemplate *param0, int param1) { int v0, v1; if (param1 >= 100) { - v0 = 3; v1 = 0; + v0 = 3; + v1 = 0; } else if (param1 >= 10) { - v0 = 3; v1 = 1; + v0 = 3; + v1 = 1; } else { - v0 = 3 - 1; v1 = 1; + v0 = 3 - 1; + v1 = 1; } StringTemplate_SetNumber(param0, 0, param1, v0, v1, 1); } -static BOOL ov97_0222B5C0 (void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3) +static BOOL ov97_0222B5C0(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3) { int v0, v1, v2; - Strbuf* v3; - StringTemplate * v4; - MessageLoader * v5; - UnkStruct_0222AE60 * v6 = (UnkStruct_0222AE60 *)param0; + Strbuf *v3; + StringTemplate *v4; + MessageLoader *v5; + UnkStruct_0222AE60 *v6 = (UnkStruct_0222AE60 *)param0; u32 v7; v5 = MessageLoader_Init(1, 26, 550, 81); @@ -619,10 +620,10 @@ static BOOL ov97_0222B5C0 (void * param0, int param1, UnkStruct_ov97_02237808 * return 1; } -static BOOL ov97_0222B768 (void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3) +static BOOL ov97_0222B768(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3) { int v0; - UnkStruct_0222AE60 * v1 = (UnkStruct_0222AE60 *)param0; + UnkStruct_0222AE60 *v1 = (UnkStruct_0222AE60 *)param0; if (v1->unk_24 == 0) { return 0; @@ -654,9 +655,9 @@ static BOOL ov97_0222B768 (void * param0, int param1, UnkStruct_ov97_02237808 * return 1; } -static BOOL ov97_0222B7DC (void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3) +static BOOL ov97_0222B7DC(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3) { - UnkStruct_0222AE60 * v0 = (UnkStruct_0222AE60 *)param0; + UnkStruct_0222AE60 *v0 = (UnkStruct_0222AE60 *)param0; if (v0->unk_34 == 0) { if (sub_0202DEC4(v0->unk_14) == 1) { @@ -695,9 +696,9 @@ static BOOL ov97_0222B7DC (void * param0, int param1, UnkStruct_ov97_02237808 * return 0; } -static BOOL ov97_0222B888 (void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3) +static BOOL ov97_0222B888(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3) { - UnkStruct_0222AE60 * v0 = (UnkStruct_0222AE60 *)param0; + UnkStruct_0222AE60 *v0 = (UnkStruct_0222AE60 *)param0; if ((v0->unk_2C == 1) && (v0->unk_4C == 1)) { ov97_0223795C(v0->unk_00, param2, 3, param3, Unk_ov97_0223E014[param1].unk_08); @@ -713,9 +714,9 @@ static BOOL ov97_0222B888 (void * param0, int param1, UnkStruct_ov97_02237808 * return 0; } -static BOOL ov97_0222B8E4 (void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3) +static BOOL ov97_0222B8E4(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3) { - UnkStruct_0222AE60 * v0 = (UnkStruct_0222AE60 *)param0; + UnkStruct_0222AE60 *v0 = (UnkStruct_0222AE60 *)param0; if (v0->unk_30 == 1) { ov97_0223795C(v0->unk_00, param2, 3, param3, Unk_ov97_0223E014[param1].unk_08); @@ -729,9 +730,9 @@ static BOOL ov97_0222B8E4 (void * param0, int param1, UnkStruct_ov97_02237808 * return 0; } -static BOOL ov97_0222B934 (void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3) +static BOOL ov97_0222B934(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3) { - UnkStruct_0222AE60 * v0 = (UnkStruct_0222AE60 *)param0; + UnkStruct_0222AE60 *v0 = (UnkStruct_0222AE60 *)param0; ov97_0223795C(v0->unk_00, param2, 3, param3, Unk_ov97_0223E014[param1].unk_08); v0->unk_FC[param1] = 2; @@ -742,9 +743,9 @@ static BOOL ov97_0222B934 (void * param0, int param1, UnkStruct_ov97_02237808 * return 1; } -static BOOL ov97_0222B978 (void * param0, int param1, UnkStruct_ov97_02237808 * param2, int param3) +static BOOL ov97_0222B978(void *param0, int param1, UnkStruct_ov97_02237808 *param2, int param3) { - UnkStruct_0222AE60 * v0 = (UnkStruct_0222AE60 *)param0; + UnkStruct_0222AE60 *v0 = (UnkStruct_0222AE60 *)param0; ov97_0223795C(v0->unk_00, param2, 3, param3, Unk_ov97_0223E014[param1].unk_08); v0->unk_FC[param1] = 0; @@ -755,9 +756,9 @@ static BOOL ov97_0222B978 (void * param0, int param1, UnkStruct_ov97_02237808 * return 1; } -static BOOL ov97_0222B9BC (UnkStruct_0222AE60 * param0) +static BOOL ov97_0222B9BC(UnkStruct_0222AE60 *param0) { - UnkStruct_ov97_0223E014 * v0; + UnkStruct_ov97_0223E014 *v0; UnkStruct_ov97_02237808 v1; int v2, v3, v4; @@ -802,7 +803,7 @@ static BOOL ov97_0222B9BC (UnkStruct_0222AE60 * param0) return v4; } -static void ov97_0222BAD8 (UnkStruct_0222AE60 * param0, int param1) +static void ov97_0222BAD8(UnkStruct_0222AE60 *param0, int param1) { int v0; @@ -823,7 +824,7 @@ static void ov97_0222BAD8 (UnkStruct_0222AE60 * param0, int param1) sub_02019448(param0->unk_00, 0); } -static void ov97_0222BB88 (UnkStruct_0222AE60 * param0, int param1) +static void ov97_0222BB88(UnkStruct_0222AE60 *param0, int param1) { int v0 = param0->unk_54; @@ -851,7 +852,7 @@ static void ov97_0222BB88 (UnkStruct_0222AE60 * param0, int param1) param0->unk_54 = v0; } -static void ov97_0222BBC8 (UnkStruct_0222AE60 * param0) +static void ov97_0222BBC8(UnkStruct_0222AE60 *param0) { int v0, v1, v2; @@ -868,7 +869,7 @@ static void ov97_0222BBC8 (UnkStruct_0222AE60 * param0) } } -static void ov97_0222BC1C (UnkStruct_0222AE60 * param0) +static void ov97_0222BC1C(UnkStruct_0222AE60 *param0) { int v0, v1, v2; int v3, v4, v5; @@ -897,10 +898,10 @@ static void ov97_0222BC1C (UnkStruct_0222AE60 * param0) sub_02021CAC(param0->unk_168[1], v2); } -static void ov97_0222BC9C (OverlayManager * param0) +static void ov97_0222BC9C(OverlayManager *param0) { int v0; - UnkStruct_0222AE60 * v1 = OverlayManager_Data(param0); + UnkStruct_0222AE60 *v1 = OverlayManager_Data(param0); if (v1->unk_168[0] || v1->unk_168[1]) { sub_02021BD4(v1->unk_168[0]); @@ -956,9 +957,9 @@ u16 Unk_ov97_0223DF70[] = { 0x0 }; -static void ov97_0222BD14 (UnkStruct_0222AE60 * param0) +static void ov97_0222BD14(UnkStruct_0222AE60 *param0) { - u16 * v0 = (u16 *)0x500006C; + u16 *v0 = (u16 *)0x500006C; if (Unk_ov97_0223DF70[param0->unk_170] == 0) { param0->unk_170 = 0; @@ -967,7 +968,7 @@ static void ov97_0222BD14 (UnkStruct_0222AE60 * param0) *v0 = Unk_ov97_0223DF70[param0->unk_170++]; } -static void ov97_0222BD48 (void * param0) +static void ov97_0222BD48(void *param0) { sub_0201DCAC(); sub_0200A858(); @@ -976,9 +977,9 @@ static void ov97_0222BD48 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static int ov97_0222BD70 (OverlayManager * param0, int * param1) +static int ov97_0222BD70(OverlayManager *param0, int *param1) { - UnkStruct_0222AE60 * v0; + UnkStruct_0222AE60 *v0; Heap_Create(3, 81, 0x40000); @@ -1012,10 +1013,10 @@ static int ov97_0222BD70 (OverlayManager * param0, int * param1) return 1; } -static int ov97_0222BE24 (OverlayManager * param0, int * param1) +static int ov97_0222BE24(OverlayManager *param0, int *param1) { int v0; - UnkStruct_0222AE60 * v1 = OverlayManager_Data(param0); + UnkStruct_0222AE60 *v1 = OverlayManager_Data(param0); v1->unk_18++; CTRDG_IsExisting(); @@ -1160,14 +1161,13 @@ static int ov97_0222BE24 (OverlayManager * param0, int * param1) return 0; } - extern const OverlayManagerTemplate Unk_ov97_0223D71C; extern const OverlayManagerTemplate Unk_ov97_0223D864; extern const OverlayManagerTemplate Unk_ov97_0223D6BC; extern const OverlayManagerTemplate Unk_020F6DF0; extern const OverlayManagerTemplate Unk_ov98_02249BAC; -static void ov97_0222C094 (UnkStruct_0222AE60 * param0) +static void ov97_0222C094(UnkStruct_0222AE60 *param0) { switch (param0->unk_58) { case 1: @@ -1202,9 +1202,9 @@ static void ov97_0222C094 (UnkStruct_0222AE60 * param0) } } -static int ov97_0222C150 (OverlayManager * param0, int * param1) +static int ov97_0222C150(OverlayManager *param0, int *param1) { - UnkStruct_0222AE60 * v0 = OverlayManager_Data(param0); + UnkStruct_0222AE60 *v0 = OverlayManager_Data(param0); ov97_0222C094(v0); diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 2ade8565a1..3b8e439648 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -1,59 +1,53 @@ -#include "enums.h" - #include #include -#include "core_sys.h" - -#include "message.h" +#include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202442C_decl.h" -#include "trainer_info.h" -#include "struct_decls/pokedexdata_decl.h" -#include "savedata.h" - -#include "overlay077/const_ov77_021D742C.h" - #include "struct_defs/struct_0202DBAC.h" #include "struct_defs/struct_0202DF40.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay077/const_ov77_021D742C.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay097/ov97_02232DC8.h" +#include "overlay097/ov97_02233408.h" +#include "overlay097/ov97_02237694.h" #include "overlay097/struct_ov97_02232E38.h" #include "overlay097/struct_ov97_022335A8.h" #include "overlay097/struct_ov97_02237808.h" +#include "savedata/save_table.h" +#include "core_sys.h" +#include "enums.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "overlay_manager.h" +#include "rtc.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02000C88.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" #include "unk_02006E3C.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" #include "unk_0200DA60.h" -#include "rtc.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "savedata/save_table.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" -#include "game_options.h" #include "unk_0202DAB4.h" #include "unk_02033200.h" #include "unk_020393C8.h" -#include "overlay097/ov97_02232DC8.h" -#include "overlay097/ov97_02233408.h" -#include "overlay097/ov97_02237694.h" FS_EXTERN_OVERLAY(overlay77); @@ -63,306 +57,306 @@ typedef struct { } UnkStruct_ov97_0223E0B0; UnkStruct_ov97_0223E0B0 Unk_ov97_0223E0B0[] = { - { 0x0, 0xffff }, - { 0x21, 0xE1 }, - { 0x23, 0x1C0 }, - { 0x25, 0x1D2 }, - { 0x27, 0xEA }, - { 0x28, 0xEB }, - { 0x29, 0x1bf }, - { 0x2A, 0x1BD }, - { 0x2B, 0x1AD }, - { 0x2C, 0x1BE }, - { 0x2E, 0x1B1 }, - { 0x30, 0xA2 }, - { 0x31, 0xA3 }, - { 0x32, 0xA4 }, - { 0x33, 0xA5 }, - { 0x34, 0xA6 }, - { 0x35, 0xA7 }, - { 0x36, 0xA8 }, - { 0x37, 0xA9 }, - { 0x38, 0xAA }, - { 0x39, 0xAB }, - { 0x3A, 0x1C4 }, - { 0x3B, 0x1C5 }, - { 0x3C, 0xEC }, - { 0x3E, 0xED }, - { 0x3F, 0x1AC }, - { 0x41, 0xAC }, - { 0x42, 0xAD }, - { 0x43, 0xAE }, - { 0x44, 0xaf }, - { 0x45, 0xB0 }, - { 0x46, 0xB1 }, - { 0x47, 0xB2 }, - { 0x48, 0xB3 }, - { 0x49, 0xB4 }, - { 0x4A, 0xB5 }, - { 0x4B, 0xB6 }, - { 0x4C, 0xB7 }, - { 0x4D, 0xB8 }, - { 0x4E, 0xB9 }, - { 0x4F, 0xBA }, - { 0x50, 0xBB }, - { 0x51, 0xBC }, - { 0x52, 0xBD }, - { 0x53, 0xBE }, - { 0x54, 0xbf }, - { 0x55, 0xC0 }, - { 0x56, 0xC1 }, - { 0x57, 0xC2 }, - { 0x58, 0xC3 }, - { 0x59, 0xC4 }, - { 0x5A, 0xC5 }, - { 0x61, 0xC6 }, - { 0x62, 0xC7 }, - { 0x63, 0xC8 }, - { 0x64, 0xC9 }, - { 0x65, 0xCA }, - { 0x66, 0xCB }, - { 0x67, 0xCC }, - { 0x68, 0xCD }, - { 0x69, 0xCE }, - { 0x6A, 0xcf }, - { 0x6B, 0xD0 }, - { 0x6C, 0xD1 }, - { 0x6D, 0xD2 }, - { 0x6E, 0xD3 }, - { 0x6F, 0xD4 }, - { 0x70, 0xD5 }, - { 0x71, 0xD6 }, - { 0x72, 0xD7 }, - { 0x73, 0xD8 }, - { 0x74, 0xD9 }, - { 0x75, 0xDA }, - { 0x76, 0xDB }, - { 0x77, 0xDC }, - { 0x78, 0xDD }, - { 0x79, 0xDE }, - { 0x7A, 0xdf }, - { 0x81, 0x2 }, - { 0x82, 0x3 }, - { 0x83, 0x4 }, - { 0x84, 0x5 }, - { 0x85, 0x6 }, - { 0x86, 0x7 }, - { 0x87, 0x8 }, - { 0x88, 0x9 }, - { 0x89, 0xA }, - { 0x8A, 0xB }, - { 0x8B, 0xC }, - { 0x8C, 0xD }, - { 0x8D, 0xE }, - { 0x8E, 0x0f }, - { 0x8F, 0x10 }, - { 0x90, 0x11 }, - { 0x91, 0x12 }, - { 0x92, 0x13 }, - { 0x93, 0x14 }, - { 0x94, 0x15 }, - { 0x95, 0x16 }, - { 0x96, 0x17 }, - { 0x97, 0x18 }, - { 0x98, 0x19 }, - { 0x99, 0x1A }, - { 0x9A, 0x1B }, - { 0x9B, 0x1C }, - { 0x9C, 0x1D }, - { 0x9D, 0x1E }, - { 0x9E, 0x1f }, - { 0x9F, 0x20 }, - { 0xA0, 0x21 }, - { 0xA1, 0x22 }, - { 0xA2, 0x23 }, - { 0xA3, 0x24 }, - { 0xA4, 0x25 }, - { 0xA5, 0x26 }, - { 0xA6, 0x27 }, - { 0xA7, 0x28 }, - { 0xA8, 0x29 }, - { 0xA9, 0x2A }, - { 0xAA, 0x2B }, - { 0xAB, 0x2C }, - { 0xAC, 0x2D }, - { 0xAD, 0x2E }, - { 0xAE, 0x2f }, - { 0xAF, 0x30 }, - { 0xB0, 0x31 }, - { 0xB1, 0x32 }, - { 0xB2, 0x33 }, - { 0xB3, 0x34 }, - { 0xB4, 0x35 }, - { 0xB5, 0x36 }, - { 0xB6, 0x37 }, - { 0xB7, 0x38 }, - { 0xB8, 0x39 }, - { 0xB9, 0x3A }, - { 0xBA, 0x3B }, - { 0xBB, 0x3C }, - { 0xBC, 0x3D }, - { 0xBD, 0x3E }, - { 0xBE, 0x3f }, - { 0xBF, 0x40 }, - { 0xC0, 0x41 }, - { 0xC1, 0x42 }, - { 0xC2, 0x43 }, - { 0xC3, 0x44 }, - { 0xC4, 0x45 }, - { 0xC5, 0x46 }, - { 0xC6, 0x47 }, - { 0xC7, 0x48 }, - { 0xC8, 0x49 }, - { 0xC9, 0x4A }, - { 0xCA, 0x4B }, - { 0xCB, 0x4C }, - { 0xCC, 0x4D }, - { 0xCD, 0x4E }, - { 0xCF, 0x4f }, - { 0xD2, 0x50 }, - { 0xD3, 0x51 }, - { 0xE1, 0x52 }, - { 0xE2, 0x53 }, - { 0xE3, 0x54 }, - { 0xE4, 0x55 }, - { 0xE5, 0x56 }, - { 0xE6, 0x57 }, - { 0xE7, 0x58 }, - { 0xE8, 0x59 }, - { 0xE9, 0x5A }, - { 0xEA, 0x5B }, - { 0xEB, 0x5C }, - { 0xEC, 0x5D }, - { 0xED, 0x5E }, - { 0xEE, 0x5f }, - { 0xEF, 0x60 }, - { 0xF0, 0x61 }, - { 0xF1, 0x62 }, - { 0xF2, 0x63 }, - { 0xF3, 0x64 }, - { 0xF4, 0x65 }, - { 0xF5, 0x66 }, - { 0xF6, 0x67 }, - { 0xF7, 0x68 }, - { 0xF8, 0x69 }, - { 0xF9, 0x6A }, - { 0xFA, 0x6B }, - { 0xFB, 0x6C }, - { 0xFC, 0x6D }, - { 0xFD, 0x6E }, - { 0xFE, 0x6f }, - { 0xFF, 0x70 }, - { 0x100, 0x71 }, - { 0x101, 0x72 }, - { 0x102, 0x73 }, - { 0x103, 0x74 }, - { 0x104, 0x75 }, - { 0x105, 0x76 }, - { 0x106, 0x77 }, - { 0x107, 0x78 }, - { 0x108, 0x79 }, - { 0x109, 0x7A }, - { 0x10A, 0x7B }, - { 0x10B, 0x7C }, - { 0x10C, 0x7D }, - { 0x10D, 0x7E }, - { 0x10E, 0x7f }, - { 0x10F, 0x80 }, - { 0x110, 0x81 }, - { 0x111, 0x82 }, - { 0x112, 0x83 }, - { 0x113, 0x84 }, - { 0x114, 0x85 }, - { 0x115, 0x86 }, - { 0x116, 0x87 }, - { 0x117, 0x88 }, - { 0x118, 0x89 }, - { 0x119, 0x8A }, - { 0x11A, 0x8B }, - { 0x11B, 0x8C }, - { 0x11C, 0x8D }, - { 0x11D, 0x8E }, - { 0x11E, 0x8f }, - { 0x11F, 0x90 }, - { 0x120, 0x91 }, - { 0x121, 0x92 }, - { 0x122, 0x93 }, - { 0x123, 0x94 }, - { 0x124, 0x95 }, - { 0x125, 0x96 }, - { 0x126, 0x97 }, - { 0x127, 0x98 }, - { 0x128, 0x99 }, - { 0x129, 0x9A }, - { 0x12A, 0x9B }, - { 0x12B, 0x9C }, - { 0x12C, 0x9D }, - { 0x12D, 0x9E }, - { 0x12F, 0x9f }, - { 0x132, 0xA0 }, - { 0x133, 0xA1 }, - { 0x140, 0xEA }, - { 0x141, 0xEB }, - { 0x142, 0xE8 }, - { 0x143, 0xE9 }, - { 0x146, 0xE6 }, - { 0x147, 0xE5 }, - { 0x148, 0xEE }, - { 0x149, 0xef }, - { 0x14A, 0xE4 }, - { 0x14B, 0x112 }, - { 0x14D, 0x11C }, - { 0x14E, 0x11E }, - { 0x14F, 0x11D }, - { 0x150, 0x11B }, - { 0x17C, 0x19f }, - { 0x17D, 0x1A0 }, - { 0x180, 0x15f }, - { 0x181, 0x160 }, - { 0x182, 0x161 }, - { 0x184, 0x163 }, - { 0x187, 0x166 }, - { 0x189, 0x168 }, - { 0x18A, 0x169 }, - { 0x18B, 0x16A }, - { 0x18C, 0x16B }, - { 0x18D, 0x16C }, - { 0x18E, 0x16D }, - { 0x18F, 0x16E }, - { 0x193, 0x172 }, - { 0x194, 0x173 }, - { 0x196, 0x175 }, - { 0x19A, 0x179 }, - { 0x19B, 0x17A }, - { 0x19C, 0x17B }, - { 0x19F, 0x17E }, - { 0x1A0, 0x17f }, - { 0x1A1, 0x180 }, - { 0x1A2, 0x181 }, - { 0x1A4, 0x183 }, - { 0x1A7, 0x186 }, - { 0x1A9, 0x188 }, - { 0x1AA, 0x189 }, - { 0x1AB, 0x18A }, - { 0x1AC, 0x18B }, - { 0x1AD, 0x18C }, - { 0x1AE, 0x18D }, - { 0x1AF, 0x18E }, - { 0x1B3, 0x192 }, - { 0x1B4, 0x193 }, - { 0x1B6, 0x195 }, - { 0x1BA, 0x199 }, - { 0x1BB, 0x19A }, - { 0x1BC, 0x19B } + { 0x0, 0xffff }, + { 0x21, 0xE1 }, + { 0x23, 0x1C0 }, + { 0x25, 0x1D2 }, + { 0x27, 0xEA }, + { 0x28, 0xEB }, + { 0x29, 0x1bf }, + { 0x2A, 0x1BD }, + { 0x2B, 0x1AD }, + { 0x2C, 0x1BE }, + { 0x2E, 0x1B1 }, + { 0x30, 0xA2 }, + { 0x31, 0xA3 }, + { 0x32, 0xA4 }, + { 0x33, 0xA5 }, + { 0x34, 0xA6 }, + { 0x35, 0xA7 }, + { 0x36, 0xA8 }, + { 0x37, 0xA9 }, + { 0x38, 0xAA }, + { 0x39, 0xAB }, + { 0x3A, 0x1C4 }, + { 0x3B, 0x1C5 }, + { 0x3C, 0xEC }, + { 0x3E, 0xED }, + { 0x3F, 0x1AC }, + { 0x41, 0xAC }, + { 0x42, 0xAD }, + { 0x43, 0xAE }, + { 0x44, 0xaf }, + { 0x45, 0xB0 }, + { 0x46, 0xB1 }, + { 0x47, 0xB2 }, + { 0x48, 0xB3 }, + { 0x49, 0xB4 }, + { 0x4A, 0xB5 }, + { 0x4B, 0xB6 }, + { 0x4C, 0xB7 }, + { 0x4D, 0xB8 }, + { 0x4E, 0xB9 }, + { 0x4F, 0xBA }, + { 0x50, 0xBB }, + { 0x51, 0xBC }, + { 0x52, 0xBD }, + { 0x53, 0xBE }, + { 0x54, 0xbf }, + { 0x55, 0xC0 }, + { 0x56, 0xC1 }, + { 0x57, 0xC2 }, + { 0x58, 0xC3 }, + { 0x59, 0xC4 }, + { 0x5A, 0xC5 }, + { 0x61, 0xC6 }, + { 0x62, 0xC7 }, + { 0x63, 0xC8 }, + { 0x64, 0xC9 }, + { 0x65, 0xCA }, + { 0x66, 0xCB }, + { 0x67, 0xCC }, + { 0x68, 0xCD }, + { 0x69, 0xCE }, + { 0x6A, 0xcf }, + { 0x6B, 0xD0 }, + { 0x6C, 0xD1 }, + { 0x6D, 0xD2 }, + { 0x6E, 0xD3 }, + { 0x6F, 0xD4 }, + { 0x70, 0xD5 }, + { 0x71, 0xD6 }, + { 0x72, 0xD7 }, + { 0x73, 0xD8 }, + { 0x74, 0xD9 }, + { 0x75, 0xDA }, + { 0x76, 0xDB }, + { 0x77, 0xDC }, + { 0x78, 0xDD }, + { 0x79, 0xDE }, + { 0x7A, 0xdf }, + { 0x81, 0x2 }, + { 0x82, 0x3 }, + { 0x83, 0x4 }, + { 0x84, 0x5 }, + { 0x85, 0x6 }, + { 0x86, 0x7 }, + { 0x87, 0x8 }, + { 0x88, 0x9 }, + { 0x89, 0xA }, + { 0x8A, 0xB }, + { 0x8B, 0xC }, + { 0x8C, 0xD }, + { 0x8D, 0xE }, + { 0x8E, 0x0f }, + { 0x8F, 0x10 }, + { 0x90, 0x11 }, + { 0x91, 0x12 }, + { 0x92, 0x13 }, + { 0x93, 0x14 }, + { 0x94, 0x15 }, + { 0x95, 0x16 }, + { 0x96, 0x17 }, + { 0x97, 0x18 }, + { 0x98, 0x19 }, + { 0x99, 0x1A }, + { 0x9A, 0x1B }, + { 0x9B, 0x1C }, + { 0x9C, 0x1D }, + { 0x9D, 0x1E }, + { 0x9E, 0x1f }, + { 0x9F, 0x20 }, + { 0xA0, 0x21 }, + { 0xA1, 0x22 }, + { 0xA2, 0x23 }, + { 0xA3, 0x24 }, + { 0xA4, 0x25 }, + { 0xA5, 0x26 }, + { 0xA6, 0x27 }, + { 0xA7, 0x28 }, + { 0xA8, 0x29 }, + { 0xA9, 0x2A }, + { 0xAA, 0x2B }, + { 0xAB, 0x2C }, + { 0xAC, 0x2D }, + { 0xAD, 0x2E }, + { 0xAE, 0x2f }, + { 0xAF, 0x30 }, + { 0xB0, 0x31 }, + { 0xB1, 0x32 }, + { 0xB2, 0x33 }, + { 0xB3, 0x34 }, + { 0xB4, 0x35 }, + { 0xB5, 0x36 }, + { 0xB6, 0x37 }, + { 0xB7, 0x38 }, + { 0xB8, 0x39 }, + { 0xB9, 0x3A }, + { 0xBA, 0x3B }, + { 0xBB, 0x3C }, + { 0xBC, 0x3D }, + { 0xBD, 0x3E }, + { 0xBE, 0x3f }, + { 0xBF, 0x40 }, + { 0xC0, 0x41 }, + { 0xC1, 0x42 }, + { 0xC2, 0x43 }, + { 0xC3, 0x44 }, + { 0xC4, 0x45 }, + { 0xC5, 0x46 }, + { 0xC6, 0x47 }, + { 0xC7, 0x48 }, + { 0xC8, 0x49 }, + { 0xC9, 0x4A }, + { 0xCA, 0x4B }, + { 0xCB, 0x4C }, + { 0xCC, 0x4D }, + { 0xCD, 0x4E }, + { 0xCF, 0x4f }, + { 0xD2, 0x50 }, + { 0xD3, 0x51 }, + { 0xE1, 0x52 }, + { 0xE2, 0x53 }, + { 0xE3, 0x54 }, + { 0xE4, 0x55 }, + { 0xE5, 0x56 }, + { 0xE6, 0x57 }, + { 0xE7, 0x58 }, + { 0xE8, 0x59 }, + { 0xE9, 0x5A }, + { 0xEA, 0x5B }, + { 0xEB, 0x5C }, + { 0xEC, 0x5D }, + { 0xED, 0x5E }, + { 0xEE, 0x5f }, + { 0xEF, 0x60 }, + { 0xF0, 0x61 }, + { 0xF1, 0x62 }, + { 0xF2, 0x63 }, + { 0xF3, 0x64 }, + { 0xF4, 0x65 }, + { 0xF5, 0x66 }, + { 0xF6, 0x67 }, + { 0xF7, 0x68 }, + { 0xF8, 0x69 }, + { 0xF9, 0x6A }, + { 0xFA, 0x6B }, + { 0xFB, 0x6C }, + { 0xFC, 0x6D }, + { 0xFD, 0x6E }, + { 0xFE, 0x6f }, + { 0xFF, 0x70 }, + { 0x100, 0x71 }, + { 0x101, 0x72 }, + { 0x102, 0x73 }, + { 0x103, 0x74 }, + { 0x104, 0x75 }, + { 0x105, 0x76 }, + { 0x106, 0x77 }, + { 0x107, 0x78 }, + { 0x108, 0x79 }, + { 0x109, 0x7A }, + { 0x10A, 0x7B }, + { 0x10B, 0x7C }, + { 0x10C, 0x7D }, + { 0x10D, 0x7E }, + { 0x10E, 0x7f }, + { 0x10F, 0x80 }, + { 0x110, 0x81 }, + { 0x111, 0x82 }, + { 0x112, 0x83 }, + { 0x113, 0x84 }, + { 0x114, 0x85 }, + { 0x115, 0x86 }, + { 0x116, 0x87 }, + { 0x117, 0x88 }, + { 0x118, 0x89 }, + { 0x119, 0x8A }, + { 0x11A, 0x8B }, + { 0x11B, 0x8C }, + { 0x11C, 0x8D }, + { 0x11D, 0x8E }, + { 0x11E, 0x8f }, + { 0x11F, 0x90 }, + { 0x120, 0x91 }, + { 0x121, 0x92 }, + { 0x122, 0x93 }, + { 0x123, 0x94 }, + { 0x124, 0x95 }, + { 0x125, 0x96 }, + { 0x126, 0x97 }, + { 0x127, 0x98 }, + { 0x128, 0x99 }, + { 0x129, 0x9A }, + { 0x12A, 0x9B }, + { 0x12B, 0x9C }, + { 0x12C, 0x9D }, + { 0x12D, 0x9E }, + { 0x12F, 0x9f }, + { 0x132, 0xA0 }, + { 0x133, 0xA1 }, + { 0x140, 0xEA }, + { 0x141, 0xEB }, + { 0x142, 0xE8 }, + { 0x143, 0xE9 }, + { 0x146, 0xE6 }, + { 0x147, 0xE5 }, + { 0x148, 0xEE }, + { 0x149, 0xef }, + { 0x14A, 0xE4 }, + { 0x14B, 0x112 }, + { 0x14D, 0x11C }, + { 0x14E, 0x11E }, + { 0x14F, 0x11D }, + { 0x150, 0x11B }, + { 0x17C, 0x19f }, + { 0x17D, 0x1A0 }, + { 0x180, 0x15f }, + { 0x181, 0x160 }, + { 0x182, 0x161 }, + { 0x184, 0x163 }, + { 0x187, 0x166 }, + { 0x189, 0x168 }, + { 0x18A, 0x169 }, + { 0x18B, 0x16A }, + { 0x18C, 0x16B }, + { 0x18D, 0x16C }, + { 0x18E, 0x16D }, + { 0x18F, 0x16E }, + { 0x193, 0x172 }, + { 0x194, 0x173 }, + { 0x196, 0x175 }, + { 0x19A, 0x179 }, + { 0x19B, 0x17A }, + { 0x19C, 0x17B }, + { 0x19F, 0x17E }, + { 0x1A0, 0x17f }, + { 0x1A1, 0x180 }, + { 0x1A2, 0x181 }, + { 0x1A4, 0x183 }, + { 0x1A7, 0x186 }, + { 0x1A9, 0x188 }, + { 0x1AA, 0x189 }, + { 0x1AB, 0x18A }, + { 0x1AC, 0x18B }, + { 0x1AD, 0x18C }, + { 0x1AE, 0x18D }, + { 0x1AF, 0x18E }, + { 0x1B3, 0x192 }, + { 0x1B4, 0x193 }, + { 0x1B6, 0x195 }, + { 0x1BA, 0x199 }, + { 0x1BB, 0x19A }, + { 0x1BC, 0x19B } }; typedef struct { int unk_00; - BGL * unk_04; - SaveData * unk_08; - PokedexData * unk_0C; - TrainerInfo * unk_10; - Options * unk_14; + BGL *unk_04; + SaveData *unk_08; + PokedexData *unk_0C; + TrainerInfo *unk_10; + Options *unk_14; Window unk_18; Window unk_28; Window unk_38; @@ -380,13 +374,13 @@ typedef struct { int unk_164; int unk_168; u8 unk_16C[12288]; - OverlayManager * unk_316C; - GraphicElementData * unk_3170; - MysteryGift * unk_3174; + OverlayManager *unk_316C; + GraphicElementData *unk_3170; + MysteryGift *unk_3174; int unk_3178; int unk_317C; UnkStruct_0202DBAC unk_3180; - void * unk_34D8; + void *unk_34D8; } UnkStruct_ov97_0222C388; enum { @@ -442,12 +436,12 @@ enum { UnkEnum_ov97_0222C78C_14 } UnkEnum_ov97_0222C78C; -static void ov97_0222C388(UnkStruct_ov97_0222C388 * param0); -int ov97_0222CB10(UnkStruct_ov97_0222C388 * param0); -MysteryGift * SaveData_MysteryGift(SaveData * param0); -void ov97_02231FFC(BGL * param0, void *, int param2); +static void ov97_0222C388(UnkStruct_ov97_0222C388 *param0); +int ov97_0222CB10(UnkStruct_ov97_0222C388 *param0); +MysteryGift *SaveData_MysteryGift(SaveData *param0); +void ov97_02231FFC(BGL *param0, void *, int param2); -static u16 ov97_0222C174 (u16 param0) +static u16 ov97_0222C174(u16 param0) { int v0; @@ -460,7 +454,7 @@ static u16 ov97_0222C174 (u16 param0) return 63; } -static void ov97_0222C1A4 (u16 * param0, int param1) +static void ov97_0222C1A4(u16 *param0, int param1) { param0[0] = param1 / 10000 + 48; param1 = param1 % 10000; @@ -503,11 +497,11 @@ static UnkStruct_ov97_02232E38 Unk_ov97_0223E0A4 = { Unk_ov97_0223F180 }; -static void ov97_0222C210 (UnkStruct_ov97_0222C388 * param0) +static void ov97_0222C210(UnkStruct_ov97_0222C388 *param0) { int v0; u32 v1; - const u16 * v2; + const u16 *v2; v2 = TrainerInfo_Name(param0->unk_10); @@ -520,7 +514,7 @@ static void ov97_0222C210 (UnkStruct_ov97_0222C388 * param0) Unk_ov97_0223F190[5] = 0; } -static void ov97_0222C254 (UnkStruct_ov97_0222C388 * param0) +static void ov97_0222C254(UnkStruct_ov97_0222C388 *param0) { int v0; UnkStruct_02099F80 v1 = { @@ -566,7 +560,7 @@ static void ov97_0222C254 (UnkStruct_ov97_0222C388 * param0) ov97_0222C388(param0); } -static void ov97_0222C388 (UnkStruct_ov97_0222C388 * param0) +static void ov97_0222C388(UnkStruct_ov97_0222C388 *param0) { sub_02006E84(116, 0, 4, 16 * 2 * 8, 16 * 2, param0->unk_00); sub_02006E3C(116, 1, param0->unk_04, 4, 0, 10 * 16 * 0x20, 1, param0->unk_00); @@ -575,7 +569,7 @@ static void ov97_0222C388 (UnkStruct_ov97_0222C388 * param0) sub_02019448(param0->unk_04, 4); } -static BOOL ov97_0222C404 (UnkStruct_ov97_0222C388 * param0) +static BOOL ov97_0222C404(UnkStruct_ov97_0222C388 *param0) { UnkStruct_ov97_02237808 v0; @@ -595,9 +589,9 @@ static BOOL ov97_0222C404 (UnkStruct_ov97_0222C388 * param0) return 1; } -static void ov97_0222C578(UnkStruct_ov97_0222C388 * param0); +static void ov97_0222C578(UnkStruct_ov97_0222C388 *param0); -static void ov97_0222C47C (UnkStruct_ov97_0222C388 * param0) +static void ov97_0222C47C(UnkStruct_ov97_0222C388 *param0) { ov97_02237808(¶m0->unk_48, ¶m0->unk_28, 0, 421, (1 + 9), 2); ov97_02237858(¶m0->unk_48, 27, 4, param0->unk_144); @@ -622,12 +616,12 @@ static void ov97_0222C47C (UnkStruct_ov97_0222C388 * param0) ov97_0222C578(param0); } -static void ov97_0222C578 (UnkStruct_ov97_0222C388 * param0) +static void ov97_0222C578(UnkStruct_ov97_0222C388 *param0) { u32 v0, v1, v2, v3; u8 v4[6]; UnkStruct_ov97_022335A8 v5; - StringTemplate * v6; + StringTemplate *v6; v6 = StringTemplate_Default(param0->unk_00); @@ -659,17 +653,20 @@ static void ov97_0222C578 (UnkStruct_ov97_0222C388 * param0) StringTemplate_Free(v6); } -static void ov97_0222C688 (OverlayManager * param0) +static void ov97_0222C688(OverlayManager *param0) { int v0; - UnkStruct_ov97_0222C388 * v1 = OverlayManager_Data(param0); + UnkStruct_ov97_0222C388 *v1 = OverlayManager_Data(param0); ov97_02237DA0(); if (BGL_WindowAdded(&v1->unk_18) == 1) { - sub_0201ACF4(&v1->unk_18); BGL_DeleteWindow(&v1->unk_18); - sub_0201ACF4(&v1->unk_28); BGL_DeleteWindow(&v1->unk_28); - sub_0201ACF4(&v1->unk_38); BGL_DeleteWindow(&v1->unk_38); + sub_0201ACF4(&v1->unk_18); + BGL_DeleteWindow(&v1->unk_18); + sub_0201ACF4(&v1->unk_28); + BGL_DeleteWindow(&v1->unk_28); + sub_0201ACF4(&v1->unk_38); + BGL_DeleteWindow(&v1->unk_38); } sub_02019044(v1->unk_04, 0); @@ -679,9 +676,9 @@ static void ov97_0222C688 (OverlayManager * param0) Heap_FreeToHeap(v1->unk_04); } -static int ov97_0222C6F8 (OverlayManager * param0, int * param1) +static int ov97_0222C6F8(OverlayManager *param0, int *param1) { - UnkStruct_ov97_0222C388 * v0; + UnkStruct_ov97_0222C388 *v0; v0 = ov97_022376C4(param0, 85, sizeof(UnkStruct_ov97_0222C388), 0x20000); @@ -707,9 +704,9 @@ static int ov97_0222C6F8 (OverlayManager * param0, int * param1) return 1; } -static int ov97_0222C78C (OverlayManager * param0, int * param1) +static int ov97_0222C78C(OverlayManager *param0, int *param1) { - UnkStruct_ov97_0222C388 * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222C388 *v0 = OverlayManager_Data(param0); switch (*param1) { case UnkEnum_ov97_0222C78C_00: @@ -788,8 +785,7 @@ static int ov97_0222C78C (OverlayManager * param0, int * param1) return 0; } - -static int ov97_0222C948 (OverlayManager * param0, int * param1) +static int ov97_0222C948(OverlayManager *param0, int *param1) { Heap_Destroy(91); sub_02000EC4(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D742C); @@ -799,13 +795,13 @@ static int ov97_0222C948 (OverlayManager * param0, int * param1) return 1; } -static void ov97_0222C974 (UnkStruct_ov97_0222C388 * param0) +static void ov97_0222C974(UnkStruct_ov97_0222C388 *param0) { RTCDate v0; - Strbuf* v1; - StringTemplate * v2; - MessageLoader * v3; - UnkStruct_0202DBAC * v4 = ¶m0->unk_3180; + Strbuf *v1; + StringTemplate *v2; + MessageLoader *v3; + UnkStruct_0202DBAC *v4 = ¶m0->unk_3180; MI_CpuClear8(v4, sizeof(UnkStruct_0202DBAC)); @@ -847,12 +843,12 @@ static void ov97_0222C974 (UnkStruct_ov97_0222C388 * param0) ov97_02238194(param0->unk_04, (UnkStruct_0202DF40 *)v4); } -static void ov97_0222CAAC (UnkStruct_ov97_0222C388 * param0, int param1) +static void ov97_0222CAAC(UnkStruct_ov97_0222C388 *param0, int param1) { param0->unk_160 = param1; } -static int ov97_0222CAB4 (UnkStruct_ov97_0222C388 * param0, int * param1, int param2, u32 param3) +static int ov97_0222CAB4(UnkStruct_ov97_0222C388 *param0, int *param1, int param2, u32 param3) { if (--param0->unk_160 == 0) { ov97_022333BC(); @@ -877,11 +873,11 @@ static int ov97_0222CAB4 (UnkStruct_ov97_0222C388 * param0, int * param1, int pa return 0; } -int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0) +int ov97_0222CB10(UnkStruct_ov97_0222C388 *param0) { int v0, v1; - u16 * v2; - int * v3 = ¶m0->unk_15C; + u16 *v2; + int *v3 = ¶m0->unk_15C; if (param0->unk_158 == 1) { sub_020397B0(WM_LINK_LEVEL_3 - ov97_02233230()); diff --git a/src/overlay097/ov97_0222D04C.c b/src/overlay097/ov97_0222D04C.c index 636feacfde..3ee9406f80 100644 --- a/src/overlay097/ov97_0222D04C.c +++ b/src/overlay097/ov97_0222D04C.c @@ -1,44 +1,45 @@ +#include "overlay097/ov97_0222D04C.h" + #include #include -#include "sys_task_manager.h" -#include "trainer_info.h" -#include "savedata.h" - #include "struct_defs/struct_0203CC84.h" + +#include "overlay097/ov97_0222D2F8.h" +#include "overlay097/ov97_0222D30C.h" #include "overlay097/struct_ov97_0222D04C.h" #include "overlay097/struct_ov97_0222D250.h" #include "overlay097/union_ov97_0222D2B0.h" +#include "communication_information.h" +#include "communication_system.h" +#include "heap.h" #include "overlay_manager.h" +#include "savedata.h" #include "sys_task.h" -#include "heap.h" -#include "communication_information.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" -#include "overlay097/ov97_0222D04C.h" -#include "overlay097/ov97_0222D2F8.h" -#include "overlay097/ov97_0222D30C.h" -typedef void (* UnkFuncPtr_ov97_0222D0A4)(void); +typedef void (*UnkFuncPtr_ov97_0222D0A4)(void); typedef struct { - UnkStruct_ov97_0222D04C * unk_00; + UnkStruct_ov97_0222D04C *unk_00; MATHRandContext32 unk_04; - SysTask * unk_1C; + SysTask *unk_1C; UnkFuncPtr_ov97_0222D0A4 unk_20; u16 unk_24; u8 unk_26; u8 unk_27; - TrainerInfo * unk_28[16]; + TrainerInfo *unk_28[16]; UnkUnion_ov97_0222D2B0 unk_68; u8 unk_3C0; u8 unk_3C1[16]; } UnkStruct_ov97_0223F1A4; -static void ov97_0222D19C(SysTask * param0, void * param1); +static void ov97_0222D19C(SysTask *param0, void *param1); static void ov97_0222D0B4(void); static void ov97_0222D0F0(void); static void ov97_0222D128(void); @@ -47,11 +48,11 @@ static void ov97_0222D144(void); static void ov97_0222D164(void); static void ov97_0222D198(void); -static UnkStruct_ov97_0223F1A4 * Unk_ov97_0223F1A4 = NULL; +static UnkStruct_ov97_0223F1A4 *Unk_ov97_0223F1A4 = NULL; -static void ov97_0222D04C (UnkStruct_ov97_0222D04C * param0) +static void ov97_0222D04C(UnkStruct_ov97_0222D04C *param0) { - void * v0; + void *v0; if (Unk_ov97_0223F1A4 != NULL) { return; @@ -69,13 +70,13 @@ static void ov97_0222D04C (UnkStruct_ov97_0222D04C * param0) CommSys_Seed(&Unk_ov97_0223F1A4->unk_04); } -static void ov97_0222D0A4 (UnkFuncPtr_ov97_0222D0A4 param0, int param1) +static void ov97_0222D0A4(UnkFuncPtr_ov97_0222D0A4 param0, int param1) { Unk_ov97_0223F1A4->unk_20 = param0; Unk_ov97_0223F1A4->unk_24 = param1; } -static void ov97_0222D0B4 (void) +static void ov97_0222D0B4(void) { int v0; @@ -91,7 +92,7 @@ static void ov97_0222D0B4 (void) ov97_0222D0A4(ov97_0222D0F0, 0); } -static void ov97_0222D0F0 (void) +static void ov97_0222D0F0(void) { int v0; @@ -106,7 +107,7 @@ static void ov97_0222D0F0 (void) } } -static void ov97_0222D128 (void) +static void ov97_0222D128(void) { if (!sub_020334A4()) { return; @@ -115,18 +116,18 @@ static void ov97_0222D128 (void) ov97_0222D0A4(ov97_0222D140, 0); } -static void ov97_0222D140 (void) +static void ov97_0222D140(void) { (void)0; } -static void ov97_0222D144 (void) +static void ov97_0222D144(void) { sub_02036948(Unk_ov97_0223F1A4->unk_27); ov97_0222D0A4(ov97_0222D164, 0); } -static void ov97_0222D164 (void) +static void ov97_0222D164(void) { if (!sub_0203699C()) { return; @@ -140,12 +141,12 @@ static void ov97_0222D164 (void) ov97_0222D0A4(ov97_0222D198, 0); } -static void ov97_0222D198 (void) +static void ov97_0222D198(void) { return; } -void ov97_0222D19C (SysTask * param0, void * param1) +void ov97_0222D19C(SysTask *param0, void *param1) { if (Unk_ov97_0223F1A4 == NULL) { SysTask_Done(param0); @@ -160,7 +161,7 @@ void ov97_0222D19C (SysTask * param0, void * param1) } } -void ov97_0222D1C4 (UnkStruct_ov97_0222D04C * param0, SaveData * param1, int param2) +void ov97_0222D1C4(UnkStruct_ov97_0222D04C *param0, SaveData *param1, int param2) { if (CommSys_IsInitialized()) { return; @@ -172,14 +173,14 @@ void ov97_0222D1C4 (UnkStruct_ov97_0222D04C * param0, SaveData * param1, int par ov97_0222D0A4(ov97_0222D0B4, 0); } -void ov97_0222D1F0 (const void * param0, int param1) +void ov97_0222D1F0(const void *param0, int param1) { sub_02035A3C(22, param0, param1); } -void ov97_0222D200 (UnkStruct_ov97_0222D04C * param0, int param1) +void ov97_0222D200(UnkStruct_ov97_0222D04C *param0, int param1) { - SaveData * v0; + SaveData *v0; if (CommSys_IsInitialized()) { return; @@ -192,16 +193,16 @@ void ov97_0222D200 (UnkStruct_ov97_0222D04C * param0, int param1) ov97_0222D0A4(ov97_0222D128, 0); } -void ov97_0222D234 (int param0) +void ov97_0222D234(int param0) { Unk_ov97_0223F1A4->unk_27 = param0; ov97_0222D0A4(ov97_0222D144, 0); } -int ov97_0222D250 (UnkStruct_ov97_0222D04C * param0) +int ov97_0222D250(UnkStruct_ov97_0222D04C *param0) { int v0; - UnkStruct_ov97_0222D250 * v1; + UnkStruct_ov97_0222D250 *v1; for (v0 = 0; v0 < 16; v0++) { v1 = (UnkStruct_ov97_0222D250 *)sub_02034168(v0); @@ -217,7 +218,7 @@ int ov97_0222D250 (UnkStruct_ov97_0222D04C * param0) return -1; } -void ov97_0222D284 (int param0, int param1, void * param2, void * param3) +void ov97_0222D284(int param0, int param1, void *param2, void *param3) { if (Unk_ov97_0223F1A4->unk_27 != param0) { return; @@ -226,27 +227,27 @@ void ov97_0222D284 (int param0, int param1, void * param2, void * param3) Unk_ov97_0223F1A4->unk_3C0 = 1; } -int ov97_0222D2A0 (void) +int ov97_0222D2A0(void) { return Unk_ov97_0223F1A4->unk_3C0; } -int ov97_0222D2B0 (void) +int ov97_0222D2B0(void) { return sizeof(UnkUnion_ov97_0222D2B0); } -u8 * ov97_0222D2B8 (int param0, void * param1, int param2) +u8 *ov97_0222D2B8(int param0, void *param1, int param2) { return (u8 *)&Unk_ov97_0223F1A4->unk_68; } -void ov97_0222D2C4 (int param0, int param1, void * param2, void * param3) +void ov97_0222D2C4(int param0, int param1, void *param2, void *param3) { Unk_ov97_0223F1A4->unk_3C1[param0] = 1; } -void ov97_0222D2DC (void) +void ov97_0222D2DC(void) { Heap_FreeToHeapExplicit(15, Unk_ov97_0223F1A4); Unk_ov97_0223F1A4 = NULL; diff --git a/src/overlay097/ov97_0222D2F8.c b/src/overlay097/ov97_0222D2F8.c index a9d42ddeef..01ead9ecee 100644 --- a/src/overlay097/ov97_0222D2F8.c +++ b/src/overlay097/ov97_0222D2F8.c @@ -1,18 +1,20 @@ +#include "overlay097/ov97_0222D2F8.h" + #include #include #include "struct_defs/struct_02039A58.h" -#include "unk_02032798.h" #include "overlay097/ov97_0222D04C.h" -#include "overlay097/ov97_0222D2F8.h" + +#include "unk_02032798.h" static const CommCmdTable Unk_ov97_0223D704[] = { - {ov97_0222D284, ov97_0222D2B0, ov97_0222D2B8}, - {ov97_0222D2C4, sub_0203294C, NULL} + { ov97_0222D284, ov97_0222D2B0, ov97_0222D2B8 }, + { ov97_0222D2C4, sub_0203294C, NULL } }; -void ov97_0222D2F8 (void * param0) +void ov97_0222D2F8(void *param0) { int v0 = sizeof(Unk_ov97_0223D704) / sizeof(CommCmdTable); CommCmd_Init(Unk_ov97_0223D704, v0, param0); diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index da92961835..25fb18ce61 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -1,78 +1,74 @@ +#include "overlay097/ov97_0222D30C.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202442C_decl.h" #include "struct_decls/struct_02025CCC_decl.h" -#include "pokemon.h" -#include "savedata.h" - -#include "overlay077/const_ov77_021D742C.h" - #include "struct_defs/struct_0202DF40.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" +#include "overlay077/const_ov77_021D742C.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "overlay097/ov97_0222D04C.h" +#include "overlay097/ov97_02232054.h" +#include "overlay097/ov97_02237520.h" +#include "overlay097/ov97_02237694.h" +#include "overlay097/ov97_02238534.h" #include "overlay097/struct_ov97_0222D04C.h" #include "overlay097/struct_ov97_0222D250.h" -#include "overlay097/union_ov97_0222D2B0.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay097/struct_ov97_02237808.h" #include "overlay097/struct_ov97_02237AEC.h" #include "overlay097/struct_ov97_0223829C.h" +#include "overlay097/union_ov97_0222D2B0.h" #include "overlay115/struct_ov115_02261520.h" +#include "savedata/save_table.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "rtc.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02000C88.h" #include "unk_0200112C.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "rtc.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "savedata/save_table.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202DAB4.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "overlay097/ov97_0222D04C.h" -#include "overlay097/ov97_0222D30C.h" -#include "overlay097/ov97_02232054.h" -#include "overlay097/ov97_02237520.h" -#include "overlay097/ov97_02237694.h" -#include "overlay097/ov97_02238534.h" FS_EXTERN_OVERLAY(overlay77); FS_EXTERN_OVERLAY(overlay97); @@ -86,7 +82,7 @@ typedef struct { int unk_00; int unk_04; BOOL unk_08; - GraphicElementData * unk_0C; + GraphicElementData *unk_0C; VecFx32 unk_10; fx32 unk_1C; fx32 unk_20; @@ -99,21 +95,21 @@ typedef struct { int unk_3C; int unk_40; int unk_44; - SysTask * unk_48; + SysTask *unk_48; } UnkStruct_ov97_0222EEB8; typedef struct { int unk_00; int unk_04; s8 unk_08; - UnkStruct_ov97_02237AEC * unk_0C; + UnkStruct_ov97_02237AEC *unk_0C; UnkStruct_ov19_021DA864 unk_10[2]; - UnkStruct_02009DC8 * unk_58[2][6]; + UnkStruct_02009DC8 *unk_58[2][6]; UnkStruct_ov97_0222EEB8 unk_88[80]; UnkStruct_ov97_0222EEB8 unk_1848[80]; UnkStruct_ov97_0222EEB8 unk_3008; UnkStruct_ov97_0222EEB8 unk_3054; - int * unk_30A0; + int *unk_30A0; } UnkStruct_ov97_0222E398; typedef struct { @@ -121,78 +117,78 @@ typedef struct { f32 unk_04; } UnkStruct_ov97_0222EDC0; -void Strbuf_ToChars(const Strbuf *param0, u16 * param1, u32 param2); -void Strbuf_CopyNumChars(Strbuf *param0, const u16 * param1, u32 param2); -MysteryGift * SaveData_MysteryGift(SaveData * param0); -void ov97_02231FFC(BGL * param0, void *, int param2); -static int ov97_0222D474(OverlayManager * param0); -static int ov97_0222D4D8(OverlayManager * param0); -static int ov97_0222DA18(OverlayManager * param0); -static int ov97_0222D984(OverlayManager * param0); -static int ov97_0222D75C(OverlayManager * param0); -static int ov97_0222D94C(OverlayManager * param0); -static int ov97_0222D798(OverlayManager * param0); -static int ov97_0222D814(OverlayManager * param0); -static int ov97_0222D884(OverlayManager * param0); -static int ov97_0222D9BC(OverlayManager * param0); -static int ov97_0222D9F0(OverlayManager * param0); -static int ov97_0222DA64(OverlayManager * param0); -static int ov97_0222DA84(OverlayManager * param0); -static int ov97_0222DB08(OverlayManager * param0); -static int ov97_0222DB40(OverlayManager * param0); -static void ov97_0222DD1C(OverlayManager * param0, UnkStruct_ov97_0223E5B8 * param1, int param2, Window * param3, u32 param4); -static void ov97_0222DDD0(OverlayManager * param0, int param1, u32 param2); -static void ov97_0222DE78(OverlayManager * param0, Window * param1, u32 param2); +void Strbuf_ToChars(const Strbuf *param0, u16 *param1, u32 param2); +void Strbuf_CopyNumChars(Strbuf *param0, const u16 *param1, u32 param2); +MysteryGift *SaveData_MysteryGift(SaveData *param0); +void ov97_02231FFC(BGL *param0, void *, int param2); +static int ov97_0222D474(OverlayManager *param0); +static int ov97_0222D4D8(OverlayManager *param0); +static int ov97_0222DA18(OverlayManager *param0); +static int ov97_0222D984(OverlayManager *param0); +static int ov97_0222D75C(OverlayManager *param0); +static int ov97_0222D94C(OverlayManager *param0); +static int ov97_0222D798(OverlayManager *param0); +static int ov97_0222D814(OverlayManager *param0); +static int ov97_0222D884(OverlayManager *param0); +static int ov97_0222D9BC(OverlayManager *param0); +static int ov97_0222D9F0(OverlayManager *param0); +static int ov97_0222DA64(OverlayManager *param0); +static int ov97_0222DA84(OverlayManager *param0); +static int ov97_0222DB08(OverlayManager *param0); +static int ov97_0222DB40(OverlayManager *param0); +static void ov97_0222DD1C(OverlayManager *param0, UnkStruct_ov97_0223E5B8 *param1, int param2, Window *param3, u32 param4); +static void ov97_0222DDD0(OverlayManager *param0, int param1, u32 param2); +static void ov97_0222DE78(OverlayManager *param0, Window *param1, u32 param2); static void ov97_022302D4(void); -static void ov97_02230224(UnkStruct_ov97_0222D04C * param0); -static void ov97_022302F4(UnkStruct_ov97_0222D04C * param0); -static int ov97_0222E228(OverlayManager * param0, Window * param1, int param2, int param3); -int ov97_02238EAC(OverlayManager * param0, int * param1); -static void ov97_0222EEB8(SysTask * param0, void * param1); +static void ov97_02230224(UnkStruct_ov97_0222D04C *param0); +static void ov97_022302F4(UnkStruct_ov97_0222D04C *param0); +static int ov97_0222E228(OverlayManager *param0, Window *param1, int param2, int param3); +int ov97_02238EAC(OverlayManager *param0, int *param1); +static void ov97_0222EEB8(SysTask *param0, void *param1); -static OverlayManager * Unk_ov97_0223F1B0; +static OverlayManager *Unk_ov97_0223F1B0; UnkStruct_ov97_0223E5B8 Unk_ov97_0223E5B8[] = { - {0xC, (u32)ov97_0222DA84}, - {0xD, (u32)ov97_0222DB08}, - {0xE, (u32)ov97_0222DB40} + { 0xC, (u32)ov97_0222DA84 }, + { 0xD, (u32)ov97_0222DB08 }, + { 0xE, (u32)ov97_0222DB40 } }; UnkStruct_ov97_0223E5B8 Unk_ov97_0223E5F0[] = { - {0xF, (u32)ov97_0222D798}, - {0x14, (u32)ov97_0222D884}, - {0x10, (u32)ov97_0222D814}, - {0x11, (u32)ov97_0222DA64} + { 0xF, (u32)ov97_0222D798 }, + { 0x14, (u32)ov97_0222D884 }, + { 0x10, (u32)ov97_0222D814 }, + { 0x11, (u32)ov97_0222DA64 } }; UnkStruct_ov97_0223E5B8 Unk_ov97_0223E598[] = { - {0x12, (u32)ov97_0222D474}, - {0x13, (u32)ov97_0222D75C} + { 0x12, (u32)ov97_0222D474 }, + { 0x13, (u32)ov97_0222D75C } }; UnkStruct_ov97_0223E5B8 Unk_ov97_0223E5A8[] = { - {0x12, (u32)ov97_0222D4D8}, - {0x13, (u32)ov97_0222D94C} + { 0x12, (u32)ov97_0222D4D8 }, + { 0x13, (u32)ov97_0222D94C } }; UnkStruct_ov97_0223E5B8 Unk_ov97_0223E568[] = { - {0x12, (u32)ov97_0222DA18}, - {0x13, (u32)ov97_0222D75C} + { 0x12, (u32)ov97_0222DA18 }, + { 0x13, (u32)ov97_0222D75C } }; UnkStruct_ov97_0223E5B8 dummy_UnkStruct_ov97_0223E5B8[] = { - {0x12, (u32)ov97_0222D4D8}, - {0x13, (u32)NULL} + { 0x12, (u32)ov97_0222D4D8 }, + { 0x13, (u32)NULL } }; UnkStruct_ov97_0223E5B8 Unk_ov97_0223E578[] = { - {0x12, (u32)ov97_0222D984}, - {0x13, (u32)ov97_0222D75C} + { 0x12, (u32)ov97_0222D984 }, + { 0x13, (u32)ov97_0222D75C } }; UnkStruct_ov97_0223E5B8 Unk_ov97_0223E588[] = { - {0x12, (u32)ov97_0222D9BC}, - {0x13, (u32)ov97_0222D9F0} + { 0x12, (u32)ov97_0222D9BC }, + { 0x13, (u32)ov97_0222D9F0 } }; static UnkStruct_ov84_02240FA8 Unk_ov97_0223E5D0 = { @@ -218,9 +214,9 @@ static UnkStruct_ov84_02240FA8 Unk_ov97_0223E5D0 = { static int Unk_ov97_0223F1A8; static int Unk_ov97_0223F1B4; -static void * Unk_ov97_0223F1AC; +static void *Unk_ov97_0223F1AC; -static void ov97_0222D30C (UnkStruct_ov97_0222D04C * param0, int param1) +static void ov97_0222D30C(UnkStruct_ov97_0222D04C *param0, int param1) { if (param1 == 1) { if (param0->unk_2A50 == NULL) { @@ -235,15 +231,15 @@ static void ov97_0222D30C (UnkStruct_ov97_0222D04C * param0, int param1) } } -void ov97_0222D344 (UnkStruct_ov97_0222D04C * param0, int param1) +void ov97_0222D344(UnkStruct_ov97_0222D04C *param0, int param1) { ov97_0222D30C(param0, param1); } -static void ov97_0222D34C (OverlayManager * param0) +static void ov97_0222D34C(OverlayManager *param0) { int v0; - UnkStruct_ov97_0222D04C * v1 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v1 = OverlayManager_Data(param0); ov97_02237DA0(); @@ -255,10 +251,12 @@ static void ov97_0222D34C (OverlayManager * param0) sub_02001384(v1->unk_78, NULL, NULL); } - sub_0201ACF4(&v1->unk_18); BGL_DeleteWindow(&v1->unk_18); + sub_0201ACF4(&v1->unk_18); + BGL_DeleteWindow(&v1->unk_18); if (BGL_WindowAdded(&v1->unk_58)) { - sub_0201ACF4(&v1->unk_58); BGL_DeleteWindow(&v1->unk_58); + sub_0201ACF4(&v1->unk_58); + BGL_DeleteWindow(&v1->unk_58); } for (v0 = 0; v0 < 3; v0++) { @@ -275,14 +273,14 @@ static void ov97_0222D34C (OverlayManager * param0) Heap_FreeToHeap(v1->unk_00); } -static void ov97_0222D3E8 (UnkStruct_ov97_0222D04C * param0) +static void ov97_0222D3E8(UnkStruct_ov97_0222D04C *param0) { ov97_02237A20(); ov97_02237A74(); ov97_02237B0C(116, 10, 7, 9, 8, 0); } -static void ov97_0222D40C (UnkStruct_ov97_0222D04C * param0, int param1) +static void ov97_0222D40C(UnkStruct_ov97_0222D04C *param0, int param1) { if (param1 != -1) { param0->unk_628 = ov97_02237D14(0, param0->unk_628, HW_LCD_WIDTH / 2, 100, param1); @@ -291,23 +289,23 @@ static void ov97_0222D40C (UnkStruct_ov97_0222D04C * param0, int param1) } } -static void ov97_0222D444 (Window * param0, u8 param1) +static void ov97_0222D444(Window *param0, u8 param1) { if (BGL_WindowAdded(param0) == 1) { Window_Clear(param0, param1); } } -static void ov97_0222D45C (Window * param0, u8 param1) +static void ov97_0222D45C(Window *param0, u8 param1) { if (BGL_WindowAdded(param0) == 1) { sub_0200E084(param0, param1); } } -static int ov97_0222D474 (OverlayManager * param0) +static int ov97_0222D474(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); if (v0->unk_1638 != 2) { ov97_0222DE78(param0, &v0->unk_18, 3); @@ -327,9 +325,9 @@ static int ov97_0222D474 (OverlayManager * param0) } } -static int ov97_0222D4D8 (OverlayManager * param0) +static int ov97_0222D4D8(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); if (v0->unk_80 == 1) { return 49; @@ -363,12 +361,12 @@ static int ov97_0222D4D8 (OverlayManager * param0) } } -static UnkStruct_0202DF40 * ov97_0222D55C (OverlayManager * param0) +static UnkStruct_0202DF40 *ov97_0222D55C(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); - UnkUnion_ov97_0222D2B0 * v1 = &v0->unk_8C.unk_50; - UnkStruct_ov97_0222D250 * v2 = &v0->unk_8C.unk_00; - UnkStruct_ov97_0223829C * v3; + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); + UnkUnion_ov97_0222D2B0 *v1 = &v0->unk_8C.unk_50; + UnkStruct_ov97_0222D250 *v2 = &v0->unk_8C.unk_00; + UnkStruct_ov97_0223829C *v3; switch (v0->unk_1638) { case 1: @@ -385,7 +383,7 @@ static UnkStruct_0202DF40 * ov97_0222D55C (OverlayManager * param0) return &v1->val1; } -static BOOL ov97_0222D5C8 (UnkStruct_0202DF40 * param0) +static BOOL ov97_0222D5C8(UnkStruct_0202DF40 *param0) { switch (param0->unk_00) { case 13: @@ -396,9 +394,8 @@ static BOOL ov97_0222D5C8 (UnkStruct_0202DF40 * param0) } break; case 1: - case 2: - { - Pokemon * v0; + case 2: { + Pokemon *v0; int v1; v0 = (Pokemon *)¶m0->unk_04.val1.unk_04; @@ -407,17 +404,16 @@ static BOOL ov97_0222D5C8 (UnkStruct_0202DF40 * param0) if (((v1 >= 3) && (v1 <= 14)) || ((v1 >= 64) && (v1 <= 71))) { return 1; } - } - break; + } break; } return 0; } -static void ov97_0222D614 (void * param0) +static void ov97_0222D614(void *param0) { int v0; - UnkStruct_ov97_0222D04C * v1 = (UnkStruct_ov97_0222D04C *)param0; + UnkStruct_ov97_0222D04C *v1 = (UnkStruct_ov97_0222D04C *)param0; if (v1->unk_2A4C == 1) { v1->unk_2A48 = NULL; @@ -436,14 +432,14 @@ static void ov97_0222D614 (void * param0) } } -static void ov97_0222D658 (OverlayManager * param0) +static void ov97_0222D658(OverlayManager *param0) { int v0, v1; - UnkStruct_ov97_0222D04C * v2 = OverlayManager_Data(param0); - UnkStruct_ov97_0222D250 * v3 = &v2->unk_8C.unk_00; - UnkUnion_ov97_0222D2B0 * v4 = &v2->unk_8C.unk_50; - SaveData * v5 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; - MysteryGift * v6; + UnkStruct_ov97_0222D04C *v2 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D250 *v3 = &v2->unk_8C.unk_00; + UnkUnion_ov97_0222D2B0 *v4 = &v2->unk_8C.unk_50; + SaveData *v5 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; + MysteryGift *v6; if (v3->unk_4E_2 == 0) { v0 = 0; @@ -476,11 +472,11 @@ static void ov97_0222D658 (OverlayManager * param0) v2->unk_2A48 = ov97_0222D614; } -static void ov97_0222D6F8 (OverlayManager * param0, int param1) +static void ov97_0222D6F8(OverlayManager *param0, int param1) { int v0; - Window * v1; - UnkStruct_ov97_0222D04C * v2 = OverlayManager_Data(param0); + Window *v1; + UnkStruct_ov97_0222D04C *v2 = OverlayManager_Data(param0); if (param1 == 0) { v0 = 4; @@ -498,9 +494,9 @@ static void ov97_0222D6F8 (OverlayManager * param0, int param1) ov97_0222DD1C(param0, Unk_ov97_0223E5A8, NELEMS(Unk_ov97_0223E5A8), v1, v0); } -static int ov97_0222D75C (OverlayManager * param0) +static int ov97_0222D75C(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); ov97_0222D444(&v0->unk_28[2], 0); ov97_0222D444(&v0->unk_58, 0); @@ -514,10 +510,10 @@ static int ov97_0222D75C (OverlayManager * param0) return ov97_0222DA84(param0); } -static int ov97_0222D798 (OverlayManager * param0) +static int ov97_0222D798(OverlayManager *param0) { - Window * v0; - UnkStruct_ov97_0222D04C * v1 = OverlayManager_Data(param0); + Window *v0; + UnkStruct_ov97_0222D04C *v1 = OverlayManager_Data(param0); if (ov97_02237624()) { v1->unk_1638 = 2; @@ -539,10 +535,10 @@ static int ov97_0222D798 (OverlayManager * param0) return 5; } -static int ov97_0222D814 (OverlayManager * param0) +static int ov97_0222D814(OverlayManager *param0) { - Window * v0; - UnkStruct_ov97_0222D04C * v1 = OverlayManager_Data(param0); + Window *v0; + UnkStruct_ov97_0222D04C *v1 = OverlayManager_Data(param0); v1->unk_1638 = 4; @@ -560,10 +556,10 @@ static int ov97_0222D814 (OverlayManager * param0) return 5; } -static int ov97_0222D884 (OverlayManager * param0) +static int ov97_0222D884(OverlayManager *param0) { - Window * v0; - UnkStruct_ov97_0222D04C * v1 = OverlayManager_Data(param0); + Window *v0; + UnkStruct_ov97_0222D04C *v1 = OverlayManager_Data(param0); v1->unk_1638 = 3; @@ -581,10 +577,10 @@ static int ov97_0222D884 (OverlayManager * param0) return 5; } -static void ov97_0222D8F4 (OverlayManager * param0) +static void ov97_0222D8F4(OverlayManager *param0) { - Window * v0; - UnkStruct_ov97_0222D04C * v1 = OverlayManager_Data(param0); + Window *v0; + UnkStruct_ov97_0222D04C *v1 = OverlayManager_Data(param0); v0 = &v1->unk_28[2]; @@ -596,9 +592,9 @@ static void ov97_0222D8F4 (OverlayManager * param0) ov97_0222DD1C(param0, Unk_ov97_0223E588, NELEMS(Unk_ov97_0223E588), v0, 4); } -static int ov97_0222D94C (OverlayManager * param0) +static int ov97_0222D94C(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); ov97_0222D444(&v0->unk_28[2], 0); ov97_0222D444(&v0->unk_58, 0); @@ -612,9 +608,9 @@ static int ov97_0222D94C (OverlayManager * param0) return ov97_0222DA84(param0); } -static int ov97_0222D984 (OverlayManager * param0) +static int ov97_0222D984(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); ov97_0222DE78(param0, &v0->unk_18, 3); ov97_0222D444(&v0->unk_28[2], 0); @@ -624,9 +620,9 @@ static int ov97_0222D984 (OverlayManager * param0) return 32; } -static int ov97_0222D9BC (OverlayManager * param0) +static int ov97_0222D9BC(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); if ((v0->unk_80 == 3) || (v0->unk_80 == 4) || (v0->unk_80 == 2)) { return 49; @@ -638,7 +634,7 @@ static int ov97_0222D9BC (OverlayManager * param0) return 33; } -static int ov97_0222D9F0 (OverlayManager * param0) +static int ov97_0222D9F0(OverlayManager *param0) { if ((Unk_ov97_0223F1A8 == 40) || (Unk_ov97_0223F1A8 == 41) || (Unk_ov97_0223F1A8 == 48)) { if (ov97_022389C8()) { @@ -649,9 +645,9 @@ static int ov97_0222D9F0 (OverlayManager * param0) return 36; } -static int ov97_0222DA18 (OverlayManager * param0) +static int ov97_0222DA18(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); ov97_0222DE78(param0, &v0->unk_18, 3); ov97_0222D30C(v0, 1); @@ -664,9 +660,9 @@ static int ov97_0222DA18 (OverlayManager * param0) return 27; } -static int ov97_0222DA64 (OverlayManager * param0) +static int ov97_0222DA64(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); ov97_0222D444(&v0->unk_28[1], 0); ov97_0222DDD0(param0, (((1 + (18 + 12)) + 9) + 26 * 6), 0); @@ -674,12 +670,12 @@ static int ov97_0222DA64 (OverlayManager * param0) return 3; } -static int ov97_0222DA84 (OverlayManager * param0) +static int ov97_0222DA84(OverlayManager *param0) { - Window * v0; - UnkStruct_02025CCC * v1; - UnkStruct_ov97_0222D04C * v2 = OverlayManager_Data(param0); - MysteryGift * v3 = SaveData_MysteryGift(v2->unk_04); + Window *v0; + UnkStruct_02025CCC *v1; + UnkStruct_ov97_0222D04C *v2 = OverlayManager_Data(param0); + MysteryGift *v3 = SaveData_MysteryGift(v2->unk_04); if (v2->unk_62C == 30) { v2->unk_630 = 1; @@ -699,9 +695,9 @@ static int ov97_0222DA84 (OverlayManager * param0) return 4; } -static int ov97_0222DB08 (OverlayManager * param0) +static int ov97_0222DB08(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); if (v0->unk_62C == 30) { v0->unk_630 = 1; @@ -712,9 +708,9 @@ static int ov97_0222DB08 (OverlayManager * param0) return -1; } -static int ov97_0222DB40 (OverlayManager * param0) +static int ov97_0222DB40(OverlayManager *param0) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); if (v0->unk_62C == 30) { v0->unk_630 = 1; @@ -726,7 +722,7 @@ static int ov97_0222DB40 (OverlayManager * param0) return -1; } -static void ov97_0222DB78 (BGL * param0, int param1, u32 param2, u32 param3) +static void ov97_0222DB78(BGL *param0, int param1, u32 param2, u32 param3) { UnkStruct_ov97_0222DB78 v0 = { 0, @@ -751,7 +747,7 @@ static void ov97_0222DB78 (BGL * param0, int param1, u32 param2, u32 param3) sub_02019EBC(param0, param1); } -static void ov97_0222DBC4 (BGL * param0) +static void ov97_0222DBC4(BGL *param0) { UnkStruct_ov84_0223BA5C v0 = { GX_DISPMODE_GRAPHICS, @@ -768,7 +764,7 @@ static void ov97_0222DBC4 (BGL * param0) ov97_0222DB78(param0, 5, 0x7800, 0x4000); } -static void ov97_0222DC20 (BGL * param0) +static void ov97_0222DC20(BGL *param0) { sub_02006E84(116, 0, 4, 16 * 2 * 8, 16 * 2, 86); sub_02006E3C(116, 1, param0, 5, 0, 10 * 16 * 0x20, 1, 86); @@ -777,7 +773,7 @@ static void ov97_0222DC20 (BGL * param0) sub_02019448(param0, 5); } -static void ov97_0222DC9C (BGL * param0) +static void ov97_0222DC9C(BGL *param0) { sub_02006E84(116, 0, 0, 16 * 2 * 8, 16 * 2, 86); sub_02006E3C(116, 1, param0, 1, 0, 10 * 16 * 0x20, 1, 86); @@ -788,11 +784,11 @@ static void ov97_0222DC9C (BGL * param0) ov97_0222DC20(param0); } -static void ov97_0222DD1C (OverlayManager * param0, UnkStruct_ov97_0223E5B8 * param1, int param2, Window * param3, u32 param4) +static void ov97_0222DD1C(OverlayManager *param0, UnkStruct_ov97_0223E5B8 *param1, int param2, Window *param3, u32 param4) { int v0; UnkStruct_ov84_02240FA8 v1; - UnkStruct_ov97_0222D04C * v2 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v2 = OverlayManager_Data(param0); if (v2->unk_7C) { sub_02013A3C(v2->unk_7C); @@ -824,13 +820,13 @@ static void ov97_0222DD1C (OverlayManager * param0, UnkStruct_ov97_0223E5B8 * pa } } -static void ov97_0222DDD0 (OverlayManager * param0, int param1, u32 param2) +static void ov97_0222DDD0(OverlayManager *param0, int param1, u32 param2) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); - Window * v1; + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); + Window *v1; UnkStruct_ov97_0223E5B8 v2[4]; int v3, v4 = 0; - MysteryGift * v5 = SaveData_MysteryGift(v0->unk_04); + MysteryGift *v5 = SaveData_MysteryGift(v0->unk_04); v1 = &v0->unk_28[0]; v2[v4++] = Unk_ov97_0223E5B8[0]; @@ -849,10 +845,10 @@ static void ov97_0222DDD0 (OverlayManager * param0, int param1, u32 param2) ov97_0222DD1C(param0, v2, v4, v1, param2); } -static void ov97_0222DE78 (OverlayManager * param0, Window * param1, u32 param2) +static void ov97_0222DE78(OverlayManager *param0, Window *param1, u32 param2) { - Strbuf* v0; - UnkStruct_ov97_0222D04C * v1 = OverlayManager_Data(param0); + Strbuf *v0; + UnkStruct_ov97_0222D04C *v1 = OverlayManager_Data(param0); v1->unk_10 = MessageLoader_Init(1, 26, 421, 86); v1->unk_0C = StringTemplate_Default(86); @@ -878,10 +874,10 @@ static void ov97_0222DE78 (OverlayManager * param0, Window * param1, u32 param2) v1->unk_68 = 0xff; } -static void ov97_0222DF10 (OverlayManager * param0, Window * param1, u16 * param2) +static void ov97_0222DF10(OverlayManager *param0, Window *param1, u16 *param2) { - Strbuf* v0; - UnkStruct_ov97_0222D04C * v1 = OverlayManager_Data(param0); + Strbuf *v0; + UnkStruct_ov97_0222D04C *v1 = OverlayManager_Data(param0); v0 = Strbuf_Init(36 + 1, 86); @@ -892,12 +888,12 @@ static void ov97_0222DF10 (OverlayManager * param0, Window * param1, u16 * param Strbuf_Free(v0); } -static void ov97_0222DF70 (OverlayManager * param0, int * param1, int (* param2)(OverlayManager *)) +static void ov97_0222DF70(OverlayManager *param0, int *param1, int (*param2)(OverlayManager *)) { u32 v0; int v1; - UnkStruct_ov97_0222D04C * v2 = OverlayManager_Data(param0); - static int (* v3)(OverlayManager *); + UnkStruct_ov97_0222D04C *v2 = OverlayManager_Data(param0); + static int (*v3)(OverlayManager *); v0 = sub_02001288(v2->unk_78); @@ -930,7 +926,7 @@ static void ov97_0222DF70 (OverlayManager * param0, int * param1, int (* param2) } } -static BOOL ov97_0222DFD4 (OverlayManager * param0, UnkStruct_ov97_0222D04C * param1) +static BOOL ov97_0222DFD4(OverlayManager *param0, UnkStruct_ov97_0222D04C *param1) { int v0; @@ -956,9 +952,9 @@ static BOOL ov97_0222DFD4 (OverlayManager * param0, UnkStruct_ov97_0222D04C * pa return 1; } -static void ov97_0222E080 (OverlayManager * param0, int * param1) +static void ov97_0222E080(OverlayManager *param0, int *param1) { - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); switch (ov97_02238EAC(param0, &v0->unk_1644)) { case 0: @@ -988,9 +984,9 @@ static void ov97_0222E080 (OverlayManager * param0, int * param1) } } -void ov97_0222E13C (UnkStruct_ov97_0222D04C * param0) +void ov97_0222E13C(UnkStruct_ov97_0222D04C *param0) { - StringTemplate * v0; + StringTemplate *v0; UnkStruct_ov97_02237808 v1; int v2; @@ -1017,10 +1013,10 @@ void ov97_0222E13C (UnkStruct_ov97_0222D04C * param0) StringTemplate_Free(v0); } -static int ov97_0222E1D8 (OverlayManager * param0) +static int ov97_0222E1D8(OverlayManager *param0) { int v0; - UnkStruct_ov97_0222D04C * v1 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v1 = OverlayManager_Data(param0); if (v1->unk_80 == 3) { v0 = 21; @@ -1038,11 +1034,11 @@ static int ov97_0222E1D8 (OverlayManager * param0) return ov97_0222E228(param0, &v1->unk_18, v0, 51); } -static int ov97_0222E228 (OverlayManager * param0, Window * param1, int param2, int param3) +static int ov97_0222E228(OverlayManager *param0, Window *param1, int param2, int param3) { - StringTemplate * v0; - MessageLoader * v1; - UnkStruct_ov97_0222D04C * v2 = OverlayManager_Data(param0); + StringTemplate *v0; + MessageLoader *v1; + UnkStruct_ov97_0222D04C *v2 = OverlayManager_Data(param0); if (param1 && param2) { v1 = MessageLoader_Init(1, 26, 421, 86); @@ -1067,7 +1063,7 @@ static int ov97_0222E228 (OverlayManager * param0, Window * param1, int param2, return 50; } -static void ov97_0222E2AC (UnkStruct_ov97_0222D04C * param0) +static void ov97_0222E2AC(UnkStruct_ov97_0222D04C *param0) { switch (param0->unk_1638) { case 0: @@ -1085,9 +1081,9 @@ static void ov97_0222E2AC (UnkStruct_ov97_0222D04C * param0) } } -static int ov97_0222E2DC (OverlayManager * param0, int * param1) +static int ov97_0222E2DC(OverlayManager *param0, int *param1) { - UnkStruct_ov97_0222D04C * v0; + UnkStruct_ov97_0222D04C *v0; ov97_022301B0(param0); Heap_Create(3, 86, 0x30000); @@ -1124,7 +1120,7 @@ static int ov97_0222E2DC (OverlayManager * param0, int * param1) return 1; } -static void ov97_0222E398 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E398(UnkStruct_ov97_0222E398 *param0) { int v0 = 116; int v1 = 39; @@ -1174,9 +1170,9 @@ static void ov97_0222E398 (UnkStruct_ov97_0222E398 * param0) sub_020093B4(¶m0->unk_10[v9 + 1], v7, v7, v7, v7, 0xffffffff, 0xffffffff, 0, 0, param0->unk_0C->unk_190[0], param0->unk_0C->unk_190[1], param0->unk_0C->unk_190[2], param0->unk_0C->unk_190[3], NULL, NULL); } -static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int param1) +static GraphicElementData *ov97_0222E538(UnkStruct_ov97_0222E398 *param0, int param1) { - GraphicElementData * v0; + GraphicElementData *v0; { UnkStruct_ov115_02261520 v1; @@ -1212,7 +1208,7 @@ static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int return v0; } -static void ov97_0222E5B4 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E5B4(UnkStruct_ov97_0222E398 *param0) { param0->unk_3008.unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DMAIN); @@ -1223,15 +1219,15 @@ static void ov97_0222E5B4 (UnkStruct_ov97_0222E398 * param0) sub_02021CF8(param0->unk_3008.unk_0C, 2); { - VecFx32 * v0; + VecFx32 *v0; - v0 = ( VecFx32 * )sub_02021D28(param0->unk_3008.unk_0C); + v0 = (VecFx32 *)sub_02021D28(param0->unk_3008.unk_0C); v0->x = FX32_CONST(128); v0->y = FX32_CONST(96); } } -static void ov97_0222E60C (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E60C(UnkStruct_ov97_0222E398 *param0) { param0->unk_3054.unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DSUB); @@ -1242,27 +1238,27 @@ static void ov97_0222E60C (UnkStruct_ov97_0222E398 * param0) sub_02021CF8(param0->unk_3054.unk_0C, 2); { - VecFx32 * v0; + VecFx32 *v0; - v0 = ( VecFx32 * )sub_02021D28(param0->unk_3054.unk_0C); + v0 = (VecFx32 *)sub_02021D28(param0->unk_3054.unk_0C); v0->x = FX32_CONST(128); v0->y = FX32_CONST(0) + FX32_CONST(256); } } -static void ov97_0222E664 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E664(UnkStruct_ov97_0222E398 *param0) { sub_02021BD4(param0->unk_3008.unk_0C); param0->unk_3008.unk_0C = NULL; } -static void ov97_0222E67C (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E67C(UnkStruct_ov97_0222E398 *param0) { sub_02021BD4(param0->unk_3054.unk_0C); param0->unk_3054.unk_0C = NULL; } -static void ov97_0222E694 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E694(UnkStruct_ov97_0222E398 *param0) { int v0; @@ -1285,7 +1281,7 @@ static void ov97_0222E694 (UnkStruct_ov97_0222E398 * param0) } } -static void ov97_0222E6F8 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E6F8(UnkStruct_ov97_0222E398 *param0) { int v0; @@ -1296,7 +1292,7 @@ static void ov97_0222E6F8 (UnkStruct_ov97_0222E398 * param0) } } -static void ov97_0222E734 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E734(UnkStruct_ov97_0222E398 *param0) { int v0; @@ -1311,7 +1307,7 @@ static void ov97_0222E734 (UnkStruct_ov97_0222E398 * param0) } } -static void ov97_0222E77C (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E77C(UnkStruct_ov97_0222E398 *param0) { int v0; @@ -1322,7 +1318,7 @@ static void ov97_0222E77C (UnkStruct_ov97_0222E398 * param0) } } -static void ov97_0222E7B4 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E7B4(UnkStruct_ov97_0222E398 *param0) { int v0; @@ -1337,7 +1333,7 @@ static void ov97_0222E7B4 (UnkStruct_ov97_0222E398 * param0) } } -static void ov97_0222E7E4 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E7E4(UnkStruct_ov97_0222E398 *param0) { int v0; @@ -1348,7 +1344,7 @@ static void ov97_0222E7E4 (UnkStruct_ov97_0222E398 * param0) } } -static void ov97_0222E814 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222E814(UnkStruct_ov97_0222E398 *param0) { int v0; VecFx32 v1; @@ -1412,7 +1408,7 @@ static void ov97_0222E814 (UnkStruct_ov97_0222E398 * param0) param0->unk_88[v0].unk_40 = param0->unk_88[v0].unk_38; param0->unk_88[v0].unk_44 = param0->unk_88[v0].unk_38; - v1 = *( VecFx32 *)sub_02021D28(param0->unk_88[v0].unk_0C); + v1 = *(VecFx32 *)sub_02021D28(param0->unk_88[v0].unk_0C); v1.x = FX32_CONST(16 + (LCRNG_Next() % (256 - 32))); v1.y = FX32_CONST(0); @@ -1423,7 +1419,7 @@ static void ov97_0222E814 (UnkStruct_ov97_0222E398 * param0) } } -static void ov97_0222EA68 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222EA68(UnkStruct_ov97_0222E398 *param0) { int v0; VecFx32 v1; @@ -1474,7 +1470,7 @@ static void ov97_0222EA68 (UnkStruct_ov97_0222E398 * param0) } } -static void ov97_0222EBD0 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222EBD0(UnkStruct_ov97_0222E398 *param0) { int v0; VecFx32 v1; @@ -1516,7 +1512,7 @@ static void ov97_0222EBD0 (UnkStruct_ov97_0222E398 * param0) param0->unk_1848[v0].unk_40 = param0->unk_1848[v0].unk_38; param0->unk_1848[v0].unk_44 = param0->unk_1848[v0].unk_38; - v1 = *( VecFx32 *)sub_02021D28(param0->unk_1848[v0].unk_0C); + v1 = *(VecFx32 *)sub_02021D28(param0->unk_1848[v0].unk_0C); v1.x = FX32_CONST(128); v1.y = FX32_CONST(384); @@ -1528,7 +1524,7 @@ static void ov97_0222EBD0 (UnkStruct_ov97_0222E398 * param0) } } -static BOOL ov97_0222EDC0 (s16 param0, s16 param1, f32 param2, f32 param3, f32 * param4, f32 * param5, f32 param6, s16 param7) +static BOOL ov97_0222EDC0(s16 param0, s16 param1, f32 param2, f32 param3, f32 *param4, f32 *param5, f32 param6, s16 param7) { f32 v0; f32 v1; @@ -1563,9 +1559,9 @@ static BOOL ov97_0222EDC0 (s16 param0, s16 param1, f32 param2, f32 param3, f32 * return 1; } -static void ov97_0222EEB8 (SysTask * param0, void * param1) +static void ov97_0222EEB8(SysTask *param0, void *param1) { - UnkStruct_ov97_0222EEB8 * v0 = ( UnkStruct_ov97_0222EEB8 * )param1; + UnkStruct_ov97_0222EEB8 *v0 = (UnkStruct_ov97_0222EEB8 *)param1; VecFx32 v1; f32 v2, v3; @@ -1580,7 +1576,7 @@ static void ov97_0222EEB8 (SysTask * param0, void * param1) { BOOL v4; - v1 = *(( VecFx32 * )sub_02021D28(v0->unk_0C)); + v1 = *((VecFx32 *)sub_02021D28(v0->unk_0C)); v4 = ov97_0222EDC0(v0->unk_10.x >> FX32_SHIFT, v0->unk_10.y >> FX32_SHIFT, FX_FX32_TO_F32(v1.x), FX_FX32_TO_F32(v1.y), &v2, &v3, FX_FX32_TO_F32(v0->unk_1C), FX_FX32_TO_F32(v0->unk_20)); if (v4 && (v0->unk_24 == 0)) { @@ -1675,29 +1671,29 @@ static void ov97_0222EEB8 (SysTask * param0, void * param1) } } -static void ov97_0222F348 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222F348(UnkStruct_ov97_0222E398 *param0) { G2_SetBlendBrightness((GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BD), param0->unk_08); } -static void ov97_0222F360 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222F360(UnkStruct_ov97_0222E398 *param0) { G2S_SetBlendBrightness((GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BD), param0->unk_08); } -static void ov97_0222F378 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222F378(UnkStruct_ov97_0222E398 *param0) { ov97_0222F348(param0); ov97_0222F360(param0); } -static void ov97_0222F388 (void) +static void ov97_0222F388(void) { sub_0201975C(1, 0x0); sub_0201975C(5, 0x0); } -static BOOL ov97_0222F39C (UnkStruct_ov97_0222E398 * param0, int param1, s8 param2) +static BOOL ov97_0222F39C(UnkStruct_ov97_0222E398 *param0, int param1, s8 param2) { BOOL v0 = 1; @@ -1741,7 +1737,7 @@ static BOOL ov97_0222F39C (UnkStruct_ov97_0222E398 * param0, int param1, s8 para return v0; } -static BOOL ov97_0222F410 (UnkStruct_ov97_0222E398 * param0, int param1, s8 param2) +static BOOL ov97_0222F410(UnkStruct_ov97_0222E398 *param0, int param1, s8 param2) { BOOL v0 = 1; @@ -1786,7 +1782,7 @@ static BOOL ov97_0222F410 (UnkStruct_ov97_0222E398 * param0, int param1, s8 para return v0; } -static void ov97_0222F484 (UnkStruct_ov97_0222E398 * param0) +static void ov97_0222F484(UnkStruct_ov97_0222E398 *param0) { param0->unk_08 = 0; @@ -1800,29 +1796,24 @@ static void ov97_0222F484 (UnkStruct_ov97_0222E398 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov97_0222F4BC (SysTask * param0, void * param1) +static void ov97_0222F4BC(SysTask *param0, void *param1) { - UnkStruct_ov97_0222E398 * v0 = ( UnkStruct_ov97_0222E398 * )param1; + UnkStruct_ov97_0222E398 *v0 = (UnkStruct_ov97_0222E398 *)param1; BOOL v1; switch (v0->unk_00) { - case 0: - { + case 0: { ov97_0222F484(v0); v0->unk_00 = 1; - } - break; - case 1: - { + } break; + case 1: { v1 = ov97_0222F39C(v0, 1, 2); if (v1) { v0->unk_00 = 2; } - } - break; - case 2: - { + } break; + case 2: { int v2; int v3; @@ -1850,8 +1841,7 @@ static void ov97_0222F4BC (SysTask * param0, void * param1) v0->unk_00 = 3; ov97_0222E7B4(v0); } - } - break; + } break; case 3: if (*(v0->unk_30A0) == 2) { ov97_0222E734(v0); @@ -1861,8 +1851,7 @@ static void ov97_0222F4BC (SysTask * param0, void * param1) v0->unk_00 = 4; } break; - case 4: - { + case 4: { int v4; int v5 = 0; @@ -1889,8 +1878,7 @@ static void ov97_0222F4BC (SysTask * param0, void * param1) ov97_0222E7B4(v0); ov97_0222E60C(v0); } - } - break; + } break; case 5: v1 = ov97_0222F410(v0, 2, 2); @@ -1899,10 +1887,9 @@ static void ov97_0222F4BC (SysTask * param0, void * param1) v0->unk_00 = 6; } break; - case 6: - { - VecFx32 * v6; - VecFx32 * v7; + case 6: { + VecFx32 *v6; + VecFx32 *v7; fx32 v8; v1 = ov97_0222F410(v0, 1, 2); @@ -1911,8 +1898,8 @@ static void ov97_0222F4BC (SysTask * param0, void * param1) break; } - v6 = ( VecFx32 * )sub_02021D28(v0->unk_3008.unk_0C); - v7 = ( VecFx32 * )sub_02021D28(v0->unk_3054.unk_0C); + v6 = (VecFx32 *)sub_02021D28(v0->unk_3008.unk_0C); + v7 = (VecFx32 *)sub_02021D28(v0->unk_3054.unk_0C); if (v6->y < FX32_CONST(256 - 32)) { v6->y += FX32_CONST(8); @@ -1935,10 +1922,8 @@ static void ov97_0222F4BC (SysTask * param0, void * param1) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); } } - } - break; - case 7: - { + } break; + case 7: { int v9; int v10 = 0; @@ -1970,26 +1955,21 @@ static void ov97_0222F4BC (SysTask * param0, void * param1) ov97_0222E7E4(v0); ov97_0222E67C(v0); } - } - break; - case 8: - { + } break; + case 8: { v1 = ov97_0222F39C(v0, 2, 1); if (v1) { v0->unk_00 = 9; } - } - break; - case 9: - { + } break; + case 9: { v1 = ov97_0222F39C(v0, 0, 2); if (v1) { v0->unk_00 = 255; } - } - break; + } break; default: *(v0->unk_30A0) = 0; SysTask_Done(param0); @@ -2000,11 +1980,11 @@ static void ov97_0222F4BC (SysTask * param0, void * param1) ov97_0222E694(v0); } -static int ov97_0222F75C (OverlayManager * param0, int * param1) +static int ov97_0222F75C(OverlayManager *param0, int *param1) { u32 v0, v1; - UnkStruct_0202DF40 * v2; - UnkStruct_ov97_0222D04C * v3 = OverlayManager_Data(param0); + UnkStruct_0202DF40 *v2; + UnkStruct_ov97_0222D04C *v3 = OverlayManager_Data(param0); CTRDG_IsExisting(); @@ -2087,7 +2067,7 @@ static int ov97_0222F75C (OverlayManager * param0, int * param1) ov97_0222D444(&v3->unk_58, 0); { - UnkStruct_ov97_0222E398 * v4 = Heap_AllocFromHeap(86, sizeof(UnkStruct_ov97_0222E398)); + UnkStruct_ov97_0222E398 *v4 = Heap_AllocFromHeap(86, sizeof(UnkStruct_ov97_0222E398)); memset(v4, 0, sizeof(UnkStruct_ov97_0222E398)); @@ -2103,16 +2083,13 @@ static int ov97_0222F75C (OverlayManager * param0, int * param1) *param1 = 34; break; - case 35: - { + case 35: { if (v3->unk_2A54 == 0) { *param1 = ov97_0222E228(param0, &v3->unk_18, 8, 55); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); } - } - break; - case 34: - { + } break; + case 34: { int v5; v5 = ov97_02238528(); @@ -2146,8 +2123,7 @@ static int ov97_0222F75C (OverlayManager * param0, int * param1) v3->unk_8C.unk_00.unk_4E_2 = 0; *param1 = ov97_0222E228(param0, &v3->unk_18, 26, 55); } - } - break; + } break; case 36: ov97_022302F4(v3); @@ -2449,24 +2425,24 @@ static int ov97_0222F75C (OverlayManager * param0, int * param1) return 0; } -OverlayManager * ov97_022301A4 (void) +OverlayManager *ov97_022301A4(void) { return Unk_ov97_0223F1B0; } -void ov97_022301B0 (OverlayManager * param0) +void ov97_022301B0(OverlayManager *param0) { Unk_ov97_0223F1B0 = param0; } extern const OverlayManagerTemplate Unk_ov97_0223D7AC; -static int ov97_022301BC (OverlayManager * param0, int * param1) +static int ov97_022301BC(OverlayManager *param0, int *param1) { FS_EXTERN_OVERLAY(overlay77); FS_EXTERN_OVERLAY(overlay97); - UnkStruct_ov97_0222D04C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v0 = OverlayManager_Data(param0); if (v0->unk_440 == 0) { sub_02000EC4(FS_OVERLAY_ID(overlay77), &Unk_ov77_021D742C); @@ -2487,7 +2463,7 @@ static int ov97_022301BC (OverlayManager * param0, int * param1) return 1; } -static void ov97_02230224 (UnkStruct_ov97_0222D04C * param0) +static void ov97_02230224(UnkStruct_ov97_0222D04C *param0) { int v0; @@ -2514,7 +2490,7 @@ static void ov97_02230224 (UnkStruct_ov97_0222D04C * param0) } } -static void ov97_02230280 (int param0) +static void ov97_02230280(int param0) { switch (param0) { case 0: @@ -2539,7 +2515,7 @@ static void ov97_02230280 (int param0) } } -static void ov97_022302D4 (void) +static void ov97_022302D4(void) { sub_020334CC(); Heap_FreeToHeap(Unk_ov97_0223F1AC); @@ -2548,7 +2524,7 @@ static void ov97_022302D4 (void) Unk_ov97_0223F1AC = NULL; } -static void ov97_022302F4 (UnkStruct_ov97_0222D04C * param0) +static void ov97_022302F4(UnkStruct_ov97_0222D04C *param0) { if (Unk_ov97_0223F1A8 == 44) { ov97_022302D4(); diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index 956bc26176..7c82054d47 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -1,76 +1,71 @@ #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202442C_decl.h" -#include "trainer_info.h" -#include "savedata.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0202DBAC.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "overlay097/ov97_0222D04C.h" +#include "overlay097/ov97_02232054.h" +#include "overlay097/ov97_02237694.h" #include "overlay097/struct_ov97_0222D04C.h" #include "overlay097/struct_ov97_0222D250.h" #include "overlay097/union_ov97_0222D2B0.h" +#include "savedata/save_table.h" +#include "buffer_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "overlay_manager.h" +#include "pokemon_icon.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02000C88.h" #include "unk_0200112C.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "overlay_manager.h" #include "unk_02006E3C.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "buffer_manager.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "savedata/save_table.h" -#include "savedata.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_0202DAB4.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "pokemon_icon.h" -#include "overlay097/ov97_0222D04C.h" -#include "overlay097/ov97_02232054.h" -#include "overlay097/ov97_02237694.h" FS_EXTERN_OVERLAY(overlay97); typedef struct { u16 unk_00[2][768]; - BufferManager * bufferManager; - SysTask * unk_C04; + BufferManager *bufferManager; + SysTask *unk_C04; fx32 unk_C08; fx32 unk_C0C; BOOL unk_C10; @@ -80,47 +75,47 @@ typedef struct { typedef struct { int unk_00; UnkStruct_ov97_0222D04C unk_04; - BGL * unk_2A5C; - StringTemplate * unk_2A60; - MessageLoader * unk_2A64; + BGL *unk_2A5C; + StringTemplate *unk_2A60; + MessageLoader *unk_2A64; Window unk_2A68[20]; int unk_2BA8[20]; int unk_2BF8; - void * unk_2BFC; - MysteryGift * unk_2C00; - SaveData * unk_2C04; - Options * unk_2C08; + void *unk_2BFC; + MysteryGift *unk_2C00; + SaveData *unk_2C04; + Options *unk_2C08; int unk_2C0C; int unk_2C10; - UnkStruct_0202DBAC * unk_2C14[3]; + UnkStruct_0202DBAC *unk_2C14[3]; int unk_2C20; int unk_2C24; - BmpList * unk_2C28; - ResourceMetadata * unk_2C2C; + BmpList *unk_2C28; + ResourceMetadata *unk_2C2C; Window unk_2C30; Window unk_2C40; int unk_2C50; int unk_2C54; u32 unk_2C58[4]; - TrainerInfo * unk_2C68[5]; + TrainerInfo *unk_2C68[5]; int unk_2C7C[5]; int unk_2C90; int unk_2C94; - void (* unk_2C98)(void *); + void (*unk_2C98)(void *); int unk_2C9C; int unk_2CA0; - GraphicElementManager * unk_2CA4; + GraphicElementManager *unk_2CA4; UnkStruct_0200C738 unk_2CA8; - UnkStruct_02009714 * unk_2E34[6]; - UnkStruct_02009DC8 * unk_2E4C[6]; + UnkStruct_02009714 *unk_2E34[6]; + UnkStruct_02009DC8 *unk_2E4C[6]; UnkStruct_ov19_021DA864 unk_2E64; - GraphicElementData * unk_2E88[2]; - GraphicElementData * unk_2E90[3]; + GraphicElementData *unk_2E88[2]; + GraphicElementData *unk_2E90[3]; UnkUnion_ov97_0222D2B0 unk_2E9C; UnkStruct_ov97_02231318 unk_31F4; - void (* unk_3E0C)(void *); + void (*unk_3E0C)(void *); int unk_3E10; - void * unk_3E14; + void *unk_3E14; } UnkStruct_ov97_02230868; typedef struct { @@ -138,83 +133,87 @@ typedef struct { int unk_18; int unk_1C; u32 unk_20; - BOOL (* unk_24)(UnkStruct_ov97_02230868 *, Window *, u32); + + // clang-format off + BOOL(*unk_24)(UnkStruct_ov97_02230868 *, Window *, u32); + // clang-format on + int unk_28; int unk_2C; } UnkStruct_ov97_0223E680; -void Strbuf_CopyNumChars(Strbuf *param0, const u16 * param1, u32 param2); -MysteryGift * SaveData_MysteryGift(SaveData * param0); -void ov97_02231FFC(BGL * param0, void *, int param2); -static int ov97_02230728(OverlayManager * param0); -static int ov97_022306F4(OverlayManager * param0); -static int ov97_02230834(OverlayManager * param0); -static int ov97_02230778(OverlayManager * param0); -static void ov97_02230868(UnkStruct_ov97_02230868 * param0); -static BOOL ov97_022308B0(UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2); -static BOOL ov97_022308B4(UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2); -static BOOL ov97_02230904(UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2); -static BOOL ov97_0223097C(UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2); -static BOOL ov97_022309E4(UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2); -static BOOL ov97_02230A34(UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2); -static BOOL ov97_02230AB0(UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2); -static BOOL ov97_02230B94(UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2); -static BOOL ov97_02230BAC(UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2); -static BOOL ov97_02230BF0(UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2); -static int ov97_02231CA0(UnkStruct_ov97_02230868 * param0, Window * param1); -static void ov97_02231E78(UnkStruct_ov97_02230868 * param0, Window * param1, int param2); -static void ov97_02231F1C(UnkStruct_ov97_02230868 * param0, int * param1, int param2); -static int ov97_02230E04(UnkStruct_ov97_02230868 * param0, Window * param1, int param2, int param3); -static void ov97_02230F98(UnkStruct_ov97_02230868 * param0, int param1); -static int ov97_02230F20(UnkStruct_ov97_02230868 * param0, int param1, int param2); -static void ov97_02230C44(UnkStruct_ov97_02230868 * param0, int param1, int param2); -static int ov97_02231BD8(UnkStruct_ov97_02230868 * param0); -static void ov97_022310FC(UnkStruct_ov97_02230868 * param0); -static void ov97_02230438(UnkStruct_ov97_02230868 * param0); -static int ov97_02231C84(UnkStruct_ov97_02230868 * param0); +void Strbuf_CopyNumChars(Strbuf *param0, const u16 *param1, u32 param2); +MysteryGift *SaveData_MysteryGift(SaveData *param0); +void ov97_02231FFC(BGL *param0, void *, int param2); +static int ov97_02230728(OverlayManager *param0); +static int ov97_022306F4(OverlayManager *param0); +static int ov97_02230834(OverlayManager *param0); +static int ov97_02230778(OverlayManager *param0); +static void ov97_02230868(UnkStruct_ov97_02230868 *param0); +static BOOL ov97_022308B0(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2); +static BOOL ov97_022308B4(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2); +static BOOL ov97_02230904(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2); +static BOOL ov97_0223097C(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2); +static BOOL ov97_022309E4(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2); +static BOOL ov97_02230A34(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2); +static BOOL ov97_02230AB0(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2); +static BOOL ov97_02230B94(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2); +static BOOL ov97_02230BAC(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2); +static BOOL ov97_02230BF0(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2); +static int ov97_02231CA0(UnkStruct_ov97_02230868 *param0, Window *param1); +static void ov97_02231E78(UnkStruct_ov97_02230868 *param0, Window *param1, int param2); +static void ov97_02231F1C(UnkStruct_ov97_02230868 *param0, int *param1, int param2); +static int ov97_02230E04(UnkStruct_ov97_02230868 *param0, Window *param1, int param2, int param3); +static void ov97_02230F98(UnkStruct_ov97_02230868 *param0, int param1); +static int ov97_02230F20(UnkStruct_ov97_02230868 *param0, int param1, int param2); +static void ov97_02230C44(UnkStruct_ov97_02230868 *param0, int param1, int param2); +static int ov97_02231BD8(UnkStruct_ov97_02230868 *param0); +static void ov97_022310FC(UnkStruct_ov97_02230868 *param0); +static void ov97_02230438(UnkStruct_ov97_02230868 *param0); +static int ov97_02231C84(UnkStruct_ov97_02230868 *param0); UnkStruct_ov97_0223E680 Unk_ov97_0223E680[] = { - {0x0, 0x2, 0x2, 0xC, 0x2, 0x1, 0x10200, -1, 0x24, ov97_022308B0}, - {0x0, 0x6, 0x11, 0xB, 0x2, 0x1, 0xF0200, -1, 0x28, ov97_022308B0}, - {0x0, 0x2, 0x9, 0x1C, 0x4, 0x1, 0x10200, -1, NULL, ov97_02230904}, - {0x0, 0x2, 0x6, 0x1C, 0x2, 0x1, 0xF0200, -1, NULL, ov97_022308B4}, - {0x0, 0x12, 0x11, 0xB, 0x2, 0x1, 0x10200, -1, 0x31, ov97_0223097C}, - {0x1, 0x2, 0x3, 0x1C, 0xA, 0x1, 0x10200, -1, NULL, ov97_022309E4}, - {0x1, 0x2, 0xE, 0x1C, 0x4, 0x1, 0x10200, -1, 0x29, ov97_02230A34}, - {0x2, 0x2, 0x13, 0x1B, 0x4, 0x1, 0x10200, 0xF, 0x24, ov97_022308B0}, - {0x2, 0x12, 0x9, 0xC, 0x8, 0x1, 0x10200, 0x5, NULL, ov97_02230AB0}, - {0x2, 0x18, 0xD, 0x6, 0x4, 0x1, 0x10200, 0x5, NULL, ov97_02230B94}, - {0x2, 0x18, 0xD, 0x6, 0x4, 0x1, 0x10200, 0x5, NULL, ov97_02230BAC}, - {0x3, 0x1, 0x1, 0x19, 0x2, 0x0, 0xE0F00, -1, 0x34, ov97_022308B0, 0x7, 0x0}, - {0x3, 0x17, 0x7, 0x9, 0x4, 0x0, 0xE0F00, -1, 0x37, ov97_022308B0, 0x2, 0x0}, - {0x3, 0x6, 0x14, 0x6, 0x2, 0x0, 0xE0F00, -1, 0x39, ov97_022308B0, -1, 0x1}, - {0x3, 0x14, 0x14, 0x6, 0x2, 0x0, 0xE0F00, -1, 0x3A, ov97_022308B0, -1, 0x1}, - {0x3, 0x19, 0xC, 0x4, 0x2, 0x1, 0x10200, -1, 0x38, ov97_02230BF0}, - {0x3, 0x2, 0x5, 0x13, 0xB, 0x0, 0x10200, -1, NULL, ov97_022308B0}, - {0x2, 0x2, 0x13, 0x1B, 0x4, 0x1, 0x10200, 0xE, 0x3B, ov97_022308B0}, - {0x2, 0x2, 0x13, 0x1B, 0x4, 0x1, 0x10200, 0xE, 0x3C, ov97_022308B0} + { 0x0, 0x2, 0x2, 0xC, 0x2, 0x1, 0x10200, -1, 0x24, ov97_022308B0 }, + { 0x0, 0x6, 0x11, 0xB, 0x2, 0x1, 0xF0200, -1, 0x28, ov97_022308B0 }, + { 0x0, 0x2, 0x9, 0x1C, 0x4, 0x1, 0x10200, -1, NULL, ov97_02230904 }, + { 0x0, 0x2, 0x6, 0x1C, 0x2, 0x1, 0xF0200, -1, NULL, ov97_022308B4 }, + { 0x0, 0x12, 0x11, 0xB, 0x2, 0x1, 0x10200, -1, 0x31, ov97_0223097C }, + { 0x1, 0x2, 0x3, 0x1C, 0xA, 0x1, 0x10200, -1, NULL, ov97_022309E4 }, + { 0x1, 0x2, 0xE, 0x1C, 0x4, 0x1, 0x10200, -1, 0x29, ov97_02230A34 }, + { 0x2, 0x2, 0x13, 0x1B, 0x4, 0x1, 0x10200, 0xF, 0x24, ov97_022308B0 }, + { 0x2, 0x12, 0x9, 0xC, 0x8, 0x1, 0x10200, 0x5, NULL, ov97_02230AB0 }, + { 0x2, 0x18, 0xD, 0x6, 0x4, 0x1, 0x10200, 0x5, NULL, ov97_02230B94 }, + { 0x2, 0x18, 0xD, 0x6, 0x4, 0x1, 0x10200, 0x5, NULL, ov97_02230BAC }, + { 0x3, 0x1, 0x1, 0x19, 0x2, 0x0, 0xE0F00, -1, 0x34, ov97_022308B0, 0x7, 0x0 }, + { 0x3, 0x17, 0x7, 0x9, 0x4, 0x0, 0xE0F00, -1, 0x37, ov97_022308B0, 0x2, 0x0 }, + { 0x3, 0x6, 0x14, 0x6, 0x2, 0x0, 0xE0F00, -1, 0x39, ov97_022308B0, -1, 0x1 }, + { 0x3, 0x14, 0x14, 0x6, 0x2, 0x0, 0xE0F00, -1, 0x3A, ov97_022308B0, -1, 0x1 }, + { 0x3, 0x19, 0xC, 0x4, 0x2, 0x1, 0x10200, -1, 0x38, ov97_02230BF0 }, + { 0x3, 0x2, 0x5, 0x13, 0xB, 0x0, 0x10200, -1, NULL, ov97_022308B0 }, + { 0x2, 0x2, 0x13, 0x1B, 0x4, 0x1, 0x10200, 0xE, 0x3B, ov97_022308B0 }, + { 0x2, 0x2, 0x13, 0x1B, 0x4, 0x1, 0x10200, 0xE, 0x3C, ov97_022308B0 } }; UnkStruct_ov97_0223E640 Unk_ov97_0223E640[] = { - {0x2A, (u32)6}, - {0x2B, (u32)ov97_022306F4}, - {0x2C, (u32)ov97_02230728}, - {0x2D, (u32)11} + { 0x2A, (u32)6 }, + { 0x2B, (u32)ov97_022306F4 }, + { 0x2C, (u32)ov97_02230728 }, + { 0x2D, (u32)11 } }; UnkStruct_ov97_0223E640 Unk_ov97_0223E610[] = { - {0x40, (u32)ov97_02230778}, - {0x41, (u32)ov97_02230834} + { 0x40, (u32)ov97_02230778 }, + { 0x41, (u32)ov97_02230834 } }; UnkStruct_ov97_0223E640 Unk_ov97_0223E630[] = { - {0x40, (u32)14}, - {0x41, (u32)ov97_02230834} + { 0x40, (u32)14 }, + { 0x41, (u32)ov97_02230834 } }; UnkStruct_ov97_0223E640 Unk_ov97_0223E620[] = { - {0x40, (u32)15}, - {0x41, (u32)ov97_02230834} + { 0x40, (u32)15 }, + { 0x41, (u32)ov97_02230834 } }; static UnkStruct_ov84_02240FA8 Unk_ov97_0223E660 = { @@ -238,7 +237,7 @@ static UnkStruct_ov84_02240FA8 Unk_ov97_0223E660 = { 0x0 }; -static void ov97_02230410 (UnkStruct_ov97_02230868 * param0) +static void ov97_02230410(UnkStruct_ov97_02230868 *param0) { ov97_02230438(param0); ov97_02237A20(); @@ -246,7 +245,7 @@ static void ov97_02230410 (UnkStruct_ov97_02230868 * param0) ov97_02237B0C(116, 15, 12, 14, 13, 0); } -static void ov97_02230438 (UnkStruct_ov97_02230868 * param0) +static void ov97_02230438(UnkStruct_ov97_02230868 *param0) { if (param0->unk_2E88[0]) { sub_02021BD4(param0->unk_2E88[0]); @@ -274,7 +273,7 @@ static void ov97_02230438 (UnkStruct_ov97_02230868 * param0) ov97_02237DA0(); } -static void ov97_022304AC (UnkStruct_ov97_02230868 * param0) +static void ov97_022304AC(UnkStruct_ov97_02230868 *param0) { param0->unk_3E10 = 0; param0->unk_2E88[0] = ov97_02237D14(0, param0->unk_2E88[0], 72, 168, 1); @@ -284,21 +283,21 @@ static void ov97_022304AC (UnkStruct_ov97_02230868 * param0) sub_02021E80(param0->unk_2E88[1], 2); } -static void ov97_02230500 (Window * param0, u8 param1) +static void ov97_02230500(Window *param0, u8 param1) { if (BGL_WindowAdded(param0) == 1) { Window_Clear(param0, param1); } } -static void ov97_02230518 (Window * param0, u8 param1) +static void ov97_02230518(Window *param0, u8 param1) { if (BGL_WindowAdded(param0) == 1) { sub_0200E084(param0, param1); } } -static void ov97_02230530 (UnkStruct_ov97_02230868 * param0, UnkStruct_ov97_0223E640 * param1, int param2, Window * param3, int param4) +static void ov97_02230530(UnkStruct_ov97_02230868 *param0, UnkStruct_ov97_0223E640 *param1, int param2, Window *param3, int param4) { int v0; UnkStruct_ov84_02240FA8 v1; @@ -329,11 +328,11 @@ static void ov97_02230530 (UnkStruct_ov97_02230868 * param0, UnkStruct_ov97_0223 param0->unk_2C28 = sub_0200112C(&v1, 0, param4, 87); } -static void ov97_022305EC (Window * param0, int param1) +static void ov97_022305EC(Window *param0, int param1) { - Strbuf* v0; - MessageLoader * v1 = MessageLoader_Init(1, 26, 421, 87); - StringTemplate * v2 = StringTemplate_Default(87); + Strbuf *v0; + MessageLoader *v1 = MessageLoader_Init(1, 26, 421, 87); + StringTemplate *v2 = StringTemplate_Default(87); BGL_FillWindow(param0, sub_02002DF8(1, 6)); @@ -346,7 +345,7 @@ static void ov97_022305EC (Window * param0, int param1) StringTemplate_Free(v2); } -static void ov97_02230664 (BGL * param0) +static void ov97_02230664(BGL *param0) { sub_02006E84(116, 11, 0, 16 * 2 * 15, 16 * 2, 87); sub_02006E84(116, 16, 0, 16 * 2 * 12, 16 * 2, 87); @@ -356,9 +355,9 @@ static void ov97_02230664 (BGL * param0) sub_02019448(param0, 1); } -static int ov97_022306F4 (OverlayManager * param0) +static int ov97_022306F4(OverlayManager *param0) { - UnkStruct_ov97_02230868 * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_02230868 *v0 = OverlayManager_Data(param0); ov97_02230868(v0); ov97_022305EC(&v0->unk_2C30, 46); @@ -367,9 +366,9 @@ static int ov97_022306F4 (OverlayManager * param0) return 13; } -static int ov97_02230728 (OverlayManager * param0) +static int ov97_02230728(OverlayManager *param0) { - UnkStruct_ov97_02230868 * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_02230868 *v0 = OverlayManager_Data(param0); ov97_02230868(v0); @@ -383,9 +382,9 @@ static int ov97_02230728 (OverlayManager * param0) return 12; } -static int ov97_02230778 (OverlayManager * param0) +static int ov97_02230778(OverlayManager *param0) { - UnkStruct_ov97_02230868 * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_02230868 *v0 = OverlayManager_Data(param0); ov97_02230868(v0); ov97_022305EC(&v0->unk_2C30, 63); @@ -414,9 +413,9 @@ static int ov97_02230778 (OverlayManager * param0) return 5; } -static int ov97_02230834 (OverlayManager * param0) +static int ov97_02230834(OverlayManager *param0) { - UnkStruct_ov97_02230868 * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_02230868 *v0 = OverlayManager_Data(param0); ov97_02230868(v0); ov97_022305EC(&v0->unk_2C30, 36); @@ -425,22 +424,25 @@ static int ov97_02230834 (OverlayManager * param0) return 5; } -static void ov97_02230868 (UnkStruct_ov97_02230868 * param0) +static void ov97_02230868(UnkStruct_ov97_02230868 *param0) { - sub_02013A3C(param0->unk_2C2C); param0->unk_2C2C = NULL; - sub_02001384(param0->unk_2C28, NULL, NULL); param0->unk_2C28 = NULL; + sub_02013A3C(param0->unk_2C2C); + param0->unk_2C2C = NULL; + sub_02001384(param0->unk_2C28, NULL, NULL); + param0->unk_2C28 = NULL; ov97_02230500(¶m0->unk_2C40, 0); - sub_0201ACF4(¶m0->unk_2C40); BGL_DeleteWindow(¶m0->unk_2C40); + sub_0201ACF4(¶m0->unk_2C40); + BGL_DeleteWindow(¶m0->unk_2C40); } -static BOOL ov97_022308B0 (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_022308B0(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { return 1; } -static BOOL ov97_022308B4 (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_022308B4(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { - Strbuf* v0; + Strbuf *v0; v0 = Strbuf_Init(36 + 1, param0->unk_00); @@ -451,10 +453,10 @@ static BOOL ov97_022308B4 (UnkStruct_ov97_02230868 * param0, Window * param1, u3 return 1; } -static BOOL ov97_02230904 (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_02230904(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { - Strbuf* v0; - UnkStruct_0202DBAC * v1 = param0->unk_2C14[param0->unk_2C20]; + Strbuf *v0; + UnkStruct_0202DBAC *v1 = param0->unk_2C14[param0->unk_2C20]; int v2; if (v1->unk_104.unk_4E_3 == 0) { @@ -475,7 +477,7 @@ static BOOL ov97_02230904 (UnkStruct_ov97_02230868 * param0, Window * param1, u3 return 1; } -static BOOL ov97_0223097C (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_0223097C(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { RTCDate v0; @@ -488,9 +490,9 @@ static BOOL ov97_0223097C (UnkStruct_ov97_02230868 * param0, Window * param1, u3 return 1; } -static BOOL ov97_022309E4 (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_022309E4(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { - Strbuf* v0; + Strbuf *v0; v0 = Strbuf_Init(250 + 1, 87); @@ -501,10 +503,10 @@ static BOOL ov97_022309E4 (UnkStruct_ov97_02230868 * param0, Window * param1, u3 return 0; } -static BOOL ov97_02230A34 (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_02230A34(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { if (param0->unk_2C14[param0->unk_2C20]->unk_348 == 255) { - Strbuf* v0; + Strbuf *v0; v0 = MessageUtil_ExpandedStrbuf(param0->unk_2A60, param0->unk_2A64, 51, 87); sub_0201D78C(param1, 1, v0, 0, 0, 0xff, param2, NULL); @@ -518,10 +520,10 @@ static BOOL ov97_02230A34 (UnkStruct_ov97_02230868 * param0, Window * param1, u3 } } -static BOOL ov97_02230AB0 (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_02230AB0(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { UnkStruct_ov97_0223E640 v0[4]; - UnkStruct_ov97_0223E680 * v1; + UnkStruct_ov97_0223E680 *v1; int v2 = 0; v0[v2++] = Unk_ov97_0223E640[0]; @@ -535,26 +537,27 @@ static BOOL ov97_02230AB0 (UnkStruct_ov97_02230868 * param0, Window * param1, u3 v1 = param0->unk_2BFC; - sub_0201ACF4(param1); BGL_DeleteWindow(param1); + sub_0201ACF4(param1); + BGL_DeleteWindow(param1); BGL_AddWindow(param0->unk_2A5C, param1, 2, v1->unk_04, v1->unk_08 + (4 - v2) * 2, v1->unk_0C, v1->unk_10 - (4 - v2) * 2, 15, param0->unk_2BF8); ov97_02230530(param0, v0, v2, param1, 0); return 1; } -static BOOL ov97_02230B94 (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_02230B94(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { ov97_02230530(param0, Unk_ov97_0223E610, 2, param1, 1); return 1; } -static BOOL ov97_02230BAC (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_02230BAC(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { ov97_02230530(param0, Unk_ov97_0223E630, 2, param1, 0); return 1; } -static BOOL ov97_02230BC4 (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_02230BC4(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { ov97_022305EC(¶m0->unk_2C30, 2); ov97_02230530(param0, Unk_ov97_0223E620, 2, param1, 0); @@ -562,13 +565,13 @@ static BOOL ov97_02230BC4 (UnkStruct_ov97_02230868 * param0, Window * param1, u3 return 1; } -static BOOL ov97_02230BF0 (UnkStruct_ov97_02230868 * param0, Window * param1, u32 param2) +static BOOL ov97_02230BF0(UnkStruct_ov97_02230868 *param0, Window *param1, u32 param2) { StringTemplate_SetNumber(param0->unk_2A60, 0, 0, 1, 1, 1); return 1; } -static void ov97_02230C10 (UnkStruct_ov97_02230868 * param0, int param1, int param2, int * param3) +static void ov97_02230C10(UnkStruct_ov97_02230868 *param0, int param1, int param2, int *param3) { sub_0200F174(0, param1, param1, 0x0, 6, 1, 87); @@ -579,12 +582,12 @@ static void ov97_02230C10 (UnkStruct_ov97_02230868 * param0, int param1, int par param0->unk_2CA0 = param2; } -static void ov97_02230C44 (UnkStruct_ov97_02230868 * param0, int param1, int param2) +static void ov97_02230C44(UnkStruct_ov97_02230868 *param0, int param1, int param2) { int v0, v1; - Strbuf* v2; + Strbuf *v2; u32 v3; - UnkStruct_ov97_0223E680 * v4 = Unk_ov97_0223E680; + UnkStruct_ov97_0223E680 *v4 = Unk_ov97_0223E680; param0->unk_2A64 = MessageLoader_Init(1, 26, 421, param0->unk_00); param0->unk_2A60 = StringTemplate_Default(param0->unk_00); @@ -639,11 +642,11 @@ static void ov97_02230C44 (UnkStruct_ov97_02230868 * param0, int param1, int par } } -static int ov97_02230E04 (UnkStruct_ov97_02230868 * param0, Window * param1, int param2, int param3) +static int ov97_02230E04(UnkStruct_ov97_02230868 *param0, Window *param1, int param2, int param3) { - Strbuf* v0; + Strbuf *v0; u32 v1; - UnkStruct_ov97_0223E680 * v2 = Unk_ov97_0223E680 + param2; + UnkStruct_ov97_0223E680 *v2 = Unk_ov97_0223E680 + param2; if (param1->unk_00 == NULL) { BGL_AddWindow(param0->unk_2A5C, param1, 2, v2->unk_04, v2->unk_08, v2->unk_0C, v2->unk_10, 15, param3); @@ -679,7 +682,7 @@ static int ov97_02230E04 (UnkStruct_ov97_02230868 * param0, Window * param1, int return param3 + v2->unk_0C * v2->unk_10; } -static int ov97_02230F20 (UnkStruct_ov97_02230868 * param0, int param1, int param2) +static int ov97_02230F20(UnkStruct_ov97_02230868 *param0, int param1, int param2) { int v0 = param1; @@ -706,10 +709,10 @@ static int ov97_02230F20 (UnkStruct_ov97_02230868 * param0, int param1, int para return param1; } -static void ov97_02230F58 (UnkStruct_ov97_02230868 * param0, u32 param1, u32 param2, u32 param3) +static void ov97_02230F58(UnkStruct_ov97_02230868 *param0, u32 param1, u32 param2, u32 param3) { - NNSG2dScreenData * v0; - void * v1 = sub_02006FE8(116, param1, 1, param0->unk_00, 1); + NNSG2dScreenData *v0; + void *v1 = sub_02006FE8(116, param1, 1, param0->unk_00, 1); NNS_G2dGetUnpackedScreenData(v1, &v0); @@ -717,7 +720,7 @@ static void ov97_02230F58 (UnkStruct_ov97_02230868 * param0, u32 param1, u32 par Heap_FreeToHeap(v1); } -static void ov97_02230F98 (UnkStruct_ov97_02230868 * param0, int param1) +static void ov97_02230F98(UnkStruct_ov97_02230868 *param0, int param1) { sub_02006E84(116, 3, 0, 0, 16 * 16, param0->unk_00); sub_02006E3C(116, 6, param0->unk_2A5C, 1, 0, 24 * 16 * 0x20, 1, param0->unk_00); @@ -740,12 +743,12 @@ static void ov97_02230F98 (UnkStruct_ov97_02230868 * param0, int param1) sub_02019448(param0->unk_2A5C, 3); } -static void ov97_02231088 (OverlayManager * param0, int * param1, int (* param2)(OverlayManager *)) +static void ov97_02231088(OverlayManager *param0, int *param1, int (*param2)(OverlayManager *)) { u32 v0; int v1; - UnkStruct_ov97_02230868 * v2 = OverlayManager_Data(param0); - static int (* v3)(OverlayManager *); + UnkStruct_ov97_02230868 *v2 = OverlayManager_Data(param0); + static int (*v3)(OverlayManager *); v0 = sub_02001288(v2->unk_2C28); @@ -782,11 +785,11 @@ static void ov97_02231088 (OverlayManager * param0, int * param1, int (* param2) } } -static void ov97_022310FC (UnkStruct_ov97_02230868 * param0) +static void ov97_022310FC(UnkStruct_ov97_02230868 *param0) { int v0, v1, v2; - u8 * v3; - NNSG2dCharacterData * v4; + u8 *v3; + NNSG2dCharacterData *v4; if ((param0->unk_2E90[0] == NULL) && (param0->unk_2E90[1] == NULL) && (param0->unk_2E90[2] == NULL)) { if (ov97_02237A60() == 1) { @@ -825,9 +828,9 @@ static void ov97_022310FC (UnkStruct_ov97_02230868 * param0) } } -static int ov97_02231224 (OverlayManager * param0, int * param1) +static int ov97_02231224(OverlayManager *param0, int *param1) { - UnkStruct_ov97_02230868 * v0; + UnkStruct_ov97_02230868 *v0; Heap_Create(3, 87, 0x30000); @@ -849,17 +852,17 @@ static int ov97_02231224 (OverlayManager * param0, int * param1) return 1; } -static void ov97_02231290 (SysTask * param0, void * param1) +static void ov97_02231290(SysTask *param0, void *param1) { - UnkStruct_ov97_02231318 * v0 = (UnkStruct_ov97_02231318 *)param1; + UnkStruct_ov97_02231318 *v0 = (UnkStruct_ov97_02231318 *)param1; BufferManager_StopDMA(); BufferManager_StartDMA(BufferManager_GetReadBuffer(v0->bufferManager), (void *)REG_BG0HOFS_ADDR, sizeof(u32) * 2, 1); } -static void ov97_022312B4 (UnkStruct_ov97_02230868 * param0, BOOL param1, fx32 param2, fx32 param3) +static void ov97_022312B4(UnkStruct_ov97_02230868 *param0, BOOL param1, fx32 param2, fx32 param3) { - UnkStruct_ov97_02231318 * v0 = ¶m0->unk_31F4; + UnkStruct_ov97_02231318 *v0 = ¶m0->unk_31F4; v0->unk_C14 = param1; v0->unk_C08 = param2; @@ -876,9 +879,9 @@ static void ov97_022312B4 (UnkStruct_ov97_02230868 * param0, BOOL param1, fx32 p v0->unk_C10 = 1; } -static void ov97_02231318 (UnkStruct_ov97_02230868 * param0) +static void ov97_02231318(UnkStruct_ov97_02230868 *param0) { - UnkStruct_ov97_02231318 * v0 = ¶m0->unk_31F4; + UnkStruct_ov97_02231318 *v0 = ¶m0->unk_31F4; if (v0->bufferManager) { BufferManager_Delete(v0->bufferManager); @@ -894,11 +897,11 @@ static void ov97_02231318 (UnkStruct_ov97_02230868 * param0) BufferManager_StopDMA(); } -static BOOL ov97_02231354 (UnkStruct_ov97_02230868 * param0) +static BOOL ov97_02231354(UnkStruct_ov97_02230868 *param0) { int v0, v1; - u16 * v2; - UnkStruct_ov97_02231318 * v3 = ¶m0->unk_31F4; + u16 *v2; + UnkStruct_ov97_02231318 *v3 = ¶m0->unk_31F4; fx32 v4 = (168 / 2) * FX32_ONE; if (v3->unk_C10 == 0) { @@ -951,10 +954,10 @@ static BOOL ov97_02231354 (UnkStruct_ov97_02230868 * param0) return 0; } -static void ov97_02231464 (void * param0) +static void ov97_02231464(void *param0) { int v0; - UnkStruct_ov97_02230868 * v1 = (UnkStruct_ov97_02230868 *)param0; + UnkStruct_ov97_02230868 *v1 = (UnkStruct_ov97_02230868 *)param0; v0 = ov97_0223847C(); @@ -964,7 +967,7 @@ static void ov97_02231464 (void * param0) } } -static void ov97_02231488 (UnkStruct_ov97_02230868 * param0) +static void ov97_02231488(UnkStruct_ov97_02230868 *param0) { GF_ASSERT(param0->unk_2C20 < 3); SaveData_Checksum(31); @@ -983,7 +986,7 @@ static void ov97_02231488 (UnkStruct_ov97_02230868 * param0) param0->unk_3E0C = ov97_02231464; } -static void ov97_022314FC (UnkStruct_ov97_02230868 * param0, int param1, int * param2) +static void ov97_022314FC(UnkStruct_ov97_02230868 *param0, int param1, int *param2) { int v0; int v1 = param0->unk_3E10; @@ -1033,10 +1036,10 @@ static void ov97_022314FC (UnkStruct_ov97_02230868 * param0, int param1, int * p } } -static int ov97_0223161C (OverlayManager * param0, int * param1) +static int ov97_0223161C(OverlayManager *param0, int *param1) { int v0, v1, v2, v3; - UnkStruct_ov97_02230868 * v4 = OverlayManager_Data(param0); + UnkStruct_ov97_02230868 *v4 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -1146,7 +1149,8 @@ static int ov97_0223161C (OverlayManager * param0, int * param1) case 11: ov97_02230868(v4); ov97_02230518(&v4->unk_2C30, 0); - sub_0201ACF4(&v4->unk_2C30); BGL_DeleteWindow(&v4->unk_2C30); + sub_0201ACF4(&v4->unk_2C30); + BGL_DeleteWindow(&v4->unk_2C30); *param1 = 3; break; case 12: @@ -1165,7 +1169,8 @@ static int ov97_0223161C (OverlayManager * param0, int * param1) case 16: ov97_02230868(v4); ov97_02230518(&v4->unk_2C30, 0); - sub_0201ACF4(&v4->unk_2C30); BGL_DeleteWindow(&v4->unk_2C30); + sub_0201ACF4(&v4->unk_2C30); + BGL_DeleteWindow(&v4->unk_2C30); ov97_02230C44(v4, 0, 3); ov97_02230664(v4->unk_2A5C); ov97_02230410(v4); @@ -1270,9 +1275,9 @@ static int ov97_0223161C (OverlayManager * param0, int * param1) return 0; } -static int ov97_02231BD8 (UnkStruct_ov97_02230868 * param0) +static int ov97_02231BD8(UnkStruct_ov97_02230868 *param0) { - UnkStruct_0202DBAC * v0 = param0->unk_2C14[param0->unk_2C20]; + UnkStruct_0202DBAC *v0 = param0->unk_2C14[param0->unk_2C20]; memcpy(¶m0->unk_04.unk_8C.unk_50, v0, sizeof(UnkUnion_ov97_0222D2B0)); memcpy(¶m0->unk_04.unk_8C.unk_00, &v0->unk_104, sizeof(UnkStruct_ov97_0222D250)); @@ -1286,9 +1291,9 @@ static int ov97_02231BD8 (UnkStruct_ov97_02230868 * param0) return NULL; } -static int ov97_02231C48 (int * param0) +static int ov97_02231C48(int *param0) { - int * v0 = param0; + int *v0 = param0; int v1 = *param0; int v2 = 0; @@ -1308,10 +1313,10 @@ static int ov97_02231C48 (int * param0) return v2 + 1; } -static int ov97_02231C84 (UnkStruct_ov97_02230868 * param0) +static int ov97_02231C84(UnkStruct_ov97_02230868 *param0) { int v0, v1; - TrainerInfo * v2; + TrainerInfo *v2; v1 = 0; @@ -1324,14 +1329,14 @@ static int ov97_02231C84 (UnkStruct_ov97_02230868 * param0) return v1; } -static int ov97_02231CA0 (UnkStruct_ov97_02230868 * param0, Window * param1) +static int ov97_02231CA0(UnkStruct_ov97_02230868 *param0, Window *param1) { int v0, v1, v2, v3; u32 v4; - TrainerInfo * v5; - Strbuf* v6; - StringTemplate * v7; - MessageLoader * v8; + TrainerInfo *v5; + Strbuf *v6; + StringTemplate *v7; + MessageLoader *v8; int v9[4]; int v10[4]; @@ -1409,9 +1414,9 @@ static int ov97_02231CA0 (UnkStruct_ov97_02230868 * param0, Window * param1) return v1; } -static void ov97_02231E78 (UnkStruct_ov97_02230868 * param0, Window * param1, int param2) +static void ov97_02231E78(UnkStruct_ov97_02230868 *param0, Window *param1, int param2) { - Strbuf* v0; + Strbuf *v0; param0->unk_2C54 = param2; param0->unk_2A64 = MessageLoader_Init(1, 26, 421, 87); @@ -1430,7 +1435,7 @@ static void ov97_02231E78 (UnkStruct_ov97_02230868 * param0, Window * param1, in StringTemplate_Free(param0->unk_2A60); } -static void ov97_02231F1C (UnkStruct_ov97_02230868 * param0, int * param1, int param2) +static void ov97_02231F1C(UnkStruct_ov97_02230868 *param0, int *param1, int param2) { ov97_0222D2DC(); sub_02039794(); @@ -1438,13 +1443,12 @@ static void ov97_02231F1C (UnkStruct_ov97_02230868 * param0, int * param1, int p *param1 = 22; } - extern const OverlayManagerTemplate Unk_ov97_0223D71C; -static int ov97_02231F38 (OverlayManager * param0, int * param1) +static int ov97_02231F38(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov97_02230868 * v1 = OverlayManager_Data(param0); + UnkStruct_ov97_02230868 *v1 = OverlayManager_Data(param0); for (v0 = 0; v0 < sizeof(Unk_ov97_0223E680) / sizeof(UnkStruct_ov97_0223E680); v0++) { if (v1->unk_2A68[v0].unk_00) { @@ -1454,11 +1458,13 @@ static int ov97_02231F38 (OverlayManager * param0, int * param1) } if (v1->unk_2C30.unk_00) { - sub_0201ACF4(&v1->unk_2C30); BGL_DeleteWindow(&v1->unk_2C30); + sub_0201ACF4(&v1->unk_2C30); + BGL_DeleteWindow(&v1->unk_2C30); } if (v1->unk_2C40.unk_00) { - sub_0201ACF4(&v1->unk_2C40); BGL_DeleteWindow(&v1->unk_2C40); + sub_0201ACF4(&v1->unk_2C40); + BGL_DeleteWindow(&v1->unk_2C40); } sub_02019044(v1->unk_2A5C, 0); @@ -1481,9 +1487,9 @@ const OverlayManagerTemplate Unk_ov97_0223D7AC = { 0xffffffff }; -void ov97_02231FFC (BGL * param0, void * param1, int param2) +void ov97_02231FFC(BGL *param0, void *param1, int param2) { - UnkStruct_ov97_02230868 * v0; + UnkStruct_ov97_02230868 *v0; ov97_02232074(param0); diff --git a/src/overlay097/ov97_02232054.c b/src/overlay097/ov97_02232054.c index 7237f228a3..ea254e407c 100644 --- a/src/overlay097/ov97_02232054.c +++ b/src/overlay097/ov97_02232054.c @@ -1,23 +1,23 @@ +#include "overlay097/ov97_02232054.h" + #include #include #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202442C_decl.h" -#include "savedata.h" - #include "struct_defs/struct_02099F80.h" + #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay097/struct_ov97_0223829C.h" +#include "savedata/save_table.h" -#include "unk_02018340.h" #include "gx_layers.h" -#include "savedata/save_table.h" #include "savedata.h" +#include "unk_02018340.h" #include "unk_0202DAB4.h" -#include "overlay097/ov97_02232054.h" -void ov97_02232054 (void) +void ov97_02232054(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_C, @@ -35,7 +35,7 @@ void ov97_02232054 (void) GXLayers_SetBanks(&v0); } -void ov97_02232074 (BGL * param0) +void ov97_02232074(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -133,10 +133,10 @@ void ov97_02232074 (BGL * param0) } } -int ov97_02232148 (SaveData * param0, UnkStruct_ov97_0223829C * param1) +int ov97_02232148(SaveData *param0, UnkStruct_ov97_0223829C *param1) { u32 v0; - MysteryGift * v1 = SaveData_MysteryGift(param0); + MysteryGift *v1 = SaveData_MysteryGift(param0); v0 = param1->unk_00.unk_48; diff --git a/src/overlay097/ov97_02232200.c b/src/overlay097/ov97_02232200.c index 85b86ef248..59bc23c563 100644 --- a/src/overlay097/ov97_02232200.c +++ b/src/overlay097/ov97_02232200.c @@ -1,6 +1,11 @@ +#include "overlay097/ov97_02232200.h" + #include #include +#include "overlay097/ov97_02233408.h" +#include "overlay097/ov97_022337FC.h" +#include "overlay097/ov97_02233814.h" #include "overlay097/struct_ov97_0223222C.h" #include "overlay097/struct_ov97_02232254.h" #include "overlay097/struct_ov97_02232620.h" @@ -11,31 +16,26 @@ #include "overlay097/struct_ov97_02233674.h" #include "overlay097/struct_ov97_022339EC.h" -#include "overlay097/ov97_02232200.h" -#include "overlay097/ov97_02233408.h" -#include "overlay097/ov97_022337FC.h" -#include "overlay097/ov97_02233814.h" - -static void ov97_02232200 (void) +static void ov97_02232200(void) { ov97_02233424(4); (void)ov97_02233AD8(); } -static UnkStruct_ov97_022335A8 ov97_02232210 (u8 * param0) +static UnkStruct_ov97_022335A8 ov97_02232210(u8 *param0) { return ov97_022335A8(param0); } -static UnkStruct_ov97_022335C8 ov97_0223221C (u8 * param0) +static UnkStruct_ov97_022335C8 ov97_0223221C(u8 *param0) { return ov97_022335C8(param0); } -static BOOL ov97_0223222C (void) +static BOOL ov97_0223222C(void) { if (ov97_02233430() == 12) { - UnkStruct_ov97_0223222C * v0 = ov97_02233410(); + UnkStruct_ov97_0223222C *v0 = ov97_02233410(); if (v0->unk_1C == 0) { (void)ov97_02233AD8(); @@ -48,9 +48,9 @@ static BOOL ov97_0223222C (void) } } -static void ov97_02232254 (u32 param0) +static void ov97_02232254(u32 param0) { - UnkStruct_ov97_02232254 * v0 = ov97_02233510(); + UnkStruct_ov97_02232254 *v0 = ov97_02233510(); int v1; for (v1 = 0; v1 < 8; v1++) { @@ -61,9 +61,9 @@ static void ov97_02232254 (u32 param0) } } -static u32 ov97_0223227C (void) +static u32 ov97_0223227C(void) { - UnkStruct_ov97_02232254 * v0 = ov97_02233510(); + UnkStruct_ov97_02232254 *v0 = ov97_02233510(); if (v0->unk_62 & 1) { v0->unk_62 &= ~1; @@ -79,9 +79,9 @@ static u32 ov97_0223227C (void) } } -static BOOL ov97_022322DC (void) +static BOOL ov97_022322DC(void) { - UnkStruct_ov97_02232254 * v0 = ov97_02233510(); + UnkStruct_ov97_02232254 *v0 = ov97_02233510(); v0->unk_60 = 1; v0->unk_62 = WM_GetAllowedChannel(); @@ -95,17 +95,17 @@ static BOOL ov97_022322DC (void) } } -static void ov97_0223231C (void) +static void ov97_0223231C(void) { - WMParentParam * v0 = ov97_02233408(); + WMParentParam *v0 = ov97_02233408(); v0->beaconPeriod = WM_GetDispersionBeaconPeriod(); v0->tgid = WM_GetNextTgid(); } -static void ov97_02232334 (void) +static void ov97_02232334(void) { - WMScanParam * v0 = ov97_02233478(); + WMScanParam *v0 = ov97_02233478(); v0->scanBuf = ov97_022334B4(); v0->channel = ov97_02233408()->channel; @@ -118,9 +118,9 @@ static void ov97_02232334 (void) v0->bssid[5] = 0xff; } -static void ov97_02232360 (void) +static void ov97_02232360(void) { - WMScanParam * v0 = ov97_02233478(); + WMScanParam *v0 = ov97_02233478(); u16 v1; s32 v2; @@ -138,9 +138,9 @@ static void ov97_02232360 (void) } } -void ov97_022323B0 (void * param0) +void ov97_022323B0(void *param0) { - WMindCallback * v0 = (WMindCallback *)param0; + WMindCallback *v0 = (WMindCallback *)param0; ov97_02233800((WMStateCode)v0->state); if (v0->errcode == WM_ERRCODE_FIFO_ERROR) { @@ -149,23 +149,23 @@ void ov97_022323B0 (void * param0) } } -void ov97_022323CC (void * param0) +void ov97_022323CC(void *param0) { - WMPortSendCallback * v0 = (WMPortSendCallback *)param0; + WMPortSendCallback *v0 = (WMPortSendCallback *)param0; ov97_02233800((WMStateCode)v0->state); if (v0->errcode == WM_ERRCODE_SUCCESS) { (void)0; } else { - WMPortSendCallback * v1 = (WMPortSendCallback *)v0; + WMPortSendCallback *v1 = (WMPortSendCallback *)v0; ov97_022337FC((WMErrCode)v0->errcode); } } -void ov97_022323E4 (void * param0) +void ov97_022323E4(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode == WM_ERRCODE_SUCCESS) { ov97_02233424(2); @@ -187,9 +187,9 @@ void ov97_022323E4 (void * param0) } } -void ov97_02232424 (void * param0) +void ov97_02232424(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode == WM_ERRCODE_SUCCESS) { if (ov97_02233430() == 12) { @@ -206,12 +206,12 @@ void ov97_02232424 (void * param0) } } -void ov97_0223245C (void * param0) +void ov97_0223245C(void *param0) { - WMMeasureChannelCallback * v0 = (WMMeasureChannelCallback *)param0; + WMMeasureChannelCallback *v0 = (WMMeasureChannelCallback *)param0; if (v0->errcode == WM_ERRCODE_SUCCESS) { - UnkStruct_ov97_02232254 * v1 = ov97_02233510(); + UnkStruct_ov97_02232254 *v1 = ov97_02233510(); if (v1->unk_61 > v0->ccaBusyRatio) { v1->unk_61 = (u8)v0->ccaBusyRatio; @@ -243,9 +243,9 @@ void ov97_0223245C (void * param0) } } -void ov97_022324C4 (void * param0) +void ov97_022324C4(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode == WM_ERRCODE_SUCCESS) { if (ov97_0223222C()) { @@ -261,14 +261,14 @@ void ov97_022324C4 (void * param0) } } -void ov97_022324EC (void * param0) +void ov97_022324EC(void *param0) { - WMstartParentCallback * v0 = (WMstartParentCallback *)param0; + WMstartParentCallback *v0 = (WMstartParentCallback *)param0; ov97_02233800((WMStateCode)v0->state); if (v0->errcode == WM_ERRCODE_SUCCESS) { - UnkStruct_ov97_02232254 * v1 = ov97_02233510(); + UnkStruct_ov97_02232254 *v1 = ov97_02233510(); ov97_02233424(8); @@ -292,16 +292,16 @@ void ov97_022324EC (void * param0) ov97_0223380C(ov97_02233510()); if (v1->unk_60 == 2) { - UnkStruct_ov97_022339EC * v2 = (UnkStruct_ov97_022339EC *)v0->ssid; + UnkStruct_ov97_022339EC *v2 = (UnkStruct_ov97_022339EC *)v0->ssid; if ((v2->unk_00.unk_00.unk_00_0 == ov97_02233560()) && (v2->unk_00.unk_00.unk_00_8 <= ov97_02233570()) && (v2->unk_00.unk_04.unk_00_16 == ov97_02233580())) { int v3; - UnkStruct_ov97_02232254 * v4 = ov97_02233510(); + UnkStruct_ov97_02232254 *v4 = ov97_02233510(); UnkStruct_ov97_022335A8 v5 = ov97_02232210(v0->macAddress); UnkStruct_ov97_022335C8 v6 = ov97_0223221C(v0->macAddress); for (v3 = 0; v3 < 8; v3++) { - UnkStruct_ov97_022335A8 * v7 = &v4->unk_00[v3].unk_00; + UnkStruct_ov97_022335A8 *v7 = &v4->unk_00[v3].unk_00; if (v7->unk_00.val2 == v5.unk_00.val2) { v4->unk_00[v3].unk_06 = v0->aid; @@ -332,16 +332,16 @@ void ov97_022324EC (void * param0) } } -static BOOL ov97_02232620 (WMstartScanCallback * param0, WMBssDesc * param1) +static BOOL ov97_02232620(WMstartScanCallback *param0, WMBssDesc *param1) { int v0; - UnkStruct_ov97_02232620 * v1 = ov97_02233508(); + UnkStruct_ov97_02232620 *v1 = ov97_02233508(); UnkStruct_ov97_022335A8 v2 = ov97_02232210(param1->bssid); UnkStruct_ov97_022335C8 v3 = ov97_0223221C(param1->bssid); for (v0 = 0; v0 < 8; v0++) { - UnkStruct_ov97_022335A8 * v4 = &v1->unk_00[v0].unk_00; - UnkStruct_ov97_022335C8 * v5 = &v1->unk_00[v0].unk_34; + UnkStruct_ov97_022335A8 *v4 = &v1->unk_00[v0].unk_00; + UnkStruct_ov97_022335C8 *v5 = &v1->unk_00[v0].unk_34; if ((v4->unk_00.val2 == v2.unk_00.val2) && (v5->unk_00.val2 == v3.unk_00.val2)) { return 1; @@ -360,7 +360,7 @@ static BOOL ov97_02232620 (WMstartScanCallback * param0, WMBssDesc * param1) return 0; } -static void ov97_022326C0 (void) +static void ov97_022326C0(void) { ov97_02232360(); @@ -369,10 +369,10 @@ static void ov97_022326C0 (void) } } -static BOOL ov97_022326D4 (WMstartScanCallback * param0) +static BOOL ov97_022326D4(WMstartScanCallback *param0) { - WMBssDesc * v0 = ov97_022334B4(); - UnkStruct_ov97_02232620 * v1 = ov97_02233508(); + WMBssDesc *v0 = ov97_022334B4(); + UnkStruct_ov97_02232620 *v1 = ov97_02233508(); if (ov97_0223222C()) { return 1; @@ -383,7 +383,7 @@ static BOOL ov97_022326D4 (WMstartScanCallback * param0) int v3; for (v3 = 0; v3 < 8; v3++) { - UnkStruct_ov97_022335A8 * v4 = &v1->unk_00[v3].unk_00; + UnkStruct_ov97_022335A8 *v4 = &v1->unk_00[v3].unk_00; if (v4->unk_00.val2) { v2 = 1; @@ -404,11 +404,11 @@ static BOOL ov97_022326D4 (WMstartScanCallback * param0) ov97_02233808(ov97_02233508()); if ((param0->gameInfoLength >= 8) && (v0->gameInfo.ggid == ov97_02233554())) { - UnkStruct_ov97_02233268 * v5 = (UnkStruct_ov97_02233268 *)v0->gameInfo.userGameInfo; + UnkStruct_ov97_02233268 *v5 = (UnkStruct_ov97_02233268 *)v0->gameInfo.userGameInfo; if ((v5->unk_00.unk_00.unk_00_0 == ov97_02233560()) && (v5->unk_00.unk_00.unk_00_8 <= ov97_02233570()) && (v5->unk_00.unk_04.unk_00_16 == ov97_02233580())) { if (ov97_02232620(param0, v0)) { - UnkStruct_ov97_02232620 * v6 = ov97_02233508(); + UnkStruct_ov97_02232620 *v6 = ov97_02233508(); if (++v6->unk_1C2 > 28) { if (ov97_022339D0() == 0) { @@ -429,14 +429,14 @@ static BOOL ov97_022326D4 (WMstartScanCallback * param0) return 0; } -void ov97_022327B8 (void * param0) +void ov97_022327B8(void *param0) { - WMstartScanCallback * v0 = (WMstartScanCallback *)param0; + WMstartScanCallback *v0 = (WMstartScanCallback *)param0; ov97_02233800((WMStateCode)v0->state); if (v0->errcode == WM_ERRCODE_SUCCESS) { { - WMBssDesc * v1 = ov97_022334B4(); + WMBssDesc *v1 = ov97_022334B4(); ov97_02233804(v1); } @@ -447,12 +447,10 @@ void ov97_022327B8 (void * param0) } switch (ov97_02233448()) { - case 1: - { - UnkStruct_ov97_02232620 * v2 = ov97_02233508(); + case 1: { + UnkStruct_ov97_02232620 *v2 = ov97_02233508(); v2->unk_1C3_4 = 1; - } - break; + } break; } switch (v0->state) { @@ -474,11 +472,11 @@ void ov97_022327B8 (void * param0) } } -static BOOL ov97_0223282C (void) +static BOOL ov97_0223282C(void) { - WMBssDesc * v0 = ov97_022334B4(); - UnkStruct_ov97_02232620 * v1 = ov97_02233508(); - WMParentParam * v2 = ov97_02233408(); + WMBssDesc *v0 = ov97_022334B4(); + UnkStruct_ov97_02232620 *v1 = ov97_02233508(); + WMParentParam *v2 = ov97_02233408(); if (ov97_0223222C()) { return 1; @@ -488,11 +486,11 @@ static BOOL ov97_0223282C (void) ov97_02233808(ov97_02233508()); if ((v0->gameInfoLength >= 8) && (v0->gameInfo.ggid == ov97_02233554())) { - UnkStruct_ov97_02233268 * v3 = (UnkStruct_ov97_02233268 *)v0->gameInfo.userGameInfo; + UnkStruct_ov97_02233268 *v3 = (UnkStruct_ov97_02233268 *)v0->gameInfo.userGameInfo; if ((v3->unk_00.unk_00.unk_00_0 == ov97_02233560()) && (v3->unk_00.unk_00.unk_00_8 <= ov97_02233570()) && (v3->unk_00.unk_04.unk_00_16 == ov97_02233580())) { UnkStruct_ov97_022335A8 v4 = ov97_02232210(v0->bssid); - UnkStruct_ov97_022335A8 * v5 = &v1->unk_00[v1->unk_1C3_0].unk_00; + UnkStruct_ov97_022335A8 *v5 = &v1->unk_00[v1->unk_1C3_0].unk_00; if (v5->unk_00.val2 == v4.unk_00.val2) { if (ov97_022339D0() == 0) { @@ -507,14 +505,14 @@ static BOOL ov97_0223282C (void) return 0; } -void ov97_022328D4 (void * param0) +void ov97_022328D4(void *param0) { - WMstartScanCallback * v0 = (WMstartScanCallback *)param0; + WMstartScanCallback *v0 = (WMstartScanCallback *)param0; ov97_02233800((WMStateCode)v0->state); if (v0->errcode == WM_ERRCODE_SUCCESS) { - UnkStruct_ov97_02232620 * v1 = ov97_02233508(); + UnkStruct_ov97_02232620 *v1 = ov97_02233508(); v1->unk_1C3_4 = 2; ov97_02233424(6); @@ -546,9 +544,9 @@ void ov97_022328D4 (void * param0) } } -void ov97_02232944 (void * param0) +void ov97_02232944(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode == WM_ERRCODE_SUCCESS) { ov97_02233424(7); @@ -558,7 +556,7 @@ void ov97_02232944 (void * param0) } if (ov97_02233448() == 1) { - UnkStruct_ov97_02232620 * v1 = ov97_02233508(); + UnkStruct_ov97_02232620 *v1 = ov97_02233508(); if (v1->unk_1C3_4 == 2) { if (ov97_022339EC() == 0) { @@ -574,9 +572,9 @@ void ov97_02232944 (void * param0) } } -void ov97_02232998 (void * param0) +void ov97_02232998(void *param0) { - WMstartConnectCallback * v0 = (WMstartConnectCallback *)param0; + WMstartConnectCallback *v0 = (WMstartConnectCallback *)param0; ov97_02233800((WMStateCode)v0->state); @@ -626,12 +624,12 @@ void ov97_02232998 (void * param0) } } -static void ov97_02232A28 (void) +static void ov97_02232A28(void) { switch (ov97_02233448()) { case 2: if ((ov97_022322DC() != 0) && (ov97_02233890(ov97_0223227C()) != 0)) { - UnkStruct_ov97_02232254 * v0 = ov97_02233510(); + UnkStruct_ov97_02232254 *v0 = ov97_02233510(); v0->unk_60 = 1; ov97_02233424(3); } else { @@ -650,9 +648,9 @@ static void ov97_02232A28 (void) } } -void ov97_02232A7C (void * param0) +void ov97_02232A7C(void *param0) { - WMstartMPCallback * v0 = (WMstartMPCallback *)param0; + WMstartMPCallback *v0 = (WMstartMPCallback *)param0; ov97_02233800((WMStateCode)v0->state); @@ -665,9 +663,11 @@ void ov97_02232A7C (void * param0) switch (ov97_02233448()) { case 2: - ov97_02233424(10); break; + ov97_02233424(10); + break; case 1: - ov97_02233424(11); break; + ov97_02233424(11); + break; } switch (v0->state) { @@ -691,12 +691,12 @@ void ov97_02232A7C (void * param0) } } -static void ov97_02232AC8 (WMPortRecvCallback * param0) +static void ov97_02232AC8(WMPortRecvCallback *param0) { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); if (v0->unk_19 == 1) { - UnkStruct_ov97_02233674 * v1 = (UnkStruct_ov97_02233674 *)v0->unk_0C; + UnkStruct_ov97_02233674 *v1 = (UnkStruct_ov97_02233674 *)v0->unk_0C; DC_FlushRange(param0->data, param0->length); MI_CpuCopy8(param0->data, v0->unk_0C, param0->length); @@ -719,12 +719,12 @@ static void ov97_02232AC8 (WMPortRecvCallback * param0) } } -static void ov97_02232B40 (WMPortRecvCallback * param0) +static void ov97_02232B40(WMPortRecvCallback *param0) { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); if ((ov97_02233448() == 2) && (v0->unk_19 != 2)) { - UnkStruct_ov97_02233674 * v1 = (UnkStruct_ov97_02233674 *)v0->unk_0C; + UnkStruct_ov97_02233674 *v1 = (UnkStruct_ov97_02233674 *)v0->unk_0C; DC_FlushRange(param0->data, param0->length); MI_CpuCopy8(param0->data, v0->unk_0C, param0->length); @@ -735,7 +735,7 @@ static void ov97_02232B40 (WMPortRecvCallback * param0) if (v1->unk_08.unk_00_0 != 0xFD) { return; } else { - UnkStruct_ov97_02232254 * v2 = ov97_02233510(); + UnkStruct_ov97_02232254 *v2 = ov97_02233510(); int v3; for (v3 = 0; v3 < 8; v3++) { @@ -752,15 +752,15 @@ static void ov97_02232B40 (WMPortRecvCallback * param0) } } -static void ov97_02232BCC (WMPortRecvCallback * param0) +static void ov97_02232BCC(WMPortRecvCallback *param0) { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); if (v0->unk_1C == 0xFD) { ov97_02232B40(param0); } else { if (((v0->unk_19 == 1) || (v0->unk_19 == 3)) && (v0->unk_1B == 0)) { - UnkStruct_ov97_02233674 * v1 = (UnkStruct_ov97_02233674 *)v0->unk_0C; + UnkStruct_ov97_02233674 *v1 = (UnkStruct_ov97_02233674 *)v0->unk_0C; DC_FlushRange(param0->data, param0->length); MI_CpuCopy8(param0->data, v0->unk_0C, param0->length); @@ -793,9 +793,9 @@ static void ov97_02232BCC (WMPortRecvCallback * param0) } } -void ov97_02232C94 (void * param0) +void ov97_02232C94(void *param0) { - WMPortRecvCallback * v0 = (WMPortRecvCallback *)param0; + WMPortRecvCallback *v0 = (WMPortRecvCallback *)param0; ov97_02233800((WMStateCode)v0->state); @@ -804,9 +804,8 @@ void ov97_02232C94 (void * param0) case WM_STATECODE_PORT_RECV: switch (ov97_02233418()) { case 10: - case 11: - { - UnkStruct_ov97_02232AC8 * v1 = ov97_02233538(); + case 11: { + UnkStruct_ov97_02232AC8 *v1 = ov97_02233538(); switch (v1->unk_18) { case 1: @@ -816,8 +815,7 @@ void ov97_02232C94 (void * param0) ov97_02232BCC(v0); break; } - } - break; + } break; } break; case WM_STATECODE_CONNECTED: @@ -844,9 +842,9 @@ void ov97_02232C94 (void * param0) } } -void ov97_02232D18 (void * param0) +void ov97_02232D18(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode == WM_ERRCODE_SUCCESS) { if (ov97_0223222C()) { @@ -860,9 +858,9 @@ void ov97_02232D18 (void * param0) } } -void ov97_02232D3C (void * param0) +void ov97_02232D3C(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode == WM_ERRCODE_SUCCESS) { if (ov97_02233870() == 0) { @@ -876,9 +874,9 @@ void ov97_02232D3C (void * param0) } } -void ov97_02232D60 (void * param0) +void ov97_02232D60(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode == WM_ERRCODE_SUCCESS) { ov97_022334C0(0); @@ -902,9 +900,9 @@ void ov97_02232D60 (void * param0) } } -void ov97_02232DA4 (void * param0) +void ov97_02232DA4(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode == WM_ERRCODE_SUCCESS) { ov97_02233424(12); diff --git a/src/overlay097/ov97_02232DC8.c b/src/overlay097/ov97_02232DC8.c index 9f48e7db77..c272d0eb30 100644 --- a/src/overlay097/ov97_02232DC8.c +++ b/src/overlay097/ov97_02232DC8.c @@ -1,6 +1,11 @@ +#include "overlay097/ov97_02232DC8.h" + #include #include +#include "overlay097/ov97_02232200.h" +#include "overlay097/ov97_02233408.h" +#include "overlay097/ov97_02233814.h" #include "overlay097/struct_ov97_0223222C.h" #include "overlay097/struct_ov97_02232254.h" #include "overlay097/struct_ov97_02232620.h" @@ -11,12 +16,7 @@ #include "overlay097/struct_ov97_02233674.h" #include "overlay097/struct_ov97_022339EC_sub1.h" -#include "overlay097/ov97_02232200.h" -#include "overlay097/ov97_02232DC8.h" -#include "overlay097/ov97_02233408.h" -#include "overlay097/ov97_02233814.h" - -static BOOL ov97_02232DC8 (void) +static BOOL ov97_02232DC8(void) { WMErrCode v0; @@ -30,7 +30,7 @@ static BOOL ov97_02232DC8 (void) return 1; } -static void ov97_02232DE8 (void) +static void ov97_02232DE8(void) { switch (ov97_02233418()) { case 0: @@ -43,9 +43,9 @@ static void ov97_02232DE8 (void) } } -static void ov97_02232E00 (const void * param0, u32 param1, u16 param2) +static void ov97_02232E00(const void *param0, u32 param1, u16 param2) { - const WMParentParam * v0 = ov97_02233408(); + const WMParentParam *v0 = ov97_02233408(); if (param1 > v0->parentMaxSize) { return; @@ -55,7 +55,7 @@ static void ov97_02232E00 (const void * param0, u32 param1, u16 param2) (void)ov97_02233814(param0, param1, param2); } -static u32 ov97_02232E28 (void) +static u32 ov97_02232E28(void) { u32 v0; u32 v1; @@ -68,7 +68,7 @@ static u32 ov97_02232E28 (void) return v2; } -static u32 ov97_02232E30 (void) +static u32 ov97_02232E30(void) { u32 v0; u32 v1; @@ -81,11 +81,11 @@ static u32 ov97_02232E30 (void) return v2; } -void ov97_02232E38 (UnkStruct_ov97_02232E38 * param0, void * param1) +void ov97_02232E38(UnkStruct_ov97_02232E38 *param0, void *param1) { - WMParentParam * v0 = ov97_02233408(); - UnkStruct_ov97_0223222C * v1 = ov97_02233410(); - void * v2 = param1; + WMParentParam *v0 = ov97_02233408(); + UnkStruct_ov97_0223222C *v1 = ov97_02233410(); + void *v2 = param1; u32 v3 = (u32)param1 & 0x1F; if (v3) { @@ -131,8 +131,8 @@ void ov97_02232E38 (UnkStruct_ov97_02232E38 * param0, void * param1) v1->unk_40.unk_00.unk_04.unk_00_16 = param0->unk_00_16; { - const u16 * v4 = param0->unk_08; - const u16 * v5 = param0->unk_04; + const u16 *v4 = param0->unk_08; + const u16 *v5 = param0->unk_04; u32 v6 = 0; while ((v4) && (v6 < 12)) { @@ -157,9 +157,9 @@ void ov97_02232E38 (UnkStruct_ov97_02232E38 * param0, void * param1) (void)WM_GetNextTgid(); } -static void ov97_02232F68 (void) +static void ov97_02232F68(void) { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); if (v0->unk_19 == 1) { if (--v0->unk_1A > 0) { @@ -182,13 +182,13 @@ static void ov97_02232F68 (void) } } -static void ov97_02232FC4 (void) +static void ov97_02232FC4(void) { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); if (v0->unk_19 == 0) { if (v0->unk_1C == (u8)0xFD) { - UnkStruct_ov97_02232254 * v1 = ov97_02233510(); + UnkStruct_ov97_02232254 *v1 = ov97_02233510(); int v2; for (v2 = 0; v2 < 8; v2++) { @@ -210,7 +210,7 @@ static void ov97_02232FC4 (void) } else { u32 v5 = ov97_02232E28() - ov97_02233614(); int v6; - UnkStruct_ov97_02233674 * v7 = (UnkStruct_ov97_02233674 *)v0->unk_0C; + UnkStruct_ov97_02233674 *v7 = (UnkStruct_ov97_02233674 *)v0->unk_0C; v6 = (int)v7->unk_08.unk_00_8; @@ -229,9 +229,9 @@ static void ov97_02232FC4 (void) } } -static void ov97_02233080 (void) +static void ov97_02233080(void) { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); switch (v0->unk_18) { case 1: @@ -243,9 +243,9 @@ static void ov97_02233080 (void) } } -static void ov97_022330A0 (void) +static void ov97_022330A0(void) { - UnkStruct_ov97_02232620 * v0 = ov97_02233508(); + UnkStruct_ov97_02232620 *v0 = ov97_02233508(); switch (ov97_02233418()) { case 6: @@ -261,7 +261,7 @@ static void ov97_022330A0 (void) } } -static void ov97_022330CC (void) +static void ov97_022330CC(void) { switch (ov97_02233418()) { case 10: @@ -272,7 +272,7 @@ static void ov97_022330CC (void) } } -void ov97_022330DC (void) +void ov97_022330DC(void) { if (ov97_02233418() == 12) { return; @@ -293,9 +293,8 @@ void ov97_022330DC (void) case 2: ov97_022330CC(); break; - default: - { - UnkStruct_ov97_0223222C * v0 = ov97_02233410(); + default: { + UnkStruct_ov97_0223222C *v0 = ov97_02233410(); switch (ov97_02233418()) { case 0: @@ -318,20 +317,20 @@ void ov97_022330DC (void) } } -void ov97_02233120 () +void ov97_02233120() { ov97_02233518(); ov97_02233454(1); ov97_02232DE8(); } -static u32 ov97_02233134 (void) +static u32 ov97_02233134(void) { int v0 = ov97_02233448(); u32 v1 = 0; if (v0 == 1) { - UnkStruct_ov97_02232620 * v2 = ov97_02233508(); + UnkStruct_ov97_02232620 *v2 = ov97_02233508(); if (v2->unk_1C3_4 == 1) { u32 v3; @@ -347,10 +346,10 @@ static u32 ov97_02233134 (void) return v1; } -BOOL ov97_0223316C (u32 param0) +BOOL ov97_0223316C(u32 param0) { if ((ov97_02233448() == 1) && (ov97_02233418() == 7)) { - UnkStruct_ov97_02232620 * v0 = ov97_02233508(); + UnkStruct_ov97_02232620 *v0 = ov97_02233508(); if ((v0->unk_1C3_4 == 1) && (v0->unk_00[param0].unk_00.unk_00.val2)) { return 1; @@ -360,10 +359,10 @@ BOOL ov97_0223316C (u32 param0) return 0; } -void ov97_022331A8 (u32 param0) +void ov97_022331A8(u32 param0) { if ((ov97_02233448() == 1) && (ov97_02233418() == 7)) { - UnkStruct_ov97_02232620 * v0 = ov97_02233508(); + UnkStruct_ov97_02232620 *v0 = ov97_02233508(); if ((v0->unk_1C3_4 == 1) && (v0->unk_00[param0].unk_00.unk_00.val2)) { v0->unk_1C3_0 = (u8)param0; @@ -374,13 +373,13 @@ void ov97_022331A8 (u32 param0) } } -static u32 ov97_022331F8 (void) +static u32 ov97_022331F8(void) { int v0 = ov97_02233448(); u32 v1 = 0; if (v0 == 2) { - UnkStruct_ov97_02232254 * v2 = ov97_02233510(); + UnkStruct_ov97_02232254 *v2 = ov97_02233510(); if (v2->unk_60 == 2) { u32 i; @@ -396,9 +395,9 @@ static u32 ov97_022331F8 (void) return v1; } -u32 ov97_02233230 (void) +u32 ov97_02233230(void) { - UnkStruct_ov97_0223222C * v0 = ov97_02233410(); + UnkStruct_ov97_0223222C *v0 = ov97_02233410(); if (!v0->unk_20) { return (u32)WM_GetLinkLevel(); @@ -407,7 +406,7 @@ u32 ov97_02233230 (void) } } -u32 ov97_02233248 (void) +u32 ov97_02233248(void) { int v0 = ov97_02233448(); u32 v1; @@ -427,10 +426,10 @@ u32 ov97_02233248 (void) return v1; } -void ov97_02233268 (void) +void ov97_02233268(void) { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); - UnkStruct_ov97_02233268 * v1 = ov97_02233590(); + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); + UnkStruct_ov97_02233268 *v1 = ov97_02233590(); if (ov97_02233448() == 1) { v0->unk_18 = 1; @@ -445,10 +444,10 @@ void ov97_02233268 (void) } } -void ov97_0223329C (void) +void ov97_0223329C(void) { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); - UnkStruct_ov97_02233268 * v1 = ov97_02233590(); + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); + UnkStruct_ov97_02233268 *v1 = ov97_02233590(); v0->unk_18 = 1; v0->unk_19 = 0; @@ -461,9 +460,9 @@ void ov97_0223329C (void) v0->unk_1C = (u8)0xFE; } -void ov97_022332C8 (void * param0, u32 param1, u32 param2) +void ov97_022332C8(void *param0, u32 param1, u32 param2) { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); if ((int)param2 > 0xF0) { return; @@ -480,95 +479,82 @@ void ov97_022332C8 (void * param0, u32 param1, u32 param2) v0->unk_1C = (u8)param2; } -BOOL ov97_022332F4 (void) +BOOL ov97_022332F4(void) { u32 v0 = 0; switch (ov97_02233448()) { case 1: - case 2: - { + case 2: { switch (ov97_02233418()) { case 11: - case 10: - { - UnkStruct_ov97_02232AC8 * v1 = ov97_02233538(); + case 10: { + UnkStruct_ov97_02232AC8 *v1 = ov97_02233538(); if (v1->unk_19 == 2) { return 1; } + } break; } - break; - } - } - break; + } break; } return 0; } -BOOL ov97_02233320 (void) +BOOL ov97_02233320(void) { u32 v0 = 0; switch (ov97_02233448()) { case 1: - case 2: - { + case 2: { switch (ov97_02233418()) { case 11: - case 10: - { - UnkStruct_ov97_02232AC8 * v1 = ov97_02233538(); + case 10: { + UnkStruct_ov97_02232AC8 *v1 = ov97_02233538(); if (v1->unk_19 == 2) { return 1; } + } break; } - break; - } - } - break; + } break; } return 0; } -BOOL ov97_0223334C (void) +BOOL ov97_0223334C(void) { switch (ov97_02233448()) { case 1: - case 2: - { + case 2: { switch (ov97_02233418()) { case 11: - case 10: - { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); + case 10: { + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); if (v0->unk_19 == 0) { - UnkStruct_ov97_02233674 * v1 = (UnkStruct_ov97_02233674 *)v0->unk_0C; + UnkStruct_ov97_02233674 *v1 = (UnkStruct_ov97_02233674 *)v0->unk_0C; if ((v1->unk_08.unk_00_8 == 0) && (v0->unk_1B < 4)) { return 1; } } + } break; } - break; - } - } - break; + } break; } return 0; } -BOOL ov97_02233388 (void) +BOOL ov97_02233388(void) { switch (ov97_02233448()) { - case 2: - { - UnkStruct_ov97_02232254 * v0 = ov97_02233510(); + case 2: { + UnkStruct_ov97_02232254 *v0 = ov97_02233510(); int v1; for (v1 = 0; v1 < 8; v1++) { @@ -580,8 +566,7 @@ BOOL ov97_02233388 (void) } return 0; - } - break; + } break; default: return ov97_022334CC(); @@ -589,7 +574,7 @@ BOOL ov97_02233388 (void) } } -void ov97_022333BC (void) +void ov97_022333BC(void) { ov97_0223343C(12); @@ -601,7 +586,7 @@ void ov97_022333BC (void) break; case 9: if (!ov97_022334CC()) { - UnkStruct_ov97_0223222C * v0 = ov97_02233410(); + UnkStruct_ov97_0223222C *v0 = ov97_02233410(); ov97_02233AD8(); v0->unk_1C = 1; @@ -610,8 +595,8 @@ void ov97_022333BC (void) } } -BOOL ov97_022333FC (void) +BOOL ov97_022333FC(void) { - UnkStruct_ov97_0223222C * v0 = ov97_02233410(); + UnkStruct_ov97_0223222C *v0 = ov97_02233410(); return v0->unk_20; } diff --git a/src/overlay097/ov97_02233408.c b/src/overlay097/ov97_02233408.c index 802e373d20..cbb8346333 100644 --- a/src/overlay097/ov97_02233408.c +++ b/src/overlay097/ov97_02233408.c @@ -1,12 +1,14 @@ +#include "overlay097/ov97_02233408.h" + #include #include +#include "overlay097/ov97_022337FC.h" #include "overlay097/struct_ov97_0223222C.h" #include "overlay097/struct_ov97_02232254.h" #include "overlay097/struct_ov97_02232620.h" #include "overlay097/struct_ov97_02232AC8.h" #include "overlay097/struct_ov97_02233268.h" -#include "overlay097/union_ov97_022334FC.h" #include "overlay097/struct_ov97_022335A8.h" #include "overlay097/struct_ov97_022335C8.h" #include "overlay097/struct_ov97_02233674.h" @@ -15,13 +17,11 @@ #include "overlay097/struct_ov97_02233674_sub3.h" #include "overlay097/struct_ov97_02233674_sub4.h" #include "overlay097/struct_ov97_022339EC.h" - -#include "overlay097/ov97_02233408.h" -#include "overlay097/ov97_022337FC.h" +#include "overlay097/union_ov97_022334FC.h" static UnkStruct_ov97_0223222C Unk_ov97_0223F1C0; -__attribute__ ((aligned(32))) static WMParentParam Unk_ov97_0223EA20 = { +__attribute__((aligned(32))) static WMParentParam Unk_ov97_0223EA20 = { NULL, 0x0, 0x0, @@ -33,188 +33,188 @@ __attribute__ ((aligned(32))) static WMParentParam Unk_ov97_0223EA20 = { 0x0, 0x0, 0xC8, - {0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, + { 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, 0x0, 0x40, 0x40 }; -WMParentParam * ov97_02233408 (void) +WMParentParam *ov97_02233408(void) { return &Unk_ov97_0223EA20; } -UnkStruct_ov97_0223222C * ov97_02233410 (void) +UnkStruct_ov97_0223222C *ov97_02233410(void) { return &Unk_ov97_0223F1C0; } -int ov97_02233418 (void) +int ov97_02233418(void) { return (int)ov97_02233410()->unk_00; } -void ov97_02233424 (int param0) +void ov97_02233424(int param0) { ov97_02233410()->unk_00 = (u8)param0; } -int ov97_02233430 (void) +int ov97_02233430(void) { return (int)ov97_02233410()->unk_01; } -void ov97_0223343C (int param0) +void ov97_0223343C(int param0) { ov97_02233410()->unk_01 = (u8)param0; } -int ov97_02233448 (void) +int ov97_02233448(void) { return (int)ov97_02233410()->unk_02; } -void ov97_02233454 (int param0) +void ov97_02233454(int param0) { ov97_02233410()->unk_02 = (u8)param0; } -u32 ov97_02233460 (void) +u32 ov97_02233460(void) { return (u32)ov97_02233410()->unk_03; } -void ov97_0223346C (u32 param0) +void ov97_0223346C(u32 param0) { ov97_02233408()->channel = (u16)param0; } -WMScanParam * ov97_02233478 (void) +WMScanParam *ov97_02233478(void) { return ov97_02233410()->unk_24; } -u32 ov97_02233484 (void) +u32 ov97_02233484(void) { return ov97_02233410()->unk_2C; } -u32 ov97_02233490 (void) +u32 ov97_02233490(void) { return ov97_02233410()->unk_30; } -void * ov97_0223349C (void) +void *ov97_0223349C(void) { return ov97_02233410()->unk_38; } -void * ov97_022334A8 (void) +void *ov97_022334A8(void) { return ov97_02233410()->unk_3C; } -WMBssDesc * ov97_022334B4 (void) +WMBssDesc *ov97_022334B4(void) { return ov97_02233410()->unk_28; } -void ov97_022334C0 (u16 param0) +void ov97_022334C0(u16 param0) { ov97_02233410()->unk_0C = param0; } -BOOL ov97_022334CC (void) +BOOL ov97_022334CC(void) { return ov97_02233410()->unk_14; } -void ov97_022334D8 (BOOL param0) +void ov97_022334D8(BOOL param0) { ov97_02233410()->unk_14 = param0; } -void ov97_022334E4 (BOOL param0) +void ov97_022334E4(BOOL param0) { ov97_02233410()->unk_18 = param0; } -void ov97_022334F0 (BOOL param0) +void ov97_022334F0(BOOL param0) { ov97_02233410()->unk_20 = param0; } -UnkUnion_ov97_022334FC * ov97_022334FC (void) +UnkUnion_ov97_022334FC *ov97_022334FC(void) { return &ov97_02233410()->unk_90; } -UnkStruct_ov97_02232620 * ov97_02233508 (void) +UnkStruct_ov97_02232620 *ov97_02233508(void) { return &ov97_022334FC()->val2; } -UnkStruct_ov97_02232254 * ov97_02233510 (void) +UnkStruct_ov97_02232254 *ov97_02233510(void) { return &ov97_022334FC()->val1; } -void ov97_02233518 (void) +void ov97_02233518(void) { - UnkStruct_ov97_02232620 * v0 = ov97_02233508(); + UnkStruct_ov97_02232620 *v0 = ov97_02233508(); MI_CpuClear8(v0, sizeof(UnkStruct_ov97_02232620)); v0->unk_1C0 = 280; } -UnkStruct_ov97_02232AC8 * ov97_02233538 (void) +UnkStruct_ov97_02232AC8 *ov97_02233538(void) { return &ov97_02233410()->unk_254; } -void ov97_02233548 (void) +void ov97_02233548(void) { - UnkStruct_ov97_02232AC8 * v0 = ov97_02233538(); + UnkStruct_ov97_02232AC8 *v0 = ov97_02233538(); v0->unk_18 = 0; } -u32 ov97_02233554 (void) +u32 ov97_02233554(void) { return ov97_02233410()->unk_04; } -u32 ov97_02233560 (void) +u32 ov97_02233560(void) { return (u32)ov97_02233410()->unk_40.unk_00.unk_00.unk_00_0; } -u32 ov97_02233570 (void) +u32 ov97_02233570(void) { return (u32)ov97_02233410()->unk_40.unk_00.unk_00.unk_00_8; } -u32 ov97_02233580 (void) +u32 ov97_02233580(void) { return (u32)ov97_02233410()->unk_40.unk_00.unk_04.unk_00_16; } -u32 ov97_0223358C (void) +u32 ov97_0223358C(void) { return sizeof(UnkStruct_ov97_02233268); } -UnkStruct_ov97_02233268 * ov97_02233590 (void) +UnkStruct_ov97_02233268 *ov97_02233590(void) { return &ov97_02233410()->unk_40; } -UnkStruct_ov97_022339EC * ov97_0223359C (void) +UnkStruct_ov97_022339EC *ov97_0223359C(void) { return &ov97_02233410()->unk_78; } -UnkStruct_ov97_022335A8 ov97_022335A8 (u8 * param0) +UnkStruct_ov97_022335A8 ov97_022335A8(u8 *param0) { u32 v0; UnkStruct_ov97_022335A8 v1; @@ -228,7 +228,7 @@ UnkStruct_ov97_022335A8 ov97_022335A8 (u8 * param0) return v1; } -UnkStruct_ov97_022335C8 ov97_022335C8 (u8 * param0) +UnkStruct_ov97_022335C8 ov97_022335C8(u8 *param0) { u32 v0; UnkStruct_ov97_022335C8 v1; @@ -242,26 +242,26 @@ UnkStruct_ov97_022335C8 ov97_022335C8 (u8 * param0) return v1; } -void ov97_022335EC (u32 param0, u32 * param1, u32 * param2) +void ov97_022335EC(u32 param0, u32 *param1, u32 *param2) { *param1 = param0 % 10000; *param2 = (param0 / 10000) % 10000; } -u32 ov97_02233614 (void) +u32 ov97_02233614(void) { return sizeof(UnkStruct_ov97_02233674); } -static u32 ov97_02233618 () +static u32 ov97_02233618() { return ((u32)(OS_GetTick() + GX_GetVCount()) & 0xFFFFFFFE) + 1; } -static u32 ov97_02233630 (u32 param0, u32 param1, void * param2) +static u32 ov97_02233630(u32 param0, u32 param1, void *param2) { u32 v0; - u32 * v1 = (u32 *)param2; + u32 *v1 = (u32 *)param2; MATHRandContext16 v2; MATH_InitRand16(&v2, param0); @@ -274,10 +274,10 @@ static u32 ov97_02233630 (u32 param0, u32 param1, void * param2) return v2.x; } -void ov97_02233674 (void * param0, void * param1, u32 param2, int param3, u32 param4) +void ov97_02233674(void *param0, void *param1, u32 param2, int param3, u32 param4) { - UnkStruct_ov97_02233674 * v0 = (UnkStruct_ov97_02233674 *)param0; - UnkStruct_ov97_02233268 * v1 = ov97_02233590(); + UnkStruct_ov97_02233674 *v0 = (UnkStruct_ov97_02233674 *)param0; + UnkStruct_ov97_02233268 *v1 = ov97_02233590(); v0->unk_00.unk_00_0 = v1->unk_00.unk_00.unk_00_0; v0->unk_00.unk_00_8 = v1->unk_00.unk_00.unk_00_8; @@ -304,10 +304,10 @@ void ov97_02233674 (void * param0, void * param1, u32 param2, int param3, u32 pa } } -void ov97_022337A4 (void * param0) +void ov97_022337A4(void *param0) { - UnkStruct_ov97_02233674 * v0 = (UnkStruct_ov97_02233674 *)param0; - UnkStruct_ov97_02233268 * v1 = ov97_02233590(); + UnkStruct_ov97_02233674 *v0 = (UnkStruct_ov97_02233674 *)param0; + UnkStruct_ov97_02233268 *v1 = ov97_02233590(); if ((int)v0->unk_00.unk_00_12 == 1) { u32 v2; @@ -317,9 +317,9 @@ void ov97_022337A4 (void * param0) } } -BOOL ov97_022337D8 (void * param0) +BOOL ov97_022337D8(void *param0) { - UnkStruct_ov97_02233674 * v0 = (UnkStruct_ov97_02233674 *)param0; + UnkStruct_ov97_02233674 *v0 = (UnkStruct_ov97_02233674 *)param0; u16 v1 = SVC_GetCRC16(0, ((u8 *)param0) + v0->unk_0C.unk_00_0, v0->unk_0C.unk_00_8); if (v0->unk_08.unk_00_16 == v1) { diff --git a/src/overlay097/ov97_022337FC.c b/src/overlay097/ov97_022337FC.c index d31e1c6cd5..5463232c0f 100644 --- a/src/overlay097/ov97_022337FC.c +++ b/src/overlay097/ov97_022337FC.c @@ -1,3 +1,5 @@ +#include "overlay097/ov97_022337FC.h" + #include #include @@ -5,39 +7,37 @@ #include "overlay097/struct_ov97_02232620.h" #include "overlay097/struct_ov97_02233674.h" -#include "overlay097/ov97_022337FC.h" - -void ov97_022337FC (WMErrCode param0) +void ov97_022337FC(WMErrCode param0) { #pragma unused(param0) return; } -void ov97_02233800 (WMStateCode param0) +void ov97_02233800(WMStateCode param0) { #pragma unused(param0) return; } -void ov97_02233804 (WMBssDesc * param0) +void ov97_02233804(WMBssDesc *param0) { #pragma unused(param0) return; } -void ov97_02233808 (UnkStruct_ov97_02232620 * param0) +void ov97_02233808(UnkStruct_ov97_02232620 *param0) { #pragma unused(param0) return; } -void ov97_0223380C (UnkStruct_ov97_02232254 * param0) +void ov97_0223380C(UnkStruct_ov97_02232254 *param0) { #pragma unused(param0) return; } -void ov97_02233810 (UnkStruct_ov97_02233674 * param0) +void ov97_02233810(UnkStruct_ov97_02233674 *param0) { #pragma unused(param0) return; diff --git a/src/overlay097/ov97_02233814.c b/src/overlay097/ov97_02233814.c index e18dea3a47..cb1757ebe0 100644 --- a/src/overlay097/ov97_02233814.c +++ b/src/overlay097/ov97_02233814.c @@ -1,17 +1,17 @@ +#include "overlay097/ov97_02233814.h" + #include #include +#include "overlay097/ov97_02232200.h" +#include "overlay097/ov97_02233408.h" +#include "overlay097/ov97_022337FC.h" #include "overlay097/struct_ov97_02232254.h" #include "overlay097/struct_ov97_02232620.h" #include "overlay097/struct_ov97_02233268.h" #include "overlay097/struct_ov97_022339EC.h" -#include "overlay097/ov97_02232200.h" -#include "overlay097/ov97_02233408.h" -#include "overlay097/ov97_022337FC.h" -#include "overlay097/ov97_02233814.h" - -BOOL ov97_02233814 (const void * param0, u32 param1, u16 param2) +BOOL ov97_02233814(const void *param0, u32 param1, u16 param2) { WMErrCode v0; @@ -25,7 +25,7 @@ BOOL ov97_02233814 (const void * param0, u32 param1, u16 param2) } } -BOOL ov97_02233854 (void) +BOOL ov97_02233854(void) { WMErrCode v0; @@ -39,7 +39,7 @@ BOOL ov97_02233854 (void) } } -BOOL ov97_02233870 (void) +BOOL ov97_02233870(void) { WMErrCode v0; @@ -54,7 +54,7 @@ BOOL ov97_02233870 (void) } } -BOOL ov97_02233890 (u32 param0) +BOOL ov97_02233890(u32 param0) { WMErrCode v0; @@ -68,12 +68,12 @@ BOOL ov97_02233890 (u32 param0) } } -BOOL ov97_022338BC (void) +BOOL ov97_022338BC(void) { WMErrCode v0; - WMParentParam * v1 = ov97_02233408(); - UnkStruct_ov97_02233268 * v2 = ov97_02233590(); - UnkStruct_ov97_02232254 * v3 = ov97_02233510(); + WMParentParam *v1 = ov97_02233408(); + UnkStruct_ov97_02233268 *v2 = ov97_02233590(); + UnkStruct_ov97_02232254 *v3 = ov97_02233510(); v1->channel = v3->unk_64; v1->userGameInfo = (u16 *)v2; @@ -89,7 +89,7 @@ BOOL ov97_022338BC (void) } } -BOOL ov97_022338F8 (void) +BOOL ov97_022338F8(void) { WMErrCode v0; @@ -103,7 +103,7 @@ BOOL ov97_022338F8 (void) } } -BOOL ov97_02233914 (void) +BOOL ov97_02233914(void) { WMErrCode v0; @@ -117,13 +117,13 @@ BOOL ov97_02233914 (void) } } -BOOL ov97_02233938 (void) +BOOL ov97_02233938(void) { WMErrCode v0; { - WMScanParam * v1 = ov97_02233478(); - UnkStruct_ov97_02232620 * v2 = ov97_02233508(); + WMScanParam *v1 = ov97_02233478(); + UnkStruct_ov97_02232620 *v2 = ov97_02233508(); v1->bssid[0] = v2->unk_00[v2->unk_1C3_0].unk_34.unk_00.val1[0]; v1->bssid[1] = v2->unk_00[v2->unk_1C3_0].unk_34.unk_00.val1[1]; @@ -143,7 +143,7 @@ BOOL ov97_02233938 (void) } } -BOOL ov97_022339D0 (void) +BOOL ov97_022339D0(void) { WMErrCode v0; @@ -157,10 +157,10 @@ BOOL ov97_022339D0 (void) } } -BOOL ov97_022339EC (void) +BOOL ov97_022339EC(void) { WMErrCode v0; - UnkStruct_ov97_022339EC * v1 = ov97_0223359C(); + UnkStruct_ov97_022339EC *v1 = ov97_0223359C(); v0 = WM_StartConnect(ov97_02232998, ov97_022334B4(), (const u8 *)v1); @@ -172,7 +172,7 @@ BOOL ov97_022339EC (void) } } -BOOL ov97_02233A24 (void) +BOOL ov97_02233A24(void) { WMErrCode v0; @@ -195,7 +195,7 @@ BOOL ov97_02233A24 (void) } } -BOOL ov97_02233A9C (void) +BOOL ov97_02233A9C(void) { WMErrCode v0; @@ -209,7 +209,7 @@ BOOL ov97_02233A9C (void) } } -BOOL ov97_02233AB8 (void) +BOOL ov97_02233AB8(void) { WMErrCode v0; @@ -224,7 +224,7 @@ BOOL ov97_02233AB8 (void) } } -BOOL ov97_02233AD8 (void) +BOOL ov97_02233AD8(void) { WMErrCode v0; @@ -239,7 +239,7 @@ BOOL ov97_02233AD8 (void) } } -BOOL ov97_02233AF8 (void) +BOOL ov97_02233AF8(void) { WMErrCode v0; diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index 1ce060abc7..ce4b6097b4 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -1,87 +1,81 @@ #include #include -#include "core_sys.h" +#include "constants/gba/species.h" +#include "constants/species.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02024440_decl.h" -#include "trainer_info.h" -#include "savedata.h" - -#include "overlay077/const_ov77_021D742C.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02015958.h" -#include "touch_screen.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" -#include "pokemon.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" +#include "overlay077/const_ov77_021D742C.h" #include "overlay084/struct_ov84_0223BA5C.h" +#include "overlay097/box_pokemon_gba.h" +#include "overlay097/ov97_02235D18.h" +#include "overlay097/ov97_0223635C.h" +#include "overlay097/ov97_02236380.h" +#include "overlay097/ov97_02237694.h" +#include "overlay097/ov97_022392E4.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay097/struct_ov97_02236340.h" -#include "overlay097/box_pokemon_gba.h" #include "overlay115/struct_ov115_02261520.h" +#include "savedata/save_table.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "touch_screen.h" +#include "trainer_info.h" #include "unk_02000C88.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "savedata/save_table.h" -#include "savedata.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202EEC0.h" -#include "pokemon.h" -#include "pokemon_icon.h" -#include "item.h" #include "unk_0209A74C.h" -#include "overlay097/ov97_02235D18.h" -#include "overlay097/ov97_0223635C.h" -#include "overlay097/ov97_02236380.h" -#include "overlay097/ov97_02237694.h" -#include "overlay097/ov97_022392E4.h" - -#include "constants/species.h" -#include "constants/gba/species.h" FS_EXTERN_OVERLAY(overlay77); typedef struct { - Window * unk_00; + Window *unk_00; int unk_04; int unk_08; int unk_0C; @@ -95,21 +89,21 @@ typedef struct { u32 unk_2C; u32 unk_30; int unk_34; - u16 * unk_38; - Strbuf* unk_3C; - StringTemplate * unk_40; + u16 *unk_38; + Strbuf *unk_3C; + StringTemplate *unk_40; int unk_44; int unk_48; } UnkStruct_ov97_02233DAC; typedef struct { - GraphicElementData * unk_00; - GraphicElementData * unk_04; + GraphicElementData *unk_00; + GraphicElementData *unk_04; int unk_08; } UnkStruct_ov97_02234A2C_sub1; typedef struct { - GraphicElementData * unk_00; + GraphicElementData *unk_00; int unk_04; int unk_08; } UnkStruct_ov97_02234A2C_sub2; @@ -117,13 +111,13 @@ typedef struct { typedef struct { int unk_00; int unk_04; - void * unk_08; + void *unk_08; } UnkStruct_ov97_02233B8C; typedef struct { int unk_00; int unk_04; - GraphicElementData * unk_08; + GraphicElementData *unk_08; u8 unk_0C[512]; } UnkStruct_ov97_0223F434; @@ -132,25 +126,25 @@ typedef struct { int unk_04; int unk_08; int unk_0C; - SaveData * unk_10; - TrainerInfo * unk_14; - Options * unk_18; + SaveData *unk_10; + TrainerInfo *unk_14; + Options *unk_18; int unk_1C; - BGL * unk_20; + BGL *unk_20; int unk_24; - GraphicElementManager * unk_28; + GraphicElementManager *unk_28; UnkStruct_0200C738 unk_2C; - UnkStruct_02009714 * unk_1B8[6]; - UnkStruct_02009DC8 * unk_1D0[6]; + UnkStruct_02009714 *unk_1B8[6]; + UnkStruct_02009DC8 *unk_1D0[6]; UnkStruct_ov19_021DA864 unk_1E8; UnkStruct_ov97_02234A2C_sub1 unk_20C[30]; TouchScreenRect unk_374[34]; - GraphicElementData * unk_3FC[4]; - GraphicElementData * unk_40C[4]; - GraphicElementData * unk_41C[4]; + GraphicElementData *unk_3FC[4]; + GraphicElementData *unk_40C[4]; + GraphicElementData *unk_41C[4]; UnkStruct_ov97_02234A2C_sub2 unk_42C[6]; int unk_474; - GraphicElementData * unk_478[6]; + GraphicElementData *unk_478[6]; UnkStruct_ov97_02233DAC unk_490; Window unk_4DC; Window unk_4EC; @@ -158,27 +152,27 @@ typedef struct { int unk_50C; int unk_510; u32 unk_514[14580]; - PokemonStorageGBA * unk_E8E0; + PokemonStorageGBA *unk_E8E0; int unk_E8E4; int unk_E8E8; - UnkStruct_02015920 * unk_E8EC; + UnkStruct_02015920 *unk_E8EC; UnkStruct_ov97_02233B8C unk_E8F0; UnkStruct_ov97_0223F434 unk_E8FC[30]; - void (* unk_12664)(void); - Strbuf* unk_12668; - Strbuf* unk_1266C; + void (*unk_12664)(void); + Strbuf *unk_12668; + Strbuf *unk_1266C; } UnkStruct_ov97_02234A2C; -static void ov97_02234A2C(UnkStruct_ov97_02234A2C * param0, int param1); -static void ov97_022349E0(UnkStruct_ov97_02234A2C * param0); -static void ov97_02234ECC(UnkStruct_ov97_02234A2C * param0); -static void ov97_02235310(UnkStruct_ov97_02234A2C * param0); -static void ov97_02233D10(UnkStruct_ov97_02234A2C * param0); -void Strbuf_CopyNumChars(Strbuf *param0, const u16 * param1, u32 param2); -void Strbuf_CopyChars(Strbuf *param0, const u16 * param1); -void BoxMonGBAToBoxMon(BoxPokemonGBA * param0, BoxPokemon * param1); +static void ov97_02234A2C(UnkStruct_ov97_02234A2C *param0, int param1); +static void ov97_022349E0(UnkStruct_ov97_02234A2C *param0); +static void ov97_02234ECC(UnkStruct_ov97_02234A2C *param0); +static void ov97_02235310(UnkStruct_ov97_02234A2C *param0); +static void ov97_02233D10(UnkStruct_ov97_02234A2C *param0); +void Strbuf_CopyNumChars(Strbuf *param0, const u16 *param1, u32 param2); +void Strbuf_CopyChars(Strbuf *param0, const u16 *param1); +void BoxMonGBAToBoxMon(BoxPokemonGBA *param0, BoxPokemon *param1); -UnkStruct_ov97_0223F434 * Unk_ov97_0223F434; +UnkStruct_ov97_0223F434 *Unk_ov97_0223F434; static int Unk_ov97_0223EA98[] = { 0xF, @@ -229,7 +223,7 @@ static int Unk_ov97_0223EAB8[] = { 0x21 }; -static BOOL IsGBASpeciesInvalid (int speciesGBA) +static BOOL IsGBASpeciesInvalid(int speciesGBA) { if (speciesGBA <= SPECIES_NONE) { return TRUE; @@ -244,7 +238,7 @@ static BOOL IsGBASpeciesInvalid (int speciesGBA) return TRUE; } -static void ov97_02233B44 (UnkStruct_ov97_02234A2C * param0) +static void ov97_02233B44(UnkStruct_ov97_02234A2C *param0) { switch (ov97_02235DB0()) { case 0: @@ -268,13 +262,13 @@ static void ov97_02233B44 (UnkStruct_ov97_02234A2C * param0) } } -static int ov97_02233B8C (UnkStruct_ov97_02234A2C * param0) +static int ov97_02233B8C(UnkStruct_ov97_02234A2C *param0) { int v0; u8 v1[16]; int v2; - PalParkTransfer * v3; - UnkStruct_ov97_02233B8C * v4 = ¶m0->unk_E8F0; + PalParkTransfer *v3; + UnkStruct_ov97_02233B8C *v4 = ¶m0->unk_E8F0; switch (v4->unk_00) { case 0: @@ -368,9 +362,9 @@ static int ov97_02233B8C (UnkStruct_ov97_02234A2C * param0) return 10; } -static void ov97_02233CE4 (UnkStruct_ov97_02234A2C * param0) +static void ov97_02233CE4(UnkStruct_ov97_02234A2C *param0) { - PalParkTransfer * v0; + PalParkTransfer *v0; int v1; v0 = SaveData_PalParkTransfer(param0->unk_10); @@ -382,14 +376,14 @@ static void ov97_02233CE4 (UnkStruct_ov97_02234A2C * param0) ResetUnlock(4); } -static void ov97_02233D10 (UnkStruct_ov97_02234A2C * param0) +static void ov97_02233D10(UnkStruct_ov97_02234A2C *param0) { int v0, v1, v2; u16 v3; - BoxPokemon * v4; - BoxPokemonGBA * v5; + BoxPokemon *v4; + BoxPokemonGBA *v5; Pokemon v6; - PalParkTransfer * v7; + PalParkTransfer *v7; v7 = SaveData_PalParkTransfer(param0->unk_10); v4 = Pokemon_GetBoxPokemon(&v6); @@ -415,7 +409,7 @@ static void ov97_02233D10 (UnkStruct_ov97_02234A2C * param0) } } -static int ov97_02233DAC (UnkStruct_ov97_02233DAC * param0, Strbuf *param1, int param2) +static int ov97_02233DAC(UnkStruct_ov97_02233DAC *param0, Strbuf *param1, int param2) { int v0, v1; @@ -428,13 +422,13 @@ static int ov97_02233DAC (UnkStruct_ov97_02233DAC * param0, Strbuf *param1, int } } -static void ov97_02233DD0 (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_02233DAC * param1, int param2) +static void ov97_02233DD0(UnkStruct_ov97_02234A2C *param0, UnkStruct_ov97_02233DAC *param1, int param2) { - Strbuf* v0; - StringTemplate * v1; - MessageLoader * v2; + Strbuf *v0; + StringTemplate *v1; + MessageLoader *v2; int v3, v4, v5; - Strbuf* v6; + Strbuf *v6; if (param1->unk_44 == 0) { v5 = 0xff; @@ -506,11 +500,14 @@ static void ov97_02233DD0 (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223 } } -static void ov97_02233F74 (void) +static void ov97_02233F74(void) { { UnkStruct_ov22_022559F8 v0 = { - 20, 2048, 2048, 78, + 20, + 2048, + 2048, + 78, }; sub_0201E86C(&v0); @@ -521,7 +518,7 @@ static void ov97_02233F74 (void) sub_0201F8E4(); } -static void ov97_02233FA4 (UnkStruct_ov97_02234A2C * param0) +static void ov97_02233FA4(UnkStruct_ov97_02234A2C *param0) { int v0; @@ -545,13 +542,13 @@ static void ov97_02233FA4 (UnkStruct_ov97_02234A2C * param0) sub_02006E84(19, PokeIconPalettesFileIndex(), 1, 8 * 0x20, 0, 78); } -static void ov97_022340B0 (UnkStruct_ov97_02234A2C * param0) +static void ov97_022340B0(UnkStruct_ov97_02234A2C *param0) { sub_020093B4(¶m0->unk_1E8, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, param0->unk_1B8[0], param0->unk_1B8[1], param0->unk_1B8[2], param0->unk_1B8[3], NULL, NULL); GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov97_022340FC (UnkStruct_ov115_02261520 * param0, UnkStruct_ov97_02234A2C * param1, UnkStruct_ov19_021DA864 * param2, int param3) +static void ov97_022340FC(UnkStruct_ov115_02261520 *param0, UnkStruct_ov97_02234A2C *param1, UnkStruct_ov19_021DA864 *param2, int param3) { param0->unk_00 = param1->unk_28; param0->unk_04 = ¶m1->unk_1E8; @@ -565,22 +562,22 @@ static void ov97_022340FC (UnkStruct_ov115_02261520 * param0, UnkStruct_ov97_022 param0->unk_2C = 78; } -static int ov97_02234124 (UnkStruct_ov97_02234A2C * param0, int param1, int param2) +static int ov97_02234124(UnkStruct_ov97_02234A2C *param0, int param1, int param2) { return GetGBABoxMonData(&(param0->unk_E8E0->boxes[param1][param2]), 11, NULL); } -static int ov97_02234148 (UnkStruct_ov97_02234A2C * param0, int param1, int param2) +static int ov97_02234148(UnkStruct_ov97_02234A2C *param0, int param1, int param2) { return GetGBABoxMonData(&(param0->unk_E8E0->boxes[param1][param2]), 45, NULL); } -static int ov97_0223416C (UnkStruct_ov97_02234A2C * param0, int param1, int param2) +static int ov97_0223416C(UnkStruct_ov97_02234A2C *param0, int param1, int param2) { return GetGBABoxMonData(&(param0->unk_E8E0->boxes[param1][param2]), 0, NULL); } -static void ov97_02234190 (TouchScreenRect *rect, int param1, int param2, int param3, int param4) +static void ov97_02234190(TouchScreenRect *rect, int param1, int param2, int param3, int param4) { rect->rect.top = param2 - param4 / 2; rect->rect.left = param1 - param3 / 2; @@ -588,9 +585,9 @@ static void ov97_02234190 (TouchScreenRect *rect, int param1, int param2, int pa rect->rect.right = param1 + param3 / 2; } -static void * ov97_022341B4 (u32 param0, u32 param1, NNSG2dCharacterData ** param2, u32 param3) +static void *ov97_022341B4(u32 param0, u32 param1, NNSG2dCharacterData **param2, u32 param3) { - void * v0; + void *v0; v0 = Heap_AllocFromHeapAtEnd(param3, 4096); @@ -606,13 +603,13 @@ static void * ov97_022341B4 (u32 param0, u32 param1, NNSG2dCharacterData ** para return v0; } -static void ov97_022341EC (u32 param0, NNSG2dCharacterData ** param1, void * param2, NARC * param3) +static void ov97_022341EC(u32 param0, NNSG2dCharacterData **param1, void *param2, NARC *param3) { NARC_ReadWholeMember(param3, param0, param2); NNS_G2dGetUnpackedBGCharacterData(param2, param1); } -static u8 GBASpeciesToDSFormId (int param0, u32 param1, int param2) +static u8 GBASpeciesToDSFormId(int param0, u32 param1, int param2) { u8 v0; @@ -646,11 +643,11 @@ static u8 GBASpeciesToDSFormId (int param0, u32 param1, int param2) return v0; } -static void ov97_02234278 (int param0, int param1, u32 param2, int param3, int param4, GraphicElementData * param5) +static void ov97_02234278(int param0, int param1, u32 param2, int param3, int param4, GraphicElementData *param5) { - u8 * v0; + u8 *v0; u8 v1; - NNSG2dCharacterData * v2; + NNSG2dCharacterData *v2; param0 = ov97_02236DD0(param0); @@ -664,11 +661,11 @@ static void ov97_02234278 (int param0, int param1, u32 param2, int param3, int p Heap_FreeToHeap(v0); } -static void ov97_022342E4 (int param0, int param1, int param2, int param3, GraphicElementData * param4, void * param5, NARC * param6) +static void ov97_022342E4(int param0, int param1, int param2, int param3, GraphicElementData *param4, void *param5, NARC *param6) { u32 v0; - NNSG2dCharacterData * v1; - UnkStruct_ov97_0223F434 * v2 = Unk_ov97_0223F434 + param3; + NNSG2dCharacterData *v1; + UnkStruct_ov97_0223F434 *v2 = Unk_ov97_0223F434 + param3; if (param4) { if (IsGBASpeciesInvalid(param0) == 0) { @@ -690,10 +687,10 @@ static void ov97_022342E4 (int param0, int param1, int param2, int param3, Graph } } -static void ov97_02234364 (void) +static void ov97_02234364(void) { int v0; - UnkStruct_ov97_0223F434 * v1 = Unk_ov97_0223F434; + UnkStruct_ov97_0223F434 *v1 = Unk_ov97_0223F434; for (v0 = 0; v0 < 30; v0++, v1++) { if (v1->unk_08) { @@ -704,12 +701,12 @@ static void ov97_02234364 (void) } } -static void ov97_022343A8 (UnkStruct_ov97_02234A2C * param0) +static void ov97_022343A8(UnkStruct_ov97_02234A2C *param0) { int v0, v1, v2, v3, v4; u32 v5; - void * v6; - NARC * v7; + void *v6; + NARC *v7; v7 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 78); v6 = Heap_AllocFromHeapAtEnd(78, 4096); @@ -746,7 +743,7 @@ static void ov97_022343A8 (UnkStruct_ov97_02234A2C * param0) ov97_022349E0(param0); } -static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0) +static void ov97_02234508(UnkStruct_ov97_02234A2C *param0) { int v0, v1, v2; UnkStruct_ov115_02261520 v3; @@ -794,10 +791,10 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0) } } -static GraphicElementData * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int param1, int param2, int param3, int param4) +static GraphicElementData *ov97_02234638(UnkStruct_ov97_02234A2C *param0, int param1, int param2, int param3, int param4) { UnkStruct_ov115_02261520 v0; - GraphicElementData * v1; + GraphicElementData *v1; ov97_022340FC(&v0, param0, ¶m0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN); @@ -815,7 +812,7 @@ static GraphicElementData * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int return v1; } -static void ov97_0223468C (UnkStruct_ov97_02234A2C * param0) +static void ov97_0223468C(UnkStruct_ov97_02234A2C *param0) { int v0; @@ -838,10 +835,10 @@ static void ov97_0223468C (UnkStruct_ov97_02234A2C * param0) param0->unk_474 = 0; } -static BOOL ov97_0223474C (UnkStruct_ov97_02234A2C * param0, int param1) +static BOOL ov97_0223474C(UnkStruct_ov97_02234A2C *param0, int param1) { int v0; - BoxPokemonGBA * v1 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; + BoxPokemonGBA *v1 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; if (GetGBABoxMonData(v1, 65, NULL) == 412) { return 1; @@ -850,10 +847,10 @@ static BOOL ov97_0223474C (UnkStruct_ov97_02234A2C * param0, int param1) return 0; } -static BOOL ov97_02234784 (UnkStruct_ov97_02234A2C * param0, int param1) +static BOOL ov97_02234784(UnkStruct_ov97_02234A2C *param0, int param1) { int v0, v1, v2; - BoxPokemonGBA * v3 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; + BoxPokemonGBA *v3 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; for (v0 = 0; v0 < 4; v0++) { v2 = GetGBABoxMonData(v3, 13 + v0, NULL); @@ -869,158 +866,157 @@ static BOOL ov97_02234784 (UnkStruct_ov97_02234A2C * param0, int param1) } u16 Unk_ov97_0223EAD8[] = { - 0x5, - 0x34, - 0x35, - 0x36, - 0x37, - 0x38, - 0x39, - 0x3A, - 0x3B, - 0x3C, - 0x3D, - 0x3E, - 0x48, - 0x52, - 0x57, - 0x58, - 0x59, - 0x5A, - 0x5B, - 0x5C, - 0x63, - 0x64, - 0x65, - 0x66, - 0x69, - 0x70, - 0x71, - 0x72, - 0x73, - 0x74, - 0x75, - 0x76, - 0x77, - 0x78, - 0x79, - 0x7A, - 0x7B, - 0x7C, - 0x7D, - 0x7E, - 0x7F, - 0x80, - 0x81, - 0x82, - 0x83, - 0x84, - 0xB0, - 0xB1, - 0xB2, - 0xE2, - 0xE3, - 0xE4, - 0xE5, - 0xE6, - 0xE7, - 0xE8, - 0xE9, - 0xEA, - 0xEB, - 0xEC, - 0xED, - 0xEE, - 0xEF, - 0xF0, - 0xF1, - 0xF2, - 0xF3, - 0xF4, - 0xF5, - 0xF6, - 0xF7, - 0xF8, - 0xF9, - 0xFA, - 0xFB, - 0xFC, - 0xFD, - 0x103, - 0x104, - 0x105, - 0x106, - 0x107, - 0x108, - 0x109, - 0x10A, - 0x10B, - 0x10C, - 0x10D, - 0x10E, - 0x10F, - 0x110, - 0x111, - 0x112, - 0x113, - 0x114, - 0x115, - 0x116, - 0x117, - 0x118, - 0x119, - 0x11A, - 0x11B, - 0x11C, - 0x11D, - 0x11E, - 0x11F, - 0x120, - 0x153, - 0x154, - 0x155, - 0x156, - 0x157, - 0x158, - 0x159, - 0x15A, - 0x15B, - 0x15C, - 0x15D, - 0x15E, - 0x15F, - 0x160, - 0x161, - 0x162, - 0x163, - 0x164, - 0x165, - 0x166, - 0x167, - 0x168, - 0x169, - 0x16A, - 0x16B, - 0x16C, - 0x16D, - 0x16E, - 0x16F, - 0x170, - 0x171, - 0x172, - 0x173, - 0x174, - 0x175, - 0x176, - 0x177, - 0x178, - 0x0 + 0x5, + 0x34, + 0x35, + 0x36, + 0x37, + 0x38, + 0x39, + 0x3A, + 0x3B, + 0x3C, + 0x3D, + 0x3E, + 0x48, + 0x52, + 0x57, + 0x58, + 0x59, + 0x5A, + 0x5B, + 0x5C, + 0x63, + 0x64, + 0x65, + 0x66, + 0x69, + 0x70, + 0x71, + 0x72, + 0x73, + 0x74, + 0x75, + 0x76, + 0x77, + 0x78, + 0x79, + 0x7A, + 0x7B, + 0x7C, + 0x7D, + 0x7E, + 0x7F, + 0x80, + 0x81, + 0x82, + 0x83, + 0x84, + 0xB0, + 0xB1, + 0xB2, + 0xE2, + 0xE3, + 0xE4, + 0xE5, + 0xE6, + 0xE7, + 0xE8, + 0xE9, + 0xEA, + 0xEB, + 0xEC, + 0xED, + 0xEE, + 0xEF, + 0xF0, + 0xF1, + 0xF2, + 0xF3, + 0xF4, + 0xF5, + 0xF6, + 0xF7, + 0xF8, + 0xF9, + 0xFA, + 0xFB, + 0xFC, + 0xFD, + 0x103, + 0x104, + 0x105, + 0x106, + 0x107, + 0x108, + 0x109, + 0x10A, + 0x10B, + 0x10C, + 0x10D, + 0x10E, + 0x10F, + 0x110, + 0x111, + 0x112, + 0x113, + 0x114, + 0x115, + 0x116, + 0x117, + 0x118, + 0x119, + 0x11A, + 0x11B, + 0x11C, + 0x11D, + 0x11E, + 0x11F, + 0x120, + 0x153, + 0x154, + 0x155, + 0x156, + 0x157, + 0x158, + 0x159, + 0x15A, + 0x15B, + 0x15C, + 0x15D, + 0x15E, + 0x15F, + 0x160, + 0x161, + 0x162, + 0x163, + 0x164, + 0x165, + 0x166, + 0x167, + 0x168, + 0x169, + 0x16A, + 0x16B, + 0x16C, + 0x16D, + 0x16E, + 0x16F, + 0x170, + 0x171, + 0x172, + 0x173, + 0x174, + 0x175, + 0x176, + 0x177, + 0x178, + 0x0 }; - -static BOOL ov97_022347D8 (UnkStruct_ov97_02234A2C * param0, int param1) +static BOOL ov97_022347D8(UnkStruct_ov97_02234A2C *param0, int param1) { - BoxPokemonGBA * v0 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; + BoxPokemonGBA *v0 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; int v1 = GetGBABoxMonData(v0, 12, NULL); int v2; @@ -1033,15 +1029,15 @@ static BOOL ov97_022347D8 (UnkStruct_ov97_02234A2C * param0, int param1) return 0; } -static BOOL ov97_02234828 (UnkStruct_ov97_02234A2C * param0, int param1) +static BOOL ov97_02234828(UnkStruct_ov97_02234A2C *param0, int param1) { - BoxPokemonGBA * v0 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; + BoxPokemonGBA *v0 = ¶m0->unk_E8E0->boxes[param0->unk_E8E4][param1]; int v1 = GetGBABoxMonData(v0, 11, NULL); return IsGBASpeciesInvalid(v1); } -static int ov97_02234854 (UnkStruct_ov97_02234A2C * param0, int param1) +static int ov97_02234854(UnkStruct_ov97_02234A2C *param0, int param1) { int v0, v1; @@ -1072,7 +1068,7 @@ static int ov97_02234854 (UnkStruct_ov97_02234A2C * param0, int param1) } if (v1 == -1) { - const VecFx32 * v2; + const VecFx32 *v2; VecFx32 v3; if (param0->unk_474 == 6) { @@ -1111,7 +1107,7 @@ static int ov97_02234854 (UnkStruct_ov97_02234A2C * param0, int param1) return 0; } -static void ov97_022349E0 (UnkStruct_ov97_02234A2C * param0) +static void ov97_022349E0(UnkStruct_ov97_02234A2C *param0) { int v0; @@ -1124,7 +1120,7 @@ static void ov97_022349E0 (UnkStruct_ov97_02234A2C * param0) } } -static void ov97_02234A2C (UnkStruct_ov97_02234A2C * param0, int param1) +static void ov97_02234A2C(UnkStruct_ov97_02234A2C *param0, int param1) { UnkStruct_ov97_02233DAC v0; u16 v1[8 + 1]; @@ -1149,9 +1145,9 @@ static void ov97_02234A2C (UnkStruct_ov97_02234A2C * param0, int param1) ov97_02233DD0(param0, &v0, 0x1); } -static void ov97_02234AB4 (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * param1) +static void ov97_02234AB4(UnkStruct_ov97_02234A2C *param0, BoxPokemonGBA *param1) { - u16 * v0 = sub_02019FE4(param0->unk_20, 2); + u16 *v0 = sub_02019FE4(param0->unk_20, 2); u8 v1; int v2; @@ -1174,15 +1170,15 @@ static void ov97_02234AB4 (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * par sub_02019448(param0->unk_20, 2); } -static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * param1) +static void ov97_02234B0C(UnkStruct_ov97_02234A2C *param0, BoxPokemonGBA *param1) { int v0, v1; int v2, v3; UnkStruct_ov97_02233DAC v4; - MessageLoader * v5; + MessageLoader *v5; u8 v6[10 + 1]; u16 v7[10 + 1]; - Strbuf* v8; + Strbuf *v8; memset(&v4, 0, sizeof(UnkStruct_ov97_02233DAC)); @@ -1274,7 +1270,7 @@ static void ov97_02234B0C (UnkStruct_ov97_02234A2C * param0, BoxPokemonGBA * par sub_02005844(v0, 0); } -static void ov97_02234CC4 (UnkStruct_ov97_02234A2C * param0, int param1, int param2, int * param3) +static void ov97_02234CC4(UnkStruct_ov97_02234A2C *param0, int param1, int param2, int *param3) { sub_0200F174(0, param1, param1, 0x0, 6, 1, 78); @@ -1285,7 +1281,7 @@ static void ov97_02234CC4 (UnkStruct_ov97_02234A2C * param0, int param1, int par param0->unk_24 = param2; } -static void ov97_02234CF4 (UnkStruct_ov97_02234A2C * param0, int param1, int param2, int * param3) +static void ov97_02234CF4(UnkStruct_ov97_02234A2C *param0, int param1, int param2, int *param3) { sub_0200F174(0, param1, param1, 0x7fff, 6, 1, 78); @@ -1296,7 +1292,7 @@ static void ov97_02234CF4 (UnkStruct_ov97_02234A2C * param0, int param1, int par param0->unk_24 = param2; } -static void ov97_02234D28 (BGL * param0) +static void ov97_02234D28(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1394,7 +1390,7 @@ static void ov97_02234D28 (BGL * param0) } } -static void ov97_02234DFC (UnkStruct_ov97_02234A2C * param0) +static void ov97_02234DFC(UnkStruct_ov97_02234A2C *param0) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -1423,14 +1419,14 @@ static void ov97_02234DFC (UnkStruct_ov97_02234A2C * param0) sub_02002BB8(2, 78); } -static void ov97_02234E7C (UnkStruct_ov97_02234A2C * param0) +static void ov97_02234E7C(UnkStruct_ov97_02234A2C *param0) { sub_02006E60(116, 20, param0->unk_20, 2, 0, 32 * 24 * 2, 1, 78); sub_02019E2C(param0->unk_20, 2, 0, 0, 32, 24, Unk_ov97_0223EA60[param0->unk_00]); sub_02019448(param0->unk_20, 2); } -static void ov97_02234ECC (UnkStruct_ov97_02234A2C * param0) +static void ov97_02234ECC(UnkStruct_ov97_02234A2C *param0) { sub_02002E7C(0, 14 * 32, 78); sub_0200DAA4(param0->unk_20, 0, 0x3F0, 14, 0, 78); @@ -1452,7 +1448,7 @@ static void ov97_02234ECC (UnkStruct_ov97_02234A2C * param0) param0->unk_490.unk_3C = NULL; } -static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0) +static void ov97_02234F88(UnkStruct_ov97_02234A2C *param0) { int v0, v1, v2, v3; u32 v4; @@ -1505,7 +1501,7 @@ static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0) ov97_02233DD0(param0, ¶m0->unk_490, 0x8 | 0x10); } -static void ov97_02235158 (Window * param0) +static void ov97_02235158(Window *param0) { if (param0->unk_00) { sub_0200E084(param0, 0); @@ -1514,7 +1510,7 @@ static void ov97_02235158 (Window * param0) } } -static void ov97_02235178 (UnkStruct_ov97_02234A2C * param0) +static void ov97_02235178(UnkStruct_ov97_02234A2C *param0) { int v0; @@ -1537,7 +1533,7 @@ static void ov97_02235178 (UnkStruct_ov97_02234A2C * param0) param0->unk_474 = 0; } -static void ov97_022351F0 (UnkStruct_ov97_02234A2C * param0) +static void ov97_022351F0(UnkStruct_ov97_02234A2C *param0) { int v0; @@ -1600,7 +1596,7 @@ static void ov97_022351F0 (UnkStruct_ov97_02234A2C * param0) sub_02019044(param0->unk_20, 3); } -static void ov97_02235310 (UnkStruct_ov97_02234A2C * param0) +static void ov97_02235310(UnkStruct_ov97_02234A2C *param0) { UnkStruct_02015958 v0; @@ -1614,11 +1610,11 @@ static void ov97_02235310 (UnkStruct_ov97_02234A2C * param0) sub_02015958(param0->unk_E8EC, &v0); } -static void ov97_02235344 (UnkStruct_ov97_02234A2C * param0) +static void ov97_02235344(UnkStruct_ov97_02234A2C *param0) { UnkStruct_ov97_02233DAC v0; - StringTemplate * v1; - Strbuf* v2; + StringTemplate *v1; + Strbuf *v2; u16 v3[7 + 1]; ov97_0223936C(ov97_02236378(), v3, 7 + 1, ov97_02235DBC()); @@ -1642,9 +1638,9 @@ static void ov97_02235344 (UnkStruct_ov97_02234A2C * param0) ov97_02235310(param0); } -static void ov97_022353CC (void * param0) +static void ov97_022353CC(void *param0) { - UnkStruct_ov97_02234A2C * v0 = (UnkStruct_ov97_02234A2C *)param0; + UnkStruct_ov97_02234A2C *v0 = (UnkStruct_ov97_02234A2C *)param0; if (v0->unk_12664) { v0->unk_12664(); @@ -1658,11 +1654,11 @@ static void ov97_022353CC (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static int ov97_02235408 (UnkStruct_ov97_02234A2C * param0) +static int ov97_02235408(UnkStruct_ov97_02234A2C *param0) { int v0; u32 v1; - PalParkTransfer * v2; + PalParkTransfer *v2; v2 = SaveData_PalParkTransfer(param0->unk_10); @@ -1688,7 +1684,7 @@ static int ov97_02235408 (UnkStruct_ov97_02234A2C * param0) } { - BoxPokemonGBA * v3; + BoxPokemonGBA *v3; int v4, v5, v6 = 0; for (v5 = 0; v5 < GBA_TOTAL_BOXES_COUNT; v5++) { @@ -1713,7 +1709,7 @@ static int ov97_02235408 (UnkStruct_ov97_02234A2C * param0) return 0; } -static BOOL ov97_022354C4 (UnkStruct_ov97_02234A2C * param0, int param1) +static BOOL ov97_022354C4(UnkStruct_ov97_02234A2C *param0, int param1) { if (param0->unk_04) { ov97_02234ECC(param0); @@ -1732,7 +1728,7 @@ static BOOL ov97_022354C4 (UnkStruct_ov97_02234A2C * param0, int param1) return 0; } -static BOOL ov97_02235528 (UnkStruct_ov97_02234A2C * param0, int param1) +static BOOL ov97_02235528(UnkStruct_ov97_02234A2C *param0, int param1) { if (param0->unk_04) { ov97_02234ECC(param0); @@ -1752,7 +1748,7 @@ static BOOL ov97_02235528 (UnkStruct_ov97_02234A2C * param0, int param1) return 0; } -static BOOL ov97_02235590 (UnkStruct_ov97_02234A2C * param0, int param1) +static BOOL ov97_02235590(UnkStruct_ov97_02234A2C *param0, int param1) { if (param0->unk_08 != -1) { ov97_02234ECC(param0); @@ -1780,9 +1776,9 @@ static BOOL ov97_02235590 (UnkStruct_ov97_02234A2C * param0, int param1) return 0; } -static int ov97_02235624 (OverlayManager * param0, int * param1) +static int ov97_02235624(OverlayManager *param0, int *param1) { - UnkStruct_ov97_02234A2C * v0; + UnkStruct_ov97_02234A2C *v0; Heap_Create(3, 78, 0x38000); @@ -1816,15 +1812,15 @@ static int ov97_02235624 (OverlayManager * param0, int * param1) extern int gIgnoreCartridgeForWake; -static int ov97_022356E8 (OverlayManager * param0, int * param1) +static int ov97_022356E8(OverlayManager *param0, int *param1) { int v0, v1, v2; - UnkStruct_ov97_02234A2C * v3 = OverlayManager_Data(param0); + UnkStruct_ov97_02234A2C *v3 = OverlayManager_Data(param0); CTRDG_IsExisting(); if ((CTRDG_IsPulledOut() == TRUE) || gIgnoreCartridgeForWake) { - UnkStruct_ov97_02233B8C * v4 = &v3->unk_E8F0; + UnkStruct_ov97_02233B8C *v4 = &v3->unk_E8F0; if ((v4->unk_00 == 3) || (v4->unk_00 == 4)) { SaveData_SaveStateCancel(v3->unk_10); @@ -2069,8 +2065,7 @@ static int ov97_022356E8 (OverlayManager * param0, int * param1) break; } break; - case 18: - { + case 18: { UnkStruct_ov97_02233DAC v5; v3->unk_490.unk_34 = 11; @@ -2080,8 +2075,7 @@ static int ov97_022356E8 (OverlayManager * param0, int * param1) Sound_PlayEffect(1500); *param1 = 19; - } - break; + } break; case 19: v0 = sub_020159FC(v3->unk_E8EC); @@ -2147,11 +2141,11 @@ static int ov97_022356E8 (OverlayManager * param0, int * param1) return 0; } -static int ov97_02235CC8 (OverlayManager * param0, int * param1) +static int ov97_02235CC8(OverlayManager *param0, int *param1) { FS_EXTERN_OVERLAY(overlay77); - UnkStruct_ov97_02234A2C * v0 = OverlayManager_Data(param0); + UnkStruct_ov97_02234A2C *v0 = OverlayManager_Data(param0); Strbuf_Free(v0->unk_12668); Strbuf_Free(v0->unk_1266C); diff --git a/src/overlay097/ov97_02235D18.c b/src/overlay097/ov97_02235D18.c index 817bfae11e..f115bfe1db 100644 --- a/src/overlay097/ov97_02235D18.c +++ b/src/overlay097/ov97_02235D18.c @@ -1,3 +1,5 @@ +#include "overlay097/ov97_02235D18.h" + #include #include @@ -5,8 +7,6 @@ #include "overlay097/struct_ov97_0223F440.h" #include "overlay097/struct_ov97_0223F450.h" -#include "overlay097/ov97_02235D18.h" - typedef struct { u32 unk_00; u8 unk_04; @@ -22,22 +22,22 @@ typedef struct { u32 unk_FFC; } UnkStruct_ov97_02235F4C; -static int ov97_02235DC8(const UnkStruct_ov97_02235DC8 * param0, int param1); -static u16 ov97_02235FFC(void * param0, int * param1, u32 * param2); -static u32 ov97_02236244(struct CTRDGTaskInfo_tag * param0); +static int ov97_02235DC8(const UnkStruct_ov97_02235DC8 *param0, int param1); +static u16 ov97_02235FFC(void *param0, int *param1, u32 *param2); +static u32 ov97_02236244(struct CTRDGTaskInfo_tag *param0); static UnkStruct_ov97_0223F450 Unk_ov97_0223F450; static UnkStruct_ov97_0223F450 Unk_ov97_0223F450; static const UnkStruct_ov97_02235DC8 Unk_ov97_0223D92C[30]; static u8 Unk_ov97_0223EC04[0xa0 - 4]; -static const UnkStruct_ov97_02235DC8 * Unk_ov97_0223EBFC = NULL; +static const UnkStruct_ov97_02235DC8 *Unk_ov97_0223EBFC = NULL; static int Unk_ov97_0223F438; static u32 Unk_ov97_0223F448; -UnkStruct_ov97_0223F440 * Unk_ov97_0223F440; +UnkStruct_ov97_0223F440 *Unk_ov97_0223F440; static int Unk_ov97_0223F43C = 0; static int Unk_ov97_0223F444; -static BOOL ov97_02235D18 () +static BOOL ov97_02235D18() { if (CTRDG_IdentifyAgbBackup(CTRDG_BACKUP_TYPE_FLASH_1M) != 0) { return 0; @@ -46,7 +46,7 @@ static BOOL ov97_02235D18 () return 1; } -int ov97_02235D2C (void * param0) +int ov97_02235D2C(void *param0) { Unk_ov97_0223F440 = (UnkStruct_ov97_0223F440 *)param0; @@ -80,22 +80,22 @@ int ov97_02235D2C (void * param0) return 0; } -void ov97_02235DA4 (void) +void ov97_02235DA4(void) { Unk_ov97_0223EBFC = NULL; } -int ov97_02235DB0 () +int ov97_02235DB0() { return Unk_ov97_0223EBFC->unk_05; } -int ov97_02235DBC () +int ov97_02235DBC() { return Unk_ov97_0223EBFC->unk_06; } -static int ov97_02235DC8 (const UnkStruct_ov97_02235DC8 * param0, int param1) +static int ov97_02235DC8(const UnkStruct_ov97_02235DC8 *param0, int param1) { u32 v0; @@ -125,7 +125,7 @@ static int ov97_02235DC8 (const UnkStruct_ov97_02235DC8 * param0, int param1) { u32 v2[0xc0 / 4]; - u8 * v3 = (u8 *)&(v2[0]); + u8 *v3 = (u8 *)&(v2[0]); CTRDG_CpuCopy32((void *)0x8000000, (void *)&(v2[0]), 0xc0); @@ -158,7 +158,7 @@ static int ov97_02235DC8 (const UnkStruct_ov97_02235DC8 * param0, int param1) return 0; } -static u16 ov97_02235E7C (u32 * param0, u16 param1) +static u16 ov97_02235E7C(u32 *param0, u16 param1) { u16 v0; u32 v1; @@ -173,12 +173,12 @@ static u16 ov97_02235E7C (u32 * param0, u16 param1) return (u16)(((v1 >> 16) & 0xffff) + (v1 & 0xffff)); } -static void ov97_02235EAC (int param0, void * param1) +static void ov97_02235EAC(int param0, void *param1) { CTRDG_ReadAgbFlash((u16)param0, 0, param1, 0x1000); } -static u16 ov97_02235EC0 (int param0) +static u16 ov97_02235EC0(int param0) { if (param0 == 0) { return (u16)(Unk_ov97_0223F450.unk_88); @@ -195,7 +195,7 @@ static u16 ov97_02235EC0 (int param0) return 0xf80; } -static void * ov97_02235EF8 (int param0) +static void *ov97_02235EF8(int param0) { if (param0 == 0) { return &(Unk_ov97_0223F440->unk_1000[0]); @@ -212,12 +212,12 @@ static void * ov97_02235EF8 (int param0) return NULL; } -static u16 ov97_02235F4C (int param0, void * param1, u32 * param2) +static u16 ov97_02235F4C(int param0, void *param1, u32 *param2) { u32 v0 = 0; u16 v1 = 0; u16 v2; - UnkStruct_ov97_02235F4C * v3 = (UnkStruct_ov97_02235F4C *)param1; + UnkStruct_ov97_02235F4C *v3 = (UnkStruct_ov97_02235F4C *)param1; int v4; *param2 = 0; @@ -249,7 +249,7 @@ static u16 ov97_02235F4C (int param0, void * param1, u32 * param2) } } -static u16 ov97_02235FFC (void * param0, int * param1, u32 * param2) +static u16 ov97_02235FFC(void *param0, int *param1, u32 *param2) { u16 v0, v1; u32 v2, v3; @@ -319,7 +319,7 @@ static u16 ov97_02235FFC (void * param0, int * param1, u32 * param2) static int Unk_ov97_0223F438; static u32 Unk_ov97_0223F448; -int ov97_022360D8 () +int ov97_022360D8() { u16 v0 = ov97_02235FFC((void *)Unk_ov97_0223F440->unk_00, &Unk_ov97_0223F438, &Unk_ov97_0223F448); @@ -337,7 +337,7 @@ int ov97_022360D8 () if ((Unk_ov97_0223F438 == 0) || (Unk_ov97_0223F438 == 1)) { int v1; u32 v2 = 0; - UnkStruct_ov97_02235F4C * v3 = (UnkStruct_ov97_02235F4C *)Unk_ov97_0223F440->unk_00; + UnkStruct_ov97_02235F4C *v3 = (UnkStruct_ov97_02235F4C *)Unk_ov97_0223F440->unk_00; for (v1 = 0; v1 < 14; v1++) { ov97_02235EAC(v1 + Unk_ov97_0223F438 * 14, (void *)v3); @@ -371,9 +371,9 @@ int ov97_022360D8 () int Unk_ov97_0223EC00 = -1; static int Unk_ov97_0223F44C = 0; -static void ov97_022361B0 (int param0) +static void ov97_022361B0(int param0) { - UnkStruct_ov97_02235F4C * v0 = (UnkStruct_ov97_02235F4C *)Unk_ov97_0223F440->unk_00; + UnkStruct_ov97_02235F4C *v0 = (UnkStruct_ov97_02235F4C *)Unk_ov97_0223F440->unk_00; Unk_ov97_0223F44C = 1; @@ -383,7 +383,7 @@ static void ov97_022361B0 (int param0) v0->unk_FFC = Unk_ov97_0223F448; v0->unk_FF4 = (u16)param0; v0->unk_FF8 = 0x8012025; - v0->unk_FF6 = ov97_02235E7C((u32 * )v0->unk_00, ov97_02235EC0(param0)); + v0->unk_FF6 = ov97_02235E7C((u32 *)v0->unk_00, ov97_02235EC0(param0)); { u8 v1 = (u8)(((param0 + Unk_ov97_0223F444 + 1) % 14) + 14 * Unk_ov97_0223EC00); @@ -391,7 +391,7 @@ static void ov97_022361B0 (int param0) } } -static u32 ov97_02236244 (struct CTRDGTaskInfo_tag * param0) +static u32 ov97_02236244(struct CTRDGTaskInfo_tag *param0) { if (param0->result == 0) { Unk_ov97_0223F43C++; @@ -415,7 +415,7 @@ static u32 ov97_02236244 (struct CTRDGTaskInfo_tag * param0) return 0; } -BOOL ov97_02236280 () +BOOL ov97_02236280() { if (Unk_ov97_0223F43C == 0) { if (Unk_ov97_0223F438 == 1) { @@ -437,7 +437,7 @@ BOOL ov97_02236280 () return 1; } -int ov97_022362C8 () +int ov97_022362C8() { switch (Unk_ov97_0223F44C) { case 2: @@ -455,7 +455,7 @@ int ov97_022362C8 () } } -int ov97_02236308 (void) +int ov97_02236308(void) { switch (Unk_ov97_0223F44C) { case 2: @@ -472,47 +472,47 @@ int ov97_02236308 (void) } } -PokemonStorageGBA * ov97_02236340 (void) +PokemonStorageGBA *ov97_02236340(void) { return &(Unk_ov97_0223F440->unk_6000); } -void * ov97_02236350 (void) +void *ov97_02236350(void) { return ov97_02235EF8(0); } static const UnkStruct_ov97_02235DC8 Unk_ov97_0223D92C[30] = { - {'JVXA', 0x0, 0x0, 0x1}, - {'EVXA', 0x0, 0x0, 0x2}, - {'FVXA', 0x0, 0x0, 0x3}, - {'DVXA', 0x0, 0x0, 0x5}, - {'SVXA', 0x0, 0x0, 0x7}, - {'IVXA', 0x0, 0x0, 0x4}, - {'JPXA', 0x0, 0x1, 0x1}, - {'EPXA', 0x0, 0x1, 0x2}, - {'FPXA', 0x0, 0x1, 0x3}, - {'DPXA', 0x0, 0x1, 0x5}, - {'SPXA', 0x0, 0x1, 0x7}, - {'IPXA', 0x0, 0x1, 0x4}, - {'JRPB', 0x1, 0x3, 0x1}, - {'ERPB', 0x1, 0x3, 0x2}, - {'FRPB', 0x1, 0x3, 0x3}, - {'DRPB', 0x1, 0x3, 0x5}, - {'SRPB', 0x1, 0x3, 0x7}, - {'IRPB', 0x1, 0x3, 0x4}, - {'JGPB', 0x1, 0x2, 0x1}, - {'EGPB', 0x1, 0x2, 0x2}, - {'FGPB', 0x1, 0x2, 0x3}, - {'DGPB', 0x1, 0x2, 0x5}, - {'SGPB', 0x1, 0x2, 0x7}, - {'IGPB', 0x1, 0x2, 0x4}, - {'JEPB', 0x2, 0x4, 0x1}, - {'EEPB', 0x2, 0x4, 0x2}, - {'FEPB', 0x2, 0x4, 0x3}, - {'DEPB', 0x2, 0x4, 0x5}, - {'SEPB', 0x2, 0x4, 0x7}, - {'IEPB', 0x2, 0x4, 0x4} + { 'JVXA', 0x0, 0x0, 0x1 }, + { 'EVXA', 0x0, 0x0, 0x2 }, + { 'FVXA', 0x0, 0x0, 0x3 }, + { 'DVXA', 0x0, 0x0, 0x5 }, + { 'SVXA', 0x0, 0x0, 0x7 }, + { 'IVXA', 0x0, 0x0, 0x4 }, + { 'JPXA', 0x0, 0x1, 0x1 }, + { 'EPXA', 0x0, 0x1, 0x2 }, + { 'FPXA', 0x0, 0x1, 0x3 }, + { 'DPXA', 0x0, 0x1, 0x5 }, + { 'SPXA', 0x0, 0x1, 0x7 }, + { 'IPXA', 0x0, 0x1, 0x4 }, + { 'JRPB', 0x1, 0x3, 0x1 }, + { 'ERPB', 0x1, 0x3, 0x2 }, + { 'FRPB', 0x1, 0x3, 0x3 }, + { 'DRPB', 0x1, 0x3, 0x5 }, + { 'SRPB', 0x1, 0x3, 0x7 }, + { 'IRPB', 0x1, 0x3, 0x4 }, + { 'JGPB', 0x1, 0x2, 0x1 }, + { 'EGPB', 0x1, 0x2, 0x2 }, + { 'FGPB', 0x1, 0x2, 0x3 }, + { 'DGPB', 0x1, 0x2, 0x5 }, + { 'SGPB', 0x1, 0x2, 0x7 }, + { 'IGPB', 0x1, 0x2, 0x4 }, + { 'JEPB', 0x2, 0x4, 0x1 }, + { 'EEPB', 0x2, 0x4, 0x2 }, + { 'FEPB', 0x2, 0x4, 0x3 }, + { 'DEPB', 0x2, 0x4, 0x5 }, + { 'SEPB', 0x2, 0x4, 0x7 }, + { 'IEPB', 0x2, 0x4, 0x4 } }; static u8 Unk_ov97_0223EC04[] = { diff --git a/src/overlay097/ov97_0223635C.c b/src/overlay097/ov97_0223635C.c index f649651df9..9544b61016 100644 --- a/src/overlay097/ov97_0223635C.c +++ b/src/overlay097/ov97_0223635C.c @@ -1,19 +1,19 @@ +#include "overlay097/ov97_0223635C.h" + #include #include -#include "overlay097/struct_ov97_0223635C.h" - #include "overlay097/ov97_02235D18.h" -#include "overlay097/ov97_0223635C.h" +#include "overlay097/struct_ov97_0223635C.h" -u32 ov97_0223635C (void) +u32 ov97_0223635C(void) { - UnkStruct_ov97_0223635C * v0 = ov97_02236350(); + UnkStruct_ov97_0223635C *v0 = ov97_02236350(); return v0->unk_0A[3] << 24 | v0->unk_0A[2] << 16 | v0->unk_0A[1] << 8 | v0->unk_0A[0]; } -u8 * ov97_02236378 (void) +u8 *ov97_02236378(void) { - UnkStruct_ov97_0223635C * v0 = ov97_02236350(); + UnkStruct_ov97_0223635C *v0 = ov97_02236350(); return v0->unk_00; } diff --git a/src/overlay097/ov97_02236380.c b/src/overlay097/ov97_02236380.c index 2909b4e1ab..51666cb3fd 100644 --- a/src/overlay097/ov97_02236380.c +++ b/src/overlay097/ov97_02236380.c @@ -1,19 +1,18 @@ +#include "overlay097/ov97_02236380.h" + #include #include -#include "core_sys.h" -#include "pokemon.h" +#include "constants/gba/pokemon.h" +#include "constants/gba/species.h" +#include "constants/species.h" #include "overlay097/box_pokemon_gba.h" - -#include "pokemon.h" -#include "item.h" -#include "overlay097/ov97_02236380.h" #include "overlay097/ov97_022392E4.h" -#include "constants/species.h" -#include "constants/gba/pokemon.h" -#include "constants/gba/species.h" +#include "core_sys.h" +#include "item.h" +#include "pokemon.h" typedef struct { u16 unk_00; @@ -335,132 +334,132 @@ typedef struct { PokemonGBASubstruct0 unk_24; } UnkStruct_ov97_02236380_23; -void BoxMonGBAToBoxMon(BoxPokemonGBA * param0, BoxPokemon * param1); +void BoxMonGBAToBoxMon(BoxPokemonGBA *param0, BoxPokemon *param1); static u16 Unk_ov97_0223ECA0[] = { - 0x10, - 0x11, - 0x12, - 0x1D, - 0x1E, - 0x1F, - 0x20, - 0x21, - 0x22, - 0x23, - 0x24, - 0x2E, - 0x2F, - 0x30, - 0x31, - 0x34, - 0x35, - 0x38, - 0x39, - 0x42, - 0x43, - 0x44, - 0x56, - 0x57, - 0x5A, - 0x5B, - 0x60, - 0x61, - 0x6A, - 0x6B, - 0x72, - 0x73, - 0x74, - 0x75, - 0x7A, - 0x7B, - 0x7C, - 0x7F, - 0x80, - 0x85, - 0x86, - 0x87, - 0x88, - 0x89, - 0xAD, - 0xBB, - 0xBC, - 0xBD, - 0xBF, - 0xC0, - 0xC4, - 0xC5, - 0xC6, - 0xD2, - 0xD4, - 0xD5, - 0xD8, - 0xD9, - 0xDC, - 0xDD, - 0xDF, - 0xE0, - 0xE6, - 0xE9, - 0xEA, - 0xEB, - 0xEC, - 0xED, - 0xEE, - 0xF1, - 0x105, - 0x106, - 0x107, - 0x108, - 0x11D, - 0x11E, - 0x12C, - 0x12D, - 0x12E, - 0x13A, - 0x142, - 0x143, - 0x147, - 0x153, - 0x154, - 0x161, - 0x162, - 0x165, - 0x167, - 0x169, - 0x16A, - 0x16B, - 0x16C, - 0x16D + 0x10, + 0x11, + 0x12, + 0x1D, + 0x1E, + 0x1F, + 0x20, + 0x21, + 0x22, + 0x23, + 0x24, + 0x2E, + 0x2F, + 0x30, + 0x31, + 0x34, + 0x35, + 0x38, + 0x39, + 0x42, + 0x43, + 0x44, + 0x56, + 0x57, + 0x5A, + 0x5B, + 0x60, + 0x61, + 0x6A, + 0x6B, + 0x72, + 0x73, + 0x74, + 0x75, + 0x7A, + 0x7B, + 0x7C, + 0x7F, + 0x80, + 0x85, + 0x86, + 0x87, + 0x88, + 0x89, + 0xAD, + 0xBB, + 0xBC, + 0xBD, + 0xBF, + 0xC0, + 0xC4, + 0xC5, + 0xC6, + 0xD2, + 0xD4, + 0xD5, + 0xD8, + 0xD9, + 0xDC, + 0xDD, + 0xDF, + 0xE0, + 0xE6, + 0xE9, + 0xEA, + 0xEB, + 0xEC, + 0xED, + 0xEE, + 0xF1, + 0x105, + 0x106, + 0x107, + 0x108, + 0x11D, + 0x11E, + 0x12C, + 0x12D, + 0x12E, + 0x13A, + 0x142, + 0x143, + 0x147, + 0x153, + 0x154, + 0x161, + 0x162, + 0x165, + 0x167, + 0x169, + 0x16A, + 0x16B, + 0x16C, + 0x16D }; -static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) +static u32 ov97_02236380(BoxPokemonGBA *param0, u32 param1, u8 param2) { u32 v0 = 0; - UnkStruct_ov97_02236380 * v1; - UnkStruct_ov97_02236380_1 * v2; - UnkStruct_ov97_02236380_2 * v3; - UnkStruct_ov97_02236380_3 * v4; - UnkStruct_ov97_02236380_4 * v5; - UnkStruct_ov97_02236380_5 * v6; - UnkStruct_ov97_02236380_6 * v7; - UnkStruct_ov97_02236380_7 * v8; - UnkStruct_ov97_02236380_8 * v9; - UnkStruct_ov97_02236380_9 * v10; - UnkStruct_ov97_02236380_10 * v11; - UnkStruct_ov97_02236380_11 * v12; - UnkStruct_ov97_02236380_12 * v13; - UnkStruct_ov97_02236380_13 * v14; - UnkStruct_ov97_02236380_14 * v15; - UnkStruct_ov97_02236380_15 * v16; - UnkStruct_ov97_02236380_16 * v17; - UnkStruct_ov97_02236380_17 * v18; - UnkStruct_ov97_02236380_18 * v19; - UnkStruct_ov97_02236380_19 * v20; - UnkStruct_ov97_02236380_20 * v21; - UnkStruct_ov97_02236380_21 * v22; - UnkStruct_ov97_02236380_22 * v23; - UnkStruct_ov97_02236380_23 * v24; + UnkStruct_ov97_02236380 *v1; + UnkStruct_ov97_02236380_1 *v2; + UnkStruct_ov97_02236380_2 *v3; + UnkStruct_ov97_02236380_3 *v4; + UnkStruct_ov97_02236380_4 *v5; + UnkStruct_ov97_02236380_5 *v6; + UnkStruct_ov97_02236380_6 *v7; + UnkStruct_ov97_02236380_7 *v8; + UnkStruct_ov97_02236380_8 *v9; + UnkStruct_ov97_02236380_9 *v10; + UnkStruct_ov97_02236380_10 *v11; + UnkStruct_ov97_02236380_11 *v12; + UnkStruct_ov97_02236380_12 *v13; + UnkStruct_ov97_02236380_13 *v14; + UnkStruct_ov97_02236380_14 *v15; + UnkStruct_ov97_02236380_15 *v16; + UnkStruct_ov97_02236380_16 *v17; + UnkStruct_ov97_02236380_17 *v18; + UnkStruct_ov97_02236380_18 *v19; + UnkStruct_ov97_02236380_19 *v20; + UnkStruct_ov97_02236380_20 *v21; + UnkStruct_ov97_02236380_21 *v22; + UnkStruct_ov97_02236380_22 *v23; + UnkStruct_ov97_02236380_23 *v24; switch (param1 % 24) { case 0: @@ -468,16 +467,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v1->unk_00; + v0 = (u32)&v1->unk_00; break; case 1: - v0 = (u32) & v1->unk_0C; + v0 = (u32)&v1->unk_0C; break; case 2: - v0 = (u32) & v1->unk_18; + v0 = (u32)&v1->unk_18; break; case 3: - v0 = (u32) & v1->unk_24; + v0 = (u32)&v1->unk_24; break; } break; @@ -486,16 +485,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v2->unk_00; + v0 = (u32)&v2->unk_00; break; case 1: - v0 = (u32) & v2->unk_0C; + v0 = (u32)&v2->unk_0C; break; case 2: - v0 = (u32) & v2->unk_24; + v0 = (u32)&v2->unk_24; break; case 3: - v0 = (u32) & v2->unk_18; + v0 = (u32)&v2->unk_18; break; } break; @@ -504,16 +503,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v3->unk_00; + v0 = (u32)&v3->unk_00; break; case 1: - v0 = (u32) & v3->unk_18; + v0 = (u32)&v3->unk_18; break; case 2: - v0 = (u32) & v3->unk_0C; + v0 = (u32)&v3->unk_0C; break; case 3: - v0 = (u32) & v3->unk_24; + v0 = (u32)&v3->unk_24; break; } break; @@ -522,16 +521,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v4->unk_00; + v0 = (u32)&v4->unk_00; break; case 1: - v0 = (u32) & v4->unk_24; + v0 = (u32)&v4->unk_24; break; case 2: - v0 = (u32) & v4->unk_0C; + v0 = (u32)&v4->unk_0C; break; case 3: - v0 = (u32) & v4->unk_18; + v0 = (u32)&v4->unk_18; break; } break; @@ -540,16 +539,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v5->unk_00; + v0 = (u32)&v5->unk_00; break; case 1: - v0 = (u32) & v5->unk_18; + v0 = (u32)&v5->unk_18; break; case 2: - v0 = (u32) & v5->unk_24; + v0 = (u32)&v5->unk_24; break; case 3: - v0 = (u32) & v5->unk_0C; + v0 = (u32)&v5->unk_0C; break; } break; @@ -558,16 +557,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v6->unk_00; + v0 = (u32)&v6->unk_00; break; case 1: - v0 = (u32) & v6->unk_24; + v0 = (u32)&v6->unk_24; break; case 2: - v0 = (u32) & v6->unk_18; + v0 = (u32)&v6->unk_18; break; case 3: - v0 = (u32) & v6->unk_0C; + v0 = (u32)&v6->unk_0C; break; } break; @@ -576,16 +575,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v7->unk_0C; + v0 = (u32)&v7->unk_0C; break; case 1: - v0 = (u32) & v7->unk_00; + v0 = (u32)&v7->unk_00; break; case 2: - v0 = (u32) & v7->unk_18; + v0 = (u32)&v7->unk_18; break; case 3: - v0 = (u32) & v7->unk_24; + v0 = (u32)&v7->unk_24; break; } break; @@ -594,16 +593,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v8->unk_0C; + v0 = (u32)&v8->unk_0C; break; case 1: - v0 = (u32) & v8->unk_00; + v0 = (u32)&v8->unk_00; break; case 2: - v0 = (u32) & v8->unk_24; + v0 = (u32)&v8->unk_24; break; case 3: - v0 = (u32) & v8->unk_18; + v0 = (u32)&v8->unk_18; break; } break; @@ -612,16 +611,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v9->unk_18; + v0 = (u32)&v9->unk_18; break; case 1: - v0 = (u32) & v9->unk_00; + v0 = (u32)&v9->unk_00; break; case 2: - v0 = (u32) & v9->unk_0C; + v0 = (u32)&v9->unk_0C; break; case 3: - v0 = (u32) & v9->unk_24; + v0 = (u32)&v9->unk_24; break; } break; @@ -630,16 +629,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v10->unk_24; + v0 = (u32)&v10->unk_24; break; case 1: - v0 = (u32) & v10->unk_00; + v0 = (u32)&v10->unk_00; break; case 2: - v0 = (u32) & v10->unk_0C; + v0 = (u32)&v10->unk_0C; break; case 3: - v0 = (u32) & v10->unk_18; + v0 = (u32)&v10->unk_18; break; } break; @@ -648,16 +647,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v11->unk_18; + v0 = (u32)&v11->unk_18; break; case 1: - v0 = (u32) & v11->unk_00; + v0 = (u32)&v11->unk_00; break; case 2: - v0 = (u32) & v11->unk_24; + v0 = (u32)&v11->unk_24; break; case 3: - v0 = (u32) & v11->unk_0C; + v0 = (u32)&v11->unk_0C; break; } break; @@ -666,16 +665,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v12->unk_24; + v0 = (u32)&v12->unk_24; break; case 1: - v0 = (u32) & v12->unk_00; + v0 = (u32)&v12->unk_00; break; case 2: - v0 = (u32) & v12->unk_18; + v0 = (u32)&v12->unk_18; break; case 3: - v0 = (u32) & v12->unk_0C; + v0 = (u32)&v12->unk_0C; break; } break; @@ -684,16 +683,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v13->unk_0C; + v0 = (u32)&v13->unk_0C; break; case 1: - v0 = (u32) & v13->unk_18; + v0 = (u32)&v13->unk_18; break; case 2: - v0 = (u32) & v13->unk_00; + v0 = (u32)&v13->unk_00; break; case 3: - v0 = (u32) & v13->unk_24; + v0 = (u32)&v13->unk_24; break; } break; @@ -702,16 +701,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v14->unk_0C; + v0 = (u32)&v14->unk_0C; break; case 1: - v0 = (u32) & v14->unk_24; + v0 = (u32)&v14->unk_24; break; case 2: - v0 = (u32) & v14->unk_00; + v0 = (u32)&v14->unk_00; break; case 3: - v0 = (u32) & v14->unk_18; + v0 = (u32)&v14->unk_18; break; } break; @@ -720,16 +719,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v15->unk_18; + v0 = (u32)&v15->unk_18; break; case 1: - v0 = (u32) & v15->unk_0C; + v0 = (u32)&v15->unk_0C; break; case 2: - v0 = (u32) & v15->unk_00; + v0 = (u32)&v15->unk_00; break; case 3: - v0 = (u32) & v15->unk_24; + v0 = (u32)&v15->unk_24; break; } break; @@ -738,16 +737,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v16->unk_24; + v0 = (u32)&v16->unk_24; break; case 1: - v0 = (u32) & v16->unk_0C; + v0 = (u32)&v16->unk_0C; break; case 2: - v0 = (u32) & v16->unk_00; + v0 = (u32)&v16->unk_00; break; case 3: - v0 = (u32) & v16->unk_18; + v0 = (u32)&v16->unk_18; break; } break; @@ -756,16 +755,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v17->unk_18; + v0 = (u32)&v17->unk_18; break; case 1: - v0 = (u32) & v17->unk_24; + v0 = (u32)&v17->unk_24; break; case 2: - v0 = (u32) & v17->unk_00; + v0 = (u32)&v17->unk_00; break; case 3: - v0 = (u32) & v17->unk_0C; + v0 = (u32)&v17->unk_0C; break; } break; @@ -774,16 +773,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v18->unk_24; + v0 = (u32)&v18->unk_24; break; case 1: - v0 = (u32) & v18->unk_18; + v0 = (u32)&v18->unk_18; break; case 2: - v0 = (u32) & v18->unk_00; + v0 = (u32)&v18->unk_00; break; case 3: - v0 = (u32) & v18->unk_0C; + v0 = (u32)&v18->unk_0C; break; } break; @@ -792,16 +791,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v19->unk_0C; + v0 = (u32)&v19->unk_0C; break; case 1: - v0 = (u32) & v19->unk_18; + v0 = (u32)&v19->unk_18; break; case 2: - v0 = (u32) & v19->unk_24; + v0 = (u32)&v19->unk_24; break; case 3: - v0 = (u32) & v19->unk_00; + v0 = (u32)&v19->unk_00; break; } break; @@ -810,16 +809,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v20->unk_0C; + v0 = (u32)&v20->unk_0C; break; case 1: - v0 = (u32) & v20->unk_24; + v0 = (u32)&v20->unk_24; break; case 2: - v0 = (u32) & v20->unk_18; + v0 = (u32)&v20->unk_18; break; case 3: - v0 = (u32) & v20->unk_00; + v0 = (u32)&v20->unk_00; break; } break; @@ -828,16 +827,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v21->unk_18; + v0 = (u32)&v21->unk_18; break; case 1: - v0 = (u32) & v21->unk_0C; + v0 = (u32)&v21->unk_0C; break; case 2: - v0 = (u32) & v21->unk_24; + v0 = (u32)&v21->unk_24; break; case 3: - v0 = (u32) & v21->unk_00; + v0 = (u32)&v21->unk_00; break; } break; @@ -846,16 +845,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v22->unk_24; + v0 = (u32)&v22->unk_24; break; case 1: - v0 = (u32) & v22->unk_0C; + v0 = (u32)&v22->unk_0C; break; case 2: - v0 = (u32) & v22->unk_18; + v0 = (u32)&v22->unk_18; break; case 3: - v0 = (u32) & v22->unk_00; + v0 = (u32)&v22->unk_00; break; } break; @@ -864,16 +863,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v23->unk_18; + v0 = (u32)&v23->unk_18; break; case 1: - v0 = (u32) & v23->unk_24; + v0 = (u32)&v23->unk_24; break; case 2: - v0 = (u32) & v23->unk_0C; + v0 = (u32)&v23->unk_0C; break; case 3: - v0 = (u32) & v23->unk_00; + v0 = (u32)&v23->unk_00; break; } break; @@ -882,16 +881,16 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) switch (param2) { case 0: - v0 = (u32) & v24->unk_24; + v0 = (u32)&v24->unk_24; break; case 1: - v0 = (u32) & v24->unk_18; + v0 = (u32)&v24->unk_18; break; case 2: - v0 = (u32) & v24->unk_0C; + v0 = (u32)&v24->unk_0C; break; case 3: - v0 = (u32) & v24->unk_00; + v0 = (u32)&v24->unk_00; break; } break; @@ -900,10 +899,10 @@ static u32 ov97_02236380 (BoxPokemonGBA * param0, u32 param1, u8 param2) return v0; } -static void GBADecryptBoxMon (BoxPokemonGBA * param0) +static void GBADecryptBoxMon(BoxPokemonGBA *param0) { int v0; - u32 * v1; + u32 *v1; v1 = (u32 *)¶m0->secure; @@ -913,10 +912,10 @@ static void GBADecryptBoxMon (BoxPokemonGBA * param0) } } -static void GBAEncryptBoxMon (BoxPokemonGBA * param0) +static void GBAEncryptBoxMon(BoxPokemonGBA *param0) { int v0; - u32 * v1; + u32 *v1; v1 = (u32 *)¶m0->secure; @@ -926,13 +925,13 @@ static void GBAEncryptBoxMon (BoxPokemonGBA * param0) } } -static u16 ov97_0223689C (BoxPokemonGBA * param0) +static u16 ov97_0223689C(BoxPokemonGBA *param0) { int v0; - u16 * v1; - u16 * v2; - u16 * v3; - u16 * v4; + u16 *v1; + u16 *v2; + u16 *v3; + u16 *v4; u16 v5 = 0; v1 = (u16 *)ov97_02236380(param0, param0->personality, 0); @@ -959,13 +958,13 @@ static u16 ov97_0223689C (BoxPokemonGBA * param0) return v5; } -u32 GetGBABoxMonData (BoxPokemonGBA *boxMonGBA, int field, u8 * param2) +u32 GetGBABoxMonData(BoxPokemonGBA *boxMonGBA, int field, u8 *param2) { u32 retVal = 0; - PokemonGBASubstruct0 * substruct0 = 0; - PokemonGBASubstruct1 * substruct1 = 0; - PokemonGBASubstruct2 * substruct2 = 0; - PokemonGBASubstruct3 * substruct3 = 0; + PokemonGBASubstruct0 *substruct0 = 0; + PokemonGBASubstruct1 *substruct1 = 0; + PokemonGBASubstruct2 *substruct2 = 0; + PokemonGBASubstruct3 *substruct3 = 0; u16 checksum; if (field > GBA_MON_DATA_ENCRYPT_SEPARATOR) { @@ -992,9 +991,9 @@ u32 GetGBABoxMonData (BoxPokemonGBA *boxMonGBA, int field, u8 * param2) retVal = boxMonGBA->otId; break; case GBA_MON_DATA_NICKNAME: - if (boxMonGBA->isBadEgg) + if (boxMonGBA->isBadEgg) { retVal = 0; - else { + } else { for (retVal = 0; retVal < 10; retVal++) { param2[retVal] = boxMonGBA->nickname[retVal]; } @@ -1015,8 +1014,9 @@ u32 GetGBABoxMonData (BoxPokemonGBA *boxMonGBA, int field, u8 * param2) retVal = boxMonGBA->isEgg; break; case GBA_MON_DATA_OT_NAME: - for (retVal = 0; retVal < 7; retVal++) + for (retVal = 0; retVal < 7; retVal++) { param2[retVal] = boxMonGBA->otName[retVal]; + } param2[retVal] = 0xffff; break; @@ -1030,10 +1030,11 @@ u32 GetGBABoxMonData (BoxPokemonGBA *boxMonGBA, int field, u8 * param2) retVal = boxMonGBA->unknown; break; case GBA_MON_DATA_SPECIES: - if (boxMonGBA->isBadEgg) + if (boxMonGBA->isBadEgg) { retVal = GBA_SPECIES_EGG; - else + } else { retVal = substruct0->species; + } break; case GBA_MON_DATA_HELD_ITEM: retVal = substruct0->heldItem; @@ -1197,20 +1198,22 @@ u32 GetGBABoxMonData (BoxPokemonGBA *boxMonGBA, int field, u8 * param2) case GBA_MON_DATA_SPECIES_OR_EGG: retVal = substruct0->species; - if (retVal == SPECIES_NONE) + if (retVal == SPECIES_NONE) { break; + } - if (substruct3->isEgg || boxMonGBA->isBadEgg) + if (substruct3->isEgg || boxMonGBA->isBadEgg) { retVal = GBA_SPECIES_EGG; + } break; case GBA_MON_DATA_IVS: retVal = substruct3->hpIV - | (substruct3->attackIV << 5) - | (substruct3->defenseIV << 10) - | (substruct3->speedIV << 15) - | (substruct3->spAttackIV << 20) - | (substruct3->spDefenseIV << 25); + | (substruct3->attackIV << 5) + | (substruct3->defenseIV << 10) + | (substruct3->speedIV << 15) + | (substruct3->spAttackIV << 20) + | (substruct3->spDefenseIV << 25); break; } @@ -1221,14 +1224,14 @@ u32 GetGBABoxMonData (BoxPokemonGBA *boxMonGBA, int field, u8 * param2) return retVal; } -void SetGBABoxMonData (BoxPokemonGBA * boxMon, int field, const u8 * dataArg) +void SetGBABoxMonData(BoxPokemonGBA *boxMon, int field, const u8 *dataArg) { int v0; u32 v1; - PokemonGBASubstruct0 * v2 = 0; - PokemonGBASubstruct1 * v3 = 0; - PokemonGBASubstruct2 * v4 = 0; - PokemonGBASubstruct3 * v5 = 0; + PokemonGBASubstruct0 *v2 = 0; + PokemonGBASubstruct1 *v3 = 0; + PokemonGBASubstruct2 *v4 = 0; + PokemonGBASubstruct3 *v5 = 0; u16 v6; if (field > GBA_MON_DATA_ENCRYPT_SEPARATOR) { @@ -1289,7 +1292,7 @@ void SetGBABoxMonData (BoxPokemonGBA * boxMon, int field, const u8 * dataArg) } } -int ov97_02236DD0 (int param0) +int ov97_02236DD0(int param0) { int v0; @@ -1306,7 +1309,7 @@ int ov97_02236DD0 (int param0) return param0; } -u32 ov97_02236E00 (BoxPokemonGBA * param0) +u32 ov97_02236E00(BoxPokemonGBA *param0) { int v0; u32 v1; @@ -1317,7 +1320,7 @@ u32 ov97_02236E00 (BoxPokemonGBA * param0) return Pokemon_GetSpeciesLevelAt(v0, v1); } -static int ov97_02236E28 (BoxPokemonGBA * param0, BoxPokemon * param1) +static int ov97_02236E28(BoxPokemonGBA *param0, BoxPokemon *param1) { int v0; int v1; @@ -1346,7 +1349,7 @@ static int ov97_02236E28 (BoxPokemonGBA * param0, BoxPokemon * param1) return v1; } -void BoxMonGBAToBoxMon (BoxPokemonGBA * param0, BoxPokemon * param1) +void BoxMonGBAToBoxMon(BoxPokemonGBA *param0, BoxPokemon *param1) { BOOL v0; u32 v1; diff --git a/src/overlay097/ov97_02237520.c b/src/overlay097/ov97_02237520.c index 4bc29776a6..baa976fb69 100644 --- a/src/overlay097/ov97_02237520.c +++ b/src/overlay097/ov97_02237520.c @@ -1,12 +1,12 @@ +#include "overlay097/ov97_02237520.h" + #include #include -#include "heap.h" -#include "overlay097/ov97_02237520.h" - #include "crypto.h" +#include "heap.h" -void * ov97_0223752C(u32 param0); +void *ov97_0223752C(u32 param0); static u32 Unk_ov97_0223EF9C[] = { 'B5BE', @@ -165,17 +165,17 @@ static const u8 Unk_ov97_0223DA1C[] = { static u32 Unk_ov97_0223F54C; -void ov97_02237520 (u32 param0) +void ov97_02237520(u32 param0) { Unk_ov97_0223F54C = param0; } -void * ov97_0223752C (u32 param0) +void *ov97_0223752C(u32 param0) { return Heap_AllocFromHeap(Unk_ov97_0223F54C, param0); } -static BOOL ov97_02237540 (void) +static BOOL ov97_02237540(void) { int v0; u32 v1 = CTRDG_GetAgbGameCode(); @@ -205,7 +205,7 @@ static BOOL ov97_02237540 (void) return 0; } -static BOOL ov97_022375F0 (void) +static BOOL ov97_022375F0(void) { CTRDG_Init(); @@ -224,7 +224,7 @@ static BOOL ov97_022375F0 (void) return 1; } -int ov97_02237624 (void) +int ov97_02237624(void) { u32 v0; @@ -239,7 +239,7 @@ int ov97_02237624 (void) return v0; } -BOOL ov97_0223764C (void * param0, int param1) +BOOL ov97_0223764C(void *param0, int param1) { BOOL v0; diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 7d3a6f71f2..208823a6cc 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -1,87 +1,84 @@ +#include "overlay097/ov97_02237694.h" + #include #include -#include "crypto.h" -#include "assert.h" +#include "constants/species.h" #include "struct_decls/struct_0200112C_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "pokemon.h" -#include "savedata.h" - #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0202DF40.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay022/struct_ov22_022559F8.h" #include "overlay097/struct_ov97_0222D250.h" -#include "overlay097/union_ov97_0222D2B0.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay097/struct_ov97_02237808.h" #include "overlay097/struct_ov97_02237AEC.h" #include "overlay097/struct_ov97_0223829C.h" +#include "overlay097/union_ov97_0222D2B0.h" #include "overlay115/struct_ov115_02261520.h" +#include "assert.h" +#include "crypto.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "message_util.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "overlay_manager.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "savedata.h" #include "unk_02033200.h" -#include "constants/species.h" -#include "pokemon.h" -#include "item.h" -#include "overlay097/ov97_02237694.h" typedef struct { - BGL * unk_00; + BGL *unk_00; BOOL unk_04; int unk_08; int unk_0C; int unk_10; int unk_14; - SaveData * unk_18; - void * unk_1C; + SaveData *unk_18; + void *unk_1C; int unk_20; BOOL unk_24[4]; UnkStruct_ov97_02237AEC unk_34; - GraphicElementData * unk_26C; + GraphicElementData *unk_26C; int unk_270; fx32 unk_274; u8 unk_278[3200]; ArchivedSprite unk_EF8; - void (* unk_F08)(void * param0); + void (*unk_F08)(void *param0); } UnkStruct_ov97_0223F550; -static void ov97_02237E58(void * param0); +static void ov97_02237E58(void *param0); static UnkStruct_ov97_0223F550 Unk_ov97_0223F550; -void ov97_02237694 (int param0) +void ov97_02237694(int param0) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; memset(v0, 0, sizeof(UnkStruct_ov97_0223F550)); @@ -89,9 +86,9 @@ void ov97_02237694 (int param0) v0->unk_08 = param0; } -void * ov97_022376C4 (OverlayManager * param0, int param1, int param2, int param3) +void *ov97_022376C4(OverlayManager *param0, int param1, int param2, int param3) { - void * v0; + void *v0; Heap_Create(3, param1, param3); v0 = OverlayManager_NewData(param0, param2, param1); @@ -104,7 +101,7 @@ void * ov97_022376C4 (OverlayManager * param0, int param1, int param2, int param return v0; } -void ov97_022376FC (BGL * param0, int param1, u8 param2, u32 param3, u32 param4) +void ov97_022376FC(BGL *param0, int param1, u8 param2, u32 param3, u32 param4) { UnkStruct_ov97_0222DB78 v0 = { 0, @@ -146,15 +143,15 @@ void ov97_022376FC (BGL * param0, int param1, u8 param2, u32 param3, u32 param4) sub_02019EBC(param0, param1); } -void ov97_02237784 (int param0) +void ov97_02237784(int param0) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; v0->unk_10 = param0; } -void ov97_02237790 (int param0, int param1, int * param2, int param3) +void ov97_02237790(int param0, int param1, int *param2, int param3) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; if (v0->unk_10 == 0) { sub_0200F174(0, param0, param0, 0x0, 6, 1, v0->unk_08); @@ -169,16 +166,16 @@ void ov97_02237790 (int param0, int param1, int * param2, int param3) v0->unk_0C = param1; } -void ov97_022377F0 (int * param0) +void ov97_022377F0(int *param0) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; if (ScreenWipe_Done()) { *param0 = v0->unk_0C; } } -void ov97_02237808 (UnkStruct_ov97_02237808 * param0, Window * param1, int param2, int param3, int param4, int param5) +void ov97_02237808(UnkStruct_ov97_02237808 *param0, Window *param1, int param2, int param3, int param4, int param5) { memset(param0, 0, sizeof(UnkStruct_ov97_02237808)); @@ -200,32 +197,32 @@ void ov97_02237808 (UnkStruct_ov97_02237808 * param0, Window * param1, int param param0->unk_50 = 0xff; } -void ov97_02237858 (UnkStruct_ov97_02237808 * param0, int param1, int param2, int param3) +void ov97_02237858(UnkStruct_ov97_02237808 *param0, int param1, int param2, int param3) { param0->unk_18 = param1; param0->unk_1C = param2; param0->unk_28 = param3; } -void ov97_02237860 (UnkStruct_ov97_02237808 * param0, int param1, int param2) +void ov97_02237860(UnkStruct_ov97_02237808 *param0, int param1, int param2) { param0->unk_00 = param1; param0->unk_40 = param2; } -void ov97_02237868 (UnkStruct_ov97_02237808 * param0, int param1, int param2) +void ov97_02237868(UnkStruct_ov97_02237808 *param0, int param1, int param2) { param0->unk_20 = param1; param0->unk_24 = param2; } -static int ov97_02237870 (UnkStruct_ov97_02237808 * param0, int param1) +static int ov97_02237870(UnkStruct_ov97_02237808 *param0, int param1) { int v0; - Strbuf* v1; - StringTemplate * v2; - MessageLoader * v3; - UnkStruct_ov97_0223F550 * v4 = &Unk_ov97_0223F550; + Strbuf *v1; + StringTemplate *v2; + MessageLoader *v3; + UnkStruct_ov97_0223F550 *v4 = &Unk_ov97_0223F550; if ((param1 != -1) && (param0->unk_4C != param1)) { param0->unk_4C = param1; @@ -271,7 +268,7 @@ static int ov97_02237870 (UnkStruct_ov97_02237808 * param0, int param1) return v0; } -int ov97_0223795C (BGL * param0, UnkStruct_ov97_02237808 * param1, int param2, int param3, int param4) +int ov97_0223795C(BGL *param0, UnkStruct_ov97_02237808 *param1, int param2, int param3, int param4) { int v0; @@ -301,16 +298,19 @@ int ov97_0223795C (BGL * param0, UnkStruct_ov97_02237808 * param1, int param2, i return v0; } -int ov97_02237A18 (UnkStruct_ov97_02237808 * param0) +int ov97_02237A18(UnkStruct_ov97_02237808 *param0) { return param0->unk_18 * param0->unk_1C; } -void ov97_02237A20 (void) +void ov97_02237A20(void) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; UnkStruct_ov22_022559F8 v1 = { - 40, 4096, 4096, NULL, + 40, + 4096, + 4096, + NULL, }; v1.unk_0C = v0->unk_08; @@ -322,17 +322,17 @@ void ov97_02237A20 (void) sub_0201F8E4(); } -BOOL ov97_02237A60 (void) +BOOL ov97_02237A60(void) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; return !!v0->unk_34.unk_00; } -void ov97_02237A74 (void) +void ov97_02237A74(void) { int v0; - UnkStruct_ov97_0223F550 * v1 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v1 = &Unk_ov97_0223F550; NNS_G2dInitOamManagerModule(); @@ -347,9 +347,9 @@ void ov97_02237A74 (void) } } -UnkStruct_ov97_02237AEC * ov97_02237AEC (void) +UnkStruct_ov97_02237AEC *ov97_02237AEC(void) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; GF_ASSERT(v0 != NULL); GF_ASSERT(v0->unk_34.unk_00 != NULL); @@ -357,9 +357,9 @@ UnkStruct_ov97_02237AEC * ov97_02237AEC (void) return &v0->unk_34; } -void ov97_02237B0C (int param0, int param1, int param2, int param3, int param4, int param5) +void ov97_02237B0C(int param0, int param1, int param2, int param3, int param4, int param5) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; int v1 = (param5 == 0) ? NNS_G2D_VRAM_TYPE_2DMAIN : NNS_G2D_VRAM_TYPE_2DSUB; int v2; @@ -398,32 +398,32 @@ void ov97_02237B0C (int param0, int param1, int param2, int param3, int param4, SetMainCallback(ov97_02237E58, NULL); } -void ov97_02237C80 (fx32 param0, fx32 param1) +void ov97_02237C80(fx32 param0, fx32 param1) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; sub_0200964C(&v0->unk_34.unk_04, param0, param1); v0->unk_274 = param1; } -void ov97_02237CA0 (void) +void ov97_02237CA0(void) { ov97_02237CAC(0); } -void ov97_02237CAC (int param0) +void ov97_02237CAC(int param0) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; if (v0->unk_26C) { - VecFx32 * v1; + VecFx32 *v1; if (v0->unk_270 == 0) { if ((sub_02021D34(v0->unk_26C) == 0) && (param0 == 0)) { sub_02021CAC(v0->unk_26C, 1); } - v1 = ( VecFx32 * )sub_02021D28(v0->unk_26C); + v1 = (VecFx32 *)sub_02021D28(v0->unk_26C); if (v1->y < 384 * FX32_ONE) { v1->y += FX32_ONE * 3; @@ -438,9 +438,9 @@ void ov97_02237CAC (int param0) } } -GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int param2, int param3, int param4) +GraphicElementData *ov97_02237D14(int param0, GraphicElementData *param1, int param2, int param3, int param4) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; if (param1 == NULL) { UnkStruct_ov115_02261520 v1; @@ -473,10 +473,10 @@ GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int return param1; } -void ov97_02237DA0 (void) +void ov97_02237DA0(void) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; - UnkStruct_ov97_02237AEC * v1 = &v0->unk_34; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_02237AEC *v1 = &v0->unk_34; int v2; if (v0->unk_26C) { @@ -515,14 +515,14 @@ void ov97_02237DA0 (void) SetMainCallback(NULL, NULL); } -u32 ov97_02237E4C (int param0) +u32 ov97_02237E4C(int param0) { return (u32)1 << (param0 - 10); } -static void ov97_02237E58 (void * param0) +static void ov97_02237E58(void *param0) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; if (v0->unk_F08) { v0->unk_F08(v0); @@ -539,28 +539,28 @@ static void ov97_02237E58 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static int ov97_02237EA8 (int param0) +static int ov97_02237EA8(int param0) { int v0; struct { u8 unk_00, unk_01; } v1[] = { - {0, 0}, - {1, 1}, - {2, 1}, - {3, 2}, - {4, 3}, - {5, 2}, - {6, 2}, - {7, 0}, - {8, 5}, - {9, 5}, - {10, 5}, - {11, 4}, - {12, 5}, - {13, 5}, - {-1}, + { 0, 0 }, + { 1, 1 }, + { 2, 1 }, + { 3, 2 }, + { 4, 3 }, + { 5, 2 }, + { 6, 2 }, + { 7, 0 }, + { 8, 5 }, + { 9, 5 }, + { 10, 5 }, + { 11, 4 }, + { 12, 5 }, + { 13, 5 }, + { -1 }, }; for (v0 = 0; v1[v0].unk_00 != -1; v0++) { @@ -572,11 +572,11 @@ static int ov97_02237EA8 (int param0) return 0; } -static void ov97_02237EF8 (GraphicElementData * param0, Pokemon * param1, int param2, int param3, u8 * param4, ArchivedSprite * param5) +static void ov97_02237EF8(GraphicElementData *param0, Pokemon *param1, int param2, int param3, u8 *param4, ArchivedSprite *param5) { int v0, v1; u32 v2; - UnkStruct_ov97_0223F550 * v3 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v3 = &Unk_ov97_0223F550; v0 = Pokemon_GetGender(param1); v1 = Pokemon_IsShiny(param1); @@ -589,21 +589,21 @@ static void ov97_02237EF8 (GraphicElementData * param0, Pokemon * param1, int pa DC_FlushRange(param4, 0x20 * 10 * 10); { - NNSG2dImageProxy * v4 = SpriteActor_ImageProxy(param0); + NNSG2dImageProxy *v4 = SpriteActor_ImageProxy(param0); u32 v5 = NNS_G2dGetImageLocation(v4, NNS_G2D_VRAM_TYPE_2DSUB); GXS_LoadOBJ(param4, v5 + 1 * (0x20 * 10 * 10), (0x20 * 10 * 10)); } { - NNSG2dImagePaletteProxy * v6 = sub_02021F9C(param0); + NNSG2dImagePaletteProxy *v6 = sub_02021F9C(param0); u32 v7 = NNS_G2dGetImagePaletteLocation(v6, NNS_G2D_VRAM_TYPE_2DSUB); sub_02006E84(param5->archive, param5->palette, 5, 0x20 * (2 + 1) + v7, 32, v3->unk_08); } } -static void ov97_02237FB4 (UnkStruct_ov97_0223F550 * param0, int param1, UnkStruct_0202DF40 * param2) +static void ov97_02237FB4(UnkStruct_ov97_0223F550 *param0, int param1, UnkStruct_0202DF40 *param2) { ov97_02237B0C(116, 35, 32, 34, 33, 1); ov97_02237C80((0 * FX32_ONE), (256 * FX32_ONE)); @@ -611,9 +611,9 @@ static void ov97_02237FB4 (UnkStruct_ov97_0223F550 * param0, int param1, UnkStru param0->unk_26C = ov97_02237D14(1, param0->unk_26C, HW_LCD_WIDTH / 2, 0, 0); } -static void ov97_02237FF4 (UnkStruct_ov97_0223F550 * param0, int param1, UnkStruct_0202DF40 * param2) +static void ov97_02237FF4(UnkStruct_ov97_0223F550 *param0, int param1, UnkStruct_0202DF40 *param2) { - Pokemon * v0; + Pokemon *v0; ov97_02237B0C(54, 10, 0, 11, 12, 1); ov97_02237C80((0 * FX32_ONE), (256 * FX32_ONE)); @@ -635,7 +635,7 @@ static void ov97_02237FF4 (UnkStruct_ov97_0223F550 * param0, int param1, UnkStru } } -static void ov97_022380C8 (UnkStruct_ov97_0223F550 * param0, int param1, UnkStruct_0202DF40 * param2) +static void ov97_022380C8(UnkStruct_ov97_0223F550 *param0, int param1, UnkStruct_0202DF40 *param2) { int v0; @@ -663,16 +663,16 @@ static void ov97_022380C8 (UnkStruct_ov97_0223F550 * param0, int param1, UnkStru param0->unk_26C = ov97_02237D14(1, param0->unk_26C, HW_LCD_WIDTH / 2, 0, 0); } -static void ov97_02238174 (void * param0) +static void ov97_02238174(void *param0) { - UnkStruct_ov97_0223F550 * v0 = (UnkStruct_ov97_0223F550 *)param0; + UnkStruct_ov97_0223F550 *v0 = (UnkStruct_ov97_0223F550 *)param0; sub_02006E84(116, 29, 4, 16 * 2 * 8, 16 * 2 * 6, v0->unk_08); } -void ov97_02238194 (BGL * param0, UnkStruct_0202DF40 * param1) +void ov97_02238194(BGL *param0, UnkStruct_0202DF40 *param1) { int v0, v1; - UnkStruct_ov97_0223F550 * v2 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v2 = &Unk_ov97_0223F550; v1 = param1->unk_00; v0 = ov97_02237EA8(v1); @@ -680,8 +680,8 @@ void ov97_02238194 (BGL * param0, UnkStruct_0202DF40 * param1) sub_02006E3C(116, 30, param0, 5, 0, 10 * 16 * 0x20, 1, v2->unk_08); { - NNSG2dScreenData * v3; - void * v4 = sub_02006FE8(116, 31, 1, v2->unk_08, 1); + NNSG2dScreenData *v3; + void *v4 = sub_02006FE8(116, 31, 1, v2->unk_08, 1); NNS_G2dGetUnpackedScreenData(v4, &v3); @@ -721,10 +721,10 @@ void ov97_02238194 (BGL * param0, UnkStruct_0202DF40 * param1) sub_02021CAC(v2->unk_26C, 0); } -void ov97_0223829C (UnkStruct_ov97_0223829C * param0, UnkUnion_ov97_0222D2B0 * param1, int param2) +void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2) { - MATHCRC16Table * v0; - CRYPTORC4Context * v1; + MATHCRC16Table *v0; + CRYPTORC4Context *v1; u16 v2[4]; u16 v3, v4; int v5; @@ -754,11 +754,11 @@ void ov97_0223829C (UnkStruct_ov97_0223829C * param0, UnkUnion_ov97_0222D2B0 * p Heap_FreeToHeap(v1); } -void ov97_02238324 (UnkStruct_ov97_0223829C * param0, UnkUnion_ov97_0222D2B0 * param1, int param2) +void ov97_02238324(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2) { - MATHCRC16Table * v0; - CRYPTORC4Context * v1; - const WMBssDesc * v2; + MATHCRC16Table *v0; + CRYPTORC4Context *v1; + const WMBssDesc *v2; u16 v3[4]; u16 v4, v5; int v6; @@ -789,7 +789,7 @@ void ov97_02238324 (UnkStruct_ov97_0223829C * param0, UnkUnion_ov97_0222D2B0 * p Heap_FreeToHeap(v1); } -void ov97_022383C4 (BmpList * param0, u32 param1, u8 param2) +void ov97_022383C4(BmpList *param0, u32 param1, u8 param2) { switch (param2) { case 0: @@ -800,7 +800,7 @@ void ov97_022383C4 (BmpList * param0, u32 param1, u8 param2) } } -static void ov97_022383DC (void) +static void ov97_022383DC(void) { if (PAD_DetectFold() == 0) { if (CTRDG_IsAgbCartridge() == 0) { @@ -809,7 +809,7 @@ static void ov97_022383DC (void) } } -void ov97_02238400 (BOOL param0) +void ov97_02238400(BOOL param0) { if (param0 == 1) { OS_DisableIrq(); @@ -821,12 +821,12 @@ void ov97_02238400 (BOOL param0) } } -static void ov97_0223843C (void) +static void ov97_0223843C(void) { return; } -void ov97_02238440 (void) +void ov97_02238440(void) { OS_DisableIrq(); OS_SetIrqFunction(OS_IE_CARTRIDGE, ov97_0223843C); @@ -834,18 +834,18 @@ void ov97_02238440 (void) OS_EnableIrq(); } -void ov97_0223846C (SaveData * param0) +void ov97_0223846C(SaveData *param0) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; v0->unk_18 = param0; v0->unk_14 = 0; } -int ov97_0223847C (void) +int ov97_0223847C(void) { int v0; - UnkStruct_ov97_0223F550 * v1 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v1 = &Unk_ov97_0223F550; switch (v1->unk_14) { case 0: @@ -881,26 +881,26 @@ int ov97_0223847C (void) return 0; } -void ov97_022384F4 (void) +void ov97_022384F4(void) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; if (v0->unk_14 == 4) { v0->unk_14 = 1; } } -void ov97_0223850C (void) +void ov97_0223850C(void) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; SaveData_SaveStateCancel(v0->unk_18); v0->unk_14 = 3; ResetUnlock(4); } -int ov97_02238528 (void) +int ov97_02238528(void) { - UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550; + UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550; return v0->unk_14; } diff --git a/src/overlay097/ov97_02238534.c b/src/overlay097/ov97_02238534.c index ab6ceeecd0..fc695592e6 100644 --- a/src/overlay097/ov97_02238534.c +++ b/src/overlay097/ov97_02238534.c @@ -1,13 +1,13 @@ +#include "overlay097/ov97_02238534.h" + #include -#include -#include #include - -#include "crypto.h" +#include +#include #include "overlay097/funcptr_ov97_02238A4C.h" -#include "overlay097/ov97_02238534.h" +#include "crypto.h" typedef struct { u16 unk_00; @@ -35,32 +35,32 @@ typedef struct { int unk_11E0; u8 unk_11E4[6]; u16 unk_11EA; - u8 * unk_11EC; + u8 *unk_11EC; UnkFuncPtr_ov97_02238A4C unk_11F0; u8 unk_11F4[1261]; } UnkStruct_ov97_022403F8; -typedef void (* UnkFuncPtr_020312B8)(WMBssDesc *); +typedef void (*UnkFuncPtr_020312B8)(WMBssDesc *); -static void ov97_02238AB4(UnkStruct_ov97_02238AB4 * param0); -static int ov97_02238B34(UnkStruct_ov97_02238AB4 * param0); -static void ov97_022388E0(void * param0); +static void ov97_02238AB4(UnkStruct_ov97_02238AB4 *param0); +static int ov97_02238B34(UnkStruct_ov97_02238AB4 *param0); +static void ov97_022388E0(void *param0); static BOOL ov97_02238908(void); -static void ov97_0223893C(void * param0); +static void ov97_0223893C(void *param0); static BOOL ov97_02238624(void); -static void ov97_02238720(void * param0); +static void ov97_02238720(void *param0); static BOOL ov97_02238858(void); -static void ov97_02238874(void * param0); -static void ov97_0223888C(void * param0); +static void ov97_02238874(void *param0); +static void ov97_0223888C(void *param0); static BOOL ov97_022389EC(void); -static void ov97_02238A10(void * param0); +static void ov97_02238A10(void *param0); -static UnkStruct_ov97_022403F8 * Unk_ov97_022403F8; -static void (* Unk_ov97_022403FC)(const char *, ...) = NULL; +static UnkStruct_ov97_022403F8 *Unk_ov97_022403F8; +static void (*Unk_ov97_022403FC)(const char *, ...) = NULL; -static void ov97_02238534 (int param0) +static void ov97_02238534(int param0) { - static const char * v0[] = { + static const char *v0[] = { "mywh_SYSSTATE_STOP", "mywh_SYSSTATE_IDLE", "mywh_SYSSTATE_SCANNING", @@ -84,7 +84,7 @@ static void ov97_02238534 (int param0) } } -static void ov97_02238584 (int param0) +static void ov97_02238584(int param0) { if (((*Unk_ov97_022403F8).unk_11C4 == 9) || ((*Unk_ov97_022403F8).unk_11C4 == 10)) { return; @@ -93,7 +93,7 @@ static void ov97_02238584 (int param0) (*Unk_ov97_022403F8).unk_11C8 = param0; } -static BOOL ov97_022385A0 (void) +static BOOL ov97_022385A0(void) { Unk_ov97_022403F8->unk_11C4 != 4 ? (void)0 : OS_Terminate(); @@ -122,7 +122,7 @@ static BOOL ov97_022385A0 (void) return 1; } -static BOOL ov97_02238624 (void) +static BOOL ov97_02238624(void) { WMErrCode v0; u16 v1; @@ -189,9 +189,9 @@ static BOOL ov97_02238624 (void) return 1; } -static void ov97_02238720 (void * param0) +static void ov97_02238720(void *param0) { - WMstartScanCallback * v0 = (WMstartScanCallback *)param0; + WMstartScanCallback *v0 = (WMstartScanCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { do { @@ -272,7 +272,7 @@ static void ov97_02238720 (void * param0) } } -static BOOL ov97_02238858 (void) +static BOOL ov97_02238858(void) { WMErrCode v0; @@ -289,9 +289,9 @@ static BOOL ov97_02238858 (void) return 1; } -static void ov97_02238874 (void * param0) +static void ov97_02238874(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { do { @@ -304,9 +304,9 @@ static void ov97_02238874 (void * param0) ov97_02238534(1); } -static void ov97_0223888C (void * param0) +static void ov97_0223888C(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { ov97_02238534(10); @@ -320,7 +320,7 @@ static void ov97_0223888C (void * param0) } } -static BOOL ov97_022388BC (void) +static BOOL ov97_022388BC(void) { (*Unk_ov97_022403F8).unk_11C8 = WM_ERRCODE_SUCCESS; @@ -331,9 +331,9 @@ static BOOL ov97_022388BC (void) return 1; } -static void ov97_022388E0 (void * param0) +static void ov97_022388E0(void *param0) { - WMindCallback * v0 = (WMindCallback *)param0; + WMindCallback *v0 = (WMindCallback *)param0; if (v0->errcode == WM_ERRCODE_FIFO_ERROR) { ov97_02238534(9); @@ -344,7 +344,7 @@ static void ov97_022388E0 (void * param0) } } -static BOOL ov97_02238908 (void) +static BOOL ov97_02238908(void) { WMErrCode v0; @@ -363,10 +363,10 @@ static BOOL ov97_02238908 (void) return 1; } -static void ov97_0223893C (void * param0) +static void ov97_0223893C(void *param0) { WMErrCode v0; - WMCallback * v1 = (WMCallback *)param0; + WMCallback *v1 = (WMCallback *)param0; if (v1->errcode != WM_ERRCODE_SUCCESS) { do { @@ -392,7 +392,7 @@ static void ov97_0223893C (void * param0) (void)ov97_022385A0(); } -static BOOL ov97_02238978 (void) +static BOOL ov97_02238978(void) { (void)(((*Unk_ov97_022403F8).unk_11C4 == 1) || (OS_Terminate(), 0)); @@ -411,16 +411,16 @@ static BOOL ov97_02238978 (void) return 1; } -BOOL ov97_022389C8 (void) +BOOL ov97_022389C8(void) { if ((*Unk_ov97_022403F8).unk_11C4 == 1) { - return ov97_02238978( ); + return ov97_02238978(); } return ov97_022389EC(); } -static BOOL ov97_022389EC (void) +static BOOL ov97_022389EC(void) { WMErrCode v0; @@ -438,9 +438,9 @@ static BOOL ov97_022389EC (void) return 1; } -static void ov97_02238A10 (void * param0) +static void ov97_02238A10(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { ov97_02238534(9); @@ -459,7 +459,7 @@ static void ov97_02238A10 (void * param0) ov97_02238978(); } -BOOL ov97_02238A4C (void * param0, UnkFuncPtr_ov97_02238A4C param1, void * param2) +BOOL ov97_02238A4C(void *param0, UnkFuncPtr_ov97_02238A4C param1, void *param2) { Unk_ov97_022403F8 = (UnkStruct_ov97_022403F8 *)(((u32)param2 + 31) / 32 * 32); (*Unk_ov97_022403F8).unk_11C4 = 0; @@ -475,7 +475,7 @@ BOOL ov97_02238A4C (void * param0, UnkFuncPtr_ov97_02238A4C param1, void * param return ov97_022388BC(); } -static void ov97_02238AB4 (UnkStruct_ov97_02238AB4 * param0) +static void ov97_02238AB4(UnkStruct_ov97_02238AB4 *param0) { int v0; @@ -492,7 +492,7 @@ static void ov97_02238AB4 (UnkStruct_ov97_02238AB4 * param0) } } -static int ov97_02238B34 (UnkStruct_ov97_02238AB4 * param0) +static int ov97_02238B34(UnkStruct_ov97_02238AB4 *param0) { if (((*Unk_ov97_022403F8).unk_11CE != param0->unk_00) || ((*Unk_ov97_022403F8).unk_11D4 != param0->unk_04)) { if ((*Unk_ov97_022403F8).unk_11D8++ >= 16) { @@ -544,10 +544,10 @@ static int ov97_02238B34 (UnkStruct_ov97_02238AB4 * param0) return 0; } -static u16 ov97_02238C70 (u8 * param0, u32 param1) +static u16 ov97_02238C70(u8 *param0, u32 param1) { u16 v0, v1; - u16 * v2 = (u16 *)param0; + u16 *v2 = (u16 *)param0; v0 = 0; @@ -559,11 +559,11 @@ static u16 ov97_02238C70 (u8 * param0, u32 param1) return v0; } -int ov97_02238CA0 (void) +int ov97_02238CA0(void) { { u16 v0[4]; - u16 * v1; + u16 *v1; v1 = (u16 *)&((*Unk_ov97_022403F8).unk_11E4[0]); v0[0] = v1[0]; @@ -582,7 +582,7 @@ int ov97_02238CA0 (void) } { - u8 * v3 = (u8 *)&(v0[0]); + u8 *v3 = (u8 *)&(v0[0]); int v4; for (v4 = 0; v4 < 8; v4++) { @@ -599,12 +599,12 @@ int ov97_02238CA0 (void) return ov97_02238C70((*Unk_ov97_022403F8).unk_11EC, (*Unk_ov97_022403F8).unk_11D4) == (*Unk_ov97_022403F8).unk_11CE; } -int ov97_02238D4C (void) +int ov97_02238D4C(void) { return sizeof(UnkStruct_ov97_022403F8) + 32; } -void * ov97_02238D54 (void) +void *ov97_02238D54(void) { if ((*Unk_ov97_022403F8).unk_10BC) { return &((*Unk_ov97_022403F8).unk_1054[0]); diff --git a/src/overlay097/ov97_02238D74.c b/src/overlay097/ov97_02238D74.c index e5daf85bdb..56e10e7709 100644 --- a/src/overlay097/ov97_02238D74.c +++ b/src/overlay097/ov97_02238D74.c @@ -1,20 +1,18 @@ +#include #include #include -#include - -#include "core_sys.h" - +#include "overlay004/ov4_021D0D80.h" +#include "overlay097/ov97_0222D30C.h" #include "overlay097/struct_ov97_0222D04C.h" -#include "overlay_manager.h" +#include "core_sys.h" #include "heap.h" +#include "overlay_manager.h" #include "unk_02033200.h" #include "unk_020366A0.h" #include "unk_020393C8.h" #include "unk_02099550.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay097/ov97_0222D30C.h" static BOOL Unk_ov97_02240400; static int Unk_ov97_0224040C; @@ -23,13 +21,13 @@ static Unk_ov97_02240408; static DWCNdFileInfo Unk_ov97_02240414[10]; static void ov97_02238E88(void); -int ov97_02238EAC(OverlayManager * param0, int * param1); +int ov97_02238EAC(OverlayManager *param0, int *param1); -static void * ov97_02238D74 (DWCAllocType param0, u32 param1, int param2) +static void *ov97_02238D74(DWCAllocType param0, u32 param1, int param2) { #pragma unused(param0, param2) - void * v0; - u32 * v1; + void *v0; + u32 *v1; param1 = (((param1 + sizeof(void *)) + 32) & ~31) + 32; @@ -43,10 +41,10 @@ static void * ov97_02238D74 (DWCAllocType param0, u32 param1, int param2) return v1; } -static void ov97_02238D94 (DWCAllocType param0, void * param1, u32 param2) +static void ov97_02238D94(DWCAllocType param0, void *param1, u32 param2) { -#pragma unused( param0, param2 ) - u32 * v0; +#pragma unused(param0, param2) + u32 *v0; if (!param1) { return; @@ -58,7 +56,7 @@ static void ov97_02238D94 (DWCAllocType param0, void * param1, u32 param2) static volatile BOOL Unk_ov97_02240410; -static int ov97_02238DA4 (UnkStruct_ov97_0222D04C * param0) +static int ov97_02238DA4(UnkStruct_ov97_0222D04C *param0) { DWCError v0; DWCErrorType v1; @@ -78,7 +76,7 @@ static int ov97_02238DA4 (UnkStruct_ov97_0222D04C * param0) return 4111; } -static BOOL ov97_02238DF8 (UnkStruct_ov97_0222D04C * param0) +static BOOL ov97_02238DF8(UnkStruct_ov97_0222D04C *param0) { DWCApInfo v0; DWCError v1; @@ -104,7 +102,7 @@ static BOOL ov97_02238DF8 (UnkStruct_ov97_0222D04C * param0) return 0; } -static void ov97_02238E20 (UnkStruct_ov97_0222D04C * param0, int * param1, int param2) +static void ov97_02238E20(UnkStruct_ov97_0222D04C *param0, int *param1, int param2) { Unk_ov97_02240400 = 0; Unk_ov97_0224040C = DWC_ND_ERROR_NONE; @@ -112,7 +110,7 @@ static void ov97_02238E20 (UnkStruct_ov97_0222D04C * param0, int * param1, int p *param1 = 4114; } -static void ov97_02238E44 (UnkStruct_ov97_0222D04C * param0, int param1, int * param2, int param3, int param4) +static void ov97_02238E44(UnkStruct_ov97_0222D04C *param0, int param1, int *param2, int param3, int param4) { Unk_ov97_02240404 = 0; Unk_ov97_02240408 = param1; @@ -124,7 +122,7 @@ static void ov97_02238E44 (UnkStruct_ov97_0222D04C * param0, int param1, int * p } } -static void ov97_02238E78 (DWCNdCallbackReason param0, DWCNdError param1, int param2) +static void ov97_02238E78(DWCNdCallbackReason param0, DWCNdError param1, int param2) { switch (param0) { case DWC_ND_CBREASON_GETFILELISTNUM: @@ -161,7 +159,7 @@ static void ov97_02238E78 (DWCNdCallbackReason param0, DWCNdError param1, int pa Unk_ov97_0224040C = param1; } -static void ov97_02238E88 (void) +static void ov97_02238E88(void) { switch (Unk_ov97_02240408) { case 1: @@ -175,7 +173,7 @@ static void ov97_02238E88 (void) Unk_ov97_02240404 = 1; } -static void ov97_02238E94 (void) +static void ov97_02238E94(void) { sub_02039794(); sub_02038514(); @@ -184,11 +182,11 @@ static void ov97_02238E94 (void) sub_020334CC(); } -int ov97_02238EAC (OverlayManager * param0, int * param1) +int ov97_02238EAC(OverlayManager *param0, int *param1) { int v0; DWCNasLoginState v1; - UnkStruct_ov97_0222D04C * v2 = OverlayManager_Data(param0); + UnkStruct_ov97_0222D04C *v2 = OverlayManager_Data(param0); if (v2->unk_26DC) { if (v2->unk_26DC() == 1) { @@ -212,7 +210,7 @@ int ov97_02238EAC (OverlayManager * param0, int * param1) break; case 4098: DWC_InitInetEx(&v2->unk_164C, 2, 1, 20); - DWC_SetAuthServer((DWC_CONNECTINET_AUTH_RELEASE)); + DWC_SetAuthServer(DWC_CONNECTINET_AUTH_RELEASE); DWC_ConnectInetAsync(); sub_02039734(); *param1 = 4099; diff --git a/src/overlay097/ov97_022392E4.c b/src/overlay097/ov97_022392E4.c index bb33212663..f10fdcb908 100644 --- a/src/overlay097/ov97_022392E4.c +++ b/src/overlay097/ov97_022392E4.c @@ -1,264 +1,264 @@ +#include "overlay097/ov97_022392E4.h" + #include #include -#include "overlay097/ov97_022392E4.h" - static const u16 Unk_ov97_0223DAE8[][2] = { - {0x1, 0x1}, - {0x3, 0x3}, - {0x5, 0x5}, - {0x7, 0x7}, - {0x9, 0x9}, - {0xB, 0xB}, - {0xC, 0xC}, - {0xE, 0xE}, - {0x10, 0x10}, - {0x12, 0x12}, - {0x14, 0x14}, - {0x16, 0x16}, - {0x18, 0x18}, - {0x1A, 0x1A}, - {0x1C, 0x1C}, - {0x1E, 0x1E}, - {0x20, 0x20}, - {0x22, 0x22}, - {0x25, 0x25}, - {0x27, 0x27}, - {0x29, 0x29}, - {0x2B, 0x2B}, - {0x2C, 0x2C}, - {0x2D, 0x2D}, - {0x2E, 0x2E}, - {0x2f, 0x2f}, - {0x30, 0x30}, - {0x33, 0x33}, - {0x36, 0x36}, - {0x39, 0x39}, - {0x3C, 0x3C}, - {0x3f, 0x3f}, - {0x40, 0x40}, - {0x41, 0x41}, - {0x42, 0x42}, - {0x43, 0x43}, - {0x45, 0x45}, - {0x47, 0x47}, - {0x49, 0x49}, - {0x4A, 0x4A}, - {0x4B, 0x4B}, - {0x4C, 0x4C}, - {0x4D, 0x4D}, - {0x4E, 0x4E}, - {0x4f, 0x4f}, - {0x50, 0x50}, - {0x51, 0x51}, - {0x2, 0x2}, - {0x4, 0x4}, - {0x6, 0x6}, - {0x8, 0x8}, - {0xA, 0xA}, - {0x44, 0x44}, - {0x46, 0x46}, - {0x48, 0x48}, - {0xD, 0xD}, - {0xf, 0xf}, - {0x11, 0x11}, - {0x13, 0x13}, - {0x15, 0x15}, - {0x17, 0x17}, - {0x19, 0x19}, - {0x1B, 0x1B}, - {0x1D, 0x1D}, - {0x1f, 0x1f}, - {0x21, 0x21}, - {0x23, 0x23}, - {0x26, 0x26}, - {0x28, 0x28}, - {0x2A, 0x2A}, - {0x31, 0x31}, - {0x34, 0x34}, - {0x37, 0x37}, - {0x3A, 0x3A}, - {0x3D, 0x3D}, - {0x32, 0x32}, - {0x35, 0x35}, - {0x38, 0x38}, - {0x3B, 0x3B}, - {0x3E, 0x3E}, - {0x24, 0x24}, - {0x53, 0x53}, - {0x55, 0x55}, - {0x57, 0x57}, - {0x59, 0x59}, - {0x5B, 0x5B}, - {0x5C, 0x5C}, - {0x5E, 0x5E}, - {0x60, 0x60}, - {0x62, 0x62}, - {0x64, 0x64}, - {0x66, 0x66}, - {0x68, 0x68}, - {0x6A, 0x6A}, - {0x6C, 0x6C}, - {0x6E, 0x6E}, - {0x70, 0x70}, - {0x72, 0x72}, - {0x75, 0x75}, - {0x77, 0x77}, - {0x79, 0x79}, - {0x7B, 0x7B}, - {0x7C, 0x7C}, - {0x7D, 0x7D}, - {0x7E, 0x7E}, - {0x7f, 0x7f}, - {0x80, 0x80}, - {0x83, 0x83}, - {0x86, 0x86}, - {0x89, 0x89}, - {0x8C, 0x8C}, - {0x8f, 0x8f}, - {0x90, 0x90}, - {0x91, 0x91}, - {0x92, 0x92}, - {0x93, 0x93}, - {0x95, 0x95}, - {0x97, 0x97}, - {0x99, 0x99}, - {0x9A, 0x9A}, - {0x9B, 0x9B}, - {0x9C, 0x9C}, - {0x9D, 0x9D}, - {0x9E, 0x9E}, - {0x9f, 0x9f}, - {0xA0, 0xA0}, - {0xA1, 0xA1}, - {0x52, 0x52}, - {0x54, 0x54}, - {0x56, 0x56}, - {0x58, 0x58}, - {0x5A, 0x5A}, - {0x94, 0x94}, - {0x96, 0x96}, - {0x98, 0x98}, - {0x5D, 0x5D}, - {0x5f, 0x5f}, - {0x61, 0x61}, - {0x63, 0x63}, - {0x65, 0x65}, - {0x67, 0x67}, - {0x69, 0x69}, - {0x6B, 0x6B}, - {0x6D, 0x6D}, - {0x6f, 0x6f}, - {0x71, 0x71}, - {0x73, 0x73}, - {0x76, 0x76}, - {0x78, 0x78}, - {0x7A, 0x7A}, - {0x81, 0x81}, - {0x84, 0x84}, - {0x87, 0x87}, - {0x8A, 0x8A}, - {0x8D, 0x8D}, - {0x82, 0x82}, - {0x85, 0x85}, - {0x88, 0x88}, - {0x8B, 0x8B}, - {0x8E, 0x8E}, - {0x74, 0x74}, - {0xA2, 0x121}, - {0xA3, 0x122}, - {0xA4, 0x123}, - {0xA5, 0x124}, - {0xA6, 0x125}, - {0xA7, 0x126}, - {0xA8, 0x127}, - {0xA9, 0x128}, - {0xAA, 0x129}, - {0xAB, 0x12A}, - {0xE1, 0x1AB}, - {0xE2, 0x1AC}, - {0xE4, 0x1AE}, - {0xf1, 0x1BE}, - {0xE6, 0x1B0}, - {0xE5, 0x1af}, - {0xEA, 0xEA}, - {0xEB, 0xEB}, - {0xE8, 0x1B2}, - {0xE9, 0x1B3}, - {0xEE, 0x1BB}, - {0xef, 0x1BC}, - {0x112, 0x112}, - {0xE3, 0x1AD}, - {0xf2, 0x176}, - {0xE7, 0x1B1}, - {0xAC, 0x12B}, - {0xAD, 0x12C}, - {0xAE, 0x12D}, - {0xaf, 0x12E}, - {0xB0, 0x12f}, - {0xB1, 0x130}, - {0xB2, 0x131}, - {0xB3, 0x132}, - {0xB4, 0x133}, - {0xB5, 0x134}, - {0xB6, 0x135}, - {0xB7, 0x136}, - {0xB8, 0x137}, - {0xB9, 0x138}, - {0xBA, 0x139}, - {0xBB, 0x13A}, - {0xBC, 0x13B}, - {0xBD, 0x13C}, - {0xBE, 0x13D}, - {0xbf, 0x13E}, - {0xC0, 0x13f}, - {0xC1, 0x140}, - {0xC2, 0x141}, - {0xC3, 0x142}, - {0xC4, 0x143}, - {0xC5, 0x144}, - {0xC6, 0x145}, - {0xC7, 0x146}, - {0xC8, 0x147}, - {0xC9, 0x148}, - {0xCA, 0x149}, - {0xCB, 0x14A}, - {0xCC, 0x14B}, - {0xCD, 0x14C}, - {0xCE, 0x14D}, - {0xcf, 0x14E}, - {0xD0, 0x14f}, - {0xD1, 0x150}, - {0xD2, 0x151}, - {0xD3, 0x152}, - {0xD4, 0x153}, - {0xD5, 0x154}, - {0xD6, 0x155}, - {0xD7, 0x156}, - {0xD8, 0x157}, - {0xD9, 0x158}, - {0xDA, 0x159}, - {0xDB, 0x15A}, - {0xDC, 0x15B}, - {0xDD, 0x15C}, - {0xDE, 0x15D}, - {0xdf, 0x15E}, - {0x11f, 0x11f}, - {0xf6, 0x1C4}, - {0x163, 0x163}, - {0x175, 0x175}, - {0x17B, 0x17B}, - {0x183, 0x183}, - {0x195, 0x195}, - {0x19B, 0x19B} + { 0x1, 0x1 }, + { 0x3, 0x3 }, + { 0x5, 0x5 }, + { 0x7, 0x7 }, + { 0x9, 0x9 }, + { 0xB, 0xB }, + { 0xC, 0xC }, + { 0xE, 0xE }, + { 0x10, 0x10 }, + { 0x12, 0x12 }, + { 0x14, 0x14 }, + { 0x16, 0x16 }, + { 0x18, 0x18 }, + { 0x1A, 0x1A }, + { 0x1C, 0x1C }, + { 0x1E, 0x1E }, + { 0x20, 0x20 }, + { 0x22, 0x22 }, + { 0x25, 0x25 }, + { 0x27, 0x27 }, + { 0x29, 0x29 }, + { 0x2B, 0x2B }, + { 0x2C, 0x2C }, + { 0x2D, 0x2D }, + { 0x2E, 0x2E }, + { 0x2f, 0x2f }, + { 0x30, 0x30 }, + { 0x33, 0x33 }, + { 0x36, 0x36 }, + { 0x39, 0x39 }, + { 0x3C, 0x3C }, + { 0x3f, 0x3f }, + { 0x40, 0x40 }, + { 0x41, 0x41 }, + { 0x42, 0x42 }, + { 0x43, 0x43 }, + { 0x45, 0x45 }, + { 0x47, 0x47 }, + { 0x49, 0x49 }, + { 0x4A, 0x4A }, + { 0x4B, 0x4B }, + { 0x4C, 0x4C }, + { 0x4D, 0x4D }, + { 0x4E, 0x4E }, + { 0x4f, 0x4f }, + { 0x50, 0x50 }, + { 0x51, 0x51 }, + { 0x2, 0x2 }, + { 0x4, 0x4 }, + { 0x6, 0x6 }, + { 0x8, 0x8 }, + { 0xA, 0xA }, + { 0x44, 0x44 }, + { 0x46, 0x46 }, + { 0x48, 0x48 }, + { 0xD, 0xD }, + { 0xf, 0xf }, + { 0x11, 0x11 }, + { 0x13, 0x13 }, + { 0x15, 0x15 }, + { 0x17, 0x17 }, + { 0x19, 0x19 }, + { 0x1B, 0x1B }, + { 0x1D, 0x1D }, + { 0x1f, 0x1f }, + { 0x21, 0x21 }, + { 0x23, 0x23 }, + { 0x26, 0x26 }, + { 0x28, 0x28 }, + { 0x2A, 0x2A }, + { 0x31, 0x31 }, + { 0x34, 0x34 }, + { 0x37, 0x37 }, + { 0x3A, 0x3A }, + { 0x3D, 0x3D }, + { 0x32, 0x32 }, + { 0x35, 0x35 }, + { 0x38, 0x38 }, + { 0x3B, 0x3B }, + { 0x3E, 0x3E }, + { 0x24, 0x24 }, + { 0x53, 0x53 }, + { 0x55, 0x55 }, + { 0x57, 0x57 }, + { 0x59, 0x59 }, + { 0x5B, 0x5B }, + { 0x5C, 0x5C }, + { 0x5E, 0x5E }, + { 0x60, 0x60 }, + { 0x62, 0x62 }, + { 0x64, 0x64 }, + { 0x66, 0x66 }, + { 0x68, 0x68 }, + { 0x6A, 0x6A }, + { 0x6C, 0x6C }, + { 0x6E, 0x6E }, + { 0x70, 0x70 }, + { 0x72, 0x72 }, + { 0x75, 0x75 }, + { 0x77, 0x77 }, + { 0x79, 0x79 }, + { 0x7B, 0x7B }, + { 0x7C, 0x7C }, + { 0x7D, 0x7D }, + { 0x7E, 0x7E }, + { 0x7f, 0x7f }, + { 0x80, 0x80 }, + { 0x83, 0x83 }, + { 0x86, 0x86 }, + { 0x89, 0x89 }, + { 0x8C, 0x8C }, + { 0x8f, 0x8f }, + { 0x90, 0x90 }, + { 0x91, 0x91 }, + { 0x92, 0x92 }, + { 0x93, 0x93 }, + { 0x95, 0x95 }, + { 0x97, 0x97 }, + { 0x99, 0x99 }, + { 0x9A, 0x9A }, + { 0x9B, 0x9B }, + { 0x9C, 0x9C }, + { 0x9D, 0x9D }, + { 0x9E, 0x9E }, + { 0x9f, 0x9f }, + { 0xA0, 0xA0 }, + { 0xA1, 0xA1 }, + { 0x52, 0x52 }, + { 0x54, 0x54 }, + { 0x56, 0x56 }, + { 0x58, 0x58 }, + { 0x5A, 0x5A }, + { 0x94, 0x94 }, + { 0x96, 0x96 }, + { 0x98, 0x98 }, + { 0x5D, 0x5D }, + { 0x5f, 0x5f }, + { 0x61, 0x61 }, + { 0x63, 0x63 }, + { 0x65, 0x65 }, + { 0x67, 0x67 }, + { 0x69, 0x69 }, + { 0x6B, 0x6B }, + { 0x6D, 0x6D }, + { 0x6f, 0x6f }, + { 0x71, 0x71 }, + { 0x73, 0x73 }, + { 0x76, 0x76 }, + { 0x78, 0x78 }, + { 0x7A, 0x7A }, + { 0x81, 0x81 }, + { 0x84, 0x84 }, + { 0x87, 0x87 }, + { 0x8A, 0x8A }, + { 0x8D, 0x8D }, + { 0x82, 0x82 }, + { 0x85, 0x85 }, + { 0x88, 0x88 }, + { 0x8B, 0x8B }, + { 0x8E, 0x8E }, + { 0x74, 0x74 }, + { 0xA2, 0x121 }, + { 0xA3, 0x122 }, + { 0xA4, 0x123 }, + { 0xA5, 0x124 }, + { 0xA6, 0x125 }, + { 0xA7, 0x126 }, + { 0xA8, 0x127 }, + { 0xA9, 0x128 }, + { 0xAA, 0x129 }, + { 0xAB, 0x12A }, + { 0xE1, 0x1AB }, + { 0xE2, 0x1AC }, + { 0xE4, 0x1AE }, + { 0xf1, 0x1BE }, + { 0xE6, 0x1B0 }, + { 0xE5, 0x1af }, + { 0xEA, 0xEA }, + { 0xEB, 0xEB }, + { 0xE8, 0x1B2 }, + { 0xE9, 0x1B3 }, + { 0xEE, 0x1BB }, + { 0xef, 0x1BC }, + { 0x112, 0x112 }, + { 0xE3, 0x1AD }, + { 0xf2, 0x176 }, + { 0xE7, 0x1B1 }, + { 0xAC, 0x12B }, + { 0xAD, 0x12C }, + { 0xAE, 0x12D }, + { 0xaf, 0x12E }, + { 0xB0, 0x12f }, + { 0xB1, 0x130 }, + { 0xB2, 0x131 }, + { 0xB3, 0x132 }, + { 0xB4, 0x133 }, + { 0xB5, 0x134 }, + { 0xB6, 0x135 }, + { 0xB7, 0x136 }, + { 0xB8, 0x137 }, + { 0xB9, 0x138 }, + { 0xBA, 0x139 }, + { 0xBB, 0x13A }, + { 0xBC, 0x13B }, + { 0xBD, 0x13C }, + { 0xBE, 0x13D }, + { 0xbf, 0x13E }, + { 0xC0, 0x13f }, + { 0xC1, 0x140 }, + { 0xC2, 0x141 }, + { 0xC3, 0x142 }, + { 0xC4, 0x143 }, + { 0xC5, 0x144 }, + { 0xC6, 0x145 }, + { 0xC7, 0x146 }, + { 0xC8, 0x147 }, + { 0xC9, 0x148 }, + { 0xCA, 0x149 }, + { 0xCB, 0x14A }, + { 0xCC, 0x14B }, + { 0xCD, 0x14C }, + { 0xCE, 0x14D }, + { 0xcf, 0x14E }, + { 0xD0, 0x14f }, + { 0xD1, 0x150 }, + { 0xD2, 0x151 }, + { 0xD3, 0x152 }, + { 0xD4, 0x153 }, + { 0xD5, 0x154 }, + { 0xD6, 0x155 }, + { 0xD7, 0x156 }, + { 0xD8, 0x157 }, + { 0xD9, 0x158 }, + { 0xDA, 0x159 }, + { 0xDB, 0x15A }, + { 0xDC, 0x15B }, + { 0xDD, 0x15C }, + { 0xDE, 0x15D }, + { 0xdf, 0x15E }, + { 0x11f, 0x11f }, + { 0xf6, 0x1C4 }, + { 0x163, 0x163 }, + { 0x175, 0x175 }, + { 0x17B, 0x17B }, + { 0x183, 0x183 }, + { 0x195, 0x195 }, + { 0x19B, 0x19B } }; -static u16 ov97_022392E4 (u32 param0) +static u16 ov97_022392E4(u32 param0) { return (param0 == 1) ? 0x1 : 0x1de; } -static u16 ov97_022392F8 (u32 param0) +static u16 ov97_022392F8(u32 param0) { switch (param0) { case 1: @@ -275,7 +275,7 @@ static u16 ov97_022392F8 (u32 param0) } } -static u16 ov97_02239334 (u32 param0) +static u16 ov97_02239334(u32 param0) { switch (param0) { case 1: @@ -292,7 +292,7 @@ static u16 ov97_02239334 (u32 param0) } } -BOOL ov97_0223936C (const u8 * param0, u16 * param1, u32 param2, u32 param3) +BOOL ov97_0223936C(const u8 *param0, u16 *param1, u32 param2, u32 param3) { u32 v0, v1; diff --git a/src/overlay098/ov98_02246C20.c b/src/overlay098/ov98_02246C20.c index 0ed6debb6a..451c42d9d0 100644 --- a/src/overlay098/ov98_02246C20.c +++ b/src/overlay098/ov98_02246C20.c @@ -1,61 +1,62 @@ +#include "overlay098/ov98_02246C20.h" + +#include #include #include -#include - - -#include "overlay077/const_ov77_021D742C.h" -#include "constdata/const_020F2DBC.h" #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_02089438.h" + +#include "overlay065/ov65_0222DCE0.h" +#include "overlay077/const_ov77_021D742C.h" +#include "overlay094/ov94_0223B140.h" +#include "overlay098/ov98_022471C8.h" +#include "overlay098/ov98_022499C8.h" #include "overlay098/struct_ov98_02246E88.h" #include "overlay098/struct_ov98_02247168.h" -#include "unk_02000C88.h" -#include "unk_020041CC.h" +#include "error_handling.h" #include "game_overlay.h" -#include "overlay_manager.h" -#include "unk_02017728.h" #include "heap.h" -#include "error_handling.h" +#include "overlay_manager.h" #include "strbuf.h" +#include "unk_02000C88.h" +#include "unk_020041CC.h" +#include "unk_02017728.h" #include "unk_02025E08.h" #include "unk_02030CE8.h" #include "unk_02033200.h" #include "unk_02038FFC.h" #include "unk_020393C8.h" -#include "vars_flags.h" #include "unk_0206A8DC.h" #include "unk_020890F4.h" #include "unk_02099550.h" -#include "overlay065/ov65_0222DCE0.h" -#include "overlay094/ov94_0223B140.h" -#include "overlay098/ov98_02246C20.h" -#include "overlay098/ov98_022471C8.h" -#include "overlay098/ov98_022499C8.h" +#include "vars_flags.h" + +#include "constdata/const_020F2DBC.h" FS_EXTERN_OVERLAY(overlay65); FS_EXTERN_OVERLAY(overlay77); FS_EXTERN_OVERLAY(overlay94); FS_EXTERN_OVERLAY(overlay98); -typedef void *(* UnkFuncPtr_ov98_02249B4C)(UnkStruct_ov98_02246E88 *); -typedef void (* UnkFuncPtr_ov98_02249B4C_1)(UnkStruct_ov98_02246E88 *); - -static void ov98_02246E08(UnkStruct_ov98_02246E88 * param0); -static void ov98_02246E54(UnkStruct_ov98_02246E88 * param0); -static void * ov98_02246EAC(DWCAllocType param0, u32 param1, int param2); -static void ov98_02246ED4(DWCAllocType param0, void * param1, u32 param2); -static void * ov98_02246FBC(UnkStruct_ov98_02246E88 * param0); -static void ov98_02246FC0(UnkStruct_ov98_02246E88 * param0); -static void * ov98_02247168(UnkStruct_ov98_02246E88 * param0); -static void ov98_02247198(UnkStruct_ov98_02246E88 * param0); -static void * ov98_02246FC4(UnkStruct_ov98_02246E88 * param0); -static void ov98_02246FFC(UnkStruct_ov98_02246E88 * param0); -static void * ov98_02247070(UnkStruct_ov98_02246E88 * param0); -static void ov98_022470B8(UnkStruct_ov98_02246E88 * param0); -static void * ov98_022470F8(UnkStruct_ov98_02246E88 * param0); -static void ov98_02247134(UnkStruct_ov98_02246E88 * param0); +typedef void *(*UnkFuncPtr_ov98_02249B4C)(UnkStruct_ov98_02246E88 *); +typedef void (*UnkFuncPtr_ov98_02249B4C_1)(UnkStruct_ov98_02246E88 *); + +static void ov98_02246E08(UnkStruct_ov98_02246E88 *param0); +static void ov98_02246E54(UnkStruct_ov98_02246E88 *param0); +static void *ov98_02246EAC(DWCAllocType param0, u32 param1, int param2); +static void ov98_02246ED4(DWCAllocType param0, void *param1, u32 param2); +static void *ov98_02246FBC(UnkStruct_ov98_02246E88 *param0); +static void ov98_02246FC0(UnkStruct_ov98_02246E88 *param0); +static void *ov98_02247168(UnkStruct_ov98_02246E88 *param0); +static void ov98_02247198(UnkStruct_ov98_02246E88 *param0); +static void *ov98_02246FC4(UnkStruct_ov98_02246E88 *param0); +static void ov98_02246FFC(UnkStruct_ov98_02246E88 *param0); +static void *ov98_02247070(UnkStruct_ov98_02246E88 *param0); +static void ov98_022470B8(UnkStruct_ov98_02246E88 *param0); +static void *ov98_022470F8(UnkStruct_ov98_02246E88 *param0); +static void ov98_02247134(UnkStruct_ov98_02246E88 *param0); static NNSFndHeapHandle Unk_ov98_02249E20; @@ -83,20 +84,20 @@ static const OverlayManagerTemplate Unk_ov98_02249B2C = { static const struct { UnkFuncPtr_ov98_02249B4C unk_00; UnkFuncPtr_ov98_02249B4C_1 unk_04; - const OverlayManagerTemplate * unk_08; + const OverlayManagerTemplate *unk_08; int unk_0C; } Unk_ov98_02249B4C[] = { - {ov98_02246FBC, ov98_02246FC0, &Unk_ov98_02249B3C, 0x0}, - {ov98_02246FC4, ov98_02246FFC, &Unk_020F2DBC, 0x0}, - {ov98_02247070, ov98_022470B8, &Unk_020F2DBC, 0x0}, - {ov98_022470F8, ov98_02247134, &Unk_020F2DBC, 0x0}, - {ov98_022470F8, ov98_02247134, &Unk_020F2DBC, 0x0}, - {ov98_02247168, ov98_02247198, &Unk_ov98_02249B2C, 0x1} + { ov98_02246FBC, ov98_02246FC0, &Unk_ov98_02249B3C, 0x0 }, + { ov98_02246FC4, ov98_02246FFC, &Unk_020F2DBC, 0x0 }, + { ov98_02247070, ov98_022470B8, &Unk_020F2DBC, 0x0 }, + { ov98_022470F8, ov98_02247134, &Unk_020F2DBC, 0x0 }, + { ov98_022470F8, ov98_02247134, &Unk_020F2DBC, 0x0 }, + { ov98_02247168, ov98_02247198, &Unk_ov98_02249B2C, 0x1 } }; -int ov98_02246C20 (OverlayManager * param0, int * param1) +int ov98_02246C20(OverlayManager *param0, int *param1) { - UnkStruct_ov98_02246E88 * v0; + UnkStruct_ov98_02246E88 *v0; Heap_Create(3, 108, 0x28000); Heap_Create(0, 91, 0x300); @@ -113,9 +114,9 @@ int ov98_02246C20 (OverlayManager * param0, int * param1) return 1; } -int ov98_02246C98 (OverlayManager * param0, int * param1) +int ov98_02246C98(OverlayManager *param0, int *param1) { - UnkStruct_ov98_02246E88 * v0 = OverlayManager_Data(param0); + UnkStruct_ov98_02246E88 *v0 = OverlayManager_Data(param0); BOOL v1; if (v0->unk_80 == 1) { @@ -169,9 +170,9 @@ int ov98_02246C98 (OverlayManager * param0, int * param1) return 0; } -int ov98_02246DC0 (OverlayManager * param0, int * param1) +int ov98_02246DC0(OverlayManager *param0, int *param1) { - UnkStruct_ov98_02246E88 * v0 = OverlayManager_Data(param0); + UnkStruct_ov98_02246E88 *v0 = OverlayManager_Data(param0); ov98_02246E54(v0); @@ -185,7 +186,7 @@ int ov98_02246DC0 (OverlayManager * param0, int * param1) return 1; } -static void ov98_02246E08 (UnkStruct_ov98_02246E88 * param0) +static void ov98_02246E08(UnkStruct_ov98_02246E88 *param0) { if (param0->unk_80 == 0) { Overlay_LoadByID(FS_OVERLAY_ID(overlay94), 2); @@ -200,7 +201,7 @@ static void ov98_02246E08 (UnkStruct_ov98_02246E88 * param0) } } -static void ov98_02246E54 (UnkStruct_ov98_02246E88 * param0) +static void ov98_02246E54(UnkStruct_ov98_02246E88 *param0) { if (param0->unk_80 == 1) { NNS_FndDestroyExpHeap(param0->unk_10); @@ -215,31 +216,31 @@ static void ov98_02246E54 (UnkStruct_ov98_02246E88 * param0) } } -void ov98_02246E88 (UnkStruct_ov98_02246E88 * param0, int param1, int param2) +void ov98_02246E88(UnkStruct_ov98_02246E88 *param0, int param1, int param2) { param0->unk_8C = param1; param0->unk_90 = param2; } -void ov98_02246E94 (UnkStruct_ov98_02246E88 * param0) +void ov98_02246E94(UnkStruct_ov98_02246E88 *param0) { param0->unk_8C = 6; } -void ov98_02246E9C (UnkStruct_ov98_02246E88 * param0, int param1) +void ov98_02246E9C(UnkStruct_ov98_02246E88 *param0, int param1) { param0->unk_7E = param1; } -int ov98_02246EA4 (UnkStruct_ov98_02246E88 * param0) +int ov98_02246EA4(UnkStruct_ov98_02246E88 *param0) { return param0->unk_7E; } -static void * ov98_02246EAC (DWCAllocType param0, u32 param1, int param2) +static void *ov98_02246EAC(DWCAllocType param0, u32 param1, int param2) { -#pragma unused( param0 ) - void * v0; +#pragma unused(param0) + void *v0; OSIntrMode v1; v1 = OS_DisableInterrupts(); v0 = NNS_FndAllocFromExpHeapEx(Unk_ov98_02249E20, param1, param2); @@ -253,9 +254,9 @@ static void * ov98_02246EAC (DWCAllocType param0, u32 param1, int param2) return v0; } -static void ov98_02246ED4 (DWCAllocType param0, void * param1, u32 param2) +static void ov98_02246ED4(DWCAllocType param0, void *param1, u32 param2) { -#pragma unused( param0, param2 ) +#pragma unused(param0, param2) OSIntrMode v0; if (!param1) { @@ -268,9 +269,9 @@ static void ov98_02246ED4 (DWCAllocType param0, void * param1, u32 param2) OS_RestoreInterrupts(v0); } -void ov98_02246EF8 (UnkStruct_ov98_02246E88 * param0) +void ov98_02246EF8(UnkStruct_ov98_02246E88 *param0) { - char * v0; + char *v0; v0 = Heap_AllocFromHeap(108, sizeof(char) * 100); @@ -279,18 +280,18 @@ void ov98_02246EF8 (UnkStruct_ov98_02246E88 * param0) Heap_FreeToHeap(v0); } -void ov98_02246F24 (UnkStruct_ov98_02246E88 * param0) +void ov98_02246F24(UnkStruct_ov98_02246E88 *param0) { sub_02030D5C(param0->unk_04, 1, param0->unk_7C); sub_02030D5C(param0->unk_04, 2, param0->unk_10C); } -void ov98_02246F48 (UnkStruct_ov98_02246E88 * param0) +void ov98_02246F48(UnkStruct_ov98_02246E88 *param0) { sub_02030D5C(param0->unk_04, 3, param0->unk_108); } -void ov98_02246F5C (UnkStruct_ov98_02246E88 * param0) +void ov98_02246F5C(UnkStruct_ov98_02246E88 *param0) { u32 v0; @@ -298,67 +299,67 @@ void ov98_02246F5C (UnkStruct_ov98_02246E88 * param0) ov98_02246F94(param0, v0); } -void ov98_02246F74 (UnkStruct_ov98_02246E88 * param0) +void ov98_02246F74(UnkStruct_ov98_02246E88 *param0) { ov98_022499C8(param0->unk_114, param0->unk_9C.unk_1C, 108); } -void ov98_02246F88 (UnkStruct_ov98_02246E88 * param0) +void ov98_02246F88(UnkStruct_ov98_02246E88 *param0) { param0->unk_9C.unk_5A = param0->unk_10C; } -void ov98_02246F94 (UnkStruct_ov98_02246E88 * param0, u32 param1) +void ov98_02246F94(UnkStruct_ov98_02246E88 *param0, u32 param1) { param0->unk_7C = param1; } -u32 ov98_02246F9C (UnkStruct_ov98_02246E88 * param0) +u32 ov98_02246F9C(UnkStruct_ov98_02246E88 *param0) { return param0->unk_10C; } -u32 ov98_02246FA4 (UnkStruct_ov98_02246E88 * param0) +u32 ov98_02246FA4(UnkStruct_ov98_02246E88 *param0) { return param0->unk_108; } -void ov98_02246FAC (UnkStruct_ov98_02246E88 * param0, int param1) +void ov98_02246FAC(UnkStruct_ov98_02246E88 *param0, int param1) { param0->unk_110 = param1; } -int ov98_02246FB4 (UnkStruct_ov98_02246E88 * param0) +int ov98_02246FB4(UnkStruct_ov98_02246E88 *param0) { return param0->unk_110; } -static void * ov98_02246FBC (UnkStruct_ov98_02246E88 * param0) +static void *ov98_02246FBC(UnkStruct_ov98_02246E88 *param0) { return param0; } -static void ov98_02246FC0 (UnkStruct_ov98_02246E88 * param0) +static void ov98_02246FC0(UnkStruct_ov98_02246E88 *param0) { return; } -void * ov98_02246FC4 (UnkStruct_ov98_02246E88 * param0) -{ +void *ov98_02246FC4(UnkStruct_ov98_02246E88 *param0) +{ int v0[4]; - + v0[0] = 4; v0[1] = 4; v0[2] = 4; v0[3] = 4; - + param0->unk_98 = sub_02089400(108, 16, v0, SaveData_Options(param0->unk_04), 4, 0); return param0->unk_98; } -void ov98_02246FFC (UnkStruct_ov98_02246E88 * param0) -{ - UnkStruct_02089438 * v0 = param0->unk_98; +void ov98_02246FFC(UnkStruct_ov98_02246E88 *param0) +{ + UnkStruct_02089438 *v0 = param0->unk_98; if (ov98_02249A80(v0->unk_1C, 108)) { ov98_02246FAC(param0, 1); } else if (ov98_02246FB4(param0) == 2) { @@ -371,27 +372,27 @@ void ov98_02246FFC (UnkStruct_ov98_02246E88 * param0) Strbuf_Copy(param0->unk_114, v0->unk_1C); ov98_02246FAC(param0, 2); } - + sub_02089438(v0); ov98_02246E88(param0, 0, 0); } -void * ov98_02247070 (UnkStruct_ov98_02246E88 * param0) -{ +void *ov98_02247070(UnkStruct_ov98_02246E88 *param0) +{ int v0[4]; - + v0[0] = 3; v0[1] = 4; v0[2] = 0; v0[3] = 0; - + param0->unk_98 = sub_0208941C(108, 7, v0, SaveData_Options(param0->unk_04), 5, 1, 1, param0->unk_7C); return param0->unk_98; } -void ov98_022470B8 (UnkStruct_ov98_02246E88 * param0) +void ov98_022470B8(UnkStruct_ov98_02246E88 *param0) { - UnkStruct_02089438 * v0 = param0->unk_98; + UnkStruct_02089438 *v0 = param0->unk_98; BOOL v1; param0->unk_10C = Strbuf_AtoI(v0->unk_1C, &v1) % 10000; GF_ASSERT(v1); @@ -399,22 +400,22 @@ void ov98_022470B8 (UnkStruct_ov98_02246E88 * param0) ov98_02246E88(param0, 0, 0); } -void * ov98_022470F8 (UnkStruct_ov98_02246E88 * param0) -{ +void *ov98_022470F8(UnkStruct_ov98_02246E88 *param0) +{ int v0[4]; - + v0[0] = 4; v0[1] = 0; v0[2] = 0; v0[3] = 0; - + param0->unk_98 = sub_02089400(108, 4, v0, SaveData_Options(param0->unk_04), 6, 0); return param0->unk_98; } -void ov98_02247134 (UnkStruct_ov98_02246E88 * param0) +void ov98_02247134(UnkStruct_ov98_02246E88 *param0) { - UnkStruct_02089438 * v0 = param0->unk_98; + UnkStruct_02089438 *v0 = param0->unk_98; BOOL v1; param0->unk_108 = Strbuf_AtoI(v0->unk_1C, &v1); GF_ASSERT(v1); @@ -422,9 +423,9 @@ void ov98_02247134 (UnkStruct_ov98_02246E88 * param0) ov98_02246E88(param0, 0, 0); } -static void * ov98_02247168 (UnkStruct_ov98_02246E88 * param0) +static void *ov98_02247168(UnkStruct_ov98_02246E88 *param0) { - UnkStruct_ov98_02247168 * v0; + UnkStruct_ov98_02247168 *v0; v0 = Heap_AllocFromHeap(108, sizeof(UnkStruct_ov98_02247168)); MI_CpuClear8(v0, sizeof(UnkStruct_ov98_02247168)); @@ -438,9 +439,9 @@ static void * ov98_02247168 (UnkStruct_ov98_02246E88 * param0) return param0->unk_98; } -static void ov98_02247198 (UnkStruct_ov98_02246E88 * param0) +static void ov98_02247198(UnkStruct_ov98_02246E88 *param0) { - UnkStruct_ov98_02247168 * v0; + UnkStruct_ov98_02247168 *v0; v0 = param0->unk_98; diff --git a/src/overlay098/ov98_022499C8.c b/src/overlay098/ov98_022499C8.c index 20de56cc52..47afb1f3e2 100644 --- a/src/overlay098/ov98_022499C8.c +++ b/src/overlay098/ov98_022499C8.c @@ -1,45 +1,46 @@ +#include "overlay098/ov98_022499C8.h" + +#include #include #include -#include #include "constants/charcode.h" -#include "strbuf.h" -#include "heap.h" #include "error_handling.h" +#include "heap.h" #include "strbuf.h" -#include "overlay098/ov98_022499C8.h" static const struct { u16 unk_00; char unk_02; } Unk_ov98_02249D2C[] = { - {0x121, '0'}, - {0x122, '1'}, - {0x123, '2'}, - {0x124, '3'}, - {0x125, '4'}, - {0x126, '5'}, - {0x127, '6'}, - {0x128, '7'}, - {0x129, '8'}, - {0x12a, '9'}, + { 0x121, '0' }, + { 0x122, '1' }, + { 0x123, '2' }, + { 0x124, '3' }, + { 0x125, '4' }, + { 0x126, '5' }, + { 0x127, '6' }, + { 0x128, '7' }, + { 0x129, '8' }, + { 0x12a, '9' }, }; -void ov98_022499C8 (Strbuf *param0, char * param1, int param2) -{ +void ov98_022499C8(Strbuf *param0, char *param1, int param2) +{ static const char Unk_ov98_02249D1C[] = "w"; static const char Unk_ov98_02249D20[] = "@wii.com"; int v0; - charcode_t * v1; + charcode_t *v1; int v2 = 0, v3; - - for (v0 = 0; Unk_ov98_02249D1C[v0]; v2++) + + for (v0 = 0; Unk_ov98_02249D1C[v0]; v2++) { param1[v2] = Unk_ov98_02249D1C[v0++]; - + } + v1 = Heap_AllocFromHeap(param2, sizeof(charcode_t) * 100); Strbuf_ToChars(param0, v1, 100); - + v0 = 0; while (1) { if (v1[v0] == CHAR_EOS) { @@ -56,39 +57,40 @@ void ov98_022499C8 (Strbuf *param0, char * param1, int param2) v2++; v0++; } - - for (v0 = 0; Unk_ov98_02249D20[v0]; v2++) + + for (v0 = 0; Unk_ov98_02249D20[v0]; v2++) { param1[v2] = Unk_ov98_02249D20[v0++]; + } param1[v2] = '\0'; Heap_FreeToHeap(v1); } -int ov98_02249A80 (Strbuf *param0, int param1) -{ - charcode_t * v0; +int ov98_02249A80(Strbuf *param0, int param1) +{ + charcode_t *v0; BOOL v1 = TRUE; int v2; - + v0 = Heap_AllocFromHeap(param1, sizeof(charcode_t) * 100); Strbuf_ToChars(param0, v0, 100); - + for (v2 = 0; v0[v2] != CHAR_EOS; v2++) { if (v0[v2] != CHAR_EN_0) { v1 = FALSE; break; } } - + Heap_FreeToHeap(v0); return v1; } -void ov98_02249ACC (const char * param0, u32 * param1, int param2) +void ov98_02249ACC(const char *param0, u32 *param1, int param2) { int v0, v1; int v2 = 0; - const char * v3; - + const char *v3; + for (v0 = 0; v0 < 4; v0++) { param1[v0] = 0; for (v1 = 0; v1 < 4; v1++) { diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c index deb3a05fca..9ca0cfb02f 100644 --- a/src/overlay099/ov99_021D0D80.c +++ b/src/overlay099/ov99_021D0D80.c @@ -1,16 +1,16 @@ +#include "overlay099/ov99_021D0D80.h" + #include #include -#include "core_sys.h" -#include "enums.h" - #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" + #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay099/ov99_021D1A54.h" +#include "overlay099/ov99_021D3E78.h" #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D3A40.h" #include "overlay104/struct_ov104_022412F4.h" @@ -18,29 +18,29 @@ #include "overlay104/struct_ov104_0224133C.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "core_sys.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_020041CC.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_020093B4.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_020170BC.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_0202419C.h" #include "unk_02024220.h" -#include "overlay099/ov99_021D0D80.h" -#include "overlay099/ov99_021D1A54.h" -#include "overlay099/ov99_021D3E78.h" static const CameraAngle Unk_ov99_021D46CC = { ((0 * 0xffff) / 360), @@ -76,23 +76,23 @@ static const UnkStruct_ov104_02241308 Unk_ov99_021D472C = { 0x8 }; -static void ov99_021D1244(SysTask * param0, void * param1); -static void ov99_021D1350(void * param0); -static void ov99_021D1380(BGL * param0); -static void ov99_021D1720(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1918(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 * param0); -static GenericPointerData * ov99_021D19AC(int param0); +static void ov99_021D1244(SysTask *param0, void *param1); +static void ov99_021D1350(void *param0); +static void ov99_021D1380(BGL *param0); +static void ov99_021D1720(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1918(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0); +static GenericPointerData *ov99_021D19AC(int param0); static void ov99_021D19C8(void); -static void ov99_021D1A4C(GenericPointerData * param0); -static void ov99_021D16E4(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1270(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1314(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1580(BGL * param0); +static void ov99_021D1A4C(GenericPointerData *param0); +static void ov99_021D16E4(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1270(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1314(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1580(BGL *param0); -int ov99_021D0D80 (OverlayManager * param0, int * param1) +int ov99_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov99_021D2CB0 * v0; + UnkStruct_ov99_021D2CB0 *v0; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -184,9 +184,9 @@ int ov99_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov99_021D1028 (OverlayManager * param0, int * param1) +int ov99_021D1028(OverlayManager *param0, int *param1) { - UnkStruct_ov99_021D2CB0 * v0 = OverlayManager_Data(param0); + UnkStruct_ov99_021D2CB0 *v0 = OverlayManager_Data(param0); if (v0->unk_1108 != NULL) { ov99_021D3F6C(v0->unk_1108, 1); @@ -259,9 +259,9 @@ int ov99_021D1028 (OverlayManager * param0, int * param1) return 0; } -int ov99_021D11A8 (OverlayManager * param0, int * param1) +int ov99_021D11A8(OverlayManager *param0, int *param1) { - UnkStruct_ov99_021D2CB0 * v0 = OverlayManager_Data(param0); + UnkStruct_ov99_021D2CB0 *v0 = OverlayManager_Data(param0); SysTask_Done(v0->unk_14); @@ -293,9 +293,9 @@ int ov99_021D11A8 (OverlayManager * param0, int * param1) return 1; } -static void ov99_021D1244 (SysTask * param0, void * param1) +static void ov99_021D1244(SysTask *param0, void *param1) { - UnkStruct_ov99_021D2CB0 * v0 = param1; + UnkStruct_ov99_021D2CB0 *v0 = param1; if (v0->unk_1103 == 1) { ov99_021D1720(v0); @@ -306,7 +306,7 @@ static void ov99_021D1244 (SysTask * param0, void * param1) sub_0200C808(); } -static void ov99_021D1270 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1270(UnkStruct_ov99_021D2CB0 *param0) { GF_ASSERT(param0->unk_1108 != NULL); @@ -329,7 +329,7 @@ static void ov99_021D1270 (UnkStruct_ov99_021D2CB0 * param0) ov99_021D1A4C(param0->unk_10); } -void ov99_021D12F0 (UnkStruct_ov99_021D2CB0 * param0) +void ov99_021D12F0(UnkStruct_ov99_021D2CB0 *param0) { if (param0->unk_1108 == NULL) { return; @@ -341,7 +341,7 @@ void ov99_021D12F0 (UnkStruct_ov99_021D2CB0 * param0) ov99_021D1580(param0->unk_08); } -static void ov99_021D1314 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1314(UnkStruct_ov99_021D2CB0 *param0) { GF_ASSERT(param0->unk_1108 == NULL); @@ -352,9 +352,9 @@ static void ov99_021D1314 (UnkStruct_ov99_021D2CB0 * param0) Heap_FreeToHeap(param0->unk_08); } -static void ov99_021D1350 (void * param0) +static void ov99_021D1350(void *param0) { - UnkStruct_ov99_021D2CB0 * v0 = param0; + UnkStruct_ov99_021D2CB0 *v0 = param0; sub_0201DCAC(); sub_0200C800(); @@ -364,7 +364,7 @@ static void ov99_021D1350 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov99_021D1380 (BGL * param0) +static void ov99_021D1380(BGL *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -417,7 +417,7 @@ static void ov99_021D1380 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -432,7 +432,7 @@ static void ov99_021D1380 (BGL * param0) 3, 0, 0, - 0 + 0, }, { 0, @@ -447,7 +447,7 @@ static void ov99_021D1380 (BGL * param0) 2, 0, 0, - 0 + 0, }, }; @@ -484,7 +484,7 @@ static void ov99_021D1380 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -499,7 +499,7 @@ static void ov99_021D1380 (BGL * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -514,7 +514,7 @@ static void ov99_021D1380 (BGL * param0) 3, 0, 0, - 0 + 0, }, }; @@ -543,7 +543,7 @@ static void ov99_021D1380 (BGL * param0) sub_02019120(6, 0); } -static void ov99_021D1580 (BGL * param0) +static void ov99_021D1580(BGL *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -596,7 +596,7 @@ static void ov99_021D1580 (BGL * param0) 3, 0, 0, - 0 + 0, }, { 0, @@ -611,7 +611,7 @@ static void ov99_021D1580 (BGL * param0) 2, 0, 0, - 0 + 0, }, { 0, @@ -626,7 +626,7 @@ static void ov99_021D1580 (BGL * param0) 3, 0, 0, - 0 + 0, }, }; @@ -661,7 +661,7 @@ static void ov99_021D1580 (BGL * param0) 3, 0, 0, - 0 + 0, }, }; @@ -674,13 +674,13 @@ static void ov99_021D1580 (BGL * param0) sub_02019690(7, 32, 0, 75); } -static void ov99_021D16E4 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D16E4(UnkStruct_ov99_021D2CB0 *param0) { PaletteSys_LoadPalette(param0->unk_0C, 127, 85, 75, 0, 0x20, 15 * 16); PaletteSys_LoadPalette(param0->unk_0C, 127, 85, 75, 1, 0x20, 15 * 16); } -static void ov99_021D1720 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1720(UnkStruct_ov99_021D2CB0 *param0) { VecFx32 v0, v1; MtxFx33 v2; @@ -753,35 +753,35 @@ static void ov99_021D1720 (UnkStruct_ov99_021D2CB0 * param0) NNS_G3dGePopMtx(1); } -static void ov99_021D1918 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1918(UnkStruct_ov99_021D2CB0 *param0) { - VecFx32 v0 = {0, (-FX32_ONE * 8), 0}; - VecFx32 v1 = {-31712, -142304, 496744}; - VecFx32 v2 = {-31712, -67780, -5704}; + VecFx32 v0 = { 0, (-FX32_ONE * 8), 0 }; + VecFx32 v1 = { -31712, -142304, 496744 }; + VecFx32 v2 = { -31712, -67780, -5704 }; param0->camera = Camera_Alloc(75); - Camera_InitWithTarget(&v0, 0x7c000, &Unk_ov99_021D46CC, (((22 * 0xffff) / 360)), 0, 0, param0->camera); + Camera_InitWithTarget(&v0, 0x7c000, &Unk_ov99_021D46CC, ((22 * 0xffff) / 360), 0, 0, param0->camera); Camera_SetPosition(&v1, param0->camera); Camera_SetTarget(&v2, param0->camera); Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), param0->camera); Camera_SetAsActive(param0->camera); } -static void ov99_021D19A0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 *param0) { Camera_Delete(param0->camera); } -static GenericPointerData * ov99_021D19AC (int param0) +static GenericPointerData *ov99_021D19AC(int param0) { - GenericPointerData * v0; + GenericPointerData *v0; v0 = sub_02024220(param0, 0, 1, 0, 1, ov99_021D19C8); return v0; } -static void ov99_021D19C8 (void) +static void ov99_021D19C8(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -796,7 +796,7 @@ static void ov99_021D19C8 (void) G3_ViewPort(0, 0, 255, 191); } -static void ov99_021D1A4C (GenericPointerData * param0) +static void ov99_021D1A4C(GenericPointerData *param0) { sub_020242C4(param0); } diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c index e22ec12e1d..b64d0687c9 100644 --- a/src/overlay099/ov99_021D1A54.c +++ b/src/overlay099/ov99_021D1A54.c @@ -1,43 +1,42 @@ +#include "overlay099/ov99_021D1A54.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" + +#include "overlay099/ov99_021D0D80.h" +#include "overlay099/ov99_021D2C08.h" +#include "overlay099/ov99_021D2E28.h" +#include "overlay099/ov99_021D340C.h" +#include "overlay099/ov99_021D3A40.h" +#include "overlay099/ov99_021D3C18.h" +#include "overlay099/ov99_021D3DE0.h" +#include "overlay099/ov99_021D3E78.h" +#include "overlay099/ov99_021D4134.h" #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D2CB0_sub2.h" #include "overlay099/struct_ov99_021D3A40.h" -#include "struct_defs/sprite_template.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "overlay099/ov99_021D0D80.h" -#include "overlay099/ov99_021D1A54.h" -#include "overlay099/ov99_021D2C08.h" -#include "overlay099/ov99_021D2E28.h" -#include "overlay099/ov99_021D340C.h" -#include "overlay099/ov99_021D3A40.h" -#include "overlay099/ov99_021D3C18.h" -#include "overlay099/ov99_021D3DE0.h" -#include "overlay099/ov99_021D3E78.h" -#include "overlay099/ov99_021D4134.h" -typedef void (* UnkFuncPtr_ov99_021D4A04)(UnkStruct_ov99_021D2CB0 *); -typedef BOOL (* UnkFuncPtr_ov99_021D4A04_1)(UnkStruct_ov99_021D2CB0 *, UnkStruct_ov99_021D3A40 *); +typedef void (*UnkFuncPtr_ov99_021D4A04)(UnkStruct_ov99_021D2CB0 *); +typedef BOOL (*UnkFuncPtr_ov99_021D4A04_1)(UnkStruct_ov99_021D2CB0 *, UnkStruct_ov99_021D3A40 *); typedef struct { UnkFuncPtr_ov99_021D4A04 unk_00; @@ -55,82 +54,82 @@ typedef struct { UnkFuncPtr_ov99_021D4A04_1 unk_30; } UnkStruct_ov99_021D4A04; -static void ov99_021D1A54(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1B98(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1BC4(UnkStruct_ov99_021D2CB0 * param0, CellActorData ** param1, CellActorData ** param2); -static void ov99_021D1C9C(UnkStruct_ov99_021D2CB0 * param0, CellActorData * param1, CellActorData * param2); -static void ov99_021D1D68(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1E6C(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1E90(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1E98(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1EA0(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1EB4(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1EC8(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1F44(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1F70(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1FB8(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D1FD8(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D20F8(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D211C(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D214C(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2158(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D215C(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2160(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2164(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2168(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D216C(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2170(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2174(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2178(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D217C(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2180(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D22AC(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D22D0(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D22D8(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D22E0(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D22F4(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2308(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2384(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D23B0(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D23F0(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2410(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D24CC(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D24F0(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2640(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2664(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D26E4(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2714(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D275C(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2780(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D27FC(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2828(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D288C(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D28AC(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2A14(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2A38(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2A70(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2A84(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2A88(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2A8C(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2A90(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2A94(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2A98(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2A9C(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2AA0(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2AA4(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2AA8(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2AAC(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2BBC(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2BE0(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2BE4(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2BE8(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2BEC(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2BF0(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2BF4(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2BF8(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2BFC(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2C00(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D2C04(UnkStruct_ov99_021D2CB0 * param0); +static void ov99_021D1A54(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1B98(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1BC4(UnkStruct_ov99_021D2CB0 *param0, CellActorData **param1, CellActorData **param2); +static void ov99_021D1C9C(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1, CellActorData *param2); +static void ov99_021D1D68(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1E6C(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1E90(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1E98(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1EA0(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1EB4(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1EC8(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1F44(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1F70(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1FB8(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D1FD8(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D20F8(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D211C(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D214C(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2158(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D215C(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2160(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2164(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2168(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D216C(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2170(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2174(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2178(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D217C(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2180(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D22AC(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D22D0(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D22D8(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D22E0(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D22F4(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2308(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2384(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D23B0(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D23F0(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2410(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D24CC(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D24F0(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2640(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2664(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D26E4(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2714(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D275C(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2780(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D27FC(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2828(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D288C(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D28AC(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2A14(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2A38(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2A70(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2A84(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2A88(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2A8C(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2A90(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2A94(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2A98(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2A9C(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2AA0(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2AA4(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2AA8(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2AAC(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2BBC(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2BE0(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2BE4(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2BE8(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2BEC(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2BF0(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2BF4(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2BF8(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2BFC(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2C00(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D2C04(UnkStruct_ov99_021D2CB0 *param0); static const UnkStruct_ov99_021D4A04 Unk_ov99_021D4A04[] = { { @@ -146,7 +145,7 @@ static const UnkStruct_ov99_021D4A04 Unk_ov99_021D4A04[] = { ov99_021D1F44, ov99_021D1EB4, ov99_021D1FB8, - ov99_021D2C08 + ov99_021D2C08, }, { ov99_021D211C, @@ -161,7 +160,7 @@ static const UnkStruct_ov99_021D4A04 Unk_ov99_021D4A04[] = { ov99_021D216C, ov99_021D2164, ov99_021D2174, - ov99_021D3A40 + ov99_021D3A40, }, { ov99_021D2180, @@ -176,7 +175,7 @@ static const UnkStruct_ov99_021D4A04 Unk_ov99_021D4A04[] = { ov99_021D2384, ov99_021D22F4, ov99_021D23F0, - ov99_021D2E28 + ov99_021D2E28, }, { ov99_021D211C, @@ -191,7 +190,7 @@ static const UnkStruct_ov99_021D4A04 Unk_ov99_021D4A04[] = { ov99_021D216C, ov99_021D2164, ov99_021D2174, - ov99_021D3B2C + ov99_021D3B2C, }, { ov99_021D24F0, @@ -206,7 +205,7 @@ static const UnkStruct_ov99_021D4A04 Unk_ov99_021D4A04[] = { ov99_021D27FC, ov99_021D275C, ov99_021D288C, - ov99_021D340C + ov99_021D340C, }, { ov99_021D2A38, @@ -221,7 +220,7 @@ static const UnkStruct_ov99_021D4A04 Unk_ov99_021D4A04[] = { ov99_021D2A98, ov99_021D2A90, ov99_021D2AA0, - ov99_021D3C18 + ov99_021D3C18, }, { ov99_021D2AAC, @@ -236,8 +235,8 @@ static const UnkStruct_ov99_021D4A04 Unk_ov99_021D4A04[] = { ov99_021D2BF4, ov99_021D2BEC, ov99_021D2BFC, - ov99_021D3DE0 - } + ov99_021D3DE0, + }, }; static const SpriteTemplate Unk_ov99_021D499C = { @@ -248,9 +247,9 @@ static const SpriteTemplate Unk_ov99_021D499C = { 0x96, 0x1, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2713, 0x2713, 0x2713, 0x2713, 0xffffffff, 0xffffffff}, + { 0x2713, 0x2713, 0x2713, 0x2713, 0xffffffff, 0xffffffff }, 0x2, - 0x0 + 0x0, }; static const SpriteTemplate Unk_ov99_021D4968 = { @@ -261,9 +260,9 @@ static const SpriteTemplate Unk_ov99_021D4968 = { 0x96, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2714, 0x2714, 0x2714, 0x2714, 0xffffffff, 0xffffffff}, + { 0x2714, 0x2714, 0x2714, 0x2714, 0xffffffff, 0xffffffff }, 0x2, - 0x0 + 0x0, }; static const SpriteTemplate Unk_ov99_021D4934 = { @@ -274,9 +273,9 @@ static const SpriteTemplate Unk_ov99_021D4934 = { 0x96, 0x2, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2715, 0x2715, 0x2715, 0x2715, 0xffffffff, 0xffffffff}, + { 0x2715, 0x2715, 0x2715, 0x2715, 0xffffffff, 0xffffffff }, 0x2, - 0x0 + 0x0, }; static const SpriteTemplate Unk_ov99_021D49D0 = { @@ -287,9 +286,9 @@ static const SpriteTemplate Unk_ov99_021D49D0 = { 0xC8, 0x3, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x2712, 0x2712, 0x2712, 0x2712, 0xffffffff, 0xffffffff}, + { 0x2712, 0x2712, 0x2712, 0x2712, 0xffffffff, 0xffffffff }, 0x3, - 0x0 + 0x0, }; static const SpriteTemplate Unk_ov99_021D48CC = { @@ -300,9 +299,9 @@ static const SpriteTemplate Unk_ov99_021D48CC = { 0xC8, 0x3, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2715, 0x2715, 0x2715, 0x2715, 0xffffffff, 0xffffffff}, + { 0x2715, 0x2715, 0x2715, 0x2715, 0xffffffff, 0xffffffff }, 0x3, - 0x0 + 0x0, }; static const SpriteTemplate Unk_ov99_021D4900 = { @@ -313,12 +312,12 @@ static const SpriteTemplate Unk_ov99_021D4900 = { 0x33, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x2711, 0x2711, 0x2711, 0x2711, 0xffffffff, 0xffffffff}, + { 0x2711, 0x2711, 0x2711, 0x2711, 0xffffffff, 0xffffffff }, + 0x1, 0x1, - 0x1 }; -static void ov99_021D1A54 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1A54(UnkStruct_ov99_021D2CB0 *param0) { u8 v0; @@ -346,7 +345,7 @@ static void ov99_021D1A54 (UnkStruct_ov99_021D2CB0 * param0) } } -static void ov99_021D1B98 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1B98(UnkStruct_ov99_021D2CB0 *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_1C, 10001); SpriteGfxHandler_UnloadPlttObjById(param0->unk_1C, 10001); @@ -354,10 +353,10 @@ static void ov99_021D1B98 (UnkStruct_ov99_021D2CB0 * param0) SpriteGfxHandler_UnloadAnimObjById(param0->unk_1C, 10001); } -static void ov99_021D1BC4 (UnkStruct_ov99_021D2CB0 * param0, CellActorData ** param1, CellActorData ** param2) +static void ov99_021D1BC4(UnkStruct_ov99_021D2CB0 *param0, CellActorData **param1, CellActorData **param2) { - CellActorData * v0; - CellActorData * v1; + CellActorData *v0; + CellActorData *v1; SpriteTemplate v2 = Unk_ov99_021D4900; MI_CpuClear8(¶m0->unk_1114, sizeof(UnkStruct_ov99_021D2CB0_sub2)); @@ -378,8 +377,8 @@ static void ov99_021D1BC4 (UnkStruct_ov99_021D2CB0 * param0, CellActorData ** pa *param2 = v1; { - void * v3; - NNSG2dCharacterData * v4; + void *v3; + NNSG2dCharacterData *v4; u32 v5; GF_ASSERT(param0->unk_10F4 == NULL); @@ -399,7 +398,7 @@ static void ov99_021D1BC4 (UnkStruct_ov99_021D2CB0 * param0, CellActorData ** pa } } -static void ov99_021D1C9C (UnkStruct_ov99_021D2CB0 * param0, CellActorData * param1, CellActorData * param2) +static void ov99_021D1C9C(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1, CellActorData *param2) { sub_0200D0F4(param1); sub_0200D0F4(param2); @@ -410,9 +409,9 @@ static void ov99_021D1C9C (UnkStruct_ov99_021D2CB0 * param0, CellActorData * par } } -void ov99_021D1CC8 (UnkStruct_ov99_021D2CB0 * param0, int param1) +void ov99_021D1CC8(UnkStruct_ov99_021D2CB0 *param0, int param1) { - const UnkStruct_ov99_021D4A04 * v0; + const UnkStruct_ov99_021D4A04 *v0; v0 = &Unk_ov99_021D4A04[param1]; @@ -424,9 +423,9 @@ void ov99_021D1CC8 (UnkStruct_ov99_021D2CB0 * param0, int param1) v0->unk_14(param0); } -void ov99_021D1CFC (UnkStruct_ov99_021D2CB0 * param0, int param1) +void ov99_021D1CFC(UnkStruct_ov99_021D2CB0 *param0, int param1) { - const UnkStruct_ov99_021D4A04 * v0; + const UnkStruct_ov99_021D4A04 *v0; v0 = &Unk_ov99_021D4A04[param1]; @@ -438,7 +437,7 @@ void ov99_021D1CFC (UnkStruct_ov99_021D2CB0 * param0, int param1) v0->unk_2C(param0); } -BOOL ov99_021D1D30 (UnkStruct_ov99_021D2CB0 * param0, int param1) +BOOL ov99_021D1D30(UnkStruct_ov99_021D2CB0 *param0, int param1) { BOOL v0; @@ -451,9 +450,9 @@ BOOL ov99_021D1D30 (UnkStruct_ov99_021D2CB0 * param0, int param1) return v0; } -static void ov99_021D1D68 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1D68(UnkStruct_ov99_021D2CB0 *param0) { - BGL * v0 = param0->unk_08; + BGL *v0 = param0->unk_08; PaletteSys_LoadPalette(param0->unk_0C, 127, 18, 75, 0, 0, 0); sub_020070E8(param0->unk_10F8, 9, param0->unk_08, 2, 0, 0, 0, 75); @@ -477,7 +476,7 @@ static void ov99_021D1D68 (UnkStruct_ov99_021D2CB0 * param0) sub_0201C3C0(param0->unk_08, 7); } -static void ov99_021D1E6C (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1E6C(UnkStruct_ov99_021D2CB0 *param0) { sub_02019120(2, 0); sub_02019120(7, 0); @@ -485,27 +484,27 @@ static void ov99_021D1E6C (UnkStruct_ov99_021D2CB0 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 0); } -static void ov99_021D1E90 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1E90(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1A54(param0); } -static void ov99_021D1E98 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1E98(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1B98(param0); } -static void ov99_021D1EA0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1EA0(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1BC4(param0, ¶m0->unk_10E0[0], ¶m0->unk_10E0[1]); } -static void ov99_021D1EB4 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1EB4(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1C9C(param0, param0->unk_10E0[0], param0->unk_10E0[1]); } -static void ov99_021D1EC8 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1EC8(UnkStruct_ov99_021D2CB0 *param0) { SpriteRenderer_LoadPalette(param0->unk_0C, 3, param0->unk_18, param0->unk_1C, param0->unk_10F8, 15, 0, 10, NNS_G2D_VRAM_TYPE_2DSUB, 10003); SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_18, param0->unk_1C, param0->unk_10F8, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 10003); @@ -513,7 +512,7 @@ static void ov99_021D1EC8 (UnkStruct_ov99_021D2CB0 * param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_18, param0->unk_1C, param0->unk_10F8, 2, 0, 10003); } -static void ov99_021D1F44 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1F44(UnkStruct_ov99_021D2CB0 *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_1C, 10003); SpriteGfxHandler_UnloadPlttObjById(param0->unk_1C, 10003); @@ -521,7 +520,7 @@ static void ov99_021D1F44 (UnkStruct_ov99_021D2CB0 * param0) SpriteGfxHandler_UnloadAnimObjById(param0->unk_1C, 10003); } -static void ov99_021D1F70 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1F70(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -534,7 +533,7 @@ static void ov99_021D1F70 (UnkStruct_ov99_021D2CB0 * param0) } } -static void ov99_021D1FB8 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1FB8(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -543,7 +542,7 @@ static void ov99_021D1FB8 (UnkStruct_ov99_021D2CB0 * param0) } } -static void ov99_021D1FD8 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D1FD8(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -583,7 +582,7 @@ static void ov99_021D1FD8 (UnkStruct_ov99_021D2CB0 * param0) param0->unk_1103 = 1; } -static void ov99_021D20F8 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D20F8(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -594,9 +593,9 @@ static void ov99_021D20F8 (UnkStruct_ov99_021D2CB0 * param0) param0->unk_1103 = 0; } -static void ov99_021D211C (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D211C(UnkStruct_ov99_021D2CB0 *param0) { - BGL * v0 = param0->unk_08; + BGL *v0 = param0->unk_08; ov99_021D439C(param0, param0->unk_1105, 3, 0); param0->unk_1105++; @@ -605,64 +604,64 @@ static void ov99_021D211C (UnkStruct_ov99_021D2CB0 * param0) sub_0201C3C0(param0->unk_08, 2); } -static void ov99_021D214C (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D214C(UnkStruct_ov99_021D2CB0 *param0) { sub_02019120(3, 0); } -static void ov99_021D2158 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2158(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D215C (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D215C(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2160 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2160(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2164 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2164(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2168 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2168(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D216C (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D216C(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2170 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2170(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2174 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2174(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2178 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2178(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D217C (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D217C(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2180 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2180(UnkStruct_ov99_021D2CB0 *param0) { - BGL * v0 = param0->unk_08; + BGL *v0 = param0->unk_08; PaletteSys_LoadPalette(param0->unk_0C, 127, 19, 75, 0, 0, 0); sub_020070E8(param0->unk_10F8, 10, param0->unk_08, 2, 0, 0, 0, 75); @@ -673,8 +672,8 @@ static void ov99_021D2180 (UnkStruct_ov99_021D2CB0 * param0) sub_0200710C(param0->unk_10F8, 7, param0->unk_08, 7, 0, 0, 0, 75); { - NNSG2dPaletteData * v1; - void * v2; + NNSG2dPaletteData *v1; + void *v2; v2 = sub_020071EC(param0->unk_10F8, 16, &v1, 75); MI_CpuCopy16(v1->pRawData, param0->unk_FA4.unk_08_val2.unk_08, 0x20 * 4); @@ -695,7 +694,7 @@ static void ov99_021D2180 (UnkStruct_ov99_021D2CB0 * param0) sub_0201C3C0(param0->unk_08, 7); } -static void ov99_021D22AC (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D22AC(UnkStruct_ov99_021D2CB0 *param0) { sub_02019120(2, 0); sub_02019120(7, 0); @@ -703,27 +702,27 @@ static void ov99_021D22AC (UnkStruct_ov99_021D2CB0 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 0); } -static void ov99_021D22D0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D22D0(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1A54(param0); } -static void ov99_021D22D8 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D22D8(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1B98(param0); } -static void ov99_021D22E0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D22E0(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1BC4(param0, ¶m0->unk_10E0[0], ¶m0->unk_10E0[1]); } -static void ov99_021D22F4 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D22F4(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1C9C(param0, param0->unk_10E0[0], param0->unk_10E0[1]); } -static void ov99_021D2308 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2308(UnkStruct_ov99_021D2CB0 *param0) { SpriteRenderer_LoadPalette(param0->unk_0C, 3, param0->unk_18, param0->unk_1C, param0->unk_10F8, 15, 0, 10, NNS_G2D_VRAM_TYPE_2DSUB, 10004); SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_18, param0->unk_1C, param0->unk_10F8, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 10004); @@ -731,7 +730,7 @@ static void ov99_021D2308 (UnkStruct_ov99_021D2CB0 * param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_18, param0->unk_1C, param0->unk_10F8, 2, 0, 10004); } -static void ov99_021D2384 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2384(UnkStruct_ov99_021D2CB0 *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_1C, 10004); SpriteGfxHandler_UnloadPlttObjById(param0->unk_1C, 10004); @@ -739,7 +738,7 @@ static void ov99_021D2384 (UnkStruct_ov99_021D2CB0 * param0) SpriteGfxHandler_UnloadAnimObjById(param0->unk_1C, 10004); } -static void ov99_021D23B0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D23B0(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -750,7 +749,7 @@ static void ov99_021D23B0 (UnkStruct_ov99_021D2CB0 * param0) } } -static void ov99_021D23F0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D23F0(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -759,7 +758,7 @@ static void ov99_021D23F0 (UnkStruct_ov99_021D2CB0 * param0) } } -static void ov99_021D2410 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2410(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -789,7 +788,7 @@ static void ov99_021D2410 (UnkStruct_ov99_021D2CB0 * param0) param0->unk_1103 = 1; } -static void ov99_021D24CC (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D24CC(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -800,9 +799,9 @@ static void ov99_021D24CC (UnkStruct_ov99_021D2CB0 * param0) param0->unk_1103 = 0; } -static void ov99_021D24F0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D24F0(UnkStruct_ov99_021D2CB0 *param0) { - BGL * v0 = param0->unk_08; + BGL *v0 = param0->unk_08; PaletteSys_LoadPalette(param0->unk_0C, 127, 20, 75, 0, 0, 0); sub_020070E8(param0->unk_10F8, 11, param0->unk_08, 2, 0, 0, 0, 75); @@ -813,8 +812,8 @@ static void ov99_021D24F0 (UnkStruct_ov99_021D2CB0 * param0) sub_0200710C(param0->unk_10F8, 8, param0->unk_08, 7, 0, 0, 0, 75); { - NNSG2dPaletteData * v1; - void * v2; + NNSG2dPaletteData *v1; + void *v2; v2 = sub_020071EC(param0->unk_10F8, 17, &v1, 75); MI_CpuCopy16(v1->pRawData, param0->unk_FA4.unk_08_val3.unk_08, 0x20 * 8); @@ -838,7 +837,7 @@ static void ov99_021D24F0 (UnkStruct_ov99_021D2CB0 * param0) sub_0201C3C0(param0->unk_08, 7); } -static void ov99_021D2640 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2640(UnkStruct_ov99_021D2CB0 *param0) { sub_02019120(2, 0); sub_02019120(7, 0); @@ -846,7 +845,7 @@ static void ov99_021D2640 (UnkStruct_ov99_021D2CB0 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 0); } -static void ov99_021D2664 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2664(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1A54(param0); @@ -856,7 +855,7 @@ static void ov99_021D2664 (UnkStruct_ov99_021D2CB0 * param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_18, param0->unk_1C, param0->unk_10F8, 2, 0, 10002); } -static void ov99_021D26E4 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D26E4(UnkStruct_ov99_021D2CB0 *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_1C, 10002); SpriteGfxHandler_UnloadPlttObjById(param0->unk_1C, 10002); @@ -866,7 +865,7 @@ static void ov99_021D26E4 (UnkStruct_ov99_021D2CB0 * param0) ov99_021D1B98(param0); } -static void ov99_021D2714 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2714(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1BC4(param0, ¶m0->unk_10E0[0], ¶m0->unk_10E0[1]); @@ -877,13 +876,13 @@ static void ov99_021D2714 (UnkStruct_ov99_021D2CB0 * param0) SpriteActor_UpdateObject(param0->unk_10E0[3]->unk_00); } -static void ov99_021D275C (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D275C(UnkStruct_ov99_021D2CB0 *param0) { ov99_021D1C9C(param0, param0->unk_10E0[0], param0->unk_10E0[1]); sub_0200D0F4(param0->unk_10E0[3]); } -static void ov99_021D2780 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2780(UnkStruct_ov99_021D2CB0 *param0) { SpriteRenderer_LoadPalette(param0->unk_0C, 3, param0->unk_18, param0->unk_1C, param0->unk_10F8, 15, 0, 10, NNS_G2D_VRAM_TYPE_2DSUB, 10005); SpriteRenderer_LoadCharResObjFromOpenNarc(param0->unk_18, param0->unk_1C, param0->unk_10F8, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 10005); @@ -891,7 +890,7 @@ static void ov99_021D2780 (UnkStruct_ov99_021D2CB0 * param0) SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_18, param0->unk_1C, param0->unk_10F8, 2, 0, 10005); } -static void ov99_021D27FC (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D27FC(UnkStruct_ov99_021D2CB0 *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_1C, 10005); SpriteGfxHandler_UnloadPlttObjById(param0->unk_1C, 10005); @@ -899,7 +898,7 @@ static void ov99_021D27FC (UnkStruct_ov99_021D2CB0 * param0) SpriteGfxHandler_UnloadAnimObjById(param0->unk_1C, 10005); } -static void ov99_021D2828 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2828(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -916,7 +915,7 @@ static void ov99_021D2828 (UnkStruct_ov99_021D2CB0 * param0) SpriteActor_UpdateObject(param0->unk_10E0[4]->unk_00); } -static void ov99_021D288C (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D288C(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -927,7 +926,7 @@ static void ov99_021D288C (UnkStruct_ov99_021D2CB0 * param0) sub_0200D0F4(param0->unk_10E0[4]); } -static void ov99_021D28AC (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D28AC(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -978,7 +977,7 @@ static void ov99_021D28AC (UnkStruct_ov99_021D2CB0 * param0) param0->unk_1103 = 1; } -static void ov99_021D2A14 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2A14(UnkStruct_ov99_021D2CB0 *param0) { int v0; @@ -989,9 +988,9 @@ static void ov99_021D2A14 (UnkStruct_ov99_021D2CB0 * param0) param0->unk_1103 = 0; } -static void ov99_021D2A38 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2A38(UnkStruct_ov99_021D2CB0 *param0) { - BGL * v0 = param0->unk_08; + BGL *v0 = param0->unk_08; ov99_021D12F0(param0); @@ -1003,65 +1002,65 @@ static void ov99_021D2A38 (UnkStruct_ov99_021D2CB0 * param0) sub_0201C3C0(param0->unk_08, 2); } -static void ov99_021D2A70 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2A70(UnkStruct_ov99_021D2CB0 *param0) { sub_02019120(2, 0); sub_02019120(3, 0); } -static void ov99_021D2A84 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2A84(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2A88 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2A88(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2A8C (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2A8C(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2A90 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2A90(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2A94 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2A94(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2A98 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2A98(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2A9C (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2A9C(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2AA0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2AA0(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2AA4 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2AA4(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2AA8 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2AA8(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2AAC (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2AAC(UnkStruct_ov99_021D2CB0 *param0) { - BGL * v0 = param0->unk_08; + BGL *v0 = param0->unk_08; gCoreSys.unk_65 = 0; @@ -1069,7 +1068,7 @@ static void ov99_021D2AAC (UnkStruct_ov99_021D2CB0 * param0) sub_020038B0(param0->unk_0C, 0, 2, 0x0, 0, 1); { - Strbuf* v1; + Strbuf *v1; int v2; param0->unk_24 = sub_0201A778(75, 1); @@ -1099,7 +1098,7 @@ static void ov99_021D2AAC (UnkStruct_ov99_021D2CB0 * param0) sub_0201C3C0(param0->unk_08, 7); } -static void ov99_021D2BBC (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2BBC(UnkStruct_ov99_021D2CB0 *param0) { sub_02019120(7, 0); @@ -1110,52 +1109,52 @@ static void ov99_021D2BBC (UnkStruct_ov99_021D2CB0 * param0) } } -static void ov99_021D2BE0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2BE0(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2BE4 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2BE4(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2BE8 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2BE8(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2BEC (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2BEC(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2BF0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2BF0(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2BF4 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2BF4(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2BF8 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2BF8(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2BFC (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2BFC(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2C00 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2C00(UnkStruct_ov99_021D2CB0 *param0) { return; } -static void ov99_021D2C04 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D2C04(UnkStruct_ov99_021D2CB0 *param0) { return; } diff --git a/src/overlay099/ov99_021D2C08.c b/src/overlay099/ov99_021D2C08.c index 09bfa1f60b..f9e40e09f1 100644 --- a/src/overlay099/ov99_021D2C08.c +++ b/src/overlay099/ov99_021D2C08.c @@ -1,7 +1,11 @@ +#include "overlay099/ov99_021D2C08.h" + #include #include #include "struct_defs/struct_0200D0F4.h" + +#include "overlay099/ov99_021D4134.h" #include "overlay099/struct_ov99_021D2C08.h" #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D2D18.h" @@ -11,8 +15,6 @@ #include "unk_0200C6E4.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "overlay099/ov99_021D2C08.h" -#include "overlay099/ov99_021D4134.h" typedef struct { s32 unk_00; @@ -27,10 +29,10 @@ typedef struct { u16 unk_22; } UnkStruct_ov99_021D4B70; -static void ov99_021D2CB0(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2C08 * param1); -static void ov99_021D2CEC(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2C08 * param1); -static void ov99_021D2DF4(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2C08 * param1); -static void ov99_021D2D18(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2C08 * param1, CellActorData * param2, int param3); +static void ov99_021D2CB0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1); +static void ov99_021D2CEC(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1); +static void ov99_021D2DF4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1); +static void ov99_021D2D18(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1, CellActorData *param2, int param3); static const UnkStruct_ov99_021D4B70 Unk_ov99_021D4B70[] = { { @@ -42,7 +44,7 @@ static const UnkStruct_ov99_021D4B70 Unk_ov99_021D4B70[] = { 0xe00, 0x8000, 0.0030, - 60 + 60, }, { 1350, @@ -64,13 +66,13 @@ static const UnkStruct_ov99_021D4B70 Unk_ov99_021D4B70[] = { 0xc00, 0x8000, -0.0045, - 60 + 60, }, }; -BOOL ov99_021D2C08 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1) +BOOL ov99_021D2C08(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1) { - UnkStruct_ov99_021D2C08 * v0 = ¶m1->unk_08_val1; + UnkStruct_ov99_021D2C08 *v0 = ¶m1->unk_08_val1; switch (param1->unk_00) { case 0: @@ -99,7 +101,7 @@ BOOL ov99_021D2C08 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * return 0; } -static void ov99_021D2CB0 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2C08 * param1) +static void ov99_021D2CB0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1) { int v0, v1 = 0; @@ -112,7 +114,7 @@ static void ov99_021D2CB0 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D } } -static void ov99_021D2CEC (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2C08 * param1) +static void ov99_021D2CEC(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1) { int v0, v1 = 0; @@ -121,10 +123,10 @@ static void ov99_021D2CEC (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D } } -static void ov99_021D2D18 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2C08 * param1, CellActorData * param2, int param3) +static void ov99_021D2D18(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1, CellActorData *param2, int param3) { - UnkStruct_ov99_021D2D18 * v0 = ¶m1->unk_08[param3]; - const UnkStruct_ov99_021D4B70 * v1 = &Unk_ov99_021D4B70[param3]; + UnkStruct_ov99_021D2D18 *v0 = ¶m1->unk_08[param3]; + const UnkStruct_ov99_021D4B70 *v1 = &Unk_ov99_021D4B70[param3]; fx32 v2; if (v0->unk_0C < v1->unk_00) { @@ -159,7 +161,7 @@ static void ov99_021D2D18 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D } } -static void ov99_021D2DF4 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2C08 * param1) +static void ov99_021D2DF4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1) { param1->unk_00 += -0x40; diff --git a/src/overlay099/ov99_021D2E28.c b/src/overlay099/ov99_021D2E28.c index dc14865827..2c3a737931 100644 --- a/src/overlay099/ov99_021D2E28.c +++ b/src/overlay099/ov99_021D2E28.c @@ -1,7 +1,11 @@ +#include "overlay099/ov99_021D2E28.h" + #include #include #include "struct_defs/struct_0200D0F4.h" + +#include "overlay099/ov99_021D4134.h" #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D2E28.h" #include "overlay099/struct_ov99_021D2FD4.h" @@ -12,8 +16,6 @@ #include "unk_0200C6E4.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "overlay099/ov99_021D2E28.h" -#include "overlay099/ov99_021D4134.h" typedef struct { s32 unk_00; @@ -40,11 +42,11 @@ typedef struct { u16 unk_52; } UnkStruct_ov99_021D4BDC; -static void ov99_021D2ED8(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2E28 * param1); -static void ov99_021D2FA8(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2E28 * param1); -static void ov99_021D32D8(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2E28 * param1); -static void ov99_021D330C(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2E28 * param1); -static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2E28 * param1, CellActorData * param2, int param3); +static void ov99_021D2ED8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1); +static void ov99_021D2FA8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1); +static void ov99_021D32D8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1); +static void ov99_021D330C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1); +static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1, CellActorData *param2, int param3); static const UnkStruct_ov99_021D4BDC Unk_ov99_021D4BDC[] = { { @@ -68,7 +70,7 @@ static const UnkStruct_ov99_021D4BDC Unk_ov99_021D4BDC[] = { (96 + 16) * FX32_ONE, 0x80, 80, - 30 + 30, }, { 100, @@ -95,9 +97,9 @@ static const UnkStruct_ov99_021D4BDC Unk_ov99_021D4BDC[] = { }, }; -BOOL ov99_021D2E28 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1) +BOOL ov99_021D2E28(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1) { - UnkStruct_ov99_021D2E28 * v0 = ¶m1->unk_08_val2; + UnkStruct_ov99_021D2E28 *v0 = ¶m1->unk_08_val2; switch (param1->unk_00) { case 0: @@ -127,7 +129,7 @@ BOOL ov99_021D2E28 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * return 0; } -static void ov99_021D2ED8 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2E28 * param1) +static void ov99_021D2ED8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1) { int v0, v1 = 0; @@ -147,7 +149,7 @@ static void ov99_021D2ED8 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D } } -static void ov99_021D2FA8 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2E28 * param1) +static void ov99_021D2FA8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1) { int v0, v1 = 0; @@ -156,10 +158,10 @@ static void ov99_021D2FA8 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D } } -static void ov99_021D2FD4 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2E28 * param1, CellActorData * param2, int param3) +static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1, CellActorData *param2, int param3) { - UnkStruct_ov99_021D2FD4 * v0 = ¶m1->unk_94[param3]; - const UnkStruct_ov99_021D4BDC * v1 = &Unk_ov99_021D4BDC[param3]; + UnkStruct_ov99_021D2FD4 *v0 = ¶m1->unk_94[param3]; + const UnkStruct_ov99_021D4BDC *v1 = &Unk_ov99_021D4BDC[param3]; fx32 v2 = 0, v3 = 0; if (v0->unk_34 > 0) { @@ -259,7 +261,7 @@ static void ov99_021D2FD4 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D sub_0200D650(param2, v0->unk_00 + v0->unk_28, v0->unk_04 + v0->unk_2C, ((192 + 80) << FX32_SHIFT)); } -static void ov99_021D32D8 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2E28 * param1) +static void ov99_021D32D8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1) { param1->unk_04 += 0x60; @@ -267,11 +269,11 @@ static void ov99_021D32D8 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D sub_02019184(param0->unk_08, 7, 3, param1->unk_04 / FX32_ONE); } -static void ov99_021D330C (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D2E28 * param1) +static void ov99_021D330C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1) { int v0, v1; int v2, v3, v4; - u16 * v5; + u16 *v5; v2 = param1->unk_88; param1->unk_8C += 0x200; diff --git a/src/overlay099/ov99_021D340C.c b/src/overlay099/ov99_021D340C.c index 004b57c3b0..e1c22e49f1 100644 --- a/src/overlay099/ov99_021D340C.c +++ b/src/overlay099/ov99_021D340C.c @@ -1,9 +1,12 @@ +#include "overlay099/ov99_021D340C.h" + #include #include -#include "overlay099/const_ov99_021D4CAC.h" - #include "struct_defs/struct_0200D0F4.h" + +#include "overlay099/const_ov99_021D4CAC.h" +#include "overlay099/ov99_021D4134.h" #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D340C.h" #include "overlay099/struct_ov99_021D35E8.h" @@ -13,8 +16,6 @@ #include "unk_0200A9DC.h" #include "unk_0200C6E4.h" #include "unk_0201D15C.h" -#include "overlay099/ov99_021D340C.h" -#include "overlay099/ov99_021D4134.h" typedef struct { s16 unk_00; @@ -32,23 +33,23 @@ typedef struct { s16 unk_02; } UnkStruct_ov99_021D4C84; -static void ov99_021D3588(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1); -static void ov99_021D35C8(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1); -static void ov99_021D35E8(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1, CellActorData * param2, int param3); -static void ov99_021D3930(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1); -static void ov99_021D36B0(UnkStruct_ov99_021D2CB0 * param0); -static void ov99_021D36D4(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1); -static void ov99_021D372C(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1, int param2); -static void ov99_021D37E0(UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1); +static void ov99_021D3588(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1); +static void ov99_021D35C8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1); +static void ov99_021D35E8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1, CellActorData *param2, int param3); +static void ov99_021D3930(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1); +static void ov99_021D36B0(UnkStruct_ov99_021D2CB0 *param0); +static void ov99_021D36D4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1); +static void ov99_021D372C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1, int param2); +static void ov99_021D37E0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1); static const UnkStruct_ov99_021D4C90 Unk_ov99_021D4C90[] = { - {0x130, -10, -0xe00, 0x600, 0x8000, 0xC000, 0x96, 0x14} + { 0x130, -10, -0xe00, 0x600, 0x8000, 0xC000, 0x96, 0x14 } }; static const UnkStruct_ov99_021D4C84 Unk_ov99_021D4C84[] = { - {0xC8, 0x0}, - {0x90, 0x0}, - {0xB4, 0x0} + { 0xC8, 0x0 }, + { 0x90, 0x0 }, + { 0xB4, 0x0 } }; __attribute__((aligned(4))) const u16 Unk_ov99_021D4CAC[] = { @@ -82,14 +83,13 @@ __attribute__((aligned(4))) const u16 Unk_ov99_021D4CAC[] = { 0x1 }; -BOOL ov99_021D340C (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1) +BOOL ov99_021D340C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1) { - UnkStruct_ov99_021D340C * v0 = ¶m1->unk_08_val3; + UnkStruct_ov99_021D340C *v0 = ¶m1->unk_08_val3; s32 v1; switch (param1->unk_00) { - case 0: - { + case 0: { int v2; for (v2 = 0; v2 < 16; v2++) { @@ -152,7 +152,7 @@ BOOL ov99_021D340C (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * return 0; } -static void ov99_021D3588 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1) +static void ov99_021D3588(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1) { int v0, v1 = 0; @@ -166,7 +166,7 @@ static void ov99_021D3588 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D } } -static void ov99_021D35C8 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1) +static void ov99_021D35C8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1) { int v0, v1 = 0; @@ -179,10 +179,10 @@ static void ov99_021D35C8 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D } } -static void ov99_021D35E8 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1, CellActorData * param2, int param3) +static void ov99_021D35E8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1, CellActorData *param2, int param3) { - UnkStruct_ov99_021D35E8 * v0 = ¶m1->unk_124[param3]; - const UnkStruct_ov99_021D4C90 * v1 = &Unk_ov99_021D4C90[param3]; + UnkStruct_ov99_021D35E8 *v0 = ¶m1->unk_124[param3]; + const UnkStruct_ov99_021D4C90 *v1 = &Unk_ov99_021D4C90[param3]; fx32 v2; if (v0->unk_00 < -64 * FX32_ONE) { @@ -216,13 +216,13 @@ static void ov99_021D35E8 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D } } -static void ov99_021D36B0 (UnkStruct_ov99_021D2CB0 * param0) +static void ov99_021D36B0(UnkStruct_ov99_021D2CB0 *param0) { SpriteActor_SetOAMMode(param0->unk_10E0[3], GX_OAM_MODE_XLU); SpriteActor_SetOAMMode(param0->unk_10E0[4], GX_OAM_MODE_XLU); } -static void ov99_021D36D4 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1) +static void ov99_021D36D4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1) { if (param0->unk_10FC == 7200) { ov99_021D372C(param0, param1, 0); @@ -239,7 +239,7 @@ static void ov99_021D36D4 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D ov99_021D37E0(param0, param1); } -static void ov99_021D372C (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1, int param2) +static void ov99_021D372C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1, int param2) { GF_ASSERT(param1->unk_11C == 0); GF_ASSERT(NELEMS(Unk_ov99_021D4C84) > param2); @@ -257,7 +257,7 @@ static void ov99_021D372C (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D G2_SetBlendAlpha(0, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ, param1->unk_11F, param1->unk_11E); } -static void ov99_021D37E0 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1) +static void ov99_021D37E0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1) { s16 v0, v1; @@ -313,11 +313,11 @@ static void ov99_021D37E0 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D } } -static void ov99_021D3930 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D340C * param1) +static void ov99_021D3930(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1) { int v0, v1; int v2, v3, v4; - u16 * v5, * v6; + u16 *v5, *v6; switch (param1->unk_114) { case 0: diff --git a/src/overlay099/ov99_021D3A40.c b/src/overlay099/ov99_021D3A40.c index b287574fe6..ec324ca581 100644 --- a/src/overlay099/ov99_021D3A40.c +++ b/src/overlay099/ov99_021D3A40.c @@ -1,17 +1,18 @@ +#include "overlay099/ov99_021D3A40.h" + #include #include +#include "overlay099/ov99_021D4134.h" #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D3A40.h" #include "overlay099/struct_ov99_021D3B2C.h" #include "unk_0200A9DC.h" -#include "overlay099/ov99_021D3A40.h" -#include "overlay099/ov99_021D4134.h" -BOOL ov99_021D3A40 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1) +BOOL ov99_021D3A40(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1) { - UnkStruct_ov99_021D3B2C * v0 = ¶m1->unk_08_val4; + UnkStruct_ov99_021D3B2C *v0 = ¶m1->unk_08_val4; switch (param1->unk_00) { case 0: @@ -56,9 +57,9 @@ BOOL ov99_021D3A40 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * return 0; } -BOOL ov99_021D3B2C (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1) +BOOL ov99_021D3B2C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1) { - UnkStruct_ov99_021D3B2C * v0 = ¶m1->unk_08_val4; + UnkStruct_ov99_021D3B2C *v0 = ¶m1->unk_08_val4; switch (param1->unk_00) { case 0: diff --git a/src/overlay099/ov99_021D3C18.c b/src/overlay099/ov99_021D3C18.c index 174096a1c7..6af1a63521 100644 --- a/src/overlay099/ov99_021D3C18.c +++ b/src/overlay099/ov99_021D3C18.c @@ -1,21 +1,22 @@ +#include "overlay099/ov99_021D3C18.h" + #include #include +#include "overlay099/ov99_021D4134.h" #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D3A40.h" #include "overlay099/struct_ov99_021D3C18.h" #include "unk_0200A9DC.h" #include "unk_02018340.h" -#include "overlay099/ov99_021D3C18.h" -#include "overlay099/ov99_021D4134.h" -static void ov99_021D3CF8(UnkStruct_ov99_021D3C18 * param0, u32 param1); -static BOOL ov99_021D3D50(UnkStruct_ov99_021D3C18 * param0); +static void ov99_021D3CF8(UnkStruct_ov99_021D3C18 *param0, u32 param1); +static BOOL ov99_021D3D50(UnkStruct_ov99_021D3C18 *param0); -BOOL ov99_021D3C18 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1) +BOOL ov99_021D3C18(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1) { - UnkStruct_ov99_021D3C18 * v0 = ¶m1->unk_08_val5; + UnkStruct_ov99_021D3C18 *v0 = ¶m1->unk_08_val5; switch (param1->unk_00) { case 0: @@ -65,7 +66,7 @@ BOOL ov99_021D3C18 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * return 0; } -static void ov99_021D3CF8 (UnkStruct_ov99_021D3C18 * param0, u32 param1) +static void ov99_021D3CF8(UnkStruct_ov99_021D3C18 *param0, u32 param1) { param0->unk_08 = param1; param0->unk_05 = 16; @@ -80,7 +81,7 @@ static void ov99_021D3CF8 (UnkStruct_ov99_021D3C18 * param0, u32 param1) } } -static BOOL ov99_021D3D50 (UnkStruct_ov99_021D3C18 * param0) +static BOOL ov99_021D3D50(UnkStruct_ov99_021D3C18 *param0) { param0->unk_05 -= 1; diff --git a/src/overlay099/ov99_021D3DE0.c b/src/overlay099/ov99_021D3DE0.c index 1c8abe3aba..6a04702153 100644 --- a/src/overlay099/ov99_021D3DE0.c +++ b/src/overlay099/ov99_021D3DE0.c @@ -1,18 +1,18 @@ +#include "overlay099/ov99_021D3DE0.h" + #include #include -#include "core_sys.h" - #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D3A40.h" #include "overlay099/struct_ov99_021D3DE0.h" +#include "core_sys.h" #include "unk_0200F174.h" -#include "overlay099/ov99_021D3DE0.h" -BOOL ov99_021D3DE0 (UnkStruct_ov99_021D2CB0 * param0, UnkStruct_ov99_021D3A40 * param1) +BOOL ov99_021D3DE0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D3A40 *param1) { - UnkStruct_ov99_021D3DE0 * v0 = ¶m1->unk_08_val6; + UnkStruct_ov99_021D3DE0 *v0 = ¶m1->unk_08_val6; switch (param1->unk_00) { case 0: diff --git a/src/overlay099/ov99_021D3E78.c b/src/overlay099/ov99_021D3E78.c index 9482e1b157..97b096d51f 100644 --- a/src/overlay099/ov99_021D3E78.c +++ b/src/overlay099/ov99_021D3E78.c @@ -1,265 +1,264 @@ +#include "overlay099/ov99_021D3E78.h" + #include #include -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "overlay099/struct_ov99_021D3E78_decl.h" - #include "struct_defs/struct_0205AA50.h" -#include "unk_02002B7C.h" +#include "overlay099/struct_ov99_021D3E78_decl.h" + +#include "heap.h" #include "message.h" +#include "strbuf.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02002B7C.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "overlay099/ov99_021D3E78.h" static const struct { - u16 unk_00; - u16 unk_02; - u16 unk_04; + u16 unk_00; + u16 unk_02; + u16 unk_04; } Unk_ov99_021D4CE4[] = { - { 0x0, 0x0, 0x1 }, - { 0x1, 0x10, 0x1 }, - { 0x2, 0x92, 0x0 }, - { 0x3, 0xA7, 0x0 }, - { 0x4, 0x129, 0x0 }, - { 0x5, 0x13E, 0x0 }, - { 0x6, 0x1C0, 0x0 }, - { 0x7, 0x1D5, 0x0 }, - { 0x8, 0x20D, 0x0 }, - { 0x9, 0x222, 0x0 }, - { 0xA, 0x25A, 0x0 }, - { 0xB, 0x26F, 0x0 }, - { 0xC, 0x2A7, 0x0 }, - { 0xD, 0x2BC, 0x0 }, - { 0xE, 0x2D1, 0x0 }, - { 0xF, 0x2E6, 0x0 }, - { 0x10, 0x2FB, 0x0 }, - { 0x11, 0x310, 0x0 }, - { 0x12, 0x325, 0x0 }, - { 0x13, 0x33A, 0x0 }, - { 0x14, 0x34F, 0x0 }, - { 0x15, 0x364, 0x0 }, - { 0x16, 0x379, 0x0 }, - { 0x17, 0x38E, 0x0 }, - { 0x18, 0x3A3, 0x0 }, - { 0x19, 0x3B8, 0x0 }, - { 0x1A, 0x3CD, 0x0 }, - { 0x1B, 0x3E2, 0x0 }, - { 0x1C, 0x464, 0x0 }, - { 0x1D, 0x474, 0x0 }, - { 0x1E, 0x484, 0x0 }, - { 0x1F, 0x499, 0x0 }, - { 0x20, 0x4AE, 0x0 }, - { 0x21, 0x4C3, 0x0 }, - { 0x22, 0x4D8, 0x0 }, - { 0x23, 0x4ED, 0x0 }, - { 0x24, 0x502, 0x0 }, - { 0x25, 0x517, 0x0 }, - { 0x26, 0x52C, 0x0 }, - { 0x27, 0x541, 0x0 }, - { 0x28, 0x556, 0x0 }, - { 0x29, 0x56B, 0x0 }, - { 0x2A, 0x580, 0x0 }, - { 0x2B, 0x595, 0x0 }, - { 0x2C, 0x5CD, 0x0 }, - { 0x2D, 0x5E2, 0x0 }, - { 0x2E, 0x61A, 0x0 }, - { 0x2F, 0x62F, 0x0 }, - { 0x30, 0x6B1, 0x0 }, - { 0x31, 0x6C6, 0x0 }, - { 0x32, 0x6DB, 0x0 }, - { 0x33, 0x6F0, 0x0 }, - { 0x34, 0x705, 0x0 }, - { 0x35, 0x73D, 0x0 }, - { 0x36, 0x752, 0x0 }, - { 0x37, 0x78A, 0x0 }, - { 0x38, 0x79F, 0x0 }, - { 0x39, 0x821, 0x0 }, - { 0x3A, 0x836, 0x0 }, - { 0x3B, 0x84B, 0x0 }, - { 0x3C, 0x860, 0x0 }, - { 0x3D, 0x875, 0x0 }, - { 0x3E, 0x88A, 0x0 }, - { 0x3F, 0x89F, 0x0 }, - { 0x40, 0x8B4, 0x0 }, - { 0x41, 0x8C9, 0x0 }, - { 0x42, 0x8DE, 0x0 }, - { 0x43, 0x8F3, 0x0 }, - { 0x44, 0x908, 0x0 }, - { 0x45, 0x940, 0x0 }, - { 0x46, 0x955, 0x0 }, - { 0x47, 0x96A, 0x0 }, - { 0x48, 0x97F, 0x0 }, - { 0x49, 0x994, 0x0 }, - { 0x4A, 0x9A9, 0x0 }, - { 0x4B, 0x9E1, 0x0 }, - { 0x4C, 0x9F6, 0x0 }, - { 0x4D, 0xA0B, 0x0 }, - { 0x4E, 0xA20, 0x0 }, - { 0x4F, 0xA35, 0x0 }, - { 0x50, 0xA6D, 0x0 }, - { 0x51, 0xA82, 0x0 }, - { 0x52, 0xA97, 0x0 }, - { 0x53, 0xAAC, 0x0 }, - { 0x54, 0xAC1, 0x0 }, - { 0x55, 0xAD6, 0x0 }, - { 0x56, 0xAEB, 0x0 }, - { 0x57, 0xB00, 0x0 }, - { 0x58, 0xB38, 0x0 }, - { 0x59, 0xB4D, 0x0 }, - { 0x5A, 0xB62, 0x0 }, - { 0x5B, 0xB9A, 0x0 }, - { 0x5C, 0xBAF, 0x0 }, - { 0x5D, 0xBC4, 0x0 }, - { 0x5E, 0xBD9, 0x0 }, - { 0x5F, 0xBEE, 0x0 }, - { 0x60, 0xC70, 0x0 }, - { 0x61, 0xC85, 0x0 }, - { 0x62, 0xC9A, 0x0 }, - { 0x63, 0xCAF, 0x0 }, - { 0x64, 0xCC4, 0x0 }, - { 0x65, 0xCFC, 0x0 }, - { 0x66, 0xD11, 0x0 }, - { 0x67, 0xD26, 0x0 }, - { 0x68, 0xD3B, 0x0 }, - { 0x69, 0xD50, 0x0 }, - { 0x6A, 0xD65, 0x0 }, - { 0x6B, 0xD7A, 0x0 }, - { 0x6C, 0xD8F, 0x0 }, - { 0x6D, 0xDC7, 0x0 }, - { 0x6E, 0xDDC, 0x0 }, - { 0x6F, 0xE5E, 0x0 }, - { 0x70, 0xE7E, 0x0 }, - { 0x71, 0xE93, 0x0 }, - { 0x72, 0xEA8, 0x0 }, - { 0x73, 0xEC8, 0x0 }, - { 0x74, 0xEDD, 0x0 }, - { 0x75, 0xEF2, 0x0 }, - { 0x76, 0xF07, 0x0 }, - { 0x77, 0xF89, 0x0 }, - { 0x78, 0xF9E, 0x0 }, - { 0x79, 0xFB3, 0x0 }, - { 0x7A, 0xFC8, 0x0 }, - { 0x7B, 0xFDD, 0x0 }, - { 0x7C, 0xFF2, 0x0 }, - { 0x7D, 0x102A, 0x0 }, - { 0x7E, 0x103F, 0x0 }, - { 0x7F, 0x10C1, 0x0 }, - { 0x80, 0x10D6, 0x0 }, - { 0x81, 0x10EB, 0x0 }, - { 0x82, 0x1100, 0x0 }, - { 0x83, 0x1138, 0x0 }, - { 0x84, 0x114D, 0x0 }, - { 0x85, 0x1185, 0x0 }, - { 0x86, 0x119A, 0x0 }, - { 0x87, 0x11AF, 0x0 }, - { 0x88, 0x11C4, 0x0 }, - { 0x89, 0x11FC, 0x0 }, - { 0x8A, 0x1211, 0x0 }, - { 0x8B, 0x1226, 0x0 }, - { 0x8C, 0x123B, 0x0 }, - { 0x8D, 0x12BD, 0x0 }, - { 0x8E, 0x12D2, 0x0 }, - { 0x8F, 0x12E7, 0x0 }, - { 0x90, 0x12FC, 0x0 }, - { 0x91, 0x1334, 0x0 }, - { 0x92, 0x1349, 0x0 }, - { 0x93, 0x135E, 0x0 }, - { 0x94, 0x1373, 0x0 }, - { 0x95, 0x1388, 0x0 }, - { 0x96, 0x139D, 0x0 }, - { 0x97, 0x13B2, 0x0 }, - { 0x98, 0x13C7, 0x0 }, - { 0x99, 0x13DC, 0x0 }, - { 0x9A, 0x13F1, 0x0 }, - { 0x9B, 0x1406, 0x0 }, - { 0x9C, 0x141B, 0x0 }, - { 0x9D, 0x1430, 0x0 }, - { 0x9E, 0x1445, 0x0 }, - { 0x9F, 0x145A, 0x0 }, - { 0xA0, 0x1492, 0x0 }, - { 0xA1, 0x14A7, 0x0 }, - { 0xA2, 0x14BC, 0x0 }, - { 0xA3, 0x14D1, 0x0 }, - { 0xA4, 0x14E6, 0x0 }, - { 0xA5, 0x14FB, 0x0 }, - { 0xA6, 0x1510, 0x0 }, - { 0xA7, 0x1525, 0x0 }, - { 0xA8, 0x153A, 0x0 }, - { 0xA9, 0x15BC, 0x0 }, - { 0xAA, 0x15D1, 0x0 }, - { 0xAB, 0x15E6, 0x0 }, - { 0xAC, 0x15FB, 0x0 }, - { 0xAD, 0x1610, 0x0 }, - { 0xAE, 0x1625, 0x0 }, - { 0xAF, 0x163A, 0x0 }, - { 0xB0, 0x164F, 0x0 }, - { 0xB1, 0x1664, 0x0 }, - { 0xB2, 0x1679, 0x0 }, - { 0xB3, 0x168E, 0x0 }, - { 0xB4, 0x16A3, 0x0 }, - { 0xB5, 0x16B8, 0x0 }, - { 0xB6, 0x16CD, 0x0 }, - { 0xB7, 0x16E2, 0x0 }, - { 0xB8, 0x16F7, 0x0 }, - { 0xB9, 0x170C, 0x0 }, - { 0xBA, 0x1721, 0x0 }, - { 0xBB, 0x1736, 0x0 }, - { 0xBC, 0x174B, 0x0 }, - { 0xBD, 0x1760, 0x0 }, - { 0xBE, 0x1775, 0x0 }, - { 0xBF, 0x178A, 0x0 }, - { 0xC0, 0x179F, 0x0 }, - { 0xC1, 0x17B4, 0x0 }, - { 0xC2, 0x17C9, 0x0 }, - { 0xC3, 0x17DE, 0x0 }, - { 0xC4, 0x17F3, 0x0 }, - { 0xC5, 0x1808, 0x0 }, - { 0xC6, 0x181D, 0x0 }, - { 0xC7, 0x1832, 0x0 }, - { 0xC8, 0x1847, 0x0 }, - { 0xC9, 0x185C, 0x0 }, - { 0xCA, 0x1871, 0x0 }, - { 0xCB, 0x1886, 0x0 }, - { 0xCC, 0x189B, 0x0 }, - { 0xCD, 0x18B0, 0x0 }, - { 0xCE, 0x18C5, 0x0 }, - { 0xCF, 0x18DA, 0x0 }, - { 0xD0, 0x18EF, 0x0 }, - { 0xD1, 0x1904, 0x0 }, - { 0xD2, 0x1919, 0x0 }, - { 0xD3, 0x192E, 0x0 }, - { 0xD4, 0x19B0, 0x0 }, - { 0xD5, 0x19C5, 0x0 }, - { 0xD6, 0x19DA, 0x0 }, - { 0xD7, 0x19EF, 0x0 }, - { 0xD8, 0x1A04, 0x0 }, - { 0xD9, 0x1A86, 0x0 }, - { 0xDA, 0x1A9B, 0x0 }, - { 0xDB, 0x1AB0, 0x0 }, - { 0xDC, 0x1AC5, 0x0 }, - { 0xDD, 0x1B47, 0x0 }, - { 0xDE, 0x1B5C, 0x0 }, - { 0xDF, 0x1B71, 0x0 }, - { 0xE0, 0x1B86, 0x0 }, - { 0xE1, 0x1C08, 0x0 }, - { 0xE2, 0x1C1D, 0x0 }, - { 0xE3, 0x1C32, 0x0 }, - { 0xE4, 0x1C47, 0x0 }, - { 0xE5, 0x1C5C, 0x0 }, - { 0xE6, 0x1CDE, 0x0 }, - { 0xE7, 0x1CF3, 0x0 }, - { 0xE8, 0x1D2B, 0x0 }, - { 0xE9, 0x1D40, 0x0 }, - { 0xEA, 0x1D78, 0x0 }, - { 0xEB, 0x1D8D, 0x0 }, - { 0xEC, 0x1D9D, 0x0 } + { 0x0, 0x0, 0x1 }, + { 0x1, 0x10, 0x1 }, + { 0x2, 0x92, 0x0 }, + { 0x3, 0xA7, 0x0 }, + { 0x4, 0x129, 0x0 }, + { 0x5, 0x13E, 0x0 }, + { 0x6, 0x1C0, 0x0 }, + { 0x7, 0x1D5, 0x0 }, + { 0x8, 0x20D, 0x0 }, + { 0x9, 0x222, 0x0 }, + { 0xA, 0x25A, 0x0 }, + { 0xB, 0x26F, 0x0 }, + { 0xC, 0x2A7, 0x0 }, + { 0xD, 0x2BC, 0x0 }, + { 0xE, 0x2D1, 0x0 }, + { 0xF, 0x2E6, 0x0 }, + { 0x10, 0x2FB, 0x0 }, + { 0x11, 0x310, 0x0 }, + { 0x12, 0x325, 0x0 }, + { 0x13, 0x33A, 0x0 }, + { 0x14, 0x34F, 0x0 }, + { 0x15, 0x364, 0x0 }, + { 0x16, 0x379, 0x0 }, + { 0x17, 0x38E, 0x0 }, + { 0x18, 0x3A3, 0x0 }, + { 0x19, 0x3B8, 0x0 }, + { 0x1A, 0x3CD, 0x0 }, + { 0x1B, 0x3E2, 0x0 }, + { 0x1C, 0x464, 0x0 }, + { 0x1D, 0x474, 0x0 }, + { 0x1E, 0x484, 0x0 }, + { 0x1F, 0x499, 0x0 }, + { 0x20, 0x4AE, 0x0 }, + { 0x21, 0x4C3, 0x0 }, + { 0x22, 0x4D8, 0x0 }, + { 0x23, 0x4ED, 0x0 }, + { 0x24, 0x502, 0x0 }, + { 0x25, 0x517, 0x0 }, + { 0x26, 0x52C, 0x0 }, + { 0x27, 0x541, 0x0 }, + { 0x28, 0x556, 0x0 }, + { 0x29, 0x56B, 0x0 }, + { 0x2A, 0x580, 0x0 }, + { 0x2B, 0x595, 0x0 }, + { 0x2C, 0x5CD, 0x0 }, + { 0x2D, 0x5E2, 0x0 }, + { 0x2E, 0x61A, 0x0 }, + { 0x2F, 0x62F, 0x0 }, + { 0x30, 0x6B1, 0x0 }, + { 0x31, 0x6C6, 0x0 }, + { 0x32, 0x6DB, 0x0 }, + { 0x33, 0x6F0, 0x0 }, + { 0x34, 0x705, 0x0 }, + { 0x35, 0x73D, 0x0 }, + { 0x36, 0x752, 0x0 }, + { 0x37, 0x78A, 0x0 }, + { 0x38, 0x79F, 0x0 }, + { 0x39, 0x821, 0x0 }, + { 0x3A, 0x836, 0x0 }, + { 0x3B, 0x84B, 0x0 }, + { 0x3C, 0x860, 0x0 }, + { 0x3D, 0x875, 0x0 }, + { 0x3E, 0x88A, 0x0 }, + { 0x3F, 0x89F, 0x0 }, + { 0x40, 0x8B4, 0x0 }, + { 0x41, 0x8C9, 0x0 }, + { 0x42, 0x8DE, 0x0 }, + { 0x43, 0x8F3, 0x0 }, + { 0x44, 0x908, 0x0 }, + { 0x45, 0x940, 0x0 }, + { 0x46, 0x955, 0x0 }, + { 0x47, 0x96A, 0x0 }, + { 0x48, 0x97F, 0x0 }, + { 0x49, 0x994, 0x0 }, + { 0x4A, 0x9A9, 0x0 }, + { 0x4B, 0x9E1, 0x0 }, + { 0x4C, 0x9F6, 0x0 }, + { 0x4D, 0xA0B, 0x0 }, + { 0x4E, 0xA20, 0x0 }, + { 0x4F, 0xA35, 0x0 }, + { 0x50, 0xA6D, 0x0 }, + { 0x51, 0xA82, 0x0 }, + { 0x52, 0xA97, 0x0 }, + { 0x53, 0xAAC, 0x0 }, + { 0x54, 0xAC1, 0x0 }, + { 0x55, 0xAD6, 0x0 }, + { 0x56, 0xAEB, 0x0 }, + { 0x57, 0xB00, 0x0 }, + { 0x58, 0xB38, 0x0 }, + { 0x59, 0xB4D, 0x0 }, + { 0x5A, 0xB62, 0x0 }, + { 0x5B, 0xB9A, 0x0 }, + { 0x5C, 0xBAF, 0x0 }, + { 0x5D, 0xBC4, 0x0 }, + { 0x5E, 0xBD9, 0x0 }, + { 0x5F, 0xBEE, 0x0 }, + { 0x60, 0xC70, 0x0 }, + { 0x61, 0xC85, 0x0 }, + { 0x62, 0xC9A, 0x0 }, + { 0x63, 0xCAF, 0x0 }, + { 0x64, 0xCC4, 0x0 }, + { 0x65, 0xCFC, 0x0 }, + { 0x66, 0xD11, 0x0 }, + { 0x67, 0xD26, 0x0 }, + { 0x68, 0xD3B, 0x0 }, + { 0x69, 0xD50, 0x0 }, + { 0x6A, 0xD65, 0x0 }, + { 0x6B, 0xD7A, 0x0 }, + { 0x6C, 0xD8F, 0x0 }, + { 0x6D, 0xDC7, 0x0 }, + { 0x6E, 0xDDC, 0x0 }, + { 0x6F, 0xE5E, 0x0 }, + { 0x70, 0xE7E, 0x0 }, + { 0x71, 0xE93, 0x0 }, + { 0x72, 0xEA8, 0x0 }, + { 0x73, 0xEC8, 0x0 }, + { 0x74, 0xEDD, 0x0 }, + { 0x75, 0xEF2, 0x0 }, + { 0x76, 0xF07, 0x0 }, + { 0x77, 0xF89, 0x0 }, + { 0x78, 0xF9E, 0x0 }, + { 0x79, 0xFB3, 0x0 }, + { 0x7A, 0xFC8, 0x0 }, + { 0x7B, 0xFDD, 0x0 }, + { 0x7C, 0xFF2, 0x0 }, + { 0x7D, 0x102A, 0x0 }, + { 0x7E, 0x103F, 0x0 }, + { 0x7F, 0x10C1, 0x0 }, + { 0x80, 0x10D6, 0x0 }, + { 0x81, 0x10EB, 0x0 }, + { 0x82, 0x1100, 0x0 }, + { 0x83, 0x1138, 0x0 }, + { 0x84, 0x114D, 0x0 }, + { 0x85, 0x1185, 0x0 }, + { 0x86, 0x119A, 0x0 }, + { 0x87, 0x11AF, 0x0 }, + { 0x88, 0x11C4, 0x0 }, + { 0x89, 0x11FC, 0x0 }, + { 0x8A, 0x1211, 0x0 }, + { 0x8B, 0x1226, 0x0 }, + { 0x8C, 0x123B, 0x0 }, + { 0x8D, 0x12BD, 0x0 }, + { 0x8E, 0x12D2, 0x0 }, + { 0x8F, 0x12E7, 0x0 }, + { 0x90, 0x12FC, 0x0 }, + { 0x91, 0x1334, 0x0 }, + { 0x92, 0x1349, 0x0 }, + { 0x93, 0x135E, 0x0 }, + { 0x94, 0x1373, 0x0 }, + { 0x95, 0x1388, 0x0 }, + { 0x96, 0x139D, 0x0 }, + { 0x97, 0x13B2, 0x0 }, + { 0x98, 0x13C7, 0x0 }, + { 0x99, 0x13DC, 0x0 }, + { 0x9A, 0x13F1, 0x0 }, + { 0x9B, 0x1406, 0x0 }, + { 0x9C, 0x141B, 0x0 }, + { 0x9D, 0x1430, 0x0 }, + { 0x9E, 0x1445, 0x0 }, + { 0x9F, 0x145A, 0x0 }, + { 0xA0, 0x1492, 0x0 }, + { 0xA1, 0x14A7, 0x0 }, + { 0xA2, 0x14BC, 0x0 }, + { 0xA3, 0x14D1, 0x0 }, + { 0xA4, 0x14E6, 0x0 }, + { 0xA5, 0x14FB, 0x0 }, + { 0xA6, 0x1510, 0x0 }, + { 0xA7, 0x1525, 0x0 }, + { 0xA8, 0x153A, 0x0 }, + { 0xA9, 0x15BC, 0x0 }, + { 0xAA, 0x15D1, 0x0 }, + { 0xAB, 0x15E6, 0x0 }, + { 0xAC, 0x15FB, 0x0 }, + { 0xAD, 0x1610, 0x0 }, + { 0xAE, 0x1625, 0x0 }, + { 0xAF, 0x163A, 0x0 }, + { 0xB0, 0x164F, 0x0 }, + { 0xB1, 0x1664, 0x0 }, + { 0xB2, 0x1679, 0x0 }, + { 0xB3, 0x168E, 0x0 }, + { 0xB4, 0x16A3, 0x0 }, + { 0xB5, 0x16B8, 0x0 }, + { 0xB6, 0x16CD, 0x0 }, + { 0xB7, 0x16E2, 0x0 }, + { 0xB8, 0x16F7, 0x0 }, + { 0xB9, 0x170C, 0x0 }, + { 0xBA, 0x1721, 0x0 }, + { 0xBB, 0x1736, 0x0 }, + { 0xBC, 0x174B, 0x0 }, + { 0xBD, 0x1760, 0x0 }, + { 0xBE, 0x1775, 0x0 }, + { 0xBF, 0x178A, 0x0 }, + { 0xC0, 0x179F, 0x0 }, + { 0xC1, 0x17B4, 0x0 }, + { 0xC2, 0x17C9, 0x0 }, + { 0xC3, 0x17DE, 0x0 }, + { 0xC4, 0x17F3, 0x0 }, + { 0xC5, 0x1808, 0x0 }, + { 0xC6, 0x181D, 0x0 }, + { 0xC7, 0x1832, 0x0 }, + { 0xC8, 0x1847, 0x0 }, + { 0xC9, 0x185C, 0x0 }, + { 0xCA, 0x1871, 0x0 }, + { 0xCB, 0x1886, 0x0 }, + { 0xCC, 0x189B, 0x0 }, + { 0xCD, 0x18B0, 0x0 }, + { 0xCE, 0x18C5, 0x0 }, + { 0xCF, 0x18DA, 0x0 }, + { 0xD0, 0x18EF, 0x0 }, + { 0xD1, 0x1904, 0x0 }, + { 0xD2, 0x1919, 0x0 }, + { 0xD3, 0x192E, 0x0 }, + { 0xD4, 0x19B0, 0x0 }, + { 0xD5, 0x19C5, 0x0 }, + { 0xD6, 0x19DA, 0x0 }, + { 0xD7, 0x19EF, 0x0 }, + { 0xD8, 0x1A04, 0x0 }, + { 0xD9, 0x1A86, 0x0 }, + { 0xDA, 0x1A9B, 0x0 }, + { 0xDB, 0x1AB0, 0x0 }, + { 0xDC, 0x1AC5, 0x0 }, + { 0xDD, 0x1B47, 0x0 }, + { 0xDE, 0x1B5C, 0x0 }, + { 0xDF, 0x1B71, 0x0 }, + { 0xE0, 0x1B86, 0x0 }, + { 0xE1, 0x1C08, 0x0 }, + { 0xE2, 0x1C1D, 0x0 }, + { 0xE3, 0x1C32, 0x0 }, + { 0xE4, 0x1C47, 0x0 }, + { 0xE5, 0x1C5C, 0x0 }, + { 0xE6, 0x1CDE, 0x0 }, + { 0xE7, 0x1CF3, 0x0 }, + { 0xE8, 0x1D2B, 0x0 }, + { 0xE9, 0x1D40, 0x0 }, + { 0xEA, 0x1D78, 0x0 }, + { 0xEB, 0x1D8D, 0x0 }, + { 0xEC, 0x1D9D, 0x0 } }; struct UnkStruct_ov99_021D3E78_t { @@ -271,19 +270,19 @@ struct UnkStruct_ov99_021D3E78_t { BOOL unk_14; BOOL unk_18; int unk_1C; - BGL * unk_20; - Window * unk_24; - Window * unk_28; - MessageLoader * unk_2C; - Strbuf* unk_30; - SysTask * unk_34; + BGL *unk_20; + Window *unk_24; + Window *unk_28; + MessageLoader *unk_2C; + Strbuf *unk_30; + SysTask *unk_34; }; -static void ov99_021D4104(SysTask * param0, void * param1); +static void ov99_021D4104(SysTask *param0, void *param1); -UnkStruct_ov99_021D3E78 * ov99_021D3E78 (BGL * param0, int param1, int param2, int param3, MessageLoader * param4) +UnkStruct_ov99_021D3E78 *ov99_021D3E78(BGL *param0, int param1, int param2, int param3, MessageLoader *param4) { - UnkStruct_ov99_021D3E78 * v0 = Heap_AllocFromHeap(75, sizeof(UnkStruct_ov99_021D3E78)); + UnkStruct_ov99_021D3E78 *v0 = Heap_AllocFromHeap(75, sizeof(UnkStruct_ov99_021D3E78)); if (v0) { v0->unk_20 = param0; @@ -312,7 +311,7 @@ UnkStruct_ov99_021D3E78 * ov99_021D3E78 (BGL * param0, int param1, int param2, i return v0; } -void ov99_021D3F38 (UnkStruct_ov99_021D3E78 * param0) +void ov99_021D3F38(UnkStruct_ov99_021D3E78 *param0) { if (param0->unk_34) { SysTask_Done(param0->unk_34); @@ -326,7 +325,7 @@ void ov99_021D3F38 (UnkStruct_ov99_021D3E78 * param0) Heap_FreeToHeap(param0); } -BOOL ov99_021D3F6C (UnkStruct_ov99_021D3E78 * param0, int param1) +BOOL ov99_021D3F6C(UnkStruct_ov99_021D3E78 *param0, int param1) { if (param0->unk_1C == 2) { return 1; @@ -394,9 +393,9 @@ BOOL ov99_021D3F6C (UnkStruct_ov99_021D3E78 * param0, int param1) } } -static void ov99_021D4104 (SysTask * param0, void * param1) +static void ov99_021D4104(SysTask *param0, void *param1) { - UnkStruct_ov99_021D3E78 * v0 = param1; + UnkStruct_ov99_021D3E78 *v0 = param1; if (v0->unk_18) { sub_0201ACCC(v0->unk_24); @@ -409,7 +408,7 @@ static void ov99_021D4104 (SysTask * param0, void * param1) } } -int ov99_021D4130 (void) +int ov99_021D4130(void) { return Unk_ov99_021D4CE4[NELEMS(Unk_ov99_021D4CE4) - 1].unk_00; } diff --git a/src/overlay099/ov99_021D4134.c b/src/overlay099/ov99_021D4134.c index f7c27a442a..aed69b1e2e 100644 --- a/src/overlay099/ov99_021D4134.c +++ b/src/overlay099/ov99_021D4134.c @@ -1,21 +1,22 @@ +#include "overlay099/ov99_021D4134.h" + #include #include #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_0200D0F4.h" + #include "overlay099/struct_ov99_021D2CB0.h" #include "overlay099/struct_ov99_021D5434.h" +#include "heap.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_020218BC.h" -#include "overlay099/ov99_021D4134.h" typedef struct { u16 unk_00; @@ -28,60 +29,60 @@ typedef struct { static const UnkStruct_ov99_021D5434 Unk_ov99_021D5434[][2] = { { - {0xE, 0x3AC, 0x65800, 0x1C800, -217088, 0x2B800, 0x7000, 0x47000}, - {0xE, 0x618, 0x9B000, 0x1C800, -217088, 0x2B800, 0x7000, 0x47000} + { 0xE, 0x3AC, 0x65800, 0x1C800, -217088, 0x2B800, 0x7000, 0x47000 }, + { 0xE, 0x618, 0x9B000, 0x1C800, -217088, 0x2B800, 0x7000, 0x47000 }, }, { - {0xE, 0x1B8, 0x65800, 0x1C800, -217088, 0x2B800, 0x7000, 0x47000}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0} + { 0xE, 0x1B8, 0x65800, 0x1C800, -217088, 0x2B800, 0x7000, 0x47000 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, }, { - {0x10, 0x3AC, 0x65800, 0x1C800, -217088, 0x2B800, 0x7000, 0x47000}, - {0xE, 0x618, 0x9B000, 0x1C800, -217088, 0x2B800, 0x7000, 0x47000} - } + { 0x10, 0x3AC, 0x65800, 0x1C800, -217088, 0x2B800, 0x7000, 0x47000 }, + { 0xE, 0x618, 0x9B000, 0x1C800, -217088, 0x2B800, 0x7000, 0x47000 }, + }, }; static const UnkStruct_ov99_021D5394 Unk_ov99_021D5394[] = { - {0x26, 0x25, 0x30, 0x0, 0x0}, - {0x27, 0x25, 0x31, -32, -48}, - {0x28, 0x25, 0x32, -16, -30}, - {0x29, 0x25, 0x33, -42, -2}, - {0x2A, 0x25, 0x34, -8, -20}, - {0x2B, 0x25, 0x35, -50, -16}, - {0x2C, 0x25, 0x36, -40, -34}, - {0x2D, 0x25, 0x37, -16, -1}, - {0x2E, 0x25, 0x38, -44, -15}, - {0x2F, 0x25, 0x39, -30, -30} + { 0x26, 0x25, 0x30, 0x0, 0x0 }, + { 0x27, 0x25, 0x31, -32, -48 }, + { 0x28, 0x25, 0x32, -16, -30 }, + { 0x29, 0x25, 0x33, -42, -2 }, + { 0x2A, 0x25, 0x34, -8, -20 }, + { 0x2B, 0x25, 0x35, -50, -16 }, + { 0x2C, 0x25, 0x36, -40, -34 }, + { 0x2D, 0x25, 0x37, -16, -1 }, + { 0x2E, 0x25, 0x38, -44, -15 }, + { 0x2F, 0x25, 0x39, -30, -30 } }; static const UnkStruct_ov99_021D5394 Unk_ov99_021D52F4[] = { - {0x3A, 0x25, 0x44, 0x0, 0x0}, - {0x3B, 0x25, 0x45, -32, -48}, - {0x3C, 0x25, 0x46, -16, -30}, - {0x3D, 0x25, 0x47, -42, -2}, - {0x3E, 0x25, 0x48, -8, -20}, - {0x3F, 0x25, 0x49, -50, -16}, - {0x40, 0x25, 0x4A, -40, -34}, - {0x41, 0x25, 0x4B, -16, -1}, - {0x42, 0x25, 0x4C, -44, -15}, - {0x43, 0x25, 0x4D, -30, -30} + { 0x3A, 0x25, 0x44, 0x0, 0x0 }, + { 0x3B, 0x25, 0x45, -32, -48 }, + { 0x3C, 0x25, 0x46, -16, -30 }, + { 0x3D, 0x25, 0x47, -42, -2 }, + { 0x3E, 0x25, 0x48, -8, -20 }, + { 0x3F, 0x25, 0x49, -50, -16 }, + { 0x40, 0x25, 0x4A, -40, -34 }, + { 0x41, 0x25, 0x4B, -16, -1 }, + { 0x42, 0x25, 0x4C, -44, -15 }, + { 0x43, 0x25, 0x4D, -30, -30 } }; static const UnkStruct_ov99_021D5394 Unk_ov99_021D5274[] = { - {0x57, 0x56, 0x5B, 0x0, 0x0}, - {0x58, 0x56, 0x5C, 0x0, 0x0}, - {0x59, 0x56, 0x5D, 0x0, 0x0}, - {0x5A, 0x56, 0x5E, 0x0, 0x0} + { 0x57, 0x56, 0x5B, 0x0, 0x0 }, + { 0x58, 0x56, 0x5C, 0x0, 0x0 }, + { 0x59, 0x56, 0x5D, 0x0, 0x0 }, + { 0x5A, 0x56, 0x5E, 0x0, 0x0 } }; static const UnkStruct_ov99_021D5394 Unk_ov99_021D52B4[] = { - {0x5F, 0x56, 0x63, 0x0, 0x0}, - {0x60, 0x56, 0x64, 0x0, 0x0}, - {0x61, 0x56, 0x65, 0x0, 0x0}, - {0x62, 0x56, 0x66, 0x0, 0x0} + { 0x5F, 0x56, 0x63, 0x0, 0x0 }, + { 0x60, 0x56, 0x64, 0x0, 0x0 }, + { 0x61, 0x56, 0x65, 0x0, 0x0 }, + { 0x62, 0x56, 0x66, 0x0, 0x0 } }; -void ov99_021D4134 (UnkStruct_ov99_021D2CB0 * param0, int param1) +void ov99_021D4134(UnkStruct_ov99_021D2CB0 *param0, int param1) { int v0; @@ -90,10 +91,10 @@ void ov99_021D4134 (UnkStruct_ov99_021D2CB0 * param0, int param1) } } -void ov99_021D4170 (UnkStruct_ov99_021D2CB0 * param0) +void ov99_021D4170(UnkStruct_ov99_021D2CB0 *param0) { int v0, v1; - UnkStruct_ov99_021D5434 * v2; + UnkStruct_ov99_021D5434 *v2; for (v1 = 0; v1 < param0->unk_1104; v1++) { v2 = ¶m0->unk_F6C.unk_00[v1]; @@ -105,7 +106,7 @@ void ov99_021D4170 (UnkStruct_ov99_021D2CB0 * param0) sub_02017348(¶m0->unk_6C[v1][v0], 1); } - for ( ; v0 < 16; v0++) { + for (; v0 < 16; v0++) { sub_02017350(¶m0->unk_6C[v1][v0], 0, (-64 * FX32_ONE), (-50 * FX32_ONE)); sub_0201736C(¶m0->unk_6C[v1][v0], FX32_ONE, FX32_ONE, FX32_ONE); sub_02017348(¶m0->unk_6C[v1][v0], 0); @@ -113,12 +114,12 @@ void ov99_021D4170 (UnkStruct_ov99_021D2CB0 * param0) } } -BOOL ov99_021D425C (UnkStruct_ov99_021D2CB0 * param0, s32 param1) +BOOL ov99_021D425C(UnkStruct_ov99_021D2CB0 *param0, s32 param1) { fx32 v0, v1, v2; fx32 v3, v4, v5; int v6, v7; - UnkStruct_ov99_021D5434 * v8; + UnkStruct_ov99_021D5434 *v8; BOOL v9 = 0; for (v6 = 0; v6 < param0->unk_1104; v6++) { @@ -151,12 +152,12 @@ BOOL ov99_021D425C (UnkStruct_ov99_021D2CB0 * param0, s32 param1) return v9; } -void ov99_021D439C (UnkStruct_ov99_021D2CB0 * param0, int param1, int param2, int param3) +void ov99_021D439C(UnkStruct_ov99_021D2CB0 *param0, int param1, int param2, int param3) { - BGL * v0 = param0->unk_08; - NNSG2dPaletteData * v1; - void * v2; - const UnkStruct_ov99_021D5394 * v3; + BGL *v0 = param0->unk_08; + NNSG2dPaletteData *v1; + void *v2; + const UnkStruct_ov99_021D5394 *v3; GF_ASSERT(NELEMS(Unk_ov99_021D5394) == NELEMS(Unk_ov99_021D52F4)); GF_ASSERT(NELEMS(Unk_ov99_021D5274) == NELEMS(Unk_ov99_021D52B4)); @@ -204,11 +205,11 @@ void ov99_021D439C (UnkStruct_ov99_021D2CB0 * param0, int param1, int param2, in sub_02019184(v0, param2, 3, v3->unk_08); } -void ov99_021D44CC (UnkStruct_ov99_021D2CB0 * param0, CellActorData * param1) +void ov99_021D44CC(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1) { - void * v0; + void *v0; u32 v1; - NNSG2dImageProxy * v2; + NNSG2dImageProxy *v2; if (param0->unk_10F4 == NULL) { return; diff --git a/src/overlay100/ov100_021D0D80.c b/src/overlay100/ov100_021D0D80.c index 8cedd4521b..4f91bb277f 100644 --- a/src/overlay100/ov100_021D0D80.c +++ b/src/overlay100/ov100_021D0D80.c @@ -1,57 +1,57 @@ +#include "overlay100/ov100_021D0D80.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay100/ov100_021D13E4.h" +#include "overlay100/ov100_021D1C44.h" +#include "overlay100/ov100_021D2F0C.h" +#include "overlay100/ov100_021D46C8.h" #include "overlay100/struct_ov100_021D46C8.h" #include "overlay100/struct_ov100_021D4DD8.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "camera.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" #include "unk_02002F38.h" #include "unk_020041CC.h" -#include "overlay_manager.h" -#include "narc.h" -#include "message.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_02024220.h" -#include "game_options.h" -#include "overlay100/ov100_021D0D80.h" -#include "overlay100/ov100_021D13E4.h" -#include "overlay100/ov100_021D1C44.h" -#include "overlay100/ov100_021D2F0C.h" -#include "overlay100/ov100_021D46C8.h" FS_EXTERN_OVERLAY(overlay100); -typedef void *(* UnkFuncPtr_ov100_021D5130)(UnkStruct_ov100_021D4DD8 *); -typedef BOOL (* UnkFuncPtr_ov100_021D5130_1)(void *); -typedef BOOL (* UnkFuncPtr_ov100_021D5130_2)(void *); +typedef void *(*UnkFuncPtr_ov100_021D5130)(UnkStruct_ov100_021D4DD8 *); +typedef BOOL (*UnkFuncPtr_ov100_021D5130_1)(void *); +typedef BOOL (*UnkFuncPtr_ov100_021D5130_2)(void *); -static void ov100_021D0FA0(UnkStruct_ov100_021D46C8 * param0); -static void ov100_021D1034(UnkStruct_ov100_021D46C8 * param0); -static void ov100_021D111C(UnkStruct_ov100_021D46C8 * param0); -static void ov100_021D1208(BGL * param0); -static void ov100_021D13B4(void * param0); +static void ov100_021D0FA0(UnkStruct_ov100_021D46C8 *param0); +static void ov100_021D1034(UnkStruct_ov100_021D46C8 *param0); +static void ov100_021D111C(UnkStruct_ov100_021D46C8 *param0); +static void ov100_021D1208(BGL *param0); +static void ov100_021D13B4(void *param0); -int ov100_021D0D80 (OverlayManager * param0, int * param1) +int ov100_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov100_021D4DD8 * v0; + UnkStruct_ov100_021D4DD8 *v0; Heap_Create(3, 111, 0xC0000); @@ -71,7 +71,7 @@ int ov100_021D0D80 (OverlayManager * param0, int * param1) sub_02005454(1); { - Window * v1 = &v0->unk_0C.unk_30; + Window *v1 = &v0->unk_0C.unk_30; int v2 = Options_Frame(v0->unk_D0->unk_04); Window_Init(v1); @@ -95,33 +95,28 @@ static const struct { UnkFuncPtr_ov100_021D5130_1 unk_04; UnkFuncPtr_ov100_021D5130_2 unk_08; } Unk_ov100_021D5130[] = { - {ov100_021D3620, ov100_021D39E4, ov100_021D3FD4}, - {ov100_021D13E4, ov100_021D14A8, ov100_021D16C4}, - {ov100_021D2340, ov100_021D2428, ov100_021D2C8C}, + { ov100_021D3620, ov100_021D39E4, ov100_021D3FD4 }, + { ov100_021D13E4, ov100_021D14A8, ov100_021D16C4 }, + { ov100_021D2340, ov100_021D2428, ov100_021D2C8C }, }; -int ov100_021D0EA8 (OverlayManager * param0, int * param1) +int ov100_021D0EA8(OverlayManager *param0, int *param1) { - UnkStruct_ov100_021D4DD8 * v0 = OverlayManager_Data(param0); + UnkStruct_ov100_021D4DD8 *v0 = OverlayManager_Data(param0); switch (*param1) { - case 0: - { + case 0: { v0->unk_08 = Unk_ov100_021D5130[v0->unk_04].unk_00(v0); *param1 = 1; - } - break; - case 1: - { + } break; + case 1: { BOOL v1 = Unk_ov100_021D5130[v0->unk_04].unk_04(v0->unk_08); if (v1 == 0) { *param1 = 2; } - } - break; - case 2: - { + } break; + case 2: { BOOL v2 = Unk_ov100_021D5130[v0->unk_04].unk_08(v0->unk_08); if (v2 == 0) { @@ -131,13 +126,10 @@ int ov100_021D0EA8 (OverlayManager * param0, int * param1) *param1 = 3; } } - } - break; - case 3: - { + } break; + case 3: { return 1; - } - break; + } break; default: GF_ASSERT(0); break; @@ -148,9 +140,9 @@ int ov100_021D0EA8 (OverlayManager * param0, int * param1) return 0; } -int ov100_021D0F44 (OverlayManager * param0, int * param1) +int ov100_021D0F44(OverlayManager *param0, int *param1) { - UnkStruct_ov100_021D4DD8 * v0; + UnkStruct_ov100_021D4DD8 *v0; v0 = OverlayManager_Data(param0); @@ -171,7 +163,7 @@ int ov100_021D0F44 (OverlayManager * param0, int * param1) return 1; } -static void ov100_021D0FA0 (UnkStruct_ov100_021D46C8 * param0) +static void ov100_021D0FA0(UnkStruct_ov100_021D46C8 *param0) { param0->unk_04 = sub_0200C6E4(111); @@ -201,7 +193,12 @@ static void ov100_021D0FA0 (UnkStruct_ov100_021D46C8 * param0) { BOOL v3; const UnkStruct_ov104_02241308 v4 = { - 48 + 48, 16 + 16, 64, 64, 16, 16, + 48 + 48, + 16 + 16, + 64, + 64, + 16, + 16, }; param0->unk_08 = sub_0200C704(param0->unk_04); @@ -214,7 +211,7 @@ static void ov100_021D0FA0 (UnkStruct_ov100_021D46C8 * param0) } } -static void ov100_021D1034 (UnkStruct_ov100_021D46C8 * param0) +static void ov100_021D1034(UnkStruct_ov100_021D46C8 *param0) { SetMainCallback(NULL, NULL); DisableHBlank(); @@ -243,7 +240,7 @@ static void ov100_021D1034 (UnkStruct_ov100_021D46C8 * param0) Heap_FndInitAllocatorForExpHeap(¶m0->unk_1C, 111, 32); } -static void ov100_021D111C (UnkStruct_ov100_021D46C8 * param0) +static void ov100_021D111C(UnkStruct_ov100_021D46C8 *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); @@ -279,7 +276,7 @@ static void ov100_021D111C (UnkStruct_ov100_021D46C8 * param0) G3X_AlphaBlend(0); } -static void ov100_021D1208 (BGL * param0) +static void ov100_021D1208(BGL *param0) { GXLayers_DisableEngineALayers(); @@ -331,7 +328,7 @@ static void ov100_021D1208 (BGL * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -346,7 +343,7 @@ static void ov100_021D1208 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -361,7 +358,7 @@ static void ov100_021D1208 (BGL * param0) 3, 0, 0, - 0 + 0, }, { 0, @@ -376,7 +373,7 @@ static void ov100_021D1208 (BGL * param0) 0, 0, 0, - 0 + 0, }, }; @@ -396,8 +393,7 @@ static void ov100_021D1208 (BGL * param0) { UnkStruct_ov97_0222DB78 v3[] = { - { - 0, + { 0, 0, 0x800, 0, @@ -409,10 +405,8 @@ static void ov100_021D1208 (BGL * param0) 0, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -424,8 +418,7 @@ static void ov100_021D1208 (BGL * param0) 2, 0, 0, - 0 - }, + 0 }, }; sub_020183C4(param0, 4, &v3[0], 0); @@ -449,9 +442,9 @@ static void ov100_021D1208 (BGL * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov100_021D13B4 (void * param0) +static void ov100_021D13B4(void *param0) { - UnkStruct_ov100_021D4DD8 * v0 = param0; + UnkStruct_ov100_021D4DD8 *v0 = param0; sub_0201DCAC(); sub_0200C800(); diff --git a/src/overlay100/ov100_021D13E4.c b/src/overlay100/ov100_021D13E4.c index 12bc45885b..e7eb2a01eb 100644 --- a/src/overlay100/ov100_021D13E4.c +++ b/src/overlay100/ov100_021D13E4.c @@ -1,3 +1,5 @@ +#include "overlay100/ov100_021D13E4.h" + #include #include @@ -6,40 +8,39 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" +#include "struct_defs/sprite_template.h" +#include "overlay100/ov100_021D400C.h" +#include "overlay100/ov100_021D46C8.h" +#include "overlay100/ov100_021D4E04.h" #include "overlay100/struct_ov100_021D1808.h" #include "overlay100/struct_ov100_021D4DD8.h" #include "overlay100/struct_ov100_021D4EBC.h" -#include "struct_defs/sprite_template.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "gx_layers.h" +#include "heap.h" +#include "sys_task.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_0201D15C.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_0202419C.h" -#include "overlay100/ov100_021D13E4.h" -#include "overlay100/ov100_021D400C.h" -#include "overlay100/ov100_021D46C8.h" -#include "overlay100/ov100_021D4E04.h" -static void ov100_021D1808(UnkStruct_ov100_021D1808 * param0); -static void ov100_021D1A24(UnkStruct_ov100_021D1808 * param0); -static void ov100_021D1A54(UnkStruct_ov100_021D1808 * param0); -static void ov100_021D17B4(UnkStruct_ov100_021D1808 * param0); -static void ov100_021D1758(Camera * camera, VecFx32 * param1); +static void ov100_021D1808(UnkStruct_ov100_021D1808 *param0); +static void ov100_021D1A24(UnkStruct_ov100_021D1808 *param0); +static void ov100_021D1A54(UnkStruct_ov100_021D1808 *param0); +static void ov100_021D17B4(UnkStruct_ov100_021D1808 *param0); +static void ov100_021D1758(Camera *camera, VecFx32 *param1); -void * ov100_021D13E4 (UnkStruct_ov100_021D4DD8 * param0) +void *ov100_021D13E4(UnkStruct_ov100_021D4DD8 *param0) { - UnkStruct_ov100_021D1808 * v0 = Heap_AllocFromHeap(111, sizeof(UnkStruct_ov100_021D1808)); + UnkStruct_ov100_021D1808 *v0 = Heap_AllocFromHeap(111, sizeof(UnkStruct_ov100_021D1808)); memset(v0, 0, sizeof(UnkStruct_ov100_021D1808)); @@ -81,20 +82,28 @@ void * ov100_021D13E4 (UnkStruct_ov100_021D4DD8 * param0) return v0; } -BOOL ov100_021D14A8 (void * param0) +BOOL ov100_021D14A8(void *param0) { - UnkStruct_ov100_021D1808 * v0 = param0; + UnkStruct_ov100_021D1808 *v0 = param0; static const u16 v1[] = { - 210, 120, 120, + 210, + 120, + 120, }; static const u16 v2[] = { - 145, 119, 100, + 145, + 119, + 100, }; static const u16 v3[] = { - 100, 19, 18, + 100, + 19, + 18, }; static const u32 v4[] = { - 480, 481, 482, + 480, + 481, + 482, }; switch (v0->unk_00) { @@ -175,9 +184,9 @@ BOOL ov100_021D14A8 (void * param0) return 1; } -BOOL ov100_021D16C4 (void * param0) +BOOL ov100_021D16C4(void *param0) { - UnkStruct_ov100_021D1808 * v0 = param0; + UnkStruct_ov100_021D1808 *v0 = param0; switch (v0->unk_00) { case 0: @@ -202,9 +211,9 @@ BOOL ov100_021D16C4 (void * param0) return 1; } -static void ov100_021D1758 (Camera * camera, VecFx32 * param1) +static void ov100_021D1758(Camera *camera, VecFx32 *param1) { - CameraAngle v0 = {1274, 0, 0}; + CameraAngle v0 = { 1274, 0, 0 }; Camera_InitWithTarget(param1, FX32_CONST(200), &v0, 0xa66, 0, 1, camera); Camera_ComputeProjectionMatrix(0, camera); @@ -212,7 +221,7 @@ static void ov100_021D1758 (Camera * camera, VecFx32 * param1) Camera_SetClipping(FX32_CONST(0.1), FX32_CONST(2048), camera); } -static void ov100_021D17B4 (UnkStruct_ov100_021D1808 * param0) +static void ov100_021D17B4(UnkStruct_ov100_021D1808 *param0) { sub_020241B4(); Camera_ComputeViewMatrix(); @@ -228,13 +237,13 @@ static void ov100_021D17B4 (UnkStruct_ov100_021D1808 * param0) G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_W); } -static void ov100_021D1808 (UnkStruct_ov100_021D1808 * param0) +static void ov100_021D1808(UnkStruct_ov100_021D1808 *param0) { - NARC * v0 = param0->unk_7C4->unk_00; - BGL * v1 = param0->unk_7C4->unk_0C; - SpriteRenderer * v2 = param0->unk_7C4->unk_04; - SpriteGfxHandler * v3 = param0->unk_7C4->unk_08; - PaletteData * v4 = param0->unk_7C4->unk_10; + NARC *v0 = param0->unk_7C4->unk_00; + BGL *v1 = param0->unk_7C4->unk_0C; + SpriteRenderer *v2 = param0->unk_7C4->unk_04; + SpriteGfxHandler *v3 = param0->unk_7C4->unk_08; + PaletteData *v4 = param0->unk_7C4->unk_10; int v5 = 50000; sub_020070E8(v0, 70, v1, 5, 0, 0, 0, 111); @@ -243,7 +252,7 @@ static void ov100_021D1808 (UnkStruct_ov100_021D1808 * param0) PaletteSys_LoadPalette(v4, 172, 71, 111, 1, 0x20 * 2, 0); { - const u16 v6[] = {0x421}; + const u16 v6[] = { 0x421 }; sub_02002FBC(v4, &v6, 0, 0, 0x2); } @@ -271,7 +280,7 @@ static void ov100_021D1808 (UnkStruct_ov100_021D1808 * param0) sub_02017348(¶m0->unk_1A4.unk_00[2].unk_00, 0); } -static void ov100_021D1A24 (UnkStruct_ov100_021D1808 * param0) +static void ov100_021D1A24(UnkStruct_ov100_021D1808 *param0) { int v0; @@ -283,14 +292,14 @@ static void ov100_021D1A24 (UnkStruct_ov100_021D1808 * param0) } } -static void ov100_021D1A54 (UnkStruct_ov100_021D1808 * param0) +static void ov100_021D1A54(UnkStruct_ov100_021D1808 *param0) { int v0; - NARC * v1 = param0->unk_7C4->unk_00; - BGL * v2 = param0->unk_7C4->unk_0C; - SpriteRenderer * v3 = param0->unk_7C4->unk_04; - SpriteGfxHandler * v4 = param0->unk_7C4->unk_08; - PaletteData * v5 = param0->unk_7C4->unk_10; + NARC *v1 = param0->unk_7C4->unk_00; + BGL *v2 = param0->unk_7C4->unk_0C; + SpriteRenderer *v3 = param0->unk_7C4->unk_04; + SpriteGfxHandler *v4 = param0->unk_7C4->unk_08; + PaletteData *v5 = param0->unk_7C4->unk_10; SpriteTemplate v6; v6.x = 0; @@ -333,9 +342,9 @@ static void ov100_021D1A54 (UnkStruct_ov100_021D1808 * param0) } for (v0 = 0; v0 < 3; v0++) { - s16 v7[] = {180, -20, 280}; - s16 v8[] = {128, 190, 150}; - f32 v9[] = {0.1f, 0.3f, 0.2f}; + s16 v7[] = { 180, -20, 280 }; + s16 v8[] = { 128, 190, 150 }; + f32 v9[] = { 0.1f, 0.3f, 0.2f }; if (v0 == 1) { v6.bgPriority = 0; diff --git a/src/overlay100/ov100_021D1C44.c b/src/overlay100/ov100_021D1C44.c index 685954b699..c79cec48c1 100644 --- a/src/overlay100/ov100_021D1C44.c +++ b/src/overlay100/ov100_021D1C44.c @@ -1,3 +1,5 @@ +#include "overlay100/ov100_021D1C44.h" + #include #include @@ -6,76 +8,75 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" +#include "struct_defs/sprite_template.h" +#include "overlay100/ov100_021D400C.h" +#include "overlay100/ov100_021D44C0.h" +#include "overlay100/ov100_021D46C8.h" +#include "overlay100/ov100_021D4E04.h" #include "overlay100/struct_ov100_021D1C98.h" #include "overlay100/struct_ov100_021D4DD8.h" #include "overlay100/struct_ov100_021D54D0.h" -#include "struct_defs/sprite_template.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "heap.h" +#include "sys_task.h" +#include "trainer_info.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" -#include "camera.h" #include "unk_0202419C.h" -#include "trainer_info.h" -#include "overlay100/ov100_021D1C44.h" -#include "overlay100/ov100_021D400C.h" -#include "overlay100/ov100_021D44C0.h" -#include "overlay100/ov100_021D46C8.h" -#include "overlay100/ov100_021D4E04.h" -static void ov100_021D1C98(UnkStruct_ov100_021D1C98 * param0); -static void ov100_021D2324(UnkStruct_ov100_021D1C98 * param0); -static void ov100_021D2250(UnkStruct_ov100_021D1C98 * param0); -static void ov100_021D2E0C(UnkStruct_ov100_021D1C98 * param0); -static void ov100_021D1C44(Camera * camera, VecFx32 * param1); +static void ov100_021D1C98(UnkStruct_ov100_021D1C98 *param0); +static void ov100_021D2324(UnkStruct_ov100_021D1C98 *param0); +static void ov100_021D2250(UnkStruct_ov100_021D1C98 *param0); +static void ov100_021D2E0C(UnkStruct_ov100_021D1C98 *param0); +static void ov100_021D1C44(Camera *camera, VecFx32 *param1); static UnkStruct_ov100_021D54D0 Unk_ov100_021D54D0[] = { - {0x6, 0x4, 0x0}, - {0x0, 0x1} + { 0x6, 0x4, 0x0 }, + { 0x0, 0x1 } }; static UnkStruct_ov100_021D54D0 Unk_ov100_021D54E8[] = { - {0x6, 0x4, 0x0}, - {0x5, 0x4, 0x0}, - {0x0, 0x1} + { 0x6, 0x4, 0x0 }, + { 0x5, 0x4, 0x0 }, + { 0x0, 0x1 } }; static UnkStruct_ov100_021D54D0 Unk_ov100_021D54B8[] = { - {0x1, 0x2, -(FX32_HALF >> 1)}, - {0x0, 0x1} + { 0x1, 0x2, -(FX32_HALF >> 1) }, + { 0x0, 0x1 } }; static UnkStruct_ov100_021D54D0 Unk_ov100_021D54A0[] = { - {0x9, 0x2, -(FX32_HALF >> 1)}, - {0x0, 0x1} + { 0x9, 0x2, -(FX32_HALF >> 1) }, + { 0x0, 0x1 } }; -static void ov100_021D1C44 (Camera * camera, VecFx32 * param1) +static void ov100_021D1C44(Camera *camera, VecFx32 *param1) { - CameraAngle v0 = {-0x29fe, 0, 0}; + CameraAngle v0 = { -0x29fe, 0, 0 }; Camera_InitWithTarget(param1, 0x13c805, &v0, 0xc01, 0, 1, camera); Camera_SetAsActive(camera); Camera_SetClipping(FX32_ONE * 10, FX32_ONE * 1008, camera); } -static void ov100_021D1C98 (UnkStruct_ov100_021D1C98 * param0) +static void ov100_021D1C98(UnkStruct_ov100_021D1C98 *param0) { - NARC * v0 = param0->unk_1EBC->unk_00; - BGL * v1 = param0->unk_1EBC->unk_0C; - SpriteRenderer * v2 = param0->unk_1EBC->unk_04; - SpriteGfxHandler * v3 = param0->unk_1EBC->unk_08; - PaletteData * v4 = param0->unk_1EBC->unk_10; + NARC *v0 = param0->unk_1EBC->unk_00; + BGL *v1 = param0->unk_1EBC->unk_0C; + SpriteRenderer *v2 = param0->unk_1EBC->unk_04; + SpriteGfxHandler *v3 = param0->unk_1EBC->unk_08; + PaletteData *v4 = param0->unk_1EBC->unk_10; int v5 = 50000; sub_020070E8(v0, 18, v1, 5, 0, 0, 0, 111); @@ -192,14 +193,14 @@ static void ov100_021D1C98 (UnkStruct_ov100_021D1C98 * param0) param0->unk_1A0.unk_13EC[1].unk_158 = 2; } -static void ov100_021D2250 (UnkStruct_ov100_021D1C98 * param0) +static void ov100_021D2250(UnkStruct_ov100_021D1C98 *param0) { int v0; - NARC * v1 = param0->unk_1EBC->unk_00; - BGL * v2 = param0->unk_1EBC->unk_0C; - SpriteRenderer * v3 = param0->unk_1EBC->unk_04; - SpriteGfxHandler * v4 = param0->unk_1EBC->unk_08; - PaletteData * v5 = param0->unk_1EBC->unk_10; + NARC *v1 = param0->unk_1EBC->unk_00; + BGL *v2 = param0->unk_1EBC->unk_0C; + SpriteRenderer *v3 = param0->unk_1EBC->unk_04; + SpriteGfxHandler *v4 = param0->unk_1EBC->unk_08; + PaletteData *v5 = param0->unk_1EBC->unk_10; SpriteTemplate v6; v6.x = 0; @@ -243,7 +244,7 @@ static void ov100_021D2250 (UnkStruct_ov100_021D1C98 * param0) } } -static void ov100_021D2324 (UnkStruct_ov100_021D1C98 * param0) +static void ov100_021D2324(UnkStruct_ov100_021D1C98 *param0) { int v0; @@ -253,9 +254,9 @@ static void ov100_021D2324 (UnkStruct_ov100_021D1C98 * param0) } } -void * ov100_021D2340 (UnkStruct_ov100_021D4DD8 * param0) +void *ov100_021D2340(UnkStruct_ov100_021D4DD8 *param0) { - UnkStruct_ov100_021D1C98 * v0 = Heap_AllocFromHeap(111, sizeof(UnkStruct_ov100_021D1C98)); + UnkStruct_ov100_021D1C98 *v0 = Heap_AllocFromHeap(111, sizeof(UnkStruct_ov100_021D1C98)); memset(v0, 0, sizeof(UnkStruct_ov100_021D1C98)); @@ -276,7 +277,14 @@ void * ov100_021D2340 (UnkStruct_ov100_021D4DD8 * param0) { static const GXRgb v1[8] = { - GX_RGB(2, 2, 2), GX_RGB(10, 10, 10), GX_RGB(10, 10, 10), GX_RGB(10, 10, 10), GX_RGB(10, 10, 10), GX_RGB(10, 10, 10), GX_RGB(10, 10, 10), GX_RGB(10, 10, 10), + GX_RGB(2, 2, 2), + GX_RGB(10, 10, 10), + GX_RGB(10, 10, 10), + GX_RGB(10, 10, 10), + GX_RGB(10, 10, 10), + GX_RGB(10, 10, 10), + GX_RGB(10, 10, 10), + GX_RGB(10, 10, 10), }; G3X_EdgeMarking(1); @@ -293,9 +301,9 @@ void * ov100_021D2340 (UnkStruct_ov100_021D4DD8 * param0) return v0; } -BOOL ov100_021D2428 (void * param0) +BOOL ov100_021D2428(void *param0) { - UnkStruct_ov100_021D1C98 * v0 = ( UnkStruct_ov100_021D1C98 * )param0; + UnkStruct_ov100_021D1C98 *v0 = (UnkStruct_ov100_021D1C98 *)param0; switch (v0->unk_00) { case 0: @@ -310,8 +318,7 @@ BOOL ov100_021D2428 (void * param0) } v0->unk_00++; break; - case 2: - { + case 2: { v0->unk_1EBC->unk_58.unk_0C = 20; v0->unk_1EBC->unk_58.unk_10 = 0; v0->unk_1EBC->unk_58.unk_14 = 0; @@ -324,8 +331,7 @@ BOOL ov100_021D2428 (void * param0) ov100_021D4890(&v0->unk_1EBC->unk_58); v0->unk_00++; - } - break; + } break; case 3: if (ov100_021D4920(&v0->unk_1EBC->unk_58)) { ov100_021D46C8(v0->unk_1EBC, v0->unk_1EC0, 20); @@ -340,8 +346,7 @@ BOOL ov100_021D2428 (void * param0) ov100_021D4788(v0->unk_1EBC); v0->unk_00++; break; - case 5: - { + case 5: { v0->unk_1EBC->unk_58.unk_0C = 0; v0->unk_1EBC->unk_58.unk_10 = 0; v0->unk_1EBC->unk_58.unk_14 = 0; @@ -353,8 +358,7 @@ BOOL ov100_021D2428 (void * param0) v0->unk_1EBC->unk_58.unk_04 = &v0->unk_1EBC->unk_44; ov100_021D4890(&v0->unk_1EBC->unk_58); v0->unk_00++; - } - break; + } break; case 6: if (ov100_021D4920(&v0->unk_1EBC->unk_58) == 0) { break; @@ -680,9 +684,9 @@ BOOL ov100_021D2428 (void * param0) return 1; } -BOOL ov100_021D2C8C (void * param0) +BOOL ov100_021D2C8C(void *param0) { - UnkStruct_ov100_021D1C98 * v0 = ( UnkStruct_ov100_021D1C98 * )param0; + UnkStruct_ov100_021D1C98 *v0 = (UnkStruct_ov100_021D1C98 *)param0; switch (v0->unk_00) { case 0: @@ -730,7 +734,7 @@ BOOL ov100_021D2C8C (void * param0) return 1; } -static void ov100_021D2E0C (UnkStruct_ov100_021D1C98 * param0) +static void ov100_021D2E0C(UnkStruct_ov100_021D1C98 *param0) { sub_020241B4(); Camera_ComputeViewMatrix(); diff --git a/src/overlay100/ov100_021D2F0C.c b/src/overlay100/ov100_021D2F0C.c index 1340c5b109..654bb3aef5 100644 --- a/src/overlay100/ov100_021D2F0C.c +++ b/src/overlay100/ov100_021D2F0C.c @@ -1,3 +1,5 @@ +#include "overlay100/ov100_021D2F0C.h" + #include #include @@ -6,8 +8,9 @@ #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" +#include "overlay100/ov100_021D46C8.h" +#include "overlay100/ov100_021D4E04.h" #include "overlay100/struct_ov100_021D3084.h" #include "overlay100/struct_ov100_021D36CC.h" #include "overlay100/struct_ov100_021D37F4.h" @@ -15,32 +18,30 @@ #include "overlay100/struct_ov100_021D4EBC.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_0201D670.h" -#include "camera.h" #include "unk_0202419C.h" -#include "trainer_info.h" -#include "overlay100/ov100_021D2F0C.h" -#include "overlay100/ov100_021D46C8.h" -#include "overlay100/ov100_021D4E04.h" -static void ov100_021D3084(UnkStruct_ov100_021D3084 * param0); -static void ov100_021D3400(UnkStruct_ov100_021D3084 * param0); -static void ov100_021D34C0(UnkStruct_ov100_021D3084 * param0); -static void ov100_021D3504(Camera * camera, VecFx32 * param1); -static void ov100_021D3558(UnkStruct_ov100_021D3084 * param0); -void * ov100_021D3620(UnkStruct_ov100_021D4DD8 * param0); -BOOL ov100_021D39E4(void * param0); -BOOL ov100_021D3FD4(void * param0); +static void ov100_021D3084(UnkStruct_ov100_021D3084 *param0); +static void ov100_021D3400(UnkStruct_ov100_021D3084 *param0); +static void ov100_021D34C0(UnkStruct_ov100_021D3084 *param0); +static void ov100_021D3504(Camera *camera, VecFx32 *param1); +static void ov100_021D3558(UnkStruct_ov100_021D3084 *param0); +void *ov100_021D3620(UnkStruct_ov100_021D4DD8 *param0); +BOOL ov100_021D39E4(void *param0); +BOOL ov100_021D3FD4(void *param0); -static void ov100_021D2F0C (BGL * param0, PaletteData * param1) +static void ov100_021D2F0C(BGL *param0, PaletteData *param1) { int v0 = 12; int v1 = 10; @@ -54,13 +55,13 @@ static void ov100_021D2F0C (BGL * param0, PaletteData * param1) PaletteSys_LoadPalette(param1, v0, v3, v5, 1, 0x20 * 1, 0); } -static void ov100_021D2F64 (UnkStruct_ov100_021D3084 * param0) +static void ov100_021D2F64(UnkStruct_ov100_021D3084 *param0) { - NARC * v0 = param0->unk_1D28->unk_00; - BGL * v1 = param0->unk_1D28->unk_0C; - SpriteRenderer * v2 = param0->unk_1D28->unk_04; - SpriteGfxHandler * v3 = param0->unk_1D28->unk_08; - PaletteData * v4 = param0->unk_1D28->unk_10; + NARC *v0 = param0->unk_1D28->unk_00; + BGL *v1 = param0->unk_1D28->unk_0C; + SpriteRenderer *v2 = param0->unk_1D28->unk_04; + SpriteGfxHandler *v3 = param0->unk_1D28->unk_08; + PaletteData *v4 = param0->unk_1D28->unk_10; ov100_021D4AC8(¶m0->unk_0C.unk_934[0], 84, param0->unk_1D28->unk_00); ov100_021D4B4C(0, ¶m0->unk_0C.unk_934[0], 82, param0->unk_1D28->unk_00, ¶m0->unk_1D28->unk_1C); @@ -82,13 +83,13 @@ static void ov100_021D2F64 (UnkStruct_ov100_021D3084 * param0) sub_0201736C(¶m0->unk_0C.unk_934[1].unk_00, param0->unk_0C.unk_934[1].unk_150, FX32_CONST(1.0), param0->unk_0C.unk_934[1].unk_150); } -static void ov100_021D3084 (UnkStruct_ov100_021D3084 * param0) +static void ov100_021D3084(UnkStruct_ov100_021D3084 *param0) { - NARC * v0 = param0->unk_1D28->unk_00; - BGL * v1 = param0->unk_1D28->unk_0C; - SpriteRenderer * v2 = param0->unk_1D28->unk_04; - SpriteGfxHandler * v3 = param0->unk_1D28->unk_08; - PaletteData * v4 = param0->unk_1D28->unk_10; + NARC *v0 = param0->unk_1D28->unk_00; + BGL *v1 = param0->unk_1D28->unk_0C; + SpriteRenderer *v2 = param0->unk_1D28->unk_04; + SpriteGfxHandler *v3 = param0->unk_1D28->unk_08; + PaletteData *v4 = param0->unk_1D28->unk_10; ov100_021D4AC8(¶m0->unk_0C.unk_04, 46, param0->unk_1D28->unk_00); ov100_021D4AC8(¶m0->unk_0C.unk_314, 24, param0->unk_1D28->unk_00); @@ -170,7 +171,7 @@ static void ov100_021D3084 (UnkStruct_ov100_021D3084 * param0) param0->unk_0C.unk_13EC[1].unk_158 = 2; } -static void ov100_021D3400 (UnkStruct_ov100_021D3084 * param0) +static void ov100_021D3400(UnkStruct_ov100_021D3084 *param0) { ov100_021D4AA4(¶m0->unk_0C.unk_04, ¶m0->unk_1D28->unk_1C, 0); @@ -194,7 +195,7 @@ static void ov100_021D3400 (UnkStruct_ov100_021D3084 * param0) ov100_021D4AA4(¶m0->unk_0C.unk_13EC[1], ¶m0->unk_1D28->unk_1C, 1); } -static void ov100_021D34C0 (UnkStruct_ov100_021D3084 * param0) +static void ov100_021D34C0(UnkStruct_ov100_021D3084 *param0) { ov100_021D4AA4(¶m0->unk_0C.unk_10DC[0], ¶m0->unk_1D28->unk_1C, 4); ov100_021D4AA4(¶m0->unk_0C.unk_10DC[1], ¶m0->unk_1D28->unk_1C, 4); @@ -203,16 +204,16 @@ static void ov100_021D34C0 (UnkStruct_ov100_021D3084 * param0) param0->unk_0C.unk_10DC[1].unk_174 = 0; } -static void ov100_021D3504 (Camera * camera, VecFx32 * param1) +static void ov100_021D3504(Camera *camera, VecFx32 *param1) { - CameraAngle v0 = {-0x29fe, 0, 0}; + CameraAngle v0 = { -0x29fe, 0, 0 }; Camera_InitWithTarget(param1, 0x13c805, &v0, 0xc01, 0, 1, camera); Camera_SetAsActive(camera); Camera_SetClipping(FX32_ONE * 10, FX32_ONE * 1008, camera); } -static void ov100_021D3558 (UnkStruct_ov100_021D3084 * param0) +static void ov100_021D3558(UnkStruct_ov100_021D3084 *param0) { sub_020241B4(); Camera_ComputeViewMatrix(); @@ -243,9 +244,9 @@ static void ov100_021D3558 (UnkStruct_ov100_021D3084 * param0) G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_W); } -void * ov100_021D3620 (UnkStruct_ov100_021D4DD8 * param0) +void *ov100_021D3620(UnkStruct_ov100_021D4DD8 *param0) { - UnkStruct_ov100_021D3084 * v0 = Heap_AllocFromHeap(111, sizeof(UnkStruct_ov100_021D3084)); + UnkStruct_ov100_021D3084 *v0 = Heap_AllocFromHeap(111, sizeof(UnkStruct_ov100_021D3084)); memset(v0, 0, sizeof(UnkStruct_ov100_021D3084)); @@ -284,9 +285,9 @@ void * ov100_021D3620 (UnkStruct_ov100_021D4DD8 * param0) return v0; } -static void ov100_021D36CC (SysTask * param0, void * param1) +static void ov100_021D36CC(SysTask *param0, void *param1) { - UnkStruct_ov100_021D36CC * v0 = param1; + UnkStruct_ov100_021D36CC *v0 = param1; switch (v0->unk_04) { case 0: @@ -336,7 +337,7 @@ static void ov100_021D36CC (SysTask * param0, void * param1) } } -static void ov100_021D37B0 (UnkStruct_ov100_021D3084 * param0) +static void ov100_021D37B0(UnkStruct_ov100_021D3084 *param0) { param0->unk_1D28->unk_58.unk_0C = 0; param0->unk_1D28->unk_58.unk_10 = 0; @@ -348,11 +349,17 @@ static void ov100_021D37B0 (UnkStruct_ov100_021D3084 * param0) SysTask_Start(ov100_021D36CC, ¶m0->unk_1D28->unk_AC, 0x1000); } -static void ov100_021D37F4 (SysTask * param0, void * param1) +static void ov100_021D37F4(SysTask *param0, void *param1) { - UnkStruct_ov100_021D37F4 * v0 = param1; + UnkStruct_ov100_021D37F4 *v0 = param1; f32 v1[] = { - 0.0f, 0.3f, 0.6f, 1.0f, 1.2f, 1.1f, 1.0f, + 0.0f, + 0.3f, + 0.6f, + 1.0f, + 1.2f, + 1.1f, + 1.0f, }; switch (v0->unk_00) { @@ -382,9 +389,9 @@ static void ov100_021D37F4 (SysTask * param0, void * param1) } } -static void ov100_021D398C (UnkStruct_ov100_021D3084 * param0, int param1, int param2) +static void ov100_021D398C(UnkStruct_ov100_021D3084 *param0, int param1, int param2) { - UnkStruct_ov100_021D37F4 * v0 = ¶m0->unk_1D30[param1]; + UnkStruct_ov100_021D37F4 *v0 = ¶m0->unk_1D30[param1]; v0->unk_00 = 0; v0->unk_04 = 0; @@ -401,9 +408,9 @@ static void ov100_021D398C (UnkStruct_ov100_021D3084 * param0, int param1, int p SysTask_Start(ov100_021D37F4, v0, 0x1000); } -BOOL ov100_021D39E4 (void * param0) +BOOL ov100_021D39E4(void *param0) { - UnkStruct_ov100_021D3084 * v0 = param0; + UnkStruct_ov100_021D3084 *v0 = param0; switch (v0->unk_00) { case 0: @@ -412,8 +419,7 @@ BOOL ov100_021D39E4 (void * param0) } v0->unk_00++; - case 1: - { + case 1: { v0->unk_1D28->unk_58.unk_0C = 0; v0->unk_1D28->unk_58.unk_10 = 0; v0->unk_1D28->unk_58.unk_14 = 0; @@ -680,9 +686,9 @@ BOOL ov100_021D39E4 (void * param0) return 1; } -BOOL ov100_021D3FD4 (void * param0) +BOOL ov100_021D3FD4(void *param0) { - UnkStruct_ov100_021D3084 * v0 = param0; + UnkStruct_ov100_021D3084 *v0 = param0; switch (v0->unk_00) { case 0: diff --git a/src/overlay100/ov100_021D400C.c b/src/overlay100/ov100_021D400C.c index 69406f2fee..d5c5a14232 100644 --- a/src/overlay100/ov100_021D400C.c +++ b/src/overlay100/ov100_021D400C.c @@ -1,36 +1,36 @@ +#include "overlay100/ov100_021D400C.h" + #include #include -#include "sys_task_manager.h" - #include "overlay100/struct_ov100_021D4104.h" +#include "sys_task_manager.h" #include "unk_0200C6E4.h" #include "unk_0201D15C.h" -#include "overlay100/ov100_021D400C.h" typedef struct { f32 unk_00; f32 unk_04; } UnkStruct_ov100_021D400C; -static BOOL ov100_021D400C(s16 param0, s16 param1, f32 param2, f32 param3, f32 * param4, f32 * param5, f32 param6, s16 param7); -static BOOL ov100_021D4104(UnkStruct_ov100_021D4104 * param0, s16 param1, s16 param2, f32 param3, int param4); -static void ov100_021D41FC(UnkStruct_ov100_021D4104 * param0); -static void ov100_021D4214(UnkStruct_ov100_021D4104 * param0); -static void ov100_021D4264(UnkStruct_ov100_021D4104 * param0, int param1, int param2, int param3, int param4); -static void ov100_021D42B0(UnkStruct_ov100_021D4104 * param0); -static void ov100_021D4318(UnkStruct_ov100_021D4104 * param0); -static void ov100_021D43BC(UnkStruct_ov100_021D4104 * param0); +static BOOL ov100_021D400C(s16 param0, s16 param1, f32 param2, f32 param3, f32 *param4, f32 *param5, f32 param6, s16 param7); +static BOOL ov100_021D4104(UnkStruct_ov100_021D4104 *param0, s16 param1, s16 param2, f32 param3, int param4); +static void ov100_021D41FC(UnkStruct_ov100_021D4104 *param0); +static void ov100_021D4214(UnkStruct_ov100_021D4104 *param0); +static void ov100_021D4264(UnkStruct_ov100_021D4104 *param0, int param1, int param2, int param3, int param4); +static void ov100_021D42B0(UnkStruct_ov100_021D4104 *param0); +static void ov100_021D4318(UnkStruct_ov100_021D4104 *param0); +static void ov100_021D43BC(UnkStruct_ov100_021D4104 *param0); -static void(*const Unk_ov100_021D5334[])(UnkStruct_ov100_021D4104 *) = { +static void (*const Unk_ov100_021D5334[])(UnkStruct_ov100_021D4104 *) = { ov100_021D41FC, ov100_021D4214, ov100_021D42B0, ov100_021D4318 }; -static BOOL ov100_021D400C (s16 param0, s16 param1, f32 param2, f32 param3, f32 * param4, f32 * param5, f32 param6, s16 param7) +static BOOL ov100_021D400C(s16 param0, s16 param1, f32 param2, f32 param3, f32 *param4, f32 *param5, f32 param6, s16 param7) { f32 v0; f32 v1; @@ -64,7 +64,7 @@ static BOOL ov100_021D400C (s16 param0, s16 param1, f32 param2, f32 param3, f32 return 1; } -static BOOL ov100_021D4104 (UnkStruct_ov100_021D4104 * param0, s16 param1, s16 param2, f32 param3, int param4) +static BOOL ov100_021D4104(UnkStruct_ov100_021D4104 *param0, s16 param1, s16 param2, f32 param3, int param4) { f32 v0; f32 v1; @@ -98,12 +98,12 @@ static BOOL ov100_021D4104 (UnkStruct_ov100_021D4104 * param0, s16 param1, s16 p return v6; } -static void ov100_021D41FC (UnkStruct_ov100_021D4104 * param0) +static void ov100_021D41FC(UnkStruct_ov100_021D4104 *param0) { BOOL v0 = ov100_021D4104(param0, 128, 40, 5.0f, 32); } -static void ov100_021D4214 (UnkStruct_ov100_021D4104 * param0) +static void ov100_021D4214(UnkStruct_ov100_021D4104 *param0) { fx32 v0, v1; @@ -118,7 +118,7 @@ static void ov100_021D4214 (UnkStruct_ov100_021D4104 * param0) param0->unk_14 = v1 / FX32_ONE; } -static void ov100_021D4264 (UnkStruct_ov100_021D4104 * param0, int param1, int param2, int param3, int param4) +static void ov100_021D4264(UnkStruct_ov100_021D4104 *param0, int param1, int param2, int param3, int param4) { fx32 v0, v1; @@ -131,20 +131,20 @@ static void ov100_021D4264 (UnkStruct_ov100_021D4104 * param0, int param1, int p sub_0200D650(param0->unk_00, v0, v1, FX32_CONST(192)); } -static void ov100_021D42B0 (UnkStruct_ov100_021D4104 * param0) +static void ov100_021D42B0(UnkStruct_ov100_021D4104 *param0) { fx32 v0, v1; static s16 v2[][2] = { - {97, 80}, - {87, 106}, - {102, 94}, - {182, 83}, - {129, 116}, - {97, 116}, - {172, 84}, - {187, 99}, - {168, 123}, - {108, 93}, + { 97, 80 }, + { 87, 106 }, + { 102, 94 }, + { 182, 83 }, + { 129, 116 }, + { 97, 116 }, + { 172, 84 }, + { 187, 99 }, + { 168, 123 }, + { 108, 93 }, }; BOOL v3; @@ -162,7 +162,7 @@ static void ov100_021D42B0 (UnkStruct_ov100_021D4104 * param0) param0->unk_14 = (v1 / FX32_ONE); } -static void ov100_021D4318 (UnkStruct_ov100_021D4104 * param0) +static void ov100_021D4318(UnkStruct_ov100_021D4104 *param0) { fx32 v0, v1; @@ -187,7 +187,7 @@ static void ov100_021D4318 (UnkStruct_ov100_021D4104 * param0) param0->unk_14 = v1 / FX32_ONE; } -static void ov100_021D43BC (UnkStruct_ov100_021D4104 * param0) +static void ov100_021D43BC(UnkStruct_ov100_021D4104 *param0) { f32 v0; @@ -207,9 +207,9 @@ static void ov100_021D43BC (UnkStruct_ov100_021D4104 * param0) sub_0200D474(param0->unk_00, param0->unk_14); } -void ov100_021D4414 (SysTask * param0, void * param1) +void ov100_021D4414(SysTask *param0, void *param1) { - UnkStruct_ov100_021D4104 * v0 = param1; + UnkStruct_ov100_021D4104 *v0 = param1; Unk_ov100_021D5334[v0->unk_0C](v0); @@ -217,9 +217,9 @@ void ov100_021D4414 (SysTask * param0, void * param1) sub_0200D33C(v0->unk_00); } -void ov100_021D4438 (SysTask * param0, void * param1) +void ov100_021D4438(SysTask *param0, void *param1) { - UnkStruct_ov100_021D4104 * v0 = param1; + UnkStruct_ov100_021D4104 *v0 = param1; if (v0->unk_0C) { ov100_021D4264(v0, 128, 48 - 12, 32, 12); diff --git a/src/overlay100/ov100_021D44C0.c b/src/overlay100/ov100_021D44C0.c index 0cb828cca7..dde061b2f2 100644 --- a/src/overlay100/ov100_021D44C0.c +++ b/src/overlay100/ov100_021D44C0.c @@ -1,3 +1,5 @@ +#include "overlay100/ov100_021D44C0.h" + #include #include @@ -5,29 +7,28 @@ #include "overlay100/struct_ov100_021D54D0.h" #include "unk_020170BC.h" -#include "overlay100/ov100_021D44C0.h" -void ov100_021D44C0(UnkStruct_ov100_021D49B4 * param0, UnkStruct_ov100_021D54D0 * param1); -void ov100_021D4510(UnkStruct_ov100_021D49B4 * param0); -void ov100_021D45A4(UnkStruct_ov100_021D49B4 * param0); +void ov100_021D44C0(UnkStruct_ov100_021D49B4 *param0, UnkStruct_ov100_021D54D0 *param1); +void ov100_021D4510(UnkStruct_ov100_021D49B4 *param0); +void ov100_021D45A4(UnkStruct_ov100_021D49B4 *param0); static const int Unk_ov100_021D5344[][5] = { - {0x1, 0x2, 0x3, 0x2, 0xFF}, - {0x5, 0x6, 0x7, 0x6, 0xFF}, - {0x9, 0xA, 0xB, 0xA, 0xFF}, - {0xD, 0xE, 0xF, 0xE, 0xFF}, - {0x0, 0x0, 0x0, 0x0, 0xFF}, - {0x4, 0x4, 0x4, 0x4, 0xFF}, - {0xA, 0xA, 0xA, 0xA, 0xFF}, - {0xE, 0xE, 0xE, 0xE, 0xFF}, - {0x0, 0x0, 0x0, 0x0, 0xFF}, - {0x0, 0x1, 0x2, 0x3, 0xFF}, - {0x4, 0x5, 0x6, 0x7, 0xFF}, - {0x8, 0x9, 0xA, 0xB, 0xFF}, - {0xC, 0xD, 0xE, 0xF, 0xFF} + { 0x1, 0x2, 0x3, 0x2, 0xFF }, + { 0x5, 0x6, 0x7, 0x6, 0xFF }, + { 0x9, 0xA, 0xB, 0xA, 0xFF }, + { 0xD, 0xE, 0xF, 0xE, 0xFF }, + { 0x0, 0x0, 0x0, 0x0, 0xFF }, + { 0x4, 0x4, 0x4, 0x4, 0xFF }, + { 0xA, 0xA, 0xA, 0xA, 0xFF }, + { 0xE, 0xE, 0xE, 0xE, 0xFF }, + { 0x0, 0x0, 0x0, 0x0, 0xFF }, + { 0x0, 0x1, 0x2, 0x3, 0xFF }, + { 0x4, 0x5, 0x6, 0x7, 0xFF }, + { 0x8, 0x9, 0xA, 0xB, 0xFF }, + { 0xC, 0xD, 0xE, 0xF, 0xFF } }; -void ov100_021D44C0 (UnkStruct_ov100_021D49B4 * param0, UnkStruct_ov100_021D54D0 * param1) +void ov100_021D44C0(UnkStruct_ov100_021D49B4 *param0, UnkStruct_ov100_021D54D0 *param1) { param0->unk_160 = 1; param0->unk_184 = param1; @@ -37,7 +38,7 @@ void ov100_021D44C0 (UnkStruct_ov100_021D49B4 * param0, UnkStruct_ov100_021D54D0 param0->unk_158 = param1[param0->unk_180].unk_00; } -void ov100_021D4510 (UnkStruct_ov100_021D49B4 * param0) +void ov100_021D4510(UnkStruct_ov100_021D49B4 *param0) { int v0; int v1; @@ -67,10 +68,10 @@ void ov100_021D4510 (UnkStruct_ov100_021D49B4 * param0) sub_02017240(¶m0->unk_88[0], v3); } -void ov100_021D45A4 (UnkStruct_ov100_021D49B4 * param0) +void ov100_021D45A4(UnkStruct_ov100_021D49B4 *param0) { int v0; - UnkStruct_ov100_021D54D0 * v1 = param0->unk_184; + UnkStruct_ov100_021D54D0 *v1 = param0->unk_184; if ((param0->unk_178 == 0xFF) || (param0->unk_180 == 0xFF)) { return; diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index 7ae8782fd1..f54bd67db6 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -1,48 +1,46 @@ +#include "overlay100/ov100_021D46C8.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" -#include "strbuf.h" - #include "struct_defs/struct_020985E4.h" + +#include "overlay100/ov100_021D44C0.h" #include "overlay100/struct_ov100_021D46C8.h" #include "overlay100/struct_ov100_021D4890.h" #include "overlay100/struct_ov100_021D49B4.h" #include "overlay100/struct_ov100_021D4DD8.h" #include "overlay115/camera_angle.h" -#include "unk_02002F38.h" +#include "camera.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" +#include "trainer_info.h" +#include "unk_02002F38.h" #include "unk_0200DA60.h" #include "unk_020170BC.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "camera.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" -#include "overlay100/ov100_021D44C0.h" -#include "overlay100/ov100_021D46C8.h" -int ov100_021D46C8 (UnkStruct_ov100_021D46C8 * param0, UnkStruct_020985E4 * param1, int param2) +int ov100_021D46C8(UnkStruct_ov100_021D46C8 *param0, UnkStruct_020985E4 *param1, int param2) { int v0; - MessageLoader * v1; - Strbuf* v2; - Strbuf* v3 = Strbuf_Init(511, 111); + MessageLoader *v1; + Strbuf *v2; + Strbuf *v3 = Strbuf_Init(511, 111); u8 v4 = 0; v1 = param0->unk_2C; v2 = MessageLoader_GetNewStrbuf(v1, param2); if (param2 == 22) { - Strbuf* v5 = TrainerInfo_NameNewStrbuf(param1->unk_08, 111); - StringTemplate * v6 = StringTemplate_Default(111); + Strbuf *v5 = TrainerInfo_NameNewStrbuf(param1->unk_08, 111); + StringTemplate *v6 = StringTemplate_Default(111); StringTemplate_SetStrbuf(v6, 0, v5, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v6, v3, v2); @@ -67,16 +65,16 @@ int ov100_021D46C8 (UnkStruct_ov100_021D46C8 * param0, UnkStruct_020985E4 * para return v0; } -void ov100_021D4788 (UnkStruct_ov100_021D46C8 * param0) +void ov100_021D4788(UnkStruct_ov100_021D46C8 *param0) { sub_0200E084(¶m0->unk_30, 1); sub_0201ACF4(¶m0->unk_30); } -void ov100_021D47A0 (UnkStruct_ov100_021D46C8 * param0) +void ov100_021D47A0(UnkStruct_ov100_021D46C8 *param0) { - VecFx32 v0 = {0, -FX32_ONE, -FX32_ONE}; - VecFx32 v1 = {-2043, -3548, 110}; + VecFx32 v0 = { 0, -FX32_ONE, -FX32_ONE }; + VecFx32 v1 = { -2043, -3548, 110 }; VEC_Normalize(&v0, &v0); NNS_G3dGlbLightVector(0, v0.x, v0.y, v0.z); @@ -90,7 +88,7 @@ void ov100_021D47A0 (UnkStruct_ov100_021D46C8 * param0) NNS_G3dGlbMaterialColorSpecEmi(GX_RGB(20, 20, 20), GX_RGB(16, 16, 16), 0); } -void ov100_021D4844 (UnkStruct_ov100_021D46C8 * param0) +void ov100_021D4844(UnkStruct_ov100_021D46C8 *param0) { CameraAngle v0 = Camera_GetAngle(param0->camera); VecFx32 v1 = Camera_GetPosition(param0->camera); @@ -99,7 +97,7 @@ void ov100_021D4844 (UnkStruct_ov100_021D46C8 * param0) Camera_SetAngleAroundTarget(&v0, param0->camera); } -void ov100_021D4890 (UnkStruct_ov100_021D4890 * param0) +void ov100_021D4890(UnkStruct_ov100_021D4890 *param0) { CameraAngle v0; @@ -119,7 +117,7 @@ void ov100_021D4890 (UnkStruct_ov100_021D4890 * param0) param0->cameraAngle.z = v0.z + ((65535 / 360) * param0->unk_14); } -BOOL ov100_021D4920 (UnkStruct_ov100_021D4890 * param0) +BOOL ov100_021D4920(UnkStruct_ov100_021D4890 *param0) { BOOL v0 = 0; CameraAngle v1 = Camera_GetAngle(param0->camera); @@ -148,7 +146,7 @@ BOOL ov100_021D4920 (UnkStruct_ov100_021D4890 * param0) return v0; } -void ov100_021D49B4 (UnkStruct_ov100_021D49B4 * param0) +void ov100_021D49B4(UnkStruct_ov100_021D49B4 *param0) { if (param0->unk_174 == 0) { return; @@ -194,17 +192,17 @@ void ov100_021D49B4 (UnkStruct_ov100_021D49B4 * param0) NNS_G3dGePopMtx(1); } -void ov100_021D4A84 (UnkStruct_ov100_021D49B4 * param0) +void ov100_021D4A84(UnkStruct_ov100_021D49B4 *param0) { sub_02017110(¶m0->unk_78); } -void ov100_021D4A90 (int param0, UnkStruct_ov100_021D49B4 * param1, NNSFndAllocator * param2) +void ov100_021D4A90(int param0, UnkStruct_ov100_021D49B4 *param1, NNSFndAllocator *param2) { sub_020171A0(¶m1->unk_88[param0], param2); } -void ov100_021D4AA4 (UnkStruct_ov100_021D49B4 * param0, NNSFndAllocator * param1, int param2) +void ov100_021D4AA4(UnkStruct_ov100_021D49B4 *param0, NNSFndAllocator *param1, int param2) { int v0; @@ -215,7 +213,7 @@ void ov100_021D4AA4 (UnkStruct_ov100_021D49B4 * param0, NNSFndAllocator * param1 } } -void ov100_021D4AC8 (UnkStruct_ov100_021D49B4 * param0, int param1, NARC * param2) +void ov100_021D4AC8(UnkStruct_ov100_021D49B4 *param0, int param1, NARC *param2) { sub_020170D8(¶m0->unk_78, param2, param1, 111); sub_02017258(¶m0->unk_00, ¶m0->unk_78); @@ -226,7 +224,7 @@ void ov100_021D4AC8 (UnkStruct_ov100_021D49B4 * param0, int param1, NARC * param param0->unk_174 = 1; } -void ov100_021D4B10 (UnkStruct_ov100_021D49B4 * param0, UnkStruct_ov100_021D49B4 * param1, int param2, NARC * param3) +void ov100_021D4B10(UnkStruct_ov100_021D49B4 *param0, UnkStruct_ov100_021D49B4 *param1, int param2, NARC *param3) { sub_02017258(¶m1->unk_00, ¶m0->unk_78); sub_02017350(¶m1->unk_00, 0, 0, 0); @@ -236,7 +234,7 @@ void ov100_021D4B10 (UnkStruct_ov100_021D49B4 * param0, UnkStruct_ov100_021D49B4 param1->unk_174 = 1; } -void ov100_021D4B4C (int param0, UnkStruct_ov100_021D49B4 * param1, int param2, NARC * param3, NNSFndAllocator * param4) +void ov100_021D4B4C(int param0, UnkStruct_ov100_021D49B4 *param1, int param2, NARC *param3, NNSFndAllocator *param4) { sub_02017164(¶m1->unk_88[param0], ¶m1->unk_78, param3, param2, 111, param4); sub_02017240(¶m1->unk_88[param0], 0); @@ -247,7 +245,7 @@ void ov100_021D4B4C (int param0, UnkStruct_ov100_021D49B4 * param1, int param2, param1->unk_178 = 0xFF; } -void ov100_021D4BA0 (int param0, UnkStruct_ov100_021D49B4 * param1, UnkStruct_ov100_021D49B4 * param2, int param3, NARC * param4, NNSFndAllocator * param5) +void ov100_021D4BA0(int param0, UnkStruct_ov100_021D49B4 *param1, UnkStruct_ov100_021D49B4 *param2, int param3, NARC *param4, NNSFndAllocator *param5) { sub_02017164(¶m2->unk_88[param0], ¶m1->unk_78, param4, param3, 111, param5); sub_02017240(¶m2->unk_88[param0], 0); @@ -258,7 +256,7 @@ void ov100_021D4BA0 (int param0, UnkStruct_ov100_021D49B4 * param1, UnkStruct_ov param2->unk_178 = 0xFF; } -void ov100_021D4BF0 (UnkStruct_ov100_021D46C8 * param0) +void ov100_021D4BF0(UnkStruct_ov100_021D46C8 *param0) { if (param0->unk_C0 == 0) { if (param0->unk_C1 < 31) { @@ -278,24 +276,28 @@ void ov100_021D4BF0 (UnkStruct_ov100_021D46C8 * param0) sub_020039B0(param0->unk_10, 1, 4, 6, param0->unk_C1 / 8, 0xCCCC); } -void ov100_021D4C94 (UnkStruct_ov100_021D46C8 * param0, int param1) +void ov100_021D4C94(UnkStruct_ov100_021D46C8 *param0, int param1) { int v0; const u8 v1[] = { - 4, 4, 4, + 4, + 4, + 4, }; const v2[][2] = { - {0, 31}, - {0, 31}, - {0, 31}, + { 0, 31 }, + { 0, 31 }, + { 0, 31 }, }; const u8 v3[][2] = { - {0, 32}, - {0, 32}, - {0, 32}, + { 0, 32 }, + { 0, 32 }, + { 0, 32 }, }; const int v4[] = { - 0x10, 0x10, 0x10, + 0x10, + 0x10, + 0x10, }; v0 = param1; @@ -332,13 +334,13 @@ void ov100_021D4C94 (UnkStruct_ov100_021D46C8 * param0, int param1) sub_020039B0(param0->unk_10, 1, v3[v0][0], v3[v0][1], param0->unk_C1 / v1[v0], v4[v0]); } -void ov100_021D4DC8 (int param0) +void ov100_021D4DC8(int param0) { gCoreSys.unk_65 = param0; GXLayers_SwapDisplay(); } -void ov100_021D4DD8 (UnkStruct_ov100_021D4DD8 * param0, int param1) +void ov100_021D4DD8(UnkStruct_ov100_021D4DD8 *param0, int param1) { param0->unk_0C.unk_50.unk_03 = param1; G2_SetBlendBrightness((GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), param0->unk_0C.unk_50.unk_03); diff --git a/src/overlay100/ov100_021D4E04.c b/src/overlay100/ov100_021D4E04.c index e07309f7c1..91ed6653fc 100644 --- a/src/overlay100/ov100_021D4E04.c +++ b/src/overlay100/ov100_021D4E04.c @@ -1,37 +1,38 @@ +#include "overlay100/ov100_021D4E04.h" + #include #include -#include "inlines.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay005/struct_ov5_021DDF24_sub1.h" #include "overlay100/struct_ov100_021D4E3C.h" #include "overlay100/struct_ov100_021D4EBC.h" +#include "overlay104/ov104_0223E894.h" -#include "unk_0200679C.h" -#include "sys_task.h" -#include "screen_scroll_manager.h" #include "buffer_manager.h" #include "heap.h" +#include "inlines.h" +#include "screen_scroll_manager.h" +#include "sys_task.h" #include "sys_task_manager.h" -#include "overlay100/ov100_021D4E04.h" -#include "overlay104/ov104_0223E894.h" +#include "unk_0200679C.h" -typedef void (* UnkFuncPtr_ov104_0223F174)(void *); +typedef void (*UnkFuncPtr_ov104_0223F174)(void *); typedef struct { - SysTask * unk_00; - SysTask * unk_04; + SysTask *unk_00; + SysTask *unk_04; BOOL unk_08; BOOL unk_0C; UnkFuncPtr_ov104_0223F174 unk_10; UnkFuncPtr_ov104_0223F174 unk_14; - void * unk_18; + void *unk_18; } UnkStruct_ov104_0223F174_sub1; typedef struct UnkStruct_ov104_0223F174_t { UnkStruct_ov104_0223F174_sub1 unk_00; - BufferManager * bufferManager; + BufferManager *bufferManager; u32 unk_20[192]; u32 unk_320[192]; u32 unk_620; @@ -41,28 +42,28 @@ typedef struct UnkStruct_ov100_021D4F9C_t { GXVRamLCDC unk_00; UnkStruct_ov100_021D4EBC unk_04; BOOL unk_30; - SysTask * unk_34; + SysTask *unk_34; } UnkStruct_ov100_021D4F9C; -static SysTask * ov100_021D4E04(UnkStruct_ov100_021D4E3C * param0); -static void ov100_021D4E18(SysTask * param0, void * param1); -static void ov100_021D4FDC(SysTask * param0, void * param1); -static void ov100_021D4F9C(SysTask * param0, void * param1); -static void ov100_021D503C(UnkStruct_ov100_021D4EBC * param0); +static SysTask *ov100_021D4E04(UnkStruct_ov100_021D4E3C *param0); +static void ov100_021D4E18(SysTask *param0, void *param1); +static void ov100_021D4FDC(SysTask *param0, void *param1); +static void ov100_021D4F9C(SysTask *param0, void *param1); +static void ov100_021D503C(UnkStruct_ov100_021D4EBC *param0); static const u8 Unk_ov104_02241964[][6] = { - {0x0, 0x1, 0x2, 0x3, 0x4, 0x5}, - {0x5, 0x4, 0x3, 0x2, 0x1, 0x0} + { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5 }, + { 0x5, 0x4, 0x3, 0x2, 0x1, 0x0 } }; -static SysTask * ov100_021D4E04 (UnkStruct_ov100_021D4E3C * param0) +static SysTask *ov100_021D4E04(UnkStruct_ov100_021D4E3C *param0) { return SysTask_ExecuteOnVBlank(ov100_021D4E18, param0, 1024); } -static void ov100_021D4E18 (SysTask * param0, void * param1) +static void ov100_021D4E18(SysTask *param0, void *param1) { - UnkStruct_ov100_021D4E3C * v0 = param1; + UnkStruct_ov100_021D4E3C *v0 = param1; if (v0->unk_08 >= 2) { ScreenScrollManager_SwapBuffers(v0->screenScrollMgr); @@ -73,21 +74,21 @@ static void ov100_021D4E18 (SysTask * param0, void * param1) v0->unk_08++; } -void ov100_021D4E3C (UnkStruct_ov100_021D4E3C * param0, u32 param1) +void ov100_021D4E3C(UnkStruct_ov100_021D4E3C *param0, u32 param1) { param0->screenScrollMgr = ScreenScrollManager_New(param1); param0->unk_08 = 0; param0->unk_04 = ov100_021D4E04(param0); } -void ov100_021D4E58 (UnkStruct_ov100_021D4E3C * param0) +void ov100_021D4E58(UnkStruct_ov100_021D4E3C *param0) { SysTask_Done(param0->unk_04); ScreenScrollManager_Stop(param0->screenScrollMgr); ScreenScrollManager_Delete(param0->screenScrollMgr); } -void ov100_021D4E70 (UnkStruct_ov100_021D4E3C * param0, u8 param1, u8 param2, u16 param3, fx32 param4, s16 param5, u32 param6, u32 param7, u32 param8, int param9) +void ov100_021D4E70(UnkStruct_ov100_021D4E3C *param0, u8 param1, u8 param2, u16 param3, fx32 param4, s16 param5, u32 param6, u32 param7, u32 param8, int param9) { if (param9 == 0) { ScreenScrollManager_ScrollX(param0->screenScrollMgr, param1, param2, param3, param4, param5, param6, param7, param8); @@ -96,10 +97,10 @@ void ov100_021D4E70 (UnkStruct_ov100_021D4E3C * param0, u8 param1, u8 param2, u1 } } -UnkStruct_ov100_021D4F9C * ov100_021D4EBC (UnkStruct_ov100_021D4EBC * param0) +UnkStruct_ov100_021D4F9C *ov100_021D4EBC(UnkStruct_ov100_021D4EBC *param0) { - SysTask * v0; - UnkStruct_ov100_021D4F9C * v1; + SysTask *v0; + UnkStruct_ov100_021D4F9C *v1; v0 = SysTask_StartAndAllocateParam(ov100_021D4F9C, sizeof(UnkStruct_ov100_021D4F9C), 5, param0->unk_28); v1 = SysTask_GetParam(v0); @@ -115,7 +116,7 @@ UnkStruct_ov100_021D4F9C * ov100_021D4EBC (UnkStruct_ov100_021D4EBC * param0) return v1; } -void ov100_021D4F0C (UnkStruct_ov100_021D4F9C ** param0, GXDispMode param1, GXBGMode param2, GXBG0As param3) +void ov100_021D4F0C(UnkStruct_ov100_021D4F9C **param0, GXDispMode param1, GXBGMode param2, GXBG0As param3) { GX_SetGraphicsMode(param1, param2, param3); GX_SetBankForLCDC((*param0)->unk_00); @@ -142,18 +143,18 @@ void ov100_021D4F0C (UnkStruct_ov100_021D4F9C ** param0, GXDispMode param1, GXBG *param0 = NULL; } -static void ov100_021D4F9C (SysTask * param0, void * param1) +static void ov100_021D4F9C(SysTask *param0, void *param1) { - UnkStruct_ov100_021D4F9C * v0 = param1; + UnkStruct_ov100_021D4F9C *v0 = param1; if (v0->unk_30) { GX_SetCapture(v0->unk_04.unk_0C, v0->unk_04.unk_10, v0->unk_04.unk_14, v0->unk_04.unk_18, v0->unk_04.unk_1C, v0->unk_04.unk_20, v0->unk_04.unk_24); } } -static void ov100_021D4FDC (SysTask * param0, void * param1) +static void ov100_021D4FDC(SysTask *param0, void *param1) { - UnkStruct_ov100_021D4F9C * v0 = (UnkStruct_ov100_021D4F9C *)param1; + UnkStruct_ov100_021D4F9C *v0 = (UnkStruct_ov100_021D4F9C *)param1; switch (v0->unk_04.unk_00) { case GX_DISPMODE_VRAM_A: @@ -179,7 +180,7 @@ static void ov100_021D4FDC (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov100_021D503C (UnkStruct_ov100_021D4EBC * param0) +static void ov100_021D503C(UnkStruct_ov100_021D4EBC *param0) { switch (param0->unk_00) { case GX_DISPMODE_VRAM_A: diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index 70bc58c2ef..37c5f59b3d 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -1,86 +1,86 @@ -#include "enums.h" +#include "overlay101/ov101_021D0D80.h" #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/struct_0203E348.h" #include "struct_defs/struct_02099F80.h" + #include "overlay022/struct_ov22_022559F8.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay101/ov101_021D1A28.h" +#include "overlay101/ov101_021D59AC.h" +#include "overlay101/ov101_021D7E48.h" #include "overlay101/struct_ov101_021D13C8.h" #include "overlay101/struct_ov101_021D148C.h" #include "overlay101/struct_ov101_021D1894.h" +#include "enums.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_0202CD50.h" #include "unk_020711EC.h" -#include "overlay101/ov101_021D0D80.h" -#include "overlay101/ov101_021D1A28.h" -#include "overlay101/ov101_021D59AC.h" -#include "overlay101/ov101_021D7E48.h" typedef struct { - UnkStruct_0203E348 * unk_00; - UnkStruct_ov101_021D13C8 * unk_04; + UnkStruct_0203E348 *unk_00; + UnkStruct_ov101_021D13C8 *unk_04; } UnkStruct_ov101_021D0F3C; -static void ov101_021D0F3C(UnkStruct_ov101_021D0F3C * param0, UnkStruct_ov101_021D13C8 * param1); -static UnkStruct_ov101_021D13C8 * ov101_021D0F6C(UnkStruct_0203E348 * param0); -static void ov101_021D0F94(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D0F9C(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D107C(UnkStruct_ov101_021D13C8 * param0); +static void ov101_021D0F3C(UnkStruct_ov101_021D0F3C *param0, UnkStruct_ov101_021D13C8 *param1); +static UnkStruct_ov101_021D13C8 *ov101_021D0F6C(UnkStruct_0203E348 *param0); +static void ov101_021D0F94(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D0F9C(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D107C(UnkStruct_ov101_021D13C8 *param0); static void ov101_021D1098(void); -static void ov101_021D10B8(BGL * param0); -static void ov101_021D11A4(BGL * param0); +static void ov101_021D10B8(BGL *param0); +static void ov101_021D11A4(BGL *param0); static void ov101_021D11D0(void); -static void ov101_021D121C(UnkStruct_ov101_021D13C8 * param0); +static void ov101_021D121C(UnkStruct_ov101_021D13C8 *param0); static void ov101_021D150C(void); static void ov101_021D1544(void); -static void ov101_021D1550(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D15A4(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D15BC(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D1868(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D186C(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D1884(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D18B4(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D18C0(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D18E4(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D18F4(SysTask * param0, void * param1); -static void ov101_021D197C(void * param0); -static void ov101_021D19BC(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D19D4(UnkStruct_ov101_021D13C8 * param0); +static void ov101_021D1550(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D15A4(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D15BC(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D1868(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D186C(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D1884(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D18B4(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D18C0(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D18E4(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D18F4(SysTask *param0, void *param1); +static void ov101_021D197C(void *param0); +static void ov101_021D19BC(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D19D4(UnkStruct_ov101_021D13C8 *param0); static const UnkStruct_ov61_0222C884 Unk_ov101_021D8588[1]; -static void ov101_021D1458(UnkStruct_ov101_021D13C8 * param0); +static void ov101_021D1458(UnkStruct_ov101_021D13C8 *param0); -int ov101_021D0D80 (OverlayManager * param0, int * param1) +int ov101_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov101_021D0F3C * v0; - UnkStruct_ov101_021D13C8 * v1; - UnkStruct_0203E348 * v2; + UnkStruct_ov101_021D0F3C *v0; + UnkStruct_ov101_021D13C8 *v1; + UnkStruct_0203E348 *v2; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -113,10 +113,10 @@ int ov101_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov101_021D0E40 (OverlayManager * param0, int * param1) +int ov101_021D0E40(OverlayManager *param0, int *param1) { - UnkStruct_ov101_021D0F3C * v0 = OverlayManager_Data(param0); - UnkStruct_ov101_021D13C8 * v1 = v0->unk_04; + UnkStruct_ov101_021D0F3C *v0 = OverlayManager_Data(param0); + UnkStruct_ov101_021D13C8 *v1 = v0->unk_04; switch (*param1) { case 0: @@ -148,10 +148,10 @@ int ov101_021D0E40 (OverlayManager * param0, int * param1) return 0; } -int ov101_021D0EE4 (OverlayManager * param0, int * param1) +int ov101_021D0EE4(OverlayManager *param0, int *param1) { - UnkStruct_ov101_021D0F3C * v0 = OverlayManager_Data(param0); - UnkStruct_ov101_021D13C8 * v1 = v0->unk_04; + UnkStruct_ov101_021D0F3C *v0 = OverlayManager_Data(param0); + UnkStruct_ov101_021D13C8 *v1 = v0->unk_04; SetMainCallback(NULL, NULL); @@ -173,7 +173,7 @@ int ov101_021D0EE4 (OverlayManager * param0, int * param1) return 1; } -static void ov101_021D0F3C (UnkStruct_ov101_021D0F3C * param0, UnkStruct_ov101_021D13C8 * param1) +static void ov101_021D0F3C(UnkStruct_ov101_021D0F3C *param0, UnkStruct_ov101_021D13C8 *param1) { u32 v0 = param1->unk_60; @@ -189,9 +189,9 @@ static void ov101_021D0F3C (UnkStruct_ov101_021D0F3C * param0, UnkStruct_ov101_0 } } -static UnkStruct_ov101_021D13C8 * ov101_021D0F6C (UnkStruct_0203E348 * param0) +static UnkStruct_ov101_021D13C8 *ov101_021D0F6C(UnkStruct_0203E348 *param0) { - UnkStruct_ov101_021D13C8 * v0 = ov101_021D1998((sizeof(UnkStruct_ov101_021D13C8))); + UnkStruct_ov101_021D13C8 *v0 = ov101_021D1998(sizeof(UnkStruct_ov101_021D13C8)); v0->unk_60 = *(param0->unk_00); v0->unk_88 = param0->unk_04; @@ -200,12 +200,12 @@ static UnkStruct_ov101_021D13C8 * ov101_021D0F6C (UnkStruct_0203E348 * param0) return v0; } -static void ov101_021D0F94 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D0F94(UnkStruct_ov101_021D13C8 *param0) { Heap_FreeToHeap(param0); } -static void ov101_021D0F9C (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D0F9C(UnkStruct_ov101_021D13C8 *param0) { param0->unk_43C = sub_02018340(79); @@ -237,14 +237,14 @@ static void ov101_021D0F9C (UnkStruct_ov101_021D13C8 * param0) SetMainCallback(ov101_021D197C, param0); } -static void ov101_021D107C (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D107C(UnkStruct_ov101_021D13C8 *param0) { ov101_021D11A4(param0->unk_43C); ov101_021D15A4(param0); ov101_021D1544(); } -static void ov101_021D1098 (void) +static void ov101_021D1098(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -262,7 +262,7 @@ static void ov101_021D1098 (void) GXLayers_SetBanks(&v0); } -static void ov101_021D10B8 (BGL * param0) +static void ov101_021D10B8(BGL *param0) { GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); @@ -363,7 +363,7 @@ static void ov101_021D10B8 (BGL * param0) } } -static void ov101_021D11A4 (BGL * param0) +static void ov101_021D11A4(BGL *param0) { sub_02019044(param0, 0); sub_02019044(param0, 1); @@ -372,7 +372,7 @@ static void ov101_021D11A4 (BGL * param0) Heap_FreeToHeap(param0); } -static void ov101_021D11D0 (void) +static void ov101_021D11D0(void) { GX_SetVisibleWnd(GX_WNDMASK_W0); G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); @@ -380,9 +380,9 @@ static void ov101_021D11D0 (void) G2_SetWnd0Position(0, 0, 255, 255); } -static void ov101_021D121C (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D121C(UnkStruct_ov101_021D13C8 *param0) { - void * v0 = ov101_021D19E4(param0, 3, 0); + void *v0 = ov101_021D19E4(param0, 3, 0); NNS_G2dGetUnpackedPaletteData(v0, ¶m0->unk_448); sub_0201972C(1, param0->unk_448->pRawData, (32 * 13), (32 * 0)); @@ -427,10 +427,10 @@ static void ov101_021D121C (UnkStruct_ov101_021D13C8 * param0) Heap_FreeToHeap(v0); } -void ov101_021D13C8 (UnkStruct_ov101_021D13C8 * param0) +void ov101_021D13C8(UnkStruct_ov101_021D13C8 *param0) { int v0; - UnkStruct_ov101_021D148C * v1 = ¶m0->unk_408; + UnkStruct_ov101_021D148C *v1 = ¶m0->unk_408; sub_0200DAA4(param0->unk_43C, 0, 1, 15, 0, 79); sub_0200DD0C(param0->unk_43C, 0, (1 + (18 + 12)), 14, param0->unk_4C4, 79); @@ -446,10 +446,10 @@ void ov101_021D13C8 (UnkStruct_ov101_021D13C8 * param0) v1->unk_18 = Strbuf_Init(256, 79); } -void ov101_021D1458 (UnkStruct_ov101_021D13C8 * param0) +void ov101_021D1458(UnkStruct_ov101_021D13C8 *param0) { int v0; - UnkStruct_ov101_021D148C * v1 = ¶m0->unk_408; + UnkStruct_ov101_021D148C *v1 = ¶m0->unk_408; for (v0 = 0; v0 < 1; v0++) { sub_0201ACF4(&v1->unk_08[v0]); @@ -461,9 +461,9 @@ void ov101_021D1458 (UnkStruct_ov101_021D13C8 * param0) Strbuf_Free(v1->unk_18); } -void ov101_021D148C (UnkStruct_ov101_021D13C8 * param0, u32 param1) +void ov101_021D148C(UnkStruct_ov101_021D13C8 *param0, u32 param1) { - UnkStruct_ov101_021D148C * v0 = ¶m0->unk_408; + UnkStruct_ov101_021D148C *v0 = ¶m0->unk_408; sub_0200E060(&v0->unk_08[0], 1, (1 + (18 + 12)), 14); BGL_FillWindow(&v0->unk_08[0], 15); @@ -472,16 +472,16 @@ void ov101_021D148C (UnkStruct_ov101_021D13C8 * param0, u32 param1) sub_0201A9A4(&v0->unk_08[0]); } -void ov101_021D14E4 (UnkStruct_ov101_021D13C8 * param0) +void ov101_021D14E4(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D148C * v0 = ¶m0->unk_408; + UnkStruct_ov101_021D148C *v0 = ¶m0->unk_408; sub_0200E084(&v0->unk_08[0], 1); BGL_FillWindow(&v0->unk_08[0], 0); sub_0201A9A4(&v0->unk_08[0]); } -static void ov101_021D150C (void) +static void ov101_021D150C(void) { UnkStruct_ov22_022559F8 v0 = { 32, 0x4000, 0x4000, 79 @@ -493,13 +493,13 @@ static void ov101_021D150C (void) sub_0201F8E4(); } -static void ov101_021D1544 (void) +static void ov101_021D1544(void) { sub_0201E958(); sub_0201F8B4(); } -static void ov101_021D1550 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D1550(UnkStruct_ov101_021D13C8 *param0) { NNS_G2dInitOamManagerModule(); @@ -508,14 +508,14 @@ static void ov101_021D1550 (UnkStruct_ov101_021D13C8 * param0) ov101_021D15BC(param0); } -static void ov101_021D15A4 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D15A4(UnkStruct_ov101_021D13C8 *param0) { ov101_021D1868(param0); ov101_021D7FB4(param0->unk_450); sub_0200A878(); } -static void ov101_021D15BC (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D15BC(UnkStruct_ov101_021D13C8 *param0) { ov101_021D80E4(param0->unk_450, (NNS_G2D_VRAM_TYPE_2DMAIN), param0->unk_438, 11, 0); ov101_021D80E4(param0->unk_450, (NNS_G2D_VRAM_TYPE_2DMAIN), param0->unk_438, 21, 1); @@ -566,24 +566,24 @@ static void ov101_021D15BC (UnkStruct_ov101_021D13C8 * param0) ov101_021D8254(param0->unk_450, 7); } -static void ov101_021D1868 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D1868(UnkStruct_ov101_021D13C8 *param0) { return; } -static void ov101_021D186C (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D186C(UnkStruct_ov101_021D13C8 *param0) { param0->unk_44C = sub_020711EC(79, 128); } -static void ov101_021D1884 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D1884(UnkStruct_ov101_021D13C8 *param0) { sub_0207121C(param0->unk_44C); } -void ov101_021D1894 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D1894 param1) +void ov101_021D1894(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D1894 param1) { - UnkStruct_ov101_021D1894 * v0 = ¶m0->unk_424; + UnkStruct_ov101_021D1894 *v0 = ¶m0->unk_424; if ((v0->unk_08 == param1) || (v0->unk_0C == param1)) { return; @@ -594,48 +594,60 @@ void ov101_021D1894 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D1894 p v0->unk_04 = 1; } -static int ov101_021D18B4 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D18B4(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D1894 * v0 = ¶m0->unk_424; + UnkStruct_ov101_021D1894 *v0 = ¶m0->unk_424; return v0->unk_04; } -static void ov101_021D18C0 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D18C0(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D1894 * v0 = ¶m0->unk_424; + UnkStruct_ov101_021D1894 *v0 = ¶m0->unk_424; v0->unk_08 = UnkEnum_ov101_021D1894_00; v0->unk_0C = UnkEnum_ov101_021D1894_03; v0->unk_10 = SysTask_Start(ov101_021D18F4, param0, 144); } -static void ov101_021D18E4 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D18E4(UnkStruct_ov101_021D13C8 *param0) { SysTask_Done(param0->unk_424.unk_10); } -static void ov101_021D18F4 (SysTask * param0, void * param1) +static void ov101_021D18F4(SysTask *param0, void *param1) { - UnkStruct_ov101_021D13C8 * v0 = param1; - UnkStruct_ov101_021D1894 * v1 = &v0->unk_424; + UnkStruct_ov101_021D13C8 *v0 = param1; + UnkStruct_ov101_021D1894 *v1 = &v0->unk_424; switch (v1->unk_00) { case 0: break; case 1: switch (v1->unk_08) { - case UnkEnum_ov101_021D1894_00: sub_020049F4(1, 1); break; - case UnkEnum_ov101_021D1894_01: sub_020055D0(1184, 0); break; - case UnkEnum_ov101_021D1894_02: sub_020055D0(1185, 0); break; + case UnkEnum_ov101_021D1894_00: + sub_020049F4(1, 1); + break; + case UnkEnum_ov101_021D1894_01: + sub_020055D0(1184, 0); + break; + case UnkEnum_ov101_021D1894_02: + sub_020055D0(1185, 0); + break; } v1->unk_00++; break; case 2: switch (v1->unk_0C) { - case UnkEnum_ov101_021D1894_00: sub_020049F4(1, 0); break; - case UnkEnum_ov101_021D1894_01: sub_02005474(1184); break; - case UnkEnum_ov101_021D1894_02: sub_02005474(1185); break; + case UnkEnum_ov101_021D1894_00: + sub_020049F4(1, 0); + break; + case UnkEnum_ov101_021D1894_01: + sub_02005474(1184); + break; + case UnkEnum_ov101_021D1894_02: + sub_02005474(1185); + break; } v1->unk_08 = v1->unk_0C; @@ -645,18 +657,18 @@ static void ov101_021D18F4 (SysTask * param0, void * param1) } } -static void ov101_021D197C (void * param0) +static void ov101_021D197C(void *param0) { - UnkStruct_ov101_021D13C8 * v0 = param0; + UnkStruct_ov101_021D13C8 *v0 = param0; sub_0201DCAC(); sub_0200A858(); sub_0201C2B8(v0->unk_43C); } -void * ov101_021D1998 (u32 param0) +void *ov101_021D1998(u32 param0) { - void * v0 = Heap_AllocFromHeap(79, param0); + void *v0 = Heap_AllocFromHeap(79, param0); GF_ASSERT(v0 != NULL); memset(v0, 0, param0); @@ -664,19 +676,19 @@ void * ov101_021D1998 (u32 param0) return v0; } -static void ov101_021D19BC (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D19BC(UnkStruct_ov101_021D13C8 *param0) { param0->unk_438 = NARC_ctor(NARC_INDEX_DATA__SLOT, 79); } -static void ov101_021D19D4 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D19D4(UnkStruct_ov101_021D13C8 *param0) { NARC_dtor(param0->unk_438); } -void * ov101_021D19E4 (UnkStruct_ov101_021D13C8 * param0, u32 param1, int param2) +void *ov101_021D19E4(UnkStruct_ov101_021D13C8 *param0, u32 param1, int param2) { - void * v0; + void *v0; u32 v1 = NARC_GetMemberSize(param0->unk_438, param1); if (param2 == 1) { @@ -692,5 +704,5 @@ void * ov101_021D19E4 (UnkStruct_ov101_021D13C8 * param0, u32 param1, int param2 } static const UnkStruct_ov61_0222C884 Unk_ov101_021D8588[1] = { - {0x0, 0x2, 0x13, 0x1A, 0x4, 0xF, 0x3D} + { 0x0, 0x2, 0x13, 0x1A, 0x4, 0xF, 0x3D } }; diff --git a/src/overlay101/ov101_021D1A28.c b/src/overlay101/ov101_021D1A28.c index 5c06d1a83c..6c9245cdfa 100644 --- a/src/overlay101/ov101_021D1A28.c +++ b/src/overlay101/ov101_021D1A28.c @@ -1,49 +1,46 @@ -#include "enums.h" +#include "overlay101/ov101_021D1A28.h" #include #include -#include "core_sys.h" - -#include "sys_task_manager.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "overlay101/const_ov101_021D9580.h" -#include "overlay101/const_ov101_021D9628.h" -#include "overlay101/const_ov101_021D9AE4.h" -#include "overlay101/const_ov101_021D9934.h" -#include "overlay101/const_ov101_021D94F0.h" #include "overlay101/const_ov101_021D94D8.h" -#include "overlay101/const_ov101_021D9538.h" -#include "overlay101/const_ov101_021D9784.h" +#include "overlay101/const_ov101_021D94F0.h" +#include "overlay101/const_ov101_021D9508.h" #include "overlay101/const_ov101_021D9520.h" -#include "overlay101/const_ov101_021D95C8.h" +#include "overlay101/const_ov101_021D9538.h" #include "overlay101/const_ov101_021D9550.h" -#include "overlay101/const_ov101_021D9508.h" -#include "overlay101/const_ov101_021D9598.h" #include "overlay101/const_ov101_021D9568.h" +#include "overlay101/const_ov101_021D9580.h" +#include "overlay101/const_ov101_021D9598.h" +#include "overlay101/const_ov101_021D95C8.h" +#include "overlay101/const_ov101_021D9628.h" #include "overlay101/const_ov101_021D9688.h" - +#include "overlay101/const_ov101_021D9784.h" +#include "overlay101/const_ov101_021D9934.h" +#include "overlay101/const_ov101_021D9AE4.h" +#include "overlay101/ov101_021D0D80.h" +#include "overlay101/ov101_021D59AC.h" #include "overlay101/struct_ov101_021D13C8.h" #include "overlay101/struct_ov101_021D2D88.h" #include "overlay101/struct_ov101_021D4714.h" #include "overlay101/struct_ov101_021D4764.h" #include "overlay101/struct_ov101_021D4F58.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D86B0.h" #include "overlay101/struct_ov101_021D95C8.h" #include "overlay101/struct_ov101_021D9784.h" #include "overlay101/struct_ov101_021D9934.h" #include "overlay101/struct_ov101_021D9AE4.h" -#include "unk_02005474.h" -#include "sys_task.h" +#include "core_sys.h" +#include "enums.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_020711EC.h" -#include "overlay101/ov101_021D0D80.h" -#include "overlay101/ov101_021D1A28.h" -#include "overlay101/ov101_021D59AC.h" typedef struct { u16 unk_00_0 : 5; @@ -60,7 +57,7 @@ typedef struct { typedef struct { UnkEnum_ov101_021D4F58 unk_00; u32 unk_04; - UnkStruct_ov101_021D13C8 * unk_08; + UnkStruct_ov101_021D13C8 *unk_08; } UnkStruct_ov101_021D5068; typedef struct { @@ -71,8 +68,8 @@ typedef struct { UnkEnum_ov101_021D4F58 unk_10; u32 unk_14; fx32 unk_18; - UnkStruct_ov101_021D13C8 * unk_1C; - UnkStruct_ov101_021D4F58 * unk_20; + UnkStruct_ov101_021D13C8 *unk_1C; + UnkStruct_ov101_021D4F58 *unk_20; } UnkStruct_ov101_021D505C; typedef struct { @@ -82,8 +79,8 @@ typedef struct { fx32 unk_0C; UnkEnum_ov101_021D4F58 unk_10; fx32 unk_14[5]; - UnkStruct_ov101_021D13C8 * unk_28; - UnkStruct_ov101_021D4F58 * unk_2C; + UnkStruct_ov101_021D13C8 *unk_28; + UnkStruct_ov101_021D4F58 *unk_2C; } UnkStruct_ov101_021D5388; typedef struct { @@ -97,115 +94,115 @@ typedef struct { int unk_00; fx32 unk_04; int unk_08; - UnkStruct_ov101_021D13C8 * unk_0C; + UnkStruct_ov101_021D13C8 *unk_0C; } UnkStruct_ov101_021D53B0; -static void ov101_021D1A68(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D2B8C(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D2BC0(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D2BDC(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1); -static void ov101_021D2BF4(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1); -static int ov101_021D2C04(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1); -static void ov101_021D2C10(SysTask * param0, void * param1); -static int ov101_021D2D88(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1); -static int ov101_021D2DC0(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1); -static int ov101_021D2DE0(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1); -static int ov101_021D2E1C(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1); -static int ov101_021D2E58(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1); -static int ov101_021D2E94(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, UnkEnum_ov101_021D9688 param2); -static int ov101_021D2FAC(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, UnkEnum_ov101_021D9688 param2); -static int ov101_021D32EC(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, UnkEnum_ov101_021D9688 param2); -static int ov101_021D3394(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, UnkEnum_ov101_021D9688 param2); -static int ov101_021D3738(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, UnkEnum_ov101_021D9688 param2); -static void ov101_021D3780(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1); -static void ov101_021D3830(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1); -static int ov101_021D3AF0(UnkStruct_ov101_021D13C8 * param0, int param1); -static int ov101_021D3B34(UnkStruct_ov101_021D13C8 * param0, int param1, UnkEnum_ov101_021D9688 param2); -static int ov101_021D3B50(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2); -static int ov101_021D3C9C(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2); -static int ov101_021D3DD4(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2); -static int ov101_021D3F0C(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2); -static int ov101_021D3F58(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2); -static int ov101_021D3FA0(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2); -static int ov101_021D38E4(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D38FC(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1); -static int ov101_021D394C(UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int * param2, int * param3, int * param4); -static void ov101_021D3FE8(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1, fx32 param2); -static fx32 ov101_021D4024(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1, fx32 param2); -static u32 ov101_021D405C(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D406C(u32 param0, u32 * param1); -static int ov101_021D4084(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D40A8(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D41EC(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D4210(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D42D0(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D4370(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D4394(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D44C4(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D44A0(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D44E8(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D44FC(UnkStruct_ov101_021D13C8 * param0); -static UnkEnum_ov101_021D4550 ov101_021D4550(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D45B0(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D45C4(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D45E8(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D45F8(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D460C(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D4614(SysTask * param0, void * param1); -static void ov101_021D4714(UnkStruct_ov101_021D4714 * param0); -static void ov101_021D4764(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D4788(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D4798(UnkStruct_ov101_021D13C8 * param0, u32 param1); -static int ov101_021D47AC(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D47B4(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D47F0(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D4D38(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D4EA4(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D4EA8(NNSG2dPaletteData * param0, int param1, u16 * param2); -static void ov101_021D4EC0(u16 param0, u16 param1, u16 param2, u16 * param3); -static void ov101_021D4F18(const u16 * param0, const u16 * param1, u16 param2, u16 * param3); -static void ov101_021D4F40(UnkStruct_ov101_021D13C8 * param0, u32 param1, int param2, u16 * param3); -static void ov101_021D4F58(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D4F58 param1); -static void ov101_021D4F78(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D4F58 param1); -static void ov101_021D4FB8(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D4F58 param1); -static void ov101_021D4FF8(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D5010(UnkStruct_ov101_021D13C8 * param0); -static UnkStruct_ov101_021D5D90 * ov101_021D5028(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D4F58 param1, u32 param2); -static int ov101_021D505C(UnkStruct_ov101_021D5D90 * param0); -static void ov101_021D5200(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D5244(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D53B0(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D53D4(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D53F8(UnkStruct_ov101_021D13C8 * param0, int param1); +static void ov101_021D1A68(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D2B8C(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D2BC0(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D2BDC(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1); +static void ov101_021D2BF4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1); +static int ov101_021D2C04(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1); +static void ov101_021D2C10(SysTask *param0, void *param1); +static int ov101_021D2D88(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1); +static int ov101_021D2DC0(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1); +static int ov101_021D2DE0(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1); +static int ov101_021D2E1C(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1); +static int ov101_021D2E58(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1); +static int ov101_021D2E94(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, UnkEnum_ov101_021D9688 param2); +static int ov101_021D2FAC(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, UnkEnum_ov101_021D9688 param2); +static int ov101_021D32EC(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, UnkEnum_ov101_021D9688 param2); +static int ov101_021D3394(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, UnkEnum_ov101_021D9688 param2); +static int ov101_021D3738(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, UnkEnum_ov101_021D9688 param2); +static void ov101_021D3780(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1); +static void ov101_021D3830(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1); +static int ov101_021D3AF0(UnkStruct_ov101_021D13C8 *param0, int param1); +static int ov101_021D3B34(UnkStruct_ov101_021D13C8 *param0, int param1, UnkEnum_ov101_021D9688 param2); +static int ov101_021D3B50(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2); +static int ov101_021D3C9C(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2); +static int ov101_021D3DD4(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2); +static int ov101_021D3F0C(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2); +static int ov101_021D3F58(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2); +static int ov101_021D3FA0(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2); +static int ov101_021D38E4(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D38FC(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1); +static int ov101_021D394C(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int *param2, int *param3, int *param4); +static void ov101_021D3FE8(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1, fx32 param2); +static fx32 ov101_021D4024(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1, fx32 param2); +static u32 ov101_021D405C(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D406C(u32 param0, u32 *param1); +static int ov101_021D4084(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D40A8(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D41EC(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D4210(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D42D0(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D4370(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D4394(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D44C4(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D44A0(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D44E8(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D44FC(UnkStruct_ov101_021D13C8 *param0); +static UnkEnum_ov101_021D4550 ov101_021D4550(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D45B0(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D45C4(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D45E8(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D45F8(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D460C(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D4614(SysTask *param0, void *param1); +static void ov101_021D4714(UnkStruct_ov101_021D4714 *param0); +static void ov101_021D4764(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D4788(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D4798(UnkStruct_ov101_021D13C8 *param0, u32 param1); +static int ov101_021D47AC(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D47B4(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D47F0(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D4D38(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D4EA4(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D4EA8(NNSG2dPaletteData *param0, int param1, u16 *param2); +static void ov101_021D4EC0(u16 param0, u16 param1, u16 param2, u16 *param3); +static void ov101_021D4F18(const u16 *param0, const u16 *param1, u16 param2, u16 *param3); +static void ov101_021D4F40(UnkStruct_ov101_021D13C8 *param0, u32 param1, int param2, u16 *param3); +static void ov101_021D4F58(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D4F58 param1); +static void ov101_021D4F78(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D4F58 param1); +static void ov101_021D4FB8(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D4F58 param1); +static void ov101_021D4FF8(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D5010(UnkStruct_ov101_021D13C8 *param0); +static UnkStruct_ov101_021D5D90 *ov101_021D5028(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D4F58 param1, u32 param2); +static int ov101_021D505C(UnkStruct_ov101_021D5D90 *param0); +static void ov101_021D5200(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D5244(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D53B0(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D53D4(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D53F8(UnkStruct_ov101_021D13C8 *param0, int param1); static int ov101_021D55F8(u32 param0); static UnkEnum_ov101_021D9688 ov101_021D5618(u32 param0); -static UnkEnum_ov101_021D9688 ov101_021D5660(UnkStruct_ov101_021D13C8 * param0); -static UnkEnum_ov101_021D9688 ov101_021D5698(UnkStruct_ov101_021D13C8 * param0); -static UnkEnum_ov101_021D9688 ov101_021D56D0(UnkStruct_ov101_021D13C8 * param0); -static UnkEnum_ov101_021D9688 ov101_021D5708(UnkStruct_ov101_021D13C8 * param0); -static UnkEnum_ov101_021D9688 ov101_021D5740(UnkStruct_ov101_021D13C8 * param0); -static UnkEnum_ov101_021D9688 ov101_021D5778(UnkStruct_ov101_021D13C8 * param0, u32 param1, u32 * param2); -static UnkEnum_ov101_021D9688 ov101_021D57EC(UnkStruct_ov101_021D13C8 * param0, u32 param1, u32 * param2); +static UnkEnum_ov101_021D9688 ov101_021D5660(UnkStruct_ov101_021D13C8 *param0); +static UnkEnum_ov101_021D9688 ov101_021D5698(UnkStruct_ov101_021D13C8 *param0); +static UnkEnum_ov101_021D9688 ov101_021D56D0(UnkStruct_ov101_021D13C8 *param0); +static UnkEnum_ov101_021D9688 ov101_021D5708(UnkStruct_ov101_021D13C8 *param0); +static UnkEnum_ov101_021D9688 ov101_021D5740(UnkStruct_ov101_021D13C8 *param0); +static UnkEnum_ov101_021D9688 ov101_021D5778(UnkStruct_ov101_021D13C8 *param0, u32 param1, u32 *param2); +static UnkEnum_ov101_021D9688 ov101_021D57EC(UnkStruct_ov101_021D13C8 *param0, u32 param1, u32 *param2); static UnkEnum_ov101_021D5814 ov101_021D5814(u32 param0); -static void ov101_021D5848(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D5858(UnkStruct_ov101_021D13C8 * param0, u32 param1); -static int ov101_021D5880(UnkStruct_ov101_021D13C8 * param0); -static int ov101_021D58C0(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D58F4(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1); -static void ov101_021D5938(UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1); -static u32 ov101_021D597C(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D4824(SysTask * param0, void * param1); -static void ov101_021D542C(SysTask * param0, void * param1); -static void ov101_021D548C(SysTask * param0, void * param1); -static void ov101_021D54EC(SysTask * param0, void * param1); +static void ov101_021D5848(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D5858(UnkStruct_ov101_021D13C8 *param0, u32 param1); +static int ov101_021D5880(UnkStruct_ov101_021D13C8 *param0); +static int ov101_021D58C0(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D58F4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1); +static void ov101_021D5938(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1); +static u32 ov101_021D597C(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D4824(SysTask *param0, void *param1); +static void ov101_021D542C(SysTask *param0, void *param1); +static void ov101_021D548C(SysTask *param0, void *param1); +static void ov101_021D54EC(SysTask *param0, void *param1); static const UnkStruct_ov101_021D87A8 Unk_ov101_021D87A8[6]; static const int Unk_ov101_021D8740[3][2]; -static int(*const Unk_ov101_021D8838[64])(UnkStruct_ov101_021D13C8 *); -static int(*const Unk_ov101_021D86C4[5])(UnkStruct_ov101_021D2D88 *, UnkStruct_ov101_021D13C8 *); -static int(*const * const Unk_ov101_021D8774[13])(UnkStruct_ov101_021D4764 *); +static int (*const Unk_ov101_021D8838[64])(UnkStruct_ov101_021D13C8 *); +static int (*const Unk_ov101_021D86C4[5])(UnkStruct_ov101_021D2D88 *, UnkStruct_ov101_021D13C8 *); +static int (*const *const Unk_ov101_021D8774[13])(UnkStruct_ov101_021D4764 *); -void ov101_021D1A28 (UnkStruct_ov101_021D13C8 * param0) +void ov101_021D1A28(UnkStruct_ov101_021D13C8 *param0) { ov101_021D1A68(param0); ov101_021D2B8C(param0); @@ -214,7 +211,7 @@ void ov101_021D1A28 (UnkStruct_ov101_021D13C8 * param0) ov101_021D4D38(param0); } -void ov101_021D1A4C (UnkStruct_ov101_021D13C8 * param0) +void ov101_021D1A4C(UnkStruct_ov101_021D13C8 *param0) { ov101_021D2BC0(param0); ov101_021D45E8(param0); @@ -222,7 +219,7 @@ void ov101_021D1A4C (UnkStruct_ov101_021D13C8 * param0) ov101_021D4EA4(param0); } -static void ov101_021D1A68 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D1A68(UnkStruct_ov101_021D13C8 *param0) { int v0, v1; fx32 v2; @@ -230,12 +227,12 @@ static void ov101_021D1A68 (UnkStruct_ov101_021D13C8 * param0) for (v0 = 0; v0 < 3; v0++) { v1 = (int)LCRNG_Next() % 21; param0->unk_A8[v0] = v1; - param0->unk_90[v0] = (FX32_ONE * ((21 * 32))) - ((FX32_ONE * ((v1) * 32))); - param0->unk_90[v0] %= (FX32_ONE * ((21 * 32))); + param0->unk_90[v0] = (FX32_ONE * (21 * 32)) - (FX32_ONE * ((v1) * 32)); + param0->unk_90[v0] %= (FX32_ONE * (21 * 32)); } } -int ov101_021D1AAC (UnkStruct_ov101_021D13C8 * param0) +int ov101_021D1AAC(UnkStruct_ov101_021D13C8 *param0) { int v0; @@ -250,11 +247,11 @@ int ov101_021D1AAC (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1AD0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1AD0(UnkStruct_ov101_021D13C8 *param0) { param0->unk_64 = 0; param0->unk_68 = 0; - param0->unk_8C = ((FX32_ONE * 16)); + param0->unk_8C = (FX32_ONE * 16); param0->unk_74 = 0; param0->unk_08 = 0; param0->unk_00 = 1; @@ -279,7 +276,7 @@ static int ov101_021D1AD0 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D1B40 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1B40(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D55F8(PAD_BUTTON_START) != 0) { ov101_021D5244(param0); @@ -302,7 +299,7 @@ static int ov101_021D1B40 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1B9C (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1B9C(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D55F8(PAD_BUTTON_START) != 0) { param0->unk_60 += 3; @@ -310,7 +307,7 @@ static int ov101_021D1B9C (UnkStruct_ov101_021D13C8 * param0) return 0; } - if (ov101_021D55F8((PAD_KEY_DOWN | PAD_BUTTON_X)) != 0) { + if (ov101_021D55F8(PAD_KEY_DOWN | PAD_BUTTON_X) != 0) { param0->unk_00 = 3; return 1; } @@ -318,7 +315,7 @@ static int ov101_021D1B9C (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1BD0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1BD0(UnkStruct_ov101_021D13C8 *param0) { ov101_021D40A8(param0); @@ -326,7 +323,7 @@ static int ov101_021D1BD0 (UnkStruct_ov101_021D13C8 * param0) param0->unk_464++; param0->unk_70 = 0; - if ((param0->unk_74 & ((1 << 0) | (1 << 1) | (1 << 4) | (1 << 5)))) { + if (param0->unk_74 & ((1 << 0) | (1 << 1) | (1 << 4) | (1 << 5))) { param0->unk_70 = 1; } @@ -365,11 +362,11 @@ static int ov101_021D1BD0 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D1C9C (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1C9C(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C >= ((FX32_ONE * 8))) { + if (param0->unk_6C >= (FX32_ONE * 8)) { param0->unk_6C = 0; param0->unk_00 = 5; return 1; @@ -378,7 +375,7 @@ static int ov101_021D1C9C (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1CBC (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1CBC(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = gCoreSys.pressedKeys; @@ -425,7 +422,7 @@ static int ov101_021D1CBC (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1DB4 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1DB4(UnkStruct_ov101_021D13C8 *param0) { if ((ov101_021D2C04(param0, 0) == 1) || (ov101_021D2C04(param0, 1) == 1) || (ov101_021D2C04(param0, 2) == 1)) { return 0; @@ -436,19 +433,19 @@ static int ov101_021D1DB4 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D1DEC (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1DEC(UnkStruct_ov101_021D13C8 *param0) { UnkEnum_ov101_021D9688 v0 = ov101_021D5778(param0, param0->unk_74, ¶m0->unk_48); param0->unk_44 = v0; if (v0 == 6) { - if ((param0->unk_74 & ((1 << 1) | (1 << 3) | (1 << 5) | (1 << 7)))) { + if (param0->unk_74 & ((1 << 1) | (1 << 3) | (1 << 5) | (1 << 7))) { param0->unk_00 = 16; return 1; } - if ((param0->unk_74 != 0)) { + if (param0->unk_74 != 0) { param0->unk_00 = 10; return 1; } @@ -457,8 +454,8 @@ static int ov101_021D1DEC (UnkStruct_ov101_021D13C8 * param0) return 1; } - if ((param0->unk_74 & ((1 << 1) | (1 << 3) | (1 << 5) | (1 << 7)))) { - if ((param0->unk_74 & (1 << 1))) { + if (param0->unk_74 & ((1 << 1) | (1 << 3) | (1 << 5) | (1 << 7))) { + if (param0->unk_74 & (1 << 1)) { param0->unk_00 = 21; } else { param0->unk_00 = 19; @@ -476,7 +473,7 @@ static int ov101_021D1DEC (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D1E54 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1E54(UnkStruct_ov101_021D13C8 *param0) { ov101_021D4FF8(param0); @@ -486,11 +483,11 @@ static int ov101_021D1E54 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D1E68 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1E68(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C >= ((FX32_ONE * 8))) { + if (param0->unk_6C >= (FX32_ONE * 8)) { param0->unk_6C = 0; param0->unk_00 = 0; } @@ -498,7 +495,7 @@ static int ov101_021D1E68 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1E84 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1E84(UnkStruct_ov101_021D13C8 *param0) { ov101_021D4FF8(param0); ov101_021D4798(param0, 2); @@ -507,7 +504,7 @@ static int ov101_021D1E84 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1E9C (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1E9C(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D47AC(param0) == 1) { ov101_021D4798(param0, 0); @@ -518,7 +515,7 @@ static int ov101_021D1E9C (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1EBC (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1EBC(UnkStruct_ov101_021D13C8 *param0) { param0->unk_64 = ov101_021D597C(param0); param0->unk_458 += param0->unk_64; @@ -531,13 +528,13 @@ static int ov101_021D1EBC (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1EEC (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1EEC(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C == ((FX32_ONE * 30))) { + if (param0->unk_6C == (FX32_ONE * 30)) { ov101_021D4798(param0, 2); - } else if (param0->unk_6C > ((FX32_ONE * 30))) { + } else if (param0->unk_6C > (FX32_ONE * 30)) { if ((ov101_021D460C(param0) == 1) && (ov101_021D47AC(param0) == 1)) { ov101_021D4798(param0, 0); param0->unk_6C = 0; @@ -549,7 +546,7 @@ static int ov101_021D1EEC (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1F34 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1F34(UnkStruct_ov101_021D13C8 *param0) { param0->unk_64 = 0; param0->unk_6C = 0; @@ -561,13 +558,13 @@ static int ov101_021D1F34 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1F54 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1F54(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C == ((FX32_ONE * 15))) { + if (param0->unk_6C == (FX32_ONE * 15)) { ov101_021D4798(param0, 2); - } else if (param0->unk_6C > ((FX32_ONE * 15))) { + } else if (param0->unk_6C > (FX32_ONE * 15)) { if ((ov101_021D460C(param0) == 1) && (ov101_021D47AC(param0) == 1)) { ov101_021D4798(param0, 0); param0->unk_6C = 0; @@ -579,7 +576,7 @@ static int ov101_021D1F54 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1FA0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1FA0(UnkStruct_ov101_021D13C8 *param0) { ov101_021D4FF8(param0); ov101_021D4210(param0); @@ -592,11 +589,11 @@ static int ov101_021D1FA0 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1FC8 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1FC8(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C >= ((FX32_ONE * 8))) { + if (param0->unk_6C >= (FX32_ONE * 8)) { ov101_021D4798(param0, 3); ov101_021D1894(param0, UnkEnum_ov101_021D1894_01); param0->unk_00 = 18; @@ -605,7 +602,7 @@ static int ov101_021D1FC8 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D1FF4 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D1FF4(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D47AC(param0) == 1) { param0->unk_00 = 23; @@ -615,7 +612,7 @@ static int ov101_021D1FF4 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D200C (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D200C(UnkStruct_ov101_021D13C8 *param0) { param0->unk_64 = ov101_021D597C(param0); param0->unk_6C = 0; @@ -629,14 +626,14 @@ static int ov101_021D200C (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D203C (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D203C(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C == ((FX32_ONE * 30))) { + if (param0->unk_6C == (FX32_ONE * 30)) { ov101_021D1894(param0, UnkEnum_ov101_021D1894_01); ov101_021D4798(param0, 3); - } else if (param0->unk_6C >= ((FX32_ONE * 30))) { + } else if (param0->unk_6C >= (FX32_ONE * 30)) { if ((ov101_021D460C(param0) == 1) && (ov101_021D47AC(param0) == 1)) { param0->unk_6C = 0; param0->unk_00 = 23; @@ -647,7 +644,7 @@ static int ov101_021D203C (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2088 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2088(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C = 0; param0->unk_00 = 22; @@ -660,14 +657,14 @@ static int ov101_021D2088 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D20B0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D20B0(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C == ((FX32_ONE * 8))) { + if (param0->unk_6C == (FX32_ONE * 8)) { ov101_021D4798(param0, 3); ov101_021D1894(param0, UnkEnum_ov101_021D1894_01); - } else if (param0->unk_6C >= ((FX32_ONE * 8))) { + } else if (param0->unk_6C >= (FX32_ONE * 8)) { if ((ov101_021D460C(param0) == 1) && (ov101_021D47AC(param0) == 1)) { param0->unk_6C = 0; param0->unk_00 = 24; @@ -678,14 +675,14 @@ static int ov101_021D20B0 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D20FC (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D20FC(UnkStruct_ov101_021D13C8 *param0) { GF_ASSERT(param0->unk_50 < UnkEnum_ov101_021D9934_06); param0->unk_00 = 25; return 1; } -static int ov101_021D2114 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2114(UnkStruct_ov101_021D13C8 *param0) { GF_ASSERT(param0->unk_50 < UnkEnum_ov101_021D9934_06); param0->unk_00 = 28; @@ -693,7 +690,7 @@ static int ov101_021D2114 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D212C (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D212C(UnkStruct_ov101_021D13C8 *param0) { param0->unk_64 = 0; param0->unk_68 = 0; @@ -721,7 +718,7 @@ static int ov101_021D212C (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2198 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2198(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D55F8(PAD_BUTTON_START) != 0) { param0->unk_00 = 63; @@ -744,7 +741,7 @@ static int ov101_021D2198 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D21F4 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D21F4(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D55F8(PAD_BUTTON_START) != 0) { param0->unk_60 += 3; @@ -752,7 +749,7 @@ static int ov101_021D21F4 (UnkStruct_ov101_021D13C8 * param0) return 0; } - if (ov101_021D55F8((PAD_KEY_DOWN | PAD_BUTTON_X)) != 0) { + if (ov101_021D55F8(PAD_KEY_DOWN | PAD_BUTTON_X) != 0) { param0->unk_00 = 28; return 1; } @@ -760,7 +757,7 @@ static int ov101_021D21F4 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2228 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2228(UnkStruct_ov101_021D13C8 *param0) { ov101_021D4394(param0); @@ -768,7 +765,7 @@ static int ov101_021D2228 (UnkStruct_ov101_021D13C8 * param0) param0->unk_468++; param0->unk_70 = 0; - if ((param0->unk_74 & ((1 << 0) | (1 << 1) | (1 << 4) | (1 << 5)))) { + if (param0->unk_74 & ((1 << 0) | (1 << 1) | (1 << 4) | (1 << 5))) { param0->unk_70 = 1; } @@ -801,11 +798,11 @@ static int ov101_021D2228 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D22D0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D22D0(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C >= ((FX32_ONE * 8))) { + if (param0->unk_6C >= (FX32_ONE * 8)) { param0->unk_6C = 0; param0->unk_00 = 30; @@ -815,7 +812,7 @@ static int ov101_021D22D0 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D22F0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D22F0(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = gCoreSys.pressedKeys; @@ -862,7 +859,7 @@ static int ov101_021D22F0 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D23E8 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D23E8(UnkStruct_ov101_021D13C8 *param0) { if ((ov101_021D2C04(param0, 0) == 1) || (ov101_021D2C04(param0, 1) == 1) || (ov101_021D2C04(param0, 2) == 1)) { return 0; @@ -873,7 +870,7 @@ static int ov101_021D23E8 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2420 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2420(UnkStruct_ov101_021D13C8 *param0) { UnkEnum_ov101_021D9688 v0 = ov101_021D5778(param0, param0->unk_74, ¶m0->unk_48); @@ -884,7 +881,7 @@ static int ov101_021D2420 (UnkStruct_ov101_021D13C8 * param0) return 1; } - if ((param0->unk_74 & ((1 << 8) | (1 << 9)))) { + if (param0->unk_74 & ((1 << 8) | (1 << 9))) { param0->unk_00 = 39; return 1; } @@ -898,7 +895,7 @@ static int ov101_021D2420 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2464 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2464(UnkStruct_ov101_021D13C8 *param0) { ov101_021D4FF8(param0); ov101_021D4798(param0, 7); @@ -909,11 +906,11 @@ static int ov101_021D2464 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2480 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2480(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C >= ((FX32_ONE * 8))) { + if (param0->unk_6C >= (FX32_ONE * 8)) { param0->unk_6C = 0; param0->unk_00 = 25; @@ -923,7 +920,7 @@ static int ov101_021D2480 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D24A0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D24A0(UnkStruct_ov101_021D13C8 *param0) { param0->unk_64 = ov101_021D597C(param0); param0->unk_458 += param0->unk_64; @@ -936,7 +933,7 @@ static int ov101_021D24A0 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D24D0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D24D0(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D460C(param0) == 1) { ov101_021D4798(param0, 7); @@ -947,7 +944,7 @@ static int ov101_021D24D0 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D24F0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D24F0(UnkStruct_ov101_021D13C8 *param0) { param0->unk_64 = 0; param0->unk_6C = 0; @@ -959,11 +956,11 @@ static int ov101_021D24F0 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2510 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2510(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C > ((FX32_ONE * 15))) { + if (param0->unk_6C > (FX32_ONE * 15)) { if (ov101_021D460C(param0) == 1) { ov101_021D4798(param0, 7); ov101_021D4FF8(param0); @@ -978,7 +975,7 @@ static int ov101_021D2510 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D254C (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D254C(UnkStruct_ov101_021D13C8 *param0) { param0->unk_64 = ov101_021D597C(param0); param0->unk_458 += param0->unk_64; @@ -995,7 +992,7 @@ static int ov101_021D254C (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2598 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2598(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D460C(param0) == 1) { sub_0207136C(param0->unk_454); @@ -1007,7 +1004,7 @@ static int ov101_021D2598 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D25C4 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D25C4(UnkStruct_ov101_021D13C8 *param0) { ov101_021D47B4(param0); @@ -1019,7 +1016,7 @@ static int ov101_021D25C4 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D25DC (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D25DC(UnkStruct_ov101_021D13C8 *param0) { param0->unk_0C++; param0->unk_1C++; @@ -1044,7 +1041,7 @@ static int ov101_021D25DC (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2628 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2628(UnkStruct_ov101_021D13C8 *param0) { param0->unk_10--; GF_ASSERT((int)param0->unk_10 >= 1); @@ -1072,7 +1069,7 @@ static int ov101_021D2628 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D269C (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D269C(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D55F8(PAD_BUTTON_START) != 0) { param0->unk_00 = 63; @@ -1100,7 +1097,7 @@ static int ov101_021D269C (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2704 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2704(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D55F8(PAD_BUTTON_START) != 0) { param0->unk_60 += 1; @@ -1108,7 +1105,7 @@ static int ov101_021D2704 (UnkStruct_ov101_021D13C8 * param0) return 0; } - if (ov101_021D55F8((PAD_KEY_DOWN | PAD_BUTTON_X)) != 0) { + if (ov101_021D55F8(PAD_KEY_DOWN | PAD_BUTTON_X) != 0) { param0->unk_00 = 46; return 1; } @@ -1116,7 +1113,7 @@ static int ov101_021D2704 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2738 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2738(UnkStruct_ov101_021D13C8 *param0) { param0->unk_460++; param0->unk_46C++; @@ -1168,11 +1165,11 @@ static int ov101_021D2738 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2828 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2828(UnkStruct_ov101_021D13C8 *param0) { param0->unk_6C += FX32_ONE; - if (param0->unk_6C >= ((FX32_ONE * 8))) { + if (param0->unk_6C >= (FX32_ONE * 8)) { param0->unk_6C = 0; param0->unk_00 = 48; ov101_021D4798(param0, 6); @@ -1182,7 +1179,7 @@ static int ov101_021D2828 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2850 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2850(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = gCoreSys.pressedKeys; @@ -1231,7 +1228,7 @@ static int ov101_021D2850 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2950 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2950(UnkStruct_ov101_021D13C8 *param0) { if ((ov101_021D2C04(param0, 0) == 1) || (ov101_021D2C04(param0, 1) == 1) || (ov101_021D2C04(param0, 2) == 1)) { return 0; @@ -1242,7 +1239,7 @@ static int ov101_021D2950 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2988 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2988(UnkStruct_ov101_021D13C8 *param0) { UnkEnum_ov101_021D9688 v0 = ov101_021D57EC(param0, param0->unk_74, ¶m0->unk_48); @@ -1266,7 +1263,7 @@ static int ov101_021D2988 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D29C0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D29C0(UnkStruct_ov101_021D13C8 *param0) { ov101_021D4FF8(param0); ov101_021D4798(param0, 7); @@ -1280,7 +1277,7 @@ static int ov101_021D29C0 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D29E4 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D29E4(UnkStruct_ov101_021D13C8 *param0) { param0->unk_64 = Unk_ov101_021D94F0[param0->unk_44]; param0->unk_458 += param0->unk_64; @@ -1294,7 +1291,7 @@ static int ov101_021D29E4 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2A18 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2A18(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D460C(param0) == 0) { return 0; @@ -1311,7 +1308,7 @@ static int ov101_021D2A18 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2A44 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2A44(UnkStruct_ov101_021D13C8 *param0) { param0->unk_10--; GF_ASSERT(param0->unk_10 == 0); @@ -1326,7 +1323,7 @@ static int ov101_021D2A44 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2A78 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2A78(UnkStruct_ov101_021D13C8 *param0) { UnkEnum_ov101_021D4550 v0; @@ -1354,7 +1351,7 @@ static int ov101_021D2A78 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2AC8 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2AC8(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D47AC(param0) == 0) { return 0; @@ -1364,7 +1361,7 @@ static int ov101_021D2AC8 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2AE0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2AE0(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D47AC(param0) == 0) { return 0; @@ -1374,7 +1371,7 @@ static int ov101_021D2AE0 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2AF8 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2AF8(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D47AC(param0) == 0) { return 0; @@ -1391,28 +1388,28 @@ static int ov101_021D2AF8 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D2B28 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2B28(UnkStruct_ov101_021D13C8 *param0) { ov101_021D148C(param0, 0); param0->unk_00 = 62; return 0; } -static int ov101_021D2B3C (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2B3C(UnkStruct_ov101_021D13C8 *param0) { ov101_021D148C(param0, 2); param0->unk_00 = 62; return 0; } -static int ov101_021D2B50 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2B50(UnkStruct_ov101_021D13C8 *param0) { ov101_021D148C(param0, 1); param0->unk_00 = 62; return 0; } -static int ov101_021D2B64 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2B64(UnkStruct_ov101_021D13C8 *param0) { if (ov101_021D55F8(PAD_BUTTON_A | PAD_BUTTON_B)) { ov101_021D14E4(param0); @@ -1422,13 +1419,13 @@ static int ov101_021D2B64 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D2B80 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D2B80(UnkStruct_ov101_021D13C8 *param0) { ov101_021D5244(param0); return 2; } -static int(*const Unk_ov101_021D8838[64])(UnkStruct_ov101_021D13C8 *) = { +static int (*const Unk_ov101_021D8838[64])(UnkStruct_ov101_021D13C8 *) = { ov101_021D1AD0, ov101_021D1B40, ov101_021D1B9C, @@ -1495,67 +1492,69 @@ static int(*const Unk_ov101_021D8838[64])(UnkStruct_ov101_021D13C8 *) = { ov101_021D2B80 }; -static void ov101_021D2B8C (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D2B8C(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = 0; - UnkStruct_ov101_021D2D88 * v1 = param0->unk_B4; + UnkStruct_ov101_021D2D88 *v1 = param0->unk_B4; do { v1->unk_00 = 0; v1->unk_10 = v0; v1->unk_20 = param0; v1->unk_1C = SysTask_Start(ov101_021D2C10, ¶m0->unk_B4[v0], 129 + v0); - v1++; v0++; + v1++; + v0++; } while (v0 < 3); } -static void ov101_021D2BC0 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D2BC0(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = 0; do { - SysTask_Done(param0->unk_B4[v0].unk_1C); v0++; + SysTask_Done(param0->unk_B4[v0].unk_1C); + v0++; } while (v0 < 3); } -static void ov101_021D2BDC (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1) +static void ov101_021D2BDC(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1) { param0->unk_B4[param1].unk_00 = 1; param0->unk_B4[param1].unk_04 = 1; } -static void ov101_021D2BF4 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1) +static void ov101_021D2BF4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1) { param0->unk_B4[param1].unk_00 = 2; } -static int ov101_021D2C04 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1) +static int ov101_021D2C04(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1) { return param0->unk_B4[param1].unk_04; } -static void ov101_021D2C10 (SysTask * param0, void * param1) +static void ov101_021D2C10(SysTask *param0, void *param1) { - UnkStruct_ov101_021D2D88 * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_20; + UnkStruct_ov101_021D2D88 *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_20; while (Unk_ov101_021D86C4[v0->unk_00](v0, v1) == 1) { (void)0; } } -static int ov101_021D2C30 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D2C30(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { return 0; } -static int ov101_021D2C34 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D2C34(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { ov101_021D3FE8(param1, param0->unk_10, param1->unk_8C); return 0; } -static int ov101_021D2C4C (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D2C4C(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { param0->unk_00++; param0->unk_14 = 0; @@ -1584,7 +1583,7 @@ static int ov101_021D2C4C (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 1; } -static int ov101_021D2CA8 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D2CA8(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { fx32 v0, v1; int v2 = param0->unk_10; @@ -1609,7 +1608,7 @@ static int ov101_021D2CA8 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 } if ((v0 == 0) && (param0->unk_18 == 0)) { - fx32 v4[5] = {(FX32_ONE * 4), (FX32_ONE * 8), (FX32_ONE * 8), (FX32_ONE * 8), (FX32_ONE * 16)}; + fx32 v4[5] = { (FX32_ONE * 4), (FX32_ONE * 8), (FX32_ONE * 8), (FX32_ONE * 8), (FX32_ONE * 16) }; s32 v5 = param0->unk_18; if (v5 > 4) { @@ -1628,7 +1627,7 @@ static int ov101_021D2CA8 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D2D50 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D2D50(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { int v0 = param0->unk_10; @@ -1649,7 +1648,7 @@ static int ov101_021D2D50 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int(*const Unk_ov101_021D86C4[5])(UnkStruct_ov101_021D2D88 *, UnkStruct_ov101_021D13C8 *) = { +static int (*const Unk_ov101_021D86C4[5])(UnkStruct_ov101_021D2D88 *, UnkStruct_ov101_021D13C8 *) = { ov101_021D2C30, ov101_021D2C34, ov101_021D2C4C, @@ -1657,7 +1656,7 @@ static int(*const Unk_ov101_021D86C4[5])(UnkStruct_ov101_021D2D88 *, UnkStruct_o ov101_021D2D50, }; -static int ov101_021D2D88 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D2D88(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { if (param1->unk_74 == 0) { return 0; @@ -1676,7 +1675,7 @@ static int ov101_021D2D88 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D2DC0 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D2DC0(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { if (param1->unk_74 == 0) { return 0; @@ -1688,7 +1687,7 @@ static int ov101_021D2DC0 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 } } -static int ov101_021D2DE0 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D2DE0(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { UnkEnum_ov101_021D9688 v0 = ov101_021D5618(param1->unk_74); @@ -1703,7 +1702,7 @@ static int ov101_021D2DE0 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return ov101_021D2FAC(param0, param1, v0); } -static int ov101_021D2E1C (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D2E1C(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { UnkEnum_ov101_021D9688 v0 = ov101_021D5618(param1->unk_74); @@ -1718,7 +1717,7 @@ static int ov101_021D2E1C (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return ov101_021D3394(param0, param1, v0); } -static int ov101_021D2E58 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D2E58(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { UnkEnum_ov101_021D9688 v0 = ov101_021D5618(param1->unk_74); @@ -1733,7 +1732,7 @@ static int ov101_021D2E58 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return ov101_021D3394(param0, param1, v0); } -static int ov101_021D2E94 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, UnkEnum_ov101_021D9688 param2) +static int ov101_021D2E94(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, UnkEnum_ov101_021D9688 param2) { int v0, v1, v2, v3, v4; int v5 = param0->unk_10; @@ -1791,7 +1790,7 @@ static int ov101_021D2E94 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D2FAC (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, UnkEnum_ov101_021D9688 param2) +static int ov101_021D2FAC(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, UnkEnum_ov101_021D9688 param2) { int v0, v1, v2, v3, v4, v5; int v6 = param0->unk_10; @@ -1842,7 +1841,7 @@ static int ov101_021D2FAC (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 if (v4 == 0) { for (v0 = 1; v0 <= v5; v0++) { - if ((v0 & 0x1)) { + if (v0 & 0x1) { if (ov101_021D55D4(param1, v6, v2 - v0) == param2) { if (ov101_021D3B34(param1, v0, param2) == 1) { param0->unk_14 = v2; @@ -1953,7 +1952,7 @@ static int ov101_021D2FAC (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D32EC (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, UnkEnum_ov101_021D9688 param2) +static int ov101_021D32EC(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, UnkEnum_ov101_021D9688 param2) { int v0, v1, v2; int v3 = param0->unk_10; @@ -1997,7 +1996,7 @@ static int ov101_021D32EC (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D3394 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, UnkEnum_ov101_021D9688 param2) +static int ov101_021D3394(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, UnkEnum_ov101_021D9688 param2) { int v0, v1, v2, v3, v4, v5, v6 = 4, v7 = param0->unk_10; @@ -2044,7 +2043,7 @@ static int ov101_021D3394 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 v2 = (int)param1->unk_A8[v7]; if (v5 == 0) { - if ((v2 & 0x1)) { + if (v2 & 0x1) { for (v0 = 1; v0 <= v6; v0++) { if (ov101_021D55D4(param1, v7, v3 - v0) == param2) { param0->unk_14 = v3; @@ -2160,7 +2159,7 @@ static int ov101_021D3394 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D3738 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, UnkEnum_ov101_021D9688 param2) +static int ov101_021D3738(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, UnkEnum_ov101_021D9688 param2) { int v0, v1, v2; int v3 = param0->unk_10; @@ -2182,7 +2181,7 @@ static int ov101_021D3738 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static void ov101_021D3780 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static void ov101_021D3780(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { int v0, v1; @@ -2241,7 +2240,7 @@ static void ov101_021D3780 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_0 GF_ASSERT(FALSE); } -static void ov101_021D3830 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static void ov101_021D3830(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { int v0, v1; @@ -2297,7 +2296,7 @@ static void ov101_021D3830 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_0 GF_ASSERT(FALSE); } -static int ov101_021D38E4 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D38E4(UnkStruct_ov101_021D13C8 *param0) { int v0 = 0, v1 = 0; @@ -2312,7 +2311,7 @@ static int ov101_021D38E4 (UnkStruct_ov101_021D13C8 * param0) return v1; } -static int ov101_021D38FC (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1) +static int ov101_021D38FC(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1) { switch (param0->unk_10) { case 0: @@ -2338,14 +2337,14 @@ static int ov101_021D38FC (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 1; } -static int ov101_021D394C (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int * param2, int * param3, int * param4) +static int ov101_021D394C(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int *param2, int *param3, int *param4) { UnkEnum_ov101_021D394C v0 = param1->unk_7C[0]; UnkEnum_ov101_021D394C v1 = param1->unk_7C[1]; UnkEnum_ov101_021D394C v2 = param1->unk_7C[2]; - UnkStruct_ov101_021D2D88 * v3 = ¶m1->unk_B4[0]; - UnkStruct_ov101_021D2D88 * v4 = ¶m1->unk_B4[1]; - UnkStruct_ov101_021D2D88 * v5 = ¶m1->unk_B4[2]; + UnkStruct_ov101_021D2D88 *v3 = ¶m1->unk_B4[0]; + UnkStruct_ov101_021D2D88 *v4 = ¶m1->unk_B4[1]; + UnkStruct_ov101_021D2D88 *v5 = ¶m1->unk_B4[2]; int v6 = v3->unk_14; int v7 = v4->unk_14; int v8 = v5->unk_14; @@ -2475,7 +2474,7 @@ static int ov101_021D394C (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D3AF0 (UnkStruct_ov101_021D13C8 * param0, int param1) +static int ov101_021D3AF0(UnkStruct_ov101_021D13C8 *param0, int param1) { u32 v0; @@ -2500,7 +2499,7 @@ static int ov101_021D3AF0 (UnkStruct_ov101_021D13C8 * param0, int param1) return 0; } -static int ov101_021D3B34 (UnkStruct_ov101_021D13C8 * param0, int param1, UnkEnum_ov101_021D9688 param2) +static int ov101_021D3B34(UnkStruct_ov101_021D13C8 *param0, int param1, UnkEnum_ov101_021D9688 param2) { if (param2 == 3) { return 1; @@ -2513,7 +2512,7 @@ static int ov101_021D3B34 (UnkStruct_ov101_021D13C8 * param0, int param1, UnkEnu return 0; } -static int ov101_021D3B50 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2) +static int ov101_021D3B50(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2) { u32 v0, v1, v2; int v3 = param1->unk_B4[1].unk_18; @@ -2562,7 +2561,7 @@ static int ov101_021D3B50 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D3C9C (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2) +static int ov101_021D3C9C(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2) { u32 v0, v1, v2; int v3 = param1->unk_B4[0].unk_18; @@ -2611,7 +2610,7 @@ static int ov101_021D3C9C (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D3DD4 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2) +static int ov101_021D3DD4(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2) { u32 v0, v1, v2; int v3 = param1->unk_B4[0].unk_18; @@ -2660,7 +2659,7 @@ static int ov101_021D3DD4 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D3F0C (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2) +static int ov101_021D3F0C(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2) { u32 v0, v1, v2; int v3 = param1->unk_B4[1].unk_18; @@ -2677,7 +2676,7 @@ static int ov101_021D3F0C (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D3F58 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2) +static int ov101_021D3F58(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2) { u32 v0, v1, v2; int v3 = param1->unk_B4[0].unk_18; @@ -2694,7 +2693,7 @@ static int ov101_021D3F58 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static int ov101_021D3FA0 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_021D13C8 * param1, int param2) +static int ov101_021D3FA0(UnkStruct_ov101_021D2D88 *param0, UnkStruct_ov101_021D13C8 *param1, int param2) { u32 v0, v1, v2; int v3 = param1->unk_B4[0].unk_18; @@ -2711,14 +2710,14 @@ static int ov101_021D3FA0 (UnkStruct_ov101_021D2D88 * param0, UnkStruct_ov101_02 return 0; } -static void ov101_021D3FE8 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1, fx32 param2) +static void ov101_021D3FE8(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1, fx32 param2) { param0->unk_90[param1] += param2; - param0->unk_90[param1] %= (FX32_ONE * ((21 * 32))); - param0->unk_A8[param1] = 21 - ((((param0->unk_90[param1]) / FX32_ONE)) / 32); + param0->unk_90[param1] %= (FX32_ONE * (21 * 32)); + param0->unk_A8[param1] = 21 - (((param0->unk_90[param1]) / FX32_ONE) / 32); } -static fx32 ov101_021D4024 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1, fx32 param2) +static fx32 ov101_021D4024(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1, fx32 param2) { fx32 v0; @@ -2736,13 +2735,13 @@ static fx32 ov101_021D4024 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021 return v0; } -static u32 ov101_021D405C (UnkStruct_ov101_021D13C8 * param0) +static u32 ov101_021D405C(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = ((u32)LCRNG_Next()) % 100; return v0; } -static int ov101_021D406C (u32 param0, u32 * param1) +static int ov101_021D406C(u32 param0, u32 *param1) { u32 v0 = *param1; @@ -2759,7 +2758,7 @@ static int ov101_021D406C (u32 param0, u32 * param1) return 0; } -static int ov101_021D4084 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D4084(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = ov101_021D405C(param0); u32 v1 = Unk_ov101_021D9520[param0->unk_88]; @@ -2771,13 +2770,13 @@ static int ov101_021D4084 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D40A8 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D40A8(UnkStruct_ov101_021D13C8 *param0) { param0->unk_74 = 0; if (ov101_021D4084(param0) == 1) { u32 v0 = ov101_021D405C(param0); - const UnkStruct_ov101_021D95C8 * v1 = &Unk_ov101_021D95C8[param0->unk_88]; + const UnkStruct_ov101_021D95C8 *v1 = &Unk_ov101_021D95C8[param0->unk_88]; param0->unk_470++; @@ -2832,7 +2831,7 @@ static int ov101_021D40A8 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D41EC (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D41EC(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = ov101_021D405C(param0); u32 v1 = Unk_ov101_021D94D8[param0->unk_88]; @@ -2844,11 +2843,11 @@ static int ov101_021D41EC (UnkStruct_ov101_021D13C8 * param0) return 0; } -static void ov101_021D4210 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D4210(UnkStruct_ov101_021D13C8 *param0) { int v0; u32 v1 = ov101_021D405C(param0); - const UnkStruct_ov101_021D9934 * v2 = Unk_ov101_021D9934[param0->unk_88]; + const UnkStruct_ov101_021D9934 *v2 = Unk_ov101_021D9934[param0->unk_88]; for (v0 = 0; v0 < UnkEnum_ov101_021D9934_06; v0++) { if (ov101_021D406C(v2[v0].unk_00, &v1) == 1) { @@ -2881,10 +2880,10 @@ static void ov101_021D4210 (UnkStruct_ov101_021D13C8 * param0) GF_ASSERT(FALSE); } -static void ov101_021D42D0 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D42D0(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = 0, v1 = ov101_021D405C(param0); - const UnkStruct_ov101_021D9784 * v2 = Unk_ov101_021D9784[param0->unk_88][param0->unk_4C]; + const UnkStruct_ov101_021D9784 *v2 = Unk_ov101_021D9784[param0->unk_88][param0->unk_4C]; do { if (ov101_021D406C(v2[v0].unk_00, &v1) == 1) { @@ -2912,7 +2911,7 @@ static void ov101_021D42D0 (UnkStruct_ov101_021D13C8 * param0) GF_ASSERT(FALSE); } -static int ov101_021D4370 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D4370(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = Unk_ov101_021D9538[param0->unk_88]; u32 v1 = ov101_021D405C(param0); @@ -2924,10 +2923,10 @@ static int ov101_021D4370 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static void ov101_021D4394 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D4394(UnkStruct_ov101_021D13C8 *param0) { u32 v0; - const u32 * v1 = Unk_ov101_021D9628[param0->unk_88]; + const u32 *v1 = Unk_ov101_021D9628[param0->unk_88]; u32 v2 = ov101_021D405C(param0); param0->unk_74 = 0; @@ -2977,7 +2976,7 @@ static void ov101_021D4394 (UnkStruct_ov101_021D13C8 * param0) param0->unk_494++; } -static int ov101_021D44A0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D44A0(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = ov101_021D405C(param0); u32 v1 = Unk_ov101_021D9580[param0->unk_88]; @@ -2989,7 +2988,7 @@ static int ov101_021D44A0 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D44C4 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D44C4(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = ov101_021D405C(param0); u32 v1 = Unk_ov101_021D9508[param0->unk_88]; @@ -3001,7 +3000,7 @@ static int ov101_021D44C4 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static int ov101_021D44E8 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D44E8(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = param0->unk_18; u32 v1 = ov101_021D405C(param0); @@ -3013,11 +3012,11 @@ static int ov101_021D44E8 (UnkStruct_ov101_021D13C8 * param0) return 0; } -static void ov101_021D44FC (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D44FC(UnkStruct_ov101_021D13C8 *param0) { u32 v0 = param0->unk_18; u32 v1 = ov101_021D405C(param0); - const u32 * v2 = Unk_ov101_021D9598[param0->unk_88]; + const u32 *v2 = Unk_ov101_021D9598[param0->unk_88]; if (param0->unk_28 == 2) { v0 -= 10; @@ -3036,12 +3035,12 @@ static void ov101_021D44FC (UnkStruct_ov101_021D13C8 * param0) param0->unk_18 = v0; } -static UnkEnum_ov101_021D4550 ov101_021D4550 (UnkStruct_ov101_021D13C8 * param0) +static UnkEnum_ov101_021D4550 ov101_021D4550(UnkStruct_ov101_021D13C8 *param0) { int v0; u32 v1 = param0->unk_18; u32 v2 = ov101_021D405C(param0); - const UnkStruct_ov101_021D9AE4 * v3 = Unk_ov101_021D9AE4[param0->unk_88]; + const UnkStruct_ov101_021D9AE4 *v3 = Unk_ov101_021D9AE4[param0->unk_88]; for (v0 = 0; v0 < UnkEnum_ov101_021D9AE4_09; v0++) { if (v1 >= v3[v0].unk_00) { @@ -3061,14 +3060,14 @@ static UnkEnum_ov101_021D4550 ov101_021D4550 (UnkStruct_ov101_021D13C8 * param0) return UnkEnum_ov101_021D4550_00; } -static void ov101_021D45B0 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D45B0(UnkStruct_ov101_021D13C8 *param0) { param0->unk_34 = LCRNG_Next() % 6; } -static void ov101_021D45C4 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D45C4(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D4714 * v0 = ¶m0->unk_120; + UnkStruct_ov101_021D4714 *v0 = ¶m0->unk_120; v0->unk_00 = 0; v0->unk_04 = 0; @@ -3076,28 +3075,28 @@ static void ov101_021D45C4 (UnkStruct_ov101_021D13C8 * param0) v0->unk_10 = SysTask_Start(ov101_021D4614, v0, 138); } -static void ov101_021D45E8 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D45E8(UnkStruct_ov101_021D13C8 *param0) { SysTask_Done(param0->unk_120.unk_10); } -static void ov101_021D45F8 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D45F8(UnkStruct_ov101_021D13C8 *param0) { param0->unk_120.unk_04 = 0; param0->unk_120.unk_08 = 0; param0->unk_120.unk_00 = 1; } -static int ov101_021D460C (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D460C(UnkStruct_ov101_021D13C8 *param0) { return param0->unk_120.unk_04; } -static void ov101_021D4614 (SysTask * param0, void * param1) +static void ov101_021D4614(SysTask *param0, void *param1) { int v0; - UnkStruct_ov101_021D4714 * v1 = param1; - UnkStruct_ov101_021D13C8 * v2 = v1->unk_0C; + UnkStruct_ov101_021D4714 *v1 = param1; + UnkStruct_ov101_021D13C8 *v2 = v1->unk_0C; switch (v1->unk_00) { case 0: @@ -3168,16 +3167,16 @@ static void ov101_021D4614 (SysTask * param0, void * param1) } } -static void ov101_021D4714 (UnkStruct_ov101_021D4714 * param0) +static void ov101_021D4714(UnkStruct_ov101_021D4714 *param0) { int v0; - UnkStruct_ov101_021D13C8 * v1 = param0->unk_0C; + UnkStruct_ov101_021D13C8 *v1 = param0->unk_0C; u32 v2 = v1->unk_48; GF_ASSERT(v2 != 0); for (v0 = 0; v0 < UnkEnum_ov101_021D4F58_05; v0++, v2 >>= 1) { - if ((v2 & 0x1)) { + if (v2 & 0x1) { if (param0->unk_14 == NULL) { param0->unk_14 = ov101_021D5028(v1, v0, v1->unk_64); } else if (param0->unk_18 == NULL) { @@ -3189,9 +3188,9 @@ static void ov101_021D4714 (UnkStruct_ov101_021D4714 * param0) } } -static void ov101_021D4764 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D4764(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D4764 * v0 = ¶m0->unk_13C; + UnkStruct_ov101_021D4764 *v0 = ¶m0->unk_13C; v0->unk_00 = 0; v0->unk_04 = 0; @@ -3199,15 +3198,15 @@ static void ov101_021D4764 (UnkStruct_ov101_021D13C8 * param0) v0->unk_24 = SysTask_Start(ov101_021D4824, v0, 132); } -static void ov101_021D4788 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D4788(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D4764 * v0 = ¶m0->unk_13C; + UnkStruct_ov101_021D4764 *v0 = ¶m0->unk_13C; SysTask_Done(v0->unk_24); } -static void ov101_021D4798 (UnkStruct_ov101_021D13C8 * param0, u32 param1) +static void ov101_021D4798(UnkStruct_ov101_021D13C8 *param0, u32 param1) { - UnkStruct_ov101_021D4764 * v0 = ¶m0->unk_13C; + UnkStruct_ov101_021D4764 *v0 = ¶m0->unk_13C; v0->unk_00 = param1; v0->unk_04 = 0; @@ -3215,13 +3214,13 @@ static void ov101_021D4798 (UnkStruct_ov101_021D13C8 * param0, u32 param1) v0->unk_10 = 0; } -static int ov101_021D47AC (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D47AC(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D4764 * v0 = ¶m0->unk_13C; + UnkStruct_ov101_021D4764 *v0 = ¶m0->unk_13C; return v0->unk_08; } -static void ov101_021D47B4 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D47B4(UnkStruct_ov101_021D13C8 *param0) { param0->unk_13C.unk_0C = 0; param0->unk_13C.unk_38 = ov101_021D7228(param0); @@ -3230,7 +3229,7 @@ static void ov101_021D47B4 (UnkStruct_ov101_021D13C8 * param0) param0->unk_13C.unk_44 = ov101_021D76B4(param0); } -static void ov101_021D47F0 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D47F0(UnkStruct_ov101_021D13C8 *param0) { param0->unk_13C.unk_0C = 1; @@ -3240,12 +3239,12 @@ static void ov101_021D47F0 (UnkStruct_ov101_021D13C8 * param0) sub_0207136C(param0->unk_13C.unk_44); } -static void ov101_021D4824 (SysTask * param0, void * param1) +static void ov101_021D4824(SysTask *param0, void *param1) { int v0; - UnkStruct_ov101_021D4764 * v1 = param1; + UnkStruct_ov101_021D4764 *v1 = param1; - int(*const * v2)(UnkStruct_ov101_021D4764 *); + int (*const *v2)(UnkStruct_ov101_021D4764 *); do { v2 = Unk_ov101_021D8774[v1->unk_00]; @@ -3253,7 +3252,7 @@ static void ov101_021D4824 (SysTask * param0, void * param1) } while (v0 == 1); } -static int ov101_021D4844 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4844(UnkStruct_ov101_021D4764 *param0) { param0->unk_28 = ov101_021D5D58(param0->unk_20, param0->unk_18); param0->unk_04++; @@ -3261,7 +3260,7 @@ static int ov101_021D4844 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D485C (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D485C(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D5DC4(param0->unk_28) == 0) { return 0; @@ -3273,7 +3272,7 @@ static int ov101_021D485C (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4880 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4880(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D5DC4(param0->unk_28) == 0) { return 0; @@ -3286,30 +3285,30 @@ static int ov101_021D4880 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D48A8 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D48A8(UnkStruct_ov101_021D4764 *param0) { return 0; } -static int(*const Unk_ov101_021D8648[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D8648[])(UnkStruct_ov101_021D4764 *) = { ov101_021D48A8, }; -static int(*const Unk_ov101_021D8690[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D8690[])(UnkStruct_ov101_021D4764 *) = { ov101_021D4844, ov101_021D485C, ov101_021D4880, ov101_021D48A8, }; -static int ov101_021D48AC (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D48AC(UnkStruct_ov101_021D4764 *param0) { ov101_021D5D90(param0->unk_28, UnkEnum_ov101_021D5D90_04); param0->unk_04++; return 0; } -static int ov101_021D48C4 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D48C4(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D5DC4(param0->unk_28) == 1) { sub_0207136C(param0->unk_28); @@ -3320,20 +3319,20 @@ static int ov101_021D48C4 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int(*const Unk_ov101_021D8678[])(UnkStruct_ov101_021D4764 * work) = { +static int (*const Unk_ov101_021D8678[])(UnkStruct_ov101_021D4764 *work) = { ov101_021D48AC, ov101_021D48C4, ov101_021D48A8, }; -static int ov101_021D48E8 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D48E8(UnkStruct_ov101_021D4764 *param0) { ov101_021D5D90(param0->unk_28, UnkEnum_ov101_021D5D90_02); param0->unk_04++; return 0; } -static int ov101_021D4900 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4900(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D5DC4(param0->unk_28) == 1) { param0->unk_2C = ov101_021D6484(param0->unk_20); @@ -3344,7 +3343,7 @@ static int ov101_021D4900 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D492C (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D492C(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D67B0(param0->unk_30) == 1) { ov101_021D679C(param0->unk_30, UnkEnum_ov101_021D679C_01); @@ -3355,7 +3354,7 @@ static int ov101_021D492C (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4954 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4954(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D67B0(param0->unk_30) == 1) { sub_0207136C(param0->unk_2C); @@ -3366,7 +3365,7 @@ static int ov101_021D4954 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int(*const Unk_ov101_021D8714[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D8714[])(UnkStruct_ov101_021D4764 *) = { ov101_021D48E8, ov101_021D4900, ov101_021D492C, @@ -3374,7 +3373,7 @@ static int(*const Unk_ov101_021D8714[])(UnkStruct_ov101_021D4764 *) = { ov101_021D48A8, }; -static int ov101_021D4978 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4978(UnkStruct_ov101_021D4764 *param0) { param0->unk_2C = ov101_021D6484(param0->unk_20); ov101_021D679C(param0->unk_30, UnkEnum_ov101_021D679C_02); @@ -3382,7 +3381,7 @@ static int ov101_021D4978 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4998 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4998(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D67B0(param0->unk_30) == 1) { sub_0207136C(param0->unk_30); @@ -3395,7 +3394,7 @@ static int ov101_021D4998 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D49CC (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D49CC(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D5DC4(param0->unk_28) == 1) { ov101_021D5D90(param0->unk_28, UnkEnum_ov101_021D5D90_04); @@ -3405,7 +3404,7 @@ static int ov101_021D49CC (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D49EC (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D49EC(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D5DC4(param0->unk_28) == 1) { sub_0207136C(param0->unk_28); @@ -3416,7 +3415,7 @@ static int ov101_021D49EC (UnkStruct_ov101_021D4764 * param0) return 0; } -static int(*const Unk_ov101_021D86EC[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D86EC[])(UnkStruct_ov101_021D4764 *) = { ov101_021D4978, ov101_021D4998, ov101_021D49CC, @@ -3424,7 +3423,7 @@ static int(*const Unk_ov101_021D86EC[])(UnkStruct_ov101_021D4764 *) = { ov101_021D48A8, }; -static int ov101_021D4A10 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4A10(UnkStruct_ov101_021D4764 *param0) { ov101_021D679C(param0->unk_30, UnkEnum_ov101_021D679C_03); param0->unk_34 = ov101_021D6DF0(param0->unk_20); @@ -3433,7 +3432,7 @@ static int ov101_021D4A10 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4A30 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4A30(UnkStruct_ov101_021D4764 *param0) { param0->unk_10++; @@ -3447,7 +3446,7 @@ static int ov101_021D4A30 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4A5C (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4A5C(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D6E1C(param0->unk_34) == 1) { ov101_021D679C(param0->unk_30, UnkEnum_ov101_021D679C_03); @@ -3460,16 +3459,16 @@ static int ov101_021D4A5C (UnkStruct_ov101_021D4764 * param0) return 0; } -static int(*const Unk_ov101_021D86A0[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D86A0[])(UnkStruct_ov101_021D4764 *) = { ov101_021D4A10, ov101_021D4A30, ov101_021D4A5C, ov101_021D48A8, }; -static int ov101_021D4A8C (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4A8C(UnkStruct_ov101_021D4764 *param0) { - const UnkStruct_ov101_021D87A8 * v0 = &Unk_ov101_021D87A8[param0->unk_20->unk_34]; + const UnkStruct_ov101_021D87A8 *v0 = &Unk_ov101_021D87A8[param0->unk_20->unk_34]; param0->unk_04++; param0->unk_14 = 0; @@ -3479,7 +3478,7 @@ static int ov101_021D4A8C (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4AB8 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4AB8(UnkStruct_ov101_021D4764 *param0) { int v0, v1 = 0; @@ -3490,7 +3489,7 @@ static int ov101_021D4AB8 (UnkStruct_ov101_021D4764 * param0) } if ((param0->unk_14 < 2) && (param0->unk_14 != v1)) { - const UnkStruct_ov101_021D87A8 * v2 = &Unk_ov101_021D87A8[param0->unk_20->unk_34]; + const UnkStruct_ov101_021D87A8 *v2 = &Unk_ov101_021D87A8[param0->unk_20->unk_34]; param0->unk_14 = v1; ov101_021D679C(param0->unk_30, v2->unk_0C[param0->unk_14]); @@ -3499,25 +3498,25 @@ static int ov101_021D4AB8 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int(*const Unk_ov101_021D8684[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D8684[])(UnkStruct_ov101_021D4764 *) = { ov101_021D4A8C, ov101_021D4AB8, ov101_021D48A8, }; -static int ov101_021D4AFC (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4AFC(UnkStruct_ov101_021D4764 *param0) { ov101_021D679C(param0->unk_30, UnkEnum_ov101_021D679C_03); param0->unk_04++; return 0; } -static int(*const Unk_ov101_021D8654[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D8654[])(UnkStruct_ov101_021D4764 *) = { ov101_021D4AFC, ov101_021D48A8 }; -static int ov101_021D4B14 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4B14(UnkStruct_ov101_021D4764 *param0) { ov101_021D47F0(param0->unk_20); param0->unk_2C = ov101_021D6484(param0->unk_20); @@ -3526,7 +3525,7 @@ static int ov101_021D4B14 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4B38 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4B38(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D67B0(param0->unk_30) == 1) { sub_0207136C(param0->unk_30); @@ -3539,7 +3538,7 @@ static int ov101_021D4B38 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4B6C (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4B6C(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D5DC4(param0->unk_28) == 1) { ov101_021D72D4(param0->unk_20); @@ -3552,7 +3551,7 @@ static int ov101_021D4B6C (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4BA0 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4BA0(UnkStruct_ov101_021D4764 *param0) { param0->unk_10++; @@ -3565,7 +3564,7 @@ static int ov101_021D4BA0 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4BC4 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4BC4(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D5DC4(param0->unk_28) == 1) { sub_0207136C(param0->unk_28); @@ -3576,7 +3575,7 @@ static int ov101_021D4BC4 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int(*const Unk_ov101_021D8728[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D8728[])(UnkStruct_ov101_021D4764 *) = { ov101_021D4B14, ov101_021D4B38, ov101_021D4B6C, @@ -3585,7 +3584,7 @@ static int(*const Unk_ov101_021D8728[])(UnkStruct_ov101_021D4764 *) = { ov101_021D48A8, }; -static int ov101_021D4BE8 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4BE8(UnkStruct_ov101_021D4764 *param0) { ov101_021D679C(param0->unk_30, UnkEnum_ov101_021D679C_04); param0->unk_08 = 1; @@ -3593,12 +3592,12 @@ static int ov101_021D4BE8 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int(*const Unk_ov101_021D8664[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D8664[])(UnkStruct_ov101_021D4764 *) = { ov101_021D4BE8, ov101_021D48A8 }; -static int ov101_021D4C04 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4C04(UnkStruct_ov101_021D4764 *param0) { ov101_021D679C(param0->unk_30, UnkEnum_ov101_021D679C_08); param0->unk_08 = 1; @@ -3606,11 +3605,12 @@ static int ov101_021D4C04 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int(*const Unk_ov101_021D865C[])(UnkStruct_ov101_021D4764 *) = { - ov101_021D4C04, ov101_021D48A8, +static int (*const Unk_ov101_021D865C[])(UnkStruct_ov101_021D4764 *) = { + ov101_021D4C04, + ov101_021D48A8, }; -static int ov101_021D4C20 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4C20(UnkStruct_ov101_021D4764 *param0) { ov101_021D5D90(param0->unk_28, UnkEnum_ov101_021D5D90_06); param0->unk_04++; @@ -3618,12 +3618,12 @@ static int ov101_021D4C20 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int(*const Unk_ov101_021D864C[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D864C[])(UnkStruct_ov101_021D4764 *) = { ov101_021D4C20, ov101_021D48A8 }; -static int ov101_021D4C3C (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4C3C(UnkStruct_ov101_021D4764 *param0) { param0->unk_2C = ov101_021D6484(param0->unk_20); ov101_021D679C(param0->unk_30, UnkEnum_ov101_021D679C_02); @@ -3632,7 +3632,7 @@ static int ov101_021D4C3C (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4C60 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4C60(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D67B0(param0->unk_30) == 1) { sub_0207136C(param0->unk_2C); @@ -3646,7 +3646,7 @@ static int ov101_021D4C60 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4C98 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4C98(UnkStruct_ov101_021D4764 *param0) { param0->unk_10++; @@ -3659,7 +3659,7 @@ static int ov101_021D4C98 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4CBC (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4CBC(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D5DC4(param0->unk_28) == 1) { param0->unk_2C = ov101_021D6484(param0->unk_20); @@ -3671,7 +3671,7 @@ static int ov101_021D4CBC (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4CEC (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4CEC(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D67B0(param0->unk_30) == 1) { ov101_021D679C(param0->unk_30, UnkEnum_ov101_021D679C_01); @@ -3682,7 +3682,7 @@ static int ov101_021D4CEC (UnkStruct_ov101_021D4764 * param0) return 0; } -static int ov101_021D4D14 (UnkStruct_ov101_021D4764 * param0) +static int ov101_021D4D14(UnkStruct_ov101_021D4764 *param0) { if (ov101_021D67B0(param0->unk_30) == 1) { sub_0207136C(param0->unk_2C); @@ -3693,7 +3693,7 @@ static int ov101_021D4D14 (UnkStruct_ov101_021D4764 * param0) return 0; } -static int(*const Unk_ov101_021D8758[])(UnkStruct_ov101_021D4764 *) = { +static int (*const Unk_ov101_021D8758[])(UnkStruct_ov101_021D4764 *) = { ov101_021D4C3C, ov101_021D4C60, ov101_021D4C98, @@ -3703,7 +3703,7 @@ static int(*const Unk_ov101_021D8758[])(UnkStruct_ov101_021D4764 *) = { ov101_021D48A8 }; -static int(*const * const Unk_ov101_021D8774[13])(UnkStruct_ov101_021D4764 *) = { +static int (*const *const Unk_ov101_021D8774[13])(UnkStruct_ov101_021D4764 *) = { Unk_ov101_021D8648, Unk_ov101_021D8690, Unk_ov101_021D8678, @@ -3719,11 +3719,11 @@ static int(*const * const Unk_ov101_021D8774[13])(UnkStruct_ov101_021D4764 *) = Unk_ov101_021D8758, }; -static void ov101_021D4D38 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D4D38(UnkStruct_ov101_021D13C8 *param0) { - void * v0; - NNSG2dPaletteData * v1; - UnkStruct_ov101_021D4F58 * v2 = ¶m0->unk_184; + void *v0; + NNSG2dPaletteData *v1; + UnkStruct_ov101_021D4F58 *v2 = ¶m0->unk_184; v2->unk_00 = param0; v0 = ov101_021D19E4(param0, 3, 0); @@ -3772,15 +3772,15 @@ static void ov101_021D4D38 (UnkStruct_ov101_021D13C8 * param0) Heap_FreeToHeap(v0); } -static void ov101_021D4EA4 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D4EA4(UnkStruct_ov101_021D13C8 *param0) { return; } -static void ov101_021D4EA8 (NNSG2dPaletteData * param0, int param1, u16 * param2) +static void ov101_021D4EA8(NNSG2dPaletteData *param0, int param1, u16 *param2) { int v0; - u16 * v1 = param0->pRawData; + u16 *v1 = param0->pRawData; v1 = &v1[param1 * 16]; @@ -3789,10 +3789,10 @@ static void ov101_021D4EA8 (NNSG2dPaletteData * param0, int param1, u16 * param2 } } -static void ov101_021D4EC0 (u16 param0, u16 param1, u16 param2, u16 * param3) +static void ov101_021D4EC0(u16 param0, u16 param1, u16 param2, u16 *param3) { - const UnkStruct_ov101_021D4EC0 * v0 = (UnkStruct_ov101_021D4EC0 *)¶m0; - const UnkStruct_ov101_021D4EC0 * v1 = (UnkStruct_ov101_021D4EC0 *)¶m1; + const UnkStruct_ov101_021D4EC0 *v0 = (UnkStruct_ov101_021D4EC0 *)¶m0; + const UnkStruct_ov101_021D4EC0 *v1 = (UnkStruct_ov101_021D4EC0 *)¶m1; if (param2 > 16) { param2 = 16; @@ -3801,80 +3801,87 @@ static void ov101_021D4EC0 (u16 param0, u16 param1, u16 param2, u16 * param3) (*param3) = (v0->unk_00_0 + ((v1->unk_00_0 - v0->unk_00_0) * param2 >> 4)) | ((v0->unk_00_5 + ((v1->unk_00_5 - v0->unk_00_5) * param2 >> 4)) << 5) | ((v0->unk_00_10 + ((v1->unk_00_10 - v0->unk_00_10) * param2 >> 4)) << 10); } -static void ov101_021D4F18 (const u16 * param0, const u16 * param1, u16 param2, u16 * param3) +static void ov101_021D4F18(const u16 *param0, const u16 *param1, u16 param2, u16 *param3) { int v0 = 0; do { - ov101_021D4EC0(param0[v0], param1[v0], param2, ¶m3[v0]); v0++; + ov101_021D4EC0(param0[v0], param1[v0], param2, ¶m3[v0]); + v0++; } while (v0 < 16); } -static void ov101_021D4F40 (UnkStruct_ov101_021D13C8 * param0, u32 param1, int param2, u16 * param3) +static void ov101_021D4F40(UnkStruct_ov101_021D13C8 *param0, u32 param1, int param2, u16 *param3) { sub_0201972C(param1, param3, 32, 32 * param2); } static int Unk_ov101_021D9E60[UnkEnum_ov101_021D4F58_05] = { - 0x2, 0x3, 0xc, 0x4, 0xb, + 0x2, + 0x3, + 0xc, + 0x4, + 0xb, }; -static void ov101_021D4F58 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D4F58 param1) +static void ov101_021D4F58(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D4F58 param1) { - UnkStruct_ov101_021D4F58 * v0 = ¶m0->unk_184; + UnkStruct_ov101_021D4F58 *v0 = ¶m0->unk_184; int v1 = Unk_ov101_021D9E60[param1]; ov101_021D4F40(param0, 1, v1, v0->unk_A4[param1]); } -static void ov101_021D4F78 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D4F58 param1) +static void ov101_021D4F78(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D4F58 param1) { - UnkStruct_ov101_021D4F58 * v0 = ¶m0->unk_184; + UnkStruct_ov101_021D4F58 *v0 = ¶m0->unk_184; int v1 = Unk_ov101_021D9E60[param1]; - const u16 * v2 = v0->unk_A4[param1]; - const u16 * v3 = v0->unk_144[param1]; - u16 * v4 = v0->unk_1E4[param1]; + const u16 *v2 = v0->unk_A4[param1]; + const u16 *v3 = v0->unk_144[param1]; + u16 *v4 = v0->unk_1E4[param1]; ov101_021D4F18(v2, v3, 10, v4); ov101_021D4F40(param0, 1, v1, v4); } -static void ov101_021D4FB8 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D4F58 param1) +static void ov101_021D4FB8(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D4F58 param1) { - UnkStruct_ov101_021D4F58 * v0 = ¶m0->unk_184; + UnkStruct_ov101_021D4F58 *v0 = ¶m0->unk_184; int v1 = Unk_ov101_021D9E60[param1]; - const u16 * v2 = v0->unk_A4[param1]; - const u16 * v3 = v0->unk_144[param1]; - u16 * v4 = v0->unk_1E4[param1]; + const u16 *v2 = v0->unk_A4[param1]; + const u16 *v3 = v0->unk_144[param1]; + u16 *v4 = v0->unk_1E4[param1]; ov101_021D4F18(v2, v3, 12, v4); ov101_021D4F40(param0, 1, v1, v4); } -static void ov101_021D4FF8 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D4FF8(UnkStruct_ov101_021D13C8 *param0) { int v0 = UnkEnum_ov101_021D4F58_00; do { - ov101_021D4F58(param0, v0); v0++; + ov101_021D4F58(param0, v0); + v0++; } while (v0 < UnkEnum_ov101_021D4F58_05); } -static void ov101_021D5010 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D5010(UnkStruct_ov101_021D13C8 *param0) { int v0 = UnkEnum_ov101_021D4F58_00; do { - ov101_021D4F78(param0, v0); v0++; + ov101_021D4F78(param0, v0); + v0++; } while (v0 < UnkEnum_ov101_021D4F58_05); } static const UnkStruct_ov101_021D86B0 Unk_ov101_021D86B0; -static UnkStruct_ov101_021D5D90 * ov101_021D5028 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D4F58 param1, u32 param2) +static UnkStruct_ov101_021D5D90 *ov101_021D5028(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D4F58 param1, u32 param2) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {0, 0, 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { 0, 0, 0 }; UnkStruct_ov101_021D5068 v2; v2.unk_00 = param1; @@ -3886,16 +3893,16 @@ static UnkStruct_ov101_021D5D90 * ov101_021D5028 (UnkStruct_ov101_021D13C8 * par return v0; } -static int ov101_021D505C (UnkStruct_ov101_021D5D90 * param0) +static int ov101_021D505C(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov101_021D505C * v0 = sub_02071598(param0); + UnkStruct_ov101_021D505C *v0 = sub_02071598(param0); return v0->unk_0C; } -static int ov101_021D5068 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D5068(UnkStruct_ov101_021D5D90 *param0, void *param1) { - const UnkStruct_ov101_021D5068 * v0; - UnkStruct_ov101_021D505C * v1 = param1; + const UnkStruct_ov101_021D5068 *v0; + UnkStruct_ov101_021D505C *v1 = param1; v0 = (const UnkStruct_ov101_021D5068 *)sub_020715BC(param0); v1->unk_1C = v0->unk_08; @@ -3906,20 +3913,20 @@ static int ov101_021D5068 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D508C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D508C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D505C * v0 = param1; + UnkStruct_ov101_021D505C *v0 = param1; ov101_021D4F58(v0->unk_1C, v0->unk_10); } -static void ov101_021D5098 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5098(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov101_021D505C * v1 = param1; + UnkStruct_ov101_021D505C *v1 = param1; int v2 = Unk_ov101_021D9E60[v1->unk_10]; - u16 * v3 = v1->unk_20->unk_1E4[v1->unk_10]; - const u16 * v4 = v1->unk_20->unk_A4[v1->unk_10]; - const u16 * v5 = v1->unk_20->unk_144[v1->unk_10]; + u16 *v3 = v1->unk_20->unk_1E4[v1->unk_10]; + const u16 *v4 = v1->unk_20->unk_A4[v1->unk_10]; + const u16 *v5 = v1->unk_20->unk_144[v1->unk_10]; switch (v1->unk_00) { case 0: @@ -4005,22 +4012,23 @@ static void ov101_021D5098 (UnkStruct_ov101_021D5D90 * param0, void * param1) static const UnkStruct_ov101_021D86B0 Unk_ov101_021D86B0 = { sizeof(UnkStruct_ov101_021D505C), - ov101_021D5068, ov101_021D508C, + ov101_021D5068, + ov101_021D508C, ov101_021D5098, sub_020715FC }; static const UnkStruct_ov101_021D86B0 Unk_ov101_021D8700; -static void ov101_021D5200 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D5200(UnkStruct_ov101_021D13C8 *param0) { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; GF_ASSERT(param0->unk_120.unk_14 == NULL); param0->unk_120.unk_14 = sub_02071330(param0->unk_44C, &Unk_ov101_021D8700, &v0, 0, param0, 143); } -static void ov101_021D5244 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D5244(UnkStruct_ov101_021D13C8 *param0) { if (param0->unk_120.unk_14 != NULL) { sub_0207136C(param0->unk_120.unk_14); @@ -4033,19 +4041,100 @@ static void ov101_021D5244 (UnkStruct_ov101_021D13C8 * param0) #define LB_WAIT_DATA(wait) (1 << 5), (FX32_ONE * (wait)), 0, 0 static const UnkStruct_ov101_021D8938 Unk_ov101_021D8938[] = { - {LB_WAIT_DATA(30)}, {(1 << 0), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 0), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(8)}, {(1 << 1) | (1 << 2), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 1) | (1 << 2), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(8)}, {(1 << 3) | (1 << 4), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 3) | (1 << 4), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(16)}, {(1 << 3) | (1 << 4), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 3) | (1 << 4), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(8)}, {(1 << 1) | (1 << 2), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 1) | (1 << 2), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(8)}, {(1 << 0), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 0), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(16)}, {(1 << 1), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 1), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(8)}, {(1 << 4), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 4), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(8)}, {(1 << 2), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 2), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(8)}, {(1 << 3), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 3), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(8)}, {(1 << 0), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 0), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(16)}, {(1 << 3), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(1)}, {(1 << 3), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 1), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(1)}, {(1 << 1), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 0), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(1)}, {(1 << 0), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 2), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(1)}, {(1 << 2), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 4), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(1)}, {(1 << 4), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(8)}, {(1 << 2), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(1)}, {(1 << 2), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 0), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(1)}, {(1 << 0), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 1), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(1)}, {(1 << 1), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(2)}, {(1 << 3), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000}, {LB_WAIT_DATA(1)}, {(1 << 3), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000}, {LB_WAIT_DATA(16)}, {(1 << 6), 1, 0, 0}, + { LB_WAIT_DATA(30) }, + { (1 << 0), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 0), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(8) }, + { (1 << 1) | (1 << 2), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 1) | (1 << 2), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(8) }, + { (1 << 3) | (1 << 4), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 3) | (1 << 4), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(16) }, + { (1 << 3) | (1 << 4), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 3) | (1 << 4), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(8) }, + { (1 << 1) | (1 << 2), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 1) | (1 << 2), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(8) }, + { (1 << 0), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 0), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(16) }, + { (1 << 1), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 1), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(8) }, + { (1 << 4), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 4), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(8) }, + { (1 << 2), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 2), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(8) }, + { (1 << 3), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 3), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(8) }, + { (1 << 0), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 0), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(16) }, + { (1 << 3), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(1) }, + { (1 << 3), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 1), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(1) }, + { (1 << 1), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 0), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(1) }, + { (1 << 0), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 2), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(1) }, + { (1 << 2), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 4), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(1) }, + { (1 << 4), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(8) }, + { (1 << 2), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(1) }, + { (1 << 2), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 0), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(1) }, + { (1 << 0), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 1), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(1) }, + { (1 << 1), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(2) }, + { (1 << 3), (FX32_ONE * 0), (FX32_ONE * 14), 0x4000 }, + { LB_WAIT_DATA(1) }, + { (1 << 3), (FX32_ONE * 14), (FX32_ONE * 0), 0x4000 }, + { LB_WAIT_DATA(16) }, + { (1 << 6), 1, 0, 0 }, }; -static void ov101_021D5268 (UnkStruct_ov101_021D5388 * param0) +static void ov101_021D5268(UnkStruct_ov101_021D5388 *param0) { u32 v0; int v1, v2, v3; - u16 * v4; - const u16 * v5, * v6; - const UnkStruct_ov101_021D8938 * v7 = &Unk_ov101_021D8938[param0->unk_04]; + u16 *v4; + const u16 *v5, *v6; + const UnkStruct_ov101_021D8938 *v7 = &Unk_ov101_021D8938[param0->unk_04]; for (v1 = 0, v2 = 1, v0 = (1 << 0); v0 <= (1 << 4); v1++, v0 <<= 1) { - if ((v7->unk_00 & v0)) { + if (v7->unk_00 & v0) { if (param0->unk_08 == 0) { param0->unk_14[v1] = v7->unk_04; v2 = 0; @@ -4079,8 +4168,8 @@ static void ov101_021D5268 (UnkStruct_ov101_021D5388 * param0) } } - for ( ; v0 <= (1 << 5); v0 <<= 1) { - if ((v7->unk_00 & (1 << 5))) { + for (; v0 <= (1 << 5); v0 <<= 1) { + if (v7->unk_00 & (1 << 5)) { param0->unk_0C += FX32_ONE; if (param0->unk_0C >= v7->unk_04) { @@ -4105,9 +4194,9 @@ static void ov101_021D5268 (UnkStruct_ov101_021D5388 * param0) } } -static int ov101_021D5388 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D5388(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D5388 * v0 = param1; + UnkStruct_ov101_021D5388 *v0 = param1; v0->unk_28 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); v0->unk_2C = &v0->unk_28->unk_184; @@ -4115,27 +4204,28 @@ static int ov101_021D5388 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D53A0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D53A0(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -static void ov101_021D53A4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D53A4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D5388 * v0 = param1; + UnkStruct_ov101_021D5388 *v0 = param1; ov101_021D5268(v0); } static const UnkStruct_ov101_021D86B0 Unk_ov101_021D8700 = { sizeof(UnkStruct_ov101_021D5388), - ov101_021D5388, ov101_021D53A0, + ov101_021D5388, + ov101_021D53A0, ov101_021D53A4, sub_020715FC }; -static void ov101_021D53B0 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D53B0(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D53B0 * v0 = Heap_AllocFromHeapAtEnd(79, sizeof(UnkStruct_ov101_021D53B0)); + UnkStruct_ov101_021D53B0 *v0 = Heap_AllocFromHeapAtEnd(79, sizeof(UnkStruct_ov101_021D53B0)); v0->unk_00 = 0; v0->unk_04 = 0; @@ -4144,9 +4234,9 @@ static void ov101_021D53B0 (UnkStruct_ov101_021D13C8 * param0) SysTask_Start(ov101_021D542C, v0, 143); } -static void ov101_021D53D4 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D53D4(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D53B0 * v0 = Heap_AllocFromHeapAtEnd(79, sizeof(UnkStruct_ov101_021D53B0)); + UnkStruct_ov101_021D53B0 *v0 = Heap_AllocFromHeapAtEnd(79, sizeof(UnkStruct_ov101_021D53B0)); v0->unk_00 = 0; v0->unk_04 = 0; @@ -4155,9 +4245,9 @@ static void ov101_021D53D4 (UnkStruct_ov101_021D13C8 * param0) SysTask_Start(ov101_021D548C, v0, 143); } -static void ov101_021D53F8 (UnkStruct_ov101_021D13C8 * param0, int param1) +static void ov101_021D53F8(UnkStruct_ov101_021D13C8 *param0, int param1) { - UnkStruct_ov101_021D53B0 * v0 = Heap_AllocFromHeapAtEnd(79, sizeof(UnkStruct_ov101_021D53B0)); + UnkStruct_ov101_021D53B0 *v0 = Heap_AllocFromHeapAtEnd(79, sizeof(UnkStruct_ov101_021D53B0)); v0->unk_00 = 0; v0->unk_08 = param1; @@ -4168,13 +4258,13 @@ static void ov101_021D53F8 (UnkStruct_ov101_021D13C8 * param0, int param1) Sound_PlayEffect(1520); } -static void ov101_021D542C (SysTask * param0, void * param1) +static void ov101_021D542C(SysTask *param0, void *param1) { - UnkStruct_ov101_021D53B0 * v0 = param1; - UnkStruct_ov101_021D4F58 * v1 = &v0->unk_0C->unk_184; - const u16 * v2 = v1->unk_04; - const u16 * v3 = v1->unk_24; - u16 * v4 = v1->unk_84; + UnkStruct_ov101_021D53B0 *v0 = param1; + UnkStruct_ov101_021D4F58 *v1 = &v0->unk_0C->unk_184; + const u16 *v2 = v1->unk_04; + const u16 *v3 = v1->unk_24; + u16 *v4 = v1->unk_84; u16 v5; v0->unk_04 += 0x800; @@ -4193,13 +4283,13 @@ static void ov101_021D542C (SysTask * param0, void * param1) } } -static void ov101_021D548C (SysTask * param0, void * param1) +static void ov101_021D548C(SysTask *param0, void *param1) { - UnkStruct_ov101_021D53B0 * v0 = param1; - UnkStruct_ov101_021D4F58 * v1 = &v0->unk_0C->unk_184; - const u16 * v2 = v1->unk_24; - const u16 * v3 = v1->unk_04; - u16 * v4 = v1->unk_84; + UnkStruct_ov101_021D53B0 *v0 = param1; + UnkStruct_ov101_021D4F58 *v1 = &v0->unk_0C->unk_184; + const u16 *v2 = v1->unk_24; + const u16 *v3 = v1->unk_04; + u16 *v4 = v1->unk_84; u16 v5; v0->unk_04 += 0x800; @@ -4218,12 +4308,12 @@ static void ov101_021D548C (SysTask * param0, void * param1) } } -static void ov101_021D54EC (SysTask * param0, void * param1) +static void ov101_021D54EC(SysTask *param0, void *param1) { - UnkStruct_ov101_021D53B0 * v0 = param1; - UnkStruct_ov101_021D4F58 * v1 = &v0->unk_0C->unk_184; - const u16 * v2, * v3 = v1->unk_24; - u16 * v4 = v1->unk_84; + UnkStruct_ov101_021D53B0 *v0 = param1; + UnkStruct_ov101_021D4F58 *v1 = &v0->unk_0C->unk_184; + const u16 *v2, *v3 = v1->unk_24; + u16 *v4 = v1->unk_84; int v5; if (v0->unk_0C->unk_00 == 63) { @@ -4269,7 +4359,7 @@ static void ov101_021D54EC (SysTask * param0, void * param1) } } -UnkEnum_ov101_021D9688 ov101_021D55A4 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1, int param2) +UnkEnum_ov101_021D9688 ov101_021D55A4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1, int param2) { int v0 = (param0->unk_A8[param1] + param2) % 21; @@ -4280,18 +4370,18 @@ UnkEnum_ov101_021D9688 ov101_021D55A4 (UnkStruct_ov101_021D13C8 * param0, UnkEnu return Unk_ov101_021D9688[param1][v0]; } -UnkEnum_ov101_021D9688 ov101_021D55D4 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1, int param2) +UnkEnum_ov101_021D9688 ov101_021D55D4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1, int param2) { int v0 = 0; - if ((param0->unk_90[param1] % (FX32_ONE * 32))) { + if (param0->unk_90[param1] % (FX32_ONE * 32)) { v0--; } return ov101_021D55A4(param0, param1, param2 + v0); } -static int ov101_021D55F8 (u32 param0) +static int ov101_021D55F8(u32 param0) { u32 v0 = gCoreSys.pressedKeys & param0; @@ -4299,14 +4389,14 @@ static int ov101_021D55F8 (u32 param0) return 2; } - if ((v0 & param0)) { + if (v0 & param0) { return 1; } return 0; } -static UnkEnum_ov101_021D9688 ov101_021D5618 (u32 param0) +static UnkEnum_ov101_021D9688 ov101_021D5618(u32 param0) { if (param0 & ((1 << 0) | (1 << 1))) { return 2; @@ -4324,18 +4414,18 @@ static UnkEnum_ov101_021D9688 ov101_021D5618 (u32 param0) return 5; } - if (param0 & ((1 << 8))) { + if (param0 & (1 << 8)) { return 1; } - if (param0 & ((1 << 9))) { + if (param0 & (1 << 9)) { return 0; } return 6; } -static UnkEnum_ov101_021D9688 ov101_021D5660 (UnkStruct_ov101_021D13C8 * param0) +static UnkEnum_ov101_021D9688 ov101_021D5660(UnkStruct_ov101_021D13C8 *param0) { u32 v0, v1, v2; @@ -4350,7 +4440,7 @@ static UnkEnum_ov101_021D9688 ov101_021D5660 (UnkStruct_ov101_021D13C8 * param0) return 6; } -static UnkEnum_ov101_021D9688 ov101_021D5698 (UnkStruct_ov101_021D13C8 * param0) +static UnkEnum_ov101_021D9688 ov101_021D5698(UnkStruct_ov101_021D13C8 *param0) { u32 v0, v1, v2; @@ -4365,7 +4455,7 @@ static UnkEnum_ov101_021D9688 ov101_021D5698 (UnkStruct_ov101_021D13C8 * param0) return 6; } -static UnkEnum_ov101_021D9688 ov101_021D56D0 (UnkStruct_ov101_021D13C8 * param0) +static UnkEnum_ov101_021D9688 ov101_021D56D0(UnkStruct_ov101_021D13C8 *param0) { u32 v0, v1, v2; @@ -4380,7 +4470,7 @@ static UnkEnum_ov101_021D9688 ov101_021D56D0 (UnkStruct_ov101_021D13C8 * param0) return 6; } -static UnkEnum_ov101_021D9688 ov101_021D5708 (UnkStruct_ov101_021D13C8 * param0) +static UnkEnum_ov101_021D9688 ov101_021D5708(UnkStruct_ov101_021D13C8 *param0) { u32 v0, v1, v2; @@ -4395,7 +4485,7 @@ static UnkEnum_ov101_021D9688 ov101_021D5708 (UnkStruct_ov101_021D13C8 * param0) return 6; } -static UnkEnum_ov101_021D9688 ov101_021D5740 (UnkStruct_ov101_021D13C8 * param0) +static UnkEnum_ov101_021D9688 ov101_021D5740(UnkStruct_ov101_021D13C8 *param0) { u32 v0, v1, v2; @@ -4410,7 +4500,7 @@ static UnkEnum_ov101_021D9688 ov101_021D5740 (UnkStruct_ov101_021D13C8 * param0) return 6; } -static UnkEnum_ov101_021D9688 ov101_021D5778 (UnkStruct_ov101_021D13C8 * param0, u32 param1, u32 * param2) +static UnkEnum_ov101_021D9688 ov101_021D5778(UnkStruct_ov101_021D13C8 *param0, u32 param1, u32 *param2) { u32 v0, v1; @@ -4420,37 +4510,42 @@ static UnkEnum_ov101_021D9688 ov101_021D5778 (UnkStruct_ov101_021D13C8 * param0, v0 = ov101_021D5660(param0); if (v0 != 6) { - v1 = v0; *param2 |= (1 << 1); + v1 = v0; + *param2 |= (1 << 1); } v0 = ov101_021D5698(param0); if (v0 != 6) { - v1 = v0; *param2 |= (1 << 0); + v1 = v0; + *param2 |= (1 << 0); } v0 = ov101_021D56D0(param0); if (v0 != 6) { - v1 = v0; *param2 |= (1 << 2); + v1 = v0; + *param2 |= (1 << 2); } v0 = ov101_021D5708(param0); if (v0 != 6) { - v1 = v0; *param2 |= (1 << 3); + v1 = v0; + *param2 |= (1 << 3); } v0 = ov101_021D5740(param0); if (v0 != 6) { - v1 = v0; *param2 |= (1 << 4); + v1 = v0; + *param2 |= (1 << 4); } return v1; } -static UnkEnum_ov101_021D9688 ov101_021D57EC (UnkStruct_ov101_021D13C8 * param0, u32 param1, u32 * param2) +static UnkEnum_ov101_021D9688 ov101_021D57EC(UnkStruct_ov101_021D13C8 *param0, u32 param1, u32 *param2) { u32 v0; @@ -4465,7 +4560,7 @@ static UnkEnum_ov101_021D9688 ov101_021D57EC (UnkStruct_ov101_021D13C8 * param0, return v0; } -static UnkEnum_ov101_021D5814 ov101_021D5814 (u32 param0) +static UnkEnum_ov101_021D5814 ov101_021D5814(u32 param0) { if (param0 & ((1 << 0) | (1 << 1))) { return UnkEnum_ov101_021D5814_01; @@ -4487,16 +4582,17 @@ static UnkEnum_ov101_021D5814 ov101_021D5814 (u32 param0) return UnkEnum_ov101_021D5814_04; } -static void ov101_021D5848 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D5848(UnkStruct_ov101_021D13C8 *param0) { int v0 = 0; do { - param0->unk_54[v0] = 0; v0++; + param0->unk_54[v0] = 0; + v0++; } while (v0 < 3); } -static void ov101_021D5858 (UnkStruct_ov101_021D13C8 * param0, u32 param1) +static void ov101_021D5858(UnkStruct_ov101_021D13C8 *param0, u32 param1) { int v0 = 0; @@ -4512,10 +4608,10 @@ static void ov101_021D5858 (UnkStruct_ov101_021D13C8 * param0, u32 param1) param0->unk_54[v0] = param1; } -static int ov101_021D5880 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D5880(UnkStruct_ov101_021D13C8 *param0) { int v0 = 0; - u32 v1[3] = {PAD_BUTTON_Y, PAD_BUTTON_B, PAD_BUTTON_A}; + u32 v1[3] = { PAD_BUTTON_Y, PAD_BUTTON_B, PAD_BUTTON_A }; do { if ((param0->unk_54[v0] != 0) && (param0->unk_54[v0] != v1[v0])) { @@ -4528,10 +4624,10 @@ static int ov101_021D5880 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static int ov101_021D58C0 (UnkStruct_ov101_021D13C8 * param0) +static int ov101_021D58C0(UnkStruct_ov101_021D13C8 *param0) { int v0 = 0; - const UnkStruct_ov101_021D87A8 * v1 = &Unk_ov101_021D87A8[param0->unk_34]; + const UnkStruct_ov101_021D87A8 *v1 = &Unk_ov101_021D87A8[param0->unk_34]; do { if ((param0->unk_54[v0] != 0) && (param0->unk_54[v0] != v1->unk_00[v0])) { @@ -4544,23 +4640,23 @@ static int ov101_021D58C0 (UnkStruct_ov101_021D13C8 * param0) return 1; } -static void ov101_021D58F4 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1) +static void ov101_021D58F4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1) { - const int * v0 = Unk_ov101_021D8740[param1]; + const int *v0 = Unk_ov101_021D8740[param1]; sub_02019E2C(param0->unk_43C, 1, v0[0], v0[1], 3, 2, 6); sub_0201C3C0(param0->unk_43C, 1); } -static void ov101_021D5938 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D2BDC param1) +static void ov101_021D5938(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D2BDC param1) { - const int * v0 = Unk_ov101_021D8740[param1]; + const int *v0 = Unk_ov101_021D8740[param1]; sub_02019E2C(param0->unk_43C, 1, v0[0], v0[1], 3, 2, 5); sub_0201C3C0(param0->unk_43C, 1); } -static u32 ov101_021D597C (UnkStruct_ov101_021D13C8 * param0) +static u32 ov101_021D597C(UnkStruct_ov101_021D13C8 *param0) { int v0, v1; UnkEnum_ov101_021D9688 v2 = param0->unk_44; @@ -4569,7 +4665,7 @@ static u32 ov101_021D597C (UnkStruct_ov101_021D13C8 * param0) GF_ASSERT(v2 != 6); for (v0 = 0, v1 = 0; v0 < UnkEnum_ov101_021D4F58_05; v0++, v3 >>= 1) { - if ((v3 & 0x1)) { + if (v3 & 0x1) { v1 += Unk_ov101_021D9550[v2]; } } @@ -4579,33 +4675,33 @@ static u32 ov101_021D597C (UnkStruct_ov101_021D13C8 * param0) static const UnkStruct_ov101_021D87A8 Unk_ov101_021D87A8[6] = { { - {PAD_BUTTON_Y, PAD_BUTTON_B, PAD_BUTTON_A}, - {UnkEnum_ov101_021D679C_06, UnkEnum_ov101_021D679C_05, UnkEnum_ov101_021D679C_07} + { PAD_BUTTON_Y, PAD_BUTTON_B, PAD_BUTTON_A }, + { UnkEnum_ov101_021D679C_06, UnkEnum_ov101_021D679C_05, UnkEnum_ov101_021D679C_07 }, }, { - {PAD_BUTTON_Y, PAD_BUTTON_A, PAD_BUTTON_B}, - {UnkEnum_ov101_021D679C_06, UnkEnum_ov101_021D679C_07, UnkEnum_ov101_021D679C_05} + { PAD_BUTTON_Y, PAD_BUTTON_A, PAD_BUTTON_B }, + { UnkEnum_ov101_021D679C_06, UnkEnum_ov101_021D679C_07, UnkEnum_ov101_021D679C_05 }, }, { - {PAD_BUTTON_B, PAD_BUTTON_Y, PAD_BUTTON_A}, - {UnkEnum_ov101_021D679C_05, UnkEnum_ov101_021D679C_06, UnkEnum_ov101_021D679C_07} + { PAD_BUTTON_B, PAD_BUTTON_Y, PAD_BUTTON_A }, + { UnkEnum_ov101_021D679C_05, UnkEnum_ov101_021D679C_06, UnkEnum_ov101_021D679C_07 }, }, { - {PAD_BUTTON_B, PAD_BUTTON_A, PAD_BUTTON_Y}, - {UnkEnum_ov101_021D679C_05, UnkEnum_ov101_021D679C_07, UnkEnum_ov101_021D679C_06} + { PAD_BUTTON_B, PAD_BUTTON_A, PAD_BUTTON_Y }, + { UnkEnum_ov101_021D679C_05, UnkEnum_ov101_021D679C_07, UnkEnum_ov101_021D679C_06 }, }, { - {PAD_BUTTON_A, PAD_BUTTON_Y, PAD_BUTTON_B}, - {UnkEnum_ov101_021D679C_07, UnkEnum_ov101_021D679C_06, UnkEnum_ov101_021D679C_05} + { PAD_BUTTON_A, PAD_BUTTON_Y, PAD_BUTTON_B }, + { UnkEnum_ov101_021D679C_07, UnkEnum_ov101_021D679C_06, UnkEnum_ov101_021D679C_05 }, }, { - {PAD_BUTTON_A, PAD_BUTTON_B, PAD_BUTTON_Y}, - {UnkEnum_ov101_021D679C_07, UnkEnum_ov101_021D679C_05, UnkEnum_ov101_021D679C_06} - } + { PAD_BUTTON_A, PAD_BUTTON_B, PAD_BUTTON_Y }, + { UnkEnum_ov101_021D679C_07, UnkEnum_ov101_021D679C_05, UnkEnum_ov101_021D679C_06 }, + }, }; static const int Unk_ov101_021D8740[3][2] = { - {0x7, 0x11}, - {0xf, 0x11}, - {0x16, 0x11}, + { 0x7, 0x11 }, + { 0xf, 0x11 }, + { 0x16, 0x11 }, }; diff --git a/src/overlay101/ov101_021D59AC.c b/src/overlay101/ov101_021D59AC.c index 6d2dfa53b1..7526e863d1 100644 --- a/src/overlay101/ov101_021D59AC.c +++ b/src/overlay101/ov101_021D59AC.c @@ -1,26 +1,26 @@ -#include "enums.h" +#include "overlay101/ov101_021D59AC.h" #include #include -#include "sys_task_manager.h" #include "struct_decls/struct_02022550_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" +#include "overlay101/ov101_021D1A28.h" +#include "overlay101/ov101_021D7E48.h" #include "overlay101/struct_ov101_021D13C8.h" #include "overlay101/struct_ov101_021D4764.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "overlay101/struct_ov101_021D8544.h" #include "overlay101/struct_ov101_021D86B0.h" #include "overlay101/struct_ov101_021D93D4.h" -#include "unk_02005474.h" +#include "enums.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" #include "unk_0201D15C.h" #include "unk_020218BC.h" #include "unk_020711EC.h" -#include "overlay101/ov101_021D1A28.h" -#include "overlay101/ov101_021D59AC.h" -#include "overlay101/ov101_021D7E48.h" typedef struct { UnkEnum_ov101_021D5D90 unk_00; @@ -33,12 +33,12 @@ typedef struct { u32 unk_2C; u32 unk_30; int unk_34; - UnkStruct_ov101_021D13C8 * unk_38; + UnkStruct_ov101_021D13C8 *unk_38; UnkStruct_ov101_021D8544 unk_3C; } UnkStruct_ov101_021D630C; typedef struct { - UnkStruct_ov101_021D13C8 * unk_00; + UnkStruct_ov101_021D13C8 *unk_00; fx32 unk_04; UnkEnum_ov101_021D2BDC unk_08; } UnkStruct_ov101_021D5A0C; @@ -49,14 +49,14 @@ typedef struct { } UnkStruct_ov101_021D5A64; typedef struct { - UnkStruct_ov101_021D13C8 * unk_00; + UnkStruct_ov101_021D13C8 *unk_00; u32 unk_04; u32 unk_08; UnkStruct_ov101_021D8544 unk_0C; } UnkStruct_ov101_021D5B9C; typedef struct { - UnkStruct_ov101_021D13C8 * unk_00; + UnkStruct_ov101_021D13C8 *unk_00; u32 unk_04; u32 unk_08; UnkStruct_ov101_021D8544 unk_0C; @@ -67,7 +67,7 @@ typedef struct { u32 unk_04; u32 unk_08; vu32 unk_0C; - UnkStruct_ov101_021D13C8 * unk_10; + UnkStruct_ov101_021D13C8 *unk_10; UnkStruct_ov101_021D8544 unk_14; } UnkStruct_ov101_021D65F4; @@ -79,8 +79,8 @@ typedef struct { u32 unk_10; int unk_14; UnkEnum_ov101_021D6764 unk_18; - void * unk_1C; - UnkStruct_ov101_021D13C8 * unk_20; + void *unk_1C; + UnkStruct_ov101_021D13C8 *unk_20; UnkStruct_ov101_021D8544 unk_24; } UnkStruct_ov101_021D66D0; @@ -92,40 +92,40 @@ typedef struct { vu32 unk_10; VecFx32 unk_14; VecFx32 unk_20; - UnkStruct_ov101_021D13C8 * unk_2C; + UnkStruct_ov101_021D13C8 *unk_2C; UnkStruct_ov101_021D8544 unk_30; UnkStruct_ov101_021D8544 unk_3C; } UnkStruct_ov101_021D6D10; typedef struct { - UnkStruct_ov101_021D13C8 * unk_00; + UnkStruct_ov101_021D13C8 *unk_00; UnkStruct_ov101_021D8544 unk_04; } UnkStruct_ov101_021D72AC; typedef struct { int unk_00; - UnkStruct_ov101_021D13C8 * unk_04; + UnkStruct_ov101_021D13C8 *unk_04; UnkStruct_ov101_021D8544 unk_08; } UnkStruct_ov101_021D7394; typedef struct { - UnkStruct_ov101_021D13C8 * unk_00; + UnkStruct_ov101_021D13C8 *unk_00; UnkStruct_ov101_021D8544 unk_04; } UnkStruct_ov101_021D7438; typedef struct { int unk_00; - UnkStruct_ov101_021D13C8 * unk_04; + UnkStruct_ov101_021D13C8 *unk_04; UnkStruct_ov101_021D8544 unk_08; } UnkStruct_ov101_021D7530; typedef struct { - UnkStruct_ov101_021D13C8 * unk_00; + UnkStruct_ov101_021D13C8 *unk_00; UnkStruct_ov101_021D8544 unk_04[2]; } UnkStruct_ov101_021D75F0; typedef struct { - UnkStruct_ov101_021D13C8 * unk_00; + UnkStruct_ov101_021D13C8 *unk_00; UnkStruct_ov101_021D8544 unk_04[5]; } UnkStruct_ov101_021D7754; @@ -135,14 +135,14 @@ typedef struct { u32 unk_08; int unk_0C; int unk_10; - UnkStruct_ov101_021D13C8 * unk_14; + UnkStruct_ov101_021D13C8 *unk_14; UnkStruct_ov101_021D8544 unk_18[5]; } UnkStruct_ov101_021D7984; typedef struct { int unk_00; int unk_04; - UnkStruct_ov101_021D13C8 * unk_08; + UnkStruct_ov101_021D13C8 *unk_08; UnkStruct_ov101_021D8544 unk_0C[3]; } UnkStruct_ov101_021D7A00; @@ -156,16 +156,16 @@ typedef struct { UnkEnum_ov101_021D9688 unk_18; UnkEnum_ov101_021D4F58 unk_1C; UnkStruct_ov101_021D8544 unk_20[3]; - UnkStruct_ov101_021D13C8 * unk_44; + UnkStruct_ov101_021D13C8 *unk_44; } UnkStruct_ov101_021D7D94; -static void ov101_021D630C(UnkStruct_ov101_021D630C * param0, UnkEnum_ov101_021D5814 param1); -static void ov101_021D63A4(UnkStruct_ov101_021D13C8 * param0); -static void ov101_021D63BC(SysTask * param0, void * param1); -static void ov101_021D63E8(SysTask * param0, void * param1); -static void ov101_021D6410(UnkStruct_ov101_021D13C8 * param0, UnkStruct_ov101_021D8544 * param1, const VecFx32 * param2); -static void ov101_021D65F4(UnkStruct_ov101_021D65F4 * param0); -static void ov101_021D7D94(UnkStruct_ov101_021D7D94 * param0); +static void ov101_021D630C(UnkStruct_ov101_021D630C *param0, UnkEnum_ov101_021D5814 param1); +static void ov101_021D63A4(UnkStruct_ov101_021D13C8 *param0); +static void ov101_021D63BC(SysTask *param0, void *param1); +static void ov101_021D63E8(SysTask *param0, void *param1); +static void ov101_021D6410(UnkStruct_ov101_021D13C8 *param0, UnkStruct_ov101_021D8544 *param1, const VecFx32 *param2); +static void ov101_021D65F4(UnkStruct_ov101_021D65F4 *param0); +static void ov101_021D7D94(UnkStruct_ov101_021D7D94 *param0); static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91DC; static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91F0; @@ -175,13 +175,13 @@ static const fx32 Unk_ov101_021D9354[10]; static const UnkStruct_ov101_021D93D4 Unk_ov101_021D93D4[UnkEnum_ov101_021D5814_05]; static const UnkStruct_ov101_021D93D4 Unk_ov101_021D93A4[UnkEnum_ov101_021D6764_03]; -void ov101_021D59AC (UnkStruct_ov101_021D13C8 * param0) +void ov101_021D59AC(UnkStruct_ov101_021D13C8 *param0) { UnkEnum_ov101_021D2BDC v0; fx32 v1, v2; - UnkStruct_ov101_021D5D90 * v3; + UnkStruct_ov101_021D5D90 *v3; UnkStruct_ov101_021D5A0C v4; - VecFx32 v5 = {0, 0, 0}; + VecFx32 v5 = { 0, 0, 0 }; v4.unk_00 = param0; @@ -195,11 +195,11 @@ void ov101_021D59AC (UnkStruct_ov101_021D13C8 * param0) } } -static int ov101_021D5A0C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D5A0C(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov101_021D5A64 * v1 = param1; - const UnkStruct_ov101_021D5A0C * v2 = sub_020715BC(param0); + UnkStruct_ov101_021D5A64 *v1 = param1; + const UnkStruct_ov101_021D5A0C *v2 = sub_020715BC(param0); v1->unk_00 = *v2; @@ -210,19 +210,19 @@ static int ov101_021D5A0C (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D5A64 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5A64(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D5A64 * v0 = param1; + UnkStruct_ov101_021D5A64 *v0 = param1; ov101_021D8544(&v0->unk_0C); } -static void ov101_021D5A70 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5A70(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; u32 v1; fx32 v2; VecFx32 v3; - UnkStruct_ov101_021D5A64 * v4 = param1; + UnkStruct_ov101_021D5A64 *v4 = param1; v0 = v4->unk_00.unk_08; v2 = v4->unk_00.unk_00->unk_90[v0] + v4->unk_00.unk_04; @@ -241,9 +241,9 @@ static void ov101_021D5A70 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov101_021D5AEC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5AEC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D5A64 * v0 = param1; + UnkStruct_ov101_021D5A64 *v0 = param1; } static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91DC = { @@ -254,20 +254,20 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91DC = { ov101_021D5AEC }; -void ov101_021D5AF0 (UnkStruct_ov101_021D13C8 * param0) +void ov101_021D5AF0(UnkStruct_ov101_021D13C8 *param0) { u32 v0; - VecFx32 v1 = {(FX32_ONE * 108), (FX32_ONE * 180), 0}; + VecFx32 v1 = { (FX32_ONE * 108), (FX32_ONE * 180), 0 }; for (v0 = 1; v0 < 100000; v0 *= 10, v1.x -= (FX32_ONE * 8)) { sub_02071330(param0->unk_44C, &Unk_ov101_021D91F0, &v1, v0, param0, 141); } } -static int ov101_021D5B44 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D5B44(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov101_021D5B9C * v1 = param1; + UnkStruct_ov101_021D5B9C *v1 = param1; v1->unk_04 = sub_020715B4(param0); v1->unk_08 = v1->unk_04 * 10; @@ -280,16 +280,16 @@ static int ov101_021D5B44 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D5B9C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5B9C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D5B9C * v0 = param1; + UnkStruct_ov101_021D5B9C *v0 = param1; ov101_021D8544(&v0->unk_0C); } -static void ov101_021D5BA8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5BA8(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov101_021D5B9C * v1 = param1; + UnkStruct_ov101_021D5B9C *v1 = param1; u32 v2 = v1->unk_00->unk_60; if ((v1->unk_04 > 1) && (v2 < v1->unk_04)) { @@ -312,9 +312,9 @@ static void ov101_021D5BA8 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02021C50(v1->unk_0C.unk_04, &v0); } -static void ov101_021D5C24 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5C24(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D5B9C * v0 = param1; + UnkStruct_ov101_021D5B9C *v0 = param1; } static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91F0 = { @@ -327,20 +327,20 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91F0 = { static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9204; -void ov101_021D5C28 (UnkStruct_ov101_021D13C8 * param0) +void ov101_021D5C28(UnkStruct_ov101_021D13C8 *param0) { u32 v0; - VecFx32 v1 = {(FX32_ONE * 180), (FX32_ONE * 180), 0}; + VecFx32 v1 = { (FX32_ONE * 180), (FX32_ONE * 180), 0 }; for (v0 = 1; v0 < 100000; v0 *= 10, v1.x -= (FX32_ONE * 8)) { sub_02071330(param0->unk_44C, &Unk_ov101_021D9204, &v1, v0, param0, 141); } } -static int ov101_021D5C7C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D5C7C(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov101_021D5CD4 * v1 = param1; + UnkStruct_ov101_021D5CD4 *v1 = param1; v1->unk_04 = sub_020715B4(param0); v1->unk_08 = v1->unk_04 * 10; @@ -353,16 +353,16 @@ static int ov101_021D5C7C (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D5CD4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5CD4(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D5CD4 * v0 = param1; + UnkStruct_ov101_021D5CD4 *v0 = param1; ov101_021D8544(&v0->unk_0C); } -static void ov101_021D5CE0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5CE0(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov101_021D5CD4 * v1 = param1; + UnkStruct_ov101_021D5CD4 *v1 = param1; u32 v2 = v1->unk_00->unk_64; if (v2 < v1->unk_04) { @@ -385,9 +385,9 @@ static void ov101_021D5CE0 (UnkStruct_ov101_021D5D90 * param0, void * param1) sub_02021C50(v1->unk_0C.unk_04, &v0); } -static void ov101_021D5D54 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5D54(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D5B9C * v0 = param1; + UnkStruct_ov101_021D5B9C *v0 = param1; } static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9204 = { @@ -399,20 +399,20 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9204 = { }; static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9218; -static int(*const * const Unk_ov101_021D9294[UnkEnum_ov101_021D5D90_07])(UnkStruct_ov101_021D630C *); +static int (*const *const Unk_ov101_021D9294[UnkEnum_ov101_021D5D90_07])(UnkStruct_ov101_021D630C *); -UnkStruct_ov101_021D5D90 * ov101_021D5D58 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D5814 param1) +UnkStruct_ov101_021D5D90 *ov101_021D5D58(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D5814 param1) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {(FX32_ONE * 0), (FX32_ONE * 400), 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { (FX32_ONE * 0), (FX32_ONE * 400), 0 }; v0 = sub_02071330(param0->unk_44C, &Unk_ov101_021D9218, &v1, param1, param0, 134); return v0; } -void ov101_021D5D90 (UnkStruct_ov101_021D5D90 * param0, UnkEnum_ov101_021D5D90 param1) +void ov101_021D5D90(UnkStruct_ov101_021D5D90 *param0, UnkEnum_ov101_021D5D90 param1) { - UnkStruct_ov101_021D630C * v0 = sub_02071598(param0); + UnkStruct_ov101_021D630C *v0 = sub_02071598(param0); v0->unk_00 = param1; v0->unk_04 = 0; @@ -420,9 +420,9 @@ void ov101_021D5D90 (UnkStruct_ov101_021D5D90 * param0, UnkEnum_ov101_021D5D90 p v0->unk_30 = 0; } -void ov101_021D5DA4 (UnkStruct_ov101_021D5D90 * param0, int param1) +void ov101_021D5DA4(UnkStruct_ov101_021D5D90 *param0, int param1) { - UnkStruct_ov101_021D630C * v0 = sub_02071598(param0); + UnkStruct_ov101_021D630C *v0 = sub_02071598(param0); if (param1 == 1) { sub_02021CAC(v0->unk_3C.unk_04, 0); @@ -431,15 +431,15 @@ void ov101_021D5DA4 (UnkStruct_ov101_021D5D90 * param0, int param1) } } -int ov101_021D5DC4 (UnkStruct_ov101_021D5D90 * param0) +int ov101_021D5DC4(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov101_021D630C * v0 = sub_02071598(param0); + UnkStruct_ov101_021D630C *v0 = sub_02071598(param0); return v0->unk_08; } -static int ov101_021D5DD0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D5DD0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D630C * v0 = param1; + UnkStruct_ov101_021D630C *v0 = param1; v0->unk_38 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); v0->unk_10 = sub_020715B4(param0); @@ -447,9 +447,9 @@ static int ov101_021D5DD0 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D5DE8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5DE8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D630C * v0 = param1; + UnkStruct_ov101_021D630C *v0 = param1; if (v0->unk_3C.unk_04 != NULL) { ov101_021D63A4(v0->unk_38); @@ -457,12 +457,12 @@ static void ov101_021D5DE8 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov101_021D5E04 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5E04(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov101_021D630C * v1 = param1; + UnkStruct_ov101_021D630C *v1 = param1; - int(*const * v2)(UnkStruct_ov101_021D630C *); + int (*const *v2)(UnkStruct_ov101_021D630C *); do { v2 = Unk_ov101_021D9294[v1->unk_00]; @@ -470,9 +470,9 @@ static void ov101_021D5E04 (UnkStruct_ov101_021D5D90 * param0, void * param1) } while (v0 == 1); } -static void ov101_021D5E24 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D5E24(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D630C * v0 = param1; + UnkStruct_ov101_021D630C *v0 = param1; } static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9218 = { @@ -483,14 +483,14 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9218 = { ov101_021D5E24 }; -static int ov101_021D5E28 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D5E28(UnkStruct_ov101_021D630C *param0) { ov101_021D630C(param0, param0->unk_10); param0->unk_04++; return 0; } -static int ov101_021D5E3C (UnkStruct_ov101_021D630C * param0) +static int ov101_021D5E3C(UnkStruct_ov101_021D630C *param0) { if (param0->unk_0C == 2) { param0->unk_04++; @@ -499,9 +499,9 @@ static int ov101_021D5E3C (UnkStruct_ov101_021D630C * param0) return 0; } -static int ov101_021D5E4C (UnkStruct_ov101_021D630C * param0) +static int ov101_021D5E4C(UnkStruct_ov101_021D630C *param0) { - VecFx32 v0 = {(FX32_ONE * 0), (FX32_ONE * (192 + 224)), 0}; + VecFx32 v0 = { (FX32_ONE * 0), (FX32_ONE * (192 + 224)), 0 }; ov101_021D6410(param0->unk_38, ¶m0->unk_3C, &v0); @@ -511,19 +511,22 @@ static int ov101_021D5E4C (UnkStruct_ov101_021D630C * param0) return 0; } -static int ov101_021D5E80 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D5E80(UnkStruct_ov101_021D630C *param0) { return 0; } -static int(*const Unk_ov101_021D911C[])(UnkStruct_ov101_021D630C * work) = { - ov101_021D5E28, ov101_021D5E3C, ov101_021D5E4C, ov101_021D5E80, +static int (*const Unk_ov101_021D911C[])(UnkStruct_ov101_021D630C *work) = { + ov101_021D5E28, + ov101_021D5E3C, + ov101_021D5E4C, + ov101_021D5E80, }; -static int ov101_021D5E84 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D5E84(UnkStruct_ov101_021D630C *param0) { - VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 192)), 0}; - VecFx32 v1 = {0x2000, 0x2000, 0}; + VecFx32 v0 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 192)), 0 }; + VecFx32 v1 = { 0x2000, 0x2000, 0 }; sub_02021C70(param0->unk_3C.unk_04, &v1); sub_02021C94(param0->unk_3C.unk_04, 0); @@ -536,7 +539,7 @@ static int ov101_021D5E84 (UnkStruct_ov101_021D630C * param0) return 0; } -static int ov101_021D5EEC (UnkStruct_ov101_021D630C * param0) +static int ov101_021D5EEC(UnkStruct_ov101_021D630C *param0) { VecFx32 v0, v1; @@ -563,7 +566,7 @@ static int ov101_021D5EEC (UnkStruct_ov101_021D630C * param0) return 0; } -static int ov101_021D5F54 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D5F54(UnkStruct_ov101_021D630C *param0) { param0->unk_30++; @@ -576,11 +579,11 @@ static int ov101_021D5F54 (UnkStruct_ov101_021D630C * param0) return 0; } -static int(*const Unk_ov101_021D912C[])(UnkStruct_ov101_021D630C *) = { +static int (*const Unk_ov101_021D912C[])(UnkStruct_ov101_021D630C *) = { ov101_021D5E84, ov101_021D5EEC, ov101_021D5F54, ov101_021D5E80 }; -static int ov101_021D5F70 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D5F70(UnkStruct_ov101_021D630C *param0) { SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 1); sub_02021DE0(param0->unk_3C.unk_04); @@ -592,7 +595,7 @@ static int ov101_021D5F70 (UnkStruct_ov101_021D630C * param0) return 0; } -static int ov101_021D5F9C (UnkStruct_ov101_021D630C * param0) +static int ov101_021D5F9C(UnkStruct_ov101_021D630C *param0) { param0->unk_30++; @@ -605,14 +608,14 @@ static int ov101_021D5F9C (UnkStruct_ov101_021D630C * param0) return 0; } -static int(*const Unk_ov101_021D9028[])(UnkStruct_ov101_021D630C *) = { +static int (*const Unk_ov101_021D9028[])(UnkStruct_ov101_021D630C *) = { ov101_021D5F70, ov101_021D5F9C, ov101_021D5E80 }; -static int ov101_021D5FB8 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D5FB8(UnkStruct_ov101_021D630C *param0) { - VecFx32 v0 = {0x1000, 0x1000, 0}; - VecFx32 v1 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 160)), 0}; + VecFx32 v0 = { 0x1000, 0x1000, 0 }; + VecFx32 v1 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 160)), 0 }; param0->unk_14 = v1; @@ -626,10 +629,10 @@ static int ov101_021D5FB8 (UnkStruct_ov101_021D630C * param0) return 1; } -static int ov101_021D6020 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D6020(UnkStruct_ov101_021D630C *param0) { VecFx32 v0; - fx32 v1[8] = {(FX32_ONE * -8), (FX32_ONE * 0), (FX32_ONE * -6), (FX32_ONE * 0), (FX32_ONE * -4), (FX32_ONE * 0), (FX32_ONE * -2), (FX32_ONE * 0)}; + fx32 v1[8] = { (FX32_ONE * -8), (FX32_ONE * 0), (FX32_ONE * -6), (FX32_ONE * 0), (FX32_ONE * -4), (FX32_ONE * 0), (FX32_ONE * -2), (FX32_ONE * 0) }; v0 = param0->unk_14; v0.y += v1[param0->unk_30 / 2]; @@ -647,14 +650,14 @@ static int ov101_021D6020 (UnkStruct_ov101_021D630C * param0) return 0; } -static int(*const Unk_ov101_021D8F38[])(UnkStruct_ov101_021D630C *) = { +static int (*const Unk_ov101_021D8F38[])(UnkStruct_ov101_021D630C *) = { ov101_021D5FB8, ov101_021D6020, ov101_021D5E80 }; -static int ov101_021D6084 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D6084(UnkStruct_ov101_021D630C *param0) { - VecFx32 v0 = {0x1000, 0x1000, 0}; - VecFx32 v1 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 160)), 0}; + VecFx32 v0 = { 0x1000, 0x1000, 0 }; + VecFx32 v1 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 160)), 0 }; param0->unk_14 = v1; @@ -668,7 +671,7 @@ static int ov101_021D6084 (UnkStruct_ov101_021D630C * param0) return 1; } -static int ov101_021D60EC (UnkStruct_ov101_021D630C * param0) +static int ov101_021D60EC(UnkStruct_ov101_021D630C *param0) { fx32 v0; VecFx32 v1, v2; @@ -697,15 +700,15 @@ static int ov101_021D60EC (UnkStruct_ov101_021D630C * param0) return 0; } -static int(*const Unk_ov101_021D8FA4[])(UnkStruct_ov101_021D630C *) = { +static int (*const Unk_ov101_021D8FA4[])(UnkStruct_ov101_021D630C *) = { ov101_021D6084, ov101_021D60EC, ov101_021D5E80 }; -static int ov101_021D6158 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D6158(UnkStruct_ov101_021D630C *param0) { - VecFx32 v0 = {0x1000, 0x1000, 0}; - VecFx32 v1 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 160)), 0}; - VecFx32 v2 = {0, 0, 0}; + VecFx32 v0 = { 0x1000, 0x1000, 0 }; + VecFx32 v1 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 160)), 0 }; + VecFx32 v2 = { 0, 0, 0 }; param0->unk_14 = v1; param0->unk_20 = v2; @@ -724,11 +727,11 @@ static int ov101_021D6158 (UnkStruct_ov101_021D630C * param0) return 1; } -static int ov101_021D61E0 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D61E0(UnkStruct_ov101_021D630C *param0) { - u32 v0[8] = {-16, 0, 16, 0, 16, 0, -16, 0}; - fx32 v1[8] = {(FX32_ONE * -2), 0, (FX32_ONE * 2), 0, (FX32_ONE * 2), 0, (FX32_ONE * -2), 0}; - u32 v2[8] = {4, 1, 4, 8, 4, 1, 4, 8}; + u32 v0[8] = { -16, 0, 16, 0, 16, 0, -16, 0 }; + fx32 v1[8] = { (FX32_ONE * -2), 0, (FX32_ONE * 2), 0, (FX32_ONE * 2), 0, (FX32_ONE * -2), 0 }; + u32 v2[8] = { 4, 1, 4, 8, 4, 1, 4, 8 }; param0->unk_2C += v0[param0->unk_34]; param0->unk_14.x += v1[param0->unk_34]; @@ -750,15 +753,15 @@ static int ov101_021D61E0 (UnkStruct_ov101_021D630C * param0) return 0; } -static int(*const Unk_ov101_021D8E90[])(UnkStruct_ov101_021D630C *) = { +static int (*const Unk_ov101_021D8E90[])(UnkStruct_ov101_021D630C *) = { ov101_021D6158, ov101_021D61E0, ov101_021D5E80 }; -static int ov101_021D6288 (UnkStruct_ov101_021D630C * param0) +static int ov101_021D6288(UnkStruct_ov101_021D630C *param0) { - VecFx32 v0 = {0x1000, 0x1000, 0}; - VecFx32 v1 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 160)), 0}; - VecFx32 v2 = {0, 0, 0}; + VecFx32 v0 = { 0x1000, 0x1000, 0 }; + VecFx32 v1 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 160)), 0 }; + VecFx32 v2 = { 0, 0, 0 }; param0->unk_14 = v1; param0->unk_20 = v2; @@ -775,19 +778,19 @@ static int ov101_021D6288 (UnkStruct_ov101_021D630C * param0) return 1; } -static int(*const Unk_ov101_021D8E68[])(UnkStruct_ov101_021D630C *) = { +static int (*const Unk_ov101_021D8E68[])(UnkStruct_ov101_021D630C *) = { ov101_021D6288, ov101_021D5E80 }; -static int(*const * const Unk_ov101_021D9294[UnkEnum_ov101_021D5D90_07])(UnkStruct_ov101_021D630C *) = { +static int (*const *const Unk_ov101_021D9294[UnkEnum_ov101_021D5D90_07])(UnkStruct_ov101_021D630C *) = { Unk_ov101_021D911C, Unk_ov101_021D912C, Unk_ov101_021D9028, Unk_ov101_021D8F38, Unk_ov101_021D8FA4, Unk_ov101_021D8E90, Unk_ov101_021D8E68 }; -static void ov101_021D630C (UnkStruct_ov101_021D630C * param0, UnkEnum_ov101_021D5814 param1) +static void ov101_021D630C(UnkStruct_ov101_021D630C *param0, UnkEnum_ov101_021D5814 param1) { - SysTask * v0; - UnkStruct_ov101_021D13C8 * v1 = param0->unk_38; - const UnkStruct_ov101_021D93D4 * v2; + SysTask *v0; + UnkStruct_ov101_021D13C8 *v1 = param0->unk_38; + const UnkStruct_ov101_021D93D4 *v2; GF_ASSERT(param1 < UnkEnum_ov101_021D5814_05); v2 = &Unk_ov101_021D93D4[param1]; @@ -804,15 +807,15 @@ static void ov101_021D630C (UnkStruct_ov101_021D630C * param0, UnkEnum_ov101_021 GF_ASSERT(v0 != NULL); } -static void ov101_021D63A4 (UnkStruct_ov101_021D13C8 * param0) +static void ov101_021D63A4(UnkStruct_ov101_021D13C8 *param0) { ov101_021D8358(param0->unk_450, 2, 2, 2, 2); } -static void ov101_021D63BC (SysTask * param0, void * param1) +static void ov101_021D63BC(SysTask *param0, void *param1) { - UnkStruct_ov101_021D630C * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_38; + UnkStruct_ov101_021D630C *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_38; ov101_021D814C(v1->unk_450, 2); ov101_021D8220(v1->unk_450, 2); @@ -822,10 +825,10 @@ static void ov101_021D63BC (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov101_021D63E8 (SysTask * param0, void * param1) +static void ov101_021D63E8(SysTask *param0, void *param1) { - UnkStruct_ov101_021D630C * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_38; + UnkStruct_ov101_021D630C *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_38; if (v0->unk_0C == 1) { ov101_021D8254(v1->unk_450, 2); @@ -834,10 +837,10 @@ static void ov101_021D63E8 (SysTask * param0, void * param1) } } -static void ov101_021D6410 (UnkStruct_ov101_021D13C8 * param0, UnkStruct_ov101_021D8544 * param1, const VecFx32 * param2) +static void ov101_021D6410(UnkStruct_ov101_021D13C8 *param0, UnkStruct_ov101_021D8544 *param1, const VecFx32 *param2) { - VecFx32 v0 = {0, 0, 0}; - VecFx32 v1 = {0x1000, 0x1000, 0}; + VecFx32 v0 = { 0, 0, 0 }; + VecFx32 v1 = { 0x1000, 0x1000, 0 }; ov101_021D84A4(param0->unk_450, param1, param2, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 2, 2, 2, 2, 2, 7); @@ -850,18 +853,18 @@ static void ov101_021D6410 (UnkStruct_ov101_021D13C8 * param0, UnkStruct_ov101_0 static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9150; -UnkStruct_ov101_021D5D90 * ov101_021D6484 (UnkStruct_ov101_021D13C8 * param0) +UnkStruct_ov101_021D5D90 *ov101_021D6484(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 16))), 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 16))), 0 }; v0 = sub_02071330(param0->unk_44C, &Unk_ov101_021D9150, &v1, 0, param0, 135); return v0; } -static int ov101_021D64BC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D64BC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D65F4 * v0 = param1; + UnkStruct_ov101_021D65F4 *v0 = param1; v0->unk_10 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); ov101_021D65F4(v0); @@ -869,9 +872,9 @@ static int ov101_021D64BC (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D64D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D64D0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D65F4 * v0 = param1; + UnkStruct_ov101_021D65F4 *v0 = param1; if (v0->unk_14.unk_04 != NULL) { ov101_021D8358(v0->unk_10->unk_450, 3, 3, 3, 3); @@ -879,9 +882,9 @@ static void ov101_021D64D0 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov101_021D64FC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D64FC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D65F4 * v0 = param1; + UnkStruct_ov101_021D65F4 *v0 = param1; switch (v0->unk_00) { case 0: @@ -917,9 +920,9 @@ static void ov101_021D64FC (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov101_021D659C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D659C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D65F4 * v0 = param1; + UnkStruct_ov101_021D65F4 *v0 = param1; } static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9150 = { @@ -930,10 +933,10 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9150 = { ov101_021D659C }; -static void ov101_021D65A0 (SysTask * param0, void * param1) +static void ov101_021D65A0(SysTask *param0, void *param1) { - UnkStruct_ov101_021D65F4 * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_10; + UnkStruct_ov101_021D65F4 *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_10; ov101_021D814C(v1->unk_450, 3); ov101_021D8220(v1->unk_450, 3); @@ -943,10 +946,10 @@ static void ov101_021D65A0 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov101_021D65CC (SysTask * param0, void * param1) +static void ov101_021D65CC(SysTask *param0, void *param1) { - UnkStruct_ov101_021D65F4 * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_10; + UnkStruct_ov101_021D65F4 *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_10; if (v0->unk_0C == 1) { ov101_021D8254(v1->unk_450, 3); @@ -955,10 +958,10 @@ static void ov101_021D65CC (SysTask * param0, void * param1) } } -static void ov101_021D65F4 (UnkStruct_ov101_021D65F4 * param0) +static void ov101_021D65F4(UnkStruct_ov101_021D65F4 *param0) { - SysTask * v0; - UnkStruct_ov101_021D13C8 * v1 = param0->unk_10; + SysTask *v0; + UnkStruct_ov101_021D13C8 *v1 = param0->unk_10; ov101_021D80E4(v1->unk_450, (NNS_G2D_VRAM_TYPE_2DSUB), v1->unk_438, 44, 3); ov101_021D81B4(v1->unk_450, (NNS_G2D_VRAM_TYPE_2DSUB), v1->unk_438, 47, 3); @@ -973,12 +976,12 @@ static void ov101_021D65F4 (UnkStruct_ov101_021D65F4 * param0) } static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9164; -static int(*const * const Unk_ov101_021D9330[UnkEnum_ov101_021D679C_09])(UnkStruct_ov101_021D66D0 *); +static int (*const *const Unk_ov101_021D9330[UnkEnum_ov101_021D679C_09])(UnkStruct_ov101_021D66D0 *); -static void ov101_021D667C (SysTask * param0, void * param1) +static void ov101_021D667C(SysTask *param0, void *param1) { - UnkStruct_ov101_021D66D0 * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_20; + UnkStruct_ov101_021D66D0 *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_20; ov101_021D814C(v1->unk_450, 4); ov101_021D8220(v1->unk_450, 4); @@ -987,10 +990,10 @@ static void ov101_021D667C (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov101_021D66A8 (SysTask * param0, void * param1) +static void ov101_021D66A8(SysTask *param0, void *param1) { - UnkStruct_ov101_021D66D0 * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_20; + UnkStruct_ov101_021D66D0 *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_20; if (v0->unk_10 == 1) { ov101_021D8254(v1->unk_450, 4); @@ -1000,11 +1003,11 @@ static void ov101_021D66A8 (SysTask * param0, void * param1) } } -static void ov101_021D66D0 (UnkStruct_ov101_021D66D0 * param0) +static void ov101_021D66D0(UnkStruct_ov101_021D66D0 *param0) { - SysTask * v0; - UnkStruct_ov101_021D13C8 * v1 = param0->unk_20; - const UnkStruct_ov101_021D93D4 * v2 = &Unk_ov101_021D93A4[param0->unk_18]; + SysTask *v0; + UnkStruct_ov101_021D13C8 *v1 = param0->unk_20; + const UnkStruct_ov101_021D93D4 *v2 = &Unk_ov101_021D93A4[param0->unk_18]; ov101_021D80E4(v1->unk_450, (NNS_G2D_VRAM_TYPE_2DSUB), v1->unk_438, v2->unk_00, 4); ov101_021D81B4(v1->unk_450, (NNS_G2D_VRAM_TYPE_2DSUB), v1->unk_438, v2->unk_04, 4); @@ -1018,19 +1021,19 @@ static void ov101_021D66D0 (UnkStruct_ov101_021D66D0 * param0) GF_ASSERT(v0 != NULL); } -UnkStruct_ov101_021D5D90 * ov101_021D6764 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D6764 param1) +UnkStruct_ov101_021D5D90 *ov101_021D6764(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D6764 param1) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {(FX32_ONE * 128), (FX32_ONE * 160), 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { (FX32_ONE * 128), (FX32_ONE * 160), 0 }; v0 = sub_02071330(param0->unk_44C, &Unk_ov101_021D9164, &v1, param1, param0, 137); return v0; } -void ov101_021D679C (UnkStruct_ov101_021D5D90 * param0, UnkEnum_ov101_021D679C param1) +void ov101_021D679C(UnkStruct_ov101_021D5D90 *param0, UnkEnum_ov101_021D679C param1) { - UnkStruct_ov101_021D66D0 * v0 = sub_02071598(param0); + UnkStruct_ov101_021D66D0 *v0 = sub_02071598(param0); v0->unk_04 = param1; v0->unk_08 = 0; @@ -1038,15 +1041,15 @@ void ov101_021D679C (UnkStruct_ov101_021D5D90 * param0, UnkEnum_ov101_021D679C p v0->unk_14 = 0; } -int ov101_021D67B0 (UnkStruct_ov101_021D5D90 * param0) +int ov101_021D67B0(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov101_021D66D0 * v0 = sub_02071598(param0); + UnkStruct_ov101_021D66D0 *v0 = sub_02071598(param0); return v0->unk_0C; } -static int ov101_021D67BC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D67BC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D66D0 * v0 = param1; + UnkStruct_ov101_021D66D0 *v0 = param1; v0->unk_20 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); v0->unk_18 = sub_020715B4(param0); @@ -1056,24 +1059,24 @@ static int ov101_021D67BC (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D67DC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D67DC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D66D0 * v0 = param1; + UnkStruct_ov101_021D66D0 *v0 = param1; if (v0->unk_24.unk_04 != NULL) { - UnkStruct_ov101_021D13C8 * v1 = v0->unk_20; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_20; ov101_021D8358(v1->unk_450, 4, 4, 4, 4); ov101_021D8544(&v0->unk_24); } } -static void ov101_021D6808 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D6808(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov101_021D66D0 * v1 = param1; + UnkStruct_ov101_021D66D0 *v1 = param1; - int(*const * v2)(UnkStruct_ov101_021D66D0 *); + int (*const *v2)(UnkStruct_ov101_021D66D0 *); do { v2 = Unk_ov101_021D9330[v1->unk_04]; @@ -1081,9 +1084,9 @@ static void ov101_021D6808 (UnkStruct_ov101_021D5D90 * param0, void * param1) } while (v0 == 1); } -static void ov101_021D6828 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D6828(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D66D0 * v0 = param1; + UnkStruct_ov101_021D66D0 *v0 = param1; } static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9164 = { @@ -1094,12 +1097,12 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9164 = { ov101_021D6828 }; -static int ov101_021D682C (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D682C(UnkStruct_ov101_021D66D0 *param0) { if (param0->unk_10 == 2) { - VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 256)), 0}; - VecFx32 v1 = {0, 0, 0}; - VecFx32 v2 = {0x1000, 0x1000, 0}; + VecFx32 v0 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 256)), 0 }; + VecFx32 v1 = { 0, 0, 0 }; + VecFx32 v2 = { 0x1000, 0x1000, 0 }; ov101_021D84A4(param0->unk_20->unk_450, ¶m0->unk_24, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 4, 4, 4, 4, 2, 6); sub_02021CF8(param0->unk_24.unk_04, 2); @@ -1113,19 +1116,20 @@ static int ov101_021D682C (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int ov101_021D68A8 (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D68A8(UnkStruct_ov101_021D66D0 *param0) { return 0; } -static int(*const Unk_ov101_021D8E80[])(UnkStruct_ov101_021D66D0 *) = { - ov101_021D682C, ov101_021D68A8, +static int (*const Unk_ov101_021D8E80[])(UnkStruct_ov101_021D66D0 *) = { + ov101_021D682C, + ov101_021D68A8, }; -static int ov101_021D68AC (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D68AC(UnkStruct_ov101_021D66D0 *param0) { - VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0}; - VecFx32 v1 = {0x400, 0x400, 0}; + VecFx32 v0 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0 }; + VecFx32 v1 = { 0x400, 0x400, 0 }; sub_02021C70(param0->unk_24.unk_04, &v1); sub_02021C50(param0->unk_24.unk_04, &v0); @@ -1137,7 +1141,7 @@ static int ov101_021D68AC (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int ov101_021D6908 (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D6908(UnkStruct_ov101_021D66D0 *param0) { VecFx32 v0, v1; @@ -1164,7 +1168,7 @@ static int ov101_021D6908 (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int ov101_021D6968 (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D6968(UnkStruct_ov101_021D66D0 *param0) { sub_02021E2C(param0->unk_24.unk_04, (FX32_ONE * 1)); param0->unk_14++; @@ -1178,14 +1182,14 @@ static int ov101_021D6968 (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int(*const Unk_ov101_021D910C[])(UnkStruct_ov101_021D66D0 *) = { +static int (*const Unk_ov101_021D910C[])(UnkStruct_ov101_021D66D0 *) = { ov101_021D68AC, ov101_021D6908, ov101_021D6968, ov101_021D68A8 }; -static int ov101_021D6994 (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D6994(UnkStruct_ov101_021D66D0 *param0) { - VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0}; - VecFx32 v1 = {0x1000, 0x1000, 0}; + VecFx32 v0 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0 }; + VecFx32 v1 = { 0x1000, 0x1000, 0 }; sub_02021C70(param0->unk_24.unk_04, &v1); sub_02021C50(param0->unk_24.unk_04, &v0); @@ -1198,7 +1202,7 @@ static int ov101_021D6994 (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int ov101_021D69FC (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D69FC(UnkStruct_ov101_021D66D0 *param0) { VecFx32 v0, v1; @@ -1225,14 +1229,14 @@ static int ov101_021D69FC (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int(*const Unk_ov101_021D9064[])(UnkStruct_ov101_021D66D0 *) = { +static int (*const Unk_ov101_021D9064[])(UnkStruct_ov101_021D66D0 *) = { ov101_021D6994, ov101_021D69FC, ov101_021D68A8 }; -static int ov101_021D6A60 (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D6A60(UnkStruct_ov101_021D66D0 *param0) { - VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0}; - VecFx32 v1 = {0x1000, 0x1000, 0}; + VecFx32 v0 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0 }; + VecFx32 v1 = { 0x1000, 0x1000, 0 }; sub_02021C70(param0->unk_24.unk_04, &v1); sub_02021C50(param0->unk_24.unk_04, &v0); @@ -1247,14 +1251,14 @@ static int ov101_021D6A60 (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int(*const Unk_ov101_021D8E58[])(UnkStruct_ov101_021D66D0 *) = { +static int (*const Unk_ov101_021D8E58[])(UnkStruct_ov101_021D66D0 *) = { ov101_021D6A60, ov101_021D68A8 }; -static int ov101_021D6AC8 (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D6AC8(UnkStruct_ov101_021D66D0 *param0) { - VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0}; - VecFx32 v1 = {0x1000, 0x1000, 0}; + VecFx32 v0 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0 }; + VecFx32 v1 = { 0x1000, 0x1000, 0 }; sub_02021C70(param0->unk_24.unk_04, &v1); sub_02021C50(param0->unk_24.unk_04, &v0); @@ -1272,14 +1276,14 @@ static int ov101_021D6AC8 (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int(*const Unk_ov101_021D8E88[])(UnkStruct_ov101_021D66D0 *) = { +static int (*const Unk_ov101_021D8E88[])(UnkStruct_ov101_021D66D0 *) = { ov101_021D6AC8, ov101_021D68A8 }; -static int ov101_021D6B3C (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D6B3C(UnkStruct_ov101_021D66D0 *param0) { - VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0}; - VecFx32 v1 = {0x1000, 0x1000, 0}; + VecFx32 v0 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0 }; + VecFx32 v1 = { 0x1000, 0x1000, 0 }; sub_02021C70(param0->unk_24.unk_04, &v1); sub_02021C50(param0->unk_24.unk_04, &v0); @@ -1294,14 +1298,14 @@ static int ov101_021D6B3C (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int(*const Unk_ov101_021D8E78[])(UnkStruct_ov101_021D66D0 *) = { +static int (*const Unk_ov101_021D8E78[])(UnkStruct_ov101_021D66D0 *) = { ov101_021D6B3C, ov101_021D68A8 }; -static int ov101_021D6BA4 (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D6BA4(UnkStruct_ov101_021D66D0 *param0) { - VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0}; - VecFx32 v1 = {0x1000, 0x1000, 0}; + VecFx32 v0 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0 }; + VecFx32 v1 = { 0x1000, 0x1000, 0 }; sub_02021C70(param0->unk_24.unk_04, &v1); sub_02021C50(param0->unk_24.unk_04, &v0); @@ -1316,14 +1320,14 @@ static int ov101_021D6BA4 (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int(*const Unk_ov101_021D8E70[])(UnkStruct_ov101_021D66D0 *) = { +static int (*const Unk_ov101_021D8E70[])(UnkStruct_ov101_021D66D0 *) = { ov101_021D6BA4, ov101_021D68A8 }; -static int ov101_021D6C0C (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D6C0C(UnkStruct_ov101_021D66D0 *param0) { - VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0}; - VecFx32 v1 = {0x1000, 0x1000, 0}; + VecFx32 v0 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0 }; + VecFx32 v1 = { 0x1000, 0x1000, 0 }; sub_02021C70(param0->unk_24.unk_04, &v1); sub_02021C50(param0->unk_24.unk_04, &v0); @@ -1338,14 +1342,14 @@ static int ov101_021D6C0C (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int(*const Unk_ov101_021D8E60[])(UnkStruct_ov101_021D66D0 *) = { +static int (*const Unk_ov101_021D8E60[])(UnkStruct_ov101_021D66D0 *) = { ov101_021D6C0C, ov101_021D68A8 }; -static int ov101_021D6C74 (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D6C74(UnkStruct_ov101_021D66D0 *param0) { - VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0}; - VecFx32 v1 = {0x1000, 0x1000, 0}; + VecFx32 v0 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0 }; + VecFx32 v1 = { 0x1000, 0x1000, 0 }; sub_02021C70(param0->unk_24.unk_04, &v1); sub_02021C50(param0->unk_24.unk_04, &v0); @@ -1362,7 +1366,7 @@ static int ov101_021D6C74 (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int ov101_021D6CE0 (UnkStruct_ov101_021D66D0 * param0) +static int ov101_021D6CE0(UnkStruct_ov101_021D66D0 *param0) { sub_02021E2C(param0->unk_24.unk_04, FX32_ONE); @@ -1378,20 +1382,20 @@ static int ov101_021D6CE0 (UnkStruct_ov101_021D66D0 * param0) return 0; } -static int(*const Unk_ov101_021D8ED8[])(UnkStruct_ov101_021D66D0 *) = { +static int (*const Unk_ov101_021D8ED8[])(UnkStruct_ov101_021D66D0 *) = { ov101_021D6C74, ov101_021D6CE0, ov101_021D68A8 }; -static int(*const * const Unk_ov101_021D9330[UnkEnum_ov101_021D679C_09])(UnkStruct_ov101_021D66D0 *) = { +static int (*const *const Unk_ov101_021D9330[UnkEnum_ov101_021D679C_09])(UnkStruct_ov101_021D66D0 *) = { Unk_ov101_021D8E80, Unk_ov101_021D910C, Unk_ov101_021D9064, Unk_ov101_021D8E58, Unk_ov101_021D8E88, Unk_ov101_021D8E78, Unk_ov101_021D8E70, Unk_ov101_021D8E60, Unk_ov101_021D8ED8 }; static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9178; -static void ov101_021D6D10 (SysTask * param0, void * param1) +static void ov101_021D6D10(SysTask *param0, void *param1) { - UnkStruct_ov101_021D6D10 * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_2C; + UnkStruct_ov101_021D6D10 *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_2C; ov101_021D814C(v1->unk_450, 5); ov101_021D8220(v1->unk_450, 5); @@ -1401,10 +1405,10 @@ static void ov101_021D6D10 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void ov101_021D6D3C (SysTask * param0, void * param1) +static void ov101_021D6D3C(SysTask *param0, void *param1) { - UnkStruct_ov101_021D6D10 * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_2C; + UnkStruct_ov101_021D6D10 *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_2C; if (v0->unk_10 = 1) { ov101_021D8254(v1->unk_450, 5); @@ -1413,10 +1417,10 @@ static void ov101_021D6D3C (SysTask * param0, void * param1) } } -static void ov101_021D6D68 (UnkStruct_ov101_021D6D10 * param0) +static void ov101_021D6D68(UnkStruct_ov101_021D6D10 *param0) { - SysTask * v0; - UnkStruct_ov101_021D13C8 * v1 = param0->unk_2C; + SysTask *v0; + UnkStruct_ov101_021D13C8 *v1 = param0->unk_2C; ov101_021D80E4(v1->unk_450, (NNS_G2D_VRAM_TYPE_2DSUB), v1->unk_438, 56, 5); ov101_021D81B4(v1->unk_450, (NNS_G2D_VRAM_TYPE_2DSUB), v1->unk_438, 59, 5); @@ -1429,34 +1433,34 @@ static void ov101_021D6D68 (UnkStruct_ov101_021D6D10 * param0) GF_ASSERT(v0 != NULL); } -UnkStruct_ov101_021D5D90 * ov101_021D6DF0 (UnkStruct_ov101_021D13C8 * param0) +UnkStruct_ov101_021D5D90 *ov101_021D6DF0(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {0, 0, 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { 0, 0, 0 }; v0 = sub_02071330(param0->unk_44C, &Unk_ov101_021D9178, &v1, 0, param0, 136); return v0; } -int ov101_021D6E1C (UnkStruct_ov101_021D5D90 * param0) +int ov101_021D6E1C(UnkStruct_ov101_021D5D90 *param0) { - UnkStruct_ov101_021D6D10 * v0 = sub_02071598(param0); + UnkStruct_ov101_021D6D10 *v0 = sub_02071598(param0); return v0->unk_04; } -static int ov101_021D6E28 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D6E28(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D6D10 * v0 = param1; + UnkStruct_ov101_021D6D10 *v0 = param1; v0->unk_2C = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); ov101_021D6D68(v0); return 1; } -static void ov101_021D6E3C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D6E3C(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D6D10 * v0 = param1; + UnkStruct_ov101_021D6D10 *v0 = param1; if (v0->unk_30.unk_04 != NULL) { ov101_021D8358(v0->unk_2C->unk_450, 5, 5, 5, 5); @@ -1468,7 +1472,7 @@ static void ov101_021D6E3C (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov101_021D6E78 (UnkStruct_ov101_021D5D90 * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, GraphicElementData * param5, int param6) +static void ov101_021D6E78(UnkStruct_ov101_021D5D90 *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, GraphicElementData *param5, int param6) { VecFx32 v0, v1; @@ -1487,9 +1491,9 @@ static void ov101_021D6E78 (UnkStruct_ov101_021D5D90 * param0, fx32 param1, fx32 sub_02021C50(param5, &v1); } -static void ov101_021D6EC8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D6EC8(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D6D10 * v0 = param1; + UnkStruct_ov101_021D6D10 *v0 = param1; switch (v0->unk_00) { case 0: @@ -1498,15 +1502,14 @@ static void ov101_021D6EC8 (UnkStruct_ov101_021D5D90 * param0, void * param1) } { - VecFx32 v1 = {0, ((FX32_ONE * 192) + (FX32_ONE * 256)), 0}; + VecFx32 v1 = { 0, ((FX32_ONE * 192) + (FX32_ONE * 256)), 0 }; ov101_021D84A4(v0->unk_2C->unk_450, &v0->unk_30, &v1, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 5, 5, 5, 5, 2, 4); ov101_021D84A4(v0->unk_2C->unk_450, &v0->unk_3C, &v1, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 5, 5, 5, 5, 2, 4); sub_02021D0C(v0->unk_3C.unk_04, 1); v0->unk_00++; } - case 1: - { + case 1: { int v2 = 0; VecFx32 v3, v4; @@ -1540,8 +1543,7 @@ static void ov101_021D6EC8 (UnkStruct_ov101_021D5D90 * param0, void * param1) if (v2 == 2) { v0->unk_00++; } - } - break; + } break; case 2: v0->unk_08++; @@ -1655,9 +1657,9 @@ static void ov101_021D6EC8 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov101_021D7224 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7224(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D6D10 * v0 = param1; + UnkStruct_ov101_021D6D10 *v0 = param1; } static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9178 = { @@ -1670,19 +1672,19 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9178 = { static const UnkStruct_ov101_021D86B0 Unk_ov101_021D918C; -UnkStruct_ov101_021D5D90 * ov101_021D7228 (UnkStruct_ov101_021D13C8 * param0) +UnkStruct_ov101_021D5D90 *ov101_021D7228(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {(FX32_ONE * 24), ((FX32_ONE * 192) + (FX32_ONE * 8)), 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { (FX32_ONE * 24), ((FX32_ONE * 192) + (FX32_ONE * 8)), 0 }; v0 = sub_02071330(param0->unk_44C, &Unk_ov101_021D918C, &v1, 0, param0, 142); return v0; } -static int ov101_021D7260 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D7260(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov101_021D72AC * v1 = param1; + UnkStruct_ov101_021D72AC *v1 = param1; v1->unk_00 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); @@ -1693,17 +1695,17 @@ static int ov101_021D7260 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D72AC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D72AC(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D72AC * v0 = param1; + UnkStruct_ov101_021D72AC *v0 = param1; ov101_021D8544(&v0->unk_04); } -static void ov101_021D72B8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D72B8(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0 = 1; - UnkStruct_ov101_021D72AC * v1 = param1; - UnkStruct_ov101_021D4764 * v2 = &v1->unk_00->unk_13C; + UnkStruct_ov101_021D72AC *v1 = param1; + UnkStruct_ov101_021D4764 *v2 = &v1->unk_00->unk_13C; if (v2->unk_0C == 1) { v0 = 0; @@ -1722,10 +1724,10 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D918C = { static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91C8; -UnkStruct_ov101_021D5D90 * ov101_021D72D4 (UnkStruct_ov101_021D13C8 * param0) +UnkStruct_ov101_021D5D90 *ov101_021D72D4(UnkStruct_ov101_021D13C8 *param0) { VecFx32 v0; - UnkStruct_ov101_021D5D90 * v1; + UnkStruct_ov101_021D5D90 *v1; v0.x = (FX32_ONE * (128 - (((6 + 5) * 8) / 2))); v0.y = ((FX32_ONE * 192) + (FX32_ONE * (96 + 16))); @@ -1734,12 +1736,12 @@ UnkStruct_ov101_021D5D90 * ov101_021D72D4 (UnkStruct_ov101_021D13C8 * param0) return v1; } -static int ov101_021D7304 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D7304(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - VecFx32 v1 = {0, 0, 0}; - VecFx32 v2 = {0x2000, 0x2000, 0}; - UnkStruct_ov101_021D7394 * v3 = param1; + VecFx32 v1 = { 0, 0, 0 }; + VecFx32 v2 = { 0x2000, 0x2000, 0 }; + UnkStruct_ov101_021D7394 *v3 = param1; v3->unk_04 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); @@ -1755,16 +1757,16 @@ static int ov101_021D7304 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D7394 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7394(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D7394 * v0 = param1; + UnkStruct_ov101_021D7394 *v0 = param1; ov101_021D8544(&v0->unk_08); } -static void ov101_021D73A0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D73A0(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0 = 1; - UnkStruct_ov101_021D7394 * v1 = param1; + UnkStruct_ov101_021D7394 *v1 = param1; v1->unk_00++; @@ -1783,19 +1785,19 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91C8 = { static const UnkStruct_ov101_021D86B0 Unk_ov101_021D922C; -UnkStruct_ov101_021D5D90 * ov101_021D73B4 (UnkStruct_ov101_021D13C8 * param0) +UnkStruct_ov101_021D5D90 *ov101_021D73B4(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {(FX32_ONE * 200), ((FX32_ONE * 192) + (FX32_ONE * 184)), 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { (FX32_ONE * 200), ((FX32_ONE * 192) + (FX32_ONE * 184)), 0 }; v0 = sub_02071330(param0->unk_44C, &Unk_ov101_021D922C, &v1, 0, param0, 142); return v0; } -static int ov101_021D73EC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D73EC(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - UnkStruct_ov101_021D72AC * v1 = param1; + UnkStruct_ov101_021D72AC *v1 = param1; v1->unk_00 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); @@ -1806,17 +1808,17 @@ static int ov101_021D73EC (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D7438 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7438(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D7438 * v0 = param1; + UnkStruct_ov101_021D7438 *v0 = param1; ov101_021D8544(&v0->unk_04); } -static void ov101_021D7444 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7444(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0 = 1; - UnkStruct_ov101_021D7438 * v1 = param1; - UnkStruct_ov101_021D4764 * v2 = &v1->unk_00->unk_13C; + UnkStruct_ov101_021D7438 *v1 = param1; + UnkStruct_ov101_021D4764 *v2 = &v1->unk_00->unk_13C; if (v2->unk_0C == 1) { v0 = 0; @@ -1835,10 +1837,10 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D922C = { static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9254; -UnkStruct_ov101_021D5D90 * ov101_021D7460 (UnkStruct_ov101_021D13C8 * param0) +UnkStruct_ov101_021D5D90 *ov101_021D7460(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {(FX32_ONE * 200), ((FX32_ONE * 192) + (FX32_ONE * 184)), 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { (FX32_ONE * 200), ((FX32_ONE * 192) + (FX32_ONE * 184)), 0 }; v1.x = (FX32_ONE * (128 - (((10 + 5) * 8) / 2))); v1.y = ((FX32_ONE * 192) + (FX32_ONE * (96 - 16))); @@ -1847,12 +1849,12 @@ UnkStruct_ov101_021D5D90 * ov101_021D7460 (UnkStruct_ov101_021D13C8 * param0) return v0; } -static int ov101_021D74A0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D74A0(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v0; - VecFx32 v1 = {0, 0, 0}; - VecFx32 v2 = {0x2000, 0x2000, 0}; - UnkStruct_ov101_021D7530 * v3 = param1; + VecFx32 v1 = { 0, 0, 0 }; + VecFx32 v2 = { 0x2000, 0x2000, 0 }; + UnkStruct_ov101_021D7530 *v3 = param1; v3->unk_04 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); @@ -1868,16 +1870,16 @@ static int ov101_021D74A0 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D7530 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7530(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D7530 * v0 = param1; + UnkStruct_ov101_021D7530 *v0 = param1; ov101_021D8544(&v0->unk_08); } -static void ov101_021D753C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D753C(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0 = 1; - UnkStruct_ov101_021D7530 * v1 = param1; + UnkStruct_ov101_021D7530 *v1 = param1; v1->unk_00++; @@ -1896,20 +1898,20 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9254 = { static const UnkStruct_ov101_021D86B0 Unk_ov101_021D913C; -UnkStruct_ov101_021D5D90 * ov101_021D7550 (UnkStruct_ov101_021D13C8 * param0) +UnkStruct_ov101_021D5D90 *ov101_021D7550(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {(FX32_ONE * 14), ((FX32_ONE * 192) + (FX32_ONE * 8)), 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { (FX32_ONE * 14), ((FX32_ONE * 192) + (FX32_ONE * 8)), 0 }; v0 = sub_02071330(param0->unk_44C, &Unk_ov101_021D913C, &v1, 0, param0, 142); return v0; } -static int ov101_021D7588 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D7588(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; VecFx32 v1; - UnkStruct_ov101_021D75F0 * v2 = param1; + UnkStruct_ov101_021D75F0 *v2 = param1; v2->unk_00 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); sub_020715E4(param0, &v1); @@ -1923,18 +1925,18 @@ static int ov101_021D7588 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D75F0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D75F0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D75F0 * v0 = param1; + UnkStruct_ov101_021D75F0 *v0 = param1; ov101_021D8544(&v0->unk_04[0]); ov101_021D8544(&v0->unk_04[1]); } -static void ov101_021D7604 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7604(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D75F0 * v0 = param1; - UnkStruct_ov101_021D4764 * v1 = &v0->unk_00->unk_13C; + UnkStruct_ov101_021D75F0 *v0 = param1; + UnkStruct_ov101_021D4764 *v1 = &v0->unk_00->unk_13C; sub_02021CAC(v0->unk_04[0].unk_04, 0); sub_02021CAC(v0->unk_04[1].unk_04, 0); @@ -1944,7 +1946,7 @@ static void ov101_021D7604 (UnkStruct_ov101_021D5D90 * param0, void * param1) } { - VecFx32 v2 = {(FX32_ONE * 52), ((FX32_ONE * 192) + (FX32_ONE * 8)), 0}; + VecFx32 v2 = { (FX32_ONE * 52), ((FX32_ONE * 192) + (FX32_ONE * 8)), 0 }; u32 v3 = 0, v4, v5; v5 = v0->unk_00->unk_10; @@ -1983,20 +1985,20 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D913C = { static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91A0; -UnkStruct_ov101_021D5D90 * ov101_021D76B4 (UnkStruct_ov101_021D13C8 * param0) +UnkStruct_ov101_021D5D90 *ov101_021D76B4(UnkStruct_ov101_021D13C8 *param0) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {(FX32_ONE * 14), ((FX32_ONE * 192) + (FX32_ONE * 8)), 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { (FX32_ONE * 14), ((FX32_ONE * 192) + (FX32_ONE * 8)), 0 }; v0 = sub_02071330(param0->unk_44C, &Unk_ov101_021D91A0, &v1, 0, param0, 142); return v0; } -static int ov101_021D76EC (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D76EC(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - VecFx32 v1 = {(FX32_ONE * 220), ((FX32_ONE * 192) + (FX32_ONE * 184)), 0}; - UnkStruct_ov101_021D7754 * v2 = param1; + VecFx32 v1 = { (FX32_ONE * 220), ((FX32_ONE * 192) + (FX32_ONE * 184)), 0 }; + UnkStruct_ov101_021D7754 *v2 = param1; v2->unk_00 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); @@ -2007,9 +2009,9 @@ static int ov101_021D76EC (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D7754 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7754(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D7754 * v0 = param1; + UnkStruct_ov101_021D7754 *v0 = param1; int v1; for (v1 = 0; v1 < 5; v1++) { @@ -2017,11 +2019,11 @@ static void ov101_021D7754 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov101_021D776C (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D776C(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov101_021D7754 * v1 = param1; - UnkStruct_ov101_021D4764 * v2 = &v1->unk_00->unk_13C; + UnkStruct_ov101_021D7754 *v1 = param1; + UnkStruct_ov101_021D4764 *v2 = &v1->unk_00->unk_13C; { int v3 = 1; @@ -2067,10 +2069,10 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91A0 = { static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9240; -UnkStruct_ov101_021D5D90 * ov101_021D77E4 (UnkStruct_ov101_021D13C8 * param0, UnkEnum_ov101_021D77E4 param1) +UnkStruct_ov101_021D5D90 *ov101_021D77E4(UnkStruct_ov101_021D13C8 *param0, UnkEnum_ov101_021D77E4 param1) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {0, 0, 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { 0, 0, 0 }; u32 v2; v0 = sub_02071330(param0->unk_44C, &Unk_ov101_021D9240, &v1, param1, param0, 142); @@ -2078,14 +2080,14 @@ UnkStruct_ov101_021D5D90 * ov101_021D77E4 (UnkStruct_ov101_021D13C8 * param0, Un return v0; } -static int ov101_021D7810 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D7810(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0, v1, v2; VecFx32 v3; - VecFx32 v4 = {0, 0, 0}; - VecFx32 v5 = {0x2000, 0x2000, 0}; - UnkStruct_ov101_021D7984 * v6 = param1; - UnkStruct_ov101_021D13C8 * v7 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); + VecFx32 v4 = { 0, 0, 0 }; + VecFx32 v5 = { 0x2000, 0x2000, 0 }; + UnkStruct_ov101_021D7984 *v6 = param1; + UnkStruct_ov101_021D13C8 *v7 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); v6->unk_00 = sub_020715B4(param0); v6->unk_14 = v7; @@ -2148,20 +2150,20 @@ static int ov101_021D7810 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D7984 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7984(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov101_021D7984 * v1 = param1; + UnkStruct_ov101_021D7984 *v1 = param1; for (v0 = 0; v0 < v1->unk_10; v0++) { ov101_021D8544(&v1->unk_18[v0]); } } -static void ov101_021D79A8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D79A8(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov101_021D7984 * v1 = param1; + UnkStruct_ov101_021D7984 *v1 = param1; v1->unk_0C++; @@ -2180,10 +2182,10 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9240 = { static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9268; -UnkStruct_ov101_021D5D90 * ov101_021D79BC (UnkStruct_ov101_021D13C8 * param0, u32 param1) +UnkStruct_ov101_021D5D90 *ov101_021D79BC(UnkStruct_ov101_021D13C8 *param0, u32 param1) { - UnkStruct_ov101_021D5D90 * v0; - VecFx32 v1 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 32)), 0}; + UnkStruct_ov101_021D5D90 *v0; + VecFx32 v1 = { (FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 32)), 0 }; if (param1 > 999) { param1 = 999; @@ -2193,12 +2195,12 @@ UnkStruct_ov101_021D5D90 * ov101_021D79BC (UnkStruct_ov101_021D13C8 * param0, u3 return v0; } -static int ov101_021D7A00 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D7A00(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; u32 v1, v2, v3; VecFx32 v4; - UnkStruct_ov101_021D7A00 * v5 = param1; + UnkStruct_ov101_021D7A00 *v5 = param1; v5->unk_08 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); v1 = sub_020715B4(param0); @@ -2228,9 +2230,9 @@ static int ov101_021D7A00 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D7AD0 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7AD0(UnkStruct_ov101_021D5D90 *param0, void *param1) { - UnkStruct_ov101_021D7A00 * v0 = param1; + UnkStruct_ov101_021D7A00 *v0 = param1; int v1; for (v1 = 0; v1 < v0->unk_04; v1++) { @@ -2238,10 +2240,10 @@ static void ov101_021D7AD0 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov101_021D7AF4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7AF4(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov101_021D7A00 * v1 = param1; + UnkStruct_ov101_021D7A00 *v1 = param1; v1->unk_00++; @@ -2260,46 +2262,46 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9268 = { static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91B4; -UnkStruct_ov101_021D5D90 * ov101_021D7B08 (UnkStruct_ov101_021D13C8 * param0) +UnkStruct_ov101_021D5D90 *ov101_021D7B08(UnkStruct_ov101_021D13C8 *param0) { - VecFx32 v0 = {0, 0, 0}; - UnkStruct_ov101_021D5D90 * v1 = sub_02071330(param0->unk_44C, &Unk_ov101_021D91B4, &v0, 0, param0, 140); + VecFx32 v0 = { 0, 0, 0 }; + UnkStruct_ov101_021D5D90 *v1 = sub_02071330(param0->unk_44C, &Unk_ov101_021D91B4, &v0, 0, param0, 140); return v1; } static const VecFx32 Unk_ov101_021D9424[UnkEnum_ov101_021D4F58_05][3] = { { - {(FX32_ONE * 68), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 2)))), 0x0}, - {(FX32_ONE * 128), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 2)))), 0x0}, - {(FX32_ONE * 188), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 2)))), 0x0} + { (FX32_ONE * 68), ((FX32_ONE * 16) + (FX32_ONE * (32 * 2))), 0x0 }, + { (FX32_ONE * 128), ((FX32_ONE * 16) + (FX32_ONE * (32 * 2))), 0x0 }, + { (FX32_ONE * 188), ((FX32_ONE * 16) + (FX32_ONE * (32 * 2))), 0x0 }, }, { - {(FX32_ONE * 68), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 1)))), 0x0}, - {(FX32_ONE * 128), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 1)))), 0x0}, - {(FX32_ONE * 188), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 1)))), 0x0} + { (FX32_ONE * 68), ((FX32_ONE * 16) + (FX32_ONE * (32 * 1))), 0x0 }, + { (FX32_ONE * 128), ((FX32_ONE * 16) + (FX32_ONE * (32 * 1))), 0x0 }, + { (FX32_ONE * 188), ((FX32_ONE * 16) + (FX32_ONE * (32 * 1))), 0x0 }, }, { - {(FX32_ONE * 68), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 3)))), 0x0}, - {(FX32_ONE * 128), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 3)))), 0x0}, - {(FX32_ONE * 188), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 3)))), 0x0} + { (FX32_ONE * 68), ((FX32_ONE * 16) + (FX32_ONE * (32 * 3))), 0x0 }, + { (FX32_ONE * 128), ((FX32_ONE * 16) + (FX32_ONE * (32 * 3))), 0x0 }, + { (FX32_ONE * 188), ((FX32_ONE * 16) + (FX32_ONE * (32 * 3))), 0x0 }, }, { - {(FX32_ONE * 68), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 1)))), 0x0}, - {(FX32_ONE * 128), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 2)))), 0x0}, - {(FX32_ONE * 188), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 3)))), 0x0} + { (FX32_ONE * 68), ((FX32_ONE * 16) + (FX32_ONE * (32 * 1))), 0x0 }, + { (FX32_ONE * 128), ((FX32_ONE * 16) + (FX32_ONE * (32 * 2))), 0x0 }, + { (FX32_ONE * 188), ((FX32_ONE * 16) + (FX32_ONE * (32 * 3))), 0x0 }, }, { - {(FX32_ONE * 68), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 3)))), 0x0}, - {(FX32_ONE * 128), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 2)))), 0x0}, - {(FX32_ONE * 188), ((FX32_ONE * 16) + ((FX32_ONE * (32 * 1)))), 0x0} - } + { (FX32_ONE * 68), ((FX32_ONE * 16) + (FX32_ONE * (32 * 3))), 0x0 }, + { (FX32_ONE * 128), ((FX32_ONE * 16) + (FX32_ONE * (32 * 2))), 0x0 }, + { (FX32_ONE * 188), ((FX32_ONE * 16) + (FX32_ONE * (32 * 1))), 0x0 }, + }, }; -static int ov101_021D7B34 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static int ov101_021D7B34(UnkStruct_ov101_021D5D90 *param0, void *param1) { u32 v0; - UnkStruct_ov101_021D7D94 * v1 = param1; + UnkStruct_ov101_021D7D94 *v1 = param1; v1->unk_44 = (UnkStruct_ov101_021D13C8 *)sub_020715BC(param0); v1->unk_18 = v1->unk_44->unk_44; @@ -2307,7 +2309,7 @@ static int ov101_021D7B34 (UnkStruct_ov101_021D5D90 * param0, void * param1) v0 = v1->unk_44->unk_48; do { - if ((v0 & 0x1)) { + if (v0 & 0x1) { break; } @@ -2321,10 +2323,10 @@ static int ov101_021D7B34 (UnkStruct_ov101_021D5D90 * param0, void * param1) return 1; } -static void ov101_021D7B74 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7B74(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0; - UnkStruct_ov101_021D7D94 * v1 = param1; + UnkStruct_ov101_021D7D94 *v1 = param1; if (v1->unk_14 == 0) { for (v0 = 0; v0 < 3; v0++) { @@ -2337,11 +2339,11 @@ static void ov101_021D7B74 (UnkStruct_ov101_021D5D90 * param0, void * param1) } } -static void ov101_021D7BB4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +static void ov101_021D7BB4(UnkStruct_ov101_021D5D90 *param0, void *param1) { int v0, v1; VecFx32 v2; - UnkStruct_ov101_021D7D94 * v3 = param1; + UnkStruct_ov101_021D7D94 *v3 = param1; switch (v3->unk_00) { case 0: @@ -2435,20 +2437,20 @@ static const UnkStruct_ov101_021D86B0 Unk_ov101_021D91B4 = { sub_020715FC }; -static void ov101_021D7D4C (SysTask * param0, void * param1) +static void ov101_021D7D4C(SysTask *param0, void *param1) { - UnkStruct_ov101_021D7D94 * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_44; + UnkStruct_ov101_021D7D94 *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_44; ov101_021D814C(v1->unk_450, 10); v0->unk_08 = 1; SysTask_Done(param0); } -static void ov101_021D7D6C (SysTask * param0, void * param1) +static void ov101_021D7D6C(SysTask *param0, void *param1) { - UnkStruct_ov101_021D7D94 * v0 = param1; - UnkStruct_ov101_021D13C8 * v1 = v0->unk_44; + UnkStruct_ov101_021D7D94 *v0 = param1; + UnkStruct_ov101_021D13C8 *v1 = v0->unk_44; if (v0->unk_08 == 1) { ov101_021D8180(v1->unk_450, 10); @@ -2457,10 +2459,10 @@ static void ov101_021D7D6C (SysTask * param0, void * param1) } } -static void ov101_021D7D94 (UnkStruct_ov101_021D7D94 * param0) +static void ov101_021D7D94(UnkStruct_ov101_021D7D94 *param0) { - SysTask * v0; - UnkStruct_ov101_021D13C8 * v1 = param0->unk_44; + SysTask *v0; + UnkStruct_ov101_021D13C8 *v1 = param0->unk_44; if (param0->unk_18 == 0) { ov101_021D80E4(v1->unk_450, (NNS_G2D_VRAM_TYPE_MAX), v1->unk_438, 14, 10); @@ -2512,15 +2514,15 @@ static const fx32 Unk_ov101_021D9354[10] = { }; static const UnkStruct_ov101_021D93D4 Unk_ov101_021D93D4[UnkEnum_ov101_021D5814_05] = { - {0x18, 0x1B, 0x19, 0x1A}, - {0x1C, 0x1F, 0x1D, 0x1E}, - {0x20, 0x23, 0x21, 0x22}, - {0x24, 0x27, 0x25, 0x26}, - {0x28, 0x2B, 0x29, 0x2A} + { 0x18, 0x1B, 0x19, 0x1A }, + { 0x1C, 0x1F, 0x1D, 0x1E }, + { 0x20, 0x23, 0x21, 0x22 }, + { 0x24, 0x27, 0x25, 0x26 }, + { 0x28, 0x2B, 0x29, 0x2A } }; static const UnkStruct_ov101_021D93D4 Unk_ov101_021D93A4[UnkEnum_ov101_021D6764_03] = { - {0x30, 0x33, 0x31, 0x32}, - {0x34, 0x33, 0x35, 0x36}, - {0x30, 0x37, 0x31, 0x32} + { 0x30, 0x33, 0x31, 0x32 }, + { 0x34, 0x33, 0x35, 0x36 }, + { 0x30, 0x37, 0x31, 0x32 } }; diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c index 21b7458dca..9b0bda8554 100644 --- a/src/overlay101/ov101_021D7E48.c +++ b/src/overlay101/ov101_021D7E48.c @@ -1,3 +1,5 @@ +#include "overlay101/ov101_021D7E48.h" + #include #include @@ -6,24 +8,23 @@ #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" - #include "struct_defs/struct_0200C738.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay101/struct_ov101_021D8544.h" +#include "heap.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" -#include "heap.h" #include "unk_0201DBEC.h" #include "unk_020218BC.h" -#include "overlay101/ov101_021D7E48.h" typedef struct { u16 unk_00; u16 unk_02; - UnkStruct_02009DC8 * unk_04; + UnkStruct_02009DC8 *unk_04; } UnkStruct_ov101_021D7E48_sub1; typedef struct UnkStruct_ov101_021D7E48_t { @@ -36,22 +37,22 @@ typedef struct UnkStruct_ov101_021D7E48_t { u8 unk_09; u8 unk_0A; u8 unk_0B; - GraphicElementManager * unk_0C; + GraphicElementManager *unk_0C; UnkStruct_0200C738 unk_10; - NNSG2dCellTransferState * unk_19C; - UnkStruct_02009714 * unk_1A0; - UnkStruct_02009714 * unk_1A4; - UnkStruct_02009714 * unk_1A8; - UnkStruct_02009714 * unk_1AC; - UnkStruct_ov101_021D7E48_sub1 * unk_1B0; - UnkStruct_ov101_021D7E48_sub1 * unk_1B4; - UnkStruct_ov101_021D7E48_sub1 * unk_1B8; - UnkStruct_ov101_021D7E48_sub1 * unk_1BC; + NNSG2dCellTransferState *unk_19C; + UnkStruct_02009714 *unk_1A0; + UnkStruct_02009714 *unk_1A4; + UnkStruct_02009714 *unk_1A8; + UnkStruct_02009714 *unk_1AC; + UnkStruct_ov101_021D7E48_sub1 *unk_1B0; + UnkStruct_ov101_021D7E48_sub1 *unk_1B4; + UnkStruct_ov101_021D7E48_sub1 *unk_1B8; + UnkStruct_ov101_021D7E48_sub1 *unk_1BC; } UnkStruct_ov101_021D7E48; -UnkStruct_ov101_021D7E48 * ov101_021D7E48 (u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9, u32 param10) +UnkStruct_ov101_021D7E48 *ov101_021D7E48(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9, u32 param10) { - UnkStruct_ov101_021D7E48 * v0 = Heap_AllocFromHeap(param0, (sizeof(UnkStruct_ov101_021D7E48))); + UnkStruct_ov101_021D7E48 *v0 = Heap_AllocFromHeap(param0, (sizeof(UnkStruct_ov101_021D7E48))); GF_ASSERT(v0 != NULL); @@ -101,7 +102,7 @@ UnkStruct_ov101_021D7E48 * ov101_021D7E48 (u32 param0, u32 param1, u32 param2, u return v0; } -void ov101_021D7FB4 (UnkStruct_ov101_021D7E48 * param0) +void ov101_021D7FB4(UnkStruct_ov101_021D7E48 *param0) { u32 v0; @@ -144,13 +145,13 @@ void ov101_021D7FB4 (UnkStruct_ov101_021D7E48 * param0) Heap_FreeToHeap(param0); } -void ov101_021D80D4 (UnkStruct_ov101_021D7E48 * param0) +void ov101_021D80D4(UnkStruct_ov101_021D7E48 *param0) { sub_020219F8(param0->unk_0C); sub_0201DCE8(); } -void ov101_021D80E4 (UnkStruct_ov101_021D7E48 * param0, u32 param1, NARC * param2, u32 param3, u32 param4) +void ov101_021D80E4(UnkStruct_ov101_021D7E48 *param0, u32 param1, NARC *param2, u32 param3, u32 param4) { u32 v0; @@ -167,7 +168,7 @@ void ov101_021D80E4 (UnkStruct_ov101_021D7E48 * param0, u32 param1, NARC * param GF_ASSERT(FALSE); } -void ov101_021D814C (UnkStruct_ov101_021D7E48 * param0, u32 param1) +void ov101_021D814C(UnkStruct_ov101_021D7E48 *param0, u32 param1) { u32 v0; @@ -181,7 +182,7 @@ void ov101_021D814C (UnkStruct_ov101_021D7E48 * param0, u32 param1) GF_ASSERT(FALSE); } -void ov101_021D8180 (UnkStruct_ov101_021D7E48 * param0, u32 param1) +void ov101_021D8180(UnkStruct_ov101_021D7E48 *param0, u32 param1) { u32 v0; @@ -195,7 +196,7 @@ void ov101_021D8180 (UnkStruct_ov101_021D7E48 * param0, u32 param1) GF_ASSERT(FALSE); } -void ov101_021D81B4 (UnkStruct_ov101_021D7E48 * param0, u32 param1, NARC * param2, u32 param3, u32 param4) +void ov101_021D81B4(UnkStruct_ov101_021D7E48 *param0, u32 param1, NARC *param2, u32 param3, u32 param4) { u32 v0; @@ -211,7 +212,7 @@ void ov101_021D81B4 (UnkStruct_ov101_021D7E48 * param0, u32 param1, NARC * param GF_ASSERT(FALSE); } -void ov101_021D8220 (UnkStruct_ov101_021D7E48 * param0, u32 param1) +void ov101_021D8220(UnkStruct_ov101_021D7E48 *param0, u32 param1) { u32 v0; @@ -225,7 +226,7 @@ void ov101_021D8220 (UnkStruct_ov101_021D7E48 * param0, u32 param1) GF_ASSERT(FALSE); } -void ov101_021D8254 (UnkStruct_ov101_021D7E48 * param0, u32 param1) +void ov101_021D8254(UnkStruct_ov101_021D7E48 *param0, u32 param1) { u32 v0; @@ -239,7 +240,7 @@ void ov101_021D8254 (UnkStruct_ov101_021D7E48 * param0, u32 param1) GF_ASSERT(FALSE); } -void ov101_021D8288 (UnkStruct_ov101_021D7E48 * param0, NARC * param1, u32 param2, u32 param3) +void ov101_021D8288(UnkStruct_ov101_021D7E48 *param0, NARC *param1, u32 param2, u32 param3) { u32 v0; @@ -255,7 +256,7 @@ void ov101_021D8288 (UnkStruct_ov101_021D7E48 * param0, NARC * param1, u32 param GF_ASSERT(FALSE); } -void ov101_021D82F0 (UnkStruct_ov101_021D7E48 * param0, NARC * param1, u32 param2, u32 param3) +void ov101_021D82F0(UnkStruct_ov101_021D7E48 *param0, NARC *param1, u32 param2, u32 param3) { u32 v0; @@ -272,7 +273,7 @@ void ov101_021D82F0 (UnkStruct_ov101_021D7E48 * param0, NARC * param1, u32 param GF_ASSERT(FALSE); } -void ov101_021D8358 (UnkStruct_ov101_021D7E48 * param0, u32 param1, u32 param2, u32 param3, u32 param4) +void ov101_021D8358(UnkStruct_ov101_021D7E48 *param0, u32 param1, u32 param2, u32 param3, u32 param4) { u32 v0; @@ -321,11 +322,11 @@ void ov101_021D8358 (UnkStruct_ov101_021D7E48 * param0, u32 param1, u32 param2, } } -void ov101_021D84A4 (UnkStruct_ov101_021D7E48 * param0, UnkStruct_ov101_021D8544 * param1, const VecFx32 * param2, u32 param3, int param4, u32 param5, u32 param6, u32 param7, u32 param8, int param9, int param10) +void ov101_021D84A4(UnkStruct_ov101_021D7E48 *param0, UnkStruct_ov101_021D8544 *param1, const VecFx32 *param2, u32 param3, int param4, u32 param5, u32 param6, u32 param7, u32 param8, int param9, int param10) { UnkStruct_ov19_021DA864 v0; UnkStruct_ov83_0223D9A8 v1; - GraphicElementData * v2; + GraphicElementData *v2; if (param8 == param0->unk_0B) { param8 = 0xffffffff; @@ -352,7 +353,7 @@ void ov101_021D84A4 (UnkStruct_ov101_021D7E48 * param0, UnkStruct_ov101_021D8544 GF_ASSERT(param1->unk_04 != NULL); } -void ov101_021D8544 (UnkStruct_ov101_021D8544 * param0) +void ov101_021D8544(UnkStruct_ov101_021D8544 *param0) { if (param0->unk_00 == 1) { sub_0200A5B4(param0->unk_08); @@ -362,14 +363,14 @@ void ov101_021D8544 (UnkStruct_ov101_021D8544 * param0) param0->unk_04 = NULL; } -void ov101_021D8560 (GraphicElementData * param0, VecFx32 * param1) +void ov101_021D8560(GraphicElementData *param0, VecFx32 *param1) { - const VecFx32 * v0 = sub_02021D28(param0); + const VecFx32 *v0 = sub_02021D28(param0); *param1 = *v0; } -void ov101_021D8574 (GraphicElementData * param0, VecFx32 * param1) +void ov101_021D8574(GraphicElementData *param0, VecFx32 *param1) { - const VecFx32 * v0 = sub_02021D2C(param0); + const VecFx32 *v0 = sub_02021D2C(param0); *param1 = *v0; } diff --git a/src/overlay101/ov101_021D94D8.c b/src/overlay101/ov101_021D94D8.c index 36e4d0eb25..7540fc7717 100644 --- a/src/overlay101/ov101_021D94D8.c +++ b/src/overlay101/ov101_021D94D8.c @@ -1,29 +1,28 @@ -#include "enums.h" - #include #include -#include "overlay101/const_ov101_021D9580.h" -#include "overlay101/const_ov101_021D9628.h" -#include "overlay101/const_ov101_021D9AE4.h" -#include "overlay101/const_ov101_021D94F0.h" -#include "overlay101/const_ov101_021D9934.h" #include "overlay101/const_ov101_021D94D8.h" -#include "overlay101/const_ov101_021D9538.h" -#include "overlay101/const_ov101_021D9784.h" -#include "overlay101/const_ov101_021D95C8.h" +#include "overlay101/const_ov101_021D94F0.h" +#include "overlay101/const_ov101_021D9508.h" #include "overlay101/const_ov101_021D9520.h" +#include "overlay101/const_ov101_021D9538.h" #include "overlay101/const_ov101_021D9550.h" -#include "overlay101/const_ov101_021D9508.h" -#include "overlay101/const_ov101_021D9598.h" #include "overlay101/const_ov101_021D9568.h" +#include "overlay101/const_ov101_021D9580.h" +#include "overlay101/const_ov101_021D9598.h" +#include "overlay101/const_ov101_021D95C8.h" +#include "overlay101/const_ov101_021D9628.h" #include "overlay101/const_ov101_021D9688.h" - +#include "overlay101/const_ov101_021D9784.h" +#include "overlay101/const_ov101_021D9934.h" +#include "overlay101/const_ov101_021D9AE4.h" #include "overlay101/struct_ov101_021D95C8.h" #include "overlay101/struct_ov101_021D9784.h" #include "overlay101/struct_ov101_021D9934.h" #include "overlay101/struct_ov101_021D9AE4.h" +#include "enums.h" + const UnkEnum_ov101_021D9688 Unk_ov101_021D9688[3][21] = { { 0x5, @@ -46,7 +45,8 @@ const UnkEnum_ov101_021D9688 Unk_ov101_021D9688[3][21] = { 0x2, 0x0, 0x2, - 0x4 }, + 0x4, + }, { 0x3, 0x0, @@ -68,7 +68,8 @@ const UnkEnum_ov101_021D9688 Unk_ov101_021D9688[3][21] = { 0x1, 0x5, 0x4, - 0x2 }, + 0x2, + }, { 0x4, 0x2, @@ -90,7 +91,8 @@ const UnkEnum_ov101_021D9688 Unk_ov101_021D9688[3][21] = { 0x2, 0x0, 0x3, - 0x5 } + 0x5, + }, }; const int Unk_ov101_021D9550[6] = { @@ -125,41 +127,40 @@ const UnkStruct_ov101_021D95C8 Unk_ov101_021D95C8[6] = { { 0x1, 0x4 }, { 0x2, 0xD }, { 0x1, 0x27 }, - { 0x1, 0x27 } + { 0x1, 0x27 }, }, { { 0x1, 0x4 }, { 0x2, 0xD }, { 0x1, 0x27 }, - { 0x1, 0x27 } + { 0x1, 0x27 }, }, { { 0x2, 0x3 }, { 0x4, 0xB }, { 0x2, 0x26 }, - { 0x2, 0x26 } + { 0x2, 0x26 }, }, { { 0x3, 0x2 }, { 0x4, 0xB }, { 0x2, 0x26 }, - { 0x2, 0x26 } + { 0x2, 0x26 }, }, { { 0x4, 0x1 }, { 0x6, 0x9 }, { 0x3, 0x25 }, - { 0x3, 0x25 } + { 0x3, 0x25 }, }, { { 0x4, 0x1 }, { 0x6, 0x9 }, { 0x3, 0x25 }, - { 0x3, 0x25 } - } + { 0x3, 0x25 }, + }, }; - const u32 Unk_ov101_021D94D8[6] = { 0x50, 0x50, @@ -169,7 +170,6 @@ const u32 Unk_ov101_021D94D8[6] = { 0x46 }; - const UnkStruct_ov101_021D9934 Unk_ov101_021D9934[6][UnkEnum_ov101_021D9934_06] = { { { 0x5, UnkEnum_ov101_021D9934_03, UnkEnum_ov101_021D9934_1_00 }, @@ -177,7 +177,7 @@ const UnkStruct_ov101_021D9934 Unk_ov101_021D9934[6][UnkEnum_ov101_021D9934_06] { 0xA, UnkEnum_ov101_021D9934_05, UnkEnum_ov101_021D9934_1_02 }, { 0xA, UnkEnum_ov101_021D9934_02, UnkEnum_ov101_021D9934_1_02 }, { 0xF, UnkEnum_ov101_021D9934_04, UnkEnum_ov101_021D9934_1_01 }, - { 0x32, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 } + { 0x32, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 }, }, { { 0x5, UnkEnum_ov101_021D9934_03, UnkEnum_ov101_021D9934_1_00 }, @@ -185,7 +185,7 @@ const UnkStruct_ov101_021D9934 Unk_ov101_021D9934[6][UnkEnum_ov101_021D9934_06] { 0xA, UnkEnum_ov101_021D9934_05, UnkEnum_ov101_021D9934_1_02 }, { 0xA, UnkEnum_ov101_021D9934_02, UnkEnum_ov101_021D9934_1_02 }, { 0xF, UnkEnum_ov101_021D9934_04, UnkEnum_ov101_021D9934_1_01 }, - { 0x32, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 } + { 0x32, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 }, }, { { 0x5, UnkEnum_ov101_021D9934_03, UnkEnum_ov101_021D9934_1_00 }, @@ -193,7 +193,7 @@ const UnkStruct_ov101_021D9934 Unk_ov101_021D9934[6][UnkEnum_ov101_021D9934_06] { 0xA, UnkEnum_ov101_021D9934_05, UnkEnum_ov101_021D9934_1_02 }, { 0xF, UnkEnum_ov101_021D9934_02, UnkEnum_ov101_021D9934_1_02 }, { 0xF, UnkEnum_ov101_021D9934_04, UnkEnum_ov101_021D9934_1_01 }, - { 0x28, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 } + { 0x28, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 }, }, { { 0x5, UnkEnum_ov101_021D9934_03, UnkEnum_ov101_021D9934_1_00 }, @@ -201,7 +201,7 @@ const UnkStruct_ov101_021D9934 Unk_ov101_021D9934[6][UnkEnum_ov101_021D9934_06] { 0xF, UnkEnum_ov101_021D9934_05, UnkEnum_ov101_021D9934_1_02 }, { 0xF, UnkEnum_ov101_021D9934_02, UnkEnum_ov101_021D9934_1_02 }, { 0xA, UnkEnum_ov101_021D9934_04, UnkEnum_ov101_021D9934_1_01 }, - { 0x28, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 } + { 0x28, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 }, }, { { 0x5, UnkEnum_ov101_021D9934_03, UnkEnum_ov101_021D9934_1_00 }, @@ -209,7 +209,7 @@ const UnkStruct_ov101_021D9934 Unk_ov101_021D9934[6][UnkEnum_ov101_021D9934_06] { 0xF, UnkEnum_ov101_021D9934_05, UnkEnum_ov101_021D9934_1_02 }, { 0x14, UnkEnum_ov101_021D9934_02, UnkEnum_ov101_021D9934_1_02 }, { 0xA, UnkEnum_ov101_021D9934_04, UnkEnum_ov101_021D9934_1_01 }, - { 0x1E, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 } + { 0x1E, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 }, }, { { 0x5, UnkEnum_ov101_021D9934_03, UnkEnum_ov101_021D9934_1_00 }, @@ -217,8 +217,8 @@ const UnkStruct_ov101_021D9934 Unk_ov101_021D9934[6][UnkEnum_ov101_021D9934_06] { 0xF, UnkEnum_ov101_021D9934_05, UnkEnum_ov101_021D9934_1_02 }, { 0x14, UnkEnum_ov101_021D9934_02, UnkEnum_ov101_021D9934_1_02 }, { 0xA, UnkEnum_ov101_021D9934_04, UnkEnum_ov101_021D9934_1_01 }, - { 0x1E, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 } - } + { 0x1E, UnkEnum_ov101_021D9934_00, UnkEnum_ov101_021D9934_1_00 }, + }, }; const u32 Unk_ov101_021D9568[UnkEnum_ov101_021D9934_06] = { @@ -235,104 +235,104 @@ const UnkStruct_ov101_021D9784 Unk_ov101_021D9784[6][UnkEnum_ov101_021D9934_1_03 { { 0x5, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x4B, UnkEnum_ov101_021D6764_01 } + { 0x4B, UnkEnum_ov101_021D6764_01 }, }, { { 0x14, UnkEnum_ov101_021D6764_02 }, { 0x3C, UnkEnum_ov101_021D6764_00 }, - { 0x14, UnkEnum_ov101_021D6764_01 } + { 0x14, UnkEnum_ov101_021D6764_01 }, }, { { 0x4B, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x5, UnkEnum_ov101_021D6764_01 } - } + { 0x5, UnkEnum_ov101_021D6764_01 }, + }, }, { { { 0x5, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x4B, UnkEnum_ov101_021D6764_01 } + { 0x4B, UnkEnum_ov101_021D6764_01 }, }, { { 0x14, UnkEnum_ov101_021D6764_02 }, { 0x3C, UnkEnum_ov101_021D6764_00 }, - { 0x14, UnkEnum_ov101_021D6764_01 } + { 0x14, UnkEnum_ov101_021D6764_01 }, }, { { 0x4B, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x5, UnkEnum_ov101_021D6764_01 } - } + { 0x5, UnkEnum_ov101_021D6764_01 }, + }, }, { { { 0x5, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x4B, UnkEnum_ov101_021D6764_01 } + { 0x4B, UnkEnum_ov101_021D6764_01 }, }, { { 0x14, UnkEnum_ov101_021D6764_02 }, { 0x3C, UnkEnum_ov101_021D6764_00 }, - { 0x14, UnkEnum_ov101_021D6764_01 } + { 0x14, UnkEnum_ov101_021D6764_01 }, }, { { 0x4B, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x5, UnkEnum_ov101_021D6764_01 } - } + { 0x5, UnkEnum_ov101_021D6764_01 }, + }, }, { { { 0x5, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x4B, UnkEnum_ov101_021D6764_01 } + { 0x4B, UnkEnum_ov101_021D6764_01 }, }, { { 0x14, UnkEnum_ov101_021D6764_02 }, { 0x3C, UnkEnum_ov101_021D6764_00 }, - { 0x14, UnkEnum_ov101_021D6764_01 } + { 0x14, UnkEnum_ov101_021D6764_01 }, }, { { 0x4B, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x5, UnkEnum_ov101_021D6764_01 } - } + { 0x5, UnkEnum_ov101_021D6764_01 }, + }, }, { { { 0x5, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x4B, UnkEnum_ov101_021D6764_01 } + { 0x4B, UnkEnum_ov101_021D6764_01 }, }, { { 0x14, UnkEnum_ov101_021D6764_02 }, { 0x3C, UnkEnum_ov101_021D6764_00 }, - { 0x14, UnkEnum_ov101_021D6764_01 } + { 0x14, UnkEnum_ov101_021D6764_01 }, }, { { 0x4B, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x5, UnkEnum_ov101_021D6764_01 } - } + { 0x5, UnkEnum_ov101_021D6764_01 }, + }, }, { { { 0x5, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x4B, UnkEnum_ov101_021D6764_01 } + { 0x4B, UnkEnum_ov101_021D6764_01 }, }, { { 0x14, UnkEnum_ov101_021D6764_02 }, { 0x3C, UnkEnum_ov101_021D6764_00 }, - { 0x14, UnkEnum_ov101_021D6764_01 } + { 0x14, UnkEnum_ov101_021D6764_01 }, }, { { 0x4B, UnkEnum_ov101_021D6764_02 }, { 0x14, UnkEnum_ov101_021D6764_00 }, - { 0x5, UnkEnum_ov101_021D6764_01 } - } - } + { 0x5, UnkEnum_ov101_021D6764_01 }, + }, + }, }; const u32 Unk_ov101_021D9538[6] = { @@ -390,7 +390,7 @@ const UnkStruct_ov101_021D9AE4 Unk_ov101_021D9AE4[6][UnkEnum_ov101_021D9AE4_09] { UnkEnum_ov101_021D9AE4_03, 0x32, 0x28, 0xA }, { UnkEnum_ov101_021D9AE4_02, 0x3C, 0x1E, 0xA }, { UnkEnum_ov101_021D9AE4_01, 0x50, 0xA, 0xA }, - { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 } + { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 }, }, { { UnkEnum_ov101_021D9AE4_08, 0xA, 0xA, 0x50 }, @@ -401,7 +401,7 @@ const UnkStruct_ov101_021D9AE4 Unk_ov101_021D9AE4[6][UnkEnum_ov101_021D9AE4_09] { UnkEnum_ov101_021D9AE4_03, 0x32, 0x28, 0xA }, { UnkEnum_ov101_021D9AE4_02, 0x3C, 0x1E, 0xA }, { UnkEnum_ov101_021D9AE4_01, 0x50, 0xA, 0xA }, - { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 } + { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 }, }, { { UnkEnum_ov101_021D9AE4_08, 0xA, 0xA, 0x50 }, @@ -412,7 +412,7 @@ const UnkStruct_ov101_021D9AE4 Unk_ov101_021D9AE4[6][UnkEnum_ov101_021D9AE4_09] { UnkEnum_ov101_021D9AE4_03, 0x32, 0x28, 0xA }, { UnkEnum_ov101_021D9AE4_02, 0x3C, 0x1E, 0xA }, { UnkEnum_ov101_021D9AE4_01, 0x50, 0xA, 0xA }, - { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 } + { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 }, }, { { UnkEnum_ov101_021D9AE4_08, 0xA, 0xA, 0x50 }, @@ -423,7 +423,7 @@ const UnkStruct_ov101_021D9AE4 Unk_ov101_021D9AE4[6][UnkEnum_ov101_021D9AE4_09] { UnkEnum_ov101_021D9AE4_03, 0x32, 0x28, 0xA }, { UnkEnum_ov101_021D9AE4_02, 0x3C, 0x1E, 0xA }, { UnkEnum_ov101_021D9AE4_01, 0x50, 0xA, 0xA }, - { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 } + { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 }, }, { { UnkEnum_ov101_021D9AE4_08, 0xA, 0xA, 0x50 }, @@ -434,7 +434,7 @@ const UnkStruct_ov101_021D9AE4 Unk_ov101_021D9AE4[6][UnkEnum_ov101_021D9AE4_09] { UnkEnum_ov101_021D9AE4_03, 0x32, 0x28, 0xA }, { UnkEnum_ov101_021D9AE4_02, 0x3C, 0x1E, 0xA }, { UnkEnum_ov101_021D9AE4_01, 0x50, 0xA, 0xA }, - { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 } + { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 }, }, { { UnkEnum_ov101_021D9AE4_08, 0xA, 0xA, 0x50 }, @@ -445,6 +445,6 @@ const UnkStruct_ov101_021D9AE4 Unk_ov101_021D9AE4[6][UnkEnum_ov101_021D9AE4_09] { UnkEnum_ov101_021D9AE4_03, 0x32, 0x28, 0xA }, { UnkEnum_ov101_021D9AE4_02, 0x3C, 0x1E, 0xA }, { UnkEnum_ov101_021D9AE4_01, 0x50, 0xA, 0xA }, - { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 } - } + { UnkEnum_ov101_021D9AE4_00, 0x5A, 0x5, 0x5 }, + }, }; diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index b06ecbbfeb..6f2e383cbd 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -1,68 +1,66 @@ +#include "overlay102/ov102_021D0D80.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "savedata.h" - #include "struct_defs/struct_0203E53C.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02000C88.h" #include "unk_02002B7C.h" -#include "overlay_manager.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "overlay102/ov102_021D0D80.h" typedef struct { int unk_00; int unk_04; - SaveData * unk_08; - TrainerInfo * unk_0C; - BGL * unk_10; + SaveData *unk_08; + TrainerInfo *unk_0C; + BGL *unk_10; Window unk_14; Window unk_24; - MessageLoader * unk_34; - StringTemplate * unk_38; + MessageLoader *unk_34; + StringTemplate *unk_38; s16 unk_3C; int unk_40; } UnkStruct_ov102_021D0F8C; -void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate * param1); -int ov102_021D0D80(OverlayManager * param0, int * param1); -int ov102_021D0E2C(OverlayManager * param0, int * param1); -int ov102_021D0F50(OverlayManager * param0, int * param1); -static void ov102_021D0F80(void * param0); -static void ov102_021D0F8C(UnkStruct_ov102_021D0F8C * param0); -static void ov102_021D10F8(UnkStruct_ov102_021D0F8C * param0); -static void ov102_021D1174(UnkStruct_ov102_021D0F8C * param0); -static void ov102_021D1204(UnkStruct_ov102_021D0F8C * param0); -static void ov102_021D1224(UnkStruct_ov102_021D0F8C * param0); -static void ov102_021D1230(UnkStruct_ov102_021D0F8C * param0); -static void ov102_021D1274(UnkStruct_ov102_021D0F8C * param0); -static void ov102_021D1420(UnkStruct_ov102_021D0F8C * param0); - -int ov102_021D0D80 (OverlayManager * param0, int * param1) +void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); +int ov102_021D0D80(OverlayManager *param0, int *param1); +int ov102_021D0E2C(OverlayManager *param0, int *param1); +int ov102_021D0F50(OverlayManager *param0, int *param1); +static void ov102_021D0F80(void *param0); +static void ov102_021D0F8C(UnkStruct_ov102_021D0F8C *param0); +static void ov102_021D10F8(UnkStruct_ov102_021D0F8C *param0); +static void ov102_021D1174(UnkStruct_ov102_021D0F8C *param0); +static void ov102_021D1204(UnkStruct_ov102_021D0F8C *param0); +static void ov102_021D1224(UnkStruct_ov102_021D0F8C *param0); +static void ov102_021D1230(UnkStruct_ov102_021D0F8C *param0); +static void ov102_021D1274(UnkStruct_ov102_021D0F8C *param0); +static void ov102_021D1420(UnkStruct_ov102_021D0F8C *param0); + +int ov102_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov102_021D0F8C * v0; + UnkStruct_ov102_021D0F8C *v0; int v1 = 84; Heap_Create(3, v1, 0x20000); @@ -72,7 +70,7 @@ int ov102_021D0D80 (OverlayManager * param0, int * param1) v0->unk_00 = v1; { - UnkStruct_0203E53C * v2 = (UnkStruct_0203E53C *)OverlayManager_Args(param0); + UnkStruct_0203E53C *v2 = (UnkStruct_0203E53C *)OverlayManager_Args(param0); v0->unk_08 = v2->unk_00; v0->unk_04 = v2->unk_04; @@ -100,9 +98,9 @@ int ov102_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov102_021D0E2C (OverlayManager * param0, int * param1) +int ov102_021D0E2C(OverlayManager *param0, int *param1) { - UnkStruct_ov102_021D0F8C * v0 = OverlayManager_Data(param0); + UnkStruct_ov102_021D0F8C *v0 = OverlayManager_Data(param0); int v1 = 0; switch (*param1) { @@ -111,12 +109,18 @@ int ov102_021D0E2C (OverlayManager * param0, int * param1) ov102_021D1274(v0); ov102_021D1420(v0); - sub_02019120(0, 1);; - sub_02019120(1, 1);; - sub_02019120(3, 1);; - sub_02019120(4, 1);; - sub_02019120(5, 1);; - sub_02019120(7, 1);; + sub_02019120(0, 1); + ; + sub_02019120(1, 1); + ; + sub_02019120(3, 1); + ; + sub_02019120(4, 1); + ; + sub_02019120(5, 1); + ; + sub_02019120(7, 1); + ; sub_0200F174(0, 1, 1, 0x0, 6, 1, v0->unk_00); *param1 = 1; break; @@ -134,7 +138,7 @@ int ov102_021D0E2C (OverlayManager * param0, int * param1) } break; case 3: - if ((v0->unk_3C > -8 * 24)) { + if (v0->unk_3C > -8 * 24) { v0->unk_3C -= 4; ov102_021D1230(v0); } else { @@ -144,7 +148,7 @@ int ov102_021D0E2C (OverlayManager * param0, int * param1) } break; case 4: - if ((((gCoreSys.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A)) || (((gCoreSys.pressedKeys & PAD_BUTTON_B) == PAD_BUTTON_B)) || (gCoreSys.touchPressed)) { + if (((gCoreSys.pressedKeys & PAD_BUTTON_A) == PAD_BUTTON_A) || ((gCoreSys.pressedKeys & PAD_BUTTON_B) == PAD_BUTTON_B) || (gCoreSys.touchPressed)) { sub_0200F174(0, 0, 0, 0x0, 6, 1, v0->unk_00); *param1 = 5; } @@ -159,9 +163,9 @@ int ov102_021D0E2C (OverlayManager * param0, int * param1) return v1; } -int ov102_021D0F50 (OverlayManager * param0, int * param1) +int ov102_021D0F50(OverlayManager *param0, int *param1) { - UnkStruct_ov102_021D0F8C * v0 = OverlayManager_Data(param0); + UnkStruct_ov102_021D0F8C *v0 = OverlayManager_Data(param0); int v1 = v0->unk_00; ov102_021D1204(v0); @@ -174,23 +178,24 @@ int ov102_021D0F50 (OverlayManager * param0, int * param1) return 1; } -static void ov102_021D0F80 (void * param0) +static void ov102_021D0F80(void *param0) { - UnkStruct_ov102_021D0F8C * v0 = param0; + UnkStruct_ov102_021D0F8C *v0 = param0; sub_0201C2B8(v0->unk_10); } -#define BGCONTSET(frame, scr, cgx, scrsiz, bufsiz) { \ - v2.unk_12 = scr; \ - v2.unk_13 = cgx; \ - v2.unk_08 = bufsiz; \ - v2.unk_10 = scrsiz; \ - sub_020183C4(param0->unk_10, frame, &v2, 0); \ - sub_02019EBC(param0->unk_10, frame); \ -} +#define BGCONTSET(frame, scr, cgx, scrsiz, bufsiz) \ + { \ + v2.unk_12 = scr; \ + v2.unk_13 = cgx; \ + v2.unk_08 = bufsiz; \ + v2.unk_10 = scrsiz; \ + sub_020183C4(param0->unk_10, frame, &v2, 0); \ + sub_02019EBC(param0->unk_10, frame); \ + } -static void ov102_021D0F8C (UnkStruct_ov102_021D0F8C * param0) +static void ov102_021D0F8C(UnkStruct_ov102_021D0F8C *param0) { { UnkStruct_02099F80 v0 = { @@ -230,7 +235,8 @@ static void ov102_021D0F8C (UnkStruct_ov102_021D0F8C * param0) v2.unk_12 = GX_BG_SCRBASE_0x0000; v2.unk_13 = GX_BG_CHARBASE_0x10000; - v2.unk_08 = 0x1000; v2.unk_10 = 2; + v2.unk_08 = 0x1000; + v2.unk_10 = 2; sub_020183C4(param0->unk_10, 0, &v2, 0); sub_02019EBC(param0->unk_10, 0); @@ -286,7 +292,7 @@ static void ov102_021D0F8C (UnkStruct_ov102_021D0F8C * param0) sub_02019120(7, 0); } -static void ov102_021D10F8 (UnkStruct_ov102_021D0F8C * param0) +static void ov102_021D10F8(UnkStruct_ov102_021D0F8C *param0) { sub_02019120(0, 0); sub_02019120(1, 0); @@ -306,9 +312,9 @@ static void ov102_021D10F8 (UnkStruct_ov102_021D0F8C * param0) Heap_FreeToHeap(param0->unk_10); } -static void ov102_021D1174 (UnkStruct_ov102_021D0F8C * param0) +static void ov102_021D1174(UnkStruct_ov102_021D0F8C *param0) { - UnkStruct_ov61_0222C884 v0 = {0, 0, 0, 32, 24, 2, 1}; + UnkStruct_ov61_0222C884 v0 = { 0, 0, 0, 32, 24, 2, 1 }; sub_0201D710(); @@ -326,7 +332,7 @@ static void ov102_021D1174 (UnkStruct_ov102_021D0F8C * param0) BGL_WindowColor(¶m0->unk_24, 0, 0, 0, 32 * 8, 24 * 8); } -static void ov102_021D1204 (UnkStruct_ov102_021D0F8C * param0) +static void ov102_021D1204(UnkStruct_ov102_021D0F8C *param0) { BGL_DeleteWindow(¶m0->unk_24); BGL_DeleteWindow(¶m0->unk_14); @@ -334,13 +340,13 @@ static void ov102_021D1204 (UnkStruct_ov102_021D0F8C * param0) MessageLoader_Free(param0->unk_34); } -static void ov102_021D1224 (UnkStruct_ov102_021D0F8C * param0) +static void ov102_021D1224(UnkStruct_ov102_021D0F8C *param0) { param0->unk_3C = 0; ov102_021D1230(param0); } -static void ov102_021D1230 (UnkStruct_ov102_021D0F8C * param0) +static void ov102_021D1230(UnkStruct_ov102_021D0F8C *param0) { sub_02019184(param0->unk_10, 1, 3, param0->unk_3C); sub_02019184(param0->unk_10, 5, 3, param0->unk_3C + (8 * 24)); @@ -348,7 +354,7 @@ static void ov102_021D1230 (UnkStruct_ov102_021D0F8C * param0) sub_02019184(param0->unk_10, 4, 3, param0->unk_3C + (8 * 24)); } -static void ov102_021D1274 (UnkStruct_ov102_021D0F8C * param0) +static void ov102_021D1274(UnkStruct_ov102_021D0F8C *param0) { int v0, v1, v2; int v3, v4, v5; @@ -393,12 +399,12 @@ static void ov102_021D1274 (UnkStruct_ov102_021D0F8C * param0) sub_02002E7C(4, 2 * (2 * 16), param0->unk_00); } -static void ov102_021D1420 (UnkStruct_ov102_021D0F8C * param0) +static void ov102_021D1420(UnkStruct_ov102_021D0F8C *param0) { - Strbuf* v0 = Strbuf_Init(0x200, param0->unk_00); + Strbuf *v0 = Strbuf_Init(0x200, param0->unk_00); { - Strbuf* v1 = Strbuf_Init(0x200, param0->unk_00); + Strbuf *v1 = Strbuf_Init(0x200, param0->unk_00); MessageLoader_GetStrbuf(param0->unk_34, 0, v1); StringTemplate_SetPlayerName(param0->unk_38, 0, param0->unk_0C); diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index 4c1673395c..4ba04e1272 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -1,137 +1,134 @@ +#include "overlay104/ov104_0222DCE0.h" + #include #include -#include "message.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202C878_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - #include "struct_defs/sentence.h" #include "struct_defs/struct_0204B184.h" #include "struct_defs/struct_0204B1E8.h" + #include "overlay006/battle_params.h" #include "overlay104/struct_ov104_0223A348.h" #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223A348_sub2.h" -#include "unk_020021B0.h" -#include "narc.h" +#include "communication_information.h" +#include "communication_system.h" +#include "flags.h" +#include "heap.h" +#include "map_header.h" #include "message.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" -#include "heap.h" +#include "trainer_info.h" +#include "unk_020021B0.h" #include "unk_0201D15C.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202C858.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_02038F8C.h" -#include "map_header.h" -#include "pokemon.h" -#include "party.h" #include "unk_0208C098.h" #include "unk_02092494.h" -#include "flags.h" -#include "overlay104/ov104_0222DCE0.h" -void ov104_0222E1C0(SaveData * param0, Party * param1, Pokemon * param2); -void ov104_0222E1D8(GraphicElementData * param0, u8 param1); -void ov104_0222E204(GraphicElementData * param0, s16 param1, s16 param2, u8 param3); +void ov104_0222E1C0(SaveData *param0, Party *param1, Pokemon *param2); +void ov104_0222E1D8(GraphicElementData *param0, u8 param1); +void ov104_0222E204(GraphicElementData *param0, s16 param1, s16 param2, u8 param3); u8 ov104_0222E240(u16 param0, u16 param1); -void ov104_0222E278(UnkStruct_ov104_0223A348 * param0, u16 param1, int param2, int param3); -void ov104_0222E284(BattleParams * param0, UnkStruct_ov104_0223A348_sub1 * param1, int param2, int param3, int param4); -u32 ov104_0222E2F0(UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, int param2, u8 param3, u32 param4, int param5, int param6); +void ov104_0222E278(UnkStruct_ov104_0223A348 *param0, u16 param1, int param2, int param3); +void ov104_0222E284(BattleParams *param0, UnkStruct_ov104_0223A348_sub1 *param1, int param2, int param3, int param4); +u32 ov104_0222E2F0(UnkStruct_ov104_0223A348_sub2 *param0, u16 param1, int param2, u8 param3, u32 param4, int param5, int param6); u8 ov104_0222E3A8(u16 param0); -BOOL ov104_0222E3E4(UnkStruct_0204B184 * param0, const u16 param1[], const u16 param2[], int param3, int param4, u16 param5[], int param6); -void ov104_0222E4BC(u8 param0, u16 param1, u16 param2, u16 * param3, UnkStruct_ov104_0223A348_sub2 * param4, u8 * param5, u32 * param6, u8 param7); +BOOL ov104_0222E3E4(UnkStruct_0204B184 *param0, const u16 param1[], const u16 param2[], int param3, int param4, u16 param5[], int param6); +void ov104_0222E4BC(u8 param0, u16 param1, u16 param2, u16 *param3, UnkStruct_ov104_0223A348_sub2 *param4, u8 *param5, u32 *param6, u8 param7); static const u16 Unk_ov104_0223F298[][2] = { - {0x5A, 0x8D}, - {0x5B, 0x8E}, - {0x5C, 0x8f}, - {0x5D, 0x90}, - {0x5E, 0x91}, - {0x2, 0x4}, - {0x3, 0x6}, - {0x3C, 0x3}, - {0x3D, 0x8}, - {0x20, 0x3E}, - {0x21, 0x3f}, - {0x4, 0x34}, - {0x5, 0x35}, - {0x2C, 0x1}, - {0x2D, 0x2}, - {0x14, 0xf}, - {0x15, 0x10}, - {0x51, 0x3B}, - {0x1A, 0x3C}, - {0x10, 0x9}, - {0x11, 0xC}, - {0x53, 0x17}, - {0x54, 0x16}, - {0x47, 0x29}, - {0x12, 0x2A}, - {0xC, 0x26}, - {0xD, 0x27}, - {0xE, 0x33}, - {0xA, 0x7}, - {0x1B, 0x11}, - {0x23, 0x25}, - {0x31, 0x46}, - {0x32, 0x46}, - {0x27, 0xB}, - {0x28, 0xE}, - {0x18, 0xB}, - {0x19, 0xE}, - {0x35, 0x44}, - {0x36, 0x45}, - {0x1D, 0xB}, - {0x6, 0x5}, - {0x1C, 0x1}, - {0x13, 0x2D}, - {0xB, 0x36}, - {0x2E, 0x38}, - {0x9, 0x14}, - {0x30, 0x32}, - {0x34, 0xA}, - {0x25, 0x13}, - {0x39, 0x1f}, - {0x29, 0x1D}, - {0x22, 0x24}, - {0x3B, 0x28}, - {0x3A, 0x2B}, - {0x26, 0x22}, - {0x33, 0x3E}, - {0x1E, 0xE}, - {0x50, 0x37}, - {0x24, 0xD}, - {0x7, 0xC}, - {0x55, 0x23}, - {0xF, 0x2C}, - {0x16, 0x47} + { 0x5A, 0x8D }, + { 0x5B, 0x8E }, + { 0x5C, 0x8f }, + { 0x5D, 0x90 }, + { 0x5E, 0x91 }, + { 0x2, 0x4 }, + { 0x3, 0x6 }, + { 0x3C, 0x3 }, + { 0x3D, 0x8 }, + { 0x20, 0x3E }, + { 0x21, 0x3f }, + { 0x4, 0x34 }, + { 0x5, 0x35 }, + { 0x2C, 0x1 }, + { 0x2D, 0x2 }, + { 0x14, 0xf }, + { 0x15, 0x10 }, + { 0x51, 0x3B }, + { 0x1A, 0x3C }, + { 0x10, 0x9 }, + { 0x11, 0xC }, + { 0x53, 0x17 }, + { 0x54, 0x16 }, + { 0x47, 0x29 }, + { 0x12, 0x2A }, + { 0xC, 0x26 }, + { 0xD, 0x27 }, + { 0xE, 0x33 }, + { 0xA, 0x7 }, + { 0x1B, 0x11 }, + { 0x23, 0x25 }, + { 0x31, 0x46 }, + { 0x32, 0x46 }, + { 0x27, 0xB }, + { 0x28, 0xE }, + { 0x18, 0xB }, + { 0x19, 0xE }, + { 0x35, 0x44 }, + { 0x36, 0x45 }, + { 0x1D, 0xB }, + { 0x6, 0x5 }, + { 0x1C, 0x1 }, + { 0x13, 0x2D }, + { 0xB, 0x36 }, + { 0x2E, 0x38 }, + { 0x9, 0x14 }, + { 0x30, 0x32 }, + { 0x34, 0xA }, + { 0x25, 0x13 }, + { 0x39, 0x1f }, + { 0x29, 0x1D }, + { 0x22, 0x24 }, + { 0x3B, 0x28 }, + { 0x3A, 0x2B }, + { 0x26, 0x22 }, + { 0x33, 0x3E }, + { 0x1E, 0xE }, + { 0x50, 0x37 }, + { 0x24, 0xD }, + { 0x7, 0xC }, + { 0x55, 0x23 }, + { 0xF, 0x2C }, + { 0x16, 0x47 } }; -UnkStruct_0204B184 * ov104_0222DCE0 (u16 param0, int param1, int param2) +UnkStruct_0204B184 *ov104_0222DCE0(u16 param0, int param1, int param2) { return NARC_AllocAndReadWholeMemberByIndexPair(param2, param0, param1); } -void ov104_0222DCF4 (UnkStruct_0204B1E8 * param0, int param1, int param2) +void ov104_0222DCF4(UnkStruct_0204B1E8 *param0, int param1, int param2) { NARC_ReadWholeMemberByIndexPair(param0, param2, param1); } -UnkStruct_0204B184 * ov104_0222DD04 (UnkStruct_ov104_0223A348_sub1 * param0, int param1, int param2, int param3) +UnkStruct_0204B184 *ov104_0222DD04(UnkStruct_ov104_0223A348_sub1 *param0, int param1, int param2, int param3) { - UnkStruct_0204B184 * v0; - MessageLoader * v1 = MessageLoader_Init(1, 26, 21, param2); - Strbuf* v2; + UnkStruct_0204B184 *v0; + MessageLoader *v1 = MessageLoader_Init(1, 26, 21, param2); + Strbuf *v2; MI_CpuClear8(param0, sizeof(UnkStruct_ov104_0223A348_sub1)); @@ -158,7 +155,7 @@ static const u16 Unk_ov104_0223F290[] = { 0xD9 }; -u32 ov104_0222DD6C (UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, u32 param2, u32 param3, u8 param4, u8 param5, BOOL param6, int param7, int param8) +u32 ov104_0222DD6C(UnkStruct_ov104_0223A348_sub2 *param0, u16 param1, u32 param2, u32 param3, u8 param4, u8 param5, BOOL param6, int param7, int param8) { int v0; int v1; @@ -253,7 +250,7 @@ u32 ov104_0222DD6C (UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, u32 para return v2; } -void ov104_0222DF40 (const UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * param1, u8 param2) +void ov104_0222DF40(const UnkStruct_ov104_0223A348_sub2 *param0, Pokemon *param1, u8 param2) { int v0; u32 v1; @@ -318,8 +315,8 @@ void ov104_0222DF40 (const UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * par Pokemon_SetValue(param1, 9, ¶m0->unk_21); if (param0->unk_14_val1_30) { - MessageLoader * v7; - Strbuf* v8; + MessageLoader *v7; + Strbuf *v8; v7 = MessageLoader_Init(1, 26, 412, 4); v8 = MessageLoader_GetNewStrbuf(v7, param0->unk_00_val1_0); @@ -335,7 +332,7 @@ void ov104_0222DF40 (const UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * par Pokemon_CalcLevelAndStats(param1); } -u16 ov104_0222E10C (u8 param0) +u16 ov104_0222E10C(u8 param0) { int v0 = 0; @@ -348,16 +345,16 @@ u16 ov104_0222E10C (u8 param0) return 0x3; } -void ov104_0222E134(SaveData * param0, Pokemon * param1); +void ov104_0222E134(SaveData *param0, Pokemon *param1); -void ov104_0222E134 (SaveData * param0, Pokemon * param1) +void ov104_0222E134(SaveData *param0, Pokemon *param1) { u32 v0; - Strbuf* v1; - MessageLoader * v2; + Strbuf *v1; + MessageLoader *v2; int v3; int v4 = 0; - TrainerInfo * v5 = SaveData_GetTrainerInfo(param0); + TrainerInfo *v5 = SaveData_GetTrainerInfo(param0); v0 = Pokemon_GetValue(param1, MON_DATA_OT_ID, NULL); Pokemon_UpdateAfterCatch(param1, SaveData_GetTrainerInfo(param0), 4, 0, 0, 11); @@ -377,14 +374,14 @@ void ov104_0222E134 (SaveData * param0, Pokemon * param1) return; } -void ov104_0222E1C0 (SaveData * param0, Party * param1, Pokemon * param2) +void ov104_0222E1C0(SaveData *param0, Party *param1, Pokemon *param2) { ov104_0222E134(param0, param2); Party_AddPokemon(param1, param2); return; } -void ov104_0222E1D8 (GraphicElementData * param0, u8 param1) +void ov104_0222E1D8(GraphicElementData *param0, u8 param1) { if (sub_02021E24(param0) == param1) { return; @@ -396,7 +393,7 @@ void ov104_0222E1D8 (GraphicElementData * param0, u8 param1) return; } -void ov104_0222E204 (GraphicElementData * param0, s16 param1, s16 param2, u8 param3) +void ov104_0222E204(GraphicElementData *param0, s16 param1, s16 param2, u8 param3) { VecFx32 v0; @@ -416,7 +413,7 @@ void ov104_0222E204 (GraphicElementData * param0, s16 param1, s16 param2, u8 par return; } -u8 ov104_0222E240 (u16 param0, u16 param1) +u8 ov104_0222E240(u16 param0, u16 param1) { switch (HealthBar_Color(param0, param1, 48)) { case 4: @@ -432,9 +429,9 @@ u8 ov104_0222E240 (u16 param0, u16 param1) return 1; } -void ov104_0222E278 (UnkStruct_ov104_0223A348 * param0, u16 param1, int param2, int param3) +void ov104_0222E278(UnkStruct_ov104_0223A348 *param0, u16 param1, int param2, int param3) { - UnkStruct_0204B184 * v0; + UnkStruct_0204B184 *v0; v0 = ov104_0222DD04(¶m0->unk_00, param1, param2, param3); Heap_FreeToHeap(v0); @@ -442,10 +439,10 @@ void ov104_0222E278 (UnkStruct_ov104_0223A348 * param0, u16 param1, int param2, return; } -void ov104_0222E284 (BattleParams * param0, UnkStruct_ov104_0223A348_sub1 * param1, int param2, int param3, int param4) +void ov104_0222E284(BattleParams *param0, UnkStruct_ov104_0223A348_sub1 *param1, int param2, int param3, int param4) { - Sentence * v0; - Pokemon * v1; + Sentence *v0; + Pokemon *v1; param0->trainerIDs[param3] = param1->unk_00; param0->trainerData[param3].class = param1->unk_04; @@ -461,7 +458,7 @@ void ov104_0222E284 (BattleParams * param0, UnkStruct_ov104_0223A348_sub1 * para return; } -u32 ov104_0222E2F0 (UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, int param2, u8 param3, u32 param4, int param5, int param6) +u32 ov104_0222E2F0(UnkStruct_ov104_0223A348_sub2 *param0, u16 param1, int param2, u8 param3, u32 param4, int param5, int param6) { u32 v0, v1, v2; @@ -471,7 +468,7 @@ u32 ov104_0222E2F0 (UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, int para return v2; } -void ov104_0222E330 (UnkStruct_ov104_0223A348_sub2 * param0, u16 param1[], u8 param2[], u32 param3[], u32 param4[], int param5, int param6, int param7) +void ov104_0222E330(UnkStruct_ov104_0223A348_sub2 *param0, u16 param1[], u8 param2[], u32 param3[], u32 param4[], int param5, int param6, int param7) { int v0; u32 v1; @@ -494,7 +491,7 @@ void ov104_0222E330 (UnkStruct_ov104_0223A348_sub2 * param0, u16 param1[], u8 pa return; } -u8 ov104_0222E3A8 (u16 param0) +u8 ov104_0222E3A8(u16 param0) { u8 v0; @@ -519,7 +516,7 @@ u8 ov104_0222E3A8 (u16 param0) return v0; } -BOOL ov104_0222E3E4 (UnkStruct_0204B184 * param0, const u16 param1[], const u16 param2[], int param3, int param4, u16 param5[], int param6) +BOOL ov104_0222E3E4(UnkStruct_0204B184 *param0, const u16 param1[], const u16 param2[], int param3, int param4, u16 param5[], int param6) { int v0, v1, v2; UnkStruct_0204B1E8 v3[6]; @@ -570,14 +567,14 @@ BOOL ov104_0222E3E4 (UnkStruct_0204B184 * param0, const u16 param1[], const u16 return 0; } -void ov104_0222E4BC (u8 param0, u16 param1, u16 param2, u16 * param3, UnkStruct_ov104_0223A348_sub2 * param4, u8 * param5, u32 * param6, u8 param7) +void ov104_0222E4BC(u8 param0, u16 param1, u16 param2, u16 *param3, UnkStruct_ov104_0223A348_sub2 *param4, u8 *param5, u32 *param6, u8 param7) { int v0; UnkStruct_ov104_0223A348_sub2 v1; u16 v2[4]; u16 v3[4]; UnkStruct_ov104_0223A348_sub1 v4; - UnkStruct_0204B184 * v5; + UnkStruct_0204B184 *v5; UnkStruct_0204B1E8 v6; v5 = ov104_0222DD04(&v4, param1, 11, 178); @@ -612,13 +609,13 @@ void ov104_0222E4BC (u8 param0, u16 param1, u16 param2, u16 * param3, UnkStruct_ return; } -void ov104_0222E5D0 (StringTemplate * param0, u32 param1) +void ov104_0222E5D0(StringTemplate *param0, u32 param1) { - StringTemplate_SetPlayerName(param0, param1, CommInfo_TrainerInfo((CommSys_CurNetId() ^ 1))); + StringTemplate_SetPlayerName(param0, param1, CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1)); return; } -int ov104_0222E5F0 (const TrainerInfo * param0) +int ov104_0222E5F0(const TrainerInfo *param0) { u32 v0; int v1, v2; @@ -641,9 +638,9 @@ int ov104_0222E5F0 (const TrainerInfo * param0) return v1; } -void ov104_0222E630 (SaveData * param0) +void ov104_0222E630(SaveData *param0) { - UnkStruct_0202C878 * v0 = sub_0202C878(param0); + UnkStruct_0202C878 *v0 = sub_0202C878(param0); sub_02038F8C(v0); return; diff --git a/src/overlay104/ov104_0222E63C.c b/src/overlay104/ov104_0222E63C.c index f561a49e7c..66c6df6d92 100644 --- a/src/overlay104/ov104_0222E63C.c +++ b/src/overlay104/ov104_0222E63C.c @@ -1,39 +1,38 @@ +#include "overlay104/ov104_0222E63C.h" + #include #include -#include "message.h" #include "struct_decls/struct_0209B75C_decl.h" -#include "overlay104/struct_ov104_0222E930_decl.h" -#include "overlay104/struct_ov104_022320B4_decl.h" -#include "overlay104/const_ov104_0223F674.h" #include "overlay104/const_ov104_0223F63C.h" - +#include "overlay104/const_ov104_0223F674.h" +#include "overlay104/ov104_0222E930.h" +#include "overlay104/ov104_0222EA90.h" +#include "overlay104/ov104_0223D860.h" #include "overlay104/struct_ov104_0222E8C8.h" +#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_0222E930_t.h" +#include "overlay104/struct_ov104_022320B4_decl.h" #include "overlay104/struct_ov104_022320B4_t.h" #include "overlay104/struct_ov104_0223C4CC.h" -#include "narc.h" -#include "message.h" -#include "string_template.h" #include "heap.h" +#include "message.h" +#include "narc.h" #include "strbuf.h" +#include "string_template.h" #include "unk_0209B6F8.h" -#include "overlay104/ov104_0222E63C.h" -#include "overlay104/ov104_0222E930.h" -#include "overlay104/ov104_0222EA90.h" -#include "overlay104/ov104_0223D860.h" -static BOOL ov104_0222E7CC(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0222E930 * param1); -static void ov104_0222E7FC(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0222E930 * param1); -static void ov104_0222E82C(UnkStruct_ov104_022320B4 * param0, u16 param1, u32 * param2, void * param3); -static void ov104_0222E830(u8 ** param0, MessageLoader ** param1, int param2, int param3); -static void ov104_0222E904(UnkStruct_ov104_0222E930 * param0, int param1); +static BOOL ov104_0222E7CC(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0222E930 *param1); +static void ov104_0222E7FC(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0222E930 *param1); +static void ov104_0222E82C(UnkStruct_ov104_022320B4 *param0, u16 param1, u32 *param2, void *param3); +static void ov104_0222E830(u8 **param0, MessageLoader **param1, int param2, int param3); +static void ov104_0222E904(UnkStruct_ov104_0222E930 *param0, int param1); -UnkStruct_ov104_022320B4 * ov104_0222E63C (UnkStruct_0209B75C * param0, int param1, int param2) +UnkStruct_ov104_022320B4 *ov104_0222E63C(UnkStruct_0209B75C *param0, int param1, int param2) { - UnkStruct_ov104_022320B4 * v0; + UnkStruct_ov104_022320B4 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov104_022320B4)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_022320B4)); @@ -53,10 +52,10 @@ UnkStruct_ov104_022320B4 * ov104_0222E63C (UnkStruct_0209B75C * param0, int para return v0; } -BOOL ov104_0222E6A8 (UnkStruct_ov104_022320B4 * param0) +BOOL ov104_0222E6A8(UnkStruct_ov104_022320B4 *param0) { int v0; - UnkStruct_ov104_0222E930 * v1; + UnkStruct_ov104_0222E930 *v1; if (param0->unk_51 == 0) { return 1; @@ -89,7 +88,7 @@ BOOL ov104_0222E6A8 (UnkStruct_ov104_022320B4 * param0) return 0; } -void ov104_0222E710 (UnkStruct_ov104_022320B4 * param0) +void ov104_0222E710(UnkStruct_ov104_022320B4 *param0) { GF_ASSERT(param0->unk_51 == 0); @@ -102,9 +101,9 @@ void ov104_0222E710 (UnkStruct_ov104_022320B4 * param0) Heap_FreeToHeap(param0); } -void ov104_0222E748 (UnkStruct_ov104_022320B4 * param0, int param1, int param2) +void ov104_0222E748(UnkStruct_ov104_022320B4 *param0, int param1, int param2) { - UnkStruct_ov104_0222E930 * v0; + UnkStruct_ov104_0222E930 *v0; v0 = Heap_AllocFromHeap(param0->unk_34, sizeof(UnkStruct_ov104_0222E930)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0222E930)); @@ -125,7 +124,7 @@ void ov104_0222E748 (UnkStruct_ov104_022320B4 * param0, int param1, int param2) ov104_0222E7CC(param0, v0); } -static BOOL ov104_0222E7CC (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0222E930 * param1) +static BOOL ov104_0222E7CC(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0222E930 *param1) { int v0; @@ -141,7 +140,7 @@ static BOOL ov104_0222E7CC (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0 return 0; } -static void ov104_0222E7FC (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0222E930 * param1) +static void ov104_0222E7FC(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0222E930 *param1) { if (param1->unk_80 != param0->unk_3C) { MessageLoader_Free(param1->unk_80); @@ -154,14 +153,14 @@ static void ov104_0222E7FC (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0 Heap_FreeToHeap(param1); } -static void ov104_0222E82C (UnkStruct_ov104_022320B4 * param0, u16 param1, u32 * param2, void * param3) +static void ov104_0222E82C(UnkStruct_ov104_022320B4 *param0, u16 param1, u32 *param2, void *param3) { if (param2 != NULL) { (void)0; } } -static void ov104_0222E830 (u8 ** param0, MessageLoader ** param1, int param2, int param3) +static void ov104_0222E830(u8 **param0, MessageLoader **param1, int param2, int param3) { int v0, v1; @@ -172,12 +171,12 @@ static void ov104_0222E830 (u8 ** param0, MessageLoader ** param1, int param2, i *param1 = MessageLoader_Init(1, 26, v1, param3); } -void ov104_0222E86C (UnkStruct_ov104_022320B4 * param0, int param1, int param2) +void ov104_0222E86C(UnkStruct_ov104_022320B4 *param0, int param1, int param2) { int v0; - UnkStruct_ov104_0222E930 * v1; + UnkStruct_ov104_0222E930 *v1; int v2, v3; - MessageLoader * v4; + MessageLoader *v4; v2 = ov104_0222EA90(param0->unk_52, 2); v3 = ov104_0222EA90(param1, 2); @@ -202,9 +201,9 @@ void ov104_0222E86C (UnkStruct_ov104_022320B4 * param0, int param1, int param2) param0->unk_3C = v4; } -UnkStruct_ov104_0222E8C8 * ov104_0222E8C8 (UnkStruct_ov104_022320B4 * param0, int param1) +UnkStruct_ov104_0222E8C8 *ov104_0222E8C8(UnkStruct_ov104_022320B4 *param0, int param1) { - UnkStruct_ov104_0222E8C8 * v0; + UnkStruct_ov104_0222E8C8 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov104_0222E8C8)); *v0 = param0->unk_24; @@ -212,24 +211,24 @@ UnkStruct_ov104_0222E8C8 * ov104_0222E8C8 (UnkStruct_ov104_022320B4 * param0, in return v0; } -void ov104_0222E8E8 (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0222E8C8 * param1) +void ov104_0222E8E8(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0222E8C8 *param1) { param0->unk_24 = *param1; Heap_FreeToHeap(param1); } -static void ov104_0222E904 (UnkStruct_ov104_0222E930 * param0, int param1) +static void ov104_0222E904(UnkStruct_ov104_0222E930 *param0, int param1) { param0->unk_1C += (param1 * 4); param0->unk_1C += ov104_0222EA60(param0); } -u16 * ov104_0222E91C (UnkStruct_ov104_022320B4 * param0, int param1) +u16 *ov104_0222E91C(UnkStruct_ov104_022320B4 *param0, int param1) { return ¶m0->unk_24.unk_00[param1]; } -UnkStruct_ov104_0223C4CC * ov104_0222E924 (UnkStruct_ov104_022320B4 * param0) +UnkStruct_ov104_0223C4CC *ov104_0222E924(UnkStruct_ov104_022320B4 *param0) { return sub_0209B974(param0->unk_00); } diff --git a/src/overlay104/ov104_0222E930.c b/src/overlay104/ov104_0222E930.c index eeabd0ee30..cc3641ca67 100644 --- a/src/overlay104/ov104_0222E930.c +++ b/src/overlay104/ov104_0222E930.c @@ -1,27 +1,26 @@ +#include "overlay104/ov104_0222E930.h" + #include #include -#include "overlay104/struct_ov104_0222E930_decl.h" - #include "overlay104/funcptr_ov104_0222E930.h" -#include "overlay104/struct_ov104_0222E930_t.h" #include "overlay104/funcptr_ov104_0222E974.h" +#include "overlay104/struct_ov104_0222E930_decl.h" +#include "overlay104/struct_ov104_0222E930_t.h" -#include "overlay104/ov104_0222E930.h" - -void ov104_0222E930(UnkStruct_ov104_0222E930 * param0, const UnkFuncPtr_ov104_0222E930 * param1, u32 param2); -u8 ov104_0222E968(UnkStruct_ov104_0222E930 * param0, const u8 * param1); -void ov104_0222E974(UnkStruct_ov104_0222E930 * param0, UnkFuncPtr_ov104_0222E974 param1); -void ov104_0222E980(UnkStruct_ov104_0222E930 * param0); -u8 ov104_0222E988(UnkStruct_ov104_0222E930 * param0); -u8 ov104_0222E9F8(UnkStruct_ov104_0222E930 * param0, const u8 * param1); -const u8 * ov104_0222EA14(UnkStruct_ov104_0222E930 * param0); -void ov104_0222EA2C(UnkStruct_ov104_0222E930 * param0, u8 * param1); -void ov104_0222EA3C(UnkStruct_ov104_0222E930 * param0); -u16 ov104_0222EA48(UnkStruct_ov104_0222E930 * param0); -u32 ov104_0222EA60(UnkStruct_ov104_0222E930 * param0); - -void ov104_0222E930 (UnkStruct_ov104_0222E930 * param0, const UnkFuncPtr_ov104_0222E930 * param1, u32 param2) +void ov104_0222E930(UnkStruct_ov104_0222E930 *param0, const UnkFuncPtr_ov104_0222E930 *param1, u32 param2); +u8 ov104_0222E968(UnkStruct_ov104_0222E930 *param0, const u8 *param1); +void ov104_0222E974(UnkStruct_ov104_0222E930 *param0, UnkFuncPtr_ov104_0222E974 param1); +void ov104_0222E980(UnkStruct_ov104_0222E930 *param0); +u8 ov104_0222E988(UnkStruct_ov104_0222E930 *param0); +u8 ov104_0222E9F8(UnkStruct_ov104_0222E930 *param0, const u8 *param1); +const u8 *ov104_0222EA14(UnkStruct_ov104_0222E930 *param0); +void ov104_0222EA2C(UnkStruct_ov104_0222E930 *param0, u8 *param1); +void ov104_0222EA3C(UnkStruct_ov104_0222E930 *param0); +u16 ov104_0222EA48(UnkStruct_ov104_0222E930 *param0); +u32 ov104_0222EA60(UnkStruct_ov104_0222E930 *param0); + +void ov104_0222E930(UnkStruct_ov104_0222E930 *param0, const UnkFuncPtr_ov104_0222E930 *param1, u32 param2) { u32 v0; @@ -32,7 +31,7 @@ void ov104_0222E930 (UnkStruct_ov104_0222E930 * param0, const UnkFuncPtr_ov104_0 param0->unk_70 = param1; param0->unk_74 = param2; - for (v0 = 0; v0 < (((((((((0x8000 + 7) + 1)) + 7) + 1)) + 3) + 1) - ((((((0x8000 + 7) + 1)) + 7) + 1))); v0++) { + for (v0 = 0; v0 < (((((((0x8000 + 7) + 1) + 7) + 1) + 3) + 1) - ((((0x8000 + 7) + 1) + 7) + 1)); v0++) { param0->unk_78[v0] = 0; } @@ -41,7 +40,7 @@ void ov104_0222E930 (UnkStruct_ov104_0222E930 * param0, const UnkFuncPtr_ov104_0 } } -u8 ov104_0222E968 (UnkStruct_ov104_0222E930 * param0, const u8 * param1) +u8 ov104_0222E968(UnkStruct_ov104_0222E930 *param0, const u8 *param1) { param0->unk_1C = param1; param0->unk_19 = 1; @@ -49,19 +48,19 @@ u8 ov104_0222E968 (UnkStruct_ov104_0222E930 * param0, const u8 * param1) return 1; } -void ov104_0222E974 (UnkStruct_ov104_0222E930 * param0, UnkFuncPtr_ov104_0222E974 param1) +void ov104_0222E974(UnkStruct_ov104_0222E930 *param0, UnkFuncPtr_ov104_0222E974 param1) { param0->unk_19 = 2; param0->unk_88 = param1; } -void ov104_0222E980 (UnkStruct_ov104_0222E930 * param0) +void ov104_0222E980(UnkStruct_ov104_0222E930 *param0) { param0->unk_19 = 0; param0->unk_1C = NULL; } -u8 ov104_0222E988 (UnkStruct_ov104_0222E930 * param0) +u8 ov104_0222E988(UnkStruct_ov104_0222E930 *param0) { u16 v0; @@ -105,7 +104,7 @@ u8 ov104_0222E988 (UnkStruct_ov104_0222E930 * param0) return 1; } -u8 ov104_0222E9F8 (UnkStruct_ov104_0222E930 * param0, const u8 * param1) +u8 ov104_0222E9F8(UnkStruct_ov104_0222E930 *param0, const u8 *param1) { if (param0->unk_18 + 1 >= 20) { return 1; @@ -117,7 +116,7 @@ u8 ov104_0222E9F8 (UnkStruct_ov104_0222E930 * param0, const u8 * param1) return 0; } -const u8 * ov104_0222EA14 (UnkStruct_ov104_0222E930 * param0) +const u8 *ov104_0222EA14(UnkStruct_ov104_0222E930 *param0) { if (param0->unk_18 == 0) { return NULL; @@ -128,18 +127,18 @@ const u8 * ov104_0222EA14 (UnkStruct_ov104_0222E930 * param0) return param0->unk_20[param0->unk_18]; } -void ov104_0222EA2C (UnkStruct_ov104_0222E930 * param0, u8 * param1) +void ov104_0222EA2C(UnkStruct_ov104_0222E930 *param0, u8 *param1) { ov104_0222E9F8(param0, param0->unk_1C); param0->unk_1C = param1; } -void ov104_0222EA3C (UnkStruct_ov104_0222E930 * param0) +void ov104_0222EA3C(UnkStruct_ov104_0222E930 *param0) { param0->unk_1C = ov104_0222EA14(param0); } -u16 ov104_0222EA48 (UnkStruct_ov104_0222E930 * param0) +u16 ov104_0222EA48(UnkStruct_ov104_0222E930 *param0) { u16 v0; @@ -149,7 +148,7 @@ u16 ov104_0222EA48 (UnkStruct_ov104_0222E930 * param0) return v0; } -u32 ov104_0222EA60 (UnkStruct_ov104_0222E930 * param0) +u32 ov104_0222EA60(UnkStruct_ov104_0222E930 *param0) { u32 v0; u8 v1, v2, v3, v4; diff --git a/src/overlay104/ov104_0222EA90.c b/src/overlay104/ov104_0222EA90.c index 2cfdd08fdf..0b03881f55 100644 --- a/src/overlay104/ov104_0222EA90.c +++ b/src/overlay104/ov104_0222EA90.c @@ -1,16 +1,17 @@ +#include "overlay104/ov104_0222EA90.h" + #include #include +#include "overlay104/ov104_0223C164.h" +#include "overlay104/ov104_0223D9E4.h" #include "overlay104/struct_ov104_0223C4CC.h" +#include "gx_layers.h" #include "heap.h" #include "unk_02018340.h" -#include "gx_layers.h" -#include "overlay104/ov104_0222EA90.h" -#include "overlay104/ov104_0223C164.h" -#include "overlay104/ov104_0223D9E4.h" -typedef void (* UnkFuncPtr_ov104_0223F394)(UnkStruct_ov104_0223C4CC *, void **); +typedef void (*UnkFuncPtr_ov104_0223F394)(UnkStruct_ov104_0223C4CC *, void **); typedef struct { int unk_00; @@ -32,22 +33,22 @@ typedef struct { u8 unk_24[2]; } UnkStruct_ov104_0223F394; -static void ov104_0222EBBC(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EBCC(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EBD8(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EC0C(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EC18(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EC1C(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EC20(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EC58(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EC5C(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EC70(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EC74(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EC8C(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222EC90(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222ECA0(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222ECAC(UnkStruct_ov104_0223C4CC * param0, void ** param1); -static void ov104_0222ECE4(UnkStruct_ov104_0223C4CC * param0, void ** param1); +static void ov104_0222EBBC(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EBCC(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EBD8(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EC0C(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EC18(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EC1C(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EC20(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EC58(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EC5C(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EC70(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EC74(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EC8C(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222EC90(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222ECA0(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222ECAC(UnkStruct_ov104_0223C4CC *param0, void **param1); +static void ov104_0222ECE4(UnkStruct_ov104_0223C4CC *param0, void **param1); static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { { @@ -66,7 +67,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0x0, 0x81, 0x0, - 0x1 + 0x1, }, { GX_BGMODE_0, @@ -84,7 +85,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0xffff, 0xffff, 0x0, - 0x1 + 0x1, }, { GX_BGMODE_0, @@ -102,7 +103,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0xffff, 0xffff, 0x0, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -120,7 +121,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0x0, 0x81, 0x1, - 0x0 + 0x0, }, { GX_BGMODE_5, @@ -138,7 +139,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0xffff, 0xffff, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -156,7 +157,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0x2D, 0x8D, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -174,7 +175,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0x2D, 0x8D, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -192,7 +193,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0xffff, 0xffff, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -210,7 +211,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0xffff, 0xffff, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -228,7 +229,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0xffff, 0xffff, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -246,7 +247,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0x13, 0x85, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -264,7 +265,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0xffff, 0xffff, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -282,7 +283,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0x1D, 0x8C, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -300,7 +301,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0xffff, 0xffff, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -318,7 +319,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0xffff, 0xffff, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -336,7 +337,7 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0xffff, 0xffff, 0x1, - 0x1 + 0x1, }, { GX_BGMODE_5, @@ -354,11 +355,11 @@ static const UnkStruct_ov104_0223F394 Unk_ov104_0223F394[] = { 0x59, 0xA9, 0x1, - 0x1 - } + 0x1, + }, }; -int ov104_0222EA90 (int param0, int param1) +int ov104_0222EA90(int param0, int param1) { switch (param1) { case 0: @@ -395,31 +396,31 @@ int ov104_0222EA90 (int param0, int param1) return 0; } -void ov104_0222EB8C (UnkStruct_ov104_0223C4CC * param0, void ** param1, int param2) +void ov104_0222EB8C(UnkStruct_ov104_0223C4CC *param0, void **param1, int param2) { if (Unk_ov104_0223F394[param2].unk_04 != NULL) { Unk_ov104_0223F394[param2].unk_04(param0, param1); } } -void ov104_0222EBA4 (UnkStruct_ov104_0223C4CC * param0, void ** param1, int param2) +void ov104_0222EBA4(UnkStruct_ov104_0223C4CC *param0, void **param1, int param2) { if (Unk_ov104_0223F394[param2].unk_08 != NULL) { Unk_ov104_0223F394[param2].unk_08(param0, param1); } } -static void ov104_0222EBBC (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EBBC(UnkStruct_ov104_0223C4CC *param0, void **param1) { *param1 = Heap_AllocFromHeap(94, 32); } -static void ov104_0222EBCC (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EBCC(UnkStruct_ov104_0223C4CC *param0, void **param1) { Heap_FreeToHeap(*param1); } -static void ov104_0222EBD8 (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EBD8(UnkStruct_ov104_0223C4CC *param0, void **param1) { *param1 = ov104_0223D9E4(param0->unk_00, param0->unk_04); @@ -431,23 +432,23 @@ static void ov104_0222EBD8 (UnkStruct_ov104_0223C4CC * param0, void ** param1) return; } -static void ov104_0222EC0C (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EC0C(UnkStruct_ov104_0223C4CC *param0, void **param1) { ov104_0223DA28(*param1); return; } -static void ov104_0222EC18 (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EC18(UnkStruct_ov104_0223C4CC *param0, void **param1) { return; } -static void ov104_0222EC1C (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EC1C(UnkStruct_ov104_0223C4CC *param0, void **param1) { return; } -static void ov104_0222EC20 (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EC20(UnkStruct_ov104_0223C4CC *param0, void **param1) { BGL_SetPriority(0, 1); BGL_SetPriority(2, 2); @@ -459,47 +460,47 @@ static void ov104_0222EC20 (UnkStruct_ov104_0223C4CC * param0, void ** param1) return; } -static void ov104_0222EC58 (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EC58(UnkStruct_ov104_0223C4CC *param0, void **param1) { return; } -static void ov104_0222EC5C (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EC5C(UnkStruct_ov104_0223C4CC *param0, void **param1) { BGL_SetPriority(2, 3); BGL_SetPriority(3, 2); return; } -static void ov104_0222EC70 (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EC70(UnkStruct_ov104_0223C4CC *param0, void **param1) { return; } -static void ov104_0222EC74 (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EC74(UnkStruct_ov104_0223C4CC *param0, void **param1) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, 20, 20); return; } -static void ov104_0222EC8C (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EC8C(UnkStruct_ov104_0223C4CC *param0, void **param1) { return; } -static void ov104_0222EC90 (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222EC90(UnkStruct_ov104_0223C4CC *param0, void **param1) { *param1 = ov104_0223C164(param0->unk_00); return; } -static void ov104_0222ECA0 (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222ECA0(UnkStruct_ov104_0223C4CC *param0, void **param1) { ov104_0223C23C(*param1); return; } -static void ov104_0222ECAC (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222ECAC(UnkStruct_ov104_0223C4CC *param0, void **param1) { BGL_SetPriority(1, 0); BGL_SetPriority(0, 2); @@ -510,7 +511,7 @@ static void ov104_0222ECAC (UnkStruct_ov104_0223C4CC * param0, void ** param1) return; } -static void ov104_0222ECE4 (UnkStruct_ov104_0223C4CC * param0, void ** param1) +static void ov104_0222ECE4(UnkStruct_ov104_0223C4CC *param0, void **param1) { return; } diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c index f8c28cd43b..7f9cd750fc 100644 --- a/src/overlay104/ov104_0222ECE8.c +++ b/src/overlay104/ov104_0222ECE8.c @@ -1,90 +1,90 @@ +#include "overlay104/ov104_0222ECE8.h" + #include #include -#include "trainer_info.h" #include "struct_decls/struct_0203041C_decl.h" #include "struct_decls/struct_020305B8_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" +#include "overlay104/ov104_0223A7F4.h" +#include "overlay104/ov104_0223B6F4.h" +#include "overlay104/ov104_0223BCBC.h" #include "overlay104/struct_ov104_0223ADA0.h" #include "overlay104/struct_ov104_0223B5C0.h" #include "overlay104/struct_ov104_0223BA10.h" #include "overlay104/struct_ov104_0223BFFC.h" +#include "communication_system.h" #include "heap.h" +#include "party.h" +#include "pokemon.h" +#include "trainer_info.h" #include "unk_02025E08.h" #include "unk_020302D0.h" #include "unk_02030494.h" #include "unk_0203061C.h" -#include "communication_system.h" #include "unk_0205DFC4.h" -#include "pokemon.h" -#include "party.h" -#include "overlay104/ov104_0222ECE8.h" -#include "overlay104/ov104_0223A7F4.h" -#include "overlay104/ov104_0223B6F4.h" -#include "overlay104/ov104_0223BCBC.h" -BOOL ov104_0222EEF8(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0222EF30(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222EF64(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0222EF94(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222EFCC(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0222F03C(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F0B4(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0222F124(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F1A0(UnkStruct_ov104_0223ADA0 * param0, u8 param1); -void ov104_0222F1C4(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F1EC(UnkStruct_ov104_0223ADA0 * param0, u8 param1); -void ov104_0222F210(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F238(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0222F31C(int param0, int param1, void * param2, void * param3); -void ov104_0222ECE8(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222ED00(UnkStruct_ov104_0223B5C0 * param0); -void ov104_0222ED2C(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222ED44(UnkStruct_ov104_0223B5C0 * param0); -void ov104_0222ED74(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222EDA8(UnkStruct_ov104_0223B5C0 * param0); -void ov104_0222EDDC(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222EE14(UnkStruct_ov104_0223B5C0 * param0, u8 param1); -void ov104_0222EE38(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222EE60(UnkStruct_ov104_0223B5C0 * param0); -void ov104_0222EEA8(int param0, int param1, void * param2, void * param3); -u8 * ov104_0222EED8(int param0, void * param1, int param2); -BOOL ov104_0222F3B8(UnkStruct_ov104_0223BA10 * param0); -void ov104_0222F418(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F44C(UnkStruct_ov104_0223BA10 * param0); -void ov104_0222F480(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F4B8(UnkStruct_ov104_0223BA10 * param0); -void ov104_0222F530(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F5D4(UnkStruct_ov104_0223BA10 * param0); -void ov104_0222F650(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F6C8(UnkStruct_ov104_0223BA10 * param0, u16 param1); -void ov104_0222F6E8(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F710(UnkStruct_ov104_0223BA10 * param0, u16 param1); -void ov104_0222F730(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F758(UnkStruct_ov104_0223BA10 * param0); -void ov104_0222F7BC(int param0, int param1, void * param2, void * param3); -u8 * ov104_0222F84C(int param0, void * param1, int param2); -BOOL ov104_0222F86C(UnkStruct_ov104_0223BFFC * param0); -void ov104_0222F8A0(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F8D0(UnkStruct_ov104_0223BFFC * param0); -void ov104_0222F908(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222F944(UnkStruct_ov104_0223BFFC * param0); -void ov104_0222F9C0(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222FA38(UnkStruct_ov104_0223BFFC * param0, u16 param1); -void ov104_0222FA5C(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222FA84(UnkStruct_ov104_0223BFFC * param0, u16 param1); -void ov104_0222FAA8(int param0, int param1, void * param2, void * param3); -BOOL ov104_0222FAD0(UnkStruct_ov104_0223BFFC * param0); -void ov104_0222FB34(int param0, int param1, void * param2, void * param3); -u8 * ov104_0222FBC4(int param0, void * param1, int param2); - -void ov104_0222ECE8 (int param0, int param1, void * param2, void * param3) +BOOL ov104_0222EEF8(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0222EF30(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222EF64(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0222EF94(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222EFCC(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0222F03C(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F0B4(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0222F124(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F1A0(UnkStruct_ov104_0223ADA0 *param0, u8 param1); +void ov104_0222F1C4(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F1EC(UnkStruct_ov104_0223ADA0 *param0, u8 param1); +void ov104_0222F210(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F238(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0222F31C(int param0, int param1, void *param2, void *param3); +void ov104_0222ECE8(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222ED00(UnkStruct_ov104_0223B5C0 *param0); +void ov104_0222ED2C(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222ED44(UnkStruct_ov104_0223B5C0 *param0); +void ov104_0222ED74(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222EDA8(UnkStruct_ov104_0223B5C0 *param0); +void ov104_0222EDDC(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222EE14(UnkStruct_ov104_0223B5C0 *param0, u8 param1); +void ov104_0222EE38(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222EE60(UnkStruct_ov104_0223B5C0 *param0); +void ov104_0222EEA8(int param0, int param1, void *param2, void *param3); +u8 *ov104_0222EED8(int param0, void *param1, int param2); +BOOL ov104_0222F3B8(UnkStruct_ov104_0223BA10 *param0); +void ov104_0222F418(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F44C(UnkStruct_ov104_0223BA10 *param0); +void ov104_0222F480(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F4B8(UnkStruct_ov104_0223BA10 *param0); +void ov104_0222F530(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F5D4(UnkStruct_ov104_0223BA10 *param0); +void ov104_0222F650(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F6C8(UnkStruct_ov104_0223BA10 *param0, u16 param1); +void ov104_0222F6E8(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F710(UnkStruct_ov104_0223BA10 *param0, u16 param1); +void ov104_0222F730(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F758(UnkStruct_ov104_0223BA10 *param0); +void ov104_0222F7BC(int param0, int param1, void *param2, void *param3); +u8 *ov104_0222F84C(int param0, void *param1, int param2); +BOOL ov104_0222F86C(UnkStruct_ov104_0223BFFC *param0); +void ov104_0222F8A0(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F8D0(UnkStruct_ov104_0223BFFC *param0); +void ov104_0222F908(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222F944(UnkStruct_ov104_0223BFFC *param0); +void ov104_0222F9C0(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222FA38(UnkStruct_ov104_0223BFFC *param0, u16 param1); +void ov104_0222FA5C(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222FA84(UnkStruct_ov104_0223BFFC *param0, u16 param1); +void ov104_0222FAA8(int param0, int param1, void *param2, void *param3); +BOOL ov104_0222FAD0(UnkStruct_ov104_0223BFFC *param0); +void ov104_0222FB34(int param0, int param1, void *param2, void *param3); +u8 *ov104_0222FBC4(int param0, void *param1, int param2); + +void ov104_0222ECE8(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov104_0223B5C0 * v0 = param3; - const u16 * v1 = param2; + UnkStruct_ov104_0223B5C0 *v0 = param3; + const u16 *v1 = param2; v0->unk_D90++; @@ -95,11 +95,11 @@ void ov104_0222ECE8 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222ED00 (UnkStruct_ov104_0223B5C0 * param0) +BOOL ov104_0222ED00(UnkStruct_ov104_0223B5C0 *param0) { int v0, v1; - TrainerInfo * v2; - u16 * v3; + TrainerInfo *v2; + u16 *v3; int v4, v5; v5 = 44; @@ -119,11 +119,11 @@ BOOL ov104_0222ED00 (UnkStruct_ov104_0223B5C0 * param0) return v4; } -void ov104_0222ED2C (int param0, int param1, void * param2, void * param3) +void ov104_0222ED2C(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223B5C0 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223B5C0 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_D90++; @@ -138,12 +138,12 @@ void ov104_0222ED2C (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222ED44 (UnkStruct_ov104_0223B5C0 * param0) +BOOL ov104_0222ED44(UnkStruct_ov104_0223B5C0 *param0) { - Party * v0; - Pokemon * v1; + Party *v0; + Pokemon *v1; int v2, v3; - u16 * v4; + u16 *v4; int v5, v6; v6 = 44; @@ -154,7 +154,7 @@ BOOL ov104_0222ED44 (UnkStruct_ov104_0223B5C0 * param0) v4[v2 + v3] = param0->unk_18[v2]; } - v3 += ((10 * 2)); + v3 += (10 * 2); if (CommSys_SendData(35, v4, v6) == 1) { v5 = 1; @@ -165,11 +165,11 @@ BOOL ov104_0222ED44 (UnkStruct_ov104_0223B5C0 * param0) return v5; } -void ov104_0222ED74 (int param0, int param1, void * param2, void * param3) +void ov104_0222ED74(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223B5C0 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223B5C0 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_D90++; @@ -186,15 +186,15 @@ void ov104_0222ED74 (int param0, int param1, void * param2, void * param3) v2->unk_18[v0] = v3[v0 + v1]; } - v1 += ((10 * 2)); + v1 += (10 * 2); return; } -BOOL ov104_0222EDA8 (UnkStruct_ov104_0223B5C0 * param0) +BOOL ov104_0222EDA8(UnkStruct_ov104_0223B5C0 *param0) { int v0, v1; - u16 * v2; + u16 *v2; int v3, v4; v4 = 44; @@ -216,11 +216,11 @@ BOOL ov104_0222EDA8 (UnkStruct_ov104_0223B5C0 * param0) return v3; } -void ov104_0222EDDC (int param0, int param1, void * param2, void * param3) +void ov104_0222EDDC(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223B5C0 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223B5C0 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_D90++; @@ -242,9 +242,9 @@ void ov104_0222EDDC (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222EE14 (UnkStruct_ov104_0223B5C0 * param0, u8 param1) +BOOL ov104_0222EE14(UnkStruct_ov104_0223B5C0 *param0, u8 param1) { - u16 * v0; + u16 *v0; int v1, v2; v2 = 44; @@ -261,10 +261,10 @@ BOOL ov104_0222EE14 (UnkStruct_ov104_0223B5C0 * param0, u8 param1) return v1; } -void ov104_0222EE38 (int param0, int param1, void * param2, void * param3) +void ov104_0222EE38(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov104_0223B5C0 * v0 = param3; - const u16 * v1 = param2; + UnkStruct_ov104_0223B5C0 *v0 = param3; + const u16 *v1 = param2; v0->unk_D90++; @@ -277,11 +277,11 @@ void ov104_0222EE38 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222EE60 (UnkStruct_ov104_0223B5C0 * param0) +BOOL ov104_0222EE60(UnkStruct_ov104_0223B5C0 *param0) { int v0, v1, v2, v3, v4; - Pokemon * v5; - Party * v6; + Pokemon *v5; + Party *v6; v1 = 0; v3 = 512; @@ -300,11 +300,11 @@ BOOL ov104_0222EE60 (UnkStruct_ov104_0223B5C0 * param0) return v2; } -void ov104_0222EEA8 (int param0, int param1, void * param2, void * param3) +void ov104_0222EEA8(int param0, int param1, void *param2, void *param3) { int v0, v1, v2; - UnkStruct_ov104_0223B5C0 * v3 = param3; - const u8 * v4 = param2; + UnkStruct_ov104_0223B5C0 *v3 = param3; + const u8 *v4 = param2; v1 = 0; v3->unk_D90++; @@ -319,19 +319,19 @@ void ov104_0222EEA8 (int param0, int param1, void * param2, void * param3) return; } -u8 * ov104_0222EED8 (int param0, void * param1, int param2) +u8 *ov104_0222EED8(int param0, void *param1, int param2) { - UnkStruct_ov104_0223B5C0 * v0 = param1; + UnkStruct_ov104_0223B5C0 *v0 = param1; GF_ASSERT(param2 <= 512); return v0->unk_984[param0]; } -BOOL ov104_0222EEF8 (UnkStruct_ov104_0223ADA0 * param0) +BOOL ov104_0222EEF8(UnkStruct_ov104_0223ADA0 *param0) { int v0, v1; - TrainerInfo * v2; - u16 * v3; + TrainerInfo *v2; + u16 *v3; int v4, v5; v5 = 60; @@ -355,11 +355,11 @@ BOOL ov104_0222EEF8 (UnkStruct_ov104_0223ADA0 * param0) return v4; } -void ov104_0222EF30 (int param0, int param1, void * param2, void * param3) +void ov104_0222EF30(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223ADA0 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223ADA0 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_702++; @@ -378,10 +378,10 @@ void ov104_0222EF30 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222EF64 (UnkStruct_ov104_0223ADA0 * param0) +BOOL ov104_0222EF64(UnkStruct_ov104_0223ADA0 *param0) { int v0, v1; - u16 * v2; + u16 *v2; int v3, v4; v4 = 60; @@ -403,11 +403,11 @@ BOOL ov104_0222EF64 (UnkStruct_ov104_0223ADA0 * param0) return v3; } -void ov104_0222EF94 (int param0, int param1, void * param2, void * param3) +void ov104_0222EF94(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223ADA0 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223ADA0 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_702++; @@ -429,10 +429,10 @@ void ov104_0222EF94 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222EFCC (UnkStruct_ov104_0223ADA0 * param0) +BOOL ov104_0222EFCC(UnkStruct_ov104_0223ADA0 *param0) { int v0, v1; - u16 * v2; + u16 *v2; int v3, v4; v4 = 60; @@ -467,12 +467,12 @@ BOOL ov104_0222EFCC (UnkStruct_ov104_0223ADA0 * param0) return v3; } -void ov104_0222F03C (int param0, int param1, void * param2, void * param3) +void ov104_0222F03C(int param0, int param1, void *param2, void *param3) { int v0, v1; - Pokemon * v2; - UnkStruct_ov104_0223ADA0 * v3 = param3; - const u16 * v4 = param2; + Pokemon *v2; + UnkStruct_ov104_0223ADA0 *v3 = param3; + const u16 *v4 = param2; v1 = 0; v3->unk_702++; @@ -507,10 +507,10 @@ void ov104_0222F03C (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F0B4 (UnkStruct_ov104_0223ADA0 * param0) +BOOL ov104_0222F0B4(UnkStruct_ov104_0223ADA0 *param0) { int v0, v1; - u16 * v2; + u16 *v2; int v3, v4; v4 = 60; @@ -545,11 +545,11 @@ BOOL ov104_0222F0B4 (UnkStruct_ov104_0223ADA0 * param0) return v3; } -void ov104_0222F124 (int param0, int param1, void * param2, void * param3) +void ov104_0222F124(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223ADA0 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223ADA0 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_702++; @@ -584,9 +584,9 @@ void ov104_0222F124 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F1A0 (UnkStruct_ov104_0223ADA0 * param0, u8 param1) +BOOL ov104_0222F1A0(UnkStruct_ov104_0223ADA0 *param0, u8 param1) { - u16 * v0; + u16 *v0; int v1, v2; v2 = 60; @@ -603,10 +603,10 @@ BOOL ov104_0222F1A0 (UnkStruct_ov104_0223ADA0 * param0, u8 param1) return v1; } -void ov104_0222F1C4 (int param0, int param1, void * param2, void * param3) +void ov104_0222F1C4(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov104_0223ADA0 * v0 = param3; - const u16 * v1 = param2; + UnkStruct_ov104_0223ADA0 *v0 = param3; + const u16 *v1 = param2; v0->unk_702++; @@ -619,9 +619,9 @@ void ov104_0222F1C4 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F1EC (UnkStruct_ov104_0223ADA0 * param0, u8 param1) +BOOL ov104_0222F1EC(UnkStruct_ov104_0223ADA0 *param0, u8 param1) { - u16 * v0; + u16 *v0; int v1, v2; v2 = 60; @@ -638,10 +638,10 @@ BOOL ov104_0222F1EC (UnkStruct_ov104_0223ADA0 * param0, u8 param1) return v1; } -void ov104_0222F210 (int param0, int param1, void * param2, void * param3) +void ov104_0222F210(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov104_0223ADA0 * v0 = param3; - const u16 * v1 = param2; + UnkStruct_ov104_0223ADA0 *v0 = param3; + const u16 *v1 = param2; v0->unk_702++; @@ -653,15 +653,15 @@ void ov104_0222F210 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F238 (UnkStruct_ov104_0223ADA0 * param0) +BOOL ov104_0222F238(UnkStruct_ov104_0223ADA0 *param0) { u8 v0; int v1, v2; - u16 * v3; + u16 *v3; int v4, v5; u32 v6[2]; u8 v7[2]; - Pokemon * v8; + Pokemon *v8; v5 = 60; v3 = param0->unk_504; @@ -702,15 +702,15 @@ BOOL ov104_0222F238 (UnkStruct_ov104_0223ADA0 * param0) return v4; } -void ov104_0222F31C (int param0, int param1, void * param2, void * param3) +void ov104_0222F31C(int param0, int param1, void *param2, void *param3) { int v0, v1; u8 v2; u32 v3[2]; u8 v4[2]; - Pokemon * v5; - UnkStruct_ov104_0223ADA0 * v6 = param3; - const u16 * v7 = param2; + Pokemon *v5; + UnkStruct_ov104_0223ADA0 *v6 = param3; + const u16 *v7 = param2; v1 = 0; v6->unk_702++; @@ -743,10 +743,10 @@ void ov104_0222F31C (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F3B8 (UnkStruct_ov104_0223BA10 * param0) +BOOL ov104_0222F3B8(UnkStruct_ov104_0223BA10 *param0) { int v0, v1, v2, v3; - UnkStruct_0203041C * v4; + UnkStruct_0203041C *v4; v4 = sub_0203041C(param0->unk_04); v3 = 40; @@ -770,11 +770,11 @@ BOOL ov104_0222F3B8 (UnkStruct_ov104_0223BA10 * param0) return v2; } -void ov104_0222F418 (int param0, int param1, void * param2, void * param3) +void ov104_0222F418(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223BA10 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223BA10 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_A1A++; @@ -795,7 +795,7 @@ void ov104_0222F418 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F44C (UnkStruct_ov104_0223BA10 * param0) +BOOL ov104_0222F44C(UnkStruct_ov104_0223BA10 *param0) { int v0, v1, v2, v3; @@ -817,11 +817,11 @@ BOOL ov104_0222F44C (UnkStruct_ov104_0223BA10 * param0) return v2; } -void ov104_0222F480 (int param0, int param1, void * param2, void * param3) +void ov104_0222F480(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223BA10 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223BA10 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_A1A++; @@ -843,10 +843,10 @@ void ov104_0222F480 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F4B8 (UnkStruct_ov104_0223BA10 * param0) +BOOL ov104_0222F4B8(UnkStruct_ov104_0223BA10 *param0) { int v0, v1, v2, v3; - TrainerInfo * v4; + TrainerInfo *v4; v1 = 0; v3 = 40; @@ -882,12 +882,12 @@ BOOL ov104_0222F4B8 (UnkStruct_ov104_0223BA10 * param0) return v2; } -void ov104_0222F530 (int param0, int param1, void * param2, void * param3) +void ov104_0222F530(int param0, int param1, void *param2, void *param3) { - Pokemon * v0; + Pokemon *v0; int v1, v2; - UnkStruct_ov104_0223BA10 * v3 = param3; - const u16 * v4 = param2; + UnkStruct_ov104_0223BA10 *v3 = param3; + const u16 *v4 = param2; v2 = 0; v3->unk_A1A++; @@ -932,7 +932,7 @@ void ov104_0222F530 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F5D4 (UnkStruct_ov104_0223BA10 * param0) +BOOL ov104_0222F5D4(UnkStruct_ov104_0223BA10 *param0) { int v0, v1, v2, v3; @@ -967,11 +967,11 @@ BOOL ov104_0222F5D4 (UnkStruct_ov104_0223BA10 * param0) return v2; } -void ov104_0222F650 (int param0, int param1, void * param2, void * param3) +void ov104_0222F650(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223BA10 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223BA10 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_A1A++; @@ -1006,7 +1006,7 @@ void ov104_0222F650 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F6C8 (UnkStruct_ov104_0223BA10 * param0, u16 param1) +BOOL ov104_0222F6C8(UnkStruct_ov104_0223BA10 *param0, u16 param1) { int v0, v1; @@ -1022,11 +1022,11 @@ BOOL ov104_0222F6C8 (UnkStruct_ov104_0223BA10 * param0, u16 param1) return v0; } -void ov104_0222F6E8 (int param0, int param1, void * param2, void * param3) +void ov104_0222F6E8(int param0, int param1, void *param2, void *param3) { int v0; - UnkStruct_ov104_0223BA10 * v1 = param3; - const u16 * v2 = param2; + UnkStruct_ov104_0223BA10 *v1 = param3; + const u16 *v2 = param2; v0 = 0; v1->unk_A1A++; @@ -1039,7 +1039,7 @@ void ov104_0222F6E8 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F710 (UnkStruct_ov104_0223BA10 * param0, u16 param1) +BOOL ov104_0222F710(UnkStruct_ov104_0223BA10 *param0, u16 param1) { int v0, v1; @@ -1055,11 +1055,11 @@ BOOL ov104_0222F710 (UnkStruct_ov104_0223BA10 * param0, u16 param1) return v0; } -void ov104_0222F730 (int param0, int param1, void * param2, void * param3) +void ov104_0222F730(int param0, int param1, void *param2, void *param3) { int v0; - UnkStruct_ov104_0223BA10 * v1 = param3; - const u16 * v2 = param2; + UnkStruct_ov104_0223BA10 *v1 = param3; + const u16 *v2 = param2; v0 = 0; v1->unk_A1A++; @@ -1072,11 +1072,11 @@ void ov104_0222F730 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F758 (UnkStruct_ov104_0223BA10 * param0) +BOOL ov104_0222F758(UnkStruct_ov104_0223BA10 *param0) { int v0, v1, v2, v3, v4; u8 v5; - Pokemon * v6; + Pokemon *v6; v1 = 0; v3 = 512; @@ -1097,13 +1097,13 @@ BOOL ov104_0222F758 (UnkStruct_ov104_0223BA10 * param0) return v2; } -void ov104_0222F7BC (int param0, int param1, void * param2, void * param3) +void ov104_0222F7BC(int param0, int param1, void *param2, void *param3) { u8 v0; int v1, v2, v3; - Pokemon * v4; - UnkStruct_ov104_0223BA10 * v5 = param3; - const u8 * v6 = param2; + Pokemon *v4; + UnkStruct_ov104_0223BA10 *v5 = param3; + const u8 *v6 = param2; v2 = 0; v5->unk_A1A++; @@ -1131,18 +1131,18 @@ void ov104_0222F7BC (int param0, int param1, void * param2, void * param3) return; } -u8 * ov104_0222F84C (int param0, void * param1, int param2) +u8 *ov104_0222F84C(int param0, void *param1, int param2) { - UnkStruct_ov104_0223BA10 * v0 = param1; + UnkStruct_ov104_0223BA10 *v0 = param1; GF_ASSERT(param2 <= 512); return v0->unk_610[param0]; } -BOOL ov104_0222F86C (UnkStruct_ov104_0223BFFC * param0) +BOOL ov104_0222F86C(UnkStruct_ov104_0223BFFC *param0) { int v0, v1, v2, v3; - UnkStruct_020305B8 * v4; + UnkStruct_020305B8 *v4; v4 = sub_020305B8(param0->unk_04); v3 = 40; @@ -1162,11 +1162,11 @@ BOOL ov104_0222F86C (UnkStruct_ov104_0223BFFC * param0) return v2; } -void ov104_0222F8A0 (int param0, int param1, void * param2, void * param3) +void ov104_0222F8A0(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223BFFC * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223BFFC *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_A7C++; @@ -1183,7 +1183,7 @@ void ov104_0222F8A0 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F8D0 (UnkStruct_ov104_0223BFFC * param0) +BOOL ov104_0222F8D0(UnkStruct_ov104_0223BFFC *param0) { int v0, v1, v2, v3; @@ -1205,11 +1205,11 @@ BOOL ov104_0222F8D0 (UnkStruct_ov104_0223BFFC * param0) return v2; } -void ov104_0222F908 (int param0, int param1, void * param2, void * param3) +void ov104_0222F908(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223BFFC * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223BFFC *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_A7C++; @@ -1231,7 +1231,7 @@ void ov104_0222F908 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222F944 (UnkStruct_ov104_0223BFFC * param0) +BOOL ov104_0222F944(UnkStruct_ov104_0223BFFC *param0) { int v0, v1, v2, v3; @@ -1266,11 +1266,11 @@ BOOL ov104_0222F944 (UnkStruct_ov104_0223BFFC * param0) return v2; } -void ov104_0222F9C0 (int param0, int param1, void * param2, void * param3) +void ov104_0222F9C0(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov104_0223BFFC * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov104_0223BFFC *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_A7C++; @@ -1305,7 +1305,7 @@ void ov104_0222F9C0 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222FA38 (UnkStruct_ov104_0223BFFC * param0, u16 param1) +BOOL ov104_0222FA38(UnkStruct_ov104_0223BFFC *param0, u16 param1) { int v0, v1; @@ -1321,11 +1321,11 @@ BOOL ov104_0222FA38 (UnkStruct_ov104_0223BFFC * param0, u16 param1) return v0; } -void ov104_0222FA5C (int param0, int param1, void * param2, void * param3) +void ov104_0222FA5C(int param0, int param1, void *param2, void *param3) { int v0; - UnkStruct_ov104_0223BFFC * v1 = param3; - const u16 * v2 = param2; + UnkStruct_ov104_0223BFFC *v1 = param3; + const u16 *v2 = param2; v0 = 0; v1->unk_A7C++; @@ -1338,7 +1338,7 @@ void ov104_0222FA5C (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222FA84 (UnkStruct_ov104_0223BFFC * param0, u16 param1) +BOOL ov104_0222FA84(UnkStruct_ov104_0223BFFC *param0, u16 param1) { int v0, v1; @@ -1354,11 +1354,11 @@ BOOL ov104_0222FA84 (UnkStruct_ov104_0223BFFC * param0, u16 param1) return v0; } -void ov104_0222FAA8 (int param0, int param1, void * param2, void * param3) +void ov104_0222FAA8(int param0, int param1, void *param2, void *param3) { int v0; - UnkStruct_ov104_0223BFFC * v1 = param3; - const u16 * v2 = param2; + UnkStruct_ov104_0223BFFC *v1 = param3; + const u16 *v2 = param2; v0 = 0; v1->unk_A7C++; @@ -1371,11 +1371,11 @@ void ov104_0222FAA8 (int param0, int param1, void * param2, void * param3) return; } -BOOL ov104_0222FAD0 (UnkStruct_ov104_0223BFFC * param0) +BOOL ov104_0222FAD0(UnkStruct_ov104_0223BFFC *param0) { int v0, v1, v2, v3, v4; u8 v5; - Pokemon * v6; + Pokemon *v6; v1 = 0; v3 = 512; @@ -1396,13 +1396,13 @@ BOOL ov104_0222FAD0 (UnkStruct_ov104_0223BFFC * param0) return v2; } -void ov104_0222FB34 (int param0, int param1, void * param2, void * param3) +void ov104_0222FB34(int param0, int param1, void *param2, void *param3) { u8 v0; int v1, v2, v3; - Pokemon * v4; - UnkStruct_ov104_0223BFFC * v5 = param3; - const u8 * v6 = param2; + Pokemon *v4; + UnkStruct_ov104_0223BFFC *v5 = param3; + const u8 *v6 = param2; v2 = 0; v5->unk_A7C++; @@ -1430,9 +1430,9 @@ void ov104_0222FB34 (int param0, int param1, void * param2, void * param3) return; } -u8 * ov104_0222FBC4 (int param0, void * param1, int param2) +u8 *ov104_0222FBC4(int param0, void *param1, int param2) { - UnkStruct_ov104_0223BFFC * v0 = param1; + UnkStruct_ov104_0223BFFC *v0 = param1; GF_ASSERT(param2 <= 512); return v0->unk_674[param0]; diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 4d86747b48..e6484ebe51 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -1,45 +1,52 @@ -#include "enums.h" +#include "overlay104/ov104_0222FBE4.h" #include #include -#include "core_sys.h" - #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" #include "struct_decls/struct_0202440C_decl.h" -#include "trainer_info.h" #include "struct_decls/struct_0202B370_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "overlay063/struct_ov63_0222BEC0_decl.h" -#include "overlay063/struct_ov63_0222D77C_decl.h" -#include "overlay104/struct_ov104_0222E930_decl.h" -#include "overlay104/struct_ov104_022320B4_decl.h" -#include "overlay104/struct_ov104_0223EBD0_decl.h" -#include "overlay104/struct_ov104_0223F174_decl.h" - -#include "overlay104/const_ov104_0223F674.h" -#include "constdata/const_020EA358.h" -#include "overlay104/const_ov104_0223F63C.h" -#include "constdata/const_020F2DAC.h" - #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0205AA50.h" + +#include "overlay004/ov4_021D0D80.h" #include "overlay006/battle_params.h" #include "overlay061/struct_ov61_0222C884.h" +#include "overlay063/ov63_0222BE18.h" +#include "overlay063/ov63_0222CCE4.h" +#include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CE44.h" +#include "overlay063/struct_ov63_0222D77C_decl.h" +#include "overlay104/const_ov104_0223F63C.h" +#include "overlay104/const_ov104_0223F674.h" #include "overlay104/funcptr_ov104_0222E930.h" +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222E63C.h" +#include "overlay104/ov104_0222E930.h" +#include "overlay104/ov104_02231F74.h" +#include "overlay104/ov104_022332B4.h" +#include "overlay104/ov104_02234838.h" +#include "overlay104/ov104_022358E8.h" +#include "overlay104/ov104_02237378.h" +#include "overlay104/ov104_02239080.h" +#include "overlay104/ov104_02239130.h" +#include "overlay104/ov104_022395F0.h" +#include "overlay104/ov104_0223C2D4.h" +#include "overlay104/ov104_0223D5D0.h" +#include "overlay104/ov104_0223D768.h" +#include "overlay104/ov104_0223D860.h" +#include "overlay104/ov104_0223E894.h" +#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_0222E930_t.h" #include "overlay104/struct_ov104_0222FEDC.h" #include "overlay104/struct_ov104_02230BE4.h" +#include "overlay104/struct_ov104_022320B4_decl.h" #include "overlay104/struct_ov104_022320B4_t.h" #include "overlay104/struct_ov104_02232B78.h" #include "overlay104/struct_ov104_02232B78_sub1.h" @@ -49,68 +56,57 @@ #include "overlay104/struct_ov104_0223C634.h" #include "overlay104/struct_ov104_0223C688.h" #include "overlay104/struct_ov104_0223D570.h" +#include "overlay104/struct_ov104_0223EBD0_decl.h" #include "overlay104/struct_ov104_0223F094.h" +#include "overlay104/struct_ov104_0223F174_decl.h" #include "overlay104/struct_ov104_0223F1B4.h" +#include "savedata/save_table.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "enums.h" +#include "field_comm_manager.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02002F38.h" #include "unk_020041CC.h" -#include "narc.h" #include "unk_0200A9DC.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02014000.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "savedata/save_table.h" -#include "savedata.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202ACE0.h" #include "unk_0202CD50.h" #include "unk_0202D05C.h" #include "unk_0202F1D4.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" -#include "vars_flags.h" -#include "field_comm_manager.h" #include "unk_0205DFC4.h" #include "unk_0206CCB0.h" -#include "party.h" #include "unk_0208694C.h" #include "unk_02096420.h" #include "unk_0209B6F8.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay063/ov63_0222CCE4.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222E63C.h" -#include "overlay104/ov104_0222E930.h" -#include "overlay104/ov104_0222FBE4.h" -#include "overlay104/ov104_02231F74.h" -#include "overlay104/ov104_022332B4.h" -#include "overlay104/ov104_02234838.h" -#include "overlay104/ov104_022358E8.h" -#include "overlay104/ov104_02237378.h" -#include "overlay104/ov104_02239080.h" -#include "overlay104/ov104_02239130.h" -#include "overlay104/ov104_022395F0.h" -#include "overlay104/ov104_0223C2D4.h" -#include "overlay104/ov104_0223D5D0.h" -#include "overlay104/ov104_0223D768.h" -#include "overlay104/ov104_0223D860.h" -#include "overlay104/ov104_0223E894.h" +#include "vars_flags.h" + +#include "constdata/const_020EA358.h" +#include "constdata/const_020F2DAC.h" typedef struct { s16 unk_00; @@ -124,173 +120,173 @@ typedef struct { typedef struct { UnkStruct_ov104_022313FC_sub1 unk_00[96]; - UnkStruct_ov104_0223F174 * unk_600; + UnkStruct_ov104_0223F174 *unk_600; int unk_604; } UnkStruct_ov104_022313FC; typedef struct { - UnkStruct_ov104_0223C4CC * unk_00; + UnkStruct_ov104_0223C4CC *unk_00; int unk_04; int unk_08; BOOL unk_0C; BOOL unk_10; - void * unk_14; + void *unk_14; UnkStruct_ov104_0223F094 unk_18; - UnkStruct_ov104_022313FC * unk_24; - Window * unk_28; - UnkStruct_ov104_0223EBD0 * unk_2C; + UnkStruct_ov104_022313FC *unk_24; + Window *unk_28; + UnkStruct_ov104_0223EBD0 *unk_2C; } UnkStruct_ov104_02231148; -void ov104_0223DC7C(int param0, BGL * param1, SpriteRenderer * param2, SpriteGfxHandler * param3, PaletteData * param4, u16 * param5, s16 param6, s16 param7); -u16 ov104_0222FC8C(UnkStruct_ov104_0222E930 * param0, u16 param1); -u16 * ov104_0222FC14(UnkStruct_ov104_0222E930 * param0, u16 param1); -static BOOL ov104_0222FCA0(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FCA4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FCB0(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FD18(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FD4C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FEDC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FF0C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FF3C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FF6C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FF84(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FF90(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FFD8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FFE8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FFFC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230058(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022300B8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022300DC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230108(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0223014C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022301A8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230208(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230234(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230250(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230124(UnkStruct_ov104_0222E930 * param0); +void ov104_0223DC7C(int param0, BGL *param1, SpriteRenderer *param2, SpriteGfxHandler *param3, PaletteData *param4, u16 *param5, s16 param6, s16 param7); +u16 ov104_0222FC8C(UnkStruct_ov104_0222E930 *param0, u16 param1); +u16 *ov104_0222FC14(UnkStruct_ov104_0222E930 *param0, u16 param1); +static BOOL ov104_0222FCA0(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FCA4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FCB0(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FD18(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FD4C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FEDC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FF0C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FF3C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FF6C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FF84(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FF90(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FFD8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FFE8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FFFC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230058(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022300B8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022300DC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230108(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0223014C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022301A8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230208(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230234(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230250(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230124(UnkStruct_ov104_0222E930 *param0); static BOOL ov104_0222FDD4(u16 param0, u16 param1); -static BOOL ov104_0222FDE8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FE08(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FD6C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FD84(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FD9C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FDB8(UnkStruct_ov104_0222E930 * param0); -void ov104_0222FE2C(UnkStruct_ov104_0222E930 * param0, u8 * param1); -static BOOL ov104_0222FE30(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FE48(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230910(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230260(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022302B4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022302E8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022303A8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022303C8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022304A0(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0223050C(UnkStruct_ov104_0222E930 * param0); -static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 * param1, const UnkStruct_ov104_02232B78_sub1 * param2, UnkStruct_ov63_0222D77C * param3, u8 * param4, int param5); -static BOOL ov104_022305B8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022305C8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230958(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230970(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022309DC(UnkStruct_ov104_0222E930 * param0); +static BOOL ov104_0222FDE8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FE08(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FD6C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FD84(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FD9C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FDB8(UnkStruct_ov104_0222E930 *param0); +void ov104_0222FE2C(UnkStruct_ov104_0222E930 *param0, u8 *param1); +static BOOL ov104_0222FE30(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FE48(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230910(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230260(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022302B4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022302E8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022303A8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022303C8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022304A0(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0223050C(UnkStruct_ov104_0222E930 *param0); +static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, int param5); +static BOOL ov104_022305B8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022305C8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230958(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230970(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022309DC(UnkStruct_ov104_0222E930 *param0); static int ov104_02230A2C(u16 param0, u16 param1); -static BOOL ov104_02230B50(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230BB0(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230BBC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230BE4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230C3C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230C04(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230C74(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230C88(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230CAC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230CC4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230CD4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230CF4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230DC4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230DF0(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230E20(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230E40(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230EB8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230ED8(UnkStruct_ov104_0222E930 * param0); -static Strbuf* ov104_02230E90(u16 param0, u32 param1); -static BOOL ov104_02230EFC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230F28(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230F6C(UnkStruct_ov104_0222E930 * param0); +static BOOL ov104_02230B50(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230BB0(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230BBC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230BE4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230C3C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230C04(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230C74(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230C88(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230CAC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230CC4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230CD4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230CF4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230DC4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230DF0(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230E20(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230E40(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230EB8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230ED8(UnkStruct_ov104_0222E930 *param0); +static Strbuf *ov104_02230E90(u16 param0, u32 param1); +static BOOL ov104_02230EFC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230F28(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230F6C(UnkStruct_ov104_0222E930 *param0); static u16 ov104_02230D28(u32 param0); -u16 * ov104_0222FBE4(UnkStruct_ov104_0222E930 * param0); -u16 ov104_0222FC00(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FE80(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FE98(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FEA4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FCC4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FCF0(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0222FCEC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022304C8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230508(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230FA4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230FCC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230FEC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230FF8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231010(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0223102C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231050(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231068(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231078(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231090(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022310B0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022310E0(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022310EC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231118(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022305DC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230640(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0223066C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230708(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230728(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230760(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230790(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022307D8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230810(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230830(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230850(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231A28(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231AF4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231AA8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231B20(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231B54(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231B74(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231BA8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231BB8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231BD4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231C44(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231C54(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231C70(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231CE4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231CF4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231D10(UnkStruct_ov104_0222E930 * param0); -static void ov104_0223088C(UnkStruct_ov104_0222E930 * param0, int param1, int param2); -static BOOL ov104_022308E0(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02230900(UnkStruct_ov104_0222E930 * param0); +u16 *ov104_0222FBE4(UnkStruct_ov104_0222E930 *param0); +u16 ov104_0222FC00(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FE80(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FE98(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FEA4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FCC4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FCF0(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0222FCEC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022304C8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230508(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230FA4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230FCC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230FEC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230FF8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231010(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0223102C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231050(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231068(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231078(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231090(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022310B0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022310E0(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022310EC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231118(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022305DC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230640(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0223066C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230708(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230728(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230760(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230790(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022307D8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230810(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230830(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230850(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231A28(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231AF4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231AA8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231B20(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231B54(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231B74(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231BA8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231BB8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231BD4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231C44(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231C54(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231C70(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231CE4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231CF4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231D10(UnkStruct_ov104_0222E930 *param0); +static void ov104_0223088C(UnkStruct_ov104_0222E930 *param0, int param1, int param2); +static BOOL ov104_022308E0(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02230900(UnkStruct_ov104_0222E930 *param0); u32 ov104_022313F4(u16 param0, u16 param1); -static BOOL ov104_02231D1C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231D8C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231DAC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231E14(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231E30(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231E54(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231E80(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231EA4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231EC4(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231ED8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231EFC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231F34(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231F44(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02231F5C(UnkStruct_ov104_0222E930 * param0); -static void ov104_02230950(void * param0); -static BOOL ov104_02231148(UnkStruct_ov104_02231148 * param0); -static BOOL ov104_022311BC(UnkStruct_ov104_02231148 * param0); -static BOOL ov104_022312D8(UnkStruct_ov104_02231148 * param0); -static BOOL ov104_02231720(UnkStruct_ov104_02231148 * param0); -static BOOL ov104_02231864(UnkStruct_ov104_02231148 * param0); -static BOOL ov104_022319CC(UnkStruct_ov104_02231148 * param0); +static BOOL ov104_02231D1C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231D8C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231DAC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231E14(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231E30(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231E54(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231E80(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231EA4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231EC4(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231ED8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231EFC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231F34(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231F44(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02231F5C(UnkStruct_ov104_0222E930 *param0); +static void ov104_02230950(void *param0); +static BOOL ov104_02231148(UnkStruct_ov104_02231148 *param0); +static BOOL ov104_022311BC(UnkStruct_ov104_02231148 *param0); +static BOOL ov104_022312D8(UnkStruct_ov104_02231148 *param0); +static BOOL ov104_02231720(UnkStruct_ov104_02231148 *param0); +static BOOL ov104_02231864(UnkStruct_ov104_02231148 *param0); +static BOOL ov104_022319CC(UnkStruct_ov104_02231148 *param0); static const UnkStruct_ov61_0222C884 Unk_ov104_0223F640 = { 0x1, @@ -303,12 +299,12 @@ static const UnkStruct_ov61_0222C884 Unk_ov104_0223F640 = { }; static const u8 Unk_ov104_0223F648[6][3] = { - {0x1, 0x0, 0x0}, - {0x0, 0x1, 0x0}, - {0x0, 0x0, 0x1}, - {0x1, 0x1, 0x0}, - {0x0, 0x1, 0x1}, - {0x1, 0x0, 0x1} + { 0x1, 0x0, 0x0 }, + { 0x0, 0x1, 0x0 }, + { 0x0, 0x0, 0x1 }, + { 0x1, 0x1, 0x0 }, + { 0x0, 0x1, 0x1 }, + { 0x1, 0x0, 0x1 } }; const UnkFuncPtr_ov104_0222E930 Unk_ov104_0223F674[] = { @@ -520,9 +516,9 @@ const UnkFuncPtr_ov104_0222E930 Unk_ov104_0223F674[] = { const u32 Unk_ov104_0223F63C = NELEMS(Unk_ov104_0223F674); -u16 * ov104_0222FBE4 (UnkStruct_ov104_0222E930 * param0) +u16 *ov104_0222FBE4(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; + u16 *v0; u16 v1 = ov104_0222EA48(param0); v0 = ov104_0222FC14(param0, v1); @@ -535,21 +531,21 @@ u16 * ov104_0222FBE4 (UnkStruct_ov104_0222E930 * param0) return v0; } -u16 ov104_0222FC00 (UnkStruct_ov104_0222E930 * param0) +u16 ov104_0222FC00(UnkStruct_ov104_0222E930 *param0) { return ov104_0222FC8C(param0, ov104_0222EA48(param0)); } -u16 * ov104_0222FC14 (UnkStruct_ov104_0222E930 * param0, u16 param1) +u16 *ov104_0222FC14(UnkStruct_ov104_0222E930 *param0, u16 param1) { if (param1 < 0x8000) { return NULL; } else if (param1 < ((0x8000 + 7) + 1)) { return ¶m0->unk_08[param1 - 0x8000]; - } else if (param1 < (((((0x8000 + 7) + 1)) + 7) + 1)) { - return ov104_0222E91C(param0->unk_00, param1 - (((0x8000 + 7) + 1))); - } else if (param1 < ((((((((0x8000 + 7) + 1)) + 7) + 1)) + 3) + 1)) { - return ¶m0->unk_78[param1 - ((((((0x8000 + 7) + 1)) + 7) + 1))]; + } else if (param1 < ((((0x8000 + 7) + 1) + 7) + 1)) { + return ov104_0222E91C(param0->unk_00, param1 - ((0x8000 + 7) + 1)); + } else if (param1 < ((((((0x8000 + 7) + 1) + 7) + 1) + 3) + 1)) { + return ¶m0->unk_78[param1 - ((((0x8000 + 7) + 1) + 7) + 1)]; } else if (param1 == 0xfd13) { return NULL; } else if (param1 == 0xeeee) { @@ -562,9 +558,9 @@ u16 * ov104_0222FC14 (UnkStruct_ov104_0222E930 * param0, u16 param1) return NULL; } -u16 ov104_0222FC8C (UnkStruct_ov104_0222E930 * param0, u16 param1) +u16 ov104_0222FC8C(UnkStruct_ov104_0222E930 *param0, u16 param1) { - u16 * v0 = ov104_0222FC14(param0, param1); + u16 *v0 = ov104_0222FC14(param0, param1); if (v0 == NULL) { return param1; @@ -573,18 +569,18 @@ u16 ov104_0222FC8C (UnkStruct_ov104_0222E930 * param0, u16 param1) return *v0; } -static BOOL ov104_0222FCA0 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FCA0(UnkStruct_ov104_0222E930 *param0) { return 0; } -static BOOL ov104_0222FCA4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FCA4(UnkStruct_ov104_0222E930 *param0) { ov104_0222E980(param0); return 0; } -static BOOL ov104_0222FCB0 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FCB0(UnkStruct_ov104_0222E930 *param0) { ov104_0222E980(param0); sub_0209B9B4(param0->unk_00->unk_00); @@ -592,9 +588,9 @@ static BOOL ov104_0222FCB0 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FCC4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FCC4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; u16 v1; v1 = ov104_0222FC00(param0); @@ -605,14 +601,14 @@ static BOOL ov104_0222FCC4 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_0222FCEC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FCEC(UnkStruct_ov104_0222E930 *param0) { return 1; } -static BOOL ov104_0222FCF0 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FCF0(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; u16 v1, v2; v1 = ov104_0222FC00(param0); @@ -624,11 +620,11 @@ static BOOL ov104_0222FCF0 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FD18 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FD18(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); u16 v1 = ov104_0222EA48(param0); - u16 * v2 = ov104_0222FC14(param0, v1); + u16 *v2 = ov104_0222FC14(param0, v1); *v2 = v0; param0->unk_78[0] = v1; @@ -637,9 +633,9 @@ static BOOL ov104_0222FD18 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_0222FD4C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FD4C(UnkStruct_ov104_0222E930 *param0) { - u16 * v0 = ov104_0222FC14(param0, param0->unk_78[0]); + u16 *v0 = ov104_0222FC14(param0, param0->unk_78[0]); (*v0)--; @@ -650,9 +646,9 @@ static BOOL ov104_0222FD4C (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FD6C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FD6C(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; + u16 *v0; v0 = ov104_0222FBE4(param0); *v0 = ov104_0222EA48(param0); @@ -660,10 +656,10 @@ static BOOL ov104_0222FD6C (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FD84 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FD84(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; - u16 * v1; + u16 *v0; + u16 *v1; v0 = ov104_0222FBE4(param0); v1 = ov104_0222FBE4(param0); @@ -673,9 +669,9 @@ static BOOL ov104_0222FD84 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FD9C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FD9C(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; + u16 *v0; u16 v1; v0 = ov104_0222FBE4(param0); @@ -684,9 +680,9 @@ static BOOL ov104_0222FD9C (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FDB8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FDB8(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; + u16 *v0; u16 v1; v0 = ov104_0222FBE4(param0); @@ -695,7 +691,7 @@ static BOOL ov104_0222FDB8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FDD4 (u16 param0, u16 param1) +static BOOL ov104_0222FDD4(u16 param0, u16 param1) { if (param0 < param1) { return 0; @@ -706,9 +702,9 @@ static BOOL ov104_0222FDD4 (u16 param0, u16 param1) return 2; } -static BOOL ov104_0222FDE8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FDE8(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; + u16 *v0; u16 v1, v2; v1 = ov104_0222FC00(param0); @@ -719,10 +715,10 @@ static BOOL ov104_0222FDE8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FE08 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FE08(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; - u16 * v1; + u16 *v0; + u16 *v1; u16 v2, v3; v0 = ov104_0222FBE4(param0); @@ -733,12 +729,12 @@ static BOOL ov104_0222FE08 (UnkStruct_ov104_0222E930 * param0) return 0; } -void ov104_0222FE2C (UnkStruct_ov104_0222E930 * param0, u8 * param1) +void ov104_0222FE2C(UnkStruct_ov104_0222E930 *param0, u8 *param1) { param0->unk_1C = param1; } -static BOOL ov104_0222FE30 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FE30(UnkStruct_ov104_0222E930 *param0) { s32 v0; @@ -748,7 +744,7 @@ static BOOL ov104_0222FE30 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FE48 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FE48(UnkStruct_ov104_0222E930 *param0) { u8 v0; s32 v1; @@ -763,7 +759,7 @@ static BOOL ov104_0222FE48 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FE80 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FE80(UnkStruct_ov104_0222E930 *param0) { s32 v0 = (s32)ov104_0222EA60(param0); @@ -771,13 +767,13 @@ static BOOL ov104_0222FE80 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FE98 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FE98(UnkStruct_ov104_0222E930 *param0) { ov104_0222EA3C(param0); return 0; } -static BOOL ov104_0222FEA4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FEA4(UnkStruct_ov104_0222E930 *param0) { u8 v0; s32 v1; @@ -792,7 +788,7 @@ static BOOL ov104_0222FEA4 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FEDC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FEDC(UnkStruct_ov104_0222E930 *param0) { UnkStruct_ov104_0222FEDC v0; u16 v1 = ov104_0222EA48(param0); @@ -807,7 +803,7 @@ static BOOL ov104_0222FEDC (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FF0C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FF0C(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); @@ -816,7 +812,7 @@ static BOOL ov104_0222FF0C (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_0222FF3C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FF3C(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); @@ -825,7 +821,7 @@ static BOOL ov104_0222FF3C (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_0222FF6C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FF6C(UnkStruct_ov104_0222E930 *param0) { if (Message_Printing(param0->unk_00->unk_50) == 0) { return 1; @@ -834,13 +830,13 @@ static BOOL ov104_0222FF6C (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FF84 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FF84(UnkStruct_ov104_0222E930 *param0) { ov104_02232088(param0->unk_00); return 0; } -static BOOL ov104_0222FF90 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FF90(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); u16 v1 = ov104_0222EA48(param0); @@ -854,13 +850,13 @@ static BOOL ov104_0222FF90 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FFD8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FFD8(UnkStruct_ov104_0222E930 *param0) { ov104_0222E974(param0, ov104_0222FFE8); return 1; } -static BOOL ov104_0222FFE8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FFE8(UnkStruct_ov104_0222E930 *param0) { if (ScreenWipe_Done() == 1) { return 1; @@ -869,9 +865,9 @@ static BOOL ov104_0222FFE8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0222FFFC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0222FFFC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; u8 v1 = (*((param0)->unk_1C++)); u8 v2 = (*((param0)->unk_1C++)); u8 v3 = (*((param0)->unk_1C++)); @@ -884,9 +880,9 @@ static BOOL ov104_0222FFFC (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02230058 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230058(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; u8 v1 = (*((param0)->unk_1C++)); u8 v2 = (*((param0)->unk_1C++)); u8 v3 = (*((param0)->unk_1C++)); @@ -899,10 +895,10 @@ static BOOL ov104_02230058 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_022300B8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022300B8(UnkStruct_ov104_0222E930 *param0) { u16 v0, v1, v2; - UnkStruct_ov104_022320B4 * v3 = param0->unk_00; + UnkStruct_ov104_022320B4 *v3 = param0->unk_00; v0 = ov104_0222EA48(param0); v1 = 0xff; @@ -912,10 +908,10 @@ static BOOL ov104_022300B8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_022300DC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022300DC(UnkStruct_ov104_0222E930 *param0) { u16 v0, v1, v2; - UnkStruct_ov104_022320B4 * v3 = param0->unk_00; + UnkStruct_ov104_022320B4 *v3 = param0->unk_00; v0 = ov104_0222EA48(param0); v1 = ov104_0222EA48(param0); @@ -925,9 +921,9 @@ static BOOL ov104_022300DC (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230108 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230108(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; ov104_022322B0(v0->unk_60); ov104_0222E974(param0, ov104_02230124); @@ -935,10 +931,10 @@ static BOOL ov104_02230108 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02230124 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230124(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - u16 * v1 = ov104_0222FC14(param0, param0->unk_78[0]); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + u16 *v1 = ov104_0222FC14(param0, param0->unk_78[0]); if (*v1 == 0xeeee) { return 0; @@ -948,9 +944,9 @@ static BOOL ov104_02230124 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_0223014C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0223014C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; u8 v1 = (*((param0)->unk_1C++)); u8 v2 = (*((param0)->unk_1C++)); u8 v3 = (*((param0)->unk_1C++)); @@ -963,9 +959,9 @@ static BOOL ov104_0223014C (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_022301A8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022301A8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; u8 v1 = (*((param0)->unk_1C++)); u8 v2 = (*((param0)->unk_1C++)); u8 v3 = (*((param0)->unk_1C++)); @@ -978,10 +974,10 @@ static BOOL ov104_022301A8 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02230208 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230208(UnkStruct_ov104_0222E930 *param0) { u16 v0, v1, v2; - UnkStruct_ov104_022320B4 * v3 = param0->unk_00; + UnkStruct_ov104_022320B4 *v3 = param0->unk_00; v0 = ov104_0222EA48(param0); v1 = ov104_0222EA48(param0); @@ -991,9 +987,9 @@ static BOOL ov104_02230208 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230234 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230234(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; ov104_02232624(v0->unk_60); ov104_0222E974(param0, ov104_02230124); @@ -1001,18 +997,18 @@ static BOOL ov104_02230234 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02230250 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230250(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; ov104_02232B5C(v0->unk_60); return 1; } -static BOOL ov104_02230260 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230260(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = ov104_0222E924(v0); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = ov104_0222E924(v0); u16 v2 = ov104_0222EA48(param0); u8 v3 = (*((param0)->unk_1C++)); @@ -1024,11 +1020,11 @@ static BOOL ov104_02230260 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_022302B4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022302B4(UnkStruct_ov104_0222E930 *param0) { u32 v0; - UnkStruct_ov104_022320B4 * v1 = param0->unk_00; - u16 * v2 = ov104_0222FC14(param0, param0->unk_78[0]); + UnkStruct_ov104_022320B4 *v1 = param0->unk_00; + u16 *v2 = ov104_0222FC14(param0, param0->unk_78[0]); v0 = sub_02002114(v1->unk_74, v1->unk_34); @@ -1045,11 +1041,11 @@ static BOOL ov104_022302B4 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_022302E8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022302E8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); - const u8 * v2; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); + const u8 *v2; UnkStruct_ov104_0223C688 v3; s32 v4; @@ -1068,8 +1064,8 @@ static BOOL ov104_022302E8 (UnkStruct_ov104_0222E930 * param0) v3.unk_02 = (*((param0)->unk_1C++)); if (v3.unk_00 == 0xeeee) { - const TrainerInfo * v5; - UnkStruct_ov104_02230BE4 * v6; + const TrainerInfo *v5; + UnkStruct_ov104_02230BE4 *v6; v6 = sub_0209B970(v0->unk_00); v5 = SaveData_GetTrainerInfo(v6->unk_08); @@ -1078,7 +1074,7 @@ static BOOL ov104_022302E8 (UnkStruct_ov104_0222E930 * param0) ov104_0223D0EC(v1, &v3); } else if (v3.unk_00 == 0xeeef) { if (CommSys_IsInitialized() == 1) { - const TrainerInfo * v7; + const TrainerInfo *v7; int v8, v9; v8 = CommSys_ConnectedCount(); @@ -1100,10 +1096,10 @@ static BOOL ov104_022302E8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_022303A8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022303A8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); u16 v2; v2 = ov104_0222FC00(param0); @@ -1112,11 +1108,11 @@ static BOOL ov104_022303A8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_022303C8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022303C8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); - const u8 * v2; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); + const u8 *v2; s32 v3; UnkStruct_ov104_0223D570 v4; int v5; @@ -1143,15 +1139,15 @@ static BOOL ov104_022303C8 (UnkStruct_ov104_0222E930 * param0) v4.unk_02 = 0; if (v4.unk_00 == 0xeeee) { - const TrainerInfo * v6; - UnkStruct_ov104_02230BE4 * v7; + const TrainerInfo *v6; + UnkStruct_ov104_02230BE4 *v7; v7 = sub_0209B970(v0->unk_00); v6 = SaveData_GetTrainerInfo(v7->unk_08); v4.unk_00 = ov104_0222E5F0(v6); v5 = (32 - 1); } else if (v4.unk_00 == 0xeeef) { - const TrainerInfo * v8; + const TrainerInfo *v8; int v9; v9 = (*((param0)->unk_1C++)); @@ -1168,11 +1164,11 @@ static BOOL ov104_022303C8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_022304A0 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022304A0(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); - UnkStruct_ov63_0222BEC0 * v2; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov63_0222BEC0 *v2; u16 v3; v3 = ov104_0222FC00(param0); @@ -1183,13 +1179,13 @@ static BOOL ov104_022304A0 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_022304C8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022304C8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); u16 v2 = ov104_0222FC00(param0); u8 v3 = (*((param0)->unk_1C++)); - UnkStruct_ov63_0222CE44 * v4 = NULL; + UnkStruct_ov63_0222CE44 *v4 = NULL; ov104_0223D258(v1, v2, NULL, &v4); GF_ASSERT(v4 != NULL); @@ -1198,19 +1194,19 @@ static BOOL ov104_022304C8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230508 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230508(UnkStruct_ov104_0222E930 *param0) { return 0; } -static BOOL ov104_0223050C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0223050C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); - u8 * v2; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); + u8 *v2; u16 v3 = ov104_0222FC00(param0); u32 v4 = (s32)ov104_0222EA60(param0); - UnkStruct_ov104_0223C634 * v5; + UnkStruct_ov104_0223C634 *v5; v5 = ov104_0223D5A8(v0->unk_00, v3); @@ -1225,9 +1221,9 @@ static BOOL ov104_0223050C (UnkStruct_ov104_0222E930 * param0) return 0; } -static void ov104_0223056C (u16 param0, UnkStruct_ov104_0223C634 * param1, const UnkStruct_ov104_02232B78_sub1 * param2, UnkStruct_ov63_0222D77C * param3, u8 * param4, int param5) +static void ov104_0223056C(u16 param0, UnkStruct_ov104_0223C634 *param1, const UnkStruct_ov104_02232B78_sub1 *param2, UnkStruct_ov63_0222D77C *param3, u8 *param4, int param5) { - UnkStruct_ov104_02232B78 * v0; + UnkStruct_ov104_02232B78 *v0; v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_ov104_02232B78)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_02232B78)); @@ -1242,15 +1238,15 @@ static void ov104_0223056C (u16 param0, UnkStruct_ov104_0223C634 * param1, const param1->unk_38 = SysTask_Start(ov104_02232B78, v0, (60000 + 100)); } -static BOOL ov104_022305B8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022305B8(UnkStruct_ov104_0222E930 *param0) { ov104_0222E974(param0, ov104_022305C8); return 1; } -static BOOL ov104_022305C8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022305C8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; if (v0->unk_59 == 0) { return 1; @@ -1259,14 +1255,14 @@ static BOOL ov104_022305C8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_022305DC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022305DC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); - const u8 * v2; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); + const u8 *v2; s32 v3; u16 v4; - NARC * v5; + NARC *v5; v3 = ov104_0222EA60(param0); v2 = param0->unk_1C; @@ -1290,10 +1286,10 @@ static BOOL ov104_022305DC (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230640 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230640(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); u16 v2; v2 = ov104_0222FC00(param0); @@ -1304,14 +1300,14 @@ static BOOL ov104_02230640 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0223066C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0223066C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); - const u8 * v2; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); + const u8 *v2; s32 v3; u16 v4, v5, v6, v7, v8, v9; - CellActorData * v10; + CellActorData *v10; v3 = ov104_0222EA60(param0); v2 = param0->unk_1C; @@ -1342,11 +1338,11 @@ static BOOL ov104_0223066C (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230708 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230708(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; u16 v1; - UnkStruct_ov104_0223C4CC * v2 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_0223C4CC *v2 = sub_0209B974(v0->unk_00); v1 = ov104_0222FC00(param0); ov104_0223D348(v2, v1); @@ -1354,13 +1350,13 @@ static BOOL ov104_02230708 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230728 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230728(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); u16 v2 = ov104_0222FC00(param0); u8 v3 = (*((param0)->unk_1C++)); - CellActorData * v4; + CellActorData *v4; v4 = ov104_0223D370(v1, v2); @@ -1370,12 +1366,12 @@ static BOOL ov104_02230728 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230760 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230760(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); u16 v2 = ov104_0222FC00(param0); - CellActorData * v3; + CellActorData *v3; v3 = ov104_0223D370(v1, v2); @@ -1385,11 +1381,11 @@ static BOOL ov104_02230760 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230790 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230790(UnkStruct_ov104_0222E930 *param0) { - CellActorData * v0; - UnkStruct_ov104_022320B4 * v1 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v2 = sub_0209B974(v1->unk_00); + CellActorData *v0; + UnkStruct_ov104_022320B4 *v1 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v2 = sub_0209B974(v1->unk_00); u16 v3 = ov104_0222FC00(param0); u16 v4 = ov104_0222FC00(param0); @@ -1405,12 +1401,12 @@ static BOOL ov104_02230790 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_022307D8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022307D8(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222FC00(param0); u16 v1 = ov104_0222FC00(param0); - CellActorData * v2; - UnkStruct_ov104_0223C4CC * v3 = sub_0209B974(param0->unk_00->unk_00); + CellActorData *v2; + UnkStruct_ov104_0223C4CC *v3 = sub_0209B974(param0->unk_00->unk_00); v2 = ov104_0223D370(v3, v0); @@ -1420,16 +1416,16 @@ static BOOL ov104_022307D8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230810 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230810(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222FC00(param0); - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(param0->unk_00->unk_00); + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(param0->unk_00->unk_00); ov104_0223D378(v1, v0, 0); return 0; } -static BOOL ov104_02230830 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230830(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222FC00(param0); @@ -1439,10 +1435,10 @@ static BOOL ov104_02230830 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02230850 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230850(UnkStruct_ov104_0222E930 *param0) { - CellActorData * v0; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(param0->unk_00->unk_00); + CellActorData *v0; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(param0->unk_00->unk_00); v0 = ov104_0223D370(v1, param0->unk_78[0]); @@ -1453,10 +1449,10 @@ static BOOL ov104_02230850 (UnkStruct_ov104_0222E930 * param0) return 0; } -static void ov104_0223088C (UnkStruct_ov104_0222E930 * param0, int param1, int param2) +static void ov104_0223088C(UnkStruct_ov104_0222E930 *param0, int param1, int param2) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - s16 * v1; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + s16 *v1; u16 v2; int v3; @@ -1473,7 +1469,7 @@ static void ov104_0223088C (UnkStruct_ov104_0222E930 * param0, int param1, int p Heap_FreeToHeap(v1); } -static BOOL ov104_022308E0 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022308E0(UnkStruct_ov104_0222E930 *param0) { u16 v0; @@ -1483,16 +1479,16 @@ static BOOL ov104_022308E0 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230900 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230900(UnkStruct_ov104_0222E930 *param0) { ov104_0223088C(param0, 1, 3); return 0; } -static BOOL ov104_02230910 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230910(UnkStruct_ov104_0222E930 *param0) { - void * v0; - UnkStruct_ov104_02230BE4 * v1; + void *v0; + UnkStruct_ov104_02230BE4 *v1; v1 = sub_0209B970(param0->unk_00->unk_00); v0 = sub_0208712C(11, 0, 0, 8, (void *)v1->unk_04); @@ -1502,27 +1498,27 @@ static BOOL ov104_02230910 (UnkStruct_ov104_0222E930 * param0) return 1; } -static void ov104_02230950 (void * param0) +static void ov104_02230950(void *param0) { sub_0208716C(param0); } -static BOOL ov104_02230958 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230958(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_ov104_02230BE4 * v1 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00); sub_0202F1F8(v1->unk_08, 11, &v0); return 0; } -static BOOL ov104_02230970 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230970(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; u16 v1 = ov104_0222EA48(param0); u16 v2 = ov104_0222FC00(param0); u16 v3 = ov104_0222FC00(param0); - u16 * v4 = ov104_0222FBE4(param0); + u16 *v4 = ov104_0222FBE4(param0); if (v3 > 9999) { v3 = 9999; @@ -1538,10 +1534,10 @@ static BOOL ov104_02230970 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_022309DC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022309DC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_02230BE4 * v1 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00); int v2; v2 = sub_0202F41C(v1->unk_08, v0->unk_B4, v0->unk_B6, 0, &v0->unk_B0, &v0->unk_B2); @@ -1559,7 +1555,7 @@ static BOOL ov104_022309DC (UnkStruct_ov104_0222E930 * param0) return 0; } -static int ov104_02230A2C (u16 param0, u16 param1) +static int ov104_02230A2C(u16 param0, u16 param1) { int v0; @@ -1678,11 +1674,11 @@ static int ov104_02230A2C (u16 param0, u16 param1) return v0; } -static BOOL ov104_02230B50 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230B50(UnkStruct_ov104_0222E930 *param0) { int v0; - BattleParams * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + BattleParams *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); v1 = Heap_AllocFromHeap(11, sizeof(BattleParams)); MI_CpuClear8(v1, sizeof(BattleParams)); @@ -1694,26 +1690,26 @@ static BOOL ov104_02230B50 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02230BB0 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230BB0(UnkStruct_ov104_0222E930 *param0) { sub_0202F22C(); return 0; } -static BOOL ov104_02230BBC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230BBC(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_ov104_02230BE4 * v1 = sub_0209B970(param0->unk_00->unk_00); - u16 * v2 = ov104_0222FBE4(param0); + UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00); + u16 *v2 = ov104_0222FBE4(param0); *v2 = sub_0202F330(v1->unk_08, 11, &v0, 0); return 0; } -static BOOL ov104_02230BE4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230BE4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0 = sub_0209B970(param0->unk_00->unk_00); - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00); + u16 *v1 = ov104_0222FBE4(param0); if (SaveData_Save(v0->unk_08) == 2) { (void)0; @@ -1724,11 +1720,11 @@ static BOOL ov104_02230BE4 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230C04 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230C04(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_02230BE4 * v1 = sub_0209B970(param0->unk_00->unk_00); - u16 * v2 = ov104_0222FBE4(param0); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00); + u16 *v2 = ov104_0222FBE4(param0); ResetLock(4); InitHeapCanary(v0->unk_34); @@ -1738,10 +1734,10 @@ static BOOL ov104_02230C04 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02230C3C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230C3C(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_ov104_02230BE4 * v1 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00); v0 = SaveData_SaveStateMain(v1->unk_08); @@ -1760,40 +1756,40 @@ static BOOL ov104_02230C3C (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230C74 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230C74(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00); SaveDataExtra_Init(v0->unk_08); return 0; } -static BOOL ov104_02230C88 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230C88(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0 = sub_0209B970(param0->unk_00->unk_00); - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00); + u16 *v1 = ov104_0222FBE4(param0); *v1 = SaveData_MiscSaveBlock_InitFlag(v0->unk_08); return 0; } -static BOOL ov104_02230CAC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230CAC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; v0->unk_7C = sub_0200E7FC(&v0->unk_64, (1024 - (18 + 12))); return 0; } -static BOOL ov104_02230CC4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230CC4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; DeleteWaitDial(v0->unk_7C); return 0; } -static BOOL ov104_02230CD4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230CD4(UnkStruct_ov104_0222E930 *param0) { u8 v0 = (*((param0)->unk_1C++)); u16 v1 = ov104_0222FC00(param0); @@ -1802,7 +1798,7 @@ static BOOL ov104_02230CD4 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230CF4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230CF4(UnkStruct_ov104_0222E930 *param0) { u8 v0 = (*((param0)->unk_1C++)); u16 v1 = ov104_0222FC00(param0); @@ -1811,7 +1807,7 @@ static BOOL ov104_02230CF4 (UnkStruct_ov104_0222E930 * param0) return 0; } -static u16 ov104_02230D28 (u32 param0) +static u16 ov104_02230D28(u32 param0) { if (param0 / 10 == 0) { return 1; @@ -1834,25 +1830,25 @@ static u16 ov104_02230D28 (u32 param0) return 1; } -static BOOL ov104_02230DC4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230DC4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00); u8 v1 = (*((param0)->unk_1C++)); StringTemplate_SetPlayerName(param0->unk_00->unk_44, v1, SaveData_GetTrainerInfo(v0->unk_08)); return 0; } -static BOOL ov104_02230DF0 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230DF0(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00); u8 v1 = (*((param0)->unk_1C++)); - StringTemplate_SetPlayerName(param0->unk_00->unk_44, v1, CommInfo_TrainerInfo((CommSys_CurNetId() ^ 1))); + StringTemplate_SetPlayerName(param0->unk_00->unk_44, v1, CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1)); return 0; } -BOOL ov104_02230E20 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02230E20(UnkStruct_ov104_0222E930 *param0) { u8 v0 = (*((param0)->unk_1C++)); u16 v1 = ov104_0222FC00(param0); @@ -1861,13 +1857,13 @@ BOOL ov104_02230E20 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02230E40 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02230E40(UnkStruct_ov104_0222E930 *param0) { u8 v0 = (*((param0)->unk_1C++)); u16 v1 = ov104_0222FC00(param0); u16 v2 = ov104_0222EA48(param0); u8 v3 = (*((param0)->unk_1C++)); - Strbuf* v4 = ov104_02230E90(v1, 11); + Strbuf *v4 = ov104_02230E90(v1, 11); StringTemplate_SetStrbuf(param0->unk_00->unk_44, v0, v4, v2, v3, GAME_LANGUAGE); Strbuf_Free(v4); @@ -1875,10 +1871,10 @@ BOOL ov104_02230E40 (UnkStruct_ov104_0222E930 * param0) return 0; } -static Strbuf* ov104_02230E90 (u16 param0, u32 param1) +static Strbuf *ov104_02230E90(u16 param0, u32 param1) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; v0 = MessageLoader_Init(1, 26, 412, param1); v1 = MessageLoader_GetNewStrbuf(v0, param0); @@ -1887,7 +1883,7 @@ static Strbuf* ov104_02230E90 (u16 param0, u32 param1) return v1; } -static BOOL ov104_02230EB8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230EB8(UnkStruct_ov104_0222E930 *param0) { u8 v0 = (*((param0)->unk_1C++)); u16 v1 = ov104_0222FC00(param0); @@ -1896,28 +1892,28 @@ static BOOL ov104_02230EB8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230ED8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230ED8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00); u8 v1 = (*((param0)->unk_1C++)); StringTemplate_SetRivalName(param0->unk_00->unk_44, v1, v0->unk_08); return 0; } -static BOOL ov104_02230EFC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230EFC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0 = sub_0209B970(param0->unk_00->unk_00); - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00); + u16 *v1 = ov104_0222FBE4(param0); *v1 = sub_0202D230(sub_0202D750(v0->unk_08), 0, 0); return 0; } -static BOOL ov104_02230F28 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230F28(UnkStruct_ov104_0222E930 *param0) { - TVBroadcast * v0; - UnkStruct_ov104_02230BE4 * v1 = sub_0209B970(param0->unk_00->unk_00); + TVBroadcast *v0; + UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00); u16 v2 = ov104_0222FC00(param0); v0 = SaveData_TVBroadcast(v1->unk_08); @@ -1929,9 +1925,9 @@ static BOOL ov104_02230F28 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230F6C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230F6C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_02230BE4 *v0 = sub_0209B970(param0->unk_00->unk_00); u16 v1 = ov104_0222FC00(param0); sub_0202CF70(sub_0202CD88(v0->unk_08), (1 + 68), v1); @@ -1940,7 +1936,7 @@ static BOOL ov104_02230F6C (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02230FA4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230FA4(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222FC00(param0); @@ -1952,7 +1948,7 @@ static BOOL ov104_02230FA4 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02230FCC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230FCC(UnkStruct_ov104_0222E930 *param0) { int v0; @@ -1965,13 +1961,13 @@ static BOOL ov104_02230FCC (UnkStruct_ov104_0222E930 * param0) return v0; } -static BOOL ov104_02230FEC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230FEC(UnkStruct_ov104_0222E930 *param0) { sub_020365F4(); return 0; } -static BOOL ov104_02230FF8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02230FF8(UnkStruct_ov104_0222E930 *param0) { FieldCommMan_EndBattle(); ov104_0222E974(param0, ov104_02231010); @@ -1979,7 +1975,7 @@ static BOOL ov104_02230FF8 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02231010 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231010(UnkStruct_ov104_0222E930 *param0) { if (CommMan_IsInitialized() != 1) { if (CommServerClient_IsInitialized() != 1) { @@ -1990,18 +1986,18 @@ static BOOL ov104_02231010 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_0223102C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0223102C(UnkStruct_ov104_0222E930 *param0) { - u16 * v0 = ov104_0222FBE4(param0); + u16 *v0 = ov104_0222FBE4(param0); u16 v1 = ov104_0222FC00(param0); *v0 = (LCRNG_Next() % v1); return 1; } -static BOOL ov104_02231050 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231050(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0; + UnkStruct_ov104_02230BE4 *v0; v0 = sub_0209B970(param0->unk_00->unk_00); @@ -2009,13 +2005,13 @@ static BOOL ov104_02231050 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231068 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231068(UnkStruct_ov104_0222E930 *param0) { ov104_0222E974(param0, ov104_02231078); return 1; } -static BOOL ov104_02231078 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231078(UnkStruct_ov104_0222E930 *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 1; @@ -2024,14 +2020,14 @@ static BOOL ov104_02231078 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231090 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231090(UnkStruct_ov104_0222E930 *param0) { param0->unk_78[0] = ov104_0222FC00(param0); ov104_0222E974(param0, ov104_022310B0); return 1; } -static BOOL ov104_022310B0 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022310B0(UnkStruct_ov104_0222E930 *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 1; @@ -2046,19 +2042,19 @@ static BOOL ov104_022310B0 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022310E0 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022310E0(UnkStruct_ov104_0222E930 *param0) { - u16 * v0 = ov104_0222FBE4(param0); + u16 *v0 = ov104_0222FBE4(param0); return 1; } -BOOL ov104_022310EC (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022310EC(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; + u16 *v0; u16 v1 = ov104_0222EA48(param0); u16 v2 = ov104_0222FC00(param0); - UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00); v0 = VarsFlags_GetVarAddress(SaveData_GetVarsFlags(v3->unk_08), v1); *v0 = v2; @@ -2066,12 +2062,12 @@ BOOL ov104_022310EC (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02231118 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02231118(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; + u16 *v0; u16 v1 = ov104_0222EA48(param0); - u16 * v2 = ov104_0222FBE4(param0); - UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); + u16 *v2 = ov104_0222FBE4(param0); + UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00); v0 = VarsFlags_GetVarAddress(SaveData_GetVarsFlags(v3->unk_08), v1); *v2 = *v0; @@ -2079,7 +2075,7 @@ BOOL ov104_02231118 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL(*const Unk_ov104_0223F65C[])(UnkStruct_ov104_02231148 *) = { +static BOOL (*const Unk_ov104_0223F65C[])(UnkStruct_ov104_02231148 *) = { ov104_02231148, ov104_022311BC, ov104_022312D8, @@ -2088,7 +2084,7 @@ static BOOL(*const Unk_ov104_0223F65C[])(UnkStruct_ov104_02231148 *) = { ov104_022319CC }; -static BOOL ov104_02231148 (UnkStruct_ov104_02231148 * param0) +static BOOL ov104_02231148(UnkStruct_ov104_02231148 *param0) { switch (param0->unk_04) { case 0: @@ -2115,7 +2111,7 @@ static BOOL ov104_02231148 (UnkStruct_ov104_02231148 * param0) return 1; } -static BOOL ov104_022311BC (UnkStruct_ov104_02231148 * param0) +static BOOL ov104_022311BC(UnkStruct_ov104_02231148 *param0) { switch (param0->unk_04) { case 0: @@ -2140,8 +2136,7 @@ static BOOL ov104_022311BC (UnkStruct_ov104_02231148 * param0) ov104_0223EBF0(param0->unk_2C, 1, 1, param0->unk_28, 15); param0->unk_04++; break; - case 3: - { + case 3: { BOOL v0 = ov104_0223EC34(param0->unk_2C); sub_0201A9A4(param0->unk_28); @@ -2149,8 +2144,7 @@ static BOOL ov104_022311BC (UnkStruct_ov104_02231148 * param0) if (v0) { param0->unk_04++; } - } - break; + } break; default: if (ScreenWipe_Done() == 1) { ov104_0223EBD0(param0->unk_2C); @@ -2171,7 +2165,7 @@ static BOOL ov104_022311BC (UnkStruct_ov104_02231148 * param0) return 1; } -static BOOL ov104_022312D8 (UnkStruct_ov104_02231148 * param0) +static BOOL ov104_022312D8(UnkStruct_ov104_02231148 *param0) { switch (param0->unk_04) { case 0: @@ -2196,8 +2190,7 @@ static BOOL ov104_022312D8 (UnkStruct_ov104_02231148 * param0) ov104_0223EBF0(param0->unk_2C, 1, 1, param0->unk_28, 15); param0->unk_04++; break; - case 3: - { + case 3: { BOOL v0 = ov104_0223EE44(param0->unk_2C); sub_0201A9A4(param0->unk_28); @@ -2205,8 +2198,7 @@ static BOOL ov104_022312D8 (UnkStruct_ov104_02231148 * param0) if (v0) { param0->unk_04++; } - } - break; + } break; default: if (ScreenWipe_Done() == 1) { @@ -2230,17 +2222,17 @@ static BOOL ov104_022312D8 (UnkStruct_ov104_02231148 * param0) return 1; } -u32 ov104_022313F4 (u16 param0, u16 param1) +u32 ov104_022313F4(u16 param0, u16 param1) { return (param1 << 16) | param0; } -static void ov104_022313FC (SysTask * param0, void * param1) +static void ov104_022313FC(SysTask *param0, void *param1) { int v0, v1; - UnkStruct_ov104_0223F1B4 * v2; - UnkStruct_ov104_02231148 * v3 = param1; - UnkStruct_ov104_022313FC * v4 = v3->unk_24; + UnkStruct_ov104_0223F1B4 *v2; + UnkStruct_ov104_02231148 *v3 = param1; + UnkStruct_ov104_022313FC *v4 = v3->unk_24; MtxFx22 v5; int v6, v7, v8, v9; @@ -2283,7 +2275,7 @@ static void ov104_022313FC (SysTask * param0, void * param1) v12 %= 256; } - G2x_SetBGyAffine_((u32) & v2[v1].unk_00, &v5, 0, 0, v12, v13); + G2x_SetBGyAffine_((u32)&v2[v1].unk_00, &v5, 0, 0, v12, v13); v12 = v8 + v4->unk_00[v0].unk_08; v13 = v9 + v4->unk_00[v0].unk_0A; @@ -2303,7 +2295,7 @@ static void ov104_022313FC (SysTask * param0, void * param1) v12 %= 256; } - G2x_SetBGyAffine_((u32) & v2[v1].unk_10, &v5, 0, 0, v12, v13); + G2x_SetBGyAffine_((u32)&v2[v1].unk_10, &v5, 0, 0, v12, v13); } } @@ -2348,7 +2340,7 @@ static void ov104_022313FC (SysTask * param0, void * param1) v16 %= 256; } - G2x_SetBGyAffine_((u32) & v2[v1].unk_00, &v5, 0, 0, v16, v17); + G2x_SetBGyAffine_((u32)&v2[v1].unk_00, &v5, 0, 0, v16, v17); v16 = v8 + v4->unk_00[v0].unk_08; v17 = v9 + v4->unk_00[v0].unk_0A; @@ -2368,12 +2360,12 @@ static void ov104_022313FC (SysTask * param0, void * param1) v16 %= 256; } - G2x_SetBGyAffine_((u32) & v2[v1].unk_10, &v5, 0, 0, v16, v17); + G2x_SetBGyAffine_((u32)&v2[v1].unk_10, &v5, 0, 0, v16, v17); } } } -static BOOL ov104_02231720 (UnkStruct_ov104_02231148 * param0) +static BOOL ov104_02231720(UnkStruct_ov104_02231148 *param0) { UnkStruct_ov104_0223F1B4 v0; @@ -2392,7 +2384,7 @@ static BOOL ov104_02231720 (UnkStruct_ov104_02231148 * param0) param0->unk_10 = 0; param0->unk_24 = Heap_AllocFromHeap(94, sizeof(UnkStruct_ov104_022313FC)); param0->unk_24->unk_604 = 1; - param0->unk_24->unk_600 = ov104_0223F1B4(((u32) & reg_G2_BG2PA), &v0, 94); + param0->unk_24->unk_600 = ov104_0223F1B4(((u32)®_G2_BG2PA), &v0, 94); { int v1; @@ -2433,7 +2425,7 @@ static BOOL ov104_02231720 (UnkStruct_ov104_02231148 * param0) return 1; } -static BOOL ov104_02231864 (UnkStruct_ov104_02231148 * param0) +static BOOL ov104_02231864(UnkStruct_ov104_02231148 *param0) { UnkStruct_ov104_0223F1B4 v0; @@ -2452,7 +2444,7 @@ static BOOL ov104_02231864 (UnkStruct_ov104_02231148 * param0) param0->unk_10 = 0; param0->unk_24 = Heap_AllocFromHeap(94, sizeof(UnkStruct_ov104_022313FC)); param0->unk_24->unk_604 = 2; - param0->unk_24->unk_600 = ov104_0223F1B4(((u32) & reg_G2_BG2PA), &v0, 94); + param0->unk_24->unk_600 = ov104_0223F1B4(((u32)®_G2_BG2PA), &v0, 94); { int v1; @@ -2503,7 +2495,7 @@ static BOOL ov104_02231864 (UnkStruct_ov104_02231148 * param0) return 1; } -static BOOL ov104_022319CC (UnkStruct_ov104_02231148 * param0) +static BOOL ov104_022319CC(UnkStruct_ov104_02231148 *param0) { switch (param0->unk_04) { case 0: @@ -2521,10 +2513,10 @@ static BOOL ov104_022319CC (UnkStruct_ov104_02231148 * param0) return 1; } -static BOOL ov104_02231A28 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231A28(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0; - UnkStruct_ov104_02231148 * v1; + UnkStruct_ov104_02230BE4 *v0; + UnkStruct_ov104_02231148 *v1; v0 = sub_0209B970(param0->unk_00->unk_00); param0->unk_78[0] = ov104_0222FC00(param0); @@ -2544,10 +2536,10 @@ static BOOL ov104_02231A28 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02231AA8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231AA8(UnkStruct_ov104_0222E930 *param0) { BOOL v0; - UnkStruct_ov104_02231148 * v1 = sub_0209B978(param0->unk_00->unk_00); + UnkStruct_ov104_02231148 *v1 = sub_0209B978(param0->unk_00->unk_00); v0 = Unk_ov104_0223F65C[v1->unk_08](v1); @@ -2561,11 +2553,11 @@ static BOOL ov104_02231AA8 (UnkStruct_ov104_0222E930 * param0) return !v0; } -static BOOL ov104_02231AF4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231AF4(UnkStruct_ov104_0222E930 *param0) { u16 v0; - UnkStruct_ov104_02230BE4 * v1; - u16 * v2 = ov104_0222FBE4(param0); + UnkStruct_ov104_02230BE4 *v1; + u16 *v2 = ov104_0222FBE4(param0); v1 = sub_0209B970(param0->unk_00->unk_00); @@ -2579,10 +2571,10 @@ static BOOL ov104_02231AF4 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231B20 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231B20(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); u16 v2, v3, v4; v2 = ov104_0222FC00(param0); @@ -2594,10 +2586,10 @@ static BOOL ov104_02231B20 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231B54 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231B54(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); u16 v2; v2 = ov104_0222FC00(param0); @@ -2606,12 +2598,12 @@ static BOOL ov104_02231B54 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231B74 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231B74(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); u16 v2, v3; - UnkStruct_02014014 * v4; + UnkStruct_02014014 *v4; v2 = ov104_0222FC00(param0); v3 = ov104_0222FC00(param0); @@ -2622,16 +2614,16 @@ static BOOL ov104_02231B74 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231BA8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231BA8(UnkStruct_ov104_0222E930 *param0) { ov104_0222E974(param0, ov104_02231BB8); return 1; } -static BOOL ov104_02231BB8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231BB8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); if (ov104_0223D6E4(v1->unk_10) == 1) { return 1; @@ -2640,12 +2632,12 @@ static BOOL ov104_02231BB8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231BD4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231BD4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); u16 v2, v3, v4, v5; - UnkStruct_ov104_0223319C * v6; + UnkStruct_ov104_0223319C *v6; v6 = &v1->unk_A4; @@ -2670,16 +2662,16 @@ static BOOL ov104_02231BD4 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231C44 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231C44(UnkStruct_ov104_0222E930 *param0) { ov104_0222E974(param0, ov104_02231C54); return 1; } -static BOOL ov104_02231C54 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231C54(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); if (v1->unk_A4.unk_00 == NULL) { return 1; @@ -2688,12 +2680,12 @@ static BOOL ov104_02231C54 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231C70 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231C70(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); u16 v2, v3, v4, v5; - UnkStruct_ov104_022331E8 * v6; + UnkStruct_ov104_022331E8 *v6; v6 = &v1->unk_B0; @@ -2715,16 +2707,16 @@ static BOOL ov104_02231C70 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231CE4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231CE4(UnkStruct_ov104_0222E930 *param0) { ov104_0222E974(param0, ov104_02231CF4); return 1; } -static BOOL ov104_02231CF4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231CF4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); if (v1->unk_B0.unk_00 == NULL) { return 1; @@ -2733,19 +2725,19 @@ static BOOL ov104_02231CF4 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231D10 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231D10(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); return 0; } -static BOOL ov104_02231D1C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231D1C(UnkStruct_ov104_0222E930 *param0) { - Party * v0; - Pokemon * v1; - UnkStruct_ov104_02230BE4 * v2; - UnkStruct_ov104_0223C4CC * v3 = ov104_0222E924(param0->unk_00); + Party *v0; + Pokemon *v1; + UnkStruct_ov104_02230BE4 *v2; + UnkStruct_ov104_0223C4CC *v3 = ov104_0222E924(param0->unk_00); u16 v4 = ov104_0222FC00(param0); u16 v5 = ov104_0222FC00(param0); u16 v6 = ov104_0222FC00(param0); @@ -2763,18 +2755,18 @@ static BOOL ov104_02231D1C (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231D8C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231D8C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223C4CC * v0 = ov104_0222E924(param0->unk_00); + UnkStruct_ov104_0223C4CC *v0 = ov104_0222E924(param0->unk_00); u16 v1 = ov104_0222EA48(param0); ov104_02232E80(v0, v1); return 0; } -static BOOL ov104_02231DAC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231DAC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223C4CC * v0 = ov104_0222E924(param0->unk_00); + UnkStruct_ov104_0223C4CC *v0 = ov104_0222E924(param0->unk_00); u16 v1 = ov104_0222EA48(param0); s16 v2, v3; @@ -2786,10 +2778,10 @@ static BOOL ov104_02231DAC (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02231E14 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231E14(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = sub_0209B974(v0->unk_00); + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00); if (param0->unk_78[0] == 1) { return 1; @@ -2798,9 +2790,9 @@ static BOOL ov104_02231E14 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231E30 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231E30(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0; + UnkStruct_ov104_02230BE4 *v0; u16 v1 = ov104_0222EA48(param0); v0 = sub_0209B970(param0->unk_00->unk_00); @@ -2809,9 +2801,9 @@ static BOOL ov104_02231E30 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231E54 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231E54(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0; + UnkStruct_ov104_02230BE4 *v0; u16 v1 = ov104_0222EA48(param0); u16 v2 = ov104_0222FC00(param0); @@ -2821,9 +2813,9 @@ static BOOL ov104_02231E54 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231E80 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231E80(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0; + UnkStruct_ov104_02230BE4 *v0; u16 v1 = ov104_0222EA48(param0); v0 = sub_0209B970(param0->unk_00->unk_00); @@ -2832,10 +2824,10 @@ static BOOL ov104_02231E80 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231EA4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231EA4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0; - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_ov104_02230BE4 *v0; + u16 *v1 = ov104_0222FBE4(param0); v0 = sub_0209B970(param0->unk_00->unk_00); *v1 = sub_0205E6D8(v0->unk_08); @@ -2843,18 +2835,18 @@ static BOOL ov104_02231EA4 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231EC4 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231EC4(UnkStruct_ov104_0222E930 *param0) { - u16 * v0 = ov104_0222FBE4(param0); + u16 *v0 = ov104_0222FBE4(param0); *v0 = sub_0202FAC0(); return 0; } -static BOOL ov104_02231ED8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231ED8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0202B370 * v0; - UnkStruct_ov104_02230BE4 * v1; + UnkStruct_0202B370 *v0; + UnkStruct_ov104_02230BE4 *v1; v1 = sub_0209B970(param0->unk_00->unk_00); v0 = sub_0202B370(v1->unk_08); @@ -2863,12 +2855,12 @@ static BOOL ov104_02231ED8 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231EFC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231EFC(UnkStruct_ov104_0222E930 *param0) { u16 v0; - TVBroadcast * v1; - TrainerInfo * v2; - UnkStruct_ov104_02230BE4 * v3; + TVBroadcast *v1; + TrainerInfo *v2; + UnkStruct_ov104_02230BE4 *v3; v3 = sub_0209B970(param0->unk_00->unk_00); v1 = SaveData_TVBroadcast(v3->unk_08); @@ -2879,7 +2871,7 @@ static BOOL ov104_02231EFC (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231F34 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231F34(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222FC00(param0); @@ -2887,18 +2879,17 @@ static BOOL ov104_02231F34 (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02231F44 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231F44(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; u8 v1 = *(param0->unk_1C++); ov104_0223327C(v0->unk_60, v1); return 1; } - -static BOOL ov104_02231F5C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02231F5C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; u8 v1 = *(param0->unk_1C++); ov104_02233298(v0->unk_60, v1); return 1; diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index 977d5c112a..e0b8701a69 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -1,83 +1,80 @@ +#include "overlay104/ov104_02231F74.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02013A04_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "pokemon.h" -#include "overlay063/struct_ov63_0222BEC0_decl.h" -#include "overlay104/struct_ov104_0222E930_decl.h" -#include "overlay104/struct_ov104_022320B4_decl.h" - #include "struct_defs/archived_sprite.h" +#include "struct_defs/sentence.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02013A04_t.h" -#include "struct_defs/sentence.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" + +#include "overlay063/ov63_0222BE18.h" +#include "overlay063/ov63_0222CCE4.h" +#include "overlay063/ov63_0222D77C.h" +#include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CCB8.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "overlay104/ov104_0222E63C.h" +#include "overlay104/ov104_0222E930.h" +#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_0222E930_t.h" #include "overlay104/struct_ov104_0222FEDC.h" #include "overlay104/struct_ov104_02230BE4.h" +#include "overlay104/struct_ov104_022320B4_decl.h" #include "overlay104/struct_ov104_022320B4_t.h" #include "overlay104/struct_ov104_02232B78.h" #include "overlay104/struct_ov104_0223319C.h" #include "overlay104/struct_ov104_022331E8.h" #include "overlay104/struct_ov104_0223C4CC.h" -#include "struct_defs/sprite_template.h" +#include "core_sys.h" +#include "game_options.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "narc.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_020131EC.h" #include "unk_02014A84.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201F834.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "game_options.h" -#include "pokemon.h" -#include "pokemon_icon.h" #include "unk_0207E0B8.h" #include "unk_0209B6F8.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay063/ov63_0222CCE4.h" -#include "overlay063/ov63_0222D77C.h" -#include "overlay104/ov104_0222E63C.h" -#include "overlay104/ov104_0222E930.h" -#include "overlay104/ov104_02231F74.h" typedef struct UnkStruct_ov104_02232B5C_t { - UnkStruct_ov104_022320B4 * unk_00; - SysTask * unk_04; + UnkStruct_ov104_022320B4 *unk_00; + SysTask *unk_04; Window unk_08; - Window * unk_18; - Strbuf* unk_1C[28]; - MessageLoader * unk_8C; - StringTemplate * unk_90; + Window *unk_18; + Strbuf *unk_1C[28]; + MessageLoader *unk_8C; + StringTemplate *unk_90; u8 unk_94; u8 unk_95; u8 unk_96; @@ -90,13 +87,13 @@ typedef struct UnkStruct_ov104_02232B5C_t { u8 unk_99; u8 unk_9A; u8 unk_9B; - u16 * unk_9C; - u16 * unk_A0; + u16 *unk_9C; + u16 *unk_A0; UnkStruct_02081CF4 unk_A4; - UIControlData * unk_B0; + UIControlData *unk_B0; ResourceMetadata unk_B4[28]; UnkStruct_ov84_02240FA8 unk_194; - BmpList * unk_1B4; + BmpList *unk_1B4; u16 unk_1B8; u16 unk_1BA; ResourceMetadata unk_1BC[28]; @@ -109,41 +106,41 @@ typedef struct { u16 unk_02; } UnkStruct_ov104_022419A0; -static void ov104_02231FC4(UnkStruct_ov104_022320B4 * param0); -static void ov104_02232034(UnkStruct_ov104_022320B4 * param0, const MessageLoader * param1, u32 param2); -static void ov104_02232050(UnkStruct_ov104_022320B4 * param0, int param1, int param2, int param3, int param4); -static void ov104_0223214C(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_02232B5C * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringTemplate * param7, MessageLoader * param8); -UnkStruct_ov104_02232B5C * ov104_02232258(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, MessageLoader * param7); -void ov104_022322A8(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); -void ov104_022322B0(UnkStruct_ov104_02232B5C * param0); -static void ov104_02232390(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); -static u32 ov104_02232414(UnkStruct_ov104_02232B5C * param0); -static void ov104_02232454(UnkStruct_ov104_02232B5C * param0); -static void ov104_022324C8(SysTask * param0, void * param1); -static void ov104_02232570(UnkStruct_ov104_02232B5C * param0); -static void ov104_022325D8(UnkStruct_ov104_02232B5C * param0); -static void ov104_02232AC4(UnkStruct_ov104_02232B5C * param0, u16 param1, u32 param2); -void ov104_022320B4(UnkStruct_ov104_022320B4 * param0, u8 param1, u16 param2, u16 param3, u16 param4, s16 param5, u8 param6); +static void ov104_02231FC4(UnkStruct_ov104_022320B4 *param0); +static void ov104_02232034(UnkStruct_ov104_022320B4 *param0, const MessageLoader *param1, u32 param2); +static void ov104_02232050(UnkStruct_ov104_022320B4 *param0, int param1, int param2, int param3, int param4); +static void ov104_0223214C(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_02232B5C *param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 *param6, StringTemplate *param7, MessageLoader *param8); +UnkStruct_ov104_02232B5C *ov104_02232258(UnkStruct_ov104_022320B4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, MessageLoader *param7); +void ov104_022322A8(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 param2, u32 param3); +void ov104_022322B0(UnkStruct_ov104_02232B5C *param0); +static void ov104_02232390(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 param2, u32 param3); +static u32 ov104_02232414(UnkStruct_ov104_02232B5C *param0); +static void ov104_02232454(UnkStruct_ov104_02232B5C *param0); +static void ov104_022324C8(SysTask *param0, void *param1); +static void ov104_02232570(UnkStruct_ov104_02232B5C *param0); +static void ov104_022325D8(UnkStruct_ov104_02232B5C *param0); +static void ov104_02232AC4(UnkStruct_ov104_02232B5C *param0, u16 param1, u32 param2); +void ov104_022320B4(UnkStruct_ov104_022320B4 *param0, u8 param1, u16 param2, u16 param3, u16 param4, s16 param5, u8 param6); static void ov104_022320FC(Strbuf *param0, u16 param1, u16 param2, u16 param3, u16 param4); -static BOOL ov104_02233184(UnkStruct_ov104_0222E930 * param0); -UnkStruct_ov104_02232B5C * ov104_022325FC(UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, MessageLoader * param7); -void ov104_0223261C(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); -void ov104_02232624(UnkStruct_ov104_02232B5C * param0); -static void ov104_02232750(UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3); -static u32 ov104_022327F0(UnkStruct_ov104_02232B5C * param0); -static void ov104_02232830(UnkStruct_ov104_02232B5C * param0); -static void ov104_0223293C(BmpList * param0, u32 param1, u8 param2); -static void ov104_02232960(BmpList * param0, u32 param1, u8 param2); -static void ov104_0223296C(SysTask * param0, void * param1); -static void ov104_02232A58(UnkStruct_ov104_02232B5C * param0, u8 param1); -static void ov104_02232B2C(UnkStruct_ov104_02232B5C * param0); -void ov104_02232B5C(UnkStruct_ov104_02232B5C * param0); -void ov104_022330FC(UnkStruct_ov104_0222E930 * param0, u16 * param1); -void ov104_0223310C(UnkStruct_ov104_0222E930 * param0, u16 * param1, u32 param2); -extern void ov104_0223327C(UnkStruct_ov104_02232B5C * param0, int param1); -extern void ov104_02233298(UnkStruct_ov104_02232B5C * param0, int param1); - -void ov104_02231F74 (UnkStruct_ov104_022320B4 * param0, const MessageLoader * param1, u16 param2, u8 param3, UnkStruct_ov104_0222FEDC * param4) +static BOOL ov104_02233184(UnkStruct_ov104_0222E930 *param0); +UnkStruct_ov104_02232B5C *ov104_022325FC(UnkStruct_ov104_022320B4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, MessageLoader *param7); +void ov104_0223261C(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 param2, u32 param3); +void ov104_02232624(UnkStruct_ov104_02232B5C *param0); +static void ov104_02232750(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 param2, u32 param3); +static u32 ov104_022327F0(UnkStruct_ov104_02232B5C *param0); +static void ov104_02232830(UnkStruct_ov104_02232B5C *param0); +static void ov104_0223293C(BmpList *param0, u32 param1, u8 param2); +static void ov104_02232960(BmpList *param0, u32 param1, u8 param2); +static void ov104_0223296C(SysTask *param0, void *param1); +static void ov104_02232A58(UnkStruct_ov104_02232B5C *param0, u8 param1); +static void ov104_02232B2C(UnkStruct_ov104_02232B5C *param0); +void ov104_02232B5C(UnkStruct_ov104_02232B5C *param0); +void ov104_022330FC(UnkStruct_ov104_0222E930 *param0, u16 *param1); +void ov104_0223310C(UnkStruct_ov104_0222E930 *param0, u16 *param1, u32 param2); +extern void ov104_0223327C(UnkStruct_ov104_02232B5C *param0, int param1); +extern void ov104_02233298(UnkStruct_ov104_02232B5C *param0, int param1); + +void ov104_02231F74(UnkStruct_ov104_022320B4 *param0, const MessageLoader *param1, u16 param2, u8 param3, UnkStruct_ov104_0222FEDC *param4) { u8 v0; u8 v1; @@ -153,8 +150,8 @@ void ov104_02231F74 (UnkStruct_ov104_022320B4 * param0, const MessageLoader * pa ov104_02232034(param0, param1, param2); if (param4 == NULL) { - UnkStruct_ov104_0223C4CC * v3 = ov104_0222E924(param0); - UnkStruct_ov104_02230BE4 * v4; + UnkStruct_ov104_0223C4CC *v3 = ov104_0222E924(param0); + UnkStruct_ov104_02230BE4 *v4; v4 = sub_0209B970(v3->unk_08); @@ -170,9 +167,9 @@ void ov104_02231F74 (UnkStruct_ov104_022320B4 * param0, const MessageLoader * pa ov104_02232050(param0, v2, v0, param3, v1); } -static void ov104_02231FC4 (UnkStruct_ov104_022320B4 * param0) +static void ov104_02231FC4(UnkStruct_ov104_022320B4 *param0) { - UnkStruct_ov104_0223C4CC * v0 = ov104_0222E924(param0); + UnkStruct_ov104_0223C4CC *v0 = ov104_0222E924(param0); if (param0->unk_5A == 0) { BGL_AddWindow( @@ -186,13 +183,13 @@ static void ov104_02231FC4 (UnkStruct_ov104_022320B4 * param0) } } -static void ov104_02232034 (UnkStruct_ov104_022320B4 * param0, const MessageLoader * param1, u32 param2) +static void ov104_02232034(UnkStruct_ov104_022320B4 *param0, const MessageLoader *param1, u32 param2) { MessageLoader_GetStrbuf(param1, param2, param0->unk_4C); StringTemplate_Format(param0->unk_44, param0->unk_48, param0->unk_4C); } -static void ov104_02232050 (UnkStruct_ov104_022320B4 * param0, int param1, int param2, int param3, int param4) +static void ov104_02232050(UnkStruct_ov104_022320B4 *param0, int param1, int param2, int param3, int param4) { sub_02002AC8(param3); sub_02002AE4(param4); @@ -200,7 +197,7 @@ static void ov104_02232050 (UnkStruct_ov104_022320B4 * param0, int param1, int p param0->unk_50 = PrintStringSimple(¶m0->unk_64, param1, param0->unk_48, 0, 0, param2, NULL); } -void ov104_02232088 (UnkStruct_ov104_022320B4 * param0) +void ov104_02232088(UnkStruct_ov104_022320B4 *param0) { GF_ASSERT(param0->unk_5A == 1); @@ -210,7 +207,7 @@ void ov104_02232088 (UnkStruct_ov104_022320B4 * param0) param0->unk_5A = 0; } -void ov104_022320B4 (UnkStruct_ov104_022320B4 * param0, u8 param1, u16 param2, u16 param3, u16 param4, s16 param5, u8 param6) +void ov104_022320B4(UnkStruct_ov104_022320B4 *param0, u8 param1, u16 param2, u16 param3, u16 param4, s16 param5, u8 param6) { Sentence v0; @@ -225,10 +222,10 @@ void ov104_022320B4 (UnkStruct_ov104_022320B4 * param0, u8 param1, u16 param2, u } } -static void ov104_022320FC (Strbuf *param0, u16 param1, u16 param2, u16 param3, u16 param4) +static void ov104_022320FC(Strbuf *param0, u16 param1, u16 param2, u16 param3, u16 param4) { Sentence v0; - Strbuf* v1; + Strbuf *v1; sub_02014A84(&v0); sub_02014CE0(&v0, param1, param2); @@ -240,7 +237,7 @@ static void ov104_022320FC (Strbuf *param0, u16 param1, u16 param2, u16 param3, Strbuf_Free(v1); } -static void ov104_0223214C (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_02232B5C * param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 * param6, StringTemplate * param7, MessageLoader * param8) +static void ov104_0223214C(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_02232B5C *param1, u8 param2, u8 param3, u8 param4, u8 param5, u16 *param6, StringTemplate *param7, MessageLoader *param8) { int v0; @@ -288,9 +285,9 @@ static void ov104_0223214C (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0 return; } -UnkStruct_ov104_02232B5C * ov104_02232258 (UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, MessageLoader * param7) +UnkStruct_ov104_02232B5C *ov104_02232258(UnkStruct_ov104_022320B4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, MessageLoader *param7) { - UnkStruct_ov104_02232B5C * v0; + UnkStruct_ov104_02232B5C *v0; int v1; v0 = Heap_AllocFromHeap(param0->unk_34, sizeof(UnkStruct_ov104_02232B5C)); @@ -306,28 +303,31 @@ UnkStruct_ov104_02232B5C * ov104_02232258 (UnkStruct_ov104_022320B4 * param0, u8 return v0; } -void ov104_022322A8 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3) +void ov104_022322A8(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 param2, u32 param3) { ov104_02232390(param0, param1, param2, param3); return; } -void ov104_022322B0 (UnkStruct_ov104_02232B5C * param0) +void ov104_022322B0(UnkStruct_ov104_02232B5C *param0) { u32 v0; - UnkStruct_ov104_0223C4CC * v1 = ov104_0222E924(param0->unk_00); - + UnkStruct_ov104_0223C4CC *v1 = ov104_0222E924(param0->unk_00); + v0 = ov104_02232414(param0); - if (v0 % 8 == 0) + if (v0 % 8 == 0) { v0 /= 8; - else + } else { v0 = v0 / 8 + 1; - - if (param0->unk_97_6) + } + + if (param0->unk_97_6) { param0->unk_98 -= v0; - if (param0->unk_97_7) + } + if (param0->unk_97_7) { param0->unk_99 -= param0->unk_9B * 2; - + } + BGL_AddWindow(v1->unk_00, ¶m0->unk_08, 1, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 14, 1); Window_Show(¶m0->unk_08, 1, 985, 12); ov104_02232454(param0); @@ -336,13 +336,13 @@ void ov104_022322B0 (UnkStruct_ov104_02232B5C * param0) param0->unk_04 = SysTask_Start(ov104_022324C8, param0, 0); } -static void ov104_02232390 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3) +static void ov104_02232390(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 param2, u32 param3) { int v0; - void * v1; + void *v1; { - Strbuf* v2 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); + Strbuf *v2 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); @@ -357,7 +357,7 @@ static void ov104_02232390 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 p return; } -static u32 ov104_02232414 (UnkStruct_ov104_02232B5C * param0) +static u32 ov104_02232414(UnkStruct_ov104_02232B5C *param0) { int v0; u32 v1, v2; @@ -380,7 +380,7 @@ static u32 ov104_02232414 (UnkStruct_ov104_02232B5C * param0) return v2 + 12; } -static void ov104_02232454 (UnkStruct_ov104_02232B5C * param0) +static void ov104_02232454(UnkStruct_ov104_02232B5C *param0) { param0->unk_A4.unk_00 = param0->unk_B4; param0->unk_A4.unk_04 = ¶m0->unk_08; @@ -399,10 +399,10 @@ static void ov104_02232454 (UnkStruct_ov104_02232B5C * param0) return; } -static void ov104_022324C8 (SysTask * param0, void * param1) +static void ov104_022324C8(SysTask *param0, void *param1) { u32 v0; - UnkStruct_ov104_02232B5C * v1 = param1; + UnkStruct_ov104_02232B5C *v1 = param1; if (v1->unk_94 != 0) { v1->unk_94--; @@ -441,7 +441,7 @@ static void ov104_022324C8 (SysTask * param0, void * param1) return; } -static void ov104_02232570 (UnkStruct_ov104_02232B5C * param0) +static void ov104_02232570(UnkStruct_ov104_02232B5C *param0) { int v0; @@ -464,7 +464,7 @@ static void ov104_02232570 (UnkStruct_ov104_02232B5C * param0) return; } -static void ov104_022325D8 (UnkStruct_ov104_02232B5C * param0) +static void ov104_022325D8(UnkStruct_ov104_02232B5C *param0) { u8 v0; @@ -477,38 +477,42 @@ static void ov104_022325D8 (UnkStruct_ov104_02232B5C * param0) return; } -UnkStruct_ov104_02232B5C * ov104_022325FC (UnkStruct_ov104_022320B4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, StringTemplate * param6, MessageLoader * param7) +UnkStruct_ov104_02232B5C *ov104_022325FC(UnkStruct_ov104_022320B4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, StringTemplate *param6, MessageLoader *param7) { return ov104_02232258(param0, param1, param2, param3, param4, param5, param6, param7); } -void ov104_0223261C (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3) +void ov104_0223261C(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 param2, u32 param3) { ov104_02232750(param0, param1, param2, param3); return; } -void ov104_02232624 (UnkStruct_ov104_02232B5C * param0) +void ov104_02232624(UnkStruct_ov104_02232B5C *param0) { u32 v0; - UnkStruct_ov104_0223C4CC * v1 = ov104_0222E924(param0->unk_00); - + UnkStruct_ov104_0223C4CC *v1 = ov104_0222E924(param0->unk_00); + v0 = ov104_022327F0(param0); - if (v0 % 8 == 0) + if (v0 % 8 == 0) { v0 /= 8; - else + } else { v0 = v0 / 8 + 1; - - if (param0->unk_97_6) + } + + if (param0->unk_97_6) { param0->unk_98 -= v0; + } if (param0->unk_9B > 8) { - if (param0->unk_97_7) + if (param0->unk_97_7) { param0->unk_99 -= 8 * 2; + } BGL_AddWindow(v1->unk_00, ¶m0->unk_08, 1, param0->unk_98, param0->unk_99, v0, 8 * 2, 14, 1); } else { - if (param0->unk_97_7) + if (param0->unk_97_7) { param0->unk_99 -= param0->unk_9B * 2; + } BGL_AddWindow(v1->unk_00, ¶m0->unk_08, 1, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 14, 1); } Window_Show(¶m0->unk_08, 1, 985, 12); @@ -518,13 +522,13 @@ void ov104_02232624 (UnkStruct_ov104_02232B5C * param0) param0->unk_04 = SysTask_Start(ov104_0223296C, param0, 0); } -static void ov104_02232750 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 param2, u32 param3) +static void ov104_02232750(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 param2, u32 param3) { int v0; - void * v1; + void *v1; { - Strbuf* v2 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); + Strbuf *v2 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); @@ -545,7 +549,7 @@ static void ov104_02232750 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 p return; } -static u32 ov104_022327F0 (UnkStruct_ov104_02232B5C * param0) +static u32 ov104_022327F0(UnkStruct_ov104_02232B5C *param0) { int v0; u32 v1, v2; @@ -568,7 +572,7 @@ static u32 ov104_022327F0 (UnkStruct_ov104_02232B5C * param0) return v2 + 12; } -static void ov104_02232830 (UnkStruct_ov104_02232B5C * param0) +static void ov104_02232830(UnkStruct_ov104_02232B5C *param0) { param0->unk_194.unk_00 = param0->unk_1BC; param0->unk_194.unk_04 = ov104_02232960; @@ -599,7 +603,7 @@ static void ov104_02232830 (UnkStruct_ov104_02232B5C * param0) return; } -static void ov104_0223293C (BmpList * param0, u32 param1, u8 param2) +static void ov104_0223293C(BmpList *param0, u32 param1, u8 param2) { if (param1 == 0xfffffffd) { sub_0200147C(param0, 3, 15, 4); @@ -608,21 +612,21 @@ static void ov104_0223293C (BmpList * param0, u32 param1, u8 param2) } } -static void ov104_02232960 (BmpList * param0, u32 param1, u8 param2) +static void ov104_02232960(BmpList *param0, u32 param1, u8 param2) { u32 v0, v1; u16 v2 = 0; u16 v3 = 0; - UnkStruct_ov104_02232B5C * v4 = (UnkStruct_ov104_02232B5C *)sub_02001504(param0, 19); + UnkStruct_ov104_02232B5C *v4 = (UnkStruct_ov104_02232B5C *)sub_02001504(param0, 19); return; } -static void ov104_0223296C (SysTask * param0, void * param1) +static void ov104_0223296C(SysTask *param0, void *param1) { u16 v0; u32 v1; - UnkStruct_ov104_02232B5C * v2; + UnkStruct_ov104_02232B5C *v2; v2 = (UnkStruct_ov104_02232B5C *)param1; @@ -675,7 +679,7 @@ static void ov104_0223296C (SysTask * param0, void * param1) return; } -static void ov104_02232A58 (UnkStruct_ov104_02232B5C * param0, u8 param1) +static void ov104_02232A58(UnkStruct_ov104_02232B5C *param0, u8 param1) { int v0; @@ -700,10 +704,10 @@ static void ov104_02232A58 (UnkStruct_ov104_02232B5C * param0, u8 param1) return; } -static void ov104_02232AC4 (UnkStruct_ov104_02232B5C * param0, u16 param1, u32 param2) +static void ov104_02232AC4(UnkStruct_ov104_02232B5C *param0, u16 param1, u32 param2) { - Strbuf* v0 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); - Strbuf* v1 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); + Strbuf *v0 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); + Strbuf *v1 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); BGL_FillWindow(param0->unk_18, 15); @@ -718,7 +722,7 @@ static void ov104_02232AC4 (UnkStruct_ov104_02232B5C * param0, u16 param1, u32 p return; } -static void ov104_02232B2C (UnkStruct_ov104_02232B5C * param0) +static void ov104_02232B2C(UnkStruct_ov104_02232B5C *param0) { sub_020014D0(param0->unk_1B4, ¶m0->unk_1BA); @@ -729,9 +733,9 @@ static void ov104_02232B2C (UnkStruct_ov104_02232B5C * param0) return; } -void ov104_02232B5C (UnkStruct_ov104_02232B5C * param0) +void ov104_02232B5C(UnkStruct_ov104_02232B5C *param0) { - UnkStruct_ov104_02232B5C * v0; + UnkStruct_ov104_02232B5C *v0; if (param0 == NULL) { return; @@ -756,43 +760,43 @@ __attribute__((aligned(4))) static const u8 Unk_ov104_0223F9A4[] = { }; static UnkStruct_ov104_022419A0 Unk_ov104_022419A0[] = { - {0x0, 0x0}, - {0x0, 0x1}, - {0x0, 0x2}, - {0x0, 0x3}, - {0x2, 0x0}, - {0x2, 0x1}, - {0x2, 0x2}, - {0x2, 0x3}, - {0x6, 0x0}, - {0x6, 0x1}, - {0x6, 0x2}, - {0x6, 0x3}, - {0x7, 0x0}, - {0x7, 0x1}, - {0x7, 0x2}, - {0x7, 0x3}, - {0xA, 0x0}, - {0xA, 0x1}, - {0xA, 0x2}, - {0xA, 0x3}, - {0xB, 0x0}, - {0xB, 0x1}, - {0xB, 0x2}, - {0xB, 0x3}, - {0x8, 0x0}, - {0x8, 0x1}, - {0x8, 0x2}, - {0x8, 0x3}, - {0x9, 0x0}, - {0x9, 0x1}, - {0x9, 0x2}, - {0x9, 0x3} + { 0x0, 0x0 }, + { 0x0, 0x1 }, + { 0x0, 0x2 }, + { 0x0, 0x3 }, + { 0x2, 0x0 }, + { 0x2, 0x1 }, + { 0x2, 0x2 }, + { 0x2, 0x3 }, + { 0x6, 0x0 }, + { 0x6, 0x1 }, + { 0x6, 0x2 }, + { 0x6, 0x3 }, + { 0x7, 0x0 }, + { 0x7, 0x1 }, + { 0x7, 0x2 }, + { 0x7, 0x3 }, + { 0xA, 0x0 }, + { 0xA, 0x1 }, + { 0xA, 0x2 }, + { 0xA, 0x3 }, + { 0xB, 0x0 }, + { 0xB, 0x1 }, + { 0xB, 0x2 }, + { 0xB, 0x3 }, + { 0x8, 0x0 }, + { 0x8, 0x1 }, + { 0x8, 0x2 }, + { 0x8, 0x3 }, + { 0x9, 0x0 }, + { 0x9, 0x1 }, + { 0x9, 0x2 }, + { 0x9, 0x3 } }; -void ov104_02232B78 (SysTask * param0, void * param1) +void ov104_02232B78(SysTask *param0, void *param1) { - UnkStruct_ov104_02232B78 * v0 = param1; + UnkStruct_ov104_02232B78 *v0 = param1; UnkStruct_ov63_0222CCB8 v1; u16 v2, v3; @@ -857,7 +861,7 @@ void ov104_02232B78 (SysTask * param0, void * param1) } } -void ov104_02232C80 (UnkStruct_ov63_0222CCB8 * param0, UnkStruct_ov63_0222BEC0 * param1, int param2, int param3) +void ov104_02232C80(UnkStruct_ov63_0222CCB8 *param0, UnkStruct_ov63_0222BEC0 *param1, int param2, int param3) { param0->unk_07 = param2; param0->unk_06 = Unk_ov104_022419A0[param3].unk_02; @@ -870,17 +874,17 @@ void ov104_02232C80 (UnkStruct_ov63_0222CCB8 * param0, UnkStruct_ov63_0222BEC0 * } } -void ov104_02232CE0 (UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9) +void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9) { - SpriteRenderer * v0 = param0->unk_34.unk_00; - SpriteGfxHandler * v1 = param0->unk_34.unk_04; - PaletteData * v2 = param0->unk_04; + SpriteRenderer *v0 = param0->unk_34.unk_00; + SpriteGfxHandler *v1 = param0->unk_34.unk_04; + PaletteData *v2 = param0->unk_04; ArchivedSprite v3; - void * v4; - CellActorData * v5; + void *v4; + CellActorData *v5; { - NARC * v6; + NARC *v6; v6 = NARC_ctor(NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, param2); @@ -927,12 +931,12 @@ void ov104_02232CE0 (UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int pa } { - NNSG2dImageProxy * v11; - NNSG2dImagePaletteProxy * v12; + NNSG2dImageProxy *v11; + NNSG2dImagePaletteProxy *v12; int v13; v11 = SpriteActor_ImageProxy(v5->unk_00); - DC_FlushRange(v4, sizeof((10 * 10 * ((8 / 2) * 8)))); + DC_FlushRange(v4, sizeof(10 * 10 * ((8 / 2) * 8))); GX_LoadOBJ(v4, v11->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN], (10 * 10 * ((8 / 2) * 8))); v12 = sub_02021F9C(v5->unk_00); @@ -951,7 +955,7 @@ void ov104_02232CE0 (UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int pa param0->unk_80[param3 - 50000] = v5; } -void ov104_02232E80 (UnkStruct_ov104_0223C4CC * param0, int param1) +void ov104_02232E80(UnkStruct_ov104_0223C4CC *param0, int param1) { sub_0200D0F4(param0->unk_80[param1 - 50000]); @@ -971,7 +975,7 @@ static const SpriteTemplate Unk_ov104_0223F9E0 = { 0x64, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x7D0, 0x7D0, 0x7D0, 0x7D0, 0xffffffff, 0xffffffff}, + { 0x7D0, 0x7D0, 0x7D0, 0x7D0, 0xffffffff, 0xffffffff }, 0x1, 0x0 }; @@ -984,28 +988,28 @@ static const SpriteTemplate Unk_ov104_0223F9AC = { 0x63, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x7D9, 0x7D1, 0x7D1, 0x7D1, 0xffffffff, 0xffffffff}, + { 0x7D9, 0x7D1, 0x7D1, 0x7D1, 0xffffffff, 0xffffffff }, 0x1, 0x0 }; -void ov104_02232EC0 (UnkStruct_ov104_0223C4CC * param0) +void ov104_02232EC0(UnkStruct_ov104_0223C4CC *param0) { sub_0200CD7C(param0->unk_04, 2, param0->unk_34.unk_00, param0->unk_34.unk_04, 19, PokeIconPalettesFileIndex(), 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 2000); sub_0200CE0C(param0->unk_34.unk_00, param0->unk_34.unk_04, 19, PokeIcon32KCellsFileIndex(), 0, 2000); sub_0200CE3C(param0->unk_34.unk_00, param0->unk_34.unk_04, 19, PokeIcon32KAnimationFileIndex(), 0, 2000); } -void ov104_02232F28 (UnkStruct_ov104_0223C4CC * param0) +void ov104_02232F28(UnkStruct_ov104_0223C4CC *param0) { SpriteGfxHandler_UnloadCellObjById(param0->unk_34.unk_04, 2000); SpriteGfxHandler_UnloadAnimObjById(param0->unk_34.unk_04, 2000); SpriteGfxHandler_UnloadPlttObjById(param0->unk_34.unk_04, 2000); } -CellActorData * ov104_02232F4C (UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int param2, int param3, int param4) +CellActorData *ov104_02232F4C(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param2, int param3, int param4) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; GF_ASSERT(param2 < (2008 - 2000)); @@ -1028,15 +1032,15 @@ CellActorData * ov104_02232F4C (UnkStruct_ov104_0223C4CC * param0, Pokemon * par return v0; } -void ov104_02232FD4 (UnkStruct_ov104_0223C4CC * param0, CellActorData * param1, int param2) +void ov104_02232FD4(UnkStruct_ov104_0223C4CC *param0, CellActorData *param1, int param2) { SpriteGfxHandler_UnloadCharObjById(param0->unk_34.unk_04, 2000 + param2); sub_0200D0F4(param1); } -void ov104_02232FEC (UnkStruct_ov104_0223C4CC * param0) +void ov104_02232FEC(UnkStruct_ov104_0223C4CC *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, 94); @@ -1047,7 +1051,7 @@ void ov104_02232FEC (UnkStruct_ov104_0223C4CC * param0) NARC_dtor(v0); } -void ov104_0223307C (UnkStruct_ov104_0223C4CC * param0) +void ov104_0223307C(UnkStruct_ov104_0223C4CC *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_34.unk_04, 2009); SpriteGfxHandler_UnloadCellObjById(param0->unk_34.unk_04, 2001); @@ -1055,9 +1059,9 @@ void ov104_0223307C (UnkStruct_ov104_0223C4CC * param0) SpriteGfxHandler_UnloadPlttObjById(param0->unk_34.unk_04, 2001); } -CellActorData * ov104_022330AC (UnkStruct_ov104_0223C4CC * param0, int param1, int param2) +CellActorData *ov104_022330AC(UnkStruct_ov104_0223C4CC *param0, int param1, int param2) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; v1 = Unk_ov104_0223F9AC; @@ -1072,22 +1076,22 @@ CellActorData * ov104_022330AC (UnkStruct_ov104_0223C4CC * param0, int param1, i return v0; } -void ov104_022330F0 (UnkStruct_ov104_0223C4CC * param0, CellActorData * param1) +void ov104_022330F0(UnkStruct_ov104_0223C4CC *param0, CellActorData *param1) { sub_0200D0F4(param1); } -void ov104_022330FC (UnkStruct_ov104_0222E930 * param0, u16 * param1) +void ov104_022330FC(UnkStruct_ov104_0222E930 *param0, u16 *param1) { ov104_0223310C(param0, param1, 614); return; } -void ov104_0223310C (UnkStruct_ov104_0222E930 * param0, u16 * param1, u32 param2) +void ov104_0223310C(UnkStruct_ov104_0222E930 *param0, u16 *param1, u32 param2) { u8 v0; - MessageLoader * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + MessageLoader *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); if (param1[0] == 0xFFFF) { v1 = MessageLoader_Init(1, 26, param2, 32); @@ -1103,7 +1107,7 @@ void ov104_0223310C (UnkStruct_ov104_0222E930 * param0, u16 * param1, u32 param2 return; } -static BOOL ov104_02233184 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02233184(UnkStruct_ov104_0222E930 *param0) { if (Message_Printing(param0->unk_00->unk_50) == 0) { return 1; @@ -1112,9 +1116,9 @@ static BOOL ov104_02233184 (UnkStruct_ov104_0222E930 * param0) return 0; } -void ov104_0223319C (SysTask * param0, void * param1) +void ov104_0223319C(SysTask *param0, void *param1) { - UnkStruct_ov104_0223319C * v0 = param1; + UnkStruct_ov104_0223319C *v0 = param1; v0->unk_08++; @@ -1133,9 +1137,9 @@ void ov104_0223319C (SysTask * param0, void * param1) } } -void ov104_022331E8 (SysTask * param0, void * param1) +void ov104_022331E8(SysTask *param0, void *param1) { - UnkStruct_ov104_022331E8 * v0 = param1; + UnkStruct_ov104_022331E8 *v0 = param1; if (v0->unk_08 <= 0) { if (v0->unk_0A == 1) { @@ -1155,12 +1159,12 @@ void ov104_022331E8 (SysTask * param0, void * param1) } } -void ov104_0223327C(UnkStruct_ov104_02232B5C * param0, int param1) +void ov104_0223327C(UnkStruct_ov104_02232B5C *param0, int param1) { param0->unk_97_6 = param1; } -void ov104_02233298(UnkStruct_ov104_02232B5C * param0, int param1) +void ov104_02233298(UnkStruct_ov104_02232B5C *param0, int param1) { param0->unk_97_7 = param1; } diff --git a/src/overlay104/ov104_022332B4.c b/src/overlay104/ov104_022332B4.c index f2268b3409..8c2c090c71 100644 --- a/src/overlay104/ov104_022332B4.c +++ b/src/overlay104/ov104_022332B4.c @@ -1,68 +1,66 @@ #include #include -#include "sys_task_manager.h" -#include "strbuf.h" -#include "pokemon.h" -#include "overlay104/struct_ov104_0222E930_decl.h" - -#include "constdata/const_020EA358.h" - #include "overlay006/battle_params.h" +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222E63C.h" +#include "overlay104/ov104_0222E930.h" +#include "overlay104/ov104_0222FBE4.h" +#include "overlay104/ov104_02231F74.h" +#include "overlay104/ov104_022339B4.h" +#include "overlay104/ov104_0223A7F4.h" +#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_0222E930_t.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_022320B4_t.h" #include "overlay104/struct_ov104_02234130.h" #include "overlay104/struct_ov104_0223ADA0.h" #include "overlay104/struct_ov104_0223C4CC.h" +#include "overlay105/ov105_02241AE0.h" +#include "heap.h" +#include "party.h" +#include "pokemon.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" #include "unk_02018340.h" #include "unk_0202FF4C.h" #include "unk_02051D8C.h" -#include "pokemon.h" -#include "party.h" #include "unk_0209B6F8.h" #include "unk_0209BA80.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222E63C.h" -#include "overlay104/ov104_0222E930.h" -#include "overlay104/ov104_0222FBE4.h" -#include "overlay104/ov104_02231F74.h" -#include "overlay104/ov104_022339B4.h" -#include "overlay104/ov104_0223A7F4.h" -#include "overlay105/ov105_02241AE0.h" + +#include "constdata/const_020EA358.h" FS_EXTERN_OVERLAY(overlay105); #include -BOOL ov104_022332B4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022332F4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02233310(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02233324(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223338C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022333B4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022333F8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223348C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022334A0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022334B4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022334C8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022334DC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022338E0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022338FC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223392C(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0223394C(UnkStruct_ov104_0222E930 * param0); -void ov104_022338B4(SysTask * param0, void * param1); -BOOL ov104_0223397C(UnkStruct_ov104_0222E930 * param0); -static void ov104_02233478(void * param0); - -BOOL ov104_022332B4 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022332B4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022332F4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02233310(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02233324(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223338C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022333B4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022333F8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223348C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022334A0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022334B4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022334C8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022334DC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022338E0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022338FC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223392C(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0223394C(UnkStruct_ov104_0222E930 *param0); +void ov104_022338B4(SysTask *param0, void *param1); +BOOL ov104_0223397C(UnkStruct_ov104_0222E930 *param0); +static void ov104_02233478(void *param0); + +BOOL ov104_022332B4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; - UnkStruct_ov104_02230BE4 * v1; + UnkStruct_ov104_0223ADA0 *v0; + UnkStruct_ov104_02230BE4 *v1; u16 v2 = ov104_0222FC00(param0); u16 v3 = ov104_0222FC00(param0); u16 v4 = ov104_0222FC00(param0); @@ -75,9 +73,9 @@ BOOL ov104_022332B4 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022332F4 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022332F4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; + UnkStruct_ov104_0223ADA0 *v0; u16 v1 = ov104_0222FC00(param0); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -86,9 +84,9 @@ BOOL ov104_022332F4 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02233310 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02233310(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; + UnkStruct_ov104_0223ADA0 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_022340D0(v0); @@ -96,12 +94,12 @@ BOOL ov104_02233310 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02233324 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02233324(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_ov104_0223ADA0 * v1; - UnkStruct_ov104_02234130 * v2; - UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_0223ADA0 *v1; + UnkStruct_ov104_02234130 *v2; + UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00); FS_EXTERN_OVERLAY(overlay105); @@ -129,10 +127,10 @@ BOOL ov104_02233324 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_0223338C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223338C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; - BattleParams * v1; + UnkStruct_ov104_0223ADA0 *v0; + BattleParams *v1; v0 = sub_0209B978(param0->unk_00->unk_00); v1 = v0->unk_4FC; @@ -143,11 +141,11 @@ BOOL ov104_0223338C (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022333B4 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022333B4(UnkStruct_ov104_0222E930 *param0) { - BattleParams * v0; - UnkStruct_ov104_0223ADA0 * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + BattleParams *v0; + UnkStruct_ov104_0223ADA0 *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); v1 = sub_0209B978(param0->unk_00->unk_00); v0 = ov104_0223ABA0(v1, v2); @@ -158,12 +156,12 @@ BOOL ov104_022333B4 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_022333F8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022333F8(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_ov104_0223ADA0 * v1; - UnkStruct_ov104_02234130 * v2; - UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_0223ADA0 *v1; + UnkStruct_ov104_02234130 *v2; + UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00); FS_EXTERN_OVERLAY(overlay105); @@ -195,10 +193,10 @@ BOOL ov104_022333F8 (UnkStruct_ov104_0222E930 * param0) return 1; } -static void ov104_02233478 (void * param0) +static void ov104_02233478(void *param0) { int v0; - UnkStruct_ov104_02234130 * v1 = param0; + UnkStruct_ov104_02234130 *v1 = param0; ov104_0223410C(v1->unk_1C, param0); Heap_FreeToHeap(param0); @@ -206,9 +204,9 @@ static void ov104_02233478 (void * param0) return; } -BOOL ov104_0223348C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223348C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; + UnkStruct_ov104_0223ADA0 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_0223449C(v0); @@ -216,9 +214,9 @@ BOOL ov104_0223348C (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022334A0 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022334A0(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; + UnkStruct_ov104_0223ADA0 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_02234570(v0); @@ -226,9 +224,9 @@ BOOL ov104_022334A0 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022334B4 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022334B4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; + UnkStruct_ov104_0223ADA0 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_022346A4(v0); @@ -236,9 +234,9 @@ BOOL ov104_022334B4 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022334C8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022334C8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; + UnkStruct_ov104_0223ADA0 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_0223470C(v0); @@ -246,20 +244,20 @@ BOOL ov104_022334C8 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022334DC (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022334DC(UnkStruct_ov104_0222E930 *param0) { int v0[18]; - UnkStruct_ov104_0223C4CC * v1; - Strbuf* v2; - Pokemon * v3; - UnkStruct_ov104_0223ADA0 * v4; + UnkStruct_ov104_0223C4CC *v1; + Strbuf *v2; + Pokemon *v3; + UnkStruct_ov104_0223ADA0 *v4; u8 v5, v6; u32 v7, v8, v9; int v10, v11; u8 v12 = (*((param0)->unk_1C++)); u8 v13 = (*((param0)->unk_1C++)); u8 v14 = (*((param0)->unk_1C++)); - u16 * v15 = ov104_0222FBE4(param0); + u16 *v15 = ov104_0222FBE4(param0); v4 = sub_0209B978(param0->unk_00->unk_00); v1 = ov104_0222E924(param0->unk_00); @@ -441,10 +439,10 @@ BOOL ov104_022334DC (UnkStruct_ov104_0222E930 * param0) return 0; } -void ov104_022338B4 (SysTask * param0, void * param1) +void ov104_022338B4(SysTask *param0, void *param1) { int v0; - UnkStruct_ov104_0223C4CC * v1 = param1; + UnkStruct_ov104_0223C4CC *v1 = param1; v0 = sub_020192F8(v1->unk_00, 2); @@ -457,10 +455,10 @@ void ov104_022338B4 (SysTask * param0, void * param1) return; } -BOOL ov104_022338E0 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022338E0(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_ov104_0223ADA0 *v0; + u16 *v1 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v1 = v0->unk_14; @@ -468,12 +466,12 @@ BOOL ov104_022338E0 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022338FC (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022338FC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; + UnkStruct_ov104_0223ADA0 *v0; u16 v1 = ov104_0222FC00(param0); u16 v2 = ov104_0222FC00(param0); - u16 * v3 = ov104_0222FBE4(param0); + u16 *v3 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v3 = ov104_022347A4(v0, v1, v2); @@ -481,7 +479,7 @@ BOOL ov104_022338FC (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_0223392C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223392C(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); @@ -491,9 +489,9 @@ BOOL ov104_0223392C (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_0223394C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0223394C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223ADA0 * v0; + UnkStruct_ov104_0223ADA0 *v0; u16 v1 = ov104_0222FC8C(param0, param0->unk_78[0]); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -506,11 +504,11 @@ static BOOL ov104_0223394C (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_0223397C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223397C(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; - UnkStruct_ov104_0223ADA0 * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + u16 *v0; + UnkStruct_ov104_0223ADA0 *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); u16 v3 = (*((param0)->unk_1C++)); v1 = sub_0209B978(param0->unk_00->unk_00); diff --git a/src/overlay104/ov104_022339B4.c b/src/overlay104/ov104_022339B4.c index 4d076dcd07..3beac4f1a6 100644 --- a/src/overlay104/ov104_022339B4.c +++ b/src/overlay104/ov104_022339B4.c @@ -1,13 +1,16 @@ +#include "overlay104/ov104_022339B4.h" + #include #include #include "struct_decls/struct_0203068C_decl.h" -#include "pokemon.h" -#include "savedata.h" - #include "struct_defs/struct_0202FF58.h" #include "struct_defs/struct_020300F4.h" #include "struct_defs/struct_0204B184.h" + +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222ECE8.h" +#include "overlay104/ov104_0223A7F4.h" #include "overlay104/struct_ov104_02234130.h" #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223A348_sub2.h" @@ -15,51 +18,48 @@ #include "overlay104/struct_ov104_0224028C.h" #include "heap.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" #include "unk_0201D15C.h" #include "unk_0202CD50.h" #include "unk_0202FF4C.h" #include "unk_0203061C.h" -#include "vars_flags.h" #include "unk_0205DFC4.h" #include "unk_0206AFE0.h" -#include "pokemon.h" -#include "party.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222ECE8.h" -#include "overlay104/ov104_022339B4.h" -#include "overlay104/ov104_0223A7F4.h" +#include "vars_flags.h" -UnkStruct_ov104_0223ADA0 * ov104_022339B4(SaveData * param0, u16 param1, u8 param2, u8 param3); -void ov104_02233B98(UnkStruct_ov104_0223ADA0 * param0, u16 param1); -static void ov104_02233BAC(UnkStruct_ov104_0223ADA0 * param0); -static void ov104_02233F1C(UnkStruct_ov104_0223ADA0 * param0); -void ov104_022340D0(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0223410C(UnkStruct_ov104_0223ADA0 * param0, void * param1); -u16 ov104_02234130(void * param0, u8 param1); -void ov104_0223449C(UnkStruct_ov104_0223ADA0 * param0); -void ov104_02234570(UnkStruct_ov104_0223ADA0 * param0); -void ov104_022346A4(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0223470C(UnkStruct_ov104_0223ADA0 * param0); -void ov104_02234790(UnkStruct_ov104_0223ADA0 * param0); -static void ov104_02233D80(UnkStruct_ov104_0223ADA0 * param0, u8 param1, u8 param2); -BOOL ov104_022347A4(UnkStruct_ov104_0223ADA0 * param0, u16 param1, u16 param2); -void ov104_02234148(UnkStruct_ov104_0223ADA0 * param0, u8 param1); -u16 ov104_02234430(UnkStruct_ov104_0223ADA0 * param0); -u16 ov104_0223443C(UnkStruct_ov104_0223ADA0 * param0); -u16 ov104_02234440(UnkStruct_ov104_0223ADA0 * param0, u8 param1); -void ov104_02234474(UnkStruct_ov104_0223ADA0 * param0); -void ov104_02234480(UnkStruct_ov104_0223ADA0 * param0); -u16 ov104_022347F8(UnkStruct_ov104_0223ADA0 * param0); - -UnkStruct_ov104_0223ADA0 * ov104_022339B4 (SaveData * param0, u16 param1, u8 param2, u8 param3) +UnkStruct_ov104_0223ADA0 *ov104_022339B4(SaveData *param0, u16 param1, u8 param2, u8 param3); +void ov104_02233B98(UnkStruct_ov104_0223ADA0 *param0, u16 param1); +static void ov104_02233BAC(UnkStruct_ov104_0223ADA0 *param0); +static void ov104_02233F1C(UnkStruct_ov104_0223ADA0 *param0); +void ov104_022340D0(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0223410C(UnkStruct_ov104_0223ADA0 *param0, void *param1); +u16 ov104_02234130(void *param0, u8 param1); +void ov104_0223449C(UnkStruct_ov104_0223ADA0 *param0); +void ov104_02234570(UnkStruct_ov104_0223ADA0 *param0); +void ov104_022346A4(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0223470C(UnkStruct_ov104_0223ADA0 *param0); +void ov104_02234790(UnkStruct_ov104_0223ADA0 *param0); +static void ov104_02233D80(UnkStruct_ov104_0223ADA0 *param0, u8 param1, u8 param2); +BOOL ov104_022347A4(UnkStruct_ov104_0223ADA0 *param0, u16 param1, u16 param2); +void ov104_02234148(UnkStruct_ov104_0223ADA0 *param0, u8 param1); +u16 ov104_02234430(UnkStruct_ov104_0223ADA0 *param0); +u16 ov104_0223443C(UnkStruct_ov104_0223ADA0 *param0); +u16 ov104_02234440(UnkStruct_ov104_0223ADA0 *param0, u8 param1); +void ov104_02234474(UnkStruct_ov104_0223ADA0 *param0); +void ov104_02234480(UnkStruct_ov104_0223ADA0 *param0); +u16 ov104_022347F8(UnkStruct_ov104_0223ADA0 *param0); + +UnkStruct_ov104_0223ADA0 *ov104_022339B4(SaveData *param0, u16 param1, u8 param2, u8 param3) { - UnkStruct_0202FF58 * v0; - UnkStruct_020300F4 * v1; - const UnkStruct_ov104_0224028C * v2; + UnkStruct_0202FF58 *v0; + UnkStruct_020300F4 *v1; + const UnkStruct_ov104_0224028C *v2; u8 v3; u16 v4, v5; u32 v6; - static UnkStruct_ov104_0223ADA0 * v7; + static UnkStruct_ov104_0223ADA0 *v7; v7 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov104_0223ADA0)); MI_CpuClear8(v7, sizeof(UnkStruct_ov104_0223ADA0)); @@ -118,7 +118,7 @@ UnkStruct_ov104_0223ADA0 * ov104_022339B4 (SaveData * param0, u16 param1, u8 par return v7; } -void ov104_02233B98 (UnkStruct_ov104_0223ADA0 * param0, u16 param1) +void ov104_02233B98(UnkStruct_ov104_0223ADA0 *param0, u16 param1) { if (param1 == 0) { ov104_02233BAC(param0); @@ -129,12 +129,12 @@ void ov104_02233B98 (UnkStruct_ov104_0223ADA0 * param0, u16 param1) return; } -static void ov104_02233BAC (UnkStruct_ov104_0223ADA0 * param0) +static void ov104_02233BAC(UnkStruct_ov104_0223ADA0 *param0) { int v0, v1; UnkStruct_ov104_0223A348_sub2 v2[6 * 2]; UnkStruct_ov104_0223A348_sub2 v3; - Pokemon * v4; + Pokemon *v4; u16 v5[6]; u16 v6[6]; @@ -201,7 +201,7 @@ static void ov104_02233BAC (UnkStruct_ov104_0223ADA0 * param0) return; } -static void ov104_02233D80 (UnkStruct_ov104_0223ADA0 * param0, u8 param1, u8 param2) +static void ov104_02233D80(UnkStruct_ov104_0223ADA0 *param0, u8 param1, u8 param2) { u16 v0; u16 v1; @@ -246,10 +246,10 @@ static void ov104_02233D80 (UnkStruct_ov104_0223ADA0 * param0, u8 param1, u8 par return; } -static void ov104_02233F1C (UnkStruct_ov104_0223ADA0 * param0) +static void ov104_02233F1C(UnkStruct_ov104_0223ADA0 *param0) { int v0; - Pokemon * v1; + Pokemon *v1; u8 v2, v3; UnkStruct_ov104_0223A348_sub2 v4[6]; u8 v5[6]; @@ -303,7 +303,7 @@ static void ov104_02233F1C (UnkStruct_ov104_0223ADA0 * param0) return; } -void ov104_022340D0 (UnkStruct_ov104_0223ADA0 * param0) +void ov104_022340D0(UnkStruct_ov104_0223ADA0 *param0) { int v0; @@ -327,7 +327,7 @@ void ov104_022340D0 (UnkStruct_ov104_0223ADA0 * param0) return; } -void ov104_0223410C (UnkStruct_ov104_0223ADA0 * param0, void * param1) +void ov104_0223410C(UnkStruct_ov104_0223ADA0 *param0, void *param1) { int v0; @@ -338,9 +338,9 @@ void ov104_0223410C (UnkStruct_ov104_0223ADA0 * param0, void * param1) return; } -u16 ov104_02234130 (void * param0, u8 param1) +u16 ov104_02234130(void *param0, u8 param1) { - UnkStruct_ov104_02234130 * v0 = param0; + UnkStruct_ov104_02234130 *v0 = param0; if (param1 >= 6) { GF_ASSERT(0); @@ -350,7 +350,7 @@ u16 ov104_02234130 (void * param0, u8 param1) return v0->unk_10[param1]; } -void ov104_02234148 (UnkStruct_ov104_0223ADA0 * param0, u8 param1) +void ov104_02234148(UnkStruct_ov104_0223ADA0 *param0, u8 param1) { u16 v0, v1, v2; u8 v3, v4; @@ -358,10 +358,10 @@ void ov104_02234148 (UnkStruct_ov104_0223ADA0 * param0, u8 param1) u16 v6[4]; u32 v7[4]; u32 v8, v9, v10; - UnkStruct_0203068C * v11; - Pokemon * v12; - UnkStruct_0202FF58 * v13 = param0->unk_4F4; - UnkStruct_020300F4 * v14 = sub_020300F4(param0->unk_4F8); + UnkStruct_0203068C *v11; + Pokemon *v12; + UnkStruct_0202FF58 *v13 = param0->unk_4F4; + UnkStruct_020300F4 *v14 = sub_020300F4(param0->unk_4F8); v11 = sub_0203068C(param0->unk_4F8); v3 = ov104_0223AA50(param0->unk_04); @@ -442,21 +442,21 @@ void ov104_02234148 (UnkStruct_ov104_0223ADA0 * param0, u8 param1) return; } -u16 ov104_02234430 (UnkStruct_ov104_0223ADA0 * param0) +u16 ov104_02234430(UnkStruct_ov104_0223ADA0 *param0) { param0->unk_06++; return param0->unk_06; } -u16 ov104_0223443C (UnkStruct_ov104_0223ADA0 * param0) +u16 ov104_0223443C(UnkStruct_ov104_0223ADA0 *param0) { return param0->unk_06; } -u16 ov104_02234440 (UnkStruct_ov104_0223ADA0 * param0, u8 param1) +u16 ov104_02234440(UnkStruct_ov104_0223ADA0 *param0, u8 param1) { UnkStruct_ov104_0223A348_sub1 v0; - UnkStruct_0204B184 * v1; + UnkStruct_0204B184 *v1; u8 v2; v2 = param0->unk_06 + (param1 * 7); @@ -467,13 +467,13 @@ u16 ov104_02234440 (UnkStruct_ov104_0223ADA0 * param0, u8 param1) return ov104_0222E10C(v0.unk_04); } -void ov104_02234474 (UnkStruct_ov104_0223ADA0 * param0) +void ov104_02234474(UnkStruct_ov104_0223ADA0 *param0) { ov104_02234148(param0, 1); return; } -void ov104_02234480 (UnkStruct_ov104_0223ADA0 * param0) +void ov104_02234480(UnkStruct_ov104_0223ADA0 *param0) { param0->unk_0A = 1; @@ -487,12 +487,12 @@ void ov104_02234480 (UnkStruct_ov104_0223ADA0 * param0) return; } -void ov104_0223449C (UnkStruct_ov104_0223ADA0 * param0) +void ov104_0223449C(UnkStruct_ov104_0223ADA0 *param0) { int v0; u8 v1, v2; - Pokemon * v3; - const UnkStruct_ov104_0224028C * v4; + Pokemon *v3; + const UnkStruct_ov104_0224028C *v4; v1 = ov104_0223AA50(param0->unk_04); v2 = ov104_0223AA74(param0->unk_04, 1); @@ -517,14 +517,14 @@ void ov104_0223449C (UnkStruct_ov104_0223ADA0 * param0) return; } -void ov104_02234570 (UnkStruct_ov104_0223ADA0 * param0) +void ov104_02234570(UnkStruct_ov104_0223ADA0 *param0) { int v0, v1, v2; u8 v3; u16 v4[8]; u16 v5[8]; - Pokemon * v6; - const UnkStruct_ov104_0224028C * v7; + Pokemon *v6; + const UnkStruct_ov104_0224028C *v7; for (v0 = 0; v0 < (4 + 4); v0++) { v4[v0] = 0; @@ -559,9 +559,9 @@ void ov104_02234570 (UnkStruct_ov104_0223ADA0 * param0) return; } -void ov104_022346A4 (UnkStruct_ov104_0223ADA0 * param0) +void ov104_022346A4(UnkStruct_ov104_0223ADA0 *param0) { - Pokemon * v0; + Pokemon *v0; if (param0->unk_4DC[0] == 0xff) { (void)0; @@ -578,11 +578,11 @@ void ov104_022346A4 (UnkStruct_ov104_0223ADA0 * param0) return; } -void ov104_0223470C (UnkStruct_ov104_0223ADA0 * param0) +void ov104_0223470C(UnkStruct_ov104_0223ADA0 *param0) { int v0; u8 v1, v2; - Pokemon * v3; + Pokemon *v3; int v4; v1 = ov104_0223AA50(param0->unk_04); @@ -606,7 +606,7 @@ void ov104_0223470C (UnkStruct_ov104_0223ADA0 * param0) return; } -void ov104_02234790 (UnkStruct_ov104_0223ADA0 * param0) +void ov104_02234790(UnkStruct_ov104_0223ADA0 *param0) { if (param0->unk_08 < 9999) { param0->unk_08++; @@ -615,7 +615,7 @@ void ov104_02234790 (UnkStruct_ov104_0223ADA0 * param0) return; } -BOOL ov104_022347A4 (UnkStruct_ov104_0223ADA0 * param0, u16 param1, u16 param2) +BOOL ov104_022347A4(UnkStruct_ov104_0223ADA0 *param0, u16 param1, u16 param2) { int v0; @@ -646,12 +646,12 @@ BOOL ov104_022347A4 (UnkStruct_ov104_0223ADA0 * param0, u16 param1, u16 param2) return v0; } -u16 ov104_022347F8 (UnkStruct_ov104_0223ADA0 * param0) +u16 ov104_022347F8(UnkStruct_ov104_0223ADA0 *param0) { u8 v0; u16 v1; - static const u8 v2[8 + 1] = {0, 5, 5, 5, 5, 7, 7, 8, 9}; - static const u8 v3[8 + 1] = {0, 10, 11, 12, 13, 16, 17, 19, 21}; + static const u8 v2[8 + 1] = { 0, 5, 5, 5, 5, 7, 7, 8, 9 }; + static const u8 v3[8 + 1] = { 0, 10, 11, 12, 13, 16, 17, 19, 21 }; v1 = param0->unk_0E; diff --git a/src/overlay104/ov104_02234838.c b/src/overlay104/ov104_02234838.c index 4f86b1ceb0..9236cc681f 100644 --- a/src/overlay104/ov104_02234838.c +++ b/src/overlay104/ov104_02234838.c @@ -2,62 +2,61 @@ #include #include "struct_decls/struct_0202440C_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "overlay104/struct_ov104_0222E930_decl.h" - -#include "constdata/const_020EA358.h" #include "overlay006/battle_params.h" +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222E930.h" +#include "overlay104/ov104_0222FBE4.h" +#include "overlay104/ov104_02231F74.h" +#include "overlay104/ov104_02234DB4.h" +#include "overlay104/ov104_0223AF58.h" +#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_0222E930_t.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_022320B4_t.h" #include "overlay104/struct_ov104_02235208.h" #include "overlay104/struct_ov104_0223B5C0.h" +#include "overlay106/ov106_02241AE0.h" +#include "savedata/save_table.h" -#include "unk_020041CC.h" -#include "heap.h" #include "gx_layers.h" -#include "savedata/save_table.h" +#include "heap.h" +#include "party.h" +#include "pokemon.h" +#include "unk_020041CC.h" #include "unk_02030108.h" #include "unk_02051D8C.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "party.h" #include "unk_0209B6F8.h" #include "unk_0209BA80.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222E930.h" -#include "overlay104/ov104_0222FBE4.h" -#include "overlay104/ov104_02231F74.h" -#include "overlay104/ov104_02234DB4.h" -#include "overlay104/ov104_0223AF58.h" -#include "overlay106/ov106_02241AE0.h" + +#include "constdata/const_020EA358.h" FS_EXTERN_OVERLAY(overlay106); #include -BOOL ov104_02234838(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223488C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022348A8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022348BC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234994(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022349B8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234A1C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234C80(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234C9C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234CCC(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02234CEC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234D18(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02234D50(UnkStruct_ov104_0222E930 * param0); -static void ov104_02234A08(void * param0); -BOOL ov104_02234D6C(UnkStruct_ov104_0222E930 * param0); - -BOOL ov104_02234838 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02234838(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223488C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022348A8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022348BC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234994(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022349B8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234A1C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234C80(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234C9C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234CCC(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02234CEC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234D18(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02234D50(UnkStruct_ov104_0222E930 *param0); +static void ov104_02234A08(void *param0); +BOOL ov104_02234D6C(UnkStruct_ov104_0222E930 *param0); + +BOOL ov104_02234838(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223B5C0 * v0; - UnkStruct_ov104_02230BE4 * v1; + UnkStruct_ov104_0223B5C0 *v0; + UnkStruct_ov104_02230BE4 *v1; u16 v2 = ov104_0222FC00(param0); u16 v3 = ov104_0222FC00(param0); u16 v4 = ov104_0222FC00(param0); @@ -71,9 +70,9 @@ BOOL ov104_02234838 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_0223488C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223488C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223B5C0 * v0; + UnkStruct_ov104_0223B5C0 *v0; u16 v1 = ov104_0222FC00(param0); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -82,9 +81,9 @@ BOOL ov104_0223488C (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022348A8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022348A8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223B5C0 * v0; + UnkStruct_ov104_0223B5C0 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_02235190(v0); @@ -92,14 +91,14 @@ BOOL ov104_022348A8 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022348BC (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022348BC(UnkStruct_ov104_0222E930 *param0) { int v0; - Party * v1; - Pokemon * v2; - UnkStruct_ov104_0223B5C0 * v3; - UnkStruct_ov104_02235208 * v4; - UnkStruct_ov104_02230BE4 * v5 = sub_0209B970(param0->unk_00->unk_00); + Party *v1; + Pokemon *v2; + UnkStruct_ov104_0223B5C0 *v3; + UnkStruct_ov104_02235208 *v4; + UnkStruct_ov104_02230BE4 *v5 = sub_0209B970(param0->unk_00->unk_00); FS_EXTERN_OVERLAY(overlay106); @@ -142,10 +141,10 @@ BOOL ov104_022348BC (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02234994 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02234994(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223B5C0 * v0; - BattleParams * v1; + UnkStruct_ov104_0223B5C0 *v0; + BattleParams *v1; v0 = sub_0209B978(param0->unk_00->unk_00); v1 = v0->unk_700; @@ -156,11 +155,11 @@ BOOL ov104_02234994 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022349B8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022349B8(UnkStruct_ov104_0222E930 *param0) { - BattleParams * v0; - UnkStruct_ov104_0223B5C0 * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + BattleParams *v0; + UnkStruct_ov104_0223B5C0 *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); v1 = sub_0209B978(param0->unk_00->unk_00); v0 = ov104_0223B250(v1, v2); @@ -173,11 +172,11 @@ BOOL ov104_022349B8 (UnkStruct_ov104_0222E930 * param0) return 1; } -static void ov104_02234A08 (void * param0) +static void ov104_02234A08(void *param0) { int v0; - Pokemon * v1; - UnkStruct_ov104_02235208 * v2 = param0; + Pokemon *v1; + UnkStruct_ov104_02235208 *v2 = param0; ov104_022351CC(v2->unk_10, param0); Heap_FreeToHeap(param0); @@ -185,19 +184,19 @@ static void ov104_02234A08 (void * param0) return; } -BOOL ov104_02234A1C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02234A1C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0; - Pokemon * v1; - Party * v2; - UnkStruct_ov104_0223B5C0 * v3; + UnkStruct_ov104_02230BE4 *v0; + Pokemon *v1; + Party *v2; + UnkStruct_ov104_0223B5C0 *v3; u8 v4, v5; u32 v6; int v7; u8 v8 = (*((param0)->unk_1C++)); u8 v9 = (*((param0)->unk_1C++)); u8 v10 = (*((param0)->unk_1C++)); - u16 * v11 = ov104_0222FBE4(param0); + u16 *v11 = ov104_0222FBE4(param0); v0 = sub_0209B970(param0->unk_00->unk_00); v3 = sub_0209B978(param0->unk_00->unk_00); @@ -322,10 +321,10 @@ BOOL ov104_02234A1C (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02234C80 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02234C80(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223B5C0 * v0; - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_ov104_0223B5C0 *v0; + u16 *v1 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v1 = v0->unk_14; @@ -333,12 +332,12 @@ BOOL ov104_02234C80 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02234C9C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02234C9C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223B5C0 * v0; + UnkStruct_ov104_0223B5C0 *v0; u16 v1 = ov104_0222FC00(param0); u16 v2 = ov104_0222FC00(param0); - u16 * v3 = ov104_0222FBE4(param0); + u16 *v3 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v3 = ov104_02235534(v0, v1, v2); @@ -346,7 +345,7 @@ BOOL ov104_02234C9C (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02234CCC (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02234CCC(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); @@ -356,9 +355,9 @@ BOOL ov104_02234CCC (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02234CEC (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02234CEC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223B5C0 * v0; + UnkStruct_ov104_0223B5C0 *v0; u16 v1 = ov104_0222FC8C(param0, param0->unk_78[0]); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -371,11 +370,11 @@ static BOOL ov104_02234CEC (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02234D18 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02234D18(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; - UnkStruct_ov104_0223B5C0 * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + u16 *v0; + UnkStruct_ov104_0223B5C0 *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); u16 v3 = (*((param0)->unk_1C++)); v1 = sub_0209B978(param0->unk_00->unk_00); @@ -390,10 +389,10 @@ BOOL ov104_02234D18 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02234D50 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02234D50(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223B5C0 * v0; - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_ov104_0223B5C0 *v0; + u16 *v1 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); ov104_0223520C(v0, v1); @@ -401,14 +400,14 @@ BOOL ov104_02234D50 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02234D6C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02234D6C(UnkStruct_ov104_0222E930 *param0) { - TVBroadcast * v0; + TVBroadcast *v0; u16 v1; - Party * v2; - Pokemon * v3; - UnkStruct_ov104_0223B5C0 * v4; - UnkStruct_ov104_02230BE4 * v5 = sub_0209B970(param0->unk_00->unk_00); + Party *v2; + Pokemon *v3; + UnkStruct_ov104_0223B5C0 *v4; + UnkStruct_ov104_02230BE4 *v5 = sub_0209B970(param0->unk_00->unk_00); v4 = sub_0209B978(param0->unk_00->unk_00); v2 = Party_GetFromSavedata(v5->unk_08); diff --git a/src/overlay104/ov104_02234DB4.c b/src/overlay104/ov104_02234DB4.c index ab4845e11b..18ccccc68d 100644 --- a/src/overlay104/ov104_02234DB4.c +++ b/src/overlay104/ov104_02234DB4.c @@ -1,60 +1,60 @@ +#include "overlay104/ov104_02234DB4.h" + #include #include #include "struct_decls/struct_02030114_decl.h" #include "struct_decls/struct_0203026C_decl.h" #include "struct_decls/struct_0203068C_decl.h" -#include "pokemon.h" -#include "savedata.h" - #include "struct_defs/struct_0204B184.h" + +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222ECE8.h" +#include "overlay104/ov104_0223AF58.h" #include "overlay104/struct_ov104_02235208.h" #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223A348_sub2.h" #include "overlay104/struct_ov104_0223B5C0.h" #include "heap.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" #include "unk_02030108.h" #include "unk_0203061C.h" #include "unk_02030880.h" -#include "vars_flags.h" #include "unk_0205DFC4.h" #include "unk_0206AFE0.h" -#include "pokemon.h" -#include "party.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222ECE8.h" -#include "overlay104/ov104_02234DB4.h" -#include "overlay104/ov104_0223AF58.h" +#include "vars_flags.h" -UnkStruct_ov104_0223B5C0 * ov104_02234DB4(SaveData * param0, u16 param1, u8 param2, u8 param3, u8 param4); -void ov104_022350B0(UnkStruct_ov104_0223B5C0 * param0, u16 param1); -static void ov104_022350B8(UnkStruct_ov104_0223B5C0 * param0); -void ov104_02235190(UnkStruct_ov104_0223B5C0 * param0); -void ov104_022351CC(UnkStruct_ov104_0223B5C0 * param0, void * param1); -u16 ov104_02235208(void * param0, u8 param1); -void ov104_0223520C(UnkStruct_ov104_0223B5C0 * param0, u16 * param1); -BOOL ov104_02235534(UnkStruct_ov104_0223B5C0 * param0, u16 param1, u16 param2); -static u16 ov104_022355C0(SaveData * param0, u8 param1, u8 param2, u16 * param3, u16 * param4); -static void ov104_02235620(SaveData * param0, u8 param1, u8 param2, u8 param3); -void ov104_022356A0(UnkStruct_ov104_0223B5C0 * param0); -static u16 ov104_02235704(UnkStruct_ov104_0223B5C0 * param0); -void ov104_0223526C(UnkStruct_ov104_0223B5C0 * param0, u8 param1); -u16 ov104_022354B0(UnkStruct_ov104_0223B5C0 * param0); -u16 ov104_022354BC(UnkStruct_ov104_0223B5C0 * param0); -u16 ov104_022354C0(UnkStruct_ov104_0223B5C0 * param0, u8 param1); -void ov104_022354F4(UnkStruct_ov104_0223B5C0 * param0); -void ov104_02235518(UnkStruct_ov104_0223B5C0 * param0); -u16 ov104_02235578(UnkStruct_ov104_0223B5C0 * param0); - -UnkStruct_ov104_0223B5C0 * ov104_02234DB4 (SaveData * param0, u16 param1, u8 param2, u8 param3, u8 param4) +UnkStruct_ov104_0223B5C0 *ov104_02234DB4(SaveData *param0, u16 param1, u8 param2, u8 param3, u8 param4); +void ov104_022350B0(UnkStruct_ov104_0223B5C0 *param0, u16 param1); +static void ov104_022350B8(UnkStruct_ov104_0223B5C0 *param0); +void ov104_02235190(UnkStruct_ov104_0223B5C0 *param0); +void ov104_022351CC(UnkStruct_ov104_0223B5C0 *param0, void *param1); +u16 ov104_02235208(void *param0, u8 param1); +void ov104_0223520C(UnkStruct_ov104_0223B5C0 *param0, u16 *param1); +BOOL ov104_02235534(UnkStruct_ov104_0223B5C0 *param0, u16 param1, u16 param2); +static u16 ov104_022355C0(SaveData *param0, u8 param1, u8 param2, u16 *param3, u16 *param4); +static void ov104_02235620(SaveData *param0, u8 param1, u8 param2, u8 param3); +void ov104_022356A0(UnkStruct_ov104_0223B5C0 *param0); +static u16 ov104_02235704(UnkStruct_ov104_0223B5C0 *param0); +void ov104_0223526C(UnkStruct_ov104_0223B5C0 *param0, u8 param1); +u16 ov104_022354B0(UnkStruct_ov104_0223B5C0 *param0); +u16 ov104_022354BC(UnkStruct_ov104_0223B5C0 *param0); +u16 ov104_022354C0(UnkStruct_ov104_0223B5C0 *param0, u8 param1); +void ov104_022354F4(UnkStruct_ov104_0223B5C0 *param0); +void ov104_02235518(UnkStruct_ov104_0223B5C0 *param0); +u16 ov104_02235578(UnkStruct_ov104_0223B5C0 *param0); + +UnkStruct_ov104_0223B5C0 *ov104_02234DB4(SaveData *param0, u16 param1, u8 param2, u8 param3, u8 param4) { - UnkStruct_02030114 * v0; - UnkStruct_0203026C * v1; + UnkStruct_02030114 *v0; + UnkStruct_0203026C *v1; u8 v2, v3, v4; u16 v5, v6, v7, v8; - Pokemon * v9; - static UnkStruct_ov104_0223B5C0 * v10; + Pokemon *v9; + static UnkStruct_ov104_0223B5C0 *v10; v10 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov104_0223B5C0)); MI_CpuClear8(v10, sizeof(UnkStruct_ov104_0223B5C0)); @@ -139,7 +139,7 @@ UnkStruct_ov104_0223B5C0 * ov104_02234DB4 (SaveData * param0, u16 param1, u8 par return v10; } -void ov104_022350B0 (UnkStruct_ov104_0223B5C0 * param0, u16 param1) +void ov104_022350B0(UnkStruct_ov104_0223B5C0 *param0, u16 param1) { if (param1 == 0) { ov104_022350B8(param0); @@ -150,11 +150,11 @@ void ov104_022350B0 (UnkStruct_ov104_0223B5C0 * param0, u16 param1) return; } -static void ov104_022350B8 (UnkStruct_ov104_0223B5C0 * param0) +static void ov104_022350B8(UnkStruct_ov104_0223B5C0 *param0) { u8 v0, v1, v2, v3; int v4, v5; - Pokemon * v6; + Pokemon *v6; UnkStruct_ov104_0223A348_sub2 v7; v3 = 0; @@ -191,7 +191,7 @@ static void ov104_022350B8 (UnkStruct_ov104_0223B5C0 * param0) return; } -void ov104_02235190 (UnkStruct_ov104_0223B5C0 * param0) +void ov104_02235190(UnkStruct_ov104_0223B5C0 *param0) { if (param0 == NULL) { return; @@ -213,7 +213,7 @@ void ov104_02235190 (UnkStruct_ov104_0223B5C0 * param0) return; } -void ov104_022351CC (UnkStruct_ov104_0223B5C0 * param0, void * param1) +void ov104_022351CC(UnkStruct_ov104_0223B5C0 *param0, void *param1) { int v0; @@ -228,13 +228,13 @@ void ov104_022351CC (UnkStruct_ov104_0223B5C0 * param0, void * param1) return; } -u16 ov104_02235208 (void * param0, u8 param1) +u16 ov104_02235208(void *param0, u8 param1) { - UnkStruct_ov104_02235208 * v0 = param0; + UnkStruct_ov104_02235208 *v0 = param0; return v0->unk_06; } -void ov104_0223520C (UnkStruct_ov104_0223B5C0 * param0, u16 * param1) +void ov104_0223520C(UnkStruct_ov104_0223B5C0 *param0, u16 *param1) { int v0; int v1; @@ -248,17 +248,17 @@ void ov104_0223520C (UnkStruct_ov104_0223B5C0 * param0, u16 * param1) return; } -void ov104_0223526C (UnkStruct_ov104_0223B5C0 * param0, u8 param1) +void ov104_0223526C(UnkStruct_ov104_0223B5C0 *param0, u8 param1) { u16 v0; u8 v1[4]; u16 v2[4]; u32 v3[4]; - UnkStruct_0203068C * v4; + UnkStruct_0203068C *v4; u16 v5, v6, v7, v8, v9; - Pokemon * v10; - UnkStruct_02030114 * v11 = param0->unk_6F8; - UnkStruct_0203026C * v12 = sub_0203026C(param0->unk_6FC); + Pokemon *v10; + UnkStruct_02030114 *v11 = param0->unk_6F8; + UnkStruct_0203026C *v12 = sub_0203026C(param0->unk_6FC); v4 = sub_0203068C(param0->unk_6FC); v1[0] = param0->unk_04; @@ -317,21 +317,21 @@ void ov104_0223526C (UnkStruct_ov104_0223B5C0 * param0, u8 param1) return; } -u16 ov104_022354B0 (UnkStruct_ov104_0223B5C0 * param0) +u16 ov104_022354B0(UnkStruct_ov104_0223B5C0 *param0) { param0->unk_05++; return param0->unk_05; } -u16 ov104_022354BC (UnkStruct_ov104_0223B5C0 * param0) +u16 ov104_022354BC(UnkStruct_ov104_0223B5C0 *param0) { return param0->unk_05; } -u16 ov104_022354C0 (UnkStruct_ov104_0223B5C0 * param0, u8 param1) +u16 ov104_022354C0(UnkStruct_ov104_0223B5C0 *param0, u8 param1) { UnkStruct_ov104_0223A348_sub1 v0; - UnkStruct_0204B184 * v1; + UnkStruct_0204B184 *v1; u8 v2; v2 = (param0->unk_05 * 2) + param1; @@ -342,7 +342,7 @@ u16 ov104_022354C0 (UnkStruct_ov104_0223B5C0 * param0, u8 param1) return ov104_0222E10C(v0.unk_04); } -void ov104_022354F4 (UnkStruct_ov104_0223B5C0 * param0) +void ov104_022354F4(UnkStruct_ov104_0223B5C0 *param0) { int v0; @@ -352,9 +352,9 @@ void ov104_022354F4 (UnkStruct_ov104_0223B5C0 * param0) return; } -void ov104_02235518 (UnkStruct_ov104_0223B5C0 * param0) +void ov104_02235518(UnkStruct_ov104_0223B5C0 *param0) { - Pokemon * v0; + Pokemon *v0; param0->unk_06 = 1; @@ -368,7 +368,7 @@ void ov104_02235518 (UnkStruct_ov104_0223B5C0 * param0) return; } -BOOL ov104_02235534 (UnkStruct_ov104_0223B5C0 * param0, u16 param1, u16 param2) +BOOL ov104_02235534(UnkStruct_ov104_0223B5C0 *param0, u16 param1, u16 param2) { int v0; @@ -393,11 +393,11 @@ BOOL ov104_02235534 (UnkStruct_ov104_0223B5C0 * param0, u16 param1, u16 param2) return v0; } -u16 ov104_02235578 (UnkStruct_ov104_0223B5C0 * param0) +u16 ov104_02235578(UnkStruct_ov104_0223B5C0 *param0) { u8 v0; - static const u8 v1[18 + 1] = {0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 6, 6, 8, 8, 10, 10, 12}; - static const u8 v2[18 + 1] = {0, 6, 6, 6, 8, 8, 8, 10, 10, 10, 12, 12, 14, 15, 17, 17, 20, 20, 23}; + static const u8 v1[18 + 1] = { 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 6, 6, 8, 8, 10, 10, 12 }; + static const u8 v2[18 + 1] = { 0, 6, 6, 6, 8, 8, 8, 10, 10, 10, 12, 12, 14, 15, 17, 17, 20, 20, 23 }; if ((param0->unk_04 == 0) || (param0->unk_04 == 1)) { if (param0->unk_0A >= 18) { @@ -424,7 +424,7 @@ u16 ov104_02235578 (UnkStruct_ov104_0223B5C0 * param0) return v0; } -static u16 ov104_022355C0 (SaveData * param0, u8 param1, u8 param2, u16 * param3, u16 * param4) +static u16 ov104_022355C0(SaveData *param0, u8 param1, u8 param2, u16 *param3, u16 *param4) { u16 v0; @@ -441,7 +441,7 @@ static u16 ov104_022355C0 (SaveData * param0, u8 param1, u8 param2, u16 * param3 } } -static void ov104_02235620 (SaveData * param0, u8 param1, u8 param2, u8 param3) +static void ov104_02235620(SaveData *param0, u8 param1, u8 param2, u8 param3) { u8 v0; u8 v1; @@ -467,7 +467,7 @@ static void ov104_02235620 (SaveData * param0, u8 param1, u8 param2, u8 param3) return; } -void ov104_022356A0 (UnkStruct_ov104_0223B5C0 * param0) +void ov104_022356A0(UnkStruct_ov104_0223B5C0 *param0) { u8 v0; int v1; @@ -491,7 +491,7 @@ void ov104_022356A0 (UnkStruct_ov104_0223B5C0 * param0) return; } -void ov104_022356F4 (UnkStruct_ov104_0223B5C0 * param0) +void ov104_022356F4(UnkStruct_ov104_0223B5C0 *param0) { int v0; @@ -501,7 +501,7 @@ void ov104_022356F4 (UnkStruct_ov104_0223B5C0 * param0) return; } -static u16 ov104_02235704 (UnkStruct_ov104_0223B5C0 * param0) +static u16 ov104_02235704(UnkStruct_ov104_0223B5C0 *param0) { fx32 v0, v1; int v2, v3; diff --git a/src/overlay104/ov104_022358E8.c b/src/overlay104/ov104_022358E8.c index 67551b2644..5beb7f3489 100644 --- a/src/overlay104/ov104_022358E8.c +++ b/src/overlay104/ov104_022358E8.c @@ -1,82 +1,81 @@ #include #include -#include "strbuf.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "overlay104/struct_ov104_0222E930_decl.h" - -#include "constdata/const_020EA358.h" #include "overlay006/battle_params.h" +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222E63C.h" +#include "overlay104/ov104_0222E930.h" +#include "overlay104/ov104_0222FBE4.h" +#include "overlay104/ov104_02231F74.h" +#include "overlay104/ov104_022361B4.h" +#include "overlay104/ov104_0223B6F4.h" +#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_0222E930_t.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_022320B4_t.h" #include "overlay104/struct_ov104_0223597C.h" #include "overlay104/struct_ov104_0223BA10.h" #include "overlay104/struct_ov104_0223C4CC.h" +#include "overlay107/ov107_02241AE0.h" +#include "overlay107/ov107_02245EB0.h" +#include "communication_system.h" #include "heap.h" +#include "party.h" +#include "pokemon.h" +#include "strbuf.h" #include "unk_020302D0.h" #include "unk_0203061C.h" -#include "communication_system.h" #include "unk_02051D8C.h" #include "unk_0205DFC4.h" -#include "pokemon.h" -#include "party.h" #include "unk_0209B6F8.h" #include "unk_0209BA80.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222E63C.h" -#include "overlay104/ov104_0222E930.h" -#include "overlay104/ov104_0222FBE4.h" -#include "overlay104/ov104_02231F74.h" -#include "overlay104/ov104_022361B4.h" -#include "overlay104/ov104_0223B6F4.h" -#include "overlay107/ov107_02241AE0.h" -#include "overlay107/ov107_02245EB0.h" + +#include "constdata/const_020EA358.h" FS_EXTERN_OVERLAY(overlay107); #include -BOOL ov104_022358E8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223594C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235968(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223597C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022359D0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235A24(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235AAC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235AE8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235B98(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235BAC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235F9C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235FB8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02235FE8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02236008(UnkStruct_ov104_0222E930 * param0); -static void ov104_02235B3C(UnkStruct_ov104_0223597C * param0, UnkStruct_ov104_0223BA10 * param1); -BOOL ov104_02236038(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02236058(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02236090(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022360A8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022360C0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022360D8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02236120(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02236150(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223617C(UnkStruct_ov104_0222E930 * param0); -static void ov104_02235B84(void * param0); - -BOOL ov104_022358E8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022358E8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223594C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235968(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223597C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022359D0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235A24(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235AAC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235AE8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235B98(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235BAC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235F9C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235FB8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02235FE8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02236008(UnkStruct_ov104_0222E930 *param0); +static void ov104_02235B3C(UnkStruct_ov104_0223597C *param0, UnkStruct_ov104_0223BA10 *param1); +BOOL ov104_02236038(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02236058(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02236090(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022360A8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022360C0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022360D8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02236120(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02236150(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223617C(UnkStruct_ov104_0222E930 *param0); +static void ov104_02235B84(void *param0); + +BOOL ov104_022358E8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; - UnkStruct_ov104_02230BE4 * v1; + UnkStruct_ov104_0223BA10 *v0; + UnkStruct_ov104_02230BE4 *v1; u16 v2 = ov104_0222FC00(param0); u16 v3 = ov104_0222FC00(param0); u16 v4 = ov104_0222FC00(param0); u16 v5 = ov104_0222FC00(param0); u16 v6 = ov104_0222FC00(param0); - u16 * v7 = ov104_0222FBE4(param0); + u16 *v7 = ov104_0222FBE4(param0); v1 = sub_0209B970(param0->unk_00->unk_00); v0 = ov104_022361B4(v1->unk_08, v2, v3, v4, v5, v6, v7); @@ -86,9 +85,9 @@ BOOL ov104_022358E8 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_0223594C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223594C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; + UnkStruct_ov104_0223BA10 *v0; u16 v1 = ov104_0222FC00(param0); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -97,9 +96,9 @@ BOOL ov104_0223594C (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02235968 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02235968(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; + UnkStruct_ov104_0223BA10 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_022367AC(v0); @@ -107,12 +106,12 @@ BOOL ov104_02235968 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_0223597C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223597C(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_ov104_0223BA10 * v1; - UnkStruct_ov104_0223597C * v2; - UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_0223BA10 *v1; + UnkStruct_ov104_0223597C *v2; + UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00); FS_EXTERN_OVERLAY(overlay107); @@ -135,12 +134,12 @@ BOOL ov104_0223597C (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_022359D0 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022359D0(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_ov104_0223BA10 * v1; - UnkStruct_ov104_0223597C * v2; - UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_0223BA10 *v1; + UnkStruct_ov104_0223597C *v2; + UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00); FS_EXTERN_OVERLAY(overlay107); @@ -163,12 +162,12 @@ BOOL ov104_022359D0 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02235A24 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02235A24(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_ov104_0223BA10 * v1; - BattleParams * v2; - Pokemon * v3; + UnkStruct_ov104_0223BA10 *v1; + BattleParams *v2; + Pokemon *v3; v1 = sub_0209B978(param0->unk_00->unk_00); v2 = v1->unk_0C; @@ -196,11 +195,11 @@ BOOL ov104_02235A24 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02235AAC (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02235AAC(UnkStruct_ov104_0222E930 *param0) { - BattleParams * v0; - UnkStruct_ov104_0223BA10 * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + BattleParams *v0; + UnkStruct_ov104_0223BA10 *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); v1 = sub_0209B978(param0->unk_00->unk_00); v0 = ov104_0223B810(v1, v2); @@ -211,12 +210,12 @@ BOOL ov104_02235AAC (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02235AE8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02235AE8(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_ov104_0223BA10 * v1; - UnkStruct_ov104_0223597C * v2; - UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_0223BA10 *v1; + UnkStruct_ov104_0223597C *v2; + UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00); FS_EXTERN_OVERLAY(overlay107); @@ -239,7 +238,7 @@ BOOL ov104_02235AE8 (UnkStruct_ov104_0222E930 * param0) return 1; } -static void ov104_02235B3C (UnkStruct_ov104_0223597C * param0, UnkStruct_ov104_0223BA10 * param1) +static void ov104_02235B3C(UnkStruct_ov104_0223597C *param0, UnkStruct_ov104_0223BA10 *param1) { int v0; @@ -259,10 +258,10 @@ static void ov104_02235B3C (UnkStruct_ov104_0223597C * param0, UnkStruct_ov104_0 return; } -static void ov104_02235B84 (void * param0) +static void ov104_02235B84(void *param0) { int v0; - UnkStruct_ov104_0223597C * v1 = param0; + UnkStruct_ov104_0223597C *v1 = param0; ov104_022367DC(v1->unk_24, param0); Heap_FreeToHeap(param0); @@ -270,9 +269,9 @@ static void ov104_02235B84 (void * param0) return; } -BOOL ov104_02235B98 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02235B98(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; + UnkStruct_ov104_0223BA10 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_02236BF0(v0); @@ -280,9 +279,9 @@ BOOL ov104_02235B98 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02235BAC (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02235BAC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; + UnkStruct_ov104_0223BA10 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_02236BF8(v0); @@ -290,23 +289,23 @@ BOOL ov104_02235BAC (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02235BC0 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02235BC0(UnkStruct_ov104_0222E930 *param0) { - Strbuf* v0; - Pokemon * v1; - Party * v2; - UnkStruct_ov104_0223BA10 * v3; + Strbuf *v0; + Pokemon *v1; + Party *v2; + UnkStruct_ov104_0223BA10 *v3; u8 v4; u32 v5[9][2]; u32 v6, v7; int v8, v9, v10; - UnkStruct_ov104_02230BE4 * v11; - UnkStruct_ov104_0223C4CC * v12; + UnkStruct_ov104_02230BE4 *v11; + UnkStruct_ov104_0223C4CC *v12; u8 v13[4]; u8 v14 = (*((param0)->unk_1C++)); u8 v15 = (*((param0)->unk_1C++)); u8 v16 = (*((param0)->unk_1C++)); - u16 * v17 = ov104_0222FBE4(param0); + u16 *v17 = ov104_0222FBE4(param0); v3 = sub_0209B978(param0->unk_00->unk_00); v11 = sub_0209B970(param0->unk_00->unk_00); @@ -493,10 +492,10 @@ BOOL ov104_02235BC0 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02235F9C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02235F9C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_ov104_0223BA10 *v0; + u16 *v1 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v1 = v0->unk_1C; @@ -504,12 +503,12 @@ BOOL ov104_02235F9C (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02235FB8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02235FB8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; + UnkStruct_ov104_0223BA10 *v0; u16 v1 = ov104_0222FC00(param0); u16 v2 = ov104_0222FC00(param0); - u16 * v3 = ov104_0222FBE4(param0); + u16 *v3 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v3 = ov104_02236F70(v0, v1, v2); @@ -517,7 +516,7 @@ BOOL ov104_02235FB8 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02235FE8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02235FE8(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); @@ -527,9 +526,9 @@ BOOL ov104_02235FE8 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02236008 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02236008(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; + UnkStruct_ov104_0223BA10 *v0; u16 v1 = ov104_0222FC8C(param0, param0->unk_78[0]); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -542,7 +541,7 @@ static BOOL ov104_02236008 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02236038 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02236038(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); @@ -552,10 +551,10 @@ BOOL ov104_02236038 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02236058 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02236058(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; - u16 * v1 = ov104_0222FC14(param0, param0->unk_78[0]); + UnkStruct_ov104_0223BA10 *v0; + u16 *v1 = ov104_0222FC14(param0, param0->unk_78[0]); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -569,9 +568,9 @@ static BOOL ov104_02236058 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02236090 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02236090(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; + UnkStruct_ov104_0223BA10 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_02236FC0(param0->unk_00, v0); @@ -579,9 +578,9 @@ BOOL ov104_02236090 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022360A8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022360A8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; + UnkStruct_ov104_0223BA10 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_022370E0(param0->unk_00, v0); @@ -589,9 +588,9 @@ BOOL ov104_022360A8 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022360C0 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022360C0(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BA10 * v0; + UnkStruct_ov104_0223BA10 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_02237180(param0->unk_00, v0); @@ -599,11 +598,11 @@ BOOL ov104_022360C0 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022360D8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022360D8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0; + UnkStruct_ov104_02230BE4 *v0; u16 v1 = ov104_0222FC00(param0); - u16 * v2 = ov104_0222FBE4(param0); + u16 *v2 = ov104_0222FBE4(param0); v0 = sub_0209B970(param0->unk_00->unk_00); *v2 = sub_02030698(sub_0203068C(v0->unk_08), sub_0205E630(v1), sub_0205E6A8(sub_0205E630(v1))); @@ -611,9 +610,9 @@ BOOL ov104_022360D8 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02236120 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02236120(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_02230BE4 * v0; + UnkStruct_ov104_02230BE4 *v0; u16 v1 = ov104_0222FC00(param0); u16 v2 = ov104_0222FC00(param0); @@ -623,10 +622,10 @@ BOOL ov104_02236120 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02236150 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02236150(UnkStruct_ov104_0222E930 *param0) { u16 v0; - UnkStruct_ov104_02230BE4 * v1; + UnkStruct_ov104_02230BE4 *v1; u16 v2 = ov104_0222FC00(param0); u16 v3 = ov104_0222FC00(param0); @@ -636,11 +635,11 @@ BOOL ov104_02236150 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_0223617C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223617C(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; - UnkStruct_ov104_0223BA10 * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + u16 *v0; + UnkStruct_ov104_0223BA10 *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); u16 v3 = (*((param0)->unk_1C++)); v1 = sub_0209B978(param0->unk_00->unk_00); diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index 177ef4f0ba..5e5094cbc4 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -1,20 +1,21 @@ +#include "overlay104/ov104_022361B4.h" + #include #include -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_020302DC_decl.h" #include "struct_decls/struct_0203041C_decl.h" #include "struct_decls/struct_0203068C_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" -#include "overlay104/struct_ov104_022320B4_decl.h" - #include "struct_defs/struct_0204B184.h" #include "struct_defs/struct_0205AA50.h" + +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222E63C.h" +#include "overlay104/ov104_0222ECE8.h" +#include "overlay104/ov104_0223B6F4.h" +#include "overlay104/struct_ov104_022320B4_decl.h" #include "overlay104/struct_ov104_022320B4_t.h" #include "overlay104/struct_ov104_0223597C.h" #include "overlay104/struct_ov104_0223A348_sub1.h" @@ -22,60 +23,57 @@ #include "overlay104/struct_ov104_0223BA10.h" #include "overlay104/struct_ov104_0223C4CC.h" +#include "communication_information.h" +#include "communication_system.h" +#include "heap.h" #include "message.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" +#include "trainer_info.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_02025E08.h" #include "unk_0202CD50.h" #include "unk_020302D0.h" #include "unk_0203061C.h" -#include "communication_information.h" -#include "communication_system.h" -#include "vars_flags.h" #include "unk_0205DFC4.h" #include "unk_0206AFE0.h" -#include "pokemon.h" -#include "party.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222E63C.h" -#include "overlay104/ov104_0222ECE8.h" -#include "overlay104/ov104_022361B4.h" -#include "overlay104/ov104_0223B6F4.h" +#include "vars_flags.h" -UnkStruct_ov104_0223BA10 * ov104_022361B4(SaveData * param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 * param6); -void ov104_02236514(UnkStruct_ov104_0223BA10 * param0, u16 param1); -static void ov104_02236528(UnkStruct_ov104_0223BA10 * param0); -static void ov104_022365F8(UnkStruct_ov104_0223BA10 * param0); -static void ov104_022366A4(UnkStruct_ov104_0223BA10 * param0); -void ov104_022367AC(UnkStruct_ov104_0223BA10 * param0); -void ov104_022367DC(UnkStruct_ov104_0223BA10 * param0, void * param1); -u16 ov104_02236834(void * param0, u8 param1); -void ov104_02236BF0(UnkStruct_ov104_0223BA10 * param0); -void ov104_02236BF8(UnkStruct_ov104_0223BA10 * param0); -void ov104_02236C50(UnkStruct_ov104_0223BA10 * param0); -int ov104_02236D10(UnkStruct_ov104_0223BA10 * param0); -BOOL ov104_02236F70(UnkStruct_ov104_0223BA10 * param0, u16 param1, u16 param2); -void ov104_02236FC0(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 * param1); -void ov104_022370E0(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 * param1); -void ov104_02237180(UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 * param1); -static void ov104_022370C0(BGL * param0, Window * param1); -static void ov104_02237284(UnkStruct_ov104_022320B4 * param0, Window * param1, TrainerInfo * param2, u16 param3); -u16 ov104_02237338(UnkStruct_ov104_0223BA10 * param0); - -UnkStruct_ov104_0223BA10 * ov104_022361B4 (SaveData * param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 * param6) +UnkStruct_ov104_0223BA10 *ov104_022361B4(SaveData *param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 *param6); +void ov104_02236514(UnkStruct_ov104_0223BA10 *param0, u16 param1); +static void ov104_02236528(UnkStruct_ov104_0223BA10 *param0); +static void ov104_022365F8(UnkStruct_ov104_0223BA10 *param0); +static void ov104_022366A4(UnkStruct_ov104_0223BA10 *param0); +void ov104_022367AC(UnkStruct_ov104_0223BA10 *param0); +void ov104_022367DC(UnkStruct_ov104_0223BA10 *param0, void *param1); +u16 ov104_02236834(void *param0, u8 param1); +void ov104_02236BF0(UnkStruct_ov104_0223BA10 *param0); +void ov104_02236BF8(UnkStruct_ov104_0223BA10 *param0); +void ov104_02236C50(UnkStruct_ov104_0223BA10 *param0); +int ov104_02236D10(UnkStruct_ov104_0223BA10 *param0); +BOOL ov104_02236F70(UnkStruct_ov104_0223BA10 *param0, u16 param1, u16 param2); +void ov104_02236FC0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1); +void ov104_022370E0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1); +void ov104_02237180(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1); +static void ov104_022370C0(BGL *param0, Window *param1); +static void ov104_02237284(UnkStruct_ov104_022320B4 *param0, Window *param1, TrainerInfo *param2, u16 param3); +u16 ov104_02237338(UnkStruct_ov104_0223BA10 *param0); + +UnkStruct_ov104_0223BA10 *ov104_022361B4(SaveData *param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 *param6) { u32 v0, v1; - Party * v2; - Pokemon * v3; - UnkStruct_020302DC * v4; + Party *v2; + Pokemon *v3; + UnkStruct_020302DC *v4; u8 v5, v6; u16 v7, v8; - static UnkStruct_ov104_0223BA10 * v9; - UnkStruct_0203041C * v10; + static UnkStruct_ov104_0223BA10 *v9; + UnkStruct_0203041C *v10; v9 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov104_0223BA10)); MI_CpuClear8(v9, sizeof(UnkStruct_ov104_0223BA10)); @@ -164,7 +162,7 @@ UnkStruct_ov104_0223BA10 * ov104_022361B4 (SaveData * param0, u16 param1, u8 par return v9; } -void ov104_02236514 (UnkStruct_ov104_0223BA10 * param0, u16 param1) +void ov104_02236514(UnkStruct_ov104_0223BA10 *param0, u16 param1) { if (param1 == 0) { ov104_02236528(param0); @@ -175,13 +173,13 @@ void ov104_02236514 (UnkStruct_ov104_0223BA10 * param0, u16 param1) return; } -static void ov104_02236528 (UnkStruct_ov104_0223BA10 * param0) +static void ov104_02236528(UnkStruct_ov104_0223BA10 *param0) { u8 v0; int v1; UnkStruct_ov104_0223A348_sub2 v2; - Pokemon * v3; - Party * v4; + Pokemon *v3; + Party *v4; u16 v5[6]; u16 v6[6]; @@ -211,11 +209,11 @@ static void ov104_02236528 (UnkStruct_ov104_0223BA10 * param0) return; } -static void ov104_022365F8 (UnkStruct_ov104_0223BA10 * param0) +static void ov104_022365F8(UnkStruct_ov104_0223BA10 *param0) { u16 v0; int v1; - Pokemon * v2; + Pokemon *v2; u8 v3; UnkStruct_ov104_0223A348_sub2 v4[6]; u8 v5[6]; @@ -247,14 +245,14 @@ static void ov104_022365F8 (UnkStruct_ov104_0223BA10 * param0) return; } -static void ov104_022366A4 (UnkStruct_ov104_0223BA10 * param0) +static void ov104_022366A4(UnkStruct_ov104_0223BA10 *param0) { u8 v0; u32 v1; u16 v2; u8 v3; int v4; - Pokemon * v5; + Pokemon *v5; v0 = Party_GetCurrentCount(param0->unk_28); @@ -286,7 +284,7 @@ static void ov104_022366A4 (UnkStruct_ov104_0223BA10 * param0) return; } -void ov104_022367AC (UnkStruct_ov104_0223BA10 * param0) +void ov104_022367AC(UnkStruct_ov104_0223BA10 *param0) { int v0; @@ -310,10 +308,10 @@ void ov104_022367AC (UnkStruct_ov104_0223BA10 * param0) return; } -void ov104_022367DC (UnkStruct_ov104_0223BA10 * param0, void * param1) +void ov104_022367DC(UnkStruct_ov104_0223BA10 *param0, void *param1) { int v0; - UnkStruct_ov104_0223597C * v1 = param1; + UnkStruct_ov104_0223597C *v1 = param1; for (v0 = 0; v0 < 6; v0++) { param0->unk_380[v0] = ov104_02236834(param1, v0); @@ -330,9 +328,9 @@ void ov104_022367DC (UnkStruct_ov104_0223BA10 * param0, void * param1) return; } -u16 ov104_02236834 (void * param0, u8 param1) +u16 ov104_02236834(void *param0, u8 param1) { - UnkStruct_ov104_0223597C * v0 = param0; + UnkStruct_ov104_0223597C *v0 = param0; if (param1 >= 6) { GF_ASSERT(0); @@ -342,14 +340,14 @@ u16 ov104_02236834 (void * param0, u8 param1) return v0->unk_20; } -void ov104_02236848(UnkStruct_ov104_0223BA10 * param0, u8 param1); -u16 ov104_02236B48(UnkStruct_ov104_0223BA10 * param0); -u16 ov104_02236B54(UnkStruct_ov104_0223BA10 * param0); -u16 ov104_02236B58(UnkStruct_ov104_0223BA10 * param0, u8 param1); -void ov104_02236B8C(UnkStruct_ov104_0223BA10 * param0); -void ov104_02236BD0(UnkStruct_ov104_0223BA10 * param0); +void ov104_02236848(UnkStruct_ov104_0223BA10 *param0, u8 param1); +u16 ov104_02236B48(UnkStruct_ov104_0223BA10 *param0); +u16 ov104_02236B54(UnkStruct_ov104_0223BA10 *param0); +u16 ov104_02236B58(UnkStruct_ov104_0223BA10 *param0, u8 param1); +void ov104_02236B8C(UnkStruct_ov104_0223BA10 *param0); +void ov104_02236BD0(UnkStruct_ov104_0223BA10 *param0); -void ov104_02236848 (UnkStruct_ov104_0223BA10 * param0, u8 param1) +void ov104_02236848(UnkStruct_ov104_0223BA10 *param0, u8 param1) { u16 v0, v1, v2; u8 v3; @@ -357,10 +355,10 @@ void ov104_02236848 (UnkStruct_ov104_0223BA10 * param0, u8 param1) u16 v5[4]; u32 v6[4]; u32 v7, v8, v9; - UnkStruct_0203068C * v10; - Pokemon * v11; - UnkStruct_020302DC * v12 = param0->unk_08; - UnkStruct_0203041C * v13 = sub_0203041C(param0->unk_04); + UnkStruct_0203068C *v10; + Pokemon *v11; + UnkStruct_020302DC *v12 = param0->unk_08; + UnkStruct_0203041C *v13 = sub_0203041C(param0->unk_04); v10 = sub_0203068C(param0->unk_04); v3 = ov104_0223B7DC(param0->unk_10, 1); @@ -443,21 +441,21 @@ void ov104_02236848 (UnkStruct_ov104_0223BA10 * param0, u8 param1) return; } -u16 ov104_02236B48 (UnkStruct_ov104_0223BA10 * param0) +u16 ov104_02236B48(UnkStruct_ov104_0223BA10 *param0) { param0->unk_11++; return param0->unk_11; } -u16 ov104_02236B54 (UnkStruct_ov104_0223BA10 * param0) +u16 ov104_02236B54(UnkStruct_ov104_0223BA10 *param0) { return param0->unk_11; } -u16 ov104_02236B58 (UnkStruct_ov104_0223BA10 * param0, u8 param1) +u16 ov104_02236B58(UnkStruct_ov104_0223BA10 *param0, u8 param1) { UnkStruct_ov104_0223A348_sub1 v0; - UnkStruct_0204B184 * v1; + UnkStruct_0204B184 *v1; u8 v2; v2 = param0->unk_11 + (param1 * 7); @@ -468,7 +466,7 @@ u16 ov104_02236B58 (UnkStruct_ov104_0223BA10 * param0, u8 param1) return ov104_0222E10C(v0.unk_04); } -void ov104_02236B8C (UnkStruct_ov104_0223BA10 * param0) +void ov104_02236B8C(UnkStruct_ov104_0223BA10 *param0) { u16 v0[4]; int v1; @@ -484,7 +482,7 @@ void ov104_02236B8C (UnkStruct_ov104_0223BA10 * param0) return; } -void ov104_02236BD0 (UnkStruct_ov104_0223BA10 * param0) +void ov104_02236BD0(UnkStruct_ov104_0223BA10 *param0) { param0->unk_27 = 1; @@ -498,13 +496,13 @@ void ov104_02236BD0 (UnkStruct_ov104_0223BA10 * param0) return; } -void ov104_02236BF0 (UnkStruct_ov104_0223BA10 * param0) +void ov104_02236BF0(UnkStruct_ov104_0223BA10 *param0) { ov104_0223BAB8(param0); return; } -void ov104_02236BF8 (UnkStruct_ov104_0223BA10 * param0) +void ov104_02236BF8(UnkStruct_ov104_0223BA10 *param0) { int v0, v1, v2; @@ -518,11 +516,11 @@ void ov104_02236BF8 (UnkStruct_ov104_0223BA10 * param0) return; } -void ov104_02236C50 (UnkStruct_ov104_0223BA10 * param0) +void ov104_02236C50(UnkStruct_ov104_0223BA10 *param0) { u8 v0, v1; int v2, v3; - Pokemon * v4; + Pokemon *v4; if (CommSys_CurNetId() == 0) { v0 = 0; @@ -554,12 +552,12 @@ void ov104_02236C50 (UnkStruct_ov104_0223BA10 * param0) return; } -int ov104_02236D10 (UnkStruct_ov104_0223BA10 * param0) +int ov104_02236D10(UnkStruct_ov104_0223BA10 *param0) { u8 v0, v1, v2; u32 v3, v4; int v5, v6, v7, v8; - Pokemon * v9; + Pokemon *v9; u8 v10[20]; int v11 = 0; @@ -656,7 +654,7 @@ int ov104_02236D10 (UnkStruct_ov104_0223BA10 * param0) return v11; } -void ov104_02236ED8 (SaveData * param0, u8 param1, int param2) +void ov104_02236ED8(SaveData *param0, u8 param1, int param2) { u16 v0; @@ -672,7 +670,7 @@ void ov104_02236ED8 (SaveData * param0, u8 param1, int param2) return; } -BOOL ov104_02236F70 (UnkStruct_ov104_0223BA10 * param0, u16 param1, u16 param2) +BOOL ov104_02236F70(UnkStruct_ov104_0223BA10 *param0, u16 param1, u16 param2) { int v0; @@ -703,9 +701,9 @@ BOOL ov104_02236F70 (UnkStruct_ov104_0223BA10 * param0, u16 param1, u16 param2) return v0; } -void ov104_02236FC0 (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 * param1) +void ov104_02236FC0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1) { - UnkStruct_ov104_0223C4CC * v0 = ov104_0222E924(param0); + UnkStruct_ov104_0223C4CC *v0 = ov104_0222E924(param0); GF_ASSERT(param0->unk_A8 == NULL); GF_ASSERT(param0->unk_AC == NULL); @@ -729,7 +727,7 @@ void ov104_02236FC0 (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 return; } -static void ov104_022370C0 (BGL * param0, Window * param1) +static void ov104_022370C0(BGL *param0, Window *param1) { Window_Show(param1, 1, ((1024 - (18 + 12)) - 9), 12); BGL_FillWindow(param1, 15); @@ -737,10 +735,10 @@ static void ov104_022370C0 (BGL * param0, Window * param1) return; } -void ov104_022370E0 (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 * param1) +void ov104_022370E0(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1) { - Window * v0; - Window * v1; + Window *v0; + Window *v1; if (ov104_0223BA14(param1->unk_10) == 0) { GF_ASSERT(param0->unk_A8 != NULL); @@ -771,7 +769,7 @@ void ov104_022370E0 (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 return; } -void ov104_02237180 (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 * param1) +void ov104_02237180(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 *param1) { u16 v0, v1; @@ -798,11 +796,11 @@ void ov104_02237180 (UnkStruct_ov104_022320B4 * param0, UnkStruct_ov104_0223BA10 return; } -static void ov104_02237284 (UnkStruct_ov104_022320B4 * param0, Window * param1, TrainerInfo * param2, u16 param3) +static void ov104_02237284(UnkStruct_ov104_022320B4 *param0, Window *param1, TrainerInfo *param2, u16 param3) { - MessageLoader * v0; - Strbuf* v1 = Strbuf_Init((10 * 2), param0->unk_34); - Strbuf* v2 = Strbuf_Init((10 * 2), param0->unk_34); + MessageLoader *v0; + Strbuf *v1 = Strbuf_Init((10 * 2), param0->unk_34); + Strbuf *v2 = Strbuf_Init((10 * 2), param0->unk_34); v0 = MessageLoader_Init(0, 26, 199, 11); @@ -827,12 +825,12 @@ static void ov104_02237284 (UnkStruct_ov104_022320B4 * param0, Window * param1, return; } -u16 ov104_02237338 (UnkStruct_ov104_0223BA10 * param0) +u16 ov104_02237338(UnkStruct_ov104_0223BA10 *param0) { u8 v0; u16 v1; - static const u8 v2[8 + 1] = {0, 3, 3, 4, 4, 5, 5, 7, 7}; - static const u8 v3[8 + 1] = {0, 8, 9, 11, 12, 14, 15, 18, 18}; + static const u8 v2[8 + 1] = { 0, 3, 3, 4, 4, 5, 5, 7, 7 }; + static const u8 v3[8 + 1] = { 0, 8, 9, 11, 12, 14, 15, 18, 18 }; v1 = param0->unk_16; diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c index 64d821a0c6..da975f8cb0 100644 --- a/src/overlay104/ov104_02237378.c +++ b/src/overlay104/ov104_02237378.c @@ -4,90 +4,89 @@ #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02022550_decl.h" #include "struct_decls/struct_party_decl.h" -#include "overlay104/struct_ov104_0222E930_decl.h" -#include "overlay104/struct_ov104_022320B4_decl.h" - -#include "constdata/const_020EA358.h" - #include "struct_defs/struct_0200D0F4.h" + #include "overlay006/battle_params.h" +#include "overlay063/ov63_0222CCE4.h" +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222E63C.h" +#include "overlay104/ov104_0222E930.h" +#include "overlay104/ov104_0222FBE4.h" +#include "overlay104/ov104_02231F74.h" +#include "overlay104/ov104_02237DD8.h" +#include "overlay104/ov104_0223B6F4.h" +#include "overlay104/ov104_0223BCBC.h" +#include "overlay104/ov104_0223C2D4.h" +#include "overlay104/ov104_0223D5D0.h" +#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_0222E930_t.h" #include "overlay104/struct_ov104_02230BE4.h" +#include "overlay104/struct_ov104_022320B4_decl.h" #include "overlay104/struct_ov104_022320B4_t.h" #include "overlay104/struct_ov104_02238240.h" #include "overlay104/struct_ov104_0223BFFC.h" #include "overlay104/struct_ov104_0223C4CC.h" #include "overlay104/struct_ov104_0223C634.h" +#include "overlay108/ov108_02241AE0.h" +#include "communication_information.h" +#include "gx_layers.h" +#include "heap.h" +#include "party.h" +#include "pokemon.h" #include "spl.h" - -#include "unk_02002F38.h" +#include "strbuf.h" #include "string_template.h" +#include "trainer_info.h" +#include "unk_02002F38.h" #include "unk_02014000.h" -#include "heap.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_02030494.h" -#include "communication_information.h" #include "unk_02051D8C.h" -#include "pokemon.h" -#include "party.h" -#include "strbuf.h" #include "unk_0209B6F8.h" #include "unk_0209BA80.h" -#include "overlay063/ov63_0222CCE4.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222E63C.h" -#include "overlay104/ov104_0222E930.h" -#include "overlay104/ov104_0222FBE4.h" -#include "overlay104/ov104_02231F74.h" -#include "overlay104/ov104_02237DD8.h" -#include "overlay104/ov104_0223B6F4.h" -#include "overlay104/ov104_0223BCBC.h" -#include "overlay104/ov104_0223C2D4.h" -#include "overlay104/ov104_0223D5D0.h" -#include "overlay108/ov108_02241AE0.h" + +#include "constdata/const_020EA358.h" FS_EXTERN_OVERLAY(overlay108); #include -BOOL ov104_02237378(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022373DC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022373F8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223740C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237460(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022375F8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237720(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237734(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237748(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237CAC(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237CC8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237CF8(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02237D18(UnkStruct_ov104_0222E930 * param0); -static void ov104_02237634(UnkStruct_ov104_02238240 * param0, UnkStruct_ov104_0223BFFC * param1); -BOOL ov104_02237D48(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02236090(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022360A8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022360C0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237D84(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02237D98(UnkStruct_ov104_0222E930 * param0); -static void ov104_02237C30(UnkSPLStruct6 * param0); -static void ov104_02237C0C(UnkStruct_ov104_0222E930 * param0, UnkStruct_ov104_0223BFFC * param1, u16 param2); -static void ov104_0223770C(void * param0); - -BOOL ov104_02237378 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237378(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022373DC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022373F8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223740C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237460(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022375F8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237720(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237734(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237748(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237CAC(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237CC8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237CF8(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02237D18(UnkStruct_ov104_0222E930 *param0); +static void ov104_02237634(UnkStruct_ov104_02238240 *param0, UnkStruct_ov104_0223BFFC *param1); +BOOL ov104_02237D48(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02236090(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022360A8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022360C0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237D84(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02237D98(UnkStruct_ov104_0222E930 *param0); +static void ov104_02237C30(UnkSPLStruct6 *param0); +static void ov104_02237C0C(UnkStruct_ov104_0222E930 *param0, UnkStruct_ov104_0223BFFC *param1, u16 param2); +static void ov104_0223770C(void *param0); + +BOOL ov104_02237378(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BFFC * v0; - UnkStruct_ov104_02230BE4 * v1; + UnkStruct_ov104_0223BFFC *v0; + UnkStruct_ov104_02230BE4 *v1; u16 v2 = ov104_0222FC00(param0); u16 v3 = ov104_0222FC00(param0); u16 v4 = ov104_0222FC00(param0); u16 v5 = ov104_0222FC00(param0); u16 v6 = ov104_0222FC00(param0); - u16 * v7 = ov104_0222FBE4(param0); + u16 *v7 = ov104_0222FBE4(param0); v1 = sub_0209B970(param0->unk_00->unk_00); v0 = ov104_02237DD8(v1->unk_08, v2, v3, v4, v5, v6, v7); @@ -96,9 +95,9 @@ BOOL ov104_02237378 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022373DC (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022373DC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BFFC * v0; + UnkStruct_ov104_0223BFFC *v0; u16 v1 = ov104_0222FC00(param0); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -107,9 +106,9 @@ BOOL ov104_022373DC (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022373F8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022373F8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BFFC * v0; + UnkStruct_ov104_0223BFFC *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_02238210(v0); @@ -117,12 +116,12 @@ BOOL ov104_022373F8 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_0223740C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223740C(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_ov104_0223BFFC * v1; - UnkStruct_ov104_02238240 * v2; - UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_ov104_0223BFFC *v1; + UnkStruct_ov104_02238240 *v2; + UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00); FS_EXTERN_OVERLAY(overlay108); @@ -145,15 +144,15 @@ BOOL ov104_0223740C (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02237460 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237460(UnkStruct_ov104_0222E930 *param0) { u8 v0; int v1, v2, v3, v4, v5; u32 v6, v7, v8; - UnkStruct_ov104_0223BFFC * v9; - BattleParams * v10; - Pokemon * v11; - Pokemon * v12; + UnkStruct_ov104_0223BFFC *v9; + BattleParams *v10; + Pokemon *v11; + Pokemon *v12; v9 = sub_0209B978(param0->unk_00->unk_00); v10 = v9->unk_0C; @@ -222,11 +221,11 @@ BOOL ov104_02237460 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022375F8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022375F8(UnkStruct_ov104_0222E930 *param0) { - BattleParams * v0; - UnkStruct_ov104_0223BFFC * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + BattleParams *v0; + UnkStruct_ov104_0223BFFC *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); v1 = sub_0209B978(param0->unk_00->unk_00); v0 = ov104_0223BDD8(v1, v2); @@ -237,10 +236,10 @@ BOOL ov104_022375F8 (UnkStruct_ov104_0222E930 * param0) return 1; } -static void ov104_02237634 (UnkStruct_ov104_02238240 * param0, UnkStruct_ov104_0223BFFC * param1) +static void ov104_02237634(UnkStruct_ov104_02238240 *param0, UnkStruct_ov104_0223BFFC *param1) { int v0, v1; - Pokemon * v2; + Pokemon *v2; param0->unk_04 = param1->unk_10; param0->unk_1E = ov104_0223C124(param1); @@ -275,10 +274,10 @@ static void ov104_02237634 (UnkStruct_ov104_02238240 * param0, UnkStruct_ov104_0 return; } -static void ov104_0223770C (void * param0) +static void ov104_0223770C(void *param0) { int v0; - UnkStruct_ov104_02238240 * v1 = param0; + UnkStruct_ov104_02238240 *v1 = param0; ov104_02238240(v1->unk_3C, param0); Heap_FreeToHeap(param0); @@ -286,9 +285,9 @@ static void ov104_0223770C (void * param0) return; } -BOOL ov104_02237720 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237720(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BFFC * v0; + UnkStruct_ov104_0223BFFC *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_022384D4(v0); @@ -296,9 +295,9 @@ BOOL ov104_02237720 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02237734 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237734(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BFFC * v0; + UnkStruct_ov104_0223BFFC *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_022384DC(v0); @@ -306,24 +305,24 @@ BOOL ov104_02237734 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237748(UnkStruct_ov104_0222E930 *param0) { - Strbuf* v0; - Pokemon * v1; - Party * v2; - UnkStruct_ov104_0223BFFC * v3; + Strbuf *v0; + Pokemon *v1; + Party *v2; + UnkStruct_ov104_0223BFFC *v3; u8 v4, v5, v6; u32 v7[9][2]; u32 v8, v9; u16 v10; int v11, v12, v13; - UnkStruct_ov104_02230BE4 * v14; - UnkStruct_ov104_0223C4CC * v15; - TrainerInfo * v16; + UnkStruct_ov104_02230BE4 *v14; + UnkStruct_ov104_0223C4CC *v15; + TrainerInfo *v16; u8 v17 = (*((param0)->unk_1C++)); u8 v18 = ov104_0222FC00(param0); u8 v19 = ov104_0222FC00(param0); - u16 * v20 = ov104_0222FBE4(param0); + u16 *v20 = ov104_0222FBE4(param0); v3 = sub_0209B978(param0->unk_00->unk_00); v14 = sub_0209B970(param0->unk_00->unk_00); @@ -405,8 +404,8 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0) { VecFx32 v21; VecFx32 v22; - GraphicElementData * v23; - GraphicElementData * v24; + GraphicElementData *v23; + GraphicElementData *v24; for (v11 = 0; v11 < v4; v11++) { v23 = v3->unk_30[v11]->unk_00; @@ -522,8 +521,8 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0) } else { { u32 v25; - UnkStruct_ov104_0223C634 * v26; - GraphicElementData * v27; + UnkStruct_ov104_0223C634 *v26; + GraphicElementData *v27; v26 = ov104_0223D5A8(param0->unk_00->unk_00, v19); v25 = ov63_0222D050(v26->unk_04); @@ -570,11 +569,11 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0) return 0; } -static void ov104_02237C0C (UnkStruct_ov104_0222E930 * param0, UnkStruct_ov104_0223BFFC * param1, u16 param2) +static void ov104_02237C0C(UnkStruct_ov104_0222E930 *param0, UnkStruct_ov104_0223BFFC *param1, u16 param2) { - UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - UnkStruct_ov104_0223C4CC * v1 = ov104_0222E924(param0->unk_00); - UnkStruct_02014014 * v2; + UnkStruct_ov104_022320B4 *v0 = param0->unk_00; + UnkStruct_ov104_0223C4CC *v1 = ov104_0222E924(param0->unk_00); + UnkStruct_02014014 *v2; v2 = ov104_0223D6D0(v1->unk_10, 0); sub_020146F4(v2, param2, ov104_02237C30, param1); @@ -582,12 +581,12 @@ static void ov104_02237C0C (UnkStruct_ov104_0222E930 * param0, UnkStruct_ov104_0 return; } -static void ov104_02237C30 (UnkSPLStruct6 * param0) +static void ov104_02237C30(UnkSPLStruct6 *param0) { VecFx32 v0; VecFx16 v1; - UnkStruct_ov104_0223BFFC * v2 = sub_02014764(); - const VecFx32 v3[] = {FX32_ONE * -1, 0, 0}; + UnkStruct_ov104_0223BFFC *v2 = sub_02014764(); + const VecFx32 v3[] = { FX32_ONE * -1, 0, 0 }; if (v2->unk_A7A == 1) { sub_02014798(param0, &v1); @@ -600,10 +599,10 @@ static void ov104_02237C30 (UnkSPLStruct6 * param0) return; } -BOOL ov104_02237CAC (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237CAC(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BFFC * v0; - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_ov104_0223BFFC *v0; + u16 *v1 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v1 = v0->unk_28; @@ -611,12 +610,12 @@ BOOL ov104_02237CAC (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02237CC8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237CC8(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BFFC * v0; + UnkStruct_ov104_0223BFFC *v0; u16 v1 = ov104_0222FC00(param0); u16 v2 = ov104_0222FC00(param0); - u16 * v3 = ov104_0222FBE4(param0); + u16 *v3 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v3 = ov104_02238B40(v0, v1, v2); @@ -624,7 +623,7 @@ BOOL ov104_02237CC8 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02237CF8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237CF8(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); @@ -634,9 +633,9 @@ BOOL ov104_02237CF8 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02237D18 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02237D18(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BFFC * v0; + UnkStruct_ov104_0223BFFC *v0; u16 v1 = ov104_0222FC8C(param0, param0->unk_78[0]); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -649,11 +648,11 @@ static BOOL ov104_02237D18 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02237D48 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237D48(UnkStruct_ov104_0222E930 *param0) { - u16 * v0; - UnkStruct_ov104_0223BFFC * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + u16 *v0; + UnkStruct_ov104_0223BFFC *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); u16 v3 = (*((param0)->unk_1C++)); v1 = sub_0209B978(param0->unk_00->unk_00); @@ -668,9 +667,9 @@ BOOL ov104_02237D48 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02237D84 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237D84(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BFFC * v0; + UnkStruct_ov104_0223BFFC *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_02238B88(v0, v0->unk_13); @@ -678,10 +677,10 @@ BOOL ov104_02237D84 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02237D98 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02237D98(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_ov104_0223BFFC * v0; - UnkStruct_ov104_0223C4CC * v1 = ov104_0222E924(param0->unk_00); + UnkStruct_ov104_0223BFFC *v0; + UnkStruct_ov104_0223C4CC *v1 = ov104_0222E924(param0->unk_00); u16 v2 = ov104_0222FC00(param0); u16 v3 = ov104_0222FC00(param0); u16 v4 = ov104_0222FC00(param0); diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c index 28751edb50..143f9bc060 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/ov104_02237DD8.c @@ -1,155 +1,155 @@ +#include "overlay104/ov104_02237DD8.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_020305B8_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0204B184.h" + +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222ECE8.h" +#include "overlay104/ov104_02231F74.h" +#include "overlay104/ov104_0223BCBC.h" #include "overlay104/struct_ov104_02238240.h" #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223A348_sub2.h" #include "overlay104/struct_ov104_0223BFFC.h" #include "overlay104/struct_ov104_0223C4CC.h" -#include "unk_02002F38.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "unk_02002F38.h" #include "unk_02006E3C.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_02030494.h" #include "unk_0203061C.h" -#include "vars_flags.h" #include "unk_0205DFC4.h" #include "unk_0206AFE0.h" -#include "pokemon.h" -#include "party.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222ECE8.h" -#include "overlay104/ov104_02231F74.h" -#include "overlay104/ov104_02237DD8.h" -#include "overlay104/ov104_0223BCBC.h" +#include "vars_flags.h" typedef struct { s16 unk_00; s16 unk_02; } UnkStruct_ov104_0223FB18; -typedef void (* UnkFuncPtr_ov104_02238B88)(UnkStruct_ov104_0223BFFC *, Party *, u8); - -UnkStruct_ov104_0223BFFC * ov104_02237DD8(SaveData * param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 * param6); -void ov104_0223806C(UnkStruct_ov104_0223BFFC * param0, u16 param1); -static void ov104_02238080(UnkStruct_ov104_0223BFFC * param0); -static void ov104_02238114(UnkStruct_ov104_0223BFFC * param0); -static void ov104_022381C4(UnkStruct_ov104_0223BFFC * param0); -void ov104_02238210(UnkStruct_ov104_0223BFFC * param0); -void ov104_02238240(UnkStruct_ov104_0223BFFC * param0, void * param1); -u16 ov104_02238264(void * param0, u8 param1); -void ov104_022384D4(UnkStruct_ov104_0223BFFC * param0); -void ov104_022384DC(UnkStruct_ov104_0223BFFC * param0); -int ov104_02238538(UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * param2, int param3); -static int ov104_02238584(UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * param2, u8 param3); -void ov104_02238658(void * param0, UnkStruct_ov104_0223C4CC * param1); -void ov104_02238728(void * param0, UnkStruct_ov104_0223C4CC * param1); -void ov104_02238764(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2); -void ov104_02238814(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2); -void ov104_0223886C(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2, u16 param3); -void ov104_022388A4(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2, u16 param3); -void ov104_022388DC(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2); -void ov104_022389A0(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2); -void ov104_022389F4(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2, u16 param3, u16 param4); +typedef void (*UnkFuncPtr_ov104_02238B88)(UnkStruct_ov104_0223BFFC *, Party *, u8); + +UnkStruct_ov104_0223BFFC *ov104_02237DD8(SaveData *param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 *param6); +void ov104_0223806C(UnkStruct_ov104_0223BFFC *param0, u16 param1); +static void ov104_02238080(UnkStruct_ov104_0223BFFC *param0); +static void ov104_02238114(UnkStruct_ov104_0223BFFC *param0); +static void ov104_022381C4(UnkStruct_ov104_0223BFFC *param0); +void ov104_02238210(UnkStruct_ov104_0223BFFC *param0); +void ov104_02238240(UnkStruct_ov104_0223BFFC *param0, void *param1); +u16 ov104_02238264(void *param0, u8 param1); +void ov104_022384D4(UnkStruct_ov104_0223BFFC *param0); +void ov104_022384DC(UnkStruct_ov104_0223BFFC *param0); +int ov104_02238538(UnkStruct_ov104_0223BFFC *param0, Party *param1, Party *param2, int param3); +static int ov104_02238584(UnkStruct_ov104_0223BFFC *param0, Party *param1, Party *param2, u8 param3); +void ov104_02238658(void *param0, UnkStruct_ov104_0223C4CC *param1); +void ov104_02238728(void *param0, UnkStruct_ov104_0223C4CC *param1); +void ov104_02238764(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2); +void ov104_02238814(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2); +void ov104_0223886C(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2, u16 param3); +void ov104_022388A4(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2, u16 param3); +void ov104_022388DC(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2); +void ov104_022389A0(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2); +void ov104_022389F4(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2, u16 param3, u16 param4); void ov104_02238AB4(u8 param0, u8 param1); -BOOL ov104_02238B40(UnkStruct_ov104_0223BFFC * param0, u16 param1, u16 param2); -void ov104_02238278(UnkStruct_ov104_0223BFFC * param0, u8 param1); -u16 ov104_02238454(UnkStruct_ov104_0223BFFC * param0); -u16 ov104_02238460(UnkStruct_ov104_0223BFFC * param0); -u16 ov104_02238464(UnkStruct_ov104_0223BFFC * param0, u8 param1); -u16 ov104_02238498(UnkStruct_ov104_0223BFFC * param0, u8 param1); -void ov104_022384A8(UnkStruct_ov104_0223BFFC * param0); -void ov104_022384B4(UnkStruct_ov104_0223BFFC * param0); -static void ov104_02238BBC(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238C18(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238C9C(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238D14(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238D8C(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238E08(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238E9C(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238EF8(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238F54(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238FAC(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238FB8(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238FC0(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238FC8(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238FD0(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238FD8(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238FE4(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238FF0(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02238FFC(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02239004(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02239008(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_0223900C(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -static void ov104_02239010(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2); -u16 ov104_02239014(UnkStruct_ov104_0223BFFC * param0); -void ov104_02239054(Party * param0, Party * param1, int param2, int param3); +BOOL ov104_02238B40(UnkStruct_ov104_0223BFFC *param0, u16 param1, u16 param2); +void ov104_02238278(UnkStruct_ov104_0223BFFC *param0, u8 param1); +u16 ov104_02238454(UnkStruct_ov104_0223BFFC *param0); +u16 ov104_02238460(UnkStruct_ov104_0223BFFC *param0); +u16 ov104_02238464(UnkStruct_ov104_0223BFFC *param0, u8 param1); +u16 ov104_02238498(UnkStruct_ov104_0223BFFC *param0, u8 param1); +void ov104_022384A8(UnkStruct_ov104_0223BFFC *param0); +void ov104_022384B4(UnkStruct_ov104_0223BFFC *param0); +static void ov104_02238BBC(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238C18(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238C9C(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238D14(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238D8C(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238E08(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238E9C(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238EF8(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238F54(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238FAC(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238FB8(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238FC0(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238FC8(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238FD0(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238FD8(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238FE4(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238FF0(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02238FFC(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02239004(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02239008(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_0223900C(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +static void ov104_02239010(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2); +u16 ov104_02239014(UnkStruct_ov104_0223BFFC *param0); +void ov104_02239054(Party *param0, Party *param1, int param2, int param3); static const u16 Unk_ov104_0223FBBA[32][3] = { - {0x59, 0x3A, 0x90}, - {0x5A, 0x3C, 0x91}, - {0x5B, 0x3E, 0x92}, - {0x5C, 0x40, 0x93}, - {0x5D, 0x42, 0x94}, - {0x5E, 0x44, 0x95}, - {0x5F, 0x46, 0x96}, - {0x60, 0x48, 0x97}, - {0x61, 0x4A, 0x98}, - {0x59, 0x39, 0x90}, - {0x5A, 0x3B, 0x91}, - {0x5B, 0x3D, 0x92}, - {0x5C, 0x3F, 0x93}, - {0x5D, 0x41, 0x94}, - {0x5E, 0x43, 0x95}, - {0x5F, 0x45, 0x96}, - {0x60, 0x47, 0x97}, - {0x61, 0x49, 0x98}, - {0x62, 0x4B, 0x99}, - {0x63, 0x4C, 0x9A}, - {0x64, 0x4D, 0x9B}, - {0x65, 0x4E, 0x9C}, - {0x66, 0x4F, 0x9D}, - {0x67, 0x50, 0x9E}, - {0x69, 0x52, 0xA0}, - {0x6A, 0x53, 0xA1}, - {0x6B, 0x54, 0xA2}, - {0x68, 0x51, 0x9F}, - {0x6D, 0x56, 0xA4}, - {0x6C, 0x55, 0xA3}, - {0x6E, 0x57, 0xA5}, - {0x6F, 0x58, 0xA6} + { 0x59, 0x3A, 0x90 }, + { 0x5A, 0x3C, 0x91 }, + { 0x5B, 0x3E, 0x92 }, + { 0x5C, 0x40, 0x93 }, + { 0x5D, 0x42, 0x94 }, + { 0x5E, 0x44, 0x95 }, + { 0x5F, 0x46, 0x96 }, + { 0x60, 0x48, 0x97 }, + { 0x61, 0x4A, 0x98 }, + { 0x59, 0x39, 0x90 }, + { 0x5A, 0x3B, 0x91 }, + { 0x5B, 0x3D, 0x92 }, + { 0x5C, 0x3F, 0x93 }, + { 0x5D, 0x41, 0x94 }, + { 0x5E, 0x43, 0x95 }, + { 0x5F, 0x45, 0x96 }, + { 0x60, 0x47, 0x97 }, + { 0x61, 0x49, 0x98 }, + { 0x62, 0x4B, 0x99 }, + { 0x63, 0x4C, 0x9A }, + { 0x64, 0x4D, 0x9B }, + { 0x65, 0x4E, 0x9C }, + { 0x66, 0x4F, 0x9D }, + { 0x67, 0x50, 0x9E }, + { 0x69, 0x52, 0xA0 }, + { 0x6A, 0x53, 0xA1 }, + { 0x6B, 0x54, 0xA2 }, + { 0x68, 0x51, 0x9F }, + { 0x6D, 0x56, 0xA4 }, + { 0x6C, 0x55, 0xA3 }, + { 0x6E, 0x57, 0xA5 }, + { 0x6F, 0x58, 0xA6 } }; static const u8 Unk_ov104_0223FAF8[][2] = { - {0x7, 0x5}, - {0x4, 0x4}, - {0x0, 0x3} + { 0x7, 0x5 }, + { 0x4, 0x4 }, + { 0x0, 0x3 } }; -UnkStruct_ov104_0223BFFC * ov104_02237DD8 (SaveData * param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 * param6) +UnkStruct_ov104_0223BFFC *ov104_02237DD8(SaveData *param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 *param6) { u32 v0, v1; - Party * v2; - Pokemon * v3; - UnkStruct_020304A0 * v4; + Party *v2; + Pokemon *v3; + UnkStruct_020304A0 *v4; u8 v5, v6; u16 v7, v8; - static UnkStruct_ov104_0223BFFC * v9; - UnkStruct_020305B8 * v10; + static UnkStruct_ov104_0223BFFC *v9; + UnkStruct_020305B8 *v10; v9 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov104_0223BFFC)); MI_CpuClear8(v9, sizeof(UnkStruct_ov104_0223BFFC)); @@ -234,7 +234,7 @@ UnkStruct_ov104_0223BFFC * ov104_02237DD8 (SaveData * param0, u16 param1, u8 par return v9; } -void ov104_0223806C (UnkStruct_ov104_0223BFFC * param0, u16 param1) +void ov104_0223806C(UnkStruct_ov104_0223BFFC *param0, u16 param1) { if (param1 == 0) { ov104_02238080(param0); @@ -245,13 +245,13 @@ void ov104_0223806C (UnkStruct_ov104_0223BFFC * param0, u16 param1) return; } -static void ov104_02238080 (UnkStruct_ov104_0223BFFC * param0) +static void ov104_02238080(UnkStruct_ov104_0223BFFC *param0) { u16 v0; int v1; UnkStruct_ov104_0223A348_sub2 v2; - Pokemon * v3; - Party * v4; + Pokemon *v3; + Party *v4; u16 v5[6]; u16 v6[6]; @@ -279,11 +279,11 @@ static void ov104_02238080 (UnkStruct_ov104_0223BFFC * param0) return; } -static void ov104_02238114 (UnkStruct_ov104_0223BFFC * param0) +static void ov104_02238114(UnkStruct_ov104_0223BFFC *param0) { u16 v0; int v1; - Pokemon * v2; + Pokemon *v2; u8 v3; UnkStruct_ov104_0223A348_sub2 v4[6]; u8 v5[6]; @@ -315,12 +315,12 @@ static void ov104_02238114 (UnkStruct_ov104_0223BFFC * param0) return; } -static void ov104_022381C4 (UnkStruct_ov104_0223BFFC * param0) +static void ov104_022381C4(UnkStruct_ov104_0223BFFC *param0) { u8 v0; u16 v1; int v2; - Pokemon * v3; + Pokemon *v3; v0 = Party_GetCurrentCount(param0->unk_70); @@ -334,7 +334,7 @@ static void ov104_022381C4 (UnkStruct_ov104_0223BFFC * param0) return; } -void ov104_02238210 (UnkStruct_ov104_0223BFFC * param0) +void ov104_02238210(UnkStruct_ov104_0223BFFC *param0) { int v0; @@ -358,10 +358,10 @@ void ov104_02238210 (UnkStruct_ov104_0223BFFC * param0) return; } -void ov104_02238240 (UnkStruct_ov104_0223BFFC * param0, void * param1) +void ov104_02238240(UnkStruct_ov104_0223BFFC *param0, void *param1) { int v0; - UnkStruct_ov104_02238240 * v1 = param1; + UnkStruct_ov104_02238240 *v1 = param1; for (v0 = 0; v0 < 6; v0++) { param0->unk_418[v0] = ov104_02238264(param1, v0); @@ -370,9 +370,9 @@ void ov104_02238240 (UnkStruct_ov104_0223BFFC * param0, void * param1) return; } -u16 ov104_02238264 (void * param0, u8 param1) +u16 ov104_02238264(void *param0, u8 param1) { - UnkStruct_ov104_02238240 * v0 = param0; + UnkStruct_ov104_02238240 *v0 = param0; if (param1 >= 6) { GF_ASSERT(0); @@ -382,7 +382,7 @@ u16 ov104_02238264 (void * param0, u8 param1) return v0->unk_38; } -void ov104_02238278 (UnkStruct_ov104_0223BFFC * param0, u8 param1) +void ov104_02238278(UnkStruct_ov104_0223BFFC *param0, u8 param1) { u16 v0; u8 v1; @@ -390,9 +390,9 @@ void ov104_02238278 (UnkStruct_ov104_0223BFFC * param0, u8 param1) u16 v3[4]; u32 v4[4]; u32 v5, v6; - Pokemon * v7; - UnkStruct_020304A0 * v8 = param0->unk_08; - UnkStruct_020305B8 * v9 = sub_020305B8(param0->unk_04); + Pokemon *v7; + UnkStruct_020304A0 *v8 = param0->unk_08; + UnkStruct_020305B8 *v9 = sub_020305B8(param0->unk_04); v1 = ov104_0223BDA4(param0->unk_10, 1); @@ -450,21 +450,21 @@ void ov104_02238278 (UnkStruct_ov104_0223BFFC * param0, u8 param1) return; } -u16 ov104_02238454 (UnkStruct_ov104_0223BFFC * param0) +u16 ov104_02238454(UnkStruct_ov104_0223BFFC *param0) { param0->unk_11++; return param0->unk_11; } -u16 ov104_02238460 (UnkStruct_ov104_0223BFFC * param0) +u16 ov104_02238460(UnkStruct_ov104_0223BFFC *param0) { return param0->unk_11; } -u16 ov104_02238464 (UnkStruct_ov104_0223BFFC * param0, u8 param1) +u16 ov104_02238464(UnkStruct_ov104_0223BFFC *param0, u8 param1) { UnkStruct_ov104_0223A348_sub1 v0; - UnkStruct_0204B184 * v1; + UnkStruct_0204B184 *v1; u8 v2; v2 = ov104_02238498(param0, param1); @@ -475,12 +475,12 @@ u16 ov104_02238464 (UnkStruct_ov104_0223BFFC * param0, u8 param1) return ov104_0222E10C(v0.unk_04); } -u16 ov104_02238498 (UnkStruct_ov104_0223BFFC * param0, u8 param1) +u16 ov104_02238498(UnkStruct_ov104_0223BFFC *param0, u8 param1) { return param0->unk_11 + (param1 * 7); } -void ov104_022384A8 (UnkStruct_ov104_0223BFFC * param0) +void ov104_022384A8(UnkStruct_ov104_0223BFFC *param0) { u16 v0[4]; int v1; @@ -489,7 +489,7 @@ void ov104_022384A8 (UnkStruct_ov104_0223BFFC * param0) return; } -void ov104_022384B4 (UnkStruct_ov104_0223BFFC * param0) +void ov104_022384B4(UnkStruct_ov104_0223BFFC *param0) { param0->unk_2F = 1; @@ -503,13 +503,13 @@ void ov104_022384B4 (UnkStruct_ov104_0223BFFC * param0) return; } -void ov104_022384D4 (UnkStruct_ov104_0223BFFC * param0) +void ov104_022384D4(UnkStruct_ov104_0223BFFC *param0) { ov104_0223C04C(param0); return; } -void ov104_022384DC (UnkStruct_ov104_0223BFFC * param0) +void ov104_022384DC(UnkStruct_ov104_0223BFFC *param0) { int v0, v1, v2; u8 v3; @@ -542,18 +542,18 @@ static const u8 Unk_ov104_0223FAE8[5] = { }; static const u8 Unk_ov104_0223FAFE[5][2] = { - {0x3, 0xA}, - {0x5, 0x6}, - {0x7, 0x4}, - {0x9, 0x2}, - {0xA, 0x0} + { 0x3, 0xA }, + { 0x5, 0x6 }, + { 0x7, 0x4 }, + { 0x9, 0x2 }, + { 0xA, 0x0 } }; -int ov104_02238538 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * param2, int param3) +int ov104_02238538(UnkStruct_ov104_0223BFFC *param0, Party *param1, Party *param2, int param3) { u8 v0; int v1; - Pokemon * v2; + Pokemon *v2; int v3; v3 = 0; @@ -571,13 +571,13 @@ int ov104_02238538 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * p return v3; } -static int ov104_02238584 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * param2, u8 param3) +static int ov104_02238584(UnkStruct_ov104_0223BFFC *param0, Party *param1, Party *param2, u8 param3) { u32 v0; u8 v1; u8 v2; int v3, v4; - Pokemon * v5; + Pokemon *v5; v4 = 0; v1 = 0; @@ -627,10 +627,10 @@ static int ov104_02238584 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Pa return v4; } -void ov104_02238658 (void * param0, UnkStruct_ov104_0223C4CC * param1) +void ov104_02238658(void *param0, UnkStruct_ov104_0223C4CC *param1) { - NARC * v0; - UnkStruct_ov104_0223BFFC * v1; + NARC *v0; + UnkStruct_ov104_0223BFFC *v1; v1 = (UnkStruct_ov104_0223BFFC *)param0; @@ -641,8 +641,8 @@ void ov104_02238658 (void * param0, UnkStruct_ov104_0223C4CC * param1) sub_0200710C(v0, Unk_ov104_0223FBBA[v1->unk_13][1], param1->unk_00, 2, 0, 0, 1, 94); { - NNSG2dPaletteData * v2; - void * v3; + NNSG2dPaletteData *v2; + void *v3; v3 = sub_020071EC(v0, Unk_ov104_0223FBBA[v1->unk_13][2], &v2, 94); DC_FlushRange(v2->pRawData, v2->szByte); @@ -664,10 +664,10 @@ void ov104_02238658 (void * param0, UnkStruct_ov104_0223C4CC * param1) return; } -void ov104_02238728 (void * param0, UnkStruct_ov104_0223C4CC * param1) +void ov104_02238728(void *param0, UnkStruct_ov104_0223C4CC *param1) { - NARC * v0; - UnkStruct_ov104_0223BFFC * v1; + NARC *v0; + UnkStruct_ov104_0223BFFC *v1; v1 = (UnkStruct_ov104_0223BFFC *)param0; v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); @@ -680,24 +680,24 @@ void ov104_02238728 (void * param0, UnkStruct_ov104_0223C4CC * param1) } static const UnkStruct_ov104_0223FB18 Unk_ov104_0223FB18[] = { - {0x21, 0x14}, - {0x27, 0x2B}, - {0x2B, 0x42}, - {0x2E, 0x59} + { 0x21, 0x14 }, + { 0x27, 0x2B }, + { 0x2B, 0x42 }, + { 0x2E, 0x59 } }; static const UnkStruct_ov104_0223FB18 Unk_ov104_0223FB28[] = { - {0xDE, 0x14}, - {0xD8, 0x2B}, - {0xD5, 0x42}, - {0xD2, 0x59} + { 0xDE, 0x14 }, + { 0xD8, 0x2B }, + { 0xD5, 0x42 }, + { 0xD2, 0x59 } }; -void ov104_02238764 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2) +void ov104_02238764(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2) { u8 v0, v1; int v2; - Pokemon * v3; + Pokemon *v3; v0 = ov104_0223BD70(param0->unk_10, 1); v1 = ov104_0223BDA4(param0->unk_10, 1); @@ -719,7 +719,7 @@ void ov104_02238764 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC return; } -void ov104_02238814 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2) +void ov104_02238814(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2) { u8 v0, v1; int v2; @@ -740,7 +740,7 @@ void ov104_02238814 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC return; } -void ov104_0223886C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2, u16 param3) +void ov104_0223886C(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2, u16 param3) { u8 v0; @@ -759,7 +759,7 @@ void ov104_0223886C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC return; } -void ov104_022388A4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2, u16 param3) +void ov104_022388A4(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2, u16 param3) { u8 v0; @@ -778,11 +778,11 @@ void ov104_022388A4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC return; } -void ov104_022388DC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2) +void ov104_022388DC(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2) { u8 v0, v1; int v2; - Pokemon * v3; + Pokemon *v3; v0 = ov104_0223BD70(param0->unk_10, 1); v1 = ov104_0223BDA4(param0->unk_10, 1); @@ -812,7 +812,7 @@ void ov104_022388DC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC return; } -void ov104_022389A0 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2) +void ov104_022389A0(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2) { u8 v0, v1; int v2; @@ -833,11 +833,11 @@ void ov104_022389A0 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC return; } -void ov104_022389F4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2, u16 param3, u16 param4) +void ov104_022389F4(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *param1, u16 param2, u16 param3, u16 param4) { u32 v0; u8 v1, v2; - Pokemon * v3; + Pokemon *v3; v1 = ov104_0223BD70(param0->unk_10, 1); v2 = ov104_0223BDA4(param0->unk_10, 1); @@ -881,13 +881,13 @@ void ov104_022389F4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC return; } -void ov104_02238AB4 (u8 param0, u8 param1) +void ov104_02238AB4(u8 param0, u8 param1) { u32 v0, v1; - NNSG2dPaletteData * v2; - void * v3; - NARC * v4; - u16 * v5; + NNSG2dPaletteData *v2; + void *v3; + NARC *v4; + u16 *v5; if (param1 == 0) { v0 = 143; @@ -917,7 +917,7 @@ void ov104_02238AB4 (u8 param0, u8 param1) return; } -BOOL ov104_02238B40 (UnkStruct_ov104_0223BFFC * param0, u16 param1, u16 param2) +BOOL ov104_02238B40(UnkStruct_ov104_0223BFFC *param0, u16 param1, u16 param2) { int v0; @@ -989,7 +989,7 @@ static const u16 Unk_ov104_0223FB62[] = { 0x11F }; -static const u16 * Unk_ov104_02241A2C[] = { +static const u16 *Unk_ov104_02241A2C[] = { Unk_ov104_0223FB4C, Unk_ov104_0223FB78, Unk_ov104_0223FB62 @@ -1042,13 +1042,13 @@ static const u16 Unk_ov104_0223FB38[] = { 0xCF }; -static const u16 * Unk_ov104_02241A20[] = { +static const u16 *Unk_ov104_02241A20[] = { Unk_ov104_0223FB08, Unk_ov104_0223FB92, Unk_ov104_0223FB38 }; -static void * Unk_ov104_02241A38[] = { +static void *Unk_ov104_02241A38[] = { ov104_02238BBC, ov104_02238C18, ov104_02238C9C, @@ -1083,10 +1083,10 @@ static void * Unk_ov104_02241A38[] = { ov104_02239008 }; -void ov104_02238B88 (UnkStruct_ov104_0223BFFC * param0, u8 param1) +void ov104_02238B88(UnkStruct_ov104_0223BFFC *param0, u8 param1) { u8 v0; - Party * v1; + Party *v1; UnkFuncPtr_ov104_02238B88 v2; if (param1 < 9) { @@ -1103,11 +1103,11 @@ void ov104_02238B88 (UnkStruct_ov104_0223BFFC * param0, u8 param1) return; } -static void ov104_02238BBC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238BBC(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { int v0; u32 v1, v2; - Pokemon * v3; + Pokemon *v3; for (v0 = 0; v0 < param2; v0++) { v3 = Party_GetPokemonBySlotIndex(param1, v0); @@ -1122,11 +1122,11 @@ static void ov104_02238BBC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238C18 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238C18(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { int v0, v1; u32 v2, v3, v4, v5; - Pokemon * v6; + Pokemon *v6; v1 = 0; @@ -1151,11 +1151,11 @@ static void ov104_02238C18 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238C9C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238C9C(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { int v0, v1; u32 v2, v3, v4, v5; - Pokemon * v6; + Pokemon *v6; v1 = 0; @@ -1180,11 +1180,11 @@ static void ov104_02238C9C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238D14 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238D14(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { int v0, v1; u32 v2, v3, v4, v5; - Pokemon * v6; + Pokemon *v6; v1 = 0; @@ -1209,12 +1209,12 @@ static void ov104_02238D14 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238D8C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238D8C(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { u8 v0; int v1, v2; u32 v3, v4; - Pokemon * v5; + Pokemon *v5; v2 = 0; v0 = (param0->unk_20 % param2); @@ -1244,12 +1244,12 @@ static void ov104_02238D8C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238E08 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238E08(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { u8 v0; int v1, v2; u32 v3, v4, v5, v6; - Pokemon * v7; + Pokemon *v7; v2 = 0; v0 = (param0->unk_20 % param2); @@ -1282,12 +1282,12 @@ static void ov104_02238E08 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238E9C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238E9C(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { int v0, v1; - const u16 * v2; + const u16 *v2; u16 v3, v4; - Pokemon * v5; + Pokemon *v5; v4 = ov104_0223C124(param0); @@ -1312,12 +1312,12 @@ static void ov104_02238E9C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238EF8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238EF8(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { int v0, v1; - const u16 * v2; + const u16 *v2; u16 v3, v4; - Pokemon * v5; + Pokemon *v5; v4 = ov104_0223C124(param0); @@ -1342,11 +1342,11 @@ static void ov104_02238EF8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238F54 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238F54(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { int v0; u32 v1, v2; - Pokemon * v3; + Pokemon *v3; for (v0 = 0; v0 < param2; v0++) { v3 = Party_GetPokemonBySlotIndex(param1, v0); @@ -1367,57 +1367,57 @@ static void ov104_02238F54 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238FAC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238FAC(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; param0->unk_14 = 1001; return; } -static void ov104_02238FB8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238FB8(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; param0->unk_14 = 2; return; } -static void ov104_02238FC0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238FC0(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; param0->unk_14 = 10; return; } -static void ov104_02238FC8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238FC8(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; param0->unk_14 = 5; return; } -static void ov104_02238FD0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238FD0(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; param0->unk_14 = 14; return; } -static void ov104_02238FD8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238FD8(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; param0->unk_14 = 1002; return; } -static void ov104_02238FE4 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238FE4(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; if (param0->unk_1C < (8 - 1)) { param0->unk_1C++; @@ -1426,9 +1426,9 @@ static void ov104_02238FE4 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238FF0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238FF0(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; if (param0->unk_1C > 0) { param0->unk_1C--; @@ -1437,46 +1437,46 @@ static void ov104_02238FF0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u return; } -static void ov104_02238FFC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02238FFC(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; param0->unk_12 = 1; return; } -static void ov104_02239004 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02239004(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; return; } -static void ov104_02239008 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02239008(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { u16 v0; - Pokemon * v1; + Pokemon *v1; return; } -static void ov104_0223900C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_0223900C(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; return; } -static void ov104_02239010 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2) +static void ov104_02239010(UnkStruct_ov104_0223BFFC *param0, Party *param1, u8 param2) { - Pokemon * v0; + Pokemon *v0; return; } -u16 ov104_02239014 (UnkStruct_ov104_0223BFFC * param0) +u16 ov104_02239014(UnkStruct_ov104_0223BFFC *param0) { u8 v0; u16 v1; - static const u8 v2[8 + 1] = {0, 2, 2, 2, 2, 4, 4, 5, 6}; - static const u8 v3[8 + 1] = {0, 7, 8, 9, 10, 13, 14, 16, 17}; + static const u8 v2[8 + 1] = { 0, 2, 2, 2, 2, 4, 4, 5, 6 }; + static const u8 v3[8 + 1] = { 0, 7, 8, 9, 10, 13, 14, 16, 17 }; v1 = param0->unk_1A; @@ -1503,11 +1503,11 @@ u16 ov104_02239014 (UnkStruct_ov104_0223BFFC * param0) return v0; } -void ov104_02239054 (Party * param0, Party * param1, int param2, int param3) +void ov104_02239054(Party *param0, Party *param1, int param2, int param3) { u16 v0; - Pokemon * v1; - Pokemon * v2; + Pokemon *v1; + Pokemon *v2; v2 = Party_GetPokemonBySlotIndex(param0, param2); v0 = Pokemon_GetValue(v2, MON_DATA_HELD_ITEM, NULL); diff --git a/src/overlay104/ov104_02239080.c b/src/overlay104/ov104_02239080.c index db6be7f675..48b647fdae 100644 --- a/src/overlay104/ov104_02239080.c +++ b/src/overlay104/ov104_02239080.c @@ -1,38 +1,37 @@ #include #include +#include "overlay104/ov104_0222E930.h" +#include "overlay104/ov104_0222FBE4.h" #include "overlay104/struct_ov104_0222E930_decl.h" - #include "overlay104/struct_ov104_0222E930_t.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay104/ov104_0222E930.h" -#include "overlay104/ov104_0222FBE4.h" -static BOOL ov104_022390C0(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_022390F8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239080(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239090(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022390A0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022390D8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022390E8(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223910C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223911C(UnkStruct_ov104_0222E930 * param0); - -BOOL ov104_02239080 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022390C0(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_022390F8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239080(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239090(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022390A0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022390D8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022390E8(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223910C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223911C(UnkStruct_ov104_0222E930 *param0); + +BOOL ov104_02239080(UnkStruct_ov104_0222E930 *param0) { Sound_PlayEffect(ov104_0222FC00(param0)); return 0; } -BOOL ov104_02239090 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239090(UnkStruct_ov104_0222E930 *param0) { sub_020057A4(ov104_0222FC00(param0), 0); return 0; } -BOOL ov104_022390A0 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022390A0(UnkStruct_ov104_0222E930 *param0) { param0->unk_78[0] = ov104_0222FC00(param0); ov104_0222E974(param0, ov104_022390C0); @@ -40,7 +39,7 @@ BOOL ov104_022390A0 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_022390C0 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022390C0(UnkStruct_ov104_0222E930 *param0) { if (Sound_IsEffectPlaying(param0->unk_78[0]) == 0) { return 1; @@ -49,19 +48,19 @@ static BOOL ov104_022390C0 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022390D8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022390D8(UnkStruct_ov104_0222E930 *param0) { sub_02006150(ov104_0222EA48(param0)); return 0; } -BOOL ov104_022390E8 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022390E8(UnkStruct_ov104_0222E930 *param0) { ov104_0222E974(param0, ov104_022390F8); return 1; } -static BOOL ov104_022390F8 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_022390F8(UnkStruct_ov104_0222E930 *param0) { if (sub_020061E4() == 0) { return 1; @@ -70,13 +69,13 @@ static BOOL ov104_022390F8 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_0223910C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223910C(UnkStruct_ov104_0222E930 *param0) { Sound_PlayBGM(ov104_0222EA48(param0)); return 0; } -BOOL ov104_0223911C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223911C(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); diff --git a/src/overlay104/ov104_02239130.c b/src/overlay104/ov104_02239130.c index 2ab40d7d34..697b01dd6d 100644 --- a/src/overlay104/ov104_02239130.c +++ b/src/overlay104/ov104_02239130.c @@ -1,56 +1,55 @@ #include +#include #include #include "struct_decls/struct_0202440C_decl.h" -#include "pokemon.h" -#include "savedata.h" -#include "overlay104/struct_ov104_0222E930_decl.h" - -#include "constdata/const_020EA358.h" - #include "struct_defs/struct_0204AFC4.h" + #include "overlay006/battle_params.h" +#include "overlay104/ov104_0222E930.h" +#include "overlay104/ov104_0222FBE4.h" +#include "overlay104/ov104_02231F74.h" +#include "overlay104/ov104_022394A4.h" +#include "overlay104/ov104_0223A0C4.h" +#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_0222E930_t.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_022320B4_t.h" +#include "savedata/save_table.h" +#include "communication_system.h" +#include "pokemon.h" +#include "savedata.h" #include "unk_020041CC.h" -#include "savedata/save_table.h" #include "unk_0202CD50.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_02049D08.h" #include "unk_02051D8C.h" #include "unk_0206CCB0.h" #include "unk_0209B6F8.h" -#include "overlay104/ov104_0222E930.h" -#include "overlay104/ov104_0222FBE4.h" -#include "overlay104/ov104_02231F74.h" -#include "overlay104/ov104_022394A4.h" -#include "overlay104/ov104_0223A0C4.h" -#include +#include "constdata/const_020EA358.h" -BOOL ov104_02239130(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022392C0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239300(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239314(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239364(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223939C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239400(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_0223942C(UnkStruct_ov104_0222E930 * param0); -static u16 ov104_0223927C(UnkStruct_0204AFC4 * param0, u8 param1); -static BOOL ov104_02239464(UnkStruct_ov104_0222E930 * param0, UnkStruct_0204AFC4 * param1, SaveData * param2, u16 param3, u16 param4); - -BOOL ov104_02239130 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239130(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022392C0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239300(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239314(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239364(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223939C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239400(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_0223942C(UnkStruct_ov104_0222E930 *param0); +static u16 ov104_0223927C(UnkStruct_0204AFC4 *param0, u8 param1); +static BOOL ov104_02239464(UnkStruct_ov104_0222E930 *param0, UnkStruct_0204AFC4 *param1, SaveData *param2, u16 param3, u16 param4); + +BOOL ov104_02239130(UnkStruct_ov104_0222E930 *param0) { - TVBroadcast * v0; - Pokemon * v1; - UnkStruct_0204AFC4 * v2; + TVBroadcast *v0; + Pokemon *v1; + UnkStruct_0204AFC4 *v2; int v3, v4; u16 v5, v6; - u16 * v7; - UnkStruct_ov104_02230BE4 * v8 = sub_0209B970(param0->unk_00->unk_00); + u16 *v7; + UnkStruct_ov104_02230BE4 *v8 = sub_0209B970(param0->unk_00->unk_00); v5 = ov104_0222EA48(param0); v6 = ov104_0222FC00(param0); @@ -124,7 +123,7 @@ BOOL ov104_02239130 (UnkStruct_ov104_0222E930 * param0) return 0; } -static u16 ov104_0223927C (UnkStruct_0204AFC4 * param0, u8 param1) +static u16 ov104_0223927C(UnkStruct_0204AFC4 *param0, u8 param1) { static const u16 v0[] = { 0x8d, @@ -157,12 +156,12 @@ static u16 ov104_0223927C (UnkStruct_0204AFC4 * param0, u8 param1) } } -BOOL ov104_022392C0 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022392C0(UnkStruct_ov104_0222E930 *param0) { u8 v0; - u16 * v1; - UnkStruct_0204AFC4 * v2; - UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0->unk_00->unk_00); + u16 *v1; + UnkStruct_0204AFC4 *v2; + UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00); u16 v4 = (*((param0)->unk_1C++)); v2 = sub_0209B978(param0->unk_00->unk_00); @@ -177,9 +176,9 @@ BOOL ov104_022392C0 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02239300 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239300(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0204AFC4 * v0; + UnkStruct_0204AFC4 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); sub_0204A32C(v0); @@ -187,11 +186,11 @@ BOOL ov104_02239300 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02239314 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239314(UnkStruct_ov104_0222E930 *param0) { - BattleParams * v0; - UnkStruct_0204AFC4 * v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_00->unk_00); + BattleParams *v0; + UnkStruct_0204AFC4 *v1; + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_00->unk_00); v1 = sub_0209B978(param0->unk_00->unk_00); v0 = ov104_0223A580(v1, v2); @@ -204,11 +203,11 @@ BOOL ov104_02239314 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02239364 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239364(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0204AFC4 * v0; - BattleParams * v1; - u16 * v2; + UnkStruct_0204AFC4 *v0; + BattleParams *v1; + u16 *v2; v0 = sub_0209B978(param0->unk_00->unk_00); v2 = ov104_0222FBE4(param0); @@ -221,13 +220,13 @@ BOOL ov104_02239364 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_0223939C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223939C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0204AFC4 * v0; - UnkStruct_ov104_02230BE4 * v1 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_0204AFC4 *v0; + UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00); u16 v2 = ov104_0222FC00(param0); u16 v3 = ov104_0222FC00(param0); - u16 * v4 = ov104_0222FBE4(param0); + u16 *v4 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -250,7 +249,7 @@ BOOL ov104_0223939C (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02239400 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239400(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); u16 v1 = ov104_0222EA48(param0); @@ -262,10 +261,10 @@ BOOL ov104_02239400 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_0223942C (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_0223942C(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0204AFC4 * v0; - UnkStruct_ov104_02230BE4 * v1 = sub_0209B970(param0->unk_00->unk_00); + UnkStruct_0204AFC4 *v0; + UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -276,10 +275,10 @@ static BOOL ov104_0223942C (UnkStruct_ov104_0222E930 * param0) return 0; } -static BOOL ov104_02239464 (UnkStruct_ov104_0222E930 * param0, UnkStruct_0204AFC4 * param1, SaveData * param2, u16 param3, u16 param4) +static BOOL ov104_02239464(UnkStruct_ov104_0222E930 *param0, UnkStruct_0204AFC4 *param1, SaveData *param2, u16 param3, u16 param4) { - u16 * v0; - const void * v1; + u16 *v0; + const void *v1; v1 = sub_0203664C(1 - CommSys_CurNetId()); diff --git a/src/overlay104/ov104_022394A4.c b/src/overlay104/ov104_022394A4.c index b2c8c65af3..c9563466d9 100644 --- a/src/overlay104/ov104_022394A4.c +++ b/src/overlay104/ov104_022394A4.c @@ -1,21 +1,21 @@ #include #include -#include "savedata.h" - #include "struct_defs/struct_0204AFC4.h" -#include "unk_0206B9D8.h" #include "overlay104/ov104_0222DCE0.h" #include "overlay104/ov104_0223A0C4.h" -void ov104_022394A4(UnkStruct_0204AFC4 * param0, SaveData * param1); -u16 ov104_02239588(UnkStruct_0204AFC4 * param0, u16 param1); -void ov104_022395A0(UnkStruct_0204AFC4 * param0, u16 param1); -u16 ov104_022395B4(UnkStruct_0204AFC4 * param0); -u16 ov104_022395D8(UnkStruct_0204AFC4 * param0); +#include "savedata.h" +#include "unk_0206B9D8.h" + +void ov104_022394A4(UnkStruct_0204AFC4 *param0, SaveData *param1); +u16 ov104_02239588(UnkStruct_0204AFC4 *param0, u16 param1); +void ov104_022395A0(UnkStruct_0204AFC4 *param0, u16 param1); +u16 ov104_022395B4(UnkStruct_0204AFC4 *param0); +u16 ov104_022395D8(UnkStruct_0204AFC4 *param0); -void ov104_022394A4 (UnkStruct_0204AFC4 * param0, SaveData * param1) +void ov104_022394A4(UnkStruct_0204AFC4 *param0, SaveData *param1) { int v0; u16 v1[2]; @@ -46,17 +46,17 @@ void ov104_022394A4 (UnkStruct_0204AFC4 * param0, SaveData * param1) } } -u16 ov104_02239588 (UnkStruct_0204AFC4 * param0, u16 param1) +u16 ov104_02239588(UnkStruct_0204AFC4 *param0, u16 param1) { return ov104_0222E10C(param0->unk_78[param1].unk_00.unk_04); } -void ov104_022395A0 (UnkStruct_0204AFC4 * param0, u16 param1) +void ov104_022395A0(UnkStruct_0204AFC4 *param0, u16 param1) { param0->unk_10_1 = param1; } -u16 ov104_022395B4 (UnkStruct_0204AFC4 * param0) +u16 ov104_022395B4(UnkStruct_0204AFC4 *param0) { ++param0->unk_0D; @@ -67,7 +67,7 @@ u16 ov104_022395B4 (UnkStruct_0204AFC4 * param0) return ++param0->unk_0C; } -u16 ov104_022395D8 (UnkStruct_0204AFC4 * param0) +u16 ov104_022395D8(UnkStruct_0204AFC4 *param0) { if ((u32)param0->unk_1A + param0->unk_0D > 0xFFFF) { return 0xFFFF; diff --git a/src/overlay104/ov104_022395F0.c b/src/overlay104/ov104_022395F0.c index 12d0b74897..ca520dd8cf 100644 --- a/src/overlay104/ov104_022395F0.c +++ b/src/overlay104/ov104_022395F0.c @@ -1,55 +1,54 @@ #include +#include #include #include "struct_decls/struct_0202D750_decl.h" -#include "overlay104/struct_ov104_0222E930_decl.h" - #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0209BBA4.h" + +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222E930.h" +#include "overlay104/ov104_0222FBE4.h" +#include "overlay104/ov104_02239C58.h" +#include "overlay104/ov104_0223C164.h" +#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_0222E930_t.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_022320B4_t.h" +#include "communication_system.h" #include "heap.h" +#include "party.h" #include "unk_0202D05C.h" #include "unk_02030108.h" #include "unk_0203061C.h" -#include "communication_system.h" #include "unk_02049D08.h" #include "unk_0204FA34.h" #include "unk_0205DFC4.h" -#include "party.h" #include "unk_02096420.h" #include "unk_0209B6F8.h" #include "unk_0209BA80.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222E930.h" -#include "overlay104/ov104_0222FBE4.h" -#include "overlay104/ov104_02239C58.h" -#include "overlay104/ov104_0223C164.h" - -#include -BOOL ov104_022395F0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239610(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239624(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239660(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02239680(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022396A4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022396D4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_0223971C(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239794(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_022397B0(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239B14(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239BF4(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239C10(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02239C20(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239C44(UnkStruct_ov104_0222E930 * param0); - -BOOL ov104_022395F0 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022395F0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239610(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239624(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239660(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02239680(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022396A4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022396D4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_0223971C(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239794(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_022397B0(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239B14(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239BF4(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239C10(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02239C20(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239C44(UnkStruct_ov104_0222E930 *param0); + +BOOL ov104_022395F0(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0209BBA4 * v0; - UnkStruct_ov104_02230BE4 * v1; + UnkStruct_0209BBA4 *v0; + UnkStruct_ov104_02230BE4 *v1; v1 = sub_0209B970(param0->unk_00->unk_00); v0 = ov104_02239C58(v1->unk_08); @@ -58,9 +57,9 @@ BOOL ov104_022395F0 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02239610 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239610(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0209BBA4 * v0; + UnkStruct_0209BBA4 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); ov104_02239C7C(v0); @@ -68,13 +67,13 @@ BOOL ov104_02239610 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02239624 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239624(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0209BBA4 * v0; + UnkStruct_0209BBA4 *v0; u16 v1 = ov104_0222FC00(param0); u16 v2 = ov104_0222FC00(param0); u16 v3 = ov104_0222FC00(param0); - u16 * v4 = ov104_0222FBE4(param0); + u16 *v4 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v4 = ov104_02239C88(v0, v1, v2, v3); @@ -82,7 +81,7 @@ BOOL ov104_02239624 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02239660 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239660(UnkStruct_ov104_0222E930 *param0) { u16 v0 = ov104_0222EA48(param0); @@ -92,9 +91,9 @@ BOOL ov104_02239660 (UnkStruct_ov104_0222E930 * param0) return 1; } -static BOOL ov104_02239680 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02239680(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0209BBA4 * v0; + UnkStruct_0209BBA4 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); @@ -106,11 +105,11 @@ static BOOL ov104_02239680 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022396A4 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022396A4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0209BBA4 * v0; + UnkStruct_0209BBA4 *v0; u16 v1 = ov104_0222FC00(param0); - u16 * v2 = ov104_0222FBE4(param0); + u16 *v2 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); @@ -123,13 +122,13 @@ BOOL ov104_022396A4 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022396D4 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022396D4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0209BBA4 * v0; - UnkStruct_ov104_02230BE4 * v1; + UnkStruct_0209BBA4 *v0; + UnkStruct_ov104_02230BE4 *v1; u16 v2 = ov104_0222FC00(param0); u16 v3 = ov104_0222FC00(param0); - u16 * v4 = ov104_0222FBE4(param0); + u16 *v4 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); v1 = sub_0209B970(param0->unk_00->unk_00); @@ -142,13 +141,13 @@ BOOL ov104_022396D4 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_0223971C (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_0223971C(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_0209BBA4 * v1; + UnkStruct_0209BBA4 *v1; u16 v2; - u16 * v3 = ov104_0222FBE4(param0); - u16 * v4 = ov104_0222FBE4(param0); + u16 *v3 = ov104_0222FBE4(param0); + u16 *v4 = ov104_0222FBE4(param0); v1 = sub_0209B978(param0->unk_00->unk_00); @@ -175,10 +174,10 @@ BOOL ov104_0223971C (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02239794 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239794(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0209BBA4 * v0; - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_0209BBA4 *v0; + u16 *v1 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v1 = v0->unk_59; @@ -186,17 +185,17 @@ BOOL ov104_02239794 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_022397B0 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_022397B0(UnkStruct_ov104_0222E930 *param0) { int v0; u16 v1, v2; - UnkStruct_0202D750 * v3; - UnkStruct_0209BBA4 * v4; - UnkStruct_ov104_02230BE4 * v5; + UnkStruct_0202D750 *v3; + UnkStruct_0209BBA4 *v4; + UnkStruct_ov104_02230BE4 *v5; u8 v6 = (*((param0)->unk_1C++)); u8 v7 = (*((param0)->unk_1C++)); u8 v8 = (*((param0)->unk_1C++)); - u16 * v9 = ov104_0222FBE4(param0); + u16 *v9 = ov104_0222FBE4(param0); v4 = sub_0209B978(param0->unk_00->unk_00); v5 = sub_0209B970(param0->unk_00->unk_00); @@ -318,12 +317,12 @@ BOOL ov104_022397B0 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02239B14 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239B14(UnkStruct_ov104_0222E930 *param0) { int v0; - UnkStruct_0204AFC4 * v1; - UnkStruct_ov104_02230BE4 * v2; - UnkStruct_0209BBA4 * v3; + UnkStruct_0204AFC4 *v1; + UnkStruct_ov104_02230BE4 *v2; + UnkStruct_0209BBA4 *v3; UnkStruct_0209BBA4 v4; v2 = sub_0209B970(param0->unk_00->unk_00); @@ -362,10 +361,10 @@ BOOL ov104_02239B14 (UnkStruct_ov104_0222E930 * param0) return 0; } -BOOL ov104_02239BF4 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239BF4(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0204AFC4 * v0; - u16 * v1 = ov104_0222FBE4(param0); + UnkStruct_0204AFC4 *v0; + u16 *v1 = ov104_0222FBE4(param0); v0 = sub_0209B978(param0->unk_00->unk_00); *v1 = sub_0209BB08(v0); @@ -373,15 +372,15 @@ BOOL ov104_02239BF4 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02239C10 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239C10(UnkStruct_ov104_0222E930 *param0) { ov104_0222E974(param0, ov104_02239C20); return 1; } -static BOOL ov104_02239C20 (UnkStruct_ov104_0222E930 * param0) +static BOOL ov104_02239C20(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0204AFC4 * v0; + UnkStruct_0204AFC4 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); @@ -393,9 +392,9 @@ static BOOL ov104_02239C20 (UnkStruct_ov104_0222E930 * param0) return 1; } -BOOL ov104_02239C44 (UnkStruct_ov104_0222E930 * param0) +BOOL ov104_02239C44(UnkStruct_ov104_0222E930 *param0) { - UnkStruct_0204AFC4 * v0; + UnkStruct_0204AFC4 *v0; v0 = sub_0209B978(param0->unk_00->unk_00); sub_0204A32C(v0); diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c index 6273741356..265d3012d7 100644 --- a/src/overlay104/ov104_02239C58.c +++ b/src/overlay104/ov104_02239C58.c @@ -1,41 +1,42 @@ +#include "overlay104/ov104_02239C58.h" + #include #include #include "struct_decls/struct_0209B75C_decl.h" -#include "savedata.h" - -#include "constdata/const_020F410C.h" -#include "constdata/const_020F1E88.h" - -#include "field/field_system.h" -#include "struct_defs/struct_02098C44.h" #include "struct_defs/pokemon_summary.h" +#include "struct_defs/struct_02098C44.h" #include "struct_defs/struct_0209BBA4.h" +#include "field/field_system.h" + +#include "bag.h" #include "heap.h" +#include "party.h" +#include "pokemon_summary_app.h" +#include "savedata.h" #include "unk_02025E08.h" #include "unk_02028124.h" #include "unk_0202D778.h" -#include "party.h" #include "unk_0207A274.h" -#include "bag.h" -#include "pokemon_summary_app.h" #include "unk_0209B6F8.h" #include "unk_0209BA80.h" -#include "overlay104/ov104_02239C58.h" -UnkStruct_0209BBA4 * ov104_02239C58(SaveData * param0); -void ov104_02239C7C(UnkStruct_0209BBA4 * param0); -BOOL ov104_02239C88(UnkStruct_0209BBA4 * param0, u16 param1, u16 param2, u16 param3); -void ov104_02239CD0(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, u16 param2); -static void ov104_02239D1C(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * fieldSystem, int param3); -static void ov104_02239F38(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * fieldSystem, int param3); -static void ov104_02239FB0(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * fieldSystem, int param3); -static void ov104_0223A090(UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * fieldSystem, int param3); +#include "constdata/const_020F1E88.h" +#include "constdata/const_020F410C.h" + +UnkStruct_0209BBA4 *ov104_02239C58(SaveData *param0); +void ov104_02239C7C(UnkStruct_0209BBA4 *param0); +BOOL ov104_02239C88(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2, u16 param3); +void ov104_02239CD0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, u16 param2); +static void ov104_02239D1C(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3); +static void ov104_02239F38(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3); +static void ov104_02239FB0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3); +static void ov104_0223A090(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3); -UnkStruct_0209BBA4 * ov104_02239C58 (SaveData * param0) +UnkStruct_0209BBA4 *ov104_02239C58(SaveData *param0) { - static UnkStruct_0209BBA4 * v0; + static UnkStruct_0209BBA4 *v0; v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0209BBA4)); MI_CpuClear8(v0, sizeof(UnkStruct_0209BBA4)); @@ -44,7 +45,7 @@ UnkStruct_0209BBA4 * ov104_02239C58 (SaveData * param0) return v0; } -void ov104_02239C7C (UnkStruct_0209BBA4 * param0) +void ov104_02239C7C(UnkStruct_0209BBA4 *param0) { if (param0 == NULL) { return; @@ -56,7 +57,7 @@ void ov104_02239C7C (UnkStruct_0209BBA4 * param0) return; } -BOOL ov104_02239C88 (UnkStruct_0209BBA4 * param0, u16 param1, u16 param2, u16 param3) +BOOL ov104_02239C88(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2, u16 param3) { int v0; @@ -81,9 +82,9 @@ BOOL ov104_02239C88 (UnkStruct_0209BBA4 * param0, u16 param1, u16 param2, u16 pa return v0; } -void ov104_02239CD0 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, u16 param2) +void ov104_02239CD0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, u16 param2) { - FieldSystem * fieldSystem = param1->fieldSystem; + FieldSystem *fieldSystem = param1->fieldSystem; switch (param2) { case 0: @@ -105,7 +106,7 @@ void ov104_02239CD0 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, u return; } -static void ov104_02239D1C (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * fieldSystem, int param3) +static void ov104_02239D1C(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3) { u8 v0; @@ -161,7 +162,7 @@ static void ov104_02239D1C (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * pa return; } -static void ov104_02239F38 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * fieldSystem, int param3) +static void ov104_02239F38(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3) { int v0; @@ -189,7 +190,7 @@ static void ov104_02239F38 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * pa return; } -static void ov104_02239FB0 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * fieldSystem, int param3) +static void ov104_02239FB0(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3) { static const u8 v0[] = { 0, 1, 2, 4, 3, 5, 6, 7, 8 @@ -216,7 +217,7 @@ static void ov104_02239FB0 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * pa return; } -static void ov104_0223A090 (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * param1, FieldSystem * fieldSystem, int param3) +static void ov104_0223A090(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param1, FieldSystem *fieldSystem, int param3) { param1->unk_9F = param1->unk_AC->pos; Heap_FreeToHeap(param1->unk_AC); diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c index b8bbc992b3..65cd53b9f4 100644 --- a/src/overlay104/ov104_0223A0C4.c +++ b/src/overlay104/ov104_0223A0C4.c @@ -1,653 +1,652 @@ +#include "overlay104/ov104_0223A0C4.h" + #include #include #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0202D764.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204B184.h" #include "struct_defs/struct_0204B1E8.h" #include "struct_defs/struct_0204B404.h" + #include "overlay006/battle_params.h" +#include "overlay104/ov104_0222DCE0.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223A348.h" #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223A348_sub2.h" -#include "message.h" +#include "communication_information.h" +#include "flags.h" #include "heap.h" +#include "message.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" #include "trainer_info.h" #include "unk_0202D05C.h" -#include "communication_information.h" #include "unk_02049D08.h" #include "unk_02051D8C.h" -#include "pokemon.h" -#include "party.h" -#include "flags.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0223A0C4.h" const UnkStruct_ov104_0223A348_sub2 Unk_ov104_0223FE30[] = { - { - 0x1, - 0x0, - 0xEA, - { 0x16, 0x4B, 0xEB, 0x4C }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x86, 0x68, 0x5f, 0x71, 0x7E, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x4, - 0x0, - 0xFD, - { 0x34, 0x53, 0x35, 0x7E }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x83, 0x79, 0x5C, 0x63, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x7, - 0x0, - 0xF3, - { 0x37, 0x39, 0x160, 0x38 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x6D, 0x7C, 0x5D, 0x92, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x7B, - 0x0, - 0xDD, - { 0x13E, 0xD3, 0x68, 0x13A }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x6A, 0x79, 0x9A, 0x55, 0x60, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x16B, - 0x0, - 0xF6, - { 0x12D, 0x160, 0x102, 0xBD }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x70, 0x8f, 0x67, 0x9A, 0x68, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x51, - 0x0, - 0x99, - { 0x15F, 0x30, 0x13F, 0x73 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x64, 0x55, 0x9C, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x12C, - 0x0, - 0xD9, - { 0x2F, 0x139, 0xCC, 0x3 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x59, 0x7E, 0x64, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x128, - 0x0, - 0xE8, - { 0xFC, 0x45, 0xC5, 0x12 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x8f, 0x60, 0x7f, 0x68, 0x70, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0xA7, - 0x0, - 0xC9, - { 0x144, 0x65, 0xA9, 0xB8 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x55, 0x79, 0x8f, 0x9C, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x1B, - 0x0, - 0xED, - { 0x5B, 0x13D, 0xC9, 0x1C }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x66, 0xA1, 0x7A, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x114, - 0x0, - 0xCB, - { 0x13, 0x62, 0x11B, 0x74 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x6A, 0x81, 0x92, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x66, - 0x0, - 0x97, - { 0x5D, 0xF6, 0x49, 0x71 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x70, 0x8f, 0x70, 0x8f, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x4A, - 0x0, - 0xE6, - { 0xDE, 0x15E, 0x46, 0xB6 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x55, 0x68, 0x75, 0x87, 0x77, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0xC8, - 0x0, - 0xD5, - { 0xDC, 0xF7, 0x6D, 0x56 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x91, 0x57, 0x8f, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x173, - 0x0, - 0x9D, - { 0xE1, 0x1D, 0x118, 0xB8 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x70, 0x75, 0x8A, 0x55, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0xE4, - 0x0, - 0xF9, - { 0xF2, 0x34, 0x2E, 0xB6 }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x78, 0x9C, 0x84, 0x9C, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - }, - { - 0x131, - 0x0, - 0x9E, - { 0xE8, 0x13D, 0x14E, 0x6A }, - 0x12345678, - 0x98765432, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x1F, - 0x0, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x20, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF, - { 0x64, 0x7A, 0x9A, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff } - } + { + 0x1, + 0x0, + 0xEA, + { 0x16, 0x4B, 0xEB, 0x4C }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x86, 0x68, 0x5f, 0x71, 0x7E, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x4, + 0x0, + 0xFD, + { 0x34, 0x53, 0x35, 0x7E }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x83, 0x79, 0x5C, 0x63, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x7, + 0x0, + 0xF3, + { 0x37, 0x39, 0x160, 0x38 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x6D, 0x7C, 0x5D, 0x92, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x7B, + 0x0, + 0xDD, + { 0x13E, 0xD3, 0x68, 0x13A }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x6A, 0x79, 0x9A, 0x55, 0x60, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x16B, + 0x0, + 0xF6, + { 0x12D, 0x160, 0x102, 0xBD }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x70, 0x8f, 0x67, 0x9A, 0x68, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x51, + 0x0, + 0x99, + { 0x15F, 0x30, 0x13F, 0x73 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x64, 0x55, 0x9C, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x12C, + 0x0, + 0xD9, + { 0x2F, 0x139, 0xCC, 0x3 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x59, 0x7E, 0x64, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x128, + 0x0, + 0xE8, + { 0xFC, 0x45, 0xC5, 0x12 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x8f, 0x60, 0x7f, 0x68, 0x70, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0xA7, + 0x0, + 0xC9, + { 0x144, 0x65, 0xA9, 0xB8 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x55, 0x79, 0x8f, 0x9C, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x1B, + 0x0, + 0xED, + { 0x5B, 0x13D, 0xC9, 0x1C }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x66, 0xA1, 0x7A, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x114, + 0x0, + 0xCB, + { 0x13, 0x62, 0x11B, 0x74 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x6A, 0x81, 0x92, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x66, + 0x0, + 0x97, + { 0x5D, 0xF6, 0x49, 0x71 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x70, 0x8f, 0x70, 0x8f, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x4A, + 0x0, + 0xE6, + { 0xDE, 0x15E, 0x46, 0xB6 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x55, 0x68, 0x75, 0x87, 0x77, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0xC8, + 0x0, + 0xD5, + { 0xDC, 0xF7, 0x6D, 0x56 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x91, 0x57, 0x8f, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x173, + 0x0, + 0x9D, + { 0xE1, 0x1D, 0x118, 0xB8 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x70, 0x75, 0x8A, 0x55, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0xE4, + 0x0, + 0xF9, + { 0xF2, 0x34, 0x2E, 0xB6 }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x78, 0x9C, 0x84, 0x9C, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, + { + 0x131, + 0x0, + 0x9E, + { 0xE8, 0x13D, 0x14E, 0x6A }, + 0x12345678, + 0x98765432, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x1F, + 0x0, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x20, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF, + { 0x64, 0x7A, 0x9A, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff }, + }, }; - const UnkStruct_ov104_0223A348_sub1 Unk_ov104_0223FCE0[] = { - { - 0x12345678, - 0x2, - 0x0, - { 0x71, 0x90, 0xf1, 0xA2, 0xA3, 0xffff, 0xffff, 0xffff }, - { 0xFFFF, 0x0, 0x0, 0x0 }, - { 0xFFFF, 0x1, 0x0, 0x0 }, - { 0xFFFF, 0x2, 0x0, 0x0 } - }, - { - 0x12345678, - 0x9, - 0x0, - { 0x71, 0x90, 0xf1, 0xA2, 0xA4, 0xffff, 0xffff, 0xffff }, - { 0xFFFF, 0x3, 0x0, 0x0 }, - { 0xFFFF, 0x1, 0x0, 0x0 }, - { 0xFFFF, 0x2, 0x0, 0x0 } - }, - { - 0x12345678, - 0xB, - 0x0, - { 0x71, 0x90, 0xf1, 0xA2, 0xA5, 0xffff, 0xffff, 0xffff }, - { 0xFFFF, 0x6, 0x0, 0x0 }, - { 0xFFFF, 0x1, 0x0, 0x0 }, - { 0xFFFF, 0x2, 0x0, 0x0 } - }, - { - 0x12345678, - 0x1E, - 0x0, - { 0x71, 0x90, 0xf1, 0xA2, 0xA6, 0xffff, 0xffff, 0xffff }, - { 0xFFFF, 0x9, 0x0, 0x0 }, - { 0xFFFF, 0x1, 0x0, 0x0 }, - { 0xFFFF, 0x2, 0x0, 0x0 } - }, - { - 0x12345678, - 0x55, - 0x0, - { 0x71, 0x90, 0xf1, 0xA2, 0xA7, 0xffff, 0xffff, 0xffff }, - { 0xFFFF, 0xC, 0x0, 0x0 }, - { 0xFFFF, 0x1, 0x0, 0x0 }, - { 0xFFFF, 0x2, 0x0, 0x0 } - }, - { - 0x12345678, - 0x50, - 0x0, - { 0x71, 0x90, 0xf1, 0xA2, 0xA8, 0xffff, 0xffff, 0xffff }, - { 0xFFFF, 0xF, 0x0, 0x0 }, - { 0xFFFF, 0x1, 0x0, 0x0 }, - { 0xFFFF, 0x2, 0x0, 0x0 } - }, - { - 0x12345678, - 0x1D, - 0x0, - { 0x71, 0x90, 0xf1, 0xA2, 0xA9, 0xffff, 0xffff, 0xffff }, - { 0xFFFF, 0x12, 0x0, 0x0 }, - { 0xFFFF, 0x1, 0x0, 0x0 }, - { 0xFFFF, 0x2, 0x0, 0x0 } - } + { + 0x12345678, + 0x2, + 0x0, + { 0x71, 0x90, 0xf1, 0xA2, 0xA3, 0xffff, 0xffff, 0xffff }, + { 0xFFFF, 0x0, 0x0, 0x0 }, + { 0xFFFF, 0x1, 0x0, 0x0 }, + { 0xFFFF, 0x2, 0x0, 0x0 }, + }, + { + 0x12345678, + 0x9, + 0x0, + { 0x71, 0x90, 0xf1, 0xA2, 0xA4, 0xffff, 0xffff, 0xffff }, + { 0xFFFF, 0x3, 0x0, 0x0 }, + { 0xFFFF, 0x1, 0x0, 0x0 }, + { 0xFFFF, 0x2, 0x0, 0x0 }, + }, + { + 0x12345678, + 0xB, + 0x0, + { 0x71, 0x90, 0xf1, 0xA2, 0xA5, 0xffff, 0xffff, 0xffff }, + { 0xFFFF, 0x6, 0x0, 0x0 }, + { 0xFFFF, 0x1, 0x0, 0x0 }, + { 0xFFFF, 0x2, 0x0, 0x0 }, + }, + { + 0x12345678, + 0x1E, + 0x0, + { 0x71, 0x90, 0xf1, 0xA2, 0xA6, 0xffff, 0xffff, 0xffff }, + { 0xFFFF, 0x9, 0x0, 0x0 }, + { 0xFFFF, 0x1, 0x0, 0x0 }, + { 0xFFFF, 0x2, 0x0, 0x0 }, + }, + { + 0x12345678, + 0x55, + 0x0, + { 0x71, 0x90, 0xf1, 0xA2, 0xA7, 0xffff, 0xffff, 0xffff }, + { 0xFFFF, 0xC, 0x0, 0x0 }, + { 0xFFFF, 0x1, 0x0, 0x0 }, + { 0xFFFF, 0x2, 0x0, 0x0 }, + }, + { + 0x12345678, + 0x50, + 0x0, + { 0x71, 0x90, 0xf1, 0xA2, 0xA8, 0xffff, 0xffff, 0xffff }, + { 0xFFFF, 0xF, 0x0, 0x0 }, + { 0xFFFF, 0x1, 0x0, 0x0 }, + { 0xFFFF, 0x2, 0x0, 0x0 }, + }, + { + 0x12345678, + 0x1D, + 0x0, + { 0x71, 0x90, 0xf1, 0xA2, 0xA9, 0xffff, 0xffff, 0xffff }, + { 0xFFFF, 0x12, 0x0, 0x0 }, + { 0xFFFF, 0x1, 0x0, 0x0 }, + { 0xFFFF, 0x2, 0x0, 0x0 }, + }, }; - typedef struct { - u16 unk_00; - u8 unk_02[4]; + u16 unk_00; + u8 unk_02[4]; } UnkStruct_ov104_0223FCB4; static const UnkStruct_ov104_0223FCB4 Unk_ov104_0223FCB4[] = { - { - 0x4, - { 0x0, 0x1, 0x2, 0x3 } - }, - { - 0x14, - { 0x2, 0x3, 0x4, 0x5 } - }, - { - 0x9, - { 0x4, 0x6, 0x6, 0x7 } - }, - { - 0xA, - { 0x6, 0x7, 0x8, 0x9 } - }, - { - 0x23, - { 0x8, 0x9, 0xA, 0xB } - }, - { - 0xD, - { 0xB, 0xC, 0xD, 0xE } - }, - { - 0x11, - { 0xD, 0xE, 0xF, 0x10 } - } + { + 0x4, + { 0x0, 0x1, 0x2, 0x3 }, + }, + { + 0x14, + { 0x2, 0x3, 0x4, 0x5 }, + }, + { + 0x9, + { 0x4, 0x6, 0x6, 0x7 }, + }, + { + 0xA, + { 0x6, 0x7, 0x8, 0x9 }, + }, + { + 0x23, + { 0x8, 0x9, 0xA, 0xB }, + }, + { + 0xD, + { 0xB, 0xC, 0xD, 0xE }, + }, + { + 0x11, + { 0xD, 0xE, 0xF, 0x10 }, + }, }; -void sub_02052894(BattleParams * param0); -BOOL ov104_0223A0C4(UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 * param1, u16 param2, int param3, u16 * param4, u16 * param5, UnkStruct_0204B404 * param6, int param7); -void ov104_0223A30C(SaveData * param0, UnkStruct_ov104_0223A348 * param1, const u8 param2); -BattleParams * ov104_0223A580(UnkStruct_0204AFC4 * param0, UnkStruct_ov104_02230BE4 * param1); -void ov104_0223A734(UnkStruct_0204AFC4 * param0, u16 param1); -u16 ov104_0223A750(UnkStruct_0204AFC4 * param0, const u16 * param1); +void sub_02052894(BattleParams *param0); +BOOL ov104_0223A0C4(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348 *param1, u16 param2, int param3, u16 *param4, u16 *param5, UnkStruct_0204B404 *param6, int param7); +void ov104_0223A30C(SaveData *param0, UnkStruct_ov104_0223A348 *param1, const u8 param2); +BattleParams *ov104_0223A580(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_02230BE4 *param1); +void ov104_0223A734(UnkStruct_0204AFC4 *param0, u16 param1); +u16 ov104_0223A750(UnkStruct_0204AFC4 *param0, const u16 *param1); int ov104_0223A768(u8 param0); int ov104_0223A77C(u8 param0); int ov104_0223A790(u8 param0); -static BOOL ov104_0223A118(UnkStruct_0204AFC4 * param0, UnkStruct_0204B184 * param1, u16 param2, UnkStruct_ov104_0223A348_sub2 * param3, u8 param4, u16 * param5, u16 * param6, UnkStruct_0204B404 * param7, int param8); -static void ov104_0223A348(UnkStruct_ov104_0223A348 * param0, const u8 param1); -static u32 ov104_0223A3A8(UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348_sub2 * param1, u16 param2, u32 param3, u32 param4, u8 param5, u8 param6, BOOL param7, int param8); +static BOOL ov104_0223A118(UnkStruct_0204AFC4 *param0, UnkStruct_0204B184 *param1, u16 param2, UnkStruct_ov104_0223A348_sub2 *param3, u8 param4, u16 *param5, u16 *param6, UnkStruct_0204B404 *param7, int param8); +static void ov104_0223A348(UnkStruct_ov104_0223A348 *param0, const u8 param1); +static u32 ov104_0223A3A8(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348_sub2 *param1, u16 param2, u32 param3, u32 param4, u8 param5, u8 param6, BOOL param7, int param8); static u32 ov104_0223A700(u8 param0); -static void ov104_0223A6AC(BattleParams * param0, UnkStruct_ov104_0223A348 * param1, int param2, int param3, int param4); +static void ov104_0223A6AC(BattleParams *param0, UnkStruct_ov104_0223A348 *param1, int param2, int param3, int param4); static int ov104_0223A7AC(u8 param0); -BOOL ov104_0223A0C4 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 * param1, u16 param2, int param3, u16 * param4, u16 * param5, UnkStruct_0204B404 * param6, int param7) +BOOL ov104_0223A0C4(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348 *param1, u16 param2, int param3, u16 *param4, u16 *param5, UnkStruct_0204B404 *param6, int param7) { BOOL v0 = 0; - UnkStruct_0204B184 * v1; + UnkStruct_0204B184 *v1; v1 = ov104_0222DD04(¶m1->unk_00, param2, param7, ov104_0223A77C(param0->unk_0F)); v0 = ov104_0223A118(param0, v1, param2, ¶m1->unk_30[0], param3, param4, param5, param6, param7); @@ -657,7 +656,7 @@ BOOL ov104_0223A0C4 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 * par return v0; } -static BOOL ov104_0223A118 (UnkStruct_0204AFC4 * param0, UnkStruct_0204B184 * param1, u16 param2, UnkStruct_ov104_0223A348_sub2 * param3, u8 param4, u16 * param5, u16 * param6, UnkStruct_0204B404 * param7, int param8) +static BOOL ov104_0223A118(UnkStruct_0204AFC4 *param0, UnkStruct_0204B184 *param1, u16 param2, UnkStruct_ov104_0223A348_sub2 *param3, u8 param4, u16 *param5, u16 *param6, UnkStruct_0204B404 *param7, int param8) { int v0, v1; u8 v2; @@ -764,12 +763,12 @@ static BOOL ov104_0223A118 (UnkStruct_0204AFC4 * param0, UnkStruct_0204B184 * pa return v10; } -void ov104_0223A30C (SaveData * param0, UnkStruct_ov104_0223A348 * param1, const u8 param2) +void ov104_0223A30C(SaveData *param0, UnkStruct_ov104_0223A348 *param1, const u8 param2) { int v0; - UnkStruct_0202D764 * v1; - const UnkStruct_ov104_0223A348_sub1 * v2; - const UnkStruct_ov104_0223A348_sub2 * v3; + UnkStruct_0202D764 *v1; + const UnkStruct_ov104_0223A348_sub1 *v2; + const UnkStruct_ov104_0223A348_sub2 *v3; MI_CpuClear8(param1, sizeof(UnkStruct_ov104_0223A348)); @@ -783,12 +782,12 @@ void ov104_0223A30C (SaveData * param0, UnkStruct_ov104_0223A348 * param1, const sub_0202D63C(v1, param1, param2); } -static void ov104_0223A348 (UnkStruct_ov104_0223A348 * param0, const u8 param1) +static void ov104_0223A348(UnkStruct_ov104_0223A348 *param0, const u8 param1) { int v0; - const UnkStruct_ov104_0223A348_sub1 * v1; - const UnkStruct_ov104_0223A348_sub2 * v2; - const UnkStruct_ov104_0223FCB4 * v3; + const UnkStruct_ov104_0223A348_sub1 *v1; + const UnkStruct_ov104_0223A348_sub2 *v2; + const UnkStruct_ov104_0223FCB4 *v3; MI_CpuClear8(param0, sizeof(UnkStruct_ov104_0223A348)); @@ -805,10 +804,13 @@ static void ov104_0223A348 (UnkStruct_ov104_0223A348 * param0, const u8 param1) } static const u16 Unk_ov104_0223FCAC[] = { - 213, 157, 234, 217, + 213, + 157, + 234, + 217, }; -static u32 ov104_0223A3A8 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348_sub2 * param1, u16 param2, u32 param3, u32 param4, u8 param5, u8 param6, BOOL param7, int param8) +static u32 ov104_0223A3A8(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348_sub2 *param1, u16 param2, u32 param3, u32 param4, u8 param5, u8 param6, BOOL param7, int param8) { int v0; int v1; @@ -899,15 +901,15 @@ static u32 ov104_0223A3A8 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 return v2; } -BattleParams * ov104_0223A580 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_02230BE4 * param1) +BattleParams *ov104_0223A580(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_02230BE4 *param1) { int v0; u8 v1; u32 v2; - BattleParams * v3; - SaveData * v4; - Party * v5; - Pokemon * v6; + BattleParams *v3; + SaveData *v4; + Party *v5; + Pokemon *v6; v3 = sub_02051D8C(param0->unk_04, ov104_0223A700(param0->unk_0F)); v4 = param1->unk_08; @@ -959,10 +961,10 @@ BattleParams * ov104_0223A580 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223 return v3; } -static void ov104_0223A6AC (BattleParams * param0, UnkStruct_ov104_0223A348 * param1, int param2, int param3, int param4) +static void ov104_0223A6AC(BattleParams *param0, UnkStruct_ov104_0223A348 *param1, int param2, int param3, int param4) { int v0, v1; - Pokemon * v2; + Pokemon *v2; ov104_0222E284(param0, ¶m1->unk_00, param2, param3, param4); v2 = Pokemon_New(param4); @@ -975,7 +977,7 @@ static void ov104_0223A6AC (BattleParams * param0, UnkStruct_ov104_0223A348 * pa Heap_FreeToHeap(v2); } -static u32 ov104_0223A700 (u8 param0) +static u32 ov104_0223A700(u8 param0) { switch (param0) { case 0: @@ -993,13 +995,13 @@ static u32 ov104_0223A700 (u8 param0) return (0x0 | 0x1) | 0x80; } -void ov104_0223A734 (UnkStruct_0204AFC4 * param0, u16 param1) +void ov104_0223A734(UnkStruct_0204AFC4 *param0, u16 param1) { param0->unk_10_3 = param1; param0->unk_83E[0] = param1; } -u16 ov104_0223A750 (UnkStruct_0204AFC4 * param0, const u16 * param1) +u16 ov104_0223A750(UnkStruct_0204AFC4 *param0, const u16 *param1) { int v0; @@ -1010,7 +1012,7 @@ u16 ov104_0223A750 (UnkStruct_0204AFC4 * param0, const u16 * param1) return 0; } -int ov104_0223A768 (u8 param0) +int ov104_0223A768(u8 param0) { if (ov104_0223A7AC(param0) == 0) { return 135; @@ -1019,7 +1021,7 @@ int ov104_0223A768 (u8 param0) return 179; } -int ov104_0223A77C (u8 param0) +int ov104_0223A77C(u8 param0) { if (ov104_0223A7AC(param0) == 0) { return 134; @@ -1028,7 +1030,7 @@ int ov104_0223A77C (u8 param0) return 178; } -int ov104_0223A790 (u8 param0) +int ov104_0223A790(u8 param0) { if (ov104_0223A7AC(param0) == 0) { return 613; @@ -1037,10 +1039,10 @@ int ov104_0223A790 (u8 param0) return 614; } -static int ov104_0223A7AC (u8 param0) +static int ov104_0223A7AC(u8 param0) { - TrainerInfo * v0; - TrainerInfo * v1; + TrainerInfo *v0; + TrainerInfo *v1; u8 v2, v3; switch (param0) { diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c index 62aa9720be..e6b8c50e9c 100644 --- a/src/overlay104/ov104_0223A7F4.c +++ b/src/overlay104/ov104_0223A7F4.c @@ -1,28 +1,30 @@ +#include "overlay104/ov104_0223A7F4.h" + #include #include #include "struct_defs/struct_0204B184.h" #include "struct_defs/struct_0204B1E8.h" + #include "overlay006/battle_params.h" +#include "overlay104/ov104_0222DCE0.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223A348_sub2.h" #include "overlay104/struct_ov104_0223ADA0.h" #include "overlay104/struct_ov104_0224028C.h" +#include "communication_information.h" +#include "communication_system.h" #include "heap.h" #include "message.h" +#include "party.h" +#include "pokemon.h" #include "strbuf.h" -#include "unk_0201D15C.h" #include "trainer_info.h" -#include "communication_information.h" -#include "communication_system.h" +#include "unk_0201D15C.h" #include "unk_02051D8C.h" -#include "pokemon.h" -#include "party.h" #include "unk_02096420.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0223A7F4.h" static const struct { u16 unk_00; @@ -30,74 +32,74 @@ static const struct { u16 unk_04; u16 unk_06; } Unk_ov104_022401FC[] = { - {0x0, 0x63, 0x64, 0x77}, - {0x50, 0x77, 0x78, 0x8B}, - {0x64, 0x8B, 0x8C, 0x9F}, - {0x78, 0x9F, 0xA0, 0xB3}, - {0x8C, 0xB3, 0xB4, 0xC7}, - {0xA0, 0xC7, 0xC8, 0xDB}, - {0xB4, 0xDB, 0xDC, 0xEF}, - {0xC8, 0x12B, 0xC8, 0x12B} + { 0x0, 0x63, 0x64, 0x77 }, + { 0x50, 0x77, 0x78, 0x8B }, + { 0x64, 0x8B, 0x8C, 0x9F }, + { 0x78, 0x9F, 0xA0, 0xB3 }, + { 0x8C, 0xB3, 0xB4, 0xC7 }, + { 0xA0, 0xC7, 0xC8, 0xDB }, + { 0xB4, 0xDB, 0xDC, 0xEF }, + { 0xC8, 0x12B, 0xC8, 0x12B } }; static const UnkStruct_ov104_0224028C Unk_ov104_0224028C[] = { - {0x64, 0x1, 0x96, 0x0, 0x1}, - {0x78, 0x97, 0xFA, 0x4, 0x1}, - {0x8C, 0xFB, 0x15E, 0x8, 0x1}, - {0xA0, 0x15F, 0x1E6, 0xC, 0x1}, - {0xB4, 0x1E7, 0x26E, 0x10, 0x1}, - {0xC8, 0x26F, 0x2F6, 0x14, 0x1}, - {0xDC, 0x2F7, 0x37E, 0x18, 0x1}, - {0x12C, 0x15F, 0x3B6, 0x1F, 0x0}, - {0x136, 0x15F, 0x1E6, 0xC, 0x0}, - {0x137, 0x15F, 0x1E6, 0x1F, 0x0} + { 0x64, 0x1, 0x96, 0x0, 0x1 }, + { 0x78, 0x97, 0xFA, 0x4, 0x1 }, + { 0x8C, 0xFB, 0x15E, 0x8, 0x1 }, + { 0xA0, 0x15F, 0x1E6, 0xC, 0x1 }, + { 0xB4, 0x1E7, 0x26E, 0x10, 0x1 }, + { 0xC8, 0x26F, 0x2F6, 0x14, 0x1 }, + { 0xDC, 0x2F7, 0x37E, 0x18, 0x1 }, + { 0x12C, 0x15F, 0x3B6, 0x1F, 0x0 }, + { 0x136, 0x15F, 0x1E6, 0xC, 0x0 }, + { 0x137, 0x15F, 0x1E6, 0x1F, 0x0 } }; static const UnkStruct_ov104_0224028C Unk_ov104_022402DC[] = { - {0x64, 0x15F, 0x1E6, 0x0, 0x1}, - {0x78, 0x1E7, 0x26E, 0x4, 0x1}, - {0x8C, 0x26F, 0x2F6, 0x8, 0x1}, - {0xA0, 0x2F7, 0x37E, 0xC, 0x1}, - {0xB4, 0x15F, 0x3B6, 0x10, 0x1}, - {0xC8, 0x15F, 0x3B6, 0x14, 0x1}, - {0xDC, 0x15F, 0x3B6, 0x18, 0x1}, - {0x12C, 0x15F, 0x3B6, 0x1F, 0x0}, - {0x136, 0x2F7, 0x3B6, 0xC, 0x0}, - {0x137, 0x2F7, 0x3B6, 0x1F, 0x0} + { 0x64, 0x15F, 0x1E6, 0x0, 0x1 }, + { 0x78, 0x1E7, 0x26E, 0x4, 0x1 }, + { 0x8C, 0x26F, 0x2F6, 0x8, 0x1 }, + { 0xA0, 0x2F7, 0x37E, 0xC, 0x1 }, + { 0xB4, 0x15F, 0x3B6, 0x10, 0x1 }, + { 0xC8, 0x15F, 0x3B6, 0x14, 0x1 }, + { 0xDC, 0x15F, 0x3B6, 0x18, 0x1 }, + { 0x12C, 0x15F, 0x3B6, 0x1F, 0x0 }, + { 0x136, 0x2F7, 0x3B6, 0xC, 0x0 }, + { 0x137, 0x2F7, 0x3B6, 0x1F, 0x0 } }; static const UnkStruct_ov104_0224028C Unk_ov104_0224023C[] = { - {0x64, 0x15F, 0x1E6, 0x0, 0x1}, - {0x78, 0x1E7, 0x26E, 0x4, 0x1}, - {0x8C, 0x26F, 0x2F6, 0x8, 0x1}, - {0xA0, 0x2F7, 0x37E, 0xC, 0x1}, - {0xB4, 0x26F, 0x3B6, 0x10, 0x1}, - {0xC8, 0x26F, 0x3B6, 0x14, 0x1}, - {0xDC, 0x26F, 0x3B6, 0x18, 0x1}, - {0x12C, 0x15F, 0x3B6, 0x1F, 0x0}, - {0x136, 0x2F7, 0x3B6, 0xC, 0x0}, - {0x137, 0x2F7, 0x3B6, 0x1F, 0x0} + { 0x64, 0x15F, 0x1E6, 0x0, 0x1 }, + { 0x78, 0x1E7, 0x26E, 0x4, 0x1 }, + { 0x8C, 0x26F, 0x2F6, 0x8, 0x1 }, + { 0xA0, 0x2F7, 0x37E, 0xC, 0x1 }, + { 0xB4, 0x26F, 0x3B6, 0x10, 0x1 }, + { 0xC8, 0x26F, 0x3B6, 0x14, 0x1 }, + { 0xDC, 0x26F, 0x3B6, 0x18, 0x1 }, + { 0x12C, 0x15F, 0x3B6, 0x1F, 0x0 }, + { 0x136, 0x2F7, 0x3B6, 0xC, 0x0 }, + { 0x137, 0x2F7, 0x3B6, 0x1F, 0x0 } }; static int ov104_0223A7F4(u8 param0, int param1, int param2); -const UnkStruct_ov104_0224028C * ov104_0223A8A8(int param0, int param1); -const UnkStruct_ov104_0224028C * ov104_0223A8F4(int param0, int param1); +const UnkStruct_ov104_0224028C *ov104_0223A8A8(int param0, int param1); +const UnkStruct_ov104_0224028C *ov104_0223A8F4(int param0, int param1); void ov104_0223A860(u8 param0, int param1, u16 param2[], u8 param3); u8 ov104_0223AA50(u8 param0); u8 ov104_0223AA74(u8 param0, BOOL param1); -void ov104_0223AAA0(u16 param0, u8 param1, u16 * param2, UnkStruct_ov104_0223A348_sub2 * param3, u8 * param4, u32 * param5, u16 param6, u16 * param7, u16 * param8); -void ov104_0223AB0C(u8 param0, u16 param1, u8 param2, UnkStruct_ov104_0223A348_sub2 * param3, u16 * param4, UnkStruct_ov104_0223A348_sub2 * param5, u8 * param6, u32 * param7, int param8); -BattleParams * ov104_0223ABA0(UnkStruct_ov104_0223ADA0 * param0, UnkStruct_ov104_02230BE4 * param1); +void ov104_0223AAA0(u16 param0, u8 param1, u16 *param2, UnkStruct_ov104_0223A348_sub2 *param3, u8 *param4, u32 *param5, u16 param6, u16 *param7, u16 *param8); +void ov104_0223AB0C(u8 param0, u16 param1, u8 param2, UnkStruct_ov104_0223A348_sub2 *param3, u16 *param4, UnkStruct_ov104_0223A348_sub2 *param5, u8 *param6, u32 *param7, int param8); +BattleParams *ov104_0223ABA0(UnkStruct_ov104_0223ADA0 *param0, UnkStruct_ov104_02230BE4 *param1); static u32 ov104_0223AD74(u8 param0); -u8 ov104_0223ADA0(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0223ADB0(UnkStruct_ov104_0223ADA0 * param0); -void ov104_0223AE30(UnkStruct_ov104_0223ADA0 * param0); +u8 ov104_0223ADA0(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0223ADB0(UnkStruct_ov104_0223ADA0 *param0); +void ov104_0223AE30(UnkStruct_ov104_0223ADA0 *param0); BOOL ov104_0223AED4(u8 param0); -static u16 ov104_0223AEE4(UnkStruct_ov104_0223ADA0 * param0); -u16 ov104_0223AF34(UnkStruct_ov104_0223ADA0 * param0); -void sub_02052894(BattleParams * param0); +static u16 ov104_0223AEE4(UnkStruct_ov104_0223ADA0 *param0); +u16 ov104_0223AF34(UnkStruct_ov104_0223ADA0 *param0); +void sub_02052894(BattleParams *param0); -static int ov104_0223A7F4 (u8 param0, int param1, int param2) +static int ov104_0223A7F4(u8 param0, int param1, int param2) { int v0, v1, v2, v3; @@ -127,7 +129,7 @@ static int ov104_0223A7F4 (u8 param0, int param1, int param2) return v0; } -void ov104_0223A860 (u8 param0, int param1, u16 param2[], u8 param3) +void ov104_0223A860(u8 param0, int param1, u16 param2[], u8 param3) { int v0 = 0; int v1; @@ -149,10 +151,10 @@ void ov104_0223A860 (u8 param0, int param1, u16 param2[], u8 param3) } while (v0 < param3); } -const UnkStruct_ov104_0224028C * ov104_0223A8A8 (int param0, int param1) +const UnkStruct_ov104_0224028C *ov104_0223A8A8(int param0, int param1) { int v0; - static const UnkStruct_ov104_0224028C * v1; + static const UnkStruct_ov104_0224028C *v1; int v2; if (param1 == 0) { @@ -177,7 +179,7 @@ const UnkStruct_ov104_0224028C * ov104_0223A8A8 (int param0, int param1) return &v1[v0]; } -const UnkStruct_ov104_0224028C * ov104_0223A8F4 (int param0, int param1) +const UnkStruct_ov104_0224028C *ov104_0223A8F4(int param0, int param1) { if (param0 >= 8) { param0 = 8 - 1; @@ -198,13 +200,13 @@ static const int Unk_ov104_022401E8[] = { 0x22 }; -BOOL ov104_0223A918 (const u16 param0[], const u16 param1[], int param2, int param3, u16 param4[], int param5, const UnkStruct_ov104_0224028C * param6, u16 param7, u8 param8[]) +BOOL ov104_0223A918(const u16 param0[], const u16 param1[], int param2, int param3, u16 param4[], int param5, const UnkStruct_ov104_0224028C *param6, u16 param7, u8 param8[]) { u8 v0; int v1, v2, v3; UnkStruct_0204B1E8 v4[6]; int v5, v6; - const UnkStruct_ov104_0224028C * v7; + const UnkStruct_ov104_0224028C *v7; v7 = param6; @@ -266,7 +268,7 @@ BOOL ov104_0223A918 (const u16 param0[], const u16 param1[], int param2, int par return 0; } -u8 ov104_0223AA50 (u8 param0) +u8 ov104_0223AA50(u8 param0) { switch (param0) { case 0: @@ -280,7 +282,7 @@ u8 ov104_0223AA50 (u8 param0) return 0; } -u8 ov104_0223AA74 (u8 param0, BOOL param1) +u8 ov104_0223AA74(u8 param0, BOOL param1) { switch (param0) { case 0: @@ -298,9 +300,9 @@ u8 ov104_0223AA74 (u8 param0, BOOL param1) return 0; } -void ov104_0223AAA0 (u16 param0, u8 param1, u16 * param2, UnkStruct_ov104_0223A348_sub2 * param3, u8 * param4, u32 * param5, u16 param6, u16 * param7, u16 * param8) +void ov104_0223AAA0(u16 param0, u8 param1, u16 *param2, UnkStruct_ov104_0223A348_sub2 *param3, u8 *param4, u32 *param5, u16 param6, u16 *param7, u16 *param8) { - const UnkStruct_ov104_0224028C * v0; + const UnkStruct_ov104_0224028C *v0; int v1; v0 = ov104_0223A8F4(param0, param1); @@ -315,11 +317,11 @@ void ov104_0223AAA0 (u16 param0, u8 param1, u16 * param2, UnkStruct_ov104_0223A3 return; } -void ov104_0223AB0C (u8 param0, u16 param1, u8 param2, UnkStruct_ov104_0223A348_sub2 * param3, u16 * param4, UnkStruct_ov104_0223A348_sub2 * param5, u8 * param6, u32 * param7, int param8) +void ov104_0223AB0C(u8 param0, u16 param1, u8 param2, UnkStruct_ov104_0223A348_sub2 *param3, u16 *param4, UnkStruct_ov104_0223A348_sub2 *param5, u8 *param6, u32 *param7, int param8) { int v0; UnkStruct_ov104_0223A348_sub2 v1; - const UnkStruct_ov104_0224028C * v2; + const UnkStruct_ov104_0224028C *v2; u16 v3[6 * 2]; u16 v4[6 * 2]; @@ -337,18 +339,18 @@ void ov104_0223AB0C (u8 param0, u16 param1, u8 param2, UnkStruct_ov104_0223A348_ return; } -BattleParams * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkStruct_ov104_02230BE4 * param1) +BattleParams *ov104_0223ABA0(UnkStruct_ov104_0223ADA0 *param0, UnkStruct_ov104_02230BE4 *param1) { int v0; u32 v1; u8 v2, v3; - BattleParams * v4; - Pokemon * v5; + BattleParams *v4; + Pokemon *v5; UnkStruct_ov104_0223A348_sub1 v6; - UnkStruct_0204B184 * v7; - MessageLoader * v8; - Strbuf* v9; - TrainerInfo * v10; + UnkStruct_0204B184 *v7; + MessageLoader *v8; + Strbuf *v9; + TrainerInfo *v10; v2 = ov104_0223AA50(param0->unk_04); v3 = ov104_0223AA74(param0->unk_04, 0); @@ -420,7 +422,7 @@ BattleParams * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkStruct_ov10 return v4; } -static u32 ov104_0223AD74 (u8 param0) +static u32 ov104_0223AD74(u8 param0) { switch (param0) { case 0: @@ -436,7 +438,7 @@ static u32 ov104_0223AD74 (u8 param0) return (0x0 | 0x1) | 0x80; } -u8 ov104_0223ADA0 (UnkStruct_ov104_0223ADA0 * param0) +u8 ov104_0223ADA0(UnkStruct_ov104_0223ADA0 *param0) { if (param0->unk_05 == 0) { return 50; @@ -445,10 +447,10 @@ u8 ov104_0223ADA0 (UnkStruct_ov104_0223ADA0 * param0) return 100; } -void ov104_0223ADB0 (UnkStruct_ov104_0223ADA0 * param0) +void ov104_0223ADB0(UnkStruct_ov104_0223ADA0 *param0) { int v0; - Pokemon * v1; + Pokemon *v1; ov104_0222E330(param0->unk_280, param0->unk_254, param0->unk_260, param0->unk_268, NULL, 6, 11, 179); Party_Init(param0->unk_4D4); @@ -465,10 +467,10 @@ void ov104_0223ADB0 (UnkStruct_ov104_0223ADA0 * param0) return; } -void ov104_0223AE30 (UnkStruct_ov104_0223ADA0 * param0) +void ov104_0223AE30(UnkStruct_ov104_0223ADA0 *param0) { int v0, v1; - Pokemon * v2; + Pokemon *v2; UnkStruct_ov104_0223A348_sub2 v3[2]; v1 = Party_GetCurrentCount(param0->unk_4D4); @@ -491,7 +493,7 @@ void ov104_0223AE30 (UnkStruct_ov104_0223ADA0 * param0) return; } -BOOL ov104_0223AED4 (u8 param0) +BOOL ov104_0223AED4(u8 param0) { switch (param0) { case 2: @@ -502,7 +504,7 @@ BOOL ov104_0223AED4 (u8 param0) return 0; } -static u16 ov104_0223AEE4 (UnkStruct_ov104_0223ADA0 * param0) +static u16 ov104_0223AEE4(UnkStruct_ov104_0223ADA0 *param0) { u16 v0, v1; @@ -515,7 +517,7 @@ static u16 ov104_0223AEE4 (UnkStruct_ov104_0223ADA0 * param0) v1 = ov104_0223AF34(param0); v0 = (0x1 | 0x2 | 0x4); - switch ((v1 + 1)) { + switch (v1 + 1) { case 1: case 2: v0 = 0; @@ -529,7 +531,7 @@ static u16 ov104_0223AEE4 (UnkStruct_ov104_0223ADA0 * param0) return v0; } -u16 ov104_0223AF34 (UnkStruct_ov104_0223ADA0 * param0) +u16 ov104_0223AF34(UnkStruct_ov104_0223ADA0 *param0) { u16 v0; diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c index c26f44b5c8..1e4892db2d 100644 --- a/src/overlay104/ov104_0223AF58.c +++ b/src/overlay104/ov104_0223AF58.c @@ -1,27 +1,28 @@ +#include "overlay104/ov104_0223AF58.h" + #include #include #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_0204B184.h" + #include "overlay006/battle_params.h" +#include "overlay104/ov104_0222DCE0.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223A348_sub2.h" #include "overlay104/struct_ov104_0223B5C0.h" +#include "communication_information.h" +#include "communication_system.h" #include "heap.h" -#include "unk_0201D15C.h" +#include "party.h" +#include "pokemon.h" #include "trainer_info.h" +#include "unk_0201D15C.h" #include "unk_02030108.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_02051D8C.h" -#include "pokemon.h" -#include "party.h" #include "unk_02096420.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0223AF58.h" typedef struct { u8 unk_00; @@ -34,1336 +35,1336 @@ typedef struct { u16 unk_02; } UnkStruct_ov104_02240364; -void sub_02052894(BattleParams * param0); +void sub_02052894(BattleParams *param0); void ov104_0223AF58(u8 param0, u8 param1, u8 param2, u8 param3, u16 param4[]); void ov104_0223AFB4(u8 param0, u8 param1, int param2, u8 param3, u8 param4, u16 param5[]); void ov104_0223B0C8(u8 param0, u8 param1, u8 param2, u8 param3, u16 param4, u16 param5[], u8 param6); u8 ov104_0223B500(u8 param0); u8 ov104_0223B50C(u8 param0); -BattleParams * ov104_0223B250(UnkStruct_ov104_0223B5C0 * param0, UnkStruct_ov104_02230BE4 * param1); +BattleParams *ov104_0223B250(UnkStruct_ov104_0223B5C0 *param0, UnkStruct_ov104_02230BE4 *param1); static u32 ov104_0223B4D4(u8 param0); -static void ov104_0223B518(UnkStruct_ov104_0223A348_sub2 * param0, u8 param1, u16 param2, u16 param3[], int param4, int param5, int param6); -static u32 ov104_0223B57C(UnkStruct_ov104_0223B5C0 * param0, u8 param1); +static void ov104_0223B518(UnkStruct_ov104_0223A348_sub2 *param0, u8 param1, u16 param2, u16 param3[], int param4, int param5, int param6); +static u32 ov104_0223B57C(UnkStruct_ov104_0223B5C0 *param0, u8 param1); u8 ov104_0223B5A4(u8 param0); -u8 ov104_0223B5C0(UnkStruct_ov104_0223B5C0 * param0); +u8 ov104_0223B5C0(UnkStruct_ov104_0223B5C0 *param0); static u8 ov104_0223B5F0(u8 param0); -static u16 ov104_0223B604(UnkStruct_ov104_0223B5C0 * param0, u8 param1, u8 param2); +static u16 ov104_0223B604(UnkStruct_ov104_0223B5C0 *param0, u8 param1, u8 param2); static u16 ov104_0223B644(u8 param0); -u16 ov104_0223B64C(UnkStruct_ov104_0223B5C0 * param0); -static BOOL ov104_0223B4A4(UnkStruct_ov104_0223B5C0 * param0, u8 param1); +u16 ov104_0223B64C(UnkStruct_ov104_0223B5C0 *param0); +static BOOL ov104_0223B4A4(UnkStruct_ov104_0223B5C0 *param0, u8 param1); BOOL ov104_0223B5B0(u8 param0); static const u16 Unk_ov104_0224041C[10][8] = { - { 0x2, 0x3, 0x14, 0x15, 0x25, 0x24, 0x16, 0x1C }, - { 0x2, 0x3, 0x51, 0x1A, 0x13, 0x50, 0x16, 0x1C }, - { 0x20, 0x21, 0x14, 0x15, 0x25, 0x24, 0x3A, 0x55 }, - { 0x20, 0x21, 0x51, 0x1A, 0x13, 0x50, 0x3A, 0x55 }, - { 0x4, 0x5, 0x47, 0x12, 0x22, 0x23, 0x25, 0x24 }, - { 0x4, 0x5, 0x10, 0x11, 0x22, 0x23, 0x39, 0x34 }, - { 0x3C, 0x3D, 0x47, 0x12, 0x14, 0x15, 0x13, 0x50 }, - { 0x3C, 0x3D, 0x10, 0x11, 0x14, 0x15, 0x39, 0x34 }, - { 0x18, 0x19, 0x47, 0x12, 0x27, 0x28, 0x33, 0x1B }, - { 0x18, 0x19, 0x10, 0x11, 0x27, 0x28, 0x33, 0x1B } + { 0x2, 0x3, 0x14, 0x15, 0x25, 0x24, 0x16, 0x1C }, + { 0x2, 0x3, 0x51, 0x1A, 0x13, 0x50, 0x16, 0x1C }, + { 0x20, 0x21, 0x14, 0x15, 0x25, 0x24, 0x3A, 0x55 }, + { 0x20, 0x21, 0x51, 0x1A, 0x13, 0x50, 0x3A, 0x55 }, + { 0x4, 0x5, 0x47, 0x12, 0x22, 0x23, 0x25, 0x24 }, + { 0x4, 0x5, 0x10, 0x11, 0x22, 0x23, 0x39, 0x34 }, + { 0x3C, 0x3D, 0x47, 0x12, 0x14, 0x15, 0x13, 0x50 }, + { 0x3C, 0x3D, 0x10, 0x11, 0x14, 0x15, 0x39, 0x34 }, + { 0x18, 0x19, 0x47, 0x12, 0x27, 0x28, 0x33, 0x1B }, + { 0x18, 0x19, 0x10, 0x11, 0x27, 0x28, 0x33, 0x1B } }; static const u16 Unk_ov104_0224038C[18][4] = { - { 0x14, 0x15, 0x2, 0x3 }, - { 0x1B, 0x1B, 0x26, 0x26 }, - { 0x2C, 0x2D, 0x2E, 0xB }, - { 0x16, 0x16, 0x3B, 0x3B }, - { 0x7, 0x7, 0x4, 0x5 }, - { 0x35, 0x35, 0x36, 0x36 }, - { 0xE, 0xE, 0xA, 0xA }, - { 0x1C, 0x1C, 0x29, 0x29 }, - { 0x9, 0x9, 0x30, 0x30 }, - { 0x1E, 0x1E, 0x1E, 0x1E }, - { 0x31, 0x31, 0x32, 0x32 }, - { 0x6, 0x6, 0x6, 0x6 }, - { 0x9, 0x9, 0x30, 0x30 }, - { 0x31, 0x31, 0x32, 0x32 }, - { 0x1D, 0x1D, 0x1D, 0x1D }, - { 0x39, 0x39, 0x34, 0x34 }, - { 0x54, 0x53, 0xC, 0xD }, - { 0x55, 0x3A, 0x51, 0x1A } + { 0x14, 0x15, 0x2, 0x3 }, + { 0x1B, 0x1B, 0x26, 0x26 }, + { 0x2C, 0x2D, 0x2E, 0xB }, + { 0x16, 0x16, 0x3B, 0x3B }, + { 0x7, 0x7, 0x4, 0x5 }, + { 0x35, 0x35, 0x36, 0x36 }, + { 0xE, 0xE, 0xA, 0xA }, + { 0x1C, 0x1C, 0x29, 0x29 }, + { 0x9, 0x9, 0x30, 0x30 }, + { 0x1E, 0x1E, 0x1E, 0x1E }, + { 0x31, 0x31, 0x32, 0x32 }, + { 0x6, 0x6, 0x6, 0x6 }, + { 0x9, 0x9, 0x30, 0x30 }, + { 0x31, 0x31, 0x32, 0x32 }, + { 0x1D, 0x1D, 0x1D, 0x1D }, + { 0x39, 0x39, 0x34, 0x34 }, + { 0x54, 0x53, 0xC, 0xD }, + { 0x55, 0x3A, 0x51, 0x1A } }; static const u16 Unk_ov104_022404BC[] = { - 0x2, - 0x2, - 0x2, - 0x3, - 0x3, - 0x3, - 0x3C, - 0x3C, - 0x3C, - 0x3D, - 0x3D, - 0x3D, - 0x20, - 0x20, - 0x20, - 0x21, - 0x21, - 0x21, - 0x4, - 0x4, - 0x4, - 0x5, - 0x5, - 0x5, - 0x2C, - 0x2C, - 0x2C, - 0x2D, - 0x2D, - 0x2D, - 0x34, - 0x34, - 0x34, - 0x55, - 0x55, - 0x55, - 0x14, - 0x14, - 0x14, - 0x15, - 0x15, - 0x15, - 0x51, - 0x51, - 0x51, - 0x1A, - 0x1A, - 0x1A, - 0x6, - 0x6, - 0x6, - 0x1C, - 0x1C, - 0x1C, - 0x16, - 0x16, - 0x16, - 0xB, - 0xB, - 0x30, - 0x30, - 0x25, - 0x25, - 0x50, - 0x50, - 0x50, - 0x24, - 0x24, - 0x24, - 0x7, - 0x7, - 0x7, - 0x34, - 0x34, - 0x1E, - 0x1E, - 0x1E, - 0x2E, - 0x2E, - 0x9, - 0x9, - 0x55, - 0x55, - 0x55, - 0x13, - 0x13, - 0x3B, - 0x3B, - 0x47, - 0x47, - 0x47, - 0x12, - 0x12, - 0x12, - 0x53, - 0x53, - 0x53, - 0x54, - 0x54, - 0x54, - 0xC, - 0xC, - 0xD, - 0xD, - 0xE, - 0xE, - 0xA, - 0xA, - 0xE, - 0xE, - 0xE, - 0xA, - 0xA, - 0xA, - 0x1B, - 0x1B, - 0x1B, - 0x23, - 0x23, - 0x23, - 0x31, - 0x31, - 0x31, - 0x32, - 0x32, - 0x32, - 0x10, - 0x10, - 0x10, - 0x11, - 0x11, - 0x11, - 0x22, - 0x22, - 0x39, - 0x39, - 0x29, - 0x29, - 0x3A, - 0x3A, - 0x18, - 0x18, - 0x18, - 0x19, - 0x19, - 0x19, - 0x27, - 0x27, - 0x27, - 0x28, - 0x28, - 0x28, - 0x1D, - 0x1D, - 0x1D, - 0x1D, - 0x35, - 0x35, - 0x36, - 0x36, - 0x2, - 0x2, - 0x3, - 0x3, - 0x3C, - 0x3C, - 0x3D, - 0x3D, - 0x20, - 0x20, - 0x21, - 0x21, - 0x6, - 0x6, - 0x1C, - 0x1C, - 0x16, - 0x16, - 0x55, - 0x55, - 0x13, - 0x13, - 0xB, - 0xB, - 0x30, - 0x30, - 0x25, - 0x25, - 0x34, - 0x34, - 0x1E, - 0x1E, - 0x2E, - 0x2E, - 0x9, - 0x9, - 0x26, - 0x26, - 0x33, - 0x33, - 0x4, - 0x4, - 0x5, - 0x5, - 0x34, - 0x34, - 0x55, - 0x55, - 0x14, - 0x14, - 0x15, - 0x15, - 0x47, - 0x47, - 0x12, - 0x12, - 0x10, - 0x10, - 0x11, - 0x11, - 0x18, - 0x18, - 0x19, - 0x19, - 0x35, - 0x35, - 0x36, - 0x36, - 0x27, - 0x27, - 0x28, - 0x28, - 0x1D, - 0x1D, - 0xE, - 0xE, - 0xA, - 0xA, - 0x1B, - 0x1B, - 0x23, - 0x23, - 0x31, - 0x31, - 0x32, - 0x32, - 0x51, - 0x51, - 0x1A, - 0x1A, - 0x53, - 0x53, - 0x54, - 0x54, - 0xC, - 0xC, - 0xD, - 0xD, - 0x33, - 0x33, - 0x55, - 0x55, - 0x13, - 0x13, - 0xB, - 0xB, - 0x2E, - 0x2E, - 0x9, - 0x9, - 0x30, - 0x30, - 0x34, - 0x34, - 0x25, - 0x25, - 0x39, - 0x39, - 0x29, - 0x29, - 0x22, - 0x22, - 0x3B, - 0x3B, - 0x3A, - 0x3A, - 0x26, - 0x26, - 0x33, - 0x33, - 0x1E, - 0x1E, - 0x50, - 0x50, - 0x24, - 0x24, - 0x7, - 0x7, - 0x55, - 0x55 + 0x2, + 0x2, + 0x2, + 0x3, + 0x3, + 0x3, + 0x3C, + 0x3C, + 0x3C, + 0x3D, + 0x3D, + 0x3D, + 0x20, + 0x20, + 0x20, + 0x21, + 0x21, + 0x21, + 0x4, + 0x4, + 0x4, + 0x5, + 0x5, + 0x5, + 0x2C, + 0x2C, + 0x2C, + 0x2D, + 0x2D, + 0x2D, + 0x34, + 0x34, + 0x34, + 0x55, + 0x55, + 0x55, + 0x14, + 0x14, + 0x14, + 0x15, + 0x15, + 0x15, + 0x51, + 0x51, + 0x51, + 0x1A, + 0x1A, + 0x1A, + 0x6, + 0x6, + 0x6, + 0x1C, + 0x1C, + 0x1C, + 0x16, + 0x16, + 0x16, + 0xB, + 0xB, + 0x30, + 0x30, + 0x25, + 0x25, + 0x50, + 0x50, + 0x50, + 0x24, + 0x24, + 0x24, + 0x7, + 0x7, + 0x7, + 0x34, + 0x34, + 0x1E, + 0x1E, + 0x1E, + 0x2E, + 0x2E, + 0x9, + 0x9, + 0x55, + 0x55, + 0x55, + 0x13, + 0x13, + 0x3B, + 0x3B, + 0x47, + 0x47, + 0x47, + 0x12, + 0x12, + 0x12, + 0x53, + 0x53, + 0x53, + 0x54, + 0x54, + 0x54, + 0xC, + 0xC, + 0xD, + 0xD, + 0xE, + 0xE, + 0xA, + 0xA, + 0xE, + 0xE, + 0xE, + 0xA, + 0xA, + 0xA, + 0x1B, + 0x1B, + 0x1B, + 0x23, + 0x23, + 0x23, + 0x31, + 0x31, + 0x31, + 0x32, + 0x32, + 0x32, + 0x10, + 0x10, + 0x10, + 0x11, + 0x11, + 0x11, + 0x22, + 0x22, + 0x39, + 0x39, + 0x29, + 0x29, + 0x3A, + 0x3A, + 0x18, + 0x18, + 0x18, + 0x19, + 0x19, + 0x19, + 0x27, + 0x27, + 0x27, + 0x28, + 0x28, + 0x28, + 0x1D, + 0x1D, + 0x1D, + 0x1D, + 0x35, + 0x35, + 0x36, + 0x36, + 0x2, + 0x2, + 0x3, + 0x3, + 0x3C, + 0x3C, + 0x3D, + 0x3D, + 0x20, + 0x20, + 0x21, + 0x21, + 0x6, + 0x6, + 0x1C, + 0x1C, + 0x16, + 0x16, + 0x55, + 0x55, + 0x13, + 0x13, + 0xB, + 0xB, + 0x30, + 0x30, + 0x25, + 0x25, + 0x34, + 0x34, + 0x1E, + 0x1E, + 0x2E, + 0x2E, + 0x9, + 0x9, + 0x26, + 0x26, + 0x33, + 0x33, + 0x4, + 0x4, + 0x5, + 0x5, + 0x34, + 0x34, + 0x55, + 0x55, + 0x14, + 0x14, + 0x15, + 0x15, + 0x47, + 0x47, + 0x12, + 0x12, + 0x10, + 0x10, + 0x11, + 0x11, + 0x18, + 0x18, + 0x19, + 0x19, + 0x35, + 0x35, + 0x36, + 0x36, + 0x27, + 0x27, + 0x28, + 0x28, + 0x1D, + 0x1D, + 0xE, + 0xE, + 0xA, + 0xA, + 0x1B, + 0x1B, + 0x23, + 0x23, + 0x31, + 0x31, + 0x32, + 0x32, + 0x51, + 0x51, + 0x1A, + 0x1A, + 0x53, + 0x53, + 0x54, + 0x54, + 0xC, + 0xC, + 0xD, + 0xD, + 0x33, + 0x33, + 0x55, + 0x55, + 0x13, + 0x13, + 0xB, + 0xB, + 0x2E, + 0x2E, + 0x9, + 0x9, + 0x30, + 0x30, + 0x34, + 0x34, + 0x25, + 0x25, + 0x39, + 0x39, + 0x29, + 0x29, + 0x22, + 0x22, + 0x3B, + 0x3B, + 0x3A, + 0x3A, + 0x26, + 0x26, + 0x33, + 0x33, + 0x1E, + 0x1E, + 0x50, + 0x50, + 0x24, + 0x24, + 0x7, + 0x7, + 0x55, + 0x55 }; static const u16 Unk_ov104_02240ACE[][2] = { - { 0xC, 0x3 }, - { 0xA, 0xA }, - { 0xB, 0xB }, - { 0x6, 0x6 }, - { 0x6, 0x6 }, - { 0x6, 0x3 }, - { 0x6, 0x3 }, - { 0x0, 0x2 }, - { 0x0, 0x0 }, - { 0x0, 0x2 }, - { 0x3, 0x3 }, - { 0xD, 0xD }, - { 0x4, 0x4 }, - { 0x3, 0x3 }, - { 0x3, 0x3 }, - { 0x0, 0x0 }, - { 0xA, 0xA }, - { 0x0, 0x0 }, - { 0x3, 0x2 }, - { 0xC, 0x3 }, - { 0x6, 0xC }, - { 0x6, 0x3 }, - { 0x4, 0x4 }, - { 0x0, 0x0 }, - { 0xB, 0xB }, - { 0x1, 0x1 }, - { 0xB, 0xB }, - { 0xE, 0xE }, - { 0x1, 0x1 }, - { 0xC, 0x3 }, - { 0xB, 0x3 }, - { 0x5, 0x4 }, - { 0xB, 0xE }, - { 0xD, 0x8 }, - { 0x0, 0x2 }, - { 0xB, 0xB }, - { 0x3, 0x3 }, - { 0xB, 0xB }, - { 0x7, 0x3 }, - { 0xE, 0xE }, - { 0xB, 0xB }, - { 0xD, 0xD }, - { 0xC, 0xE }, - { 0x4, 0x4 }, - { 0xB, 0xB }, - { 0xB, 0xB }, - { 0xB, 0xB }, - { 0x0, 0x0 }, - { 0x0, 0x0 }, - { 0x10, 0x10 }, - { 0xC, 0xC }, - { 0xA, 0xA }, - { 0xB, 0xB }, - { 0x0, 0x0 }, - { 0x0, 0x2 }, - { 0x6, 0x2 }, - { 0x6, 0x3 }, - { 0xB, 0xD }, - { 0xD, 0xD }, - { 0x0, 0x0 }, - { 0x0, 0x0 }, - { 0x0, 0x0 }, - { 0xE, 0x2 }, - { 0xD, 0xD }, - { 0xB, 0xB }, - { 0xC, 0x2 }, - { 0xC, 0xC }, - { 0xB, 0x4 }, - { 0xE, 0xE }, - { 0x6, 0x6 }, - { 0x0, 0x0 }, - { 0x0, 0x0 }, - { 0xA, 0xA }, - { 0xF, 0x4 }, - { 0xB, 0xB }, - { 0xF, 0x2 }, - { 0x11, 0xA }, - { 0x4, 0x4 }, - { 0x0, 0x0 }, - { 0x1, 0x1 }, - { 0xF, 0xE }, - { 0x5, 0x4 }, - { 0xC, 0xC }, - { 0xA, 0xA }, - { 0xB, 0xB }, - { 0x11, 0x11 }, - { 0x0, 0x0 }, - { 0x6, 0x6 }, - { 0x6, 0x6 }, - { 0x6, 0x6 }, - { 0xB, 0xC }, - { 0xC, 0xC }, - { 0x0, 0x2 }, - { 0xB, 0x2 }, - { 0xE, 0xE }, - { 0xE, 0xE }, - { 0x6, 0xB }, - { 0xC, 0xC }, - { 0x0, 0x0 }, - { 0x6, 0x4 }, - { 0x6, 0x7 }, - { 0x0, 0x0 }, - { 0x1, 0x1 }, - { 0x0, 0x0 }, - { 0x0, 0x0 }, - { 0x8, 0x5 }, - { 0x1, 0xE }, - { 0xD, 0xD }, - { 0x3, 0x3 }, - { 0xB, 0x11 }, - { 0xA, 0x4 }, - { 0xE, 0xE }, - { 0x4, 0x4 }, - { 0xC, 0xC }, - { 0x0, 0x2 }, - { 0xB, 0x4 }, - { 0xB, 0xB }, - { 0x4, 0xE }, - { 0xB, 0xB }, - { 0x7, 0x7 }, - { 0x7, 0x7 }, - { 0xE, 0xE }, - { 0xF, 0xF }, - { 0xF, 0xB }, - { 0xB, 0xB }, - { 0x10, 0x10 }, - { 0x8, 0xE }, - { 0xC, 0xC }, - { 0xA, 0xA }, - { 0xB, 0xB }, - { 0x0, 0x2 }, - { 0x0, 0x0 }, - { 0x6, 0x6 }, - { 0xD, 0xD }, - { 0xC, 0x3 }, - { 0x6, 0x6 }, - { 0x6, 0x2 }, - { 0xB, 0xB }, - { 0xC, 0xC }, - { 0xB, 0xB }, - { 0x0, 0x0 }, - { 0xE, 0xE }, - { 0x3, 0x11 }, - { 0x8, 0xE }, - { 0x5, 0x5 }, - { 0xE, 0xE }, - { 0x0, 0x0 }, - { 0x10, 0x4 }, - { 0x1, 0x1 }, - { 0x4, 0x4 }, - { 0x3, 0x6 }, - { 0x3, 0x1 }, - { 0xB, 0xB }, - { 0xC, 0xF }, - { 0xC, 0x3 }, - { 0xA, 0xA }, - { 0xB, 0xB }, - { 0x6, 0x2 }, - { 0x6, 0x3 }, - { 0x0, 0x2 }, - { 0x0, 0x0 }, - { 0x3, 0x3 }, - { 0x3, 0x3 }, - { 0x3, 0x3 }, - { 0x0, 0x0 }, - { 0xC, 0x3 }, - { 0x6, 0xC }, - { 0x4, 0x4 }, - { 0xA, 0xA }, - { 0xB, 0xB }, - { 0xE, 0xE }, - { 0x1, 0x1 }, - { 0xC, 0x3 }, - { 0x5, 0x4 }, - { 0xA, 0xA }, - { 0x0, 0x2 }, - { 0x7, 0x3 }, - { 0x5, 0x4 }, - { 0x4, 0x4 }, - { 0x0, 0x0 }, - { 0x3, 0x3 }, - { 0x4, 0x5 }, - { 0xC, 0xC }, - { 0xB, 0xB }, - { 0x0, 0x0 }, - { 0x5, 0xB }, - { 0x5, 0xB }, - { 0x10, 0x10 }, - { 0xC, 0xC }, - { 0xA, 0xA }, - { 0xB, 0xB }, - { 0x0, 0x0 }, - { 0x6, 0x2 }, - { 0x6, 0x3 }, - { 0x0, 0x2 }, - { 0xD, 0xD }, - { 0xB, 0xB }, - { 0x5, 0x5 }, - { 0xC, 0x2 }, - { 0x0, 0x0 }, - { 0xC, 0xC }, - { 0x6, 0x2 }, - { 0xB, 0x4 }, - { 0x11, 0x2 }, - { 0x7, 0x7 }, - { 0xE, 0xE }, - { 0x0, 0x0 }, - { 0x4, 0x2 }, - { 0xB, 0x3 }, - { 0x11, 0xF }, - { 0xA, 0x5 }, - { 0xB, 0x5 }, - { 0xD, 0xD }, - { 0xA, 0xA }, - { 0x5, 0x4 }, - { 0xC, 0xC }, - { 0xA, 0x1 }, - { 0xB, 0x4 }, - { 0x11, 0x11 }, - { 0x0, 0x0 }, - { 0x6, 0x2 }, - { 0x6, 0x3 }, - { 0xB, 0xC }, - { 0xC, 0x11 }, - { 0x0, 0x2 }, - { 0xB, 0x2 }, - { 0x6, 0x2 }, - { 0x0, 0x0 }, - { 0x5, 0x5 }, - { 0x0, 0x0 }, - { 0x11, 0x7 }, - { 0x8, 0x8 }, - { 0x8, 0x5 }, - { 0x1, 0xE }, - { 0xD, 0xD }, - { 0xD, 0xD }, - { 0x6, 0x6 }, - { 0x6, 0x6 }, - { 0xC, 0x3 }, - { 0xB, 0xB }, - { 0x0, 0x0 }, - { 0x4, 0x10 }, - { 0x5, 0xC }, - { 0x5, 0x6 }, - { 0x0, 0x0 }, - { 0xE, 0xE }, - { 0xF, 0xB }, - { 0xB, 0xB }, - { 0x10, 0x10 }, - { 0x8, 0xE }, - { 0xC, 0xC }, - { 0xA, 0x1 }, - { 0xB, 0xB }, - { 0x0, 0x2 }, - { 0x0, 0xB }, - { 0x6, 0x6 }, - { 0xD, 0xD }, - { 0x5, 0x5 }, - { 0x5, 0x8 }, - { 0x6, 0xC }, - { 0x6, 0x2 }, - { 0xD, 0xD }, - { 0x7, 0x2 }, - { 0x0, 0x0 }, - { 0x0, 0x2 }, - { 0x10, 0x4 }, - { 0x0, 0x0 }, - { 0xB, 0x2 }, - { 0x6, 0x4 }, - { 0x6, 0x8 }, - { 0xD, 0xD }, - { 0x4, 0x4 }, - { 0x3, 0x4 }, - { 0x3, 0x4 }, - { 0x0, 0x0 }, - { 0x3, 0x2 }, - { 0xC, 0x3 }, - { 0x6, 0x3 }, - { 0x0, 0x0 }, - { 0x1, 0x1 }, - { 0xE, 0xE }, - { 0xC, 0x3 }, - { 0x5, 0x4 }, - { 0xB, 0xE }, - { 0xD, 0x8 }, - { 0x0, 0x2 }, - { 0xB, 0xF }, - { 0xE, 0xE }, - { 0xB, 0xB }, - { 0xD, 0xD }, - { 0x1, 0x1 }, - { 0x1, 0x1 }, - { 0x3, 0x3 }, - { 0x4, 0x5 }, - { 0x0, 0x0 }, - { 0x0, 0x0 }, - { 0xB, 0xB }, - { 0xB, 0xB }, - { 0xE, 0xE }, - { 0xF, 0xE }, - { 0xD, 0xD }, - { 0xA, 0xA }, - { 0x0, 0x0 }, - { 0x5, 0xB }, - { 0x5, 0xB }, - { 0x0, 0x2 }, - { 0xB, 0xD }, - { 0xE, 0x2 }, - { 0xC, 0xC }, - { 0xC, 0x2 }, - { 0xB, 0xE }, - { 0x0, 0xE }, - { 0x6, 0x8 }, - { 0x0, 0x0 }, - { 0xF, 0x4 }, - { 0xB, 0xB }, - { 0xB, 0x2 }, - { 0x8, 0x2 }, - { 0x0, 0x0 }, - { 0x1, 0x1 }, - { 0x0, 0x0 }, - { 0xB, 0xC }, - { 0xC, 0x11 }, - { 0xC, 0x1 }, - { 0x0, 0x0 }, - { 0x6, 0x2 }, - { 0x0, 0x0 }, - { 0x1, 0x1 }, - { 0xD, 0xD }, - { 0x3, 0x3 }, - { 0xB, 0x11 }, - { 0xA, 0x4 }, - { 0xA, 0xA }, - { 0xE, 0xE }, - { 0xC, 0x11 }, - { 0x10, 0x2 }, - { 0x0, 0x0 }, - { 0x3, 0x3 }, - { 0x5, 0xE }, - { 0x5, 0xE }, - { 0xB, 0x4 }, - { 0xB, 0x11 }, - { 0x5, 0xC }, - { 0x5, 0x6 }, - { 0x0, 0x0 }, - { 0x7, 0x7 }, - { 0x7, 0x7 }, - { 0xC, 0x2 }, - { 0x11, 0x11 }, - { 0xF, 0xF }, - { 0xB, 0xB }, - { 0xB, 0xB }, - { 0xB, 0x5 }, - { 0x0, 0x2 }, - { 0x5, 0x5 }, - { 0x5, 0x8 }, - { 0x6, 0x2 }, - { 0xB, 0xB }, - { 0xC, 0xC }, - { 0xB, 0x4 }, - { 0x0, 0x0 }, - { 0x7, 0x2 }, - { 0x0, 0x0 }, - { 0x7, 0x7 }, - { 0x0, 0x0 }, - { 0x3, 0x11 }, - { 0x7, 0x11 }, - { 0x3, 0x1 }, - { 0xC, 0xC }, - { 0xB, 0xB }, - { 0xC, 0xF }, - { 0xF, 0x7 }, - { 0xD, 0x7 }, - { 0x0, 0x2 }, - { 0x0, 0x2 }, - { 0xB, 0xB }, - { 0xA, 0xA }, - { 0xB, 0xB }, - { 0xA, 0xA }, - { 0xB, 0x1 }, - { 0x1, 0x1 }, - { 0xB, 0x3 }, - { 0xA, 0xA }, - { 0x3, 0x3 }, - { 0xB, 0xF }, - { 0x7, 0x3 }, - { 0xC, 0xE }, - { 0xB, 0xE }, - { 0x6, 0x2 }, - { 0x6, 0x6 }, - { 0xB, 0x2 }, - { 0xB, 0xF }, - { 0xB, 0xB }, - { 0xD, 0xD }, - { 0xA, 0xA }, - { 0x5, 0x2 }, - { 0x0, 0x0 }, - { 0xF, 0x2 }, - { 0xD, 0x2 }, - { 0xA, 0x2 }, - { 0x10, 0x2 }, - { 0xC, 0xC }, - { 0xA, 0xA }, - { 0xB, 0xB }, - { 0x3, 0x2 }, - { 0xD, 0xD }, - { 0xB, 0xB }, - { 0xE, 0xE }, - { 0x11, 0x11 }, - { 0x8, 0x4 }, - { 0x6, 0x8 }, - { 0x6, 0x5 }, - { 0x6, 0x1 }, - { 0x0, 0x0 }, - { 0x11, 0xA }, - { 0xB, 0x10 }, - { 0x4, 0x4 }, - { 0x0, 0x0 }, - { 0x0, 0x0 }, - { 0xD, 0xD }, - { 0xA, 0xA }, - { 0xB, 0xB }, - { 0x5, 0x11 }, - { 0xC, 0xC }, - { 0xA, 0x1 }, - { 0xB, 0x4 }, - { 0xE, 0xE }, - { 0x0, 0x0 }, - { 0x8, 0x5 }, - { 0xB, 0xB }, - { 0x4, 0x10 }, - { 0x4, 0xE }, - { 0xB, 0xB }, - { 0xF, 0xB }, - { 0xE, 0xE }, - { 0x10, 0x2 }, - { 0x8, 0xE }, - { 0x5, 0x5 }, - { 0xF, 0xF }, - { 0x8, 0x8 }, - { 0x10, 0xE }, - { 0x10, 0xE }, - { 0xC, 0x4 }, - { 0xA, 0x1 }, - { 0xB, 0x8 }, - { 0xD, 0xD }, - { 0xC, 0x3 }, - { 0x11, 0x2 }, - { 0x8, 0xE }, - { 0x10, 0x4 }, - { 0x1, 0x8 }, - { 0x4, 0x4 }, - { 0x3, 0x11 }, - { 0x11, 0xF }, - { 0xD, 0x8 }, - { 0x0, 0x0 }, - { 0x4, 0x5 }, - { 0xC, 0xC }, - { 0xD, 0xD }, - { 0xA, 0xA }, - { 0x0, 0x2 }, - { 0x6, 0x2 }, - { 0xC, 0xC }, - { 0xF, 0xF }, - { 0x4, 0x2 }, - { 0xF, 0x4 }, - { 0x0, 0x0 }, - { 0xE, 0x1 }, - { 0x5, 0x8 }, - { 0x7, 0x7 }, - { 0xE, 0xE }, - { 0xE, 0xE }, - { 0xE, 0xE }, - { 0xA, 0x8 }, - { 0xC, 0x3 }, - { 0xA, 0x2 }, - { 0x0, 0x0 } + { 0xC, 0x3 }, + { 0xA, 0xA }, + { 0xB, 0xB }, + { 0x6, 0x6 }, + { 0x6, 0x6 }, + { 0x6, 0x3 }, + { 0x6, 0x3 }, + { 0x0, 0x2 }, + { 0x0, 0x0 }, + { 0x0, 0x2 }, + { 0x3, 0x3 }, + { 0xD, 0xD }, + { 0x4, 0x4 }, + { 0x3, 0x3 }, + { 0x3, 0x3 }, + { 0x0, 0x0 }, + { 0xA, 0xA }, + { 0x0, 0x0 }, + { 0x3, 0x2 }, + { 0xC, 0x3 }, + { 0x6, 0xC }, + { 0x6, 0x3 }, + { 0x4, 0x4 }, + { 0x0, 0x0 }, + { 0xB, 0xB }, + { 0x1, 0x1 }, + { 0xB, 0xB }, + { 0xE, 0xE }, + { 0x1, 0x1 }, + { 0xC, 0x3 }, + { 0xB, 0x3 }, + { 0x5, 0x4 }, + { 0xB, 0xE }, + { 0xD, 0x8 }, + { 0x0, 0x2 }, + { 0xB, 0xB }, + { 0x3, 0x3 }, + { 0xB, 0xB }, + { 0x7, 0x3 }, + { 0xE, 0xE }, + { 0xB, 0xB }, + { 0xD, 0xD }, + { 0xC, 0xE }, + { 0x4, 0x4 }, + { 0xB, 0xB }, + { 0xB, 0xB }, + { 0xB, 0xB }, + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0x10, 0x10 }, + { 0xC, 0xC }, + { 0xA, 0xA }, + { 0xB, 0xB }, + { 0x0, 0x0 }, + { 0x0, 0x2 }, + { 0x6, 0x2 }, + { 0x6, 0x3 }, + { 0xB, 0xD }, + { 0xD, 0xD }, + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0xE, 0x2 }, + { 0xD, 0xD }, + { 0xB, 0xB }, + { 0xC, 0x2 }, + { 0xC, 0xC }, + { 0xB, 0x4 }, + { 0xE, 0xE }, + { 0x6, 0x6 }, + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0xA, 0xA }, + { 0xF, 0x4 }, + { 0xB, 0xB }, + { 0xF, 0x2 }, + { 0x11, 0xA }, + { 0x4, 0x4 }, + { 0x0, 0x0 }, + { 0x1, 0x1 }, + { 0xF, 0xE }, + { 0x5, 0x4 }, + { 0xC, 0xC }, + { 0xA, 0xA }, + { 0xB, 0xB }, + { 0x11, 0x11 }, + { 0x0, 0x0 }, + { 0x6, 0x6 }, + { 0x6, 0x6 }, + { 0x6, 0x6 }, + { 0xB, 0xC }, + { 0xC, 0xC }, + { 0x0, 0x2 }, + { 0xB, 0x2 }, + { 0xE, 0xE }, + { 0xE, 0xE }, + { 0x6, 0xB }, + { 0xC, 0xC }, + { 0x0, 0x0 }, + { 0x6, 0x4 }, + { 0x6, 0x7 }, + { 0x0, 0x0 }, + { 0x1, 0x1 }, + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0x8, 0x5 }, + { 0x1, 0xE }, + { 0xD, 0xD }, + { 0x3, 0x3 }, + { 0xB, 0x11 }, + { 0xA, 0x4 }, + { 0xE, 0xE }, + { 0x4, 0x4 }, + { 0xC, 0xC }, + { 0x0, 0x2 }, + { 0xB, 0x4 }, + { 0xB, 0xB }, + { 0x4, 0xE }, + { 0xB, 0xB }, + { 0x7, 0x7 }, + { 0x7, 0x7 }, + { 0xE, 0xE }, + { 0xF, 0xF }, + { 0xF, 0xB }, + { 0xB, 0xB }, + { 0x10, 0x10 }, + { 0x8, 0xE }, + { 0xC, 0xC }, + { 0xA, 0xA }, + { 0xB, 0xB }, + { 0x0, 0x2 }, + { 0x0, 0x0 }, + { 0x6, 0x6 }, + { 0xD, 0xD }, + { 0xC, 0x3 }, + { 0x6, 0x6 }, + { 0x6, 0x2 }, + { 0xB, 0xB }, + { 0xC, 0xC }, + { 0xB, 0xB }, + { 0x0, 0x0 }, + { 0xE, 0xE }, + { 0x3, 0x11 }, + { 0x8, 0xE }, + { 0x5, 0x5 }, + { 0xE, 0xE }, + { 0x0, 0x0 }, + { 0x10, 0x4 }, + { 0x1, 0x1 }, + { 0x4, 0x4 }, + { 0x3, 0x6 }, + { 0x3, 0x1 }, + { 0xB, 0xB }, + { 0xC, 0xF }, + { 0xC, 0x3 }, + { 0xA, 0xA }, + { 0xB, 0xB }, + { 0x6, 0x2 }, + { 0x6, 0x3 }, + { 0x0, 0x2 }, + { 0x0, 0x0 }, + { 0x3, 0x3 }, + { 0x3, 0x3 }, + { 0x3, 0x3 }, + { 0x0, 0x0 }, + { 0xC, 0x3 }, + { 0x6, 0xC }, + { 0x4, 0x4 }, + { 0xA, 0xA }, + { 0xB, 0xB }, + { 0xE, 0xE }, + { 0x1, 0x1 }, + { 0xC, 0x3 }, + { 0x5, 0x4 }, + { 0xA, 0xA }, + { 0x0, 0x2 }, + { 0x7, 0x3 }, + { 0x5, 0x4 }, + { 0x4, 0x4 }, + { 0x0, 0x0 }, + { 0x3, 0x3 }, + { 0x4, 0x5 }, + { 0xC, 0xC }, + { 0xB, 0xB }, + { 0x0, 0x0 }, + { 0x5, 0xB }, + { 0x5, 0xB }, + { 0x10, 0x10 }, + { 0xC, 0xC }, + { 0xA, 0xA }, + { 0xB, 0xB }, + { 0x0, 0x0 }, + { 0x6, 0x2 }, + { 0x6, 0x3 }, + { 0x0, 0x2 }, + { 0xD, 0xD }, + { 0xB, 0xB }, + { 0x5, 0x5 }, + { 0xC, 0x2 }, + { 0x0, 0x0 }, + { 0xC, 0xC }, + { 0x6, 0x2 }, + { 0xB, 0x4 }, + { 0x11, 0x2 }, + { 0x7, 0x7 }, + { 0xE, 0xE }, + { 0x0, 0x0 }, + { 0x4, 0x2 }, + { 0xB, 0x3 }, + { 0x11, 0xF }, + { 0xA, 0x5 }, + { 0xB, 0x5 }, + { 0xD, 0xD }, + { 0xA, 0xA }, + { 0x5, 0x4 }, + { 0xC, 0xC }, + { 0xA, 0x1 }, + { 0xB, 0x4 }, + { 0x11, 0x11 }, + { 0x0, 0x0 }, + { 0x6, 0x2 }, + { 0x6, 0x3 }, + { 0xB, 0xC }, + { 0xC, 0x11 }, + { 0x0, 0x2 }, + { 0xB, 0x2 }, + { 0x6, 0x2 }, + { 0x0, 0x0 }, + { 0x5, 0x5 }, + { 0x0, 0x0 }, + { 0x11, 0x7 }, + { 0x8, 0x8 }, + { 0x8, 0x5 }, + { 0x1, 0xE }, + { 0xD, 0xD }, + { 0xD, 0xD }, + { 0x6, 0x6 }, + { 0x6, 0x6 }, + { 0xC, 0x3 }, + { 0xB, 0xB }, + { 0x0, 0x0 }, + { 0x4, 0x10 }, + { 0x5, 0xC }, + { 0x5, 0x6 }, + { 0x0, 0x0 }, + { 0xE, 0xE }, + { 0xF, 0xB }, + { 0xB, 0xB }, + { 0x10, 0x10 }, + { 0x8, 0xE }, + { 0xC, 0xC }, + { 0xA, 0x1 }, + { 0xB, 0xB }, + { 0x0, 0x2 }, + { 0x0, 0xB }, + { 0x6, 0x6 }, + { 0xD, 0xD }, + { 0x5, 0x5 }, + { 0x5, 0x8 }, + { 0x6, 0xC }, + { 0x6, 0x2 }, + { 0xD, 0xD }, + { 0x7, 0x2 }, + { 0x0, 0x0 }, + { 0x0, 0x2 }, + { 0x10, 0x4 }, + { 0x0, 0x0 }, + { 0xB, 0x2 }, + { 0x6, 0x4 }, + { 0x6, 0x8 }, + { 0xD, 0xD }, + { 0x4, 0x4 }, + { 0x3, 0x4 }, + { 0x3, 0x4 }, + { 0x0, 0x0 }, + { 0x3, 0x2 }, + { 0xC, 0x3 }, + { 0x6, 0x3 }, + { 0x0, 0x0 }, + { 0x1, 0x1 }, + { 0xE, 0xE }, + { 0xC, 0x3 }, + { 0x5, 0x4 }, + { 0xB, 0xE }, + { 0xD, 0x8 }, + { 0x0, 0x2 }, + { 0xB, 0xF }, + { 0xE, 0xE }, + { 0xB, 0xB }, + { 0xD, 0xD }, + { 0x1, 0x1 }, + { 0x1, 0x1 }, + { 0x3, 0x3 }, + { 0x4, 0x5 }, + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0xB, 0xB }, + { 0xB, 0xB }, + { 0xE, 0xE }, + { 0xF, 0xE }, + { 0xD, 0xD }, + { 0xA, 0xA }, + { 0x0, 0x0 }, + { 0x5, 0xB }, + { 0x5, 0xB }, + { 0x0, 0x2 }, + { 0xB, 0xD }, + { 0xE, 0x2 }, + { 0xC, 0xC }, + { 0xC, 0x2 }, + { 0xB, 0xE }, + { 0x0, 0xE }, + { 0x6, 0x8 }, + { 0x0, 0x0 }, + { 0xF, 0x4 }, + { 0xB, 0xB }, + { 0xB, 0x2 }, + { 0x8, 0x2 }, + { 0x0, 0x0 }, + { 0x1, 0x1 }, + { 0x0, 0x0 }, + { 0xB, 0xC }, + { 0xC, 0x11 }, + { 0xC, 0x1 }, + { 0x0, 0x0 }, + { 0x6, 0x2 }, + { 0x0, 0x0 }, + { 0x1, 0x1 }, + { 0xD, 0xD }, + { 0x3, 0x3 }, + { 0xB, 0x11 }, + { 0xA, 0x4 }, + { 0xA, 0xA }, + { 0xE, 0xE }, + { 0xC, 0x11 }, + { 0x10, 0x2 }, + { 0x0, 0x0 }, + { 0x3, 0x3 }, + { 0x5, 0xE }, + { 0x5, 0xE }, + { 0xB, 0x4 }, + { 0xB, 0x11 }, + { 0x5, 0xC }, + { 0x5, 0x6 }, + { 0x0, 0x0 }, + { 0x7, 0x7 }, + { 0x7, 0x7 }, + { 0xC, 0x2 }, + { 0x11, 0x11 }, + { 0xF, 0xF }, + { 0xB, 0xB }, + { 0xB, 0xB }, + { 0xB, 0x5 }, + { 0x0, 0x2 }, + { 0x5, 0x5 }, + { 0x5, 0x8 }, + { 0x6, 0x2 }, + { 0xB, 0xB }, + { 0xC, 0xC }, + { 0xB, 0x4 }, + { 0x0, 0x0 }, + { 0x7, 0x2 }, + { 0x0, 0x0 }, + { 0x7, 0x7 }, + { 0x0, 0x0 }, + { 0x3, 0x11 }, + { 0x7, 0x11 }, + { 0x3, 0x1 }, + { 0xC, 0xC }, + { 0xB, 0xB }, + { 0xC, 0xF }, + { 0xF, 0x7 }, + { 0xD, 0x7 }, + { 0x0, 0x2 }, + { 0x0, 0x2 }, + { 0xB, 0xB }, + { 0xA, 0xA }, + { 0xB, 0xB }, + { 0xA, 0xA }, + { 0xB, 0x1 }, + { 0x1, 0x1 }, + { 0xB, 0x3 }, + { 0xA, 0xA }, + { 0x3, 0x3 }, + { 0xB, 0xF }, + { 0x7, 0x3 }, + { 0xC, 0xE }, + { 0xB, 0xE }, + { 0x6, 0x2 }, + { 0x6, 0x6 }, + { 0xB, 0x2 }, + { 0xB, 0xF }, + { 0xB, 0xB }, + { 0xD, 0xD }, + { 0xA, 0xA }, + { 0x5, 0x2 }, + { 0x0, 0x0 }, + { 0xF, 0x2 }, + { 0xD, 0x2 }, + { 0xA, 0x2 }, + { 0x10, 0x2 }, + { 0xC, 0xC }, + { 0xA, 0xA }, + { 0xB, 0xB }, + { 0x3, 0x2 }, + { 0xD, 0xD }, + { 0xB, 0xB }, + { 0xE, 0xE }, + { 0x11, 0x11 }, + { 0x8, 0x4 }, + { 0x6, 0x8 }, + { 0x6, 0x5 }, + { 0x6, 0x1 }, + { 0x0, 0x0 }, + { 0x11, 0xA }, + { 0xB, 0x10 }, + { 0x4, 0x4 }, + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0xD, 0xD }, + { 0xA, 0xA }, + { 0xB, 0xB }, + { 0x5, 0x11 }, + { 0xC, 0xC }, + { 0xA, 0x1 }, + { 0xB, 0x4 }, + { 0xE, 0xE }, + { 0x0, 0x0 }, + { 0x8, 0x5 }, + { 0xB, 0xB }, + { 0x4, 0x10 }, + { 0x4, 0xE }, + { 0xB, 0xB }, + { 0xF, 0xB }, + { 0xE, 0xE }, + { 0x10, 0x2 }, + { 0x8, 0xE }, + { 0x5, 0x5 }, + { 0xF, 0xF }, + { 0x8, 0x8 }, + { 0x10, 0xE }, + { 0x10, 0xE }, + { 0xC, 0x4 }, + { 0xA, 0x1 }, + { 0xB, 0x8 }, + { 0xD, 0xD }, + { 0xC, 0x3 }, + { 0x11, 0x2 }, + { 0x8, 0xE }, + { 0x10, 0x4 }, + { 0x1, 0x8 }, + { 0x4, 0x4 }, + { 0x3, 0x11 }, + { 0x11, 0xF }, + { 0xD, 0x8 }, + { 0x0, 0x0 }, + { 0x4, 0x5 }, + { 0xC, 0xC }, + { 0xD, 0xD }, + { 0xA, 0xA }, + { 0x0, 0x2 }, + { 0x6, 0x2 }, + { 0xC, 0xC }, + { 0xF, 0xF }, + { 0x4, 0x2 }, + { 0xF, 0x4 }, + { 0x0, 0x0 }, + { 0xE, 0x1 }, + { 0x5, 0x8 }, + { 0x7, 0x7 }, + { 0xE, 0xE }, + { 0xE, 0xE }, + { 0xE, 0xE }, + { 0xA, 0x8 }, + { 0xC, 0x3 }, + { 0xA, 0x2 }, + { 0x0, 0x0 } }; static const u16 Unk_ov104_02240714[] = { - 0x1, - 0x4, - 0x7, - 0xA, - 0xB, - 0xD, - 0xE, - 0x10, - 0x13, - 0x15, - 0x17, - 0x19, - 0x1B, - 0x1D, - 0x20, - 0x23, - 0x25, - 0x27, - 0x29, - 0x2B, - 0x2E, - 0x30, - 0x32, - 0x34, - 0x36, - 0x38, - 0x3C, - 0x3F, - 0x42, - 0x45, - 0x48, - 0x4A, - 0x4F, - 0x51, - 0x54, - 0x56, - 0x58, - 0x5A, - 0x5C, - 0x60, - 0x62, - 0x64, - 0x66, - 0x68, - 0x74, - 0x76, - 0x81, - 0x84, - 0x85, - 0x93, - 0x98, - 0x9B, - 0x9E, - 0xA1, - 0xA3, - 0xA5, - 0xA7, - 0xAA, - 0xAC, - 0xAD, - 0xAE, - 0xAF, - 0xB1, - 0xB3, - 0xB7, - 0xBB, - 0xBF, - 0xC2, - 0xC9, - 0xCC, - 0xD1, - 0xD8, - 0xDA, - 0xDC, - 0xDF, - 0xE1, - 0xE4, - 0xE7, - 0xEB, - 0xEC, - 0xEE, - 0xF6, - 0xFC, - 0xFF, - 0x102, - 0x105, - 0x107, - 0x109, - 0x10A, - 0x10C, - 0x10E, - 0x111, - 0x114, - 0x116, - 0x118, - 0x119, - 0x11B, - 0x11D, - 0x11F, - 0x122, - 0x124, - 0x125, - 0x128, - 0x12A, - 0x12C, - 0x130, - 0x133, - 0x135, - 0x13C, - 0x13E, - 0x142, - 0x145, - 0x148, - 0x14B, - 0x14D, - 0x153, - 0x155, - 0x157, - 0x15D, - 0x161, - 0x163, - 0x168, - 0x169, - 0x16B, - 0x172, - 0x173, - 0x176, - 0x183, - 0x186, - 0x189, - 0x18C, - 0x18F, - 0x191, - 0x193, - 0x196, - 0x19C, - 0x19F, - 0x1A2, - 0x1A4, - 0x1A6, - 0x1AF, - 0x1B1, - 0x1B2, - 0x1B4, - 0x1B6, - 0x1B7, - 0x1B8, - 0x1BB, - 0x1BF, - 0x1C1, - 0x1C3, - 0x1C5, - 0x1C8, - 0x1CB, - 0x2, - 0x5, - 0x8, - 0xC, - 0xF, - 0x11, - 0x14, - 0x18, - 0x1E, - 0x21, - 0x28, - 0x2C, - 0x2F, - 0x33, - 0x3A, - 0x3D, - 0x40, - 0x43, - 0x46, - 0x4B, - 0x4D, - 0x53, - 0x5D, - 0x5F, - 0x69, - 0x6C, - 0x6D, - 0x6F, - 0x72, - 0x78, - 0x89, - 0x8A, - 0x8C, - 0x94, - 0x99, - 0x9C, - 0x9F, - 0xA2, - 0xA6, - 0xA8, - 0xB0, - 0xB4, - 0xB8, - 0xB9, - 0xBC, - 0xBE, - 0xC0, - 0xC1, - 0xC3, - 0xC6, - 0xC8, - 0xCA, - 0xCE, - 0xCF, - 0xD3, - 0xD7, - 0xDB, - 0xDE, - 0xEF, - 0xF0, - 0xF7, - 0xFD, - 0x100, - 0x103, - 0x106, - 0x108, - 0x10B, - 0x10D, - 0x10F, - 0x112, - 0x115, - 0x117, - 0x11C, - 0x126, - 0x12B, - 0x12D, - 0x12E, - 0x12F, - 0x131, - 0x134, - 0x137, - 0x138, - 0x139, - 0x13A, - 0x13B, - 0x140, - 0x147, - 0x149, - 0x159, - 0x15B, - 0x15F, - 0x166, - 0x16C, - 0x16E, - 0x174, - 0x177, - 0x184, - 0x187, - 0x18A, - 0x18D, - 0x190, - 0x192, - 0x194, - 0x198, - 0x19A, - 0x19D, - 0x19E, - 0x1A1, - 0x1A9, - 0x1AB, - 0x1B9, - 0x1BC, - 0x1BE, - 0x1CA, - 0x19D, - 0x19D, - 0x1A, - 0x1C, - 0x1F, - 0x22, - 0x24, - 0x2A, - 0x2D, - 0x31, - 0x35, - 0x39, - 0x41, - 0x47, - 0x4C, - 0x50, - 0x52, - 0x55, - 0x57, - 0x61, - 0x63, - 0x65, - 0x6A, - 0x6B, - 0x6E, - 0x70, - 0x71, - 0x73, - 0x75, - 0x77, - 0x7A, - 0x7C, - 0x7D, - 0x7E, - 0x80, - 0x8B, - 0x8D, - 0xA4, - 0xAB, - 0xB2, - 0xB6, - 0xBD, - 0xC7, - 0xCB, - 0xCD, - 0xD2, - 0xDD, - 0xE0, - 0xE2, - 0xE3, - 0xEA, - 0xED, - 0xF1, - 0x110, - 0x113, - 0x11E, - 0x120, - 0x123, - 0x127, - 0x129, - 0x136, - 0x13D, - 0x13F, - 0x143, - 0x144, - 0x146, - 0x14C, - 0x14E, - 0x14F, - 0x150, - 0x151, - 0x152, - 0x154, - 0x156, - 0x15A, - 0x15C, - 0x160, - 0x162, - 0x164, - 0x165, - 0x167, - 0x16A, - 0x16F, - 0x170, - 0x171, - 0x18E, - 0x199, - 0x19B, - 0x1A0, - 0x1A3, - 0x1A5, - 0x1A7, - 0x1A8, - 0x1AA, - 0x1AC, - 0x1AD, - 0x1B0, - 0x1B3, - 0x1BA, - 0x1C6, - 0x1C7, - 0x1C9, - 0x1CC, - 0x1DE, - 0x1DF, - 0x12, - 0x16, - 0x9, - 0x26, - 0x37, - 0x3B, - 0x3E, - 0x44, - 0x49, - 0x4E, - 0x59, - 0x5B, - 0x5E, - 0x67, - 0x79, - 0x7B, - 0x7F, - 0x82, - 0x83, - 0x86, - 0x87, - 0x88, - 0x8E, - 0x8F, - 0x90, - 0x91, - 0x92, - 0x95, - 0x9A, - 0x9D, - 0xA0, - 0xA9, - 0xB5, - 0xBA, - 0xC4, - 0xC5, - 0xD0, - 0xD4, - 0xD5, - 0xD6, - 0xD9, - 0xE5, - 0xE6, - 0xE8, - 0xE9, - 0xF2, - 0xF3, - 0xF4, - 0xF5, - 0xF8, - 0xFE, - 0x101, - 0x104, - 0x11A, - 0x121, - 0x132, - 0x141, - 0x14A, - 0x158, - 0x15E, - 0x16D, - 0x1E8, - 0x175, - 0x178, - 0x179, - 0x17A, - 0x17B, - 0x17C, - 0x17D, - 0x185, - 0x188, - 0x18B, - 0x195, - 0x197, - 0x1AE, - 0x1B5, - 0x1BD, - 0x1C0, - 0x1C2, - 0x1C4, - 0x1CD, - 0x1CE, - 0x1CF, - 0x1D0, - 0x1D1, - 0x1D2, - 0x1D3, - 0x1D4, - 0x1D5, - 0x1D6, - 0x1D7, - 0x1D8, - 0x1D9, - 0x1DA, - 0x1DB, - 0x1DC, - 0x1DD, - 0x1E0, - 0x1E1, - 0x1E2, - 0x1E5, - 0x3, - 0x6, - 0x1E6 + 0x1, + 0x4, + 0x7, + 0xA, + 0xB, + 0xD, + 0xE, + 0x10, + 0x13, + 0x15, + 0x17, + 0x19, + 0x1B, + 0x1D, + 0x20, + 0x23, + 0x25, + 0x27, + 0x29, + 0x2B, + 0x2E, + 0x30, + 0x32, + 0x34, + 0x36, + 0x38, + 0x3C, + 0x3F, + 0x42, + 0x45, + 0x48, + 0x4A, + 0x4F, + 0x51, + 0x54, + 0x56, + 0x58, + 0x5A, + 0x5C, + 0x60, + 0x62, + 0x64, + 0x66, + 0x68, + 0x74, + 0x76, + 0x81, + 0x84, + 0x85, + 0x93, + 0x98, + 0x9B, + 0x9E, + 0xA1, + 0xA3, + 0xA5, + 0xA7, + 0xAA, + 0xAC, + 0xAD, + 0xAE, + 0xAF, + 0xB1, + 0xB3, + 0xB7, + 0xBB, + 0xBF, + 0xC2, + 0xC9, + 0xCC, + 0xD1, + 0xD8, + 0xDA, + 0xDC, + 0xDF, + 0xE1, + 0xE4, + 0xE7, + 0xEB, + 0xEC, + 0xEE, + 0xF6, + 0xFC, + 0xFF, + 0x102, + 0x105, + 0x107, + 0x109, + 0x10A, + 0x10C, + 0x10E, + 0x111, + 0x114, + 0x116, + 0x118, + 0x119, + 0x11B, + 0x11D, + 0x11F, + 0x122, + 0x124, + 0x125, + 0x128, + 0x12A, + 0x12C, + 0x130, + 0x133, + 0x135, + 0x13C, + 0x13E, + 0x142, + 0x145, + 0x148, + 0x14B, + 0x14D, + 0x153, + 0x155, + 0x157, + 0x15D, + 0x161, + 0x163, + 0x168, + 0x169, + 0x16B, + 0x172, + 0x173, + 0x176, + 0x183, + 0x186, + 0x189, + 0x18C, + 0x18F, + 0x191, + 0x193, + 0x196, + 0x19C, + 0x19F, + 0x1A2, + 0x1A4, + 0x1A6, + 0x1AF, + 0x1B1, + 0x1B2, + 0x1B4, + 0x1B6, + 0x1B7, + 0x1B8, + 0x1BB, + 0x1BF, + 0x1C1, + 0x1C3, + 0x1C5, + 0x1C8, + 0x1CB, + 0x2, + 0x5, + 0x8, + 0xC, + 0xF, + 0x11, + 0x14, + 0x18, + 0x1E, + 0x21, + 0x28, + 0x2C, + 0x2F, + 0x33, + 0x3A, + 0x3D, + 0x40, + 0x43, + 0x46, + 0x4B, + 0x4D, + 0x53, + 0x5D, + 0x5F, + 0x69, + 0x6C, + 0x6D, + 0x6F, + 0x72, + 0x78, + 0x89, + 0x8A, + 0x8C, + 0x94, + 0x99, + 0x9C, + 0x9F, + 0xA2, + 0xA6, + 0xA8, + 0xB0, + 0xB4, + 0xB8, + 0xB9, + 0xBC, + 0xBE, + 0xC0, + 0xC1, + 0xC3, + 0xC6, + 0xC8, + 0xCA, + 0xCE, + 0xCF, + 0xD3, + 0xD7, + 0xDB, + 0xDE, + 0xEF, + 0xF0, + 0xF7, + 0xFD, + 0x100, + 0x103, + 0x106, + 0x108, + 0x10B, + 0x10D, + 0x10F, + 0x112, + 0x115, + 0x117, + 0x11C, + 0x126, + 0x12B, + 0x12D, + 0x12E, + 0x12F, + 0x131, + 0x134, + 0x137, + 0x138, + 0x139, + 0x13A, + 0x13B, + 0x140, + 0x147, + 0x149, + 0x159, + 0x15B, + 0x15F, + 0x166, + 0x16C, + 0x16E, + 0x174, + 0x177, + 0x184, + 0x187, + 0x18A, + 0x18D, + 0x190, + 0x192, + 0x194, + 0x198, + 0x19A, + 0x19D, + 0x19E, + 0x1A1, + 0x1A9, + 0x1AB, + 0x1B9, + 0x1BC, + 0x1BE, + 0x1CA, + 0x19D, + 0x19D, + 0x1A, + 0x1C, + 0x1F, + 0x22, + 0x24, + 0x2A, + 0x2D, + 0x31, + 0x35, + 0x39, + 0x41, + 0x47, + 0x4C, + 0x50, + 0x52, + 0x55, + 0x57, + 0x61, + 0x63, + 0x65, + 0x6A, + 0x6B, + 0x6E, + 0x70, + 0x71, + 0x73, + 0x75, + 0x77, + 0x7A, + 0x7C, + 0x7D, + 0x7E, + 0x80, + 0x8B, + 0x8D, + 0xA4, + 0xAB, + 0xB2, + 0xB6, + 0xBD, + 0xC7, + 0xCB, + 0xCD, + 0xD2, + 0xDD, + 0xE0, + 0xE2, + 0xE3, + 0xEA, + 0xED, + 0xF1, + 0x110, + 0x113, + 0x11E, + 0x120, + 0x123, + 0x127, + 0x129, + 0x136, + 0x13D, + 0x13F, + 0x143, + 0x144, + 0x146, + 0x14C, + 0x14E, + 0x14F, + 0x150, + 0x151, + 0x152, + 0x154, + 0x156, + 0x15A, + 0x15C, + 0x160, + 0x162, + 0x164, + 0x165, + 0x167, + 0x16A, + 0x16F, + 0x170, + 0x171, + 0x18E, + 0x199, + 0x19B, + 0x1A0, + 0x1A3, + 0x1A5, + 0x1A7, + 0x1A8, + 0x1AA, + 0x1AC, + 0x1AD, + 0x1B0, + 0x1B3, + 0x1BA, + 0x1C6, + 0x1C7, + 0x1C9, + 0x1CC, + 0x1DE, + 0x1DF, + 0x12, + 0x16, + 0x9, + 0x26, + 0x37, + 0x3B, + 0x3E, + 0x44, + 0x49, + 0x4E, + 0x59, + 0x5B, + 0x5E, + 0x67, + 0x79, + 0x7B, + 0x7F, + 0x82, + 0x83, + 0x86, + 0x87, + 0x88, + 0x8E, + 0x8F, + 0x90, + 0x91, + 0x92, + 0x95, + 0x9A, + 0x9D, + 0xA0, + 0xA9, + 0xB5, + 0xBA, + 0xC4, + 0xC5, + 0xD0, + 0xD4, + 0xD5, + 0xD6, + 0xD9, + 0xE5, + 0xE6, + 0xE8, + 0xE9, + 0xF2, + 0xF3, + 0xF4, + 0xF5, + 0xF8, + 0xFE, + 0x101, + 0x104, + 0x11A, + 0x121, + 0x132, + 0x141, + 0x14A, + 0x158, + 0x15E, + 0x16D, + 0x1E8, + 0x175, + 0x178, + 0x179, + 0x17A, + 0x17B, + 0x17C, + 0x17D, + 0x185, + 0x188, + 0x18B, + 0x195, + 0x197, + 0x1AE, + 0x1B5, + 0x1BD, + 0x1C0, + 0x1C2, + 0x1C4, + 0x1CD, + 0x1CE, + 0x1CF, + 0x1D0, + 0x1D1, + 0x1D2, + 0x1D3, + 0x1D4, + 0x1D5, + 0x1D6, + 0x1D7, + 0x1D8, + 0x1D9, + 0x1DA, + 0x1DB, + 0x1DC, + 0x1DD, + 0x1E0, + 0x1E1, + 0x1E2, + 0x1E5, + 0x3, + 0x6, + 0x1E6 }; static const UnkStruct_ov104_0224033C Unk_ov104_0224033C[10] = { - {0x0, 0x8, 0x0}, - {0x0, 0xA, 0x0}, - {0x0, 0xC, 0x0}, - {0x0, 0xE, 0x0}, - {0x0, 0x10, 0x0}, - {0x0, 0x12, 0x0}, - {0x0, 0x14, 0x0}, - {0x0, 0x16, 0x0}, - {0x0, 0x18, 0x0}, - {0x0, 0x1A, 0x0} + { 0x0, 0x8, 0x0 }, + { 0x0, 0xA, 0x0 }, + { 0x0, 0xC, 0x0 }, + { 0x0, 0xE, 0x0 }, + { 0x0, 0x10, 0x0 }, + { 0x0, 0x12, 0x0 }, + { 0x0, 0x14, 0x0 }, + { 0x0, 0x16, 0x0 }, + { 0x0, 0x18, 0x0 }, + { 0x0, 0x1A, 0x0 } }; -void ov104_0223AF58 (u8 param0, u8 param1, u8 param2, u8 param3, u16 param4[]) +void ov104_0223AF58(u8 param0, u8 param1, u8 param2, u8 param3, u16 param4[]) { int v0; u16 v1; @@ -1388,7 +1389,7 @@ void ov104_0223AF58 (u8 param0, u8 param1, u8 param2, u8 param3, u16 param4[]) return; } -void ov104_0223AFB4 (u8 param0, u8 param1, int param2, u8 param3, u8 param4, u16 param5[]) +void ov104_0223AFB4(u8 param0, u8 param1, int param2, u8 param3, u8 param4, u16 param5[]) { int v0, v1, v2, v3, v4; u16 v5, v6; @@ -1454,28 +1455,28 @@ void ov104_0223AFB4 (u8 param0, u8 param1, int param2, u8 param3, u8 param4, u16 } static const UnkStruct_ov104_02240364 Unk_ov104_02240364[] = { - {0x1, 0x9A}, - {0x1, 0x9A}, - {0x1, 0x10E}, - {0x1, 0x10E}, - {0x1, 0x10E}, - {0x9B, 0x177}, - {0x9B, 0x177}, - {0x9B, 0x177}, - {0x10F, 0x1DD}, - {0x10F, 0x1DD} + { 0x1, 0x9A }, + { 0x1, 0x9A }, + { 0x1, 0x10E }, + { 0x1, 0x10E }, + { 0x1, 0x10E }, + { 0x9B, 0x177 }, + { 0x9B, 0x177 }, + { 0x9B, 0x177 }, + { 0x10F, 0x1DD }, + { 0x10F, 0x1DD } }; static const UnkStruct_ov104_02240364 Unk_ov104_0224032C[] = { - {0x1, 0x9A}, - {0x9B, 0x10E}, - {0x10F, 0x177}, - {0x178, 0x1DD} + { 0x1, 0x9A }, + { 0x9B, 0x10E }, + { 0x10F, 0x177 }, + { 0x178, 0x1DD } }; -void ov104_0223B0C8 (u8 param0, u8 param1, u8 param2, u8 param3, u16 param4, u16 param5[], u8 param6) +void ov104_0223B0C8(u8 param0, u8 param1, u8 param2, u8 param3, u16 param4, u16 param5[], u8 param6) { - const UnkStruct_ov104_02240364 * v0; + const UnkStruct_ov104_02240364 *v0; u8 v1, v2, v3; u16 v4, v5, v6, v7, v8, v9; int v10 = 0; @@ -1567,19 +1568,19 @@ void ov104_0223B0C8 (u8 param0, u8 param1, u8 param2, u8 param3, u16 param4, u16 return; } -BattleParams * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkStruct_ov104_02230BE4 * param1) +BattleParams *ov104_0223B250(UnkStruct_ov104_0223B5C0 *param0, UnkStruct_ov104_02230BE4 *param1) { BOOL v0; int v1; u16 v2; u32 v3; u8 v4, v5, v6, v7; - BattleParams * v8; - Pokemon * v9; + BattleParams *v8; + Pokemon *v9; UnkStruct_ov104_0223A348_sub1 v10; - UnkStruct_0204B184 * v11; - TrainerInfo * v12; - Party * v13; + UnkStruct_0204B184 *v11; + TrainerInfo *v12; + Party *v13; v6 = (param0->unk_05 * 2); v4 = ov104_0223B500(param0->unk_04); @@ -1675,7 +1676,7 @@ BattleParams * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkStruct_ov10 return v8; } -static BOOL ov104_0223B4A4 (UnkStruct_ov104_0223B5C0 * param0, u8 param1) +static BOOL ov104_0223B4A4(UnkStruct_ov104_0223B5C0 *param0, u8 param1) { if (param0->unk_290[param1].unk_10 > ((24 + 1) * 10001)) { param0->unk_290[param1].unk_10 -= ((24 + 1) * 10001); @@ -1686,7 +1687,7 @@ static BOOL ov104_0223B4A4 (UnkStruct_ov104_0223B5C0 * param0, u8 param1) return Pokemon_IsPersonalityShiny(param0->unk_290[param1].unk_0C, param0->unk_290[param1].unk_10); } -static u32 ov104_0223B4D4 (u8 param0) +static u32 ov104_0223B4D4(u8 param0) { switch (param0) { case 0: @@ -1702,7 +1703,7 @@ static u32 ov104_0223B4D4 (u8 param0) return (0x0 | 0x1) | 0x80; } -u8 ov104_0223B500 (u8 param0) +u8 ov104_0223B500(u8 param0) { switch (param0) { case 1: @@ -1712,7 +1713,7 @@ u8 ov104_0223B500 (u8 param0) return 1; } -u8 ov104_0223B50C (u8 param0) +u8 ov104_0223B50C(u8 param0) { switch (param0) { case 1: @@ -1722,7 +1723,7 @@ u8 ov104_0223B50C (u8 param0) return 1; } -static void ov104_0223B518 (UnkStruct_ov104_0223A348_sub2 * param0, u8 param1, u16 param2, u16 param3[], int param4, int param5, int param6) +static void ov104_0223B518(UnkStruct_ov104_0223A348_sub2 *param0, u8 param1, u16 param2, u16 param3[], int param4, int param5, int param6) { int v0; u32 v1; @@ -1744,7 +1745,7 @@ static void ov104_0223B518 (UnkStruct_ov104_0223A348_sub2 * param0, u8 param1, u return; } -static u32 ov104_0223B57C (UnkStruct_ov104_0223B5C0 * param0, u8 param1) +static u32 ov104_0223B57C(UnkStruct_ov104_0223B5C0 *param0, u8 param1) { u8 v0; u32 v1; @@ -1783,12 +1784,12 @@ static const u8 Unk_ov104_02241244[20] = { 0x9 }; -u8 ov104_0223B5A4 (u8 param0) +u8 ov104_0223B5A4(u8 param0) { return Unk_ov104_02241244[param0]; } -BOOL ov104_0223B5B0 (u8 param0) +BOOL ov104_0223B5B0(u8 param0) { switch (param0) { case 2: @@ -1799,12 +1800,12 @@ BOOL ov104_0223B5B0 (u8 param0) return 0; } -u8 ov104_0223B5C0 (UnkStruct_ov104_0223B5C0 * param0) +u8 ov104_0223B5C0(UnkStruct_ov104_0223B5C0 *param0) { u32 v0; int v1; - Party * v2; - Pokemon * v3; + Party *v2; + Pokemon *v3; v2 = Party_GetFromSavedata(param0->unk_6FC); v3 = Party_GetPokemonBySlotIndex(v2, param0->unk_260[0]); @@ -1813,12 +1814,12 @@ u8 ov104_0223B5C0 (UnkStruct_ov104_0223B5C0 * param0) return v1 / 10; } -static u8 ov104_0223B5F0 (u8 param0) +static u8 ov104_0223B5F0(u8 param0) { return Unk_ov104_0224033C[ov104_0223B644(param0)].unk_01; } -static u16 ov104_0223B604 (UnkStruct_ov104_0223B5C0 * param0, u8 param1, u8 param2) +static u16 ov104_0223B604(UnkStruct_ov104_0223B5C0 *param0, u8 param1, u8 param2) { u8 v0; u16 v1; @@ -1846,7 +1847,7 @@ static u16 ov104_0223B604 (UnkStruct_ov104_0223B5C0 * param0, u8 param1, u8 para return v1; } -static u16 ov104_0223B644 (u8 param0) +static u16 ov104_0223B644(u8 param0) { u8 v0; @@ -1859,10 +1860,10 @@ static u16 ov104_0223B644 (u8 param0) return v0; } -u16 ov104_0223B64C (UnkStruct_ov104_0223B5C0 * param0) +u16 ov104_0223B64C(UnkStruct_ov104_0223B5C0 *param0) { - Party * v0; - Pokemon * v1; + Party *v0; + Pokemon *v1; u16 v2, v3; v0 = Party_GetFromSavedata(param0->unk_6FC); @@ -1891,7 +1892,7 @@ u16 ov104_0223B64C (UnkStruct_ov104_0223B5C0 * param0) return v2; } -fx32 ov104_0223B6C4 (u32 param0) +fx32 ov104_0223B6C4(u32 param0) { return FX_Sqrt(FX32_CONST(param0)); } diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c index 222f921789..b9aa27a9af 100644 --- a/src/overlay104/ov104_0223B6F4.c +++ b/src/overlay104/ov104_0223B6F4.c @@ -1,54 +1,53 @@ +#include "overlay104/ov104_0223B6F4.h" + #include #include -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0203068C_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_0204B184.h" + #include "overlay006/battle_params.h" +#include "overlay104/ov104_0222DCE0.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223BA10.h" +#include "communication_information.h" +#include "communication_system.h" #include "heap.h" +#include "message.h" +#include "party.h" +#include "pokemon.h" +#include "strbuf.h" +#include "trainer_info.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0203061C.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_02051D8C.h" #include "unk_0205DFC4.h" -#include "pokemon.h" -#include "party.h" #include "unk_02096420.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0223B6F4.h" static int ov104_0223B6F4(u8 param0, int param1, int param2); void ov104_0223B760(u8 param0, int param1, u16 param2[], u8 param3); u8 ov104_0223B7A8(u8 param0, BOOL param1); u8 ov104_0223B7DC(u8 param0, BOOL param1); -BattleParams * ov104_0223B810(UnkStruct_ov104_0223BA10 * param0, UnkStruct_ov104_02230BE4 * param1); +BattleParams *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104_02230BE4 *param1); static u32 ov104_0223B9E4(u8 param0); -u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 * param0); +u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 *param0); BOOL ov104_0223BA14(u8 param0); -void ov104_0223BA24(Party * param0); -void ov104_0223BAB8(UnkStruct_ov104_0223BA10 * param0); -void ov104_0223BA7C(UnkStruct_ov104_0223BA10 * param0, Pokemon * param1); -void ov104_0223BAA0(UnkStruct_ov104_0223BA10 * param0, Party * param1, Pokemon * param2); -static u16 ov104_0223BB10(UnkStruct_ov104_0223BA10 * param0); -u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 * param0); +void ov104_0223BA24(Party *param0); +void ov104_0223BAB8(UnkStruct_ov104_0223BA10 *param0); +void ov104_0223BA7C(UnkStruct_ov104_0223BA10 *param0, Pokemon *param1); +void ov104_0223BAA0(UnkStruct_ov104_0223BA10 *param0, Party *param1, Pokemon *param2); +static u16 ov104_0223BB10(UnkStruct_ov104_0223BA10 *param0); +u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 *param0); u16 ov104_0223BC24(u16 param0); -void sub_02052894(BattleParams * param0); -void ov104_0223BB84(BGL * param0, UnkStruct_ov104_0223BA10 * param1, u32 param2); -static void ov104_0223BBC4(u16 * param0, u16 param1); +void sub_02052894(BattleParams *param0); +void ov104_0223BB84(BGL *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2); +static void ov104_0223BBC4(u16 *param0, u16 param1); static const struct { u16 unk_00; @@ -56,17 +55,17 @@ static const struct { u16 unk_04; u16 unk_06; } Unk_ov104_02241258[] = { - {0x0, 0x63, 0x64, 0x77}, - {0x50, 0x77, 0x78, 0x8B}, - {0x64, 0x8B, 0x8C, 0x9F}, - {0x78, 0x9F, 0xA0, 0xB3}, - {0x8C, 0xB3, 0xB4, 0xC7}, - {0xA0, 0xC7, 0xC8, 0xDB}, - {0xB4, 0xDB, 0xDC, 0xEF}, - {0xC8, 0x12B, 0xC8, 0x12B} + { 0x0, 0x63, 0x64, 0x77 }, + { 0x50, 0x77, 0x78, 0x8B }, + { 0x64, 0x8B, 0x8C, 0x9F }, + { 0x78, 0x9F, 0xA0, 0xB3 }, + { 0x8C, 0xB3, 0xB4, 0xC7 }, + { 0xA0, 0xC7, 0xC8, 0xDB }, + { 0xB4, 0xDB, 0xDC, 0xEF }, + { 0xC8, 0x12B, 0xC8, 0x12B } }; -static int ov104_0223B6F4 (u8 param0, int param1, int param2) +static int ov104_0223B6F4(u8 param0, int param1, int param2) { int v0, v1, v2, v3, v4; @@ -98,7 +97,7 @@ static int ov104_0223B6F4 (u8 param0, int param1, int param2) return v0; } -void ov104_0223B760 (u8 param0, int param1, u16 param2[], u8 param3) +void ov104_0223B760(u8 param0, int param1, u16 param2[], u8 param3) { int v0 = 0; int v1; @@ -120,7 +119,7 @@ void ov104_0223B760 (u8 param0, int param1, u16 param2[], u8 param3) } while (v0 < param3); } -u8 ov104_0223B7A8 (u8 param0, BOOL param1) +u8 ov104_0223B7A8(u8 param0, BOOL param1) { switch (param0) { case 0: @@ -139,7 +138,7 @@ u8 ov104_0223B7A8 (u8 param0, BOOL param1) return 3; } -u8 ov104_0223B7DC (u8 param0, BOOL param1) +u8 ov104_0223B7DC(u8 param0, BOOL param1) { switch (param0) { case 0: @@ -158,18 +157,18 @@ u8 ov104_0223B7DC (u8 param0, BOOL param1) return 3; } -BattleParams * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkStruct_ov104_02230BE4 * param1) +BattleParams *ov104_0223B810(UnkStruct_ov104_0223BA10 *param0, UnkStruct_ov104_02230BE4 *param1) { int v0; u32 v1; u8 v2, v3, v4; - BattleParams * v5; - Pokemon * v6; + BattleParams *v5; + Pokemon *v6; UnkStruct_ov104_0223A348_sub1 v7; - UnkStruct_0204B184 * v8; - MessageLoader * v9; - Strbuf* v10; - TrainerInfo * v11; + UnkStruct_0204B184 *v8; + MessageLoader *v9; + Strbuf *v10; + TrainerInfo *v11; v2 = ov104_0223B7A8(param0->unk_10, 0); v3 = ov104_0223B7DC(param0->unk_10, 0); @@ -247,7 +246,7 @@ BattleParams * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkStruct_ov10 return v5; } -static u32 ov104_0223B9E4 (u8 param0) +static u32 ov104_0223B9E4(u8 param0) { switch (param0) { case 0: @@ -263,12 +262,12 @@ static u32 ov104_0223B9E4 (u8 param0) return (0x0 | 0x1) | 0x80; } -u8 ov104_0223BA10 (UnkStruct_ov104_0223BA10 * param0) +u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 *param0) { return 50; } -BOOL ov104_0223BA14 (u8 param0) +BOOL ov104_0223BA14(u8 param0) { switch (param0) { case 2: @@ -279,11 +278,11 @@ BOOL ov104_0223BA14 (u8 param0) return 0; } -void ov104_0223BA24 (Party * param0) +void ov104_0223BA24(Party *param0) { int v0, v1, v2; u32 v3; - Pokemon * mon; + Pokemon *mon; v2 = Party_GetCurrentCount(param0); @@ -306,24 +305,24 @@ void ov104_0223BA24 (Party * param0) return; } -void ov104_0223BA7C (UnkStruct_ov104_0223BA10 * param0, Pokemon * param1) +void ov104_0223BA7C(UnkStruct_ov104_0223BA10 *param0, Pokemon *param1) { Pokemon_UpdateAfterCatch(param1, SaveData_GetTrainerInfo(param0->unk_04), 4, 0, 0, 11); return; } -void ov104_0223BAA0 (UnkStruct_ov104_0223BA10 * param0, Party * param1, Pokemon * param2) +void ov104_0223BAA0(UnkStruct_ov104_0223BA10 *param0, Party *param1, Pokemon *param2) { ov104_0223BA7C(param0, param2); Party_AddPokemon(param1, param2); return; } -void ov104_0223BAB8 (UnkStruct_ov104_0223BA10 * param0) +void ov104_0223BAB8(UnkStruct_ov104_0223BA10 *param0) { int v0, v1; u8 v2; - Pokemon * v3; + Pokemon *v3; Party_Init(param0->unk_2C); @@ -340,7 +339,7 @@ void ov104_0223BAB8 (UnkStruct_ov104_0223BA10 * param0) return; } -static u16 ov104_0223BB10 (UnkStruct_ov104_0223BA10 * param0) +static u16 ov104_0223BB10(UnkStruct_ov104_0223BA10 *param0) { u16 v0, v1; @@ -353,7 +352,7 @@ static u16 ov104_0223BB10 (UnkStruct_ov104_0223BA10 * param0) v1 = ov104_0223BB60(param0); v0 = (0x1 | 0x2 | 0x4); - switch ((v1 + 1)) { + switch (v1 + 1) { case 1: case 2: v0 = 0; @@ -367,7 +366,7 @@ static u16 ov104_0223BB10 (UnkStruct_ov104_0223BA10 * param0) return v0; } -u16 ov104_0223BB60 (UnkStruct_ov104_0223BA10 * param0) +u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 *param0) { u16 v0; @@ -382,7 +381,7 @@ u16 ov104_0223BB60 (UnkStruct_ov104_0223BA10 * param0) return v0; } -void ov104_0223BB84 (BGL * param0, UnkStruct_ov104_0223BA10 * param1, u32 param2) +void ov104_0223BB84(BGL *param0, UnkStruct_ov104_0223BA10 *param1, u32 param2) { int v0; u16 v1[30]; @@ -395,7 +394,7 @@ void ov104_0223BB84 (BGL * param0, UnkStruct_ov104_0223BA10 * param1, u32 param2 return; } -static void ov104_0223BBC4 (u16 * param0, u16 param1) +static void ov104_0223BBC4(u16 *param0, u16 param1) { u8 v0[10]; u16 v1; @@ -424,7 +423,7 @@ static void ov104_0223BBC4 (u16 * param0, u16 param1) return; } -u16 ov104_0223BC24 (u16 param0) +u16 ov104_0223BC24(u16 param0) { if (param0 >= 8) { return 8 - 1; @@ -433,7 +432,7 @@ u16 ov104_0223BC24 (u16 param0) return param0; } -void ov104_0223BC2C (UnkStruct_0203068C * param0, u8 param1, int param2) +void ov104_0223BC2C(UnkStruct_0203068C *param0, u8 param1, int param2) { u16 v0; diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c index 14deb916de..a82ad220ad 100644 --- a/src/overlay104/ov104_0223BCBC.c +++ b/src/overlay104/ov104_0223BCBC.c @@ -1,43 +1,44 @@ +#include "overlay104/ov104_0223BCBC.h" + #include #include #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_0204B184.h" + #include "overlay006/battle_params.h" +#include "overlay104/ov104_0222DCE0.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223BFFC.h" +#include "communication_information.h" +#include "communication_system.h" #include "heap.h" #include "message.h" +#include "party.h" +#include "pokemon.h" #include "strbuf.h" +#include "trainer_info.h" #include "unk_0201D15C.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_02051D8C.h" -#include "pokemon.h" -#include "party.h" #include "unk_02096420.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0223BCBC.h" u8 ov104_0223BD70(u8 param0, BOOL param1); u8 ov104_0223BDA4(u8 param0, BOOL param1); -BattleParams * ov104_0223BDD8(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_02230BE4 * param1); +BattleParams *ov104_0223BDD8(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_02230BE4 *param1); static u32 ov104_0223BFD0(u8 param0); -u8 ov104_0223BFFC(UnkStruct_ov104_0223BFFC * param0); +u8 ov104_0223BFFC(UnkStruct_ov104_0223BFFC *param0); BOOL ov104_0223C000(u8 param0); -void ov104_0223C04C(UnkStruct_ov104_0223BFFC * param0); -void ov104_0223C010(UnkStruct_ov104_0223BFFC * param0, Pokemon * param1); -void ov104_0223C034(UnkStruct_ov104_0223BFFC * param0, Party * param1, Pokemon * param2); -u16 ov104_0223C0BC(UnkStruct_ov104_0223BFFC * param0, u8 param1); -static u16 ov104_0223C0D0(UnkStruct_ov104_0223BFFC * param0); -u16 ov104_0223C124(UnkStruct_ov104_0223BFFC * param0); +void ov104_0223C04C(UnkStruct_ov104_0223BFFC *param0); +void ov104_0223C010(UnkStruct_ov104_0223BFFC *param0, Pokemon *param1); +void ov104_0223C034(UnkStruct_ov104_0223BFFC *param0, Party *param1, Pokemon *param2); +u16 ov104_0223C0BC(UnkStruct_ov104_0223BFFC *param0, u8 param1); +static u16 ov104_0223C0D0(UnkStruct_ov104_0223BFFC *param0); +u16 ov104_0223C124(UnkStruct_ov104_0223BFFC *param0); u8 ov104_0223C148(u8 param0); -void sub_02052894(BattleParams * param0); +void sub_02052894(BattleParams *param0); static int ov104_0223BCBC(u8 param0, int param1, int param2); void ov104_0223BD28(u8 param0, int param1, u16 param2[], u8 param3); @@ -47,14 +48,14 @@ static const struct { u16 unk_04; u16 unk_06; } Unk_ov104_02241298[] = { - {0x0, 0x63, 0x64, 0x77}, - {0x50, 0x77, 0x78, 0x8B}, - {0x64, 0x8B, 0x8C, 0x9F}, - {0x78, 0x9F, 0xA0, 0xB3}, - {0x8C, 0xB3, 0xB4, 0xC7}, - {0xA0, 0xC7, 0xC8, 0xDB}, - {0xB4, 0xDB, 0xDC, 0xEF}, - {0xC8, 0x12B, 0xC8, 0x12B} + { 0x0, 0x63, 0x64, 0x77 }, + { 0x50, 0x77, 0x78, 0x8B }, + { 0x64, 0x8B, 0x8C, 0x9F }, + { 0x78, 0x9F, 0xA0, 0xB3 }, + { 0x8C, 0xB3, 0xB4, 0xC7 }, + { 0xA0, 0xC7, 0xC8, 0xDB }, + { 0xB4, 0xDB, 0xDC, 0xEF }, + { 0xC8, 0x12B, 0xC8, 0x12B } }; static const u8 Unk_ov104_0223C0BC[] = { @@ -69,7 +70,7 @@ static const u8 Unk_ov104_0223C0BC_1[] = { 0x3 }; -static int ov104_0223BCBC (u8 param0, int param1, int param2) +static int ov104_0223BCBC(u8 param0, int param1, int param2) { int v0, v1, v2, v3; @@ -99,7 +100,7 @@ static int ov104_0223BCBC (u8 param0, int param1, int param2) return v0; } -void ov104_0223BD28 (u8 param0, int param1, u16 param2[], u8 param3) +void ov104_0223BD28(u8 param0, int param1, u16 param2[], u8 param3) { int v0 = 0; int v1; @@ -121,7 +122,7 @@ void ov104_0223BD28 (u8 param0, int param1, u16 param2[], u8 param3) } while (v0 < param3); } -u8 ov104_0223BD70 (u8 param0, BOOL param1) +u8 ov104_0223BD70(u8 param0, BOOL param1) { switch (param0) { case 0: @@ -140,7 +141,7 @@ u8 ov104_0223BD70 (u8 param0, BOOL param1) return 3; } -u8 ov104_0223BDA4 (u8 param0, BOOL param1) +u8 ov104_0223BDA4(u8 param0, BOOL param1) { switch (param0) { case 0: @@ -159,20 +160,20 @@ u8 ov104_0223BDA4 (u8 param0, BOOL param1) return 3; } -BattleParams * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_02230BE4 * param1) +BattleParams *ov104_0223BDD8(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_02230BE4 *param1) { int v0; u32 v1; u8 v2, v3, v4; - BattleParams * v5; - Pokemon * v6; + BattleParams *v5; + Pokemon *v6; UnkStruct_ov104_0223A348_sub1 v7; - UnkStruct_0204B184 * v8; - MessageLoader * v9; - Strbuf* v10; - TrainerInfo * v11; - Party * v12; - Party * v13; + UnkStruct_0204B184 *v8; + MessageLoader *v9; + Strbuf *v10; + TrainerInfo *v11; + Party *v12; + Party *v13; v2 = ov104_0223BD70(param0->unk_10, 0); v3 = ov104_0223BDA4(param0->unk_10, 0); @@ -260,7 +261,7 @@ BattleParams * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov10 return v5; } -static u32 ov104_0223BFD0 (u8 param0) +static u32 ov104_0223BFD0(u8 param0) { switch (param0) { case 0: @@ -276,12 +277,12 @@ static u32 ov104_0223BFD0 (u8 param0) return (0x0 | 0x1) | 0x80; } -u8 ov104_0223BFFC (UnkStruct_ov104_0223BFFC * param0) +u8 ov104_0223BFFC(UnkStruct_ov104_0223BFFC *param0) { return 50; } -BOOL ov104_0223C000 (u8 param0) +BOOL ov104_0223C000(u8 param0) { switch (param0) { case 2: @@ -292,27 +293,27 @@ BOOL ov104_0223C000 (u8 param0) return 0; } -void ov104_0223C010 (UnkStruct_ov104_0223BFFC * param0, Pokemon * param1) +void ov104_0223C010(UnkStruct_ov104_0223BFFC *param0, Pokemon *param1) { Pokemon_UpdateAfterCatch(param1, SaveData_GetTrainerInfo(param0->unk_04), 4, 0, 0, 11); return; } -void ov104_0223C034 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Pokemon * param2) +void ov104_0223C034(UnkStruct_ov104_0223BFFC *param0, Party *param1, Pokemon *param2) { ov104_0223C010(param0, param2); Party_AddPokemon(param1, param2); return; } -void ov104_0223C04C (UnkStruct_ov104_0223BFFC * param0) +void ov104_0223C04C(UnkStruct_ov104_0223BFFC *param0) { u32 v0; int v1, v2; u8 v3; - Party * v4; - Pokemon * v5; - Pokemon * v6; + Party *v4; + Pokemon *v5; + Pokemon *v6; Party_Init(param0->unk_74); @@ -333,7 +334,7 @@ void ov104_0223C04C (UnkStruct_ov104_0223BFFC * param0) return; } -u16 ov104_0223C0BC (UnkStruct_ov104_0223BFFC * param0, u8 param1) +u16 ov104_0223C0BC(UnkStruct_ov104_0223BFFC *param0, u8 param1) { u16 v0, v1; @@ -360,7 +361,7 @@ u16 ov104_0223C0BC (UnkStruct_ov104_0223BFFC * param0, u8 param1) return v0; } -static u16 ov104_0223C0D0 (UnkStruct_ov104_0223BFFC * param0) +static u16 ov104_0223C0D0(UnkStruct_ov104_0223BFFC *param0) { u16 v0, v1; @@ -373,7 +374,7 @@ static u16 ov104_0223C0D0 (UnkStruct_ov104_0223BFFC * param0) v1 = ov104_0223C124(param0); v0 = (0x1 | 0x2 | 0x4); - switch ((v1 + 1)) { + switch (v1 + 1) { case 1: case 2: v0 = 0; @@ -387,7 +388,7 @@ static u16 ov104_0223C0D0 (UnkStruct_ov104_0223BFFC * param0) return v0; } -u16 ov104_0223C124 (UnkStruct_ov104_0223BFFC * param0) +u16 ov104_0223C124(UnkStruct_ov104_0223BFFC *param0) { u16 v0; @@ -402,7 +403,7 @@ u16 ov104_0223C124 (UnkStruct_ov104_0223BFFC * param0) return v0; } -u8 ov104_0223C148 (u8 param0) +u8 ov104_0223C148(u8 param0) { if (param0 < 9) { return 0; diff --git a/src/overlay104/ov104_0223C164.c b/src/overlay104/ov104_0223C164.c index 8b14ea30c3..871b2386e6 100644 --- a/src/overlay104/ov104_0223C164.c +++ b/src/overlay104/ov104_0223C164.c @@ -1,35 +1,37 @@ +#include "overlay104/ov104_0223C164.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" + #include "overlay104/struct_ov104_0223C23C_decl.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02018340.h" -#include "overlay104/ov104_0223C164.h" typedef struct { - SysTask * unk_00; - BGL * unk_04; + SysTask *unk_00; + BGL *unk_04; u16 unk_08; u16 unk_0A; } UnkStruct_ov104_0223C188; struct UnkStruct_ov104_0223C23C_t { - BGL * unk_00; - UnkStruct_ov104_0223C188 * unk_04; + BGL *unk_00; + UnkStruct_ov104_0223C188 *unk_04; }; -UnkStruct_ov104_0223C23C * ov104_0223C164(BGL * param0); -static UnkStruct_ov104_0223C188 * ov104_0223C188(BGL * param0); -static void ov104_0223C1BC(SysTask * param0, void * param1); -static void ov104_0223C208(u16 * param0, u8 param1); +UnkStruct_ov104_0223C23C *ov104_0223C164(BGL *param0); +static UnkStruct_ov104_0223C188 *ov104_0223C188(BGL *param0); +static void ov104_0223C1BC(SysTask *param0, void *param1); +static void ov104_0223C208(u16 *param0, u8 param1); -UnkStruct_ov104_0223C23C * ov104_0223C164 (BGL * param0) +UnkStruct_ov104_0223C23C *ov104_0223C164(BGL *param0) { - UnkStruct_ov104_0223C23C * v0; + UnkStruct_ov104_0223C23C *v0; v0 = Heap_AllocFromHeap(94, sizeof(UnkStruct_ov104_0223C23C)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223C23C)); @@ -38,9 +40,9 @@ UnkStruct_ov104_0223C23C * ov104_0223C164 (BGL * param0) return v0; } -static UnkStruct_ov104_0223C188 * ov104_0223C188 (BGL * param0) +static UnkStruct_ov104_0223C188 *ov104_0223C188(BGL *param0) { - UnkStruct_ov104_0223C188 * v0; + UnkStruct_ov104_0223C188 *v0; v0 = Heap_AllocFromHeap(94, sizeof(UnkStruct_ov104_0223C188)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223C188)); @@ -52,11 +54,11 @@ static UnkStruct_ov104_0223C188 * ov104_0223C188 (BGL * param0) return v0; } -static void ov104_0223C1BC (SysTask * param0, void * param1) +static void ov104_0223C1BC(SysTask *param0, void *param1) { u32 v0; u16 v1[4]; - UnkStruct_ov104_0223C188 * v2 = param1; + UnkStruct_ov104_0223C188 *v2 = param1; if (v2->unk_0A < 2) { v2->unk_0A++; @@ -74,7 +76,7 @@ static void ov104_0223C1BC (SysTask * param0, void * param1) return; } -static void ov104_0223C208 (u16 * param0, u8 param1) +static void ov104_0223C208(u16 *param0, u8 param1) { u32 v0, v1, v2, v3; @@ -95,10 +97,10 @@ static void ov104_0223C208 (u16 * param0, u8 param1) return; } -void ov104_0223C23C(UnkStruct_ov104_0223C23C * param0); -static void ov104_0223C250(UnkStruct_ov104_0223C188 * param0); +void ov104_0223C23C(UnkStruct_ov104_0223C23C *param0); +static void ov104_0223C250(UnkStruct_ov104_0223C188 *param0); -void ov104_0223C23C (UnkStruct_ov104_0223C23C * param0) +void ov104_0223C23C(UnkStruct_ov104_0223C23C *param0) { ov104_0223C250(param0->unk_04); Heap_FreeToHeap(param0); @@ -106,7 +108,7 @@ void ov104_0223C23C (UnkStruct_ov104_0223C23C * param0) return; } -static void ov104_0223C250 (UnkStruct_ov104_0223C188 * param0) +static void ov104_0223C250(UnkStruct_ov104_0223C188 *param0) { SysTask_Done(param0->unk_00); Heap_FreeToHeap(param0); @@ -114,7 +116,7 @@ static void ov104_0223C250 (UnkStruct_ov104_0223C188 * param0) return; } -u16 ov104_0223C264 (u8 param0) +u16 ov104_0223C264(u8 param0) { u16 v0; @@ -142,7 +144,7 @@ u16 ov104_0223C264 (u8 param0) return v0; } -u16 ov104_0223C29C (u8 param0) +u16 ov104_0223C29C(u8 param0) { u16 v0; diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c index ea1ad30db6..130cfd6dfb 100644 --- a/src/overlay104/ov104_0223C2D4.c +++ b/src/overlay104/ov104_0223C2D4.c @@ -1,24 +1,35 @@ +#include "overlay104/ov104_0223C2D4.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "trainer_info.h" #include "struct_decls/struct_0209B75C_decl.h" -#include "overlay063/struct_ov63_0222BEC0_decl.h" - #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" -#include "overlay063/union_ov63_0222BDAC.h" + +#include "overlay063/ov63_0222BCE8.h" +#include "overlay063/ov63_0222BE18.h" +#include "overlay063/ov63_0222CA88.h" +#include "overlay063/ov63_0222CCE4.h" +#include "overlay063/ov63_0222D160.h" +#include "overlay063/ov63_0222D1C0.h" +#include "overlay063/ov63_0222D77C.h" +#include "overlay063/struct_ov63_0222BEC0_decl.h" #include "overlay063/struct_ov63_0222CCB8.h" #include "overlay063/struct_ov63_0222CE44.h" #include "overlay063/struct_ov63_0222D894.h" +#include "overlay063/union_ov63_0222BDAC.h" #include "overlay065/struct_ov65_0223582C.h" #include "overlay065/struct_ov65_022376D0.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0222EA90.h" +#include "overlay104/ov104_0223D5D0.h" +#include "overlay104/ov104_0223D768.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223C4CC.h" #include "overlay104/struct_ov104_0223C634.h" @@ -30,64 +41,54 @@ #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "narc.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02002328.h" #include "unk_02002F38.h" #include "unk_020041CC.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" #include "unk_0202419C.h" #include "unk_02024220.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_020393C8.h" #include "unk_0209B6F8.h" -#include "overlay063/ov63_0222BCE8.h" -#include "overlay063/ov63_0222BE18.h" -#include "overlay063/ov63_0222CA88.h" -#include "overlay063/ov63_0222CCE4.h" -#include "overlay063/ov63_0222D160.h" -#include "overlay063/ov63_0222D1C0.h" -#include "overlay063/ov63_0222D77C.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0222EA90.h" -#include "overlay104/ov104_0223C2D4.h" -#include "overlay104/ov104_0223D5D0.h" -#include "overlay104/ov104_0223D768.h" -static void ov104_0223C6EC(void * param0); -static void ov104_0223C71C(SysTask * param0, void * param1); -static void ov104_0223C738(SysTask * param0, void * param1); -static void ov104_0223C720(SysTask * param0, void * param1); -static void ov104_0223C72C(SysTask * param0, void * param1); -static void ov104_0223C948(BGL * param0, int param1); -static void ov104_0223CC74(UnkStruct_ov104_0223C4CC * param0, int param1, const TrainerInfo * param2); -static void ov104_0223CEEC(UnkStruct_ov104_0223C4CC * param0); -static void ov104_0223CB80(UnkStruct_ov104_0223C4CC * param0); -static void ov104_0223CFF4(UnkStruct_ov104_0223C4CC * param0); -static void ov104_0223D058(UnkStruct_ov104_0223C4CC * param0); -UnkStruct_ov104_0223C4CC * ov104_0223C2D4(UnkStruct_0209B75C * param0); -void ov104_0223C4CC(UnkStruct_ov104_0223C4CC * param0); -static void ov104_0223C8E8(UnkStruct_ov104_0223C4CC * param0); -static void ov104_0223CC10(UnkStruct_ov104_0223C4CC * param0); -static GenericPointerData * ov104_0223CF4C(int param0); +static void ov104_0223C6EC(void *param0); +static void ov104_0223C71C(SysTask *param0, void *param1); +static void ov104_0223C738(SysTask *param0, void *param1); +static void ov104_0223C720(SysTask *param0, void *param1); +static void ov104_0223C72C(SysTask *param0, void *param1); +static void ov104_0223C948(BGL *param0, int param1); +static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const TrainerInfo *param2); +static void ov104_0223CEEC(UnkStruct_ov104_0223C4CC *param0); +static void ov104_0223CB80(UnkStruct_ov104_0223C4CC *param0); +static void ov104_0223CFF4(UnkStruct_ov104_0223C4CC *param0); +static void ov104_0223D058(UnkStruct_ov104_0223C4CC *param0); +UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0); +void ov104_0223C4CC(UnkStruct_ov104_0223C4CC *param0); +static void ov104_0223C8E8(UnkStruct_ov104_0223C4CC *param0); +static void ov104_0223CC10(UnkStruct_ov104_0223C4CC *param0); +static GenericPointerData *ov104_0223CF4C(int param0); static void ov104_0223CF68(void); -static void ov104_0223CFEC(GenericPointerData * param0); -static void ov104_0223D3B0(UnkStruct_ov104_0223C4CC * param0); -static void ov104_0223D498(UnkStruct_ov104_0223C4CC * param0); -static void ov104_0223D570(UnkStruct_ov104_0223C634 * param0, UnkStruct_ov104_0223D570 * param1); -static void ov104_0223D584(UnkStruct_0209B75C * param0, int param1, UnkStruct_ov63_0222BEC0 * param2, UnkStruct_ov63_0222CE44 * param3, const UnkStruct_ov104_0223D570 * param4); -static void ov104_0223C798(UnkStruct_ov104_0223C4CC * param0); -static void ov104_0223C7EC(UnkStruct_ov104_0223C4CC * param0); +static void ov104_0223CFEC(GenericPointerData *param0); +static void ov104_0223D3B0(UnkStruct_ov104_0223C4CC *param0); +static void ov104_0223D498(UnkStruct_ov104_0223C4CC *param0); +static void ov104_0223D570(UnkStruct_ov104_0223C634 *param0, UnkStruct_ov104_0223D570 *param1); +static void ov104_0223D584(UnkStruct_0209B75C *param0, int param1, UnkStruct_ov63_0222BEC0 *param2, UnkStruct_ov63_0222CE44 *param3, const UnkStruct_ov104_0223D570 *param4); +static void ov104_0223C798(UnkStruct_ov104_0223C4CC *param0); +static void ov104_0223C7EC(UnkStruct_ov104_0223C4CC *param0); static const UnkStruct_ov104_0224133C Unk_ov104_0224133C = { 0x0, @@ -121,12 +122,12 @@ static const UnkUnion_ov63_0222BDAC Unk_ov104_022413D8[256] = { 0x0 }; -UnkStruct_ov104_0223C4CC * ov104_0223C2D4 (UnkStruct_0209B75C * param0) +UnkStruct_ov104_0223C4CC *ov104_0223C2D4(UnkStruct_0209B75C *param0) { - UnkStruct_ov104_0223C4CC * v0; + UnkStruct_ov104_0223C4CC *v0; int v1, v2; - UnkStruct_ov104_02230BE4 * v3 = sub_0209B970(param0); - const TrainerInfo * v4; + UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0); + const TrainerInfo *v4; v4 = SaveData_GetTrainerInfo(v3->unk_08); v2 = v3->unk_24; @@ -203,12 +204,12 @@ UnkStruct_ov104_0223C4CC * ov104_0223C2D4 (UnkStruct_0209B75C * param0) return v0; } -void ov104_0223C4CC (UnkStruct_ov104_0223C4CC * param0) +void ov104_0223C4CC(UnkStruct_ov104_0223C4CC *param0) { int v0; { - UnkStruct_ov104_02230BE4 * v1 = sub_0209B970(param0->unk_08); + UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_08); ov104_0222EBA4(param0, ¶m0->unk_90, param0->unk_C1); } @@ -266,12 +267,12 @@ void ov104_0223C4CC (UnkStruct_ov104_0223C4CC * param0) G2S_BlendNone(); } -void ov104_0223C634 (UnkStruct_ov104_0223C4CC * param0) +void ov104_0223C634(UnkStruct_ov104_0223C4CC *param0) { int v0; { - UnkStruct_ov104_0223C634 * v1; + UnkStruct_ov104_0223C634 *v1; for (v0 = 0; v0 < 32; v0++) { v1 = sub_0209B9D4(param0->unk_08, v0); @@ -289,12 +290,12 @@ void ov104_0223C634 (UnkStruct_ov104_0223C4CC * param0) ov104_0223D3B0(param0); } -void ov104_0223C688 (UnkStruct_ov104_0223C4CC * param0) +void ov104_0223C688(UnkStruct_ov104_0223C4CC *param0) { int v0; { - UnkStruct_ov104_0223C688 * v1; + UnkStruct_ov104_0223C688 *v1; v1 = sub_0209B9CC(param0->unk_08); @@ -306,7 +307,7 @@ void ov104_0223C688 (UnkStruct_ov104_0223C4CC * param0) } { - UnkStruct_ov104_0223C634 * v2; + UnkStruct_ov104_0223C634 *v2; UnkStruct_ov104_0223D570 v3; for (v0 = 0; v0 < 32; v0++) { @@ -322,9 +323,9 @@ void ov104_0223C688 (UnkStruct_ov104_0223C4CC * param0) ov104_0223D498(param0); } -static void ov104_0223C6EC (void * param0) +static void ov104_0223C6EC(void *param0) { - UnkStruct_ov104_0223C4CC * v0 = param0; + UnkStruct_ov104_0223C4CC *v0 = param0; sub_0201DCAC(); sub_0200C800(); @@ -334,29 +335,29 @@ static void ov104_0223C6EC (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov104_0223C71C (SysTask * param0, void * param1) +static void ov104_0223C71C(SysTask *param0, void *param1) { - UnkStruct_ov104_0223C4CC * v0 = param1; + UnkStruct_ov104_0223C4CC *v0 = param1; } -static void ov104_0223C720 (SysTask * param0, void * param1) +static void ov104_0223C720(SysTask *param0, void *param1) { - UnkStruct_ov104_0223C4CC * v0 = param1; + UnkStruct_ov104_0223C4CC *v0 = param1; ov63_0222BE84(v0->unk_14); } -static void ov104_0223C72C (SysTask * param0, void * param1) +static void ov104_0223C72C(SysTask *param0, void *param1) { - UnkStruct_ov104_0223C4CC * v0 = param1; + UnkStruct_ov104_0223C4CC *v0 = param1; ov104_0223C8E8(v0); } -static void ov104_0223C738 (SysTask * param0, void * param1) +static void ov104_0223C738(SysTask *param0, void *param1) { - UnkStruct_ov104_0223C4CC * v0 = param1; + UnkStruct_ov104_0223C4CC *v0 = param1; { - UnkStruct_ov104_0223C634 * v1; + UnkStruct_ov104_0223C634 *v1; v1 = sub_0209B9D4(v0->unk_08, (32 - 1)); @@ -389,10 +390,10 @@ static void ov104_0223C738 (SysTask * param0, void * param1) G3_RequestSwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } -static void ov104_0223C798 (UnkStruct_ov104_0223C4CC * param0) +static void ov104_0223C798(UnkStruct_ov104_0223C4CC *param0) { int v0; - UnkStruct_ov104_02230BE4 * v1 = sub_0209B970(param0->unk_08); + UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_08); v0 = ov104_0222EA90(v1->unk_24, 12); @@ -413,11 +414,11 @@ static void ov104_0223C798 (UnkStruct_ov104_0223C4CC * param0) } } -static void ov104_0223C7EC (UnkStruct_ov104_0223C4CC * param0) +static void ov104_0223C7EC(UnkStruct_ov104_0223C4CC *param0) { s16 v0; s16 v1; - UnkStruct_ov104_02230BE4 * v2 = sub_0209B970(param0->unk_08); + UnkStruct_ov104_02230BE4 *v2 = sub_0209B970(param0->unk_08); v1 = ov63_0222D1B0(¶m0->unk_1C) + param0->unk_A4.unk_06; v0 = ov63_0222D1B8(¶m0->unk_1C) + param0->unk_A4.unk_04; @@ -432,7 +433,7 @@ static void ov104_0223C7EC (UnkStruct_ov104_0223C4CC * param0) } } -static void ov104_0223C8E8 (UnkStruct_ov104_0223C4CC * param0) +static void ov104_0223C8E8(UnkStruct_ov104_0223C4CC *param0) { UnkStruct_ov63_0222D894 v0; UnkStruct_ov63_0222CCB8 v1; @@ -451,7 +452,7 @@ static void ov104_0223C8E8 (UnkStruct_ov104_0223C4CC * param0) } } -static void ov104_0223C948 (BGL * param0, int param1) +static void ov104_0223C948(BGL *param0, int param1) { int v0; @@ -507,7 +508,7 @@ static void ov104_0223C948 (BGL * param0, int param1) 0, 0, 0, - 0 + 0, }, { 0, @@ -522,7 +523,7 @@ static void ov104_0223C948 (BGL * param0, int param1) 1, 0, 0, - 0 + 0, }, { 0, @@ -537,7 +538,7 @@ static void ov104_0223C948 (BGL * param0, int param1) 3, 0, 0, - 0 + 0, }, }; u16 v4; @@ -590,8 +591,7 @@ static void ov104_0223C948 (BGL * param0, int param1) { UnkStruct_ov97_0222DB78 v5[] = { - { - 0, + { 0, 0, 0x800, 0, @@ -603,8 +603,7 @@ static void ov104_0223C948 (BGL * param0, int param1) 3, 0, 0, - 0 - }, + 0 }, }; sub_020183C4(param0, 4, &v5[0], 0); @@ -614,13 +613,13 @@ static void ov104_0223C948 (BGL * param0, int param1) } } -static void ov104_0223CB80 (UnkStruct_ov104_0223C4CC * param0) +static void ov104_0223CB80(UnkStruct_ov104_0223C4CC *param0) { PaletteSys_LoadPalette(param0->unk_04, 14, 6, 94, 0, 0x20, 14 * 16); PaletteSys_LoadPalette(param0->unk_04, 14, 7, 94, 0, 0x20, 13 * 16); { - UnkStruct_ov104_02230BE4 * v0; + UnkStruct_ov104_02230BE4 *v0; v0 = sub_0209B970(param0->unk_08); @@ -632,9 +631,9 @@ static void ov104_0223CB80 (UnkStruct_ov104_0223C4CC * param0) sub_02003070(param0->unk_04, 0, 12 * 16, 0x20); } -static void ov104_0223CC10 (UnkStruct_ov104_0223C4CC * param0) +static void ov104_0223CC10(UnkStruct_ov104_0223C4CC *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); @@ -644,7 +643,7 @@ static void ov104_0223CC10 (UnkStruct_ov104_0223C4CC * param0) NARC_dtor(v0); } -static void ov104_0223CC74 (UnkStruct_ov104_0223C4CC * param0, int param1, const TrainerInfo * param2) +static void ov104_0223CC74(UnkStruct_ov104_0223C4CC *param0, int param1, const TrainerInfo *param2) { param0->unk_14 = ov63_0222BE18(32, 94); param0->unk_18 = ov63_0222BCE8((256 / 16), (256 / 16), 94); @@ -698,7 +697,7 @@ static void ov104_0223CC74 (UnkStruct_ov104_0223C4CC * param0, int param1, const { u32 v2; - NARC * v3; + NARC *v3; int v4 = ov104_0222EA90(param1, 0); v2 = ov104_0222EA90(param1, 5); @@ -709,8 +708,8 @@ static void ov104_0223CC74 (UnkStruct_ov104_0223C4CC * param0, int param1, const if (v4 == GX_BGMODE_0) { PaletteSys_LoadPalette(param0->unk_04, v2, ov104_0222EA90(param1, 8), 94, 0, ((10 - 0 + 1) * 0x20), 0 * 16); } else { - NNSG2dPaletteData * v5; - void * v6; + NNSG2dPaletteData *v5; + void *v6; v6 = sub_020071EC(v3, ov104_0222EA90(param1, 8), &v5, 94); DC_FlushRange(v5->pRawData, v5->szByte); @@ -732,8 +731,8 @@ static void ov104_0223CC74 (UnkStruct_ov104_0223C4CC * param0, int param1, const if (v4 == GX_BGMODE_0) { (void)0; } else { - NNSG2dPaletteData * v7; - void * v8; + NNSG2dPaletteData *v7; + void *v8; v8 = sub_020071EC(v3, ov104_0222EA90(param1, 11), &v7, 94); DC_FlushRange(v7->pRawData, v7->szByte); @@ -751,12 +750,12 @@ static void ov104_0223CC74 (UnkStruct_ov104_0223C4CC * param0, int param1, const } } -static void ov104_0223CEEC (UnkStruct_ov104_0223C4CC * param0) +static void ov104_0223CEEC(UnkStruct_ov104_0223C4CC *param0) { int v0; { - UnkStruct_ov104_0223C634 * v1; + UnkStruct_ov104_0223C634 *v1; v1 = sub_0209B9D0(param0->unk_08); @@ -784,15 +783,15 @@ static void ov104_0223CEEC (UnkStruct_ov104_0223C4CC * param0) ov63_0222D7B4(param0->unk_30); } -static GenericPointerData * ov104_0223CF4C (int param0) +static GenericPointerData *ov104_0223CF4C(int param0) { - GenericPointerData * v0; + GenericPointerData *v0; v0 = sub_02024220(param0, 0, 1, 0, 1, ov104_0223CF68); return v0; } -static void ov104_0223CF68 (void) +static void ov104_0223CF68(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -807,12 +806,12 @@ static void ov104_0223CF68 (void) G3_ViewPort(0, 0, 255, 191); } -static void ov104_0223CFEC (GenericPointerData * param0) +static void ov104_0223CFEC(GenericPointerData *param0) { sub_020242C4(param0); } -static void ov104_0223CFF4 (UnkStruct_ov104_0223C4CC * param0) +static void ov104_0223CFF4(UnkStruct_ov104_0223C4CC *param0) { param0->unk_34.unk_00 = sub_0200C6E4(94); @@ -827,7 +826,7 @@ static void ov104_0223CFF4 (UnkStruct_ov104_0223C4CC * param0) sub_0200964C(sub_0200C738(param0->unk_34.unk_00), 0, (512 * FX32_ONE)); } -static void ov104_0223D058 (UnkStruct_ov104_0223C4CC * param0) +static void ov104_0223D058(UnkStruct_ov104_0223C4CC *param0) { { int v0; @@ -864,9 +863,9 @@ static void ov104_0223D058 (UnkStruct_ov104_0223C4CC * param0) sub_0200C8D4(param0->unk_34.unk_00); } -void ov104_0223D0EC (UnkStruct_ov104_0223C4CC * param0, const UnkStruct_ov104_0223C688 * param1) +void ov104_0223D0EC(UnkStruct_ov104_0223C4CC *param0, const UnkStruct_ov104_0223C688 *param1) { - UnkStruct_ov104_0223C688 * v0; + UnkStruct_ov104_0223C688 *v0; int v1, v2; v0 = sub_0209B9CC(param0->unk_08); @@ -891,10 +890,10 @@ void ov104_0223D0EC (UnkStruct_ov104_0223C4CC * param0, const UnkStruct_ov104_02 ov63_0222CDE8(param0->unk_20, param1->unk_00, param1->unk_02, 94); } -void ov104_0223D148 (UnkStruct_ov104_0223C4CC * param0, int param1) +void ov104_0223D148(UnkStruct_ov104_0223C4CC *param0, int param1) { int v0; - UnkStruct_ov104_0223C688 * v1; + UnkStruct_ov104_0223C688 *v1; v1 = sub_0209B9CC(param0->unk_08); @@ -907,13 +906,13 @@ void ov104_0223D148 (UnkStruct_ov104_0223C4CC * param0, int param1) } } -UnkStruct_ov63_0222BEC0 * ov104_0223D180 (UnkStruct_ov104_0223C4CC * param0, const UnkStruct_ov104_0223D570 * param1, int param2) +UnkStruct_ov63_0222BEC0 *ov104_0223D180(UnkStruct_ov104_0223C4CC *param0, const UnkStruct_ov104_0223D570 *param1, int param2) { - UnkStruct_ov104_0223C634 * v0; + UnkStruct_ov104_0223C634 *v0; int v1, v2; UnkStruct_ov65_022376D0 v3; - UnkStruct_ov63_0222BEC0 * v4; - UnkStruct_ov63_0222CE44 * v5; + UnkStruct_ov63_0222BEC0 *v4; + UnkStruct_ov63_0222CE44 *v5; v0 = sub_0209B9D0(param0->unk_08); @@ -946,10 +945,10 @@ UnkStruct_ov63_0222BEC0 * ov104_0223D180 (UnkStruct_ov104_0223C4CC * param0, con return v4; } -void ov104_0223D200 (UnkStruct_ov104_0223C4CC * param0, UnkStruct_ov63_0222BEC0 * param1) +void ov104_0223D200(UnkStruct_ov104_0223C4CC *param0, UnkStruct_ov63_0222BEC0 *param1) { int v0; - UnkStruct_ov104_0223C634 * v1; + UnkStruct_ov104_0223C634 *v1; v1 = sub_0209B9D0(param0->unk_08); @@ -967,10 +966,10 @@ void ov104_0223D200 (UnkStruct_ov104_0223C4CC * param0, UnkStruct_ov63_0222BEC0 } } -void ov104_0223D258 (UnkStruct_ov104_0223C4CC * param0, u16 param1, UnkStruct_ov63_0222BEC0 ** param2, UnkStruct_ov63_0222CE44 ** param3) +void ov104_0223D258(UnkStruct_ov104_0223C4CC *param0, u16 param1, UnkStruct_ov63_0222BEC0 **param2, UnkStruct_ov63_0222CE44 **param3) { int v0; - UnkStruct_ov104_0223C634 * v1; + UnkStruct_ov104_0223C634 *v1; v1 = sub_0209B9D0(param0->unk_08); @@ -991,7 +990,7 @@ void ov104_0223D258 (UnkStruct_ov104_0223C4CC * param0, u16 param1, UnkStruct_ov GF_ASSERT(0); } -void ov104_0223D29C (UnkStruct_ov104_0223C4CC * param0, u16 param1) +void ov104_0223D29C(UnkStruct_ov104_0223C4CC *param0, u16 param1) { int v0; @@ -1005,7 +1004,7 @@ void ov104_0223D29C (UnkStruct_ov104_0223C4CC * param0, u16 param1) GF_ASSERT(0); } -void ov104_0223D2CC (UnkStruct_ov104_0223C4CC * param0, u16 param1) +void ov104_0223D2CC(UnkStruct_ov104_0223C4CC *param0, u16 param1) { int v0; @@ -1017,9 +1016,9 @@ void ov104_0223D2CC (UnkStruct_ov104_0223C4CC * param0, u16 param1) } } -CellActorData * ov104_0223D2FC (UnkStruct_ov104_0223C4CC * param0, u16 param1, u16 param2) +CellActorData *ov104_0223D2FC(UnkStruct_ov104_0223C4CC *param0, u16 param1, u16 param2) { - CellActorData * v0; + CellActorData *v0; GF_ASSERT(param1 < 8); GF_ASSERT(param0->unk_3C.unk_00[param1] == NULL); @@ -1033,7 +1032,7 @@ CellActorData * ov104_0223D2FC (UnkStruct_ov104_0223C4CC * param0, u16 param1, u return v0; } -void ov104_0223D348 (UnkStruct_ov104_0223C4CC * param0, u16 param1) +void ov104_0223D348(UnkStruct_ov104_0223C4CC *param0, u16 param1) { GF_ASSERT(param1 < 8); GF_ASSERT(param0->unk_3C.unk_00[param1] != NULL); @@ -1042,12 +1041,12 @@ void ov104_0223D348 (UnkStruct_ov104_0223C4CC * param0, u16 param1) param0->unk_3C.unk_00[param1] = NULL; } -CellActorData * ov104_0223D370 (UnkStruct_ov104_0223C4CC * param0, u16 param1) +CellActorData *ov104_0223D370(UnkStruct_ov104_0223C4CC *param0, u16 param1) { return param0->unk_3C.unk_00[param1]; } -void ov104_0223D378 (UnkStruct_ov104_0223C4CC * param0, u16 param1, int param2) +void ov104_0223D378(UnkStruct_ov104_0223C4CC *param0, u16 param1, int param2) { if (param2 == 1) { param0->unk_3C.unk_30 |= 1 << param1; @@ -1056,16 +1055,16 @@ void ov104_0223D378 (UnkStruct_ov104_0223C4CC * param0, u16 param1, int param2) } } -u32 ov104_0223D3A4 (UnkStruct_ov104_0223C4CC * param0, u16 param1) +u32 ov104_0223D3A4(UnkStruct_ov104_0223C4CC *param0, u16 param1) { return (param0->unk_3C.unk_30 >> param1) & 1; } -static void ov104_0223D3B0 (UnkStruct_ov104_0223C4CC * param0) +static void ov104_0223D3B0(UnkStruct_ov104_0223C4CC *param0) { int v0; - UnkStruct_ov104_0223D3B0 * v1; - UnkStruct_ov104_0223D3B0_1 * v2; + UnkStruct_ov104_0223D3B0 *v1; + UnkStruct_ov104_0223D3B0_1 *v2; v1 = sub_0209B9E0(param0->unk_08); v2 = ¶m0->unk_3C; @@ -1092,12 +1091,12 @@ static void ov104_0223D3B0 (UnkStruct_ov104_0223C4CC * param0) } } -static void ov104_0223D498 (UnkStruct_ov104_0223C4CC * param0) +static void ov104_0223D498(UnkStruct_ov104_0223C4CC *param0) { int v0; - NARC * v1; - UnkStruct_ov104_0223D3B0 * v2; - CellActorData * v3; + NARC *v1; + UnkStruct_ov104_0223D3B0 *v2; + CellActorData *v3; v2 = sub_0209B9E0(param0->unk_08); v1 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_OBJ, 94); @@ -1126,20 +1125,20 @@ static void ov104_0223D498 (UnkStruct_ov104_0223C4CC * param0) sub_0209B9EC(param0->unk_08); } -void ov104_0223D554 (UnkStruct_ov104_0223C4CC * param0, s16 * param1, s16 * param2) +void ov104_0223D554(UnkStruct_ov104_0223C4CC *param0, s16 *param1, s16 *param2) { *param2 = ov63_0222D1B0(¶m0->unk_1C); *param1 = ov63_0222D1B8(¶m0->unk_1C); } -static void ov104_0223D570 (UnkStruct_ov104_0223C634 * param0, UnkStruct_ov104_0223D570 * param1) +static void ov104_0223D570(UnkStruct_ov104_0223C634 *param0, UnkStruct_ov104_0223D570 *param1) { *param1 = param0->unk_08; } -static void ov104_0223D584 (UnkStruct_0209B75C * param0, int param1, UnkStruct_ov63_0222BEC0 * param2, UnkStruct_ov63_0222CE44 * param3, const UnkStruct_ov104_0223D570 * param4) +static void ov104_0223D584(UnkStruct_0209B75C *param0, int param1, UnkStruct_ov63_0222BEC0 *param2, UnkStruct_ov63_0222CE44 *param3, const UnkStruct_ov104_0223D570 *param4) { - UnkStruct_ov104_0223C634 * v0; + UnkStruct_ov104_0223C634 *v0; v0 = sub_0209B9D4(param0, param1); @@ -1148,10 +1147,10 @@ static void ov104_0223D584 (UnkStruct_0209B75C * param0, int param1, UnkStruct_o v0->unk_08 = *param4; } -UnkStruct_ov104_0223C634 * ov104_0223D5A8 (UnkStruct_0209B75C * param0, int param1) +UnkStruct_ov104_0223C634 *ov104_0223D5A8(UnkStruct_0209B75C *param0, int param1) { int v0; - UnkStruct_ov104_0223C634 * v1; + UnkStruct_ov104_0223C634 *v1; v1 = sub_0209B9D0(param0); diff --git a/src/overlay104/ov104_0223D5D0.c b/src/overlay104/ov104_0223D5D0.c index 20a39dcfca..9682a1af35 100644 --- a/src/overlay104/ov104_0223D5D0.c +++ b/src/overlay104/ov104_0223D5D0.c @@ -1,26 +1,27 @@ +#include "overlay104/ov104_0223D5D0.h" + #include #include #include "struct_decls/struct_02014014_decl.h" -#include "unk_02014000.h" -#include "heap.h" #include "camera.h" +#include "heap.h" +#include "unk_02014000.h" #include "unk_0202419C.h" -#include "overlay104/ov104_0223D5D0.h" typedef struct UnkStruct_ov104_0223D5F0_t { - UnkStruct_02014014 * unk_00[8]; + UnkStruct_02014014 *unk_00[8]; u16 unk_20; } UnkStruct_ov104_0223D5F0; static u32 ov104_0223D720(u32 param0, BOOL param1); static u32 ov104_0223D744(u32 param0, BOOL param1); -static void ov104_0223D708(UnkStruct_02014014 * param0); +static void ov104_0223D708(UnkStruct_02014014 *param0); -UnkStruct_ov104_0223D5F0 * ov104_0223D5D0 (int param0) +UnkStruct_ov104_0223D5F0 *ov104_0223D5D0(int param0) { - UnkStruct_ov104_0223D5F0 * v0; + UnkStruct_ov104_0223D5F0 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov104_0223D5F0)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223D5F0)); @@ -31,10 +32,10 @@ UnkStruct_ov104_0223D5F0 * ov104_0223D5D0 (int param0) return v0; } -void ov104_0223D5F0 (UnkStruct_ov104_0223D5F0 * param0) +void ov104_0223D5F0(UnkStruct_ov104_0223D5F0 *param0) { int v0; - void * v1; + void *v1; for (v0 = 0; v0 < (((3 + 1) + 3) + 1); v0++) { if (param0->unk_00[v0] != NULL) { @@ -45,12 +46,12 @@ void ov104_0223D5F0 (UnkStruct_ov104_0223D5F0 * param0) Heap_FreeToHeap(param0); } -UnkStruct_02014014 * ov104_0223D614 (UnkStruct_ov104_0223D5F0 * param0, int param1, int param2, int param3) +UnkStruct_02014014 *ov104_0223D614(UnkStruct_ov104_0223D5F0 *param0, int param1, int param2, int param3) { - UnkStruct_02014014 * v0; - void * v1; - Camera * camera; - void * v3; + UnkStruct_02014014 *v0; + void *v1; + Camera *camera; + void *v3; GF_ASSERT(param0->unk_00[param1] == NULL); @@ -68,7 +69,7 @@ UnkStruct_02014014 * ov104_0223D614 (UnkStruct_ov104_0223D5F0 * param0, int para return v0; } -void ov104_0223D68C (UnkStruct_ov104_0223D5F0 * param0, int param1) +void ov104_0223D68C(UnkStruct_ov104_0223D5F0 *param0, int param1) { GF_ASSERT(param0->unk_00[param1] != NULL); @@ -76,7 +77,7 @@ void ov104_0223D68C (UnkStruct_ov104_0223D5F0 * param0, int param1) param0->unk_00[param1] = NULL; } -int ov104_0223D6A8 (void) +int ov104_0223D6A8(void) { int v0; @@ -97,13 +98,13 @@ int ov104_0223D6A8 (void) return 1; } -UnkStruct_02014014 * ov104_0223D6D0 (UnkStruct_ov104_0223D5F0 * param0, int param1) +UnkStruct_02014014 *ov104_0223D6D0(UnkStruct_ov104_0223D5F0 *param0, int param1) { GF_ASSERT(param0->unk_00[param1] != NULL); return param0->unk_00[param1]; } -BOOL ov104_0223D6E4 (UnkStruct_ov104_0223D5F0 * param0) +BOOL ov104_0223D6E4(UnkStruct_ov104_0223D5F0 *param0) { int v0; @@ -118,9 +119,9 @@ BOOL ov104_0223D6E4 (UnkStruct_ov104_0223D5F0 * param0) return 1; } -static void ov104_0223D708 (UnkStruct_02014014 * param0) +static void ov104_0223D708(UnkStruct_02014014 *param0) { - void * v0; + void *v0; v0 = sub_02014730(param0); @@ -128,7 +129,7 @@ static void ov104_0223D708 (UnkStruct_02014014 * param0) Heap_FreeToHeap(v0); } -static u32 ov104_0223D720 (u32 param0, BOOL param1) +static u32 ov104_0223D720(u32 param0, BOOL param1) { u32 v0; NNSGfdTexKey v1; @@ -142,7 +143,7 @@ static u32 ov104_0223D720 (u32 param0, BOOL param1) return v0; } -static u32 ov104_0223D744 (u32 param0, BOOL param1) +static u32 ov104_0223D744(u32 param0, BOOL param1) { NNSGfdPlttKey v0; u32 v1; diff --git a/src/overlay104/ov104_0223D768.c b/src/overlay104/ov104_0223D768.c index c436351e27..292dc76422 100644 --- a/src/overlay104/ov104_0223D768.c +++ b/src/overlay104/ov104_0223D768.c @@ -1,3 +1,5 @@ +#include "overlay104/ov104_0223D768.h" + #include #include @@ -5,12 +7,10 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" - -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" #include "unk_0200C6E4.h" -#include "overlay104/ov104_0223D768.h" static const SpriteTemplate Unk_ov104_022417D8[] = { { @@ -21,9 +21,9 @@ static const SpriteTemplate Unk_ov104_022417D8[] = { 0x64, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x21, 0x2C, 0x23, 0x22, 0xffffffff, 0xffffffff}, + { 0x21, 0x2C, 0x23, 0x22, 0xffffffff, 0xffffffff }, 0x1, - 0x0 + 0x0, }, { 0x0, @@ -33,9 +33,9 @@ static const SpriteTemplate Unk_ov104_022417D8[] = { 0x64, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x21, 0x2C, 0x23, 0x22, 0xffffffff, 0xffffffff}, + { 0x21, 0x2C, 0x23, 0x22, 0xffffffff, 0xffffffff }, 0x1, - 0x0 + 0x0, }, { 0x0, @@ -45,9 +45,9 @@ static const SpriteTemplate Unk_ov104_022417D8[] = { 0x64, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x18, 0x2A, 0x1A, 0x19, 0xffffffff, 0xffffffff}, + { 0x18, 0x2A, 0x1A, 0x19, 0xffffffff, 0xffffffff }, 0x1, - 0x0 + 0x0, }, { 0x0, @@ -57,15 +57,15 @@ static const SpriteTemplate Unk_ov104_022417D8[] = { 0x64, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x1B, 0x2B, 0x1D, 0x1C, 0xffffffff, 0xffffffff}, + { 0x1B, 0x2B, 0x1D, 0x1C, 0xffffffff, 0xffffffff }, 0x1, - 0x0 - } + 0x0, + }, }; -void ov104_0223D768 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, PaletteData * param3, u16 param4) +void ov104_0223D768(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, PaletteData *param3, u16 param4) { - const SpriteTemplate * v0; + const SpriteTemplate *v0; GF_ASSERT(param4 < NELEMS(Unk_ov104_022417D8)); v0 = &Unk_ov104_022417D8[param4]; @@ -76,9 +76,9 @@ void ov104_0223D768 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * SpriteRenderer_LoadAnimResObjFromOpenNarc(param0, param1, param2, v0->resources[3], 1, v0->resources[3]); } -void ov104_0223D7EC (SpriteGfxHandler * param0, u16 param1) +void ov104_0223D7EC(SpriteGfxHandler *param0, u16 param1) { - const SpriteTemplate * v0; + const SpriteTemplate *v0; GF_ASSERT(param1 < NELEMS(Unk_ov104_022417D8)); v0 = &Unk_ov104_022417D8[param1]; @@ -89,9 +89,9 @@ void ov104_0223D7EC (SpriteGfxHandler * param0, u16 param1) SpriteGfxHandler_UnloadAnimObjById(param0, v0->resources[3]); } -CellActorData * ov104_0223D828 (SpriteRenderer * param0, SpriteGfxHandler * param1, u16 param2) +CellActorData *ov104_0223D828(SpriteRenderer *param0, SpriteGfxHandler *param1, u16 param2) { - CellActorData * v0; + CellActorData *v0; GF_ASSERT(param2 < NELEMS(Unk_ov104_022417D8)); @@ -100,7 +100,7 @@ CellActorData * ov104_0223D828 (SpriteRenderer * param0, SpriteGfxHandler * para return v0; } -void ov104_0223D858 (CellActorData * param0) +void ov104_0223D858(CellActorData *param0) { sub_0200D0F4(param0); } diff --git a/src/overlay104/ov104_0223D860.c b/src/overlay104/ov104_0223D860.c index b0565d788b..6d97fe8b6f 100644 --- a/src/overlay104/ov104_0223D860.c +++ b/src/overlay104/ov104_0223D860.c @@ -1,34 +1,35 @@ +#include "overlay104/ov104_0223D860.h" + #include #include #include "struct_decls/struct_0209B75C_decl.h" +#include "overlay063/ov63_0222D77C.h" #include "overlay063/struct_ov63_0222CCB8.h" +#include "overlay104/ov104_02231F74.h" +#include "overlay104/ov104_0223C2D4.h" #include "overlay104/struct_ov104_0223C4CC.h" #include "overlay104/struct_ov104_0223C634.h" #include "overlay104/struct_ov104_0223D8F0.h" #include "unk_0209B6F8.h" -#include "overlay063/ov63_0222D77C.h" -#include "overlay104/ov104_02231F74.h" -#include "overlay104/ov104_0223C2D4.h" -#include "overlay104/ov104_0223D860.h" -typedef BOOL (* UnkFuncPtr_ov104_022418A8)(UnkStruct_0209B75C *, UnkStruct_ov104_0223C634 *); +typedef BOOL (*UnkFuncPtr_ov104_022418A8)(UnkStruct_0209B75C *, UnkStruct_ov104_0223C634 *); -static void ov104_0223D898(UnkStruct_0209B75C * param0, UnkStruct_ov104_0223C634 * param1); -void ov104_0223D860(UnkStruct_0209B75C * param0, u16 param1, u8 param2, s16 param3[], int param4); -void ov104_0223D8C4(UnkStruct_0209B75C * param0); -static BOOL ov104_0223D8F0(UnkStruct_0209B75C * param0, UnkStruct_ov104_0223C634 * param1); +static void ov104_0223D898(UnkStruct_0209B75C *param0, UnkStruct_ov104_0223C634 *param1); +void ov104_0223D860(UnkStruct_0209B75C *param0, u16 param1, u8 param2, s16 param3[], int param4); +void ov104_0223D8C4(UnkStruct_0209B75C *param0); +static BOOL ov104_0223D8F0(UnkStruct_0209B75C *param0, UnkStruct_ov104_0223C634 *param1); static const UnkFuncPtr_ov104_022418A8 Unk_ov104_022418A8[] = { NULL, ov104_0223D8F0 }; -void ov104_0223D860 (UnkStruct_0209B75C * param0, u16 param1, u8 param2, s16 param3[], int param4) +void ov104_0223D860(UnkStruct_0209B75C *param0, u16 param1, u8 param2, s16 param3[], int param4) { - UnkStruct_ov104_0223C634 * v0; + UnkStruct_ov104_0223C634 *v0; int v1; v0 = ov104_0223D5A8(param0, param1); @@ -41,7 +42,7 @@ void ov104_0223D860 (UnkStruct_0209B75C * param0, u16 param1, u8 param2, s16 par } } -static void ov104_0223D898 (UnkStruct_0209B75C * param0, UnkStruct_ov104_0223C634 * param1) +static void ov104_0223D898(UnkStruct_0209B75C *param0, UnkStruct_ov104_0223C634 *param1) { int v0; @@ -56,9 +57,9 @@ static void ov104_0223D898 (UnkStruct_0209B75C * param0, UnkStruct_ov104_0223C63 } } -void ov104_0223D8C4 (UnkStruct_0209B75C * param0) +void ov104_0223D8C4(UnkStruct_0209B75C *param0) { - UnkStruct_ov104_0223C634 * v0; + UnkStruct_ov104_0223C634 *v0; int v1; v0 = sub_0209B9D0(param0); @@ -72,11 +73,11 @@ void ov104_0223D8C4 (UnkStruct_0209B75C * param0) } } -static BOOL ov104_0223D8F0 (UnkStruct_0209B75C * param0, UnkStruct_ov104_0223C634 * param1) +static BOOL ov104_0223D8F0(UnkStruct_0209B75C *param0, UnkStruct_ov104_0223C634 *param1) { - UnkStruct_ov104_0223D8F0 * v0 = ¶m1->unk_26; + UnkStruct_ov104_0223D8F0 *v0 = ¶m1->unk_26; UnkStruct_ov63_0222CCB8 v1; - UnkStruct_ov104_0223C4CC * v2 = sub_0209B974(param0); + UnkStruct_ov104_0223C4CC *v2 = sub_0209B974(param0); if (v0->unk_02[2] > 0) { v0->unk_02[2]--; diff --git a/src/overlay104/ov104_0223D9E4.c b/src/overlay104/ov104_0223D9E4.c index 7fad7a3878..d41792c3e2 100644 --- a/src/overlay104/ov104_0223D9E4.c +++ b/src/overlay104/ov104_0223D9E4.c @@ -1,24 +1,24 @@ +#include "overlay104/ov104_0223D9E4.h" + #include #include -#include "enums.h" - #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "unk_02002F38.h" +#include "enums.h" +#include "heap.h" #include "narc.h" -#include "unk_02006E3C.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_02002F38.h" +#include "unk_02006E3C.h" #include "unk_02018340.h" -#include "overlay104/ov104_0223D9E4.h" typedef struct { - SysTask * unk_00; - BGL * unk_04; + SysTask *unk_00; + BGL *unk_04; u16 unk_08[2][2048]; u8 unk_2008[2][65536]; u8 unk_22008; @@ -26,17 +26,17 @@ typedef struct { } UnkStruct_ov104_0223DB34; typedef struct { - SysTask * unk_00; - PaletteData * unk_04; + SysTask *unk_00; + PaletteData *unk_04; u16 unk_08[3][16]; u8 unk_68; u8 unk_69; } UnkStruct_ov104_0223DC04; typedef struct { - SysTask * unk_00; - SysTask * unk_04; - BGL * unk_08; + SysTask *unk_00; + SysTask *unk_04; + BGL *unk_08; int unk_0C; int unk_10; int unk_14; @@ -46,26 +46,26 @@ typedef struct { } UnkStruct_ov104_0223DA28_sub1; typedef struct UnkStruct_ov104_0223DA28_t { - UnkStruct_ov104_0223DB34 * unk_00; - UnkStruct_ov104_0223DC04 * unk_04; - UnkStruct_ov104_0223DA28_sub1 * unk_08; + UnkStruct_ov104_0223DB34 *unk_00; + UnkStruct_ov104_0223DC04 *unk_04; + UnkStruct_ov104_0223DA28_sub1 *unk_08; } UnkStruct_ov104_0223DA28; -static UnkStruct_ov104_0223DB34 * ov104_0223DA40(BGL * param0); -static void ov104_0223DB34(UnkStruct_ov104_0223DB34 * param0); -static void ov104_0223DB48(SysTask * param0, void * param1); -static UnkStruct_ov104_0223DC04 * ov104_0223DBB8(PaletteData * param0); -static void ov104_0223DC04(UnkStruct_ov104_0223DC04 * param0); -static void ov104_0223DC18(SysTask * param0, void * param1); +static UnkStruct_ov104_0223DB34 *ov104_0223DA40(BGL *param0); +static void ov104_0223DB34(UnkStruct_ov104_0223DB34 *param0); +static void ov104_0223DB48(SysTask *param0, void *param1); +static UnkStruct_ov104_0223DC04 *ov104_0223DBB8(PaletteData *param0); +static void ov104_0223DC04(UnkStruct_ov104_0223DC04 *param0); +static void ov104_0223DC18(SysTask *param0, void *param1); static const u16 Unk_ov104_022418B0[] = { 0x14, 0x15 }; -UnkStruct_ov104_0223DA28 * ov104_0223D9E4 (BGL * param0, PaletteData * param1) +UnkStruct_ov104_0223DA28 *ov104_0223D9E4(BGL *param0, PaletteData *param1) { - UnkStruct_ov104_0223DA28 * v0; + UnkStruct_ov104_0223DA28 *v0; v0 = Heap_AllocFromHeap(94, sizeof(UnkStruct_ov104_0223DA28)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223DA28)); @@ -78,16 +78,16 @@ UnkStruct_ov104_0223DA28 * ov104_0223D9E4 (BGL * param0, PaletteData * param1) return v0; } -void ov104_0223DA28 (UnkStruct_ov104_0223DA28 * param0) +void ov104_0223DA28(UnkStruct_ov104_0223DA28 *param0) { ov104_0223DB34(param0->unk_00); ov104_0223DC04(param0->unk_04); Heap_FreeToHeap(param0); } -static UnkStruct_ov104_0223DB34 * ov104_0223DA40 (BGL * param0) +static UnkStruct_ov104_0223DB34 *ov104_0223DA40(BGL *param0) { - UnkStruct_ov104_0223DB34 * v0; + UnkStruct_ov104_0223DB34 *v0; GF_ASSERT(2 == NELEMS(Unk_ov104_022418B0)); @@ -96,9 +96,9 @@ static UnkStruct_ov104_0223DB34 * ov104_0223DA40 (BGL * param0) v0->unk_04 = param0; { - NARC * v1; - void * v2; - NNSG2dScreenData * v3; + NARC *v1; + void *v2; + NNSG2dScreenData *v3; int v4; v1 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); @@ -113,9 +113,9 @@ static UnkStruct_ov104_0223DB34 * ov104_0223DA40 (BGL * param0) } { - NARC * v5; - void * v6; - NNSG2dCharacterData * v7; + NARC *v5; + void *v6; + NNSG2dCharacterData *v7; v5 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 94); @@ -136,16 +136,16 @@ static UnkStruct_ov104_0223DB34 * ov104_0223DA40 (BGL * param0) return v0; } -static void ov104_0223DB34 (UnkStruct_ov104_0223DB34 * param0) +static void ov104_0223DB34(UnkStruct_ov104_0223DB34 *param0) { SysTask_Done(param0->unk_00); Heap_FreeToHeap(param0); } -static void ov104_0223DB48 (SysTask * param0, void * param1) +static void ov104_0223DB48(SysTask *param0, void *param1) { u32 v0; - UnkStruct_ov104_0223DB34 * v1 = param1; + UnkStruct_ov104_0223DB34 *v1 = param1; if (v1->unk_22008 < 12) { v1->unk_22008++; @@ -164,9 +164,9 @@ static void ov104_0223DB48 (SysTask * param0, void * param1) v1->unk_22009 ^= 1; } -static UnkStruct_ov104_0223DC04 * ov104_0223DBB8 (PaletteData * param0) +static UnkStruct_ov104_0223DC04 *ov104_0223DBB8(PaletteData *param0) { - UnkStruct_ov104_0223DC04 * v0; + UnkStruct_ov104_0223DC04 *v0; v0 = Heap_AllocFromHeap(94, sizeof(UnkStruct_ov104_0223DC04)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223DC04)); @@ -175,7 +175,7 @@ static UnkStruct_ov104_0223DC04 * ov104_0223DBB8 (PaletteData * param0) v0->unk_68 = 2; { - u16 * v1; + u16 *v1; v1 = sub_02003164(param0, 0); MI_CpuCopy16(&v1[16 * 5], v0->unk_08, 3 * 16 * sizeof(u16)); @@ -186,15 +186,15 @@ static UnkStruct_ov104_0223DC04 * ov104_0223DBB8 (PaletteData * param0) return v0; } -static void ov104_0223DC04 (UnkStruct_ov104_0223DC04 * param0) +static void ov104_0223DC04(UnkStruct_ov104_0223DC04 *param0) { SysTask_Done(param0->unk_00); Heap_FreeToHeap(param0); } -static void ov104_0223DC18 (SysTask * param0, void * param1) +static void ov104_0223DC18(SysTask *param0, void *param1) { - UnkStruct_ov104_0223DC04 * v0 = param1; + UnkStruct_ov104_0223DC04 *v0 = param1; if (v0->unk_69 < 8) { v0->unk_69++; diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c index 397b37bdd3..1c6a1d8295 100644 --- a/src/overlay104/ov104_0223DC7C.c +++ b/src/overlay104/ov104_0223DC7C.c @@ -1,40 +1,37 @@ #include #include +#include "struct_decls/font_oam.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - +#include "struct_defs/sprite_manager_allocation.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_defs/sprite_template.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_0200679C.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_02012744.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" #include "unk_020218BC.h" -#include "strbuf.h" typedef struct { Window unk_00; @@ -43,7 +40,7 @@ typedef struct { } UnkStruct_ov104_0223E29C; typedef struct { - FontOAM * unk_00; + FontOAM *unk_00; SpriteManagerAllocation unk_04; u16 unk_10; } UnkStruct_ov104_0223E3B8; @@ -72,22 +69,22 @@ typedef struct { int unk_00; int unk_04; int unk_08; - void * unk_0C; - BGL * unk_10; - SpriteRenderer * unk_14; - SpriteGfxHandler * unk_18; - PaletteData * unk_1C; - u16 * unk_20; - NARC * unk_24; + void *unk_0C; + BGL *unk_10; + SpriteRenderer *unk_14; + SpriteGfxHandler *unk_18; + PaletteData *unk_1C; + u16 *unk_20; + NARC *unk_24; s16 unk_28; s16 unk_2A; u8 unk_2C; - UnkStruct_02012744 * unk_30; - SysTask * unk_34; + UnkStruct_02012744 *unk_30; + SysTask *unk_34; int unk_38; int unk_3C; u16 unk_40[128]; - SysTask * unk_140; + SysTask *unk_140; UnkStruct_ov104_0223E6F0 unk_144; UnkStruct_ov104_0223E804 unk_158; int unk_160; @@ -105,7 +102,7 @@ typedef struct { typedef struct { s16 unk_00; s16 unk_02; - CellActorData * unk_04[4]; + CellActorData *unk_04[4]; LinearInterpolationTaskFX32 unk_14[4]; } UnkStruct_ov104_0223E48C; @@ -114,7 +111,7 @@ typedef struct { UnkStruct_ov104_0223E48C unk_14; s32 unk_78; UnkStruct_ov104_0223E3B8 unk_7C; - CellActorData * unk_90; + CellActorData *unk_90; } UnkStruct_ov104_0223DDE4; typedef struct { @@ -129,34 +126,34 @@ typedef struct { u8 unk_0B; } UnkStruct_ov104_0224191C; -void ov104_0223DC7C(int param0, BGL * param1, SpriteRenderer * param2, SpriteGfxHandler * param3, PaletteData * param4, u16 * param5, s16 param6, s16 param7); -static void ov104_0223DD30(UnkStruct_ov104_0223DD30 * param0, SysTask * param1); -static void ov104_0223DD5C(SysTask * param0, void * param1); -static void ov104_0223DDB4(SysTask * param0, void * param1); -static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 * param0, u32 param1, const UnkStruct_ov104_0224191C * param2); -static void ov104_0223E29C(UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223E3B8 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov104_0223E29C * param10); -static void ov104_0223E3B8(UnkStruct_ov104_0223E3B8 * param0); -static void ov104_0223E3FC(UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223E48C * param1, fx32 param2, fx32 param3, u32 param4); -static void ov104_0223E48C(UnkStruct_ov104_0223E48C * param0); -static BOOL ov104_0223E4A4(UnkStruct_ov104_0223E48C * param0); -static void ov104_0223E534(LinearInterpolationTaskFX32 * param0, fx32 param1, fx32 param2, int param3); -static BOOL ov104_0223E544(LinearInterpolationTaskFX32 * param0); +void ov104_0223DC7C(int param0, BGL *param1, SpriteRenderer *param2, SpriteGfxHandler *param3, PaletteData *param4, u16 *param5, s16 param6, s16 param7); +static void ov104_0223DD30(UnkStruct_ov104_0223DD30 *param0, SysTask *param1); +static void ov104_0223DD5C(SysTask *param0, void *param1); +static void ov104_0223DDB4(SysTask *param0, void *param1); +static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const UnkStruct_ov104_0224191C *param2); +static void ov104_0223E29C(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_0223E3B8 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov104_0223E29C *param10); +static void ov104_0223E3B8(UnkStruct_ov104_0223E3B8 *param0); +static void ov104_0223E3FC(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_0223E48C *param1, fx32 param2, fx32 param3, u32 param4); +static void ov104_0223E48C(UnkStruct_ov104_0223E48C *param0); +static BOOL ov104_0223E4A4(UnkStruct_ov104_0223E48C *param0); +static void ov104_0223E534(LinearInterpolationTaskFX32 *param0, fx32 param1, fx32 param2, int param3); +static BOOL ov104_0223E544(LinearInterpolationTaskFX32 *param0); static VecFx32 ov104_0223E58C(fx32 param0, fx32 param1, fx32 param2); -static void ov104_0223E5A8(UnkStruct_ov104_0223DD30 * param0, const UnkStruct_ov104_0224191C * param1); -static void ov104_0223E6BC(SysTask * param0, void * param1); -static void ov104_0223E6F0(UnkStruct_ov104_0223DD30 * param0, int param1); -static void ov104_0223E740(SysTask * param0, void * param1); -static void ov104_0223E7A4(SysTask * param0, void * param1); -static BOOL ov104_0223E804(UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223DDE4 * param1, UnkStruct_ov104_0223E804 * param2); -static void ov104_0223E3CC(const Strbuf *param0, int param1, int * param2, int * param3); +static void ov104_0223E5A8(UnkStruct_ov104_0223DD30 *param0, const UnkStruct_ov104_0224191C *param1); +static void ov104_0223E6BC(SysTask *param0, void *param1); +static void ov104_0223E6F0(UnkStruct_ov104_0223DD30 *param0, int param1); +static void ov104_0223E740(SysTask *param0, void *param1); +static void ov104_0223E7A4(SysTask *param0, void *param1); +static BOOL ov104_0223E804(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_0223DDE4 *param1, UnkStruct_ov104_0223E804 *param2); +static void ov104_0223E3CC(const Strbuf *param0, int param1, int *param2, int *param3); static const UnkStruct_ov104_0224191C Unk_ov104_0224191C[] = { - {0x33A, 0x7D, 0x7E, 0x7F, 0x80, 0x8F, 0x8E, 0x8D, 0x0}, - {0x387, 0x71, 0x72, 0x73, 0x74, 0x86, 0x85, 0x84, 0x0}, - {0x387, 0x71, 0x72, 0x73, 0x74, 0x86, 0x85, 0x84, 0x0}, - {0x389, 0x6D, 0x6E, 0x6F, 0x70, 0x83, 0x82, 0x81, 0x0}, - {0x386, 0x79, 0x7A, 0x7B, 0x7C, 0x8C, 0x8B, 0x8A, 0x0}, - {0x388, 0x75, 0x76, 0x77, 0x78, 0x89, 0x88, 0x87, 0x0} + { 0x33A, 0x7D, 0x7E, 0x7F, 0x80, 0x8F, 0x8E, 0x8D, 0x0 }, + { 0x387, 0x71, 0x72, 0x73, 0x74, 0x86, 0x85, 0x84, 0x0 }, + { 0x387, 0x71, 0x72, 0x73, 0x74, 0x86, 0x85, 0x84, 0x0 }, + { 0x389, 0x6D, 0x6E, 0x6F, 0x70, 0x83, 0x82, 0x81, 0x0 }, + { 0x386, 0x79, 0x7A, 0x7B, 0x7C, 0x8C, 0x8B, 0x8A, 0x0 }, + { 0x388, 0x75, 0x76, 0x77, 0x78, 0x89, 0x88, 0x87, 0x0 } }; static const SpriteTemplate Unk_ov104_022418B4 = { @@ -167,7 +164,7 @@ static const SpriteTemplate Unk_ov104_022418B4 = { 0xC, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x7DA, 0x7D2, 0x7D2, 0x7D2, 0xffffffff, 0xffffffff}, + { 0x7DA, 0x7D2, 0x7D2, 0x7D2, 0xffffffff, 0xffffffff }, 0x0, 0x0 }; @@ -180,15 +177,15 @@ static const SpriteTemplate Unk_ov104_022418E8 = { 0xA, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x7DB, 0x7D3, 0x7D3, 0x7D3, 0xffffffff, 0xffffffff}, + { 0x7DB, 0x7D3, 0x7D3, 0x7D3, 0xffffffff, 0xffffffff }, 0x0, 0x0 }; -void ov104_0223DC7C (int param0, BGL * param1, SpriteRenderer * param2, SpriteGfxHandler * param3, PaletteData * param4, u16 * param5, s16 param6, s16 param7) +void ov104_0223DC7C(int param0, BGL *param1, SpriteRenderer *param2, SpriteGfxHandler *param3, PaletteData *param4, u16 *param5, s16 param6, s16 param7) { - SysTask * v0; - UnkStruct_ov104_0223DD30 * v1; + SysTask *v0; + UnkStruct_ov104_0223DD30 *v1; v0 = SysTask_StartAndAllocateParam(ov104_0223DDB4, sizeof(UnkStruct_ov104_0223DD30), 1000, 94); v1 = SysTask_GetParam(v0); @@ -218,7 +215,7 @@ void ov104_0223DC7C (int param0, BGL * param1, SpriteRenderer * param2, SpriteGf v1->unk_34 = SysTask_ExecuteAfterVBlank(ov104_0223DD5C, v1, 1); } -static void ov104_0223DD30 (UnkStruct_ov104_0223DD30 * param0, SysTask * param1) +static void ov104_0223DD30(UnkStruct_ov104_0223DD30 *param0, SysTask *param1) { SysTask_Done(param0->unk_140); SysTask_Done(param0->unk_34); @@ -227,17 +224,17 @@ static void ov104_0223DD30 (UnkStruct_ov104_0223DD30 * param0, SysTask * param1) SysTask_FinishAndFreeParam(param1); } -static void ov104_0223DD5C (SysTask * param0, void * param1) +static void ov104_0223DD5C(SysTask *param0, void *param1) { - UnkStruct_ov104_0223DD30 * v0 = param1; + UnkStruct_ov104_0223DD30 *v0 = param1; G2_SetWnd0Position(v0->unk_144.unk_0A, v0->unk_144.unk_0B, v0->unk_144.unk_0C, v0->unk_144.unk_0D); G2_SetWnd1Position(v0->unk_144.unk_0E, v0->unk_144.unk_0F, v0->unk_144.unk_10, v0->unk_144.unk_11); } -static void ov104_0223DDB4 (SysTask * param0, void * param1) +static void ov104_0223DDB4(SysTask *param0, void *param1) { - UnkStruct_ov104_0223DD30 * v0 = param1; + UnkStruct_ov104_0223DD30 *v0 = param1; BOOL v1; v1 = ov104_0223DDE4(v0, 94, &Unk_ov104_0224191C[v0->unk_2C]); @@ -247,16 +244,16 @@ static void ov104_0223DDB4 (SysTask * param0, void * param1) } } -static BOOL ov104_0223DDE4 (UnkStruct_ov104_0223DD30 * param0, u32 param1, const UnkStruct_ov104_0224191C * param2) +static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const UnkStruct_ov104_0224191C *param2) { - UnkStruct_ov104_0223DDE4 * v0 = param0->unk_0C; + UnkStruct_ov104_0223DDE4 *v0 = param0->unk_0C; BOOL v1; - const VecFx32 * v2; + const VecFx32 *v2; VecFx32 v3; VecFx32 v4; int v5; int v6, v7 = 0; - Strbuf* v8; + Strbuf *v8; switch (param0->unk_00) { case 0: @@ -270,8 +267,8 @@ static BOOL ov104_0223DDE4 (UnkStruct_ov104_0223DD30 * param0, u32 param1, const param0->unk_30 = sub_02012744(4, 94); { - MessageLoader * v9; - Strbuf* v10; + MessageLoader *v9; + Strbuf *v10; v9 = MessageLoader_Init(1, 26, 618, param1); v10 = MessageLoader_GetNewStrbuf(v9, param2->unk_00); @@ -426,15 +423,15 @@ static BOOL ov104_0223DDE4 (UnkStruct_ov104_0223DD30 * param0, u32 param1, const return 0; } -static void ov104_0223E29C (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223E3B8 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov104_0223E29C * param10) +static void ov104_0223E29C(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_0223E3B8 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9, UnkStruct_ov104_0223E29C *param10) { UnkStruct_020127E8 v0; Window v1; SpriteManagerAllocation v2; int v3; - FontOAM * v4; - BGL * v5; - SpriteGfxHandler * v6; + FontOAM *v4; + BGL *v5; + SpriteGfxHandler *v6; int v7, v8; GF_ASSERT(param1->unk_00 == NULL); @@ -493,13 +490,13 @@ static void ov104_0223E29C (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0 param1->unk_10 = v7; } -static void ov104_0223E3B8 (UnkStruct_ov104_0223E3B8 * param0) +static void ov104_0223E3B8(UnkStruct_ov104_0223E3B8 *param0) { sub_02012870(param0->unk_00); sub_0201EE28(¶m0->unk_04); } -static void ov104_0223E3CC (const Strbuf *param0, int param1, int * param2, int * param3) +static void ov104_0223E3CC(const Strbuf *param0, int param1, int *param2, int *param3) { int v0, v1; @@ -514,7 +511,7 @@ static void ov104_0223E3CC (const Strbuf *param0, int param1, int * param2, int *param3 = v1; } -static void ov104_0223E3FC (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223E48C * param1, fx32 param2, fx32 param3, u32 param4) +static void ov104_0223E3FC(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_0223E48C *param1, fx32 param2, fx32 param3, u32 param4) { int v0; SpriteTemplate v1 = Unk_ov104_022418E8; @@ -539,7 +536,7 @@ static void ov104_0223E3FC (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0 } } -static void ov104_0223E48C (UnkStruct_ov104_0223E48C * param0) +static void ov104_0223E48C(UnkStruct_ov104_0223E48C *param0) { int v0; @@ -548,7 +545,7 @@ static void ov104_0223E48C (UnkStruct_ov104_0223E48C * param0) } } -static BOOL ov104_0223E4A4 (UnkStruct_ov104_0223E48C * param0) +static BOOL ov104_0223E4A4(UnkStruct_ov104_0223E48C *param0) { int v0; BOOL v1; @@ -580,7 +577,7 @@ static BOOL ov104_0223E4A4 (UnkStruct_ov104_0223E48C * param0) return v2; } -static void ov104_0223E534 (LinearInterpolationTaskFX32 * param0, fx32 param1, fx32 param2, int param3) +static void ov104_0223E534(LinearInterpolationTaskFX32 *param0, fx32 param1, fx32 param2, int param3) { param0->currentValue = param1; param0->startValue = param1; @@ -589,7 +586,7 @@ static void ov104_0223E534 (LinearInterpolationTaskFX32 * param0, fx32 param1, f param0->currentStep = 0; } -static BOOL ov104_0223E544 (LinearInterpolationTaskFX32 * param0) +static BOOL ov104_0223E544(LinearInterpolationTaskFX32 *param0) { fx32 v0; @@ -607,7 +604,7 @@ static BOOL ov104_0223E544 (LinearInterpolationTaskFX32 * param0) return 1; } -static VecFx32 ov104_0223E58C (fx32 param0, fx32 param1, fx32 param2) +static VecFx32 ov104_0223E58C(fx32 param0, fx32 param1, fx32 param2) { VecFx32 v0; @@ -618,7 +615,7 @@ static VecFx32 ov104_0223E58C (fx32 param0, fx32 param1, fx32 param2) return v0; } -static void ov104_0223E5A8 (UnkStruct_ov104_0223DD30 * param0, const UnkStruct_ov104_0224191C * param1) +static void ov104_0223E5A8(UnkStruct_ov104_0223DD30 *param0, const UnkStruct_ov104_0224191C *param1) { GX_SetVisibleWnd(GX_WNDMASK_W0 | GX_WNDMASK_W1); G2_SetWnd0InsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1); @@ -634,8 +631,8 @@ static void ov104_0223E5A8 (UnkStruct_ov104_0223DD30 * param0, const UnkStruct_o sub_0201C3C0(param0->unk_10, 1); { - void * v0; - NNSG2dPaletteData * v1; + void *v0; + NNSG2dPaletteData *v1; v0 = sub_02006F88(112, param1->unk_08, &v1, 94); @@ -646,9 +643,9 @@ static void ov104_0223E5A8 (UnkStruct_ov104_0223DD30 * param0, const UnkStruct_o param0->unk_140 = SysTask_Start(ov104_0223E6BC, param0, 1100); } -static void ov104_0223E6BC (SysTask * param0, void * param1) +static void ov104_0223E6BC(SysTask *param0, void *param1) { - UnkStruct_ov104_0223DD30 * v0 = param1; + UnkStruct_ov104_0223DD30 *v0 = param1; v0->unk_38++; @@ -666,9 +663,9 @@ static void ov104_0223E6BC (SysTask * param0, void * param1) sub_02002FBC(v0->unk_1C, &v0->unk_40[v0->unk_3C * 16], 0, 12 * 16, 0x20); } -static void ov104_0223E6F0 (UnkStruct_ov104_0223DD30 * param0, int param1) +static void ov104_0223E6F0(UnkStruct_ov104_0223DD30 *param0, int param1) { - UnkStruct_ov104_0223E6F0 * v0; + UnkStruct_ov104_0223E6F0 *v0; v0 = ¶m0->unk_144; MI_CpuClear8(v0, sizeof(UnkStruct_ov104_0223E6F0)); @@ -686,9 +683,9 @@ static void ov104_0223E6F0 (UnkStruct_ov104_0223DD30 * param0, int param1) } } -static void ov104_0223E740 (SysTask * param0, void * param1) +static void ov104_0223E740(SysTask *param0, void *param1) { - UnkStruct_ov104_0223E6F0 * v0 = param1; + UnkStruct_ov104_0223E6F0 *v0 = param1; switch (v0->unk_09) { case 0: @@ -717,9 +714,9 @@ static void ov104_0223E740 (SysTask * param0, void * param1) } } -static void ov104_0223E7A4 (SysTask * param0, void * param1) +static void ov104_0223E7A4(SysTask *param0, void *param1) { - UnkStruct_ov104_0223E6F0 * v0 = param1; + UnkStruct_ov104_0223E6F0 *v0 = param1; switch (v0->unk_09) { case 0: @@ -748,7 +745,7 @@ static void ov104_0223E7A4 (SysTask * param0, void * param1) } } -static BOOL ov104_0223E804 (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0223DDE4 * param1, UnkStruct_ov104_0223E804 * param2) +static BOOL ov104_0223E804(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_0223DDE4 *param1, UnkStruct_ov104_0223E804 *param2) { int v0 = 0; diff --git a/src/overlay104/ov104_0223E894.c b/src/overlay104/ov104_0223E894.c index 1025df8905..5f40716572 100644 --- a/src/overlay104/ov104_0223E894.c +++ b/src/overlay104/ov104_0223E894.c @@ -1,20 +1,21 @@ +#include "overlay104/ov104_0223E894.h" + #include #include -#include "sys_task_manager.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay104/struct_ov104_0223E9EC.h" #include "overlay104/struct_ov104_0223EA38.h" #include "overlay104/struct_ov104_0223F094.h" #include "overlay104/struct_ov104_0223F1B4.h" -#include "sys_task.h" -#include "screen_scroll_manager.h" #include "buffer_manager.h" #include "heap.h" +#include "screen_scroll_manager.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02018340.h" -#include "overlay104/ov104_0223E894.h" typedef struct { int unk_00; @@ -25,13 +26,13 @@ typedef struct { u32 unk_14; UnkStruct_ov104_0223E9EC unk_18; UnkStruct_ov104_0223E9EC unk_30; - BOOL * unk_48; + BOOL *unk_48; } UnkStruct_ov104_0223E894; typedef struct UnkStruct_ov104_0223EA84_t { UnkStruct_ov104_0223EA38 unk_00; UnkStruct_ov104_0223EA38 unk_14; - Window * unk_28; + Window *unk_28; u8 unk_2C; u8 unk_2D; u8 unk_2E; @@ -39,8 +40,8 @@ typedef struct UnkStruct_ov104_0223EA84_t { } UnkStruct_ov104_0223EA84; typedef struct UnkStruct_ov104_0223EBD0_t { - Window * unk_00; - UnkStruct_ov104_0223EA84 * unk_04[96]; + Window *unk_00; + UnkStruct_ov104_0223EA84 *unk_04[96]; u8 unk_184; u8 unk_185; u8 unk_186; @@ -54,36 +55,36 @@ typedef struct UnkStruct_ov104_0223EBD0_t { u8 unk_18E[1]; } UnkStruct_ov104_0223EBD0; -typedef void (* UnkFuncPtr_ov104_0223F110)(void *); +typedef void (*UnkFuncPtr_ov104_0223F110)(void *); typedef struct { - SysTask * unk_00; - SysTask * unk_04; + SysTask *unk_00; + SysTask *unk_04; BOOL unk_08; BOOL unk_0C; UnkFuncPtr_ov104_0223F110 unk_10; UnkFuncPtr_ov104_0223F110 unk_14; - void * unk_18; + void *unk_18; } UnkStruct_ov104_0223F0D8; typedef struct UnkStruct_ov104_0223F174_t { UnkStruct_ov104_0223F0D8 unk_00; - BufferManager * bufferManager; + BufferManager *bufferManager; UnkStruct_ov104_0223F1B4 unk_20[192]; UnkStruct_ov104_0223F1B4 unk_1820[192]; u32 unk_3020; } UnkStruct_ov104_0223F174; -static void ov104_0223EA14(SysTask * param0, void * param1); -static void ov104_0223E8D8(SysTask * param0, void * param1); -static void ov104_0223EB44(Window * param0, s32 param1, s32 param2, s32 param3, s32 param4, u8 param5); -static SysTask * ov104_0223F05C(UnkStruct_ov104_0223F094 * param0); -static void ov104_0223F070(SysTask * param0, void * param1); +static void ov104_0223EA14(SysTask *param0, void *param1); +static void ov104_0223E8D8(SysTask *param0, void *param1); +static void ov104_0223EB44(Window *param0, s32 param1, s32 param2, s32 param3, s32 param4, u8 param5); +static SysTask *ov104_0223F05C(UnkStruct_ov104_0223F094 *param0); +static void ov104_0223F070(SysTask *param0, void *param1); -void ov104_0223E894 (int param0, u32 param1, u32 param2, BOOL * param3, u32 param4) +void ov104_0223E894(int param0, u32 param1, u32 param2, BOOL *param3, u32 param4) { - SysTask * v0; - UnkStruct_ov104_0223E894 * v1; + SysTask *v0; + UnkStruct_ov104_0223E894 *v1; v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov104_0223E894)); memset(v1, 0, sizeof(UnkStruct_ov104_0223E894)); @@ -102,9 +103,9 @@ void ov104_0223E894 (int param0, u32 param1, u32 param2, BOOL * param3, u32 para v1->unk_04 = param4; } -static void ov104_0223E8D8 (SysTask * param0, void * param1) +static void ov104_0223E8D8(SysTask *param0, void *param1) { - UnkStruct_ov104_0223E894 * v0 = param1; + UnkStruct_ov104_0223E894 *v0 = param1; switch (v0->unk_00) { case 0: @@ -159,7 +160,7 @@ static void ov104_0223E8D8 (SysTask * param0, void * param1) ov104_0223E9F8(&v0->unk_30); } -void ov104_0223E9CC (int param0, int param1) +void ov104_0223E9CC(int param0, int param1) { if (param0 == 1) { GX_SetMasterBrightness(param1); @@ -168,13 +169,13 @@ void ov104_0223E9CC (int param0, int param1) } } -void ov104_0223E9EC (UnkStruct_ov104_0223E9EC * param0, int param1, int param2, int param3, int param4) +void ov104_0223E9EC(UnkStruct_ov104_0223E9EC *param0, int param1, int param2, int param3, int param4) { param0->unk_14 = param3; ov104_0223EA28(¶m0->unk_00, param1, param2, param4); } -BOOL ov104_0223E9F8 (UnkStruct_ov104_0223E9EC * param0) +BOOL ov104_0223E9F8(UnkStruct_ov104_0223E9EC *param0) { BOOL v0; @@ -184,15 +185,15 @@ BOOL ov104_0223E9F8 (UnkStruct_ov104_0223E9EC * param0) return v0; } -static void ov104_0223EA14 (SysTask * param0, void * param1) +static void ov104_0223EA14(SysTask *param0, void *param1) { - UnkStruct_ov104_0223E9EC * v0 = param1; + UnkStruct_ov104_0223E9EC *v0 = param1; ov104_0223E9CC(v0->unk_14, v0->unk_00.unk_00); SysTask_Done(param0); } -void ov104_0223EA28 (UnkStruct_ov104_0223EA38 * param0, int param1, int param2, int param3) +void ov104_0223EA28(UnkStruct_ov104_0223EA38 *param0, int param1, int param2, int param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -201,7 +202,7 @@ void ov104_0223EA28 (UnkStruct_ov104_0223EA38 * param0, int param1, int param2, param0->unk_0C = 0; } -BOOL ov104_0223EA38 (UnkStruct_ov104_0223EA38 * param0) +BOOL ov104_0223EA38(UnkStruct_ov104_0223EA38 *param0) { int v0; @@ -219,9 +220,9 @@ BOOL ov104_0223EA38 (UnkStruct_ov104_0223EA38 * param0) return 1; } -UnkStruct_ov104_0223EA84 * ov104_0223EA64 (u32 param0) +UnkStruct_ov104_0223EA84 *ov104_0223EA64(u32 param0) { - UnkStruct_ov104_0223EA84 * v0; + UnkStruct_ov104_0223EA84 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov104_0223EA84)); memset(v0, 0, sizeof(UnkStruct_ov104_0223EA84)); @@ -229,12 +230,12 @@ UnkStruct_ov104_0223EA84 * ov104_0223EA64 (u32 param0) return v0; } -void ov104_0223EA7C (UnkStruct_ov104_0223EA84 * param0) +void ov104_0223EA7C(UnkStruct_ov104_0223EA84 *param0) { Heap_FreeToHeap(param0); } -void ov104_0223EA84 (UnkStruct_ov104_0223EA84 * param0, int param1, int param2, int param3, int param4, int param5, Window * param6, u32 param7, u32 param8, u8 param9) +void ov104_0223EA84(UnkStruct_ov104_0223EA84 *param0, int param1, int param2, int param3, int param4, int param5, Window *param6, u32 param7, u32 param8, u8 param9) { GF_ASSERT(param0->unk_2E == 0); @@ -248,7 +249,7 @@ void ov104_0223EA84 (UnkStruct_ov104_0223EA84 * param0, int param1, int param2, param0->unk_2E = 1; } -BOOL ov104_0223EADC (UnkStruct_ov104_0223EA84 * param0) +BOOL ov104_0223EADC(UnkStruct_ov104_0223EA84 *param0) { BOOL v0; s16 v1, v2, v3, v4; @@ -275,7 +276,7 @@ BOOL ov104_0223EADC (UnkStruct_ov104_0223EA84 * param0) return v0; } -static void ov104_0223EB44 (Window * param0, s32 param1, s32 param2, s32 param3, s32 param4, u8 param5) +static void ov104_0223EB44(Window *param0, s32 param1, s32 param2, s32 param3, s32 param4, u8 param5) { if ((param4 <= 0) || (param2 <= 0)) { return; @@ -304,9 +305,9 @@ static void ov104_0223EB44 (Window * param0, s32 param1, s32 param2, s32 param3, BGL_WindowColor(param0, param5, param3, param1, param4 - param3, param2 - param1); } -UnkStruct_ov104_0223EBD0 * ov104_0223EBA0 (u32 param0) +UnkStruct_ov104_0223EBD0 *ov104_0223EBA0(u32 param0) { - UnkStruct_ov104_0223EBD0 * v0; + UnkStruct_ov104_0223EBD0 *v0; int v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov104_0223EBD0)); @@ -319,7 +320,7 @@ UnkStruct_ov104_0223EBD0 * ov104_0223EBA0 (u32 param0) return v0; } -void ov104_0223EBD0 (UnkStruct_ov104_0223EBD0 * param0) +void ov104_0223EBD0(UnkStruct_ov104_0223EBD0 *param0) { int v0; @@ -330,7 +331,7 @@ void ov104_0223EBD0 (UnkStruct_ov104_0223EBD0 * param0) Heap_FreeToHeap(param0); } -void ov104_0223EBF0 (UnkStruct_ov104_0223EBD0 * param0, u8 param1, u8 param2, Window * param3, u8 param4) +void ov104_0223EBF0(UnkStruct_ov104_0223EBD0 *param0, u8 param1, u8 param2, Window *param3, u8 param4) { param0->unk_00 = param3; param0->unk_18C = param4; @@ -346,11 +347,11 @@ void ov104_0223EBF0 (UnkStruct_ov104_0223EBD0 * param0, u8 param1, u8 param2, Wi } static const u8 Unk_ov104_02241970[][(256 / 16)] = { - {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7}, - {0x7, 0x6, 0x5, 0x4, 0x3, 0x2, 0x1, 0x0} + { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7 }, + { 0x7, 0x6, 0x5, 0x4, 0x3, 0x2, 0x1, 0x0 } }; -BOOL ov104_0223EC34 (UnkStruct_ov104_0223EBD0 * param0) +BOOL ov104_0223EC34(UnkStruct_ov104_0223EBD0 *param0) { int v0, v1, v2, v3; int v4; @@ -422,11 +423,11 @@ BOOL ov104_0223EC34 (UnkStruct_ov104_0223EBD0 * param0) } static const u8 Unk_ov104_02241964[][(192 / 32)] = { - {0x0, 0x1, 0x2, 0x3, 0x4, 0x5}, - {0x5, 0x4, 0x3, 0x2, 0x1, 0x0} + { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5 }, + { 0x5, 0x4, 0x3, 0x2, 0x1, 0x0 } }; -BOOL ov104_0223EE44 (UnkStruct_ov104_0223EBD0 * param0) +BOOL ov104_0223EE44(UnkStruct_ov104_0223EBD0 *param0) { int v0, v1, v2; int v3; @@ -497,14 +498,14 @@ BOOL ov104_0223EE44 (UnkStruct_ov104_0223EBD0 * param0) return 0; } -static SysTask * ov104_0223F05C (UnkStruct_ov104_0223F094 * param0) +static SysTask *ov104_0223F05C(UnkStruct_ov104_0223F094 *param0) { return SysTask_ExecuteOnVBlank(ov104_0223F070, param0, 1024); } -static void ov104_0223F070 (SysTask * param0, void * param1) +static void ov104_0223F070(SysTask *param0, void *param1) { - UnkStruct_ov104_0223F094 * v0 = param1; + UnkStruct_ov104_0223F094 *v0 = param1; if (v0->unk_08 >= 2) { ScreenScrollManager_SwapBuffers(v0->screenScrollMgr); @@ -515,21 +516,21 @@ static void ov104_0223F070 (SysTask * param0, void * param1) v0->unk_08++; } -void ov104_0223F094 (UnkStruct_ov104_0223F094 * param0, u32 param1) +void ov104_0223F094(UnkStruct_ov104_0223F094 *param0, u32 param1) { param0->screenScrollMgr = ScreenScrollManager_New(param1); param0->unk_08 = 0; param0->unk_04 = ov104_0223F05C(param0); } -void ov104_0223F0B0 (UnkStruct_ov104_0223F094 * param0, u8 param1, u8 param2, u16 param3, fx32 param4, s16 param5, u32 param6, u32 param7, u32 param8) +void ov104_0223F0B0(UnkStruct_ov104_0223F094 *param0, u8 param1, u8 param2, u16 param3, fx32 param4, s16 param5, u32 param6, u32 param7, u32 param8) { ScreenScrollManager_ScrollX(param0->screenScrollMgr, param1, param2, param3, param4, param5, param6, param7, param8); } -static void ov104_0223F0D8 (SysTask * param0, void * param1) +static void ov104_0223F0D8(SysTask *param0, void *param1) { - UnkStruct_ov104_0223F0D8 * v0 = param1; + UnkStruct_ov104_0223F0D8 *v0 = param1; if (v0->unk_08) { v0->unk_0C = 1; @@ -540,9 +541,9 @@ static void ov104_0223F0D8 (SysTask * param0, void * param1) } } -static void ov104_0223F0F4 (SysTask * param0, void * param1) +static void ov104_0223F0F4(SysTask *param0, void *param1) { - UnkStruct_ov104_0223F0D8 * v0 = param1; + UnkStruct_ov104_0223F0D8 *v0 = param1; if (v0->unk_08 && v0->unk_0C) { v0->unk_14(v0->unk_18); @@ -551,7 +552,7 @@ static void ov104_0223F0F4 (SysTask * param0, void * param1) } } -static void ov104_0223F110 (UnkStruct_ov104_0223F0D8 * param0, void * param1, UnkFuncPtr_ov104_0223F110 param2, UnkFuncPtr_ov104_0223F110 param3) +static void ov104_0223F110(UnkStruct_ov104_0223F0D8 *param0, void *param1, UnkFuncPtr_ov104_0223F110 param2, UnkFuncPtr_ov104_0223F110 param3) { GF_ASSERT(param0); @@ -564,7 +565,7 @@ static void ov104_0223F110 (UnkStruct_ov104_0223F0D8 * param0, void * param1, Un param0->unk_00 = SysTask_ExecuteOnVBlank(ov104_0223F0F4, param0, 0); } -static void ov104_0223F150 (UnkStruct_ov104_0223F0D8 * param0) +static void ov104_0223F150(UnkStruct_ov104_0223F0D8 *param0) { GF_ASSERT(param0); @@ -579,9 +580,9 @@ static void ov104_0223F150 (UnkStruct_ov104_0223F0D8 * param0) BufferManager_StopDMA(); } -static void ov104_0223F174 (UnkStruct_ov104_0223F174 * param0) +static void ov104_0223F174(UnkStruct_ov104_0223F174 *param0) { - const void * v0; + const void *v0; v0 = BufferManager_GetReadBuffer(param0->bufferManager); @@ -589,23 +590,23 @@ static void ov104_0223F174 (UnkStruct_ov104_0223F174 * param0) BufferManager_StartDMA(v0, (void *)param0->unk_3020, (sizeof(UnkStruct_ov104_0223F1B4)), 1); } -static void ov104_0223F198 (void * param0) +static void ov104_0223F198(void *param0) { - UnkStruct_ov104_0223F174 * v0 = param0; + UnkStruct_ov104_0223F174 *v0 = param0; BufferManager_SwapBuffers(v0->bufferManager); ov104_0223F174(v0); } -static void ov104_0223F1AC (void * param0) +static void ov104_0223F1AC(void *param0) { - UnkStruct_ov104_0223F174 * v0 = param0; + UnkStruct_ov104_0223F174 *v0 = param0; ov104_0223F174(v0); } -UnkStruct_ov104_0223F174 * ov104_0223F1B4 (u32 param0, UnkStruct_ov104_0223F1B4 * param1, int param2) +UnkStruct_ov104_0223F174 *ov104_0223F1B4(u32 param0, UnkStruct_ov104_0223F1B4 *param1, int param2) { - UnkStruct_ov104_0223F174 * v0; + UnkStruct_ov104_0223F174 *v0; int v1; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov104_0223F174)); @@ -626,7 +627,7 @@ UnkStruct_ov104_0223F174 * ov104_0223F1B4 (u32 param0, UnkStruct_ov104_0223F1B4 return v0; } -void ov104_0223F258 (UnkStruct_ov104_0223F174 * param0) +void ov104_0223F258(UnkStruct_ov104_0223F174 *param0) { GF_ASSERT(param0); @@ -639,7 +640,7 @@ void ov104_0223F258 (UnkStruct_ov104_0223F174 * param0) Heap_FreeToHeap(param0); } -void * ov104_0223F27C (const UnkStruct_ov104_0223F174 * param0) +void *ov104_0223F27C(const UnkStruct_ov104_0223F174 *param0) { GF_ASSERT(param0); diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 04e09c2981..e25a542be7 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -1,86 +1,86 @@ +#include "overlay105/ov105_02241AE0.h" + #include #include -#include "core_sys.h" - +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02007768_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" -#include "overlay105/struct_ov105_02241FF4_decl.h" -#include "overlay105/struct_ov105_02245E1C_decl.h" -#include "overlay105/struct_ov105_02245EA8_decl.h" -#include "overlay105/struct_ov105_02246060_decl.h" - -#include "constdata/const_020F410C.h" - +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02081CF4.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02099F80.h" + #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0223A7F4.h" #include "overlay104/struct_ov104_02234130.h" +#include "overlay105/ov105_02245AAC.h" +#include "overlay105/ov105_02245CD0.h" +#include "overlay105/ov105_02245DC4.h" +#include "overlay105/ov105_02245E54.h" +#include "overlay105/ov105_02245FB8.h" +#include "overlay105/ov105_02246214.h" +#include "overlay105/struct_ov105_02241FF4_decl.h" #include "overlay105/struct_ov105_02245AAC.h" +#include "overlay105/struct_ov105_02245E1C_decl.h" +#include "overlay105/struct_ov105_02245EA8_decl.h" +#include "overlay105/struct_ov105_02246060_decl.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "game_overlay.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_020093B4.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02024220.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "game_options.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "party.h" #include "unk_0207A274.h" -#include "pokemon_summary_app.h" #include "unk_0209BA80.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0223A7F4.h" -#include "overlay105/ov105_02241AE0.h" -#include "overlay105/ov105_02245AAC.h" -#include "overlay105/ov105_02245CD0.h" -#include "overlay105/ov105_02245DC4.h" -#include "overlay105/ov105_02245E54.h" -#include "overlay105/ov105_02245FB8.h" -#include "overlay105/ov105_02246214.h" + +#include "constdata/const_020F410C.h" FS_EXTERN_OVERLAY(overlay104); struct UnkStruct_ov105_02241FF4_t { - OverlayManager * unk_00; - OverlayManager * unk_04; + OverlayManager *unk_00; + OverlayManager *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; @@ -102,36 +102,36 @@ struct UnkStruct_ov105_02241FF4_t { u8 unk_19; u8 unk_1A; u8 unk_1B; - MessageLoader * unk_1C; - StringTemplate * unk_20; - Strbuf* unk_24; - Strbuf* unk_28; - Strbuf* unk_2C[4]; + MessageLoader *unk_1C; + StringTemplate *unk_20; + Strbuf *unk_24; + Strbuf *unk_28; + Strbuf *unk_2C[4]; u16 unk_3C[8]; - BGL * unk_4C; + BGL *unk_4C; Window unk_50[10]; UnkStruct_02081CF4 unk_F0; - UIControlData * unk_FC; + UIControlData *unk_FC; ResourceMetadata unk_100[4]; - PaletteData * unk_120; - GenericPointerData * unk_124; - UnkStruct_02007768 * unk_128; - Sprite * unk_12C[3]; - Options * unk_138; - SaveData * unk_13C; - PokemonSummary * unk_140; + PaletteData *unk_120; + GenericPointerData *unk_124; + UnkStruct_02007768 *unk_128; + Sprite *unk_12C[3]; + Options *unk_138; + SaveData *unk_13C; + PokemonSummary *unk_140; UnkStruct_ov105_02245AAC unk_144; - UnkStruct_ov105_02245EA8 * unk_2F4[6]; - UnkStruct_ov105_02246060 * unk_30C; - UnkStruct_ov105_02246060 * unk_310; - UnkStruct_ov105_02245E1C * unk_314; - UnkStruct_ov105_02245E1C * unk_318; - Party * unk_31C; - Party * unk_320; + UnkStruct_ov105_02245EA8 *unk_2F4[6]; + UnkStruct_ov105_02246060 *unk_30C; + UnkStruct_ov105_02246060 *unk_310; + UnkStruct_ov105_02245E1C *unk_314; + UnkStruct_ov105_02245E1C *unk_318; + Party *unk_31C; + Party *unk_320; u16 unk_324[6]; - u16 * unk_330; + u16 *unk_330; int unk_334; - NARC * unk_338; + NARC *unk_338; u16 unk_33C[60]; u16 unk_3B4; u16 unk_3B6[2]; @@ -141,211 +141,212 @@ struct UnkStruct_ov105_02241FF4_t { u32 unk_3C0; }; -int ov105_02241AE0(OverlayManager * param0, int * param1); -int ov105_02241BD8(OverlayManager * param0, int * param1); -int ov105_02241F54(OverlayManager * param0, int * param1); -static BOOL ov105_02241FF4(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_022421F0(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_02242698(UnkStruct_ov105_02241FF4 * param0); -static void ov105_0224227C(UnkStruct_ov105_02241FF4 * param0); -static void ov105_0224246C(UnkStruct_ov105_02241FF4 * param0); -static void ov105_022424A0(UnkStruct_ov105_02241FF4 * param0); -static void ov105_022424CC(UnkStruct_ov105_02241FF4 * param0); -static void ov105_0224260C(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_022426E0(UnkStruct_ov105_02241FF4 * param0); -static void ov105_0224296C(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02242A58(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02242B54(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_02243144(UnkStruct_ov105_02241FF4 * param0); -static void ov105_022433AC(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_022434BC(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02243738(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_02243818(UnkStruct_ov105_02241FF4 * param0); -static void ov105_0224396C(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_02243A3C(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02243D20(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02243D84(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02243DE4(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_02243E84(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02243FDC(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_0224400C(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_0224435C(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_0224439C(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_022443DC(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_02244424(UnkStruct_ov105_02241FF4 * param0); -static void ov105_022451B4(UnkStruct_ov105_02241FF4 * param0); -static void ov105_022452A0(UnkStruct_ov105_02241FF4 * param0); +int ov105_02241AE0(OverlayManager *param0, int *param1); +int ov105_02241BD8(OverlayManager *param0, int *param1); +int ov105_02241F54(OverlayManager *param0, int *param1); +static BOOL ov105_02241FF4(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_022421F0(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_02242698(UnkStruct_ov105_02241FF4 *param0); +static void ov105_0224227C(UnkStruct_ov105_02241FF4 *param0); +static void ov105_0224246C(UnkStruct_ov105_02241FF4 *param0); +static void ov105_022424A0(UnkStruct_ov105_02241FF4 *param0); +static void ov105_022424CC(UnkStruct_ov105_02241FF4 *param0); +static void ov105_0224260C(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_022426E0(UnkStruct_ov105_02241FF4 *param0); +static void ov105_0224296C(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02242A58(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02242B54(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_02243144(UnkStruct_ov105_02241FF4 *param0); +static void ov105_022433AC(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_022434BC(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02243738(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_02243818(UnkStruct_ov105_02241FF4 *param0); +static void ov105_0224396C(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_02243A3C(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02243D20(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02243D84(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02243DE4(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_02243E84(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02243FDC(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_0224400C(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_0224435C(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_0224439C(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_022443DC(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_02244424(UnkStruct_ov105_02241FF4 *param0); +static void ov105_022451B4(UnkStruct_ov105_02241FF4 *param0); +static void ov105_022452A0(UnkStruct_ov105_02241FF4 *param0); static void ov105_022452E4(void); -static void ov105_0224531C(UnkStruct_ov105_02241FF4 * param0); -static void ov105_022453F8(UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2, int param3, const Party * param4); -static void ov105_0224472C(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02244678(UnkStruct_ov105_02241FF4 * param0); -static void ov105_0224473C(BGL * param0); -static void ov105_0224451C(void * param0); +static void ov105_0224531C(UnkStruct_ov105_02241FF4 *param0); +static void ov105_022453F8(UnkStruct_ov105_02241FF4 *param0, u8 param1, u8 param2, int param3, const Party *param4); +static void ov105_0224472C(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02244678(UnkStruct_ov105_02241FF4 *param0); +static void ov105_0224473C(BGL *param0); +static void ov105_0224451C(void *param0); static void ov105_02244564(void); -static void ov105_02244584(BGL * param0); -static void ov105_02244778(UnkStruct_ov105_02241FF4 * param0, int * param1, int param2); -static BOOL ov105_02244780(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_02244830(UnkStruct_ov105_02241FF4 * param0); -static void ov105_022448BC(UnkStruct_ov105_02241FF4 * param0); -static void ov105_022448F4(UnkStruct_ov105_02241FF4 * param0, u32 param1, u8 param2, u8 param3, u8 param4); -static void ov105_02244924(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static void ov105_022449A4(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static void ov105_02244A60(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static void ov105_02244A18(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static void ov105_02244AA8(UnkStruct_ov105_02241FF4 * param0, u32 param1); +static void ov105_02244584(BGL *param0); +static void ov105_02244778(UnkStruct_ov105_02241FF4 *param0, int *param1, int param2); +static BOOL ov105_02244780(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_02244830(UnkStruct_ov105_02241FF4 *param0); +static void ov105_022448BC(UnkStruct_ov105_02241FF4 *param0); +static void ov105_022448F4(UnkStruct_ov105_02241FF4 *param0, u32 param1, u8 param2, u8 param3, u8 param4); +static void ov105_02244924(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static void ov105_022449A4(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static void ov105_02244A60(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static void ov105_02244A18(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static void ov105_02244AA8(UnkStruct_ov105_02241FF4 *param0, u32 param1); static void ov105_02244AF8(void); -static void ov105_02244B30(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static void ov105_02244B90(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static void ov105_02244BE4(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static void ov105_02244C0C(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static u8 ov105_02244C60(UnkStruct_ov105_02241FF4 * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); -static u8 ov105_02244CC0(UnkStruct_ov105_02241FF4 * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); -static u8 ov105_02244D14(UnkStruct_ov105_02241FF4 * param0, int param1); -static void ov105_02244D48(UnkStruct_ov105_02241FF4 * param0, Window * param1, u8 param2); -static void ov105_02244DC4(UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2, int param3); -static void ov105_02244DF0(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02244E94(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02244EE8(UnkStruct_ov105_02241FF4 * param0, u32 param1, s32 param2); -static void ov105_02244F00(UnkStruct_ov105_02241FF4 * param0, u32 param1, BoxPokemon * param2); -static void ov105_02244F0C(UnkStruct_ov105_02241FF4 * param0, Window * param1, u32 param2, u32 param3, u8 param4); -static void ov105_02244F84(UnkStruct_ov105_02241FF4 * param0, Window * param1, u32 param2, u32 param3, u8 param4); -static void ov105_02244FF8(UnkStruct_ov105_02241FF4 * param0, Window * param1, u8 param2, u32 param3, u32 param4, u8 param5, u8 param6, u8 param7, u8 param8, const Party * param9); -static void ov105_022450DC(UnkStruct_ov105_02241FF4 * param0, Window * param1, u32 param2, u32 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8, u8 param9); -static void ov105_02245464(UnkStruct_ov105_02241FF4 * param0); -static BOOL ov105_022454F8(UnkStruct_ov105_02241FF4 * param0, u8 param1); +static void ov105_02244B30(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static void ov105_02244B90(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static void ov105_02244BE4(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static void ov105_02244C0C(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static u8 ov105_02244C60(UnkStruct_ov105_02241FF4 *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); +static u8 ov105_02244CC0(UnkStruct_ov105_02241FF4 *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); +static u8 ov105_02244D14(UnkStruct_ov105_02241FF4 *param0, int param1); +static void ov105_02244D48(UnkStruct_ov105_02241FF4 *param0, Window *param1, u8 param2); +static void ov105_02244DC4(UnkStruct_ov105_02241FF4 *param0, u8 param1, u8 param2, int param3); +static void ov105_02244DF0(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02244E94(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02244EE8(UnkStruct_ov105_02241FF4 *param0, u32 param1, s32 param2); +static void ov105_02244F00(UnkStruct_ov105_02241FF4 *param0, u32 param1, BoxPokemon *param2); +static void ov105_02244F0C(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 param2, u32 param3, u8 param4); +static void ov105_02244F84(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 param2, u32 param3, u8 param4); +static void ov105_02244FF8(UnkStruct_ov105_02241FF4 *param0, Window *param1, u8 param2, u32 param3, u32 param4, u8 param5, u8 param6, u8 param7, u8 param8, const Party *param9); +static void ov105_022450DC(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 param2, u32 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8, u8 param9); +static void ov105_02245464(UnkStruct_ov105_02241FF4 *param0); +static BOOL ov105_022454F8(UnkStruct_ov105_02241FF4 *param0, u8 param1); static u8 ov105_02245508(u8 param0); -static BOOL ov105_02245518(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02245528(UnkStruct_ov105_02241FF4 * param0, u8 param1); -static u8 ov105_02245538(UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2); -static u32 ov105_02245584(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static void ov105_022455C4(UnkStruct_ov105_02241FF4 * param0, u8 param1, Pokemon * param2, int param3, int param4, int param5); -BOOL ov105_02245620(UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2); -void ov105_02245684(UnkStruct_ov105_02241FF4 * param0, u16 param1); -void ov105_0224569C(int param0, int param1, void * param2, void * param3); -void ov105_022456A8(UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2); -void ov105_02245744(int param0, int param1, void * param2, void * param3); -void ov105_022457B8(int param0, int param1, void * param2, void * param3); -void ov105_02245884(UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2); -void ov105_022458A4(int param0, int param1, void * param2, void * param3); -static void ov105_022457C0(UnkStruct_ov105_02241FF4 * param0); -static UnkStruct_ov105_02245EA8 * ov105_02245934(UnkStruct_ov105_02241FF4 * param0, int param1); -static UnkStruct_ov105_02245E1C * ov105_022459B0(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static UnkStruct_ov105_02245E1C * ov105_02245A04(UnkStruct_ov105_02241FF4 * param0, u32 param1); -static void ov105_02245A30(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02245A64(UnkStruct_ov105_02241FF4 * param0); -static void ov105_02245A98(Window * param0); +static BOOL ov105_02245518(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02245528(UnkStruct_ov105_02241FF4 *param0, u8 param1); +static u8 ov105_02245538(UnkStruct_ov105_02241FF4 *param0, u8 param1, u8 param2); +static u32 ov105_02245584(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static void ov105_022455C4(UnkStruct_ov105_02241FF4 *param0, u8 param1, Pokemon *param2, int param3, int param4, int param5); +BOOL ov105_02245620(UnkStruct_ov105_02241FF4 *param0, u16 param1, u16 param2); +void ov105_02245684(UnkStruct_ov105_02241FF4 *param0, u16 param1); +void ov105_0224569C(int param0, int param1, void *param2, void *param3); +void ov105_022456A8(UnkStruct_ov105_02241FF4 *param0, u16 param1, u16 param2); +void ov105_02245744(int param0, int param1, void *param2, void *param3); +void ov105_022457B8(int param0, int param1, void *param2, void *param3); +void ov105_02245884(UnkStruct_ov105_02241FF4 *param0, u16 param1, u16 param2); +void ov105_022458A4(int param0, int param1, void *param2, void *param3); +static void ov105_022457C0(UnkStruct_ov105_02241FF4 *param0); +static UnkStruct_ov105_02245EA8 *ov105_02245934(UnkStruct_ov105_02241FF4 *param0, int param1); +static UnkStruct_ov105_02245E1C *ov105_022459B0(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static UnkStruct_ov105_02245E1C *ov105_02245A04(UnkStruct_ov105_02241FF4 *param0, u32 param1); +static void ov105_02245A30(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02245A64(UnkStruct_ov105_02241FF4 *param0); +static void ov105_02245A98(Window *param0); static const u16 Unk_ov105_02246364[][2] = { - { 0x18, 0x70 }, - { 0x40, 0x70 }, - { 0x68, 0x70 }, - { 0x90, 0x70 }, - { 0xB8, 0x70 }, - { 0xE0, 0x70 } + { 0x18, 0x70 }, + { 0x40, 0x70 }, + { 0x68, 0x70 }, + { 0x90, 0x70 }, + { 0xB8, 0x70 }, + { 0xE0, 0x70 } }; static const u16 Unk_ov105_02246314[][2] = { - { 0x40, 0x70 }, - { 0x78, 0x70 }, - { 0xB0, 0x70 } + { 0x40, 0x70 }, + { 0x78, 0x70 }, + { 0xB0, 0x70 } }; static const u16 Unk_ov105_022462EC[][2] = { - { 0x60, 0x70 }, - { 0x98, 0x70 } + { 0x60, 0x70 }, + { 0x98, 0x70 } }; static const u16 Unk_ov105_02246320[][2] = { - { 0x28, 0x70 }, - { 0x60, 0x70 }, - { 0x98, 0x70 }, - { 0xD0, 0x70 } + { 0x28, 0x70 }, + { 0x60, 0x70 }, + { 0x98, 0x70 }, + { 0xD0, 0x70 } }; static const UnkStruct_ov105_02246394 Unk_ov105_02246394[] = { - { 0x18, 0x70 }, - { 0x40, 0x70 }, - { 0x68, 0x70 }, - { 0x90, 0x70 }, - { 0xB8, 0x70 }, - { 0xE0, 0x70 } + { 0x18, 0x70 }, + { 0x40, 0x70 }, + { 0x68, 0x70 }, + { 0x90, 0x70 }, + { 0xB8, 0x70 }, + { 0xE0, 0x70 } }; static const UnkStruct_ov105_02246394 Unk_ov105_02246340[] = { - { 0x40, 0x70 }, - { 0x78, 0x70 }, - { 0xB0, 0x70 }, - { 0xD4, 0x90 } + { 0x40, 0x70 }, + { 0x78, 0x70 }, + { 0xB0, 0x70 }, + { 0xD4, 0x90 } }; static const u8 Unk_ov105_022462D0[(NELEMS(Unk_ov105_02246340))] = { - 0x8, - 0x8, - 0x8, - 0x9 + 0x8, + 0x8, + 0x8, + 0x9 }; static const UnkStruct_ov105_02246394 Unk_ov105_022462FC[] = { - { 0x60, 0x70 }, - { 0x98, 0x70 }, - { 0xD4, 0x90 } + { 0x60, 0x70 }, + { 0x98, 0x70 }, + { 0xD4, 0x90 } }; static const u8 Unk_ov105_022462CC[(NELEMS(Unk_ov105_022462FC))] = { - 0x8, - 0x8, - 0x9 + 0x8, + 0x8, + 0x9 }; static const UnkStruct_ov105_02246394 Unk_ov105_02246350[] = { - { 0x40, 0x70 }, - { 0x78, 0x70 }, - { 0xB0, 0x70 }, - { 0xD4, 0x90 }, - { 0xD4, 0xA0 } + { 0x40, 0x70 }, + { 0x78, 0x70 }, + { 0xB0, 0x70 }, + { 0xD4, 0x90 }, + { 0xD4, 0xA0 } }; static const u8 Unk_ov105_022462D4[(NELEMS(Unk_ov105_02246350))] = { - 0x8, - 0x8, - 0x8, - 0x9, - 0x9 + 0x8, + 0x8, + 0x8, + 0x9, + 0x9 }; static const UnkStruct_ov105_02246394 Unk_ov105_0224637C[] = { - { 0x28, 0x70 }, - { 0x60, 0x70 }, - { 0x98, 0x70 }, - { 0xD0, 0x70 }, - { 0xD4, 0x90 }, - { 0xD4, 0xA0 } + { 0x28, 0x70 }, + { 0x60, 0x70 }, + { 0x98, 0x70 }, + { 0xD0, 0x70 }, + { 0xD4, 0x90 }, + { 0xD4, 0xA0 } }; static const u8 Unk_ov105_022462E4[(NELEMS(Unk_ov105_0224637C))] = { - 0x8, - 0x8, - 0x8, - 0x8, - 0x9, - 0x9 + 0x8, + 0x8, + 0x8, + 0x8, + 0x9, + 0x9 }; static const UnkStruct_ov105_02246394 Unk_ov105_02246308[] = { - { 0xD4, 0x90 }, - { 0xD4, 0xA0 }, - { 0xD4, 0xB0 } + { 0xD4, 0x90 }, + { 0xD4, 0xA0 }, + { 0xD4, 0xB0 } }; static const UnkStruct_ov105_02246394 Unk_ov105_022462F4[] = { - { 0xD4, 0x90 }, - { 0xD4, 0xA0 } + { 0xD4, 0x90 }, + { 0xD4, 0xA0 } }; static const UnkStruct_ov105_02246394 bf_v_trade_final_csr_pos[] = { - {212, 144}, {212, 160}, + { 212, 144 }, + { 212, 160 }, }; static const u8 Unk_ov105_022462DC[] = { @@ -357,11 +358,11 @@ static const u8 Unk_ov105_022462DC[] = { 0x8 }; -int ov105_02241AE0 (OverlayManager * param0, int * param1) +int ov105_02241AE0(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov105_02241FF4 * v1; - UnkStruct_ov104_02234130 * v2; + UnkStruct_ov105_02241FF4 *v1; + UnkStruct_ov104_02234130 *v2; Overlay_LoadByID(FS_OVERLAY_ID(overlay104), 2); ov105_022452E4(); @@ -411,9 +412,9 @@ int ov105_02241AE0 (OverlayManager * param0, int * param1) return 1; } -int ov105_02241BD8 (OverlayManager * param0, int * param1) +int ov105_02241BD8(OverlayManager *param0, int *param1) { - UnkStruct_ov105_02241FF4 * v0 = OverlayManager_Data(param0); + UnkStruct_ov105_02241FF4 *v0 = OverlayManager_Data(param0); if (v0->unk_3B4 == 1) { switch (*param1) { @@ -588,10 +589,10 @@ int ov105_02241BD8 (OverlayManager * param0, int * param1) return 0; } -int ov105_02241F54 (OverlayManager * param0, int * param1) +int ov105_02241F54(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov105_02241FF4 * v1 = OverlayManager_Data(param0); + UnkStruct_ov105_02241FF4 *v1 = OverlayManager_Data(param0); if (ov105_022454F8(v1, 0) == 1) { for (v0 = 0; v0 < ov105_02245508(v1->unk_09); v0++) { @@ -618,10 +619,10 @@ int ov105_02241F54 (OverlayManager * param0, int * param1) return 1; } -static BOOL ov105_02241FF4 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02241FF4(UnkStruct_ov105_02241FF4 *param0) { int v0; - const VecFx32 * v1; + const VecFx32 *v1; switch (param0->unk_08) { case 0: @@ -716,7 +717,7 @@ static BOOL ov105_02241FF4 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static BOOL ov105_022421F0 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_022421F0(UnkStruct_ov105_02241FF4 *param0) { int v0; @@ -749,7 +750,7 @@ static BOOL ov105_022421F0 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static void ov105_0224227C (UnkStruct_ov105_02241FF4 * param0) +static void ov105_0224227C(UnkStruct_ov105_02241FF4 *param0) { int v0; u8 v1; @@ -779,7 +780,7 @@ static void ov105_0224227C (UnkStruct_ov105_02241FF4 * param0) param0->unk_310 = ov105_02245FB8(¶m0->unk_144, (NELEMS(Unk_ov105_02246308)), (NELEMS(Unk_ov105_02246308)), 1, 0, Unk_ov105_02246308, NULL); - if ((param0->unk_18 != 0)) { + if (param0->unk_18 != 0) { for (v0 = 0; v0 < v1; v0++) { BGL_FillWindow(¶m0->unk_50[8 + v0], 0); @@ -795,7 +796,7 @@ static void ov105_0224227C (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_0224246C (UnkStruct_ov105_02241FF4 * param0) +static void ov105_0224246C(UnkStruct_ov105_02241FF4 *param0) { int v0; @@ -807,13 +808,13 @@ static void ov105_0224246C (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_022424A0 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_022424A0(UnkStruct_ov105_02241FF4 *param0) { ov105_022455C4(param0, 0, Party_GetPokemonBySlotIndex(param0->unk_31C, param0->unk_334), 120, 43, 0); return; } -static void ov105_022424CC (UnkStruct_ov105_02241FF4 * param0) +static void ov105_022424CC(UnkStruct_ov105_02241FF4 *param0) { int v0; @@ -842,7 +843,7 @@ static void ov105_022424CC (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_0224260C (UnkStruct_ov105_02241FF4 * param0) +static void ov105_0224260C(UnkStruct_ov105_02241FF4 *param0) { int v0; @@ -860,13 +861,13 @@ static void ov105_0224260C (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_0224266C (UnkStruct_ov105_02241FF4 * param0) +static void ov105_0224266C(UnkStruct_ov105_02241FF4 *param0) { ov105_022455C4(param0, 0, Party_GetPokemonBySlotIndex(param0->unk_31C, param0->unk_334), 120, 43, 1); return; } -static BOOL ov105_02242698 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02242698(UnkStruct_ov105_02241FF4 *param0) { switch (param0->unk_08) { case 0: @@ -886,7 +887,7 @@ static BOOL ov105_02242698 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static BOOL ov105_022426E0 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_022426E0(UnkStruct_ov105_02241FF4 *param0) { int v0; u32 v1; @@ -1002,7 +1003,7 @@ static BOOL ov105_022426E0 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static void ov105_0224296C (UnkStruct_ov105_02241FF4 * param0) +static void ov105_0224296C(UnkStruct_ov105_02241FF4 *param0) { BGL_FillWindow(¶m0->unk_50[2 + param0->unk_11], 0); sub_0201A9A4(¶m0->unk_50[2 + param0->unk_11]); @@ -1023,7 +1024,7 @@ static void ov105_0224296C (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_02242A58 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02242A58(UnkStruct_ov105_02241FF4 *param0) { ov105_02245F44(param0->unk_2F4[ov105_022461A0(param0->unk_30C)]); ov105_02245FAC(param0->unk_2F4[ov105_022461A0(param0->unk_30C)], 0); @@ -1050,7 +1051,7 @@ static void ov105_02242A58 (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_02242B54 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02242B54(UnkStruct_ov105_02241FF4 *param0) { u8 v0; int v1; @@ -1096,7 +1097,7 @@ static void ov105_02242B54 (UnkStruct_ov105_02241FF4 * param0) return; } -static BOOL ov105_02242D04 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02242D04(UnkStruct_ov105_02241FF4 *param0) { u8 v0; u32 v1; @@ -1282,7 +1283,7 @@ static BOOL ov105_02242D04 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static BOOL ov105_02243144 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02243144(UnkStruct_ov105_02241FF4 *param0) { u8 v0; int v1; @@ -1392,7 +1393,7 @@ static BOOL ov105_02243144 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static void ov105_022433AC (UnkStruct_ov105_02241FF4 * param0) +static void ov105_022433AC(UnkStruct_ov105_02241FF4 *param0) { int v0; u8 v1; @@ -1415,7 +1416,7 @@ static void ov105_022433AC (UnkStruct_ov105_02241FF4 * param0) return; } -static BOOL ov105_022434BC (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_022434BC(UnkStruct_ov105_02241FF4 *param0) { int v0; u32 v1; @@ -1519,7 +1520,7 @@ static BOOL ov105_022434BC (UnkStruct_ov105_02241FF4 * param0) return 0; } -static void ov105_02243738 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02243738(UnkStruct_ov105_02241FF4 *param0) { ov105_02245F44(param0->unk_2F4[ov105_022461A0(param0->unk_30C)]); ov105_02245FAC(param0->unk_2F4[ov105_022461A0(param0->unk_30C)], 0); @@ -1542,7 +1543,7 @@ static void ov105_02243738 (UnkStruct_ov105_02241FF4 * param0) return; } -static BOOL ov105_02243818 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02243818(UnkStruct_ov105_02241FF4 *param0) { int v0, v1; u32 v2; @@ -1601,7 +1602,7 @@ static BOOL ov105_02243818 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static void ov105_0224396C (UnkStruct_ov105_02241FF4 * param0) +static void ov105_0224396C(UnkStruct_ov105_02241FF4 *param0) { ov105_022461C0(param0->unk_30C, 0); ov105_02244FF8(param0, ¶m0->unk_50[2], ov105_022461A0(param0->unk_30C), 0, 0, 15, 2, 0, 0, param0->unk_31C); @@ -1618,7 +1619,7 @@ static void ov105_0224396C (UnkStruct_ov105_02241FF4 * param0) return; } -static BOOL ov105_02243A3C (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02243A3C(UnkStruct_ov105_02241FF4 *param0) { int v0, v1; u32 v2; @@ -1720,7 +1721,7 @@ static BOOL ov105_02243A3C (UnkStruct_ov105_02241FF4 * param0) return 0; } -static void ov105_02243D20 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02243D20(UnkStruct_ov105_02241FF4 *param0) { ov105_02246060(param0->unk_30C); @@ -1741,7 +1742,7 @@ static void ov105_02243D20 (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_02243D84 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02243D84(UnkStruct_ov105_02241FF4 *param0) { param0->unk_13_3 = 1; param0->unk_324[param0->unk_11] = ov105_022461A0(param0->unk_30C); @@ -1758,7 +1759,7 @@ static void ov105_02243D84 (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_02243DE4 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02243DE4(UnkStruct_ov105_02241FF4 *param0) { ov105_02246060(param0->unk_310); param0->unk_310 = NULL; @@ -1771,7 +1772,7 @@ static void ov105_02243DE4 (UnkStruct_ov105_02241FF4 * param0) sub_0201A9A4(¶m0->unk_50[7]); } -static BOOL ov105_02243E84 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02243E84(UnkStruct_ov105_02241FF4 *param0) { int v0, v1; u32 v2; @@ -1836,7 +1837,7 @@ static BOOL ov105_02243E84 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static void ov105_02243FDC (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02243FDC(UnkStruct_ov105_02241FF4 *param0) { ov105_022455C4(param0, 0, Party_GetPokemonBySlotIndex(param0->unk_320, 0), 120, 43, 0); ov105_02245528(param0, 1); @@ -1844,12 +1845,12 @@ static void ov105_02243FDC (UnkStruct_ov105_02241FF4 * param0) return; } -static BOOL ov105_0224400C (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_0224400C(UnkStruct_ov105_02241FF4 *param0) { u8 v0; int v1, v2, v3, v4; VecFx32 v5; - const VecFx32 * v6; + const VecFx32 *v6; v0 = ov104_0223AA50(param0->unk_09); @@ -2014,7 +2015,7 @@ static BOOL ov105_0224400C (UnkStruct_ov105_02241FF4 * param0) return 0; } -static BOOL ov105_0224435C (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_0224435C(UnkStruct_ov105_02241FF4 *param0) { switch (param0->unk_08) { case 0: @@ -2034,7 +2035,7 @@ static BOOL ov105_0224435C (UnkStruct_ov105_02241FF4 * param0) return 0; } -static BOOL ov105_0224439C (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_0224439C(UnkStruct_ov105_02241FF4 *param0) { int v0; @@ -2059,7 +2060,7 @@ static BOOL ov105_0224439C (UnkStruct_ov105_02241FF4 * param0) return 0; } -static BOOL ov105_022443DC (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_022443DC(UnkStruct_ov105_02241FF4 *param0) { int v0; @@ -2078,11 +2079,11 @@ static BOOL ov105_022443DC (UnkStruct_ov105_02241FF4 * param0) return 0; } -static BOOL ov105_02244424 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02244424(UnkStruct_ov105_02241FF4 *param0) { int v0; - Pokemon * v1; - BoxPokemon * v2; + Pokemon *v1; + BoxPokemon *v2; switch (param0->unk_08) { case 0: @@ -2127,9 +2128,9 @@ static BOOL ov105_02244424 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static void ov105_0224451C (void * param0) +static void ov105_0224451C(void *param0) { - UnkStruct_ov105_02241FF4 * v0 = param0; + UnkStruct_ov105_02241FF4 *v0 = param0; if (v0->unk_04 != NULL) { return; @@ -2148,7 +2149,7 @@ static void ov105_0224451C (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov105_02244564 (void) +static void ov105_02244564(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_C, @@ -2167,7 +2168,7 @@ static void ov105_02244564 (void) return; } -static void ov105_02244584 (BGL * param0) +static void ov105_02244584(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -2271,7 +2272,7 @@ static void ov105_02244584 (BGL * param0) return; } -static void ov105_02244678 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02244678(UnkStruct_ov105_02241FF4 *param0) { ov105_02244564(); ov105_02244584(param0->unk_4C); @@ -2305,13 +2306,13 @@ static void ov105_02244678 (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_0224472C (UnkStruct_ov105_02241FF4 * param0) +static void ov105_0224472C(UnkStruct_ov105_02241FF4 *param0) { ov105_02245AAC(¶m0->unk_144); return; } -static void ov105_0224473C (BGL * param0) +static void ov105_0224473C(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); @@ -2325,17 +2326,17 @@ static void ov105_0224473C (BGL * param0) return; } -static void ov105_02244778 (UnkStruct_ov105_02241FF4 * param0, int * param1, int param2) +static void ov105_02244778(UnkStruct_ov105_02241FF4 *param0, int *param1, int param2) { param0->unk_08 = 0; *param1 = param2; return; } -static BOOL ov105_02244780 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02244780(UnkStruct_ov105_02241FF4 *param0) { int v0, v1, v2, v3; - const VecFx32 * v4; + const VecFx32 *v4; v3 = 0; @@ -2364,10 +2365,10 @@ static BOOL ov105_02244780 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static BOOL ov105_02244830 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02244830(UnkStruct_ov105_02241FF4 *param0) { int v0, v1, v2, v3; - const VecFx32 * v4; + const VecFx32 *v4; v3 = 0; @@ -2394,7 +2395,7 @@ static BOOL ov105_02244830 (UnkStruct_ov105_02241FF4 * param0) return 0; } -static void ov105_022448BC (UnkStruct_ov105_02241FF4 * param0) +static void ov105_022448BC(UnkStruct_ov105_02241FF4 *param0) { if ((param0->unk_14 % 4) == 0) { if ((param0->unk_14 / 4) >= 4) { @@ -2408,7 +2409,7 @@ static void ov105_022448BC (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_022448F4 (UnkStruct_ov105_02241FF4 * param0, u32 param1, u8 param2, u8 param3, u8 param4) +static void ov105_022448F4(UnkStruct_ov105_02241FF4 *param0, u32 param1, u8 param2, u8 param3, u8 param4) { sub_02019E2C(param0->unk_4C, param1, 0, 0, param3, param4, param2); sub_0201C3C0(param0->unk_4C, param1); @@ -2416,7 +2417,7 @@ static void ov105_022448F4 (UnkStruct_ov105_02241FF4 * param0, u32 param1, u8 pa return; } -static void ov105_02244924 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static void ov105_02244924(UnkStruct_ov105_02241FF4 *param0, u32 param1) { u32 v0; @@ -2448,7 +2449,7 @@ static void ov105_02244924 (UnkStruct_ov105_02241FF4 * param0, u32 param1) return; } -static void ov105_022449A4 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static void ov105_022449A4(UnkStruct_ov105_02241FF4 *param0, u32 param1) { sub_020070E8(param0->unk_338, 4, param0->unk_4C, param1, 0, 0, 1, 93); @@ -2461,7 +2462,7 @@ static void ov105_022449A4 (UnkStruct_ov105_02241FF4 * param0, u32 param1) return; } -static void ov105_02244A18 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static void ov105_02244A18(UnkStruct_ov105_02241FF4 *param0, u32 param1) { sub_020070E8(param0->unk_338, 4, param0->unk_4C, param1, 0, 0, 1, 93); sub_0200710C(param0->unk_338, 7, param0->unk_4C, param1, 0, 0, 1, 93); @@ -2469,7 +2470,7 @@ static void ov105_02244A18 (UnkStruct_ov105_02241FF4 * param0, u32 param1) return; } -static void ov105_02244A60 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static void ov105_02244A60(UnkStruct_ov105_02241FF4 *param0, u32 param1) { sub_020070E8(param0->unk_338, 4, param0->unk_4C, param1, 0, 0, 1, 93); sub_0200710C(param0->unk_338, 8, param0->unk_4C, param1, 0, 0, 1, 93); @@ -2477,7 +2478,7 @@ static void ov105_02244A60 (UnkStruct_ov105_02241FF4 * param0, u32 param1) return; } -static void ov105_02244AA8 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static void ov105_02244AA8(UnkStruct_ov105_02241FF4 *param0, u32 param1) { sub_020070E8(param0->unk_338, 4, param0->unk_4C, param1, 0, 0, 1, 93); sub_0200710C(param0->unk_338, 9, param0->unk_4C, param1, 0, 0, 1, 93); @@ -2486,10 +2487,10 @@ static void ov105_02244AA8 (UnkStruct_ov105_02241FF4 * param0, u32 param1) return; } -static void ov105_02244AF8 (void) +static void ov105_02244AF8(void) { - void * v0; - NNSG2dPaletteData * v1; + void *v0; + NNSG2dPaletteData *v1; v0 = sub_02006F88(150, 130, &v1, 93); @@ -2500,7 +2501,7 @@ static void ov105_02244AF8 (void) return; } -static void ov105_02244B30 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static void ov105_02244B30(UnkStruct_ov105_02241FF4 *param0, u32 param1) { sub_020070E8(param0->unk_338, 125, param0->unk_4C, param1, 0, 0, 1, 93); sub_0200710C(param0->unk_338, 126, param0->unk_4C, param1, 0, 0, 1, 93); @@ -2509,7 +2510,7 @@ static void ov105_02244B30 (UnkStruct_ov105_02241FF4 * param0, u32 param1) return; } -static void ov105_02244B90 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static void ov105_02244B90(UnkStruct_ov105_02241FF4 *param0, u32 param1) { if (ov104_0223AED4(param0->unk_09) == 0) { sub_0200710C(param0->unk_338, 5, param0->unk_4C, 3, 0, 0, 1, 93); @@ -2520,13 +2521,13 @@ static void ov105_02244B90 (UnkStruct_ov105_02241FF4 * param0, u32 param1) return; } -static void ov105_02244BE4 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static void ov105_02244BE4(UnkStruct_ov105_02241FF4 *param0, u32 param1) { sub_0200710C(param0->unk_338, 7, param0->unk_4C, 3, 0, 0, 1, 93); return; } -static void ov105_02244C0C (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static void ov105_02244C0C(UnkStruct_ov105_02241FF4 *param0, u32 param1) { if (ov104_0223AED4(param0->unk_09) == 0) { sub_0200710C(param0->unk_338, 10, param0->unk_4C, 3, 0, 0, 1, 93); @@ -2537,7 +2538,7 @@ static void ov105_02244C0C (UnkStruct_ov105_02241FF4 * param0, u32 param1) return; } -static u8 ov105_02244C60 (UnkStruct_ov105_02241FF4 * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) +static u8 ov105_02244C60(UnkStruct_ov105_02241FF4 *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { BGL_FillWindow(param1, param8); MessageLoader_GetStrbuf(param0->unk_1C, param2, param0->unk_28); @@ -2546,7 +2547,7 @@ static u8 ov105_02244C60 (UnkStruct_ov105_02241FF4 * param0, Window * param1, in return sub_0201D78C(param1, param9, param0->unk_24, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); } -static u8 ov105_02244CC0 (UnkStruct_ov105_02241FF4 * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) +static u8 ov105_02244CC0(UnkStruct_ov105_02241FF4 *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { MessageLoader_GetStrbuf(param0->unk_1C, param2, param0->unk_28); StringTemplate_Format(param0->unk_20, param0->unk_24, param0->unk_28); @@ -2554,7 +2555,7 @@ static u8 ov105_02244CC0 (UnkStruct_ov105_02241FF4 * param0, Window * param1, in return sub_0201D78C(param1, param9, param0->unk_24, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); } -static u8 ov105_02244D14 (UnkStruct_ov105_02241FF4 * param0, int param1) +static u8 ov105_02244D14(UnkStruct_ov105_02241FF4 *param0, int param1) { u8 v0; @@ -2564,7 +2565,7 @@ static u8 ov105_02244D14 (UnkStruct_ov105_02241FF4 * param0, int param1) return v0; } -static void ov105_02244D48 (UnkStruct_ov105_02241FF4 * param0, Window * param1, u8 param2) +static void ov105_02244D48(UnkStruct_ov105_02241FF4 *param0, Window *param1, u8 param2) { int v0; @@ -2585,10 +2586,10 @@ static void ov105_02244D48 (UnkStruct_ov105_02241FF4 * param0, Window * param1, return; } -static void ov105_02244DC4 (UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2, int param3) +static void ov105_02244DC4(UnkStruct_ov105_02241FF4 *param0, u8 param1, u8 param2, int param3) { int v0; - void * v1; + void *v1; MessageLoader_GetStrbuf(param0->unk_1C, param3, param0->unk_2C[param1]); @@ -2598,7 +2599,7 @@ static void ov105_02244DC4 (UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 par return; } -static void ov105_02244DF0 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02244DF0(UnkStruct_ov105_02241FF4 *param0) { ov105_02246260(param0->unk_4C, ¶m0->unk_50[7]); ov105_02244D48(param0, ¶m0->unk_50[7], (NELEMS(Unk_ov105_02246308))); @@ -2620,7 +2621,7 @@ static void ov105_02244DF0 (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_02244E94 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02244E94(UnkStruct_ov105_02241FF4 *param0) { ov105_02246260(param0->unk_4C, ¶m0->unk_50[7]); ov105_02244D48(param0, ¶m0->unk_50[7], (NELEMS(Unk_ov105_022462F4))); @@ -2631,23 +2632,23 @@ static void ov105_02244E94 (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_02244EE8 (UnkStruct_ov105_02241FF4 * param0, u32 param1, s32 param2) +static void ov105_02244EE8(UnkStruct_ov105_02241FF4 *param0, u32 param1, s32 param2) { StringTemplate_SetNumber(param0->unk_20, param1, param2, 1, 0, 1); return; } -static void ov105_02244F00 (UnkStruct_ov105_02241FF4 * param0, u32 param1, BoxPokemon * param2) +static void ov105_02244F00(UnkStruct_ov105_02241FF4 *param0, u32 param1, BoxPokemon *param2) { StringTemplate_SetSpeciesName(param0->unk_20, param1, param2); return; } -static void ov105_02244F0C (UnkStruct_ov105_02241FF4 * param0, Window * param1, u32 param2, u32 param3, u8 param4) +static void ov105_02244F0C(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 param2, u32 param3, u8 param4) { u32 v0; - const TrainerInfo * v1; - Strbuf* v2; + const TrainerInfo *v1; + Strbuf *v2; v1 = SaveData_GetTrainerInfo(param0->unk_13C); v2 = Strbuf_Init((7 + 1), 93); @@ -2656,9 +2657,9 @@ static void ov105_02244F0C (UnkStruct_ov105_02241FF4 * param0, Window * param1, Strbuf_CopyChars(v2, TrainerInfo_Name(v1)); if (TrainerInfo_Gender(v1) == 0) { - v0 = ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | (((0 & 0xff) << 0)))); + v0 = ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((0 & 0xff) << 0))); } else { - v0 = ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))); + v0 = ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))); } sub_0201D78C(param1, param4, v2, param2, param3, 0xff, v0, NULL); @@ -2668,11 +2669,11 @@ static void ov105_02244F0C (UnkStruct_ov105_02241FF4 * param0, Window * param1, return; } -static void ov105_02244F84 (UnkStruct_ov105_02241FF4 * param0, Window * param1, u32 param2, u32 param3, u8 param4) +static void ov105_02244F84(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 param2, u32 param3, u8 param4) { u32 v0; - Strbuf* v1; - TrainerInfo * v2; + Strbuf *v1; + TrainerInfo *v2; v2 = CommInfo_TrainerInfo(1 - CommSys_CurNetId()); v1 = Strbuf_Init((7 + 1), 93); @@ -2681,9 +2682,9 @@ static void ov105_02244F84 (UnkStruct_ov105_02241FF4 * param0, Window * param1, TrainerInfo_NameStrbuf(v2, v1); if (TrainerInfo_Gender(v2) == 0) { - v0 = ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | (((0 & 0xff) << 0)))); + v0 = ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((0 & 0xff) << 0))); } else { - v0 = ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))); + v0 = ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))); } sub_0201D78C(param1, param4, v1, param2, param3, 0xff, v0, NULL); @@ -2693,12 +2694,12 @@ static void ov105_02244F84 (UnkStruct_ov105_02241FF4 * param0, Window * param1, return; } -static void ov105_02244FF8 (UnkStruct_ov105_02241FF4 * param0, Window * param1, u8 param2, u32 param3, u32 param4, u8 param5, u8 param6, u8 param7, u8 param8, const Party * param9) +static void ov105_02244FF8(UnkStruct_ov105_02241FF4 *param0, Window *param1, u8 param2, u32 param3, u32 param4, u8 param5, u8 param6, u8 param7, u8 param8, const Party *param9) { u8 v0; u32 v1, v2, v3; - Strbuf* v4; - Pokemon * v5; + Strbuf *v4; + Pokemon *v5; u16 v6[(10 + 1)]; v5 = Party_GetPokemonBySlotIndex(param9, param2); @@ -2712,7 +2713,7 @@ static void ov105_02244FF8 (UnkStruct_ov105_02241FF4 * param0, Window * param1, v0 = sub_0201C294(param1) - 1; v1 = Pokemon_GetValue(v5, MON_DATA_GENDER, NULL); v2 = (v1 == 0) ? 25 : 26; - v3 = (v1 == 0) ? ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | (((0 & 0xff) << 0)))) : ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))); + v3 = (v1 == 0) ? ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((0 & 0xff) << 0))) : ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))); Strbuf_Clear(v4); @@ -2727,13 +2728,13 @@ static void ov105_02244FF8 (UnkStruct_ov105_02241FF4 * param0, Window * param1, return; } -static void ov105_022450DC (UnkStruct_ov105_02241FF4 * param0, Window * param1, u32 param2, u32 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8, u8 param9) +static void ov105_022450DC(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 param2, u32 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8, u8 param9) { u8 v0; u32 v1, v2; - MessageLoader * v3; - Strbuf* v4; - Pokemon * v5; + MessageLoader *v3; + Strbuf *v4; + Pokemon *v5; u16 v6[(10 + 1)]; BGL_FillWindow(param1, param6); @@ -2746,7 +2747,7 @@ static void ov105_022450DC (UnkStruct_ov105_02241FF4 * param0, Window * param1, v0 = sub_0201C294(param1) - 1; v1 = (param9 == 0) ? 25 : 26; - v2 = (param9 == 0) ? ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | (((0 & 0xff) << 0)))) : ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))); + v2 = (param9 == 0) ? ((u32)(((7 & 0xff) << 16) | ((8 & 0xff) << 8) | ((0 & 0xff) << 0))) : ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0))); Strbuf_Clear(v4); @@ -2760,7 +2761,7 @@ static void ov105_022450DC (UnkStruct_ov105_02241FF4 * param0, Window * param1, return; } -static void ov105_022451B4 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_022451B4(UnkStruct_ov105_02241FF4 *param0) { int v0; @@ -2810,7 +2811,7 @@ static void ov105_022451B4 (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_022452A0 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_022452A0(UnkStruct_ov105_02241FF4 *param0) { int v0; @@ -2825,7 +2826,7 @@ static void ov105_022452A0 (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_022452E4 (void) +static void ov105_022452E4(void) { SetMainCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); @@ -2839,7 +2840,7 @@ static void ov105_022452E4 (void) return; } -static void ov105_0224531C (UnkStruct_ov105_02241FF4 * param0) +static void ov105_0224531C(UnkStruct_ov105_02241FF4 *param0) { int v0, v1; @@ -2882,7 +2883,7 @@ static void ov105_0224531C (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_022453F8 (UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2, int param3, const Party * param4) +static void ov105_022453F8(UnkStruct_ov105_02241FF4 *param0, u8 param1, u8 param2, int param3, const Party *param4) { int v0 = param2; @@ -2895,7 +2896,7 @@ static void ov105_022453F8 (UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 par return; } -static void ov105_02245464 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02245464(UnkStruct_ov105_02241FF4 *param0) { param0->unk_140 = Heap_AllocFromHeap(93, sizeof(PokemonSummary)); memset(param0->unk_140, 0, sizeof(PokemonSummary)); @@ -2916,7 +2917,7 @@ static void ov105_02245464 (UnkStruct_ov105_02241FF4 * param0) return; } -static BOOL ov105_022454F8 (UnkStruct_ov105_02241FF4 * param0, u8 param1) +static BOOL ov105_022454F8(UnkStruct_ov105_02241FF4 *param0, u8 param1) { if (param0->unk_0B == param1) { return 1; @@ -2925,7 +2926,7 @@ static BOOL ov105_022454F8 (UnkStruct_ov105_02241FF4 * param0, u8 param1) return 0; } -static u8 ov105_02245508 (u8 param0) +static u8 ov105_02245508(u8 param0) { switch (param0) { case 0: @@ -2936,7 +2937,7 @@ static u8 ov105_02245508 (u8 param0) return 2; } -static BOOL ov105_02245518 (UnkStruct_ov105_02241FF4 * param0) +static BOOL ov105_02245518(UnkStruct_ov105_02241FF4 *param0) { if (param0->unk_13_0 == 0) { return 0; @@ -2945,13 +2946,13 @@ static BOOL ov105_02245518 (UnkStruct_ov105_02241FF4 * param0) return 1; } -static void ov105_02245528 (UnkStruct_ov105_02241FF4 * param0, u8 param1) +static void ov105_02245528(UnkStruct_ov105_02241FF4 *param0, u8 param1) { param0->unk_13_0 = param1; return; } -static u8 ov105_02245538 (UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2) +static u8 ov105_02245538(UnkStruct_ov105_02241FF4 *param0, u8 param1, u8 param2) { u8 v0; @@ -2990,7 +2991,7 @@ static u8 ov105_02245538 (UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param return v0; } -static u32 ov105_02245584 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static u32 ov105_02245584(UnkStruct_ov105_02241FF4 *param0, u32 param1) { switch (param1) { case 0: @@ -3012,7 +3013,7 @@ static u32 ov105_02245584 (UnkStruct_ov105_02241FF4 * param0, u32 param1) return param1; } -static void ov105_022455C4 (UnkStruct_ov105_02241FF4 * param0, u8 param1, Pokemon * param2, int param3, int param4, int param5) +static void ov105_022455C4(UnkStruct_ov105_02241FF4 *param0, u8 param1, Pokemon *param2, int param3, int param4, int param5) { u32 v0, v1; @@ -3030,7 +3031,7 @@ static void ov105_022455C4 (UnkStruct_ov105_02241FF4 * param0, u8 param1, Pokemo return; } -BOOL ov105_02245620 (UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2) +BOOL ov105_02245620(UnkStruct_ov105_02241FF4 *param0, u16 param1, u16 param2) { int v0, v1; @@ -3062,9 +3063,9 @@ BOOL ov105_02245620 (UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2) return v0; } -void ov105_02245684 (UnkStruct_ov105_02241FF4 * param0, u16 param1) +void ov105_02245684(UnkStruct_ov105_02241FF4 *param0, u16 param1) { - TrainerInfo * v0; + TrainerInfo *v0; v0 = SaveData_GetTrainerInfo(param0->unk_13C); param0->unk_33C[0] = param1; @@ -3072,11 +3073,11 @@ void ov105_02245684 (UnkStruct_ov105_02241FF4 * param0, u16 param1) return; } -void ov105_0224569C (int param0, int param1, void * param2, void * param3) +void ov105_0224569C(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov105_02241FF4 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov105_02241FF4 *v2 = param3; + const u16 *v3 = param2; v1 = 0; @@ -3087,10 +3088,10 @@ void ov105_0224569C (int param0, int param1, void * param2, void * param3) return; } -void ov105_022456A8 (UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2) +void ov105_022456A8(UnkStruct_ov105_02241FF4 *param0, u16 param1, u16 param2) { int v0, v1; - Pokemon * v2; + Pokemon *v2; v1 = 0; @@ -3118,12 +3119,12 @@ void ov105_022456A8 (UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2) return; } -void ov105_02245744 (int param0, int param1, void * param2, void * param3) +void ov105_02245744(int param0, int param1, void *param2, void *param3) { int v0, v1; u8 v2; - UnkStruct_ov105_02241FF4 * v3 = param3; - const u16 * v4 = param2; + UnkStruct_ov105_02241FF4 *v3 = param3; + const u16 *v4 = param2; v1 = 0; v2 = ov104_0223AA50(v3->unk_09); @@ -3151,13 +3152,13 @@ void ov105_02245744 (int param0, int param1, void * param2, void * param3) return; } -void ov105_022457B8 (int param0, int param1, void * param2, void * param3) +void ov105_022457B8(int param0, int param1, void *param2, void *param3) { GF_ASSERT(0); return; } -static void ov105_022457C0 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_022457C0(UnkStruct_ov105_02241FF4 *param0) { int v0; u8 v1; @@ -3189,7 +3190,7 @@ static void ov105_022457C0 (UnkStruct_ov105_02241FF4 * param0) return; } -void ov105_02245884 (UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2) +void ov105_02245884(UnkStruct_ov105_02241FF4 *param0, u16 param1, u16 param2) { param0->unk_33C[0] = param1; param0->unk_33C[1] = param2; @@ -3199,11 +3200,11 @@ void ov105_02245884 (UnkStruct_ov105_02241FF4 * param0, u16 param1, u16 param2) return; } -void ov105_022458A4 (int param0, int param1, void * param2, void * param3) +void ov105_022458A4(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov105_02241FF4 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov105_02241FF4 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_3BE++; @@ -3235,7 +3236,7 @@ void ov105_022458A4 (int param0, int param1, void * param2, void * param3) return; } -static UnkStruct_ov105_02245EA8 * ov105_02245934 (UnkStruct_ov105_02241FF4 * param0, int param1) +static UnkStruct_ov105_02245EA8 *ov105_02245934(UnkStruct_ov105_02241FF4 *param0, int param1) { int v0, v1; @@ -3260,7 +3261,7 @@ static UnkStruct_ov105_02245EA8 * ov105_02245934 (UnkStruct_ov105_02241FF4 * par return ov105_02245E54(¶m0->unk_144, v0, v1, 93); } -static UnkStruct_ov105_02245E1C * ov105_022459B0 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static UnkStruct_ov105_02245E1C *ov105_022459B0(UnkStruct_ov105_02241FF4 *param0, u32 param1) { int v0, v1; @@ -3288,7 +3289,7 @@ static UnkStruct_ov105_02245E1C * ov105_022459B0 (UnkStruct_ov105_02241FF4 * par return ov105_02245DC4(¶m0->unk_144, param1, v0, v1, 93); } -static UnkStruct_ov105_02245E1C * ov105_02245A04 (UnkStruct_ov105_02241FF4 * param0, u32 param1) +static UnkStruct_ov105_02245E1C *ov105_02245A04(UnkStruct_ov105_02241FF4 *param0, u32 param1) { int v0, v1; @@ -3308,7 +3309,7 @@ static UnkStruct_ov105_02245E1C * ov105_02245A04 (UnkStruct_ov105_02241FF4 * par return ov105_02245DC4(¶m0->unk_144, param1, v0, v1, 93); } -static void ov105_02245A30 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02245A30(UnkStruct_ov105_02241FF4 *param0) { if (param0->unk_314 != NULL) { ov105_02245E1C(param0->unk_314); @@ -3323,7 +3324,7 @@ static void ov105_02245A30 (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_02245A64 (UnkStruct_ov105_02241FF4 * param0) +static void ov105_02245A64(UnkStruct_ov105_02241FF4 *param0) { BGL_SetPriority(1, 1); sub_02019690(1, 32, 0, 93); @@ -3334,7 +3335,7 @@ static void ov105_02245A64 (UnkStruct_ov105_02241FF4 * param0) return; } -static void ov105_02245A98 (Window * param0) +static void ov105_02245A98(Window *param0) { Window_Clear(param0, 1); sub_0201AD10(param0); diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c index 0bffd0ba0b..4c15df25ec 100644 --- a/src/overlay105/ov105_02245AAC.c +++ b/src/overlay105/ov105_02245AAC.c @@ -1,3 +1,5 @@ +#include "overlay105/ov105_02245AAC.h" + #include #include @@ -8,19 +10,18 @@ #include "overlay105/struct_ov105_02245AAC.h" #include "overlay115/struct_ov115_02261520.h" +#include "gx_layers.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "overlay105/ov105_02245AAC.h" -void ov105_02245AAC(UnkStruct_ov105_02245AAC * param0); -GraphicElementData * ov105_02245BA4(UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5); -void ov105_02245C50(UnkStruct_ov105_02245AAC * param0); +void ov105_02245AAC(UnkStruct_ov105_02245AAC *param0); +GraphicElementData *ov105_02245BA4(UnkStruct_ov105_02245AAC *param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5); +void ov105_02245C50(UnkStruct_ov105_02245AAC *param0); static void ov105_02245C98(void); static const u8 Unk_ov105_02246444[4] = { @@ -30,7 +31,7 @@ static const u8 Unk_ov105_02246444[4] = { 0x1 }; -void ov105_02245AAC (UnkStruct_ov105_02245AAC * param0) +void ov105_02245AAC(UnkStruct_ov105_02245AAC *param0) { int v0; @@ -60,11 +61,11 @@ void ov105_02245AAC (UnkStruct_ov105_02245AAC * param0) return; } -GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5) +GraphicElementData *ov105_02245BA4(UnkStruct_ov105_02245AAC *param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5) { int v0; UnkStruct_ov19_021DA864 v1; - GraphicElementData * v2; + GraphicElementData *v2; sub_020093B4(&v1, param1, param1, param1, param1, 0xffffffff, 0xffffffff, 0, param4, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL); @@ -103,7 +104,7 @@ GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 para return v2; } -void ov105_02245C50 (UnkStruct_ov105_02245AAC * param0) +void ov105_02245C50(UnkStruct_ov105_02245AAC *param0) { u8 v0; @@ -124,7 +125,7 @@ void ov105_02245C50 (UnkStruct_ov105_02245AAC * param0) return; } -static void ov105_02245C98 (void) +static void ov105_02245C98(void) { { UnkStruct_ov22_022559F8 v0 = { diff --git a/src/overlay105/ov105_02245CD0.c b/src/overlay105/ov105_02245CD0.c index 4faa797f78..8ec9b434e8 100644 --- a/src/overlay105/ov105_02245CD0.c +++ b/src/overlay105/ov105_02245CD0.c @@ -1,23 +1,21 @@ #include #include -#include "struct_decls/struct_02007768_decl.h" #include "struct_decls/sprite_decl.h" -#include "pokemon.h" - +#include "struct_decls/struct_02007768_decl.h" #include "struct_defs/archived_sprite.h" -#include "unk_0200762C.h" #include "gx_layers.h" -#include "unk_0202419C.h" #include "pokemon.h" +#include "unk_0200762C.h" +#include "unk_0202419C.h" void ov105_02245CD0(void); -void ov105_02245D50(UnkStruct_02007768 * param0); -Sprite * ov105_02245D88(UnkStruct_02007768 * param0, int param1, Pokemon * param2, int param3, int param4, int param5); -void ov105_02245DB8(Sprite * param0, int param1); +void ov105_02245D50(UnkStruct_02007768 *param0); +Sprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5); +void ov105_02245DB8(Sprite *param0, int param1); -void ov105_02245CD0 (void) +void ov105_02245CD0(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); G2_SetBG0Priority(0); @@ -34,7 +32,7 @@ void ov105_02245CD0 (void) return; } -void ov105_02245D50 (UnkStruct_02007768 * param0) +void ov105_02245D50(UnkStruct_02007768 *param0) { sub_020241B4(); @@ -52,10 +50,10 @@ void ov105_02245D50 (UnkStruct_02007768 * param0) return; } -Sprite * ov105_02245D88 (UnkStruct_02007768 * param0, int param1, Pokemon * param2, int param3, int param4, int param5) +Sprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5) { ArchivedSprite v0; - Sprite * v1; + Sprite *v1; int v2; u32 v3; @@ -67,7 +65,7 @@ Sprite * ov105_02245D88 (UnkStruct_02007768 * param0, int param1, Pokemon * para return v1; } -void ov105_02245DB8 (Sprite * param0, int param1) +void ov105_02245DB8(Sprite *param0, int param1) { sub_02007DEC(param0, 35, param1); return; diff --git a/src/overlay105/ov105_02245DC4.c b/src/overlay105/ov105_02245DC4.c index 09bcfaaa0b..fa968a3c24 100644 --- a/src/overlay105/ov105_02245DC4.c +++ b/src/overlay105/ov105_02245DC4.c @@ -1,30 +1,31 @@ +#include "overlay105/ov105_02245DC4.h" + #include #include #include "struct_decls/struct_02022550_decl.h" -#include "overlay105/struct_ov105_02245E1C_decl.h" +#include "overlay105/ov105_02245AAC.h" #include "overlay105/struct_ov105_02245AAC.h" +#include "overlay105/struct_ov105_02245E1C_decl.h" #include "heap.h" #include "unk_020218BC.h" -#include "overlay105/ov105_02245AAC.h" -#include "overlay105/ov105_02245DC4.h" struct UnkStruct_ov105_02245E1C_t { int unk_00; int unk_04; - GraphicElementData * unk_08; + GraphicElementData *unk_08; }; -UnkStruct_ov105_02245E1C * ov105_02245DC4(UnkStruct_ov105_02245AAC * param0, u32 param1, int param2, int param3, u32 param4); -void * ov105_02245E1C(UnkStruct_ov105_02245E1C * param0); -void ov105_02245E30(UnkStruct_ov105_02245E1C * param0, int param1, int param2); -BOOL ov105_02245E48(UnkStruct_ov105_02245E1C * param0); +UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 param4); +void *ov105_02245E1C(UnkStruct_ov105_02245E1C *param0); +void ov105_02245E30(UnkStruct_ov105_02245E1C *param0, int param1, int param2); +BOOL ov105_02245E48(UnkStruct_ov105_02245E1C *param0); -UnkStruct_ov105_02245E1C * ov105_02245DC4 (UnkStruct_ov105_02245AAC * param0, u32 param1, int param2, int param3, u32 param4) +UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 param4) { - UnkStruct_ov105_02245E1C * v0; + UnkStruct_ov105_02245E1C *v0; v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_ov105_02245E1C)); memset(v0, 0, sizeof(UnkStruct_ov105_02245E1C)); @@ -38,7 +39,7 @@ UnkStruct_ov105_02245E1C * ov105_02245DC4 (UnkStruct_ov105_02245AAC * param0, u3 return v0; } -void * ov105_02245E1C (UnkStruct_ov105_02245E1C * param0) +void *ov105_02245E1C(UnkStruct_ov105_02245E1C *param0) { sub_02021BD4(param0->unk_08); Heap_FreeToHeap(param0); @@ -46,7 +47,7 @@ void * ov105_02245E1C (UnkStruct_ov105_02245E1C * param0) return NULL; } -void ov105_02245E30 (UnkStruct_ov105_02245E1C * param0, int param1, int param2) +void ov105_02245E30(UnkStruct_ov105_02245E1C *param0, int param1, int param2) { VecFx32 v0; @@ -57,7 +58,7 @@ void ov105_02245E30 (UnkStruct_ov105_02245E1C * param0, int param1, int param2) return; } -BOOL ov105_02245E48 (UnkStruct_ov105_02245E1C * param0) +BOOL ov105_02245E48(UnkStruct_ov105_02245E1C *param0) { return sub_02021FD0(param0->unk_08); } diff --git a/src/overlay105/ov105_02245E54.c b/src/overlay105/ov105_02245E54.c index dcd47b1660..19078c1b9f 100644 --- a/src/overlay105/ov105_02245E54.c +++ b/src/overlay105/ov105_02245E54.c @@ -1,43 +1,44 @@ +#include "overlay105/ov105_02245E54.h" + #include #include #include "struct_decls/struct_02022550_decl.h" -#include "overlay105/struct_ov105_02245EA8_decl.h" +#include "overlay105/ov105_02245AAC.h" #include "overlay105/struct_ov105_02245AAC.h" +#include "overlay105/struct_ov105_02245EA8_decl.h" #include "heap.h" #include "unk_020218BC.h" -#include "overlay105/ov105_02245AAC.h" -#include "overlay105/ov105_02245E54.h" struct UnkStruct_ov105_02245EA8_t { u16 unk_00; u16 unk_02; int unk_04; int unk_08; - GraphicElementData * unk_0C; + GraphicElementData *unk_0C; }; -UnkStruct_ov105_02245EA8 * ov105_02245E54(UnkStruct_ov105_02245AAC * param0, int param1, int param2, u32 param3); -void * ov105_02245EA8(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245EBC(UnkStruct_ov105_02245EA8 * param0, int param1); -VecFx32 ov105_02245EC8(UnkStruct_ov105_02245EA8 * param0, int param1, int param2); -void ov105_02245F14(UnkStruct_ov105_02245EA8 * param0, int param1, int param2); -const VecFx32 * ov105_02245F2C(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245F38(UnkStruct_ov105_02245EA8 * param0, u8 param1); -u8 ov105_02245F3C(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245F44(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245F50(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245F5C(UnkStruct_ov105_02245EA8 * param0); -int ov105_02245F88(UnkStruct_ov105_02245EA8 * param0); -int ov105_02245F8C(UnkStruct_ov105_02245EA8 * param0); -void ov105_02245F90(UnkStruct_ov105_02245EA8 * param0, u32 param1); -void ov105_02245FAC(UnkStruct_ov105_02245EA8 * param0, u32 param1); - -UnkStruct_ov105_02245EA8 * ov105_02245E54 (UnkStruct_ov105_02245AAC * param0, int param1, int param2, u32 param3) +UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int param1, int param2, u32 param3); +void *ov105_02245EA8(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245EBC(UnkStruct_ov105_02245EA8 *param0, int param1); +VecFx32 ov105_02245EC8(UnkStruct_ov105_02245EA8 *param0, int param1, int param2); +void ov105_02245F14(UnkStruct_ov105_02245EA8 *param0, int param1, int param2); +const VecFx32 *ov105_02245F2C(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245F38(UnkStruct_ov105_02245EA8 *param0, u8 param1); +u8 ov105_02245F3C(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245F44(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245F50(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245F5C(UnkStruct_ov105_02245EA8 *param0); +int ov105_02245F88(UnkStruct_ov105_02245EA8 *param0); +int ov105_02245F8C(UnkStruct_ov105_02245EA8 *param0); +void ov105_02245F90(UnkStruct_ov105_02245EA8 *param0, u32 param1); +void ov105_02245FAC(UnkStruct_ov105_02245EA8 *param0, u32 param1); + +UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int param1, int param2, u32 param3) { - UnkStruct_ov105_02245EA8 * v0; + UnkStruct_ov105_02245EA8 *v0; v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov105_02245EA8)); memset(v0, 0, sizeof(UnkStruct_ov105_02245EA8)); @@ -53,7 +54,7 @@ UnkStruct_ov105_02245EA8 * ov105_02245E54 (UnkStruct_ov105_02245AAC * param0, in return v0; } -void * ov105_02245EA8 (UnkStruct_ov105_02245EA8 * param0) +void *ov105_02245EA8(UnkStruct_ov105_02245EA8 *param0) { sub_02021BD4(param0->unk_0C); Heap_FreeToHeap(param0); @@ -61,13 +62,13 @@ void * ov105_02245EA8 (UnkStruct_ov105_02245EA8 * param0) return NULL; } -void ov105_02245EBC (UnkStruct_ov105_02245EA8 * param0, int param1) +void ov105_02245EBC(UnkStruct_ov105_02245EA8 *param0, int param1) { sub_02021CAC(param0->unk_0C, param1); return; } -VecFx32 ov105_02245EC8 (UnkStruct_ov105_02245EA8 * param0, int param1, int param2) +VecFx32 ov105_02245EC8(UnkStruct_ov105_02245EA8 *param0, int param1, int param2) { VecFx32 v0; @@ -79,7 +80,7 @@ VecFx32 ov105_02245EC8 (UnkStruct_ov105_02245EA8 * param0, int param1, int param return *(sub_02021D28(param0->unk_0C)); } -void ov105_02245F14 (UnkStruct_ov105_02245EA8 * param0, int param1, int param2) +void ov105_02245F14(UnkStruct_ov105_02245EA8 *param0, int param1, int param2) { VecFx32 v0; @@ -90,38 +91,38 @@ void ov105_02245F14 (UnkStruct_ov105_02245EA8 * param0, int param1, int param2) return; } -const VecFx32 * ov105_02245F2C (UnkStruct_ov105_02245EA8 * param0) +const VecFx32 *ov105_02245F2C(UnkStruct_ov105_02245EA8 *param0) { return sub_02021D28(param0->unk_0C); } -void ov105_02245F38 (UnkStruct_ov105_02245EA8 * param0, u8 param1) +void ov105_02245F38(UnkStruct_ov105_02245EA8 *param0, u8 param1) { param0->unk_00 = param1; return; } -u8 ov105_02245F3C (UnkStruct_ov105_02245EA8 * param0) +u8 ov105_02245F3C(UnkStruct_ov105_02245EA8 *param0) { return param0->unk_00; } -void ov105_02245F44 (UnkStruct_ov105_02245EA8 * param0) +void ov105_02245F44(UnkStruct_ov105_02245EA8 *param0) { ov105_02245F38(param0, 1); return; } -void ov105_02245F50 (UnkStruct_ov105_02245EA8 * param0) +void ov105_02245F50(UnkStruct_ov105_02245EA8 *param0) { ov105_02245F38(param0, 0); return; } -void ov105_02245F5C (UnkStruct_ov105_02245EA8 * param0) +void ov105_02245F5C(UnkStruct_ov105_02245EA8 *param0) { VecFx32 v0; - const VecFx32 * v1; + const VecFx32 *v1; v1 = ov105_02245F2C(param0); @@ -132,17 +133,17 @@ void ov105_02245F5C (UnkStruct_ov105_02245EA8 * param0) return; } -int ov105_02245F88 (UnkStruct_ov105_02245EA8 * param0) +int ov105_02245F88(UnkStruct_ov105_02245EA8 *param0) { return param0->unk_04; } -int ov105_02245F8C (UnkStruct_ov105_02245EA8 * param0) +int ov105_02245F8C(UnkStruct_ov105_02245EA8 *param0) { return param0->unk_08; } -void ov105_02245F90 (UnkStruct_ov105_02245EA8 * param0, u32 param1) +void ov105_02245F90(UnkStruct_ov105_02245EA8 *param0, u32 param1) { sub_02021CE4(param0->unk_0C, FX32_ONE); SpriteActor_SetSpriteAnimActive(param0->unk_0C, param1); @@ -150,7 +151,7 @@ void ov105_02245F90 (UnkStruct_ov105_02245EA8 * param0, u32 param1) return; } -void ov105_02245FAC (UnkStruct_ov105_02245EA8 * param0, u32 param1) +void ov105_02245FAC(UnkStruct_ov105_02245EA8 *param0, u32 param1) { sub_02021E90(param0->unk_0C, param1); return; diff --git a/src/overlay105/ov105_02245FB8.c b/src/overlay105/ov105_02245FB8.c index 0ea339f997..5423a12cd0 100644 --- a/src/overlay105/ov105_02245FB8.c +++ b/src/overlay105/ov105_02245FB8.c @@ -1,41 +1,41 @@ +#include "overlay105/ov105_02245FB8.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02022550_decl.h" -#include "overlay105/struct_ov105_02246060_decl.h" +#include "overlay105/ov105_02245AAC.h" #include "overlay105/struct_ov105_02245AAC.h" +#include "overlay105/struct_ov105_02246060_decl.h" #include "overlay105/struct_ov105_02246394.h" +#include "core_sys.h" #include "heap.h" #include "unk_020218BC.h" -#include "overlay105/ov105_02245AAC.h" -#include "overlay105/ov105_02245FB8.h" struct UnkStruct_ov105_02246060_t { u8 unk_00; u8 unk_01; u8 unk_02; u8 unk_03; - const UnkStruct_ov105_02246394 * unk_04; - const u8 * unk_08; - GraphicElementData * unk_0C; + const UnkStruct_ov105_02246394 *unk_04; + const u8 *unk_08; + GraphicElementData *unk_0C; u8 unk_10; }; -UnkStruct_ov105_02246060 * ov105_02245FB8(UnkStruct_ov105_02245AAC * param0, u8 param1, u8 param2, u8 param3, u8 param4, const UnkStruct_ov105_02246394 * param5, const u8 * param6); -void * ov105_02246060(UnkStruct_ov105_02246060 * param0); -void ov105_02246074(UnkStruct_ov105_02246060 * param0, int param1); -void ov105_02246080(UnkStruct_ov105_02246060 * param0); -u8 ov105_022461A0(UnkStruct_ov105_02246060 * param0); -void ov105_022461A4(UnkStruct_ov105_02246060 * param0, int param1); -void ov105_022461C0(UnkStruct_ov105_02246060 * param0, u8 param1); +UnkStruct_ov105_02246060 *ov105_02245FB8(UnkStruct_ov105_02245AAC *param0, u8 param1, u8 param2, u8 param3, u8 param4, const UnkStruct_ov105_02246394 *param5, const u8 *param6); +void *ov105_02246060(UnkStruct_ov105_02246060 *param0); +void ov105_02246074(UnkStruct_ov105_02246060 *param0, int param1); +void ov105_02246080(UnkStruct_ov105_02246060 *param0); +u8 ov105_022461A0(UnkStruct_ov105_02246060 *param0); +void ov105_022461A4(UnkStruct_ov105_02246060 *param0, int param1); +void ov105_022461C0(UnkStruct_ov105_02246060 *param0, u8 param1); -UnkStruct_ov105_02246060 * ov105_02245FB8 (UnkStruct_ov105_02245AAC * param0, u8 param1, u8 param2, u8 param3, u8 param4, const UnkStruct_ov105_02246394 * param5, const u8 * param6) +UnkStruct_ov105_02246060 *ov105_02245FB8(UnkStruct_ov105_02245AAC *param0, u8 param1, u8 param2, u8 param3, u8 param4, const UnkStruct_ov105_02246394 *param5, const u8 *param6) { - UnkStruct_ov105_02246060 * v0; + UnkStruct_ov105_02246060 *v0; VecFx32 v1; v0 = Heap_AllocFromHeap(93, sizeof(UnkStruct_ov105_02246060)); @@ -65,7 +65,7 @@ UnkStruct_ov105_02246060 * ov105_02245FB8 (UnkStruct_ov105_02245AAC * param0, u8 return v0; } -void * ov105_02246060 (UnkStruct_ov105_02246060 * param0) +void *ov105_02246060(UnkStruct_ov105_02246060 *param0) { sub_02021BD4(param0->unk_0C); Heap_FreeToHeap(param0); @@ -73,13 +73,13 @@ void * ov105_02246060 (UnkStruct_ov105_02246060 * param0) return NULL; } -void ov105_02246074 (UnkStruct_ov105_02246060 * param0, int param1) +void ov105_02246074(UnkStruct_ov105_02246060 *param0, int param1) { sub_02021CAC(param0->unk_0C, param1); return; } -void ov105_02246080 (UnkStruct_ov105_02246060 * param0) +void ov105_02246080(UnkStruct_ov105_02246060 *param0) { VecFx32 v0; u32 v1, v2; @@ -156,12 +156,12 @@ void ov105_02246080 (UnkStruct_ov105_02246060 * param0) return; } -u8 ov105_022461A0 (UnkStruct_ov105_02246060 * param0) +u8 ov105_022461A0(UnkStruct_ov105_02246060 *param0) { return param0->unk_02; } -void ov105_022461A4 (UnkStruct_ov105_02246060 * param0, int param1) +void ov105_022461A4(UnkStruct_ov105_02246060 *param0, int param1) { param0->unk_03 = param1; @@ -174,7 +174,7 @@ void ov105_022461A4 (UnkStruct_ov105_02246060 * param0, int param1) return; } -void ov105_022461C0 (UnkStruct_ov105_02246060 * param0, u8 param1) +void ov105_022461C0(UnkStruct_ov105_02246060 *param0, u8 param1) { VecFx32 v0; diff --git a/src/overlay105/ov105_02246214.c b/src/overlay105/ov105_02246214.c index 44d712465c..d4242d94fe 100644 --- a/src/overlay105/ov105_02246214.c +++ b/src/overlay105/ov105_02246214.c @@ -1,37 +1,38 @@ +#include "overlay105/ov105_02246214.h" + #include #include #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay061/struct_ov61_0222C884.h" #include "unk_0200DA60.h" #include "unk_02018340.h" -#include "overlay105/ov105_02246214.h" -void ov105_02246214(BGL * param0, Window * param1); -void ov105_02246244(Window * param0); -void ov105_02246260(BGL * param0, Window * param1); -void ov105_0224628C(Window * param0, int param1); +void ov105_02246214(BGL *param0, Window *param1); +void ov105_02246244(Window *param0); +void ov105_02246260(BGL *param0, Window *param1); +void ov105_0224628C(Window *param0, int param1); static const UnkStruct_ov61_0222C884 Unk_ov105_02246458[] = { - {0x1, 0x1, 0x1, 0xA, 0x2, 0xD, 0x1}, - {0x1, 0x16, 0x1, 0xA, 0x2, 0xD, 0x15}, - {0x1, 0x1, 0x4, 0x9, 0x2, 0xD, 0x29}, - {0x1, 0x1, 0x6, 0x9, 0x2, 0xD, 0x3B}, - {0x1, 0x1, 0x8, 0x9, 0x2, 0xD, 0x4D}, - {0x1, 0x2, 0x13, 0x11, 0x4, 0xC, 0x5F}, - {0x1, 0x17, 0x13, 0x8, 0x4, 0xD, 0xA3}, - {0x1, 0x17, 0x11, 0x8, 0x6, 0xD, 0xC3}, - {0x1, 0x16, 0x4, 0x9, 0x2, 0xD, 0xF3}, - {0x1, 0x16, 0x6, 0x9, 0x2, 0xD, 0x105} + { 0x1, 0x1, 0x1, 0xA, 0x2, 0xD, 0x1 }, + { 0x1, 0x16, 0x1, 0xA, 0x2, 0xD, 0x15 }, + { 0x1, 0x1, 0x4, 0x9, 0x2, 0xD, 0x29 }, + { 0x1, 0x1, 0x6, 0x9, 0x2, 0xD, 0x3B }, + { 0x1, 0x1, 0x8, 0x9, 0x2, 0xD, 0x4D }, + { 0x1, 0x2, 0x13, 0x11, 0x4, 0xC, 0x5F }, + { 0x1, 0x17, 0x13, 0x8, 0x4, 0xD, 0xA3 }, + { 0x1, 0x17, 0x11, 0x8, 0x6, 0xD, 0xC3 }, + { 0x1, 0x16, 0x4, 0x9, 0x2, 0xD, 0xF3 }, + { 0x1, 0x16, 0x6, 0x9, 0x2, 0xD, 0x105 } }; -void ov105_02246214 (BGL * param0, Window * param1) +void ov105_02246214(BGL *param0, Window *param1) { u8 v0; - const UnkStruct_ov61_0222C884 * v1 = Unk_ov105_02246458; + const UnkStruct_ov61_0222C884 *v1 = Unk_ov105_02246458; for (v0 = 0; v0 < 10; v0++) { sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); @@ -41,7 +42,7 @@ void ov105_02246214 (BGL * param0, Window * param1) return; } -void ov105_02246244 (Window * param0) +void ov105_02246244(Window *param0) { u16 v0; @@ -52,7 +53,7 @@ void ov105_02246244 (Window * param0) return; } -void ov105_02246260 (BGL * param0, Window * param1) +void ov105_02246260(BGL *param0, Window *param1) { sub_0200DAA4(param0, 1, (1024 - 9), 11, 0, 93); Window_Show(param1, 1, (1024 - 9), 11); @@ -60,11 +61,11 @@ void ov105_02246260 (BGL * param0, Window * param1) return; } -void ov105_0224628C (Window * param0, int param1) +void ov105_0224628C(Window *param0, int param1) { - sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - ((18 + 12))), 10, param1, 93); + sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 93); BGL_FillWindow(param0, 15); - sub_0200E060(param0, 1, ((1024 - 9) - ((18 + 12))), 10); + sub_0200E060(param0, 1, ((1024 - 9) - (18 + 12)), 10); return; } diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index bc0ddef840..2afb18d178 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -1,8 +1,8 @@ +#include "overlay106/ov106_02241AE0.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" @@ -10,69 +10,69 @@ #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" -#include "overlay106/struct_ov106_02243118_decl.h" -#include "overlay106/struct_ov106_02243650_decl.h" - -#include "constdata/const_020F410C.h" - +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02099F80.h" + #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay104/ov104_0222DCE0.h" +#include "overlay104/ov104_0223AF58.h" #include "overlay104/struct_ov104_02235208.h" +#include "overlay106/ov106_02243310.h" +#include "overlay106/ov106_022435FC.h" +#include "overlay106/ov106_022436E0.h" +#include "overlay106/struct_ov106_02243118_decl.h" #include "overlay106/struct_ov106_02243310.h" +#include "overlay106/struct_ov106_02243650_decl.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "game_overlay.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_02030108.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "party.h" #include "unk_0207A274.h" -#include "pokemon_summary_app.h" #include "unk_0209BA80.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay104/ov104_0223AF58.h" -#include "overlay106/ov106_02241AE0.h" -#include "overlay106/ov106_02243310.h" -#include "overlay106/ov106_022435FC.h" -#include "overlay106/ov106_022436E0.h" + +#include "constdata/const_020F410C.h" FS_EXTERN_OVERLAY(overlay104); struct UnkStruct_ov106_02243118_t { - OverlayManager * unk_00; - OverlayManager * unk_04; + OverlayManager *unk_00; + OverlayManager *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; @@ -93,31 +93,31 @@ struct UnkStruct_ov106_02243118_t { u16 unk_1C; u8 unk_1E; u8 unk_1F; - MessageLoader * unk_20; - StringTemplate * unk_24; - Strbuf* unk_28; - Strbuf* unk_2C; - Strbuf* unk_30[2]; + MessageLoader *unk_20; + StringTemplate *unk_24; + Strbuf *unk_28; + Strbuf *unk_2C; + Strbuf *unk_30[2]; u16 unk_38[8]; - BGL * unk_48; + BGL *unk_48; Window unk_4C[4]; UnkStruct_02081CF4 unk_8C; - UIControlData * unk_98; + UIControlData *unk_98; ResourceMetadata unk_9C[2]; - PaletteData * unk_AC; - UnkStruct_0200C440 * unk_B0; - Options * unk_B4; - SaveData * unk_B8; - PokemonSummary * unk_BC; + PaletteData *unk_AC; + UnkStruct_0200C440 *unk_B0; + Options *unk_B4; + SaveData *unk_B8; + PokemonSummary *unk_BC; UnkStruct_ov106_02243310 unk_C0; - UnkStruct_ov106_02243650 * unk_280; - UnkStruct_ov106_02243650 * unk_284; + UnkStruct_ov106_02243650 *unk_280; + UnkStruct_ov106_02243650 *unk_284; int unk_288; - u16 * unk_28C; - Party * unk_290; - u8 * unk_294; - u16 * unk_298; - NARC * unk_29C; + u16 *unk_28C; + Party *unk_290; + u8 *unk_294; + u16 *unk_298; + NARC *unk_29C; u16 unk_2A0[44]; u8 unk_2F8; u8 unk_2F9; @@ -125,61 +125,61 @@ struct UnkStruct_ov106_02243118_t { u32 unk_2FC; }; -int ov106_02241AE0(OverlayManager * param0, int * param1); -int ov106_02241B9C(OverlayManager * param0, int * param1); -int ov106_02241CF0(OverlayManager * param0, int * param1); -static BOOL ov106_02241D28(UnkStruct_ov106_02243118 * param0); -static BOOL ov106_02241E14(UnkStruct_ov106_02243118 * param0); -static void ov106_02241DD4(UnkStruct_ov106_02243118 * param0); -static BOOL ov106_02241E5C(UnkStruct_ov106_02243118 * param0); -static BOOL ov106_02242108(UnkStruct_ov106_02243118 * param0); -static BOOL ov106_0224230C(UnkStruct_ov106_02243118 * param0); -static BOOL ov106_02242344(UnkStruct_ov106_02243118 * param0); -static BOOL ov106_022423AC(UnkStruct_ov106_02243118 * param0); -static void ov106_022423E8(UnkStruct_ov106_02243118 * param0); -static void ov106_0224248C(UnkStruct_ov106_02243118 * param0); +int ov106_02241AE0(OverlayManager *param0, int *param1); +int ov106_02241B9C(OverlayManager *param0, int *param1); +int ov106_02241CF0(OverlayManager *param0, int *param1); +static BOOL ov106_02241D28(UnkStruct_ov106_02243118 *param0); +static BOOL ov106_02241E14(UnkStruct_ov106_02243118 *param0); +static void ov106_02241DD4(UnkStruct_ov106_02243118 *param0); +static BOOL ov106_02241E5C(UnkStruct_ov106_02243118 *param0); +static BOOL ov106_02242108(UnkStruct_ov106_02243118 *param0); +static BOOL ov106_0224230C(UnkStruct_ov106_02243118 *param0); +static BOOL ov106_02242344(UnkStruct_ov106_02243118 *param0); +static BOOL ov106_022423AC(UnkStruct_ov106_02243118 *param0); +static void ov106_022423E8(UnkStruct_ov106_02243118 *param0); +static void ov106_0224248C(UnkStruct_ov106_02243118 *param0); static void ov106_022424C8(void); -static void ov106_02242500(UnkStruct_ov106_02243118 * param0); -static void ov106_02242688(UnkStruct_ov106_02243118 * param0); -static void ov106_0224262C(UnkStruct_ov106_02243118 * param0); -static void ov106_022426A4(BGL * param0); -static void ov106_022426E0(void * param0); +static void ov106_02242500(UnkStruct_ov106_02243118 *param0); +static void ov106_02242688(UnkStruct_ov106_02243118 *param0); +static void ov106_0224262C(UnkStruct_ov106_02243118 *param0); +static void ov106_022426A4(BGL *param0); +static void ov106_022426E0(void *param0); static void ov106_0224271C(void); -static void ov106_0224273C(BGL * param0); -static void ov106_0224283C(UnkStruct_ov106_02243118 * param0, u32 param1); +static void ov106_0224273C(BGL *param0); +static void ov106_0224283C(UnkStruct_ov106_02243118 *param0, u32 param1); static void ov106_02242884(void); -static void ov106_022428B8(UnkStruct_ov106_02243118 * param0, u32 param1); -static u8 ov106_02242918(UnkStruct_ov106_02243118 * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); -static u8 ov106_02242978(UnkStruct_ov106_02243118 * param0, int param1, u8 param2); -static void ov106_022429B0(UnkStruct_ov106_02243118 * param0, Window * param1, u8 param2); -static void ov106_02242A28(UnkStruct_ov106_02243118 * param0, u8 param1, u8 param2, int param3); -static void ov106_02242A54(UnkStruct_ov106_02243118 * param0); -static void ov106_02242AAC(UnkStruct_ov106_02243118 * param0, u32 param1, s32 param2); -static void ov106_02242AC4(UnkStruct_ov106_02243118 * param0, Window * param1, u32 param2, u32 param3, u8 param4, u8 param5, u8 param6, u8 param7); -static void ov106_02242B38(UnkStruct_ov106_02243118 * param0, Window * param1, u8 param2, u8 param3, u8 param4, u8 param5); -static void ov106_02242C04(UnkStruct_ov106_02243118 * param0, Window * param1, u8 param2, u32 param3, u32 param4); -static void ov106_02242C2C(UnkStruct_ov106_02243118 * param0, Window * param1); -static void ov106_02242CA4(UnkStruct_ov106_02243118 * param0); -static void ov106_02242D5C(UnkStruct_ov106_02243118 * param0, int * param1, int param2); -static void ov106_02242D64(UnkStruct_ov106_02243118 * param0, int param1); -static u16 ov106_02242F24(UnkStruct_ov106_02243118 * param0); -static u16 ov106_02242F3C(UnkStruct_ov106_02243118 * param0); -static void ov106_02242FAC(BGL * param0, u8 param1, u8 param2); -static void ov106_02242F4C(UnkStruct_ov106_02243118 * param0, BGL * param1); +static void ov106_022428B8(UnkStruct_ov106_02243118 *param0, u32 param1); +static u8 ov106_02242918(UnkStruct_ov106_02243118 *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); +static u8 ov106_02242978(UnkStruct_ov106_02243118 *param0, int param1, u8 param2); +static void ov106_022429B0(UnkStruct_ov106_02243118 *param0, Window *param1, u8 param2); +static void ov106_02242A28(UnkStruct_ov106_02243118 *param0, u8 param1, u8 param2, int param3); +static void ov106_02242A54(UnkStruct_ov106_02243118 *param0); +static void ov106_02242AAC(UnkStruct_ov106_02243118 *param0, u32 param1, s32 param2); +static void ov106_02242AC4(UnkStruct_ov106_02243118 *param0, Window *param1, u32 param2, u32 param3, u8 param4, u8 param5, u8 param6, u8 param7); +static void ov106_02242B38(UnkStruct_ov106_02243118 *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5); +static void ov106_02242C04(UnkStruct_ov106_02243118 *param0, Window *param1, u8 param2, u32 param3, u32 param4); +static void ov106_02242C2C(UnkStruct_ov106_02243118 *param0, Window *param1); +static void ov106_02242CA4(UnkStruct_ov106_02243118 *param0); +static void ov106_02242D5C(UnkStruct_ov106_02243118 *param0, int *param1, int param2); +static void ov106_02242D64(UnkStruct_ov106_02243118 *param0, int param1); +static u16 ov106_02242F24(UnkStruct_ov106_02243118 *param0); +static u16 ov106_02242F3C(UnkStruct_ov106_02243118 *param0); +static void ov106_02242FAC(BGL *param0, u8 param1, u8 param2); +static void ov106_02242F4C(UnkStruct_ov106_02243118 *param0, BGL *param1); static u8 ov106_02243090(u8 param0); -static BOOL ov106_02243098(UnkStruct_ov106_02243118 * param0); -static BOOL ov106_022430B0(UnkStruct_ov106_02243118 * param0); -BOOL ov106_022430B4(UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2); -void ov106_02243118(UnkStruct_ov106_02243118 * param0, u16 param1); -void ov106_02243130(int param0, int param1, void * param2, void * param3); -void ov106_0224313C(UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2); -void ov106_02243180(int param0, int param1, void * param2, void * param3); -void ov106_022431D4(UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2); -void ov106_022431E0(int param0, int param1, void * param2, void * param3); -static void ov106_02243200(UnkStruct_ov106_02243118 * param0); -static void ov106_02243224(UnkStruct_ov106_02243118 * param0); -static void ov106_022432AC(UnkStruct_ov106_02243118 * param0); -static void ov106_022432D4(UnkStruct_ov106_02243118 * param0); +static BOOL ov106_02243098(UnkStruct_ov106_02243118 *param0); +static BOOL ov106_022430B0(UnkStruct_ov106_02243118 *param0); +BOOL ov106_022430B4(UnkStruct_ov106_02243118 *param0, u16 param1, u16 param2); +void ov106_02243118(UnkStruct_ov106_02243118 *param0, u16 param1); +void ov106_02243130(int param0, int param1, void *param2, void *param3); +void ov106_0224313C(UnkStruct_ov106_02243118 *param0, u16 param1, u16 param2); +void ov106_02243180(int param0, int param1, void *param2, void *param3); +void ov106_022431D4(UnkStruct_ov106_02243118 *param0, u16 param1, u16 param2); +void ov106_022431E0(int param0, int param1, void *param2, void *param3); +static void ov106_02243200(UnkStruct_ov106_02243118 *param0); +static void ov106_02243224(UnkStruct_ov106_02243118 *param0); +static void ov106_022432AC(UnkStruct_ov106_02243118 *param0); +static void ov106_022432D4(UnkStruct_ov106_02243118 *param0); static const u8 Unk_ov106_02243798[] = { 0x0, @@ -193,11 +193,11 @@ static const u8 Unk_ov106_02243798[] = { 0x8 }; -int ov106_02241AE0 (OverlayManager * param0, int * param1) +int ov106_02241AE0(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov106_02243118 * v1; - UnkStruct_ov104_02235208 * v2; + UnkStruct_ov106_02243118 *v1; + UnkStruct_ov104_02235208 *v2; Overlay_LoadByID(FS_OVERLAY_ID(overlay104), 2); ov106_022424C8(); @@ -235,9 +235,9 @@ int ov106_02241AE0 (OverlayManager * param0, int * param1) return 1; } -int ov106_02241B9C (OverlayManager * param0, int * param1) +int ov106_02241B9C(OverlayManager *param0, int *param1) { - UnkStruct_ov106_02243118 * v0 = OverlayManager_Data(param0); + UnkStruct_ov106_02243118 *v0 = OverlayManager_Data(param0); if (v0->unk_18 != 0xff) { switch (*param1) { @@ -315,10 +315,10 @@ int ov106_02241B9C (OverlayManager * param0, int * param1) return 0; } -int ov106_02241CF0 (OverlayManager * param0, int * param1) +int ov106_02241CF0(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov106_02243118 * v1 = OverlayManager_Data(param0); + UnkStruct_ov106_02243118 *v1 = OverlayManager_Data(param0); *(v1->unk_28C) = v1->unk_0D; @@ -332,7 +332,7 @@ int ov106_02241CF0 (OverlayManager * param0, int * param1) return 1; } -static BOOL ov106_02241D28 (UnkStruct_ov106_02243118 * param0) +static BOOL ov106_02241D28(UnkStruct_ov106_02243118 *param0) { switch (param0->unk_08) { case 0: @@ -369,7 +369,7 @@ static BOOL ov106_02241D28 (UnkStruct_ov106_02243118 * param0) return 0; } -static void ov106_02241DD4 (UnkStruct_ov106_02243118 * param0) +static void ov106_02241DD4(UnkStruct_ov106_02243118 *param0) { int v0; @@ -384,7 +384,7 @@ static void ov106_02241DD4 (UnkStruct_ov106_02243118 * param0) return; } -static BOOL ov106_02241E14 (UnkStruct_ov106_02243118 * param0) +static BOOL ov106_02241E14(UnkStruct_ov106_02243118 *param0) { switch (param0->unk_08) { case 0: @@ -404,7 +404,7 @@ static BOOL ov106_02241E14 (UnkStruct_ov106_02243118 * param0) return 0; } -static BOOL ov106_02241E5C (UnkStruct_ov106_02243118 * param0) +static BOOL ov106_02241E5C(UnkStruct_ov106_02243118 *param0) { int v0; u32 v1, v2; @@ -535,7 +535,7 @@ static BOOL ov106_02241E5C (UnkStruct_ov106_02243118 * param0) return 0; } -static BOOL ov106_02242108 (UnkStruct_ov106_02243118 * param0) +static BOOL ov106_02242108(UnkStruct_ov106_02243118 *param0) { u8 v0; u32 v1; @@ -669,7 +669,7 @@ static BOOL ov106_02242108 (UnkStruct_ov106_02243118 * param0) return 0; } -static BOOL ov106_0224230C (UnkStruct_ov106_02243118 * param0) +static BOOL ov106_0224230C(UnkStruct_ov106_02243118 *param0) { int v0; @@ -690,7 +690,7 @@ static BOOL ov106_0224230C (UnkStruct_ov106_02243118 * param0) return 0; } -static BOOL ov106_02242344 (UnkStruct_ov106_02243118 * param0) +static BOOL ov106_02242344(UnkStruct_ov106_02243118 *param0) { int v0; @@ -718,7 +718,7 @@ static BOOL ov106_02242344 (UnkStruct_ov106_02243118 * param0) return 0; } -static BOOL ov106_022423AC (UnkStruct_ov106_02243118 * param0) +static BOOL ov106_022423AC(UnkStruct_ov106_02243118 *param0) { int v0; @@ -737,7 +737,7 @@ static BOOL ov106_022423AC (UnkStruct_ov106_02243118 * param0) return 0; } -static void ov106_022423E8 (UnkStruct_ov106_02243118 * param0) +static void ov106_022423E8(UnkStruct_ov106_02243118 *param0) { int v0; @@ -775,7 +775,7 @@ static void ov106_022423E8 (UnkStruct_ov106_02243118 * param0) return; } -static void ov106_0224248C (UnkStruct_ov106_02243118 * param0) +static void ov106_0224248C(UnkStruct_ov106_02243118 *param0) { int v0; @@ -791,7 +791,7 @@ static void ov106_0224248C (UnkStruct_ov106_02243118 * param0) return; } -static void ov106_022424C8 (void) +static void ov106_022424C8(void) { SetMainCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); @@ -805,7 +805,7 @@ static void ov106_022424C8 (void) return; } -static void ov106_02242500 (UnkStruct_ov106_02243118 * param0) +static void ov106_02242500(UnkStruct_ov106_02243118 *param0) { int v0, v1; @@ -848,7 +848,7 @@ static void ov106_02242500 (UnkStruct_ov106_02243118 * param0) return; } -static void ov106_0224262C (UnkStruct_ov106_02243118 * param0) +static void ov106_0224262C(UnkStruct_ov106_02243118 *param0) { ov106_0224271C(); ov106_0224273C(param0->unk_48); @@ -867,13 +867,13 @@ static void ov106_0224262C (UnkStruct_ov106_02243118 * param0) return; } -static void ov106_02242688 (UnkStruct_ov106_02243118 * param0) +static void ov106_02242688(UnkStruct_ov106_02243118 *param0) { ov106_02243310(¶m0->unk_C0, Party_GetPokemonBySlotIndex(param0->unk_290, 0)); return; } -static void ov106_022426A4 (BGL * param0) +static void ov106_022426A4(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); @@ -887,9 +887,9 @@ static void ov106_022426A4 (BGL * param0) return; } -static void ov106_022426E0 (void * param0) +static void ov106_022426E0(void *param0) { - UnkStruct_ov106_02243118 * v0 = param0; + UnkStruct_ov106_02243118 *v0 = param0; if (v0->unk_04 != NULL) { return; @@ -906,7 +906,7 @@ static void ov106_022426E0 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov106_0224271C (void) +static void ov106_0224271C(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_C, @@ -925,7 +925,7 @@ static void ov106_0224271C (void) return; } -static void ov106_0224273C (BGL * param0) +static void ov106_0224273C(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1030,7 +1030,7 @@ static void ov106_0224273C (BGL * param0) return; } -static void ov106_0224283C (UnkStruct_ov106_02243118 * param0, u32 param1) +static void ov106_0224283C(UnkStruct_ov106_02243118 *param0, u32 param1) { sub_020070E8(param0->unk_29C, 23, param0->unk_48, param1, 0, 0, 1, 98); sub_0200710C(param0->unk_29C, 24, param0->unk_48, param1, 0, 0, 1, 98); @@ -1038,10 +1038,10 @@ static void ov106_0224283C (UnkStruct_ov106_02243118 * param0, u32 param1) return; } -static void ov106_02242884 (void) +static void ov106_02242884(void) { - void * v0; - NNSG2dPaletteData * v1; + void *v0; + NNSG2dPaletteData *v1; v0 = sub_02006F88(150, 134, &v1, 98); @@ -1052,7 +1052,7 @@ static void ov106_02242884 (void) return; } -static void ov106_022428B8 (UnkStruct_ov106_02243118 * param0, u32 param1) +static void ov106_022428B8(UnkStruct_ov106_02243118 *param0, u32 param1) { sub_020070E8(param0->unk_29C, 125, param0->unk_48, param1, 0, 0, 1, 98); sub_0200710C(param0->unk_29C, 126, param0->unk_48, param1, 0, 0, 1, 98); @@ -1061,7 +1061,7 @@ static void ov106_022428B8 (UnkStruct_ov106_02243118 * param0, u32 param1) return; } -static u8 ov106_02242918 (UnkStruct_ov106_02243118 * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) +static u8 ov106_02242918(UnkStruct_ov106_02243118 *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { BGL_FillWindow(param1, param8); MessageLoader_GetStrbuf(param0->unk_20, param2, param0->unk_2C); @@ -1070,7 +1070,7 @@ static u8 ov106_02242918 (UnkStruct_ov106_02243118 * param0, Window * param1, in return sub_0201D78C(param1, param9, param0->unk_28, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); } -static u8 ov106_02242978 (UnkStruct_ov106_02243118 * param0, int param1, u8 param2) +static u8 ov106_02242978(UnkStruct_ov106_02243118 *param0, int param1, u8 param2) { u8 v0; @@ -1080,7 +1080,7 @@ static u8 ov106_02242978 (UnkStruct_ov106_02243118 * param0, int param1, u8 para return v0; } -static void ov106_022429B0 (UnkStruct_ov106_02243118 * param0, Window * param1, u8 param2) +static void ov106_022429B0(UnkStruct_ov106_02243118 *param0, Window *param1, u8 param2) { int v0; @@ -1101,10 +1101,10 @@ static void ov106_022429B0 (UnkStruct_ov106_02243118 * param0, Window * param1, return; } -static void ov106_02242A28 (UnkStruct_ov106_02243118 * param0, u8 param1, u8 param2, int param3) +static void ov106_02242A28(UnkStruct_ov106_02243118 *param0, u8 param1, u8 param2, int param3) { int v0; - void * v1; + void *v1; MessageLoader_GetStrbuf(param0->unk_20, param3, param0->unk_30[param1]); @@ -1114,7 +1114,7 @@ static void ov106_02242A28 (UnkStruct_ov106_02243118 * param0, u8 param1, u8 par return; } -static void ov106_02242A54 (UnkStruct_ov106_02243118 * param0) +static void ov106_02242A54(UnkStruct_ov106_02243118 *param0) { param0->unk_0F = 1; @@ -1127,18 +1127,18 @@ static void ov106_02242A54 (UnkStruct_ov106_02243118 * param0) return; } -static void ov106_02242AAC (UnkStruct_ov106_02243118 * param0, u32 param1, s32 param2) +static void ov106_02242AAC(UnkStruct_ov106_02243118 *param0, u32 param1, s32 param2) { StringTemplate_SetNumber(param0->unk_24, param1, param2, 2, 0, 1); return; } -static void ov106_02242AC4 (UnkStruct_ov106_02243118 * param0, Window * param1, u32 param2, u32 param3, u8 param4, u8 param5, u8 param6, u8 param7) +static void ov106_02242AC4(UnkStruct_ov106_02243118 *param0, Window *param1, u32 param2, u32 param3, u8 param4, u8 param5, u8 param6, u8 param7) { u8 v0; u32 v1, v2, v3; - Strbuf* v4; - Pokemon * v5; + Strbuf *v4; + Pokemon *v5; u16 v6[(10 + 1)]; v5 = Party_GetPokemonBySlotIndex(param0->unk_290, 0); @@ -1154,11 +1154,11 @@ static void ov106_02242AC4 (UnkStruct_ov106_02243118 * param0, Window * param1, return; } -static void ov106_02242B38 (UnkStruct_ov106_02243118 * param0, Window * param1, u8 param2, u8 param3, u8 param4, u8 param5) +static void ov106_02242B38(UnkStruct_ov106_02243118 *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5) { int v0, v1; - Strbuf* v2; - MessageLoader * v3; + Strbuf *v2; + MessageLoader *v3; BGL_FillWindow(param1, param4); @@ -1182,14 +1182,14 @@ static void ov106_02242B38 (UnkStruct_ov106_02243118 * param0, Window * param1, return; } -static void ov106_02242C04 (UnkStruct_ov106_02243118 * param0, Window * param1, u8 param2, u32 param3, u32 param4) +static void ov106_02242C04(UnkStruct_ov106_02243118 *param0, Window *param1, u8 param2, u32 param3, u32 param4) { sub_0200C5BC(param0->unk_B0, param2, 2, 0, param1, param3, param4); sub_0201A9A4(param1); return; } -static void ov106_02242C2C (UnkStruct_ov106_02243118 * param0, Window * param1) +static void ov106_02242C2C(UnkStruct_ov106_02243118 *param0, Window *param1) { int v0, v1; u8 v2, v3, v4; @@ -1216,7 +1216,7 @@ static void ov106_02242C2C (UnkStruct_ov106_02243118 * param0, Window * param1) return; } -static void ov106_02242CA4 (UnkStruct_ov106_02243118 * param0) +static void ov106_02242CA4(UnkStruct_ov106_02243118 *param0) { param0->unk_BC = Heap_AllocFromHeap(98, sizeof(PokemonSummary)); memset(param0->unk_BC, 0, sizeof(PokemonSummary)); @@ -1237,14 +1237,14 @@ static void ov106_02242CA4 (UnkStruct_ov106_02243118 * param0) return; } -static void ov106_02242D5C (UnkStruct_ov106_02243118 * param0, int * param1, int param2) +static void ov106_02242D5C(UnkStruct_ov106_02243118 *param0, int *param1, int param2) { param0->unk_08 = 0; *param1 = param2; return; } -static void ov106_02242D64 (UnkStruct_ov106_02243118 * param0, int param1) +static void ov106_02242D64(UnkStruct_ov106_02243118 *param0, int param1) { int v0; @@ -1353,7 +1353,7 @@ static void ov106_02242D64 (UnkStruct_ov106_02243118 * param0, int param1) return; } -static u16 ov106_02242F24 (UnkStruct_ov106_02243118 * param0) +static u16 ov106_02242F24(UnkStruct_ov106_02243118 *param0) { u8 v0; @@ -1361,12 +1361,12 @@ static u16 ov106_02242F24 (UnkStruct_ov106_02243118 * param0) return (v0 % 4) * 64 + 32; } -static u16 ov106_02242F3C (UnkStruct_ov106_02243118 * param0) +static u16 ov106_02242F3C(UnkStruct_ov106_02243118 *param0) { return (param0->unk_0D / 4) * 36 + 16; } -static void ov106_02242F4C (UnkStruct_ov106_02243118 * param0, BGL * param1) +static void ov106_02242F4C(UnkStruct_ov106_02243118 *param0, BGL *param1) { int v0; @@ -1388,7 +1388,7 @@ static void ov106_02242F4C (UnkStruct_ov106_02243118 * param0, BGL * param1) return; } -static void ov106_02242FAC (BGL * param0, u8 param1, u8 param2) +static void ov106_02242FAC(BGL *param0, u8 param1, u8 param2) { u8 v0, v1, v2, v3, v4; @@ -1458,7 +1458,7 @@ static void ov106_02242FAC (BGL * param0, u8 param1, u8 param2) return; } -static u8 ov106_02243090 (u8 param0) +static u8 ov106_02243090(u8 param0) { if (param0 >= 17) { return 18 - 1; @@ -1467,7 +1467,7 @@ static u8 ov106_02243090 (u8 param0) return param0; } -static BOOL ov106_02243098 (UnkStruct_ov106_02243118 * param0) +static BOOL ov106_02243098(UnkStruct_ov106_02243118 *param0) { if (param0->unk_09 == 0) { if ((param0->unk_1C == 50) || (param0->unk_1C == 170)) { @@ -1478,12 +1478,12 @@ static BOOL ov106_02243098 (UnkStruct_ov106_02243118 * param0) return 0; } -static BOOL ov106_022430B0 (UnkStruct_ov106_02243118 * param0) +static BOOL ov106_022430B0(UnkStruct_ov106_02243118 *param0) { return param0->unk_1E; } -BOOL ov106_022430B4 (UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2) +BOOL ov106_022430B4(UnkStruct_ov106_02243118 *param0, u16 param1, u16 param2) { int v0, v1; @@ -1515,9 +1515,9 @@ BOOL ov106_022430B4 (UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2) return v0; } -void ov106_02243118 (UnkStruct_ov106_02243118 * param0, u16 param1) +void ov106_02243118(UnkStruct_ov106_02243118 *param0, u16 param1) { - TrainerInfo * v0; + TrainerInfo *v0; v0 = SaveData_GetTrainerInfo(param0->unk_B8); param0->unk_2A0[0] = param1; @@ -1525,11 +1525,11 @@ void ov106_02243118 (UnkStruct_ov106_02243118 * param0, u16 param1) return; } -void ov106_02243130 (int param0, int param1, void * param2, void * param3) +void ov106_02243130(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov106_02243118 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov106_02243118 *v2 = param3; + const u16 *v3 = param2; v1 = 0; @@ -1540,11 +1540,11 @@ void ov106_02243130 (int param0, int param1, void * param2, void * param3) return; } -void ov106_0224313C (UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2) +void ov106_0224313C(UnkStruct_ov106_02243118 *param0, u16 param1, u16 param2) { int v0, v1; - Pokemon * v2; - Party * v3; + Pokemon *v2; + Party *v3; v1 = 0; @@ -1564,11 +1564,11 @@ void ov106_0224313C (UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2) return; } -void ov106_02243180 (int param0, int param1, void * param2, void * param3) +void ov106_02243180(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov106_02243118 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov106_02243118 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_16++; @@ -1593,7 +1593,7 @@ void ov106_02243180 (int param0, int param1, void * param2, void * param3) return; } -void ov106_022431D4 (UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2) +void ov106_022431D4(UnkStruct_ov106_02243118 *param0, u16 param1, u16 param2) { param0->unk_2A0[0] = param1; param0->unk_2A0[1] = param2; @@ -1601,11 +1601,11 @@ void ov106_022431D4 (UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2) return; } -void ov106_022431E0 (int param0, int param1, void * param2, void * param3) +void ov106_022431E0(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov106_02243118 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov106_02243118 *v2 = param3; + const u16 *v3 = param2; v1 = 0; @@ -1621,7 +1621,7 @@ void ov106_022431E0 (int param0, int param1, void * param2, void * param3) return; } -static void ov106_02243200 (UnkStruct_ov106_02243118 * param0) +static void ov106_02243200(UnkStruct_ov106_02243118 *param0) { if (param0->unk_0F == 1) { param0->unk_0F = 0; @@ -1632,7 +1632,7 @@ static void ov106_02243200 (UnkStruct_ov106_02243118 * param0) return; } -static void ov106_02243224 (UnkStruct_ov106_02243118 * param0) +static void ov106_02243224(UnkStruct_ov106_02243118 *param0) { u8 v0; int v1; @@ -1664,7 +1664,7 @@ static void ov106_02243224 (UnkStruct_ov106_02243118 * param0) return; } -static void ov106_022432AC (UnkStruct_ov106_02243118 * param0) +static void ov106_022432AC(UnkStruct_ov106_02243118 *param0) { ov106_022432D4(param0); ov106_02242FAC(param0->unk_48, param0->unk_0D, 0); @@ -1675,7 +1675,7 @@ static void ov106_022432AC (UnkStruct_ov106_02243118 * param0) return; } -static void ov106_022432D4 (UnkStruct_ov106_02243118 * param0) +static void ov106_022432D4(UnkStruct_ov106_02243118 *param0) { ov106_02243664(param0->unk_284, 1); sub_0200E084(¶m0->unk_4C[0], 0); diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c index cec7d74064..a700270c21 100644 --- a/src/overlay106/ov106_02243310.c +++ b/src/overlay106/ov106_02243310.c @@ -1,30 +1,31 @@ +#include "overlay106/ov106_02243310.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "pokemon.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay106/struct_ov106_02243310.h" #include "overlay115/struct_ov115_02261520.h" +#include "gx_layers.h" #include "narc.h" +#include "pokemon.h" +#include "pokemon_icon.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "pokemon_icon.h" -#include "overlay106/ov106_02243310.h" -void ov106_02243310(UnkStruct_ov106_02243310 * param0, Pokemon * param1); -GraphicElementData * ov106_022434BC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4); -void ov106_02243570(UnkStruct_ov106_02243310 * param0); +void ov106_02243310(UnkStruct_ov106_02243310 *param0, Pokemon *param1); +GraphicElementData *ov106_022434BC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u32 param3, u8 param4); +void ov106_02243570(UnkStruct_ov106_02243310 *param0); static void ov106_022435C8(void); static const u8 Unk_ov106_0224384C[4] = { @@ -34,10 +35,10 @@ static const u8 Unk_ov106_0224384C[4] = { 0x2 }; -void ov106_02243310 (UnkStruct_ov106_02243310 * param0, Pokemon * param1) +void ov106_02243310(UnkStruct_ov106_02243310 *param0, Pokemon *param1) { int v0; - NARC * v1; + NARC *v1; ov106_022435C8(); NNS_G2dInitOamManagerModule(); @@ -73,11 +74,11 @@ void ov106_02243310 (UnkStruct_ov106_02243310 * param0, Pokemon * param1) return; } -GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4) +GraphicElementData *ov106_022434BC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u32 param3, u8 param4) { int v0; UnkStruct_ov19_021DA864 v1; - GraphicElementData * v2; + GraphicElementData *v2; sub_020093B4(&v1, param1, param1, param1, param1, 0xffffffff, 0xffffffff, 0, 1, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL); @@ -118,7 +119,7 @@ GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 para return v2; } -void ov106_02243570 (UnkStruct_ov106_02243310 * param0) +void ov106_02243570(UnkStruct_ov106_02243310 *param0) { u8 v0; @@ -139,7 +140,7 @@ void ov106_02243570 (UnkStruct_ov106_02243310 * param0) return; } -static void ov106_022435C8 (void) +static void ov106_022435C8(void) { { UnkStruct_ov22_022559F8 v0 = { diff --git a/src/overlay106/ov106_022435FC.c b/src/overlay106/ov106_022435FC.c index 2f84feaab3..7807b2847e 100644 --- a/src/overlay106/ov106_022435FC.c +++ b/src/overlay106/ov106_022435FC.c @@ -1,36 +1,37 @@ +#include "overlay106/ov106_022435FC.h" + #include #include #include "struct_decls/struct_02022550_decl.h" -#include "pokemon.h" -#include "overlay106/struct_ov106_02243650_decl.h" +#include "overlay106/ov106_02243310.h" #include "overlay106/struct_ov106_02243310.h" +#include "overlay106/struct_ov106_02243650_decl.h" #include "heap.h" -#include "unk_020218BC.h" +#include "pokemon.h" #include "pokemon_icon.h" -#include "overlay106/ov106_02243310.h" -#include "overlay106/ov106_022435FC.h" +#include "unk_020218BC.h" struct UnkStruct_ov106_02243650_t { u32 unk_00; u32 unk_04; u32 unk_08; - const u8 * unk_0C; - GraphicElementData * unk_10; + const u8 *unk_0C; + GraphicElementData *unk_10; }; -UnkStruct_ov106_02243650 * ov106_022435FC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u16 param3, u16 param4, const u8 * param5); -void * ov106_02243650(UnkStruct_ov106_02243650 * param0); -void ov106_02243664(UnkStruct_ov106_02243650 * param0, int param1); -void ov106_02243670(UnkStruct_ov106_02243650 * param0, u16 param1, u16 param2); -void ov106_022436B0(UnkStruct_ov106_02243650 * param0, u32 param1); -void ov106_022436CC(UnkStruct_ov106_02243650 * param0, Pokemon * param1); +UnkStruct_ov106_02243650 *ov106_022435FC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u16 param3, u16 param4, const u8 *param5); +void *ov106_02243650(UnkStruct_ov106_02243650 *param0); +void ov106_02243664(UnkStruct_ov106_02243650 *param0, int param1); +void ov106_02243670(UnkStruct_ov106_02243650 *param0, u16 param1, u16 param2); +void ov106_022436B0(UnkStruct_ov106_02243650 *param0, u32 param1); +void ov106_022436CC(UnkStruct_ov106_02243650 *param0, Pokemon *param1); -UnkStruct_ov106_02243650 * ov106_022435FC (UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u16 param3, u16 param4, const u8 * param5) +UnkStruct_ov106_02243650 *ov106_022435FC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u16 param3, u16 param4, const u8 *param5) { - UnkStruct_ov106_02243650 * v0; + UnkStruct_ov106_02243650 *v0; VecFx32 v1; v0 = Heap_AllocFromHeap(98, sizeof(UnkStruct_ov106_02243650)); @@ -52,7 +53,7 @@ UnkStruct_ov106_02243650 * ov106_022435FC (UnkStruct_ov106_02243310 * param0, u3 return v0; } -void * ov106_02243650 (UnkStruct_ov106_02243650 * param0) +void *ov106_02243650(UnkStruct_ov106_02243650 *param0) { sub_02021BD4(param0->unk_10); Heap_FreeToHeap(param0); @@ -60,13 +61,13 @@ void * ov106_02243650 (UnkStruct_ov106_02243650 * param0) return NULL; } -void ov106_02243664 (UnkStruct_ov106_02243650 * param0, int param1) +void ov106_02243664(UnkStruct_ov106_02243650 *param0, int param1) { sub_02021CAC(param0->unk_10, param1); return; } -void ov106_02243670 (UnkStruct_ov106_02243650 * param0, u16 param1, u16 param2) +void ov106_02243670(UnkStruct_ov106_02243650 *param0, u16 param1, u16 param2) { VecFx32 v0; @@ -83,7 +84,7 @@ void ov106_02243670 (UnkStruct_ov106_02243650 * param0, u16 param1, u16 param2) return; } -void ov106_022436B0 (UnkStruct_ov106_02243650 * param0, u32 param1) +void ov106_022436B0(UnkStruct_ov106_02243650 *param0, u32 param1) { sub_02021CE4(param0->unk_10, FX32_ONE); sub_02021DCC(param0->unk_10, param1); @@ -91,7 +92,7 @@ void ov106_022436B0 (UnkStruct_ov106_02243650 * param0, u32 param1) return; } -void ov106_022436CC (UnkStruct_ov106_02243650 * param0, Pokemon * param1) +void ov106_022436CC(UnkStruct_ov106_02243650 *param0, Pokemon *param1) { sub_02021F24(param0->unk_10, Pokemon_IconPaletteIndex(param1)); return; diff --git a/src/overlay106/ov106_022436E0.c b/src/overlay106/ov106_022436E0.c index 2c4b2d7ac3..10f1d02898 100644 --- a/src/overlay106/ov106_022436E0.c +++ b/src/overlay106/ov106_022436E0.c @@ -1,31 +1,32 @@ +#include "overlay106/ov106_022436E0.h" + #include #include #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay061/struct_ov61_0222C884.h" #include "unk_0200DA60.h" #include "unk_02018340.h" -#include "overlay106/ov106_022436E0.h" -void ov106_022436E0(BGL * param0, Window * param1); -void ov106_02243710(Window * param0); -void ov106_0224372C(BGL * param0, Window * param1); -void ov106_02243758(Window * param0, int param1); +void ov106_022436E0(BGL *param0, Window *param1); +void ov106_02243710(Window *param0); +void ov106_0224372C(BGL *param0, Window *param1); +void ov106_02243758(Window *param0, int param1); static const UnkStruct_ov61_0222C884 Unk_ov106_02243860[] = { - {0x0, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1}, - {0x0, 0x18, 0xD, 0x7, 0x4, 0xD, 0x6D}, - {0x0, 0xA, 0x14, 0x9, 0x2, 0xD, 0x89}, - {0x1, 0x1, 0x0, 0x1F, 0x16, 0xD, 0x1} + { 0x0, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1 }, + { 0x0, 0x18, 0xD, 0x7, 0x4, 0xD, 0x6D }, + { 0x0, 0xA, 0x14, 0x9, 0x2, 0xD, 0x89 }, + { 0x1, 0x1, 0x0, 0x1F, 0x16, 0xD, 0x1 } }; -void ov106_022436E0 (BGL * param0, Window * param1) +void ov106_022436E0(BGL *param0, Window *param1) { u8 v0; - const UnkStruct_ov61_0222C884 * v1 = Unk_ov106_02243860; + const UnkStruct_ov61_0222C884 *v1 = Unk_ov106_02243860; for (v0 = 0; v0 < 4; v0++) { sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); @@ -35,7 +36,7 @@ void ov106_022436E0 (BGL * param0, Window * param1) return; } -void ov106_02243710 (Window * param0) +void ov106_02243710(Window *param0) { u16 v0; @@ -46,7 +47,7 @@ void ov106_02243710 (Window * param0) return; } -void ov106_0224372C (BGL * param0, Window * param1) +void ov106_0224372C(BGL *param0, Window *param1) { sub_0200DAA4(param0, 0, (1024 - 9), 11, 0, 98); Window_Show(param1, 1, (1024 - 9), 11); @@ -54,11 +55,11 @@ void ov106_0224372C (BGL * param0, Window * param1) return; } -void ov106_02243758 (Window * param0, int param1) +void ov106_02243758(Window *param0, int param1) { - sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - ((18 + 12))), 10, param1, 98); + sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 98); BGL_FillWindow(param0, 15); - sub_0200E060(param0, 0, ((1024 - 9) - ((18 + 12))), 10); + sub_0200E060(param0, 0, ((1024 - 9) - (18 + 12)), 10); return; } diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c index 756cd87bc2..00cf48aa36 100644 --- a/src/overlay107/ov107_02249604.c +++ b/src/overlay107/ov107_02249604.c @@ -1,10 +1,11 @@ +#include "overlay107/ov107_02249604.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay019/struct_ov19_021DA864.h" @@ -12,7 +13,12 @@ #include "overlay107/struct_ov107_02249954.h" #include "overlay115/struct_ov115_02261520.h" +#include "gx_layers.h" +#include "item.h" #include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_icon.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" @@ -20,21 +26,16 @@ #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "pokemon_icon.h" -#include "party.h" -#include "item.h" #include "unk_0207E0B8.h" -#include "overlay107/ov107_02249604.h" -void ov107_02249604(UnkStruct_ov107_02249954 * param0, Party * param1, u8 param2); -GraphicElementData * ov107_022498A4(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7); -void ov107_02249954(UnkStruct_ov107_02249954 * param0); -void ov107_022499BC(UnkStruct_ov107_02249954 * param0, u16 param1); -void ov107_022499FC(UnkStruct_ov107_02249954 * param0, u16 param1); +void ov107_02249604(UnkStruct_ov107_02249954 *param0, Party *param1, u8 param2); +GraphicElementData *ov107_022498A4(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7); +void ov107_02249954(UnkStruct_ov107_02249954 *param0); +void ov107_022499BC(UnkStruct_ov107_02249954 *param0, u16 param1); +void ov107_022499FC(UnkStruct_ov107_02249954 *param0, u16 param1); static void ov107_02249A3C(void); -static void ov107_02249A70(UnkStruct_ov107_02249954 * param0); +static void ov107_02249A70(UnkStruct_ov107_02249954 *param0); static const u8 Unk_ov107_0224A204[4] = { 0x7, @@ -43,11 +44,11 @@ static const u8 Unk_ov107_0224A204[4] = { 0x7 }; -void ov107_02249604 (UnkStruct_ov107_02249954 * param0, Party * param1, u8 param2) +void ov107_02249604(UnkStruct_ov107_02249954 *param0, Party *param1, u8 param2) { int v0; - NARC * v1; - Pokemon * v2; + NARC *v1; + Pokemon *v2; sub_0201DBEC(32, 100); ov107_02249A3C(); @@ -112,11 +113,11 @@ void ov107_02249604 (UnkStruct_ov107_02249954 * param0, Party * param1, u8 param return; } -GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7) +GraphicElementData *ov107_022498A4(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7) { int v0; UnkStruct_ov19_021DA864 v1; - GraphicElementData * v2; + GraphicElementData *v2; sub_020093B4(&v1, param1, param2, param3, param3, 0xffffffff, 0xffffffff, 0, param6, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL); @@ -156,7 +157,7 @@ GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 para return v2; } -void ov107_02249954 (UnkStruct_ov107_02249954 * param0) +void ov107_02249954(UnkStruct_ov107_02249954 *param0) { u8 v0; @@ -180,9 +181,9 @@ void ov107_02249954 (UnkStruct_ov107_02249954 * param0) return; } -void ov107_022499BC (UnkStruct_ov107_02249954 * param0, u16 param1) +void ov107_022499BC(UnkStruct_ov107_02249954 *param0, u16 param1) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009DC8(param0->unk_190[0], 1); @@ -192,9 +193,9 @@ void ov107_022499BC (UnkStruct_ov107_02249954 * param0, u16 param1) return; } -void ov107_022499FC (UnkStruct_ov107_02249954 * param0, u16 param1) +void ov107_022499FC(UnkStruct_ov107_02249954 *param0, u16 param1) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009DC8(param0->unk_190[1], 1); @@ -204,7 +205,7 @@ void ov107_022499FC (UnkStruct_ov107_02249954 * param0, u16 param1) return; } -static void ov107_02249A3C (void) +static void ov107_02249A3C(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -221,9 +222,9 @@ static void ov107_02249A3C (void) return; } -static void ov107_02249A70 (UnkStruct_ov107_02249954 * param0) +static void ov107_02249A70(UnkStruct_ov107_02249954 *param0) { - NARC * v0; + NARC *v0; u32 v1; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, 100); diff --git a/src/overlay107/ov107_02249B1C.c b/src/overlay107/ov107_02249B1C.c index 16c6ac24b3..f4866815e7 100644 --- a/src/overlay107/ov107_02249B1C.c +++ b/src/overlay107/ov107_02249B1C.c @@ -1,42 +1,43 @@ +#include "overlay107/ov107_02249B1C.h" + #include #include #include "struct_decls/struct_02022550_decl.h" -#include "pokemon.h" -#include "overlay107/struct_ov107_02249B8C_decl.h" +#include "overlay104/ov104_0222DCE0.h" +#include "overlay107/ov107_02249604.h" #include "overlay107/struct_ov107_02249954.h" +#include "overlay107/struct_ov107_02249B8C_decl.h" -#include "unk_02005474.h" #include "heap.h" -#include "unk_020218BC.h" +#include "pokemon.h" #include "pokemon_icon.h" -#include "overlay104/ov104_0222DCE0.h" -#include "overlay107/ov107_02249604.h" -#include "overlay107/ov107_02249B1C.h" +#include "unk_02005474.h" +#include "unk_020218BC.h" struct UnkStruct_ov107_02249B8C_t { s16 unk_00; s16 unk_02; - GraphicElementData * unk_04; + GraphicElementData *unk_04; }; -UnkStruct_ov107_02249B8C * ov107_02249B1C(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, s16 param5, s16 param6, int param7, const u8 * param8); -void * ov107_02249B8C(UnkStruct_ov107_02249B8C * param0); -void ov107_02249BAC(UnkStruct_ov107_02249B8C * param0, int param1); -void ov107_02249BB8(UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2); -void ov107_02249BEC(UnkStruct_ov107_02249B8C * param0, u32 param1); -void ov107_02249C08(UnkStruct_ov107_02249B8C * param0, Pokemon * param1); -void ov107_02249C1C(UnkStruct_ov107_02249B8C * param0, u8 param1); -void ov107_02249C28(UnkStruct_ov107_02249B8C * param0, u8 param1); -BOOL ov107_02249C40(UnkStruct_ov107_02249B8C * param0); -void ov107_02249C4C(UnkStruct_ov107_02249B8C * param0, u8 param1); -void ov107_02249C58(UnkStruct_ov107_02249B8C * param0, s16 param1, s16 param2); -void ov107_02249C60(UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2); - -UnkStruct_ov107_02249B8C * ov107_02249B1C (UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, s16 param5, s16 param6, int param7, const u8 * param8) +UnkStruct_ov107_02249B8C *ov107_02249B1C(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, s16 param5, s16 param6, int param7, const u8 *param8); +void *ov107_02249B8C(UnkStruct_ov107_02249B8C *param0); +void ov107_02249BAC(UnkStruct_ov107_02249B8C *param0, int param1); +void ov107_02249BB8(UnkStruct_ov107_02249B8C *param0, u16 param1, u16 param2); +void ov107_02249BEC(UnkStruct_ov107_02249B8C *param0, u32 param1); +void ov107_02249C08(UnkStruct_ov107_02249B8C *param0, Pokemon *param1); +void ov107_02249C1C(UnkStruct_ov107_02249B8C *param0, u8 param1); +void ov107_02249C28(UnkStruct_ov107_02249B8C *param0, u8 param1); +BOOL ov107_02249C40(UnkStruct_ov107_02249B8C *param0); +void ov107_02249C4C(UnkStruct_ov107_02249B8C *param0, u8 param1); +void ov107_02249C58(UnkStruct_ov107_02249B8C *param0, s16 param1, s16 param2); +void ov107_02249C60(UnkStruct_ov107_02249B8C *param0, u16 param1, u16 param2); + +UnkStruct_ov107_02249B8C *ov107_02249B1C(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, s16 param5, s16 param6, int param7, const u8 *param8) { - UnkStruct_ov107_02249B8C * v0; + UnkStruct_ov107_02249B8C *v0; VecFx32 v1; v0 = Heap_AllocFromHeap(100, sizeof(UnkStruct_ov107_02249B8C)); @@ -53,7 +54,7 @@ UnkStruct_ov107_02249B8C * ov107_02249B1C (UnkStruct_ov107_02249954 * param0, u3 return v0; } -void * ov107_02249B8C (UnkStruct_ov107_02249B8C * param0) +void *ov107_02249B8C(UnkStruct_ov107_02249B8C *param0) { if (param0 == NULL) { GF_ASSERT(0); @@ -66,13 +67,13 @@ void * ov107_02249B8C (UnkStruct_ov107_02249B8C * param0) return NULL; } -void ov107_02249BAC (UnkStruct_ov107_02249B8C * param0, int param1) +void ov107_02249BAC(UnkStruct_ov107_02249B8C *param0, int param1) { sub_02021CAC(param0->unk_04, param1); return; } -void ov107_02249BB8 (UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2) +void ov107_02249BB8(UnkStruct_ov107_02249B8C *param0, u16 param1, u16 param2) { VecFx32 v0; @@ -84,7 +85,7 @@ void ov107_02249BB8 (UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2) return; } -void ov107_02249BEC (UnkStruct_ov107_02249B8C * param0, u32 param1) +void ov107_02249BEC(UnkStruct_ov107_02249B8C *param0, u32 param1) { sub_02021CE4(param0->unk_04, FX32_ONE); SpriteActor_SetSpriteAnimActive(param0->unk_04, param1); @@ -92,43 +93,43 @@ void ov107_02249BEC (UnkStruct_ov107_02249B8C * param0, u32 param1) return; } -void ov107_02249C08 (UnkStruct_ov107_02249B8C * param0, Pokemon * param1) +void ov107_02249C08(UnkStruct_ov107_02249B8C *param0, Pokemon *param1) { sub_02021F24(param0->unk_04, Pokemon_IconPaletteIndex(param1)); return; } -void ov107_02249C1C (UnkStruct_ov107_02249B8C * param0, u8 param1) +void ov107_02249C1C(UnkStruct_ov107_02249B8C *param0, u8 param1) { ov104_0222E1D8(param0->unk_04, param1); return; } -void ov107_02249C28 (UnkStruct_ov107_02249B8C * param0, u8 param1) +void ov107_02249C28(UnkStruct_ov107_02249B8C *param0, u8 param1) { ov104_0222E204(param0->unk_04, param0->unk_00, param0->unk_02, param1); return; } -BOOL ov107_02249C40 (UnkStruct_ov107_02249B8C * param0) +BOOL ov107_02249C40(UnkStruct_ov107_02249B8C *param0) { return sub_02021FD0(param0->unk_04); } -void ov107_02249C4C (UnkStruct_ov107_02249B8C * param0, u8 param1) +void ov107_02249C4C(UnkStruct_ov107_02249B8C *param0, u8 param1) { sub_02021E80(param0->unk_04, param1); return; } -void ov107_02249C58 (UnkStruct_ov107_02249B8C * param0, s16 param1, s16 param2) +void ov107_02249C58(UnkStruct_ov107_02249B8C *param0, s16 param1, s16 param2) { param0->unk_00 = param1; param0->unk_02 = param2; return; } -void ov107_02249C60 (UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2) +void ov107_02249C60(UnkStruct_ov107_02249B8C *param0, u16 param1, u16 param2) { ov107_02249BEC(param0, 11); ov107_02249BB8(param0, param1, param2); diff --git a/src/overlay107/ov107_02249C98.c b/src/overlay107/ov107_02249C98.c index bbdb09ae40..1f631ccab0 100644 --- a/src/overlay107/ov107_02249C98.c +++ b/src/overlay107/ov107_02249C98.c @@ -1,31 +1,31 @@ +#include "overlay107/ov107_02249C98.h" + #include #include -#include "trainer_info.h" +#include "communication_information.h" +#include "communication_system.h" #include "savedata.h" - -#include "unk_02005474.h" #include "string_template.h" +#include "trainer_info.h" +#include "unk_02005474.h" #include "unk_0203061C.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_0205DFC4.h" -#include "overlay107/ov107_02249C98.h" FS_EXTERN_OVERLAY(overlay104); u8 ov107_02249C98(u8 param0, u8 param1); u8 ov107_02249C9C(u8 param0, u8 param1); -u8 ov107_02249CAC(SaveData * param0, u8 param1, u8 param2); +u8 ov107_02249CAC(SaveData *param0, u8 param1, u8 param2); void ov107_02249CE0(u32 param0, u16 param1); -void ov107_02249CF4(StringTemplate * param0, u32 param1); +void ov107_02249CF4(StringTemplate *param0, u32 param1); -u8 ov107_02249C98 (u8 param0, u8 param1) +u8 ov107_02249C98(u8 param0, u8 param1) { return param1; } -u8 ov107_02249C9C (u8 param0, u8 param1) +u8 ov107_02249C9C(u8 param0, u8 param1) { if (param1 < param0) { return param1; @@ -34,12 +34,12 @@ u8 ov107_02249C9C (u8 param0, u8 param1) return param1 - param0; } -u8 ov107_02249CAC (SaveData * param0, u8 param1, u8 param2) +u8 ov107_02249CAC(SaveData *param0, u8 param1, u8 param2) { return sub_02030698(sub_0203068C(param0), sub_0205E5B4(param1, param2), sub_0205E6A8(sub_0205E5B4(param1, param2))); } -void ov107_02249CE0 (u32 param0, u16 param1) +void ov107_02249CE0(u32 param0, u16 param1) { if (param0 != 0xffffffff) { Sound_PlayEffect(param1); @@ -48,12 +48,12 @@ void ov107_02249CE0 (u32 param0, u16 param1) return; } -void ov107_02249CF4 (StringTemplate * param0, u32 param1) +void ov107_02249CF4(StringTemplate *param0, u32 param1) { - TrainerInfo * v0; + TrainerInfo *v0; u32 v1; - v0 = CommInfo_TrainerInfo((CommSys_CurNetId() ^ 1)); + v0 = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); StringTemplate_SetPlayerName(param0, param1, v0); return; diff --git a/src/overlay107/ov107_02249D14.c b/src/overlay107/ov107_02249D14.c index 2631263213..f2551c8f6b 100644 --- a/src/overlay107/ov107_02249D14.c +++ b/src/overlay107/ov107_02249D14.c @@ -1,70 +1,71 @@ +#include "overlay107/ov107_02249D14.h" + #include #include #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay061/struct_ov61_0222C884.h" #include "unk_0200DA60.h" #include "unk_02018340.h" -#include "overlay107/ov107_02249D14.h" typedef struct { - const UnkStruct_ov61_0222C884 * unk_00; + const UnkStruct_ov61_0222C884 *unk_00; u32 unk_04; } UnkStruct_ov107_0224A218; -void ov107_02249D14(BGL * param0, Window * param1, u8 param2); -void ov107_02249D5C(Window * param0, u8 param1); -void ov107_02249D84(BGL * param0, Window * param1); -void ov107_02249DBC(Window * param0, int param1); +void ov107_02249D14(BGL *param0, Window *param1, u8 param2); +void ov107_02249D5C(Window *param0, u8 param1); +void ov107_02249D84(BGL *param0, Window *param1); +void ov107_02249DBC(Window *param0, int param1); static const UnkStruct_ov61_0222C884 Unk_ov107_0224A288[] = { - {0x1, 0x2, 0x1, 0x1D, 0x2, 0xD, 0x1}, - {0x1, 0x1A, 0x13, 0x4, 0x3, 0xD, 0x3B}, - {0x1, 0x0, 0x4, 0x20, 0x2, 0xD, 0x47}, - {0x1, 0x0, 0x9, 0x20, 0x2, 0xD, 0x87}, - {0x0, 0x5, 0xA, 0x18, 0xE, 0xD, 0x1}, - {0x0, 0xC, 0x2, 0x13, 0xC, 0xD, 0x1}, - {0x0, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x151}, - {0x0, 0x2, 0x13, 0x14, 0x4, 0xC, 0x1BD}, - {0x0, 0x2, 0x13, 0x11, 0x4, 0xC, 0x20D}, - {0x0, 0x17, 0xD, 0x8, 0xA, 0xD, 0x251}, - {0x0, 0x14, 0x7, 0xB, 0xA, 0xD, 0x2A1}, - {0x0, 0x16, 0x9, 0x9, 0x8, 0xD, 0x2A1}, - {0x0, 0x5, 0x10, 0x1B, 0x7, 0xC, 0x1BD}, - {0x0, 0x18, 0xD, 0x7, 0x4, 0xD, 0x27A}, - {0x0, 0x18, 0xB, 0x7, 0x6, 0xD, 0x296}, - {0x0, 0x1, 0x1, 0x8, 0x4, 0xD, 0x2C0}, - {0x0, 0x1, 0x7, 0xA, 0x2, 0xD, 0x2E0}, - {0x0, 0x1, 0xD, 0xB, 0x2, 0xD, 0x2F4} + { 0x1, 0x2, 0x1, 0x1D, 0x2, 0xD, 0x1 }, + { 0x1, 0x1A, 0x13, 0x4, 0x3, 0xD, 0x3B }, + { 0x1, 0x0, 0x4, 0x20, 0x2, 0xD, 0x47 }, + { 0x1, 0x0, 0x9, 0x20, 0x2, 0xD, 0x87 }, + { 0x0, 0x5, 0xA, 0x18, 0xE, 0xD, 0x1 }, + { 0x0, 0xC, 0x2, 0x13, 0xC, 0xD, 0x1 }, + { 0x0, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x151 }, + { 0x0, 0x2, 0x13, 0x14, 0x4, 0xC, 0x1BD }, + { 0x0, 0x2, 0x13, 0x11, 0x4, 0xC, 0x20D }, + { 0x0, 0x17, 0xD, 0x8, 0xA, 0xD, 0x251 }, + { 0x0, 0x14, 0x7, 0xB, 0xA, 0xD, 0x2A1 }, + { 0x0, 0x16, 0x9, 0x9, 0x8, 0xD, 0x2A1 }, + { 0x0, 0x5, 0x10, 0x1B, 0x7, 0xC, 0x1BD }, + { 0x0, 0x18, 0xD, 0x7, 0x4, 0xD, 0x27A }, + { 0x0, 0x18, 0xB, 0x7, 0x6, 0xD, 0x296 }, + { 0x0, 0x1, 0x1, 0x8, 0x4, 0xD, 0x2C0 }, + { 0x0, 0x1, 0x7, 0xA, 0x2, 0xD, 0x2E0 }, + { 0x0, 0x1, 0xD, 0xB, 0x2, 0xD, 0x2F4 } }; static const UnkStruct_ov61_0222C884 Unk_ov107_0224A228[] = { - {0x1, 0x2, 0x1, 0x1D, 0x2, 0xD, 0x1}, - {0x1, 0x1A, 0x13, 0x4, 0x3, 0xD, 0x3B}, - {0x1, 0x0, 0x4, 0x20, 0x2, 0xD, 0x47}, - {0x1, 0x0, 0x9, 0x20, 0x2, 0xD, 0x87}, - {0x0, 0x4, 0xA, 0x1A, 0xE, 0xD, 0x1}, - {0x0, 0x17, 0xF, 0x8, 0x8, 0xD, 0x1}, - {0x0, 0x16, 0x9, 0x9, 0x8, 0xD, 0x16D}, - {0x0, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1B5}, - {0x0, 0x2, 0x13, 0x14, 0x4, 0xC, 0x221}, - {0x0, 0x2, 0x13, 0x11, 0x4, 0xC, 0x271}, - {0x0, 0x18, 0xD, 0x7, 0x4, 0xD, 0x2B5}, - {0x0, 0x18, 0xB, 0x7, 0x6, 0xD, 0x2D1} + { 0x1, 0x2, 0x1, 0x1D, 0x2, 0xD, 0x1 }, + { 0x1, 0x1A, 0x13, 0x4, 0x3, 0xD, 0x3B }, + { 0x1, 0x0, 0x4, 0x20, 0x2, 0xD, 0x47 }, + { 0x1, 0x0, 0x9, 0x20, 0x2, 0xD, 0x87 }, + { 0x0, 0x4, 0xA, 0x1A, 0xE, 0xD, 0x1 }, + { 0x0, 0x17, 0xF, 0x8, 0x8, 0xD, 0x1 }, + { 0x0, 0x16, 0x9, 0x9, 0x8, 0xD, 0x16D }, + { 0x0, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1B5 }, + { 0x0, 0x2, 0x13, 0x14, 0x4, 0xC, 0x221 }, + { 0x0, 0x2, 0x13, 0x11, 0x4, 0xC, 0x271 }, + { 0x0, 0x18, 0xD, 0x7, 0x4, 0xD, 0x2B5 }, + { 0x0, 0x18, 0xB, 0x7, 0x6, 0xD, 0x2D1 } }; static const UnkStruct_ov107_0224A218 Unk_ov107_0224A218[2] = { - {Unk_ov107_0224A288, 0x12}, - {Unk_ov107_0224A228, 0xC} + { Unk_ov107_0224A288, 0x12 }, + { Unk_ov107_0224A228, 0xC } }; -void ov107_02249D14 (BGL * param0, Window * param1, u8 param2) +void ov107_02249D14(BGL *param0, Window *param1, u8 param2) { u8 v0; - const UnkStruct_ov61_0222C884 * v1 = Unk_ov107_0224A218[param2].unk_00; + const UnkStruct_ov61_0222C884 *v1 = Unk_ov107_0224A218[param2].unk_00; u32 v2 = Unk_ov107_0224A218[param2].unk_04; for (v0 = 0; v0 < v2; v0++) { @@ -75,7 +76,7 @@ void ov107_02249D14 (BGL * param0, Window * param1, u8 param2) return; } -void ov107_02249D5C (Window * param0, u8 param1) +void ov107_02249D5C(Window *param0, u8 param1) { u16 v0; u32 v1 = Unk_ov107_0224A218[param1].unk_04; @@ -87,7 +88,7 @@ void ov107_02249D5C (Window * param0, u8 param1) return; } -void ov107_02249D84 (BGL * param0, Window * param1) +void ov107_02249D84(BGL *param0, Window *param1) { sub_0200DAA4(param0, sub_0201C290(param1), (1024 - 9), 11, 0, 100); Window_Show(param1, 1, (1024 - 9), 11); @@ -95,11 +96,11 @@ void ov107_02249D84 (BGL * param0, Window * param1) return; } -void ov107_02249DBC (Window * param0, int param1) +void ov107_02249DBC(Window *param0, int param1) { - sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - ((18 + 12))), 10, param1, 100); + sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 100); BGL_FillWindow(param0, 15); - sub_0200E060(param0, 1, ((1024 - 9) - ((18 + 12))), 10); + sub_0200E060(param0, 1, ((1024 - 9) - (18 + 12)), 10); sub_0201A9A4(param0); return; diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 7c0a7080e6..8cfc857c1d 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -1,82 +1,79 @@ +#include "overlay108/ov108_02241AE0.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_020305B8_decl.h" #include "struct_decls/struct_0203068C_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" -#include "overlay108/struct_ov108_02241DB0_decl.h" -#include "overlay108/struct_ov108_02243594_decl.h" - #include "struct_defs/struct_02013A04_t.h" -#include "touch_screen.h" -#include "game_options.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" + #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay104/ov104_0223BCBC.h" #include "overlay104/struct_ov104_02238240.h" +#include "overlay108/ov108_02243030.h" +#include "overlay108/ov108_0224351C.h" +#include "overlay108/ov108_02243630.h" +#include "overlay108/struct_ov108_02241DB0_decl.h" #include "overlay108/struct_ov108_02243030.h" +#include "overlay108/struct_ov108_02243594_decl.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "touch_screen.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "game_overlay.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" #include "unk_02030494.h" #include "unk_0203061C.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "party.h" #include "unk_0209BA80.h" -#include "overlay104/ov104_0223BCBC.h" -#include "overlay108/ov108_02241AE0.h" -#include "overlay108/ov108_02243030.h" -#include "overlay108/ov108_0224351C.h" -#include "overlay108/ov108_02243630.h" FS_EXTERN_OVERLAY(overlay104); static const u8 Unk_ov108_0224368F[8][2] = { - { 0x14, 0x0 }, - { 0x10, 0x0 }, - { 0x8, 0x0 }, - { 0x4, 0x0 }, - { 0x3, 0x0 }, - { 0x2, 0x0 }, - { 0x1, 0x0 }, - { 0x0, 0x0 } + { 0x14, 0x0 }, + { 0x10, 0x0 }, + { 0x8, 0x0 }, + { 0x4, 0x0 }, + { 0x3, 0x0 }, + { 0x2, 0x0 }, + { 0x1, 0x0 }, + { 0x0, 0x0 } }; typedef struct { @@ -91,41 +88,40 @@ typedef struct { } UnkStruct_ov108_02243718; static const UnkStruct_ov108_02243718 Unk_ov108_02243718[] = { - { 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, - { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x0 }, - { 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, - { 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, - { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x0 }, - { 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, - { 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0 }, - { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, - { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, - { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0 } + { 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, + { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x0 }, + { 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, + { 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, + { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x0 }, + { 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, + { 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, 0x1, 0x0 }, + { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, + { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1, 0x0 }, + { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0 } }; - typedef struct { u8 unk_00_0 : 1; u8 unk_00_1 : 1; @@ -138,34 +134,33 @@ typedef struct { } UnkStruct_ov108_02243680; static const UnkStruct_ov108_02243680 Unk_ov108_02243680[7] = { - { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0 }, - { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0 }, - { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0 }, - { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0 }, - { 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0 }, - { 0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x0 }, - { 0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x0 } + { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0 }, + { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0 }, + { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0 }, + { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x0 }, + { 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x0, 0x0 }, + { 0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x0 }, + { 0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x0 } }; static const u8 Unk_ov108_022436B0[][4] = { - { 0xF, 0xF, 0x28, 0x1E }, - { 0x23, 0x14, 0x1E, 0xF }, - { 0x1E, 0x1E, 0x23, 0x5 }, - { 0x19, 0x28, 0x1E, 0x5 }, - { 0xA, 0x4B, 0xA, 0x5 } + { 0xF, 0xF, 0x28, 0x1E }, + { 0x23, 0x14, 0x1E, 0xF }, + { 0x1E, 0x1E, 0x23, 0x5 }, + { 0x19, 0x28, 0x1E, 0x5 }, + { 0xA, 0x4B, 0xA, 0x5 } }; static const u8 Unk_ov108_0224367C[] = { - 0x15, - 0x10, - 0xA, - 0x5 + 0x15, + 0x10, + 0xA, + 0x5 }; - struct UnkStruct_ov108_02241DB0_t { - OverlayManager * unk_00; - UnkStruct_0203068C * unk_04; + OverlayManager *unk_00; + UnkStruct_0203068C *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; @@ -183,9 +178,9 @@ struct UnkStruct_ov108_02241DB0_t { u8 unk_15; u16 unk_16; int unk_18; - u8 * unk_1C; - u8 * unk_20; - u16 * unk_24; + u8 *unk_1C; + u8 *unk_20; + u16 *unk_24; u16 unk_28; u16 unk_2A; u8 unk_2C; @@ -197,35 +192,35 @@ struct UnkStruct_ov108_02241DB0_t { u8 unk_34[16]; u8 unk_44[32]; u8 unk_64; - MessageLoader * unk_68; - StringTemplate * unk_6C; - Strbuf* unk_70; - Strbuf* unk_74; - Strbuf* unk_78[2]; + MessageLoader *unk_68; + StringTemplate *unk_6C; + Strbuf *unk_70; + Strbuf *unk_74; + Strbuf *unk_78[2]; u16 unk_80[8]; - BGL * unk_90; + BGL *unk_90; Window unk_94[2]; UnkStruct_02081CF4 unk_B4; - UIControlData * unk_C0; + UIControlData *unk_C0; ResourceMetadata unk_C4[2]; - PaletteData * unk_D4; - Options * unk_D8; - SaveData * unk_DC; - UnkStruct_020304A0 * unk_E0; - UnkStruct_020305B8 * unk_E4; + PaletteData *unk_D4; + Options *unk_D8; + SaveData *unk_DC; + UnkStruct_020304A0 *unk_E0; + UnkStruct_020305B8 *unk_E4; UnkStruct_ov108_02243030 unk_E8; - UnkStruct_ov108_02243594 * unk_338; - UnkStruct_ov108_02243594 * unk_33C[16]; - UnkStruct_ov108_02243594 * unk_37C[4]; - UnkStruct_ov108_02243594 * unk_38C[4]; - UnkStruct_ov108_02243594 * unk_39C[4]; - UnkStruct_ov108_02243594 * unk_3AC[4]; - UnkStruct_ov108_02243594 * unk_3BC; - int * unk_3C0; - u16 * unk_3C4; - Party * unk_3C8; - Party * unk_3CC; - NARC * unk_3D0; + UnkStruct_ov108_02243594 *unk_338; + UnkStruct_ov108_02243594 *unk_33C[16]; + UnkStruct_ov108_02243594 *unk_37C[4]; + UnkStruct_ov108_02243594 *unk_38C[4]; + UnkStruct_ov108_02243594 *unk_39C[4]; + UnkStruct_ov108_02243594 *unk_3AC[4]; + UnkStruct_ov108_02243594 *unk_3BC; + int *unk_3C0; + u16 *unk_3C4; + Party *unk_3C8; + Party *unk_3CC; + NARC *unk_3D0; u16 unk_3D4[40]; u8 unk_424; u8 unk_425; @@ -234,63 +229,63 @@ struct UnkStruct_ov108_02241DB0_t { u32 unk_42C; }; -int ov108_02241AE0(OverlayManager * param0, int * param1); -int ov108_02241C38(OverlayManager * param0, int * param1); -int ov108_02241D70(OverlayManager * param0, int * param1); -static BOOL ov108_02241DB0(UnkStruct_ov108_02241DB0 * param0); -static BOOL ov108_02241F28(UnkStruct_ov108_02241DB0 * param0); -static BOOL ov108_02242104(UnkStruct_ov108_02241DB0 * param0); -static BOOL ov108_02242198(UnkStruct_ov108_02241DB0 * param0); -static BOOL ov108_022421F0(UnkStruct_ov108_02241DB0 * param0); -static void ov108_02242238(UnkStruct_ov108_02241DB0 * param0); +int ov108_02241AE0(OverlayManager *param0, int *param1); +int ov108_02241C38(OverlayManager *param0, int *param1); +int ov108_02241D70(OverlayManager *param0, int *param1); +static BOOL ov108_02241DB0(UnkStruct_ov108_02241DB0 *param0); +static BOOL ov108_02241F28(UnkStruct_ov108_02241DB0 *param0); +static BOOL ov108_02242104(UnkStruct_ov108_02241DB0 *param0); +static BOOL ov108_02242198(UnkStruct_ov108_02241DB0 *param0); +static BOOL ov108_022421F0(UnkStruct_ov108_02241DB0 *param0); +static void ov108_02242238(UnkStruct_ov108_02241DB0 *param0); static void ov108_02242344(void); -static void ov108_0224237C(UnkStruct_ov108_02241DB0 * param0); -static void ov108_022426B0(UnkStruct_ov108_02241DB0 * param0); -static void ov108_02242658(UnkStruct_ov108_02241DB0 * param0); -static void ov108_022426D4(BGL * param0); -static void ov108_02242708(void * param0); +static void ov108_0224237C(UnkStruct_ov108_02241DB0 *param0); +static void ov108_022426B0(UnkStruct_ov108_02241DB0 *param0); +static void ov108_02242658(UnkStruct_ov108_02241DB0 *param0); +static void ov108_022426D4(BGL *param0); +static void ov108_02242708(void *param0); static void ov108_02242740(void); -static void ov108_02242760(BGL * param0); -static void ov108_02242828(UnkStruct_ov108_02241DB0 * param0, u32 param1); -static void ov108_02242884(UnkStruct_ov108_02241DB0 * param0, u32 param1); +static void ov108_02242760(BGL *param0); +static void ov108_02242828(UnkStruct_ov108_02241DB0 *param0, u32 param1); +static void ov108_02242884(UnkStruct_ov108_02241DB0 *param0, u32 param1); static void ov108_022428C0(void); -static void ov108_022428F4(UnkStruct_ov108_02241DB0 * param0, u32 param1); -static void ov108_0224295C(UnkStruct_ov108_02241DB0 * param0, int * param1, int param2); -static void ov108_02242964(UnkStruct_ov108_02241DB0 * param0, int param1); -static void ov108_022429C8(UnkStruct_ov108_02241DB0 * param0, u8 param1); -static void ov108_022429FC(UnkStruct_ov108_02241DB0 * param0); +static void ov108_022428F4(UnkStruct_ov108_02241DB0 *param0, u32 param1); +static void ov108_0224295C(UnkStruct_ov108_02241DB0 *param0, int *param1, int param2); +static void ov108_02242964(UnkStruct_ov108_02241DB0 *param0, int param1); +static void ov108_022429C8(UnkStruct_ov108_02241DB0 *param0, u8 param1); +static void ov108_022429FC(UnkStruct_ov108_02241DB0 *param0); static u8 ov108_02242A04(u8 param0, u8 param1); -static u16 ov108_02242A14(UnkStruct_ov108_02241DB0 * param0); -BOOL ov108_02242A38(UnkStruct_ov108_02241DB0 * param0, u16 param1, u16 param2); -void ov108_02242A7C(UnkStruct_ov108_02241DB0 * param0, u16 param1); -void ov108_02242AB0(int param0, int param1, void * param2, void * param3); -void ov108_02242AE8(UnkStruct_ov108_02241DB0 * param0, u16 param1, u16 param2); -void ov108_02242B24(int param0, int param1, void * param2, void * param3); -void ov108_02242B74(UnkStruct_ov108_02241DB0 * param0, u16 param1); -void ov108_02242B84(int param0, int param1, void * param2, void * param3); -static void ov108_02242BA0(UnkStruct_ov108_02241DB0 * param0, u8 param1); -static u8 ov108_02242EF4(UnkStruct_ov108_02241DB0 * param0, u8 param1); -static void ov108_02242BF0(UnkStruct_ov108_02241DB0 * param0); -static void ov108_02242D5C(UnkStruct_ov108_02241DB0 * param0); -static void ov108_02242E10(UnkStruct_ov108_02241DB0 * param0); -static void ov108_02242F38(UnkStruct_ov108_02241DB0 * param0); -static BOOL ov108_02242FE8(UnkStruct_ov108_02241DB0 * param0); -static void ov108_02243008(UnkStruct_ov108_02241DB0 * param0); -static u16 ov108_02242B1C(UnkStruct_ov108_02241DB0 * param0); +static u16 ov108_02242A14(UnkStruct_ov108_02241DB0 *param0); +BOOL ov108_02242A38(UnkStruct_ov108_02241DB0 *param0, u16 param1, u16 param2); +void ov108_02242A7C(UnkStruct_ov108_02241DB0 *param0, u16 param1); +void ov108_02242AB0(int param0, int param1, void *param2, void *param3); +void ov108_02242AE8(UnkStruct_ov108_02241DB0 *param0, u16 param1, u16 param2); +void ov108_02242B24(int param0, int param1, void *param2, void *param3); +void ov108_02242B74(UnkStruct_ov108_02241DB0 *param0, u16 param1); +void ov108_02242B84(int param0, int param1, void *param2, void *param3); +static void ov108_02242BA0(UnkStruct_ov108_02241DB0 *param0, u8 param1); +static u8 ov108_02242EF4(UnkStruct_ov108_02241DB0 *param0, u8 param1); +static void ov108_02242BF0(UnkStruct_ov108_02241DB0 *param0); +static void ov108_02242D5C(UnkStruct_ov108_02241DB0 *param0); +static void ov108_02242E10(UnkStruct_ov108_02241DB0 *param0); +static void ov108_02242F38(UnkStruct_ov108_02241DB0 *param0); +static BOOL ov108_02242FE8(UnkStruct_ov108_02241DB0 *param0); +static void ov108_02243008(UnkStruct_ov108_02241DB0 *param0); +static u16 ov108_02242B1C(UnkStruct_ov108_02241DB0 *param0); static u8 Unk_ov108_022437A0; static u8 Unk_ov108_022437A1; static const TouchScreenHitTable Unk_ov108_02243687[] = { - {0xfe, 0x80, 0x60, 0x20}, - {0xff, 0x0, 0x0, 0x0} + { 0xfe, 0x80, 0x60, 0x20 }, + { 0xff, 0x0, 0x0, 0x0 } }; -int ov108_02241AE0 (OverlayManager * param0, int * param1) +int ov108_02241AE0(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov108_02241DB0 * v1; - UnkStruct_ov104_02238240 * v2; + UnkStruct_ov108_02241DB0 *v1; + UnkStruct_ov104_02238240 *v2; Overlay_LoadByID(FS_OVERLAY_ID(overlay104), 2); ov108_02242344(); @@ -352,9 +347,9 @@ int ov108_02241AE0 (OverlayManager * param0, int * param1) return 1; } -int ov108_02241C38 (OverlayManager * param0, int * param1) +int ov108_02241C38(OverlayManager *param0, int *param1) { - UnkStruct_ov108_02241DB0 * v0 = OverlayManager_Data(param0); + UnkStruct_ov108_02241DB0 *v0 = OverlayManager_Data(param0); if (v0->unk_0E != 0xff) { switch (*param1) { @@ -414,10 +409,10 @@ int ov108_02241C38 (OverlayManager * param0, int * param1) return 0; } -int ov108_02241D70 (OverlayManager * param0, int * param1) +int ov108_02241D70(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov108_02241DB0 * v1 = OverlayManager_Data(param0); + UnkStruct_ov108_02241DB0 *v1 = OverlayManager_Data(param0); *(v1->unk_3C4) = v1->unk_0D; @@ -431,7 +426,7 @@ int ov108_02241D70 (OverlayManager * param0, int * param1) return 1; } -static BOOL ov108_02241DB0 (UnkStruct_ov108_02241DB0 * param0) +static BOOL ov108_02241DB0(UnkStruct_ov108_02241DB0 *param0) { switch (param0->unk_08) { case 0: @@ -515,7 +510,7 @@ static BOOL ov108_02241DB0 (UnkStruct_ov108_02241DB0 * param0) return 0; } -static BOOL ov108_02241F28 (UnkStruct_ov108_02241DB0 * param0) +static BOOL ov108_02241F28(UnkStruct_ov108_02241DB0 *param0) { u16 v0, v1; u16 v2; @@ -647,7 +642,7 @@ static BOOL ov108_02241F28 (UnkStruct_ov108_02241DB0 * param0) return 0; } -static BOOL ov108_02242104 (UnkStruct_ov108_02241DB0 * param0) +static BOOL ov108_02242104(UnkStruct_ov108_02241DB0 *param0) { switch (param0->unk_08) { case 0: @@ -686,7 +681,7 @@ static BOOL ov108_02242104 (UnkStruct_ov108_02241DB0 * param0) return 0; } -static BOOL ov108_02242198 (UnkStruct_ov108_02241DB0 * param0) +static BOOL ov108_02242198(UnkStruct_ov108_02241DB0 *param0) { switch (param0->unk_08) { case 0: @@ -715,7 +710,7 @@ static BOOL ov108_02242198 (UnkStruct_ov108_02241DB0 * param0) return 0; } -static BOOL ov108_022421F0 (UnkStruct_ov108_02241DB0 * param0) +static BOOL ov108_022421F0(UnkStruct_ov108_02241DB0 *param0) { int v0; @@ -734,7 +729,7 @@ static BOOL ov108_022421F0 (UnkStruct_ov108_02241DB0 * param0) return 0; } -static void ov108_02242238 (UnkStruct_ov108_02241DB0 * param0) +static void ov108_02242238(UnkStruct_ov108_02241DB0 *param0) { u8 v0; int v1; @@ -797,7 +792,7 @@ static void ov108_02242238 (UnkStruct_ov108_02241DB0 * param0) return; } -static void ov108_02242344 (void) +static void ov108_02242344(void) { SetMainCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); @@ -811,13 +806,13 @@ static void ov108_02242344 (void) return; } -static void ov108_0224237C (UnkStruct_ov108_02241DB0 * param0) +static void ov108_0224237C(UnkStruct_ov108_02241DB0 *param0) { u8 v0; u16 v1, v2, v3, v4; int v5, v6; - Window * v7; - Pokemon * v8; + Window *v7; + Pokemon *v8; param0->unk_3D0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_BG, 103); @@ -881,7 +876,7 @@ static void ov108_0224237C (UnkStruct_ov108_02241DB0 * param0) return; } -static void ov108_02242658 (UnkStruct_ov108_02241DB0 * param0) +static void ov108_02242658(UnkStruct_ov108_02241DB0 *param0) { ov108_02242740(); ov108_02242760(param0->unk_90); @@ -898,13 +893,13 @@ static void ov108_02242658 (UnkStruct_ov108_02241DB0 * param0) return; } -static void ov108_022426B0 (UnkStruct_ov108_02241DB0 * param0) +static void ov108_022426B0(UnkStruct_ov108_02241DB0 *param0) { ov108_02243030(¶m0->unk_E8, param0->unk_3C8, param0->unk_3CC, ov104_0223C000(param0->unk_09)); return; } -static void ov108_022426D4 (BGL * param0) +static void ov108_022426D4(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); @@ -917,9 +912,9 @@ static void ov108_022426D4 (BGL * param0) return; } -static void ov108_02242708 (void * param0) +static void ov108_02242708(void *param0) { - UnkStruct_ov108_02241DB0 * v0 = param0; + UnkStruct_ov108_02241DB0 *v0 = param0; if (v0->unk_D4 != NULL) { sub_02003694(v0->unk_D4); @@ -932,7 +927,7 @@ static void ov108_02242708 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov108_02242740 (void) +static void ov108_02242740(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_C, @@ -951,7 +946,7 @@ static void ov108_02242740 (void) return; } -static void ov108_02242760 (BGL * param0) +static void ov108_02242760(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1034,7 +1029,7 @@ static void ov108_02242760 (BGL * param0) return; } -static void ov108_02242828 (UnkStruct_ov108_02241DB0 * param0, u32 param1) +static void ov108_02242828(UnkStruct_ov108_02241DB0 *param0, u32 param1) { u32 v0; @@ -1050,7 +1045,7 @@ static void ov108_02242828 (UnkStruct_ov108_02241DB0 * param0, u32 param1) return; } -static void ov108_02242884 (UnkStruct_ov108_02241DB0 * param0, u32 param1) +static void ov108_02242884(UnkStruct_ov108_02241DB0 *param0, u32 param1) { u32 v0; @@ -1064,10 +1059,10 @@ static void ov108_02242884 (UnkStruct_ov108_02241DB0 * param0, u32 param1) return; } -static void ov108_022428C0 (void) +static void ov108_022428C0(void) { - void * v0; - NNSG2dPaletteData * v1; + void *v0; + NNSG2dPaletteData *v1; v0 = sub_02006F88(150, 167, &v1, 103); @@ -1078,7 +1073,7 @@ static void ov108_022428C0 (void) return; } -static void ov108_022428F4 (UnkStruct_ov108_02241DB0 * param0, u32 param1) +static void ov108_022428F4(UnkStruct_ov108_02241DB0 *param0, u32 param1) { sub_020070E8(param0->unk_3D0, 122, param0->unk_90, param1, 0, 0, 1, 103); sub_02007130(param0->unk_3D0, 168, 4, 0, (sizeof(u16) * 16 * 2), 103); @@ -1087,14 +1082,14 @@ static void ov108_022428F4 (UnkStruct_ov108_02241DB0 * param0, u32 param1) return; } -static void ov108_0224295C (UnkStruct_ov108_02241DB0 * param0, int * param1, int param2) +static void ov108_0224295C(UnkStruct_ov108_02241DB0 *param0, int *param1, int param2) { param0->unk_08 = 0; *param1 = param2; return; } -static void ov108_02242964 (UnkStruct_ov108_02241DB0 * param0, int param1) +static void ov108_02242964(UnkStruct_ov108_02241DB0 *param0, int param1) { u8 v0; @@ -1122,19 +1117,19 @@ static void ov108_02242964 (UnkStruct_ov108_02241DB0 * param0, int param1) return; } -static void ov108_022429C8 (UnkStruct_ov108_02241DB0 * param0, u8 param1) +static void ov108_022429C8(UnkStruct_ov108_02241DB0 *param0, u8 param1) { ov108_022435B4(param0->unk_338, 68 + (40 * (param1 % 4)), 36 + (40 * (param1 / 4))); return; } -static void ov108_022429FC (UnkStruct_ov108_02241DB0 * param0) +static void ov108_022429FC(UnkStruct_ov108_02241DB0 *param0) { param0->unk_14 = param0->unk_0D; return; } -static u8 ov108_02242A04 (u8 param0, u8 param1) +static u8 ov108_02242A04(u8 param0, u8 param1) { if (param1 < param0) { return param1; @@ -1143,7 +1138,7 @@ static u8 ov108_02242A04 (u8 param0, u8 param1) return param1 - param0; } -static u16 ov108_02242A14 (UnkStruct_ov108_02241DB0 * param0) +static u16 ov108_02242A14(UnkStruct_ov108_02241DB0 *param0) { u16 v0; @@ -1158,7 +1153,7 @@ static u16 ov108_02242A14 (UnkStruct_ov108_02241DB0 * param0) return v0; } -BOOL ov108_02242A38 (UnkStruct_ov108_02241DB0 * param0, u16 param1, u16 param2) +BOOL ov108_02242A38(UnkStruct_ov108_02241DB0 *param0, u16 param1, u16 param2) { int v0, v1; @@ -1186,10 +1181,10 @@ BOOL ov108_02242A38 (UnkStruct_ov108_02241DB0 * param0, u16 param1, u16 param2) return v0; } -void ov108_02242A7C (UnkStruct_ov108_02241DB0 * param0, u16 param1) +void ov108_02242A7C(UnkStruct_ov108_02241DB0 *param0, u16 param1) { int v0, v1; - TrainerInfo * v2; + TrainerInfo *v2; v1 = 0; v2 = SaveData_GetTrainerInfo(param0->unk_DC); @@ -1210,11 +1205,11 @@ void ov108_02242A7C (UnkStruct_ov108_02241DB0 * param0, u16 param1) return; } -void ov108_02242AB0 (int param0, int param1, void * param2, void * param3) +void ov108_02242AB0(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov108_02241DB0 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov108_02241DB0 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_0F++; @@ -1243,7 +1238,7 @@ void ov108_02242AB0 (int param0, int param1, void * param2, void * param3) return; } -void ov108_02242AE8 (UnkStruct_ov108_02241DB0 * param0, u16 param1, u16 param2) +void ov108_02242AE8(UnkStruct_ov108_02241DB0 *param0, u16 param1, u16 param2) { u8 v0; @@ -1262,16 +1257,16 @@ void ov108_02242AE8 (UnkStruct_ov108_02241DB0 * param0, u16 param1, u16 param2) return; } -static u16 ov108_02242B1C (UnkStruct_ov108_02241DB0 * param0) +static u16 ov108_02242B1C(UnkStruct_ov108_02241DB0 *param0) { return LCRNG_Next(); } -void ov108_02242B24 (int param0, int param1, void * param2, void * param3) +void ov108_02242B24(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_ov108_02241DB0 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_ov108_02241DB0 *v2 = param3; + const u16 *v3 = param2; v1 = 0; v2->unk_0F++; @@ -1297,7 +1292,7 @@ void ov108_02242B24 (int param0, int param1, void * param2, void * param3) return; } -void ov108_02242B74 (UnkStruct_ov108_02241DB0 * param0, u16 param1) +void ov108_02242B74(UnkStruct_ov108_02241DB0 *param0, u16 param1) { param0->unk_3D4[0] = param1; @@ -1310,10 +1305,10 @@ void ov108_02242B74 (UnkStruct_ov108_02241DB0 * param0, u16 param1) return; } -void ov108_02242B84 (int param0, int param1, void * param2, void * param3) +void ov108_02242B84(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov108_02241DB0 * v0 = param3; - const u16 * v1 = param2; + UnkStruct_ov108_02241DB0 *v0 = param3; + const u16 *v1 = param2; if (CommSys_CurNetId() == param0) { return; @@ -1323,7 +1318,7 @@ void ov108_02242B84 (int param0, int param1, void * param2, void * param3) return; } -static void ov108_02242BA0 (UnkStruct_ov108_02241DB0 * param0, u8 param1) +static void ov108_02242BA0(UnkStruct_ov108_02241DB0 *param0, u8 param1) { int v0; u8 v1, v2, v3, v4; @@ -1347,7 +1342,7 @@ static void ov108_02242BA0 (UnkStruct_ov108_02241DB0 * param0, u8 param1) return; } -static void ov108_02242BF0 (UnkStruct_ov108_02241DB0 * param0) +static void ov108_02242BF0(UnkStruct_ov108_02241DB0 *param0) { int v0, v1, v2; u16 v3, v4, v5; @@ -1455,7 +1450,7 @@ static void ov108_02242BF0 (UnkStruct_ov108_02241DB0 * param0) return; } -static void ov108_02242D5C (UnkStruct_ov108_02241DB0 * param0) +static void ov108_02242D5C(UnkStruct_ov108_02241DB0 *param0) { int v0, v1; @@ -1486,7 +1481,7 @@ static void ov108_02242D5C (UnkStruct_ov108_02241DB0 * param0) return; } -static void ov108_02242E10 (UnkStruct_ov108_02241DB0 * param0) +static void ov108_02242E10(UnkStruct_ov108_02241DB0 *param0) { int v0, v1, v2, v3; u16 v4, v5; @@ -1552,7 +1547,7 @@ static void ov108_02242E10 (UnkStruct_ov108_02241DB0 * param0) return; } -static u8 ov108_02242EF4 (UnkStruct_ov108_02241DB0 * param0, u8 param1) +static u8 ov108_02242EF4(UnkStruct_ov108_02241DB0 *param0, u8 param1) { u8 v0, v1; u16 v2; @@ -1576,10 +1571,10 @@ static u8 ov108_02242EF4 (UnkStruct_ov108_02241DB0 * param0, u8 param1) return v1; } -static void ov108_02242F38 (UnkStruct_ov108_02241DB0 * param0) +static void ov108_02242F38(UnkStruct_ov108_02241DB0 *param0) { u8 v0, v1, v2; - Pokemon * v3; + Pokemon *v3; v0 = ov104_0223BD70(param0->unk_09, 1); v1 = ov104_0223BDA4(param0->unk_09, 1); @@ -1607,7 +1602,7 @@ static void ov108_02242F38 (UnkStruct_ov108_02241DB0 * param0) return; } -static BOOL ov108_02242FE8 (UnkStruct_ov108_02241DB0 * param0) +static BOOL ov108_02242FE8(UnkStruct_ov108_02241DB0 *param0) { int v0 = sub_020226DC(Unk_ov108_02243687); @@ -1619,7 +1614,7 @@ static BOOL ov108_02242FE8 (UnkStruct_ov108_02241DB0 * param0) return 0; } -static void ov108_02243008 (UnkStruct_ov108_02241DB0 * param0) +static void ov108_02243008(UnkStruct_ov108_02241DB0 *param0) { sub_020057A4(1500, 0); Sound_PlayEffect(1508); diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c index 8d7ea7a0cc..c3dac2a58b 100644 --- a/src/overlay108/ov108_02243030.c +++ b/src/overlay108/ov108_02243030.c @@ -1,9 +1,10 @@ +#include "overlay108/ov108_02243030.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" #include "overlay019/struct_ov19_021DA864.h" @@ -11,7 +12,11 @@ #include "overlay108/struct_ov108_02243030.h" #include "overlay115/struct_ov115_02261520.h" +#include "gx_layers.h" #include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_icon.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" @@ -19,27 +24,26 @@ #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "pokemon_icon.h" -#include "party.h" #include "unk_0207E0B8.h" -#include "overlay108/ov108_02243030.h" static const u8 Unk_ov108_02243760[4] = { - 11, 11, 11, 11, + 11, + 11, + 11, + 11, }; -void ov108_02243030(UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3); -GraphicElementData * ov108_022430F0(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7); -void ov108_02243194(UnkStruct_ov108_02243030 * param0); +void ov108_02243030(UnkStruct_ov108_02243030 *param0, Party *param1, Party *param2, u8 param3); +GraphicElementData *ov108_022430F0(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7); +void ov108_02243194(UnkStruct_ov108_02243030 *param0); static void ov108_022431FC(void); -static void ov108_02243230(UnkStruct_ov108_02243030 * param0); -static void ov108_022432B4(UnkStruct_ov108_02243030 * param0); -static void ov108_02243360(UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3); -static void ov108_02243490(UnkStruct_ov108_02243030 * param0); +static void ov108_02243230(UnkStruct_ov108_02243030 *param0); +static void ov108_022432B4(UnkStruct_ov108_02243030 *param0); +static void ov108_02243360(UnkStruct_ov108_02243030 *param0, Party *param1, Party *param2, u8 param3); +static void ov108_02243490(UnkStruct_ov108_02243030 *param0); -void ov108_02243030 (UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3) +void ov108_02243030(UnkStruct_ov108_02243030 *param0, Party *param1, Party *param2, u8 param3) { int v0; @@ -74,11 +78,11 @@ void ov108_02243030 (UnkStruct_ov108_02243030 * param0, Party * param1, Party * return; } -GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7) +GraphicElementData *ov108_022430F0(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7) { int v0; UnkStruct_ov19_021DA864 v1; - GraphicElementData * v2; + GraphicElementData *v2; sub_020093B4(&v1, param1, param2, param3, param3, 0xffffffff, 0xffffffff, 0, param6, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL); @@ -114,7 +118,7 @@ GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 para return v2; } -void ov108_02243194 (UnkStruct_ov108_02243030 * param0) +void ov108_02243194(UnkStruct_ov108_02243030 *param0) { u8 v0; @@ -138,7 +142,7 @@ void ov108_02243194 (UnkStruct_ov108_02243030 * param0) return; } -static void ov108_022431FC (void) +static void ov108_022431FC(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -155,7 +159,7 @@ static void ov108_022431FC (void) return; } -static void ov108_02243230 (UnkStruct_ov108_02243030 * param0) +static void ov108_02243230(UnkStruct_ov108_02243030 *param0) { param0->unk_1A0[1][0] = sub_0200985C(param0->unk_190[0], 151, 18, 1, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 103); param0->unk_1A0[1][1] = sub_020098B8(param0->unk_190[1], 151, 40, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 8, 103); @@ -165,9 +169,9 @@ static void ov108_02243230 (UnkStruct_ov108_02243030 * param0) return; } -static void ov108_022432B4 (UnkStruct_ov108_02243030 * param0) +static void ov108_022432B4(UnkStruct_ov108_02243030 *param0) { - NARC * v0; + NARC *v0; u32 v1; v0 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, 103); @@ -181,11 +185,11 @@ static void ov108_022432B4 (UnkStruct_ov108_02243030 * param0) return; } -static void ov108_02243360 (UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3) +static void ov108_02243360(UnkStruct_ov108_02243030 *param0, Party *param1, Party *param2, u8 param3) { - Pokemon * v0; - Pokemon * v1; - NARC * v2; + Pokemon *v0; + Pokemon *v1; + NARC *v2; u32 v3; v2 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 103); @@ -216,7 +220,7 @@ static void ov108_02243360 (UnkStruct_ov108_02243030 * param0, Party * param1, P return; } -static void ov108_02243490 (UnkStruct_ov108_02243030 * param0) +static void ov108_02243490(UnkStruct_ov108_02243030 *param0) { param0->unk_1A0[0][0] = sub_0200985C(param0->unk_190[0], 151, 21, 1, 0, NNS_G2D_VRAM_TYPE_2DSUB, 103); param0->unk_1A0[0][1] = sub_020098B8(param0->unk_190[1], 151, 41, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 2, 103); diff --git a/src/overlay108/ov108_0224351C.c b/src/overlay108/ov108_0224351C.c index 8456eb474e..b6bb76242c 100644 --- a/src/overlay108/ov108_0224351C.c +++ b/src/overlay108/ov108_0224351C.c @@ -1,17 +1,18 @@ +#include "overlay108/ov108_0224351C.h" + #include #include #include "struct_decls/struct_02022550_decl.h" -#include "pokemon.h" -#include "overlay108/struct_ov108_02243594_decl.h" +#include "overlay108/ov108_02243030.h" #include "overlay108/struct_ov108_02243030.h" +#include "overlay108/struct_ov108_02243594_decl.h" #include "heap.h" -#include "unk_020218BC.h" +#include "pokemon.h" #include "pokemon_icon.h" -#include "overlay108/ov108_02243030.h" -#include "overlay108/ov108_0224351C.h" +#include "unk_020218BC.h" struct UnkStruct_ov108_02243594_t { u32 unk_00; @@ -21,20 +22,20 @@ struct UnkStruct_ov108_02243594_t { u8 unk_0B; u16 unk_0C; u16 unk_0E; - GraphicElementData * unk_10; + GraphicElementData *unk_10; }; -UnkStruct_ov108_02243594 * ov108_0224351C(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u16 param5, u16 param6, u32 param7, int param8, u8 param9); -void * ov108_02243594(UnkStruct_ov108_02243594 * param0); -void ov108_022435A8(UnkStruct_ov108_02243594 * param0, int param1); -void ov108_022435B4(UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2); -void ov108_022435F4(UnkStruct_ov108_02243594 * param0, u32 param1); -void ov108_02243610(UnkStruct_ov108_02243594 * param0, Pokemon * param1); -void ov108_02243624(UnkStruct_ov108_02243594 * param0, u8 param1); +UnkStruct_ov108_02243594 *ov108_0224351C(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u16 param5, u16 param6, u32 param7, int param8, u8 param9); +void *ov108_02243594(UnkStruct_ov108_02243594 *param0); +void ov108_022435A8(UnkStruct_ov108_02243594 *param0, int param1); +void ov108_022435B4(UnkStruct_ov108_02243594 *param0, u16 param1, u16 param2); +void ov108_022435F4(UnkStruct_ov108_02243594 *param0, u32 param1); +void ov108_02243610(UnkStruct_ov108_02243594 *param0, Pokemon *param1); +void ov108_02243624(UnkStruct_ov108_02243594 *param0, u8 param1); -UnkStruct_ov108_02243594 * ov108_0224351C (UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u16 param5, u16 param6, u32 param7, int param8, u8 param9) +UnkStruct_ov108_02243594 *ov108_0224351C(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u16 param5, u16 param6, u32 param7, int param8, u8 param9) { - UnkStruct_ov108_02243594 * v0; + UnkStruct_ov108_02243594 *v0; VecFx32 v1; v0 = Heap_AllocFromHeap(103, sizeof(UnkStruct_ov108_02243594)); @@ -57,7 +58,7 @@ UnkStruct_ov108_02243594 * ov108_0224351C (UnkStruct_ov108_02243030 * param0, u3 return v0; } -void * ov108_02243594 (UnkStruct_ov108_02243594 * param0) +void *ov108_02243594(UnkStruct_ov108_02243594 *param0) { sub_02021BD4(param0->unk_10); Heap_FreeToHeap(param0); @@ -65,13 +66,13 @@ void * ov108_02243594 (UnkStruct_ov108_02243594 * param0) return NULL; } -void ov108_022435A8 (UnkStruct_ov108_02243594 * param0, int param1) +void ov108_022435A8(UnkStruct_ov108_02243594 *param0, int param1) { sub_02021CAC(param0->unk_10, param1); return; } -void ov108_022435B4 (UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2) +void ov108_022435B4(UnkStruct_ov108_02243594 *param0, u16 param1, u16 param2) { VecFx32 v0; @@ -88,7 +89,7 @@ void ov108_022435B4 (UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2) return; } -void ov108_022435F4 (UnkStruct_ov108_02243594 * param0, u32 param1) +void ov108_022435F4(UnkStruct_ov108_02243594 *param0, u32 param1) { sub_02021CE4(param0->unk_10, FX32_ONE); sub_02021DCC(param0->unk_10, param1); @@ -96,25 +97,25 @@ void ov108_022435F4 (UnkStruct_ov108_02243594 * param0, u32 param1) return; } -void ov108_02243610 (UnkStruct_ov108_02243594 * param0, Pokemon * param1) +void ov108_02243610(UnkStruct_ov108_02243594 *param0, Pokemon *param1) { sub_02021F24(param0->unk_10, Pokemon_IconPaletteIndex(param1)); return; } static const VecFx32 Unk_ov111_021D3834[] = { - {FX32_ONE, FX32_ONE, FX32_ONE}, - {FX32_ONE + (FX32_ONE / 2), FX32_ONE + (FX32_ONE / 2), FX32_ONE + (FX32_ONE / 2)}, - {FX32_ONE + (FX32_ONE / 4), FX32_ONE + (FX32_ONE / 4), FX32_ONE + (FX32_ONE / 4)}, - {FX32_ONE + (FX32_ONE / 5), FX32_ONE + (FX32_ONE / 5), FX32_ONE + (FX32_ONE / 5)}, - {FX32_ONE + (FX32_ONE / 7), FX32_ONE + (FX32_ONE / 7), FX32_ONE + (FX32_ONE / 7)}, - {FX32_ONE - (FX32_ONE / 2), FX32_ONE - (FX32_ONE / 2), FX32_ONE - (FX32_ONE / 2)}, - {FX32_ONE - (FX32_ONE / 4), FX32_ONE - (FX32_ONE / 4), FX32_ONE - (FX32_ONE / 4)}, - {FX32_ONE - (FX32_ONE / 5), FX32_ONE - (FX32_ONE / 5), FX32_ONE - (FX32_ONE / 5)}, - {FX32_ONE - (FX32_ONE / 7), FX32_ONE - (FX32_ONE / 7), FX32_ONE - (FX32_ONE / 7)} + { FX32_ONE, FX32_ONE, FX32_ONE }, + { FX32_ONE + (FX32_ONE / 2), FX32_ONE + (FX32_ONE / 2), FX32_ONE + (FX32_ONE / 2) }, + { FX32_ONE + (FX32_ONE / 4), FX32_ONE + (FX32_ONE / 4), FX32_ONE + (FX32_ONE / 4) }, + { FX32_ONE + (FX32_ONE / 5), FX32_ONE + (FX32_ONE / 5), FX32_ONE + (FX32_ONE / 5) }, + { FX32_ONE + (FX32_ONE / 7), FX32_ONE + (FX32_ONE / 7), FX32_ONE + (FX32_ONE / 7) }, + { FX32_ONE - (FX32_ONE / 2), FX32_ONE - (FX32_ONE / 2), FX32_ONE - (FX32_ONE / 2) }, + { FX32_ONE - (FX32_ONE / 4), FX32_ONE - (FX32_ONE / 4), FX32_ONE - (FX32_ONE / 4) }, + { FX32_ONE - (FX32_ONE / 5), FX32_ONE - (FX32_ONE / 5), FX32_ONE - (FX32_ONE / 5) }, + { FX32_ONE - (FX32_ONE / 7), FX32_ONE - (FX32_ONE / 7), FX32_ONE - (FX32_ONE / 7) } }; -void ov108_02243624 (UnkStruct_ov108_02243594 * param0, u8 param1) +void ov108_02243624(UnkStruct_ov108_02243594 *param0, u8 param1) { sub_02021CC8(param0->unk_10, param1); return; diff --git a/src/overlay108/ov108_02243630.c b/src/overlay108/ov108_02243630.c index 9c3d5662d8..dae45dfdba 100644 --- a/src/overlay108/ov108_02243630.c +++ b/src/overlay108/ov108_02243630.c @@ -1,26 +1,27 @@ +#include "overlay108/ov108_02243630.h" + #include #include #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay061/struct_ov61_0222C884.h" #include "unk_02018340.h" -#include "overlay108/ov108_02243630.h" -void ov108_02243630(BGL * param0, Window * param1); -void ov108_02243660(Window * param0); +void ov108_02243630(BGL *param0, Window *param1); +void ov108_02243660(Window *param0); static const UnkStruct_ov61_0222C884 Unk_ov108_02243774[] = { - {0x1, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1}, - {0x1, 0x18, 0xD, 0x7, 0x4, 0xD, 0x6D} + { 0x1, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1 }, + { 0x1, 0x18, 0xD, 0x7, 0x4, 0xD, 0x6D } }; -void ov108_02243630 (BGL * param0, Window * param1) +void ov108_02243630(BGL *param0, Window *param1) { u8 v0; - const UnkStruct_ov61_0222C884 * v1 = Unk_ov108_02243774; + const UnkStruct_ov61_0222C884 *v1 = Unk_ov108_02243774; for (v0 = 0; v0 < 2; v0++) { sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); @@ -30,7 +31,7 @@ void ov108_02243630 (BGL * param0, Window * param1) return; } -void ov108_02243660 (Window * param0) +void ov108_02243660(Window *param0) { u16 v0; diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index 79a2b42866..170199c6c1 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -1,16 +1,15 @@ +#include "overlay109/ov109_021D0D80.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_party_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02073838.h" @@ -20,12 +19,12 @@ #include "struct_defs/struct_0209BDF8.h" #include "struct_defs/struct_0209C0F0.h" #include "struct_defs/struct_0209C194.h" + #include "overlay005/struct_ov5_02201C58.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay072/struct_ov72_0223E2A8.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" @@ -33,46 +32,47 @@ #include "overlay109/struct_ov109_021D17EC.h" #include "overlay115/camera_angle.h" +#include "bag.h" +#include "camera.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "journal.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_020093B4.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "camera.h" -#include "strbuf.h" #include "unk_0202419C.h" -#include "trainer_info.h" -#include "journal.h" #include "unk_0202CD50.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_02038ED4.h" #include "unk_020393C8.h" #include "unk_02073838.h" -#include "pokemon.h" -#include "party.h" -#include "bag.h" #include "unk_02092494.h" #include "unk_0209BDF8.h" -#include "overlay109/ov109_021D0D80.h" typedef struct { VecFx32 unk_00; @@ -113,14 +113,14 @@ typedef struct { VecFx32 unk_0C; VecFx32 unk_18; UnkStruct_02073B50 unk_24; - UnkStruct_ov109_021D2D78 * unk_78; + UnkStruct_ov109_021D2D78 *unk_78; } UnkStruct_ov109_021D2EF4; typedef struct { int unk_00; VecFx32 unk_04; UnkStruct_02073B50 unk_10; - UnkStruct_ov109_021D2D78 * unk_64; + UnkStruct_ov109_021D2D78 *unk_64; } UnkStruct_ov109_021D2FA4; typedef struct { @@ -138,17 +138,17 @@ typedef struct { int unk_04; int unk_08; fx32 unk_0C; - UnkStruct_ov109_021D2D78 * unk_10; - UnkStruct_ov109_021D0F70 * unk_14; + UnkStruct_ov109_021D2D78 *unk_10; + UnkStruct_ov109_021D0F70 *unk_14; } UnkStruct_ov109_021D2FE0; typedef struct { int unk_00; - MessageLoader * unk_04; - StringTemplate * unk_08; + MessageLoader *unk_04; + StringTemplate *unk_08; Window unk_0C[1]; Window unk_1C[5]; - void * unk_6C; + void *unk_6C; } UnkStruct_ov109_021D24F8; typedef struct { @@ -165,7 +165,7 @@ typedef struct { u32 unk_04; VecFx32 unk_08; CameraAngle cameraAngle; - Camera * camera; + Camera *camera; } UnkStruct_ov109_021D28C4; typedef struct { @@ -177,7 +177,7 @@ typedef struct { } UnkStruct_ov109_021D294C; typedef struct { - UnkStruct_ov109_021D0F70 * unk_00; + UnkStruct_ov109_021D0F70 *unk_00; int unk_04; u32 unk_08; } UnkStruct_ov109_021D3948; @@ -189,7 +189,7 @@ typedef struct { typedef struct { int unk_00; - const UnkStruct_ov109_021D59AC * unk_04; + const UnkStruct_ov109_021D59AC *unk_04; } UnkStruct_ov109_021D5C14; typedef struct { @@ -200,7 +200,7 @@ typedef struct { fx32 unk_10; fx32 unk_14; fx32 unk_18; - UnkStruct_ov109_021D2D78 * unk_1C; + UnkStruct_ov109_021D2D78 *unk_1C; } UnkStruct_ov109_021D3110; typedef struct { @@ -212,7 +212,7 @@ typedef struct { int unk_04; int unk_08; fx32 unk_0C; - UnkStruct_ov109_021D2D78 * unk_10; + UnkStruct_ov109_021D2D78 *unk_10; } UnkStruct_ov109_021D3268; typedef struct { @@ -225,7 +225,7 @@ typedef struct { fx32 unk_08; fx32 unk_0C; fx32 unk_10; - UnkStruct_ov109_021D2D78 * unk_14; + UnkStruct_ov109_021D2D78 *unk_14; } UnkStruct_ov109_021D3370; typedef struct { @@ -250,7 +250,7 @@ typedef struct { int unk_00; int unk_04; int unk_08; - UnkStruct_ov109_021D2D78 * unk_0C; + UnkStruct_ov109_021D2D78 *unk_0C; } UnkStruct_ov109_021D3818; typedef struct { @@ -268,8 +268,8 @@ typedef struct { UnkStruct_0209C0F0 unk_2C; UnkStruct_ov109_021D17EC unk_34; UnkStruct_ov109_021D1048 unk_44[5]; - TrainerInfo * unk_58[5]; - Strbuf* unk_6C[5]; + TrainerInfo *unk_58[5]; + Strbuf *unk_6C[5]; } UnkStruct_ov109_021D0F70_sub1; typedef struct UnkStruct_ov109_021D0F70_t { @@ -282,12 +282,12 @@ typedef struct UnkStruct_ov109_021D0F70_t { int unk_18; int unk_1C; u32 unk_20; - Party * unk_24; - UnkStruct_ov109_021D2D78 * unk_28; + Party *unk_24; + UnkStruct_ov109_021D2D78 *unk_28; UnkStruct_ov109_021D0F70_sub1 unk_2C; u8 unk_AC[32]; - UnkStruct_0209C194 * unk_CC; - UnkStruct_0209BDF8 * unk_D0; + UnkStruct_0209C194 *unk_CC; + UnkStruct_0209BDF8 *unk_D0; UnkStruct_ov109_021D2AE4 unk_D4; UnkStruct_ov109_021D1334 unk_190; UnkStruct_ov109_021D31A8 unk_AB4; @@ -299,22 +299,22 @@ typedef struct UnkStruct_ov109_021D0F70_t { UnkStruct_ov109_021D24F8 unk_C9C; UnkStruct_ov109_021D28C4 unk_D0C; UnkStruct_ov109_021D294C unk_D2C; - NARC * unk_D80; - BGL * unk_D84; - NNSG2dScreenData * unk_D88; - NNSG2dCharacterData * unk_D8C; - NNSG2dPaletteData * unk_D90; - SpriteRenderer * unk_D94; - SpriteGfxHandler * unk_D98; - PaletteData * unk_D9C; + NARC *unk_D80; + BGL *unk_D84; + NNSG2dScreenData *unk_D88; + NNSG2dCharacterData *unk_D8C; + NNSG2dPaletteData *unk_D90; + SpriteRenderer *unk_D94; + SpriteGfxHandler *unk_D98; + PaletteData *unk_D9C; GXRgb unk_DA0[8]; - SysTask * unk_DB0; - SysTask * unk_DB4; - SysTask * unk_DB8; - SysTask * unk_DBC; - SysTask * unk_DC0; - SysTask * unk_DC4; - void * unk_DC8; + SysTask *unk_DB0; + SysTask *unk_DB4; + SysTask *unk_DB8; + SysTask *unk_DBC; + SysTask *unk_DC0; + SysTask *unk_DC4; + void *unk_DC8; } UnkStruct_ov109_021D0F70; typedef struct { @@ -322,126 +322,126 @@ typedef struct { int unk_04; int unk_08; int unk_0C; - UnkStruct_ov109_021D0F70 * unk_10; - CellActorData * unk_14; + UnkStruct_ov109_021D0F70 *unk_10; + CellActorData *unk_14; } UnkStruct_ov109_021D3600; -static void ov109_021D0F70(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D1C00(void * param0); -static void ov109_021D1C28(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D1C68(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D1C90(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D1CF0(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D1D10(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D1DC8(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D1E1C(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2004(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2204(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D228C(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2298(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D22A4(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D22B0(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2308(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2344(UnkStruct_ov109_021D0F70 * param0, u32 param1); -static void ov109_021D2368(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2408(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D24C0(UnkStruct_ov109_021D0F70 * param0); -static CellActorData * ov109_021D24E0(UnkStruct_ov109_021D0F70 * param0, const SpriteTemplate * param1); -static void ov109_021D24F8(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D25E8(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2634(UnkStruct_ov109_021D0F70 * param0, u32 param1); -static void ov109_021D268C(UnkStruct_ov109_021D0F70 * param0, u32 param1, const TrainerInfo * param2); -static void ov109_021D2714(UnkStruct_ov109_021D0F70 * param0, u32 param1, u32 param2); -static void ov109_021D2788(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D27AC(UnkStruct_ov109_021D0F70 * param0, int param1); -static void ov109_021D27F0(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2820(UnkStruct_ov109_021D0F70 * param0, Strbuf *param1, int param2, u32 param3); -static void ov109_021D2874(UnkStruct_ov109_021D0F70 * param0, Strbuf *param1, int param2, int param3); -static void ov109_021D28A0(UnkStruct_ov109_021D0F70 * param0, int param1); -static void ov109_021D28C4(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D293C(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D294C(UnkStruct_ov109_021D0F70 * param0); -static BOOL ov109_021D29AC(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D29CC(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2A58(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2A68(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2AC8(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2AE4(UnkStruct_ov109_021D2AE4 * param0, fx32 param1); -static void ov109_021D2AF0(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2AF8(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2B00(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2BD4(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2C0C(UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1); -static void ov109_021D2C38(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2CCC(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2D44(UnkStruct_ov109_021D0F70 * param0, fx32 param1); -static void ov109_021D2D78(UnkStruct_ov109_021D2D78 * param0, const VecFx32 * param1); -static UnkStruct_ov109_021D2D78 * ov109_021D2DF8(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D2EC0(UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1); -static void ov109_021D2EF4(UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2EF4 * param1); -static void ov109_021D2F68(UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1); -static void ov109_021D2FA4(UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2FA4 * param1); -static SysTask * ov109_021D2FE0(UnkStruct_ov109_021D0F70 * param0, int param1, int param2, int param3, int param4, int param5, UnkStruct_ov109_021D2D78 * param6); -static void ov109_021D302C(SysTask * param0, void * param1); -static void ov109_021D31A8(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D31E0(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D3218(UnkStruct_ov109_021D0F70 * param0); -static BOOL ov109_021D3248(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D32DC(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D3318(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D3328(UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1); -static void ov109_021D3414(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D3450(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D3460(UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1); -static void ov109_021D3584(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D35BC(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D35CC(UnkStruct_ov109_021D0F70 * param0); -static BOOL ov109_021D35E8(UnkStruct_ov109_021D0F70 * param0); -static BOOL ov109_021D35F4(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D379C(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D37E0(UnkStruct_ov109_021D0F70 * param0); -static BOOL ov109_021D37F0(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D37FC(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D3884(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D38BC(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D38CC(UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1); -static void ov109_021D38F8(UnkStruct_ov109_021D0F70 * param0); -static SysTask * ov109_021D3684(UnkStruct_ov109_021D0F70 * param0); -static void ov109_021D3990(UnkStruct_ov109_021D0F70 * param0, int param1); -static void ov109_021D39D4(fx32 * param0, fx32 param1); -static void ov109_021D39FC(UnkStruct_ov109_021D0F70 * param0, fx32 param1); -static BOOL ov109_021D3A14(UnkStruct_ov109_021D0F70 * param0); -static void * ov109_021D3A2C(UnkStruct_ov109_021D0F70 * param0, u32 param1, BOOL param2); -static void * ov109_021D3A94(UnkStruct_ov109_021D0F70 * param0, u32 param1); -static void * ov109_021D3AB4(UnkStruct_ov109_021D0F70 * param0); -static BOOL ov109_021D3AB8(UnkStruct_ov109_021D0F70 * param0, u16 param1); -static BOOL ov109_021D3ACC(UnkStruct_ov109_021D0F70 * param0); -static int ov109_021D3B04(UnkStruct_ov109_021D0F70 * param0); -static BOOL ov109_021D3B54(UnkStruct_ov109_021D0F70 * param0, int param1); -static void ov109_021D3B70(UnkStruct_ov109_021D0F70 * param0, int param1); -static int ov109_021D3BC4(UnkStruct_ov109_021D0F70 * param0); -static BOOL ov109_021D3C08(UnkStruct_ov109_021D0F70 * param0, fx32 param1, int param2); -static BOOL ov109_021D3C94(Party * param0); -static BOOL ov109_021D3CD8(UnkStruct_ov109_021D0F70 * param0); -static int ov109_021D3D1C(UnkStruct_ov109_021D0F70 * param0); -static BOOL ov109_021D3D3C(UnkStruct_ov109_021D0F70 * param0); +static void ov109_021D0F70(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D1C00(void *param0); +static void ov109_021D1C28(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D1C68(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D1C90(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D1CF0(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D1D10(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D1DC8(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D1E1C(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2004(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2204(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D228C(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2298(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D22A4(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D22B0(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2308(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2344(UnkStruct_ov109_021D0F70 *param0, u32 param1); +static void ov109_021D2368(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2408(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D24C0(UnkStruct_ov109_021D0F70 *param0); +static CellActorData *ov109_021D24E0(UnkStruct_ov109_021D0F70 *param0, const SpriteTemplate *param1); +static void ov109_021D24F8(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D25E8(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2634(UnkStruct_ov109_021D0F70 *param0, u32 param1); +static void ov109_021D268C(UnkStruct_ov109_021D0F70 *param0, u32 param1, const TrainerInfo *param2); +static void ov109_021D2714(UnkStruct_ov109_021D0F70 *param0, u32 param1, u32 param2); +static void ov109_021D2788(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D27AC(UnkStruct_ov109_021D0F70 *param0, int param1); +static void ov109_021D27F0(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2820(UnkStruct_ov109_021D0F70 *param0, Strbuf *param1, int param2, u32 param3); +static void ov109_021D2874(UnkStruct_ov109_021D0F70 *param0, Strbuf *param1, int param2, int param3); +static void ov109_021D28A0(UnkStruct_ov109_021D0F70 *param0, int param1); +static void ov109_021D28C4(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D293C(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D294C(UnkStruct_ov109_021D0F70 *param0); +static BOOL ov109_021D29AC(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D29CC(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2A58(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2A68(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2AC8(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2AE4(UnkStruct_ov109_021D2AE4 *param0, fx32 param1); +static void ov109_021D2AF0(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2AF8(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2B00(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2BD4(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2C0C(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1); +static void ov109_021D2C38(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2CCC(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2D44(UnkStruct_ov109_021D0F70 *param0, fx32 param1); +static void ov109_021D2D78(UnkStruct_ov109_021D2D78 *param0, const VecFx32 *param1); +static UnkStruct_ov109_021D2D78 *ov109_021D2DF8(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D2EC0(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1); +static void ov109_021D2EF4(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2EF4 *param1); +static void ov109_021D2F68(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1); +static void ov109_021D2FA4(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2FA4 *param1); +static SysTask *ov109_021D2FE0(UnkStruct_ov109_021D0F70 *param0, int param1, int param2, int param3, int param4, int param5, UnkStruct_ov109_021D2D78 *param6); +static void ov109_021D302C(SysTask *param0, void *param1); +static void ov109_021D31A8(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D31E0(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D3218(UnkStruct_ov109_021D0F70 *param0); +static BOOL ov109_021D3248(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D32DC(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D3318(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D3328(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1); +static void ov109_021D3414(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D3450(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D3460(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1); +static void ov109_021D3584(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D35BC(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D35CC(UnkStruct_ov109_021D0F70 *param0); +static BOOL ov109_021D35E8(UnkStruct_ov109_021D0F70 *param0); +static BOOL ov109_021D35F4(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D379C(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D37E0(UnkStruct_ov109_021D0F70 *param0); +static BOOL ov109_021D37F0(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D37FC(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D3884(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D38BC(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D38CC(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1); +static void ov109_021D38F8(UnkStruct_ov109_021D0F70 *param0); +static SysTask *ov109_021D3684(UnkStruct_ov109_021D0F70 *param0); +static void ov109_021D3990(UnkStruct_ov109_021D0F70 *param0, int param1); +static void ov109_021D39D4(fx32 *param0, fx32 param1); +static void ov109_021D39FC(UnkStruct_ov109_021D0F70 *param0, fx32 param1); +static BOOL ov109_021D3A14(UnkStruct_ov109_021D0F70 *param0); +static void *ov109_021D3A2C(UnkStruct_ov109_021D0F70 *param0, u32 param1, BOOL param2); +static void *ov109_021D3A94(UnkStruct_ov109_021D0F70 *param0, u32 param1); +static void *ov109_021D3AB4(UnkStruct_ov109_021D0F70 *param0); +static BOOL ov109_021D3AB8(UnkStruct_ov109_021D0F70 *param0, u16 param1); +static BOOL ov109_021D3ACC(UnkStruct_ov109_021D0F70 *param0); +static int ov109_021D3B04(UnkStruct_ov109_021D0F70 *param0); +static BOOL ov109_021D3B54(UnkStruct_ov109_021D0F70 *param0, int param1); +static void ov109_021D3B70(UnkStruct_ov109_021D0F70 *param0, int param1); +static int ov109_021D3BC4(UnkStruct_ov109_021D0F70 *param0); +static BOOL ov109_021D3C08(UnkStruct_ov109_021D0F70 *param0, fx32 param1, int param2); +static BOOL ov109_021D3C94(Party *param0); +static BOOL ov109_021D3CD8(UnkStruct_ov109_021D0F70 *param0); +static int ov109_021D3D1C(UnkStruct_ov109_021D0F70 *param0); +static BOOL ov109_021D3D3C(UnkStruct_ov109_021D0F70 *param0); static const UnkStruct_ov61_0222C884 Unk_ov109_021D59B8[1]; -static const UnkStruct_ov61_0222C884 * const Unk_ov109_021D5A68[5 + 1]; +static const UnkStruct_ov61_0222C884 *const Unk_ov109_021D5A68[5 + 1]; static const u16 Unk_ov109_021D5C44[5 + 1][5]; static const u16 Unk_ov109_021D5C80[5 + 1][5]; static const UnkStruct_ov109_021D5C14 Unk_ov109_021D5C14[5 + 1]; static const u32 Unk_ov109_021D5BE4[5 + 1][2]; static const u32 Unk_ov109_021D5A80[5 + 1]; static const fx32 Unk_ov109_021D5A98[5 + 1]; -static int(*const Unk_ov109_021D5CBC[54])(UnkStruct_ov109_021D0F70 *); -static int(*const Unk_ov109_021D59D8[3])(UnkStruct_ov109_021D2FE0 *); +static int (*const Unk_ov109_021D5CBC[54])(UnkStruct_ov109_021D0F70 *); +static int (*const Unk_ov109_021D59D8[3])(UnkStruct_ov109_021D2FE0 *); -int ov109_021D0D80 (OverlayManager * param0, int * param1) +int ov109_021D0D80(OverlayManager *param0, int *param1) { - UnkStruct_ov109_021D0F70 * v0; - UnkStruct_0209C194 * v1 = OverlayManager_Args(param0); + UnkStruct_ov109_021D0F70 *v0; + UnkStruct_0209C194 *v1 = OverlayManager_Args(param0); CommMan_SetErrorHandling(1, 1); SetMainCallback(NULL, NULL); @@ -469,10 +469,10 @@ int ov109_021D0D80 (OverlayManager * param0, int * param1) { int v2 = 0, v3 = 0; int v4 = CommSys_CurNetId(); - UnkStruct_ov109_021D2AE4 * v5 = &v0->unk_D4; + UnkStruct_ov109_021D2AE4 *v5 = &v0->unk_D4; do { - if ((v0->unk_CC->unk_0C & (1 << v2))) { + if (v0->unk_CC->unk_0C & (1 << v2)) { if (v2 == v4) { break; } @@ -499,9 +499,9 @@ int ov109_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov109_021D0EB4 (OverlayManager * param0, int * param1) +int ov109_021D0EB4(OverlayManager *param0, int *param1) { - UnkStruct_ov109_021D0F70 * v0 = OverlayManager_Data(param0); + UnkStruct_ov109_021D0F70 *v0 = OverlayManager_Data(param0); if (sub_0201E530() != 1) { GF_ASSERT(0); @@ -527,10 +527,10 @@ int ov109_021D0EB4 (OverlayManager * param0, int * param1) return 1; } -int ov109_021D0F2C (OverlayManager * param0, int * param1) +int ov109_021D0F2C(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov109_021D0F70 * v1 = OverlayManager_Data(param0); + UnkStruct_ov109_021D0F70 *v1 = OverlayManager_Data(param0); ov109_021D294C(v1); @@ -550,20 +550,20 @@ int ov109_021D0F2C (OverlayManager * param0, int * param1) return 0; } -static void ov109_021D0F70 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D0F70(UnkStruct_ov109_021D0F70 *param0) { param0->unk_2C.unk_08 = 0; param0->unk_2C.unk_10 = 0; } -static int ov109_021D0F78 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D0F78(UnkStruct_ov109_021D0F70 *param0) { ov109_021D2634(param0, 0); param0->unk_00 = 1; return 0; } -static int ov109_021D0F8C (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D0F8C(UnkStruct_ov109_021D0F70 *param0) { if (ScreenWipe_Done()) { if (CommSys_CurNetId() == 0) { @@ -578,7 +578,7 @@ static int ov109_021D0F8C (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D0FB0 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D0FB0(UnkStruct_ov109_021D0F70 *param0) { if (ov109_021D3ACC(param0)) { param0->unk_00 = 3; @@ -588,7 +588,7 @@ static int ov109_021D0FB0 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D0FC8 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D0FC8(UnkStruct_ov109_021D0F70 *param0) { u16 v0 = (1 << 0); @@ -600,7 +600,7 @@ static int ov109_021D0FC8 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D0FF8 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D0FF8(UnkStruct_ov109_021D0F70 *param0) { int v0 = ov109_021D3B04(param0) + 1; @@ -612,7 +612,7 @@ static int ov109_021D0FF8 (UnkStruct_ov109_021D0F70 * param0) return 1; } -static int ov109_021D1018 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1018(UnkStruct_ov109_021D0F70 *param0) { int v0; @@ -628,7 +628,7 @@ static int ov109_021D1018 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1048 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1048(UnkStruct_ov109_021D0F70 *param0) { int v0; UnkStruct_ov109_021D1048 v1; @@ -651,7 +651,7 @@ static int ov109_021D1048 (UnkStruct_ov109_021D0F70 * param0) u32 v4 = param0->unk_D0->unk_42; do { - if ((v4 & (1 << v2))) { + if (v4 & (1 << v2)) { if (v3 >= param0->unk_14) { v1.unk_02 = v2; v1.unk_00 = param0->unk_14; @@ -678,7 +678,7 @@ static int ov109_021D1048 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D10D8 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D10D8(UnkStruct_ov109_021D0F70 *param0) { u16 v0 = (1 << 3); @@ -689,7 +689,7 @@ static int ov109_021D10D8 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1100 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1100(UnkStruct_ov109_021D0F70 *param0) { int v0; @@ -704,7 +704,7 @@ static int ov109_021D1100 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1124 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1124(UnkStruct_ov109_021D0F70 *param0) { if (ov109_021D3AB8(param0, (1 << 3)) == 1) { GF_ASSERT(param0->unk_2C.unk_04 >= 2); @@ -715,14 +715,14 @@ static int ov109_021D1124 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1150 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1150(UnkStruct_ov109_021D0F70 *param0) { CommTiming_StartSync(202); param0->unk_00 = 11; return 0; } -static int ov109_021D1164 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1164(UnkStruct_ov109_021D0F70 *param0) { if (CommTiming_IsSyncState(202)) { param0->unk_00 = 12; @@ -731,7 +731,7 @@ static int ov109_021D1164 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D117C (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D117C(UnkStruct_ov109_021D0F70 *param0) { if (sub_0209BEBC(param0->unk_D0, 14, ¶m0->unk_CC->unk_04, 4)) { param0->unk_00 = 13; @@ -740,7 +740,7 @@ static int ov109_021D117C (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D11A0 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D11A0(UnkStruct_ov109_021D0F70 *param0) { int v0; u32 v1; @@ -755,7 +755,7 @@ static int ov109_021D11A0 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D11BC (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D11BC(UnkStruct_ov109_021D0F70 *param0) { if (ov109_021D3BC4(param0) == param0->unk_2C.unk_04) { if (ov109_021D3CD8(param0) == 1) { @@ -770,7 +770,7 @@ static int ov109_021D11BC (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1204 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1204(UnkStruct_ov109_021D0F70 *param0) { if (ov109_021D3D3C(param0) == 1) { param0->unk_00 = 46; @@ -781,10 +781,10 @@ static int ov109_021D1204 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D122C (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D122C(UnkStruct_ov109_021D0F70 *param0) { int v0; - UnkStruct_ov109_021D122C * v1 = ov109_021D3A94(param0, sizeof(UnkStruct_ov109_021D122C)); + UnkStruct_ov109_021D122C *v1 = ov109_021D3A94(param0, sizeof(UnkStruct_ov109_021D122C)); v1->unk_10 = param0->unk_2C.unk_00; v1->unk_14 = param0->unk_2C.unk_04; @@ -807,7 +807,7 @@ static int ov109_021D122C (UnkStruct_ov109_021D0F70 * param0) return 1; } -static int ov109_021D12B0 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D12B0(UnkStruct_ov109_021D0F70 *param0) { param0->unk_0C--; @@ -818,7 +818,7 @@ static int ov109_021D12B0 (UnkStruct_ov109_021D0F70 * param0) param0->unk_0C = 15; { - UnkStruct_ov109_021D122C * v0 = ov109_021D3AB4(param0); + UnkStruct_ov109_021D122C *v0 = ov109_021D3AB4(param0); u16 v1 = Unk_ov109_021D5C80[v0->unk_14][v0->unk_10]; int v2 = param0->unk_2C.unk_44[v0->unk_10].unk_02; @@ -837,9 +837,9 @@ static int ov109_021D12B0 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1334 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1334(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D1334 * v0 = ¶m0->unk_190; + UnkStruct_ov109_021D1334 *v0 = ¶m0->unk_190; int v1 = 0, v2 = 0, v3 = param0->unk_2C.unk_04; do { @@ -858,7 +858,7 @@ static int ov109_021D1334 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1368 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1368(UnkStruct_ov109_021D0F70 *param0) { param0->unk_0C++; @@ -875,7 +875,7 @@ static int ov109_021D1368 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1390 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1390(UnkStruct_ov109_021D0F70 *param0) { u16 v0 = (1 << 2); @@ -886,7 +886,7 @@ static int ov109_021D1390 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D13BC (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D13BC(UnkStruct_ov109_021D0F70 *param0) { if (ov109_021D3AB8(param0, (1 << 2)) == 1) { param0->unk_00 = 22; @@ -897,14 +897,14 @@ static int ov109_021D13BC (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D13D8 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D13D8(UnkStruct_ov109_021D0F70 *param0) { CommTiming_StartSync(202); param0->unk_00 = 23; return 0; } -static int ov109_021D13EC (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D13EC(UnkStruct_ov109_021D0F70 *param0) { if (CommTiming_IsSyncState(202)) { param0->unk_00 = 24; @@ -913,7 +913,7 @@ static int ov109_021D13EC (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1404 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1404(UnkStruct_ov109_021D0F70 *param0) { ov109_021D3990(param0, 1); ov109_021D3684(param0); @@ -922,7 +922,7 @@ static int ov109_021D1404 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D141C (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D141C(UnkStruct_ov109_021D0F70 *param0) { int v0; @@ -942,7 +942,7 @@ static int ov109_021D141C (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1450 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1450(UnkStruct_ov109_021D0F70 *param0) { if (CommSys_CurNetId() == 0) { param0->unk_00 = 27; @@ -953,7 +953,7 @@ static int ov109_021D1450 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1460 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1460(UnkStruct_ov109_021D0F70 *param0) { { BOOL v0 = ov109_021D3A14(param0); @@ -989,19 +989,19 @@ static int ov109_021D1460 (UnkStruct_ov109_021D0F70 * param0) { fx32 v1; - UnkStruct_ov109_021D2AE4 * v2 = ¶m0->unk_D4; + UnkStruct_ov109_021D2AE4 *v2 = ¶m0->unk_D4; if (param0->unk_08 < ((30 * 20) / 2)) { - v2->unk_48 += (((FX32_ONE * 14 / ((30 * 20) / 2)))); + v2->unk_48 += (FX32_ONE * 14 / ((30 * 20) / 2)); - if (v2->unk_48 >= ((FX32_ONE * 14))) { - v2->unk_48 = ((FX32_ONE * 14)); + if (v2->unk_48 >= (FX32_ONE * 14)) { + v2->unk_48 = (FX32_ONE * 14); } } else { - v2->unk_48 -= (((FX32_ONE * 14 / ((30 * 20) / 2)))); + v2->unk_48 -= (FX32_ONE * 14 / ((30 * 20) / 2)); - if (v2->unk_48 < ((FX32_ONE * 4))) { - v2->unk_48 = ((FX32_ONE * 4)); + if (v2->unk_48 < (FX32_ONE * 4)) { + v2->unk_48 = (FX32_ONE * 4); } } @@ -1027,7 +1027,7 @@ static int ov109_021D1460 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1570 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1570(UnkStruct_ov109_021D0F70 *param0) { if (param0->unk_2C.unk_10 == 1) { param0->unk_D4.unk_3C = (FX32_ONE * (param0->unk_2C.unk_2C.unk_06)); @@ -1076,7 +1076,7 @@ static int ov109_021D1570 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1648 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1648(UnkStruct_ov109_021D0F70 *param0) { ov109_021D3990(param0, 0); @@ -1092,12 +1092,12 @@ static int ov109_021D1648 (UnkStruct_ov109_021D0F70 * param0) return 1; } -static int ov109_021D167C (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D167C(UnkStruct_ov109_021D0F70 *param0) { u32 v0; - UnkStruct_ov109_021D2D78 * v1 = param0->unk_28; + UnkStruct_ov109_021D2D78 *v1 = param0->unk_28; - ov109_021D39FC(param0, ((FX32_ONE * 4))); + ov109_021D39FC(param0, (FX32_ONE * 4)); param0->unk_28 = ov109_021D2DF8(param0); if (param0->unk_28->unk_0C != CommSys_CurNetId()) { @@ -1107,15 +1107,15 @@ static int ov109_021D167C (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D16A4 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D16A4(UnkStruct_ov109_021D0F70 *param0) { int v0, v1; fx32 v2, v3, v4, v5; - UnkStruct_ov109_021D2D78 * v6 = param0->unk_28; + UnkStruct_ov109_021D2D78 *v6 = param0->unk_28; v1 = param0->unk_2C.unk_00; v0 = param0->unk_2C.unk_04; - v5 = ((FX32_ONE * 4)); + v5 = (FX32_ONE * 4); v2 = v6->unk_1C; v3 = (FX32_ONE * (Unk_ov109_021D5C80[v0][v1])); @@ -1125,7 +1125,7 @@ static int ov109_021D16A4 (UnkStruct_ov109_021D0F70 * param0) v4 = (v3 + (FX32_ONE * 360)) - v2; } - if (v4 <= ((FX32_ONE * 16))) { + if (v4 <= (FX32_ONE * 16)) { v5 >>= 1; } @@ -1144,14 +1144,14 @@ static int ov109_021D16A4 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1720 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1720(UnkStruct_ov109_021D0F70 *param0) { CommTiming_StartSync(202); param0->unk_00 = 33; return 0; } -static int ov109_021D1734 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1734(UnkStruct_ov109_021D0F70 *param0) { if (CommTiming_IsSyncState(202)) { if (CommSys_CurNetId() == 0) { @@ -1164,10 +1164,10 @@ static int ov109_021D1734 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1758 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1758(UnkStruct_ov109_021D0F70 *param0) { int v0, v1; - UnkStruct_ov109_021D2D78 * v2; + UnkStruct_ov109_021D2D78 *v2; UnkStruct_ov109_021D17EC v3; v3.unk_00 = ((param0->unk_D4.unk_3C) / FX32_ONE); @@ -1192,12 +1192,12 @@ static int ov109_021D1758 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D17EC (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D17EC(UnkStruct_ov109_021D0F70 *param0) { if (param0->unk_2C.unk_14 == 1) { int v0; - UnkStruct_ov109_021D2D78 * v1; - UnkStruct_ov109_021D17EC * v2 = ¶m0->unk_2C.unk_34; + UnkStruct_ov109_021D2D78 *v1; + UnkStruct_ov109_021D17EC *v2 = ¶m0->unk_2C.unk_34; param0->unk_D4.unk_3C = (FX32_ONE * (v2->unk_00)); @@ -1219,7 +1219,7 @@ static int ov109_021D17EC (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1858 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1858(UnkStruct_ov109_021D0F70 *param0) { int v0, v1; int v2 = param0->unk_28->unk_10; @@ -1237,7 +1237,7 @@ static int ov109_021D1858 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D18A0 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D18A0(UnkStruct_ov109_021D0F70 *param0) { param0->unk_0C++; @@ -1268,7 +1268,7 @@ static int ov109_021D18A0 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D18F4 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D18F4(UnkStruct_ov109_021D0F70 *param0) { if (param0->unk_0C < (30 * 4)) { param0->unk_0C++; @@ -1280,7 +1280,7 @@ static int ov109_021D18F4 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1918 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1918(UnkStruct_ov109_021D0F70 *param0) { ov109_021D38F8(param0); @@ -1317,7 +1317,7 @@ static int ov109_021D1918 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D19AC (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D19AC(UnkStruct_ov109_021D0F70 *param0) { if (param0->unk_0C < (30 * 4)) { param0->unk_0C++; @@ -1329,7 +1329,7 @@ static int ov109_021D19AC (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D19D0 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D19D0(UnkStruct_ov109_021D0F70 *param0) { if (param0->unk_0C < (30 * 4)) { param0->unk_0C++; @@ -1342,7 +1342,7 @@ static int ov109_021D19D0 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D19FC (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D19FC(UnkStruct_ov109_021D0F70 *param0) { if (param0->unk_0C < (30 * 4)) { param0->unk_0C++; @@ -1354,14 +1354,14 @@ static int ov109_021D19FC (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1A14 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1A14(UnkStruct_ov109_021D0F70 *param0) { - void * v0; + void *v0; v0 = sub_0202C244(95, 17); sub_0202B758(param0->unk_CC->unk_14.unk_18, v0, 4); - sub_0202CF28(param0->unk_CC->unk_14.unk_14, (((70 + 1)) + 48)); + sub_0202CF28(param0->unk_CC->unk_14.unk_14, ((70 + 1) + 48)); sub_0202CFEC(param0->unk_CC->unk_14.unk_14, 45); ov109_021D2634(param0, 11); CommTiming_StartSync(202); @@ -1372,7 +1372,7 @@ static int ov109_021D1A14 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1A6C (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1A6C(UnkStruct_ov109_021D0F70 *param0) { if (CommTiming_IsSyncState(202)) { ov109_021D3B70(param0, param0->unk_28->unk_0C); @@ -1384,7 +1384,7 @@ static int ov109_021D1A6C (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1AA8 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1AA8(UnkStruct_ov109_021D0F70 *param0) { int v0 = sub_02038EDC( param0->unk_CC->unk_14.unk_08, 2, ¶m0->unk_04); @@ -1398,14 +1398,14 @@ static int ov109_021D1AA8 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1ADC (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1ADC(UnkStruct_ov109_021D0F70 *param0) { ov109_021D2634(param0, 12); param0->unk_00 = 47; return 0; } -static int ov109_021D1AF0 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1AF0(UnkStruct_ov109_021D0F70 *param0) { param0->unk_0C++; @@ -1419,7 +1419,7 @@ static int ov109_021D1AF0 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1B0C (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1B0C(UnkStruct_ov109_021D0F70 *param0) { if (param0->unk_18 == 0) { CommTiming_StartSync(202); @@ -1431,7 +1431,7 @@ static int ov109_021D1B0C (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1B2C (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1B2C(UnkStruct_ov109_021D0F70 *param0) { if (param0->unk_18 == 0) { if (CommTiming_IsSyncState(202)) { @@ -1459,7 +1459,7 @@ static int ov109_021D1B2C (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1B8C (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1B8C(UnkStruct_ov109_021D0F70 *param0) { if (CommSys_ConnectedCount() <= 1) { param0->unk_00 = 51; @@ -1469,7 +1469,7 @@ static int ov109_021D1B8C (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1BA4 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1BA4(UnkStruct_ov109_021D0F70 *param0) { sub_0200F174(2, 0, 0, 0x0, 8, 1, 95); @@ -1481,7 +1481,7 @@ static int ov109_021D1BA4 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1BE4 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1BE4(UnkStruct_ov109_021D0F70 *param0) { if (ScreenWipe_Done()) { param0->unk_00 = 53; @@ -1491,12 +1491,12 @@ static int ov109_021D1BE4 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D1BFC (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D1BFC(UnkStruct_ov109_021D0F70 *param0) { return 2; } -static int(*const Unk_ov109_021D5CBC[54])(UnkStruct_ov109_021D0F70 * g2m) = { +static int (*const Unk_ov109_021D5CBC[54])(UnkStruct_ov109_021D0F70 *g2m) = { ov109_021D0F78, ov109_021D0F8C, ov109_021D0FB0, @@ -1553,9 +1553,9 @@ static int(*const Unk_ov109_021D5CBC[54])(UnkStruct_ov109_021D0F70 * g2m) = { ov109_021D1BFC, }; -static void ov109_021D1C00 (void * param0) +static void ov109_021D1C00(void *param0) { - UnkStruct_ov109_021D0F70 * v0 = param0; + UnkStruct_ov109_021D0F70 *v0 = param0; sub_0201DCAC(); sub_0200C800(); @@ -1563,7 +1563,7 @@ static void ov109_021D1C00 (void * param0) sub_0201C2B8(v0->unk_D84); } -static void ov109_021D1C28 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D1C28(UnkStruct_ov109_021D0F70 *param0) { ov109_021D1CF0(param0); ov109_021D1E1C(param0); @@ -1578,7 +1578,7 @@ static void ov109_021D1C28 (UnkStruct_ov109_021D0F70 * param0) ov109_021D1D10(param0); } -static void ov109_021D1C68 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D1C68(UnkStruct_ov109_021D0F70 *param0) { ov109_021D1DC8(param0); ov109_021D24C0(param0); @@ -1588,7 +1588,7 @@ static void ov109_021D1C68 (UnkStruct_ov109_021D0F70 * param0) ov109_021D293C(param0); } -static void ov109_021D1C90 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D1C90(UnkStruct_ov109_021D0F70 *param0) { sub_020241B4(); Camera_ComputeViewMatrix(); @@ -1605,7 +1605,7 @@ static void ov109_021D1C90 (UnkStruct_ov109_021D0F70 * param0) sub_0200C7EC(param0->unk_D98); } -static void ov109_021D1CF0 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D1CF0(UnkStruct_ov109_021D0F70 *param0) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -1623,7 +1623,7 @@ static void ov109_021D1CF0 (UnkStruct_ov109_021D0F70 * param0) GXLayers_SetBanks(&v0); } -static void ov109_021D1D10 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D1D10(UnkStruct_ov109_021D0F70 *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); @@ -1650,7 +1650,7 @@ static void ov109_021D1D10 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D1DC8 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D1DC8(UnkStruct_ov109_021D0F70 *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); @@ -1664,7 +1664,7 @@ static void ov109_021D1DC8 (UnkStruct_ov109_021D0F70 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 0); } -static void ov109_021D1E1C (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D1E1C(UnkStruct_ov109_021D0F70 *param0) { int v0; @@ -1689,7 +1689,7 @@ static void ov109_021D1E1C (UnkStruct_ov109_021D0F70 * param0) NNS_GfdInitFrmPlttVramManager(0x4000, 1); } -static void ov109_021D1EC8 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D1EC8(UnkStruct_ov109_021D0F70 *param0) { param0->unk_D84 = sub_02018340(95); GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB); @@ -1812,9 +1812,9 @@ static void ov109_021D1EC8 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D2004 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2004(UnkStruct_ov109_021D0F70 *param0) { - void * v0; + void *v0; v0 = ov109_021D3A2C(param0, 17, 0); NNS_G2dGetUnpackedPaletteData(v0, ¶m0->unk_D90); @@ -1868,7 +1868,7 @@ static void ov109_021D2004 (UnkStruct_ov109_021D0F70 * param0) Heap_FreeToHeap(v0); } -static void ov109_021D2204 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2204(UnkStruct_ov109_021D0F70 *param0) { sub_02019044(param0->unk_D84, 1); sub_02019044(param0->unk_D84, 2); @@ -1878,9 +1878,9 @@ static void ov109_021D2204 (UnkStruct_ov109_021D0F70 * param0) Heap_FreeToHeap(param0->unk_D84); } -static void ov109_021D2248 (UnkStruct_ov109_021D0F70 * param0, u32 param1) +static void ov109_021D2248(UnkStruct_ov109_021D0F70 *param0, u32 param1) { - void * v0; + void *v0; v0 = ov109_021D3A2C(param0, param1, 0); NNS_G2dGetUnpackedScreenData(v0, ¶m0->unk_D88); @@ -1890,22 +1890,22 @@ static void ov109_021D2248 (UnkStruct_ov109_021D0F70 * param0, u32 param1) Heap_FreeToHeap(v0); } -static void ov109_021D228C (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D228C(UnkStruct_ov109_021D0F70 *param0) { ov109_021D2248(param0, 26); } -static void ov109_021D2298 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2298(UnkStruct_ov109_021D0F70 *param0) { ov109_021D2248(param0, 24); } -static void ov109_021D22A4 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D22A4(UnkStruct_ov109_021D0F70 *param0) { ov109_021D2248(param0, 25); } -static void ov109_021D22B0 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D22B0(UnkStruct_ov109_021D0F70 *param0) { param0->unk_D9C = sub_02002F38(95); @@ -1916,7 +1916,7 @@ static void ov109_021D22B0 (UnkStruct_ov109_021D0F70 * param0) sub_02002F70(param0->unk_D9C, 3, 0x200, 95); } -static void ov109_021D2308 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2308(UnkStruct_ov109_021D0F70 *param0) { sub_02002FA0(param0->unk_D9C, 0); sub_02002FA0(param0->unk_D9C, 2); @@ -1925,16 +1925,23 @@ static void ov109_021D2308 (UnkStruct_ov109_021D0F70 * param0) sub_02002F54(param0->unk_D9C); } -static void ov109_021D2344 (UnkStruct_ov109_021D0F70 * param0, u32 param1) +static void ov109_021D2344(UnkStruct_ov109_021D0F70 *param0, u32 param1) { sub_02003A2C(param0->unk_D9C, 1, 0xffff, param1, 0); } -static void ov109_021D2368 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2368(UnkStruct_ov109_021D0F70 *param0) { { const UnkStruct_ov104_0224133C v0 = { - 0, 128, 0, 32, 0, 128, 0, 32, + 0, + 128, + 0, + 32, + 0, + 128, + 0, + 32, }; const UnkStruct_ov104_022412F4 v1 = { 48 + 48, 1024 * 0x40, 512 * 0x20, GX_OBJVRAMMODE_CHAR_1D_64K, GX_OBJVRAMMODE_CHAR_1D_32K @@ -1947,7 +1954,12 @@ static void ov109_021D2368 (UnkStruct_ov109_021D0F70 * param0) { BOOL v2; const UnkStruct_ov104_02241308 v3 = { - 48 + 48, 16 + 16, 64, 64, 16, 16, + 48 + 48, + 16 + 16, + 64, + 64, + 16, + 16, }; param0->unk_D98 = sub_0200C704(param0->unk_D94); @@ -1958,19 +1970,19 @@ static void ov109_021D2368 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D2408 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2408(UnkStruct_ov109_021D0F70 *param0) { - SpriteRenderer * v0 = param0->unk_D94; - SpriteGfxHandler * v1 = param0->unk_D98; - PaletteData * v2 = param0->unk_D9C; - NARC * v3 = param0->unk_D80; + SpriteRenderer *v0 = param0->unk_D94; + SpriteGfxHandler *v1 = param0->unk_D98; + PaletteData *v2 = param0->unk_D9C; + NARC *v3 = param0->unk_D80; { sub_02009704(NNS_G2D_VRAM_TYPE_2DMAIN); } { - NARC * v4; + NARC *v4; v4 = NARC_ctor(NARC_INDEX_GRAPHIC__NUTMIXER, 95); @@ -1986,8 +1998,8 @@ static void ov109_021D2408 (UnkStruct_ov109_021D0F70 * param0) } { - NNSG2dPaletteData * v5; - void * v6 = sub_020394A8(95); + NNSG2dPaletteData *v5; + void *v6 = sub_020394A8(95); NNS_G2dGetUnpackedPaletteData(v6, &v5); sub_02002FBC(v2, v5->pRawData, 2, 14 * 16, 32); @@ -1995,22 +2007,22 @@ static void ov109_021D2408 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D24C0 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D24C0(UnkStruct_ov109_021D0F70 *param0) { sub_0200D0B0(param0->unk_D94, param0->unk_D98); sub_0200C8D4(param0->unk_D94); } -static CellActorData * ov109_021D24E0 (UnkStruct_ov109_021D0F70 * param0, const SpriteTemplate * param1) +static CellActorData *ov109_021D24E0(UnkStruct_ov109_021D0F70 *param0, const SpriteTemplate *param1) { - CellActorData * v0 = SpriteActor_LoadResources(param0->unk_D94, param0->unk_D98, param1); + CellActorData *v0 = SpriteActor_LoadResources(param0->unk_D94, param0->unk_D98, param1); return v0; } -static void ov109_021D24F8 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D24F8(UnkStruct_ov109_021D0F70 *param0) { int v0; - UnkStruct_ov109_021D24F8 * v1 = ¶m0->unk_C9C; + UnkStruct_ov109_021D24F8 *v1 = ¶m0->unk_C9C; sub_0200DAA4(param0->unk_D84, 1, 1, 15, 0, 95); sub_0200DD0C(param0->unk_D84, 1, (1 + 9), 14, param0->unk_CC->unk_14.unk_04, 95); @@ -2033,10 +2045,10 @@ static void ov109_021D24F8 (UnkStruct_ov109_021D0F70 * param0) ov109_021D27AC(param0, param0->unk_CC->unk_08); } -static void ov109_021D25E8 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D25E8(UnkStruct_ov109_021D0F70 *param0) { int v0; - UnkStruct_ov109_021D24F8 * v1 = ¶m0->unk_C9C; + UnkStruct_ov109_021D24F8 *v1 = ¶m0->unk_C9C; for (v0 = 0; v0 < 1; v0++) { sub_0201ACF4(&v1->unk_0C[v0]); @@ -2054,10 +2066,10 @@ static void ov109_021D25E8 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D2634 (UnkStruct_ov109_021D0F70 * param0, u32 param1) +static void ov109_021D2634(UnkStruct_ov109_021D0F70 *param0, u32 param1) { - UnkStruct_ov109_021D24F8 * v0 = ¶m0->unk_C9C; - Window * v1 = &v0->unk_0C[0]; + UnkStruct_ov109_021D24F8 *v0 = ¶m0->unk_C9C; + Window *v1 = &v0->unk_0C[0]; BGL_FillWindow(v1, 15); sub_0200E060(v1, 1, (1 + 9), 14); @@ -2067,11 +2079,11 @@ static void ov109_021D2634 (UnkStruct_ov109_021D0F70 * param0, u32 param1) sub_0201A9A4(v1); } -static void ov109_021D268C (UnkStruct_ov109_021D0F70 * param0, u32 param1, const TrainerInfo * param2) +static void ov109_021D268C(UnkStruct_ov109_021D0F70 *param0, u32 param1, const TrainerInfo *param2) { - Strbuf* v0; - UnkStruct_ov109_021D24F8 * v1 = ¶m0->unk_C9C; - Window * v2 = &v1->unk_0C[0]; + Strbuf *v0; + UnkStruct_ov109_021D24F8 *v1 = ¶m0->unk_C9C; + Window *v2 = &v1->unk_0C[0]; StringTemplate_SetPlayerName(v1->unk_08, 1, CommInfo_TrainerInfo(CommSys_CurNetId())); StringTemplate_SetPlayerName(v1->unk_08, 2, param2); @@ -2087,11 +2099,11 @@ static void ov109_021D268C (UnkStruct_ov109_021D0F70 * param0, u32 param1, const sub_0201A9A4(v2); } -static void ov109_021D2714 (UnkStruct_ov109_021D0F70 * param0, u32 param1, u32 param2) +static void ov109_021D2714(UnkStruct_ov109_021D0F70 *param0, u32 param1, u32 param2) { - Strbuf* v0; - UnkStruct_ov109_021D24F8 * v1 = ¶m0->unk_C9C; - Window * v2 = &v1->unk_0C[0]; + Strbuf *v0; + UnkStruct_ov109_021D24F8 *v1 = ¶m0->unk_C9C; + Window *v2 = &v1->unk_0C[0]; StringTemplate_SetItemName(v1->unk_08, 0, param2); @@ -2106,21 +2118,21 @@ static void ov109_021D2714 (UnkStruct_ov109_021D0F70 * param0, u32 param1, u32 p sub_0201A9A4(v2); } -static void ov109_021D2788 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2788(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D24F8 * v0 = ¶m0->unk_C9C; - Window * v1 = &v0->unk_0C[0]; + UnkStruct_ov109_021D24F8 *v0 = ¶m0->unk_C9C; + Window *v1 = &v0->unk_0C[0]; sub_0200E084(v1, 1); BGL_FillWindow(v1, 0); sub_0201A9A4(v1); } -static void ov109_021D27AC (UnkStruct_ov109_021D0F70 * param0, int param1) +static void ov109_021D27AC(UnkStruct_ov109_021D0F70 *param0, int param1) { int v0; - UnkStruct_ov109_021D24F8 * v1 = ¶m0->unk_C9C; - const UnkStruct_ov61_0222C884 * v2 = Unk_ov109_021D5A68[param1]; + UnkStruct_ov109_021D24F8 *v1 = ¶m0->unk_C9C; + const UnkStruct_ov61_0222C884 *v2 = Unk_ov109_021D5A68[param1]; v1->unk_00 = param1; @@ -2129,10 +2141,10 @@ static void ov109_021D27AC (UnkStruct_ov109_021D0F70 * param0, int param1) } } -static void ov109_021D27F0 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D27F0(UnkStruct_ov109_021D0F70 *param0) { int v0; - UnkStruct_ov109_021D24F8 * v1 = ¶m0->unk_C9C; + UnkStruct_ov109_021D24F8 *v1 = ¶m0->unk_C9C; for (v0 = 0; v0 < v1->unk_00; v0++) { sub_0201ACF4(&v1->unk_1C[v0]); @@ -2140,17 +2152,17 @@ static void ov109_021D27F0 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D2820 (UnkStruct_ov109_021D0F70 * param0, Strbuf *param1, int param2, u32 param3) +static void ov109_021D2820(UnkStruct_ov109_021D0F70 *param0, Strbuf *param1, int param2, u32 param3) { - UnkStruct_ov109_021D24F8 * v0 = ¶m0->unk_C9C; - Window * v1 = &v0->unk_1C[param2]; + UnkStruct_ov109_021D24F8 *v0 = ¶m0->unk_C9C; + Window *v1 = &v0->unk_1C[param2]; Window_Show(v1, 1, 1, 14); BGL_FillWindow(v1, 15); sub_0201D78C(v1, 0, param1, sub_02002EEC(0, param1, 0, 8 * 8), 0, 0xFF, param3, NULL); sub_0201A9A4(v1); } -static void ov109_021D2874 (UnkStruct_ov109_021D0F70 * param0, Strbuf *param1, int param2, int param3) +static void ov109_021D2874(UnkStruct_ov109_021D0F70 *param0, Strbuf *param1, int param2, int param3) { u32 v0 = ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))); @@ -2161,19 +2173,19 @@ static void ov109_021D2874 (UnkStruct_ov109_021D0F70 * param0, Strbuf *param1, i ov109_021D2820(param0, param1, param2, v0); } -static void ov109_021D28A0 (UnkStruct_ov109_021D0F70 * param0, int param1) +static void ov109_021D28A0(UnkStruct_ov109_021D0F70 *param0, int param1) { - UnkStruct_ov109_021D24F8 * v0 = ¶m0->unk_C9C; - Window * v1 = &v0->unk_1C[param1]; + UnkStruct_ov109_021D24F8 *v0 = ¶m0->unk_C9C; + Window *v1 = &v0->unk_1C[param1]; sub_0200E084(v1, 1); BGL_FillWindow(v1, 0); sub_0201A9A4(v1); } -static void ov109_021D28C4 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D28C4(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D28C4 * v0 = ¶m0->unk_D0C; + UnkStruct_ov109_021D28C4 *v0 = ¶m0->unk_D0C; v0->camera = Camera_Alloc(95); @@ -2184,12 +2196,12 @@ static void ov109_021D28C4 (UnkStruct_ov109_021D0F70 * param0) v0->unk_08.y = (FX32_ONE * 0); v0->unk_08.z = (FX32_ONE * 0); - v0->cameraAngle.x = ((((-32 * 0xffff) / 360))); - v0->cameraAngle.y = ((((0 * 0xffff) / 360))); - v0->cameraAngle.z = ((((0 * 0xffff) / 360))); + v0->cameraAngle.x = ((-32 * 0xffff) / 360); + v0->cameraAngle.y = ((0 * 0xffff) / 360); + v0->cameraAngle.z = ((0 * 0xffff) / 360); v0->unk_00 = (0x143 << FX32_SHIFT); - v0->unk_04 = ((((6 * 0xffff) / 360))); + v0->unk_04 = ((6 * 0xffff) / 360); Camera_InitWithTarget(&v0->unk_08, v0->unk_00, &v0->cameraAngle, v0->unk_04, 0, 1, v0->camera); @@ -2202,16 +2214,16 @@ static void ov109_021D28C4 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D293C (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D293C(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D28C4 * v0 = ¶m0->unk_D0C; + UnkStruct_ov109_021D28C4 *v0 = ¶m0->unk_D0C; Camera_Delete(v0->camera); } -static void ov109_021D294C (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D294C(UnkStruct_ov109_021D0F70 *param0) { int v0 = 0, v1 = 4 - 1; - UnkStruct_ov109_021D294C * v2 = ¶m0->unk_D2C; + UnkStruct_ov109_021D294C *v2 = ¶m0->unk_D2C; sub_0201E564(&v2->unk_10, 2, 0); @@ -2229,7 +2241,7 @@ static void ov109_021D294C (UnkStruct_ov109_021D0F70 * param0) v2->unk_0C = v0; } -static BOOL ov109_021D2990 (UnkStruct_ov109_021D294C * param0) +static BOOL ov109_021D2990(UnkStruct_ov109_021D294C *param0) { int v0, v1, v2, v3, v4, v5; @@ -2247,9 +2259,9 @@ static BOOL ov109_021D2990 (UnkStruct_ov109_021D294C * param0) return 0; } -static BOOL ov109_021D29AC (UnkStruct_ov109_021D0F70 * param0) +static BOOL ov109_021D29AC(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D294C * v0 = ¶m0->unk_D2C; + UnkStruct_ov109_021D294C *v0 = ¶m0->unk_D2C; if (v0->unk_08) { if (ov109_021D2990(v0) == 1) { @@ -2260,12 +2272,12 @@ static BOOL ov109_021D29AC (UnkStruct_ov109_021D0F70 * param0) return 0; } -static void ov109_021D29CC (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D29CC(UnkStruct_ov109_021D0F70 *param0) { int v0; u32 v1; - UnkStruct_ov109_021D2AE4 * v2 = ¶m0->unk_D4; - NARC * v3 = param0->unk_D80; + UnkStruct_ov109_021D2AE4 *v2 = ¶m0->unk_D4; + NARC *v3 = param0->unk_D80; v0 = param0->unk_CC->unk_08; v1 = Unk_ov109_021D5A80[v0]; @@ -2282,21 +2294,21 @@ static void ov109_021D29CC (UnkStruct_ov109_021D0F70 * param0) v2->unk_4C.unk_00 = 0; v2->unk_4C.unk_02 = 0; v2->unk_4C.unk_04 = 0; - v2->unk_00.x = ((FX32_ONE * 0)); - v2->unk_00.y = ((FX32_ONE * -36)); - v2->unk_00.z = ((FX32_ONE * 0)); + v2->unk_00.x = (FX32_ONE * 0); + v2->unk_00.y = (FX32_ONE * -36); + v2->unk_00.z = (FX32_ONE * 0); v2->unk_0C = v2->unk_00; } -static void ov109_021D2A58 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2A58(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D2AE4 * v0 = ¶m0->unk_D4; + UnkStruct_ov109_021D2AE4 *v0 = ¶m0->unk_D4; sub_0207395C(&v0->unk_54); } -static void ov109_021D2A68 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2A68(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D2AE4 * v0 = ¶m0->unk_D4; + UnkStruct_ov109_021D2AE4 *v0 = ¶m0->unk_D4; fx32 v1 = v0->unk_3C; ov109_021D39D4(&v1, v0->unk_40); @@ -2308,28 +2320,28 @@ static void ov109_021D2A68 (UnkStruct_ov109_021D0F70 * param0) v0->unk_0C.z = v0->unk_00.z + v0->unk_30.z + v0->unk_24.z; } -static void ov109_021D2AC8 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2AC8(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D2AE4 * v0 = ¶m0->unk_D4; + UnkStruct_ov109_021D2AE4 *v0 = ¶m0->unk_D4; sub_02073BC8(&v0->unk_68, &v0->unk_0C, &v0->unk_18, &v0->unk_4C); } -static void ov109_021D2AE4 (UnkStruct_ov109_021D2AE4 * param0, fx32 param1) +static void ov109_021D2AE4(UnkStruct_ov109_021D2AE4 *param0, fx32 param1) { ov109_021D39D4(¶m0->unk_3C, param1); } -static void ov109_021D2AF0 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2AF0(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D1334 * v0 = ¶m0->unk_190; + UnkStruct_ov109_021D1334 *v0 = ¶m0->unk_190; ov109_021D2B00(param0); } -static void ov109_021D2AF8 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2AF8(UnkStruct_ov109_021D0F70 *param0) { int v0; - UnkStruct_ov109_021D2D78 * v1; - UnkStruct_ov109_021D1334 * v2 = ¶m0->unk_190; + UnkStruct_ov109_021D2D78 *v1; + UnkStruct_ov109_021D1334 *v2 = ¶m0->unk_190; for (v0 = 0; v0 < 5; v0++) { v1 = &v2->unk_140[v0]; @@ -2354,11 +2366,11 @@ static const u32 Unk_ov109_021D5A3C[5] = { 0xF }; -static void ov109_021D2B00 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2B00(UnkStruct_ov109_021D0F70 *param0) { int v0; - const u32 * v1, * v2; - UnkStruct_ov109_021D1334 * v3 = ¶m0->unk_190; + const u32 *v1, *v2; + UnkStruct_ov109_021D1334 *v3 = ¶m0->unk_190; sub_0207389C(&v3->unk_00, 0, param0->unk_D80, 0, 95, 0); sub_020738EC(&v3->unk_00); @@ -2377,10 +2389,10 @@ static void ov109_021D2B00 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D2BD4 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2BD4(UnkStruct_ov109_021D0F70 *param0) { int v0; - UnkStruct_ov109_021D1334 * v1 = ¶m0->unk_190; + UnkStruct_ov109_021D1334 *v1 = ¶m0->unk_190; sub_0207395C(&v1->unk_00); sub_0207395C(&v1->unk_14); @@ -2391,9 +2403,9 @@ static void ov109_021D2BD4 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D2C0C (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1) +static void ov109_021D2C0C(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1) { - UnkStruct_ov109_021D1334 * v0 = ¶m0->unk_190; + UnkStruct_ov109_021D1334 *v0 = ¶m0->unk_190; sub_02073B70(¶m1->unk_5C, &v0->unk_00); param1->unk_04 = 1; @@ -2402,10 +2414,10 @@ static void ov109_021D2C0C (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 ov109_021D2F68(param0, param1); } -static void ov109_021D2C38 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2C38(UnkStruct_ov109_021D0F70 *param0) { int v0 = 0, v1 = param0->unk_2C.unk_04; - UnkStruct_ov109_021D1334 * v2 = ¶m0->unk_190; + UnkStruct_ov109_021D1334 *v2 = ¶m0->unk_190; while (v0 < v1) { if (v2->unk_140[v0].unk_00) { @@ -2424,13 +2436,13 @@ static void ov109_021D2C38 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D2CCC (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D2CCC(UnkStruct_ov109_021D0F70 *param0) { int v0 = 0, v1 = param0->unk_2C.unk_04; - UnkStruct_ov109_021D1334 * v2 = ¶m0->unk_190; - UnkStruct_ov109_021D2D78 * v3 = v2->unk_140; - UnkStruct_ov109_021D2EF4 * v4 = v2->unk_4B0; - UnkStruct_ov109_021D2FA4 * v5 = v2->unk_71C; + UnkStruct_ov109_021D1334 *v2 = ¶m0->unk_190; + UnkStruct_ov109_021D2D78 *v3 = v2->unk_140; + UnkStruct_ov109_021D2EF4 *v4 = v2->unk_4B0; + UnkStruct_ov109_021D2FA4 *v5 = v2->unk_71C; while (v0 < v1) { if (v3->unk_04) { @@ -2452,10 +2464,10 @@ static void ov109_021D2CCC (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D2D44 (UnkStruct_ov109_021D0F70 * param0, fx32 param1) +static void ov109_021D2D44(UnkStruct_ov109_021D0F70 *param0, fx32 param1) { int v0 = 0, v1 = param0->unk_2C.unk_04; - UnkStruct_ov109_021D1334 * v2 = ¶m0->unk_190; + UnkStruct_ov109_021D1334 *v2 = ¶m0->unk_190; while (v0 < v1) { if (v2->unk_140[v0].unk_00) { @@ -2466,7 +2478,7 @@ static void ov109_021D2D44 (UnkStruct_ov109_021D0F70 * param0, fx32 param1) } } -static void ov109_021D2D78 (UnkStruct_ov109_021D2D78 * param0, const VecFx32 * param1) +static void ov109_021D2D78(UnkStruct_ov109_021D2D78 *param0, const VecFx32 *param1) { u16 v0; fx32 v1; @@ -2475,22 +2487,22 @@ static void ov109_021D2D78 (UnkStruct_ov109_021D2D78 * param0, const VecFx32 * p ov109_021D39D4(&v1, param0->unk_20); v0 = (u16)((v1) / FX32_ONE); - param0->unk_44.x = ((FX32_ONE * 0)) + param0->unk_50.x + param1->x + (sub_0201D1D4(v0) * 22); - param0->unk_44.y = ((FX32_ONE * -6)) + param0->unk_50.y + param1->y; - param0->unk_44.z = ((FX32_ONE * 0)) + param0->unk_50.z + param1->z + (sub_0201D15C(v0) * 22); + param0->unk_44.x = (FX32_ONE * 0) + param0->unk_50.x + param1->x + (sub_0201D1D4(v0) * 22); + param0->unk_44.y = (FX32_ONE * -6) + param0->unk_50.y + param1->y; + param0->unk_44.z = (FX32_ONE * 0) + param0->unk_50.z + param1->z + (sub_0201D15C(v0) * 22); param0->unk_24.unk_00 = ((param0->unk_2C.x) / FX32_ONE); param0->unk_24.unk_02 = ((param0->unk_2C.y) / FX32_ONE); param0->unk_24.unk_04 = ((param0->unk_2C.z) / FX32_ONE); } -static UnkStruct_ov109_021D2D78 * ov109_021D2DF8 (UnkStruct_ov109_021D0F70 * param0) +static UnkStruct_ov109_021D2D78 *ov109_021D2DF8(UnkStruct_ov109_021D0F70 *param0) { int v0, v1, v2, v3; fx32 v4, v5, v6; int v7 = param0->unk_2C.unk_04; int v8[5], v9[5]; - UnkStruct_ov109_021D1334 * v10 = ¶m0->unk_190; + UnkStruct_ov109_021D1334 *v10 = ¶m0->unk_190; v0 = 0; v4 = (FX32_ONE * (Unk_ov109_021D5C80[v7][param0->unk_2C.unk_00])); @@ -2511,7 +2523,8 @@ static UnkStruct_ov109_021D2D78 * ov109_021D2DF8 (UnkStruct_ov109_021D0F70 * par } for (v0 = 1; v0 < v7; v0++) { - v3 = v9[v0]; v2 = v8[v3]; + v3 = v9[v0]; + v2 = v8[v3]; for (v1 = v0 - 1; v1 >= 0 && v8[v9[v1]] > v2; v1--) { v9[v1 + 1] = v9[v1]; @@ -2523,10 +2536,10 @@ static UnkStruct_ov109_021D2D78 * ov109_021D2DF8 (UnkStruct_ov109_021D0F70 * par return &v10->unk_140[v9[0]]; } -static void ov109_021D2EC0 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1) +static void ov109_021D2EC0(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1) { - UnkStruct_ov109_021D1334 * v0 = ¶m0->unk_190; - UnkStruct_ov109_021D2EF4 * v1 = &v0->unk_4B0[param1->unk_10]; + UnkStruct_ov109_021D1334 *v0 = ¶m0->unk_190; + UnkStruct_ov109_021D2EF4 *v1 = &v0->unk_4B0[param1->unk_10]; v1->unk_00 = 1; v1->unk_78 = param1; @@ -2534,7 +2547,7 @@ static void ov109_021D2EC0 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 ov109_021D2EF4(param0, v1); } -static void ov109_021D2EF4 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2EF4 * param1) +static void ov109_021D2EF4(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2EF4 *param1) { fx32 v0; @@ -2564,10 +2577,10 @@ static void ov109_021D2EF4 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 param1->unk_0C.z = FX32_ONE - v0; } -static void ov109_021D2F68 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1) +static void ov109_021D2F68(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1) { - UnkStruct_ov109_021D1334 * v0 = ¶m0->unk_190; - UnkStruct_ov109_021D2FA4 * v1 = &v0->unk_71C[param1->unk_10]; + UnkStruct_ov109_021D1334 *v0 = ¶m0->unk_190; + UnkStruct_ov109_021D2FA4 *v1 = &v0->unk_71C[param1->unk_10]; v1->unk_00 = 1; v1->unk_64 = param1; @@ -2575,9 +2588,9 @@ static void ov109_021D2F68 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 sub_02073B90(&v1->unk_10, &v0->unk_28[param1->unk_10], &v0->unk_8C[param1->unk_10]); } -static void ov109_021D2FA4 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2FA4 * param1) +static void ov109_021D2FA4(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2FA4 *param1) { - UnkStruct_ov109_021D1334 * v0 = ¶m0->unk_190; + UnkStruct_ov109_021D1334 *v0 = ¶m0->unk_190; param1->unk_04 = param1->unk_64->unk_44; param1->unk_04.y += (FX32_ONE * 20); @@ -2585,10 +2598,10 @@ static void ov109_021D2FA4 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 sub_02073AC0(&v0->unk_8C[param1->unk_64->unk_10], FX32_ONE, 1); } -static SysTask * ov109_021D2FE0 (UnkStruct_ov109_021D0F70 * param0, int param1, int param2, int param3, int param4, int param5, UnkStruct_ov109_021D2D78 * param6) +static SysTask *ov109_021D2FE0(UnkStruct_ov109_021D0F70 *param0, int param1, int param2, int param3, int param4, int param5, UnkStruct_ov109_021D2D78 *param6) { - SysTask * v0; - UnkStruct_ov109_021D2FE0 * v1; + SysTask *v0; + UnkStruct_ov109_021D2FE0 *v1; param6->unk_0C = param1; param6->unk_10 = param2; @@ -2608,10 +2621,10 @@ static SysTask * ov109_021D2FE0 (UnkStruct_ov109_021D0F70 * param0, int param1, return v0; } -static void ov109_021D302C (SysTask * param0, void * param1) +static void ov109_021D302C(SysTask *param0, void *param1) { int v0; - UnkStruct_ov109_021D2FE0 * v1 = param1; + UnkStruct_ov109_021D2FE0 *v1 = param1; do { v0 = Unk_ov109_021D59D8[v1->unk_00](v1); @@ -2624,14 +2637,14 @@ static void ov109_021D302C (SysTask * param0, void * param1) } } -static int ov109_021D3060 (UnkStruct_ov109_021D2FE0 * param0) +static int ov109_021D3060(UnkStruct_ov109_021D2FE0 *param0) { - UnkStruct_ov109_021D2D78 * v0 = param0->unk_10; + UnkStruct_ov109_021D2D78 *v0 = param0->unk_10; v0->unk_38.x = FX32_ONE; v0->unk_38.y = FX32_ONE; v0->unk_38.z = FX32_ONE; - v0->unk_50.y = ((FX32_ONE * 192)); + v0->unk_50.y = (FX32_ONE * 192); ov109_021D2C0C(param0->unk_14, v0); @@ -2641,9 +2654,9 @@ static int ov109_021D3060 (UnkStruct_ov109_021D2FE0 * param0) return 0; } -static int ov109_021D308C (UnkStruct_ov109_021D2FE0 * param0) +static int ov109_021D308C(UnkStruct_ov109_021D2FE0 *param0) { - UnkStruct_ov109_021D2D78 * v0 = param0->unk_10; + UnkStruct_ov109_021D2D78 *v0 = param0->unk_10; v0->unk_50.y -= param0->unk_0C; @@ -2662,9 +2675,9 @@ static int ov109_021D308C (UnkStruct_ov109_021D2FE0 * param0) return 0; } -static int ov109_021D30CC (UnkStruct_ov109_021D2FE0 * param0) +static int ov109_021D30CC(UnkStruct_ov109_021D2FE0 *param0) { - UnkStruct_ov109_021D2D78 * v0 = param0->unk_10; + UnkStruct_ov109_021D2D78 *v0 = param0->unk_10; if (param0->unk_0C > (FX32_ONE * 1)) { param0->unk_0C -= 0x1000; @@ -2687,15 +2700,15 @@ static int ov109_021D30CC (UnkStruct_ov109_021D2FE0 * param0) return 0; } -static int(*const Unk_ov109_021D59D8[3])(UnkStruct_ov109_021D2FE0 *) = { +static int (*const Unk_ov109_021D59D8[3])(UnkStruct_ov109_021D2FE0 *) = { ov109_021D3060, ov109_021D308C, ov109_021D30CC, }; -static void ov109_021D3110 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D3110 * param1) +static void ov109_021D3110(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D3110 *param1) { - UnkStruct_ov109_021D2D78 * v0 = param1->unk_1C; + UnkStruct_ov109_021D2D78 *v0 = param1->unk_1C; switch (param1->unk_04) { case 0: @@ -2726,12 +2739,12 @@ static void ov109_021D3110 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 } } -static void ov109_021D3180 (SysTask * param0, void * param1) +static void ov109_021D3180(SysTask *param0, void *param1) { int v0; - UnkStruct_ov109_021D0F70 * v1 = param1; - UnkStruct_ov109_021D31A8 * v2 = &v1->unk_AB4; - UnkStruct_ov109_021D3110 * v3 = v2->unk_00; + UnkStruct_ov109_021D0F70 *v1 = param1; + UnkStruct_ov109_021D31A8 *v2 = &v1->unk_AB4; + UnkStruct_ov109_021D3110 *v3 = v2->unk_00; for (v0 = 0; v0 < 5; v0++, v3++) { if (v3->unk_00) { @@ -2740,9 +2753,9 @@ static void ov109_021D3180 (SysTask * param0, void * param1) } } -static void ov109_021D31A8 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D31A8(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D31A8 * v0; + UnkStruct_ov109_021D31A8 *v0; v0 = ¶m0->unk_AB4; memset(v0, 0, sizeof(UnkStruct_ov109_021D31A8)); @@ -2751,16 +2764,16 @@ static void ov109_021D31A8 (UnkStruct_ov109_021D0F70 * param0) GF_ASSERT(param0->unk_DB0); } -static void ov109_021D31E0 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D31E0(UnkStruct_ov109_021D0F70 *param0) { SysTask_Done(param0->unk_DB0); } -static void ov109_021D31F0 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1) +static void ov109_021D31F0(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1) { int v0; - UnkStruct_ov109_021D31A8 * v1 = ¶m0->unk_AB4; - UnkStruct_ov109_021D3110 * v2 = v1->unk_00; + UnkStruct_ov109_021D31A8 *v1 = ¶m0->unk_AB4; + UnkStruct_ov109_021D3110 *v2 = v1->unk_00; for (v0 = 0; v0 < 5; v0++, v2++) { if (v2->unk_00 == 0) { @@ -2773,9 +2786,9 @@ static void ov109_021D31F0 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 GF_ASSERT(0); } -static void ov109_021D3218 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D3218(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D1334 * v0 = ¶m0->unk_190; + UnkStruct_ov109_021D1334 *v0 = ¶m0->unk_190; int v1 = 0, v2 = param0->unk_2C.unk_04; do { @@ -2787,11 +2800,11 @@ static void ov109_021D3218 (UnkStruct_ov109_021D0F70 * param0) } while (v1 < v2); } -static BOOL ov109_021D3248 (UnkStruct_ov109_021D0F70 * param0) +static BOOL ov109_021D3248(UnkStruct_ov109_021D0F70 *param0) { int v0; - UnkStruct_ov109_021D31A8 * v1 = ¶m0->unk_AB4; - UnkStruct_ov109_021D3110 * v2 = v1->unk_00; + UnkStruct_ov109_021D31A8 *v1 = ¶m0->unk_AB4; + UnkStruct_ov109_021D3110 *v2 = v1->unk_00; for (v0 = 0; v0 < 5; v0++, v2++) { if (v2->unk_00) { @@ -2802,10 +2815,10 @@ static BOOL ov109_021D3248 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static void ov109_021D3268 (UnkStruct_ov109_021D3268 * param0) +static void ov109_021D3268(UnkStruct_ov109_021D3268 *param0) { fx32 v0; - UnkStruct_ov109_021D2D78 * v1 = param0->unk_10; + UnkStruct_ov109_021D2D78 *v1 = param0->unk_10; switch (param0->unk_04) { case 0: @@ -2827,12 +2840,12 @@ static void ov109_021D3268 (UnkStruct_ov109_021D3268 * param0) } } -static void ov109_021D32B8 (SysTask * param0, void * param1) +static void ov109_021D32B8(SysTask *param0, void *param1) { int v0; - UnkStruct_ov109_021D0F70 * v1 = param1; - UnkStruct_ov109_021D32DC * v2 = &v1->unk_B54; - UnkStruct_ov109_021D3268 * v3 = v2->unk_00; + UnkStruct_ov109_021D0F70 *v1 = param1; + UnkStruct_ov109_021D32DC *v2 = &v1->unk_B54; + UnkStruct_ov109_021D3268 *v3 = v2->unk_00; for (v0 = 0; v0 < 5; v0++, v3++) { if (v3->unk_00) { @@ -2841,9 +2854,9 @@ static void ov109_021D32B8 (SysTask * param0, void * param1) } } -static void ov109_021D32DC (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D32DC(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D32DC * v0; + UnkStruct_ov109_021D32DC *v0; v0 = ¶m0->unk_B54; memset(v0, 0, sizeof(UnkStruct_ov109_021D32DC)); @@ -2852,16 +2865,16 @@ static void ov109_021D32DC (UnkStruct_ov109_021D0F70 * param0) GF_ASSERT(param0->unk_DB4); } -static void ov109_021D3318 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D3318(UnkStruct_ov109_021D0F70 *param0) { SysTask_Done(param0->unk_DB4); } -static void ov109_021D3328 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1) +static void ov109_021D3328(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1) { int v0; - UnkStruct_ov109_021D32DC * v1 = ¶m0->unk_B54; - UnkStruct_ov109_021D3268 * v2 = v1->unk_00; + UnkStruct_ov109_021D32DC *v1 = ¶m0->unk_B54; + UnkStruct_ov109_021D3268 *v2 = v1->unk_00; for (v0 = 0; v0 < 5; v0++, v2++) { if ((v2->unk_00 == 1) && (v2->unk_10 == param1)) { @@ -2881,20 +2894,20 @@ static void ov109_021D3328 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 GF_ASSERT(0); } -static void ov109_021D3370 (UnkStruct_ov109_021D3370 * param0) +static void ov109_021D3370(UnkStruct_ov109_021D3370 *param0) { fx32 v0; - UnkStruct_ov109_021D2D78 * v1 = param0->unk_14; + UnkStruct_ov109_021D2D78 *v1 = param0->unk_14; switch (param0->unk_04) { case 0: v1->unk_2C.z = 0; param0->unk_10 = 0; - param0->unk_08 = ((FX32_ONE * 30)); + param0->unk_08 = (FX32_ONE * 30); param0->unk_0C = (FX32_ONE * 20); param0->unk_04++; case 1: - v0 = sub_0201D15C(((param0->unk_10) / FX32_ONE)) * ((param0->unk_08) / FX32_ONE); + v0 = sub_0201D15C((param0->unk_10) / FX32_ONE) * ((param0->unk_08) / FX32_ONE); v1->unk_2C.z = 0; ov109_021D39D4(&v1->unk_2C.z, v0); @@ -2912,12 +2925,12 @@ static void ov109_021D3370 (UnkStruct_ov109_021D3370 * param0) } } -static void ov109_021D33F0 (SysTask * param0, void * param1) +static void ov109_021D33F0(SysTask *param0, void *param1) { int v0; - UnkStruct_ov109_021D0F70 * v1 = param1; - UnkStruct_ov109_021D3414 * v2 = &v1->unk_BB8; - UnkStruct_ov109_021D3370 * v3 = v2->unk_00; + UnkStruct_ov109_021D0F70 *v1 = param1; + UnkStruct_ov109_021D3414 *v2 = &v1->unk_BB8; + UnkStruct_ov109_021D3370 *v3 = v2->unk_00; for (v0 = 0; v0 < 5; v0++, v3++) { if (v3->unk_00) { @@ -2926,9 +2939,9 @@ static void ov109_021D33F0 (SysTask * param0, void * param1) } } -static void ov109_021D3414 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D3414(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D3414 * v0; + UnkStruct_ov109_021D3414 *v0; v0 = ¶m0->unk_BB8; memset(v0, 0, sizeof(UnkStruct_ov109_021D3414)); @@ -2937,16 +2950,16 @@ static void ov109_021D3414 (UnkStruct_ov109_021D0F70 * param0) GF_ASSERT(param0->unk_DB8); } -static void ov109_021D3450 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D3450(UnkStruct_ov109_021D0F70 *param0) { SysTask_Done(param0->unk_DB8); } -static void ov109_021D3460 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1) +static void ov109_021D3460(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1) { int v0; - UnkStruct_ov109_021D3414 * v1 = ¶m0->unk_BB8; - UnkStruct_ov109_021D3370 * v2 = v1->unk_00; + UnkStruct_ov109_021D3414 *v1 = ¶m0->unk_BB8; + UnkStruct_ov109_021D3370 *v2 = v1->unk_00; for (v0 = 0; v0 < 5; v0++, v2++) { if ((v2->unk_00 == 1) && (v2->unk_14 == param1)) { @@ -2966,9 +2979,9 @@ static void ov109_021D3460 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 GF_ASSERT(0); } -static void ov109_021D34A8 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D34A8 * param1) +static void ov109_021D34A8(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D34A8 *param1) { - UnkStruct_ov109_021D2AE4 * v0 = ¶m0->unk_D4; + UnkStruct_ov109_021D2AE4 *v0 = ¶m0->unk_D4; switch (param1->unk_00) { case 0: @@ -3020,17 +3033,17 @@ static void ov109_021D34A8 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 } } -static void ov109_021D3574 (SysTask * param0, void * param1) +static void ov109_021D3574(SysTask *param0, void *param1) { - UnkStruct_ov109_021D0F70 * v0 = param1; - UnkStruct_ov109_021D34A8 * v1 = &v0->unk_C30; + UnkStruct_ov109_021D0F70 *v0 = param1; + UnkStruct_ov109_021D34A8 *v1 = &v0->unk_C30; ov109_021D34A8(v0, v1); } -static void ov109_021D3584 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D3584(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D34A8 * v0; + UnkStruct_ov109_021D34A8 *v0; v0 = ¶m0->unk_C30; memset(v0, 0, sizeof(UnkStruct_ov109_021D34A8)); @@ -3039,14 +3052,14 @@ static void ov109_021D3584 (UnkStruct_ov109_021D0F70 * param0) GF_ASSERT(param0->unk_DBC); } -static void ov109_021D35BC (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D35BC(UnkStruct_ov109_021D0F70 *param0) { SysTask_Done(param0->unk_DBC); } -static void ov109_021D35CC (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D35CC(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D34A8 * v0; + UnkStruct_ov109_021D34A8 *v0; v0 = ¶m0->unk_C30; GF_ASSERT(v0->unk_04 == 0); @@ -3054,30 +3067,30 @@ static void ov109_021D35CC (UnkStruct_ov109_021D0F70 * param0) v0->unk_00 = 1; } -static BOOL ov109_021D35E8 (UnkStruct_ov109_021D0F70 * param0) +static BOOL ov109_021D35E8(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D34A8 * v0; + UnkStruct_ov109_021D34A8 *v0; v0 = ¶m0->unk_C30; return v0->unk_04; } -static BOOL ov109_021D35F4 (UnkStruct_ov109_021D0F70 * param0) +static BOOL ov109_021D35F4(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D34A8 * v0; + UnkStruct_ov109_021D34A8 *v0; v0 = ¶m0->unk_C30; return v0->unk_08; } -static void ov109_021D3600 (SysTask * param0, void * param1) +static void ov109_021D3600(SysTask *param0, void *param1) { - UnkStruct_ov109_021D3600 * v0 = param1; + UnkStruct_ov109_021D3600 *v0 = param1; switch (v0->unk_00) { case 0: if (v0->unk_0C < 4) { - int v1[4] = {1501, 1501, 1501, 1603}; + int v1[4] = { 1501, 1501, 1501, 1603 }; v0->unk_04--; @@ -3102,10 +3115,10 @@ static void ov109_021D3600 (SysTask * param0, void * param1) } } -static SysTask * ov109_021D3684 (UnkStruct_ov109_021D0F70 * param0) +static SysTask *ov109_021D3684(UnkStruct_ov109_021D0F70 *param0) { SpriteTemplate v0; - UnkStruct_ov109_021D3600 * v1 = Heap_AllocFromHeapAtEnd(95, sizeof(UnkStruct_ov109_021D3600)); + UnkStruct_ov109_021D3600 *v1 = Heap_AllocFromHeapAtEnd(95, sizeof(UnkStruct_ov109_021D3600)); memset(v1, 0, sizeof(UnkStruct_ov109_021D3600)); @@ -3130,14 +3143,14 @@ static SysTask * ov109_021D3684 (UnkStruct_ov109_021D0F70 * param0) v1->unk_10 = param0; { - SysTask * v2 = SysTask_Start(ov109_021D3600, v1, 0); + SysTask *v2 = SysTask_Start(ov109_021D3600, v1, 0); GF_ASSERT(v2 != NULL); return v2; } } -static void ov109_021D3700 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D3700 * param1) +static void ov109_021D3700(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D3700 *param1) { switch (param1->unk_00) { case 0: @@ -3177,17 +3190,17 @@ static void ov109_021D3700 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 } } -static void ov109_021D3788 (SysTask * param0, void * param1) +static void ov109_021D3788(SysTask *param0, void *param1) { - UnkStruct_ov109_021D0F70 * v0 = param1; - UnkStruct_ov109_021D3700 * v1 = &v0->unk_C44; + UnkStruct_ov109_021D0F70 *v0 = param1; + UnkStruct_ov109_021D3700 *v1 = &v0->unk_C44; ov109_021D3700(v0, v1); } -static void ov109_021D379C (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D379C(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D3700 * v0; + UnkStruct_ov109_021D3700 *v0; v0 = ¶m0->unk_C44; memset(v0, 0, sizeof(UnkStruct_ov109_021D3700)); @@ -3195,22 +3208,22 @@ static void ov109_021D379C (UnkStruct_ov109_021D0F70 * param0) GF_ASSERT(param0->unk_DC0); } -static void ov109_021D37E0 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D37E0(UnkStruct_ov109_021D0F70 *param0) { SysTask_Done(param0->unk_DC0); } -static BOOL ov109_021D37F0 (UnkStruct_ov109_021D0F70 * param0) +static BOOL ov109_021D37F0(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D3700 * v0; + UnkStruct_ov109_021D3700 *v0; v0 = ¶m0->unk_C44; return v0->unk_02; } -static void ov109_021D37FC (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D37FC(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D3700 * v0; + UnkStruct_ov109_021D3700 *v0; v0 = ¶m0->unk_C44; GF_ASSERT(v0->unk_02 == 0); @@ -3218,13 +3231,12 @@ static void ov109_021D37FC (UnkStruct_ov109_021D0F70 * param0) v0->unk_00 = 1; } -static void ov109_021D3818 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D3818 * param1) +static void ov109_021D3818(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D3818 *param1) { switch (param1->unk_00) { case 0: break; - case 1: - { + case 1: { static int v0[16] = { 4, 6, 8, 10, 11, 12, 12, 12, 11, 10, 9, 8, 6, 4, 0, 0 }; @@ -3236,8 +3248,7 @@ static void ov109_021D3818 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 param1->unk_04 = 0; param1->unk_00++; } - } - break; + } break; case 2: param1->unk_08++; @@ -3249,21 +3260,21 @@ static void ov109_021D3818 (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 } } -static void ov109_021D3864 (SysTask * param0, void * param1) +static void ov109_021D3864(SysTask *param0, void *param1) { int v0; - UnkStruct_ov109_021D0F70 * v1 = param1; - UnkStruct_ov109_021D3884 * v2 = &v1->unk_C4C; - UnkStruct_ov109_021D3818 * v3 = v2->unk_00; + UnkStruct_ov109_021D0F70 *v1 = param1; + UnkStruct_ov109_021D3884 *v2 = &v1->unk_C4C; + UnkStruct_ov109_021D3818 *v3 = v2->unk_00; for (v0 = 0; v0 < 5; v0++, v3++) { ov109_021D3818(v1, v3); } } -static void ov109_021D3884 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D3884(UnkStruct_ov109_021D0F70 *param0) { - UnkStruct_ov109_021D3884 * v0; + UnkStruct_ov109_021D3884 *v0; v0 = ¶m0->unk_C4C; memset(v0, 0, sizeof(UnkStruct_ov109_021D3884)); @@ -3271,16 +3282,16 @@ static void ov109_021D3884 (UnkStruct_ov109_021D0F70 * param0) GF_ASSERT(param0->unk_DC4); } -static void ov109_021D38BC (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D38BC(UnkStruct_ov109_021D0F70 *param0) { SysTask_Done(param0->unk_DC4); } -static void ov109_021D38CC (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_021D2D78 * param1) +static void ov109_021D38CC(UnkStruct_ov109_021D0F70 *param0, UnkStruct_ov109_021D2D78 *param1) { int v0 = param1->unk_0C; - UnkStruct_ov109_021D3884 * v1 = ¶m0->unk_C4C; - UnkStruct_ov109_021D3818 * v2 = &v1->unk_00[v0]; + UnkStruct_ov109_021D3884 *v1 = ¶m0->unk_C4C; + UnkStruct_ov109_021D3818 *v2 = &v1->unk_00[v0]; GF_ASSERT(v0 < 5); GF_ASSERT(v2->unk_00 == 0); @@ -3289,11 +3300,11 @@ static void ov109_021D38CC (UnkStruct_ov109_021D0F70 * param0, UnkStruct_ov109_0 v2->unk_0C = param1; } -static void ov109_021D38F8 (UnkStruct_ov109_021D0F70 * param0) +static void ov109_021D38F8(UnkStruct_ov109_021D0F70 *param0) { u32 v0 = param0->unk_20; int v1 = 0, v2 = param0->unk_2C.unk_04; - UnkStruct_ov109_021D1334 * v3 = ¶m0->unk_190; + UnkStruct_ov109_021D1334 *v3 = ¶m0->unk_190; while (v1 < v2) { if (v3->unk_140[v1].unk_00 && (v0 & (1 << v3->unk_140[v1].unk_0C))) { @@ -3304,10 +3315,10 @@ static void ov109_021D38F8 (UnkStruct_ov109_021D0F70 * param0) } } -static void ov109_021D3948 (SysTask * param0, void * param1) +static void ov109_021D3948(SysTask *param0, void *param1) { int v0 = 0; - UnkStruct_ov109_021D3948 * v1 = param1; + UnkStruct_ov109_021D3948 *v1 = param1; if (v1->unk_04 == 1) { v1->unk_08--; @@ -3333,11 +3344,11 @@ static void ov109_021D3948 (SysTask * param0, void * param1) } } -static void ov109_021D3990 (UnkStruct_ov109_021D0F70 * param0, int param1) +static void ov109_021D3990(UnkStruct_ov109_021D0F70 *param0, int param1) { - SysTask * v0; - u32 v1[2] = {0, 8}; - UnkStruct_ov109_021D3948 * v2 = Heap_AllocFromHeapAtEnd(95, sizeof(UnkStruct_ov109_021D3948)); + SysTask *v0; + u32 v1[2] = { 0, 8 }; + UnkStruct_ov109_021D3948 *v2 = Heap_AllocFromHeapAtEnd(95, sizeof(UnkStruct_ov109_021D3948)); v2->unk_00 = param0; v2->unk_04 = param1; @@ -3347,7 +3358,7 @@ static void ov109_021D3990 (UnkStruct_ov109_021D0F70 * param0, int param1) GF_ASSERT(v0 != NULL); } -static void ov109_021D39D4 (fx32 * param0, fx32 param1) +static void ov109_021D39D4(fx32 *param0, fx32 param1) { (*param0) += param1; @@ -3358,13 +3369,13 @@ static void ov109_021D39D4 (fx32 * param0, fx32 param1) (*param0) %= (FX32_ONE * 360); } -static void ov109_021D39FC (UnkStruct_ov109_021D0F70 * param0, fx32 param1) +static void ov109_021D39FC(UnkStruct_ov109_021D0F70 *param0, fx32 param1) { ov109_021D2AE4(¶m0->unk_D4, param1); ov109_021D2D44(param0, param1); } -static BOOL ov109_021D3A14 (UnkStruct_ov109_021D0F70 * param0) +static BOOL ov109_021D3A14(UnkStruct_ov109_021D0F70 *param0) { param0->unk_08++; @@ -3376,9 +3387,9 @@ static BOOL ov109_021D3A14 (UnkStruct_ov109_021D0F70 * param0) return 1; } -static void * ov109_021D3A2C (UnkStruct_ov109_021D0F70 * param0, u32 param1, BOOL param2) +static void *ov109_021D3A2C(UnkStruct_ov109_021D0F70 *param0, u32 param1, BOOL param2) { - void * v0; + void *v0; u32 v1 = NARC_GetMemberSize(param0->unk_D80, param1); if (param2 == 1) { @@ -3391,43 +3402,43 @@ static void * ov109_021D3A2C (UnkStruct_ov109_021D0F70 * param0, u32 param1, BOO return v0; } -void ov109_021D3A68 (UnkStruct_ov109_021D0F70 * param0, u32 param1) +void ov109_021D3A68(UnkStruct_ov109_021D0F70 *param0, u32 param1) { if (param1 != 0) { param0->unk_2C.unk_08 = param1; } } -void ov109_021D3A70 (UnkStruct_ov109_021D0F70 * param0, const UnkStruct_0209C0F0 * param1) +void ov109_021D3A70(UnkStruct_ov109_021D0F70 *param0, const UnkStruct_0209C0F0 *param1) { param0->unk_2C.unk_10 = 1; param0->unk_2C.unk_2C = *param1; } -static void * ov109_021D3A94 (UnkStruct_ov109_021D0F70 * param0, u32 param1) +static void *ov109_021D3A94(UnkStruct_ov109_021D0F70 *param0, u32 param1) { GF_ASSERT(param1 < 32); memset(param0->unk_AC, 0, 32); return param0->unk_AC; } -static void * ov109_021D3AB4 (UnkStruct_ov109_021D0F70 * param0) +static void *ov109_021D3AB4(UnkStruct_ov109_021D0F70 *param0) { return param0->unk_AC; } -static BOOL ov109_021D3AB8 (UnkStruct_ov109_021D0F70 * param0, u16 param1) +static BOOL ov109_021D3AB8(UnkStruct_ov109_021D0F70 *param0, u16 param1) { u32 v0 = param0->unk_D0->unk_40; - if ((v0 & param1)) { + if (v0 & param1) { return 1; } return 0; } -static BOOL ov109_021D3ACC (UnkStruct_ov109_021D0F70 * param0) +static BOOL ov109_021D3ACC(UnkStruct_ov109_021D0F70 *param0) { int v0 = 0; int v1 = param0->unk_CC->unk_08 - 1; @@ -3445,7 +3456,7 @@ static BOOL ov109_021D3ACC (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D3B04 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D3B04(UnkStruct_ov109_021D0F70 *param0) { int v0 = 0; u32 v1 = param0->unk_D0->unk_42; @@ -3458,7 +3469,7 @@ static int ov109_021D3B04 (UnkStruct_ov109_021D0F70 * param0) return v0; } -void ov109_021D3B24 (UnkStruct_ov109_021D0F70 * param0, const UnkStruct_ov109_021D1048 * param1) +void ov109_021D3B24(UnkStruct_ov109_021D0F70 *param0, const UnkStruct_ov109_021D1048 *param1) { param0->unk_2C.unk_44[param1->unk_00] = *param1; @@ -3467,12 +3478,12 @@ void ov109_021D3B24 (UnkStruct_ov109_021D0F70 * param0, const UnkStruct_ov109_02 } } -void ov109_021D3B50 (UnkStruct_ov109_021D0F70 * param0, int param1) +void ov109_021D3B50(UnkStruct_ov109_021D0F70 *param0, int param1) { param0->unk_2C.unk_04 = param1; } -static BOOL ov109_021D3B54 (UnkStruct_ov109_021D0F70 * param0, int param1) +static BOOL ov109_021D3B54(UnkStruct_ov109_021D0F70 *param0, int param1) { if (param1 != 0) { u32 v0 = 1 << (u32)param1; @@ -3485,11 +3496,11 @@ static BOOL ov109_021D3B54 (UnkStruct_ov109_021D0F70 * param0, int param1) return 1; } -static void ov109_021D3B70 (UnkStruct_ov109_021D0F70 * param0, int param1) +static void ov109_021D3B70(UnkStruct_ov109_021D0F70 *param0, int param1) { int v0, v1; - Party * v2, * v3; - Pokemon * v4, * v5; + Party *v2, *v3; + Pokemon *v4, *v5; v2 = param0->unk_24; v3 = (Party *)sub_0209C188(param0->unk_D0, param1); @@ -3504,7 +3515,7 @@ static void ov109_021D3B70 (UnkStruct_ov109_021D0F70 * param0, int param1) Pokemon_Copy(v5, v4); } -static int ov109_021D3BC4 (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D3BC4(UnkStruct_ov109_021D0F70 *param0) { int v0 = 0; u32 v1 = param0->unk_D0->unk_46; @@ -3517,33 +3528,33 @@ static int ov109_021D3BC4 (UnkStruct_ov109_021D0F70 * param0) return v0; } -void ov109_021D3BE4 (UnkStruct_ov109_021D0F70 * param0, int param1, int param2) +void ov109_021D3BE4(UnkStruct_ov109_021D0F70 *param0, int param1, int param2) { param0->unk_2C.unk_18[param1] = param2; } -void ov109_021D3BEC (UnkStruct_ov109_021D0F70 * param0, const UnkStruct_ov109_021D17EC * param1) +void ov109_021D3BEC(UnkStruct_ov109_021D0F70 *param0, const UnkStruct_ov109_021D17EC *param1) { param0->unk_2C.unk_34 = *param1; param0->unk_2C.unk_14 = 1; } -static BOOL ov109_021D3C08 (UnkStruct_ov109_021D0F70 * param0, fx32 param1, int param2) +static BOOL ov109_021D3C08(UnkStruct_ov109_021D0F70 *param0, fx32 param1, int param2) { int v0; fx32 v1; u32 v2, v3; - const UnkStruct_ov109_021D5C14 * v4; - const UnkStruct_ov109_021D59AC * v5; + const UnkStruct_ov109_021D5C14 *v4; + const UnkStruct_ov109_021D59AC *v5; ov109_021D39D4(¶m1, -param0->unk_D4.unk_3C); v1 = param1; - ov109_021D39D4(&v1, ((FX32_ONE * -4))); + ov109_021D39D4(&v1, (FX32_ONE * -4)); v2 = ((v1) / FX32_ONE); v1 = param1; - ov109_021D39D4(&v1, ((FX32_ONE * 5))); + ov109_021D39D4(&v1, (FX32_ONE * 5)); v3 = ((v1) / FX32_ONE); v4 = &Unk_ov109_021D5C14[param2]; @@ -3562,10 +3573,10 @@ static BOOL ov109_021D3C08 (UnkStruct_ov109_021D0F70 * param0, fx32 param1, int return 0; } -static BOOL ov109_021D3C94 (Party * param0) +static BOOL ov109_021D3C94(Party *param0) { int v0, v1; - Pokemon * v2; + Pokemon *v2; v1 = Party_GetCurrentCount(param0); @@ -3582,7 +3593,7 @@ static BOOL ov109_021D3C94 (Party * param0) return 0; } -static BOOL ov109_021D3CD8 (UnkStruct_ov109_021D0F70 * param0) +static BOOL ov109_021D3CD8(UnkStruct_ov109_021D0F70 *param0) { if (ov109_021D3C94(param0->unk_24) == 1) { return 1; @@ -3590,7 +3601,7 @@ static BOOL ov109_021D3CD8 (UnkStruct_ov109_021D0F70 * param0) { int v0; - Party * v1; + Party *v1; for (v0 = 0; v0 < 5; v0++) { if (ov109_021D3B54(param0, v0)) { @@ -3606,7 +3617,7 @@ static BOOL ov109_021D3CD8 (UnkStruct_ov109_021D0F70 * param0) return 0; } -static int ov109_021D3D1C (UnkStruct_ov109_021D0F70 * param0) +static int ov109_021D3D1C(UnkStruct_ov109_021D0F70 *param0) { int v0 = 0; u32 v1 = param0->unk_D0->unk_4A; @@ -3619,7 +3630,7 @@ static int ov109_021D3D1C (UnkStruct_ov109_021D0F70 * param0) return v0; } -static BOOL ov109_021D3D3C (UnkStruct_ov109_021D0F70 * param0) +static BOOL ov109_021D3D3C(UnkStruct_ov109_021D0F70 *param0) { int v0 = 0; u32 v1 = param0->unk_D0->unk_48; @@ -3642,32 +3653,32 @@ static const UnkStruct_ov61_0222C884 Unk_ov109_021D59B8[1] = { }; static const UnkStruct_ov61_0222C884 Unk_ov109_021D5A04[2] = { - {0x1, 0xC, 0x12, 0x8, 0x2, 0xF, 0x94}, - {0x1, 0xC, 0x6, 0x8, 0x2, 0xF, 0xBC} + { 0x1, 0xC, 0x12, 0x8, 0x2, 0xF, 0x94 }, + { 0x1, 0xC, 0x6, 0x8, 0x2, 0xF, 0xBC } }; static const UnkStruct_ov61_0222C884 Unk_ov109_021D5AB0[3] = { - {0x1, 0xC, 0x12, 0x8, 0x2, 0xF, 0x94}, - {0x1, 0x5, 0xA, 0x8, 0x2, 0xF, 0xBC}, - {0x1, 0x13, 0xA, 0x8, 0x2, 0xF, 0xE4} + { 0x1, 0xC, 0x12, 0x8, 0x2, 0xF, 0x94 }, + { 0x1, 0x5, 0xA, 0x8, 0x2, 0xF, 0xBC }, + { 0x1, 0x13, 0xA, 0x8, 0x2, 0xF, 0xE4 } }; static const UnkStruct_ov61_0222C884 Unk_ov109_021D5B54[4] = { - {0x1, 0xC, 0x12, 0x8, 0x2, 0xF, 0x94}, - {0x1, 0x4, 0xD, 0x8, 0x2, 0xF, 0xBC}, - {0x1, 0xC, 0x6, 0x8, 0x2, 0xF, 0xE4}, - {0x1, 0x14, 0xD, 0x8, 0x2, 0xF, 0x10C} + { 0x1, 0xC, 0x12, 0x8, 0x2, 0xF, 0x94 }, + { 0x1, 0x4, 0xD, 0x8, 0x2, 0xF, 0xBC }, + { 0x1, 0xC, 0x6, 0x8, 0x2, 0xF, 0xE4 }, + { 0x1, 0x14, 0xD, 0x8, 0x2, 0xF, 0x10C } }; static const UnkStruct_ov61_0222C884 Unk_ov109_021D5B94[5] = { - {0x1, 0xC, 0x13, 0x8, 0x2, 0xF, 0x94}, - {0x1, 0x4, 0xE, 0x8, 0x2, 0xF, 0xBC}, - {0x1, 0x6, 0x9, 0x8, 0x2, 0xF, 0xE4}, - {0x1, 0x12, 0x9, 0x8, 0x2, 0xF, 0x10C}, - {0x1, 0x14, 0xE, 0x8, 0x2, 0xF, 0X134} + { 0x1, 0xC, 0x13, 0x8, 0x2, 0xF, 0x94 }, + { 0x1, 0x4, 0xE, 0x8, 0x2, 0xF, 0xBC }, + { 0x1, 0x6, 0x9, 0x8, 0x2, 0xF, 0xE4 }, + { 0x1, 0x12, 0x9, 0x8, 0x2, 0xF, 0x10C }, + { 0x1, 0x14, 0xE, 0x8, 0x2, 0xF, 0X134 } }; -static const UnkStruct_ov61_0222C884 * const Unk_ov109_021D5A68[5 + 1] = { +static const UnkStruct_ov61_0222C884 *const Unk_ov109_021D5A68[5 + 1] = { NULL, NULL, Unk_ov109_021D5A04, @@ -3677,21 +3688,21 @@ static const UnkStruct_ov61_0222C884 * const Unk_ov109_021D5A68[5 + 1] = { }; static const u16 Unk_ov109_021D5C44[5 + 1][5] = { - {0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0xB4, 0x0, 0x0, 0x0}, - {0x0, 0xF0, 0x78, 0x0, 0x0}, - {0x0, 0x10E, 0xB4, 0x5A, 0x0}, - {0x0, 0x120, 0xD8, 0x90, 0x48} + { 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0xB4, 0x0, 0x0, 0x0 }, + { 0x0, 0xF0, 0x78, 0x0, 0x0 }, + { 0x0, 0x10E, 0xB4, 0x5A, 0x0 }, + { 0x0, 0x120, 0xD8, 0x90, 0x48 } }; static const u16 Unk_ov109_021D5C80[5 + 1][5] = { - {0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0}, - {0x5A, 0x10E, 0x0, 0x0, 0x0}, - {0x5A, 0xD2, 0x14A, 0x0, 0x0}, - {0x5A, 0xB4, 0x10E, 0x0, 0x0}, - {0x5A, 0xA2, 0xEA, 0x132, 0x12} + { 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5A, 0x10E, 0x0, 0x0, 0x0 }, + { 0x5A, 0xD2, 0x14A, 0x0, 0x0 }, + { 0x5A, 0xB4, 0x10E, 0x0, 0x0 }, + { 0x5A, 0xA2, 0xEA, 0x132, 0x12 } }; static const UnkStruct_ov109_021D59AC Unk_ov109_021D59AC = { @@ -3700,36 +3711,36 @@ static const UnkStruct_ov109_021D59AC Unk_ov109_021D59AC = { }; static const UnkStruct_ov109_021D59AC Unk_ov109_021D59B0[2] = { - {0x0, 0xC6}, - {0x156, 0x167} + { 0x0, 0xC6 }, + { 0x156, 0x167 } }; static const UnkStruct_ov109_021D59AC Unk_ov109_021D59D0[2] = { - {0x25, 0x8E}, - {0xD7, 0x143} + { 0x25, 0x8E }, + { 0xD7, 0x143 } }; static const UnkStruct_ov109_021D59AC Unk_ov109_021D59C0[2] = { - {0x0, 0xD7}, - {0x143, 0x167} + { 0x0, 0xD7 }, + { 0x143, 0x167 } }; static const UnkStruct_ov109_021D5C14 Unk_ov109_021D5C14[5 + 1] = { - {0x0, NULL}, - {0x0, NULL}, - {0x1, &Unk_ov109_021D59AC}, - {0x2, Unk_ov109_021D59B0}, - {0x2, Unk_ov109_021D59D0}, - {0x2, Unk_ov109_021D59C0} + { 0x0, NULL }, + { 0x0, NULL }, + { 0x1, &Unk_ov109_021D59AC }, + { 0x2, Unk_ov109_021D59B0 }, + { 0x2, Unk_ov109_021D59D0 }, + { 0x2, Unk_ov109_021D59C0 } }; static const u32 Unk_ov109_021D5BE4[5 + 1][2] = { - {0x0, 0x0}, - {0x0, 0x0}, - {0x9F, 0xA3}, - {0x9F, 0xA3}, - {0xA4, 0xA8}, - {0xAF, 0xB7} + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0x9F, 0xA3 }, + { 0x9F, 0xA3 }, + { 0xA4, 0xA8 }, + { 0xAF, 0xB7 } }; static const u32 Unk_ov109_021D5A80[5 + 1] = { @@ -3744,8 +3755,8 @@ static const u32 Unk_ov109_021D5A80[5 + 1] = { static const fx32 Unk_ov109_021D5A98[5 + 1] = { 0x0, 0x0, - ((FX32_ONE * -72)), - ((FX32_ONE * 0)), - ((FX32_ONE * -181)), - ((FX32_ONE * 0)) + (FX32_ONE * -72), + (FX32_ONE * 0), + (FX32_ONE * -181), + (FX32_ONE * 0) }; diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 2c1ad0fceb..8499c2b8a0 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -1,19 +1,15 @@ +#include "overlay109/ov109_021D3D50.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "savedata.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" #include "struct_defs/struct_0209BF64.h" #include "struct_defs/struct_0209C194.h" + #include "overlay022/struct_ov22_022559F8.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" @@ -23,41 +19,44 @@ #include "overlay109/struct_ov109_021D5140_sub2.h" #include "overlay115/struct_ov115_02261520.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "journal.h" +#include "message.h" +#include "message_util.h" +#include "narc.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" -#include "journal.h" #include "unk_0202CD50.h" #include "unk_02030EE0.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_02038ED4.h" @@ -65,77 +64,76 @@ #include "unk_0205B33C.h" #include "unk_0205C980.h" #include "unk_0209BDF8.h" -#include "overlay109/ov109_021D3D50.h" -static void ov109_021D40A8(void * param0); +static void ov109_021D40A8(void *param0); static void ov109_021D40D0(void); -static void ov109_021D40F0(BGL * param0); -static void ov109_021D41F8(UnkStruct_ov109_021D5140 * param0, NARC * param1); -static void ov109_021D4294(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D42CC(BGL * param0); -static void ov109_021D4300(UnkStruct_ov109_021D5140 * param0, NARC * param1); +static void ov109_021D40F0(BGL *param0); +static void ov109_021D41F8(UnkStruct_ov109_021D5140 *param0, NARC *param1); +static void ov109_021D4294(UnkStruct_ov109_021D5140 *param0); +static void ov109_021D42CC(BGL *param0); +static void ov109_021D4300(UnkStruct_ov109_021D5140 *param0, NARC *param1); static void ov109_021D43EC(void); -static void ov109_021D441C(UnkStruct_ov109_021D5140 * param0, NARC * param1); -static void ov109_021D4518(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D45F4(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D471C(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D48D0(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D5314(u16 * param0); -static BOOL ov109_021D537C(Window * param0, int param1, u32 param2, UnkStruct_ov109_021D5140 * param3); -static BOOL ov109_021D54CC(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D55A8(UnkStruct_ov109_021D5140 * param0, int param1, int param2); +static void ov109_021D441C(UnkStruct_ov109_021D5140 *param0, NARC *param1); +static void ov109_021D4518(UnkStruct_ov109_021D5140 *param0); +static void ov109_021D45F4(UnkStruct_ov109_021D5140 *param0); +static void ov109_021D471C(UnkStruct_ov109_021D5140 *param0); +static void ov109_021D48D0(UnkStruct_ov109_021D5140 *param0); +static void ov109_021D5314(u16 *param0); +static BOOL ov109_021D537C(Window *param0, int param1, u32 param2, UnkStruct_ov109_021D5140 *param3); +static BOOL ov109_021D54CC(UnkStruct_ov109_021D5140 *param0); +static void ov109_021D55A8(UnkStruct_ov109_021D5140 *param0, int param1, int param2); static int ov109_021D5638(int param0); -static void ov109_021D5658(UnkStruct_ov109_021D5140 * param0); +static void ov109_021D5658(UnkStruct_ov109_021D5140 *param0); static int ov109_021D5360(void); static int ov109_021D548C(void); static u32 ov109_021D54A8(void); -static void ov109_021D5488(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D46D8(Window * param0, Strbuf *param1, int param2); -static void ov109_021D48EC(UnkStruct_ov109_021D5140 * param0, int param1); -static void ov109_021D5668(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D577C(UnkStruct_ov109_021D5140 * param0, NARC * param1); -static void ov109_021D5824(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D57E0(NNSG2dCharacterData * param0[2], NNSG2dPaletteData * param1[2], int param2, int param3, int param4); -static void ov109_021D4044(SysTask * param0, void * param1); -static int ov109_021D5854(UnkStruct_ov109_021D5140 * param0); -static void ov109_021D5858(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D58AC(UnkStruct_ov109_021D5140 * param0, int param1); -static void ov109_021D47B8(UnkStruct_ov109_021D5140 * param0); -static int ov109_021D474C(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D478C(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4C4C(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4C7C(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4CA8(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4B94(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4B64(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4950(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4980(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4AA8(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4AC0(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4B44(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4D9C(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4DBC(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4DF8(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4E28(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4ED8(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4F4C(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4F6C(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4FAC(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4FD8(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D48FC(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4FFC(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D5098(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D505C(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D48D4(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4920(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4CC8(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4D20(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4D80(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D4F28(UnkStruct_ov109_021D5140 * param0, int param1); -static int ov109_021D510C(UnkStruct_ov109_021D5140 * param0, int param1); -static void ov109_021D59A8(SaveData * param0, const UnkStruct_ov109_021D5140_sub2 * param1); - -static int(*const Unk_ov109_021D5E9C[])(UnkStruct_ov109_021D5140 *, int) = { +static void ov109_021D5488(UnkStruct_ov109_021D5140 *param0); +static void ov109_021D46D8(Window *param0, Strbuf *param1, int param2); +static void ov109_021D48EC(UnkStruct_ov109_021D5140 *param0, int param1); +static void ov109_021D5668(UnkStruct_ov109_021D5140 *param0); +static void ov109_021D577C(UnkStruct_ov109_021D5140 *param0, NARC *param1); +static void ov109_021D5824(UnkStruct_ov109_021D5140 *param0); +static void ov109_021D57E0(NNSG2dCharacterData *param0[2], NNSG2dPaletteData *param1[2], int param2, int param3, int param4); +static void ov109_021D4044(SysTask *param0, void *param1); +static int ov109_021D5854(UnkStruct_ov109_021D5140 *param0); +static void ov109_021D5858(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D58AC(UnkStruct_ov109_021D5140 *param0, int param1); +static void ov109_021D47B8(UnkStruct_ov109_021D5140 *param0); +static int ov109_021D474C(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D478C(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4C4C(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4C7C(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4CA8(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4B94(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4B64(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4950(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4980(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4AA8(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4AC0(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4B44(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4D9C(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4DBC(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4DF8(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4E28(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4ED8(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4F4C(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4F6C(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4FAC(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4FD8(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D48FC(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4FFC(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D5098(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D505C(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D48D4(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4920(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4CC8(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4D20(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4D80(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D4F28(UnkStruct_ov109_021D5140 *param0, int param1); +static int ov109_021D510C(UnkStruct_ov109_021D5140 *param0, int param1); +static void ov109_021D59A8(SaveData *param0, const UnkStruct_ov109_021D5140_sub2 *param1); + +static int (*const Unk_ov109_021D5E9C[])(UnkStruct_ov109_021D5140 *, int) = { ov109_021D474C, ov109_021D48D4, ov109_021D4920, @@ -170,11 +168,11 @@ static int(*const Unk_ov109_021D5E9C[])(UnkStruct_ov109_021D5140 *, int) = { ov109_021D510C, }; -int ov109_021D3D50 (OverlayManager * param0, int * param1) +int ov109_021D3D50(OverlayManager *param0, int *param1) { - UnkStruct_ov109_021D5140 * v0; - NARC * v1; - UnkStruct_0209C194 * v2 = OverlayManager_Args(param0); + UnkStruct_ov109_021D5140 *v0; + NARC *v1; + UnkStruct_0209C194 *v2 = OverlayManager_Args(param0); switch (*param1) { case 0: @@ -234,9 +232,9 @@ int ov109_021D3D50 (OverlayManager * param0, int * param1) return 0; } -int ov109_021D3EB0 (OverlayManager * param0, int * param1) +int ov109_021D3EB0(OverlayManager *param0, int *param1) { - UnkStruct_ov109_021D5140 * v0 = OverlayManager_Data(param0); + UnkStruct_ov109_021D5140 *v0 = OverlayManager_Data(param0); if ((CommSys_CurNetId() == 0) && (v0->unk_10->unk_30 != 0)) { v0->unk_10->unk_30 &= sub_020318EC(); @@ -295,10 +293,10 @@ int ov109_021D3EB0 (OverlayManager * param0, int * param1) return 0; } -int ov109_021D3F9C (OverlayManager * param0, int * param1) +int ov109_021D3F9C(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov109_021D5140 * v1 = OverlayManager_Data(param0); + UnkStruct_ov109_021D5140 *v1 = OverlayManager_Data(param0); SysTask_Done(v1->unk_30); sub_0200A4E4(v1->unk_200[2][0]); @@ -335,21 +333,21 @@ int ov109_021D3F9C (OverlayManager * param0, int * param1) } static const u8 Unk_ov109_021D5DA6[][2] = { - {0x8, 0x2}, - {0x8, 0x3}, - {0x8, 0x4}, - {0x18, 0x0}, - {0x0, 0xFF} + { 0x8, 0x2 }, + { 0x8, 0x3 }, + { 0x8, 0x4 }, + { 0x18, 0x0 }, + { 0x0, 0xFF } }; -static void ov109_021D4044 (SysTask * param0, void * param1) +static void ov109_021D4044(SysTask *param0, void *param1) { - UnkStruct_ov109_021D5140 * v0 = (UnkStruct_ov109_021D5140 *)param1; - UnkStruct_ov109_021D5140_sub1 * v1 = &v0->unk_1C; + UnkStruct_ov109_021D5140 *v0 = (UnkStruct_ov109_021D5140 *)param1; + UnkStruct_ov109_021D5140_sub1 *v1 = &v0->unk_1C; if (v1->unk_00) { if (v1->unk_08 > Unk_ov109_021D5DA6[v1->unk_04][0]) { - u16 * v2; + u16 *v2; v1->unk_08 = 0; v1->unk_04++; @@ -368,7 +366,7 @@ static void ov109_021D4044 (SysTask * param0, void * param1) } } -static void ov109_021D40A8 (void * param0) +static void ov109_021D40A8(void *param0) { sub_0201DCAC(); sub_0200A858(); @@ -377,7 +375,7 @@ static void ov109_021D40A8 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov109_021D40D0 (void) +static void ov109_021D40D0(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -395,7 +393,7 @@ static void ov109_021D40D0 (void) GXLayers_SetBanks(&v0); } -static void ov109_021D40F0 (BGL * param0) +static void ov109_021D40F0(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -515,7 +513,7 @@ static void ov109_021D40F0 (BGL * param0) sub_02019690(4, 32, 0, 95); } -static void ov109_021D41F8 (UnkStruct_ov109_021D5140 * param0, NARC * param1) +static void ov109_021D41F8(UnkStruct_ov109_021D5140 *param0, NARC *param1) { int v0; @@ -543,7 +541,7 @@ static void ov109_021D41F8 (UnkStruct_ov109_021D5140 * param0, NARC * param1) param0->unk_10->unk_2C = 2; } -static void ov109_021D4294 (UnkStruct_ov109_021D5140 * param0) +static void ov109_021D4294(UnkStruct_ov109_021D5140 *param0) { int v0; @@ -559,7 +557,7 @@ static void ov109_021D4294 (UnkStruct_ov109_021D5140 * param0) Strbuf_Free(param0->unk_54); } -static void ov109_021D42CC (BGL * param0) +static void ov109_021D42CC(BGL *param0) { sub_02019044(param0, 6); sub_02019044(param0, 5); @@ -569,9 +567,9 @@ static void ov109_021D42CC (BGL * param0) Heap_FreeToHeap(param0); } -static void ov109_021D4300 (UnkStruct_ov109_021D5140 * param0, NARC * param1) +static void ov109_021D4300(UnkStruct_ov109_021D5140 *param0, NARC *param1) { - BGL * v0 = param0->unk_14; + BGL *v0 = param0->unk_14; sub_02007130(param1, 0, 0, 0, 16 * 16 * 2, 95); sub_02006E84(12, 12, 4, 0, 16 * 2, 95); @@ -581,12 +579,11 @@ static void ov109_021D4300 (UnkStruct_ov109_021D5140 * param0, NARC * param1) sub_02006E60(12, 11, v0, 6, 0, 0, 1, 95); sub_020070E8(param1, 2, v0, 1, 0, 32 * 8 * 0x20, 1, 95); sub_0200710C(param1, 3, v0, 1, 0, 32 * 24 * 2, 1, 95); - sub_0200DD0C(v0, 0, 1, 10, - Options_Frame(param0->unk_0C->unk_14.unk_10), 95); + sub_0200DD0C(v0, 0, 1, 10, Options_Frame(param0->unk_0C->unk_14.unk_10), 95); sub_0200DAA4(v0, 0, 1 + (18 + 12), 11, 0, 95); } -static void ov109_021D43EC (void) +static void ov109_021D43EC(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -601,7 +598,7 @@ static void ov109_021D43EC (void) sub_0201F8E4(); } -static void ov109_021D441C (UnkStruct_ov109_021D5140 * param0, NARC * param1) +static void ov109_021D441C(UnkStruct_ov109_021D5140 *param0, NARC *param1) { int v0; @@ -627,15 +624,15 @@ static void ov109_021D441C (UnkStruct_ov109_021D5140 * param0, NARC * param1) } static const u16 Unk_ov109_021D5DD0[][2] = { - {0xCC, 0x54}, - {0xCC, 0x35}, - {0xE9, 0x48}, - {0xDF, 0x67}, - {0xB8, 0x67}, - {0xAE, 0x48} + { 0xCC, 0x54 }, + { 0xCC, 0x35 }, + { 0xE9, 0x48 }, + { 0xDF, 0x67 }, + { 0xB8, 0x67 }, + { 0xAE, 0x48 } }; -static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0) +static void ov109_021D4518(UnkStruct_ov109_021D5140 *param0) { int v0; @@ -675,7 +672,7 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov109_021D45F4 (UnkStruct_ov109_021D5140 * param0) +static void ov109_021D45F4(UnkStruct_ov109_021D5140 *param0) { BGL_AddWindow(param0->unk_14, ¶m0->unk_36C, 5, 26, 20, 6, 2, 13, 1 + 30 * 15); BGL_FillWindow(¶m0->unk_36C, 0x0); @@ -693,7 +690,7 @@ static void ov109_021D45F4 (UnkStruct_ov109_021D5140 * param0) } } -static void ov109_021D46D8 (Window * param0, Strbuf *param1, int param2) +static void ov109_021D46D8(Window *param0, Strbuf *param1, int param2) { int v0 = sub_02002D7C(1, param1, 0); int v1 = (26 * 8 - v0) / 2; @@ -702,7 +699,7 @@ static void ov109_021D46D8 (Window * param0, Strbuf *param1, int param2) sub_0201D78C(param0, 1, param1, v1, 1, param2, (u32)(((1 & 0xff) << 16) | ((4 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); } -static void ov109_021D471C (UnkStruct_ov109_021D5140 * param0) +static void ov109_021D471C(UnkStruct_ov109_021D5140 *param0) { int v0; @@ -712,7 +709,7 @@ static void ov109_021D471C (UnkStruct_ov109_021D5140 * param0) BGL_DeleteWindow(¶m0->unk_35C); } -static int ov109_021D474C (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D474C(UnkStruct_ov109_021D5140 *param0, int param1) { CommMan_SetErrorHandling(0, 1); @@ -729,7 +726,7 @@ static int ov109_021D474C (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D478C (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D478C(UnkStruct_ov109_021D5140 *param0, int param1) { ov109_021D47B8(param0); @@ -744,7 +741,7 @@ static int ov109_021D478C (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static void ov109_021D47B8 (UnkStruct_ov109_021D5140 * param0) +static void ov109_021D47B8(UnkStruct_ov109_021D5140 *param0) { if (gCoreSys.pressedKeys & PAD_BUTTON_A) { if (CommSys_CurNetId() == 0) { @@ -790,12 +787,12 @@ static void ov109_021D47B8 (UnkStruct_ov109_021D5140 * param0) } } -static void ov109_021D48D0 (UnkStruct_ov109_021D5140 * param0) +static void ov109_021D48D0(UnkStruct_ov109_021D5140 *param0) { return; } -static int ov109_021D48D4 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D48D4(UnkStruct_ov109_021D5140 *param0, int param1) { ov109_021D48EC(param0, 2); ov109_021D48D0(param0); @@ -803,13 +800,13 @@ static int ov109_021D48D4 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static void ov109_021D48EC (UnkStruct_ov109_021D5140 * param0, int param1) +static void ov109_021D48EC(UnkStruct_ov109_021D5140 *param0, int param1) { param0->unk_3B8 = 30; param0->unk_3BC = param1; } -static int ov109_021D48FC (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D48FC(UnkStruct_ov109_021D5140 *param0, int param1) { if (ov109_021D5638(param0->unk_5C)) { param0->unk_3B8 = param0->unk_3BC; @@ -820,7 +817,7 @@ static int ov109_021D48FC (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4920 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4920(UnkStruct_ov109_021D5140 *param0, int param1) { if (CommSys_CurNetId() == 0) { int v0 = 0; @@ -844,7 +841,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov109_021D5D94 = { 0x178 }; -static int ov109_021D4950 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4950(UnkStruct_ov109_021D5140 *param0, int param1) { param0->unk_394 = sub_02002100(param0->unk_14, &Unk_ov109_021D5D94, (1 + (18 + 12)), 11, 95); param0->unk_3B8 = 5; @@ -853,7 +850,7 @@ static int ov109_021D4950 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4980 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4980(UnkStruct_ov109_021D5140 *param0, int param1) { int v0; u32 v1; @@ -922,7 +919,7 @@ static int ov109_021D4980 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4AA8 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4AA8(UnkStruct_ov109_021D5140 *param0, int param1) { param0->unk_4AC0 = 0; ov109_021D48D0(param0); @@ -930,7 +927,7 @@ static int ov109_021D4AA8 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4AC0 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4AC0(UnkStruct_ov109_021D5140 *param0, int param1) { if ((param0->unk_10->unk_38 != CommSys_ConnectedCount()) || (param0->unk_10->unk_38 != ov109_021D548C())) { param0->unk_4AC0 = 0; @@ -958,7 +955,7 @@ static int ov109_021D4AC0 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4B44 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4B44(UnkStruct_ov109_021D5140 *param0, int param1) { param0->unk_4AB4 = 0; @@ -968,7 +965,7 @@ static int ov109_021D4B44 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4B64 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4B64(UnkStruct_ov109_021D5140 *param0, int param1) { param0->unk_394 = sub_02002100(param0->unk_14, &Unk_ov109_021D5D94, (1 + (18 + 12)), 11, 95); param0->unk_3B8 = 23; @@ -978,7 +975,7 @@ static int ov109_021D4B64 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4B94 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4B94(UnkStruct_ov109_021D5140 *param0, int param1) { int v0; u32 v1; @@ -1019,7 +1016,7 @@ static int ov109_021D4B94 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4C4C (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4C4C(UnkStruct_ov109_021D5140 *param0, int param1) { if (param0->unk_4AB7 == 0) { if (sub_0209BEBC(param0->unk_10, 5, NULL, 0) == 1) { @@ -1030,7 +1027,7 @@ static int ov109_021D4C4C (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4C7C (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4C7C(UnkStruct_ov109_021D5140 *param0, int param1) { int v0, v1; @@ -1047,7 +1044,7 @@ static int ov109_021D4C7C (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4CA8 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4CA8(UnkStruct_ov109_021D5140 *param0, int param1) { ov109_021D59A8(param0->unk_0C->unk_14.unk_08, param0->unk_FE4); @@ -1056,9 +1053,9 @@ static int ov109_021D4CA8 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4CC8 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4CC8(UnkStruct_ov109_021D5140 *param0, int param1) { - void * v0; + void *v0; gCoreSys.inhibitReset = 1; @@ -1074,7 +1071,7 @@ static int ov109_021D4CC8 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4D20 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4D20(UnkStruct_ov109_021D5140 *param0, int param1) { if ((CommSys_CurNetId() == 0) && (CommSys_ConnectedCount() != param0->unk_4AB6)) { (void)0; @@ -1094,7 +1091,7 @@ static int ov109_021D4D20 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4D80 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4D80(UnkStruct_ov109_021D5140 *param0, int param1) { if (param0->unk_3C4++ > 60) { param0->unk_3B8 = 15; @@ -1103,7 +1100,7 @@ static int ov109_021D4D80 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4D9C (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4D9C(UnkStruct_ov109_021D5140 *param0, int param1) { u8 v0; @@ -1117,7 +1114,7 @@ static int ov109_021D4D9C (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4DBC (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4DBC(UnkStruct_ov109_021D5140 *param0, int param1) { if (++param0->unk_3C4 > 60) { sub_0200F174(0, 16, 16, 0x0, 16, 1, 95); @@ -1128,7 +1125,7 @@ static int ov109_021D4DBC (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4DF8 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4DF8(UnkStruct_ov109_021D5140 *param0, int param1) { param0->unk_394 = sub_02002100(param0->unk_14, &Unk_ov109_021D5D94, (1 + (18 + 12)), 11, 95); param0->unk_3B8 = 12; @@ -1137,7 +1134,7 @@ static int ov109_021D4DF8 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4E28 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4E28(UnkStruct_ov109_021D5140 *param0, int param1) { int v0; @@ -1173,7 +1170,7 @@ static int ov109_021D4E28 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4ED8 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4ED8(UnkStruct_ov109_021D5140 *param0, int param1) { if (CommSys_CurNetId() == 0) { ov109_021D55A8(param0, 5, 0); @@ -1189,7 +1186,7 @@ static int ov109_021D4ED8 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4F28 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4F28(UnkStruct_ov109_021D5140 *param0, int param1) { param0->unk_3C4++; @@ -1201,7 +1198,7 @@ static int ov109_021D4F28 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4F4C (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4F4C(UnkStruct_ov109_021D5140 *param0, int param1) { CommTiming_StartSync(202); param0->unk_3B8 = 16; @@ -1210,7 +1207,7 @@ static int ov109_021D4F4C (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4F6C (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4F6C(UnkStruct_ov109_021D5140 *param0, int param1) { if (CommTiming_IsSyncState(202)) { CommMan_SetErrorHandling(0, 0); @@ -1222,7 +1219,7 @@ static int ov109_021D4F6C (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4FAC (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4FAC(UnkStruct_ov109_021D5140 *param0, int param1) { if (ov109_021D5638(param0->unk_5C)) { ov109_021D55A8(param0, 9, 0); @@ -1234,7 +1231,7 @@ static int ov109_021D4FAC (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4FD8 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4FD8(UnkStruct_ov109_021D5140 *param0, int param1) { if (ov109_021D5638(param0->unk_5C)) { param0->unk_3B8 = 10; @@ -1244,7 +1241,7 @@ static int ov109_021D4FD8 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D4FFC (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D4FFC(UnkStruct_ov109_021D5140 *param0, int param1) { if ((param0->unk_5C != 0xff) && (ov109_021D5638(param0->unk_5C) == 0)) { PrintString_ForceStop(param0->unk_5C); @@ -1265,7 +1262,7 @@ static int ov109_021D4FFC (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D505C (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D505C(UnkStruct_ov109_021D5140 *param0, int param1) { if ((param0->unk_4ABC != 0) && (CommSys_ConnectedCount() != param0->unk_4ABC)) { param0->unk_4ABC = 0; @@ -1278,7 +1275,7 @@ static int ov109_021D505C (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D5098 (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D5098(UnkStruct_ov109_021D5140 *param0, int param1) { if ((param0->unk_4ABC != 0) && (CommSys_ConnectedCount() != param0->unk_4ABC)) { param0->unk_4ABC = 0; @@ -1302,7 +1299,7 @@ static int ov109_021D5098 (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -static int ov109_021D510C (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D510C(UnkStruct_ov109_021D5140 *param0, int param1) { sub_0205BEA8(12); sub_0200F174(0, 16, 16, 0x0, 16, 1, 95); @@ -1314,7 +1311,7 @@ static int ov109_021D510C (UnkStruct_ov109_021D5140 * param0, int param1) return param1; } -void ov109_021D5140 (UnkStruct_ov109_021D5140 * param0, int param1, u8 param2) +void ov109_021D5140(UnkStruct_ov109_021D5140 *param0, int param1, u8 param2) { switch (param1) { case 2: @@ -1383,7 +1380,7 @@ void ov109_021D5140 (UnkStruct_ov109_021D5140 * param0, int param1, u8 param2) param0->unk_3B8 = param1; } -void ov109_021D5258 (UnkStruct_ov109_021D5140 * param0, int param1, u8 param2) +void ov109_021D5258(UnkStruct_ov109_021D5140 *param0, int param1, u8 param2) { if (param0->unk_3B8 == 3) { switch (param1) { @@ -1423,7 +1420,7 @@ void ov109_021D5258 (UnkStruct_ov109_021D5140 * param0, int param1, u8 param2) } } -static void ov109_021D5314 (u16 * param0) +static void ov109_021D5314(u16 *param0) { fx32 v0; GXRgb v1; @@ -1443,10 +1440,10 @@ static void ov109_021D5314 (u16 * param0) GX_LoadOBJPltt((u16 *)&v1, (5 + 16) * 2, 2); } -static int ov109_021D5360 (void) +static int ov109_021D5360(void) { int v0, v1; - TrainerInfo * v2; + TrainerInfo *v2; v1 = 0; @@ -1461,10 +1458,10 @@ static int ov109_021D5360 (void) return v1; } -static BOOL ov109_021D537C (Window * param0, int param1, u32 param2, UnkStruct_ov109_021D5140 * param3) +static BOOL ov109_021D537C(Window *param0, int param1, u32 param2, UnkStruct_ov109_021D5140 *param3) { int v0, v1 = CommSys_CurNetId(); - Strbuf* v2 = NULL; + Strbuf *v2 = NULL; if (!ov109_021D54CC(param3)) { return 0; @@ -1497,12 +1494,12 @@ static BOOL ov109_021D537C (Window * param0, int param1, u32 param2, UnkStruct_o return 1; } -static void ov109_021D5488 (UnkStruct_ov109_021D5140 * param0) +static void ov109_021D5488(UnkStruct_ov109_021D5140 *param0) { return; } -static int ov109_021D548C (void) +static int ov109_021D548C(void) { int v0, v1; @@ -1515,7 +1512,7 @@ static int ov109_021D548C (void) return v1; } -static u32 ov109_021D54A8 (void) +static u32 ov109_021D54A8(void) { int v0; u32 v1; @@ -1529,7 +1526,7 @@ static u32 ov109_021D54A8 (void) return v1; } -static BOOL ov109_021D54CC (UnkStruct_ov109_021D5140 * param0) +static BOOL ov109_021D54CC(UnkStruct_ov109_021D5140 *param0) { int v0, v1 = 0; @@ -1571,9 +1568,9 @@ static BOOL ov109_021D54CC (UnkStruct_ov109_021D5140 * param0) return v1; } -static void ov109_021D55A8 (UnkStruct_ov109_021D5140 * param0, int param1, int param2) +static void ov109_021D55A8(UnkStruct_ov109_021D5140 *param0, int param1, int param2) { - Strbuf* v0; + Strbuf *v0; v0 = Strbuf_Init((90 * 2), 95); @@ -1591,7 +1588,7 @@ static void ov109_021D55A8 (UnkStruct_ov109_021D5140 * param0, int param1, int p } } -static int ov109_021D5638 (int param0) +static int ov109_021D5638(int param0) { if (param0 == 0xff) { return 1; @@ -1604,12 +1601,12 @@ static int ov109_021D5638 (int param0) return 0; } -static void ov109_021D5658 (UnkStruct_ov109_021D5140 * param0) +static void ov109_021D5658(UnkStruct_ov109_021D5140 *param0) { sub_0200E084(¶m0->unk_35C, 0); } -static void ov109_021D5668 (UnkStruct_ov109_021D5140 * param0) +static void ov109_021D5668(UnkStruct_ov109_021D5140 *param0) { int v0, v1 = 0; @@ -1617,8 +1614,7 @@ static void ov109_021D5668 (UnkStruct_ov109_021D5140 * param0) switch (param0->unk_400[v0]) { case 0: break; - case 1: - { + case 1: { int v2, v3; GF_ASSERT(param0->unk_3D8[v0][0] != NULL); @@ -1658,7 +1654,7 @@ static void ov109_021D5668 (UnkStruct_ov109_021D5140 * param0) } } -static void ov109_021D577C (UnkStruct_ov109_021D5140 * param0, NARC * param1) +static void ov109_021D577C(UnkStruct_ov109_021D5140 *param0, NARC *param1) { param0->unk_3A8[0] = sub_02006F88(104, 8, &(param0->unk_3B0[0]), 95); param0->unk_3A8[1] = sub_020071EC(param1, 7, &(param0->unk_3B0[1]), 95); @@ -1674,10 +1670,10 @@ static const u16 Unk_ov109_021D5D9C[] = { 0x19A0 }; -static void ov109_021D57E0 (NNSG2dCharacterData * param0[2], NNSG2dPaletteData * param1[2], int param2, int param3, int param4) +static void ov109_021D57E0(NNSG2dCharacterData *param0[2], NNSG2dPaletteData *param1[2], int param2, int param3, int param4) { int v0; - u8 * v1, * v2; + u8 *v1, *v2; v0 = sub_0205CA0C(param4, param3); v1 = (u8 *)param0[1]->pRawData; @@ -1687,7 +1683,7 @@ static void ov109_021D57E0 (NNSG2dCharacterData * param0[2], NNSG2dPaletteData * GX_LoadOBJPltt(&v2[v0 * 32], (param2 + 7) * 32, 32); } -static void ov109_021D5824 (UnkStruct_ov109_021D5140 * param0) +static void ov109_021D5824(UnkStruct_ov109_021D5140 *param0) { Heap_FreeToHeap(param0->unk_3A8[0]); Heap_FreeToHeap(param0->unk_3A8[1]); @@ -1695,12 +1691,12 @@ static void ov109_021D5824 (UnkStruct_ov109_021D5140 * param0) Heap_FreeToHeap(param0->unk_398[1]); } -static int ov109_021D5854 (UnkStruct_ov109_021D5140 * param0) +static int ov109_021D5854(UnkStruct_ov109_021D5140 *param0) { return 1; } -static void ov109_021D5858 (UnkStruct_ov109_021D5140 * param0, int param1) +static void ov109_021D5858(UnkStruct_ov109_021D5140 *param0, int param1) { if (CommSys_CurNetId() == 0) { if (param1 == -1) { @@ -1725,7 +1721,7 @@ static void ov109_021D5858 (UnkStruct_ov109_021D5140 * param0, int param1) } } -static int ov109_021D58AC (UnkStruct_ov109_021D5140 * param0, int param1) +static int ov109_021D58AC(UnkStruct_ov109_021D5140 *param0, int param1) { int v0; @@ -1788,7 +1784,7 @@ static int ov109_021D58AC (UnkStruct_ov109_021D5140 * param0, int param1) return 1; } -void ov109_021D59A8 (SaveData * param0, const UnkStruct_ov109_021D5140_sub2 * param1) +void ov109_021D59A8(SaveData *param0, const UnkStruct_ov109_021D5140_sub2 *param1) { return; } diff --git a/src/overlay110/ov110_021D2124.c b/src/overlay110/ov110_021D2124.c index ec71ad7dab..241e1bf71f 100644 --- a/src/overlay110/ov110_021D2124.c +++ b/src/overlay110/ov110_021D2124.c @@ -1,76 +1,77 @@ +#include "overlay110/ov110_021D2124.h" + #include #include #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay061/struct_ov61_0222C884.h" #include "unk_02018340.h" -#include "overlay110/ov110_021D2124.h" typedef struct { - const UnkStruct_ov61_0222C884 * unk_00; + const UnkStruct_ov61_0222C884 *unk_00; u32 unk_04; } UnkStruct_ov110_021D2278; -void ov110_021D2124(BGL * param0, Window * param1, u8 param2); -void ov110_021D216C(Window * param0, u8 param1); +void ov110_021D2124(BGL *param0, Window *param1, u8 param2); +void ov110_021D216C(Window *param0, u8 param1); static const UnkStruct_ov61_0222C884 Unk_ov110_021D22A0[] = { - {0x0, 0x2, 0x2, 0x1E, 0x2, 0xD, 0x1}, - {0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x3D}, - {0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x75}, - {0x0, 0x2, 0xC, 0x1C, 0x2, 0xD, 0xAD}, - {0x0, 0x2, 0xF, 0x10, 0x2, 0xD, 0xE5}, - {0x0, 0x2, 0x12, 0x1C, 0x2, 0xD, 0x105}, - {0x0, 0x2, 0x14, 0x1C, 0x2, 0xD, 0x13D} + { 0x0, 0x2, 0x2, 0x1E, 0x2, 0xD, 0x1 }, + { 0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x3D }, + { 0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x75 }, + { 0x0, 0x2, 0xC, 0x1C, 0x2, 0xD, 0xAD }, + { 0x0, 0x2, 0xF, 0x10, 0x2, 0xD, 0xE5 }, + { 0x0, 0x2, 0x12, 0x1C, 0x2, 0xD, 0x105 }, + { 0x0, 0x2, 0x14, 0x1C, 0x2, 0xD, 0x13D } }; static const UnkStruct_ov61_0222C884 Unk_ov110_021D2238[] = { - {0x0, 0x2, 0x2, 0x1C, 0x2, 0xD, 0x1}, - {0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x39}, - {0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x71}, - {0x0, 0x2, 0xD, 0x1C, 0x2, 0xD, 0xA9} + { 0x0, 0x2, 0x2, 0x1C, 0x2, 0xD, 0x1 }, + { 0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x39 }, + { 0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x71 }, + { 0x0, 0x2, 0xD, 0x1C, 0x2, 0xD, 0xA9 } }; static const UnkStruct_ov61_0222C884 Unk_ov110_021D2258[] = { - {0x0, 0x2, 0x2, 0x1C, 0x2, 0xD, 0x1}, - {0x0, 0x12, 0x7, 0xC, 0x2, 0xD, 0x39}, - {0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x51}, - {0x0, 0x2, 0xD, 0x1C, 0x2, 0xD, 0x89} + { 0x0, 0x2, 0x2, 0x1C, 0x2, 0xD, 0x1 }, + { 0x0, 0x12, 0x7, 0xC, 0x2, 0xD, 0x39 }, + { 0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x51 }, + { 0x0, 0x2, 0xD, 0x1C, 0x2, 0xD, 0x89 } }; static const UnkStruct_ov61_0222C884 Unk_ov110_021D2220[] = { - {0x0, 0x2, 0x2, 0x1C, 0x2, 0xD, 0x1}, - {0x0, 0x2, 0x8, 0x1C, 0x2, 0xD, 0x39}, - {0x0, 0x2, 0xB, 0x1C, 0x2, 0xD, 0x71} + { 0x0, 0x2, 0x2, 0x1C, 0x2, 0xD, 0x1 }, + { 0x0, 0x2, 0x8, 0x1C, 0x2, 0xD, 0x39 }, + { 0x0, 0x2, 0xB, 0x1C, 0x2, 0xD, 0x71 } }; static const UnkStruct_ov61_0222C884 Unk_ov110_021D22D8[] = { - {0x0, 0x2, 0x2, 0x1E, 0x2, 0xD, 0x1}, - {0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x3D}, - {0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x75}, - {0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0xAD}, - {0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x75}, - {0x0, 0x2, 0xC, 0x1C, 0x2, 0xD, 0xAD}, - {0x0, 0x2, 0xF, 0x10, 0x2, 0xD, 0xE5}, - {0x0, 0x2, 0x12, 0x1C, 0x2, 0xD, 0x105}, - {0x0, 0x2, 0x14, 0x1C, 0x2, 0xD, 0x13D} + { 0x0, 0x2, 0x2, 0x1E, 0x2, 0xD, 0x1 }, + { 0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x3D }, + { 0x0, 0x2, 0x7, 0x1C, 0x2, 0xD, 0x75 }, + { 0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0xAD }, + { 0x0, 0x2, 0xA, 0x1C, 0x2, 0xD, 0x75 }, + { 0x0, 0x2, 0xC, 0x1C, 0x2, 0xD, 0xAD }, + { 0x0, 0x2, 0xF, 0x10, 0x2, 0xD, 0xE5 }, + { 0x0, 0x2, 0x12, 0x1C, 0x2, 0xD, 0x105 }, + { 0x0, 0x2, 0x14, 0x1C, 0x2, 0xD, 0x13D } }; static const UnkStruct_ov110_021D2278 Unk_ov110_021D2278[5] = { - {Unk_ov110_021D22A0, 0x7}, - {Unk_ov110_021D2238, 0x4}, - {Unk_ov110_021D2258, 0x4}, - {Unk_ov110_021D2220, 0x3}, - {Unk_ov110_021D22D8, 0x9} + { Unk_ov110_021D22A0, 0x7 }, + { Unk_ov110_021D2238, 0x4 }, + { Unk_ov110_021D2258, 0x4 }, + { Unk_ov110_021D2220, 0x3 }, + { Unk_ov110_021D22D8, 0x9 } }; -void ov110_021D2124 (BGL * param0, Window * param1, u8 param2) +void ov110_021D2124(BGL *param0, Window *param1, u8 param2) { u8 v0; - const UnkStruct_ov61_0222C884 * v1 = Unk_ov110_021D2278[param2].unk_00; + const UnkStruct_ov61_0222C884 *v1 = Unk_ov110_021D2278[param2].unk_00; u32 v2 = Unk_ov110_021D2278[param2].unk_04; for (v0 = 0; v0 < v2; v0++) { @@ -81,7 +82,7 @@ void ov110_021D2124 (BGL * param0, Window * param1, u8 param2) return; } -void ov110_021D216C (Window * param0, u8 param1) +void ov110_021D216C(Window *param0, u8 param1) { u16 v0; u32 v1 = Unk_ov110_021D2278[param1].unk_04; diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index da265202c4..7458d0c227 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -1,59 +1,58 @@ +#include "overlay111/ov111_021D0D80.h" + #include #include #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C440_decl.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "savedata.h" -#include "overlay111/struct_ov111_021D0F7C_decl.h" -#include "overlay111/struct_ov111_021D33F4_decl.h" - #include "struct_defs/struct_02015958.h" -#include "touch_screen.h" #include "struct_defs/struct_0203E608.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay072/struct_ov72_0223E2A8.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay111/ov111_021D2F80.h" +#include "overlay111/ov111_021D33F4.h" +#include "overlay111/ov111_021D3548.h" +#include "overlay111/struct_ov111_021D0F7C_decl.h" #include "overlay111/struct_ov111_021D2F80.h" +#include "overlay111/struct_ov111_021D33F4_decl.h" #include "overlay111/struct_ov111_021D3620.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "touch_screen.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_0201567C.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "game_options.h" -#include "overlay111/ov111_021D0D80.h" -#include "overlay111/ov111_021D2F80.h" -#include "overlay111/ov111_021D33F4.h" -#include "overlay111/ov111_021D3548.h" typedef struct { u8 unk_00; @@ -63,8 +62,8 @@ typedef struct { } UnkStruct_ov111_021D3728; struct UnkStruct_ov111_021D0F7C_t { - OverlayManager * unk_00; - OverlayManager * unk_04; + OverlayManager *unk_00; + OverlayManager *unk_04; u8 unk_08; u8 unk_09; u8 unk_0A; @@ -80,38 +79,38 @@ struct UnkStruct_ov111_021D0F7C_t { u8 unk_19[3]; VecFx32 unk_1C; VecFx32 unk_28; - void * unk_34; - MessageLoader * unk_38; - StringTemplate * unk_3C; - Strbuf* unk_40; - Strbuf* unk_44; + void *unk_34; + MessageLoader *unk_38; + StringTemplate *unk_3C; + Strbuf *unk_40; + Strbuf *unk_44; u16 unk_48[8]; - BGL * unk_58; + BGL *unk_58; Window unk_5C[16]; - PaletteData * unk_15C; - UnkStruct_0200C440 * unk_160; - Options * unk_164; - SaveData * unk_168; + PaletteData *unk_15C; + UnkStruct_0200C440 *unk_160; + Options *unk_164; + SaveData *unk_168; UnkStruct_ov111_021D2F80 unk_16C; - UnkStruct_ov111_021D33F4 * unk_35C[4]; - UnkStruct_ov111_021D33F4 * unk_36C[9]; - UnkStruct_ov111_021D33F4 * unk_390[4]; - UnkStruct_ov111_021D33F4 * unk_3A0; - UnkStruct_ov111_021D33F4 * unk_3A4; - UnkStruct_ov111_021D33F4 * unk_3A8[3]; - UnkStruct_ov111_021D33F4 * unk_3B4[3]; - UnkStruct_ov111_021D33F4 * unk_3C0; + UnkStruct_ov111_021D33F4 *unk_35C[4]; + UnkStruct_ov111_021D33F4 *unk_36C[9]; + UnkStruct_ov111_021D33F4 *unk_390[4]; + UnkStruct_ov111_021D33F4 *unk_3A0; + UnkStruct_ov111_021D33F4 *unk_3A4; + UnkStruct_ov111_021D33F4 *unk_3A8[3]; + UnkStruct_ov111_021D33F4 *unk_3B4[3]; + UnkStruct_ov111_021D33F4 *unk_3C0; u8 unk_3C4[9]; u16 unk_3CE[4]; - u16 * unk_3D8; - u16 * unk_3DC; - u16 * unk_3E0; - NARC * unk_3E4; + u16 *unk_3D8; + u16 *unk_3DC; + u16 *unk_3E0; + NARC *unk_3E4; u8 padding_3E8[8]; - void * unk_3F0; - NNSG2dCharacterData * unk_3F4; - u8 * unk_3F8; - UnkStruct_02015920 * unk_3FC; + void *unk_3F0; + NNSG2dCharacterData *unk_3F4; + u8 *unk_3F8; + UnkStruct_02015920 *unk_3FC; u8 unk_400[9]; u8 unk_409; u8 unk_40A; @@ -127,82 +126,82 @@ struct UnkStruct_ov111_021D0F7C_t { u8 unk_466[38400]; }; -int ov111_021D0D80(OverlayManager * param0, int * param1); -int ov111_021D0E34(OverlayManager * param0, int * param1); -int ov111_021D0F40(OverlayManager * param0, int * param1); -static BOOL ov111_021D0F7C(UnkStruct_ov111_021D0F7C * param0); -static BOOL ov111_021D0FC8(UnkStruct_ov111_021D0F7C * param0); -static BOOL ov111_021D10B8(UnkStruct_ov111_021D0F7C * param0); -static BOOL ov111_021D116C(UnkStruct_ov111_021D0F7C * param0); -static BOOL ov111_021D1284(UnkStruct_ov111_021D0F7C * param0); -static BOOL ov111_021D1508(UnkStruct_ov111_021D0F7C * param0); -static BOOL ov111_021D1980(UnkStruct_ov111_021D0F7C * param0); -static BOOL ov111_021D1A88(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D1AF4(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D1B44(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D1B90(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D1BEC(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D1C0C(UnkStruct_ov111_021D0F7C * param0); +int ov111_021D0D80(OverlayManager *param0, int *param1); +int ov111_021D0E34(OverlayManager *param0, int *param1); +int ov111_021D0F40(OverlayManager *param0, int *param1); +static BOOL ov111_021D0F7C(UnkStruct_ov111_021D0F7C *param0); +static BOOL ov111_021D0FC8(UnkStruct_ov111_021D0F7C *param0); +static BOOL ov111_021D10B8(UnkStruct_ov111_021D0F7C *param0); +static BOOL ov111_021D116C(UnkStruct_ov111_021D0F7C *param0); +static BOOL ov111_021D1284(UnkStruct_ov111_021D0F7C *param0); +static BOOL ov111_021D1508(UnkStruct_ov111_021D0F7C *param0); +static BOOL ov111_021D1980(UnkStruct_ov111_021D0F7C *param0); +static BOOL ov111_021D1A88(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D1AF4(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D1B44(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D1B90(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D1BEC(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D1C0C(UnkStruct_ov111_021D0F7C *param0); static void ov111_021D1D30(void); -static void ov111_021D1D68(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D1F70(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D1F84(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D1FB4(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D2034(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D1FC4(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D2044(BGL * param0); -static void ov111_021D2090(void * param0); +static void ov111_021D1D68(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D1F70(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D1F84(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D1FB4(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D2034(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D1FC4(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D2044(BGL *param0); +static void ov111_021D2090(void *param0); static void ov111_021D20CC(void); -static void ov111_021D20EC(BGL * param0); -static void ov111_021D2248(UnkStruct_ov111_021D0F7C * param0, u32 param1); +static void ov111_021D20EC(BGL *param0); +static void ov111_021D2248(UnkStruct_ov111_021D0F7C *param0, u32 param1); static void ov111_021D22D0(void); -static void ov111_021D228C(UnkStruct_ov111_021D0F7C * param0, u32 param1); -static void ov111_021D233C(UnkStruct_ov111_021D0F7C * param0, u32 param1); +static void ov111_021D228C(UnkStruct_ov111_021D0F7C *param0, u32 param1); +static void ov111_021D233C(UnkStruct_ov111_021D0F7C *param0, u32 param1); static void ov111_021D2304(void); -static void ov111_021D2380(UnkStruct_ov111_021D0F7C * param0, u32 param1); -static u8 ov111_021D23C4(UnkStruct_ov111_021D0F7C * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); -static u8 ov111_021D2424(UnkStruct_ov111_021D0F7C * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); -static u8 ov111_021D2494(UnkStruct_ov111_021D0F7C * param0); -static u8 ov111_021D24D4(UnkStruct_ov111_021D0F7C * param0); -static u8 ov111_021D2518(UnkStruct_ov111_021D0F7C * param0); -static u8 ov111_021D255C(UnkStruct_ov111_021D0F7C * param0); -static u8 ov111_021D25BC(UnkStruct_ov111_021D0F7C * param0); -static u8 ov111_021D2604(UnkStruct_ov111_021D0F7C * param0); -static u8 ov111_021D263C(UnkStruct_ov111_021D0F7C * param0); -static u8 ov111_021D2674(UnkStruct_ov111_021D0F7C * param0, u8 param1); -static void ov111_021D26CC(UnkStruct_ov111_021D0F7C * param0, u32 param1, s32 param2); -static void ov111_021D26E4(UnkStruct_ov111_021D0F7C * param0, int * param1, int param2); -static void ov111_021D26EC(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D271C(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D27AC(UnkStruct_ov111_021D0F7C * param0, u8 param1); -static void ov111_021D27BC(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D27D4(UnkStruct_ov111_021D0F7C * param0, u8 param1); -static BOOL ov111_021D2868(UnkStruct_ov111_021D0F7C * param0, u8 param1); -static void ov111_021D28E8(UnkStruct_ov111_021D0F7C * param0, u32 param1, u8 param2, u8 param3, u8 param4); -static u8 ov111_021D2918(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D2940(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D295C(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D297C(UnkStruct_ov111_021D0F7C * param0, int param1); -static void ov111_021D29D8(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D2A18(UnkStruct_ov111_021D0F7C * param0, int param1, int param2); -static BOOL ov111_021D2A68(UnkStruct_ov111_021D0F7C * param0, u8 param1); -static void ov111_021D2B20(UnkStruct_ov111_021D0F7C * param0); -static BOOL ov111_021D2BBC(UnkStruct_ov111_021D0F7C * param0); -static BOOL ov111_021D2D14(UnkStruct_ov111_021D0F7C * param0); -static BOOL ov111_021D2D60(UnkStruct_ov111_021D0F7C * param0, u8 param1); -static void ov111_021D2E18(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D2E20(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D2E28(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D2E4C(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D2E8C(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D2EB4(UnkStruct_ov111_021D0F7C * param0); -static void ov111_021D2ECC(UnkStruct_ov111_021D0F7C * param0, int param1, int param2); -static void ov111_021D2F38(UnkStruct_ov111_021D0F7C * param0, u32 param1, u32 param2); +static void ov111_021D2380(UnkStruct_ov111_021D0F7C *param0, u32 param1); +static u8 ov111_021D23C4(UnkStruct_ov111_021D0F7C *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); +static u8 ov111_021D2424(UnkStruct_ov111_021D0F7C *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9); +static u8 ov111_021D2494(UnkStruct_ov111_021D0F7C *param0); +static u8 ov111_021D24D4(UnkStruct_ov111_021D0F7C *param0); +static u8 ov111_021D2518(UnkStruct_ov111_021D0F7C *param0); +static u8 ov111_021D255C(UnkStruct_ov111_021D0F7C *param0); +static u8 ov111_021D25BC(UnkStruct_ov111_021D0F7C *param0); +static u8 ov111_021D2604(UnkStruct_ov111_021D0F7C *param0); +static u8 ov111_021D263C(UnkStruct_ov111_021D0F7C *param0); +static u8 ov111_021D2674(UnkStruct_ov111_021D0F7C *param0, u8 param1); +static void ov111_021D26CC(UnkStruct_ov111_021D0F7C *param0, u32 param1, s32 param2); +static void ov111_021D26E4(UnkStruct_ov111_021D0F7C *param0, int *param1, int param2); +static void ov111_021D26EC(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D271C(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D27AC(UnkStruct_ov111_021D0F7C *param0, u8 param1); +static void ov111_021D27BC(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D27D4(UnkStruct_ov111_021D0F7C *param0, u8 param1); +static BOOL ov111_021D2868(UnkStruct_ov111_021D0F7C *param0, u8 param1); +static void ov111_021D28E8(UnkStruct_ov111_021D0F7C *param0, u32 param1, u8 param2, u8 param3, u8 param4); +static u8 ov111_021D2918(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D2940(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D295C(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D297C(UnkStruct_ov111_021D0F7C *param0, int param1); +static void ov111_021D29D8(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D2A18(UnkStruct_ov111_021D0F7C *param0, int param1, int param2); +static BOOL ov111_021D2A68(UnkStruct_ov111_021D0F7C *param0, u8 param1); +static void ov111_021D2B20(UnkStruct_ov111_021D0F7C *param0); +static BOOL ov111_021D2BBC(UnkStruct_ov111_021D0F7C *param0); +static BOOL ov111_021D2D14(UnkStruct_ov111_021D0F7C *param0); +static BOOL ov111_021D2D60(UnkStruct_ov111_021D0F7C *param0, u8 param1); +static void ov111_021D2E18(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D2E20(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D2E28(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D2E4C(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D2E8C(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D2EB4(UnkStruct_ov111_021D0F7C *param0); +static void ov111_021D2ECC(UnkStruct_ov111_021D0F7C *param0, int param1, int param2); +static void ov111_021D2F38(UnkStruct_ov111_021D0F7C *param0, u32 param1, u32 param2); static const UnkStruct_ov111_021D3620 Unk_ov111_021D3620[3] = { - {0x34, 0x44}, - {0x6C, 0x44}, - {0xA4, 0x44} + { 0x34, 0x44 }, + { 0x6C, 0x44 }, + { 0xA4, 0x44 } }; static const UnkStruct_ov111_021D3620 Unk_ov111_021D3608 = { @@ -211,22 +210,22 @@ static const UnkStruct_ov111_021D3620 Unk_ov111_021D3608 = { }; static const UnkStruct_ov111_021D3620 Unk_ov111_021D3770[9] = { - {0x39, 0x12}, - {0x7C, 0x12}, - {0xBF, 0x12}, - {0x39, 0x42}, - {0x7C, 0x42}, - {0xBF, 0x42}, - {0x39, 0x72}, - {0x7C, 0x72}, - {0xBF, 0x72} + { 0x39, 0x12 }, + { 0x7C, 0x12 }, + { 0xBF, 0x12 }, + { 0x39, 0x42 }, + { 0x7C, 0x42 }, + { 0xBF, 0x42 }, + { 0x39, 0x72 }, + { 0x7C, 0x72 }, + { 0xBF, 0x72 } }; static const UnkStruct_ov111_021D3620 Unk_ov111_021D362C[4] = { - {0x0, 0x24}, - {0x38, 0x24}, - {0x70, 0x24}, - {0xA8, 0x24} + { 0x0, 0x24 }, + { 0x38, 0x24 }, + { 0x70, 0x24 }, + { 0xA8, 0x24 } }; static const UnkStruct_ov111_021D3620 Unk_ov111_021D3604 = { @@ -271,65 +270,65 @@ static const u16 Unk_ov111_021D37E4[] = { }; static const TouchScreenRect Unk_ov111_021D364C[5] = { - {0x2A, 0x9A, 0x0, 0x50}, - {0x2A, 0x9A, 0x58, 0x8A}, - {0x2A, 0x9A, 0x90, 0xC3}, - {0x2A, 0x9A, 0xCC, 0xFE}, - {0xFF, 0x0, 0x0, 0x0} + { 0x2A, 0x9A, 0x0, 0x50 }, + { 0x2A, 0x9A, 0x58, 0x8A }, + { 0x2A, 0x9A, 0x90, 0xC3 }, + { 0x2A, 0x9A, 0xCC, 0xFE }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov111_021D3618[] = { - {0xA4, 0xBF, 0x4C, 0xB4}, - {0xFF, 0x0, 0x0, 0x0} + { 0xA4, 0xBF, 0x4C, 0xB4 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov111_021D3610[] = { - {0xA4, 0xBF, 0x5E, 0xA4}, - {0xFF, 0x0, 0x0, 0x0} + { 0xA4, 0xBF, 0x5E, 0xA4 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_ov111_021D3794[] = { - {0x15, 0x36, 0x20, 0x59}, - {0x15, 0x36, 0x66, 0x9D}, - {0x15, 0x36, 0xAA, 0xE3}, - {0x44, 0x64, 0x20, 0x59}, - {0x44, 0x64, 0x66, 0x9D}, - {0x44, 0x64, 0xAA, 0xE3}, - {0x72, 0x94, 0x20, 0x59}, - {0x72, 0x94, 0x66, 0x9D}, - {0x72, 0x94, 0xAA, 0xE3}, - {0xFF, 0x0, 0x0, 0x0} + { 0x15, 0x36, 0x20, 0x59 }, + { 0x15, 0x36, 0x66, 0x9D }, + { 0x15, 0x36, 0xAA, 0xE3 }, + { 0x44, 0x64, 0x20, 0x59 }, + { 0x44, 0x64, 0x66, 0x9D }, + { 0x44, 0x64, 0xAA, 0xE3 }, + { 0x72, 0x94, 0x20, 0x59 }, + { 0x72, 0x94, 0x66, 0x9D }, + { 0x72, 0x94, 0xAA, 0xE3 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const UnkStruct_ov111_021D3728 Unk_ov111_021D3728[] = { - {0x15, 0x36, 0x20, 0x59}, - {0x15, 0x36, 0x66, 0x9D}, - {0x15, 0x36, 0xAA, 0xE3}, - {0x44, 0x64, 0x20, 0x59}, - {0x44, 0x64, 0x66, 0x9D}, - {0x44, 0x64, 0xAA, 0xE3}, - {0x72, 0x94, 0x20, 0x59}, - {0x72, 0x94, 0x66, 0x9D}, - {0x72, 0x94, 0xAA, 0xE3} + { 0x15, 0x36, 0x20, 0x59 }, + { 0x15, 0x36, 0x66, 0x9D }, + { 0x15, 0x36, 0xAA, 0xE3 }, + { 0x44, 0x64, 0x20, 0x59 }, + { 0x44, 0x64, 0x66, 0x9D }, + { 0x44, 0x64, 0xAA, 0xE3 }, + { 0x72, 0x94, 0x20, 0x59 }, + { 0x72, 0x94, 0x66, 0x9D }, + { 0x72, 0x94, 0xAA, 0xE3 } }; static const UnkStruct_ov111_021D3620 Unk_ov111_021D374C[9] = { - {0x2A, 0x1B}, - {0x75, 0x1B}, - {0xBD, 0x1B}, - {0x2A, 0x4A}, - {0x75, 0x4A}, - {0xBD, 0x4A}, - {0x2A, 0x78}, - {0x75, 0x78}, - {0xBD, 0x78} + { 0x2A, 0x1B }, + { 0x75, 0x1B }, + { 0xBD, 0x1B }, + { 0x2A, 0x4A }, + { 0x75, 0x4A }, + { 0xBD, 0x4A }, + { 0x2A, 0x78 }, + { 0x75, 0x78 }, + { 0xBD, 0x78 } }; -int ov111_021D0D80 (OverlayManager * param0, int * param1) +int ov111_021D0D80(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov111_021D0F7C * v1; - UnkStruct_0203E608 * v2; + UnkStruct_ov111_021D0F7C *v1; + UnkStruct_0203E608 *v2; ov111_021D1D30(); Heap_Create(3, 115, 0x48000); @@ -363,9 +362,9 @@ int ov111_021D0D80 (OverlayManager * param0, int * param1) return 1; } -int ov111_021D0E34 (OverlayManager * param0, int * param1) +int ov111_021D0E34(OverlayManager *param0, int *param1) { - UnkStruct_ov111_021D0F7C * v0 = OverlayManager_Data(param0); + UnkStruct_ov111_021D0F7C *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -428,10 +427,10 @@ int ov111_021D0E34 (OverlayManager * param0, int * param1) return 0; } -int ov111_021D0F40 (OverlayManager * param0, int * param1) +int ov111_021D0F40(OverlayManager *param0, int *param1) { int v0; - UnkStruct_ov111_021D0F7C * v1 = OverlayManager_Data(param0); + UnkStruct_ov111_021D0F7C *v1 = OverlayManager_Data(param0); sub_0201E530(); *(v1->unk_3D8) = v1->unk_0C; @@ -446,7 +445,7 @@ int ov111_021D0F40 (OverlayManager * param0, int * param1) return 1; } -static BOOL ov111_021D0F7C (UnkStruct_ov111_021D0F7C * param0) +static BOOL ov111_021D0F7C(UnkStruct_ov111_021D0F7C *param0) { switch (param0->unk_08) { case 0: @@ -464,7 +463,7 @@ static BOOL ov111_021D0F7C (UnkStruct_ov111_021D0F7C * param0) return 0; } -static BOOL ov111_021D0FC8 (UnkStruct_ov111_021D0F7C * param0) +static BOOL ov111_021D0FC8(UnkStruct_ov111_021D0F7C *param0) { int v0; @@ -506,7 +505,7 @@ static BOOL ov111_021D0FC8 (UnkStruct_ov111_021D0F7C * param0) return 0; } -static BOOL ov111_021D10B8 (UnkStruct_ov111_021D0F7C * param0) +static BOOL ov111_021D10B8(UnkStruct_ov111_021D0F7C *param0) { u32 v0, v1; int v2, v3; @@ -548,7 +547,7 @@ static BOOL ov111_021D10B8 (UnkStruct_ov111_021D0F7C * param0) return 0; } -static BOOL ov111_021D116C (UnkStruct_ov111_021D0F7C * param0) +static BOOL ov111_021D116C(UnkStruct_ov111_021D0F7C *param0) { int v0, v1, v2, v3; @@ -608,7 +607,7 @@ static BOOL ov111_021D116C (UnkStruct_ov111_021D0F7C * param0) return 0; } -static BOOL ov111_021D1284 (UnkStruct_ov111_021D0F7C * param0) +static BOOL ov111_021D1284(UnkStruct_ov111_021D0F7C *param0) { int v0, v1; @@ -704,7 +703,7 @@ static BOOL ov111_021D1284 (UnkStruct_ov111_021D0F7C * param0) return 0; } -static BOOL ov111_021D1508 (UnkStruct_ov111_021D0F7C * param0) +static BOOL ov111_021D1508(UnkStruct_ov111_021D0F7C *param0) { int v0, v1; u32 v2, v3; @@ -937,7 +936,7 @@ static BOOL ov111_021D1508 (UnkStruct_ov111_021D0F7C * param0) return 0; } -static BOOL ov111_021D1980 (UnkStruct_ov111_021D0F7C * param0) +static BOOL ov111_021D1980(UnkStruct_ov111_021D0F7C *param0) { int v0, v1; @@ -991,7 +990,7 @@ static BOOL ov111_021D1980 (UnkStruct_ov111_021D0F7C * param0) return 0; } -static BOOL ov111_021D1A88 (UnkStruct_ov111_021D0F7C * param0) +static BOOL ov111_021D1A88(UnkStruct_ov111_021D0F7C *param0) { int v0; @@ -1019,7 +1018,7 @@ static BOOL ov111_021D1A88 (UnkStruct_ov111_021D0F7C * param0) return 0; } -static void ov111_021D1AF4 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D1AF4(UnkStruct_ov111_021D0F7C *param0) { int v0; @@ -1032,7 +1031,7 @@ static void ov111_021D1AF4 (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D1B44 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D1B44(UnkStruct_ov111_021D0F7C *param0) { int v0; @@ -1044,7 +1043,7 @@ static void ov111_021D1B44 (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D1B90 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D1B90(UnkStruct_ov111_021D0F7C *param0) { param0->unk_3A0 = ov111_021D33F4(¶m0->unk_16C, 3, 1, Unk_ov111_021D3604.unk_00, Unk_ov111_021D3604.unk_02, 0, 1, 0); ov111_021D345C(param0->unk_3A0, 0); @@ -1055,7 +1054,7 @@ static void ov111_021D1B90 (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D1BEC (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D1BEC(UnkStruct_ov111_021D0F7C *param0) { int v0; @@ -1068,7 +1067,7 @@ static void ov111_021D1BEC (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D1C0C (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D1C0C(UnkStruct_ov111_021D0F7C *param0) { int v0; @@ -1133,7 +1132,7 @@ static void ov111_021D1C0C (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D1D30 (void) +static void ov111_021D1D30(void) { SetMainCallback(NULL, NULL); SetHBlankCallback(NULL, NULL); @@ -1146,7 +1145,7 @@ static void ov111_021D1D30 (void) return; } -static void ov111_021D1D68 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D1D68(UnkStruct_ov111_021D0F7C *param0) { int v0, v1; @@ -1207,13 +1206,13 @@ static void ov111_021D1D68 (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D1F70 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D1F70(UnkStruct_ov111_021D0F7C *param0) { param0->unk_3FC = sub_02015920(115); return; } -static void ov111_021D1F84 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D1F84(UnkStruct_ov111_021D0F7C *param0) { UnkStruct_02015958 v0; @@ -1229,13 +1228,13 @@ static void ov111_021D1F84 (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D1FB4 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D1FB4(UnkStruct_ov111_021D0F7C *param0) { sub_02015938(param0->unk_3FC); return; } -static void ov111_021D1FC4 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D1FC4(UnkStruct_ov111_021D0F7C *param0) { ov111_021D20CC(); ov111_021D20EC(param0->unk_58); @@ -1258,13 +1257,13 @@ static void ov111_021D1FC4 (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D2034 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D2034(UnkStruct_ov111_021D0F7C *param0) { ov111_021D2F80(¶m0->unk_16C); return; } -static void ov111_021D2044 (BGL * param0) +static void ov111_021D2044(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); @@ -1279,9 +1278,9 @@ static void ov111_021D2044 (BGL * param0) return; } -static void ov111_021D2090 (void * param0) +static void ov111_021D2090(void *param0) { - UnkStruct_ov111_021D0F7C * v0 = param0; + UnkStruct_ov111_021D0F7C *v0 = param0; if (v0->unk_04 != NULL) { return; @@ -1298,7 +1297,7 @@ static void ov111_021D2090 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov111_021D20CC (void) +static void ov111_021D20CC(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -1317,7 +1316,7 @@ static void ov111_021D20CC (void) return; } -static void ov111_021D20EC (BGL * param0) +static void ov111_021D20EC(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1465,7 +1464,7 @@ static void ov111_021D20EC (BGL * param0) return; } -static void ov111_021D2248 (UnkStruct_ov111_021D0F7C * param0, u32 param1) +static void ov111_021D2248(UnkStruct_ov111_021D0F7C *param0, u32 param1) { sub_020070E8(param0->unk_3E4, 35, param0->unk_58, param1, 0, 0, 0, 115); sub_0200710C(param0->unk_3E4, 37, param0->unk_58, param1, 0, 0, 0, 115); @@ -1473,7 +1472,7 @@ static void ov111_021D2248 (UnkStruct_ov111_021D0F7C * param0, u32 param1) return; } -static void ov111_021D228C (UnkStruct_ov111_021D0F7C * param0, u32 param1) +static void ov111_021D228C(UnkStruct_ov111_021D0F7C *param0, u32 param1) { sub_020070E8(param0->unk_3E4, 38, param0->unk_58, param1, 0, 0, 0, 115); sub_0200710C(param0->unk_3E4, 40, param0->unk_58, param1, 0, 0, 0, 115); @@ -1481,10 +1480,10 @@ static void ov111_021D228C (UnkStruct_ov111_021D0F7C * param0, u32 param1) return; } -static void ov111_021D22D0 (void) +static void ov111_021D22D0(void) { - void * v0; - NNSG2dPaletteData * v1; + void *v0; + NNSG2dPaletteData *v1; v0 = sub_02006F88(184, 34, &v1, 115); @@ -1495,10 +1494,10 @@ static void ov111_021D22D0 (void) return; } -static void ov111_021D2304 (void) +static void ov111_021D2304(void) { - void * v0; - NNSG2dPaletteData * v1; + void *v0; + NNSG2dPaletteData *v1; v0 = sub_02006F88(184, 0, &v1, 115); @@ -1509,7 +1508,7 @@ static void ov111_021D2304 (void) return; } -static void ov111_021D233C (UnkStruct_ov111_021D0F7C * param0, u32 param1) +static void ov111_021D233C(UnkStruct_ov111_021D0F7C *param0, u32 param1) { sub_020070E8(param0->unk_3E4, 4, param0->unk_58, param1, 0, 0, 0, 115); sub_0200710C(param0->unk_3E4, 6, param0->unk_58, param1, 0, 0, 0, 115); @@ -1517,7 +1516,7 @@ static void ov111_021D233C (UnkStruct_ov111_021D0F7C * param0, u32 param1) return; } -static void ov111_021D2380 (UnkStruct_ov111_021D0F7C * param0, u32 param1) +static void ov111_021D2380(UnkStruct_ov111_021D0F7C *param0, u32 param1) { sub_020070E8(param0->unk_3E4, 7, param0->unk_58, param1, 0, 0, 0, 115); sub_0200710C(param0->unk_3E4, 9, param0->unk_58, param1, 0, 0, 0, 115); @@ -1525,7 +1524,7 @@ static void ov111_021D2380 (UnkStruct_ov111_021D0F7C * param0, u32 param1) return; } -static u8 ov111_021D23C4 (UnkStruct_ov111_021D0F7C * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) +static u8 ov111_021D23C4(UnkStruct_ov111_021D0F7C *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { BGL_FillWindow(param1, param8); MessageLoader_GetStrbuf(param0->unk_38, param2, param0->unk_44); @@ -1534,7 +1533,7 @@ static u8 ov111_021D23C4 (UnkStruct_ov111_021D0F7C * param0, Window * param1, in return sub_0201D78C(param1, param9, param0->unk_40, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); } -static u8 ov111_021D2424 (UnkStruct_ov111_021D0F7C * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) +static u8 ov111_021D2424(UnkStruct_ov111_021D0F7C *param0, Window *param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { BGL_FillWindow(param1, param8); MessageLoader_GetStrbuf(param0->unk_38, param2, param0->unk_44); @@ -1543,7 +1542,7 @@ static u8 ov111_021D2424 (UnkStruct_ov111_021D0F7C * param0, Window * param1, in return sub_0201D78C(param1, param9, param0->unk_40, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); } -static u8 ov111_021D2494 (UnkStruct_ov111_021D0F7C * param0) +static u8 ov111_021D2494(UnkStruct_ov111_021D0F7C *param0) { u8 v0; @@ -1554,7 +1553,7 @@ static u8 ov111_021D2494 (UnkStruct_ov111_021D0F7C * param0) return v0; } -static u8 ov111_021D24D4 (UnkStruct_ov111_021D0F7C * param0) +static u8 ov111_021D24D4(UnkStruct_ov111_021D0F7C *param0) { u8 v0; @@ -1565,7 +1564,7 @@ static u8 ov111_021D24D4 (UnkStruct_ov111_021D0F7C * param0) return v0; } -static u8 ov111_021D2518 (UnkStruct_ov111_021D0F7C * param0) +static u8 ov111_021D2518(UnkStruct_ov111_021D0F7C *param0) { u8 v0; @@ -1576,7 +1575,7 @@ static u8 ov111_021D2518 (UnkStruct_ov111_021D0F7C * param0) return v0; } -static u8 ov111_021D255C (UnkStruct_ov111_021D0F7C * param0) +static u8 ov111_021D255C(UnkStruct_ov111_021D0F7C *param0) { u8 v0, v1; @@ -1595,7 +1594,7 @@ static u8 ov111_021D255C (UnkStruct_ov111_021D0F7C * param0) return v0; } -static u8 ov111_021D25BC (UnkStruct_ov111_021D0F7C * param0) +static u8 ov111_021D25BC(UnkStruct_ov111_021D0F7C *param0) { u8 v0; @@ -1606,7 +1605,7 @@ static u8 ov111_021D25BC (UnkStruct_ov111_021D0F7C * param0) return v0; } -static u8 ov111_021D2604 (UnkStruct_ov111_021D0F7C * param0) +static u8 ov111_021D2604(UnkStruct_ov111_021D0F7C *param0) { u8 v0; @@ -1616,7 +1615,7 @@ static u8 ov111_021D2604 (UnkStruct_ov111_021D0F7C * param0) return v0; } -static u8 ov111_021D263C (UnkStruct_ov111_021D0F7C * param0) +static u8 ov111_021D263C(UnkStruct_ov111_021D0F7C *param0) { u8 v0; @@ -1633,7 +1632,7 @@ static const u8 Unk_ov111_021D3814[4] = { 0x8 }; -static u8 ov111_021D2674 (UnkStruct_ov111_021D0F7C * param0, u8 param1) +static u8 ov111_021D2674(UnkStruct_ov111_021D0F7C *param0, u8 param1) { u8 v0; @@ -1644,13 +1643,13 @@ static u8 ov111_021D2674 (UnkStruct_ov111_021D0F7C * param0, u8 param1) return v0; } -static void ov111_021D26CC (UnkStruct_ov111_021D0F7C * param0, u32 param1, s32 param2) +static void ov111_021D26CC(UnkStruct_ov111_021D0F7C *param0, u32 param1, s32 param2) { StringTemplate_SetNumber(param0->unk_3C, param1, param2, 1, 0, 1); return; } -static void ov111_021D26E4 (UnkStruct_ov111_021D0F7C * param0, int * param1, int param2) +static void ov111_021D26E4(UnkStruct_ov111_021D0F7C *param0, int *param1, int param2) { param0->unk_08 = 0; *param1 = param2; @@ -1658,7 +1657,7 @@ static void ov111_021D26E4 (UnkStruct_ov111_021D0F7C * param0, int * param1, int return; } -static void ov111_021D26EC (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D26EC(UnkStruct_ov111_021D0F7C *param0) { int v0; u8 v1; @@ -1677,7 +1676,7 @@ static void ov111_021D26EC (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D271C (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D271C(UnkStruct_ov111_021D0F7C *param0) { int v0, v1, v2, v3, v4; u8 v5; @@ -1734,7 +1733,7 @@ static void ov111_021D271C (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D27AC (UnkStruct_ov111_021D0F7C * param0, u8 param1) +static void ov111_021D27AC(UnkStruct_ov111_021D0F7C *param0, u8 param1) { ov111_021D26EC(param0); ov111_021D271C(param0); @@ -1742,7 +1741,7 @@ static void ov111_021D27AC (UnkStruct_ov111_021D0F7C * param0, u8 param1) return; } -static void ov111_021D27BC (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D27BC(UnkStruct_ov111_021D0F7C *param0) { int v0; @@ -1753,7 +1752,7 @@ static void ov111_021D27BC (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D27D4 (UnkStruct_ov111_021D0F7C * param0, u8 param1) +static void ov111_021D27D4(UnkStruct_ov111_021D0F7C *param0, u8 param1) { int v0, v1; u16 v2[4]; @@ -1790,10 +1789,10 @@ static void ov111_021D27D4 (UnkStruct_ov111_021D0F7C * param0, u8 param1) } static const s8 Unk_ov111_021D3708[4][8] = { - {0x9, 0x9, 0x9, 0x8, 0x7, 0x6, 0x5, 0x4}, - {0x2, 0x2, 0x2, 0x1, 0x1, 0x1, 0x1, 0x1}, - {0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFF9, 0xFFFFFFFFFFFFFFF9, 0xFFFFFFFFFFFFFFFA, 0xFFFFFFFFFFFFFFFB, 0xFFFFFFFFFFFFFFFC}, - {0xFFFFFFFFFFFFFFEE, 0xFFFFFFFFFFFFFFF0, 0xFFFFFFFFFFFFFFF1, 0xFFFFFFFFFFFFFFF2, 0xFFFFFFFFFFFFFFF3, 0xFFFFFFFFFFFFFFF4, 0xFFFFFFFFFFFFFFF6, 0xFFFFFFFFFFFFFFF8} + { 0x9, 0x9, 0x9, 0x8, 0x7, 0x6, 0x5, 0x4 }, + { 0x2, 0x2, 0x2, 0x1, 0x1, 0x1, 0x1, 0x1 }, + { 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFF8, 0xFFFFFFFFFFFFFFF9, 0xFFFFFFFFFFFFFFF9, 0xFFFFFFFFFFFFFFFA, 0xFFFFFFFFFFFFFFFB, 0xFFFFFFFFFFFFFFFC }, + { 0xFFFFFFFFFFFFFFEE, 0xFFFFFFFFFFFFFFF0, 0xFFFFFFFFFFFFFFF1, 0xFFFFFFFFFFFFFFF2, 0xFFFFFFFFFFFFFFF3, 0xFFFFFFFFFFFFFFF4, 0xFFFFFFFFFFFFFFF6, 0xFFFFFFFFFFFFFFF8 } }; static const s8 Unk_ov111_021D3818[8] = { @@ -1807,7 +1806,7 @@ static const s8 Unk_ov111_021D3818[8] = { 0xFFFFFFFFFFFFFFFC }; -static BOOL ov111_021D2868 (UnkStruct_ov111_021D0F7C * param0, u8 param1) +static BOOL ov111_021D2868(UnkStruct_ov111_021D0F7C *param0, u8 param1) { int v0, v1, v2, v3; @@ -1826,7 +1825,7 @@ static BOOL ov111_021D2868 (UnkStruct_ov111_021D0F7C * param0, u8 param1) return 0; } -static void ov111_021D28E8 (UnkStruct_ov111_021D0F7C * param0, u32 param1, u8 param2, u8 param3, u8 param4) +static void ov111_021D28E8(UnkStruct_ov111_021D0F7C *param0, u32 param1, u8 param2, u8 param3, u8 param4) { sub_02019E2C(param0->unk_58, param1, 0, 0, param3, param4, param2); sub_0201C3C0(param0->unk_58, param1); @@ -1834,7 +1833,7 @@ static void ov111_021D28E8 (UnkStruct_ov111_021D0F7C * param0, u32 param1, u8 pa return; } -static u8 ov111_021D2918 (UnkStruct_ov111_021D0F7C * param0) +static u8 ov111_021D2918(UnkStruct_ov111_021D0F7C *param0) { u8 v0, v1; @@ -1849,7 +1848,7 @@ static u8 ov111_021D2918 (UnkStruct_ov111_021D0F7C * param0) return v1; } -static void ov111_021D2940 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D2940(UnkStruct_ov111_021D0F7C *param0) { u8 v0; @@ -1860,7 +1859,7 @@ static void ov111_021D2940 (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D295C (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D295C(UnkStruct_ov111_021D0F7C *param0) { u8 v0; @@ -1871,7 +1870,7 @@ static void ov111_021D295C (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D297C (UnkStruct_ov111_021D0F7C * param0, int param1) +static void ov111_021D297C(UnkStruct_ov111_021D0F7C *param0, int param1) { int v0, v1, v2, v3; @@ -1887,7 +1886,7 @@ static void ov111_021D297C (UnkStruct_ov111_021D0F7C * param0, int param1) return; } -static void ov111_021D29D8 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D29D8(UnkStruct_ov111_021D0F7C *param0) { int v0; u8 v1, v2; @@ -1902,7 +1901,7 @@ static void ov111_021D29D8 (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D2A18 (UnkStruct_ov111_021D0F7C * param0, int param1, int param2) +static void ov111_021D2A18(UnkStruct_ov111_021D0F7C *param0, int param1, int param2) { int v0, v1; @@ -1917,7 +1916,7 @@ static void ov111_021D2A18 (UnkStruct_ov111_021D0F7C * param0, int param1, int p return; } -static BOOL ov111_021D2A68 (UnkStruct_ov111_021D0F7C * param0, u8 param1) +static BOOL ov111_021D2A68(UnkStruct_ov111_021D0F7C *param0, u8 param1) { int v0, v1, v2, v3, v4; @@ -1947,7 +1946,7 @@ static BOOL ov111_021D2A68 (UnkStruct_ov111_021D0F7C * param0, u8 param1) return 0; } -static void ov111_021D2B20 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D2B20(UnkStruct_ov111_021D0F7C *param0) { int v0; @@ -1976,7 +1975,7 @@ static void ov111_021D2B20 (UnkStruct_ov111_021D0F7C * param0) return; } -static BOOL ov111_021D2BBC (UnkStruct_ov111_021D0F7C * param0) +static BOOL ov111_021D2BBC(UnkStruct_ov111_021D0F7C *param0) { int v0, v1; @@ -2040,7 +2039,7 @@ static BOOL ov111_021D2BBC (UnkStruct_ov111_021D0F7C * param0) return 0; } -static BOOL ov111_021D2D14 (UnkStruct_ov111_021D0F7C * param0) +static BOOL ov111_021D2D14(UnkStruct_ov111_021D0F7C *param0) { int v0; BOOL v1; @@ -2061,7 +2060,7 @@ static BOOL ov111_021D2D14 (UnkStruct_ov111_021D0F7C * param0) return v1; } -static BOOL ov111_021D2D60 (UnkStruct_ov111_021D0F7C * param0, u8 param1) +static BOOL ov111_021D2D60(UnkStruct_ov111_021D0F7C *param0, u8 param1) { int v0; @@ -2108,19 +2107,19 @@ static BOOL ov111_021D2D60 (UnkStruct_ov111_021D0F7C * param0, u8 param1) return 1; } -static void ov111_021D2E18 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D2E18(UnkStruct_ov111_021D0F7C *param0) { param0->unk_0E++; return; } -static void ov111_021D2E20 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D2E20(UnkStruct_ov111_021D0F7C *param0) { param0->unk_0E++; return; } -static void ov111_021D2E28 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D2E28(UnkStruct_ov111_021D0F7C *param0) { ov111_021D345C(param0->unk_3A4, 0); BGL_FillWindow(¶m0->unk_5C[10], 0); @@ -2128,7 +2127,7 @@ static void ov111_021D2E28 (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D2E4C (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D2E4C(UnkStruct_ov111_021D0F7C *param0) { param0->unk_3F0 = sub_02006F50(184, 7, 0, ¶m0->unk_3F4, 115); @@ -2138,7 +2137,7 @@ static void ov111_021D2E4C (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D2E8C (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D2E8C(UnkStruct_ov111_021D0F7C *param0) { param0->unk_3F8 = Heap_AllocFromHeap(115, param0->unk_3F4->szByte); @@ -2149,13 +2148,13 @@ static void ov111_021D2E8C (UnkStruct_ov111_021D0F7C * param0) return; } -static void ov111_021D2EB4 (UnkStruct_ov111_021D0F7C * param0) +static void ov111_021D2EB4(UnkStruct_ov111_021D0F7C *param0) { memcpy(param0->unk_3F8, param0->unk_3F4->pRawData, param0->unk_3F4->szByte); return; } -static void ov111_021D2ECC (UnkStruct_ov111_021D0F7C * param0, int param1, int param2) +static void ov111_021D2ECC(UnkStruct_ov111_021D0F7C *param0, int param1, int param2) { int v0, v1; @@ -2173,7 +2172,7 @@ static void ov111_021D2ECC (UnkStruct_ov111_021D0F7C * param0, int param1, int p return; } -static void ov111_021D2F38 (UnkStruct_ov111_021D0F7C * param0, u32 param1, u32 param2) +static void ov111_021D2F38(UnkStruct_ov111_021D0F7C *param0, u32 param1, u32 param2) { u8 v0; u32 v1, v2, v3, v4, v5; diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c index 8fed14176e..dd02fb59cf 100644 --- a/src/overlay111/ov111_021D2F80.c +++ b/src/overlay111/ov111_021D2F80.c @@ -1,3 +1,5 @@ +#include "overlay111/ov111_021D2F80.h" + #include #include @@ -10,6 +12,7 @@ #include "overlay111/struct_ov111_021D2F80.h" #include "overlay115/struct_ov115_02261520.h" +#include "gx_layers.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" @@ -17,19 +20,17 @@ #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "overlay111/ov111_021D2F80.h" -void ov111_021D2F80(UnkStruct_ov111_021D2F80 * param0); -GraphicElementData * ov111_021D3280(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5); -void ov111_021D3320(UnkStruct_ov111_021D2F80 * param0); -void ov111_021D33B0(UnkStruct_ov111_021D2F80 * param0, int param1); +void ov111_021D2F80(UnkStruct_ov111_021D2F80 *param0); +GraphicElementData *ov111_021D3280(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5); +void ov111_021D3320(UnkStruct_ov111_021D2F80 *param0); +void ov111_021D33B0(UnkStruct_ov111_021D2F80 *param0, int param1); static void ov111_021D3378(void); -static void ov111_021D30D8(UnkStruct_ov111_021D2F80 * param0, int param1, int param2, int param3); -static void ov111_021D304C(UnkStruct_ov111_021D2F80 * param0, int param1); -static void ov111_021D3168(UnkStruct_ov111_021D2F80 * param0, int param1); -static void ov111_021D31F4(UnkStruct_ov111_021D2F80 * param0, int param1); +static void ov111_021D30D8(UnkStruct_ov111_021D2F80 *param0, int param1, int param2, int param3); +static void ov111_021D304C(UnkStruct_ov111_021D2F80 *param0, int param1); +static void ov111_021D3168(UnkStruct_ov111_021D2F80 *param0, int param1); +static void ov111_021D31F4(UnkStruct_ov111_021D2F80 *param0, int param1); static const u8 Unk_ov111_021D3820[4] = { 0x5, @@ -38,10 +39,10 @@ static const u8 Unk_ov111_021D3820[4] = { 0x5 }; -void ov111_021D2F80 (UnkStruct_ov111_021D2F80 * param0) +void ov111_021D2F80(UnkStruct_ov111_021D2F80 *param0) { int v0; - NARC * v1; + NARC *v1; sub_0201DBEC(32, 115); ov111_021D3378(); @@ -73,7 +74,7 @@ void ov111_021D2F80 (UnkStruct_ov111_021D2F80 * param0) return; } -static void ov111_021D304C (UnkStruct_ov111_021D2F80 * param0, int param1) +static void ov111_021D304C(UnkStruct_ov111_021D2F80 *param0, int param1) { param0->unk_1A0[2][0] = sub_0200985C(param0->unk_190[0], 184, 12, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 115); param0->unk_1A0[2][1] = sub_020098B8(param0->unk_190[1], 184, 13, 0, 2, NNS_G2D_VRAM_TYPE_2DMAIN, 4, 115); @@ -83,7 +84,7 @@ static void ov111_021D304C (UnkStruct_ov111_021D2F80 * param0, int param1) return; } -static void ov111_021D30D8 (UnkStruct_ov111_021D2F80 * param0, int param1, int param2, int param3) +static void ov111_021D30D8(UnkStruct_ov111_021D2F80 *param0, int param1, int param2, int param3) { param0->unk_1A0[param1][0] = sub_0200985C(param0->unk_190[0], 184, 32, 0, param2, param3, 115); param0->unk_1A0[param1][1] = sub_020098B8(param0->unk_190[1], 184, 33, 0, param2, param3, 5, 115); @@ -93,7 +94,7 @@ static void ov111_021D30D8 (UnkStruct_ov111_021D2F80 * param0, int param1, int p return; } -static void ov111_021D3168 (UnkStruct_ov111_021D2F80 * param0, int param1) +static void ov111_021D3168(UnkStruct_ov111_021D2F80 *param0, int param1) { param0->unk_1A0[3][0] = sub_0200985C(param0->unk_190[0], 184, 16, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 115); param0->unk_1A0[3][1] = sub_020098B8(param0->unk_190[1], 184, 17, 0, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 4, 115); @@ -103,7 +104,7 @@ static void ov111_021D3168 (UnkStruct_ov111_021D2F80 * param0, int param1) return; } -static void ov111_021D31F4 (UnkStruct_ov111_021D2F80 * param0, int param1) +static void ov111_021D31F4(UnkStruct_ov111_021D2F80 *param0, int param1) { param0->unk_1A0[4][0] = sub_0200985C(param0->unk_190[0], 184, 20, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, 115); param0->unk_1A0[4][1] = sub_020098B8(param0->unk_190[1], 184, 21, 0, 4, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 115); @@ -113,11 +114,11 @@ static void ov111_021D31F4 (UnkStruct_ov111_021D2F80 * param0, int param1) return; } -GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5) +GraphicElementData *ov111_021D3280(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5) { int v0; UnkStruct_ov19_021DA864 v1; - GraphicElementData * v2; + GraphicElementData *v2; sub_020093B4(&v1, param1, param1, param1, param1, 0xffffffff, 0xffffffff, 0, param3, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL); @@ -152,7 +153,7 @@ GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 para return v2; } -void ov111_021D3320 (UnkStruct_ov111_021D2F80 * param0) +void ov111_021D3320(UnkStruct_ov111_021D2F80 *param0) { u8 v0; @@ -173,7 +174,7 @@ void ov111_021D3320 (UnkStruct_ov111_021D2F80 * param0) return; } -static void ov111_021D3378 (void) +static void ov111_021D3378(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -201,9 +202,9 @@ static u8 Unk_ov111_021D3940[8] = { 0x1D }; -void ov111_021D33B0 (UnkStruct_ov111_021D2F80 * param0, int param1) +void ov111_021D33B0(UnkStruct_ov111_021D2F80 *param0, int param1) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; if (param1 >= 8) { GF_ASSERT(0); diff --git a/src/overlay111/ov111_021D33F4.c b/src/overlay111/ov111_021D33F4.c index ad12c9bc7e..85e29834e2 100644 --- a/src/overlay111/ov111_021D33F4.c +++ b/src/overlay111/ov111_021D33F4.c @@ -1,15 +1,16 @@ +#include "overlay111/ov111_021D33F4.h" + #include #include #include "struct_decls/struct_02022550_decl.h" -#include "overlay111/struct_ov111_021D33F4_decl.h" +#include "overlay111/ov111_021D2F80.h" #include "overlay111/struct_ov111_021D2F80.h" +#include "overlay111/struct_ov111_021D33F4_decl.h" #include "heap.h" #include "unk_020218BC.h" -#include "overlay111/ov111_021D2F80.h" -#include "overlay111/ov111_021D33F4.h" struct UnkStruct_ov111_021D33F4_t { u16 unk_00; @@ -17,26 +18,26 @@ struct UnkStruct_ov111_021D33F4_t { u8 unk_03; u32 unk_04; u32 unk_08; - GraphicElementData * unk_0C; + GraphicElementData *unk_0C; }; -UnkStruct_ov111_021D33F4 * ov111_021D33F4(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u16 param3, u16 param4, u8 param5, u32 param6, u32 param7); -void * ov111_021D3448(UnkStruct_ov111_021D33F4 * param0); -void ov111_021D345C(UnkStruct_ov111_021D33F4 * param0, int param1); -void ov111_021D3468(UnkStruct_ov111_021D33F4 * param0, u32 param1); -void ov111_021D3474(UnkStruct_ov111_021D33F4 * param0, int param1, int param2); -void ov111_021D349C(UnkStruct_ov111_021D33F4 * param0, int * param1, int * param2); -void ov111_021D34C4(UnkStruct_ov111_021D33F4 * param0, u32 param1); -void ov111_021D34E0(UnkStruct_ov111_021D33F4 * param0, u32 param1); -void ov111_021D34F4(UnkStruct_ov111_021D33F4 * param0, VecFx32 * param1); -void ov111_021D3500(UnkStruct_ov111_021D33F4 * param0, u32 param1); -void ov111_021D350C(UnkStruct_ov111_021D33F4 * param0, int param1); -void ov111_021D3530(UnkStruct_ov111_021D33F4 * param0, BOOL param1); -BOOL ov111_021D353C(UnkStruct_ov111_021D33F4 * param0); - -UnkStruct_ov111_021D33F4 * ov111_021D33F4 (UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u16 param3, u16 param4, u8 param5, u32 param6, u32 param7) +UnkStruct_ov111_021D33F4 *ov111_021D33F4(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u16 param3, u16 param4, u8 param5, u32 param6, u32 param7); +void *ov111_021D3448(UnkStruct_ov111_021D33F4 *param0); +void ov111_021D345C(UnkStruct_ov111_021D33F4 *param0, int param1); +void ov111_021D3468(UnkStruct_ov111_021D33F4 *param0, u32 param1); +void ov111_021D3474(UnkStruct_ov111_021D33F4 *param0, int param1, int param2); +void ov111_021D349C(UnkStruct_ov111_021D33F4 *param0, int *param1, int *param2); +void ov111_021D34C4(UnkStruct_ov111_021D33F4 *param0, u32 param1); +void ov111_021D34E0(UnkStruct_ov111_021D33F4 *param0, u32 param1); +void ov111_021D34F4(UnkStruct_ov111_021D33F4 *param0, VecFx32 *param1); +void ov111_021D3500(UnkStruct_ov111_021D33F4 *param0, u32 param1); +void ov111_021D350C(UnkStruct_ov111_021D33F4 *param0, int param1); +void ov111_021D3530(UnkStruct_ov111_021D33F4 *param0, BOOL param1); +BOOL ov111_021D353C(UnkStruct_ov111_021D33F4 *param0); + +UnkStruct_ov111_021D33F4 *ov111_021D33F4(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u16 param3, u16 param4, u8 param5, u32 param6, u32 param7) { - UnkStruct_ov111_021D33F4 * v0; + UnkStruct_ov111_021D33F4 *v0; VecFx32 v1; v0 = Heap_AllocFromHeap(115, sizeof(UnkStruct_ov111_021D33F4)); @@ -49,26 +50,26 @@ UnkStruct_ov111_021D33F4 * ov111_021D33F4 (UnkStruct_ov111_021D2F80 * param0, u3 return v0; } -void * ov111_021D3448 (UnkStruct_ov111_021D33F4 * param0) +void *ov111_021D3448(UnkStruct_ov111_021D33F4 *param0) { sub_02021BD4(param0->unk_0C); Heap_FreeToHeap(param0); return NULL; } -void ov111_021D345C (UnkStruct_ov111_021D33F4 * param0, int param1) +void ov111_021D345C(UnkStruct_ov111_021D33F4 *param0, int param1) { sub_02021CAC(param0->unk_0C, param1); return; } -void ov111_021D3468 (UnkStruct_ov111_021D33F4 * param0, u32 param1) +void ov111_021D3468(UnkStruct_ov111_021D33F4 *param0, u32 param1) { sub_02021F58(param0->unk_0C, param1); return; } -void ov111_021D3474 (UnkStruct_ov111_021D33F4 * param0, int param1, int param2) +void ov111_021D3474(UnkStruct_ov111_021D33F4 *param0, int param1, int param2) { VecFx32 v0; @@ -83,9 +84,9 @@ void ov111_021D3474 (UnkStruct_ov111_021D33F4 * param0, int param1, int param2) return; } -void ov111_021D349C (UnkStruct_ov111_021D33F4 * param0, int * param1, int * param2) +void ov111_021D349C(UnkStruct_ov111_021D33F4 *param0, int *param1, int *param2) { - const VecFx32 * v0; + const VecFx32 *v0; v0 = sub_02021D28(param0->unk_0C); @@ -95,7 +96,7 @@ void ov111_021D349C (UnkStruct_ov111_021D33F4 * param0, int * param1, int * para return; } -void ov111_021D34C4 (UnkStruct_ov111_021D33F4 * param0, u32 param1) +void ov111_021D34C4(UnkStruct_ov111_021D33F4 *param0, u32 param1) { sub_02021CE4(param0->unk_0C, FX32_ONE); sub_02021DCC(param0->unk_0C, param1); @@ -104,20 +105,20 @@ void ov111_021D34C4 (UnkStruct_ov111_021D33F4 * param0, u32 param1) } static const VecFx32 Unk_ov111_021D3834[] = { - {FX32_ONE, FX32_ONE, FX32_ONE}, - {FX32_ONE + (FX32_ONE / 5), FX32_ONE + (FX32_ONE / 5), FX32_ONE + (FX32_ONE / 5)}, - {FX32_ONE + (FX32_ONE / 4), FX32_ONE + (FX32_ONE / 4), FX32_ONE + (FX32_ONE / 4)}, - {FX32_ONE + (FX32_ONE / 3), FX32_ONE + (FX32_ONE / 3), FX32_ONE + (FX32_ONE / 3)}, - {FX32_ONE + (FX32_ONE / 2), FX32_ONE + (FX32_ONE / 2), FX32_ONE + (FX32_ONE / 2)}, - {FX32_ONE + (FX32_ONE)-(FX32_ONE / 5), FX32_ONE + (FX32_ONE)-(FX32_ONE / 5), FX32_ONE + (FX32_ONE)-(FX32_ONE / 5)}, - {FX32_ONE + (FX32_ONE / 7), FX32_ONE + (FX32_ONE / 7), FX32_ONE + (FX32_ONE / 7)}, - {FX32_ONE - (FX32_ONE / 2), FX32_ONE - (FX32_ONE / 2), FX32_ONE - (FX32_ONE / 2)}, - {FX32_ONE - (FX32_ONE / 4), FX32_ONE - (FX32_ONE / 4), FX32_ONE - (FX32_ONE / 4)}, - {FX32_ONE - (FX32_ONE / 5), FX32_ONE - (FX32_ONE / 5), FX32_ONE - (FX32_ONE / 5)}, - {FX32_ONE - (FX32_ONE / 7), FX32_ONE - (FX32_ONE / 7), FX32_ONE - (FX32_ONE / 7)} + { FX32_ONE, FX32_ONE, FX32_ONE }, + { FX32_ONE + (FX32_ONE / 5), FX32_ONE + (FX32_ONE / 5), FX32_ONE + (FX32_ONE / 5) }, + { FX32_ONE + (FX32_ONE / 4), FX32_ONE + (FX32_ONE / 4), FX32_ONE + (FX32_ONE / 4) }, + { FX32_ONE + (FX32_ONE / 3), FX32_ONE + (FX32_ONE / 3), FX32_ONE + (FX32_ONE / 3) }, + { FX32_ONE + (FX32_ONE / 2), FX32_ONE + (FX32_ONE / 2), FX32_ONE + (FX32_ONE / 2) }, + { FX32_ONE + (FX32_ONE) - (FX32_ONE / 5), FX32_ONE + (FX32_ONE) - (FX32_ONE / 5), FX32_ONE + (FX32_ONE) - (FX32_ONE / 5) }, + { FX32_ONE + (FX32_ONE / 7), FX32_ONE + (FX32_ONE / 7), FX32_ONE + (FX32_ONE / 7) }, + { FX32_ONE - (FX32_ONE / 2), FX32_ONE - (FX32_ONE / 2), FX32_ONE - (FX32_ONE / 2) }, + { FX32_ONE - (FX32_ONE / 4), FX32_ONE - (FX32_ONE / 4), FX32_ONE - (FX32_ONE / 4) }, + { FX32_ONE - (FX32_ONE / 5), FX32_ONE - (FX32_ONE / 5), FX32_ONE - (FX32_ONE / 5) }, + { FX32_ONE - (FX32_ONE / 7), FX32_ONE - (FX32_ONE / 7), FX32_ONE - (FX32_ONE / 7) } }; -void ov111_021D34E0 (UnkStruct_ov111_021D33F4 * param0, u32 param1) +void ov111_021D34E0(UnkStruct_ov111_021D33F4 *param0, u32 param1) { u8 v0; v0 = param1; @@ -127,19 +128,19 @@ void ov111_021D34E0 (UnkStruct_ov111_021D33F4 * param0, u32 param1) return; } -void ov111_021D34F4 (UnkStruct_ov111_021D33F4 * param0, VecFx32 * param1) +void ov111_021D34F4(UnkStruct_ov111_021D33F4 *param0, VecFx32 *param1) { sub_02021C80(param0->unk_0C, param1, 2); return; } -void ov111_021D3500 (UnkStruct_ov111_021D33F4 * param0, u32 param1) +void ov111_021D3500(UnkStruct_ov111_021D33F4 *param0, u32 param1) { sub_02021EC4(param0->unk_0C, param1); return; } -void ov111_021D350C (UnkStruct_ov111_021D33F4 * param0, int param1) +void ov111_021D350C(UnkStruct_ov111_021D33F4 *param0, int param1) { sub_02021CC8(param0->unk_0C, param1); sub_02021CE4(param0->unk_0C, FX32_ONE); @@ -147,13 +148,13 @@ void ov111_021D350C (UnkStruct_ov111_021D33F4 * param0, int param1) return; } -void ov111_021D3530 (UnkStruct_ov111_021D33F4 * param0, BOOL param1) +void ov111_021D3530(UnkStruct_ov111_021D33F4 *param0, BOOL param1) { sub_02021FA0(param0->unk_0C, param1); return; } -BOOL ov111_021D353C (UnkStruct_ov111_021D33F4 * param0) +BOOL ov111_021D353C(UnkStruct_ov111_021D33F4 *param0) { return sub_02021FD0(param0->unk_0C); } diff --git a/src/overlay111/ov111_021D3548.c b/src/overlay111/ov111_021D3548.c index 35b7c24632..21d80ee2cf 100644 --- a/src/overlay111/ov111_021D3548.c +++ b/src/overlay111/ov111_021D3548.c @@ -1,43 +1,44 @@ +#include "overlay111/ov111_021D3548.h" + #include #include #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_0205AA50.h" + #include "overlay061/struct_ov61_0222C884.h" #include "unk_0200DA60.h" #include "unk_02018340.h" -#include "overlay111/ov111_021D3548.h" static const UnkStruct_ov61_0222C884 Unk_ov111_021D38B8[] = { - {0x2, 0x2, 0x1, 0x1B, 0x4, 0xC, 0x1}, - {0x4, 0x18, 0xD, 0x7, 0x4, 0xD, 0x6D}, - {0x4, 0x11, 0x3, 0xB, 0x5, 0xD, 0x89}, - {0x4, 0x11, 0x8, 0xB, 0x5, 0xD, 0xC0}, - {0x4, 0x11, 0xE, 0xB, 0x5, 0xD, 0xF7}, - {0x4, 0x11, 0x13, 0xB, 0x5, 0xD, 0x12E}, - {0x4, 0xA, 0x3, 0x5, 0x3, 0xD, 0x165}, - {0x4, 0xA, 0x8, 0x5, 0x3, 0xD, 0x174}, - {0x4, 0xA, 0xE, 0x5, 0x3, 0xD, 0x183}, - {0x4, 0xA, 0x13, 0x5, 0x3, 0xD, 0x192}, - {0x2, 0xA, 0x9, 0xC, 0x4, 0xD, 0x1A1}, - {0x2, 0xA, 0x9, 0xC, 0x4, 0xD, 0x1A1}, - {0x2, 0xA, 0x9, 0xC, 0x4, 0xD, 0x1A1}, - {0x2, 0xA, 0x15, 0xD, 0x3, 0xD, 0x1D1}, - {0x2, 0xD, 0x15, 0xD, 0x3, 0xD, 0x1D1}, - {0x4, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1} + { 0x2, 0x2, 0x1, 0x1B, 0x4, 0xC, 0x1 }, + { 0x4, 0x18, 0xD, 0x7, 0x4, 0xD, 0x6D }, + { 0x4, 0x11, 0x3, 0xB, 0x5, 0xD, 0x89 }, + { 0x4, 0x11, 0x8, 0xB, 0x5, 0xD, 0xC0 }, + { 0x4, 0x11, 0xE, 0xB, 0x5, 0xD, 0xF7 }, + { 0x4, 0x11, 0x13, 0xB, 0x5, 0xD, 0x12E }, + { 0x4, 0xA, 0x3, 0x5, 0x3, 0xD, 0x165 }, + { 0x4, 0xA, 0x8, 0x5, 0x3, 0xD, 0x174 }, + { 0x4, 0xA, 0xE, 0x5, 0x3, 0xD, 0x183 }, + { 0x4, 0xA, 0x13, 0x5, 0x3, 0xD, 0x192 }, + { 0x2, 0xA, 0x9, 0xC, 0x4, 0xD, 0x1A1 }, + { 0x2, 0xA, 0x9, 0xC, 0x4, 0xD, 0x1A1 }, + { 0x2, 0xA, 0x9, 0xC, 0x4, 0xD, 0x1A1 }, + { 0x2, 0xA, 0x15, 0xD, 0x3, 0xD, 0x1D1 }, + { 0x2, 0xD, 0x15, 0xD, 0x3, 0xD, 0x1D1 }, + { 0x4, 0x2, 0x13, 0x1B, 0x4, 0xC, 0x1 } }; -void ov111_021D3548(BGL * param0, Window * param1); -void ov111_021D3578(Window * param0); -void ov111_021D3594(BGL * param0, Window * param1); -void ov111_021D35C0(Window * param0, int param1); +void ov111_021D3548(BGL *param0, Window *param1); +void ov111_021D3578(Window *param0); +void ov111_021D3594(BGL *param0, Window *param1); +void ov111_021D35C0(Window *param0, int param1); -void ov111_021D3548 (BGL * param0, Window * param1) +void ov111_021D3548(BGL *param0, Window *param1) { u8 v0; - const UnkStruct_ov61_0222C884 * v1 = Unk_ov111_021D38B8; + const UnkStruct_ov61_0222C884 *v1 = Unk_ov111_021D38B8; for (v0 = 0; v0 < 16; v0++) { sub_0201A8D4(param0, ¶m1[v0], &v1[v0]); @@ -47,7 +48,7 @@ void ov111_021D3548 (BGL * param0, Window * param1) return; } -void ov111_021D3578 (Window * param0) +void ov111_021D3578(Window *param0) { u16 v0; @@ -58,7 +59,7 @@ void ov111_021D3578 (Window * param0) return; } -void ov111_021D3594 (BGL * param0, Window * param1) +void ov111_021D3594(BGL *param0, Window *param1) { sub_0200DAA4(param0, 2, (1024 - 9), 11, 0, 115); Window_Show(param1, 1, (1024 - 9), 11); @@ -66,11 +67,11 @@ void ov111_021D3594 (BGL * param0, Window * param1) return; } -void ov111_021D35C0 (Window * param0, int param1) +void ov111_021D35C0(Window *param0, int param1) { - sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - ((18 + 12))), 10, param1, 115); + sub_0200DD0C(param0->unk_00, sub_0201C290(param0), ((1024 - 9) - (18 + 12)), 10, param1, 115); BGL_FillWindow(param0, 15); - sub_0200E060(param0, 0, ((1024 - 9) - ((18 + 12))), 10); + sub_0200E060(param0, 0, ((1024 - 9) - (18 + 12)), 10); return; } diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index ff7ea50bc9..1b2f17b0dd 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -1,93 +1,90 @@ +#include "overlay113/ov113_0225C700.h" + +#include #include #include -#include - -#include "core_sys.h" #include "constants/species.h" +#include "struct_decls/font_oam.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - +#include "struct_defs/sprite_manager_allocation.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017294.h" -#include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay066/ov66_0222DDF0.h" +#include "overlay066/ov66_02231428.h" +#include "overlay066/ov66_022324F0.h" #include "overlay066/struct_ov66_0223127C.h" #include "overlay066/struct_ov66_02232B20.h" #include "overlay066/struct_ov66_022589B4.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "overlay113/ov113_0225E368.h" +#include "overlay113/ov113_02260620.h" +#include "overlay113/ov113_022607D8.h" #include "overlay113/struct_ov113_0225CA04.h" #include "overlay113/struct_ov113_0225EB20.h" #include "overlay113/struct_ov113_022607EC.h" #include "overlay113/struct_ov113_02260818.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_02015920.h" #include "unk_020170BC.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E190.h" #include "unk_0201E3D8.h" #include "unk_0201E86C.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_02024220.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_020393C8.h" -#include "pokemon.h" -#include "party.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_02231428.h" -#include "overlay066/ov66_022324F0.h" -#include "overlay113/ov113_0225C700.h" -#include "overlay113/ov113_0225E368.h" -#include "overlay113/ov113_02260620.h" -#include "overlay113/ov113_022607D8.h" typedef struct { UnkStruct_020170F4 unk_00; @@ -95,36 +92,36 @@ typedef struct { } UnkStruct_ov113_0225DBCC_sub1; typedef struct { - FontOAM * unk_00; + FontOAM *unk_00; SpriteManagerAllocation unk_04; u16 unk_10; } UnkStruct_ov113_0225E250; typedef struct UnkStruct_ov113_0225DBCC_t { - UnkStruct_ov66_0223127C * unk_00; - SaveData * unk_04; - BGL * unk_08; - PaletteData * unk_0C; - UnkStruct_02012744 * unk_10; - GenericPointerData * unk_14; - SysTask * unk_18; - SpriteRenderer * unk_1C; - SpriteGfxHandler * unk_20; - UnkStruct_02015920 * unk_24; + UnkStruct_ov66_0223127C *unk_00; + SaveData *unk_04; + BGL *unk_08; + PaletteData *unk_0C; + UnkStruct_02012744 *unk_10; + GenericPointerData *unk_14; + SysTask *unk_18; + SpriteRenderer *unk_1C; + SpriteGfxHandler *unk_20; + UnkStruct_02015920 *unk_24; u8 unk_28; u8 unk_29; - StringTemplate * unk_2C; - MessageLoader * unk_30; + StringTemplate *unk_2C; + MessageLoader *unk_30; Window unk_34[8]; Window unk_B4; - Strbuf* unk_C4; + Strbuf *unk_C4; u8 unk_C8; - Camera * camera; + Camera *camera; fx32 unk_D0; fx32 unk_D4; UnkStruct_ov113_0225DBCC_sub1 unk_D8; - NARC * unk_160; - NARC * unk_164; + NARC *unk_160; + NARC *unk_164; UnkStruct_ov113_022607EC unk_168; s32 unk_170[8]; int unk_190; @@ -132,12 +129,12 @@ typedef struct UnkStruct_ov113_0225DBCC_t { UnkStruct_ov113_02260818 unk_8D8[6]; u8 unk_920; u8 unk_921; - CellActorData * unk_924[6]; - CellActorData * unk_93C[6]; - CellActorData * unk_954[6]; - CellActorData * unk_96C; - CellActorData * unk_970[8]; - CellActorData * unk_990[3]; + CellActorData *unk_924[6]; + CellActorData *unk_93C[6]; + CellActorData *unk_954[6]; + CellActorData *unk_96C; + CellActorData *unk_970[8]; + CellActorData *unk_990[3]; u16 unk_99C[8]; u16 unk_9AC[8]; int unk_9BC; @@ -149,42 +146,42 @@ typedef struct UnkStruct_ov113_0225DBCC_t { BOOL unk_19E0; } UnkStruct_ov113_0225DBCC; -static void ov113_0225CEF0(SysTask * param0, void * param1); -static void ov113_0225CF18(void * param0); -static void ov113_0225CF58(BGL * param0); -static void ov113_0225D12C(BGL * param0); -static void ov113_0225D160(UnkStruct_ov113_0225DBCC * param0, NARC * param1); -static void ov113_0225DBCC(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC * param0); -static GenericPointerData * ov113_0225DC6C(int param0); +static void ov113_0225CEF0(SysTask *param0, void *param1); +static void ov113_0225CF18(void *param0); +static void ov113_0225CF58(BGL *param0); +static void ov113_0225D12C(BGL *param0); +static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1); +static void ov113_0225DBCC(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0); +static GenericPointerData *ov113_0225DC6C(int param0); static void ov113_0225DC88(void); -static void ov113_0225DD0C(GenericPointerData * param0); -static void ov113_0225D9FC(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225DA9C(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225DAA8(UnkStruct_ov113_0225DBCC * param0, NARC * param1); -static void ov113_0225DAFC(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225DB08(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225E364(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225DD14(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225DD24(UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225CA04 * param1); -static void ov113_0225DD4C(int param0, SaveData * param1, UnkStruct_ov113_02260818 * param2); -static void ov113_0225D304(UnkStruct_ov113_0225DBCC * param0, NARC * param1); -static void ov113_0225D630(UnkStruct_ov113_0225DBCC * param0, NARC * param1); -static void ov113_0225D484(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225D5D8(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225D6F8(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225D7A4(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225D7CC(UnkStruct_ov113_0225DBCC * param0); -static BOOL ov113_0225D938(int param0, int param1, CellActorData * param2, NARC * param3, NARC * param4, NNS_G2D_VRAM_TYPE param5, BOOL param6); -static void ov113_0225E068(UnkStruct_ov113_0225DBCC * param0, int param1); -static void ov113_0225E0D4(UnkStruct_ov113_0225DBCC * param0, int param1); -static void ov113_0225E118(UnkStruct_ov113_0225DBCC * param0); -static int ov113_0225DE98(UnkStruct_ov113_0225DBCC * param0); -static void ov113_0225E15C(UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225E250 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9); -static void ov113_0225E250(UnkStruct_ov113_0225E250 * param0); -static void ov113_0225E264(const Strbuf *param0, int param1, int * param2, int * param3); -static void ov113_0225E294(UnkStruct_ov113_0225DBCC * param0); -static BOOL ov113_0225E318(UnkStruct_ov113_0225DBCC * param0, int param1); +static void ov113_0225DD0C(GenericPointerData *param0); +static void ov113_0225D9FC(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225DA9C(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225DAA8(UnkStruct_ov113_0225DBCC *param0, NARC *param1); +static void ov113_0225DAFC(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225DB08(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225E364(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225DD14(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225DD24(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_0225CA04 *param1); +static void ov113_0225DD4C(int param0, SaveData *param1, UnkStruct_ov113_02260818 *param2); +static void ov113_0225D304(UnkStruct_ov113_0225DBCC *param0, NARC *param1); +static void ov113_0225D630(UnkStruct_ov113_0225DBCC *param0, NARC *param1); +static void ov113_0225D484(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225D5D8(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225D6F8(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225D7A4(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225D7CC(UnkStruct_ov113_0225DBCC *param0); +static BOOL ov113_0225D938(int param0, int param1, CellActorData *param2, NARC *param3, NARC *param4, NNS_G2D_VRAM_TYPE param5, BOOL param6); +static void ov113_0225E068(UnkStruct_ov113_0225DBCC *param0, int param1); +static void ov113_0225E0D4(UnkStruct_ov113_0225DBCC *param0, int param1); +static void ov113_0225E118(UnkStruct_ov113_0225DBCC *param0); +static int ov113_0225DE98(UnkStruct_ov113_0225DBCC *param0); +static void ov113_0225E15C(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_0225E250 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9); +static void ov113_0225E250(UnkStruct_ov113_0225E250 *param0); +static void ov113_0225E264(const Strbuf *param0, int param1, int *param2, int *param3); +static void ov113_0225E294(UnkStruct_ov113_0225DBCC *param0); +static BOOL ov113_0225E318(UnkStruct_ov113_0225DBCC *param0, int param1); static const CameraAngle Unk_ov113_022608B4 = { 0x0, @@ -221,47 +218,47 @@ static const UnkStruct_ov104_02241308 Unk_ov113_022608FC = { }; __attribute__((aligned(4))) static const u8 Unk_ov113_022608C8[][2] = { - {0x7, 0x5}, - {0x16, 0x5}, - {0x7, 0xA}, - {0x16, 0xA}, - {0x7, 0xF}, - {0x16, 0xF}, - {0x7, 0x14}, - {0x16, 0x14} + { 0x7, 0x5 }, + { 0x16, 0x5 }, + { 0x7, 0xA }, + { 0x16, 0xA }, + { 0x7, 0xF }, + { 0x16, 0xF }, + { 0x7, 0x14 }, + { 0x16, 0x14 } }; __attribute__((aligned(4))) static const s16 Unk_ov113_02260934[][2] = { - {0x20, 0x30}, - {0x98, 0x30}, - {0x20, 0x58}, - {0x98, 0x58}, - {0x20, 0x80}, - {0x98, 0x80}, - {0x20, 0xA8}, - {0x98, 0xA8} + { 0x20, 0x30 }, + { 0x98, 0x30 }, + { 0x20, 0x58 }, + { 0x98, 0x58 }, + { 0x20, 0x80 }, + { 0x98, 0x80 }, + { 0x20, 0xA8 }, + { 0x98, 0xA8 } }; __attribute__((aligned(4))) static const s16 Unk_ov113_02260914[][2] = { - {0x48, 0x30}, - {0xC0, 0x30}, - {0x48, 0x58}, - {0xC0, 0x58}, - {0x48, 0x80}, - {0xC0, 0x80}, - {0x48, 0xA8}, - {0xC0, 0xA8} + { 0x48, 0x30 }, + { 0xC0, 0x30 }, + { 0x48, 0x58 }, + { 0xC0, 0x58 }, + { 0x48, 0x80 }, + { 0xC0, 0x80 }, + { 0x48, 0xA8 }, + { 0xC0, 0xA8 } }; __attribute__((aligned(4))) static const u16 Unk_ov113_02260AD4[][4] = { - {0x2, 0x4, 0xE, 0x4}, - {0x11, 0x4, 0xE, 0x4}, - {0x2, 0x9, 0xE, 0x4}, - {0x11, 0x9, 0xE, 0x4}, - {0x2, 0xE, 0xE, 0x4}, - {0x11, 0xE, 0xE, 0x4}, - {0x2, 0x13, 0xE, 0x4}, - {0x11, 0x13, 0xE, 0x4} + { 0x2, 0x4, 0xE, 0x4 }, + { 0x11, 0x4, 0xE, 0x4 }, + { 0x2, 0x9, 0xE, 0x4 }, + { 0x11, 0x9, 0xE, 0x4 }, + { 0x2, 0xE, 0xE, 0x4 }, + { 0x11, 0xE, 0xE, 0x4 }, + { 0x2, 0x13, 0xE, 0x4 }, + { 0x11, 0x13, 0xE, 0x4 } }; static const u16 Unk_ov113_022608AC[] = { @@ -279,7 +276,7 @@ static const SpriteTemplate Unk_ov113_02260A04 = { 0x35, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x2717, 0x2711, 0x2712, 0x2712, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2717, 0x2711, 0x2712, 0x2712, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -292,7 +289,7 @@ static const SpriteTemplate Unk_ov113_02260A38 = { 0x36, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x2717, 0x2711, 0x2712, 0x2712, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2717, 0x2711, 0x2712, 0x2712, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -305,7 +302,7 @@ static const SpriteTemplate Unk_ov113_02260A6C = { 0x34, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x2711, 0x2712, 0x2711, 0x2711, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2711, 0x2712, 0x2711, 0x2711, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -318,7 +315,7 @@ static const SpriteTemplate Unk_ov113_02260AA0 = { 0x32, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x2718, 0x2711, 0x2713, 0x2713, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2718, 0x2711, 0x2713, 0x2713, 0xFFFFFFFF, 0xFFFFFFFF }, 0x0, 0x0 }; @@ -331,7 +328,7 @@ static const SpriteTemplate Unk_ov113_0226099C = { 0x32, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2719, 0x2714, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2719, 0x2714, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -344,14 +341,14 @@ static const SpriteTemplate Unk_ov113_022609D0 = { 0x33, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x271A, 0x2714, 0x2715, 0x2715, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x271A, 0x2714, 0x2715, 0x2715, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; -int ov113_0225C700 (OverlayManager * param0, int * param1) +int ov113_0225C700(OverlayManager *param0, int *param1) { - UnkStruct_ov113_0225DBCC * v0; + UnkStruct_ov113_0225DBCC *v0; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -464,9 +461,9 @@ int ov113_0225C700 (OverlayManager * param0, int * param1) return 1; } -int ov113_0225CA04 (OverlayManager * param0, int * param1) +int ov113_0225CA04(OverlayManager *param0, int *param1) { - UnkStruct_ov113_0225DBCC * v0 = OverlayManager_Data(param0); + UnkStruct_ov113_0225DBCC *v0 = OverlayManager_Data(param0); ov113_0225E3F0(&v0->unk_194, v0->camera, v0->unk_9BC, v0->unk_00->unk_04); @@ -636,9 +633,9 @@ int ov113_0225CA04 (OverlayManager * param0, int * param1) return 0; } -int ov113_0225CDFC (OverlayManager * param0, int * param1) +int ov113_0225CDFC(OverlayManager *param0, int *param1) { - UnkStruct_ov113_0225DBCC * v0 = OverlayManager_Data(param0); + UnkStruct_ov113_0225DBCC *v0 = OverlayManager_Data(param0); SysTask_Done(v0->unk_18); ov113_0225D5D8(v0); @@ -684,9 +681,9 @@ int ov113_0225CDFC (OverlayManager * param0, int * param1) return 1; } -static void ov113_0225CEF0 (SysTask * param0, void * param1) +static void ov113_0225CEF0(SysTask *param0, void *param1) { - UnkStruct_ov113_0225DBCC * v0 = param1; + UnkStruct_ov113_0225DBCC *v0 = param1; ov113_0225E4E8(&v0->unk_194); ov113_0225DB08(v0); @@ -696,9 +693,9 @@ static void ov113_0225CEF0 (SysTask * param0, void * param1) G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z); } -static void ov113_0225CF18 (void * param0) +static void ov113_0225CF18(void *param0) { - UnkStruct_ov113_0225DBCC * v0 = param0; + UnkStruct_ov113_0225DBCC *v0 = param0; ov113_0225E65C(&v0->unk_194, v0->unk_9BC); @@ -710,7 +707,7 @@ static void ov113_0225CF18 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void ov113_0225CF58 (BGL * param0) +static void ov113_0225CF58(BGL *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -763,7 +760,7 @@ static void ov113_0225CF58 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -778,7 +775,7 @@ static void ov113_0225CF58 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -793,7 +790,7 @@ static void ov113_0225CF58 (BGL * param0) 3, 0, 0, - 0 + 0, }, }; @@ -818,8 +815,7 @@ static void ov113_0225CF58 (BGL * param0) { UnkStruct_ov97_0222DB78 v3[] = { - { - 0, + { 0, 0, 0x800, 0, @@ -831,10 +827,8 @@ static void ov113_0225CF58 (BGL * param0) 2, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -846,10 +840,8 @@ static void ov113_0225CF58 (BGL * param0) 3, 0, 0, - 0 - }, - { - 0, + 0 }, + { 0, 0, 0x800, 0, @@ -861,8 +853,7 @@ static void ov113_0225CF58 (BGL * param0) 3, 0, 0, - 0 - }, + 0 }, }; sub_020183C4(param0, 5, &v3[0], 0); @@ -884,7 +875,7 @@ static void ov113_0225CF58 (BGL * param0) sub_02019690(5, 32, 0, 118); } -static void ov113_0225D12C (BGL * param0) +static void ov113_0225D12C(BGL *param0) { sub_02019044(param0, 6); sub_02019044(param0, 5); @@ -894,10 +885,10 @@ static void ov113_0225D12C (BGL * param0) sub_02019044(param0, 1); } -static void ov113_0225D160 (UnkStruct_ov113_0225DBCC * param0, NARC * param1) +static void ov113_0225D160(UnkStruct_ov113_0225DBCC *param0, NARC *param1) { - BGL * v0 = param0->unk_08; - u16 * v1; + BGL *v0 = param0->unk_08; + u16 *v1; PaletteSys_LoadPalette(param0->unk_0C, 187, 19, 118, 0, 0x200 - 0x40, 0); sub_020070E8(param1, 18, param0->unk_08, 2, 0, 0, 0, 118); @@ -936,7 +927,7 @@ static void ov113_0225D160 (UnkStruct_ov113_0225DBCC * param0, NARC * param1) sub_0201C3C0(param0->unk_08, 6); } -static void ov113_0225D304 (UnkStruct_ov113_0225DBCC * param0, NARC * param1) +static void ov113_0225D304(UnkStruct_ov113_0225DBCC *param0, NARC *param1) { int v0, v1; u16 v2; @@ -969,7 +960,7 @@ static void ov113_0225D304 (UnkStruct_ov113_0225DBCC * param0, NARC * param1) param0->unk_921 = sub_0200CD7C(param0->unk_0C, 2, param0->unk_1C, param0->unk_20, 187, 26, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 10003); } -static void ov113_0225D484 (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225D484(UnkStruct_ov113_0225DBCC *param0) { int v0; SpriteTemplate v1; @@ -1010,7 +1001,7 @@ static void ov113_0225D484 (UnkStruct_ov113_0225DBCC * param0) } { - Strbuf* v2; + Strbuf *v2; v2 = MessageLoader_GetNewStrbuf(param0->unk_30, 1); ov113_0225E15C(param0, ¶m0->unk_19C0, v2, 2, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0)), 0, 10003, 0x1c * 8, 176, 1); @@ -1019,7 +1010,7 @@ static void ov113_0225D484 (UnkStruct_ov113_0225DBCC * param0) } } -static void ov113_0225D5D8 (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225D5D8(UnkStruct_ov113_0225DBCC *param0) { int v0; @@ -1038,7 +1029,7 @@ static void ov113_0225D5D8 (UnkStruct_ov113_0225DBCC * param0) ov113_0225E250(¶m0->unk_19C0); } -static void ov113_0225D630 (UnkStruct_ov113_0225DBCC * param0, NARC * param1) +static void ov113_0225D630(UnkStruct_ov113_0225DBCC *param0, NARC *param1) { int v0; @@ -1055,7 +1046,7 @@ static void ov113_0225D630 (UnkStruct_ov113_0225DBCC * param0, NARC * param1) SpriteRenderer_LoadAnimResObjFromOpenNarc(param0->unk_1C, param0->unk_20, param1, 11, 0, 10005); } -static void ov113_0225D6F8 (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225D6F8(UnkStruct_ov113_0225DBCC *param0) { int v0; SpriteTemplate v1; @@ -1077,7 +1068,7 @@ static void ov113_0225D6F8 (UnkStruct_ov113_0225DBCC * param0) } } -static void ov113_0225D7A4 (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225D7A4(UnkStruct_ov113_0225DBCC *param0) { int v0; @@ -1088,10 +1079,10 @@ static void ov113_0225D7A4 (UnkStruct_ov113_0225DBCC * param0) } } -static void ov113_0225D7CC (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225D7CC(UnkStruct_ov113_0225DBCC *param0) { int v0, v1; - u16 * v2, * v3; + u16 *v2, *v3; int v4 = 0; v2 = sub_02003164(param0->unk_0C, 2); @@ -1126,13 +1117,13 @@ static void ov113_0225D7CC (UnkStruct_ov113_0225DBCC * param0) sub_0201C3C0(param0->unk_08, 2); } -static BOOL ov113_0225D938 (int param0, int param1, CellActorData * param2, NARC * param3, NARC * param4, NNS_G2D_VRAM_TYPE param5, BOOL param6) +static BOOL ov113_0225D938(int param0, int param1, CellActorData *param2, NARC *param3, NARC *param4, NNS_G2D_VRAM_TYPE param5, BOOL param6) { - void * v0; - NNSG2dImageProxy * v1; - void * v2; - NNSG2dCharacterData * v3; - u8 * v4, * v5; + void *v0; + NNSG2dImageProxy *v1; + void *v2; + NNSG2dCharacterData *v3; + u8 *v4, *v5; if ((param0 == 0) || (param0 > NATIONAL_DEX_COUNT)) { return 0; @@ -1167,13 +1158,13 @@ static BOOL ov113_0225D938 (int param0, int param1, CellActorData * param2, NARC return 1; } -static void ov113_0225D9FC (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225D9FC(UnkStruct_ov113_0225DBCC *param0) { - VecFx32 v0 = {0, (-FX32_ONE * 8), 0}; + VecFx32 v0 = { 0, (-FX32_ONE * 8), 0 }; param0->camera = Camera_Alloc(118); - Camera_InitWithTarget(&v0, 0x7c000, &Unk_ov113_022608B4, (((22 * 0xffff) / 360)), 0, 0, param0->camera); + Camera_InitWithTarget(&v0, 0x7c000, &Unk_ov113_022608B4, ((22 * 0xffff) / 360), 0, 0, param0->camera); Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), param0->camera); Camera_SetAsActive(param0->camera); @@ -1193,12 +1184,12 @@ static void ov113_0225D9FC (UnkStruct_ov113_0225DBCC * param0) } } -static void ov113_0225DA9C (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225DA9C(UnkStruct_ov113_0225DBCC *param0) { Camera_Delete(param0->camera); } -static void ov113_0225DAA8 (UnkStruct_ov113_0225DBCC * param0, NARC * param1) +static void ov113_0225DAA8(UnkStruct_ov113_0225DBCC *param0, NARC *param1) { int v0; @@ -1215,12 +1206,12 @@ static void ov113_0225DAA8 (UnkStruct_ov113_0225DBCC * param0, NARC * param1) sub_02017348(¶m0->unk_D8.unk_10, 1); } -static void ov113_0225DAFC (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225DAFC(UnkStruct_ov113_0225DBCC *param0) { sub_02017110(¶m0->unk_D8.unk_00); } -static void ov113_0225DB08 (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225DB08(UnkStruct_ov113_0225DBCC *param0) { VecFx32 v0, v1; MtxFx33 v2; @@ -1257,7 +1248,7 @@ static void ov113_0225DB08 (UnkStruct_ov113_0225DBCC * param0) NNS_G3dGePopMtx(1); } -static void ov113_0225DBCC (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225DBCC(UnkStruct_ov113_0225DBCC *param0) { int v0; @@ -1270,7 +1261,7 @@ static void ov113_0225DBCC (UnkStruct_ov113_0225DBCC * param0) } } -static void ov113_0225DC4C (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC *param0) { int v0; @@ -1281,15 +1272,15 @@ static void ov113_0225DC4C (UnkStruct_ov113_0225DBCC * param0) } } -static GenericPointerData * ov113_0225DC6C (int param0) +static GenericPointerData *ov113_0225DC6C(int param0) { - GenericPointerData * v0; + GenericPointerData *v0; v0 = sub_02024220(param0, 0, 2, 0, 2, ov113_0225DC88); return v0; } -static void ov113_0225DC88 (void) +static void ov113_0225DC88(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); G2_SetBG0Priority(1); @@ -1304,22 +1295,22 @@ static void ov113_0225DC88 (void) G3_ViewPort(0, 0, 255, 191); } -static void ov113_0225DD0C (GenericPointerData * param0) +static void ov113_0225DD0C(GenericPointerData *param0) { sub_020242C4(param0); } -static void ov113_0225DD14 (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225DD14(UnkStruct_ov113_0225DBCC *param0) { - UnkStruct_ov113_022607EC * v0; + UnkStruct_ov113_022607EC *v0; v0 = ¶m0->unk_168; v0->unk_04 = ov66_022328F0(); } -static void ov113_0225DD24 (UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225CA04 * param1) +static void ov113_0225DD24(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_0225CA04 *param1) { - UnkStruct_ov113_02260818 * v0; + UnkStruct_ov113_02260818 *v0; MI_CpuClear8(param1, sizeof(UnkStruct_ov113_0225CA04)); @@ -1331,16 +1322,16 @@ static void ov113_0225DD24 (UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0 v0->unk_08 = 0; } -UnkStruct_ov113_022607EC * ov113_0225DD44 (UnkStruct_ov113_0225DBCC * param0) +UnkStruct_ov113_022607EC *ov113_0225DD44(UnkStruct_ov113_0225DBCC *param0) { return ¶m0->unk_168; } -static void ov113_0225DD4C (int param0, SaveData * param1, UnkStruct_ov113_02260818 * param2) +static void ov113_0225DD4C(int param0, SaveData *param1, UnkStruct_ov113_02260818 *param2) { - Party * v0; + Party *v0; int v1; - Pokemon * v2; + Pokemon *v2; int v3; MI_CpuClear8(param2, sizeof(UnkStruct_ov113_02260818) * 6); @@ -1357,7 +1348,7 @@ static void ov113_0225DD4C (int param0, SaveData * param1, UnkStruct_ov113_02260 } } -BOOL ov113_0225DDC0 (UnkStruct_ov113_0225DBCC * param0, const UnkStruct_ov113_02260818 * param1, s32 param2) +BOOL ov113_0225DDC0(UnkStruct_ov113_0225DBCC *param0, const UnkStruct_ov113_02260818 *param1, s32 param2) { int v0; u32 v1; @@ -1383,7 +1374,7 @@ BOOL ov113_0225DDC0 (UnkStruct_ov113_0225DBCC * param0, const UnkStruct_ov113_02 return v0; } -static int ov113_0225DE98 (UnkStruct_ov113_0225DBCC * param0) +static int ov113_0225DE98(UnkStruct_ov113_0225DBCC *param0) { UnkStruct_ov66_02232B20 v0; int v1, v2, v3, v4; @@ -1399,7 +1390,7 @@ static int ov113_0225DE98 (UnkStruct_ov113_0225DBCC * param0) ov113_02260620(param0->unk_30, param0->unk_2C, param0->unk_34, param0->unk_00->unk_00, v0.unk_04[v1]); { - u16 * v5; + u16 *v5; int v6, v7; v5 = sub_02019FE4(param0->unk_08, 6); @@ -1454,17 +1445,17 @@ static int ov113_0225DE98 (UnkStruct_ov113_0225DBCC * param0) return 0; } -void ov113_0225E044 (UnkStruct_ov113_0225DBCC * param0, s32 param1) +void ov113_0225E044(UnkStruct_ov113_0225DBCC *param0, s32 param1) { ov113_02260620(param0->unk_30, param0->unk_2C, param0->unk_34, param0->unk_00->unk_00, param1); } -void ov113_0225E05C (UnkStruct_ov113_0225DBCC * param0, u32 param1) +void ov113_0225E05C(UnkStruct_ov113_0225DBCC *param0, u32 param1) { ov113_02260714(param0->unk_34, param1); } -static void ov113_0225E068 (UnkStruct_ov113_0225DBCC * param0, int param1) +static void ov113_0225E068(UnkStruct_ov113_0225DBCC *param0, int param1) { SpriteTemplate v0; int v1; @@ -1485,9 +1476,9 @@ static void ov113_0225E068 (UnkStruct_ov113_0225DBCC * param0, int param1) Sound_PlayEffect(1509); } -static void ov113_0225E0D4 (UnkStruct_ov113_0225DBCC * param0, int param1) +static void ov113_0225E0D4(UnkStruct_ov113_0225DBCC *param0, int param1) { - u16 * v0, * v1; + u16 *v0, *v1; v0 = sub_02003164(param0->unk_0C, 2); v1 = sub_0200316C(param0->unk_0C, 2); @@ -1496,7 +1487,7 @@ static void ov113_0225E0D4 (UnkStruct_ov113_0225DBCC * param0, int param1) sub_0200393C(&v0[1 * 16 + 1 + param1], &v1[1 * 16 + 1 + param1], 1, 6, 0x0); } -static void ov113_0225E118 (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225E118(UnkStruct_ov113_0225DBCC *param0) { int v0; @@ -1512,15 +1503,15 @@ static void ov113_0225E118 (UnkStruct_ov113_0225DBCC * param0) } } -static void ov113_0225E15C (UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225E250 * param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9) +static void ov113_0225E15C(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_0225E250 *param1, const Strbuf *param2, int param3, u32 param4, int param5, int param6, int param7, int param8, int param9) { UnkStruct_020127E8 v0; Window v1; SpriteManagerAllocation v2; int v3; - FontOAM * v4; - BGL * v5; - SpriteGfxHandler * v6; + FontOAM *v4; + BGL *v5; + SpriteGfxHandler *v6; int v7, v8; GF_ASSERT(param1->unk_00 == NULL); @@ -1567,13 +1558,13 @@ static void ov113_0225E15C (UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0 param1->unk_10 = v7; } -static void ov113_0225E250 (UnkStruct_ov113_0225E250 * param0) +static void ov113_0225E250(UnkStruct_ov113_0225E250 *param0) { sub_02012870(param0->unk_00); sub_0201EE28(¶m0->unk_04); } -static void ov113_0225E264 (const Strbuf *param0, int param1, int * param2, int * param3) +static void ov113_0225E264(const Strbuf *param0, int param1, int *param2, int *param3) { int v0, v1; @@ -1588,7 +1579,7 @@ static void ov113_0225E264 (const Strbuf *param0, int param1, int * param2, int *param3 = v1; } -static void ov113_0225E294 (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225E294(UnkStruct_ov113_0225DBCC *param0) { int v0, v1; @@ -1615,7 +1606,7 @@ static void ov113_0225E294 (UnkStruct_ov113_0225DBCC * param0) } } -static BOOL ov113_0225E318 (UnkStruct_ov113_0225DBCC * param0, int param1) +static BOOL ov113_0225E318(UnkStruct_ov113_0225DBCC *param0, int param1) { if (param0->unk_19D4 < param1) { return 0; @@ -1632,7 +1623,7 @@ static BOOL ov113_0225E318 (UnkStruct_ov113_0225DBCC * param0, int param1) return 1; } -static void ov113_0225E364 (UnkStruct_ov113_0225DBCC * param0) +static void ov113_0225E364(UnkStruct_ov113_0225DBCC *param0) { return; } diff --git a/src/overlay113/ov113_0225E368.c b/src/overlay113/ov113_0225E368.c index 09a253a558..3d7b29af58 100644 --- a/src/overlay113/ov113_0225E368.c +++ b/src/overlay113/ov113_0225E368.c @@ -1,13 +1,16 @@ +#include "overlay113/ov113_0225E368.h" + #include #include #include "constants/species.h" #include "struct_decls/struct_02006C24_decl.h" -#include "overlay113/struct_ov113_0225DBCC_decl.h" - #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017294.h" + +#include "overlay113/ov113_02260620.h" +#include "overlay113/struct_ov113_0225DBCC_decl.h" #include "overlay113/struct_ov113_0225EB20.h" #include "overlay113/struct_ov113_0225EB20_sub1.h" #include "overlay113/struct_ov113_0225EDCC.h" @@ -25,34 +28,32 @@ #include "overlay113/struct_ov113_02260818.h" #include "overlay115/camera_angle.h" +#include "camera.h" +#include "heap.h" +#include "pokemon.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_0201C970.h" #include "unk_0201D15C.h" -#include "camera.h" -#include "pokemon.h" -#include "overlay113/ov113_0225E368.h" -#include "overlay113/ov113_02260620.h" __attribute__((aligned(4))) static const s16 Unk_ov113_02260BCC[] = { - 0xFF, - 0xA, - 0xA, - 0xA, - 0xA, - 0xA, - 0xA, - 0xA, - 0xA + 0xFF, + 0xA, + 0xA, + 0xA, + 0xA, + 0xA, + 0xA, + 0xA, + 0xA }; -typedef int (* UnkFuncPtr_ov113_02260CAC)(UnkStruct_ov113_0225EB20 *, UnkStruct_ov113_0225E6B8 *); -typedef void (* UnkFuncPtr_ov113_02260CAC_1)(UnkStruct_ov113_0225EB20 *, UnkStruct_ov113_0225E6B8 *); -typedef BOOL (* UnkFuncPtr_ov113_02260CAC_2)(UnkStruct_ov113_0225EB20 *, UnkStruct_ov113_0225E6B8 *, UnkStruct_ov113_0225E6B8 *); -typedef BOOL (* UnkFuncPtr_ov113_02260C0C)(UnkStruct_ov113_0225EB20 *, UnkStruct_ov113_0225EB20_sub1 *, Camera *); +typedef int (*UnkFuncPtr_ov113_02260CAC)(UnkStruct_ov113_0225EB20 *, UnkStruct_ov113_0225E6B8 *); +typedef void (*UnkFuncPtr_ov113_02260CAC_1)(UnkStruct_ov113_0225EB20 *, UnkStruct_ov113_0225E6B8 *); +typedef BOOL (*UnkFuncPtr_ov113_02260CAC_2)(UnkStruct_ov113_0225EB20 *, UnkStruct_ov113_0225E6B8 *, UnkStruct_ov113_0225E6B8 *); +typedef BOOL (*UnkFuncPtr_ov113_02260C0C)(UnkStruct_ov113_0225EB20 *, UnkStruct_ov113_0225EB20_sub1 *, Camera *); typedef struct { UnkFuncPtr_ov113_02260CAC unk_00; @@ -177,64 +178,64 @@ typedef struct UnkStruct_ov113_0225E6B8_t { u32 unk_240_24 : 8; } UnkStruct_ov113_0225E6B8; -static UnkStruct_ov113_0225E6B8 * ov113_0225E6B8(UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225EB20 * param1, const UnkStruct_ov113_02260818 * param2, NARC * param3, NARC * param4, BOOL param5); -static void ov113_0225EB0C(UnkStruct_ov113_0225E6B8 * param0); -static void ov113_0225EB20(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, int param2); -static void ov113_0225EB64(UnkStruct_ov113_0225DBCC * param0, int param1, int param2, fx32 * param3, fx32 * param4); -static BOOL ov113_0225E774(UnkStruct_ov113_0225EB20 * param0, UnkStruct_020170F4 * param1, NARC * param2, NARC * param3, const UnkStruct_ov113_02260818 * param4, BOOL param5); -static void ov113_0225E920(NNSG3dResTex * param0, NARC * param1, NARC * param2, const UnkStruct_ov113_02260818 * param3, BOOL param4); -static void ov113_0225EA60(NNSG3dResTex * param0, int param1); -static BOOL ov113_0225E8B0(NNSG3dResTex * param0); -static BOOL ov113_0225E854(UnkStruct_ov113_0225EB20 * param0, NNSG3dResTex * param1); -static void ov113_0225E884(UnkStruct_ov113_0225EB20 * param0, NNSG3dResTex * param1); -static BOOL ov113_0225EEBC(UnkStruct_ov113_0225E6B8 * param0, int param1); -static u8 ov113_0225EEF8(const UnkStruct_ov113_02260818 * param0); -static int ov113_0225EBFC(UnkStruct_ov113_0225EB20 * param0); -static void ov113_0225EC60(UnkStruct_ov113_0225EB20 * param0, int param1); -static void ov113_0225ECA0(UnkStruct_02017294 * param0, const UnkStruct_ov113_02260818 * param1, UnkStruct_ov113_0225EDA4 * param2, int param3); -static BOOL ov113_0225EDA4(const UnkStruct_ov113_0225EDA4 * param0, const UnkStruct_ov113_0225EDA4 * param1); -static void ov113_0225EDCC(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225EE0C(UnkStruct_ov113_0225EB20 * param0, int param1, int param2); -static void ov113_0225EE78(UnkStruct_ov113_0225EB20 * param0, int param1); -static void ov113_0225EE98(UnkStruct_ov113_0225EB20 * param0); -static BOOL ov113_0225FD80(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225FD80 * param1, int param2, int param3); -static int ov113_0225EF0C(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225EF78(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225F060(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225F1E4(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225F368(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225F51C(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225F728(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225F818(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225F890(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225FAB0(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static int ov113_0225FCD0(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static void ov113_0225EFFC(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static void ov113_0225F194(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static void ov113_0225F680(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static void ov113_0225FA24(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static void ov113_0225FC44(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1); -static BOOL ov113_0225EF74(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225F044(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225F1B8(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225F34C(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225F500(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225F70C(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225F7FC(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225F874(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225FA84(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225FCA4(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225FD64(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2); -static BOOL ov113_0225FE30(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera); -static BOOL ov113_0225FEE0(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera); -static BOOL ov113_0225FF8C(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera); -static BOOL ov113_02260064(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera); -static BOOL ov113_0226013C(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera); -static BOOL ov113_02260218(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera); -static BOOL ov113_022602E4(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera); -static BOOL ov113_02260394(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera); -static BOOL ov113_0226046C(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera); -static BOOL ov113_02260544(UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera); +static UnkStruct_ov113_0225E6B8 *ov113_0225E6B8(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_0225EB20 *param1, const UnkStruct_ov113_02260818 *param2, NARC *param3, NARC *param4, BOOL param5); +static void ov113_0225EB0C(UnkStruct_ov113_0225E6B8 *param0); +static void ov113_0225EB20(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, int param2); +static void ov113_0225EB64(UnkStruct_ov113_0225DBCC *param0, int param1, int param2, fx32 *param3, fx32 *param4); +static BOOL ov113_0225E774(UnkStruct_ov113_0225EB20 *param0, UnkStruct_020170F4 *param1, NARC *param2, NARC *param3, const UnkStruct_ov113_02260818 *param4, BOOL param5); +static void ov113_0225E920(NNSG3dResTex *param0, NARC *param1, NARC *param2, const UnkStruct_ov113_02260818 *param3, BOOL param4); +static void ov113_0225EA60(NNSG3dResTex *param0, int param1); +static BOOL ov113_0225E8B0(NNSG3dResTex *param0); +static BOOL ov113_0225E854(UnkStruct_ov113_0225EB20 *param0, NNSG3dResTex *param1); +static void ov113_0225E884(UnkStruct_ov113_0225EB20 *param0, NNSG3dResTex *param1); +static BOOL ov113_0225EEBC(UnkStruct_ov113_0225E6B8 *param0, int param1); +static u8 ov113_0225EEF8(const UnkStruct_ov113_02260818 *param0); +static int ov113_0225EBFC(UnkStruct_ov113_0225EB20 *param0); +static void ov113_0225EC60(UnkStruct_ov113_0225EB20 *param0, int param1); +static void ov113_0225ECA0(UnkStruct_02017294 *param0, const UnkStruct_ov113_02260818 *param1, UnkStruct_ov113_0225EDA4 *param2, int param3); +static BOOL ov113_0225EDA4(const UnkStruct_ov113_0225EDA4 *param0, const UnkStruct_ov113_0225EDA4 *param1); +static void ov113_0225EDCC(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225EE0C(UnkStruct_ov113_0225EB20 *param0, int param1, int param2); +static void ov113_0225EE78(UnkStruct_ov113_0225EB20 *param0, int param1); +static void ov113_0225EE98(UnkStruct_ov113_0225EB20 *param0); +static BOOL ov113_0225FD80(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225FD80 *param1, int param2, int param3); +static int ov113_0225EF0C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225EF78(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225F060(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225F1E4(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225F368(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225F51C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225F728(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225F818(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225F890(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225FAB0(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static int ov113_0225FCD0(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static void ov113_0225EFFC(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static void ov113_0225F194(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static void ov113_0225F680(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static void ov113_0225FA24(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static void ov113_0225FC44(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1); +static BOOL ov113_0225EF74(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225F044(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225F1B8(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225F34C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225F500(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225F70C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225F7FC(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225F874(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225FA84(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225FCA4(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225FD64(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2); +static BOOL ov113_0225FE30(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera); +static BOOL ov113_0225FEE0(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera); +static BOOL ov113_0225FF8C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera); +static BOOL ov113_02260064(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera); +static BOOL ov113_0226013C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera); +static BOOL ov113_02260218(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera); +static BOOL ov113_022602E4(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera); +static BOOL ov113_02260394(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera); +static BOOL ov113_0226046C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera); +static BOOL ov113_02260544(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera); static const struct { fx32 unk_00; @@ -249,17 +250,17 @@ static const struct { }; static const UnkStruct_ov113_02260CAC Unk_ov113_02260CAC[] = { - {ov113_0225EF0C, NULL, ov113_0225EF74}, - {ov113_0225EF78, ov113_0225EFFC, ov113_0225F044}, - {ov113_0225F060, ov113_0225F194, ov113_0225F1B8}, - {ov113_0225F1E4, NULL, ov113_0225F34C}, - {ov113_0225F368, NULL, ov113_0225F500}, - {ov113_0225F51C, ov113_0225F680, ov113_0225F70C}, - {ov113_0225F728, NULL, ov113_0225F7FC}, - {ov113_0225F818, NULL, ov113_0225F874}, - {ov113_0225F890, ov113_0225FA24, ov113_0225FA84}, - {ov113_0225FAB0, ov113_0225FC44, ov113_0225FCA4}, - {ov113_0225FCD0, NULL, ov113_0225FD64} + { ov113_0225EF0C, NULL, ov113_0225EF74 }, + { ov113_0225EF78, ov113_0225EFFC, ov113_0225F044 }, + { ov113_0225F060, ov113_0225F194, ov113_0225F1B8 }, + { ov113_0225F1E4, NULL, ov113_0225F34C }, + { ov113_0225F368, NULL, ov113_0225F500 }, + { ov113_0225F51C, ov113_0225F680, ov113_0225F70C }, + { ov113_0225F728, NULL, ov113_0225F7FC }, + { ov113_0225F818, NULL, ov113_0225F874 }, + { ov113_0225F890, ov113_0225FA24, ov113_0225FA84 }, + { ov113_0225FAB0, ov113_0225FC44, ov113_0225FCA4 }, + { ov113_0225FCD0, NULL, ov113_0225FD64 } }; __attribute__((aligned(4))) static const u8 Unk_ov113_02260D30[] = { @@ -295,20 +296,20 @@ static const UnkStruct_ov113_0225EDA4 Unk_ov113_02260C38[] = { -(((FX32_ONE * 16 * 1) / 2) / 3), ((FX32_ONE * 16 * 1) / 2) / 3, ((FX32_ONE * 16 * 1) / 2) / 3, - -(((FX32_ONE * 16 * 1) / 2) / 3) + -(((FX32_ONE * 16 * 1) / 2) / 3), }, { -(((FX32_ONE * 16 * 1) / 2) / 2), ((FX32_ONE * 16 * 1) / 2) / 2, ((FX32_ONE * 16 * 1) / 2) / 2, - -(((FX32_ONE * 16 * 1) / 2) / 2) + -(((FX32_ONE * 16 * 1) / 2) / 2), }, { -(((FX32_ONE * 16 * 1) / 2) / 3 * 2), ((FX32_ONE * 16 * 1) / 2) / 3 * 2, ((FX32_ONE * 16 * 1) / 2) / 3 * 2, - -(((FX32_ONE * 16 * 1) / 2) / 3 * 2) - } + -(((FX32_ONE * 16 * 1) / 2) / 3 * 2), + }, }; static const UnkFuncPtr_ov113_02260C0C Unk_ov113_02260C0C[] = { @@ -359,12 +360,12 @@ static const s32 Unk_ov113_02260BE0[] = { 0xFFFFFFFFFFFDB70F }; -void ov113_0225E368 (UnkStruct_ov113_0225EB20 * param0, BOOL param1) +void ov113_0225E368(UnkStruct_ov113_0225EB20 *param0, BOOL param1) { MI_CpuClear8(param0, sizeof(UnkStruct_ov113_0225EB20)); } -void ov113_0225E378 (UnkStruct_ov113_0225EB20 * param0) +void ov113_0225E378(UnkStruct_ov113_0225EB20 *param0) { int v0; @@ -375,7 +376,7 @@ void ov113_0225E378 (UnkStruct_ov113_0225EB20 * param0) } } -BOOL ov113_0225E398 (UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225EB20 * param1, const UnkStruct_ov113_02260818 * param2, NARC * param3, NARC * param4, BOOL param5) +BOOL ov113_0225E398(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_0225EB20 *param1, const UnkStruct_ov113_02260818 *param2, NARC *param3, NARC *param4, BOOL param5) { int v0; @@ -398,10 +399,10 @@ BOOL ov113_0225E398 (UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225EB20 return 0; } -void ov113_0225E3F0 (UnkStruct_ov113_0225EB20 * param0, Camera * camera, int param2, int param3) +void ov113_0225E3F0(UnkStruct_ov113_0225EB20 *param0, Camera *camera, int param2, int param3) { int v0; - UnkStruct_ov113_0225E6B8 * v1; + UnkStruct_ov113_0225E6B8 *v1; int v2; BOOL v3; @@ -436,10 +437,10 @@ void ov113_0225E3F0 (UnkStruct_ov113_0225EB20 * param0, Camera * camera, int par } } -void ov113_0225E4A0 (UnkStruct_ov113_0225EB20 * param0) +void ov113_0225E4A0(UnkStruct_ov113_0225EB20 *param0) { int v0; - UnkStruct_ov113_0225E6B8 * v1; + UnkStruct_ov113_0225E6B8 *v1; for (v0 = 0; v0 < 128; v0++) { v1 = param0->unk_B4[v0]; @@ -454,11 +455,11 @@ void ov113_0225E4A0 (UnkStruct_ov113_0225EB20 * param0) } } -void ov113_0225E4E8 (UnkStruct_ov113_0225EB20 * param0) +void ov113_0225E4E8(UnkStruct_ov113_0225EB20 *param0) { int v0, v1, v2, v3, v4; - UnkStruct_ov113_0225E6B8 * v5; - UnkStruct_ov113_0225E6B8 * v6; + UnkStruct_ov113_0225E6B8 *v5; + UnkStruct_ov113_0225E6B8 *v6; BOOL v7; int v8 = 0; @@ -516,10 +517,10 @@ void ov113_0225E4E8 (UnkStruct_ov113_0225EB20 * param0) } } -void ov113_0225E65C (UnkStruct_ov113_0225EB20 * param0, int param1) +void ov113_0225E65C(UnkStruct_ov113_0225EB20 *param0, int param1) { int v0; - NNSG3dResTex ** v1; + NNSG3dResTex **v1; v1 = param0->unk_4B4; @@ -542,9 +543,9 @@ void ov113_0225E65C (UnkStruct_ov113_0225EB20 * param0, int param1) } } -static UnkStruct_ov113_0225E6B8 * ov113_0225E6B8 (UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0225EB20 * param1, const UnkStruct_ov113_02260818 * param2, NARC * param3, NARC * param4, BOOL param5) +static UnkStruct_ov113_0225E6B8 *ov113_0225E6B8(UnkStruct_ov113_0225DBCC *param0, UnkStruct_ov113_0225EB20 *param1, const UnkStruct_ov113_02260818 *param2, NARC *param3, NARC *param4, BOOL param5) { - UnkStruct_ov113_0225E6B8 * v0; + UnkStruct_ov113_0225E6B8 *v0; fx32 v1, v2; BOOL v3; @@ -574,7 +575,7 @@ static UnkStruct_ov113_0225E6B8 * ov113_0225E6B8 (UnkStruct_ov113_0225DBCC * par return v0; } -static BOOL ov113_0225E774 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_020170F4 * param1, NARC * param2, NARC * param3, const UnkStruct_ov113_02260818 * param4, BOOL param5) +static BOOL ov113_0225E774(UnkStruct_ov113_0225EB20 *param0, UnkStruct_020170F4 *param1, NARC *param2, NARC *param3, const UnkStruct_ov113_02260818 *param4, BOOL param5) { param1->unk_00 = sub_0200723C(param2, 29, 0, 118, 0); @@ -619,7 +620,7 @@ static BOOL ov113_0225E774 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_020170F return 1; } -static BOOL ov113_0225E854 (UnkStruct_ov113_0225EB20 * param0, NNSG3dResTex * param1) +static BOOL ov113_0225E854(UnkStruct_ov113_0225EB20 *param0, NNSG3dResTex *param1) { int v0; @@ -633,7 +634,7 @@ static BOOL ov113_0225E854 (UnkStruct_ov113_0225EB20 * param0, NNSG3dResTex * pa return 0; } -static void ov113_0225E884 (UnkStruct_ov113_0225EB20 * param0, NNSG3dResTex * param1) +static void ov113_0225E884(UnkStruct_ov113_0225EB20 *param0, NNSG3dResTex *param1) { int v0; @@ -645,7 +646,7 @@ static void ov113_0225E884 (UnkStruct_ov113_0225EB20 * param0, NNSG3dResTex * pa } } -static BOOL ov113_0225E8B0 (NNSG3dResTex * param0) +static BOOL ov113_0225E8B0(NNSG3dResTex *param0) { u32 v0, v1; NNSG3dTexKey v2; @@ -674,11 +675,11 @@ static BOOL ov113_0225E8B0 (NNSG3dResTex * param0) return 1; } -static void ov113_0225E920 (NNSG3dResTex * param0, NARC * param1, NARC * param2, const UnkStruct_ov113_02260818 * param3, BOOL param4) +static void ov113_0225E920(NNSG3dResTex *param0, NARC *param1, NARC *param2, const UnkStruct_ov113_02260818 *param3, BOOL param4) { - u16 * v0; - u8 * v1, * v2; - NNSG2dCharacterData * v3; + u16 *v0; + u8 *v1, *v2; + NNSG2dCharacterData *v3; int v4; v4 = PokemonHasOverworldFootprint(param3->unk_02, param3->unk_08, param4); @@ -696,8 +697,8 @@ static void ov113_0225E920 (NNSG3dResTex * param0, NARC * param1, NARC * param2, { int v5, v6, v7, v8, v9, v10; - u8 * v11, * v12; - u16 * v13; + u8 *v11, *v12; + u16 *v13; v11 = v3->pRawData; v12 = v11; @@ -779,10 +780,10 @@ static void ov113_0225E920 (NNSG3dResTex * param0, NARC * param1, NARC * param2, Heap_FreeToHeap(v2); } -static void ov113_0225EA60 (NNSG3dResTex * param0, int param1) +static void ov113_0225EA60(NNSG3dResTex *param0, int param1) { - u32 * v0; - u32 * v1; + u32 *v0; + u32 *v1; int v2, v3, v4, v5, v6; v0 = (u32 *)((u8 *)param0 + param0->texInfo.ofsTex); @@ -827,13 +828,13 @@ static void ov113_0225EA60 (NNSG3dResTex * param0, int param1) Heap_FreeToHeap(v1); } -static void ov113_0225EB0C (UnkStruct_ov113_0225E6B8 * param0) +static void ov113_0225EB0C(UnkStruct_ov113_0225E6B8 *param0) { sub_02017110(¶m0->unk_0C); Heap_FreeToHeap(param0); } -static void ov113_0225EB20 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, int param2) +static void ov113_0225EB20(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, int param2) { if ((param1->unk_240_0 == 0) || (param1->unk_240_4 == 1)) { ov113_0225E884(param0, param1->unk_0C.unk_0C); @@ -845,7 +846,7 @@ static void ov113_0225EB20 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 param0->unk_B4[param2] = NULL; } -static void ov113_0225EB64 (UnkStruct_ov113_0225DBCC * param0, int param1, int param2, fx32 * param3, fx32 * param4) +static void ov113_0225EB64(UnkStruct_ov113_0225DBCC *param0, int param1, int param2, fx32 *param3, fx32 *param4) { int v0; @@ -874,7 +875,7 @@ static void ov113_0225EB64 (UnkStruct_ov113_0225DBCC * param0, int param1, int p } } -static int ov113_0225EBFC (UnkStruct_ov113_0225EB20 * param0) +static int ov113_0225EBFC(UnkStruct_ov113_0225EB20 *param0) { int v0, v1; @@ -887,7 +888,7 @@ static int ov113_0225EBFC (UnkStruct_ov113_0225EB20 * param0) v1 = 0; - for ( ; v0 < 63; v0++) { + for (; v0 < 63; v0++) { if ((param0->unk_534[1] & (1 << v1)) == 0) { param0->unk_534[1] |= 1 << v1; return v0; @@ -899,7 +900,7 @@ static int ov113_0225EBFC (UnkStruct_ov113_0225EB20 * param0) return 0xff; } -static void ov113_0225EC60 (UnkStruct_ov113_0225EB20 * param0, int param1) +static void ov113_0225EC60(UnkStruct_ov113_0225EB20 *param0, int param1) { if (param1 == 0xff) { return; @@ -912,7 +913,7 @@ static void ov113_0225EC60 (UnkStruct_ov113_0225EB20 * param0, int param1) } } -static void ov113_0225ECA0 (UnkStruct_02017294 * param0, const UnkStruct_ov113_02260818 * param1, UnkStruct_ov113_0225EDA4 * param2, int param3) +static void ov113_0225ECA0(UnkStruct_02017294 *param0, const UnkStruct_ov113_02260818 *param1, UnkStruct_ov113_0225EDA4 *param2, int param3) { fx32 v0, v1, v2; fx32 v3, v4, v5; @@ -946,7 +947,7 @@ static void ov113_0225ECA0 (UnkStruct_02017294 * param0, const UnkStruct_ov113_0 } } -static BOOL ov113_0225EDA4 (const UnkStruct_ov113_0225EDA4 * param0, const UnkStruct_ov113_0225EDA4 * param1) +static BOOL ov113_0225EDA4(const UnkStruct_ov113_0225EDA4 *param0, const UnkStruct_ov113_0225EDA4 *param1) { if ((param0->unk_00 <= param1->unk_04) && (param1->unk_00 <= param0->unk_04) && (param0->unk_08 >= param1->unk_0C) && (param1->unk_08 >= param0->unk_0C)) { return 1; @@ -955,10 +956,10 @@ static BOOL ov113_0225EDA4 (const UnkStruct_ov113_0225EDA4 * param0, const UnkSt } } -static void ov113_0225EDCC (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static void ov113_0225EDCC(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { int v0; - UnkStruct_ov113_0225EDCC * v1; + UnkStruct_ov113_0225EDCC *v1; v1 = param0->unk_53C; @@ -976,7 +977,7 @@ static void ov113_0225EDCC (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 GF_ASSERT(0); } -static int ov113_0225EE0C (UnkStruct_ov113_0225EB20 * param0, int param1, int param2) +static int ov113_0225EE0C(UnkStruct_ov113_0225EB20 *param0, int param1, int param2) { if (param1 == 0xff) { return 0; @@ -994,7 +995,7 @@ static int ov113_0225EE0C (UnkStruct_ov113_0225EB20 * param0, int param1, int pa return 0; } -static void ov113_0225EE78 (UnkStruct_ov113_0225EB20 * param0, int param1) +static void ov113_0225EE78(UnkStruct_ov113_0225EB20 *param0, int param1) { int v0; @@ -1013,7 +1014,7 @@ static void ov113_0225EE78 (UnkStruct_ov113_0225EB20 * param0, int param1) param0->unk_53C[param1].unk_01 = v0; } -static void ov113_0225EE98 (UnkStruct_ov113_0225EB20 * param0) +static void ov113_0225EE98(UnkStruct_ov113_0225EB20 *param0) { MI_CpuClear8(¶m0->unk_00, sizeof(UnkStruct_ov113_0225EB20_sub1)); @@ -1022,7 +1023,7 @@ static void ov113_0225EE98 (UnkStruct_ov113_0225EB20 * param0) param0->unk_73E = 0; } -static BOOL ov113_0225EEBC (UnkStruct_ov113_0225E6B8 * param0, int param1) +static BOOL ov113_0225EEBC(UnkStruct_ov113_0225E6B8 *param0, int param1) { if ((param0->unk_240_8 != 0) || (param0->unk_240_16 != 0) || (param0->unk_240_0 == 0)) { return 0; @@ -1033,7 +1034,7 @@ static BOOL ov113_0225EEBC (UnkStruct_ov113_0225E6B8 * param0, int param1) return 1; } -static u8 ov113_0225EEF8 (const UnkStruct_ov113_02260818 * param0) +static u8 ov113_0225EEF8(const UnkStruct_ov113_02260818 *param0) { u8 v0; @@ -1041,9 +1042,9 @@ static u8 ov113_0225EEF8 (const UnkStruct_ov113_02260818 * param0) return Unk_ov113_02260D30[v0]; } -static int ov113_0225EF0C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225EF0C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225EF0C * v0 = ¶m1->unk_94.val1; + UnkStruct_ov113_0225EF0C *v0 = ¶m1->unk_94.val1; v0->unk_00++; @@ -1061,14 +1062,14 @@ static int ov113_0225EF0C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static BOOL ov113_0225EF74 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225EF74(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { return 0; } -static int ov113_0225EF78 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225EF78(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225EF78 * v0 = ¶m1->unk_94.val2; + UnkStruct_ov113_0225EF78 *v0 = ¶m1->unk_94.val2; switch (v0->unk_08) { case 0: @@ -1097,9 +1098,9 @@ static int ov113_0225EF78 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static void ov113_0225EFFC (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static void ov113_0225EFFC(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225EF78 * v0 = ¶m1->unk_94.val2; + UnkStruct_ov113_0225EF78 *v0 = ¶m1->unk_94.val2; if (v0->unk_09 != 0xff) { NNS_G3dGlbPolygonAttr(0, 0, 0, v0->unk_09, v0->unk_00 >> 8, 0); @@ -1110,10 +1111,10 @@ static void ov113_0225EFFC (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 sub_02017294(¶m1->unk_1C); } -static BOOL ov113_0225F044 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225F044(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { - UnkStruct_ov113_0225EF78 * v0 = ¶m1->unk_94.val2; - UnkStruct_ov113_0225EF0C * v1 = ¶m2->unk_94.val1; + UnkStruct_ov113_0225EF78 *v0 = ¶m1->unk_94.val2; + UnkStruct_ov113_0225EF0C *v1 = ¶m2->unk_94.val1; if (ov113_0225EDA4(&v0->unk_0C, &v1->unk_04) == 1) { return 1; @@ -1122,9 +1123,9 @@ static BOOL ov113_0225F044 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static int ov113_0225F060 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225F060(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225F060 * v0 = ¶m1->unk_94.val3; + UnkStruct_ov113_0225F060 *v0 = ¶m1->unk_94.val3; int v1; fx32 v2, v3, v4; @@ -1164,9 +1165,9 @@ static int ov113_0225F060 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static void ov113_0225F194 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static void ov113_0225F194(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225F060 * v0 = ¶m1->unk_94.val3; + UnkStruct_ov113_0225F060 *v0 = ¶m1->unk_94.val3; int v1; for (v1 = 0; v1 < 3; v1++) { @@ -1176,10 +1177,10 @@ static void ov113_0225F194 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 sub_02017294(¶m1->unk_1C); } -static BOOL ov113_0225F1B8 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225F1B8(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { - UnkStruct_ov113_0225F060 * v0 = ¶m1->unk_94.val3; - UnkStruct_ov113_0225EF0C * v1 = ¶m2->unk_94.val1; + UnkStruct_ov113_0225F060 *v0 = ¶m1->unk_94.val3; + UnkStruct_ov113_0225EF0C *v1 = ¶m2->unk_94.val1; int v2; for (v2 = 0; v2 < 3 + 1; v2++) { @@ -1191,9 +1192,9 @@ static BOOL ov113_0225F1B8 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static int ov113_0225F1E4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225F1E4(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225F1E4 * v0 = ¶m1->unk_94.val4; + UnkStruct_ov113_0225F1E4 *v0 = ¶m1->unk_94.val4; u16 v1, v2; fx32 v3, v4, v5; @@ -1260,10 +1261,10 @@ static int ov113_0225F1E4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static BOOL ov113_0225F34C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225F34C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { - UnkStruct_ov113_0225F1E4 * v0 = ¶m1->unk_94.val4; - UnkStruct_ov113_0225EF0C * v1 = ¶m2->unk_94.val1; + UnkStruct_ov113_0225F1E4 *v0 = ¶m1->unk_94.val4; + UnkStruct_ov113_0225EF0C *v1 = ¶m2->unk_94.val1; if (ov113_0225EDA4(&v0->unk_0C, &v1->unk_04) == 1) { return 1; @@ -1272,9 +1273,9 @@ static BOOL ov113_0225F34C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static int ov113_0225F368 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225F368(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225F368 * v0 = ¶m1->unk_94.val5; + UnkStruct_ov113_0225F368 *v0 = ¶m1->unk_94.val5; u16 v1; fx32 v2, v3, v4; fx32 v5; @@ -1341,10 +1342,10 @@ static int ov113_0225F368 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static BOOL ov113_0225F500 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225F500(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { - UnkStruct_ov113_0225F368 * v0 = ¶m1->unk_94.val5; - UnkStruct_ov113_0225EF0C * v1 = ¶m2->unk_94.val1; + UnkStruct_ov113_0225F368 *v0 = ¶m1->unk_94.val5; + UnkStruct_ov113_0225EF0C *v1 = ¶m2->unk_94.val1; if (ov113_0225EDA4(&v0->unk_10, &v1->unk_04) == 1) { return 1; @@ -1353,9 +1354,9 @@ static BOOL ov113_0225F500 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static int ov113_0225F51C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225F51C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225F51C * v0 = ¶m1->unk_94.val6; + UnkStruct_ov113_0225F51C *v0 = ¶m1->unk_94.val6; fx32 v1, v2, v3; int v4; @@ -1409,9 +1410,9 @@ static int ov113_0225F51C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static void ov113_0225F680 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static void ov113_0225F680(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225F51C * v0 = ¶m1->unk_94.val6; + UnkStruct_ov113_0225F51C *v0 = ¶m1->unk_94.val6; int v1; if (v0->unk_16C != 0xff) { @@ -1433,10 +1434,10 @@ static void ov113_0225F680 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 sub_02017294(¶m1->unk_1C); } -static BOOL ov113_0225F70C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225F70C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { - UnkStruct_ov113_0225F51C * v0 = ¶m1->unk_94.val6; - UnkStruct_ov113_0225EF0C * v1 = ¶m2->unk_94.val1; + UnkStruct_ov113_0225F51C *v0 = ¶m1->unk_94.val6; + UnkStruct_ov113_0225EF0C *v1 = ¶m2->unk_94.val1; if (ov113_0225EDA4(&v0->unk_170, &v1->unk_04) == 1) { return 1; @@ -1445,9 +1446,9 @@ static BOOL ov113_0225F70C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static int ov113_0225F728 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225F728(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225F728 * v0 = ¶m1->unk_94.val7; + UnkStruct_ov113_0225F728 *v0 = ¶m1->unk_94.val7; u16 v1; fx32 v2, v3, v4; fx32 v5; @@ -1480,10 +1481,10 @@ static int ov113_0225F728 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static BOOL ov113_0225F7FC (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225F7FC(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { - UnkStruct_ov113_0225F728 * v0 = ¶m1->unk_94.val7; - UnkStruct_ov113_0225EF0C * v1 = ¶m2->unk_94.val1; + UnkStruct_ov113_0225F728 *v0 = ¶m1->unk_94.val7; + UnkStruct_ov113_0225EF0C *v1 = ¶m2->unk_94.val1; if (ov113_0225EDA4(&v0->unk_0C, &v1->unk_04) == 1) { return 1; @@ -1492,9 +1493,9 @@ static BOOL ov113_0225F7FC (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static int ov113_0225F818 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225F818(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225F818 * v0 = ¶m1->unk_94.val8; + UnkStruct_ov113_0225F818 *v0 = ¶m1->unk_94.val8; switch (v0->unk_06) { case 0: @@ -1516,10 +1517,10 @@ static int ov113_0225F818 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static BOOL ov113_0225F874 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225F874(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { - UnkStruct_ov113_0225F818 * v0 = ¶m1->unk_94.val8; - UnkStruct_ov113_0225EF0C * v1 = ¶m2->unk_94.val1; + UnkStruct_ov113_0225F818 *v0 = ¶m1->unk_94.val8; + UnkStruct_ov113_0225EF0C *v1 = ¶m2->unk_94.val1; if (ov113_0225EDA4(&v0->unk_08, &v1->unk_04) == 1) { return 1; @@ -1528,9 +1529,9 @@ static BOOL ov113_0225F874 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static int ov113_0225F890 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225F890(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225F890 * v0 = ¶m1->unk_94.val9; + UnkStruct_ov113_0225F890 *v0 = ¶m1->unk_94.val9; fx32 v1, v2, v3; fx32 v4; int v5; @@ -1592,9 +1593,9 @@ static int ov113_0225F890 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static void ov113_0225FA24 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static void ov113_0225FA24(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225F890 * v0 = ¶m1->unk_94.val9; + UnkStruct_ov113_0225F890 *v0 = ¶m1->unk_94.val9; int v1; if (v0->unk_F6 != 0xff) { @@ -1610,10 +1611,10 @@ static void ov113_0225FA24 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 sub_02017294(¶m1->unk_1C); } -static BOOL ov113_0225FA84 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225FA84(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { - UnkStruct_ov113_0225F890 * v0 = ¶m1->unk_94.val9; - UnkStruct_ov113_0225EF0C * v1 = ¶m2->unk_94.val1; + UnkStruct_ov113_0225F890 *v0 = ¶m1->unk_94.val9; + UnkStruct_ov113_0225EF0C *v1 = ¶m2->unk_94.val1; int v2; for (v2 = 0; v2 < 2 + 1; v2++) { @@ -1625,9 +1626,9 @@ static BOOL ov113_0225FA84 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static int ov113_0225FAB0 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225FAB0(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225FAB0 * v0 = ¶m1->unk_94.val10; + UnkStruct_ov113_0225FAB0 *v0 = ¶m1->unk_94.val10; fx32 v1, v2, v3; fx32 v4; int v5; @@ -1690,9 +1691,9 @@ static int ov113_0225FAB0 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static void ov113_0225FC44 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static void ov113_0225FC44(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225FAB0 * v0 = ¶m1->unk_94.val10; + UnkStruct_ov113_0225FAB0 *v0 = ¶m1->unk_94.val10; int v1; if (v0->unk_F6 != 0xff) { @@ -1708,10 +1709,10 @@ static void ov113_0225FC44 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 sub_02017294(¶m1->unk_1C); } -static BOOL ov113_0225FCA4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225FCA4(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { - UnkStruct_ov113_0225FAB0 * v0 = ¶m1->unk_94.val10; - UnkStruct_ov113_0225EF0C * v1 = ¶m2->unk_94.val1; + UnkStruct_ov113_0225FAB0 *v0 = ¶m1->unk_94.val10; + UnkStruct_ov113_0225EF0C *v1 = ¶m2->unk_94.val1; int v2; for (v2 = 0; v2 < 2 + 1; v2++) { @@ -1723,9 +1724,9 @@ static BOOL ov113_0225FCA4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static int ov113_0225FCD0 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1) +static int ov113_0225FCD0(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1) { - UnkStruct_ov113_0225FCD0 * v0 = ¶m1->unk_94.val11; + UnkStruct_ov113_0225FCD0 *v0 = ¶m1->unk_94.val11; fx32 v1, v2, v3; fx32 v4; @@ -1754,10 +1755,10 @@ static int ov113_0225FCD0 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_02 return 0; } -static BOOL ov113_0225FD64 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225E6B8 * param1, UnkStruct_ov113_0225E6B8 * param2) +static BOOL ov113_0225FD64(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225E6B8 *param1, UnkStruct_ov113_0225E6B8 *param2) { - UnkStruct_ov113_0225FCD0 * v0 = ¶m1->unk_94.val11; - UnkStruct_ov113_0225EF0C * v1 = ¶m2->unk_94.val1; + UnkStruct_ov113_0225FCD0 *v0 = ¶m1->unk_94.val11; + UnkStruct_ov113_0225EF0C *v1 = ¶m2->unk_94.val1; if (ov113_0225EDA4(&v0->unk_08, &v1->unk_04) == 1) { return 1; @@ -1766,7 +1767,7 @@ static BOOL ov113_0225FD64 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_0225FD80 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225FD80 * param1, int param2, int param3) +static BOOL ov113_0225FD80(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225FD80 *param1, int param2, int param3) { int v0; @@ -1817,9 +1818,9 @@ static BOOL ov113_0225FD80 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_0225FE30 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera) +static BOOL ov113_0225FE30(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera) { - UnkStruct_ov113_0225FE30 * v0 = ¶m1->unk_00; + UnkStruct_ov113_0225FE30 *v0 = ¶m1->unk_00; switch (v0->unk_06) { case 0: @@ -1858,9 +1859,9 @@ static BOOL ov113_0225FE30 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_0225FEE0 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera) +static BOOL ov113_0225FEE0(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera) { - UnkStruct_ov113_0225FEE0 * v0 = ¶m1->unk_08; + UnkStruct_ov113_0225FEE0 *v0 = ¶m1->unk_08; fx32 v1; switch (v0->unk_0C) { @@ -1907,10 +1908,10 @@ static BOOL ov113_0225FEE0 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_0225FF8C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera) +static BOOL ov113_0225FF8C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera) { - UnkStruct_ov113_0225FF8C * v0 = ¶m1->unk_18; - CameraAngle v1 = {0, 0, 0, 0}; + UnkStruct_ov113_0225FF8C *v0 = ¶m1->unk_18; + CameraAngle v1 = { 0, 0, 0, 0 }; switch (v0->unk_0E) { case 0: @@ -1950,10 +1951,10 @@ static BOOL ov113_0225FF8C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_02260064 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera) +static BOOL ov113_02260064(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera) { - UnkStruct_ov113_02260064 * v0 = ¶m1->unk_28; - CameraAngle v1 = {0, 0, 0, 0}; + UnkStruct_ov113_02260064 *v0 = ¶m1->unk_28; + CameraAngle v1 = { 0, 0, 0, 0 }; switch (v0->unk_0E) { case 0: @@ -1993,10 +1994,10 @@ static BOOL ov113_02260064 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_0226013C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera) +static BOOL ov113_0226013C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera) { - UnkStruct_ov113_0226013C * v0 = ¶m1->unk_38; - CameraAngle v1 = {0, 0, 0, 0}; + UnkStruct_ov113_0226013C *v0 = ¶m1->unk_38; + CameraAngle v1 = { 0, 0, 0, 0 }; switch (v0->unk_0E) { case 0: @@ -2039,11 +2040,11 @@ static BOOL ov113_0226013C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_02260218 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera) +static BOOL ov113_02260218(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera) { - UnkStruct_ov113_02260218 * v0 = ¶m1->unk_48; + UnkStruct_ov113_02260218 *v0 = ¶m1->unk_48; fx32 v1; - CameraAngle v2 = {0, 0, 0, 0}; + CameraAngle v2 = { 0, 0, 0, 0 }; switch (v0->unk_0D) { case 0: @@ -2075,9 +2076,9 @@ static BOOL ov113_02260218 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_022602E4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera) +static BOOL ov113_022602E4(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera) { - UnkStruct_ov113_022602E4 * v0 = ¶m1->unk_58; + UnkStruct_ov113_022602E4 *v0 = ¶m1->unk_58; switch (v0->unk_06) { case 0: @@ -2116,10 +2117,10 @@ static BOOL ov113_022602E4 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_02260394 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera) +static BOOL ov113_02260394(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera) { - UnkStruct_ov113_02260394 * v0 = ¶m1->unk_60; - VecFx32 v1 = {0, 0, 0}; + UnkStruct_ov113_02260394 *v0 = ¶m1->unk_60; + VecFx32 v1 = { 0, 0, 0 }; fx32 v2; switch (v0->unk_1D) { @@ -2155,10 +2156,10 @@ static BOOL ov113_02260394 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_0226046C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera) +static BOOL ov113_0226046C(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera) { - UnkStruct_ov113_0226046C * v0 = ¶m1->unk_80; - VecFx32 v1 = {0, 0, 0}; + UnkStruct_ov113_0226046C *v0 = ¶m1->unk_80; + VecFx32 v1 = { 0, 0, 0 }; fx32 v2; switch (v0->unk_1D) { @@ -2194,10 +2195,10 @@ static BOOL ov113_0226046C (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0 return 0; } -static BOOL ov113_02260544 (UnkStruct_ov113_0225EB20 * param0, UnkStruct_ov113_0225EB20_sub1 * param1, Camera * camera) +static BOOL ov113_02260544(UnkStruct_ov113_0225EB20 *param0, UnkStruct_ov113_0225EB20_sub1 *param1, Camera *camera) { - UnkStruct_ov113_02260544 * v0 = ¶m1->unk_A0; - CameraAngle v1 = {0, 0, 0, 0}; + UnkStruct_ov113_02260544 *v0 = ¶m1->unk_A0; + CameraAngle v1 = { 0, 0, 0, 0 }; switch (v0->unk_0E) { case 0: diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c index ac3bc557e7..0d156eb9a8 100644 --- a/src/overlay113/ov113_02260620.c +++ b/src/overlay113/ov113_02260620.c @@ -1,62 +1,61 @@ +#include "overlay113/ov113_02260620.h" + #include #include +#include "constants/species.h" #include "consts/pokemon.h" -#include "message.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "overlay066/struct_ov66_0222DFF8_decl.h" -#include "overlay066/struct_ov66_0222E71C_decl.h" -#include "touch_screen.h" #include "struct_defs/struct_0205AA50.h" -#include "overlay113/struct_ov113_02260818.h" + +#include "overlay066/ov66_0222DDF0.h" +#include "overlay066/ov66_022324F0.h" +#include "overlay066/struct_ov66_0222DFF8_decl.h" +#include "overlay066/struct_ov66_0222E71C_decl.h" #include "overlay113/footprint_data.h" +#include "overlay113/struct_ov113_02260818.h" +#include "heap.h" #include "message.h" -#include "constants/species.h" +#include "strbuf.h" #include "string_template.h" -#include "heap.h" +#include "touch_screen.h" +#include "trainer_info.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay066/ov66_022324F0.h" -#include "overlay113/ov113_02260620.h" __attribute__((aligned(4))) static const u16 Unk_ov113_02260D6C[][2] = { - { 0x4210, 0x6f7b }, - { 0x1A, 0x483C }, - { 0x221, 0x1746 }, - { 0x61A0, 0x7325 }, - { 0x17D, 0x7DE }, - { 0x3C70, 0x79D9 }, - { 0xC, 0x5f3d }, - { 0x3A80, 0x5400 }, - { 0x2D4A, 0x5651 } + { 0x4210, 0x6f7b }, + { 0x1A, 0x483C }, + { 0x221, 0x1746 }, + { 0x61A0, 0x7325 }, + { 0x17D, 0x7DE }, + { 0x3C70, 0x79D9 }, + { 0xC, 0x5f3d }, + { 0x3A80, 0x5400 }, + { 0x2D4A, 0x5651 } }; #include "res/pokemon/footprint_data.h" static const TouchScreenRect Unk_ov113_02260D4C[] = { - {0xA0, 0xC0, 0x0, 0x20}, - {0xA0, 0xC0, 0x20, 0x40}, - {0xA0, 0xC0, 0x40, 0x60}, - {0xA0, 0xC0, 0x60, 0x80}, - {0xA0, 0xC0, 0x80, 0xA0}, - {0xA0, 0xC0, 0xA0, 0xC0}, - {0xA0, 0xC0, 0xC0, 0xFF}, - {0xFF, 0x0, 0x0, 0x0} + { 0xA0, 0xC0, 0x0, 0x20 }, + { 0xA0, 0xC0, 0x20, 0x40 }, + { 0xA0, 0xC0, 0x40, 0x60 }, + { 0xA0, 0xC0, 0x60, 0x80 }, + { 0xA0, 0xC0, 0x80, 0xA0 }, + { 0xA0, 0xC0, 0xA0, 0xC0 }, + { 0xA0, 0xC0, 0xC0, 0xFF }, + { 0xFF, 0x0, 0x0, 0x0 } }; -void ov113_02260620 (MessageLoader * param0, StringTemplate * param1, Window param2[], UnkStruct_ov66_0222DFF8 * param3, s32 param4) +void ov113_02260620(MessageLoader *param0, StringTemplate *param1, Window param2[], UnkStruct_ov66_0222DFF8 *param3, s32 param4) { - const UnkStruct_ov66_0222E71C * v0; - TrainerInfo * v1; - Strbuf* v2; - Strbuf* v3; - Strbuf* v4; + const UnkStruct_ov66_0222E71C *v0; + TrainerInfo *v1; + Strbuf *v2; + Strbuf *v3; + Strbuf *v4; int v5 = 64; int v6; u32 v7, v8; @@ -113,7 +112,7 @@ void ov113_02260620 (MessageLoader * param0, StringTemplate * param1, Window par Heap_FreeToHeap(v1); } -void ov113_02260714 (Window param0[], u32 param1) +void ov113_02260714(Window param0[], u32 param1) { if (param1 >= 8) { GF_ASSERT(0); @@ -123,12 +122,12 @@ void ov113_02260714 (Window param0[], u32 param1) sub_0201ACF4(¶m0[param1]); } -u16 ov113_0226072C (int param0, u32 param1) +u16 ov113_0226072C(int param0, u32 param1) { return Unk_ov113_02260D6C[param1 % NELEMS(Unk_ov113_02260D6C)][param0]; } -int ov113_02260748 (UnkStruct_ov113_02260818 * param0, int param1) +int ov113_02260748(UnkStruct_ov113_02260818 *param0, int param1) { int v0; int v1 = 0xff; @@ -151,7 +150,7 @@ int ov113_02260748 (UnkStruct_ov113_02260818 * param0, int param1) // canShowArceus is a flag pulled from wifi room data that dictates whether or not Arceus is allowed to be seen. // The contexts where Arceus is allowed to be seen is unclear. I haven't seen any case where this could be true // Seems to be from a cut feature where you could have pokemon out walking around while being in a wifi room. Amity square? -BOOL PokemonHasOverworldFootprint (int species, int form, BOOL canShowArceus) +BOOL PokemonHasOverworldFootprint(int species, int form, BOOL canShowArceus) { if (species == SPECIES_GIRATINA && form > 0) { return FALSE; @@ -164,7 +163,7 @@ BOOL PokemonHasOverworldFootprint (int species, int form, BOOL canShowArceus) return sSpeciesFootprintData[species].hasFootprint; } -int PokemonOverworldFootprintSize (int species, int form) +int PokemonOverworldFootprintSize(int species, int form) { if (species == SPECIES_GIRATINA && form > 0) { return FOOTPRINT_LARGE; @@ -172,4 +171,3 @@ int PokemonOverworldFootprintSize (int species, int form) return sSpeciesFootprintData[species].footprintSize; } - diff --git a/src/overlay113/ov113_022607D8.c b/src/overlay113/ov113_022607D8.c index 5777cb7a89..ea9d7b6dd9 100644 --- a/src/overlay113/ov113_022607D8.c +++ b/src/overlay113/ov113_022607D8.c @@ -1,35 +1,34 @@ +#include "overlay113/ov113_022607D8.h" + +#include #include #include -#include - -#include "overlay113/struct_ov113_0225DBCC_decl.h" - -#include "overlay113/struct_ov113_0225CA04.h" -#include "overlay113/struct_ov113_022607EC.h" -#include "overlay113/struct_ov113_02260818.h" #include "overlay066/ov66_02231428.h" #include "overlay066/ov66_022324F0.h" #include "overlay113/ov113_0225C700.h" -#include "overlay113/ov113_022607D8.h" +#include "overlay113/struct_ov113_0225CA04.h" +#include "overlay113/struct_ov113_0225DBCC_decl.h" +#include "overlay113/struct_ov113_022607EC.h" +#include "overlay113/struct_ov113_02260818.h" -static void ov113_02260838(s32 param0, const void * param1, u32 param2, void * param3); -static void ov113_0226085C(s32 param0, const void * param1, u32 param2, void * param3); -static void ov113_02260884(s32 param0, const void * param1, u32 param2, void * param3); -static BOOL ov113_022607EC(s32 param0, UnkStruct_ov113_022607EC * param1); +static void ov113_02260838(s32 param0, const void *param1, u32 param2, void *param3); +static void ov113_0226085C(s32 param0, const void *param1, u32 param2, void *param3); +static void ov113_02260884(s32 param0, const void *param1, u32 param2, void *param3); +static BOOL ov113_022607EC(s32 param0, UnkStruct_ov113_022607EC *param1); static const UnkStruct_ov66_022589B4 Unk_ov113_02261548[] = { - {ov113_02260838, sizeof(UnkStruct_ov113_0225CA04)}, - {ov113_0226085C, 0x0}, - {ov113_02260884, sizeof(UnkStruct_ov113_02260818)} + { ov113_02260838, sizeof(UnkStruct_ov113_0225CA04) }, + { ov113_0226085C, 0x0 }, + { ov113_02260884, sizeof(UnkStruct_ov113_02260818) } }; -void ov113_022607D8 (UnkStruct_ov113_0225DBCC * param0) +void ov113_022607D8(UnkStruct_ov113_0225DBCC *param0) { ov66_02232D60(Unk_ov113_02261548, (NELEMS(Unk_ov113_02261548)), param0); } -static BOOL ov113_022607EC (s32 param0, UnkStruct_ov113_022607EC * param1) +static BOOL ov113_022607EC(s32 param0, UnkStruct_ov113_022607EC *param1) { if (param1->unk_04 == param0) { return 0; @@ -46,7 +45,7 @@ static BOOL ov113_022607EC (s32 param0, UnkStruct_ov113_022607EC * param1) return 1; } -BOOL ov113_02260818 (const UnkStruct_ov113_02260818 * param0) +BOOL ov113_02260818(const UnkStruct_ov113_02260818 *param0) { if (ov66_02231760() == 1) { return 0; @@ -56,11 +55,11 @@ BOOL ov113_02260818 (const UnkStruct_ov113_02260818 * param0) return 1; } -static void ov113_02260838 (s32 param0, const void * param1, u32 param2, void * param3) +static void ov113_02260838(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov113_0225DBCC * v0 = param3; - UnkStruct_ov113_022607EC * v1 = ov113_0225DD44(v0); - const UnkStruct_ov113_0225CA04 * v2 = param1; + UnkStruct_ov113_0225DBCC *v0 = param3; + UnkStruct_ov113_022607EC *v1 = ov113_0225DD44(v0); + const UnkStruct_ov113_0225CA04 *v2 = param1; if (ov113_022607EC(param0, v1) == 0) { return; @@ -69,10 +68,10 @@ static void ov113_02260838 (s32 param0, const void * param1, u32 param2, void * ov113_0225E044(v0, param0); } -static void ov113_0226085C (s32 param0, const void * param1, u32 param2, void * param3) +static void ov113_0226085C(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov113_0225DBCC * v0 = param3; - UnkStruct_ov113_022607EC * v1 = ov113_0225DD44(v0); + UnkStruct_ov113_0225DBCC *v0 = param3; + UnkStruct_ov113_022607EC *v1 = ov113_0225DD44(v0); if (ov113_022607EC(param0, v1) == 0) { return; @@ -81,11 +80,11 @@ static void ov113_0226085C (s32 param0, const void * param1, u32 param2, void * ov113_0225E05C(v0, ov66_02232B8C(param0)); } -static void ov113_02260884 (s32 param0, const void * param1, u32 param2, void * param3) +static void ov113_02260884(s32 param0, const void *param1, u32 param2, void *param3) { - UnkStruct_ov113_0225DBCC * v0 = param3; - UnkStruct_ov113_022607EC * v1 = ov113_0225DD44(v0); - const UnkStruct_ov113_02260818 * v2 = param1; + UnkStruct_ov113_0225DBCC *v0 = param3; + UnkStruct_ov113_022607EC *v1 = ov113_0225DD44(v0); + const UnkStruct_ov113_02260818 *v2 = param1; if (ov113_022607EC(param0, v1) == 0) { return; diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index a3ab2e4e40..531ecc7bf9 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -1,78 +1,75 @@ -#include "enums.h" +#include "overlay114/ov114_0225C700.h" #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202B370_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + +#include "overlay004/ov4_021D0D80.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" +#include "overlay066/ov66_0222DDF0.h" #include "overlay066/struct_ov66_02230DBC.h" #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay114/ov114_02260044.h" #include "overlay114/struct_ov114_0225C76C.h" #include "overlay114/struct_ov114_0225C9A8.h" +#include "buffer_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "enums.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "buffer_manager.h" #include "unk_02015920.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202ACE0.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_0203909C.h" #include "unk_020393C8.h" #include "unk_02094EDC.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay066/ov66_0222DDF0.h" -#include "overlay114/ov114_0225C700.h" -#include "overlay114/ov114_02260044.h" typedef struct { fx32 unk_00; @@ -84,18 +81,18 @@ typedef struct { typedef struct { BOOL unk_00; - UnkStruct_02009DC8 * unk_04[4]; + UnkStruct_02009DC8 *unk_04[4]; UnkStruct_ov19_021DA864 unk_14; } UnkStruct_ov114_0225CDB4; typedef struct { - UnkStruct_02009714 * unk_00[4]; - UnkStruct_ov114_0225CDB4 * unk_10; + UnkStruct_02009714 *unk_00[4]; + UnkStruct_ov114_0225CDB4 *unk_10; u32 unk_14; } UnkStruct_ov114_0225CCD0; typedef struct { - GraphicElementManager * unk_00; + GraphicElementManager *unk_00; UnkStruct_0200C738 unk_04; } UnkStruct_ov114_0225CFCC; @@ -105,23 +102,23 @@ typedef struct { } UnkStruct_ov114_02260284; typedef struct { - BGL * unk_00; - const UnkStruct_ov114_02260284 * unk_04; + BGL *unk_00; + const UnkStruct_ov114_02260284 *unk_04; u32 unk_08; } UnkStruct_ov114_0225CEF0; typedef struct { - MessageLoader * unk_00; - StringTemplate * unk_04; - Strbuf* unk_08; - Strbuf* unk_0C; + MessageLoader *unk_00; + StringTemplate *unk_04; + Strbuf *unk_08; + Strbuf *unk_0C; } UnkStruct_ov114_0225D084; typedef struct { Window unk_00[2]; u16 unk_20[2]; - Strbuf* unk_24[2]; - void * unk_2C[2]; + Strbuf *unk_24[2]; + void *unk_2C[2]; BOOL unk_34; } UnkStruct_ov114_0225D338; @@ -133,8 +130,8 @@ typedef struct { typedef struct { Window unk_00; - GraphicElementData * unk_10; - GraphicElementData * unk_14; + GraphicElementData *unk_10; + GraphicElementData *unk_14; u16 unk_18; u8 unk_1A; u8 unk_1B; @@ -147,22 +144,22 @@ typedef struct { typedef struct { u8 unk_00[4]; u8 unk_04[4]; - const TrainerInfo * unk_08[4]; + const TrainerInfo *unk_08[4]; } UnkStruct_ov114_0225E0F8; typedef struct { Window unk_00; u32 unk_10; - Strbuf* unk_14; + Strbuf *unk_14; UnkStruct_ov114_0225CBF0 unk_18; s16 unk_2C; s16 unk_2E; } UnkStruct_ov114_0225E1A4; typedef struct { - UnkStruct_ov114_0225CEF0 * unk_00; + UnkStruct_ov114_0225CEF0 *unk_00; s16 unk_04[2][192]; - BufferManager * bufferManager; + BufferManager *bufferManager; } UnkStruct_ov114_0225DFFC; typedef struct UnkStruct_ov114_0225D678_t { @@ -179,21 +176,21 @@ typedef struct UnkStruct_ov114_0225D678_t { UnkStruct_ov114_0225D338 unk_4C; UnkStruct_ov114_0225CFCC unk_84; UnkStruct_ov114_0225CCD0 unk_214; - UnkStruct_ov114_0225CDB4 * unk_22C; + UnkStruct_ov114_0225CDB4 *unk_22C; UnkStruct_ov114_0225E1A4 unk_230; - void * unk_260; - NNSG2dScreenData * unk_264; + void *unk_260; + NNSG2dScreenData *unk_264; UnkStruct_ov114_0225DAC0 unk_268[4]; UnkStruct_ov114_0225DFFC unk_348; - SysTask * unk_650; - SysTask * unk_654; + SysTask *unk_650; + SysTask *unk_654; } UnkStruct_ov114_0225D678; typedef struct { u8 unk_00; u8 unk_01; u16 unk_02; - UnkStruct_02015920 * unk_04; + UnkStruct_02015920 *unk_04; UnkStruct_02015958 unk_08; u8 unk_1C; u8 unk_1D; @@ -202,10 +199,10 @@ typedef struct { } UnkStruct_ov114_0225F270; typedef struct { - void * unk_00; - NNSG2dScreenData * unk_04; - GraphicElementData * unk_08[15]; - UnkStruct_ov114_0225CDB4 * unk_44; + void *unk_00; + NNSG2dScreenData *unk_04; + GraphicElementData *unk_08[15]; + UnkStruct_ov114_0225CDB4 *unk_44; u8 unk_48; u8 unk_49; u8 unk_4A; @@ -230,31 +227,31 @@ typedef struct UnkStruct_ov114_0225E854_t { UnkStruct_ov114_0225D338 unk_68; UnkStruct_ov114_0225CFCC unk_A0; UnkStruct_ov114_0225CCD0 unk_230; - UnkStruct_ov114_0225CDB4 * unk_248; + UnkStruct_ov114_0225CDB4 *unk_248; UnkStruct_ov114_0225F270 unk_24C; UnkStruct_ov114_0225F578 unk_26C; - void * unk_2B8[1]; - NNSG2dScreenData * unk_2BC[1]; + void *unk_2B8[1]; + NNSG2dScreenData *unk_2BC[1]; UnkStruct_ov114_0225DAC0 unk_2C0[4]; UnkStruct_ov114_0225DFFC unk_3A0; - SysTask * unk_6A8; - SysTask * unk_6AC; + SysTask *unk_6A8; + SysTask *unk_6AC; u32 unk_6B0; u16 unk_6B4; u16 unk_6B6; - void * unk_6B8; - NNSG2dPaletteData * unk_6BC; + void *unk_6B8; + NNSG2dPaletteData *unk_6BC; u16 unk_6C0; u16 unk_6C2; BOOL unk_6C4; } UnkStruct_ov114_0225E854; typedef struct { - GraphicElementData * unk_00[2]; + GraphicElementData *unk_00[2]; s16 unk_08; s16 unk_0A; u8 unk_0C[2][192]; - SysTask * unk_18C; + SysTask *unk_18C; GXWndPlane unk_190; GXWndPlane battlerType; int unk_194; @@ -264,12 +261,12 @@ typedef struct UnkStruct_ov114_02025CAD4_t { u32 unk_00; u16 unk_04; s16 unk_06; - GraphicElementManager * unk_08; - NARC * unk_0C; + GraphicElementManager *unk_08; + NARC *unk_0C; UnkStruct_ov114_0225CCD0 unk_10; - UnkStruct_ov114_0225CDB4 * unk_28; - SysTask * unk_2C; - GraphicElementData * unk_30; + UnkStruct_ov114_0225CDB4 *unk_28; + SysTask *unk_2C; + GraphicElementData *unk_30; UnkStruct_ov114_0225FAB8 unk_34; } UnkStruct_ov114_0225CAD4; @@ -278,125 +275,125 @@ typedef struct { u16 unk_02; } UnkStruct_ov114_02260234; -static void ov114_0225CBF0(UnkStruct_ov114_0225CBF0 * param0, fx32 param1, fx32 param2, fx32 param3, int param4); -static BOOL ov114_0225CC4C(UnkStruct_ov114_0225CBF0 * param0, s32 param1); -static void ov114_0225CCB0(NNSG2dScreenData * param0, u32 param1); -static void ov114_0225CCD0(UnkStruct_ov114_0225CCD0 * param0, u32 param1, u32 param2); -static void ov114_0225CD10(UnkStruct_ov114_0225CCD0 * param0); -static UnkStruct_ov114_0225CDB4 * ov114_0225CD54(UnkStruct_ov114_0225CCD0 * param0, NARC * param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); -static GraphicElementData * ov114_0225CDB4(UnkStruct_ov114_0225CDB4 * param0, GraphicElementManager * param1, s16 param2, s16 param3, u16 param4, u32 param5); -static void ov114_0225CDE0(UnkStruct_ov114_0225CCD0 * param0, UnkStruct_ov114_0225CDB4 * param1, NARC * param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9); -static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 * param0, UnkStruct_ov114_0225CDB4 * param1); -static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 * param0, const UnkStruct_ov84_0223BA5C * param1, const UnkStruct_ov114_02260284 * param2, u32 param3, u32 param4); -static void ov114_0225CF84(UnkStruct_ov114_0225CEF0 * param0); -static void ov114_0225CFC0(UnkStruct_ov114_0225CEF0 * param0); -static void ov114_0225CFCC(UnkStruct_ov114_0225CFCC * param0, u32 param1, u32 param2, u32 param3, u32 param4); -static void ov114_0225D058(UnkStruct_ov114_0225CFCC * param0); -static void ov114_0225D070(UnkStruct_ov114_0225CFCC * param0); -static void ov114_0225D07C(UnkStruct_ov114_0225CFCC * param0); -static void ov114_0225D084(UnkStruct_ov114_0225D084 * param0, u32 param1); -static void ov114_0225D0D8(UnkStruct_ov114_0225D084 * param0); -static void ov114_0225D0F8(UnkStruct_ov114_0225D084 * param0); -static void ov114_0225D104(UnkStruct_ov114_0225D084 * param0, const TrainerInfo * param1); -static void ov114_0225D114(UnkStruct_ov114_0225D084 * param0, u32 param1); -static void ov114_0225D124(UnkStruct_ov114_0225D084 * param0, u32 param1, u32 param2); -static void ov114_0225D138(UnkStruct_ov114_0225D084 * param0, u32 param1, u32 param2); -static void ov114_0225D154(UnkStruct_ov114_0225D084 * param0, u32 param1); -static void ov114_0225D170(UnkStruct_ov114_0225D084 * param0, u32 param1); -static void ov114_0225D180(UnkStruct_ov114_0225D084 * param0, u32 param1); -static void ov114_0225D190(UnkStruct_ov114_0225D084 * param0, Strbuf *param1, u32 param2); -static void ov114_0225D1AC(UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, u8 param3, u8 param4); -static void ov114_0225D1C8(UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, u8 param3, u8 param4); -static u32 ov114_0225D218(UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, Strbuf *param3, u32 param4); -static void ov114_0225D254(UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, u8 param3, u8 param4, u32 param5); -static void ov114_0225D290(UnkStruct_ov114_0225D338 * param0, UnkStruct_ov114_0225CEF0 * param1, SaveData * param2, BOOL param3, u32 param4); -static void ov114_0225D338(UnkStruct_ov114_0225D338 * param0); -static void ov114_0225D368(UnkStruct_ov114_0225D338 * param0, UnkStruct_ov114_0225D084 * param1, u32 param2, u32 param3); -static void ov114_0225D400(UnkStruct_ov114_0225D338 * param0, u32 param1); -static BOOL ov114_0225D43C(const UnkStruct_ov114_0225D338 * param0, u32 param1); -static void ov114_0225D458(UnkStruct_ov114_0225D338 * param0, u32 param1); -static void ov114_0225D474(UnkStruct_ov114_0225D338 * param0, u32 param1); -static void ov114_0225DAC0(UnkStruct_ov114_0225DAC0 * param0, u32 param1, u32 param2, NNSG2dScreenData * param3, UnkStruct_ov114_0225CEF0 * param4, u32 param5, u32 param6, UnkStruct_ov114_0225CFCC * param7, UnkStruct_ov114_0225CDB4 * param8, u32 param9); -static void ov114_0225DC44(UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0225D084 * param1, const TrainerInfo * param2, s16 param3, s16 param4, u32 param5); -static void ov114_0225DCA0(UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0225D084 * param1, BOOL param2, u32 param3, u32 param4, s16 param5); -static void ov114_0225DD0C(UnkStruct_ov114_0225DAC0 * param0, u32 param1); -static void ov114_0225DD2C(UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0225D084 * param1, u32 param2, s16 param3, s16 param4, u32 param5); -static void ov114_0225DD80(UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0225CEF0 * param1); -static void ov114_0225DD94(UnkStruct_ov114_0225DAC0 * param0); -static void ov114_0225DDA0(UnkStruct_ov114_0225DAC0 * param0); -static void ov114_0225DDD4(UnkStruct_ov114_0225DAC0 * param0, s16 param1, s16 param2); -static void ov114_0225DE38(UnkStruct_ov114_0225DAC0 * param0, s16 param1); -static BOOL ov114_0225DE70(UnkStruct_ov114_0225DAC0 * param0); -static void ov114_0225DEBC(UnkStruct_ov114_0225DAC0 * param0, s32 param1); +static void ov114_0225CBF0(UnkStruct_ov114_0225CBF0 *param0, fx32 param1, fx32 param2, fx32 param3, int param4); +static BOOL ov114_0225CC4C(UnkStruct_ov114_0225CBF0 *param0, s32 param1); +static void ov114_0225CCB0(NNSG2dScreenData *param0, u32 param1); +static void ov114_0225CCD0(UnkStruct_ov114_0225CCD0 *param0, u32 param1, u32 param2); +static void ov114_0225CD10(UnkStruct_ov114_0225CCD0 *param0); +static UnkStruct_ov114_0225CDB4 *ov114_0225CD54(UnkStruct_ov114_0225CCD0 *param0, NARC *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8); +static GraphicElementData *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, GraphicElementManager *param1, s16 param2, s16 param3, u16 param4, u32 param5); +static void ov114_0225CDE0(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_0225CDB4 *param1, NARC *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9); +static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_0225CDB4 *param1); +static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const UnkStruct_ov84_0223BA5C *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 param4); +static void ov114_0225CF84(UnkStruct_ov114_0225CEF0 *param0); +static void ov114_0225CFC0(UnkStruct_ov114_0225CEF0 *param0); +static void ov114_0225CFCC(UnkStruct_ov114_0225CFCC *param0, u32 param1, u32 param2, u32 param3, u32 param4); +static void ov114_0225D058(UnkStruct_ov114_0225CFCC *param0); +static void ov114_0225D070(UnkStruct_ov114_0225CFCC *param0); +static void ov114_0225D07C(UnkStruct_ov114_0225CFCC *param0); +static void ov114_0225D084(UnkStruct_ov114_0225D084 *param0, u32 param1); +static void ov114_0225D0D8(UnkStruct_ov114_0225D084 *param0); +static void ov114_0225D0F8(UnkStruct_ov114_0225D084 *param0); +static void ov114_0225D104(UnkStruct_ov114_0225D084 *param0, const TrainerInfo *param1); +static void ov114_0225D114(UnkStruct_ov114_0225D084 *param0, u32 param1); +static void ov114_0225D124(UnkStruct_ov114_0225D084 *param0, u32 param1, u32 param2); +static void ov114_0225D138(UnkStruct_ov114_0225D084 *param0, u32 param1, u32 param2); +static void ov114_0225D154(UnkStruct_ov114_0225D084 *param0, u32 param1); +static void ov114_0225D170(UnkStruct_ov114_0225D084 *param0, u32 param1); +static void ov114_0225D180(UnkStruct_ov114_0225D084 *param0, u32 param1); +static void ov114_0225D190(UnkStruct_ov114_0225D084 *param0, Strbuf *param1, u32 param2); +static void ov114_0225D1AC(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, u8 param3, u8 param4); +static void ov114_0225D1C8(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, u8 param3, u8 param4); +static u32 ov114_0225D218(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, Strbuf *param3, u32 param4); +static void ov114_0225D254(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, u8 param3, u8 param4, u32 param5); +static void ov114_0225D290(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225CEF0 *param1, SaveData *param2, BOOL param3, u32 param4); +static void ov114_0225D338(UnkStruct_ov114_0225D338 *param0); +static void ov114_0225D368(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225D084 *param1, u32 param2, u32 param3); +static void ov114_0225D400(UnkStruct_ov114_0225D338 *param0, u32 param1); +static BOOL ov114_0225D43C(const UnkStruct_ov114_0225D338 *param0, u32 param1); +static void ov114_0225D458(UnkStruct_ov114_0225D338 *param0, u32 param1); +static void ov114_0225D474(UnkStruct_ov114_0225D338 *param0, u32 param1); +static void ov114_0225DAC0(UnkStruct_ov114_0225DAC0 *param0, u32 param1, u32 param2, NNSG2dScreenData *param3, UnkStruct_ov114_0225CEF0 *param4, u32 param5, u32 param6, UnkStruct_ov114_0225CFCC *param7, UnkStruct_ov114_0225CDB4 *param8, u32 param9); +static void ov114_0225DC44(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_0225D084 *param1, const TrainerInfo *param2, s16 param3, s16 param4, u32 param5); +static void ov114_0225DCA0(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_0225D084 *param1, BOOL param2, u32 param3, u32 param4, s16 param5); +static void ov114_0225DD0C(UnkStruct_ov114_0225DAC0 *param0, u32 param1); +static void ov114_0225DD2C(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_0225D084 *param1, u32 param2, s16 param3, s16 param4, u32 param5); +static void ov114_0225DD80(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_0225CEF0 *param1); +static void ov114_0225DD94(UnkStruct_ov114_0225DAC0 *param0); +static void ov114_0225DDA0(UnkStruct_ov114_0225DAC0 *param0); +static void ov114_0225DDD4(UnkStruct_ov114_0225DAC0 *param0, s16 param1, s16 param2); +static void ov114_0225DE38(UnkStruct_ov114_0225DAC0 *param0, s16 param1); +static BOOL ov114_0225DE70(UnkStruct_ov114_0225DAC0 *param0); +static void ov114_0225DEBC(UnkStruct_ov114_0225DAC0 *param0, s32 param1); static u32 ov114_0225DF44(u32 param0, u32 param1, u32 param2); -static void ov114_0225DF7C(UnkStruct_ov114_0225DFFC * param0, UnkStruct_ov114_0225CEF0 * param1, u32 param2); -static void ov114_0225DFFC(UnkStruct_ov114_0225DFFC * param0); -static void ov114_0225E028(UnkStruct_ov114_0225DFFC * param0, const UnkStruct_ov114_0225DAC0 * param1); -static void ov114_0225E08C(UnkStruct_ov114_0225DFFC * param0); -static void ov114_0225E0AC(void * param0); -static void ov114_0225E0F8(UnkStruct_ov114_0225E0F8 * param0, const UnkStruct_ov114_0225C76C * param1); -static BOOL ov114_0225E14C(const UnkStruct_ov114_0225C76C * param0, const UnkStruct_ov114_0225E0F8 * param1); +static void ov114_0225DF7C(UnkStruct_ov114_0225DFFC *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2); +static void ov114_0225DFFC(UnkStruct_ov114_0225DFFC *param0); +static void ov114_0225E028(UnkStruct_ov114_0225DFFC *param0, const UnkStruct_ov114_0225DAC0 *param1); +static void ov114_0225E08C(UnkStruct_ov114_0225DFFC *param0); +static void ov114_0225E0AC(void *param0); +static void ov114_0225E0F8(UnkStruct_ov114_0225E0F8 *param0, const UnkStruct_ov114_0225C76C *param1); +static BOOL ov114_0225E14C(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225E0F8 *param1); u32 ov114_0225E180(u32 param0); -static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1, UnkStruct_ov114_0225D084 * param2, u32 param3, NARC * param4, u32 param5); -static void ov114_0225E234(UnkStruct_ov114_0225E1A4 * param0); -static void ov114_0225E244(UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1, u32 param2); -static void ov114_0225E2D4(UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1); -static BOOL ov114_0225E31C(UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1); -static BOOL ov114_0225E438(UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1); -static void ov114_0225E4B0(UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1, s32 param2); -static void ov114_0225E500(UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1, s32 param2); -static void ov114_0225E550(NARC * param0, u32 param1, u32 param2); -static UnkStruct_ov114_0225D678 * ov114_0225D48C(const UnkStruct_ov114_0225C76C * param0, u32 param1, u32 param2); -static void ov114_0225D5BC(UnkStruct_ov114_0225D678 * param0, u32 param1); -static void ov114_0225D678(UnkStruct_ov114_0225D678 * param0); -static void ov114_0225D688(SysTask * param0, void * param1); -static void ov114_0225DA0C(SysTask * param0, void * param1); -static int ov114_0225DA2C(const u8 * param0, u32 param1); -static BOOL ov114_0225DA5C(UnkStruct_ov114_0225D678 * param0); -static UnkStruct_ov114_0225E854 * ov114_0225E5A8(const UnkStruct_ov114_0225C76C * param0, const UnkStruct_ov114_0225C9A8 * param1, u32 param2, u32 param3); -static void ov114_0225E744(UnkStruct_ov114_0225E854 * param0, u32 param1); -static void ov114_0225E854(UnkStruct_ov114_0225E854 * param0); -static void ov114_0225E874(SysTask * param0, void * param1); -static void ov114_0225ED40(SysTask * param0, void * param1); -static void ov114_0225F124(SysTask * param0, void * param1); -static void ov114_0225F148(UnkStruct_ov114_0225E854 * param0, NARC * param1, u32 param2); -static void ov114_0225F168(UnkStruct_ov114_0225E854 * param0); -static void ov114_0225F19C(UnkStruct_ov114_0225E854 * param0); -static void ov114_0225F224(UnkStruct_ov114_0225E854 * param0); -static void ov114_0225F234(UnkStruct_ov114_0225F270 * param0, UnkStruct_ov114_0225CEF0 * param1, u32 param2, u32 param3); -static void ov114_0225F270(UnkStruct_ov114_0225F270 * param0); -static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 * param0, UnkStruct_ov114_0225D338 * param1, UnkStruct_ov114_0225D084 * param2, u32 param3, u32 param4); -static BOOL ov114_0225F420(const UnkStruct_ov114_0225F270 * param0); -static void ov114_0225F424(UnkStruct_ov114_0225F270 * param0, u32 param1, BOOL param2, u32 param3); -static void ov114_0225F47C(UnkStruct_ov114_0225F270 * param0, BOOL param1); -static void ov114_0225F484(UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0225CEF0 * param1, UnkStruct_ov114_0225CFCC * param2, UnkStruct_ov114_0225CCD0 * param3, NARC * param4, u32 param5); -static void ov114_0225F578(UnkStruct_ov114_0225F578 * param0); -static void ov114_0225F598(UnkStruct_ov114_0225F578 * param0, u32 param1); -static BOOL ov114_0225F5AC(UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0225CEF0 * param1); -static void ov114_0225F6E4(UnkStruct_ov114_0225E854 * param0, u32 param1, u32 param2); -static u32 ov114_0225F8FC(const UnkStruct_ov114_0225E854 * param0); -static void ov114_0225F920(UnkStruct_ov114_0225E854 * param0); -static void ov114_0225F988(UnkStruct_ov114_0225E854 * param0); -static BOOL ov114_0225F7D8(UnkStruct_ov114_0225E854 * param0); -static void ov114_0225F83C(UnkStruct_ov114_0225E854 * param0); -static BOOL ov114_0225F860(UnkStruct_ov114_0225E854 * param0); -static void ov114_0225F890(UnkStruct_ov114_0225E854 * param0); -static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0225CDB4 * param1, GraphicElementManager * param2, u32 param3); -static BOOL ov114_0225FAB8(UnkStruct_ov114_0225FAB8 * param0); -static BOOL ov114_0225FAD8(UnkStruct_ov114_0225FAB8 * param0); -static void ov114_0225FB10(UnkStruct_ov114_0225FAB8 * param0, s32 param1); -static void ov114_0225FBF0(UnkStruct_ov114_0225FAB8 * param0); -static void ov114_0225FC6C(UnkStruct_ov114_0225FAB8 * param0); -static void ov114_0225FCCC(SysTask * param0, void * param1); -static void ov114_0225FCF0(void * param0); -static void ov114_0225FDC8(SysTask * param0, void * param1); -static void ov114_0225FF54(SysTask * param0, void * param1); +static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, NARC *param4, u32 param5); +static void ov114_0225E234(UnkStruct_ov114_0225E1A4 *param0); +static void ov114_0225E244(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2); +static void ov114_0225E2D4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1); +static BOOL ov114_0225E31C(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1); +static BOOL ov114_0225E438(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1); +static void ov114_0225E4B0(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, s32 param2); +static void ov114_0225E500(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, s32 param2); +static void ov114_0225E550(NARC *param0, u32 param1, u32 param2); +static UnkStruct_ov114_0225D678 *ov114_0225D48C(const UnkStruct_ov114_0225C76C *param0, u32 param1, u32 param2); +static void ov114_0225D5BC(UnkStruct_ov114_0225D678 *param0, u32 param1); +static void ov114_0225D678(UnkStruct_ov114_0225D678 *param0); +static void ov114_0225D688(SysTask *param0, void *param1); +static void ov114_0225DA0C(SysTask *param0, void *param1); +static int ov114_0225DA2C(const u8 *param0, u32 param1); +static BOOL ov114_0225DA5C(UnkStruct_ov114_0225D678 *param0); +static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 param3); +static void ov114_0225E744(UnkStruct_ov114_0225E854 *param0, u32 param1); +static void ov114_0225E854(UnkStruct_ov114_0225E854 *param0); +static void ov114_0225E874(SysTask *param0, void *param1); +static void ov114_0225ED40(SysTask *param0, void *param1); +static void ov114_0225F124(SysTask *param0, void *param1); +static void ov114_0225F148(UnkStruct_ov114_0225E854 *param0, NARC *param1, u32 param2); +static void ov114_0225F168(UnkStruct_ov114_0225E854 *param0); +static void ov114_0225F19C(UnkStruct_ov114_0225E854 *param0); +static void ov114_0225F224(UnkStruct_ov114_0225E854 *param0); +static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2, u32 param3); +static void ov114_0225F270(UnkStruct_ov114_0225F270 *param0); +static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225D338 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, u32 param4); +static BOOL ov114_0225F420(const UnkStruct_ov114_0225F270 *param0); +static void ov114_0225F424(UnkStruct_ov114_0225F270 *param0, u32 param1, BOOL param2, u32 param3); +static void ov114_0225F47C(UnkStruct_ov114_0225F270 *param0, BOOL param1); +static void ov114_0225F484(UnkStruct_ov114_0225F578 *param0, UnkStruct_ov114_0225CEF0 *param1, UnkStruct_ov114_0225CFCC *param2, UnkStruct_ov114_0225CCD0 *param3, NARC *param4, u32 param5); +static void ov114_0225F578(UnkStruct_ov114_0225F578 *param0); +static void ov114_0225F598(UnkStruct_ov114_0225F578 *param0, u32 param1); +static BOOL ov114_0225F5AC(UnkStruct_ov114_0225F578 *param0, UnkStruct_ov114_0225CEF0 *param1); +static void ov114_0225F6E4(UnkStruct_ov114_0225E854 *param0, u32 param1, u32 param2); +static u32 ov114_0225F8FC(const UnkStruct_ov114_0225E854 *param0); +static void ov114_0225F920(UnkStruct_ov114_0225E854 *param0); +static void ov114_0225F988(UnkStruct_ov114_0225E854 *param0); +static BOOL ov114_0225F7D8(UnkStruct_ov114_0225E854 *param0); +static void ov114_0225F83C(UnkStruct_ov114_0225E854 *param0); +static BOOL ov114_0225F860(UnkStruct_ov114_0225E854 *param0); +static void ov114_0225F890(UnkStruct_ov114_0225E854 *param0); +static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 *param0, UnkStruct_ov114_0225CDB4 *param1, GraphicElementManager *param2, u32 param3); +static BOOL ov114_0225FAB8(UnkStruct_ov114_0225FAB8 *param0); +static BOOL ov114_0225FAD8(UnkStruct_ov114_0225FAB8 *param0); +static void ov114_0225FB10(UnkStruct_ov114_0225FAB8 *param0, s32 param1); +static void ov114_0225FBF0(UnkStruct_ov114_0225FAB8 *param0); +static void ov114_0225FC6C(UnkStruct_ov114_0225FAB8 *param0); +static void ov114_0225FCCC(SysTask *param0, void *param1); +static void ov114_0225FCF0(void *param0); +static void ov114_0225FDC8(SysTask *param0, void *param1); +static void ov114_0225FF54(SysTask *param0, void *param1); static const s16 Unk_ov114_0226015C[4][2] = { - {0x80, 0x2C}, - {0xEC, 0x18}, - {0x4, 0x18}, - {0x80, 0x4} + { 0x80, 0x2C }, + { 0xEC, 0x18 }, + { 0x4, 0x18 }, + { 0x80, 0x4 } }; static const u8 Unk_ov114_022600D4[4] = { @@ -414,8 +411,8 @@ static const s16 Unk_ov114_022600D8[4] = { }; static const VecFx32 Unk_ov114_0226019C[2] = { - {FX32_CONST(128), FX32_CONST(96), 0x0}, - {FX32_CONST(128), FX32_CONST(96 + 2), 0x0} + { FX32_CONST(128), FX32_CONST(96), 0x0 }, + { FX32_CONST(128), FX32_CONST(96 + 2), 0x0 } }; static const u32 Unk_ov114_022600F8[UnkEnum_ov66_022324D0_12] = { @@ -530,8 +527,8 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260284[5] = { 0x3, 0x0, 0x0, - 0x0 - } + 0x0, + }, }, { 0x1, @@ -548,8 +545,8 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260284[5] = { 0x1, 0x0, 0x0, - 0x0 - } + 0x0, + }, }, { 0x2, @@ -566,8 +563,8 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260284[5] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0, + }, }, { 0x0, @@ -584,8 +581,8 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260284[5] = { 0x2, 0x0, 0x0, - 0x0 - } + 0x0, + }, }, { 0x4, @@ -602,39 +599,39 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260284[5] = { 0x0, 0x0, 0x0, - 0x0 - } - } + 0x0, + }, + }, }; static const UnkStruct_ov114_02260204 Unk_ov114_02260204[4] = { { - {0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0} + { 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0 }, }, { - {0xE, 0x4, 0x0, 0x0}, - {0x12, 0x0, 0x0, 0x0}, - {0x0, 0x3, 0x0, 0x0} + { 0xE, 0x4, 0x0, 0x0 }, + { 0x12, 0x0, 0x0, 0x0 }, + { 0x0, 0x3, 0x0, 0x0 }, }, { - {0xE, 0x8, 0x2, 0x0}, - {0x12, 0x0, 0x6, 0x0}, - {0x0, 0x2, 0x1, 0x0} + { 0xE, 0x8, 0x2, 0x0 }, + { 0x12, 0x0, 0x6, 0x0 }, + { 0x0, 0x2, 0x1, 0x0 }, }, { - {0x12, 0xC, 0x0, 0x6}, - {0x12, 0x0, 0x6, 0xC}, - {0x0, 0x2, 0x3, 0x1} - } + { 0x12, 0xC, 0x0, 0x6 }, + { 0x12, 0x0, 0x6, 0xC }, + { 0x0, 0x2, 0x3, 0x1 }, + }, }; static const u8 Unk_ov114_0226016C[4][4] = { - {0x0, 0x0, 0x0, 0x0}, - {0x0, 0x1, 0x0, 0x0}, - {0x0, 0x2, 0x1, 0x0}, - {0x0, 0x3, 0x1, 0x2} + { 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x1, 0x0, 0x0 }, + { 0x0, 0x2, 0x1, 0x0 }, + { 0x0, 0x3, 0x1, 0x2 }, }; static const UnkStruct_02099F80 Unk_ov114_022601DC = { @@ -673,8 +670,8 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260324[6] = { 0x3, 0x0, 0x0, - 0x0 - } + 0x0, + }, }, { 0x1, @@ -691,8 +688,8 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260324[6] = { 0x2, 0x0, 0x0, - 0x0 - } + 0x0, + }, }, { 0x2, @@ -709,8 +706,8 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260324[6] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0, + }, }, { 0x0, @@ -727,8 +724,8 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260324[6] = { 0x1, 0x0, 0x0, - 0x0 - } + 0x0, + }, }, { 0x4, @@ -745,8 +742,8 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260324[6] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0, + }, }, { 0x5, @@ -763,40 +760,40 @@ static const UnkStruct_ov114_02260284 Unk_ov114_02260324[6] = { 0x0, 0x0, 0x0, - 0x0 - } - } + 0x0, + }, + }, }; static const UnkStruct_ov114_02260234 Unk_ov114_02260234[] = { - {0x0, 0x0}, - {0x1, 0x1}, - {0x2, 0x14}, - {0x3, 0x3}, - {0x4, 0x4}, - {0x5, 0x5}, - {0x6, 0x6}, - {0x7, 0x7}, - {0x8, 0x8}, - {0x9, 0x9}, - {0xA, 0x15}, - {0xB, 0xB}, - {0xC, 0xC}, - {0xD, 0xD}, - {0xE, 0xE}, - {0xF, 0xF}, - {0x10, 0x10}, - {0x11, 0x16}, - {0x12, 0x17}, - {0x13, 0x13} + { 0x0, 0x0 }, + { 0x1, 0x1 }, + { 0x2, 0x14 }, + { 0x3, 0x3 }, + { 0x4, 0x4 }, + { 0x5, 0x5 }, + { 0x6, 0x6 }, + { 0x7, 0x7 }, + { 0x8, 0x8 }, + { 0x9, 0x9 }, + { 0xA, 0x15 }, + { 0xB, 0xB }, + { 0xC, 0xC }, + { 0xD, 0xD }, + { 0xE, 0xE }, + { 0xF, 0xF }, + { 0x10, 0x10 }, + { 0x11, 0x16 }, + { 0x12, 0x17 }, + { 0x13, 0x13 }, }; -void ov114_0225C700 (UnkStruct_ov114_0225C76C * param0, BOOL param1, SaveData * param2, BOOL param3, UnkStruct_ov66_02230DBC * param4) +void ov114_0225C700(UnkStruct_ov114_0225C76C *param0, BOOL param1, SaveData *param2, BOOL param3, UnkStruct_ov66_02230DBC *param4) { int v0; int v1; u32 v2; - TrainerInfo * v3; + TrainerInfo *v3; memset(param0, 0, sizeof(UnkStruct_ov114_0225C76C)); @@ -828,7 +825,7 @@ void ov114_0225C700 (UnkStruct_ov114_0225C76C * param0, BOOL param1, SaveData * param0->unk_0C = param4; } -u32 ov114_0225C76C (const UnkStruct_ov114_0225C76C * param0, u32 param1) +u32 ov114_0225C76C(const UnkStruct_ov114_0225C76C *param0, u32 param1) { int v0; @@ -841,14 +838,14 @@ u32 ov114_0225C76C (const UnkStruct_ov114_0225C76C * param0, u32 param1) return 4; } -u32 ov114_0225C78C (const UnkStruct_ov114_0225C76C * param0, u32 param1) +u32 ov114_0225C78C(const UnkStruct_ov114_0225C76C *param0, u32 param1) { GF_ASSERT(param1 < param0->unk_08); return param0->unk_04[param1]; } -BOOL ov114_0225C7A4 (const UnkStruct_ov114_0225C76C * param0, u32 param1) +BOOL ov114_0225C7A4(const UnkStruct_ov114_0225C76C *param0, u32 param1) { u32 v0; BOOL v1; @@ -869,7 +866,7 @@ BOOL ov114_0225C7A4 (const UnkStruct_ov114_0225C76C * param0, u32 param1) return v1; } -TrainerInfo * ov114_0225C7CC (const UnkStruct_ov114_0225C76C * param0, u32 param1) +TrainerInfo *ov114_0225C7CC(const UnkStruct_ov114_0225C76C *param0, u32 param1) { u32 v0; @@ -892,22 +889,22 @@ TrainerInfo * ov114_0225C7CC (const UnkStruct_ov114_0225C76C * param0, u32 param return param0->unk_0C->unk_20[param1]; } -UnkStruct_ov114_0225D678 * ov114_0225C814 (const UnkStruct_ov114_0225C76C * param0, u32 param1) +UnkStruct_ov114_0225D678 *ov114_0225C814(const UnkStruct_ov114_0225C76C *param0, u32 param1) { return ov114_0225D48C(param0, UnkEnum_ov66_022324D0_00, param1); } -UnkStruct_ov114_0225D678 * ov114_0225C820 (const UnkStruct_ov114_0225C76C * param0, u32 param1) +UnkStruct_ov114_0225D678 *ov114_0225C820(const UnkStruct_ov114_0225C76C *param0, u32 param1) { return ov114_0225D48C(param0, UnkEnum_ov66_022324D0_01, param1); } -UnkStruct_ov114_0225D678 * ov114_0225C82C (const UnkStruct_ov114_0225C76C * param0, u32 param1) +UnkStruct_ov114_0225D678 *ov114_0225C82C(const UnkStruct_ov114_0225C76C *param0, u32 param1) { return ov114_0225D48C(param0, UnkEnum_ov66_022324D0_02, param1); } -void ov114_0225C838 (UnkStruct_ov114_0225D678 * param0) +void ov114_0225C838(UnkStruct_ov114_0225D678 *param0) { SysTask_Done(param0->unk_650); SysTask_Done(param0->unk_654); @@ -933,7 +930,7 @@ void ov114_0225C838 (UnkStruct_ov114_0225D678 * param0) Heap_FreeToHeap(param0); } -BOOL ov114_0225C8BC (const UnkStruct_ov114_0225D678 * param0) +BOOL ov114_0225C8BC(const UnkStruct_ov114_0225D678 *param0) { if (param0->unk_00 >= 16) { return 1; @@ -942,28 +939,28 @@ BOOL ov114_0225C8BC (const UnkStruct_ov114_0225D678 * param0) return 0; } -int ov114_0225C8CC (const UnkStruct_ov114_0225D678 * param0) +int ov114_0225C8CC(const UnkStruct_ov114_0225D678 *param0) { GF_ASSERT(param0->unk_07 == 1); return param0->unk_06; } -UnkStruct_ov114_0225E854 * ov114_0225C8E0 (const UnkStruct_ov114_0225C76C * param0, const UnkStruct_ov114_0225C9A8 * param1, u32 param2) +UnkStruct_ov114_0225E854 *ov114_0225C8E0(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2) { return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_00, param2); } -UnkStruct_ov114_0225E854 * ov114_0225C8EC (const UnkStruct_ov114_0225C76C * param0, const UnkStruct_ov114_0225C9A8 * param1, u32 param2) +UnkStruct_ov114_0225E854 *ov114_0225C8EC(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2) { return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_01, param2); } -UnkStruct_ov114_0225E854 * ov114_0225C8F8 (const UnkStruct_ov114_0225C76C * param0, const UnkStruct_ov114_0225C9A8 * param1, u32 param2) +UnkStruct_ov114_0225E854 *ov114_0225C8F8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2) { return ov114_0225E5A8(param0, param1, UnkEnum_ov66_022324D0_02, param2); } -void ov114_0225C904 (UnkStruct_ov114_0225E854 * param0) +void ov114_0225C904(UnkStruct_ov114_0225E854 *param0) { SysTask_Done(param0->unk_6A8); SysTask_Done(param0->unk_6AC); @@ -993,17 +990,17 @@ void ov114_0225C904 (UnkStruct_ov114_0225E854 * param0) Heap_FreeToHeap(param0); } -BOOL ov114_0225C9A0 (const UnkStruct_ov114_0225E854 * param0) +BOOL ov114_0225C9A0(const UnkStruct_ov114_0225E854 *param0) { return param0->unk_06; } -BOOL ov114_0225C9A4 (const UnkStruct_ov114_0225E854 * param0) +BOOL ov114_0225C9A4(const UnkStruct_ov114_0225E854 *param0) { return param0->unk_08; } -void ov114_0225C9A8 (UnkStruct_ov114_0225C9A8 * param0, u32 param1) +void ov114_0225C9A8(UnkStruct_ov114_0225C9A8 *param0, u32 param1) { u8 v0[4]; int v1, v2; @@ -1043,25 +1040,25 @@ void ov114_0225C9A8 (UnkStruct_ov114_0225C9A8 * param0, u32 param1) } } -void ov114_0225CA24 (UnkStruct_ov114_0225D678 * param0, int param1) +void ov114_0225CA24(UnkStruct_ov114_0225D678 *param0, int param1) { param0->unk_06 = param1; param0->unk_07 = 1; } -void ov114_0225CA2C (UnkStruct_ov114_0225E854 * param0, u32 param1, BOOL param2) +void ov114_0225CA2C(UnkStruct_ov114_0225E854 *param0, u32 param1, BOOL param2) { if (param0->unk_0C.unk_09 == 0) { ov114_0225F424(¶m0->unk_24C, param1, param2, param0->unk_0C.unk_08); } } -void ov114_0225CA44 (UnkStruct_ov114_0225E854 * param0, BOOL param1) +void ov114_0225CA44(UnkStruct_ov114_0225E854 *param0, BOOL param1) { ov114_0225F47C(¶m0->unk_24C, param1); } -BOOL ov114_0225CA54 (UnkStruct_ov114_0225C76C * param0) +BOOL ov114_0225CA54(UnkStruct_ov114_0225C76C *param0) { BOOL v0 = 0; @@ -1090,7 +1087,7 @@ BOOL ov114_0225CA54 (UnkStruct_ov114_0225C76C * param0) return v0; } -BOOL ov114_0225CA98 (const UnkStruct_ov114_0225C76C * param0) +BOOL ov114_0225CA98(const UnkStruct_ov114_0225C76C *param0) { GF_ASSERT(param0->unk_0C != NULL); GF_ASSERT(param0->unk_0C->unk_1C == 1); @@ -1107,9 +1104,9 @@ BOOL ov114_0225CA98 (const UnkStruct_ov114_0225C76C * param0) return 0; } -UnkStruct_ov114_0225CAD4 * ov114_0225CAD4 (GraphicElementManager * param0, u32 param1) +UnkStruct_ov114_0225CAD4 *ov114_0225CAD4(GraphicElementManager *param0, u32 param1) { - UnkStruct_ov114_0225CAD4 * v0; + UnkStruct_ov114_0225CAD4 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov114_0225CAD4)); memset(v0, 0, sizeof(UnkStruct_ov114_0225CAD4)); @@ -1124,7 +1121,7 @@ UnkStruct_ov114_0225CAD4 * ov114_0225CAD4 (GraphicElementManager * param0, u32 p return v0; } -void ov114_0225CB38 (UnkStruct_ov114_0225CAD4 * param0) +void ov114_0225CB38(UnkStruct_ov114_0225CAD4 *param0) { if (param0->unk_2C != NULL) { SysTask_Done(param0->unk_2C); @@ -1142,20 +1139,20 @@ void ov114_0225CB38 (UnkStruct_ov114_0225CAD4 * param0) Heap_FreeToHeap(param0); } -int ov114_0225CB74 (UnkStruct_ov114_0225CAD4 * param0) +int ov114_0225CB74(UnkStruct_ov114_0225CAD4 *param0) { - UnkStruct_02009DC8 * v0 = sub_02009DC8(param0->unk_10.unk_00[1], 5000); + UnkStruct_02009DC8 *v0 = sub_02009DC8(param0->unk_10.unk_00[1], 5000); return sub_0200A760(v0, NNS_G2D_VRAM_TYPE_2DMAIN); } -void ov114_0225CB8C (UnkStruct_ov114_0225CAD4 * param0) +void ov114_0225CB8C(UnkStruct_ov114_0225CAD4 *param0) { GF_ASSERT(param0->unk_2C == NULL); param0->unk_2C = SysTask_Start(ov114_0225FDC8, param0, 0); param0->unk_04 = 1; } -void ov114_0225CBB0 (UnkStruct_ov114_0225CAD4 * param0) +void ov114_0225CBB0(UnkStruct_ov114_0225CAD4 *param0) { GF_ASSERT(param0->unk_2C == NULL); param0->unk_2C = SysTask_Start(ov114_0225FF54, param0, 0); @@ -1164,7 +1161,7 @@ void ov114_0225CBB0 (UnkStruct_ov114_0225CAD4 * param0) Sound_PlayEffect(1521); } -BOOL ov114_0225CBE0 (const UnkStruct_ov114_0225CAD4 * param0) +BOOL ov114_0225CBE0(const UnkStruct_ov114_0225CAD4 *param0) { if (param0->unk_04 == 0) { return 1; @@ -1173,7 +1170,7 @@ BOOL ov114_0225CBE0 (const UnkStruct_ov114_0225CAD4 * param0) return 0; } -static void ov114_0225CBF0 (UnkStruct_ov114_0225CBF0 * param0, fx32 param1, fx32 param2, fx32 param3, int param4) +static void ov114_0225CBF0(UnkStruct_ov114_0225CBF0 *param0, fx32 param1, fx32 param2, fx32 param3, int param4) { fx32 v0; fx32 v1; @@ -1194,7 +1191,7 @@ static void ov114_0225CBF0 (UnkStruct_ov114_0225CBF0 * param0, fx32 param1, fx32 param0->unk_10 = param4; } -static BOOL ov114_0225CC4C (UnkStruct_ov114_0225CBF0 * param0, s32 param1) +static BOOL ov114_0225CC4C(UnkStruct_ov114_0225CBF0 *param0, s32 param1) { fx32 v0; fx32 v1; @@ -1220,10 +1217,10 @@ static BOOL ov114_0225CC4C (UnkStruct_ov114_0225CBF0 * param0, s32 param1) return v4; } -static void ov114_0225CCB0 (NNSG2dScreenData * param0, u32 param1) +static void ov114_0225CCB0(NNSG2dScreenData *param0, u32 param1) { int v0; - u16 * v1; + u16 *v1; int v2; v2 = param0->szByte / 2; @@ -1234,7 +1231,7 @@ static void ov114_0225CCB0 (NNSG2dScreenData * param0, u32 param1) } } -static void ov114_0225CCD0 (UnkStruct_ov114_0225CCD0 * param0, u32 param1, u32 param2) +static void ov114_0225CCD0(UnkStruct_ov114_0225CCD0 *param0, u32 param1, u32 param2) { int v0; @@ -1247,7 +1244,7 @@ static void ov114_0225CCD0 (UnkStruct_ov114_0225CCD0 * param0, u32 param1, u32 p param0->unk_14 = param1; } -static void ov114_0225CD10 (UnkStruct_ov114_0225CCD0 * param0) +static void ov114_0225CD10(UnkStruct_ov114_0225CCD0 *param0) { int v0; @@ -1264,10 +1261,10 @@ static void ov114_0225CD10 (UnkStruct_ov114_0225CCD0 * param0) Heap_FreeToHeap(param0->unk_10); } -static UnkStruct_ov114_0225CDB4 * ov114_0225CD54 (UnkStruct_ov114_0225CCD0 * param0, NARC * param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) +static UnkStruct_ov114_0225CDB4 *ov114_0225CD54(UnkStruct_ov114_0225CCD0 *param0, NARC *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8) { int v0; - UnkStruct_ov114_0225CDB4 * v1 = NULL; + UnkStruct_ov114_0225CDB4 *v1 = NULL; for (v0 = 0; v0 < param0->unk_14; v0++) { if (param0->unk_10[v0].unk_00 == 0) { @@ -1283,7 +1280,7 @@ static UnkStruct_ov114_0225CDB4 * ov114_0225CD54 (UnkStruct_ov114_0225CCD0 * par return v1; } -static GraphicElementData * ov114_0225CDB4 (UnkStruct_ov114_0225CDB4 * param0, GraphicElementManager * param1, s16 param2, s16 param3, u16 param4, u32 param5) +static GraphicElementData *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, GraphicElementManager *param1, s16 param2, s16 param3, u16 param4, u32 param5) { UnkStruct_ov83_0223D9A8 v0; @@ -1298,7 +1295,7 @@ static GraphicElementData * ov114_0225CDB4 (UnkStruct_ov114_0225CDB4 * param0, G return sub_02021B90(&v0); } -static void ov114_0225CDE0 (UnkStruct_ov114_0225CCD0 * param0, UnkStruct_ov114_0225CDB4 * param1, NARC * param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9) +static void ov114_0225CDE0(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_0225CDB4 *param1, NARC *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9) { BOOL v0; @@ -1322,7 +1319,7 @@ static void ov114_0225CDE0 (UnkStruct_ov114_0225CCD0 * param0, UnkStruct_ov114_0 sub_020093B4(¶m1->unk_14, param8, param8, param8, param8, 0xffffffff, 0xffffffff, 0, 1, param0->unk_00[0], param0->unk_00[1], param0->unk_00[2], param0->unk_00[3], NULL, NULL); } -static void ov114_0225CEB8 (UnkStruct_ov114_0225CCD0 * param0, UnkStruct_ov114_0225CDB4 * param1) +static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 *param0, UnkStruct_ov114_0225CDB4 *param1) { int v0; @@ -1338,7 +1335,7 @@ static void ov114_0225CEB8 (UnkStruct_ov114_0225CCD0 * param0, UnkStruct_ov114_0 } } -static void ov114_0225CEF0 (UnkStruct_ov114_0225CEF0 * param0, const UnkStruct_ov84_0223BA5C * param1, const UnkStruct_ov114_02260284 * param2, u32 param3, u32 param4) +static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 *param0, const UnkStruct_ov84_0223BA5C *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 param4) { sub_02018368(param1); @@ -1362,7 +1359,7 @@ static void ov114_0225CEF0 (UnkStruct_ov114_0225CEF0 * param0, const UnkStruct_o } } -static void ov114_0225CF84 (UnkStruct_ov114_0225CEF0 * param0) +static void ov114_0225CF84(UnkStruct_ov114_0225CEF0 *param0) { sub_02019184(param0->unk_00, 3, 3, 0); @@ -1377,12 +1374,12 @@ static void ov114_0225CF84 (UnkStruct_ov114_0225CEF0 * param0) Heap_FreeToHeap(param0->unk_00); } -static void ov114_0225CFC0 (UnkStruct_ov114_0225CEF0 * param0) +static void ov114_0225CFC0(UnkStruct_ov114_0225CEF0 *param0) { sub_0201C2B8(param0->unk_00); } -static void ov114_0225CFCC (UnkStruct_ov114_0225CFCC * param0, u32 param1, u32 param2, u32 param3, u32 param4) +static void ov114_0225CFCC(UnkStruct_ov114_0225CFCC *param0, u32 param1, u32 param2, u32 param3, u32 param4) { int v0; @@ -1411,7 +1408,7 @@ static void ov114_0225CFCC (UnkStruct_ov114_0225CFCC * param0, u32 param1, u32 p GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void ov114_0225D058 (UnkStruct_ov114_0225CFCC * param0) +static void ov114_0225D058(UnkStruct_ov114_0225CFCC *param0) { sub_02021964(param0->unk_00); sub_0201E958(); @@ -1419,17 +1416,17 @@ static void ov114_0225D058 (UnkStruct_ov114_0225CFCC * param0) sub_0200A878(); } -static void ov114_0225D070 (UnkStruct_ov114_0225CFCC * param0) +static void ov114_0225D070(UnkStruct_ov114_0225CFCC *param0) { sub_020219F8(param0->unk_00); } -static void ov114_0225D07C (UnkStruct_ov114_0225CFCC * param0) +static void ov114_0225D07C(UnkStruct_ov114_0225CFCC *param0) { sub_0200A858(); } -static void ov114_0225D084 (UnkStruct_ov114_0225D084 * param0, u32 param1) +static void ov114_0225D084(UnkStruct_ov114_0225D084 *param0, u32 param1) { param0->unk_00 = MessageLoader_Init(0, 26, 411, param1); param0->unk_04 = StringTemplate_New(8, 64, param1); @@ -1440,7 +1437,7 @@ static void ov114_0225D084 (UnkStruct_ov114_0225D084 * param0, u32 param1) sub_02002E98(4, 12 * 0x20, param1); } -static void ov114_0225D0D8 (UnkStruct_ov114_0225D084 * param0) +static void ov114_0225D0D8(UnkStruct_ov114_0225D084 *param0) { Strbuf_Free(param0->unk_0C); Strbuf_Free(param0->unk_08); @@ -1448,58 +1445,58 @@ static void ov114_0225D0D8 (UnkStruct_ov114_0225D084 * param0) MessageLoader_Free(param0->unk_00); } -static void ov114_0225D0F8 (UnkStruct_ov114_0225D084 * param0) +static void ov114_0225D0F8(UnkStruct_ov114_0225D084 *param0) { StringTemplate_ClearArgs(param0->unk_04); } -static void ov114_0225D104 (UnkStruct_ov114_0225D084 * param0, const TrainerInfo * param1) +static void ov114_0225D104(UnkStruct_ov114_0225D084 *param0, const TrainerInfo *param1) { StringTemplate_SetPlayerName(param0->unk_04, 0, param1); } -static void ov114_0225D114 (UnkStruct_ov114_0225D084 * param0, u32 param1) +static void ov114_0225D114(UnkStruct_ov114_0225D084 *param0, u32 param1) { StringTemplate_SetCountryName(param0->unk_04, 0, param1); } -static void ov114_0225D124 (UnkStruct_ov114_0225D084 * param0, u32 param1, u32 param2) +static void ov114_0225D124(UnkStruct_ov114_0225D084 *param0, u32 param1, u32 param2) { StringTemplate_SetCityName(param0->unk_04, 0, param1, param2); } -static void ov114_0225D138 (UnkStruct_ov114_0225D084 * param0, u32 param1, u32 param2) +static void ov114_0225D138(UnkStruct_ov114_0225D084 *param0, u32 param1, u32 param2) { StringTemplate_SetNumber(param0->unk_04, 0, param1, param2, 1, 1); } -static void ov114_0225D154 (UnkStruct_ov114_0225D084 * param0, u32 param1) +static void ov114_0225D154(UnkStruct_ov114_0225D084 *param0, u32 param1) { StringTemplate_SetNumber(param0->unk_04, 0, param1, 2, 1, 1); } -static void ov114_0225D170 (UnkStruct_ov114_0225D084 * param0, u32 param1) +static void ov114_0225D170(UnkStruct_ov114_0225D084 *param0, u32 param1) { StringTemplate_SetPlazaItemName(param0->unk_04, 1, param1); } -static void ov114_0225D180 (UnkStruct_ov114_0225D084 * param0, u32 param1) +static void ov114_0225D180(UnkStruct_ov114_0225D084 *param0, u32 param1) { StringTemplate_SetPlazaMinigameName(param0->unk_04, 0, param1); } -static void ov114_0225D190 (UnkStruct_ov114_0225D084 * param0, Strbuf *param1, u32 param2) +static void ov114_0225D190(UnkStruct_ov114_0225D084 *param0, Strbuf *param1, u32 param2) { MessageLoader_GetStrbuf(param0->unk_00, param2, param0->unk_0C); StringTemplate_Format(param0->unk_04, param1, param0->unk_0C); } -static void ov114_0225D1AC (UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, u8 param3, u8 param4) +static void ov114_0225D1AC(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, u8 param3, u8 param4) { ov114_0225D254(param0, param1, param2, param3, param4, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0)))); } -static void ov114_0225D1C8 (UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, u8 param3, u8 param4) +static void ov114_0225D1C8(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, u8 param3, u8 param4) { u32 v0; s32 v1; @@ -1517,7 +1514,7 @@ static void ov114_0225D1C8 (UnkStruct_ov114_0225D084 * param0, u32 param1, Windo sub_0201D78C(param2, 0, param0->unk_08, v1, param4, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } -static u32 ov114_0225D218 (UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, Strbuf *param3, u32 param4) +static u32 ov114_0225D218(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, Strbuf *param3, u32 param4) { MessageLoader_GetStrbuf(param0->unk_00, param1, param0->unk_0C); StringTemplate_Format(param0->unk_04, param3, param0->unk_0C); @@ -1525,14 +1522,14 @@ static u32 ov114_0225D218 (UnkStruct_ov114_0225D084 * param0, u32 param1, Window return sub_0201D78C(param2, 1, param3, 0, 0, param4, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); } -static void ov114_0225D254 (UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, u8 param3, u8 param4, u32 param5) +static void ov114_0225D254(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, u8 param3, u8 param4, u32 param5) { MessageLoader_GetStrbuf(param0->unk_00, param1, param0->unk_0C); StringTemplate_Format(param0->unk_04, param0->unk_08, param0->unk_0C); sub_0201D78C(param2, 0, param0->unk_08, param3, param4, 0xff, param5, NULL); } -static void ov114_0225D290 (UnkStruct_ov114_0225D338 * param0, UnkStruct_ov114_0225CEF0 * param1, SaveData * param2, BOOL param3, u32 param4) +static void ov114_0225D290(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225CEF0 *param1, SaveData *param2, BOOL param3, u32 param4) { u32 v0 = Options_Frame(SaveData_Options(param2)); u32 v1; @@ -1552,7 +1549,7 @@ static void ov114_0225D290 (UnkStruct_ov114_0225D338 * param0, UnkStruct_ov114_0 v3 = 1; } - BGL_AddWindow(param1->unk_00, ¶m0->unk_00[v2], v1, 2, v3, 27, 4, 12, ((1 + (18 + 12)))); + BGL_AddWindow(param1->unk_00, ¶m0->unk_00[v2], v1, 2, v3, 27, 4, 12, (1 + (18 + 12))); BGL_FillWindow(¶m0->unk_00[v2], 0); param0->unk_24[v2] = Strbuf_Init(128, param4); @@ -1561,7 +1558,7 @@ static void ov114_0225D290 (UnkStruct_ov114_0225D338 * param0, UnkStruct_ov114_0 param0->unk_34 = param3; } -static void ov114_0225D338 (UnkStruct_ov114_0225D338 * param0) +static void ov114_0225D338(UnkStruct_ov114_0225D338 *param0) { int v0; @@ -1574,7 +1571,7 @@ static void ov114_0225D338 (UnkStruct_ov114_0225D338 * param0) sub_02095A24(); } -static void ov114_0225D368 (UnkStruct_ov114_0225D338 * param0, UnkStruct_ov114_0225D084 * param1, u32 param2, u32 param3) +static void ov114_0225D368(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225D084 *param1, u32 param2, u32 param3) { int v0; @@ -1597,7 +1594,7 @@ static void ov114_0225D368 (UnkStruct_ov114_0225D338 * param0, UnkStruct_ov114_0 sub_0201A9A4(¶m0->unk_00[param3]); } -static void ov114_0225D400 (UnkStruct_ov114_0225D338 * param0, u32 param1) +static void ov114_0225D400(UnkStruct_ov114_0225D338 *param0, u32 param1) { ov114_0225D474(param0, param1); @@ -1609,7 +1606,7 @@ static void ov114_0225D400 (UnkStruct_ov114_0225D338 * param0, u32 param1) sub_0201AD10(¶m0->unk_00[param1]); } -static BOOL ov114_0225D43C (const UnkStruct_ov114_0225D338 * param0, u32 param1) +static BOOL ov114_0225D43C(const UnkStruct_ov114_0225D338 *param0, u32 param1) { u32 v0; @@ -1622,14 +1619,14 @@ static BOOL ov114_0225D43C (const UnkStruct_ov114_0225D338 * param0, u32 param1) return 0; } -static void ov114_0225D458 (UnkStruct_ov114_0225D338 * param0, u32 param1) +static void ov114_0225D458(UnkStruct_ov114_0225D338 *param0, u32 param1) { if (param0->unk_2C[param1] == NULL) { param0->unk_2C[param1] = sub_0200E7FC(¶m0->unk_00[param1], 1); } } -static void ov114_0225D474 (UnkStruct_ov114_0225D338 * param0, u32 param1) +static void ov114_0225D474(UnkStruct_ov114_0225D338 *param0, u32 param1) { if (param0->unk_2C[param1]) { sub_0200EBC8(param0->unk_2C[param1]); @@ -1637,9 +1634,9 @@ static void ov114_0225D474 (UnkStruct_ov114_0225D338 * param0, u32 param1) } } -static UnkStruct_ov114_0225D678 * ov114_0225D48C (const UnkStruct_ov114_0225C76C * param0, u32 param1, u32 param2) +static UnkStruct_ov114_0225D678 *ov114_0225D48C(const UnkStruct_ov114_0225C76C *param0, u32 param1, u32 param2) { - UnkStruct_ov114_0225D678 * v0; + UnkStruct_ov114_0225D678 *v0; int v1; sub_02004550(19, 1211, 0); @@ -1687,9 +1684,9 @@ static UnkStruct_ov114_0225D678 * ov114_0225D48C (const UnkStruct_ov114_0225C76C return v0; } -static void ov114_0225D5BC (UnkStruct_ov114_0225D678 * param0, u32 param1) +static void ov114_0225D5BC(UnkStruct_ov114_0225D678 *param0, u32 param1) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL, param1); @@ -1707,14 +1704,14 @@ static void ov114_0225D5BC (UnkStruct_ov114_0225D678 * param0, u32 param1) NARC_dtor(v0); } -static void ov114_0225D678 (UnkStruct_ov114_0225D678 * param0) +static void ov114_0225D678(UnkStruct_ov114_0225D678 *param0) { Heap_FreeToHeap(param0->unk_260); } -static void ov114_0225D688 (SysTask * param0, void * param1) +static void ov114_0225D688(SysTask *param0, void *param1) { - UnkStruct_ov114_0225D678 * v0 = param1; + UnkStruct_ov114_0225D678 *v0 = param1; BOOL v1; switch (v0->unk_00) { @@ -1768,8 +1765,7 @@ static void ov114_0225D688 (SysTask * param0, void * param1) v0->unk_00++; } break; - case 7: - { + case 7: { int v2; BOOL v3; BOOL v4; @@ -1825,8 +1821,7 @@ static void ov114_0225D688 (SysTask * param0, void * param1) v0->unk_00++; } break; - case 11: - { + case 11: { int v7; for (v7 = 0; v7 < v0->unk_08.unk_08; v7++) { @@ -1835,8 +1830,7 @@ static void ov114_0225D688 (SysTask * param0, void * param1) v0->unk_00++; v0->unk_01 = 8; - } - break; + } break; case 12: v0->unk_01--; ov114_0225DA5C(v0); @@ -1893,16 +1887,16 @@ static void ov114_0225D688 (SysTask * param0, void * param1) sub_0201C63C(v0->unk_30.unk_00, 5, 4, 2); } -static void ov114_0225DA0C (SysTask * param0, void * param1) +static void ov114_0225DA0C(SysTask *param0, void *param1) { - UnkStruct_ov114_0225D678 * v0 = param1; + UnkStruct_ov114_0225D678 *v0 = param1; ov114_0225CFC0(&v0->unk_30); ov114_0225D07C(&v0->unk_84); ov114_0225E08C(&v0->unk_348); } -static int ov114_0225DA2C (const u8 * param0, u32 param1) +static int ov114_0225DA2C(const u8 *param0, u32 param1) { u32 v0; u32 v1; @@ -1923,7 +1917,7 @@ static int ov114_0225DA2C (const u8 * param0, u32 param1) return param1 - 1; } -static BOOL ov114_0225DA5C (UnkStruct_ov114_0225D678 * param0) +static BOOL ov114_0225DA5C(UnkStruct_ov114_0225D678 *param0) { int v0; BOOL v1; @@ -1945,7 +1939,7 @@ static BOOL ov114_0225DA5C (UnkStruct_ov114_0225D678 * param0) return v2; } -static void ov114_0225DAC0 (UnkStruct_ov114_0225DAC0 * param0, u32 param1, u32 param2, NNSG2dScreenData * param3, UnkStruct_ov114_0225CEF0 * param4, u32 param5, u32 param6, UnkStruct_ov114_0225CFCC * param7, UnkStruct_ov114_0225CDB4 * param8, u32 param9) +static void ov114_0225DAC0(UnkStruct_ov114_0225DAC0 *param0, u32 param1, u32 param2, NNSG2dScreenData *param3, UnkStruct_ov114_0225CEF0 *param4, u32 param5, u32 param6, UnkStruct_ov114_0225CFCC *param7, UnkStruct_ov114_0225CDB4 *param8, u32 param9) { s32 v0; @@ -2007,7 +2001,7 @@ static void ov114_0225DAC0 (UnkStruct_ov114_0225DAC0 * param0, u32 param1, u32 p param0->unk_18 = param1; } -static void ov114_0225DC44 (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0225D084 * param1, const TrainerInfo * param2, s16 param3, s16 param4, u32 param5) +static void ov114_0225DC44(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_0225D084 *param1, const TrainerInfo *param2, s16 param3, s16 param4, u32 param5) { ov114_0225D104(param1, param2); @@ -2018,7 +2012,7 @@ static void ov114_0225DC44 (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0 } } -static void ov114_0225DCA0 (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0225D084 * param1, BOOL param2, u32 param3, u32 param4, s16 param5) +static void ov114_0225DCA0(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_0225D084 *param1, BOOL param2, u32 param3, u32 param4, s16 param5) { if (param2) { if (param3 != 0) { @@ -2035,14 +2029,14 @@ static void ov114_0225DCA0 (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0 } } -static void ov114_0225DD0C (UnkStruct_ov114_0225DAC0 * param0, u32 param1) +static void ov114_0225DD0C(UnkStruct_ov114_0225DAC0 *param0, u32 param1) { sub_02021CAC(param0->unk_14, 1); SpriteActor_SetSpriteAnimActive(param0->unk_14, 4 + param1); sub_02021CC8(param0->unk_14, 1); } -static void ov114_0225DD2C (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0225D084 * param1, u32 param2, s16 param3, s16 param4, u32 param5) +static void ov114_0225DD2C(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_0225D084 *param1, u32 param2, s16 param3, s16 param4, u32 param5) { ov114_0225D138(param1, param2, param5); @@ -2053,18 +2047,18 @@ static void ov114_0225DD2C (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0 } } -static void ov114_0225DD80 (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0225CEF0 * param1) +static void ov114_0225DD80(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_0225CEF0 *param1) { sub_0201A9A4(¶m0->unk_00); sub_0201C3C0(param1->unk_00, 1); } -static void ov114_0225DD94 (UnkStruct_ov114_0225DAC0 * param0) +static void ov114_0225DD94(UnkStruct_ov114_0225DAC0 *param0) { sub_02021CAC(param0->unk_10, 1); } -static void ov114_0225DDA0 (UnkStruct_ov114_0225DAC0 * param0) +static void ov114_0225DDA0(UnkStruct_ov114_0225DAC0 *param0) { if (param0->unk_10) { sub_02021BD4(param0->unk_10); @@ -2081,7 +2075,7 @@ static void ov114_0225DDA0 (UnkStruct_ov114_0225DAC0 * param0) } } -static void ov114_0225DDD4 (UnkStruct_ov114_0225DAC0 * param0, s16 param1, s16 param2) +static void ov114_0225DDD4(UnkStruct_ov114_0225DAC0 *param0, s16 param1, s16 param2) { ov114_0225CBF0(¶m0->unk_1C, FX32_CONST(-255), FX32_CONST(param1), FX32_CONST(28), 8); @@ -2092,7 +2086,7 @@ static void ov114_0225DDD4 (UnkStruct_ov114_0225DAC0 * param0, s16 param1, s16 p ov114_0225DEBC(param0, -(param0->unk_1C.unk_00 >> FX32_SHIFT)); } -static void ov114_0225DE38 (UnkStruct_ov114_0225DAC0 * param0, s16 param1) +static void ov114_0225DE38(UnkStruct_ov114_0225DAC0 *param0, s16 param1) { ov114_0225CBF0(¶m0->unk_1C, param0->unk_1C.unk_00, FX32_CONST(-255), 0, 8); @@ -2103,7 +2097,7 @@ static void ov114_0225DE38 (UnkStruct_ov114_0225DAC0 * param0, s16 param1) ov114_0225DEBC(param0, -(param0->unk_1C.unk_00 >> FX32_SHIFT)); } -static BOOL ov114_0225DE70 (UnkStruct_ov114_0225DAC0 * param0) +static BOOL ov114_0225DE70(UnkStruct_ov114_0225DAC0 *param0) { BOOL v0; u8 v1, v2; @@ -2124,7 +2118,7 @@ static BOOL ov114_0225DE70 (UnkStruct_ov114_0225DAC0 * param0) return 0; } -static void ov114_0225DEBC (UnkStruct_ov114_0225DAC0 * param0, s32 param1) +static void ov114_0225DEBC(UnkStruct_ov114_0225DAC0 *param0, s32 param1) { u8 v0; u8 v1, v2; @@ -2148,7 +2142,7 @@ static void ov114_0225DEBC (UnkStruct_ov114_0225DAC0 * param0, s32 param1) sub_02021C50(param0->unk_14, &v3); } -static u32 ov114_0225DF44 (u32 param0, u32 param1, u32 param2) +static u32 ov114_0225DF44(u32 param0, u32 param1, u32 param2) { s32 v0, v1, v2; int v3; @@ -2172,7 +2166,7 @@ static u32 ov114_0225DF44 (u32 param0, u32 param1, u32 param2) return v2; } -static void ov114_0225DF7C (UnkStruct_ov114_0225DFFC * param0, UnkStruct_ov114_0225CEF0 * param1, u32 param2) +static void ov114_0225DF7C(UnkStruct_ov114_0225DFFC *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2) { int v0, v1; @@ -2193,7 +2187,7 @@ static void ov114_0225DF7C (UnkStruct_ov114_0225DFFC * param0, UnkStruct_ov114_0 SetHBlankCallback(ov114_0225E0AC, param0); } -static void ov114_0225DFFC (UnkStruct_ov114_0225DFFC * param0) +static void ov114_0225DFFC(UnkStruct_ov114_0225DFFC *param0) { if (param0->bufferManager != NULL) { SetHBlankCallback(NULL, NULL); @@ -2202,9 +2196,9 @@ static void ov114_0225DFFC (UnkStruct_ov114_0225DFFC * param0) } } -static void ov114_0225E028 (UnkStruct_ov114_0225DFFC * param0, const UnkStruct_ov114_0225DAC0 * param1) +static void ov114_0225E028(UnkStruct_ov114_0225DFFC *param0, const UnkStruct_ov114_0225DAC0 *param1) { - s16 * v0; + s16 *v0; int v1; int v2; @@ -2226,7 +2220,7 @@ static void ov114_0225E028 (UnkStruct_ov114_0225DFFC * param0, const UnkStruct_o BufferManager_SetMode(param0->bufferManager, 1); } -static void ov114_0225E08C (UnkStruct_ov114_0225DFFC * param0) +static void ov114_0225E08C(UnkStruct_ov114_0225DFFC *param0) { if (param0->bufferManager == NULL) { return; @@ -2236,11 +2230,11 @@ static void ov114_0225E08C (UnkStruct_ov114_0225DFFC * param0) BufferManager_SetMode(param0->bufferManager, 0); } -static void ov114_0225E0AC (void * param0) +static void ov114_0225E0AC(void *param0) { - UnkStruct_ov114_0225DFFC * v0 = param0; + UnkStruct_ov114_0225DFFC *v0 = param0; int v1; - const s16 * v2; + const s16 *v2; v1 = GX_GetVCount(); @@ -2256,7 +2250,7 @@ static void ov114_0225E0AC (void * param0) } } -static void ov114_0225E0F8 (UnkStruct_ov114_0225E0F8 * param0, const UnkStruct_ov114_0225C76C * param1) +static void ov114_0225E0F8(UnkStruct_ov114_0225E0F8 *param0, const UnkStruct_ov114_0225C76C *param1) { int v0; @@ -2268,7 +2262,7 @@ static void ov114_0225E0F8 (UnkStruct_ov114_0225E0F8 * param0, const UnkStruct_o } } -static BOOL ov114_0225E14C (const UnkStruct_ov114_0225C76C * param0, const UnkStruct_ov114_0225E0F8 * param1) +static BOOL ov114_0225E14C(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225E0F8 *param1) { int v0; BOOL v1; @@ -2284,7 +2278,7 @@ static BOOL ov114_0225E14C (const UnkStruct_ov114_0225C76C * param0, const UnkSt return v1; } -u32 ov114_0225E180 (u32 param0) +u32 ov114_0225E180(u32 param0) { u32 v0; u32 v1; @@ -2303,7 +2297,7 @@ u32 ov114_0225E180 (u32 param0) return v2; } -static void ov114_0225E1A4 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1, UnkStruct_ov114_0225D084 * param2, u32 param3, NARC * param4, u32 param5) +static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, NARC *param4, u32 param5) { BGL_AddWindow(param1->unk_00, ¶m0->unk_00, 1, 6, 11, 20, 10, 8, 513); BGL_FillWindow(¶m0->unk_00, 0); @@ -2318,13 +2312,13 @@ static void ov114_0225E1A4 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0 sub_0200710C(param4, 10, param1->unk_00, 0, 0, 0, 0, param5); } -static void ov114_0225E234 (UnkStruct_ov114_0225E1A4 * param0) +static void ov114_0225E234(UnkStruct_ov114_0225E1A4 *param0) { BGL_DeleteWindow(¶m0->unk_00); Strbuf_Free(param0->unk_14); } -static void ov114_0225E244 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1, u32 param2) +static void ov114_0225E244(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2) { u32 v0; u32 v1; @@ -2344,7 +2338,7 @@ static void ov114_0225E244 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0 GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); } -static void ov114_0225E2D4 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1) +static void ov114_0225E2D4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1) { param0->unk_2C = 0; param0->unk_2E = 0; @@ -2353,7 +2347,7 @@ static void ov114_0225E2D4 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0 ov114_0225E500(param0, param1, param0->unk_18.unk_00 >> FX32_SHIFT); } -static BOOL ov114_0225E31C (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1) +static BOOL ov114_0225E31C(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1) { BOOL v0; @@ -2398,7 +2392,7 @@ static BOOL ov114_0225E31C (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0 return 0; } -static BOOL ov114_0225E438 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1) +static BOOL ov114_0225E438(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1) { BOOL v0; @@ -2427,7 +2421,7 @@ static BOOL ov114_0225E438 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0 return 0; } -static void ov114_0225E4B0 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1, s32 param2) +static void ov114_0225E4B0(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, s32 param2) { switch (param0->unk_10) { case UnkEnum_ov66_022324D0_00: @@ -2445,7 +2439,7 @@ static void ov114_0225E4B0 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0 } } -static void ov114_0225E500 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0225CEF0 * param1, s32 param2) +static void ov114_0225E500(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, s32 param2) { switch (param0->unk_10) { case UnkEnum_ov66_022324D0_00: @@ -2463,7 +2457,7 @@ static void ov114_0225E500 (UnkStruct_ov114_0225E1A4 * param0, UnkStruct_ov114_0 } } -static void ov114_0225E550 (NARC * param0, u32 param1, u32 param2) +static void ov114_0225E550(NARC *param0, u32 param1, u32 param2) { u32 v0; @@ -2486,9 +2480,9 @@ static void ov114_0225E550 (NARC * param0, u32 param1, u32 param2) sub_02007148(param0, 5, 4, v0 * 32, 5 * 32, 32, param2); } -static UnkStruct_ov114_0225E854 * ov114_0225E5A8 (const UnkStruct_ov114_0225C76C * param0, const UnkStruct_ov114_0225C9A8 * param1, u32 param2, u32 param3) +static UnkStruct_ov114_0225E854 *ov114_0225E5A8(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225C9A8 *param1, u32 param2, u32 param3) { - UnkStruct_ov114_0225E854 * v0; + UnkStruct_ov114_0225E854 *v0; int v1; v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov114_0225E854)); @@ -2558,9 +2552,9 @@ static UnkStruct_ov114_0225E854 * ov114_0225E5A8 (const UnkStruct_ov114_0225C76C return v0; } -static void ov114_0225E744 (UnkStruct_ov114_0225E854 * param0, u32 param1) +static void ov114_0225E744(UnkStruct_ov114_0225E854 *param0, u32 param1) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL, param1); @@ -2590,7 +2584,7 @@ static void ov114_0225E744 (UnkStruct_ov114_0225E854 * param0, u32 param1) NARC_dtor(v0); } -static void ov114_0225E854 (UnkStruct_ov114_0225E854 * param0) +static void ov114_0225E854(UnkStruct_ov114_0225E854 *param0) { ov114_0225F578(¶m0->unk_26C); @@ -2605,9 +2599,9 @@ static void ov114_0225E854 (UnkStruct_ov114_0225E854 * param0) ov114_0225F224(param0); } -static void ov114_0225E874 (SysTask * param0, void * param1) +static void ov114_0225E874(SysTask *param0, void *param1) { - UnkStruct_ov114_0225E854 * v0 = param1; + UnkStruct_ov114_0225E854 *v0 = param1; BOOL v1; switch (v0->unk_04) { @@ -2686,8 +2680,7 @@ static void ov114_0225E874 (SysTask * param0, void * param1) } } break; - case 5: - { + case 5: { int v6; BOOL v7; @@ -2719,8 +2712,7 @@ static void ov114_0225E874 (SysTask * param0, void * param1) ov114_0225F7D8(v0); v0->unk_04++; - } - break; + } break; case 6: v0->unk_6B6--; ov114_0225F7D8(v0); @@ -2776,8 +2768,7 @@ static void ov114_0225E874 (SysTask * param0, void * param1) v0->unk_00 = 0; } break; - case 10: - { + case 10: { u32 v10; if (v0->unk_1C.unk_10[v0->unk_0C.unk_09] == 0) { @@ -2907,8 +2898,7 @@ static void ov114_0225E874 (SysTask * param0, void * param1) v0->unk_04++; } break; - case 23: - { + case 23: { int v12; for (v12 = 0; v12 < v0->unk_0C.unk_08; v12++) { @@ -2917,8 +2907,7 @@ static void ov114_0225E874 (SysTask * param0, void * param1) } v0->unk_04 = 7; - } - break; + } break; } ov114_0225F19C(v0); @@ -2928,9 +2917,9 @@ static void ov114_0225E874 (SysTask * param0, void * param1) sub_0201C63C(v0->unk_4C.unk_00, 5, 4, 2); } -static void ov114_0225ED40 (SysTask * param0, void * param1) +static void ov114_0225ED40(SysTask *param0, void *param1) { - UnkStruct_ov114_0225E854 * v0 = param1; + UnkStruct_ov114_0225E854 *v0 = param1; BOOL v1; switch (v0->unk_04) { @@ -2984,8 +2973,7 @@ static void ov114_0225ED40 (SysTask * param0, void * param1) } } break; - case 5: - { + case 5: { int v2; BOOL v3; u32 v4; @@ -3055,8 +3043,7 @@ static void ov114_0225ED40 (SysTask * param0, void * param1) } } break; - case 10: - { + case 10: { u32 v5; if (v0->unk_09) { @@ -3153,9 +3140,9 @@ static void ov114_0225ED40 (SysTask * param0, void * param1) sub_0201C63C(v0->unk_4C.unk_00, 5, 4, 2); } -static void ov114_0225F124 (SysTask * param0, void * param1) +static void ov114_0225F124(SysTask *param0, void *param1) { - UnkStruct_ov114_0225E854 * v0 = param1; + UnkStruct_ov114_0225E854 *v0 = param1; sub_0201DCAC(); @@ -3164,12 +3151,12 @@ static void ov114_0225F124 (SysTask * param0, void * param1) ov114_0225E08C(&v0->unk_3A0); } -static void ov114_0225F148 (UnkStruct_ov114_0225E854 * param0, NARC * param1, u32 param2) +static void ov114_0225F148(UnkStruct_ov114_0225E854 *param0, NARC *param1, u32 param2) { param0->unk_6B8 = sub_020071EC(param1, 5, ¶m0->unk_6BC, param2); } -static void ov114_0225F168 (UnkStruct_ov114_0225E854 * param0) +static void ov114_0225F168(UnkStruct_ov114_0225E854 *param0) { int v0; @@ -3185,11 +3172,11 @@ static void ov114_0225F168 (UnkStruct_ov114_0225E854 * param0) } } -static void ov114_0225F19C (UnkStruct_ov114_0225E854 * param0) +static void ov114_0225F19C(UnkStruct_ov114_0225E854 *param0) { int v0; u32 v1; - u8 * v2; + u8 *v2; BOOL v3; if (param0->unk_6C2 == 0) { @@ -3217,18 +3204,18 @@ static void ov114_0225F19C (UnkStruct_ov114_0225E854 * param0) param0->unk_6C0 = (param0->unk_6C0 + 1) % (8 * 2); } -static void ov114_0225F224 (UnkStruct_ov114_0225E854 * param0) +static void ov114_0225F224(UnkStruct_ov114_0225E854 *param0) { Heap_FreeToHeap(param0->unk_6B8); } -static void ov114_0225F234 (UnkStruct_ov114_0225F270 * param0, UnkStruct_ov114_0225CEF0 * param1, u32 param2, u32 param3) +static void ov114_0225F234(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 param2, u32 param3) { memset(param0, 0, sizeof(UnkStruct_ov114_0225F270)); param0->unk_08.unk_00 = param1->unk_00; param0->unk_08.unk_04 = 4; - param0->unk_08.unk_08 = ((((1 + (18 + 12))) + (27 * 4))); + param0->unk_08.unk_08 = ((1 + (18 + 12)) + (27 * 4)); param0->unk_08.unk_0C = 2; param0->unk_08.unk_10 = 24; param0->unk_08.unk_11 = 8; @@ -3237,12 +3224,12 @@ static void ov114_0225F234 (UnkStruct_ov114_0225F270 * param0, UnkStruct_ov114_0 param0->unk_1D = 1; } -static void ov114_0225F270 (UnkStruct_ov114_0225F270 * param0) +static void ov114_0225F270(UnkStruct_ov114_0225F270 *param0) { sub_02015938(param0->unk_04); } -static BOOL ov114_0225F27C (UnkStruct_ov114_0225F270 * param0, UnkStruct_ov114_0225D338 * param1, UnkStruct_ov114_0225D084 * param2, u32 param3, u32 param4) +static BOOL ov114_0225F27C(UnkStruct_ov114_0225F270 *param0, UnkStruct_ov114_0225D338 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, u32 param4) { u32 v0; @@ -3345,12 +3332,12 @@ static BOOL ov114_0225F27C (UnkStruct_ov114_0225F270 * param0, UnkStruct_ov114_0 return 0; } -static BOOL ov114_0225F420 (const UnkStruct_ov114_0225F270 * param0) +static BOOL ov114_0225F420(const UnkStruct_ov114_0225F270 *param0) { return param0->unk_1F; } -static void ov114_0225F424 (UnkStruct_ov114_0225F270 * param0, u32 param1, BOOL param2, u32 param3) +static void ov114_0225F424(UnkStruct_ov114_0225F270 *param0, u32 param1, BOOL param2, u32 param3) { if ((param0->unk_1C & (1 << param1)) == 0) { if (param2 == 0) { @@ -3367,7 +3354,7 @@ static void ov114_0225F424 (UnkStruct_ov114_0225F270 * param0, u32 param1, BOOL v1 = 0; for (v0 = 0; v0 < 4; v0++) { - if ((param0->unk_1C & (1 << v0))) { + if (param0->unk_1C & (1 << v0)) { v1++; } } @@ -3382,19 +3369,19 @@ static void ov114_0225F424 (UnkStruct_ov114_0225F270 * param0, u32 param1, BOOL } } -static void ov114_0225F47C (UnkStruct_ov114_0225F270 * param0, BOOL param1) +static void ov114_0225F47C(UnkStruct_ov114_0225F270 *param0, BOOL param1) { param0->unk_1E = 1; param0->unk_1F = param1; } -static void ov114_0225F484 (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0225CEF0 * param1, UnkStruct_ov114_0225CFCC * param2, UnkStruct_ov114_0225CCD0 * param3, NARC * param4, u32 param5) +static void ov114_0225F484(UnkStruct_ov114_0225F578 *param0, UnkStruct_ov114_0225CEF0 *param1, UnkStruct_ov114_0225CFCC *param2, UnkStruct_ov114_0225CCD0 *param3, NARC *param4, u32 param5) { memset(param0, 0, sizeof(UnkStruct_ov114_0225F578)); { sub_02007130(param4, 24, 0, (13 + 1) * 32, 32, param5); - sub_020070E8(param4, 25, param1->unk_00, 2, ((((1 + (18 + 12))) + (27 * 4))), 0, 0, param5); + sub_020070E8(param4, 25, param1->unk_00, 2, ((1 + (18 + 12)) + (27 * 4)), 0, 0, param5); param0->unk_00 = sub_020071D0(param4, 26, 0, ¶m0->unk_04, param5); } @@ -3425,7 +3412,7 @@ static void ov114_0225F484 (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0 } } -static void ov114_0225F578 (UnkStruct_ov114_0225F578 * param0) +static void ov114_0225F578(UnkStruct_ov114_0225F578 *param0) { { int v0; @@ -3440,19 +3427,19 @@ static void ov114_0225F578 (UnkStruct_ov114_0225F578 * param0) } } -static void ov114_0225F598 (UnkStruct_ov114_0225F578 * param0, u32 param1) +static void ov114_0225F598(UnkStruct_ov114_0225F578 *param0, u32 param1) { param0->unk_4B = param1; param0->unk_48 = 0; param0->unk_4A = 0; } -static BOOL ov114_0225F5AC (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0225CEF0 * param1) +static BOOL ov114_0225F5AC(UnkStruct_ov114_0225F578 *param0, UnkStruct_ov114_0225CEF0 *param1) { switch (param0->unk_48) { case 0: - ov114_0225CCB0(param0->unk_04, ((((1 + (18 + 12))) + (27 * 4)))); + ov114_0225CCB0(param0->unk_04, ((1 + (18 + 12)) + (27 * 4))); sub_020198C0(param1->unk_00, 2, param0->unk_04->rawData, 0, 0, 32, 20); sub_02019E2C(param1->unk_00, 2, 0, 0, 32, 20, (13 + 1)); sub_0201C3C0(param1->unk_00, 2); @@ -3496,7 +3483,7 @@ static BOOL ov114_0225F5AC (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0 return 0; } -static void ov114_0225F6E4 (UnkStruct_ov114_0225E854 * param0, u32 param1, u32 param2) +static void ov114_0225F6E4(UnkStruct_ov114_0225E854 *param0, u32 param1, u32 param2) { BOOL v0; u32 v1; @@ -3522,7 +3509,7 @@ static void ov114_0225F6E4 (UnkStruct_ov114_0225E854 * param0, u32 param1, u32 p ov114_0225DDD4(¶m0->unk_2C0[param1], Unk_ov114_022600D8[param2], 0); } -static BOOL ov114_0225F7D8 (UnkStruct_ov114_0225E854 * param0) +static BOOL ov114_0225F7D8(UnkStruct_ov114_0225E854 *param0) { int v0; BOOL v1; @@ -3544,7 +3531,7 @@ static BOOL ov114_0225F7D8 (UnkStruct_ov114_0225E854 * param0) return v2; } -static void ov114_0225F83C (UnkStruct_ov114_0225E854 * param0) +static void ov114_0225F83C(UnkStruct_ov114_0225E854 *param0) { if (param0->unk_6C4 == 0) { sub_02006150(1222); @@ -3552,7 +3539,7 @@ static void ov114_0225F83C (UnkStruct_ov114_0225E854 * param0) } } -static BOOL ov114_0225F860 (UnkStruct_ov114_0225E854 * param0) +static BOOL ov114_0225F860(UnkStruct_ov114_0225E854 *param0) { if (param0->unk_6C4 == 1) { if (sub_020061E4() == 0) { @@ -3567,13 +3554,13 @@ static BOOL ov114_0225F860 (UnkStruct_ov114_0225E854 * param0) } } -static void ov114_0225F890 (UnkStruct_ov114_0225E854 * param0) +static void ov114_0225F890(UnkStruct_ov114_0225E854 *param0) { - UnkStruct_0202B370 * v0 = sub_0202B370(param0->unk_0C.unk_00); + UnkStruct_0202B370 *v0 = sub_0202B370(param0->unk_0C.unk_00); int v1; int v2, v3; int v4; - DWCFriendData * v5; + DWCFriendData *v5; for (v1 = 0; v1 < param0->unk_0C.unk_08; v1++) { v2 = param0->unk_0C.unk_04[v1]; @@ -3601,7 +3588,7 @@ static void ov114_0225F890 (UnkStruct_ov114_0225E854 * param0) } } -static u32 ov114_0225F8FC (const UnkStruct_ov114_0225E854 * param0) +static u32 ov114_0225F8FC(const UnkStruct_ov114_0225E854 *param0) { u32 v0; @@ -3621,10 +3608,10 @@ static u32 ov114_0225F8FC (const UnkStruct_ov114_0225E854 * param0) return v0; } -static void ov114_0225F920 (UnkStruct_ov114_0225E854 * param0) +static void ov114_0225F920(UnkStruct_ov114_0225E854 *param0) { int v0; - u32 v1[4] = {0}; + u32 v1[4] = { 0 }; u32 v2; u32 v3; @@ -3643,7 +3630,7 @@ static void ov114_0225F920 (UnkStruct_ov114_0225E854 * param0) } } -static void ov114_0225F988 (UnkStruct_ov114_0225E854 * param0) +static void ov114_0225F988(UnkStruct_ov114_0225E854 *param0) { if (param0->unk_0C.unk_08 > 0) { if (param0->unk_1C.unk_14 >= 10) { @@ -3652,7 +3639,7 @@ static void ov114_0225F988 (UnkStruct_ov114_0225E854 * param0) } } -static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0225CDB4 * param1, GraphicElementManager * param2, u32 param3) +static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 *param0, UnkStruct_ov114_0225CDB4 *param1, GraphicElementManager *param2, u32 param3) { int v0; int v1; @@ -3688,7 +3675,7 @@ static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0 ov114_0225FC6C(param0); } -static BOOL ov114_0225FAB8 (UnkStruct_ov114_0225FAB8 * param0) +static BOOL ov114_0225FAB8(UnkStruct_ov114_0225FAB8 *param0) { BOOL v0 = 0; @@ -3704,7 +3691,7 @@ static BOOL ov114_0225FAB8 (UnkStruct_ov114_0225FAB8 * param0) return v0; } -static BOOL ov114_0225FAD8 (UnkStruct_ov114_0225FAB8 * param0) +static BOOL ov114_0225FAD8(UnkStruct_ov114_0225FAB8 *param0) { BOOL v0 = 0; @@ -3723,7 +3710,7 @@ static BOOL ov114_0225FAD8 (UnkStruct_ov114_0225FAB8 * param0) return v0; } -static void ov114_0225FB10 (UnkStruct_ov114_0225FAB8 * param0, s32 param1) +static void ov114_0225FB10(UnkStruct_ov114_0225FAB8 *param0, s32 param1) { VecFx32 v0; int v1; @@ -3752,7 +3739,7 @@ static void ov114_0225FB10 (UnkStruct_ov114_0225FAB8 * param0, s32 param1) ov114_0225FC6C(param0); } -static void ov114_0225FBF0 (UnkStruct_ov114_0225FAB8 * param0) +static void ov114_0225FBF0(UnkStruct_ov114_0225FAB8 *param0) { int v0; @@ -3774,7 +3761,7 @@ static void ov114_0225FBF0 (UnkStruct_ov114_0225FAB8 * param0) G2_SetWndOutsidePlane(param0->unk_190.planeMask, param0->unk_190.effect); } -static void ov114_0225FC6C (UnkStruct_ov114_0225FAB8 * param0) +static void ov114_0225FC6C(UnkStruct_ov114_0225FAB8 *param0) { int v0; @@ -3790,9 +3777,9 @@ static void ov114_0225FC6C (UnkStruct_ov114_0225FAB8 * param0) } } -static void ov114_0225FCCC (SysTask * param0, void * param1) +static void ov114_0225FCCC(SysTask *param0, void *param1) { - UnkStruct_ov114_0225FAB8 * v0 = param1; + UnkStruct_ov114_0225FAB8 *v0 = param1; memcpy(v0->unk_0C[0], v0->unk_0C[1], 192); SysTask_Done(v0->unk_18C); @@ -3800,9 +3787,9 @@ static void ov114_0225FCCC (SysTask * param0, void * param1) v0->unk_18C = NULL; } -static void ov114_0225FCF0 (void * param0) +static void ov114_0225FCF0(void *param0) { - UnkStruct_ov114_0225FAB8 * v0 = param0; + UnkStruct_ov114_0225FAB8 *v0 = param0; s32 v1; int v2; @@ -3831,9 +3818,9 @@ static void ov114_0225FCF0 (void * param0) } } -static void ov114_0225FDC8 (SysTask * param0, void * param1) +static void ov114_0225FDC8(SysTask *param0, void *param1) { - UnkStruct_ov114_0225CAD4 * v0 = param1; + UnkStruct_ov114_0225CAD4 *v0 = param1; BOOL v1; u16 v2; u16 v3; @@ -3931,9 +3918,9 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1) } } -static void ov114_0225FF54 (SysTask * param0, void * param1) +static void ov114_0225FF54(SysTask *param0, void *param1) { - UnkStruct_ov114_0225CAD4 * v0 = param1; + UnkStruct_ov114_0225CAD4 *v0 = param1; BOOL v1; switch (v0->unk_04) { diff --git a/src/overlay114/ov114_02260038.c b/src/overlay114/ov114_02260038.c index a849d69807..369397ad48 100644 --- a/src/overlay114/ov114_02260038.c +++ b/src/overlay114/ov114_02260038.c @@ -1,25 +1,26 @@ +#include "overlay114/ov114_02260038.h" + #include #include #include "struct_defs/struct_02039A58.h" -#include "overlay114/ov114_02260038.h" #include "overlay114/ov114_02260044.h" static const CommCmdTable Unk_ov114_022603E4[] = { - {ov114_02260090, ov114_0226007C, NULL}, - {ov114_022600A0, ov114_0226007C, NULL}, - {ov114_022600B0, ov114_0226007C, NULL}, - {ov114_022600BC, ov114_0226007C, NULL}, - {ov114_02260084, ov114_02260080, NULL}, + { ov114_02260090, ov114_0226007C, NULL }, + { ov114_022600A0, ov114_0226007C, NULL }, + { ov114_022600B0, ov114_0226007C, NULL }, + { ov114_022600BC, ov114_0226007C, NULL }, + { ov114_02260084, ov114_02260080, NULL }, }; -const CommCmdTable * ov114_02260038 (void) +const CommCmdTable *ov114_02260038(void) { return Unk_ov114_022603E4; } -int ov114_02260040 (void) +int ov114_02260040(void) { return sizeof(Unk_ov114_022603E4) / sizeof(CommCmdTable); } diff --git a/src/overlay114/ov114_02260044.c b/src/overlay114/ov114_02260044.c index c5e5771f49..8ba7bcc1de 100644 --- a/src/overlay114/ov114_02260044.c +++ b/src/overlay114/ov114_02260044.c @@ -1,55 +1,56 @@ +#include "overlay114/ov114_02260044.h" + #include #include +#include "overlay114/ov114_0225C700.h" +#include "overlay114/ov114_02260038.h" #include "overlay114/struct_ov114_0225D678_decl.h" #include "overlay114/struct_ov114_0225E854_decl.h" #include "unk_02032798.h" -#include "overlay114/ov114_0225C700.h" -#include "overlay114/ov114_02260038.h" -#include "overlay114/ov114_02260044.h" -void ov114_02260044 (UnkStruct_ov114_0225E854 * param0) +void ov114_02260044(UnkStruct_ov114_0225E854 *param0) { CommCmd_Init(ov114_02260038(), ov114_02260040(), param0); } -void ov114_02260060 (UnkStruct_ov114_0225D678 * param0) +void ov114_02260060(UnkStruct_ov114_0225D678 *param0) { CommCmd_Init(ov114_02260038(), ov114_02260040(), param0); } -int ov114_0226007C (void) +int ov114_0226007C(void) { return 0; } -int ov114_02260080 (void) +int ov114_02260080(void) { return sizeof(u32); } -void ov114_02260084 (int param0, int param1, void * param2, void * param3) +void ov114_02260084(int param0, int param1, void *param2, void *param3) { ov114_0225CA24(param3, *((u32 *)param2)); } -void ov114_02260090 (int param0, int param1, void * param2, void * param3) +void ov114_02260090(int param0, int param1, void *param2, void *param3) { ov114_0225CA2C(param3, param0, 1); } -void ov114_022600A0 (int param0, int param1, void * param2, void * param3) +void ov114_022600A0(int param0, int param1, void *param2, void *param3) { ov114_0225CA2C(param3, param0, 0); } -void ov114_022600B0 (int param0, int param1, void * param2, void * param3) +void ov114_022600B0(int param0, int param1, void *param2, void *param3) { ov114_0225CA44(param3, 1); } -void ov114_022600BC (int param0, int param1, void * param2, void * param3) +void ov114_022600BC(int param0, int param1, void *param2, void *param3) { ov114_0225CA44(param3, 0); } diff --git a/src/overlay115/ov115_02260440.c b/src/overlay115/ov115_02260440.c index 9d5d6593b2..22f1c393cd 100644 --- a/src/overlay115/ov115_02260440.c +++ b/src/overlay115/ov115_02260440.c @@ -1,47 +1,46 @@ +#include "overlay115/ov115_02260440.h" + #include #include -#include "core_sys.h" - +#include "overlay004/ov4_021D0D80.h" +#include "overlay114/ov114_0225C700.h" +#include "overlay114/struct_ov114_0225C76C.h" +#include "overlay114/struct_ov114_0225C9A8.h" #include "overlay114/struct_ov114_0225D678_decl.h" #include "overlay114/struct_ov114_0225E854_decl.h" +#include "overlay115/ov115_02260BBC.h" +#include "overlay115/ov115_02260CEC.h" +#include "overlay115/ov115_02265A24.h" +#include "overlay115/struct_ov115_02260440.h" #include "overlay115/struct_ov115_02260BE4_decl.h" #include "overlay115/struct_ov115_02260D78_decl.h" - -#include "overlay114/struct_ov114_0225C76C.h" -#include "overlay114/struct_ov114_0225C9A8.h" -#include "overlay115/struct_ov115_02260440.h" #include "overlay115/struct_ov115_022612BC.h" #include "overlay115/struct_ov115_02262DC4.h" #include "overlay115/struct_ov115_02262F50.h" #include "overlay115/struct_ov115_02265AD0.h" #include "overlay115/struct_ov115_02265AD4.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "heap.h" #include "overlay_manager.h" #include "unk_02006E3C.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_0201DBEC.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay114/ov114_0225C700.h" -#include "overlay115/ov115_02260440.h" -#include "overlay115/ov115_02260BBC.h" -#include "overlay115/ov115_02260CEC.h" -#include "overlay115/ov115_02265A24.h" typedef struct UnkStruct_ov115_0226095C_t { - UnkStruct_ov114_0225D678 * unk_00; - UnkStruct_ov114_0225E854 * unk_04; + UnkStruct_ov114_0225D678 *unk_00; + UnkStruct_ov114_0225E854 *unk_04; UnkStruct_ov114_0225C76C unk_08; UnkStruct_ov114_0225C9A8 unk_18; - UnkStruct_ov115_02260BE4 * unk_30; - UnkStruct_ov115_02260D78 * unk_34; + UnkStruct_ov115_02260BE4 *unk_30; + UnkStruct_ov115_02260D78 *unk_34; BOOL unk_38; BOOL unk_3C; BOOL unk_40; @@ -56,18 +55,18 @@ typedef struct UnkStruct_ov115_0226095C_t { u8 unk_84[4]; } UnkStruct_ov115_0226095C; -static void ov115_02260A50(void * param0); -static void ov115_02260A5C(UnkStruct_ov115_0226095C * param0); -static void ov115_02260A90(UnkStruct_ov115_0226095C * param0); -static void ov115_02260ADC(UnkStruct_ov115_0226095C * param0, u32 param1); -static void ov115_02260B30(UnkStruct_ov115_0226095C * param0); -static void ov115_02260B44(UnkStruct_ov115_0226095C * param0, UnkStruct_ov115_02260440 * param1); -static BOOL ov115_02260BA0(UnkStruct_ov115_0226095C * param0, int param1, const void * param2, int param3); +static void ov115_02260A50(void *param0); +static void ov115_02260A5C(UnkStruct_ov115_0226095C *param0); +static void ov115_02260A90(UnkStruct_ov115_0226095C *param0); +static void ov115_02260ADC(UnkStruct_ov115_0226095C *param0, u32 param1); +static void ov115_02260B30(UnkStruct_ov115_0226095C *param0); +static void ov115_02260B44(UnkStruct_ov115_0226095C *param0, UnkStruct_ov115_02260440 *param1); +static BOOL ov115_02260BA0(UnkStruct_ov115_0226095C *param0, int param1, const void *param2, int param3); -int ov115_02260440 (OverlayManager * param0, int * param1) +int ov115_02260440(OverlayManager *param0, int *param1) { - UnkStruct_ov115_0226095C * v0; - UnkStruct_ov115_02260440 * v1 = OverlayManager_Args(param0); + UnkStruct_ov115_0226095C *v0; + UnkStruct_ov115_02260440 *v1 = OverlayManager_Args(param0); BOOL v2; Heap_Create(3, 99, 0x60000); @@ -81,14 +80,14 @@ int ov115_02260440 (OverlayManager * param0, int * param1) return 1; } -int ov115_0226048C (OverlayManager * param0, int * param1) +int ov115_0226048C(OverlayManager *param0, int *param1) { - UnkStruct_ov115_0226095C * v0 = OverlayManager_Data(param0); - UnkStruct_ov115_02260440 * v1 = OverlayManager_Args(param0); + UnkStruct_ov115_0226095C *v0 = OverlayManager_Data(param0); + UnkStruct_ov115_02260440 *v1 = OverlayManager_Args(param0); BOOL v2; u32 v3; - if ((ov114_0225CA54(&v0->unk_08) == 1)) { + if (ov114_0225CA54(&v0->unk_08) == 1) { switch (v0->unk_78) { case 0: @@ -114,7 +113,7 @@ int ov115_0226048C (OverlayManager * param0, int * param1) return 0; } - switch ((*param1)) { + switch (*param1) { case 0: v0->unk_00 = ov114_0225C814(&v0->unk_08, 99); @@ -232,7 +231,7 @@ int ov115_0226048C (OverlayManager * param0, int * param1) } break; case 7: - if ((v0->unk_3C)) { + if (v0->unk_3C) { u32 v5; v5 = ov115_02261274(v0->unk_34); @@ -336,8 +335,7 @@ int ov115_0226048C (OverlayManager * param0, int * param1) sub_0201DC3C(); (*param1)++; break; - case 14: - { + case 14: { u32 v9; ov114_0225C9A8(&v0->unk_18, v0->unk_08.unk_08); @@ -346,8 +344,7 @@ int ov115_0226048C (OverlayManager * param0, int * param1) v0->unk_04 = ov114_0225C8E0(&v0->unk_08, &v0->unk_18, 99); (*param1)++; break; - case 15: - { + case 15: { BOOL v10; if (ov114_0225C9A0(v0->unk_04) == 1) { @@ -362,17 +359,16 @@ int ov115_0226048C (OverlayManager * param0, int * param1) (*param1) = 0; } } - } - break; + } break; } return 0; } -int ov115_022608E4 (OverlayManager * param0, int * param1) +int ov115_022608E4(OverlayManager *param0, int *param1) { - UnkStruct_ov115_0226095C * v0 = OverlayManager_Data(param0); - UnkStruct_ov115_02260440 * v1 = OverlayManager_Args(param0); + UnkStruct_ov115_0226095C *v0 = OverlayManager_Data(param0); + UnkStruct_ov115_02260440 *v1 = OverlayManager_Args(param0); BOOL v2; switch (*param1) { @@ -404,17 +400,17 @@ int ov115_022608E4 (OverlayManager * param0, int * param1) return 0; } -void ov115_0226095C (UnkStruct_ov115_0226095C * param0) +void ov115_0226095C(UnkStruct_ov115_0226095C *param0) { param0->unk_38 = 1; } -void ov115_02260964 (UnkStruct_ov115_0226095C * param0) +void ov115_02260964(UnkStruct_ov115_0226095C *param0) { param0->unk_3C = 1; } -void ov115_0226096C (UnkStruct_ov115_0226095C * param0, const UnkStruct_ov115_02265AD0 * param1, u32 param2) +void ov115_0226096C(UnkStruct_ov115_0226095C *param0, const UnkStruct_ov115_02265AD0 *param1, u32 param2) { u32 v0; @@ -422,12 +418,12 @@ void ov115_0226096C (UnkStruct_ov115_0226095C * param0, const UnkStruct_ov115_02 ov115_02260C6C(param0->unk_30, param1, v0); } -void ov115_02260988 (UnkStruct_ov115_0226095C * param0, const UnkStruct_ov115_02265AD0 * param1, u32 param2) +void ov115_02260988(UnkStruct_ov115_0226095C *param0, const UnkStruct_ov115_02265AD0 *param1, u32 param2) { ov115_022611E4(param0->unk_34, param1); } -void ov115_02260994 (UnkStruct_ov115_0226095C * param0, u32 param1, u32 param2) +void ov115_02260994(UnkStruct_ov115_0226095C *param0, u32 param1, u32 param2) { u32 v0; @@ -438,7 +434,7 @@ void ov115_02260994 (UnkStruct_ov115_0226095C * param0, u32 param1, u32 param2) } } -void ov115_022609B4 (UnkStruct_ov115_0226095C * param0, const UnkStruct_ov115_02265AD4 * param1, u32 param2) +void ov115_022609B4(UnkStruct_ov115_0226095C *param0, const UnkStruct_ov115_02265AD4 *param1, u32 param2) { ov115_02261260(param0->unk_34, param1); param0->unk_40 = 1; @@ -452,12 +448,12 @@ void ov115_022609B4 (UnkStruct_ov115_0226095C * param0, const UnkStruct_ov115_02 } } -void ov115_022609D8 (UnkStruct_ov115_0226095C * param0, u32 param1) +void ov115_022609D8(UnkStruct_ov115_0226095C *param0, u32 param1) { ov115_02261278(param0->unk_34, param1); } -void ov115_022609E4 (UnkStruct_ov115_0226095C * param0, u32 param1, u32 param2) +void ov115_022609E4(UnkStruct_ov115_0226095C *param0, u32 param1, u32 param2) { u32 v0; int v1; @@ -483,19 +479,19 @@ void ov115_022609E4 (UnkStruct_ov115_0226095C * param0, u32 param1, u32 param2) } } -void ov115_02260A48 (UnkStruct_ov115_0226095C * param0) +void ov115_02260A48(UnkStruct_ov115_0226095C *param0) { param0->unk_80 = 1; } -static void ov115_02260A50 (void * param0) +static void ov115_02260A50(void *param0) { - UnkStruct_ov115_0226095C * v0 = param0; + UnkStruct_ov115_0226095C *v0 = param0; ov115_022611C8(v0->unk_34); } -static void ov115_02260A5C (UnkStruct_ov115_0226095C * param0) +static void ov115_02260A5C(UnkStruct_ov115_0226095C *param0) { UnkStruct_ov115_02265AD0 v0; @@ -504,7 +500,7 @@ static void ov115_02260A5C (UnkStruct_ov115_0226095C * param0) } } -static void ov115_02260A90 (UnkStruct_ov115_0226095C * param0) +static void ov115_02260A90(UnkStruct_ov115_0226095C *param0) { s32 v0; u32 v1; @@ -527,7 +523,7 @@ static void ov115_02260A90 (UnkStruct_ov115_0226095C * param0) } } -static void ov115_02260ADC (UnkStruct_ov115_0226095C * param0, u32 param1) +static void ov115_02260ADC(UnkStruct_ov115_0226095C *param0, u32 param1) { u32 v0; int v1; @@ -541,14 +537,14 @@ static void ov115_02260ADC (UnkStruct_ov115_0226095C * param0, u32 param1) } } -static void ov115_02260B30 (UnkStruct_ov115_0226095C * param0) +static void ov115_02260B30(UnkStruct_ov115_0226095C *param0) { Heap_FreeToHeap(param0->unk_48.unk_04); param0->unk_48.unk_04 = NULL; param0->unk_48.unk_00 = 0; } -static void ov115_02260B44 (UnkStruct_ov115_0226095C * param0, UnkStruct_ov115_02260440 * param1) +static void ov115_02260B44(UnkStruct_ov115_0226095C *param0, UnkStruct_ov115_02260440 *param1) { SetMainCallback(NULL, NULL); DisableHBlank(); @@ -577,7 +573,7 @@ static void ov115_02260B44 (UnkStruct_ov115_0226095C * param0, UnkStruct_ov115_0 } } -static BOOL ov115_02260BA0 (UnkStruct_ov115_0226095C * param0, int param1, const void * param2, int param3) +static BOOL ov115_02260BA0(UnkStruct_ov115_0226095C *param0, int param1, const void *param2, int param3) { if (param0->unk_80 == 0) { return 0; diff --git a/src/overlay115/ov115_02260BBC.c b/src/overlay115/ov115_02260BBC.c index ed1dc6dcc3..261f1d648b 100644 --- a/src/overlay115/ov115_02260BBC.c +++ b/src/overlay115/ov115_02260BBC.c @@ -1,3 +1,5 @@ +#include "overlay115/ov115_02260BBC.h" + #include #include @@ -6,7 +8,6 @@ #include "overlay115/struct_ov115_02265AD4.h" #include "heap.h" -#include "overlay115/ov115_02260BBC.h" typedef struct UnkStruct_ov115_02260BE4_t { s32 unk_00; @@ -15,17 +16,17 @@ typedef struct UnkStruct_ov115_02260BE4_t { UnkStruct_ov115_02265AD4 unk_0C; u32 unk_1C; u32 unk_20[4]; - const UnkStruct_ov115_02262F50 * unk_30; + const UnkStruct_ov115_02262F50 *unk_30; u16 unk_34; u8 unk_36; u8 unk_37; } UnkStruct_ov115_02260BE4; -static u32 ov115_02260CCC(const UnkStruct_ov115_02260BE4 * param0); +static u32 ov115_02260CCC(const UnkStruct_ov115_02260BE4 *param0); -UnkStruct_ov115_02260BE4 * ov115_02260BBC (u32 param0, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 * param3) +UnkStruct_ov115_02260BE4 *ov115_02260BBC(u32 param0, u32 param1, u32 param2, const UnkStruct_ov115_02262F50 *param3) { - UnkStruct_ov115_02260BE4 * v0; + UnkStruct_ov115_02260BE4 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov115_02260BE4)); memset(v0, 0, sizeof(UnkStruct_ov115_02260BE4)); @@ -38,12 +39,12 @@ UnkStruct_ov115_02260BE4 * ov115_02260BBC (u32 param0, u32 param1, u32 param2, c return v0; } -void ov115_02260BE4 (UnkStruct_ov115_02260BE4 * param0) +void ov115_02260BE4(UnkStruct_ov115_02260BE4 *param0) { Heap_FreeToHeap(param0); } -BOOL ov115_02260BEC (UnkStruct_ov115_02260BE4 * param0) +BOOL ov115_02260BEC(UnkStruct_ov115_02260BE4 *param0) { int v0; @@ -73,29 +74,29 @@ BOOL ov115_02260BEC (UnkStruct_ov115_02260BE4 * param0) return 1; } -BOOL ov115_02260C54 (const UnkStruct_ov115_02260BE4 * param0) +BOOL ov115_02260C54(const UnkStruct_ov115_02260BE4 *param0) { return param0->unk_37; } -void ov115_02260C5C (UnkStruct_ov115_02260BE4 * param0) +void ov115_02260C5C(UnkStruct_ov115_02260BE4 *param0) { param0->unk_37 = 0; } -u32 ov115_02260C64 (const UnkStruct_ov115_02260BE4 * param0) +u32 ov115_02260C64(const UnkStruct_ov115_02260BE4 *param0) { return param0->unk_36; } -void ov115_02260C6C (UnkStruct_ov115_02260BE4 * param0, const UnkStruct_ov115_02265AD0 * param1, u32 param2) +void ov115_02260C6C(UnkStruct_ov115_02260BE4 *param0, const UnkStruct_ov115_02265AD0 *param1, u32 param2) { if (param1->unk_02) { param0->unk_34++; } } -void ov115_02260C7C (UnkStruct_ov115_02260BE4 * param0, u32 param1, u32 param2) +void ov115_02260C7C(UnkStruct_ov115_02260BE4 *param0, u32 param1, u32 param2) { int v0; int v1; @@ -110,7 +111,7 @@ void ov115_02260C7C (UnkStruct_ov115_02260BE4 * param0, u32 param1, u32 param2) } } -BOOL ov115_02260CA4 (const UnkStruct_ov115_02260BE4 * param0) +BOOL ov115_02260CA4(const UnkStruct_ov115_02260BE4 *param0) { int v0; @@ -123,12 +124,12 @@ BOOL ov115_02260CA4 (const UnkStruct_ov115_02260BE4 * param0) return 0; } -void ov115_02260CBC (UnkStruct_ov115_02260BE4 * param0, UnkStruct_ov115_02265AD4 * param1) +void ov115_02260CBC(UnkStruct_ov115_02260BE4 *param0, UnkStruct_ov115_02265AD4 *param1) { *param1 = param0->unk_0C; } -static u32 ov115_02260CCC (const UnkStruct_ov115_02260BE4 * param0) +static u32 ov115_02260CCC(const UnkStruct_ov115_02260BE4 *param0) { int v0; int v1; diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index 8289661801..0ed42f69d5 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -1,31 +1,28 @@ +#include "overlay115/ov115_02260CEC.h" + #include #include -#include "core_sys.h" - +#include "struct_decls/font_oam.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02012744_decl.h" #include "struct_decls/struct_02012B20_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "overlay114/struct_ov114_0225CAD4_decl.h" - +#include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017248.h" #include "struct_defs/struct_02017294.h" -#include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay072/struct_ov72_0223E2A8.h" @@ -33,30 +30,37 @@ #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay092/struct_ov92_021D28C0.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay114/ov114_0225C700.h" +#include "overlay114/struct_ov114_0225CAD4_decl.h" +#include "overlay115/camera_angle.h" #include "overlay115/struct_ov115_022612BC.h" #include "overlay115/struct_ov115_02261520.h" #include "overlay115/struct_ov115_02262DC4.h" #include "overlay115/struct_ov115_02262F50.h" -#include "overlay115/camera_angle.h" #include "overlay115/struct_ov115_02265AD0.h" #include "overlay115/struct_ov115_02265AD4.h" +#include "camera.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" #include "unk_0200A9DC.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_02012744.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" @@ -64,16 +68,10 @@ #include "unk_0201E3D8.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_02024220.h" -#include "trainer_info.h" #include "unk_020363E8.h" -#include "overlay114/ov114_0225C700.h" -#include "overlay115/ov115_02260CEC.h" typedef struct { fx32 unk_00; @@ -168,16 +166,16 @@ typedef struct { typedef struct { UnkStruct_020170F4 unk_00[5]; UnkStruct_020170F4 unk_50; - UnkStruct_02009DC8 * unk_60[4]; + UnkStruct_02009DC8 *unk_60[4]; UnkStruct_ov19_021DA864 unk_70; } UnkStruct_ov115_02264A40; typedef struct { - GraphicElementData * unk_00; + GraphicElementData *unk_00; UnkStruct_02017294 unk_04; UnkStruct_02017294 unk_7C; BOOL unk_F4; - const UnkStruct_ov115_022622F8 * unk_F8; + const UnkStruct_ov115_022622F8 *unk_F8; u16 unk_FC; u16 unk_FE; u16 unk_100; @@ -187,12 +185,12 @@ typedef struct { typedef struct { BOOL unk_00; - GraphicElementData * unk_04; + GraphicElementData *unk_04; } UnkStruct_ov115_02264BA0; typedef struct { BOOL unk_00; - GraphicElementData * unk_04; + GraphicElementData *unk_04; VecFx32 unk_08; s32 unk_14; BOOL unk_18; @@ -203,7 +201,7 @@ typedef struct { } UnkStruct_ov115_02264C90; typedef struct { - GraphicElementData * unk_00[3]; + GraphicElementData *unk_00[3]; u32 unk_0C[3]; VecFx32 unk_18[3]; BOOL unk_3C; @@ -247,9 +245,9 @@ typedef struct { } UnkStruct_ov115_02262E64; typedef struct { - UnkStruct_02009DC8 * unk_00[4]; + UnkStruct_02009DC8 *unk_00[4]; UnkStruct_ov19_021DA864 unk_10; - GraphicElementData * unk_34; + GraphicElementData *unk_34; u8 unk_38; u8 unk_39; u8 unk_3A; @@ -264,15 +262,15 @@ typedef struct { } UnkStruct_ov115_022632C8; typedef struct { - UnkStruct_02009DC8 * unk_00[4]; + UnkStruct_02009DC8 *unk_00[4]; UnkStruct_ov19_021DA864 unk_10; - GraphicElementData * unk_34; + GraphicElementData *unk_34; Window unk_38; - FontOAM * unk_48; - UnkStruct_02012B20 * unk_4C; + FontOAM *unk_48; + UnkStruct_02012B20 *unk_4C; SpriteManagerAllocation unk_50; - Strbuf* unk_5C; - UnkStruct_02009DC8 * unk_60; + Strbuf *unk_5C; + UnkStruct_02009DC8 *unk_60; UnkStruct_ov115_02261304 unk_64; UnkStruct_ov115_02261304 unk_7C; s16 unk_94; @@ -289,28 +287,28 @@ typedef struct { } UnkStruct_ov115_022658E0; typedef struct { - BGL * unk_00; - StringTemplate * unk_04; - MessageLoader * unk_08; - Strbuf* unk_0C; - Strbuf* unk_10; + BGL *unk_00; + StringTemplate *unk_04; + MessageLoader *unk_08; + Strbuf *unk_0C; + Strbuf *unk_10; u16 unk_14; u16 unk_16; - GenericPointerData * unk_18; - GraphicElementManager * unk_1C; + GenericPointerData *unk_18; + GraphicElementManager *unk_1C; UnkStruct_0200C738 unk_20; - UnkStruct_02009714 * unk_1AC[4]; + UnkStruct_02009714 *unk_1AC[4]; UnkStruct_ov19_021DA864 unk_1BC; - UnkStruct_02009DC8 * unk_1E0[4]; - UnkStruct_02012744 * unk_1F0; - Camera * camera; + UnkStruct_02009DC8 *unk_1E0[4]; + UnkStruct_02012744 *unk_1F0; + Camera *camera; VecFx32 unk_1F8; UnkStruct_ov115_02264FA0 unk_204; UnkStruct_ov115_02261574 unk_3E8; UnkStruct_ov115_022617E8 unk_4E8; UnkStruct_ov115_02261ADC_sub1 unk_504; UnkStruct_ov115_02263DF8 unk_524; - UnkStruct_ov114_0225CAD4 * unk_754; + UnkStruct_ov114_0225CAD4 *unk_754; UnkStruct_ov115_022653CC unk_758; UnkStruct_ov115_02264A40 unk_760; UnkStruct_ov115_022647A0 unk_7F4[96]; @@ -336,7 +334,7 @@ typedef struct UnkStruct_ov115_02260D78_t { UnkStruct_ov115_02265AD4 unk_8680; UnkStruct_ov72_0223E2A8 unk_8690; UnkStruct_ov115_02262E64 unk_86D4; - const UnkStruct_ov115_02262F50 * unk_8720; + const UnkStruct_ov115_02262F50 *unk_8720; u16 unk_8724; u16 unk_8726; UnkStruct_ov115_022612BC unk_8728; @@ -346,188 +344,188 @@ typedef struct UnkStruct_ov115_02260D78_t { UnkStruct_ov115_022658E0 unk_8788; } UnkStruct_ov115_02260D78; -static void ov115_02261304(UnkStruct_ov115_02261304 * param0, fx32 param1, fx32 param2, fx32 param3, int param4); -static BOOL ov115_02261364(UnkStruct_ov115_02261304 * param0); -static void ov115_022613CC(u32 param0, u32 param1, u32 param2, s32 * param3, s32 * param4); -static void ov115_022613F8(UnkStruct_ov115_02260D78 * param0, u16 param1, u16 param2, u16 param3, u16 param4, u32 param5); -static u32 ov115_022614F8(UnkStruct_ov115_02260D78 * param0); -static void ov115_02261520(UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2, u32 param3, u32 param4); -static void ov115_02261574(UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_02261ADC * param1); -static void ov115_0226158C(UnkStruct_ov115_02261574 * param0, u32 param1, u32 param2, int param3); -static void ov115_02261598(UnkStruct_ov115_02261574 * param0); -static void ov115_022615B0(UnkStruct_ov115_022615B0 * param0, UnkStruct_ov115_02261520 * param1, UnkStruct_ov115_02261ADC * param2, u32 param3, u32 param4, u32 param5, u32 param6); -static void ov115_02261648(UnkStruct_ov115_022615B0 * param0); -static void ov115_02261660(UnkStruct_ov115_022615B0 * param0, u32 param1, u32 param2, int param3); -static void ov115_02261744(UnkStruct_ov115_022615B0 * param0); -static void ov115_0226177C(UnkStruct_ov115_022615B0 * param0, u32 param1); -static void ov115_022617D8(UnkStruct_ov115_022615B0 * param0, u32 param1); -static void ov115_022617E8(UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1, const UnkStruct_ov115_02262F50 * param2, u32 param3, u32 param4, NARC * param5, u32 param6); -static void ov115_02261A04(UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1); -static void ov115_02261A10(UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1); -static BOOL ov115_02261A3C(UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1); -static void ov115_02261A54(UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1); -static void ov115_02261A74(UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1); -static BOOL ov115_02261AA4(UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1); -static void ov115_02261AB8(UnkStruct_ov115_02261ADC * param0, const UnkStruct_ov115_02261C18 * param1); -static void ov115_02261AC8(UnkStruct_ov115_02261ADC * param0, u32 param1, u32 param2, u32 param3); -static void ov115_02261AD8(UnkStruct_ov115_02261ADC * param0, u32 param1); -static void ov115_02261ADC(UnkStruct_ov115_02261ADC * param0); -static BOOL ov115_02261AEC(UnkStruct_ov115_02261ADC * param0); -static BOOL ov115_02261B1C(UnkStruct_ov115_02261ADC * param0); -static void ov115_02261B34(const UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02261C18 * param1); -static void ov115_02261BBC(const UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02261C18 * param1); -static void ov115_02261C18(UnkStruct_ov115_02261C18 * param0, BOOL param1); -static void ov115_02261C1C(UnkStruct_ov115_02261C18 * param0, u16 param1); -static void ov115_02261C48(UnkStruct_ov115_02261C18 * param0, u16 param1); -static u32 ov115_02261D84(const UnkStruct_ov115_02261C18 * param0, const VecFx32 * param1, const VecFx32 * param2, VecFx32 * param3); -static BOOL ov115_02261EA8(const UnkStruct_ov115_02261C18 * param0, const VecFx32 * param1); -static fx32 ov115_02261F3C(const UnkStruct_ov115_02261C18 * param0, u16 param1); -static fx32 ov115_02261F68(const UnkStruct_ov115_02261C18 * param0, u16 param1); -static void ov115_02261F94(UnkStruct_ov115_02261C18 * param0, fx32 param1); -static void ov115_022620D8(UnkStruct_ov115_02261C18 * param0, u16 param1); -static void ov115_022620DC(UnkStruct_ov115_02261C18 * param0, fx32 param1); -static u16 ov115_022620E4(const UnkStruct_ov115_02261C18 * param0, s32 param1, s32 param2); -static u16 ov115_022620EC(const UnkStruct_ov115_02261C18 * param0, s32 param1, s32 param2); -static u16 ov115_022620F4(const UnkStruct_ov115_02261C18 * param0, s32 param1, s32 param2); -static void ov115_02262134(const UnkStruct_ov115_02262134 * param0, UnkStruct_ov115_02265AD0 * param1); -static void ov115_0226218C(const UnkStruct_ov115_02265AD0 * param0, UnkStruct_ov115_02262134 * param1); -static void ov115_022621DC(UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02262134 * param1, u32 param2); -static void ov115_022622EC(UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_022622F8 * param1, BOOL param2, u32 param3); -static void ov115_022622F8(UnkStruct_ov115_022622F8 * param0); -static void ov115_02262304(UnkStruct_ov115_02260D78 * param0); -static void ov115_02262354(UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_022622F8 * param1); -static void ov115_02262524(UnkStruct_ov115_02260D78 * param0); -static void ov115_02262540(UnkStruct_ov115_02260D78 * param0); -static void ov115_02262574(UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1); -static void ov115_022625A8(UnkStruct_ov115_02260D78 * param0); -static BOOL ov115_022625C8(const UnkStruct_ov115_02260D78 * param0); -static fx32 ov115_022625F0(const UnkStruct_ov115_022622F8 * param0); -static void ov115_02262620(const UnkStruct_ov115_022622F8 * param0, VecFx32 * param1); -static void ov115_022626BC(UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1, BOOL param2); -static void ov115_022626E0(UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1, BOOL param2, fx32 param3, BOOL param4); -static void ov115_022627B4(UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1); -static BOOL ov115_02262888(const UnkStruct_ov115_022622F8 * param0); -static BOOL ov115_022628A4(const UnkStruct_ov115_022622F8 * param0); -static BOOL ov115_022628B8(UnkStruct_ov115_022622F8 * param0); -static void ov115_022628DC(UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1); -static void ov115_022628EC(UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1); -static void ov115_0226294C(UnkStruct_ov115_022622F8 * param0, const VecFx32 * param1); -static void ov115_02262974(UnkStruct_ov115_02260D78 * param0); -static void ov115_02262990(UnkStruct_ov115_02260D78 * param0); -static void ov115_02262B70(UnkStruct_ov115_02260D78 * param0); -static BOOL ov115_02262C60(UnkStruct_ov115_02260D78 * param0); -static void ov115_02262CA4(UnkStruct_ov115_02262CA4 * param0); -static void ov115_02262CBC(UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 param1); -static BOOL ov115_02262D0C(UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 * param1); -static BOOL ov115_02262D3C(UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 * param1); -static BOOL ov115_02262D58(UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 * param1); -static u32 ov115_02262D7C(UnkStruct_ov115_02262CA4 * param0); -static void ov115_02262D90(UnkStruct_ov115_02260D78 * param0); -static void ov115_02262DB0(UnkStruct_ov115_02262E64 * param0, const UnkStruct_ov115_02262F50 * param1, const UnkStruct_ov115_022612BC * param2); -static void ov115_02262DC4(UnkStruct_ov115_02262E64 * param0, const UnkStruct_ov115_02262F50 * param1, const UnkStruct_ov115_022612BC * param2, u16 param3, u16 param4); -static BOOL ov115_02262E64(UnkStruct_ov115_02262E64 * param0); -static void ov115_02262EFC(UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02262E64 * param1); -static void ov115_02262F04(UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02262DC4 * param1); -static void ov115_02262F50(const UnkStruct_ov115_02262F50 * param0, const UnkStruct_ov115_022612BC * param1, u32 param2, UnkStruct_ov115_02262DC4 * param3); -static void ov115_02262FB4(UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2); -static void ov115_022630DC(UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_02261ADC * param1); -static void ov115_02263130(UnkStruct_ov115_02263130 * param0); -static BOOL ov115_02263150(UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_02260D78 * param1); -static void ov115_0226327C(UnkStruct_ov115_022632C8 * param0); -static void ov115_02263294(UnkStruct_ov115_022632C8 * param0, u32 param1, u32 param2); -static void ov115_022632C8(UnkStruct_ov115_022632C8 * param0); -static u32 ov115_022632D8(const UnkStruct_ov115_022632C8 * param0); -static BOOL ov115_022632DC(const UnkStruct_ov115_022632C8 * param0, u32 param1); -static void ov115_022633FC(UnkStruct_ov115_02260D78 * param0, u32 param1); -static void ov115_02263560(UnkStruct_ov115_02260D78 * param0); -static void ov115_02263640(const UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02261ADC * param1); -static void ov115_0226369C(const UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02261ADC * param1); +static void ov115_02261304(UnkStruct_ov115_02261304 *param0, fx32 param1, fx32 param2, fx32 param3, int param4); +static BOOL ov115_02261364(UnkStruct_ov115_02261304 *param0); +static void ov115_022613CC(u32 param0, u32 param1, u32 param2, s32 *param3, s32 *param4); +static void ov115_022613F8(UnkStruct_ov115_02260D78 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u32 param5); +static u32 ov115_022614F8(UnkStruct_ov115_02260D78 *param0); +static void ov115_02261520(UnkStruct_ov115_02261574 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2, u32 param3, u32 param4); +static void ov115_02261574(UnkStruct_ov115_02261574 *param0, UnkStruct_ov115_02261ADC *param1); +static void ov115_0226158C(UnkStruct_ov115_02261574 *param0, u32 param1, u32 param2, int param3); +static void ov115_02261598(UnkStruct_ov115_02261574 *param0); +static void ov115_022615B0(UnkStruct_ov115_022615B0 *param0, UnkStruct_ov115_02261520 *param1, UnkStruct_ov115_02261ADC *param2, u32 param3, u32 param4, u32 param5, u32 param6); +static void ov115_02261648(UnkStruct_ov115_022615B0 *param0); +static void ov115_02261660(UnkStruct_ov115_022615B0 *param0, u32 param1, u32 param2, int param3); +static void ov115_02261744(UnkStruct_ov115_022615B0 *param0); +static void ov115_0226177C(UnkStruct_ov115_022615B0 *param0, u32 param1); +static void ov115_022617D8(UnkStruct_ov115_022615B0 *param0, u32 param1); +static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1, const UnkStruct_ov115_02262F50 *param2, u32 param3, u32 param4, NARC *param5, u32 param6); +static void ov115_02261A04(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1); +static void ov115_02261A10(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1); +static BOOL ov115_02261A3C(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1); +static void ov115_02261A54(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1); +static void ov115_02261A74(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1); +static BOOL ov115_02261AA4(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1); +static void ov115_02261AB8(UnkStruct_ov115_02261ADC *param0, const UnkStruct_ov115_02261C18 *param1); +static void ov115_02261AC8(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3); +static void ov115_02261AD8(UnkStruct_ov115_02261ADC *param0, u32 param1); +static void ov115_02261ADC(UnkStruct_ov115_02261ADC *param0); +static BOOL ov115_02261AEC(UnkStruct_ov115_02261ADC *param0); +static BOOL ov115_02261B1C(UnkStruct_ov115_02261ADC *param0); +static void ov115_02261B34(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261C18 *param1); +static void ov115_02261BBC(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261C18 *param1); +static void ov115_02261C18(UnkStruct_ov115_02261C18 *param0, BOOL param1); +static void ov115_02261C1C(UnkStruct_ov115_02261C18 *param0, u16 param1); +static void ov115_02261C48(UnkStruct_ov115_02261C18 *param0, u16 param1); +static u32 ov115_02261D84(const UnkStruct_ov115_02261C18 *param0, const VecFx32 *param1, const VecFx32 *param2, VecFx32 *param3); +static BOOL ov115_02261EA8(const UnkStruct_ov115_02261C18 *param0, const VecFx32 *param1); +static fx32 ov115_02261F3C(const UnkStruct_ov115_02261C18 *param0, u16 param1); +static fx32 ov115_02261F68(const UnkStruct_ov115_02261C18 *param0, u16 param1); +static void ov115_02261F94(UnkStruct_ov115_02261C18 *param0, fx32 param1); +static void ov115_022620D8(UnkStruct_ov115_02261C18 *param0, u16 param1); +static void ov115_022620DC(UnkStruct_ov115_02261C18 *param0, fx32 param1); +static u16 ov115_022620E4(const UnkStruct_ov115_02261C18 *param0, s32 param1, s32 param2); +static u16 ov115_022620EC(const UnkStruct_ov115_02261C18 *param0, s32 param1, s32 param2); +static u16 ov115_022620F4(const UnkStruct_ov115_02261C18 *param0, s32 param1, s32 param2); +static void ov115_02262134(const UnkStruct_ov115_02262134 *param0, UnkStruct_ov115_02265AD0 *param1); +static void ov115_0226218C(const UnkStruct_ov115_02265AD0 *param0, UnkStruct_ov115_02262134 *param1); +static void ov115_022621DC(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_02262134 *param1, u32 param2); +static void ov115_022622EC(UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_022622F8 *param1, BOOL param2, u32 param3); +static void ov115_022622F8(UnkStruct_ov115_022622F8 *param0); +static void ov115_02262304(UnkStruct_ov115_02260D78 *param0); +static void ov115_02262354(UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_022622F8 *param1); +static void ov115_02262524(UnkStruct_ov115_02260D78 *param0); +static void ov115_02262540(UnkStruct_ov115_02260D78 *param0); +static void ov115_02262574(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1); +static void ov115_022625A8(UnkStruct_ov115_02260D78 *param0); +static BOOL ov115_022625C8(const UnkStruct_ov115_02260D78 *param0); +static fx32 ov115_022625F0(const UnkStruct_ov115_022622F8 *param0); +static void ov115_02262620(const UnkStruct_ov115_022622F8 *param0, VecFx32 *param1); +static void ov115_022626BC(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1, BOOL param2); +static void ov115_022626E0(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1, BOOL param2, fx32 param3, BOOL param4); +static void ov115_022627B4(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1); +static BOOL ov115_02262888(const UnkStruct_ov115_022622F8 *param0); +static BOOL ov115_022628A4(const UnkStruct_ov115_022622F8 *param0); +static BOOL ov115_022628B8(UnkStruct_ov115_022622F8 *param0); +static void ov115_022628DC(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1); +static void ov115_022628EC(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1); +static void ov115_0226294C(UnkStruct_ov115_022622F8 *param0, const VecFx32 *param1); +static void ov115_02262974(UnkStruct_ov115_02260D78 *param0); +static void ov115_02262990(UnkStruct_ov115_02260D78 *param0); +static void ov115_02262B70(UnkStruct_ov115_02260D78 *param0); +static BOOL ov115_02262C60(UnkStruct_ov115_02260D78 *param0); +static void ov115_02262CA4(UnkStruct_ov115_02262CA4 *param0); +static void ov115_02262CBC(UnkStruct_ov115_02262CA4 *param0, NNSG2dSVec2 param1); +static BOOL ov115_02262D0C(UnkStruct_ov115_02262CA4 *param0, NNSG2dSVec2 *param1); +static BOOL ov115_02262D3C(UnkStruct_ov115_02262CA4 *param0, NNSG2dSVec2 *param1); +static BOOL ov115_02262D58(UnkStruct_ov115_02262CA4 *param0, NNSG2dSVec2 *param1); +static u32 ov115_02262D7C(UnkStruct_ov115_02262CA4 *param0); +static void ov115_02262D90(UnkStruct_ov115_02260D78 *param0); +static void ov115_02262DB0(UnkStruct_ov115_02262E64 *param0, const UnkStruct_ov115_02262F50 *param1, const UnkStruct_ov115_022612BC *param2); +static void ov115_02262DC4(UnkStruct_ov115_02262E64 *param0, const UnkStruct_ov115_02262F50 *param1, const UnkStruct_ov115_022612BC *param2, u16 param3, u16 param4); +static BOOL ov115_02262E64(UnkStruct_ov115_02262E64 *param0); +static void ov115_02262EFC(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_02262E64 *param1); +static void ov115_02262F04(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_02262DC4 *param1); +static void ov115_02262F50(const UnkStruct_ov115_02262F50 *param0, const UnkStruct_ov115_022612BC *param1, u32 param2, UnkStruct_ov115_02262DC4 *param3); +static void ov115_02262FB4(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2); +static void ov115_022630DC(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_02261ADC *param1); +static void ov115_02263130(UnkStruct_ov115_02263130 *param0); +static BOOL ov115_02263150(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_02260D78 *param1); +static void ov115_0226327C(UnkStruct_ov115_022632C8 *param0); +static void ov115_02263294(UnkStruct_ov115_022632C8 *param0, u32 param1, u32 param2); +static void ov115_022632C8(UnkStruct_ov115_022632C8 *param0); +static u32 ov115_022632D8(const UnkStruct_ov115_022632C8 *param0); +static BOOL ov115_022632DC(const UnkStruct_ov115_022632C8 *param0, u32 param1); +static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 param1); +static void ov115_02263560(UnkStruct_ov115_02260D78 *param0); +static void ov115_02263640(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261ADC *param1); +static void ov115_0226369C(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261ADC *param1); static void ov115_02263308(void); static void ov115_02263328(void); -static void ov115_022633B4(UnkStruct_ov115_02261ADC * param0, u32 param1, u32 param2, u32 param3); -static void ov115_022633EC(UnkStruct_ov115_02261ADC * param0); -static void ov115_0226376C(UnkStruct_ov115_02261ADC * param0, u32 param1); -static void ov115_02263954(UnkStruct_ov115_02261ADC * param0); -static void ov115_02263990(UnkStruct_ov115_02261ADC * param0, u32 param1); -static void ov115_02263A3C(UnkStruct_ov115_02261ADC * param0); -static void ov115_02263BCC(UnkStruct_ov115_02261ADC * param0, u32 param1); -static void ov115_02263C04(UnkStruct_ov115_02261ADC * param0); -static void ov115_02263C24(UnkStruct_ov115_02261ADC * param0, u32 param1, u32 param2, u32 param3); -static void ov115_02263CC0(UnkStruct_ov115_02261ADC * param0); -static void ov115_02263CD0(UnkStruct_ov115_02261ADC * param0); -static void ov115_02263CD8(UnkStruct_ov115_02261ADC * param0, NARC * param1, u32 param2, u32 param3); -static void ov115_02263DF4(UnkStruct_ov115_02261ADC * param0); -static void ov115_02263A74(UnkStruct_ov115_02261ADC * param0, NARC * param1, u32 param2); -static void ov115_02263B78(UnkStruct_ov115_02261ADC * param0); -static void ov115_02263DF8(UnkStruct_ov115_02263DF8 * param0, NARC * param1, u32 param2, NNSFndAllocator * param3); -static void ov115_02263FF4(UnkStruct_ov115_02263DF8 * param0, NNSFndAllocator * param1); -static void ov115_02264044(UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1, int param2); -static void ov115_022640A4(UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1, int param2); -static void ov115_022640C0(UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1); -static void ov115_022640EC(UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1); -static void ov115_02264110(UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1); -static void ov115_02264134(UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1); -static void ov115_0226414C(UnkStruct_ov115_02263DF8 * param0, u32 param1); -static void ov115_02264190(UnkStruct_ov115_02263DF8 * param0, u32 param1); -static BOOL ov115_02264214(UnkStruct_ov115_02263DF8 * param0, fx32 param1); -static void ov115_0226422C(UnkStruct_ov115_02263DF8 * param0, BOOL param1); -static void ov115_0226425C(UnkStruct_ov115_02263DF8 * param0, BOOL param1); -static void ov115_02264268(UnkStruct_ov115_02263DF8 * param0, u32 param1); -static void ov115_02264270(UnkStruct_ov115_02263DF8 * param0); -static void ov115_022642F8(s16 param0, s16 param1, VecFx32 * param2); -static void ov115_02264324(const VecFx32 * param0, NNSG2dSVec2 * param1); -static void ov115_02264354(const VecFx32 * param0, VecFx32 * param1, u32 param2, u32 param3); -static void ov115_0226439C(const VecFx32 * param0, VecFx32 * param1, u32 param2, u32 param3); -static void ov115_022643EC(UnkStruct_ov115_02261ADC * param0, NARC * param1, u32 param2); -static void ov115_02264564(UnkStruct_ov115_02261ADC * param0); -static void ov115_02264620(UnkStruct_ov115_02261ADC * param0, const UnkStruct_ov115_022622F8 * param1, u32 param2, u32 param3); -static void ov115_0226464C(UnkStruct_ov115_02261ADC * param0, const UnkStruct_ov115_022622F8 * param1); -static void ov115_02264684(UnkStruct_ov115_02261ADC * param0, u32 param1); -static void ov115_022646BC(UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1, u32 param2); -static void ov115_02264728(UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1); -static void ov115_02264740(UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1, const UnkStruct_ov115_022622F8 * param2, u32 param3); -static void ov115_0226477C(UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1, const UnkStruct_ov115_022622F8 * param2); -static void ov115_022647A0(UnkStruct_ov115_022647A0 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2); -static void ov115_02264848(UnkStruct_ov115_022647A0 * param0); -static void ov115_02264908(UnkStruct_ov115_022647A0 * param0); -static void ov115_02264924(UnkStruct_ov115_022647A0 * param0); -static UnkStruct_ov115_022647A0 * ov115_02264948(UnkStruct_ov115_02261ADC * param0); -static BOOL ov115_02264980(UnkStruct_ov115_022647A0 * param0, const UnkStruct_ov115_022622F8 * param1, u32 param2); -static void ov115_022649F0(UnkStruct_ov115_022647A0 * param0, UnkStruct_ov115_02261ADC * param1); -static UnkStruct_020170F4 * ov115_02264A40(const UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02264A40 * param1); -static void ov115_02264A54(UnkStruct_ov115_022647A0 * param0); -static void ov115_02264B40(UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_02264BA0 * param1, u32 param2, u32 param3); -static void ov115_02264BA0(UnkStruct_ov115_02264BA0 * param0); -static void ov115_02264BAC(UnkStruct_ov115_02264BA0 * param0); -static void ov115_02264BC0(UnkStruct_ov115_02264BA0 * param0); -static void ov115_02264BF8(UnkStruct_ov115_02264BA0 * param0); -static void ov115_02264BD8(UnkStruct_ov115_02264BA0 * param0, s32 param1, s32 param2); -static void ov115_02264C0C(UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_02264C90 * param1, u32 param2, u32 param3); -static void ov115_02264C78(UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_02264C90 * param1); -static void ov115_02264C90(UnkStruct_ov115_02264C90 * param0); -static void ov115_02264D80(UnkStruct_ov115_02264C90 * param0, s32 param1, s32 param2); -static void ov115_02264DD8(int param0, int param1, int param2, int param3, int param4, s32 * param5, s32 * param6); -static void ov115_02264E48(UnkStruct_ov115_02264FA0 * param0, UnkStruct_ov115_02261ADC * param1, NARC * param2, int param3, u32 param4, u32 param5, NNSFndAllocator * param6); -static void ov115_02264F68(UnkStruct_ov115_02264FA0 * param0, UnkStruct_ov115_02261ADC * param1, NNSFndAllocator * param2); -static void ov115_02264FA0(UnkStruct_ov115_02264FA0 * param0); -static void ov115_022650C8(UnkStruct_ov115_02264FA0 * param0); -static void ov115_022650F8(UnkStruct_ov115_02264FA0 * param0, fx32 param1); -static void ov115_02265100(const VecFx32 * param0, const VecFx32 * param1, const VecFx32 * param2, fx32 param3, VecFx32 * param4, fx32 * param5); -static void ov115_02265274(UnkStruct_ov115_02261ADC * param0, fx32 param1); -static void ov115_0226527C(UnkStruct_ov115_02261ADC * param0, u16 param1); -static void ov115_022652A4(UnkStruct_ov115_022653CC * param0, u8 param1); -static void ov115_022652C0(UnkStruct_ov115_022653CC * param0, UnkStruct_ov115_02261ADC * param1); -static void ov115_022653CC(UnkStruct_ov115_022653CC * param0); -static void ov115_022653F4(UnkStruct_ov115_02261ADC * param0, s16 param1, u16 param2); -static void ov115_02265478(UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_02261ADC * param1, NARC * param2, u32 param3); -static void ov115_02265688(UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_02261ADC * param1); -static void ov115_02265700(UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2); -static void ov115_02265788(UnkStruct_ov115_02265788 * param0); -static void ov115_022657A8(UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2); -static void ov115_02265820(UnkStruct_ov115_02265788 * param0); -static void ov115_022658E0(UnkStruct_ov115_022658E0 * param0); -static void ov115_022658F8(UnkStruct_ov115_022658E0 * param0, UnkStruct_ov115_02264FA0 * param1, UnkStruct_ov115_02263DF8 * param2); -static void ov115_02265A08(UnkStruct_ov115_022658E0 * param0); +static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3); +static void ov115_022633EC(UnkStruct_ov115_02261ADC *param0); +static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1); +static void ov115_02263954(UnkStruct_ov115_02261ADC *param0); +static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 param1); +static void ov115_02263A3C(UnkStruct_ov115_02261ADC *param0); +static void ov115_02263BCC(UnkStruct_ov115_02261ADC *param0, u32 param1); +static void ov115_02263C04(UnkStruct_ov115_02261ADC *param0); +static void ov115_02263C24(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3); +static void ov115_02263CC0(UnkStruct_ov115_02261ADC *param0); +static void ov115_02263CD0(UnkStruct_ov115_02261ADC *param0); +static void ov115_02263CD8(UnkStruct_ov115_02261ADC *param0, NARC *param1, u32 param2, u32 param3); +static void ov115_02263DF4(UnkStruct_ov115_02261ADC *param0); +static void ov115_02263A74(UnkStruct_ov115_02261ADC *param0, NARC *param1, u32 param2); +static void ov115_02263B78(UnkStruct_ov115_02261ADC *param0); +static void ov115_02263DF8(UnkStruct_ov115_02263DF8 *param0, NARC *param1, u32 param2, NNSFndAllocator *param3); +static void ov115_02263FF4(UnkStruct_ov115_02263DF8 *param0, NNSFndAllocator *param1); +static void ov115_02264044(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1, int param2); +static void ov115_022640A4(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1, int param2); +static void ov115_022640C0(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1); +static void ov115_022640EC(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1); +static void ov115_02264110(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1); +static void ov115_02264134(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1); +static void ov115_0226414C(UnkStruct_ov115_02263DF8 *param0, u32 param1); +static void ov115_02264190(UnkStruct_ov115_02263DF8 *param0, u32 param1); +static BOOL ov115_02264214(UnkStruct_ov115_02263DF8 *param0, fx32 param1); +static void ov115_0226422C(UnkStruct_ov115_02263DF8 *param0, BOOL param1); +static void ov115_0226425C(UnkStruct_ov115_02263DF8 *param0, BOOL param1); +static void ov115_02264268(UnkStruct_ov115_02263DF8 *param0, u32 param1); +static void ov115_02264270(UnkStruct_ov115_02263DF8 *param0); +static void ov115_022642F8(s16 param0, s16 param1, VecFx32 *param2); +static void ov115_02264324(const VecFx32 *param0, NNSG2dSVec2 *param1); +static void ov115_02264354(const VecFx32 *param0, VecFx32 *param1, u32 param2, u32 param3); +static void ov115_0226439C(const VecFx32 *param0, VecFx32 *param1, u32 param2, u32 param3); +static void ov115_022643EC(UnkStruct_ov115_02261ADC *param0, NARC *param1, u32 param2); +static void ov115_02264564(UnkStruct_ov115_02261ADC *param0); +static void ov115_02264620(UnkStruct_ov115_02261ADC *param0, const UnkStruct_ov115_022622F8 *param1, u32 param2, u32 param3); +static void ov115_0226464C(UnkStruct_ov115_02261ADC *param0, const UnkStruct_ov115_022622F8 *param1); +static void ov115_02264684(UnkStruct_ov115_02261ADC *param0, u32 param1); +static void ov115_022646BC(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1, u32 param2); +static void ov115_02264728(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1); +static void ov115_02264740(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1, const UnkStruct_ov115_022622F8 *param2, u32 param3); +static void ov115_0226477C(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1, const UnkStruct_ov115_022622F8 *param2); +static void ov115_022647A0(UnkStruct_ov115_022647A0 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2); +static void ov115_02264848(UnkStruct_ov115_022647A0 *param0); +static void ov115_02264908(UnkStruct_ov115_022647A0 *param0); +static void ov115_02264924(UnkStruct_ov115_022647A0 *param0); +static UnkStruct_ov115_022647A0 *ov115_02264948(UnkStruct_ov115_02261ADC *param0); +static BOOL ov115_02264980(UnkStruct_ov115_022647A0 *param0, const UnkStruct_ov115_022622F8 *param1, u32 param2); +static void ov115_022649F0(UnkStruct_ov115_022647A0 *param0, UnkStruct_ov115_02261ADC *param1); +static UnkStruct_020170F4 *ov115_02264A40(const UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02264A40 *param1); +static void ov115_02264A54(UnkStruct_ov115_022647A0 *param0); +static void ov115_02264B40(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_02264BA0 *param1, u32 param2, u32 param3); +static void ov115_02264BA0(UnkStruct_ov115_02264BA0 *param0); +static void ov115_02264BAC(UnkStruct_ov115_02264BA0 *param0); +static void ov115_02264BC0(UnkStruct_ov115_02264BA0 *param0); +static void ov115_02264BF8(UnkStruct_ov115_02264BA0 *param0); +static void ov115_02264BD8(UnkStruct_ov115_02264BA0 *param0, s32 param1, s32 param2); +static void ov115_02264C0C(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_02264C90 *param1, u32 param2, u32 param3); +static void ov115_02264C78(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_02264C90 *param1); +static void ov115_02264C90(UnkStruct_ov115_02264C90 *param0); +static void ov115_02264D80(UnkStruct_ov115_02264C90 *param0, s32 param1, s32 param2); +static void ov115_02264DD8(int param0, int param1, int param2, int param3, int param4, s32 *param5, s32 *param6); +static void ov115_02264E48(UnkStruct_ov115_02264FA0 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, int param3, u32 param4, u32 param5, NNSFndAllocator *param6); +static void ov115_02264F68(UnkStruct_ov115_02264FA0 *param0, UnkStruct_ov115_02261ADC *param1, NNSFndAllocator *param2); +static void ov115_02264FA0(UnkStruct_ov115_02264FA0 *param0); +static void ov115_022650C8(UnkStruct_ov115_02264FA0 *param0); +static void ov115_022650F8(UnkStruct_ov115_02264FA0 *param0, fx32 param1); +static void ov115_02265100(const VecFx32 *param0, const VecFx32 *param1, const VecFx32 *param2, fx32 param3, VecFx32 *param4, fx32 *param5); +static void ov115_02265274(UnkStruct_ov115_02261ADC *param0, fx32 param1); +static void ov115_0226527C(UnkStruct_ov115_02261ADC *param0, u16 param1); +static void ov115_022652A4(UnkStruct_ov115_022653CC *param0, u8 param1); +static void ov115_022652C0(UnkStruct_ov115_022653CC *param0, UnkStruct_ov115_02261ADC *param1); +static void ov115_022653CC(UnkStruct_ov115_022653CC *param0); +static void ov115_022653F4(UnkStruct_ov115_02261ADC *param0, s16 param1, u16 param2); +static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, u32 param3); +static void ov115_02265688(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1); +static void ov115_02265700(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2); +static void ov115_02265788(UnkStruct_ov115_02265788 *param0); +static void ov115_022657A8(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2); +static void ov115_02265820(UnkStruct_ov115_02265788 *param0); +static void ov115_022658E0(UnkStruct_ov115_022658E0 *param0); +static void ov115_022658F8(UnkStruct_ov115_022658E0 *param0, UnkStruct_ov115_02264FA0 *param1, UnkStruct_ov115_02263DF8 *param2); +static void ov115_02265A08(UnkStruct_ov115_022658E0 *param0); static const u32 Unk_ov115_02265B38[3] = { 0x0, @@ -536,11 +534,11 @@ static const u32 Unk_ov115_02265B38[3] = { }; static const u8 Unk_ov115_02265B0A[5][2] = { - {0x0, 0x0}, - {0x1, 0xA}, - {0xB, 0x14}, - {0x15, 0x1E}, - {0x1F, 0x28} + { 0x0, 0x0 }, + { 0x1, 0xA }, + { 0xB, 0x14 }, + { 0x15, 0x1E }, + { 0x1F, 0x28 } }; static const NNSG3dResName Unk_ov115_022660A4[6][15] = { @@ -548,7 +546,7 @@ static const NNSG3dResName Unk_ov115_022660A4[6][15] = { "polySurface2", "polySurface3", "pTorus2", - "null1" + "null1", }, { "polySurface7", @@ -556,11 +554,11 @@ static const NNSG3dResName Unk_ov115_022660A4[6][15] = { "pSphere2", "pSphere3", "pSphere6", - "pSphere7" + "pSphere7", }, { "polySurface13", - "pSphere7" + "pSphere7", }, { "null1", @@ -577,7 +575,7 @@ static const NNSG3dResName Unk_ov115_022660A4[6][15] = { "polySurface2", "polySurface3", "polySurface7", - "polySurface12" + "polySurface12", }, { "polySurface7", @@ -586,7 +584,7 @@ static const NNSG3dResName Unk_ov115_022660A4[6][15] = { "pSphere3", "pSphere6", "pSphere7", - "null1" + "null1", }, { "polySurface7", @@ -594,8 +592,8 @@ static const NNSG3dResName Unk_ov115_022660A4[6][15] = { "pSphere2", "pSphere3", "pSphere6", - "pSphere7" - } + "pSphere7", + }, }; static const u8 Unk_ov115_02266644[6] = { @@ -630,88 +628,88 @@ static const u32 Unk_ov115_02265B2C[3] = { }; static const u16 Unk_ov115_02265C3C[4][4] = { - {0x0, 0x0, 0x0, 0x0}, - {0x0, 0x7FFF, 0x0, 0x0}, - {0x0, 0x5555, 0xAAAA, 0x0}, - {0x0, 0x7FFF, 0x3FFF, 0xBFFF} + { 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x7FFF, 0x0, 0x0 }, + { 0x0, 0x5555, 0xAAAA, 0x0 }, + { 0x0, 0x7FFF, 0x3FFF, 0xBFFF } }; static const u16 Unk_ov115_02265C5C[4][4] = { - {0x0, 0x0, 0x0, 0x0}, - {0x7FFF, 0x0, 0x0, 0x0}, - {0x7FFF, 0xD554, 0x2AAA, 0x0}, - {0x7FFF, 0x0, 0xBFFF, 0x3FFF} + { 0x0, 0x0, 0x0, 0x0 }, + { 0x7FFF, 0x0, 0x0, 0x0 }, + { 0x7FFF, 0xD554, 0x2AAA, 0x0 }, + { 0x7FFF, 0x0, 0xBFFF, 0x3FFF } }; static const UnkStruct_ov92_021D28C0 Unk_ov115_02265CA4[4][4][4] = { { - {0x0}, + { 0x0 }, { - {0x0, 0x0}, - {0xC, 0x2} + { 0x0, 0x0 }, + { 0xC, 0x2 }, }, { - {0x0, 0x0}, - {0x17, 0x4}, - {0x1, 0x4} + { 0x0, 0x0 }, + { 0x17, 0x4 }, + { 0x1, 0x4 }, }, { - {0x0, 0x0}, - {0xC, 0x2}, - {0x17, 0x6}, - {0x1, 0x6} - } + { 0x0, 0x0 }, + { 0xC, 0x2 }, + { 0x17, 0x6 }, + { 0x1, 0x6 }, + }, }, { - {0x0}, + { 0x0 }, { - {0xC, 0x2}, - {0x0, 0x0} + { 0xC, 0x2 }, + { 0x0, 0x0 }, }, { - {0x1, 0x4}, - {0x0, 0x0}, - {0x17, 0x4} + { 0x1, 0x4 }, + { 0x0, 0x0 }, + { 0x17, 0x4 }, }, { - {0xC, 0x2}, - {0x0, 0x0}, - {0x1, 0x6}, - {0x17, 0x6} - } + { 0xC, 0x2 }, + { 0x0, 0x0 }, + { 0x1, 0x6 }, + { 0x17, 0x6 }, + }, }, { - {0x0}, + { 0x0 }, { - {0x0} + { 0x0 }, }, { - {0x17, 0x4}, - {0x1, 0x4}, - {0x0, 0x0} + { 0x17, 0x4 }, + { 0x1, 0x4 }, + { 0x0, 0x0 }, }, { - {0x1, 0x6}, - {0x17, 0x6}, - {0x0, 0x0}, - {0xC, 0x2} - } + { 0x1, 0x6 }, + { 0x17, 0x6 }, + { 0x0, 0x0 }, + { 0xC, 0x2 }, + }, }, { - {0x0}, + { 0x0 }, { - {0x0} + { 0x0 }, }, { - {0x0, 0x0} + { 0x0, 0x0 }, }, { - {0x17, 0x6}, - {0x1, 0x6}, - {0xC, 0x2}, - {0x0, 0x0} - } - } + { 0x17, 0x6 }, + { 0x1, 0x6 }, + { 0xC, 0x2 }, + { 0x0, 0x0 }, + }, + }, }; static TPData Unk_ov115_022666C0[8]; @@ -731,9 +729,9 @@ static const s16 Unk_ov115_02265B7C[12] = { 0x4D }; -UnkStruct_ov115_02260D78 * ov115_02260CEC (u32 param0, u32 param1, u32 param2, u32 param3, UnkStruct_ov115_02262F50 * param4) +UnkStruct_ov115_02260D78 *ov115_02260CEC(u32 param0, u32 param1, u32 param2, u32 param3, UnkStruct_ov115_02262F50 *param4) { - UnkStruct_ov115_02260D78 * v0; + UnkStruct_ov115_02260D78 *v0; u32 v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_ov115_02260D78)); @@ -757,7 +755,7 @@ UnkStruct_ov115_02260D78 * ov115_02260CEC (u32 param0, u32 param1, u32 param2, u return v0; } -void ov115_02260D78 (UnkStruct_ov115_02260D78 * param0) +void ov115_02260D78(UnkStruct_ov115_02260D78 *param0) { u32 v0; @@ -769,7 +767,7 @@ void ov115_02260D78 (UnkStruct_ov115_02260D78 * param0) Heap_FreeToHeap(param0); } -BOOL ov115_02260DAC (UnkStruct_ov115_02260D78 * param0, u32 param1) +BOOL ov115_02260DAC(UnkStruct_ov115_02260D78 *param0, u32 param1) { BOOL v0; BOOL v1 = 1; @@ -864,7 +862,7 @@ BOOL ov115_02260DAC (UnkStruct_ov115_02260D78 * param0, u32 param1) return v1; } -BOOL ov115_02260F70 (UnkStruct_ov115_02260D78 * param0, u32 param1) +BOOL ov115_02260F70(UnkStruct_ov115_02260D78 *param0, u32 param1) { BOOL v0; BOOL v1 = 1; @@ -940,7 +938,7 @@ BOOL ov115_02260F70 (UnkStruct_ov115_02260D78 * param0, u32 param1) return v1; } -BOOL ov115_022610D4 (UnkStruct_ov115_02260D78 * param0) +BOOL ov115_022610D4(UnkStruct_ov115_02260D78 *param0) { BOOL v0; @@ -999,19 +997,19 @@ BOOL ov115_022610D4 (UnkStruct_ov115_02260D78 * param0) return 0; } -void ov115_022611C8 (UnkStruct_ov115_02260D78 * param0) +void ov115_022611C8(UnkStruct_ov115_02260D78 *param0) { sub_0201C2B8(param0->unk_1AB4.unk_00); sub_0201DCAC(); sub_0200A858(); } -s32 ov115_022611E0 (const UnkStruct_ov115_02260D78 * param0) +s32 ov115_022611E0(const UnkStruct_ov115_02260D78 *param0) { return param0->unk_08; } -void ov115_022611E4 (UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02265AD0 * param1) +void ov115_022611E4(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_02265AD0 *param1) { UnkStruct_ov115_02262134 v0; @@ -1025,7 +1023,7 @@ void ov115_022611E4 (UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02 } } -BOOL ov115_02261224 (UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02265AD0 * param1) +BOOL ov115_02261224(UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02265AD0 *param1) { int v0; @@ -1040,17 +1038,17 @@ BOOL ov115_02261224 (UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02265AD0 return 0; } -void ov115_02261260 (UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02265AD4 * param1) +void ov115_02261260(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_02265AD4 *param1) { param0->unk_8680 = *param1; } -u32 ov115_02261274 (const UnkStruct_ov115_02260D78 * param0) +u32 ov115_02261274(const UnkStruct_ov115_02260D78 *param0) { return param0->unk_18; } -void ov115_02261278 (UnkStruct_ov115_02260D78 * param0, u32 param1) +void ov115_02261278(UnkStruct_ov115_02260D78 *param0, u32 param1) { param0->unk_8726 = param0->unk_8724; param0->unk_8724 = param1; @@ -1058,12 +1056,12 @@ void ov115_02261278 (UnkStruct_ov115_02260D78 * param0, u32 param1) ov115_02262DC4(¶m0->unk_86D4, param0->unk_8720, ¶m0->unk_8728, param0->unk_8726, param0->unk_8724); } -void ov115_022612AC (UnkStruct_ov115_02260D78 * param0, u32 param1, u32 param2) +void ov115_022612AC(UnkStruct_ov115_02260D78 *param0, u32 param1, u32 param2) { ov115_02263294(¶m0->unk_8770, param1, param2); } -void ov115_022612BC (UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_022612BC * param1) +void ov115_022612BC(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_022612BC *param1) { param0->unk_8728 = *param1; param0->unk_872C = 1; @@ -1072,7 +1070,7 @@ void ov115_022612BC (UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02 ov115_02262EFC(param0, ¶m0->unk_86D4); } -static void ov115_02261304 (UnkStruct_ov115_02261304 * param0, fx32 param1, fx32 param2, fx32 param3, int param4) +static void ov115_02261304(UnkStruct_ov115_02261304 *param0, fx32 param1, fx32 param2, fx32 param3, int param4) { fx32 v0; fx32 v1; @@ -1094,7 +1092,7 @@ static void ov115_02261304 (UnkStruct_ov115_02261304 * param0, fx32 param1, fx32 param0->unk_14 = param4; } -static BOOL ov115_02261364 (UnkStruct_ov115_02261304 * param0) +static BOOL ov115_02261364(UnkStruct_ov115_02261304 *param0) { fx32 v0; fx32 v1; @@ -1118,75 +1116,75 @@ static BOOL ov115_02261364 (UnkStruct_ov115_02261304 * param0) return 1; } -static void ov115_022613CC (u32 param0, u32 param1, u32 param2, s32 * param3, s32 * param4) +static void ov115_022613CC(u32 param0, u32 param1, u32 param2, s32 *param3, s32 *param4) { static const UnkStruct_ov92_021D28C0 v0[4][4][4] = { { - {0}, + { 0 }, { - {128, 144}, - {128, 48}, + { 128, 144 }, + { 128, 48 }, }, { - {128, 144}, - {208, 64}, - {48, 64}, + { 128, 144 }, + { 208, 64 }, + { 48, 64 }, }, { - {128, 144}, - {128, 48}, - {208, 96}, - {48, 96}, + { 128, 144 }, + { 128, 48 }, + { 208, 96 }, + { 48, 96 }, }, }, { - {0}, + { 0 }, { - {128, 48}, - {128, 144}, + { 128, 48 }, + { 128, 144 }, }, { - {48, 64}, - {128, 144}, - {208, 64}, + { 48, 64 }, + { 128, 144 }, + { 208, 64 }, }, { - {128, 48}, - {128, 144}, - {48, 96}, - {208, 96}, + { 128, 48 }, + { 128, 144 }, + { 48, 96 }, + { 208, 96 }, }, }, { - {0}, + { 0 }, { - {0}, + { 0 }, }, { - {208, 64}, - {48, 64}, - {128, 144}, + { 208, 64 }, + { 48, 64 }, + { 128, 144 }, }, { - {48, 96}, - {208, 96}, - {128, 144}, - {128, 48}, + { 48, 96 }, + { 208, 96 }, + { 128, 144 }, + { 128, 48 }, }, }, { - {0}, + { 0 }, { - {0}, + { 0 }, }, { - {0, 0}, + { 0, 0 }, }, { - {208, 96}, - {48, 96}, - {128, 48}, - {128, 144}, + { 208, 96 }, + { 48, 96 }, + { 128, 48 }, + { 128, 144 }, }, }, }; @@ -1195,7 +1193,7 @@ static void ov115_022613CC (u32 param0, u32 param1, u32 param2, s32 * param3, s3 *param4 = v0[param1][param0 - 1][param2].unk_04; } -static void ov115_022613F8 (UnkStruct_ov115_02260D78 * param0, u16 param1, u16 param2, u16 param3, u16 param4, u32 param5) +static void ov115_022613F8(UnkStruct_ov115_02260D78 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u32 param5) { UnkStruct_ov115_02262134 v0; NNSG2dSVec2 v1; @@ -1236,7 +1234,7 @@ static void ov115_022613F8 (UnkStruct_ov115_02260D78 * param0, u16 param1, u16 p ov115_022621DC(param0, &v0, param5); } -static u32 ov115_022614F8 (UnkStruct_ov115_02260D78 * param0) +static u32 ov115_022614F8(UnkStruct_ov115_02260D78 *param0) { u8 v0; u32 v1; @@ -1256,7 +1254,7 @@ static u32 ov115_022614F8 (UnkStruct_ov115_02260D78 * param0) return v1; } -static void ov115_02261520 (UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2, u32 param3, u32 param4) +static void ov115_02261520(UnkStruct_ov115_02261574 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2, u32 param3, u32 param4) { UnkStruct_ov115_02261520 v0; int v1, v2; @@ -1279,7 +1277,7 @@ static void ov115_02261520 (UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_0 } } -static void ov115_02261574 (UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_02261574(UnkStruct_ov115_02261574 *param0, UnkStruct_ov115_02261ADC *param1) { int v0, v1; @@ -1288,12 +1286,12 @@ static void ov115_02261574 (UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_0 } } -static void ov115_0226158C (UnkStruct_ov115_02261574 * param0, u32 param1, u32 param2, int param3) +static void ov115_0226158C(UnkStruct_ov115_02261574 *param0, u32 param1, u32 param2, int param3) { ov115_02261660(¶m0->unk_00[param1], param1, param2, param3); } -static void ov115_02261598 (UnkStruct_ov115_02261574 * param0) +static void ov115_02261598(UnkStruct_ov115_02261574 *param0) { int v0; @@ -1302,7 +1300,7 @@ static void ov115_02261598 (UnkStruct_ov115_02261574 * param0) } } -static void ov115_022615B0 (UnkStruct_ov115_022615B0 * param0, UnkStruct_ov115_02261520 * param1, UnkStruct_ov115_02261ADC * param2, u32 param3, u32 param4, u32 param5, u32 param6) +static void ov115_022615B0(UnkStruct_ov115_022615B0 *param0, UnkStruct_ov115_02261520 *param1, UnkStruct_ov115_02261ADC *param2, u32 param3, u32 param4, u32 param5, u32 param6) { int v0; s32 v1, v2; @@ -1329,7 +1327,7 @@ static void ov115_022615B0 (UnkStruct_ov115_022615B0 * param0, UnkStruct_ov115_0 } } -static void ov115_02261648 (UnkStruct_ov115_022615B0 * param0) +static void ov115_02261648(UnkStruct_ov115_022615B0 *param0) { int v0; @@ -1338,7 +1336,7 @@ static void ov115_02261648 (UnkStruct_ov115_022615B0 * param0) } } -static void ov115_02261660 (UnkStruct_ov115_022615B0 * param0, u32 param1, u32 param2, int param3) +static void ov115_02261660(UnkStruct_ov115_022615B0 *param0, u32 param1, u32 param2, int param3) { int v0; int v1; @@ -1400,7 +1398,7 @@ static void ov115_02261660 (UnkStruct_ov115_022615B0 * param0, u32 param1, u32 p sub_02021E90(param0->unk_00[v1], v6); } -static void ov115_02261744 (UnkStruct_ov115_022615B0 * param0) +static void ov115_02261744(UnkStruct_ov115_022615B0 *param0) { int v0; @@ -1417,7 +1415,7 @@ static void ov115_02261744 (UnkStruct_ov115_022615B0 * param0) } } -static void ov115_0226177C (UnkStruct_ov115_022615B0 * param0, u32 param1) +static void ov115_0226177C(UnkStruct_ov115_022615B0 *param0, u32 param1) { fx32 v0; VecFx32 v1; @@ -1429,19 +1427,19 @@ static void ov115_0226177C (UnkStruct_ov115_022615B0 * param0, u32 param1) sub_02021C50(param0->unk_00[param1], &v1); } -static void ov115_022617D8 (UnkStruct_ov115_022615B0 * param0, u32 param1) +static void ov115_022617D8(UnkStruct_ov115_022615B0 *param0, u32 param1) { sub_02021CAC(param0->unk_00[param1], 0); } -static void ov115_022617E8 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1, const UnkStruct_ov115_02262F50 * param2, u32 param3, u32 param4, NARC * param5, u32 param6) +static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1, const UnkStruct_ov115_02262F50 *param2, u32 param3, u32 param4, NARC *param5, u32 param6) { - Strbuf* v0; + Strbuf *v0; UnkStruct_ov115_02261520 v1; memset(param0, 0, sizeof(UnkStruct_ov115_022617E8)); - BGL_AddWindow(param1->unk_00, ¶m0->unk_0C, 1, 2, 19, 28, 4, 5, ((1 + 9))); + BGL_AddWindow(param1->unk_00, ¶m0->unk_0C, 1, 2, 19, 28, 4, 5, (1 + 9)); BGL_WindowColor(¶m0->unk_0C, 15, 0, 0, 28 * 8, 4 * 8); v0 = Strbuf_Init(128, param6); @@ -1458,7 +1456,7 @@ static void ov115_022617E8 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_0 s32 v3, v4; Window v5; u32 v6; - Strbuf* v7; + Strbuf *v7; u32 v8; u32 v9; u32 v10; @@ -1505,12 +1503,12 @@ static void ov115_022617E8 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_0 GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } -static void ov115_02261A04 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_02261A04(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1) { BGL_DeleteWindow(¶m0->unk_0C); } -static void ov115_02261A10 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_02261A10(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1) { Window_Show(¶m0->unk_0C, 0, 1, 4); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1); @@ -1518,7 +1516,7 @@ static void ov115_02261A10 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_0 ov114_0225CB8C(param1->unk_754); } -static BOOL ov115_02261A3C (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1) +static BOOL ov115_02261A3C(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1) { BOOL v0; @@ -1531,53 +1529,53 @@ static BOOL ov115_02261A3C (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_0 return 1; } -static void ov115_02261A54 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_02261A54(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1) { Window_Clear(¶m0->unk_0C, 1); sub_0201AD10(¶m0->unk_0C); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0); } -static void ov115_02261A74 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_02261A74(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1) { ov115_02264190(¶m1->unk_524, 1); sub_02017240(¶m1->unk_524.unk_198[1], (FX32_CONST(180))); ov115_0226422C(¶m1->unk_524, 1); } -static BOOL ov115_02261AA4 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1) +static BOOL ov115_02261AA4(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_02261ADC *param1) { param0->unk_04++; - if ((param0->unk_04 >= 8)) { + if (param0->unk_04 >= 8) { return 0; } return 1; } -static void ov115_02261AB8 (UnkStruct_ov115_02261ADC * param0, const UnkStruct_ov115_02261C18 * param1) +static void ov115_02261AB8(UnkStruct_ov115_02261ADC *param0, const UnkStruct_ov115_02261C18 *param1) { ov115_022640C0(¶m0->unk_524, param1); } -static void ov115_02261AC8 (UnkStruct_ov115_02261ADC * param0, u32 param1, u32 param2, u32 param3) +static void ov115_02261AC8(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3) { param0->unk_504.unk_00 = 0; param0->unk_504.unk_04 = 0; } -static void ov115_02261AD8 (UnkStruct_ov115_02261ADC * param0, u32 param1) +static void ov115_02261AD8(UnkStruct_ov115_02261ADC *param0, u32 param1) { return; } -static void ov115_02261ADC (UnkStruct_ov115_02261ADC * param0) +static void ov115_02261ADC(UnkStruct_ov115_02261ADC *param0) { ov115_02264190(¶m0->unk_524, 5); } -static BOOL ov115_02261AEC (UnkStruct_ov115_02261ADC * param0) +static BOOL ov115_02261AEC(UnkStruct_ov115_02261ADC *param0) { BOOL v0; @@ -1594,7 +1592,7 @@ static BOOL ov115_02261AEC (UnkStruct_ov115_02261ADC * param0) return 0; } -static BOOL ov115_02261B1C (UnkStruct_ov115_02261ADC * param0) +static BOOL ov115_02261B1C(UnkStruct_ov115_02261ADC *param0) { BOOL v0; @@ -1607,12 +1605,12 @@ static BOOL ov115_02261B1C (UnkStruct_ov115_02261ADC * param0) return 0; } -static void ov115_02261B34 (const UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02261C18 * param1) +static void ov115_02261B34(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261C18 *param1) { param1->unk_06 = 0; - ov115_02261C48(param1, (((180 * 0xffff) / 360))); - ov115_02261C1C(param1, (((20 * 0xffff) / 360))); + ov115_02261C48(param1, ((180 * 0xffff) / 360)); + ov115_02261C1C(param1, ((20 * 0xffff) / 360)); param1->unk_00 = 0; param1->unk_01 = 1; @@ -1627,9 +1625,9 @@ static void ov115_02261B34 (const UnkStruct_ov115_02260D78 * param0, UnkStruct_o param1->unk_E4 = param1->unk_C0; } -static void ov115_02261BBC (const UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02261C18 * param1) +static void ov115_02261BBC(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261C18 *param1) { - static u16(*const v0[3])(const UnkStruct_ov115_02261C18 *, s32, s32) = { + static u16 (*const v0[3])(const UnkStruct_ov115_02261C18 *, s32, s32) = { ov115_022620E4, ov115_022620EC, ov115_022620F4, @@ -1654,12 +1652,12 @@ static void ov115_02261BBC (const UnkStruct_ov115_02260D78 * param0, UnkStruct_o ov115_02261C48(param1, param1->unk_02 + param1->unk_06); } -static void ov115_02261C18 (UnkStruct_ov115_02261C18 * param0, BOOL param1) +static void ov115_02261C18(UnkStruct_ov115_02261C18 *param0, BOOL param1) { param0->unk_00 = param1; } -static void ov115_02261C1C (UnkStruct_ov115_02261C18 * param0, u16 param1) +static void ov115_02261C1C(UnkStruct_ov115_02261C18 *param0, u16 param1) { param0->unk_04 = param1; @@ -1667,7 +1665,7 @@ static void ov115_02261C1C (UnkStruct_ov115_02261C18 * param0, u16 param1) MTX_RotX33(¶m0->unk_0C, FX_SinIdx(param1), FX_CosIdx(param1)); } -static void ov115_02261C48 (UnkStruct_ov115_02261C18 * param0, u16 param1) +static void ov115_02261C48(UnkStruct_ov115_02261C18 *param0, u16 param1) { VecFx32 v0; @@ -1697,7 +1695,7 @@ static void ov115_02261C48 (UnkStruct_ov115_02261C18 * param0, u16 param1) MTX_MultVec33(¶m0->unk_9C, ¶m0->unk_30, ¶m0->unk_D8); } -static u32 ov115_02261D84 (const UnkStruct_ov115_02261C18 * param0, const VecFx32 * param1, const VecFx32 * param2, VecFx32 * param3) +static u32 ov115_02261D84(const UnkStruct_ov115_02261C18 *param0, const VecFx32 *param1, const VecFx32 *param2, VecFx32 *param3) { fx32 v0; VecFx32 v1; @@ -1750,7 +1748,7 @@ static u32 ov115_02261D84 (const UnkStruct_ov115_02261C18 * param0, const VecFx3 return v6; } -static BOOL ov115_02261EA8 (const UnkStruct_ov115_02261C18 * param0, const VecFx32 * param1) +static BOOL ov115_02261EA8(const UnkStruct_ov115_02261C18 *param0, const VecFx32 *param1) { VecFx32 v0; VecFx32 v1, v2; @@ -1786,7 +1784,7 @@ static BOOL ov115_02261EA8 (const UnkStruct_ov115_02261C18 * param0, const VecFx return 0; } -static fx32 ov115_02261F3C (const UnkStruct_ov115_02261C18 * param0, u16 param1) +static fx32 ov115_02261F3C(const UnkStruct_ov115_02261C18 *param0, u16 param1) { s32 v0; fx32 v1; @@ -1799,7 +1797,7 @@ static fx32 ov115_02261F3C (const UnkStruct_ov115_02261C18 * param0, u16 param1) return v1; } -static fx32 ov115_02261F68 (const UnkStruct_ov115_02261C18 * param0, u16 param1) +static fx32 ov115_02261F68(const UnkStruct_ov115_02261C18 *param0, u16 param1) { s32 v0; fx32 v1; @@ -1811,7 +1809,7 @@ static fx32 ov115_02261F68 (const UnkStruct_ov115_02261C18 * param0, u16 param1) return v1; } -static void ov115_02261F94 (UnkStruct_ov115_02261C18 * param0, fx32 param1) +static void ov115_02261F94(UnkStruct_ov115_02261C18 *param0, fx32 param1) { param0->unk_A8 = param1; param0->unk_AC = FX_Mul((FX32_CONST(30)), param1); @@ -1827,42 +1825,42 @@ static void ov115_02261F94 (UnkStruct_ov115_02261C18 * param0, fx32 param1) param0->unk_D4 = FX_Mul((FX32_CONST(1.50f)), param1); } -static void ov115_022620D8 (UnkStruct_ov115_02261C18 * param0, u16 param1) +static void ov115_022620D8(UnkStruct_ov115_02261C18 *param0, u16 param1) { param0->unk_06 = param1; } -static void ov115_022620DC (UnkStruct_ov115_02261C18 * param0, fx32 param1) +static void ov115_022620DC(UnkStruct_ov115_02261C18 *param0, fx32 param1) { param0->unk_9C.z = param1; } -static u16 ov115_022620E4 (const UnkStruct_ov115_02261C18 * param0, s32 param1, s32 param2) +static u16 ov115_022620E4(const UnkStruct_ov115_02261C18 *param0, s32 param1, s32 param2) { - return((20 * 0xffff) / 360); + return (20 * 0xffff) / 360; } -static u16 ov115_022620EC (const UnkStruct_ov115_02261C18 * param0, s32 param1, s32 param2) +static u16 ov115_022620EC(const UnkStruct_ov115_02261C18 *param0, s32 param1, s32 param2) { - return(((90 * 0xffff) / 360)); + return (90 * 0xffff) / 360; } -static u16 ov115_022620F4 (const UnkStruct_ov115_02261C18 * param0, s32 param1, s32 param2) +static u16 ov115_022620F4(const UnkStruct_ov115_02261C18 *param0, s32 param1, s32 param2) { s32 v0; s32 v1; v0 = (param1 - Unk_ov115_02265B38[2]) % 50; - v1 = (v0 * ((((((90 * 0xffff) / 360))) - (((20 * 0xffff) / 360))) * 2)) / 50; + v1 = (v0 * ((((90 * 0xffff) / 360) - ((20 * 0xffff) / 360)) * 2)) / 50; - if (v1 > (((((90 * 0xffff) / 360))) - (((20 * 0xffff) / 360)))) { - v1 = (((((90 * 0xffff) / 360))) - (((20 * 0xffff) / 360))) - (v1 % (((((90 * 0xffff) / 360))) - (((20 * 0xffff) / 360)))); + if (v1 > (((90 * 0xffff) / 360) - ((20 * 0xffff) / 360))) { + v1 = (((90 * 0xffff) / 360) - ((20 * 0xffff) / 360)) - (v1 % (((90 * 0xffff) / 360) - ((20 * 0xffff) / 360))); } - return (((20 * 0xffff) / 360)) + v1; + return ((20 * 0xffff) / 360) + v1; } -static void ov115_02262134 (const UnkStruct_ov115_02262134 * param0, UnkStruct_ov115_02265AD0 * param1) +static void ov115_02262134(const UnkStruct_ov115_02262134 *param0, UnkStruct_ov115_02265AD0 *param1) { param1->unk_00 = param0->unk_00; param1->unk_02 = param0->unk_02; @@ -1877,7 +1875,7 @@ static void ov115_02262134 (const UnkStruct_ov115_02262134 * param0, UnkStruct_o param1->unk_13 = param0->unk_24; } -static void ov115_0226218C (const UnkStruct_ov115_02265AD0 * param0, UnkStruct_ov115_02262134 * param1) +static void ov115_0226218C(const UnkStruct_ov115_02265AD0 *param0, UnkStruct_ov115_02262134 *param1) { param1->unk_00 = param0->unk_00; param1->unk_02 = param0->unk_02; @@ -1891,7 +1889,7 @@ static void ov115_0226218C (const UnkStruct_ov115_02265AD0 * param0, UnkStruct_o param1->unk_24 = param0->unk_13; } -static void ov115_022621DC (UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02262134 * param1, u32 param2) +static void ov115_022621DC(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_02262134 *param1, u32 param2) { int v0; @@ -1931,34 +1929,34 @@ static void ov115_022621DC (UnkStruct_ov115_02260D78 * param0, const UnkStruct_o } } -static void ov115_022622EC (UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_022622F8 * param1, BOOL param2, u32 param3) +static void ov115_022622EC(UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_022622F8 *param1, BOOL param2, u32 param3) { param1->unk_01 = 1; param1->unk_04.unk_02 = param2; param1->unk_04.unk_20 = param3; } -static void ov115_022622F8 (UnkStruct_ov115_022622F8 * param0) +static void ov115_022622F8(UnkStruct_ov115_022622F8 *param0) { memset(param0, 0, sizeof(UnkStruct_ov115_022622F8)); } -static void ov115_02262304 (UnkStruct_ov115_02260D78 * param0) +static void ov115_02262304(UnkStruct_ov115_02260D78 *param0) { int v0; for (v0 = 0; v0 < 96; v0++) { if ((param0->unk_4C[v0].unk_00 == 1) || (param0->unk_4C[v0].unk_00 == 2)) { ov115_02262354(param0, ¶m0->unk_4C[v0]); - } else if ((param0->unk_4C[v0].unk_00 == 5)) { + } else if (param0->unk_4C[v0].unk_00 == 5) { ov115_022627B4(¶m0->unk_4C[v0], param0); - } else if ((param0->unk_4C[v0].unk_00 == 3)) { + } else if (param0->unk_4C[v0].unk_00 == 3) { ov115_022628EC(¶m0->unk_4C[v0], param0); } } } -static void ov115_02262354 (UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_022622F8 * param1) +static void ov115_02262354(UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_022622F8 *param1) { VecFx32 v0; u32 v1; @@ -2069,7 +2067,7 @@ static void ov115_02262354 (UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_0 } } -static void ov115_02262524 (UnkStruct_ov115_02260D78 * param0) +static void ov115_02262524(UnkStruct_ov115_02260D78 *param0) { int v0; @@ -2078,7 +2076,7 @@ static void ov115_02262524 (UnkStruct_ov115_02260D78 * param0) } } -static void ov115_02262540 (UnkStruct_ov115_02260D78 * param0) +static void ov115_02262540(UnkStruct_ov115_02260D78 *param0) { int v0; @@ -2091,7 +2089,7 @@ static void ov115_02262540 (UnkStruct_ov115_02260D78 * param0) } } -static void ov115_02262574 (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1) +static void ov115_02262574(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1) { if (param0->unk_01) { if ((param0->unk_00 == 3) && (param0->unk_04.unk_02 == 1)) { @@ -2104,18 +2102,18 @@ static void ov115_02262574 (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_0 } } -static void ov115_022625A8 (UnkStruct_ov115_02260D78 * param0) +static void ov115_022625A8(UnkStruct_ov115_02260D78 *param0) { int v0; for (v0 = 0; v0 < 96; v0++) { - if ((param0->unk_4C[v0].unk_00 == 1)) { + if (param0->unk_4C[v0].unk_00 == 1) { param0->unk_4C[v0].unk_00 = 2; } } } -static BOOL ov115_022625C8 (const UnkStruct_ov115_02260D78 * param0) +static BOOL ov115_022625C8(const UnkStruct_ov115_02260D78 *param0) { int v0; @@ -2128,7 +2126,7 @@ static BOOL ov115_022625C8 (const UnkStruct_ov115_02260D78 * param0) return 0; } -static fx32 ov115_022625F0 (const UnkStruct_ov115_022622F8 * param0) +static fx32 ov115_022625F0(const UnkStruct_ov115_022622F8 *param0) { fx32 v0; @@ -2141,7 +2139,7 @@ static fx32 ov115_022625F0 (const UnkStruct_ov115_022622F8 * param0) return v0; } -static void ov115_02262620 (const UnkStruct_ov115_022622F8 * param0, VecFx32 * param1) +static void ov115_02262620(const UnkStruct_ov115_022622F8 *param0, VecFx32 *param1) { fx32 v0; VecFx32 v1; @@ -2154,7 +2152,7 @@ static void ov115_02262620 (const UnkStruct_ov115_022622F8 * param0, VecFx32 * p param1->z = FX_Mul(param0->unk_04.unk_04.z, v0); } -static void ov115_022626BC (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1, BOOL param2) +static void ov115_022626BC(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1, BOOL param2) { fx32 v0; @@ -2167,7 +2165,7 @@ static void ov115_022626BC (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_0 ov115_022626E0(param0, param1, param2, v0, 1); } -static void ov115_022626E0 (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1, BOOL param2, fx32 param3, BOOL param4) +static void ov115_022626E0(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1, BOOL param2, fx32 param3, BOOL param4) { fx32 v0; fx32 v1; @@ -2211,14 +2209,14 @@ static void ov115_022626E0 (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_0 param0->unk_02++; } -static void ov115_022627B4 (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1) +static void ov115_022627B4(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1) { VecFx32 v0; BOOL v1; BOOL v2 = 0; fx32 v3; - if ((param0->unk_00 != 5)) { + if (param0->unk_00 != 5) { return; } @@ -2269,7 +2267,7 @@ static void ov115_022627B4 (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_0 } } -static BOOL ov115_02262888 (const UnkStruct_ov115_022622F8 * param0) +static BOOL ov115_02262888(const UnkStruct_ov115_022622F8 *param0) { if ((param0->unk_40 >= (FX32_CONST(188))) && (param0->unk_40 <= (FX32_CONST(240)))) { return 1; @@ -2278,18 +2276,18 @@ static BOOL ov115_02262888 (const UnkStruct_ov115_022622F8 * param0) return 0; } -static BOOL ov115_022628A4 (const UnkStruct_ov115_022622F8 * param0) +static BOOL ov115_022628A4(const UnkStruct_ov115_022622F8 *param0) { - if ((param0->unk_40 <= (FX32_CONST(120)))) { + if (param0->unk_40 <= (FX32_CONST(120))) { return 1; } return 0; } -static BOOL ov115_022628B8 (UnkStruct_ov115_022622F8 * param0) +static BOOL ov115_022628B8(UnkStruct_ov115_022622F8 *param0) { - if ((param0->unk_40 >= (FX32_CONST(240)))) { + if (param0->unk_40 >= (FX32_CONST(240))) { if (param0->unk_3C == 1) { return 1; } @@ -2300,14 +2298,14 @@ static BOOL ov115_022628B8 (UnkStruct_ov115_022622F8 * param0) return 0; } -static void ov115_022628DC (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1) +static void ov115_022628DC(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1) { param0->unk_00 = 3; param0->unk_38 = 8; param0->unk_3A = param1->unk_1C; } -static void ov115_022628EC (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02260D78 * param1) +static void ov115_022628EC(UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02260D78 *param1) { VecFx32 v0; u32 v1; @@ -2329,7 +2327,7 @@ static void ov115_022628EC (UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_0 } } -static void ov115_0226294C (UnkStruct_ov115_022622F8 * param0, const VecFx32 * param1) +static void ov115_0226294C(UnkStruct_ov115_022622F8 *param0, const VecFx32 *param1) { VecFx32 v0; @@ -2342,7 +2340,7 @@ static void ov115_0226294C (UnkStruct_ov115_022622F8 * param0, const VecFx32 * p param0->unk_40 = VEC_Mag(&v0); } -static void ov115_02262974 (UnkStruct_ov115_02260D78 * param0) +static void ov115_02262974(UnkStruct_ov115_02260D78 *param0) { if (gCoreSys.touchHeld == 0) { ov115_02262990(param0); @@ -2351,7 +2349,7 @@ static void ov115_02262974 (UnkStruct_ov115_02260D78 * param0) } } -static void ov115_02262990 (UnkStruct_ov115_02260D78 * param0) +static void ov115_02262990(UnkStruct_ov115_02260D78 *param0) { UnkStruct_ov115_02262134 v0; NNSG2dSVec2 v1; @@ -2431,7 +2429,7 @@ static void ov115_02262990 (UnkStruct_ov115_02260D78 * param0) param0->unk_20.unk_28 = 0; } -static void ov115_02262B70 (UnkStruct_ov115_02260D78 * param0) +static void ov115_02262B70(UnkStruct_ov115_02260D78 *param0) { NNSG2dSVec2 v0; BOOL v1; @@ -2467,7 +2465,7 @@ static void ov115_02262B70 (UnkStruct_ov115_02260D78 * param0) } } -static BOOL ov115_02262C60 (UnkStruct_ov115_02260D78 * param0) +static BOOL ov115_02262C60(UnkStruct_ov115_02260D78 *param0) { s32 v0; s32 v1; @@ -2488,14 +2486,14 @@ static BOOL ov115_02262C60 (UnkStruct_ov115_02260D78 * param0) return 0; } -static void ov115_02262CA4 (UnkStruct_ov115_02262CA4 * param0) +static void ov115_02262CA4(UnkStruct_ov115_02262CA4 *param0) { memset(param0->unk_04, 0, sizeof(NNSG2dSVec2) * 8); param0->unk_24 = 0; param0->unk_26 = 0; } -static void ov115_02262CBC (UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 param1) +static void ov115_02262CBC(UnkStruct_ov115_02262CA4 *param0, NNSG2dSVec2 param1) { if (((param0->unk_26 + 1) % 8) == param0->unk_24) { NNSG2dSVec2 v0; @@ -2507,7 +2505,7 @@ static void ov115_02262CBC (UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 param param0->unk_26 = (param0->unk_26 + 1) % 8; } -static BOOL ov115_02262D0C (UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 * param1) +static BOOL ov115_02262D0C(UnkStruct_ov115_02262CA4 *param0, NNSG2dSVec2 *param1) { if (param0->unk_26 == param0->unk_24) { return 0; @@ -2519,7 +2517,7 @@ static BOOL ov115_02262D0C (UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 * par return 1; } -static BOOL ov115_02262D3C (UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 * param1) +static BOOL ov115_02262D3C(UnkStruct_ov115_02262CA4 *param0, NNSG2dSVec2 *param1) { if (param0->unk_26 == param0->unk_24) { return 0; @@ -2530,7 +2528,7 @@ static BOOL ov115_02262D3C (UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 * par return 1; } -static BOOL ov115_02262D58 (UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 * param1) +static BOOL ov115_02262D58(UnkStruct_ov115_02262CA4 *param0, NNSG2dSVec2 *param1) { s32 v0; @@ -2549,7 +2547,7 @@ static BOOL ov115_02262D58 (UnkStruct_ov115_02262CA4 * param0, NNSG2dSVec2 * par return 1; } -static u32 ov115_02262D7C (UnkStruct_ov115_02262CA4 * param0) +static u32 ov115_02262D7C(UnkStruct_ov115_02262CA4 *param0) { if (param0->unk_24 > param0->unk_26) { return (8 - param0->unk_24) + param0->unk_26; @@ -2558,7 +2556,7 @@ static u32 ov115_02262D7C (UnkStruct_ov115_02262CA4 * param0) return param0->unk_26 - param0->unk_24; } -static void ov115_02262D90 (UnkStruct_ov115_02260D78 * param0) +static void ov115_02262D90(UnkStruct_ov115_02260D78 *param0) { param0->unk_20.unk_00 = 0; @@ -2566,13 +2564,13 @@ static void ov115_02262D90 (UnkStruct_ov115_02260D78 * param0) ov115_02264BF8(¶m0->unk_1AB4.unk_6A34); } -static void ov115_02262DB0 (UnkStruct_ov115_02262E64 * param0, const UnkStruct_ov115_02262F50 * param1, const UnkStruct_ov115_022612BC * param2) +static void ov115_02262DB0(UnkStruct_ov115_02262E64 *param0, const UnkStruct_ov115_02262F50 *param1, const UnkStruct_ov115_022612BC *param2) { param0->unk_48 = 16; ov115_02262F50(param1, param2, 0, ¶m0->unk_00); } -static void ov115_02262DC4 (UnkStruct_ov115_02262E64 * param0, const UnkStruct_ov115_02262F50 * param1, const UnkStruct_ov115_022612BC * param2, u16 param3, u16 param4) +static void ov115_02262DC4(UnkStruct_ov115_02262E64 *param0, const UnkStruct_ov115_02262F50 *param1, const UnkStruct_ov115_022612BC *param2, u16 param3, u16 param4) { UnkStruct_ov115_02262DC4 v0, v1; @@ -2601,7 +2599,7 @@ static void ov115_02262DC4 (UnkStruct_ov115_02262E64 * param0, const UnkStruct_o param0->unk_48 = 0; } -static BOOL ov115_02262E64 (UnkStruct_ov115_02262E64 * param0) +static BOOL ov115_02262E64(UnkStruct_ov115_02262E64 *param0) { if (param0->unk_48 >= 16) { return 1; @@ -2619,12 +2617,12 @@ static BOOL ov115_02262E64 (UnkStruct_ov115_02262E64 * param0) return 0; } -static void ov115_02262EFC (UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02262E64 * param1) +static void ov115_02262EFC(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_02262E64 *param1) { ov115_02262F04(param0, ¶m1->unk_00); } -static void ov115_02262F04 (UnkStruct_ov115_02260D78 * param0, const UnkStruct_ov115_02262DC4 * param1) +static void ov115_02262F04(UnkStruct_ov115_02260D78 *param0, const UnkStruct_ov115_02262DC4 *param1) { ov115_022620D8(¶m0->unk_19CC, param1->unk_04); ov115_02265274(¶m0->unk_1AB4, param1->unk_08); @@ -2633,7 +2631,7 @@ static void ov115_02262F04 (UnkStruct_ov115_02260D78 * param0, const UnkStruct_o ov115_02261F94(¶m0->unk_19CC, param1->unk_14); } -static void ov115_02262F50 (const UnkStruct_ov115_02262F50 * param0, const UnkStruct_ov115_022612BC * param1, u32 param2, UnkStruct_ov115_02262DC4 * param3) +static void ov115_02262F50(const UnkStruct_ov115_02262F50 *param0, const UnkStruct_ov115_022612BC *param1, u32 param2, UnkStruct_ov115_02262DC4 *param3) { u16 v0; s32 v1; @@ -2663,9 +2661,9 @@ static void ov115_02262F50 (const UnkStruct_ov115_02262F50 * param0, const UnkSt } } -static void ov115_02262FB4 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2) +static void ov115_02262FB4(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2) { - NARC * v0; + NARC *v0; BOOL v1; memset(param0, 0, sizeof(UnkStruct_ov115_02263130)); @@ -2706,7 +2704,7 @@ static void ov115_02262FB4 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0 NARC_dtor(v0); } -static void ov115_022630DC (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_022630DC(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_02261ADC *param1) { { sub_02021BD4(param0->unk_34); @@ -2724,7 +2722,7 @@ static void ov115_022630DC (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0 memset(param0, 0, sizeof(UnkStruct_ov115_02263130)); } -static void ov115_02263130 (UnkStruct_ov115_02263130 * param0) +static void ov115_02263130(UnkStruct_ov115_02263130 *param0) { { param0->unk_38 = 1; @@ -2735,7 +2733,7 @@ static void ov115_02263130 (UnkStruct_ov115_02263130 * param0) sub_02021CAC(param0->unk_34, 1); } -static BOOL ov115_02263150 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_02260D78 * param1) +static BOOL ov115_02263150(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_02260D78 *param1) { switch (param0->unk_3A) { case 0: @@ -2802,13 +2800,13 @@ static BOOL ov115_02263150 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0 return 0; } -static void ov115_0226327C (UnkStruct_ov115_022632C8 * param0) +static void ov115_0226327C(UnkStruct_ov115_022632C8 *param0) { memset(param0, 0, sizeof(UnkStruct_ov115_022632C8)); param0->unk_14 = 0xffff; } -static void ov115_02263294 (UnkStruct_ov115_022632C8 * param0, u32 param1, u32 param2) +static void ov115_02263294(UnkStruct_ov115_022632C8 *param0, u32 param1, u32 param2) { param0->unk_00[param2] = param1; param0->unk_10 |= 1 << param2; @@ -2826,18 +2824,18 @@ static void ov115_02263294 (UnkStruct_ov115_022632C8 * param0, u32 param1, u32 p } } -static void ov115_022632C8 (UnkStruct_ov115_022632C8 * param0) +static void ov115_022632C8(UnkStruct_ov115_022632C8 *param0) { param0->unk_10 = 0; param0->unk_14 = 0xffff; } -static u32 ov115_022632D8 (const UnkStruct_ov115_022632C8 * param0) +static u32 ov115_022632D8(const UnkStruct_ov115_022632C8 *param0) { return param0->unk_14; } -static BOOL ov115_022632DC (const UnkStruct_ov115_022632C8 * param0, u32 param1) +static BOOL ov115_022632DC(const UnkStruct_ov115_022632C8 *param0, u32 param1) { int v0; int v1; @@ -2857,7 +2855,7 @@ static BOOL ov115_022632DC (const UnkStruct_ov115_022632C8 * param0, u32 param1) return 0; } -static void ov115_02263308 (void) +static void ov115_02263308(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_32_FG, @@ -2875,7 +2873,7 @@ static void ov115_02263308 (void) GXLayers_SetBanks(&v0); } -static void ov115_02263328 (void) +static void ov115_02263328(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -2890,21 +2888,21 @@ static void ov115_02263328 (void) G3_ViewPort(0, 0, 255, 191); } -static void ov115_022633B4 (UnkStruct_ov115_02261ADC * param0, u32 param1, u32 param2, u32 param3) +static void ov115_022633B4(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3) { param0->unk_18 = sub_02024220(param3, 0, 1, 0, 4, ov115_02263328); ov115_02263C24(param0, param1, param2, param3); } -static void ov115_022633EC (UnkStruct_ov115_02261ADC * param0) +static void ov115_022633EC(UnkStruct_ov115_02261ADC *param0) { ov115_02263CC0(param0); sub_020242C4(param0->unk_18); } -static void ov115_022633FC (UnkStruct_ov115_02260D78 * param0, u32 param1) +static void ov115_022633FC(UnkStruct_ov115_02260D78 *param0, u32 param1) { - NARC * v0; + NARC *v0; Heap_FndInitAllocatorForExpHeap(¶m0->unk_1AB4.unk_6BBC, param1, 32); @@ -2933,7 +2931,7 @@ static void ov115_022633FC (UnkStruct_ov115_02260D78 * param0, u32 param1) param0->unk_1AB4.unk_754 = ov114_0225CAD4(param0->unk_1AB4.unk_1C, param1); } -static void ov115_02263560 (UnkStruct_ov115_02260D78 * param0) +static void ov115_02263560(UnkStruct_ov115_02260D78 *param0) { ov115_02265688(¶m0->unk_1AB4.unk_6B1C, ¶m0->unk_1AB4); ov115_02261574(¶m0->unk_1AB4.unk_3E8, ¶m0->unk_1AB4); @@ -2956,7 +2954,7 @@ static void ov115_02263560 (UnkStruct_ov115_02260D78 * param0) G2S_BlendNone(); } -static void ov115_02263640 (const UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_02263640(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261ADC *param1) { ov115_02264044(¶m1->unk_524, ¶m0->unk_19CC, param0->unk_00); ov115_022640A4(¶m1->unk_524, ¶m0->unk_19CC, param0->unk_00); @@ -2966,7 +2964,7 @@ static void ov115_02263640 (const UnkStruct_ov115_02260D78 * param0, UnkStruct_o ov115_02265820(¶m1->unk_6B1C); } -static void ov115_0226369C (const UnkStruct_ov115_02260D78 * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_0226369C(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov115_02261ADC *param1) { ov115_02264C90(¶m1->unk_6A3C); ov115_02261598(¶m1->unk_3E8); @@ -3005,7 +3003,7 @@ static void ov115_0226369C (const UnkStruct_ov115_02260D78 * param0, UnkStruct_o sub_020219F8(param1->unk_1C); } -static void ov115_0226376C (UnkStruct_ov115_02261ADC * param0, u32 param1) +static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1) { param0->unk_00 = sub_02018340(param1); @@ -3166,7 +3164,7 @@ static void ov115_0226376C (UnkStruct_ov115_02261ADC * param0, u32 param1) sub_0200DAA4(param0->unk_00, 1, 1, 4, 0, param1); } -static void ov115_02263954 (UnkStruct_ov115_02261ADC * param0) +static void ov115_02263954(UnkStruct_ov115_02261ADC *param0) { sub_02019044(param0->unk_00, 1); sub_02019044(param0->unk_00, 2); @@ -3177,7 +3175,7 @@ static void ov115_02263954 (UnkStruct_ov115_02261ADC * param0) Heap_FreeToHeap(param0->unk_00); } -static void ov115_02263990 (UnkStruct_ov115_02261ADC * param0, u32 param1) +static void ov115_02263990(UnkStruct_ov115_02261ADC *param0, u32 param1) { int v0; @@ -3210,7 +3208,7 @@ static void ov115_02263990 (UnkStruct_ov115_02261ADC * param0, u32 param1) param0->unk_1F0 = sub_02012744(8, param1); } -static void ov115_02263A3C (UnkStruct_ov115_02261ADC * param0) +static void ov115_02263A3C(UnkStruct_ov115_02261ADC *param0) { int v0; @@ -3226,7 +3224,7 @@ static void ov115_02263A3C (UnkStruct_ov115_02261ADC * param0) sub_0200A878(); } -static void ov115_02263A74 (UnkStruct_ov115_02261ADC * param0, NARC * param1, u32 param2) +static void ov115_02263A74(UnkStruct_ov115_02261ADC *param0, NARC *param1, u32 param2) { BOOL v0; @@ -3247,7 +3245,7 @@ static void ov115_02263A74 (UnkStruct_ov115_02261ADC * param0, NARC * param1, u3 } } -static void ov115_02263B78 (UnkStruct_ov115_02261ADC * param0) +static void ov115_02263B78(UnkStruct_ov115_02261ADC *param0) { { sub_0200A4E4(param0->unk_1E0[0]); @@ -3259,7 +3257,7 @@ static void ov115_02263B78 (UnkStruct_ov115_02261ADC * param0) } } -static void ov115_02263BCC (UnkStruct_ov115_02261ADC * param0, u32 param1) +static void ov115_02263BCC(UnkStruct_ov115_02261ADC *param0, u32 param1) { param0->unk_04 = StringTemplate_Default(param1); param0->unk_08 = MessageLoader_Init(0, 26, 407, param1); @@ -3267,7 +3265,7 @@ static void ov115_02263BCC (UnkStruct_ov115_02261ADC * param0, u32 param1) param0->unk_10 = Strbuf_Init(128, param1); } -static void ov115_02263C04 (UnkStruct_ov115_02261ADC * param0) +static void ov115_02263C04(UnkStruct_ov115_02261ADC *param0) { Strbuf_Free(param0->unk_10); Strbuf_Free(param0->unk_0C); @@ -3275,7 +3273,7 @@ static void ov115_02263C04 (UnkStruct_ov115_02261ADC * param0) StringTemplate_Free(param0->unk_04); } -static void ov115_02263C24 (UnkStruct_ov115_02261ADC * param0, u32 param1, u32 param2, u32 param3) +static void ov115_02263C24(UnkStruct_ov115_02261ADC *param0, u32 param1, u32 param2, u32 param3) { CameraAngle v0; VecFx32 v1; @@ -3288,9 +3286,9 @@ static void ov115_02263C24 (UnkStruct_ov115_02261ADC * param0, u32 param1, u32 p v0.x = 0xf112; v0.y = Unk_ov115_02265C5C[param1 - 1][param2]; - v0.z = (((0 * 0xffff) / 360)); + v0.z = ((0 * 0xffff) / 360); - Camera_InitWithTarget(¶m0->unk_1F8, 0x1d9000, &v0, (((22 * 0xffff) / 360)), 0, 1, param0->camera); + Camera_InitWithTarget(¶m0->unk_1F8, 0x1d9000, &v0, ((22 * 0xffff) / 360), 0, 1, param0->camera); v1.x = 0; v1.y = (FX32_ONE); @@ -3301,20 +3299,23 @@ static void ov115_02263C24 (UnkStruct_ov115_02261ADC * param0, u32 param1, u32 p Camera_SetClipping((FX32_CONST(200)), (FX32_CONST(1000)), param0->camera); } -static void ov115_02263CC0 (UnkStruct_ov115_02261ADC * param0) +static void ov115_02263CC0(UnkStruct_ov115_02261ADC *param0) { Camera_Delete(param0->camera); } -static void ov115_02263CD0 (UnkStruct_ov115_02261ADC * param0) +static void ov115_02263CD0(UnkStruct_ov115_02261ADC *param0) { Camera_ComputeViewMatrix(); } -static void ov115_02263CD8 (UnkStruct_ov115_02261ADC * param0, NARC * param1, u32 param2, u32 param3) +static void ov115_02263CD8(UnkStruct_ov115_02261ADC *param0, NARC *param1, u32 param2, u32 param3) { static const u8 v0[4] = { - 0, 9, 10, 11, + 0, + 9, + 10, + 11, }; sub_020070E8(param1, 12, param0->unk_00, 4, 0, 0, 0, param3); @@ -3333,24 +3334,31 @@ static void ov115_02263CD8 (UnkStruct_ov115_02261ADC * param0, NARC * param1, u3 sub_02019448(param0->unk_00, 7); } -static void ov115_02263DF4 (UnkStruct_ov115_02261ADC * param0) +static void ov115_02263DF4(UnkStruct_ov115_02261ADC *param0) { return; } -static void ov115_02263DF8 (UnkStruct_ov115_02263DF8 * param0, NARC * param1, u32 param2, NNSFndAllocator * param3) +static void ov115_02263DF8(UnkStruct_ov115_02263DF8 *param0, NARC *param1, u32 param2, NNSFndAllocator *param3) { static const u16 v0[6] = { - 26, 27, 28, 29, 30, 31, + 26, + 27, + 28, + 29, + 30, + 31, }; static const u16 v1[3] = { - 23, 24, 25, + 23, + 24, + 25, }; int v2, v3, v4, v5; - const NNSG3dResName * v6; - const NNSG3dResNodeInfo * v7; + const NNSG3dResName *v6; + const NNSG3dResNodeInfo *v7; memset(param0, 0, sizeof(UnkStruct_ov115_02263DF8)); @@ -3400,7 +3408,7 @@ static void ov115_02263DF8 (UnkStruct_ov115_02263DF8 * param0, NARC * param1, u3 param0->unk_210 = 4; } -static void ov115_02263FF4 (UnkStruct_ov115_02263DF8 * param0, NNSFndAllocator * param1) +static void ov115_02263FF4(UnkStruct_ov115_02263DF8 *param0, NNSFndAllocator *param1) { int v0; @@ -3419,7 +3427,7 @@ static void ov115_02263FF4 (UnkStruct_ov115_02263DF8 * param0, NNSFndAllocator * memset(param0, 0, sizeof(UnkStruct_ov115_02263DF8)); } -static void ov115_02264044 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1, int param2) +static void ov115_02264044(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1, int param2) { ov115_022640C0(param0, param1); ov115_022640EC(param0, param1); @@ -3440,13 +3448,13 @@ static void ov115_02264044 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_o } } -static void ov115_022640A4 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1, int param2) +static void ov115_022640A4(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1, int param2) { sub_020171CC(¶m0->unk_198[0], (FX32_CONST(1))); ov115_02264270(param0); } -static void ov115_022640C0 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1) +static void ov115_022640C0(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1) { int v0; @@ -3455,20 +3463,20 @@ static void ov115_022640C0 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_o } } -static void ov115_022640EC (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1) +static void ov115_022640EC(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1) { int v0; fx32 v1; u32 v2; - v2 = param1->unk_02 + (((0 * 0xffff) / 360)); + v2 = param1->unk_02 + ((0 * 0xffff) / 360); for (v0 = 0; v0 < 3; v0++) { sub_02017388(¶m0->unk_00[v0], (u16)v2, 1); } } -static void ov115_02264110 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1) +static void ov115_02264110(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1) { int v0; @@ -3477,7 +3485,7 @@ static void ov115_02264110 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_o } } -static void ov115_02264134 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_ov115_02261C18 * param1) +static void ov115_02264134(UnkStruct_ov115_02263DF8 *param0, const UnkStruct_ov115_02261C18 *param1) { int v0; @@ -3486,19 +3494,19 @@ static void ov115_02264134 (UnkStruct_ov115_02263DF8 * param0, const UnkStruct_o } } -static void ov115_0226414C (UnkStruct_ov115_02263DF8 * param0, u32 param1) +static void ov115_0226414C(UnkStruct_ov115_02263DF8 *param0, u32 param1) { fx32 v0; - param1 -= (((20 * 0xffff) / 360)); - v0 = (param1 * 90) / sub_0201D2A4(90 - (((20 * 0xffff) / 360))); + param1 -= ((20 * 0xffff) / 360); + v0 = (param1 * 90) / sub_0201D2A4(90 - ((20 * 0xffff) / 360)); v0 = (v0 * (FX32_CONST(180))) / 90; v0 = (FX32_CONST(180)) - v0; sub_02017240(¶m0->unk_198[1], v0); } -static void ov115_02264190 (UnkStruct_ov115_02263DF8 * param0, u32 param1) +static void ov115_02264190(UnkStruct_ov115_02263DF8 *param0, u32 param1) { GF_ASSERT(param1 < 6); @@ -3512,12 +3520,12 @@ static void ov115_02264190 (UnkStruct_ov115_02263DF8 * param0, u32 param1) } } -static BOOL ov115_02264214 (UnkStruct_ov115_02263DF8 * param0, fx32 param1) +static BOOL ov115_02264214(UnkStruct_ov115_02263DF8 *param0, fx32 param1) { return sub_02017204(¶m0->unk_198[param0->unk_210], param1); } -static void ov115_0226422C (UnkStruct_ov115_02263DF8 * param0, BOOL param1) +static void ov115_0226422C(UnkStruct_ov115_02263DF8 *param0, BOOL param1) { if (param0->unk_212 != param1) { if (param1 == 1) { @@ -3530,17 +3538,17 @@ static void ov115_0226422C (UnkStruct_ov115_02263DF8 * param0, BOOL param1) } } -static void ov115_0226425C (UnkStruct_ov115_02263DF8 * param0, BOOL param1) +static void ov115_0226425C(UnkStruct_ov115_02263DF8 *param0, BOOL param1) { param0->unk_22E = param1; } -static void ov115_02264268 (UnkStruct_ov115_02263DF8 * param0, u32 param1) +static void ov115_02264268(UnkStruct_ov115_02263DF8 *param0, u32 param1) { param0->unk_22C = param1; } -static void ov115_02264270 (UnkStruct_ov115_02263DF8 * param0) +static void ov115_02264270(UnkStruct_ov115_02263DF8 *param0) { int v0; @@ -3573,19 +3581,19 @@ static void ov115_02264270 (UnkStruct_ov115_02263DF8 * param0) } } -static void ov115_022642F8 (s16 param0, s16 param1, VecFx32 * param2) +static void ov115_022642F8(s16 param0, s16 param1, VecFx32 *param2) { - param2->x = ((((255 - param0)) * ((FX32_CONST(150)) / 256)) - ((FX32_CONST(150)) / 2)); + param2->x = (((255 - param0) * ((FX32_CONST(150)) / 256)) - ((FX32_CONST(150)) / 2)); param2->z = (FX32_CONST(-300)) - (((param1) * ((FX32_CONST(150)) / 256)) - ((FX32_CONST(150)) / 2)); } -static void ov115_02264324 (const VecFx32 * param0, NNSG2dSVec2 * param1) +static void ov115_02264324(const VecFx32 *param0, NNSG2dSVec2 *param1) { param1->x = 255 - (((param0->x) + ((FX32_CONST(150)) / 2)) / ((FX32_CONST(150)) / 256)); - param1->y = ((((-param0->z) + (((fx32)((-300 > 0) ? (-300 * (1 << 12) + 0.5f) : (-300 * (1 << 12) - 0.5f))))) + ((FX32_CONST(150)) / 2)) / ((FX32_CONST(150)) / 256)); + param1->y = ((((-param0->z) + ((fx32)((-300 > 0) ? (-300 * (1 << 12) + 0.5f) : (-300 * (1 << 12) - 0.5f)))) + ((FX32_CONST(150)) / 2)) / ((FX32_CONST(150)) / 256)); } -static void ov115_02264354 (const VecFx32 * param0, VecFx32 * param1, u32 param2, u32 param3) +static void ov115_02264354(const VecFx32 *param0, VecFx32 *param1, u32 param2, u32 param3) { MtxFx33 v0; @@ -3594,7 +3602,7 @@ static void ov115_02264354 (const VecFx32 * param0, VecFx32 * param1, u32 param2 MTX_MultVec33(param0, &v0, param1); } -static void ov115_0226439C (const VecFx32 * param0, VecFx32 * param1, u32 param2, u32 param3) +static void ov115_0226439C(const VecFx32 *param0, VecFx32 *param1, u32 param2, u32 param3) { MtxFx33 v0; @@ -3604,12 +3612,16 @@ static void ov115_0226439C (const VecFx32 * param0, VecFx32 * param1, u32 param2 MTX_MultVec33(param0, &v0, param1); } -static void ov115_022643EC (UnkStruct_ov115_02261ADC * param0, NARC * param1, u32 param2) +static void ov115_022643EC(UnkStruct_ov115_02261ADC *param0, NARC *param1, u32 param2) { BOOL v0; int v1; static const u8 v2[5] = { - 41, 42, 43, 44, 45, + 41, + 42, + 43, + 44, + 45, }; for (v1 = 0; v1 < 5; v1++) { @@ -3641,7 +3653,7 @@ static void ov115_022643EC (UnkStruct_ov115_02261ADC * param0, NARC * param1, u3 } } -static void ov115_02264564 (UnkStruct_ov115_02261ADC * param0) +static void ov115_02264564(UnkStruct_ov115_02261ADC *param0) { int v0; @@ -3668,9 +3680,9 @@ static void ov115_02264564 (UnkStruct_ov115_02261ADC * param0) memset(¶m0->unk_7F4, 0, sizeof(UnkStruct_ov115_022647A0) * 96); } -static void ov115_02264620 (UnkStruct_ov115_02261ADC * param0, const UnkStruct_ov115_022622F8 * param1, u32 param2, u32 param3) +static void ov115_02264620(UnkStruct_ov115_02261ADC *param0, const UnkStruct_ov115_022622F8 *param1, u32 param2, u32 param3) { - UnkStruct_ov115_022647A0 * v0; + UnkStruct_ov115_022647A0 *v0; v0 = ov115_02264948(param0); @@ -3681,7 +3693,7 @@ static void ov115_02264620 (UnkStruct_ov115_02261ADC * param0, const UnkStruct_o } } -static void ov115_0226464C (UnkStruct_ov115_02261ADC * param0, const UnkStruct_ov115_022622F8 * param1) +static void ov115_0226464C(UnkStruct_ov115_02261ADC *param0, const UnkStruct_ov115_022622F8 *param1) { int v0; @@ -3695,7 +3707,7 @@ static void ov115_0226464C (UnkStruct_ov115_02261ADC * param0, const UnkStruct_o GF_ASSERT(0); } -static void ov115_02264684 (UnkStruct_ov115_02261ADC * param0, u32 param1) +static void ov115_02264684(UnkStruct_ov115_02261ADC *param0, u32 param1) { int v0; @@ -3706,10 +3718,10 @@ static void ov115_02264684 (UnkStruct_ov115_02261ADC * param0, u32 param1) } } -static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1, u32 param2) +static void ov115_022646BC(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1, u32 param2) { { - UnkStruct_ov115_02261520 v0 = {0}; + UnkStruct_ov115_02261520 v0 = { 0 }; v0.unk_00 = param0->unk_1C; v0.unk_04 = ¶m0->unk_760.unk_70; @@ -3728,13 +3740,13 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0 sub_02017348(¶m1->unk_7C, 0); } -static void ov115_02264728 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1) +static void ov115_02264728(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1) { sub_02021BD4(param1->unk_00); memset(param1, 0, sizeof(UnkStruct_ov115_022647A0)); } -static void ov115_02264740 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1, const UnkStruct_ov115_022622F8 * param2, u32 param3) +static void ov115_02264740(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1, const UnkStruct_ov115_022622F8 *param2, u32 param3) { param1->unk_F8 = param2; param1->unk_F4 = 1; @@ -3745,7 +3757,7 @@ static void ov115_02264740 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0 sub_02021CAC(param1->unk_00, 1); } -static void ov115_0226477C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1, const UnkStruct_ov115_022622F8 * param2) +static void ov115_0226477C(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1, const UnkStruct_ov115_022622F8 *param2) { param1->unk_F8 = param2; param1->unk_104 = 0; @@ -3754,10 +3766,10 @@ static void ov115_0226477C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0 ov115_022649F0(param1, param0); } -static void ov115_022647A0 (UnkStruct_ov115_022647A0 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2) +static void ov115_022647A0(UnkStruct_ov115_022647A0 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2) { BOOL v0; - UnkStruct_020170F4 * v1; + UnkStruct_020170F4 *v1; if (param0->unk_F4 == 1) { v0 = ov115_02264980(param0, param0->unk_F8, param2); @@ -3788,7 +3800,7 @@ static void ov115_022647A0 (UnkStruct_ov115_022647A0 * param0, UnkStruct_ov115_0 } } -static void ov115_02264848 (UnkStruct_ov115_022647A0 * param0) +static void ov115_02264848(UnkStruct_ov115_022647A0 *param0) { BOOL v0; fx32 v1; @@ -3823,12 +3835,12 @@ static void ov115_02264848 (UnkStruct_ov115_022647A0 * param0) NNS_G3dGlbPolygonAttr(0, 0, 0, 0, v4, 0); } -static void ov115_02264908 (UnkStruct_ov115_022647A0 * param0) +static void ov115_02264908(UnkStruct_ov115_022647A0 *param0) { NNS_G3dGlbPolygonAttr(0, 0, 0, 0, 31, 0); } -static void ov115_02264924 (UnkStruct_ov115_022647A0 * param0) +static void ov115_02264924(UnkStruct_ov115_022647A0 *param0) { param0->unk_F8 = NULL; param0->unk_F4 = 0; @@ -3837,7 +3849,7 @@ static void ov115_02264924 (UnkStruct_ov115_022647A0 * param0) sub_02017348(¶m0->unk_7C, 0); } -static UnkStruct_ov115_022647A0 * ov115_02264948 (UnkStruct_ov115_02261ADC * param0) +static UnkStruct_ov115_022647A0 *ov115_02264948(UnkStruct_ov115_02261ADC *param0) { int v0; @@ -3851,7 +3863,7 @@ static UnkStruct_ov115_022647A0 * ov115_02264948 (UnkStruct_ov115_02261ADC * par return NULL; } -static BOOL ov115_02264980 (UnkStruct_ov115_022647A0 * param0, const UnkStruct_ov115_022622F8 * param1, u32 param2) +static BOOL ov115_02264980(UnkStruct_ov115_022647A0 *param0, const UnkStruct_ov115_022622F8 *param1, u32 param2) { VecFx32 v0; NNSG2dSVec2 v1; @@ -3874,9 +3886,9 @@ static BOOL ov115_02264980 (UnkStruct_ov115_022647A0 * param0, const UnkStruct_o return 1; } -static void ov115_022649F0 (UnkStruct_ov115_022647A0 * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_022649F0(UnkStruct_ov115_022647A0 *param0, UnkStruct_ov115_02261ADC *param1) { - UnkStruct_020170F4 * v0; + UnkStruct_020170F4 *v0; sub_02021CAC(param0->unk_00, 0); param0->unk_F4 = 0; @@ -3891,7 +3903,7 @@ static void ov115_022649F0 (UnkStruct_ov115_022647A0 * param0, UnkStruct_ov115_0 } } -static UnkStruct_020170F4 * ov115_02264A40 (const UnkStruct_ov115_022622F8 * param0, UnkStruct_ov115_02264A40 * param1) +static UnkStruct_020170F4 *ov115_02264A40(const UnkStruct_ov115_022622F8 *param0, UnkStruct_ov115_02264A40 *param1) { u32 v0; @@ -3904,7 +3916,7 @@ static UnkStruct_020170F4 * ov115_02264A40 (const UnkStruct_ov115_022622F8 * par return ¶m1->unk_00[v0]; } -static void ov115_02264A54 (UnkStruct_ov115_022647A0 * param0) +static void ov115_02264A54(UnkStruct_ov115_022647A0 *param0) { fx32 v0; u16 v1; @@ -3929,9 +3941,9 @@ static void ov115_02264A54 (UnkStruct_ov115_022647A0 * param0) sub_02017388(¶m0->unk_04, param0->unk_FE, 2); } -static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_02264BA0 * param1, u32 param2, u32 param3) +static void ov115_02264B40(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_02264BA0 *param1, u32 param2, u32 param3) { - UnkStruct_ov115_02261520 v0 = {0}; + UnkStruct_ov115_02261520 v0 = { 0 }; v0.unk_00 = param0->unk_1C; v0.unk_04 = ¶m0->unk_760.unk_70; @@ -3950,18 +3962,18 @@ static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0 param1->unk_00 = 0; } -static void ov115_02264BA0 (UnkStruct_ov115_02264BA0 * param0) +static void ov115_02264BA0(UnkStruct_ov115_02264BA0 *param0) { sub_02021BD4(param0->unk_04); } -static void ov115_02264BAC (UnkStruct_ov115_02264BA0 * param0) +static void ov115_02264BAC(UnkStruct_ov115_02264BA0 *param0) { sub_02021CAC(param0->unk_04, 1); param0->unk_00 = 1; } -static void ov115_02264BC0 (UnkStruct_ov115_02264BA0 * param0) +static void ov115_02264BC0(UnkStruct_ov115_02264BA0 *param0) { VecFx32 v0; @@ -3972,7 +3984,7 @@ static void ov115_02264BC0 (UnkStruct_ov115_02264BA0 * param0) ov115_02264BD8(param0, gCoreSys.touchX, gCoreSys.touchY); } -static void ov115_02264BD8 (UnkStruct_ov115_02264BA0 * param0, s32 param1, s32 param2) +static void ov115_02264BD8(UnkStruct_ov115_02264BA0 *param0, s32 param1, s32 param2) { VecFx32 v0; @@ -3982,16 +3994,16 @@ static void ov115_02264BD8 (UnkStruct_ov115_02264BA0 * param0, s32 param1, s32 p sub_02021C50(param0->unk_04, &v0); } -static void ov115_02264BF8 (UnkStruct_ov115_02264BA0 * param0) +static void ov115_02264BF8(UnkStruct_ov115_02264BA0 *param0) { sub_02021CAC(param0->unk_04, 0); param0->unk_00 = 0; } -static void ov115_02264C0C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_02264C90 * param1, u32 param2, u32 param3) +static void ov115_02264C0C(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_02264C90 *param1, u32 param2, u32 param3) { int v0; - UnkStruct_ov115_02261520 v1 = {0}; + UnkStruct_ov115_02261520 v1 = { 0 }; v1.unk_00 = param0->unk_1C; v1.unk_04 = ¶m0->unk_760.unk_70; @@ -4011,7 +4023,7 @@ static void ov115_02264C0C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0 } } -static void ov115_02264C78 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_02264C90 * param1) +static void ov115_02264C78(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_02264C90 *param1) { int v0; @@ -4020,7 +4032,7 @@ static void ov115_02264C78 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0 } } -static void ov115_02264C90 (UnkStruct_ov115_02264C90 * param0) +static void ov115_02264C90(UnkStruct_ov115_02264C90 *param0) { int v0; s32 v1; @@ -4067,10 +4079,10 @@ static void ov115_02264C90 (UnkStruct_ov115_02264C90 * param0) } } -static void ov115_02264D80 (UnkStruct_ov115_02264C90 * param0, s32 param1, s32 param2) +static void ov115_02264D80(UnkStruct_ov115_02264C90 *param0, s32 param1, s32 param2) { int v0; - UnkStruct_ov115_02264D80 * v1 = NULL; + UnkStruct_ov115_02264D80 *v1 = NULL; for (v0 = 0; v0 < 8; v0++) { if (param0->unk_00[v0].unk_00 == 0) { @@ -4099,7 +4111,7 @@ static void ov115_02264D80 (UnkStruct_ov115_02264C90 * param0, s32 param1, s32 p v1->unk_14 = 0; } -static void ov115_02264DD8 (int param0, int param1, int param2, int param3, int param4, s32 * param5, s32 * param6) +static void ov115_02264DD8(int param0, int param1, int param2, int param3, int param4, s32 *param5, s32 *param6) { s16 v0; s32 v1; @@ -4111,16 +4123,23 @@ static void ov115_02264DD8 (int param0, int param1, int param2, int param3, int *param6 = FX_Mul(sub_0201D15C(v0), param2 << FX32_SHIFT) >> FX32_SHIFT; } -static void ov115_02264E48 (UnkStruct_ov115_02264FA0 * param0, UnkStruct_ov115_02261ADC * param1, NARC * param2, int param3, u32 param4, u32 param5, NNSFndAllocator * param6) +static void ov115_02264E48(UnkStruct_ov115_02264FA0 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, int param3, u32 param4, u32 param5, NNSFndAllocator *param6) { static const u16 v0[4] = { - 35, 35, 34, 33, + 35, + 35, + 34, + 33, }; static const u16 v1[3] = { - 38, 39, 40, + 38, + 39, + 40, }; static const u16 v2[3] = { - 0, 1, 1, + 0, + 1, + 1, }; u32 v3; int v4; @@ -4158,7 +4177,7 @@ static void ov115_02264E48 (UnkStruct_ov115_02264FA0 * param0, UnkStruct_ov115_0 param0->unk_1D4 = (FX32_CONST(1)); } -static void ov115_02264F68 (UnkStruct_ov115_02264FA0 * param0, UnkStruct_ov115_02261ADC * param1, NNSFndAllocator * param2) +static void ov115_02264F68(UnkStruct_ov115_02264FA0 *param0, UnkStruct_ov115_02261ADC *param1, NNSFndAllocator *param2) { int v0; @@ -4171,7 +4190,7 @@ static void ov115_02264F68 (UnkStruct_ov115_02264FA0 * param0, UnkStruct_ov115_0 } } -static void ov115_02264FA0 (UnkStruct_ov115_02264FA0 * param0) +static void ov115_02264FA0(UnkStruct_ov115_02264FA0 *param0) { int v0; @@ -4230,7 +4249,7 @@ static void ov115_02264FA0 (UnkStruct_ov115_02264FA0 * param0) } } -static void ov115_022650C8 (UnkStruct_ov115_02264FA0 * param0) +static void ov115_022650C8(UnkStruct_ov115_02264FA0 *param0) { sub_02017348(¶m0->unk_00[0], 0); sub_02017348(¶m0->unk_00[1], 1); @@ -4241,12 +4260,12 @@ static void ov115_022650C8 (UnkStruct_ov115_02264FA0 * param0) param0->unk_1D9 = 0; } -static void ov115_022650F8 (UnkStruct_ov115_02264FA0 * param0, fx32 param1) +static void ov115_022650F8(UnkStruct_ov115_02264FA0 *param0, fx32 param1) { param0->unk_1D4 = param1; } -static void ov115_02265100 (const VecFx32 * param0, const VecFx32 * param1, const VecFx32 * param2, fx32 param3, VecFx32 * param4, fx32 * param5) +static void ov115_02265100(const VecFx32 *param0, const VecFx32 *param1, const VecFx32 *param2, fx32 param3, VecFx32 *param4, fx32 *param5) { fx32 v0; fx32 v1; @@ -4263,12 +4282,12 @@ static void ov115_02265100 (const VecFx32 * param0, const VecFx32 * param1, cons *param5 = v0; } -static void ov115_02265274 (UnkStruct_ov115_02261ADC * param0, fx32 param1) +static void ov115_02265274(UnkStruct_ov115_02261ADC *param0, fx32 param1) { param0->unk_1F8.y = param1; } -static void ov115_0226527C (UnkStruct_ov115_02261ADC * param0, u16 param1) +static void ov115_0226527C(UnkStruct_ov115_02261ADC *param0, u16 param1) { CameraAngle v0; @@ -4278,14 +4297,14 @@ static void ov115_0226527C (UnkStruct_ov115_02261ADC * param0, u16 param1) Camera_SetAngleAroundTarget(&v0, param0->camera); } -static void ov115_022652A4 (UnkStruct_ov115_022653CC * param0, u8 param1) +static void ov115_022652A4(UnkStruct_ov115_022653CC *param0, u8 param1) { memset(param0, 0, sizeof(UnkStruct_ov115_022653CC)); param0->unk_04 = 2; param0->unk_06 = param1; } -static void ov115_022652C0 (UnkStruct_ov115_022653CC * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_022652C0(UnkStruct_ov115_022653CC *param0, UnkStruct_ov115_02261ADC *param1) { switch (param0->unk_00) { case 0: @@ -4345,7 +4364,7 @@ static void ov115_022652C0 (UnkStruct_ov115_022653CC * param0, UnkStruct_ov115_0 } } -static void ov115_022653CC (UnkStruct_ov115_022653CC * param0) +static void ov115_022653CC(UnkStruct_ov115_022653CC *param0) { param0->unk_07++; @@ -4356,7 +4375,7 @@ static void ov115_022653CC (UnkStruct_ov115_022653CC * param0) } } -static void ov115_022653F4 (UnkStruct_ov115_02261ADC * param0, s16 param1, u16 param2) +static void ov115_022653F4(UnkStruct_ov115_02261ADC *param0, s16 param1, u16 param2) { int v0; s32 v1; @@ -4382,7 +4401,7 @@ static void ov115_022653F4 (UnkStruct_ov115_02261ADC * param0, s16 param1, u16 p } } -static void ov115_02265478 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_02261ADC * param1, NARC * param2, u32 param3) +static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, NARC *param2, u32 param3) { param0->unk_9C = param3; @@ -4464,7 +4483,7 @@ static void ov115_02265478 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0 param0->unk_96 = 4; } -static void ov115_02265688 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_02261ADC * param1) +static void ov115_02265688(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1) { { sub_02012BD8(param0->unk_48); @@ -4487,7 +4506,7 @@ static void ov115_02265688 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0 } } -static void ov115_02265700 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2) +static void ov115_02265700(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2) { { Strbuf_FormatInt(param0->unk_5C, param2, 2, 2, 1); @@ -4504,7 +4523,7 @@ static void ov115_02265700 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0 param0->unk_9A = 0; } -static void ov115_02265788 (UnkStruct_ov115_02265788 * param0) +static void ov115_02265788(UnkStruct_ov115_02265788 *param0) { if (param0->unk_98 != 3) { if (param0->unk_98 == 2) { @@ -4515,7 +4534,7 @@ static void ov115_02265788 (UnkStruct_ov115_02265788 * param0) } } -static void ov115_022657A8 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2) +static void ov115_022657A8(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_02261ADC *param1, u32 param2) { if (param0->unk_98 != 3) { { @@ -4530,7 +4549,7 @@ static void ov115_022657A8 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0 } } -static void ov115_02265820 (UnkStruct_ov115_02265788 * param0) +static void ov115_02265820(UnkStruct_ov115_02265788 *param0) { switch (param0->unk_98) { case 0: @@ -4582,7 +4601,7 @@ static void ov115_02265820 (UnkStruct_ov115_02265788 * param0) } } -static void ov115_022658E0 (UnkStruct_ov115_022658E0 * param0) +static void ov115_022658E0(UnkStruct_ov115_022658E0 *param0) { param0->unk_00 = 0; param0->unk_02 = 1; @@ -4590,7 +4609,7 @@ static void ov115_022658E0 (UnkStruct_ov115_022658E0 * param0) Sound_PlayEffect(1390); } -static void ov115_022658F8 (UnkStruct_ov115_022658E0 * param0, UnkStruct_ov115_02264FA0 * param1, UnkStruct_ov115_02263DF8 * param2) +static void ov115_022658F8(UnkStruct_ov115_022658E0 *param0, UnkStruct_ov115_02264FA0 *param1, UnkStruct_ov115_02263DF8 *param2) { fx32 v0; u32 v1; @@ -4649,7 +4668,7 @@ static void ov115_022658F8 (UnkStruct_ov115_022658E0 * param0, UnkStruct_ov115_0 } } -static void ov115_02265A08 (UnkStruct_ov115_022658E0 * param0) +static void ov115_02265A08(UnkStruct_ov115_022658E0 *param0) { sub_02004FA8(7, 256); } diff --git a/src/overlay115/ov115_02265A18.c b/src/overlay115/ov115_02265A18.c index c59e1668d9..8b5f8ffa94 100644 --- a/src/overlay115/ov115_02265A18.c +++ b/src/overlay115/ov115_02265A18.c @@ -1,28 +1,29 @@ +#include "overlay115/ov115_02265A18.h" + #include #include #include "struct_defs/struct_02039A58.h" -#include "overlay115/ov115_02265A18.h" #include "overlay115/ov115_02265A24.h" static const CommCmdTable Unk_ov115_0226664C[] = { - {ov115_02265A44, ov115_02265A40, NULL}, - {ov115_02265A50, ov115_02265A40, NULL}, - {ov115_02265A5C, ov115_02265AD0, NULL}, - {ov115_02265A84, ov115_02265AD8, NULL}, - {ov115_02265A94, ov115_02265AD4, NULL}, - {ov115_02265AC0, ov115_02265ADC, NULL}, - {ov115_02265AA4, ov115_02265AD8, NULL}, - {ov115_02265AB4, ov115_02265A40, NULL}, + { ov115_02265A44, ov115_02265A40, NULL }, + { ov115_02265A50, ov115_02265A40, NULL }, + { ov115_02265A5C, ov115_02265AD0, NULL }, + { ov115_02265A84, ov115_02265AD8, NULL }, + { ov115_02265A94, ov115_02265AD4, NULL }, + { ov115_02265AC0, ov115_02265ADC, NULL }, + { ov115_02265AA4, ov115_02265AD8, NULL }, + { ov115_02265AB4, ov115_02265A40, NULL }, }; -const CommCmdTable * ov115_02265A18 (void) +const CommCmdTable *ov115_02265A18(void) { return Unk_ov115_0226664C; } -int ov115_02265A20 (void) +int ov115_02265A20(void) { return sizeof(Unk_ov115_0226664C) / sizeof(CommCmdTable); } diff --git a/src/overlay115/ov115_02265A24.c b/src/overlay115/ov115_02265A24.c index 29b6ff3007..199a8594a1 100644 --- a/src/overlay115/ov115_02265A24.c +++ b/src/overlay115/ov115_02265A24.c @@ -1,42 +1,42 @@ +#include "overlay115/ov115_02265A24.h" + #include #include +#include "overlay115/ov115_02260440.h" +#include "overlay115/ov115_02265A18.h" #include "overlay115/struct_ov115_0226095C_decl.h" - #include "overlay115/struct_ov115_02265AD0.h" #include "overlay115/struct_ov115_02265AD4.h" -#include "unk_02032798.h" #include "communication_system.h" -#include "overlay115/ov115_02260440.h" -#include "overlay115/ov115_02265A18.h" -#include "overlay115/ov115_02265A24.h" +#include "unk_02032798.h" -void ov115_02265A24 (UnkStruct_ov115_0226095C * param0) +void ov115_02265A24(UnkStruct_ov115_0226095C *param0) { CommCmd_Init(ov115_02265A18(), ov115_02265A20(), param0); } -int ov115_02265A40 (void) +int ov115_02265A40(void) { return 0; } -void ov115_02265A44 (int param0, int param1, void * param2, void * param3) +void ov115_02265A44(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov115_0226095C * v0 = param3; + UnkStruct_ov115_0226095C *v0 = param3; ov115_0226095C(v0); } -void ov115_02265A50 (int param0, int param1, void * param2, void * param3) +void ov115_02265A50(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov115_0226095C * v0 = param3; + UnkStruct_ov115_0226095C *v0 = param3; ov115_02260964(v0); } -void ov115_02265A5C (int param0, int param1, void * param2, void * param3) +void ov115_02265A5C(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov115_0226095C * v0 = param3; + UnkStruct_ov115_0226095C *v0 = param3; ov115_02260988(v0, param2, param0); @@ -45,37 +45,37 @@ void ov115_02265A5C (int param0, int param1, void * param2, void * param3) } } -void ov115_02265A84 (int param0, int param1, void * param2, void * param3) +void ov115_02265A84(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov115_0226095C * v0 = param3; + UnkStruct_ov115_0226095C *v0 = param3; ov115_02260994(v0, *((u32 *)param2), param0); } -void ov115_02265A94 (int param0, int param1, void * param2, void * param3) +void ov115_02265A94(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov115_0226095C * v0 = param3; + UnkStruct_ov115_0226095C *v0 = param3; ov115_022609B4(v0, param2, param0); } -void ov115_02265AA4 (int param0, int param1, void * param2, void * param3) +void ov115_02265AA4(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov115_0226095C * v0 = param3; + UnkStruct_ov115_0226095C *v0 = param3; u32 v1; v1 = *((u32 *)param2); ov115_022609E4(v0, v1, param0); } -void ov115_02265AB4 (int param0, int param1, void * param2, void * param3) +void ov115_02265AB4(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov115_0226095C * v0 = param3; + UnkStruct_ov115_0226095C *v0 = param3; ov115_02260A48(v0); } -void ov115_02265AC0 (int param0, int param1, void * param2, void * param3) +void ov115_02265AC0(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov115_0226095C * v0 = param3; + UnkStruct_ov115_0226095C *v0 = param3; u32 v1; v1 = *((u32 *)param2); @@ -85,22 +85,22 @@ void ov115_02265AC0 (int param0, int param1, void * param2, void * param3) } } -int ov115_02265AD0 (void) +int ov115_02265AD0(void) { return sizeof(UnkStruct_ov115_02265AD0); } -int ov115_02265AD4 (void) +int ov115_02265AD4(void) { return sizeof(UnkStruct_ov115_02265AD4); } -int ov115_02265AD8 (void) +int ov115_02265AD8(void) { return sizeof(u32); } -int ov115_02265ADC (void) +int ov115_02265ADC(void) { return sizeof(u32); } diff --git a/src/overlay116/ov116_02260440.c b/src/overlay116/ov116_02260440.c index 30a884d7f0..6699594c28 100644 --- a/src/overlay116/ov116_02260440.c +++ b/src/overlay116/ov116_02260440.c @@ -1,7 +1,11 @@ +#include "overlay116/ov116_02260440.h" + #include #include #include "struct_defs/struct_02039A58.h" + +#include "overlay116/ov116_022604C4.h" #include "overlay116/struct_ov116_0226048C.h" #include "overlay116/struct_ov116_02260490.h" #include "overlay116/struct_ov116_02260494.h" @@ -10,14 +14,12 @@ #include "unk_0201D15C.h" #include "unk_02032798.h" -#include "overlay116/ov116_02260440.h" -#include "overlay116/ov116_022604C4.h" -static void ov116_02260440(int param0, int param1, void * param2, void * param3); -static void ov116_02260458(int param0, int param1, void * param2, void * param3); -static void ov116_02260464(int param0, int param1, void * param2, void * param3); -static void ov116_02260478(int param0, int param1, void * param2, void * param3); -static void ov116_02260484(int param0, int param1, void * param2, void * param3); +static void ov116_02260440(int param0, int param1, void *param2, void *param3); +static void ov116_02260458(int param0, int param1, void *param2, void *param3); +static void ov116_02260464(int param0, int param1, void *param2, void *param3); +static void ov116_02260478(int param0, int param1, void *param2, void *param3); +static void ov116_02260484(int param0, int param1, void *param2, void *param3); static int ov116_02260488(void); static int ov116_0226048C(void); static int ov116_02260490(void); @@ -25,16 +27,16 @@ static int ov116_02260494(void); static int ov116_02260498(void); static const CommCmdTable Unk_ov116_02267740[] = { - {ov116_02260440, ov116_0226048C, NULL}, - {ov116_02260458, ov116_02260488, NULL}, - {ov116_02260464, ov116_02260490, NULL}, - {ov116_02260478, ov116_02260494, NULL}, - {ov116_02260484, ov116_02260498, NULL} + { ov116_02260440, ov116_0226048C, NULL }, + { ov116_02260458, ov116_02260488, NULL }, + { ov116_02260464, ov116_02260490, NULL }, + { ov116_02260478, ov116_02260494, NULL }, + { ov116_02260484, ov116_02260498, NULL } }; -static void ov116_02260440 (int param0, int param1, void * param2, void * param3) +static void ov116_02260440(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov116_0226139C * v0 = param3; + UnkStruct_ov116_0226139C *v0 = param3; v0->unk_14 = *((UnkStruct_ov116_0226048C *)param2); @@ -42,71 +44,71 @@ static void ov116_02260440 (int param0, int param1, void * param2, void * param3 ov116_022617D4(v0); } -static void ov116_02260458 (int param0, int param1, void * param2, void * param3) +static void ov116_02260458(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov116_0226139C * v0 = param3; + UnkStruct_ov116_0226139C *v0 = param3; ov116_022617DC(v0); } -static void ov116_02260464 (int param0, int param1, void * param2, void * param3) +static void ov116_02260464(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov116_0226139C * v0 = param3; - UnkStruct_ov116_02260490 * v1; + UnkStruct_ov116_0226139C *v0 = param3; + UnkStruct_ov116_02260490 *v1; v1 = ((UnkStruct_ov116_02260490 *)param2); v0->unk_04->unk_2858[param0].unk_00 = v1->unk_00; } -static void ov116_02260478 (int param0, int param1, void * param2, void * param3) +static void ov116_02260478(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov116_0226139C * v0 = param3; - UnkStruct_ov116_02260494 * v1; + UnkStruct_ov116_0226139C *v0 = param3; + UnkStruct_ov116_02260494 *v1; v1 = ((UnkStruct_ov116_02260494 *)param2); v0->unk_24.unk_00[param0].unk_00 = v1->unk_00; } -static void ov116_02260484 (int param0, int param1, void * param2, void * param3) +static void ov116_02260484(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov116_0226139C * v0 = param3; + UnkStruct_ov116_0226139C *v0 = param3; } -static int ov116_02260488 (void) +static int ov116_02260488(void) { return 0; } -static int ov116_0226048C (void) +static int ov116_0226048C(void) { return sizeof(UnkStruct_ov116_0226048C); } -static int ov116_02260490 (void) +static int ov116_02260490(void) { return sizeof(UnkStruct_ov116_02260490); } -static int ov116_02260494 (void) +static int ov116_02260494(void) { return sizeof(UnkStruct_ov116_02260494); } -static int ov116_02260498 (void) +static int ov116_02260498(void) { return sizeof(UnkStruct_ov116_02260498); } -const CommCmdTable * ov116_0226049C (void) +const CommCmdTable *ov116_0226049C(void) { return Unk_ov116_02267740; } -int ov116_022604A4 (void) +int ov116_022604A4(void) { return sizeof(Unk_ov116_02267740) / sizeof(CommCmdTable); } -void ov116_022604A8 (UnkStruct_ov116_0226139C * param0) +void ov116_022604A8(UnkStruct_ov116_0226139C *param0) { CommCmd_Init(ov116_0226049C(), ov116_022604A4(), param0); } diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c index 14fe7e5212..9d9f427e2e 100644 --- a/src/overlay116/ov116_022604C4.c +++ b/src/overlay116/ov116_022604C4.c @@ -1,16 +1,24 @@ +#include "overlay116/ov116_022604C4.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_02099F80.h" + +#include "overlay004/ov4_021D0D80.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" +#include "overlay114/ov114_0225C700.h" +#include "overlay116/ov116_02260440.h" +#include "overlay116/ov116_02261870.h" +#include "overlay116/ov116_02262A44.h" +#include "overlay116/ov116_02262A8C.h" +#include "overlay116/ov116_0226432C.h" +#include "overlay116/ov116_02266FEC.h" #include "overlay116/struct_ov116_0226048C.h" #include "overlay116/struct_ov116_02260494.h" #include "overlay116/struct_ov116_02260498.h" @@ -18,49 +26,41 @@ #include "overlay116/struct_ov116_02262A8C.h" #include "overlay116/struct_ov116_0226501C.h" +#include "camera.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "narc.h" +#include "overlay_manager.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_020093B4.h" #include "unk_0200C6E4.h" #include "unk_0200F174.h" #include "unk_020170BC.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_02024220.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_020393C8.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay114/ov114_0225C700.h" -#include "overlay116/ov116_02260440.h" -#include "overlay116/ov116_022604C4.h" -#include "overlay116/ov116_02261870.h" -#include "overlay116/ov116_02262A44.h" -#include "overlay116/ov116_02262A8C.h" -#include "overlay116/ov116_0226432C.h" -#include "overlay116/ov116_02266FEC.h" -static void ov116_022612CC(UnkStruct_ov116_0226139C * param0); -static void ov116_02261494(BGL * param0); -static void ov116_022616CC(UnkStruct_ov116_0226139C * param0); +static void ov116_022612CC(UnkStruct_ov116_0226139C *param0); +static void ov116_02261494(BGL *param0); +static void ov116_022616CC(UnkStruct_ov116_0226139C *param0); static BOOL ov116_02261768(int param0); -static void ov116_0226178C(UnkStruct_ov116_0226139C * param0, BOOL param1, int param2, int * param3); -static void ov116_02261794(void * param0); -static void ov116_022610FC(UnkStruct_ov116_0226139C * param0); -static void ov116_02261244(UnkStruct_ov116_0226139C * param0); -static u32 ov116_022617E4(UnkStruct_ov116_0226139C * param0); +static void ov116_0226178C(UnkStruct_ov116_0226139C *param0, BOOL param1, int param2, int *param3); +static void ov116_02261794(void *param0); +static void ov116_022610FC(UnkStruct_ov116_0226139C *param0); +static void ov116_02261244(UnkStruct_ov116_0226139C *param0); +static u32 ov116_022617E4(UnkStruct_ov116_0226139C *param0); -static void ov116_022604C4 (UnkStruct_ov116_0226139C * param0) +static void ov116_022604C4(UnkStruct_ov116_0226139C *param0) { param0->unk_78 = LCRNG_GetSeed(); @@ -73,8 +73,8 @@ static void ov116_022604C4 (UnkStruct_ov116_0226139C * param0) sub_02039734(); { - NNSG2dPaletteData * v0; - void * v1 = sub_020394A8(106); + NNSG2dPaletteData *v0; + void *v1 = sub_020394A8(106); NNS_G2dGetUnpackedPaletteData(v1, &v0); sub_02002FBC(param0->unk_48.unk_14, v0->pRawData, 2, 14 * 16, 32); @@ -116,22 +116,22 @@ static void ov116_022604C4 (UnkStruct_ov116_0226139C * param0) { int v4; int v5[][2] = { - {44, 43}, - {46, 45}, - {48, 47}, - {50, 49}, - {44, 43}, - {46, 45}, - {48, 47}, - {50, 49}, - {44, 43}, - {46, 45}, - {48, 47}, - {50, 49}, - {44, 43}, - {46, 45}, - {48, 47}, - {50, 49}, + { 44, 43 }, + { 46, 45 }, + { 48, 47 }, + { 50, 49 }, + { 44, 43 }, + { 46, 45 }, + { 48, 47 }, + { 50, 49 }, + { 44, 43 }, + { 46, 45 }, + { 48, 47 }, + { 50, 49 }, + { 44, 43 }, + { 46, 45 }, + { 48, 47 }, + { 50, 49 }, }; for (v4 = 0; v4 < 8; v4++) { @@ -189,7 +189,7 @@ static void ov116_022604C4 (UnkStruct_ov116_0226139C * param0) ov116_022618B4(¶m0->unk_04->unk_308[2], param0->unk_14.unk_00); { - UnkStruct_ov116_0226501C * v9; + UnkStruct_ov116_0226501C *v9; int v10; v9 = ¶m0->unk_04->unk_308[0]; @@ -237,9 +237,9 @@ static void ov116_022604C4 (UnkStruct_ov116_0226139C * param0) } } -int ov116_022609B4 (OverlayManager * param0, int * param1) +int ov116_022609B4(OverlayManager *param0, int *param1) { - UnkStruct_ov116_0226139C * v0; + UnkStruct_ov116_0226139C *v0; Heap_Create(3, 106, 0x65000); v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov116_0226139C), 106); @@ -265,7 +265,7 @@ int ov116_022609B4 (OverlayManager * param0, int * param1) return 1; } -static void ov116_02260A2C (UnkStruct_ov116_02262A8C * param0, u32 param1, u32 param2) +static void ov116_02260A2C(UnkStruct_ov116_02262A8C *param0, u32 param1, u32 param2) { s16 v0, v1; BOOL v2; @@ -278,7 +278,7 @@ static void ov116_02260A2C (UnkStruct_ov116_02262A8C * param0, u32 param1, u32 p v2 = ov116_0226452C(¶m0->unk_FC, 1.0f); if (v2 = 1) { - VecFx32 v3 = {0, (FX32_CONST(100)), 0}; + VecFx32 v3 = { 0, (FX32_CONST(100)), 0 }; VecFx32 v4; MTX_MultVec43(&v3, ¶m0->unk_308[0].unk_1B0, ¶m0->unk_1FB0); } @@ -304,7 +304,7 @@ static void ov116_02260A2C (UnkStruct_ov116_02262A8C * param0, u32 param1, u32 p v2 = ov116_0226432C(¶m0->unk_FC, param1, param2, param0->unk_1FBC.unk_00, param0->unk_1FBC.unk_04, (2.50 * 0.80), 1); if (v2 = 1) { - VecFx32 v6 = {0, (FX32_CONST(100)), 0}; + VecFx32 v6 = { 0, (FX32_CONST(100)), 0 }; VecFx32 v7; MTX_MultVec43(&v6, ¶m0->unk_308[0].unk_1B0, ¶m0->unk_1FB0); } @@ -318,60 +318,60 @@ static void ov116_02260A2C (UnkStruct_ov116_02262A8C * param0, u32 param1, u32 p } } -static BOOL ov116_02260B6C (UnkStruct_ov116_02262A8C * param0) +static BOOL ov116_02260B6C(UnkStruct_ov116_02262A8C *param0) { int v0; int v1; int v2, v3; s16 v4[][2] = { - {0, 0}, - {0, -40}, - {0, -30}, - {0, -20}, - {0, -10}, - {0, 0}, - {0, 10}, - {0, 20}, - {0, 30}, - {0, 40}, - {0, 00}, - {0, 0}, - {0, 0}, - {0, -40}, - {0, -30}, - {0, -20}, - {0, -10}, - {0, 0}, - {0, 10}, - {0, 20}, - {0, 30}, - {0, 40}, - {0, 00}, - {0, 0}, - {0, 0}, - {10, 0}, - {20, 0}, - {30, 0}, - {40, 0}, - {50, 0}, - {60, 0}, - {70, 0}, - {80, 0}, - {90, 0}, - {0, 0}, - {0, 0}, - {0, 0}, - {10, 0}, - {20, 0}, - {30, 0}, - {40, 0}, - {50, 0}, - {60, 0}, - {70, 0}, - {80, 0}, - {90, 0}, - {0, 0}, - {0, 0}, + { 0, 0 }, + { 0, -40 }, + { 0, -30 }, + { 0, -20 }, + { 0, -10 }, + { 0, 0 }, + { 0, 10 }, + { 0, 20 }, + { 0, 30 }, + { 0, 40 }, + { 0, 00 }, + { 0, 0 }, + { 0, 0 }, + { 0, -40 }, + { 0, -30 }, + { 0, -20 }, + { 0, -10 }, + { 0, 0 }, + { 0, 10 }, + { 0, 20 }, + { 0, 30 }, + { 0, 40 }, + { 0, 00 }, + { 0, 0 }, + { 0, 0 }, + { 10, 0 }, + { 20, 0 }, + { 30, 0 }, + { 40, 0 }, + { 50, 0 }, + { 60, 0 }, + { 70, 0 }, + { 80, 0 }, + { 90, 0 }, + { 0, 0 }, + { 0, 0 }, + { 0, 0 }, + { 10, 0 }, + { 20, 0 }, + { 30, 0 }, + { 40, 0 }, + { 50, 0 }, + { 60, 0 }, + { 70, 0 }, + { 80, 0 }, + { 90, 0 }, + { 0, 0 }, + { 0, 0 }, }; v0 = sub_0200D3E0(param0->unk_D8); @@ -430,9 +430,9 @@ static BOOL ov116_02260B6C (UnkStruct_ov116_02262A8C * param0) return 0; } -int ov116_02260CF4 (OverlayManager * param0, int * param1) +int ov116_02260CF4(OverlayManager *param0, int *param1) { - UnkStruct_ov116_0226139C * v0 = OverlayManager_Data(param0); + UnkStruct_ov116_0226139C *v0 = OverlayManager_Data(param0); BOOL v1 = 0; u32 v2; @@ -668,7 +668,7 @@ int ov116_02260CF4 (OverlayManager * param0, int * param1) return 0; } -static void ov116_022610FC (UnkStruct_ov116_0226139C * param0) +static void ov116_022610FC(UnkStruct_ov116_0226139C *param0) { SetMainCallback(NULL, NULL); DisableHBlank(); @@ -721,7 +721,7 @@ static void ov116_022610FC (UnkStruct_ov116_0226139C * param0) param0->unk_04 = NULL; } -static void ov116_02261244 (UnkStruct_ov116_0226139C * param0) +static void ov116_02261244(UnkStruct_ov116_0226139C *param0) { param0->unk_0C = 0; param0->unk_08 = 0; @@ -731,13 +731,12 @@ static void ov116_02261244 (UnkStruct_ov116_0226139C * param0) memset(¶m0->unk_24, 0, sizeof(UnkStruct_ov116_02260498)); } -int ov116_0226126C (OverlayManager * param0, int * param1) +int ov116_0226126C(OverlayManager *param0, int *param1) { switch (*param1) { - case 0: - { + case 0: { u32 v0; - UnkStruct_ov116_0226139C * v1 = OverlayManager_Data(param0); + UnkStruct_ov116_0226139C *v1 = OverlayManager_Data(param0); v0 = ov116_022617E4(v1); @@ -751,8 +750,7 @@ int ov116_0226126C (OverlayManager * param0, int * param1) CommTiming_StartSync(999); (*param1)++; - } - break; + } break; default: if ((CommTiming_IsSyncState(999) == 1) || (CommSys_ConnectedCount() < CommInfo_CountReceived())) { return 1; @@ -763,7 +761,7 @@ int ov116_0226126C (OverlayManager * param0, int * param1) return 0; } -static void ov116_022612CC (UnkStruct_ov116_0226139C * param0) +static void ov116_022612CC(UnkStruct_ov116_0226139C *param0) { param0->unk_48.unk_00 = NARC_ctor(NARC_INDEX_ARC__MANENE, 106); param0->unk_48.unk_04 = NARC_ctor(NARC_INDEX_GRAPHIC__BUCKET, 106); @@ -804,7 +802,7 @@ static void ov116_022612CC (UnkStruct_ov116_0226139C * param0) Heap_FndInitAllocatorForExpHeap(¶m0->unk_48.unk_24, 106, 32); } -void ov116_0226139C (UnkStruct_ov116_0226139C * param0) +void ov116_0226139C(UnkStruct_ov116_0226139C *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); @@ -841,7 +839,7 @@ void ov116_0226139C (UnkStruct_ov116_0226139C * param0) G3X_AlphaBlend(0); } -static void ov116_02261494 (BGL * param0) +static void ov116_02261494(BGL *param0) { GXLayers_DisableEngineALayers(); { @@ -888,7 +886,7 @@ static void ov116_02261494 (BGL * param0) 0x3, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -903,7 +901,7 @@ static void ov116_02261494 (BGL * param0) 0x2, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -918,7 +916,7 @@ static void ov116_02261494 (BGL * param0) 0x2, 0x0, 0x0, - 0x0 + 0x0, }, { 0x0, @@ -933,7 +931,7 @@ static void ov116_02261494 (BGL * param0) 0x3, 0x0, 0x0, - 0x0 + 0x0, }, }; @@ -963,7 +961,7 @@ static void ov116_02261494 (BGL * param0) 3, 0, 0, - 0 + 0, }, { 0, @@ -978,7 +976,7 @@ static void ov116_02261494 (BGL * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -993,7 +991,7 @@ static void ov116_02261494 (BGL * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -1008,7 +1006,7 @@ static void ov116_02261494 (BGL * param0) 0, 0, 0, - 0 + 0, }, }; @@ -1048,7 +1046,7 @@ static void ov116_02261494 (BGL * param0) G2S_SetBlendAlpha(0, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_OBJ, 7, 10); } -static void ov116_022616CC (UnkStruct_ov116_0226139C * param0) +static void ov116_022616CC(UnkStruct_ov116_0226139C *param0) { param0->unk_48.unk_08 = sub_0200C6E4(106); { @@ -1095,22 +1093,22 @@ static void ov116_022616CC (UnkStruct_ov116_0226139C * param0) sub_0200964C(sub_0200C738(param0->unk_48.unk_08), 0, (192 + 64) << FX32_SHIFT); } -static BOOL ov116_02261768 (int param0) +static BOOL ov116_02261768(int param0) { sub_0200F174(0, param0, param0, 0, 6, 1, 106); return 1; } -static void ov116_0226178C (UnkStruct_ov116_0226139C * param0, BOOL param1, int param2, int * param3) +static void ov116_0226178C(UnkStruct_ov116_0226139C *param0, BOOL param1, int param2, int *param3) { if (param1) { *param3 = param2; } } -static void ov116_02261794 (void * param0) +static void ov116_02261794(void *param0) { - UnkStruct_ov116_0226139C * v0 = param0; + UnkStruct_ov116_0226139C *v0 = param0; sub_0201DCAC(); sub_0200C800(); @@ -1120,22 +1118,22 @@ static void ov116_02261794 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -BOOL ov116_022617C4 (UnkStruct_ov116_0226139C * param0) +BOOL ov116_022617C4(UnkStruct_ov116_0226139C *param0) { return (param0->unk_44 == 0) ? 1 : 0; } -void ov116_022617D4 (UnkStruct_ov116_0226139C * param0) +void ov116_022617D4(UnkStruct_ov116_0226139C *param0) { param0->unk_08 = 1; } -void ov116_022617DC (UnkStruct_ov116_0226139C * param0) +void ov116_022617DC(UnkStruct_ov116_0226139C *param0) { param0->unk_0C = 1; } -static u32 ov116_022617E4 (UnkStruct_ov116_0226139C * param0) +static u32 ov116_022617E4(UnkStruct_ov116_0226139C *param0) { if (ov114_0225CA54(¶m0->unk_84) == 1) { if (param0->unk_48.unk_2C.unk_00 == 0) { diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c index 252c379536..ce3e045885 100644 --- a/src/overlay116/ov116_02261870.c +++ b/src/overlay116/ov116_02261870.c @@ -1,49 +1,46 @@ +#include "overlay116/ov116_02261870.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "trainer_info.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02017294.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_defs/sprite_template.h" + +#include "overlay114/ov114_0225C700.h" +#include "overlay116/ov116_0226432C.h" #include "overlay116/struct_ov116_0226139C.h" #include "overlay116/struct_ov116_02262A8C.h" #include "overlay116/struct_ov116_0226501C.h" +#include "camera.h" +#include "inlines.h" +#include "message.h" +#include "narc.h" +#include "strbuf.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_020170BC.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "camera.h" -#include "strbuf.h" #include "unk_0202419C.h" -#include "trainer_info.h" -#include "overlay114/ov114_0225C700.h" -#include "overlay116/ov116_02261870.h" -#include "overlay116/ov116_0226432C.h" -static inline void inline_ov116_02261940(UnkStruct_ov116_0226501C * param0); +static inline void inline_ov116_02261940(UnkStruct_ov116_0226501C *param0); static inline void inline_ov116_02261940_1(void); -static void ov116_02261CD8(SpriteTemplate * param0, s16 param1, s16 param2, int param3, int param4, int param5); +static void ov116_02261CD8(SpriteTemplate *param0, s16 param1, s16 param2, int param3, int param4, int param5); void include_ov116_02261870(void); -void ov116_02261870 (UnkStruct_02017294 * param0, MtxFx43 * param1, VecFx32 * param2) +void ov116_02261870(UnkStruct_02017294 *param0, MtxFx43 *param1, VecFx32 *param2) { if (param0->unk_6C) { NNS_G3dGlbFlush(); @@ -54,23 +51,23 @@ void ov116_02261870 (UnkStruct_02017294 * param0, MtxFx43 * param1, VecFx32 * pa } } -static inline void inline_ov116_02261940 (UnkStruct_ov116_0226501C * param0) +static inline void inline_ov116_02261940(UnkStruct_ov116_0226501C *param0) { NNS_G3dGePushMtx(); ov116_02261870(¶m0->unk_00, ¶m0->unk_1B0, ¶m0->unk_1E0); NNS_G3dGePopMtx(1); } -static inline void inline_ov116_02261940_2 (UnkStruct_ov116_0226501C * wk, UnkStruct_ov116_0226501C * wk2) +static inline void inline_ov116_02261940_2(UnkStruct_ov116_0226501C *wk, UnkStruct_ov116_0226501C *wk2) { NNS_G3dGePushMtx(); ov116_02261870(&wk2->unk_00, &wk->unk_1B0, &wk->unk_1E0); NNS_G3dGePopMtx(1); } -static inline void inline_ov116_02261940_1 (void) +static inline void inline_ov116_02261940_1(void) { - VecFx32 v0 = {0, (-FX32_ONE), (-FX32_ONE)}; + VecFx32 v0 = { 0, (-FX32_ONE), (-FX32_ONE) }; VEC_Normalize(&v0, &v0); @@ -80,12 +77,12 @@ static inline void inline_ov116_02261940_1 (void) NNS_G3dGlbMaterialColorSpecEmi(GX_RGB(31, 31, 31), GX_RGB(31, 31, 31), 0); } -void ov116_022618A8 (UnkStruct_ov116_0226501C * param0, NARC * param1, int param2) +void ov116_022618A8(UnkStruct_ov116_0226501C *param0, NARC *param1, int param2) { sub_020170D8(¶m0->unk_78, param1, param2, 106); } -void ov116_022618B4 (UnkStruct_ov116_0226501C * param0, int param1) +void ov116_022618B4(UnkStruct_ov116_0226501C *param0, int param1) { sub_02017258(¶m0->unk_00, ¶m0->unk_78); sub_02017350(¶m0->unk_00, (0 * FX32_ONE), (-20 * FX32_ONE), (0 * FX32_ONE)); @@ -107,13 +104,13 @@ void ov116_022618B4 (UnkStruct_ov116_0226501C * param0, int param1) param0->unk_1F0 = 1; } -void ov116_0226192C (UnkStruct_ov116_0226501C * param0) +void ov116_0226192C(UnkStruct_ov116_0226501C *param0) { param0->unk_1F0 = 0; sub_02017110(¶m0->unk_78); } -void ov116_02261940 (UnkStruct_ov116_0226139C * param0) +void ov116_02261940(UnkStruct_ov116_0226139C *param0) { sub_020241B4(); Camera_ComputeViewMatrix(); @@ -179,7 +176,7 @@ void ov116_02261940 (UnkStruct_ov116_0226139C * param0) sub_0200C7EC(param0->unk_48.unk_0C); } -void ov116_02261C48 (UnkStruct_ov116_02262A8C * param0, int param1) +void ov116_02261C48(UnkStruct_ov116_02262A8C *param0, int param1) { int v0 = param0->unk_308[0].unk_1F4; int v1 = param1; @@ -193,17 +190,17 @@ void ov116_02261C48 (UnkStruct_ov116_02262A8C * param0, int param1) sub_0201727C(¶m0->unk_308[0].unk_00, ¶m0->unk_308[0].unk_88[v1]); } -void ov116_02261C88 (UnkStruct_ov116_0226139C * param0) +void ov116_02261C88(UnkStruct_ov116_0226139C *param0) { - VecFx32 v0 = {0, 0, 0}; - VecFx32 v1 = {0, 0, (FX32_ONE * 160)}; + VecFx32 v0 = { 0, 0, 0 }; + VecFx32 v1 = { 0, 0, (FX32_ONE * 160) }; Camera_InitWithTargetAndPosition(&v0, &v1, 0xb60, 0, 0, param0->unk_48.camera); Camera_SetClipping((FX32_ONE * -1000), (FX32_ONE * 1000), param0->unk_48.camera); Camera_SetAsActive(param0->unk_48.camera); } -static void ov116_02261CD8 (SpriteTemplate * param0, s16 param1, s16 param2, int param3, int param4, int param5) +static void ov116_02261CD8(SpriteTemplate *param0, s16 param1, s16 param2, int param3, int param4, int param5) { param0->x = param1; param0->y = param2; @@ -223,18 +220,18 @@ static void ov116_02261CD8 (SpriteTemplate * param0, s16 param1, s16 param2, int } static const s16 Unk_ov116_02267A78[][3] = { - {0x0, 0x0, 0x0}, - {0x80, 0x0, 0x0}, - {0x55, 0xAA, 0x0}, - {0x40, 0x80, 0xC0} + { 0x0, 0x0, 0x0 }, + { 0x80, 0x0, 0x0 }, + { 0x55, 0xAA, 0x0 }, + { 0x40, 0x80, 0xC0 } }; -void ov116_02261D08 (UnkStruct_ov116_02262A8C * param0) +void ov116_02261D08(UnkStruct_ov116_02262A8C *param0) { SpriteTemplate v0; - SpriteRenderer * v1 = param0->unk_14->unk_08; - SpriteGfxHandler * v2 = param0->unk_14->unk_0C; - PaletteData * v3 = param0->unk_14->unk_14; + SpriteRenderer *v1 = param0->unk_14->unk_08; + SpriteGfxHandler *v2 = param0->unk_14->unk_0C; + PaletteData *v3 = param0->unk_14->unk_14; int v4; for (v4 = 0; v4 < (3 * 12); v4++) { @@ -247,14 +244,14 @@ void ov116_02261D08 (UnkStruct_ov116_02262A8C * param0) ov116_02261E0C(param0, 0, 0); } -void ov116_02261D70 (UnkStruct_ov116_02262A8C * param0) +void ov116_02261D70(UnkStruct_ov116_02262A8C *param0) { SpriteTemplate v0; - SpriteRenderer * v1 = param0->unk_14->unk_08; - SpriteGfxHandler * v2 = param0->unk_14->unk_0C; - PaletteData * v3 = param0->unk_14->unk_14; + SpriteRenderer *v1 = param0->unk_14->unk_08; + SpriteGfxHandler *v2 = param0->unk_14->unk_0C; + PaletteData *v3 = param0->unk_14->unk_14; int v4; - s16 v5[] = {72, 180, 24, 232}; + s16 v5[] = { 72, 180, 24, 232 }; for (v4 = 0; v4 < 4; v4++) { ov116_02261CD8(&v0, v5[v4], (192 + 32), 1, 1, 9004); @@ -268,7 +265,7 @@ void ov116_02261D70 (UnkStruct_ov116_02262A8C * param0) } } -void ov116_02261DF0 (UnkStruct_ov116_02262A8C * param0) +void ov116_02261DF0(UnkStruct_ov116_02262A8C *param0) { int v0; @@ -277,7 +274,7 @@ void ov116_02261DF0 (UnkStruct_ov116_02262A8C * param0) } } -void ov116_02261E0C (UnkStruct_ov116_02262A8C * param0, BOOL param1, int param2) +void ov116_02261E0C(UnkStruct_ov116_02262A8C *param0, BOOL param1, int param2) { int v0; @@ -286,7 +283,7 @@ void ov116_02261E0C (UnkStruct_ov116_02262A8C * param0, BOOL param1, int param2) } } -void ov116_02261E28 (UnkStruct_ov116_02262A8C * param0) +void ov116_02261E28(UnkStruct_ov116_02262A8C *param0) { int v0; @@ -295,7 +292,7 @@ void ov116_02261E28 (UnkStruct_ov116_02262A8C * param0) } } -void ov116_02261E40 (UnkStruct_ov116_02262A8C * param0) +void ov116_02261E40(UnkStruct_ov116_02262A8C *param0) { int v0; @@ -304,19 +301,25 @@ void ov116_02261E40 (UnkStruct_ov116_02262A8C * param0) } } -void include_ov116_02261870 (void) +void include_ov116_02261870(void) { int dummy[][2] = { - {0, 2}, {0, 3}, {0, 4}, {1, 2}, + { 0, 2 }, + { 0, 3 }, + { 0, 4 }, + { 1, 2 }, }; dummy[0]; } -void ov116_02261E58 (UnkStruct_ov116_02262A8C * param0, int param1, int param2) +void ov116_02261E58(UnkStruct_ov116_02262A8C *param0, int param1, int param2) { int v0[][2] = { - {0, 2}, {0, 3}, {0, 4}, {1, 2}, + { 0, 2 }, + { 0, 3 }, + { 0, 4 }, + { 1, 2 }, }; int v1 = param0->unk_DC[param1]; @@ -325,10 +328,13 @@ void ov116_02261E58 (UnkStruct_ov116_02262A8C * param0, int param1, int param2) sub_0200D364(param0->unk_20[v1], v0[param2][1]); } -int ov116_02261EA4 (UnkStruct_ov116_02262A8C * param0, int param1) +int ov116_02261EA4(UnkStruct_ov116_02262A8C *param0, int param1) { int v0[][2] = { - {0, 2}, {0, 3}, {0, 4}, {1, 2}, + { 0, 2 }, + { 0, 3 }, + { 0, 4 }, + { 1, 2 }, }; int v1; @@ -353,7 +359,7 @@ int ov116_02261EA4 (UnkStruct_ov116_02262A8C * param0, int param1) return 0; } -void ov116_02261F08 (UnkStruct_ov116_02262A8C * param0) +void ov116_02261F08(UnkStruct_ov116_02262A8C *param0) { int v0; int v1 = 0; @@ -371,7 +377,7 @@ void ov116_02261F08 (UnkStruct_ov116_02262A8C * param0) } } -void ov116_02261F3C (UnkStruct_ov116_02262A8C * param0) +void ov116_02261F3C(UnkStruct_ov116_02262A8C *param0) { int v0; int v1 = 0; @@ -389,15 +395,15 @@ void ov116_02261F3C (UnkStruct_ov116_02262A8C * param0) } } -void ov116_02261F70 (UnkStruct_ov116_02262A8C * param0) +void ov116_02261F70(UnkStruct_ov116_02262A8C *param0) { Window_Init(¶m0->unk_1FC8); BGL_AddWindow(param0->unk_14->unk_10, ¶m0->unk_1FC8, 7, 2, 19, 28, 4, 14, 256 + (16 * 3)); BGL_FillWindow(¶m0->unk_1FC8, 0xFF); { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; v0 = MessageLoader_Init(0, 26, 410, 106); v1 = MessageLoader_GetNewStrbuf(v0, 0); @@ -411,7 +417,7 @@ void ov116_02261F70 (UnkStruct_ov116_02262A8C * param0) sub_0201A954(¶m0->unk_1FC8); } -void ov116_02262004 (UnkStruct_ov116_02262A8C * param0) +void ov116_02262004(UnkStruct_ov116_02262A8C *param0) { if (BGL_WindowAdded(¶m0->unk_1FC8) == 1) { Window_Clear(¶m0->unk_1FC8, 1); @@ -420,33 +426,33 @@ void ov116_02262004 (UnkStruct_ov116_02262A8C * param0) } } -void ov116_02262034 (UnkStruct_ov116_0226139C * param0, int param1) +void ov116_02262034(UnkStruct_ov116_0226139C *param0, int param1) { - PaletteData * v0 = param0->unk_48.unk_14; + PaletteData *v0 = param0->unk_48.unk_14; static int v1[][4][4 + 1] = { { - {0, 0, 0, 0, 0}, - {0, 0, 0, 0, 0}, - {0, 0, 0, 0, 0}, - {0, 0, 0, 0, 0}, + { 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, }, { - {1, 2, 0, 0, 0}, - {2, 1, 0, 0, 0}, - {0, 0, 0, 0, 0}, - {0, 0, 0, 0, 0}, + { 1, 2, 0, 0, 0 }, + { 2, 1, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, }, { - {1, 2, 3, 0, 0}, - {2, 1, 3, 0, 0}, - {3, 1, 2, 0, 0}, - {0, 0, 0, 0, 0}, + { 1, 2, 3, 0, 0 }, + { 2, 1, 3, 0, 0 }, + { 3, 1, 2, 0, 0 }, + { 0, 0, 0, 0, 0 }, }, { - {1, 2, 3, 4, 0}, - {2, 1, 3, 4, 0}, - {3, 1, 2, 4, 0}, - {4, 1, 2, 3, 0}, + { 1, 2, 3, 4, 0 }, + { 2, 1, 3, 4, 0 }, + { 3, 1, 2, 4, 0 }, + { 4, 1, 2, 3, 0 }, }, }; @@ -459,7 +465,7 @@ void ov116_02262034 (UnkStruct_ov116_0226139C * param0, int param1) } } -static int ov116_0226208C (Window * param0, Strbuf *param1) +static int ov116_0226208C(Window *param0, Strbuf *param1) { int v0 = sub_02002D7C(0, param1, 0); int v1 = (sub_0201C294(param0) * 8 - v0) / 2; @@ -467,31 +473,31 @@ static int ov116_0226208C (Window * param0, Strbuf *param1) return v1; } -void ov116_022620AC (UnkStruct_ov116_0226139C * param0, UnkStruct_ov116_02262A8C * param1) +void ov116_022620AC(UnkStruct_ov116_0226139C *param0, UnkStruct_ov116_02262A8C *param1) { int v0; int v1 = 0; int v2 = 256; - Window * v3; + Window *v3; s16 v4[][3][4] = { { - {12, 8, 8, 2}, - {0, 0, 0, 0}, - {0, 0, 0, 0}, + { 12, 8, 8, 2 }, + { 0, 0, 0, 0 }, + { 0, 0, 0, 0 }, }, { - {4 + 1, 8, 8, 2}, - {18 + 1, 8, 8, 2}, - {0, 0, 0, 0}, + { 4 + 1, 8, 8, 2 }, + { 18 + 1, 8, 8, 2 }, + { 0, 0, 0, 0 }, }, { - {0 + 1, 8, 8, 2}, - {11 + 1, 8, 8, 2}, - {22 + 1, 8, 8, 2}, + { 0 + 1, 8, 8, 2 }, + { 11 + 1, 8, 8, 2 }, + { 22 + 1, 8, 8, 2 }, }, }; int v5, v6, v7, v8; - TrainerInfo * v9; + TrainerInfo *v9; BOOL v10; switch (param1->unk_04) { @@ -529,7 +535,7 @@ void ov116_022620AC (UnkStruct_ov116_0226139C * param0, UnkStruct_ov116_02262A8C BGL_FillWindow(v3, 0xFF); { - Strbuf* v11; + Strbuf *v11; int v12; v11 = TrainerInfo_NameNewStrbuf(v9, 106); @@ -549,11 +555,11 @@ void ov116_022620AC (UnkStruct_ov116_0226139C * param0, UnkStruct_ov116_02262A8C } } -void ov116_02262264 (UnkStruct_ov116_02262A8C * param0) +void ov116_02262264(UnkStruct_ov116_02262A8C *param0) { int v0; int v1 = 0; - Window * v2; + Window *v2; for (v0 = 0; v0 < param0->unk_04; v0++) { if (v0 == param0->unk_00) { @@ -572,15 +578,15 @@ void ov116_02262264 (UnkStruct_ov116_02262A8C * param0) sub_0200710C(param0->unk_14->unk_00, 78, param0->unk_14->unk_10, 7, 0, 0, 0, 106); } -void ov116_022622C8 (UnkStruct_ov116_0226139C * param0) +void ov116_022622C8(UnkStruct_ov116_0226139C *param0) { - NARC * v0 = param0->unk_48.unk_00; - NARC * v1 = param0->unk_48.unk_04; - BGL * v2 = param0->unk_48.unk_10; - SpriteRenderer * v3 = param0->unk_48.unk_08; - SpriteGfxHandler * v4 = param0->unk_48.unk_0C; - PaletteData * v5 = param0->unk_48.unk_14; - NARC * v6; + NARC *v0 = param0->unk_48.unk_00; + NARC *v1 = param0->unk_48.unk_04; + BGL *v2 = param0->unk_48.unk_10; + SpriteRenderer *v3 = param0->unk_48.unk_08; + SpriteGfxHandler *v4 = param0->unk_48.unk_0C; + PaletteData *v5 = param0->unk_48.unk_14; + NARC *v6; int v7; int v8; int v9; @@ -662,7 +668,7 @@ void ov116_022622C8 (UnkStruct_ov116_0226139C * param0) SpriteRenderer_LoadPalette(v5, 2, v3, v4, v6, v10, 0, v12, NNS_G2D_VRAM_TYPE_2DMAIN, v11); { - NARC * v13 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL, 106); + NARC *v13 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__WIFI_LOBBY_MINIGAME__WLMNGM_TOOL, 106); v7 = 23; v8 = 22; @@ -679,12 +685,12 @@ void ov116_022622C8 (UnkStruct_ov116_0226139C * param0) } } -void ov116_022625A8 (UnkStruct_ov116_0226139C * param0, UnkStruct_ov116_02262A8C * param1) +void ov116_022625A8(UnkStruct_ov116_0226139C *param0, UnkStruct_ov116_02262A8C *param1) { SpriteTemplate v0; - SpriteRenderer * v1 = param1->unk_14->unk_08; - SpriteGfxHandler * v2 = param1->unk_14->unk_0C; - PaletteData * v3 = param1->unk_14->unk_14; + SpriteRenderer *v1 = param1->unk_14->unk_08; + SpriteGfxHandler *v2 = param1->unk_14->unk_0C; + PaletteData *v3 = param1->unk_14->unk_14; int v4; int v5 = 0; @@ -719,13 +725,13 @@ void ov116_022625A8 (UnkStruct_ov116_0226139C * param0, UnkStruct_ov116_02262A8C } } -CellActorData * ov116_022626E8 (UnkStruct_ov116_02262A8C * param0, s16 param1, s16 param2) +CellActorData *ov116_022626E8(UnkStruct_ov116_02262A8C *param0, s16 param1, s16 param2) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; - SpriteRenderer * v2 = param0->unk_14->unk_08; - SpriteGfxHandler * v3 = param0->unk_14->unk_0C; - PaletteData * v4 = param0->unk_14->unk_14; + SpriteRenderer *v2 = param0->unk_14->unk_08; + SpriteGfxHandler *v3 = param0->unk_14->unk_0C; + PaletteData *v4 = param0->unk_14->unk_14; ov116_02261CD8(&v1, param1, param2, 1, 0, 9003); @@ -738,14 +744,14 @@ CellActorData * ov116_022626E8 (UnkStruct_ov116_02262A8C * param0, s16 param1, s return v0; } -void ov116_02262724 (UnkStruct_ov116_02262A8C * param0) +void ov116_02262724(UnkStruct_ov116_02262A8C *param0) { int v0; - CellActorData * v1; + CellActorData *v1; SpriteTemplate v2; - SpriteRenderer * v3 = param0->unk_14->unk_08; - SpriteGfxHandler * v4 = param0->unk_14->unk_0C; - PaletteData * v5 = param0->unk_14->unk_14; + SpriteRenderer *v3 = param0->unk_14->unk_08; + SpriteGfxHandler *v4 = param0->unk_14->unk_0C; + PaletteData *v5 = param0->unk_14->unk_14; for (v0 = 0; v0 < 2; v0++) { ov116_02261CD8(&v2, 0, 0, 1, 4, 9002); @@ -774,7 +780,7 @@ void ov116_02262724 (UnkStruct_ov116_02262A8C * param0) } } -void ov116_0226281C (UnkStruct_ov116_02262A8C * param0) +void ov116_0226281C(UnkStruct_ov116_02262A8C *param0) { int v0; @@ -784,14 +790,14 @@ void ov116_0226281C (UnkStruct_ov116_02262A8C * param0) } } -void ov116_02262840 (UnkStruct_ov116_02262A8C * param0) +void ov116_02262840(UnkStruct_ov116_02262A8C *param0) { int v0; - CellActorData * v1; + CellActorData *v1; SpriteTemplate v2; - SpriteRenderer * v3 = param0->unk_14->unk_08; - SpriteGfxHandler * v4 = param0->unk_14->unk_0C; - PaletteData * v5 = param0->unk_14->unk_14; + SpriteRenderer *v3 = param0->unk_14->unk_08; + SpriteGfxHandler *v4 = param0->unk_14->unk_0C; + PaletteData *v5 = param0->unk_14->unk_14; ov116_02261CD8(&v2, 128, 128, 1, 7, 9007); @@ -805,20 +811,20 @@ void ov116_02262840 (UnkStruct_ov116_02262A8C * param0) sub_0200D430(param0->unk_D8, 7); } -void ov116_022628AC (UnkStruct_ov116_02262A8C * param0) +void ov116_022628AC(UnkStruct_ov116_02262A8C *param0) { sub_0200D0F4(param0->unk_D8); } -void ov116_022628B8 (UnkStruct_ov116_0226139C * param0) +void ov116_022628B8(UnkStruct_ov116_0226139C *param0) { - NARC * v0 = param0->unk_48.unk_00; - NARC * v1 = param0->unk_48.unk_04; - BGL * v2 = param0->unk_48.unk_10; - SpriteRenderer * v3 = param0->unk_48.unk_08; - SpriteGfxHandler * v4 = param0->unk_48.unk_0C; - PaletteData * v5 = param0->unk_48.unk_14; - NARC * v6 = v0; + NARC *v0 = param0->unk_48.unk_00; + NARC *v1 = param0->unk_48.unk_04; + BGL *v2 = param0->unk_48.unk_10; + SpriteRenderer *v3 = param0->unk_48.unk_08; + SpriteGfxHandler *v4 = param0->unk_48.unk_0C; + PaletteData *v5 = param0->unk_48.unk_14; + NARC *v6 = v0; sub_020070E8(v6, 72, v2, 4, 0, 0, 0, 106); sub_020070E8(v6, 75, v2, 5, 0, 0, 0, 106); diff --git a/src/overlay116/ov116_02262A44.c b/src/overlay116/ov116_02262A44.c index 4f0ace7dab..f6e8cdcbae 100644 --- a/src/overlay116/ov116_02262A44.c +++ b/src/overlay116/ov116_02262A44.c @@ -1,3 +1,5 @@ +#include "overlay116/ov116_02262A44.h" + #include #include @@ -5,11 +7,10 @@ #include "overlay116/struct_ov116_022649E4.h" #include "heap.h" -#include "overlay116/ov116_02262A44.h" -UnkStruct_ov116_02262A44 * ov116_02262A44 (int param0, UnkStruct_ov116_022649E4 * param1) +UnkStruct_ov116_02262A44 *ov116_02262A44(int param0, UnkStruct_ov116_022649E4 *param1) { - UnkStruct_ov116_02262A44 * v0 = Heap_AllocFromHeap(106, sizeof(UnkStruct_ov116_02262A44)); + UnkStruct_ov116_02262A44 *v0 = Heap_AllocFromHeap(106, sizeof(UnkStruct_ov116_02262A44)); memset(v0, 0, sizeof(UnkStruct_ov116_02262A44)); @@ -20,12 +21,12 @@ UnkStruct_ov116_02262A44 * ov116_02262A44 (int param0, UnkStruct_ov116_022649E4 return v0; } -void ov116_02262A6C (UnkStruct_ov116_02262A44 * param0) +void ov116_02262A6C(UnkStruct_ov116_02262A44 *param0) { Heap_FreeToHeap(param0); } -BOOL ov116_02262A74 (UnkStruct_ov116_02262A44 * param0) +BOOL ov116_02262A74(UnkStruct_ov116_02262A44 *param0) { if ((--param0->unk_08) <= 0) { return 0; diff --git a/src/overlay116/ov116_02262A8C.c b/src/overlay116/ov116_02262A8C.c index 8289c3975d..3572d64c04 100644 --- a/src/overlay116/ov116_02262A8C.c +++ b/src/overlay116/ov116_02262A8C.c @@ -1,11 +1,11 @@ +#include "overlay116/ov116_02262A8C.h" + #include #include -#include "inlines.h" - -#include "sys_task_manager.h" - -#include "touch_screen.h" +#include "overlay116/ov116_02261870.h" +#include "overlay116/ov116_0226432C.h" +#include "overlay116/ov116_02266FEC.h" #include "overlay116/struct_ov116_02260490.h" #include "overlay116/struct_ov116_02262A8C.h" #include "overlay116/struct_ov116_02262CB8.h" @@ -14,114 +14,113 @@ #include "overlay116/struct_ov116_022649E4.h" #include "overlay116/struct_ov116_0226501C.h" +#include "communication_system.h" +#include "heap.h" +#include "inlines.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_0201D15C.h" -#include "communication_system.h" -#include "overlay116/ov116_02261870.h" -#include "overlay116/ov116_02262A8C.h" -#include "overlay116/ov116_0226432C.h" -#include "overlay116/ov116_02266FEC.h" static const s16 Unk_ov116_02267BFC[] = { - -2, - -2, - -1, - -1, - -1, - -1, - 0xEE, - 0x2, - 0x2, - 0x2, - 0x2, - 0x4, - 0x4, - 0x4, - 0x4, - 0x6, - 0x6, - 0x6, - 0x6, - 0xFF + -2, + -2, + -1, + -1, + -1, + -1, + 0xEE, + 0x2, + 0x2, + 0x2, + 0x2, + 0x4, + 0x4, + 0x4, + 0x4, + 0x6, + 0x6, + 0x6, + 0x6, + 0xFF }; static const s16 Unk_ov116_02267C24[] = { - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xEE, - 0x0, - 0x0, - 0x4, - 0x4, - 0x4, - 0x4, - 0x4, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xEE, + 0x0, + 0x0, + 0x4, + 0x4, + 0x4, + 0x4, + 0x4, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF }; static const s16 Unk_ov116_02267BB4[] = { - -2, - -2, - -2, - -2, - -1, - -1, - 0x3, - 0x3, - 0x4, - 0x4, - 0x6, - 0x6, - 0x7, - 0x7, - 0x8, - 0x8 + -2, + -2, + -2, + -2, + -1, + -1, + 0x3, + 0x3, + 0x4, + 0x4, + 0x6, + 0x6, + 0x7, + 0x7, + 0x8, + 0x8 }; static const s16 Unk_ov116_02267C4C[] = { - -3, - -3, - -2, - -2, - -1, - -1, - 0xEE, - 0x1, - 0x1, - 0x2, - 0x2, - 0x3, - 0x3, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0xFF + -3, + -3, + -2, + -2, + -1, + -1, + 0xEE, + 0x1, + 0x1, + 0x2, + 0x2, + 0x3, + 0x3, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0xFF }; typedef struct { @@ -129,63 +128,63 @@ typedef struct { int unk_04; } UnkStruct_ov116_02267C88; -static void ov116_02262CB8(UnkStruct_ov116_02262A8C * param0, int param1); -static void ov116_02262D08(UnkStruct_ov116_02262A8C * param0, int param1); -static void ov116_02262D64(UnkStruct_ov116_02262A8C * param0, int param1); -static void ov116_02262DC0(UnkStruct_ov116_02262A8C * param0); -static void ov116_0226323C(SysTask * param0, void * param1); -static void ov116_02263434(SysTask * param0, void * param1); -static void ov116_0226377C(UnkStruct_ov116_02262A8C * param0); -static void ov116_022637B4(UnkStruct_ov116_02262A8C * param0); -static BOOL ov116_022637F0(UnkStruct_ov116_02262A8C * param0); -static BOOL ov116_0226386C(UnkStruct_ov116_02262A8C * param0, int param1, int * param2); -static void ov116_022638C8(UnkStruct_ov116_02262A8C * param0); -static void ov116_022639BC(UnkStruct_ov116_02262A8C * param0); +static void ov116_02262CB8(UnkStruct_ov116_02262A8C *param0, int param1); +static void ov116_02262D08(UnkStruct_ov116_02262A8C *param0, int param1); +static void ov116_02262D64(UnkStruct_ov116_02262A8C *param0, int param1); +static void ov116_02262DC0(UnkStruct_ov116_02262A8C *param0); +static void ov116_0226323C(SysTask *param0, void *param1); +static void ov116_02263434(SysTask *param0, void *param1); +static void ov116_0226377C(UnkStruct_ov116_02262A8C *param0); +static void ov116_022637B4(UnkStruct_ov116_02262A8C *param0); +static BOOL ov116_022637F0(UnkStruct_ov116_02262A8C *param0); +static BOOL ov116_0226386C(UnkStruct_ov116_02262A8C *param0, int param1, int *param2); +static void ov116_022638C8(UnkStruct_ov116_02262A8C *param0); +static void ov116_022639BC(UnkStruct_ov116_02262A8C *param0); static inline u32 inline_ov116_02263E20(void); -static inline s8 inline_ov116_02263E20_1(void); -static inline s8 inline_ov116_02263E20_2(s16 val); +static inline s8 inline_ov116_02263E20_1(void); +static inline s8 inline_ov116_02263E20_2(s16 val); void include_unk_ov116_02267BB4(void); void include_unk_ov116_02267BFC(void); void include_unk_ov116_02267C24(void); void include_unk_ov116_02267C4C(void); static const int Unk_ov116_02267BD4[][2] = { - {0x1F, 0x20}, - {0x21, 0x22}, - {0x23, 0x24}, - {0x25, 0x26}, - {0x25, 0x26} + { 0x1F, 0x20 }, + { 0x21, 0x22 }, + { 0x23, 0x24 }, + { 0x25, 0x26 }, + { 0x25, 0x26 } }; static const int Unk_ov116_02267B9C[][2] = { - {0x27, 0x28}, - {0x29, 0x2A}, - {0x29, 0x2A} + { 0x27, 0x28 }, + { 0x29, 0x2A }, + { 0x29, 0x2A } }; -void include_unk_ov116_02267BB4 (void) +void include_unk_ov116_02267BB4(void) { Unk_ov116_02267BB4[0]; } -void include_unk_ov116_02267BFC (void) +void include_unk_ov116_02267BFC(void) { Unk_ov116_02267BFC[0]; } -void include_unk_ov116_02267C24 (void) +void include_unk_ov116_02267C24(void) { Unk_ov116_02267C24[0]; } -void include_unk_ov116_02267C4C (void) +void include_unk_ov116_02267C4C(void) { Unk_ov116_02267C4C[0]; } -UnkStruct_ov116_02262A8C * ov116_02262A8C (int param0, u32 param1, UnkStruct_ov116_022649E4 * param2) +UnkStruct_ov116_02262A8C *ov116_02262A8C(int param0, u32 param1, UnkStruct_ov116_022649E4 *param2) { - UnkStruct_ov116_02262A8C * v0 = Heap_AllocFromHeap(106, sizeof(UnkStruct_ov116_02262A8C)); + UnkStruct_ov116_02262A8C *v0 = Heap_AllocFromHeap(106, sizeof(UnkStruct_ov116_02262A8C)); memset(v0, 0, sizeof(UnkStruct_ov116_02262A8C)); @@ -207,7 +206,7 @@ UnkStruct_ov116_02262A8C * ov116_02262A8C (int param0, u32 param1, UnkStruct_ov1 return v0; } -void ov116_02262AE4 (UnkStruct_ov116_02262A8C * param0) +void ov116_02262AE4(UnkStruct_ov116_02262A8C *param0) { int v0; @@ -243,12 +242,12 @@ void ov116_02262AE4 (UnkStruct_ov116_02262A8C * param0) ov116_0226432C(¶m0->unk_92C, 0, 0, -5, -5, (0.80), 0); } -void ov116_02262C64 (UnkStruct_ov116_02262A8C * param0) +void ov116_02262C64(UnkStruct_ov116_02262A8C *param0) { Heap_FreeToHeap(param0); } -BOOL ov116_02262C6C (UnkStruct_ov116_02262A8C * param0, int * param1) +BOOL ov116_02262C6C(UnkStruct_ov116_02262A8C *param0, int *param1) { int v0; int v1; @@ -263,7 +262,7 @@ BOOL ov116_02262C6C (UnkStruct_ov116_02262A8C * param0, int * param1) return 0; } -void ov116_02262C84 (UnkStruct_ov116_02262A8C * param0) +void ov116_02262C84(UnkStruct_ov116_02262A8C *param0) { int v0; int v1; @@ -289,9 +288,9 @@ void ov116_02262C84 (UnkStruct_ov116_02262A8C * param0) ov116_02261C48(param0, 0); } -static void ov116_02262CB8 (UnkStruct_ov116_02262A8C * param0, int param1) +static void ov116_02262CB8(UnkStruct_ov116_02262A8C *param0, int param1) { - UnkStruct_ov116_02262CB8 * v0 = Heap_AllocFromHeap(106, sizeof(UnkStruct_ov116_02262CB8)); + UnkStruct_ov116_02262CB8 *v0 = Heap_AllocFromHeap(106, sizeof(UnkStruct_ov116_02262CB8)); memset(v0, 0, sizeof(UnkStruct_ov116_02262CB8)); @@ -304,9 +303,9 @@ static void ov116_02262CB8 (UnkStruct_ov116_02262A8C * param0, int param1) SysTask_Start(ov116_02263158, v0, 4096); } -static void ov116_02262D08 (UnkStruct_ov116_02262A8C * param0, int param1) +static void ov116_02262D08(UnkStruct_ov116_02262A8C *param0, int param1) { - UnkStruct_ov116_02262D08 * v0; + UnkStruct_ov116_02262D08 *v0; v0 = ¶m0->unk_268C[param1]; @@ -326,9 +325,9 @@ static void ov116_02262D08 (UnkStruct_ov116_02262A8C * param0, int param1) SysTask_Start(ov116_0226323C, v0, 4096); } -static void ov116_02262D64 (UnkStruct_ov116_02262A8C * param0, int param1) +static void ov116_02262D64(UnkStruct_ov116_02262A8C *param0, int param1) { - UnkStruct_ov116_02262D08 * v0; + UnkStruct_ov116_02262D08 *v0; v0 = ¶m0->unk_268C[param1]; @@ -349,9 +348,9 @@ static void ov116_02262D64 (UnkStruct_ov116_02262A8C * param0, int param1) SysTask_Start(ov116_02263434, v0, 4096); } -static void ov116_02262DC0 (UnkStruct_ov116_02262A8C * param0) +static void ov116_02262DC0(UnkStruct_ov116_02262A8C *param0) { - UnkStruct_ov116_02262DC0 * v0 = Heap_AllocFromHeap(106, sizeof(UnkStruct_ov116_02262DC0)); + UnkStruct_ov116_02262DC0 *v0 = Heap_AllocFromHeap(106, sizeof(UnkStruct_ov116_02262DC0)); memset(v0, 0, sizeof(UnkStruct_ov116_02262DC0)); @@ -370,9 +369,9 @@ static void ov116_02262DC0 (UnkStruct_ov116_02262A8C * param0) SysTask_Start(ov116_02262E50, v0, 4096); } -void ov116_02262E50 (SysTask * param0, void * param1) +void ov116_02262E50(SysTask *param0, void *param1) { - UnkStruct_ov116_02262DC0 * v0 = param1; + UnkStruct_ov116_02262DC0 *v0 = param1; s16 v1; s16 v2; s16 v3 = v0->unk_10->unk_1E0.y >> FX32_SHIFT; @@ -423,8 +422,7 @@ void ov116_02262E50 (SysTask * param0, void * param1) v0->unk_08 = 0; v0->unk_00++; break; - case 1: - { + case 1: { BOOL v9[2]; v9[0] = ov116_02264774(&v0->unk_44); @@ -458,10 +456,8 @@ void ov116_02262E50 (SysTask * param0, void * param1) v0->unk_00++; } - } - break; - case 2: - { + } break; + case 2: { BOOL v10[2]; v10[0] = ov116_02264774(&v0->unk_44); @@ -475,15 +471,14 @@ void ov116_02262E50 (SysTask * param0, void * param1) } v0->unk_00++; } - } - break; + } break; case 3: if (v0->unk_04 == 0) { - if (v0->unk_08 == (((30 * 3)) - 82)) { + if (v0->unk_08 == ((30 * 3) - 82)) { Sound_PlayEffect(1397); } - if ((++v0->unk_08) >= (((30 * 3)) - 50)) { + if ((++v0->unk_08) >= ((30 * 3) - 50)) { *v0->unk_0C = 2; v0->unk_00++; } @@ -493,7 +488,7 @@ void ov116_02262E50 (SysTask * param0, void * param1) break; default: if (v0->unk_04 == 0) { - if ((++v0->unk_08) >= (((30 * 3)) - 45)) { + if ((++v0->unk_08) >= ((30 * 3) - 45)) { *v0->unk_0C = 0; Sound_PlayEffect(1547); v0->unk_00 = 0; @@ -516,9 +511,9 @@ void ov116_02262E50 (SysTask * param0, void * param1) } } -void ov116_02263158 (SysTask * param0, void * param1) +void ov116_02263158(SysTask *param0, void *param1) { - UnkStruct_ov116_02262CB8 * v0 = param1; + UnkStruct_ov116_02262CB8 *v0 = param1; int v1 = sub_0200D3E0(v0->unk_0C); if ((ScreenWipe_Done() == 0) || (v0->unk_2C->unk_2C.unk_00 == 1)) { @@ -528,8 +523,7 @@ void ov116_02263158 (SysTask * param0, void * param1) } switch (v0->unk_00) { - case 0: - { + case 0: { fx32 v2, v3; fx32 v4; @@ -543,10 +537,8 @@ void ov116_02263158 (SysTask * param0, void * param1) } v0->unk_00++; - } - break; - case 1: - { + } break; + case 1: { fx32 v5, v6; BOOL v7; @@ -557,8 +549,7 @@ void ov116_02263158 (SysTask * param0, void * param1) if (v7) { v0->unk_00++; } - } - break; + } break; default: if (v0->unk_04 == 0) { @@ -576,9 +567,9 @@ void ov116_02263158 (SysTask * param0, void * param1) } } -static void ov116_0226323C (SysTask * param0, void * param1) +static void ov116_0226323C(SysTask *param0, void *param1) { - UnkStruct_ov116_02262D08 * v0 = param1; + UnkStruct_ov116_02262D08 *v0 = param1; if ((ScreenWipe_Done() == 0) || (v0->unk_3C->unk_2C.unk_00 == 1)) { v0->unk_30 = 0; @@ -587,8 +578,7 @@ static void ov116_0226323C (SysTask * param0, void * param1) } switch (v0->unk_00) { - case 0: - { + case 0: { f32 v1, v2; sub_0200D364(v0->unk_0C, 7); @@ -604,8 +594,7 @@ static void ov116_0226323C (SysTask * param0, void * param1) v0->unk_00++; } - case 1: - { + case 1: { fx32 v4, v5; BOOL v6; @@ -615,13 +604,11 @@ static void ov116_0226323C (SysTask * param0, void * param1) if (v6) { v0->unk_00++; } - } - break; + } break; case 2: ov116_02264764(&v0->unk_10, FX_F32_TO_FX32(2.0f), FX_F32_TO_FX32(0.4f), 4); v0->unk_00++; - case 3: - { + case 3: { fx32 v7, v8; BOOL v9; @@ -631,8 +618,7 @@ static void ov116_0226323C (SysTask * param0, void * param1) if (v9) { v0->unk_00++; } - } - break; + } break; case 4: if (v0->unk_28 != *v0->unk_2C) { v0->unk_00 = 0; @@ -652,8 +638,7 @@ static void ov116_0226323C (SysTask * param0, void * param1) v0->unk_00 = 0xFF; } break; - case 5: - { + case 5: { BOOL v10 = ov116_02264774(&v0->unk_10); sub_0200D6E8(v0->unk_0C, 1.0f, FX_FX32_TO_F32(v0->unk_10.unk_00)); @@ -661,8 +646,7 @@ static void ov116_0226323C (SysTask * param0, void * param1) v0->unk_00 = 4; v0->unk_04 ^= 1; } - } - break; + } break; default: sub_0200D6E8(v0->unk_0C, 1.0f, 1.0f); sub_0200D364(v0->unk_0C, 5); @@ -676,12 +660,12 @@ static void ov116_0226323C (SysTask * param0, void * param1) } } -static void ov116_02263434 (SysTask * param0, void * param1) +static void ov116_02263434(SysTask *param0, void *param1) { int v0; - UnkStruct_ov116_02262D08 * v1 = param1; - UnkStruct_ov116_0226501C * v2 = v1->unk_34; - UnkStruct_ov116_0226501C * v3 = v1->unk_38; + UnkStruct_ov116_02262D08 *v1 = param1; + UnkStruct_ov116_0226501C *v2 = v1->unk_34; + UnkStruct_ov116_0226501C *v3 = v1->unk_38; if ((ScreenWipe_Done() == 0) || (v1->unk_3C->unk_2C.unk_00 == 1)) { ov116_0226192C(v2); @@ -797,19 +781,19 @@ static void ov116_02263434 (SysTask * param0, void * param1) } } -static void ov116_0226377C (UnkStruct_ov116_02262A8C * param0) +static void ov116_0226377C(UnkStruct_ov116_02262A8C *param0) { - const u16 v0[] = {0x1, 0x2, 0x3, 0x4}; + const u16 v0[] = { 0x1, 0x2, 0x3, 0x4 }; param0->unk_279C.unk_10 += v0[param0->unk_279C.unk_0C]; } -static void ov116_022637B4 (UnkStruct_ov116_02262A8C * param0) +static void ov116_022637B4(UnkStruct_ov116_02262A8C *param0) { - const u16 v0[] = {700, 1400, 2100, 2800}; + const u16 v0[] = { 700, 1400, 2100, 2800 }; param0->unk_279C.unk_10 += v0[param0->unk_279C.unk_0C - 1]; } -static BOOL ov116_022637F0 (UnkStruct_ov116_02262A8C * param0) +static BOOL ov116_022637F0(UnkStruct_ov116_02262A8C *param0) { switch (param0->unk_279C.unk_38) { case ((4 * 30) - 1): @@ -835,7 +819,7 @@ static BOOL ov116_022637F0 (UnkStruct_ov116_02262A8C * param0) return ov116_0226386C(param0, param0->unk_279C.unk_38, ¶m0->unk_279C.unk_0C); } -static BOOL ov116_0226386C (UnkStruct_ov116_02262A8C * param0, int param1, int * param2) +static BOOL ov116_0226386C(UnkStruct_ov116_02262A8C *param0, int param1, int *param2) { switch (param1) { case ((30 * 10) - 1): @@ -858,7 +842,7 @@ static BOOL ov116_0226386C (UnkStruct_ov116_02262A8C * param0, int param1, int * return 0; } -static void ov116_022638C8 (UnkStruct_ov116_02262A8C * param0) +static void ov116_022638C8(UnkStruct_ov116_02262A8C *param0) { int v0; int v1 = param0->unk_04; @@ -905,7 +889,7 @@ static void ov116_022638C8 (UnkStruct_ov116_02262A8C * param0) } } -static void ov116_022639BC (UnkStruct_ov116_02262A8C * param0) +static void ov116_022639BC(UnkStruct_ov116_02262A8C *param0) { switch (param0->unk_2858[param0->unk_00].unk_00) { case 0: @@ -929,7 +913,7 @@ static void ov116_022639BC (UnkStruct_ov116_02262A8C * param0) } break; case 1: - if ((++param0->unk_279C.unk_1C) >= ((30 * 3))) { + if ((++param0->unk_279C.unk_1C) >= (30 * 3)) { param0->unk_2858[param0->unk_00].unk_00 = 2; } @@ -965,7 +949,7 @@ static void ov116_022639BC (UnkStruct_ov116_02262A8C * param0) } } -void ov116_02263B30 (UnkStruct_ov116_02262A8C * param0) +void ov116_02263B30(UnkStruct_ov116_02262A8C *param0) { int v0; int v1 = param0->unk_04; @@ -993,23 +977,23 @@ void ov116_02263B30 (UnkStruct_ov116_02262A8C * param0) } static const TouchScreenHitTable Unk_ov116_02267B38[] = { - {0xFE, 0x80, 0x80, 0x30}, - {0xFF, 0x0, 0x0, 0x0} + { 0xFE, 0x80, 0x80, 0x30 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenHitTable Unk_ov116_02267B40[] = { - {0xFE, 0x80, 0x80, 0x40}, - {0xFF, 0x0, 0x0, 0x0} + { 0xFE, 0x80, 0x80, 0x40 }, + { 0xFF, 0x0, 0x0, 0x0 } }; -void ov116_02263BA0 (UnkStruct_ov116_02262A8C * param0) +void ov116_02263BA0(UnkStruct_ov116_02262A8C *param0) { { u32 v0, v1; s16 v2, v3; BOOL v4; BOOL v5 = TouchScreen_GetHoldState(&v0, &v1); - TouchScreenHitTable * v6; + TouchScreenHitTable *v6; int v7; param0->unk_279C.unk_A4 = 0; @@ -1029,7 +1013,7 @@ void ov116_02263BA0 (UnkStruct_ov116_02262A8C * param0) v4 = ov116_0226452C(¶m0->unk_308[0], 0.5f); if (v4 = 1) { - VecFx32 v8 = {0, (FX32_CONST(100)), 0}; + VecFx32 v8 = { 0, (FX32_CONST(100)), 0 }; VecFx32 v9; MTX_MultVec43(&v8, ¶m0->unk_308[0].unk_1B0, ¶m0->unk_1FB0); @@ -1063,7 +1047,7 @@ void ov116_02263BA0 (UnkStruct_ov116_02262A8C * param0) v4 = ov116_0226432C(¶m0->unk_308[0], v0, v1, param0->unk_1FBC.unk_00, param0->unk_1FBC.unk_04, v10, 1); if (v4 = 1) { - VecFx32 v11 = {0, (FX32_CONST(100)), 0}; + VecFx32 v11 = { 0, (FX32_CONST(100)), 0 }; VecFx32 v12; MTX_MultVec43(&v11, ¶m0->unk_308[0].unk_1B0, ¶m0->unk_1FB0); @@ -1090,32 +1074,32 @@ void ov116_02263BA0 (UnkStruct_ov116_02262A8C * param0) static const UnkStruct_ov116_02267C88 Unk_ov116_02267C88[][4] = { { - {0x13, 0x2D}, - {0x13, 0x2D}, - {0x13, 0x5}, - {0x13, 0x5} + { 0x13, 0x2D }, + { 0x13, 0x2D }, + { 0x13, 0x5 }, + { 0x13, 0x5 }, }, { - {0x14, 0x1E}, - {0x14, 0x32}, - {0x19, 0x14}, - {0x19, 0xA} + { 0x14, 0x1E }, + { 0x14, 0x32 }, + { 0x19, 0x14 }, + { 0x19, 0xA }, }, { - {0x14, 0x12}, - {0x1E, 0x28}, - {0x23, 0x1E}, - {0x28, 0xC} + { 0x14, 0x12 }, + { 0x1E, 0x28 }, + { 0x23, 0x1E }, + { 0x28, 0xC }, }, { - {0x14, 0xF}, - {0x1E, 0x1E}, - {0x23, 0x28}, - {0x2D, 0xF} - } + { 0x14, 0xF }, + { 0x1E, 0x1E }, + { 0x23, 0x28 }, + { 0x2D, 0xF }, + }, }; -static inline u32 inline_ov116_02263E20 (void) +static inline u32 inline_ov116_02263E20(void) { u32 v0 = LCRNG_GetSeed(); u32 v1; @@ -1126,7 +1110,7 @@ static inline u32 inline_ov116_02263E20 (void) return v1; } -static inline s8 inline_ov116_02263E20_1 (void) +static inline s8 inline_ov116_02263E20_1(void) { if (LCRNG_Next() % 2) { return +1; @@ -1135,7 +1119,7 @@ static inline s8 inline_ov116_02263E20_1 (void) } } -static inline s8 inline_ov116_02263E20_2 (s16 param0) +static inline s8 inline_ov116_02263E20_2(s16 param0) { if (param0 >= 0) { return +1; @@ -1144,7 +1128,7 @@ static inline s8 inline_ov116_02263E20_2 (s16 param0) } } -void ov116_02263DB8 (UnkStruct_ov116_02262A8C * param0) +void ov116_02263DB8(UnkStruct_ov116_02262A8C *param0) { param0->unk_279C.unk_40 = 0; param0->unk_279C.unk_00 = 0; @@ -1155,7 +1139,7 @@ void ov116_02263DB8 (UnkStruct_ov116_02262A8C * param0) param0->unk_279C.unk_0C = 0; } -void ov116_02263DE8 (UnkStruct_ov116_02262A8C * param0) +void ov116_02263DE8(UnkStruct_ov116_02262A8C *param0) { BOOL v0 = 1; @@ -1173,7 +1157,7 @@ void ov116_02263DE8 (UnkStruct_ov116_02262A8C * param0) param0->unk_2018.unk_28 = 1; } -void ov116_02263E20 (UnkStruct_ov116_02262A8C * param0) +void ov116_02263E20(UnkStruct_ov116_02262A8C *param0) { BOOL v0; BOOL v1; @@ -1183,7 +1167,7 @@ void ov116_02263E20 (UnkStruct_ov116_02262A8C * param0) fx32 v5; s16 v6 = 0; s16 v7 = 0; - s16 v8[] = {(30 * 4), (30 * 3), (30 * 2), (30 * 1.5)}; + s16 v8[] = { (30 * 4), (30 * 3), (30 * 2), (30 * 1.5) }; param0->unk_279C.unk_00++; @@ -1226,7 +1210,7 @@ void ov116_02263E20 (UnkStruct_ov116_02262A8C * param0) v1 = ov116_0226432C(¶m0->unk_308[0], 0, 0, v6, v7, (0.80), 0); if (v1) { - VecFx32 v9 = {0, (FX32_CONST(100)), 0}; + VecFx32 v9 = { 0, (FX32_CONST(100)), 0 }; VecFx32 v10; MTX_MultVec43(&v9, ¶m0->unk_308[0].unk_1B0, ¶m0->unk_1FB0); } @@ -1246,7 +1230,7 @@ void ov116_02263E20 (UnkStruct_ov116_02262A8C * param0) v1 = ov116_0226432C(¶m0->unk_308[0], 0, 0, v6, v7, (0.80), 0); if (v1) { - VecFx32 v11 = {0, (FX32_CONST(100)), 0}; + VecFx32 v11 = { 0, (FX32_CONST(100)), 0 }; VecFx32 v12; MTX_MultVec43(&v11, ¶m0->unk_308[0].unk_1B0, ¶m0->unk_1FB0); @@ -1258,7 +1242,7 @@ void ov116_02263E20 (UnkStruct_ov116_02262A8C * param0) v1 = ov116_0226432C(¶m0->unk_308[0], 0, 0, v6, v7, (0.80), 0); if (v1) { - VecFx32 v13 = {0, (FX32_CONST(100)), 0}; + VecFx32 v13 = { 0, (FX32_CONST(100)), 0 }; VecFx32 v14; MTX_MultVec43(&v13, ¶m0->unk_308[0].unk_1B0, ¶m0->unk_1FB0); } diff --git a/src/overlay116/ov116_0226432C.c b/src/overlay116/ov116_0226432C.c index ac31e8ef65..37c90ba9af 100644 --- a/src/overlay116/ov116_0226432C.c +++ b/src/overlay116/ov116_0226432C.c @@ -1,12 +1,13 @@ +#include "overlay116/ov116_0226432C.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_02002F38_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/struct_0200D0F4.h" + +#include "overlay116/ov116_02261870.h" +#include "overlay116/ov116_02266FEC.h" #include "overlay116/struct_ov116_0226139C.h" #include "overlay116/struct_ov116_02262A8C.h" #include "overlay116/struct_ov116_0226469C.h" @@ -20,21 +21,20 @@ #include "overlay116/struct_ov116_022660A8.h" #include "overlay116/union_ov116_02266FEC.h" +#include "heap.h" +#include "inlines.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_02005474.h" #include "unk_0200C6E4.h" -#include "sys_task.h" #include "unk_0200F174.h" #include "unk_020170BC.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" -#include "overlay116/ov116_02261870.h" -#include "overlay116/ov116_0226432C.h" -#include "overlay116/ov116_02266FEC.h" typedef struct { - CellActorData * unk_00; + CellActorData *unk_00; fx32 unk_04; fx32 unk_08; fx32 unk_0C; @@ -55,11 +55,11 @@ typedef struct { } UnkStruct_ov116_02264FEC_sub1; typedef struct { - UnkStruct_ov116_02262A8C * unk_00; + UnkStruct_ov116_02262A8C *unk_00; int unk_04; int unk_08; int unk_0C; - BOOL * unk_10; + BOOL *unk_10; UnkStruct_ov116_02264FEC_sub1 unk_14[36]; } UnkStruct_ov116_02264FEC; @@ -69,52 +69,52 @@ typedef struct { int unk_08; int unk_0C[3]; int unk_18[3]; - void * unk_24; + void *unk_24; } UnkStruct_ov116_02267DA4; -static void ov116_022647BC(SysTask * param0, void * param1); -static inline void inline_ov116_022649E4(UnkStruct_ov116_02264FEC_sub1 * param0); -static inline void inline_ov116_022649E4_1(UnkStruct_ov116_02264FEC_sub1 * wk, fx32 x, fx32 y); -static void ov116_022649E4(SysTask * param0, void * param1); -static void ov116_0226501C(UnkStruct_ov116_02265470 * param0); -static void ov116_0226510C(UnkStruct_ov116_02265470 * param0); -static void ov116_02265260(UnkStruct_ov116_02265470 * param0); -static void ov116_022652F4(UnkStruct_ov116_02265470 * param0); -static void ov116_0226534C(SysTask * param0, void * param1); -static void ov116_022655DC(UnkStruct_ov116_022660A8 * param0); -static void ov116_02265754(UnkStruct_ov116_022660A8 * param0); +static void ov116_022647BC(SysTask *param0, void *param1); +static inline void inline_ov116_022649E4(UnkStruct_ov116_02264FEC_sub1 *param0); +static inline void inline_ov116_022649E4_1(UnkStruct_ov116_02264FEC_sub1 *wk, fx32 x, fx32 y); +static void ov116_022649E4(SysTask *param0, void *param1); +static void ov116_0226501C(UnkStruct_ov116_02265470 *param0); +static void ov116_0226510C(UnkStruct_ov116_02265470 *param0); +static void ov116_02265260(UnkStruct_ov116_02265470 *param0); +static void ov116_022652F4(UnkStruct_ov116_02265470 *param0); +static void ov116_0226534C(SysTask *param0, void *param1); +static void ov116_022655DC(UnkStruct_ov116_022660A8 *param0); +static void ov116_02265754(UnkStruct_ov116_022660A8 *param0); static int ov116_022658C8(int param0); -static void ov116_0226591C(SysTask * param0, void * param1); -static void ov116_02265AA4(SysTask * param0, void * param1); -static void ov116_02265D84(UnkStruct_ov116_02265D84 * param0); -static BOOL ov116_02265D8C(UnkStruct_ov116_02265D84 * param0, int param1, int param2, int param3); -static BOOL ov116_02265E64(UnkStruct_ov116_02265D84 * param0, int param1, int param2, int param3); -static BOOL ov116_02265F1C(UnkStruct_ov116_02265D84 * param0, int param1, int param2, int param3); -static BOOL ov116_02265FD4(UnkStruct_ov116_02265D84 * param0, int param1, int param2, int param3); -static void ov116_022660A8(SysTask * param0, void * param1); -static void ov116_0226644C(SysTask * param0, void * param1); -static void ov116_022667F4(SysTask * param0, void * param1); -static void ov116_02266BF0(SysTask * param0, void * param1); -BOOL ov116_0226432C(UnkStruct_ov116_0226501C * param0, int param1, int param2, int param3, int param4, f32 param5, BOOL param6); -BOOL ov116_0226452C(UnkStruct_ov116_0226501C * param0, f32 param1); -int ov116_02264680(UnkStruct_ov116_0226139C * param0, int param1); -void ov116_0226469C(UnkStruct_ov116_0226469C * param0, fx32 param1, fx32 param2, fx32 param3, int param4); -BOOL ov116_022646FC(UnkStruct_ov116_0226469C * param0); -void ov116_02264764(UnkStruct_ov116_0226469C * param0, fx32 param1, fx32 param2, s32 param3); -BOOL ov116_02264774(UnkStruct_ov116_0226469C * param0); -void ov116_0226493C(UnkStruct_ov116_02262A8C * param0, s16 param1, s16 param2); -void ov116_02264FEC(UnkStruct_ov116_02262A8C * param0, BOOL * param1); -void ov116_02265470(UnkStruct_ov116_02262A8C * param0); -void ov116_02265A1C(UnkStruct_ov116_02262A8C * param0); - -BOOL ov116_0226432C (UnkStruct_ov116_0226501C * param0, int param1, int param2, int param3, int param4, f32 param5, BOOL param6) +static void ov116_0226591C(SysTask *param0, void *param1); +static void ov116_02265AA4(SysTask *param0, void *param1); +static void ov116_02265D84(UnkStruct_ov116_02265D84 *param0); +static BOOL ov116_02265D8C(UnkStruct_ov116_02265D84 *param0, int param1, int param2, int param3); +static BOOL ov116_02265E64(UnkStruct_ov116_02265D84 *param0, int param1, int param2, int param3); +static BOOL ov116_02265F1C(UnkStruct_ov116_02265D84 *param0, int param1, int param2, int param3); +static BOOL ov116_02265FD4(UnkStruct_ov116_02265D84 *param0, int param1, int param2, int param3); +static void ov116_022660A8(SysTask *param0, void *param1); +static void ov116_0226644C(SysTask *param0, void *param1); +static void ov116_022667F4(SysTask *param0, void *param1); +static void ov116_02266BF0(SysTask *param0, void *param1); +BOOL ov116_0226432C(UnkStruct_ov116_0226501C *param0, int param1, int param2, int param3, int param4, f32 param5, BOOL param6); +BOOL ov116_0226452C(UnkStruct_ov116_0226501C *param0, f32 param1); +int ov116_02264680(UnkStruct_ov116_0226139C *param0, int param1); +void ov116_0226469C(UnkStruct_ov116_0226469C *param0, fx32 param1, fx32 param2, fx32 param3, int param4); +BOOL ov116_022646FC(UnkStruct_ov116_0226469C *param0); +void ov116_02264764(UnkStruct_ov116_0226469C *param0, fx32 param1, fx32 param2, s32 param3); +BOOL ov116_02264774(UnkStruct_ov116_0226469C *param0); +void ov116_0226493C(UnkStruct_ov116_02262A8C *param0, s16 param1, s16 param2); +void ov116_02264FEC(UnkStruct_ov116_02262A8C *param0, BOOL *param1); +void ov116_02265470(UnkStruct_ov116_02262A8C *param0); +void ov116_02265A1C(UnkStruct_ov116_02262A8C *param0); + +BOOL ov116_0226432C(UnkStruct_ov116_0226501C *param0, int param1, int param2, int param3, int param4, f32 param5, BOOL param6) { f32 v0; fx32 v1; f32 v2, v3; - v2 = (param1 - param3) * (((1.33) / 256)) * param5; - v3 = (param2 - param4) * (((1.00) / 192)) * param5; + v2 = (param1 - param3) * ((1.33) / 256) * param5; + v3 = (param2 - param4) * ((1.00) / 192) * param5; if (param6) { param0->unk_1FC = v2; @@ -166,7 +166,7 @@ BOOL ov116_0226432C (UnkStruct_ov116_0226501C * param0, int param1, int param2, return 0; } -BOOL ov116_0226452C (UnkStruct_ov116_0226501C * param0, f32 param1) +BOOL ov116_0226452C(UnkStruct_ov116_0226501C *param0, f32 param1) { f32 v0; fx32 v1; @@ -213,7 +213,7 @@ BOOL ov116_0226452C (UnkStruct_ov116_0226501C * param0, f32 param1) return 0; } -int ov116_02264680 (UnkStruct_ov116_0226139C * param0, int param1) +int ov116_02264680(UnkStruct_ov116_0226139C *param0, int param1) { int v0; @@ -226,7 +226,7 @@ int ov116_02264680 (UnkStruct_ov116_0226139C * param0, int param1) return 0xFF; } -void ov116_0226469C (UnkStruct_ov116_0226469C * param0, fx32 param1, fx32 param2, fx32 param3, int param4) +void ov116_0226469C(UnkStruct_ov116_0226469C *param0, fx32 param1, fx32 param2, fx32 param3, int param4) { fx32 v0; fx32 v1; @@ -249,7 +249,7 @@ void ov116_0226469C (UnkStruct_ov116_0226469C * param0, fx32 param1, fx32 param2 param0->unk_14 = param4; } -BOOL ov116_022646FC (UnkStruct_ov116_0226469C * param0) +BOOL ov116_022646FC(UnkStruct_ov116_0226469C *param0) { fx32 v0; fx32 v1; @@ -274,7 +274,7 @@ BOOL ov116_022646FC (UnkStruct_ov116_0226469C * param0) return 1; } -void ov116_02264764 (UnkStruct_ov116_0226469C * param0, fx32 param1, fx32 param2, s32 param3) +void ov116_02264764(UnkStruct_ov116_0226469C *param0, fx32 param1, fx32 param2, s32 param3) { param0->unk_00 = param1; param0->unk_04 = param1; @@ -283,7 +283,7 @@ void ov116_02264764 (UnkStruct_ov116_0226469C * param0, fx32 param1, fx32 param2 param0->unk_14 = param3; } -BOOL ov116_02264774 (UnkStruct_ov116_0226469C * param0) +BOOL ov116_02264774(UnkStruct_ov116_0226469C *param0) { s32 v0; BOOL v1; @@ -307,9 +307,9 @@ BOOL ov116_02264774 (UnkStruct_ov116_0226469C * param0) return v1; } -static void ov116_022647BC (SysTask * param0, void * param1) +static void ov116_022647BC(SysTask *param0, void *param1) { - UnkStruct_ov116_022647BC * v0 = param1; + UnkStruct_ov116_022647BC *v0 = param1; int v1; fx32 v2, v3; BOOL v4[4][2]; @@ -382,7 +382,7 @@ static void ov116_022647BC (SysTask * param0, void * param1) } } -void ov116_0226493C (UnkStruct_ov116_02262A8C * param0, s16 param1, s16 param2) +void ov116_0226493C(UnkStruct_ov116_02262A8C *param0, s16 param1, s16 param2) { int v0; int v1; @@ -406,24 +406,24 @@ void ov116_0226493C (UnkStruct_ov116_02262A8C * param0, s16 param1, s16 param2) } } -static inline void inline_ov116_022649E4 (UnkStruct_ov116_02264FEC_sub1 * param0) +static inline void inline_ov116_022649E4(UnkStruct_ov116_02264FEC_sub1 *param0) { param0->unk_1C = FX_Mul(sub_0201D250(param0->unk_28), FX32_CONST(param0->unk_2E)); param0->unk_20 = FX_Mul(sub_0201D264(param0->unk_28), FX32_CONST(param0->unk_30)); } -static inline void inline_ov116_022649E4_1 (UnkStruct_ov116_02264FEC_sub1 * wk, fx32 x, fx32 y) +static inline void inline_ov116_022649E4_1(UnkStruct_ov116_02264FEC_sub1 *wk, fx32 x, fx32 y) { wk->unk_04 += x; wk->unk_08 += y; - sub_0200D650(wk->unk_00, wk->unk_14 + wk->unk_0C + wk->unk_1C + wk->unk_04, wk->unk_18 + wk->unk_10 + wk->unk_20 + wk->unk_08, FX32_CONST((192 + 32))); + sub_0200D650(wk->unk_00, wk->unk_14 + wk->unk_0C + wk->unk_1C + wk->unk_04, wk->unk_18 + wk->unk_10 + wk->unk_20 + wk->unk_08, FX32_CONST(192 + 32)); } -static void ov116_022649E4 (SysTask * param0, void * param1) +static void ov116_022649E4(SysTask *param0, void *param1) { - UnkStruct_ov116_02264FEC * v0 = param1; - UnkStruct_ov116_022649E4 * v1 = v0->unk_00->unk_14; + UnkStruct_ov116_02264FEC *v0 = param1; + UnkStruct_ov116_022649E4 *v1 = v0->unk_00->unk_14; if ((ScreenWipe_Done() == 0) || (v1->unk_2C.unk_00 == 1)) { *v0->unk_10 = 0; @@ -436,11 +436,10 @@ static void ov116_022649E4 (SysTask * param0, void * param1) case 0: v0->unk_0C = 0; v0->unk_04++; - case 1: - { + case 1: { int v2; s16 v3[][2] = { - {96, 58}, {230, 48}, {128, 32}, {40, 64}, {180, 48} + { 96, 58 }, { 230, 48 }, { 128, 32 }, { 40, 64 }, { 180, 48 } }; u32 v4 = v3[v0->unk_0C][0]; u32 v5 = v3[v0->unk_0C][1]; @@ -483,8 +482,7 @@ static void ov116_022649E4 (SysTask * param0, void * param1) v0->unk_04++; break; - case 2: - { + case 2: { int v6; s16 v7, v8; BOOL v9 = 1; @@ -587,8 +585,7 @@ static void ov116_022649E4 (SysTask * param0, void * param1) if (*v0->unk_10) { v0->unk_04++; } - } - break; + } break; default: ov116_02261E0C(v0->unk_00, 0, 0); @@ -600,9 +597,9 @@ static void ov116_022649E4 (SysTask * param0, void * param1) ov116_02261E28(v0->unk_00); } -void ov116_02264FEC (UnkStruct_ov116_02262A8C * param0, BOOL * param1) +void ov116_02264FEC(UnkStruct_ov116_02262A8C *param0, BOOL *param1) { - UnkStruct_ov116_02264FEC * v0 = Heap_AllocFromHeap(106, sizeof(UnkStruct_ov116_02264FEC)); + UnkStruct_ov116_02264FEC *v0 = Heap_AllocFromHeap(106, sizeof(UnkStruct_ov116_02264FEC)); v0->unk_00 = param0; v0->unk_04 = 0; @@ -612,12 +609,12 @@ void ov116_02264FEC (UnkStruct_ov116_02262A8C * param0, BOOL * param1) SysTask_Start(ov116_022649E4, v0, 4096); } -static void ov116_0226501C (UnkStruct_ov116_02265470 * param0) +static void ov116_0226501C(UnkStruct_ov116_02265470 *param0) { - UnkStruct_ov116_0226501C * v0 = param0->unk_08[0]; - int * v1 = param0->unk_08[1]; - int * v2 = param0->unk_08[3]; - PaletteData * v3 = param0->unk_08[2]; + UnkStruct_ov116_0226501C *v0 = param0->unk_08[0]; + int *v1 = param0->unk_08[1]; + int *v2 = param0->unk_08[3]; + PaletteData *v3 = param0->unk_08[2]; if (param0->unk_04 == 0) { return; @@ -674,13 +671,13 @@ static void ov116_0226501C (UnkStruct_ov116_02265470 * param0) } } -static void ov116_0226510C (UnkStruct_ov116_02265470 * param0) +static void ov116_0226510C(UnkStruct_ov116_02265470 *param0) { int v0; s16 v1, v2; - s16 v3[] = {188, 188, 180, 180}; - BOOL v4[4] = {1, 1, 1, 1}; - CellActorData * v5; + s16 v3[] = { 188, 188, 180, 180 }; + BOOL v4[4] = { 1, 1, 1, 1 }; + CellActorData *v5; if (param0->unk_04 == 0) { return; @@ -756,7 +753,7 @@ static void ov116_0226510C (UnkStruct_ov116_02265470 * param0) } } -static void ov116_02265260 (UnkStruct_ov116_02265470 * param0) +static void ov116_02265260(UnkStruct_ov116_02265470 *param0) { int v0; @@ -767,7 +764,7 @@ static void ov116_02265260 (UnkStruct_ov116_02265470 * param0) switch (param0->unk_00) { case 0: for (v0 = 0; v0 < 8; v0++) { - UnkStruct_ov116_0226501C * v1 = param0->unk_08[v0]; + UnkStruct_ov116_0226501C *v1 = param0->unk_08[v0]; sub_02017240(&v1->unk_88[0], (v0 * 20) % 40); sub_02017348(&v1->unk_00, 1); @@ -785,7 +782,7 @@ static void ov116_02265260 (UnkStruct_ov116_02265470 * param0) break; default: for (v0 = 0; v0 < 8; v0++) { - UnkStruct_ov116_0226501C * v2 = param0->unk_08[v0]; + UnkStruct_ov116_0226501C *v2 = param0->unk_08[v0]; sub_02017348(&v2->unk_00, 0); } @@ -798,7 +795,7 @@ static void ov116_02265260 (UnkStruct_ov116_02265470 * param0) } } -static void ov116_022652F4 (UnkStruct_ov116_02265470 * param0) +static void ov116_022652F4(UnkStruct_ov116_02265470 *param0) { if (param0->unk_04 == 0) { return; @@ -828,10 +825,10 @@ static void ov116_022652F4 (UnkStruct_ov116_02265470 * param0) } } -static void ov116_0226534C (SysTask * param0, void * param1) +static void ov116_0226534C(SysTask *param0, void *param1) { - UnkStruct_ov116_0226534C * v0 = param1; - UnkStruct_ov116_022649E4 * v1 = v0->unk_84; + UnkStruct_ov116_0226534C *v0 = param1; + UnkStruct_ov116_022649E4 *v1 = v0->unk_84; if ((ScreenWipe_Done() == 0) || (v1->unk_2C.unk_00 == 1)) { SysTask_Done(param0); @@ -889,7 +886,7 @@ static void ov116_0226534C (SysTask * param0, void * param1) v0->unk_00 = *v0->unk_04; } -void ov116_02265470 (UnkStruct_ov116_02262A8C * param0) +void ov116_02265470(UnkStruct_ov116_02262A8C *param0) { int v0; @@ -898,7 +895,7 @@ void ov116_02265470 (UnkStruct_ov116_02262A8C * param0) param0->unk_20C4.unk_00 = *param0->unk_20C4.unk_04; for (v0 = 0; v0 < 5; v0++) { - UnkStruct_ov116_02265470 * v1 = ¶m0->unk_20C4.unk_08[v0]; + UnkStruct_ov116_02265470 *v1 = ¶m0->unk_20C4.unk_08[v0]; v1->unk_00 = 0; v1->unk_04 = 0; @@ -924,15 +921,13 @@ void ov116_02265470 (UnkStruct_ov116_02262A8C * param0) SpriteActor_SetSpritePositionXY(param0->unk_B8[1], v2, (192 + 32)); } break; - case 2: - { + case 2: { int v4; for (v4 = 0; v4 < 8; v4++) { v1->unk_08[v4] = ¶m0->unk_B38[v4]; } - } - break; + } break; case 3: v1->unk_08[0] = NULL; v1->unk_08[1] = NULL; @@ -956,10 +951,10 @@ void ov116_02265470 (UnkStruct_ov116_02262A8C * param0) param0->unk_20C4.unk_80 = SysTask_Start(ov116_0226534C, ¶m0->unk_20C4, 4096); } -static void ov116_022655DC (UnkStruct_ov116_022660A8 * param0) +static void ov116_022655DC(UnkStruct_ov116_022660A8 *param0) { - int * v0 = param0->unk_10; - int * v1 = param0->unk_14; + int *v0 = param0->unk_10; + int *v1 = param0->unk_14; BOOL v2[5]; switch (param0->unk_24) { @@ -970,8 +965,7 @@ static void ov116_022655DC (UnkStruct_ov116_022660A8 * param0) param0->unk_24++; break; - case 1: - { + case 1: { int v3; for (v3 = 0; v3 < 3; v3++) { @@ -987,8 +981,7 @@ static void ov116_022655DC (UnkStruct_ov116_022660A8 * param0) if (v2[0] && v2[1] && v2[2]) { param0->unk_24++; } - } - break; + } break; case 2: param0->unk_2C = 1; param0->unk_24 = 0; @@ -1005,10 +998,10 @@ static void ov116_022655DC (UnkStruct_ov116_022660A8 * param0) sub_02003A2C(param0->unk_30->unk_14, 1, 0x1, *v0 + *v1, 0x0); } -static void ov116_02265754 (UnkStruct_ov116_022660A8 * param0) +static void ov116_02265754(UnkStruct_ov116_022660A8 *param0) { - int * v0 = param0->unk_10; - int * v1 = param0->unk_14; + int *v0 = param0->unk_10; + int *v1 = param0->unk_14; BOOL v2[5]; switch (param0->unk_24) { @@ -1018,8 +1011,7 @@ static void ov116_02265754 (UnkStruct_ov116_022660A8 * param0) ov116_02264764(¶m0->unk_34[2], FX32_CONST(-80), FX32_CONST(0), 10); param0->unk_24++; break; - case 1: - { + case 1: { int v3; for (v3 = 0; v3 < 3; v3++) { @@ -1035,8 +1027,7 @@ static void ov116_02265754 (UnkStruct_ov116_022660A8 * param0) if (v2[0] && v2[1] && v2[2]) { param0->unk_24++; } - } - break; + } break; case 2: param0->unk_2C = 0; param0->unk_24 = 0; @@ -1053,7 +1044,7 @@ static void ov116_02265754 (UnkStruct_ov116_022660A8 * param0) sub_02003A2C(param0->unk_30->unk_14, 1, 0x1, *v0 + *v1, 0x0); } -static int ov116_022658C8 (int param0) +static int ov116_022658C8(int param0) { switch (param0) { case 1: @@ -1086,83 +1077,83 @@ static const UnkStruct_ov116_02267DA4 Unk_ov116_02267DA4[] = { 0x96, 0x0, 0x0, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - NULL + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + NULL, }, { 0x96, 0x2, 0x1, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - ov116_02265AA4 + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + ov116_02265AA4, }, { 0x96, 0x3, 0x2, - {0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0}, - ov116_022660A8 + { 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + ov116_022660A8, }, { 0x96, 0x3, 0x2, - {0x0, 0x1, 0x0}, - {0x1, 0x0, 0x0}, - ov116_022660A8 + { 0x0, 0x1, 0x0 }, + { 0x1, 0x0, 0x0 }, + ov116_022660A8, }, { 0x96, 0x3, 0x3, - {0x0, 0x1, 0x2}, - {0x2, 0x0, 0x0}, - ov116_0226644C + { 0x0, 0x1, 0x2 }, + { 0x2, 0x0, 0x0 }, + ov116_0226644C, }, { 0x96, 0x3, 0x4, - {0x0, 0x1, 0x2}, - {0x2, 0x0, 0x0}, - ov116_0226644C + { 0x0, 0x1, 0x2 }, + { 0x2, 0x0, 0x0 }, + ov116_0226644C, }, { 0x96, 0x3, 0x5, - {0x2, 0x1, 0x0}, - {0x1, 0x0, 0x0}, - ov116_022667F4 + { 0x2, 0x1, 0x0 }, + { 0x1, 0x0, 0x0 }, + ov116_022667F4, }, { 0x96, 0x3, 0x5, - {0x2, 0x1, 0x0}, - {0x2, 0x0, 0x0}, - ov116_02266BF0 + { 0x2, 0x1, 0x0 }, + { 0x2, 0x0, 0x0 }, + ov116_02266BF0, }, { 0x96, 0x3, 0x5, - {0x2, 0x1, 0x0}, - {0x2, 0x0, 0x0}, - ov116_02266BF0 - } + { 0x2, 0x1, 0x0 }, + { 0x2, 0x0, 0x0 }, + ov116_02266BF0, + }, }; -static void ov116_0226591C (SysTask * param0, void * param1) +static void ov116_0226591C(SysTask *param0, void *param1) { int v0; int v1; int v2; - UnkStruct_ov116_022660A8 * v3 = param1; - UnkStruct_ov116_02265AA4 * v4 = &v3->unk_00; + UnkStruct_ov116_022660A8 *v3 = param1; + UnkStruct_ov116_02265AA4 *v4 = &v3->unk_00; v2 = *v3->unk_0C; @@ -1206,7 +1197,7 @@ static void ov116_0226591C (SysTask * param0, void * param1) } } -void ov116_02265A1C (UnkStruct_ov116_02262A8C * param0) +void ov116_02265A1C(UnkStruct_ov116_02262A8C *param0) { param0->unk_2018.unk_0C = ¶m0->unk_279C.unk_14; param0->unk_2018.unk_10 = ¶m0->unk_F0; @@ -1228,10 +1219,10 @@ void ov116_02265A1C (UnkStruct_ov116_02262A8C * param0) param0->unk_2018.unk_08 = SysTask_Start(ov116_0226591C, ¶m0->unk_2018, 4096); } -static void ov116_02265AA4 (SysTask * param0, void * param1) +static void ov116_02265AA4(SysTask *param0, void *param1) { - UnkStruct_ov116_022660A8 * v0 = param1; - UnkStruct_ov116_02265AA4 * v1 = &v0->unk_00; + UnkStruct_ov116_022660A8 *v0 = param1; + UnkStruct_ov116_02265AA4 *v1 = &v0->unk_00; BOOL v2[2]; fx32 v3, v4; fx32 v5, v6; @@ -1327,12 +1318,12 @@ static void ov116_02265AA4 (SysTask * param0, void * param1) } } -static void ov116_02265D84 (UnkStruct_ov116_02265D84 * param0) +static void ov116_02265D84(UnkStruct_ov116_02265D84 *param0) { param0->unk_04 = 0; } -static BOOL ov116_02265D8C (UnkStruct_ov116_02265D84 * param0, int param1, int param2, int param3) +static BOOL ov116_02265D8C(UnkStruct_ov116_02265D84 *param0, int param1, int param2, int param3) { BOOL v0[2]; fx32 v1, v2; @@ -1370,7 +1361,7 @@ static BOOL ov116_02265D8C (UnkStruct_ov116_02265D84 * param0, int param1, int p return 0; } -static BOOL ov116_02265E64 (UnkStruct_ov116_02265D84 * param0, int param1, int param2, int param3) +static BOOL ov116_02265E64(UnkStruct_ov116_02265D84 *param0, int param1, int param2, int param3) { BOOL v0[2]; fx32 v1, v2; @@ -1385,9 +1376,9 @@ static BOOL ov116_02265E64 (UnkStruct_ov116_02265D84 * param0, int param1, int p } if (param3 == 2) { - ov116_02264764(¶m0->unk_38, FX32_CONST((128 + 32)), FX32_CONST((128 + 32) - 24), ov116_022658C8(param1)); + ov116_02264764(¶m0->unk_38, FX32_CONST(128 + 32), FX32_CONST((128 + 32) - 24), ov116_022658C8(param1)); } else { - ov116_02264764(¶m0->unk_38, FX32_CONST((128 + 32)), FX32_CONST((128 + 32) + 24), ov116_022658C8(param1)); + ov116_02264764(¶m0->unk_38, FX32_CONST(128 + 32), FX32_CONST((128 + 32) + 24), ov116_022658C8(param1)); } param0->unk_04++; @@ -1407,7 +1398,7 @@ static BOOL ov116_02265E64 (UnkStruct_ov116_02265D84 * param0, int param1, int p return 0; } -static BOOL ov116_02265F1C (UnkStruct_ov116_02265D84 * param0, int param1, int param2, int param3) +static BOOL ov116_02265F1C(UnkStruct_ov116_02265D84 *param0, int param1, int param2, int param3) { BOOL v0[2]; fx32 v1, v2; @@ -1444,7 +1435,7 @@ static BOOL ov116_02265F1C (UnkStruct_ov116_02265D84 * param0, int param1, int p return 0; } -static BOOL ov116_02265FD4 (UnkStruct_ov116_02265D84 * param0, int param1, int param2, int param3) +static BOOL ov116_02265FD4(UnkStruct_ov116_02265D84 *param0, int param1, int param2, int param3) { BOOL v0[2]; fx32 v1, v2; @@ -1492,12 +1483,12 @@ static BOOL ov116_02265FD4 (UnkStruct_ov116_02265D84 * param0, int param1, int p return 0; } -static void ov116_022660A8 (SysTask * param0, void * param1) +static void ov116_022660A8(SysTask *param0, void *param1) { int v0; - UnkStruct_ov116_022660A8 * v1 = param1; - UnkStruct_ov116_02265AA4 * v2 = &v1->unk_00; - BOOL v3[4] = {1, 1, 1, 1}; + UnkStruct_ov116_022660A8 *v1 = param1; + UnkStruct_ov116_02265AA4 *v2 = &v1->unk_00; + BOOL v3[4] = { 1, 1, 1, 1 }; fx32 v4, v5; fx32 v6, v7; @@ -1619,12 +1610,12 @@ static void ov116_022660A8 (SysTask * param0, void * param1) } } -static void ov116_0226644C (SysTask * param0, void * param1) +static void ov116_0226644C(SysTask *param0, void *param1) { int v0; - UnkStruct_ov116_022660A8 * v1 = param1; - UnkStruct_ov116_02265AA4 * v2 = &v1->unk_00; - BOOL v3[4] = {1, 1, 1, 1}; + UnkStruct_ov116_022660A8 *v1 = param1; + UnkStruct_ov116_02265AA4 *v2 = &v1->unk_00; + BOOL v3[4] = { 1, 1, 1, 1 }; fx32 v4, v5; fx32 v6, v7; @@ -1737,12 +1728,12 @@ static void ov116_0226644C (SysTask * param0, void * param1) } } -static void ov116_022667F4 (SysTask * param0, void * param1) +static void ov116_022667F4(SysTask *param0, void *param1) { int v0; - UnkStruct_ov116_022660A8 * v1 = param1; - UnkStruct_ov116_02265AA4 * v2 = &v1->unk_00; - BOOL v3[4] = {1, 1, 1, 1}; + UnkStruct_ov116_022660A8 *v1 = param1; + UnkStruct_ov116_02265AA4 *v2 = &v1->unk_00; + BOOL v3[4] = { 1, 1, 1, 1 }; fx32 v4, v5; fx32 v6, v7; @@ -1883,12 +1874,12 @@ static void ov116_022667F4 (SysTask * param0, void * param1) } } -static void ov116_02266BF0 (SysTask * param0, void * param1) +static void ov116_02266BF0(SysTask *param0, void *param1) { int v0; - UnkStruct_ov116_022660A8 * v1 = param1; - UnkStruct_ov116_02265AA4 * v2 = &v1->unk_00; - BOOL v3[4] = {1, 1, 1, 1}; + UnkStruct_ov116_022660A8 *v1 = param1; + UnkStruct_ov116_02265AA4 *v2 = &v1->unk_00; + BOOL v3[4] = { 1, 1, 1, 1 }; fx32 v4, v5; fx32 v6, v7; diff --git a/src/overlay116/ov116_02266FEC.c b/src/overlay116/ov116_02266FEC.c index fa1c04c071..7e560b2faa 100644 --- a/src/overlay116/ov116_02266FEC.c +++ b/src/overlay116/ov116_02266FEC.c @@ -1,12 +1,12 @@ +#include "overlay116/ov116_02266FEC.h" + #include #include #include "overlay116/union_ov116_02266FEC.h" #include "overlay116/union_ov116_022671EC.h" -#include "overlay116/ov116_02266FEC.h" - -void ov116_02266FEC (UnkUnion_ov116_02266FEC * param0) +void ov116_02266FEC(UnkUnion_ov116_02266FEC *param0) { param0->val1_00 = 1.0; param0->val1_04 = 0; @@ -14,12 +14,12 @@ void ov116_02266FEC (UnkUnion_ov116_02266FEC * param0) param0->val1_0C = 0; } -void ov116_02266FFC (UnkUnion_ov116_02266FEC * param0, UnkUnion_ov116_02266FEC * param1) +void ov116_02266FFC(UnkUnion_ov116_02266FEC *param0, UnkUnion_ov116_02266FEC *param1) { *param0 = *param1; } -void ov116_0226700C (UnkUnion_ov116_02266FEC * param0, const UnkUnion_ov116_02266FEC * param1, const UnkUnion_ov116_02266FEC * param2) +void ov116_0226700C(UnkUnion_ov116_02266FEC *param0, const UnkUnion_ov116_02266FEC *param1, const UnkUnion_ov116_02266FEC *param2) { param0->val1_00 = (param1->val1_00 * param2->val1_00) - (param1->val1_04 * param2->val1_04) - (param1->val1_08 * param2->val1_08) - (param1->val1_0C * param2->val1_0C); param0->val1_04 = (param1->val1_00 * param2->val1_04) + (param1->val1_04 * param2->val1_00) + (param1->val1_08 * param2->val1_0C) - (param1->val1_0C * param2->val1_08); @@ -27,12 +27,12 @@ void ov116_0226700C (UnkUnion_ov116_02266FEC * param0, const UnkUnion_ov116_0226 param0->val1_0C = (param1->val1_00 * param2->val1_0C) + (param1->val1_04 * param2->val1_08) - (param1->val1_08 * param2->val1_04) + (param1->val1_0C * param2->val1_00); } -f32 ov116_0226711C (const UnkUnion_ov116_02266FEC * param0) +f32 ov116_0226711C(const UnkUnion_ov116_02266FEC *param0) { return (param0->val1_00 * param0->val1_00) + (param0->val1_04 + param0->val1_04) + (param0->val1_08 + param0->val1_08) + (param0->val1_0C + param0->val1_0C); } -f32 ov116_02267160 (const UnkUnion_ov116_02266FEC * param0) +f32 ov116_02267160(const UnkUnion_ov116_02266FEC *param0) { fx32 v0; @@ -40,7 +40,7 @@ f32 ov116_02267160 (const UnkUnion_ov116_02266FEC * param0) return FX_FX32_TO_F32(FX_Sqrt(v0)); } -void ov116_022671B8 (UnkUnion_ov116_02266FEC * param0, const UnkUnion_ov116_02266FEC * param1, f32 param2) +void ov116_022671B8(UnkUnion_ov116_02266FEC *param0, const UnkUnion_ov116_02266FEC *param1, f32 param2) { param0->val1_00 = param1->val1_00 / param2; param0->val1_04 = param1->val1_04 / param2; @@ -48,7 +48,7 @@ void ov116_022671B8 (UnkUnion_ov116_02266FEC * param0, const UnkUnion_ov116_0226 param0->val1_0C = param1->val1_0C / param2; } -void ov116_022671EC (UnkUnion_ov116_022671EC * param0, const UnkUnion_ov116_02266FEC * param1) +void ov116_022671EC(UnkUnion_ov116_022671EC *param0, const UnkUnion_ov116_02266FEC *param1) { f32 v0 = param1->val1_04 * param1->val1_04 * 2.0; f32 v1 = param1->val1_08 * param1->val1_08 * 2.0; @@ -78,7 +78,7 @@ void ov116_022671EC (UnkUnion_ov116_022671EC * param0, const UnkUnion_ov116_0226 param0->val1_3C = 1.0; } -void ov116_022673FC (const UnkUnion_ov116_022671EC * param0, MtxFx44 * param1) +void ov116_022673FC(const UnkUnion_ov116_022671EC *param0, MtxFx44 *param1) { param1->_00 = FX32_CONST(param0->val1_00); param1->_01 = FX32_CONST(param0->val1_04); @@ -98,7 +98,7 @@ void ov116_022673FC (const UnkUnion_ov116_022671EC * param0, MtxFx44 * param1) param1->_33 = FX32_CONST(param0->val1_3C); } -void ov116_02267728 (const UnkUnion_ov116_022671EC * param0, MtxFx43 * param1) +void ov116_02267728(const UnkUnion_ov116_022671EC *param0, MtxFx43 *param1) { MtxFx44 v0; diff --git a/src/overlay117/ov117_02260440.c b/src/overlay117/ov117_02260440.c index 75fbda5eb7..358b03907f 100644 --- a/src/overlay117/ov117_02260440.c +++ b/src/overlay117/ov117_02260440.c @@ -1,22 +1,22 @@ +#include "overlay117/ov117_02260440.h" + +#include #include #include -#include - +#include "overlay004/ov4_021D0D80.h" +#include "overlay114/ov114_0225C700.h" +#include "overlay117/ov117_02260668.h" +#include "overlay117/ov117_02266498.h" #include "overlay117/struct_ov117_02260440.h" #include "overlay117/struct_ov117_022605C0.h" -#include "overlay_manager.h" -#include "heap.h" #include "communication_information.h" #include "communication_system.h" +#include "heap.h" +#include "overlay_manager.h" #include "unk_020363E8.h" #include "unk_020366A0.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay114/ov114_0225C700.h" -#include "overlay117/ov117_02260440.h" -#include "overlay117/ov117_02260668.h" -#include "overlay117/ov117_02266498.h" static const OverlayManagerTemplate Unk_ov117_022668F8 = { ov117_02260668, @@ -32,13 +32,13 @@ static const OverlayManagerTemplate Unk_ov117_02266908 = { 0xFFFFFFFF }; -static void ov117_022605D8(UnkStruct_ov117_022605C0 * param0, UnkStruct_ov117_02260440 * param1); -static BOOL ov117_02260630(UnkStruct_ov117_022605C0 * param0); +static void ov117_022605D8(UnkStruct_ov117_022605C0 *param0, UnkStruct_ov117_02260440 *param1); +static BOOL ov117_02260630(UnkStruct_ov117_022605C0 *param0); -int ov117_02260440 (OverlayManager * param0, int * param1) +int ov117_02260440(OverlayManager *param0, int *param1) { - UnkStruct_ov117_02260440 * v0 = OverlayManager_Args(param0); - UnkStruct_ov117_022605C0 * v1; + UnkStruct_ov117_02260440 *v0 = OverlayManager_Args(param0); + UnkStruct_ov117_022605C0 *v1; Heap_Create(3, 110, 0x60000); @@ -49,10 +49,10 @@ int ov117_02260440 (OverlayManager * param0, int * param1) return 1; } -int ov117_02260474 (OverlayManager * param0, int * param1) +int ov117_02260474(OverlayManager *param0, int *param1) { - UnkStruct_ov117_022605C0 * v0 = OverlayManager_Data(param0); - UnkStruct_ov117_02260440 * v1 = OverlayManager_Args(param0); + UnkStruct_ov117_022605C0 *v0 = OverlayManager_Data(param0); + UnkStruct_ov117_02260440 *v1 = OverlayManager_Args(param0); if (ov117_02260630(v0) == 1) { return 1; @@ -123,9 +123,9 @@ int ov117_02260474 (OverlayManager * param0, int * param1) return 0; } -int ov117_022605C0 (OverlayManager * param0, int * param1) +int ov117_022605C0(OverlayManager *param0, int *param1) { - UnkStruct_ov117_022605C0 * v0 = OverlayManager_Data(param0); + UnkStruct_ov117_022605C0 *v0 = OverlayManager_Data(param0); OverlayManager_FreeData(param0); Heap_Destroy(110); @@ -133,7 +133,7 @@ int ov117_022605C0 (OverlayManager * param0, int * param1) return 1; } -static void ov117_022605D8 (UnkStruct_ov117_022605C0 * param0, UnkStruct_ov117_02260440 * param1) +static void ov117_022605D8(UnkStruct_ov117_022605C0 *param0, UnkStruct_ov117_02260440 *param1) { int v0, v1, v2, v3; @@ -161,7 +161,7 @@ static void ov117_022605D8 (UnkStruct_ov117_022605C0 * param0, UnkStruct_ov117_0 ov114_0225C700(¶m0->unk_00, param1->unk_39, param1->unk_34, param1->unk_38, ¶m1->unk_00); } -static BOOL ov117_02260630 (UnkStruct_ov117_022605C0 * param0) +static BOOL ov117_02260630(UnkStruct_ov117_022605C0 *param0) { if (param0->unk_3D == 0) { if (ov114_0225CA54(¶m0->unk_00) == 1) { diff --git a/src/overlay117/ov117_022626B0.c b/src/overlay117/ov117_022626B0.c index a14e8bb56f..9b726a34e4 100644 --- a/src/overlay117/ov117_022626B0.c +++ b/src/overlay117/ov117_022626B0.c @@ -1,25 +1,25 @@ +#include "overlay117/ov117_022626B0.h" + #include #include -#include "core_sys.h" -#include "inlines.h" - #include "struct_decls/struct_02006C24_decl.h" - -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" + +#include "overlay117/ov117_02260668.h" +#include "overlay117/ov117_02263AF0.h" #include "overlay117/struct_ov117_02261280.h" #include "overlay117/struct_ov117_02264E84.h" +#include "core_sys.h" +#include "heap.h" +#include "inlines.h" +#include "narc.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_0200C6E4.h" -#include "heap.h" #include "unk_0201C970.h" -#include "overlay117/ov117_02260668.h" -#include "overlay117/ov117_022626B0.h" -#include "overlay117/ov117_02263AF0.h" typedef struct { fx32 unk_00; @@ -41,8 +41,8 @@ typedef struct { } UnkStruct_ov117_022626B0_sub2; typedef struct UnkStruct_ov117_022626B0_t { - NNSG3dResFileHeader * unk_00; - NNSG3dResTex * unk_04; + NNSG3dResFileHeader *unk_00; + NNSG3dResTex *unk_04; u16 unk_08; UnkStruct_ov117_022626B0_sub1 unk_0C[8]; UnkStruct_ov117_022626B0_sub2 unk_10C[8]; @@ -56,14 +56,14 @@ typedef struct UnkStruct_ov117_022626B0_t { int unk_228; int unk_22C; fx32 unk_230; - CellActorData * unk_234; + CellActorData *unk_234; int unk_238; int unk_23C; int unk_240; int unk_244; fx32 unk_248; - u16 * unk_24C; - u16 * unk_250; + u16 *unk_24C; + u16 *unk_250; u32 unk_254; u32 unk_258; s32 unk_25C; @@ -78,35 +78,35 @@ typedef struct UnkStruct_ov117_022626B0_t { u8 unk_276; } UnkStruct_ov117_022626B0; -static void ov117_02262B98(UnkStruct_ov117_022626B0 * param0); -static void ov117_02262E0C(UnkStruct_ov117_022626B0 * param0); -static void ov117_02262E5C(UnkStruct_ov117_022626B0 * param0); -static void ov117_02262EAC(UnkStruct_ov117_022626B0 * param0); -static void ov117_02262A70(UnkStruct_ov117_022626B0 * param0); -static BOOL ov117_02263270(UnkStruct_ov117_022626B0 * param0); -static int ov117_0226334C(UnkStruct_ov117_022626B0 * param0); -static int ov117_02263448(UnkStruct_ov117_022626B0 * param0, int param1, fx32 param2); -static int ov117_022637AC(UnkStruct_ov117_022626B0 * param0, int param1); -static int ov117_022637E4(UnkStruct_ov117_022626B0 * param0, fx32 param1, fx32 param2, fx32 param3, fx32 * param4, fx32 * param5); -static fx32 ov117_0226384C(UnkStruct_ov117_022626B0 * param0); -static int ov117_022638AC(UnkStruct_ov117_022626B0 * param0); -static void ov117_02263168(fx32 param0, fx32 param1, fx16 * param2, fx16 * param3); -static void ov117_02262A38(UnkStruct_ov117_022626B0 * param0); -static int ov117_0226296C(UnkStruct_ov117_022626B0 * param0, int param1); -static void ov117_02262998(UnkStruct_ov117_022626B0 * param0, int param1); -static void ov117_02262C3C(UnkStruct_ov117_022626B0 * param0); -static void ov117_02262C60(UnkStruct_ov117_022626B0 * param0, int param1); -static BOOL ov117_02262CB8(UnkStruct_ov117_022626B0 * param0, int param1); -static void ov117_02262CE8(UnkStruct_ov117_022626B0 * param0); -static void ov117_02262CFC(UnkStruct_ov117_022626B0 * param0); -static void ov117_022629E0(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 * param1, int param2, int param3); +static void ov117_02262B98(UnkStruct_ov117_022626B0 *param0); +static void ov117_02262E0C(UnkStruct_ov117_022626B0 *param0); +static void ov117_02262E5C(UnkStruct_ov117_022626B0 *param0); +static void ov117_02262EAC(UnkStruct_ov117_022626B0 *param0); +static void ov117_02262A70(UnkStruct_ov117_022626B0 *param0); +static BOOL ov117_02263270(UnkStruct_ov117_022626B0 *param0); +static int ov117_0226334C(UnkStruct_ov117_022626B0 *param0); +static int ov117_02263448(UnkStruct_ov117_022626B0 *param0, int param1, fx32 param2); +static int ov117_022637AC(UnkStruct_ov117_022626B0 *param0, int param1); +static int ov117_022637E4(UnkStruct_ov117_022626B0 *param0, fx32 param1, fx32 param2, fx32 param3, fx32 *param4, fx32 *param5); +static fx32 ov117_0226384C(UnkStruct_ov117_022626B0 *param0); +static int ov117_022638AC(UnkStruct_ov117_022626B0 *param0); +static void ov117_02263168(fx32 param0, fx32 param1, fx16 *param2, fx16 *param3); +static void ov117_02262A38(UnkStruct_ov117_022626B0 *param0); +static int ov117_0226296C(UnkStruct_ov117_022626B0 *param0, int param1); +static void ov117_02262998(UnkStruct_ov117_022626B0 *param0, int param1); +static void ov117_02262C3C(UnkStruct_ov117_022626B0 *param0); +static void ov117_02262C60(UnkStruct_ov117_022626B0 *param0, int param1); +static BOOL ov117_02262CB8(UnkStruct_ov117_022626B0 *param0, int param1); +static void ov117_02262CE8(UnkStruct_ov117_022626B0 *param0); +static void ov117_02262CFC(UnkStruct_ov117_022626B0 *param0); +static void ov117_022629E0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022626B0 *param1, int param2, int param3); void ov117_02262D4C(BOOL param0, BOOL param1); void ov117_02262D98(); -static void ov117_022638D8(UnkStruct_ov117_02261280 * param0); -static void ov117_022639BC(UnkStruct_ov117_02261280 * param0); -static CellActorData * ov117_02263A00(UnkStruct_ov117_02261280 * param0); -static void ov117_02263A6C(UnkStruct_ov117_022626B0 * param0, CellActorData * param1); -static void ov117_02263AE4(CellActorData * param0); +static void ov117_022638D8(UnkStruct_ov117_02261280 *param0); +static void ov117_022639BC(UnkStruct_ov117_02261280 *param0); +static CellActorData *ov117_02263A00(UnkStruct_ov117_02261280 *param0); +static void ov117_02263A6C(UnkStruct_ov117_022626B0 *param0, CellActorData *param1); +static void ov117_02263AE4(CellActorData *param0); static const fx16 Unk_ov117_02266B12[3 * 6] = { 0x0, @@ -137,7 +137,7 @@ static const SpriteTemplate Unk_ov117_02266B38 = { 0xE, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x2713, 0x2715, 0x2713, 0x2713, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2713, 0x2715, 0x2713, 0x2713, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -148,21 +148,21 @@ static const struct { u8 unk_02; u8 unk_03; } Unk_ov117_02266B05[] = { - {0x40, 0xC0, 0x10, 0xA8}, - {0x28, 0xD8, 0x0, 0xA8}, - {0x54, 0xAC, 0x8, 0xA8} + { 0x40, 0xC0, 0x10, 0xA8 }, + { 0x28, 0xD8, 0x0, 0xA8 }, + { 0x54, 0xAC, 0x8, 0xA8 } }; extern const s32 Unk_ov117_02266FD8[]; -inline void inline_ov117_02262EAC (int param0) +inline void inline_ov117_02262EAC(int param0) { NNS_G3dGeNormal(Unk_ov117_02266B12[param0 * 3], Unk_ov117_02266B12[param0 * 3 + 1], Unk_ov117_02266B12[param0 * 3 + 2]); } -UnkStruct_ov117_022626B0 * ov117_022626B0 (UnkStruct_ov117_02261280 * param0) +UnkStruct_ov117_022626B0 *ov117_022626B0(UnkStruct_ov117_02261280 *param0) { - UnkStruct_ov117_022626B0 * v0; + UnkStruct_ov117_022626B0 *v0; v0 = Heap_AllocFromHeap(110, sizeof(UnkStruct_ov117_022626B0)); MI_CpuClear8(v0, sizeof(UnkStruct_ov117_022626B0)); @@ -199,7 +199,7 @@ UnkStruct_ov117_022626B0 * ov117_022626B0 (UnkStruct_ov117_02261280 * param0) return v0; } -void ov117_02262760 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 * param1) +void ov117_02262760(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022626B0 *param1) { ov117_02263AE4(param1->unk_234); ov117_022639BC(param0); @@ -210,7 +210,7 @@ void ov117_02262760 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 Heap_FreeToHeap(param1); } -void ov117_02262798 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 * param1) +void ov117_02262798(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022626B0 *param1) { param1->unk_244 = 0; @@ -290,7 +290,7 @@ void ov117_02262798 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 } } -void ov117_02262950 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 * param1) +void ov117_02262950(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022626B0 *param1) { if (param1->unk_276 == 1) { param1->unk_276 = 0; @@ -298,7 +298,7 @@ void ov117_02262950 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 } } -static int ov117_0226296C (UnkStruct_ov117_022626B0 * param0, int param1) +static int ov117_0226296C(UnkStruct_ov117_022626B0 *param0, int param1) { int v0; @@ -312,7 +312,7 @@ static int ov117_0226296C (UnkStruct_ov117_022626B0 * param0, int param1) return v0; } -static void ov117_02262998 (UnkStruct_ov117_022626B0 * param0, int param1) +static void ov117_02262998(UnkStruct_ov117_022626B0 *param0, int param1) { if (param0->unk_244 >= 98) { param0->unk_248 += 0x1000; @@ -327,7 +327,7 @@ static void ov117_02262998 (UnkStruct_ov117_022626B0 * param0, int param1) } } -static void ov117_022629E0 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022626B0 * param1, int param2, int param3) +static void ov117_022629E0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022626B0 *param1, int param2, int param3) { if ((param3 == 1) && (param1->unk_244 >= 98)) { ov117_02261600(param0, 0); @@ -345,7 +345,7 @@ static void ov117_022629E0 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 } } -static void ov117_02262A38 (UnkStruct_ov117_022626B0 * param0) +static void ov117_02262A38(UnkStruct_ov117_022626B0 *param0) { if (param0->unk_238 == 0) { return; @@ -366,7 +366,7 @@ static void ov117_02262A38 (UnkStruct_ov117_022626B0 * param0) } } -static void ov117_02262A70 (UnkStruct_ov117_022626B0 * param0) +static void ov117_02262A70(UnkStruct_ov117_022626B0 *param0) { u32 v0, v1; @@ -404,7 +404,7 @@ static void ov117_02262A70 (UnkStruct_ov117_022626B0 * param0) NNS_G3dGeFlushBuffer(); } -static void ov117_02262B98 (UnkStruct_ov117_022626B0 * param0) +static void ov117_02262B98(UnkStruct_ov117_022626B0 *param0) { param0->unk_00 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_APPLICATION__BALLOON__GRAPHIC__BALLOON_GRA, 29, 110); param0->unk_04 = NNS_G3dGetTex(param0->unk_00); @@ -413,7 +413,7 @@ static void ov117_02262B98 (UnkStruct_ov117_022626B0 * param0) { u32 v0; - void * v1; + void *v1; u32 v2; v0 = (u32)param0->unk_04->plttInfo.sizePltt << 3; @@ -435,7 +435,7 @@ static void ov117_02262B98 (UnkStruct_ov117_022626B0 * param0) } { - u8 * v3; + u8 *v3; u32 v4; GF_ASSERT(param0->unk_04->texInfo.ofsTex != 0); @@ -447,14 +447,14 @@ static void ov117_02262B98 (UnkStruct_ov117_022626B0 * param0) } } -static void ov117_02262C3C (UnkStruct_ov117_022626B0 * param0) +static void ov117_02262C3C(UnkStruct_ov117_022626B0 *param0) { GX_BeginLoadTexPltt(); GX_LoadTexPltt(param0->unk_250, param0->unk_258, param0->unk_254); GX_EndLoadTexPltt(); } -static void ov117_02262C60 (UnkStruct_ov117_022626B0 * param0, int param1) +static void ov117_02262C60(UnkStruct_ov117_022626B0 *param0, int param1) { int v0; @@ -471,7 +471,7 @@ static void ov117_02262C60 (UnkStruct_ov117_022626B0 * param0, int param1) param0->unk_276 = 1; } -static BOOL ov117_02262CB8 (UnkStruct_ov117_022626B0 * param0, int param1) +static BOOL ov117_02262CB8(UnkStruct_ov117_022626B0 *param0, int param1) { BOOL v0 = 0; @@ -487,13 +487,13 @@ static BOOL ov117_02262CB8 (UnkStruct_ov117_022626B0 * param0, int param1) return v0; } -static void ov117_02262CE8 (UnkStruct_ov117_022626B0 * param0) +static void ov117_02262CE8(UnkStruct_ov117_022626B0 *param0) { param0->unk_25C = 0; ov117_02262C60(param0, param0->unk_25C); } -static void ov117_02262CFC (UnkStruct_ov117_022626B0 * param0) +static void ov117_02262CFC(UnkStruct_ov117_022626B0 *param0) { if (param0->unk_268 == 0) { return; @@ -515,18 +515,18 @@ static const GXRgb DEMO_SPECULAR_COL = GX_RGB(31, 31, 31); static const GXRgb DEMO_EMISSION_COL = GX_RGB(0, 0, 0); static const u32 LIGHTING_L_DOT_S_SHIFT = 8; -void ov117_02262D4C (BOOL param0, BOOL param1) +void ov117_02262D4C(BOOL param0, BOOL param1) { NNS_G3dGeMaterialColorDiffAmb(DEMO_DIFFUSE_COL, DEMO_AMBIENT_COL, param0); NNS_G3dGeMaterialColorSpecEmi(DEMO_SPECULAR_COL, DEMO_EMISSION_COL, param1); } #include -void ov117_02262D98 () +void ov117_02262D98() { u8 i; u32 v0[32]; - u8 * v1 = (u8 *)&v0[0]; + u8 *v1 = (u8 *)&v0[0]; const u8 v2 = 32 * sizeof(u32); for (i = 0; i < v2 - 1; i++) { @@ -539,7 +539,7 @@ void ov117_02262D98 () } #include -static void ov117_02262E0C (UnkStruct_ov117_022626B0 * param0) +static void ov117_02262E0C(UnkStruct_ov117_022626B0 *param0) { int v0; fx32 v1; @@ -554,14 +554,14 @@ static void ov117_02262E0C (UnkStruct_ov117_022626B0 * param0) param0->unk_0C[v0].unk_00.unk_04 = v1; param0->unk_0C[v0].unk_08.unk_00 = 0; param0->unk_0C[v0].unk_08.unk_04 = v1 + v2; - param0->unk_0C[v0].unk_10.unk_00 = ((128 * FX32_ONE)); + param0->unk_0C[v0].unk_10.unk_00 = (128 * FX32_ONE); param0->unk_0C[v0].unk_10.unk_04 = v1; - param0->unk_0C[v0].unk_18.unk_00 = ((128 * FX32_ONE)); + param0->unk_0C[v0].unk_18.unk_00 = (128 * FX32_ONE); param0->unk_0C[v0].unk_18.unk_04 = v1 + v2; } } -static void ov117_02262E5C (UnkStruct_ov117_022626B0 * param0) +static void ov117_02262E5C(UnkStruct_ov117_022626B0 *param0) { int v0; fx32 v1; @@ -583,7 +583,7 @@ static void ov117_02262E5C (UnkStruct_ov117_022626B0 * param0) } } -static void ov117_02262EAC (UnkStruct_ov117_022626B0 * param0) +static void ov117_02262EAC(UnkStruct_ov117_022626B0 *param0) { int v0; fx64 v1, v2; @@ -616,12 +616,12 @@ static void ov117_02262EAC (UnkStruct_ov117_022626B0 * param0) } } -static void ov117_02263168 (fx32 param0, fx32 param1, fx16 * param2, fx16 * param3) +static void ov117_02263168(fx32 param0, fx32 param1, fx16 *param2, fx16 *param3) { fx32 v0, v1; - v0 = (FX16_ONE)*(fx64)param0 / (128 * FX32_ONE); - v1 = (FX16_ONE)*(fx64)param1 / (128 * FX32_ONE); + v0 = (FX16_ONE) * (fx64)param0 / (128 * FX32_ONE); + v1 = (FX16_ONE) * (fx64)param1 / (128 * FX32_ONE); GF_ASSERT(v0 <= FX16_MAX); GF_ASSERT(v0 >= FX16_MIN); @@ -640,7 +640,7 @@ static void ov117_02263168 (fx32 param0, fx32 param1, fx16 * param2, fx16 * para *param3 = v1; } -static BOOL ov117_02263270 (UnkStruct_ov117_022626B0 * param0) +static BOOL ov117_02263270(UnkStruct_ov117_022626B0 *param0) { int v0; @@ -664,7 +664,7 @@ static BOOL ov117_02263270 (UnkStruct_ov117_022626B0 * param0) return 1; } -static int ov117_0226334C (UnkStruct_ov117_022626B0 * param0) +static int ov117_0226334C(UnkStruct_ov117_022626B0 *param0) { int v0 = 0; fx32 v1; @@ -709,7 +709,7 @@ static int ov117_0226334C (UnkStruct_ov117_022626B0 * param0) return 1; } -static int ov117_02263448 (UnkStruct_ov117_022626B0 * param0, int param1, fx32 param2) +static int ov117_02263448(UnkStruct_ov117_022626B0 *param0, int param1, fx32 param2) { fx32 v0, v1, v2, v3, v4, v5, v6; fx32 v7, v8; @@ -849,7 +849,7 @@ static int ov117_02263448 (UnkStruct_ov117_022626B0 * param0, int param1, fx32 p return 0; } -static int ov117_022637AC (UnkStruct_ov117_022626B0 * param0, int param1) +static int ov117_022637AC(UnkStruct_ov117_022626B0 *param0, int param1) { if (param1 == 1) { return 0; @@ -864,7 +864,7 @@ static int ov117_022637AC (UnkStruct_ov117_022626B0 * param0, int param1) return 0; } -static int ov117_022637E4 (UnkStruct_ov117_022626B0 * param0, fx32 param1, fx32 param2, fx32 param3, fx32 * param4, fx32 * param5) +static int ov117_022637E4(UnkStruct_ov117_022626B0 *param0, fx32 param1, fx32 param2, fx32 param3, fx32 *param4, fx32 *param5) { int v0 = 0; @@ -887,7 +887,7 @@ static int ov117_022637E4 (UnkStruct_ov117_022626B0 * param0, fx32 param1, fx32 return v0; } -static fx32 ov117_0226384C (UnkStruct_ov117_022626B0 * param0) +static fx32 ov117_0226384C(UnkStruct_ov117_022626B0 *param0) { fx32 v0, v1, v2; fx32 v3, v4, v5; @@ -903,20 +903,20 @@ static fx32 ov117_0226384C (UnkStruct_ov117_022626B0 * param0) return v6; } -static int ov117_022638AC (UnkStruct_ov117_022626B0 * param0) +static int ov117_022638AC(UnkStruct_ov117_022626B0 *param0) { fx32 v0; int v1; v0 = ov117_0226384C(param0); - v1 = 100 * (fx64)v0 / (((((((128 * FX32_ONE)) - 0) + (((128 * FX32_ONE)) - 0)) * (fx64)((((128 * FX32_ONE) / 8 * (8 - 1)) - 12 * FX32_ONE))) >> FX32_SHIFT) / 2); + v1 = 100 * (fx64)v0 / ((((((128 * FX32_ONE) - 0) + ((128 * FX32_ONE) - 0)) * (fx64)(((128 * FX32_ONE) / 8 * (8 - 1)) - 12 * FX32_ONE)) >> FX32_SHIFT) / 2); return v1; } -static void ov117_022638D8 (UnkStruct_ov117_02261280 * param0) +static void ov117_022638D8(UnkStruct_ov117_02261280 *param0) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_APPLICATION__BALLOON__GRAPHIC__BALLOON_GRA, 110); @@ -927,7 +927,7 @@ static void ov117_022638D8 (UnkStruct_ov117_02261280 * param0) NARC_dtor(v0); } -static void ov117_022639BC (UnkStruct_ov117_02261280 * param0) +static void ov117_022639BC(UnkStruct_ov117_02261280 *param0) { SpriteGfxHandler_UnloadCharObjById(param0->unk_28, 10003); SpriteGfxHandler_UnloadCellObjById(param0->unk_28, 10003); @@ -935,9 +935,9 @@ static void ov117_022639BC (UnkStruct_ov117_02261280 * param0) SpriteGfxHandler_UnloadPlttObjById(param0->unk_28, 10005); } -static CellActorData * ov117_02263A00 (UnkStruct_ov117_02261280 * param0) +static CellActorData *ov117_02263A00(UnkStruct_ov117_02261280 *param0) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; v1 = Unk_ov117_02266B38; @@ -949,7 +949,7 @@ static CellActorData * ov117_02263A00 (UnkStruct_ov117_02261280 * param0) return v0; } -static void ov117_02263A6C (UnkStruct_ov117_022626B0 * param0, CellActorData * param1) +static void ov117_02263A6C(UnkStruct_ov117_022626B0 *param0, CellActorData *param1) { int v0; @@ -964,7 +964,7 @@ static void ov117_02263A6C (UnkStruct_ov117_022626B0 * param0, CellActorData * p SpriteActor_UpdateObject(param1->unk_00); } -static void ov117_02263AE4 (CellActorData * param0) +static void ov117_02263AE4(CellActorData *param0) { sub_0200D0F4(param0); } diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c index 24eccfaba7..9fe9e8ebae 100644 --- a/src/overlay117/ov117_02263AF0.c +++ b/src/overlay117/ov117_02263AF0.c @@ -1,18 +1,21 @@ +#include "overlay117/ov117_02263AF0.h" + #include #include +#include "struct_decls/font_oam.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02012744_decl.h" -#include "struct_decls/font_oam.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - +#include "struct_defs/sprite_manager_allocation.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/sprite_manager_allocation.h" #include "struct_defs/struct_0205AA50.h" -#include "struct_defs/sprite_template.h" + +#include "overlay117/ov117_02260668.h" +#include "overlay117/ov117_022666C0.h" #include "overlay117/struct_ov117_02261280.h" #include "overlay117/struct_ov117_02263DAC.h" #include "overlay117/struct_ov117_02263EF8.h" @@ -31,24 +34,21 @@ #include "overlay117/struct_ov117_02266344.h" #include "overlay117/struct_ov117_02266F10.h" +#include "communication_system.h" +#include "error_handling.h" +#include "message.h" +#include "narc.h" +#include "strbuf.h" #include "unk_02002B7C.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" #include "unk_0200C6E4.h" #include "unk_02012744.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201E86C.h" -#include "error_handling.h" -#include "strbuf.h" -#include "communication_system.h" -#include "overlay117/ov117_02260668.h" -#include "overlay117/ov117_02263AF0.h" -#include "overlay117/ov117_022666C0.h" typedef struct { u16 unk_00; @@ -67,45 +67,45 @@ typedef struct { u8 unk_03; } UnkStruct_ov117_02266BC4; -static void ov117_02263BA4(BGL * param0, UnkStruct_ov117_02263DAC * param1, int param2); -int ov117_02263DAC(UnkStruct_ov117_02261280 * param0); -static void ov117_02263C8C(int param0, int param1, int param2, fx32 * param3, fx32 * param4); -static int ov117_02263D08(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02263DAC * param1, int param2, int param3, int param4); -static int ov117_02263E1C(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02264E84 * param1, UnkStruct_ov117_02263EF8 * param2); -static BOOL ov117_02263F80(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02263EF8 * param1); -static CellActorData * ov117_0226417C(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02266F10 * param1); -static void ov117_02264214(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02264808 * param1, UnkStruct_ov117_02263DAC * param2); -static void ov117_02263B8C(BGL * param0, UnkStruct_ov117_02263DAC * param1); -static CellActorData * ov117_02264884(UnkStruct_ov117_02261280 * param0, int param1, int param2); -void ov117_022648E0(UnkStruct_ov117_02261280 * param0); -BOOL ov117_02264930(UnkStruct_ov117_02261280 * param0); -static BOOL ov117_02264958(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02264930 * param1, int param2, int param3); -static void ov117_0226498C(UnkStruct_ov117_02264930 * param0); -static void ov117_022649D8(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02264930 * param1); +static void ov117_02263BA4(BGL *param0, UnkStruct_ov117_02263DAC *param1, int param2); +int ov117_02263DAC(UnkStruct_ov117_02261280 *param0); +static void ov117_02263C8C(int param0, int param1, int param2, fx32 *param3, fx32 *param4); +static int ov117_02263D08(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02263DAC *param1, int param2, int param3, int param4); +static int ov117_02263E1C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02264E84 *param1, UnkStruct_ov117_02263EF8 *param2); +static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02263EF8 *param1); +static CellActorData *ov117_0226417C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02266F10 *param1); +static void ov117_02264214(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264808 *param1, UnkStruct_ov117_02263DAC *param2); +static void ov117_02263B8C(BGL *param0, UnkStruct_ov117_02263DAC *param1); +static CellActorData *ov117_02264884(UnkStruct_ov117_02261280 *param0, int param1, int param2); +void ov117_022648E0(UnkStruct_ov117_02261280 *param0); +BOOL ov117_02264930(UnkStruct_ov117_02261280 *param0); +static BOOL ov117_02264958(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264930 *param1, int param2, int param3); +static void ov117_0226498C(UnkStruct_ov117_02264930 *param0); +static void ov117_022649D8(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264930 *param1); static int ov117_02264A70(int param0); -static void ov117_02264A84(UnkStruct_ov117_02261280 * param0); -static void ov117_02265438(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1, UnkStruct_ov117_02265428 * param2); -static void ov117_02265428(UnkStruct_ov117_02265428 * param0, int param1); -static int ov117_0226544C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1, UnkStruct_ov117_02265428 * param2); -static int ov117_02265454(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1, UnkStruct_ov117_02265428 * param2); -static int ov117_02265644(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1, UnkStruct_ov117_02265428 * param2); -static int ov117_022657C4(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1, UnkStruct_ov117_02265428 * param2); -static int ov117_022653F4(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265428 ** param1); -static BOOL ov117_02265C3C(UnkStruct_ov117_02265C3C * param0, UnkStruct_ov117_02265C1C * param1); -static void ov117_02265FD4(UnkStruct_ov117_02265EC8 * param0); -static BOOL ov117_02266008(UnkStruct_ov117_02265EC8 * param0); -static BOOL ov117_02266030(UnkStruct_ov117_02265EC8 * param0); -static void ov117_02266344(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02266344 * param1); -static void ov117_02266384(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02266344 * param1); -static void ov117_0226639C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265428 * param1, UnkStruct_ov117_02266344 * param2); -static void ov117_02266440(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265428 * param1, UnkStruct_ov117_02266344 * param2); +static void ov117_02264A84(UnkStruct_ov117_02261280 *param0); +static void ov117_02265438(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1, UnkStruct_ov117_02265428 *param2); +static void ov117_02265428(UnkStruct_ov117_02265428 *param0, int param1); +static int ov117_0226544C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1, UnkStruct_ov117_02265428 *param2); +static int ov117_02265454(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1, UnkStruct_ov117_02265428 *param2); +static int ov117_02265644(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1, UnkStruct_ov117_02265428 *param2); +static int ov117_022657C4(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1, UnkStruct_ov117_02265428 *param2); +static int ov117_022653F4(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265428 **param1); +static BOOL ov117_02265C3C(UnkStruct_ov117_02265C3C *param0, UnkStruct_ov117_02265C1C *param1); +static void ov117_02265FD4(UnkStruct_ov117_02265EC8 *param0); +static BOOL ov117_02266008(UnkStruct_ov117_02265EC8 *param0); +static BOOL ov117_02266030(UnkStruct_ov117_02265EC8 *param0); +static void ov117_02266344(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266344 *param1); +static void ov117_02266384(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266344 *param1); +static void ov117_0226639C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265428 *param1, UnkStruct_ov117_02266344 *param2); +static void ov117_02266440(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265428 *param1, UnkStruct_ov117_02266344 *param2); static const u16 Unk_ov117_02266C7C[][4] = { - {0x16, 0x15, 0x17, 0x18}, - {0x16, 0x15, 0x17, 0x18}, - {0x16, 0x17}, - {0x16, 0x18, 0x17}, - {0x16, 0x15, 0x17, 0x18} + { 0x16, 0x15, 0x17, 0x18 }, + { 0x16, 0x15, 0x17, 0x18 }, + { 0x16, 0x17 }, + { 0x16, 0x18, 0x17 }, + { 0x16, 0x15, 0x17, 0x18 } }; __attribute__((aligned(4))) static const u16 Unk_ov117_02266B6C[] = { @@ -116,26 +116,26 @@ __attribute__((aligned(4))) static const u16 Unk_ov117_02266B6C[] = { static const UnkStruct_ov117_02266F10 Unk_ov117_02266F10[][4] = { { - {0x80, 0xD0, 0x7, 0x2, 0x2} + { 0x80, 0xD0, 0x7, 0x2, 0x2 }, }, { - {0x80, 0xD0, 0x7, 0x2, 0x2} + { 0x80, 0xD0, 0x7, 0x2, 0x2 }, }, { - {0x80, 0xD0, 0x7, 0x2, 0x2}, - {0x80, 0xFFFFFFFFFFFFFFF0, 0xA, 0x1, 0x0} + { 0x80, 0xD0, 0x7, 0x2, 0x2 }, + { 0x80, 0xFFFFFFFFFFFFFFF0, 0xA, 0x1, 0x0 }, }, { - {0x80, 0xD0, 0x7, 0x2, 0x2}, - {0xFFFFFFFFFFFFFFF0, 0x60, 0x9, 0x3, 0x3}, - {0x110, 0x60, 0x8, 0x1, 0x1} + { 0x80, 0xD0, 0x7, 0x2, 0x2 }, + { 0xFFFFFFFFFFFFFFF0, 0x60, 0x9, 0x3, 0x3 }, + { 0x110, 0x60, 0x8, 0x1, 0x1 }, }, { - {0x80, 0xD0, 0x7, 0x2, 0x2}, - {0xFFFFFFFFFFFFFFF0, 0x60, 0x9, 0x4, 0x3}, - {0x80, 0xFFFFFFFFFFFFFFF0, 0xA, 0x1, 0x0}, - {0x100, 0x60, 0x8, 0x3, 0x1} - } + { 0x80, 0xD0, 0x7, 0x2, 0x2 }, + { 0xFFFFFFFFFFFFFFF0, 0x60, 0x9, 0x4, 0x3 }, + { 0x80, 0xFFFFFFFFFFFFFFF0, 0xA, 0x1, 0x0 }, + { 0x100, 0x60, 0x8, 0x3, 0x1 }, + }, }; static const SpriteTemplate Unk_ov117_02266CCC = { @@ -146,7 +146,7 @@ static const SpriteTemplate Unk_ov117_02266CCC = { 0x14, 0x1, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -159,7 +159,7 @@ static const SpriteTemplate Unk_ov117_02266D00 = { 0xC, 0x5, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -172,7 +172,7 @@ static const SpriteTemplate Unk_ov117_02266D34 = { 0xB, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF }, 0x1, 0x0 }; @@ -185,7 +185,7 @@ static const SpriteTemplate Unk_ov117_02266D68 = { 0x13, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -198,7 +198,7 @@ static const SpriteTemplate Unk_ov117_02266D9C = { 0x10, 0x2, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -211,7 +211,7 @@ static const SpriteTemplate Unk_ov117_02266DD0 = { 0xF, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -224,7 +224,7 @@ static const SpriteTemplate Unk_ov117_02266E04 = { 0x12, 0x1, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -237,7 +237,7 @@ static const SpriteTemplate Unk_ov117_02266E38 = { 0x11, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, - {0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2714, 0x2716, 0x2714, 0x2714, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -250,7 +250,7 @@ static const SpriteTemplate Unk_ov117_02266E6C = { 0xD, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x2712, 0x2714, 0x2712, 0x2712, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2712, 0x2714, 0x2712, 0x2712, 0xFFFFFFFF, 0xFFFFFFFF }, 0x3, 0x0 }; @@ -263,17 +263,17 @@ static const SpriteTemplate Unk_ov117_02266EA0 = { 0xB, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x2711, 0x2712, 0x2711, 0x2711, 0xFFFFFFFF, 0xFFFFFFFF}, + { 0x2711, 0x2712, 0x2711, 0x2711, 0xFFFFFFFF, 0xFFFFFFFF }, 0x0, 0x0 }; static const u16 Unk_ov117_02266CA4[][4] = { - {0x1D, 0x2D, 0xD, 0x3D}, - {0x1D, 0x2D, 0xD, 0x3D}, - {0x1D, 0xD}, - {0x1D, 0x3D, 0xD}, - {0x1D, 0x2D, 0xD, 0x3D} + { 0x1D, 0x2D, 0xD, 0x3D }, + { 0x1D, 0x2D, 0xD, 0x3D }, + { 0x1D, 0xD }, + { 0x1D, 0x3D, 0xD }, + { 0x1D, 0x2D, 0xD, 0x3D } }; static const u16 Unk_ov117_02266B72[4] = { @@ -284,11 +284,11 @@ static const u16 Unk_ov117_02266B72[4] = { }; static const u16 Unk_ov117_02266C04[][4] = { - {0x20, 0x10, 0x30, 0x40}, - {0x20, 0x10, 0x30, 0x40}, - {0x20, 0x10}, - {0x20, 0x30, 0x10}, - {0x20, 0x40, 0x10, 0x30} + { 0x20, 0x10, 0x30, 0x40 }, + { 0x20, 0x10, 0x30, 0x40 }, + { 0x20, 0x10 }, + { 0x20, 0x30, 0x10 }, + { 0x20, 0x40, 0x10, 0x30 } }; static const u16 Unk_ov117_02266B8A[4] = { @@ -306,11 +306,11 @@ static const fx32 Unk_ov117_02266BA4[] = { }; static const u16 Unk_ov117_02266C54[][4] = { - {0x52, 0x51, 0x53, 0x54}, - {0x52, 0x51, 0x53, 0x54}, - {0x52, 0x51}, - {0x52, 0x53, 0x51}, - {0x52, 0x54, 0x51, 0x53} + { 0x52, 0x51, 0x53, 0x54 }, + { 0x52, 0x51, 0x53, 0x54 }, + { 0x52, 0x51 }, + { 0x52, 0x53, 0x51 }, + { 0x52, 0x54, 0x51, 0x53 } }; static const u16 Unk_ov117_02266B82[4] = { @@ -324,10 +324,10 @@ static const struct { s16 unk_00; s16 unk_02; } Unk_ov117_02266BB4[] = { - {0x80, 0xA4}, - {0x80, 0x1C}, - {0x34, 0x60}, - {0xCC, 0x60} + { 0x80, 0xA4 }, + { 0x80, 0x1C }, + { 0x34, 0x60 }, + { 0xCC, 0x60 } }; static const u16 Unk_ov117_02266B7A[] = { @@ -338,59 +338,59 @@ static const u16 Unk_ov117_02266B7A[] = { }; static const u16 Unk_ov117_02266C2C[][4] = { - {0x2, 0x4, 0x1, 0x3}, - {0x2, 0x4, 0x1, 0x3}, - {0x2, 0x1}, - {0x2, 0x3, 0x1}, - {0x2, 0x4, 0x1, 0x3} + { 0x2, 0x4, 0x1, 0x3 }, + { 0x2, 0x4, 0x1, 0x3 }, + { 0x2, 0x1 }, + { 0x2, 0x3, 0x1 }, + { 0x2, 0x4, 0x1, 0x3 } }; static const u8 Unk_ov117_02266BD8[][4] = { - {0x0}, - {0x0, 0x2, 0x1, 0x3}, - {0x0, 0x1}, - {0x0, 0x2, 0x3}, - {0x0, 0x2, 0x1, 0x3} + { 0x0 }, + { 0x0, 0x2, 0x1, 0x3 }, + { 0x0, 0x1 }, + { 0x0, 0x2, 0x3 }, + { 0x0, 0x2, 0x1, 0x3 } }; static const UnkStruct_ov117_02266ED4 Unk_ov117_02266ED4[] = { - { 0xBB8, 0x1770, 0x1F40 }, - { 0x3E8, 0x3E8, 0x3E8 }, - { 0x19A6, 0x20FA, 0x284E }, - { 0x20EC, 0x2A54, 0x33BC }, - { 0x2648, 0x3138, 0x3C28 } + { 0xBB8, 0x1770, 0x1F40 }, + { 0x3E8, 0x3E8, 0x3E8 }, + { 0x19A6, 0x20FA, 0x284E }, + { 0x20EC, 0x2A54, 0x33BC }, + { 0x2648, 0x3138, 0x3C28 } }; static const UnkStruct_ov117_02266BEC Unk_ov117_02266BEC[] = { - { 0xB, 0xC, 0x1100 }, - { 0x9, 0xA, 0x1700 }, - { 0x7, 0x8, 0x1D00 } + { 0xB, 0xC, 0x1100 }, + { 0x9, 0xA, 0x1700 }, + { 0x7, 0x8, 0x1D00 } }; static const UnkStruct_ov117_02266BC4 Unk_ov117_02266BC4[] = { - { 0x8, 0x14, 0x7 }, - { 0x8, 0x11, 0x7 }, - { 0x8, 0xE, 0x6 }, - { 0x8, 0xA, 0x6 }, - { 0x8, 0x6, 0x5 } + { 0x8, 0x14, 0x7 }, + { 0x8, 0x11, 0x7 }, + { 0x8, 0xE, 0x6 }, + { 0x8, 0xA, 0x6 }, + { 0x8, 0x6, 0x5 } }; const s32 Unk_ov117_02266FD8[] = { - 0x64, - 0x7D, - 0x58 + 0x64, + 0x7D, + 0x58 }; -static int(*const Unk_ov117_02266B94[])(UnkStruct_ov117_02261280 *, UnkStruct_ov117_022653F4 *, UnkStruct_ov117_02265428 *) = { +static int (*const Unk_ov117_02266B94[])(UnkStruct_ov117_02261280 *, UnkStruct_ov117_022653F4 *, UnkStruct_ov117_02265428 *) = { ov117_0226544C, ov117_02265454, ov117_02265644, ov117_022657C4, }; -void ov117_02263AF0 (BGL * param0, int param1, int param2, UnkStruct_ov117_02263DAC * param3) +void ov117_02263AF0(BGL *param0, int param1, int param2, UnkStruct_ov117_02263DAC *param3) { - NARC * v0; + NARC *v0; v0 = NARC_ctor(NARC_INDEX_APPLICATION__BALLOON__GRAPHIC__BALLOON_GRA, 110); @@ -409,14 +409,14 @@ void ov117_02263AF0 (BGL * param0, int param1, int param2, UnkStruct_ov117_02263 Sound_PlayEffect(1515); } -static void ov117_02263B8C (BGL * param0, UnkStruct_ov117_02263DAC * param1) +static void ov117_02263B8C(BGL *param0, UnkStruct_ov117_02263DAC *param1) { sub_02019EBC(param0, 7); param1->unk_00 = 0; param1->unk_2D = 1; } -static void ov117_02263BA4 (BGL * param0, UnkStruct_ov117_02263DAC * param1, int param2) +static void ov117_02263BA4(BGL *param0, UnkStruct_ov117_02263DAC *param1, int param2) { fx32 v0, v1; int v2, v3; @@ -473,7 +473,7 @@ static void ov117_02263BA4 (BGL * param0, UnkStruct_ov117_02263DAC * param1, int } } -static void ov117_02263C8C (int param0, int param1, int param2, fx32 * param3, fx32 * param4) +static void ov117_02263C8C(int param0, int param1, int param2, fx32 *param3, fx32 *param4) { fx32 v0; @@ -488,7 +488,7 @@ static void ov117_02263C8C (int param0, int param1, int param2, fx32 * param3, f } } -int ov117_02263CF4 (int param0) +int ov117_02263CF4(int param0) { if (10 <= param0) { return 2; @@ -499,7 +499,7 @@ int ov117_02263CF4 (int param0) return 0; } -static int ov117_02263D08 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02263DAC * param1, int param2, int param3, int param4) +static int ov117_02263D08(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02263DAC *param1, int param2, int param3, int param4) { param1->unk_10 += param2; param1->unk_14 = param1->unk_10 / 6; @@ -513,7 +513,7 @@ static int ov117_02263D08 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02 return param1->unk_10; } -static int ov117_02263D5C (UnkStruct_ov117_02263DAC * param0) +static int ov117_02263D5C(UnkStruct_ov117_02263DAC *param0) { int v0; @@ -533,7 +533,7 @@ static int ov117_02263D5C (UnkStruct_ov117_02263DAC * param0) return 1; } -void ov117_02263D80 (UnkStruct_ov117_02261280 * param0, BGL * param1, UnkStruct_ov117_02263DAC * param2) +void ov117_02263D80(UnkStruct_ov117_02261280 *param0, BGL *param1, UnkStruct_ov117_02263DAC *param2) { if (param0->unk_2FCC == 0) { return; @@ -543,13 +543,13 @@ void ov117_02263D80 (UnkStruct_ov117_02261280 * param0, BGL * param1, UnkStruct_ ov117_02263BA4(param1, param2, param0->unk_00->unk_30); } -int ov117_02263DAC (UnkStruct_ov117_02261280 * param0) +int ov117_02263DAC(UnkStruct_ov117_02261280 *param0) { - UnkStruct_ov117_02263DAC * v0 = ¶m0->unk_1428; + UnkStruct_ov117_02263DAC *v0 = ¶m0->unk_1428; return 100 * v0->unk_08 / v0->unk_0C; } -BOOL ov117_02263DC4 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02264E84 * param1) +BOOL ov117_02263DC4(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02264E84 *param1) { int v0, v1; @@ -570,10 +570,10 @@ BOOL ov117_02263DC4 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02 return 0; } -static int ov117_02263E1C (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02264E84 * param1, UnkStruct_ov117_02263EF8 * param2) +static int ov117_02263E1C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02264E84 *param1, UnkStruct_ov117_02263EF8 *param2) { int v0; - const UnkStruct_ov117_02266F10 * v1; + const UnkStruct_ov117_02266F10 *v1; int v2; GF_ASSERT(param2->unk_00 == 0); @@ -624,10 +624,10 @@ static int ov117_02263E1C (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov return v2; } -void ov117_02263EF8 (UnkStruct_ov117_02261280 * param0) +void ov117_02263EF8(UnkStruct_ov117_02261280 *param0) { int v0; - UnkStruct_ov117_02263EF8 * v1; + UnkStruct_ov117_02263EF8 *v1; v1 = param0->unk_2FDC; @@ -653,7 +653,7 @@ void ov117_02263EF8 (UnkStruct_ov117_02261280 * param0) } } -static BOOL ov117_02263F80 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02263EF8 * param1) +static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02263EF8 *param1) { s16 v0, v1, v2, v3; int v4 = 0; @@ -737,7 +737,7 @@ static BOOL ov117_02263F80 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 } } if ((param1->unk_04 == CommSys_CurNetId()) && (v6 >= 0) && (v5 <= 0)) { - UnkStruct_ov117_02265428 * v9; + UnkStruct_ov117_02265428 *v9; param1->unk_0E = ov117_022653F4(param0, &v9); @@ -760,7 +760,7 @@ static BOOL ov117_02263F80 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 } { - UnkStruct_ov117_02264E84 * v10; + UnkStruct_ov117_02264E84 *v10; v10 = ov117_02264E84(param0); @@ -779,9 +779,9 @@ static BOOL ov117_02263F80 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 return 0; } -static CellActorData * ov117_0226417C (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02266F10 * param1) +static CellActorData *ov117_0226417C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02266F10 *param1) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; v1 = Unk_ov117_02266CCC; @@ -798,7 +798,7 @@ static CellActorData * ov117_0226417C (UnkStruct_ov117_02261280 * param0, const return v0; } -void ov117_022641E4 (UnkStruct_ov117_02261280 * param0) +void ov117_022641E4(UnkStruct_ov117_02261280 *param0) { int v0; @@ -810,10 +810,10 @@ void ov117_022641E4 (UnkStruct_ov117_02261280 * param0) } } -static void ov117_02264214 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02264808 * param1, UnkStruct_ov117_02263DAC * param2) +static void ov117_02264214(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264808 *param1, UnkStruct_ov117_02263DAC *param2) { SpriteTemplate v0; - CellActorData * v1; + CellActorData *v1; int v2; int v3[4]; int v4, v5, v6; @@ -829,7 +829,7 @@ static void ov117_02264214 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 v6 = Unk_ov117_02266C7C[param0->unk_00->unk_30][v2]; for (v9 = 0; v9 < v3[v8]; v9++) { - UnkStruct_ov117_02264508 * v10 = ¶m1->unk_04[v7]; + UnkStruct_ov117_02264508 *v10 = ¶m1->unk_04[v7]; v1 = SpriteActor_LoadResources(param0->unk_24, param0->unk_28, &v0); @@ -857,7 +857,7 @@ static void ov117_02264214 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 v0.plttIdx = 0; for (v8 = 0; v8 < 8; v8++) { - UnkStruct_ov117_02264508 * v11 = ¶m1->unk_868[v8]; + UnkStruct_ov117_02264508 *v11 = ¶m1->unk_868[v8]; v1 = SpriteActor_LoadResources(param0->unk_24, param0->unk_28, &v0); @@ -882,7 +882,7 @@ static void ov117_02264214 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 v0.plttIdx = Unk_ov117_02266B6C[param2->unk_04]; for (v8 = 0; v8 < 3; v8++) { - UnkStruct_ov117_02264508 * v12 = ¶m1->unk_928[v8]; + UnkStruct_ov117_02264508 *v12 = ¶m1->unk_928[v8]; v1 = SpriteActor_LoadResources(param0->unk_24, param0->unk_28, &v0); @@ -904,10 +904,10 @@ static void ov117_02264214 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 } } -void ov117_02264508 (UnkStruct_ov117_02261280 * param0) +void ov117_02264508(UnkStruct_ov117_02261280 *param0) { int v0; - UnkStruct_ov117_02264508 * v1, * v2, * v3; + UnkStruct_ov117_02264508 *v1, *v2, *v3; for (v0 = 0; v0 < 36; v0++) { v1 = ¶m0->unk_339C.unk_04[v0]; @@ -934,10 +934,10 @@ void ov117_02264508 (UnkStruct_ov117_02261280 * param0) } } -BOOL ov117_02264560 (UnkStruct_ov117_02261280 * param0) +BOOL ov117_02264560(UnkStruct_ov117_02261280 *param0) { - UnkStruct_ov117_02264808 * v0 = ¶m0->unk_339C; - UnkStruct_ov117_02264508 * v1, * v2, * v3; + UnkStruct_ov117_02264808 *v0 = ¶m0->unk_339C; + UnkStruct_ov117_02264508 *v1, *v2, *v3; s16 v4, v5; int v6 = 0; int v7; @@ -1034,9 +1034,9 @@ BOOL ov117_02264560 (UnkStruct_ov117_02261280 * param0) return 1; } -BOOL ov117_02264808 (UnkStruct_ov117_02261280 * param0) +BOOL ov117_02264808(UnkStruct_ov117_02261280 *param0) { - UnkStruct_ov117_02264808 * v0 = ¶m0->unk_339C; + UnkStruct_ov117_02264808 *v0 = ¶m0->unk_339C; int v1; if (v0->unk_00 == 1) { @@ -1062,9 +1062,9 @@ BOOL ov117_02264808 (UnkStruct_ov117_02261280 * param0) return 1; } -static CellActorData * ov117_02264884 (UnkStruct_ov117_02261280 * param0, int param1, int param2) +static CellActorData *ov117_02264884(UnkStruct_ov117_02261280 *param0, int param1, int param2) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; v1 = Unk_ov117_02266D34; @@ -1078,10 +1078,10 @@ static CellActorData * ov117_02264884 (UnkStruct_ov117_02261280 * param0, int pa return v0; } -void ov117_022648E0 (UnkStruct_ov117_02261280 * param0) +void ov117_022648E0(UnkStruct_ov117_02261280 *param0) { int v0; - UnkStruct_ov117_02264930 * v1; + UnkStruct_ov117_02264930 *v1; for (v0 = 0; v0 < 5; v0++) { v1 = ¶m0->unk_3D10[v0]; @@ -1090,10 +1090,10 @@ void ov117_022648E0 (UnkStruct_ov117_02261280 * param0) } } -void ov117_02264914 (UnkStruct_ov117_02261280 * param0) +void ov117_02264914(UnkStruct_ov117_02261280 *param0) { int v0; - UnkStruct_ov117_02264930 * v1; + UnkStruct_ov117_02264930 *v1; for (v0 = 0; v0 < 5; v0++) { v1 = ¶m0->unk_3D10[v0]; @@ -1101,9 +1101,9 @@ void ov117_02264914 (UnkStruct_ov117_02261280 * param0) } } -BOOL ov117_02264930 (UnkStruct_ov117_02261280 * param0) +BOOL ov117_02264930(UnkStruct_ov117_02261280 *param0) { - UnkStruct_ov117_02264930 * v0; + UnkStruct_ov117_02264930 *v0; int v1; for (v1 = 0; v1 < 5; v1++) { @@ -1115,7 +1115,7 @@ BOOL ov117_02264930 (UnkStruct_ov117_02261280 * param0) return 1; } -static BOOL ov117_02264958 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02264930 * param1, int param2, int param3) +static BOOL ov117_02264958(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264930 *param1, int param2, int param3) { MI_CpuClear8(param1, sizeof(UnkStruct_ov117_02264930)); @@ -1128,7 +1128,7 @@ static BOOL ov117_02264958 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 return 1; } -static void ov117_0226498C (UnkStruct_ov117_02264930 * param0) +static void ov117_0226498C(UnkStruct_ov117_02264930 *param0) { s16 v0, v1, v2; @@ -1146,10 +1146,10 @@ static void ov117_0226498C (UnkStruct_ov117_02264930 * param0) } } -static void ov117_022649D8 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02264930 * param1) +static void ov117_022649D8(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264930 *param1) { int v0, v1; - UnkStruct_ov117_02264930 * v2; + UnkStruct_ov117_02264930 *v2; if (param1->unk_06 != 0) { return; @@ -1190,7 +1190,7 @@ static void ov117_022649D8 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 } } -static int ov117_02264A70 (int param0) +static int ov117_02264A70(int param0) { if (param0 >= 10) { return 2; @@ -1203,10 +1203,10 @@ static int ov117_02264A70 (int param0) return 0; } -static void ov117_02264A84 (UnkStruct_ov117_02261280 * param0) +static void ov117_02264A84(UnkStruct_ov117_02261280 *param0) { int v0; - UnkStruct_ov117_02264930 * v1; + UnkStruct_ov117_02264930 *v1; for (v0 = 0; v0 < 5; v0++) { v1 = ¶m0->unk_3D10[v0]; @@ -1219,7 +1219,7 @@ static void ov117_02264A84 (UnkStruct_ov117_02261280 * param0) } } -void ov117_02264AB0 (UnkStruct_ov117_02261280 * param0) +void ov117_02264AB0(UnkStruct_ov117_02261280 *param0) { int v0; @@ -1231,13 +1231,13 @@ void ov117_02264AB0 (UnkStruct_ov117_02261280 * param0) } } -void ov117_02264AF0 (UnkStruct_ov117_02261280 * param0) +void ov117_02264AF0(UnkStruct_ov117_02261280 *param0) { u16 v0[4][3]; int v1, v2; int v3 = 0; int v4, v5, v6, v7; - u16 * v8, * v9; + u16 *v8, *v9; for (v2 = 0; v2 < param0->unk_00->unk_30; v2++) { v4 = Unk_ov117_02266B72[v2]; @@ -1269,13 +1269,13 @@ void ov117_02264AF0 (UnkStruct_ov117_02261280 * param0) } } -void ov117_02264BF8 (UnkStruct_ov117_02261280 * param0) +void ov117_02264BF8(UnkStruct_ov117_02261280 *param0) { u16 v0[4][16]; int v1, v2; int v3 = 0; int v4, v5, v6, v7; - u16 * v8, * v9; + u16 *v8, *v9; int v10; v10 = sub_0200D05C(param0->unk_28, 10006, NNS_G2D_VRAM_TYPE_2DSUB); @@ -1310,13 +1310,13 @@ void ov117_02264BF8 (UnkStruct_ov117_02261280 * param0) } } -void ov117_02264D1C (UnkStruct_ov117_02261280 * param0) +void ov117_02264D1C(UnkStruct_ov117_02261280 *param0) { u16 v0[4][1]; int v1, v2; int v3 = 0; int v4, v5, v6, v7; - u16 * v8, * v9; + u16 *v8, *v9; int v10; v10 = sub_0200D05C(param0->unk_28, 10006, NNS_G2D_VRAM_TYPE_2DSUB); @@ -1351,7 +1351,7 @@ void ov117_02264D1C (UnkStruct_ov117_02261280 * param0) } } -void ov117_02264E14 (UnkStruct_ov117_02261280 * param0, int param1, s32 param2, UnkStruct_ov117_02264E84 * param3) +void ov117_02264E14(UnkStruct_ov117_02261280 *param0, int param1, s32 param2, UnkStruct_ov117_02264E84 *param3) { MI_CpuClear8(param3, sizeof(UnkStruct_ov117_02264E84)); @@ -1363,7 +1363,7 @@ void ov117_02264E14 (UnkStruct_ov117_02261280 * param0, int param1, s32 param2, param3->unk_0C = 0; } -BOOL ov117_02264E3C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02264E84 * param1) +BOOL ov117_02264E3C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264E84 *param1) { if (param0->unk_2FB0 - param0->unk_2FAC >= 8) { return 0; @@ -1374,9 +1374,9 @@ BOOL ov117_02264E3C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02264E84 return 1; } -UnkStruct_ov117_02264E84 * ov117_02264E84 (UnkStruct_ov117_02261280 * param0) +UnkStruct_ov117_02264E84 *ov117_02264E84(UnkStruct_ov117_02261280 *param0) { - UnkStruct_ov117_02264E84 * v0; + UnkStruct_ov117_02264E84 *v0; if (param0->unk_2FAC >= param0->unk_2FB0) { return NULL; @@ -1387,9 +1387,9 @@ UnkStruct_ov117_02264E84 * ov117_02264E84 (UnkStruct_ov117_02261280 * param0) return v0; } -BOOL ov117_02264EB8 (UnkStruct_ov117_02261280 * param0, int param1) +BOOL ov117_02264EB8(UnkStruct_ov117_02261280 *param0, int param1) { - UnkStruct_ov117_02264E84 * v0 = NULL; + UnkStruct_ov117_02264E84 *v0 = NULL; int v1, v2, v3; if ((param0->unk_2FAC == param0->unk_2FB0) || (param1 == 0)) { @@ -1449,9 +1449,9 @@ BOOL ov117_02264EB8 (UnkStruct_ov117_02261280 * param0, int param1) return 1; } -void ov117_02264FB0 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0226504C * param1) +void ov117_02264FB0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226504C *param1) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; int v2; @@ -1475,7 +1475,7 @@ void ov117_02264FB0 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0226504C } } -void ov117_0226504C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0226504C * param1) +void ov117_0226504C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226504C *param1) { int v0; @@ -1484,7 +1484,7 @@ void ov117_0226504C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0226504C } } -void ov117_02265064 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1) +void ov117_02265064(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1) { SpriteTemplate v0; int v1, v2; @@ -1524,7 +1524,7 @@ void ov117_02265064 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 SpriteActor_EnableObject(param1->unk_00[0].unk_08, 1); } -void ov117_022651E0 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1) +void ov117_022651E0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1) { int v0; @@ -1536,7 +1536,7 @@ void ov117_022651E0 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 } } -void ov117_02265210 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1) +void ov117_02265210(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1) { int v0; @@ -1551,7 +1551,7 @@ void ov117_02265210 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 param1->unk_F1 = 1; } -void ov117_02265254 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1) +void ov117_02265254(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1) { int v0, v1, v2 = 0; @@ -1612,9 +1612,9 @@ void ov117_02265254 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 } } -static int ov117_022653F4 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265428 ** param1) +static int ov117_022653F4(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265428 **param1) { - UnkStruct_ov117_022653F4 * v0 = ¶m0->unk_1468; + UnkStruct_ov117_022653F4 *v0 = ¶m0->unk_1468; int v1; for (v1 = 0; v1 < 3; v1++) { @@ -1628,7 +1628,7 @@ static int ov117_022653F4 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02 return 0; } -static void ov117_02265428 (UnkStruct_ov117_02265428 * param0, int param1) +static void ov117_02265428(UnkStruct_ov117_02265428 *param0, int param1) { param0->unk_10 = param1; param0->unk_11 = 0; @@ -1637,18 +1637,18 @@ static void ov117_02265428 (UnkStruct_ov117_02265428 * param0, int param1) param0->unk_15 = 0; } -static void ov117_02265438 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1, UnkStruct_ov117_02265428 * param2) +static void ov117_02265438(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1, UnkStruct_ov117_02265428 *param2) { Unk_ov117_02266B94[param2->unk_10](param0, param1, param2); } -static int ov117_0226544C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1, UnkStruct_ov117_02265428 * param2) +static int ov117_0226544C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1, UnkStruct_ov117_02265428 *param2) { param2->unk_15 = 0; return 1; } -static int ov117_02265454 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1, UnkStruct_ov117_02265428 * param2) +static int ov117_02265454(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1, UnkStruct_ov117_02265428 *param2) { s16 v0, v1, v2, v3, v4, v5; fx32 v6; @@ -1678,17 +1678,17 @@ static int ov117_02265454 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02 v1 = -32 + v3; break; case 90 << FX32_SHIFT: - v5 = param2->unk_1C - (256 + 32); + v5 = param2->unk_1C - (256 + 32); v2 = param2->unk_12 * v5 / 15; v0 = (256 + 32) + v2; break; case 180 << FX32_SHIFT: - v4 = param2->unk_1E - (196 + 32); + v4 = param2->unk_1E - (196 + 32); v3 = param2->unk_12 * v4 / 15; v1 = (196 + 32) + v3; break; case 270 << FX32_SHIFT: - v5 = param2->unk_1C - -32; + v5 = param2->unk_1C - -32; v2 = param2->unk_12 * v5 / 15; v0 = -32 + v2; break; @@ -1722,7 +1722,7 @@ static int ov117_02265454 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02 return 1; } -static int ov117_02265644 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1, UnkStruct_ov117_02265428 * param2) +static int ov117_02265644(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1, UnkStruct_ov117_02265428 *param2) { fx32 v0, v1; fx32 v2; @@ -1762,7 +1762,7 @@ static int ov117_02265644 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02 return 1; } -static int ov117_022657C4 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022653F4 * param1, UnkStruct_ov117_02265428 * param2) +static int ov117_022657C4(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1, UnkStruct_ov117_02265428 *param2) { s16 v0, v1; int v2, v3; @@ -1865,7 +1865,7 @@ static int ov117_022657C4 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02 return 1; } -void ov117_02265ABC (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1) +void ov117_02265ABC(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1) { SpriteTemplate v0; int v1; @@ -1887,7 +1887,7 @@ void ov117_02265ABC (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C } } -void ov117_02265B3C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1) +void ov117_02265B3C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1) { int v0; @@ -1897,10 +1897,10 @@ void ov117_02265B3C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C } } -void ov117_02265B58 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1, int param2, int param3, int param4) +void ov117_02265B58(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1, int param2, int param3, int param4) { int v0, v1, v2, v3; - UnkStruct_ov117_02265C1C * v4 = NULL; + UnkStruct_ov117_02265C1C *v4 = NULL; if ((param2 == 0) || (param3 == CommSys_CurNetId())) { return; @@ -1935,10 +1935,10 @@ void ov117_02265B58 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C v4->unk_15 = 1; } -void ov117_02265C1C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1) +void ov117_02265C1C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *param1) { int v0; - UnkStruct_ov117_02265C1C * v1; + UnkStruct_ov117_02265C1C *v1; for (v0 = 0; v0 < 3; v0++) { if (param1->unk_00[v0].unk_15 == 1) { @@ -1948,7 +1948,7 @@ void ov117_02265C1C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C } } -static BOOL ov117_02265C3C (UnkStruct_ov117_02265C3C * param0, UnkStruct_ov117_02265C1C * param1) +static BOOL ov117_02265C3C(UnkStruct_ov117_02265C3C *param0, UnkStruct_ov117_02265C1C *param1) { s16 v0, v1; @@ -2012,13 +2012,13 @@ static BOOL ov117_02265C3C (UnkStruct_ov117_02265C3C * param0, UnkStruct_ov117_0 return 1; } -void ov117_02265DB8 (BGL * param0, SpriteGfxHandler * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) +void ov117_02265DB8(BGL *param0, SpriteGfxHandler *param1, UnkStruct_02012744 *param2, UnkStruct_ov117_02265EB0 *param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14) { UnkStruct_020127E8 v0; Window v1; SpriteManagerAllocation v2; int v3; - FontOAM * v4; + FontOAM *v4; int v5, v6; int v7 = 0; @@ -2073,14 +2073,14 @@ void ov117_02265DB8 (BGL * param0, SpriteGfxHandler * param1, UnkStruct_02012744 param3->unk_10 = v5; } -void ov117_02265EB0 (UnkStruct_ov117_02265EB0 * param0) +void ov117_02265EB0(UnkStruct_ov117_02265EB0 *param0) { sub_02012870(param0->unk_00); sub_0201EE28(¶m0->unk_04); param0->unk_00 = NULL; } -void ov117_02265EC8 (UnkStruct_ov117_02265EC8 * param0) +void ov117_02265EC8(UnkStruct_ov117_02265EC8 *param0) { int v0, v1; int v2 = 16 * 5; @@ -2106,7 +2106,7 @@ void ov117_02265EC8 (UnkStruct_ov117_02265EC8 * param0) } } -void ov117_02265F34 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265EC8 * param1) +void ov117_02265F34(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265EC8 *param1) { int v0; BOOL v1; @@ -2137,7 +2137,7 @@ void ov117_02265F34 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265EC8 } } -void ov117_02265F98 (UnkStruct_ov117_02265EC8 * param0, int param1) +void ov117_02265F98(UnkStruct_ov117_02265EC8 *param0, int param1) { int v0, v1, v2; @@ -2152,7 +2152,7 @@ void ov117_02265F98 (UnkStruct_ov117_02265EC8 * param0, int param1) } } -static void ov117_02265FD4 (UnkStruct_ov117_02265EC8 * param0) +static void ov117_02265FD4(UnkStruct_ov117_02265EC8 *param0) { int v0; @@ -2165,7 +2165,7 @@ static void ov117_02265FD4 (UnkStruct_ov117_02265EC8 * param0) param0->unk_19F = 0; } -static BOOL ov117_02266008 (UnkStruct_ov117_02265EC8 * param0) +static BOOL ov117_02266008(UnkStruct_ov117_02265EC8 *param0) { int v0; @@ -2178,7 +2178,7 @@ static BOOL ov117_02266008 (UnkStruct_ov117_02265EC8 * param0) return 1; } -static BOOL ov117_02266030 (UnkStruct_ov117_02265EC8 * param0) +static BOOL ov117_02266030(UnkStruct_ov117_02265EC8 *param0) { int v0; int v1 = 6 - 1; @@ -2230,21 +2230,21 @@ static BOOL ov117_02266030 (UnkStruct_ov117_02265EC8 * param0) return 0; } -CellActorData * ov117_02266130 (UnkStruct_ov117_02261280 * param0) +CellActorData *ov117_02266130(UnkStruct_ov117_02261280 *param0) { - CellActorData * v0; + CellActorData *v0; v0 = SpriteActor_LoadResources(param0->unk_24, param0->unk_28, &Unk_ov117_02266E6C); SpriteActor_UpdateObject(v0->unk_00); return v0; } -void ov117_02266150 (UnkStruct_ov117_02261280 * param0) +void ov117_02266150(UnkStruct_ov117_02261280 *param0) { - Strbuf * v0; + Strbuf *v0; int v1, v2, v3; u32 v4; - + v4 = param0->unk_3D4C; for (v1 = 6 - 1; v1 >= 0; v1--) { GF_ASSERT(param0->unk_15A8.unk_108[v1].unk_00 == NULL); @@ -2256,7 +2256,7 @@ void ov117_02266150 (UnkStruct_ov117_02261280 * param0) } } -void ov117_02266210 (UnkStruct_ov117_02261280 * param0) +void ov117_02266210(UnkStruct_ov117_02261280 *param0) { int v0; @@ -2267,14 +2267,14 @@ void ov117_02266210 (UnkStruct_ov117_02261280 * param0) } } -void ov117_02266238 (UnkStruct_ov117_02261280 * param0, CellActorData * param1) +void ov117_02266238(UnkStruct_ov117_02261280 *param0, CellActorData *param1) { sub_0200D0F4(param1); } -CellActorData * ov117_02266244 (UnkStruct_ov117_02261280 * param0) +CellActorData *ov117_02266244(UnkStruct_ov117_02261280 *param0) { - CellActorData * v0; + CellActorData *v0; v0 = SpriteActor_LoadResources(param0->unk_24, param0->unk_28, &Unk_ov117_02266EA0); @@ -2284,12 +2284,12 @@ CellActorData * ov117_02266244 (UnkStruct_ov117_02261280 * param0) return v0; } -void ov117_02266268 (UnkStruct_ov117_02261280 * param0, CellActorData * param1) +void ov117_02266268(UnkStruct_ov117_02261280 *param0, CellActorData *param1) { sub_0200D0F4(param1); } -BOOL ov117_02266274 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02266274 * param1) +BOOL ov117_02266274(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266274 *param1) { switch (param1->unk_04) { case 0: @@ -2347,9 +2347,9 @@ BOOL ov117_02266274 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02266274 return 0; } -static void ov117_02266344 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02266344 * param1) +static void ov117_02266344(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266344 *param1) { - CellActorData * v0; + CellActorData *v0; int v1; for (v1 = 0; v1 < 2; v1++) { @@ -2364,7 +2364,7 @@ static void ov117_02266344 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 } } -static void ov117_02266384 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02266344 * param1) +static void ov117_02266384(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266344 *param1) { int v0; @@ -2373,7 +2373,7 @@ static void ov117_02266384 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 } } -static void ov117_0226639C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265428 * param1, UnkStruct_ov117_02266344 * param2) +static void ov117_0226639C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265428 *param1, UnkStruct_ov117_02266344 *param2) { s16 v0, v1; int v2; @@ -2398,7 +2398,7 @@ static void ov117_0226639C (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_0 param2->unk_18 = 1; } -static void ov117_02266440 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265428 * param1, UnkStruct_ov117_02266344 * param2) +static void ov117_02266440(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265428 *param1, UnkStruct_ov117_02266344 *param2) { int v0; diff --git a/src/overlay117/ov117_02266498.c b/src/overlay117/ov117_02266498.c index b7dc9d1816..2eae409e1e 100644 --- a/src/overlay117/ov117_02266498.c +++ b/src/overlay117/ov117_02266498.c @@ -1,26 +1,26 @@ +#include "overlay117/ov117_02266498.h" + +#include #include #include -#include +#include "overlay114/ov114_0225C700.h" #include "overlay114/struct_ov114_0225D678_decl.h" #include "overlay114/struct_ov114_0225E854_decl.h" - #include "overlay117/struct_ov117_022605C0.h" #include "overlay_manager.h" #include "unk_0200F174.h" -#include "overlay114/ov114_0225C700.h" -#include "overlay117/ov117_02266498.h" typedef struct { - UnkStruct_ov117_022605C0 * unk_00; - UnkStruct_ov114_0225D678 * unk_04; - UnkStruct_ov114_0225E854 * unk_08; + UnkStruct_ov117_022605C0 *unk_00; + UnkStruct_ov114_0225D678 *unk_04; + UnkStruct_ov114_0225E854 *unk_08; } UnkStruct_ov117_02266498; -int ov117_02266498 (OverlayManager * param0, int * param1) +int ov117_02266498(OverlayManager *param0, int *param1) { - UnkStruct_ov117_02266498 * v0; + UnkStruct_ov117_02266498 *v0; v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_ov117_02266498), 110); MI_CpuClear8(v0, sizeof(UnkStruct_ov117_02266498)); @@ -29,9 +29,9 @@ int ov117_02266498 (OverlayManager * param0, int * param1) return 1; } -int ov117_022664BC (OverlayManager * param0, int * param1) +int ov117_022664BC(OverlayManager *param0, int *param1) { - UnkStruct_ov117_02266498 * v0 = OverlayManager_Data(param0); + UnkStruct_ov117_02266498 *v0 = OverlayManager_Data(param0); if (v0->unk_00->unk_3D == 1) { switch (v0->unk_00->unk_3E) { @@ -107,9 +107,9 @@ int ov117_022664BC (OverlayManager * param0, int * param1) return 0; } -int ov117_022665E8 (OverlayManager * param0, int * param1) +int ov117_022665E8(OverlayManager *param0, int *param1) { - UnkStruct_ov117_02266498 * v0 = OverlayManager_Data(param0); + UnkStruct_ov117_02266498 *v0 = OverlayManager_Data(param0); OverlayManager_FreeData(param0); return 1; diff --git a/src/overlay117/ov117_022665FC.c b/src/overlay117/ov117_022665FC.c index 68e197b240..ded53aa924 100644 --- a/src/overlay117/ov117_022665FC.c +++ b/src/overlay117/ov117_022665FC.c @@ -1,29 +1,31 @@ +#include "overlay117/ov117_022665FC.h" + #include #include #include "struct_defs/struct_02039A58.h" + +#include "overlay117/ov117_02260668.h" #include "overlay117/struct_ov117_02261280.h" #include "overlay117/struct_ov117_022621D4.h" -#include "unk_02032798.h" #include "communication_system.h" -#include "overlay117/ov117_02260668.h" -#include "overlay117/ov117_022665FC.h" +#include "unk_02032798.h" -static void ov117_02266618(int param0, int param1, void * param2, void * param3); -static void ov117_0226663C(int param0, int param1, void * param2, void * param3); -static void ov117_02266660(int param0, int param1, void * param2, void * param3); +static void ov117_02266618(int param0, int param1, void *param2, void *param3); +static void ov117_0226663C(int param0, int param1, void *param2, void *param3); +static void ov117_02266660(int param0, int param1, void *param2, void *param3); static int ov117_02266610(void); static int ov117_02266614(void); static const CommCmdTable Unk_ov117_02266FE4[] = { - {NULL, sub_0203294C, NULL}, - {ov117_02266660, ov117_02266614, NULL}, - {ov117_02266618, ov117_02266610, NULL}, - {ov117_0226663C, sub_0203294C, NULL} + { NULL, sub_0203294C, NULL }, + { ov117_02266660, ov117_02266614, NULL }, + { ov117_02266618, ov117_02266610, NULL }, + { ov117_0226663C, sub_0203294C, NULL } }; -void ov117_022665FC (void * param0) +void ov117_022665FC(void *param0) { int v0 = sizeof(Unk_ov117_02266FE4) / sizeof(CommCmdTable); @@ -31,23 +33,23 @@ void ov117_022665FC (void * param0) GF_ASSERT(sizeof(UnkStruct_ov117_022621D4) < 256); } -static int ov117_02266610 (void) +static int ov117_02266610(void) { return sizeof(UnkStruct_ov117_022621D4); } -static int ov117_02266614 (void) +static int ov117_02266614(void) { return sizeof(u32); } -static void ov117_02266618 (int param0, int param1, void * param2, void * param3) +static void ov117_02266618(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov117_02261280 * v0 = param3; + UnkStruct_ov117_02261280 *v0 = param3; ov117_02262044(v0, param0, param2); } -BOOL ov117_02266624 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022621D4 * param1) +BOOL ov117_02266624(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022621D4 *param1) { if (CommSys_SendData(24, param1, sizeof(UnkStruct_ov117_022621D4)) == 1) { return 1; @@ -56,13 +58,13 @@ BOOL ov117_02266624 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022621D4 return 0; } -static void ov117_0226663C (int param0, int param1, void * param2, void * param3) +static void ov117_0226663C(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov117_02261280 * v0 = param3; + UnkStruct_ov117_02261280 *v0 = param3; v0->unk_2FC0 = 1; } -BOOL ov117_02266648 (UnkStruct_ov117_02261280 * param0) +BOOL ov117_02266648(UnkStruct_ov117_02261280 *param0) { if (CommSys_SendData(25, NULL, 0) == 1) { return 1; @@ -71,10 +73,10 @@ BOOL ov117_02266648 (UnkStruct_ov117_02261280 * param0) return 0; } -static void ov117_02266660 (int param0, int param1, void * param2, void * param3) +static void ov117_02266660(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov117_02261280 * v0 = param3; - u32 * v1 = param2; + UnkStruct_ov117_02261280 *v0 = param3; + u32 *v1 = param2; u32 v2; int v3; @@ -91,7 +93,7 @@ static void ov117_02266660 (int param0, int param1, void * param2, void * param3 v0->unk_08++; } -BOOL ov117_022666A4 (UnkStruct_ov117_02261280 * param0) +BOOL ov117_022666A4(UnkStruct_ov117_02261280 *param0) { u32 v0 = 100; diff --git a/src/overlay117/ov117_022666C0.c b/src/overlay117/ov117_022666C0.c index b4b58ccbd5..bb01a495ac 100644 --- a/src/overlay117/ov117_022666C0.c +++ b/src/overlay117/ov117_022666C0.c @@ -1,24 +1,25 @@ +#include "overlay117/ov117_022666C0.h" + #include #include +#include "overlay117/ov117_02260668.h" +#include "overlay117/ov117_02263AF0.h" #include "overlay117/struct_ov117_02261280.h" #include "overlay117/struct_ov117_022621D4.h" #include "overlay117/struct_ov117_02264E84.h" #include "communication_system.h" -#include "overlay117/ov117_02260668.h" -#include "overlay117/ov117_02263AF0.h" -#include "overlay117/ov117_022666C0.h" -static void ov117_022668A8(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1); -static void ov117_02266714(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1); -static void ov117_02266760(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1); -static void ov117_022667B8(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1); -static void ov117_02266820(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1); -static void ov117_02266860(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1); -static void ov117_022668E4(UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1); +static void ov117_022668A8(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1); +static void ov117_02266714(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1); +static void ov117_02266760(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1); +static void ov117_022667B8(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1); +static void ov117_02266820(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1); +static void ov117_02266860(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1); +static void ov117_022668E4(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1); -static void(*const Unk_ov117_02267014[])(UnkStruct_ov117_02261280 *, const UnkStruct_ov117_022621D4 *) = { +static void (*const Unk_ov117_02267014[])(UnkStruct_ov117_02261280 *, const UnkStruct_ov117_022621D4 *) = { NULL, ov117_02266714, ov117_02266760, @@ -33,7 +34,7 @@ static void(*const Unk_ov117_02267014[])(UnkStruct_ov117_02261280 *, const UnkSt SDK_COMPILER_ASSERT(NELEMS(Unk_ov117_02267014) == 8); #endif -BOOL ov117_022666C0 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022621D4 * param1) +BOOL ov117_022666C0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022621D4 *param1) { if (Unk_ov117_02267014[param1->unk_00] != NULL) { Unk_ov117_02267014[param1->unk_00](param0, param1); @@ -44,7 +45,7 @@ BOOL ov117_022666C0 (UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_022621D4 return 0; } -void ov117_022666E8 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02264E84 * param1) +void ov117_022666E8(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02264E84 *param1) { UnkStruct_ov117_022621D4 v0; @@ -56,7 +57,7 @@ void ov117_022666E8 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_02 ov117_02262130(param0, &v0); } -static void ov117_02266714 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1) +static void ov117_02266714(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1) { if (param1->unk_04_val4.unk_00 == CommSys_CurNetId()) { return; @@ -65,7 +66,7 @@ static void ov117_02266714 (UnkStruct_ov117_02261280 * param0, const UnkStruct_o ov117_02263DC4(param0, ¶m1->unk_04_val4); } -void ov117_02266730 (UnkStruct_ov117_02261280 * param0, int param1, u8 param2) +void ov117_02266730(UnkStruct_ov117_02261280 *param0, int param1, u8 param2) { UnkStruct_ov117_022621D4 v0; @@ -79,7 +80,7 @@ void ov117_02266730 (UnkStruct_ov117_02261280 * param0, int param1, u8 param2) ov117_02262130(param0, &v0); } -static void ov117_02266760 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1) +static void ov117_02266760(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1) { param0->unk_2FD0++; @@ -87,7 +88,7 @@ static void ov117_02266760 (UnkStruct_ov117_02261280 * param0, const UnkStruct_o ov117_0226238C(param0, param1->unk_04_val5.unk_02, param1->unk_04_val5.unk_03); } -void ov117_02266784 (UnkStruct_ov117_02261280 * param0, int param1, int param2, u8 param3) +void ov117_02266784(UnkStruct_ov117_02261280 *param0, int param1, int param2, u8 param3) { UnkStruct_ov117_022621D4 v0; @@ -102,7 +103,7 @@ void ov117_02266784 (UnkStruct_ov117_02261280 * param0, int param1, int param2, ov117_02262130(param0, &v0); } -static void ov117_022667B8 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1) +static void ov117_022667B8(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1) { param0->unk_2FC8 = param1->unk_04_val6.unk_00; ov117_02263AF0(param0->unk_2C, param0->unk_00->unk_30, param1->unk_04_val6.unk_02, ¶m0->unk_1428); @@ -111,7 +112,7 @@ static void ov117_022667B8 (UnkStruct_ov117_02261280 * param0, const UnkStruct_o ov117_0226238C(param0, param1->unk_04_val6.unk_03, param1->unk_04_val6.unk_04); } -void ov117_022667F4 (UnkStruct_ov117_02261280 * param0, u8 param1) +void ov117_022667F4(UnkStruct_ov117_02261280 *param0, u8 param1) { UnkStruct_ov117_022621D4 v0; @@ -124,13 +125,13 @@ void ov117_022667F4 (UnkStruct_ov117_02261280 * param0, u8 param1) ov117_02262130(param0, &v0); } -static void ov117_02266820 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1) +static void ov117_02266820(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1) { param0->unk_20 = 3; ov117_0226238C(param0, param1->unk_04_val2.unk_00, param1->unk_04_val2.unk_01); } -void ov117_02266834 (UnkStruct_ov117_02261280 * param0, u8 param1) +void ov117_02266834(UnkStruct_ov117_02261280 *param0, u8 param1) { UnkStruct_ov117_022621D4 v0; @@ -143,14 +144,14 @@ void ov117_02266834 (UnkStruct_ov117_02261280 * param0, u8 param1) ov117_02262130(param0, &v0); } -static void ov117_02266860 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1) +static void ov117_02266860(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1) { param0->unk_2FBC = 1; param0->unk_20 = 6; ov117_0226238C(param0, param1->unk_04_val3.unk_00, param1->unk_04_val3.unk_01); } -void ov117_0226687C (UnkStruct_ov117_02261280 * param0, int param1, u8 param2) +void ov117_0226687C(UnkStruct_ov117_02261280 *param0, int param1, u8 param2) { UnkStruct_ov117_022621D4 v0; @@ -163,12 +164,12 @@ void ov117_0226687C (UnkStruct_ov117_02261280 * param0, int param1, u8 param2) ov117_02262130(param0, &v0); } -static void ov117_022668A8 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1) +static void ov117_022668A8(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1) { ov117_0226238C(param0, param1->unk_04_val1.unk_00, param1->unk_04_val1.unk_01); } -void ov117_022668B8 (UnkStruct_ov117_02261280 * param0, u8 param1) +void ov117_022668B8(UnkStruct_ov117_02261280 *param0, u8 param1) { UnkStruct_ov117_022621D4 v0; @@ -181,7 +182,7 @@ void ov117_022668B8 (UnkStruct_ov117_02261280 * param0, u8 param1) ov117_02262130(param0, &v0); } -static void ov117_022668E4 (UnkStruct_ov117_02261280 * param0, const UnkStruct_ov117_022621D4 * param1) +static void ov117_022668E4(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_022621D4 *param1) { param0->unk_20 = 1; ov117_0226238C(param0, param1->unk_04_val2.unk_00, param1->unk_04_val2.unk_01); diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index 5e588dc53d..43e0f71d55 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -1,34 +1,30 @@ +#include "overlay118/ov118_021D0D80.h" + #include #include -#include "enums.h" - #include "struct_decls/struct_02014014_decl.h" -#include "strbuf.h" -#include "pokemon.h" - #include "struct_defs/struct_0207F248.h" -#include "spl.h" - -#include "unk_02005474.h" +#include "camera.h" +#include "enums.h" +#include "field_system.h" +#include "gx_layers.h" +#include "heap.h" #include "message.h" +#include "party.h" +#include "pokemon.h" +#include "spl.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02005474.h" #include "unk_02014000.h" -#include "heap.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "camera.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_0202631C.h" -#include "field_system.h" -#include "pokemon.h" -#include "party.h" #include "unk_0207E0B8.h" #include "unk_020819DC.h" #include "unk_02082C2C.h" -#include "overlay118/ov118_021D0D80.h" typedef struct OverlayMetadata_t { int unk_00; @@ -37,30 +33,30 @@ typedef struct OverlayMetadata_t { int unk_0C; u32 unk_10; int unk_14; - UnkStruct_02014014 * unk_18; + UnkStruct_02014014 *unk_18; } OverlayMetadata; -static void ov118_021D0F70(GameWindowLayout * param0); -static void ov118_021D0F88(GameWindowLayout * param0); -static void ov118_021D0FB8(GameWindowLayout * param0); -static void ov118_021D0FDC(OverlayMetadata * param0); -static void ov118_021D1028(OverlayMetadata * param0); +static void ov118_021D0F70(GameWindowLayout *param0); +static void ov118_021D0F88(GameWindowLayout *param0); +static void ov118_021D0FB8(GameWindowLayout *param0); +static void ov118_021D0FDC(OverlayMetadata *param0); +static void ov118_021D1028(OverlayMetadata *param0); static int ov118_021D10E8(void); -static void ov118_021D110C(OverlayMetadata * param0); +static void ov118_021D110C(OverlayMetadata *param0); static u32 ov118_021D1128(u32 param0, BOOL param1); static u32 ov118_021D114C(u32 param0, BOOL param1); -static void ov118_021D10B0(UnkSPLStruct6 * param0); +static void ov118_021D10B0(UnkSPLStruct6 *param0); static const fx32 Unk_ov118_021D1170[][2] = { - {0xFFFFFFFFFFFFBF8C, 0x2EE0}, - {0x1388, 0x2CEC}, - {0xFFFFFFFFFFFFBF8C, 0x1388}, - {0x1388, 0xDAC}, - {0xFFFFFFFFFFFFBF8C, 0xFFFFFFFFFFFFF448}, - {0x1388, 0xFFFFFFFFFFFFEE6C} + { 0xFFFFFFFFFFFFBF8C, 0x2EE0 }, + { 0x1388, 0x2CEC }, + { 0xFFFFFFFFFFFFBF8C, 0x1388 }, + { 0x1388, 0xDAC }, + { 0xFFFFFFFFFFFFBF8C, 0xFFFFFFFFFFFFF448 }, + { 0x1388, 0xFFFFFFFFFFFFEE6C } }; -void ov118_021D0D80 (GameWindowLayout * param0) +void ov118_021D0D80(GameWindowLayout *param0) { GF_ASSERT(param0->unk_B24 == NULL); @@ -69,14 +65,13 @@ void ov118_021D0D80 (GameWindowLayout * param0) param0->unk_B24->unk_14 = param0->unk_B11; } -int ov118_021D0DBC (GameWindowLayout * param0) +int ov118_021D0DBC(GameWindowLayout *param0) { - OverlayMetadata * v0 = param0->unk_B24; - Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + OverlayMetadata *v0 = param0->unk_B24; + Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); switch (v0->unk_00) { - case 0: - { + case 0: { v0->unk_0C = Pokemon_GetValue(v1, MON_DATA_SPECIES, NULL); switch (v0->unk_0C) { @@ -139,9 +134,8 @@ int ov118_021D0DBC (GameWindowLayout * param0) v0->unk_00++; } break; - case 9: - { - Strbuf* v2; + case 9: { + Strbuf *v2; v2 = MessageLoader_GetNewStrbuf(param0->unk_69C, 202); @@ -165,13 +159,13 @@ int ov118_021D0DBC (GameWindowLayout * param0) return 0; } -static void ov118_021D0F70 (GameWindowLayout * param0) +static void ov118_021D0F70(GameWindowLayout *param0) { Heap_FreeToHeap(param0->unk_B24); param0->unk_B24 = NULL; } -static void ov118_021D0F88 (GameWindowLayout * param0) +static void ov118_021D0F88(GameWindowLayout *param0) { sub_0207EA74(param0, 0); ov118_021D0FDC(param0->unk_B24); @@ -179,7 +173,7 @@ static void ov118_021D0F88 (GameWindowLayout * param0) G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_ALL, 31, 0); } -static void ov118_021D0FB8 (GameWindowLayout * param0) +static void ov118_021D0FB8(GameWindowLayout *param0) { ov118_021D110C(param0->unk_B24); sub_0207EA74(param0, 1); @@ -187,10 +181,10 @@ static void ov118_021D0FB8 (GameWindowLayout * param0) G2_BlendNone(); } -static void ov118_021D0FDC (OverlayMetadata * param0) +static void ov118_021D0FDC(OverlayMetadata *param0) { - void * v0; - Camera * camera; + void *v0; + Camera *camera; sub_02014000(); @@ -201,9 +195,9 @@ static void ov118_021D0FDC (OverlayMetadata * param0) Camera_SetClipping((FX32_ONE), (FX32_ONE * 900), camera); } -static void ov118_021D1028 (OverlayMetadata * param0) +static void ov118_021D1028(OverlayMetadata *param0) { - void * v0; + void *v0; v0 = sub_020144C4(185, param0->unk_10, 12); sub_020144CC(param0->unk_18, v0, (1 << 1) | (1 << 3), 1); @@ -223,9 +217,9 @@ static void ov118_021D1028 (OverlayMetadata * param0) } } -static void ov118_021D10B0 (UnkSPLStruct6 * param0) +static void ov118_021D10B0(UnkSPLStruct6 *param0) { - OverlayMetadata * v0; + OverlayMetadata *v0; v0 = sub_02014764(); @@ -233,7 +227,7 @@ static void ov118_021D10B0 (UnkSPLStruct6 * param0) SPL_UnkInline3(param0, Unk_ov118_021D1170[v0->unk_14][1]); } -static int ov118_021D10E8 (void) +static int ov118_021D10E8(void) { int v0; @@ -251,16 +245,16 @@ static int ov118_021D10E8 (void) return v0; } -static void ov118_021D110C (OverlayMetadata * param0) +static void ov118_021D110C(OverlayMetadata *param0) { - void * v0; + void *v0; v0 = sub_02014730(param0->unk_18); sub_0201411C(param0->unk_18); Heap_FreeToHeap(v0); } -static u32 ov118_021D1128 (u32 param0, BOOL param1) +static u32 ov118_021D1128(u32 param0, BOOL param1) { NNSGfdTexKey v0; @@ -271,7 +265,7 @@ static u32 ov118_021D1128 (u32 param0, BOOL param1) return NNS_GfdGetTexKeyAddr(v0); } -static u32 ov118_021D114C (u32 param0, BOOL param1) +static u32 ov118_021D114C(u32 param0, BOOL param1) { NNSGfdPlttKey v0; diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index 60e0716f30..63f5faa25b 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -1,24 +1,23 @@ +#include "overlay119/ov119_021D0D80.h" + #include #include #include "struct_decls/struct_02002F38_decl.h" -#include "message.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" #include "struct_decls/struct_02014014_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "pokemon.h" - -#include "struct_defs/sprite_animation_frame.h" #include "struct_defs/archived_sprite.h" +#include "struct_defs/sprite_animation_frame.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_02099F80.h" + #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" @@ -28,43 +27,41 @@ #include "overlay119/struct_ov119_021D17B8.h" #include "overlay119/struct_ov119_021D1930.h" +#include "camera.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "pokemon.h" #include "spl.h" - +#include "strbuf.h" +#include "string_template.h" #include "unk_02001AF4.h" #include "unk_02002F38.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02014000.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" -#include "camera.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_02024220.h" -#include "pokemon.h" -#include "overlay119/ov119_021D0D80.h" void ov119_021D0D80(void); void ov119_021D0DA8(void); -GenericPointerData * ov119_021D0DD4(void); +GenericPointerData *ov119_021D0DD4(void); void ov119_021D0DF4(void); void ov119_021D0E78(void); static u32 ov119_021D13B4(u32 param0, BOOL param1); static u32 ov119_021D13D0(u32 param0, BOOL param1); -static UnkStruct_02014014 * ov119_021D13EC(int param0); -static UnkStruct_02014014 * ov119_021D1434(int param0, int param1, int param2); -static void ov119_021D1474(UnkSPLStruct6 * param0); +static UnkStruct_02014014 *ov119_021D13EC(int param0); +static UnkStruct_02014014 *ov119_021D1434(int param0, int param1, int param2); +static void ov119_021D1474(UnkSPLStruct6 *param0); -void ov119_021D0D80 (void) +void ov119_021D0D80(void) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -73,21 +70,21 @@ void ov119_021D0D80 (void) GXS_SetVisiblePlane(0); } -void ov119_021D0DA8 (void) +void ov119_021D0DA8(void) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 11, 7); G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8); } -GenericPointerData * ov119_021D0DD4 (void) +GenericPointerData *ov119_021D0DD4(void) { - GenericPointerData * v0; + GenericPointerData *v0; v0 = sub_02024220(71, 0, 2, 0, 2, ov119_021D0DF4); return v0; } -void ov119_021D0DF4 (void) +void ov119_021D0DF4(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -102,7 +99,7 @@ void ov119_021D0DF4 (void) G3_ViewPort(0, 0, 255, 191); } -void ov119_021D0E78 (void) +void ov119_021D0E78(void) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -120,7 +117,7 @@ void ov119_021D0E78 (void) sub_02014000(); } -void ov119_021D0EB8 (BGL * param0) +void ov119_021D0EB8(BGL *param0) { GXLayers_DisableEngineALayers(); @@ -172,7 +169,7 @@ void ov119_021D0EB8 (BGL * param0) 0, 0, 0, - 0 + 0, }, { 0, @@ -187,7 +184,7 @@ void ov119_021D0EB8 (BGL * param0) 1, 0, 0, - 0 + 0, }, { 0, @@ -202,7 +199,7 @@ void ov119_021D0EB8 (BGL * param0) 2, 0, 0, - 0 + 0, }, }; @@ -235,7 +232,7 @@ void ov119_021D0EB8 (BGL * param0) 0, 0, 0, - 0 + 0, }, }; @@ -244,9 +241,9 @@ void ov119_021D0EB8 (BGL * param0) } } -void ov119_021D0FD0 (void * param0) +void ov119_021D0FD0(void *param0) { - UnkStruct_ov119_021D0FD0 * v0 = (UnkStruct_ov119_021D0FD0 *)param0; + UnkStruct_ov119_021D0FD0 *v0 = (UnkStruct_ov119_021D0FD0 *)param0; sub_02008A94(v0->unk_04.unk_38); sub_0201DCAC(); @@ -257,10 +254,10 @@ void ov119_021D0FD0 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -void ov119_021D1004 (void) +void ov119_021D1004(void) { int v0; - const MtxFx43 * v1; + const MtxFx43 *v1; sub_020241B4(); @@ -275,17 +272,17 @@ void ov119_021D1004 (void) G3_RequestSwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } -void ov119_021D1028 (void) +void ov119_021D1028(void) { sub_0200F174(0, 1, 1, 0x0, 6, 1, 71); } -void ov119_021D1048 (void) +void ov119_021D1048(void) { sub_0200F174(0, 0, 0, 0x0, 6, 1, 71); } -void ov119_021D1068 (BGL * param0, PaletteData * param1, int param2) +void ov119_021D1068(BGL *param0, PaletteData *param1, int param2) { int v0 = 71; @@ -296,7 +293,7 @@ void ov119_021D1068 (BGL * param0, PaletteData * param1, int param2) PaletteSys_LoadPalette(param1, 14, 7, v0, 0, 0x20, 14 * 16); } -void ov119_021D10F0 (BGL * param0, Window * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) +void ov119_021D10F0(BGL *param0, Window *param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { Window_Init(param1); BGL_AddWindow(param0, param1, param2, param3, param4, param5, param6, param8, param7); @@ -305,14 +302,14 @@ void ov119_021D10F0 (BGL * param0, Window * param1, int param2, int param3, int sub_0201A954(param1); } -int ov119_021D1158 (Window * param0, int param1, Pokemon * param2, int param3) +int ov119_021D1158(Window *param0, int param1, Pokemon *param2, int param3) { int v0; - Strbuf* v1; - Strbuf* v2; - StringTemplate * v3; - BoxPokemon * v4; - MessageLoader * v5; + Strbuf *v1; + Strbuf *v2; + StringTemplate *v3; + BoxPokemon *v4; + MessageLoader *v5; BGL_FillWindow(param0, 15); @@ -335,7 +332,7 @@ int ov119_021D1158 (Window * param0, int param1, Pokemon * param2, int param3) return v0; } -void ov119_021D11E4 (UnkStruct_ov119_021D0FD0 * param0, BGL * param1, Window * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) +void ov119_021D11E4(UnkStruct_ov119_021D0FD0 *param0, BGL *param1, Window *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) { UnkStruct_02081CF4 v0; @@ -346,8 +343,8 @@ void ov119_021D11E4 (UnkStruct_ov119_021D0FD0 * param0, BGL * param1, Window * p { int v1; - Strbuf* v2; - MessageLoader * v3 = MessageLoader_Init(0, 26, 357, 71); + Strbuf *v2; + MessageLoader *v3 = MessageLoader_Init(0, 26, 357, 71); for (v1 = 0; v1 < 2; v1++) { v2 = MessageLoader_GetNewStrbuf(v3, 2 + v1); @@ -371,7 +368,7 @@ void ov119_021D11E4 (UnkStruct_ov119_021D0FD0 * param0, BGL * param1, Window * p param0->unk_04.unk_48 = sub_02001B7C(&v0, 8, 0, 0, 71, PAD_BUTTON_B); } -void ov119_021D12CC (UnkStruct_ov119_021D0FD0 * param0) +void ov119_021D12CC(UnkStruct_ov119_021D0FD0 *param0) { Window_Clear(¶m0->unk_04.unk_14[1], 1); sub_0201ACF4(¶m0->unk_04.unk_14[1]); @@ -380,13 +377,13 @@ void ov119_021D12CC (UnkStruct_ov119_021D0FD0 * param0) sub_02013A3C(param0->unk_04.unk_44); } -void ov119_021D12F8 (Window * param0) +void ov119_021D12F8(Window *param0) { sub_0201ACF4(param0); BGL_DeleteWindow(param0); } -void ov119_021D1308 (BGL * param0, PaletteData * param1) +void ov119_021D1308(BGL *param0, PaletteData *param1) { int v0 = 118; int v1 = 0; @@ -400,7 +397,7 @@ void ov119_021D1308 (BGL * param0, PaletteData * param1) PaletteSys_LoadPalette(param1, v0, v3, v5, 0, 0x20 * 2, 0); } -void ov119_021D135C (BGL * param0, PaletteData * param1) +void ov119_021D135C(BGL *param0, PaletteData *param1) { int v0 = 12; int v1 = 10; @@ -414,7 +411,7 @@ void ov119_021D135C (BGL * param0, PaletteData * param1) PaletteSys_LoadPalette(param1, v0, v3, v5, 1, 0x20 * 1, 0); } -static u32 ov119_021D13B4 (u32 param0, BOOL param1) +static u32 ov119_021D13B4(u32 param0, BOOL param1) { NNSGfdTexKey v0; u32 v1; @@ -426,7 +423,7 @@ static u32 ov119_021D13B4 (u32 param0, BOOL param1) return v1; } -static u32 ov119_021D13D0 (u32 param0, BOOL param1) +static u32 ov119_021D13D0(u32 param0, BOOL param1) { NNSGfdPlttKey v0; u32 v1; @@ -438,11 +435,11 @@ static u32 ov119_021D13D0 (u32 param0, BOOL param1) return v1; } -static UnkStruct_02014014 * ov119_021D13EC (int param0) +static UnkStruct_02014014 *ov119_021D13EC(int param0) { - UnkStruct_02014014 * v0; - void * v1; - Camera * camera; + UnkStruct_02014014 *v0; + void *v1; + Camera *camera; v1 = Heap_AllocFromHeap(param0, 0x4800); v0 = sub_02014014(ov119_021D13B4, ov119_021D13D0, v1, 0x4800, 1, param0); @@ -455,10 +452,10 @@ static UnkStruct_02014014 * ov119_021D13EC (int param0) return v0; } -static UnkStruct_02014014 * ov119_021D1434 (int param0, int param1, int param2) +static UnkStruct_02014014 *ov119_021D1434(int param0, int param1, int param2) { - UnkStruct_02014014 * v0; - void * v1; + UnkStruct_02014014 *v0; + void *v1; v0 = ov119_021D13EC(param0); v1 = sub_020144C4(param1, param2, param0); @@ -468,29 +465,29 @@ static UnkStruct_02014014 * ov119_021D1434 (int param0, int param1, int param2) return v0; } -void ov119_021D145C (UnkStruct_02014014 * param0) +void ov119_021D145C(UnkStruct_02014014 *param0) { - void * v0; + void *v0; v0 = sub_02014730(param0); sub_0201411C(param0); Heap_FreeToHeap(v0); } -static void ov119_021D1474 (UnkSPLStruct6 * param0) +static void ov119_021D1474(UnkSPLStruct6 *param0) { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; SPL_UnkInline1(param0, &v0); } -UnkStruct_ov119_021D14DC * ov119_021D14AC (UnkStruct_ov119_021D1930 * param0) +UnkStruct_ov119_021D14DC *ov119_021D14AC(UnkStruct_ov119_021D1930 *param0) { int v0; int v1; int v2; int v3; - UnkStruct_ov119_021D14DC * v4; + UnkStruct_ov119_021D14DC *v4; v4 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov119_021D14DC)); @@ -504,21 +501,21 @@ UnkStruct_ov119_021D14DC * ov119_021D14AC (UnkStruct_ov119_021D1930 * param0) return v4; } -void ov119_021D14DC (UnkStruct_ov119_021D14DC * param0, int param1) +void ov119_021D14DC(UnkStruct_ov119_021D14DC *param0, int param1) { int v0; int v1; int v2; int v3; - UnkStruct_ov119_021D14DC * v4 = param0; + UnkStruct_ov119_021D14DC *v4 = param0; sub_020146F4(v4->unk_0C, param1, ov119_021D1474, v4); sub_02014788(v4->unk_0C, 1); } -BOOL ov119_021D14F8 (UnkStruct_ov119_021D14DC * param0) +BOOL ov119_021D14F8(UnkStruct_ov119_021D14DC *param0) { - UnkStruct_ov119_021D14DC * v0 = param0; + UnkStruct_ov119_021D14DC *v0 = param0; if (sub_02014710(v0->unk_0C) == 0) { return 0; @@ -527,19 +524,19 @@ BOOL ov119_021D14F8 (UnkStruct_ov119_021D14DC * param0) return 1; } -void ov119_021D150C (UnkStruct_ov119_021D14DC * param0) +void ov119_021D150C(UnkStruct_ov119_021D14DC *param0) { Heap_FreeToHeap(param0); } -void ov119_021D1514 (UnkStruct_ov119_021D0FD0 * param0) +void ov119_021D1514(UnkStruct_ov119_021D0FD0 *param0) { - SpriteRenderer * v0; - SpriteGfxHandler * v1; - PaletteData * v2; + SpriteRenderer *v0; + SpriteGfxHandler *v1; + PaletteData *v2; int v3[][4] = { - {4, 9, 3, 2}, - {4, 9, 3, 2} + { 4, 9, 3, 2 }, + { 4, 9, 3, 2 } }; int v4 = 118; int v5 = NNS_G2D_VRAM_TYPE_2DMAIN; @@ -560,7 +557,7 @@ void ov119_021D1514 (UnkStruct_ov119_021D0FD0 * param0) sub_0200CE3C(v0, v1, v4, 5, 1, 25003); } -void ov119_021D161C (UnkStruct_ov119_021D0FD0 * param0) +void ov119_021D161C(UnkStruct_ov119_021D0FD0 *param0) { SpriteTemplate v0; @@ -604,33 +601,33 @@ void ov119_021D161C (UnkStruct_ov119_021D0FD0 * param0) } static const s16 Unk_ov119_021D2478[][10] = { - {-1, 0x1, 0x1, -1, -1, 0x1, 0x1, -1, 0xFF, 0xFF}, - {-2, 0x2, 0x2, -2, -2, 0x2, 0x2, -2, 0xFF, 0xFF}, - {-3, 0x3, 0x3, -3, -3, 0x3, 0xFF, 0xFF}, - {-3, 0x3, 0x3, -3, -3, 0x3, 0xFF, 0xFF} + { -1, 0x1, 0x1, -1, -1, 0x1, 0x1, -1, 0xFF, 0xFF }, + { -2, 0x2, 0x2, -2, -2, 0x2, 0x2, -2, 0xFF, 0xFF }, + { -3, 0x3, 0x3, -3, -3, 0x3, 0xFF, 0xFF }, + { -3, 0x3, 0x3, -3, -3, 0x3, 0xFF, 0xFF } }; static const s16 Unk_ov119_021D24C8[][10] = { - {0x0, 0xFF}, - {0x0, 0x0, 0x1, 0x1, 0x0, -1, -1, 0x0, 0x0, 0xFF}, - {0x0, 0x0, 0x1, 0x1, 0x1, -1, -1, -1, 0x0, 0x0}, - {0x0, 0x0, 0x1, 0x1, 0x1, -1, -1, -1, 0x0, 0x0} + { 0x0, 0xFF }, + { 0x0, 0x0, 0x1, 0x1, 0x0, -1, -1, 0x0, 0x0, 0xFF }, + { 0x0, 0x0, 0x1, 0x1, 0x1, -1, -1, -1, 0x0, 0x0 }, + { 0x0, 0x0, 0x1, 0x1, 0x1, -1, -1, -1, 0x0, 0x0 } }; static const f32 Unk_ov119_021D256C[][10] = { - {1.0f, 0.0f}, - {1.0f, 1.0f, 1.1f, 1.1f, 1.1f, 1.1f, 1.1f, 1.0f, 1.0f, 0.0f}, - {1.0f, 1.1f, 1.1f, 1.2f, 1.2f, 1.2f, 1.1f, 1.1f, 1.0f, 0.0f}, - {1.0f, 1.1f, 1.1f, 1.2f, 1.2f, 1.2f, 1.1f, 1.1f, 1.0f, 0.0f} + { 1.0f, 0.0f }, + { 1.0f, 1.0f, 1.1f, 1.1f, 1.1f, 1.1f, 1.1f, 1.0f, 1.0f, 0.0f }, + { 1.0f, 1.1f, 1.1f, 1.2f, 1.2f, 1.2f, 1.1f, 1.1f, 1.0f, 0.0f }, + { 1.0f, 1.1f, 1.1f, 1.2f, 1.2f, 1.2f, 1.1f, 1.1f, 1.0f, 0.0f } }; static const f32 Unk_ov119_021D260C[][10] = { - {1.0f, 0.0f}, - {1.0f, 1.0f, 0.9f, 0.9f, 0.9f, 0.9f, 0.9f, 1.0f, 1.0f, 0.0f}, - {1.0f, 1.0f, 0.9f, 0.8f, 0.7f, 0.7f, 0.8f, 0.9f, 1.0f, 1.0f}, - {1.0f, 1.0f, 0.9f, 0.8f, 0.7f, 0.7f, 0.8f, 0.9f, 1.0f, 1.0f} + { 1.0f, 0.0f }, + { 1.0f, 1.0f, 0.9f, 0.9f, 0.9f, 0.9f, 0.9f, 1.0f, 1.0f, 0.0f }, + { 1.0f, 1.0f, 0.9f, 0.8f, 0.7f, 0.7f, 0.8f, 0.9f, 1.0f, 1.0f }, + { 1.0f, 1.0f, 0.9f, 0.8f, 0.7f, 0.7f, 0.8f, 0.9f, 1.0f, 1.0f } }; -BOOL ov119_021D16C0 (UnkStruct_ov119_021D0FD0 * param0, int param1) +BOOL ov119_021D16C0(UnkStruct_ov119_021D0FD0 *param0, int param1) { - UnkStruct_ov119_021D16C0 * v0; + UnkStruct_ov119_021D16C0 *v0; v0 = ¶m0->unk_80; @@ -685,7 +682,7 @@ BOOL ov119_021D16C0 (UnkStruct_ov119_021D0FD0 * param0, int param1) return 1; } -int ov119_021D176C (UnkStruct_ov119_021D0FD0 * param0, int param1) +int ov119_021D176C(UnkStruct_ov119_021D0FD0 *param0, int param1) { if (ov119_021D16C0(param0, param1) == 0) { return 2; @@ -704,19 +701,26 @@ int ov119_021D176C (UnkStruct_ov119_021D0FD0 * param0, int param1) return 0; } -void ov119_021D17A0 (UnkStruct_ov119_021D0FD0 * param0) +void ov119_021D17A0(UnkStruct_ov119_021D0FD0 *param0) { sub_0200D0F4(param0->unk_74); sub_0200D0F4(param0->unk_78); sub_0200D0F4(param0->unk_7C); } -void ov119_021D17B8 (UnkStruct_ov119_021D17B8 * param0) +void ov119_021D17B8(UnkStruct_ov119_021D17B8 *param0) { param0->unk_50 = sub_0200C6E4(71); { const UnkStruct_ov104_0224133C v0 = { - 0, 128, 0, 32, 0, 128, 0, 32, + 0, + 128, + 0, + 32, + 0, + 128, + 0, + 32, }; const UnkStruct_ov104_022412F4 v1 = { 48 + 48, 1024 * 0x40, 512 * 0x20, GX_OBJVRAMMODE_CHAR_1D_64K, GX_OBJVRAMMODE_CHAR_1D_32K @@ -728,7 +732,12 @@ void ov119_021D17B8 (UnkStruct_ov119_021D17B8 * param0) { BOOL v2; const UnkStruct_ov104_02241308 v3 = { - 48 + 48, 16 + 16, 64, 64, 16, 16, + 48 + 48, + 16 + 16, + 64, + 64, + 16, + 16, }; param0->unk_4C = sub_0200C704(param0->unk_50); @@ -741,17 +750,17 @@ void ov119_021D17B8 (UnkStruct_ov119_021D17B8 * param0) } } -void ov119_021D1844 (UnkStruct_ov119_021D17B8 * param0) +void ov119_021D1844(UnkStruct_ov119_021D17B8 *param0) { sub_0200D0B0(param0->unk_50, param0->unk_4C); sub_0200C8D4(param0->unk_50); } -void ov119_021D1858 (UnkStruct_ov119_021D0FD0 * param0) +void ov119_021D1858(UnkStruct_ov119_021D0FD0 *param0) { ArchivedSprite v0; SpriteAnimationFrame v1[10]; - Pokemon * v2; + Pokemon *v2; int v3; int v4; @@ -771,7 +780,7 @@ void ov119_021D1858 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_70 = sub_02007C34(param0->unk_04.unk_38, &v0, 128, 96 + v4, 0, 0, &v1[0], NULL); } -void ov119_021D18C0 (UnkStruct_ov119_021D0FD0 * param0) +void ov119_021D18C0(UnkStruct_ov119_021D0FD0 *param0) { int v0; int v1; @@ -783,12 +792,12 @@ void ov119_021D18C0 (UnkStruct_ov119_021D0FD0 * param0) PokeSprite_LoadAnimation(param0->unk_04.unk_3C, param0->unk_04.unk_54, param0->unk_70, v0, 2, 0, 0); } -void ov119_021D1900 (UnkStruct_ov119_021D0FD0 * param0) +void ov119_021D1900(UnkStruct_ov119_021D0FD0 *param0) { sub_02007DC8(param0->unk_70); } -void ov119_021D190C (UnkStruct_ov119_021D0FD0 * param0, int param1) +void ov119_021D190C(UnkStruct_ov119_021D0FD0 *param0, int param1) { sub_02007DEC(param0->unk_70, 6, param1); } diff --git a/src/overlay119/ov119_021D191C.c b/src/overlay119/ov119_021D191C.c index 877f360ec4..d9ae657886 100644 --- a/src/overlay119/ov119_021D191C.c +++ b/src/overlay119/ov119_021D191C.c @@ -1,10 +1,16 @@ +#include "overlay119/ov119_021D191C.h" + #include #include #include "struct_defs/struct_0200D0F4.h" + +#include "overlay119/ov119_021D0D80.h" #include "overlay119/struct_ov119_021D0FD0.h" #include "overlay119/struct_ov119_021D1930.h" +#include "gx_layers.h" +#include "pokemon.h" #include "unk_02001AF4.h" #include "unk_02002F38.h" #include "unk_020041CC.h" @@ -15,26 +21,23 @@ #include "unk_02015F84.h" #include "unk_0201D670.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "pokemon.h" -#include "overlay119/ov119_021D0D80.h" -#include "overlay119/ov119_021D191C.h" -static BOOL ov119_021D1930(UnkStruct_ov119_021D0FD0 * param0); -static BOOL ov119_021D1BD0(UnkStruct_ov119_021D0FD0 * param0); -static BOOL ov119_021D1E38(UnkStruct_ov119_021D0FD0 * param0); -static BOOL ov119_021D1E80(UnkStruct_ov119_021D0FD0 * param0); -static BOOL ov119_021D1EF0(UnkStruct_ov119_021D0FD0 * param0); -static BOOL ov119_021D1F48(UnkStruct_ov119_021D0FD0 * param0); -static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 * param0); -static BOOL ov119_021D21BC(UnkStruct_ov119_021D0FD0 * param0); - -static BOOL(*const Unk_ov119_021D26AC[])(UnkStruct_ov119_021D0FD0 *) = { - ov119_021D1930, ov119_021D1BD0, +static BOOL ov119_021D1930(UnkStruct_ov119_021D0FD0 *param0); +static BOOL ov119_021D1BD0(UnkStruct_ov119_021D0FD0 *param0); +static BOOL ov119_021D1E38(UnkStruct_ov119_021D0FD0 *param0); +static BOOL ov119_021D1E80(UnkStruct_ov119_021D0FD0 *param0); +static BOOL ov119_021D1EF0(UnkStruct_ov119_021D0FD0 *param0); +static BOOL ov119_021D1F48(UnkStruct_ov119_021D0FD0 *param0); +static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0); +static BOOL ov119_021D21BC(UnkStruct_ov119_021D0FD0 *param0); + +static BOOL (*const Unk_ov119_021D26AC[])(UnkStruct_ov119_021D0FD0 *) = { + ov119_021D1930, + ov119_021D1BD0, }; -BOOL ov119_021D191C (UnkStruct_ov119_021D0FD0 * param0) +BOOL ov119_021D191C(UnkStruct_ov119_021D0FD0 *param0) { BOOL v0; @@ -42,7 +45,7 @@ BOOL ov119_021D191C (UnkStruct_ov119_021D0FD0 * param0) return v0; } -static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) +static BOOL ov119_021D1930(UnkStruct_ov119_021D0FD0 *param0) { BOOL v0 = 1; @@ -52,7 +55,7 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) ov119_021D135C(param0->unk_04.unk_00, param0->unk_04.unk_04); ov119_021D1068(param0->unk_04.unk_00, param0->unk_04.unk_04, param0->unk_04.unk_10); - ov119_021D10F0(param0->unk_04.unk_00, ¶m0->unk_04.unk_14[0], 1, 2, 19, 27, 4, (((20 + (18 + 12)) + 9)), 14); + ov119_021D10F0(param0->unk_04.unk_00, ¶m0->unk_04.unk_14[0], 1, 2, 19, 27, 4, ((20 + (18 + 12)) + 9), 14); ov119_021D1514(param0); ov119_021D161C(param0); @@ -81,8 +84,7 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_60++; } break; - case 3: - { + case 3: { BOOL v2; v2 = ov119_021D1E38(param0); @@ -90,10 +92,8 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) if (v2 == 0) { param0->unk_60++; } - } - break; - case 4: - { + } break; + case 4: { BOOL v3; v3 = ov119_021D1E80(param0); @@ -101,10 +101,8 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) if (v3 == 0) { param0->unk_60++; } - } - break; - case 5: - { + } break; + case 5: { BOOL v4; v4 = ov119_021D1EF0(param0); @@ -112,10 +110,8 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) if (v4 == 0) { param0->unk_60++; } - } - break; - case 6: - { + } break; + case 6: { BOOL v5; v5 = ov119_021D1F48(param0); @@ -123,10 +119,8 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) if (v5 == 0) { param0->unk_60++; } - } - break; - case 7: - { + } break; + case 7: { BOOL v6; v6 = ov119_021D1FAC(param0); @@ -144,8 +138,7 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) } param0->unk_60++; } - } - break; + } break; case 8: if (sub_0200598C() != 0) { break; @@ -179,11 +172,10 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) break; } - ov119_021D11E4(param0, param0->unk_04.unk_00, ¶m0->unk_04.unk_14[1], 1, 25, 13, 6, 4, (((((20 + (18 + 12)) + 9)) + (27 * 4))), 14); + ov119_021D11E4(param0, param0->unk_04.unk_00, ¶m0->unk_04.unk_14[1], 1, 25, 13, 6, 4, (((20 + (18 + 12)) + 9) + (27 * 4)), 14); param0->unk_60++; break; - case 12: - { + case 12: { u32 v9 = sub_02001BE0(param0->unk_04.unk_48); switch (v9) { @@ -203,8 +195,7 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_60++; break; } - } - break; + } break; case 13: ov119_021D12CC(param0); param0->unk_60++; @@ -236,7 +227,7 @@ static BOOL ov119_021D1930 (UnkStruct_ov119_021D0FD0 * param0) return v0; } -static BOOL ov119_021D1BD0 (UnkStruct_ov119_021D0FD0 * param0) +static BOOL ov119_021D1BD0(UnkStruct_ov119_021D0FD0 *param0) { BOOL v0 = 1; @@ -246,7 +237,7 @@ static BOOL ov119_021D1BD0 (UnkStruct_ov119_021D0FD0 * param0) ov119_021D135C(param0->unk_04.unk_00, param0->unk_04.unk_04); ov119_021D1068(param0->unk_04.unk_00, param0->unk_04.unk_04, param0->unk_04.unk_10); - ov119_021D10F0(param0->unk_04.unk_00, ¶m0->unk_04.unk_14[0], 1, 2, 19, 27, 4, (((20 + (18 + 12)) + 9)), 14); + ov119_021D10F0(param0->unk_04.unk_00, ¶m0->unk_04.unk_14[0], 1, 2, 19, 27, 4, ((20 + (18 + 12)) + 9), 14); ov119_021D1514(param0); ov119_021D161C(param0); @@ -275,8 +266,7 @@ static BOOL ov119_021D1BD0 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_60++; } break; - case 3: - { + case 3: { BOOL v2; v2 = ov119_021D21BC(param0); @@ -295,8 +285,7 @@ static BOOL ov119_021D1BD0 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_60 = 8; } - } - break; + } break; case 4: case 5: case 6: @@ -336,11 +325,10 @@ static BOOL ov119_021D1BD0 (UnkStruct_ov119_021D0FD0 * param0) break; } - ov119_021D11E4(param0, param0->unk_04.unk_00, ¶m0->unk_04.unk_14[1], 1, 25, 13, 6, 4, (((((20 + (18 + 12)) + 9)) + (27 * 4))), 14); + ov119_021D11E4(param0, param0->unk_04.unk_00, ¶m0->unk_04.unk_14[1], 1, 25, 13, 6, 4, (((20 + (18 + 12)) + 9) + (27 * 4)), 14); param0->unk_60++; break; - case 12: - { + case 12: { u32 v5 = sub_02001BE0(param0->unk_04.unk_48); switch (v5) { @@ -360,8 +348,7 @@ static BOOL ov119_021D1BD0 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_60++; break; } - } - break; + } break; case 13: ov119_021D12CC(param0); param0->unk_60++; @@ -393,7 +380,7 @@ static BOOL ov119_021D1BD0 (UnkStruct_ov119_021D0FD0 * param0) return v0; } -static BOOL ov119_021D1E38 (UnkStruct_ov119_021D0FD0 * param0) +static BOOL ov119_021D1E38(UnkStruct_ov119_021D0FD0 *param0) { switch (param0->unk_68) { case 0: @@ -416,7 +403,7 @@ static BOOL ov119_021D1E38 (UnkStruct_ov119_021D0FD0 * param0) return 1; } -static BOOL ov119_021D1E80 (UnkStruct_ov119_021D0FD0 * param0) +static BOOL ov119_021D1E80(UnkStruct_ov119_021D0FD0 *param0) { switch (param0->unk_68) { case 0: @@ -427,8 +414,7 @@ static BOOL ov119_021D1E80 (UnkStruct_ov119_021D0FD0 * param0) sub_0200D3CC(param0->unk_74, 1); param0->unk_68++; break; - case 1: - { + case 1: { int v0; v0 = ov119_021D176C(param0, 0); @@ -440,10 +426,8 @@ static BOOL ov119_021D1E80 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_68++; param0->unk_64 = 0; } - } - break; - default: - { + } break; + default: { int v1; v1 = ov119_021D176C(param0, 0); @@ -454,21 +438,19 @@ static BOOL ov119_021D1E80 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_64 = 0; return 0; } - } - break; + } break; } return 1; } -static BOOL ov119_021D1EF0 (UnkStruct_ov119_021D0FD0 * param0) +static BOOL ov119_021D1EF0(UnkStruct_ov119_021D0FD0 *param0) { switch (param0->unk_68) { case 0: param0->unk_68++; break; - case 1: - { + case 1: { int v0; v0 = ov119_021D176C(param0, 1); @@ -483,8 +465,7 @@ static BOOL ov119_021D1EF0 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_64 = 0; param0->unk_68++; } - } - break; + } break; default: param0->unk_68 = 0; param0->unk_64 = 0; @@ -494,7 +475,7 @@ static BOOL ov119_021D1EF0 (UnkStruct_ov119_021D0FD0 * param0) return 1; } -static BOOL ov119_021D1F48 (UnkStruct_ov119_021D0FD0 * param0) +static BOOL ov119_021D1F48(UnkStruct_ov119_021D0FD0 *param0) { switch (param0->unk_68) { case 0: @@ -504,8 +485,7 @@ static BOOL ov119_021D1F48 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_68++; break; - case 1: - { + case 1: { int v0; v0 = ov119_021D176C(param0, 2); @@ -521,8 +501,7 @@ static BOOL ov119_021D1F48 (UnkStruct_ov119_021D0FD0 * param0) param0->unk_64 = 0; param0->unk_68++; } - } - break; + } break; default: param0->unk_68 = 0; param0->unk_64 = 0; @@ -532,7 +511,7 @@ static BOOL ov119_021D1F48 (UnkStruct_ov119_021D0FD0 * param0) return 1; } -static BOOL ov119_021D1FAC (UnkStruct_ov119_021D0FD0 * param0) +static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0) { switch (param0->unk_68) { case 0: @@ -544,8 +523,7 @@ static BOOL ov119_021D1FAC (UnkStruct_ov119_021D0FD0 * param0) GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); param0->unk_68++; break; - case 1: - { + case 1: { int v0; v0 = ov119_021D176C(param0, 3); @@ -562,8 +540,7 @@ static BOOL ov119_021D1FAC (UnkStruct_ov119_021D0FD0 * param0) param0->unk_64 = 0; param0->unk_68++; } - } - break; + } break; case 2: if ((++param0->unk_64) >= 10) { param0->unk_64 = 0; @@ -571,7 +548,7 @@ static BOOL ov119_021D1FAC (UnkStruct_ov119_021D0FD0 * param0) sub_02003178(param0->unk_04.unk_04, 0x1, 0xFFFF, 0, 0, 16, 0xFFFF); { - NNSG2dImagePaletteProxy * v1; + NNSG2dImagePaletteProxy *v1; int v2; v1 = sub_02021F9C(param0->unk_78->unk_00); @@ -584,8 +561,7 @@ static BOOL ov119_021D1FAC (UnkStruct_ov119_021D0FD0 * param0) param0->unk_68++; } break; - case 3: - { + case 3: { s16 v3, v4; int v5 = 0; @@ -616,8 +592,7 @@ static BOOL ov119_021D1FAC (UnkStruct_ov119_021D0FD0 * param0) SpriteActor_EnableObject(param0->unk_7C, 0); param0->unk_68++; - } - break; + } break; case 4: if ((++param0->unk_64) >= 25) { param0->unk_64 = 0; @@ -650,7 +625,7 @@ static BOOL ov119_021D1FAC (UnkStruct_ov119_021D0FD0 * param0) return 1; } -static BOOL ov119_021D21BC (UnkStruct_ov119_021D0FD0 * param0) +static BOOL ov119_021D21BC(UnkStruct_ov119_021D0FD0 *param0) { switch (param0->unk_68) { case 0: @@ -679,7 +654,7 @@ static BOOL ov119_021D21BC (UnkStruct_ov119_021D0FD0 * param0) sub_02003178(param0->unk_04.unk_04, 0x1, 0xFFFF, 0, 0, 16, 0xFFFF); { - NNSG2dImagePaletteProxy * v0; + NNSG2dImagePaletteProxy *v0; int v1; v0 = sub_02021F9C(param0->unk_78->unk_00); @@ -692,8 +667,7 @@ static BOOL ov119_021D21BC (UnkStruct_ov119_021D0FD0 * param0) param0->unk_68++; } break; - case 2: - { + case 2: { s16 v2, v3; int v4 = 0; @@ -725,8 +699,7 @@ static BOOL ov119_021D21BC (UnkStruct_ov119_021D0FD0 * param0) SpriteActor_EnableObject(param0->unk_7C, 0); param0->unk_68++; - } - break; + } break; case 3: if ((++param0->unk_64) >= 25) { param0->unk_64 = 0; diff --git a/src/overlay_manager.c b/src/overlay_manager.c index e695c62db1..83561ff447 100644 --- a/src/overlay_manager.c +++ b/src/overlay_manager.c @@ -1,15 +1,16 @@ +#include "overlay_manager.h" + #include #include -#include "heap.h" #include "game_overlay.h" -#include "overlay_manager.h" +#include "heap.h" -OverlayManager* OverlayManager_New(const OverlayManagerTemplate *template, void *args, const enum HeapId heapID) +OverlayManager *OverlayManager_New(const OverlayManagerTemplate *template, void *args, const enum HeapId heapID) { OverlayManager *ovyManager = Heap_AllocFromHeap(heapID, sizeof(OverlayManager)); - ovyManager->template= *template; + ovyManager->template = *template; ovyManager->execState = 0; ovyManager->procState = 0; ovyManager->args = args; @@ -25,13 +26,13 @@ void OverlayManager_Free(OverlayManager *ovyManager) Heap_FreeToHeap(ovyManager); } -void* OverlayManager_NewData(OverlayManager *ovyManager, u32 size, enum HeapId heapID) +void *OverlayManager_NewData(OverlayManager *ovyManager, u32 size, enum HeapId heapID) { ovyManager->data = Heap_AllocFromHeap(heapID, size); return ovyManager->data; } -void* OverlayManager_Data(OverlayManager *ovyManager) +void *OverlayManager_Data(OverlayManager *ovyManager) { return ovyManager->data; } @@ -42,7 +43,7 @@ void OverlayManager_FreeData(OverlayManager *ovyManager) ovyManager->data = NULL; } -void* OverlayManager_Args(OverlayManager *ovyManager) +void *OverlayManager_Args(OverlayManager *ovyManager) { return ovyManager->args; } diff --git a/src/party.c b/src/party.c index 26ad7e0d1d..158f318909 100644 --- a/src/party.c +++ b/src/party.c @@ -1,30 +1,29 @@ +#include "party.h" + #include #include -#include "savedata.h" - -#include "pokemon.h" #include "struct_defs/struct_party.h" #include "heap.h" -#include "savedata.h" #include "pokemon.h" -#include "party.h" +#include "savedata.h" -#define PARTY_ASSERT_SLOT(party, slot) { \ - GF_ASSERT(slot >= 0); \ - GF_ASSERT(slot < (party)->currentCount); \ - GF_ASSERT(slot < (party)->capacity); \ -} +#define PARTY_ASSERT_SLOT(party, slot) \ + { \ + GF_ASSERT(slot >= 0); \ + GF_ASSERT(slot < (party)->currentCount); \ + GF_ASSERT(slot < (party)->capacity); \ + } -int Party_SaveSize (void) +int Party_SaveSize(void) { return sizeof(Party); } -Party * Party_New (u32 param0) +Party *Party_New(u32 param0) { - Party * v0; + Party *v0; v0 = Heap_AllocFromHeap(param0, sizeof(Party)); Party_Init(v0); @@ -32,12 +31,12 @@ Party * Party_New (u32 param0) return v0; } -void Party_Init (Party * param0) +void Party_Init(Party *param0) { Party_InitWithCapacity(param0, 6); } -void Party_InitWithCapacity (Party * party, int capacity) +void Party_InitWithCapacity(Party *party, int capacity) { int i; @@ -52,7 +51,7 @@ void Party_InitWithCapacity (Party * party, int capacity) } } -BOOL Party_AddPokemon (Party * party, Pokemon * pokemon) +BOOL Party_AddPokemon(Party *party, Pokemon *pokemon) { if (party->currentCount >= party->capacity) { return FALSE; @@ -64,7 +63,7 @@ BOOL Party_AddPokemon (Party * party, Pokemon * pokemon) return TRUE; } -BOOL Party_RemovePokemonBySlotIndex (Party * party, int slot) +BOOL Party_RemovePokemonBySlotIndex(Party *party, int slot) { int i; @@ -81,23 +80,23 @@ BOOL Party_RemovePokemonBySlotIndex (Party * party, int slot) return TRUE; } -int Party_GetCapacity (const Party * party) +int Party_GetCapacity(const Party *party) { return party->capacity; } -int Party_GetCurrentCount (const Party * party) +int Party_GetCurrentCount(const Party *party) { return party->currentCount; } -Pokemon * Party_GetPokemonBySlotIndex (const Party * party, int slot) +Pokemon *Party_GetPokemonBySlotIndex(const Party *party, int slot) { PARTY_ASSERT_SLOT(party, slot); return (Pokemon *)&party->pokemon[slot]; } -void sub_0207A128 (Party * party, int slot, Pokemon * param2) +void sub_0207A128(Party *party, int slot, Pokemon *param2) { int v0; @@ -108,9 +107,9 @@ void sub_0207A128 (Party * party, int slot, Pokemon * param2) party->currentCount += v0; } -BOOL Party_SwapSlots (Party * party, int slotA, int slotB) +BOOL Party_SwapSlots(Party *party, int slotA, int slotB) { - Pokemon * tempPokemon; + Pokemon *tempPokemon; PARTY_ASSERT_SLOT(party, slotA); PARTY_ASSERT_SLOT(party, slotB); @@ -126,12 +125,12 @@ BOOL Party_SwapSlots (Party * party, int slotA, int slotB) return FALSE; } -void Party_cpy (const Party * src, Party * dest) +void Party_cpy(const Party *src, Party *dest) { *dest = *src; } -BOOL Party_HasSpecies (const Party * party, int species) +BOOL Party_HasSpecies(const Party *party, int species) { int i; @@ -144,9 +143,9 @@ BOOL Party_HasSpecies (const Party * party, int species) return i != party->currentCount; } -Party * Party_GetFromSavedata (SaveData * param0) +Party *Party_GetFromSavedata(SaveData *param0) { - Party * v0; + Party *v0; v0 = (Party *)SaveData_SaveTable(param0, 2); return v0; diff --git a/src/play_time.c b/src/play_time.c index dd5e181ffb..2ed542b37b 100644 --- a/src/play_time.c +++ b/src/play_time.c @@ -1,10 +1,10 @@ -#include - #include "play_time.h" -#define SECONDS_PER_MINUTE 60 -#define MINUTES_PER_HOUR 60 -#define PLAYTIME_MAX_HOURS 999 +#include + +#define SECONDS_PER_MINUTE 60 +#define MINUTES_PER_HOUR 60 +#define PLAYTIME_MAX_HOURS 999 #define PLAYTIME_MAX_MINUTES (MINUTES_PER_HOUR - 1) #define PLAYTIME_MAX_SECONDS (SECONDS_PER_MINUTE - 1) @@ -17,8 +17,8 @@ void PlayTime_Init(PlayTime *playTime) void PlayTime_Increment(PlayTime *playTime, u32 seconds) { - if (playTime->hours == PLAYTIME_MAX_HOURS - && playTime->minutes == PLAYTIME_MAX_MINUTES + if (playTime->hours == PLAYTIME_MAX_HOURS + && playTime->minutes == PLAYTIME_MAX_MINUTES && playTime->seconds == PLAYTIME_MAX_SECONDS) { return; } diff --git a/src/player_avatar.c b/src/player_avatar.c index 67dd53f3ed..aa102dcfa2 100644 --- a/src/player_avatar.c +++ b/src/player_avatar.c @@ -1,19 +1,20 @@ +#include "player_avatar.h" + #include #include #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" +#include "struct_defs/struct_0205EC34.h" #include "field/field_system.h" -#include "struct_defs/struct_0205EC34.h" +#include "overlay005/ov5_021F25C0.h" +#include "overlay005/ov5_021F61BC.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" #include "heap.h" -#include "player_avatar.h" #include "map_object.h" #include "map_object_move.h" -#include "overlay005/ov5_021F25C0.h" -#include "overlay005/ov5_021F61BC.h" typedef struct PlayerAvatar { u32 unk_00; @@ -28,24 +29,24 @@ typedef struct PlayerAvatar { int speed; int unk_28; int unk_2C; - MapObject * mapObject; - UnkStruct_ov101_021D5D90 * unk_34; - PlayerData * player; - const PlayerData * playerConst; + MapObject *mapObject; + UnkStruct_ov101_021D5D90 *unk_34; + PlayerData *player; + const PlayerData *playerConst; } PlayerAvatar; -static PlayerAvatar * PlayerAvatar_Alloc(void); -static void sub_0205E91C(PlayerAvatar * playerAvatar, int param1, int param2, PlayerData * param3); -static void PlayerAvatar_AddMapObject(PlayerAvatar * playerAvatar, const MapObjectManager * param1, int param2, int param3, int param4, int param5); -static MapObject * sub_0205EA64(const MapObjectManager * mapObjMan); -static void sub_0205EB9C(PlayerAvatar * playerAvatar, u32 param1); -static void sub_0205EBA4(PlayerAvatar * playerAvatar, u32 param1); -static u32 sub_0205EBB0(PlayerAvatar * playerAvatar, u32 param1); -static void PlayerAvatar_SetPlayerData(PlayerAvatar * playerAvatar, PlayerData * param1); +static PlayerAvatar *PlayerAvatar_Alloc(void); +static void sub_0205E91C(PlayerAvatar *playerAvatar, int param1, int param2, PlayerData *param3); +static void PlayerAvatar_AddMapObject(PlayerAvatar *playerAvatar, const MapObjectManager *param1, int param2, int param3, int param4, int param5); +static MapObject *sub_0205EA64(const MapObjectManager *mapObjMan); +static void sub_0205EB9C(PlayerAvatar *playerAvatar, u32 param1); +static void sub_0205EBA4(PlayerAvatar *playerAvatar, u32 param1); +static u32 sub_0205EBB0(PlayerAvatar *playerAvatar, u32 param1); +static void PlayerAvatar_SetPlayerData(PlayerAvatar *playerAvatar, PlayerData *param1); -PlayerAvatar * PlayerAvatar_Init (const MapObjectManager * mapObjMan, int x, int z, int dir, int param4, int param5, int param6, PlayerData * param7) +PlayerAvatar *PlayerAvatar_Init(const MapObjectManager *mapObjMan, int x, int z, int dir, int param4, int param5, int param6, PlayerData *param7) { - PlayerAvatar * playerAvatar = PlayerAvatar_Alloc(); + PlayerAvatar *playerAvatar = PlayerAvatar_Alloc(); sub_0205E91C(playerAvatar, param4, param5, param7); int v1; @@ -62,15 +63,14 @@ PlayerAvatar * PlayerAvatar_Init (const MapObjectManager * mapObjMan, int x, int PlayerAvatar_AddMapObject(playerAvatar, mapObjMan, v1, dir, x, z); - return playerAvatar; } -PlayerAvatar * sub_0205E820 (const MapObjectManager * mapObjMan, PlayerData * param1, int param2) +PlayerAvatar *sub_0205E820(const MapObjectManager *mapObjMan, PlayerData *param1, int param2) { int v0; - PlayerAvatar * playerAvatar; - MapObject * mapObj; + PlayerAvatar *playerAvatar; + MapObject *mapObj; playerAvatar = PlayerAvatar_Alloc(); v0 = sub_0205EC94(param1); @@ -87,9 +87,9 @@ PlayerAvatar * sub_0205E820 (const MapObjectManager * mapObjMan, PlayerData * pa return playerAvatar; } -void PlayerAvatar_InitDraw (PlayerAvatar * playerAvatar, int groundId) +void PlayerAvatar_InitDraw(PlayerAvatar *playerAvatar, int groundId) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); GF_ASSERT(mapObj != NULL); MapObject_MapObjectManager(mapObj); @@ -100,36 +100,36 @@ void PlayerAvatar_InitDraw (PlayerAvatar * playerAvatar, int groundId) int x = Player_GetXPos(playerAvatar); int z = Player_GetZPos(playerAvatar); int dir = PlayerAvatar_GetDir(playerAvatar); - UnkStruct_ov101_021D5D90 * v7 = ov5_021F261C(mapObj, x, z, dir, 1); + UnkStruct_ov101_021D5D90 *v7 = ov5_021F261C(mapObj, x, z, dir, 1); sub_0205EC00(playerAvatar, v7); } } } -void Player_Delete (PlayerAvatar * playerAvatar) +void Player_Delete(PlayerAvatar *playerAvatar) { Heap_FreeToHeap(playerAvatar); } -void Player_DeleteAll (PlayerAvatar * playerAvatar) +void Player_DeleteAll(PlayerAvatar *playerAvatar) { - MapObject * mapObject = Player_MapObject(playerAvatar); + MapObject *mapObject = Player_MapObject(playerAvatar); MapObject_Delete(mapObject); Player_Delete(playerAvatar); } -static PlayerAvatar * PlayerAvatar_Alloc (void) +static PlayerAvatar *PlayerAvatar_Alloc(void) { - PlayerAvatar * playerAvatar = Heap_AllocFromHeap(11, (sizeof(PlayerAvatar))); + PlayerAvatar *playerAvatar = Heap_AllocFromHeap(11, (sizeof(PlayerAvatar))); GF_ASSERT(playerAvatar != NULL); memset(playerAvatar, 0, (sizeof(PlayerAvatar))); return playerAvatar; } -static void sub_0205E91C (PlayerAvatar * playerAvatar, int param1, int gender, PlayerData * player) +static void sub_0205E91C(PlayerAvatar *playerAvatar, int param1, int gender, PlayerData *player) { PlayerAvatar_SetPlayerData(playerAvatar, player); @@ -147,9 +147,9 @@ static void sub_0205E91C (PlayerAvatar * playerAvatar, int param1, int gender, P PlayerAvatar_SetInDeepSwamp(playerAvatar, 1); } -static void PlayerAvatar_AddMapObject (PlayerAvatar * playerAvatar, const MapObjectManager * mapObjMan, int param2, int dir, int x, int z) +static void PlayerAvatar_AddMapObject(PlayerAvatar *playerAvatar, const MapObjectManager *mapObjMan, int param2, int dir, int x, int z) { - MapObject * mapObj = MapObjectMan_AddMapObject(mapObjMan, x, z, dir, param2, 0x1, 1); + MapObject *mapObj = MapObjectMan_AddMapObject(mapObjMan, x, z, dir, param2, 0x1, 1); GF_ASSERT(mapObj != NULL); MapObject_SetId(mapObj, 0xff); @@ -168,10 +168,10 @@ static void PlayerAvatar_AddMapObject (PlayerAvatar * playerAvatar, const MapObj PlayerAvatar_SetMapObject(playerAvatar, mapObj); } -MapObject * sub_0205EA24 (const MapObjectManager * mapObjMan) +MapObject *sub_0205EA24(const MapObjectManager *mapObjMan) { int v0 = 0; - MapObject * mapObj = NULL; + MapObject *mapObj = NULL; while (sub_020625B0(mapObjMan, &mapObj, &v0, (1 << 0))) { if (MapObject_GetMoveCode(mapObj) == 0x1) { @@ -182,30 +182,30 @@ MapObject * sub_0205EA24 (const MapObjectManager * mapObjMan) return mapObj; } -static MapObject * sub_0205EA64 (const MapObjectManager * mapObjMan) +static MapObject *sub_0205EA64(const MapObjectManager *mapObjMan) { - MapObject * mapObj = sub_0205EA24(mapObjMan); + MapObject *mapObj = sub_0205EA24(mapObjMan); GF_ASSERT(mapObj != NULL); return mapObj; } -int PlayerAvatar_GetDir (PlayerAvatar * const playerAvatar) +int PlayerAvatar_GetDir(PlayerAvatar *const playerAvatar) { return MapObject_Dir(Player_MapObject(playerAvatar)); } -void Player_SetDir (PlayerAvatar * playerAvatar, int dir) +void Player_SetDir(PlayerAvatar *playerAvatar, int dir) { MapObject_SetDir(Player_MapObject(playerAvatar), dir); } -int PlayerAvatar_GetMoveDir (PlayerAvatar * const playerAvatar) +int PlayerAvatar_GetMoveDir(PlayerAvatar *const playerAvatar) { return MapObject_GetMoveDir(Player_MapObject(playerAvatar)); } -int sub_0205EAA0 (PlayerAvatar * const playerAvatar) +int sub_0205EAA0(PlayerAvatar *const playerAvatar) { if (PlayerAvatar_DistortionStateOnFloor(playerAvatar) == TRUE) { return PlayerAvatar_GetDir(playerAvatar); @@ -214,59 +214,59 @@ int sub_0205EAA0 (PlayerAvatar * const playerAvatar) return PlayerAvatar_GetMoveDir(playerAvatar); } -int Player_GetXPos (PlayerAvatar * const playerAvatar) +int Player_GetXPos(PlayerAvatar *const playerAvatar) { return MapObject_GetXPos(Player_MapObject(playerAvatar)); } -int Player_GetZPos (PlayerAvatar * const playerAvatar) +int Player_GetZPos(PlayerAvatar *const playerAvatar) { return MapObject_GetZPos(Player_MapObject(playerAvatar)); } -int PlayerAvatar_XPosPrev (PlayerAvatar * const playerAvatar) +int PlayerAvatar_XPosPrev(PlayerAvatar *const playerAvatar) { return MapObject_XPosPrev(Player_MapObject(playerAvatar)); } -int PlayerAvatar_ZPosPrev (PlayerAvatar * const playerAvatar) +int PlayerAvatar_ZPosPrev(PlayerAvatar *const playerAvatar) { return MapObject_ZPosPrev(Player_MapObject(playerAvatar)); } -void PlayerAvatar_PosVectorOut (PlayerAvatar * const playerAvatar, VecFx32 * pos) +void PlayerAvatar_PosVectorOut(PlayerAvatar *const playerAvatar, VecFx32 *pos) { MapObject_PosVectorOut(Player_MapObject(playerAvatar), pos); } -const VecFx32 * PlayerAvatar_PosVector (PlayerAvatar * const playerAvatar) +const VecFx32 *PlayerAvatar_PosVector(PlayerAvatar *const playerAvatar) { return MapObject_PosVector(PlayerAvatar_ConstMapObject(playerAvatar)); } -void sub_0205EB08 (PlayerAvatar * playerAvatar, int param1) +void sub_0205EB08(PlayerAvatar *playerAvatar, int param1) { playerAvatar->unk_14 = param1; } -int PlayerAvatar_MoveState (const PlayerAvatar * playerAvatar) +int PlayerAvatar_MoveState(const PlayerAvatar *playerAvatar) { return playerAvatar->unk_14; } -void sub_0205EB10 (PlayerAvatar * playerAvatar, int param1) +void sub_0205EB10(PlayerAvatar *playerAvatar, int param1) { playerAvatar->unk_18 = param1; } -int Player_MoveState (const PlayerAvatar * playerAvatar) +int Player_MoveState(const PlayerAvatar *playerAvatar) { return playerAvatar->unk_18; } -void PlayerAvatar_SetHidden (PlayerAvatar * playerAvatar, int param1) +void PlayerAvatar_SetHidden(PlayerAvatar *playerAvatar, int param1) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); if (param1 == 1) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_HIDE); @@ -275,12 +275,12 @@ void PlayerAvatar_SetHidden (PlayerAvatar * playerAvatar, int param1) } } -void PlayerAvatar_SetMapObject (PlayerAvatar * playerAvatar, MapObject * mapObject) +void PlayerAvatar_SetMapObject(PlayerAvatar *playerAvatar, MapObject *mapObject) { playerAvatar->mapObject = mapObject; } -MapObject * Player_MapObject (PlayerAvatar * playerAvatar) +MapObject *Player_MapObject(PlayerAvatar *playerAvatar) { GF_ASSERT(playerAvatar != NULL); GF_ASSERT(playerAvatar->mapObject != NULL); @@ -288,12 +288,12 @@ MapObject * Player_MapObject (PlayerAvatar * playerAvatar) return playerAvatar->mapObject; } -const MapObject * PlayerAvatar_ConstMapObject (const PlayerAvatar * playerAvatar) +const MapObject *PlayerAvatar_ConstMapObject(const PlayerAvatar *playerAvatar) { return playerAvatar->mapObject; } -void PlayerAvatar_SetPlayerState (PlayerAvatar * playerAvatar, int param1) +void PlayerAvatar_SetPlayerState(PlayerAvatar *playerAvatar, int param1) { GF_ASSERT(param1 < 0x6); playerAvatar->unk_1C = param1; @@ -301,69 +301,69 @@ void PlayerAvatar_SetPlayerState (PlayerAvatar * playerAvatar, int param1) sub_0205ECA8(playerAvatar, param1); } -int PlayerAvatar_GetPlayerState (PlayerAvatar * playerAvatar) +int PlayerAvatar_GetPlayerState(PlayerAvatar *playerAvatar) { GF_ASSERT(playerAvatar != NULL); return playerAvatar->unk_1C; } -void PlayerAvatar_TurnOnRequestStateBit (PlayerAvatar * playerAvatar, u32 param1) +void PlayerAvatar_TurnOnRequestStateBit(PlayerAvatar *playerAvatar, u32 param1) { playerAvatar->unk_04 |= param1; } -void PlayerAvatar_SetRequestStateFlag (PlayerAvatar * playerAvatar, u32 param1) +void PlayerAvatar_SetRequestStateFlag(PlayerAvatar *playerAvatar, u32 param1) { playerAvatar->unk_04 = param1; } -u32 PlayerAvatar_RequestStateFlag (PlayerAvatar * playerAvatar) +u32 PlayerAvatar_RequestStateFlag(PlayerAvatar *playerAvatar) { return playerAvatar->unk_04; } -void PlayerAvatar_SetGender (PlayerAvatar * playerAvatar, int gender) +void PlayerAvatar_SetGender(PlayerAvatar *playerAvatar, int gender) { playerAvatar->gender = gender; } -int PlayerAvatar_Gender (PlayerAvatar * playerAvatar) +int PlayerAvatar_Gender(PlayerAvatar *playerAvatar) { return playerAvatar->gender; } -static void sub_0205EB9C (PlayerAvatar * playerAvatar, u32 param1) +static void sub_0205EB9C(PlayerAvatar *playerAvatar, u32 param1) { playerAvatar->unk_00 |= param1; } -static void sub_0205EBA4 (PlayerAvatar * playerAvatar, u32 param1) +static void sub_0205EBA4(PlayerAvatar *playerAvatar, u32 param1) { playerAvatar->unk_00 &= ~param1; } -static u32 sub_0205EBB0 (PlayerAvatar * playerAvatar, u32 param1) +static u32 sub_0205EBB0(PlayerAvatar *playerAvatar, u32 param1) { return playerAvatar->unk_00 & param1; } -int PlayerAvatar_Speed (PlayerAvatar * playerAvatar) +int PlayerAvatar_Speed(PlayerAvatar *playerAvatar) { return playerAvatar->speed; } -void PlayerAvatar_SetSpeed (PlayerAvatar * playerAvatar, int speed) +void PlayerAvatar_SetSpeed(PlayerAvatar *playerAvatar, int speed) { playerAvatar->speed = speed; } -void PlayerAvatar_ClearSpeed (PlayerAvatar * playerAvatar) +void PlayerAvatar_ClearSpeed(PlayerAvatar *playerAvatar) { playerAvatar->speed = 0; sub_0205EF98(playerAvatar, 0); } -int PlayerAvatar_AddMoveSpeed (PlayerAvatar * playerAvatar, int dSpeed, int maxSpeed) +int PlayerAvatar_AddMoveSpeed(PlayerAvatar *playerAvatar, int dSpeed, int maxSpeed) { playerAvatar->speed += dSpeed; @@ -374,86 +374,86 @@ int PlayerAvatar_AddMoveSpeed (PlayerAvatar * playerAvatar, int dSpeed, int maxS return playerAvatar->speed; } -void sub_0205EBDC (PlayerAvatar * playerAvatar, int param1) +void sub_0205EBDC(PlayerAvatar *playerAvatar, int param1) { playerAvatar->unk_28 = param1; } -int sub_0205EBE0 (PlayerAvatar * playerAvatar) +int sub_0205EBE0(PlayerAvatar *playerAvatar) { return playerAvatar->unk_28; } -void sub_0205EBE4 (PlayerAvatar * playerAvatar, int param1) +void sub_0205EBE4(PlayerAvatar *playerAvatar, int param1) { playerAvatar->unk_2C = param1; } -int sub_0205EBE8 (PlayerAvatar * playerAvatar) +int sub_0205EBE8(PlayerAvatar *playerAvatar) { return playerAvatar->unk_2C; } -void sub_0205EBEC (PlayerAvatar * playerAvatar, int param1, int param2) +void sub_0205EBEC(PlayerAvatar *playerAvatar, int param1, int param2) { sub_0205EBDC(playerAvatar, param1); sub_0205EBE4(playerAvatar, param2); } -void sub_0205EC00 (PlayerAvatar * playerAvatar, UnkStruct_ov101_021D5D90 * param1) +void sub_0205EC00(PlayerAvatar *playerAvatar, UnkStruct_ov101_021D5D90 *param1) { playerAvatar->unk_34 = param1; } -UnkStruct_ov101_021D5D90 * sub_0205EC04 (PlayerAvatar * playerAvatar) +UnkStruct_ov101_021D5D90 *sub_0205EC04(PlayerAvatar *playerAvatar) { return playerAvatar->unk_34; } -static void PlayerAvatar_SetPlayerData (PlayerAvatar * playerAvatar, PlayerData * player) +static void PlayerAvatar_SetPlayerData(PlayerAvatar *playerAvatar, PlayerData *player) { playerAvatar->player = player; } -PlayerData * PlayerAvatar_PlayerData (PlayerAvatar * playerAvatar) +PlayerData *PlayerAvatar_PlayerData(PlayerAvatar *playerAvatar) { return playerAvatar->player; } -void sub_0205EC10 (PlayerAvatar * playerAvatar, u32 param1) +void sub_0205EC10(PlayerAvatar *playerAvatar, u32 param1) { playerAvatar->unk_08 = param1; } -u32 sub_0205EC14 (PlayerAvatar * playerAvatar) +u32 sub_0205EC14(PlayerAvatar *playerAvatar) { return playerAvatar->unk_08; } -void sub_0205EC18 (PlayerAvatar * playerAvatar, int param1) +void sub_0205EC18(PlayerAvatar *playerAvatar, int param1) { playerAvatar->unk_0C = param1; } -int sub_0205EC1C (PlayerAvatar * playerAvatar) +int sub_0205EC1C(PlayerAvatar *playerAvatar) { return playerAvatar->unk_0C; } -void sub_0205EC20 (PlayerAvatar * playerAvatar, u32 param1, int param2) +void sub_0205EC20(PlayerAvatar *playerAvatar, u32 param1, int param2) { sub_0205EC10(playerAvatar, param1); sub_0205EC18(playerAvatar, param2); } -void PlayerData_Init (PlayerData * playerData) +void PlayerData_Init(PlayerData *playerData) { playerData->unk_00 = 0; playerData->runningShoes = FALSE; playerData->unk_04 = 0x0; } -int PlayerData_HasRunningShoes (PlayerData * playerData) +int PlayerData_HasRunningShoes(PlayerData *playerData) { if (playerData != NULL) { if (playerData->runningShoes == TRUE) { @@ -464,7 +464,7 @@ int PlayerData_HasRunningShoes (PlayerData * playerData) return FALSE; } -void PlayerData_SetRunningShoes (PlayerData * playerData, BOOL flag) +void PlayerData_SetRunningShoes(PlayerData *playerData, BOOL flag) { if (flag == TRUE) { playerData->runningShoes = TRUE; @@ -473,7 +473,7 @@ void PlayerData_SetRunningShoes (PlayerData * playerData, BOOL flag) } } -int PlayerData_CyclingGear (PlayerData * playerData) +int PlayerData_CyclingGear(PlayerData *playerData) { if (playerData == NULL) { return 0; @@ -482,26 +482,26 @@ int PlayerData_CyclingGear (PlayerData * playerData) return playerData->unk_00; } -void PlayerData_SetCyclingGear (PlayerData * playerData, int gear) +void PlayerData_SetCyclingGear(PlayerData *playerData, int gear) { if (playerData != NULL) { playerData->unk_00 = gear; } } -void PlayerAvatar_SetCyclingGear (PlayerAvatar * playerAvatar, int gear) +void PlayerAvatar_SetCyclingGear(PlayerAvatar *playerAvatar, int gear) { - PlayerData * player = PlayerAvatar_PlayerData(playerAvatar); + PlayerData *player = PlayerAvatar_PlayerData(playerAvatar); PlayerData_SetCyclingGear(player, gear); } -int PlayerAvatar_CyclingGear (PlayerAvatar * playerAvatar) +int PlayerAvatar_CyclingGear(PlayerAvatar *playerAvatar) { - PlayerData * player = PlayerAvatar_PlayerData(playerAvatar); + PlayerData *player = PlayerAvatar_PlayerData(playerAvatar); return PlayerData_CyclingGear(player); } -u32 sub_0205EC94 (PlayerData * player) +u32 sub_0205EC94(PlayerData *player) { if (player != NULL) { return player->unk_04; @@ -510,50 +510,50 @@ u32 sub_0205EC94 (PlayerData * player) return 0x0; } -void sub_0205ECA0 (PlayerData * player, u32 param1) +void sub_0205ECA0(PlayerData *player, u32 param1) { if (player != NULL) { player->unk_04 = param1; } } -void sub_0205ECA8 (PlayerAvatar * playerAvatar, u32 param1) +void sub_0205ECA8(PlayerAvatar *playerAvatar, u32 param1) { - PlayerData * player = PlayerAvatar_PlayerData(playerAvatar); + PlayerData *player = PlayerAvatar_PlayerData(playerAvatar); sub_0205ECA0(player, param1); } -void sub_0205ECB8 (PlayerAvatar * playerAvatar, const VecFx32 * param1, int param2) +void sub_0205ECB8(PlayerAvatar *playerAvatar, const VecFx32 *param1, int param2) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); sub_020632D4(mapObj, param1, param2); sub_0205EB08(playerAvatar, 0); sub_0205EB10(playerAvatar, 0); } -void sub_0205ECE0 (PlayerAvatar * playerAvatar, int param1, int param2, int param3) +void sub_0205ECE0(PlayerAvatar *playerAvatar, int param1, int param2, int param3) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); MapObject_SetPosDir(mapObj, param1, 0, param2, param3); sub_0205EB08(playerAvatar, 0); sub_0205EB10(playerAvatar, 0); } -void sub_0205ED0C (PlayerAvatar * playerAvatar, fx32 param1) +void sub_0205ED0C(PlayerAvatar *playerAvatar, fx32 param1) { VecFx32 v0; - MapObject * v1 = Player_MapObject(playerAvatar); + MapObject *v1 = Player_MapObject(playerAvatar); MapObject_PosVectorOut(v1, &v0); v0.y = param1; MapObject_SetPosVec(v1, &v0); } -void sub_0205ED2C (PlayerAvatar * playerAvatar, int param1) +void sub_0205ED2C(PlayerAvatar *playerAvatar, int param1) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); if (param1 == 1) { sub_02062E28(mapObj, 0); @@ -562,9 +562,9 @@ void sub_0205ED2C (PlayerAvatar * playerAvatar, int param1) } } -void sub_0205ED48 (PlayerAvatar * playerAvatar, int param1) +void sub_0205ED48(PlayerAvatar *playerAvatar, int param1) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); if (param1 == 1) { sub_02062E28(mapObj, 0); @@ -574,7 +574,7 @@ void sub_0205ED48 (PlayerAvatar * playerAvatar, int param1) } } -int Player_MoveStateFromGender (int param0, int gender) +int Player_MoveStateFromGender(int param0, int gender) { if (gender == 0) { switch (param0) { @@ -660,7 +660,7 @@ int Player_MoveStateFromGender (int param0, int gender) return 0x0; } -u32 sub_0205EED8 (int param0) +u32 sub_0205EED8(int param0) { switch (param0) { case 0x0: @@ -685,12 +685,12 @@ u32 sub_0205EED8 (int param0) return 1 << 0; } -PlayerAvatar * sub_0205EF3C (FieldSystem * fieldSystem) +PlayerAvatar *sub_0205EF3C(FieldSystem *fieldSystem) { return fieldSystem->playerAvatar; } -void sub_0205EF40 (PlayerAvatar * playerAvatar, int param1) +void sub_0205EF40(PlayerAvatar *playerAvatar, int param1) { if (param1 == 1) { sub_0205EB9C(playerAvatar, (1 << 0)); @@ -699,7 +699,7 @@ void sub_0205EF40 (PlayerAvatar * playerAvatar, int param1) } } -int sub_0205EF58 (PlayerAvatar * playerAvatar) +int sub_0205EF58(PlayerAvatar *playerAvatar) { if (sub_0205EBB0(playerAvatar, (1 << 0))) { return 1; @@ -708,7 +708,7 @@ int sub_0205EF58 (PlayerAvatar * playerAvatar) return 0; } -void sub_0205EF6C (PlayerAvatar * playerAvatar, int param1) +void sub_0205EF6C(PlayerAvatar *playerAvatar, int param1) { if (param1 == 1) { sub_0205EB9C(playerAvatar, (1 << 1)); @@ -717,7 +717,7 @@ void sub_0205EF6C (PlayerAvatar * playerAvatar, int param1) } } -int sub_0205EF84 (PlayerAvatar * playerAvatar) +int sub_0205EF84(PlayerAvatar *playerAvatar) { if (sub_0205EBB0(playerAvatar, (1 << 1))) { return 1; @@ -726,7 +726,7 @@ int sub_0205EF84 (PlayerAvatar * playerAvatar) return 0; } -void sub_0205EF98 (PlayerAvatar * playerAvatar, int param1) +void sub_0205EF98(PlayerAvatar *playerAvatar, int param1) { if (param1 == 1) { sub_0205EB9C(playerAvatar, (1 << 2)); @@ -735,7 +735,7 @@ void sub_0205EF98 (PlayerAvatar * playerAvatar, int param1) } } -BOOL sub_0205EFB0 (PlayerAvatar * playerAvatar) +BOOL sub_0205EFB0(PlayerAvatar *playerAvatar) { if (sub_0205EBB0(playerAvatar, (1 << 2))) { return TRUE; @@ -744,7 +744,7 @@ BOOL sub_0205EFB0 (PlayerAvatar * playerAvatar) return FALSE; } -void sub_0205EFC4 (PlayerAvatar * playerAvatar, int flag) +void sub_0205EFC4(PlayerAvatar *playerAvatar, int flag) { if (flag == TRUE) { sub_0205EB9C(playerAvatar, (1 << 3)); @@ -753,7 +753,7 @@ void sub_0205EFC4 (PlayerAvatar * playerAvatar, int flag) } } -BOOL sub_0205EFDC (PlayerAvatar * playerAvatar) +BOOL sub_0205EFDC(PlayerAvatar *playerAvatar) { if (sub_0205EBB0(playerAvatar, (1 << 3))) { return TRUE; @@ -762,7 +762,7 @@ BOOL sub_0205EFDC (PlayerAvatar * playerAvatar) return FALSE; } -void PlayerAvatar_SetInDeepSwamp (PlayerAvatar * playerAvatar, BOOL flag) +void PlayerAvatar_SetInDeepSwamp(PlayerAvatar *playerAvatar, BOOL flag) { if (flag == TRUE) { sub_0205EB9C(playerAvatar, (1 << 4)); @@ -771,7 +771,7 @@ void PlayerAvatar_SetInDeepSwamp (PlayerAvatar * playerAvatar, BOOL flag) } } -BOOL PlayerAvatar_IsNotInDeepSwamp (PlayerAvatar * playerAvatar) +BOOL PlayerAvatar_IsNotInDeepSwamp(PlayerAvatar *playerAvatar) { if (sub_0205EBB0(playerAvatar, (1 << 4))) { return TRUE; @@ -780,7 +780,7 @@ BOOL PlayerAvatar_IsNotInDeepSwamp (PlayerAvatar * playerAvatar) return FALSE; } -void sub_0205F01C (PlayerAvatar * playerAvatar, BOOL flag) +void sub_0205F01C(PlayerAvatar *playerAvatar, BOOL flag) { if (flag == TRUE) { sub_0205EB9C(playerAvatar, (1 << 5)); @@ -789,7 +789,7 @@ void sub_0205F01C (PlayerAvatar * playerAvatar, BOOL flag) } } -BOOL sub_0205F034 (PlayerAvatar * playerAvatar) +BOOL sub_0205F034(PlayerAvatar *playerAvatar) { if (sub_0205EBB0(playerAvatar, (1 << 5))) { return TRUE; @@ -798,17 +798,17 @@ BOOL sub_0205F034 (PlayerAvatar * playerAvatar) return FALSE; } -void sub_0205F048 (PlayerAvatar * playerAvatar) +void sub_0205F048(PlayerAvatar *playerAvatar) { sub_0205EB9C(playerAvatar, (1 << 6)); } -void sub_0205F054 (PlayerAvatar * playerAvatar) +void sub_0205F054(PlayerAvatar *playerAvatar) { sub_0205EBA4(playerAvatar, (1 << 6)); } -BOOL sub_0205F060 (PlayerAvatar * playerAvatar) +BOOL sub_0205F060(PlayerAvatar *playerAvatar) { if (sub_0205EBB0(playerAvatar, (1 << 6))) { return TRUE; @@ -817,7 +817,7 @@ BOOL sub_0205F060 (PlayerAvatar * playerAvatar) return FALSE; } -void sub_0205F074 (PlayerAvatar * playerAvatar, BOOL flag) +void sub_0205F074(PlayerAvatar *playerAvatar, BOOL flag) { if (flag == TRUE) { sub_0205EB9C(playerAvatar, (1 << 7)); @@ -826,12 +826,12 @@ void sub_0205F074 (PlayerAvatar * playerAvatar, BOOL flag) } } -int sub_0205F08C (PlayerAvatar * playerAvatar) +int sub_0205F08C(PlayerAvatar *playerAvatar) { return sub_0205EBB0(playerAvatar, (1 << 7)); } -void PlayerAvatar_SetDistortionState (PlayerAvatar * playerAvatar, enum AvatarDistortionState state) +void PlayerAvatar_SetDistortionState(PlayerAvatar *playerAvatar, enum AvatarDistortionState state) { sub_0205EBA4(playerAvatar, ((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11) | (1 << 12))); @@ -858,7 +858,7 @@ void PlayerAvatar_SetDistortionState (PlayerAvatar * playerAvatar, enum AvatarDi GF_ASSERT(0); } -enum AvatarDistortionState PlayerAvatar_MapDistortionState (PlayerAvatar * const playerAvatar) +enum AvatarDistortionState PlayerAvatar_MapDistortionState(PlayerAvatar *const playerAvatar) { enum AvatarDistortionState state = AVATAR_DISTORTION_STATE_NONE; u32 v1 = sub_0205EBB0(playerAvatar, ((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11) | (1 << 12))); @@ -885,7 +885,7 @@ enum AvatarDistortionState PlayerAvatar_MapDistortionState (PlayerAvatar * const } // this function can be simplified, but preserving matching reduces clarity -BOOL PlayerAvatar_DistortionGravityChanged (PlayerAvatar * const playerAvatar) +BOOL PlayerAvatar_DistortionGravityChanged(PlayerAvatar *const playerAvatar) { enum AvatarDistortionState state = PlayerAvatar_MapDistortionState(playerAvatar); @@ -896,11 +896,11 @@ BOOL PlayerAvatar_DistortionGravityChanged (PlayerAvatar * const playerAvatar) return TRUE; } -BOOL PlayerAvatar_DistortionStateOnFloor (PlayerAvatar * const playerAvatar) +BOOL PlayerAvatar_DistortionStateOnFloor(PlayerAvatar *const playerAvatar) { enum AvatarDistortionState state = PlayerAvatar_MapDistortionState(playerAvatar); - return state == AVATAR_DISTORTION_STATE_NONE - || state == AVATAR_DISTORTION_STATE_ACTIVE + return state == AVATAR_DISTORTION_STATE_NONE + || state == AVATAR_DISTORTION_STATE_ACTIVE || state == AVATAR_DISTORTION_STATE_FLOOR; } diff --git a/src/poffin.c b/src/poffin.c index 2365f54004..3b73f51d4b 100644 --- a/src/poffin.c +++ b/src/poffin.c @@ -1,22 +1,21 @@ +#include "poffin.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0202A93C.h" #include "struct_defs/struct_0202AB28.h" #include "heap.h" -#include "unk_0201D15C.h" #include "savedata.h" -#include "poffin.h" +#include "unk_0201D15C.h" -int Poffin_sizeof (void) +int Poffin_sizeof(void) { return sizeof(Poffin); } -BOOL sub_0202A914 (Poffin * poffin) +BOOL sub_0202A914(Poffin *poffin) { if (poffin->flavor == 30) { return FALSE; @@ -25,7 +24,7 @@ BOOL sub_0202A914 (Poffin * poffin) return TRUE; } -void Poffin_clear (Poffin * poffin) +void Poffin_clear(Poffin *poffin) { poffin->flavor = 30; poffin->spiciness = 0; @@ -37,9 +36,9 @@ void Poffin_clear (Poffin * poffin) poffin->dummy = 0; } -Poffin * Poffin_malloc (int heapID) +Poffin *Poffin_malloc(int heapID) { - Poffin * poffin; + Poffin *poffin; poffin = Heap_AllocFromHeapAtEnd(heapID, sizeof(Poffin)); Poffin_clear(poffin); @@ -47,7 +46,7 @@ Poffin * Poffin_malloc (int heapID) return poffin; } -void Poffin_copy (Poffin * src, Poffin * dest) +void Poffin_copy(Poffin *src, Poffin *dest) { dest->flavor = src->flavor; dest->spiciness = src->spiciness; @@ -59,7 +58,7 @@ void Poffin_copy (Poffin * src, Poffin * dest) dest->dummy = src->dummy; } -u8 Poffin_GetAttribute (Poffin * poffin, PoffinAttributeID attributeID) +u8 Poffin_GetAttribute(Poffin *poffin, PoffinAttributeID attributeID) { switch (attributeID) { case POFFIN_ATTRIBUTEID_FLAVOR: @@ -80,7 +79,7 @@ u8 Poffin_GetAttribute (Poffin * poffin, PoffinAttributeID attributeID) } } -static void MakePoffinFoul (Poffin * poffin, u8 param1) +static void MakePoffinFoul(Poffin *poffin, u8 param1) { int v0; u8 v1; @@ -102,7 +101,7 @@ static void MakePoffinFoul (Poffin * poffin, u8 param1) poffin->val1_06 = param1; } -int sub_0202A9E4 (Poffin * poffin, u8 * param1, u8 param2, BOOL isFoul) +int sub_0202A9E4(Poffin *poffin, u8 *param1, u8 param2, BOOL isFoul) { int v0, v1 = 0; u8 v2[5]; @@ -162,7 +161,7 @@ int sub_0202A9E4 (Poffin * poffin, u8 * param1, u8 param2, BOOL isFoul) return v4; } -void Poffin_StoreAttributesToArray (Poffin * poffin, u8 * dest) +void Poffin_StoreAttributesToArray(Poffin *poffin, u8 *dest) { dest[0] = poffin->flavor; dest[1] = poffin->spiciness; @@ -173,7 +172,7 @@ void Poffin_StoreAttributesToArray (Poffin * poffin, u8 * dest) dest[6] = poffin->val1_06; } -u8 Poffin_CalcLevel (Poffin * poffin) +u8 Poffin_CalcLevel(Poffin *poffin) { u8 v0 = 0; u8 level = 0; @@ -225,17 +224,17 @@ u8 Poffin_CalcLevel (Poffin * poffin) return level; } -UnkStruct_0202AB28 * Poffin_GetSavedataBlock (SaveData * savedata) +UnkStruct_0202AB28 *Poffin_GetSavedataBlock(SaveData *savedata) { return SaveData_SaveTable(savedata, 16); } -int Poffin_SaveSize (void) +int Poffin_SaveSize(void) { return sizeof(Poffin) * 100; } -void Poffin_Init (UnkStruct_0202AB28 * param0) +void Poffin_Init(UnkStruct_0202AB28 *param0) { int i = 0; @@ -244,7 +243,7 @@ void Poffin_Init (UnkStruct_0202AB28 * param0) } } -u16 sub_0202AB54 (UnkStruct_0202AB28 * param0) +u16 sub_0202AB54(UnkStruct_0202AB28 *param0) { u16 v0; @@ -257,7 +256,7 @@ u16 sub_0202AB54 (UnkStruct_0202AB28 * param0) return 0xFFFF; } -u16 sub_0202AB74 (UnkStruct_0202AB28 * param0, Poffin * param1) +u16 sub_0202AB74(UnkStruct_0202AB28 *param0, Poffin *param1) { u16 v0 = sub_0202AB54(param0); @@ -269,7 +268,7 @@ u16 sub_0202AB74 (UnkStruct_0202AB28 * param0, Poffin * param1) return v0; } -BOOL sub_0202AB98 (UnkStruct_0202AB28 * param0, u16 param1) +BOOL sub_0202AB98(UnkStruct_0202AB28 *param0, u16 param1) { if (param1 >= 100) { return FALSE; @@ -279,7 +278,7 @@ BOOL sub_0202AB98 (UnkStruct_0202AB28 * param0, u16 param1) return TRUE; } -static u16 sub_0202ABB0 (UnkStruct_0202AB28 * param0, u16 param1) +static u16 sub_0202ABB0(UnkStruct_0202AB28 *param0, u16 param1) { u16 v0; @@ -292,7 +291,7 @@ static u16 sub_0202ABB0 (UnkStruct_0202AB28 * param0, u16 param1) return 0xFFFF; } -void sub_0202ABD4 (UnkStruct_0202AB28 * param0) +void sub_0202ABD4(UnkStruct_0202AB28 *param0) { u16 v0, v1, v2; u16 v3, v4, v5; @@ -323,7 +322,7 @@ void sub_0202ABD4 (UnkStruct_0202AB28 * param0) } } -void sub_0202AC54 (UnkStruct_0202AB28 * param0, u16 param1, Poffin * param2) +void sub_0202AC54(UnkStruct_0202AB28 *param0, u16 param1, Poffin *param2) { if (param1 >= 100) { Poffin_clear(param2); @@ -334,9 +333,9 @@ void sub_0202AC54 (UnkStruct_0202AB28 * param0, u16 param1, Poffin * param2) return; } -Poffin * sub_0202AC70 (UnkStruct_0202AB28 * param0, u16 param1, int param2) +Poffin *sub_0202AC70(UnkStruct_0202AB28 *param0, u16 param1, int param2) { - Poffin * v0; + Poffin *v0; v0 = Poffin_malloc(param2); @@ -349,7 +348,7 @@ Poffin * sub_0202AC70 (UnkStruct_0202AB28 * param0, u16 param1, int param2) return v0; } -u16 sub_0202AC98 (UnkStruct_0202AB28 * param0) +u16 sub_0202AC98(UnkStruct_0202AB28 *param0) { u16 v0 = 0, v1; @@ -362,7 +361,7 @@ u16 sub_0202AC98 (UnkStruct_0202AB28 * param0) return v0; } -u16 sub_0202ACC0 (UnkStruct_0202AB28 * param0) +u16 sub_0202ACC0(UnkStruct_0202AB28 *param0) { u16 v0, v1; diff --git a/src/pokemon.c b/src/pokemon.c index 9f6d81ff3f..2ab048ac25 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1,65 +1,64 @@ +#include "constants/pokemon.h" + #include #include -#include "consts/abilities.h" -#include "consts/gender.h" - #include "constants/charcode.h" #include "constants/heap.h" #include "constants/items.h" #include "constants/moves.h" #include "constants/narc.h" -#include "constants/pokemon.h" #include "constants/sound.h" #include "constants/species.h" +#include "consts/abilities.h" +#include "consts/gender.h" -#include "inlines.h" - +#include "struct_decls/pokemon_animation_sys_decl.h" +#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "struct_decls/sprite_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02023790_decl.h" -#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_party_decl.h" - -#include "struct_defs/sprite_animation_frame.h" +#include "struct_defs/archived_poke_sprite_data.h" #include "struct_defs/archived_sprite.h" +#include "struct_defs/chatot_cry.h" +#include "struct_defs/poke_animation_settings.h" +#include "struct_defs/sprite_animation_frame.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0202818C.h" #include "struct_defs/struct_0202CA28.h" -#include "struct_defs/archived_poke_sprite_data.h" -#include "struct_defs/poke_animation_settings.h" #include "struct_defs/struct_02078B40.h" + #include "overlay005/struct_ov5_021DE5D0.h" -#include "struct_defs/sprite_template.h" +#include "flags.h" +#include "heap.h" +#include "inlines.h" +#include "item.h" +#include "message.h" +#include "message_util.h" +#include "move_table.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "rtc.h" +#include "strbuf.h" +#include "trainer_data.h" +#include "trainer_info.h" #include "unk_020021B0.h" #include "unk_02005474.h" #include "unk_02006224.h" -#include "narc.h" -#include "message.h" -#include "message_util.h" #include "unk_0200C6E4.h" -#include "rtc.h" #include "unk_02015F84.h" #include "unk_02017038.h" -#include "heap.h" #include "unk_0201D15C.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "trainer_info.h" #include "unk_02028124.h" #include "unk_0202C9F4.h" -#include "pokemon.h" -#include "move_table.h" -#include "trainer_data.h" -#include "party.h" -#include "item.h" #include "unk_02092494.h" -#include "flags.h" #define FATEFUL_ENCOUNTER_LOCATION 3002 @@ -167,7 +166,7 @@ int Pokemon_StructSize(void) Pokemon *Pokemon_New(u32 heapID) { - Pokemon * mon = Heap_AllocFromHeap(heapID, sizeof(Pokemon)); + Pokemon *mon = Heap_AllocFromHeap(heapID, sizeof(Pokemon)); Pokemon_Init(mon); return mon; } @@ -436,7 +435,7 @@ void Pokemon_CalcStats(Pokemon *mon) int monCurrentHp; int monHpIV, monAtkIV, monDefIV, monSpeedIV, monSpAtkIV, monSpDefIV; int monHpEV, monAtkEV, monDefEV, monSpeedEV, monSpAtkEV, monSpDefEV; - + BOOL reencrypt = Pokemon_EnterDecryptionContext(mon); int monLevel = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL); @@ -456,7 +455,7 @@ void Pokemon_CalcStats(Pokemon *mon) monSpAtkEV = Pokemon_GetValue(mon, MON_DATA_SPATK_EV, NULL); monSpDefIV = Pokemon_GetValue(mon, MON_DATA_SPDEF_IV, NULL); monSpDefEV = Pokemon_GetValue(mon, MON_DATA_SPDEF_EV, NULL); - + int monForm = Pokemon_GetValue(mon, MON_DATA_FORM, NULL); int monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); PokemonPersonalData *monPersonalData = Heap_AllocFromHeap(0, sizeof(PokemonPersonalData)); @@ -630,7 +629,7 @@ static inline u32 GetRibbon(u64 mask, enum PokemonDataParam param, enum PokemonD return (mask & (bit << (param - ribbonStart))) != 0; } -static u32 BoxPokemon_GetDataInternal (BoxPokemon *boxMon, enum PokemonDataParam param, void *dest) +static u32 BoxPokemon_GetDataInternal(BoxPokemon *boxMon, enum PokemonDataParam param, void *dest) { u32 result = 0; @@ -682,7 +681,7 @@ static u32 BoxPokemon_GetDataInternal (BoxPokemon *boxMon, enum PokemonDataParam if (result != SPECIES_NONE && (monDataBlockB->isEgg || boxMon->invalidData)) { result = SPECIES_EGG; } - + break; case MON_DATA_LEVEL: @@ -1071,16 +1070,16 @@ static u32 BoxPokemon_GetDataInternal (BoxPokemon *boxMon, enum PokemonDataParam case MON_DATA_COMBINED_IVS: result = (monDataBlockB->hpIV << 0) - | (monDataBlockB->atkIV << 5) - | (monDataBlockB->defIV << 10) - | (monDataBlockB->speedIV << 15) - | (monDataBlockB->spAtkIV << 20) - | (monDataBlockB->spDefIV << 25); + | (monDataBlockB->atkIV << 5) + | (monDataBlockB->defIV << 10) + | (monDataBlockB->speedIV << 15) + | (monDataBlockB->spAtkIV << 20) + | (monDataBlockB->spDefIV << 25); break; case MON_DATA_NIDORAN_HAS_NICKNAME: if ((monDataBlockA->species == SPECIES_NIDORAN_F || monDataBlockA->species == SPECIES_NIDORAN_M) - && monDataBlockB->hasNickname == FALSE) { + && monDataBlockB->hasNickname == FALSE) { result = FALSE; } else { result = TRUE; @@ -1265,7 +1264,7 @@ static void BoxPokemon_SetDataInternal(BoxPokemon *boxMon, enum PokemonDataParam case MON_DATA_FRIENDSHIP: monDataBlockA->friendship = *u8Value; break; - + case MON_DATA_ABILITY: monDataBlockA->ability = *u8Value; break; @@ -2290,31 +2289,31 @@ u8 Pokemon_GetNatureOf(u32 monPersonality) // TODO enum here? static const s8 sNatureStatAffinities[][5] = { - {0, 0, 0, 0, 0}, - {1, -1, 0, 0, 0}, - {1, 0, -1, 0, 0}, - {1, 0, 0, -1, 0}, - {1, 0, 0, 0, -1}, - {-1, 1, 0, 0, 0}, - {0, 0, 0, 0, 0}, - {0, 1, -1, 0, 0}, - {0, 1, 0, -1, 0}, - {0, 1, 0, 0, -1}, - {-1, 0, 1, 0, 0}, - {0, -1, 1, 0, 0}, - {0, 0, 0, 0, 0}, - {0, 0, 1, -1, 0}, - {0, 0, 1, 0, -1}, - {-1, 0, 0, 1, 0}, - {0, -1, 0, 1, 0}, - {0, 0, -1, 1, 0}, - {0, 0, 0, 0, 0}, - {0, 0, 0, 1, -1}, - {-1, 0, 0, 0, 1}, - {0, -1, 0, 0, 1}, - {0, 0, -1, 0, 1}, - {0, 0, 0, -1, 1}, - {0, 0, 0, 0, 0} + { 0, 0, 0, 0, 0 }, + { 1, -1, 0, 0, 0 }, + { 1, 0, -1, 0, 0 }, + { 1, 0, 0, -1, 0 }, + { 1, 0, 0, 0, -1 }, + { -1, 1, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 1, -1, 0, 0 }, + { 0, 1, 0, -1, 0 }, + { 0, 1, 0, 0, -1 }, + { -1, 0, 1, 0, 0 }, + { 0, -1, 1, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, 1, -1, 0 }, + { 0, 0, 1, 0, -1 }, + { -1, 0, 0, 1, 0 }, + { 0, -1, 0, 1, 0 }, + { 0, 0, -1, 1, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, 0, 1, -1 }, + { -1, 0, 0, 0, 1 }, + { 0, -1, 0, 0, 1 }, + { 0, 0, -1, 0, 1 }, + { 0, 0, 0, -1, 1 }, + { 0, 0, 0, 0, 0 } }; static u16 Pokemon_GetNatureStatValue(u8 monNature, u16 monStatValue, u8 statType) @@ -2347,16 +2346,16 @@ s8 Pokemon_GetStatAffinityOf(u8 monNature, u8 statType) } static const s8 Unk_020F05A0[][3] = { - {5, 3, 2}, // ??? in battle overlay - {5, 3, 2}, // unused? - {1, 1, 0}, // unused? - {3, 2, 1}, // ??? in battle overlay - {1, 1, 0}, // ??? in unk_02084B70.c - {1, 1, 1}, // walking 128 steps - {-1, -1, -1}, // fainting (opponent level difference < 30) - {-5, -5, -10}, // letting poison tick mon to 1HP - {-5, -5, -10}, // fainting (opponent level difference >= 30) - {3, 2, 1} // ??? in unk_020933F8.c + { 5, 3, 2 }, // ??? in battle overlay + { 5, 3, 2 }, // unused? + { 1, 1, 0 }, // unused? + { 3, 2, 1 }, // ??? in battle overlay + { 1, 1, 0 }, // ??? in unk_02084B70.c + { 1, 1, 1 }, // walking 128 steps + { -1, -1, -1 }, // fainting (opponent level difference < 30) + { -5, -5, -10 }, // letting poison tick mon to 1HP + { -5, -5, -10 }, // fainting (opponent level difference >= 30) + { 3, 2, 1 } // ??? in unk_020933F8.c }; void Pokemon_UpdateFriendship(Pokemon *mon, u8 param1, u16 param2) @@ -2443,7 +2442,7 @@ u8 Pokemon_GetGenderOf(u16 monSpecies, u32 monPersonality) } u8 PokemonPersonalData_GetGenderOf(PokemonPersonalData *monPersonalData, u16 unused_monSpecies, u32 monPersonality) -{ +{ u8 monGender = PokemonPersonalData_GetValue(monPersonalData, MON_DATA_PERSONAL_GENDER); switch (monGender) { @@ -2477,7 +2476,8 @@ static u8 BoxPokemon_IsShiny(BoxPokemon *boxMon) return Pokemon_IsPersonalityShiny(monOTID, monPersonality); } -static inline BOOL Pokemon_InlineIsPersonalityShiny(u32 monOTID, u32 monPersonality) { +static inline BOOL Pokemon_InlineIsPersonalityShiny(u32 monOTID, u32 monPersonality) +{ return (((monOTID & 0xFFFF0000) >> 16) ^ (monOTID & 0xFFFF) ^ ((monPersonality & 0xFFFF0000) >> 16) ^ (monPersonality & 0xFFFF)) < 8; } @@ -2602,7 +2602,7 @@ void BuildArchivedPokemonSprite(ArchivedSprite *sprite, u16 species, u8 gender, sprite->character = 96 + (face / 2) + form * 2; sprite->palette = 190 + shiny + form * 2; break; - + case SPECIES_CASTFORM: sprite->archive = NARC_INDEX_POKETOOL__POKEGRA__PL_OTHERPOKE; sprite->character = 64 + (face * 2) + form; @@ -2742,13 +2742,13 @@ u8 Pokemon_SanitizeFormId(u16 monSpecies, u8 monForm) /** * @brief Build an ArchivedSprite for a Pokemon sprite, preferring sprites from * Diamond/Pearl over Platinum. - * + * * This routine will still use sprites from Platinum for Pokemon variants which * did not exist in Diamond/Pearl, namely: * - Giratina-Origin * - Shaymin-Sky * - Rotom appliances - * + * * @param sprite Pointer to the sprite structure to be populated * @param species The Pokemon's species * @param gender The Pokemon's gender @@ -3000,7 +3000,7 @@ u8 LoadPokemonSpriteYOffset(u16 species, u8 gender, u8 face, u8 form, u32 person break; } - u8 result; + u8 result; NARC_ReadWholeMemberByIndexPair(&result, narcIndex, memberIndex); return result; } @@ -3127,7 +3127,7 @@ static const SpriteTemplate Unk_020F05E4 = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x4E2F, 0x4E2A, 0x4E27, 0x4E27, 0xffffffff, 0xffffffff}, + { 0x4E2F, 0x4E2A, 0x4E27, 0x4E27, 0xffffffff, 0xffffffff }, 0x2, 0x1 }; @@ -3262,7 +3262,7 @@ BOOL Pokemon_ShouldLevelUp(Pokemon *mon) u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int *evoTypeResult) { u16 targetSpecies = SPECIES_NONE; - + u16 monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL); u16 monHeldItem = Pokemon_GetValue(mon, MON_DATA_HELD_ITEM, NULL); u32 monPersonality = Pokemon_GetValue(mon, MON_DATA_PERSONALITY, NULL); @@ -3270,7 +3270,7 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * int i; u16 monFriendship; - + u16 monPersonalityUpper = (monPersonality & 0xffff0000) >> 16; u8 itemHoldEffect = Item_LoadParam(monHeldItem, ITEM_PARAM_HOLD_EFFECT, 0); @@ -3296,31 +3296,31 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * for (i = 0; i < 7; i++) { switch (monEvolutionData->methods[i].type) { - case 1: // high friendship + case 1: // high friendship if (220 <= monFriendship) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 1; } break; - case 2: // high friendship && daytime + case 2: // high friendship && daytime if (IsNight() == 0 && 220 <= monFriendship) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 2; } break; - case 3: // high friendship && nighttime + case 3: // high friendship && nighttime if (IsNight() == 1 && 220 <= monFriendship) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 3; } break; - case 4: // above level param + case 4: // above level param if (monEvolutionData->methods[i].param <= monLevel) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 4; } break; - case 8: // tyrogue evo to hitmonlee: above level param && attack > defense + case 8: // tyrogue evo to hitmonlee: above level param && attack > defense if (monEvolutionData->methods[i].param <= monLevel) { if (Pokemon_GetValue(mon, MON_DATA_ATK, NULL) > Pokemon_GetValue(mon, MON_DATA_DEF, NULL)) { targetSpecies = monEvolutionData->methods[i].targetSpecies; @@ -3328,7 +3328,7 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * } } break; - case 9: // tyrogue evo to hitmontop: above level param && attack == defense + case 9: // tyrogue evo to hitmontop: above level param && attack == defense if (monEvolutionData->methods[i].param <= monLevel) { if (Pokemon_GetValue(mon, MON_DATA_ATK, NULL) == Pokemon_GetValue(mon, MON_DATA_DEF, NULL)) { targetSpecies = monEvolutionData->methods[i].targetSpecies; @@ -3336,7 +3336,7 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * } } break; - case 10: // tyrogue evo to hitmonchan: above level param && attack < defense + case 10: // tyrogue evo to hitmonchan: above level param && attack < defense if (monEvolutionData->methods[i].param <= monLevel) { if (Pokemon_GetValue(mon, MON_DATA_ATK, NULL) < Pokemon_GetValue(mon, MON_DATA_DEF, NULL)) { targetSpecies = monEvolutionData->methods[i].targetSpecies; @@ -3344,7 +3344,7 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * } } break; - case 11: // wurmple evo to silcoon: above level param && upper16 of personality % 10 < 5 + case 11: // wurmple evo to silcoon: above level param && upper16 of personality % 10 < 5 if (monEvolutionData->methods[i].param <= monLevel) { if (monPersonalityUpper % 10 < 5) { targetSpecies = monEvolutionData->methods[i].targetSpecies; @@ -3352,7 +3352,7 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * } } break; - case 12: // wurmple evo to cascoon: above level param && upper16 of personality % 10 >= 5 + case 12: // wurmple evo to cascoon: above level param && upper16 of personality % 10 >= 5 if (monEvolutionData->methods[i].param <= monLevel) { if (monPersonalityUpper % 10 >= 5) { targetSpecies = monEvolutionData->methods[i].targetSpecies; @@ -3360,40 +3360,40 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * } } break; - case 13: // nincada evo to ninjask: above level param + case 13: // nincada evo to ninjask: above level param if (monEvolutionData->methods[i].param <= monLevel) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 13; } break; - case 14: // nincada evo to shedinja: ??? + case 14: // nincada evo to shedinja: ??? evoTypeResult[0] = 14; break; - case 15: // feebas evo: beauty > param + case 15: // feebas evo: beauty > param if (monEvolutionData->methods[i].param <= monBeauty) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 15; } break; - case 18: // happiny evo: hold param && daytime + case 18: // happiny evo: hold param && daytime if (IsNight() == 0 && monEvolutionData->methods[i].param == monHeldItem) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 18; } break; - case 19: // sneasel and gligar evo: hold param && nighttime + case 19: // sneasel and gligar evo: hold param && nighttime if (IsNight() == 1 && monEvolutionData->methods[i].param == monHeldItem) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 19; } break; - case 20: // lickitung, tangela etc. evo: after param learned + case 20: // lickitung, tangela etc. evo: after param learned if (Pokemon_HasMove(mon, monEvolutionData->methods[i].param) == 1) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 20; } break; - case 21: // mantyke evo: have param in party + case 21: // mantyke evo: have param in party if (party != NULL) { if (Party_HasSpecies(party, monEvolutionData->methods[i].param) == 1) { targetSpecies = monEvolutionData->methods[i].targetSpecies; @@ -3401,31 +3401,31 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * } } break; - case 22: // burmy evo to mothim: above level param && male + case 22: // burmy evo to mothim: above level param && male if (Pokemon_GetValue(mon, MON_DATA_GENDER, NULL) == 0 && monEvolutionData->methods[i].param <= monLevel) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 22; } break; - case 23: // burmy evo to wormadam, combee evo to vespiquen: above level param && female + case 23: // burmy evo to wormadam, combee evo to vespiquen: above level param && female if (Pokemon_GetValue(mon, MON_DATA_GENDER, NULL) == 1 && monEvolutionData->methods[i].param <= monLevel) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 23; } break; - case 24: // magneton and nosepass evo: custom check + case 24: // magneton and nosepass evo: custom check if (monEvolutionData->methods[i].type == evoParam) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 24; } break; - case 25: // eevee evo to leafeon: custom check + case 25: // eevee evo to leafeon: custom check if (monEvolutionData->methods[i].type == evoParam) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 25; } break; - case 26: // eevee evo to glaceon: custom check + case 26: // eevee evo to glaceon: custom check if (monEvolutionData->methods[i].type == evoParam) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 26; @@ -3441,11 +3441,11 @@ u16 sub_02076B94(Party *party, Pokemon *mon, u8 evoTypeList, u16 evoParam, int * case 1: for (i = 0; i < 7; i++) { switch (monEvolutionData->methods[i].type) { - case 5: // kadabra etc. evo: trade + case 5: // kadabra etc. evo: trade targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 5; break; - case 6: // poliwhirl evo to politoed etc.: trade holding param + case 6: // poliwhirl evo to politoed etc.: trade holding param if (monEvolutionData->methods[i].param == monHeldItem) { targetSpecies = monEvolutionData->methods[i].targetSpecies; evoTypeResult[0] = 6; @@ -3532,7 +3532,7 @@ static void BoxPokemon_SetDefaultMoves(BoxPokemon *boxMon) u16 *monLevelUpMoves = Heap_AllocFromHeap(0, 44); reencrypt = BoxPokemon_EnterDecryptionContext(boxMon); - + u16 monSpecies = BoxPokemon_GetValue(boxMon, MON_DATA_SPECIES, 0); int monForm = BoxPokemon_GetValue(boxMon, MON_DATA_FORM, 0); u8 monLevel = BoxPokemon_GetLevel(boxMon); @@ -3593,7 +3593,7 @@ static u16 BoxPokemon_AddMove(BoxPokemon *boxMon, u16 moveID) return result; } -void Pokemon_ReplaceMove (Pokemon *mon, u16 moveID) +void Pokemon_ReplaceMove(Pokemon *mon, u16 moveID) { BoxPokemon *boxMon = Pokemon_GetBoxPokemon(mon); BoxPokemon_ReplaceMove(boxMon, moveID); @@ -3602,7 +3602,7 @@ void Pokemon_ReplaceMove (Pokemon *mon, u16 moveID) static void BoxPokemon_ReplaceMove(BoxPokemon *boxMon, u16 moveID) { BOOL reencrypt = BoxPokemon_EnterDecryptionContext(boxMon); - + u16 moveIDs[4]; u8 movePPs[4]; u8 movePPUps[4]; @@ -3954,7 +3954,7 @@ void Party_UpdatePokerusStatus(Party *party, s32 param1) for (int i = 0; i < currentPartyCount; i++) { Pokemon *mon = Party_GetPokemonBySlotIndex(party, i); - + if (Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL)) { u8 monPokerus = Pokemon_GetValue(mon, MON_DATA_POKERUS, NULL); @@ -4201,13 +4201,13 @@ BOOL Pokemon_CanShayminSkyForm(Pokemon *mon) RTCTime rtcTime; GetCurrentTime(&rtcTime); - return (monSpecies == SPECIES_SHAYMIN - && monForm == 0 - && monCurrentHP > 0 - && monFatefulEncounter == TRUE - && (v2 & 0x20) == 0 - && rtcTime.hour >= 4 - && rtcTime.hour < 20); + return monSpecies == SPECIES_SHAYMIN + && monForm == 0 + && monCurrentHP > 0 + && monFatefulEncounter == TRUE + && (v2 & 0x20) == 0 + && rtcTime.hour >= 4 + && rtcTime.hour < 20; } void Party_SetShayminLandForm(Party *party) @@ -4354,7 +4354,7 @@ void Pokemon_PlayCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 specie return; } - + Sound_PlayPokemonCry(crymod, species, pan, volume, heapID, form); } @@ -4374,7 +4374,7 @@ void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 return; } - + Sound_PlayDelayedPokemonCry(crymod, species, pan, volume, heapID, delay, form); } @@ -4418,8 +4418,8 @@ static void PostCaptureBoxPokemonProcessing(BoxPokemon *boxMon, TrainerInfo *par } static const u16 sHeldItemChance[][2] = { - {45, 95}, - {20, 80} + { 45, 95 }, + { 20, 80 } }; void Pokemon_GiveHeldItem(Pokemon *mon, u32 param1, int param2) @@ -4587,26 +4587,25 @@ static u16 Pokemon_GetDataChecksum(void *data, u32 bytes) return checksum; } -#define DATA_BLOCK_SHUFFLE_CASE(v1, v2, v3, v4) \ -{ \ - PokemonDataBlock *dataBlocks = boxMon->dataBlocks; \ - switch (dataBlockID) \ - { \ - case DATA_BLOCK_A: \ - result = &dataBlocks[v1]; \ - break; \ - case DATA_BLOCK_B: \ - result = &dataBlocks[v2]; \ - break; \ - case DATA_BLOCK_C: \ - result = &dataBlocks[v3]; \ - break; \ - case DATA_BLOCK_D: \ - result = &dataBlocks[v4]; \ - break; \ - } \ - break; \ -} +#define DATA_BLOCK_SHUFFLE_CASE(v1, v2, v3, v4) \ + { \ + PokemonDataBlock *dataBlocks = boxMon->dataBlocks; \ + switch (dataBlockID) { \ + case DATA_BLOCK_A: \ + result = &dataBlocks[v1]; \ + break; \ + case DATA_BLOCK_B: \ + result = &dataBlocks[v2]; \ + break; \ + case DATA_BLOCK_C: \ + result = &dataBlocks[v3]; \ + break; \ + case DATA_BLOCK_D: \ + result = &dataBlocks[v4]; \ + break; \ + } \ + break; \ + } static void *BoxPokemon_GetDataBlock(BoxPokemon *boxMon, u32 personality, enum PokemonDataBlockID dataBlockID) { @@ -4617,60 +4616,60 @@ static void *BoxPokemon_GetDataBlock(BoxPokemon *boxMon, u32 personality, enum P switch (personality) { case 0: case 24: - DATA_BLOCK_SHUFFLE_CASE(0,1,2,3) + DATA_BLOCK_SHUFFLE_CASE(0, 1, 2, 3) case 1: case 25: - DATA_BLOCK_SHUFFLE_CASE(0,1,3,2) + DATA_BLOCK_SHUFFLE_CASE(0, 1, 3, 2) case 2: case 26: - DATA_BLOCK_SHUFFLE_CASE(0,2,1,3) - case 3: + DATA_BLOCK_SHUFFLE_CASE(0, 2, 1, 3) + case 3: case 27: - DATA_BLOCK_SHUFFLE_CASE(0,3,1,2) - case 4: + DATA_BLOCK_SHUFFLE_CASE(0, 3, 1, 2) + case 4: case 28: - DATA_BLOCK_SHUFFLE_CASE(0,2,3,1) - case 5: + DATA_BLOCK_SHUFFLE_CASE(0, 2, 3, 1) + case 5: case 29: - DATA_BLOCK_SHUFFLE_CASE(0,3,2,1) - case 6: + DATA_BLOCK_SHUFFLE_CASE(0, 3, 2, 1) + case 6: case 30: - DATA_BLOCK_SHUFFLE_CASE(1,0,2,3) - case 7: + DATA_BLOCK_SHUFFLE_CASE(1, 0, 2, 3) + case 7: case 31: - DATA_BLOCK_SHUFFLE_CASE(1,0,3,2) - case 8: - DATA_BLOCK_SHUFFLE_CASE(2,0,1,3) - case 9: - DATA_BLOCK_SHUFFLE_CASE(3,0,1,2) + DATA_BLOCK_SHUFFLE_CASE(1, 0, 3, 2) + case 8: + DATA_BLOCK_SHUFFLE_CASE(2, 0, 1, 3) + case 9: + DATA_BLOCK_SHUFFLE_CASE(3, 0, 1, 2) case 10: - DATA_BLOCK_SHUFFLE_CASE(2,0,3,1) + DATA_BLOCK_SHUFFLE_CASE(2, 0, 3, 1) case 11: - DATA_BLOCK_SHUFFLE_CASE(3,0,2,1) + DATA_BLOCK_SHUFFLE_CASE(3, 0, 2, 1) case 12: - DATA_BLOCK_SHUFFLE_CASE(1,2,0,3) + DATA_BLOCK_SHUFFLE_CASE(1, 2, 0, 3) case 13: - DATA_BLOCK_SHUFFLE_CASE(1,3,0,2) + DATA_BLOCK_SHUFFLE_CASE(1, 3, 0, 2) case 14: - DATA_BLOCK_SHUFFLE_CASE(2,1,0,3) + DATA_BLOCK_SHUFFLE_CASE(2, 1, 0, 3) case 15: - DATA_BLOCK_SHUFFLE_CASE(3,1,0,2) + DATA_BLOCK_SHUFFLE_CASE(3, 1, 0, 2) case 16: - DATA_BLOCK_SHUFFLE_CASE(2,3,0,1) + DATA_BLOCK_SHUFFLE_CASE(2, 3, 0, 1) case 17: - DATA_BLOCK_SHUFFLE_CASE(3,2,0,1) + DATA_BLOCK_SHUFFLE_CASE(3, 2, 0, 1) case 18: - DATA_BLOCK_SHUFFLE_CASE(1,2,3,0) + DATA_BLOCK_SHUFFLE_CASE(1, 2, 3, 0) case 19: - DATA_BLOCK_SHUFFLE_CASE(1,3,2,0) + DATA_BLOCK_SHUFFLE_CASE(1, 3, 2, 0) case 20: - DATA_BLOCK_SHUFFLE_CASE(2,1,3,0) + DATA_BLOCK_SHUFFLE_CASE(2, 1, 3, 0) case 21: - DATA_BLOCK_SHUFFLE_CASE(3,1,2,0) + DATA_BLOCK_SHUFFLE_CASE(3, 1, 2, 0) case 22: - DATA_BLOCK_SHUFFLE_CASE(2,3,1,0) + DATA_BLOCK_SHUFFLE_CASE(2, 3, 1, 0) case 23: - DATA_BLOCK_SHUFFLE_CASE(3,2,1,0) + DATA_BLOCK_SHUFFLE_CASE(3, 2, 1, 0) } return result; diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 678f51460b..6243c1ab74 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1,13 +1,14 @@ +#include "pokemon_icon.h" + #include #include #include "constants/pokemon.h" -#include "pokemon.h" -#include "pokemon_icon.h" - #include "data/pokeicon_palettes.h" +#include "pokemon.h" + enum { POKEICON_SHARED_PALETTES = 0, POKEICON_SHARED_ANIMATION, diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c index e44cd0e69f..5867572d4c 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_app.c @@ -1,56 +1,53 @@ +#include "struct_defs/pokemon_summary_app.h" + #include #include -#include "core_sys.h" - #include "constants/pokemon.h" #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "savedata.h" - -#include "constdata/const_020F410C.h" - -#include "struct_defs/pokemon_summary_app.h" #include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02099F80.h" + #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "move_table.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "trainer_info.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006224.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "game_options.h" #include "unk_020393C8.h" -#include "vars_flags.h" #include "unk_0206A8DC.h" -#include "pokemon.h" -#include "move_table.h" -#include "party.h" -#include "item.h" #include "unk_0208C098.h" -#include "pokemon_summary_app.h" #include "unk_0208EA44.h" #include "unk_0208FCF8.h" #include "unk_020916B4.h" @@ -58,73 +55,76 @@ #include "unk_020923C0.h" #include "unk_02094EDC.h" #include "unk_020989DC.h" +#include "vars_flags.h" + +#include "constdata/const_020F410C.h" -static int sub_0208C330(OverlayManager * param0, int * param1); -static int sub_0208C488(OverlayManager * param0, int * param1); -static int sub_0208C5A0(OverlayManager * param0, int * param1); -static int sub_0208C9C8(PokemonSummaryApp * param0); -static int sub_0208CA00(PokemonSummaryApp * param0); -static int sub_0208CB38(PokemonSummaryApp * param0); -static int sub_0208CB4C(PokemonSummaryApp * param0); -static int sub_0208CB60(PokemonSummaryApp * param0); -static int sub_0208CB74(PokemonSummaryApp * param0); -static int sub_0208CB88(PokemonSummaryApp * param0); -static int sub_0208CC6C(PokemonSummaryApp * param0); -static int sub_0208CD44(PokemonSummaryApp * param0); -static int sub_0208CE54(PokemonSummaryApp * param0); -static int sub_0208CE70(PokemonSummaryApp * param0); -static int sub_0208CE84(PokemonSummaryApp * param0); -static int sub_0208CE98(PokemonSummaryApp * param0); -static int sub_0208CF0C(PokemonSummaryApp * param0); -static int sub_0208CF78(PokemonSummaryApp * param0); -static int sub_0208D114(PokemonSummaryApp * param0); -static int sub_0208D164(PokemonSummaryApp * param0); -static u8 sub_0208D17C(PokemonSummaryApp * param0); -static u8 sub_0208D18C(PokemonSummaryApp * param0); +static int sub_0208C330(OverlayManager *param0, int *param1); +static int sub_0208C488(OverlayManager *param0, int *param1); +static int sub_0208C5A0(OverlayManager *param0, int *param1); +static int sub_0208C9C8(PokemonSummaryApp *param0); +static int sub_0208CA00(PokemonSummaryApp *param0); +static int sub_0208CB38(PokemonSummaryApp *param0); +static int sub_0208CB4C(PokemonSummaryApp *param0); +static int sub_0208CB60(PokemonSummaryApp *param0); +static int sub_0208CB74(PokemonSummaryApp *param0); +static int sub_0208CB88(PokemonSummaryApp *param0); +static int sub_0208CC6C(PokemonSummaryApp *param0); +static int sub_0208CD44(PokemonSummaryApp *param0); +static int sub_0208CE54(PokemonSummaryApp *param0); +static int sub_0208CE70(PokemonSummaryApp *param0); +static int sub_0208CE84(PokemonSummaryApp *param0); +static int sub_0208CE98(PokemonSummaryApp *param0); +static int sub_0208CF0C(PokemonSummaryApp *param0); +static int sub_0208CF78(PokemonSummaryApp *param0); +static int sub_0208D114(PokemonSummaryApp *param0); +static int sub_0208D164(PokemonSummaryApp *param0); +static u8 sub_0208D17C(PokemonSummaryApp *param0); +static u8 sub_0208D18C(PokemonSummaryApp *param0); static void sub_0208C638(void); -static void sub_0208C658(BGL * param0); -static void sub_0208C76C(BGL * param0); -static void sub_0208C7AC(PokemonSummaryApp * param0, NARC * param1); +static void sub_0208C658(BGL *param0); +static void sub_0208C76C(BGL *param0); +static void sub_0208C7AC(PokemonSummaryApp *param0, NARC *param1); static void sub_0208C86C(void); -static void sub_0208C604(void * param0); -static void sub_0208C884(PokemonSummaryApp * param0); -static void sub_0208C950(PokemonSummaryApp * param0); -static void sub_0208D1A4(PokemonSummaryApp * param0); -static void sub_0208D1D4(PokemonSummaryApp * param0, BoxPokemon * param1, PokemonSummaryAppData * param2); -static void sub_0208D200(PokemonSummaryApp * param0, Pokemon * param1, PokemonSummaryAppData * param2); -static void sub_0208D678(PokemonSummaryApp * param0); -static void sub_0208D618(PokemonSummaryApp * param0); -static void sub_0208D7EC(PokemonSummaryApp * param0, u8 param1); -static void sub_0208D898(PokemonSummaryApp * param0, s8 param1); -static u8 sub_0208D920(PokemonSummaryApp * param0); -static void sub_0208D748(PokemonSummaryApp * param0); -static void sub_0208D948(PokemonSummaryApp * param0); -static void sub_0208D9D0(PokemonSummaryApp * param0); -static void sub_0208DA84(PokemonSummaryApp * param0); -static void sub_0208DB10(PokemonSummaryApp * param0, s8 param1); -static s8 sub_0208DBC4(PokemonSummaryApp * param0, s8 param1); -static s8 sub_0208DC1C(PokemonSummaryApp * param0, s8 param1); -static s8 sub_0208DC84(PokemonSummaryApp * param0, s8 param1); -static s8 sub_0208DCE0(PokemonSummaryApp * param0, s8 param1); -static u8 sub_0208DD8C(PokemonSummaryApp * param0); -static u8 sub_0208DEA4(PokemonSummaryApp * param0); -static u8 sub_0208DF94(PokemonSummaryApp * param0, s8 param1); -static void sub_0208DFF4(PokemonSummaryApp * param0); -static void sub_0208E0DC(PokemonSummaryApp * param0); -static void sub_0208E190(PokemonSummaryApp * param0); -static void sub_0208E07C(PokemonSummaryApp * param0, u32 param1); -static void sub_0208E0B8(PokemonSummaryApp * param0, u32 param1); -static void sub_0208E4EC(PokemonSummaryApp * param0); -static void sub_0208E508(PokemonSummaryApp * param0); -static u8 sub_0208E208(PokemonSummaryApp * param0); -static u8 sub_0208E308(PokemonSummaryApp * param0); -static void sub_0208E498(PokemonSummaryApp * param0, u32 param1); -static void sub_0208E46C(PokemonSummaryApp * param0); -static u8 sub_0208E57C(PokemonSummaryApp * param0); -static u8 sub_0208E6A8(PokemonSummaryApp * param0); -static void sub_0208E794(PokemonSummaryApp * param0, s8 param1); -u8 PokemonSummary_RibbonAt(PokemonSummaryApp * param0, u8 param1); -static int sub_0208E958(PokemonSummaryApp * param0); +static void sub_0208C604(void *param0); +static void sub_0208C884(PokemonSummaryApp *param0); +static void sub_0208C950(PokemonSummaryApp *param0); +static void sub_0208D1A4(PokemonSummaryApp *param0); +static void sub_0208D1D4(PokemonSummaryApp *param0, BoxPokemon *param1, PokemonSummaryAppData *param2); +static void sub_0208D200(PokemonSummaryApp *param0, Pokemon *param1, PokemonSummaryAppData *param2); +static void sub_0208D678(PokemonSummaryApp *param0); +static void sub_0208D618(PokemonSummaryApp *param0); +static void sub_0208D7EC(PokemonSummaryApp *param0, u8 param1); +static void sub_0208D898(PokemonSummaryApp *param0, s8 param1); +static u8 sub_0208D920(PokemonSummaryApp *param0); +static void sub_0208D748(PokemonSummaryApp *param0); +static void sub_0208D948(PokemonSummaryApp *param0); +static void sub_0208D9D0(PokemonSummaryApp *param0); +static void sub_0208DA84(PokemonSummaryApp *param0); +static void sub_0208DB10(PokemonSummaryApp *param0, s8 param1); +static s8 sub_0208DBC4(PokemonSummaryApp *param0, s8 param1); +static s8 sub_0208DC1C(PokemonSummaryApp *param0, s8 param1); +static s8 sub_0208DC84(PokemonSummaryApp *param0, s8 param1); +static s8 sub_0208DCE0(PokemonSummaryApp *param0, s8 param1); +static u8 sub_0208DD8C(PokemonSummaryApp *param0); +static u8 sub_0208DEA4(PokemonSummaryApp *param0); +static u8 sub_0208DF94(PokemonSummaryApp *param0, s8 param1); +static void sub_0208DFF4(PokemonSummaryApp *param0); +static void sub_0208E0DC(PokemonSummaryApp *param0); +static void sub_0208E190(PokemonSummaryApp *param0); +static void sub_0208E07C(PokemonSummaryApp *param0, u32 param1); +static void sub_0208E0B8(PokemonSummaryApp *param0, u32 param1); +static void sub_0208E4EC(PokemonSummaryApp *param0); +static void sub_0208E508(PokemonSummaryApp *param0); +static u8 sub_0208E208(PokemonSummaryApp *param0); +static u8 sub_0208E308(PokemonSummaryApp *param0); +static void sub_0208E498(PokemonSummaryApp *param0, u32 param1); +static void sub_0208E46C(PokemonSummaryApp *param0); +static u8 sub_0208E57C(PokemonSummaryApp *param0); +static u8 sub_0208E6A8(PokemonSummaryApp *param0); +static void sub_0208E794(PokemonSummaryApp *param0, s8 param1); +u8 PokemonSummary_RibbonAt(PokemonSummaryApp *param0, u8 param1); +static int sub_0208E958(PokemonSummaryApp *param0); const OverlayManagerTemplate Unk_020F410C = { sub_0208C330, @@ -133,15 +133,15 @@ const OverlayManagerTemplate Unk_020F410C = { 0xFFFFFFFF }; -BOOL PokemonSummary_ShowContestData(SaveData * param0) +BOOL PokemonSummary_ShowContestData(SaveData *param0) { return ContestHall_IsVisited(SaveData_GetVarsFlags(param0)); } -static int sub_0208C330 (OverlayManager * param0, int * param1) +static int sub_0208C330(OverlayManager *param0, int *param1) { - PokemonSummaryApp * v0; - NARC * v1; + PokemonSummaryApp *v0; + NARC *v1; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -197,9 +197,9 @@ static int sub_0208C330 (OverlayManager * param0, int * param1) return 1; } -static int sub_0208C488 (OverlayManager * param0, int * param1) +static int sub_0208C488(OverlayManager *param0, int *param1) { - PokemonSummaryApp * v0 = OverlayManager_Data(param0); + PokemonSummaryApp *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -276,9 +276,9 @@ static int sub_0208C488 (OverlayManager * param0, int * param1) return 0; } -static int sub_0208C5A0 (OverlayManager * param0, int * param1) +static int sub_0208C5A0(OverlayManager *param0, int *param1) { - PokemonSummaryApp * v0 = OverlayManager_Data(param0); + PokemonSummaryApp *v0 = OverlayManager_Data(param0); SetMainCallback(NULL, NULL); sub_020917B0(v0); @@ -299,9 +299,9 @@ static int sub_0208C5A0 (OverlayManager * param0, int * param1) return 1; } -static void sub_0208C604 (void * param0) +static void sub_0208C604(void *param0) { - PokemonSummaryApp * v0 = param0; + PokemonSummaryApp *v0 = param0; sub_0201C2B8(v0->bgl); sub_02008A94(v0->monSpriteData.spriteManager); @@ -311,7 +311,7 @@ static void sub_0208C604 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void sub_0208C638 (void) +static void sub_0208C638(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -329,7 +329,7 @@ static void sub_0208C638 (void) GXLayers_SetBanks(&v0); } -static void sub_0208C658 (BGL * param0) +static void sub_0208C658(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -449,7 +449,7 @@ static void sub_0208C658 (BGL * param0) sub_02019690(4, 32, 0, 19); } -static void sub_0208C76C (BGL * param0) +static void sub_0208C76C(BGL *param0) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -463,7 +463,7 @@ static void sub_0208C76C (BGL * param0) Heap_FreeToHeapExplicit(19, param0); } -static void sub_0208C7AC (PokemonSummaryApp * param0, NARC * param1) +static void sub_0208C7AC(PokemonSummaryApp *param0, NARC *param1) { sub_020070E8(param1, 0, param0->bgl, 3, 0, 0, 0, 19); sub_0200710C(param1, 3, param0->bgl, 3, 0, 0, 0, 19); @@ -477,12 +477,12 @@ static void sub_0208C7AC (PokemonSummaryApp * param0, NARC * param1) sub_02007130(param1, 14, 4, 0, 0, 19); } -static void sub_0208C86C (void) +static void sub_0208C86C(void) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ, 23, 8); } -static void sub_0208C884 (PokemonSummaryApp * param0) +static void sub_0208C884(PokemonSummaryApp *param0) { param0->msgLoader = MessageLoader_Init(0, 26, 455, 19); param0->ribbonLoader = MessageLoader_Init(1, 26, 535, 19); @@ -500,7 +500,7 @@ static void sub_0208C884 (PokemonSummaryApp * param0) } } -static void sub_0208C950 (PokemonSummaryApp * param0) +static void sub_0208C950(PokemonSummaryApp *param0) { MessageLoader_Free(param0->moveNameLoader); MessageLoader_Free(param0->ribbonLoader); @@ -514,7 +514,7 @@ static void sub_0208C950 (PokemonSummaryApp * param0) Strbuf_Free(param0->playerName); } -static int sub_0208C9C8 (PokemonSummaryApp * param0) +static int sub_0208C9C8(PokemonSummaryApp *param0) { if (ScreenWipe_Done() == 1) { sub_02092028(param0); @@ -532,7 +532,7 @@ static int sub_0208C9C8 (PokemonSummaryApp * param0) return 1; } -static int sub_0208CA00 (PokemonSummaryApp * param0) +static int sub_0208CA00(PokemonSummaryApp *param0) { if (param0->subscreenExit == 1) { param0->data->returnMode = 1; @@ -600,7 +600,7 @@ static int sub_0208CA00 (PokemonSummaryApp * param0) return 2; } -static int sub_0208CB38 (PokemonSummaryApp * param0) +static int sub_0208CB38(PokemonSummaryApp *param0) { if (sub_0208DD8C(param0) == 1) { return 7; @@ -609,7 +609,7 @@ static int sub_0208CB38 (PokemonSummaryApp * param0) return 3; } -static int sub_0208CB4C (PokemonSummaryApp * param0) +static int sub_0208CB4C(PokemonSummaryApp *param0) { if (sub_0208DEA4(param0) == 1) { return 2; @@ -618,7 +618,7 @@ static int sub_0208CB4C (PokemonSummaryApp * param0) return 4; } -static int sub_0208CB60 (PokemonSummaryApp * param0) +static int sub_0208CB60(PokemonSummaryApp *param0) { if (sub_0208E208(param0) == 1) { return 7; @@ -627,7 +627,7 @@ static int sub_0208CB60 (PokemonSummaryApp * param0) return 5; } -static int sub_0208CB74 (PokemonSummaryApp * param0) +static int sub_0208CB74(PokemonSummaryApp *param0) { if (sub_0208E308(param0) == 1) { return 2; @@ -636,7 +636,7 @@ static int sub_0208CB74 (PokemonSummaryApp * param0) return 6; } -static int sub_0208CB88 (PokemonSummaryApp * param0) +static int sub_0208CB88(PokemonSummaryApp *param0) { if (gCoreSys.pressedKeys & PAD_KEY_UP) { if (sub_0208DF94(param0, -1) == 1) { @@ -688,7 +688,7 @@ static int sub_0208CB88 (PokemonSummaryApp * param0) return 7; } -static int sub_0208CC6C (PokemonSummaryApp * param0) +static int sub_0208CC6C(PokemonSummaryApp *param0) { if (gCoreSys.pressedKeys & PAD_KEY_UP) { if (sub_0208DF94(param0, -1) == 1) { @@ -733,7 +733,7 @@ static int sub_0208CC6C (PokemonSummaryApp * param0) return 8; } -static int sub_0208CD44 (PokemonSummaryApp * param0) +static int sub_0208CD44(PokemonSummaryApp *param0) { if (gCoreSys.pressedKeys & PAD_KEY_LEFT) { sub_0208D898(param0, -1); @@ -790,7 +790,7 @@ static int sub_0208CD44 (PokemonSummaryApp * param0) return 9; } -static int sub_0208CE54 (PokemonSummaryApp * param0) +static int sub_0208CE54(PokemonSummaryApp *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { sub_0208DFF4(param0); @@ -800,7 +800,7 @@ static int sub_0208CE54 (PokemonSummaryApp * param0) return 10; } -static int sub_0208CE70 (PokemonSummaryApp * param0) +static int sub_0208CE70(PokemonSummaryApp *param0) { if (sub_0208E57C(param0) == 1) { return 13; @@ -809,7 +809,7 @@ static int sub_0208CE70 (PokemonSummaryApp * param0) return 11; } -static int sub_0208CE84 (PokemonSummaryApp * param0) +static int sub_0208CE84(PokemonSummaryApp *param0) { if (sub_0208E6A8(param0) == 1) { return 2; @@ -818,7 +818,7 @@ static int sub_0208CE84 (PokemonSummaryApp * param0) return 12; } -static int sub_0208CE98 (PokemonSummaryApp * param0) +static int sub_0208CE98(PokemonSummaryApp *param0) { if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) { sub_0208E794(param0, -1); @@ -849,7 +849,7 @@ static int sub_0208CE98 (PokemonSummaryApp * param0) return 13; } -static int sub_0208CF0C (PokemonSummaryApp * param0) +static int sub_0208CF0C(PokemonSummaryApp *param0) { if (sub_0209228C(param0) == 1) { return param0->subscreen; @@ -874,11 +874,11 @@ static int sub_0208CF0C (PokemonSummaryApp * param0) return 14; } -static int sub_0208CF78 (PokemonSummaryApp * param0) +static int sub_0208CF78(PokemonSummaryApp *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { - BoxPokemon * v0; - Pokemon * v1; + BoxPokemon *v0; + Pokemon *v1; u8 v2; if (param0->data->dataType == 2) { @@ -950,13 +950,13 @@ static int sub_0208CF78 (PokemonSummaryApp * param0) return 15; } -static int sub_0208D114 (PokemonSummaryApp * param0) +static int sub_0208D114(PokemonSummaryApp *param0) { u8 v0; if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { for (v0 = 0; v0 < 5; v0++) { - if ((param0->subscreen & (1 << v0))) { + if (param0->subscreen & (1 << v0)) { sub_02091610(param0, v0); param0->subscreen ^= (1 << v0); @@ -971,7 +971,7 @@ static int sub_0208D114 (PokemonSummaryApp * param0) return 16; } -static int sub_0208D164 (PokemonSummaryApp * param0) +static int sub_0208D164(PokemonSummaryApp *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return 18; @@ -980,13 +980,13 @@ static int sub_0208D164 (PokemonSummaryApp * param0) return 17; } -static u8 sub_0208D17C (PokemonSummaryApp * param0) +static u8 sub_0208D17C(PokemonSummaryApp *param0) { sub_0208C120(1, 19); return 19; } -static u8 sub_0208D18C (PokemonSummaryApp * param0) +static u8 sub_0208D18C(PokemonSummaryApp *param0) { if (ScreenWipe_Done() == 1) { return 1; @@ -995,9 +995,9 @@ static u8 sub_0208D18C (PokemonSummaryApp * param0) return 0; } -static void sub_0208D1A4 (PokemonSummaryApp * param0) +static void sub_0208D1A4(PokemonSummaryApp *param0) { - void * v0 = PokemonSummary_MonData(param0); + void *v0 = PokemonSummary_MonData(param0); if (param0->data->dataType == 2) { sub_0208D1D4(param0, v0, ¶m0->monData); @@ -1006,18 +1006,18 @@ static void sub_0208D1A4 (PokemonSummaryApp * param0) } } -static void sub_0208D1D4 (PokemonSummaryApp * param0, BoxPokemon * param1, PokemonSummaryAppData * param2) +static void sub_0208D1D4(PokemonSummaryApp *param0, BoxPokemon *param1, PokemonSummaryAppData *param2) { - Pokemon * v0 = Pokemon_New(19); + Pokemon *v0 = Pokemon_New(19); Pokemon_FromBoxPokemon(param1, v0); sub_0208D200(param0, v0, param2); Heap_FreeToHeap(v0); } -static void sub_0208D200 (PokemonSummaryApp * param0, Pokemon * param1, PokemonSummaryAppData * param2) +static void sub_0208D200(PokemonSummaryApp *param0, Pokemon *param1, PokemonSummaryAppData *param2) { - BoxPokemon * v0; + BoxPokemon *v0; u16 v1; u8 v2; BOOL v3; @@ -1135,7 +1135,7 @@ static void sub_0208D200 (PokemonSummaryApp * param0, Pokemon * param1, PokemonS Pokemon_ExitDecryptionContext(param1, v3); } -static void sub_0208D618 (PokemonSummaryApp * param0) +static void sub_0208D618(PokemonSummaryApp *param0) { u8 v0; @@ -1152,7 +1152,7 @@ static void sub_0208D618 (PokemonSummaryApp * param0) } } -static void sub_0208D678 (PokemonSummaryApp * param0) +static void sub_0208D678(PokemonSummaryApp *param0) { switch (param0->data->mode) { case 0: @@ -1189,7 +1189,7 @@ static void sub_0208D678 (PokemonSummaryApp * param0) } } -void PokemonSummary_FlagVisiblePages (PokemonSummary * param0, const u8 * param1) +void PokemonSummary_FlagVisiblePages(PokemonSummary *param0, const u8 *param1) { u8 v0; @@ -1204,7 +1204,7 @@ void PokemonSummary_FlagVisiblePages (PokemonSummary * param0, const u8 * param1 } } -static void sub_0208D748 (PokemonSummaryApp * param0) +static void sub_0208D748(PokemonSummaryApp *param0) { if (param0->data->contest == 1) { return; @@ -1223,7 +1223,7 @@ static void sub_0208D748 (PokemonSummaryApp * param0) } } -u8 PokemonSummary_PageIsVisble (PokemonSummaryApp * param0, u32 param1) +u8 PokemonSummary_PageIsVisble(PokemonSummaryApp *param0, u32 param1) { if ((param0->monData.isEgg != 0) && (param1 != 1) && (param1 != 7)) { return 0; @@ -1232,7 +1232,7 @@ u8 PokemonSummary_PageIsVisble (PokemonSummaryApp * param0, u32 param1) return param0->data->pageFlag & (1 << param1); } -u8 PokemonSummary_CountVisiblePages (PokemonSummaryApp * param0) +u8 PokemonSummary_CountVisiblePages(PokemonSummaryApp *param0) { u8 v0, v1; @@ -1247,7 +1247,7 @@ u8 PokemonSummary_CountVisiblePages (PokemonSummaryApp * param0) return v1; } -static void sub_0208D7EC (PokemonSummaryApp * param0, u8 param1) +static void sub_0208D7EC(PokemonSummaryApp *param0, u8 param1) { if (param0->page == param1) { return; @@ -1280,7 +1280,7 @@ static void sub_0208D7EC (PokemonSummaryApp * param0, u8 param1) } } -static void sub_0208D898 (PokemonSummaryApp * param0, s8 param1) +static void sub_0208D898(PokemonSummaryApp *param0, s8 param1) { s8 v0 = param0->page; @@ -1314,7 +1314,7 @@ static void sub_0208D898 (PokemonSummaryApp * param0, s8 param1) sub_0208D7EC(param0, v0); } -static u8 sub_0208D920 (PokemonSummaryApp * param0) +static u8 sub_0208D920(PokemonSummaryApp *param0) { u8 v0 = sub_020921E4(param0); @@ -1329,11 +1329,11 @@ static u8 sub_0208D920 (PokemonSummaryApp * param0) return 1; } -static void sub_0208D948 (PokemonSummaryApp * param0) +static void sub_0208D948(PokemonSummaryApp *param0) { { - NNSG2dScreenData * v0; - void * v1; + NNSG2dScreenData *v0; + void *v1; u32 v2; if ((param0->data->mode == 2) && (param0->data->move != 0)) { @@ -1361,7 +1361,7 @@ static void sub_0208D948 (PokemonSummaryApp * param0) } } -static void sub_0208D9D0 (PokemonSummaryApp * param0) +static void sub_0208D9D0(PokemonSummaryApp *param0) { u16 v0; u16 v1; @@ -1403,7 +1403,7 @@ static void sub_0208D9D0 (PokemonSummaryApp * param0) sub_0201C3C0(param0->bgl, 3); } -static void sub_0208DA84 (PokemonSummaryApp * param0) +static void sub_0208DA84(PokemonSummaryApp *param0) { u32 v0; u32 v1; @@ -1440,7 +1440,7 @@ static void sub_0208DA84 (PokemonSummaryApp * param0) sub_0201C3C0(param0->bgl, 3); } -static void sub_0208DB10 (PokemonSummaryApp * param0, s8 param1) +static void sub_0208DB10(PokemonSummaryApp *param0, s8 param1) { s8 v0 = sub_0208DBC4(param0, param1); @@ -1479,7 +1479,7 @@ static void sub_0208DB10 (PokemonSummaryApp * param0, s8 param1) sub_020904C4(param0); } -static s8 sub_0208DBC4 (PokemonSummaryApp * param0, s8 param1) +static s8 sub_0208DBC4(PokemonSummaryApp *param0, s8 param1) { switch (param0->data->dataType) { case 0: @@ -1493,7 +1493,7 @@ static s8 sub_0208DBC4 (PokemonSummaryApp * param0, s8 param1) return -1; } -static BOOL sub_0208DBF4 (PokemonSummaryApp * param0) +static BOOL sub_0208DBF4(PokemonSummaryApp *param0) { if (param0->data->mode == 3) { return 0; @@ -1506,9 +1506,9 @@ static BOOL sub_0208DBF4 (PokemonSummaryApp * param0) return 1; } -static s8 sub_0208DC1C (PokemonSummaryApp * param0, s8 param1) +static s8 sub_0208DC1C(PokemonSummaryApp *param0, s8 param1) { - Pokemon * v0; + Pokemon *v0; s8 v1; v1 = (s8)param0->data->pos; @@ -1537,9 +1537,9 @@ static s8 sub_0208DC1C (PokemonSummaryApp * param0, s8 param1) return v1; } -static s8 sub_0208DC84 (PokemonSummaryApp * param0, s8 param1) +static s8 sub_0208DC84(PokemonSummaryApp *param0, s8 param1) { - Pokemon * v0; + Pokemon *v0; s8 v1; v1 = (s8)param0->data->pos; @@ -1567,9 +1567,9 @@ static s8 sub_0208DC84 (PokemonSummaryApp * param0, s8 param1) return v1; } -static s8 sub_0208DCE0 (PokemonSummaryApp * param0, s8 param1) +static s8 sub_0208DCE0(PokemonSummaryApp *param0, s8 param1) { - BoxPokemon * v0; + BoxPokemon *v0; s8 v1; v1 = (s8)param0->data->pos; @@ -1598,7 +1598,7 @@ static s8 sub_0208DCE0 (PokemonSummaryApp * param0, s8 param1) return v1; } -void * PokemonSummary_MonData (PokemonSummaryApp * param0) +void *PokemonSummary_MonData(PokemonSummaryApp *param0) { switch (param0->data->dataType) { case 0: @@ -1612,7 +1612,7 @@ void * PokemonSummary_MonData (PokemonSummaryApp * param0) return NULL; } -static u8 sub_0208DD8C (PokemonSummaryApp * param0) +static u8 sub_0208DD8C(PokemonSummaryApp *param0) { switch (param0->subscreen) { case 0: @@ -1628,8 +1628,7 @@ static u8 sub_0208DD8C (PokemonSummaryApp * param0) param0->cursor = 0; param0->subscreen = 1; break; - case 1: - { + case 1: { int v0 = sub_020192EC(param0->bgl, 2); if (v0 <= 64) { @@ -1638,8 +1637,7 @@ static u8 sub_0208DD8C (PokemonSummaryApp * param0) } else { sub_0201C63C(param0->bgl, 2, 2, 64); } - } - break; + } break; case 2: sub_02091420(param0); @@ -1663,7 +1661,7 @@ static u8 sub_0208DD8C (PokemonSummaryApp * param0) return 0; } -static u8 sub_0208DEA4 (PokemonSummaryApp * param0) +static u8 sub_0208DEA4(PokemonSummaryApp *param0) { switch (param0->subscreen) { case 0: @@ -1678,8 +1676,7 @@ static u8 sub_0208DEA4 (PokemonSummaryApp * param0) sub_020913D8(param0); param0->subscreen = 1; break; - case 1: - { + case 1: { int v0 = sub_020192EC(param0->bgl, 2); if (v0 >= 128) { @@ -1688,8 +1685,7 @@ static u8 sub_0208DEA4 (PokemonSummaryApp * param0) } else { sub_0201C63C(param0->bgl, 2, 1, 64); } - } - break; + } break; case 2: sub_0201A9A4(¶m0->staticWindows[33]); sub_0201A9A4(¶m0->staticWindows[6]); @@ -1703,7 +1699,7 @@ static u8 sub_0208DEA4 (PokemonSummaryApp * param0) return 0; } -static u8 sub_0208DF94 (PokemonSummaryApp * param0, s8 param1) +static u8 sub_0208DF94(PokemonSummaryApp *param0, s8 param1) { s8 v0 = param0->cursor; @@ -1729,7 +1725,7 @@ static u8 sub_0208DF94 (PokemonSummaryApp * param0, s8 param1) return 0; } -static void sub_0208DFF4 (PokemonSummaryApp * param0) +static void sub_0208DFF4(PokemonSummaryApp *param0) { sub_0208F2E8(param0); @@ -1756,7 +1752,7 @@ static void sub_0208DFF4 (PokemonSummaryApp * param0) } } -static void sub_0208E07C (PokemonSummaryApp * param0, u32 param1) +static void sub_0208E07C(PokemonSummaryApp *param0, u32 param1) { if (param1 == 0xffffffff) { sub_020913D8(param0); @@ -1768,7 +1764,7 @@ static void sub_0208E07C (PokemonSummaryApp * param0, u32 param1) } } -static void sub_0208E0B8 (PokemonSummaryApp * param0, u32 param1) +static void sub_0208E0B8(PokemonSummaryApp *param0, u32 param1) { sub_0208E498(param0, param1); @@ -1779,9 +1775,9 @@ static void sub_0208E0B8 (PokemonSummaryApp * param0, u32 param1) } } -static void sub_0208E0DC (PokemonSummaryApp * param0) +static void sub_0208E0DC(PokemonSummaryApp *param0) { - void * v0; + void *v0; u16 v1; u8 v2; u8 v3; @@ -1807,7 +1803,7 @@ static void sub_0208E0DC (PokemonSummaryApp * param0) param0->monData.maxPP[param0->cursorTmp] = v3; } -static void sub_0208E190 (PokemonSummaryApp * param0) +static void sub_0208E190(PokemonSummaryApp *param0) { sub_0201AD10(¶m0->staticWindows[33]); sub_0201AD10(¶m0->staticWindows[6]); @@ -1828,7 +1824,7 @@ static void sub_0208E190 (PokemonSummaryApp * param0) sub_02021CAC(param0->unk_41C[9], 1); } -static u8 sub_0208E208 (PokemonSummaryApp * param0) +static u8 sub_0208E208(PokemonSummaryApp *param0) { switch (param0->subscreen) { case 0: @@ -1844,8 +1840,7 @@ static u8 sub_0208E208 (PokemonSummaryApp * param0) param0->cursor = 0; param0->subscreen = 1; break; - case 1: - { + case 1: { int v0 = sub_020192EC(param0->bgl, 2); if (v0 <= 64) { @@ -1854,8 +1849,7 @@ static u8 sub_0208E208 (PokemonSummaryApp * param0) } else { sub_0201C63C(param0->bgl, 2, 2, 64); } - } - break; + } break; case 2: sub_02091420(param0); @@ -1875,7 +1869,7 @@ static u8 sub_0208E208 (PokemonSummaryApp * param0) return 0; } -static u8 sub_0208E308 (PokemonSummaryApp * param0) +static u8 sub_0208E308(PokemonSummaryApp *param0) { switch (param0->subscreen) { case 0: @@ -1889,8 +1883,7 @@ static u8 sub_0208E308 (PokemonSummaryApp * param0) sub_020915F4(param0); param0->subscreen = 1; break; - case 1: - { + case 1: { int v0 = sub_020192EC(param0->bgl, 2); if (v0 >= 128) { @@ -1899,8 +1892,7 @@ static u8 sub_0208E308 (PokemonSummaryApp * param0) } else { sub_0201C63C(param0->bgl, 2, 1, 64); } - } - break; + } break; case 2: sub_0201A9A4(¶m0->staticWindows[33]); sub_0201A9A4(¶m0->staticWindows[6]); @@ -1914,7 +1906,7 @@ static u8 sub_0208E308 (PokemonSummaryApp * param0) return 0; } -static void sub_0208E3DC (PokemonSummaryApp * param0, u16 param1, u8 param2) +static void sub_0208E3DC(PokemonSummaryApp *param0, u16 param1, u8 param2) { sub_02019CB8(param0->bgl, 2, param1, 2 + param2 * 2, (32 + 15), 1, 1, 16); sub_02019CB8(param0->bgl, 2, param1 + 1, 2 + param2 * 2 + 1, (32 + 15), 1, 1, 16); @@ -1922,7 +1914,7 @@ static void sub_0208E3DC (PokemonSummaryApp * param0, u16 param1, u8 param2) sub_02019CB8(param0->bgl, 2, param1 + 33, 2 + param2 * 2 + 1, (32 + 15) + 1, 1, 1, 16); } -static void sub_0208E46C (PokemonSummaryApp * param0) +static void sub_0208E46C(PokemonSummaryApp *param0) { u16 v0; @@ -1933,7 +1925,7 @@ static void sub_0208E46C (PokemonSummaryApp * param0) sub_0201C3C0(param0->bgl, 2); } -static void sub_0208E498 (PokemonSummaryApp * param0, u32 param1) +static void sub_0208E498(PokemonSummaryApp *param0, u32 param1) { u32 v0; u16 v1; @@ -1953,7 +1945,7 @@ static void sub_0208E498 (PokemonSummaryApp * param0, u32 param1) sub_0201C3C0(param0->bgl, 2); } -static void sub_0208E4EC (PokemonSummaryApp * param0) +static void sub_0208E4EC(PokemonSummaryApp *param0) { if (param0->page == 3) { sub_020913D8(param0); @@ -1962,7 +1954,7 @@ static void sub_0208E4EC (PokemonSummaryApp * param0) } } -static void sub_0208E508 (PokemonSummaryApp * param0) +static void sub_0208E508(PokemonSummaryApp *param0) { sub_02091420(param0); sub_0208DFF4(param0); @@ -1983,7 +1975,7 @@ static void sub_0208E508 (PokemonSummaryApp * param0) } } -static u8 sub_0208E57C (PokemonSummaryApp * param0) +static u8 sub_0208E57C(PokemonSummaryApp *param0) { switch (param0->subscreen) { case 0: @@ -2002,8 +1994,7 @@ static u8 sub_0208E57C (PokemonSummaryApp * param0) param0->ribbonState = 0; param0->subscreen = 1; break; - case 1: - { + case 1: { int v0 = sub_020192F8(param0->bgl, 2); if (v0 >= 48) { @@ -2012,8 +2003,7 @@ static u8 sub_0208E57C (PokemonSummaryApp * param0) } else { sub_0201C63C(param0->bgl, 2, 4, 16); } - } - break; + } break; case 2: sub_02090064(param0, 181); sub_0208F6DC(param0, ¶m0->staticWindows[35]); @@ -2031,7 +2021,7 @@ static u8 sub_0208E57C (PokemonSummaryApp * param0) return 0; } -static u8 sub_0208E6A8 (PokemonSummaryApp * param0) +static u8 sub_0208E6A8(PokemonSummaryApp *param0) { switch (param0->subscreen) { case 0: @@ -2045,8 +2035,7 @@ static u8 sub_0208E6A8 (PokemonSummaryApp * param0) sub_0208FA04(param0); param0->subscreen = 1; break; - case 1: - { + case 1: { int v0 = sub_020192F8(param0->bgl, 2); if (v0 <= 8) { @@ -2055,8 +2044,7 @@ static u8 sub_0208E6A8 (PokemonSummaryApp * param0) } else { sub_0201C63C(param0->bgl, 2, 5, 16); } - } - break; + } break; case 2: sub_0201A9A4(¶m0->staticWindows[6]); sub_0201A9A4(¶m0->staticWindows[32]); @@ -2073,7 +2061,7 @@ static u8 sub_0208E6A8 (PokemonSummaryApp * param0) return 0; } -static void sub_0208E794 (PokemonSummaryApp * param0, s8 param1) +static void sub_0208E794(PokemonSummaryApp *param0, s8 param1) { u8 v0; u8 v1; @@ -2149,7 +2137,7 @@ static void sub_0208E794 (PokemonSummaryApp * param0, s8 param1) } } -u8 PokemonSummary_RibbonAt (PokemonSummaryApp * param0, u8 param1) +u8 PokemonSummary_RibbonAt(PokemonSummaryApp *param0, u8 param1) { u16 v0; u8 v1, v2; @@ -2170,7 +2158,7 @@ u8 PokemonSummary_RibbonAt (PokemonSummaryApp * param0, u8 param1) return 0; } -static int sub_0208E958 (PokemonSummaryApp * param0) +static int sub_0208E958(PokemonSummaryApp *param0) { if (param0->monData.sheen == 255) { sub_02002E98(0, 14 * 32, 19); @@ -2185,34 +2173,34 @@ static int sub_0208E958 (PokemonSummaryApp * param0) return 18; } -void PokemonSummary_SetPlayerProfile (PokemonSummary * param0, const TrainerInfo * param1) +void PokemonSummary_SetPlayerProfile(PokemonSummary *param0, const TrainerInfo *param1) { param0->OTName = TrainerInfo_Name(param1); param0->OTID = TrainerInfo_ID(param1); param0->OTGender = (u8)TrainerInfo_Gender(param1); } -u32 PokemonSummary_StatusIconChar (void) +u32 PokemonSummary_StatusIconChar(void) { return 64; } -u32 PokemonSummary_StatusIconPltt (void) +u32 PokemonSummary_StatusIconPltt(void) { return 65; } -u32 PokemonSummary_StatusIconCell (void) +u32 PokemonSummary_StatusIconCell(void) { return 63; } -u32 PokemonSummary_StatusIconAnim (void) +u32 PokemonSummary_StatusIconAnim(void) { return 62; } -u32 PokemonSummary_StatusIconAnimIdx (Pokemon * param0) +u32 PokemonSummary_StatusIconAnimIdx(Pokemon *param0) { u32 v0 = Pokemon_GetValue(param0, MON_DATA_STATUS_CONDITION, NULL); diff --git a/src/pokeradar.c b/src/pokeradar.c index b0264af075..46c381e82f 100644 --- a/src/pokeradar.c +++ b/src/pokeradar.c @@ -1,17 +1,26 @@ +#include "pokeradar.h" + #include #include -#include "inlines.h" +#include "constants/battle.h" +#include "consts/sdat.h" #include "struct_decls/struct_020508D4_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - #include "struct_defs/struct_0201CFEC.h" -#include "field/field_system.h" #include "struct_defs/struct_020698E4.h" -#include "unk_02005474.h" +#include "field/field_system.h" +#include "overlay005/ov5_021F2D20.h" +#include "overlay006/ov6_022430C4.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" + +#include "bag.h" #include "heap.h" +#include "inlines.h" +#include "map_object.h" +#include "player_avatar.h" +#include "unk_02005474.h" #include "unk_0201CED8.h" #include "unk_0202D7A8.h" #include "unk_02039C80.h" @@ -20,16 +29,7 @@ #include "unk_02054D00.h" #include "unk_020553DC.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" -#include "map_object.h" -#include "pokeradar.h" #include "unk_020711EC.h" -#include "bag.h" -#include "overlay005/ov5_021F2D20.h" -#include "overlay006/ov6_022430C4.h" - -#include "constants/battle.h" -#include "consts/sdat.h" typedef struct { int unk_00; @@ -63,17 +63,20 @@ static BOOL CheckPatchContinueChain(const u8 patchRing, const int battleResult); static BOOL CheckPatchShiny(const int param0); static void IncWithCap(int *param0); -RadarChain *RadarChain_Init (const int heapID) { +RadarChain *RadarChain_Init(const int heapID) +{ RadarChain *chain = Heap_AllocFromHeap(heapID, sizeof(RadarChain)); sub_0201CFEC(FX32_ONE * 16, FX32_ONE * 8, FX32_ONE * 16, &chain->unk_BC); return chain; } -void RadarChain_Free (RadarChain *chain) { +void RadarChain_Free(RadarChain *chain) +{ Heap_FreeToHeap(chain); } -void RadarChain_Clear (RadarChain *chain) { +void RadarChain_Clear(RadarChain *chain) +{ chain->count = 0; chain->shakeType = PATCH_SHAKE_SOFT; chain->species = 0; @@ -88,14 +91,18 @@ void RadarChain_Clear (RadarChain *chain) { } } -BOOL RadarSpawnPatches (FieldSystem *fieldSystem, const int param1, const int param2, RadarChain *chain) { +BOOL RadarSpawnPatches(FieldSystem *fieldSystem, const int param1, const int param2, RadarChain *chain) +{ u8 v1, v2; u8 v3; u8 v4; int v5, v6; u8 v7; - u8 ringTileCount[NUM_GRASS_PATCHES] = { // Number of tiles in each ring of the radar. Lowest being the most outer ring - 32, 24, 16, 8 + u8 ringTileCount[NUM_GRASS_PATCHES] = { // Number of tiles in each ring of the radar. Lowest being the most outer ring + 32, + 24, + 16, + 8 }; const VecFx32 *v8 = PlayerAvatar_PosVector(fieldSystem->playerAvatar); @@ -140,26 +147,28 @@ BOOL RadarSpawnPatches (FieldSystem *fieldSystem, const int param1, const int pa return chain->active; } -void SetupGrassPatches (FieldSystem *fieldSystem, const int param1, RadarChain *chain) { +void SetupGrassPatches(FieldSystem *fieldSystem, const int param1, RadarChain *chain) +{ for (u8 patchRing = 0; patchRing < NUM_GRASS_PATCHES; patchRing++) { if (chain->patch[patchRing].active) { chain->patch[patchRing].continueChain = CheckPatchContinueChain(patchRing, param1); if (!chain->patch[patchRing].continueChain) { - if (inline_020564D0(100) < 50) { // If the patch will break the chain, it has a 50/50 chance of shaking the other type + if (inline_020564D0(100) < 50) { // If the patch will break the chain, it has a 50/50 chance of shaking the other type chain->patch[patchRing].shakeType = PATCH_SHAKE_SOFT; } else { chain->patch[patchRing].shakeType = PATCH_SHAKE_HARD; } chain->patch[patchRing].shiny = FALSE; } else { - chain->patch[patchRing].shakeType = chain->shakeType; // A patch that continues the chain, shakes the type the chain is set to + chain->patch[patchRing].shakeType = chain->shakeType; // A patch that continues the chain, shakes the type the chain is set to chain->patch[patchRing].shiny = CheckPatchShiny(fieldSystem->chain->count); } } } } -void sub_02069638 (FieldSystem *fieldSystem, RadarChain *chain) { +void sub_02069638(FieldSystem *fieldSystem, RadarChain *chain) +{ for (u8 patchRing = 0; patchRing < NUM_GRASS_PATCHES; patchRing++) { if (chain->patch[patchRing].active) { int v1 = chain->patch[patchRing].unk_00; @@ -179,7 +188,8 @@ void sub_02069638 (FieldSystem *fieldSystem, RadarChain *chain) { } } -BOOL sub_02069690 (RadarChain *chain) { +BOOL sub_02069690(RadarChain *chain) +{ u8 v0 = 0; for (u8 patchRing = 0; patchRing < NUM_GRASS_PATCHES; patchRing++) { @@ -201,7 +211,8 @@ BOOL sub_02069690 (RadarChain *chain) { return FALSE; } -BOOL sub_020696DC (const int param0, const int param1, FieldSystem *fieldSystem, RadarChain *chain, int *param4, BOOL *param5, BOOL *param6) { +BOOL sub_020696DC(const int param0, const int param1, FieldSystem *fieldSystem, RadarChain *chain, int *param4, BOOL *param5, BOOL *param6) +{ u8 patchRing; *param5 = 0; *param6 = 0; @@ -235,22 +246,26 @@ BOOL sub_020696DC (const int param0, const int param1, FieldSystem *fieldSystem, return TRUE; } -void SetRadarMon (RadarChain *chain, const int species, const int level) { +void SetRadarMon(RadarChain *chain, const int species, const int level) +{ GF_ASSERT(species != 0); chain->species = species; chain->level = level; } -void GetRadarMon (RadarChain *chain, int *species, int *level) { +void GetRadarMon(RadarChain *chain, int *species, int *level) +{ *species = chain->species; *level = chain->level; } -const BOOL sub_02069798 (const RadarChain *chain) { +const BOOL sub_02069798(const RadarChain *chain) +{ return chain->unk_18; } -void sub_0206979C (FieldSystem *fieldSystem) { +void sub_0206979C(FieldSystem *fieldSystem) +{ BOOL v0; GrassPatch *patch; int patchRing; @@ -281,11 +296,13 @@ void sub_0206979C (FieldSystem *fieldSystem) { } } -BOOL GetRadarChainActive (const RadarChain *chain) { +BOOL GetRadarChainActive(const RadarChain *chain) +{ return chain->active; } -static BOOL CheckTileIsGrass (FieldSystem *fieldSystem, const fx32 param1, const int param2, const int param3, const u8 param4, const u8 param5, GrassPatch *patch) { +static BOOL CheckTileIsGrass(FieldSystem *fieldSystem, const fx32 param1, const int param2, const int param3, const u8 param4, const u8 param5, GrassPatch *patch) +{ int v0 = (param2 - (9 / 2)) + param4; int v1 = (param3 - (9 / 2)) + param5; patch->unk_00 = v0; @@ -318,7 +335,8 @@ static BOOL CheckTileIsGrass (FieldSystem *fieldSystem, const fx32 param1, const } } -static BOOL sub_020698AC (const RadarChain *chain, const int param1, const int param2, u8 *param3) { +static BOOL sub_020698AC(const RadarChain *chain, const int param1, const int param2, u8 *param3) +{ for (u8 patchRing = 0; patchRing < NUM_GRASS_PATCHES; patchRing++) { if (chain->patch[patchRing].active) { if ((chain->patch[patchRing].unk_00 == param1) && (chain->patch[patchRing].unk_04 == param2)) { @@ -330,7 +348,8 @@ static BOOL sub_020698AC (const RadarChain *chain, const int param1, const int p return FALSE; } -static void sub_020698E4 (FieldSystem *fieldSystem, RadarChain *chain) { +static void sub_020698E4(FieldSystem *fieldSystem, RadarChain *chain) +{ UnkStruct_020698E4 *v0 = sub_0202D830(sub_0202D834(fieldSystem->saveData)); int v1 = v0->unk_00[chain->unk_D0].unk_02; @@ -350,7 +369,8 @@ static void sub_020698E4 (FieldSystem *fieldSystem, RadarChain *chain) { } } -static u8 sub_0206994C (FieldSystem *fieldSystem) { +static u8 sub_0206994C(FieldSystem *fieldSystem) +{ u8 v1; BOOL v2; UnkStruct_020698E4 *v0 = sub_0202D830(sub_0202D834(fieldSystem->saveData)); @@ -376,25 +396,27 @@ static u8 sub_0206994C (FieldSystem *fieldSystem) { return v1; } -static BOOL CheckPatchContinueChain (const u8 patchRing, const int battleResult) { +static BOOL CheckPatchContinueChain(const u8 patchRing, const int battleResult) +{ u8 *rates; - u8 ratesNormal[4] = {88, 68, 48, 28}; - u8 ratesBoosted[4] = {98, 78, 58, 38}; + u8 ratesNormal[4] = { 88, 68, 48, 28 }; + u8 ratesBoosted[4] = { 98, 78, 58, 38 }; - if (battleResult == BATTLE_RESULT_WIN) { // If the battle resulted in fainting the mon, use the regular rates + if (battleResult == BATTLE_RESULT_WIN) { // If the battle resulted in fainting the mon, use the regular rates rates = ratesNormal; - } else if (battleResult == BATTLE_RESULT_CAPTURED_MON) { // If the battle resulted in a capture, use the boosted rates + } else if (battleResult == BATTLE_RESULT_CAPTURED_MON) { // If the battle resulted in a capture, use the boosted rates rates = ratesBoosted; } - if (inline_020564D0(100) < rates[patchRing]) { // Check if random number falls within the rates - return TRUE; // Patch will continue the chain + if (inline_020564D0(100) < rates[patchRing]) { // Check if random number falls within the rates + return TRUE; // Patch will continue the chain } else { - return FALSE; // Patch will break the chain + return FALSE; // Patch will break the chain } } -BOOL RefreshRadarChain (TaskManager *taskMan) { +BOOL RefreshRadarChain(TaskManager *taskMan) +{ FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); int *v1 = TaskManager_Environment(taskMan); @@ -420,7 +442,7 @@ BOOL RefreshRadarChain (TaskManager *taskMan) { *v1 = 3; } } - break; + break; case 1: Sound_PlayBGM(SEQ_POKERADAR); *v1 = 2; @@ -444,7 +466,8 @@ BOOL RefreshRadarChain (TaskManager *taskMan) { return FALSE; } -static BOOL CheckPatchShiny (const int chainCount) { +static BOOL CheckPatchShiny(const int chainCount) +{ if (!chainCount) { return FALSE; } @@ -461,16 +484,19 @@ static BOOL CheckPatchShiny (const int chainCount) { } } -void sub_02069B74 (FieldSystem *fieldSystem) { +void sub_02069B74(FieldSystem *fieldSystem) +{ IncWithCap(&(fieldSystem->chain->count)); sub_020698E4(fieldSystem, fieldSystem->chain); } -int GetChainCount (FieldSystem *fieldSystem) { +int GetChainCount(FieldSystem *fieldSystem) +{ return fieldSystem->chain->count; } -void RadarChargeStep (FieldSystem *fieldSystem) { +void RadarChargeStep(FieldSystem *fieldSystem) +{ u8 *v0; if (Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), 431, 1, 4) == 1) { @@ -481,7 +507,8 @@ void RadarChargeStep (FieldSystem *fieldSystem) { } } -static void IncWithCap (int *param0) { +static void IncWithCap(int *param0) +{ (*param0)++; if ((*param0) > 999) { (*param0) = 999; diff --git a/src/poketch_data.c b/src/poketch_data.c index 22b7955bef..05650c230e 100644 --- a/src/poketch_data.c +++ b/src/poketch_data.c @@ -1,13 +1,13 @@ +#include "poketch_data.h" + #include #include -#include "pokemon.h" -#include "savedata.h" +#include "savedata/save_table.h" -#include "savedata.h" -#include "poketch_data.h" +#include "pokemon.h" #include "pokemon_icon.h" -#include "savedata/save_table.h" +#include "savedata.h" int Poketch_SaveSize(void) { @@ -15,15 +15,15 @@ int Poketch_SaveSize(void) } static const struct { - u8 x; - u8 y; + u8 x; + u8 y; } sDefaultMapMarkers[POKETCH_MAPMARKER_COUNT] = { - {104, 152}, - {120, 152}, - {136, 152}, - {152, 152}, - {168, 152}, - {184, 152} + { 104, 152 }, + { 120, 152 }, + { 136, 152 }, + { 152, 152 }, + { 168, 152 }, + { 184, 152 } }; void Poketch_Init(PoketchData *poketchData) @@ -91,7 +91,7 @@ BOOL PoketchData_RegisterApp(PoketchData *poketchData, enum PoketchAppID appID) } appRegistered = TRUE; - } + } return appRegistered; } @@ -304,7 +304,7 @@ u32 PoketchData_PokemonHistoryForm(const PoketchData *poketchData, int index) return poketchData->pokemonHistoryQueue[index].form; } -PoketchData* SaveData_PoketchData(SaveData *saveData) +PoketchData *SaveData_PoketchData(SaveData *saveData) { return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_POKETCH); } diff --git a/src/roaming_pokemon.c b/src/roaming_pokemon.c index e41fd152c6..ec3a8a64b6 100644 --- a/src/roaming_pokemon.c +++ b/src/roaming_pokemon.c @@ -1,148 +1,147 @@ +#include "roaming_pokemon.h" + #include #include -#include "inlines.h" - #include "constants/species.h" -#include "savedata.h" - #include "struct_defs/struct_0202D7B0.h" #include "struct_defs/struct_0206C638.h" #include "heap.h" -#include "unk_02025E08.h" +#include "inlines.h" +#include "pokemon.h" +#include "savedata.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0202D7A8.h" -#include "roaming_pokemon.h" -#include "pokemon.h" typedef struct { u16 unk_00; u16 unk_02[5]; } UnkStruct_020EFBB8; -static void sub_0206C538(UnkStruct_0202D7B0 * param0, const u8 param1, const int param2); -static void sub_0206C588(UnkStruct_0202D7B0 * param0, const u8 param1, const int param2); -static void sub_0206C638(UnkStruct_0202D7B0 * param0, const u8 param1, const u8 param2, const int param3); +static void sub_0206C538(UnkStruct_0202D7B0 *param0, const u8 param1, const int param2); +static void sub_0206C588(UnkStruct_0202D7B0 *param0, const u8 param1, const int param2); +static void sub_0206C638(UnkStruct_0202D7B0 *param0, const u8 param1, const u8 param2, const int param3); static const UnkStruct_020EFBB8 Unk_020EFBB8[29] = { { 0x2, - {0x1, 0x17, 0xffff, 0xffff, 0xffff} + { 0x1, 0x17, 0xffff, 0xffff, 0xffff }, }, { 0x5, - {0x0, 0x2, 0x3, 0x16, 0x17} + { 0x0, 0x2, 0x3, 0x16, 0x17 }, }, { 0x4, - {0x1, 0x3, 0x8, 0x16, 0xffff} + { 0x1, 0x3, 0x8, 0x16, 0xffff }, }, { 0x4, - {0x1, 0x2, 0x4, 0x16, 0xffff} + { 0x1, 0x2, 0x4, 0x16, 0xffff }, }, { 0x2, - {0x3, 0x5, 0xffff, 0xffff, 0xffff} + { 0x3, 0x5, 0xffff, 0xffff, 0xffff }, }, { 0x4, - {0x4, 0x6, 0x1B, 0x1C, 0xffff} + { 0x4, 0x6, 0x1B, 0x1C, 0xffff }, }, { 0x3, - {0x5, 0x7, 0x9, 0xffff, 0xffff} + { 0x5, 0x7, 0x9, 0xffff, 0xffff }, }, { 0x3, - {0x6, 0x8, 0xD, 0xffff, 0xffff} + { 0x6, 0x8, 0xD, 0xffff, 0xffff }, }, { 0x3, - {0x2, 0x7, 0x9, 0xffff, 0xffff} + { 0x2, 0x7, 0x9, 0xffff, 0xffff }, }, { 0x3, - {0x8, 0xA, 0xF, 0xffff, 0xffff} + { 0x8, 0xA, 0xF, 0xffff, 0xffff }, }, { 0x3, - {0x9, 0xB, 0xF, 0xffff, 0xffff} + { 0x9, 0xB, 0xF, 0xffff, 0xffff }, }, { 0x3, - {0xA, 0xC, 0x13, 0xffff, 0xffff} + { 0xA, 0xC, 0x13, 0xffff, 0xffff }, }, { 0x2, - {0xB, 0xE, 0xffff, 0xffff, 0xffff} + { 0xB, 0xE, 0xffff, 0xffff, 0xffff }, }, { 0x4, - {0x6, 0x7, 0xE, 0x14, 0xffff} + { 0x6, 0x7, 0xE, 0x14, 0xffff }, }, { 0x3, - {0xC, 0xD, 0x14, 0xffff} + { 0xC, 0xD, 0x14, 0xffff }, }, { 0x3, - {0x9, 0xA, 0x10, 0xffff, 0xffff} + { 0x9, 0xA, 0x10, 0xffff, 0xffff }, }, { 0x2, - {0xF, 0x11, 0xffff, 0xffff, 0xffff} + { 0xF, 0x11, 0xffff, 0xffff, 0xffff }, }, { 0x3, - {0x10, 0x12, 0x1A, 0xffff, 0xffff} + { 0x10, 0x12, 0x1A, 0xffff, 0xffff }, }, { 0x3, - {0x11, 0x13, 0x1A, 0xffff, 0xffff} + { 0x11, 0x13, 0x1A, 0xffff, 0xffff }, }, { 0x2, - {0xB, 0x12, 0xffff, 0xffff, 0xffff} + { 0xB, 0x12, 0xffff, 0xffff, 0xffff }, }, { 0x3, - {0xD, 0xE, 0x15, 0xffff, 0xffff} + { 0xD, 0xE, 0x15, 0xffff, 0xffff }, }, { 0x1, - {0x14, 0xffff, 0xffff, 0xffff, 0xffff} + { 0x14, 0xffff, 0xffff, 0xffff, 0xffff }, }, { 0x3, - {0x1, 0x2, 0x3, 0xffff, 0xffff} + { 0x1, 0x2, 0x3, 0xffff, 0xffff }, }, { 0x3, - {0x0, 0x1, 0x18, 0xffff, 0xffff} + { 0x0, 0x1, 0x18, 0xffff, 0xffff }, }, { 0x2, - {0x17, 0x19, 0xffff, 0xffff, 0xffff} + { 0x17, 0x19, 0xffff, 0xffff, 0xffff }, }, { 0x1, - {0x18, 0xffff, 0xffff, 0xffff, 0xffff} + { 0x18, 0xffff, 0xffff, 0xffff, 0xffff }, }, { 0x2, - {0x11, 0x12, 0xffff, 0xffff, 0xffff} + { 0x11, 0x12, 0xffff, 0xffff, 0xffff }, }, { 0x1, - {0x5, 0xffff, 0xffff, 0xffff, 0xffff} + { 0x5, 0xffff, 0xffff, 0xffff, 0xffff }, }, { 0x1, - {0x5, 0xffff, 0xffff, 0xffff, 0xffff} - } + { 0x5, 0xffff, 0xffff, 0xffff, 0xffff }, + }, }; static const int RoamingPokemonRoutes[29] = { @@ -177,7 +176,7 @@ static const int RoamingPokemonRoutes[29] = { 0xCC }; -void sub_0206C33C (UnkStruct_0202D7B0 * param0, const u8 param1) +void sub_0206C33C(UnkStruct_0202D7B0 *param0, const u8 param1) { int v0; @@ -185,7 +184,7 @@ void sub_0206C33C (UnkStruct_0202D7B0 * param0, const u8 param1) sub_0206C538(param0, param1, v0); } -void sub_0206C354 (UnkStruct_0202D7B0 * param0) +void sub_0206C354(UnkStruct_0202D7B0 *param0) { u8 v0; @@ -196,7 +195,7 @@ void sub_0206C354 (UnkStruct_0202D7B0 * param0) } } -void sub_0206C37C (UnkStruct_0202D7B0 * param0) +void sub_0206C37C(UnkStruct_0202D7B0 *param0) { u8 v0; @@ -216,13 +215,13 @@ void sub_0206C37C (UnkStruct_0202D7B0 * param0) } } -int sub_0206C3C8 (const u8 param0) +int sub_0206C3C8(const u8 param0) { GF_ASSERT(param0 < 29); return RoamingPokemonRoutes[param0]; } -BOOL sub_0206C3E0 (UnkStruct_0202D7B0 * param0) +BOOL sub_0206C3E0(UnkStruct_0202D7B0 *param0) { u8 v0; @@ -235,20 +234,20 @@ BOOL sub_0206C3E0 (UnkStruct_0202D7B0 * param0) return 0; } -void sub_0206C404 (UnkStruct_0202D7B0 * param0, const int param1) +void sub_0206C404(UnkStruct_0202D7B0 *param0, const int param1) { if (sub_0206C3E0(param0)) { sub_0202D8A4(param0, param1); } } -void RoamingPokemon_ActivateSlot (SaveData * saveData, const u8 slot) +void RoamingPokemon_ActivateSlot(SaveData *saveData, const u8 slot) { - Pokemon * v0; - UnkStruct_0206C638 * v1; - UnkStruct_0202D7B0 * v2; + Pokemon *v0; + UnkStruct_0206C638 *v1; + UnkStruct_0202D7B0 *v2; int previouslyVisitedMap; - TrainerInfo * v4; + TrainerInfo *v4; int species; u8 level; @@ -304,7 +303,7 @@ void RoamingPokemon_ActivateSlot (SaveData * saveData, const u8 slot) sub_0206C538(v2, slot, previouslyVisitedMap); } -static void sub_0206C538 (UnkStruct_0202D7B0 * param0, const u8 param1, const int param2) +static void sub_0206C538(UnkStruct_0202D7B0 *param0, const u8 param1, const int param2) { u8 v0; int v1; @@ -323,9 +322,9 @@ static void sub_0206C538 (UnkStruct_0202D7B0 * param0, const u8 param1, const in } } -static void sub_0206C588 (UnkStruct_0202D7B0 * param0, const u8 param1, const int param2) +static void sub_0206C588(UnkStruct_0202D7B0 *param0, const u8 param1, const int param2) { - const UnkStruct_020EFBB8 * v0; + const UnkStruct_020EFBB8 *v0; u8 v1; int v2; @@ -356,9 +355,9 @@ static void sub_0206C588 (UnkStruct_0202D7B0 * param0, const u8 param1, const in } } -static void sub_0206C638 (UnkStruct_0202D7B0 * param0, const u8 param1, const u8 param2, const int param3) +static void sub_0206C638(UnkStruct_0202D7B0 *param0, const u8 param1, const u8 param2, const int param3) { - UnkStruct_0206C638 * v0; + UnkStruct_0206C638 *v0; v0 = sub_0202D924(param0, param1); diff --git a/src/rtc.c b/src/rtc.c index 6b40d23997..4951d2b717 100644 --- a/src/rtc.c +++ b/src/rtc.c @@ -1,11 +1,11 @@ +#include "rtc.h" + #include -#include #include +#include #include "inlines.h" -#include "rtc.h" - typedef struct { BOOL valid; BOOL readInProgress; @@ -17,12 +17,12 @@ typedef struct { RTCTime tempTime; } RTCState; -static void GetTimeCallback(RTCResult param0, void * param1); -static void StartRTCRead(RTCState * param0); +static void GetTimeCallback(RTCResult param0, void *param1); +static void StartRTCRead(RTCState *param0); static RTCState sRTCState; -void InitRTC (void) +void InitRTC(void) { RTC_Init(); memset(&sRTCState, 0, sizeof(sRTCState)); @@ -32,7 +32,7 @@ void InitRTC (void) StartRTCRead(&sRTCState); } -void UpdateRTC (void) +void UpdateRTC(void) { if (sRTCState.readInProgress) { return; @@ -46,9 +46,9 @@ void UpdateRTC (void) } } -static void GetTimeCallback (RTCResult result, void * data) +static void GetTimeCallback(RTCResult result, void *data) { - RTCState * state = data; + RTCState *state = data; state->status = result; @@ -60,14 +60,14 @@ static void GetTimeCallback (RTCResult result, void * data) state->readInProgress = 0; } -static void StartRTCRead (RTCState * param0) +static void StartRTCRead(RTCState *param0) { param0->readInProgress = 1; param0->status = RTC_GetDateTimeAsync(¶m0->tempDate, ¶m0->tempTime, GetTimeCallback, param0); GF_ASSERT(param0->status == RTC_RESULT_SUCCESS); } -void GetCurrentDateTime (RTCDate * date, RTCTime * time) +void GetCurrentDateTime(RTCDate *date, RTCTime *time) { GF_ASSERT(sRTCState.valid == 1); @@ -75,31 +75,31 @@ void GetCurrentDateTime (RTCDate * date, RTCTime * time) *time = sRTCState.time; } -void GetCurrentTime (RTCTime * time) +void GetCurrentTime(RTCTime *time) { GF_ASSERT(sRTCState.valid == 1); *time = sRTCState.time; } -void GetCurrentDate (RTCDate * date) +void GetCurrentDate(RTCDate *date) { GF_ASSERT(sRTCState.valid == 1); *date = sRTCState.date; } -int GetSecondsSinceMidnight (void) +int GetSecondsSinceMidnight(void) { - RTCTime * time = &sRTCState.time; + RTCTime *time = &sRTCState.time; return time->hour * 60 * 60 + time->minute * 60 + time->second; } -s64 GetTimestamp (void) +s64 GetTimestamp(void) { return RTC_ConvertDateTimeToSecond(&sRTCState.date, &sRTCState.time); } -int DayNumberForDate (const RTCDate * date) +int DayNumberForDate(const RTCDate *date) { int year, days; static const u16 monthStart[12] = { @@ -120,7 +120,7 @@ int DayNumberForDate (const RTCDate * date) return days; } -BOOL IsNight (void) +BOOL IsNight(void) { switch (GetTimeOfDay()) { case TOD_LATE_NIGHT: @@ -131,7 +131,7 @@ BOOL IsNight (void) return 0; } -enum TimeOfDay GetTimeOfDay (void) +enum TimeOfDay GetTimeOfDay(void) { RTCTime time; @@ -139,7 +139,7 @@ enum TimeOfDay GetTimeOfDay (void) return TimeOfDayForHour(time.hour); } -enum TimeOfDay TimeOfDayForHour (int hour) +enum TimeOfDay TimeOfDayForHour(int hour) { static const u8 lookup[24] = { TOD_LATE_NIGHT, @@ -174,10 +174,10 @@ enum TimeOfDay TimeOfDayForHour (int hour) #define MAX_TIMESTAMP 3155759999 -s64 TimeElapsed (s64 since, s64 until) +s64 TimeElapsed(s64 since, s64 until) { - RTCDate maxDate = {99, 12, 31, 0}; - RTCTime maxTime = {23, 59, 59}; + RTCDate maxDate = { 99, 12, 31, 0 }; + RTCTime maxTime = { 23, 59, 59 }; s64 maxTimestamp = RTC_ConvertDateTimeToSecond(&maxDate, &maxTime); GF_ASSERT(maxTimestamp == MAX_TIMESTAMP); diff --git a/src/savedata.c b/src/savedata.c index 677566379f..ef2ef62e82 100644 --- a/src/savedata.c +++ b/src/savedata.c @@ -1,19 +1,19 @@ +#include "savedata.h" + #include #include -#include "inlines.h" - +#include "constants/heap.h" #include "savedata/save_table.h" -#include "unk_02017728.h" #include "heap.h" -#include "unk_0201D15C.h" -#include "savedata.h" +#include "inlines.h" #include "savedata_misc.h" +#include "unk_02017728.h" +#include "unk_0201D15C.h" #include "unk_0209A74C.h" #include "unk_0209AA74.h" -#include "constants/heap.h" static void SaveTable_Clear(SaveDataBody *body, const SavePageInfo *pageInfo); static void SavePageInfo_Init(SavePageInfo *pageInfo); @@ -36,9 +36,10 @@ static void SaveDataExtra_SetSaveKey(SaveData *saveData, int extraSaveID, u32 ne static SaveData *sSaveDataPtr = NULL; static BOOL sSaveComplete; -SaveData* SaveData_Init (void) +SaveData *SaveData_Init(void) { - SaveData *saveData = Heap_AllocFromHeap(HEAP_ID_SAVE, sizeof(SaveData));; + SaveData *saveData = Heap_AllocFromHeap(HEAP_ID_SAVE, sizeof(SaveData)); + ; MI_CpuClearFast(saveData, sizeof(SaveData)); @@ -97,24 +98,24 @@ SaveData* SaveData_Init (void) return saveData; } -SaveData* SaveData_Ptr (void) +SaveData *SaveData_Ptr(void) { GF_ASSERT(sSaveDataPtr != NULL); return sSaveDataPtr; } -void* SaveData_SaveTable (SaveData *saveData, int saveTableID) +void *SaveData_SaveTable(SaveData *saveData, int saveTableID) { GF_ASSERT(saveTableID < SAVE_TABLE_ENTRY_MAX); return &(saveData->body.data[saveData->pageInfo[saveTableID].location]); } -const void* SaveData_SaveTableConst (const SaveData *saveData, int saveTableID) +const void *SaveData_SaveTableConst(const SaveData *saveData, int saveTableID) { return SaveData_SaveTable(saveData, saveTableID); } -BOOL SaveData_Erase (SaveData *saveData) +BOOL SaveData_Erase(SaveData *saveData) { u8 *saveBuffer = Heap_AllocFromHeapAtEnd(HEAP_ID_APPLICATION, SAVE_SECTOR_SIZE); @@ -141,7 +142,7 @@ BOOL SaveData_Erase (SaveData *saveData) return TRUE; } -BOOL SaveData_Load (SaveData *saveData) +BOOL SaveData_Load(SaveData *saveData) { if (!saveData->backupExists) { return FALSE; @@ -157,11 +158,11 @@ BOOL SaveData_Load (SaveData *saveData) SaveDataExtra_LoadCheck(saveData, &frontierResult, &videoResult); return TRUE; } - + return FALSE; } -int SaveData_Save (SaveData *saveData) +int SaveData_Save(SaveData *saveData) { if (!saveData->backupExists) { return SAVE_RESULT_CORRUPT; @@ -188,7 +189,7 @@ int SaveData_Save (SaveData *saveData) return saveResult; } -int SaveData_SaveBlock (SaveData *saveData, int saveBlockID) +int SaveData_SaveBlock(SaveData *saveData, int saveBlockID) { GF_ASSERT(saveBlockID < SAVE_BLOCK_ID_MAX); GF_ASSERT(saveData->isNewGameData == FALSE); @@ -204,7 +205,7 @@ int SaveData_SaveBlock (SaveData *saveData, int saveBlockID) return saveResult; } -void SaveData_Clear (SaveData *saveData) +void SaveData_Clear(SaveData *saveData) { saveData->isNewGameData = TRUE; saveData->fullSaveRequired = TRUE; @@ -212,57 +213,57 @@ void SaveData_Clear (SaveData *saveData) SaveTable_Clear(&saveData->body, saveData->pageInfo); } -BOOL SaveData_BackupExists (const SaveData *saveData) +BOOL SaveData_BackupExists(const SaveData *saveData) { return saveData->backupExists; } -u32 SaveData_LoadCheckStatus (const SaveData *saveData) +u32 SaveData_LoadCheckStatus(const SaveData *saveData) { return saveData->loadCheckStatus; } -BOOL SaveData_DataExists (const SaveData *saveData) +BOOL SaveData_DataExists(const SaveData *saveData) { return saveData->dataExists; } -BOOL SaveData_IsNewGameData (const SaveData *saveData) +BOOL SaveData_IsNewGameData(const SaveData *saveData) { return saveData->isNewGameData; } -BOOL SaveData_MiscSaveBlock_InitFlag (SaveData *saveData) +BOOL SaveData_MiscSaveBlock_InitFlag(SaveData *saveData) { return MiscSaveBlock_InitFlag(SaveData_MiscSaveBlock(saveData)); } -static void SaveData_MiscSaveBlock_SetInitFlag (SaveData *saveData) +static void SaveData_MiscSaveBlock_SetInitFlag(SaveData *saveData) { MiscSaveBlock_SetInitFlag(SaveData_MiscSaveBlock(saveData)); } -BOOL SaveData_OverwriteCheck (const SaveData *saveData) +BOOL SaveData_OverwriteCheck(const SaveData *saveData) { return SaveData_IsNewGameData(saveData) && SaveData_DataExists(saveData); } -BOOL SaveData_FullSaveRequired (const SaveData *saveData) +BOOL SaveData_FullSaveRequired(const SaveData *saveData) { return saveData->fullSaveRequired; } -void SaveData_SetFullSaveRequired (void) +void SaveData_SetFullSaveRequired(void) { sSaveDataPtr->fullSaveRequired = TRUE; } -void SaveData_SaveStateInit (SaveData *saveData, int blockID) +void SaveData_SaveStateInit(SaveData *saveData, int blockID) { SaveDataState_Init(saveData, &saveData->state, blockID); } -int SaveData_SaveStateMain (SaveData *saveData) +int SaveData_SaveStateMain(SaveData *saveData) { int saveResult = SaveDataState_Main(saveData, &saveData->state); @@ -273,29 +274,29 @@ int SaveData_SaveStateMain (SaveData *saveData) return saveResult; } -void SaveData_SaveStateCancel (SaveData *saveData) +void SaveData_SaveStateCancel(SaveData *saveData) { SaveDataState_Cancel(saveData, &saveData->state); } -static void SaveData_CheckInfoInit (SaveCheckInfo *checkInfo) +static void SaveData_CheckInfoInit(SaveCheckInfo *checkInfo) { checkInfo->valid = FALSE; checkInfo->globalCounter = 0; checkInfo->blockCounter = 0; } -u16 SaveData_CalculateChecksum (const SaveData *saveData, const void *startAddress, u32 size) +u16 SaveData_CalculateChecksum(const SaveData *saveData, const void *startAddress, u32 size) { return sub_0201D628(startAddress, size); } -static u16 SaveData_CalculateFooterChecksum (const SaveData *saveData, void *startAddress, u32 size) +static u16 SaveData_CalculateFooterChecksum(const SaveData *saveData, void *startAddress, u32 size) { return sub_0201D628(startAddress, size - sizeof(SaveBlockFooter)); } -static u32 SaveData_SaveOffset (int sectorID, const SaveBlockInfo *blockInfo) +static u32 SaveData_SaveOffset(int sectorID, const SaveBlockInfo *blockInfo) { u32 offset; @@ -309,7 +310,7 @@ static u32 SaveData_SaveOffset (int sectorID, const SaveBlockInfo *blockInfo) return offset; } -static SaveBlockFooter* SaveBlockFooter_Ptr (SaveData *saveData, u32 bodyAddress, int blockID) +static SaveBlockFooter *SaveBlockFooter_Ptr(SaveData *saveData, u32 bodyAddress, int blockID) { u32 footerAddress; const SaveBlockInfo *blockInfo = &saveData->blockInfo[blockID]; @@ -323,7 +324,7 @@ static SaveBlockFooter* SaveBlockFooter_Ptr (SaveData *saveData, u32 bodyAddress return (SaveBlockFooter *)footerAddress; } -static BOOL SaveBlockFooter_Validate (SaveData *saveData, u32 bodyAddress, int blockID) +static BOOL SaveBlockFooter_Validate(SaveData *saveData, u32 bodyAddress, int blockID) { const SaveBlockInfo *blockInfo = &saveData->blockInfo[blockID]; SaveBlockFooter *footer = SaveBlockFooter_Ptr(saveData, bodyAddress, blockID); @@ -348,7 +349,7 @@ static BOOL SaveBlockFooter_Validate (SaveData *saveData, u32 bodyAddress, int b return TRUE; } -static void SaveBlockFooter_CheckInfo (SaveCheckInfo *checkInfo, SaveData *saveData, u32 bodyAddress, int blockID) +static void SaveBlockFooter_CheckInfo(SaveCheckInfo *checkInfo, SaveData *saveData, u32 bodyAddress, int blockID) { SaveBlockFooter *footer = SaveBlockFooter_Ptr(saveData, bodyAddress, blockID); @@ -357,7 +358,7 @@ static void SaveBlockFooter_CheckInfo (SaveCheckInfo *checkInfo, SaveData *saveD checkInfo->blockCounter = footer->blockCounter; } -static void SaveBlockFooter_Set (SaveData *saveData, u32 bodyAddress, int blockID) +static void SaveBlockFooter_Set(SaveData *saveData, u32 bodyAddress, int blockID) { const SaveBlockInfo *blockInfo = &saveData->blockInfo[blockID]; SaveBlockFooter *footer = SaveBlockFooter_Ptr(saveData, bodyAddress, blockID); @@ -371,7 +372,7 @@ static void SaveBlockFooter_Set (SaveData *saveData, u32 bodyAddress, int blockI footer->checksum = SaveData_CalculateFooterChecksum(saveData, startAddress, blockInfo->size); } -static int SaveCheckInfo_CompareCounters (u32 counter1, u32 counter2) +static int SaveCheckInfo_CompareCounters(u32 counter1, u32 counter2) { if (counter1 == 0xffffffff && counter2 == 0) { return -1; @@ -386,7 +387,7 @@ static int SaveCheckInfo_CompareCounters (u32 counter1, u32 counter2) return 0; } -static int SaveCheckInfo_CompareSectors (const SaveCheckInfo *checkInfo1, const SaveCheckInfo *checkInfo2, int *currentSector, int *staleSector) +static int SaveCheckInfo_CompareSectors(const SaveCheckInfo *checkInfo1, const SaveCheckInfo *checkInfo2, int *currentSector, int *staleSector) { int globalDiff = SaveCheckInfo_CompareCounters(checkInfo1->globalCounter, checkInfo2->globalCounter); int blockDiff = SaveCheckInfo_CompareCounters(checkInfo1->blockCounter, checkInfo2->blockCounter); @@ -428,7 +429,7 @@ static int SaveCheckInfo_CompareSectors (const SaveCheckInfo *checkInfo1, const } } -static void SaveData_SetBlockCheckInfo (SaveData *saveData, const SaveCheckInfo *normalCheck, const SaveCheckInfo *boxCheck, int normalOffset, int boxOffset) +static void SaveData_SetBlockCheckInfo(SaveData *saveData, const SaveCheckInfo *normalCheck, const SaveCheckInfo *boxCheck, int normalOffset, int boxOffset) { saveData->globalCounter = normalCheck[normalOffset].globalCounter; saveData->blockCounters[SAVE_BLOCK_ID_NORMAL] = normalCheck[normalOffset].blockCounter; @@ -437,7 +438,7 @@ static void SaveData_SetBlockCheckInfo (SaveData *saveData, const SaveCheckInfo saveData->blockOffsets[SAVE_BLOCK_ID_BOXES] = boxOffset; } -static int SaveData_LoadCheck (SaveData *saveData) +static int SaveData_LoadCheck(SaveData *saveData) { u8 *primaryBuffer = Heap_AllocFromHeapAtEnd(HEAP_ID_APPLICATION, SAVE_SECTOR_SIZE * SAVE_PAGE_MAX); u8 *backupBuffer = Heap_AllocFromHeapAtEnd(HEAP_ID_APPLICATION, SAVE_SECTOR_SIZE * SAVE_PAGE_MAX); @@ -508,8 +509,8 @@ static int SaveData_LoadCheck (SaveData *saveData) } } - if (normalResult == SECTOR_RESULT_PARTIAL_VALID - && boxResult == SECTOR_RESULT_PARTIAL_VALID + if (normalResult == SECTOR_RESULT_PARTIAL_VALID + && boxResult == SECTOR_RESULT_PARTIAL_VALID && currNormalSector == currBoxSector) { GF_ASSERT(normalInfo[currNormalSector].globalCounter == boxInfo[currBoxSector].globalCounter); SaveData_SetBlockCheckInfo(saveData, normalInfo, boxInfo, currNormalSector, currBoxSector); @@ -521,7 +522,7 @@ static int SaveData_LoadCheck (SaveData *saveData) } } -static void SaveDataExtra_LoadCheck (SaveData *saveData, int *frontierResult, int *videoResult) +static void SaveDataExtra_LoadCheck(SaveData *saveData, int *frontierResult, int *videoResult) { int loadResult; MiscSaveBlock *miscSave = SaveData_MiscSaveBlock(saveData); @@ -569,7 +570,7 @@ static void SaveDataExtra_LoadCheck (SaveData *saveData, int *frontierResult, in } } -static BOOL SaveBlock_Load (int sectorID, const SaveBlockInfo *blockInfo, u8 *blockOffset) +static BOOL SaveBlock_Load(int sectorID, const SaveBlockInfo *blockInfo, u8 *blockOffset) { u32 saveOffset = SaveData_SaveOffset(sectorID, blockInfo); blockOffset += blockInfo->offset; @@ -577,7 +578,7 @@ static BOOL SaveBlock_Load (int sectorID, const SaveBlockInfo *blockInfo, u8 *bl return SaveData_CardLoad(saveOffset, blockOffset, blockInfo->size); } -static BOOL SaveDataState_Load (SaveData *saveData) +static BOOL SaveDataState_Load(SaveData *saveData) { int i; @@ -598,7 +599,7 @@ static BOOL SaveDataState_Load (SaveData *saveData) return TRUE; } -static s32 SaveDataState_InitBlock (SaveData *saveData, int blockID, u8 sectorID) +static s32 SaveDataState_InitBlock(SaveData *saveData, int blockID, u8 sectorID) { const SaveBlockInfo *blockInfo = &saveData->blockInfo[blockID]; @@ -610,7 +611,7 @@ static s32 SaveDataState_InitBlock (SaveData *saveData, int blockID, u8 sectorID return SaveData_CardSave_Init(saveOffset, bodyOffset, blockInfo->size - sizeof(SaveBlockFooter)); } -static s32 SaveDataState_InitFooter (SaveData *saveData, int blockID, u8 sectorID) +static s32 SaveDataState_InitFooter(SaveData *saveData, int blockID, u8 sectorID) { const SaveBlockInfo *blockInfo = &saveData->blockInfo[blockID]; @@ -620,7 +621,7 @@ static s32 SaveDataState_InitFooter (SaveData *saveData, int blockID, u8 sectorI return SaveData_CardSave_Init(saveOffset, bodyOffset, sizeof(SaveBlockFooter)); } -static s32 SaveDataState_InitFooter_Secondary (SaveData *saveData, int blockID, u8 sectorID) +static s32 SaveDataState_InitFooter_Secondary(SaveData *saveData, int blockID, u8 sectorID) { const SaveBlockInfo *blockInfo = &saveData->blockInfo[blockID]; @@ -630,7 +631,7 @@ static s32 SaveDataState_InitFooter_Secondary (SaveData *saveData, int blockID, return SaveData_CardSave_Init(saveOffset, bodyOffset, SECONDARY_FOOTER_SIZE); } -static void SaveDataState_Init (SaveData *saveData, SaveDataState *state, int blockID) +static void SaveDataState_Init(SaveData *saveData, SaveDataState *state, int blockID) { for (int i = 0; i < SAVE_BLOCK_ID_MAX; i++) { state->blockCounterBackup[i] = saveData->blockCounters[i]; @@ -664,7 +665,7 @@ static void SaveDataState_Init (SaveData *saveData, SaveDataState *state, int bl SleepLock(1); } -static int SaveDataState_Main (SaveData *saveData, SaveDataState *state) +static int SaveDataState_Main(SaveData *saveData, SaveDataState *state) { BOOL saveResult; @@ -733,7 +734,7 @@ static int SaveDataState_Main (SaveData *saveData, SaveDataState *state) return 0; } -static void SaveDataState_End (SaveData *saveData, SaveDataState *state, int saveResult) +static void SaveDataState_End(SaveData *saveData, SaveDataState *state, int saveResult) { int i; @@ -758,7 +759,7 @@ static void SaveDataState_End (SaveData *saveData, SaveDataState *state, int sav SleepUnlock(1); } -static void SaveDataState_Cancel (SaveData *saveData, SaveDataState *state) +static void SaveDataState_Cancel(SaveData *saveData, SaveDataState *state) { int i; @@ -783,7 +784,7 @@ static void SaveDataState_Cancel (SaveData *saveData, SaveDataState *state) SleepUnlock(1); } -BOOL SaveDataState_Save (SaveData *saveData) +BOOL SaveDataState_Save(SaveData *saveData) { SaveDataState state; SaveDataState_Init(saveData, &state, SAVE_BLOCK_ID_MAX); @@ -798,7 +799,7 @@ BOOL SaveDataState_Save (SaveData *saveData) return saveResult; } -static BOOL SaveBlockFooter_Erase (const SaveData *saveData, int blockID, int sectorID) +static BOOL SaveBlockFooter_Erase(const SaveData *saveData, int blockID, int sectorID) { SaveBlockFooter footer; const SaveBlockInfo *blockInfo = &saveData->blockInfo[blockID]; @@ -809,7 +810,7 @@ static BOOL SaveBlockFooter_Erase (const SaveData *saveData, int blockID, int se return SaveData_CardSave(saveOffset, &footer, sizeof(SaveBlockFooter)); } -int SaveTableEntry_BodySize (int saveTableID) +int SaveTableEntry_BodySize(int saveTableID) { const SaveTableEntry *saveTable = gSaveTable; @@ -822,7 +823,7 @@ int SaveTableEntry_BodySize (int saveTableID) return size; } -static void SavePageInfo_Init (SavePageInfo *pageInfo) +static void SavePageInfo_Init(SavePageInfo *pageInfo) { const SaveTableEntry *saveTable = gSaveTable; int i, totalSize = 0; @@ -848,7 +849,7 @@ static void SavePageInfo_Init (SavePageInfo *pageInfo) GF_ASSERT(totalSize <= SAVE_SECTOR_SIZE * SAVE_PAGE_MAX); } -static void SaveBlockInfo_Init (SaveBlockInfo *blockInfo, const SavePageInfo *pageInfo) +static void SaveBlockInfo_Init(SaveBlockInfo *blockInfo, const SavePageInfo *pageInfo) { int totalSectors = 0, blockOffset = 0, i, page = 0; @@ -874,7 +875,7 @@ static void SaveBlockInfo_Init (SaveBlockInfo *blockInfo, const SavePageInfo *pa GF_ASSERT(totalSectors <= SAVE_PAGE_MAX); } -static void SaveTable_Clear (SaveDataBody *body, const SavePageInfo *pageInfo) +static void SaveTable_Clear(SaveDataBody *body, const SavePageInfo *pageInfo) { const SaveTableEntry *saveTable = gSaveTable; MI_CpuClearFast(body->data, sizeof(body->data)); @@ -882,7 +883,7 @@ static void SaveTable_Clear (SaveDataBody *body, const SavePageInfo *pageInfo) int i, size; void *page; u32 location; - + for (i = 0; i < gSaveTableSize; i++) { location = pageInfo[i].location; page = &body->data[location]; @@ -892,7 +893,7 @@ static void SaveTable_Clear (SaveDataBody *body, const SavePageInfo *pageInfo) } } -void SaveDataExtra_Init (SaveData *saveData) +void SaveDataExtra_Init(SaveData *saveData) { const SaveTableEntry *extraTable = gExtraSaveTable; @@ -922,7 +923,7 @@ void SaveDataExtra_Init (SaveData *saveData) SaveData_MiscSaveBlock_SetInitFlag(saveData); } -static void SaveCheckFooter_Set (const SaveData *saveData, void *saveBody, int extraSaveID, u32 size) +static void SaveCheckFooter_Set(const SaveData *saveData, void *saveBody, int extraSaveID, u32 size) { SaveCheckFooter *footer = (SaveCheckFooter *)(saveBody + size); @@ -933,7 +934,7 @@ static void SaveCheckFooter_Set (const SaveData *saveData, void *saveBody, int e footer->checksum = sub_0201D628(saveBody, size + sizeof(SaveCheckFooter) - 2); } -static BOOL SaveCheckFooter_Validate (const SaveData *saveData, void *saveBody, int extraSaveID, u32 size) +static BOOL SaveCheckFooter_Validate(const SaveData *saveData, void *saveBody, int extraSaveID, u32 size) { SaveCheckFooter *footer = (SaveCheckFooter *)(saveBody + size); @@ -956,12 +957,12 @@ static BOOL SaveCheckFooter_Validate (const SaveData *saveData, void *saveBody, return TRUE; } -static u32 SaveCheckFooter_SaveCounter (void *saveBody, u32 size) +static u32 SaveCheckFooter_SaveCounter(void *saveBody, u32 size) { return ((SaveCheckFooter *)(saveBody + size))->saveCounter; } -int SaveDataExtra_Save (const SaveData *saveData, int extraSaveID, void *data) +int SaveDataExtra_Save(const SaveData *saveData, int extraSaveID, void *data) { SleepLock(1); GF_ASSERT(extraSaveID < gExtraSaveTableSize); @@ -1001,14 +1002,14 @@ int SaveDataExtra_Save (const SaveData *saveData, int extraSaveID, void *data) } } -int SaveDataExtra_SaveMirror (SaveData *saveData, int extraSaveID, void *data) +int SaveDataExtra_SaveMirror(SaveData *saveData, int extraSaveID, void *data) { SleepLock(1); GF_ASSERT(extraSaveID < gExtraSaveTableSize); const SaveTableEntry *saveTable = &gExtraSaveTable[extraSaveID]; GF_ASSERT(saveTable->dataID == extraSaveID); - + u32 size = saveTable->sizeFunc() + sizeof(SaveCheckFooter); u32 currKey, oldKey, newKey; @@ -1044,7 +1045,7 @@ int SaveDataExtra_SaveMirror (SaveData *saveData, int extraSaveID, void *data) } } -void* SaveDataExtra_Get (SaveData *saveData, int heapID, int extraSaveID, int *loadResult) +void *SaveDataExtra_Get(SaveData *saveData, int heapID, int extraSaveID, int *loadResult) { GF_ASSERT(extraSaveID < gExtraSaveTableSize); @@ -1102,7 +1103,7 @@ void* SaveDataExtra_Get (SaveData *saveData, int heapID, int extraSaveID, int *l return ret; } -void* SaveDataExtra_Mirror (SaveData *saveData, int heapID, int extraSaveID, int *loadResult, BOOL *isOld) +void *SaveDataExtra_Mirror(SaveData *saveData, int heapID, int extraSaveID, int *loadResult, BOOL *isOld) { const SaveTableEntry *saveTable; void *ret; @@ -1126,7 +1127,7 @@ void* SaveDataExtra_Mirror (SaveData *saveData, int heapID, int extraSaveID, int SaveData_CardLoad((PRIMARY_SECTOR_START + saveTable->blockID) * SAVE_SECTOR_SIZE, ret, size); primaryResult = SaveCheckFooter_Validate(saveData, ret, extraSaveID, saveTable->sizeFunc()); - + MI_CpuCopy8(ret, &primaryKey, sizeof(u32)); SaveData_CardLoad((BACKUP_SECTOR_START + saveTable->blockID) * SAVE_SECTOR_SIZE, ret, size); @@ -1137,8 +1138,8 @@ void* SaveDataExtra_Mirror (SaveData *saveData, int heapID, int extraSaveID, int *loadResult = LOAD_RESULT_OK; *isOld = FALSE; - if (primaryResult == TRUE - && backupResult == FALSE + if (primaryResult == TRUE + && backupResult == FALSE && currKey == primaryKey) { if (keyFlag == 1) { @@ -1150,8 +1151,8 @@ void* SaveDataExtra_Mirror (SaveData *saveData, int heapID, int extraSaveID, int return ret; } - if (primaryResult == FALSE - && backupResult == TRUE + if (primaryResult == FALSE + && backupResult == TRUE && currKey == backupKey) { if (keyFlag == 0) { @@ -1193,17 +1194,17 @@ void* SaveDataExtra_Mirror (SaveData *saveData, int heapID, int extraSaveID, int return ret; } -static void SaveDataExtra_SaveKey (SaveData *saveData, int extraSaveID, u32 *returnKey, u32 *oldKey, u8 *keyFlag) +static void SaveDataExtra_SaveKey(SaveData *saveData, int extraSaveID, u32 *returnKey, u32 *oldKey, u8 *keyFlag) { MiscSaveBlock_ExtraSaveKey(SaveData_MiscSaveBlock(saveData), extraSaveID, returnKey, oldKey, keyFlag); } -static void SaveDataExtra_SetSaveKey (SaveData *saveData, int extraSaveID, u32 newKey, u32 oldKey, u8 keyFlag) +static void SaveDataExtra_SetSaveKey(SaveData *saveData, int extraSaveID, u32 newKey, u32 oldKey, u8 keyFlag) { MiscSaveBlock_SetExtraSaveKey(SaveData_MiscSaveBlock(saveData), extraSaveID, newKey, oldKey, keyFlag); } -BOOL SaveData_CardBackupType (void) +BOOL SaveData_CardBackupType(void) { s32 lockID = OS_GetLockID(); GF_ASSERT(lockID != OS_LOCK_ID_ERROR); @@ -1226,7 +1227,7 @@ BOOL SaveData_CardBackupType (void) return result != CARD_BACKUP_TYPE_NOT_USE; } -BOOL SaveData_CardSave (u32 address, void *data, u32 size) +BOOL SaveData_CardSave(u32 address, void *data, u32 size) { s32 lockID = SaveData_CardSave_Init(address, data, size); BOOL result; @@ -1238,7 +1239,7 @@ BOOL SaveData_CardSave (u32 address, void *data, u32 size) return result; } -BOOL SaveData_CardLoad (u32 address, void *data, u32 size) +BOOL SaveData_CardLoad(u32 address, void *data, u32 size) { s32 lockID = OS_GetLockID(); GF_ASSERT(lockID != OS_LOCK_ID_ERROR); @@ -1259,12 +1260,12 @@ BOOL SaveData_CardLoad (u32 address, void *data, u32 size) return result; } -static void CB_SaveComplete (void *unused) +static void CB_SaveComplete(void *unused) { sSaveComplete = TRUE; } -static s32 SaveData_CardSave_Init (u32 address, void *data, u32 size) +static s32 SaveData_CardSave_Init(u32 address, void *data, u32 size) { s32 lockID = OS_GetLockID(); GF_ASSERT(lockID != OS_LOCK_ID_ERROR); @@ -1284,7 +1285,7 @@ static s32 SaveData_CardSave_Init (u32 address, void *data, u32 size) return lockID; } -static BOOL SaveData_CardSave_Main (s32 lockID, BOOL lockFlag, BOOL *result) +static BOOL SaveData_CardSave_Main(s32 lockID, BOOL lockFlag, BOOL *result) { if (sSaveComplete == TRUE) { if (!lockFlag) { @@ -1315,7 +1316,7 @@ static BOOL SaveData_CardSave_Main (s32 lockID, BOOL lockFlag, BOOL *result) return FALSE; } -static void SaveData_CardSave_Error (s32 lockID, int errorID) +static void SaveData_CardSave_Error(s32 lockID, int errorID) { CARD_UnlockBackup(lockID); OS_ReleaseLockID(lockID); @@ -1324,7 +1325,7 @@ static void SaveData_CardSave_Error (s32 lockID, int errorID) sub_0209AA74(HEAP_ID_SAVE, errorID); } -BOOL SaveData_Checksum (int saveTableID) +BOOL SaveData_Checksum(int saveTableID) { SaveData *saveData = SaveData_Ptr(); void *table = SaveData_SaveTable(saveData, saveTableID); @@ -1339,13 +1340,13 @@ BOOL SaveData_Checksum (int saveTableID) return TRUE; } - u32 address = (u32) &halfTable[halfSize]; + u32 address = (u32)&halfTable[halfSize]; GF_ASSERT(0); return FALSE; } -void SaveData_SetChecksum (int saveTableID) +void SaveData_SetChecksum(int saveTableID) { SaveData *saveData = SaveData_Ptr(); void *table = SaveData_SaveTable(saveData, saveTableID); @@ -1358,5 +1359,5 @@ void SaveData_SetChecksum (int saveTableID) halfTable[halfSize] = checksum; - u32 address = (u32) &halfTable[halfSize]; + u32 address = (u32)&halfTable[halfSize]; } diff --git a/src/savedata/save_table.c b/src/savedata/save_table.c index b5eb13b6b1..3950724e21 100644 --- a/src/savedata/save_table.c +++ b/src/savedata/save_table.c @@ -1,24 +1,28 @@ +#include "savedata/save_table.h" + #include #include -#include "savedata/save_table.h" - -#include "unk_02014D38.h" +#include "bag.h" +#include "field_overworld_state.h" +#include "journal.h" +#include "party.h" +#include "poffin.h" +#include "poketch_data.h" #include "savedata.h" +#include "savedata_misc.h" +#include "unk_02014D38.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" #include "unk_0202602C.h" #include "unk_020261E4.h" #include "unk_0202631C.h" -#include "savedata_misc.h" #include "unk_02027F84.h" #include "unk_02028124.h" #include "unk_0202854C.h" #include "unk_020298BC.h" -#include "poffin.h" #include "unk_0202ACE0.h" #include "unk_0202B37C.h" -#include "journal.h" #include "unk_0202C7FC.h" #include "unk_0202C858.h" #include "unk_0202C9F4.h" @@ -38,13 +42,10 @@ #include "unk_02030880.h" #include "unk_02030CE8.h" #include "unk_02030EA4.h" -#include "field_overworld_state.h" -#include "vars_flags.h" -#include "poketch_data.h" #include "unk_020797C8.h" -#include "party.h" -#include "bag.h" +#include "vars_flags.h" +// clang-format off const SaveTableEntry gSaveTable[] = { { SAVE_TABLE_ENTRY_SYSTEM, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)SystemData_SaveSize, (SaveEntryInitFunc)SystemData_Init }, { SAVE_TABLE_ENTRY_PLAYER, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Player_SaveSize, (SaveEntryInitFunc)Player_Init }, @@ -85,31 +86,33 @@ const SaveTableEntry gSaveTable[] = { { SAVE_TABLE_ENTRY_WIFI_QUESTIONS, SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)WiFiQuestion_SaveSize, (SaveEntryInitFunc)WiFiQuestion_Init }, { SAVE_TABLE_ENTRY_PC_BOXES, SAVE_BLOCK_ID_BOXES, (SaveEntrySizeFunc)PCBoxes_SaveSize, (SaveEntryInitFunc)PCBoxes_Init }, }; +// clang-format on const int gSaveTableSize = NELEMS(gSaveTable); -TVBroadcast* SaveData_TVBroadcast(SaveData *save) +TVBroadcast *SaveData_TVBroadcast(SaveData *save) { SaveData_Checksum(SAVE_TABLE_ENTRY_TV_BROADCAST); return SaveData_SaveTable(save, SAVE_TABLE_ENTRY_TV_BROADCAST); } -PCBoxes* SaveData_PCBoxes(SaveData *save) +PCBoxes *SaveData_PCBoxes(SaveData *save) { return SaveData_SaveTable(save, SAVE_TABLE_ENTRY_PC_BOXES); } -MysteryGift* SaveData_MysteryGift(SaveData *save) +MysteryGift *SaveData_MysteryGift(SaveData *save) { SaveData_Checksum(SAVE_TABLE_ENTRY_MYSTERY_GIFT); return SaveData_SaveTable(save, SAVE_TABLE_ENTRY_MYSTERY_GIFT); } -PalParkTransfer* SaveData_PalParkTransfer(SaveData *save) +PalParkTransfer *SaveData_PalParkTransfer(SaveData *save) { return SaveData_SaveTable(save, SAVE_TABLE_ENTRY_PAL_PARK_TRANSFER); } +// clang-format off const SaveTableEntry gExtraSaveTable[] = { { EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, SAVE_PAGE_MAX, (SaveEntrySizeFunc)HallOfFame_SaveSize, (SaveEntryInitFunc)HallOfFame_Init }, { EXTRA_SAVE_TABLE_ENTRY_FRONTIER, SAVE_PAGE_MAX + 3, (SaveEntrySizeFunc)Frontier_Extra_SaveSize, (SaveEntryInitFunc)Frontier_Extra_Init }, @@ -118,10 +121,11 @@ const SaveTableEntry gExtraSaveTable[] = { { EXTRA_SAVE_TABLE_ENTRY_DL_RECORDINGS_1, SAVE_PAGE_MAX + 8, (SaveEntrySizeFunc)BattleRecording_SaveSize, (SaveEntryInitFunc)BattleRecording_Init }, { EXTRA_SAVE_TABLE_ENTRY_DL_RECORDINGS_2, SAVE_PAGE_MAX + 10, (SaveEntrySizeFunc)BattleRecording_SaveSize, (SaveEntryInitFunc)BattleRecording_Init }, }; +// clang-format on const int gExtraSaveTableSize = NELEMS(gExtraSaveTable); -HallOfFame* SaveData_HallOfFame(SaveData *save, int heapID, int *resultCode) +HallOfFame *SaveData_HallOfFame(SaveData *save, int heapID, int *resultCode) { return SaveDataExtra_Get(save, heapID, EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, resultCode); } @@ -131,7 +135,7 @@ int SaveData_SaveHallOfFame(SaveData *save, HallOfFame *hof) return SaveDataExtra_Save(save, EXTRA_SAVE_TABLE_ENTRY_HALL_OF_FAME, hof); } -BattleRecording* SaveData_BattleRecording(SaveData *save, int heapID, int *resultCode, int recNum) +BattleRecording *SaveData_BattleRecording(SaveData *save, int heapID, int *resultCode, int recNum) { BOOL tmp; return SaveDataExtra_Mirror(save, heapID, EXTRA_SAVE_TABLE_ENTRY_MY_RECORDINGS + recNum, resultCode, &tmp); @@ -142,7 +146,7 @@ int SaveData_SaveBattleRecording(SaveData *save, BattleRecording *rec, int recNu return SaveDataExtra_SaveMirror(save, EXTRA_SAVE_TABLE_ENTRY_MY_RECORDINGS + recNum, rec); } -BattleFrontierStage* SaveData_BattleFrontierStage(SaveData *save, int heapID, int *resultCode) +BattleFrontierStage *SaveData_BattleFrontierStage(SaveData *save, int heapID, int *resultCode) { BOOL tmp; return SaveDataExtra_Mirror(save, heapID, EXTRA_SAVE_TABLE_ENTRY_FRONTIER, resultCode, &tmp); diff --git a/src/savedata_misc.c b/src/savedata_misc.c index 5a370501e2..78b4aff04e 100644 --- a/src/savedata_misc.c +++ b/src/savedata_misc.c @@ -1,3 +1,5 @@ +#include "savedata_misc.h" + #include #include @@ -7,16 +9,15 @@ #include "unk_02014A84.h" #include "unk_02014D38.h" -#include "savedata_misc.h" #include "unk_02027B70.h" #include "unk_02027F50.h" -int MiscSaveBlock_SaveSize (void) +int MiscSaveBlock_SaveSize(void) { return sizeof(MiscSaveBlock); } -void MiscSaveBlock_Init (MiscSaveBlock *miscSave) +void MiscSaveBlock_Init(MiscSaveBlock *miscSave) { MI_CpuClearFast(miscSave, sizeof(MiscSaveBlock)); @@ -38,100 +39,100 @@ void MiscSaveBlock_Init (MiscSaveBlock *miscSave) } } -MiscSaveBlock* SaveData_MiscSaveBlock (SaveData *saveData) +MiscSaveBlock *SaveData_MiscSaveBlock(SaveData *saveData) { return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_MISC); } -const MiscSaveBlock* SaveData_MiscSaveBlockConst (const SaveData *saveData) +const MiscSaveBlock *SaveData_MiscSaveBlockConst(const SaveData *saveData) { return SaveData_SaveTableConst(saveData, SAVE_TABLE_ENTRY_MISC); } -UnkStruct_02027854* sub_02027854 (SaveData *saveData) +UnkStruct_02027854 *sub_02027854(SaveData *saveData) { MiscSaveBlock *miscSave = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_MISC); return miscSave->unk_00; } -UnkStruct_02027860* sub_02027860 (SaveData *saveData) +UnkStruct_02027860 *sub_02027860(SaveData *saveData) { MiscSaveBlock *miscSave = SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_MISC); return &miscSave->unk_680; } -const u16* MiscSaveBlock_RivalName (const MiscSaveBlock* miscSave) +const u16 *MiscSaveBlock_RivalName(const MiscSaveBlock *miscSave) { return miscSave->rivalName; } -void MiscSaveBlock_SetRivalName (MiscSaveBlock* miscSave, Strbuf *name) +void MiscSaveBlock_SetRivalName(MiscSaveBlock *miscSave, Strbuf *name) { Strbuf_ToChars(name, miscSave->rivalName, TRAINER_NAME_LEN + 1); } -const u16* MiscSaveBlock_TabletName (const MiscSaveBlock *miscSave) +const u16 *MiscSaveBlock_TabletName(const MiscSaveBlock *miscSave) { return miscSave->tabletName; } -void MiscSaveBlock_SetTabletName (MiscSaveBlock *miscSave, Strbuf *name) +void MiscSaveBlock_SetTabletName(MiscSaveBlock *miscSave, Strbuf *name) { Strbuf_ToChars(name, miscSave->tabletName, TABLET_NAME_LEN + 1); } -void MiscSaveBlock_SetInitFlag (MiscSaveBlock *miscSave) +void MiscSaveBlock_SetInitFlag(MiscSaveBlock *miscSave) { miscSave->extraSaveInitalized = TRUE; } -u32 MiscSaveBlock_InitFlag (const MiscSaveBlock *miscSave) +u32 MiscSaveBlock_InitFlag(const MiscSaveBlock *miscSave) { return miscSave->extraSaveInitalized; } -void MiscSaveBlock_SetFavoriteMon (MiscSaveBlock *miscSave, int species, int form, int isEgg) +void MiscSaveBlock_SetFavoriteMon(MiscSaveBlock *miscSave, int species, int form, int isEgg) { miscSave->favoriteMon = species; miscSave->favoriteMonForm = form; miscSave->favoriteMonIsEgg = isEgg; } -void MiscSaveBlock_FavoriteMon (const MiscSaveBlock *miscSave, int *species, int *form, int *isEgg) +void MiscSaveBlock_FavoriteMon(const MiscSaveBlock *miscSave, int *species, int *form, int *isEgg) { *species = miscSave->favoriteMon; *form = miscSave->favoriteMonForm; *isEgg = miscSave->favoriteMonIsEgg; } -void MiscSaveBlock_IntroMsg (const MiscSaveBlock *miscSave, Sentence *message) +void MiscSaveBlock_IntroMsg(const MiscSaveBlock *miscSave, Sentence *message) { *message = miscSave->introMsg; } -void MiscSaveBlock_SetIntroMsg (MiscSaveBlock *miscSave, const Sentence *message) +void MiscSaveBlock_SetIntroMsg(MiscSaveBlock *miscSave, const Sentence *message) { miscSave->introMsg = *message; } -void MiscSaveBlock_VsRecorderColor (const MiscSaveBlock *miscSave, u8 *color) +void MiscSaveBlock_VsRecorderColor(const MiscSaveBlock *miscSave, u8 *color) { *color = miscSave->vsRecorderColor; } -void MiscSaveBlock_SetVsRecorderColor (MiscSaveBlock *miscSave, u8 color) +void MiscSaveBlock_SetVsRecorderColor(MiscSaveBlock *miscSave, u8 color) { miscSave->vsRecorderColor = color; } -void MiscSaveBlock_ExtraSaveKey (const MiscSaveBlock *miscSave, int saveTableID, u32 *currKey, u32 *oldKey, u8 *keyFlag) +void MiscSaveBlock_ExtraSaveKey(const MiscSaveBlock *miscSave, int saveTableID, u32 *currKey, u32 *oldKey, u8 *keyFlag) { *currKey = miscSave->extraKey.keys[saveTableID - 1]; *oldKey = miscSave->extraKey.oldKeys[saveTableID - 1]; *keyFlag = miscSave->extraKey.keyFlags[saveTableID - 1]; } -void MiscSaveBlock_SetExtraSaveKey (MiscSaveBlock *miscSave, int saveTableID, u32 currKey, u32 oldKey, u8 keyFlag) +void MiscSaveBlock_SetExtraSaveKey(MiscSaveBlock *miscSave, int saveTableID, u32 currKey, u32 oldKey, u8 keyFlag) { miscSave->extraKey.keys[saveTableID - 1] = currKey; miscSave->extraKey.oldKeys[saveTableID - 1] = oldKey; diff --git a/src/scrcmd.c b/src/scrcmd.c index 836a6cc275..19fffdbdc2 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1,20 +1,19 @@ +#include "scrcmd.h" + #include +#include #include -#include "inlines.h" -#include "core_sys.h" +#include "constants/overworld_weather.h" +#include "constants/species.h" +#include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02014EC4_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_02025CCC_decl.h" -#include "trainer_info.h" #include "struct_decls/struct_02026218_decl.h" #include "struct_decls/struct_02026310_decl.h" -#include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02028430_decl.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_020298B0_decl.h" @@ -29,86 +28,132 @@ #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" -#include "overlay005/struct_ov5_021DC1A4_decl.h" -#include "overlay005/struct_ov5_021E1FF4_decl.h" -#include "overlay006/struct_ov6_02246204_decl.h" - -#include "constdata/const_020F8BE0.h" -#include "constdata/const_020EAB80.h" -#include "constdata/const_020EAC58.h" - +#include "struct_defs/choose_starter_data.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0202A93C.h" #include "struct_defs/struct_0202D7B0.h" #include "struct_defs/struct_0202DF8C.h" -#include "field/field_system.h" -#include "field/field_system_sub2_t.h" #include "struct_defs/struct_0203D8AC.h" #include "struct_defs/struct_0203E608.h" #include "struct_defs/struct_02041DC8.h" #include "struct_defs/struct_02042434.h" -#include "struct_defs/choose_starter_data.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02098C44.h" -#include "struct_defs/pokemon_summary.h" -#include "overlay005/struct_ov5_021DD42C.h" + +#include "field/field_system.h" +#include "field/field_system_sub2_t.h" #include "overlay005/map_object_anim_cmd.h" +#include "overlay005/ov5_021D431C.h" +#include "overlay005/ov5_021D5EB8.h" +#include "overlay005/ov5_021DC018.h" +#include "overlay005/ov5_021DD42C.h" +#include "overlay005/ov5_021DDAE4.h" +#include "overlay005/ov5_021DFB54.h" +#include "overlay005/ov5_021E1B08.h" +#include "overlay005/ov5_021E1D20.h" +#include "overlay005/ov5_021E779C.h" +#include "overlay005/ov5_021EA874.h" +#include "overlay005/ov5_021ECC20.h" +#include "overlay005/ov5_021EE7D4.h" +#include "overlay005/ov5_021EFB0C.h" +#include "overlay005/ov5_021F0E84.h" +#include "overlay005/ov5_021F6454.h" +#include "overlay005/ov5_021F77A8.h" +#include "overlay005/struct_ov5_021DC1A4_decl.h" +#include "overlay005/struct_ov5_021DD42C.h" +#include "overlay005/struct_ov5_021E1FF4_decl.h" +#include "overlay005/vs_seeker.h" +#include "overlay006/ov6_0223E140.h" +#include "overlay006/ov6_02242AF0.h" +#include "overlay006/ov6_02243004.h" +#include "overlay006/ov6_02243218.h" +#include "overlay006/ov6_02243258.h" +#include "overlay006/ov6_02246184.h" +#include "overlay006/ov6_02246C24.h" +#include "overlay006/ov6_02246F00.h" +#include "overlay006/ov6_02247078.h" +#include "overlay006/ov6_022475B0.h" +#include "overlay006/ov6_02247830.h" +#include "overlay006/ov6_02247D30.h" +#include "overlay006/ov6_02247F5C.h" +#include "overlay006/ov6_02248948.h" +#include "overlay006/struct_ov6_02246204_decl.h" +#include "overlay007/communication_club.h" +#include "overlay007/ov7_0224B4E8.h" +#include "overlay007/ov7_0224CD28.h" +#include "overlay008/ov8_02249960.h" +#include "overlay009/ov9_02249960.h" +#include "overlay023/ov23_022521F0.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay090/struct_ov90_021D0D80.h" #include "overlay098/struct_ov98_02247168.h" #include "overlay104/struct_ov104_02230BE4.h" +#include "savedata/save_table.h" -#include "unk_02001AF4.h" -#include "unk_020041CC.h" +#include "bag.h" +#include "camera.h" +#include "comm_player_manager.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_comm_manager.h" +#include "field_map_change.h" +#include "field_overworld_state.h" +#include "field_script_context.h" +#include "field_system.h" +#include "heap.h" +#include "inlines.h" +#include "journal.h" +#include "map_header_data.h" +#include "map_object.h" +#include "map_object_move.h" #include "message.h" #include "message_util.h" +#include "party.h" +#include "player_avatar.h" +#include "poffin.h" +#include "pokemon.h" +#include "pokeradar.h" +#include "poketch_data.h" +#include "roaming_pokemon.h" +#include "rtc.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_data.h" +#include "trainer_info.h" +#include "unk_02001AF4.h" +#include "unk_020041CC.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "rtc.h" #include "unk_02014D38.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" -#include "camera.h" -#include "strbuf.h" -#include "savedata/save_table.h" -#include "savedata.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_020261E4.h" #include "unk_0202631C.h" #include "unk_02028124.h" #include "unk_0202854C.h" #include "unk_020298BC.h" -#include "poffin.h" #include "unk_0202ACE0.h" -#include "journal.h" #include "unk_0202C9F4.h" #include "unk_0202CD50.h" #include "unk_0202D7A8.h" #include "unk_0202DF8C.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" #include "unk_02038FFC.h" #include "unk_020393C8.h" -#include "map_header_data.h" -#include "field_overworld_state.h" -#include "field_system.h" #include "unk_0203D1B8.h" -#include "field_script_context.h" #include "unk_0203E880.h" -#include "scrcmd.h" #include "unk_02046AD4.h" #include "unk_02046C7C.h" #include "unk_020474B8.h" @@ -139,35 +184,25 @@ #include "unk_0204FAB4.h" #include "unk_0205003C.h" #include "unk_02050568.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_02050A74.h" #include "unk_020528D0.h" #include "unk_02052C6C.h" -#include "field_map_change.h" #include "unk_020553DC.h" #include "unk_02055808.h" #include "unk_020559DC.h" -#include "poketch_data.h" #include "unk_0205749C.h" -#include "comm_player_manager.h" -#include "field_comm_manager.h" #include "unk_0205B33C.h" #include "unk_0205C22C.h" #include "unk_0205C980.h" #include "unk_0205D8CC.h" #include "unk_0205DFC4.h" -#include "player_avatar.h" -#include "map_object.h" -#include "map_object_move.h" #include "unk_020655F4.h" -#include "pokeradar.h" #include "unk_02069BE0.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_0206B70C.h" #include "unk_0206C0E8.h" -#include "roaming_pokemon.h" #include "unk_0206C660.h" #include "unk_0206C784.h" #include "unk_0206CCB0.h" @@ -178,12 +213,7 @@ #include "unk_02071CD0.h" #include "unk_02071D40.h" #include "unk_020722AC.h" -#include "constants/species.h" -#include "pokemon.h" -#include "trainer_data.h" #include "unk_020797C8.h" -#include "party.h" -#include "bag.h" #include "unk_0207DA28.h" #include "unk_02096420.h" #include "unk_02097B18.h" @@ -193,573 +223,537 @@ #include "unk_0209ACF4.h" #include "unk_0209B344.h" #include "unk_0209C194.h" -#include "overlay005/ov5_021D431C.h" -#include "overlay005/ov5_021D5EB8.h" -#include "overlay005/vs_seeker.h" -#include "overlay005/ov5_021DC018.h" -#include "overlay005/ov5_021DD42C.h" -#include "overlay005/ov5_021DDAE4.h" -#include "overlay005/ov5_021DFB54.h" -#include "overlay005/ov5_021E1B08.h" -#include "overlay005/ov5_021E1D20.h" -#include "overlay005/ov5_021E779C.h" -#include "overlay005/ov5_021EA874.h" -#include "overlay005/ov5_021ECC20.h" -#include "overlay005/ov5_021EE7D4.h" -#include "overlay005/ov5_021EFB0C.h" -#include "overlay005/ov5_021F0E84.h" -#include "overlay005/ov5_021F6454.h" -#include "overlay005/ov5_021F77A8.h" -#include "overlay006/ov6_0223E140.h" -#include "overlay006/ov6_02242AF0.h" -#include "overlay006/ov6_02243004.h" -#include "overlay006/ov6_02243218.h" -#include "overlay006/ov6_02243258.h" -#include "overlay006/ov6_02246184.h" -#include "overlay006/ov6_02246C24.h" -#include "overlay006/ov6_02246F00.h" -#include "overlay006/ov6_02247078.h" -#include "overlay006/ov6_022475B0.h" -#include "overlay006/ov6_02247830.h" -#include "overlay006/ov6_02247D30.h" -#include "overlay006/ov6_02247F5C.h" -#include "overlay006/ov6_02248948.h" -#include "overlay007/communication_club.h" -#include "overlay007/ov7_0224B4E8.h" -#include "overlay007/ov7_0224CD28.h" -#include "overlay008/ov8_02249960.h" -#include "overlay009/ov9_02249960.h" -#include "overlay023/ov23_022521F0.h" - -#include "constants/overworld_weather.h" +#include "vars_flags.h" -#include +#include "constdata/const_020EAB80.h" +#include "constdata/const_020EAC58.h" +#include "constdata/const_020F8BE0.h" typedef struct { - SysTask * unk_00; - SysTask * unk_04; - MapObjectAnimCmd * unk_08; - FieldSystem * fieldSystem; + SysTask *unk_00; + SysTask *unk_04; + MapObjectAnimCmd *unk_08; + FieldSystem *fieldSystem; } UnkStruct_02040F28; -static BOOL ScrCmd_Noop(ScriptContext * ctx); -static BOOL ScrCmd_Dummy(ScriptContext * ctx); -static BOOL ScrCmd_End(ScriptContext * ctx); -static BOOL ScrCmd_WaitTime(ScriptContext * ctx); -static BOOL ScriptContext_DecrementTimer(ScriptContext * ctx); -static BOOL ScrCmd_004(ScriptContext * ctx); -static BOOL ScrCmd_005(ScriptContext * ctx); -static BOOL ScrCmd_006(ScriptContext * ctx); -static BOOL ScrCmd_007(ScriptContext * ctx); -static BOOL ScrCmd_008(ScriptContext * ctx); -static BOOL ScrCmd_009(ScriptContext * ctx); -static BOOL ScrCmd_00A(ScriptContext * ctx); +static BOOL ScrCmd_Noop(ScriptContext *ctx); +static BOOL ScrCmd_Dummy(ScriptContext *ctx); +static BOOL ScrCmd_End(ScriptContext *ctx); +static BOOL ScrCmd_WaitTime(ScriptContext *ctx); +static BOOL ScriptContext_DecrementTimer(ScriptContext *ctx); +static BOOL ScrCmd_004(ScriptContext *ctx); +static BOOL ScrCmd_005(ScriptContext *ctx); +static BOOL ScrCmd_006(ScriptContext *ctx); +static BOOL ScrCmd_007(ScriptContext *ctx); +static BOOL ScrCmd_008(ScriptContext *ctx); +static BOOL ScrCmd_009(ScriptContext *ctx); +static BOOL ScrCmd_00A(ScriptContext *ctx); static u32 Compare(u16 value0, u16 value1); -static BOOL ScrCmd_00B(ScriptContext * ctx); -static BOOL ScrCmd_00C(ScriptContext * ctx); -static BOOL ScrCmd_00D(ScriptContext * ctx); -static BOOL ScrCmd_00E(ScriptContext * ctx); -static BOOL ScrCmd_00F(ScriptContext * ctx); -static BOOL ScrCmd_010(ScriptContext * ctx); -static BOOL ScrCmd_CompareVarToValue(ScriptContext * ctx); -static BOOL ScrCmd_CompareVarToVar(ScriptContext * ctx); -static BOOL ScrCmd_013(ScriptContext * ctx); -static BOOL ScrCmd_014(ScriptContext * ctx); -static BOOL sub_0203F9EC(ScriptContext * ctx); -static BOOL ScrCmd_015(ScriptContext * ctx); -static BOOL ScrCmd_GoTo(ScriptContext * ctx); -static MapObject * sub_02040ED4(FieldSystem * fieldSystem, int param1); -static BOOL ScrCmd_017(ScriptContext * ctx); -static BOOL ScrCmd_018(ScriptContext * ctx); -static BOOL ScrCmd_019(ScriptContext * ctx); -static BOOL ScrCmd_Call(ScriptContext * ctx); -static BOOL ScrCmd_Return(ScriptContext * ctx); -static BOOL ScrCmd_GoToIf(ScriptContext * ctx); -static BOOL ScrCmd_CallIf(ScriptContext * ctx); -static BOOL ScrCmd_SetFlag(ScriptContext * ctx); -static BOOL ScrCmd_ClearFlag(ScriptContext * ctx); -static BOOL ScrCmd_CheckFlag(ScriptContext * ctx); -static BOOL ScrCmd_021(ScriptContext * ctx); -static BOOL ScrCmd_SetFlagFromVar(ScriptContext * ctx); -static BOOL ScrCmd_SetTrainerFlag(ScriptContext * ctx); -static BOOL ScrCmd_ClearTrainerFlag(ScriptContext * ctx); -static BOOL ScrCmd_CheckTrainerFlag(ScriptContext * ctx); -static BOOL ScrCmd_AddVar(ScriptContext * ctx); -static BOOL ScrCmd_SubVar(ScriptContext * ctx); -static BOOL ScrCmd_SetVarFromValue(ScriptContext * ctx); -static BOOL ScrCmd_SetVarFromVar(ScriptContext * ctx); -static BOOL ScrCmd_02A(ScriptContext * ctx); -static BOOL ScrCmd_MessageInstant(ScriptContext * ctx); -static BOOL ScrCmd_1FA(ScriptContext * ctx); -static BOOL ScrCmd_1FB(ScriptContext * ctx); -static BOOL ScrCmd_1FC(ScriptContext * ctx); -static BOOL ScrCmd_1FD(ScriptContext * ctx); -static BOOL ScrCmd_1FE(ScriptContext * ctx); -static BOOL ScrCmd_1FF(ScriptContext * ctx); -static BOOL ScrCmd_26D(ScriptContext * ctx); -static BOOL ScrCmd_Message(ScriptContext * ctx); -static BOOL ScrCmd_MessageVar(ScriptContext * ctx); -static BOOL ScrCmd_2C0(ScriptContext * ctx); -static BOOL ScrCmd_02E(ScriptContext * ctx); -static BOOL ScrCmd_02F(ScriptContext * ctx); -static BOOL sub_02040014(ScriptContext * ctx); -static BOOL ScrCmd_WaitABPress(ScriptContext * ctx); -static BOOL ScriptContext_CheckABPress(ScriptContext * ctx); -static BOOL ScrCmd_WaitABXPadPress(ScriptContext * ctx); -static BOOL ScriptContext_CheckABXPadPress(ScriptContext * ctx); -static BOOL ScrCmd_WaitABPadPress(ScriptContext * ctx); -static BOOL ScriptContext_CheckABPadPress(ScriptContext * ctx); -static BOOL ScrCmd_033(ScriptContext * ctx); -static BOOL ScrCmd_CloseMessage(ScriptContext * ctx); -static BOOL ScrCmd_035(ScriptContext * ctx); -static BOOL ScrCmd_036(ScriptContext * ctx); -static BOOL ScrCmd_037(ScriptContext * ctx); -static BOOL ScrCmd_038(ScriptContext * ctx); -static BOOL ScrCmd_039(ScriptContext * ctx); -static BOOL sub_020405C4(ScriptContext * ctx); -static BOOL ScrCmd_03A(ScriptContext * ctx); -static BOOL sub_02040670(ScriptContext * ctx); -static BOOL ScrCmd_03B(ScriptContext * ctx); -static BOOL sub_02040730(ScriptContext * ctx); -static BOOL ScrCmd_03C(ScriptContext * ctx); -static BOOL sub_020403EC(ScriptContext * ctx); -static BOOL ScrCmd_03D(ScriptContext * ctx); -static BOOL ScrCmd_03E(ScriptContext * ctx); -static BOOL sub_02040824(ScriptContext * ctx); -static BOOL ScrCmd_040(ScriptContext * ctx); -static BOOL ScrCmd_041(ScriptContext * ctx); -static BOOL ScrCmd_042(ScriptContext * ctx); -static BOOL ScrCmd_29D(ScriptContext * ctx); -static BOOL ScrCmd_043(ScriptContext * ctx); -static BOOL sub_02040A50(ScriptContext * ctx); -static BOOL ScrCmd_044(ScriptContext * ctx); -static BOOL ScrCmd_045(ScriptContext * ctx); -static BOOL ScrCmd_046(ScriptContext * ctx); -static BOOL ScrCmd_047(ScriptContext * ctx); -static BOOL ScrCmd_327(ScriptContext * ctx); -static BOOL ScrCmd_306(ScriptContext * ctx); -static BOOL ScrCmd_048(ScriptContext * ctx); -static BOOL ScrCmd_ApplyMovement(ScriptContext * ctx); -static BOOL ScrCmd_WaitMovement(ScriptContext * ctx); -static BOOL ScrCmd_LockAll(ScriptContext * ctx); -static BOOL sub_020410CC(ScriptContext * ctx); -static BOOL ScrCmd_ReleaseAll(ScriptContext * ctx); -static BOOL ScrCmd_062(ScriptContext * ctx); -static BOOL ScrCmd_063(ScriptContext * ctx); -static BOOL ScrCmd_064(ScriptContext * ctx); -static BOOL ScrCmd_065(ScriptContext * ctx); -static BOOL ScrCmd_066(ScriptContext * ctx); -static BOOL ScrCmd_067(ScriptContext * ctx); -static BOOL ScrCmd_308(ScriptContext * ctx); -static BOOL ScrCmd_309(ScriptContext * ctx); -static BOOL ScrCmd_FacePlayer(ScriptContext * ctx); -static BOOL ScrCmd_069(ScriptContext * ctx); -static BOOL ScrCmd_06A(ScriptContext * ctx); -static BOOL ScrCmd_1BD(ScriptContext * ctx); -static BOOL ScrCmd_06B(ScriptContext * ctx); -static BOOL ScrCmd_06C(ScriptContext * ctx); -static BOOL ScrCmd_06D(ScriptContext * ctx); -static BOOL ScrCmd_2AD(ScriptContext * ctx); -static BOOL ScrCmd_06E(ScriptContext * ctx); -static BOOL ScrCmd_093(ScriptContext * ctx); -static BOOL ScrCmd_094(ScriptContext * ctx); -static BOOL ScrCmd_095(ScriptContext * ctx); -static BOOL ScrCmd_09B(ScriptContext * ctx); -static BOOL ScrCmd_315(ScriptContext * ctx); -static BOOL ScrCmd_09C(ScriptContext * ctx); -static BOOL ScrCmd_09D(ScriptContext * ctx); -static BOOL ScrCmd_09E(ScriptContext * ctx); -static BOOL ScrCmd_09F(ScriptContext * ctx); -static BOOL ScrCmd_0A1(ScriptContext * ctx); -static BOOL ScrCmd_1F8(ScriptContext * ctx); -static BOOL ScrCmd_0A2(ScriptContext * ctx); -static BOOL ScrCmd_0A3(ScriptContext * ctx); -static BOOL ScrCmd_0A4(ScriptContext * ctx); -static BOOL ScrCmd_207(ScriptContext * ctx); -static BOOL ScrCmd_208(ScriptContext * ctx); -static void sub_020451B4(FieldSystem * fieldSystem, u16 param1); -static BOOL ScrCmd_209(ScriptContext * ctx); -static BOOL ScrCmd_20A(ScriptContext * ctx); -static BOOL ScrCmd_20B(ScriptContext * ctx); -static BOOL ScrCmd_0A5(ScriptContext * ctx); -static BOOL ScrCmd_30E(ScriptContext * ctx); -static BOOL ScrCmd_0A6(ScriptContext * ctx); -static BOOL ScrCmd_0A7(ScriptContext * ctx); -static BOOL ScrCmd_0A8(ScriptContext * ctx); -static BOOL ScrCmd_12E(ScriptContext * ctx); -static BOOL ScrCmd_12F(ScriptContext * ctx); -static BOOL ScrCmd_130(ScriptContext * ctx); -static BOOL ScrCmd_0A9(ScriptContext * ctx); -static BOOL ScrCmd_0AA(ScriptContext * ctx); -static BOOL ScrCmd_1D7(ScriptContext * ctx); -static BOOL ScrCmd_1D8(ScriptContext * ctx); -static BOOL ScrCmd_1D9(ScriptContext * ctx); -static BOOL ScrCmd_0AB(ScriptContext * ctx); -static BOOL ScrCmd_0AC(ScriptContext * ctx); -static BOOL ScrCmd_0AD(ScriptContext * ctx); -static BOOL ScrCmd_0AE(ScriptContext * ctx); -static BOOL ScrCmd_0AF(ScriptContext * ctx); -static BOOL ScrCmd_0B0(ScriptContext * ctx); -static BOOL ScrCmd_0B1(ScriptContext * ctx); -static BOOL ScrCmd_336(ScriptContext * ctx); -static BOOL ScrCmd_0B2(ScriptContext * ctx); -static BOOL ScrCmd_0B3(ScriptContext * ctx); -static BOOL ScrCmd_0B4(ScriptContext * ctx); -static BOOL ScrCmd_0B5(ScriptContext * ctx); -static BOOL ScrCmd_0BA(ScriptContext * ctx); -static BOOL ScrCmd_0BB(ScriptContext * ctx); -static BOOL ScrCmd_271(ScriptContext * ctx); -static BOOL ScrCmd_FadeScreen(ScriptContext * ctx); -static BOOL ScrCmd_WaitFadeScreen(ScriptContext * ctx); -static BOOL ScriptContext_ScreenWipeDone(ScriptContext * ctx); -static BOOL ScrCmd_0BE(ScriptContext * ctx); -static BOOL ScrCmd_0BF(ScriptContext * ctx); -static BOOL ScrCmd_0C0(ScriptContext * ctx); -static BOOL ScrCmd_0C1(ScriptContext * ctx); -static BOOL ScrCmd_0C2(ScriptContext * ctx); -static BOOL ScrCmd_0C3(ScriptContext * ctx); -static BOOL ScrCmd_0C4(ScriptContext * ctx); -static BOOL ScrCmd_0C5(ScriptContext * ctx); -static BOOL sub_02042C80(ScriptContext * ctx); -static BOOL ScrCmd_0C6(ScriptContext * ctx); -static BOOL ScrCmd_0C7(ScriptContext * ctx); -static BOOL ScrCmd_0C8(ScriptContext * ctx); -static BOOL ScrCmd_0C9(ScriptContext * ctx); -static BOOL ScrCmd_0CA(ScriptContext * ctx); -static BOOL ScrCmd_0CB(ScriptContext * ctx); -static BOOL ScrCmd_0CC(ScriptContext * ctx); -static BOOL ScrCmd_0DE(ScriptContext * ctx); -static BOOL ScrCmd_0E3(ScriptContext * ctx); -static BOOL ScrCmd_0E6(ScriptContext * ctx); -static BOOL ScrCmd_0F2(ScriptContext * ctx); -static BOOL sub_02042F74(ScriptContext * ctx); -static BOOL ScrCmd_0F3(ScriptContext * ctx); -static BOOL sub_0204300C(ScriptContext * ctx); -static BOOL ScrCmd_0F4(ScriptContext * ctx); -static BOOL ScrCmd_0F5(ScriptContext * ctx); -static BOOL ScrCmd_0F6(ScriptContext * ctx); -static BOOL ScrCmd_0F7(ScriptContext * ctx); -static BOOL ScrCmd_11B(ScriptContext * ctx); -static BOOL ScrCmd_11C(ScriptContext * ctx); -static BOOL ScrCmd_11D(ScriptContext * ctx); -static BOOL ScrCmd_11E(ScriptContext * ctx); -static BOOL ScrCmd_11F(ScriptContext * ctx); -static BOOL ScrCmd_120(ScriptContext * ctx); -static BOOL ScrCmd_121(ScriptContext * ctx); -static BOOL ScrCmd_122(ScriptContext * ctx); -static BOOL ScrCmd_123(ScriptContext * ctx); -static BOOL ScrCmd_124(ScriptContext * ctx); -static BOOL ScrCmd_2BD(ScriptContext * ctx); -static BOOL ScrCmd_318(ScriptContext * ctx); -static BOOL ScrCmd_125(ScriptContext * ctx); -static BOOL ScrCmd_126(ScriptContext * ctx); -static BOOL ScrCmd_127(ScriptContext * ctx); -static BOOL ScrCmd_128(ScriptContext * ctx); -static BOOL ScrCmd_129(ScriptContext * ctx); -static BOOL ScrCmd_12A(ScriptContext * ctx); -static BOOL ScrCmd_12B(ScriptContext * ctx); -static BOOL ScrCmd_12C(ScriptContext * ctx); -static BOOL ScrCmd_12D(ScriptContext * ctx); -static BOOL ScrCmd_131(ScriptContext * ctx); -static BOOL ScrCmd_132(ScriptContext * ctx); -static BOOL ScrCmd_133(ScriptContext * ctx); -static BOOL ScrCmd_134(ScriptContext * ctx); -static BOOL ScrCmd_135(ScriptContext * ctx); -static BOOL sub_02043678(ScriptContext * ctx); -static BOOL ScrCmd_136(ScriptContext * ctx); -static BOOL ScrCmd_137(ScriptContext * ctx); -static BOOL ScrCmd_138(ScriptContext * ctx); -static BOOL ScrCmd_139(ScriptContext * ctx); -static BOOL ScrCmd_13B(ScriptContext * ctx); -static BOOL ScrCmd_13A(ScriptContext * ctx); -static BOOL ScrCmd_13C(ScriptContext * ctx); -static BOOL ScrCmd_13D(ScriptContext * ctx); -static BOOL ScrCmd_13E(ScriptContext * ctx); -static BOOL sub_020437E8(ScriptContext * ctx); -static BOOL ScrCmd_13F(ScriptContext * ctx); -static BOOL ScrCmd_140(ScriptContext * ctx); -static BOOL ScrCmd_146(ScriptContext * ctx); -static BOOL ScrCmd_141(ScriptContext * ctx); -static BOOL sub_02043938(ScriptContext * ctx); -static BOOL ScrCmd_142(ScriptContext * ctx); -static BOOL ScrCmd_143(ScriptContext * ctx); -static BOOL ScrCmd_144(ScriptContext * ctx); -static BOOL sub_020439F4(ScriptContext * ctx); -static BOOL ScrCmd_145(ScriptContext * ctx); -static BOOL sub_02043A4C(ScriptContext * ctx); -static BOOL ScrCmd_153(ScriptContext * ctx); -static BOOL ScrCmd_154(ScriptContext * ctx); -static BOOL ScrCmd_155(ScriptContext * ctx); -static BOOL ScrCmd_29C(ScriptContext * ctx); -static BOOL ScrCmd_156(ScriptContext * ctx); -static BOOL ScrCmd_2BA(ScriptContext * ctx); -static BOOL ScrCmd_14B(ScriptContext * ctx); -static BOOL ScrCmd_14C(ScriptContext * ctx); -static BOOL ScrCmd_14D(ScriptContext * ctx); -static BOOL ScrCmd_14E(ScriptContext * ctx); -static BOOL ScrCmd_14F(ScriptContext * ctx); -static BOOL ScrCmd_150(ScriptContext * ctx); -static BOOL sub_02043C70(ScriptContext * ctx); -static BOOL ScrCmd_151(ScriptContext * ctx); -static BOOL ScrCmd_152(ScriptContext * ctx); -static BOOL ScrCmd_186(ScriptContext * ctx); -static BOOL ScrCmd_187(ScriptContext * ctx); -static BOOL ScrCmd_188(ScriptContext * ctx); -static BOOL ScrCmd_189(ScriptContext * ctx); -static BOOL ScrCmd_18A(ScriptContext * ctx); -static BOOL ScrCmd_18B(ScriptContext * ctx); -static BOOL ScrCmd_18C(ScriptContext * ctx); -static BOOL ScrCmd_18F(ScriptContext * ctx); -static BOOL ScrCmd_168(ScriptContext * ctx); -static BOOL ScrCmd_169(ScriptContext * ctx); -static BOOL ScrCmd_16A(ScriptContext * ctx); -static BOOL ScrCmd_16B(ScriptContext * ctx); -static BOOL ScrCmd_16C(ScriptContext * ctx); -static BOOL ScrCmd_16F(ScriptContext * ctx); -static BOOL ScrCmd_170(ScriptContext * ctx); -static BOOL ScrCmd_171(ScriptContext * ctx); -static BOOL ScrCmd_172(ScriptContext * ctx); -static BOOL ScrCmd_173(ScriptContext * ctx); -static BOOL ScrCmd_174(ScriptContext * ctx); -static BOOL ScrCmd_175(ScriptContext * ctx); -static BOOL ScrCmd_176(ScriptContext * ctx); -static BOOL ScrCmd_2C9(ScriptContext * ctx); -static BOOL ScrCmd_2F0(ScriptContext * ctx); -static BOOL ScrCmd_2F2(ScriptContext * ctx); -static BOOL ScrCmd_317(ScriptContext * ctx); -static BOOL ScrCmd_178(ScriptContext * ctx); -static BOOL ScrCmd_179(ScriptContext * ctx); -static BOOL ScrCmd_17A(ScriptContext * ctx); -static BOOL ScrCmd_18D(ScriptContext * ctx); -static BOOL ScrCmd_18E(ScriptContext * ctx); -static BOOL ScrCmd_WaitABPressTime(ScriptContext * ctx); -static BOOL ScriptContext_DecrementABPressTimer(ScriptContext * ctx); -static BOOL ScrCmd_191(ScriptContext * ctx); -static BOOL ScrCmd_193(ScriptContext * ctx); -static BOOL ScrCmd_2D0(ScriptContext * ctx); -static BOOL ScrCmd_2D4(ScriptContext * ctx); -static BOOL ScrCmd_2DB(ScriptContext * ctx); -static BOOL ScrCmd_2A5(ScriptContext * ctx); -static BOOL ScrCmd_196(ScriptContext * ctx); -static BOOL ScrCmd_197(ScriptContext * ctx); -static BOOL ScrCmd_2E7(ScriptContext * ctx); -static BOOL ScrCmd_2E8(ScriptContext * ctx); -static BOOL ScrCmd_19E(ScriptContext * ctx); -static BOOL sub_020441C8(ScriptContext * ctx); -static BOOL ScrCmd_19F(ScriptContext * ctx); -static BOOL sub_02044240(ScriptContext * ctx); -static BOOL ScrCmd_1A0(ScriptContext * ctx); -static BOOL ScrCmd_1A1(ScriptContext * ctx); -static BOOL ScrCmd_1A2(ScriptContext * ctx); -static BOOL ScrCmd_03F(ScriptContext * ctx); -static BOOL ScrCmd_1AC(ScriptContext * ctx); -static BOOL ScrCmd_1B1(ScriptContext * ctx); -static BOOL ScrCmd_1B2(ScriptContext * ctx); -static BOOL ScrCmd_1B3(ScriptContext * ctx); -static BOOL ScrCmd_1B4(ScriptContext * ctx); -static BOOL ScrCmd_1B5(ScriptContext * ctx); -static BOOL ScrCmd_GetTimeOfDay(ScriptContext * ctx); -static BOOL ScrCmd_1B7(ScriptContext * ctx); -static BOOL ScrCmd_1B8(ScriptContext * ctx); -static BOOL ScrCmd_1C1(ScriptContext * ctx); -static BOOL ScrCmd_1C2(ScriptContext * ctx); -static BOOL ScrCmd_1C3(ScriptContext * ctx); -static BOOL ScrCmd_1C4(ScriptContext * ctx); -static BOOL ScrCmd_1C5(ScriptContext * ctx); -static BOOL ScrCmd_1CC(ScriptContext * ctx); -static BOOL ScrCmd_1CD(ScriptContext * ctx); -static BOOL ScrCmd_1CE(ScriptContext * ctx); -static BOOL ScrCmd_1D2(ScriptContext * ctx); -static BOOL ScrCmd_1D3(ScriptContext * ctx); -static BOOL ScrCmd_1D4(ScriptContext * ctx); -static BOOL ScrCmd_1D5(ScriptContext * ctx); -static BOOL ScrCmd_1D6(ScriptContext * ctx); -static BOOL ScrCmd_192(ScriptContext * ctx); -static BOOL ScrCmd_194(ScriptContext * ctx); -static BOOL ScrCmd_195(ScriptContext * ctx); -static BOOL ScrCmd_1E8(ScriptContext * ctx); -static BOOL ScrCmd_1E9(ScriptContext * ctx); -static BOOL ScrCmd_1EA(ScriptContext * ctx); -static BOOL ScrCmd_1EB(ScriptContext * ctx); -static BOOL ScrCmd_1EC(ScriptContext * ctx); -static BOOL ScrCmd_1ED(ScriptContext * ctx); -static BOOL ScrCmd_1EF(ScriptContext * ctx); -static BOOL ScrCmd_1E5(ScriptContext * ctx); -static BOOL ScrCmd_1E6(ScriptContext * ctx); -static BOOL ScrCmd_1E7(ScriptContext * ctx); -static BOOL ScrCmd_334(ScriptContext * ctx); -static BOOL ScrCmd_335(ScriptContext * ctx); -static BOOL ScrCmd_Dummy1(ScriptContext * ctx); -static BOOL ScrCmd_200(ScriptContext * ctx); -static BOOL ScrCmd_201(ScriptContext * ctx); -static BOOL ScrCmd_202(ScriptContext * ctx); -static BOOL ScrCmd_203(ScriptContext * ctx); -static BOOL ScrCmd_204(ScriptContext * ctx); -static BOOL ScrCmd_205(ScriptContext * ctx); -static BOOL ScrCmd_310(ScriptContext * ctx); -static BOOL ScrCmd_206(ScriptContext * ctx); -static BOOL ScrCmd_20C(ScriptContext * ctx); -static BOOL ScrCmd_20D(ScriptContext * ctx); -static BOOL ScrCmd_20E(ScriptContext * ctx); -static BOOL ScrCmd_20F(ScriptContext * ctx); -static BOOL ScrCmd_210(ScriptContext * ctx); -static BOOL ScrCmd_211(ScriptContext * ctx); -static BOOL ScrCmd_214(ScriptContext * ctx); -static BOOL ScrCmd_26F(ScriptContext * ctx); -static BOOL ScrCmd_218(ScriptContext * ctx); -static BOOL ScrCmd_219(ScriptContext * ctx); -static BOOL ScrCmd_21A(ScriptContext * ctx); -static BOOL ScrCmd_21B(ScriptContext * ctx); -static BOOL ScrCmd_21C(ScriptContext * ctx); -static BOOL ScrCmd_226(ScriptContext * ctx); -static BOOL ScrCmd_227(ScriptContext * ctx); -static BOOL ScrCmd_228(ScriptContext * ctx); -static BOOL ScrCmd_229(ScriptContext * ctx); -static BOOL ScrCmd_22A(ScriptContext * ctx); -static BOOL ScrCmd_22B(ScriptContext * ctx); -static BOOL ScrCmd_22C(ScriptContext * ctx); -static BOOL ScrCmd_22D(ScriptContext * ctx); -static BOOL ScrCmd_233(ScriptContext * ctx); -static BOOL ScrCmd_234(ScriptContext * ctx); -static BOOL ScrCmd_239(ScriptContext * ctx); -static BOOL ScrCmd_23A(ScriptContext * ctx); -static BOOL ScrCmd_23B(ScriptContext * ctx); -static BOOL ScrCmd_23C(ScriptContext * ctx); -static BOOL ScrCmd_23D(ScriptContext * ctx); -static BOOL ScrCmd_243(ScriptContext * ctx); -static BOOL ScrCmd_244(ScriptContext * ctx); -static BOOL ScrCmd_245(ScriptContext * ctx); -static BOOL ScrCmd_246(ScriptContext * ctx); -static BOOL ScrCmd_249(ScriptContext * ctx); -static BOOL ScrCmd_24A(ScriptContext * ctx); -static BOOL ScrCmd_24B(ScriptContext * ctx); -static BOOL ScrCmd_24C(ScriptContext * ctx); -static BOOL ScrCmd_24D(ScriptContext * ctx); -static BOOL ScrCmd_252(ScriptContext * ctx); -static BOOL ScrCmd_258(ScriptContext * ctx); -static BOOL ScrCmd_259(ScriptContext * ctx); -static BOOL ScrCmd_25A(ScriptContext * ctx); -static BOOL ScrCmd_25B(ScriptContext * ctx); -static BOOL ScrCmd_25C(ScriptContext * ctx); -static BOOL ScrCmd_25D(ScriptContext * ctx); -static BOOL ScrCmd_25E(ScriptContext * ctx); -static BOOL ScrCmd_25F(ScriptContext * ctx); -static BOOL ScrCmd_260(ScriptContext * ctx); -static BOOL ScrCmd_262(ScriptContext * ctx); -static BOOL ScrCmd_263(ScriptContext * ctx); -static BOOL ScrCmd_264(ScriptContext * ctx); -static BOOL ScrCmd_265(ScriptContext * ctx); -static BOOL ScrCmd_266(ScriptContext * ctx); -static BOOL ScrCmd_267(ScriptContext * ctx); -static BOOL ScrCmd_268(ScriptContext * ctx); -static BOOL ScrCmd_269(ScriptContext * ctx); -static BOOL ScrCmd_26A(ScriptContext * ctx); -static BOOL ScrCmd_26B(ScriptContext * ctx); -static BOOL ScrCmd_26C(ScriptContext * ctx); -static BOOL ScrCmd_26E(ScriptContext * ctx); -static BOOL ScrCmd_270(ScriptContext * ctx); -static BOOL ScrCmd_273(ScriptContext * ctx); -static BOOL ScrCmd_275(ScriptContext * ctx); -static BOOL ScrCmd_277(ScriptContext * ctx); -static BOOL ScrCmd_279(ScriptContext * ctx); -static BOOL ScrCmd_27A(ScriptContext * ctx); -static BOOL ScrCmd_27B(ScriptContext * ctx); -static BOOL ScrCmd_27D(ScriptContext * ctx); -static BOOL ScrCmd_27E(ScriptContext * ctx); -static BOOL ScrCmd_27F(ScriptContext * ctx); -static BOOL ScrCmd_282(ScriptContext * ctx); -static BOOL ScrCmd_284(ScriptContext * ctx); -static BOOL ScrCmd_285(ScriptContext * ctx); -static BOOL ScrCmd_286(ScriptContext * ctx); -static BOOL ScrCmd_287(ScriptContext * ctx); -static BOOL ScrCmd_288(ScriptContext * ctx); -static BOOL ScrCmd_289(ScriptContext * ctx); -static BOOL ScrCmd_28A(ScriptContext * ctx); -static BOOL ScrCmd_307(ScriptContext * ctx); -static BOOL ScrCmd_28B(ScriptContext * ctx); -static BOOL ScrCmd_28C(ScriptContext * ctx); -static BOOL ScrCmd_28D(ScriptContext * ctx); -static BOOL ScrCmd_28E(ScriptContext * ctx); -static BOOL sub_02041FF8(ScriptContext * ctx); -static BOOL ScrCmd_28F(ScriptContext * ctx); -static BOOL ScrCmd_292(ScriptContext * ctx); -static BOOL ScrCmd_290(ScriptContext * ctx); -static BOOL ScrCmd_291(ScriptContext * ctx); -static BOOL ScrCmd_29E(ScriptContext * ctx); -static BOOL ScrCmd_293(ScriptContext * ctx); -static BOOL ScrCmd_29F(ScriptContext * ctx); -static BOOL ScrCmd_2A1(ScriptContext * ctx); -static BOOL ScrCmd_2A2(ScriptContext * ctx); -static BOOL ScrCmd_2A3(ScriptContext * ctx); -static BOOL ScrCmd_2A4(ScriptContext * ctx); -static BOOL ScrCmd_2A7(ScriptContext * ctx); -static BOOL ScrCmd_2AA(ScriptContext * ctx); -static BOOL ScrCmd_2AB(ScriptContext * ctx); -static BOOL ScrCmd_2AC(ScriptContext * ctx); -static BOOL ScrCmd_2AF(ScriptContext * ctx); -static BOOL ScrCmd_2B0(ScriptContext * ctx); -static BOOL ScrCmd_2B1(ScriptContext * ctx); -static BOOL ScrCmd_2B2(ScriptContext * ctx); -static BOOL ScrCmd_LockLastTalked(ScriptContext * ctx); -static BOOL ScrCmd_2B5(ScriptContext * ctx); -static BOOL ScrCmd_2B6(ScriptContext * ctx); -static BOOL sub_02040A9C(ScriptContext * ctx); -static BOOL ScrCmd_2B9(ScriptContext * ctx); -static BOOL ScrCmd_2BB(ScriptContext * ctx); -static BOOL ScrCmd_2BE(ScriptContext * ctx); -static BOOL ScrCmd_2BF(ScriptContext * ctx); -static BOOL ScrCmd_2C1(ScriptContext * ctx); -static BOOL ScrCmd_2C2(ScriptContext * ctx); -static BOOL ScrCmd_2C3(ScriptContext * ctx); -static BOOL ScrCmd_33A(ScriptContext * ctx); -static BOOL ScrCmd_33B(ScriptContext * ctx); -static BOOL ScrCmd_2C4(ScriptContext * ctx); -static BOOL ScrCmd_2C6(ScriptContext * ctx); -static BOOL ScrCmd_2C7(ScriptContext * ctx); -static BOOL ScrCmd_2CA(ScriptContext * ctx); -static BOOL ScrCmd_2CD(ScriptContext * ctx); -static BOOL ScrCmd_2CE(ScriptContext * ctx); -static BOOL ScrCmd_2D6(ScriptContext * ctx); -static BOOL ScrCmd_2D7(ScriptContext * ctx); -static BOOL ScrCmd_2D8(ScriptContext * ctx); -BOOL ScrCmd_2C8(ScriptContext * ctx); -BOOL ScrCmd_2E2(ScriptContext * ctx); -BOOL ScrCmd_2E3(ScriptContext * ctx); -BOOL ScrCmd_2E4(ScriptContext * ctx); -BOOL ScrCmd_2F4(ScriptContext * ctx); +static BOOL ScrCmd_00B(ScriptContext *ctx); +static BOOL ScrCmd_00C(ScriptContext *ctx); +static BOOL ScrCmd_00D(ScriptContext *ctx); +static BOOL ScrCmd_00E(ScriptContext *ctx); +static BOOL ScrCmd_00F(ScriptContext *ctx); +static BOOL ScrCmd_010(ScriptContext *ctx); +static BOOL ScrCmd_CompareVarToValue(ScriptContext *ctx); +static BOOL ScrCmd_CompareVarToVar(ScriptContext *ctx); +static BOOL ScrCmd_013(ScriptContext *ctx); +static BOOL ScrCmd_014(ScriptContext *ctx); +static BOOL sub_0203F9EC(ScriptContext *ctx); +static BOOL ScrCmd_015(ScriptContext *ctx); +static BOOL ScrCmd_GoTo(ScriptContext *ctx); +static MapObject *sub_02040ED4(FieldSystem *fieldSystem, int param1); +static BOOL ScrCmd_017(ScriptContext *ctx); +static BOOL ScrCmd_018(ScriptContext *ctx); +static BOOL ScrCmd_019(ScriptContext *ctx); +static BOOL ScrCmd_Call(ScriptContext *ctx); +static BOOL ScrCmd_Return(ScriptContext *ctx); +static BOOL ScrCmd_GoToIf(ScriptContext *ctx); +static BOOL ScrCmd_CallIf(ScriptContext *ctx); +static BOOL ScrCmd_SetFlag(ScriptContext *ctx); +static BOOL ScrCmd_ClearFlag(ScriptContext *ctx); +static BOOL ScrCmd_CheckFlag(ScriptContext *ctx); +static BOOL ScrCmd_021(ScriptContext *ctx); +static BOOL ScrCmd_SetFlagFromVar(ScriptContext *ctx); +static BOOL ScrCmd_SetTrainerFlag(ScriptContext *ctx); +static BOOL ScrCmd_ClearTrainerFlag(ScriptContext *ctx); +static BOOL ScrCmd_CheckTrainerFlag(ScriptContext *ctx); +static BOOL ScrCmd_AddVar(ScriptContext *ctx); +static BOOL ScrCmd_SubVar(ScriptContext *ctx); +static BOOL ScrCmd_SetVarFromValue(ScriptContext *ctx); +static BOOL ScrCmd_SetVarFromVar(ScriptContext *ctx); +static BOOL ScrCmd_02A(ScriptContext *ctx); +static BOOL ScrCmd_MessageInstant(ScriptContext *ctx); +static BOOL ScrCmd_1FA(ScriptContext *ctx); +static BOOL ScrCmd_1FB(ScriptContext *ctx); +static BOOL ScrCmd_1FC(ScriptContext *ctx); +static BOOL ScrCmd_1FD(ScriptContext *ctx); +static BOOL ScrCmd_1FE(ScriptContext *ctx); +static BOOL ScrCmd_1FF(ScriptContext *ctx); +static BOOL ScrCmd_26D(ScriptContext *ctx); +static BOOL ScrCmd_Message(ScriptContext *ctx); +static BOOL ScrCmd_MessageVar(ScriptContext *ctx); +static BOOL ScrCmd_2C0(ScriptContext *ctx); +static BOOL ScrCmd_02E(ScriptContext *ctx); +static BOOL ScrCmd_02F(ScriptContext *ctx); +static BOOL sub_02040014(ScriptContext *ctx); +static BOOL ScrCmd_WaitABPress(ScriptContext *ctx); +static BOOL ScriptContext_CheckABPress(ScriptContext *ctx); +static BOOL ScrCmd_WaitABXPadPress(ScriptContext *ctx); +static BOOL ScriptContext_CheckABXPadPress(ScriptContext *ctx); +static BOOL ScrCmd_WaitABPadPress(ScriptContext *ctx); +static BOOL ScriptContext_CheckABPadPress(ScriptContext *ctx); +static BOOL ScrCmd_033(ScriptContext *ctx); +static BOOL ScrCmd_CloseMessage(ScriptContext *ctx); +static BOOL ScrCmd_035(ScriptContext *ctx); +static BOOL ScrCmd_036(ScriptContext *ctx); +static BOOL ScrCmd_037(ScriptContext *ctx); +static BOOL ScrCmd_038(ScriptContext *ctx); +static BOOL ScrCmd_039(ScriptContext *ctx); +static BOOL sub_020405C4(ScriptContext *ctx); +static BOOL ScrCmd_03A(ScriptContext *ctx); +static BOOL sub_02040670(ScriptContext *ctx); +static BOOL ScrCmd_03B(ScriptContext *ctx); +static BOOL sub_02040730(ScriptContext *ctx); +static BOOL ScrCmd_03C(ScriptContext *ctx); +static BOOL sub_020403EC(ScriptContext *ctx); +static BOOL ScrCmd_03D(ScriptContext *ctx); +static BOOL ScrCmd_03E(ScriptContext *ctx); +static BOOL sub_02040824(ScriptContext *ctx); +static BOOL ScrCmd_040(ScriptContext *ctx); +static BOOL ScrCmd_041(ScriptContext *ctx); +static BOOL ScrCmd_042(ScriptContext *ctx); +static BOOL ScrCmd_29D(ScriptContext *ctx); +static BOOL ScrCmd_043(ScriptContext *ctx); +static BOOL sub_02040A50(ScriptContext *ctx); +static BOOL ScrCmd_044(ScriptContext *ctx); +static BOOL ScrCmd_045(ScriptContext *ctx); +static BOOL ScrCmd_046(ScriptContext *ctx); +static BOOL ScrCmd_047(ScriptContext *ctx); +static BOOL ScrCmd_327(ScriptContext *ctx); +static BOOL ScrCmd_306(ScriptContext *ctx); +static BOOL ScrCmd_048(ScriptContext *ctx); +static BOOL ScrCmd_ApplyMovement(ScriptContext *ctx); +static BOOL ScrCmd_WaitMovement(ScriptContext *ctx); +static BOOL ScrCmd_LockAll(ScriptContext *ctx); +static BOOL sub_020410CC(ScriptContext *ctx); +static BOOL ScrCmd_ReleaseAll(ScriptContext *ctx); +static BOOL ScrCmd_062(ScriptContext *ctx); +static BOOL ScrCmd_063(ScriptContext *ctx); +static BOOL ScrCmd_064(ScriptContext *ctx); +static BOOL ScrCmd_065(ScriptContext *ctx); +static BOOL ScrCmd_066(ScriptContext *ctx); +static BOOL ScrCmd_067(ScriptContext *ctx); +static BOOL ScrCmd_308(ScriptContext *ctx); +static BOOL ScrCmd_309(ScriptContext *ctx); +static BOOL ScrCmd_FacePlayer(ScriptContext *ctx); +static BOOL ScrCmd_069(ScriptContext *ctx); +static BOOL ScrCmd_06A(ScriptContext *ctx); +static BOOL ScrCmd_1BD(ScriptContext *ctx); +static BOOL ScrCmd_06B(ScriptContext *ctx); +static BOOL ScrCmd_06C(ScriptContext *ctx); +static BOOL ScrCmd_06D(ScriptContext *ctx); +static BOOL ScrCmd_2AD(ScriptContext *ctx); +static BOOL ScrCmd_06E(ScriptContext *ctx); +static BOOL ScrCmd_093(ScriptContext *ctx); +static BOOL ScrCmd_094(ScriptContext *ctx); +static BOOL ScrCmd_095(ScriptContext *ctx); +static BOOL ScrCmd_09B(ScriptContext *ctx); +static BOOL ScrCmd_315(ScriptContext *ctx); +static BOOL ScrCmd_09C(ScriptContext *ctx); +static BOOL ScrCmd_09D(ScriptContext *ctx); +static BOOL ScrCmd_09E(ScriptContext *ctx); +static BOOL ScrCmd_09F(ScriptContext *ctx); +static BOOL ScrCmd_0A1(ScriptContext *ctx); +static BOOL ScrCmd_1F8(ScriptContext *ctx); +static BOOL ScrCmd_0A2(ScriptContext *ctx); +static BOOL ScrCmd_0A3(ScriptContext *ctx); +static BOOL ScrCmd_0A4(ScriptContext *ctx); +static BOOL ScrCmd_207(ScriptContext *ctx); +static BOOL ScrCmd_208(ScriptContext *ctx); +static void sub_020451B4(FieldSystem *fieldSystem, u16 param1); +static BOOL ScrCmd_209(ScriptContext *ctx); +static BOOL ScrCmd_20A(ScriptContext *ctx); +static BOOL ScrCmd_20B(ScriptContext *ctx); +static BOOL ScrCmd_0A5(ScriptContext *ctx); +static BOOL ScrCmd_30E(ScriptContext *ctx); +static BOOL ScrCmd_0A6(ScriptContext *ctx); +static BOOL ScrCmd_0A7(ScriptContext *ctx); +static BOOL ScrCmd_0A8(ScriptContext *ctx); +static BOOL ScrCmd_12E(ScriptContext *ctx); +static BOOL ScrCmd_12F(ScriptContext *ctx); +static BOOL ScrCmd_130(ScriptContext *ctx); +static BOOL ScrCmd_0A9(ScriptContext *ctx); +static BOOL ScrCmd_0AA(ScriptContext *ctx); +static BOOL ScrCmd_1D7(ScriptContext *ctx); +static BOOL ScrCmd_1D8(ScriptContext *ctx); +static BOOL ScrCmd_1D9(ScriptContext *ctx); +static BOOL ScrCmd_0AB(ScriptContext *ctx); +static BOOL ScrCmd_0AC(ScriptContext *ctx); +static BOOL ScrCmd_0AD(ScriptContext *ctx); +static BOOL ScrCmd_0AE(ScriptContext *ctx); +static BOOL ScrCmd_0AF(ScriptContext *ctx); +static BOOL ScrCmd_0B0(ScriptContext *ctx); +static BOOL ScrCmd_0B1(ScriptContext *ctx); +static BOOL ScrCmd_336(ScriptContext *ctx); +static BOOL ScrCmd_0B2(ScriptContext *ctx); +static BOOL ScrCmd_0B3(ScriptContext *ctx); +static BOOL ScrCmd_0B4(ScriptContext *ctx); +static BOOL ScrCmd_0B5(ScriptContext *ctx); +static BOOL ScrCmd_0BA(ScriptContext *ctx); +static BOOL ScrCmd_0BB(ScriptContext *ctx); +static BOOL ScrCmd_271(ScriptContext *ctx); +static BOOL ScrCmd_FadeScreen(ScriptContext *ctx); +static BOOL ScrCmd_WaitFadeScreen(ScriptContext *ctx); +static BOOL ScriptContext_ScreenWipeDone(ScriptContext *ctx); +static BOOL ScrCmd_0BE(ScriptContext *ctx); +static BOOL ScrCmd_0BF(ScriptContext *ctx); +static BOOL ScrCmd_0C0(ScriptContext *ctx); +static BOOL ScrCmd_0C1(ScriptContext *ctx); +static BOOL ScrCmd_0C2(ScriptContext *ctx); +static BOOL ScrCmd_0C3(ScriptContext *ctx); +static BOOL ScrCmd_0C4(ScriptContext *ctx); +static BOOL ScrCmd_0C5(ScriptContext *ctx); +static BOOL sub_02042C80(ScriptContext *ctx); +static BOOL ScrCmd_0C6(ScriptContext *ctx); +static BOOL ScrCmd_0C7(ScriptContext *ctx); +static BOOL ScrCmd_0C8(ScriptContext *ctx); +static BOOL ScrCmd_0C9(ScriptContext *ctx); +static BOOL ScrCmd_0CA(ScriptContext *ctx); +static BOOL ScrCmd_0CB(ScriptContext *ctx); +static BOOL ScrCmd_0CC(ScriptContext *ctx); +static BOOL ScrCmd_0DE(ScriptContext *ctx); +static BOOL ScrCmd_0E3(ScriptContext *ctx); +static BOOL ScrCmd_0E6(ScriptContext *ctx); +static BOOL ScrCmd_0F2(ScriptContext *ctx); +static BOOL sub_02042F74(ScriptContext *ctx); +static BOOL ScrCmd_0F3(ScriptContext *ctx); +static BOOL sub_0204300C(ScriptContext *ctx); +static BOOL ScrCmd_0F4(ScriptContext *ctx); +static BOOL ScrCmd_0F5(ScriptContext *ctx); +static BOOL ScrCmd_0F6(ScriptContext *ctx); +static BOOL ScrCmd_0F7(ScriptContext *ctx); +static BOOL ScrCmd_11B(ScriptContext *ctx); +static BOOL ScrCmd_11C(ScriptContext *ctx); +static BOOL ScrCmd_11D(ScriptContext *ctx); +static BOOL ScrCmd_11E(ScriptContext *ctx); +static BOOL ScrCmd_11F(ScriptContext *ctx); +static BOOL ScrCmd_120(ScriptContext *ctx); +static BOOL ScrCmd_121(ScriptContext *ctx); +static BOOL ScrCmd_122(ScriptContext *ctx); +static BOOL ScrCmd_123(ScriptContext *ctx); +static BOOL ScrCmd_124(ScriptContext *ctx); +static BOOL ScrCmd_2BD(ScriptContext *ctx); +static BOOL ScrCmd_318(ScriptContext *ctx); +static BOOL ScrCmd_125(ScriptContext *ctx); +static BOOL ScrCmd_126(ScriptContext *ctx); +static BOOL ScrCmd_127(ScriptContext *ctx); +static BOOL ScrCmd_128(ScriptContext *ctx); +static BOOL ScrCmd_129(ScriptContext *ctx); +static BOOL ScrCmd_12A(ScriptContext *ctx); +static BOOL ScrCmd_12B(ScriptContext *ctx); +static BOOL ScrCmd_12C(ScriptContext *ctx); +static BOOL ScrCmd_12D(ScriptContext *ctx); +static BOOL ScrCmd_131(ScriptContext *ctx); +static BOOL ScrCmd_132(ScriptContext *ctx); +static BOOL ScrCmd_133(ScriptContext *ctx); +static BOOL ScrCmd_134(ScriptContext *ctx); +static BOOL ScrCmd_135(ScriptContext *ctx); +static BOOL sub_02043678(ScriptContext *ctx); +static BOOL ScrCmd_136(ScriptContext *ctx); +static BOOL ScrCmd_137(ScriptContext *ctx); +static BOOL ScrCmd_138(ScriptContext *ctx); +static BOOL ScrCmd_139(ScriptContext *ctx); +static BOOL ScrCmd_13B(ScriptContext *ctx); +static BOOL ScrCmd_13A(ScriptContext *ctx); +static BOOL ScrCmd_13C(ScriptContext *ctx); +static BOOL ScrCmd_13D(ScriptContext *ctx); +static BOOL ScrCmd_13E(ScriptContext *ctx); +static BOOL sub_020437E8(ScriptContext *ctx); +static BOOL ScrCmd_13F(ScriptContext *ctx); +static BOOL ScrCmd_140(ScriptContext *ctx); +static BOOL ScrCmd_146(ScriptContext *ctx); +static BOOL ScrCmd_141(ScriptContext *ctx); +static BOOL sub_02043938(ScriptContext *ctx); +static BOOL ScrCmd_142(ScriptContext *ctx); +static BOOL ScrCmd_143(ScriptContext *ctx); +static BOOL ScrCmd_144(ScriptContext *ctx); +static BOOL sub_020439F4(ScriptContext *ctx); +static BOOL ScrCmd_145(ScriptContext *ctx); +static BOOL sub_02043A4C(ScriptContext *ctx); +static BOOL ScrCmd_153(ScriptContext *ctx); +static BOOL ScrCmd_154(ScriptContext *ctx); +static BOOL ScrCmd_155(ScriptContext *ctx); +static BOOL ScrCmd_29C(ScriptContext *ctx); +static BOOL ScrCmd_156(ScriptContext *ctx); +static BOOL ScrCmd_2BA(ScriptContext *ctx); +static BOOL ScrCmd_14B(ScriptContext *ctx); +static BOOL ScrCmd_14C(ScriptContext *ctx); +static BOOL ScrCmd_14D(ScriptContext *ctx); +static BOOL ScrCmd_14E(ScriptContext *ctx); +static BOOL ScrCmd_14F(ScriptContext *ctx); +static BOOL ScrCmd_150(ScriptContext *ctx); +static BOOL sub_02043C70(ScriptContext *ctx); +static BOOL ScrCmd_151(ScriptContext *ctx); +static BOOL ScrCmd_152(ScriptContext *ctx); +static BOOL ScrCmd_186(ScriptContext *ctx); +static BOOL ScrCmd_187(ScriptContext *ctx); +static BOOL ScrCmd_188(ScriptContext *ctx); +static BOOL ScrCmd_189(ScriptContext *ctx); +static BOOL ScrCmd_18A(ScriptContext *ctx); +static BOOL ScrCmd_18B(ScriptContext *ctx); +static BOOL ScrCmd_18C(ScriptContext *ctx); +static BOOL ScrCmd_18F(ScriptContext *ctx); +static BOOL ScrCmd_168(ScriptContext *ctx); +static BOOL ScrCmd_169(ScriptContext *ctx); +static BOOL ScrCmd_16A(ScriptContext *ctx); +static BOOL ScrCmd_16B(ScriptContext *ctx); +static BOOL ScrCmd_16C(ScriptContext *ctx); +static BOOL ScrCmd_16F(ScriptContext *ctx); +static BOOL ScrCmd_170(ScriptContext *ctx); +static BOOL ScrCmd_171(ScriptContext *ctx); +static BOOL ScrCmd_172(ScriptContext *ctx); +static BOOL ScrCmd_173(ScriptContext *ctx); +static BOOL ScrCmd_174(ScriptContext *ctx); +static BOOL ScrCmd_175(ScriptContext *ctx); +static BOOL ScrCmd_176(ScriptContext *ctx); +static BOOL ScrCmd_2C9(ScriptContext *ctx); +static BOOL ScrCmd_2F0(ScriptContext *ctx); +static BOOL ScrCmd_2F2(ScriptContext *ctx); +static BOOL ScrCmd_317(ScriptContext *ctx); +static BOOL ScrCmd_178(ScriptContext *ctx); +static BOOL ScrCmd_179(ScriptContext *ctx); +static BOOL ScrCmd_17A(ScriptContext *ctx); +static BOOL ScrCmd_18D(ScriptContext *ctx); +static BOOL ScrCmd_18E(ScriptContext *ctx); +static BOOL ScrCmd_WaitABPressTime(ScriptContext *ctx); +static BOOL ScriptContext_DecrementABPressTimer(ScriptContext *ctx); +static BOOL ScrCmd_191(ScriptContext *ctx); +static BOOL ScrCmd_193(ScriptContext *ctx); +static BOOL ScrCmd_2D0(ScriptContext *ctx); +static BOOL ScrCmd_2D4(ScriptContext *ctx); +static BOOL ScrCmd_2DB(ScriptContext *ctx); +static BOOL ScrCmd_2A5(ScriptContext *ctx); +static BOOL ScrCmd_196(ScriptContext *ctx); +static BOOL ScrCmd_197(ScriptContext *ctx); +static BOOL ScrCmd_2E7(ScriptContext *ctx); +static BOOL ScrCmd_2E8(ScriptContext *ctx); +static BOOL ScrCmd_19E(ScriptContext *ctx); +static BOOL sub_020441C8(ScriptContext *ctx); +static BOOL ScrCmd_19F(ScriptContext *ctx); +static BOOL sub_02044240(ScriptContext *ctx); +static BOOL ScrCmd_1A0(ScriptContext *ctx); +static BOOL ScrCmd_1A1(ScriptContext *ctx); +static BOOL ScrCmd_1A2(ScriptContext *ctx); +static BOOL ScrCmd_03F(ScriptContext *ctx); +static BOOL ScrCmd_1AC(ScriptContext *ctx); +static BOOL ScrCmd_1B1(ScriptContext *ctx); +static BOOL ScrCmd_1B2(ScriptContext *ctx); +static BOOL ScrCmd_1B3(ScriptContext *ctx); +static BOOL ScrCmd_1B4(ScriptContext *ctx); +static BOOL ScrCmd_1B5(ScriptContext *ctx); +static BOOL ScrCmd_GetTimeOfDay(ScriptContext *ctx); +static BOOL ScrCmd_1B7(ScriptContext *ctx); +static BOOL ScrCmd_1B8(ScriptContext *ctx); +static BOOL ScrCmd_1C1(ScriptContext *ctx); +static BOOL ScrCmd_1C2(ScriptContext *ctx); +static BOOL ScrCmd_1C3(ScriptContext *ctx); +static BOOL ScrCmd_1C4(ScriptContext *ctx); +static BOOL ScrCmd_1C5(ScriptContext *ctx); +static BOOL ScrCmd_1CC(ScriptContext *ctx); +static BOOL ScrCmd_1CD(ScriptContext *ctx); +static BOOL ScrCmd_1CE(ScriptContext *ctx); +static BOOL ScrCmd_1D2(ScriptContext *ctx); +static BOOL ScrCmd_1D3(ScriptContext *ctx); +static BOOL ScrCmd_1D4(ScriptContext *ctx); +static BOOL ScrCmd_1D5(ScriptContext *ctx); +static BOOL ScrCmd_1D6(ScriptContext *ctx); +static BOOL ScrCmd_192(ScriptContext *ctx); +static BOOL ScrCmd_194(ScriptContext *ctx); +static BOOL ScrCmd_195(ScriptContext *ctx); +static BOOL ScrCmd_1E8(ScriptContext *ctx); +static BOOL ScrCmd_1E9(ScriptContext *ctx); +static BOOL ScrCmd_1EA(ScriptContext *ctx); +static BOOL ScrCmd_1EB(ScriptContext *ctx); +static BOOL ScrCmd_1EC(ScriptContext *ctx); +static BOOL ScrCmd_1ED(ScriptContext *ctx); +static BOOL ScrCmd_1EF(ScriptContext *ctx); +static BOOL ScrCmd_1E5(ScriptContext *ctx); +static BOOL ScrCmd_1E6(ScriptContext *ctx); +static BOOL ScrCmd_1E7(ScriptContext *ctx); +static BOOL ScrCmd_334(ScriptContext *ctx); +static BOOL ScrCmd_335(ScriptContext *ctx); +static BOOL ScrCmd_Dummy1(ScriptContext *ctx); +static BOOL ScrCmd_200(ScriptContext *ctx); +static BOOL ScrCmd_201(ScriptContext *ctx); +static BOOL ScrCmd_202(ScriptContext *ctx); +static BOOL ScrCmd_203(ScriptContext *ctx); +static BOOL ScrCmd_204(ScriptContext *ctx); +static BOOL ScrCmd_205(ScriptContext *ctx); +static BOOL ScrCmd_310(ScriptContext *ctx); +static BOOL ScrCmd_206(ScriptContext *ctx); +static BOOL ScrCmd_20C(ScriptContext *ctx); +static BOOL ScrCmd_20D(ScriptContext *ctx); +static BOOL ScrCmd_20E(ScriptContext *ctx); +static BOOL ScrCmd_20F(ScriptContext *ctx); +static BOOL ScrCmd_210(ScriptContext *ctx); +static BOOL ScrCmd_211(ScriptContext *ctx); +static BOOL ScrCmd_214(ScriptContext *ctx); +static BOOL ScrCmd_26F(ScriptContext *ctx); +static BOOL ScrCmd_218(ScriptContext *ctx); +static BOOL ScrCmd_219(ScriptContext *ctx); +static BOOL ScrCmd_21A(ScriptContext *ctx); +static BOOL ScrCmd_21B(ScriptContext *ctx); +static BOOL ScrCmd_21C(ScriptContext *ctx); +static BOOL ScrCmd_226(ScriptContext *ctx); +static BOOL ScrCmd_227(ScriptContext *ctx); +static BOOL ScrCmd_228(ScriptContext *ctx); +static BOOL ScrCmd_229(ScriptContext *ctx); +static BOOL ScrCmd_22A(ScriptContext *ctx); +static BOOL ScrCmd_22B(ScriptContext *ctx); +static BOOL ScrCmd_22C(ScriptContext *ctx); +static BOOL ScrCmd_22D(ScriptContext *ctx); +static BOOL ScrCmd_233(ScriptContext *ctx); +static BOOL ScrCmd_234(ScriptContext *ctx); +static BOOL ScrCmd_239(ScriptContext *ctx); +static BOOL ScrCmd_23A(ScriptContext *ctx); +static BOOL ScrCmd_23B(ScriptContext *ctx); +static BOOL ScrCmd_23C(ScriptContext *ctx); +static BOOL ScrCmd_23D(ScriptContext *ctx); +static BOOL ScrCmd_243(ScriptContext *ctx); +static BOOL ScrCmd_244(ScriptContext *ctx); +static BOOL ScrCmd_245(ScriptContext *ctx); +static BOOL ScrCmd_246(ScriptContext *ctx); +static BOOL ScrCmd_249(ScriptContext *ctx); +static BOOL ScrCmd_24A(ScriptContext *ctx); +static BOOL ScrCmd_24B(ScriptContext *ctx); +static BOOL ScrCmd_24C(ScriptContext *ctx); +static BOOL ScrCmd_24D(ScriptContext *ctx); +static BOOL ScrCmd_252(ScriptContext *ctx); +static BOOL ScrCmd_258(ScriptContext *ctx); +static BOOL ScrCmd_259(ScriptContext *ctx); +static BOOL ScrCmd_25A(ScriptContext *ctx); +static BOOL ScrCmd_25B(ScriptContext *ctx); +static BOOL ScrCmd_25C(ScriptContext *ctx); +static BOOL ScrCmd_25D(ScriptContext *ctx); +static BOOL ScrCmd_25E(ScriptContext *ctx); +static BOOL ScrCmd_25F(ScriptContext *ctx); +static BOOL ScrCmd_260(ScriptContext *ctx); +static BOOL ScrCmd_262(ScriptContext *ctx); +static BOOL ScrCmd_263(ScriptContext *ctx); +static BOOL ScrCmd_264(ScriptContext *ctx); +static BOOL ScrCmd_265(ScriptContext *ctx); +static BOOL ScrCmd_266(ScriptContext *ctx); +static BOOL ScrCmd_267(ScriptContext *ctx); +static BOOL ScrCmd_268(ScriptContext *ctx); +static BOOL ScrCmd_269(ScriptContext *ctx); +static BOOL ScrCmd_26A(ScriptContext *ctx); +static BOOL ScrCmd_26B(ScriptContext *ctx); +static BOOL ScrCmd_26C(ScriptContext *ctx); +static BOOL ScrCmd_26E(ScriptContext *ctx); +static BOOL ScrCmd_270(ScriptContext *ctx); +static BOOL ScrCmd_273(ScriptContext *ctx); +static BOOL ScrCmd_275(ScriptContext *ctx); +static BOOL ScrCmd_277(ScriptContext *ctx); +static BOOL ScrCmd_279(ScriptContext *ctx); +static BOOL ScrCmd_27A(ScriptContext *ctx); +static BOOL ScrCmd_27B(ScriptContext *ctx); +static BOOL ScrCmd_27D(ScriptContext *ctx); +static BOOL ScrCmd_27E(ScriptContext *ctx); +static BOOL ScrCmd_27F(ScriptContext *ctx); +static BOOL ScrCmd_282(ScriptContext *ctx); +static BOOL ScrCmd_284(ScriptContext *ctx); +static BOOL ScrCmd_285(ScriptContext *ctx); +static BOOL ScrCmd_286(ScriptContext *ctx); +static BOOL ScrCmd_287(ScriptContext *ctx); +static BOOL ScrCmd_288(ScriptContext *ctx); +static BOOL ScrCmd_289(ScriptContext *ctx); +static BOOL ScrCmd_28A(ScriptContext *ctx); +static BOOL ScrCmd_307(ScriptContext *ctx); +static BOOL ScrCmd_28B(ScriptContext *ctx); +static BOOL ScrCmd_28C(ScriptContext *ctx); +static BOOL ScrCmd_28D(ScriptContext *ctx); +static BOOL ScrCmd_28E(ScriptContext *ctx); +static BOOL sub_02041FF8(ScriptContext *ctx); +static BOOL ScrCmd_28F(ScriptContext *ctx); +static BOOL ScrCmd_292(ScriptContext *ctx); +static BOOL ScrCmd_290(ScriptContext *ctx); +static BOOL ScrCmd_291(ScriptContext *ctx); +static BOOL ScrCmd_29E(ScriptContext *ctx); +static BOOL ScrCmd_293(ScriptContext *ctx); +static BOOL ScrCmd_29F(ScriptContext *ctx); +static BOOL ScrCmd_2A1(ScriptContext *ctx); +static BOOL ScrCmd_2A2(ScriptContext *ctx); +static BOOL ScrCmd_2A3(ScriptContext *ctx); +static BOOL ScrCmd_2A4(ScriptContext *ctx); +static BOOL ScrCmd_2A7(ScriptContext *ctx); +static BOOL ScrCmd_2AA(ScriptContext *ctx); +static BOOL ScrCmd_2AB(ScriptContext *ctx); +static BOOL ScrCmd_2AC(ScriptContext *ctx); +static BOOL ScrCmd_2AF(ScriptContext *ctx); +static BOOL ScrCmd_2B0(ScriptContext *ctx); +static BOOL ScrCmd_2B1(ScriptContext *ctx); +static BOOL ScrCmd_2B2(ScriptContext *ctx); +static BOOL ScrCmd_LockLastTalked(ScriptContext *ctx); +static BOOL ScrCmd_2B5(ScriptContext *ctx); +static BOOL ScrCmd_2B6(ScriptContext *ctx); +static BOOL sub_02040A9C(ScriptContext *ctx); +static BOOL ScrCmd_2B9(ScriptContext *ctx); +static BOOL ScrCmd_2BB(ScriptContext *ctx); +static BOOL ScrCmd_2BE(ScriptContext *ctx); +static BOOL ScrCmd_2BF(ScriptContext *ctx); +static BOOL ScrCmd_2C1(ScriptContext *ctx); +static BOOL ScrCmd_2C2(ScriptContext *ctx); +static BOOL ScrCmd_2C3(ScriptContext *ctx); +static BOOL ScrCmd_33A(ScriptContext *ctx); +static BOOL ScrCmd_33B(ScriptContext *ctx); +static BOOL ScrCmd_2C4(ScriptContext *ctx); +static BOOL ScrCmd_2C6(ScriptContext *ctx); +static BOOL ScrCmd_2C7(ScriptContext *ctx); +static BOOL ScrCmd_2CA(ScriptContext *ctx); +static BOOL ScrCmd_2CD(ScriptContext *ctx); +static BOOL ScrCmd_2CE(ScriptContext *ctx); +static BOOL ScrCmd_2D6(ScriptContext *ctx); +static BOOL ScrCmd_2D7(ScriptContext *ctx); +static BOOL ScrCmd_2D8(ScriptContext *ctx); +BOOL ScrCmd_2C8(ScriptContext *ctx); +BOOL ScrCmd_2E2(ScriptContext *ctx); +BOOL ScrCmd_2E3(ScriptContext *ctx); +BOOL ScrCmd_2E4(ScriptContext *ctx); +BOOL ScrCmd_2F4(ScriptContext *ctx); static u8 sub_02046524(u16 param0, u16 param1, u16 param2, u16 param3); static u8 sub_02046568(u16 param0, u16 param1, u16 param2, u16 param3); -static BOOL ScrCmd_2F6(ScriptContext * ctx); -static BOOL ScrCmd_2F7(ScriptContext * ctx); -static BOOL ScrCmd_2FB(ScriptContext * ctx); -static BOOL ScrCmd_2FC(ScriptContext * ctx); -static BOOL ScrCmd_302(ScriptContext * ctx); -static BOOL ScrCmd_30A(ScriptContext * ctx); -static BOOL ScrCmd_311(ScriptContext * ctx); -static BOOL ScrCmd_312(ScriptContext * ctx); -static BOOL ScrCmd_31F(ScriptContext * ctx); -static BOOL ScrCmd_313(ScriptContext * ctx); -static BOOL ScrCmd_319(ScriptContext * ctx); -static BOOL ScrCmd_31A(ScriptContext * ctx); -static BOOL ScrCmd_320(ScriptContext * ctx); -static BOOL ScrCmd_321(ScriptContext * ctx); -static BOOL ScrCmd_322(ScriptContext * ctx); -static BOOL ScrCmd_323(ScriptContext * ctx); -static BOOL ScrCmd_328(ScriptContext * ctx); -static BOOL ScrCmd_32B(ScriptContext * ctx); -static BOOL sub_02040F0C(ScriptContext * ctx); -static void sub_02040F28(FieldSystem * fieldSystem, SysTask * param1, MapObjectAnimCmd * param2); -static void sub_02040F5C(SysTask * param0, void * param1); -static u32 sub_0204676C(SaveData * param0); +static BOOL ScrCmd_2F6(ScriptContext *ctx); +static BOOL ScrCmd_2F7(ScriptContext *ctx); +static BOOL ScrCmd_2FB(ScriptContext *ctx); +static BOOL ScrCmd_2FC(ScriptContext *ctx); +static BOOL ScrCmd_302(ScriptContext *ctx); +static BOOL ScrCmd_30A(ScriptContext *ctx); +static BOOL ScrCmd_311(ScriptContext *ctx); +static BOOL ScrCmd_312(ScriptContext *ctx); +static BOOL ScrCmd_31F(ScriptContext *ctx); +static BOOL ScrCmd_313(ScriptContext *ctx); +static BOOL ScrCmd_319(ScriptContext *ctx); +static BOOL ScrCmd_31A(ScriptContext *ctx); +static BOOL ScrCmd_320(ScriptContext *ctx); +static BOOL ScrCmd_321(ScriptContext *ctx); +static BOOL ScrCmd_322(ScriptContext *ctx); +static BOOL ScrCmd_323(ScriptContext *ctx); +static BOOL ScrCmd_328(ScriptContext *ctx); +static BOOL ScrCmd_32B(ScriptContext *ctx); +static BOOL sub_02040F0C(ScriptContext *ctx); +static void sub_02040F28(FieldSystem *fieldSystem, SysTask *param1, MapObjectAnimCmd *param2); +static void sub_02040F5C(SysTask *param0, void *param1); +static u32 sub_0204676C(SaveData *param0); static const u8 sConditionTable[6][3] = { // < == > - { TRUE, FALSE, FALSE }, // < - { FALSE, TRUE, FALSE }, // == - { FALSE, FALSE, TRUE }, // > - { TRUE, TRUE, FALSE }, // <= - { FALSE, TRUE, TRUE }, // >= - { TRUE, FALSE, TRUE }, // != + { TRUE, FALSE, FALSE }, // < + { FALSE, TRUE, FALSE }, // == + { FALSE, FALSE, TRUE }, // > + { TRUE, TRUE, FALSE }, // <= + { FALSE, TRUE, TRUE }, // >= + { TRUE, FALSE, TRUE }, // != }; static const UnkStruct_ov61_0222C884 Unk_020EAB84 = { @@ -1617,23 +1611,23 @@ const ScrCmdFunc Unk_020EAC58[] = { const u32 Unk_020EAB80 = NELEMS(Unk_020EAC58); -static BOOL ScrCmd_Noop (ScriptContext * ctx) +static BOOL ScrCmd_Noop(ScriptContext *ctx) { return FALSE; } -static BOOL ScrCmd_Dummy (ScriptContext * ctx) +static BOOL ScrCmd_Dummy(ScriptContext *ctx) { return FALSE; } -static BOOL ScrCmd_End (ScriptContext * ctx) +static BOOL ScrCmd_End(ScriptContext *ctx) { ScriptContext_Stop(ctx); return FALSE; } -static BOOL ScrCmd_WaitTime (ScriptContext * ctx) +static BOOL ScrCmd_WaitTime(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 frames = ScriptContext_ReadHalfWord(ctx); @@ -1648,7 +1642,7 @@ static BOOL ScrCmd_WaitTime (ScriptContext * ctx) return TRUE; } -static BOOL ScriptContext_DecrementTimer (ScriptContext * ctx) +static BOOL ScriptContext_DecrementTimer(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 *frames = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); @@ -1658,13 +1652,13 @@ static BOOL ScriptContext_DecrementTimer (ScriptContext * ctx) return *frames == 0; } -static BOOL ScrCmd_Dummy1 (ScriptContext *ctx) +static BOOL ScrCmd_Dummy1(ScriptContext *ctx) { u16 dummy = ScriptContext_GetVar(ctx); return FALSE; } -static BOOL ScrCmd_004 (ScriptContext * ctx) +static BOOL ScrCmd_004(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); @@ -1672,7 +1666,7 @@ static BOOL ScrCmd_004 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_005 (ScriptContext * ctx) +static BOOL ScrCmd_005(ScriptContext *ctx) { u8 v0; u32 v1; @@ -1684,10 +1678,10 @@ static BOOL ScrCmd_005 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_006 (ScriptContext * ctx) +static BOOL ScrCmd_006(ScriptContext *ctx) { u8 v0; - u8 * v1; + u8 *v1; v0 = ScriptContext_ReadByte(ctx); v1 = (u8 *)ScriptContext_ReadWord(ctx); @@ -1696,9 +1690,9 @@ static BOOL ScrCmd_006 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_007 (ScriptContext * ctx) +static BOOL ScrCmd_007(ScriptContext *ctx) { - u8 * v0; + u8 *v0; u8 v1; v0 = (u8 *)ScriptContext_ReadWord(ctx); @@ -1708,9 +1702,9 @@ static BOOL ScrCmd_007 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_008 (ScriptContext * ctx) +static BOOL ScrCmd_008(ScriptContext *ctx) { - u8 * v0; + u8 *v0; u8 v1; v0 = (u8 *)ScriptContext_ReadWord(ctx); @@ -1720,7 +1714,7 @@ static BOOL ScrCmd_008 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_009 (ScriptContext * ctx) +static BOOL ScrCmd_009(ScriptContext *ctx) { u8 v0, v1; @@ -1731,10 +1725,10 @@ static BOOL ScrCmd_009 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_00A (ScriptContext * ctx) +static BOOL ScrCmd_00A(ScriptContext *ctx) { - u8 * v0; - u8 * v1; + u8 *v0; + u8 *v1; v0 = (u8 *)ScriptContext_ReadWord(ctx); v1 = (u8 *)ScriptContext_ReadWord(ctx); @@ -1743,7 +1737,7 @@ static BOOL ScrCmd_00A (ScriptContext * ctx) return 0; } -static u32 Compare (u16 value0, u16 value1) +static u32 Compare(u16 value0, u16 value1) { if (value0 < value1) { return 0; @@ -1754,7 +1748,7 @@ static u32 Compare (u16 value0, u16 value1) } } -static BOOL ScrCmd_00B (ScriptContext * ctx) +static BOOL ScrCmd_00B(ScriptContext *ctx) { u8 v0, v1; @@ -1765,7 +1759,7 @@ static BOOL ScrCmd_00B (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_00C (ScriptContext * ctx) +static BOOL ScrCmd_00C(ScriptContext *ctx) { u8 v0, v1; @@ -1776,7 +1770,7 @@ static BOOL ScrCmd_00C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_00D (ScriptContext * ctx) +static BOOL ScrCmd_00D(ScriptContext *ctx) { u8 v0, v1; @@ -1787,7 +1781,7 @@ static BOOL ScrCmd_00D (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_00E (ScriptContext * ctx) +static BOOL ScrCmd_00E(ScriptContext *ctx) { u8 v0, v1; @@ -1798,7 +1792,7 @@ static BOOL ScrCmd_00E (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_00F (ScriptContext * ctx) +static BOOL ScrCmd_00F(ScriptContext *ctx) { u8 v0, v1; @@ -1809,7 +1803,7 @@ static BOOL ScrCmd_00F (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_010 (ScriptContext * ctx) +static BOOL ScrCmd_010(ScriptContext *ctx) { u8 v0, v1; @@ -1820,7 +1814,7 @@ static BOOL ScrCmd_010 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_CompareVarToValue (ScriptContext * ctx) +static BOOL ScrCmd_CompareVarToValue(ScriptContext *ctx) { u16 value0 = *ScriptContext_GetVarPointer(ctx); u16 value1 = ScriptContext_ReadHalfWord(ctx); @@ -1828,20 +1822,20 @@ static BOOL ScrCmd_CompareVarToValue (ScriptContext * ctx) return FALSE; } -static BOOL ScrCmd_CompareVarToVar (ScriptContext * ctx) +static BOOL ScrCmd_CompareVarToVar(ScriptContext *ctx) { - u16 * var0 = ScriptContext_GetVarPointer(ctx); - u16 * var1 = ScriptContext_GetVarPointer(ctx); + u16 *var0 = ScriptContext_GetVarPointer(ctx); + u16 *var1 = ScriptContext_GetVarPointer(ctx); ctx->comparisonResult = Compare(*var0, *var1); return FALSE; } -static BOOL ScrCmd_013 (ScriptContext * ctx) +static BOOL ScrCmd_013(ScriptContext *ctx) { u16 v0; - FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v2 = sub_0203F098(fieldSystem, 7); - ScriptContext ** v3 = sub_0203F098(fieldSystem, 14); + FieldSystem *fieldSystem = ctx->fieldSystem; + u8 *v2 = sub_0203F098(fieldSystem, 7); + ScriptContext **v3 = sub_0203F098(fieldSystem, 14); v0 = ScriptContext_ReadHalfWord(ctx); *v3 = sub_0203EAB8(fieldSystem, v0); @@ -1850,13 +1844,13 @@ static BOOL ScrCmd_013 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_014 (ScriptContext * ctx) +static BOOL ScrCmd_014(ScriptContext *ctx) { u16 v0; - FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v2 = sub_0203F098(fieldSystem, 5); - u8 * v3 = sub_0203F098(fieldSystem, 7); - ScriptContext ** v4 = sub_0203F098(fieldSystem, 14); + FieldSystem *fieldSystem = ctx->fieldSystem; + u8 *v2 = sub_0203F098(fieldSystem, 5); + u8 *v3 = sub_0203F098(fieldSystem, 7); + ScriptContext **v4 = sub_0203F098(fieldSystem, 14); v0 = ScriptContext_ReadHalfWord(ctx); *v2 = 1; @@ -1867,10 +1861,10 @@ static BOOL ScrCmd_014 (ScriptContext * ctx) return 1; } -static BOOL sub_0203F9EC (ScriptContext * ctx) +static BOOL sub_0203F9EC(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = sub_0203F098(fieldSystem, 5); + FieldSystem *fieldSystem = ctx->fieldSystem; + u8 *v1 = sub_0203F098(fieldSystem, 5); if (*v1 == 0) { return 1; @@ -1879,27 +1873,27 @@ static BOOL sub_0203F9EC (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_015 (ScriptContext * ctx) +static BOOL ScrCmd_015(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = sub_0203F098(fieldSystem, 5); + FieldSystem *fieldSystem = ctx->fieldSystem; + u8 *v1 = sub_0203F098(fieldSystem, 5); *v1 = 0; return 0; } -static BOOL ScrCmd_GoTo (ScriptContext * ctx) +static BOOL ScrCmd_GoTo(ScriptContext *ctx) { ScriptContext_Jump(ctx, ctx->scriptPtr + ScriptContext_ReadWord(ctx)); return FALSE; } -static BOOL ScrCmd_017 (ScriptContext * ctx) +static BOOL ScrCmd_017(ScriptContext *ctx) { u8 v0; s32 v1; - MapObject ** v2; - FieldSystem * fieldSystem = ctx->fieldSystem; + MapObject **v2; + FieldSystem *fieldSystem = ctx->fieldSystem; v2 = sub_0203F098(fieldSystem, 10); v0 = ScriptContext_ReadByte(ctx); @@ -1912,7 +1906,7 @@ static BOOL ScrCmd_017 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_018 (ScriptContext * ctx) +static BOOL ScrCmd_018(ScriptContext *ctx) { u8 v0; s32 v1; @@ -1929,12 +1923,12 @@ static BOOL ScrCmd_018 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_019 (ScriptContext * ctx) +static BOOL ScrCmd_019(ScriptContext *ctx) { u8 v0; s32 v1; - int * v2; - FieldSystem * fieldSystem = ctx->fieldSystem; + int *v2; + FieldSystem *fieldSystem = ctx->fieldSystem; v2 = sub_0203F098(fieldSystem, 9); v0 = ScriptContext_ReadByte(ctx); @@ -1947,19 +1941,19 @@ static BOOL ScrCmd_019 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_Call (ScriptContext * ctx) +static BOOL ScrCmd_Call(ScriptContext *ctx) { ScriptContext_Call(ctx, ctx->scriptPtr + ScriptContext_ReadWord(ctx)); return FALSE; } -static BOOL ScrCmd_Return (ScriptContext * ctx) +static BOOL ScrCmd_Return(ScriptContext *ctx) { ScriptContext_Return(ctx); return FALSE; } -static BOOL ScrCmd_GoToIf (ScriptContext * ctx) +static BOOL ScrCmd_GoToIf(ScriptContext *ctx) { u8 condition = ScriptContext_ReadByte(ctx); s32 offset = ScriptContext_ReadWord(ctx); @@ -1969,7 +1963,7 @@ static BOOL ScrCmd_GoToIf (ScriptContext * ctx) return FALSE; } -static BOOL ScrCmd_CallIf (ScriptContext * ctx) +static BOOL ScrCmd_CallIf(ScriptContext *ctx) { u8 condition = ScriptContext_ReadByte(ctx); s32 offset = ScriptContext_ReadWord(ctx); @@ -1979,104 +1973,104 @@ static BOOL ScrCmd_CallIf (ScriptContext * ctx) return FALSE; } -static BOOL ScrCmd_SetFlag (ScriptContext * ctx) +static BOOL ScrCmd_SetFlag(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 flagID = ScriptContext_ReadHalfWord(ctx); sub_0203F19C(fieldSystem, flagID); return FALSE; } -static BOOL ScrCmd_ClearFlag (ScriptContext * ctx) +static BOOL ScrCmd_ClearFlag(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 flagID = ScriptContext_ReadHalfWord(ctx); sub_0203F1B0(fieldSystem, flagID); return FALSE; } -static BOOL ScrCmd_CheckFlag (ScriptContext * ctx) +static BOOL ScrCmd_CheckFlag(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 flagID = ScriptContext_ReadHalfWord(ctx); ctx->comparisonResult = sub_0203F188(fieldSystem, flagID); return FALSE; } -static BOOL ScrCmd_021 (ScriptContext * ctx) +static BOOL ScrCmd_021(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); *v2 = sub_0203F188(fieldSystem, (*v1)); return 0; } -static BOOL ScrCmd_SetFlagFromVar (ScriptContext * ctx) +static BOOL ScrCmd_SetFlagFromVar(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 flagID = *ScriptContext_GetVarPointer(ctx); sub_0203F19C(fieldSystem, flagID); return FALSE; } -static BOOL ScrCmd_SetTrainerFlag (ScriptContext * ctx) +static BOOL ScrCmd_SetTrainerFlag(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 trainerID = ScriptContext_GetVar(ctx); sub_0203F2BC(fieldSystem, trainerID); return FALSE; } -static BOOL ScrCmd_ClearTrainerFlag (ScriptContext * ctx) +static BOOL ScrCmd_ClearTrainerFlag(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 trainerID = ScriptContext_GetVar(ctx); sub_0203F2D8(fieldSystem, trainerID); return FALSE; } -static BOOL ScrCmd_CheckTrainerFlag (ScriptContext * ctx) +static BOOL ScrCmd_CheckTrainerFlag(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 trainerID = ScriptContext_GetVar(ctx); ctx->comparisonResult = Script_IsTrainerDefeated(fieldSystem, trainerID); return FALSE; } -static BOOL ScrCmd_AddVar (ScriptContext * ctx) +static BOOL ScrCmd_AddVar(ScriptContext *ctx) { - u16 * destVar = ScriptContext_GetVarPointer(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); *destVar += ScriptContext_GetVar(ctx); return FALSE; } -static BOOL ScrCmd_SubVar (ScriptContext * ctx) +static BOOL ScrCmd_SubVar(ScriptContext *ctx) { - u16 * destVar = ScriptContext_GetVarPointer(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); *destVar -= ScriptContext_GetVar(ctx); return FALSE; } -static BOOL ScrCmd_SetVarFromValue (ScriptContext * ctx) +static BOOL ScrCmd_SetVarFromValue(ScriptContext *ctx) { - u16 * destVar = ScriptContext_GetVarPointer(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); *destVar = ScriptContext_ReadHalfWord(ctx); return FALSE; } -static BOOL ScrCmd_SetVarFromVar (ScriptContext * ctx) +static BOOL ScrCmd_SetVarFromVar(ScriptContext *ctx) { - u16 * destVar = ScriptContext_GetVarPointer(ctx); - u16 * srcVar = ScriptContext_GetVarPointer(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); + u16 *srcVar = ScriptContext_GetVarPointer(ctx); *destVar = *srcVar; return FALSE; } -static BOOL ScrCmd_02A (ScriptContext * ctx) +static BOOL ScrCmd_02A(ScriptContext *ctx) { - u16 * v0; + u16 *v0; v0 = ScriptContext_GetVarPointer(ctx); *v0 = ScriptContext_GetVar(ctx); @@ -2084,7 +2078,7 @@ static BOOL ScrCmd_02A (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_MessageInstant (ScriptContext * ctx) +static BOOL ScrCmd_MessageInstant(ScriptContext *ctx) { u8 messageID = ScriptContext_ReadByte(ctx); @@ -2092,9 +2086,9 @@ static BOOL ScrCmd_MessageInstant (ScriptContext * ctx) return FALSE; } -static BOOL ScrCmd_1FA (ScriptContext * ctx) +static BOOL ScrCmd_1FA(ScriptContext *ctx) { - MessageLoader * msgLoader; + MessageLoader *msgLoader; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -2106,9 +2100,9 @@ static BOOL ScrCmd_1FA (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1FB (ScriptContext * ctx) +static BOOL ScrCmd_1FB(ScriptContext *ctx) { - MessageLoader * msgLoader; + MessageLoader *msgLoader; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -2121,7 +2115,7 @@ static BOOL ScrCmd_1FB (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_1FC (ScriptContext * ctx) +static BOOL ScrCmd_1FC(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); u16 v1 = ScriptContext_ReadHalfWord(ctx); @@ -2132,7 +2126,7 @@ static BOOL ScrCmd_1FC (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1FD (ScriptContext * ctx) +static BOOL ScrCmd_1FD(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); u16 v1 = ScriptContext_ReadHalfWord(ctx); @@ -2145,11 +2139,11 @@ static BOOL ScrCmd_1FD (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_1FE (ScriptContext * ctx) +static BOOL ScrCmd_1FE(ScriptContext *ctx) { - u16 * v0; - UnkStruct_0204AFC4 * v1; - MessageLoader * v2; + u16 *v0; + UnkStruct_0204AFC4 *v1; + MessageLoader *v2; u16 v3 = ScriptContext_ReadByte(ctx); v1 = ctx->fieldSystem->unk_AC; @@ -2172,15 +2166,15 @@ static BOOL ScrCmd_1FE (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_1FF (ScriptContext * ctx) +static BOOL ScrCmd_1FF(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 v1 = ScriptContext_ReadByte(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_ReadHalfWord(ctx); u8 v4 = ScriptContext_ReadByte(ctx); u8 v5; - StringTemplate * v6; + StringTemplate *v6; v5 = 0; v6 = sub_0204AEE8(fieldSystem->saveData, v2, v3, v4, &v5); @@ -2192,7 +2186,7 @@ static BOOL ScrCmd_1FF (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_26D (ScriptContext * ctx) +static BOOL ScrCmd_26D(ScriptContext *ctx) { UnkStruct_ov5_021DD42C v0; u16 v1 = ScriptContext_ReadHalfWord(ctx); @@ -2206,7 +2200,7 @@ static BOOL ScrCmd_26D (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_Message (ScriptContext * ctx) +static BOOL ScrCmd_Message(ScriptContext *ctx) { u8 messageID = ScriptContext_ReadByte(ctx); @@ -2216,15 +2210,15 @@ static BOOL ScrCmd_Message (ScriptContext * ctx) return TRUE; } -static BOOL sub_02040014 (ScriptContext * ctx) +static BOOL sub_02040014(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = sub_0203F098(fieldSystem, 3); + FieldSystem *fieldSystem = ctx->fieldSystem; + u8 *v1 = sub_0203F098(fieldSystem, 3); return FieldMessage_FinishedPrinting(*v1); } -static BOOL ScrCmd_MessageVar (ScriptContext * ctx) +static BOOL ScrCmd_MessageVar(ScriptContext *ctx) { u16 messageID = ScriptContext_GetVar(ctx); @@ -2234,7 +2228,7 @@ static BOOL ScrCmd_MessageVar (ScriptContext * ctx) return TRUE; } -static BOOL ScrCmd_2C0 (ScriptContext * ctx) +static BOOL ScrCmd_2C0(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); UnkStruct_ov5_021DD42C v1; @@ -2249,7 +2243,7 @@ static BOOL ScrCmd_2C0 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_02E (ScriptContext * ctx) +static BOOL ScrCmd_02E(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); @@ -2259,9 +2253,9 @@ static BOOL ScrCmd_02E (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_20C (ScriptContext * ctx) +static BOOL ScrCmd_20C(ScriptContext *ctx) { - MapObject ** mapObj = sub_0203F098(ctx->fieldSystem, 10); + MapObject **mapObj = sub_0203F098(ctx->fieldSystem, 10); u8 v1 = MapObject_GetEventType(*mapObj); ov5_021DD444(ctx, ctx->loader, (u8)v1, 1, NULL); @@ -2270,7 +2264,7 @@ static BOOL ScrCmd_20C (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_02F (ScriptContext * ctx) +static BOOL ScrCmd_02F(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); @@ -2291,26 +2285,26 @@ static BOOL ScrCmd_02F (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_WaitABPress (ScriptContext * ctx) +static BOOL ScrCmd_WaitABPress(ScriptContext *ctx) { ScriptContext_Pause(ctx, ScriptContext_CheckABPress); return TRUE; } -static BOOL ScriptContext_CheckABPress (ScriptContext * ctx) +static BOOL ScriptContext_CheckABPress(ScriptContext *ctx) { // this doesn't match using == TRUE or leaving off a comparison entirely - return (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) != FALSE; + return (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) != FALSE; } -static BOOL ScrCmd_WaitABPressTime (ScriptContext * ctx) +static BOOL ScrCmd_WaitABPressTime(ScriptContext *ctx) { ctx->data[0] = ScriptContext_GetVar(ctx); ScriptContext_Pause(ctx, ScriptContext_DecrementABPressTimer); return TRUE; } -static BOOL ScriptContext_DecrementABPressTimer (ScriptContext * ctx) +static BOOL ScriptContext_DecrementABPressTimer(ScriptContext *ctx) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return TRUE; @@ -2321,13 +2315,13 @@ static BOOL ScriptContext_DecrementABPressTimer (ScriptContext * ctx) return ctx->data[0] == 0; } -static BOOL ScrCmd_WaitABXPadPress (ScriptContext * ctx) +static BOOL ScrCmd_WaitABXPadPress(ScriptContext *ctx) { ScriptContext_Pause(ctx, ScriptContext_CheckABXPadPress); return TRUE; } -static BOOL ScriptContext_CheckABXPadPress (ScriptContext * ctx) +static BOOL ScriptContext_CheckABXPadPress(ScriptContext *ctx) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return TRUE; @@ -2350,25 +2344,25 @@ static BOOL ScriptContext_CheckABXPadPress (ScriptContext * ctx) return TRUE; } -static BOOL ScrCmd_WaitABPadPress (ScriptContext * ctx) +static BOOL ScrCmd_WaitABPadPress(ScriptContext *ctx) { ScriptContext_Pause(ctx, ScriptContext_CheckABPadPress); return TRUE; } -static BOOL ScriptContext_CheckABPadPress (ScriptContext * ctx) +static BOOL ScriptContext_CheckABPadPress(ScriptContext *ctx) { // this function doesn't match simplified further, using == TRUE, or leaving off a comparison entirely if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { return TRUE; } - return (gCoreSys.pressedKeys & PAD_KEY) != FALSE; + return (gCoreSys.pressedKeys & PAD_KEY) != FALSE; } -static BOOL ScrCmd_033 (ScriptContext * ctx) +static BOOL ScrCmd_033(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = sub_0203F098(fieldSystem, 6); + FieldSystem *fieldSystem = ctx->fieldSystem; + u8 *v1 = sub_0203F098(fieldSystem, 6); FieldMessage_AddWindow(fieldSystem->unk_08, sub_0203F098(fieldSystem, 1), 3); FieldMessage_DrawWindow(sub_0203F098(fieldSystem, 1), SaveData_Options(ctx->fieldSystem->saveData)); @@ -2377,7 +2371,7 @@ static BOOL ScrCmd_033 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_CloseMessage (ScriptContext * ctx) +static BOOL ScrCmd_CloseMessage(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; Window *window = sub_0203F098(fieldSystem, 1); @@ -2390,11 +2384,11 @@ static BOOL ScrCmd_CloseMessage (ScriptContext * ctx) return FALSE; } -static BOOL ScrCmd_035 (ScriptContext * ctx) +static BOOL ScrCmd_035(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - Window * v1 = sub_0203F098(fieldSystem, 1); - u8 * v2 = sub_0203F098(fieldSystem, 6); + FieldSystem *fieldSystem = ctx->fieldSystem; + Window *v1 = sub_0203F098(fieldSystem, 1); + u8 *v2 = sub_0203F098(fieldSystem, 6); BGL_DeleteWindow(v1); @@ -2402,15 +2396,15 @@ static BOOL ScrCmd_035 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_03D (ScriptContext * ctx) +static BOOL ScrCmd_03D(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = sub_0203F098(fieldSystem, 49); - u16 * v2 = sub_0203F098(fieldSystem, 45); - u16 * v3 = sub_0203F098(fieldSystem, 50); - u16 * v4 = sub_0203F098(fieldSystem, 51); - u16 * v5 = sub_0203F098(fieldSystem, 46); - u16 * v6 = sub_0203F098(fieldSystem, 52); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = sub_0203F098(fieldSystem, 49); + u16 *v2 = sub_0203F098(fieldSystem, 45); + u16 *v3 = sub_0203F098(fieldSystem, 50); + u16 *v4 = sub_0203F098(fieldSystem, 51); + u16 *v5 = sub_0203F098(fieldSystem, 46); + u16 *v6 = sub_0203F098(fieldSystem, 52); *v1 = ScriptContext_ReadByte(ctx); *v2 = ScriptContext_ReadByte(ctx); @@ -2424,15 +2418,15 @@ static BOOL ScrCmd_03D (ScriptContext * ctx) return 1; } -static BOOL sub_020403EC (ScriptContext * ctx) +static BOOL sub_020403EC(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = sub_0203F098(fieldSystem, 49); - u16 * v2 = sub_0203F098(fieldSystem, 50); - u16 * v3 = sub_0203F098(fieldSystem, 51); - u16 * v4 = sub_0203F098(fieldSystem, 52); - u16 * v5 = sub_0203F098(fieldSystem, 45); - u16 * v6 = sub_0203F098(fieldSystem, 46); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = sub_0203F098(fieldSystem, 49); + u16 *v2 = sub_0203F098(fieldSystem, 50); + u16 *v3 = sub_0203F098(fieldSystem, 51); + u16 *v4 = sub_0203F098(fieldSystem, 52); + u16 *v5 = sub_0203F098(fieldSystem, 45); + u16 *v6 = sub_0203F098(fieldSystem, 46); if ((*v5 == 0) && (*v6 == 0)) { return 1; @@ -2465,12 +2459,12 @@ static BOOL sub_020403EC (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_036 (ScriptContext * ctx) +static BOOL ScrCmd_036(ScriptContext *ctx) { - FieldSystem * fieldSystem; - Strbuf ** v1; - Strbuf ** v2; - StringTemplate ** v3; + FieldSystem *fieldSystem; + Strbuf **v1; + Strbuf **v2; + StringTemplate **v3; u16 v4; u16 v5; u8 v6; @@ -2486,7 +2480,7 @@ static BOOL ScrCmd_036 (ScriptContext * ctx) v5 = ScriptContext_ReadHalfWord(ctx); if (v4 == 0) { - MapObject ** v8 = sub_0203F098(fieldSystem, 10); + MapObject **v8 = sub_0203F098(fieldSystem, 10); v4 = sub_020629D8(*v8, 0); } @@ -2502,9 +2496,9 @@ static BOOL ScrCmd_036 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_037 (ScriptContext * ctx) +static BOOL ScrCmd_037(ScriptContext *ctx) { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; u16 v1; u8 v2; @@ -2518,9 +2512,9 @@ static BOOL ScrCmd_037 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_038 (ScriptContext * ctx) +static BOOL ScrCmd_038(ScriptContext *ctx) { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; u8 v1; fieldSystem = ctx->fieldSystem; @@ -2531,9 +2525,9 @@ static BOOL ScrCmd_038 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_039 (ScriptContext * ctx) +static BOOL ScrCmd_039(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; if (ov5_021E1B58(fieldSystem->unk_64) == 1) { return 0; @@ -2543,9 +2537,9 @@ static BOOL ScrCmd_039 (ScriptContext * ctx) return 1; } -static BOOL sub_020405C4 (ScriptContext * ctx) +static BOOL sub_020405C4(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; if (ov5_021E1B58(fieldSystem->unk_64) == 1) { return 1; @@ -2554,13 +2548,13 @@ static BOOL sub_020405C4 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_03A (ScriptContext * ctx) +static BOOL ScrCmd_03A(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = sub_0203F098(fieldSystem, 3); - Strbuf ** v2 = sub_0203F098(fieldSystem, 17); - Strbuf ** v3 = sub_0203F098(fieldSystem, 16); - StringTemplate ** v4 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = ctx->fieldSystem; + u8 *v1 = sub_0203F098(fieldSystem, 3); + Strbuf **v2 = sub_0203F098(fieldSystem, 17); + Strbuf **v3 = sub_0203F098(fieldSystem, 16); + StringTemplate **v4 = sub_0203F098(fieldSystem, 15); u8 v5 = ScriptContext_ReadByte(ctx); u16 v6 = ScriptContext_ReadHalfWord(ctx); @@ -2575,11 +2569,11 @@ static BOOL ScrCmd_03A (ScriptContext * ctx) return 1; } -static BOOL sub_02040670 (ScriptContext * ctx) +static BOOL sub_02040670(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = sub_0203F098(fieldSystem, 3); - u16 * v2 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); + FieldSystem *fieldSystem = ctx->fieldSystem; + u8 *v1 = sub_0203F098(fieldSystem, 3); + u16 *v2 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); u8 v3 = ov5_021E1B54(fieldSystem->unk_64); int v4 = 0xffff; @@ -2614,7 +2608,7 @@ static BOOL sub_02040670 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_03B (ScriptContext * ctx) +static BOOL ScrCmd_03B(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -2624,10 +2618,10 @@ static BOOL ScrCmd_03B (ScriptContext * ctx) return 1; } -static BOOL sub_02040730 (ScriptContext * ctx) +static BOOL sub_02040730(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); int v2 = 0xffff; if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -2659,18 +2653,18 @@ static BOOL sub_02040730 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_03C (ScriptContext * ctx) +static BOOL ScrCmd_03C(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_0203F0C0(fieldSystem); return 0; } -static BOOL ScrCmd_03E (ScriptContext * ctx) +static BOOL ScrCmd_03E(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UIControlData ** v1 = sub_0203F098(fieldSystem, 2); + FieldSystem *fieldSystem = ctx->fieldSystem; + UIControlData **v1 = sub_0203F098(fieldSystem, 2); u16 v2 = ScriptContext_ReadHalfWord(ctx); sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4); @@ -2683,12 +2677,12 @@ static BOOL ScrCmd_03E (ScriptContext * ctx) return 1; } -static BOOL sub_02040824 (ScriptContext * ctx) +static BOOL sub_02040824(ScriptContext *ctx) { u32 v0; - FieldSystem * fieldSystem = ctx->fieldSystem; - UIControlData ** v2 = sub_0203F098(fieldSystem, 2); - u16 * v3 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); + FieldSystem *fieldSystem = ctx->fieldSystem; + UIControlData **v2 = sub_0203F098(fieldSystem, 2); + u16 *v3 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); v0 = sub_02002114(*v2, 4); @@ -2705,10 +2699,10 @@ static BOOL sub_02040824 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_18D (ScriptContext * ctx) +static BOOL ScrCmd_18D(ScriptContext *ctx) { - void ** v0; - Window * v1 = sub_0203F098(ctx->fieldSystem, 1); + void **v0; + Window *v1 = sub_0203F098(ctx->fieldSystem, 1); v0 = sub_0203F098(ctx->fieldSystem, 18); *v0 = sub_0200E7FC(v1, 1024 - (18 + 12)); @@ -2716,9 +2710,9 @@ static BOOL ScrCmd_18D (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_18E (ScriptContext * ctx) +static BOOL ScrCmd_18E(ScriptContext *ctx) { - void ** v0; + void **v0; v0 = sub_0203F098(ctx->fieldSystem, 18); DeleteWaitDial(*v0); @@ -2726,11 +2720,11 @@ static BOOL ScrCmd_18E (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_040 (ScriptContext * ctx) +static BOOL ScrCmd_040(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); u8 v3 = ScriptContext_ReadByte(ctx); u8 v4 = ScriptContext_ReadByte(ctx); u8 v5 = ScriptContext_ReadByte(ctx); @@ -2743,11 +2737,11 @@ static BOOL ScrCmd_040 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_041 (ScriptContext * ctx) +static BOOL ScrCmd_041(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); u8 v3 = ScriptContext_ReadByte(ctx); u8 v4 = ScriptContext_ReadByte(ctx); u8 v5 = ScriptContext_ReadByte(ctx); @@ -2760,11 +2754,11 @@ static BOOL ScrCmd_041 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_042 (ScriptContext * ctx) +static BOOL ScrCmd_042(ScriptContext *ctx) { u8 v0, v1; - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v3 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v3 = sub_0203F098(fieldSystem, 0); v0 = ScriptContext_ReadByte(ctx); v1 = ScriptContext_ReadByte(ctx); @@ -2773,11 +2767,11 @@ static BOOL ScrCmd_042 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_29D (ScriptContext * ctx) +static BOOL ScrCmd_29D(ScriptContext *ctx) { u16 v0, v1; - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v3 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v3 = sub_0203F098(fieldSystem, 0); v0 = ScriptContext_GetVar(ctx); v1 = ScriptContext_GetVar(ctx); @@ -2786,10 +2780,10 @@ static BOOL ScrCmd_29D (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_043 (ScriptContext * ctx) +static BOOL ScrCmd_043(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); ov5_021DC1AC(*v1); ScriptContext_Pause(ctx, sub_02040A50); @@ -2797,10 +2791,10 @@ static BOOL ScrCmd_043 (ScriptContext * ctx) return 1; } -static BOOL sub_02040A50 (ScriptContext * ctx) +static BOOL sub_02040A50(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); if (*v1 == 0xeeee) { return 0; @@ -2809,10 +2803,10 @@ static BOOL sub_02040A50 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_2B9 (ScriptContext * ctx) +static BOOL ScrCmd_2B9(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); ov5_021DC1AC(*v1); ScriptContext_Pause(ctx, sub_02040A9C); @@ -2820,11 +2814,11 @@ static BOOL ScrCmd_2B9 (ScriptContext * ctx) return 1; } -static BOOL sub_02040A9C (ScriptContext * ctx) +static BOOL sub_02040A9C(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); - UnkStruct_ov5_021DC1A4 ** v2 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); + UnkStruct_ov5_021DC1A4 **v2 = sub_0203F098(fieldSystem, 0); if (*v1 == 0xeeee) { if (sub_0205B9E8(fieldSystem->unk_7C)) { @@ -2839,11 +2833,11 @@ static BOOL sub_02040A9C (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_044 (ScriptContext * ctx) +static BOOL ScrCmd_044(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); u8 v3 = ScriptContext_ReadByte(ctx); u8 v4 = ScriptContext_ReadByte(ctx); u8 v5 = ScriptContext_ReadByte(ctx); @@ -2856,11 +2850,11 @@ static BOOL ScrCmd_044 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_045 (ScriptContext * ctx) +static BOOL ScrCmd_045(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); u8 v3 = ScriptContext_ReadByte(ctx); u8 v4 = ScriptContext_ReadByte(ctx); u8 v5 = ScriptContext_ReadByte(ctx); @@ -2873,9 +2867,9 @@ static BOOL ScrCmd_045 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_046 (ScriptContext * ctx) +static BOOL ScrCmd_046(ScriptContext *ctx) { - UnkStruct_ov5_021DC1A4 ** v0 = sub_0203F098(ctx->fieldSystem, 0); + UnkStruct_ov5_021DC1A4 **v0 = sub_0203F098(ctx->fieldSystem, 0); u8 v1 = ScriptContext_GetVar(ctx); u8 v2 = ScriptContext_GetVar(ctx); u8 v3 = ScriptContext_GetVar(ctx); @@ -2884,10 +2878,10 @@ static BOOL ScrCmd_046 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_047 (ScriptContext * ctx) +static BOOL ScrCmd_047(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); ov5_021DC4B8(*v1); @@ -2895,10 +2889,10 @@ static BOOL ScrCmd_047 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_327 (ScriptContext * ctx) +static BOOL ScrCmd_327(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); u16 v2 = ScriptContext_GetVar(ctx); ov5_021DC528(*v1, v2); @@ -2907,12 +2901,12 @@ static BOOL ScrCmd_327 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_306 (ScriptContext * ctx) +static BOOL ScrCmd_306(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); - u16 * v2 = ScriptContext_GetVarPointer(ctx); - u16 * v3 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); + u16 *v2 = ScriptContext_GetVarPointer(ctx); + u16 *v3 = ScriptContext_GetVarPointer(ctx); ov5_021DC600(*v1, v2, v3); ScriptContext_Pause(ctx, sub_02040A50); @@ -2920,10 +2914,10 @@ static BOOL ScrCmd_306 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_048 (ScriptContext * ctx) +static BOOL ScrCmd_048(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); u8 v2 = ScriptContext_ReadByte(ctx); ov5_021DCD94(*v1, v2); @@ -2932,55 +2926,55 @@ static BOOL ScrCmd_048 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_33A (ScriptContext * ctx) +static BOOL ScrCmd_33A(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); u8 v2 = ScriptContext_ReadByte(ctx); ov5_021DD3F4(*v1, (BOOL)v2); return 1; } -static BOOL ScrCmd_33B (ScriptContext * ctx) +static BOOL ScrCmd_33B(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021DC1A4 ** v1 = sub_0203F098(fieldSystem, 0); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021DC1A4 **v1 = sub_0203F098(fieldSystem, 0); u8 v2 = ScriptContext_ReadByte(ctx); ov5_021DD410(*v1, (BOOL)v2); return 1; } -static BOOL ScrCmd_ApplyMovement (ScriptContext * ctx) +static BOOL ScrCmd_ApplyMovement(ScriptContext *ctx) { u16 localID = ScriptContext_GetVar(ctx); u32 movementOffset = ScriptContext_ReadWord(ctx); - MapObject * object = sub_02040ED4(ctx->fieldSystem, localID); + MapObject *object = sub_02040ED4(ctx->fieldSystem, localID); if (object == NULL) { GF_ASSERT(FALSE); return FALSE; } - SysTask * v1 = MapObject_StartAnimation(object, (MapObjectAnimCmd *)(ctx->scriptPtr + movementOffset)); - u8 * v2 = sub_0203F098(ctx->fieldSystem, 4); + SysTask *v1 = MapObject_StartAnimation(object, (MapObjectAnimCmd *)(ctx->scriptPtr + movementOffset)); + u8 *v2 = sub_0203F098(ctx->fieldSystem, 4); (*v2)++; sub_02040F28(ctx->fieldSystem, v1, NULL); return FALSE; } -static BOOL ScrCmd_2A1 (ScriptContext * ctx) +static BOOL ScrCmd_2A1(ScriptContext *ctx) { - u8 * v0; - SysTask * v1; - u8 * v2; - MapObject ** v3; - MapObject * v4; + u8 *v0; + SysTask *v1; + u8 *v2; + MapObject **v3; + MapObject *v4; u16 v5 = ScriptContext_GetVar(ctx); u16 v6 = ScriptContext_GetVar(ctx); u16 v7 = ScriptContext_GetVar(ctx); u16 v8, v9; - MapObjectAnimCmd * v10; + MapObjectAnimCmd *v10; int v11; v4 = sub_02040ED4(ctx->fieldSystem, v5); @@ -3026,10 +3020,10 @@ static BOOL ScrCmd_2A1 (ScriptContext * ctx) return 0; } -static MapObject * sub_02040ED4 (FieldSystem * fieldSystem, int param1) +static MapObject *sub_02040ED4(FieldSystem *fieldSystem, int param1) { - MapObject ** v0; - MapObject * v1; + MapObject **v0; + MapObject *v1; if (param1 == 0xf2) { v1 = sub_02062570(fieldSystem->mapObjMan, 0x30); @@ -3043,16 +3037,16 @@ static MapObject * sub_02040ED4 (FieldSystem * fieldSystem, int param1) return v1; } -static BOOL ScrCmd_WaitMovement (ScriptContext * ctx) +static BOOL ScrCmd_WaitMovement(ScriptContext *ctx) { ScriptContext_Pause(ctx, sub_02040F0C); return TRUE; } -static BOOL sub_02040F0C (ScriptContext * ctx) +static BOOL sub_02040F0C(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u8 * v1 = sub_0203F098(fieldSystem, 4); + FieldSystem *fieldSystem = ctx->fieldSystem; + u8 *v1 = sub_0203F098(fieldSystem, 4); if (*v1 == 0) { return 1; @@ -3061,9 +3055,9 @@ static BOOL sub_02040F0C (ScriptContext * ctx) return 0; } -static void sub_02040F28 (FieldSystem * fieldSystem, SysTask * param1, MapObjectAnimCmd * param2) +static void sub_02040F28(FieldSystem *fieldSystem, SysTask *param1, MapObjectAnimCmd *param2) { - UnkStruct_02040F28 * v0 = NULL; + UnkStruct_02040F28 *v0 = NULL; v0 = Heap_AllocFromHeap(4, sizeof(UnkStruct_02040F28)); @@ -3080,10 +3074,10 @@ static void sub_02040F28 (FieldSystem * fieldSystem, SysTask * param1, MapObject return; } -static void sub_02040F5C (SysTask * task, void * param1) +static void sub_02040F5C(SysTask *task, void *param1) { - UnkStruct_02040F28 * v0; - u8 * v1; + UnkStruct_02040F28 *v0; + u8 *v1; v0 = (UnkStruct_02040F28 *)param1; v1 = sub_0203F098(v0->fieldSystem, 4); @@ -3109,7 +3103,7 @@ static void sub_02040F5C (SysTask * task, void * param1) return; } -static BOOL ScrCmd_LockAll (ScriptContext * ctx) +static BOOL ScrCmd_LockAll(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; MapObject **objectPtr = sub_0203F098(fieldSystem, 10); @@ -3120,10 +3114,10 @@ static BOOL ScrCmd_LockAll (ScriptContext * ctx) MapObject *object = sub_02062570(fieldSystem->mapObjMan, 0x30); - if (object - && sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1 + if (object + && sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1 && MapObject_IsMoving(object) != FALSE) { - + sub_02062DDC(object); ScriptContext_Pause(ctx, sub_020410CC); return TRUE; @@ -3137,57 +3131,57 @@ static BOOL ScrCmd_LockAll (ScriptContext * ctx) static u8 Unk_021C07E0; -static inline void inline_020410F4 (void) +static inline void inline_020410F4(void) { Unk_021C07E0 = 0; } -static inline BOOL inline_020410F4_1 (int mask) +static inline BOOL inline_020410F4_1(int mask) { return (Unk_021C07E0 & mask) != 0; } -static inline void inline_020410F4_2 (int mask) +static inline void inline_020410F4_2(int mask) { Unk_021C07E0 |= mask; } -static inline void inline_020410F4_3 (int mask) +static inline void inline_020410F4_3(int mask) { Unk_021C07E0 &= (0xff ^ mask); } -static BOOL sub_02041004 (ScriptContext * ctx) +static BOOL sub_02041004(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - MapObject ** v1 = sub_0203F098(fieldSystem, 10); - MapObject * v2 = Player_MapObject(fieldSystem->playerAvatar); + FieldSystem *fieldSystem = ctx->fieldSystem; + MapObject **v1 = sub_0203F098(fieldSystem, 10); + MapObject *v2 = Player_MapObject(fieldSystem->playerAvatar); - if (inline_020410F4_1((1 << 0)) && (LocalMapObj_CheckAnimationFinished(v2) == 1)) { + if (inline_020410F4_1(1 << 0) && (LocalMapObj_CheckAnimationFinished(v2) == 1)) { sub_02062DD0(v2); - inline_020410F4_3((1 << 0)); + inline_020410F4_3(1 << 0); } - if (inline_020410F4_1((1 << 2)) && (MapObject_IsMoving(*v1) == 0)) { + if (inline_020410F4_1(1 << 2) && (MapObject_IsMoving(*v1) == 0)) { sub_02062DD0(*v1); - inline_020410F4_3((1 << 2)); + inline_020410F4_3(1 << 2); } - if (inline_020410F4_1((1 << 1))) { - MapObject * v3 = sub_02062570(fieldSystem->mapObjMan, 0x30); + if (inline_020410F4_1(1 << 1)) { + MapObject *v3 = sub_02062570(fieldSystem->mapObjMan, 0x30); if (MapObject_IsMoving(v3) == 0) { sub_02062DD0(v3); - inline_020410F4_3((1 << 1)); + inline_020410F4_3(1 << 1); } } - if (inline_020410F4_1((1 << 3))) { - MapObject * v4 = sub_02069EB8(*v1); + if (inline_020410F4_1(1 << 3)) { + MapObject *v4 = sub_02069EB8(*v1); if (MapObject_IsMoving(v4) == 0) { sub_02062DD0(v4); - inline_020410F4_3((1 << 3)); + inline_020410F4_3(1 << 3); } } @@ -3198,10 +3192,10 @@ static BOOL sub_02041004 (ScriptContext * ctx) return 0; } -static BOOL sub_020410CC (ScriptContext * ctx) +static BOOL sub_020410CC(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - MapObject * v1 = sub_02062570(fieldSystem->mapObjMan, 0x30); + FieldSystem *fieldSystem = ctx->fieldSystem; + MapObject *v1 = sub_02062570(fieldSystem->mapObjMan, 0x30); if (MapObject_IsMoving(v1) == 0) { sub_02062DD0(v1); @@ -3211,7 +3205,7 @@ static BOOL sub_020410CC (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_LockLastTalked (ScriptContext * ctx) +static BOOL ScrCmd_LockLastTalked(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; MapObject **v1 = sub_0203F098(fieldSystem, 10); @@ -3224,25 +3218,25 @@ static BOOL ScrCmd_LockLastTalked (ScriptContext * ctx) MapObjectMan_PauseAllMovement(mapObjMan); if (LocalMapObj_CheckAnimationFinished(player) == FALSE) { - inline_020410F4_2((1 << 0)); + inline_020410F4_2(1 << 0); sub_02062DDC(player); } if (MapObject_IsMoving(*v1) != FALSE) { - inline_020410F4_2((1 << 2)); + inline_020410F4_2(1 << 2); sub_02062DDC(*v1); } if (v3) { if (sub_0206A984(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1 && MapObject_IsMoving(v3) != FALSE) { - inline_020410F4_2((1 << 1)); + inline_020410F4_2(1 << 1); sub_02062DDC(v3); } } if (v4) { if (MapObject_IsMoving(v4) != FALSE) { - inline_020410F4_2((1 << 3)); + inline_020410F4_2(1 << 3); sub_02062DDC(v4); } } @@ -3251,7 +3245,7 @@ static BOOL ScrCmd_LockLastTalked (ScriptContext * ctx) return TRUE; } -static BOOL ScrCmd_ReleaseAll (ScriptContext * ctx) +static BOOL ScrCmd_ReleaseAll(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; MapObjectManager *mapObjMan = fieldSystem->mapObjMan; @@ -3260,10 +3254,10 @@ static BOOL ScrCmd_ReleaseAll (ScriptContext * ctx) return TRUE; } -static BOOL ScrCmd_062 (ScriptContext * ctx) +static BOOL ScrCmd_062(ScriptContext *ctx) { - MapObject * mapObj; - FieldSystem * fieldSystem = ctx->fieldSystem; + MapObject *mapObj; + FieldSystem *fieldSystem = ctx->fieldSystem; mapObj = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_ReadHalfWord(ctx)); sub_02062DD0(mapObj); @@ -3271,10 +3265,10 @@ static BOOL ScrCmd_062 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_063 (ScriptContext * ctx) +static BOOL ScrCmd_063(ScriptContext *ctx) { - MapObject * mapObj; - FieldSystem * fieldSystem = ctx->fieldSystem; + MapObject *mapObj; + FieldSystem *fieldSystem = ctx->fieldSystem; mapObj = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_ReadHalfWord(ctx)); sub_02062DDC(mapObj); @@ -3282,10 +3276,10 @@ static BOOL ScrCmd_063 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_064 (ScriptContext * ctx) +static BOOL ScrCmd_064(ScriptContext *ctx) { - MapObject * mapObj; - FieldSystem * fieldSystem = ctx->fieldSystem; + MapObject *mapObj; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v2 = ScriptContext_GetVar(ctx); mapObj = sub_02061A74(fieldSystem->mapObjMan, v2, MapHeaderData_GetNumObjectEvents(fieldSystem), fieldSystem->location->mapId, MapHeaderData_GetObjectEvents(fieldSystem)); @@ -3297,10 +3291,10 @@ static BOOL ScrCmd_064 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_065 (ScriptContext * ctx) +static BOOL ScrCmd_065(ScriptContext *ctx) { - MapObject * mapObj; - FieldSystem * fieldSystem = ctx->fieldSystem; + MapObject *mapObj; + FieldSystem *fieldSystem = ctx->fieldSystem; mapObj = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_GetVar(ctx)); @@ -3313,11 +3307,11 @@ static BOOL ScrCmd_065 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_066 (ScriptContext * ctx) +static BOOL ScrCmd_066(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); - MapObject ** v2 = sub_0203F098(ctx->fieldSystem, 11); + MapObject **v2 = sub_0203F098(ctx->fieldSystem, 11); *v2 = MapObjectMan_AddMapObject(ctx->fieldSystem->mapObjMan, v0, v1, 0, 0x2000, 0x0, ctx->fieldSystem->location->mapId); @@ -3326,7 +3320,7 @@ static BOOL ScrCmd_066 (ScriptContext * ctx) sub_02062D80(*v2, 0); { - const VecFx32 * v3; + const VecFx32 *v3; v3 = MapObject_PosVector(*v2); ov5_021E931C(v3, ctx->fieldSystem->unk_28); @@ -3336,15 +3330,15 @@ static BOOL ScrCmd_066 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_067 (ScriptContext * ctx) +static BOOL ScrCmd_067(ScriptContext *ctx) { - MapObject ** v0 = sub_0203F098(ctx->fieldSystem, 11); + MapObject **v0 = sub_0203F098(ctx->fieldSystem, 11); MapObject_Delete(*v0); { - MapObject * v1; - const VecFx32 * v2; + MapObject *v1; + const VecFx32 *v2; v1 = MapObjMan_LocalMapObjByIndex(ctx->fieldSystem->mapObjMan, 0xff); v2 = MapObject_PosVector(v1); @@ -3356,11 +3350,11 @@ static BOOL ScrCmd_067 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_308 (ScriptContext * ctx) +static BOOL ScrCmd_308(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); - MapObject ** v2 = sub_0203F098(ctx->fieldSystem, 11); + MapObject **v2 = sub_0203F098(ctx->fieldSystem, 11); *v2 = MapObjectMan_AddMapObject(ctx->fieldSystem->mapObjMan, v0, v1, 0, 0x2000, 0x0, ctx->fieldSystem->location->mapId); @@ -3371,15 +3365,15 @@ static BOOL ScrCmd_308 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_309 (ScriptContext * ctx) +static BOOL ScrCmd_309(ScriptContext *ctx) { - MapObject ** v0 = sub_0203F098(ctx->fieldSystem, 11); + MapObject **v0 = sub_0203F098(ctx->fieldSystem, 11); MapObject_Delete(*v0); return 0; } -static BOOL ScrCmd_FacePlayer (ScriptContext *ctx) +static BOOL ScrCmd_FacePlayer(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; PlayerAvatar *playerAvatar = fieldSystem->playerAvatar; @@ -3395,10 +3389,10 @@ static BOOL ScrCmd_FacePlayer (ScriptContext *ctx) return FALSE; } -static BOOL ScrCmd_069 (ScriptContext * ctx) +static BOOL ScrCmd_069(ScriptContext *ctx) { - u16 * v0, * v1; - FieldSystem * fieldSystem = ctx->fieldSystem; + u16 *v0, *v1; + FieldSystem *fieldSystem = ctx->fieldSystem; v0 = ScriptContext_GetVarPointer(ctx); v1 = ScriptContext_GetVarPointer(ctx); @@ -3408,11 +3402,11 @@ static BOOL ScrCmd_069 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_06A (ScriptContext * ctx) +static BOOL ScrCmd_06A(ScriptContext *ctx) { - MapObject * mapObj; - u16 * v1, * v2; - FieldSystem * fieldSystem = ctx->fieldSystem; + MapObject *mapObj; + u16 *v1, *v2; + FieldSystem *fieldSystem = ctx->fieldSystem; mapObj = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_GetVar(ctx)); v1 = ScriptContext_GetVarPointer(ctx); @@ -3423,9 +3417,9 @@ static BOOL ScrCmd_06A (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1BD (ScriptContext * ctx) +static BOOL ScrCmd_1BD(ScriptContext *ctx) { - u16 * v0; + u16 *v0; v0 = ScriptContext_GetVarPointer(ctx); *v0 = PlayerAvatar_GetDir(ctx->fieldSystem->playerAvatar); @@ -3433,11 +3427,11 @@ static BOOL ScrCmd_1BD (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_06B (ScriptContext * ctx) +static BOOL ScrCmd_06B(ScriptContext *ctx) { u16 v0, v1, v2; VecFx32 v3; - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; v0 = ScriptContext_GetVar(ctx); v1 = ScriptContext_GetVar(ctx); @@ -3453,9 +3447,9 @@ static BOOL ScrCmd_06B (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_06C (ScriptContext * ctx) +static BOOL ScrCmd_06C(ScriptContext *ctx) { - MapObject * mapObj; + MapObject *mapObj; u8 v1; mapObj = MapObjMan_LocalMapObjByIndex(ctx->fieldSystem->mapObjMan, ScriptContext_GetVar(ctx)); @@ -3465,9 +3459,9 @@ static BOOL ScrCmd_06C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_06D (ScriptContext * ctx) +static BOOL ScrCmd_06D(ScriptContext *ctx) { - MapObject * mapObj; + MapObject *mapObj; u16 v1; mapObj = MapObjMan_LocalMapObjByIndex(ctx->fieldSystem->mapObjMan, ScriptContext_GetVar(ctx)); @@ -3477,10 +3471,10 @@ static BOOL ScrCmd_06D (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2AD (ScriptContext * ctx) +static BOOL ScrCmd_2AD(ScriptContext *ctx) { - MapObject * mapObj; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + MapObject *mapObj; + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = 0; mapObj = MapObjMan_LocalMapObjByIndex(ctx->fieldSystem->mapObjMan, ScriptContext_GetVar(ctx)); @@ -3492,9 +3486,9 @@ static BOOL ScrCmd_2AD (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_06E (ScriptContext * ctx) +static BOOL ScrCmd_06E(ScriptContext *ctx) { - MapObject * mapObj; + MapObject *mapObj; mapObj = sub_02062570(ctx->fieldSystem->mapObjMan, 0x30); @@ -3502,10 +3496,10 @@ static BOOL ScrCmd_06E (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2AB (ScriptContext * ctx) +static BOOL ScrCmd_2AB(ScriptContext *ctx) { - UnkStruct_0202CA1C * v0; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + UnkStruct_0202CA1C *v0; + u16 *v1 = ScriptContext_GetVarPointer(ctx); v0 = sub_0202CA1C(ctx->fieldSystem->saveData); *v1 = sub_0202CBA8(v0); @@ -3513,11 +3507,11 @@ static BOOL ScrCmd_2AB (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_093 (ScriptContext * ctx) +static BOOL ScrCmd_093(ScriptContext *ctx) { - UnkStruct_0202CA1C * v0; + UnkStruct_0202CA1C *v0; u16 v1 = ScriptContext_GetVar(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); v0 = sub_0202CA1C(ctx->fieldSystem->saveData); *v2 = sub_0202CBC8(v0, v1); @@ -3525,7 +3519,7 @@ static BOOL ScrCmd_093 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_094 (ScriptContext * ctx) +static BOOL ScrCmd_094(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); @@ -3534,11 +3528,11 @@ static BOOL ScrCmd_094 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_095 (ScriptContext * ctx) +static BOOL ScrCmd_095(ScriptContext *ctx) { - Pokemon * pokemon; + Pokemon *pokemon; u16 v1 = ScriptContext_GetVar(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); pokemon = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(ctx->fieldSystem->saveData), v1); *v2 = Pokemon_GetForm(pokemon); @@ -3546,9 +3540,9 @@ static BOOL ScrCmd_095 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_191 (ScriptContext * ctx) +static BOOL ScrCmd_191(ScriptContext *ctx) { - void ** v0; + void **v0; v0 = sub_0203F098(ctx->fieldSystem, 19); *v0 = sub_0203D3C0(32, ctx->fieldSystem); @@ -3557,9 +3551,9 @@ static BOOL ScrCmd_191 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_2A5 (ScriptContext * ctx) +static BOOL ScrCmd_2A5(ScriptContext *ctx) { - void ** v0; + void **v0; v0 = sub_0203F098(ctx->fieldSystem, 19); *v0 = sub_0203D3E4(32, ctx->fieldSystem); @@ -3568,9 +3562,9 @@ static BOOL ScrCmd_2A5 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_192 (ScriptContext * ctx) +static BOOL ScrCmd_192(ScriptContext *ctx) { - void ** v0; + void **v0; v0 = sub_0203F098(ctx->fieldSystem, 19); *v0 = sub_0203D50C(ctx->fieldSystem->unk_10, 32); @@ -3578,10 +3572,10 @@ static BOOL ScrCmd_192 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_193 (ScriptContext * ctx) +static BOOL ScrCmd_193(ScriptContext *ctx) { - void ** v0; - u16 * v1; + void **v0; + u16 *v1; v1 = ScriptContext_GetVarPointer(ctx); v0 = sub_0203F098(ctx->fieldSystem, 19); @@ -3600,14 +3594,14 @@ static BOOL ScrCmd_193 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2D0 (ScriptContext * ctx) +static BOOL ScrCmd_2D0(ScriptContext *ctx) { u16 v0; int v1; - void ** v2; - u16 * v3; - u16 * v4; - PartyManagementData * v5; + void **v2; + u16 *v3; + u16 *v4; + PartyManagementData *v5; v3 = ScriptContext_GetVarPointer(ctx); v4 = ScriptContext_GetVarPointer(ctx); @@ -3638,15 +3632,15 @@ static BOOL ScrCmd_2D0 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2D4 (ScriptContext * ctx) +static BOOL ScrCmd_2D4(ScriptContext *ctx) { u16 v0; int v1; - void ** v2; - u16 * v3; - u16 * v4; - u16 * v5; - PartyManagementData * v6; + void **v2; + u16 *v3; + u16 *v4; + u16 *v5; + PartyManagementData *v6; v3 = ScriptContext_GetVarPointer(ctx); v4 = ScriptContext_GetVarPointer(ctx); @@ -3680,15 +3674,15 @@ static BOOL ScrCmd_2D4 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2DB (ScriptContext * ctx) +static BOOL ScrCmd_2DB(ScriptContext *ctx) { u16 v0; int v1; - void ** v2; - u16 * v3; - u16 * v4; - u16 * v5; - PartyManagementData * v6; + void **v2; + u16 *v3; + u16 *v4; + u16 *v5; + PartyManagementData *v6; v3 = ScriptContext_GetVarPointer(ctx); v4 = ScriptContext_GetVarPointer(ctx); @@ -3722,9 +3716,9 @@ static BOOL ScrCmd_2DB (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_194 (ScriptContext * ctx) +static BOOL ScrCmd_194(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -3736,10 +3730,10 @@ static BOOL ScrCmd_194 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_195 (ScriptContext * ctx) +static BOOL ScrCmd_195(ScriptContext *ctx) { - void ** v0; - u16 * v1, * v2; + void **v0; + u16 *v1, *v2; v1 = ScriptContext_GetVarPointer(ctx); v2 = ScriptContext_GetVarPointer(ctx); @@ -3767,9 +3761,9 @@ static BOOL ScrCmd_195 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_196 (ScriptContext * ctx) +static BOOL ScrCmd_196(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); u16 v1 = ScriptContext_GetVar(ctx); *v0 = sub_0203D5C8(32, ctx->fieldSystem, v1); @@ -3778,10 +3772,10 @@ static BOOL ScrCmd_196 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_197 (ScriptContext * ctx) +static BOOL ScrCmd_197(ScriptContext *ctx) { - void ** v0; - u16 * v1; + void **v0; + u16 *v1; v1 = ScriptContext_GetVarPointer(ctx); v0 = sub_0203F098(ctx->fieldSystem, 19); @@ -3796,9 +3790,9 @@ static BOOL ScrCmd_197 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2E7 (ScriptContext * ctx) +static BOOL ScrCmd_2E7(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -3808,11 +3802,11 @@ static BOOL ScrCmd_2E7 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_2E8 (ScriptContext * ctx) +static BOOL ScrCmd_2E8(ScriptContext *ctx) { - void ** v0; - u16 * v1; - PokemonSummary * v2; + void **v0; + u16 *v1; + PokemonSummary *v2; v1 = ScriptContext_GetVarPointer(ctx); v0 = sub_0203F098(ctx->fieldSystem, 19); @@ -3828,49 +3822,49 @@ static BOOL ScrCmd_2E8 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_09B (ScriptContext * ctx) +static BOOL ScrCmd_09B(ScriptContext *ctx) { u8 v0, v1; - MapObject ** v2 = sub_0203F098(ctx->fieldSystem, 10); + MapObject **v2 = sub_0203F098(ctx->fieldSystem, 10); u16 v3 = ScriptContext_GetVar(ctx); - u16 * v4 = ScriptContext_GetVarPointer(ctx); + u16 *v4 = ScriptContext_GetVarPointer(ctx); *v4 = VsSeeker_GetRematchTrainerID(ctx->fieldSystem, *v2, v3); return 0; } -static BOOL ScrCmd_315 (ScriptContext * ctx) +static BOOL ScrCmd_315(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = FieldOverworldState_GetWeather(SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData)); return 0; } -static BOOL ScrCmd_09C (ScriptContext * ctx) +static BOOL ScrCmd_09C(ScriptContext *ctx) { return 0; } -static BOOL ScrCmd_09D (ScriptContext * ctx) +static BOOL ScrCmd_09D(ScriptContext *ctx) { return 0; } -static BOOL ScrCmd_09E (ScriptContext * ctx) +static BOOL ScrCmd_09E(ScriptContext *ctx) { return 1; } -static BOOL ScrCmd_09F (ScriptContext * ctx) +static BOOL ScrCmd_09F(ScriptContext *ctx) { return 0; } -BOOL sub_02041CC8 (ScriptContext * ctx) +BOOL sub_02041CC8(ScriptContext *ctx) { - void ** v0; - FieldSystem * fieldSystem = ctx->fieldSystem; + void **v0; + FieldSystem *fieldSystem = ctx->fieldSystem; v0 = sub_0203F098(ctx->fieldSystem, 19); @@ -3884,11 +3878,11 @@ BOOL sub_02041CC8 (ScriptContext * ctx) return 1; } -static BOOL sub_02041CF4 (ScriptContext * ctx) +static BOOL sub_02041CF4(ScriptContext *ctx) { - void ** v0; - FieldSystem * fieldSystem; - UnkStruct_02042434 * v2; + void **v0; + FieldSystem *fieldSystem; + UnkStruct_02042434 *v2; fieldSystem = ctx->fieldSystem; v0 = sub_0203F098(fieldSystem, 19); @@ -3899,7 +3893,7 @@ static BOOL sub_02041CF4 (ScriptContext * ctx) } if (v2->unk_08 == 1) { - void * v3; + void *v3; v3 = sub_0202BCFC(11); sub_0202B758(fieldSystem->unk_9C, v3, 1); @@ -3911,10 +3905,10 @@ static BOOL sub_02041CF4 (ScriptContext * ctx) return 1; } -static BOOL sub_02041D3C (ScriptContext * ctx) +static BOOL sub_02041D3C(ScriptContext *ctx) { - void ** v0; - FieldSystem * fieldSystem = ctx->fieldSystem; + void **v0; + FieldSystem *fieldSystem = ctx->fieldSystem; v0 = sub_0203F098(ctx->fieldSystem, 19); @@ -3927,9 +3921,9 @@ static BOOL sub_02041D3C (ScriptContext * ctx) return 1; } -BOOL sub_02041D60 (ScriptContext * ctx) +BOOL sub_02041D60(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; if (sub_020509B4(fieldSystem)) { return 0; @@ -3938,21 +3932,21 @@ BOOL sub_02041D60 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0A1 (ScriptContext * ctx) +static BOOL ScrCmd_0A1(ScriptContext *ctx) { sub_02055868(ctx->fieldSystem->unk_10); return 1; } -static BOOL ScrCmd_1F8 (ScriptContext * ctx) +static BOOL ScrCmd_1F8(ScriptContext *ctx) { sub_02055820(ctx->fieldSystem->unk_10); return 1; } -static BOOL sub_02041D98 (FieldSystem * fieldSystem, int param1, int param2) +static BOOL sub_02041D98(FieldSystem *fieldSystem, int param1, int param2) { - UnkStruct_0202A750 * v0 = sub_0202A750(fieldSystem->saveData); + UnkStruct_0202A750 *v0 = sub_0202A750(fieldSystem->saveData); if (param1 == 0) { if (sub_02029D10(v0, param2) == 0) { @@ -3967,12 +3961,12 @@ static BOOL sub_02041D98 (FieldSystem * fieldSystem, int param1, int param2) return 1; } -static UnkStruct_02041DC8 * sub_02041DC8 (int param0, FieldSystem * fieldSystem, int param2, int param3) +static UnkStruct_02041DC8 *sub_02041DC8(int param0, FieldSystem *fieldSystem, int param2, int param3) { - UnkStruct_02041DC8 * v0; - UnkStruct_02029C68 * v1; - UnkStruct_02029C88 * v2; - UnkStruct_0202A750 * v3 = sub_0202A750(fieldSystem->saveData); + UnkStruct_02041DC8 *v0; + UnkStruct_02029C68 *v1; + UnkStruct_02029C88 *v2; + UnkStruct_0202A750 *v3 = sub_0202A750(fieldSystem->saveData); if (sub_02041D98(fieldSystem, param2, param3) == 0) { return NULL; @@ -3988,23 +3982,23 @@ static UnkStruct_02041DC8 * sub_02041DC8 (int param0, FieldSystem * fieldSystem, return v0; } -static BOOL ScrCmd_0A2 (ScriptContext * ctx) +static BOOL ScrCmd_0A2(ScriptContext *ctx) { ov5_021EAF50(ctx->fieldSystem); return 1; } -static BOOL ScrCmd_0A3 (ScriptContext * ctx) +static BOOL ScrCmd_0A3(ScriptContext *ctx) { sub_0207DDC0(ctx->taskManager); return 1; } -static BOOL ScrCmd_0A4 (ScriptContext * ctx) +static BOOL ScrCmd_0A4(ScriptContext *ctx) { - UnkStruct_ov98_02247168 * v0; - void ** v1 = sub_0203F098(ctx->fieldSystem, 19); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + UnkStruct_ov98_02247168 *v0; + void **v1 = sub_0203F098(ctx->fieldSystem, 19); + u16 *v2 = ScriptContext_GetVarPointer(ctx); v0 = (*v1); *v2 = v0->unk_04; @@ -4013,17 +4007,17 @@ static BOOL ScrCmd_0A4 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_207 (ScriptContext * ctx) +static BOOL ScrCmd_207(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = CommSys_CurNetId(); return 1; } -static BOOL ScrCmd_208 (ScriptContext * ctx) +static BOOL ScrCmd_208(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 20); + void **v0 = sub_0203F098(ctx->fieldSystem, 20); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -4034,10 +4028,10 @@ static BOOL ScrCmd_208 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_28C (ScriptContext * ctx) +static BOOL ScrCmd_28C(ScriptContext *ctx) { - Pokemon * v0; - void ** v1 = sub_0203F098(ctx->fieldSystem, 20); + Pokemon *v0; + void **v1 = sub_0203F098(ctx->fieldSystem, 20); u16 v2 = ScriptContext_GetVar(ctx); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(ctx->fieldSystem->saveData), v2); @@ -4049,10 +4043,10 @@ static BOOL ScrCmd_28C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_209 (ScriptContext * ctx) +static BOOL ScrCmd_209(ScriptContext *ctx) { - u8 * v0; - void ** v1 = sub_0203F098(ctx->fieldSystem, 20); + u8 *v0; + void **v1 = sub_0203F098(ctx->fieldSystem, 20); v0 = *v1; *v0 = 1; @@ -4060,10 +4054,10 @@ static BOOL ScrCmd_209 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_28D (ScriptContext * ctx) +static BOOL ScrCmd_28D(ScriptContext *ctx) { - u8 * v0; - void ** v1 = sub_0203F098(ctx->fieldSystem, 20); + u8 *v0; + void **v1 = sub_0203F098(ctx->fieldSystem, 20); v0 = *v1; *v0 = 2; @@ -4071,9 +4065,9 @@ static BOOL ScrCmd_28D (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_28E (ScriptContext * ctx) +static BOOL ScrCmd_28E(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_ReadHalfWord(ctx); ctx->data[0] = v1; @@ -4082,11 +4076,11 @@ static BOOL ScrCmd_28E (ScriptContext * ctx) return 1; } -static BOOL sub_02041FF8 (ScriptContext * ctx) +static BOOL sub_02041FF8(ScriptContext *ctx) { - u8 * v0; - void ** v1 = sub_0203F098(ctx->fieldSystem, 20); - u16 * v2 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); + u8 *v0; + void **v1 = sub_0203F098(ctx->fieldSystem, 20); + u16 *v2 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); v0 = *v1; @@ -4097,18 +4091,18 @@ static BOOL sub_02041FF8 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_20A (ScriptContext * ctx) +static BOOL ScrCmd_20A(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); - StringTemplate ** v1 = sub_0203F098(ctx->fieldSystem, 15); + StringTemplate **v1 = sub_0203F098(ctx->fieldSystem, 15); VsSeeker_Start(ctx->taskManager, *v1, FieldSystem_GetVarPointer(ctx->fieldSystem, v0)); return 1; } -static BOOL ScrCmd_20B (ScriptContext * ctx) +static BOOL ScrCmd_20B(ScriptContext *ctx) { - MapObject ** v0 = sub_0203F098(ctx->fieldSystem, 10); + MapObject **v0 = sub_0203F098(ctx->fieldSystem, 10); if (*v0 != NULL) { if ((sub_02071CB4(ctx->fieldSystem, 2) == 0) || (ov8_0224C5DC(ctx->fieldSystem, *v0) == 0)) { @@ -4119,35 +4113,35 @@ static BOOL ScrCmd_20B (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_0A5 (ScriptContext * ctx) +static BOOL ScrCmd_0A5(ScriptContext *ctx) { sub_0209ACF4(ctx->taskManager); return 1; } -static BOOL ScrCmd_30E (ScriptContext * ctx) +static BOOL ScrCmd_30E(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); sub_0209B344(ctx->taskManager, v0); return 1; } -static BOOL ScrCmd_0A6 (ScriptContext * ctx) +static BOOL ScrCmd_0A6(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); u16 v2 = ScriptContext_GetVar(ctx); sub_0203DAC0(ctx->fieldSystem->unk_10, v1, ctx->fieldSystem->saveData, v0, v2); return 1; } -static BOOL ScrCmd_0A7 (ScriptContext * ctx) +static BOOL ScrCmd_0A7(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); int v1 = ScriptContext_ReadHalfWord(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); *v0 = sub_02041DC8(11, ctx->fieldSystem, 0, v1); @@ -4165,11 +4159,11 @@ static BOOL ScrCmd_0A7 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0A8 (ScriptContext * ctx) +static BOOL ScrCmd_0A8(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); int v1 = ScriptContext_ReadHalfWord(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); *v0 = sub_02041DC8(11, ctx->fieldSystem, 1, v1); @@ -4187,11 +4181,11 @@ static BOOL ScrCmd_0A8 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_12E (ScriptContext * ctx) +static BOOL ScrCmd_12E(ScriptContext *ctx) { BOOL v0; int v1 = ScriptContext_ReadHalfWord(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); v0 = sub_02041D98(ctx->fieldSystem, 0, v1); @@ -4204,11 +4198,11 @@ static BOOL ScrCmd_12E (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_12F (ScriptContext * ctx) +static BOOL ScrCmd_12F(ScriptContext *ctx) { BOOL v0; int v1 = ScriptContext_ReadHalfWord(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); v0 = sub_02041D98(ctx->fieldSystem, 1, v1); @@ -4221,18 +4215,18 @@ static BOOL ScrCmd_12F (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_130 (ScriptContext * ctx) +static BOOL ScrCmd_130(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - UnkStruct_0202A750 * v1 = sub_0202A750(ctx->fieldSystem->saveData); - UnkStruct_02029C68 * v2 = sub_02029CA8(v1, 0); + UnkStruct_0202A750 *v1 = sub_0202A750(ctx->fieldSystem->saveData); + UnkStruct_02029C68 *v2 = sub_02029CA8(v1, 0); sub_0202A0A0(v2, v0); return 1; } -static BOOL ScrCmd_205 (ScriptContext * ctx) +static BOOL ScrCmd_205(ScriptContext *ctx) { sub_0203E224(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041D60); @@ -4240,7 +4234,7 @@ static BOOL ScrCmd_205 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_310 (ScriptContext * ctx) +static BOOL ScrCmd_310(ScriptContext *ctx) { sub_0203E704(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041D60); @@ -4248,16 +4242,16 @@ static BOOL ScrCmd_310 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0A9 (ScriptContext * ctx) +static BOOL ScrCmd_0A9(ScriptContext *ctx) { sub_020980DC(ctx->taskManager, ctx->fieldSystem->saveData); return 1; } -static BOOL ScrCmd_0AA (ScriptContext * ctx) +static BOOL ScrCmd_0AA(ScriptContext *ctx) { - UnkStruct_0203D8AC * v0; - void ** v1 = sub_0203F098(ctx->fieldSystem, 19); + UnkStruct_0203D8AC *v0; + void **v1 = sub_0203F098(ctx->fieldSystem, 19); *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203D8AC)); @@ -4268,11 +4262,11 @@ static BOOL ScrCmd_0AA (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_1D7 (ScriptContext * ctx) +static BOOL ScrCmd_1D7(ScriptContext *ctx) { u8 v0; - UnkStruct_0203D8AC * v1; - void ** v2 = sub_0203F098(ctx->fieldSystem, 19); + UnkStruct_0203D8AC *v1; + void **v2 = sub_0203F098(ctx->fieldSystem, 19); v0 = ScriptContext_ReadHalfWord(ctx); *v2 = sub_02099674(ctx->fieldSystem, v0, 11); @@ -4281,9 +4275,9 @@ static BOOL ScrCmd_1D7 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_1D8 (ScriptContext * ctx) +static BOOL ScrCmd_1D8(ScriptContext *ctx) { - u16 * v0 = FieldSystem_GetVarPointer(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx)); + u16 *v0 = FieldSystem_GetVarPointer(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx)); if (!Bag_HasItemsInPocket(SaveData_GetBag(ctx->fieldSystem->saveData), 4)) { *v0 = 1; @@ -4299,12 +4293,12 @@ static BOOL ScrCmd_1D8 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1D9 (ScriptContext * ctx) +static BOOL ScrCmd_1D9(ScriptContext *ctx) { - UnkStruct_ov90_021D0D80 * v0; + UnkStruct_ov90_021D0D80 *v0; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); - void ** v3 = sub_0203F098(ctx->fieldSystem, 19); + void **v3 = sub_0203F098(ctx->fieldSystem, 19); *v3 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov90_021D0D80)); @@ -4321,10 +4315,10 @@ static BOOL ScrCmd_1D9 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0AB (ScriptContext * ctx) +static BOOL ScrCmd_0AB(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); - UnkStruct_02042434 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02042434)); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); + UnkStruct_02042434 *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02042434)); v1->unk_00 = ctx->fieldSystem->saveData; v1->unk_04 = ScriptContext_ReadByte(ctx); @@ -4336,9 +4330,9 @@ static BOOL ScrCmd_0AB (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0AC (ScriptContext * ctx) +static BOOL ScrCmd_0AC(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_0203DDFC(fieldSystem); ScriptContext_Pause(ctx, sub_02041D60); @@ -4346,21 +4340,21 @@ static BOOL ScrCmd_0AC (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0AD (ScriptContext * ctx) +static BOOL ScrCmd_0AD(ScriptContext *ctx) { sub_02072204(ctx->fieldSystem); return 1; } -static BOOL ScrCmd_0AE (ScriptContext * ctx) +static BOOL ScrCmd_0AE(ScriptContext *ctx) { sub_0203DDDC(ctx->fieldSystem->unk_10); return 1; } -static BOOL ScrCmd_0AF (ScriptContext * ctx) +static BOOL ScrCmd_0AF(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); *v0 = sub_0203DE34(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041CC8); @@ -4368,15 +4362,15 @@ static BOOL ScrCmd_0AF (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0B0 (ScriptContext * ctx) +static BOOL ScrCmd_0B0(ScriptContext *ctx) { sub_02052E58(ctx->fieldSystem->unk_10); return 1; } -static BOOL ScrCmd_0B1 (ScriptContext * ctx) +static BOOL ScrCmd_0B1(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); *v0 = sub_0203E244(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041CC8); @@ -4384,11 +4378,11 @@ static BOOL ScrCmd_0B1 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_336 (ScriptContext * ctx) +static BOOL ScrCmd_336(ScriptContext *ctx) { - u16 * v0; + u16 *v0; int v1; - HallOfFame * v2; + HallOfFame *v2; v2 = SaveData_HallOfFame(ctx->fieldSystem->saveData, 4, &v1); v0 = ScriptContext_GetVarPointer(ctx); @@ -4402,10 +4396,10 @@ static BOOL ScrCmd_336 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_0B2 (ScriptContext * ctx) +static BOOL ScrCmd_0B2(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); if (sub_02039074(ctx->fieldSystem->saveData)) { *v1 = 1; @@ -4418,7 +4412,7 @@ static BOOL ScrCmd_0B2 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0B3 (ScriptContext * ctx) +static BOOL ScrCmd_0B3(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -4426,10 +4420,10 @@ static BOOL ScrCmd_0B3 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0B4 (ScriptContext * ctx) +static BOOL ScrCmd_0B4(ScriptContext *ctx) { - ChooseStarterData * v0; - void ** v1 = sub_0203F098(ctx->fieldSystem, 20); + ChooseStarterData *v0; + void **v1 = sub_0203F098(ctx->fieldSystem, 20); *v1 = Heap_AllocFromHeap(11, sizeof(ChooseStarterData)); v0 = *v1; @@ -4442,10 +4436,10 @@ static BOOL ScrCmd_0B4 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0B5 (ScriptContext * ctx) +static BOOL ScrCmd_0B5(ScriptContext *ctx) { - ChooseStarterData * v0; - void ** v1 = sub_0203F098(ctx->fieldSystem, 20); + ChooseStarterData *v0; + void **v1 = sub_0203F098(ctx->fieldSystem, 20); v0 = (*v1); @@ -4456,9 +4450,9 @@ static BOOL ScrCmd_0B5 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_178 (ScriptContext * ctx) +static BOOL ScrCmd_178(ScriptContext *ctx) { - void ** v0; + void **v0; u8 v1; if (ScriptContext_ReadByte(ctx) == 0) { @@ -4476,10 +4470,10 @@ static BOOL ScrCmd_178 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_179 (ScriptContext * ctx) +static BOOL ScrCmd_179(ScriptContext *ctx) { - u16 * v0; - void ** v1; + u16 *v0; + void **v1; v0 = ScriptContext_GetVarPointer(ctx); v1 = sub_0203F098(ctx->fieldSystem, 19); @@ -4493,19 +4487,19 @@ static BOOL ScrCmd_179 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_0BA (ScriptContext * ctx) +static BOOL ScrCmd_0BA(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_0203DFE8(ctx->taskManager, 0, 0, 7, 0, NULL, ScriptContext_GetVarPointer(ctx)); return 1; } -static BOOL ScrCmd_0BB (ScriptContext * ctx) +static BOOL ScrCmd_0BB(ScriptContext *ctx) { u16 v0[10 * 2]; - Pokemon * v1; - FieldSystem * fieldSystem = ctx->fieldSystem; + Pokemon *v1; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v3 = ScriptContext_GetVar(ctx); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), v3); @@ -4516,15 +4510,15 @@ static BOOL ScrCmd_0BB (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_271 (ScriptContext * ctx) +static BOOL ScrCmd_271(ScriptContext *ctx) { sub_0203DFE8(ctx->taskManager, 6, 0, 10, 0, NULL, ScriptContext_GetVarPointer(ctx)); return 1; } -static BOOL ScrCmd_2C6 (ScriptContext * ctx) +static BOOL ScrCmd_2C6(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); *v0 = sub_0209C1EC(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041D3C); @@ -4532,9 +4526,9 @@ static BOOL ScrCmd_2C6 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_2C7 (ScriptContext * ctx) +static BOOL ScrCmd_2C7(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); u8 v1; v1 = sub_0205BE38(); @@ -4548,11 +4542,11 @@ static BOOL ScrCmd_2C7 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_243 (ScriptContext * ctx) +static BOOL ScrCmd_243(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); *v2 = 0xffff; sub_0203D80C(ctx->fieldSystem->unk_10, v1, v2, NULL); @@ -4560,12 +4554,12 @@ static BOOL ScrCmd_243 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_244 (ScriptContext * ctx) +static BOOL ScrCmd_244(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); - u16 * v3 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); + u16 *v3 = ScriptContext_GetVarPointer(ctx); *v2 = 0xffff; *v3 = 0xffff; @@ -4574,9 +4568,9 @@ static BOOL ScrCmd_244 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_245 (ScriptContext * ctx) +static BOOL ScrCmd_245(ScriptContext *ctx) { - StringTemplate ** v0 = sub_0203F098(ctx->fieldSystem, 15); + StringTemplate **v0 = sub_0203F098(ctx->fieldSystem, 15); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -4585,7 +4579,7 @@ static BOOL ScrCmd_245 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_FadeScreen (ScriptContext * ctx) +static BOOL ScrCmd_FadeScreen(ScriptContext *ctx) { u16 transition = ScriptContext_ReadHalfWord(ctx); u16 frames = ScriptContext_ReadHalfWord(ctx); @@ -4599,22 +4593,22 @@ static BOOL ScrCmd_FadeScreen (ScriptContext * ctx) return FALSE; } -static BOOL ScrCmd_WaitFadeScreen (ScriptContext * ctx) +static BOOL ScrCmd_WaitFadeScreen(ScriptContext *ctx) { ScriptContext_Pause(ctx, ScriptContext_ScreenWipeDone); return TRUE; } -static BOOL ScriptContext_ScreenWipeDone (ScriptContext * ctx) +static BOOL ScriptContext_ScreenWipeDone(ScriptContext *ctx) { return ScreenWipe_Done() == TRUE; } -static BOOL ScrCmd_0BE (ScriptContext * ctx) +static BOOL ScrCmd_0BE(ScriptContext *ctx) { u16 v0, v1, v2, v3; s16 v4; - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; v0 = ScriptContext_GetVar(ctx); v4 = ScriptContext_ReadHalfWord(ctx); @@ -4627,11 +4621,11 @@ static BOOL ScrCmd_0BE (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_203 (ScriptContext * ctx) +static BOOL ScrCmd_203(ScriptContext *ctx) { u16 v0, v1, v2, v3; s16 v4; - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; v0 = ScriptContext_ReadHalfWord(ctx); v4 = ScriptContext_ReadHalfWord(ctx); @@ -4645,37 +4639,37 @@ static BOOL ScrCmd_203 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_204 (ScriptContext * ctx) +static BOOL ScrCmd_204(ScriptContext *ctx) { sub_02054864(ctx->fieldSystem->unk_10); return 1; } -static BOOL ScrCmd_200 (ScriptContext * ctx) +static BOOL ScrCmd_200(ScriptContext *ctx) { - FieldOverworldState * v0 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); - Location * location = FieldOverworldState_GetPrevLocation(v0); - u16 * mapId = ScriptContext_GetVarPointer(ctx); + FieldOverworldState *v0 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); + Location *location = FieldOverworldState_GetPrevLocation(v0); + u16 *mapId = ScriptContext_GetVarPointer(ctx); *mapId = location->mapId; return 0; } -static BOOL ScrCmd_201 (ScriptContext * ctx) +static BOOL ScrCmd_201(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = ctx->fieldSystem->location->mapId; return 0; } -static BOOL ScrCmd_0BF (ScriptContext * ctx) +static BOOL ScrCmd_0BF(ScriptContext *ctx) { ov5_021E0734(ctx->taskManager, PlayerAvatar_GetDir(ctx->fieldSystem->playerAvatar), ScriptContext_GetVar(ctx)); return 1; } -static BOOL ScrCmd_0C0 (ScriptContext * ctx) +static BOOL ScrCmd_0C0(ScriptContext *ctx) { RadarChain_Clear(ctx->fieldSystem->chain); @@ -4694,13 +4688,13 @@ static BOOL ScrCmd_0C0 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0C1 (ScriptContext * ctx) +static BOOL ScrCmd_0C1(ScriptContext *ctx) { ov5_021E0998(ctx->taskManager, PlayerAvatar_GetDir(ctx->fieldSystem->playerAvatar), ScriptContext_GetVar(ctx)); return 1; } -static BOOL ScrCmd_0C2 (ScriptContext * ctx) +static BOOL ScrCmd_0C2(ScriptContext *ctx) { u16 v0, v1, v2; @@ -4712,9 +4706,9 @@ static BOOL ScrCmd_0C2 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0C3 (ScriptContext * ctx) +static BOOL ScrCmd_0C3(ScriptContext *ctx) { - FieldOverworldState * v0 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); + FieldOverworldState *v0 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); FieldOverworldState_SetWeather(v0, OVERWORLD_WEATHER_CLEAR); ov5_021D5F7C(ctx->fieldSystem->unk_04->unk_0C, FieldOverworldState_GetWeather(v0)); @@ -4722,9 +4716,9 @@ static BOOL ScrCmd_0C3 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0C4 (ScriptContext * ctx) +static BOOL ScrCmd_0C4(ScriptContext *ctx) { - FieldOverworldState * v0 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); + FieldOverworldState *v0 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); FieldOverworldState_SetWeather(v0, OVERWORLD_WEATHER_CLEAR); ov5_021D5F7C(ctx->fieldSystem->unk_04->unk_0C, FieldOverworldState_GetWeather(v0)); @@ -4732,10 +4726,10 @@ static BOOL ScrCmd_0C4 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0C5 (ScriptContext * ctx) +static BOOL ScrCmd_0C5(ScriptContext *ctx) { - Pokemon * v0; - void ** v1 = sub_0203F098(ctx->fieldSystem, 20); + Pokemon *v0; + void **v1 = sub_0203F098(ctx->fieldSystem, 20); u16 v2 = ScriptContext_GetVar(ctx); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(ctx->fieldSystem->saveData), v2); @@ -4745,9 +4739,9 @@ static BOOL ScrCmd_0C5 (ScriptContext * ctx) return 1; } -static BOOL sub_02042C80 (ScriptContext * ctx) +static BOOL sub_02042C80(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 20); + void **v0 = sub_0203F098(ctx->fieldSystem, 20); if (ov6_02243FBC(*v0) == 1) { ov6_02243FC8(*v0); @@ -4757,15 +4751,15 @@ static BOOL sub_02042C80 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_0C6 (ScriptContext * ctx) +static BOOL ScrCmd_0C6(ScriptContext *ctx) { ov5_021E0DD4(ctx->taskManager); return 1; } -static BOOL ScrCmd_0C7 (ScriptContext * ctx) +static BOOL ScrCmd_0C7(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); if (PlayerAvatar_GetPlayerState(ctx->fieldSystem->playerAvatar) == 0x1) { *v0 = 1; @@ -4776,7 +4770,7 @@ static BOOL ScrCmd_0C7 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_0C8 (ScriptContext * ctx) +static BOOL ScrCmd_0C8(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); @@ -4795,27 +4789,27 @@ static BOOL ScrCmd_0C8 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2BF (ScriptContext * ctx) +static BOOL ScrCmd_2BF(ScriptContext *ctx) { sub_020553F0(ctx->fieldSystem, 1189); return 0; } -static BOOL ScrCmd_0C9 (ScriptContext * ctx) +static BOOL ScrCmd_0C9(ScriptContext *ctx) { sub_0205EFC4(ctx->fieldSystem->playerAvatar, ScriptContext_ReadByte(ctx)); return 0; } -static BOOL ScrCmd_0CA (ScriptContext * ctx) +static BOOL ScrCmd_0CA(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = PlayerAvatar_GetPlayerState(ctx->fieldSystem->playerAvatar); return 0; } -static BOOL ScrCmd_0CB (ScriptContext * ctx) +static BOOL ScrCmd_0CB(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -4823,37 +4817,37 @@ static BOOL ScrCmd_0CB (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0CC (ScriptContext * ctx) +static BOOL ScrCmd_0CC(ScriptContext *ctx) { PlayerAvatar_RequestChangeState(ctx->fieldSystem->playerAvatar); return 0; } -static BOOL ScrCmd_0E3 (ScriptContext * ctx) +static BOOL ScrCmd_0E3(ScriptContext *ctx) { - UnkStruct_0202D7B0 * v0 = sub_0202D834(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + UnkStruct_0202D7B0 *v0 = sub_0202D834(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); ov6_0224322C(sub_0202D814(v0, 2), v1, v2); return 0; } -static BOOL ScrCmd_0DE (ScriptContext * ctx) +static BOOL ScrCmd_0DE(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = sub_0206B054(SaveData_GetVarsFlags(ctx->fieldSystem->saveData)); return 0; } -static BOOL ScrCmd_0E6 (ScriptContext * ctx) +static BOOL ScrCmd_0E6(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = sub_0203F098(fieldSystem, 8); - Strbuf ** v2 = sub_0203F098(fieldSystem, 16); - u8 * v3 = sub_0203F098(fieldSystem, 6); - u8 * v4 = sub_0203F098(fieldSystem, 3); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = sub_0203F098(fieldSystem, 8); + Strbuf **v2 = sub_0203F098(fieldSystem, 16); + u8 *v3 = sub_0203F098(fieldSystem, 6); + u8 *v4 = sub_0203F098(fieldSystem, 3); u16 v5 = ScriptContext_GetVar(ctx); u16 v6 = ScriptContext_GetVar(ctx); @@ -4866,9 +4860,9 @@ static BOOL ScrCmd_0E6 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0F2 (ScriptContext * ctx) +static BOOL ScrCmd_0F2(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 commType = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -4881,11 +4875,11 @@ static BOOL ScrCmd_0F2 (ScriptContext * ctx) return 1; } -static BOOL sub_02042F74 (ScriptContext * ctx) +static BOOL sub_02042F74(ScriptContext *ctx) { u32 v0; - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v2 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v2 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); v0 = ov7_0224B460(); @@ -4897,9 +4891,9 @@ static BOOL sub_02042F74 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0F3 (ScriptContext * ctx) +static BOOL ScrCmd_0F3(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 commType = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -4912,11 +4906,11 @@ static BOOL ScrCmd_0F3 (ScriptContext * ctx) return 1; } -static BOOL sub_0204300C (ScriptContext * ctx) +static BOOL sub_0204300C(ScriptContext *ctx) { u32 v0; - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v2 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v2 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); v0 = CommClub_CheckWindowOpenClient(); @@ -4928,26 +4922,26 @@ static BOOL sub_0204300C (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0F4 (ScriptContext * ctx) +static BOOL ScrCmd_0F4(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_ReadHalfWord(ctx); return 1; } -static BOOL ScrCmd_0F5 (ScriptContext * ctx) +static BOOL ScrCmd_0F5(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_ReadHalfWord(ctx); return 1; } -static BOOL ScrCmd_0F6 (ScriptContext * ctx) +static BOOL ScrCmd_0F6(ScriptContext *ctx) { - PartyManagementData * v0; - void ** v1; + PartyManagementData *v0; + void **v1; v1 = sub_0203F098(ctx->fieldSystem, 19); v0 = *v1; @@ -4960,12 +4954,12 @@ static BOOL ScrCmd_0F6 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_0F7 (ScriptContext * ctx) +static BOOL ScrCmd_0F7(ScriptContext *ctx) { return 1; } -static BOOL ScrCmd_11B (ScriptContext * ctx) +static BOOL ScrCmd_11B(ScriptContext *ctx) { Location location; @@ -4979,10 +4973,10 @@ static BOOL ScrCmd_11B (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_11C (ScriptContext * ctx) +static BOOL ScrCmd_11C(ScriptContext *ctx) { - Location * location; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + Location *location; + u16 *v1 = ScriptContext_GetVarPointer(ctx); location = sub_0203A730(SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData)); *v1 = ov5_021DCCC8(location->mapId); @@ -4990,68 +4984,68 @@ static BOOL ScrCmd_11C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_11D (ScriptContext * ctx) +static BOOL ScrCmd_11D(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = ctx->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(ctx); u8 v3 = ScriptContext_ReadByte(ctx); - u16 * v4 = ScriptContext_GetVarPointer(ctx); + u16 *v4 = ScriptContext_GetVarPointer(ctx); u16 v5 = ScriptContext_GetVar(ctx); ov5_021DCB24(fieldSystem, v2, v3, v4, *v1, v5); return 0; } -static BOOL ScrCmd_11E (ScriptContext * ctx) +static BOOL ScrCmd_11E(ScriptContext *ctx) { - const PokedexData * v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_02026EAC(v0); return 0; } -static BOOL ScrCmd_11F (ScriptContext * ctx) +static BOOL ScrCmd_11F(ScriptContext *ctx) { - const PokedexData * v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_02026E64(v0); return 0; } -static BOOL ScrCmd_120 (ScriptContext * ctx) +static BOOL ScrCmd_120(ScriptContext *ctx) { - const PokedexData * v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_02026E0C(v0); return 0; } -static BOOL ScrCmd_121 (ScriptContext * ctx) +static BOOL ScrCmd_121(ScriptContext *ctx) { - const PokedexData * v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_02026DD0(v0); return 0; } -static BOOL ScrCmd_122 (ScriptContext * ctx) +static BOOL ScrCmd_122(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; return 0; } -static BOOL ScrCmd_123 (ScriptContext * ctx) +static BOOL ScrCmd_123(ScriptContext *ctx) { - const PokedexData * v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); - const TrainerInfo * v1 = SaveData_GetTrainerInfo(ctx->fieldSystem->saveData); + const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + const TrainerInfo *v1 = SaveData_GetTrainerInfo(ctx->fieldSystem->saveData); u8 v2 = ScriptContext_ReadByte(ctx); - u16 * v3 = ScriptContext_GetVarPointer(ctx); + u16 *v3 = ScriptContext_GetVarPointer(ctx); u16 v4; if (v2 == 0) { @@ -5065,9 +5059,9 @@ static BOOL ScrCmd_123 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_124 (ScriptContext * ctx) +static BOOL ScrCmd_124(ScriptContext *ctx) { - BOOL * v0 = sub_0203F098(ctx->fieldSystem, 23); + BOOL *v0 = sub_0203F098(ctx->fieldSystem, 23); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5076,9 +5070,9 @@ static BOOL ScrCmd_124 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_2BD (ScriptContext * ctx) +static BOOL ScrCmd_2BD(ScriptContext *ctx) { - BOOL * v0 = sub_0203F098(ctx->fieldSystem, 23); + BOOL *v0 = sub_0203F098(ctx->fieldSystem, 23); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5087,9 +5081,9 @@ static BOOL ScrCmd_2BD (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_319 (ScriptContext * ctx) +static BOOL ScrCmd_319(ScriptContext *ctx) { - BOOL * v0 = sub_0203F098(ctx->fieldSystem, 23); + BOOL *v0 = sub_0203F098(ctx->fieldSystem, 23); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5097,9 +5091,9 @@ static BOOL ScrCmd_319 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_318 (ScriptContext * ctx) +static BOOL ScrCmd_318(ScriptContext *ctx) { - BOOL * v0 = sub_0203F098(ctx->fieldSystem, 23); + BOOL *v0 = sub_0203F098(ctx->fieldSystem, 23); u16 v1 = ScriptContext_GetVar(ctx); u8 v2 = (u8)ScriptContext_GetVar(ctx); @@ -5107,67 +5101,67 @@ static BOOL ScrCmd_318 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_125 (ScriptContext * ctx) +static BOOL ScrCmd_125(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - BOOL * v1 = sub_0203F098(fieldSystem, 23); + FieldSystem *fieldSystem = ctx->fieldSystem; + BOOL *v1 = sub_0203F098(fieldSystem, 23); u16 v2 = ScriptContext_GetVar(ctx); sub_02051480(ctx->taskManager, v2, 11, v1); return 1; } -static BOOL ScrCmd_126 (ScriptContext * ctx) +static BOOL ScrCmd_126(ScriptContext *ctx) { sub_02051590(ctx->taskManager); return 1; } -static BOOL ScrCmd_127 (ScriptContext * ctx) +static BOOL ScrCmd_127(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; ov5_021EFBDC(fieldSystem); return 0; } -static BOOL ScrCmd_128 (ScriptContext * ctx) +static BOOL ScrCmd_128(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = ov5_021EFB94(fieldSystem); return 0; } -static BOOL ScrCmd_129 (ScriptContext * ctx) +static BOOL ScrCmd_129(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - BOOL * v1 = sub_0203F098(fieldSystem, 23); + FieldSystem *fieldSystem = ctx->fieldSystem; + BOOL *v1 = sub_0203F098(fieldSystem, 23); sub_0205120C(ctx->taskManager, v1); return 1; } -static BOOL ScrCmd_12A (ScriptContext * ctx) +static BOOL ScrCmd_12A(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; ov5_021EFC90(fieldSystem); return 0; } -static BOOL ScrCmd_12B (ScriptContext * ctx) +static BOOL ScrCmd_12B(ScriptContext *ctx) { sub_0203E0D0(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041D60); return 1; } -static BOOL ScrCmd_12C (ScriptContext * ctx) +static BOOL ScrCmd_12C(ScriptContext *ctx) { - SaveData * v0 = ctx->fieldSystem->saveData; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + SaveData *v0 = ctx->fieldSystem->saveData; + u16 *v1 = ScriptContext_GetVarPointer(ctx); if (SaveData_OverwriteCheck(v0)) { *v1 = 0; @@ -5182,64 +5176,64 @@ static BOOL ScrCmd_12C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_12D (ScriptContext * ctx) +static BOOL ScrCmd_12D(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = ov5_021E200C(fieldSystem); return 0; } -static BOOL ScrCmd_2D6 (ScriptContext * ctx) +static BOOL ScrCmd_2D6(ScriptContext *ctx) { SaveDataExtra_Init(ctx->fieldSystem->saveData); return 0; } -static BOOL ScrCmd_2D7 (ScriptContext * ctx) +static BOOL ScrCmd_2D7(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = SaveData_MiscSaveBlock_InitFlag(ctx->fieldSystem->saveData); return 0; } -static BOOL ScrCmd_131 (ScriptContext * ctx) +static BOOL ScrCmd_131(ScriptContext *ctx) { ov5_021DDBC8(ctx->taskManager); return 1; } -static BOOL ScrCmd_132 (ScriptContext * ctx) +static BOOL ScrCmd_132(ScriptContext *ctx) { PoketchData *poketchData = SaveData_PoketchData(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = PoketchData_IsEnabled(poketchData); return 0; } -static BOOL ScrCmd_133 (ScriptContext * ctx) +static BOOL ScrCmd_133(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_GetVar(ctx); PoketchData_RegisterApp(SaveData_PoketchData(fieldSystem->saveData), v1); return 0; } -static BOOL ScrCmd_134 (ScriptContext * ctx) +static BOOL ScrCmd_134(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_GetVar(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); *v2 = PoketchData_IsAppRegistered(SaveData_PoketchData(fieldSystem->saveData), v1); return 0; } -static BOOL ScrCmd_135 (ScriptContext * ctx) +static BOOL ScrCmd_135(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); @@ -5251,7 +5245,7 @@ static BOOL ScrCmd_135 (ScriptContext * ctx) return 1; } -static BOOL sub_02043678 (ScriptContext * ctx) +static BOOL sub_02043678(ScriptContext *ctx) { int v0; @@ -5264,33 +5258,33 @@ static BOOL sub_02043678 (ScriptContext * ctx) return v0; } -static BOOL ScrCmd_136 (ScriptContext * ctx) +static BOOL ScrCmd_136(ScriptContext *ctx) { sub_020365F4(); return 0; } -static BOOL ScrCmd_137 (ScriptContext * ctx) +static BOOL ScrCmd_137(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); + u16 *v2 = ScriptContext_GetVarPointer(ctx); *v2 = sub_0205BC50(*v1); return 0; } -static BOOL ScrCmd_138 (ScriptContext * ctx) +static BOOL ScrCmd_138(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); - FieldSystem * fieldSystem = ctx->fieldSystem; - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + u16 *v0 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); *v0 = sub_0205BF44(ctx->fieldSystem->unk_7C, *v2); return 0; } -static BOOL ScrCmd_139 (ScriptContext * ctx) +static BOOL ScrCmd_139(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -5307,13 +5301,13 @@ static BOOL ScrCmd_139 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_13C (ScriptContext * ctx) +static BOOL ScrCmd_13C(ScriptContext *ctx) { - MapObject ** v0 = sub_0203F098(ctx->fieldSystem, 10); - StringTemplate ** v1 = sub_0203F098(ctx->fieldSystem, 15); + MapObject **v0 = sub_0203F098(ctx->fieldSystem, 10); + StringTemplate **v1 = sub_0203F098(ctx->fieldSystem, 15); u16 v2 = ScriptContext_ReadHalfWord(ctx); - TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); - UnkStruct_02014EC4 * v4 = sub_02014EC4(FieldSystem_SaveData(ctx->fieldSystem)); + TrainerInfo *v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); + UnkStruct_02014EC4 *v4 = sub_02014EC4(FieldSystem_SaveData(ctx->fieldSystem)); u16 v5; if (v2 == 0) { @@ -5326,15 +5320,15 @@ static BOOL ScrCmd_13C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_13D (ScriptContext * ctx) +static BOOL ScrCmd_13D(ScriptContext *ctx) { CommFieldCmd_Init(ctx->fieldSystem); return 0; } -static BOOL ScrCmd_13E (ScriptContext * ctx) +static BOOL ScrCmd_13E(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_0205C2B0(fieldSystem->unk_80); sub_02036AC4(); @@ -5343,27 +5337,27 @@ static BOOL ScrCmd_13E (ScriptContext * ctx) return 1; } -static BOOL sub_020437E8 (ScriptContext * ctx) +static BOOL sub_020437E8(ScriptContext *ctx) { return CommSys_ConnectedCount() < 2; } -static BOOL ScrCmd_13F (ScriptContext * ctx) +static BOOL ScrCmd_13F(ScriptContext *ctx) { - MapObject ** v0 = sub_0203F098(ctx->fieldSystem, 10); + MapObject **v0 = sub_0203F098(ctx->fieldSystem, 10); u16 v1 = ScriptContext_ReadHalfWord(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); - StringTemplate ** v3 = sub_0203F098(ctx->fieldSystem, 15); + u16 *v2 = ScriptContext_GetVarPointer(ctx); + StringTemplate **v3 = sub_0203F098(ctx->fieldSystem, 15); *v2 = sub_0205BCF4(ctx->fieldSystem->unk_7C, MapObject_Id(*v0), v1, *v3); return 0; } -static BOOL ScrCmd_2BA (ScriptContext * ctx) +static BOOL ScrCmd_2BA(ScriptContext *ctx) { - PartyManagementData * v0; - void ** v1; - u16 * v2 = ScriptContext_GetVarPointer(ctx); + PartyManagementData *v0; + void **v1; + u16 *v2 = ScriptContext_GetVarPointer(ctx); *v2 = sub_0205BA7C(ctx->fieldSystem->unk_7C); @@ -5376,28 +5370,28 @@ static BOOL ScrCmd_2BA (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_140 (ScriptContext * ctx) +static BOOL ScrCmd_140(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - MapObject ** v1 = sub_0203F098(fieldSystem, 10); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + MapObject **v1 = sub_0203F098(fieldSystem, 10); + u16 *v2 = ScriptContext_GetVarPointer(ctx); *v2 = sub_0205B780(fieldSystem->unk_7C, MapObject_Id(*v1)); return 0; } -static BOOL ScrCmd_146 (ScriptContext * ctx) +static BOOL ScrCmd_146(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - MapObject ** v1 = sub_0203F098(fieldSystem, 10); + FieldSystem *fieldSystem = ctx->fieldSystem; + MapObject **v1 = sub_0203F098(fieldSystem, 10); u16 v2 = ScriptContext_GetVar(ctx); - u16 * v3 = ScriptContext_GetVarPointer(ctx); + u16 *v3 = ScriptContext_GetVarPointer(ctx); *v3 = sub_0205B804(fieldSystem->unk_7C, MapObject_Id(*v1), v2); return 0; } -static BOOL ScrCmd_141 (ScriptContext * ctx) +static BOOL ScrCmd_141(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -5407,11 +5401,11 @@ static BOOL ScrCmd_141 (ScriptContext * ctx) return 1; } -static BOOL sub_02043938 (ScriptContext * ctx) +static BOOL sub_02043938(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u32 v1 = sub_0205B8D8(fieldSystem->unk_7C); - u16 * v2 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); + u16 *v2 = FieldSystem_GetVarPointer(fieldSystem, ctx->data[0]); if (v1 == 0) { return 0; @@ -5421,23 +5415,23 @@ static BOOL sub_02043938 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_142 (ScriptContext * ctx) +static BOOL ScrCmd_142(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_0205C22C * v1 = fieldSystem->unk_80; + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_0205C22C *v1 = fieldSystem->unk_80; sub_0205C820(fieldSystem->mapObjMan, v1); return 0; } -static BOOL ScrCmd_13A (ScriptContext * ctx) +static BOOL ScrCmd_13A(ScriptContext *ctx) { sub_0205BEA8(4); sub_02036BA0(); return 0; } -static BOOL ScrCmd_13B (ScriptContext * ctx) +static BOOL ScrCmd_13B(ScriptContext *ctx) { sub_02036BD8(); sub_02036AC4(); @@ -5445,9 +5439,9 @@ static BOOL ScrCmd_13B (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_143 (ScriptContext * ctx) +static BOOL ScrCmd_143(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -5455,7 +5449,7 @@ static BOOL ScrCmd_143 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_144 (ScriptContext * ctx) +static BOOL ScrCmd_144(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -5465,9 +5459,9 @@ static BOOL ScrCmd_144 (ScriptContext * ctx) return 1; } -static BOOL sub_020439F4 (ScriptContext * ctx) +static BOOL sub_020439F4(ScriptContext *ctx) { - u16 * v0 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); + u16 *v0 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); u32 v1 = sub_0205B8DC(ctx->fieldSystem->unk_7C); if (v1 >= 1) { @@ -5481,7 +5475,7 @@ static BOOL sub_020439F4 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_145 (ScriptContext * ctx) +static BOOL ScrCmd_145(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -5491,9 +5485,9 @@ static BOOL ScrCmd_145 (ScriptContext * ctx) return 1; } -static BOOL sub_02043A4C (ScriptContext * ctx) +static BOOL sub_02043A4C(ScriptContext *ctx) { - u16 * v0 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); + u16 *v0 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); u32 v1 = sub_0205B91C(ctx->fieldSystem->unk_7C); if (gCoreSys.pressedKeys & PAD_BUTTON_B) { @@ -5514,26 +5508,26 @@ static BOOL sub_02043A4C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_153 (ScriptContext * ctx) +static BOOL ScrCmd_153(ScriptContext *ctx) { sub_02054708(ctx->fieldSystem->unk_10); return 1; } -static BOOL ScrCmd_154 (ScriptContext * ctx) +static BOOL ScrCmd_154(ScriptContext *ctx) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); - StringTemplate ** v1 = sub_0203F098(ctx->fieldSystem, 15); + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); + StringTemplate **v1 = sub_0203F098(ctx->fieldSystem, 15); sub_0205C980(TrainerInfo_ID(v0), TrainerInfo_Gender(v0), *v1); return 0; } -static BOOL ScrCmd_155 (ScriptContext * ctx) +static BOOL ScrCmd_155(ScriptContext *ctx) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); u16 v1 = ScriptContext_GetVar(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); *v2 = sub_0205C9BC(TrainerInfo_ID(v0), TrainerInfo_Gender(v0), v1); *v2 = sub_0205CA14(TrainerInfo_Gender(v0), *v2, 2); @@ -5541,71 +5535,71 @@ static BOOL ScrCmd_155 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_29C (ScriptContext * ctx) +static BOOL ScrCmd_29C(ScriptContext *ctx) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); u16 v1 = ScriptContext_GetVar(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); *v2 = sub_0205C9BC(TrainerInfo_ID(v0), TrainerInfo_Gender(v0), v1); return 0; } -static BOOL ScrCmd_156 (ScriptContext * ctx) +static BOOL ScrCmd_156(ScriptContext *ctx) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); u16 v1 = ScriptContext_GetVar(ctx); TrainerInfo_SetAppearance(v0, v1); return 0; } -static BOOL ScrCmd_14B (ScriptContext * ctx) +static BOOL ScrCmd_14B(ScriptContext *ctx) { sub_02052C5C(ctx->taskManager); return 1; } -static BOOL ScrCmd_14C (ScriptContext * ctx) +static BOOL ScrCmd_14C(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; FieldOverworldState_SetWarpId(SaveData_GetFieldOverworldState(fieldSystem->saveData), v0); return 0; } -static BOOL ScrCmd_14D (ScriptContext * ctx) +static BOOL ScrCmd_14D(ScriptContext *ctx) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = TrainerInfo_Gender(v0); return 0; } -static BOOL ScrCmd_14E (ScriptContext * ctx) +static BOOL ScrCmd_14E(ScriptContext *ctx) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(ctx->taskManager); + FieldSystem *fieldSystem = TaskManager_FieldSystem(ctx->taskManager); HealAllPokemonInParty(Party_GetFromSavedata(fieldSystem->saveData)); return 0; } -static BOOL ScrCmd_14F (ScriptContext * ctx) +static BOOL ScrCmd_14F(ScriptContext *ctx) { return 0; } -static BOOL ScrCmd_150 (ScriptContext * ctx) +static BOOL ScrCmd_150(ScriptContext *ctx) { FieldCommMan_EndBattle(); ScriptContext_Pause(ctx, sub_02043C70); return 1; } -static BOOL sub_02043C70 (ScriptContext * ctx) +static BOOL sub_02043C70(ScriptContext *ctx) { if (CommMan_IsInitialized() != 1) { if (CommServerClient_IsInitialized() != 1) { @@ -5616,35 +5610,35 @@ static BOOL sub_02043C70 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2BB (ScriptContext * ctx) +static BOOL ScrCmd_2BB(ScriptContext *ctx) { sub_020598A0(); ScriptContext_Pause(ctx, sub_02043C70); return 1; } -static BOOL ScrCmd_151 (ScriptContext * ctx) +static BOOL ScrCmd_151(ScriptContext *ctx) { FieldCommMan_EnterBattleRoom(ctx->fieldSystem); return 0; } -static BOOL ScrCmd_152 (ScriptContext * ctx) +static BOOL ScrCmd_152(ScriptContext *ctx) { CommPlayer_SetDir(ScriptContext_ReadHalfWord(ctx)); return 0; } -static BOOL ScrCmd_17A (ScriptContext * ctx) +static BOOL ScrCmd_17A(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = Bag_HasItemsInPocket(SaveData_GetBag(ctx->fieldSystem->saveData), v0); return 0; } -static BOOL ScrCmd_186 (ScriptContext * ctx) +static BOOL ScrCmd_186(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); @@ -5654,9 +5648,9 @@ static BOOL ScrCmd_186 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_187 (ScriptContext * ctx) +static BOOL ScrCmd_187(ScriptContext *ctx) { - MapObject * v0; + MapObject *v0; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -5671,7 +5665,7 @@ static BOOL ScrCmd_187 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_188 (ScriptContext * ctx) +static BOOL ScrCmd_188(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); @@ -5680,7 +5674,7 @@ static BOOL ScrCmd_188 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_189 (ScriptContext * ctx) +static BOOL ScrCmd_189(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); @@ -5689,7 +5683,7 @@ static BOOL ScrCmd_189 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_18A (ScriptContext * ctx) +static BOOL ScrCmd_18A(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); @@ -5699,7 +5693,7 @@ static BOOL ScrCmd_18A (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_18B (ScriptContext * ctx) +static BOOL ScrCmd_18B(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); @@ -5709,9 +5703,9 @@ static BOOL ScrCmd_18B (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_18C (ScriptContext * ctx) +static BOOL ScrCmd_18C(ScriptContext *ctx) { - MapObject * v0; + MapObject *v0; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -5725,9 +5719,9 @@ static BOOL ScrCmd_18C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_18F (ScriptContext * ctx) +static BOOL ScrCmd_18F(ScriptContext *ctx) { - u16 ** v0 = sub_0203F098(ctx->fieldSystem, 12); + u16 **v0 = sub_0203F098(ctx->fieldSystem, 12); u16 v1 = ScriptContext_GetVar(ctx); if (*v0 != NULL) { @@ -5737,13 +5731,13 @@ static BOOL ScrCmd_18F (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_168 (ScriptContext * ctx) +static BOOL ScrCmd_168(ScriptContext *ctx) { u16 v0, v1; u16 v2, v3; int v4, v5; u8 v6; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; v0 = ScriptContext_ReadHalfWord(ctx); v1 = ScriptContext_ReadHalfWord(ctx); @@ -5759,10 +5753,10 @@ static BOOL ScrCmd_168 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_169 (ScriptContext * ctx) +static BOOL ScrCmd_169(ScriptContext *ctx) { u8 v0; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; v0 = ScriptContext_ReadByte(ctx); fieldSystem = ctx->fieldSystem; @@ -5771,10 +5765,10 @@ static BOOL ScrCmd_169 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_16A (ScriptContext * ctx) +static BOOL ScrCmd_16A(ScriptContext *ctx) { u8 v0; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; v0 = ScriptContext_ReadByte(ctx); fieldSystem = ctx->fieldSystem; @@ -5783,10 +5777,10 @@ static BOOL ScrCmd_16A (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_16B (ScriptContext * ctx) +static BOOL ScrCmd_16B(ScriptContext *ctx) { u8 v0; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; v0 = ScriptContext_ReadByte(ctx); fieldSystem = ctx->fieldSystem; @@ -5795,10 +5789,10 @@ static BOOL ScrCmd_16B (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_16C (ScriptContext * ctx) +static BOOL ScrCmd_16C(ScriptContext *ctx) { u8 v0; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; v0 = ScriptContext_ReadByte(ctx); fieldSystem = ctx->fieldSystem; @@ -5807,126 +5801,126 @@ static BOOL ScrCmd_16C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_16F (ScriptContext * ctx) +static BOOL ScrCmd_16F(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_02071B10(fieldSystem); return 0; } -static BOOL ScrCmd_170 (ScriptContext * ctx) +static BOOL ScrCmd_170(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; ov8_0224997C(fieldSystem); return 1; } -static BOOL ScrCmd_171 (ScriptContext * ctx) +static BOOL ScrCmd_171(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_02071C18(fieldSystem); return 0; } -static BOOL ScrCmd_172 (ScriptContext * ctx) +static BOOL ScrCmd_172(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; ov8_02249FB8(fieldSystem); return 1; } -static BOOL ScrCmd_173 (ScriptContext * ctx) +static BOOL ScrCmd_173(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_02071B30(fieldSystem); return 0; } -static BOOL ScrCmd_174 (ScriptContext * ctx) +static BOOL ScrCmd_174(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_02071BF8(fieldSystem); return 0; } -static BOOL ScrCmd_175 (ScriptContext * ctx) +static BOOL ScrCmd_175(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 v1 = ScriptContext_ReadByte(ctx); sub_02071B6C(fieldSystem, v1); return 0; } -static BOOL ScrCmd_176 (ScriptContext * ctx) +static BOOL ScrCmd_176(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u8 v1 = ScriptContext_ReadByte(ctx); ov8_0224AD34(fieldSystem, v1); return 1; } -static BOOL ScrCmd_2C9 (ScriptContext * ctx) +static BOOL ScrCmd_2C9(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_02071BD0(fieldSystem); return 0; } -static BOOL ScrCmd_2F0 (ScriptContext * ctx) +static BOOL ScrCmd_2F0(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_02071C34(fieldSystem); return 0; } -static BOOL ScrCmd_2F2 (ScriptContext * ctx) +static BOOL ScrCmd_2F2(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_02071C5C(fieldSystem); return 0; } -static BOOL ScrCmd_317 (ScriptContext * ctx) +static BOOL ScrCmd_317(ScriptContext *ctx) { - u16 * v0, * v1, * v2; - FieldSystem * fieldSystem = ctx->fieldSystem; + u16 *v0, *v1, *v2; + FieldSystem *fieldSystem = ctx->fieldSystem; v0 = ScriptContext_GetVarPointer(ctx); v2 = ScriptContext_GetVarPointer(ctx); v1 = ScriptContext_GetVarPointer(ctx); { - MapObject * v4 = Player_MapObject(fieldSystem->playerAvatar); + MapObject *v4 = Player_MapObject(fieldSystem->playerAvatar); *v0 = MapObject_GetXPos(v4); - *v2 = ((MapObject_GetYPos(v4) / 2)); + *v2 = (MapObject_GetYPos(v4) / 2); *v1 = MapObject_GetZPos(v4); } return 0; } -static BOOL ScrCmd_1AC (ScriptContext * ctx) +static BOOL ScrCmd_1AC(ScriptContext *ctx) { sub_0203E2FC(ctx->fieldSystem); return 1; } -static BOOL ScrCmd_19E (ScriptContext * ctx) +static BOOL ScrCmd_19E(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 20); - MapObject ** v1 = sub_0203F098(ctx->fieldSystem, 10); + void **v0 = sub_0203F098(ctx->fieldSystem, 20); + MapObject **v1 = sub_0203F098(ctx->fieldSystem, 10); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_ReadHalfWord(ctx); @@ -5937,12 +5931,12 @@ static BOOL ScrCmd_19E (ScriptContext * ctx) return 1; } -static BOOL sub_020441C8 (ScriptContext * ctx) +static BOOL sub_020441C8(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 20); - u16 * v1 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); + void **v0 = sub_0203F098(ctx->fieldSystem, 20); + u16 *v1 = FieldSystem_GetVarPointer(ctx->fieldSystem, ctx->data[0]); - *v1 = ov23_02252C70((*v0)); + *v1 = ov23_02252C70(*v0); if ((*v1) == 0xfffe) { return 0; @@ -5951,9 +5945,9 @@ static BOOL sub_020441C8 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_19F (ScriptContext * ctx) +static BOOL ScrCmd_19F(ScriptContext *ctx) { - u8 * v0 = sub_0203F098(ctx->fieldSystem, 3); + u8 *v0 = sub_0203F098(ctx->fieldSystem, 3); *v0 = ov23_02252C9C(ScriptContext_GetVar(ctx)); ScriptContext_Pause(ctx, sub_02044240); @@ -5961,19 +5955,19 @@ static BOOL ScrCmd_19F (ScriptContext * ctx) return 1; } -static BOOL sub_02044240 (ScriptContext * ctx) +static BOOL sub_02044240(ScriptContext *ctx) { - u8 * v0 = sub_0203F098(ctx->fieldSystem, 3); + u8 *v0 = sub_0203F098(ctx->fieldSystem, 3); return FieldMessage_FinishedPrinting(*v0); } -static BOOL ScrCmd_1A0 (ScriptContext * ctx) +static BOOL ScrCmd_1A0(ScriptContext *ctx) { ov23_02252CD4(); return 0; } -static BOOL ScrCmd_1A1 (ScriptContext * ctx) +static BOOL ScrCmd_1A1(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); u16 v1 = ScriptContext_GetVar(ctx); @@ -5982,7 +5976,7 @@ static BOOL ScrCmd_1A1 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1A2 (ScriptContext * ctx) +static BOOL ScrCmd_1A2(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); u16 v1 = ScriptContext_GetVar(ctx); @@ -5991,15 +5985,15 @@ static BOOL ScrCmd_1A2 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_03F (ScriptContext * ctx) +static BOOL ScrCmd_03F(ScriptContext *ctx) { return 1; } -static BOOL ScrCmd_1B1 (ScriptContext * ctx) +static BOOL ScrCmd_1B1(ScriptContext *ctx) { - MapObject * v0; - FieldSystem * fieldSystem = ctx->fieldSystem; + MapObject *v0; + FieldSystem *fieldSystem = ctx->fieldSystem; v0 = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_GetVar(ctx)); @@ -6011,10 +6005,10 @@ static BOOL ScrCmd_1B1 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1B2 (ScriptContext * ctx) +static BOOL ScrCmd_1B2(ScriptContext *ctx) { - MapObject * v0; - FieldSystem * fieldSystem = ctx->fieldSystem; + MapObject *v0; + FieldSystem *fieldSystem = ctx->fieldSystem; v0 = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_GetVar(ctx)); @@ -6026,23 +6020,23 @@ static BOOL ScrCmd_1B2 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1B3 (ScriptContext * ctx) +static BOOL ScrCmd_1B3(ScriptContext *ctx) { sub_020736D8(ctx->taskManager); return 1; } -static BOOL ScrCmd_1B4 (ScriptContext * ctx) +static BOOL ScrCmd_1B4(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); - UnkStruct_02028430 * v2 = sub_02028430(fieldSystem->saveData); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); + UnkStruct_02028430 *v2 = sub_02028430(fieldSystem->saveData); *v1 = (u16)sub_02028494(v2, 0); return 0; } -static BOOL ScrCmd_1B5 (ScriptContext * ctx) +static BOOL ScrCmd_1B5(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); @@ -6050,17 +6044,17 @@ static BOOL ScrCmd_1B5 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_GetTimeOfDay (ScriptContext * ctx) +static BOOL ScrCmd_GetTimeOfDay(ScriptContext *ctx) { u16 *timeOfDay = ScriptContext_GetVarPointer(ctx); *timeOfDay = sub_02055BA8(ctx->fieldSystem); return FALSE; } -static BOOL ScrCmd_1B7 (ScriptContext * ctx) +static BOOL ScrCmd_1B7(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); u16 v2 = ScriptContext_GetVar(ctx); *v1 = (LCRNG_Next() % v2); @@ -6068,10 +6062,10 @@ static BOOL ScrCmd_1B7 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_1B8 (ScriptContext * ctx) +static BOOL ScrCmd_1B8(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); u16 v2 = ScriptContext_GetVar(ctx); *v1 = (LCRNG_Next() % v2); @@ -6079,10 +6073,10 @@ static BOOL ScrCmd_1B8 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_1C1 (ScriptContext * ctx) +static BOOL ScrCmd_1C1(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); u16 v2 = ScriptContext_GetVar(ctx); *v1 = ov5_021EE920(fieldSystem, v2); @@ -6090,10 +6084,10 @@ static BOOL ScrCmd_1C1 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1C2 (ScriptContext * ctx) +static BOOL ScrCmd_1C2(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - Pokemon * v1; + FieldSystem *fieldSystem = ctx->fieldSystem; + Pokemon *v1; u16 v2 = ScriptContext_GetVar(ctx); ov5_021EE9BC(fieldSystem, v2); @@ -6101,9 +6095,9 @@ static BOOL ScrCmd_1C2 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1C3 (ScriptContext * ctx) +static BOOL ScrCmd_1C3(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -6112,9 +6106,9 @@ static BOOL ScrCmd_1C3 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1C4 (ScriptContext * ctx) +static BOOL ScrCmd_1C4(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -6123,17 +6117,17 @@ static BOOL ScrCmd_1C4 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1C5 (ScriptContext * ctx) +static BOOL ScrCmd_1C5(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_0206B0C4(SaveData_GetVarsFlags(fieldSystem->saveData), 0x8200); return 0; } -static BOOL ScrCmd_1CC (ScriptContext * ctx) +static BOOL ScrCmd_1CC(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; inline_02044528(SaveData_GetVarsFlags(fieldSystem->saveData)); fieldSystem->unk_9C = Journal_GetSavedPage(SaveData_GetJournal(fieldSystem->saveData), 1); @@ -6142,7 +6136,7 @@ static BOOL ScrCmd_1CC (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1CD (ScriptContext * ctx) +static BOOL ScrCmd_1CD(ScriptContext *ctx) { u8 v0; u16 v1 = ScriptContext_GetVar(ctx); @@ -6150,7 +6144,7 @@ static BOOL ScrCmd_1CD (ScriptContext * ctx) u16 v3 = ScriptContext_GetVar(ctx); u16 v4 = ScriptContext_GetVar(ctx); u16 v5 = ScriptContext_GetVar(ctx); - void ** v6 = sub_0203F098(ctx->fieldSystem, 20); + void **v6 = sub_0203F098(ctx->fieldSystem, 20); switch (v1) { case 16: @@ -6191,15 +6185,15 @@ static BOOL ScrCmd_1CD (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_1CE (ScriptContext * ctx) +static BOOL ScrCmd_1CE(ScriptContext *ctx) { return 0; } -static BOOL ScrCmd_1D2 (ScriptContext * ctx) +static BOOL ScrCmd_1D2(ScriptContext *ctx) { - UnkStruct_0202A750 * v0; - UnkStruct_02029D04 * v1; + UnkStruct_0202A750 *v0; + UnkStruct_02029D04 *v1; u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -6210,13 +6204,13 @@ static BOOL ScrCmd_1D2 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1D3 (ScriptContext * ctx) +static BOOL ScrCmd_1D3(ScriptContext *ctx) { - UnkStruct_0202A750 * v0; - UnkStruct_02029D04 * v1; + UnkStruct_0202A750 *v0; + UnkStruct_02029D04 *v1; u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); - u16 * v4 = ScriptContext_GetVarPointer(ctx); + u16 *v4 = ScriptContext_GetVarPointer(ctx); v0 = sub_0202A750(ctx->fieldSystem->saveData); v1 = sub_02029D04(v0); @@ -6225,13 +6219,13 @@ static BOOL ScrCmd_1D3 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1D4 (ScriptContext * ctx) +static BOOL ScrCmd_1D4(ScriptContext *ctx) { - UnkStruct_0202A750 * v0; - UnkStruct_02029D04 * v1; + UnkStruct_0202A750 *v0; + UnkStruct_02029D04 *v1; u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); - u16 * v4 = ScriptContext_GetVarPointer(ctx); + u16 *v4 = ScriptContext_GetVarPointer(ctx); v0 = sub_0202A750(ctx->fieldSystem->saveData); v1 = sub_02029D04(v0); @@ -6245,10 +6239,10 @@ static BOOL ScrCmd_1D4 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1D5 (ScriptContext * ctx) +static BOOL ScrCmd_1D5(ScriptContext *ctx) { - UnkStruct_0202A750 * v0; - UnkStruct_02029D04 * v1; + UnkStruct_0202A750 *v0; + UnkStruct_02029D04 *v1; u16 v2 = ScriptContext_GetVar(ctx); v0 = sub_0202A750(ctx->fieldSystem->saveData); @@ -6258,12 +6252,12 @@ static BOOL ScrCmd_1D5 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1D6 (ScriptContext * ctx) +static BOOL ScrCmd_1D6(ScriptContext *ctx) { - UnkStruct_0202A750 * v0; - UnkStruct_02029D04 * v1; + UnkStruct_0202A750 *v0; + UnkStruct_02029D04 *v1; u16 v2 = ScriptContext_GetVar(ctx); - u16 * v3 = ScriptContext_GetVarPointer(ctx); + u16 *v3 = ScriptContext_GetVarPointer(ctx); v0 = sub_0202A750(ctx->fieldSystem->saveData); v1 = sub_02029D04(v0); @@ -6272,10 +6266,10 @@ static BOOL ScrCmd_1D6 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1E8 (ScriptContext * ctx) +static BOOL ScrCmd_1E8(ScriptContext *ctx) { - const PokedexData * v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = 0; @@ -6286,10 +6280,10 @@ static BOOL ScrCmd_1E8 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1E9 (ScriptContext * ctx) +static BOOL ScrCmd_1E9(ScriptContext *ctx) { - const PokedexData * v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = 0; @@ -6300,9 +6294,9 @@ static BOOL ScrCmd_1E9 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1EA (ScriptContext * ctx) +static BOOL ScrCmd_1EA(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); *v0 = sub_0203E53C(ctx->fieldSystem, 32, 0); ScriptContext_Pause(ctx, sub_02041CC8); @@ -6310,9 +6304,9 @@ static BOOL ScrCmd_1EA (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_1EB (ScriptContext * ctx) +static BOOL ScrCmd_1EB(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); *v0 = sub_0203E53C(ctx->fieldSystem, 32, 1); ScriptContext_Pause(ctx, sub_02041CC8); @@ -6320,27 +6314,27 @@ static BOOL ScrCmd_1EB (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_1EC (ScriptContext * ctx) +static BOOL ScrCmd_1EC(ScriptContext *ctx) { ov6_022475B0(ctx->fieldSystem->saveData); return 0; } -static BOOL ScrCmd_1ED (ScriptContext * ctx) +static BOOL ScrCmd_1ED(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); (*v0) = ov6_02247624(ctx->fieldSystem->saveData); return 0; } -static BOOL ScrCmd_1EF (ScriptContext * ctx) +static BOOL ScrCmd_1EF(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); return 0; } -static BOOL ScrCmd_1E5 (ScriptContext * ctx) +static BOOL ScrCmd_1E5(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -6348,10 +6342,10 @@ static BOOL ScrCmd_1E5 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1E6 (ScriptContext * ctx) +static BOOL ScrCmd_1E6(ScriptContext *ctx) { u32 v0; - u16 * v1, * v2; + u16 *v1, *v2; u16 v3 = ScriptContext_ReadHalfWord(ctx); u16 v4 = ScriptContext_ReadHalfWord(ctx); u16 v5 = ScriptContext_ReadHalfWord(ctx); @@ -6365,7 +6359,7 @@ static BOOL ScrCmd_1E6 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_1E7 (ScriptContext * ctx) +static BOOL ScrCmd_1E7(ScriptContext *ctx) { u32 v0; u16 v1 = ScriptContext_ReadHalfWord(ctx); @@ -6391,7 +6385,7 @@ static BOOL ScrCmd_1E7 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_334 (ScriptContext * ctx) +static BOOL ScrCmd_334(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); u16 v1 = ScriptContext_GetVar(ctx); @@ -6400,7 +6394,7 @@ static BOOL ScrCmd_334 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_335 (ScriptContext * ctx) +static BOOL ScrCmd_335(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); u32 v1 = ScriptContext_ReadWord(ctx); @@ -6409,13 +6403,13 @@ static BOOL ScrCmd_335 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_202 (ScriptContext * ctx) +static BOOL ScrCmd_202(ScriptContext *ctx) { - u16 * v0; - u16 * v1; - FieldOverworldState * v2 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); - VarsFlags * v3 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); - TVBroadcast * v4 = SaveData_TVBroadcast(ctx->fieldSystem->saveData); + u16 *v0; + u16 *v1; + FieldOverworldState *v2 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); + VarsFlags *v3 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + TVBroadcast *v4 = SaveData_TVBroadcast(ctx->fieldSystem->saveData); int v5 = ScriptContext_ReadByte(ctx); v0 = sub_0203A784(v2); @@ -6432,7 +6426,7 @@ static BOOL ScrCmd_202 (ScriptContext * ctx) sub_0206AE4C(v3); sub_0206D720(ctx->fieldSystem); { - void * v6 = sub_0202BDE0(4); + void *v6 = sub_0202BDE0(4); sub_0202B758(ctx->fieldSystem->unk_9C, v6, 1); } @@ -6444,30 +6438,30 @@ static BOOL ScrCmd_202 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_206 (ScriptContext * ctx) +static BOOL ScrCmd_206(ScriptContext *ctx) { sub_0206C0E8(ctx->fieldSystem); return 1; } -static BOOL ScrCmd_20D (ScriptContext * ctx) +static BOOL ScrCmd_20D(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = ov6_02243004(ctx->fieldSystem, v0); return 1; } -static BOOL ScrCmd_20E (ScriptContext * ctx) +static BOOL ScrCmd_20E(ScriptContext *ctx) { sub_02071CD0(ctx->fieldSystem); return 0; } -static BOOL ScrCmd_20F (ScriptContext * ctx) +static BOOL ScrCmd_20F(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); u16 v1 = ScriptContext_ReadHalfWord(ctx); sub_02004550(65, 0, 0); @@ -6476,16 +6470,16 @@ static BOOL ScrCmd_20F (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_210 (ScriptContext * ctx) +static BOOL ScrCmd_210(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = ov6_02242C3C(ctx->fieldSystem, v0); return 0; } -static BOOL ScrCmd_211 (ScriptContext * ctx) +static BOOL ScrCmd_211(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); @@ -6493,19 +6487,19 @@ static BOOL ScrCmd_211 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_214 (ScriptContext * ctx) +static BOOL ScrCmd_214(ScriptContext *ctx) { - VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + VarsFlags *v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_0206B354(v0); return 0; } -static BOOL ScrCmd_218 (ScriptContext * ctx) +static BOOL ScrCmd_218(ScriptContext *ctx) { - const PokedexData * v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); u16 v2, v3, v4, v5; v2 = sub_02026EAC(v0); @@ -6526,7 +6520,7 @@ static BOOL ScrCmd_218 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_219 (ScriptContext * ctx) +static BOOL ScrCmd_219(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); @@ -6534,22 +6528,22 @@ static BOOL ScrCmd_219 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_21A (ScriptContext * ctx) +static BOOL ScrCmd_21A(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = sub_0206B260(SaveData_GetVarsFlags(ctx->fieldSystem->saveData)); return 0; } -static BOOL ScrCmd_21B (ScriptContext * ctx) +static BOOL ScrCmd_21B(ScriptContext *ctx) { sub_0202D884(ctx->fieldSystem->saveData); return 0; } -static BOOL ScrCmd_21C (ScriptContext * ctx) +static BOOL ScrCmd_21C(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); @@ -6557,66 +6551,66 @@ static BOOL ScrCmd_21C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_226 (ScriptContext * ctx) +static BOOL ScrCmd_226(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 20); + void **v0 = sub_0203F098(ctx->fieldSystem, 20); u8 v1 = ScriptContext_ReadByte(ctx); *v0 = ov6_02246184(11, v1); return 0; } -static BOOL ScrCmd_227 (ScriptContext * ctx) +static BOOL ScrCmd_227(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + void **v0 = sub_0203F098(ctx->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = ov6_02246224((UnkStruct_ov6_02246204 *)*v0); return 0; } -static BOOL ScrCmd_228 (ScriptContext * ctx) +static BOOL ScrCmd_228(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + void **v0 = sub_0203F098(ctx->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = ov6_0224622C((UnkStruct_ov6_02246204 *)*v0); return 0; } -static BOOL ScrCmd_229 (ScriptContext * ctx) +static BOOL ScrCmd_229(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 20); + void **v0 = sub_0203F098(ctx->fieldSystem, 20); u16 v1 = ScriptContext_GetVar(ctx); sub_0206C740(ctx->taskManager, (UnkStruct_ov6_02246204 *)*v0, v1, 11); return 1; } -static BOOL ScrCmd_22A (ScriptContext * ctx) +static BOOL ScrCmd_22A(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 20); + void **v0 = sub_0203F098(ctx->fieldSystem, 20); ov6_02246204((UnkStruct_ov6_02246204 *)*v0); return 0; } -static BOOL ScrCmd_22B (ScriptContext * ctx) +static BOOL ScrCmd_22B(ScriptContext *ctx) { sub_02027508(SaveData_Pokedex(ctx->fieldSystem->saveData)); return 0; } -static BOOL ScrCmd_22C (ScriptContext * ctx) +static BOOL ScrCmd_22C(ScriptContext *ctx) { sub_020274B0(SaveData_Pokedex(ctx->fieldSystem->saveData)); return 0; } -static BOOL ScrCmd_22D (ScriptContext * ctx) +static BOOL ScrCmd_22D(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = 0; @@ -6632,10 +6626,10 @@ static BOOL ScrCmd_22D (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_233 (ScriptContext * ctx) +static BOOL ScrCmd_233(ScriptContext *ctx) { - Pokemon * v0; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + Pokemon *v0; + u16 *v1 = ScriptContext_GetVarPointer(ctx); u16 v2 = ScriptContext_GetVar(ctx); u32 v3[7]; @@ -6652,10 +6646,10 @@ static BOOL ScrCmd_233 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_234 (ScriptContext * ctx) +static BOOL ScrCmd_234(ScriptContext *ctx) { RTCDate v0; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); GetCurrentDate(&v0); *v1 = v0.week; @@ -6663,7 +6657,7 @@ static BOOL ScrCmd_234 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_239 (ScriptContext * ctx) +static BOOL ScrCmd_239(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -6671,11 +6665,11 @@ static BOOL ScrCmd_239 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_23A (ScriptContext * ctx) +static BOOL ScrCmd_23A(ScriptContext *ctx) { - Pokemon * v0; - u16 * v1 = ScriptContext_GetVarPointer(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + Pokemon *v0; + u16 *v1 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); u16 v3 = ScriptContext_GetVar(ctx); u16 v4, v5; @@ -6688,7 +6682,7 @@ static BOOL ScrCmd_23A (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_23B (ScriptContext * ctx) +static BOOL ScrCmd_23B(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); @@ -6696,7 +6690,7 @@ static BOOL ScrCmd_23B (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_23C (ScriptContext * ctx) +static BOOL ScrCmd_23C(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); @@ -6705,7 +6699,7 @@ static BOOL ScrCmd_23C (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_23D (ScriptContext * ctx) +static BOOL ScrCmd_23D(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); u8 v1 = ScriptContext_ReadByte(ctx); @@ -6717,20 +6711,20 @@ static BOOL ScrCmd_23D (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_246 (ScriptContext * ctx) +static BOOL ScrCmd_246(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = GAME_VERSION; return 0; } -static BOOL ScrCmd_249 (ScriptContext * ctx) +static BOOL ScrCmd_249(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); - u16 * v2 = ScriptContext_GetVarPointer(ctx); - PCBoxes * v3 = SaveData_PCBoxes(fieldSystem->saveData); + FieldSystem *fieldSystem = ctx->fieldSystem; + TrainerInfo *v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(ctx->fieldSystem)); + u16 *v2 = ScriptContext_GetVarPointer(ctx); + PCBoxes *v3 = SaveData_PCBoxes(fieldSystem->saveData); u16 v4 = ScriptContext_GetVar(ctx); u16 v5 = ScriptContext_GetVar(ctx); u16 v6 = ScriptContext_GetVar(ctx); @@ -6754,12 +6748,12 @@ static BOOL ScrCmd_249 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_24A (ScriptContext * ctx) +static BOOL ScrCmd_24A(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - SecretBaseRecord * v2; - u16 * v3 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + SecretBaseRecord *v2; + u16 *v3 = ScriptContext_GetVarPointer(ctx); v2 = SaveData_SecretBaseRecord(v1); *v3 = sub_020295B8(v2); @@ -6767,9 +6761,9 @@ static BOOL ScrCmd_24A (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_24B (ScriptContext * ctx) +static BOOL ScrCmd_24B(ScriptContext *ctx) { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; u8 v1; fieldSystem = ctx->fieldSystem; @@ -6780,9 +6774,9 @@ static BOOL ScrCmd_24B (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_24C (ScriptContext * ctx) +static BOOL ScrCmd_24C(ScriptContext *ctx) { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; u8 v1; fieldSystem = ctx->fieldSystem; @@ -6792,9 +6786,9 @@ static BOOL ScrCmd_24C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_24D (ScriptContext * ctx) +static BOOL ScrCmd_24D(ScriptContext *ctx) { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; u8 v1; fieldSystem = ctx->fieldSystem; @@ -6804,10 +6798,10 @@ static BOOL ScrCmd_24D (ScriptContext * ctx) return 0; } -static void sub_020451B4 (FieldSystem * fieldSystem, u16 param1) +static void sub_020451B4(FieldSystem *fieldSystem, u16 param1) { - PokedexData * v0 = SaveData_Pokedex(fieldSystem->saveData); - Pokemon * v1 = Pokemon_New(32); + PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); + Pokemon *v1 = Pokemon_New(32); Pokemon_Init(v1); Pokemon_InitWith(v1, param1, 50, 32, 0, 0, 0, 0); @@ -6817,7 +6811,7 @@ static void sub_020451B4 (FieldSystem * fieldSystem, u16 param1) return; } -static BOOL ScrCmd_31A (ScriptContext * ctx) +static BOOL ScrCmd_31A(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); @@ -6825,9 +6819,9 @@ static BOOL ScrCmd_31A (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_252 (ScriptContext * ctx) +static BOOL ScrCmd_252(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); u16 v1; v1 = sub_02079A50(SaveData_PCBoxes(ctx->fieldSystem->saveData)); @@ -6836,9 +6830,9 @@ static BOOL ScrCmd_252 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_258 (ScriptContext * ctx) +static BOOL ScrCmd_258(ScriptContext *ctx) { - SysTask ** v0 = sub_0203F098(ctx->fieldSystem, 22); + SysTask **v0 = sub_0203F098(ctx->fieldSystem, 22); *v0 = NULL; *v0 = ov5_021E1000(ctx->fieldSystem); @@ -6846,15 +6840,15 @@ static BOOL ScrCmd_258 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_259 (ScriptContext * ctx) +static BOOL ScrCmd_259(ScriptContext *ctx) { - SysTask ** v0 = sub_0203F098(ctx->fieldSystem, 22); + SysTask **v0 = sub_0203F098(ctx->fieldSystem, 22); ov5_021E100C(*v0); return 1; } -static BOOL ScrCmd_25A (ScriptContext * ctx) +static BOOL ScrCmd_25A(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); @@ -6862,21 +6856,21 @@ static BOOL ScrCmd_25A (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_25B (ScriptContext * ctx) +static BOOL ScrCmd_25B(ScriptContext *ctx) { sub_020716D4(ctx->fieldSystem); return 0; } -static BOOL ScrCmd_25C (ScriptContext * ctx) +static BOOL ScrCmd_25C(ScriptContext *ctx) { sub_0207183C(ctx->fieldSystem); return 1; } -static BOOL ScrCmd_25D (ScriptContext * ctx) +static BOOL ScrCmd_25D(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); if (sub_02071818(ctx->fieldSystem)) { (*v0) = 1; @@ -6887,19 +6881,19 @@ static BOOL ScrCmd_25D (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_25E (ScriptContext * ctx) +static BOOL ScrCmd_25E(ScriptContext *ctx) { ov6_02247F5C(ctx->fieldSystem); return 0; } -static BOOL ScrCmd_25F (ScriptContext * ctx) +static BOOL ScrCmd_25F(ScriptContext *ctx) { ov6_02247FBC(ctx->fieldSystem); return 1; } -static BOOL ScrCmd_260 (ScriptContext * ctx) +static BOOL ScrCmd_260(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -6907,25 +6901,25 @@ static BOOL ScrCmd_260 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_262 (ScriptContext * ctx) +static BOOL ScrCmd_262(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); - Party * v2 = Party_GetFromSavedata(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); + Party *v2 = Party_GetFromSavedata(ctx->fieldSystem->saveData); *v1 = Party_HasSpecies(v2, v0); return 1; } -static BOOL ScrCmd_263 (ScriptContext * ctx) +static BOOL ScrCmd_263(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - Party * v1 = Party_GetFromSavedata(ctx->fieldSystem->saveData); + Party *v1 = Party_GetFromSavedata(ctx->fieldSystem->saveData); int v2; int v3; int v4 = Party_GetCurrentCount(v1); - Pokemon * v5; - PokedexData * v6 = SaveData_Pokedex(ctx->fieldSystem->saveData); + Pokemon *v5; + PokedexData *v6 = SaveData_Pokedex(ctx->fieldSystem->saveData); for (v2 = 0; v2 < v4; v2++) { v5 = Party_GetPokemonBySlotIndex(v1, v2); @@ -6941,12 +6935,12 @@ static BOOL ScrCmd_263 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_264 (ScriptContext * ctx) +static BOOL ScrCmd_264(ScriptContext *ctx) { - Pokemon * v0; + Pokemon *v0; int v1, v2, v3, v4, v5, v6; - u16 * v7 = ScriptContext_GetVarPointer(ctx); - Party * v8 = Party_GetFromSavedata(ctx->fieldSystem->saveData); + u16 *v7 = ScriptContext_GetVarPointer(ctx); + Party *v8 = Party_GetFromSavedata(ctx->fieldSystem->saveData); int v9 = Party_GetCurrentCount(v8); v3 = 0; @@ -6980,23 +6974,23 @@ static BOOL ScrCmd_264 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_265 (ScriptContext * ctx) +static BOOL ScrCmd_265(ScriptContext *ctx) { - VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); sub_0206AE0C(v0); return 0; } -static BOOL ScrCmd_266 (ScriptContext * ctx) +static BOOL ScrCmd_266(ScriptContext *ctx) { - VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); sub_0206AE1C(v0); return 0; } -static BOOL ScrCmd_267 (ScriptContext * ctx) +static BOOL ScrCmd_267(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); @@ -7004,17 +6998,17 @@ static BOOL ScrCmd_267 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_268 (ScriptContext * ctx) +static BOOL ScrCmd_268(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = sub_02055BDC(ctx->fieldSystem); return 0; } -static BOOL ScrCmd_269 (ScriptContext * ctx) +static BOOL ScrCmd_269(ScriptContext *ctx) { - MapObject * v0; + MapObject *v0; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -7031,9 +7025,9 @@ static BOOL ScrCmd_269 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_26A (ScriptContext * ctx) +static BOOL ScrCmd_26A(ScriptContext *ctx) { - MapObject * v0; + MapObject *v0; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -7048,21 +7042,21 @@ static BOOL ScrCmd_26A (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_26B (ScriptContext * ctx) +static BOOL ScrCmd_26B(ScriptContext *ctx) { - u16 * v0 = FieldSystem_GetVarPointer(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx)); + u16 *v0 = FieldSystem_GetVarPointer(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx)); *v0 = HasAllLegendaryTitansInParty(ctx->fieldSystem->saveData); return 0; } -static BOOL ScrCmd_26C (ScriptContext * ctx) +static BOOL ScrCmd_26C(ScriptContext *ctx) { - UnkStruct_0202A750 * v0; - UnkStruct_02029D04 * v1; + UnkStruct_0202A750 *v0; + UnkStruct_02029D04 *v1; u16 v2[16]; int v3, v4, v5, v6; - u16 * v7 = ScriptContext_GetVarPointer(ctx); + u16 *v7 = ScriptContext_GetVarPointer(ctx); v0 = sub_0202A750(ctx->fieldSystem->saveData); v1 = sub_02029D04(v0); @@ -7101,27 +7095,27 @@ static BOOL ScrCmd_26C (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_26E (ScriptContext * ctx) +static BOOL ScrCmd_26E(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = gCoreSys.unk_66; return 1; } -static BOOL ScrCmd_26F (ScriptContext * ctx) +static BOOL ScrCmd_26F(ScriptContext *ctx) { - VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); sub_0206B364(v0, 0); return 0; } -static BOOL ScrCmd_270 (ScriptContext * ctx) +static BOOL ScrCmd_270(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u8 v1 = ScriptContext_ReadByte(ctx); - VarsFlags * v2 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + VarsFlags *v2 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); if (v1) { sub_0206B1B0(v2, v0); @@ -7132,9 +7126,9 @@ static BOOL ScrCmd_270 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_273 (ScriptContext * ctx) +static BOOL ScrCmd_273(ScriptContext *ctx) { - StringTemplate ** v0 = sub_0203F098(ctx->fieldSystem, 15); + StringTemplate **v0 = sub_0203F098(ctx->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(ctx); u16 v2 = ScriptContext_GetVar(ctx); @@ -7142,11 +7136,11 @@ static BOOL ScrCmd_273 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_275 (ScriptContext * ctx) +static BOOL ScrCmd_275(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - VarsFlags * v1 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + VarsFlags *v1 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + u16 *v2 = ScriptContext_GetVarPointer(ctx); u32 v3; v3 = sub_0206B394(v1); @@ -7160,18 +7154,18 @@ static BOOL ScrCmd_275 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_277 (ScriptContext * ctx) +static BOOL ScrCmd_277(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = sub_0206B314(SaveData_GetVarsFlags(ctx->fieldSystem->saveData)); return 0; } -static BOOL ScrCmd_279 (ScriptContext * ctx) +static BOOL ScrCmd_279(ScriptContext *ctx) { - UnkStruct_0202A750 * v0; - UnkStruct_02029D04 * v1; + UnkStruct_0202A750 *v0; + UnkStruct_02029D04 *v1; u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -7182,30 +7176,30 @@ static BOOL ScrCmd_279 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_27A (ScriptContext * ctx) +static BOOL ScrCmd_27A(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; sub_02050568(fieldSystem); return 1; } -static BOOL ScrCmd_27B (ScriptContext * ctx) +static BOOL ScrCmd_27B(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - SaveData * v1 = fieldSystem->saveData; + FieldSystem *fieldSystem = ctx->fieldSystem; + SaveData *v1 = fieldSystem->saveData; sub_0206B334(v1); return 0; } -static BOOL ScrCmd_27D (ScriptContext * ctx) +static BOOL ScrCmd_27D(ScriptContext *ctx) { - UnkStruct_02014EC4 * v0; + UnkStruct_02014EC4 *v0; u32 v1; - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); u16 v3 = ScriptContext_GetVar(ctx); - StringTemplate ** v4 = sub_0203F098(ctx->fieldSystem, 15); + StringTemplate **v4 = sub_0203F098(ctx->fieldSystem, 15); v0 = sub_02014EC4(ctx->fieldSystem->saveData); v1 = sub_02014EE4(v0); @@ -7227,10 +7221,10 @@ static BOOL ScrCmd_27D (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_27F (ScriptContext * ctx) +static BOOL ScrCmd_27F(ScriptContext *ctx) { - UnkStruct_02014EC4 * v0; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + UnkStruct_02014EC4 *v0; + u16 *v1 = ScriptContext_GetVarPointer(ctx); v0 = sub_02014EC4(ctx->fieldSystem->saveData); @@ -7243,11 +7237,11 @@ static BOOL ScrCmd_27F (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_27E (ScriptContext * ctx) +static BOOL ScrCmd_27E(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - VarsFlags * v1 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + VarsFlags *v1 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + u16 *v2 = ScriptContext_GetVarPointer(ctx); u16 v3; v3 = sub_0206B3DC(v1); @@ -7261,11 +7255,11 @@ static BOOL ScrCmd_27E (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_282 (ScriptContext * ctx) +static BOOL ScrCmd_282(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_02025CCC * v2; + u16 *v0 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_02025CCC *v2; v2 = sub_02025CCC(ctx->fieldSystem->saveData); @@ -7278,22 +7272,22 @@ static BOOL ScrCmd_282 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_284 (ScriptContext * ctx) +static BOOL ScrCmd_284(ScriptContext *ctx) { - const PokedexData * v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + const PokedexData *v0 = SaveData_Pokedex(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_020270DC(v0); return 0; } -static BOOL ScrCmd_285 (ScriptContext * ctx) +static BOOL ScrCmd_285(ScriptContext *ctx) { u8 v0, v1; u16 v2, v3, v4; u16 v5 = ScriptContext_GetVar(ctx); u16 v6 = ScriptContext_GetVar(ctx); - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; static const u16 v8[] = { 0x10F, 0x110, @@ -7378,42 +7372,42 @@ static BOOL ScrCmd_285 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_286 (ScriptContext * ctx) +static BOOL ScrCmd_286(ScriptContext *ctx) { - VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + VarsFlags *v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_0206B3EC(v0); return 0; } -static BOOL ScrCmd_287 (ScriptContext * ctx) +static BOOL ScrCmd_287(ScriptContext *ctx) { - VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + VarsFlags *v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_0206B40C(v0); return 0; } -static BOOL ScrCmd_288 (ScriptContext * ctx) +static BOOL ScrCmd_288(ScriptContext *ctx) { - VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + VarsFlags *v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_0206B42C(v0); return 0; } -static BOOL ScrCmd_289 (ScriptContext * ctx) +static BOOL ScrCmd_289(ScriptContext *ctx) { - Poffin * v0; + Poffin *v0; int v1; - UnkStruct_0202AB28 * v2; + UnkStruct_0202AB28 *v2; u8 v3[5]; u8 v4; u16 v5; - u16 * v6; + u16 *v6; int v7; v6 = ScriptContext_GetVarPointer(ctx); @@ -7439,10 +7433,10 @@ static BOOL ScrCmd_289 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_28A (ScriptContext * ctx) +static BOOL ScrCmd_28A(ScriptContext *ctx) { - UnkStruct_0202AB28 * v0; - u16 * v1; + UnkStruct_0202AB28 *v0; + u16 *v1; v1 = ScriptContext_GetVarPointer(ctx); v0 = Poffin_GetSavedataBlock(ctx->fieldSystem->saveData); @@ -7456,10 +7450,10 @@ static BOOL ScrCmd_28A (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_307 (ScriptContext * ctx) +static BOOL ScrCmd_307(ScriptContext *ctx) { - UnkStruct_0202AB28 * v0; - u16 * v1; + UnkStruct_0202AB28 *v0; + u16 *v1; v1 = ScriptContext_GetVarPointer(ctx); v0 = Poffin_GetSavedataBlock(ctx->fieldSystem->saveData); @@ -7468,23 +7462,23 @@ static BOOL ScrCmd_307 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_28B (ScriptContext * ctx) +static BOOL ScrCmd_28B(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); - VarsFlags * v2 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); + VarsFlags *v2 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); - GF_ASSERT((v0 <= 4)); + GF_ASSERT(v0 <= 4); *v1 = sub_0206B16C(v2, v0); return 0; } -static BOOL ScrCmd_28F (ScriptContext * ctx) +static BOOL ScrCmd_28F(ScriptContext *ctx) { int v0; - const HallOfFame * v1; - u16 * v2 = ScriptContext_GetVarPointer(ctx); + const HallOfFame *v1; + u16 *v2 = ScriptContext_GetVarPointer(ctx); v1 = SaveData_HallOfFame(ctx->fieldSystem->saveData, 32, &v0); @@ -7506,9 +7500,9 @@ static BOOL ScrCmd_28F (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_290 (ScriptContext * ctx) +static BOOL ScrCmd_290(ScriptContext *ctx) { - void ** v0; + void **v0; u16 v1 = ScriptContext_GetVar(ctx); v0 = sub_0203F098(ctx->fieldSystem, 19); @@ -7518,10 +7512,10 @@ static BOOL ScrCmd_290 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_291 (ScriptContext * ctx) +static BOOL ScrCmd_291(ScriptContext *ctx) { - void ** v0; - u16 * v1, * v2; + void **v0; + u16 *v1, *v2; v1 = ScriptContext_GetVarPointer(ctx); v2 = ScriptContext_GetVarPointer(ctx); @@ -7549,11 +7543,11 @@ static BOOL ScrCmd_291 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_292 (ScriptContext * ctx) +static BOOL ScrCmd_292(ScriptContext *ctx) { u16 v0; u8 v1 = ScriptContext_ReadByte(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); if (v1 > 100) { v1 = 100; @@ -7570,11 +7564,11 @@ static BOOL ScrCmd_292 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_29E (ScriptContext * ctx) +static BOOL ScrCmd_29E(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); - FieldSystem * fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; switch (v0) { case 0: @@ -7594,16 +7588,16 @@ static BOOL ScrCmd_29E (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_293 (ScriptContext * ctx) +static BOOL ScrCmd_293(ScriptContext *ctx) { - VarsFlags * v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + VarsFlags *v0 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_0206B374(v0); return 0; } -static BOOL ScrCmd_29F (ScriptContext * ctx) +static BOOL ScrCmd_29F(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); @@ -7616,26 +7610,26 @@ static BOOL ScrCmd_29F (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_2A3 (ScriptContext * ctx) +static BOOL ScrCmd_2A3(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = sub_02039074(ctx->fieldSystem->saveData); return 0; } -static BOOL ScrCmd_2A4 (ScriptContext * ctx) +static BOOL ScrCmd_2A4(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = sub_0202AF94(sub_0202B370(ctx->fieldSystem->saveData)); return 0; } -static BOOL ScrCmd_2A2 (ScriptContext * ctx) +static BOOL ScrCmd_2A2(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - UndergroundData * v1 = sub_020298B0(ctx->fieldSystem->saveData); + UndergroundData *v1 = sub_020298B0(ctx->fieldSystem->saveData); if ((v0 == 135) || (v0 == 136)) { sub_02028828(v1); @@ -7644,10 +7638,10 @@ static BOOL ScrCmd_2A2 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2A7 (ScriptContext * ctx) +static BOOL ScrCmd_2A7(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); - u16 * v1 = ScriptContext_GetVarPointer(ctx); + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = 0; @@ -7658,18 +7652,18 @@ static BOOL ScrCmd_2A7 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2AA (ScriptContext * ctx) +static BOOL ScrCmd_2AA(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); u16 v4 = ScriptContext_GetVar(ctx); u16 v5 = ScriptContext_GetVar(ctx); - StringTemplate * v6 = StringTemplate_Default(32); - MessageLoader * v7 = MessageLoader_Init(0, 26, 372, 32); - Strbuf* v8; - Strbuf* v9; + StringTemplate *v6 = StringTemplate_Default(32); + MessageLoader *v7 = MessageLoader_Init(0, 26, 372, 32); + Strbuf *v8; + Strbuf *v9; StringTemplate_SetCustomMessageWord(v6, 0, v2); StringTemplate_SetCustomMessageWord(v6, 1, v3); @@ -7688,10 +7682,10 @@ static BOOL ScrCmd_2AA (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2AC (ScriptContext * ctx) +static BOOL ScrCmd_2AC(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_02025CCC * v1; + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_02025CCC *v1; v1 = sub_02025CCC(ctx->fieldSystem->saveData); @@ -7699,41 +7693,41 @@ static BOOL ScrCmd_2AC (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2AF (ScriptContext * ctx) +static BOOL ScrCmd_2AF(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); *v1 = sub_0205BC50(*v2); return 0; } -static BOOL ScrCmd_2B0 (ScriptContext * ctx) +static BOOL ScrCmd_2B0(ScriptContext *ctx) { sub_02039734(); return 0; } -static BOOL ScrCmd_2B1 (ScriptContext * ctx) +static BOOL ScrCmd_2B1(ScriptContext *ctx) { sub_02039794(); return 0; } -static BOOL ScrCmd_2B2 (ScriptContext * ctx) +static BOOL ScrCmd_2B2(ScriptContext *ctx) { FieldSystem_SaveObjects(ctx->fieldSystem); return 0; } -static BOOL ScrCmd_2B5 (ScriptContext * ctx) +static BOOL ScrCmd_2B5(ScriptContext *ctx) { u16 mapId = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); - FieldOverworldState * v3 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); - Location * location = sub_0203A72C(v3); + FieldOverworldState *v3 = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData); + Location *location = sub_0203A72C(v3); location->mapId = mapId; location->x = v1; @@ -7744,9 +7738,9 @@ static BOOL ScrCmd_2B5 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2B6 (ScriptContext * ctx) +static BOOL ScrCmd_2B6(ScriptContext *ctx) { - MapObject * v0; + MapObject *v0; u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_ReadByte(ctx); @@ -7760,19 +7754,19 @@ static BOOL ScrCmd_2B6 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2BE (ScriptContext * ctx) +static BOOL ScrCmd_2BE(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); *v1 = sub_02071F28(fieldSystem); return 0; } -static BOOL ScrCmd_2C1 (ScriptContext * ctx) +static BOOL ScrCmd_2C1(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021E1FF4 ** v1 = sub_0203F098(fieldSystem, 40); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021E1FF4 **v1 = sub_0203F098(fieldSystem, 40); if (!SaveData_OverwriteCheck(fieldSystem->saveData)) { *v1 = ov5_021E1F98(fieldSystem, 4, 3); @@ -7782,10 +7776,10 @@ static BOOL ScrCmd_2C1 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2C2 (ScriptContext * ctx) +static BOOL ScrCmd_2C2(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - UnkStruct_ov5_021E1FF4 ** v1 = sub_0203F098(fieldSystem, 40); + FieldSystem *fieldSystem = ctx->fieldSystem; + UnkStruct_ov5_021E1FF4 **v1 = sub_0203F098(fieldSystem, 40); if (!SaveData_OverwriteCheck(fieldSystem->saveData)) { ov5_021E1F7C(*v1); @@ -7795,17 +7789,17 @@ static BOOL ScrCmd_2C2 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_2C3 (ScriptContext * ctx) +static BOOL ScrCmd_2C3(ScriptContext *ctx) { sub_02070428(ctx->fieldSystem, ScriptContext_ReadByte(ctx)); return 0; } -static BOOL ScrCmd_2C4 (ScriptContext * ctx) +static BOOL ScrCmd_2C4(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); u8 v1 = ScriptContext_ReadByte(ctx); - UnkStruct_ov104_02230BE4 * v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov104_02230BE4)); + UnkStruct_ov104_02230BE4 *v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov104_02230BE4)); MI_CpuClear8(v2, sizeof(UnkStruct_ov104_02230BE4)); @@ -7831,19 +7825,19 @@ static BOOL ScrCmd_2C4 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_2CA (ScriptContext * ctx) +static BOOL ScrCmd_2CA(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - Strbuf ** v1 = sub_0203F098(fieldSystem, 16); - Window * v2 = sub_0203F098(fieldSystem, 1); + FieldSystem *fieldSystem = ctx->fieldSystem; + Strbuf **v1 = sub_0203F098(fieldSystem, 16); + Window *v2 = sub_0203F098(fieldSystem, 1); ov8_0224B67C(fieldSystem, v2, ctx->loader, *v1); return 1; } -static void sub_020462C0 (SysTask * ctx, void * param1) +static void sub_020462C0(SysTask *ctx, void *param1) { - FieldSystem * fieldSystem = param1; + FieldSystem *fieldSystem = param1; if (fieldSystem->unk_04->unk_0C) { ov5_021D5F24(fieldSystem->unk_04->unk_0C, 26); @@ -7851,24 +7845,24 @@ static void sub_020462C0 (SysTask * ctx, void * param1) } } -static BOOL ScrCmd_2CD (ScriptContext * ctx) +static BOOL ScrCmd_2CD(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; SysTask_Start(sub_020462C0, fieldSystem, 128); return 1; } -static BOOL ScrCmd_2CE (ScriptContext * ctx) +static BOOL ScrCmd_2CE(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = FieldOverworldState_GetWeather(SaveData_GetFieldOverworldState(fieldSystem->saveData)); ov5_021D5F24(fieldSystem->unk_04->unk_0C, v1); return 1; } -static BOOL ScrCmd_2D8 (ScriptContext * ctx) +static BOOL ScrCmd_2D8(ScriptContext *ctx) { u8 v0 = ScriptContext_ReadByte(ctx); static const u16 v1[] = { @@ -7918,17 +7912,18 @@ static BOOL ScrCmd_2D8 (ScriptContext * ctx) 0x32, 0xffff }; - static const u16 * v3[] = { - v1, v2, + static const u16 *v3[] = { + v1, + v2, }; ov7_0224CDA4(ctx->taskManager, ctx->fieldSystem, (u16 *)v3[v0], 3, 0); return 1; } -BOOL ScrCmd_2C8 (ScriptContext * ctx) +BOOL ScrCmd_2C8(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); u16 v1 = ScriptContext_GetVar(ctx); u16 v2 = ScriptContext_GetVar(ctx); u16 v3 = ScriptContext_GetVar(ctx); @@ -7939,9 +7934,9 @@ BOOL ScrCmd_2C8 (ScriptContext * ctx) return 1; } -BOOL ScrCmd_2E2 (ScriptContext * ctx) +BOOL ScrCmd_2E2(ScriptContext *ctx) { - void ** v0 = sub_0203F098(ctx->fieldSystem, 19); + void **v0 = sub_0203F098(ctx->fieldSystem, 19); *v0 = sub_0203E608(ctx->fieldSystem, 32); ScriptContext_Pause(ctx, sub_02041D60); @@ -7949,10 +7944,10 @@ BOOL ScrCmd_2E2 (ScriptContext * ctx) return 1; } -BOOL ScrCmd_2E3 (ScriptContext * ctx) +BOOL ScrCmd_2E3(ScriptContext *ctx) { - void ** v0; - FieldSystem * fieldSystem = ctx->fieldSystem; + void **v0; + FieldSystem *fieldSystem = ctx->fieldSystem; v0 = sub_0203F098(ctx->fieldSystem, 19); Heap_FreeToHeap(*v0); @@ -7961,14 +7956,14 @@ BOOL ScrCmd_2E3 (ScriptContext * ctx) return 1; } -BOOL ScrCmd_2E4 (ScriptContext * ctx) +BOOL ScrCmd_2E4(ScriptContext *ctx) { - void ** v0; - UnkStruct_0203E608 * v1; - FieldSystem * fieldSystem = ctx->fieldSystem; + void **v0; + UnkStruct_0203E608 *v1; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v3 = ScriptContext_GetVar(ctx); - u16 * v4 = ScriptContext_GetVarPointer(ctx); - u16 * v5 = ScriptContext_GetVarPointer(ctx); + u16 *v4 = ScriptContext_GetVarPointer(ctx); + u16 *v5 = ScriptContext_GetVarPointer(ctx); v0 = sub_0203F098(ctx->fieldSystem, 19); v1 = (UnkStruct_0203E608 *)*v0; @@ -7997,13 +7992,13 @@ static const u16 Unk_020EAB8C[] = { 0x91 }; -BOOL ScrCmd_2F4 (ScriptContext * ctx) +BOOL ScrCmd_2F4(ScriptContext *ctx) { u16 v0, v1, v2, v3, v4; - u16 * v5 = ScriptContext_GetVarPointer(ctx); - u16 * v6 = ScriptContext_GetVarPointer(ctx); - u16 * v7 = ScriptContext_GetVarPointer(ctx); - u16 * v8 = ScriptContext_GetVarPointer(ctx); + u16 *v5 = ScriptContext_GetVarPointer(ctx); + u16 *v6 = ScriptContext_GetVarPointer(ctx); + u16 *v7 = ScriptContext_GetVarPointer(ctx); + u16 *v8 = ScriptContext_GetVarPointer(ctx); *v5 = 0xfff; *v6 = 0xfff; @@ -8033,7 +8028,7 @@ BOOL ScrCmd_2F4 (ScriptContext * ctx) return 0; } -static u8 sub_02046524 (u16 ctx, u16 param1, u16 param2, u16 param3) +static u8 sub_02046524(u16 ctx, u16 param1, u16 param2, u16 param3) { u16 v0; u8 v1; @@ -8062,7 +8057,7 @@ static u8 sub_02046524 (u16 ctx, u16 param1, u16 param2, u16 param3) return v0; } -static u8 sub_02046568 (u16 ctx, u16 param1, u16 param2, u16 param3) +static u8 sub_02046568(u16 ctx, u16 param1, u16 param2, u16 param3) { u16 v0; u8 v1; @@ -8091,11 +8086,11 @@ static u8 sub_02046568 (u16 ctx, u16 param1, u16 param2, u16 param3) return v0; } -static BOOL ScrCmd_2F6 (ScriptContext * ctx) +static BOOL ScrCmd_2F6(ScriptContext *ctx) { u16 v0 = ScriptContext_GetVar(ctx); u16 v1 = ScriptContext_GetVar(ctx); - u16 * v2 = ScriptContext_GetVarPointer(ctx); + u16 *v2 = ScriptContext_GetVarPointer(ctx); if (sub_02039074(ctx->fieldSystem->saveData)) { *v2 = 1; @@ -8108,10 +8103,10 @@ static BOOL ScrCmd_2F6 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_2F7 (ScriptContext * ctx) +static BOOL ScrCmd_2F7(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); - u16 * v1 = FieldSystem_GetVarPointer(ctx->fieldSystem, v0); + u16 *v1 = FieldSystem_GetVarPointer(ctx->fieldSystem, v0); if (sub_02039074(ctx->fieldSystem->saveData)) { sub_0205749C(ctx->taskManager, *v1); @@ -8120,15 +8115,15 @@ static BOOL ScrCmd_2F7 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_2FB (ScriptContext * ctx) +static BOOL ScrCmd_2FB(ScriptContext *ctx) { sub_020985E4(ctx->taskManager, ctx->fieldSystem->saveData); return 1; } -static BOOL ScrCmd_2FC (ScriptContext * ctx) +static BOOL ScrCmd_2FC(ScriptContext *ctx) { - u16 * v0 = ScriptContext_GetVarPointer(ctx); + u16 *v0 = ScriptContext_GetVarPointer(ctx); *v0 = 0; @@ -8143,15 +8138,15 @@ static BOOL ScrCmd_2FC (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_302 (ScriptContext * ctx) +static BOOL ScrCmd_302(ScriptContext *ctx) { u32 v0; - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v2 = ScriptContext_GetVarPointer(ctx); - u16 * v3 = ScriptContext_GetVarPointer(ctx); - u16 * v4 = ScriptContext_GetVarPointer(ctx); - u16 * v5 = ScriptContext_GetVarPointer(ctx); - u16 * v6 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v2 = ScriptContext_GetVarPointer(ctx); + u16 *v3 = ScriptContext_GetVarPointer(ctx); + u16 *v4 = ScriptContext_GetVarPointer(ctx); + u16 *v5 = ScriptContext_GetVarPointer(ctx); + u16 *v6 = ScriptContext_GetVarPointer(ctx); *v2 = 0; *v3 = 0; @@ -8184,17 +8179,17 @@ static BOOL ScrCmd_302 (ScriptContext * ctx) return 1; } -static u32 sub_0204676C (SaveData * saveData) +static u32 sub_0204676C(SaveData *saveData) { int v0; - Pokemon * v1; - BoxPokemon * v2; + Pokemon *v1; + BoxPokemon *v2; u32 v3; v3 = 0; { - Party * v4; + Party *v4; int v5; v4 = Party_GetFromSavedata(saveData); @@ -8210,8 +8205,8 @@ static u32 sub_0204676C (SaveData * saveData) } { - UnkStruct_02026310 * v6; - UnkStruct_02026218 * v7; + UnkStruct_02026310 *v6; + UnkStruct_02026218 *v7; v6 = sub_02026310(saveData); @@ -8226,7 +8221,7 @@ static u32 sub_0204676C (SaveData * saveData) } { - PCBoxes * v8; + PCBoxes *v8; u32 v9; v8 = SaveData_PCBoxes(saveData); @@ -8245,7 +8240,7 @@ static u32 sub_0204676C (SaveData * saveData) return v3; } -static BOOL ScrCmd_30A (ScriptContext * ctx) +static BOOL ScrCmd_30A(ScriptContext *ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); @@ -8253,27 +8248,27 @@ static BOOL ScrCmd_30A (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_311 (ScriptContext * ctx) +static BOOL ScrCmd_311(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_GetVar(ctx); ov9_0224F158(fieldSystem, v1); return 0; } -static BOOL ScrCmd_312 (ScriptContext * ctx) +static BOOL ScrCmd_312(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_GetVar(ctx); ov9_0224F16C(fieldSystem, v1); return 0; } -static BOOL ScrCmd_31F (ScriptContext * ctx) +static BOOL ScrCmd_31F(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; ov9_02249FD0(fieldSystem); return 0; @@ -8283,9 +8278,9 @@ u32 Unk_021C07E8; u32 Unk_021C07E4; u32 Unk_021C07EC; -static BOOL ScrCmd_313 (ScriptContext * ctx) +static BOOL ScrCmd_313(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_GetVar(ctx); u32 v2, v3, v4; @@ -8310,7 +8305,7 @@ static BOOL ScrCmd_313 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_320 (ScriptContext * ctx) +static BOOL ScrCmd_320(ScriptContext *ctx) { sub_0203E714(ctx->fieldSystem); ScriptContext_Pause(ctx, sub_02041D60); @@ -8318,27 +8313,27 @@ static BOOL ScrCmd_320 (ScriptContext * ctx) return 1; } -static BOOL ScrCmd_321 (ScriptContext * ctx) +static BOOL ScrCmd_321(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; u16 v1 = ScriptContext_GetVar(ctx); ov9_0224E884(fieldSystem, v1); return 0; } -static BOOL ScrCmd_322 (ScriptContext * ctx) +static BOOL ScrCmd_322(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; + FieldSystem *fieldSystem = ctx->fieldSystem; ov9_0224E8A8(fieldSystem); return 0; } -static BOOL ScrCmd_323 (ScriptContext * ctx) +static BOOL ScrCmd_323(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(ctx); + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(ctx); s64 v2; s64 v3; @@ -8354,17 +8349,17 @@ static BOOL ScrCmd_323 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_328 (ScriptContext * ctx) +static BOOL ScrCmd_328(ScriptContext *ctx) { - FieldSystem * fieldSystem = ctx->fieldSystem; - Party * v1; + FieldSystem *fieldSystem = ctx->fieldSystem; + Party *v1; u16 v2 = ScriptContext_GetVar(ctx); v1 = Party_GetFromSavedata(ctx->fieldSystem->saveData); Party_SetGiratinaForm(v1, v2); { int v3, v4; - Pokemon * v5; + Pokemon *v5; v4 = Party_GetCurrentCount(v1); @@ -8379,12 +8374,12 @@ static BOOL ScrCmd_328 (ScriptContext * ctx) return 0; } -static BOOL ScrCmd_32B (ScriptContext * ctx) +static BOOL ScrCmd_32B(ScriptContext *ctx) { u32 v0, v1; int v2, v3; - Pokemon * v4; - u16 * v5 = ScriptContext_GetVarPointer(ctx); + Pokemon *v4; + u16 *v5 = ScriptContext_GetVarPointer(ctx); *v5 = 0; v2 = Party_GetCurrentCount(Party_GetFromSavedata(ctx->fieldSystem->saveData)); diff --git a/src/screen_scroll_manager.c b/src/screen_scroll_manager.c index 4aecfde51b..dda6776db5 100644 --- a/src/screen_scroll_manager.c +++ b/src/screen_scroll_manager.c @@ -1,13 +1,14 @@ +#include "screen_scroll_manager.h" + #include #include #include "constants/heap.h" -#include "sys_task_manager.h" #include "buffer_manager.h" -#include "sys_task.h" -#include "screen_scroll_manager.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" static void ScreenScrollManager_StopDMA(void); static void ScreenScrollManager_StartDMA(const ScreenScrollManager *screenScrollMgr); diff --git a/src/strbuf.c b/src/strbuf.c index 3c59dfc785..e1394fb3ec 100644 --- a/src/strbuf.c +++ b/src/strbuf.c @@ -1,13 +1,14 @@ +#include "strbuf.h" + #include #include #include "constants/charcode.h" #include "heap.h" -#include "strbuf.h" #define SIZEOF_STRBUF_HEADER (sizeof(Strbuf) - sizeof(charcode_t)) -#define STRBUF_MAGIC_NUMBER (0xB6F8D2EC) +#define STRBUF_MAGIC_NUMBER (0xB6F8D2EC) static inline void Strbuf_Check(const Strbuf *strbuf) { @@ -15,7 +16,7 @@ static inline void Strbuf_Check(const Strbuf *strbuf) GF_ASSERT(strbuf->integrity == STRBUF_MAGIC_NUMBER); } -Strbuf* Strbuf_Init(u32 size, u32 heapID) +Strbuf *Strbuf_Init(u32 size, u32 heapID) { Strbuf *strbuf; @@ -61,7 +62,7 @@ void Strbuf_Copy(Strbuf *dst, const Strbuf *src) GF_ASSERT(FALSE); } -Strbuf* Strbuf_Clone(const Strbuf *src, u32 heapID) +Strbuf *Strbuf_Clone(const Strbuf *src, u32 heapID) { Strbuf_Check(src); @@ -134,7 +135,7 @@ void Strbuf_FormatInt(Strbuf *dst, int num, u32 maxDigits, enum PaddingMode padd if (paddingMode == PADDING_MODE_ZEROES) { dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_JP_QUESTION; - // If we hit a non-zero digit, flip the padding mode off + // If we hit a non-zero digit, flip the padding mode off } else if (digit != 0 || div == 1) { paddingMode = PADDING_MODE_ZEROES; dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_JP_QUESTION; @@ -318,7 +319,7 @@ void Strbuf_CopyLineNum(Strbuf *dst, const Strbuf *src, u32 lineNum) Strbuf_Clear(dst); - for ( ; i < src->size; i++) { + for (; i < src->size; i++) { if (src->data[i] == CHAR_CR) { break; } @@ -382,7 +383,7 @@ void Strbuf_ToChars(const Strbuf *src, charcode_t *dst, u32 dstSize) GF_ASSERT(FALSE); } -const charcode_t* Strbuf_GetData(const Strbuf *src) +const charcode_t *Strbuf_GetData(const Strbuf *src) { Strbuf_Check(src); @@ -416,9 +417,9 @@ void Strbuf_AppendChar(Strbuf *dst, charcode_t c) GF_ASSERT(FALSE); } -#define COMPRESSED_LEADER (0xF100) -#define COMPRESSED_MASK (0x01FF) -#define COMPRESSED_EOS (0x01FF) // 0xFFFF & 0x01FF +#define COMPRESSED_LEADER (0xF100) +#define COMPRESSED_MASK (0x01FF) +#define COMPRESSED_EOS (0x01FF) // 0xFFFF & 0x01FF BOOL Strbuf_IsTrainerName(Strbuf *strbuf) { diff --git a/src/string_template.c b/src/string_template.c index b9432f7b07..6a1d23ed8c 100644 --- a/src/string_template.c +++ b/src/string_template.c @@ -1,38 +1,35 @@ -#include "constants/charcode.h" -#include "constants/heap.h" -#include "enums.h" +#include "string_template.h" #include #include +#include "constants/charcode.h" +#include "constants/heap.h" +#include "constants/narc.h" +#include "constants/pokemon.h" #include "consts/abilities.h" #include "consts/gender.h" #include "consts/moves.h" +#include "struct_decls/struct_0202B4A0_decl.h" +#include "struct_decls/struct_020797DC_decl.h" +#include "struct_defs/trainer_data.h" + #include "gmm/message_bank_common_strings.h" #include "gmm/message_bank_common_strings_2.h" #include "gmm/message_bank_mystery_gift_event_names.h" #include "gmm/message_bank_special_met_location_names.h" - -#include "constants/narc.h" -#include "constants/pokemon.h" #include "text/pl_msg.naix" -#include "struct_decls/struct_0202B4A0_decl.h" -#include "struct_decls/struct_020797DC_decl.h" - -#include "struct_defs/trainer_data.h" - #include "charcode.h" +#include "enums.h" #include "heap.h" #include "message.h" #include "pokemon.h" #include "savedata.h" #include "savedata_misc.h" #include "strbuf.h" -#include "string_template.h" #include "trainer_info.h" - #include "unk_02014D38.h" #include "unk_02017038.h" #include "unk_02025E08.h" @@ -60,7 +57,7 @@ StringTemplate *StringTemplate_New(u32 maxArgs, u32 maxLen, u32 heapID) goto cleanup; } - tmp->maxArgs= maxArgs; + tmp->maxArgs = maxArgs; tmp->heapID = heapID; tmp->templateBuf = Strbuf_Init(maxLen, heapID); if (tmp->templateBuf == NULL) { @@ -484,7 +481,7 @@ void StringTemplate_SetMetLocationName(StringTemplate *template, u32 idx, u32 lo if (loader) { if (metLocationID < MessageLoader_MessageCount(loader) - && (!(metLocationType == 0 && metLocationID == 0))) { + && (!(metLocationType == 0 && metLocationID == 0))) { MessageLoader_GetStrbuf(loader, metLocationID, template->templateBuf); SetStringTemplateArg(template, idx, template->templateBuf, NULL); MessageLoader_Free(loader); @@ -666,4 +663,3 @@ void StringTemplate_ClearArgs(StringTemplate *template) Strbuf_Clear(template->args[i].strbuf); } } - diff --git a/src/sys_task.c b/src/sys_task.c index e1a5be5fb5..e49b9410ba 100644 --- a/src/sys_task.c +++ b/src/sys_task.c @@ -1,8 +1,9 @@ +#include "sys_task.h" + #include #include #include "core_sys.h" -#include "sys_task.h" #include "sys_task_manager.h" SysTask *SysTask_Start(SysTaskFunc callback, void *param, u32 priority) diff --git a/src/sys_task_manager.c b/src/sys_task_manager.c index 7f291980a8..af7a224bca 100644 --- a/src/sys_task_manager.c +++ b/src/sys_task_manager.c @@ -1,9 +1,8 @@ -#include -#include +#include "sys_task_manager.h" #include "nitro/types.h" - -#include "sys_task_manager.h" +#include +#include static void SysTaskManager_InitTask(SysTaskManager *sysTaskMgr, SysTask *task); static void SysTaskManager_InitTasks(SysTaskManager *sysTaskMgr); diff --git a/src/touch_screen.c b/src/touch_screen.c index db8d1cfb91..22c1d3eb70 100644 --- a/src/touch_screen.c +++ b/src/touch_screen.c @@ -1,15 +1,15 @@ +#include "touch_screen.h" + #include #include #include "core_sys.h" -#include "touch_screen.h" - static int sub_02022594(const TouchScreenRect *rect, u32 param1, u32 param2); static BOOL sub_020225E0(const TouchScreenHitTable *hitTable, u32 param1, u32 param2); static BOOL sub_0202260C(const TouchScreenHitTable *hitTable, u32 param1, u32 param2); -static int sub_02022594 (const TouchScreenRect *rect, u32 param1, u32 param2) +static int sub_02022594(const TouchScreenRect *rect, u32 param1, u32 param2) { int v0; @@ -22,7 +22,7 @@ static int sub_02022594 (const TouchScreenRect *rect, u32 param1, u32 param2) return 0xffffffff; } -static BOOL sub_020225E0 (const TouchScreenHitTable *hitTable, u32 param1, u32 param2) +static BOOL sub_020225E0(const TouchScreenHitTable *hitTable, u32 param1, u32 param2) { param1 = (hitTable->circle.x - param1) * (hitTable->circle.x - param1); param2 = (hitTable->circle.y - param2) * (hitTable->circle.y - param2); @@ -34,7 +34,7 @@ static BOOL sub_020225E0 (const TouchScreenHitTable *hitTable, u32 param1, u32 p return 0; } -static BOOL sub_0202260C (const TouchScreenHitTable *hitTable, u32 param1, u32 param2) +static BOOL sub_0202260C(const TouchScreenHitTable *hitTable, u32 param1, u32 param2) { if (((u32)(param1 - hitTable->rect.left) < (u32)(hitTable->rect.right - hitTable->rect.left)) & ((u32)(param2 - hitTable->rect.top) < (u32)(hitTable->rect.bottom - hitTable->rect.top))) { return 1; @@ -43,7 +43,7 @@ static BOOL sub_0202260C (const TouchScreenHitTable *hitTable, u32 param1, u32 p return 0; } -int sub_02022644 (const TouchScreenRect *rect) +int sub_02022644(const TouchScreenRect *rect) { if (gCoreSys.touchHeld) { return sub_02022594(rect, gCoreSys.touchX, gCoreSys.touchY); @@ -52,7 +52,7 @@ int sub_02022644 (const TouchScreenRect *rect) return 0xffffffff; } -int sub_02022664 (const TouchScreenRect *rect) +int sub_02022664(const TouchScreenRect *rect) { if (gCoreSys.touchPressed) { return sub_02022594(rect, gCoreSys.touchX, gCoreSys.touchY); @@ -61,7 +61,7 @@ int sub_02022664 (const TouchScreenRect *rect) return 0xffffffff; } -int sub_02022684 (const TouchScreenHitTable *hitTable) +int sub_02022684(const TouchScreenHitTable *hitTable) { if (gCoreSys.touchHeld) { int v0; @@ -82,7 +82,7 @@ int sub_02022684 (const TouchScreenHitTable *hitTable) return 0xffffffff; } -int sub_020226DC (const TouchScreenHitTable *hitTable) +int sub_020226DC(const TouchScreenHitTable *hitTable) { if (gCoreSys.touchPressed) { int v0; @@ -150,7 +150,7 @@ BOOL TouchScreen_GetHoldState(u32 *x, u32 *y) return FALSE; } -BOOL TouchScreen_GetTapState(u32 * x, u32 * y) +BOOL TouchScreen_GetTapState(u32 *x, u32 *y) { if (gCoreSys.touchPressed) { *x = gCoreSys.touchX; @@ -161,7 +161,7 @@ BOOL TouchScreen_GetTapState(u32 * x, u32 * y) return FALSE; } -int sub_020227DC (const TouchScreenHitTable *hitTable, u32 param1, u32 param2) +int sub_020227DC(const TouchScreenHitTable *hitTable, u32 param1, u32 param2) { int v0; @@ -180,7 +180,7 @@ int sub_020227DC (const TouchScreenHitTable *hitTable, u32 param1, u32 param2) return 0xffffffff; } -BOOL sub_02022830 (const TouchScreenHitTable *hitTable, u32 param1, u32 param2) +BOOL sub_02022830(const TouchScreenHitTable *hitTable, u32 param1, u32 param2) { if (hitTable->circle.code == TOUCHSCREEN_USE_CIRCLE) { return sub_020225E0(hitTable, param1, param2); diff --git a/src/trainer_data.c b/src/trainer_data.c index 95fcb548d8..747ddf5392 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -1,3 +1,5 @@ +#include "struct_defs/trainer_data.h" + #include #include @@ -5,11 +7,9 @@ #include "constants/pokemon.h" #include "constants/trainer.h" -#include "data/trainer_class_genders.h" - #include "struct_decls/struct_02006C24_decl.h" -#include "savedata.h" -#include "struct_defs/trainer_data.h" + +#include "data/trainer_class_genders.h" #include "overlay006/battle_params.h" #include "heap.h" @@ -17,11 +17,12 @@ #include "narc.h" #include "party.h" #include "pokemon.h" +#include "savedata.h" +#include "savedata_misc.h" #include "strbuf.h" #include "trainer_data.h" #include "unk_020021B0.h" #include "unk_0201D15C.h" -#include "savedata_misc.h" static void TrainerData_BuildParty(BattleParams *battleParams, int battler, int heapID); @@ -35,7 +36,7 @@ void TrainerData_Encounter(BattleParams *battleParams, const SaveData *save, int if (!battleParams->trainerIDs[i]) { continue; } - + TrainerData_Load(battleParams->trainerIDs[i], &trdata); battleParams->trainerData[i] = trdata; @@ -170,7 +171,7 @@ u8 TrainerClass_Gender(int trclass) /** * @brief Build the party for a trainer as loaded in the BattleParams struct. - * + * * @param battleParams The parent BattleParams struct containing trainer data. * @param battler Which battler's party is to be loaded. * @param heapID Heap on which to perform any allocations. @@ -195,7 +196,8 @@ static void TrainerData_BuildParty(BattleParams *battleParams, int battler, int // determine which magic gender-specific modifier to use for the RNG function genderMod = TrainerClass_Gender(battleParams->trainerData[battler].class) == GENDER_FEMALE - ? 120 : 136; + ? 120 + : 136; switch (battleParams->trainerData[battler].type) { case TRDATATYPE_BASE: { diff --git a/src/trainer_info.c b/src/trainer_info.c index 1e7d8d4385..9897b2c704 100644 --- a/src/trainer_info.c +++ b/src/trainer_info.c @@ -1,13 +1,13 @@ +#include "trainer_info.h" + #include #include #include "constants/charcode.h" -#include "unk_020021B0.h" - #include "heap.h" #include "strbuf.h" -#include "trainer_info.h" +#include "unk_020021B0.h" #define MONEY_MAX 999999 @@ -16,7 +16,7 @@ int TrainerInfo_Size(void) return sizeof(TrainerInfo); } -TrainerInfo* TrainerInfo_New(u32 heapID) +TrainerInfo *TrainerInfo_New(u32 heapID) { TrainerInfo *info = Heap_AllocFromHeap(heapID, sizeof(TrainerInfo)); TrainerInfo_Init(info); @@ -29,7 +29,6 @@ void TrainerInfo_Copy(const TrainerInfo *src, TrainerInfo *dst) MI_CpuCopy8(src, dst, sizeof(TrainerInfo)); } - void TrainerInfo_Init(TrainerInfo *info) { memset(info, 0, sizeof(TrainerInfo)); @@ -62,7 +61,7 @@ void TrainerInfo_SetNameFromStrbuf(TrainerInfo *info, const Strbuf *name) Strbuf_ToChars(name, info->name, TRAINER_NAME_LEN + 1); } -const charcode_t* TrainerInfo_Name(const TrainerInfo *info) +const charcode_t *TrainerInfo_Name(const TrainerInfo *info) { return info->name; } @@ -72,7 +71,7 @@ void TrainerInfo_NameStrbuf(const TrainerInfo *info, Strbuf *name) Strbuf_CopyChars(name, info->name); } -Strbuf* TrainerInfo_NameNewStrbuf(const TrainerInfo *info, int heapID) +Strbuf *TrainerInfo_NameNewStrbuf(const TrainerInfo *info, int heapID) { Strbuf *name = Strbuf_Init(TRAINER_NAME_LEN + 1, heapID); @@ -230,5 +229,5 @@ BOOL TrainerInfo_HasNationalDex(TrainerInfo *info) BOOL TrainerInfo_Equals(const TrainerInfo *info1, const TrainerInfo *info2) { return GF_strncmp(info1->name, info2->name, TRAINER_NAME_LEN) == 0 - && info1->id == info2->id; + && info1->id == info2->id; } diff --git a/src/unk_0200112C.c b/src/unk_0200112C.c index 44da2eb945..dbdc7e9838 100644 --- a/src/unk_0200112C.c +++ b/src/unk_0200112C.c @@ -1,19 +1,19 @@ +#include "unk_0200112C.h" + #include -#include #include - -#include "core_sys.h" +#include #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_020149F0_decl.h" - #include "struct_defs/struct_02013A04_t.h" + #include "overlay084/struct_ov84_02240FA8.h" -#include "unk_0200112C.h" +#include "core_sys.h" +#include "heap.h" #include "unk_02002B7C.h" #include "unk_020149F0.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" @@ -30,7 +30,7 @@ typedef struct { typedef struct UnkStruct_0200112C_t { UnkStruct_ov84_02240FA8 unk_00; UnkStruct_0200112C_sub1 unk_1F; - UnkStruct_020149F0 * unk_24; + UnkStruct_020149F0 *unk_24; u16 unk_28; u16 unk_2A; u8 unk_2C; @@ -40,18 +40,18 @@ typedef struct UnkStruct_0200112C_t { u8 unk_30; } BmpList; -static void sub_020015D0(BmpList * param0, void * param1, u8 param2, u8 param3); -static void sub_02001688(BmpList * param0, u16 param1, u16 param2, u16 param3); -static void sub_02001720(BmpList * param0); -static void sub_02001778(BmpList * param0, u16 param1); -static u8 sub_020017E0(BmpList * param0, u8 param1); -static void sub_02001900(BmpList * param0, u8 param1, u8 param2); -static u8 sub_02001A18(BmpList * param0, u8 param1, u8 param2, u8 param3); -static void sub_02001AD8(BmpList * param0, u8 param1); +static void sub_020015D0(BmpList *param0, void *param1, u8 param2, u8 param3); +static void sub_02001688(BmpList *param0, u16 param1, u16 param2, u16 param3); +static void sub_02001720(BmpList *param0); +static void sub_02001778(BmpList *param0, u16 param1); +static u8 sub_020017E0(BmpList *param0, u8 param1); +static void sub_02001900(BmpList *param0, u8 param1, u8 param2); +static u8 sub_02001A18(BmpList *param0, u8 param1, u8 param2, u8 param3); +static void sub_02001AD8(BmpList *param0, u8 param1); -BmpList * sub_0200112C (const UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3) +BmpList *sub_0200112C(const UnkStruct_ov84_02240FA8 *param0, u16 param1, u16 param2, u8 param3) { - BmpList * v0 = (BmpList *)Heap_AllocFromHeap(param3, sizeof(BmpList)); + BmpList *v0 = (BmpList *)Heap_AllocFromHeap(param3, sizeof(BmpList)); v0->unk_00 = *param0; v0->unk_24 = sub_020149F0(param3); @@ -84,7 +84,7 @@ BmpList * sub_0200112C (const UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 return v0; } -u32 sub_02001288 (BmpList * param0) +u32 sub_02001288(BmpList *param0) { u16 v0, v1; @@ -149,7 +149,7 @@ u32 sub_02001288 (BmpList * param0) return 0xffffffff; } -void sub_02001384 (BmpList * param0, u16 * param1, u16 * param2) +void sub_02001384(BmpList *param0, u16 *param1, u16 *param2) { if (param1 != NULL) { *param1 = param0->unk_28; @@ -163,7 +163,7 @@ void sub_02001384 (BmpList * param0, u16 * param1, u16 * param2) Heap_FreeToHeapExplicit(param0->unk_30, param0); } -void sub_020013AC (BmpList * param0) +void sub_020013AC(BmpList *param0) { BGL_FillWindow(param0->unk_00.unk_0C, param0->unk_00.unk_18_0); sub_02001688(param0, param0->unk_28, 0, param0->unk_00.unk_12); @@ -171,14 +171,14 @@ void sub_020013AC (BmpList * param0) sub_0201A954(param0->unk_00.unk_0C); } -void sub_020013D8 (BmpList * param0, u8 param1, u8 param2, u8 param3) +void sub_020013D8(BmpList *param0, u8 param1, u8 param2, u8 param3) { param0->unk_00.unk_17_4 = param1; param0->unk_00.unk_18_0 = param2; param0->unk_00.unk_18_4 = param3; } -u32 sub_02001408 (BmpList * param0, UnkStruct_ov84_02240FA8 * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 * param6, u16 * param7) +u32 sub_02001408(BmpList *param0, UnkStruct_ov84_02240FA8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 *param6, u16 *param7) { if (param1) { param0->unk_00 = *param1; @@ -206,7 +206,7 @@ u32 sub_02001408 (BmpList * param0, UnkStruct_ov84_02240FA8 * param1, u16 param2 return 0xffffffff; } -void sub_0200147C (BmpList * param0, u8 param1, u8 param2, u8 param3) +void sub_0200147C(BmpList *param0, u8 param1, u8 param2, u8 param3) { param0->unk_1F.unk_00_0 = param1; param0->unk_1F.unk_00_4 = param2; @@ -214,12 +214,12 @@ void sub_0200147C (BmpList * param0, u8 param1, u8 param2, u8 param3) param0->unk_1F.unk_04_7 = 1; } -void sub_020014D0 (BmpList * param0, u16 * param1) +void sub_020014D0(BmpList *param0, u16 *param1) { *param1 = (u16)(param0->unk_28 + param0->unk_2A); } -void sub_020014DC (BmpList * param0, u16 * param1, u16 * param2) +void sub_020014DC(BmpList *param0, u16 *param1, u16 *param2) { if (param1 != NULL) { *param1 = param0->unk_28; @@ -230,17 +230,17 @@ void sub_020014DC (BmpList * param0, u16 * param1, u16 * param2) } } -u8 sub_020014F0 (BmpList * param0) +u8 sub_020014F0(BmpList *param0) { return param0->unk_2F; } -u32 sub_020014F8 (BmpList * param0, u16 param1) +u32 sub_020014F8(BmpList *param0, u16 param1) { return param0->unk_00.unk_00[param1].unk_04; } -u32 sub_02001504 (BmpList * param0, u8 param1) +u32 sub_02001504(BmpList *param0, u8 param1) { u32 v0; @@ -309,12 +309,12 @@ u32 sub_02001504 (BmpList * param0, u8 param1) return v0; } -void sub_020015CC (BmpList * param0, ResourceMetadata * param1) +void sub_020015CC(BmpList *param0, ResourceMetadata *param1) { param0->unk_00.unk_00 = param1; } -static void sub_020015D0 (BmpList * param0, void * param1, u8 param2, u8 param3) +static void sub_020015D0(BmpList *param0, void *param1, u8 param2, u8 param3) { if (param1 == NULL) { return; @@ -327,7 +327,7 @@ static void sub_020015D0 (BmpList * param0, void * param1, u8 param2, u8 param3) } } -static void sub_02001688 (BmpList * param0, u16 param1, u16 param2, u16 param3) +static void sub_02001688(BmpList *param0, u16 param1, u16 param2, u16 param3) { int v0; u8 v1, v2, v3; @@ -352,7 +352,7 @@ static void sub_02001688 (BmpList * param0, u16 param1, u16 param2, u16 param3) } } -static void sub_02001720 (BmpList * param0) +static void sub_02001720(BmpList *param0) { u8 v0, v1, v2; @@ -373,7 +373,7 @@ static void sub_02001720 (BmpList * param0) } } -static void sub_02001778 (BmpList * param0, u16 param1) +static void sub_02001778(BmpList *param0, u16 param1) { u8 v0; @@ -389,7 +389,7 @@ static void sub_02001778 (BmpList * param0, u16 param1) } } -static u8 sub_020017E0 (BmpList * param0, u8 param1) +static u8 sub_020017E0(BmpList *param0, u8 param1) { u16 v0, v1, v2; @@ -467,7 +467,7 @@ static u8 sub_020017E0 (BmpList * param0, u8 param1) return 2; } -static void sub_02001900 (BmpList * param0, u8 param1, u8 param2) +static void sub_02001900(BmpList *param0, u8 param1, u8 param2) { u8 v0; u16 v1; @@ -494,7 +494,7 @@ static void sub_02001900 (BmpList * param0, u8 param1, u8 param2) } } -static u8 sub_02001A18 (BmpList * param0, u8 param1, u8 param2, u8 param3) +static u8 sub_02001A18(BmpList *param0, u8 param1, u8 param2, u8 param3) { u16 v0; u8 v1, v2; @@ -543,7 +543,7 @@ static u8 sub_02001A18 (BmpList * param0, u8 param1, u8 param2, u8 param3) return 0; } -static void sub_02001AD8 (BmpList * param0, u8 param1) +static void sub_02001AD8(BmpList *param0, u8 param1) { if (param0->unk_00.unk_04 != NULL) { param0->unk_00.unk_04(param0, param0->unk_00.unk_00[param0->unk_28 + param0->unk_2A].unk_04, param1); diff --git a/src/unk_02001AF4.c b/src/unk_02001AF4.c index 17e43c4b25..51883d096e 100644 --- a/src/unk_02001AF4.c +++ b/src/unk_02001AF4.c @@ -1,32 +1,31 @@ +#include "unk_02001AF4.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_020149F0_decl.h" #include "struct_decls/struct_02018340_decl.h" - #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02081CF4.h" + #include "overlay061/struct_ov61_0222C884.h" -#include "unk_02001AF4.h" +#include "core_sys.h" +#include "heap.h" +#include "message.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "message.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" #include "unk_020149F0.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" typedef struct UIControlData_t { UnkStruct_02081CF4 unk_00; - UnkStruct_020149F0 * unk_0C; + UnkStruct_020149F0 *unk_0C; u32 unk_10; u8 unk_14; u8 unk_15; @@ -39,18 +38,18 @@ typedef struct UIControlData_t { u8 unk_1C; } UIControlData; -static void sub_0200DB10(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7); -static void sub_0200DD7C(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7); -static BOOL sub_02001DCC(UIControlData * param0, u8 param1, u16 param2); -static u8 sub_02001E24(UIControlData * param0, u8 param1); -static u8 sub_02001F1C(UIControlData * param0); -static void sub_02001F5C(UIControlData * param0); -static void sub_02001FE8(UIControlData * param0); -static void sub_02002018(UIControlData * param0, u8 * param1, u8 * param2, u8 param3); +static void sub_0200DB10(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7); +static void sub_0200DD7C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7); +static BOOL sub_02001DCC(UIControlData *param0, u8 param1, u16 param2); +static u8 sub_02001E24(UIControlData *param0, u8 param1); +static u8 sub_02001F1C(UIControlData *param0); +static void sub_02001F5C(UIControlData *param0); +static void sub_02001FE8(UIControlData *param0); +static void sub_02002018(UIControlData *param0, u8 *param1, u8 *param2, u8 param3); -UIControlData * sub_02001AF4 (const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5) +UIControlData *sub_02001AF4(const UnkStruct_02081CF4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5) { - UIControlData * v0 = (UIControlData *)Heap_AllocFromHeap(param4, sizeof(UIControlData)); + UIControlData *v0 = (UIControlData *)Heap_AllocFromHeap(param4, sizeof(UIControlData)); v0->unk_00 = *param0; v0->unk_0C = sub_020149F0(param4); @@ -69,20 +68,20 @@ UIControlData * sub_02001AF4 (const UnkStruct_02081CF4 * param0, u8 param1, u8 p return v0; } -UIControlData * sub_02001B7C (const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5) +UIControlData *sub_02001B7C(const UnkStruct_02081CF4 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5) { - UIControlData * v0 = sub_02001AF4(param0, param1, param2, param3, param4, param5); + UIControlData *v0 = sub_02001AF4(param0, param1, param2, param3, param4, param5); sub_0201A954(v0->unk_00.unk_04); return v0; } -UIControlData * sub_02001B9C (const UnkStruct_02081CF4 * param0, u8 param1, u8 param2) +UIControlData *sub_02001B9C(const UnkStruct_02081CF4 *param0, u8 param1, u8 param2) { return sub_02001B7C(param0, sub_02002DF8(param0->unk_08, 0), 0, param1, param2, PAD_BUTTON_B); } -void sub_02001BC4 (UIControlData * param0, u8 * param1) +void sub_02001BC4(UIControlData *param0, u8 *param1) { if (param1 != NULL) { *param1 = param0->unk_15; @@ -92,7 +91,7 @@ void sub_02001BC4 (UIControlData * param0, u8 * param1) Heap_FreeToHeapExplicit(param0->unk_1C, param0); } -u32 sub_02001BE0 (UIControlData * param0) +u32 sub_02001BE0(UIControlData *param0) { param0->unk_1B = 0; @@ -141,7 +140,7 @@ u32 sub_02001BE0 (UIControlData * param0) return 0xffffffff; } -u32 sub_02001C94 (UIControlData * param0, u16 param1) +u32 sub_02001C94(UIControlData *param0, u16 param1) { param0->unk_1B = 0; @@ -190,7 +189,7 @@ u32 sub_02001C94 (UIControlData * param0, u16 param1) return 0xffffffff; } -u32 sub_02001D44 (UIControlData * param0, u8 param1) +u32 sub_02001D44(UIControlData *param0, u8 param1) { switch (param1) { case 0: @@ -216,17 +215,17 @@ u32 sub_02001D44 (UIControlData * param0, u8 param1) return 0xffffffff; } -u8 sub_02001DC4 (UIControlData * param0) +u8 sub_02001DC4(UIControlData *param0) { return param0->unk_15; } -u8 sub_02001DC8 (UIControlData * param0) +u8 sub_02001DC8(UIControlData *param0) { return param0->unk_1B; } -static BOOL sub_02001DCC (UIControlData * param0, u8 param1, u16 param2) +static BOOL sub_02001DCC(UIControlData *param0, u8 param1, u16 param2) { u8 v0 = param0->unk_15; @@ -250,7 +249,7 @@ static BOOL sub_02001DCC (UIControlData * param0, u8 param1, u16 param2) return 1; } -static u8 sub_02001E24 (UIControlData * param0, u8 param1) +static u8 sub_02001E24(UIControlData *param0, u8 param1) { s8 v0; @@ -320,7 +319,7 @@ static u8 sub_02001E24 (UIControlData * param0, u8 param1) return 1; } -static u8 sub_02001F1C (UIControlData * param0) +static u8 sub_02001F1C(UIControlData *param0) { u8 v0 = 0; u8 v1, v2; @@ -336,9 +335,9 @@ static u8 sub_02001F1C (UIControlData * param0) return v0; } -static void sub_02001F5C (UIControlData * param0) +static void sub_02001F5C(UIControlData *param0) { - const void * v0; + const void *v0; u8 v1, v2, v3; u8 v4, v5; @@ -359,7 +358,7 @@ static void sub_02001F5C (UIControlData * param0) } } -static void sub_02001FE8 (UIControlData * param0) +static void sub_02001FE8(UIControlData *param0) { u8 v0, v1; @@ -371,17 +370,17 @@ static void sub_02001FE8 (UIControlData * param0) sub_02014A58(param0->unk_0C, param0->unk_00.unk_04, v0, v1); } -static void sub_02002018 (UIControlData * param0, u8 * param1, u8 * param2, u8 param3) +static void sub_02002018(UIControlData *param0, u8 *param1, u8 *param2, u8 param3) { *param1 = (param3 / param0->unk_00.unk_0A) * (param0->unk_16 + param0->unk_19 * 2); *param2 = (param3 % param0->unk_00.unk_0A) * (param0->unk_1A + param0->unk_00.unk_0B_0) + param0->unk_18; } -UIControlData * sub_02002054 (BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u8 param4, u32 param5) +UIControlData *sub_02002054(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u8 param4, u32 param5) { UnkStruct_02081CF4 v0; - MessageLoader * v1; - ResourceMetadata * v2; + MessageLoader *v1; + ResourceMetadata *v2; v1 = MessageLoader_Init(1, 26, 361, param5); v2 = sub_02013A04(2, param5); @@ -405,12 +404,12 @@ UIControlData * sub_02002054 (BGL * param0, const UnkStruct_ov61_0222C884 * para return sub_02001B7C(&v0, 8, 0, param4, param5, PAD_BUTTON_B); } -UIControlData * sub_02002100 (BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u32 param4) +UIControlData *sub_02002100(BGL *param0, const UnkStruct_ov61_0222C884 *param1, u16 param2, u8 param3, u32 param4) { return sub_02002054(param0, param1, param2, param3, 0, param4); } -u32 sub_02002114 (UIControlData * param0, u32 param1) +u32 sub_02002114(UIControlData *param0, u32 param1) { u32 v0 = sub_02001BE0(param0); @@ -421,7 +420,7 @@ u32 sub_02002114 (UIControlData * param0, u32 param1) return v0; } -u32 sub_02002134 (UIControlData * param0, u8 param1, u32 param2) +u32 sub_02002134(UIControlData *param0, u8 param1, u32 param2) { u32 v0 = sub_02001D44(param0, param1); @@ -432,7 +431,7 @@ u32 sub_02002134 (UIControlData * param0, u8 param1, u32 param2) return v0; } -void sub_02002154 (UIControlData * param0, u32 param1) +void sub_02002154(UIControlData *param0, u32 param1) { Window_Clear(param0->unk_00.unk_04, 0); BGL_DeleteWindow(param0->unk_00.unk_04); @@ -441,7 +440,7 @@ void sub_02002154 (UIControlData * param0, u32 param1) sub_02001BC4(param0, NULL); } -void sub_02002180 (Window * param0, u32 param1, u32 param2) +void sub_02002180(Window *param0, u32 param1, u32 param2) { static const u8 v0[] = { 0xff, diff --git a/src/unk_020021B0.c b/src/unk_020021B0.c index 2859c9a90c..00e9204802 100644 --- a/src/unk_020021B0.c +++ b/src/unk_020021B0.c @@ -1,8 +1,8 @@ +#include "unk_020021B0.h" + #include #include -#include "unk_020021B0.h" - static const u16 Unk_020E4C88[] = { 0xA2, 0xA3, @@ -35,7 +35,7 @@ static const int Unk_020E4CA8[] = { 1000000000, }; -u16 * GF_strcpy (u16 * param0, const u16 * param1) +u16 *GF_strcpy(u16 *param0, const u16 *param1) { while (*param1 != 0xffff) { *param0 = *param1; @@ -47,7 +47,7 @@ u16 * GF_strcpy (u16 * param0, const u16 * param1) return param0; } -u16 * sub_020021D0 (u16 * param0, const u16 * param1, u32 param2) +u16 *sub_020021D0(u16 *param0, const u16 *param1, u32 param2) { u32 v0; @@ -58,7 +58,7 @@ u16 * sub_020021D0 (u16 * param0, const u16 * param1, u32 param2) return ¶m0[param2]; } -u32 GF_strlen (const u16 * param0) +u32 GF_strlen(const u16 *param0) { u32 v0 = 0; @@ -69,7 +69,7 @@ u32 GF_strlen (const u16 * param0) return v0; } -BOOL GF_strcmp (const u16 * param0, const u16 * param1) +BOOL GF_strcmp(const u16 *param0, const u16 *param1) { while (*param0 == *param1) { if (*param0 == 0xffff) { @@ -83,7 +83,7 @@ BOOL GF_strcmp (const u16 * param0, const u16 * param1) return 1; } -BOOL GF_strncmp (const u16 * param0, const u16 * param1, u32 param2) +BOOL GF_strncmp(const u16 *param0, const u16 *param1, u32 param2) { while (*param0 == *param1) { if (param2 == 0) { @@ -102,7 +102,7 @@ BOOL GF_strncmp (const u16 * param0, const u16 * param1, u32 param2) return 1; } -u16 * sub_02002278 (u16 * param0, u16 param1, u32 param2) +u16 *sub_02002278(u16 *param0, u16 param1, u32 param2) { u32 v0; @@ -113,12 +113,12 @@ u16 * sub_02002278 (u16 * param0, u16 param1, u32 param2) return ¶m0[v0]; } -u16 * sub_02002294 (u16 * param0, u32 param1) +u16 *sub_02002294(u16 *param0, u32 param1) { return sub_02002278(param0, 0xffff, param1); } -u16 * sub_020022A4 (u16 * param0, s32 param1, u32 param2, u32 param3) +u16 *sub_020022A4(u16 *param0, s32 param1, u32 param2, u32 param3) { u32 v0; u32 v1; diff --git a/src/unk_02002328.c b/src/unk_02002328.c index 76ba60b793..ce0f41e206 100644 --- a/src/unk_02002328.c +++ b/src/unk_02002328.c @@ -1,27 +1,26 @@ +#include "unk_02002328.h" + #include #include -#include "core_sys.h" - #include "struct_defs/struct_02002328.h" #include "struct_defs/struct_02002D18.h" #include "struct_defs/struct_0201D834.h" #include "struct_defs/struct_02101D44.h" -#include "unk_02002328.h" +#include "charcode.h" +#include "core_sys.h" #include "unk_02002B7C.h" #include "unk_02005474.h" #include "unk_02018340.h" -#include "charcode.h" #include "unk_0201D670.h" static UnkStruct_02101D44 Unk_02101D44; - -int sub_02002328 (UnkStruct_0201D834 * param0) +int sub_02002328(UnkStruct_0201D834 *param0) { - const UnkStruct_02002328 * v0; - UnkStruct_02002D18 * v1; + const UnkStruct_02002328 *v0; + UnkStruct_02002D18 *v1; int v2, v3; u16 v4; @@ -71,8 +70,7 @@ int sub_02002328 (UnkStruct_0201D834 * param0) v4 = CharCode_FormatArgType(param0->unk_00.unk_00_val1); switch (v4) { - case 0xff00: - { + case 0xff00: { u16 v5 = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); if (v5 == 255) { @@ -94,10 +92,8 @@ int sub_02002328 (UnkStruct_0201D834 * param0) param0->unk_00.unk_17 = 1 + (v5 * 2) + 1; sub_0201D9FC(param0->unk_00.unk_15, param0->unk_00.unk_16, param0->unk_00.unk_17); - } - break; - case 0x200: - { + } break; + case 0x200: { u16 v7 = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); sub_0201DB8C(param0, param0->unk_00.unk_0C, param0->unk_00.unk_0E, v7); } @@ -106,14 +102,12 @@ int sub_02002328 (UnkStruct_0201D834 * param0) sub_0201A954(param0->unk_00.unk_04); } break; - case 0x201: - { + case 0x201: { param0->unk_2A = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); param0->unk_00.unk_00_val1 = CharCode_SkipFormatArg(param0->unk_00.unk_00_val1); param0->unk_28 = 6; return 3; - } - break; + } break; case 0x202: param0->unk_2E = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); param0->unk_00.unk_00_val1 = CharCode_SkipFormatArg(param0->unk_00.unk_00_val1); @@ -124,8 +118,7 @@ int sub_02002328 (UnkStruct_0201D834 * param0) case 0x204: param0->unk_00.unk_0E = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); break; - case 0xff01: - { + case 0xff01: { u16 v8 = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); switch (v8) { @@ -138,10 +131,8 @@ int sub_02002328 (UnkStruct_0201D834 * param0) param0->unk_00.unk_1A = 0; break; } - } - break; - case 0xfe06: - { + } break; + case 0xfe06: { u16 v9 = CharCode_FormatArgParam(param0->unk_00.unk_00_val1, 0); switch (v9) { @@ -156,8 +147,7 @@ int sub_02002328 (UnkStruct_0201D834 * param0) param0->unk_00.unk_00_val1 = CharCode_SkipFormatArg(param0->unk_00.unk_00_val1); return 3; } - } - break; + } break; } param0->unk_00.unk_00_val1 = CharCode_SkipFormatArg(param0->unk_00.unk_00_val1); @@ -242,14 +232,14 @@ int sub_02002328 (UnkStruct_0201D834 * param0) static u16 Unk_02101D46 = 0; -void sub_020027A8 (u16 param0) +void sub_020027A8(u16 param0) { Unk_02101D46 = param0; } -void sub_020027B4 (UnkStruct_0201D834 * param0) +void sub_020027B4(UnkStruct_0201D834 *param0) { - UnkStruct_02002D18 * v0; + UnkStruct_02002D18 *v0; v0 = (UnkStruct_02002D18 *)&(param0->unk_20[0]); @@ -268,10 +258,10 @@ static const u8 Unk_020E4CD0[] = { 0x1 }; -void sub_020027E0 (UnkStruct_0201D834 * param0) +void sub_020027E0(UnkStruct_0201D834 *param0) { - UnkStruct_02002D18 * v0; - void * v1; + UnkStruct_02002D18 *v0; + void *v1; v0 = (UnkStruct_02002D18 *)&(param0->unk_20[0]); @@ -305,7 +295,7 @@ void sub_020027E0 (UnkStruct_0201D834 * param0) } } -void sub_02002968 (UnkStruct_0201D834 * param0) +void sub_02002968(UnkStruct_0201D834 *param0) { u16 v0; u8 v1, v2, v3, v4; @@ -321,7 +311,7 @@ void sub_02002968 (UnkStruct_0201D834 * param0) sub_02019448(param0->unk_00.unk_04->unk_00, v1); } -static BOOL sub_020029FC (UnkStruct_0201D834 * param0) +static BOOL sub_020029FC(UnkStruct_0201D834 *param0) { if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) || ((gCoreSys.touchPressed) && (Unk_02101D44.unk_00_4))) { Sound_PlayEffect(1500); @@ -332,9 +322,9 @@ static BOOL sub_020029FC (UnkStruct_0201D834 * param0) return 0; } -BOOL sub_02002A44 (UnkStruct_0201D834 * param0) +BOOL sub_02002A44(UnkStruct_0201D834 *param0) { - UnkStruct_02002D18 * v0; + UnkStruct_02002D18 *v0; u16 v1; v0 = (UnkStruct_02002D18 *)&(param0->unk_20[0]); @@ -353,7 +343,7 @@ BOOL sub_02002A44 (UnkStruct_0201D834 * param0) return 0; } -BOOL sub_02002A80 (UnkStruct_0201D834 * param0) +BOOL sub_02002A80(UnkStruct_0201D834 *param0) { BOOL v0 = 0; @@ -367,7 +357,7 @@ BOOL sub_02002A80 (UnkStruct_0201D834 * param0) return v0; } -BOOL sub_02002AA4 (UnkStruct_0201D834 * param0) +BOOL sub_02002AA4(UnkStruct_0201D834 *param0) { u8 v0 = 0; @@ -380,38 +370,38 @@ BOOL sub_02002AA4 (UnkStruct_0201D834 * param0) return v0; } -void sub_02002AC8 (int param0) +void sub_02002AC8(int param0) { Unk_02101D44.unk_00_0 = param0; } -void sub_02002AE4 (int param0) +void sub_02002AE4(int param0) { Unk_02101D44.unk_00_2 = (param0 & 1); Unk_02101D44.unk_00_5 = ((param0 >> 1) & 1); } -void sub_02002B20 (int param0) +void sub_02002B20(int param0) { Unk_02101D44.unk_00_4 = param0; } -u8 sub_02002B3C (void) +u8 sub_02002B3C(void) { return Unk_02101D44.unk_00_6; } -void sub_02002B4C (void) +void sub_02002B4C(void) { Unk_02101D44.unk_00_6 = 0; } -u8 sub_02002B5C (void) +u8 sub_02002B5C(void) { return Unk_02101D44.unk_00_7; } -void sub_02002B6C (void) +void sub_02002B6C(void) { Unk_02101D44.unk_00_7 = 0; } diff --git a/src/unk_02002B7C.c b/src/unk_02002B7C.c index 4b1be69d49..3aa12516f6 100644 --- a/src/unk_02002B7C.c +++ b/src/unk_02002B7C.c @@ -1,53 +1,52 @@ +#include "unk_02002B7C.h" + #include #include #include "struct_decls/struct_02023350_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_02002328.h" #include "struct_defs/struct_02002D18.h" #include "struct_defs/struct_0201D670.h" #include "struct_defs/struct_0201D834.h" +#include "heap.h" +#include "strbuf.h" #include "unk_02002328.h" -#include "unk_02002B7C.h" #include "unk_02006E3C.h" -#include "heap.h" #include "unk_0201D670.h" #include "unk_020232E0.h" -#include "strbuf.h" typedef struct { UnkStruct_02002328 unk_00; - void * unk_84[4]; - UnkStruct_02023350 * unk_94[4]; + void *unk_84[4]; + UnkStruct_02023350 *unk_94[4]; } UnkStruct_02101D4C; static const struct { u16 unk_00; u16 unk_02; } Unk_020E4CD4[] = { - {0x0, 0x0}, - {0x1, 0x0}, - {0x2, 0x0}, - {0x3, 0x0} + { 0x0, 0x0 }, + { 0x1, 0x0 }, + { 0x2, 0x0 }, + { 0x3, 0x0 } }; static const UnkStruct_0201D670 Unk_020E4CE4[] = { - {0xB, 0x10, 0x0, 0x0, 0x0, 0x1, 0xF, 0x2}, - {0xB, 0x10, 0x0, 0x0, 0x0, 0x1, 0xF, 0x2}, - {0xB, 0x10, 0x0, 0x0, 0x0, 0x1, 0xF, 0x2}, - {0xB, 0x10, 0x0, 0x0, 0x0, 0x1, 0xF, 0x2}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0} + { 0xB, 0x10, 0x0, 0x0, 0x0, 0x1, 0xF, 0x2 }, + { 0xB, 0x10, 0x0, 0x0, 0x0, 0x1, 0xF, 0x2 }, + { 0xB, 0x10, 0x0, 0x0, 0x0, 0x1, 0xF, 0x2 }, + { 0xB, 0x10, 0x0, 0x0, 0x0, 0x1, 0xF, 0x2 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }; static UnkStruct_02101D4C Unk_02101D4C = { 0x0 }; -static UnkStruct_02101D4C * Unk_02101D48 = NULL; +static UnkStruct_02101D4C *Unk_02101D48 = NULL; -void sub_02002B7C (void) +void sub_02002B7C(void) { u32 v0; @@ -61,12 +60,12 @@ void sub_02002B7C (void) sub_0201D670(Unk_020E4CE4); } -void sub_02002BB8 (int param0, u32 param1) +void sub_02002BB8(int param0, u32 param1) { Unk_02101D48->unk_94[param0] = sub_020232E0(14, Unk_020E4CD4[param0].unk_00, 1, Unk_020E4CD4[param0].unk_02, param1); } -void sub_02002BEC (int param0, u32 param1) +void sub_02002BEC(int param0, u32 param1) { GF_ASSERT(param0 < 4); GF_ASSERT(Unk_02101D48->unk_94[param0]); @@ -74,7 +73,7 @@ void sub_02002BEC (int param0, u32 param1) sub_02023330(Unk_02101D48->unk_94[param0], 0, param1); } -void sub_02002C28 (int param0) +void sub_02002C28(int param0) { GF_ASSERT(param0 < 4); GF_ASSERT(Unk_02101D48->unk_94[param0]); @@ -82,7 +81,7 @@ void sub_02002C28 (int param0) sub_02023330(Unk_02101D48->unk_94[param0], 1, 0); } -void sub_02002C60 (int param0) +void sub_02002C60(int param0) { GF_ASSERT(param0 < 4); @@ -112,15 +111,15 @@ void sub_02002C60 (int param0) } } -const UnkStruct_02002328 * sub_02002CFC (int param0, u16 param1) +const UnkStruct_02002328 *sub_02002CFC(int param0, u16 param1) { sub_020234A0(Unk_02101D48->unk_94[param0], param1, &Unk_02101D48->unk_00); return &(Unk_02101D48->unk_00); } -int sub_02002D18 (int param0, UnkStruct_0201D834 * param1) +int sub_02002D18(int param0, UnkStruct_0201D834 *param1) { - UnkStruct_02002D18 * v0; + UnkStruct_02002D18 *v0; v0 = (UnkStruct_02002D18 *)&(param1->unk_20[0]); @@ -132,19 +131,19 @@ int sub_02002D18 (int param0, UnkStruct_0201D834 * param1) return sub_02002328(param1); } -u32 sub_02002D48 (int param0, const u16 * param1, u32 param2) +u32 sub_02002D48(int param0, const u16 *param1, u32 param2) { GF_ASSERT(Unk_02101D48->unk_94[param0] != NULL); return sub_02023620(Unk_02101D48->unk_94[param0], param1, param2); } -u32 sub_02002D7C (int param0, const Strbuf *param1, u32 param2) +u32 sub_02002D7C(int param0, const Strbuf *param1, u32 param2) { GF_ASSERT(Unk_02101D48->unk_94[param0] != NULL); return sub_02023620(Unk_02101D48->unk_94[param0], Strbuf_GetData(param1), param2); } -u32 sub_02002DB4 (int param0, Strbuf *param1, Strbuf *param2) +u32 sub_02002DB4(int param0, Strbuf *param1, Strbuf *param2) { GF_ASSERT(Unk_02101D48->unk_94[param0] != NULL); @@ -154,7 +153,7 @@ u32 sub_02002DB4 (int param0, Strbuf *param1, Strbuf *param2) return sub_0202366C(Unk_02101D48->unk_94[param0], Strbuf_GetData(param2)); } -u8 sub_02002DF8 (u8 param0, u8 param1) +u8 sub_02002DF8(u8 param0, u8 param1) { u8 v0 = 0; @@ -188,30 +187,30 @@ u8 sub_02002DF8 (u8 param0, u8 param1) return v0; } -void sub_02002E7C (u32 param0, u32 param1, u32 param2) +void sub_02002E7C(u32 param0, u32 param1, u32 param2) { sub_02006E84(14, 6, (int)param0, param1, 0x20, param2); } -void sub_02002E98 (u32 param0, u32 param1, u32 param2) +void sub_02002E98(u32 param0, u32 param1, u32 param2) { sub_02006E84(14, 7, (int)param0, param1, 0x20, param2); } -u32 sub_02002EB4 (int param0, const Strbuf *param1, u32 param2) +u32 sub_02002EB4(int param0, const Strbuf *param1, u32 param2) { GF_ASSERT(Unk_02101D48->unk_94[param0] != NULL); return sub_020236D0(Unk_02101D48->unk_94[param0], Strbuf_GetData(param1), param2); } -u32 sub_02002EEC (int param0, const Strbuf *param1, u32 param2, u32 param3) +u32 sub_02002EEC(int param0, const Strbuf *param1, u32 param2, u32 param3) { u32 v0 = sub_02002D7C(param0, param1, param2); return (v0 < param3) ? (param3 - v0) / 2 : 0; } -u32 sub_02002F04 (int param0, const Strbuf *param1) +u32 sub_02002F04(int param0, const Strbuf *param1) { GF_ASSERT(Unk_02101D48->unk_94[param0] != NULL); return sub_02023738(Unk_02101D48->unk_94[param0], Strbuf_GetData(param1)); diff --git a/src/unk_02002F38.c b/src/unk_02002F38.c index b24b3ee34d..85b0c638c6 100644 --- a/src/unk_02002F38.c +++ b/src/unk_02002F38.c @@ -1,15 +1,15 @@ +#include "unk_02002F38.h" + #include #include -#include "sys_task_manager.h" - #include "struct_defs/struct_020032D0.h" #include "struct_defs/struct_0200330C.h" -#include "unk_02002F38.h" -#include "unk_02006E3C.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_020241F0.h" typedef struct UnkStruct_02002F38_t { @@ -31,20 +31,20 @@ typedef struct { } UnkStruct_0200393C; static u8 sub_0200327C(u16 param0, u16 param1); -static void sub_02003290(PaletteData * param0, u16 param1); -static void sub_020032D0(int param0, UnkStruct_020032D0 * param1, u16 * param2); -static void sub_0200330C(UnkStruct_0200330C * param0, u16 param1, s8 param2, u8 param3, u8 param4, u16 param5); -static void sub_020033CC(SysTask * param0, void * param1); -static void sub_02003468(PaletteData * param0); -static void sub_02003488(PaletteData * param0); -static void sub_020034A8(PaletteData * param0, u16 param1, u16 param2); -static void sub_02003504(PaletteData * param0, u16 param1, u16 param2); -static void sub_02003560(u16 * param0, u16 * param1, UnkStruct_0200330C * param2, u32 param3); -static void sub_020035EC(PaletteData * param0, u8 param1, UnkStruct_0200330C * param2); +static void sub_02003290(PaletteData *param0, u16 param1); +static void sub_020032D0(int param0, UnkStruct_020032D0 *param1, u16 *param2); +static void sub_0200330C(UnkStruct_0200330C *param0, u16 param1, s8 param2, u8 param3, u8 param4, u16 param5); +static void sub_020033CC(SysTask *param0, void *param1); +static void sub_02003468(PaletteData *param0); +static void sub_02003488(PaletteData *param0); +static void sub_020034A8(PaletteData *param0, u16 param1, u16 param2); +static void sub_02003504(PaletteData *param0, u16 param1, u16 param2); +static void sub_02003560(u16 *param0, u16 *param1, UnkStruct_0200330C *param2, u32 param3); +static void sub_020035EC(PaletteData *param0, u8 param1, UnkStruct_0200330C *param2); -PaletteData * sub_02002F38 (int param0) +PaletteData *sub_02002F38(int param0) { - PaletteData * v0; + PaletteData *v0; v0 = Heap_AllocFromHeap(param0, sizeof(PaletteData)); MI_CpuClear8(v0, sizeof(PaletteData)); @@ -52,22 +52,22 @@ PaletteData * sub_02002F38 (int param0) return v0; } -void sub_02002F54 (PaletteData * param0) +void sub_02002F54(PaletteData *param0) { Heap_FreeToHeap(param0); } -void sub_02002F5C (PaletteData * param0, int param1, void * param2, void * param3, u32 param4) +void sub_02002F5C(PaletteData *param0, int param1, void *param2, void *param3, u32 param4) { param0->unk_00[param1].unk_00 = (u16 *)param2; param0->unk_00[param1].unk_04 = (u16 *)param3; param0->unk_00[param1].unk_08 = param4; } -void sub_02002F70 (PaletteData * param0, int param1, u32 param2, u32 param3) +void sub_02002F70(PaletteData *param0, int param1, u32 param2, u32 param3) { - void * v0; - void * v1; + void *v0; + void *v1; v0 = Heap_AllocFromHeap(param3, param2); v1 = Heap_AllocFromHeap(param3, param2); @@ -75,22 +75,22 @@ void sub_02002F70 (PaletteData * param0, int param1, u32 param2, u32 param3) sub_02002F5C(param0, param1, v0, v1, param2); } -void sub_02002FA0 (PaletteData * param0, int param1) +void sub_02002FA0(PaletteData *param0, int param1) { Heap_FreeToHeap(param0->unk_00[param1].unk_00); Heap_FreeToHeap(param0->unk_00[param1].unk_04); } -void sub_02002FBC (PaletteData * param0, const void * param1, int param2, u16 param3, u16 param4) +void sub_02002FBC(PaletteData *param0, const void *param1, int param2, u16 param3, u16 param4) { MI_CpuCopy16(param1, (void *)¶m0->unk_00[param2].unk_00[param3], (u32)param4); MI_CpuCopy16(param1, (void *)¶m0->unk_00[param2].unk_04[param3], (u32)param4); } -void sub_02002FEC (PaletteData * param0, u32 bankID, u32 memberIndex, u32 param3, int param4, u32 param5, u16 param6, u16 param7) +void sub_02002FEC(PaletteData *param0, u32 bankID, u32 memberIndex, u32 param3, int param4, u32 param5, u16 param6, u16 param7) { - NNSG2dPaletteData * v0; - void * v1; + NNSG2dPaletteData *v0; + void *v1; v1 = sub_02006F88(bankID, memberIndex, &v0, param3); GF_ASSERT(v1 != NULL); @@ -105,14 +105,14 @@ void sub_02002FEC (PaletteData * param0, u32 bankID, u32 memberIndex, u32 param3 Heap_FreeToHeap(v1); } -void PaletteSys_LoadPalette (PaletteData * param0, u32 bankID, u32 memberIndex, u32 param3, int param4, u32 param5, u16 param6) +void PaletteSys_LoadPalette(PaletteData *param0, u32 bankID, u32 memberIndex, u32 param3, int param4, u32 param5, u16 param6) { sub_02002FEC(param0, bankID, memberIndex, param3, param4, param5, param6, 0); } -void sub_02003070 (PaletteData * param0, int param1, u16 param2, u32 param3) +void sub_02003070(PaletteData *param0, int param1, u16 param2, u32 param3) { - u16 * v0; + u16 *v0; GF_ASSERT(param2 * sizeof(param2) + param3 <= param0->unk_00[param1].unk_08); @@ -137,10 +137,10 @@ void sub_02003070 (PaletteData * param0, int param1, u16 param2, u32 param3) sub_02002FBC(param0, &v0[param2], param1, param2, param3); } -void sub_020030E4 (u32 param0, u32 param1, u32 param2, u32 param3, u16 param4, void * param5) +void sub_020030E4(u32 param0, u32 param1, u32 param2, u32 param3, u16 param4, void *param5) { - NNSG2dPaletteData * v0; - void * v1; + NNSG2dPaletteData *v0; + void *v1; v1 = sub_02006F88(param0, param1, &v0, param2); GF_ASSERT(v1 != NULL); @@ -153,23 +153,23 @@ void sub_020030E4 (u32 param0, u32 param1, u32 param2, u32 param3, u16 param4, v Heap_FreeToHeap(v1); } -void sub_02003120 (PaletteData * param0, int param1, u16 param2, int param3, u16 param4, u16 param5) +void sub_02003120(PaletteData *param0, int param1, u16 param2, int param3, u16 param4, u16 param5) { MI_CpuCopy16((void *)¶m0->unk_00[param1].unk_00[param2], (void *)¶m0->unk_00[param3].unk_00[param4], param5); MI_CpuCopy16((void *)¶m0->unk_00[param1].unk_00[param2], (void *)¶m0->unk_00[param3].unk_04[param4], param5); } -u16 * sub_02003164 (PaletteData * param0, int param1) +u16 *sub_02003164(PaletteData *param0, int param1) { return param0->unk_00[param1].unk_00; } -u16 * sub_0200316C (PaletteData * param0, int param1) +u16 *sub_0200316C(PaletteData *param0, int param1) { return param0->unk_00[param1].unk_04; } -u8 sub_02003178 (PaletteData * param0, u16 param1, u16 param2, s8 param3, u8 param4, u8 param5, u16 param6) +u8 sub_02003178(PaletteData *param0, u16 param1, u16 param2, s8 param3, u8 param4, u8 param5, u16 param6) { u16 v0; u8 v1; @@ -210,7 +210,7 @@ u8 sub_02003178 (PaletteData * param0, u16 param1, u16 param2, s8 param3, u8 par return v1; } -static u8 sub_0200327C (u16 param0, u16 param1) +static u8 sub_0200327C(u16 param0, u16 param1) { if ((param0 & (1 << param1)) != 0) { return 1; @@ -219,7 +219,7 @@ static u8 sub_0200327C (u16 param0, u16 param1) return 0; } -static void sub_02003290 (PaletteData * param0, u16 param1) +static void sub_02003290(PaletteData *param0, u16 param1) { if (sub_0200327C(param0->unk_11A_0, param1) == 1) { return; @@ -228,7 +228,7 @@ static void sub_02003290 (PaletteData * param0, u16 param1) param0->unk_11A_0 |= (1 << param1); } -static void sub_020032D0 (int param0, UnkStruct_020032D0 * param1, u16 * param2) +static void sub_020032D0(int param0, UnkStruct_020032D0 *param1, u16 *param2) { u16 v0; u8 v1, v2; @@ -248,7 +248,7 @@ static void sub_020032D0 (int param0, UnkStruct_020032D0 * param1, u16 * param2) *param2 &= v0; } -static void sub_0200330C (UnkStruct_0200330C * param0, u16 param1, s8 param2, u8 param3, u8 param4, u16 param5) +static void sub_0200330C(UnkStruct_0200330C *param0, u16 param1, s8 param2, u8 param3, u8 param4, u16 param5) { if (param2 < 0) { param0->unk_06_0 = 2 + abs(param2); @@ -271,9 +271,9 @@ static void sub_0200330C (UnkStruct_0200330C * param0, u16 param1, s8 param2, u8 } } -static void sub_020033CC (SysTask * param0, void * param1) +static void sub_020033CC(SysTask *param0, void *param1) { - PaletteData * v0 = param1; + PaletteData *v0 = param1; if (v0->unk_11C == 1) { v0->unk_11C = 0; @@ -299,7 +299,7 @@ static void sub_020033CC (SysTask * param0, void * param1) } } -static void sub_02003468 (PaletteData * param0) +static void sub_02003468(PaletteData *param0) { u8 v0, v1; @@ -308,7 +308,7 @@ static void sub_02003468 (PaletteData * param0) } } -static void sub_02003488 (PaletteData * param0) +static void sub_02003488(PaletteData *param0) { u8 v0, v1; @@ -317,7 +317,7 @@ static void sub_02003488 (PaletteData * param0) } } -static void sub_020034A8 (PaletteData * param0, u16 param1, u16 param2) +static void sub_020034A8(PaletteData *param0, u16 param1, u16 param2) { if (sub_0200327C(param0->unk_118_2, param1) == 0) { return; @@ -333,7 +333,7 @@ static void sub_020034A8 (PaletteData * param0, u16 param1, u16 param2) sub_02003504(param0, param1, param2); } -static void sub_02003504 (PaletteData * param0, u16 param1, u16 param2) +static void sub_02003504(PaletteData *param0, u16 param1, u16 param2) { u32 v0; @@ -348,7 +348,7 @@ static void sub_02003504 (PaletteData * param0, u16 param1, u16 param2) sub_020035EC(param0, param1, ¶m0->unk_00[param1].unk_0C); } -static void sub_02003560 (u16 * param0, u16 * param1, UnkStruct_0200330C * param2, u32 param3) +static void sub_02003560(u16 *param0, u16 *param1, UnkStruct_0200330C *param2, u32 param3) { u32 v0; u8 v1, v2, v3; @@ -362,7 +362,7 @@ static void sub_02003560 (u16 * param0, u16 * param1, UnkStruct_0200330C * param } } -static void sub_020035EC (PaletteData * param0, u8 param1, UnkStruct_0200330C * param2) +static void sub_020035EC(PaletteData *param0, u8 param1, UnkStruct_0200330C *param2) { s16 v0; @@ -391,7 +391,7 @@ static void sub_020035EC (PaletteData * param0, u8 param1, UnkStruct_0200330C * } } -void sub_02003694 (PaletteData * param0) +void sub_02003694(PaletteData *param0) { if ((param0->unk_11A_15 == 0) && (param0->unk_118_0 != 1)) { return; @@ -482,23 +482,23 @@ void sub_02003694 (PaletteData * param0) } } -u16 sub_0200384C (PaletteData * param0) +u16 sub_0200384C(PaletteData *param0) { return param0->unk_118_2; } -void sub_02003858 (PaletteData * param0, int param1) +void sub_02003858(PaletteData *param0, int param1) { param0->unk_11A_15 = param1; } -void sub_0200387C (PaletteData * param0, u8 param1) +void sub_0200387C(PaletteData *param0, u8 param1) { param0->unk_118_0 = param1 & 0x1; param0->unk_118_2 = 0xFFFFFFFF; } -void sub_020038B0 (PaletteData * param0, int param1, int param2, u16 param3, u16 param4, u16 param5) +void sub_020038B0(PaletteData *param0, int param1, int param2, u16 param3, u16 param4, u16 param5) { GF_ASSERT(param5 * sizeof(u16) <= param0->unk_00[param1].unk_08); @@ -511,7 +511,7 @@ void sub_020038B0 (PaletteData * param0, int param1, int param2, u16 param3, u16 } } -u16 sub_02003910 (PaletteData * param0, int param1, int param2, u16 param3) +u16 sub_02003910(PaletteData *param0, int param1, int param2, u16 param3) { if (param2 == 1) { return param0->unk_00[param1].unk_00[param3]; @@ -525,7 +525,7 @@ u16 sub_02003910 (PaletteData * param0, int param1, int param2, u16 param3) return 0; } -void sub_0200393C (const u16 * param0, u16 * param1, u16 param2, u8 param3, u16 param4) +void sub_0200393C(const u16 *param0, u16 *param1, u16 param2, u8 param3, u16 param4) { u16 v0; int v1, v2, v3; @@ -544,13 +544,13 @@ void sub_0200393C (const u16 * param0, u16 * param1, u16 param2, u8 param3, u16 } } -void sub_020039B0 (PaletteData * param0, int param1, u16 param2, u16 param3, u8 param4, u16 param5) +void sub_020039B0(PaletteData *param0, int param1, u16 param2, u16 param3, u8 param4, u16 param5) { GF_ASSERT(param0->unk_00[param1].unk_00 != NULL && param0->unk_00[param1].unk_04 != NULL); sub_0200393C(¶m0->unk_00[param1].unk_00[param2], ¶m0->unk_00[param1].unk_04[param2], param3, param4, param5); } -void sub_020039F8 (const u16 * param0, u16 * param1, u16 param2, u8 param3, u16 param4) +void sub_020039F8(const u16 *param0, u16 *param1, u16 param2, u8 param3, u16 param4) { int v0 = 0; @@ -564,7 +564,7 @@ void sub_020039F8 (const u16 * param0, u16 * param1, u16 param2, u8 param3, u16 } } -void sub_02003A2C (PaletteData * param0, int param1, u16 param2, u8 param3, u16 param4) +void sub_02003A2C(PaletteData *param0, int param1, u16 param2, u8 param3, u16 param4) { int v0 = 0; @@ -580,7 +580,7 @@ void sub_02003A2C (PaletteData * param0, int param1, u16 param2, u8 param3, u16 } } -void sub_02003A8C (u16 * param0, int param1, int param2, int param3, int param4) +void sub_02003A8C(u16 *param0, int param1, int param2, int param3, int param4) { int v0, v1, v2, v3; u32 v4; @@ -613,10 +613,10 @@ void sub_02003A8C (u16 * param0, int param1, int param2, int param3, int param4) } } -void sub_02003B08 (PaletteData * param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6, int param7, int param8, int param9) +void sub_02003B08(PaletteData *param0, u32 param1, u32 param2, u32 param3, int param4, u32 param5, u16 param6, int param7, int param8, int param9) { - NNSG2dPaletteData * v0; - void * v1; + NNSG2dPaletteData *v0; + void *v1; v1 = sub_02006F88(param1, param2, &v0, param3); GF_ASSERT(v1 != NULL); diff --git a/src/unk_02003B60.c b/src/unk_02003B60.c index eb13d34e42..5dd1921e45 100644 --- a/src/unk_02003B60.c +++ b/src/unk_02003B60.c @@ -1,14 +1,14 @@ +#include "unk_02003B60.h" + #include #include #include "struct_decls/struct_02003D54_decl.h" -#include "sys_task_manager.h" #include "struct_defs/chatot_cry.h" - #include "struct_defs/struct_020052C8.h" -#include "game_options.h" -#include "unk_02003B60.h" +#include "game_options.h" +#include "sys_task_manager.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006224.h" @@ -19,7 +19,7 @@ struct UnkStruct_02003D54_t { u8 unk_FC[769024]; NNSSndHandle unk_BBCFC[9]; NNSSndWaveOutHandle unk_BBD20[2]; - const NNSSndArcBankInfo * unk_BBD28; + const NNSSndArcBankInfo *unk_BBD28; u8 unk_BBD2C[4096] ATTRIBUTE_ALIGN(32); UnkStruct_020052C8 unk_BCD2C; u16 unk_BCD48; @@ -45,12 +45,12 @@ struct UnkStruct_02003D54_t { u8 unk_BCD84; u8 unk_BCD85; u16 unk_BCD86; - const SNDWaveData * unk_BCD88; - void * unk_BCD8C; + const SNDWaveData *unk_BCD88; + void *unk_BCD8C; int unk_BCD90; - SysTask * unk_BCD94; - ChatotCry * unk_BCD98; - ChatotCry * unk_BCD9C[4]; + SysTask *unk_BCD94; + ChatotCry *unk_BCD98; + ChatotCry *unk_BCD9C[4]; int unk_BCDAC[2]; int unk_BCDB4[2]; int unk_BCDBC[2]; @@ -61,9 +61,9 @@ struct UnkStruct_02003D54_t { u8 unk_BCDD3; }; -static void sub_0200413C(UnkStruct_02003D54 * param0); -static void sub_02004160(UnkStruct_02003D54 * param0); -static void sub_0200417C(UnkStruct_02003D54 * param0); +static void sub_0200413C(UnkStruct_02003D54 *param0); +static void sub_02004160(UnkStruct_02003D54 *param0); +static void sub_0200417C(UnkStruct_02003D54 *param0); static void sub_020041A0(void); static BOOL sub_02003D28(void); static void sub_02003C64(void); @@ -73,9 +73,9 @@ static UnkStruct_02003D54 Unk_02101DF8; static int Unk_02101DF0; static NNSSndCaptureOutputEffectType Unk_02101DF4; -void sub_02003B60 (ChatotCry * param0, Options * param1) +void sub_02003B60(ChatotCry *param0, Options *param1) { - UnkStruct_02003D54 * v0 = sub_02003D54(); + UnkStruct_02003D54 *v0 = sub_02003D54(); NNS_SndInit(); @@ -98,10 +98,10 @@ void sub_02003B60 (ChatotCry * param0, Options * param1) return; } -void UpdateSound (void) +void UpdateSound(void) { int v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); if (sub_02003D28() == 0) { if (v1->unk_BCD4C > 0) { @@ -127,10 +127,10 @@ void UpdateSound (void) return; } -static void sub_02003C64 (void) +static void sub_02003C64(void) { int v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); switch (Unk_02101DF0) { case 0: @@ -172,9 +172,9 @@ static void sub_02003C64 (void) return; } -void sub_02003D0C (int param0) +void sub_02003D0C(int param0) { - UnkStruct_02003D54 * v0 = sub_02003D54(); + UnkStruct_02003D54 *v0 = sub_02003D54(); v0->unk_BCD48 = 0; Unk_02101DF0 = param0; @@ -182,9 +182,9 @@ void sub_02003D0C (int param0) return; } -static BOOL sub_02003D28 (void) +static BOOL sub_02003D28(void) { - UnkStruct_02003D54 * v0 = sub_02003D54(); + UnkStruct_02003D54 *v0 = sub_02003D54(); if (sub_02004B04(2) != 0) { return 1; @@ -197,14 +197,14 @@ static BOOL sub_02003D28 (void) return 0; } -UnkStruct_02003D54 * sub_02003D54 () +UnkStruct_02003D54 *sub_02003D54() { return (UnkStruct_02003D54 *)&Unk_02101DF8; } -void * sub_02003D5C (int param0) +void *sub_02003D5C(int param0) { - UnkStruct_02003D54 * v0 = sub_02003D54(); + UnkStruct_02003D54 *v0 = sub_02003D54(); switch (param0) { case 5: @@ -323,10 +323,10 @@ void * sub_02003D5C (int param0) return NULL; } -int sub_02004014 (int * param0) +int sub_02004014(int *param0) { int v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); v0 = NNS_SndHeapSaveState(v1->unk_F8); @@ -341,62 +341,62 @@ int sub_02004014 (int * param0) return v0; } -void sub_0200403C (int param0) +void sub_0200403C(int param0) { - UnkStruct_02003D54 * v0 = sub_02003D54(); + UnkStruct_02003D54 *v0 = sub_02003D54(); NNS_SndHeapLoadState(v0->unk_F8, param0); return; } -BOOL sub_02004050 (u16 param0) +BOOL sub_02004050(u16 param0) { int v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); v0 = NNS_SndArcLoadGroup(param0, v1->unk_F8); return v0; } -BOOL sub_02004068 (u16 param0) +BOOL sub_02004068(u16 param0) { int v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); v0 = NNS_SndArcLoadSeq(param0, v1->unk_F8); return v0; } -BOOL sub_02004080 (u16 param0, u32 param1) +BOOL sub_02004080(u16 param0, u32 param1) { int v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); v0 = NNS_SndArcLoadSeqEx(param0, param1, v1->unk_F8); return v0; } -BOOL sub_0200409C (u16 param0) +BOOL sub_0200409C(u16 param0) { int v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); v0 = NNS_SndArcLoadWaveArc(param0, v1->unk_F8); return v0; } -BOOL sub_020040B4 (u16 param0) +BOOL sub_020040B4(u16 param0) { int v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); v0 = NNS_SndArcLoadBank(param0, v1->unk_F8); return v0; } -NNSSndHandle * sub_020040CC (int param0) +NNSSndHandle *sub_020040CC(int param0) { - UnkStruct_02003D54 * v0 = sub_02003D54(); + UnkStruct_02003D54 *v0 = sub_02003D54(); if (param0 >= 9) { GF_ASSERT(FALSE); @@ -406,7 +406,7 @@ NNSSndHandle * sub_020040CC (int param0) return &v0->unk_BBCFC[param0]; } -int sub_020040F0 (int param0) +int sub_020040F0(int param0) { int v0; @@ -444,7 +444,7 @@ int sub_020040F0 (int param0) return v0; } -static void sub_0200413C (UnkStruct_02003D54 * param0) +static void sub_0200413C(UnkStruct_02003D54 *param0) { int v0; @@ -457,7 +457,7 @@ static void sub_0200413C (UnkStruct_02003D54 * param0) return; } -static void sub_02004160 (UnkStruct_02003D54 * param0) +static void sub_02004160(UnkStruct_02003D54 *param0) { int v0; @@ -468,7 +468,7 @@ static void sub_02004160 (UnkStruct_02003D54 * param0) return; } -static void sub_0200417C (UnkStruct_02003D54 * param0) +static void sub_0200417C(UnkStruct_02003D54 *param0) { int v0; @@ -479,7 +479,7 @@ static void sub_0200417C (UnkStruct_02003D54 * param0) return; } -static void sub_020041A0 (void) +static void sub_020041A0(void) { MIC_Init(); @@ -489,7 +489,7 @@ static void sub_020041A0 (void) return; } -static void sub_020041B4 (void) +static void sub_020041B4(void) { NNS_SndPlayerStopSeqByPlayerNo(7, 0); NNS_SndHandleReleaseSeq(sub_020040CC(7)); diff --git a/src/unk_020041CC.c b/src/unk_020041CC.c index 5a9b882b5c..97efaf2772 100644 --- a/src/unk_020041CC.c +++ b/src/unk_020041CC.c @@ -1,16 +1,16 @@ +#include "unk_020041CC.h" + #include #include #include "struct_decls/struct_02003D54_decl.h" - #include "struct_defs/struct_02004CB4.h" #include "struct_defs/struct_020052C8.h" +#include "communication_system.h" +#include "heap.h" #include "unk_02003B60.h" -#include "unk_020041CC.h" #include "unk_02005474.h" -#include "heap.h" -#include "communication_system.h" void sub_020041E8(u16 param0); u16 sub_020041FC(void); @@ -44,23 +44,23 @@ void sub_02004AD4(u16 param0, int param1); BOOL sub_02004AE8(int param0, int param1, u16 param2); int sub_02004B04(int param0); u8 sub_02004B18(u16 param0); -int sub_02004B34(NNSSndHandle * param0); -const NNSSndArcBankInfo * sub_02004B3C(int param0); +int sub_02004B34(NNSSndHandle *param0); +const NNSSndArcBankInfo *sub_02004B3C(int param0); u16 sub_02004B48(int param0); -MICResult sub_02004B5C(MICAutoParam * param0); +MICResult sub_02004B5C(MICAutoParam *param0); MICResult sub_02004B64(void); -NNSSndWaveOutHandle * sub_02004B78(u32 param0); +NNSSndWaveOutHandle *sub_02004B78(u32 param0); BOOL sub_02004BCC(u32 param0); void sub_02004C4C(u32 param0); void sub_02004D14(u32 param0, u8 param1); void sub_02004D2C(u32 param0, u32 param1); void sub_02004D40(u32 param0, int param1); -BOOL sub_02004CB4(UnkStruct_02004CB4 * param0, u32 param1); +BOOL sub_02004CB4(UnkStruct_02004CB4 *param0, u32 param1); void sub_02004CF4(u32 param0); BOOL sub_02004D04(u32 param0); BOOL sub_02004D78(u16 param0, int param1, int param2, u32 param3, int param4); void sub_02004E84(u32 param0); -static void sub_02004E64(u8 * param0, u32 param1); +static void sub_02004E64(u8 *param0, u32 param1); BOOL sub_02004EC0(void); BOOL sub_02004EC8(int param0); void sub_02004EEC(int param0); @@ -68,7 +68,7 @@ void sub_02004EF4(int param0, int param1); BOOL sub_02004EFC(void); void sub_02004F44(void); void sub_02004F4C(int param0); -void sub_020052C8(void * param0, void * param1, u32 param2, NNSSndCaptureFormat param3, void * param4); +void sub_020052C8(void *param0, void *param1, u32 param2, NNSSndCaptureFormat param3, void *param4); void sub_02004F68(int param0, u16 param1, int param2); void sub_02004F7C(u16 param0, u16 param1, int param2); void sub_02004F94(int param0, u16 param1, int param2); @@ -78,42 +78,42 @@ void sub_02004FCC(int param0); void sub_02004FDC(int param0); int sub_02004FEC(void); void sub_0200500C(int param0); -void * sub_02005014(void); +void *sub_02005014(void); void sub_0200501C(int param0); -BOOL sub_0200502C(u8 param0, u16 param1, int param2, int param3, u8 param4, void * param5); -BOOL sub_02005068(u8 param0, u16 param1, int param2, int param3, int param4, u8 param5, void * param6); -static void sub_020050A4(u8 param0, u16 param1, int param2, int param3, u8 param4, void * param5); +BOOL sub_0200502C(u8 param0, u16 param1, int param2, int param3, u8 param4, void *param5); +BOOL sub_02005068(u8 param0, u16 param1, int param2, int param3, int param4, u8 param5, void *param6); +static void sub_020050A4(u8 param0, u16 param1, int param2, int param3, u8 param4, void *param5); static void sub_020053C0(u16 param0); void sub_020053CC(int param0); static void sub_0200540C(void); -const u8 * sub_020050E0(const SNDWaveData * param0); -const u32 sub_020050EC(const SNDWaveData * param0); -const SNDWaveData * sub_020050F8(int param0); -static const SNDWaveData * sub_02005130(int param0); -u32 sub_02005188(int param0, const SNDWaveData * param1, int param2); +const u8 *sub_020050E0(const SNDWaveData *param0); +const u32 sub_020050EC(const SNDWaveData *param0); +const SNDWaveData *sub_020050F8(int param0); +static const SNDWaveData *sub_02005130(int param0); +u32 sub_02005188(int param0, const SNDWaveData *param1, int param2); u32 sub_020051C4(int param0); -void sub_020051D0(const SNDWaveData * param0, u8 * param1, int param2, int param3); +void sub_020051D0(const SNDWaveData *param0, u8 *param1, int param2, int param3); static s8 Unk_021BEBA0[2000] ATTRIBUTE_ALIGN(32); static int Unk_021BEB80; -void sub_020041CC (u8 param0) +void sub_020041CC(u8 param0) { - u8 * v0 = sub_02003D5C(5); + u8 *v0 = sub_02003D5C(5); *v0 = param0; return; } -u8 sub_020041DC (void) +u8 sub_020041DC(void) { - u8 * v0 = sub_02003D5C(5); + u8 *v0 = sub_02003D5C(5); return *v0; } -void sub_020041E8 (u16 param0) +void sub_020041E8(u16 param0) { - u16 * v0 = sub_02003D5C(10); + u16 *v0 = sub_02003D5C(10); *v0 = param0; sub_02004208(0); @@ -121,38 +121,38 @@ void sub_020041E8 (u16 param0) return; } -u16 sub_020041FC (void) +u16 sub_020041FC(void) { - u16 * v0 = sub_02003D5C(10); + u16 *v0 = sub_02003D5C(10); return *v0; } -void sub_02004208 (u16 param0) +void sub_02004208(u16 param0) { - u16 * v0 = sub_02003D5C(11); + u16 *v0 = sub_02003D5C(11); *v0 = param0; return; } -u16 sub_02004218 (void) +u16 sub_02004218(void) { - u16 * v0 = sub_02003D5C(11); + u16 *v0 = sub_02003D5C(11); return *v0; } -void sub_02004224 (u16 param0) +void sub_02004224(u16 param0) { - u16 * v0 = sub_02003D5C(32); + u16 *v0 = sub_02003D5C(32); *v0 = param0; return; } -void sub_02004234 (u8 param0) +void sub_02004234(u8 param0) { - u8 * v0 = sub_02003D5C(21); - u8 * v1 = sub_02003D5C(22); + u8 *v0 = sub_02003D5C(21); + u8 *v1 = sub_02003D5C(22); if (param0 < 51) { *v0 = param0; @@ -164,16 +164,16 @@ void sub_02004234 (u8 param0) return; } -void sub_02004258 (u8 param0) +void sub_02004258(u8 param0) { - u8 * v0 = sub_02003D5C(21); - u8 * v1 = sub_02003D5C(22); + u8 *v0 = sub_02003D5C(21); + u8 *v1 = sub_02003D5C(22); *v1 = param0; return; } -int sub_0200426C (u8 param0) +int sub_0200426C(u8 param0) { int v0; @@ -316,11 +316,11 @@ int sub_0200426C (u8 param0) return v0; } -BOOL sub_02004550 (u8 param0, u16 param1, int param2) +BOOL sub_02004550(u8 param0, u16 param1, int param2) { - u8 * v0 = sub_02003D5C(21); - u8 * v1 = sub_02003D5C(22); - u16 * v2 = sub_02003D5C(14); + u8 *v0 = sub_02003D5C(21); + u8 *v1 = sub_02003D5C(22); + u16 *v2 = sub_02003D5C(14); if (param0 < 51) { if (*v0 == param0) { @@ -408,9 +408,9 @@ BOOL sub_02004550 (u8 param0, u16 param1, int param2) return 1; } -static void sub_020046CC (u8 param0) +static void sub_020046CC(u8 param0) { - int * v0 = sub_02003D5C(24); + int *v0 = sub_02003D5C(24); sub_0200403C(*v0); sub_02004014(sub_02003D5C(25)); @@ -420,13 +420,13 @@ static void sub_020046CC (u8 param0) return; } -static void sub_020046F8 (u16 param0, int param1) +static void sub_020046F8(u16 param0, int param1) { int v0, v1; u16 v2; - u8 * v3 = sub_02003D5C(12); - int * v4 = sub_02003D5C(24); - u16 * v5 = sub_02003D5C(32); + u8 *v3 = sub_02003D5C(12); + int *v4 = sub_02003D5C(24); + u16 *v5 = sub_02003D5C(32); v1 = sub_02004B34(sub_020040CC(0)); @@ -464,9 +464,9 @@ static void sub_020046F8 (u16 param0, int param1) return; } -static void sub_0200478C (u16 param0, u16 param1) +static void sub_0200478C(u16 param0, u16 param1) { - u16 * v0 = sub_02003D5C(32); + u16 *v0 = sub_02003D5C(32); u16 v1 = sub_02004B48(*v0); if ((v1 != 701) && (v1 != 703)) { @@ -484,11 +484,11 @@ static void sub_0200478C (u16 param0, u16 param1) return; } -void sub_020047E8 (u16 param0, u16 param1) +void sub_020047E8(u16 param0, u16 param1) { u16 v0; - u8 * v1 = sub_02003D5C(19); - u16 * v2 = sub_02003D5C(32); + u8 *v1 = sub_02003D5C(19); + u16 *v2 = sub_02003D5C(32); if ((*v1 == 1) || (param1 == 0)) { sub_0200403C(sub_02004974(1)); @@ -513,9 +513,9 @@ void sub_020047E8 (u16 param0, u16 param1) return; } -static void sub_02004874 (u16 param0, int param1) +static void sub_02004874(u16 param0, int param1) { - int * v0 = sub_02003D5C(24); + int *v0 = sub_02003D5C(24); sub_0200540C(); sub_0200403C(sub_02004974(2)); @@ -527,9 +527,9 @@ static void sub_02004874 (u16 param0, int param1) return; } -static void sub_020048AC (u16 param0, int param1) +static void sub_020048AC(u16 param0, int param1) { - int * v0 = sub_02003D5C(24); + int *v0 = sub_02003D5C(24); sub_0200569C(); sub_02004A3C(); @@ -539,9 +539,9 @@ static void sub_020048AC (u16 param0, int param1) return; } -void sub_020048CC (u16 param0, int param1) +void sub_020048CC(u16 param0, int param1) { - int * v0 = sub_02003D5C(24); + int *v0 = sub_02003D5C(24); sub_0200569C(); sub_020046CC(6); @@ -551,9 +551,9 @@ void sub_020048CC (u16 param0, int param1) return; } -void sub_020048F0 (u16 param0, int param1) +void sub_020048F0(u16 param0, int param1) { - int * v0 = sub_02003D5C(24); + int *v0 = sub_02003D5C(24); sub_0200569C(); sub_020046CC(7); @@ -563,7 +563,7 @@ void sub_020048F0 (u16 param0, int param1) return; } -static void sub_02004914 (u8 param0) +static void sub_02004914(u8 param0) { sub_02004964(); sub_0200426C(param0); @@ -572,9 +572,9 @@ static void sub_02004914 (u8 param0) return; } -static void sub_02004930 (u8 param0, u16 param1, int param2) +static void sub_02004930(u8 param0, u16 param1, int param2) { - int * v0 = sub_02003D5C(24); + int *v0 = sub_02003D5C(24); sub_0200569C(); sub_020046CC(param0); @@ -583,10 +583,10 @@ static void sub_02004930 (u8 param0, u16 param1, int param2) return; } -void sub_02004950 (u16 param0) +void sub_02004950(u16 param0) { int v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); sub_0200540C(); @@ -594,16 +594,16 @@ void sub_02004950 (u16 param0) return; } -void sub_02004964 (void) +void sub_02004964(void) { sub_0200403C(sub_02004974(4)); return; } -int sub_02004974 (int param0) +int sub_02004974(int param0) { - int * v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + int *v0; + UnkStruct_02003D54 *v1 = sub_02003D54(); if (param0 >= 7) { GF_ASSERT(FALSE); @@ -638,10 +638,10 @@ int sub_02004974 (int param0) return *v0; } -void sub_020049F4 (u8 param0, BOOL param1) +void sub_020049F4(u8 param0, BOOL param1) { u8 v0; - u8 * v1; + u8 *v1; if (param0 == 1) { v1 = sub_02003D5C(12); @@ -663,10 +663,10 @@ void sub_020049F4 (u8 param0, BOOL param1) return; } -void sub_02004A3C (void) +void sub_02004A3C(void) { - u8 * v0 = sub_02003D5C(12); - u8 * v1 = sub_02003D5C(13); + u8 *v0 = sub_02003D5C(12); + u8 *v1 = sub_02003D5C(13); *v0 = 0; *v1 = 0; @@ -674,13 +674,13 @@ void sub_02004A3C (void) return; } -void sub_02004A54 (int param0, int param1, int param2) +void sub_02004A54(int param0, int param1, int param2) { NNS_SndPlayerMoveVolume(sub_020040CC(param0), param1, param2); return; } -void sub_02004A68 (int param0, int param1) +void sub_02004A68(int param0, int param1) { if (param1 < 0) { param1 = 0; @@ -694,7 +694,7 @@ void sub_02004A68 (int param0, int param1) return; } -void sub_02004A84 (int param0) +void sub_02004A84(int param0) { u8 v0 = sub_02004B18(param0); int v1 = sub_020040F0(v0); @@ -703,10 +703,10 @@ void sub_02004A84 (int param0) return; } -void sub_02004AA0 (int param0, int param1) +void sub_02004AA0(int param0, int param1) { u8 v0; - const NNSSndSeqParam * v1 = NNS_SndArcGetSeqParam(param0); + const NNSSndSeqParam *v1 = NNS_SndArcGetSeqParam(param0); switch (param1) { case 1: @@ -729,7 +729,7 @@ void sub_02004AA0 (int param0, int param1) return; } -void sub_02004AD4 (u16 param0, int param1) +void sub_02004AD4(u16 param0, int param1) { u8 v0 = sub_02004B18(param0); int v1 = sub_020040F0(v0); @@ -738,12 +738,12 @@ void sub_02004AD4 (u16 param0, int param1) return; } -BOOL sub_02004AE8 (int param0, int param1, u16 param2) +BOOL sub_02004AE8(int param0, int param1, u16 param2) { return NNS_SndArcPlayerStartSeqEx(sub_020040CC(param0), param1, -1, -1, param2); } -int sub_02004B04 (int param0) +int sub_02004B04(int param0) { if (param0 < 0) { GF_ASSERT(FALSE); @@ -752,9 +752,9 @@ int sub_02004B04 (int param0) return NNS_SndPlayerCountPlayingSeqByPlayerNo(param0); } -u8 sub_02004B18 (u16 param0) +u8 sub_02004B18(u16 param0) { - const NNSSndSeqParam * v0; + const NNSSndSeqParam *v0; if (param0 == 0) { return 0xff; @@ -769,14 +769,14 @@ u8 sub_02004B18 (u16 param0) return v0->playerNo; } -int sub_02004B34 (NNSSndHandle * param0) +int sub_02004B34(NNSSndHandle *param0) { return NNS_SndPlayerGetSeqNo(param0); } -const NNSSndArcBankInfo * sub_02004B3C (int param0) +const NNSSndArcBankInfo *sub_02004B3C(int param0) { - const NNSSndArcBankInfo * v0; + const NNSSndArcBankInfo *v0; v0 = NNS_SndArcGetBankInfo(sub_02004B48(param0)); @@ -787,9 +787,9 @@ const NNSSndArcBankInfo * sub_02004B3C (int param0) return v0; } -u16 sub_02004B48 (int param0) +u16 sub_02004B48(int param0) { - const NNSSndSeqParam * v0; + const NNSSndSeqParam *v0; v0 = NNS_SndArcGetSeqParam(param0); @@ -800,7 +800,7 @@ u16 sub_02004B48 (int param0) return v0->bankNo; } -MICResult sub_02004B5C (MICAutoParam * param0) +MICResult sub_02004B5C(MICAutoParam *param0) { MICResult v0; @@ -813,10 +813,10 @@ MICResult sub_02004B5C (MICAutoParam * param0) return v0; } -MICResult sub_02004B64 (void) +MICResult sub_02004B64(void) { MICResult v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); v0 = MIC_StopAutoSampling(); @@ -827,7 +827,7 @@ MICResult sub_02004B64 (void) return v0; } -MICResult sub_02004B70 (MICSamplingType param0, void * param1, MICCallback param2, void * param3) +MICResult sub_02004B70(MICSamplingType param0, void *param1, MICCallback param2, void *param3) { MICResult v0; @@ -840,11 +840,11 @@ MICResult sub_02004B70 (MICSamplingType param0, void * param1, MICCallback param return v0; } -NNSSndWaveOutHandle * sub_02004B78 (u32 param0) +NNSSndWaveOutHandle *sub_02004B78(u32 param0) { - UnkStruct_02003D54 * v0 = sub_02003D54(); - u8 * v1 = sub_02003D5C(16); - u8 * v2 = sub_02003D5C(17); + UnkStruct_02003D54 *v0 = sub_02003D54(); + u8 *v1 = sub_02003D5C(16); + u8 *v2 = sub_02003D5C(17); if ((param0 != 14) && (param0 != 15)) { GF_ASSERT(FALSE); @@ -865,12 +865,12 @@ NNSSndWaveOutHandle * sub_02004B78 (u32 param0) } } -BOOL sub_02004BCC (u32 param0) +BOOL sub_02004BCC(u32 param0) { - u8 * v0; - u8 * v1; - NNSSndWaveOutHandle * v2; - UnkStruct_02003D54 * v3 = sub_02003D54(); + u8 *v0; + u8 *v1; + NNSSndWaveOutHandle *v2; + UnkStruct_02003D54 *v3 = sub_02003D54(); v0 = sub_02003D5C(16); v1 = sub_02003D5C(17); @@ -910,12 +910,12 @@ BOOL sub_02004BCC (u32 param0) return 1; } -void sub_02004C4C (u32 param0) +void sub_02004C4C(u32 param0) { - NNSSndWaveOutHandle * v0; - UnkStruct_02003D54 * v1 = sub_02003D54(); - u8 * v2 = sub_02003D5C(16); - u8 * v3 = sub_02003D5C(17); + NNSSndWaveOutHandle *v0; + UnkStruct_02003D54 *v1 = sub_02003D54(); + u8 *v2 = sub_02003D5C(16); + u8 *v3 = sub_02003D5C(17); if ((param0 != 14) && (param0 != 15)) { GF_ASSERT(FALSE); @@ -943,7 +943,7 @@ void sub_02004C4C (u32 param0) return; } -BOOL sub_02004CB4 (UnkStruct_02004CB4 * param0, u32 param1) +BOOL sub_02004CB4(UnkStruct_02004CB4 *param0, u32 param1) { int v0; @@ -956,18 +956,18 @@ BOOL sub_02004CB4 (UnkStruct_02004CB4 * param0, u32 param1) return v0; } -void sub_02004CF4 (u32 param0) +void sub_02004CF4(u32 param0) { NNS_SndWaveOutStop(*sub_02004B78(param0)); return; } -BOOL sub_02004D04 (u32 param0) +BOOL sub_02004D04(u32 param0) { return NNS_SndWaveOutIsPlaying(*sub_02004B78(param0)); } -void sub_02004D14 (u32 param0, u8 param1) +void sub_02004D14(u32 param0, u8 param1) { u8 v0; @@ -981,13 +981,13 @@ void sub_02004D14 (u32 param0, u8 param1) return; } -void sub_02004D2C (u32 param0, u32 param1) +void sub_02004D2C(u32 param0, u32 param1) { NNS_SndWaveOutSetSpeed(*sub_02004B78(param0), param1); return; } -void sub_02004D40 (u32 param0, int param1) +void sub_02004D40(u32 param0, int param1) { if (sub_02036314() == 1) { NNS_SndWaveOutSetVolume(*sub_02004B78(param0), (param1 / 5)); @@ -998,14 +998,14 @@ void sub_02004D40 (u32 param0, int param1) return; } -BOOL sub_02004D78 (u16 param0, int param1, int param2, u32 param3, int param4) +BOOL sub_02004D78(u16 param0, int param1, int param2, u32 param3, int param4) { - u8 * v0; - const NNSSndArcWaveArcInfo * v1; + u8 *v0; + const NNSSndArcWaveArcInfo *v1; u32 v2; int v3, v4; - UnkStruct_02003D54 * v5 = sub_02003D54(); - void ** v6 = sub_02003D5C(34); + UnkStruct_02003D54 *v5 = sub_02003D54(); + void **v6 = sub_02003D5C(34); if ((param3 != 14) && (param3 != 15)) { GF_ASSERT(FALSE); @@ -1070,7 +1070,7 @@ BOOL sub_02004D78 (u16 param0, int param1, int param2, u32 param3, int param4) return v4; } -static void sub_02004E64 (u8 * param0, u32 param1) +static void sub_02004E64(u8 *param0, u32 param1) { int v0; u8 v1; @@ -1084,11 +1084,11 @@ static void sub_02004E64 (u8 * param0, u32 param1) return; } -void sub_02004E84 (u32 param0) +void sub_02004E84(u32 param0) { - UnkStruct_02003D54 * v0 = sub_02003D54(); - u8 * v1 = sub_02003D5C(15); - void ** v2 = sub_02003D5C(34); + UnkStruct_02003D54 *v0 = sub_02003D54(); + u8 *v1 = sub_02003D5C(15); + void **v2 = sub_02003D5C(34); if ((param0 != 14) && (param0 != 15)) { GF_ASSERT(FALSE); @@ -1104,7 +1104,7 @@ void sub_02004E84 (u32 param0) return; } -BOOL sub_02004EC0 (void) +BOOL sub_02004EC0(void) { int v0, v1; @@ -1113,43 +1113,43 @@ BOOL sub_02004EC0 (void) return v1; } -BOOL sub_02004EC8 (int param0) +BOOL sub_02004EC8(int param0) { - UnkStruct_02003D54 * v0 = sub_02003D54(); - s8 * v1 = sub_02003D5C(3); + UnkStruct_02003D54 *v0 = sub_02003D54(); + s8 *v1 = sub_02003D5C(3); return NNS_SndCaptureStartReverb(v1, 0x1000, (NNS_SND_CAPTURE_FORMAT_PCM16), 16000, param0); } -void sub_02004EEC (int param0) +void sub_02004EEC(int param0) { NNS_SndCaptureStopReverb(param0); return; } -void sub_02004EF4 (int param0, int param1) +void sub_02004EF4(int param0, int param1) { NNS_SndCaptureSetReverbVolume(param0, param1); return; } -BOOL sub_02004EFC (void) +BOOL sub_02004EFC(void) { - UnkStruct_02003D54 * v1 = sub_02003D54(); + UnkStruct_02003D54 *v1 = sub_02003D54(); MI_CpuClear8(sub_02003D5C(4), sizeof(UnkStruct_020052C8)); return NNS_SndCaptureStartEffect(sub_02003D5C(3), 0x1000, NNS_SND_CAPTURE_FORMAT_PCM16, 22000, 2, sub_020052C8, sub_02003D5C(4)); } -void sub_02004F44 (void) +void sub_02004F44(void) { NNS_SndCaptureStopEffect(); return; } -void sub_02004F4C (int param0) +void sub_02004F4C(int param0) { - u8 * v0 = sub_02003D5C(20); + u8 *v0 = sub_02003D5C(20); if (param0 > 8) { param0 = 8; @@ -1161,13 +1161,13 @@ void sub_02004F4C (int param0) return; } -void sub_02004F68 (int param0, u16 param1, int param2) +void sub_02004F68(int param0, u16 param1, int param2) { NNS_SndPlayerSetTrackPitch(sub_020040CC(param0), param1, param2); return; } -void sub_02004F7C (u16 param0, u16 param1, int param2) +void sub_02004F7C(u16 param0, u16 param1, int param2) { u8 v0 = sub_02004B18(param0); int v1 = sub_020040F0(v0); @@ -1176,44 +1176,44 @@ void sub_02004F7C (u16 param0, u16 param1, int param2) return; } -void sub_02004F94 (int param0, u16 param1, int param2) +void sub_02004F94(int param0, u16 param1, int param2) { NNS_SndPlayerSetTrackPan(sub_020040CC(param0), param1, param2); return; } -void sub_02004FA8 (int param0, int param1) +void sub_02004FA8(int param0, int param1) { NNS_SndPlayerSetTempoRatio(sub_020040CC(param0), param1); return; } -void sub_02004FB8 (BOOL param0) +void sub_02004FB8(BOOL param0) { NNS_SndSetMonoFlag(param0); Unk_021BEB80 = param0; return; } -void sub_02004FCC (int param0) +void sub_02004FCC(int param0) { - int * v0 = sub_02003D5C(7); + int *v0 = sub_02003D5C(7); *v0 = param0; return; } -void sub_02004FDC (int param0) +void sub_02004FDC(int param0) { - int * v0 = sub_02003D5C(8); + int *v0 = sub_02003D5C(8); *v0 = param0; return; } -int sub_02004FEC () +int sub_02004FEC() { - u16 * v0 = sub_02003D5C(8); + u16 *v0 = sub_02003D5C(8); if (*v0 <= 0) { *v0 = 0; @@ -1224,28 +1224,28 @@ int sub_02004FEC () return *v0; } -void sub_0200500C (int param0) +void sub_0200500C(int param0) { NNS_SndSetMasterVolume(param0); return; } -void * sub_02005014 (void) +void *sub_02005014(void) { return &Unk_021BEBA0[0]; } -void sub_0200501C (int param0) +void sub_0200501C(int param0) { - u8 * v0 = sub_02003D5C(19); + u8 *v0 = sub_02003D5C(19); *v0 = param0; return; } -BOOL sub_0200502C (u8 param0, u16 param1, int param2, int param3, u8 param4, void * param5) +BOOL sub_0200502C(u8 param0, u16 param1, int param2, int param3, u8 param4, void *param5) { - u8 * v0 = sub_02003D5C(22); + u8 *v0 = sub_02003D5C(22); sub_020050A4(param0, param1, param2, param3, param4, param5); *v0 = 0; @@ -1254,9 +1254,9 @@ BOOL sub_0200502C (u8 param0, u16 param1, int param2, int param3, u8 param4, voi return 1; } -BOOL sub_02005068 (u8 param0, u16 param1, int param2, int param3, int param4, u8 param5, void * param6) +BOOL sub_02005068(u8 param0, u16 param1, int param2, int param3, int param4, u8 param5, void *param6) { - int * v0 = sub_02003D5C(9); + int *v0 = sub_02003D5C(9); sub_020050A4(param0, param1, param2, param3, param5, param6); *v0 = param4; @@ -1265,9 +1265,9 @@ BOOL sub_02005068 (u8 param0, u16 param1, int param2, int param3, int param4, u8 return 1; } -static void sub_020050A4 (u8 param0, u16 param1, int param2, int param3, u8 param4, void * param5) +static void sub_020050A4(u8 param0, u16 param1, int param2, int param3, u8 param4, void *param5) { - const NNSSndArcBankInfo ** v0 = sub_02003D5C(2); + const NNSSndArcBankInfo **v0 = sub_02003D5C(2); sub_0200564C(0, param2); sub_020041E8(0); @@ -1281,7 +1281,7 @@ static void sub_020050A4 (u8 param0, u16 param1, int param2, int param3, u8 para return; } -const u8 * sub_020050E0 (const SNDWaveData * param0) +const u8 *sub_020050E0(const SNDWaveData *param0) { if (param0 == NULL) { return NULL; @@ -1290,7 +1290,7 @@ const u8 * sub_020050E0 (const SNDWaveData * param0) return ¶m0->samples[0]; } -const u32 sub_020050EC (const SNDWaveData * param0) +const u32 sub_020050EC(const SNDWaveData *param0) { if (param0 == NULL) { return 0; @@ -1299,7 +1299,7 @@ const u32 sub_020050EC (const SNDWaveData * param0) return param0->param.looplen; } -const SNDWaveData * sub_020050F8 (int param0) +const SNDWaveData *sub_020050F8(int param0) { u16 v0; @@ -1318,12 +1318,12 @@ const SNDWaveData * sub_020050F8 (int param0) return sub_02005130(v0); } -static const SNDWaveData * sub_02005130 (int param0) +static const SNDWaveData *sub_02005130(int param0) { u16 v0; - const NNSSndArcWaveArcInfo * v1; - SNDWaveArc * v2 = NULL; - const SNDWaveData ** v3 = sub_02003D5C(33); + const NNSSndArcWaveArcInfo *v1; + SNDWaveArc *v2 = NULL; + const SNDWaveData **v3 = sub_02003D5C(33); v0 = param0; @@ -1352,7 +1352,7 @@ static const SNDWaveData * sub_02005130 (int param0) return *v3; } -u32 sub_02005188 (int param0, const SNDWaveData * param1, int param2) +u32 sub_02005188(int param0, const SNDWaveData *param1, int param2) { int v0; u32 v1; @@ -1379,7 +1379,7 @@ u32 sub_02005188 (int param0, const SNDWaveData * param1, int param2) return v1; } -u32 sub_020051C4 (int param0) +u32 sub_020051C4(int param0) { u32 v0 = NNS_SndPlayerGetTick(sub_020040CC(param0)); return v0; @@ -1397,7 +1397,7 @@ static const u8 Unk_020E4D0C[9] = { 0xA }; -void sub_020051D0 (const SNDWaveData * param0, u8 * param1, int param2, int param3) +void sub_020051D0(const SNDWaveData *param0, u8 *param1, int param2, int param3) { int v0; int v1; @@ -1472,13 +1472,13 @@ void sub_020051D0 (const SNDWaveData * param0, u8 * param1, int param2, int para return; } -static void sub_020052C8 (void * param0, void * param1, u32 param2, NNSSndCaptureFormat param3, void * param4) +static void sub_020052C8(void *param0, void *param1, u32 param2, NNSSndCaptureFormat param3, void *param4) { s16 v0[8][2]; - s16 * v1 = (s16 *)param0; - s16 * v2 = (s16 *)param1; - UnkStruct_020052C8 * v3 = (UnkStruct_020052C8 *)param4; - u8 * v4 = sub_02003D5C(20); + s16 *v1 = (s16 *)param0; + s16 *v2 = (s16 *)param1; + UnkStruct_020052C8 *v3 = (UnkStruct_020052C8 *)param4; + u8 *v4 = sub_02003D5C(20); int v5; int v6; int v7, v8; @@ -1521,13 +1521,13 @@ static void sub_020052C8 (void * param0, void * param1, u32 param2, NNSSndCaptur DC_FlushRange(param1, v5); } -static void sub_020053C0 (u16 param0) +static void sub_020053C0(u16 param0) { NNS_SndPlayerSetAllocatableChannel(7, param0); return; } -void sub_020053CC (int param0) +void sub_020053CC(int param0) { if (param0 == 0) { sub_020053C0(0x7ff); @@ -1555,7 +1555,7 @@ void sub_020053CC (int param0) return; } -static void sub_0200540C (void) +static void sub_0200540C(void) { if ((Sound_CheckFade() == 0) && (sub_02004B34(sub_020040CC(0)) != -1) && (sub_020041FC() != 1150)) { sub_020056D4(); @@ -1567,23 +1567,23 @@ static void sub_0200540C (void) return; } -void sub_0200544C (int param0, int param1) +void sub_0200544C(int param0, int param1) { NNS_SndPlayerSetPlayerVolume(param0, param1); return; } -void sub_02005454 (BOOL param0) +void sub_02005454(BOOL param0) { - u8 * v0 = sub_02003D5C(53); + u8 *v0 = sub_02003D5C(53); *v0 = param0; return; } -void sub_02005464 (BOOL param0) +void sub_02005464(BOOL param0) { - u8 * v0 = sub_02003D5C(54); + u8 *v0 = sub_02003D5C(54); *v0 = param0; return; diff --git a/src/unk_02005474.c b/src/unk_02005474.c index fab0e66d87..e7e702f7a1 100644 --- a/src/unk_02005474.c +++ b/src/unk_02005474.c @@ -1,3 +1,5 @@ +#include "unk_02005474.h" + #include #include @@ -5,17 +7,16 @@ #include "struct_defs/chatot_cry.h" +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02003B60.h" #include "unk_020041CC.h" -#include "unk_02005474.h" #include "unk_02006224.h" -#include "sys_task.h" -#include "heap.h" -#include "sys_task_manager.h" typedef struct { int unk_00; - SysTask * unk_04; + SysTask *unk_04; } UnkStruct_02005E64; BOOL sub_02005474(u16 param0); @@ -48,7 +49,7 @@ void sub_0200592C(int param0); int sub_0200598C(void); BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int param4, u8 param5); void sub_02005E64(int param0, int param1); -static void sub_02005EB0(SysTask * param0, void * param1); +static void sub_02005EB0(SysTask *param0, void *param1); void sub_02005F24(void); void Sound_PlayDelayedPokemonCry(int param0, u16 param1, int param2, int param3, int param4, u8 param5, u8 param6); static BOOL sub_02006038(u16 param0, u8 param1); @@ -61,7 +62,7 @@ static void sub_020061C8(int param0); int sub_020061E4(void); static void sub_02006214(u16 param0); -BOOL sub_02005474 (u16 param0) +BOOL sub_02005474(u16 param0) { int v0; u8 v1 = sub_02004B18(param0); @@ -77,7 +78,7 @@ BOOL sub_02005474 (u16 param0) return v0; } -BOOL Sound_PlayBGM (u16 param0) +BOOL Sound_PlayBGM(u16 param0) { int v0; u8 v1 = sub_02004B18(param0); @@ -102,7 +103,7 @@ BOOL Sound_PlayBGM (u16 param0) return v0; } -static void sub_020054EC (u16 param0, int param1) +static void sub_020054EC(u16 param0, int param1) { sub_020041E8(param0); sub_02004AA0(param0, param1); @@ -111,7 +112,7 @@ static void sub_020054EC (u16 param0, int param1) return; } -static BOOL sub_02005508 (u16 param0, u8 param1, int param2) +static BOOL sub_02005508(u16 param0, u8 param1, int param2) { int v0; @@ -123,11 +124,11 @@ static BOOL sub_02005508 (u16 param0, u8 param1, int param2) return v0; } -static BOOL sub_02005538 (u16 param0, u8 param1, int param2) +static BOOL sub_02005538(u16 param0, u8 param1, int param2) { int v0; - u8 * v1 = sub_02003D5C(19); - u16 * v2 = sub_02003D5C(32); + u8 *v1 = sub_02003D5C(19); + u16 *v2 = sub_02003D5C(32); v0 = sub_02004B34(sub_020040CC(0)); sub_020047E8(param0, sub_02004B48(v0)); @@ -135,7 +136,7 @@ static BOOL sub_02005538 (u16 param0, u8 param1, int param2) return NNS_SndArcPlayerStartSeqEx(sub_020040CC(param2), -1, sub_02004B48(*v2), -1, param0); } -BOOL sub_02005588 (u8 param0, u16 param1) +BOOL sub_02005588(u8 param0, u16 param1) { int v0; @@ -162,7 +163,7 @@ BOOL sub_02005588 (u8 param0, u16 param1) return v0; } -void sub_020055D0 (u16 param0, int param1) +void sub_020055D0(u16 param0, int param1) { u8 v0; int v1; @@ -180,7 +181,7 @@ void sub_020055D0 (u16 param0, int param1) return; } -static void sub_020055F4 (void) +static void sub_020055F4(void) { sub_020041E8(0); sub_02004208(0); @@ -189,7 +190,7 @@ static void sub_020055F4 (void) return; } -void sub_0200560C (int param0, int param1, int param2) +void sub_0200560C(int param0, int param1, int param2) { u8 v0; int v1; @@ -214,7 +215,7 @@ void sub_0200560C (int param0, int param1, int param2) return; } -void sub_0200564C (int param0, int param1) +void sub_0200564C(int param0, int param1) { u8 v0; int v1; @@ -237,13 +238,13 @@ void sub_0200564C (int param0, int param1) return; } -int Sound_CheckFade () +int Sound_CheckFade() { - u16 * v0 = sub_02003D5C(7); + u16 *v0 = sub_02003D5C(7); return *v0; } -int sub_02005690 (u16 param0) +int sub_02005690(u16 param0) { u8 v0; @@ -251,10 +252,10 @@ int sub_02005690 (u16 param0) return sub_02004B04(v0); } -void sub_0200569C (void) +void sub_0200569C(void) { - u8 * v0 = sub_02003D5C(16); - u8 * v1 = sub_02003D5C(17); + u8 *v0 = sub_02003D5C(16); + u8 *v1 = sub_02003D5C(17); NNS_SndPlayerStopSeqAll(0); @@ -270,11 +271,11 @@ void sub_0200569C (void) return; } -void sub_020056D4 (void) +void sub_020056D4(void) { int v0; - u8 * v1 = sub_02003D5C(16); - u8 * v2 = sub_02003D5C(17); + u8 *v1 = sub_02003D5C(16); + u8 *v2 = sub_02003D5C(17); NNS_SndPlayerStopSeq(sub_020040CC(7), 0); sub_020055F4(); @@ -296,7 +297,7 @@ void sub_020056D4 (void) return; } -BOOL sub_02005728 (u16 param0, int param1) +BOOL sub_02005728(u16 param0, int param1) { int v0; @@ -306,7 +307,7 @@ BOOL sub_02005728 (u16 param0, int param1) return v0; } -BOOL Sound_PlayEffect (u16 sdatID) +BOOL Sound_PlayEffect(u16 sdatID) { int v0 = sub_020040F0(sub_02004B18(sdatID)); int v1 = NNS_SndArcPlayerStartSeq(sub_020040CC(v0), sdatID); @@ -316,7 +317,7 @@ BOOL Sound_PlayEffect (u16 sdatID) return v1; } -BOOL sub_02005770 (u16 param0, int param1) +BOOL sub_02005770(u16 param0, int param1) { int v0, v1; @@ -332,19 +333,19 @@ BOOL sub_02005770 (u16 param0, int param1) return v1; } -void sub_020057A4 (u16 param0, int param1) +void sub_020057A4(u16 param0, int param1) { NNS_SndPlayerStopSeqBySeqNo(param0, param1); return; } -void sub_020057AC (int param0, int param1) +void sub_020057AC(int param0, int param1) { NNS_SndPlayerStopSeq(sub_020040CC(param0), param1); return; } -void sub_020057BC (int param0) +void sub_020057BC(int param0) { int v0; @@ -355,12 +356,12 @@ void sub_020057BC (int param0) return; } -int Sound_IsEffectPlaying (u16 param0) +int Sound_IsEffectPlaying(u16 param0) { return sub_02004B04(sub_02004B18(param0)); } -int sub_020057E0 () +int sub_020057E0() { int v0; @@ -373,7 +374,7 @@ int sub_020057E0 () return 0; } -void sub_020057FC (u16 param0, u16 param1, int param2) +void sub_020057FC(u16 param0, u16 param1, int param2) { int v0; @@ -383,7 +384,7 @@ void sub_020057FC (u16 param0, u16 param1, int param2) return; } -void sub_02005818 (int param0) +void sub_02005818(int param0) { int v0, v1; @@ -396,13 +397,13 @@ void sub_02005818 (int param0) return; } -BOOL sub_02005844 (u16 param0, u8 param1) +BOOL sub_02005844(u16 param0, u8 param1) { u16 v0; int v1; - u8 * v2 = sub_02003D5C(18); - ChatotCry ** v3 = sub_02003D5C(36); - u8 * v4 = sub_02003D5C(53); + u8 *v2 = sub_02003D5C(18); + ChatotCry **v3 = sub_02003D5C(36); + u8 *v4 = sub_02003D5C(53); v0 = param0; @@ -444,17 +445,17 @@ BOOL sub_02005844 (u16 param0, u8 param1) return v1; } -BOOL sub_0200590C (u16 param0, u8 param1, u8 param2) +BOOL sub_0200590C(u16 param0, u8 param1, u8 param2) { Sound_PlayDelayedPokemonCry(0, param0, 0, 127, 11, param1, param2); return 1; } -void sub_0200592C (int param0) +void sub_0200592C(int param0) { - u8 * v0 = sub_02003D5C(16); - u8 * v1 = sub_02003D5C(17); - u8 * v2 = sub_02003D5C(15); + u8 *v0 = sub_02003D5C(16); + u8 *v1 = sub_02003D5C(17); + u8 *v2 = sub_02003D5C(15); NNS_SndPlayerStopSeq(sub_020040CC(1), param0); NNS_SndPlayerStopSeq(sub_020040CC(8), param0); @@ -475,12 +476,12 @@ void sub_0200592C (int param0) return; } -int sub_0200598C (void) +int sub_0200598C(void) { - u8 * v0 = sub_02003D5C(16); - u8 * v1 = sub_02003D5C(17); - u8 * v2 = sub_02003D5C(15); - u8 * v3 = sub_02003D5C(46); + u8 *v0 = sub_02003D5C(16); + u8 *v1 = sub_02003D5C(17); + u8 *v2 = sub_02003D5C(15); + u8 *v3 = sub_02003D5C(46); if (*v0 == 1) { return sub_02004D04(14); @@ -493,17 +494,17 @@ int sub_0200598C (void) return sub_02004B04(0); } -BOOL Sound_PlayPokemonCry (int param0, u16 species, int param2, int param3, int param4, u8 param5) +BOOL Sound_PlayPokemonCry(int param0, u16 species, int param2, int param3, int param4, u8 param5) { int v0, v1; u16 v2; u16 v3; int v4, v5, v6, v7; - u8 * v8 = sub_02003D5C(16); - u8 * v9 = sub_02003D5C(17); - u8 * v10 = sub_02003D5C(18); - u8 * v11 = sub_02003D5C(30); - ChatotCry ** v12 = sub_02003D5C(36); + u8 *v8 = sub_02003D5C(16); + u8 *v9 = sub_02003D5C(17); + u8 *v10 = sub_02003D5C(18); + u8 *v11 = sub_02003D5C(30); + ChatotCry **v12 = sub_02003D5C(36); v4 = 0; v5 = 0; @@ -687,7 +688,7 @@ BOOL Sound_PlayPokemonCry (int param0, u16 species, int param2, int param3, int return 1; } -static void sub_02005E4C (u16 param0, int param1, int param2) +static void sub_02005E4C(u16 param0, int param1, int param2) { sub_02004A68(param1, param2); sub_02004AA0(param0, param1); @@ -695,10 +696,10 @@ static void sub_02005E4C (u16 param0, int param1, int param2) return; } -void sub_02005E64 (int param0, int param1) +void sub_02005E64(int param0, int param1) { - UnkStruct_02005E64 * v0 = NULL; - SysTask ** v1 = sub_02003D5C(35); + UnkStruct_02005E64 *v0 = NULL; + SysTask **v1 = sub_02003D5C(35); if (*v1 != NULL) { (void)0; @@ -722,11 +723,11 @@ void sub_02005E64 (int param0, int param1) return; } -static void sub_02005EB0 (SysTask * param0, void * param1) +static void sub_02005EB0(SysTask *param0, void *param1) { - u8 * v0 = sub_02003D5C(16); - u8 * v1 = sub_02003D5C(17); - UnkStruct_02005E64 * v2 = (UnkStruct_02005E64 *)param1; + u8 *v0 = sub_02003D5C(16); + u8 *v1 = sub_02003D5C(17); + UnkStruct_02005E64 *v2 = (UnkStruct_02005E64 *)param1; if (v2->unk_00 == 10) { sub_02004A54(1, 0, v2->unk_00); @@ -758,10 +759,10 @@ static void sub_02005EB0 (SysTask * param0, void * param1) return; } -void sub_02005F24 () +void sub_02005F24() { - void * v0; - SysTask ** v1 = sub_02003D5C(35); + void *v0; + SysTask **v1 = sub_02003D5C(35); if (*v1 != NULL) { v0 = SysTask_GetParam(*v1); @@ -773,17 +774,17 @@ void sub_02005F24 () return; } -void Sound_PlayDelayedPokemonCry (int param0, u16 param1, int param2, int param3, int param4, u8 param5, u8 param6) +void Sound_PlayDelayedPokemonCry(int param0, u16 param1, int param2, int param3, int param4, u8 param5, u8 param6) { u16 v0; - int * v1; - u16 * v2; - int * v3; - int * v4; - int * v5; - u8 * v6; - u8 * v7 = sub_02003D5C(6); - u8 * v8 = sub_02003D5C(53); + int *v1; + u16 *v2; + int *v3; + int *v4; + int *v5; + u8 *v6; + u8 *v7 = sub_02003D5C(6); + u8 *v8 = sub_02003D5C(53); if (*v7 == 0) { v1 = sub_02003D5C(41); @@ -830,7 +831,7 @@ void Sound_PlayDelayedPokemonCry (int param0, u16 param1, int param2, int param3 return; } -static BOOL sub_02006038 (u16 param0, u8 param1) +static BOOL sub_02006038(u16 param0, u8 param1) { if (param0 == 492) { if (param1 == 1) { @@ -845,20 +846,20 @@ static BOOL sub_02006038 (u16 param0, u8 param1) return 0; } -void sub_0200605C (void) +void sub_0200605C(void) { - int * v0 = sub_02003D5C(41); - u16 * v1 = sub_02003D5C(45); - int * v2 = sub_02003D5C(42); - int * v3 = sub_02003D5C(43); - int * v4 = sub_02003D5C(44); - u8 * v5 = sub_02003D5C(46); - int * v6 = sub_02003D5C(47); - u16 * v7 = sub_02003D5C(51); - int * v8 = sub_02003D5C(48); - int * v9 = sub_02003D5C(49); - int * v10 = sub_02003D5C(50); - u8 * v11 = sub_02003D5C(52); + int *v0 = sub_02003D5C(41); + u16 *v1 = sub_02003D5C(45); + int *v2 = sub_02003D5C(42); + int *v3 = sub_02003D5C(43); + int *v4 = sub_02003D5C(44); + u8 *v5 = sub_02003D5C(46); + int *v6 = sub_02003D5C(47); + u16 *v7 = sub_02003D5C(51); + int *v8 = sub_02003D5C(48); + int *v9 = sub_02003D5C(49); + int *v10 = sub_02003D5C(50); + u8 *v11 = sub_02003D5C(52); *v0 = 0; *v1 = 0; @@ -877,10 +878,10 @@ void sub_0200605C (void) return; } -static BOOL sub_020060EC (u16 param0, s8 param1, u8 param2) +static BOOL sub_020060EC(u16 param0, s8 param1, u8 param2) { int v0; - u8 * v1 = sub_02003D5C(18); + u8 *v1 = sub_02003D5C(18); *v1 = 1; @@ -891,10 +892,10 @@ static BOOL sub_020060EC (u16 param0, s8 param1, u8 param2) return v0; } -static BOOL sub_02006120 (u16 param0, s8 param1, int param2, int param3, int param4) +static BOOL sub_02006120(u16 param0, s8 param1, int param2, int param3, int param4) { int v0; - u8 * v1 = sub_02003D5C(18); + u8 *v1 = sub_02003D5C(18); *v1 = 1; @@ -904,12 +905,12 @@ static BOOL sub_02006120 (u16 param0, s8 param1, int param2, int param3, int par return v0; } -BOOL sub_02006150 (u16 param0) +BOOL sub_02006150(u16 param0) { u16 v0; u8 v1; int v2, v3; - const NNSSndArcBankInfo * v4; + const NNSSndArcBankInfo *v4; v4 = sub_02004B3C(param0); @@ -932,9 +933,9 @@ BOOL sub_02006150 (u16 param0) return v2; } -int sub_0200619C (void) +int sub_0200619C(void) { - u16 * v0 = sub_02003D5C(14); + u16 *v0 = sub_02003D5C(14); if (sub_02004B04(2) != 0) { return 1; @@ -948,7 +949,7 @@ int sub_0200619C (void) return 0; } -static void sub_020061C8 (int param0) +static void sub_020061C8(int param0) { int v0, v1; u16 v2; @@ -959,11 +960,11 @@ static void sub_020061C8 (int param0) return; } -int sub_020061E4 (void) +int sub_020061E4(void) { u8 v0; u16 v1; - u16 * v2 = sub_02003D5C(14); + u16 *v2 = sub_02003D5C(14); if (sub_0200619C() == 1) { return 1; @@ -981,9 +982,9 @@ int sub_020061E4 (void) return 0; } -static void sub_02006214 (u16 param0) +static void sub_02006214(u16 param0) { - u16 * v0 = sub_02003D5C(14); + u16 *v0 = sub_02003D5C(14); (*v0) = 15; return; diff --git a/src/unk_02006224.c b/src/unk_02006224.c index 5d5ce66689..b5276797fc 100644 --- a/src/unk_02006224.c +++ b/src/unk_02006224.c @@ -2,7 +2,6 @@ #include #include "struct_defs/chatot_cry.h" - #include "struct_defs/struct_02004CB4.h" #include "unk_02003B60.h" @@ -12,22 +11,22 @@ #include "unk_0202CC64.h" BOOL CheckMicRecordingStatus(void); -BOOL IsChatotCryStructReadyForProcessing(const ChatotCry * param0); -BOOL ProcessAudioInput(const ChatotCry * param0, u32 param1, int param2, int param3); +BOOL IsChatotCryStructReadyForProcessing(const ChatotCry *param0); +BOOL ProcessAudioInput(const ChatotCry *param0, u32 param1, int param2, int param3); void ResetMicStatusFlags(void); MICResult StartMicSampling(void); MICResult StopMicSampling(void); -void StoreMicDataInChatotCryStruct(ChatotCry * param0); +void StoreMicDataInChatotCryStruct(ChatotCry *param0); void Sound_FlagDefaultChatotCry(u8 param0); -BOOL Sound_PlayChatotCry(ChatotCry * param0, u32 param1, int param2, int param3); -BOOL Sound_PlayDelayedChatotCry(ChatotCry * param0, u32 param1, int param2, int param3, u8 param4); -int Sound_Chatter(ChatotCry * param0); +BOOL Sound_PlayChatotCry(ChatotCry *param0, u32 param1, int param2, int param3); +BOOL Sound_PlayDelayedChatotCry(ChatotCry *param0, u32 param1, int param2, int param3, u8 param4); +int Sound_Chatter(ChatotCry *param0); BOOL Sound_CanPlayChatotCry(int param0); -BOOL CheckMicRecordingStatus (void) +BOOL CheckMicRecordingStatus(void) { - u8 * v0 = sub_02003D5C(16); - u8 * v1 = sub_02003D5C(30); + u8 *v0 = sub_02003D5C(16); + u8 *v1 = sub_02003D5C(30); if (*v1 == 1) { if (*v0 == 1) { @@ -44,10 +43,10 @@ BOOL CheckMicRecordingStatus (void) return 0; } -BOOL IsChatotCryStructReadyForProcessing (const ChatotCry * cry) +BOOL IsChatotCryStructReadyForProcessing(const ChatotCry *cry) { - u8 * v0 = sub_02003D5C(31); - u8 * v1 = sub_02003D5C(54); + u8 *v0 = sub_02003D5C(31); + u8 *v1 = sub_02003D5C(54); if (IsChatotCryDataValid(cry) == 0) { return 0; @@ -64,12 +63,12 @@ BOOL IsChatotCryStructReadyForProcessing (const ChatotCry * cry) return 1; } -BOOL ProcessAudioInput (const ChatotCry * param0, u32 param1, int param2, int param3) +BOOL ProcessAudioInput(const ChatotCry *param0, u32 param1, int param2, int param3) { u16 v0; int v1, v2; - s8 * v3 = sub_02005014(); - u8 * v4 = sub_02003D5C(30); + s8 *v3 = sub_02005014(); + u8 *v4 = sub_02003D5C(30); if (IsChatotCryStructReadyForProcessing(param0) == 0) { return 0; @@ -112,10 +111,10 @@ BOOL ProcessAudioInput (const ChatotCry * param0, u32 param1, int param2, int pa return v1; } -void ResetMicStatusFlags (void) +void ResetMicStatusFlags(void) { - u8 * v0 = sub_02003D5C(16); - u8 * v1 = sub_02003D5C(30); + u8 *v0 = sub_02003D5C(16); + u8 *v1 = sub_02003D5C(30); if (*v0 == 1) { sub_02004E84(14); @@ -126,7 +125,7 @@ void ResetMicStatusFlags (void) return; } -MICResult StartMicSampling (void) +MICResult StartMicSampling(void) { MICAutoParam v0; @@ -146,29 +145,29 @@ MICResult StartMicSampling (void) return sub_02004B5C(&v0); } -MICResult StopMicSampling (void) +MICResult StopMicSampling(void) { return sub_02004B64(); } -void StoreMicDataInChatotCryStruct (ChatotCry * param0) +void StoreMicDataInChatotCryStruct(ChatotCry *param0) { StoreProcessedAudioInChatotCryData(param0, (const s8 *)sub_02005014()); return; } -void Sound_FlagDefaultChatotCry (u8 param0) +void Sound_FlagDefaultChatotCry(u8 param0) { - u8 * v0 = sub_02003D5C(31); + u8 *v0 = sub_02003D5C(31); *v0 = param0; return; } -BOOL Sound_PlayChatotCry (ChatotCry * param0, u32 param1, int param2, int param3) +BOOL Sound_PlayChatotCry(ChatotCry *param0, u32 param1, int param2, int param3) { int v0; - ChatotCry ** v1 = sub_02003D5C(36); + ChatotCry **v1 = sub_02003D5C(36); if (param0 == NULL) { v0 = ProcessAudioInput(*v1, param1, param2, param3); @@ -184,10 +183,10 @@ BOOL Sound_PlayChatotCry (ChatotCry * param0, u32 param1, int param2, int param3 return v0; } -BOOL Sound_PlayDelayedChatotCry (ChatotCry * param0, u32 param1, int param2, int param3, u8 param4) +BOOL Sound_PlayDelayedChatotCry(ChatotCry *param0, u32 param1, int param2, int param3, u8 param4) { int v0; - ChatotCry ** v1 = sub_02003D5C(36); + ChatotCry **v1 = sub_02003D5C(36); if (param0 == NULL) { v0 = ProcessAudioInput(*v1, param1, param2, param3); @@ -204,9 +203,9 @@ BOOL Sound_PlayDelayedChatotCry (ChatotCry * param0, u32 param1, int param2, int return v0; } -int Sound_Chatter (ChatotCry * param0) +int Sound_Chatter(ChatotCry *param0) { - const s8 * v0; + const s8 *v0; s8 v1; if (IsChatotCryDataValid(param0) == 0) { @@ -227,7 +226,7 @@ int Sound_Chatter (ChatotCry * param0) return 0; } -BOOL Sound_CanPlayChatotCry (int param0) +BOOL Sound_CanPlayChatotCry(int param0) { switch (param0) { case 0: diff --git a/src/unk_0200679C.c b/src/unk_0200679C.c index be5c8e0a7c..3e42567203 100644 --- a/src/unk_0200679C.c +++ b/src/unk_0200679C.c @@ -1,9 +1,10 @@ +#include "unk_0200679C.h" + #include #include -#include "unk_0200679C.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" #include "sys_task_manager.h" SysTask *SysTask_StartAndAllocateParam(SysTaskFunc callback, int paramSize, u32 priority, const u32 heapID) diff --git a/src/unk_02006E3C.c b/src/unk_02006E3C.c index 32b2b5150c..d6e398987d 100644 --- a/src/unk_02006E3C.c +++ b/src/unk_02006E3C.c @@ -1,115 +1,116 @@ +#include "unk_02006E3C.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "narc.h" -#include "unk_02006E3C.h" #include "heap.h" +#include "narc.h" #include "unk_02018340.h" -static u32 sub_020072D0(void * param0, BGL * param1, u32 param2, u32 param3, u32 param4); -static void sub_02007314(void * param0, BGL * param1, u32 param2, u32 param3, u32 param4); -static u32 sub_02007374(void * param0, int param1, u32 param2, u32 param3); -static void sub_020073BC(void * param0, int param1, u32 param2, u32 param3, u32 param4); -static void sub_0200749C(void * param0, NNS_G2D_VRAM_TYPE param1, u32 param2, NNSG2dImagePaletteProxy * param3); -static u32 sub_020074EC(void * param0, int param1, u32 param2, NNS_G2D_VRAM_TYPE param3, u32 param4, NNSG2dImageProxy * param5); -static void sub_02007534(void * param0, int param1, u32 param2, NNS_G2D_VRAM_TYPE param3, u32 param4, NNSG2dImageProxy * param5); -static void * sub_020075A0(void * param0, NNSG2dCharacterData ** param1); -static void * sub_020075BC(void * param0, NNSG2dScreenData ** param1); -static void * sub_020075D8(void * param0, NNSG2dPaletteData ** param1); -static void * sub_020075F4(void * param0, NNSG2dCellDataBank ** param1); -static void * sub_02007610(void * param0, NNSG2dAnimBankData ** param1); - -u32 sub_02006E3C (u32 param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) -{ - void * v0 = sub_02006FE8(param0, param1, param6, param7, 0); +static u32 sub_020072D0(void *param0, BGL *param1, u32 param2, u32 param3, u32 param4); +static void sub_02007314(void *param0, BGL *param1, u32 param2, u32 param3, u32 param4); +static u32 sub_02007374(void *param0, int param1, u32 param2, u32 param3); +static void sub_020073BC(void *param0, int param1, u32 param2, u32 param3, u32 param4); +static void sub_0200749C(void *param0, NNS_G2D_VRAM_TYPE param1, u32 param2, NNSG2dImagePaletteProxy *param3); +static u32 sub_020074EC(void *param0, int param1, u32 param2, NNS_G2D_VRAM_TYPE param3, u32 param4, NNSG2dImageProxy *param5); +static void sub_02007534(void *param0, int param1, u32 param2, NNS_G2D_VRAM_TYPE param3, u32 param4, NNSG2dImageProxy *param5); +static void *sub_020075A0(void *param0, NNSG2dCharacterData **param1); +static void *sub_020075BC(void *param0, NNSG2dScreenData **param1); +static void *sub_020075D8(void *param0, NNSG2dPaletteData **param1); +static void *sub_020075F4(void *param0, NNSG2dCellDataBank **param1); +static void *sub_02007610(void *param0, NNSG2dAnimBankData **param1); + +u32 sub_02006E3C(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +{ + void *v0 = sub_02006FE8(param0, param1, param6, param7, 0); return sub_020072D0(v0, param2, param3, param4, param5); } -void sub_02006E60 (u32 param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +void sub_02006E60(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { - void * v0 = sub_02006FE8(param0, param1, param6, param7, 1); + void *v0 = sub_02006FE8(param0, param1, param6, param7, 1); sub_02007314(v0, param2, param3, param4, param5); } -void sub_02006E84 (u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) +void sub_02006E84(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) { sub_02006E9C(param0, param1, param2, 0, param3, param4, param5); } -void sub_02006E9C (u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6) +void sub_02006E9C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6) { - void * v0 = sub_02006FE8(param0, param1, 0, param6, 1); + void *v0 = sub_02006FE8(param0, param1, 0, param6, 1); sub_020073BC(v0, param2, param3, param4, param5); } -u32 sub_02006EC0 (u32 param0, u32 param1, int param2, u32 param3, u32 param4, BOOL param5, u32 param6) +u32 sub_02006EC0(u32 param0, u32 param1, int param2, u32 param3, u32 param4, BOOL param5, u32 param6) { - void * v0 = sub_02006FE8(param0, param1, param5, param6, 1); + void *v0 = sub_02006FE8(param0, param1, param5, param6, 1); return sub_02007374(v0, param2, param3, param4); } -void sub_02006EE0 (u32 param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy * param5) +void sub_02006EE0(u32 param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5) { - void * v0 = sub_02006FE8(param0, param1, 0, param4, 1); + void *v0 = sub_02006FE8(param0, param1, 0, param4, 1); sub_0200749C(v0, param2, param3, param5); } -u32 sub_02006F00 (u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy * param8) +u32 sub_02006F00(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8) { - void * v0 = sub_02006FE8(param0, param1, param2, param7, 1); + void *v0 = sub_02006FE8(param0, param1, param2, param7, 1); return sub_020074EC(v0, param3, param4, param5, param6, param8); } -void sub_02006F28 (u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy * param8) +void sub_02006F28(u32 param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8) { - void * v0 = sub_02006FE8(param0, param1, param2, param7, 1); + void *v0 = sub_02006FE8(param0, param1, param2, param7, 1); sub_02007534(v0, param3, param4, param5, param6, param8); } -void * sub_02006F50 (u32 param0, u32 param1, BOOL param2, NNSG2dCharacterData ** param3, u32 param4) +void *sub_02006F50(u32 param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4) { - void * v0 = sub_02006FE8(param0, param1, param2, param4, 0); + void *v0 = sub_02006FE8(param0, param1, param2, param4, 0); return sub_020075A0(v0, param3); } -void * sub_02006F6C (u32 param0, u32 param1, BOOL param2, NNSG2dScreenData ** param3, u32 param4) +void *sub_02006F6C(u32 param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4) { - void * v0 = sub_02006FE8(param0, param1, param2, param4, 0); + void *v0 = sub_02006FE8(param0, param1, param2, param4, 0); return sub_020075BC(v0, param3); } -void * sub_02006F88 (u32 param0, u32 param1, NNSG2dPaletteData ** param2, u32 param3) +void *sub_02006F88(u32 param0, u32 param1, NNSG2dPaletteData **param2, u32 param3) { - void * v0 = sub_02006FE8(param0, param1, 0, param3, 0); + void *v0 = sub_02006FE8(param0, param1, 0, param3, 0); return sub_020075D8(v0, param2); } -void * sub_02006FA0 (u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank ** param3, u32 param4) +void *sub_02006FA0(u32 param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4) { - void * v0; + void *v0; v0 = sub_02006FE8(param0, param1, param2, param4, 0); return sub_020075F4(v0, param3); } -void * sub_02006FBC (u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData ** param3, u32 param4) +void *sub_02006FBC(u32 param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4) { - void * v0 = sub_02006FE8(param0, param1, param2, param4, 0); + void *v0 = sub_02006FE8(param0, param1, param2, param4, 0); return sub_02007610(v0, param3); } -void * sub_02006FD8 (u32 param0, u32 param1, u32 param2) +void *sub_02006FD8(u32 param0, u32 param1, u32 param2) { return sub_02006FE8(param0, param1, 1, param2, 0); } -void * sub_02006FE8 (u32 param0, u32 param1, BOOL param2, u32 param3, int param4) +void *sub_02006FE8(u32 param0, u32 param1, BOOL param2, u32 param3, int param4) { - void * v0; + void *v0; if (param2 || (param4 == 1)) { v0 = Heap_AllocFromHeapAtEnd(param3, NARC_GetMemberSizeByIndexPair(param0, param1)); @@ -121,7 +122,7 @@ void * sub_02006FE8 (u32 param0, u32 param1, BOOL param2, u32 param3, int param4 NARC_ReadWholeMemberByIndexPair(v0, param0, param1); if (param2) { - void * v1; + void *v1; if (param4 == 0) { v1 = Heap_AllocFromHeap(param3, MI_GetUncompressedSize(v0)); @@ -141,9 +142,9 @@ void * sub_02006FE8 (u32 param0, u32 param1, BOOL param2, u32 param3, int param4 return v0; } -void * sub_02007068 (u32 param0, u32 param1, BOOL param2, u32 param3, int param4, u32 * param5) +void *sub_02007068(u32 param0, u32 param1, BOOL param2, u32 param3, int param4, u32 *param5) { - void * v0; + void *v0; *param5 = NARC_GetMemberSizeByIndexPair(param0, param1); @@ -157,7 +158,7 @@ void * sub_02007068 (u32 param0, u32 param1, BOOL param2, u32 param3, int param4 NARC_ReadWholeMemberByIndexPair(v0, param0, param1); if (param2) { - void * v1; + void *v1; *param5 = MI_GetUncompressedSize(v0); @@ -179,83 +180,83 @@ void * sub_02007068 (u32 param0, u32 param1, BOOL param2, u32 param3, int param4 return v0; } -u32 sub_020070E8 (NARC * param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +u32 sub_020070E8(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { - void * v0 = sub_0200723C(param0, param1, param6, param7, 0); + void *v0 = sub_0200723C(param0, param1, param6, param7, 0); return sub_020072D0(v0, param2, param3, param4, param5); } -void sub_0200710C (NARC * param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) +void sub_0200710C(NARC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7) { - void * v0 = sub_0200723C(param0, param1, param6, param7, 1); + void *v0 = sub_0200723C(param0, param1, param6, param7, 1); sub_02007314(v0, param2, param3, param4, param5); } -void sub_02007130 (NARC * param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) +void sub_02007130(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) { sub_02007148(param0, param1, param2, 0, param3, param4, param5); } -void sub_02007148 (NARC * param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6) +void sub_02007148(NARC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6) { - void * v0 = sub_0200723C(param0, param1, 0, param6, 1); + void *v0 = sub_0200723C(param0, param1, 0, param6, 1); sub_020073BC(v0, param2, param3, param4, param5); } -void sub_0200716C (NARC * param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy * param5) +void sub_0200716C(NARC *param0, u32 param1, NNS_G2D_VRAM_TYPE param2, u32 param3, u32 param4, NNSG2dImagePaletteProxy *param5) { - void * v0 = sub_0200723C(param0, param1, 0, param4, 1); + void *v0 = sub_0200723C(param0, param1, 0, param4, 1); sub_0200749C(v0, param2, param3, param5); } -u32 sub_0200718C (NARC * param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy * param8) +u32 sub_0200718C(NARC *param0, u32 param1, BOOL param2, int param3, u32 param4, NNS_G2D_VRAM_TYPE param5, u32 param6, u32 param7, NNSG2dImageProxy *param8) { - void * v0 = sub_0200723C(param0, param1, param2, param7, 1); + void *v0 = sub_0200723C(param0, param1, param2, param7, 1); return sub_020074EC(v0, param3, param4, param5, param6, param8); } -void * sub_020071B4 (NARC * param0, u32 param1, BOOL param2, NNSG2dCharacterData ** param3, u32 param4) +void *sub_020071B4(NARC *param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4) { - void * v0 = sub_0200723C(param0, param1, param2, param4, 0); + void *v0 = sub_0200723C(param0, param1, param2, param4, 0); return sub_020075A0(v0, param3); } -void * sub_020071D0 (NARC * param0, u32 param1, BOOL param2, NNSG2dScreenData ** param3, u32 param4) +void *sub_020071D0(NARC *param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4) { - void * v0 = sub_0200723C(param0, param1, param2, param4, 0); + void *v0 = sub_0200723C(param0, param1, param2, param4, 0); return sub_020075BC(v0, param3); } -void * sub_020071EC (NARC * param0, u32 param1, NNSG2dPaletteData ** param2, u32 param3) +void *sub_020071EC(NARC *param0, u32 param1, NNSG2dPaletteData **param2, u32 param3) { - void * v0 = sub_0200723C(param0, param1, 0, param3, 0); + void *v0 = sub_0200723C(param0, param1, 0, param3, 0); return sub_020075D8(v0, param2); } -void * sub_02007204 (NARC * param0, u32 param1, BOOL param2, NNSG2dCellDataBank ** param3, u32 param4) +void *sub_02007204(NARC *param0, u32 param1, BOOL param2, NNSG2dCellDataBank **param3, u32 param4) { - void * v0; + void *v0; v0 = sub_0200723C(param0, param1, param2, param4, 0); return sub_020075F4(v0, param3); } -void * sub_02007220 (NARC * param0, u32 param1, BOOL param2, NNSG2dAnimBankData ** param3, u32 param4) +void *sub_02007220(NARC *param0, u32 param1, BOOL param2, NNSG2dAnimBankData **param3, u32 param4) { - void * v0 = sub_0200723C(param0, param1, param2, param4, 0); + void *v0 = sub_0200723C(param0, param1, param2, param4, 0); return sub_02007610(v0, param3); } -void * sub_0200723C (NARC * param0, u32 param1, BOOL param2, u32 param3, int param4) +void *sub_0200723C(NARC *param0, u32 param1, BOOL param2, u32 param3, int param4) { u32 v0; return sub_02007250(param0, param1, param2, param3, param4, &v0); } -void * sub_02007250 (NARC * param0, u32 param1, BOOL param2, u32 param3, int param4, u32 * param5) +void *sub_02007250(NARC *param0, u32 param1, BOOL param2, u32 param3, int param4, u32 *param5) { - void * v0; + void *v0; *param5 = NARC_GetMemberSize(param0, param1); @@ -269,7 +270,7 @@ void * sub_02007250 (NARC * param0, u32 param1, BOOL param2, u32 param3, int par NARC_ReadWholeMember(param0, param1, v0); if (param2) { - void * v1; + void *v1; *param5 = MI_GetUncompressedSize(v0); @@ -291,10 +292,10 @@ void * sub_02007250 (NARC * param0, u32 param1, BOOL param2, u32 param3, int par return v0; } -static u32 sub_020072D0 (void * param0, BGL * param1, u32 param2, u32 param3, u32 param4) +static u32 sub_020072D0(void *param0, BGL *param1, u32 param2, u32 param3, u32 param4) { if (param0 != NULL) { - NNSG2dCharacterData * v0; + NNSG2dCharacterData *v0; if (NNS_G2dGetUnpackedBGCharacterData(param0, &v0)) { if (param4 == 0) { @@ -310,10 +311,10 @@ static u32 sub_020072D0 (void * param0, BGL * param1, u32 param2, u32 param3, u3 return param4; } -static void sub_02007314 (void * param0, BGL * param1, u32 param2, u32 param3, u32 param4) +static void sub_02007314(void *param0, BGL *param1, u32 param2, u32 param3, u32 param4) { if (param0 != NULL) { - NNSG2dScreenData * v0; + NNSG2dScreenData *v0; if (NNS_G2dGetUnpackedScreenData(param0, &v0)) { if (param4 == 0) { @@ -331,15 +332,15 @@ static void sub_02007314 (void * param0, BGL * param1, u32 param2, u32 param3, u } } -static u32 sub_02007374 (void * param0, int param1, u32 param2, u32 param3) +static u32 sub_02007374(void *param0, int param1, u32 param2, u32 param3) { - static void(*const v0[])(const void *, u32, u32) = { + static void (*const v0[])(const void *, u32, u32) = { GX_LoadOBJ, GXS_LoadOBJ }; if (param0 != NULL) { - NNSG2dCharacterData * v1; + NNSG2dCharacterData *v1; if (NNS_G2dGetUnpackedCharacterData(param0, &v1)) { if (param3 == 0) { @@ -356,9 +357,9 @@ static u32 sub_02007374 (void * param0, int param1, u32 param2, u32 param3) return param3; } -static void sub_020073BC (void * param0, int param1, u32 param2, u32 param3, u32 param4) +static void sub_020073BC(void *param0, int param1, u32 param2, u32 param3, u32 param4) { - static void(*const v0[])(const void *, u32, u32) = { + static void (*const v0[])(const void *, u32, u32) = { GX_LoadBGPltt, GX_LoadOBJPltt, GX_LoadBGExtPltt, @@ -370,7 +371,7 @@ static void sub_020073BC (void * param0, int param1, u32 param2, u32 param3, u32 }; if (param0 != NULL) { - NNSG2dPaletteData * v1; + NNSG2dPaletteData *v1; if (NNS_G2dGetUnpackedPaletteData(param0, &v1)) { (u8 *)(v1->pRawData) += param2; @@ -412,11 +413,11 @@ static void sub_020073BC (void * param0, int param1, u32 param2, u32 param3, u32 } } -static void sub_0200749C (void * param0, NNS_G2D_VRAM_TYPE param1, u32 param2, NNSG2dImagePaletteProxy * param3) +static void sub_0200749C(void *param0, NNS_G2D_VRAM_TYPE param1, u32 param2, NNSG2dImagePaletteProxy *param3) { if (param0 != NULL) { - NNSG2dPaletteData * v0; - NNSG2dPaletteCompressInfo * v1; + NNSG2dPaletteData *v0; + NNSG2dPaletteCompressInfo *v1; BOOL v2; v2 = NNS_G2dGetUnpackedPaletteCompressInfo(param0, &v1); @@ -433,9 +434,9 @@ static void sub_0200749C (void * param0, NNS_G2D_VRAM_TYPE param1, u32 param2, N } } -static u32 sub_020074EC (void * param0, int param1, u32 param2, NNS_G2D_VRAM_TYPE param3, u32 param4, NNSG2dImageProxy * param5) +static u32 sub_020074EC(void *param0, int param1, u32 param2, NNS_G2D_VRAM_TYPE param3, u32 param4, NNSG2dImageProxy *param5) { - static void(*const v0[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = { + static void (*const v0[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = { NNS_G2dLoadImage1DMapping, NNS_G2dLoadImage2DMapping }; @@ -443,7 +444,7 @@ static u32 sub_020074EC (void * param0, int param1, u32 param2, NNS_G2D_VRAM_TYP u32 v1 = 0; if (param0 != NULL) { - NNSG2dCharacterData * v2; + NNSG2dCharacterData *v2; if (NNS_G2dGetUnpackedCharacterData(param0, &v2)) { if (param2) { @@ -460,15 +461,15 @@ static u32 sub_020074EC (void * param0, int param1, u32 param2, NNS_G2D_VRAM_TYP return v1; } -static void sub_02007534 (void * param0, int param1, u32 param2, NNS_G2D_VRAM_TYPE param3, u32 param4, NNSG2dImageProxy * param5) +static void sub_02007534(void *param0, int param1, u32 param2, NNS_G2D_VRAM_TYPE param3, u32 param4, NNSG2dImageProxy *param5) { - static void(*const v0[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = { + static void (*const v0[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = { NNS_G2dLoadImage1DMapping, NNS_G2dLoadImage2DMapping }; if (param0 != NULL) { - NNSG2dCharacterData * v1; + NNSG2dCharacterData *v1; if (NNS_G2dGetUnpackedCharacterData(param0, &v1)) { if (param2) { @@ -491,7 +492,7 @@ static void sub_02007534 (void * param0, int param1, u32 param2, NNS_G2D_VRAM_TY } } -static void * sub_020075A0 (void * param0, NNSG2dCharacterData ** param1) +static void *sub_020075A0(void *param0, NNSG2dCharacterData **param1) { if (param0 != NULL) { if (NNS_G2dGetUnpackedBGCharacterData(param0, param1) == 0) { @@ -503,7 +504,7 @@ static void * sub_020075A0 (void * param0, NNSG2dCharacterData ** param1) return param0; } -static void * sub_020075BC (void * param0, NNSG2dScreenData ** param1) +static void *sub_020075BC(void *param0, NNSG2dScreenData **param1) { if (param0 != NULL) { if (NNS_G2dGetUnpackedScreenData(param0, param1) == 0) { @@ -515,7 +516,7 @@ static void * sub_020075BC (void * param0, NNSG2dScreenData ** param1) return param0; } -static void * sub_020075D8 (void * param0, NNSG2dPaletteData ** param1) +static void *sub_020075D8(void *param0, NNSG2dPaletteData **param1) { if (param0 != NULL) { if (NNS_G2dGetUnpackedPaletteData(param0, param1) == 0) { @@ -527,7 +528,7 @@ static void * sub_020075D8 (void * param0, NNSG2dPaletteData ** param1) return param0; } -static void * sub_020075F4 (void * param0, NNSG2dCellDataBank ** param1) +static void *sub_020075F4(void *param0, NNSG2dCellDataBank **param1) { if (param0 != NULL) { if (NNS_G2dGetUnpackedCellBank(param0, param1) == 0) { @@ -539,7 +540,7 @@ static void * sub_020075F4 (void * param0, NNSG2dCellDataBank ** param1) return param0; } -static void * sub_02007610 (void * param0, NNSG2dAnimBankData ** param1) +static void *sub_02007610(void *param0, NNSG2dAnimBankData **param1) { if (param0 != NULL) { if (NNS_G2dGetUnpackedAnimBank(param0, param1) == 0) { diff --git a/src/unk_0200762C.c b/src/unk_0200762C.c index 47d457a1a3..ade3c66708 100644 --- a/src/unk_0200762C.c +++ b/src/unk_0200762C.c @@ -1,323 +1,323 @@ +#include "unk_0200762C.h" + #include #include -#include "inlines.h" - -#include "struct_defs/struct_02007768.h" +#include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" -#include "functypes/funcptr_02007C34.h" +#include "struct_defs/struct_02007768.h" #include "struct_defs/struct_02007C7C.h" #include "struct_defs/struct_02008900.h" -#include "struct_defs/archived_sprite.h" -#include "unk_02002F38.h" -#include "narc.h" -#include "unk_0200762C.h" +#include "functypes/funcptr_02007C34.h" + #include "heap.h" +#include "inlines.h" +#include "narc.h" +#include "unk_02002F38.h" typedef struct { u8 unk_00; u8 unk_01; } UnkStruct_020E4E62; - static const UnkStruct_020E4E62 Unk_020E4E62[] = { - { 0x1B, 0xF }, - { 0x1C, 0xF }, - { 0x1D, 0xF }, - { 0x1E, 0xF }, - { 0x1A, 0x10 }, - { 0x1B, 0x10 }, - { 0x1C, 0x10 }, - { 0x1D, 0x10 }, - { 0x1E, 0x10 }, - { 0x1F, 0x10 }, - { 0x19, 0x11 }, - { 0x1A, 0x11 }, - { 0x1B, 0x11 }, - { 0x1C, 0x11 }, - { 0x1D, 0x11 }, - { 0x1E, 0x11 }, - { 0x1F, 0x11 }, - { 0x20, 0x11 }, - { 0x19, 0x12 }, - { 0x1A, 0x12 }, - { 0x1B, 0x12 }, - { 0x1C, 0x12 }, - { 0x1D, 0x12 }, - { 0x1E, 0x12 }, - { 0x1F, 0x12 }, - { 0x20, 0x12 }, - { 0x19, 0x13 }, - { 0x1A, 0x13 }, - { 0x1B, 0x13 }, - { 0x1C, 0x13 }, - { 0x1D, 0x13 }, - { 0x1E, 0x13 }, - { 0x1F, 0x13 }, - { 0x20, 0x13 }, - { 0x19, 0x14 }, - { 0x1A, 0x14 }, - { 0x1B, 0x14 }, - { 0x1C, 0x14 }, - { 0x1D, 0x14 }, - { 0x1E, 0x14 }, - { 0x1F, 0x14 }, - { 0x20, 0x14 }, - { 0x1A, 0x15 }, - { 0x1B, 0x15 }, - { 0x1C, 0x15 }, - { 0x1D, 0x15 }, - { 0x1E, 0x15 }, - { 0x1F, 0x15 }, - { 0x1B, 0x16 }, - { 0x1C, 0x16 }, - { 0x1D, 0x16 }, - { 0x1E, 0x16 }, - { 0xff, 0xff } + { 0x1B, 0xF }, + { 0x1C, 0xF }, + { 0x1D, 0xF }, + { 0x1E, 0xF }, + { 0x1A, 0x10 }, + { 0x1B, 0x10 }, + { 0x1C, 0x10 }, + { 0x1D, 0x10 }, + { 0x1E, 0x10 }, + { 0x1F, 0x10 }, + { 0x19, 0x11 }, + { 0x1A, 0x11 }, + { 0x1B, 0x11 }, + { 0x1C, 0x11 }, + { 0x1D, 0x11 }, + { 0x1E, 0x11 }, + { 0x1F, 0x11 }, + { 0x20, 0x11 }, + { 0x19, 0x12 }, + { 0x1A, 0x12 }, + { 0x1B, 0x12 }, + { 0x1C, 0x12 }, + { 0x1D, 0x12 }, + { 0x1E, 0x12 }, + { 0x1F, 0x12 }, + { 0x20, 0x12 }, + { 0x19, 0x13 }, + { 0x1A, 0x13 }, + { 0x1B, 0x13 }, + { 0x1C, 0x13 }, + { 0x1D, 0x13 }, + { 0x1E, 0x13 }, + { 0x1F, 0x13 }, + { 0x20, 0x13 }, + { 0x19, 0x14 }, + { 0x1A, 0x14 }, + { 0x1B, 0x14 }, + { 0x1C, 0x14 }, + { 0x1D, 0x14 }, + { 0x1E, 0x14 }, + { 0x1F, 0x14 }, + { 0x20, 0x14 }, + { 0x1A, 0x15 }, + { 0x1B, 0x15 }, + { 0x1C, 0x15 }, + { 0x1D, 0x15 }, + { 0x1E, 0x15 }, + { 0x1F, 0x15 }, + { 0x1B, 0x16 }, + { 0x1C, 0x16 }, + { 0x1D, 0x16 }, + { 0x1E, 0x16 }, + { 0xff, 0xff } }; static const UnkStruct_020E4E62 Unk_020E4DF8[] = { - { 0x33, 0x11 }, - { 0x34, 0x11 }, - { 0x35, 0x11 }, - { 0x36, 0x11 }, - { 0x32, 0x12 }, - { 0x33, 0x12 }, - { 0x34, 0x12 }, - { 0x35, 0x12 }, - { 0x36, 0x12 }, - { 0x37, 0x12 }, - { 0x31, 0x13 }, - { 0x32, 0x13 }, - { 0x33, 0x13 }, - { 0x34, 0x13 }, - { 0x35, 0x13 }, - { 0x36, 0x13 }, - { 0x37, 0x13 }, - { 0x38, 0x13 }, - { 0x31, 0x14 }, - { 0x32, 0x14 }, - { 0x33, 0x14 }, - { 0x34, 0x14 }, - { 0x35, 0x14 }, - { 0x36, 0x14 }, - { 0x37, 0x14 }, - { 0x38, 0x14 }, - { 0x31, 0x15 }, - { 0x32, 0x15 }, - { 0x33, 0x15 }, - { 0x34, 0x15 }, - { 0x35, 0x15 }, - { 0x36, 0x15 }, - { 0x37, 0x15 }, - { 0x38, 0x15 }, - { 0x31, 0x16 }, - { 0x32, 0x16 }, - { 0x33, 0x16 }, - { 0x34, 0x16 }, - { 0x35, 0x16 }, - { 0x36, 0x16 }, - { 0x37, 0x16 }, - { 0x38, 0x16 }, - { 0x32, 0x17 }, - { 0x33, 0x17 }, - { 0x34, 0x17 }, - { 0x35, 0x17 }, - { 0x36, 0x17 }, - { 0x37, 0x17 }, - { 0x33, 0x18 }, - { 0x34, 0x18 }, - { 0x35, 0x18 }, - { 0x36, 0x18 }, - { 0xff, 0xff } + { 0x33, 0x11 }, + { 0x34, 0x11 }, + { 0x35, 0x11 }, + { 0x36, 0x11 }, + { 0x32, 0x12 }, + { 0x33, 0x12 }, + { 0x34, 0x12 }, + { 0x35, 0x12 }, + { 0x36, 0x12 }, + { 0x37, 0x12 }, + { 0x31, 0x13 }, + { 0x32, 0x13 }, + { 0x33, 0x13 }, + { 0x34, 0x13 }, + { 0x35, 0x13 }, + { 0x36, 0x13 }, + { 0x37, 0x13 }, + { 0x38, 0x13 }, + { 0x31, 0x14 }, + { 0x32, 0x14 }, + { 0x33, 0x14 }, + { 0x34, 0x14 }, + { 0x35, 0x14 }, + { 0x36, 0x14 }, + { 0x37, 0x14 }, + { 0x38, 0x14 }, + { 0x31, 0x15 }, + { 0x32, 0x15 }, + { 0x33, 0x15 }, + { 0x34, 0x15 }, + { 0x35, 0x15 }, + { 0x36, 0x15 }, + { 0x37, 0x15 }, + { 0x38, 0x15 }, + { 0x31, 0x16 }, + { 0x32, 0x16 }, + { 0x33, 0x16 }, + { 0x34, 0x16 }, + { 0x35, 0x16 }, + { 0x36, 0x16 }, + { 0x37, 0x16 }, + { 0x38, 0x16 }, + { 0x32, 0x17 }, + { 0x33, 0x17 }, + { 0x34, 0x17 }, + { 0x35, 0x17 }, + { 0x36, 0x17 }, + { 0x37, 0x17 }, + { 0x33, 0x18 }, + { 0x34, 0x18 }, + { 0x35, 0x18 }, + { 0x36, 0x18 }, + { 0xff, 0xff } }; static const UnkStruct_020E4E62 Unk_020E4D90[] = { - { 0x1E, 0x21 }, - { 0x1F, 0x21 }, - { 0x20, 0x21 }, - { 0x1D, 0x22 }, - { 0x1E, 0x22 }, - { 0x1F, 0x22 }, - { 0x20, 0x22 }, - { 0x21, 0x22 }, - { 0x1C, 0x23 }, - { 0x1D, 0x23 }, - { 0x1E, 0x23 }, - { 0x1F, 0x23 }, - { 0x20, 0x23 }, - { 0x21, 0x23 }, - { 0x22, 0x23 }, - { 0x1C, 0x24 }, - { 0x1D, 0x24 }, - { 0x1E, 0x24 }, - { 0x1F, 0x24 }, - { 0x20, 0x24 }, - { 0x21, 0x24 }, - { 0x22, 0x24 }, - { 0x1C, 0x25 }, - { 0x1D, 0x25 }, - { 0x1E, 0x25 }, - { 0x1F, 0x25 }, - { 0x20, 0x25 }, - { 0x21, 0x25 }, - { 0x22, 0x25 }, - { 0x1C, 0x26 }, - { 0x1D, 0x26 }, - { 0x1E, 0x26 }, - { 0x1F, 0x26 }, - { 0x20, 0x26 }, - { 0x21, 0x26 }, - { 0x22, 0x26 }, - { 0x1C, 0x27 }, - { 0x1D, 0x27 }, - { 0x1E, 0x27 }, - { 0x1F, 0x27 }, - { 0x20, 0x27 }, - { 0x21, 0x27 }, - { 0x22, 0x27 }, - { 0x1D, 0x28 }, - { 0x1E, 0x28 }, - { 0x1F, 0x28 }, - { 0x20, 0x28 }, - { 0x21, 0x28 }, - { 0x1E, 0x29 }, - { 0x1F, 0x29 }, - { 0x20, 0x29 }, - { 0xff, 0xff } + { 0x1E, 0x21 }, + { 0x1F, 0x21 }, + { 0x20, 0x21 }, + { 0x1D, 0x22 }, + { 0x1E, 0x22 }, + { 0x1F, 0x22 }, + { 0x20, 0x22 }, + { 0x21, 0x22 }, + { 0x1C, 0x23 }, + { 0x1D, 0x23 }, + { 0x1E, 0x23 }, + { 0x1F, 0x23 }, + { 0x20, 0x23 }, + { 0x21, 0x23 }, + { 0x22, 0x23 }, + { 0x1C, 0x24 }, + { 0x1D, 0x24 }, + { 0x1E, 0x24 }, + { 0x1F, 0x24 }, + { 0x20, 0x24 }, + { 0x21, 0x24 }, + { 0x22, 0x24 }, + { 0x1C, 0x25 }, + { 0x1D, 0x25 }, + { 0x1E, 0x25 }, + { 0x1F, 0x25 }, + { 0x20, 0x25 }, + { 0x21, 0x25 }, + { 0x22, 0x25 }, + { 0x1C, 0x26 }, + { 0x1D, 0x26 }, + { 0x1E, 0x26 }, + { 0x1F, 0x26 }, + { 0x20, 0x26 }, + { 0x21, 0x26 }, + { 0x22, 0x26 }, + { 0x1C, 0x27 }, + { 0x1D, 0x27 }, + { 0x1E, 0x27 }, + { 0x1F, 0x27 }, + { 0x20, 0x27 }, + { 0x21, 0x27 }, + { 0x22, 0x27 }, + { 0x1D, 0x28 }, + { 0x1E, 0x28 }, + { 0x1F, 0x28 }, + { 0x20, 0x28 }, + { 0x21, 0x28 }, + { 0x1E, 0x29 }, + { 0x1F, 0x29 }, + { 0x20, 0x29 }, + { 0xff, 0xff } }; static const UnkStruct_020E4E62 Unk_020E4F4C[] = { - { 0x2B, 0x21 }, - { 0x2C, 0x21 }, - { 0x2D, 0x21 }, - { 0x29, 0x22 }, - { 0x2A, 0x22 }, - { 0x2B, 0x22 }, - { 0x2C, 0x22 }, - { 0x2D, 0x22 }, - { 0x2E, 0x22 }, - { 0x2F, 0x22 }, - { 0x28, 0x23 }, - { 0x29, 0x23 }, - { 0x2A, 0x23 }, - { 0x2B, 0x23 }, - { 0x2C, 0x23 }, - { 0x2D, 0x23 }, - { 0x2E, 0x23 }, - { 0x2F, 0x23 }, - { 0x30, 0x23 }, - { 0x28, 0x24 }, - { 0x29, 0x24 }, - { 0x2A, 0x24 }, - { 0x2B, 0x24 }, - { 0x2C, 0x24 }, - { 0x2D, 0x24 }, - { 0x2E, 0x24 }, - { 0x2F, 0x24 }, - { 0x30, 0x24 }, - { 0x28, 0x25 }, - { 0x29, 0x25 }, - { 0x2A, 0x25 }, - { 0x2B, 0x25 }, - { 0x2C, 0x25 }, - { 0x2D, 0x25 }, - { 0x2E, 0x25 }, - { 0x2F, 0x25 }, - { 0x30, 0x25 }, - { 0x28, 0x26 }, - { 0x29, 0x26 }, - { 0x2A, 0x26 }, - { 0x2B, 0x26 }, - { 0x2C, 0x26 }, - { 0x2D, 0x26 }, - { 0x2E, 0x26 }, - { 0x2F, 0x26 }, - { 0x30, 0x26 }, - { 0x28, 0x27 }, - { 0x29, 0x27 }, - { 0x2A, 0x27 }, - { 0x2B, 0x27 }, - { 0x2C, 0x27 }, - { 0x2D, 0x27 }, - { 0x2E, 0x27 }, - { 0x2F, 0x27 }, - { 0x30, 0x27 }, - { 0x28, 0x28 }, - { 0x29, 0x28 }, - { 0x2A, 0x28 }, - { 0x2B, 0x28 }, - { 0x2C, 0x28 }, - { 0x2D, 0x28 }, - { 0x2E, 0x28 }, - { 0x2F, 0x28 }, - { 0x30, 0x28 }, - { 0x29, 0x29 }, - { 0x2A, 0x29 }, - { 0x2B, 0x29 }, - { 0x2C, 0x29 }, - { 0x2D, 0x29 }, - { 0x2E, 0x29 }, - { 0x2F, 0x29 }, - { 0x2B, 0x2A }, - { 0x2C, 0x2A }, - { 0x2D, 0x2A }, - { 0xff, 0xff } + { 0x2B, 0x21 }, + { 0x2C, 0x21 }, + { 0x2D, 0x21 }, + { 0x29, 0x22 }, + { 0x2A, 0x22 }, + { 0x2B, 0x22 }, + { 0x2C, 0x22 }, + { 0x2D, 0x22 }, + { 0x2E, 0x22 }, + { 0x2F, 0x22 }, + { 0x28, 0x23 }, + { 0x29, 0x23 }, + { 0x2A, 0x23 }, + { 0x2B, 0x23 }, + { 0x2C, 0x23 }, + { 0x2D, 0x23 }, + { 0x2E, 0x23 }, + { 0x2F, 0x23 }, + { 0x30, 0x23 }, + { 0x28, 0x24 }, + { 0x29, 0x24 }, + { 0x2A, 0x24 }, + { 0x2B, 0x24 }, + { 0x2C, 0x24 }, + { 0x2D, 0x24 }, + { 0x2E, 0x24 }, + { 0x2F, 0x24 }, + { 0x30, 0x24 }, + { 0x28, 0x25 }, + { 0x29, 0x25 }, + { 0x2A, 0x25 }, + { 0x2B, 0x25 }, + { 0x2C, 0x25 }, + { 0x2D, 0x25 }, + { 0x2E, 0x25 }, + { 0x2F, 0x25 }, + { 0x30, 0x25 }, + { 0x28, 0x26 }, + { 0x29, 0x26 }, + { 0x2A, 0x26 }, + { 0x2B, 0x26 }, + { 0x2C, 0x26 }, + { 0x2D, 0x26 }, + { 0x2E, 0x26 }, + { 0x2F, 0x26 }, + { 0x30, 0x26 }, + { 0x28, 0x27 }, + { 0x29, 0x27 }, + { 0x2A, 0x27 }, + { 0x2B, 0x27 }, + { 0x2C, 0x27 }, + { 0x2D, 0x27 }, + { 0x2E, 0x27 }, + { 0x2F, 0x27 }, + { 0x30, 0x27 }, + { 0x28, 0x28 }, + { 0x29, 0x28 }, + { 0x2A, 0x28 }, + { 0x2B, 0x28 }, + { 0x2C, 0x28 }, + { 0x2D, 0x28 }, + { 0x2E, 0x28 }, + { 0x2F, 0x28 }, + { 0x30, 0x28 }, + { 0x29, 0x29 }, + { 0x2A, 0x29 }, + { 0x2B, 0x29 }, + { 0x2C, 0x29 }, + { 0x2D, 0x29 }, + { 0x2E, 0x29 }, + { 0x2F, 0x29 }, + { 0x2B, 0x2A }, + { 0x2C, 0x2A }, + { 0x2D, 0x2A }, + { 0xff, 0xff } }; static const UnkStruct_020E4E62 *Unk_021007A4[] = { - (UnkStruct_020E4E62 *)&Unk_020E4E62, - (UnkStruct_020E4E62 *)&Unk_020E4DF8, - (UnkStruct_020E4E62 *)&Unk_020E4D90, - (UnkStruct_020E4E62 *)&Unk_020E4F4C + (UnkStruct_020E4E62 *)&Unk_020E4E62, + (UnkStruct_020E4E62 *)&Unk_020E4DF8, + (UnkStruct_020E4E62 *)&Unk_020E4D90, + (UnkStruct_020E4E62 *)&Unk_020E4F4C }; -void * sub_0200762C(int param0); -void sub_02007768(UnkStruct_02007768 * param0); -void sub_02007B6C(UnkStruct_02007768 * param0); -Sprite * sub_02007C34(UnkStruct_02007768 * param0, ArchivedSprite * param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame * param6, UnkFuncPtr_02007C34 * param7); -Sprite * sub_02007C7C(UnkStruct_02007768 * param0, ArchivedSprite * param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame * param7, UnkFuncPtr_02007C34 * param8); -void sub_02007DC8(Sprite * param0); -void sub_02007DD4(UnkStruct_02007768 * param0); -void sub_02007B98(Sprite * param0, int param1); -void sub_02007C10(Sprite * param0, SpriteAnimationFrame * param1); -BOOL sub_02007C24(Sprite * param0); -void sub_02007DEC(Sprite * param0, int param1, int param2); -int sub_020080C0(Sprite * param0, int param1); -void sub_02008274(Sprite * param0, int param1, int param2); -void sub_020086D4(Sprite * param0, int param1, int param2, int param3, int param4); -void sub_020086FC(Sprite * param0, int param1, int param2, int param3, int param4); -void sub_0200872C(UnkStruct_02007768 * param0, int param1, int param2, int param3, int param4); -void sub_02008780(Sprite * param0); -BOOL sub_020087B4(Sprite * param0); -void sub_020087C8(Sprite * param0, int param1); -void sub_020089A0(Sprite * param0); -void sub_020089B0(Sprite * param0); -void sub_02008A0C(Sprite * param0); -void sub_02008A78(UnkStruct_02007768 * param0, u32 param1, u32 param2); -void sub_02008A84(UnkStruct_02007768 * param0, u32 param1, u32 param2); -ArchivedSprite * sub_02008A90(Sprite * param0); -void sub_02008A94(UnkStruct_02007768 * param0); -void sub_02008B2C(UnkStruct_02007768 * param0, int param1); -BOOL sub_02008B38(Sprite * param0); -void sub_02008B54(UnkStruct_02007768 * param0, u32 param1); -void sub_02008B60(UnkStruct_02007768 * param0, u32 param1); -void sub_020091D8(u8 * param0, u32 param1, BOOL param2); -void sub_02009348(u8 * param0); -static void sub_02008B78(UnkStruct_02007768 * param0); -static void sub_02008FC8(UnkStruct_02007768 * param0); -static void sub_020088D8(Sprite * param0); +void *sub_0200762C(int param0); +void sub_02007768(UnkStruct_02007768 *param0); +void sub_02007B6C(UnkStruct_02007768 *param0); +Sprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7); +Sprite *sub_02007C7C(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8); +void sub_02007DC8(Sprite *param0); +void sub_02007DD4(UnkStruct_02007768 *param0); +void sub_02007B98(Sprite *param0, int param1); +void sub_02007C10(Sprite *param0, SpriteAnimationFrame *param1); +BOOL sub_02007C24(Sprite *param0); +void sub_02007DEC(Sprite *param0, int param1, int param2); +int sub_020080C0(Sprite *param0, int param1); +void sub_02008274(Sprite *param0, int param1, int param2); +void sub_020086D4(Sprite *param0, int param1, int param2, int param3, int param4); +void sub_020086FC(Sprite *param0, int param1, int param2, int param3, int param4); +void sub_0200872C(UnkStruct_02007768 *param0, int param1, int param2, int param3, int param4); +void sub_02008780(Sprite *param0); +BOOL sub_020087B4(Sprite *param0); +void sub_020087C8(Sprite *param0, int param1); +void sub_020089A0(Sprite *param0); +void sub_020089B0(Sprite *param0); +void sub_02008A0C(Sprite *param0); +void sub_02008A78(UnkStruct_02007768 *param0, u32 param1, u32 param2); +void sub_02008A84(UnkStruct_02007768 *param0, u32 param1, u32 param2); +ArchivedSprite *sub_02008A90(Sprite *param0); +void sub_02008A94(UnkStruct_02007768 *param0); +void sub_02008B2C(UnkStruct_02007768 *param0, int param1); +BOOL sub_02008B38(Sprite *param0); +void sub_02008B54(UnkStruct_02007768 *param0, u32 param1); +void sub_02008B60(UnkStruct_02007768 *param0, u32 param1); +void sub_020091D8(u8 *param0, u32 param1, BOOL param2); +void sub_02009348(u8 *param0); +static void sub_02008B78(UnkStruct_02007768 *param0); +static void sub_02008FC8(UnkStruct_02007768 *param0); +static void sub_020088D8(Sprite *param0); static u8 sub_020091AC(u8 param0); -static void sub_020091C0(Sprite * param0, u8 * param1); +static void sub_020091C0(Sprite *param0, u8 *param1); -void * sub_0200762C (int param0) +void *sub_0200762C(int param0) { - UnkStruct_02007768 * v0; + UnkStruct_02007768 *v0; int v1, v2, v3, v4; - NNSG2dCharacterData * v5; - u8 * v6; - void * v7; + NNSG2dCharacterData *v5; + u8 *v6; + void *v7; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02007768)); @@ -330,9 +330,9 @@ void * sub_0200762C (int param0) v0->unk_2FC = Heap_AllocFromHeap(param0, (32 * 32 * 0x20)); v0->unk_300 = Heap_AllocFromHeap(param0, (0x20 * 6)); - MI_CpuClearFast(v0->unk_300, sizeof((0x20 * 6))); + MI_CpuClearFast(v0->unk_300, sizeof(0x20 * 6)); v0->unk_304 = Heap_AllocFromHeap(param0, (0x20 * 6)); - MI_CpuClearFast(v0->unk_304, sizeof((0x20 * 6))); + MI_CpuClearFast(v0->unk_304, sizeof(0x20 * 6)); for (v1 = 0; v1 < 4; v1++) { MI_CpuClearFast(&v0->unk_00[v1], sizeof(Sprite)); @@ -369,31 +369,31 @@ void * sub_0200762C (int param0) static const int Unk_020E4ECC[4][2][4] = { { - {0x0, 0x0, 0x50, 0x50}, - {0x50, 0x0, 0xA0, 0x50} + { 0x0, 0x0, 0x50, 0x50 }, + { 0x50, 0x0, 0xA0, 0x50 }, }, { - {0x0, 0x50, 0x50, 0xA0}, - {0x50, 0x50, 0xA0, 0xA0} + { 0x0, 0x50, 0x50, 0xA0 }, + { 0x50, 0x50, 0xA0, 0xA0 }, }, { - {0x0, 0xA0, 0x50, 0xF0}, - {0x50, 0xA0, 0xA0, 0xF0} + { 0x0, 0xA0, 0x50, 0xF0 }, + { 0x50, 0xA0, 0xA0, 0xF0 }, }, { - {0xA0, 0x0, 0xF0, 0x50}, - {0xA0, 0x50, 0xF0, 0xA0} - } + { 0xA0, 0x0, 0xF0, 0x50 }, + { 0xA0, 0x50, 0xF0, 0xA0 }, + }, }; static const int Unk_020E4D50[4][4] = { - {0xA0, 0xA0, 0xE0, 0xB0}, - {0xA0, 0xA0, 0xE0, 0xB0}, - {0xA0, 0xB0, 0xE0, 0xC0}, - {0xA0, 0xC0, 0xE0, 0xD0} + { 0xA0, 0xA0, 0xE0, 0xB0 }, + { 0xA0, 0xA0, 0xE0, 0xB0 }, + { 0xA0, 0xB0, 0xE0, 0xC0 }, + { 0xA0, 0xC0, 0xE0, 0xD0 }, }; -void sub_02007768 (UnkStruct_02007768 * param0) +void sub_02007768(UnkStruct_02007768 *param0) { int v0; int v1, v2; @@ -483,7 +483,7 @@ void sub_02007768 (UnkStruct_02007768 * param0) G3_PopMtx(1); } -void sub_02007B6C (UnkStruct_02007768 * param0) +void sub_02007B6C(UnkStruct_02007768 *param0) { Heap_FreeToHeap(param0->unk_2FC); Heap_FreeToHeap(param0->unk_300); @@ -491,7 +491,7 @@ void sub_02007B6C (UnkStruct_02007768 * param0) Heap_FreeToHeap(param0); } -void sub_02007B98 (Sprite * param0, int param1) +void sub_02007B98(Sprite *param0, int param1) { int v0; @@ -511,17 +511,17 @@ void sub_02007B98 (Sprite * param0, int param1) } } -void sub_02007C10 (Sprite * param0, SpriteAnimationFrame * param1) +void sub_02007C10(Sprite *param0, SpriteAnimationFrame *param1) { MI_CpuCopy8(param1, ¶m0->unk_84, sizeof(SpriteAnimationFrame) * 10); } -BOOL sub_02007C24 (Sprite * param0) +BOOL sub_02007C24(Sprite *param0) { return param0->unk_58 != 0; } -Sprite * sub_02007C34 (UnkStruct_02007768 * param0, ArchivedSprite * param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame * param6, UnkFuncPtr_02007C34 * param7) +Sprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7) { int v0; @@ -536,7 +536,7 @@ Sprite * sub_02007C34 (UnkStruct_02007768 * param0, ArchivedSprite * param1, int return sub_02007C7C(param0, param1, param2, param3, param4, param5, v0, param6, param7); } -Sprite * sub_02007C7C (UnkStruct_02007768 * param0, ArchivedSprite * param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame * param7, UnkFuncPtr_02007C34 * param8) +Sprite *sub_02007C7C(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8) { GF_ASSERT(param0->unk_00[param6].unk_00_0 == 0); @@ -574,12 +574,12 @@ Sprite * sub_02007C7C (UnkStruct_02007768 * param0, ArchivedSprite * param1, int return ¶m0->unk_00[param6]; } -void sub_02007DC8 (Sprite * param0) +void sub_02007DC8(Sprite *param0) { param0->unk_00_0 = 0; } -void sub_02007DD4 (UnkStruct_02007768 * param0) +void sub_02007DD4(UnkStruct_02007768 *param0) { int v0; @@ -588,7 +588,7 @@ void sub_02007DD4 (UnkStruct_02007768 * param0) } } -void sub_02007DEC (Sprite * param0, int param1, int param2) +void sub_02007DEC(Sprite *param0, int param1, int param2) { switch (param1) { case 0: @@ -740,7 +740,7 @@ void sub_02007DEC (Sprite * param0, int param1, int param2) } } -int sub_020080C0 (Sprite * param0, int param1) +int sub_020080C0(Sprite *param0, int param1) { switch (param1) { case 0: @@ -843,7 +843,7 @@ int sub_020080C0 (Sprite * param0, int param1) return 0; } -void sub_02008274 (Sprite * param0, int param1, int param2) +void sub_02008274(Sprite *param0, int param1, int param2) { switch (param1) { case 0: @@ -995,7 +995,7 @@ void sub_02008274 (Sprite * param0, int param1, int param2) } } -void sub_020086D4 (Sprite * param0, int param1, int param2, int param3, int param4) +void sub_020086D4(Sprite *param0, int param1, int param2, int param3, int param4) { param0->unk_24.unk_30_1 = 1; param0->unk_24.unk_20 = param1; @@ -1004,7 +1004,7 @@ void sub_020086D4 (Sprite * param0, int param1, int param2, int param3, int para param0->unk_24.unk_23 = param4; } -void sub_020086FC (Sprite * param0, int param1, int param2, int param3, int param4) +void sub_020086FC(Sprite *param0, int param1, int param2, int param3, int param4) { param0->unk_24.unk_30_12 = 1; param0->unk_24.unk_24 = param1; @@ -1014,7 +1014,7 @@ void sub_020086FC (Sprite * param0, int param1, int param2, int param3, int para param0->unk_24.unk_28 = param4; } -void sub_0200872C (UnkStruct_02007768 * param0, int param1, int param2, int param3, int param4) +void sub_0200872C(UnkStruct_02007768 *param0, int param1, int param2, int param3, int param4) { int v0; @@ -1030,7 +1030,7 @@ void sub_0200872C (UnkStruct_02007768 * param0, int param1, int param2, int para } } -void sub_02008780 (Sprite * param0) +void sub_02008780(Sprite *param0) { param0->unk_24.unk_30_12 = 0; param0->unk_24.unk_24 = 0; @@ -1041,17 +1041,17 @@ void sub_02008780 (Sprite * param0) param0->unk_00_8 = 1; } -BOOL sub_020087B4 (Sprite * param0) +BOOL sub_020087B4(Sprite *param0) { return param0->unk_24.unk_30_12 == 1; } -void sub_020087C8 (Sprite * param0, int param1) +void sub_020087C8(Sprite *param0, int param1) { param0->unk_24.unk_0A = ((80 / 2) - param1) - ((((80 / 2) - param1) * param0->unk_24.unk_12) >> 8); } -static inline void inline_02008900 (u8 * param0, u8 * param1, u8 * param2, u8 * param3, u8 * param4, const SpriteAnimationFrame * param5) +static inline void inline_02008900(u8 *param0, u8 *param1, u8 *param2, u8 *param3, u8 *param4, const SpriteAnimationFrame *param5) { if (*param0) { if ((*param3) == 0) { @@ -1082,7 +1082,7 @@ static inline void inline_02008900 (u8 * param0, u8 * param1, u8 * param2, u8 * } } -static void sub_020087DC (Sprite * param0) +static void sub_020087DC(Sprite *param0) { if (param0->unk_58) { if (param0->unk_5A == 0) { @@ -1116,12 +1116,12 @@ static void sub_020087DC (Sprite * param0) } } -static void sub_020088D8 (Sprite * param0) +static void sub_020088D8(Sprite *param0) { sub_020087DC(param0); } -void sub_020088E0 (UnkStruct_02008900 * param0, const SpriteAnimationFrame * param1) +void sub_020088E0(UnkStruct_02008900 *param0, const SpriteAnimationFrame *param1) { int v0; @@ -1136,7 +1136,7 @@ void sub_020088E0 (UnkStruct_02008900 * param0, const SpriteAnimationFrame * par } } -int sub_02008900 (UnkStruct_02008900 * param0) +int sub_02008900(UnkStruct_02008900 *param0) { if (param0->unk_00) { inline_02008900(¶m0->unk_00, ¶m0->unk_01, ¶m0->unk_02, ¶m0->unk_03, param0->unk_04, param0->unk_10); @@ -1146,19 +1146,19 @@ int sub_02008900 (UnkStruct_02008900 * param0) return -1; } -void sub_020089A0 (Sprite * param0) +void sub_020089A0(Sprite *param0) { param0->unk_00_7 = 1; param0->unk_00_8 = 1; } -void sub_020089B0 (Sprite * param0) +void sub_020089B0(Sprite *param0) { param0->unk_14 = param0->unk_04; param0->unk_78 = param0->unk_6C; } -void sub_02008A0C (Sprite * param0) +void sub_02008A0C(Sprite *param0) { param0->unk_04 = param0->unk_14; param0->unk_6C = param0->unk_78; @@ -1166,24 +1166,24 @@ void sub_02008A0C (Sprite * param0) param0->unk_00_8 = 1; } -void sub_02008A78 (UnkStruct_02007768 * param0, u32 param1, u32 param2) +void sub_02008A78(UnkStruct_02007768 *param0, u32 param1, u32 param2) { param0->unk_2EC = param1; param0->unk_2F0 = param2; } -void sub_02008A84 (UnkStruct_02007768 * param0, u32 param1, u32 param2) +void sub_02008A84(UnkStruct_02007768 *param0, u32 param1, u32 param2) { param0->unk_2F4 = param1; param0->unk_2F8 = param2; } -ArchivedSprite * sub_02008A90 (Sprite * param0) +ArchivedSprite *sub_02008A90(Sprite *param0) { return ¶m0->unk_04; } -void sub_02008A94 (UnkStruct_02007768 * param0) +void sub_02008A94(UnkStruct_02007768 *param0) { if (param0->unk_331) { param0->unk_331 = 0; @@ -1210,33 +1210,33 @@ void sub_02008A94 (UnkStruct_02007768 * param0) } } -void sub_02008B2C (UnkStruct_02007768 * param0, int param1) +void sub_02008B2C(UnkStruct_02007768 *param0, int param1) { param0->unk_333 = param1; } -BOOL sub_02008B38 (Sprite * param0) +BOOL sub_02008B38(Sprite *param0) { GF_ASSERT(param0 != NULL); return param0->unk_00_0 != 0; } -void sub_02008B54 (UnkStruct_02007768 * param0, u32 param1) +void sub_02008B54(UnkStruct_02007768 *param0, u32 param1) { param0->unk_334 |= param1; } -void sub_02008B60 (UnkStruct_02007768 * param0, u32 param1) +void sub_02008B60(UnkStruct_02007768 *param0, u32 param1) { param0->unk_334 &= (param1 ^ 0xffffffff); } -static void sub_02008B78 (UnkStruct_02007768 * param0) +static void sub_02008B78(UnkStruct_02007768 *param0) { - NNSG2dCharacterData * v0; + NNSG2dCharacterData *v0; int v1, v2, v3; - u8 * v4; - void * v5; + u8 *v4; + void *v5; u8 v6; v6 = 0; @@ -1346,12 +1346,12 @@ static void sub_02008B78 (UnkStruct_02007768 * param0) param0->unk_331 = v6; } -static void sub_02008FC8 (UnkStruct_02007768 * param0) +static void sub_02008FC8(UnkStruct_02007768 *param0) { - NNSG2dPaletteData * v0; + NNSG2dPaletteData *v0; int v1, v2, v3; - u16 * v4; - void * v5; + u16 *v4; + void *v5; u8 v6; v6 = 0; @@ -1416,7 +1416,7 @@ static void sub_02008FC8 (UnkStruct_02007768 * param0) param0->unk_332 = v6; } -static u8 sub_020091AC (u8 param0) +static u8 sub_020091AC(u8 param0) { u8 v0; @@ -1426,7 +1426,7 @@ static u8 sub_020091AC (u8 param0) return v0; } -static void sub_020091C0 (Sprite * param0, u8 * param1) +static void sub_020091C0(Sprite *param0, u8 *param1) { if (param0->unk_04.spindaSpots == 0) { return; @@ -1435,9 +1435,9 @@ static void sub_020091C0 (Sprite * param0, u8 * param1) sub_020091D8(param1, param0->unk_04.personality, 1); } -void sub_020091D8 (u8 * param0, u32 param1, BOOL param2) +void sub_020091D8(u8 *param0, u32 param1, BOOL param2) { - const UnkStruct_020E4E62 * v0; + const UnkStruct_020E4E62 *v0; int v1; u8 v2, v3, v4; int v5; @@ -1500,16 +1500,16 @@ void sub_020091D8 (u8 * param0, u32 param1, BOOL param2) } } -static u16 sub_02009328 (u32 * param0) +static u16 sub_02009328(u32 *param0) { param0[0] = param0[0] * 1103515245L + 24691; return (u16)(param0[0] / 65536L); } -void sub_02009348 (u8 * param0) +void sub_02009348(u8 *param0) { int v0; - u16 * v1; + u16 *v1; u32 v2; v1 = (u16 *)param0; @@ -1521,10 +1521,10 @@ void sub_02009348 (u8 * param0) } } -void sub_02009370 (u8 * param0) +void sub_02009370(u8 *param0) { int v0; - u16 * v1; + u16 *v1; u32 v2; v1 = (u16 *)param0; @@ -1536,7 +1536,7 @@ void sub_02009370 (u8 * param0) } } -void sub_020093A0 (u8 * param0, int param1) +void sub_020093A0(u8 *param0, int param1) { if ((param1 == 165) || (param1 == 166)) { sub_02009370(param0); diff --git a/src/unk_020093B4.c b/src/unk_020093B4.c index e40e7cb977..042e6073f9 100644 --- a/src/unk_020093B4.c +++ b/src/unk_020093B4.c @@ -1,35 +1,36 @@ +#include "unk_020093B4.h" + #include #include #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_020218BC_decl.h" - #include "struct_defs/struct_02009508.h" #include "struct_defs/struct_02009508_1.h" #include "struct_defs/struct_020095C4.h" #include "struct_defs/struct_0200C738.h" + #include "overlay019/struct_ov19_021DA864.h" -#include "unk_020093B4.h" +#include "heap.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "heap.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" #include "unk_020218BC.h" #include "unk_0202309C.h" -void sub_020093B4 (UnkStruct_ov19_021DA864 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, UnkStruct_02009714 * param9, UnkStruct_02009714 * param10, UnkStruct_02009714 * param11, UnkStruct_02009714 * param12, UnkStruct_02009714 * param13, UnkStruct_02009714 * param14) +void sub_020093B4(UnkStruct_ov19_021DA864 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, UnkStruct_02009714 *param9, UnkStruct_02009714 *param10, UnkStruct_02009714 *param11, UnkStruct_02009714 *param12, UnkStruct_02009714 *param13, UnkStruct_02009714 *param14) { - UnkStruct_02009DC8 * v0; - UnkStruct_02009DC8 * v1; - UnkStruct_02009DC8 * v2; - UnkStruct_02009DC8 * v3 = NULL; - UnkStruct_02009DC8 * v4 = NULL; - UnkStruct_02009DC8 * v5 = NULL; - NNSG2dImageProxy * v6; + UnkStruct_02009DC8 *v0; + UnkStruct_02009DC8 *v1; + UnkStruct_02009DC8 *v2; + UnkStruct_02009DC8 *v3 = NULL; + UnkStruct_02009DC8 *v4 = NULL; + UnkStruct_02009DC8 *v5 = NULL; + NNSG2dImageProxy *v6; GF_ASSERT(param9); GF_ASSERT(param10); @@ -96,17 +97,17 @@ void sub_020093B4 (UnkStruct_ov19_021DA864 * param0, int param1, int param2, int param0->unk_20 = param8; } -void sub_020094F0 (UnkStruct_ov19_021DA864 * param0) +void sub_020094F0(UnkStruct_ov19_021DA864 *param0) { sub_0200A5B4(param0->unk_00); memset(param0, 0, sizeof(UnkStruct_ov19_021DA864)); } -UnkStruct_02009508 * sub_02009508 (const UnkStruct_02009508_1 * param0, int param1, UnkStruct_02009714 * param2, UnkStruct_02009714 * param3, UnkStruct_02009714 * param4, UnkStruct_02009714 * param5, UnkStruct_02009714 * param6, UnkStruct_02009714 * param7) +UnkStruct_02009508 *sub_02009508(const UnkStruct_02009508_1 *param0, int param1, UnkStruct_02009714 *param2, UnkStruct_02009714 *param3, UnkStruct_02009714 *param4, UnkStruct_02009714 *param5, UnkStruct_02009714 *param6, UnkStruct_02009714 *param7) { int v0; int v1; - UnkStruct_02009508 * v2; + UnkStruct_02009508 *v2; int v3, v4; v1 = 0; @@ -126,7 +127,7 @@ UnkStruct_02009508 * sub_02009508 (const UnkStruct_02009508_1 * param0, int para return v2; } -void sub_020095A8 (UnkStruct_02009508 * param0) +void sub_020095A8(UnkStruct_02009508 *param0) { GF_ASSERT(param0); @@ -137,7 +138,7 @@ void sub_020095A8 (UnkStruct_02009508 * param0) Heap_FreeToHeap(param0); } -GraphicElementManager * sub_020095C4 (int param0, UnkStruct_0200C738 * param1, int param2) +GraphicElementManager *sub_020095C4(int param0, UnkStruct_0200C738 *param1, int param2) { UnkStruct_020095C4 v0; NNSG2dViewRect v1; @@ -165,7 +166,7 @@ GraphicElementManager * sub_020095C4 (int param0, UnkStruct_0200C738 * param1, i return sub_020218BC(&v0); } -void sub_0200962C (UnkStruct_0200C738 * param0, fx32 param1, fx32 param2) +void sub_0200962C(UnkStruct_0200C738 *param0, fx32 param1, fx32 param2) { NNSG2dViewRect v0; @@ -177,7 +178,7 @@ void sub_0200962C (UnkStruct_0200C738 * param0, fx32 param1, fx32 param2) sub_020230E0(¶m0->unk_94[0], &v0); } -void sub_0200964C (UnkStruct_0200C738 * param0, fx32 param1, fx32 param2) +void sub_0200964C(UnkStruct_0200C738 *param0, fx32 param1, fx32 param2) { NNSG2dViewRect v0; @@ -189,7 +190,7 @@ void sub_0200964C (UnkStruct_0200C738 * param0, fx32 param1, fx32 param2) sub_020230E0(¶m0->unk_94[1], &v0); } -void sub_0200966C (u32 param0, GXOBJVRamModeChar param1) +void sub_0200966C(u32 param0, GXOBJVRamModeChar param1) { switch (param1) { case GX_OBJVRAMMODE_CHAR_1D_32K: @@ -215,7 +216,7 @@ void sub_0200966C (u32 param0, GXOBJVRamModeChar param1) } } -void sub_02009704 (u32 param0) +void sub_02009704(u32 param0) { sub_0201F890((1 << 14 | 1 << 15), param0); } diff --git a/src/unk_02009714.c b/src/unk_02009714.c index fa6e3ffa4e..1c1b4d98c9 100644 --- a/src/unk_02009714.c +++ b/src/unk_02009714.c @@ -1,28 +1,27 @@ +#include "unk_02009714.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0202298C_decl.h" #include "struct_decls/struct_02022BC0_decl.h" - #include "struct_defs/struct_02009CFC.h" +#include "heap.h" #include "narc.h" #include "unk_02006E3C.h" -#include "unk_02009714.h" -#include "heap.h" #include "unk_0202298C.h" - typedef struct UnkStruct_02009DC8_t { - UnkStruct_02022BC0 * unk_00; + UnkStruct_02022BC0 *unk_00; int unk_04; - void * unk_08; + void *unk_08; } UnkStruct_02009DC8; typedef struct UnkStruct_02009714_t { - UnkStruct_0202298C * unk_00; - UnkStruct_02009DC8 * unk_04; + UnkStruct_0202298C *unk_00; + UnkStruct_02009DC8 *unk_04; int unk_08; int unk_0C; int unk_10; @@ -43,58 +42,58 @@ typedef struct { } UnkStruct_0200A2C0; typedef struct UnkStruct_02009F38_t { - void * unk_00; + void *unk_00; int unk_04; int unk_08; u8 unk_0C; } UnkStruct_02009F38; typedef struct { - NNSG2dCharacterData * unk_00; + NNSG2dCharacterData *unk_00; int unk_04; } UnkStruct_0200A144; typedef struct { - NNSG2dPaletteData * unk_00; + NNSG2dPaletteData *unk_00; int unk_04; int unk_08; } UnkStruct_02009E34; typedef struct { - NNSG2dCellDataBank * unk_00; + NNSG2dCellDataBank *unk_00; } UnkStruct_02009E4C; typedef struct { - NNSG2dAnimBankData * unk_00; + NNSG2dAnimBankData *unk_00; } UnkStruct_02009E64; typedef struct { - NNSG2dMultiCellDataBank * unk_00; + NNSG2dMultiCellDataBank *unk_00; } UnkStruct_02009E7C; typedef struct { - NNSG2dAnimBankData * unk_00; + NNSG2dAnimBankData *unk_00; } UnkStruct_02009E94; -static UnkStruct_02009DC8 * sub_0200A0A8(UnkStruct_02009714 * param0); -static void sub_0200A224(UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, const char * param2, int param3, int param4, int param5, int param6, int param7); -static void sub_0200A250(UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, int param2, int param3, BOOL param4, int param5, int param6, int param7, int param8, int param9, u32 param10); -static void sub_0200A288(UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, NARC * param2, int param3, BOOL param4, int param5, int param6, int param7, int param8, int param9, u32 param10); -static void * sub_0200A2DC(NARC * param0, u32 param1, BOOL param2, u32 param3, u32 param4); -static void sub_0200A0D4(UnkStruct_02009DC8 * param0, int param1, int param2, int param3, int param4); -static UnkStruct_0200A144 * sub_0200A144(void * param0, int param1, int param2); -static UnkStruct_02009E34 * sub_0200A164(void * param0, int param1, int param2, int param3); -static UnkStruct_02009E4C * sub_0200A188(void * param0, int param1); -static UnkStruct_02009E64 * sub_0200A1A4(void * param0, int param1); -static UnkStruct_02009E7C * sub_0200A1C0(void * param0, int param1); -static UnkStruct_02009E94 * sub_0200A1DC(void * param0, int param1); -static void * sub_0200A20C(const UnkStruct_02009DC8 * param0); -static void sub_0200A1F8(UnkStruct_02009DC8 * param0); -static int sub_0200A2C0(const UnkStruct_0200A2C0 * param0); - -UnkStruct_02009714 * sub_02009714 (int param0, int param1, int param2) -{ - UnkStruct_02009714 * v0; +static UnkStruct_02009DC8 *sub_0200A0A8(UnkStruct_02009714 *param0); +static void sub_0200A224(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, const char *param2, int param3, int param4, int param5, int param6, int param7); +static void sub_0200A250(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, int param2, int param3, BOOL param4, int param5, int param6, int param7, int param8, int param9, u32 param10); +static void sub_0200A288(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, NARC *param2, int param3, BOOL param4, int param5, int param6, int param7, int param8, int param9, u32 param10); +static void *sub_0200A2DC(NARC *param0, u32 param1, BOOL param2, u32 param3, u32 param4); +static void sub_0200A0D4(UnkStruct_02009DC8 *param0, int param1, int param2, int param3, int param4); +static UnkStruct_0200A144 *sub_0200A144(void *param0, int param1, int param2); +static UnkStruct_02009E34 *sub_0200A164(void *param0, int param1, int param2, int param3); +static UnkStruct_02009E4C *sub_0200A188(void *param0, int param1); +static UnkStruct_02009E64 *sub_0200A1A4(void *param0, int param1); +static UnkStruct_02009E7C *sub_0200A1C0(void *param0, int param1); +static UnkStruct_02009E94 *sub_0200A1DC(void *param0, int param1); +static void *sub_0200A20C(const UnkStruct_02009DC8 *param0); +static void sub_0200A1F8(UnkStruct_02009DC8 *param0); +static int sub_0200A2C0(const UnkStruct_0200A2C0 *param0); + +UnkStruct_02009714 *sub_02009714(int param0, int param1, int param2) +{ + UnkStruct_02009714 *v0; int v1; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_02009714)); @@ -110,7 +109,7 @@ UnkStruct_02009714 * sub_02009714 (int param0, int param1, int param2) return v0; } -void sub_02009754 (UnkStruct_02009714 * param0) +void sub_02009754(UnkStruct_02009714 *param0) { GF_ASSERT(param0); GF_ASSERT(param0->unk_00); @@ -128,11 +127,11 @@ void sub_02009754 (UnkStruct_02009714 * param0) param0 = NULL; } -UnkStruct_02009DC8 * sub_02009794 (UnkStruct_02009714 * param0, const UnkStruct_02009F38 * param1, int param2, int param3) +UnkStruct_02009DC8 *sub_02009794(UnkStruct_02009714 *param0, const UnkStruct_02009F38 *param1, int param2, int param3) { - UnkStruct_02009DC8 * v0; - UnkStruct_02009794 * v1; - UnkStruct_0200A2C0 * v2; + UnkStruct_02009DC8 *v0; + UnkStruct_02009794 *v1; + UnkStruct_0200A2C0 *v2; GF_ASSERT(param0); GF_ASSERT(param1); @@ -157,9 +156,9 @@ UnkStruct_02009DC8 * sub_02009794 (UnkStruct_02009714 * param0, const UnkStruct_ return v0; } -UnkStruct_02009DC8 * sub_0200985C (UnkStruct_02009714 * param0, int param1, int param2, BOOL param3, int param4, int param5, int param6) +UnkStruct_02009DC8 *sub_0200985C(UnkStruct_02009714 *param0, int param1, int param2, BOOL param3, int param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; GF_ASSERT(param0); GF_ASSERT(param0->unk_10 == 0); @@ -174,9 +173,9 @@ UnkStruct_02009DC8 * sub_0200985C (UnkStruct_02009714 * param0, int param1, int return v0; } -UnkStruct_02009DC8 * sub_020098B8 (UnkStruct_02009714 * param0, int param1, int param2, BOOL param3, int param4, int param5, int param6, int param7) +UnkStruct_02009DC8 *sub_020098B8(UnkStruct_02009714 *param0, int param1, int param2, BOOL param3, int param4, int param5, int param6, int param7) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; GF_ASSERT(param0); GF_ASSERT(param0->unk_10 == 1); @@ -190,9 +189,9 @@ UnkStruct_02009DC8 * sub_020098B8 (UnkStruct_02009714 * param0, int param1, int return v0; } -UnkStruct_02009DC8 * sub_02009918 (UnkStruct_02009714 * param0, int param1, int param2, BOOL param3, int param4, int param5, int param6) +UnkStruct_02009DC8 *sub_02009918(UnkStruct_02009714 *param0, int param1, int param2, BOOL param3, int param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; GF_ASSERT(param0); @@ -205,7 +204,7 @@ UnkStruct_02009DC8 * sub_02009918 (UnkStruct_02009714 * param0, int param1, int return v0; } -void sub_02009968 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, int param2, int param3, BOOL param4, int param5) +void sub_02009968(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, int param2, int param3, BOOL param4, int param5) { int v0; int v1; @@ -222,7 +221,7 @@ void sub_02009968 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, int sub_0200A250(param0, param1, param2, param3, param4, v1, v0, 0, 0, param5, 0); } -void sub_020099D4 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, int param2, int param3, BOOL param4, int param5) +void sub_020099D4(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, int param2, int param3, BOOL param4, int param5) { int v0; int v1; @@ -241,9 +240,9 @@ void sub_020099D4 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, int sub_0200A250(param0, param1, param2, param3, param4, v2, v0, v1, 1, param5, 0); } -UnkStruct_02009DC8 * sub_02009A4C (UnkStruct_02009714 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6) +UnkStruct_02009DC8 *sub_02009A4C(UnkStruct_02009714 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; GF_ASSERT(param0); GF_ASSERT(param0->unk_10 == 0); @@ -257,9 +256,9 @@ UnkStruct_02009DC8 * sub_02009A4C (UnkStruct_02009714 * param0, NARC * param1, i return v0; } -UnkStruct_02009DC8 * sub_02009AA8 (UnkStruct_02009714 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6, int param7) +UnkStruct_02009DC8 *sub_02009AA8(UnkStruct_02009714 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6, int param7) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; GF_ASSERT(param0); GF_ASSERT(param0->unk_10 == 0); @@ -274,9 +273,9 @@ UnkStruct_02009DC8 * sub_02009AA8 (UnkStruct_02009714 * param0, NARC * param1, i return v0; } -UnkStruct_02009DC8 * sub_02009B04 (UnkStruct_02009714 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6, int param7) +UnkStruct_02009DC8 *sub_02009B04(UnkStruct_02009714 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6, int param7) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; GF_ASSERT(param0); GF_ASSERT(param0->unk_10 == 1); @@ -290,9 +289,9 @@ UnkStruct_02009DC8 * sub_02009B04 (UnkStruct_02009714 * param0, NARC * param1, i return v0; } -UnkStruct_02009DC8 * sub_02009B64 (UnkStruct_02009714 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6, int param7, int param8) +UnkStruct_02009DC8 *sub_02009B64(UnkStruct_02009714 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6, int param7, int param8) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; GF_ASSERT(param0); GF_ASSERT(param0->unk_10 == 1); @@ -306,9 +305,9 @@ UnkStruct_02009DC8 * sub_02009B64 (UnkStruct_02009714 * param0, NARC * param1, i return v0; } -UnkStruct_02009DC8 * sub_02009BC4 (UnkStruct_02009714 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6) +UnkStruct_02009DC8 *sub_02009BC4(UnkStruct_02009714 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; GF_ASSERT(param0); @@ -321,7 +320,7 @@ UnkStruct_02009DC8 * sub_02009BC4 (UnkStruct_02009714 * param0, NARC * param1, i return v0; } -void sub_02009C14 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, NARC * param2, int param3, BOOL param4, int param5) +void sub_02009C14(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, NARC *param2, int param3, BOOL param4, int param5) { int v0; int v1; @@ -338,7 +337,7 @@ void sub_02009C14 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, NAR sub_0200A288(param0, param1, param2, param3, param4, v1, v0, 0, 0, param5, 0); } -int sub_02009C80 (UnkStruct_02009714 * param0, const UnkStruct_02009F38 * param1, UnkStruct_02009CFC * param2, int param3) +int sub_02009C80(UnkStruct_02009714 *param0, const UnkStruct_02009F38 *param1, UnkStruct_02009CFC *param2, int param3) { GF_ASSERT(param0); GF_ASSERT(param1); @@ -347,10 +346,10 @@ int sub_02009C80 (UnkStruct_02009714 * param0, const UnkStruct_02009F38 * param1 return param1->unk_04; } -void sub_02009CB4 (UnkStruct_02009714 * param0, const UnkStruct_02009F38 * param1, int param2, int param3, UnkStruct_02009CFC * param4, int param5) +void sub_02009CB4(UnkStruct_02009714 *param0, const UnkStruct_02009F38 *param1, int param2, int param3, UnkStruct_02009CFC *param4, int param5) { int v0; - UnkStruct_02009DC8 * v1; + UnkStruct_02009DC8 *v1; for (v0 = param2; v0 < param2 + param3; v0++) { v1 = sub_02009794(param0, param1, v0, param5); @@ -364,9 +363,9 @@ void sub_02009CB4 (UnkStruct_02009714 * param0, const UnkStruct_02009F38 * param } } -UnkStruct_02009CFC * sub_02009CFC (int param0, int param1) +UnkStruct_02009CFC *sub_02009CFC(int param0, int param1) { - UnkStruct_02009CFC * v0; + UnkStruct_02009CFC *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02009CFC)); @@ -377,20 +376,20 @@ UnkStruct_02009CFC * sub_02009CFC (int param0, int param1) return v0; } -void sub_02009D20 (UnkStruct_02009CFC * param0) +void sub_02009D20(UnkStruct_02009CFC *param0) { Heap_FreeToHeap(param0->unk_00); Heap_FreeToHeap(param0); param0 = NULL; } -BOOL sub_02009D34 (const UnkStruct_02009714 * param0, int param1) +BOOL sub_02009D34(const UnkStruct_02009714 *param0, int param1) { GF_ASSERT(param0); return sub_020229F8(param0->unk_00, param1); } -void sub_02009D4C (UnkStruct_02009DC8 * param0) +void sub_02009D4C(UnkStruct_02009DC8 *param0) { GF_ASSERT(param0); @@ -398,7 +397,7 @@ void sub_02009D4C (UnkStruct_02009DC8 * param0) sub_02022B64(param0->unk_00, NULL); } -void sub_02009D68 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1) +void sub_02009D68(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk_04); @@ -410,7 +409,7 @@ void sub_02009D68 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1) param0->unk_0C--; } -void sub_02009D9C (UnkStruct_02009714 * param0) +void sub_02009D9C(UnkStruct_02009714 *param0) { int v0; @@ -421,7 +420,7 @@ void sub_02009D9C (UnkStruct_02009714 * param0) } } -UnkStruct_02009DC8 * sub_02009DC8 (const UnkStruct_02009714 * param0, int param1) +UnkStruct_02009DC8 *sub_02009DC8(const UnkStruct_02009714 *param0, int param1) { int v0; int v1; @@ -441,15 +440,15 @@ UnkStruct_02009DC8 * sub_02009DC8 (const UnkStruct_02009714 * param0, int param1 return NULL; } -int sub_02009E08 (const UnkStruct_02009DC8 * param0) +int sub_02009E08(const UnkStruct_02009DC8 *param0) { GF_ASSERT(param0); return sub_02022B80(param0->unk_00); } -NNSG2dCharacterData * sub_02009E1C (const UnkStruct_02009DC8 * param0) +NNSG2dCharacterData *sub_02009E1C(const UnkStruct_02009DC8 *param0) { - UnkStruct_0200A144 * v0; + UnkStruct_0200A144 *v0; GF_ASSERT(param0->unk_04 == 0); @@ -457,9 +456,9 @@ NNSG2dCharacterData * sub_02009E1C (const UnkStruct_02009DC8 * param0) return v0->unk_00; } -NNSG2dPaletteData * sub_02009E34 (const UnkStruct_02009DC8 * param0) +NNSG2dPaletteData *sub_02009E34(const UnkStruct_02009DC8 *param0) { - UnkStruct_02009E34 * v0; + UnkStruct_02009E34 *v0; GF_ASSERT(param0->unk_04 == 1); @@ -467,9 +466,9 @@ NNSG2dPaletteData * sub_02009E34 (const UnkStruct_02009DC8 * param0) return v0->unk_00; } -NNSG2dCellDataBank * sub_02009E4C (const UnkStruct_02009DC8 * param0) +NNSG2dCellDataBank *sub_02009E4C(const UnkStruct_02009DC8 *param0) { - UnkStruct_02009E4C * v0; + UnkStruct_02009E4C *v0; GF_ASSERT(param0->unk_04 == 2); @@ -477,9 +476,9 @@ NNSG2dCellDataBank * sub_02009E4C (const UnkStruct_02009DC8 * param0) return v0->unk_00; } -NNSG2dCellAnimBankData * sub_02009E64 (const UnkStruct_02009DC8 * param0) +NNSG2dCellAnimBankData *sub_02009E64(const UnkStruct_02009DC8 *param0) { - UnkStruct_02009E64 * v0; + UnkStruct_02009E64 *v0; GF_ASSERT(param0->unk_04 == 3); @@ -487,9 +486,9 @@ NNSG2dCellAnimBankData * sub_02009E64 (const UnkStruct_02009DC8 * param0) return v0->unk_00; } -NNSG2dMultiCellDataBank * sub_02009E7C (const UnkStruct_02009DC8 * param0) +NNSG2dMultiCellDataBank *sub_02009E7C(const UnkStruct_02009DC8 *param0) { - UnkStruct_02009E7C * v0; + UnkStruct_02009E7C *v0; GF_ASSERT(param0->unk_04 == 4); @@ -497,9 +496,9 @@ NNSG2dMultiCellDataBank * sub_02009E7C (const UnkStruct_02009DC8 * param0) return v0->unk_00; } -NNSG2dMultiCellAnimBankData * sub_02009E94 (const UnkStruct_02009DC8 * param0) +NNSG2dMultiCellAnimBankData *sub_02009E94(const UnkStruct_02009DC8 *param0) { - UnkStruct_02009E94 * v0; + UnkStruct_02009E94 *v0; GF_ASSERT(param0->unk_04 == 5); @@ -507,25 +506,25 @@ NNSG2dMultiCellAnimBankData * sub_02009E94 (const UnkStruct_02009DC8 * param0) return v0->unk_00; } -int sub_02009EAC (const UnkStruct_02009DC8 * param0) +int sub_02009EAC(const UnkStruct_02009DC8 *param0) { GF_ASSERT(param0); return param0->unk_04; } -int sub_02009EBC (const UnkStruct_02009DC8 * param0) +int sub_02009EBC(const UnkStruct_02009DC8 *param0) { GF_ASSERT(param0); if (param0->unk_04 == 0) { - UnkStruct_0200A144 * v0; + UnkStruct_0200A144 *v0; v0 = sub_0200A20C(param0); return v0->unk_04; } if (param0->unk_04 == 1) { - UnkStruct_02009E34 * v1; + UnkStruct_02009E34 *v1; v1 = sub_0200A20C(param0); return v1->unk_04; @@ -534,12 +533,12 @@ int sub_02009EBC (const UnkStruct_02009DC8 * param0) return 0; } -int sub_02009EE8 (const UnkStruct_02009DC8 * param0) +int sub_02009EE8(const UnkStruct_02009DC8 *param0) { GF_ASSERT(param0); if (param0->unk_04 == 1) { - UnkStruct_02009E34 * v0; + UnkStruct_02009E34 *v0; v0 = sub_0200A20C(param0); return v0->unk_08; @@ -548,39 +547,39 @@ int sub_02009EE8 (const UnkStruct_02009DC8 * param0) return 0; } -void sub_02009F08 (UnkStruct_02009DC8 * param0, int param1) +void sub_02009F08(UnkStruct_02009DC8 *param0, int param1) { GF_ASSERT(param0); if (param0->unk_04 == 0) { - UnkStruct_0200A144 * v0; + UnkStruct_0200A144 *v0; v0 = sub_0200A20C(param0); v0->unk_04 = param1; } if (param0->unk_04 == 1) { - UnkStruct_02009E34 * v1; + UnkStruct_02009E34 *v1; v1 = sub_0200A20C(param0); v1->unk_04 = param1; } } -int sub_02009F34 (void) +int sub_02009F34(void) { return sizeof(UnkStruct_02009F38); } -UnkStruct_02009F38 * sub_02009F38 (UnkStruct_02009F38 * param0, int param1) +UnkStruct_02009F38 *sub_02009F38(UnkStruct_02009F38 *param0, int param1) { return param0 + param1; } -void sub_02009F40 (const void * param0, UnkStruct_02009F38 * param1, int param2) +void sub_02009F40(const void *param0, UnkStruct_02009F38 *param1, int param2) { int v0; - const int * v1; + const int *v1; GF_ASSERT(param1); @@ -601,7 +600,7 @@ void sub_02009F40 (const void * param0, UnkStruct_02009F38 * param1, int param2) } } -void sub_02009F8C (UnkStruct_02009F38 * param0) +void sub_02009F8C(UnkStruct_02009F38 *param0) { if (param0->unk_00) { Heap_FreeToHeap(param0->unk_00); @@ -611,13 +610,13 @@ void sub_02009F8C (UnkStruct_02009F38 * param0) param0->unk_04 = 0; } -int sub_02009FA4 (const UnkStruct_02009F38 * param0) +int sub_02009FA4(const UnkStruct_02009F38 *param0) { GF_ASSERT(param0); return param0->unk_04; } -int sub_02009FB4 (const UnkStruct_02009F38 * param0, int param1) +int sub_02009FB4(const UnkStruct_02009F38 *param0, int param1) { int v0; @@ -625,17 +624,17 @@ int sub_02009FB4 (const UnkStruct_02009F38 * param0, int param1) GF_ASSERT(param0->unk_04 > param1); if (param0->unk_0C == 0) { - UnkStruct_02009794 * v1 = param0->unk_00; + UnkStruct_02009794 *v1 = param0->unk_00; v0 = v1[param1].unk_00; } else { - UnkStruct_0200A2C0 * v2 = param0->unk_00; + UnkStruct_0200A2C0 *v2 = param0->unk_00; v0 = v2[param1].unk_0C; } return v0; } -int sub_02009FE8 (const UnkStruct_02009F38 * param0, int param1) +int sub_02009FE8(const UnkStruct_02009F38 *param0, int param1) { int v0; @@ -643,7 +642,7 @@ int sub_02009FE8 (const UnkStruct_02009F38 * param0, int param1) GF_ASSERT(param0->unk_04 > param1); if (param0->unk_0C == 1) { - UnkStruct_0200A2C0 * v1 = param0->unk_00; + UnkStruct_0200A2C0 *v1 = param0->unk_00; v0 = v1[param1].unk_04; } @@ -651,7 +650,7 @@ int sub_02009FE8 (const UnkStruct_02009F38 * param0, int param1) return v0; } -int sub_0200A014 (const UnkStruct_02009F38 * param0, int param1) +int sub_0200A014(const UnkStruct_02009F38 *param0, int param1) { int v0; @@ -659,7 +658,7 @@ int sub_0200A014 (const UnkStruct_02009F38 * param0, int param1) GF_ASSERT(param0->unk_04 > param1); if (param0->unk_0C == 1) { - UnkStruct_0200A2C0 * v1 = param0->unk_00; + UnkStruct_0200A2C0 *v1 = param0->unk_00; v0 = v1[param1].unk_08; } @@ -667,7 +666,7 @@ int sub_0200A014 (const UnkStruct_02009F38 * param0, int param1) return v0; } -int sub_0200A040 (const UnkStruct_02009F38 * param0, int param1) +int sub_0200A040(const UnkStruct_02009F38 *param0, int param1) { int v0; @@ -675,17 +674,17 @@ int sub_0200A040 (const UnkStruct_02009F38 * param0, int param1) GF_ASSERT(param0->unk_04 > param1); if (param0->unk_0C == 0) { - UnkStruct_02009794 * v1 = param0->unk_00; + UnkStruct_02009794 *v1 = param0->unk_00; v0 = v1[param1].unk_44[0]; } else { - UnkStruct_0200A2C0 * v2 = param0->unk_00; + UnkStruct_0200A2C0 *v2 = param0->unk_00; v0 = v2[param1].unk_10[0]; } return v0; } -int sub_0200A074 (const UnkStruct_02009F38 * param0, int param1) +int sub_0200A074(const UnkStruct_02009F38 *param0, int param1) { int v0; @@ -693,17 +692,17 @@ int sub_0200A074 (const UnkStruct_02009F38 * param0, int param1) GF_ASSERT(param0->unk_04 > param1); if (param0->unk_0C == 0) { - UnkStruct_02009794 * v1 = param0->unk_00; + UnkStruct_02009794 *v1 = param0->unk_00; v0 = v1[param1].unk_44[1]; } else { - UnkStruct_0200A2C0 * v2 = param0->unk_00; + UnkStruct_0200A2C0 *v2 = param0->unk_00; v0 = v2[param1].unk_10[1]; } return v0; } -static UnkStruct_02009DC8 * sub_0200A0A8 (UnkStruct_02009714 * param0) +static UnkStruct_02009DC8 *sub_0200A0A8(UnkStruct_02009714 *param0) { int v0; @@ -716,9 +715,9 @@ static UnkStruct_02009DC8 * sub_0200A0A8 (UnkStruct_02009714 * param0) return NULL; } -static void sub_0200A0D4 (UnkStruct_02009DC8 * param0, int param1, int param2, int param3, int param4) +static void sub_0200A0D4(UnkStruct_02009DC8 *param0, int param1, int param2, int param3, int param4) { - void * v0; + void *v0; v0 = sub_02022B54(param0->unk_00); @@ -744,9 +743,9 @@ static void sub_0200A0D4 (UnkStruct_02009DC8 * param0, int param1, int param2, i } } -static UnkStruct_0200A144 * sub_0200A144 (void * param0, int param1, int param2) +static UnkStruct_0200A144 *sub_0200A144(void *param0, int param1, int param2) { - UnkStruct_0200A144 * v0; + UnkStruct_0200A144 *v0; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_0200A144)); NNS_G2dGetUnpackedCharacterData(param0, &v0->unk_00); @@ -755,9 +754,9 @@ static UnkStruct_0200A144 * sub_0200A144 (void * param0, int param1, int param2) return v0; } -static UnkStruct_02009E34 * sub_0200A164 (void * param0, int param1, int param2, int param3) +static UnkStruct_02009E34 *sub_0200A164(void *param0, int param1, int param2, int param3) { - UnkStruct_02009E34 * v0; + UnkStruct_02009E34 *v0; v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_02009E34)); NNS_G2dGetUnpackedPaletteData(param0, &v0->unk_00); @@ -768,9 +767,9 @@ static UnkStruct_02009E34 * sub_0200A164 (void * param0, int param1, int param2, return v0; } -static UnkStruct_02009E4C * sub_0200A188 (void * param0, int param1) +static UnkStruct_02009E4C *sub_0200A188(void *param0, int param1) { - UnkStruct_02009E4C * v0; + UnkStruct_02009E4C *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02009E4C)); NNS_G2dGetUnpackedCellBank(param0, &v0->unk_00); @@ -778,9 +777,9 @@ static UnkStruct_02009E4C * sub_0200A188 (void * param0, int param1) return v0; } -static UnkStruct_02009E64 * sub_0200A1A4 (void * param0, int param1) +static UnkStruct_02009E64 *sub_0200A1A4(void *param0, int param1) { - UnkStruct_02009E64 * v0; + UnkStruct_02009E64 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02009E64)); NNS_G2dGetUnpackedAnimBank(param0, &v0->unk_00); @@ -788,9 +787,9 @@ static UnkStruct_02009E64 * sub_0200A1A4 (void * param0, int param1) return v0; } -static UnkStruct_02009E7C * sub_0200A1C0 (void * param0, int param1) +static UnkStruct_02009E7C *sub_0200A1C0(void *param0, int param1) { - UnkStruct_02009E7C * v0; + UnkStruct_02009E7C *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02009E7C)); NNS_G2dGetUnpackedMultiCellBank(param0, &v0->unk_00); @@ -798,9 +797,9 @@ static UnkStruct_02009E7C * sub_0200A1C0 (void * param0, int param1) return v0; } -static UnkStruct_02009E94 * sub_0200A1DC (void * param0, int param1) +static UnkStruct_02009E94 *sub_0200A1DC(void *param0, int param1) { - UnkStruct_02009E94 * v0; + UnkStruct_02009E94 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02009E94)); NNS_G2dGetUnpackedMCAnimBank(param0, &v0->unk_00); @@ -808,7 +807,7 @@ static UnkStruct_02009E94 * sub_0200A1DC (void * param0, int param1) return v0; } -static void sub_0200A1F8 (UnkStruct_02009DC8 * param0) +static void sub_0200A1F8(UnkStruct_02009DC8 *param0) { if (param0->unk_08) { Heap_FreeToHeap(param0->unk_08); @@ -817,7 +816,7 @@ static void sub_0200A1F8 (UnkStruct_02009DC8 * param0) param0->unk_08 = NULL; } -static void * sub_0200A20C (const UnkStruct_02009DC8 * param0) +static void *sub_0200A20C(const UnkStruct_02009DC8 *param0) { GF_ASSERT(param0); GF_ASSERT(param0->unk_08); @@ -825,7 +824,7 @@ static void * sub_0200A20C (const UnkStruct_02009DC8 * param0) return param0->unk_08; } -static void sub_0200A224 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, const char * param2, int param3, int param4, int param5, int param6, int param7) +static void sub_0200A224(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, const char *param2, int param3, int param4, int param5, int param6, int param7) { param1->unk_00 = sub_02022A58(param0->unk_00, param2, param3, param7); param1->unk_04 = param6; @@ -833,9 +832,9 @@ static void sub_0200A224 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * para sub_0200A0D4(param1, param6, param4, param5, param7); } -static void sub_0200A250 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, int param2, int param3, BOOL param4, int param5, int param6, int param7, int param8, int param9, u32 param10) +static void sub_0200A250(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, int param2, int param3, BOOL param4, int param5, int param6, int param7, int param8, int param9, u32 param10) { - void * v0; + void *v0; v0 = sub_02006FE8(param2, param3, param4, param9, param10); @@ -845,9 +844,9 @@ static void sub_0200A250 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * para sub_0200A0D4(param1, param8, param6, param7, param9); } -static void sub_0200A288 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * param1, NARC * param2, int param3, BOOL param4, int param5, int param6, int param7, int param8, int param9, u32 param10) +static void sub_0200A288(UnkStruct_02009714 *param0, UnkStruct_02009DC8 *param1, NARC *param2, int param3, BOOL param4, int param5, int param6, int param7, int param8, int param9, u32 param10) { - void * v0; + void *v0; v0 = sub_0200A2DC(param2, param3, param4, param9, param10); @@ -857,7 +856,7 @@ static void sub_0200A288 (UnkStruct_02009714 * param0, UnkStruct_02009DC8 * para sub_0200A0D4(param1, param8, param6, param7, param9); } -static int sub_0200A2C0 (const UnkStruct_0200A2C0 * param0) +static int sub_0200A2C0(const UnkStruct_0200A2C0 *param0) { int v0; @@ -870,15 +869,15 @@ static int sub_0200A2C0 (const UnkStruct_0200A2C0 * param0) return v0; } -static void * sub_0200A2DC (NARC * param0, u32 param1, BOOL param2, u32 param3, u32 param4) +static void *sub_0200A2DC(NARC *param0, u32 param1, BOOL param2, u32 param3, u32 param4) { - void * v0; + void *v0; v0 = NARC_AllocAndReadWholeMember(param0, param1, param3); if (v0 != NULL) { if (param2) { - void * v1; + void *v1; if (param4 == 0) { v1 = Heap_AllocFromHeap(param3, MI_GetUncompressedSize(v0)); diff --git a/src/unk_0200A328.c b/src/unk_0200A328.c index 3011bdcb23..cb71cc87a4 100644 --- a/src/unk_0200A328.c +++ b/src/unk_0200A328.c @@ -1,18 +1,18 @@ +#include "unk_0200A328.h" + #include #include #include "struct_decls/struct_02009DC8_decl.h" - #include "struct_defs/struct_02009CFC.h" #include "struct_defs/struct_0200A328.h" #include "struct_defs/struct_0200A5C8.h" #include "unk_02009714.h" -#include "unk_0200A328.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -BOOL sub_0200A328 (const UnkStruct_02009DC8 * param0) +BOOL sub_0200A328(const UnkStruct_02009DC8 *param0) { UnkStruct_0200A328 v0; @@ -27,7 +27,7 @@ BOOL sub_0200A328 (const UnkStruct_02009DC8 * param0) return sub_0201EA24(&v0); } -void sub_0200A368 (const UnkStruct_02009CFC * param0) +void sub_0200A368(const UnkStruct_02009CFC *param0) { int v0; BOOL v1; @@ -42,7 +42,7 @@ void sub_0200A368 (const UnkStruct_02009CFC * param0) } } -BOOL sub_0200A39C (const UnkStruct_02009DC8 * param0) +BOOL sub_0200A39C(const UnkStruct_02009DC8 *param0) { UnkStruct_0200A328 v0; @@ -57,7 +57,7 @@ BOOL sub_0200A39C (const UnkStruct_02009DC8 * param0) return sub_0201EA7C(&v0); } -BOOL sub_0200A3DC (const UnkStruct_02009DC8 * param0) +BOOL sub_0200A3DC(const UnkStruct_02009DC8 *param0) { UnkStruct_0200A328 v0; @@ -72,7 +72,7 @@ BOOL sub_0200A3DC (const UnkStruct_02009DC8 * param0) return sub_0201EA24(&v0); } -void sub_0200A41C (const UnkStruct_02009CFC * param0) +void sub_0200A41C(const UnkStruct_02009CFC *param0) { int v0; BOOL v1; @@ -87,7 +87,7 @@ void sub_0200A41C (const UnkStruct_02009CFC * param0) } } -BOOL sub_0200A450 (const UnkStruct_02009DC8 * param0) +BOOL sub_0200A450(const UnkStruct_02009DC8 *param0) { UnkStruct_0200A328 v0; @@ -102,10 +102,10 @@ BOOL sub_0200A450 (const UnkStruct_02009DC8 * param0) return sub_0201EA7C(&v0); } -void sub_0200A490 (const UnkStruct_02009DC8 * param0, const UnkStruct_02009DC8 * param1) +void sub_0200A490(const UnkStruct_02009DC8 *param0, const UnkStruct_02009DC8 *param1) { int v0; - NNSG2dCharacterData * v1; + NNSG2dCharacterData *v1; GF_ASSERT(param0); GF_ASSERT(param1); @@ -116,10 +116,10 @@ void sub_0200A490 (const UnkStruct_02009DC8 * param0, const UnkStruct_02009DC8 * sub_0201EB08(v0, v1); } -void sub_0200A4C0 (const UnkStruct_02009DC8 * param0) +void sub_0200A4C0(const UnkStruct_02009DC8 *param0) { int v0; - NNSG2dCharacterData * v1; + NNSG2dCharacterData *v1; GF_ASSERT(param0); @@ -129,7 +129,7 @@ void sub_0200A4C0 (const UnkStruct_02009DC8 * param0) sub_0201EB08(v0, v1); } -void sub_0200A4E4 (UnkStruct_02009DC8 * param0) +void sub_0200A4E4(UnkStruct_02009DC8 *param0) { int v0; @@ -140,7 +140,7 @@ void sub_0200A4E4 (UnkStruct_02009DC8 * param0) sub_0201EB50(v0); } -void sub_0200A508 (UnkStruct_02009CFC * param0) +void sub_0200A508(UnkStruct_02009CFC *param0) { int v0; @@ -153,7 +153,7 @@ void sub_0200A508 (UnkStruct_02009CFC * param0) } } -NNSG2dImageProxy * sub_0200A534 (const UnkStruct_02009DC8 * param0) +NNSG2dImageProxy *sub_0200A534(const UnkStruct_02009DC8 *param0) { int v0; @@ -164,11 +164,11 @@ NNSG2dImageProxy * sub_0200A534 (const UnkStruct_02009DC8 * param0) return sub_0201EBDC(v0); } -NNSG2dImageProxy * sub_0200A558 (const UnkStruct_02009DC8 * param0, const UnkStruct_02009DC8 * param1) +NNSG2dImageProxy *sub_0200A558(const UnkStruct_02009DC8 *param0, const UnkStruct_02009DC8 *param1) { int v0; - NNSG2dCellDataBank * v1; - NNSG2dImageProxy * v2; + NNSG2dCellDataBank *v1; + NNSG2dImageProxy *v2; GF_ASSERT(param0); GF_ASSERT(sub_02009EAC(param0) == 0); @@ -180,7 +180,7 @@ NNSG2dImageProxy * sub_0200A558 (const UnkStruct_02009DC8 * param0, const UnkStr v2 = sub_0201EC00(v0, v1->pVramTransferData->szByteMax); if (v2 == NULL) { - NNSG2dImageProxy * v3; + NNSG2dImageProxy *v3; v3 = sub_0201EBDC(v0); v2 = sub_0201EC84(v3); @@ -189,13 +189,13 @@ NNSG2dImageProxy * sub_0200A558 (const UnkStruct_02009DC8 * param0, const UnkStr return v2; } -void sub_0200A5B4 (const NNSG2dImageProxy * param0) +void sub_0200A5B4(const NNSG2dImageProxy *param0) { GF_ASSERT(param0); sub_0201ED1C(param0); } -BOOL sub_0200A5C8 (const UnkStruct_02009DC8 * param0) +BOOL sub_0200A5C8(const UnkStruct_02009DC8 *param0) { UnkStruct_0200A5C8 v0; @@ -210,7 +210,7 @@ BOOL sub_0200A5C8 (const UnkStruct_02009DC8 * param0) return sub_0201F90C(&v0); } -void sub_0200A60C (const UnkStruct_02009CFC * param0) +void sub_0200A60C(const UnkStruct_02009CFC *param0) { int v0; BOOL v1; @@ -225,7 +225,7 @@ void sub_0200A60C (const UnkStruct_02009CFC * param0) } } -BOOL sub_0200A640 (const UnkStruct_02009DC8 * param0) +BOOL sub_0200A640(const UnkStruct_02009DC8 *param0) { UnkStruct_0200A5C8 v0; @@ -240,7 +240,7 @@ BOOL sub_0200A640 (const UnkStruct_02009DC8 * param0) return sub_0201F950(&v0); } -void sub_0200A684 (const UnkStruct_02009CFC * param0) +void sub_0200A684(const UnkStruct_02009CFC *param0) { int v0; BOOL v1; @@ -255,9 +255,9 @@ void sub_0200A684 (const UnkStruct_02009CFC * param0) } } -void sub_0200A6B8 (const UnkStruct_02009DC8 * param0) +void sub_0200A6B8(const UnkStruct_02009DC8 *param0) { - NNSG2dPaletteData * v0; + NNSG2dPaletteData *v0; int v1; int v2; @@ -269,7 +269,7 @@ void sub_0200A6B8 (const UnkStruct_02009DC8 * param0) sub_0201F990(v1, v0); } -void sub_0200A6DC (UnkStruct_02009DC8 * param0) +void sub_0200A6DC(UnkStruct_02009DC8 *param0) { int v0; @@ -280,7 +280,7 @@ void sub_0200A6DC (UnkStruct_02009DC8 * param0) sub_0201F9F0(v0); } -void sub_0200A700 (UnkStruct_02009CFC * param0) +void sub_0200A700(UnkStruct_02009CFC *param0) { int v0; @@ -293,7 +293,7 @@ void sub_0200A700 (UnkStruct_02009CFC * param0) } } -const NNSG2dImagePaletteProxy * sub_0200A72C (const UnkStruct_02009DC8 * param0, NNSG2dImageProxy * param1) +const NNSG2dImagePaletteProxy *sub_0200A72C(const UnkStruct_02009DC8 *param0, NNSG2dImageProxy *param1) { int v0; @@ -309,10 +309,10 @@ const NNSG2dImagePaletteProxy * sub_0200A72C (const UnkStruct_02009DC8 * param0, return sub_0201FA58(v0); } -u32 sub_0200A760 (const UnkStruct_02009DC8 * param0, NNS_G2D_VRAM_TYPE param1) +u32 sub_0200A760(const UnkStruct_02009DC8 *param0, NNS_G2D_VRAM_TYPE param1) { int v0; - const NNSG2dImagePaletteProxy * v1; + const NNSG2dImagePaletteProxy *v1; v1 = sub_0200A72C(param0, NULL); v0 = NNS_G2dGetImagePaletteLocation(v1, param1); diff --git a/src/unk_0200A784.c b/src/unk_0200A784.c index 7051269c2b..fd9b18cacf 100644 --- a/src/unk_0200A784.c +++ b/src/unk_0200A784.c @@ -1,7 +1,8 @@ +#include "unk_0200A784.h" + #include #include -#include "unk_0200A784.h" #include "heap.h" #include "unk_020218BC.h" #include "unk_0202309C.h" @@ -12,15 +13,15 @@ typedef struct { int unk_38; } UnkStruct_021BF430; -static BOOL sub_0200A94C(const GXOamAttr * param0, u16 param1, BOOL param2); -static BOOL sub_0200A96C(const GXOamAttr * param0, u16 param1, BOOL param2); -static u16 sub_0200A990(const MtxFx22 * param0); -static u16 sub_0200A9B4(const MtxFx22 * param0); +static BOOL sub_0200A94C(const GXOamAttr *param0, u16 param1, BOOL param2); +static BOOL sub_0200A96C(const GXOamAttr *param0, u16 param1, BOOL param2); +static u16 sub_0200A990(const MtxFx22 *param0); +static u16 sub_0200A9B4(const MtxFx22 *param0); static void sub_0200A7C8(int param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8); -static UnkStruct_021BF430 * Unk_021BF430; +static UnkStruct_021BF430 *Unk_021BF430; -void sub_0200A784 (int param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) +void sub_0200A784(int param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { int v0; int v1; @@ -56,7 +57,7 @@ void sub_0200A784 (int param0, int param1, int param2, int param3, int param4, i sub_0200A7C8(v0, v1, v2, v3, param4, param5, param6, param7, param8); } -static void sub_0200A7C8 (int param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) +static void sub_0200A7C8(int param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8) { BOOL v0; @@ -73,7 +74,7 @@ static void sub_0200A7C8 (int param0, int param1, int param2, int param3, int pa GF_ASSERT(v0); } -void sub_0200A858 (void) +void sub_0200A858(void) { if (Unk_021BF430) { NNS_G2dApplyAndResetOamManagerBuffer(&Unk_021BF430->unk_00); @@ -81,7 +82,7 @@ void sub_0200A858 (void) } } -void sub_0200A878 (void) +void sub_0200A878(void) { GF_ASSERT(Unk_021BF430); @@ -92,7 +93,7 @@ void sub_0200A878 (void) Unk_021BF430 = NULL; } -void sub_0200A8B0 (NNSG2dRenderSurface * param0, NNSG2dViewRect * param1, NNSG2dSurfaceType param2, NNSG2dRendererInstance * param3) +void sub_0200A8B0(NNSG2dRenderSurface *param0, NNSG2dViewRect *param1, NNSG2dSurfaceType param2, NNSG2dRendererInstance *param3) { GF_ASSERT(Unk_021BF430); @@ -103,9 +104,9 @@ void sub_0200A8B0 (NNSG2dRenderSurface * param0, NNSG2dViewRect * param1, NNSG2d } } -NNSG2dOamManagerInstance * sub_0200A914 (int param0) +NNSG2dOamManagerInstance *sub_0200A914(int param0) { - NNSG2dOamManagerInstance * v0; + NNSG2dOamManagerInstance *v0; GF_ASSERT(Unk_021BF430); @@ -118,17 +119,17 @@ NNSG2dOamManagerInstance * sub_0200A914 (int param0) return v0; } -void sub_0200A93C (int param0) +void sub_0200A93C(int param0) { sub_02022014(param0); } -void sub_0200A944 (int param0) +void sub_0200A944(int param0) { sub_0202204C(param0); } -static BOOL sub_0200A94C (const GXOamAttr * param0, u16 param1, BOOL param2) +static BOOL sub_0200A94C(const GXOamAttr *param0, u16 param1, BOOL param2) { BOOL v0; @@ -138,7 +139,7 @@ static BOOL sub_0200A94C (const GXOamAttr * param0, u16 param1, BOOL param2) return v0; } -static BOOL sub_0200A96C (const GXOamAttr * param0, u16 param1, BOOL param2) +static BOOL sub_0200A96C(const GXOamAttr *param0, u16 param1, BOOL param2) { BOOL v0; @@ -148,7 +149,7 @@ static BOOL sub_0200A96C (const GXOamAttr * param0, u16 param1, BOOL param2) return v0; } -static u16 sub_0200A990 (const MtxFx22 * param0) +static u16 sub_0200A990(const MtxFx22 *param0) { u16 v0; @@ -158,7 +159,7 @@ static u16 sub_0200A990 (const MtxFx22 * param0) return v0; } -static u16 sub_0200A9B4 (const MtxFx22 * param0) +static u16 sub_0200A9B4(const MtxFx22 *param0) { u16 v0; diff --git a/src/unk_0200A9DC.c b/src/unk_0200A9DC.c index 7454a76b99..3218ce8a3c 100644 --- a/src/unk_0200A9DC.c +++ b/src/unk_0200A9DC.c @@ -1,10 +1,10 @@ +#include "unk_0200A9DC.h" + #include #include #include "struct_defs/struct_0200A9DC.h" -#include "unk_0200A9DC.h" - typedef struct { UnkStruct_0200A9DC unk_00; s8 unk_10; @@ -16,14 +16,14 @@ typedef struct { BOOL unk_1C; } UnkStruct_021BF454; -static void sub_0200AA78(UnkStruct_021BF454 * param0, const u8 param1, const s16 param2, const s16 param3, const int param4, const u32 param5); +static void sub_0200AA78(UnkStruct_021BF454 *param0, const u8 param1, const s16 param2, const s16 param3, const int param4, const u32 param5); static UnkStruct_021BF454 Unk_021BF454; static UnkStruct_021BF454 Unk_021BF434; -static void sub_0200A9DC (UnkStruct_021BF454 * param0) +static void sub_0200A9DC(UnkStruct_021BF454 *param0) { - UnkStruct_0200A9DC * v0; + UnkStruct_0200A9DC *v0; BOOL v1; v1 = 0; @@ -58,11 +58,11 @@ static void sub_0200A9DC (UnkStruct_021BF454 * param0) } } -static void sub_0200AA78 (UnkStruct_021BF454 * param0, const u8 param1, const s16 param2, const s16 param3, const int param4, const u32 param5) +static void sub_0200AA78(UnkStruct_021BF454 *param0, const u8 param1, const s16 param2, const s16 param3, const int param4, const u32 param5) { - UnkStruct_0200A9DC * v0; + UnkStruct_0200A9DC *v0; - GF_ASSERT((param0->unk_1C == 0)); + GF_ASSERT(param0->unk_1C == 0); param0->unk_1C = 1; v0 = ¶m0->unk_00; @@ -87,9 +87,9 @@ static void sub_0200AA78 (UnkStruct_021BF454 * param0, const u8 param1, const s1 param0->unk_18 = 0; } -void sub_0200AAE0 (const u8 param0, const s16 param1, const s16 param2, const int param3, const u32 param4) +void sub_0200AAE0(const u8 param0, const s16 param1, const s16 param2, const int param3, const u32 param4) { - UnkStruct_021BF454 * v0; + UnkStruct_021BF454 *v0; if (param0 == 0) { return; @@ -108,7 +108,7 @@ void sub_0200AAE0 (const u8 param0, const s16 param1, const s16 param2, const in } } -void sub_0200AB4C (const s16 param0, const int param1, const u32 param2) +void sub_0200AB4C(const s16 param0, const int param1, const u32 param2) { if (param2 & 1) { G2_SetBlendBrightness(param1, param0); @@ -121,7 +121,7 @@ void sub_0200AB4C (const s16 param0, const int param1, const u32 param2) sub_0200ABB0(param2); } -void sub_0200AB84 (void) +void sub_0200AB84(void) { MI_CpuClear8(&Unk_021BF454, sizeof(UnkStruct_021BF454)); MI_CpuClear8(&Unk_021BF434, sizeof(UnkStruct_021BF454)); @@ -130,7 +130,7 @@ void sub_0200AB84 (void) Unk_021BF434.unk_1C = 0; } -void sub_0200ABB0 (const u32 param0) +void sub_0200ABB0(const u32 param0) { if (param0 & 1) { MI_CpuClear8(&Unk_021BF454, sizeof(UnkStruct_021BF454)); @@ -143,7 +143,7 @@ void sub_0200ABB0 (const u32 param0) } } -void sub_0200ABF0 (void) +void sub_0200ABF0(void) { if (Unk_021BF454.unk_1C) { sub_0200A9DC(&Unk_021BF454); @@ -154,7 +154,7 @@ void sub_0200ABF0 (void) } } -BOOL sub_0200AC1C (u32 param0) +BOOL sub_0200AC1C(u32 param0) { if (param0 == 3) { if ((Unk_021BF454.unk_1C == 0) && (Unk_021BF434.unk_1C == 0)) { diff --git a/src/unk_0200C440.c b/src/unk_0200C440.c index df0c82002d..6ffa1f9d2e 100644 --- a/src/unk_0200C440.c +++ b/src/unk_0200C440.c @@ -1,17 +1,18 @@ +#include "unk_0200C440.h" + #include #include #include "struct_defs/struct_0205AA50.h" +#include "heap.h" #include "unk_020021B0.h" #include "unk_02006E3C.h" -#include "unk_0200C440.h" -#include "heap.h" #include "unk_02018340.h" typedef struct UnkStruct_0200C440_t { - void * unk_00; - NNSG2dCharacterData * unk_04; + void *unk_00; + NNSG2dCharacterData *unk_04; u16 unk_08[16]; u32 unk_28; } UnkStruct_0200C440; @@ -20,22 +21,22 @@ static const struct { u16 unk_00; u16 unk_02; } Unk_020E4FEC[] = { - {0x140, 0x8}, - {0x160, 0x10}, - {0x1A0, 0x10}, - {0x1E0, 0x10}, - {0x220, 0x10}, - {0x260, 0x10}, - {0x2A0, 0x10} + { 0x140, 0x8 }, + { 0x160, 0x10 }, + { 0x1A0, 0x10 }, + { 0x1E0, 0x10 }, + { 0x220, 0x10 }, + { 0x260, 0x10 }, + { 0x2A0, 0x10 } }; -UnkStruct_0200C440 * sub_0200C440 (u32 param0, u32 param1, u32 param2, u32 param3) +UnkStruct_0200C440 *sub_0200C440(u32 param0, u32 param1, u32 param2, u32 param3) { - UnkStruct_0200C440 * v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_0200C440)); + UnkStruct_0200C440 *v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_0200C440)); if (v0) { u32 v1; - u8 * v2; + u8 *v2; v0->unk_00 = sub_02006F50(14, 4, 1, &v0->unk_04, param3); v2 = v0->unk_04->pRawData; @@ -78,7 +79,7 @@ UnkStruct_0200C440 * sub_0200C440 (u32 param0, u32 param1, u32 param2, u32 param return v0; } -void sub_0200C560 (UnkStruct_0200C440 * param0) +void sub_0200C560(UnkStruct_0200C440 *param0) { if (param0) { if (param0->unk_00) { @@ -89,12 +90,12 @@ void sub_0200C560 (UnkStruct_0200C440 * param0) } } -void sub_0200C578 (UnkStruct_0200C440 * param0, int param1, Window * param2, u32 param3, u32 param4) +void sub_0200C578(UnkStruct_0200C440 *param0, int param1, Window *param2, u32 param3, u32 param4) { sub_0201ADDC(param2, (u8 *)(param0->unk_04->pRawData) + Unk_020E4FEC[param1].unk_00, 0, 0, Unk_020E4FEC[param1].unk_02, 8, param3, param4, Unk_020E4FEC[param1].unk_02, 8); } -void sub_0200C5BC (UnkStruct_0200C440 * param0, s32 param1, u32 param2, int param3, Window * param4, u32 param5, u32 param6) +void sub_0200C5BC(UnkStruct_0200C440 *param0, s32 param1, u32 param2, int param3, Window *param4, u32 param5, u32 param6) { int v0; @@ -111,17 +112,17 @@ void sub_0200C5BC (UnkStruct_0200C440 * param0, s32 param1, u32 param2, int para } } -void sub_0200C648 (UnkStruct_0200C440 * param0, int param1, s32 param2, u32 param3, int param4, Window * param5, u32 param6, u32 param7) +void sub_0200C648(UnkStruct_0200C440 *param0, int param1, s32 param2, u32 param3, int param4, Window *param5, u32 param6, u32 param7) { sub_0200C578(param0, param1, param5, param6, param7); sub_0200C5BC(param0, param2, param3, param4, param5, param6 + 16, param7); } -void sub_0200C67C (UnkStruct_0200C440 * param0, s32 param1, u32 param2, int param3, void * param4) +void sub_0200C67C(UnkStruct_0200C440 *param0, s32 param1, u32 param2, int param3, void *param4) { int v0; u8 v1; - u8 * v2; + u8 *v2; v2 = param4; v1 = param0->unk_28 | (param0->unk_28 << 4); diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c index 17fe201036..4e23a03400 100644 --- a/src/unk_0200C6E4.c +++ b/src/unk_0200C6E4.c @@ -1,3 +1,5 @@ +#include "unk_0200C6E4.h" + #include #include @@ -8,29 +10,28 @@ #include "struct_decls/struct_02009F38_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_02009508.h" #include "struct_defs/struct_02009CFC.h" #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0200D0F4.h" + #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_02241308.h" #include "overlay104/struct_ov104_0224133C.h" #include "overlay115/struct_ov115_02261520.h" +#include "heap.h" #include "unk_02002F38.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "unk_0200C6E4.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" @@ -40,30 +41,30 @@ typedef struct CellTransferStateData_t { int unk_00; int unk_04; int unk_08; - NNSG2dCellTransferState * unk_0C; + NNSG2dCellTransferState *unk_0C; UnkStruct_0200C738 unk_10; } SpriteRenderer; typedef struct AnimationResourceCollection_t { - GraphicElementManager * unk_00; - UnkStruct_02009508 * unk_04; - UnkStruct_02009F38 * unk_08; - UnkStruct_02009714 * unk_0C[6]; - UnkStruct_02009CFC * unk_24[6]; + GraphicElementManager *unk_00; + UnkStruct_02009508 *unk_04; + UnkStruct_02009F38 *unk_08; + UnkStruct_02009714 *unk_0C[6]; + UnkStruct_02009CFC *unk_24[6]; int unk_3C[6]; int unk_54; } SpriteGfxHandler; -static BOOL sub_0200D11C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5, int param6); -static BOOL sub_0200D18C(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, int param4, int param5, int param6); -static BOOL sub_0200D1FC(UnkStruct_02009CFC * param0, UnkStruct_02009DC8 * param1); -static BOOL sub_0200D27C(UnkStruct_02009714 * param0, UnkStruct_02009CFC * param1, int param2); -static BOOL sub_0200D2D0(UnkStruct_02009714 * param0, UnkStruct_02009CFC * param1, int param2); -static BOOL sub_0200D230(UnkStruct_02009714 * param0, UnkStruct_02009CFC * param1, int param2); +static BOOL sub_0200D11C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, int param4, int param5, int param6); +static BOOL sub_0200D18C(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, int param4, int param5, int param6); +static BOOL sub_0200D1FC(UnkStruct_02009CFC *param0, UnkStruct_02009DC8 *param1); +static BOOL sub_0200D27C(UnkStruct_02009714 *param0, UnkStruct_02009CFC *param1, int param2); +static BOOL sub_0200D2D0(UnkStruct_02009714 *param0, UnkStruct_02009CFC *param1, int param2); +static BOOL sub_0200D230(UnkStruct_02009714 *param0, UnkStruct_02009CFC *param1, int param2); -SpriteRenderer * sub_0200C6E4 (int param0) +SpriteRenderer *sub_0200C6E4(int param0) { - SpriteRenderer * v0 = NULL; + SpriteRenderer *v0 = NULL; v0 = Heap_AllocFromHeap(param0, sizeof(SpriteRenderer)); @@ -78,10 +79,10 @@ SpriteRenderer * sub_0200C6E4 (int param0) return v0; } -SpriteGfxHandler * sub_0200C704 (SpriteRenderer * param0) +SpriteGfxHandler *sub_0200C704(SpriteRenderer *param0) { int v0; - SpriteGfxHandler * v1 = NULL; + SpriteGfxHandler *v1 = NULL; GF_ASSERT(param0 != NULL); @@ -100,12 +101,12 @@ SpriteGfxHandler * sub_0200C704 (SpriteRenderer * param0) return v1; } -UnkStruct_0200C738 * sub_0200C738 (SpriteRenderer * param0) +UnkStruct_0200C738 *sub_0200C738(SpriteRenderer *param0) { return ¶m0->unk_10; } -BOOL sub_0200C73C (SpriteRenderer * param0, const UnkStruct_ov104_0224133C * param1, const UnkStruct_ov104_022412F4 * param2, int param3) +BOOL sub_0200C73C(SpriteRenderer *param0, const UnkStruct_ov104_0224133C *param1, const UnkStruct_ov104_022412F4 *param2, int param3) { GF_ASSERT(param0 != NULL); @@ -139,7 +140,7 @@ BOOL sub_0200C73C (SpriteRenderer * param0, const UnkStruct_ov104_0224133C * par return 1; } -BOOL sub_0200C7C0 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2) +BOOL sub_0200C7C0(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2) { if ((param0 == NULL) || (param1 == NULL)) { return 0; @@ -149,33 +150,33 @@ BOOL sub_0200C7C0 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param return 1; } -void sub_0200C7E4 (GraphicElementData * param0) +void sub_0200C7E4(GraphicElementData *param0) { sub_02021BD4(param0); } -void sub_0200C7EC (SpriteGfxHandler * param0) +void sub_0200C7EC(SpriteGfxHandler *param0) { GF_ASSERT(param0 != NULL); sub_020219F8(param0->unk_00); } -void sub_0200C800 (void) +void sub_0200C800(void) { sub_0200A858(); } -void sub_0200C808 (void) +void sub_0200C808(void) { sub_0201DCE8(); } -void sub_0200C810 (SpriteGfxHandler * param0) +void sub_0200C810(SpriteGfxHandler *param0) { sub_02021964(param0->unk_00); } -void sub_0200C81C (SpriteGfxHandler * param0) +void sub_0200C81C(SpriteGfxHandler *param0) { if (param0->unk_04 == NULL) { return; @@ -184,10 +185,10 @@ void sub_0200C81C (SpriteGfxHandler * param0) sub_020095A8(param0->unk_04); } -void sub_0200C82C (SpriteGfxHandler * param0) +void sub_0200C82C(SpriteGfxHandler *param0) { int v0; - UnkStruct_02009F38 * v1; + UnkStruct_02009F38 *v1; for (v0 = 0; v0 < param0->unk_54; v0++) { v1 = sub_02009F38(param0->unk_08, v0); @@ -204,7 +205,7 @@ void sub_0200C82C (SpriteGfxHandler * param0) } } -void sub_0200C880 (SpriteRenderer * param0) +void sub_0200C880(SpriteRenderer *param0) { sub_0201DCF0(param0->unk_0C); sub_0201E958(); @@ -215,13 +216,13 @@ void sub_0200C880 (SpriteRenderer * param0) } } -void sub_0200C8A0 (SpriteRenderer * param0, SpriteGfxHandler * param1) +void sub_0200C8A0(SpriteRenderer *param0, SpriteGfxHandler *param1) { param0->unk_04--; Heap_FreeToHeap(param1); } -void sub_0200C8B0 (SpriteRenderer * param0, SpriteGfxHandler * param1) +void sub_0200C8B0(SpriteRenderer *param0, SpriteGfxHandler *param1) { sub_0200C810(param1); sub_0200C81C(param1); @@ -229,7 +230,7 @@ void sub_0200C8B0 (SpriteRenderer * param0, SpriteGfxHandler * param1) sub_0200C8A0(param0, param1); } -void sub_0200C8D4 (SpriteRenderer * param0) +void sub_0200C8D4(SpriteRenderer *param0) { GF_ASSERT(param0->unk_04 == 0); @@ -237,13 +238,13 @@ void sub_0200C8D4 (SpriteRenderer * param0) Heap_FreeToHeap(param0); } -BOOL sub_0200C8F0 (SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F2EC * param2) +BOOL sub_0200C8F0(SpriteRenderer *param0, SpriteGfxHandler *param1, const UnkStruct_ov7_0224F2EC *param2) { int v0; int v1 = 6; int v2; - UnkStruct_02009F38 * v3; - void * v4; + UnkStruct_02009F38 *v3; + void *v4; if ((param0 == NULL) || (param1 == NULL)) { return 0; @@ -290,17 +291,17 @@ BOOL sub_0200C8F0 (SpriteRenderer * param0, SpriteGfxHandler * param1, const Unk return 1; } -GraphicElementData * sub_0200CA08 (SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F358 * param2) +GraphicElementData *sub_0200CA08(SpriteRenderer *param0, SpriteGfxHandler *param1, const UnkStruct_ov7_0224F358 *param2) { - GraphicElementData * v0 = NULL; + GraphicElementData *v0 = NULL; v0 = sub_0200CA44(param0, param1, param2->unk_00, param2->unk_04, param2->unk_06, param2->unk_04, param2->unk_0A, param2->unk_0C, param2->unk_10, param2->unk_14, param2->unk_18, param2->unk_1C, param2->unk_20, param2->unk_24); return v0; } -GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, s16 param3, s16 param4, s16 param5, u16 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13) +GraphicElementData *sub_0200CA44(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, s16 param3, s16 param4, s16 param5, u16 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13) { - GraphicElementData * v0 = NULL; + GraphicElementData *v0 = NULL; UnkStruct_ov115_02261520 v1; v1.unk_00 = param1->unk_00; @@ -331,13 +332,13 @@ GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * p return v0; } -BOOL sub_0200CB30 (SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov104_02241308 * param2) +BOOL sub_0200CB30(SpriteRenderer *param0, SpriteGfxHandler *param1, const UnkStruct_ov104_02241308 *param2) { int v0; int v1; int v2 = 6; int v3; - UnkStruct_02009F38 * v4; + UnkStruct_02009F38 *v4; if ((param0 == NULL) || (param1 == NULL)) { return 0; @@ -371,9 +372,9 @@ BOOL sub_0200CB30 (SpriteRenderer * param0, SpriteGfxHandler * param1, const Unk return 1; } -BOOL sub_0200CBDC (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6) +BOOL sub_0200CBDC(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, BOOL param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; if (sub_02009D34(param1->unk_0C[0], param6) == 0) { return 0; @@ -393,9 +394,9 @@ BOOL sub_0200CBDC (SpriteRenderer * param0, SpriteGfxHandler * param1, int param return (v0 == NULL) ? 0 : 1; } -BOOL SpriteRenderer_LoadCharResObjFromOpenNarc (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, BOOL param4, int param5, int param6) +BOOL SpriteRenderer_LoadCharResObjFromOpenNarc(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, BOOL param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; if (sub_02009D34(param1->unk_0C[0], param6) == 0) { return 0; @@ -414,9 +415,9 @@ BOOL SpriteRenderer_LoadCharResObjFromOpenNarc (SpriteRenderer * param0, SpriteG return (v0 == NULL) ? 0 : 1; } -s8 sub_0200CC9C (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5, int param6, int param7) +s8 sub_0200CC9C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, int param4, int param5, int param6, int param7) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; int v1; if (sub_02009D34(param1->unk_0C[1], param7) == 0) { @@ -438,9 +439,9 @@ s8 sub_0200CC9C (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, return -1; } -s8 sub_0200CD0C (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, int param4, int param5, int param6, int param7) +s8 sub_0200CD0C(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, int param4, int param5, int param6, int param7) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; int v1; if (sub_02009D34(param1->unk_0C[1], param7) == 0) { @@ -461,7 +462,7 @@ s8 sub_0200CD0C (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * para return -1; } -u8 sub_0200CD7C (PaletteData * param0, int param1, SpriteRenderer * param2, SpriteGfxHandler * param3, int param4, int param5, int param6, int param7, int param8, int param9) +u8 sub_0200CD7C(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, int param4, int param5, int param6, int param7, int param8, int param9) { int v0; @@ -474,7 +475,7 @@ u8 sub_0200CD7C (PaletteData * param0, int param1, SpriteRenderer * param2, Spri return v0; } -u8 SpriteRenderer_LoadPalette (PaletteData * param0, enum PaletteBufferId param1, SpriteRenderer * param2, SpriteGfxHandler * param3, NARC * param4, int param5, BOOL param6, int param7, int param8, int param9) +u8 SpriteRenderer_LoadPalette(PaletteData *param0, enum PaletteBufferId param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NARC *param4, int param5, BOOL param6, int param7, int param8, int param9) { int v0; @@ -487,31 +488,31 @@ u8 SpriteRenderer_LoadPalette (PaletteData * param0, enum PaletteBufferId param1 return v0; } -BOOL sub_0200CE0C (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5) +BOOL sub_0200CE0C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, int param4, int param5) { return sub_0200D11C(param0, param1, param2, param3, param4, 2, param5); } -BOOL SpriteRenderer_LoadCellResObjFromOpenNarc (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, BOOL param4, int param5) +BOOL SpriteRenderer_LoadCellResObjFromOpenNarc(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, BOOL param4, int param5) { return sub_0200D18C(param0, param1, param2, param3, param4, 2, param5); } -BOOL sub_0200CE3C (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5) +BOOL sub_0200CE3C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, int param4, int param5) { return sub_0200D11C(param0, param1, param2, param3, param4, 3, param5); } -BOOL SpriteRenderer_LoadAnimResObjFromOpenNarc (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, BOOL param4, int param5) +BOOL SpriteRenderer_LoadAnimResObjFromOpenNarc(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, BOOL param4, int param5) { return sub_0200D18C(param0, param1, param2, param3, param4, 3, param5); } -CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHandler * param1, const SpriteTemplate * param2) +CellActorData *SpriteActor_LoadResources(SpriteRenderer *param0, SpriteGfxHandler *param1, const SpriteTemplate *param2) { int v0; int v1; - CellActorData * v2 = NULL; + CellActorData *v2 = NULL; UnkStruct_ov115_02261520 v3; int v4[6]; @@ -589,39 +590,39 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan return v2; } -const NNSG2dImagePaletteProxy * sub_0200D04C (SpriteGfxHandler * param0, int param1) +const NNSG2dImagePaletteProxy *sub_0200D04C(SpriteGfxHandler *param0, int param1) { - UnkStruct_02009DC8 * v0 = sub_02009DC8(param0->unk_0C[1], param1); + UnkStruct_02009DC8 *v0 = sub_02009DC8(param0->unk_0C[1], param1); return sub_0200A72C(v0, NULL); } -u32 sub_0200D05C (SpriteGfxHandler * param0, int param1, NNS_G2D_VRAM_TYPE param2) +u32 sub_0200D05C(SpriteGfxHandler *param0, int param1, NNS_G2D_VRAM_TYPE param2) { - UnkStruct_02009DC8 * v0 = sub_02009DC8(param0->unk_0C[1], param1); + UnkStruct_02009DC8 *v0 = sub_02009DC8(param0->unk_0C[1], param1); return sub_0200A760(v0, param2); } -BOOL SpriteGfxHandler_UnloadCharObjById (SpriteGfxHandler * param0, int param1) +BOOL SpriteGfxHandler_UnloadCharObjById(SpriteGfxHandler *param0, int param1) { return sub_0200D27C(param0->unk_0C[0], param0->unk_24[0], param1); } -BOOL SpriteGfxHandler_UnloadPlttObjById (SpriteGfxHandler * param0, int param1) +BOOL SpriteGfxHandler_UnloadPlttObjById(SpriteGfxHandler *param0, int param1) { return sub_0200D2D0(param0->unk_0C[1], param0->unk_24[1], param1); } -BOOL SpriteGfxHandler_UnloadCellObjById (SpriteGfxHandler * param0, int param1) +BOOL SpriteGfxHandler_UnloadCellObjById(SpriteGfxHandler *param0, int param1) { return sub_0200D230(param0->unk_0C[2], param0->unk_24[2], param1); } -BOOL SpriteGfxHandler_UnloadAnimObjById (SpriteGfxHandler * param0, int param1) +BOOL SpriteGfxHandler_UnloadAnimObjById(SpriteGfxHandler *param0, int param1) { return sub_0200D230(param0->unk_0C[3], param0->unk_24[3], param1); } -void sub_0200D0B0 (SpriteRenderer * param0, SpriteGfxHandler * param1) +void sub_0200D0B0(SpriteRenderer *param0, SpriteGfxHandler *param1) { int v0; @@ -637,7 +638,7 @@ void sub_0200D0B0 (SpriteRenderer * param0, SpriteGfxHandler * param1) sub_0200C8A0(param0, param1); } -void sub_0200D0F4 (CellActorData * param0) +void sub_0200D0F4(CellActorData *param0) { if (param0->unk_0C) { sub_0200A5B4(param0->unk_04->unk_00); @@ -648,9 +649,9 @@ void sub_0200D0F4 (CellActorData * param0) Heap_FreeToHeap(param0); } -static BOOL sub_0200D11C (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, int param4, int param5, int param6) +static BOOL sub_0200D11C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, int param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; int v1; if (sub_02009D34(param1->unk_0C[param5], param6) == 0) { @@ -670,9 +671,9 @@ static BOOL sub_0200D11C (SpriteRenderer * param0, SpriteGfxHandler * param1, in return (v0 == NULL) ? 0 : 1; } -static BOOL sub_0200D18C (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, int param4, int param5, int param6) +static BOOL sub_0200D18C(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, int param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; int v1; if (sub_02009D34(param1->unk_0C[param5], param6) == 0) { @@ -693,7 +694,7 @@ static BOOL sub_0200D18C (SpriteRenderer * param0, SpriteGfxHandler * param1, NA return (v0 == NULL) ? 0 : 1; } -static BOOL sub_0200D1FC (UnkStruct_02009CFC * param0, UnkStruct_02009DC8 * param1) +static BOOL sub_0200D1FC(UnkStruct_02009CFC *param0, UnkStruct_02009DC8 *param1) { int v0; @@ -711,7 +712,7 @@ static BOOL sub_0200D1FC (UnkStruct_02009CFC * param0, UnkStruct_02009DC8 * para return 0; } -static BOOL sub_0200D230 (UnkStruct_02009714 * param0, UnkStruct_02009CFC * param1, int param2) +static BOOL sub_0200D230(UnkStruct_02009714 *param0, UnkStruct_02009CFC *param1, int param2) { int v0; int v1; @@ -736,7 +737,7 @@ static BOOL sub_0200D230 (UnkStruct_02009714 * param0, UnkStruct_02009CFC * para return 0; } -static BOOL sub_0200D27C (UnkStruct_02009714 * param0, UnkStruct_02009CFC * param1, int param2) +static BOOL sub_0200D27C(UnkStruct_02009714 *param0, UnkStruct_02009CFC *param1, int param2) { int v0; int v1; @@ -762,7 +763,7 @@ static BOOL sub_0200D27C (UnkStruct_02009714 * param0, UnkStruct_02009CFC * para return 0; } -static BOOL sub_0200D2D0 (UnkStruct_02009714 * param0, UnkStruct_02009CFC * param1, int param2) +static BOOL sub_0200D2D0(UnkStruct_02009714 *param0, UnkStruct_02009CFC *param1, int param2) { int v0; int v1; @@ -788,177 +789,177 @@ static BOOL sub_0200D2D0 (UnkStruct_02009714 * param0, UnkStruct_02009CFC * para return 0; } -void SpriteActor_UpdateObject (GraphicElementData * param0) +void SpriteActor_UpdateObject(GraphicElementData *param0) { sub_02021E2C(param0, FX32_ONE); } -void sub_0200D330 (CellActorData * param0) +void sub_0200D330(CellActorData *param0) { SpriteActor_UpdateObject(param0->unk_00); } -void sub_0200D33C (CellActorData * param0) +void sub_0200D33C(CellActorData *param0) { sub_02021E2C(param0->unk_00, FX32_CONST(2)); } -void sub_0200D34C (CellActorData * param0, fx32 param1) +void sub_0200D34C(CellActorData *param0, fx32 param1) { sub_02021E2C(param0->unk_00, param1); } -u32 sub_0200D358 (CellActorData * param0) +u32 sub_0200D358(CellActorData *param0) { return sub_02021D44(param0->unk_00); } -void sub_0200D364 (CellActorData * param0, u32 param1) +void sub_0200D364(CellActorData *param0, u32 param1) { SpriteActor_SetSpriteAnimActive(param0->unk_00, param1); } -void sub_0200D370 (CellActorData * param0, u32 param1) +void sub_0200D370(CellActorData *param0, u32 param1) { sub_02021DCC(param0->unk_00, param1); } -u32 sub_0200D37C (CellActorData * param0) +u32 sub_0200D37C(CellActorData *param0) { return sub_02021E24(param0->unk_00); } -void sub_0200D388 (GraphicElementData * param0, int param1) +void sub_0200D388(GraphicElementData *param0, int param1) { sub_02021CC8(param0, param1); } -void sub_0200D390 (CellActorData * param0, int param1) +void sub_0200D390(CellActorData *param0, int param1) { sub_0200D388(param0->unk_00, param1); } -void sub_0200D39C (GraphicElementData * param0, fx32 param1) +void sub_0200D39C(GraphicElementData *param0, fx32 param1) { sub_02021CE4(param0, param1); } -void sub_0200D3A4 (CellActorData * param0, fx32 param1) +void sub_0200D3A4(CellActorData *param0, fx32 param1) { sub_0200D39C(param0->unk_00, param1); } -BOOL sub_0200D3B0 (GraphicElementData * param0) +BOOL sub_0200D3B0(GraphicElementData *param0) { return sub_02021FD0(param0); } -BOOL sub_0200D3B8 (CellActorData * param0) +BOOL sub_0200D3B8(CellActorData *param0) { return sub_0200D3B0(param0->unk_00); } -void sub_0200D3C4 (GraphicElementData * param0, u16 param1) +void sub_0200D3C4(GraphicElementData *param0, u16 param1) { SpriteActor_SetAnimFrame(param0, param1); } -void sub_0200D3CC (CellActorData * param0, u16 param1) +void sub_0200D3CC(CellActorData *param0, u16 param1) { sub_0200D3C4(param0->unk_00, param1); } -u16 sub_0200D3D8 (GraphicElementData * param0) +u16 sub_0200D3D8(GraphicElementData *param0) { return sub_02021E74(param0); } -u16 sub_0200D3E0 (CellActorData * param0) +u16 sub_0200D3E0(CellActorData *param0) { return sub_0200D3D8(param0->unk_00); } -void SpriteActor_DrawSprite (GraphicElementData * param0, int param1) +void SpriteActor_DrawSprite(GraphicElementData *param0, int param1) { sub_02021CAC(param0, param1); } -void SpriteActor_EnableObject (CellActorData * param0, int param1) +void SpriteActor_EnableObject(CellActorData *param0, int param1) { SpriteActor_DrawSprite(param0->unk_00, param1); } -int sub_0200D400 (GraphicElementData * param0) +int sub_0200D400(GraphicElementData *param0) { return sub_02021D34(param0); } -int sub_0200D408 (CellActorData * param0) +int sub_0200D408(CellActorData *param0) { return sub_0200D400(param0->unk_00); } -void sub_0200D414 (GraphicElementData * param0, int param1) +void sub_0200D414(GraphicElementData *param0, int param1) { sub_02021E90(param0, param1); } -void sub_0200D41C (CellActorData * param0, int param1) +void sub_0200D41C(CellActorData *param0, int param1) { sub_0200D414(param0->unk_00, param1); } -void sub_0200D428 (GraphicElementData * param0, int param1) +void sub_0200D428(GraphicElementData *param0, int param1) { sub_02021EF0(param0, param1); } -void sub_0200D430 (CellActorData * param0, int param1) +void sub_0200D430(CellActorData *param0, int param1) { sub_0200D428(param0->unk_00, param1); } -int sub_0200D43C (CellActorData * param0) +int sub_0200D43C(CellActorData *param0) { return sub_02021F48(param0->unk_00); } -void sub_0200D448 (GraphicElementData * param0, int param1) +void sub_0200D448(GraphicElementData *param0, int param1) { sub_02021E80(param0, param1); } -int sub_0200D454 (CellActorData * param0) +int sub_0200D454(CellActorData *param0) { return sub_02021E88(param0->unk_00); } -void sub_0200D460 (CellActorData * param0, int param1) +void sub_0200D460(CellActorData *param0, int param1) { sub_0200D448(param0->unk_00, param1); } -void sub_0200D46C (GraphicElementData * param0, int param1) +void sub_0200D46C(GraphicElementData *param0, int param1) { sub_02021F58(param0, param1); } -void sub_0200D474 (CellActorData * param0, int param1) +void sub_0200D474(CellActorData *param0, int param1) { sub_0200D46C(param0->unk_00, param1); } -u32 sub_0200D480 (GraphicElementData * param0) +u32 sub_0200D480(GraphicElementData *param0) { return sub_02021F74(param0); } -u32 sub_0200D488 (CellActorData * param0) +u32 sub_0200D488(CellActorData *param0) { return sub_0200D480(param0->unk_00); } -void SpriteActor_SetPositionXY (GraphicElementData * param0, s16 param1, s16 param2) +void SpriteActor_SetPositionXY(GraphicElementData *param0, s16 param1, s16 param2) { VecFx32 v0; @@ -974,12 +975,12 @@ void SpriteActor_SetPositionXY (GraphicElementData * param0, s16 param1, s16 par sub_02021C50(param0, &v0); } -void SpriteActor_SetSpritePositionXY (CellActorData * param0, s16 param1, s16 param2) +void SpriteActor_SetSpritePositionXY(CellActorData *param0, s16 param1, s16 param2) { SpriteActor_SetPositionXY(param0->unk_00, param1, param2); } -void sub_0200D4D0 (GraphicElementData * param0, s16 param1, s16 param2, fx32 param3) +void sub_0200D4D0(GraphicElementData *param0, s16 param1, s16 param2, fx32 param3) { VecFx32 v0; @@ -995,14 +996,14 @@ void sub_0200D4D0 (GraphicElementData * param0, s16 param1, s16 param2, fx32 par sub_02021C50(param0, &v0); } -void sub_0200D500 (CellActorData * param0, s16 param1, s16 param2, fx32 param3) +void sub_0200D500(CellActorData *param0, s16 param1, s16 param2, fx32 param3) { sub_0200D4D0(param0->unk_00, param1, param2, param3); } -void sub_0200D50C (GraphicElementData * param0, s16 * param1, s16 * param2) +void sub_0200D50C(GraphicElementData *param0, s16 *param1, s16 *param2) { - const VecFx32 * v0; + const VecFx32 *v0; v0 = sub_02021D28(param0); *param1 = v0->x / FX32_ONE; @@ -1014,14 +1015,14 @@ void sub_0200D50C (GraphicElementData * param0, s16 * param1, s16 * param2) } } -void SpriteActor_GetSpritePositionXY (CellActorData * param0, s16 * param1, s16 * param2) +void SpriteActor_GetSpritePositionXY(CellActorData *param0, s16 *param1, s16 *param2) { sub_0200D50C(param0->unk_00, param1, param2); } -void sub_0200D55C (GraphicElementData * param0, s16 * param1, s16 * param2, fx32 param3) +void sub_0200D55C(GraphicElementData *param0, s16 *param1, s16 *param2, fx32 param3) { - const VecFx32 * v0; + const VecFx32 *v0; v0 = sub_02021D28(param0); *param1 = v0->x / FX32_ONE; @@ -1033,14 +1034,14 @@ void sub_0200D55C (GraphicElementData * param0, s16 * param1, s16 * param2, fx32 } } -void sub_0200D5A0 (CellActorData * param0, s16 * param1, s16 * param2, fx32 param3) +void sub_0200D5A0(CellActorData *param0, s16 *param1, s16 *param2, fx32 param3) { sub_0200D55C(param0->unk_00, param1, param2, param3); } -void sub_0200D5AC (GraphicElementData * param0, s16 param1, s16 param2) +void sub_0200D5AC(GraphicElementData *param0, s16 param1, s16 param2) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; v0 = sub_02021D28(param0); @@ -1052,14 +1053,14 @@ void sub_0200D5AC (GraphicElementData * param0, s16 param1, s16 param2) sub_02021C50(param0, &v1); } -void sub_0200D5DC (CellActorData * param0, s16 param1, s16 param2) +void sub_0200D5DC(CellActorData *param0, s16 param1, s16 param2) { sub_0200D5AC(param0->unk_00, param1, param2); } -void sub_0200D5E8 (CellActorData * param0, fx32 param1, fx32 param2) +void sub_0200D5E8(CellActorData *param0, fx32 param1, fx32 param2) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; v0 = sub_02021D28(param0->unk_00); @@ -1071,9 +1072,9 @@ void sub_0200D5E8 (CellActorData * param0, fx32 param1, fx32 param2) sub_02021C50(param0->unk_00, &v1); } -void sub_0200D614 (CellActorData * param0, fx32 param1, fx32 param2) +void sub_0200D614(CellActorData *param0, fx32 param1, fx32 param2) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; v0 = sub_02021D28(param0->unk_00); @@ -1085,9 +1086,9 @@ void sub_0200D614 (CellActorData * param0, fx32 param1, fx32 param2) sub_02021C50(param0->unk_00, &v1); } -void sub_0200D638 (CellActorData * param0, fx32 * param1, fx32 * param2) +void sub_0200D638(CellActorData *param0, fx32 *param1, fx32 *param2) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; v0 = sub_02021D28(param0->unk_00); @@ -1096,7 +1097,7 @@ void sub_0200D638 (CellActorData * param0, fx32 * param1, fx32 * param2) *param2 = v0->y; } -void sub_0200D650 (CellActorData * param0, fx32 param1, fx32 param2, fx32 param3) +void sub_0200D650(CellActorData *param0, fx32 param1, fx32 param2, fx32 param3) { if (sub_02021FC8(param0->unk_00) == NNS_G2D_VRAM_TYPE_2DSUB) { sub_0200D614(param0, param1, param2 + param3); @@ -1105,7 +1106,7 @@ void sub_0200D650 (CellActorData * param0, fx32 param1, fx32 param2, fx32 param3 } } -void sub_0200D67C (CellActorData * param0, fx32 * param1, fx32 * param2, fx32 param3) +void sub_0200D67C(CellActorData *param0, fx32 *param1, fx32 *param2, fx32 param3) { sub_0200D638(param0, param1, param2); @@ -1114,20 +1115,20 @@ void sub_0200D67C (CellActorData * param0, fx32 * param1, fx32 * param2, fx32 pa } } -void sub_0200D69C (GraphicElementData * param0, int param1) +void sub_0200D69C(GraphicElementData *param0, int param1) { sub_02021CF8(param0, param1); } -void sub_0200D6A4 (CellActorData * param0, int param1) +void sub_0200D6A4(CellActorData *param0, int param1) { sub_0200D69C(param0->unk_00, param1); } -void sub_0200D6B0 (GraphicElementData * param0, f32 param1, f32 param2) +void sub_0200D6B0(GraphicElementData *param0, f32 param1, f32 param2) { - const VecFx32 * v0; - VecFx32 * v1; + const VecFx32 *v0; + VecFx32 *v1; v0 = sub_02021D2C(param0); v1 = (VecFx32 *)v0; @@ -1138,15 +1139,15 @@ void sub_0200D6B0 (GraphicElementData * param0, f32 param1, f32 param2) sub_02021C70(param0, v1); } -void sub_0200D6E8 (CellActorData * param0, f32 param1, f32 param2) +void sub_0200D6E8(CellActorData *param0, f32 param1, f32 param2) { sub_0200D6B0(param0->unk_00, param1, param2); } -void sub_0200D6F4 (GraphicElementData * param0, f32 param1, f32 param2) +void sub_0200D6F4(GraphicElementData *param0, f32 param1, f32 param2) { - const VecFx32 * v0; - VecFx32 * v1; + const VecFx32 *v0; + VecFx32 *v1; v0 = sub_02021D2C(param0); v1 = (VecFx32 *)v0; @@ -1157,15 +1158,15 @@ void sub_0200D6F4 (GraphicElementData * param0, f32 param1, f32 param2) sub_02021C70(param0, v1); } -void sub_0200D74C (CellActorData * param0, f32 param1, f32 param2) +void sub_0200D74C(CellActorData *param0, f32 param1, f32 param2) { sub_0200D6F4(param0->unk_00, param1, param2); } -void sub_0200D758 (GraphicElementData * param0, f32 * param1, f32 * param2) +void sub_0200D758(GraphicElementData *param0, f32 *param1, f32 *param2) { - const VecFx32 * v0; - VecFx32 * v1; + const VecFx32 *v0; + VecFx32 *v1; v0 = sub_02021D2C(param0); @@ -1173,22 +1174,22 @@ void sub_0200D758 (GraphicElementData * param0, f32 * param1, f32 * param2) *param2 = FX_FX32_TO_F32(v0->y); } -void sub_0200D788 (CellActorData * param0, f32 * param1, f32 * param2) +void sub_0200D788(CellActorData *param0, f32 *param1, f32 *param2) { sub_0200D758(param0->unk_00, param1, param2); } -void sub_0200D794 (GraphicElementData * param0, u16 param1) +void sub_0200D794(GraphicElementData *param0, u16 param1) { sub_02021C94(param0, param1); } -void sub_0200D79C (CellActorData * param0, u16 param1) +void sub_0200D79C(CellActorData *param0, u16 param1) { sub_0200D794(param0->unk_00, param1); } -void sub_0200D7A8 (GraphicElementData * param0, s32 param1) +void sub_0200D7A8(GraphicElementData *param0, s32 param1) { u16 v0; @@ -1198,22 +1199,22 @@ void sub_0200D7A8 (GraphicElementData * param0, s32 param1) sub_02021C94(param0, v0); } -void sub_0200D7C0 (CellActorData * param0, s32 param1) +void sub_0200D7C0(CellActorData *param0, s32 param1) { sub_0200D7A8(param0->unk_00, param1); } -void sub_0200D7CC (GraphicElementData * param0, int param1) +void sub_0200D7CC(GraphicElementData *param0, int param1) { sub_02021D0C(param0, param1); } -void sub_0200D7D4 (CellActorData * param0, int param1) +void sub_0200D7D4(CellActorData *param0, int param1) { sub_0200D7CC(param0->unk_00, param1); } -void sub_0200D7E0 (CellActorData * param0, s16 param1, s16 param2) +void sub_0200D7E0(CellActorData *param0, s16 param1, s16 param2) { VecFx32 v0; @@ -1224,29 +1225,29 @@ void sub_0200D7E0 (CellActorData * param0, s16 param1, s16 param2) sub_02021C60(param0->unk_00, &v0); } -void sub_0200D7FC (CellActorData * param0, BOOL param1) +void sub_0200D7FC(CellActorData *param0, BOOL param1) { sub_02021FA0(param0->unk_00, param1); } -void sub_0200D808 (GraphicElementData * param0, GXOamMode param1) +void sub_0200D808(GraphicElementData *param0, GXOamMode param1) { sub_02021FE0(param0, param1); } -void SpriteActor_SetOAMMode (CellActorData * param0, GXOamMode param1) +void SpriteActor_SetOAMMode(CellActorData *param0, GXOamMode param1) { sub_0200D808(param0->unk_00, param1); } -u32 sub_0200D81C (CellActorData * param0) +u32 sub_0200D81C(CellActorData *param0) { return sub_020220F4(param0->unk_00); } -BOOL sub_0200D828 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6) +BOOL sub_0200D828(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, BOOL param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; if (sub_02009D34(param1->unk_0C[0], param6) == 0) { return 0; @@ -1266,9 +1267,9 @@ BOOL sub_0200D828 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param return (v0 == NULL) ? 0 : 1; } -BOOL sub_0200D888 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6) +BOOL sub_0200D888(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, BOOL param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; if (sub_02009D34(param1->unk_0C[0], param6) == 0) { return 0; @@ -1288,9 +1289,9 @@ BOOL sub_0200D888 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param return (v0 == NULL) ? 0 : 1; } -BOOL sub_0200D8E8 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, BOOL param4, int param5, int param6) +BOOL sub_0200D8E8(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, BOOL param4, int param5, int param6) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; if (sub_02009D34(param1->unk_0C[0], param6) == 0) { return 0; @@ -1310,9 +1311,9 @@ BOOL sub_0200D8E8 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * pa return (v0 == NULL) ? 0 : 1; } -void sub_0200D948 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5) +void sub_0200D948(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, BOOL param4, int param5) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009DC8(param1->unk_0C[0], param5); @@ -1320,9 +1321,9 @@ void sub_0200D948 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param sub_0200A4C0(v0); } -void sub_0200D97C (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5) +void sub_0200D97C(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, int param3, BOOL param4, int param5) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009DC8(param1->unk_0C[1], param5); @@ -1330,14 +1331,14 @@ void sub_0200D97C (SpriteRenderer * param0, SpriteGfxHandler * param1, int param sub_0200A6B8(v0); } -GraphicElementManager * sub_0200D9B0 (SpriteGfxHandler * param0) +GraphicElementManager *sub_0200D9B0(SpriteGfxHandler *param0) { return param0->unk_00; } -void sub_0200D9B4 (SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, BOOL param4, int param5) +void sub_0200D9B4(SpriteRenderer *param0, SpriteGfxHandler *param1, NARC *param2, int param3, BOOL param4, int param5) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = sub_02009DC8(param1->unk_0C[0], param5); diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c index 636af5803f..e4bfc63744 100644 --- a/src/unk_0200DA60.c +++ b/src/unk_0200DA60.c @@ -1,75 +1,74 @@ +#include "unk_0200DA60.h" + #include #include - #include "struct_decls/struct_02009DC8_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "pokemon.h" - #include "struct_defs/archived_sprite.h" +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02013610.h" #include "struct_defs/struct_0201AE08.h" #include "struct_defs/struct_0205AA50.h" + +#include "overlay005/ov5_021D2F14.h" #include "overlay005/struct_ov5_021D30A8.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_02241308.h" +#include "gx_layers.h" +#include "heap.h" +#include "narc.h" +#include "pokemon.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002328.h" #include "unk_0200679C.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200C6E4.h" -#include "sys_task.h" -#include "unk_0200DA60.h" #include "unk_020131EC.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "pokemon.h" -#include "overlay005/ov5_021D2F14.h" typedef struct { - Window * unk_00; + Window *unk_00; u8 unk_04[1024]; u8 unk_404[128]; u16 unk_484; u8 unk_486; u8 unk_487_0 : 7; - u8 : 1; + u8 : 1; u8 unk_488_0 : 2; - u8 : 6; + u8 : 6; } UnkStruct_0200E924; typedef struct { UnkStruct_ov5_021D30A8 unk_00; - CellActorData * unk_1C8; - BGL * unk_1CC; + CellActorData *unk_1C8; + BGL *unk_1CC; u8 unk_1D0; u8 unk_1D1; u8 unk_1D2; u8 unk_1D3; } UnkStruct_0200ED50; -static void sub_0200E130(Window * param0, u16 param1); -static void sub_0200E31C(BGL * param0, u8 param1, u16 param2, u8 param3, u16 param4, u32 param5); -static void sub_0200E924(UnkStruct_0200E924 * param0, u32 param1); -static void sub_0200EB20(SysTask * param0, void * param1); -static UnkStruct_0200ED50 * sub_0200ED14(BGL * param0, u8 param1, u8 param2, u8 param3, u32 param4); -static void sub_0200ED50(UnkStruct_0200ED50 * param0, u32 param1); -static void sub_0200ED7C(UnkStruct_0200ED50 * param0); -static void sub_0200EDD4(UnkStruct_0200ED50 * param0, u8 param1, u8 param2); -static void sub_0200EE98(UnkStruct_ov5_021D30A8 * param0, ArchivedSprite * param1); -static void sub_0200EE24(UnkStruct_ov5_021D30A8 * param0, u16 param1, u8 param2); -static void sub_0200EE64(UnkStruct_ov5_021D30A8 * param0, Pokemon * param1); -static void sub_0200EC9C(SysTask * param0, void * param1); -static void sub_0200EF7C(UnkStruct_0200ED50 * param0, u8 param1, u16 param2); -static void sub_0200F12C(UnkStruct_0200ED50 * param0); +static void sub_0200E130(Window *param0, u16 param1); +static void sub_0200E31C(BGL *param0, u8 param1, u16 param2, u8 param3, u16 param4, u32 param5); +static void sub_0200E924(UnkStruct_0200E924 *param0, u32 param1); +static void sub_0200EB20(SysTask *param0, void *param1); +static UnkStruct_0200ED50 *sub_0200ED14(BGL *param0, u8 param1, u8 param2, u8 param3, u32 param4); +static void sub_0200ED50(UnkStruct_0200ED50 *param0, u32 param1); +static void sub_0200ED7C(UnkStruct_0200ED50 *param0); +static void sub_0200EDD4(UnkStruct_0200ED50 *param0, u8 param1, u8 param2); +static void sub_0200EE98(UnkStruct_ov5_021D30A8 *param0, ArchivedSprite *param1); +static void sub_0200EE24(UnkStruct_ov5_021D30A8 *param0, u16 param1, u8 param2); +static void sub_0200EE64(UnkStruct_ov5_021D30A8 *param0, Pokemon *param1); +static void sub_0200EC9C(SysTask *param0, void *param1); +static void sub_0200EF7C(UnkStruct_0200ED50 *param0, u8 param1, u16 param2); +static void sub_0200F12C(UnkStruct_0200ED50 *param0); static const SpriteTemplate Unk_020E5040 = { 0x0, @@ -79,12 +78,12 @@ static const SpriteTemplate Unk_020E5040 = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x15CD5, 0x15CD5, 0x15CD5, 0x15CD5, 0x0, 0x0}, + { 0x15CD5, 0x15CD5, 0x15CD5, 0x15CD5, 0x0, 0x0 }, 0x0, 0x0 }; -void Window_SetFrame (BGL * param0, u8 param1, u16 param2, u8 param3, u32 param4) +void Window_SetFrame(BGL *param0, u8 param1, u16 param2, u8 param3, u32 param4) { if (param3 == 0) { sub_02006E3C(38, 0, param0, param1, param2, 0, 0, param4); @@ -93,12 +92,12 @@ void Window_SetFrame (BGL * param0, u8 param1, u16 param2, u8 param3, u32 param4 } } -u32 Window_FramePalette (void) +u32 Window_FramePalette(void) { return 24; } -void sub_0200DAA4 (BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) +void sub_0200DAA4(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) { u32 v0; @@ -123,7 +122,7 @@ void sub_0200DAA4 (BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u3 } } -static void sub_0200DB10 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) +static void sub_0200DB10(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) { sub_02019CB8(param0, param1, param7, param2 - 1, param3 - 1, 1, 1, param6); sub_02019CB8(param0, param1, param7 + 1, param2, param3 - 1, param4, 1, param6); @@ -135,7 +134,7 @@ static void sub_0200DB10 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 para sub_02019CB8(param0, param1, param7 + 8, param2 + param4, param3 + param5, 1, 1, param6); } -void Window_Show (Window * param0, u8 param1, u16 param2, u8 param3) +void Window_Show(Window *param0, u8 param1, u16 param2, u8 param3) { u8 v0 = sub_0201C290(param0); @@ -146,7 +145,7 @@ void Window_Show (Window * param0, u8 param1, u16 param2, u8 param3) } } -void Window_Clear (Window * param0, u8 param1) +void Window_Clear(Window *param0, u8 param1) { u8 v0 = sub_0201C290(param0); @@ -157,17 +156,17 @@ void Window_Clear (Window * param0, u8 param1) } } -u32 sub_0200DD04 (u32 param0) +u32 sub_0200DD04(u32 param0) { return 2 + param0; } -u32 sub_0200DD08 (u32 param0) +u32 sub_0200DD08(u32 param0) { return 25 + param0; } -void sub_0200DD0C (BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) +void sub_0200DD0C(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) { sub_02006E3C(38, sub_0200DD04(param4), param0, param1, param2, 0, 0, param5); @@ -178,7 +177,7 @@ void sub_0200DD0C (BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u3 } } -static void sub_0200DD7C (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) +static void sub_0200DD7C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) { sub_02019CB8(param0, param1, param7, param2 - 2, param3 - 1, 1, 1, param6); sub_02019CB8(param0, param1, param7 + 1, param2 - 1, param3 - 1, 1, 1, param6); @@ -199,12 +198,12 @@ static void sub_0200DD7C (BGL * param0, u8 param1, u8 param2, u8 param3, u8 para sub_02019CB8(param0, param1, param7 + 17, param2 + param4 + 2, param3 + param5, 1, 1, param6); } -void sub_0200E010 (Window * param0, u32 param1, u32 param2) +void sub_0200E010(Window *param0, u32 param1, u32 param2) { sub_0200DD7C(param0->unk_00, sub_0201C290(param0), sub_0201C29C(param0), sub_0201C2A0(param0), sub_0201C294(param0), sub_0201C298(param0), param2, param1); } -void sub_0200E060 (Window * param0, u8 param1, u16 param2, u8 param3) +void sub_0200E060(Window *param0, u8 param1, u16 param2, u8 param3) { sub_0200E010(param0, param2, param3); @@ -215,7 +214,7 @@ void sub_0200E060 (Window * param0, u8 param1, u16 param2, u8 param3) sub_0200E130(param0, param2); } -void sub_0200E084 (Window * param0, u8 param1) +void sub_0200E084(Window *param0, u8 param1) { u8 v0 = sub_0201C290(param0); @@ -226,7 +225,7 @@ void sub_0200E084 (Window * param0, u8 param1) } } -static void sub_0200E0EC (void * param0, u16 param1, u16 param2, u16 param3, u16 param4, void * param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10, u16 param11) +static void sub_0200E0EC(void *param0, u16 param1, u16 param2, u16 param3, u16 param4, void *param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10, u16 param11) { UnkStruct_0201AE08 v0; UnkStruct_0201AE08 v1; @@ -242,13 +241,13 @@ static void sub_0200E0EC (void * param0, u16 param1, u16 param2, u16 param3, u16 sub_0201A1E4(&v0, &v1, param1, param2, param8, param9, param10, param11, 0); } -static void sub_0200E130 (Window * param0, u16 param1) +static void sub_0200E130(Window *param0, u16 param1) { u32 v0; - u8 * v1; - u8 * v2; - u8 * v3; - void * v4; + u8 *v1; + u8 *v2; + u8 *v3; + void *v4; u8 v5; u8 v6; @@ -258,7 +257,7 @@ static void sub_0200E130 (Window * param0, u16 param1) v2 = sub_02019F28(v5); { - NNSG2dCharacterData * v7; + NNSG2dCharacterData *v7; v4 = sub_02006F50(38, 22, 0, &v7, v0); v3 = (u8 *)v7->pRawData; @@ -278,11 +277,11 @@ static void sub_0200E130 (Window * param0, u16 param1) Heap_FreeToHeap(v1); } -void sub_0200E218 (BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) +void sub_0200E218(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u32 param5) { - void * v0; - NNSG2dCharacterData * v1; - u8 * v2; + void *v0; + NNSG2dCharacterData *v1; + u8 *v2; u32 v3; u8 v4, v5; @@ -311,15 +310,15 @@ void sub_0200E218 (BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u3 Heap_FreeToHeap(v2); } -void sub_0200E2A4 (BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 param5, u32 param6) +void sub_0200E2A4(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 param5, u32 param6) { sub_02006E3C( 36, 0, param0, param1, param2, (18 + 12) * 0x20, 0, param6); { - NNSG2dPaletteData * v0; - void * v1; - u16 * v2; + NNSG2dPaletteData *v0; + void *v1; + u16 *v2; v1 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_GRAPHIC__FIELD_BOARD, 1, param6); NNS_G2dGetUnpackedPaletteData(v1, &v0); @@ -334,7 +333,7 @@ void sub_0200E2A4 (BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u1 } } -static void sub_0200E31C (BGL * param0, u8 param1, u16 param2, u8 param3, u16 param4, u32 param5) +static void sub_0200E31C(BGL *param0, u8 param1, u16 param2, u8 param3, u16 param4, u32 param5) { if (param3 == 0) { param4 += 33; @@ -345,7 +344,7 @@ static void sub_0200E31C (BGL * param0, u8 param1, u16 param2, u8 param3, u16 pa sub_02006E3C(36, param4, param0, param1, param2, 24 * 0x20, 0, param5); } -static void sub_0200E354 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) +static void sub_0200E354(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7) { sub_02019CB8(param0, param1, param7, param2 - 9, param3 - 1, 1, 1, param6); sub_02019CB8(param0, param1, param7 + 1, param2 - 8, param3 - 1, 1, 1, param6); @@ -367,7 +366,7 @@ static void sub_0200E354 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 para sub_02019CB8(param0, param1, param7 + 17, param2 + param4 + 2, param3 + param5, 1, 1, param6); } -static void sub_0200E61C (Window * param0, u16 param1, u8 param2) +static void sub_0200E61C(Window *param0, u16 param1, u8 param2) { u16 v0, v1; u16 v2, v3; @@ -384,7 +383,7 @@ static void sub_0200E61C (Window * param0, u16 param1, u8 param2) } } -void sub_0200E69C (Window * param0, u8 param1, u16 param2, u8 param3, u8 param4) +void sub_0200E69C(Window *param0, u8 param1, u16 param2, u8 param3, u8 param4) { u8 v0 = sub_0201C290(param0); @@ -402,7 +401,7 @@ void sub_0200E69C (Window * param0, u8 param1, u16 param2, u8 param3, u8 param4) sub_0200E130(param0, param2); } -void sub_0200E744 (Window * param0, u8 param1, u8 param2) +void sub_0200E744(Window *param0, u8 param1, u8 param2) { u8 v0 = sub_0201C290(param0); @@ -417,14 +416,14 @@ void sub_0200E744 (Window * param0, u8 param1, u8 param2) } } -void * sub_0200E7FC (Window * param0, u32 param1) +void *sub_0200E7FC(Window *param0, u32 param1) { - UnkStruct_0200E924 * v0; + UnkStruct_0200E924 *v0; u32 v1; - u8 * v2; - u8 * v3; - u8 * v4; - void * v5; + u8 *v2; + u8 *v3; + u8 *v4; + void *v5; u8 v6; u8 v7; @@ -449,7 +448,7 @@ void * sub_0200E7FC (Window * param0, u32 param1) Heap_FreeToHeap(v4); { - NNSG2dCharacterData * v8; + NNSG2dCharacterData *v8; v5 = sub_02006F50(38, 23, 0, &v8, v1); v3 = (u8 *)v8->pRawData; @@ -470,7 +469,7 @@ void * sub_0200E7FC (Window * param0, u32 param1) return v0; } -static void sub_0200E924 (UnkStruct_0200E924 * param0, u32 param1) +static void sub_0200E924(UnkStruct_0200E924 *param0, u32 param1) { u8 v0, v1, v2, v3; @@ -504,9 +503,9 @@ static void sub_0200E924 (UnkStruct_0200E924 * param0, u32 param1) sub_02019448(param0->unk_00->unk_00, v0); } -static void sub_0200EB20 (SysTask * param0, void * param1) +static void sub_0200EB20(SysTask *param0, void *param1) { - UnkStruct_0200E924 * v0 = param1; + UnkStruct_0200E924 *v0 = param1; if (v0->unk_488_0 != 0) { if (v0->unk_488_0 == 1) { @@ -526,31 +525,31 @@ static void sub_0200EB20 (SysTask * param0, void * param1) } } -static void sub_0200EB8C (SysTask * param0, void * param1) +static void sub_0200EB8C(SysTask *param0, void *param1) { Heap_FreeToHeap(param1); SysTask_Done(param0); } -void DeleteWaitDial (void * param0) +void DeleteWaitDial(void *param0) { - UnkStruct_0200E924 * v0 = param0; + UnkStruct_0200E924 *v0 = param0; SysTask_ExecuteAfterVBlank(sub_0200EB8C, v0, 0); v0->unk_488_0 = 1; } -void sub_0200EBC8 (void * param0) +void sub_0200EBC8(void *param0) { - UnkStruct_0200E924 * v0 = param0; + UnkStruct_0200E924 *v0 = param0; SysTask_ExecuteAfterVBlank(sub_0200EB8C, v0, 0); v0->unk_488_0 = 2; } -u8 * sub_0200EBF0 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, u16 param6, u8 param7, int param8) +u8 *sub_0200EBF0(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, u16 param6, u8 param7, int param8) { - UnkStruct_0200ED50 * v0 = sub_0200ED14(param0, param1, param2, param3, param8); + UnkStruct_0200ED50 *v0 = sub_0200ED14(param0, param1, param2, param3, param8); sub_0200ED50(v0, param8); sub_0200ED7C(v0); @@ -562,9 +561,9 @@ u8 * sub_0200EBF0 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 return &v0->unk_1D3; } -u8 * sub_0200EC48 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon * param6, int param7) +u8 *sub_0200EC48(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon *param6, int param7) { - UnkStruct_0200ED50 * v0 = sub_0200ED14(param0, param1, param2, param3, param7); + UnkStruct_0200ED50 *v0 = sub_0200ED14(param0, param1, param2, param3, param7); sub_0200ED50(v0, param7); sub_0200ED7C(v0); @@ -576,9 +575,9 @@ u8 * sub_0200EC48 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 return &v0->unk_1D3; } -static void sub_0200EC9C (SysTask * param0, void * param1) +static void sub_0200EC9C(SysTask *param0, void *param1) { - UnkStruct_0200ED50 * v0 = param1; + UnkStruct_0200ED50 *v0 = param1; switch (v0->unk_1D3) { case 1: @@ -601,9 +600,9 @@ static void sub_0200EC9C (SysTask * param0, void * param1) sub_020219F8(v0->unk_00.unk_00); } -static UnkStruct_0200ED50 * sub_0200ED14 (BGL * param0, u8 param1, u8 param2, u8 param3, u32 param4) +static UnkStruct_0200ED50 *sub_0200ED14(BGL *param0, u8 param1, u8 param2, u8 param3, u32 param4) { - UnkStruct_0200ED50 * v0 = SysTask_GetParam(SysTask_StartAndAllocateParam(sub_0200EC9C, sizeof(UnkStruct_0200ED50), 0, param4)); + UnkStruct_0200ED50 *v0 = SysTask_GetParam(SysTask_StartAndAllocateParam(sub_0200EC9C, sizeof(UnkStruct_0200ED50), 0, param4)); v0->unk_1D3 = 0; v0->unk_1CC = param0; @@ -614,13 +613,13 @@ static UnkStruct_0200ED50 * sub_0200ED14 (BGL * param0, u8 param1, u8 param2, u8 return v0; } -static void sub_0200ED50 (UnkStruct_0200ED50 * param0, u32 param1) +static void sub_0200ED50(UnkStruct_0200ED50 *param0, u32 param1) { - UnkStruct_ov104_02241308 v0 = {1, 1, 1, 1, 0, 0}; + UnkStruct_ov104_02241308 v0 = { 1, 1, 1, 1, 0, 0 }; ov5_021D3190(¶m0->unk_00, &v0, 1, param1); } -static void sub_0200ED7C (UnkStruct_0200ED50 * param0) +static void sub_0200ED7C(UnkStruct_0200ED50 *param0) { ov5_021D3270(¶m0->unk_00, 38, 49, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 89301); ov5_021D3360(¶m0->unk_00, 38, 47, 0, 89301); @@ -628,7 +627,7 @@ static void sub_0200ED7C (UnkStruct_0200ED50 * param0) ov5_021D33B0(¶m0->unk_00, 38, 48, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 89301); } -static void sub_0200EDD4 (UnkStruct_0200ED50 * param0, u8 param1, u8 param2) +static void sub_0200EDD4(UnkStruct_0200ED50 *param0, u8 param1, u8 param2) { SpriteTemplate v0 = Unk_020E5040; @@ -641,9 +640,9 @@ static void sub_0200EDD4 (UnkStruct_0200ED50 * param0, u8 param1, u8 param2) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void sub_0200EE24 (UnkStruct_ov5_021D30A8 * param0, u16 param1, u8 param2) +static void sub_0200EE24(UnkStruct_ov5_021D30A8 *param0, u16 param1, u8 param2) { - void * v0; + void *v0; ArchivedSprite v1; v0 = sub_0200762C(param0->unk_1C6); @@ -653,9 +652,9 @@ static void sub_0200EE24 (UnkStruct_ov5_021D30A8 * param0, u16 param1, u8 param2 sub_02007B6C(v0); } -static void sub_0200EE64 (UnkStruct_ov5_021D30A8 * param0, Pokemon * param1) +static void sub_0200EE64(UnkStruct_ov5_021D30A8 *param0, Pokemon *param1) { - void * v0; + void *v0; ArchivedSprite v1; v0 = sub_0200762C(param0->unk_1C6); @@ -665,23 +664,23 @@ static void sub_0200EE64 (UnkStruct_ov5_021D30A8 * param0, Pokemon * param1) sub_02007B6C(v0); } -static void sub_0200EE98 (UnkStruct_ov5_021D30A8 * param0, ArchivedSprite * param1) +static void sub_0200EE98(UnkStruct_ov5_021D30A8 *param0, ArchivedSprite *param1) { - u8 * v0; + u8 *v0; u32 v1; - UnkStruct_02009DC8 * v2; - NNSG2dImageProxy * v3; - UnkStruct_02009DC8 * v4; - const NNSG2dImagePaletteProxy * v5; + UnkStruct_02009DC8 *v2; + NNSG2dImageProxy *v3; + UnkStruct_02009DC8 *v4; + const NNSG2dImagePaletteProxy *v5; v0 = Heap_AllocFromHeap(param0->unk_1C6, ((32 * 10 * 10) * 2)); { - UnkStruct_02013610 v6 = {0, 0, 10, 10}; + UnkStruct_02013610 v6 = { 0, 0, 10, 10 }; sub_020135F0(param1->archive, param1->character, param0->unk_1C6, &v6, &v0[0]); } { - UnkStruct_02013610 v7 = {10, 0, 10, 10}; + UnkStruct_02013610 v7 = { 10, 0, 10, 10 }; sub_020135F0(param1->archive, param1->character, param0->unk_1C6, &v7, &v0[(32 * 10 * 10)]); } @@ -705,7 +704,7 @@ static void sub_0200EE98 (UnkStruct_ov5_021D30A8 * param0, ArchivedSprite * para Heap_FreeToHeap(v0); } -static void sub_0200EF7C (UnkStruct_0200ED50 * param0, u8 param1, u16 param2) +static void sub_0200EF7C(UnkStruct_0200ED50 *param0, u8 param1, u16 param2) { sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2, param0->unk_1D1 - 1, param0->unk_1D2 - 1, 1, 1, param1); sub_02019CB8(param0->unk_1CC, param0->unk_1D0, param2 + 1, param0->unk_1D1, param0->unk_1D2 - 1, 10, 1, param1); @@ -719,7 +718,7 @@ static void sub_0200EF7C (UnkStruct_0200ED50 * param0, u8 param1, u16 param2) sub_0201C3C0(param0->unk_1CC, param0->unk_1D0); } -static void sub_0200F12C (UnkStruct_0200ED50 * param0) +static void sub_0200F12C(UnkStruct_0200ED50 *param0) { sub_02019CB8(param0->unk_1CC, param0->unk_1D0, 0, param0->unk_1D1 - 1, param0->unk_1D2 - 1, 12, 12, 0); sub_0201C3C0(param0->unk_1CC, param0->unk_1D0); diff --git a/src/unk_0200F174.c b/src/unk_0200F174.c index 20e0445081..e407bfb0bd 100644 --- a/src/unk_0200F174.c +++ b/src/unk_0200F174.c @@ -1,32 +1,32 @@ +#include "unk_0200F174.h" + #include #include -#include "enums.h" - -#include "sys_task_manager.h" - #include "struct_defs/struct_0200F600.h" -#include "functypes/funcptr_0200F634.h" -#include "functypes/funcptr_0200F6D8.h" #include "struct_defs/struct_0200F7A0.h" #include "struct_defs/struct_02010658.h" +#include "functypes/funcptr_0200F634.h" +#include "functypes/funcptr_0200F6D8.h" + +#include "enums.h" +#include "heap.h" #include "sys_task.h" -#include "unk_0200F174.h" +#include "sys_task_manager.h" #include "unk_0200F85C.h" #include "unk_02012480.h" #include "unk_02017728.h" -#include "heap.h" typedef struct { - UnkStruct_0200F600 * unk_00; - void * unk_04; + UnkStruct_0200F600 *unk_00; + void *unk_04; UnkFuncPtr_0200F634 unk_08; int unk_0C; } UnkStruct_0200F6D8; typedef struct { - UnkStruct_0200F600 * unk_00; + UnkStruct_0200F600 *unk_00; int unk_04; } UnkStruct_0200F704; @@ -50,23 +50,23 @@ typedef struct { u16 unk_150; } UnkStruct_0200F46C; -static void sub_0200F46C(UnkStruct_0200F46C * param0); -static void sub_0200F814(UnkStruct_0200F46C * param0); -static void sub_0200F600(UnkStruct_0200F600 * param0); -static void sub_0200F61C(void * param0); -static void sub_0200F728(SysTask * param0, void * param1); -static void sub_0200F748(SysTask * param0, void * param1); -static BOOL sub_0200F4C4(UnkStruct_0200F4C4 * param0, UnkStruct_0200F7A0 * param1, UnkStruct_0200F7A0 * param2); -static void sub_0200F534(BOOL * param0, UnkStruct_0200F7A0 * param1); -static BOOL sub_0200F550(UnkStruct_0200F7A0 * param0); -static void sub_0200F564(int param0, UnkStruct_0200F4C4 * param1); -static void sub_0200F5D4(UnkStruct_0200F7A0 * param0, int param1, int param2, int param3, int param4, void * param5, int param6, UnkStruct_02010658 * param7, UnkStruct_0200F600 * param8, int param9, u16 param10); -static void sub_0200F5C8(UnkStruct_0200F4C4 * param0, int param1, BOOL param2, BOOL param3); -static u16 sub_0200F768(UnkStruct_0200F46C * param0, u16 param1); -static u16 sub_0200F77C(const UnkStruct_0200F46C * param0); -static void sub_0200F7E4(UnkStruct_0200F7A0 * param0); -static void sub_0200F7B4(UnkStruct_0200F7A0 * param0); -static void sub_0200F7A0(SysTask * param0, void * param1); +static void sub_0200F46C(UnkStruct_0200F46C *param0); +static void sub_0200F814(UnkStruct_0200F46C *param0); +static void sub_0200F600(UnkStruct_0200F600 *param0); +static void sub_0200F61C(void *param0); +static void sub_0200F728(SysTask *param0, void *param1); +static void sub_0200F748(SysTask *param0, void *param1); +static BOOL sub_0200F4C4(UnkStruct_0200F4C4 *param0, UnkStruct_0200F7A0 *param1, UnkStruct_0200F7A0 *param2); +static void sub_0200F534(BOOL *param0, UnkStruct_0200F7A0 *param1); +static BOOL sub_0200F550(UnkStruct_0200F7A0 *param0); +static void sub_0200F564(int param0, UnkStruct_0200F4C4 *param1); +static void sub_0200F5D4(UnkStruct_0200F7A0 *param0, int param1, int param2, int param3, int param4, void *param5, int param6, UnkStruct_02010658 *param7, UnkStruct_0200F600 *param8, int param9, u16 param10); +static void sub_0200F5C8(UnkStruct_0200F4C4 *param0, int param1, BOOL param2, BOOL param3); +static u16 sub_0200F768(UnkStruct_0200F46C *param0, u16 param1); +static u16 sub_0200F77C(const UnkStruct_0200F46C *param0); +static void sub_0200F7E4(UnkStruct_0200F7A0 *param0); +static void sub_0200F7B4(UnkStruct_0200F7A0 *param0); +static void sub_0200F7A0(SysTask *param0, void *param1); const static UnkFuncPtr_0200F6D8 Unk_020E5074[] = { sub_0200F85C, @@ -115,9 +115,9 @@ const static UnkFuncPtr_0200F6D8 Unk_020E5074[] = { static UnkStruct_0200F46C Unk_021BF474; -void sub_0200F174 (int param0, int param1, int param2, u16 param3, int param4, int param5, int param6) +void sub_0200F174(int param0, int param1, int param2, u16 param3, int param4, int param5, int param6) { - UnkStruct_0200F46C * v0; + UnkStruct_0200F46C *v0; u16 v1; GF_ASSERT(param4); @@ -151,9 +151,9 @@ void sub_0200F174 (int param0, int param1, int param2, u16 param3, int param4, i } } -void sub_0200F27C (void) +void sub_0200F27C(void) { - UnkStruct_0200F46C * v0 = &Unk_021BF474; + UnkStruct_0200F46C *v0 = &Unk_021BF474; BOOL v1; if (v0->unk_14C) { @@ -165,7 +165,7 @@ void sub_0200F27C (void) } } -BOOL ScreenWipe_Done (void) +BOOL ScreenWipe_Done(void) { if (Unk_021BF474.unk_14C) { return 0; @@ -174,7 +174,7 @@ BOOL ScreenWipe_Done (void) return 1; } -void sub_0200F2C0 (void) +void sub_0200F2C0(void) { sub_0200F6AC(&Unk_021BF474.unk_74, 0); sub_0200F6AC(&Unk_021BF474.unk_74, 1); @@ -197,17 +197,17 @@ void sub_0200F2C0 (void) sub_0200F814(&Unk_021BF474); } -void sub_0200F32C (int param0) +void sub_0200F32C(int param0) { sub_02012480(GX_WNDMASK_NONE, param0); } -void sub_0200F338 (int param0) +void sub_0200F338(int param0) { sub_0200F44C(param0, 0); } -void sub_0200F344 (int param0, u16 param1) +void sub_0200F344(int param0, u16 param1) { int v0; @@ -224,7 +224,7 @@ void sub_0200F344 (int param0, u16 param1) sub_0200F44C(param0, v0); } -void sub_0200F370 (u16 param0) +void sub_0200F370(u16 param0) { int v0; @@ -244,7 +244,7 @@ void sub_0200F370 (u16 param0) Unk_021BF474.unk_150 = param0; } -void sub_0200F3B0 (int param0, u16 param1) +void sub_0200F3B0(int param0, u16 param1) { if (param1 == 0xffff) { param1 = Unk_021BF474.unk_150; @@ -262,13 +262,13 @@ void sub_0200F3B0 (int param0, u16 param1) sub_02012678(&Unk_021BF474.unk_8C, GX_BLEND_PLANEMASK_BD, 0, param0); } -void sub_0200F42C (u16 param0) +void sub_0200F42C(u16 param0) { GX_LoadBGPltt((void *)¶m0, 0, sizeof(short)); GXS_LoadBGPltt((void *)¶m0, 0, sizeof(short)); } -void sub_0200F44C (int param0, int param1) +void sub_0200F44C(int param0, int param1) { if (param0 == 0) { GX_SetMasterBrightness(param1); @@ -277,7 +277,7 @@ void sub_0200F44C (int param0, int param1) } } -static void sub_0200F46C (UnkStruct_0200F46C * param0) +static void sub_0200F46C(UnkStruct_0200F46C *param0) { param0->unk_14C = 0; param0->unk_150 = sub_0200F77C(param0); @@ -301,7 +301,7 @@ static void sub_0200F46C (UnkStruct_0200F46C * param0) sub_0200F814(param0); } -static BOOL sub_0200F4C4 (UnkStruct_0200F4C4 * param0, UnkStruct_0200F7A0 * param1, UnkStruct_0200F7A0 * param2) +static BOOL sub_0200F4C4(UnkStruct_0200F4C4 *param0, UnkStruct_0200F7A0 *param1, UnkStruct_0200F7A0 *param2) { switch (param0->unk_00) { case 0: @@ -331,7 +331,7 @@ static BOOL sub_0200F4C4 (UnkStruct_0200F4C4 * param0, UnkStruct_0200F7A0 * para return 0; } -static void sub_0200F534 (BOOL * param0, UnkStruct_0200F7A0 * param1) +static void sub_0200F534(BOOL *param0, UnkStruct_0200F7A0 *param1) { int v0; @@ -344,12 +344,12 @@ static void sub_0200F534 (BOOL * param0, UnkStruct_0200F7A0 * param1) } } -static BOOL sub_0200F550 (UnkStruct_0200F7A0 * param0) +static BOOL sub_0200F550(UnkStruct_0200F7A0 *param0) { return Unk_020E5074[param0->unk_00](param0); } -static void sub_0200F564 (int param0, UnkStruct_0200F4C4 * param1) +static void sub_0200F564(int param0, UnkStruct_0200F4C4 *param1) { switch (param0) { case 0: @@ -370,7 +370,7 @@ static void sub_0200F564 (int param0, UnkStruct_0200F4C4 * param1) } } -static void sub_0200F5C8 (UnkStruct_0200F4C4 * param0, int param1, BOOL param2, BOOL param3) +static void sub_0200F5C8(UnkStruct_0200F4C4 *param0, int param1, BOOL param2, BOOL param3) { param0->unk_00 = param1; param0->unk_04 = param2; @@ -379,7 +379,7 @@ static void sub_0200F5C8 (UnkStruct_0200F4C4 * param0, int param1, BOOL param2, param0->unk_10 = param3; } -static void sub_0200F5D4 (UnkStruct_0200F7A0 * param0, int param1, int param2, int param3, int param4, void * param5, int param6, UnkStruct_02010658 * param7, UnkStruct_0200F600 * param8, int param9, u16 param10) +static void sub_0200F5D4(UnkStruct_0200F7A0 *param0, int param1, int param2, int param3, int param4, void *param5, int param6, UnkStruct_02010658 *param7, UnkStruct_0200F600 *param8, int param9, u16 param10) { param0->unk_00 = param1; param0->unk_04 = param2; @@ -393,7 +393,7 @@ static void sub_0200F5D4 (UnkStruct_0200F7A0 * param0, int param1, int param2, i param0->unk_24 = param10; } -static void sub_0200F600 (UnkStruct_0200F600 * param0) +static void sub_0200F600(UnkStruct_0200F600 *param0) { int v0; @@ -404,21 +404,21 @@ static void sub_0200F600 (UnkStruct_0200F600 * param0) } } -static void sub_0200F61C (void * param0) +static void sub_0200F61C(void *param0) { int v0; - UnkStruct_0200F600 * v1 = param0; + UnkStruct_0200F600 *v1 = param0; for (v0 = 0; v0 < 2; v0++) { v1->unk_08[v0](v1->unk_00[v0]); } } -void sub_0200F634 (UnkStruct_0200F600 * param0, void * param1, UnkFuncPtr_0200F634 param2, int param3) +void sub_0200F634(UnkStruct_0200F600 *param0, void *param1, UnkFuncPtr_0200F634 param2, int param3) { u8 v0 = 1; - GF_ASSERT((param0->unk_10[param3] == 0)); + GF_ASSERT(param0->unk_10[param3] == 0); GF_ASSERT(param0->unk_08[param3] != NULL); if ((param0->unk_10[0] == 0) && (param0->unk_10[1] == 0)) { @@ -438,7 +438,7 @@ void sub_0200F634 (UnkStruct_0200F600 * param0, void * param1, UnkFuncPtr_0200F6 param0->unk_10[param3] = 1; } -void sub_0200F6AC (UnkStruct_0200F600 * param0, int param1) +void sub_0200F6AC(UnkStruct_0200F600 *param0, int param1) { param0->unk_10[param1] = 0; @@ -450,9 +450,9 @@ void sub_0200F6AC (UnkStruct_0200F600 * param0, int param1) param0->unk_00[param1] = NULL; } -void sub_0200F6D8 (UnkStruct_0200F600 * param0, void * param1, UnkFuncPtr_0200F634 param2, int param3, int param4) +void sub_0200F6D8(UnkStruct_0200F600 *param0, void *param1, UnkFuncPtr_0200F634 param2, int param3, int param4) { - UnkStruct_0200F6D8 * v0 = Heap_AllocFromHeapAtEnd(param4, sizeof(UnkStruct_0200F6D8)); + UnkStruct_0200F6D8 *v0 = Heap_AllocFromHeapAtEnd(param4, sizeof(UnkStruct_0200F6D8)); v0->unk_00 = param0; v0->unk_04 = param1; @@ -462,9 +462,9 @@ void sub_0200F6D8 (UnkStruct_0200F600 * param0, void * param1, UnkFuncPtr_0200F6 SysTask_ExecuteAfterVBlank(sub_0200F728, v0, 1024); } -void sub_0200F704 (UnkStruct_0200F600 * param0, int param1, int param2) +void sub_0200F704(UnkStruct_0200F600 *param0, int param1, int param2) { - UnkStruct_0200F704 * v0 = Heap_AllocFromHeapAtEnd(param2, sizeof(UnkStruct_0200F704)); + UnkStruct_0200F704 *v0 = Heap_AllocFromHeapAtEnd(param2, sizeof(UnkStruct_0200F704)); v0->unk_00 = param0; v0->unk_04 = param1; @@ -472,30 +472,30 @@ void sub_0200F704 (UnkStruct_0200F600 * param0, int param1, int param2) SysTask_ExecuteAfterVBlank(sub_0200F748, v0, 1024); } -static void sub_0200F728 (SysTask * param0, void * param1) +static void sub_0200F728(SysTask *param0, void *param1) { - UnkStruct_0200F6D8 * v0 = (UnkStruct_0200F6D8 *)param1; + UnkStruct_0200F6D8 *v0 = (UnkStruct_0200F6D8 *)param1; sub_0200F634(v0->unk_00, v0->unk_04, v0->unk_08, v0->unk_0C); SysTask_Done(param0); Heap_FreeToHeap(param1); } -static void sub_0200F748 (SysTask * param0, void * param1) +static void sub_0200F748(SysTask *param0, void *param1) { - UnkStruct_0200F704 * v0 = (UnkStruct_0200F704 *)param1; + UnkStruct_0200F704 *v0 = (UnkStruct_0200F704 *)param1; sub_0200F6AC(v0->unk_00, v0->unk_04); SysTask_Done(param0); Heap_FreeToHeap(param1); } -static void sub_0200F764 (void * param0) +static void sub_0200F764(void *param0) { return; } -static u16 sub_0200F768 (UnkStruct_0200F46C * param0, u16 param1) +static u16 sub_0200F768(UnkStruct_0200F46C *param0, u16 param1) { if (param1 == 0xffff) { return param0->unk_150; @@ -504,9 +504,9 @@ static u16 sub_0200F768 (UnkStruct_0200F46C * param0, u16 param1) return param1; } -static u16 sub_0200F77C (const UnkStruct_0200F46C * param0) +static u16 sub_0200F77C(const UnkStruct_0200F46C *param0) { - const UnkStruct_0200F7A0 * v0; + const UnkStruct_0200F7A0 *v0; if (param0->unk_00.unk_0C == 1) { v0 = ¶m0->unk_14; @@ -521,22 +521,22 @@ static u16 sub_0200F77C (const UnkStruct_0200F46C * param0) return param0->unk_150; } -static void sub_0200F7A0 (SysTask * param0, void * param1) +static void sub_0200F7A0(SysTask *param0, void *param1) { - UnkStruct_0200F7A0 * v0 = param1; + UnkStruct_0200F7A0 *v0 = param1; sub_0200F44C(v0->unk_10, 0); SysTask_Done(param0); } -static void sub_0200F7B4 (UnkStruct_0200F7A0 * param0) +static void sub_0200F7B4(UnkStruct_0200F7A0 *param0) { if ((param0->unk_28 == 0) && ((param0->unk_24 == 0x7fff) || (param0->unk_24 == 0x0)) && (param0->unk_2C == 0)) { SysTask_ExecuteAfterVBlank(sub_0200F7A0, param0, 1024); } } -static void sub_0200F7E4 (UnkStruct_0200F7A0 * param0) +static void sub_0200F7E4(UnkStruct_0200F7A0 *param0) { if ((param0->unk_28 == 1) && ((param0->unk_24 == 0x7fff) || (param0->unk_24 == 0x0)) && (param0->unk_2C == 0)) { sub_0200F344(param0->unk_10, param0->unk_24); @@ -544,7 +544,7 @@ static void sub_0200F7E4 (UnkStruct_0200F7A0 * param0) } } -static void sub_0200F814 (UnkStruct_0200F46C * param0) +static void sub_0200F814(UnkStruct_0200F46C *param0) { memset(¶m0->unk_00, 0, sizeof(UnkStruct_0200F4C4)); memset(¶m0->unk_14, 0, sizeof(UnkStruct_0200F7A0)); diff --git a/src/unk_0200F85C.c b/src/unk_0200F85C.c index 1401ba2cb3..318b286a21 100644 --- a/src/unk_0200F85C.c +++ b/src/unk_0200F85C.c @@ -1,22 +1,20 @@ +#include "unk_0200F85C.h" + #include #include -#include "inlines.h" -#include "enums.h" - -#include "sys_task_manager.h" - #include "struct_defs/struct_0200F600.h" #include "struct_defs/struct_0200F7A0.h" #include "struct_defs/struct_02010658.h" +#include "enums.h" +#include "heap.h" +#include "inlines.h" +#include "string.h" #include "sys_task.h" +#include "sys_task_manager.h" #include "unk_0200F174.h" -#include "unk_0200F85C.h" #include "unk_02012480.h" -#include "heap.h" - -#include "string.h" typedef struct { int unk_00; @@ -52,7 +50,7 @@ typedef struct { int unk_3C; int unk_40; int unk_44; - UnkStruct_02010658 * unk_48; + UnkStruct_02010658 *unk_48; } UnkStruct_02010EA4; typedef struct { @@ -76,7 +74,7 @@ typedef struct { } UnkStruct_02010FC0; typedef struct { - UnkStruct_02010FC0 * unk_00; + UnkStruct_02010FC0 *unk_00; int unk_04; int unk_08; } UnkStruct_02010588; @@ -92,8 +90,8 @@ typedef struct { int unk_24; int unk_28; int unk_2C; - UnkStruct_02010658 * unk_30; - UnkStruct_0200F600 * unk_34; + UnkStruct_02010658 *unk_30; + UnkStruct_0200F600 *unk_34; } UnkStruct_0201109C; typedef struct { @@ -115,8 +113,8 @@ typedef struct { int unk_18; int unk_1C; int unk_20; - UnkStruct_02010658 * unk_24; - UnkStruct_0200F600 * unk_28; + UnkStruct_02010658 *unk_24; + UnkStruct_0200F600 *unk_28; int unk_2C; } UnkStruct_02011360; @@ -138,8 +136,8 @@ typedef struct { int unk_1C; int unk_20; int unk_24; - UnkStruct_02010658 * unk_28; - UnkStruct_0200F600 * unk_2C; + UnkStruct_02010658 *unk_28; + UnkStruct_0200F600 *unk_2C; int unk_30; } UnkStruct_02011568; @@ -160,20 +158,20 @@ typedef struct { typedef struct { UnkStruct_02010588 unk_00; - UnkStruct_0201184C_sub1 * unk_0C; + UnkStruct_0201184C_sub1 *unk_0C; int unk_10; int unk_14; int unk_18; int unk_1C; int unk_20; - UnkStruct_02010658 * unk_24; - UnkStruct_0200F600 * unk_28; + UnkStruct_02010658 *unk_24; + UnkStruct_0200F600 *unk_28; int unk_2C; } UnkStruct_0201184C; typedef struct { - const UnkStruct_0200FD8C * unk_00; - const UnkStruct_0200FD8C * unk_04; + const UnkStruct_0200FD8C *unk_00; + const UnkStruct_0200FD8C *unk_04; u16 unk_08; u16 unk_0A; u8 unk_0C; @@ -196,8 +194,8 @@ typedef struct { int unk_24; int unk_28; int unk_2C; - UnkStruct_02010658 * unk_30; - UnkStruct_0200F600 * unk_34; + UnkStruct_02010658 *unk_30; + UnkStruct_0200F600 *unk_34; } UnkStruct_02011AFC; typedef struct { @@ -223,8 +221,8 @@ typedef struct { int unk_24; int unk_28; int unk_2C; - UnkStruct_02010658 * unk_30; - UnkStruct_0200F600 * unk_34; + UnkStruct_02010658 *unk_30; + UnkStruct_0200F600 *unk_34; } UnkStruct_02011E04; typedef struct { @@ -255,7 +253,7 @@ typedef struct { typedef struct { UnkStruct_0201076C unk_00; - const UnkStruct_0200F898 * unk_30C; + const UnkStruct_0200F898 *unk_30C; int unk_310; int unk_314; int unk_318; @@ -263,12 +261,12 @@ typedef struct { int unk_320; int unk_324; int unk_328; - UnkStruct_02010658 * unk_32C; - UnkStruct_0200F600 * unk_330; + UnkStruct_02010658 *unk_32C; + UnkStruct_0200F600 *unk_330; } UnkStruct_020120D4; typedef struct { - const UnkStruct_0200F898 * unk_00; + const UnkStruct_0200F898 *unk_00; u16 unk_04; u16 unk_06; } UnkStruct_0200FE6C; @@ -282,7 +280,7 @@ typedef struct { typedef struct { UnkStruct_02010EA4 unk_00; UnkStruct_020120D4 unk_4C; - UnkStruct_0201006C * unk_380; + UnkStruct_0201006C *unk_380; u8 unk_384; u8 unk_385; u8 unk_386; @@ -291,88 +289,88 @@ typedef struct { static fx32 sub_020100E0(int param0); static int sub_020100FC(int param0, int param1); -static void sub_02010124(int param0, int * param1, int param2, int param3); +static void sub_02010124(int param0, int *param1, int param2, int param3); static int sub_02010178(int param0, int param1); static int sub_02010190(int param0, int param1, int param2); static int sub_020101A0(int param0, int param1); -static void sub_020101B0(UnkStruct_020101B0 * param0, UnkStruct_020101B0 * param1); -static void sub_020101D4(UnkStruct_020101B0 * param0, UnkStruct_020101B0 * param1, UnkStruct_020101B0 * param2, const UnkStruct_0200FD8C * param3, const UnkStruct_0200FD8C * param4, int param5); -static void sub_02010658(int param0, UnkStruct_02010658 * param1, int param2); -static void sub_0201035C(void * param0); -static void sub_02010588(UnkStruct_02010588 * param0, int param1, int param2, int param3); -static void sub_020105EC(UnkStruct_02010588 * param0); -static void sub_020105F4(UnkStruct_02010588 * param0); -static UnkStruct_02010FC0 * sub_02010604(UnkStruct_02010588 * param0, int param1); -static void sub_02010624(SysTask * param0, void * param1); -static void sub_020106A8(UnkStruct_02010658 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); -static void sub_02010710(UnkStruct_02010658 * param0, int param1, int param2, int param3); -static void sub_02010728(UnkStruct_0201076C * param0, int param1, int param2, int param3, int param4); -static void sub_0201076C(UnkStruct_0201076C * param0); -static void sub_02010784(UnkStruct_0200F600 * param0, UnkStruct_0201076C * param1, u32 param2); -static void sub_0201079C(UnkStruct_0200F600 * param0, UnkStruct_0201076C * param1, u32 param2); -static void sub_020107AC(SysTask * param0, void * param1); -static void sub_020107D8(void * param0); -static void sub_02010238(UnkStruct_0200F7A0 * param0, int param1); -static BOOL sub_020102D8(UnkStruct_0200F7A0 * param0); -static BOOL sub_02010318(UnkStruct_02010318 * param0); -static void sub_02010CF4(UnkStruct_0200F7A0 * param0, const UnkStruct_0200F980 * param1); -static BOOL sub_02010D44(UnkStruct_0200F7A0 * param0); -static void sub_02010D94(UnkStruct_0200F7A0 * param0, const UnkStruct_0200F980 * param1, const UnkStruct_0200F980 * param2); -static BOOL sub_02010DEC(UnkStruct_0200F7A0 * param0); -static void sub_02010E48(UnkStruct_02010EA4 * param0, const UnkStruct_0200F980 * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5); -static BOOL sub_02010EA4(UnkStruct_02010EA4 * param0); -static void sub_02010F2C(UnkStruct_0200F7A0 * param0, const UnkStruct_0200FB7C * param1); -static BOOL sub_02010F64(UnkStruct_0200F7A0 * param0); -static void sub_02010FC0(UnkStruct_0201109C * param0, const UnkStruct_0200FB7C * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7); -static BOOL sub_0201109C(UnkStruct_0201109C * param0); -static void sub_02011180(UnkStruct_0201109C * param0); -static void sub_02011204(UnkStruct_0200F7A0 * param0, const UnkStruct_0200FC2C * param1); -static BOOL sub_0201123C(UnkStruct_0200F7A0 * param0); -static void sub_02011298(UnkStruct_02011360 * param0, const UnkStruct_0200FC2C * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7); -static BOOL sub_02011360(UnkStruct_02011360 * param0); -static void sub_020113B0(UnkStruct_02011360 * param0); -static void sub_02011408(UnkStruct_0200F7A0 * param0, const UnkStruct_0200FD34 * param1); -static BOOL sub_02011440(UnkStruct_0200F7A0 * param0); -static void sub_02011494(UnkStruct_02011568 * param0, const UnkStruct_0200FD34 * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7); -static BOOL sub_02011568(UnkStruct_02011568 * param0); -static void sub_020115B8(UnkStruct_02011568 * param0); -static void sub_020116A0(UnkStruct_0200F7A0 * param0, const UnkStruct_02011738 * param1); -static BOOL sub_020116D8(UnkStruct_0200F7A0 * param0); -static BOOL sub_0201184C(UnkStruct_0201184C * param0); -static void sub_02011738(UnkStruct_0201184C * param0, const UnkStruct_02011738 * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7); -static void sub_0201189C(UnkStruct_0201184C * param0); -static void sub_020118AC(UnkStruct_0201184C * param0); -static void sub_02011938(UnkStruct_0201184C * param0); -static void sub_020118E0(UnkStruct_02010588 * param0, UnkStruct_020101B0 * param1); -static void sub_02011960(UnkStruct_0200F7A0 * param0, UnkStruct_0200FEA4 * param1); -static BOOL sub_020119A0(UnkStruct_0200F7A0 * param0); -static void sub_02011A00(UnkStruct_02011AFC * param0, UnkStruct_0200FEA4 * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7); -static BOOL sub_02011AFC(UnkStruct_02011AFC * param0); -static void sub_02011B54(UnkStruct_02011AFC * param0); -static void sub_02011B58(UnkStruct_02011AFC * param0); -static void sub_02011C7C(UnkStruct_02011C7C * param0, int param1, int param2); -static void sub_02011C94(UnkStruct_0200F7A0 * param0, UnkStruct_0200FF30 * param1); -static BOOL sub_02011CD4(UnkStruct_0200F7A0 * param0); -static void sub_02011D34(UnkStruct_02011E04 * param0, UnkStruct_0200FF30 * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7); -static BOOL sub_02011E04(UnkStruct_02011E04 * param0); -static void sub_02011E5C(UnkStruct_02011E04 * param0); -static void sub_02011E60(UnkStruct_02011E04 * param0); -static void sub_02011F2C(UnkStruct_02011F2C * param0, int param1, int param2); -static void sub_02011F44(UnkStruct_0200F7A0 * param0, UnkStruct_0200FE6C * param1); -static BOOL sub_02011F88(UnkStruct_0200F7A0 * param0); -static void sub_02011FE8(UnkStruct_020120D4 * param0, UnkStruct_0200FE6C * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7); -static BOOL sub_020120D4(UnkStruct_020120D4 * param0); -static void sub_02012134(UnkStruct_020120D4 * param0); -static void sub_02012138(UnkStruct_020120D4 * param0); -static void sub_02012174(const UnkStruct_0200F898 * param0, UnkStruct_02012174 * param1, int param2, int param3); -static void sub_020121C4(UnkStruct_0200F7A0 * param0, UnkStruct_0201006C * param1); -static BOOL sub_02012228(UnkStruct_0200F7A0 * param0); -static void sub_02012290(UnkStruct_02012290 * param0, UnkStruct_0201006C * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7); -static BOOL sub_02012310(UnkStruct_02012290 * param0, UnkStruct_0200F7A0 * param1); -static void sub_02012384(UnkStruct_02012290 * param0, UnkStruct_0201006C * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7); -static BOOL sub_020123F4(UnkStruct_02012290 * param0, UnkStruct_0200F7A0 * param1); - -BOOL sub_0200F85C (UnkStruct_0200F7A0 * param0) +static void sub_020101B0(UnkStruct_020101B0 *param0, UnkStruct_020101B0 *param1); +static void sub_020101D4(UnkStruct_020101B0 *param0, UnkStruct_020101B0 *param1, UnkStruct_020101B0 *param2, const UnkStruct_0200FD8C *param3, const UnkStruct_0200FD8C *param4, int param5); +static void sub_02010658(int param0, UnkStruct_02010658 *param1, int param2); +static void sub_0201035C(void *param0); +static void sub_02010588(UnkStruct_02010588 *param0, int param1, int param2, int param3); +static void sub_020105EC(UnkStruct_02010588 *param0); +static void sub_020105F4(UnkStruct_02010588 *param0); +static UnkStruct_02010FC0 *sub_02010604(UnkStruct_02010588 *param0, int param1); +static void sub_02010624(SysTask *param0, void *param1); +static void sub_020106A8(UnkStruct_02010658 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9); +static void sub_02010710(UnkStruct_02010658 *param0, int param1, int param2, int param3); +static void sub_02010728(UnkStruct_0201076C *param0, int param1, int param2, int param3, int param4); +static void sub_0201076C(UnkStruct_0201076C *param0); +static void sub_02010784(UnkStruct_0200F600 *param0, UnkStruct_0201076C *param1, u32 param2); +static void sub_0201079C(UnkStruct_0200F600 *param0, UnkStruct_0201076C *param1, u32 param2); +static void sub_020107AC(SysTask *param0, void *param1); +static void sub_020107D8(void *param0); +static void sub_02010238(UnkStruct_0200F7A0 *param0, int param1); +static BOOL sub_020102D8(UnkStruct_0200F7A0 *param0); +static BOOL sub_02010318(UnkStruct_02010318 *param0); +static void sub_02010CF4(UnkStruct_0200F7A0 *param0, const UnkStruct_0200F980 *param1); +static BOOL sub_02010D44(UnkStruct_0200F7A0 *param0); +static void sub_02010D94(UnkStruct_0200F7A0 *param0, const UnkStruct_0200F980 *param1, const UnkStruct_0200F980 *param2); +static BOOL sub_02010DEC(UnkStruct_0200F7A0 *param0); +static void sub_02010E48(UnkStruct_02010EA4 *param0, const UnkStruct_0200F980 *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5); +static BOOL sub_02010EA4(UnkStruct_02010EA4 *param0); +static void sub_02010F2C(UnkStruct_0200F7A0 *param0, const UnkStruct_0200FB7C *param1); +static BOOL sub_02010F64(UnkStruct_0200F7A0 *param0); +static void sub_02010FC0(UnkStruct_0201109C *param0, const UnkStruct_0200FB7C *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7); +static BOOL sub_0201109C(UnkStruct_0201109C *param0); +static void sub_02011180(UnkStruct_0201109C *param0); +static void sub_02011204(UnkStruct_0200F7A0 *param0, const UnkStruct_0200FC2C *param1); +static BOOL sub_0201123C(UnkStruct_0200F7A0 *param0); +static void sub_02011298(UnkStruct_02011360 *param0, const UnkStruct_0200FC2C *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7); +static BOOL sub_02011360(UnkStruct_02011360 *param0); +static void sub_020113B0(UnkStruct_02011360 *param0); +static void sub_02011408(UnkStruct_0200F7A0 *param0, const UnkStruct_0200FD34 *param1); +static BOOL sub_02011440(UnkStruct_0200F7A0 *param0); +static void sub_02011494(UnkStruct_02011568 *param0, const UnkStruct_0200FD34 *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7); +static BOOL sub_02011568(UnkStruct_02011568 *param0); +static void sub_020115B8(UnkStruct_02011568 *param0); +static void sub_020116A0(UnkStruct_0200F7A0 *param0, const UnkStruct_02011738 *param1); +static BOOL sub_020116D8(UnkStruct_0200F7A0 *param0); +static BOOL sub_0201184C(UnkStruct_0201184C *param0); +static void sub_02011738(UnkStruct_0201184C *param0, const UnkStruct_02011738 *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7); +static void sub_0201189C(UnkStruct_0201184C *param0); +static void sub_020118AC(UnkStruct_0201184C *param0); +static void sub_02011938(UnkStruct_0201184C *param0); +static void sub_020118E0(UnkStruct_02010588 *param0, UnkStruct_020101B0 *param1); +static void sub_02011960(UnkStruct_0200F7A0 *param0, UnkStruct_0200FEA4 *param1); +static BOOL sub_020119A0(UnkStruct_0200F7A0 *param0); +static void sub_02011A00(UnkStruct_02011AFC *param0, UnkStruct_0200FEA4 *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7); +static BOOL sub_02011AFC(UnkStruct_02011AFC *param0); +static void sub_02011B54(UnkStruct_02011AFC *param0); +static void sub_02011B58(UnkStruct_02011AFC *param0); +static void sub_02011C7C(UnkStruct_02011C7C *param0, int param1, int param2); +static void sub_02011C94(UnkStruct_0200F7A0 *param0, UnkStruct_0200FF30 *param1); +static BOOL sub_02011CD4(UnkStruct_0200F7A0 *param0); +static void sub_02011D34(UnkStruct_02011E04 *param0, UnkStruct_0200FF30 *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7); +static BOOL sub_02011E04(UnkStruct_02011E04 *param0); +static void sub_02011E5C(UnkStruct_02011E04 *param0); +static void sub_02011E60(UnkStruct_02011E04 *param0); +static void sub_02011F2C(UnkStruct_02011F2C *param0, int param1, int param2); +static void sub_02011F44(UnkStruct_0200F7A0 *param0, UnkStruct_0200FE6C *param1); +static BOOL sub_02011F88(UnkStruct_0200F7A0 *param0); +static void sub_02011FE8(UnkStruct_020120D4 *param0, UnkStruct_0200FE6C *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7); +static BOOL sub_020120D4(UnkStruct_020120D4 *param0); +static void sub_02012134(UnkStruct_020120D4 *param0); +static void sub_02012138(UnkStruct_020120D4 *param0); +static void sub_02012174(const UnkStruct_0200F898 *param0, UnkStruct_02012174 *param1, int param2, int param3); +static void sub_020121C4(UnkStruct_0200F7A0 *param0, UnkStruct_0201006C *param1); +static BOOL sub_02012228(UnkStruct_0200F7A0 *param0); +static void sub_02012290(UnkStruct_02012290 *param0, UnkStruct_0201006C *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7); +static BOOL sub_02012310(UnkStruct_02012290 *param0, UnkStruct_0200F7A0 *param1); +static void sub_02012384(UnkStruct_02012290 *param0, UnkStruct_0201006C *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7); +static BOOL sub_020123F4(UnkStruct_02012290 *param0, UnkStruct_0200F7A0 *param1); + +BOOL sub_0200F85C(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { param0->unk_28 = 1; @@ -385,7 +383,7 @@ BOOL sub_0200F85C (UnkStruct_0200F7A0 * param0) return sub_020102D8(param0); } -BOOL sub_0200F878 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200F878(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { param0->unk_28 = 0; @@ -398,7 +396,7 @@ BOOL sub_0200F878 (UnkStruct_0200F7A0 * param0) return sub_020102D8(param0); } -BOOL sub_0200F898 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200F898(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0 = { @@ -422,7 +420,7 @@ BOOL sub_0200F898 (UnkStruct_0200F7A0 * param0) return sub_02011F88(param0); } -BOOL sub_0200F8D4 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200F8D4(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0 = { @@ -446,7 +444,7 @@ BOOL sub_0200F8D4 (UnkStruct_0200F7A0 * param0) return sub_02011F88(param0); } -BOOL sub_0200F90C (UnkStruct_0200F7A0 * param0) +BOOL sub_0200F90C(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0 = { @@ -474,7 +472,7 @@ BOOL sub_0200F90C (UnkStruct_0200F7A0 * param0) return sub_02011F88(param0); } -BOOL sub_0200F948 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200F948(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0 = { @@ -502,12 +500,12 @@ BOOL sub_0200F948 (UnkStruct_0200F7A0 * param0) return sub_02011F88(param0); } -BOOL sub_0200F980 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200F980(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {0, 0, 255, 192}, - {0, 0, 0, 192}, + { 0, 0, 255, 192 }, + { 0, 0, 0, 192 }, 0, GX_BLEND_ALL, GX_BLEND_PLANEMASK_BD, @@ -525,12 +523,12 @@ BOOL sub_0200F980 (UnkStruct_0200F7A0 * param0) return sub_02010D44(param0); } -BOOL sub_0200F9AC (UnkStruct_0200F7A0 * param0) +BOOL sub_0200F9AC(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {0, 0, 0, 192}, - {0, 0, 255, 192}, + { 0, 0, 0, 192 }, + { 0, 0, 255, 192 }, 0, GX_BLEND_ALL, GX_BLEND_PLANEMASK_BD, @@ -549,12 +547,12 @@ BOOL sub_0200F9AC (UnkStruct_0200F7A0 * param0) return sub_02010D44(param0); } -BOOL sub_0200F9D8 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200F9D8(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0[2] = { - {0, 96, 1}, - {192, 96, 1} + { 0, 96, 1 }, + { 192, 96, 1 } }; static UnkStruct_0200FE6C v1 = { NULL, @@ -575,12 +573,12 @@ BOOL sub_0200F9D8 (UnkStruct_0200F7A0 * param0) return sub_02011F88(param0); } -BOOL sub_0200FA14 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FA14(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0[2] = { - {96, 0, 0}, - {96, 192, 0} + { 96, 0, 0 }, + { 96, 192, 0 } }; static UnkStruct_0200FE6C v1 = { NULL, @@ -602,12 +600,12 @@ BOOL sub_0200FA14 (UnkStruct_0200F7A0 * param0) return sub_02011F88(param0); } -BOOL sub_0200FA4C (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FA4C(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0[2] = { - {96, 0, 1}, - {96, 192, 1} + { 96, 0, 1 }, + { 96, 192, 1 } }; static UnkStruct_0200FE6C v1 = { NULL, @@ -629,12 +627,12 @@ BOOL sub_0200FA4C (UnkStruct_0200F7A0 * param0) return sub_02011F88(param0); } -BOOL sub_0200FA88 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FA88(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0[2] = { - {0, 96, 0}, - {192, 96, 0} + { 0, 96, 0 }, + { 192, 96, 0 } }; static UnkStruct_0200FE6C v1 = { NULL, @@ -656,12 +654,12 @@ BOOL sub_0200FA88 (UnkStruct_0200F7A0 * param0) return sub_02011F88(param0); } -BOOL sub_0200FAC0 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FAC0(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {0, 0, 255, 192}, - {128, 0, 128, 192}, + { 0, 0, 255, 192 }, + { 128, 0, 128, 192 }, 0, GX_BLEND_ALL, GX_BLEND_PLANEMASK_BD, @@ -680,12 +678,12 @@ BOOL sub_0200FAC0 (UnkStruct_0200F7A0 * param0) return sub_02010D44(param0); } -BOOL sub_0200FAEC (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FAEC(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {128, 0, 128, 192}, - {0, 0, 255, 192}, + { 128, 0, 128, 192 }, + { 0, 0, 255, 192 }, 0, GX_BLEND_ALL, GX_BLEND_PLANEMASK_BD, @@ -703,20 +701,20 @@ BOOL sub_0200FAEC (UnkStruct_0200F7A0 * param0) return sub_02010D44(param0); } -BOOL sub_0200FB18 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FB18(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {128, 0, 128, 192}, - {0, 0, 128, 192}, + { 128, 0, 128, 192 }, + { 0, 0, 128, 192 }, 0, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, 1 }; static const UnkStruct_0200F980 v1 = { - {128, 0, 128, 192}, - {128, 0, 255, 192}, + { 128, 0, 128, 192 }, + { 128, 0, 255, 192 }, 1, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, @@ -735,20 +733,20 @@ BOOL sub_0200FB18 (UnkStruct_0200F7A0 * param0) return sub_02010DEC(param0); } -BOOL sub_0200FB4C (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FB4C(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {0, 0, 128, 192}, - {128, 0, 128, 192}, + { 0, 0, 128, 192 }, + { 128, 0, 128, 192 }, 0, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, 0 }; static const UnkStruct_0200F980 v1 = { - {128, 0, 255, 192}, - {128, 0, 128, 192}, + { 128, 0, 255, 192 }, + { 128, 0, 128, 192 }, 1, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, @@ -767,7 +765,7 @@ BOOL sub_0200FB4C (UnkStruct_0200F7A0 * param0) return sub_02010DEC(param0); } -BOOL sub_0200FB7C (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FB7C(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FB7C v0 = { @@ -793,7 +791,7 @@ BOOL sub_0200FB7C (UnkStruct_0200F7A0 * param0) return sub_02010F64(param0); } -BOOL sub_0200FBA8 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FBA8(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FB7C v0 = { @@ -819,7 +817,7 @@ BOOL sub_0200FBA8 (UnkStruct_0200F7A0 * param0) return sub_02010F64(param0); } -BOOL sub_0200FBD4 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FBD4(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FB7C v0 = { @@ -845,7 +843,7 @@ BOOL sub_0200FBD4 (UnkStruct_0200F7A0 * param0) return sub_02010F64(param0); } -BOOL sub_0200FC00 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FC00(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FB7C v0 = { @@ -871,7 +869,7 @@ BOOL sub_0200FC00 (UnkStruct_0200F7A0 * param0) return sub_02010F64(param0); } -BOOL sub_0200FC2C (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FC2C(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FC2C v0 = { @@ -895,7 +893,7 @@ BOOL sub_0200FC2C (UnkStruct_0200F7A0 * param0) return sub_0201123C(param0); } -BOOL sub_0200FC58 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FC58(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FC2C v0 = { @@ -919,11 +917,11 @@ BOOL sub_0200FC58 (UnkStruct_0200F7A0 * param0) return sub_0201123C(param0); } -BOOL sub_0200FC84 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FC84(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {0, 0, 255, 192}, {128, 96, 128, 96}, 0, GX_BLEND_ALL, GX_BLEND_PLANEMASK_BD, 1 + { 0, 0, 255, 192 }, { 128, 96, 128, 96 }, 0, GX_BLEND_ALL, GX_BLEND_PLANEMASK_BD, 1 }; sub_0200F42C(param0->unk_24); @@ -938,11 +936,11 @@ BOOL sub_0200FC84 (UnkStruct_0200F7A0 * param0) return sub_02010D44(param0); } -BOOL sub_0200FCB0 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FCB0(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {128, 96, 128, 96}, {0, 0, 255, 192}, 0, GX_BLEND_ALL, GX_BLEND_PLANEMASK_BD, 0 + { 128, 96, 128, 96 }, { 0, 0, 255, 192 }, 0, GX_BLEND_ALL, GX_BLEND_PLANEMASK_BD, 0 }; sub_0200F42C(param0->unk_24); @@ -957,11 +955,11 @@ BOOL sub_0200FCB0 (UnkStruct_0200F7A0 * param0) return sub_02010D44(param0); } -BOOL sub_0200FCDC (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FCDC(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {128, 96, 128, 96}, {0, 0, 255, 192}, 0, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, 1 + { 128, 96, 128, 96 }, { 0, 0, 255, 192 }, 0, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, 1 }; sub_0200F42C(param0->unk_24); @@ -976,11 +974,11 @@ BOOL sub_0200FCDC (UnkStruct_0200F7A0 * param0) return sub_02010D44(param0); } -BOOL sub_0200FD08 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FD08(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {0, 0, 255, 192}, {128, 96, 128, 96}, 0, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, 0 + { 0, 0, 255, 192 }, { 128, 96, 128, 96 }, 0, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, 0 }; sub_0200F42C(param0->unk_24); @@ -995,7 +993,7 @@ BOOL sub_0200FD08 (UnkStruct_0200F7A0 * param0) return sub_02010D44(param0); } -BOOL sub_0200FD34 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FD34(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FD34 v0 = { @@ -1018,7 +1016,7 @@ BOOL sub_0200FD34 (UnkStruct_0200F7A0 * param0) return sub_02011440(param0); } -BOOL sub_0200FD60 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FD60(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FD34 v0 = { @@ -1042,20 +1040,20 @@ BOOL sub_0200FD60 (UnkStruct_0200F7A0 * param0) return sub_02011440(param0); } -BOOL sub_0200FD8C (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FD8C(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FD8C v0[] = { - {0, 0, 255, 48}, - {0, 47, 255, 96}, - {0, 96, 255, 144}, - {0, 144, 255, 192} + { 0, 0, 255, 48 }, + { 0, 47, 255, 96 }, + { 0, 96, 255, 144 }, + { 0, 144, 255, 192 } }; static const UnkStruct_0200FD8C v1[] = { - {0, 0, 0, 48}, - {255, 47, 255, 96}, - {0, 96, 0, 144}, - {255, 144, 255, 192} + { 0, 0, 0, 48 }, + { 255, 47, 255, 96 }, + { 0, 96, 0, 144 }, + { 255, 144, 255, 192 } }; UnkStruct_02011738 v2; @@ -1078,14 +1076,14 @@ BOOL sub_0200FD8C (UnkStruct_0200F7A0 * param0) return sub_020116D8(param0); } -BOOL sub_0200FDE0 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FDE0(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FD8C v0[] = { - {255, 0, 255, 48}, {0, 47, 0, 96}, {255, 96, 255, 144}, {0, 144, 0, 192} + { 255, 0, 255, 48 }, { 0, 47, 0, 96 }, { 255, 96, 255, 144 }, { 0, 144, 0, 192 } }; static const UnkStruct_0200FD8C v1[] = { - {0, 0, 255, 48}, {0, 47, 255, 96}, {0, 96, 255, 144}, {0, 144, 255, 192} + { 0, 0, 255, 48 }, { 0, 47, 255, 96 }, { 0, 96, 255, 144 }, { 0, 144, 255, 192 } }; UnkStruct_02011738 v2; @@ -1108,11 +1106,13 @@ BOOL sub_0200FDE0 (UnkStruct_0200F7A0 * param0) return sub_020116D8(param0); } -BOOL sub_0200FE30 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FE30(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0[3] = { - {0, 64, 1}, {64, 128, 1}, {128, 192, 1}, + { 0, 64, 1 }, + { 64, 128, 1 }, + { 128, 192, 1 }, }; static UnkStruct_0200FE6C v1 = { NULL, 3, 1 @@ -1131,11 +1131,13 @@ BOOL sub_0200FE30 (UnkStruct_0200F7A0 * param0) return sub_02011F88(param0); } -BOOL sub_0200FE6C (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FE6C(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0[3] = { - {64, 0, 0}, {128, 64, 0}, {192, 128, 0}, + { 64, 0, 0 }, + { 128, 64, 0 }, + { 192, 128, 0 }, }; static UnkStruct_0200FE6C v1 = { NULL, 3, 0 @@ -1154,7 +1156,7 @@ BOOL sub_0200FE6C (UnkStruct_0200F7A0 * param0) return sub_02011F88(param0); } -BOOL sub_0200FEA4 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FEA4(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { UnkStruct_0200FEA4 v0 = { @@ -1172,7 +1174,7 @@ BOOL sub_0200FEA4 (UnkStruct_0200F7A0 * param0) return sub_020119A0(param0); } -BOOL sub_0200FEEC (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FEEC(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { UnkStruct_0200FEA4 v0 = { @@ -1190,7 +1192,7 @@ BOOL sub_0200FEEC (UnkStruct_0200F7A0 * param0) return sub_020119A0(param0); } -BOOL sub_0200FF30 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FF30(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { UnkStruct_0200FF30 v0 = { @@ -1208,7 +1210,7 @@ BOOL sub_0200FF30 (UnkStruct_0200F7A0 * param0) return sub_02011CD4(param0); } -BOOL sub_0200FF78 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FF78(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { UnkStruct_0200FF30 v0 = { @@ -1226,7 +1228,7 @@ BOOL sub_0200FF78 (UnkStruct_0200F7A0 * param0) return sub_02011CD4(param0); } -BOOL sub_0200FFBC (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FFBC(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FB7C v0 = { @@ -1244,7 +1246,7 @@ BOOL sub_0200FFBC (UnkStruct_0200F7A0 * param0) return sub_02010F64(param0); } -BOOL sub_0200FFE8 (UnkStruct_0200F7A0 * param0) +BOOL sub_0200FFE8(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200FB7C v0 = { @@ -1262,11 +1264,11 @@ BOOL sub_0200FFE8 (UnkStruct_0200F7A0 * param0) return sub_02010F64(param0); } -BOOL sub_02010014 (UnkStruct_0200F7A0 * param0) +BOOL sub_02010014(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {0, 0, 0, 192}, {0, 0, 255, 192}, 0, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, 1 + { 0, 0, 0, 192 }, { 0, 0, 255, 192 }, 0, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, 1 }; sub_0200F42C(param0->unk_24); @@ -1280,11 +1282,16 @@ BOOL sub_02010014 (UnkStruct_0200F7A0 * param0) return sub_02010D44(param0); } -BOOL sub_02010040 (UnkStruct_0200F7A0 * param0) +BOOL sub_02010040(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F980 v0 = { - {0, 0, 255, 192}, {0, 0, 0, 192}, 0, GX_BLEND_PLANEMASK_BD, GX_BLEND_ALL, 0 + { 0, 0, 255, 192 }, + { 0, 0, 0, 192 }, + 0, + GX_BLEND_PLANEMASK_BD, + GX_BLEND_ALL, + 0, }; sub_0200F42C(param0->unk_24); @@ -1298,22 +1305,26 @@ BOOL sub_02010040 (UnkStruct_0200F7A0 * param0) return sub_02010D44(param0); } -BOOL sub_0201006C (UnkStruct_0200F7A0 * param0) +BOOL sub_0201006C(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0[2] = { - {0, 94, 1}, {192, 98, 1}, + { 0, 94, 1 }, + { 192, 98, 1 }, }; static UnkStruct_0201006C v1 = { { - {0, 94, 255, 98}, {128, 96, 128, 96}, 0, GX_BLEND_ALL, GX_BLEND_PLANEMASK_BD, 1 + { 0, 94, 255, 98 }, + { 128, 96, 128, 96 }, + 0, + GX_BLEND_ALL, + GX_BLEND_PLANEMASK_BD, + 1, }, - { - NULL, + { NULL, 2, - 1 - }, - FX32_CONST(0.70f) + 1 }, + FX32_CONST(0.70f), }; v1.unk_0C.unk_00 = v0; @@ -1329,28 +1340,28 @@ BOOL sub_0201006C (UnkStruct_0200F7A0 * param0) return sub_02012228(param0); } -BOOL sub_020100A8 (UnkStruct_0200F7A0 * param0) +BOOL sub_020100A8(UnkStruct_0200F7A0 *param0) { if (param0->unk_0C == 0) { static const UnkStruct_0200F898 v0[2] = { - {94, 0, 0}, - {98, 192, 0}, + { 94, 0, 0 }, + { 98, 192, 0 }, }; static UnkStruct_0201006C v1 = { { - {128, 96, 128, 96}, - {0, 94, 255, 98}, + { 128, 96, 128, 96 }, + { 0, 94, 255, 98 }, 0, GX_BLEND_ALL, GX_BLEND_PLANEMASK_BD, - 0 + 0, }, { NULL, 2, - 0 + 0, }, - FX32_CONST(0.70f) + FX32_CONST(0.70f), }; v1.unk_0C.unk_00 = v0; @@ -1367,12 +1378,12 @@ BOOL sub_020100A8 (UnkStruct_0200F7A0 * param0) return sub_02012228(param0); } -static fx32 sub_020100E0 (int param0) +static fx32 sub_020100E0(int param0) { return FX_Div(FX_SinIdx(param0), FX_CosIdx(param0)); } -static int sub_020100FC (int param0, int param1) +static int sub_020100FC(int param0, int param1) { fx32 v0; fx32 v1; @@ -1385,7 +1396,7 @@ static int sub_020100FC (int param0, int param1) return v1; } -static void sub_02010124 (int param0, int * param1, int param2, int param3) +static void sub_02010124(int param0, int *param1, int param2, int param3) { int v0; fx32 v1; @@ -1402,7 +1413,7 @@ static void sub_02010124 (int param0, int * param1, int param2, int param3) } } -static int sub_02010178 (int param0, int param1) +static int sub_02010178(int param0, int param1) { fx32 v0; fx32 v1; @@ -1415,7 +1426,7 @@ static int sub_02010178 (int param0, int param1) return v2; } -static int sub_02010190 (int param0, int param1, int param2) +static int sub_02010190(int param0, int param1, int param2) { int v0; @@ -1426,7 +1437,7 @@ static int sub_02010190 (int param0, int param1, int param2) return v0; } -static int sub_020101A0 (int param0, int param1) +static int sub_020101A0(int param0, int param1) { int v0; @@ -1443,7 +1454,7 @@ static int sub_020101A0 (int param0, int param1) return v0; } -static void sub_020101B0 (UnkStruct_020101B0 * param0, UnkStruct_020101B0 * param1) +static void sub_020101B0(UnkStruct_020101B0 *param0, UnkStruct_020101B0 *param1) { param0->unk_00 += param1->unk_00; param0->unk_04 += param1->unk_04; @@ -1451,7 +1462,7 @@ static void sub_020101B0 (UnkStruct_020101B0 * param0, UnkStruct_020101B0 * para param0->unk_0C += param1->unk_0C; } -static void sub_020101D4 (UnkStruct_020101B0 * param0, UnkStruct_020101B0 * param1, UnkStruct_020101B0 * param2, const UnkStruct_0200FD8C * param3, const UnkStruct_0200FD8C * param4, int param5) +static void sub_020101D4(UnkStruct_020101B0 *param0, UnkStruct_020101B0 *param1, UnkStruct_020101B0 *param2, const UnkStruct_0200FD8C *param3, const UnkStruct_0200FD8C *param4, int param5) { param0->unk_00 = param3->unk_00 * 128; param0->unk_04 = param3->unk_01 * 128; @@ -1469,10 +1480,10 @@ static void sub_020101D4 (UnkStruct_020101B0 * param0, UnkStruct_020101B0 * para param2->unk_0C = sub_02010190(param3->unk_03, param4->unk_03, param5); } -static void sub_02010238 (UnkStruct_0200F7A0 * param0, int param1) +static void sub_02010238(UnkStruct_0200F7A0 *param0, int param1) { int v0, v1; - UnkStruct_02010318 * v2; + UnkStruct_02010318 *v2; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_02010318)); memset(param0->unk_14, 0, sizeof(UnkStruct_02010318)); @@ -1519,9 +1530,9 @@ static void sub_02010238 (UnkStruct_0200F7A0 * param0, int param1) param0->unk_0C++; } -static BOOL sub_020102D8 (UnkStruct_0200F7A0 * param0) +static BOOL sub_020102D8(UnkStruct_0200F7A0 *param0) { - UnkStruct_02010318 * v0 = param0->unk_14; + UnkStruct_02010318 *v0 = param0->unk_14; BOOL v1; BOOL v2 = 0; @@ -1549,7 +1560,7 @@ static BOOL sub_020102D8 (UnkStruct_0200F7A0 * param0) return v2; } -static BOOL sub_02010318 (UnkStruct_02010318 * param0) +static BOOL sub_02010318(UnkStruct_02010318 *param0) { BOOL v0 = 0; @@ -1573,7 +1584,7 @@ static BOOL sub_02010318 (UnkStruct_02010318 * param0) return v0; } -static inline void inline_0201035C_sub (int param0, int param1, int param2, int param3, int param4, int param5) +static inline void inline_0201035C_sub(int param0, int param1, int param2, int param3, int param4, int param5) { if (param4 == 0) { if (param5 == 0) { @@ -1598,17 +1609,17 @@ static inline void inline_0201035C_sub (int param0, int param1, int param2, int } } -static inline void inline_0201035C (UnkStruct_02010588 * param0, int param1, int param2) +static inline void inline_0201035C(UnkStruct_02010588 *param0, int param1, int param2) { - UnkStruct_02010FC0 * v0; + UnkStruct_02010FC0 *v0; v0 = sub_02010604(param0, param2); inline_0201035C_sub(v0->unk_00[0][param1], 0, v0->unk_00[1][param1], 192, v0->unk_600, param0->unk_08); } -static void sub_0201035C (void * param0) +static void sub_0201035C(void *param0) { - UnkStruct_02010588 * v0 = (UnkStruct_02010588 *)param0; + UnkStruct_02010588 *v0 = (UnkStruct_02010588 *)param0; int v1; int v2; @@ -1632,7 +1643,7 @@ static void sub_0201035C (void * param0) } } -static void sub_02010588 (UnkStruct_02010588 * param0, int param1, int param2, int param3) +static void sub_02010588(UnkStruct_02010588 *param0, int param1, int param2, int param3) { switch (param1) { case 0: @@ -1642,8 +1653,7 @@ static void sub_02010588 (UnkStruct_02010588 * param0, int param1, int param2, i param0->unk_08 = param2; param0->unk_00->unk_600 = param1; break; - case 2: - { + case 2: { int v0; param0->unk_00 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_02010FC0) * 2); @@ -1653,34 +1663,33 @@ static void sub_02010588 (UnkStruct_02010588 * param0, int param1, int param2, i for (v0 = 0; v0 < 2; v0++) { param0->unk_00[v0].unk_600 = v0; } - } - break; + } break; default: break; } } -static void sub_020105EC (UnkStruct_02010588 * param0) +static void sub_020105EC(UnkStruct_02010588 *param0) { sub_020105F4(param0); } -static void sub_020105F4 (UnkStruct_02010588 * param0) +static void sub_020105F4(UnkStruct_02010588 *param0) { Heap_FreeToHeap(param0->unk_00); param0->unk_00 = NULL; } -static UnkStruct_02010FC0 * sub_02010604 (UnkStruct_02010588 * param0, int param1) +static UnkStruct_02010FC0 *sub_02010604(UnkStruct_02010588 *param0, int param1) { GF_ASSERT(param0->unk_04 > param1); return param0->unk_00 + param1; } -static void sub_02010624 (SysTask * param0, void * param1) +static void sub_02010624(SysTask *param0, void *param1) { - UnkStruct_02010588 * v0 = (UnkStruct_02010588 *)param1; - UnkStruct_02010FC0 * v1; + UnkStruct_02010588 *v0 = (UnkStruct_02010588 *)param1; + UnkStruct_02010FC0 *v1; int v2; for (v2 = 0; v2 < v0->unk_04; v2++) { @@ -1691,7 +1700,7 @@ static void sub_02010624 (SysTask * param0, void * param1) SysTask_Done(param0); } -static void sub_02010658 (int param0, UnkStruct_02010658 * param1, int param2) +static void sub_02010658(int param0, UnkStruct_02010658 *param1, int param2) { if (param0 == 0) { sub_02012634(param1, GX_WNDMASK_NONE, param2); @@ -1703,7 +1712,7 @@ static void sub_02010658 (int param0, UnkStruct_02010658 * param1, int param2) } } -static void sub_020106A8 (UnkStruct_02010658 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) +static void sub_020106A8(UnkStruct_02010658 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9) { if (param9 == 0) { sub_020124AC(param1, 0, param3, param4); @@ -1716,7 +1725,7 @@ static void sub_020106A8 (UnkStruct_02010658 * param0, int param1, int param2, i } } -static void sub_02010710 (UnkStruct_02010658 * param0, int param1, int param2, int param3) +static void sub_02010710(UnkStruct_02010658 *param0, int param1, int param2, int param3) { if (param3 == 0) { sub_02012480(param1, param2); @@ -1725,7 +1734,7 @@ static void sub_02010710 (UnkStruct_02010658 * param0, int param1, int param2, i } } -static void sub_02010728 (UnkStruct_0201076C * param0, int param1, int param2, int param3, int param4) +static void sub_02010728(UnkStruct_0201076C *param0, int param1, int param2, int param3, int param4) { memset(param0, 0, sizeof(UnkStruct_0201076C)); @@ -1741,24 +1750,24 @@ static void sub_02010728 (UnkStruct_0201076C * param0, int param1, int param2, i } } -static void sub_0201076C (UnkStruct_0201076C * param0) +static void sub_0201076C(UnkStruct_0201076C *param0) { SysTask_ExecuteAfterVBlank(sub_020107AC, param0, 1023); } -static void sub_02010784 (UnkStruct_0200F600 * param0, UnkStruct_0201076C * param1, u32 param2) +static void sub_02010784(UnkStruct_0200F600 *param0, UnkStruct_0201076C *param1, u32 param2) { sub_0200F6D8(param0, param1, sub_020107D8, param1->unk_309, param2); } -static void sub_0201079C (UnkStruct_0200F600 * param0, UnkStruct_0201076C * param1, u32 param2) +static void sub_0201079C(UnkStruct_0200F600 *param0, UnkStruct_0201076C *param1, u32 param2) { sub_0200F704(param0, param1->unk_309, param2); } -static void sub_020107AC (SysTask * param0, void * param1) +static void sub_020107AC(SysTask *param0, void *param1) { - UnkStruct_0201076C * v0 = param1; + UnkStruct_0201076C *v0 = param1; int v1; for (v1 = 0; v1 < 2; v1++) { @@ -1768,7 +1777,7 @@ static void sub_020107AC (SysTask * param0, void * param1) SysTask_Done(param0); } -static inline void inline_020107D8_sub (int param0, BOOL param1, int param2) +static inline void inline_020107D8_sub(int param0, BOOL param1, int param2) { if (param2 == 0) { if (GX_IsHBlank()) { @@ -1781,7 +1790,7 @@ static inline void inline_020107D8_sub (int param0, BOOL param1, int param2) } } -static inline void inline_020107D8_sub_1 (int param0, BOOL param1, int param4, int param3) +static inline void inline_020107D8_sub_1(int param0, BOOL param1, int param4, int param3) { if (param4 == 0) { if (param3 == 0) { @@ -1806,9 +1815,9 @@ static inline void inline_020107D8_sub_1 (int param0, BOOL param1, int param4, i } } -static inline void inline_020107D8 (UnkStruct_0201076C * param0, int param1, int param2) +static inline void inline_020107D8(UnkStruct_0201076C *param0, int param1, int param2) { - UnkStruct_02012174 * v0; + UnkStruct_02012174 *v0; v0 = ¶m0->unk_00[param2]; @@ -1821,9 +1830,9 @@ static inline void inline_020107D8 (UnkStruct_0201076C * param0, int param1, int } } -static void sub_020107D8 (void * param0) +static void sub_020107D8(void *param0) { - UnkStruct_0201076C * v0 = (UnkStruct_0201076C *)param0; + UnkStruct_0201076C *v0 = (UnkStruct_0201076C *)param0; int v1; int v2; @@ -1847,9 +1856,9 @@ static void sub_020107D8 (void * param0) } } -static void sub_02010CF4 (UnkStruct_0200F7A0 * param0, const UnkStruct_0200F980 * param1) +static void sub_02010CF4(UnkStruct_0200F7A0 *param0, const UnkStruct_0200F980 *param1) { - UnkStruct_02010EA4 * v0; + UnkStruct_02010EA4 *v0; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_02010EA4)); @@ -1866,9 +1875,9 @@ static void sub_02010CF4 (UnkStruct_0200F7A0 * param0, const UnkStruct_0200F980 param0->unk_0C++; } -static BOOL sub_02010D44 (UnkStruct_0200F7A0 * param0) +static BOOL sub_02010D44(UnkStruct_0200F7A0 *param0) { - UnkStruct_02010EA4 * v0; + UnkStruct_02010EA4 *v0; BOOL v1; BOOL v2 = 0; @@ -1901,9 +1910,9 @@ static BOOL sub_02010D44 (UnkStruct_0200F7A0 * param0) return v2; } -static void sub_02010D94 (UnkStruct_0200F7A0 * param0, const UnkStruct_0200F980 * param1, const UnkStruct_0200F980 * param2) +static void sub_02010D94(UnkStruct_0200F7A0 *param0, const UnkStruct_0200F980 *param1, const UnkStruct_0200F980 *param2) { - UnkStruct_02010D94 * v0; + UnkStruct_02010D94 *v0; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_02010D94)); v0 = (UnkStruct_02010D94 *)param0->unk_14; @@ -1915,9 +1924,9 @@ static void sub_02010D94 (UnkStruct_0200F7A0 * param0, const UnkStruct_0200F980 param0->unk_0C++; } -static BOOL sub_02010DEC (UnkStruct_0200F7A0 * param0) +static BOOL sub_02010DEC(UnkStruct_0200F7A0 *param0) { - UnkStruct_02010D94 * v0; + UnkStruct_02010D94 *v0; BOOL v1; BOOL v2 = 0; @@ -1948,7 +1957,7 @@ static BOOL sub_02010DEC (UnkStruct_0200F7A0 * param0) return v2; } -static void sub_02010E48 (UnkStruct_02010EA4 * param0, const UnkStruct_0200F980 * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5) +static void sub_02010E48(UnkStruct_02010EA4 *param0, const UnkStruct_0200F980 *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5) { sub_020101D4(¶m0->unk_00, ¶m0->unk_20, ¶m0->unk_10, ¶m1->unk_00, ¶m1->unk_04, param2); @@ -1963,7 +1972,7 @@ static void sub_02010E48 (UnkStruct_02010EA4 * param0, const UnkStruct_0200F980 sub_020106A8(param5, param1->unk_09, param1->unk_0A, param1->unk_08, param4, param1->unk_00.unk_00, param1->unk_00.unk_01, param1->unk_00.unk_02, param1->unk_00.unk_03, param0->unk_44); } -static BOOL sub_02010EA4 (UnkStruct_02010EA4 * param0) +static BOOL sub_02010EA4(UnkStruct_02010EA4 *param0) { param0->unk_40++; @@ -1984,9 +1993,9 @@ static BOOL sub_02010EA4 (UnkStruct_02010EA4 * param0) return 0; } -static void sub_02010F2C (UnkStruct_0200F7A0 * param0, const UnkStruct_0200FB7C * param1) +static void sub_02010F2C(UnkStruct_0200F7A0 *param0, const UnkStruct_0200FB7C *param1) { - UnkStruct_0201109C * v0; + UnkStruct_0201109C *v0; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_0201109C)); v0 = (UnkStruct_0201109C *)param0->unk_14; @@ -1996,9 +2005,9 @@ static void sub_02010F2C (UnkStruct_0200F7A0 * param0, const UnkStruct_0200FB7C param0->unk_0C++; } -static BOOL sub_02010F64 (UnkStruct_0200F7A0 * param0) +static BOOL sub_02010F64(UnkStruct_0200F7A0 *param0) { - UnkStruct_0201109C * v0; + UnkStruct_0201109C *v0; BOOL v1; BOOL v2 = 0; @@ -2031,10 +2040,10 @@ static BOOL sub_02010F64 (UnkStruct_0200F7A0 * param0) return v2; } -static void sub_02010FC0 (UnkStruct_0201109C * param0, const UnkStruct_0200FB7C * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7) +static void sub_02010FC0(UnkStruct_0201109C *param0, const UnkStruct_0200FB7C *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7) { int v0; - UnkStruct_02010FC0 * v1; + UnkStruct_02010FC0 *v1; v0 = sub_02010190(param1->unk_00, param1->unk_02, param2); sub_02010588(¶m0->unk_00, param1->unk_08, param4, param7); @@ -2066,7 +2075,7 @@ static void sub_02010FC0 (UnkStruct_0201109C * param0, const UnkStruct_0200FB7C sub_0200F6D8(param0->unk_34, ¶m0->unk_00, sub_0201035C, param4, param7); } -static BOOL sub_0201109C (UnkStruct_0201109C * param0) +static BOOL sub_0201109C(UnkStruct_0201109C *param0) { param0->unk_24++; @@ -2087,7 +2096,7 @@ static BOOL sub_0201109C (UnkStruct_0201109C * param0) return 0; } -static void sub_020110EC (int param0, int param1, int param2, int param3, int * param4, int * param5) +static void sub_020110EC(int param0, int param1, int param2, int param3, int *param4, int *param5) { fx32 v0; fx32 v1; @@ -2123,14 +2132,14 @@ static void sub_020110EC (int param0, int param1, int param2, int param3, int * } } -static void sub_02011180 (UnkStruct_0201109C * param0) +static void sub_02011180(UnkStruct_0201109C *param0) { - UnkStruct_02010588 * v0 = ¶m0->unk_00; + UnkStruct_02010588 *v0 = ¶m0->unk_00; int v1; int v2; int v3; int v4; - UnkStruct_02010FC0 * v5; + UnkStruct_02010FC0 *v5; v5 = sub_02010604(v0, 0); @@ -2151,9 +2160,9 @@ static void sub_02011180 (UnkStruct_0201109C * param0) } } -static void sub_02011204 (UnkStruct_0200F7A0 * param0, const UnkStruct_0200FC2C * param1) +static void sub_02011204(UnkStruct_0200F7A0 *param0, const UnkStruct_0200FC2C *param1) { - UnkStruct_02011360 * v0; + UnkStruct_02011360 *v0; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_02011360)); v0 = (UnkStruct_02011360 *)param0->unk_14; @@ -2162,9 +2171,9 @@ static void sub_02011204 (UnkStruct_0200F7A0 * param0, const UnkStruct_0200FC2C param0->unk_0C++; } -static BOOL sub_0201123C (UnkStruct_0200F7A0 * param0) +static BOOL sub_0201123C(UnkStruct_0200F7A0 *param0) { - UnkStruct_02011360 * v0; + UnkStruct_02011360 *v0; BOOL v1; BOOL v2 = 0; @@ -2197,9 +2206,9 @@ static BOOL sub_0201123C (UnkStruct_0200F7A0 * param0) return v2; } -static void sub_02011298 (UnkStruct_02011360 * param0, const UnkStruct_0200FC2C * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7) +static void sub_02011298(UnkStruct_02011360 *param0, const UnkStruct_0200FC2C *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7) { - UnkStruct_02010FC0 * v0; + UnkStruct_02010FC0 *v0; param0->unk_10 = sub_02010190(param1->unk_00, param1->unk_02, param2); sub_02010588(¶m0->unk_00, param1->unk_04, param4, param7); @@ -2228,7 +2237,7 @@ static void sub_02011298 (UnkStruct_02011360 * param0, const UnkStruct_0200FC2C sub_0200F6D8(param0->unk_28, ¶m0->unk_00, sub_0201035C, param4, param7); } -static BOOL sub_02011360 (UnkStruct_02011360 * param0) +static BOOL sub_02011360(UnkStruct_02011360 *param0) { param0->unk_1C++; @@ -2249,12 +2258,12 @@ static BOOL sub_02011360 (UnkStruct_02011360 * param0) return 0; } -static void sub_020113B0 (UnkStruct_02011360 * param0) +static void sub_020113B0(UnkStruct_02011360 *param0) { int v0; int v1, v2; int v3[192]; - UnkStruct_02010FC0 * v4; + UnkStruct_02010FC0 *v4; v4 = sub_02010604(¶m0->unk_00, 0); sub_02010124(param0->unk_0C / 128, v3, 192, 0); @@ -2265,9 +2274,9 @@ static void sub_020113B0 (UnkStruct_02011360 * param0) } } -static void sub_02011408 (UnkStruct_0200F7A0 * param0, const UnkStruct_0200FD34 * param1) +static void sub_02011408(UnkStruct_0200F7A0 *param0, const UnkStruct_0200FD34 *param1) { - UnkStruct_02011568 * v0; + UnkStruct_02011568 *v0; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_02011568)); v0 = (UnkStruct_02011568 *)param0->unk_14; @@ -2276,9 +2285,9 @@ static void sub_02011408 (UnkStruct_0200F7A0 * param0, const UnkStruct_0200FD34 param0->unk_0C++; } -static BOOL sub_02011440 (UnkStruct_0200F7A0 * param0) +static BOOL sub_02011440(UnkStruct_0200F7A0 *param0) { - UnkStruct_02011568 * v0; + UnkStruct_02011568 *v0; BOOL v1; BOOL v2 = 0; @@ -2308,10 +2317,10 @@ static BOOL sub_02011440 (UnkStruct_0200F7A0 * param0) return v2; } -static void sub_02011494 (UnkStruct_02011568 * param0, const UnkStruct_0200FD34 * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7) +static void sub_02011494(UnkStruct_02011568 *param0, const UnkStruct_0200FD34 *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7) { int v0; - UnkStruct_02010FC0 * v1; + UnkStruct_02010FC0 *v1; v0 = (param1->unk_02 - param1->unk_00); v0 /= param2; @@ -2344,7 +2353,7 @@ static void sub_02011494 (UnkStruct_02011568 * param0, const UnkStruct_0200FD34 sub_0200F6D8(param0->unk_2C, ¶m0->unk_00, sub_0201035C, param4, param7); } -static BOOL sub_02011568 (UnkStruct_02011568 * param0) +static BOOL sub_02011568(UnkStruct_02011568 *param0) { param0->unk_20++; @@ -2365,7 +2374,7 @@ static BOOL sub_02011568 (UnkStruct_02011568 * param0) return 0; } -static void sub_020115B8 (UnkStruct_02011568 * param0) +static void sub_020115B8(UnkStruct_02011568 *param0) { int v0; int v1; @@ -2375,7 +2384,7 @@ static void sub_020115B8 (UnkStruct_02011568 * param0) int v5; int v6; int v7, v8; - UnkStruct_02010FC0 * v9; + UnkStruct_02010FC0 *v9; v9 = sub_02010604(¶m0->unk_00, 0); v5 = FX_Mul(FX_SinIdx(param0->unk_10), param0->unk_0C); @@ -2415,9 +2424,9 @@ static void sub_020115B8 (UnkStruct_02011568 * param0) } } -static void sub_020116A0 (UnkStruct_0200F7A0 * param0, const UnkStruct_02011738 * param1) +static void sub_020116A0(UnkStruct_0200F7A0 *param0, const UnkStruct_02011738 *param1) { - UnkStruct_0201184C * v0; + UnkStruct_0201184C *v0; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_0201184C)); v0 = (UnkStruct_0201184C *)param0->unk_14; @@ -2426,9 +2435,9 @@ static void sub_020116A0 (UnkStruct_0200F7A0 * param0, const UnkStruct_02011738 param0->unk_0C++; } -static BOOL sub_020116D8 (UnkStruct_0200F7A0 * param0) +static BOOL sub_020116D8(UnkStruct_0200F7A0 *param0) { - UnkStruct_0201184C * v0; + UnkStruct_0201184C *v0; BOOL v1; BOOL v2 = 0; @@ -2462,10 +2471,10 @@ static BOOL sub_020116D8 (UnkStruct_0200F7A0 * param0) return v2; } -static void sub_02011738 (UnkStruct_0201184C * param0, const UnkStruct_02011738 * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7) +static void sub_02011738(UnkStruct_0201184C *param0, const UnkStruct_02011738 *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7) { int v0; - UnkStruct_02010FC0 * v1; + UnkStruct_02010FC0 *v1; param0->unk_0C = Heap_AllocFromHeap(param7, sizeof(UnkStruct_0201184C_sub1) * param1->unk_08); GF_ASSERT(param0->unk_0C != NULL); @@ -2500,7 +2509,7 @@ static void sub_02011738 (UnkStruct_0201184C * param0, const UnkStruct_02011738 sub_0200F6D8(param0->unk_28, ¶m0->unk_00, sub_0201035C, param4, param7); } -static BOOL sub_0201184C (UnkStruct_0201184C * param0) +static BOOL sub_0201184C(UnkStruct_0201184C *param0) { param0->unk_1C++; @@ -2521,16 +2530,16 @@ static BOOL sub_0201184C (UnkStruct_0201184C * param0) return 0; } -static void sub_0201189C (UnkStruct_0201184C * param0) +static void sub_0201189C(UnkStruct_0201184C *param0) { Heap_FreeToHeap(param0->unk_0C); param0->unk_0C = NULL; } -static void sub_020118AC (UnkStruct_0201184C * param0) +static void sub_020118AC(UnkStruct_0201184C *param0) { int v0; - UnkStruct_02010FC0 * v1; + UnkStruct_02010FC0 *v1; v1 = sub_02010604(¶m0->unk_00, 0); memset(v1->unk_300, 0, 768); @@ -2540,10 +2549,10 @@ static void sub_020118AC (UnkStruct_0201184C * param0) } } -static void sub_020118E0 (UnkStruct_02010588 * param0, UnkStruct_020101B0 * param1) +static void sub_020118E0(UnkStruct_02010588 *param0, UnkStruct_020101B0 *param1) { int v0; - UnkStruct_02010FC0 * v1; + UnkStruct_02010FC0 *v1; UnkStruct_020101B0 v2; v1 = sub_02010604(param0, 0); @@ -2559,7 +2568,7 @@ static void sub_020118E0 (UnkStruct_02010588 * param0, UnkStruct_020101B0 * para } } -static void sub_02011938 (UnkStruct_0201184C * param0) +static void sub_02011938(UnkStruct_0201184C *param0) { int v0; @@ -2568,9 +2577,9 @@ static void sub_02011938 (UnkStruct_0201184C * param0) } } -static void sub_02011960 (UnkStruct_0200F7A0 * param0, UnkStruct_0200FEA4 * param1) +static void sub_02011960(UnkStruct_0200F7A0 *param0, UnkStruct_0200FEA4 *param1) { - UnkStruct_02011AFC * v0; + UnkStruct_02011AFC *v0; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_02011AFC)); memset(param0->unk_14, 0, sizeof(UnkStruct_02011AFC)); @@ -2581,9 +2590,9 @@ static void sub_02011960 (UnkStruct_0200F7A0 * param0, UnkStruct_0200FEA4 * para param0->unk_0C++; } -static BOOL sub_020119A0 (UnkStruct_0200F7A0 * param0) +static BOOL sub_020119A0(UnkStruct_0200F7A0 *param0) { - UnkStruct_02011AFC * v0; + UnkStruct_02011AFC *v0; BOOL v1; BOOL v2 = 0; @@ -2617,10 +2626,10 @@ static BOOL sub_020119A0 (UnkStruct_0200F7A0 * param0) return v2; } -static void sub_02011A00 (UnkStruct_02011AFC * param0, UnkStruct_0200FEA4 * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7) +static void sub_02011A00(UnkStruct_02011AFC *param0, UnkStruct_0200FEA4 *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7) { - UnkStruct_02010FC0 * v0; - UnkStruct_02010FC0 * v1; + UnkStruct_02010FC0 *v0; + UnkStruct_02010FC0 *v1; param0->unk_0C.unk_00 = 0; param0->unk_0C.unk_04 = param1->unk_00; @@ -2650,7 +2659,7 @@ static void sub_02011A00 (UnkStruct_02011AFC * param0, UnkStruct_0200FEA4 * para sub_0200F6D8(param0->unk_34, ¶m0->unk_00, sub_0201035C, param4, param7); } -static BOOL sub_02011AFC (UnkStruct_02011AFC * param0) +static BOOL sub_02011AFC(UnkStruct_02011AFC *param0) { param0->unk_24++; @@ -2672,15 +2681,15 @@ static BOOL sub_02011AFC (UnkStruct_02011AFC * param0) return 0; } -static void sub_02011B54 (UnkStruct_02011AFC * param0) +static void sub_02011B54(UnkStruct_02011AFC *param0) { return; } -static void sub_02011B58 (UnkStruct_02011AFC * param0) +static void sub_02011B58(UnkStruct_02011AFC *param0) { - UnkStruct_02010FC0 * v0; - UnkStruct_02010FC0 * v1; + UnkStruct_02010FC0 *v0; + UnkStruct_02010FC0 *v1; u16 v2; int v3, v4; int v5; @@ -2735,7 +2744,7 @@ static void sub_02011B58 (UnkStruct_02011AFC * param0) } } -static void sub_02011C7C (UnkStruct_02011C7C * param0, int param1, int param2) +static void sub_02011C7C(UnkStruct_02011C7C *param0, int param1, int param2) { int v0; @@ -2745,9 +2754,9 @@ static void sub_02011C7C (UnkStruct_02011C7C * param0, int param1, int param2) param0->unk_00 = v0 + param0->unk_04; } -static void sub_02011C94 (UnkStruct_0200F7A0 * param0, UnkStruct_0200FF30 * param1) +static void sub_02011C94(UnkStruct_0200F7A0 *param0, UnkStruct_0200FF30 *param1) { - UnkStruct_02011E04 * v0; + UnkStruct_02011E04 *v0; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_02011E04)); memset(param0->unk_14, 0, sizeof(UnkStruct_02011E04)); @@ -2758,9 +2767,9 @@ static void sub_02011C94 (UnkStruct_0200F7A0 * param0, UnkStruct_0200FF30 * para param0->unk_0C++; } -static BOOL sub_02011CD4 (UnkStruct_0200F7A0 * param0) +static BOOL sub_02011CD4(UnkStruct_0200F7A0 *param0) { - UnkStruct_02011E04 * v0; + UnkStruct_02011E04 *v0; BOOL v1; BOOL v2 = 0; @@ -2794,10 +2803,10 @@ static BOOL sub_02011CD4 (UnkStruct_0200F7A0 * param0) return v2; } -static void sub_02011D34 (UnkStruct_02011E04 * param0, UnkStruct_0200FF30 * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7) +static void sub_02011D34(UnkStruct_02011E04 *param0, UnkStruct_0200FF30 *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7) { - UnkStruct_02010FC0 * v0; - UnkStruct_02010FC0 * v1; + UnkStruct_02010FC0 *v0; + UnkStruct_02010FC0 *v1; param0->unk_0C.unk_00 = param1->unk_00; param0->unk_0C.unk_04 = param1->unk_00; @@ -2826,7 +2835,7 @@ static void sub_02011D34 (UnkStruct_02011E04 * param0, UnkStruct_0200FF30 * para sub_0200F6D8(param0->unk_34, ¶m0->unk_00, sub_0201035C, param4, param7); } -static BOOL sub_02011E04 (UnkStruct_02011E04 * param0) +static BOOL sub_02011E04(UnkStruct_02011E04 *param0) { param0->unk_24++; @@ -2848,15 +2857,15 @@ static BOOL sub_02011E04 (UnkStruct_02011E04 * param0) return 0; } -static void sub_02011E5C (UnkStruct_02011E04 * param0) +static void sub_02011E5C(UnkStruct_02011E04 *param0) { return; } -static void sub_02011E60 (UnkStruct_02011E04 * param0) +static void sub_02011E60(UnkStruct_02011E04 *param0) { - UnkStruct_02010FC0 * v0; - UnkStruct_02010FC0 * v1; + UnkStruct_02010FC0 *v0; + UnkStruct_02010FC0 *v1; u16 v2; int v3, v4; int v5; @@ -2891,7 +2900,7 @@ static void sub_02011E60 (UnkStruct_02011E04 * param0) } } -static void sub_02011F2C (UnkStruct_02011F2C * param0, int param1, int param2) +static void sub_02011F2C(UnkStruct_02011F2C *param0, int param1, int param2) { int v0; @@ -2901,9 +2910,9 @@ static void sub_02011F2C (UnkStruct_02011F2C * param0, int param1, int param2) param0->unk_00 = v0 + param0->unk_04; } -static void sub_02011F44 (UnkStruct_0200F7A0 * param0, UnkStruct_0200FE6C * param1) +static void sub_02011F44(UnkStruct_0200F7A0 *param0, UnkStruct_0200FE6C *param1) { - UnkStruct_020120D4 * v0; + UnkStruct_020120D4 *v0; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_020120D4)); memset(param0->unk_14, 0, sizeof(UnkStruct_020120D4)); @@ -2914,9 +2923,9 @@ static void sub_02011F44 (UnkStruct_0200F7A0 * param0, UnkStruct_0200FE6C * para param0->unk_0C++; } -static BOOL sub_02011F88 (UnkStruct_0200F7A0 * param0) +static BOOL sub_02011F88(UnkStruct_0200F7A0 *param0) { - UnkStruct_020120D4 * v0; + UnkStruct_020120D4 *v0; BOOL v1; BOOL v2 = 0; @@ -2949,7 +2958,7 @@ static BOOL sub_02011F88 (UnkStruct_0200F7A0 * param0) return v2; } -static void sub_02011FE8 (UnkStruct_020120D4 * param0, UnkStruct_0200FE6C * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7) +static void sub_02011FE8(UnkStruct_020120D4 *param0, UnkStruct_0200FE6C *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7) { sub_02010728(¶m0->unk_00, param4, 1, 0, 0); @@ -2983,7 +2992,7 @@ static void sub_02011FE8 (UnkStruct_020120D4 * param0, UnkStruct_0200FE6C * para sub_02010710(param5, GX_WNDMASK_W0, param4, param0->unk_324); } -static BOOL sub_020120D4 (UnkStruct_020120D4 * param0) +static BOOL sub_020120D4(UnkStruct_020120D4 *param0) { param0->unk_320++; @@ -3004,16 +3013,16 @@ static BOOL sub_020120D4 (UnkStruct_020120D4 * param0) return 0; } -static void sub_02012134 (UnkStruct_020120D4 * param0) +static void sub_02012134(UnkStruct_020120D4 *param0) { return; } -static void sub_02012138 (UnkStruct_020120D4 * param0) +static void sub_02012138(UnkStruct_020120D4 *param0) { int v0; - UnkStruct_02012174 * v1; - const UnkStruct_0200F898 * v2; + UnkStruct_02012174 *v1; + const UnkStruct_0200F898 *v2; v1 = ¶m0->unk_00.unk_00[0]; @@ -3023,7 +3032,7 @@ static void sub_02012138 (UnkStruct_020120D4 * param0) } } -static void sub_02012174 (const UnkStruct_0200F898 * param0, UnkStruct_02012174 * param1, int param2, int param3) +static void sub_02012174(const UnkStruct_0200F898 *param0, UnkStruct_02012174 *param1, int param2, int param3) { int v0; int v1; @@ -3065,9 +3074,9 @@ static void sub_02012174 (const UnkStruct_0200F898 * param0, UnkStruct_02012174 } } -static void sub_020121C4 (UnkStruct_0200F7A0 * param0, UnkStruct_0201006C * param1) +static void sub_020121C4(UnkStruct_0200F7A0 *param0, UnkStruct_0201006C *param1) { - UnkStruct_02012290 * v0; + UnkStruct_02012290 *v0; param0->unk_14 = Heap_AllocFromHeap(param0->unk_20, sizeof(UnkStruct_02012290)); memset(param0->unk_14, 0, sizeof(UnkStruct_02012290)); @@ -3083,9 +3092,9 @@ static void sub_020121C4 (UnkStruct_0200F7A0 * param0, UnkStruct_0201006C * para param0->unk_0C++; } -static BOOL sub_02012228 (UnkStruct_0200F7A0 * param0) +static BOOL sub_02012228(UnkStruct_0200F7A0 *param0) { - UnkStruct_02012290 * v0; + UnkStruct_02012290 *v0; BOOL v1; BOOL v2 = 0; @@ -3121,7 +3130,7 @@ static BOOL sub_02012228 (UnkStruct_0200F7A0 * param0) return v2; } -static void sub_02012290 (UnkStruct_02012290 * param0, UnkStruct_0201006C * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7) +static void sub_02012290(UnkStruct_02012290 *param0, UnkStruct_0201006C *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7) { int v0; @@ -3142,7 +3151,7 @@ static void sub_02012290 (UnkStruct_02012290 * param0, UnkStruct_0201006C * para param0->unk_385 = 0; } -static BOOL sub_02012310 (UnkStruct_02012290 * param0, UnkStruct_0200F7A0 * param1) +static BOOL sub_02012310(UnkStruct_02012290 *param0, UnkStruct_0200F7A0 *param1) { BOOL v0; BOOL v1 = 0; @@ -3173,7 +3182,7 @@ static BOOL sub_02012310 (UnkStruct_02012290 * param0, UnkStruct_0200F7A0 * para return v1; } -static void sub_02012384 (UnkStruct_02012290 * param0, UnkStruct_0201006C * param1, int param2, int param3, int param4, UnkStruct_02010658 * param5, UnkStruct_0200F600 * param6, int param7) +static void sub_02012384(UnkStruct_02012290 *param0, UnkStruct_0201006C *param1, int param2, int param3, int param4, UnkStruct_02010658 *param5, UnkStruct_0200F600 *param6, int param7) { int v0; @@ -3189,7 +3198,7 @@ static void sub_02012384 (UnkStruct_02012290 * param0, UnkStruct_0201006C * para param0->unk_385 = 0; } -static BOOL sub_020123F4 (UnkStruct_02012290 * param0, UnkStruct_0200F7A0 * param1) +static BOOL sub_020123F4(UnkStruct_02012290 *param0, UnkStruct_0200F7A0 *param1) { BOOL v0; BOOL v1 = 0; diff --git a/src/unk_02012480.c b/src/unk_02012480.c index 534fd977cc..281e518a8e 100644 --- a/src/unk_02012480.c +++ b/src/unk_02012480.c @@ -1,8 +1,8 @@ +#include "unk_02012480.h" + #include #include -#include "sys_task_manager.h" - #include "struct_defs/struct_02010658.h" #include "struct_defs/struct_02012634.h" #include "struct_defs/struct_02012650.h" @@ -10,14 +10,14 @@ #include "struct_defs/struct_02012698.h" #include "sys_task.h" -#include "unk_02012480.h" +#include "sys_task_manager.h" -static void sub_020126CC(SysTask * param0, void * param1); -static void sub_020126E0(SysTask * param0, void * param1); -static void sub_020126FC(SysTask * param0, void * param1); -static void sub_02012714(SysTask * param0, void * param1); +static void sub_020126CC(SysTask *param0, void *param1); +static void sub_020126E0(SysTask *param0, void *param1); +static void sub_020126FC(SysTask *param0, void *param1); +static void sub_02012714(SysTask *param0, void *param1); -void sub_02012480 (int param0, int param1) +void sub_02012480(int param0, int param1) { if (param1 == 0) { GX_SetVisibleWnd(param0); @@ -26,7 +26,7 @@ void sub_02012480 (int param0, int param1) } } -void sub_020124AC (int param0, BOOL param1, int param2, int param3) +void sub_020124AC(int param0, BOOL param1, int param2, int param3) { if (param2 == 0) { if (param3 == 0) { @@ -43,7 +43,7 @@ void sub_020124AC (int param0, BOOL param1, int param2, int param3) } } -void sub_02012534 (int param0, BOOL param1, int param2) +void sub_02012534(int param0, BOOL param1, int param2) { if (param2 == 0) { G2_SetWndOutsidePlane(param0, param1); @@ -52,7 +52,7 @@ void sub_02012534 (int param0, BOOL param1, int param2) } } -void sub_02012574 (int param0, int param1, int param2, int param3, int param4, int param5) +void sub_02012574(int param0, int param1, int param2, int param3, int param4, int param5) { if (param4 == 0) { if (param5 == 0) { @@ -69,9 +69,9 @@ void sub_02012574 (int param0, int param1, int param2, int param3, int param4, i } } -void sub_02012634 (UnkStruct_02010658 * param0, int param1, int param2) +void sub_02012634(UnkStruct_02010658 *param0, int param1, int param2) { - UnkStruct_02012634 * v0; + UnkStruct_02012634 *v0; v0 = ¶m0->unk_00[param2]; @@ -81,9 +81,9 @@ void sub_02012634 (UnkStruct_02010658 * param0, int param1, int param2) SysTask_ExecuteAfterVBlank(sub_020126CC, v0, 1); } -void sub_02012650 (UnkStruct_02010658 * param0, int param1, BOOL param2, int param3, int param4) +void sub_02012650(UnkStruct_02010658 *param0, int param1, BOOL param2, int param3, int param4) { - UnkStruct_02012650 * v0; + UnkStruct_02012650 *v0; v0 = ¶m0->unk_10[param4][param3]; @@ -95,9 +95,9 @@ void sub_02012650 (UnkStruct_02010658 * param0, int param1, BOOL param2, int par SysTask_ExecuteAfterVBlank(sub_020126E0, v0, 1); } -void sub_02012678 (UnkStruct_02010658 * param0, int param1, BOOL param2, int param3) +void sub_02012678(UnkStruct_02010658 *param0, int param1, BOOL param2, int param3) { - UnkStruct_02012678 * v0; + UnkStruct_02012678 *v0; v0 = ¶m0->unk_5C[param3]; @@ -108,9 +108,9 @@ void sub_02012678 (UnkStruct_02010658 * param0, int param1, BOOL param2, int par SysTask_ExecuteAfterVBlank(sub_020126FC, v0, 1); } -void sub_02012698 (UnkStruct_02010658 * param0, int param1, int param2, int param3, int param4, int param5, int param6) +void sub_02012698(UnkStruct_02010658 *param0, int param1, int param2, int param3, int param4, int param5, int param6) { - UnkStruct_02012698 * v0; + UnkStruct_02012698 *v0; v0 = ¶m0->unk_74[param6][param5]; @@ -124,33 +124,33 @@ void sub_02012698 (UnkStruct_02010658 * param0, int param1, int param2, int para SysTask_ExecuteAfterVBlank(sub_02012714, v0, 1); } -static void sub_020126CC (SysTask * param0, void * param1) +static void sub_020126CC(SysTask *param0, void *param1) { - UnkStruct_02012634 * v0 = (UnkStruct_02012634 *)param1; + UnkStruct_02012634 *v0 = (UnkStruct_02012634 *)param1; sub_02012480(v0->unk_00, v0->unk_04); SysTask_Done(param0); } -static void sub_020126E0 (SysTask * param0, void * param1) +static void sub_020126E0(SysTask *param0, void *param1) { - UnkStruct_02012650 * v0 = (UnkStruct_02012650 *)param1; + UnkStruct_02012650 *v0 = (UnkStruct_02012650 *)param1; sub_020124AC(v0->unk_00, v0->unk_04, v0->unk_08, v0->unk_0C); SysTask_Done(param0); } -static void sub_020126FC (SysTask * param0, void * param1) +static void sub_020126FC(SysTask *param0, void *param1) { - UnkStruct_02012678 * v0 = (UnkStruct_02012678 *)param1; + UnkStruct_02012678 *v0 = (UnkStruct_02012678 *)param1; sub_02012534(v0->unk_00, v0->unk_04, v0->unk_08); SysTask_Done(param0); } -static void sub_02012714 (SysTask * param0, void * param1) +static void sub_02012714(SysTask *param0, void *param1) { - UnkStruct_02012698 * v0 = (UnkStruct_02012698 *)param1; + UnkStruct_02012698 *v0 = (UnkStruct_02012698 *)param1; sub_02012574(v0->unk_00, v0->unk_02, v0->unk_04, v0->unk_06, v0->unk_08, v0->unk_0C); SysTask_Done(param0); diff --git a/src/unk_02012744.c b/src/unk_02012744.c index 3944f212b3..efd56517cd 100644 --- a/src/unk_02012744.c +++ b/src/unk_02012744.c @@ -1,37 +1,38 @@ +#include "unk_02012744.h" + #include #include #include "struct_decls/struct_02022550_decl.h" - #include "struct_defs/struct_020127E8.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay083/struct_ov83_0223D9A8.h" -#include "unk_02006E3C.h" -#include "unk_02012744.h" #include "heap.h" +#include "unk_02006E3C.h" #include "unk_0201E86C.h" #include "unk_020218BC.h" typedef struct { - GraphicElementData * unk_00; + GraphicElementData *unk_00; int unk_04; int unk_08; } UnkStruct_02012CE0_sub1; typedef struct FontOAM { - UnkStruct_02012CE0_sub1 * unk_00; + UnkStruct_02012CE0_sub1 *unk_00; int unk_04; - const GraphicElementData * unk_08; + const GraphicElementData *unk_08; int unk_0C; int unk_10; } FontOAM; typedef struct UnkStruct_02012744_t { - void * unk_00[12]; - NNSG2dCellDataBank * unk_30[12]; - FontOAM * unk_60; + void *unk_00[12]; + NNSG2dCellDataBank *unk_30[12]; + FontOAM *unk_60; int unk_64; } UnkStruct_02012744; @@ -52,8 +53,8 @@ typedef struct UnkStruct_02013034_t { int unk_00; int unk_04; int unk_08; - struct UnkStruct_02013034_t * unk_0C; - struct UnkStruct_02013034_t * unk_10; + struct UnkStruct_02013034_t *unk_0C; + struct UnkStruct_02013034_t *unk_10; } UnkStruct_02013034; typedef struct UnkStruct_02012B20_t { @@ -61,42 +62,42 @@ typedef struct UnkStruct_02012B20_t { int unk_14; } UnkStruct_02012B20; -static void sub_02012CD0(FontOAM * param0); -static FontOAM * sub_02012CE0(const UnkStruct_02012744 * param0); +static void sub_02012CD0(FontOAM *param0); +static FontOAM *sub_02012CE0(const UnkStruct_02012744 *param0); static int sub_02012D08(int param0, int param1); -static BOOL sub_02012D34(UnkStruct_02012D34 * param0, UnkStruct_02013034 * param1, int param2); -static int sub_02012DE4(int param0, int param1, int param2, UnkStruct_02013034 * param3); -static void sub_02012E6C(const Window * param0, const UnkStruct_02013034 * param1, NNSG2dImageProxy * param2, int param3, int param4, int param5); -static int sub_02012EE0(const Window * param0, const UnkStruct_02013034 * param1, NNSG2dImageProxy * param2, int param3, int param4, int param5, int param6, int param7); -static int sub_02013034(const UnkStruct_02013034 * param0, int param1); -static void sub_02013088(const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2, FontOAM * param3); -static GraphicElementData * sub_02013100(const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2); -static void sub_020130DC(FontOAM * param0); -static UnkStruct_02013034 * sub_02013188(int param0); -static void sub_020131A4(UnkStruct_02013034 * param0); -static void sub_020131B8(UnkStruct_02013034 * param0); -static void sub_020131D0(UnkStruct_02013034 * param0, UnkStruct_02013034 * param1); -static void sub_02012F98(const Window * param0, char * param1, const UnkStruct_02013034 * param2, int param3, int param4); -static int sub_02012FF0(const Window * param0, const UnkStruct_02013034 * param1, char * param2, int param3, int param4, int param5, int param6); +static BOOL sub_02012D34(UnkStruct_02012D34 *param0, UnkStruct_02013034 *param1, int param2); +static int sub_02012DE4(int param0, int param1, int param2, UnkStruct_02013034 *param3); +static void sub_02012E6C(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int param5); +static int sub_02012EE0(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int param5, int param6, int param7); +static int sub_02013034(const UnkStruct_02013034 *param0, int param1); +static void sub_02013088(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2, FontOAM *param3); +static GraphicElementData *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2); +static void sub_020130DC(FontOAM *param0); +static UnkStruct_02013034 *sub_02013188(int param0); +static void sub_020131A4(UnkStruct_02013034 *param0); +static void sub_020131B8(UnkStruct_02013034 *param0); +static void sub_020131D0(UnkStruct_02013034 *param0, UnkStruct_02013034 *param1); +static void sub_02012F98(const Window *param0, char *param1, const UnkStruct_02013034 *param2, int param3, int param4); +static int sub_02012FF0(const Window *param0, const UnkStruct_02013034 *param1, char *param2, int param3, int param4, int param5, int param6); static const u8 Unk_020E52E4[12][2] = { - {0x8, 0x8}, - {0x8, 0x4}, - {0x4, 0x8}, - {0x4, 0x4}, - {0x4, 0x2}, - {0x4, 0x1}, - {0x2, 0x4}, - {0x2, 0x2}, - {0x2, 0x1}, - {0x1, 0x4}, - {0x1, 0x2}, - {0x1, 0x1} + { 0x8, 0x8 }, + { 0x8, 0x4 }, + { 0x4, 0x8 }, + { 0x4, 0x4 }, + { 0x4, 0x2 }, + { 0x4, 0x1 }, + { 0x2, 0x4 }, + { 0x2, 0x2 }, + { 0x2, 0x1 }, + { 0x1, 0x4 }, + { 0x1, 0x2 }, + { 0x1, 0x1 } }; -UnkStruct_02012744 * sub_02012744 (int param0, int param1) +UnkStruct_02012744 *sub_02012744(int param0, int param1) { - UnkStruct_02012744 * v0; + UnkStruct_02012744 *v0; int v1; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02012744)); @@ -118,7 +119,7 @@ UnkStruct_02012744 * sub_02012744 (int param0, int param1) return v0; } -void sub_020127BC (UnkStruct_02012744 * param0) +void sub_020127BC(UnkStruct_02012744 *param0) { int v0; @@ -132,12 +133,12 @@ void sub_020127BC (UnkStruct_02012744 * param0) Heap_FreeToHeap(param0); } -FontOAM * sub_020127E8 (const UnkStruct_020127E8 * param0) +FontOAM *sub_020127E8(const UnkStruct_020127E8 *param0) { - FontOAM * v0; + FontOAM *v0; UnkStruct_02013034 v1; int v2; - NNSG2dImageProxy * v3; + NNSG2dImageProxy *v3; GF_ASSERT(param0); @@ -165,7 +166,7 @@ FontOAM * sub_020127E8 (const UnkStruct_020127E8 * param0) return v0; } -void sub_02012870 (FontOAM * param0) +void sub_02012870(FontOAM *param0) { GF_ASSERT(param0); GF_ASSERT(param0->unk_00); @@ -175,7 +176,7 @@ void sub_02012870 (FontOAM * param0) sub_02012CD0(param0); } -int sub_02012898 (const Window * param0, int param1, int param2) +int sub_02012898(const Window *param0, int param1, int param2) { UnkStruct_02013034 v0; int v1; @@ -190,11 +191,11 @@ int sub_02012898 (const Window * param0, int param1, int param2) return v1; } -void sub_020128C4 (FontOAM * param0, int param1, int param2) +void sub_020128C4(FontOAM *param0, int param1, int param2) { int v0; VecFx32 v1; - const VecFx32 * v2; + const VecFx32 *v2; GF_ASSERT(param0); @@ -221,11 +222,11 @@ void sub_020128C4 (FontOAM * param0, int param1, int param2) } } -void sub_02012938 (FontOAM * param0) +void sub_02012938(FontOAM *param0) { int v0; VecFx32 v1; - const VecFx32 * v2; + const VecFx32 *v2; fx32 v3, v4; GF_ASSERT(param0); @@ -249,7 +250,7 @@ void sub_02012938 (FontOAM * param0) } } -void sub_020129A4 (const FontOAM * param0, int * param1, int * param2) +void sub_020129A4(const FontOAM *param0, int *param1, int *param2) { GF_ASSERT(param0); GF_ASSERT(param1); @@ -259,7 +260,7 @@ void sub_020129A4 (const FontOAM * param0, int * param1, int * param2) *param2 = param0->unk_10; } -void sub_020129D0 (FontOAM * param0, BOOL param1) +void sub_020129D0(FontOAM *param0, BOOL param1) { int v0; @@ -270,7 +271,7 @@ void sub_020129D0 (FontOAM * param0, BOOL param1) } } -void sub_02012A00 (FontOAM * param0, u8 param1) +void sub_02012A00(FontOAM *param0, u8 param1) { int v0; @@ -281,7 +282,7 @@ void sub_02012A00 (FontOAM * param0, u8 param1) } } -void sub_02012A30 (FontOAM * param0, u32 param1) +void sub_02012A30(FontOAM *param0, u32 param1) { int v0; @@ -292,7 +293,7 @@ void sub_02012A30 (FontOAM * param0, u32 param1) } } -void sub_02012A60 (FontOAM * param0, u32 param1) +void sub_02012A60(FontOAM *param0, u32 param1) { int v0; @@ -303,7 +304,7 @@ void sub_02012A60 (FontOAM * param0, u32 param1) } } -void sub_02012A90 (FontOAM * param0, u32 param1) +void sub_02012A90(FontOAM *param0, u32 param1) { int v0; @@ -314,7 +315,7 @@ void sub_02012A90 (FontOAM * param0, u32 param1) } } -void sub_02012AC0 (FontOAM * param0, u32 param1) +void sub_02012AC0(FontOAM *param0, u32 param1) { int v0; @@ -325,7 +326,7 @@ void sub_02012AC0 (FontOAM * param0, u32 param1) } } -void sub_02012AF0 (FontOAM * param0, GXOamMode param1) +void sub_02012AF0(FontOAM *param0, GXOamMode param1) { int v0; @@ -336,9 +337,9 @@ void sub_02012AF0 (FontOAM * param0, GXOamMode param1) } } -UnkStruct_02012B20 * sub_02012B20 (const Window * param0, int param1) +UnkStruct_02012B20 *sub_02012B20(const Window *param0, int param1) { - UnkStruct_02012B20 * v0; + UnkStruct_02012B20 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02012B20)); @@ -349,21 +350,21 @@ UnkStruct_02012B20 * sub_02012B20 (const Window * param0, int param1) return v0; } -void sub_02012B48 (UnkStruct_02012B20 * param0) +void sub_02012B48(UnkStruct_02012B20 *param0) { sub_020131B8(¶m0->unk_00); Heap_FreeToHeap(param0); } -int sub_02012B58 (const UnkStruct_02012B20 * param0, int param1) +int sub_02012B58(const UnkStruct_02012B20 *param0, int param1) { return sub_02013034(¶m0->unk_00, param1); } -FontOAM * sub_02012B60 (const UnkStruct_020127E8 * param0, const UnkStruct_02012B20 * param1) +FontOAM *sub_02012B60(const UnkStruct_020127E8 *param0, const UnkStruct_02012B20 *param1) { - FontOAM * v0; - NNSG2dImageProxy * v1; + FontOAM *v0; + NNSG2dImageProxy *v1; GF_ASSERT(param0); v0 = sub_02012CE0(param0->unk_00); @@ -386,17 +387,17 @@ FontOAM * sub_02012B60 (const UnkStruct_020127E8 * param0, const UnkStruct_02012 return v0; } -void sub_02012BD8 (FontOAM * param0) +void sub_02012BD8(FontOAM *param0) { sub_02012870(param0); } -void sub_02012BE0 (FontOAM * param0, const UnkStruct_02012B20 * param1, const Window * param2, int param3) +void sub_02012BE0(FontOAM *param0, const UnkStruct_02012B20 *param1, const Window *param2, int param3) { int v0; - char * v1; - NNSG2dImageProxy * v2; - GraphicElementData * v3 = param0->unk_00[0].unk_00; + char *v1; + NNSG2dImageProxy *v2; + GraphicElementData *v3 = param0->unk_00[0].unk_00; int v4; v4 = sub_02021FC8(v3); @@ -419,7 +420,7 @@ void sub_02012BE0 (FontOAM * param0, const UnkStruct_02012B20 * param1, const Wi Heap_FreeToHeap(v1); } -void sub_02012C60 (const Window * param0, int param1, int param2, int param3, int param4, char * param5) +void sub_02012C60(const Window *param0, int param1, int param2, int param3, int param4, char *param5) { int v0; int v1; @@ -439,12 +440,12 @@ void sub_02012C60 (const Window * param0, int param1, int param2, int param3, in } } -static void sub_02012CD0 (FontOAM * param0) +static void sub_02012CD0(FontOAM *param0) { memset(param0, 0, sizeof(FontOAM)); } -static FontOAM * sub_02012CE0 (const UnkStruct_02012744 * param0) +static FontOAM *sub_02012CE0(const UnkStruct_02012744 *param0) { int v0; @@ -457,7 +458,7 @@ static FontOAM * sub_02012CE0 (const UnkStruct_02012744 * param0) return NULL; } -static int sub_02012D08 (int param0, int param1) +static int sub_02012D08(int param0, int param1) { int v0; @@ -470,9 +471,9 @@ static int sub_02012D08 (int param0, int param1) return 12; } -static BOOL sub_02012D34 (UnkStruct_02012D34 * param0, UnkStruct_02013034 * param1, int param2) +static BOOL sub_02012D34(UnkStruct_02012D34 *param0, UnkStruct_02013034 *param1, int param2) { - UnkStruct_02013034 * v0; + UnkStruct_02013034 *v0; int v1; int v2; @@ -492,7 +493,7 @@ static BOOL sub_02012D34 (UnkStruct_02012D34 * param0, UnkStruct_02013034 * para param0->unk_10.unk_00 = param0->unk_00.unk_00; param0->unk_10.unk_04 = param0->unk_00.unk_04 + Unk_020E52E4[v0->unk_08][0]; - GF_ASSERT((param0->unk_20 != 1)); + GF_ASSERT(param0->unk_20 != 1); param0->unk_20 = 1; } @@ -511,7 +512,7 @@ static BOOL sub_02012D34 (UnkStruct_02012D34 * param0, UnkStruct_02013034 * para return 0; } -static int sub_02012DE4 (int param0, int param1, int param2, UnkStruct_02013034 * param3) +static int sub_02012DE4(int param0, int param1, int param2, UnkStruct_02013034 *param3) { UnkStruct_02012DE4 v0; UnkStruct_02012D34 v1; @@ -549,9 +550,9 @@ static int sub_02012DE4 (int param0, int param1, int param2, UnkStruct_02013034 return v3; } -static void sub_02012E6C (const Window * param0, const UnkStruct_02013034 * param1, NNSG2dImageProxy * param2, int param3, int param4, int param5) +static void sub_02012E6C(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int param5) { - UnkStruct_02013034 * v0; + UnkStruct_02013034 *v0; int v1; int v2; GXOBJVRamModeChar v3; @@ -574,9 +575,9 @@ static void sub_02012E6C (const Window * param0, const UnkStruct_02013034 * para } } -static int sub_02012EE0 (const Window * param0, const UnkStruct_02013034 * param1, NNSG2dImageProxy * param2, int param3, int param4, int param5, int param6, int param7) +static int sub_02012EE0(const Window *param0, const UnkStruct_02013034 *param1, NNSG2dImageProxy *param2, int param3, int param4, int param5, int param6, int param7) { - char * v0; + char *v0; int v1; int v2, v3; @@ -617,9 +618,9 @@ static int sub_02012EE0 (const Window * param0, const UnkStruct_02013034 * param return param5 + v1; } -static void sub_02012F98 (const Window * param0, char * param1, const UnkStruct_02013034 * param2, int param3, int param4) +static void sub_02012F98(const Window *param0, char *param1, const UnkStruct_02013034 *param2, int param3, int param4) { - UnkStruct_02013034 * v0; + UnkStruct_02013034 *v0; int v1; int v2; int v3; @@ -641,7 +642,7 @@ static void sub_02012F98 (const Window * param0, char * param1, const UnkStruct_ } } -static int sub_02012FF0 (const Window * param0, const UnkStruct_02013034 * param1, char * param2, int param3, int param4, int param5, int param6) +static int sub_02012FF0(const Window *param0, const UnkStruct_02013034 *param1, char *param2, int param3, int param4, int param5, int param6) { int v0; int v1, v2; @@ -661,9 +662,9 @@ static int sub_02012FF0 (const Window * param0, const UnkStruct_02013034 * param return param3 + v0; } -static int sub_02013034 (const UnkStruct_02013034 * param0, int param1) +static int sub_02013034(const UnkStruct_02013034 *param0, int param1) { - UnkStruct_02013034 * v0; + UnkStruct_02013034 *v0; int v1; GXOBJVRamModeChar v2; int v3; @@ -696,9 +697,9 @@ static int sub_02013034 (const UnkStruct_02013034 * param0, int param1) return v3; } -static void sub_02013088 (const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2, FontOAM * param3) +static void sub_02013088(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2, FontOAM *param3) { - UnkStruct_02013034 * v0; + UnkStruct_02013034 *v0; int v1; v1 = 0; @@ -716,7 +717,7 @@ static void sub_02013088 (const UnkStruct_020127E8 * param0, const UnkStruct_020 } } -static void sub_020130DC (FontOAM * param0) +static void sub_020130DC(FontOAM *param0) { int v0; @@ -725,7 +726,7 @@ static void sub_020130DC (FontOAM * param0) } } -static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2) +static GraphicElementData *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2) { UnkStruct_ov83_0223D9A8 v0; UnkStruct_ov19_021DA864 v1; @@ -750,7 +751,7 @@ static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, con v0.unk_08.z = 0; if (param0->unk_10) { - const VecFx32 * v2; + const VecFx32 *v2; v2 = sub_02021D28(param0->unk_10); v0.unk_08 = *v2; @@ -762,9 +763,9 @@ static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, con return sub_02021B90(&v0); } -static UnkStruct_02013034 * sub_02013188 (int param0) +static UnkStruct_02013034 *sub_02013188(int param0) { - UnkStruct_02013034 * v0; + UnkStruct_02013034 *v0; v0 = Heap_AllocFromHeapAtEnd(param0, sizeof(UnkStruct_02013034)); GF_ASSERT(v0); @@ -775,16 +776,16 @@ static UnkStruct_02013034 * sub_02013188 (int param0) return v0; } -static void sub_020131A4 (UnkStruct_02013034 * param0) +static void sub_020131A4(UnkStruct_02013034 *param0) { GF_ASSERT(param0); Heap_FreeToHeap(param0); } -static void sub_020131B8 (UnkStruct_02013034 * param0) +static void sub_020131B8(UnkStruct_02013034 *param0) { - UnkStruct_02013034 * v0; - UnkStruct_02013034 * v1; + UnkStruct_02013034 *v0; + UnkStruct_02013034 *v1; v0 = param0->unk_0C; @@ -795,7 +796,7 @@ static void sub_020131B8 (UnkStruct_02013034 * param0) } } -static void sub_020131D0 (UnkStruct_02013034 * param0, UnkStruct_02013034 * param1) +static void sub_020131D0(UnkStruct_02013034 *param0, UnkStruct_02013034 *param1) { param0->unk_0C = param1->unk_0C; param0->unk_10 = param1; @@ -803,7 +804,7 @@ static void sub_020131D0 (UnkStruct_02013034 * param0, UnkStruct_02013034 * para param1->unk_0C = param0; } -void sub_020131E0 (FontOAM * param0, const GraphicElementData * param1) +void sub_020131E0(FontOAM *param0, const GraphicElementData *param1) { param0->unk_08 = param1; sub_02012938(param0); diff --git a/src/unk_020131EC.c b/src/unk_020131EC.c index 36530ba6c2..9506f51855 100644 --- a/src/unk_020131EC.c +++ b/src/unk_020131EC.c @@ -1,16 +1,17 @@ +#include "unk_020131EC.h" + #include #include #include "struct_defs/struct_02013610.h" +#include "heap.h" #include "narc.h" #include "unk_0200762C.h" -#include "unk_020131EC.h" -#include "heap.h" -static void sub_020131EC(const u8 * param0, u8 * param1, int * param2, int * param3, int param4, int param5); +static void sub_020131EC(const u8 *param0, u8 *param1, int *param2, int *param3, int param4, int param5); -static void sub_020131EC (const u8 * param0, u8 * param1, int * param2, int * param3, int param4, int param5) +static void sub_020131EC(const u8 *param0, u8 *param1, int *param2, int *param3, int param4, int param5) { int v0; u32 v1; @@ -22,10 +23,10 @@ static void sub_020131EC (const u8 * param0, u8 * param1, int * param2, int * pa } } -static void sub_0201322C (int param0, int param1, int param2, NNSG2dCharacterData ** param3) +static void sub_0201322C(int param0, int param1, int param2, NNSG2dCharacterData **param3) { BOOL v0; - void * v1 = NULL; + void *v1 = NULL; v1 = NARC_AllocAndReadWholeMemberByIndexPair(param0, param1, param2); GF_ASSERT(v1 != NULL); @@ -37,10 +38,10 @@ static void sub_0201322C (int param0, int param1, int param2, NNSG2dCharacterDat Heap_FreeToHeap(v1); } -static void sub_02013260 (int param0, int param1, int param2, int param3, NNSG2dCharacterData * param4, void * param5) +static void sub_02013260(int param0, int param1, int param2, int param3, NNSG2dCharacterData *param4, void *param5) { - u8 * v0 = NULL; - u8 * v1 = NULL; + u8 *v0 = NULL; + u8 *v1 = NULL; int v2; int v3; int v4; @@ -70,12 +71,13 @@ static void sub_02013260 (int param0, int param1, int param2, int param3, NNSG2d } } -static BOOL sub_020132F8 (int param0) +static BOOL sub_020132F8(int param0) { int v0; int v1; const int v2[] = { - 327, 495, + 327, + 495, }; for (v0 = 0; v0 < 495; v0++) { @@ -93,10 +95,10 @@ static BOOL sub_020132F8 (int param0) return 0; } -static void sub_02013338 (int param0, int param1, int param2, int param3, int param4, int param5, int param6, void * param7, u32 param8, BOOL param9, int param10, int param11) +static void sub_02013338(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11) { BOOL v0; - NNSG2dCharacterData * v1 = NULL; + NNSG2dCharacterData *v1 = NULL; sub_0201322C(param0, param1, param2, &v1); sub_020093A0(v1->pRawData, param0); @@ -110,9 +112,9 @@ static void sub_02013338 (int param0, int param1, int param2, int param3, int pa sub_02013260(param3, param4, param5, param6, v1, param7); } -static void * sub_02013388 (int param0, int param1, int param2, int param3, int param4, int param5, int param6, u32 param7, BOOL param8, int param9, int param10) +static void *sub_02013388(int param0, int param1, int param2, int param3, int param4, int param5, int param6, u32 param7, BOOL param8, int param9, int param10) { - void * v0; + void *v0; int v1; v1 = ((param5 * param6) * ((8 / 2) * 8)); @@ -123,12 +125,12 @@ static void * sub_02013388 (int param0, int param1, int param2, int param3, int return v0; } -void sub_020133D4 (int param0, int param1, int param2, int param3, int param4, int param5, int param6, void * param7) +void sub_020133D4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7) { - void * v0 = NULL; - u8 * v1 = NULL; - u8 * v2 = NULL; - NNSG2dCharacterData * v3 = NULL; + void *v0 = NULL; + u8 *v1 = NULL; + u8 *v2 = NULL; + NNSG2dCharacterData *v3 = NULL; int v4; int v5; int v6; @@ -169,9 +171,9 @@ void sub_020133D4 (int param0, int param1, int param2, int param3, int param4, i Heap_FreeToHeap(v0); } -void * sub_020134A8 (int param0, int param1, int param2, int param3, int param4, int param5, int param6) +void *sub_020134A8(int param0, int param1, int param2, int param3, int param4, int param5, int param6) { - void * v0; + void *v0; int v1; v1 = ((param5 * param6) * ((8 / 2) * 8)); @@ -182,11 +184,11 @@ void * sub_020134A8 (int param0, int param1, int param2, int param3, int param4, return v0; } -void sub_020134E4 (int param0, int param1, int param2, int param3, int param4, int param5, int * param6, const void * param7, void * param8) +void sub_020134E4(int param0, int param1, int param2, int param3, int param4, int param5, int *param6, const void *param7, void *param8) { int v0, v1; - u8 * v2; - u8 * v3; + u8 *v2; + u8 *v3; int v4; int v5; int v6; @@ -205,24 +207,24 @@ void sub_020134E4 (int param0, int param1, int param2, int param3, int param4, i } } -void sub_02013560 (int param0, int param1, const UnkStruct_02013610 * param2, int * param3, const void * param4, void * param5) +void sub_02013560(int param0, int param1, const UnkStruct_02013610 *param2, int *param3, const void *param4, void *param5) { sub_020134E4(param0, param1, param2->unk_00, param2->unk_04, param2->unk_08, param2->unk_0C, param3, param4, param5); } -void sub_02013584 (int param0, int param1, int param2, int param3, int param4, int param5, int param6, void * param7) +void sub_02013584(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7) { int v0; int v1; int v2; - void * v3 = NULL; + void *v3 = NULL; const UnkStruct_02013610 v4[] = { - {0x0, 0x0, 0x8, 0x8}, - {0x8, 0x0, 0x2, 0x4}, - {0x8, 0x4, 0x2, 0x4}, - {0x0, 0x8, 0x4, 0x2}, - {0x4, 0x8, 0x4, 0x2}, - {0x8, 0x8, 0x2, 0x2} + { 0x0, 0x0, 0x8, 0x8 }, + { 0x8, 0x0, 0x2, 0x4 }, + { 0x8, 0x4, 0x2, 0x4 }, + { 0x0, 0x8, 0x4, 0x2 }, + { 0x4, 0x8, 0x4, 0x2 }, + { 0x8, 0x8, 0x2, 0x2 } }; v1 = NELEMS(v4); @@ -236,12 +238,12 @@ void sub_02013584 (int param0, int param1, int param2, int param3, int param4, i Heap_FreeToHeap(v3); } -void sub_020135F0 (int param0, int param1, int param2, const UnkStruct_02013610 * param3, void * param4) +void sub_020135F0(int param0, int param1, int param2, const UnkStruct_02013610 *param3, void *param4) { sub_02013584(param0, param1, param2, param3->unk_00, param3->unk_04, param3->unk_08, param3->unk_0C, param4); } -void sub_02013610 (int param0, int param1, int param2, void * param3) +void sub_02013610(int param0, int param1, int param2, void *param3) { const UnkStruct_02013610 v0 = { 0x0, @@ -253,9 +255,9 @@ void sub_02013610 (int param0, int param1, int param2, void * param3) sub_020135F0(param0, param1, param2, &v0, param3); } -void * sub_0201363C (int param0, int param1, int param2) +void *sub_0201363C(int param0, int param1, int param2) { - void * v0 = NULL; + void *v0 = NULL; int v1; v1 = (10 * 10 * ((8 / 2) * 8)); @@ -266,11 +268,11 @@ void * sub_0201363C (int param0, int param1, int param2) return v0; } -void * sub_02013660 (int param0, int param1, int param2) +void *sub_02013660(int param0, int param1, int param2) { - NNSG2dPaletteData * v0; - void * v1; - void * v2; + NNSG2dPaletteData *v0; + void *v1; + void *v2; int v3; BOOL v4; @@ -286,19 +288,19 @@ void * sub_02013660 (int param0, int param1, int param2) return v2; } -void sub_020136A4 (int param0, int param1, int param2, int param3, int param4, int param5, int param6, void * param7, u32 param8, BOOL param9, int param10, int param11) +void sub_020136A4(int param0, int param1, int param2, int param3, int param4, int param5, int param6, void *param7, u32 param8, BOOL param9, int param10, int param11) { int v0; int v1; int v2; - void * v3 = NULL; + void *v3 = NULL; const UnkStruct_02013610 v4[] = { - {0x0, 0x0, 0x8, 0x8}, - {0x8, 0x0, 0x2, 0x4}, - {0x8, 0x4, 0x2, 0x4}, - {0x0, 0x8, 0x4, 0x2}, - {0x4, 0x8, 0x4, 0x2}, - {0x8, 0x8, 0x2, 0x2} + { 0x0, 0x0, 0x8, 0x8 }, + { 0x8, 0x0, 0x2, 0x4 }, + { 0x8, 0x4, 0x2, 0x4 }, + { 0x0, 0x8, 0x4, 0x2 }, + { 0x4, 0x8, 0x4, 0x2 }, + { 0x8, 0x8, 0x2, 0x2 } }; v1 = NELEMS(v4); @@ -313,12 +315,12 @@ void sub_020136A4 (int param0, int param1, int param2, int param3, int param4, i Heap_FreeToHeap(v3); } -void sub_02013720 (int param0, int param1, int param2, const UnkStruct_02013610 * param3, void * param4, u32 param5, BOOL param6, int param7, int param8) +void sub_02013720(int param0, int param1, int param2, const UnkStruct_02013610 *param3, void *param4, u32 param5, BOOL param6, int param7, int param8) { sub_020136A4(param0, param1, param2, param3->unk_00, param3->unk_04, param3->unk_08, param3->unk_0C, param4, param5, param6, param7, param8); } -void sub_02013750 (int param0, int param1, int param2, void * param3, u32 param4, BOOL param5, int param6, int param7) +void sub_02013750(int param0, int param1, int param2, void *param3, u32 param4, BOOL param5, int param6, int param7) { const UnkStruct_02013610 v0 = { 0x0, diff --git a/src/unk_02013A04.c b/src/unk_02013A04.c index 333d447cd4..8e65b83146 100644 --- a/src/unk_02013A04.c +++ b/src/unk_02013A04.c @@ -1,22 +1,20 @@ +#include "unk_02013A04.h" + #include #include -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_02013A04_t.h" -#include "message.h" -#include "unk_02013A04.h" #include "heap.h" +#include "message.h" #include "strbuf.h" -static ResourceMetadata * sub_02013AAC(ResourceMetadata * param0, u32 * param1); +static ResourceMetadata *sub_02013AAC(ResourceMetadata *param0, u32 *param1); -ResourceMetadata * sub_02013A04 (u32 param0, u32 param1) +ResourceMetadata *sub_02013A04(u32 param0, u32 param1) { - ResourceMetadata * v0 = Heap_AllocFromHeap(param1, sizeof(ResourceMetadata) * (param0 + 1)); + ResourceMetadata *v0 = Heap_AllocFromHeap(param1, sizeof(ResourceMetadata) * (param0 + 1)); if (v0) { u32 v1; @@ -33,13 +31,13 @@ ResourceMetadata * sub_02013A04 (u32 param0, u32 param1) return v0; } -void sub_02013A3C (ResourceMetadata * param0) +void sub_02013A3C(ResourceMetadata *param0) { sub_02013AE8(param0); Heap_FreeToHeap(param0); } -void sub_02013A4C (ResourceMetadata * param0, const MessageLoader * param1, u32 param2, u32 param3) +void sub_02013A4C(ResourceMetadata *param0, const MessageLoader *param1, u32 param2, u32 param3) { u32 v0; @@ -51,7 +49,7 @@ void sub_02013A4C (ResourceMetadata * param0, const MessageLoader * param1, u32 } } -void sub_02013A6C (ResourceMetadata * param0, const Strbuf *param1, u32 param2) +void sub_02013A6C(ResourceMetadata *param0, const Strbuf *param1, u32 param2) { u32 v0; @@ -63,7 +61,7 @@ void sub_02013A6C (ResourceMetadata * param0, const Strbuf *param1, u32 param2) } } -void sub_02013A90 (ResourceMetadata * param0, const ResourceMetadata * param1) +void sub_02013A90(ResourceMetadata *param0, const ResourceMetadata *param1) { u32 v0; @@ -75,9 +73,9 @@ void sub_02013A90 (ResourceMetadata * param0, const ResourceMetadata * param1) } } -static ResourceMetadata * sub_02013AAC (ResourceMetadata * param0, u32 * param1) +static ResourceMetadata *sub_02013AAC(ResourceMetadata *param0, u32 *param1) { - ResourceMetadata * v0; + ResourceMetadata *v0; while (param0->unk_00 != NULL) { if (param0->unk_00 == ((const void *)0xffffffff)) { @@ -99,9 +97,9 @@ static ResourceMetadata * sub_02013AAC (ResourceMetadata * param0, u32 * param1) return v0; } -void sub_02013AE8 (ResourceMetadata * param0) +void sub_02013AE8(ResourceMetadata *param0) { - ResourceMetadata * v0 = param0; + ResourceMetadata *v0 = param0; while (v0->unk_00 != ((const void *)0xffffffff)) { if (v0->unk_00 == NULL) { diff --git a/src/unk_02014000.c b/src/unk_02014000.c index cddf72730c..fce907d82a 100644 --- a/src/unk_02014000.c +++ b/src/unk_02014000.c @@ -1,24 +1,24 @@ +#include "unk_02014000.h" + #include #include -#include "sys_task_manager.h" - -#include "functypes/funcptr_02014014.h" #include "struct_defs/struct_02014560.h" -#include "functypes/funcptr_020146F4.h" #include "struct_defs/struct_020147B8.h" #include "struct_defs/struct_02014874.h" #include "struct_defs/struct_02014890.h" #include "struct_defs/struct_02014910.h" #include "struct_defs/struct_02014970.h" -#include "spl.h" +#include "functypes/funcptr_02014014.h" +#include "functypes/funcptr_020146F4.h" +#include "camera.h" +#include "heap.h" #include "narc.h" +#include "spl.h" #include "sys_task.h" -#include "unk_02014000.h" -#include "heap.h" -#include "camera.h" +#include "sys_task_manager.h" enum { EMIT_MAX = 20, @@ -29,15 +29,15 @@ enum { }; typedef struct UnkStruct_02014014_t { - UnkSPLStruct1 * unk_00; - void * unk_04; - UnkSPLStruct6 * unk_08; - void * unk_0C; - void * unk_10; - void * unk_14; + UnkSPLStruct1 *unk_00; + void *unk_04; + UnkSPLStruct6 *unk_08; + void *unk_0C; + void *unk_10; + void *unk_14; UnkFuncPtr_02014014 unk_18; UnkFuncPtr_02014014 unk_1C; - Camera * camera; + Camera *camera; VecFx32 unk_24; u16 unk_30; VecFx32 unk_34; @@ -57,11 +57,11 @@ typedef struct UnkStruct_02014014_t { u8 unk_DB; } UnkStruct_02014014; -static void * Unk_021BF618[16]; +static void *Unk_021BF618[16]; -static void * Unk_021BF614; +static void *Unk_021BF614; -static UnkStruct_02014014 * Unk_021BF610; +static UnkStruct_02014014 *Unk_021BF610; static const VecFx32 Unk_020E5448 = { 0, 0, 0x4000 @@ -75,29 +75,29 @@ static const VecFx32 Unk_020E543C = { 0, 0, 0 }; -static void * sub_02014204(u32 param0); -static void * sub_02014230(u32 param0); -static void * sub_0201425C(u32 param0); -static void * sub_02014288(u32 param0); -static void * sub_020142B4(u32 param0); -static void * sub_020142E0(u32 param0); -static void * sub_0201430C(u32 param0); -static void * sub_02014338(u32 param0); -static void * sub_02014364(u32 param0); -static void * sub_02014390(u32 param0); -static void * sub_020143BC(u32 param0); -static void * sub_020143E8(u32 param0); -static void * sub_02014414(u32 param0); -static void * sub_02014440(u32 param0); -static void * sub_0201446C(u32 param0); -static void * sub_02014498(u32 param0); -static inline void * Particle_LocalAlloc(UnkStruct_02014014 * param0, u32 param1); -static void sub_02014560(UnkStruct_02014014 * param0); -static void sub_020145A0(SysTask * param0, void * param1); - -void sub_0201411C(UnkStruct_02014014 * param0); -void sub_02014718(UnkStruct_02014014 * param0); -void sub_020144CC(UnkStruct_02014014 * param0, void * param1, int param2, int param3); +static void *sub_02014204(u32 param0); +static void *sub_02014230(u32 param0); +static void *sub_0201425C(u32 param0); +static void *sub_02014288(u32 param0); +static void *sub_020142B4(u32 param0); +static void *sub_020142E0(u32 param0); +static void *sub_0201430C(u32 param0); +static void *sub_02014338(u32 param0); +static void *sub_02014364(u32 param0); +static void *sub_02014390(u32 param0); +static void *sub_020143BC(u32 param0); +static void *sub_020143E8(u32 param0); +static void *sub_02014414(u32 param0); +static void *sub_02014440(u32 param0); +static void *sub_0201446C(u32 param0); +static void *sub_02014498(u32 param0); +static inline void *Particle_LocalAlloc(UnkStruct_02014014 *param0, u32 param1); +static void sub_02014560(UnkStruct_02014014 *param0); +static void sub_020145A0(SysTask *param0, void *param1); + +void sub_0201411C(UnkStruct_02014014 *param0); +void sub_02014718(UnkStruct_02014014 *param0); +void sub_020144CC(UnkStruct_02014014 *param0, void *param1, int param2, int param3); static const UnkFuncPtr_0209CD00 Unk_020E5454[] = { sub_02014204, @@ -118,7 +118,7 @@ static const UnkFuncPtr_0209CD00 Unk_020E5454[] = { sub_02014498, }; -void sub_02014000 (void) +void sub_02014000(void) { int i; @@ -127,9 +127,9 @@ void sub_02014000 (void) } } -UnkStruct_02014014 * sub_02014014 (UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 param1, void * param2, int param3, int param4, int param5) +UnkStruct_02014014 *sub_02014014(UnkFuncPtr_02014014 param0, UnkFuncPtr_02014014 param1, void *param2, int param3, int param4, int param5) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; int v1; for (v1 = 0; v1 < 16; v1++) { @@ -167,26 +167,20 @@ UnkStruct_02014014 * sub_02014014 (UnkFuncPtr_02014014 param0, UnkFuncPtr_020140 VEC_Set(&v0->unk_24, 0, 0, 0); v0->unk_30 = 8192; - Camera_InitWithTargetAndPosition(&Unk_020E543C, &Unk_020E5448, - v0->unk_30, - 0, - 0, - v0->camera - ); + Camera_InitWithTargetAndPosition(&Unk_020E543C, &Unk_020E5448, v0->unk_30, 0, 0, v0->camera); v0->unk_DB = 0; Camera_SetAsActive(v0->camera); } } - v0->unk_00 = SPL_0209CD00(Unk_020E5454[v1], EMIT_MAX, PARTICLE_MAX, - FIX_POLYGON_ID, MIN_POLYGON_ID, MAX_POLYGON_ID); + v0->unk_00 = SPL_0209CD00(Unk_020E5454[v1], EMIT_MAX, PARTICLE_MAX, FIX_POLYGON_ID, MIN_POLYGON_ID, MAX_POLYGON_ID); sub_02014744(v0, &Unk_020E5430); return v0; } -void sub_0201411C (UnkStruct_02014014 * param0) +void sub_0201411C(UnkStruct_02014014 *param0) { int v0; @@ -237,7 +231,7 @@ void sub_0201411C (UnkStruct_02014014 * param0) Heap_FreeToHeap(param0); } -void sub_020141E4 (void) +void sub_020141E4(void) { int i; @@ -248,9 +242,9 @@ void sub_020141E4 (void) } } -static inline void * Particle_LocalAlloc (UnkStruct_02014014 * param0, u32 param1) +static inline void *Particle_LocalAlloc(UnkStruct_02014014 *param0, u32 param1) { - void * v0; + void *v0; u32 v1, v2; v0 = param0->unk_10; @@ -268,140 +262,140 @@ static inline void * Particle_LocalAlloc (UnkStruct_02014014 * param0, u32 param return v0; } -static void * sub_02014204 (u32 param0) +static void *sub_02014204(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[0]; return Particle_LocalAlloc(v0, param0); } -static void * sub_02014230 (u32 param0) +static void *sub_02014230(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[1]; return Particle_LocalAlloc(v0, param0); } -static void * sub_0201425C (u32 param0) +static void *sub_0201425C(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[2]; return Particle_LocalAlloc(v0, param0); } -static void * sub_02014288 (u32 param0) +static void *sub_02014288(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[3]; return Particle_LocalAlloc(v0, param0); } -static void * sub_020142B4 (u32 param0) +static void *sub_020142B4(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[4]; return Particle_LocalAlloc(v0, param0); } -static void * sub_020142E0 (u32 param0) +static void *sub_020142E0(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[5]; return Particle_LocalAlloc(v0, param0); } -static void * sub_0201430C (u32 param0) +static void *sub_0201430C(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[6]; return Particle_LocalAlloc(v0, param0); } -static void * sub_02014338 (u32 param0) +static void *sub_02014338(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[7]; return Particle_LocalAlloc(v0, param0); } -static void * sub_02014364 (u32 param0) +static void *sub_02014364(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[8]; return Particle_LocalAlloc(v0, param0); } -static void * sub_02014390 (u32 param0) +static void *sub_02014390(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[9]; return Particle_LocalAlloc(v0, param0); } -static void * sub_020143BC (u32 param0) +static void *sub_020143BC(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[10]; return Particle_LocalAlloc(v0, param0); } -static void * sub_020143E8 (u32 param0) +static void *sub_020143E8(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[11]; return Particle_LocalAlloc(v0, param0); } -static void * sub_02014414 (u32 param0) +static void *sub_02014414(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[12]; return Particle_LocalAlloc(v0, param0); } -static void * sub_02014440 (u32 param0) +static void *sub_02014440(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[13]; return Particle_LocalAlloc(v0, param0); } -static void * sub_0201446C (u32 param0) +static void *sub_0201446C(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[14]; return Particle_LocalAlloc(v0, param0); } -static void * sub_02014498 (u32 param0) +static void *sub_02014498(u32 param0) { - UnkStruct_02014014 * v0; + UnkStruct_02014014 *v0; v0 = Unk_021BF618[15]; return Particle_LocalAlloc(v0, param0); } -void * sub_020144C4 (int param0, int param1, int param2) +void *sub_020144C4(int param0, int param1, int param2) { return NARC_AllocAndReadWholeMemberByIndexPair(param0, param1, param2); } -void sub_020144CC (UnkStruct_02014014 * param0, void * param1, int param2, int param3) +void sub_020144CC(UnkStruct_02014014 *param0, void *param1, int param2, int param3) { GF_ASSERT(param0->unk_00 != NULL); GF_ASSERT(param0->unk_04 == NULL); @@ -435,7 +429,7 @@ void sub_020144CC (UnkStruct_02014014 * param0, void * param1, int param2, int p } } -static void sub_02014560 (UnkStruct_02014014 * param0) +static void sub_02014560(UnkStruct_02014014 *param0) { SPL_0209C988(param0->unk_00, param0->unk_04); @@ -458,18 +452,18 @@ static void sub_02014560 (UnkStruct_02014014 * param0) } } -static void sub_020145A0 (SysTask * param0, void * param1) +static void sub_020145A0(SysTask *param0, void *param1) { - UnkStruct_02014014 * v0 = param1; + UnkStruct_02014014 *v0 = param1; sub_02014560(v0); SysTask_Done(param0); } -void sub_020145B4 (NNSGfdTexKey param0) +void sub_020145B4(NNSGfdTexKey param0) { int v0; - UnkStruct_02014014 * v1; + UnkStruct_02014014 *v1; GF_ASSERT(param0 != NNS_GFD_ALLOC_ERROR_TEXKEY); GF_ASSERT(Unk_021BF610 != NULL); @@ -485,10 +479,10 @@ void sub_020145B4 (NNSGfdTexKey param0) GF_ASSERT(FALSE); } -void sub_020145F4 (NNSGfdPlttKey param0) +void sub_020145F4(NNSGfdPlttKey param0) { int v0; - UnkStruct_02014014 * v1; + UnkStruct_02014014 *v1; GF_ASSERT(param0 != NNS_GFD_ALLOC_ERROR_PLTTKEY); GF_ASSERT(Unk_021BF610 != NULL); @@ -504,9 +498,9 @@ void sub_020145F4 (NNSGfdPlttKey param0) GF_ASSERT(FALSE); } -void sub_02014638 (UnkStruct_02014014 * param0) +void sub_02014638(UnkStruct_02014014 *param0) { - const MtxFx43 * v0; + const MtxFx43 *v0; if (param0->camera != NULL) { Camera_ComputeProjectionMatrix(param0->unk_DB, param0->camera); @@ -526,12 +520,12 @@ void sub_02014638 (UnkStruct_02014014 * param0) NNS_G3dGlbFlush(); } -void sub_02014674 (UnkStruct_02014014 * param0) +void sub_02014674(UnkStruct_02014014 *param0) { SPL_0209C6A8(param0->unk_00); } -int sub_02014680 (void) +int sub_02014680(void) { int i, count; @@ -544,7 +538,7 @@ int sub_02014680 (void) return count; } -int sub_0201469C (void) +int sub_0201469C(void) { int i, count; @@ -558,7 +552,7 @@ int sub_0201469C (void) return count; } -int sub_020146C0 (void) +int sub_020146C0(void) { int i, count; @@ -572,9 +566,9 @@ int sub_020146C0 (void) return count; } -UnkSPLStruct6 * sub_020146E4 (UnkStruct_02014014 * param0, int param1, const VecFx32 * param2) +UnkSPLStruct6 *sub_020146E4(UnkStruct_02014014 *param0, int param1, const VecFx32 *param2) { - UnkSPLStruct6 * v0; + UnkSPLStruct6 *v0; v0 = SPL_0209C56C(param0->unk_00, param1, param2); param0->unk_08 = v0; @@ -582,9 +576,9 @@ UnkSPLStruct6 * sub_020146E4 (UnkStruct_02014014 * param0, int param1, const Vec return v0; } -UnkSPLStruct6 * sub_020146F4 (UnkStruct_02014014 * param0, int param1, UnkFuncPtr_020146F4 param2, void * param3) +UnkSPLStruct6 *sub_020146F4(UnkStruct_02014014 *param0, int param1, UnkFuncPtr_020146F4 param2, void *param3) { - UnkSPLStruct6 * v0; + UnkSPLStruct6 *v0; Unk_021BF614 = param3; v0 = SPL_0209C4D8(param0->unk_00, param1, param2); @@ -594,68 +588,68 @@ UnkSPLStruct6 * sub_020146F4 (UnkStruct_02014014 * param0, int param1, UnkFuncPt return v0; } -s32 sub_02014710 (UnkStruct_02014014 * param0) +s32 sub_02014710(UnkStruct_02014014 *param0) { return param0->unk_00->unk_04.unk_04; } -void sub_02014718 (UnkStruct_02014014 * param0) +void sub_02014718(UnkStruct_02014014 *param0) { SPL_0209C400(param0->unk_00); } -void sub_02014724 (UnkStruct_02014014 * param0, UnkSPLStruct6 * param1) +void sub_02014724(UnkStruct_02014014 *param0, UnkSPLStruct6 *param1) { SPL_0209C444(param0->unk_00, param1); } -void * sub_02014730 (UnkStruct_02014014 * param0) +void *sub_02014730(UnkStruct_02014014 *param0) { return param0->unk_0C; } -void sub_02014734 (UnkStruct_02014014 * param0, VecFx32 * param1) +void sub_02014734(UnkStruct_02014014 *param0, VecFx32 *param1) { *param1 = param0->unk_40; } -void sub_02014744 (UnkStruct_02014014 * param0, const VecFx32 * param1) +void sub_02014744(UnkStruct_02014014 *param0, const VecFx32 *param1) { param0->unk_40 = *param1; Camera_SetUp(param1, param0->camera); } -void * sub_02014764 (void) +void *sub_02014764(void) { return Unk_021BF614; } -void sub_02014770 (VecFx32 * param0) +void sub_02014770(VecFx32 *param0) { *param0 = Unk_020E5430; } -Camera * sub_02014784 (UnkStruct_02014014 * param0) +Camera *sub_02014784(UnkStruct_02014014 *param0) { return param0->camera; } -void sub_02014788 (UnkStruct_02014014 * param0, int param1) +void sub_02014788(UnkStruct_02014014 *param0, int param1) { param0->unk_DB = param1; } -u8 sub_02014790 (UnkStruct_02014014 * param0) +u8 sub_02014790(UnkStruct_02014014 *param0) { return param0->unk_DB; } -void sub_02014798 (UnkSPLStruct6 * param0, VecFx16 * param1) +void sub_02014798(UnkSPLStruct6 *param0, VecFx16 *param1) { *param1 = param0->unk_C0; } -void sub_020147B0 (UnkSPLStruct6 * param0, fx32 param1) +void sub_020147B0(UnkSPLStruct6 *param0, fx32 param1) { param0->unk_90->unk_00->unk_10 = param1; } @@ -669,11 +663,11 @@ enum { SPL_FLD_TYPE_CONVERGENCE, }; -static const void * sub_020147B8 (UnkSPLStruct6 * param0, int param1) +static const void *sub_020147B8(UnkSPLStruct6 *param0, int param1) { int v0; int v1; - UnkStruct_020147B8 * v2; + UnkStruct_020147B8 *v2; v1 = param0->unk_90->unk_1C; @@ -727,9 +721,9 @@ static const void * sub_020147B8 (UnkSPLStruct6 * param0, int param1) return NULL; } -void sub_02014874 (UnkSPLStruct6 * param0, VecFx16 * param1) +void sub_02014874(UnkSPLStruct6 *param0, VecFx16 *param1) { - UnkStruct_02014874 * v0; + UnkStruct_02014874 *v0; v0 = (UnkStruct_02014874 *)sub_020147B8(param0, SPL_FLD_TYPE_GRAVITY); @@ -740,9 +734,9 @@ void sub_02014874 (UnkSPLStruct6 * param0, VecFx16 * param1) v0->unk_00 = *param1; } -void sub_02014890 (UnkSPLStruct6 * param0, VecFx32 * param1) +void sub_02014890(UnkSPLStruct6 *param0, VecFx32 *param1) { - UnkStruct_02014890 * v0; + UnkStruct_02014890 *v0; v0 = (UnkStruct_02014890 *)sub_020147B8(param0, SPL_FLD_TYPE_MAGNET); @@ -753,14 +747,14 @@ void sub_02014890 (UnkSPLStruct6 * param0, VecFx32 * param1) v0->unk_00 = *param1; } -void sub_020148A8 (UnkSPLStruct6 * param0, VecFx32 * param1) +void sub_020148A8(UnkSPLStruct6 *param0, VecFx32 *param1) { - UnkStruct_02014890 * v0; + UnkStruct_02014890 *v0; v0 = (UnkStruct_02014890 *)sub_020147B8(param0, SPL_FLD_TYPE_MAGNET); if (v0 == NULL) { - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; *param1 = v1; return; } @@ -768,9 +762,9 @@ void sub_020148A8 (UnkSPLStruct6 * param0, VecFx32 * param1) *param1 = v0->unk_00; } -void sub_020148DC (UnkSPLStruct6 * param0, fx16 * param1) +void sub_020148DC(UnkSPLStruct6 *param0, fx16 *param1) { - UnkStruct_02014890 * v0; + UnkStruct_02014890 *v0; v0 = (UnkStruct_02014890 *)sub_020147B8(param0, SPL_FLD_TYPE_MAGNET); @@ -781,9 +775,9 @@ void sub_020148DC (UnkSPLStruct6 * param0, fx16 * param1) v0->unk_0C = *param1; } -void sub_020148F4 (UnkSPLStruct6 * param0, fx16 * param1) +void sub_020148F4(UnkSPLStruct6 *param0, fx16 *param1) { - UnkStruct_02014890 * v0; + UnkStruct_02014890 *v0; v0 = (UnkStruct_02014890 *)sub_020147B8(param0, SPL_FLD_TYPE_MAGNET); @@ -795,9 +789,9 @@ void sub_020148F4 (UnkSPLStruct6 * param0, fx16 * param1) *param1 = v0->unk_0C; } -void sub_02014910 (UnkSPLStruct6 * param0, u16 * param1) +void sub_02014910(UnkSPLStruct6 *param0, u16 *param1) { - UnkStruct_02014910 * v0; + UnkStruct_02014910 *v0; v0 = (UnkStruct_02014910 *)sub_020147B8(param0, SPL_FLD_TYPE_SPIN); @@ -808,9 +802,9 @@ void sub_02014910 (UnkSPLStruct6 * param0, u16 * param1) v0->unk_00 = *param1; } -void sub_02014924 (UnkSPLStruct6 * param0, u16 * param1) +void sub_02014924(UnkSPLStruct6 *param0, u16 *param1) { - UnkStruct_02014910 * v0; + UnkStruct_02014910 *v0; v0 = (UnkStruct_02014910 *)sub_020147B8(param0, SPL_FLD_TYPE_SPIN); @@ -822,9 +816,9 @@ void sub_02014924 (UnkSPLStruct6 * param0, u16 * param1) *param1 = v0->unk_00; } -void sub_02014940 (UnkSPLStruct6 * param0, u16 * param1) +void sub_02014940(UnkSPLStruct6 *param0, u16 *param1) { - UnkStruct_02014910 * v0; + UnkStruct_02014910 *v0; v0 = (UnkStruct_02014910 *)sub_020147B8(param0, SPL_FLD_TYPE_SPIN); @@ -835,9 +829,9 @@ void sub_02014940 (UnkSPLStruct6 * param0, u16 * param1) v0->unk_02 = *param1; } -void sub_02014954 (UnkSPLStruct6 * param0, u16 * param1) +void sub_02014954(UnkSPLStruct6 *param0, u16 *param1) { - UnkStruct_02014910 * v0; + UnkStruct_02014910 *v0; v0 = (UnkStruct_02014910 *)sub_020147B8(param0, SPL_FLD_TYPE_SPIN); @@ -849,9 +843,9 @@ void sub_02014954 (UnkSPLStruct6 * param0, u16 * param1) *param1 = v0->unk_02; } -void sub_02014970 (UnkSPLStruct6 * param0, VecFx32 * param1) +void sub_02014970(UnkSPLStruct6 *param0, VecFx32 *param1) { - UnkStruct_02014970 * v0; + UnkStruct_02014970 *v0; v0 = (UnkStruct_02014970 *)sub_020147B8(param0, SPL_FLD_TYPE_CONVERGENCE); @@ -862,14 +856,14 @@ void sub_02014970 (UnkSPLStruct6 * param0, VecFx32 * param1) v0->unk_00 = *param1; } -void sub_02014988 (UnkSPLStruct6 * param0, VecFx32 * param1) +void sub_02014988(UnkSPLStruct6 *param0, VecFx32 *param1) { - UnkStruct_02014970 * v0; + UnkStruct_02014970 *v0; v0 = (UnkStruct_02014970 *)sub_020147B8(param0, SPL_FLD_TYPE_CONVERGENCE); if (v0 == NULL) { - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; *param1 = v1; return; } @@ -877,9 +871,9 @@ void sub_02014988 (UnkSPLStruct6 * param0, VecFx32 * param1) *param1 = v0->unk_00; } -void sub_020149BC (UnkSPLStruct6 * param0, fx16 * param1) +void sub_020149BC(UnkSPLStruct6 *param0, fx16 *param1) { - UnkStruct_02014970 * v0; + UnkStruct_02014970 *v0; v0 = (UnkStruct_02014970 *)sub_020147B8(param0, SPL_FLD_TYPE_CONVERGENCE); @@ -890,9 +884,9 @@ void sub_020149BC (UnkSPLStruct6 * param0, fx16 * param1) v0->unk_0C = *param1; } -void sub_020149D4 (UnkSPLStruct6 * param0, fx16 * param1) +void sub_020149D4(UnkSPLStruct6 *param0, fx16 *param1) { - UnkStruct_02014970 * v0; + UnkStruct_02014970 *v0; v0 = (UnkStruct_02014970 *)sub_020147B8(param0, SPL_FLD_TYPE_CONVERGENCE); diff --git a/src/unk_020149F0.c b/src/unk_020149F0.c index 65e887afd3..58a3b35836 100644 --- a/src/unk_020149F0.c +++ b/src/unk_020149F0.c @@ -1,29 +1,28 @@ +#include "unk_020149F0.h" + #include #include #include "struct_decls/struct_020149F0_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" -#include "unk_020149F0.h" #include "heap.h" +#include "strbuf.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" struct UnkStruct_020149F0_t { u32 unk_00; - Strbuf* unk_04; + Strbuf *unk_04; }; -UnkStruct_020149F0 * sub_020149F0 (u32 param0) +UnkStruct_020149F0 *sub_020149F0(u32 param0) { static const u16 v0[] = { 0x11f, 0xffff }; - UnkStruct_020149F0 * v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020149F0)); + UnkStruct_020149F0 *v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020149F0)); if (v1) { v1->unk_00 = (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0)); @@ -34,7 +33,7 @@ UnkStruct_020149F0 * sub_020149F0 (u32 param0) return v1; } -void sub_02014A20 (UnkStruct_020149F0 * param0) +void sub_02014A20(UnkStruct_020149F0 *param0) { GF_ASSERT(param0 != NULL); @@ -47,7 +46,7 @@ void sub_02014A20 (UnkStruct_020149F0 * param0) } } -void sub_02014A40 (UnkStruct_020149F0 * param0, u32 param1) +void sub_02014A40(UnkStruct_020149F0 *param0, u32 param1) { GF_ASSERT(param0 != NULL); @@ -56,7 +55,7 @@ void sub_02014A40 (UnkStruct_020149F0 * param0, u32 param1) } } -void sub_02014A58 (const UnkStruct_020149F0 * param0, Window * param1, u32 param2, u32 param3) +void sub_02014A58(const UnkStruct_020149F0 *param0, Window *param1, u32 param2, u32 param3) { sub_0201D78C(param1, 0, param0->unk_04, param2, param3, 0xff, param0->unk_00, NULL); sub_0201ACCC(param1); diff --git a/src/unk_02014A84.c b/src/unk_02014A84.c index 1b197563ca..34ca1ff3e1 100644 --- a/src/unk_02014A84.c +++ b/src/unk_02014A84.c @@ -1,18 +1,16 @@ +#include "unk_02014A84.h" + #include #include -#include "message.h" -#include "strbuf.h" - #include "struct_defs/sentence.h" +#include "charcode.h" #include "message.h" #include "message_util.h" +#include "strbuf.h" #include "string_template.h" -#include "unk_02014A84.h" #include "unk_02014D38.h" -#include "charcode.h" -#include "strbuf.h" static u32 sub_02014C00(u32 param0, u32 param1); @@ -24,7 +22,7 @@ static const u16 Unk_020E5498[] = { 0x1C1 }; -void sub_02014A84 (Sentence * param0) +void sub_02014A84(Sentence *param0) { int v0; @@ -35,7 +33,7 @@ void sub_02014A84 (Sentence * param0) } } -void sub_02014A9C (Sentence * param0, u32 param1) +void sub_02014A9C(Sentence *param0, u32 param1) { int v0; @@ -47,13 +45,13 @@ void sub_02014A9C (Sentence * param0, u32 param1) } } -void sub_02014AB4 (Sentence * param0) +void sub_02014AB4(Sentence *param0) { sub_02014A9C(param0, 4); param0->id = 5; } -void sub_02014AC4 (Sentence * param0, int param1) +void sub_02014AC4(Sentence *param0, int param1) { static const struct { u8 unk_00; @@ -63,10 +61,10 @@ void sub_02014AC4 (Sentence * param0, int param1) s16 unk_06; u16 unk_08; } v0[] = { - {0x0, 0x0, 0x1B7, 0x7, -1, 0x0}, - {0x1, 0x0, 0x1B7, 0x21, -1, 0x0}, - {0x2, 0x0, 0x1BB, 0xA, -1, 0x0}, - {0x1, 0x4, 0x1B7, 0x1, -1, 0x0} + { 0x0, 0x0, 0x1B7, 0x7, -1, 0x0 }, + { 0x1, 0x0, 0x1B7, 0x21, -1, 0x0 }, + { 0x2, 0x0, 0x1BB, 0xA, -1, 0x0 }, + { 0x1, 0x4, 0x1B7, 0x1, -1, 0x0 } }; GF_ASSERT(param1 < NELEMS(v0)); @@ -87,11 +85,11 @@ void sub_02014AC4 (Sentence * param0, int param1) } } -Strbuf* sub_02014B34 (const Sentence * param0, u32 param1) +Strbuf *sub_02014B34(const Sentence *param0, u32 param1) { - Strbuf* v0; - StringTemplate * v1; - MessageLoader * v2; + Strbuf *v0; + StringTemplate *v1; + MessageLoader *v2; int v3; v1 = StringTemplate_Default(param1); @@ -113,17 +111,17 @@ Strbuf* sub_02014B34 (const Sentence * param0, u32 param1) return v0; } -Strbuf* sub_02014BA0 (const Sentence * param0, u32 param1) +Strbuf *sub_02014BA0(const Sentence *param0, u32 param1) { return MessageBank_GetNewStrbufFromNARC(26, Unk_020E5498[param0->type], param0->id, param1); } -BOOL sub_02014BBC (const Sentence * param0) +BOOL sub_02014BBC(const Sentence *param0) { return param0->type != 0xffff; } -BOOL sub_02014BD0 (const Sentence * param0) +BOOL sub_02014BD0(const Sentence *param0) { u32 v0, v1; @@ -138,10 +136,10 @@ BOOL sub_02014BD0 (const Sentence * param0) return 1; } -static u32 sub_02014C00 (u32 param0, u32 param1) +static u32 sub_02014C00(u32 param0, u32 param1) { - Strbuf* v0; - const u16 * v1; + Strbuf *v0; + const u16 *v1; u32 v2; GF_ASSERT(param0 < 5); @@ -167,22 +165,22 @@ static u32 sub_02014C00 (u32 param0, u32 param1) return v2; } -u16 sub_02014C78 (const Sentence * param0, int param1) +u16 sub_02014C78(const Sentence *param0, int param1) { return param0->words[param1]; } -u32 sub_02014C80 (const Sentence * param0) +u32 sub_02014C80(const Sentence *param0) { return param0->type; } -u32 sub_02014C84 (const Sentence * param0) +u32 sub_02014C84(const Sentence *param0) { return param0->id; } -BOOL sub_02014C88 (const Sentence * param0, const Sentence * param1) +BOOL sub_02014C88(const Sentence *param0, const Sentence *param1) { int v0; @@ -199,12 +197,12 @@ BOOL sub_02014C88 (const Sentence * param0, const Sentence * param1) return 1; } -void sub_02014CC0 (Sentence * param0, const Sentence * param1) +void sub_02014CC0(Sentence *param0, const Sentence *param1) { *param0 = *param1; } -u32 sub_02014CD4 (u32 param0) +u32 sub_02014CD4(u32 param0) { if (param0 < NELEMS(Unk_020E5498)) { return 20; @@ -213,7 +211,7 @@ u32 sub_02014CD4 (u32 param0) return 0; } -void sub_02014CE0 (Sentence * param0, u32 param1, u32 param2) +void sub_02014CE0(Sentence *param0, u32 param1, u32 param2) { GF_ASSERT(param1 < 5); @@ -221,13 +219,13 @@ void sub_02014CE0 (Sentence * param0, u32 param1, u32 param2) param0->id = param2; } -void sub_02014CF8 (Sentence * param0, u32 param1, u16 param2) +void sub_02014CF8(Sentence *param0, u32 param1, u16 param2) { GF_ASSERT(param1 < 2); param0->words[param1] = param2; } -void sub_02014D10 (Sentence * param0) +void sub_02014D10(Sentence *param0) { u32 v0, v1; diff --git a/src/unk_02014D38.c b/src/unk_02014D38.c index 1128b9104c..ab22ae0c5b 100644 --- a/src/unk_02014D38.c +++ b/src/unk_02014D38.c @@ -1,128 +1,127 @@ +#include "unk_02014D38.h" + #include #include +#include "heap.h" +#include "message.h" +#include "narc.h" #include "savedata.h" - +#include "strbuf.h" #include "unk_02006E3C.h" -#include "narc.h" -#include "message.h" -#include "unk_02014D38.h" -#include "heap.h" #include "unk_0201D15C.h" -#include "strbuf.h" -#include "savedata.h" static const u16 Unk_020E5522[] = { - 0x1F0, - 0x1D4, - 0x12, - 0x7C, - 0x26, - 0x26, - 0x6B, - 0x68, - 0x2F, - 0x20, - 0x17 + 0x1F0, + 0x1D4, + 0x12, + 0x7C, + 0x26, + 0x26, + 0x6B, + 0x68, + 0x2F, + 0x20, + 0x17 }; static const u16 Unk_020E550C[] = { - 0x19C, - 0x288, - 0x270, - 0x263, - 0x1B7, - 0x1B8, - 0x1B9, - 0x1BA, - 0x1BB, - 0x1BC, - 0x1BD + 0x19C, + 0x288, + 0x270, + 0x263, + 0x1B7, + 0x1B8, + 0x1B9, + 0x1BA, + 0x1BB, + 0x1BC, + 0x1BD }; static const u16 Unk_020E54D8[] = { - 0x441, - 0x599 + 0x441, + 0x599 }; static const u16 Unk_020E54CC[] = { - 0x4C0, - 0x4F0 + 0x4C0, + 0x4F0 }; static const u16 Unk_020E54F4[] = { - 0x4A7, - 0x4E1 + 0x4A7, + 0x4E1 }; static const u16 Unk_020E54F8[] = { - 0x479, - 0x498, - 0x49B, - 0x49C + 0x479, + 0x498, + 0x49B, + 0x49C }; static const u16 Unk_020E54EC[] = { - 0x48F, - 0x497 + 0x48F, + 0x497 }; static const u16 Unk_020E54E8[] = { - 0x4FC, - 0x596 + 0x4FC, + 0x596 }; static const u16 Unk_020E54D4[] = { - 0x4BB, - 0x500 + 0x4BB, + 0x500 }; static const u16 Unk_020E54D0[] = { - 0x24E, - 0x3D2 + 0x24E, + 0x3D2 }; static const u16 Unk_020E54DC[] = { - 0x42C, - 0x59D + 0x42C, + 0x59D }; static const u16 Unk_020E54F0[] = { - 0x4B0, - 0x4FF + 0x4B0, + 0x4FF }; static const u16 Unk_020E54E4[] = { - 0x4B6, - 0x505 + 0x4B6, + 0x505 }; static const u16 Unk_020E54E0[] = { - 0x47A, - 0x48D + 0x47A, + 0x48D }; static const struct { - const u16* unk_00; + const u16 *unk_00; int unk_04; } Unk_020E5538[] = { - { Unk_020E54D8, 0x2 }, - { Unk_020E54CC, 0x2 }, - { Unk_020E54F4, 0x2 }, - { Unk_020E54F8, 0x4 }, - { Unk_020E54EC, 0x2 }, - { Unk_020E54E8, 0x2 }, - { Unk_020E54D4, 0x2 }, - { Unk_020E54D0, 0x2 }, - { Unk_020E54DC, 0x2 }, - { Unk_020E54F0, 0x2 }, - { Unk_020E54E4, 0x2 }, - { Unk_020E54E0, 0x2 } + { Unk_020E54D8, 0x2 }, + { Unk_020E54CC, 0x2 }, + { Unk_020E54F4, 0x2 }, + { Unk_020E54F8, 0x4 }, + { Unk_020E54EC, 0x2 }, + { Unk_020E54E8, 0x2 }, + { Unk_020E54D4, 0x2 }, + { Unk_020E54D0, 0x2 }, + { Unk_020E54DC, 0x2 }, + { Unk_020E54F0, 0x2 }, + { Unk_020E54E4, 0x2 }, + { Unk_020E54E0, 0x2 } }; typedef struct UnkStruct_02014D38_t { u32 unk_00; - MessageLoader * unk_04[11]; + MessageLoader *unk_04[11]; } UnkStruct_02014D38; typedef struct UnkStruct_02014EC4_t { @@ -132,21 +131,21 @@ typedef struct UnkStruct_02014EC4_t { typedef struct UnkStruct_02014FB0_t { u32 unk_00; - u32 * unk_04; + u32 *unk_04; } UnkStruct_02014FB0; void include_unk_020E5538(void); -BOOL sub_02014E4C(u16 param0, u32 * param1, u32 * param2); +BOOL sub_02014E4C(u16 param0, u32 *param1, u32 *param2); -void include_unk_020E5538 (void) +void include_unk_020E5538(void) { Unk_020E5538[0]; } -UnkStruct_02014D38 * sub_02014D38 (u32 param0) +UnkStruct_02014D38 *sub_02014D38(u32 param0) { int v0; - UnkStruct_02014D38 * v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02014D38)); + UnkStruct_02014D38 *v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02014D38)); for (v0 = 0; v0 < 11; v0++) { v1->unk_00 = param0; @@ -156,7 +155,7 @@ UnkStruct_02014D38 * sub_02014D38 (u32 param0) return v1; } -void sub_02014D70 (UnkStruct_02014D38 * param0) +void sub_02014D70(UnkStruct_02014D38 *param0) { int v0; @@ -167,7 +166,7 @@ void sub_02014D70 (UnkStruct_02014D38 * param0) Heap_FreeToHeap(param0); } -void sub_02014D90 (UnkStruct_02014D38 * param0, u16 param1, Strbuf *param2) +void sub_02014D90(UnkStruct_02014D38 *param0, u16 param1, Strbuf *param2) { u32 v0, v1; @@ -175,7 +174,7 @@ void sub_02014D90 (UnkStruct_02014D38 * param0, u16 param1, Strbuf *param2) MessageLoader_GetStrbuf(param0->unk_04[v0], v1, param2); } -void sub_02014DB8 (u16 param0, Strbuf *param1) +void sub_02014DB8(u16 param0, Strbuf *param1) { if (param0 != 0xffff) { u32 v0, v1; @@ -188,7 +187,7 @@ void sub_02014DB8 (u16 param0, Strbuf *param1) } } -u16 sub_02014DFC (u32 param0, u32 param1) +u16 sub_02014DFC(u32 param0, u32 param1) { u32 v0; @@ -207,7 +206,7 @@ u16 sub_02014DFC (u32 param0, u32 param1) return 0xffff; } -BOOL sub_02014E4C (u16 param0, u32 * param1, u32 * param2) +BOOL sub_02014E4C(u16 param0, u32 *param1, u32 *param2) { u32 v0, v1, v2; @@ -227,25 +226,25 @@ BOOL sub_02014E4C (u16 param0, u32 * param1, u32 * param2) return 0; } -u32 Sentence_SaveSize (void) +u32 Sentence_SaveSize(void) { return sizeof(UnkStruct_02014EC4); } -void Sentence_Init (void * param0) +void Sentence_Init(void *param0) { static const struct { u8 unk_00; u8 unk_01; } v0[] = { - {0x1, 0x0}, - {0x2, 0x1}, - {0x3, 0x2}, - {0x4, 0x3}, - {0x5, 0x4}, - {0x7, 0x5} + { 0x1, 0x0 }, + { 0x2, 0x1 }, + { 0x3, 0x2 }, + { 0x4, 0x3 }, + { 0x5, 0x4 }, + { 0x7, 0x5 } }; - UnkStruct_02014EC4 * v1 = param0; + UnkStruct_02014EC4 *v1 = param0; int v2; v1->unk_00 = 0; @@ -261,18 +260,18 @@ void Sentence_Init (void * param0) SaveData_SetChecksum(34); } -UnkStruct_02014EC4 * sub_02014EC4 (SaveData * param0) +UnkStruct_02014EC4 *sub_02014EC4(SaveData *param0) { SaveData_Checksum(34); return SaveData_SaveTable(param0, 34); } -BOOL sub_02014ED8 (const UnkStruct_02014EC4 * param0, u32 param1) +BOOL sub_02014ED8(const UnkStruct_02014EC4 *param0, u32 param1) { return (param0->unk_04 >> param1) & 1; } -u32 sub_02014EE4 (UnkStruct_02014EC4 * param0) +u32 sub_02014EE4(UnkStruct_02014EC4 *param0) { u32 v0, v1; @@ -305,7 +304,7 @@ u32 sub_02014EE4 (UnkStruct_02014EC4 * param0) return 32; } -BOOL sub_02014F48 (UnkStruct_02014EC4 * param0) +BOOL sub_02014F48(UnkStruct_02014EC4 *param0) { u32 v0; @@ -318,7 +317,7 @@ BOOL sub_02014F48 (UnkStruct_02014EC4 * param0) return 1; } -u16 sub_02014F64 (u32 param0) +u16 sub_02014F64(u32 param0) { int v0; u16 v1 = 0; @@ -330,21 +329,21 @@ u16 sub_02014F64 (u32 param0) return v1 + param0; } -BOOL sub_02014F8C (const UnkStruct_02014EC4 * param0, int param1) +BOOL sub_02014F8C(const UnkStruct_02014EC4 *param0, int param1) { return (param0->unk_00 >> param1) & 1; } -void sub_02014F98 (UnkStruct_02014EC4 * param0, int param1) +void sub_02014F98(UnkStruct_02014EC4 *param0, int param1) { param0->unk_00 |= (1 << param1); SaveData_SetChecksum(34); } -UnkStruct_02014FB0 * sub_02014FB0 (u32 param0) +UnkStruct_02014FB0 *sub_02014FB0(u32 param0) { - UnkStruct_02014FB0 * v0; + UnkStruct_02014FB0 *v0; u32 v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02014FB0)); @@ -356,19 +355,19 @@ UnkStruct_02014FB0 * sub_02014FB0 (u32 param0) return v0; } -void sub_02014FF0 (UnkStruct_02014FB0 * param0) +void sub_02014FF0(UnkStruct_02014FB0 *param0) { Heap_FreeToHeap(param0->unk_04); Heap_FreeToHeap(param0); } -u32 sub_02015004 (const UnkStruct_02014FB0 * param0) +u32 sub_02015004(const UnkStruct_02014FB0 *param0) { return param0->unk_00; } -u16 sub_02015008 (const UnkStruct_02014FB0 * param0, u32 param1) +u16 sub_02015008(const UnkStruct_02014FB0 *param0, u32 param1) { GF_ASSERT(param0); @@ -379,7 +378,7 @@ u16 sub_02015008 (const UnkStruct_02014FB0 * param0, u32 param1) return param0->unk_04[param1]; } -s16 sub_02015030 (const UnkStruct_02014FB0 * param0, u16 param1) +s16 sub_02015030(const UnkStruct_02014FB0 *param0, u16 param1) { int v0; diff --git a/src/unk_02015064.c b/src/unk_02015064.c index 2d3ceb66f0..6895755f97 100644 --- a/src/unk_02015064.c +++ b/src/unk_02015064.c @@ -1,3 +1,5 @@ +#include "unk_02015064.h" + #include #include @@ -6,7 +8,6 @@ #include "overlay022/struct_ov22_022557A0.h" #include "overlay022/struct_ov22_02255800.h" -#include "unk_02015064.h" #include "heap.h" typedef struct UnkStruct_02015128_t { @@ -29,7 +30,7 @@ typedef struct UnkStruct_02015214_t { int unk_18; BOOL unk_1C; BOOL unk_20; - NNSG2dImageAttr * unk_24; + NNSG2dImageAttr *unk_24; u32 unk_28; u32 unk_2C; u32 unk_30; @@ -40,33 +41,33 @@ typedef struct UnkStruct_02015214_t { } UnkStruct_02015214; typedef struct UnkStruct_02015064_t { - UnkStruct_02015214 * unk_00; + UnkStruct_02015214 *unk_00; int unk_04; - UnkStruct_02015128 * unk_08; + UnkStruct_02015128 *unk_08; int unk_0C; - UnkStruct_020151A4 * unk_10; + UnkStruct_020151A4 *unk_10; int unk_14; } UnkStruct_02015064; -static void sub_020152C0(UnkStruct_02015214 * param0); -static void sub_020152E0(UnkStruct_02015128 * param0); -static void sub_020152EC(UnkStruct_020151A4 * param0); -static void sub_02015468(UnkStruct_02015214 * param0); -static UnkStruct_02015214 * sub_020152F8(int param0, int param1); -static UnkStruct_02015128 * sub_02015328(int param0, int param1); -static UnkStruct_020151A4 * sub_02015358(int param0, int param1); -static UnkStruct_02015214 * sub_02015388(UnkStruct_02015064 * param0); -static UnkStruct_02015128 * sub_020153B4(UnkStruct_02015064 * param0); -static UnkStruct_020151A4 * sub_020153E0(UnkStruct_02015064 * param0); -static NNSGfdTexKey sub_0201540C(NNSG2dCharacterData * param0); +static void sub_020152C0(UnkStruct_02015214 *param0); +static void sub_020152E0(UnkStruct_02015128 *param0); +static void sub_020152EC(UnkStruct_020151A4 *param0); +static void sub_02015468(UnkStruct_02015214 *param0); +static UnkStruct_02015214 *sub_020152F8(int param0, int param1); +static UnkStruct_02015128 *sub_02015328(int param0, int param1); +static UnkStruct_020151A4 *sub_02015358(int param0, int param1); +static UnkStruct_02015214 *sub_02015388(UnkStruct_02015064 *param0); +static UnkStruct_02015128 *sub_020153B4(UnkStruct_02015064 *param0); +static UnkStruct_020151A4 *sub_020153E0(UnkStruct_02015064 *param0); +static NNSGfdTexKey sub_0201540C(NNSG2dCharacterData *param0); static NNSGfdPlttKey sub_02015420(int param0); -static void sub_02015434(NNSG2dCharacterData * param0, NNSGfdTexKey param1, NNSG2dImageProxy * param2); -static void sub_02015444(NNSG2dPaletteData * param0, NNSGfdPlttKey param1, NNSG2dImagePaletteProxy * param2); -static void sub_020155A8(UnkStruct_02015214 * param0, const UnkStruct_ov21_021E7F40 * param1); +static void sub_02015434(NNSG2dCharacterData *param0, NNSGfdTexKey param1, NNSG2dImageProxy *param2); +static void sub_02015444(NNSG2dPaletteData *param0, NNSGfdPlttKey param1, NNSG2dImagePaletteProxy *param2); +static void sub_020155A8(UnkStruct_02015214 *param0, const UnkStruct_ov21_021E7F40 *param1); -UnkStruct_02015064 * sub_02015064 (const UnkStruct_ov22_022550D4 * param0) +UnkStruct_02015064 *sub_02015064(const UnkStruct_ov22_022550D4 *param0) { - UnkStruct_02015064 * v0; + UnkStruct_02015064 *v0; int v1; v0 = Heap_AllocFromHeap(param0->unk_0C, sizeof(UnkStruct_02015064)); @@ -82,7 +83,7 @@ UnkStruct_02015064 * sub_02015064 (const UnkStruct_ov22_022550D4 * param0) return v0; } -void sub_020150A8 (UnkStruct_02015064 * param0) +void sub_020150A8(UnkStruct_02015064 *param0) { GF_ASSERT(param0); GF_ASSERT(param0->unk_00); @@ -97,7 +98,7 @@ void sub_020150A8 (UnkStruct_02015064 * param0) param0 = NULL; } -void sub_020150EC (UnkStruct_02015064 * param0) +void sub_020150EC(UnkStruct_02015064 *param0) { int v0; @@ -112,9 +113,9 @@ void sub_020150EC (UnkStruct_02015064 * param0) G3_PopMtx(1); } -UnkStruct_02015128 * sub_02015128 (const UnkStruct_ov22_022557A0 * param0) +UnkStruct_02015128 *sub_02015128(const UnkStruct_ov22_022557A0 *param0) { - UnkStruct_02015128 * v0; + UnkStruct_02015128 *v0; v0 = sub_020153B4(param0->unk_00); @@ -129,13 +130,13 @@ UnkStruct_02015128 * sub_02015128 (const UnkStruct_ov22_022557A0 * param0) return v0; } -void sub_02015164 (UnkStruct_02015128 * param0) +void sub_02015164(UnkStruct_02015128 *param0) { NNS_GfdFreeTexVram(param0->unk_00); sub_020152E0(param0); } -void sub_0201517C (UnkStruct_02015064 * param0) +void sub_0201517C(UnkStruct_02015064 *param0) { int v0; @@ -146,9 +147,9 @@ void sub_0201517C (UnkStruct_02015064 * param0) } } -UnkStruct_020151A4 * sub_020151A4 (const UnkStruct_ov22_02255800 * param0) +UnkStruct_020151A4 *sub_020151A4(const UnkStruct_ov22_02255800 *param0) { - UnkStruct_020151A4 * v0; + UnkStruct_020151A4 *v0; v0 = sub_020153E0(param0->unk_00); GF_ASSERT(v0); @@ -161,13 +162,13 @@ UnkStruct_020151A4 * sub_020151A4 (const UnkStruct_ov22_02255800 * param0) return v0; } -void sub_020151D4 (UnkStruct_020151A4 * param0) +void sub_020151D4(UnkStruct_020151A4 *param0) { NNS_GfdFreePlttVram(param0->unk_00); sub_020152EC(param0); } -void sub_020151EC (UnkStruct_02015064 * param0) +void sub_020151EC(UnkStruct_02015064 *param0) { int v0; @@ -178,9 +179,9 @@ void sub_020151EC (UnkStruct_02015064 * param0) } } -UnkStruct_02015214 * sub_02015214 (const UnkStruct_ov21_021E7F40 * param0) +UnkStruct_02015214 *sub_02015214(const UnkStruct_ov21_021E7F40 *param0) { - UnkStruct_02015214 * v0; + UnkStruct_02015214 *v0; v0 = sub_02015388(param0->unk_00); GF_ASSERT(v0); @@ -193,92 +194,92 @@ UnkStruct_02015214 * sub_02015214 (const UnkStruct_ov21_021E7F40 * param0) return v0; } -void sub_02015238 (UnkStruct_02015214 * param0) +void sub_02015238(UnkStruct_02015214 *param0) { sub_020152C0(param0); } -void sub_02015240 (UnkStruct_02015214 * param0, BOOL param1) +void sub_02015240(UnkStruct_02015214 *param0, BOOL param1) { GF_ASSERT(param0); param0->unk_20 = param1; } -void sub_02015254 (UnkStruct_02015214 * param0, s16 param1, s16 param2) +void sub_02015254(UnkStruct_02015214 *param0, s16 param1, s16 param2) { param0->unk_00.x = param1; param0->unk_00.y = param2; } -NNSG2dSVec2 sub_0201525C (UnkStruct_02015214 * param0) +NNSG2dSVec2 sub_0201525C(UnkStruct_02015214 *param0) { return param0->unk_00; } -void sub_02015268 (UnkStruct_02015214 * param0, s16 param1, s16 param2) +void sub_02015268(UnkStruct_02015214 *param0, s16 param1, s16 param2) { param0->unk_04.x = param1; param0->unk_04.y = param2; } -void sub_02015270 (UnkStruct_02015214 * param0, fx32 param1, fx32 param2) +void sub_02015270(UnkStruct_02015214 *param0, fx32 param1, fx32 param2) { param0->unk_0C = param1; param0->unk_10 = param2; } -void sub_02015278 (UnkStruct_02015214 * param0, int param1, int param2) +void sub_02015278(UnkStruct_02015214 *param0, int param1, int param2) { param0->unk_08.x = param1; param0->unk_08.y = param2; } -NNSG2dSVec2 sub_02015280 (UnkStruct_02015214 * param0) +NNSG2dSVec2 sub_02015280(UnkStruct_02015214 *param0) { return param0->unk_08; } -void sub_0201528C (UnkStruct_02015214 * param0, int param1) +void sub_0201528C(UnkStruct_02015214 *param0, int param1) { param0->unk_14 = param1; } -int sub_02015290 (UnkStruct_02015214 * param0) +int sub_02015290(UnkStruct_02015214 *param0) { return param0->unk_14; } -void sub_02015294 (UnkStruct_02015214 * param0, u8 param1) +void sub_02015294(UnkStruct_02015214 *param0, u8 param1) { param0->unk_3E = param1; } -void sub_0201529C (UnkStruct_02015214 * param0, GXRgb param1) +void sub_0201529C(UnkStruct_02015214 *param0, GXRgb param1) { param0->unk_3C = param1; } -void sub_020152A0 (UnkStruct_02015214 * param0, NNSG2dImageAttr * param1) +void sub_020152A0(UnkStruct_02015214 *param0, NNSG2dImageAttr *param1) { param0->unk_24 = param1; } -void sub_020152A4 (UnkStruct_02015214 * param0, u32 param1) +void sub_020152A4(UnkStruct_02015214 *param0, u32 param1) { param0->unk_28 = param1; } -void sub_020152A8 (UnkStruct_02015214 * param0, u32 param1) +void sub_020152A8(UnkStruct_02015214 *param0, u32 param1) { param0->unk_2C = param1; } -void sub_020152AC (UnkStruct_02015214 * param0, u32 param1) +void sub_020152AC(UnkStruct_02015214 *param0, u32 param1) { param0->unk_30 = param1; } -void sub_020152B0 (UnkStruct_02015214 * param0, int param1, BOOL param2) +void sub_020152B0(UnkStruct_02015214 *param0, int param1, BOOL param2) { if (param1 == 0) { param0->unk_34 = param2; @@ -287,12 +288,12 @@ void sub_020152B0 (UnkStruct_02015214 * param0, int param1, BOOL param2) } } -void sub_020152BC (UnkStruct_02015214 * param0, u16 param1) +void sub_020152BC(UnkStruct_02015214 *param0, u16 param1) { param0->unk_18 = param1; } -static void sub_020152C0 (UnkStruct_02015214 * param0) +static void sub_020152C0(UnkStruct_02015214 *param0) { memset(param0, 0, sizeof(UnkStruct_02015214)); @@ -300,21 +301,21 @@ static void sub_020152C0 (UnkStruct_02015214 * param0) param0->unk_3C = GX_RGB(31, 31, 31); } -static void sub_020152E0 (UnkStruct_02015128 * param0) +static void sub_020152E0(UnkStruct_02015128 *param0) { param0->unk_00 = 0; NNS_G2dInitImageProxy(¶m0->unk_04); } -static void sub_020152EC (UnkStruct_020151A4 * param0) +static void sub_020152EC(UnkStruct_020151A4 *param0) { param0->unk_00 = 0; NNS_G2dInitImagePaletteProxy(¶m0->unk_04); } -static UnkStruct_02015214 * sub_020152F8 (int param0, int param1) +static UnkStruct_02015214 *sub_020152F8(int param0, int param1) { - UnkStruct_02015214 * v0; + UnkStruct_02015214 *v0; int v1; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02015214) * param0); @@ -327,9 +328,9 @@ static UnkStruct_02015214 * sub_020152F8 (int param0, int param1) return v0; } -static UnkStruct_02015128 * sub_02015328 (int param0, int param1) +static UnkStruct_02015128 *sub_02015328(int param0, int param1) { - UnkStruct_02015128 * v0; + UnkStruct_02015128 *v0; int v1; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02015128) * param0); @@ -342,9 +343,9 @@ static UnkStruct_02015128 * sub_02015328 (int param0, int param1) return v0; } -static UnkStruct_020151A4 * sub_02015358 (int param0, int param1) +static UnkStruct_020151A4 *sub_02015358(int param0, int param1) { - UnkStruct_020151A4 * v0; + UnkStruct_020151A4 *v0; int v1; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_020151A4) * param0); @@ -357,7 +358,7 @@ static UnkStruct_020151A4 * sub_02015358 (int param0, int param1) return v0; } -static UnkStruct_02015214 * sub_02015388 (UnkStruct_02015064 * param0) +static UnkStruct_02015214 *sub_02015388(UnkStruct_02015064 *param0) { int v0; @@ -370,7 +371,7 @@ static UnkStruct_02015214 * sub_02015388 (UnkStruct_02015064 * param0) return NULL; } -static UnkStruct_02015128 * sub_020153B4 (UnkStruct_02015064 * param0) +static UnkStruct_02015128 *sub_020153B4(UnkStruct_02015064 *param0) { int v0; @@ -383,7 +384,7 @@ static UnkStruct_02015128 * sub_020153B4 (UnkStruct_02015064 * param0) return NULL; } -static UnkStruct_020151A4 * sub_020153E0 (UnkStruct_02015064 * param0) +static UnkStruct_020151A4 *sub_020153E0(UnkStruct_02015064 *param0) { int v0; @@ -396,22 +397,22 @@ static UnkStruct_020151A4 * sub_020153E0 (UnkStruct_02015064 * param0) return NULL; } -static NNSGfdTexKey sub_0201540C (NNSG2dCharacterData * param0) +static NNSGfdTexKey sub_0201540C(NNSG2dCharacterData *param0) { return NNS_GfdAllocTexVram(param0->szByte, 0, 0); } -static NNSGfdPlttKey sub_02015420 (int param0) +static NNSGfdPlttKey sub_02015420(int param0) { return NNS_GfdAllocPlttVram(param0 * 32, 0, 0); } -static void sub_02015434 (NNSG2dCharacterData * param0, NNSGfdTexKey param1, NNSG2dImageProxy * param2) +static void sub_02015434(NNSG2dCharacterData *param0, NNSGfdTexKey param1, NNSG2dImageProxy *param2) { NNS_G2dLoadImage2DMapping(param0, NNS_GfdGetTexKeyAddr(param1), NNS_G2D_VRAM_TYPE_3DMAIN, param2); } -static void sub_02015444 (NNSG2dPaletteData * param0, NNSGfdPlttKey param1, NNSG2dImagePaletteProxy * param2) +static void sub_02015444(NNSG2dPaletteData *param0, NNSGfdPlttKey param1, NNSG2dImagePaletteProxy *param2) { int v0; @@ -422,7 +423,7 @@ static void sub_02015444 (NNSG2dPaletteData * param0, NNSGfdPlttKey param1, NNSG param0->szByte = v0; } -static void sub_02015468 (UnkStruct_02015214 * param0) +static void sub_02015468(UnkStruct_02015214 *param0) { NNSG2dSVec2 v0, v1; @@ -457,7 +458,7 @@ static void sub_02015468 (UnkStruct_02015214 * param0) G3_PopMtx(1); } -static void sub_020155A8 (UnkStruct_02015214 * param0, const UnkStruct_ov21_021E7F40 * param1) +static void sub_020155A8(UnkStruct_02015214 *param0, const UnkStruct_ov21_021E7F40 *param1) { int v0; int v1, v2; diff --git a/src/unk_0201567C.c b/src/unk_0201567C.c index 7b3eee45c2..acf5500310 100644 --- a/src/unk_0201567C.c +++ b/src/unk_0201567C.c @@ -1,21 +1,22 @@ +#include "unk_0201567C.h" + #include #include #include "struct_decls/struct_02002F38_decl.h" +#include "sys_task_manager.h" #include "unk_02002F38.h" #include "unk_0200679C.h" -#include "unk_0201567C.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_020241F0.h" -typedef void (* UnkFuncPtr_020157E4)(void *, u16 *); +typedef void (*UnkFuncPtr_020157E4)(void *, u16 *); typedef struct { - SysTask * unk_00; + SysTask *unk_00; UnkFuncPtr_020157E4 unk_04; - PaletteData * unk_08; + PaletteData *unk_08; u16 unk_0C[16]; u16 unk_2C[16]; u8 unk_4C; @@ -24,18 +25,18 @@ typedef struct { u8 unk_4F; } UnkStruct_020157E4; -static void sub_0201576C(SysTask * param0, void * param1); -static u8 sub_020157E4(UnkStruct_020157E4 * param0); -static void sub_02015840(void * param0, u16 * param1); -static void sub_02015858(void * param0, u16 * param1); -static void sub_02015870(void * param0, u16 * param1); -static void sub_0201588C(void * param0, u16 * param1); +static void sub_0201576C(SysTask *param0, void *param1); +static u8 sub_020157E4(UnkStruct_020157E4 *param0); +static void sub_02015840(void *param0, u16 *param1); +static void sub_02015858(void *param0, u16 *param1); +static void sub_02015870(void *param0, u16 *param1); +static void sub_0201588C(void *param0, u16 *param1); -void * sub_0201567C (PaletteData * param0, u16 param1, u16 param2, u32 param3) +void *sub_0201567C(PaletteData *param0, u16 param1, u16 param2, u32 param3) { - UnkStruct_020157E4 * v0; - SysTask * v1; - u16 * v2; + UnkStruct_020157E4 *v0; + SysTask *v1; + u16 *v2; v1 = SysTask_StartAndAllocateParam(sub_0201576C, sizeof(UnkStruct_020157E4), 0, param3); v0 = (UnkStruct_020157E4 *)SysTask_GetParam(v1); @@ -71,9 +72,9 @@ void * sub_0201567C (PaletteData * param0, u16 param1, u16 param2, u32 param3) return v0; } -void sub_02015738 (void * param0, u8 param1) +void sub_02015738(void *param0, u8 param1) { - UnkStruct_020157E4 * v0 = (UnkStruct_020157E4 *)param0; + UnkStruct_020157E4 *v0 = (UnkStruct_020157E4 *)param0; switch (param1) { case 0: @@ -87,15 +88,15 @@ void sub_02015738 (void * param0, u8 param1) } } -void sub_02015760 (void * param0) +void sub_02015760(void *param0) { - UnkStruct_020157E4 * v0 = (UnkStruct_020157E4 *)param0; + UnkStruct_020157E4 *v0 = (UnkStruct_020157E4 *)param0; SysTask_FinishAndFreeParam(v0->unk_00); } -static void sub_0201576C (SysTask * param0, void * param1) +static void sub_0201576C(SysTask *param0, void *param1) { - UnkStruct_020157E4 * v0 = (UnkStruct_020157E4 *)param1; + UnkStruct_020157E4 *v0 = (UnkStruct_020157E4 *)param1; switch (v0->unk_4E) { case 0: @@ -121,7 +122,7 @@ static void sub_0201576C (SysTask * param0, void * param1) } } -static u8 sub_020157E4 (UnkStruct_020157E4 * param0) +static u8 sub_020157E4(UnkStruct_020157E4 *param0) { u32 v0; @@ -150,26 +151,26 @@ static u8 sub_020157E4 (UnkStruct_020157E4 * param0) return 0; } -static void sub_02015840 (void * param0, u16 * param1) +static void sub_02015840(void *param0, u16 *param1) { - UnkStruct_020157E4 * v0 = (UnkStruct_020157E4 *)param0; + UnkStruct_020157E4 *v0 = (UnkStruct_020157E4 *)param0; sub_0201972C(0, param1, 0x20, v0->unk_4D * 0x20); } -static void sub_02015858 (void * param0, u16 * param1) +static void sub_02015858(void *param0, u16 *param1) { - UnkStruct_020157E4 * v0 = (UnkStruct_020157E4 *)param0; + UnkStruct_020157E4 *v0 = (UnkStruct_020157E4 *)param0; sub_0201972C(4, param1, 0x20, v0->unk_4D * 0x20); } -static void sub_02015870 (void * param0, u16 * param1) +static void sub_02015870(void *param0, u16 *param1) { - UnkStruct_020157E4 * v0 = (UnkStruct_020157E4 *)param0; + UnkStruct_020157E4 *v0 = (UnkStruct_020157E4 *)param0; sub_02002FBC(v0->unk_08, param1, 0, v0->unk_4D * 16, 0x20); } -static void sub_0201588C (void * param0, u16 * param1) +static void sub_0201588C(void *param0, u16 *param1) { - UnkStruct_020157E4 * v0 = (UnkStruct_020157E4 *)param0; + UnkStruct_020157E4 *v0 = (UnkStruct_020157E4 *)param0; sub_02002FBC(v0->unk_08, param1, 1, v0->unk_4D * 16, 0x20); } diff --git a/src/unk_020158A8.c b/src/unk_020158A8.c index 8de697dac9..359cc9110c 100644 --- a/src/unk_020158A8.c +++ b/src/unk_020158A8.c @@ -1,18 +1,17 @@ +#include "unk_020158A8.h" + #include #include -#include "strbuf.h" - #include "struct_defs/struct_020158A8.h" -#include "message.h" -#include "unk_020158A8.h" #include "heap.h" +#include "message.h" #include "strbuf.h" -UnkStruct_020158A8 * sub_020158A8 (int param0) +UnkStruct_020158A8 *sub_020158A8(int param0) { - UnkStruct_020158A8 * v0; + UnkStruct_020158A8 *v0; int v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020158A8)); @@ -28,7 +27,7 @@ UnkStruct_020158A8 * sub_020158A8 (int param0) return v0; } -void sub_020158F4 (UnkStruct_020158A8 * param0) +void sub_020158F4(UnkStruct_020158A8 *param0) { int v0; @@ -40,7 +39,7 @@ void sub_020158F4 (UnkStruct_020158A8 * param0) Heap_FreeToHeap(param0); } -const Strbuf* sub_02015918 (UnkStruct_020158A8 * param0, int param1) +const Strbuf *sub_02015918(UnkStruct_020158A8 *param0, int param1) { return (const Strbuf *)param0->unk_04[param1]; } diff --git a/src/unk_02015920.c b/src/unk_02015920.c index a04696b6a2..223cd1282a 100644 --- a/src/unk_02015920.c +++ b/src/unk_02015920.c @@ -1,45 +1,45 @@ +#include "unk_02015920.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" #include "struct_decls/struct_02023FCC_decl.h" - #include "struct_defs/struct_02015958.h" -#include "touch_screen.h" +#include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_02006E3C.h" -#include "sys_task.h" -#include "unk_02015920.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_02023FCC.h" typedef struct { - const fx32 * unk_00; + const fx32 *unk_00; u32 unk_04; fx32 unk_08; } UnkStruct_02015D8C; typedef struct { - BGL * unk_00; + BGL *unk_00; u32 unk_04; u32 unk_08; u32 unk_0C[4]; u32 unk_1C; u32 unk_20; - const fx32 * unk_24; + const fx32 *unk_24; u32 unk_28; u8 unk_2C; u8 unk_2D; } UnkStruct_02015B14; typedef struct { - BGL * unk_00; + BGL *unk_00; u32 unk_04; - void * unk_08[4]; - NNSG2dScreenData * unk_18[4]; + void *unk_08[4]; + NNSG2dScreenData *unk_18[4]; UnkStruct_02015D8C unk_28; u8 unk_34; u8 unk_35; @@ -48,26 +48,26 @@ typedef struct { } UnkStruct_02015C38; typedef struct { - BGL * unk_00; - NNSG2dCharacterData * unk_04; - void * unk_08; + BGL *unk_00; + NNSG2dCharacterData *unk_04; + void *unk_08; int unk_0C; int unk_10; } UnkStruct_02015DCC; typedef struct { - NNSG2dPaletteData * unk_00; - void * unk_04; + NNSG2dPaletteData *unk_00; + void *unk_04; int unk_08; int unk_0C; int unk_10; } UnkStruct_02015E1C; typedef struct UnkStruct_02015920_t { - UnkStruct_02023FCC * unk_00; + UnkStruct_02023FCC *unk_00; TouchScreenHitTable unk_04[2]; UnkStruct_02015C38 unk_0C[2]; - BGL * unk_7C; + BGL *unk_7C; u32 unk_80; u32 unk_84; fx32 unk_88[4]; @@ -78,30 +78,30 @@ typedef struct UnkStruct_02015920_t { u8 unk_9B_4 : 4; } UnkStruct_02015920; -static void sub_02015A80(UnkStruct_02015920 * param0, u32 param1); -static void sub_02015AC0(UnkStruct_02015920 * param0, const UnkStruct_02015958 * param1); -static void sub_02015AE4(UnkStruct_02015920 * param0, const UnkStruct_02015958 * param1); -static void sub_02015B14(UnkStruct_02015920 * param0, const UnkStruct_02015958 * param1); -static void sub_02015BA4(UnkStruct_02015920 * param0, const UnkStruct_02015958 * param1); -static void sub_02015C08(u32 param0, u32 param1, void * param2); -static void sub_02015C38(UnkStruct_02015C38 * param0, const UnkStruct_02015B14 * param1, u32 param2); -static BOOL sub_02015CC0(UnkStruct_02015C38 * param0); -static void sub_02015D00(UnkStruct_02015C38 * param0); -static void sub_02015D60(UnkStruct_02015C38 * param0); -static void sub_02015D8C(UnkStruct_02015D8C * param0, const fx32 * param1, u32 param2); -static void sub_02015D98(UnkStruct_02015D8C * param0, fx32 param1); -static u32 sub_02015DA0(const UnkStruct_02015D8C * param0); -static void sub_02015DCC(u32 param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5); +static void sub_02015A80(UnkStruct_02015920 *param0, u32 param1); +static void sub_02015AC0(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); +static void sub_02015AE4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); +static void sub_02015B14(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); +static void sub_02015BA4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1); +static void sub_02015C08(u32 param0, u32 param1, void *param2); +static void sub_02015C38(UnkStruct_02015C38 *param0, const UnkStruct_02015B14 *param1, u32 param2); +static BOOL sub_02015CC0(UnkStruct_02015C38 *param0); +static void sub_02015D00(UnkStruct_02015C38 *param0); +static void sub_02015D60(UnkStruct_02015C38 *param0); +static void sub_02015D8C(UnkStruct_02015D8C *param0, const fx32 *param1, u32 param2); +static void sub_02015D98(UnkStruct_02015D8C *param0, fx32 param1); +static u32 sub_02015DA0(const UnkStruct_02015D8C *param0); +static void sub_02015DCC(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5); static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5); -static void sub_02015E64(SysTask * param0, void * param1); -static void sub_02015EA0(SysTask * param0, void * param1); -static void sub_02015EE8(BGL * param0, int param1, const NNSG2dScreenData * param2, int param3, int param4); -static void sub_02015F34(const NNSG2dScreenData * param0, int param1); -static void sub_02015F54(const NNSG2dScreenData * param0, int param1); +static void sub_02015E64(SysTask *param0, void *param1); +static void sub_02015EA0(SysTask *param0, void *param1); +static void sub_02015EE8(BGL *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4); +static void sub_02015F34(const NNSG2dScreenData *param0, int param1); +static void sub_02015F54(const NNSG2dScreenData *param0, int param1); -UnkStruct_02015920 * sub_02015920 (u32 param0) +UnkStruct_02015920 *sub_02015920(u32 param0) { - UnkStruct_02015920 * v0; + UnkStruct_02015920 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02015920)); sub_02015A80(v0, param0); @@ -109,7 +109,7 @@ UnkStruct_02015920 * sub_02015920 (u32 param0) return v0; } -void sub_02015938 (UnkStruct_02015920 * param0) +void sub_02015938(UnkStruct_02015920 *param0) { if (param0->unk_9B_0 == 1) { sub_02015A54(param0); @@ -118,7 +118,7 @@ void sub_02015938 (UnkStruct_02015920 * param0) Heap_FreeToHeap(param0); } -void sub_02015958 (UnkStruct_02015920 * param0, const UnkStruct_02015958 * param1) +void sub_02015958(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1) { param0->unk_7C = param1->unk_00; param0->unk_80 = param1->unk_04; @@ -134,7 +134,7 @@ void sub_02015958 (UnkStruct_02015920 * param0, const UnkStruct_02015958 * param param0->unk_9B_4 = 0x8; } -u32 sub_020159C0 (UnkStruct_02015920 * param0) +u32 sub_020159C0(UnkStruct_02015920 *param0) { u32 v0; @@ -155,7 +155,7 @@ u32 sub_020159C0 (UnkStruct_02015920 * param0) return v0; } -u32 sub_020159FC (UnkStruct_02015920 * param0) +u32 sub_020159FC(UnkStruct_02015920 *param0) { BOOL v0; @@ -182,7 +182,7 @@ u32 sub_020159FC (UnkStruct_02015920 * param0) return 0; } -void sub_02015A54 (UnkStruct_02015920 * param0) +void sub_02015A54(UnkStruct_02015920 *param0) { int v0; @@ -195,7 +195,7 @@ void sub_02015A54 (UnkStruct_02015920 * param0) sub_02015A80(param0, param0->unk_84); } -static void sub_02015A80 (UnkStruct_02015920 * param0, u32 param1) +static void sub_02015A80(UnkStruct_02015920 *param0, u32 param1) { memset(param0, 0, sizeof(UnkStruct_02015920)); @@ -205,12 +205,12 @@ static void sub_02015A80 (UnkStruct_02015920 * param0, u32 param1) param0->unk_9B_4 = 0x8; } -static void sub_02015AC0 (UnkStruct_02015920 * param0, const UnkStruct_02015958 * param1) +static void sub_02015AC0(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1) { sub_02015DCC(84, 1, param0->unk_7C, param0->unk_80, param1->unk_08, param0->unk_84); } -static void sub_02015AE4 (UnkStruct_02015920 * param0, const UnkStruct_02015958 * param1) +static void sub_02015AE4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1) { u32 v0; @@ -223,7 +223,7 @@ static void sub_02015AE4 (UnkStruct_02015920 * param0, const UnkStruct_02015958 sub_02015E1C(84, 0, v0, param1->unk_0C * 32, 2 * 32, param0->unk_84); } -static void sub_02015B14 (UnkStruct_02015920 * param0, const UnkStruct_02015958 * param1) +static void sub_02015B14(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1) { int v0, v1; UnkStruct_02015B14 v2; @@ -253,7 +253,7 @@ static void sub_02015B14 (UnkStruct_02015920 * param0, const UnkStruct_02015958 } } -static void sub_02015BA4 (UnkStruct_02015920 * param0, const UnkStruct_02015958 * param1) +static void sub_02015BA4(UnkStruct_02015920 *param0, const UnkStruct_02015958 *param1) { int v0; @@ -267,9 +267,9 @@ static void sub_02015BA4 (UnkStruct_02015920 * param0, const UnkStruct_02015958 param0->unk_00 = sub_02023FCC(param0->unk_04, 2, sub_02015C08, param0, param0->unk_84); } -static void sub_02015C08 (u32 param0, u32 param1, void * param2) +static void sub_02015C08(u32 param0, u32 param1, void *param2) { - UnkStruct_02015920 * v0 = param2; + UnkStruct_02015920 *v0 = param2; v0->unk_9B_4 = param1; @@ -280,7 +280,7 @@ static void sub_02015C08 (u32 param0, u32 param1, void * param2) } } -static void sub_02015C38 (UnkStruct_02015C38 * param0, const UnkStruct_02015B14 * param1, u32 param2) +static void sub_02015C38(UnkStruct_02015C38 *param0, const UnkStruct_02015B14 *param1, u32 param2) { int v0; @@ -302,7 +302,7 @@ static void sub_02015C38 (UnkStruct_02015C38 * param0, const UnkStruct_02015B14 param0->unk_36 = 0; } -static BOOL sub_02015CC0 (UnkStruct_02015C38 * param0) +static BOOL sub_02015CC0(UnkStruct_02015C38 *param0) { u32 v0 = sub_02015DA0(¶m0->unk_28); @@ -320,7 +320,7 @@ static BOOL sub_02015CC0 (UnkStruct_02015C38 * param0) return 0; } -static void sub_02015D00 (UnkStruct_02015C38 * param0) +static void sub_02015D00(UnkStruct_02015C38 *param0) { int v0; @@ -334,25 +334,25 @@ static void sub_02015D00 (UnkStruct_02015C38 * param0) memset(param0, 0, sizeof(UnkStruct_02015C38)); } -static void sub_02015D60 (UnkStruct_02015C38 * param0) +static void sub_02015D60(UnkStruct_02015C38 *param0) { u32 v0 = sub_02015DA0(¶m0->unk_28); sub_02015EE8(param0->unk_00, param0->unk_04, param0->unk_18[v0], param0->unk_34, param0->unk_35); } -static void sub_02015D8C (UnkStruct_02015D8C * param0, const fx32 * param1, u32 param2) +static void sub_02015D8C(UnkStruct_02015D8C *param0, const fx32 *param1, u32 param2) { param0->unk_00 = param1; param0->unk_04 = param2; param0->unk_08 = 0; } -static void sub_02015D98 (UnkStruct_02015D8C * param0, fx32 param1) +static void sub_02015D98(UnkStruct_02015D8C *param0, fx32 param1) { param0->unk_08 += param1; } -static u32 sub_02015DA0 (const UnkStruct_02015D8C * param0) +static u32 sub_02015DA0(const UnkStruct_02015D8C *param0) { int v0; @@ -365,9 +365,9 @@ static u32 sub_02015DA0 (const UnkStruct_02015D8C * param0) return param0->unk_04 - 1; } -static void sub_02015DCC (u32 param0, u32 param1, BGL * param2, u32 param3, u32 param4, u32 param5) +static void sub_02015DCC(u32 param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5) { - UnkStruct_02015DCC * v0; + UnkStruct_02015DCC *v0; v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_02015DCC)); memset(v0, 0, sizeof(UnkStruct_02015DCC)); @@ -380,9 +380,9 @@ static void sub_02015DCC (u32 param0, u32 param1, BGL * param2, u32 param3, u32 SysTask_ExecuteAfterVBlank(sub_02015E64, v0, 128); } -static void sub_02015E1C (u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) +static void sub_02015E1C(u32 param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5) { - UnkStruct_02015E1C * v0; + UnkStruct_02015E1C *v0; v0 = Heap_AllocFromHeap(param5, sizeof(UnkStruct_02015E1C)); memset(v0, 0, sizeof(UnkStruct_02015E1C)); @@ -395,9 +395,9 @@ static void sub_02015E1C (u32 param0, u32 param1, int param2, u32 param3, u32 pa SysTask_ExecuteAfterVBlank(sub_02015EA0, v0, 128); } -static void sub_02015E64 (SysTask * param0, void * param1) +static void sub_02015E64(SysTask *param0, void *param1) { - UnkStruct_02015DCC * v0 = param1; + UnkStruct_02015DCC *v0 = param1; DC_FlushRange(v0->unk_04->pRawData, v0->unk_04->szByte); @@ -407,9 +407,9 @@ static void sub_02015E64 (SysTask * param0, void * param1) Heap_FreeToHeap(v0); } -static void sub_02015EA0 (SysTask * param0, void * param1) +static void sub_02015EA0(SysTask *param0, void *param1) { - UnkStruct_02015E1C * v0 = param1; + UnkStruct_02015E1C *v0 = param1; DC_FlushRange(v0->unk_00->pRawData, v0->unk_10); @@ -424,16 +424,16 @@ static void sub_02015EA0 (SysTask * param0, void * param1) Heap_FreeToHeap(v0); } -static void sub_02015EE8 (BGL * param0, int param1, const NNSG2dScreenData * param2, int param3, int param4) +static void sub_02015EE8(BGL *param0, int param1, const NNSG2dScreenData *param2, int param3, int param4) { sub_020198E8(param0, param1, param3, param4, param2->screenWidth / 8, param2->screenHeight / 8, param2->rawData, 0, 0, param2->screenWidth / 8, param2->screenHeight / 8); sub_0201C3C0(param0, param1); } -static void sub_02015F34 (const NNSG2dScreenData * param0, int param1) +static void sub_02015F34(const NNSG2dScreenData *param0, int param1) { int v0; - u16 * v1; + u16 *v1; int v2 = param0->szByte / 2; v1 = (u16 *)param0->rawData; @@ -443,10 +443,10 @@ static void sub_02015F34 (const NNSG2dScreenData * param0, int param1) } } -static void sub_02015F54 (const NNSG2dScreenData * param0, int param1) +static void sub_02015F54(const NNSG2dScreenData *param0, int param1) { int v0; - u16 * v1; + u16 *v1; int v2 = param0->szByte / 2; v1 = (u16 *)param0->rawData; diff --git a/src/unk_02015F84.c b/src/unk_02015F84.c index 516b09e211..8ea96c6ec9 100644 --- a/src/unk_02015F84.c +++ b/src/unk_02015F84.c @@ -1,29 +1,29 @@ +#include "unk_02015F84.h" + #include #include #include "struct_decls/sprite_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/poke_animation_settings.h" +#include "heap.h" #include "narc.h" -#include "unk_0200762C.h" #include "sys_task.h" -#include "unk_02015F84.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_0200762C.h" typedef struct PokemonAnimationSys PokemonAnimationSys; typedef struct UnkStruct_02016DAC_t UnkStruct_02016DAC; typedef struct UnkStruct_02016E64_t UnkStruct_02016E64; -typedef void (* UnkFuncPtr_020E55D4)(UnkStruct_02016E64 *); -typedef void (* UnkFuncPtr_02016DAC)(UnkStruct_02016DAC *, UnkStruct_02016E64 *); +typedef void (*UnkFuncPtr_020E55D4)(UnkStruct_02016E64 *); +typedef void (*UnkFuncPtr_02016DAC)(UnkStruct_02016DAC *, UnkStruct_02016E64 *); typedef struct UnkStruct_02016DAC_t { BOOL unk_00; int unk_04[8]; - int * unk_24; - int * unk_28; + int *unk_24; + int *unk_28; u8 unk_2C; u8 unk_2D; int unk_30; @@ -38,10 +38,10 @@ typedef struct UnkStruct_02016DAC_t { } UnkStruct_02016DAC; typedef struct UnkStruct_02016E64_t { - Sprite * unk_00; - SysTask * unk_04; - void * unk_08; - u32 * unk_0C; + Sprite *unk_00; + SysTask *unk_04; + void *unk_08; + u32 *unk_0C; BOOL unk_10; int unk_14; int unk_18; @@ -51,7 +51,7 @@ typedef struct UnkStruct_02016E64_t { int unk_44; int unk_48; int unk_4C; - u32 * unk_50; + u32 *unk_50; int unk_54; int unk_58; int unk_5C; @@ -82,51 +82,51 @@ typedef struct { int unk_08; } UnkStruct_020E5598; -static int sub_02016280(u32 * param0, u8 param1, u8 param2); -static int sub_02016294(u32 * param0, u8 param1); -static int sub_020162A0(u32 * param0); -static void sub_02016D04(UnkStruct_02016E64 * param0, const int param1); -static void sub_02016150(SysTask * param0, void * param1); -static void sub_02016188(UnkStruct_02016E64 * param0); -static void sub_02016530(UnkStruct_02016E64 * param0); -static void sub_02016540(UnkStruct_02016E64 * param0); -static void sub_02016548(UnkStruct_02016E64 * param0); -static void sub_02016678(UnkStruct_02016E64 * param0); -static void sub_02016758(UnkStruct_02016E64 * param0); -static void sub_02016590(UnkStruct_02016E64 * param0); -static void sub_020165B8(UnkStruct_02016E64 * param0); -static void sub_020165DC(UnkStruct_02016E64 * param0); -static void sub_02016604(UnkStruct_02016E64 * param0); -static void sub_02016628(UnkStruct_02016E64 * param0); -static void sub_02016650(UnkStruct_02016E64 * param0); -static void sub_0201677C(UnkStruct_02016E64 * param0); -static void sub_020167A0(UnkStruct_02016E64 * param0); -static void sub_020167BC(UnkStruct_02016E64 * param0); -static void sub_020167E8(UnkStruct_02016E64 * param0); -static void sub_02016814(UnkStruct_02016E64 * param0); -static void sub_02016894(UnkStruct_02016E64 * param0); -static void sub_020168C8(UnkStruct_02016E64 * param0); -static void sub_02016900(UnkStruct_02016E64 * param0); -static void sub_02016948(UnkStruct_02016E64 * param0); -static void sub_02016998(UnkStruct_02016E64 * param0); -static void sub_02016A60(UnkStruct_02016E64 * param0); -static void sub_02016AA8(UnkStruct_02016E64 * param0); -static void sub_02016B10(UnkStruct_02016E64 * param0); -static void sub_02016B64(UnkStruct_02016E64 * param0); -static void sub_02016B78(UnkStruct_02016E64 * param0); -static void sub_02016BB8(UnkStruct_02016E64 * param0); -static void sub_02016BD4(UnkStruct_02016E64 * param0); -static void sub_02016BE0(UnkStruct_02016E64 * param0); -static void sub_02016C18(UnkStruct_02016E64 * param0); -static void sub_02016C24(UnkStruct_02016E64 * param0); -static void sub_02016C30(UnkStruct_02016E64 * param0); -static void sub_02016C3C(UnkStruct_02016E64 * param0); -static void sub_02016C48(UnkStruct_02016E64 * param0); -static void sub_02016DAC(UnkStruct_02016DAC * param0, UnkStruct_02016E64 * param1); -static void sub_02016E64(UnkStruct_02016DAC * param0, UnkStruct_02016E64 * param1); -static void sub_02016F24(UnkStruct_02016DAC * param0, UnkStruct_02016E64 * param1); -static void sub_02016F60(UnkStruct_02016DAC * param0, UnkStruct_02016E64 * param1); -static void sub_02016F9C(UnkStruct_02016DAC * param0, UnkStruct_02016E64 * param1); +static int sub_02016280(u32 *param0, u8 param1, u8 param2); +static int sub_02016294(u32 *param0, u8 param1); +static int sub_020162A0(u32 *param0); +static void sub_02016D04(UnkStruct_02016E64 *param0, const int param1); +static void sub_02016150(SysTask *param0, void *param1); +static void sub_02016188(UnkStruct_02016E64 *param0); +static void sub_02016530(UnkStruct_02016E64 *param0); +static void sub_02016540(UnkStruct_02016E64 *param0); +static void sub_02016548(UnkStruct_02016E64 *param0); +static void sub_02016678(UnkStruct_02016E64 *param0); +static void sub_02016758(UnkStruct_02016E64 *param0); +static void sub_02016590(UnkStruct_02016E64 *param0); +static void sub_020165B8(UnkStruct_02016E64 *param0); +static void sub_020165DC(UnkStruct_02016E64 *param0); +static void sub_02016604(UnkStruct_02016E64 *param0); +static void sub_02016628(UnkStruct_02016E64 *param0); +static void sub_02016650(UnkStruct_02016E64 *param0); +static void sub_0201677C(UnkStruct_02016E64 *param0); +static void sub_020167A0(UnkStruct_02016E64 *param0); +static void sub_020167BC(UnkStruct_02016E64 *param0); +static void sub_020167E8(UnkStruct_02016E64 *param0); +static void sub_02016814(UnkStruct_02016E64 *param0); +static void sub_02016894(UnkStruct_02016E64 *param0); +static void sub_020168C8(UnkStruct_02016E64 *param0); +static void sub_02016900(UnkStruct_02016E64 *param0); +static void sub_02016948(UnkStruct_02016E64 *param0); +static void sub_02016998(UnkStruct_02016E64 *param0); +static void sub_02016A60(UnkStruct_02016E64 *param0); +static void sub_02016AA8(UnkStruct_02016E64 *param0); +static void sub_02016B10(UnkStruct_02016E64 *param0); +static void sub_02016B64(UnkStruct_02016E64 *param0); +static void sub_02016B78(UnkStruct_02016E64 *param0); +static void sub_02016BB8(UnkStruct_02016E64 *param0); +static void sub_02016BD4(UnkStruct_02016E64 *param0); +static void sub_02016BE0(UnkStruct_02016E64 *param0); +static void sub_02016C18(UnkStruct_02016E64 *param0); +static void sub_02016C24(UnkStruct_02016E64 *param0); +static void sub_02016C30(UnkStruct_02016E64 *param0); +static void sub_02016C3C(UnkStruct_02016E64 *param0); +static void sub_02016C48(UnkStruct_02016E64 *param0); +static void sub_02016DAC(UnkStruct_02016DAC *param0, UnkStruct_02016E64 *param1); +static void sub_02016E64(UnkStruct_02016DAC *param0, UnkStruct_02016E64 *param1); +static void sub_02016F24(UnkStruct_02016DAC *param0, UnkStruct_02016E64 *param1); +static void sub_02016F60(UnkStruct_02016DAC *param0, UnkStruct_02016E64 *param1); +static void sub_02016F9C(UnkStruct_02016DAC *param0, UnkStruct_02016E64 *param1); static const UnkFuncPtr_020E55D4 Unk_020E55D4[34] = { sub_02016530, @@ -166,16 +166,16 @@ static const UnkFuncPtr_020E55D4 Unk_020E55D4[34] = { }; static const UnkStruct_020E5598 Unk_020E5598[] = { - {sub_02016DAC, 0x6, 0x1}, - {sub_02016E64, 0x6, 0x1}, - {sub_02016F24, 0x4, 0x0}, - {sub_02016F60, 0x3, 0x0}, - {sub_02016F9C, 0x4, 0x0} + { sub_02016DAC, 0x6, 0x1 }, + { sub_02016E64, 0x6, 0x1 }, + { sub_02016F24, 0x4, 0x0 }, + { sub_02016F60, 0x3, 0x0 }, + { sub_02016F9C, 0x4, 0x0 } }; -PokemonAnimationSys * sub_02015F84 (const int param0, const int param1, const u8 param2) +PokemonAnimationSys *sub_02015F84(const int param0, const int param1, const u8 param2) { - PokemonAnimationSys * v0; + PokemonAnimationSys *v0; v0 = Heap_AllocFromHeap(param0, sizeof(PokemonAnimationSys)); v0->reverse = param2; @@ -188,19 +188,19 @@ PokemonAnimationSys * sub_02015F84 (const int param0, const int param1, const u8 return v0; } -void sub_02015FB8 (PokemonAnimationSys * param0) +void sub_02015FB8(PokemonAnimationSys *param0) { Heap_FreeToHeap(param0->pokeAnimation); Heap_FreeToHeap(param0); } -void PokeAnimation_Init (PokemonAnimationSys * param0, Sprite * param1, const PokeAnimationSettings * param2, const u8 param3) +void PokeAnimation_Init(PokemonAnimationSys *param0, Sprite *param1, const PokeAnimationSettings *param2, const u8 param3) { u8 v0 = param3; int v1 = param2->animation; int v2 = param2->startDelay; - GF_ASSERT((v0 < param0->animation)); + GF_ASSERT(v0 < param0->animation); GF_ASSERT(param0->pokeAnimation[v0].unk_10 == 0); MI_CpuClear8(¶m0->pokeAnimation[v0], sizeof(UnkStruct_02016E64)); @@ -241,13 +241,13 @@ void PokeAnimation_Init (PokemonAnimationSys * param0, Sprite * param1, const Po param0->pokeAnimation[v0].unk_78 = 0; } -BOOL sub_020160F4 (PokemonAnimationSys * param0, const u8 param1) +BOOL sub_020160F4(PokemonAnimationSys *param0, const u8 param1) { - GF_ASSERT((param1 < param0->animation)); + GF_ASSERT(param1 < param0->animation); return param0->pokeAnimation[param1].unk_20; } -void sub_02016114 (PokemonAnimationSys * param0, const u8 param1) +void sub_02016114(PokemonAnimationSys *param0, const u8 param1) { if (param0->pokeAnimation[param1].unk_04 != NULL) { SysTask_Done(param0->pokeAnimation[param1].unk_04); @@ -260,9 +260,9 @@ void sub_02016114 (PokemonAnimationSys * param0, const u8 param1) } } -static void sub_02016150 (SysTask * param0, void * param1) +static void sub_02016150(SysTask *param0, void *param1) { - UnkStruct_02016E64 * v0 = (UnkStruct_02016E64 *)(param1); + UnkStruct_02016E64 *v0 = (UnkStruct_02016E64 *)(param1); if (v0->unk_54 == 0) { sub_02016188(v0); @@ -280,7 +280,7 @@ static void sub_02016150 (SysTask * param0, void * param1) } } -static void sub_02016188 (UnkStruct_02016E64 * param0) +static void sub_02016188(UnkStruct_02016E64 *param0) { UnkFuncPtr_020E55D4 v0; @@ -290,7 +290,7 @@ static void sub_02016188 (UnkStruct_02016E64 * param0) { u8 v1; u8 v2; - UnkStruct_02016DAC * v3; + UnkStruct_02016DAC *v3; v2 = 0; @@ -358,7 +358,7 @@ static void sub_02016188 (UnkStruct_02016E64 * param0) } } -static int sub_02016280 (u32 * param0, u8 param1, u8 param2) +static int sub_02016280(u32 *param0, u8 param1, u8 param2) { int v0 = param0[param1]; @@ -369,7 +369,7 @@ static int sub_02016280 (u32 * param0, u8 param1, u8 param2) return v0; } -static int sub_02016294 (u32 * param0, u8 param1) +static int sub_02016294(u32 *param0, u8 param1) { int v0; @@ -377,14 +377,14 @@ static int sub_02016294 (u32 * param0, u8 param1) return v0; } -static int sub_020162A0 (u32 * param0) +static int sub_020162A0(u32 *param0) { return sub_02016294(param0, 1); } -static UnkStruct_02016DAC * sub_020162AC (UnkStruct_02016E64 * param0, const u8 param1) +static UnkStruct_02016DAC *sub_020162AC(UnkStruct_02016E64 *param0, const u8 param1) { - UnkStruct_02016DAC * v0; + UnkStruct_02016DAC *v0; u8 v1; for (v1 = 0; v1 < 4; v1++) { @@ -404,32 +404,32 @@ static UnkStruct_02016DAC * sub_020162AC (UnkStruct_02016E64 * param0, const u8 return NULL; } -static void sub_020162F8 (UnkStruct_02016E64 * param0, int * param1) +static void sub_020162F8(UnkStruct_02016E64 *param0, int *param1) { param0->unk_0C += 1; (*param1) = (int)sub_020162A0(param0->unk_0C); } -static void sub_0201630C (UnkStruct_02016E64 * param0, u8 * param1) +static void sub_0201630C(UnkStruct_02016E64 *param0, u8 *param1) { param0->unk_0C += 1; (*param1) = (u8)sub_020162A0(param0->unk_0C); } -static void sub_02016320 (UnkStruct_02016E64 * param0, u8 * param1) +static void sub_02016320(UnkStruct_02016E64 *param0, u8 *param1) { param0->unk_0C += 1; (*param1) = (u8)sub_020162A0(param0->unk_0C); GF_ASSERT((*param1) < 8); } -static void sub_02016340 (UnkStruct_02016E64 * param0, u8 * param1, u8 * param2) +static void sub_02016340(UnkStruct_02016E64 *param0, u8 *param1, u8 *param2) { sub_02016320(param0, param1); sub_02016320(param0, param2); } -static void sub_02016354 (UnkStruct_02016E64 * param0, u8 * param1, int * param2, int * param3) +static void sub_02016354(UnkStruct_02016E64 *param0, u8 *param1, int *param2, int *param3) { u8 v0, v1; u8 v2; @@ -450,7 +450,7 @@ static void sub_02016354 (UnkStruct_02016E64 * param0, u8 * param1, int * param2 } } -static void sub_020163C8 (UnkStruct_02016E64 * param0, u8 * param1, int * param2, int * param3) +static void sub_020163C8(UnkStruct_02016E64 *param0, u8 *param1, int *param2, int *param3) { u8 v0, v1; u8 v2, v3; @@ -478,7 +478,7 @@ static void sub_020163C8 (UnkStruct_02016E64 * param0, u8 * param1, int * param2 } } -static void sub_02016454 (UnkStruct_02016E64 * param0, u8 * param1, int * param2, int * param3) +static void sub_02016454(UnkStruct_02016E64 *param0, u8 *param1, int *param2, int *param3) { u8 v0, v1, v2; int v3; @@ -513,7 +513,7 @@ static void sub_02016454 (UnkStruct_02016E64 * param0, u8 * param1, int * param2 (*param2) %= 0x10000; } -static u8 sub_020164FC (const int * param0, const int * param1) +static u8 sub_020164FC(const int *param0, const int *param1) { int v0; @@ -528,7 +528,7 @@ static u8 sub_020164FC (const int * param0, const int * param1) } } -static void sub_02016514 (UnkStruct_02016E64 * param0) +static void sub_02016514(UnkStruct_02016E64 *param0) { int v0; @@ -536,7 +536,7 @@ static void sub_02016514 (UnkStruct_02016E64 * param0) sub_02008274(param0->unk_00, 1, v0); } -static void sub_02016530 (UnkStruct_02016E64 * param0) +static void sub_02016530(UnkStruct_02016E64 *param0) { sub_02016548(param0); @@ -544,12 +544,12 @@ static void sub_02016530 (UnkStruct_02016E64 * param0) param0->unk_1C = 1; } -static void sub_02016540 (UnkStruct_02016E64 * param0) +static void sub_02016540(UnkStruct_02016E64 *param0) { param0->unk_18 = 1; } -static void sub_02016548 (UnkStruct_02016E64 * param0) +static void sub_02016548(UnkStruct_02016E64 *param0) { sub_02007DEC(param0->unk_00, 0, param0->unk_58); sub_02007DEC(param0->unk_00, 1, param0->unk_5C); @@ -561,7 +561,7 @@ static void sub_02016548 (UnkStruct_02016E64 * param0) sub_02007DEC(param0->unk_00, 13, 0x100); } -static void sub_02016590 (UnkStruct_02016E64 * param0) +static void sub_02016590(UnkStruct_02016E64 *param0) { u8 v0, v1; @@ -569,7 +569,7 @@ static void sub_02016590 (UnkStruct_02016E64 * param0) param0->unk_24[v0] = param0->unk_24[v1]; } -static void sub_020165B8 (UnkStruct_02016E64 * param0) +static void sub_020165B8(UnkStruct_02016E64 *param0) { u8 v0; int v1, v2; @@ -578,7 +578,7 @@ static void sub_020165B8 (UnkStruct_02016E64 * param0) param0->unk_24[v0] = v1 + v2; } -static void sub_020165DC (UnkStruct_02016E64 * param0) +static void sub_020165DC(UnkStruct_02016E64 *param0) { u8 v0; int v1, v2; @@ -587,7 +587,7 @@ static void sub_020165DC (UnkStruct_02016E64 * param0) param0->unk_24[v0] = v1 * v2; } -static void sub_02016604 (UnkStruct_02016E64 * param0) +static void sub_02016604(UnkStruct_02016E64 *param0) { u8 v0; int v1, v2; @@ -596,7 +596,7 @@ static void sub_02016604 (UnkStruct_02016E64 * param0) param0->unk_24[v0] = v1 - v2; } -static void sub_02016628 (UnkStruct_02016E64 * param0) +static void sub_02016628(UnkStruct_02016E64 *param0) { u8 v0; int v1, v2; @@ -605,7 +605,7 @@ static void sub_02016628 (UnkStruct_02016E64 * param0) param0->unk_24[v0] = v1 / v2; } -static void sub_02016650 (UnkStruct_02016E64 * param0) +static void sub_02016650(UnkStruct_02016E64 *param0) { u8 v0; int v1, v2; @@ -614,7 +614,7 @@ static void sub_02016650 (UnkStruct_02016E64 * param0) param0->unk_24[v0] = v1 % v2; } -static void sub_02016678 (UnkStruct_02016E64 * param0) +static void sub_02016678(UnkStruct_02016E64 *param0) { u8 v0, v1; u8 v2, v3; @@ -638,7 +638,7 @@ static void sub_02016678 (UnkStruct_02016E64 * param0) } sub_0201630C(param0, &v2); - GF_ASSERT((v2 <= 17)); + GF_ASSERT(v2 <= 17); v3 = sub_020164FC(&v5, &v6); } @@ -664,7 +664,7 @@ static void sub_02016678 (UnkStruct_02016E64 * param0) } } -static void sub_02016758 (UnkStruct_02016E64 * param0) +static void sub_02016758(UnkStruct_02016E64 *param0) { u8 v0; @@ -674,7 +674,7 @@ static void sub_02016758 (UnkStruct_02016E64 * param0) param0->unk_24[v0] = (int)sub_020162A0(param0->unk_0C); } -static void sub_0201677C (UnkStruct_02016E64 * param0) +static void sub_0201677C(UnkStruct_02016E64 *param0) { GF_ASSERT(param0->unk_50 == NULL); @@ -684,7 +684,7 @@ static void sub_0201677C (UnkStruct_02016E64 * param0) param0->unk_4C = 0; } -static void sub_020167A0 (UnkStruct_02016E64 * param0) +static void sub_020167A0(UnkStruct_02016E64 *param0) { param0->unk_4C++; @@ -697,7 +697,7 @@ static void sub_020167A0 (UnkStruct_02016E64 * param0) } } -static void sub_020167BC (UnkStruct_02016E64 * param0) +static void sub_020167BC(UnkStruct_02016E64 *param0) { u8 v0; int v1; @@ -707,7 +707,7 @@ static void sub_020167BC (UnkStruct_02016E64 * param0) sub_02007DEC(param0->unk_00, v1, param0->unk_24[v0]); } -static void sub_020167E8 (UnkStruct_02016E64 * param0) +static void sub_020167E8(UnkStruct_02016E64 *param0) { u8 v0; int v1; @@ -717,7 +717,7 @@ static void sub_020167E8 (UnkStruct_02016E64 * param0) sub_02008274(param0->unk_00, v1, param0->unk_24[v0]); } -static void sub_02016814 (UnkStruct_02016E64 * param0) +static void sub_02016814(UnkStruct_02016E64 *param0) { int v0; int v1; @@ -755,7 +755,7 @@ static void sub_02016814 (UnkStruct_02016E64 * param0) } } -static void sub_02016894 (UnkStruct_02016E64 * param0) +static void sub_02016894(UnkStruct_02016E64 *param0) { u8 v0; int v1; @@ -765,7 +765,7 @@ static void sub_02016894 (UnkStruct_02016E64 * param0) param0->unk_24[v0] = FX_Whole(FX_SinIdx(v1) * v2); } -static void sub_020168C8 (UnkStruct_02016E64 * param0) +static void sub_020168C8(UnkStruct_02016E64 *param0) { u8 v0; int v1; @@ -775,7 +775,7 @@ static void sub_020168C8 (UnkStruct_02016E64 * param0) param0->unk_24[v0] = FX_Whole(FX_CosIdx(v1) * v2); } -static void sub_02016900 (UnkStruct_02016E64 * param0) +static void sub_02016900(UnkStruct_02016E64 *param0) { u8 v0; u8 v1; @@ -792,7 +792,7 @@ static void sub_02016900 (UnkStruct_02016E64 * param0) } } -static void sub_02016948 (UnkStruct_02016E64 * param0) +static void sub_02016948(UnkStruct_02016E64 *param0) { u8 v0; u8 v1; @@ -809,9 +809,9 @@ static void sub_02016948 (UnkStruct_02016E64 * param0) } } -static void sub_02016998 (UnkStruct_02016E64 * param0) +static void sub_02016998(UnkStruct_02016E64 *param0) { - int * v0; + int *v0; int v1; { @@ -869,7 +869,7 @@ static void sub_02016998 (UnkStruct_02016E64 * param0) } } -static void sub_02016A60 (UnkStruct_02016E64 * param0) +static void sub_02016A60(UnkStruct_02016E64 *param0) { if (param0->unk_1C4) { sub_02007DEC(param0->unk_00, 0, param0->unk_58 - (param0->unk_60 + param0->unk_68)); @@ -880,7 +880,7 @@ static void sub_02016A60 (UnkStruct_02016E64 * param0) sub_02007DEC(param0->unk_00, 1, param0->unk_5C + param0->unk_64 + param0->unk_6C); } -static void sub_02016AA8 (UnkStruct_02016E64 * param0) +static void sub_02016AA8(UnkStruct_02016E64 *param0) { sub_02007DEC(param0->unk_00, 12, 0x100 + param0->unk_70); sub_02007DEC(param0->unk_00, 13, 0x100 + param0->unk_74); @@ -905,7 +905,7 @@ static void sub_02016AA8 (UnkStruct_02016E64 * param0) } } -static void sub_02016B10 (UnkStruct_02016E64 * param0) +static void sub_02016B10(UnkStruct_02016E64 *param0) { u8 v0; u8 v1; @@ -924,13 +924,13 @@ static void sub_02016B10 (UnkStruct_02016E64 * param0) } } -static void sub_02016B64 (UnkStruct_02016E64 * param0) +static void sub_02016B64(UnkStruct_02016E64 *param0) { sub_020162F8(param0, ¶m0->unk_54); param0->unk_18 = 1; } -static void sub_02016B78 (UnkStruct_02016E64 * param0) +static void sub_02016B78(UnkStruct_02016E64 *param0) { u8 v0, v1, v2; int v3; @@ -942,7 +942,7 @@ static void sub_02016B78 (UnkStruct_02016E64 * param0) sub_020086FC(param0->unk_00, v0, v1, v2, v3); } -static void sub_02016BB8 (UnkStruct_02016E64 * param0) +static void sub_02016BB8(UnkStruct_02016E64 *param0) { u8 v0, v1, v2; @@ -952,43 +952,43 @@ static void sub_02016BB8 (UnkStruct_02016E64 * param0) } } -static void sub_02016BD4 (UnkStruct_02016E64 * param0) +static void sub_02016BD4(UnkStruct_02016E64 *param0) { param0->unk_1C5 = 1; } -static void sub_02016BE0 (UnkStruct_02016E64 * param0) +static void sub_02016BE0(UnkStruct_02016E64 *param0) { sub_0201630C(param0, ¶m0->unk_1C6); GF_ASSERT((param0->unk_1C6 == 27) || (param0->unk_1C6 == 29) || ((param0->unk_1C6 == 28) && TRUE)); } -static void sub_02016C18 (UnkStruct_02016E64 * param0) +static void sub_02016C18(UnkStruct_02016E64 *param0) { sub_02016D04(param0, 0); } -static void sub_02016C24 (UnkStruct_02016E64 * param0) +static void sub_02016C24(UnkStruct_02016E64 *param0) { sub_02016D04(param0, 1); } -static void sub_02016C30 (UnkStruct_02016E64 * param0) +static void sub_02016C30(UnkStruct_02016E64 *param0) { sub_02016D04(param0, 2); } -static void sub_02016C3C (UnkStruct_02016E64 * param0) +static void sub_02016C3C(UnkStruct_02016E64 *param0) { sub_02016D04(param0, 3); } -static void sub_02016C48 (UnkStruct_02016E64 * param0) +static void sub_02016C48(UnkStruct_02016E64 *param0) { sub_02016D04(param0, 4); } -static void sub_02016C54 (const u8 param0, const int * param1, const int * param2, int * param3) +static void sub_02016C54(const u8 param0, const int *param1, const int *param2, int *param3) { if (param0 == 24) { (*param3) = (*param2); @@ -1001,7 +1001,7 @@ static void sub_02016C54 (const u8 param0, const int * param1, const int * param } } -static void sub_02016C84 (const u8 param0, UnkStruct_02016DAC * param1, UnkStruct_02016E64 * param2) +static void sub_02016C84(const u8 param0, UnkStruct_02016DAC *param1, UnkStruct_02016E64 *param2) { switch (param0) { case 35: @@ -1034,10 +1034,10 @@ static void sub_02016C84 (const u8 param0, UnkStruct_02016DAC * param1, UnkStruc } } -static void sub_02016D04 (UnkStruct_02016E64 * param0, const int param1) +static void sub_02016D04(UnkStruct_02016E64 *param0, const int param1) { u8 v0; - UnkStruct_02016DAC * v1; + UnkStruct_02016DAC *v1; v1 = sub_020162AC(param0, param1); @@ -1062,10 +1062,10 @@ static void sub_02016D04 (UnkStruct_02016E64 * param0, const int param1) } } -static void sub_02016DAC (UnkStruct_02016DAC * param0, UnkStruct_02016E64 * param1) +static void sub_02016DAC(UnkStruct_02016DAC *param0, UnkStruct_02016E64 *param1) { u16 v0; - int * v1; + int *v1; v1 = param0->unk_04; v0 = (v1[3] * (v1[6] + 1)) + v1[4]; @@ -1096,10 +1096,10 @@ static void sub_02016DAC (UnkStruct_02016DAC * param0, UnkStruct_02016E64 * para } } -static void sub_02016E64 (UnkStruct_02016DAC * param0, UnkStruct_02016E64 * param1) +static void sub_02016E64(UnkStruct_02016DAC *param0, UnkStruct_02016E64 *param1) { u16 v0; - int * v1; + int *v1; v1 = param0->unk_04; v0 = ((v1[3] * (v1[6] + 1)) / v1[5]) + v1[4]; @@ -1130,10 +1130,10 @@ static void sub_02016E64 (UnkStruct_02016DAC * param0, UnkStruct_02016E64 * para } } -static void sub_02016F24 (UnkStruct_02016DAC * param0, UnkStruct_02016E64 * param1) +static void sub_02016F24(UnkStruct_02016DAC *param0, UnkStruct_02016E64 *param1) { int v0; - int * v1; + int *v1; v1 = param0->unk_04; v0 = v1[1] + (v1[2] * v1[4]); @@ -1149,10 +1149,10 @@ static void sub_02016F24 (UnkStruct_02016DAC * param0, UnkStruct_02016E64 * para } } -static void sub_02016F60 (UnkStruct_02016DAC * param0, UnkStruct_02016E64 * param1) +static void sub_02016F60(UnkStruct_02016DAC *param0, UnkStruct_02016E64 *param1) { int v0; - int * v1; + int *v1; v1 = param0->unk_04; v0 = ((v1[3] + 1) * v1[1]) / v1[2]; @@ -1168,10 +1168,10 @@ static void sub_02016F60 (UnkStruct_02016DAC * param0, UnkStruct_02016E64 * para } } -static void sub_02016F9C (UnkStruct_02016DAC * param0, UnkStruct_02016E64 * param1) +static void sub_02016F9C(UnkStruct_02016DAC *param0, UnkStruct_02016E64 *param1) { int v0; - int * v1; + int *v1; v1 = param0->unk_04; v0 = v1[1] + (v1[2] * v1[4]); diff --git a/src/unk_02017038.c b/src/unk_02017038.c index 51db3cb717..09f119a721 100644 --- a/src/unk_02017038.c +++ b/src/unk_02017038.c @@ -1,15 +1,15 @@ +#include "unk_02017038.h" + #include #include -#include "unk_02017038.h" - static const u16 Unk_020E565C[] = { 0x0, 0x7D0, 0xBB8 }; -int sub_02017038 (u32 param0) +int sub_02017038(u32 param0) { int v0; @@ -22,19 +22,19 @@ int sub_02017038 (u32 param0) return v0; } -int sub_02017058 (u32 param0) +int sub_02017058(u32 param0) { int v0 = sub_02017038(param0); return param0 - Unk_020E565C[v0]; } -int sub_02017070 (int param0, int param1) +int sub_02017070(int param0, int param1) { GF_ASSERT(param0 < 3); return Unk_020E565C[param0] + param1; } -BOOL sub_0201708C (u16 param0) +BOOL sub_0201708C(u16 param0) { if (((param0 >= 1) && (param0 <= 111)) || ((param0 >= 2000) && (param0 <= 2010)) || ((param0 >= 3000) && (param0 <= 3076))) { return 1; diff --git a/src/unk_020170BC.c b/src/unk_020170BC.c index 9d8ffe00ae..8e79547923 100644 --- a/src/unk_020170BC.c +++ b/src/unk_020170BC.c @@ -1,45 +1,45 @@ +#include "unk_020170BC.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/struct_020170F4.h" #include "struct_defs/struct_02017248.h" #include "struct_defs/struct_02017294.h" -#include "unk_02006E3C.h" -#include "sys_task.h" -#include "unk_020170BC.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_0201C970.h" -static void sub_020170F4(SysTask * param0, void * param1); -static void sub_020173A0(UnkStruct_02017248 * param0, const UnkStruct_020170F4 * param1, void * param2, NNSFndAllocator * param3); -static void sub_020173CC(UnkStruct_020170F4 * param0); +static void sub_020170F4(SysTask *param0, void *param1); +static void sub_020173A0(UnkStruct_02017248 *param0, const UnkStruct_020170F4 *param1, void *param2, NNSFndAllocator *param3); +static void sub_020173CC(UnkStruct_020170F4 *param0); -void sub_020170BC (UnkStruct_020170F4 * param0, u32 param1, u32 param2, u32 param3) +void sub_020170BC(UnkStruct_020170F4 *param0, u32 param1, u32 param2, u32 param3) { param0->unk_00 = sub_02006FE8(param1, param2, 0, param3, 0); sub_020173CC(param0); } -void sub_020170D8 (UnkStruct_020170F4 * param0, NARC * param1, u32 param2, u32 param3) +void sub_020170D8(UnkStruct_020170F4 *param0, NARC *param1, u32 param2, u32 param3) { param0->unk_00 = sub_0200723C(param1, param2, 0, param3, 0); sub_020173CC(param0); } -static void sub_020170F4 (SysTask * param0, void * param1) +static void sub_020170F4(SysTask *param0, void *param1) { - UnkStruct_020170F4 * v0 = param1; + UnkStruct_020170F4 *v0 = param1; sub_0201CBCC(v0->unk_0C); sub_0201CBB0(v0->unk_00, v0->unk_0C); SysTask_Done(param0); } -void sub_02017110 (UnkStruct_020170F4 * param0) +void sub_02017110(UnkStruct_020170F4 *param0) { NNSG3dTexKey v0; NNSG3dTexKey v1; @@ -61,9 +61,9 @@ void sub_02017110 (UnkStruct_020170F4 * param0) memset(param0, 0, sizeof(UnkStruct_020170F4)); } -void sub_02017164 (UnkStruct_02017248 * param0, const UnkStruct_020170F4 * param1, NARC * param2, u32 param3, u32 param4, NNSFndAllocator * param5) +void sub_02017164(UnkStruct_02017248 *param0, const UnkStruct_020170F4 *param1, NARC *param2, u32 param3, u32 param4, NNSFndAllocator *param5) { - void * v0; + void *v0; v0 = sub_0200723C(param2, param3, 0, param4, 0); @@ -71,13 +71,13 @@ void sub_02017164 (UnkStruct_02017248 * param0, const UnkStruct_020170F4 * param param0->unk_10 = 0; } -void sub_02017190 (UnkStruct_02017248 * param0, const UnkStruct_020170F4 * param1, void * param2, NNSFndAllocator * param3) +void sub_02017190(UnkStruct_02017248 *param0, const UnkStruct_020170F4 *param1, void *param2, NNSFndAllocator *param3) { sub_020173A0(param0, param1, param2, param3); param0->unk_10 = 1; } -void sub_020171A0 (UnkStruct_02017248 * param0, NNSFndAllocator * param1) +void sub_020171A0(UnkStruct_02017248 *param0, NNSFndAllocator *param1) { if (param0->unk_00) { NNS_G3dFreeAnmObj(param1, param0->unk_08); @@ -90,7 +90,7 @@ void sub_020171A0 (UnkStruct_02017248 * param0, NNSFndAllocator * param1) memset(param0, 0, sizeof(UnkStruct_02017248)); } -void sub_020171CC (UnkStruct_02017248 * param0, fx32 param1) +void sub_020171CC(UnkStruct_02017248 *param0, fx32 param1) { fx32 v0 = NNS_G3dAnmObjGetNumFrame(param0->unk_08); @@ -107,7 +107,7 @@ void sub_020171CC (UnkStruct_02017248 * param0, fx32 param1) NNS_G3dAnmObjSetFrame(param0->unk_08, param0->unk_0C); } -BOOL sub_02017204 (UnkStruct_02017248 * param0, fx32 param1) +BOOL sub_02017204(UnkStruct_02017248 *param0, fx32 param1) { fx32 v0 = NNS_G3dAnmObjGetNumFrame(param0->unk_08); BOOL v1 = 0; @@ -132,23 +132,23 @@ BOOL sub_02017204 (UnkStruct_02017248 * param0, fx32 param1) return v1; } -void sub_02017240 (UnkStruct_02017248 * param0, fx32 param1) +void sub_02017240(UnkStruct_02017248 *param0, fx32 param1) { param0->unk_0C = param1; NNS_G3dAnmObjSetFrame(param0->unk_08, param1); } -fx32 sub_02017248 (const UnkStruct_02017248 * param0) +fx32 sub_02017248(const UnkStruct_02017248 *param0) { return param0->unk_0C; } -fx32 sub_0201724C (const UnkStruct_02017248 * param0) +fx32 sub_0201724C(const UnkStruct_02017248 *param0) { return NNS_G3dAnmObjGetNumFrame(param0->unk_08); } -void sub_02017258 (UnkStruct_02017294 * param0, UnkStruct_020170F4 * param1) +void sub_02017258(UnkStruct_02017294 *param0, UnkStruct_020170F4 *param1) { memset(param0, 0, sizeof(UnkStruct_02017294)); NNS_G3dRenderObjInit(¶m0->unk_00, param1->unk_08); @@ -159,17 +159,17 @@ void sub_02017258 (UnkStruct_02017294 * param0, UnkStruct_020170F4 * param1) param0->unk_60.z = FX32_ONE; } -void sub_0201727C (UnkStruct_02017294 * param0, UnkStruct_02017248 * param1) +void sub_0201727C(UnkStruct_02017294 *param0, UnkStruct_02017248 *param1) { NNS_G3dRenderObjAddAnmObj(¶m0->unk_00, param1->unk_08); } -void sub_02017288 (UnkStruct_02017294 * param0, UnkStruct_02017248 * param1) +void sub_02017288(UnkStruct_02017294 *param0, UnkStruct_02017248 *param1) { NNS_G3dRenderObjRemoveAnmObj(¶m0->unk_00, param1->unk_08); } -void sub_02017294 (UnkStruct_02017294 * param0) +void sub_02017294(UnkStruct_02017294 *param0) { MtxFx33 v0; MtxFx33 v1; @@ -187,62 +187,62 @@ void sub_02017294 (UnkStruct_02017294 * param0) } } -void sub_02017330 (UnkStruct_02017294 * param0, const MtxFx33 * param1) +void sub_02017330(UnkStruct_02017294 *param0, const MtxFx33 *param1) { if (param0->unk_6C) { sub_0201CA74(¶m0->unk_00, ¶m0->unk_54, (MtxFx33 *)param1, ¶m0->unk_60); } } -void sub_02017348 (UnkStruct_02017294 * param0, BOOL param1) +void sub_02017348(UnkStruct_02017294 *param0, BOOL param1) { param0->unk_6C = param1; } -BOOL sub_0201734C (const UnkStruct_02017294 * param0) +BOOL sub_0201734C(const UnkStruct_02017294 *param0) { return param0->unk_6C; } -void sub_02017350 (UnkStruct_02017294 * param0, fx32 param1, fx32 param2, fx32 param3) +void sub_02017350(UnkStruct_02017294 *param0, fx32 param1, fx32 param2, fx32 param3) { param0->unk_54.x = param1; param0->unk_54.y = param2; param0->unk_54.z = param3; } -void sub_02017358 (const UnkStruct_02017294 * param0, fx32 * param1, fx32 * param2, fx32 * param3) +void sub_02017358(const UnkStruct_02017294 *param0, fx32 *param1, fx32 *param2, fx32 *param3) { *param1 = param0->unk_54.x; *param2 = param0->unk_54.y; *param3 = param0->unk_54.z; } -void sub_0201736C (UnkStruct_02017294 * param0, fx32 param1, fx32 param2, fx32 param3) +void sub_0201736C(UnkStruct_02017294 *param0, fx32 param1, fx32 param2, fx32 param3) { param0->unk_60.x = param1; param0->unk_60.y = param2; param0->unk_60.z = param3; } -void sub_02017374 (const UnkStruct_02017294 * param0, fx32 * param1, fx32 * param2, fx32 * param3) +void sub_02017374(const UnkStruct_02017294 *param0, fx32 *param1, fx32 *param2, fx32 *param3) { *param1 = param0->unk_60.x; *param2 = param0->unk_60.y; *param3 = param0->unk_60.z; } -void sub_02017388 (UnkStruct_02017294 * param0, u16 param1, u32 param2) +void sub_02017388(UnkStruct_02017294 *param0, u16 param1, u32 param2) { param0->unk_70[param2] = param1; } -u16 sub_02017394 (const UnkStruct_02017294 * param0, u32 param1) +u16 sub_02017394(const UnkStruct_02017294 *param0, u32 param1) { return param0->unk_70[param1]; } -static void sub_020173A0 (UnkStruct_02017248 * param0, const UnkStruct_020170F4 * param1, void * param2, NNSFndAllocator * param3) +static void sub_020173A0(UnkStruct_02017248 *param0, const UnkStruct_020170F4 *param1, void *param2, NNSFndAllocator *param3) { param0->unk_00 = param2; param0->unk_04 = NNS_G3dGetAnmByIdx(param0->unk_00, 0); @@ -251,7 +251,7 @@ static void sub_020173A0 (UnkStruct_02017248 * param0, const UnkStruct_020170F4 NNS_G3dAnmObjInit(param0->unk_08, param0->unk_04, param1->unk_08, param1->unk_0C); } -static void sub_020173CC (UnkStruct_020170F4 * param0) +static void sub_020173CC(UnkStruct_020170F4 *param0) { GF_ASSERT(param0->unk_00); diff --git a/src/unk_02017428.c b/src/unk_02017428.c index 767afee815..9c1f8b9715 100644 --- a/src/unk_02017428.c +++ b/src/unk_02017428.c @@ -1,22 +1,23 @@ +#include "unk_02017428.h" + #include #include -#include "unk_02017428.h" -#include "unk_02022844.h" #include "play_time.h" +#include "unk_02022844.h" static BOOL Unk_021BF658 = 0; static u64 Unk_021BF668 = 0; static u64 Unk_021BF660 = 0; static u64 Unk_021BF670 = 0; -static PlayTime * sPlayTime = NULL; +static PlayTime *sPlayTime = NULL; -void sub_02017428 (void) +void sub_02017428(void) { Unk_021BF658 = 0; } -void sub_02017434 (PlayTime *playTime) +void sub_02017434(PlayTime *playTime) { Unk_021BF658 = 1; Unk_021BF668 = 0; @@ -25,7 +26,7 @@ void sub_02017434 (PlayTime *playTime) Unk_021BF670 = sub_0202293C(); } -void sub_02017458 (void) +void sub_02017458(void) { if (Unk_021BF658) { u64 v0 = sub_0202295C(sub_0202293C() - Unk_021BF670); diff --git a/src/unk_02017498.c b/src/unk_02017498.c index e929949878..9fe9814085 100644 --- a/src/unk_02017498.c +++ b/src/unk_02017498.c @@ -1,28 +1,29 @@ +#include "unk_02017498.h" + +#include #include #include -#include - #include "struct_defs/struct_02017498.h" -#include "unk_020041CC.h" +#include "overlay061/ov61_0222BF44.h" + +#include "gx_layers.h" +#include "heap.h" #include "overlay_manager.h" -#include "unk_02017498.h" +#include "unk_020041CC.h" #include "unk_02017728.h" -#include "heap.h" -#include "gx_layers.h" #include "unk_02033200.h" #include "unk_020393C8.h" #include "unk_0208BA78.h" #include "unk_02099550.h" -#include "overlay061/ov61_0222BF44.h" static NNSFndHeapHandle Unk_021BF678; -static void sub_0201767C(UnkStruct_02017498 * param0); -static void sub_020176B4(UnkStruct_02017498 * param0); -static void * sub_020176DC(DWCAllocType param0, u32 param1, int param2); -static void sub_02017704(DWCAllocType param0, void * param1, u32 param2); +static void sub_0201767C(UnkStruct_02017498 *param0); +static void sub_020176B4(UnkStruct_02017498 *param0); +static void *sub_020176DC(DWCAllocType param0, u32 param1, int param2); +static void sub_02017704(DWCAllocType param0, void *param1, u32 param2); static const OverlayManagerTemplate Unk_020E5664 = { ov61_0222BF44, @@ -31,9 +32,9 @@ static const OverlayManagerTemplate Unk_020E5664 = { 0xffffffff, }; -int sub_02017498 (OverlayManager * param0, int * param1) +int sub_02017498(OverlayManager *param0, int *param1) { - UnkStruct_02017498 * v0; + UnkStruct_02017498 *v0; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -58,9 +59,9 @@ int sub_02017498 (OverlayManager * param0, int * param1) return 1; } -int sub_02017524 (OverlayManager * param0, int * param1) +int sub_02017524(OverlayManager *param0, int *param1) { - UnkStruct_02017498 * v0 = OverlayManager_Data(param0); + UnkStruct_02017498 *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -93,15 +94,13 @@ int sub_02017524 (OverlayManager * param0, int * param1) } } break; - case 4: - { - const OverlayManagerTemplate * v1; + case 4: { + const OverlayManagerTemplate *v1; v1 = sub_0208BE5C(v0->unk_00->unk_0C); v0->unk_14 = OverlayManager_New(v1, v0->unk_00->fieldSystem, 116); (*param1)++; - } - break; + } break; case 5: if (OverlayManager_Exec(v0->unk_14) == 1) { OverlayManager_Free(v0->unk_14); @@ -131,9 +130,9 @@ int sub_02017524 (OverlayManager * param0, int * param1) return 0; } -int sub_02017658 (OverlayManager * param0, int * param1) +int sub_02017658(OverlayManager *param0, int *param1) { - UnkStruct_02017498 * v0 = OverlayManager_Data(param0); + UnkStruct_02017498 *v0 = OverlayManager_Data(param0); sub_020176B4(v0); Heap_FreeToHeap(v0->unk_00); @@ -143,7 +142,7 @@ int sub_02017658 (OverlayManager * param0, int * param1) return 1; } -static void sub_0201767C (UnkStruct_02017498 * param0) +static void sub_0201767C(UnkStruct_02017498 *param0) { if (param0->unk_88 == 0) { param0->unk_18 = Heap_AllocFromHeap(116, 0x20000 + 32); @@ -155,7 +154,7 @@ static void sub_0201767C (UnkStruct_02017498 * param0) } } -static void sub_020176B4 (UnkStruct_02017498 * param0) +static void sub_020176B4(UnkStruct_02017498 *param0) { if (param0->unk_88 == 1) { NNS_FndDestroyExpHeap(param0->unk_1C); @@ -169,10 +168,10 @@ static void sub_020176B4 (UnkStruct_02017498 * param0) } } -static void * sub_020176DC (DWCAllocType param0, u32 param1, int param2) +static void *sub_020176DC(DWCAllocType param0, u32 param1, int param2) { -#pragma unused( param0 ) - void * v0; +#pragma unused(param0) + void *v0; OSIntrMode v1; v1 = OS_DisableInterrupts(); @@ -187,9 +186,9 @@ static void * sub_020176DC (DWCAllocType param0, u32 param1, int param2) return v0; } -static void sub_02017704 (DWCAllocType param0, void * param1, u32 param2) +static void sub_02017704(DWCAllocType param0, void *param1, u32 param2) { -#pragma unused( param0, param2 ) +#pragma unused(param0, param2) OSIntrMode v0; if (!param1) { diff --git a/src/unk_02017728.c b/src/unk_02017728.c index 57e8a42ee0..a82201a923 100644 --- a/src/unk_02017728.c +++ b/src/unk_02017728.c @@ -1,18 +1,18 @@ +#include "unk_02017728.h" + #include #include -#include "core_sys.h" - #include "struct_defs/struct_02017E74.h" -#include "unk_02017728.h" +#include "core_sys.h" #include "heap.h" #include "sys_task_manager.h" #include "unk_0201D15C.h" #include "unk_02024358.h" typedef struct { - void * unk_00; + void *unk_00; u32 unk_04; } UnkStruct_021BF6F0; @@ -22,7 +22,7 @@ static void ApplyButtonModeToInput(void); CoreSys gCoreSys; -void sub_02017728 (void) +void sub_02017728(void) { OS_SetIrqCheckFlag(OS_IE_V_BLANK); @@ -32,33 +32,33 @@ void sub_02017728 (void) gCoreSys.unk_30++; } -static void sub_0201775C (void) +static void sub_0201775C(void) { OS_SetIrqCheckFlag(OS_IE_V_BLANK); MI_WaitDma(GX_DEFAULT_DMAID); } -void sub_0201777C (void) +void sub_0201777C(void) { (void)OS_DisableIrqMask(OS_IE_V_BLANK); OS_SetIrqFunction(OS_IE_V_BLANK, sub_0201775C); (void)OS_EnableIrqMask(OS_IE_V_BLANK); } -void SetMainCallback (Callback cb, void * data) +void SetMainCallback(Callback cb, void *data) { gCoreSys.mainCallback = cb; gCoreSys.mainCallbackData = data; } -void DisableHBlank (void) +void DisableHBlank(void) { SetHBlankEnabled(0); gCoreSys.hblankCallback = NULL; gCoreSys.hblankCallbackData = NULL; } -BOOL SetHBlankCallback (Callback cb, void * data) +BOOL SetHBlankCallback(Callback cb, void *data) { if (cb == NULL) { SetHBlankEnabled(0); @@ -77,18 +77,18 @@ BOOL SetHBlankCallback (Callback cb, void * data) } } -static void HBlankIntr (void) +static void HBlankIntr(void) { if (gCoreSys.hblankCallback) { gCoreSys.hblankCallback(gCoreSys.hblankCallbackData); } } -static void SetHBlankEnabled (BOOL enabled) +static void SetHBlankEnabled(BOOL enabled) { OSIrqMask savedMask; - OS_DisableIrq( ); + OS_DisableIrq(); if (!enabled) { savedMask = OS_GetIrqMask(); @@ -101,17 +101,17 @@ static void SetHBlankEnabled (BOOL enabled) GX_HBlankIntr(1); } - OS_EnableIrq( ); + OS_EnableIrq(); } static const HeapParam Unk_020E5674[] = { - {0xD200, OS_ARENA_MAIN}, - {0x20E00, OS_ARENA_MAIN}, - {0x10, OS_ARENA_MAIN}, - {0x10D800, OS_ARENA_MAIN} + { 0xD200, OS_ARENA_MAIN }, + { 0x20E00, OS_ARENA_MAIN }, + { 0x10, OS_ARENA_MAIN }, + { 0x10D800, OS_ARENA_MAIN } }; -static void sub_02017850 (void) +static void sub_02017850(void) { u32 v0[8]; u8 v1[MATH_MD5_DIGEST_SIZE]; @@ -135,7 +135,7 @@ static void sub_02017850 (void) Heap_InitSystem(Unk_020E5674, NELEMS(Unk_020E5674), 123, v2); } -void sub_0201789C (void) +void sub_0201789C(void) { OS_Init(); FX_Init(); @@ -167,7 +167,7 @@ void sub_0201789C (void) { u32 v0 = FS_GetTableSize(); - void * v1 = OS_AllocFromMainArenaLo(v0, 4); + void *v1 = OS_AllocFromMainArenaLo(v0, 4); GF_ASSERT(v1 != NULL); FS_LoadTable(v1, v0); @@ -186,7 +186,7 @@ void sub_0201789C (void) sub_0201D640(0); } -void InitGraphics (void) +void InitGraphics(void) { GX_SetBankForLCDC(GX_VRAM_LCDC_ALL); @@ -200,10 +200,10 @@ void InitGraphics (void) MI_CpuClearFast((void *)HW_DB_PLTT, HW_DB_PLTT_SIZE); } -void * ReadFileToHeap (int heapID, const char * filename) +void *ReadFileToHeap(int heapID, const char *filename) { FSFile file; - void * buf; + void *buf; FS_InitFile(&file); @@ -227,7 +227,7 @@ void * ReadFileToHeap (int heapID, const char * filename) return buf; } -void ReadFileToBuffer (const char * filename, void ** buf) +void ReadFileToBuffer(const char *filename, void **buf) { FSFile file; @@ -248,7 +248,7 @@ void ReadFileToBuffer (const char * filename, void ** buf) UnkStruct_021BF6F0 Unk_021BF6F0[128]; -void sub_02017ACC (void) +void sub_02017ACC(void) { int v0; @@ -262,7 +262,7 @@ void sub_02017ACC (void) } } -void InitKeypadAndTouchpad (void) +void InitKeypadAndTouchpad(void) { TPCalibrateParam v0; @@ -296,22 +296,22 @@ void InitKeypadAndTouchpad (void) } } -void sub_02017B70 (int param0) +void sub_02017B70(int param0) { gCoreSys.unk_66 = param0; } -void SleepLock (u8 param0) +void SleepLock(u8 param0) { gCoreSys.inhibitSleep |= param0; } -void SleepUnlock (u8 param0) +void SleepUnlock(u8 param0) { gCoreSys.inhibitSleep &= ~(param0); } -void ReadKeypadAndTouchpad (void) +void ReadKeypadAndTouchpad(void) { TPData tpRaw; TPData tp; @@ -350,7 +350,8 @@ void ReadKeypadAndTouchpad (void) ApplyButtonModeToInput(); if (gCoreSys.unk_64 == 0) { - while (TP_RequestRawSampling(&tpRaw) != 0); + while (TP_RequestRawSampling(&tpRaw) != 0) + ; } else { TP_GetLatestRawPointInAuto(&tpRaw); } @@ -383,7 +384,7 @@ void ReadKeypadAndTouchpad (void) gCoreSys.touchHeld = tp.touch; } -static void ApplyButtonModeToInput (void) +static void ApplyButtonModeToInput(void) { switch (gCoreSys.buttonMode) { default: @@ -402,21 +403,20 @@ static void ApplyButtonModeToInput (void) gCoreSys.pressedKeysRepeatable |= PAD_BUTTON_X; } break; - case BUTTON_MODE_SWAP_XY: - { - u32 tmp = 0; + case BUTTON_MODE_SWAP_XY: { + u32 tmp = 0; - if (gCoreSys.pressedKeys & PAD_BUTTON_X) { - tmp |= PAD_BUTTON_Y; - } - - if (gCoreSys.pressedKeys & PAD_BUTTON_Y) { - tmp |= PAD_BUTTON_X; - } + if (gCoreSys.pressedKeys & PAD_BUTTON_X) { + tmp |= PAD_BUTTON_Y; + } - gCoreSys.pressedKeys &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); - gCoreSys.pressedKeys |= tmp; + if (gCoreSys.pressedKeys & PAD_BUTTON_Y) { + tmp |= PAD_BUTTON_X; } + + gCoreSys.pressedKeys &= ((PAD_BUTTON_X | PAD_BUTTON_Y) ^ 0xffff); + gCoreSys.pressedKeys |= tmp; + } { u32 tmp = 0; @@ -466,25 +466,25 @@ static void ApplyButtonModeToInput (void) } } -void SetAutorepeat (int rate, int delay) +void SetAutorepeat(int rate, int delay) { gCoreSys.autorepeatRate = rate; gCoreSys.autorepeatDelay = delay; } -void ResetLock (u8 param0) +void ResetLock(u8 param0) { gCoreSys.inhibitReset |= param0; } -void ResetUnlock (u8 param0) +void ResetUnlock(u8 param0) { gCoreSys.inhibitReset &= ~(param0); } #define HEAP_CANARY 0x2f93a1bc -void InitHeapCanary (int heapID) +void InitHeapCanary(int heapID) { GF_ASSERT(gCoreSys.heapCanary == NULL); @@ -492,7 +492,7 @@ void InitHeapCanary (int heapID) *(gCoreSys.heapCanary) = HEAP_CANARY; } -void FreeHeapCanary (void) +void FreeHeapCanary(void) { GF_ASSERT(gCoreSys.heapCanary != NULL); @@ -501,7 +501,7 @@ void FreeHeapCanary (void) gCoreSys.heapCanary = NULL; } -BOOL HeapCanaryOK (void) +BOOL HeapCanaryOK(void) { if (gCoreSys.heapCanary && *gCoreSys.heapCanary == HEAP_CANARY) { return 1; diff --git a/src/unk_02018340.c b/src/unk_02018340.c index f4ac342e02..6bf90185b6 100644 --- a/src/unk_02018340.c +++ b/src/unk_02018340.c @@ -1,16 +1,18 @@ +#include "unk_02018340.h" + #include #include #include "struct_defs/struct_0201AE08.h" #include "struct_defs/struct_0205AA50.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "gx_layers.h" #include "heap.h" -#include "unk_02018340.h" #include "unk_0201D15C.h" -#include "gx_layers.h" enum { UnkEnum_00 = 0, @@ -18,7 +20,7 @@ enum { }; typedef struct { - void * unk_00; + void *unk_00; u32 unk_04; u32 unk_08; int unk_0C; @@ -42,39 +44,39 @@ typedef struct UnkStruct_02018340_t { } BGL; static u8 sub_02018F80(u8 param0, u8 param1); -static void sub_02019304(UnkStruct_02019304 * param0, u8 param1, int param2); -static void sub_020193E4(BGL * param0, u8 param1); -static void sub_020194E0(u8 param0, void * param1, u32 param2, u32 param3); -static void sub_020195B8(BGL * param0, u8 param1, const void * param2, u32 param3, u32 param4); -static void sub_020195FC(u8 param0, void * param1, u32 param2, u32 param3); -static void sub_020199E0(UnkStruct_02019304 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); -static void sub_02019B54(UnkStruct_02019304 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 * param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); -static void sub_02019D08(UnkStruct_02019304 * param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); -static void sub_02019DB8(UnkStruct_02019304 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); -static void sub_0201AC20(Window * param0); -static void sub_0201AC4C(Window * param0); -static void sub_0201AC64(Window * param0); -static void sub_0201ACA0(Window * param0); -static void sub_0201AD2C(Window * param0); -static void sub_0201AD54(Window * param0); -static void sub_0201AD68(Window * param0); -static void sub_0201AD90(Window * param0); -static void sub_0201C06C(Window * param0, u8 param1, u8 param2, u8 param3); -static void sub_0201C158(Window * param0, u8 param1, u8 param2, u8 param3); -static void sub_0201C8E0(BGL * param0, u8 param1, u8 * param2); -static void sub_0201AA58(Window * param0); -static void sub_0201AADC(Window * param0); -static void sub_0201AB38(Window * param0); -static void sub_0201ABC8(Window * param0); -static void sub_0201C684(UnkStruct_02019304 * param0, u8 param1, u16 param2); -static void sub_0201C6CC(UnkStruct_02019304 * param0, u8 param1, fx32 param2); -static void sub_0201C73C(UnkStruct_02019304 * param0, u8 param1, int param2); -static void sub_0201C3D0(BGL * param0); -static void sub_0201C2D0(BGL * param0); - -BGL * sub_02018340 (u32 param0) -{ - BGL * v0 = Heap_AllocFromHeap(param0, sizeof(BGL)); +static void sub_02019304(UnkStruct_02019304 *param0, u8 param1, int param2); +static void sub_020193E4(BGL *param0, u8 param1); +static void sub_020194E0(u8 param0, void *param1, u32 param2, u32 param3); +static void sub_020195B8(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4); +static void sub_020195FC(u8 param0, void *param1, u32 param2, u32 param3); +static void sub_020199E0(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); +static void sub_02019B54(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10); +static void sub_02019D08(UnkStruct_02019304 *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6); +static void sub_02019DB8(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5); +static void sub_0201AC20(Window *param0); +static void sub_0201AC4C(Window *param0); +static void sub_0201AC64(Window *param0); +static void sub_0201ACA0(Window *param0); +static void sub_0201AD2C(Window *param0); +static void sub_0201AD54(Window *param0); +static void sub_0201AD68(Window *param0); +static void sub_0201AD90(Window *param0); +static void sub_0201C06C(Window *param0, u8 param1, u8 param2, u8 param3); +static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3); +static void sub_0201C8E0(BGL *param0, u8 param1, u8 *param2); +static void sub_0201AA58(Window *param0); +static void sub_0201AADC(Window *param0); +static void sub_0201AB38(Window *param0); +static void sub_0201ABC8(Window *param0); +static void sub_0201C684(UnkStruct_02019304 *param0, u8 param1, u16 param2); +static void sub_0201C6CC(UnkStruct_02019304 *param0, u8 param1, fx32 param2); +static void sub_0201C73C(UnkStruct_02019304 *param0, u8 param1, int param2); +static void sub_0201C3D0(BGL *param0); +static void sub_0201C2D0(BGL *param0); + +BGL *sub_02018340(u32 param0) +{ + BGL *v0 = Heap_AllocFromHeap(param0, sizeof(BGL)); memset(v0, 0, sizeof(BGL)); @@ -85,12 +87,12 @@ BGL * sub_02018340 (u32 param0) return v0; } -u32 sub_02018364 (BGL * param0) +u32 sub_02018364(BGL *param0) { return param0->unk_00; } -void sub_02018368 (const UnkStruct_ov84_0223BA5C * param0) +void sub_02018368(const UnkStruct_ov84_0223BA5C *param0) { GX_SetGraphicsMode(param0->unk_00, param0->unk_04, param0->unk_0C); GXS_SetGraphicsMode(param0->unk_08); @@ -102,7 +104,7 @@ void sub_02018368 (const UnkStruct_ov84_0223BA5C * param0) GXLayers_DisableEngineBLayers(); } -void sub_020183A0 (const UnkStruct_ov84_0223BA5C * param0, u8 param1) +void sub_020183A0(const UnkStruct_ov84_0223BA5C *param0, u8 param1) { if (param1 == 0) { GX_SetGraphicsMode(param0->unk_00, param0->unk_04, param0->unk_0C); @@ -113,7 +115,7 @@ void sub_020183A0 (const UnkStruct_ov84_0223BA5C * param0, u8 param1) } } -void sub_020183C4 (BGL * param0, u8 param1, const UnkStruct_ov97_0222DB78 * param2, u8 param3) +void sub_020183C4(BGL *param0, u8 param1, const UnkStruct_ov97_0222DB78 *param2, u8 param3) { u8 v0 = sub_02018F80(param2->unk_10, param3); @@ -253,15 +255,14 @@ void sub_020183C4 (BGL * param0, u8 param1, const UnkStruct_ov97_0222DB78 * para sub_02019184(param0, param1, 3, param2->unk_04); } -void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) +void sub_02018898(BGL *param0, u8 param1, u8 param2, u8 param3) { if (param2 == 0) { param0->unk_08[param1].unk_16 = param3; } switch (param1) { - case 0: - { + case 0: { GXBg01Control v0 = G2_GetBG0Control(); if (param2 == 1) { @@ -271,10 +272,8 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2_SetBG0Control((GXBGScrSizeText)v0.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v0.screenBase, (GXBGCharBase)v0.charBase, (GXBGExtPltt)v0.bgExtPltt); - } - break; - case 1: - { + } break; + case 1: { GXBg01Control v1 = G2_GetBG1Control(); if (param2 == 1) { @@ -284,13 +283,11 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2_SetBG1Control((GXBGScrSizeText)v1.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v1.screenBase, (GXBGCharBase)v1.charBase, (GXBGExtPltt)v1.bgExtPltt); - } - break; + } break; case 2: switch (param0->unk_08[param1].unk_14) { default: - case 0: - { + case 0: { GXBg23ControlText v2 = G2_GetBG2ControlText(); if (param2 == 1) { @@ -300,10 +297,8 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2_SetBG2ControlText((GXBGScrSizeText)v2.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v2.screenBase, (GXBGCharBase)v2.charBase); - } - break; - case 1: - { + } break; + case 1: { GXBg23ControlAffine v3 = G2_GetBG2ControlAffine(); if (param2 == 1) { @@ -313,10 +308,8 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2_SetBG2ControlAffine((GXBGScrSizeText)v3.screenSize, (GXBGAreaOver)v3.areaOver, (GXBGScrBase)v3.screenBase, (GXBGCharBase)v3.charBase); - } - break; - case 2: - { + } break; + case 2: { GXBg23Control256x16Pltt v4 = G2_GetBG2Control256x16Pltt(); if (param2 == 1) { @@ -326,16 +319,14 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2_SetBG2Control256x16Pltt((GXBGScrSizeText)v4.screenSize, (GXBGAreaOver)v4.areaOver, (GXBGScrBase)v4.screenBase, (GXBGCharBase)v4.charBase); - } - break; + } break; } break; case 3: switch (param0->unk_08[param1].unk_14) { default: - case 0: - { + case 0: { GXBg23ControlText v5 = G2_GetBG3ControlText(); if (param2 == 1) { @@ -345,10 +336,8 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2_SetBG3ControlText((GXBGScrSizeText)v5.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v5.screenBase, (GXBGCharBase)v5.charBase); - } - break; - case 1: - { + } break; + case 1: { GXBg23ControlAffine v6 = G2_GetBG3ControlAffine(); if (param2 == 1) { @@ -358,10 +347,8 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2_SetBG3ControlAffine((GXBGScrSizeText)v6.screenSize, (GXBGAreaOver)v6.areaOver, (GXBGScrBase)v6.screenBase, (GXBGCharBase)v6.charBase); - } - break; - case 2: - { + } break; + case 2: { GXBg23Control256x16Pltt v7 = G2_GetBG3Control256x16Pltt(); if (param2 == 1) { @@ -371,13 +358,11 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2_SetBG3Control256x16Pltt((GXBGScrSizeText)v7.screenSize, (GXBGAreaOver)v7.areaOver, (GXBGScrBase)v7.screenBase, (GXBGCharBase)v7.charBase); - } - break; + } break; } break; - case 4: - { + case 4: { GXBg01Control v8 = G2S_GetBG0Control(); if (param2 == 1) { @@ -387,10 +372,8 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2S_SetBG0Control((GXBGScrSizeText)v8.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v8.screenBase, (GXBGCharBase)v8.charBase, (GXBGExtPltt)v8.bgExtPltt); - } - break; - case 5: - { + } break; + case 5: { GXBg01Control v9 = G2S_GetBG1Control(); if (param2 == 1) { @@ -400,13 +383,11 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2S_SetBG1Control((GXBGScrSizeText)v9.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v9.screenBase, (GXBGCharBase)v9.charBase, (GXBGExtPltt)v9.bgExtPltt); - } - break; + } break; case 6: switch (param0->unk_08[param1].unk_14) { default: - case 0: - { + case 0: { GXBg23ControlText v10 = G2S_GetBG2ControlText(); if (param2 == 1) { @@ -416,10 +397,8 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2S_SetBG2ControlText((GXBGScrSizeText)v10.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v10.screenBase, (GXBGCharBase)v10.charBase); - } - break; - case 1: - { + } break; + case 1: { GXBg23ControlAffine v11 = G2S_GetBG2ControlAffine(); if (param2 == 1) { @@ -429,10 +408,8 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2S_SetBG2ControlAffine((GXBGScrSizeText)v11.screenSize, (GXBGAreaOver)v11.areaOver, (GXBGScrBase)v11.screenBase, (GXBGCharBase)v11.charBase); - } - break; - case 2: - { + } break; + case 2: { GXBg23Control256x16Pltt v12 = G2S_GetBG2Control256x16Pltt(); if (param2 == 1) { @@ -442,16 +419,14 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2S_SetBG2Control256x16Pltt((GXBGScrSizeText)v12.screenSize, (GXBGAreaOver)v12.areaOver, (GXBGScrBase)v12.screenBase, (GXBGCharBase)v12.charBase); - } - break; + } break; } break; case 7: switch (param0->unk_08[param1].unk_14) { default: - case 0: - { + case 0: { GXBg23ControlText v13 = G2S_GetBG3ControlText(); if (param2 == 1) { @@ -461,10 +436,8 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2S_SetBG3ControlText((GXBGScrSizeText)v13.screenSize, (GXBGColorMode)param0->unk_08[param1].unk_16, (GXBGScrBase)v13.screenBase, (GXBGCharBase)v13.charBase); - } - break; - case 1: - { + } break; + case 1: { GXBg23ControlAffine v14 = G2S_GetBG3ControlAffine(); if (param2 == 1) { @@ -474,10 +447,8 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2S_SetBG3ControlAffine((GXBGScrSizeText)v14.screenSize, (GXBGAreaOver)v14.areaOver, (GXBGScrBase)v14.screenBase, (GXBGCharBase)v14.charBase); - } - break; - case 2: - { + } break; + case 2: { GXBg23Control256x16Pltt v15 = G2S_GetBG3Control256x16Pltt(); if (param2 == 1) { @@ -487,14 +458,13 @@ void sub_02018898 (BGL * param0, u8 param1, u8 param2, u8 param3) } G2S_SetBG3Control256x16Pltt((GXBGScrSizeText)v15.screenSize, (GXBGAreaOver)v15.areaOver, (GXBGScrBase)v15.screenBase, (GXBGCharBase)v15.charBase); - } - break; + } break; } break; } } -static u8 sub_02018F80 (u8 param0, u8 param1) +static u8 sub_02018F80(u8 param0, u8 param1) { switch (param1) { case 0: @@ -553,7 +523,7 @@ static u8 sub_02018F80 (u8 param0, u8 param1) return 0; } -static void sub_02018FF4 (u8 param0, u8 * param1, u8 * param2) +static void sub_02018FF4(u8 param0, u8 *param1, u8 *param2) { switch (param0) { case 0: @@ -583,7 +553,7 @@ static void sub_02018FF4 (u8 param0, u8 * param1, u8 * param2) } } -void sub_02019044 (BGL * param0, u8 param1) +void sub_02019044(BGL *param0, u8 param1) { if (param0->unk_08[param1].unk_00 == NULL) { return; @@ -593,7 +563,7 @@ void sub_02019044 (BGL * param0, u8 param1) param0->unk_08[param1].unk_00 = NULL; } -void BGL_SetPriority (u8 param0, u8 param1) +void BGL_SetPriority(u8 param0, u8 param1) { switch (param0) { case 0: @@ -623,7 +593,7 @@ void BGL_SetPriority (u8 param0, u8 param1) } } -void sub_02019120 (u8 param0, u8 param1) +void sub_02019120(u8 param0, u8 param1) { switch (param0) { case 0: @@ -653,7 +623,7 @@ void sub_02019120 (u8 param0, u8 param1) } } -void sub_02019184 (BGL * param0, u8 param1, u8 param2, int param3) +void sub_02019184(BGL *param0, u8 param1, u8 param2, int param3) { int v0, v1; @@ -707,17 +677,17 @@ void sub_02019184 (BGL * param0, u8 param1, u8 param2, int param3) } } -int sub_020192EC (BGL * param0, u32 param1) +int sub_020192EC(BGL *param0, u32 param1) { return param0->unk_08[param1].unk_0C; } -int sub_020192F8 (BGL * param0, u32 param1) +int sub_020192F8(BGL *param0, u32 param1) { return param0->unk_08[param1].unk_10; } -static void sub_02019304 (UnkStruct_02019304 * param0, u8 param1, int param2) +static void sub_02019304(UnkStruct_02019304 *param0, u8 param1, int param2) { switch (param1) { case 0: @@ -741,7 +711,7 @@ static void sub_02019304 (UnkStruct_02019304 * param0, u8 param1, int param2) } } -void sub_02019348 (BGL * param0, u8 param1, const MtxFx22 * param2, int param3, int param4) +void sub_02019348(BGL *param0, u8 param1, const MtxFx22 *param2, int param3, int param4) { switch (param1) { case 2: @@ -759,7 +729,7 @@ void sub_02019348 (BGL * param0, u8 param1, const MtxFx22 * param2, int param3, } } -static void sub_020193E4 (BGL * param0, u8 param1) +static void sub_020193E4(BGL *param0, u8 param1) { MtxFx22 v0; @@ -767,7 +737,7 @@ static void sub_020193E4 (BGL * param0, u8 param1) sub_02019348(param0, param1, &v0, 0, 0); } -void sub_02019410 (const void * param0, void * param1, u32 param2) +void sub_02019410(const void *param0, void *param1, u32 param2) { if (param2 == 0) { MI_UncompressLZ8(param0, param1); @@ -780,14 +750,14 @@ void sub_02019410 (const void * param0, void * param1, u32 param2) } } -void sub_02019448 (BGL * param0, u8 param1) +void sub_02019448(BGL *param0, u8 param1) { sub_02019460(param0, param1, param0->unk_08[param1].unk_00, param0->unk_08[param1].unk_04, param0->unk_08[param1].unk_08); } -void sub_02019460 (BGL * param0, u8 param1, const void * param2, u32 param3, u32 param4) +void sub_02019460(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4) { - void * v0; + void *v0; if (param3 == 0) { if (param0->unk_08[param1].unk_00 != NULL) { @@ -809,7 +779,7 @@ void sub_02019460 (BGL * param0, u8 param1, const void * param2, u32 param3, u32 } } -static void sub_020194E0 (u8 param0, void * param1, u32 param2, u32 param3) +static void sub_020194E0(u8 param0, void *param1, u32 param2, u32 param3) { DC_FlushRange(param1, param3); @@ -841,12 +811,12 @@ static void sub_020194E0 (u8 param0, void * param1, u32 param2, u32 param3) } } -void sub_02019574 (BGL * param0, u8 param1, const void * param2, u32 param3) +void sub_02019574(BGL *param0, u8 param1, const void *param2, u32 param3) { sub_02019410(param2, param0->unk_08[param1].unk_00, param3); } -void sub_0201958C (BGL * param0, u8 param1, const void * param2, u32 param3, u32 param4) +void sub_0201958C(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4) { if (param0->unk_08[param1].unk_16 == GX_BG_COLORMODE_16) { sub_020195B8(param0, param1, param2, param3, param4 * 0x20); @@ -855,9 +825,9 @@ void sub_0201958C (BGL * param0, u8 param1, const void * param2, u32 param3, u32 } } -static void sub_020195B8 (BGL * param0, u8 param1, const void * param2, u32 param3, u32 param4) +static void sub_020195B8(BGL *param0, u8 param1, const void *param2, u32 param3, u32 param4) { - void * v0; + void *v0; if (param3 == 0) { u32 v1; @@ -873,7 +843,7 @@ static void sub_020195B8 (BGL * param0, u8 param1, const void * param2, u32 para } } -static void sub_020195FC (u8 param0, void * param1, u32 param2, u32 param3) +static void sub_020195FC(u8 param0, void *param1, u32 param2, u32 param3) { DC_FlushRange(param1, param3); @@ -905,9 +875,9 @@ static void sub_020195FC (u8 param0, void * param1, u32 param2, u32 param3) } } -void sub_02019690 (u8 param0, u32 param1, u32 param2, u32 param3) +void sub_02019690(u8 param0, u32 param1, u32 param2, u32 param3) { - u32 * v0 = (u32 *)Heap_AllocFromHeapAtEnd(param3, param1); + u32 *v0 = (u32 *)Heap_AllocFromHeapAtEnd(param3, param1); memset(v0, 0, param1); @@ -915,9 +885,9 @@ void sub_02019690 (u8 param0, u32 param1, u32 param2, u32 param3) Heap_FreeToHeapExplicit(param3, v0); } -void sub_020196C0 (BGL * param0, u32 param1, u32 param2, u32 param3, u32 param4) +void sub_020196C0(BGL *param0, u32 param1, u32 param2, u32 param3, u32 param4) { - u32 * v0; + u32 *v0; u32 v1; v1 = param3 * param0->unk_08[param1].unk_17; @@ -936,7 +906,7 @@ void sub_020196C0 (BGL * param0, u32 param1, u32 param2, u32 param3, u32 param4) Heap_FreeToHeap(v0); } -void sub_0201972C (u8 param0, void * param1, u16 param2, u16 param3) +void sub_0201972C(u8 param0, void *param1, u16 param2, u16 param3) { DC_FlushRange((void *)param1, param2); @@ -947,12 +917,12 @@ void sub_0201972C (u8 param0, void * param1, u16 param2, u16 param3) } } -void sub_0201975C (u8 param0, u16 param1) +void sub_0201975C(u8 param0, u16 param1) { sub_0201972C(param0, ¶m1, 2, 0); } -static u16 sub_02019774 (u8 param0, u8 param1, u8 param2) +static u16 sub_02019774(u8 param0, u8 param1, u8 param2) { u16 v0; @@ -979,7 +949,7 @@ static u16 sub_02019774 (u8 param0, u8 param1, u8 param2) return v0; } -static u16 sub_020197E0 (u8 param0, u8 param1, u8 param2, u8 param3) +static u16 sub_020197E0(u8 param0, u8 param1, u8 param2, u8 param3) { u8 v0 = 0; u16 v1 = 0; @@ -1029,12 +999,12 @@ static u16 sub_020197E0 (u8 param0, u8 param1, u8 param2, u8 param3) return v1; } -void sub_020198C0 (BGL * param0, u8 param1, const void * param2, u8 param3, u8 param4, u8 param5, u8 param6) +void sub_020198C0(BGL *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6) { sub_020198E8(param0, param1, param3, param4, param5, param6, param2, 0, 0, param5, param6); } -void sub_020198E8 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void * param6, u8 param7, u8 param8, u8 param9, u8 param10) +void sub_020198E8(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) { if (param0->unk_08[param1].unk_14 != 1) { sub_020199E0(¶m0->unk_08[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 0); @@ -1043,7 +1013,7 @@ void sub_020198E8 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 } } -void sub_02019964 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void * param6, u8 param7, u8 param8, u8 param9, u8 param10) +void sub_02019964(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10) { if (param0->unk_08[param1].unk_14 != 1) { sub_020199E0(¶m0->unk_08[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 1); @@ -1052,9 +1022,9 @@ void sub_02019964 (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 } } -static void sub_020199E0 (UnkStruct_02019304 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 * param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10) +static void sub_020199E0(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10) { - u16 * v0; + u16 *v0; u8 v1, v2; u8 v3, v4; @@ -1096,9 +1066,9 @@ static void sub_020199E0 (UnkStruct_02019304 * param0, u8 param1, u8 param2, u8 } } -static void sub_02019B54 (UnkStruct_02019304 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 * param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10) +static void sub_02019B54(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u8 param8, u8 param9, u8 param10) { - u8 * v0; + u8 *v0; u8 v1, v2; u8 v3, v4; @@ -1140,7 +1110,7 @@ static void sub_02019B54 (UnkStruct_02019304 * param0, u8 param1, u8 param2, u8 } } -void sub_02019CB8 (BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7) +void sub_02019CB8(BGL *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7) { if (param0->unk_08[param1].unk_14 != 1) { sub_02019D08(¶m0->unk_08[param1], param2, param3, param4, param5, param6, param7); @@ -1149,9 +1119,9 @@ void sub_02019CB8 (BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 } } -static void sub_02019D08 (UnkStruct_02019304 * param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) +static void sub_02019D08(UnkStruct_02019304 *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) { - u16 * v0; + u16 *v0; u8 v1, v2; u8 v3, v4; @@ -1187,9 +1157,9 @@ static void sub_02019D08 (UnkStruct_02019304 * param0, u16 param1, u8 param2, u8 } } -static void sub_02019DB8 (UnkStruct_02019304 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5) +static void sub_02019DB8(UnkStruct_02019304 *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5) { - u8 * v0; + u8 *v0; u8 v1, v2; u8 v3, v4; @@ -1215,9 +1185,9 @@ static void sub_02019DB8 (UnkStruct_02019304 * param0, u8 param1, u8 param2, u8 } } -void sub_02019E2C (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) +void sub_02019E2C(BGL *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6) { - u16 * v0; + u16 *v0; u8 v1, v2; u8 v3, v4; @@ -1246,7 +1216,7 @@ void sub_02019E2C (BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 } } -void sub_02019EBC (BGL * param0, u8 param1) +void sub_02019EBC(BGL *param0, u8 param1) { if (param0->unk_08[param1].unk_00 == NULL) { return; @@ -1256,7 +1226,7 @@ void sub_02019EBC (BGL * param0, u8 param1) sub_02019448(param0, param1); } -void sub_02019EE0 (BGL * param0, u8 param1, u16 param2) +void sub_02019EE0(BGL *param0, u8 param1, u16 param2) { if (param0->unk_08[param1].unk_00 == NULL) { return; @@ -1266,7 +1236,7 @@ void sub_02019EE0 (BGL * param0, u8 param1, u16 param2) sub_02019448(param0, param1); } -void sub_02019F04 (BGL * param0, u8 param1, u16 param2) +void sub_02019F04(BGL *param0, u8 param1, u16 param2) { if (param0->unk_08[param1].unk_00 == NULL) { return; @@ -1276,7 +1246,7 @@ void sub_02019F04 (BGL * param0, u8 param1, u16 param2) sub_0201C3C0(param0, param1); } -void * sub_02019F28 (u8 param0) +void *sub_02019F28(u8 param0) { switch (param0) { case 0: @@ -1300,7 +1270,7 @@ void * sub_02019F28 (u8 param0) return NULL; } -void sub_02019F80 (const u8 * param0, u32 param1, u8 * param2, u8 param3) +void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3) { u32 v0; @@ -1321,9 +1291,9 @@ void sub_02019F80 (const u8 * param0, u32 param1, u8 * param2, u8 param3) } } -void * sub_02019FC0 (const u8 * param0, u32 param1, u8 param2, u32 param3) +void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3) { - void * v0; + void *v0; v0 = Heap_AllocFromHeap(param3, param1 * 2); sub_02019F80(param0, param1, (u8 *)v0, param2); @@ -1331,49 +1301,44 @@ void * sub_02019FC0 (const u8 * param0, u32 param1, u8 param2, u32 param3) return v0; } -void * sub_02019FE4 (BGL * param0, u8 param1) +void *sub_02019FE4(BGL *param0, u8 param1) { return param0->unk_08[param1].unk_00; } -int sub_02019FF0 (BGL * param0, u8 param1) +int sub_02019FF0(BGL *param0, u8 param1) { return param0->unk_08[param1].unk_0C; } -u16 sub_02019FFC (BGL * param0, u8 param1) +u16 sub_02019FFC(BGL *param0, u8 param1) { return param0->unk_08[param1].unk_18; } -u8 sub_0201A008 (BGL * param0, u8 param1) +u8 sub_0201A008(BGL *param0, u8 param1) { switch (param1) { - case 0: - { + case 0: { GXBg01Control v0 = G2_GetBG0Control(); return (u8)v0.priority; } - case 1: - { + case 1: { GXBg01Control v1 = G2_GetBG1Control(); return (u8)v1.priority; } case 2: switch (param0->unk_08[param1].unk_14) { default: - case 0: - { + case 0: { GXBg23ControlText v2 = G2_GetBG2ControlText(); return (u8)v2.priority; } - case 1: - { + case 1: { GXBg23ControlAffine v3 = G2_GetBG2ControlAffine(); return (u8)v3.priority; } - case 2: - { + case 2: { GXBg23Control256x16Pltt v4 = G2_GetBG2Control256x16Pltt(); return (u8)v4.priority; } @@ -1382,48 +1347,40 @@ u8 sub_0201A008 (BGL * param0, u8 param1) case 3: switch (param0->unk_08[param1].unk_14) { default: - case 0: - { + case 0: { GXBg23ControlText v5 = G2_GetBG3ControlText(); return (u8)v5.priority; } - case 1: - { + case 1: { GXBg23ControlAffine v6 = G2_GetBG3ControlAffine(); return (u8)v6.priority; } - case 2: - { + case 2: { GXBg23Control256x16Pltt v7 = G2_GetBG3Control256x16Pltt(); return (u8)v7.priority; } } - case 4: - { + case 4: { GXBg01Control v8 = G2S_GetBG0Control(); return (u8)v8.priority; } - case 5: - { + case 5: { GXBg01Control v9 = G2S_GetBG1Control(); return (u8)v9.priority; } case 6: switch (param0->unk_08[param1].unk_14) { default: - case 0: - { + case 0: { GXBg23ControlText v10 = G2S_GetBG2ControlText(); return (u8)v10.priority; } - case 1: - { + case 1: { GXBg23ControlAffine v11 = G2S_GetBG2ControlAffine(); return (u8)v11.priority; } - case 2: - { + case 2: { GXBg23Control256x16Pltt v12 = G2S_GetBG2Control256x16Pltt(); return (u8)v12.priority; } @@ -1432,18 +1389,15 @@ u8 sub_0201A008 (BGL * param0, u8 param1) case 7: switch (param0->unk_08[param1].unk_14) { default: - case 0: - { + case 0: { GXBg23ControlText v13 = G2S_GetBG3ControlText(); return (u8)v13.priority; } - case 1: - { + case 1: { GXBg23ControlAffine v14 = G2S_GetBG3ControlAffine(); return (u8)v14.priority; } - case 2: - { + case 2: { GXBg23Control256x16Pltt v15 = G2S_GetBG3Control256x16Pltt(); return (u8)v15.priority; } @@ -1453,10 +1407,10 @@ u8 sub_0201A008 (BGL * param0, u8 param1) return 0; } -void sub_0201A1E4 (const UnkStruct_0201AE08 * param0, const UnkStruct_0201AE08 * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) +void sub_0201A1E4(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) { int v0, v1, v2, v3, v4, v5, v6, v7, v8, v9; - u8 * v10, * v11; + u8 *v10, *v11; if (((param1->unk_04) - (param4)) < (param6)) { v6 = (param1->unk_04) - (param4) + (param2); @@ -1470,8 +1424,8 @@ void sub_0201A1E4 (const UnkStruct_0201AE08 * param0, const UnkStruct_0201AE08 * v7 = (param7) + (param3); } - v8 = ((((param0->unk_04)) + ((param0->unk_04) & 7)) >> 3); - v9 = ((((param1->unk_04)) + ((param1->unk_04) & 7)) >> 3); + v8 = (((param0->unk_04) + ((param0->unk_04) & 7)) >> 3); + v9 = (((param1->unk_04) + ((param1->unk_04) & 7)) >> 3); if (param8 == 0xffff) { for (v2 = (param3), v3 = (param5); v2 < v7; v2++, v3++) { @@ -1501,11 +1455,11 @@ void sub_0201A1E4 (const UnkStruct_0201AE08 * param0, const UnkStruct_0201AE08 * } } -void sub_0201A424 (const UnkStruct_0201AE08 * param0, const UnkStruct_0201AE08 * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) +void sub_0201A424(const UnkStruct_0201AE08 *param0, const UnkStruct_0201AE08 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8) { int v0, v1, v2, v3, v4, v5, v6, v7; - u8 * v8; - u8 * v9; + u8 *v8; + u8 *v9; if (((param1->unk_04) - (param4)) < (param6)) { v4 = (param1->unk_04) - (param4) + (param2); @@ -1519,22 +1473,22 @@ void sub_0201A424 (const UnkStruct_0201AE08 * param0, const UnkStruct_0201AE08 * v5 = (param7) + (param3); } - v6 = ((((param0->unk_04)) + ((param0->unk_04) & 7)) >> 3); - v7 = ((((param1->unk_04)) + ((param1->unk_04) & 7)) >> 3); + v6 = (((param0->unk_04) + ((param0->unk_04) & 7)) >> 3); + v7 = (((param1->unk_04) + ((param1->unk_04) & 7)) >> 3); if (param8 == 0xffff) { for (v2 = (param3), v3 = (param5); v2 < v5; v2++, v3++) { for (v0 = (param2), v1 = (param4); v0 < v4; v0++, v1++) { - v8 = (u8 *)(((param0->unk_00)) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v2 << 3) & 0x7fc0) * v6) + ((u32)((v2 << 3) & 0x38))); - v9 = (u8 *)(((param1->unk_00)) + (v1 & 0x7) + ((v1 << 3) & 0x7fc0) + (((v3 << 3) & 0x7fc0) * v7) + ((u32)((v3 << 3) & 0x38))); + v8 = (u8 *)((param0->unk_00) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v2 << 3) & 0x7fc0) * v6) + ((u32)((v2 << 3) & 0x38))); + v9 = (u8 *)((param1->unk_00) + (v1 & 0x7) + ((v1 << 3) & 0x7fc0) + (((v3 << 3) & 0x7fc0) * v7) + ((u32)((v3 << 3) & 0x38))); *v9 = *v8; } } } else { for (v2 = (param3), v3 = (param5); v2 < v5; v2++, v3++) { for (v0 = (param2), v1 = (param4); v0 < v4; v0++, v1++) { - v8 = (u8 *)(((param0->unk_00)) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v2 << 3) & 0x7fc0) * v6) + ((u32)((v2 << 3) & 0x38))); - v9 = (u8 *)(((param1->unk_00)) + (v1 & 0x7) + ((v1 << 3) & 0x7fc0) + (((v3 << 3) & 0x7fc0) * v7) + ((u32)((v3 << 3) & 0x38))); + v8 = (u8 *)((param0->unk_00) + (v0 & 0x7) + ((v0 << 3) & 0x7fc0) + (((v2 << 3) & 0x7fc0) * v6) + ((u32)((v2 << 3) & 0x38))); + v9 = (u8 *)((param1->unk_00) + (v1 & 0x7) + ((v1 << 3) & 0x7fc0) + (((v3 << 3) & 0x7fc0) * v7) + ((u32)((v3 << 3) & 0x38))); if (*v8 != (param8)) { *v9 = *v8; @@ -1544,10 +1498,10 @@ void sub_0201A424 (const UnkStruct_0201AE08 * param0, const UnkStruct_0201AE08 * } } -void sub_0201A60C (const UnkStruct_0201AE08 * param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) +void sub_0201A60C(const UnkStruct_0201AE08 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) { int v0, v1, v2, v3, v4; - u8 * v5; + u8 *v5; v2 = param1 + param3; @@ -1578,10 +1532,10 @@ void sub_0201A60C (const UnkStruct_0201AE08 * param0, u16 param1, u16 param2, u1 } } -void sub_0201A6D0 (const UnkStruct_0201AE08 * param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) +void sub_0201A6D0(const UnkStruct_0201AE08 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5) { int v0, v1, v2, v3, v4; - u8 * v5; + u8 *v5; v2 = param1 + param3; @@ -1605,9 +1559,9 @@ void sub_0201A6D0 (const UnkStruct_0201AE08 * param0, u16 param1, u16 param2, u1 } } -Window * sub_0201A778 (u32 param0, u8 param1) +Window *sub_0201A778(u32 param0, u8 param1) { - Window * v0; + Window *v0; u16 v1; v0 = (Window *)Heap_AllocFromHeap(param0, sizeof(Window) * param1); @@ -1619,7 +1573,7 @@ Window * sub_0201A778 (u32 param0, u8 param1) return v0; } -void Window_Init (Window * param0) +void Window_Init(Window *param0) { param0->unk_00 = NULL; param0->unk_04 = 0xff; @@ -1633,7 +1587,7 @@ void Window_Init (Window * param0) param0->unk_0A_15 = UnkEnum_00; } -u8 BGL_WindowAdded (Window * param0) +u8 BGL_WindowAdded(Window *param0) { if ((param0->unk_00 == NULL) || (param0->unk_04 == 0xff) || (param0->unk_0C == NULL)) { return 0; @@ -1642,9 +1596,9 @@ u8 BGL_WindowAdded (Window * param0) return 1; } -void BGL_AddWindow (BGL * param0, Window * param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8) +void BGL_AddWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8) { - void * v0; + void *v0; u32 v1; if (param0->unk_08[param2].unk_00 == NULL) { @@ -1670,9 +1624,9 @@ void BGL_AddWindow (BGL * param0, Window * param1, u8 param2, u8 param3, u8 para param1->unk_0A_15 = (param0->unk_08[param2].unk_16 == GX_BG_COLORMODE_16) ? UnkEnum_00 : UnkEnum_01; } -void BGL_AddFramelessWindow (BGL * param0, Window * param1, u8 param2, u8 param3, u16 param4, u8 param5) +void BGL_AddFramelessWindow(BGL *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5) { - void * v0; + void *v0; u32 v1; v1 = (u32)(param2 * param3 * 0x20); @@ -1693,13 +1647,13 @@ void BGL_AddFramelessWindow (BGL * param0, Window * param1, u8 param2, u8 param3 param1->unk_0A_15 = UnkEnum_00; } -void sub_0201A8D4 (BGL * param0, Window * param1, const UnkStruct_ov61_0222C884 * param2) +void sub_0201A8D4(BGL *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2) { BGL_AddWindow( param0, param1, param2->unk_00, param2->unk_01, param2->unk_02, param2->unk_03, param2->unk_04, param2->unk_05, param2->unk_06); } -void BGL_DeleteWindow (Window * param0) +void BGL_DeleteWindow(Window *param0) { Heap_FreeToHeap(param0->unk_0C); @@ -1714,7 +1668,7 @@ void BGL_DeleteWindow (Window * param0) param0->unk_0C = NULL; } -void sub_0201A928 (Window * param0, u8 param1) +void sub_0201A928(Window *param0, u8 param1) { u16 v0; @@ -1729,37 +1683,37 @@ void sub_0201A928 (Window * param0, u8 param1) Heap_FreeToHeap(param0); } -static void(*const Unk_020E56CC[])(Window *) = { +static void (*const Unk_020E56CC[])(Window *) = { sub_0201AC20, sub_0201AC64, sub_0201AC20 }; -static void(*const Unk_020E56C0[])(Window *) = { +static void (*const Unk_020E56C0[])(Window *) = { sub_0201AC4C, sub_0201ACA0, sub_0201AC4C }; -static void(*const Unk_020E56B4[])(Window *) = { +static void (*const Unk_020E56B4[])(Window *) = { sub_0201AD2C, sub_0201AD68, sub_0201AD2C }; -static void(*const Unk_020E56A8[])(Window *) = { +static void (*const Unk_020E56A8[])(Window *) = { sub_0201AD54, sub_0201AD90, sub_0201AD54 }; -static void(*const Unk_020E569C[])(Window *) = { +static void (*const Unk_020E569C[])(Window *) = { sub_0201AA58, sub_0201AADC, sub_0201AA58 }; -static void(*const Unk_020E56D8[])(Window *) = { +static void (*const Unk_020E56D8[])(Window *) = { sub_0201AB38, sub_0201ABC8, sub_0201AB38 @@ -1774,7 +1728,7 @@ static const u8 Unk_020E5694[] = { 0x20 }; -void sub_0201A954 (Window * param0) +void sub_0201A954(Window *param0) { GF_ASSERT(param0 != NULL); GF_ASSERT(param0->unk_00 != NULL); @@ -1784,7 +1738,7 @@ void sub_0201A954 (Window * param0) Unk_020E56CC[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); } -void sub_0201A9A4 (Window * param0) +void sub_0201A9A4(Window *param0) { GF_ASSERT(param0 != NULL); GF_ASSERT(param0->unk_00 != NULL); @@ -1794,12 +1748,12 @@ void sub_0201A9A4 (Window * param0) Unk_020E56C0[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); } -void sub_0201A9F4 (Window * param0) +void sub_0201A9F4(Window *param0) { Unk_020E569C[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); } -void sub_0201AA10 (Window * param0, u32 param1, u32 param2) +void sub_0201AA10(Window *param0, u32 param1, u32 param2) { u32 v0, v1; @@ -1815,16 +1769,16 @@ void sub_0201AA10 (Window * param0, u32 param1, u32 param2) param0->unk_08 = v1; } -void sub_0201AA3C (Window * param0) +void sub_0201AA3C(Window *param0) { Unk_020E56D8[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); } -static void sub_0201AA58 (Window * param0) +static void sub_0201AA58(Window *param0) { if (param0->unk_00->unk_08[param0->unk_04].unk_00) { u32 v0, v1, v2, v3, v4, v5, v6; - u16 * v7; + u16 *v7; v6 = 32; v7 = (u16 *)(param0->unk_00->unk_08[param0->unk_04].unk_00); @@ -1842,11 +1796,11 @@ static void sub_0201AA58 (Window * param0) } } -static void sub_0201AADC (Window * param0) +static void sub_0201AADC(Window *param0) { if (param0->unk_00->unk_08[param0->unk_04].unk_00) { int v0, v1, v2, v3; - u8 * v4; + u8 *v4; v3 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].unk_15]; v4 = (u8 *)(param0->unk_00->unk_08[param0->unk_04].unk_00) + param0->unk_06 * v3 + param0->unk_05; @@ -1862,11 +1816,11 @@ static void sub_0201AADC (Window * param0) } } -static void sub_0201AB38 (Window * param0) +static void sub_0201AB38(Window *param0) { if (param0->unk_00->unk_08[param0->unk_04].unk_00) { u32 v0, v1, v2, v3, v4, v5; - u16 * v6; + u16 *v6; v5 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].unk_15]; v6 = (u16 *)(param0->unk_00->unk_08[param0->unk_04].unk_00); @@ -1882,11 +1836,11 @@ static void sub_0201AB38 (Window * param0) } } -static void sub_0201ABC8 (Window * param0) +static void sub_0201ABC8(Window *param0) { if (param0->unk_00->unk_08[param0->unk_04].unk_00) { int v0, v1, v2; - u8 * v3; + u8 *v3; v2 = Unk_020E5694[param0->unk_00->unk_08[param0->unk_04].unk_15]; v3 = (u8 *)(param0->unk_00->unk_08[param0->unk_04].unk_00) + param0->unk_06 * v2 + param0->unk_05; @@ -1901,21 +1855,21 @@ static void sub_0201ABC8 (Window * param0) } } -static void sub_0201AC20 (Window * param0) +static void sub_0201AC20(Window *param0) { sub_0201AA58(param0); sub_0201ACCC(param0); sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].unk_00, param0->unk_00->unk_08[param0->unk_04].unk_04, param0->unk_00->unk_08[param0->unk_04].unk_08); } -static void sub_0201AC4C (Window * param0) +static void sub_0201AC4C(Window *param0) { sub_0201AA58(param0); sub_0201C3C0(param0->unk_00, param0->unk_04); sub_0201ACCC(param0); } -static void sub_0201AC64 (Window * param0) +static void sub_0201AC64(Window *param0) { sub_0201AADC(param0); @@ -1923,7 +1877,7 @@ static void sub_0201AC64 (Window * param0) sub_0201958C(param0->unk_00, param0->unk_04, param0->unk_0C, (u32)(param0->unk_07 * param0->unk_08 * 0x40), (u32)param0->unk_0A_0); } -static void sub_0201ACA0 (Window * param0) +static void sub_0201ACA0(Window *param0) { sub_0201AADC(param0); @@ -1931,47 +1885,47 @@ static void sub_0201ACA0 (Window * param0) sub_0201958C(param0->unk_00, param0->unk_04, param0->unk_0C, (u32)(param0->unk_07 * param0->unk_08 * 0x40), (u32)param0->unk_0A_0); } -void sub_0201ACCC (Window * param0) +void sub_0201ACCC(Window *param0) { u32 v0 = param0->unk_07 * param0->unk_08 * param0->unk_00->unk_08[param0->unk_04].unk_17; sub_0201958C(param0->unk_00, param0->unk_04, param0->unk_0C, v0, param0->unk_0A_0); } -void sub_0201ACF4 (Window * param0) +void sub_0201ACF4(Window *param0) { Unk_020E56B4[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); } -void sub_0201AD10 (Window * param0) +void sub_0201AD10(Window *param0) { Unk_020E56A8[param0->unk_00->unk_08[param0->unk_04].unk_14](param0); } -static void sub_0201AD2C (Window * param0) +static void sub_0201AD2C(Window *param0) { sub_0201AB38(param0); sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].unk_00, param0->unk_00->unk_08[param0->unk_04].unk_04, param0->unk_00->unk_08[param0->unk_04].unk_08); } -static void sub_0201AD54 (Window * param0) +static void sub_0201AD54(Window *param0) { sub_0201AB38(param0); sub_0201C3C0(param0->unk_00, param0->unk_04); } -static void sub_0201AD68 (Window * param0) +static void sub_0201AD68(Window *param0) { sub_0201ABC8(param0); sub_02019460(param0->unk_00, param0->unk_04, param0->unk_00->unk_08[param0->unk_04].unk_00, param0->unk_00->unk_08[param0->unk_04].unk_04, param0->unk_00->unk_08[param0->unk_04].unk_08); } -static void sub_0201AD90 (Window * param0) +static void sub_0201AD90(Window *param0) { sub_0201ABC8(param0); sub_0201C3C0(param0->unk_00, param0->unk_04); } -void BGL_FillWindow (Window * param0, u8 param1) +void BGL_FillWindow(Window *param0, u8 param1) { u32 v0; u32 v1; @@ -1986,12 +1940,12 @@ void BGL_FillWindow (Window * param0, u8 param1) MI_CpuFillFast(param0->unk_0C, v1, v0); } -void sub_0201ADDC (Window * param0, void * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9) +void sub_0201ADDC(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9) { sub_0201AE08(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9, 0); } -void sub_0201AE08 (Window * param0, void * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10) +void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10) { UnkStruct_0201AE08 v0; UnkStruct_0201AE08 v1; @@ -2010,7 +1964,7 @@ void sub_0201AE08 (Window * param0, void * param1, u16 param2, u16 param3, u16 p } } -void BGL_WindowColor (Window * param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5) +void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5) { UnkStruct_0201AE08 v0; @@ -2025,9 +1979,9 @@ void BGL_WindowColor (Window * param0, u8 param1, u16 param2, u16 param3, u16 pa } } -void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6) +void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6) { - u8 * v0; + u8 *v0; u16 v1, v2; int v3, v4; u8 v5; @@ -2060,20 +2014,20 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u if (param0->unk_0A_15 == UnkEnum_00) { switch (v5) { - case 0: - { + case 0: { int v7, v8, v9, v10, v17; u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; + u8 *v14; + const u8 *v15; u32 v16; v15 = (param1) + (0 / 8 * 0x40) + (0 / 8 * 0x20); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2087,16 +2041,21 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4; v9++) { - v16 = *(u32 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = *(u32 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); v11 = (u8)((v16 >> (v7 * 4)) & 0xf); + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); + v11 = (u8)((v16 >> (v7 * 4)) & 0xf); if (v11 != 0) { - v17 = (v8 & 1) * 4; v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); *v14 = v11; + v17 = (v8 & 1) * 4; + v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); + *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); *v14 = v11; + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); + *v14 = v11; } } } @@ -2111,20 +2070,20 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } }; return; - case 1: - { + case 1: { int v7, v8, v9, v10, v17; u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; + u8 *v14; + const u8 *v15; u32 v16; v15 = (param1) + (0 / 8 * 0x40) + (0 / 8 * 0x20); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2138,16 +2097,21 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4; v9++) { - v16 = *(u32 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = *(u32 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); v11 = (u8)((v16 >> (v7 * 4)) & 0xf); + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); + v11 = (u8)((v16 >> (v7 * 4)) & 0xf); if (v11 != 0) { - v17 = (v8 & 1) * 4; v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); *v14 = v11; + v17 = (v8 & 1) * 4; + v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); + *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); *v14 = v11; + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); + *v14 = v11; } } } @@ -2166,14 +2130,15 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; + u8 *v14; + const u8 *v15; u32 v16; v15 = (param1) + (0 / 8 * 0x40) + (8 / 8 * 0x20); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2187,16 +2152,21 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4; v9++) { - v16 = *(u32 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = *(u32 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); v11 = (u8)((v16 >> (v7 * 4)) & 0xf); + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); + v11 = (u8)((v16 >> (v7 * 4)) & 0xf); if (v11 != 0) { - v17 = (v8 & 1) * 4; v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); *v14 = v11; + v17 = (v8 & 1) * 4; + v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); + *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); *v14 = v11; + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); + *v14 = v11; } } } @@ -2211,20 +2181,20 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } } return; - case 2: - { + case 2: { int v7, v8, v9, v10, v17; u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; + u8 *v14; + const u8 *v15; u32 v16; v15 = (param1) + (0 / 8 * 0x40) + (0 / 8 * 0x20); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2238,16 +2208,21 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < 8; v9++) { - v16 = *(u32 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = *(u32 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); v11 = (u8)((v16 >> (v7 * 4)) & 0xf); + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); + v11 = (u8)((v16 >> (v7 * 4)) & 0xf); if (v11 != 0) { - v17 = (v8 & 1) * 4; v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); *v14 = v11; + v17 = (v8 & 1) * 4; + v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); + *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); *v14 = v11; + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); + *v14 = v11; } } } @@ -2265,10 +2240,15 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u int v7, v8, v9, v10, v17; u8 v11; u8 v12; - u8 v13; u8 * v14; const u8 * v15; u32 v16; v15 = (param1) + (8 / 8 * 0x40) + (0 / 8 * 0x20); + u8 v13; + u8 *v14; + const u8 *v15; + u32 v16; + v15 = (param1) + (8 / 8 * 0x40) + (0 / 8 * 0x20); if (8 == 0) { - v10 = (param5) + 8; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 8; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 8; @@ -2282,16 +2262,21 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = *(u32 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = *(u32 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); v11 = (u8)((v16 >> (v7 * 4)) & 0xf); + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); + v11 = (u8)((v16 >> (v7 * 4)) & 0xf); if (v11 != 0) { - v17 = (v8 & 1) * 4; v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); *v14 = v11; + v17 = (v8 & 1) * 4; + v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); + *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); *v14 = v11; + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); + *v14 = v11; } } } @@ -2306,20 +2291,20 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } } return; - case 3: - { + case 3: { int v7, v8, v9, v10, v17; u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; + u8 *v14; + const u8 *v15; u32 v16; v15 = (param1) + (0 / 8 * 0x40) + (0 / 8 * 0x20); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2333,16 +2318,21 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < 8; v9++) { - v16 = *(u32 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = *(u32 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); v11 = (u8)((v16 >> (v7 * 4)) & 0xf); + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); + v11 = (u8)((v16 >> (v7 * 4)) & 0xf); if (v11 != 0) { - v17 = (v8 & 1) * 4; v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); *v14 = v11; + v17 = (v8 & 1) * 4; + v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); + *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); *v14 = v11; + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); + *v14 = v11; } } } @@ -2361,14 +2351,15 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; + u8 *v14; + const u8 *v15; u32 v16; v15 = (param1) + (0 / 8 * 0x40) + (8 / 8 * 0x20); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2382,16 +2373,21 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < 8; v9++) { - v16 = *(u32 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = *(u32 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); v11 = (u8)((v16 >> (v7 * 4)) & 0xf); + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); + v11 = (u8)((v16 >> (v7 * 4)) & 0xf); if (v11 != 0) { - v17 = (v8 & 1) * 4; v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); *v14 = v11; + v17 = (v8 & 1) * 4; + v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); + *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); *v14 = v11; + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); + *v14 = v11; } } } @@ -2410,14 +2406,15 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; + u8 *v14; + const u8 *v15; u32 v16; v15 = (param1) + (8 / 8 * 0x40) + (0 / 8 * 0x20); if (8 == 0) { - v10 = (param5) + 8; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 8; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 8; @@ -2431,16 +2428,21 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = *(u32 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = *(u32 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); v11 = (u8)((v16 >> (v7 * 4)) & 0xf); + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); + v11 = (u8)((v16 >> (v7 * 4)) & 0xf); if (v11 != 0) { - v17 = (v8 & 1) * 4; v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); *v14 = v11; + v17 = (v8 & 1) * 4; + v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); + *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); *v14 = v11; + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); + *v14 = v11; } } } @@ -2459,14 +2461,15 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; + u8 *v14; + const u8 *v15; u32 v16; v15 = (param1) + (8 / 8 * 0x40) + (8 / 8 * 0x20); if (8 == 0) { - v10 = (param5) + 8; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 8; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 8; @@ -2480,16 +2483,21 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = *(u32 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = *(u32 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); v11 = (u8)((v16 >> (v7 * 4)) & 0xf); + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + (((v10 << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 2) & 0x1c))); + v11 = (u8)((v16 >> (v7 * 4)) & 0xf); if (v11 != 0) { - v17 = (v8 & 1) * 4; v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); *v14 = v11; + v17 = (v8 & 1) * 4; + v11 = (u8)((v11 << v17) | (*v14 & (0xf0 >> v17))); + *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); *v14 = v11; + v14 = (u8 *)((v0) + ((v8 >> 1) & 0x3) + ((v8 << 2) & 0x3fe0) + ((((v10 + 1) << 2) & 0x3fe0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 2) & 0x1c))); + *v14 = v11; } } } @@ -2506,23 +2514,23 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u return; } } else { - u8 * v6 = sub_02019FC0(param1, param2 * 4 * param3 * 8, param0->unk_09, param0->unk_00->unk_00); + u8 *v6 = sub_02019FC0(param1, param2 * 4 * param3 * 8, param0->unk_09, param0->unk_00->unk_00); switch (v5) { - case 0: - { + case 0: { int v7, v8, v9, v10; u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; - u8 * v16; + u8 *v14; + const u8 *v15; + u8 *v16; v15 = (v6) + (0 / 8 * 0x80) + (0 / 8 * 0x40); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2536,16 +2544,19 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4; v9++) { - v16 = (u8 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = (u8 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); v11 = v16[v7]; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); + v11 = v16[v7]; if (v11 != 0) { *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); *v14 = v11; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); + *v14 = v11; } } } @@ -2560,20 +2571,20 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } }; break; - case 1: - { + case 1: { int v7, v8, v9, v10; u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; - u8 * v16; + u8 *v14; + const u8 *v15; + u8 *v16; v15 = (v6) + (0 / 8 * 0x80) + (0 / 8 * 0x40); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2587,16 +2598,19 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4; v9++) { - v16 = (u8 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = (u8 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); v11 = v16[v7]; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); + v11 = v16[v7]; if (v11 != 0) { *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); *v14 = v11; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); + *v14 = v11; } } } @@ -2615,14 +2629,15 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; - u8 * v16; + u8 *v14; + const u8 *v15; + u8 *v16; v15 = (v6) + (0 / 8 * 0x80) + (8 / 8 * 0x40); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2636,16 +2651,19 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4; v9++) { - v16 = (u8 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = (u8 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); v11 = v16[v7]; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); + v11 = v16[v7]; if (v11 != 0) { *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); *v14 = v11; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); + *v14 = v11; } } } @@ -2660,12 +2678,19 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } } break; - case 2: - { - int v7, v8, v9, v10; u8 v11; u8 v12; u8 v13; u8 * v14; const u8 * v15; u8 * v16; v15 = (v6) + (0 / 8 * 0x80) + (0 / 8 * 0x40); + case 2: { + int v7, v8, v9, v10; + u8 v11; + u8 v12; + u8 v13; + u8 *v14; + const u8 *v15; + u8 *v16; + v15 = (v6) + (0 / 8 * 0x80) + (0 / 8 * 0x40); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2679,16 +2704,19 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < 8; v9++) { - v16 = (u8 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = (u8 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); v11 = v16[v7]; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); + v11 = v16[v7]; if (v11 != 0) { *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); *v14 = v11; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); + *v14 = v11; } } } @@ -2707,14 +2735,15 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; - u8 * v16; + u8 *v14; + const u8 *v15; + u8 *v16; v15 = (v6) + (8 / 8 * 0x80) + (0 / 8 * 0x40); if (8 == 0) { - v10 = (param5) + 8; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 8; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 8; @@ -2728,16 +2757,19 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = (u8 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = (u8 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < v3; v7++, v8++) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); v11 = v16[v7]; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); + v11 = v16[v7]; if (v11 != 0) { *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); *v14 = v11; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); + *v14 = v11; } } } @@ -2752,20 +2784,20 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } } break; - case 3: - { + case 3: { int v7, v8, v9, v10; u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; - u8 * v16; + u8 *v14; + const u8 *v15; + u8 *v16; v15 = (v6) + (0 / 8 * 0x80) + (0 / 8 * 0x40); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2779,16 +2811,19 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < 8; v9++) { - v16 = (u8 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = (u8 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); v11 = v16[v7]; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); + v11 = v16[v7]; if (v11 != 0) { *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); *v14 = v11; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); + *v14 = v11; } } } @@ -2807,14 +2842,15 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; - u8 * v16; + u8 *v14; + const u8 *v15; + u8 *v16; v15 = (v6) + (0 / 8 * 0x80) + (8 / 8 * 0x40); if (0 == 0) { - v10 = (param5) + 0; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 0; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 0; @@ -2828,16 +2864,19 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < 8; v9++) { - v16 = (u8 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = (u8 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); v11 = v16[v7]; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); + v11 = v16[v7]; if (v11 != 0) { *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); *v14 = v11; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); + *v14 = v11; } } } @@ -2856,14 +2895,15 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u u8 v11; u8 v12; u8 v13; - u8 * v14; - const u8 * v15; - u8 * v16; + u8 *v14; + const u8 *v15; + u8 *v16; v15 = (v6) + (8 / 8 * 0x80) + (0 / 8 * 0x40); if (8 == 0) { - v10 = (param5) + 8; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 8; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 8; @@ -2877,16 +2917,19 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = (u8 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = (u8 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 0; v7 < 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); v11 = v16[v7]; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); + v11 = v16[v7]; if (v11 != 0) { *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); *v14 = v11; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); + *v14 = v11; } } } @@ -2901,10 +2944,18 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } } { - int v7, v8, v9, v10; u8 v11; u8 v12; u8 v13; u8 * v14; const u8 * v15; u8 * v16; v15 = (v6) + (8 / 8 * 0x80) + (8 / 8 * 0x40); + int v7, v8, v9, v10; + u8 v11; + u8 v12; + u8 v13; + u8 *v14; + const u8 *v15; + u8 *v16; + v15 = (v6) + (8 / 8 * 0x80) + (8 / 8 * 0x40); if (8 == 0) { - v10 = (param5) + 8; v13 = (u8)((param6) & 0xff); + v10 = (param5) + 8; + v13 = (u8)((param6) & 0xff); } else { v10 = (param5) + 8; @@ -2918,16 +2969,19 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } for (v9 = 0; v9 < v4 - 8; v9++) { - v16 = (u8 *)v15; v12 = (u8)((v13 >> v9) & 1); + v16 = (u8 *)v15; + v12 = (u8)((v13 >> v9) & 1); for (v7 = 0, v8 = (param4) + 8; v7 < v3 - 8; v7++, v8++) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); v11 = v16[v7]; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + (((v10 << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)((v10 << 3) & 0x38))); + v11 = v16[v7]; if (v11 != 0) { *v14 = v11; if (v12 != 0) { - v14 = (u8 *)(((v0)) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * ((((v1)) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); *v14 = v11; + v14 = (u8 *)((v0) + (v8 & 0x7) + ((v8 << 3) & 0x7fc0) + ((((v10 + 1) << 3) & 0x7fc0) * (((v1) + ((v1) & 7)) >> 3)) + ((u32)(((v10 + 1) << 3) & 0x38))); + *v14 = v11; } } } @@ -2948,7 +3002,7 @@ void sub_0201AED0 (Window * param0, const u8 * param1, u16 param2, u16 param3, u } } -void sub_0201C04C (Window * param0, u8 param1, u8 param2, u8 param3) +void sub_0201C04C(Window *param0, u8 param1, u8 param2, u8 param3) { if (param0->unk_00->unk_08[param0->unk_04].unk_16 == GX_BG_COLORMODE_16) { sub_0201C06C(param0, param1, param2, param3); @@ -2957,9 +3011,9 @@ void sub_0201C04C (Window * param0, u8 param1, u8 param2, u8 param3) } } -static void sub_0201C06C (Window * param0, u8 param1, u8 param2, u8 param3) +static void sub_0201C06C(Window *param0, u8 param1, u8 param2, u8 param3) { - u8 * v0; + u8 *v0; int v1, v2, v3; int v4, v5; int v6, v7; @@ -3017,9 +3071,9 @@ static void sub_0201C06C (Window * param0, u8 param1, u8 param2, u8 param3) } } -static void sub_0201C158 (Window * param0, u8 param1, u8 param2, u8 param3) +static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3) { - u8 * v0; + u8 *v0; int v1, v2, v3; int v4, v5; int v6, v7; @@ -3094,57 +3148,57 @@ static void sub_0201C158 (Window * param0, u8 param1, u8 param2, u8 param3) } } -BGL * sub_0201C28C (Window * param0) +BGL *sub_0201C28C(Window *param0) { return param0->unk_00; } -u8 sub_0201C290 (Window * param0) +u8 sub_0201C290(Window *param0) { return param0->unk_04; } -u8 sub_0201C294 (Window * param0) +u8 sub_0201C294(Window *param0) { return param0->unk_07; } -u8 sub_0201C298 (Window * param0) +u8 sub_0201C298(Window *param0) { return param0->unk_08; } -u8 sub_0201C29C (Window * param0) +u8 sub_0201C29C(Window *param0) { return param0->unk_05; } -u8 sub_0201C2A0 (Window * param0) +u8 sub_0201C2A0(Window *param0) { return param0->unk_06; } -u16 sub_0201C2A4 (Window * param0) +u16 sub_0201C2A4(Window *param0) { return param0->unk_0A_0; } -void sub_0201C2AC (Window * param0, u8 param1) +void sub_0201C2AC(Window *param0, u8 param1) { param0->unk_05 = param1; } -void sub_0201C2B0 (Window * param0, u8 param1) +void sub_0201C2B0(Window *param0, u8 param1) { param0->unk_06 = param1; } -void sub_0201C2B4 (Window * param0, u8 param1) +void sub_0201C2B4(Window *param0, u8 param1) { param0->unk_09 = param1; } -void sub_0201C2B8 (BGL * param0) +void sub_0201C2B8(BGL *param0) { sub_0201C3D0(param0); sub_0201C2D0(param0); @@ -3153,7 +3207,7 @@ void sub_0201C2B8 (BGL * param0) param0->unk_06 = 0; } -static void sub_0201C2D0 (BGL * param0) +static void sub_0201C2D0(BGL *param0) { if ((param0->unk_06 & 1) != 0) { sub_020194E0(0, param0->unk_08[0].unk_00, param0->unk_08[0].unk_08 * 0x2, param0->unk_08[0].unk_04); @@ -3188,12 +3242,12 @@ static void sub_0201C2D0 (BGL * param0) } } -void sub_0201C3C0 (BGL * param0, u8 param1) +void sub_0201C3C0(BGL *param0, u8 param1) { param0->unk_06 |= (1 << param1); } -static void sub_0201C3D0 (BGL * param0) +static void sub_0201C3D0(BGL *param0) { if ((param0->unk_04 & 1) != 0) { G2_SetBG0Offset(param0->unk_08[0].unk_0C, param0->unk_08[0].unk_10); @@ -3256,19 +3310,19 @@ static void sub_0201C3D0 (BGL * param0) } } -void sub_0201C63C (BGL * param0, u8 param1, u8 param2, int param3) +void sub_0201C63C(BGL *param0, u8 param1, u8 param2, int param3) { sub_02019304(¶m0->unk_08[param1], param2, param3); param0->unk_04 |= (1 << param1); } -void sub_0201C660 (BGL * param0, u8 param1, u8 param2, u16 param3) +void sub_0201C660(BGL *param0, u8 param1, u8 param2, u16 param3) { sub_0201C684(¶m0->unk_08[param1], param2, param3); param0->unk_04 |= (1 << param1); } -static void sub_0201C684 (UnkStruct_02019304 * param0, u8 param1, u16 param2) +static void sub_0201C684(UnkStruct_02019304 *param0, u8 param1, u16 param2) { switch (param1) { case 0: @@ -3283,13 +3337,13 @@ static void sub_0201C684 (UnkStruct_02019304 * param0, u8 param1, u16 param2) } } -void sub_0201C6A8 (BGL * param0, u8 param1, u8 param2, fx32 param3) +void sub_0201C6A8(BGL *param0, u8 param1, u8 param2, fx32 param3) { sub_0201C6CC(¶m0->unk_08[param1], param2, param3); param0->unk_04 |= (1 << param1); } -static void sub_0201C6CC (UnkStruct_02019304 * param0, u8 param1, fx32 param2) +static void sub_0201C6CC(UnkStruct_02019304 *param0, u8 param1, fx32 param2) { switch (param1) { case 3: @@ -3313,13 +3367,13 @@ static void sub_0201C6CC (UnkStruct_02019304 * param0, u8 param1, fx32 param2) } } -void sub_0201C718 (BGL * param0, u8 param1, u8 param2, int param3) +void sub_0201C718(BGL *param0, u8 param1, u8 param2, int param3) { sub_0201C73C(¶m0->unk_08[param1], param2, param3); param0->unk_04 |= (1 << param1); } -static void sub_0201C73C (UnkStruct_02019304 * param0, u8 param1, int param2) +static void sub_0201C73C(UnkStruct_02019304 *param0, u8 param1, int param2) { switch (param1) { case 9: @@ -3343,9 +3397,9 @@ static void sub_0201C73C (UnkStruct_02019304 * param0, u8 param1, int param2) } } -u8 sub_0201C784 (BGL * param0, u8 param1, u16 param2, u16 param3, u16 * param4) +u8 sub_0201C784(BGL *param0, u8 param1, u16 param2, u16 param3, u16 *param4) { - u8 * v0; + u8 *v0; u16 v1; u8 v2, v3; u8 v4; @@ -3361,8 +3415,8 @@ u8 sub_0201C784 (BGL * param0, u8 param1, u16 param2, u16 param3, u16 * param4) v3 = (u8)(param3 & 7); if (param0->unk_08[param1].unk_16 == GX_BG_COLORMODE_16) { - u16 * v6; - u8 * v7; + u16 *v6; + u8 *v7; v6 = (u16 *)param0->unk_08[param1].unk_00; v7 = Heap_AllocFromHeapAtEnd(param0->unk_00, 64); @@ -3383,8 +3437,8 @@ u8 sub_0201C784 (BGL * param0, u8 param1, u16 param2, u16 param3, u16 * param4) } } else { if (param0->unk_08[param1].unk_14 != 1) { - u16 * v8; - u8 * v9; + u16 *v8; + u8 *v9; v8 = (u16 *)param0->unk_08[param1].unk_00; v9 = Heap_AllocFromHeapAtEnd(param0->unk_00, 64); @@ -3395,7 +3449,7 @@ u8 sub_0201C784 (BGL * param0, u8 param1, u16 param2, u16 param3, u16 * param4) v4 = v9[v2 + (v3 << 3)]; Heap_FreeToHeap(v9); } else { - u8 * v10 = (u8 *)param0->unk_08[param1].unk_00; + u8 *v10 = (u8 *)param0->unk_08[param1].unk_00; v4 = v0[(v10[v1] << 6) + v2 + (v3 << 3)]; } @@ -3416,9 +3470,9 @@ u8 sub_0201C784 (BGL * param0, u8 param1, u16 param2, u16 param3, u16 * param4) return 0; } -static void sub_0201C8E0 (BGL * param0, u8 param1, u8 * param2) +static void sub_0201C8E0(BGL *param0, u8 param1, u8 *param2) { - u8 * v0; + u8 *v0; u8 v1, v2; if (param1 == 0) { diff --git a/src/unk_0201C970.c b/src/unk_0201C970.c index 99e409da8d..a47b7ba1f2 100644 --- a/src/unk_0201C970.c +++ b/src/unk_0201C970.c @@ -1,20 +1,21 @@ +#include "unk_0201C970.h" + #include -#include #include +#include #include "struct_defs/struct_0207C690.h" -#include "unk_02017728.h" -#include "unk_0201C970.h" #include "gx_layers.h" +#include "unk_02017728.h" #include "unk_02024220.h" -void sub_0201C9CC(NNSG3dResMdl ** param0, NNSG3dResFileHeader ** param1); +void sub_0201C9CC(NNSG3dResMdl **param0, NNSG3dResFileHeader **param1); static void sub_0201CB1C(void); -void sub_0201C970 (const u8 param0, const char * param1, NNSG3dResMdl ** param2, NNSG3dResFileHeader ** param3) +void sub_0201C970(const u8 param0, const char *param1, NNSG3dResMdl **param2, NNSG3dResFileHeader **param3) { - NNSG3dResTex * v0 = NULL; + NNSG3dResTex *v0 = NULL; BOOL v1; *param3 = ReadFileToHeap(param0, param1); @@ -33,9 +34,9 @@ void sub_0201C970 (const u8 param0, const char * param1, NNSG3dResMdl ** param2, *param2 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*param3), 0); } -void sub_0201C9CC (NNSG3dResMdl ** param0, NNSG3dResFileHeader ** param1) +void sub_0201C9CC(NNSG3dResMdl **param0, NNSG3dResFileHeader **param1) { - NNSG3dResTex * v0 = NULL; + NNSG3dResTex *v0 = NULL; BOOL v1; v0 = NNS_G3dGetTex(*param1); @@ -51,20 +52,20 @@ void sub_0201C9CC (NNSG3dResMdl ** param0, NNSG3dResFileHeader ** param1) *param0 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*param1), 0); } -void sub_0201CA24 (const u8 param0, const char * param1, NNSG3dRenderObj * param2, NNSG3dResMdl ** param3, NNSG3dResFileHeader ** param4) +void sub_0201CA24(const u8 param0, const char *param1, NNSG3dRenderObj *param2, NNSG3dResMdl **param3, NNSG3dResFileHeader **param4) { sub_0201C970(param0, param1, param3, param4); NNS_G3dRenderObjInit(param2, *param3); } -void sub_0201CA3C (NNSG3dRenderObj * param0, NNSG3dResMdl ** param1, NNSG3dResFileHeader ** param2) +void sub_0201CA3C(NNSG3dRenderObj *param0, NNSG3dResMdl **param1, NNSG3dResFileHeader **param2) { sub_0201C9CC(param1, param2); GF_ASSERT(param1); NNS_G3dRenderObjInit(param0, *param1); } -BOOL sub_0201CA5C (NNSG3dResTex * param0) +BOOL sub_0201CA5C(NNSG3dResTex *param0) { if ((param0->texInfo.flag & NNS_G3D_RESTEX_LOADED) || (param0->tex4x4Info.flag & NNS_G3D_RESTEX4x4_LOADED)) { return 1; @@ -73,7 +74,7 @@ BOOL sub_0201CA5C (NNSG3dResTex * param0) return 0; } -void sub_0201CA74 (NNSG3dRenderObj * param0, const VecFx32 * param1, const MtxFx33 * param2, const VecFx32 * param3) +void sub_0201CA74(NNSG3dRenderObj *param0, const VecFx32 *param1, const MtxFx33 *param2, const VecFx32 *param3) { NNS_G3dGlbSetBaseTrans(param1); NNS_G3dGlbSetBaseRot(param2); @@ -82,7 +83,7 @@ void sub_0201CA74 (NNSG3dRenderObj * param0, const VecFx32 * param1, const MtxFx NNS_G3dDraw(param0); } -void sub_0201CAB0 (NNSG3dRenderObj * param0, const VecFx32 * param1, const MtxFx33 * param2, const VecFx32 * param3) +void sub_0201CAB0(NNSG3dRenderObj *param0, const VecFx32 *param1, const MtxFx33 *param2, const VecFx32 *param3) { NNS_G3dGlbSetBaseTrans(param1); NNS_G3dGlbSetBaseRot(param2); @@ -92,14 +93,14 @@ void sub_0201CAB0 (NNSG3dRenderObj * param0, const VecFx32 * param1, const MtxFx NNS_G3dGeFlushBuffer(); } -static GenericPointerData * Unk_021BFB0C = NULL; +static GenericPointerData *Unk_021BFB0C = NULL; -void sub_0201CAF4 (const u8 param0) +void sub_0201CAF4(const u8 param0) { Unk_021BFB0C = sub_02024220(param0, 0, 2, 0, 4, sub_0201CB1C); } -static void sub_0201CB1C (void) +static void sub_0201CB1C(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); @@ -114,14 +115,14 @@ static void sub_0201CB1C (void) G3_ViewPort(0, 0, 255, 191); } -void sub_0201CBA0 (void) +void sub_0201CBA0(void) { sub_020242C4(Unk_021BFB0C); } -BOOL sub_0201CBB0 (void * param0, NNSG3dResTex * param1) +BOOL sub_0201CBB0(void *param0, NNSG3dResTex *param1) { - NNSG3dResMdlSet * v0 = NNS_G3dGetMdlSet((NNSG3dResFileHeader *)param0); + NNSG3dResMdlSet *v0 = NNS_G3dGetMdlSet((NNSG3dResFileHeader *)param0); NNS_G3D_NULL_ASSERT(v0); @@ -135,7 +136,7 @@ BOOL sub_0201CBB0 (void * param0, NNSG3dResTex * param1) return 0; } -BOOL sub_0201CBCC (NNSG3dResTex * param0) +BOOL sub_0201CBCC(NNSG3dResTex *param0) { if (param0 == NULL) { return 0; diff --git a/src/unk_0201CED8.c b/src/unk_0201CED8.c index 0b01294ca3..39e57913bd 100644 --- a/src/unk_0201CED8.c +++ b/src/unk_0201CED8.c @@ -1,20 +1,20 @@ +#include "unk_0201CED8.h" + #include #include #include "struct_defs/struct_0201CFEC.h" -#include "unk_0201CED8.h" - -static void sub_0201D018(const fx16 param0, const fx16 param1, const fx16 param2, const fx16 param3, const fx16 param4, const fx16 param5, GXBoxTestParam * param6); -static u32 sub_0201D03C(const GXBoxTestParam * param0); -static void sub_0201D090(const fx32 param0, fx16 * param1, int * param2); +static void sub_0201D018(const fx16 param0, const fx16 param1, const fx16 param2, const fx16 param3, const fx16 param4, const fx16 param5, GXBoxTestParam *param6); +static u32 sub_0201D03C(const GXBoxTestParam *param0); +static void sub_0201D090(const fx32 param0, fx16 *param1, int *param2); -u32 sub_0201CED8 (const NNSG3dResMdl * param0, const VecFx32 * param1, const MtxFx33 * param2, const VecFx32 * param3) +u32 sub_0201CED8(const NNSG3dResMdl *param0, const VecFx32 *param1, const MtxFx33 *param2, const VecFx32 *param3) { u32 v0; GXBoxTestParam v1; VecFx32 v2; - NNSG3dResMdlInfo * v3; + NNSG3dResMdlInfo *v3; v2 = *param1; v3 = NNS_G3dGetMdlInfo(param0); @@ -34,7 +34,7 @@ u32 sub_0201CED8 (const NNSG3dResMdl * param0, const VecFx32 * param1, const Mtx return v0; } -u32 sub_0201CF7C (const VecFx32 * param0, const UnkStruct_0201CFEC * param1) +u32 sub_0201CF7C(const VecFx32 *param0, const UnkStruct_0201CFEC *param1) { u32 v0; GXBoxTestParam v1; @@ -52,14 +52,14 @@ u32 sub_0201CF7C (const VecFx32 * param0, const UnkStruct_0201CFEC * param1) return v0; } -void sub_0201CFEC (const fx32 param0, const fx32 param1, const fx32 param2, UnkStruct_0201CFEC * param3) +void sub_0201CFEC(const fx32 param0, const fx32 param1, const fx32 param2, UnkStruct_0201CFEC *param3) { sub_0201D090(param0, ¶m3->unk_00, ¶m3->unk_08); sub_0201D090(param1, ¶m3->unk_02, ¶m3->unk_0C); sub_0201D090(param2, ¶m3->unk_04, ¶m3->unk_10); } -static void sub_0201D018 (const fx16 param0, const fx16 param1, const fx16 param2, const fx16 param3, const fx16 param4, const fx16 param5, GXBoxTestParam * param6) +static void sub_0201D018(const fx16 param0, const fx16 param1, const fx16 param2, const fx16 param3, const fx16 param4, const fx16 param5, GXBoxTestParam *param6) { param6->x = param0; param6->y = param1; @@ -69,7 +69,7 @@ static void sub_0201D018 (const fx16 param0, const fx16 param1, const fx16 param param6->depth = param5; } -static u32 sub_0201D03C (const GXBoxTestParam * param0) +static u32 sub_0201D03C(const GXBoxTestParam *param0) { s32 v0 = 1; @@ -86,7 +86,7 @@ static u32 sub_0201D03C (const GXBoxTestParam * param0) return v0; } -static void sub_0201D090 (const fx32 param0, fx16 * param1, int * param2) +static void sub_0201D090(const fx32 param0, fx16 *param1, int *param2) { int v0; u8 v1; diff --git a/src/unk_0201D15C.c b/src/unk_0201D15C.c index 76fa13413c..8e63960a75 100644 --- a/src/unk_0201D15C.c +++ b/src/unk_0201D15C.c @@ -1,10 +1,10 @@ +#include "unk_0201D15C.h" + #include #include -#include "inlines.h" - #include "heap.h" -#include "unk_0201D15C.h" +#include "inlines.h" typedef struct { MATHCRC16Table unk_00; @@ -12,7 +12,7 @@ typedef struct { static u16 LCRNG_NextFrom(u32 *seed); -fx32 sub_0201D15C (u16 param0) +fx32 sub_0201D15C(u16 param0) { if (param0 >= 360) { return 0; @@ -23,13 +23,13 @@ fx32 sub_0201D15C (u16 param0) fx32 v1; v0 = FX_SinIdx(sub_0201D278(param0)); - v1 = FX32_CONST(FX_FX16_TO_F32((v0))); + v1 = FX32_CONST(FX_FX16_TO_F32(v0)); return v1; } } -fx32 sub_0201D1D4 (u16 param0) +fx32 sub_0201D1D4(u16 param0) { if (param0 >= 360) { return 0; @@ -40,25 +40,25 @@ fx32 sub_0201D1D4 (u16 param0) fx32 v1; v0 = FX_CosIdx(sub_0201D278(param0)); - v1 = FX32_CONST(FX_FX16_TO_F32((v0))); + v1 = FX32_CONST(FX_FX16_TO_F32(v0)); return v1; } } -fx32 sub_0201D250 (u16 param0) +fx32 sub_0201D250(u16 param0) { param0 %= 360; return sub_0201D15C(param0); } -fx32 sub_0201D264 (u16 param0) +fx32 sub_0201D264(u16 param0) { param0 %= 360; return sub_0201D1D4(param0); } -u16 sub_0201D278 (u16 param0) +u16 sub_0201D278(u16 param0) { if (param0 >= 360) { return 0; @@ -67,19 +67,19 @@ u16 sub_0201D278 (u16 param0) return FX_DEG_TO_IDX(param0 * FX32_ONE); } -u16 sub_0201D2A4 (u16 param0) +u16 sub_0201D2A4(u16 param0) { param0 %= 360; return sub_0201D278(param0); } -fx32 sub_0201D2B8 (fx32 param0) +fx32 sub_0201D2B8(fx32 param0) { u16 v0 = param0 >> FX32_SHIFT; return sub_0201D250(v0); } -fx32 sub_0201D2C4 (fx32 param0) +fx32 sub_0201D2C4(fx32 param0) { u16 v0 = param0 >> FX32_SHIFT; return sub_0201D264(v0); @@ -87,32 +87,32 @@ fx32 sub_0201D2C4 (fx32 param0) u32 gLCRNG_State; -u32 LCRNG_GetSeed (void) +u32 LCRNG_GetSeed(void) { return gLCRNG_State; } -void LCRNG_SetSeed (u32 seed) +void LCRNG_SetSeed(u32 seed) { gLCRNG_State = seed; } -u16 LCRNG_Next (void) +u16 LCRNG_Next(void) { gLCRNG_State = gLCRNG_State * 1103515245L + 24691; return (u16)(gLCRNG_State / 65536L); } -u32 ARNG_Next (u32 seed) +u32 ARNG_Next(u32 seed) { return seed * 1812433253L + 1; } static u32 sMTRNG_State[624]; static int sMTRNG_Size = 624 + 1; -static u32 sMTRNG_Xor[2] = {0x0UL, 0x9908b0dfUL}; +static u32 sMTRNG_Xor[2] = { 0x0UL, 0x9908b0dfUL }; -void MTRNG_SetSeed (u32 seed) +void MTRNG_SetSeed(u32 seed) { sMTRNG_State[0] = seed & 0xffffffff; @@ -122,7 +122,7 @@ void MTRNG_SetSeed (u32 seed) } } -u32 MTRNG_Next (void) +u32 MTRNG_Next(void) { u32 result; @@ -159,7 +159,7 @@ u32 MTRNG_Next (void) return result; } -void sub_0201D470 (MtxFx22 * param0, u16 param1, fx32 param2, fx32 param3, u8 param4) +void sub_0201D470(MtxFx22 *param0, u16 param1, fx32 param2, fx32 param3, u8 param4) { if (param4 == 1) { param1 = (u16)((u32)(0xffff * param1) >> 8); @@ -171,14 +171,14 @@ void sub_0201D470 (MtxFx22 * param0, u16 param1, fx32 param2, fx32 param3, u8 pa MTX_ScaleApply22(param0, param0, param2, param3); } -static inline void inline_0201D4CC (const VecFx32 * param0, const VecFx32 * param1, VecFx32 * param2) +static inline void inline_0201D4CC(const VecFx32 *param0, const VecFx32 *param1, VecFx32 *param2) { param2->x = 0; param2->y = 0; param2->z = FX_Mul(param0->x, param1->y) - FX_Mul(param1->x, param0->y); } -s32 sub_0201D4CC (s32 param0, s32 param1, s32 param2, s32 param3, u32 param4) +s32 sub_0201D4CC(s32 param0, s32 param1, s32 param2, s32 param3, u32 param4) { VecFx32 v0, v1, v2, v3; fx32 v4; @@ -208,7 +208,7 @@ s32 sub_0201D4CC (s32 param0, s32 param1, s32 param2, s32 param3, u32 param4) return v6; } -s32 sub_0201D580 (u16 param0, s32 param1) +s32 sub_0201D580(u16 param0, s32 param1) { s32 v0; @@ -216,7 +216,7 @@ s32 sub_0201D580 (u16 param0, s32 param1) return (s32)((param1 * 0xffff) / v0); } -u32 sub_0201D5B8 (const void * param0, u32 param1) +u32 sub_0201D5B8(const void *param0, u32 param1) { u32 v0, v1; @@ -229,7 +229,7 @@ u32 sub_0201D5B8 (const void * param0, u32 param1) return v0; } -void EncryptData (void *data, u32 bytes, u32 seed) +void EncryptData(void *data, u32 bytes, u32 seed) { int i; u16 *dataWords = (u16 *)data; @@ -239,25 +239,25 @@ void EncryptData (void *data, u32 bytes, u32 seed) } } -void DecryptData (void *data, u32 bytes, u32 seed) +void DecryptData(void *data, u32 bytes, u32 seed) { EncryptData(data, bytes, seed); } -static u16 LCRNG_NextFrom (u32 *seed) +static u16 LCRNG_NextFrom(u32 *seed) { seed[0] = seed[0] * 1103515245L + 24691; return (u16)(seed[0] / 65536L); } -static UnkStruct_021BFB10 * Unk_021BFB10 = NULL; +static UnkStruct_021BFB10 *Unk_021BFB10 = NULL; -u16 sub_0201D628 (const void * param0, u32 param1) +u16 sub_0201D628(const void *param0, u32 param1) { return MATH_CalcCRC16CCITT(&Unk_021BFB10->unk_00, param0, param1); } -void sub_0201D640 (int param0) +void sub_0201D640(int param0) { GF_ASSERT(Unk_021BFB10 == NULL); diff --git a/src/unk_0201D670.c b/src/unk_0201D670.c index 26001a15e5..c9d1f45b8e 100644 --- a/src/unk_0201D670.c +++ b/src/unk_0201D670.c @@ -1,42 +1,42 @@ +#include "unk_0201D670.h" + #include #include -#include "strbuf.h" - #include "struct_defs/struct_0201D670.h" #include "struct_defs/struct_0201D738.h" #include "struct_defs/struct_0201D834.h" -#include "functypes/funcptr_0201D834.h" #include "struct_defs/struct_0205AA50.h" +#include "functypes/funcptr_0201D834.h" + +#include "heap.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02002B7C.h" #include "unk_02006E3C.h" -#include "sys_task.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" -#include "unk_0201D670.h" -#include "strbuf.h" -static int sub_0201D9E8(UnkStruct_0201D834 * param0); -static void sub_0201D97C(SysTask * param0, void * param1); -static u8 sub_0201D67C(SysTaskFunc param0, void * param1, u32 param2); +static int sub_0201D9E8(UnkStruct_0201D834 *param0); +static void sub_0201D97C(SysTask *param0, void *param1); +static u8 sub_0201D67C(SysTaskFunc param0, void *param1, u32 param2); static void sub_0201D6B0(u8 param0); -static void sub_0201DB48(UnkStruct_0201D834 * param0); -static void sub_0201DBD8(UnkStruct_0201D834 * param0); -static u8 * sub_0201DB50(void); +static void sub_0201DB48(UnkStruct_0201D834 *param0); +static void sub_0201DBD8(UnkStruct_0201D834 *param0); +static u8 *sub_0201DB50(void); -static const UnkStruct_0201D670 * Unk_02100840 = NULL; +static const UnkStruct_0201D670 *Unk_02100840 = NULL; static u8 Unk_021C04D8 = 0; -void sub_0201D670 (const UnkStruct_0201D670 * param0) +void sub_0201D670(const UnkStruct_0201D670 *param0) { Unk_02100840 = param0; } -static SysTask * Unk_021C04E0[8] = {0}; +static SysTask *Unk_021C04E0[8] = { 0 }; -static u8 sub_0201D67C (SysTaskFunc param0, void * param1, u32 param2) +static u8 sub_0201D67C(SysTaskFunc param0, void *param1, u32 param2) { int v0; @@ -55,13 +55,13 @@ static u8 sub_0201D67C (SysTaskFunc param0, void * param1, u32 param2) return v0; } -static void sub_0201D6B0 (u8 param0) +static void sub_0201D6B0(u8 param0) { GF_ASSERT(param0 < 8); GF_ASSERT(Unk_021C04E0[param0] != NULL); if ((param0 < 8) && (Unk_021C04E0[param0] != NULL)) { - UnkStruct_0201D834 * v0 = SysTask_GetParam(Unk_021C04E0[param0]); + UnkStruct_0201D834 *v0 = SysTask_GetParam(Unk_021C04E0[param0]); if (v0) { sub_0201DBD8(v0); @@ -73,12 +73,12 @@ static void sub_0201D6B0 (u8 param0) } } -static BOOL sub_0201D6F8 (u8 param0) +static BOOL sub_0201D6F8(u8 param0) { return Unk_021C04E0[param0] != NULL; } -void sub_0201D710 (void) +void sub_0201D710(void) { int v0; @@ -87,17 +87,17 @@ void sub_0201D710 (void) } } -u8 Message_Printing (u8 param0) +u8 Message_Printing(u8 param0) { return sub_0201D6F8(param0); } -void PrintString_ForceStop (u8 param0) +void PrintString_ForceStop(u8 param0) { sub_0201D6B0(param0); } -u8 PrintStringSimple (Window *window, u32 fontID, const Strbuf *strbuf, u32 xOffset, u32 yOffset, u32 renderDelay, UnkFuncPtr_0201D834 callback) +u8 PrintStringSimple(Window *window, u32 fontID, const Strbuf *strbuf, u32 xOffset, u32 yOffset, u32 renderDelay, UnkFuncPtr_0201D834 callback) { UnkStruct_0201D738 v0; @@ -121,7 +121,7 @@ u8 PrintStringSimple (Window *window, u32 fontID, const Strbuf *strbuf, u32 xOff return sub_0201D834(&v0, renderDelay, callback); } -u8 sub_0201D78C (Window * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, UnkFuncPtr_0201D834 param7) +u8 sub_0201D78C(Window *param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, UnkFuncPtr_0201D834 param7) { UnkStruct_0201D738 v0; @@ -145,7 +145,7 @@ u8 sub_0201D78C (Window * param0, u32 param1, const Strbuf *param2, u32 param3, return sub_0201D834(&v0, param5, param7); } -u8 PrintStringWithColorAndMargins (Window * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkFuncPtr_0201D834 param9) +u8 PrintStringWithColorAndMargins(Window *param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkFuncPtr_0201D834 param9) { UnkStruct_0201D738 v0; @@ -169,9 +169,9 @@ u8 PrintStringWithColorAndMargins (Window * param0, u32 param1, const Strbuf *pa return sub_0201D834(&v0, param5, param9); } -u8 sub_0201D834 (const UnkStruct_0201D738 * param0, u32 param1, UnkFuncPtr_0201D834 param2) +u8 sub_0201D834(const UnkStruct_0201D738 *param0, u32 param1, UnkFuncPtr_0201D834 param2) { - UnkStruct_0201D834 * v0; + UnkStruct_0201D834 *v0; int v1; if (Unk_02100840 == NULL) { @@ -231,9 +231,9 @@ u8 sub_0201D834 (const UnkStruct_0201D738 * param0, u32 param1, UnkFuncPtr_0201D } } -static void sub_0201D97C (SysTask * param0, void * param1) +static void sub_0201D97C(SysTask *param0, void *param1) { - UnkStruct_0201D834 * v0; + UnkStruct_0201D834 *v0; int v1; if (Unk_021C04D8) { @@ -265,7 +265,7 @@ static void sub_0201D97C (SysTask * param0, void * param1) } } -static int sub_0201D9E8 (UnkStruct_0201D834 * param0) +static int sub_0201D9E8(UnkStruct_0201D834 *param0) { int v0; @@ -279,7 +279,7 @@ static int sub_0201D9E8 (UnkStruct_0201D834 * param0) static u16 Unk_021C0500[256]; static u16 Unk_021C04DE, Unk_021C04DA, Unk_021C04DC; -void sub_0201D9FC (u8 param0, u8 param1, u8 param2) +void sub_0201D9FC(u8 param0, u8 param1, u8 param2) { int v0, v1, v2, v3, v4; u32 v5[4]; @@ -306,11 +306,11 @@ void sub_0201D9FC (u8 param0, u8 param1, u8 param2) } } -void sub_0201DAA0 (u32 param0, u32 param1) +void sub_0201DAA0(u32 param0, u32 param1) { u32 v0; - u16 * v1; - u16 * v2; + u16 *v1; + u16 *v2; v1 = (u16 *)param0; v2 = (u16 *)param1; @@ -364,16 +364,16 @@ void sub_0201DAA0 (u32 param0, u32 param1) *v2 = Unk_021C0500[v0]; } -static void sub_0201DB48 (UnkStruct_0201D834 * param0) +static void sub_0201DB48(UnkStruct_0201D834 *param0) { param0->unk_30 = NULL; } -static u8 * sub_0201DB50 (void) +static u8 *sub_0201DB50(void) { - NNSG2dCharacterData * v0; - void * v1; - u8 * v2; + NNSG2dCharacterData *v0; + void *v1; + u8 *v2; v2 = Heap_AllocFromHeap(0, 3 * 4 * 4 * 0x20); v1 = sub_02006F50(14, 5, 0, &v0, 0); @@ -384,10 +384,10 @@ static u8 * sub_0201DB50 (void) return v2; } -void sub_0201DB8C (UnkStruct_0201D834 * param0, u16 param1, u16 param2, u16 param3) +void sub_0201DB8C(UnkStruct_0201D834 *param0, u16 param1, u16 param2, u16 param3) { - Window * v0 = param0->unk_00.unk_04; - u8 * v1; + Window *v0 = param0->unk_00.unk_04; + u8 *v1; if (param0->unk_30 == NULL) { param0->unk_30 = sub_0201DB50(); @@ -402,7 +402,7 @@ void sub_0201DB8C (UnkStruct_0201D834 * param0, u16 param1, u16 param2, u16 para sub_0201ADDC(v0, v1, 0, 0, 24, 32, param1, param2, 24, 32); } -static void sub_0201DBD8 (UnkStruct_0201D834 * param0) +static void sub_0201DBD8(UnkStruct_0201D834 *param0) { if (param0->unk_30) { Heap_FreeToHeap(param0->unk_30); diff --git a/src/unk_0201DBEC.c b/src/unk_0201DBEC.c index 32f2bd3dcd..05e54833fa 100644 --- a/src/unk_0201DBEC.c +++ b/src/unk_0201DBEC.c @@ -1,21 +1,22 @@ +#include "unk_0201DBEC.h" + #include -#include #include +#include #include "heap.h" -#include "unk_0201DBEC.h" typedef struct { u32 unk_00; u32 unk_04; - NNSGfdVramTransferTask * unk_08; + NNSGfdVramTransferTask *unk_08; } UnkStruct_021C0700; -static BOOL sub_0201DCF8(NNS_GFD_DST_TYPE param0, u32 param1, void * param2, u32 param3); +static BOOL sub_0201DCF8(NNS_GFD_DST_TYPE param0, u32 param1, void *param2, u32 param3); -static UnkStruct_021C0700 * Unk_021C0700; +static UnkStruct_021C0700 *Unk_021C0700; -void sub_0201DBEC (u32 param0, int param1) +void sub_0201DBEC(u32 param0, int param1) { GF_ASSERT(Unk_021C0700 == NULL); Unk_021C0700 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_021C0700)); @@ -28,7 +29,7 @@ void sub_0201DBEC (u32 param0, int param1) NNS_GfdInitVramTransferManager(Unk_021C0700->unk_08, Unk_021C0700->unk_00); } -void sub_0201DC3C (void) +void sub_0201DC3C(void) { GF_ASSERT(Unk_021C0700 != NULL); @@ -38,7 +39,7 @@ void sub_0201DC3C (void) Unk_021C0700 = NULL; } -BOOL sub_0201DC68 (NNS_GFD_DST_TYPE param0, u32 param1, void * param2, u32 param3) +BOOL sub_0201DC68(NNS_GFD_DST_TYPE param0, u32 param1, void *param2, u32 param3) { GF_ASSERT(Unk_021C0700); Unk_021C0700->unk_04++; @@ -51,7 +52,7 @@ BOOL sub_0201DC68 (NNS_GFD_DST_TYPE param0, u32 param1, void * param2, u32 param return NNS_GfdRegisterNewVramTransferTask(param0, param1, param2, param3); } -void sub_0201DCAC (void) +void sub_0201DCAC(void) { if (Unk_021C0700) { NNS_GfdDoVramTransfer(); @@ -59,9 +60,9 @@ void sub_0201DCAC (void) } } -NNSG2dCellTransferState * sub_0201DCC8 (int param0, int param1) +NNSG2dCellTransferState *sub_0201DCC8(int param0, int param1) { - NNSG2dCellTransferState * v0; + NNSG2dCellTransferState *v0; v0 = Heap_AllocFromHeap(param1, sizeof(NNSG2dCellTransferState) * param0); NNS_G2dInitCellTransferStateManager(v0, param0, sub_0201DCF8); @@ -69,17 +70,17 @@ NNSG2dCellTransferState * sub_0201DCC8 (int param0, int param1) return v0; } -void sub_0201DCE8 (void) +void sub_0201DCE8(void) { NNS_G2dUpdateCellTransferStateManager(); } -void sub_0201DCF0 (NNSG2dCellTransferState * param0) +void sub_0201DCF0(NNSG2dCellTransferState *param0) { Heap_FreeToHeap(param0); } -static BOOL sub_0201DCF8 (NNS_GFD_DST_TYPE param0, u32 param1, void * param2, u32 param3) +static BOOL sub_0201DCF8(NNS_GFD_DST_TYPE param0, u32 param1, void *param2, u32 param3) { return sub_0201DC68(param0, param1, param2, param3); } diff --git a/src/unk_0201DD00.c b/src/unk_0201DD00.c index 9d95c91ccf..1027916fab 100644 --- a/src/unk_0201DD00.c +++ b/src/unk_0201DD00.c @@ -1,18 +1,19 @@ +#include "unk_0201DD00.h" + #include #include #include "struct_defs/struct_0202144C.h" #include "struct_defs/struct_02024184.h" +#include "ascii_util.h" #include "heap.h" #include "unk_0201DBEC.h" -#include "unk_0201DD00.h" -#include "ascii_util.h" #include "unk_0202414C.h" typedef struct UnkStruct_0201DDF4_t { - const UnkStruct_02024184 * unk_00; - const NNSG3dResTex * unk_04; + const UnkStruct_02024184 *unk_00; + const NNSG3dResTex *unk_04; NNSGfdTexKey unk_08; NNSGfdPlttKey unk_0C; u8 unk_10; @@ -20,20 +21,20 @@ typedef struct UnkStruct_0201DDF4_t { } UnkStruct_0201DDF4; typedef struct UnkStruct_0201DD00_t { - UnkStruct_0201DDF4 * unk_00; + UnkStruct_0201DDF4 *unk_00; int unk_04; } UnkStruct_0201DD00; -static void sub_0201DDF4(UnkStruct_0201DDF4 * param0, const u16 param1); -static void * sub_0201DE94(UnkStruct_0201DDF4 * param0, const UnkStruct_0202144C * param1); -static void * sub_0201DEA0(UnkStruct_0201DDF4 * param0, const UnkStruct_0202144C * param1); -static void sub_0201DDE4(UnkStruct_0201DDF4 * param0); -static void sub_0201DE3C(UnkStruct_0201DDF4 * param0, const UnkStruct_0202144C * param1); -static void sub_0201DE68(UnkStruct_0201DDF4 * param0, const UnkStruct_0202144C * param1); +static void sub_0201DDF4(UnkStruct_0201DDF4 *param0, const u16 param1); +static void *sub_0201DE94(UnkStruct_0201DDF4 *param0, const UnkStruct_0202144C *param1); +static void *sub_0201DEA0(UnkStruct_0201DDF4 *param0, const UnkStruct_0202144C *param1); +static void sub_0201DDE4(UnkStruct_0201DDF4 *param0); +static void sub_0201DE3C(UnkStruct_0201DDF4 *param0, const UnkStruct_0202144C *param1); +static void sub_0201DE68(UnkStruct_0201DDF4 *param0, const UnkStruct_0202144C *param1); -UnkStruct_0201DD00 * sub_0201DD00 (int param0, int param1) +UnkStruct_0201DD00 *sub_0201DD00(int param0, int param1) { - UnkStruct_0201DD00 * v0; + UnkStruct_0201DD00 *v0; int v1; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0201DD00)); @@ -48,16 +49,16 @@ UnkStruct_0201DD00 * sub_0201DD00 (int param0, int param1) return v0; } -void sub_0201DD3C (UnkStruct_0201DD00 * param0) +void sub_0201DD3C(UnkStruct_0201DD00 *param0) { sub_0201DDB4(param0); Heap_FreeToHeap(param0->unk_00); Heap_FreeToHeap(param0); } -UnkStruct_0201DDF4 * sub_0201DD54 (UnkStruct_0201DD00 * param0, const UnkStruct_02024184 * param1, const NNSG3dResTex * param2, NNSGfdTexKey param3, NNSGfdPlttKey param4, const fx32 param5) +UnkStruct_0201DDF4 *sub_0201DD54(UnkStruct_0201DD00 *param0, const UnkStruct_02024184 *param1, const NNSG3dResTex *param2, NNSGfdTexKey param3, NNSGfdPlttKey param4, const fx32 param5) { - UnkStruct_0201DDF4 * v0; + UnkStruct_0201DDF4 *v0; u32 v1; int v2; @@ -86,21 +87,21 @@ UnkStruct_0201DDF4 * sub_0201DD54 (UnkStruct_0201DD00 * param0, const UnkStruct_ return v0; } -void sub_0201DDAC (UnkStruct_0201DDF4 * param0) +void sub_0201DDAC(UnkStruct_0201DDF4 *param0) { sub_0201DDE4(param0); } -void sub_0201DDB4 (UnkStruct_0201DD00 * param0) +void sub_0201DDB4(UnkStruct_0201DD00 *param0) { int v0; for (v0 = 0; v0 < param0->unk_04; v0++) { - sub_0201DDE4((param0->unk_00 + v0)); + sub_0201DDE4(param0->unk_00 + v0); } } -void sub_0201DDD8 (UnkStruct_0201DDF4 * param0, const fx32 param1) +void sub_0201DDD8(UnkStruct_0201DDF4 *param0, const fx32 param1) { u16 v0; @@ -109,7 +110,7 @@ void sub_0201DDD8 (UnkStruct_0201DDF4 * param0, const fx32 param1) sub_0201DDF4(param0, v0); } -static void sub_0201DDE4 (UnkStruct_0201DDF4 * param0) +static void sub_0201DDE4(UnkStruct_0201DDF4 *param0) { param0->unk_00 = NULL; param0->unk_04 = NULL; @@ -119,7 +120,7 @@ static void sub_0201DDE4 (UnkStruct_0201DDF4 * param0) param0->unk_11 = 0; } -static void sub_0201DDF4 (UnkStruct_0201DDF4 * param0, const u16 param1) +static void sub_0201DDF4(UnkStruct_0201DDF4 *param0, const u16 param1) { UnkStruct_0202144C v0; @@ -134,9 +135,9 @@ static void sub_0201DDF4 (UnkStruct_0201DDF4 * param0, const u16 param1) } } -static void sub_0201DE3C (UnkStruct_0201DDF4 * param0, const UnkStruct_0202144C * param1) +static void sub_0201DE3C(UnkStruct_0201DDF4 *param0, const UnkStruct_0202144C *param1) { - void * v0; + void *v0; v0 = sub_0201DE94(param0, param1); @@ -144,9 +145,9 @@ static void sub_0201DE3C (UnkStruct_0201DDF4 * param0, const UnkStruct_0202144C param0->unk_10 = param1->unk_00; } -static void sub_0201DE68 (UnkStruct_0201DDF4 * param0, const UnkStruct_0202144C * param1) +static void sub_0201DE68(UnkStruct_0201DDF4 *param0, const UnkStruct_0202144C *param1) { - void * v0; + void *v0; v0 = sub_0201DEA0(param0, param1); sub_0201DC68(NNS_GFD_DST_3D_TEX_PLTT, NNS_GfdGetPlttKeyAddr(param0->unk_0C), v0, NNS_GfdGetPlttKeySize(param0->unk_0C)); @@ -154,20 +155,20 @@ static void sub_0201DE68 (UnkStruct_0201DDF4 * param0, const UnkStruct_0202144C param0->unk_11 = param1->unk_01; } -static void * sub_0201DE94 (UnkStruct_0201DDF4 * param0, const UnkStruct_0202144C * param1) +static void *sub_0201DE94(UnkStruct_0201DDF4 *param0, const UnkStruct_0202144C *param1) { return sub_0201DEAC((NNSG3dResTex *)param0->unk_04, param1->unk_00); } -static void * sub_0201DEA0 (UnkStruct_0201DDF4 * param0, const UnkStruct_0202144C * param1) +static void *sub_0201DEA0(UnkStruct_0201DDF4 *param0, const UnkStruct_0202144C *param1) { return sub_0201DEFC((NNSG3dResTex *)param0->unk_04, param1->unk_01); } -void * sub_0201DEAC (NNSG3dResTex * param0, const u8 param1) +void *sub_0201DEAC(NNSG3dResTex *param0, const u8 param1) { u32 v0; - const NNSG3dResDictTexData * v1 = NNS_G3dGetTexDataByIdx(param0, param1); + const NNSG3dResDictTexData *v1 = NNS_G3dGetTexDataByIdx(param0, param1); if (v1 == NULL) { return NULL; @@ -177,9 +178,9 @@ void * sub_0201DEAC (NNSG3dResTex * param0, const u8 param1) return (void *)((u8 *)param0 + param0->texInfo.ofsTex + (v0 << 3)); } -void * sub_0201DEFC (NNSG3dResTex * param0, const u8 param1) +void *sub_0201DEFC(NNSG3dResTex *param0, const u8 param1) { - const NNSG3dResDictPlttData * v0 = NNS_G3dGetPlttDataByIdx(param0, param1); + const NNSG3dResDictPlttData *v0 = NNS_G3dGetPlttDataByIdx(param0, param1); if (v0 == NULL) { return NULL; @@ -188,7 +189,7 @@ void * sub_0201DEFC (NNSG3dResTex * param0, const u8 param1) return (void *)((u8 *)param0 + param0->plttInfo.ofsPlttData + (v0->offset << 3)); } -static void * sub_0201DF40 (NNSG3dResTex * param0, const NNSG3dResDictTexData * param1) +static void *sub_0201DF40(NNSG3dResTex *param0, const NNSG3dResDictTexData *param1) { u32 v0 = (param1->texImageParam & NNS_G3D_TEXIMAGE_PARAM_TEX_ADDR_MASK) << 3; @@ -196,10 +197,10 @@ static void * sub_0201DF40 (NNSG3dResTex * param0, const NNSG3dResDictTexData * return (void *)(v0); } -void * sub_0201DF50 (NNSG3dResTex * param0, const char * param1) +void *sub_0201DF50(NNSG3dResTex *param0, const char *param1) { NNSG3dResName v0; - const NNSG3dResDictTexData * v1; + const NNSG3dResDictTexData *v1; Ascii_SetResourceName(&v0, param1); v1 = NNS_G3dGetTexDataByName(param0, &v0); @@ -211,7 +212,7 @@ void * sub_0201DF50 (NNSG3dResTex * param0, const char * param1) return sub_0201DF40(param0, v1); } -static int sub_0201DF84 (NNSG3dResTex * param0, const NNSG3dResDictTexData * param1) +static int sub_0201DF84(NNSG3dResTex *param0, const NNSG3dResDictTexData *param1) { u32 v0; u32 v1; @@ -251,9 +252,9 @@ static int sub_0201DF84 (NNSG3dResTex * param0, const NNSG3dResDictTexData * par return v0; } -int sub_0201DFE4 (NNSG3dResTex * param0, const char * param1) +int sub_0201DFE4(NNSG3dResTex *param0, const char *param1) { - const NNSG3dResDictTexData * v0; + const NNSG3dResDictTexData *v0; NNSG3dResName v1; Ascii_SetResourceName(&v1, param1); diff --git a/src/unk_0201E010.c b/src/unk_0201E010.c index 8f68bcbaec..31cd730cca 100644 --- a/src/unk_0201E010.c +++ b/src/unk_0201E010.c @@ -1,23 +1,23 @@ +#include "unk_0201E010.h" + #include #include #include "struct_defs/struct_020F1DB8.h" -#include "unk_0201E010.h" - -void sub_0201E010 (const ByteFlagSet * param0, u8 * param1, u8 * param2) +void sub_0201E010(const ByteFlagSet *param0, u8 *param1, u8 *param2) { *param1 = param0->unk_00; *param2 = param0->unk_01; } -void sub_0201E01C (const ByteFlagSet * param0, u8 * param1, u8 * param2) +void sub_0201E01C(const ByteFlagSet *param0, u8 *param1, u8 *param2) { *param1 = param0->unk_02; *param2 = param0->unk_03; } -u8 sub_0201E028 (const ByteFlagSet * param0, u8 * param1, u8 * param2, u8 * param3, u8 * param4, u8 param5, u8 param6) +u8 sub_0201E028(const ByteFlagSet *param0, u8 *param1, u8 *param2, u8 *param3, u8 *param4, u8 param5, u8 param6) { u8 v0 = param5; diff --git a/src/unk_0201E190.c b/src/unk_0201E190.c index c9cb8c1f3a..249b23208e 100644 --- a/src/unk_0201E190.c +++ b/src/unk_0201E190.c @@ -1,15 +1,16 @@ +#include "unk_0201E190.h" + +#include "nitro/fx/fx_trig.h" #include -#include #include +#include -#include "nitro/fx/fx_trig.h" #include "unk_0201D15C.h" -#include "unk_0201E190.h" -#define F32_PI ((f32)3.14159265358979323846) -#define FX_F32_RAD_TO_IDX(f) ((u16)(FX_RAD_TO_IDX(FX32_CONST((f))))) +#define F32_PI ((f32)3.14159265358979323846) +#define FX_F32_RAD_TO_IDX(f) ((u16)(FX_RAD_TO_IDX(FX32_CONST(f)))) -fx32 sub_0201E190 (fx32 param0, fx32 param1) +fx32 sub_0201E190(fx32 param0, fx32 param1) { if (param0 < param1) { return param0; @@ -18,7 +19,7 @@ fx32 sub_0201E190 (fx32 param0, fx32 param1) } } -fx32 sub_0201E198 (fx32 param0, fx32 param1) +fx32 sub_0201E198(fx32 param0, fx32 param1) { if (param0 > param1) { return param0; @@ -27,8 +28,6 @@ fx32 sub_0201E198 (fx32 param0, fx32 param1) } } - - fx32 VEC_AngleBetween(const VecFx32 *a, const VecFx32 *b) { VecFx32 aNorm, bNorm; @@ -50,7 +49,7 @@ fx32 VEC_AngleBetween(const VecFx32 *a, const VecFx32 *b) return angle; } -void sub_0201E268 (MtxFx33 * param0, VecFx32 * param1) +void sub_0201E268(MtxFx33 *param0, VecFx32 *param1) { MtxFx33 v0; @@ -61,7 +60,7 @@ void sub_0201E268 (MtxFx33 * param0, VecFx32 * param1) MTX_Concat33(param0, &v0, param0); } -void sub_0201E2E0 (MtxFx33 * param0, u16 param1, u16 param2, u16 param3) +void sub_0201E2E0(MtxFx33 *param0, u16 param1, u16 param2, u16 param3) { MtxFx33 v0; @@ -72,7 +71,7 @@ void sub_0201E2E0 (MtxFx33 * param0, u16 param1, u16 param2, u16 param3) MTX_Concat33(param0, &v0, param0); } -void sub_0201E34C (u16 param0, fx32 param1, fx32 param2, fx32 * param3, fx32 * param4) +void sub_0201E34C(u16 param0, fx32 param1, fx32 param2, fx32 *param3, fx32 *param4) { fx32 v0; fx32 v1; diff --git a/src/unk_0201E3BC.c b/src/unk_0201E3BC.c index 45ad70e71d..cbd654559d 100644 --- a/src/unk_0201E3BC.c +++ b/src/unk_0201E3BC.c @@ -1,10 +1,10 @@ +#include "unk_0201E3BC.h" + #include -#include #include +#include -#include "unk_0201E3BC.h" - -u32 sub_0201E3BC (s32 param0, s32 param1, s32 param2, s32 param3) +u32 sub_0201E3BC(s32 param0, s32 param1, s32 param2, s32 param3) { s32 v0, v1; u32 v2; diff --git a/src/unk_0201E3D8.c b/src/unk_0201E3D8.c index 247031d2e7..5134744d29 100644 --- a/src/unk_0201E3D8.c +++ b/src/unk_0201E3D8.c @@ -1,24 +1,24 @@ +#include "unk_0201E3D8.h" + #include #include -#include "core_sys.h" -#include "inlines.h" - #include "overlay072/struct_ov72_0223E2A8.h" -#include "unk_0201E3D8.h" +#include "core_sys.h" +#include "inlines.h" static u32 sub_0201E658(u32 param0); static u32 sub_0201E4EC(void); static u32 sub_0201E6CC(u32 param0, u32 param1, u32 param2); static u32 sub_0201E784(u32 param0, u32 param1); -static void sub_0201E7FC(UnkStruct_ov72_0223E2A8 * param0, u32 param1); +static void sub_0201E7FC(UnkStruct_ov72_0223E2A8 *param0, u32 param1); static u32 sub_0201E69C(u32 param0, u32 param1, u32 param2); -static void sub_0201E4A4(u32 param0, u32 param1, void * param2, u32 param3, u32 param4, u32 param5); -static void sub_0201E4D8(TPData * param0, int param1); +static void sub_0201E4A4(u32 param0, u32 param1, void *param2, u32 param3, u32 param4, u32 param5); +static void sub_0201E4D8(TPData *param0, int param1); typedef struct { - TPData * unk_00; + TPData *unk_00; u32 unk_04; u32 unk_08; TPData unk_0C[9]; @@ -29,7 +29,7 @@ typedef struct { static UnkStruct_021C0704 Unk_021C0704; -void sub_0201E3D8 (void) +void sub_0201E3D8(void) { GF_ASSERT(Unk_021C0704.unk_5A == 0); @@ -37,7 +37,7 @@ void sub_0201E3D8 (void) Unk_021C0704.unk_5A = 0; } -u32 sub_0201E3F4 (TPData * param0, u32 param1, u32 param2) +u32 sub_0201E3F4(TPData *param0, u32 param1, u32 param2) { int v0 = 0; u32 v1; @@ -64,7 +64,7 @@ u32 sub_0201E3F4 (TPData * param0, u32 param1, u32 param2) return 1; } -u32 sub_0201E450 (u32 param0) +u32 sub_0201E450(u32 param0) { u32 v0; int v1; @@ -90,7 +90,7 @@ u32 sub_0201E450 (u32 param0) return 1; } -static void sub_0201E4A4 (u32 param0, u32 param1, void * param2, u32 param3, u32 param4, u32 param5) +static void sub_0201E4A4(u32 param0, u32 param1, void *param2, u32 param3, u32 param4, u32 param5) { Unk_021C0704.unk_58 = param0; gCoreSys.unk_64 = param1; @@ -102,7 +102,7 @@ static void sub_0201E4A4 (u32 param0, u32 param1, void * param2, u32 param3, u32 sub_0201E4D8(Unk_021C0704.unk_0C, 9); } -static void sub_0201E4D8 (TPData * param0, int param1) +static void sub_0201E4D8(TPData *param0, int param1) { int v0; @@ -111,7 +111,7 @@ static void sub_0201E4D8 (TPData * param0, int param1) } } -static u32 sub_0201E4EC (void) +static u32 sub_0201E4EC(void) { u32 v0 = 0; u32 v1; @@ -139,7 +139,7 @@ static u32 sub_0201E4EC (void) return 1; } -u32 sub_0201E530 (void) +u32 sub_0201E530(void) { u32 v0; @@ -154,7 +154,7 @@ u32 sub_0201E530 (void) return v0; } -u32 sub_0201E564 (UnkStruct_ov72_0223E2A8 * param0, u32 param1, u32 param2) +u32 sub_0201E564(UnkStruct_ov72_0223E2A8 *param0, u32 param1, u32 param2) { u32 v0 = 3; u32 v1; @@ -182,7 +182,7 @@ u32 sub_0201E564 (UnkStruct_ov72_0223E2A8 * param0, u32 param1, u32 param2) return v0; } -void sub_0201E5C0 (TPData * param0, u32 param1) +void sub_0201E5C0(TPData *param0, u32 param1) { int v0; TPData v1; @@ -193,7 +193,7 @@ void sub_0201E5C0 (TPData * param0, u32 param1) } } -void AfterSleep (void) +void AfterSleep(void) { u32 v0; @@ -211,7 +211,7 @@ void AfterSleep (void) Unk_021C0704.unk_5A = 0; } -void BeforeSleep (void) +void BeforeSleep(void) { u32 v0; @@ -229,7 +229,7 @@ void BeforeSleep (void) Unk_021C0704.unk_5A = 1; } -static u32 sub_0201E658 (u32 param0) +static u32 sub_0201E658(u32 param0) { int v0 = 0; u32 v1; @@ -252,7 +252,7 @@ static u32 sub_0201E658 (u32 param0) return 1; } -static u32 sub_0201E69C (u32 param0, u32 param1, u32 param2) +static u32 sub_0201E69C(u32 param0, u32 param1, u32 param2) { u32 v0; @@ -273,13 +273,13 @@ static u32 sub_0201E69C (u32 param0, u32 param1, u32 param2) return v0; } -static inline int inline_0201E6CC (int param0, int param1) +static inline int inline_0201E6CC(int param0, int param1) { int v0 = (param0 >= param1) ? (param0 - param1) : (param1 - param0); return v0; } -static u32 sub_0201E6CC (u32 param0, u32 param1, u32 param2) +static u32 sub_0201E6CC(u32 param0, u32 param1, u32 param2) { int v0; s32 v1; @@ -315,7 +315,7 @@ static u32 sub_0201E6CC (u32 param0, u32 param1, u32 param2) return Unk_021C0704.unk_54; } -static u32 sub_0201E784 (u32 param0, u32 param1) +static u32 sub_0201E784(u32 param0, u32 param1) { int v0; s16 v1; @@ -342,7 +342,7 @@ static u32 sub_0201E784 (u32 param0, u32 param1) return Unk_021C0704.unk_54; } -static void sub_0201E7FC (UnkStruct_ov72_0223E2A8 * param0, u32 param1) +static void sub_0201E7FC(UnkStruct_ov72_0223E2A8 *param0, u32 param1) { int v0; s16 v1; diff --git a/src/unk_0201E86C.c b/src/unk_0201E86C.c index 5b40e8e61d..c677ffb2bd 100644 --- a/src/unk_0201E86C.c +++ b/src/unk_0201E86C.c @@ -1,16 +1,18 @@ +#include "unk_0201E86C.h" + #include #include -#include "struct_defs/struct_0200A328.h" #include "struct_defs/sprite_manager_allocation.h" +#include "struct_defs/struct_0200A328.h" + #include "overlay022/struct_ov22_022559F8.h" #include "heap.h" #include "unk_0201DBEC.h" -#include "unk_0201E86C.h" typedef struct { - NNSG2dCharacterData * unk_00; + NNSG2dCharacterData *unk_00; NNS_G2D_VRAM_TYPE unk_04; u8 unk_08; u32 unk_0C; @@ -26,7 +28,7 @@ typedef struct { } UnkStruct_0201EED4; typedef struct { - UnkStruct_0201EED4 * unk_00; + UnkStruct_0201EED4 *unk_00; int unk_04; int unk_08; u32 unk_0C; @@ -39,53 +41,53 @@ typedef struct { u32 unk_28; u32 unk_2C; u32 unk_30; - u8 * unk_34; - u8 * unk_38; + u8 *unk_34; + u8 *unk_38; } UnkStruct_021C0760; -static void sub_0201EED4(UnkStruct_0201EED4 * param0); -static BOOL sub_0201EEF8(const UnkStruct_0200A328 * param0, UnkStruct_0201EED4 * param1); -static UnkStruct_0201EED4 * sub_0201EF1C(const NNSG2dImageProxy * param0); -static BOOL sub_0201EF68(UnkStruct_0201EED4 * param0); -static BOOL sub_0201EF98(UnkStruct_0201EED4 * param0); -static BOOL sub_0201EFCC(UnkStruct_0201EED4 * param0); -static void sub_0201F09C(UnkStruct_0201EED4 * param0, u32 param1, u32 param2); -static BOOL sub_0201F0B0(int param0, u32 * param1, u32 * param2, u32 param3, u32 * param4, u32 * param5); -static void sub_0201F15C(UnkStruct_0201EED4 * param0, u32 param1, u32 param2); +static void sub_0201EED4(UnkStruct_0201EED4 *param0); +static BOOL sub_0201EEF8(const UnkStruct_0200A328 *param0, UnkStruct_0201EED4 *param1); +static UnkStruct_0201EED4 *sub_0201EF1C(const NNSG2dImageProxy *param0); +static BOOL sub_0201EF68(UnkStruct_0201EED4 *param0); +static BOOL sub_0201EF98(UnkStruct_0201EED4 *param0); +static BOOL sub_0201EFCC(UnkStruct_0201EED4 *param0); +static void sub_0201F09C(UnkStruct_0201EED4 *param0, u32 param1, u32 param2); +static BOOL sub_0201F0B0(int param0, u32 *param1, u32 *param2, u32 param3, u32 *param4, u32 *param5); +static void sub_0201F15C(UnkStruct_0201EED4 *param0, u32 param1, u32 param2); static void sub_0201F18C(int param0, u32 param1, u32 param2, u32 param3, u32 param4); -static void sub_0201F1F4(void * param0); -static void sub_0201F220(UnkStruct_0201EED4 * param0, int param1); -static void sub_0201F26C(void * param0); -static void sub_0201F298(UnkStruct_0201EED4 * param0, int param1); -static u32 sub_0201F50C(u8 * param0); -static UnkStruct_0201EED4 * sub_0201F2D0(void); +static void sub_0201F1F4(void *param0); +static void sub_0201F220(UnkStruct_0201EED4 *param0, int param1); +static void sub_0201F26C(void *param0); +static void sub_0201F298(UnkStruct_0201EED4 *param0, int param1); +static u32 sub_0201F50C(u8 *param0); +static UnkStruct_0201EED4 *sub_0201F2D0(void); static void sub_0201F30C(void); -static void sub_0201F024(UnkStruct_0201EED4 * param0); -static void sub_0201F670(UnkStruct_0201EED4 * param0); -static UnkStruct_0201EED4 * sub_0201F03C(int param0); +static void sub_0201F024(UnkStruct_0201EED4 *param0); +static void sub_0201F670(UnkStruct_0201EED4 *param0); +static UnkStruct_0201EED4 *sub_0201F03C(int param0); static void sub_0201F47C(u32 param0, u32 param1, int param2); -static void sub_0201F4E4(u8 * param0); -static void sub_0201F524(u8 * param0); -static void sub_0201F53C(u32 param0, u32 param1, u8 * param2); -static u32 sub_0201F598(u32 param0, u8 * param1); -static void sub_0201F620(u32 param0, u32 param1, u8 * param2); -static int sub_0201F074(UnkStruct_0201EED4 * param0, int param1); -static BOOL sub_0201F76C(u32 param0, int param1, u32 * param2, u32 * param3); +static void sub_0201F4E4(u8 *param0); +static void sub_0201F524(u8 *param0); +static void sub_0201F53C(u32 param0, u32 param1, u8 *param2); +static u32 sub_0201F598(u32 param0, u8 *param1); +static void sub_0201F620(u32 param0, u32 param1, u8 *param2); +static int sub_0201F074(UnkStruct_0201EED4 *param0, int param1); +static BOOL sub_0201F76C(u32 param0, int param1, u32 *param2, u32 *param3); static void sub_0201F7BC(u32 param0, int param1); -static void sub_0201F80C(int param0, u32 * param1, u8 * param2); +static void sub_0201F80C(int param0, u32 *param1, u8 *param2); static int sub_0201F734(int param0, int param1, int param2); static int sub_0201F754(int param0, int param1); static int sub_0201F764(int param0, int param1); -static void sub_0201F818(u32 param0, u32 param1, u32 param2, int * param3, int * param4); +static void sub_0201F818(u32 param0, u32 param1, u32 param2, int *param3, int *param4); -static UnkStruct_021C0760 * Unk_021C0760 = NULL; +static UnkStruct_021C0760 *Unk_021C0760 = NULL; -void sub_0201E86C (const UnkStruct_ov22_022559F8 * param0) +void sub_0201E86C(const UnkStruct_ov22_022559F8 *param0) { sub_0201E88C(param0, GX_GetOBJVRamModeChar(), GXS_GetOBJVRamModeChar()); } -void sub_0201E88C (const UnkStruct_ov22_022559F8 * param0, GXOBJVRamModeChar param1, GXOBJVRamModeChar param2) +void sub_0201E88C(const UnkStruct_ov22_022559F8 *param0, GXOBJVRamModeChar param1, GXOBJVRamModeChar param2) { int v0; int v1; @@ -115,7 +117,7 @@ void sub_0201E88C (const UnkStruct_ov22_022559F8 * param0, GXOBJVRamModeChar par } } -void sub_0201E958 (void) +void sub_0201E958(void) { if (Unk_021C0760 != NULL) { sub_0201F4E4(Unk_021C0760->unk_34); @@ -130,7 +132,7 @@ void sub_0201E958 (void) } } -void sub_0201E994 (void) +void sub_0201E994(void) { Unk_021C0760->unk_0C = 0; Unk_021C0760->unk_10 = 0; @@ -141,7 +143,7 @@ void sub_0201E994 (void) sub_0201F30C(); } -void sub_0201E9C0 (u32 param0, u32 param1, u32 param2) +void sub_0201E9C0(u32 param0, u32 param1, u32 param2) { int v0; int v1; @@ -161,10 +163,10 @@ void sub_0201E9C0 (u32 param0, u32 param1, u32 param2) } } -BOOL sub_0201EA24 (const UnkStruct_0200A328 * param0) +BOOL sub_0201EA24(const UnkStruct_0200A328 *param0) { - UnkStruct_0201EED4 * v0; - u32 * v1; + UnkStruct_0201EED4 *v0; + u32 *v1; u8 v2 = 0; u32 v3; @@ -193,10 +195,10 @@ BOOL sub_0201EA24 (const UnkStruct_0200A328 * param0) return 1; } -BOOL sub_0201EA7C (const UnkStruct_0200A328 * param0) +BOOL sub_0201EA7C(const UnkStruct_0200A328 *param0) { - UnkStruct_0201EED4 * v0; - u32 * v1; + UnkStruct_0201EED4 *v0; + u32 *v1; u8 v2 = 0; u32 v3; @@ -227,7 +229,7 @@ BOOL sub_0201EA7C (const UnkStruct_0200A328 * param0) return 1; } -BOOL sub_0201EAD8 (int param0) +BOOL sub_0201EAD8(int param0) { int v0; @@ -240,9 +242,9 @@ BOOL sub_0201EAD8 (int param0) return 0; } -void sub_0201EB08 (int param0, NNSG2dCharacterData * param1) +void sub_0201EB08(int param0, NNSG2dCharacterData *param1) { - UnkStruct_0201EED4 * v0; + UnkStruct_0201EED4 *v0; GF_ASSERT(param1); @@ -250,7 +252,7 @@ void sub_0201EB08 (int param0, NNSG2dCharacterData * param1) GF_ASSERT(v0); v0->unk_00 = param1; - if ((v0->unk_04 & NNS_G2D_VRAM_TYPE_2DMAIN)) { + if (v0->unk_04 & NNS_G2D_VRAM_TYPE_2DMAIN) { sub_0201DC68(NNS_GFD_DST_2D_OBJ_CHAR_MAIN, v0->unk_34, param1->pRawData, param1->szByte); } @@ -259,9 +261,9 @@ void sub_0201EB08 (int param0, NNSG2dCharacterData * param1) } } -void sub_0201EB50 (int param0) +void sub_0201EB50(int param0) { - UnkStruct_0201EED4 * v0; + UnkStruct_0201EED4 *v0; int v1 = 1; do { @@ -275,13 +277,13 @@ void sub_0201EB50 (int param0) } } while (v1); - if ((v0->unk_3C != 0)) { + if (v0->unk_3C != 0) { sub_0201F024(v0); Unk_021C0760->unk_08--; } } -void sub_0201EBA0 (void) +void sub_0201EBA0(void) { int v0; @@ -293,9 +295,9 @@ void sub_0201EBA0 (void) } } -NNSG2dImageProxy * sub_0201EBDC (int param0) +NNSG2dImageProxy *sub_0201EBDC(int param0) { - UnkStruct_0201EED4 * v0; + UnkStruct_0201EED4 *v0; v0 = sub_0201F03C(param0); GF_ASSERT(v0); @@ -307,11 +309,11 @@ NNSG2dImageProxy * sub_0201EBDC (int param0) return &v0->unk_10; } -NNSG2dImageProxy * sub_0201EC00 (int param0, u32 param1) +NNSG2dImageProxy *sub_0201EC00(int param0, u32 param1) { u32 v0, v1; - UnkStruct_0201EED4 * v2; - UnkStruct_0201EED4 * v3; + UnkStruct_0201EED4 *v2; + UnkStruct_0201EED4 *v3; u32 v4, v5; v2 = sub_0201F03C(param0); @@ -342,10 +344,10 @@ NNSG2dImageProxy * sub_0201EC00 (int param0, u32 param1) return &v3->unk_10; } -NNSG2dImageProxy * sub_0201EC84 (const NNSG2dImageProxy * param0) +NNSG2dImageProxy *sub_0201EC84(const NNSG2dImageProxy *param0) { - UnkStruct_0201EED4 * v0; - UnkStruct_0201EED4 * v1; + UnkStruct_0201EED4 *v0; + UnkStruct_0201EED4 *v1; u32 v2, v3; u32 v4, v5; u32 v6; @@ -382,7 +384,7 @@ NNSG2dImageProxy * sub_0201EC84 (const NNSG2dImageProxy * param0) return &v1->unk_10; } -void sub_0201ED1C (const NNSG2dImageProxy * param0) +void sub_0201ED1C(const NNSG2dImageProxy *param0) { int v0; @@ -408,7 +410,7 @@ void sub_0201ED1C (const NNSG2dImageProxy * param0) } } -BOOL sub_0201ED94 (int param0, int param1, int param2, SpriteManagerAllocation * param3) +BOOL sub_0201ED94(int param0, int param1, int param2, SpriteManagerAllocation *param3) { u32 v0, v1; u32 v2, v3; @@ -454,7 +456,7 @@ BOOL sub_0201ED94 (int param0, int param1, int param2, SpriteManagerAllocation * return v4; } -void sub_0201EE28 (SpriteManagerAllocation * param0) +void sub_0201EE28(SpriteManagerAllocation *param0) { int v0; int v1; @@ -478,9 +480,9 @@ void sub_0201EE28 (SpriteManagerAllocation * param0) } } -void * sub_0201EE9C (void) +void *sub_0201EE9C(void) { - void * v0; + void *v0; GF_ASSERT(Unk_021C0760); @@ -490,13 +492,13 @@ void * sub_0201EE9C (void) return v0; } -void sub_0201EEB8 (void * param0) +void sub_0201EEB8(void *param0) { GF_ASSERT(Unk_021C0760 == NULL); Unk_021C0760 = param0; } -static void sub_0201EED4 (UnkStruct_0201EED4 * param0) +static void sub_0201EED4(UnkStruct_0201EED4 *param0) { param0->unk_00 = NULL; param0->unk_04 = 0; @@ -510,7 +512,7 @@ static void sub_0201EED4 (UnkStruct_0201EED4 * param0) NNS_G2dInitImageProxy(¶m0->unk_10); } -static BOOL sub_0201EEF8 (const UnkStruct_0200A328 * param0, UnkStruct_0201EED4 * param1) +static BOOL sub_0201EEF8(const UnkStruct_0200A328 *param0, UnkStruct_0201EED4 *param1) { param1->unk_00 = param0->unk_00; param1->unk_0C = param0->unk_08; @@ -525,7 +527,7 @@ static BOOL sub_0201EEF8 (const UnkStruct_0200A328 * param0, UnkStruct_0201EED4 return 1; } -static UnkStruct_0201EED4 * sub_0201EF1C (const NNSG2dImageProxy * param0) +static UnkStruct_0201EED4 *sub_0201EF1C(const NNSG2dImageProxy *param0) { int v0; @@ -544,7 +546,7 @@ static UnkStruct_0201EED4 * sub_0201EF1C (const NNSG2dImageProxy * param0) return Unk_021C0760->unk_00 + v0; } -static BOOL sub_0201EF68 (UnkStruct_0201EED4 * param0) +static BOOL sub_0201EF68(UnkStruct_0201EED4 *param0) { BOOL v0 = 1; @@ -563,7 +565,7 @@ static BOOL sub_0201EF68 (UnkStruct_0201EED4 * param0) return v0; } -static BOOL sub_0201EF98 (UnkStruct_0201EED4 * param0) +static BOOL sub_0201EF98(UnkStruct_0201EED4 *param0) { BOOL v0 = 1; u32 v1, v2; @@ -578,7 +580,7 @@ static BOOL sub_0201EF98 (UnkStruct_0201EED4 * param0) return v0; } -static BOOL sub_0201EFCC (UnkStruct_0201EED4 * param0) +static BOOL sub_0201EFCC(UnkStruct_0201EED4 *param0) { u32 v0, v1; u32 v2, v3; @@ -602,7 +604,7 @@ static BOOL sub_0201EFCC (UnkStruct_0201EED4 * param0) return 1; } -static void sub_0201F024 (UnkStruct_0201EED4 * param0) +static void sub_0201F024(UnkStruct_0201EED4 *param0) { if (param0->unk_48) { sub_0201F670(param0); @@ -611,7 +613,7 @@ static void sub_0201F024 (UnkStruct_0201EED4 * param0) sub_0201EED4(param0); } -static UnkStruct_0201EED4 * sub_0201F03C (int param0) +static UnkStruct_0201EED4 *sub_0201F03C(int param0) { int v0; @@ -624,7 +626,7 @@ static UnkStruct_0201EED4 * sub_0201F03C (int param0) return NULL; } -static int sub_0201F074 (UnkStruct_0201EED4 * param0, int param1) +static int sub_0201F074(UnkStruct_0201EED4 *param0, int param1) { if (param1 == NNS_G2D_VRAM_TYPE_2DMAIN) { param0->unk_00->mapingType = GX_GetOBJVRamModeChar(); @@ -635,7 +637,7 @@ static int sub_0201F074 (UnkStruct_0201EED4 * param0, int param1) return param0->unk_00->mapingType; } -static void sub_0201F09C (UnkStruct_0201EED4 * param0, u32 param1, u32 param2) +static void sub_0201F09C(UnkStruct_0201EED4 *param0, u32 param1, u32 param2) { param0->unk_34 = param1; param0->unk_38 = param2; @@ -645,7 +647,7 @@ static void sub_0201F09C (UnkStruct_0201EED4 * param0, u32 param1, u32 param2) } } -static BOOL sub_0201F0B0 (int param0, u32 * param1, u32 * param2, u32 param3, u32 * param4, u32 * param5) +static BOOL sub_0201F0B0(int param0, u32 *param1, u32 *param2, u32 param3, u32 *param4, u32 *param5) { u32 v0; @@ -678,7 +680,7 @@ static BOOL sub_0201F0B0 (int param0, u32 * param1, u32 * param2, u32 param3, u3 return 1; } -static void sub_0201F15C (UnkStruct_0201EED4 * param0, u32 param1, u32 param2) +static void sub_0201F15C(UnkStruct_0201EED4 *param0, u32 param1, u32 param2) { if (param0->unk_04 & NNS_G2D_VRAM_TYPE_2DMAIN) { param0->unk_34 = param1 + Unk_021C0760->unk_1C; @@ -689,7 +691,7 @@ static void sub_0201F15C (UnkStruct_0201EED4 * param0, u32 param1, u32 param2) } } -static void sub_0201F18C (int param0, u32 param1, u32 param2, u32 param3, u32 param4) +static void sub_0201F18C(int param0, u32 param1, u32 param2, u32 param3, u32 param4) { int v0; int v1; @@ -709,9 +711,9 @@ static void sub_0201F18C (int param0, u32 param1, u32 param2, u32 param3, u32 pa } } -static void sub_0201F1F4 (void * param0) +static void sub_0201F1F4(void *param0) { - UnkStruct_0201EED4 * v0 = (UnkStruct_0201EED4 *)param0; + UnkStruct_0201EED4 *v0 = (UnkStruct_0201EED4 *)param0; int v1; NNS_G2dInitImageProxy(&v0->unk_10); @@ -724,7 +726,7 @@ static void sub_0201F1F4 (void * param0) } } -static void sub_0201F220 (UnkStruct_0201EED4 * param0, int param1) +static void sub_0201F220(UnkStruct_0201EED4 *param0, int param1) { int v0; int v1; @@ -751,9 +753,9 @@ static void sub_0201F220 (UnkStruct_0201EED4 * param0, int param1) } } -static void sub_0201F26C (void * param0) +static void sub_0201F26C(void *param0) { - UnkStruct_0201EED4 * v0 = (UnkStruct_0201EED4 *)param0; + UnkStruct_0201EED4 *v0 = (UnkStruct_0201EED4 *)param0; NNS_G2dInitImageProxy(&v0->unk_10); @@ -765,7 +767,7 @@ static void sub_0201F26C (void * param0) } } -static void sub_0201F298 (UnkStruct_0201EED4 * param0, int param1) +static void sub_0201F298(UnkStruct_0201EED4 *param0, int param1) { int v0; int v1; @@ -788,7 +790,7 @@ static void sub_0201F298 (UnkStruct_0201EED4 * param0, int param1) NNS_G2dLoadImageVramTransfer(param0->unk_00, v1, param1, ¶m0->unk_10); } -static UnkStruct_0201EED4 * sub_0201F2D0 (void) +static UnkStruct_0201EED4 *sub_0201F2D0(void) { int v0; @@ -801,7 +803,7 @@ static UnkStruct_0201EED4 * sub_0201F2D0 (void) return NULL; } -static void sub_0201F30C (void) +static void sub_0201F30C(void) { GXVRamOBJ v0; GXVRamSubOBJ v1; @@ -865,17 +867,17 @@ static void sub_0201F30C (void) v2 = sub_0201F764(Unk_021C0760->unk_28, Unk_021C0760->unk_30); Unk_021C0760->unk_20 = Unk_021C0760->unk_18 - v2; - GF_ASSERT(((Unk_021C0760->unk_1C >= 0) && (Unk_021C0760->unk_20 >= 0))); - GF_ASSERT(((Unk_021C0760->unk_1C >= 0) && (Unk_021C0760->unk_20 >= 0))); + GF_ASSERT((Unk_021C0760->unk_1C >= 0) && (Unk_021C0760->unk_20 >= 0)); + GF_ASSERT((Unk_021C0760->unk_1C >= 0) && (Unk_021C0760->unk_20 >= 0)); } -void sub_0201F460 (void) +void sub_0201F460(void) { sub_0201F524(Unk_021C0760->unk_34); sub_0201F524(Unk_021C0760->unk_38); } -static void sub_0201F47C (u32 param0, u32 param1, int param2) +static void sub_0201F47C(u32 param0, u32 param1, int param2) { Unk_021C0760->unk_24 = param0; Unk_021C0760->unk_28 = param1; @@ -899,7 +901,7 @@ static void sub_0201F47C (u32 param0, u32 param1, int param2) sub_0201F460(); } -static void sub_0201F4E4 (u8 * param0) +static void sub_0201F4E4(u8 *param0) { if (param0 != NULL) { if (param0 == Unk_021C0760->unk_34) { @@ -915,7 +917,7 @@ static void sub_0201F4E4 (u8 * param0) } } -static u32 sub_0201F50C (u8 * param0) +static u32 sub_0201F50C(u8 *param0) { if (param0 == Unk_021C0760->unk_34) { return Unk_021C0760->unk_24; @@ -924,7 +926,7 @@ static u32 sub_0201F50C (u8 * param0) return Unk_021C0760->unk_28; } -static void sub_0201F524 (u8 * param0) +static void sub_0201F524(u8 *param0) { int v0; u32 v1; @@ -935,7 +937,7 @@ static void sub_0201F524 (u8 * param0) } } -static void sub_0201F53C (u32 param0, u32 param1, u8 * param2) +static void sub_0201F53C(u32 param0, u32 param1, u8 *param2) { int v0; u32 v1; @@ -961,7 +963,7 @@ static void sub_0201F53C (u32 param0, u32 param1, u8 * param2) } } -static u32 sub_0201F598 (u32 param0, u8 * param1) +static u32 sub_0201F598(u32 param0, u8 *param1) { int v0, v1; u32 v2; @@ -1002,7 +1004,7 @@ static u32 sub_0201F598 (u32 param0, u8 * param1) return 0xffffffff; } -static void sub_0201F620 (u32 param0, u32 param1, u8 * param2) +static void sub_0201F620(u32 param0, u32 param1, u8 *param2) { int v0; @@ -1013,7 +1015,7 @@ static void sub_0201F620 (u32 param0, u32 param1, u8 * param2) sub_0201F80C(v0, &v1, &v2); - GF_ASSERT((param2[v1] & (1 << v2))); + GF_ASSERT(param2[v1] & (1 << v2)); v3 = (1 << v2) ^ 0xff; param2[v1] &= v3; @@ -1021,7 +1023,7 @@ static void sub_0201F620 (u32 param0, u32 param1, u8 * param2) } } -static void sub_0201F670 (UnkStruct_0201EED4 * param0) +static void sub_0201F670(UnkStruct_0201EED4 *param0) { u32 v0; u32 v1; @@ -1043,7 +1045,7 @@ static void sub_0201F670 (UnkStruct_0201EED4 * param0) param0->unk_48 = 0; } -int sub_0201F6F4 (int param0) +int sub_0201F6F4(int param0) { int v0; @@ -1068,7 +1070,7 @@ int sub_0201F6F4 (int param0) return v0; } -static int sub_0201F734 (int param0, int param1, int param2) +static int sub_0201F734(int param0, int param1, int param2) { param1 *= 32; @@ -1083,7 +1085,7 @@ static int sub_0201F734 (int param0, int param1, int param2) return param0; } -static int sub_0201F754 (int param0, int param1) +static int sub_0201F754(int param0, int param1) { param0 /= 32; param0 /= param1; @@ -1091,7 +1093,7 @@ static int sub_0201F754 (int param0, int param1) return param0; } -static int sub_0201F764 (int param0, int param1) +static int sub_0201F764(int param0, int param1) { param0 *= param1; param0 *= 32; @@ -1099,7 +1101,7 @@ static int sub_0201F764 (int param0, int param1) return param0; } -static BOOL sub_0201F76C (u32 param0, int param1, u32 * param2, u32 * param3) +static BOOL sub_0201F76C(u32 param0, int param1, u32 *param2, u32 *param3) { BOOL v0 = 1; @@ -1124,7 +1126,7 @@ static BOOL sub_0201F76C (u32 param0, int param1, u32 * param2, u32 * param3) return v0; } -static void sub_0201F7BC (u32 param0, int param1) +static void sub_0201F7BC(u32 param0, int param1) { if (param1 & NNS_G2D_VRAM_TYPE_2DMAIN) { Unk_021C0760->unk_0C += param0; @@ -1137,13 +1139,13 @@ static void sub_0201F7BC (u32 param0, int param1) } } -static void sub_0201F80C (int param0, u32 * param1, u8 * param2) +static void sub_0201F80C(int param0, u32 *param1, u8 *param2) { *param1 = param0 >> 3; *param2 = param0 & 7; } -static void sub_0201F818 (u32 param0, u32 param1, u32 param2, int * param3, int * param4) +static void sub_0201F818(u32 param0, u32 param1, u32 param2, int *param3, int *param4) { *param3 = param1 - param0; diff --git a/src/unk_0201F834.c b/src/unk_0201F834.c index 97a3fb400e..c26bccea32 100644 --- a/src/unk_0201F834.c +++ b/src/unk_0201F834.c @@ -1,15 +1,15 @@ +#include "unk_0201F834.h" + #include #include - #include "struct_defs/struct_0200A5C8.h" #include "heap.h" #include "unk_0201DBEC.h" -#include "unk_0201F834.h" typedef struct { - NNSG2dPaletteData * unk_00; + NNSG2dPaletteData *unk_00; NNS_G2D_VRAM_TYPE unk_04; u32 unk_08; u32 unk_0C; @@ -20,7 +20,7 @@ typedef struct { } UnkStruct_0201FB20; typedef struct { - UnkStruct_0201FB20 * unk_00; + UnkStruct_0201FB20 *unk_00; int unk_04; int unk_08; u32 unk_0C; @@ -33,28 +33,28 @@ typedef struct { u16 unk_26; } UnkStruct_0201FD9C; -static void sub_0201FB20(UnkStruct_0201FB20 * param0); -static BOOL sub_0201FB3C(const UnkStruct_0200A5C8 * param0, UnkStruct_0201FB20 * param1); -static BOOL sub_0201FB94(const UnkStruct_0200A5C8 * param0, UnkStruct_0201FB20 * param1); -static BOOL sub_0201FAEC(const UnkStruct_0200A5C8 * param0, UnkStruct_0201FB20 * param1); -static void sub_0201FCD4(UnkStruct_0201FB20 * param0); -static void sub_0201FCE4(void * param0); +static void sub_0201FB20(UnkStruct_0201FB20 *param0); +static BOOL sub_0201FB3C(const UnkStruct_0200A5C8 *param0, UnkStruct_0201FB20 *param1); +static BOOL sub_0201FB94(const UnkStruct_0200A5C8 *param0, UnkStruct_0201FB20 *param1); +static BOOL sub_0201FAEC(const UnkStruct_0200A5C8 *param0, UnkStruct_0201FB20 *param1); +static void sub_0201FCD4(UnkStruct_0201FB20 *param0); +static void sub_0201FCE4(void *param0); static void sub_0201FC8C(void); -static void sub_0201FAE4(UnkStruct_0201FB20 * param0); -static UnkStruct_0201FB20 * sub_0201FC18(int param0); -static UnkStruct_0201FB20 * sub_0201FC50(void); -static void sub_0201FD18(u16 * param0, int param1, int param2); -static void sub_0201FD3C(u16 * param0, int param1, int param2); +static void sub_0201FAE4(UnkStruct_0201FB20 *param0); +static UnkStruct_0201FB20 *sub_0201FC18(int param0); +static UnkStruct_0201FB20 *sub_0201FC50(void); +static void sub_0201FD18(u16 *param0, int param1, int param2); +static void sub_0201FD3C(u16 *param0, int param1, int param2); static int sub_0201FD5C(u16 param0, int param1); -static void sub_0201FD9C(UnkStruct_0201FD9C * param0); -static void sub_0201FDA4(UnkStruct_0201FB20 * param0); -static void sub_0201FDE0(UnkStruct_0201FB20 * param0); -static BOOL sub_0201FE1C(UnkStruct_0201FB20 * param0, u32 param1, u32 param2, u32 param3, u32 param4); -static void sub_0201FE68(UnkStruct_0201FB20 * param0, u32 * param1, u32 * param2); +static void sub_0201FD9C(UnkStruct_0201FD9C *param0); +static void sub_0201FDA4(UnkStruct_0201FB20 *param0); +static void sub_0201FDE0(UnkStruct_0201FB20 *param0); +static BOOL sub_0201FE1C(UnkStruct_0201FB20 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +static void sub_0201FE68(UnkStruct_0201FB20 *param0, u32 *param1, u32 *param2); -static UnkStruct_0201FD9C * Unk_021C0764 = NULL; +static UnkStruct_0201FD9C *Unk_021C0764 = NULL; -void sub_0201F834 (int param0, int param1) +void sub_0201F834(int param0, int param1) { int v0; @@ -71,7 +71,7 @@ void sub_0201F834 (int param0, int param1) } } -void sub_0201F890 (u16 param0, u32 param1) +void sub_0201F890(u16 param0, u32 param1) { if (param1 == NNS_G2D_VRAM_TYPE_2DMAIN) { Unk_021C0764->unk_24 |= param0; @@ -80,7 +80,7 @@ void sub_0201F890 (u16 param0, u32 param1) } } -void sub_0201F8B4 (void) +void sub_0201F8B4(void) { if (Unk_021C0764 != NULL) { sub_0201FA18(); @@ -90,12 +90,12 @@ void sub_0201F8B4 (void) } } -static void sub_0201F8E0 (void) +static void sub_0201F8E0(void) { return; } -void sub_0201F8E4 (void) +void sub_0201F8E4(void) { Unk_021C0764->unk_0C = 0; Unk_021C0764->unk_10 = 0; @@ -106,9 +106,9 @@ void sub_0201F8E4 (void) sub_0201FD9C(Unk_021C0764); } -BOOL sub_0201F90C (const UnkStruct_0200A5C8 * param0) +BOOL sub_0201F90C(const UnkStruct_0200A5C8 *param0) { - UnkStruct_0201FB20 * v0; + UnkStruct_0201FB20 *v0; v0 = sub_0201FC50(); @@ -131,9 +131,9 @@ BOOL sub_0201F90C (const UnkStruct_0200A5C8 * param0) return 1; } -BOOL sub_0201F950 (const UnkStruct_0200A5C8 * param0) +BOOL sub_0201F950(const UnkStruct_0200A5C8 *param0) { - UnkStruct_0201FB20 * v0; + UnkStruct_0201FB20 *v0; v0 = sub_0201FC50(); @@ -154,9 +154,9 @@ BOOL sub_0201F950 (const UnkStruct_0200A5C8 * param0) return 1; } -void sub_0201F990 (int param0, NNSG2dPaletteData * param1) +void sub_0201F990(int param0, NNSG2dPaletteData *param1) { - UnkStruct_0201FB20 * v0; + UnkStruct_0201FB20 *v0; GF_ASSERT(param1); v0 = sub_0201FC18(param0); @@ -173,9 +173,9 @@ void sub_0201F990 (int param0, NNSG2dPaletteData * param1) } } -BOOL sub_0201F9DC (int param0) +BOOL sub_0201F9DC(int param0) { - UnkStruct_0201FB20 * v0; + UnkStruct_0201FB20 *v0; v0 = sub_0201FC18(param0); @@ -186,9 +186,9 @@ BOOL sub_0201F9DC (int param0) return 0; } -void sub_0201F9F0 (int param0) +void sub_0201F9F0(int param0) { - UnkStruct_0201FB20 * v0; + UnkStruct_0201FB20 *v0; v0 = sub_0201FC18(param0); @@ -200,7 +200,7 @@ void sub_0201F9F0 (int param0) } } -void sub_0201FA18 (void) +void sub_0201FA18(void) { int v0; @@ -212,9 +212,9 @@ void sub_0201FA18 (void) } } -NNSG2dImagePaletteProxy * sub_0201FA58 (int param0) +NNSG2dImagePaletteProxy *sub_0201FA58(int param0) { - UnkStruct_0201FB20 * v0; + UnkStruct_0201FB20 *v0; v0 = sub_0201FC18(param0); @@ -230,9 +230,9 @@ NNSG2dImagePaletteProxy * sub_0201FA58 (int param0) return NULL; } -NNSG2dImagePaletteProxy * sub_0201FA80 (int param0, NNSG2dImageProxy * param1) +NNSG2dImagePaletteProxy *sub_0201FA80(int param0, NNSG2dImageProxy *param1) { - UnkStruct_0201FB20 * v0; + UnkStruct_0201FB20 *v0; v0 = sub_0201FC18(param0); @@ -252,7 +252,7 @@ NNSG2dImagePaletteProxy * sub_0201FA80 (int param0, NNSG2dImageProxy * param1) return &v0->unk_10; } -u32 sub_0201FAB4 (const NNSG2dImagePaletteProxy * param0, u32 param1) +u32 sub_0201FAB4(const NNSG2dImagePaletteProxy *param0, u32 param1) { u32 v0; u32 v1; @@ -277,12 +277,12 @@ u32 sub_0201FAB4 (const NNSG2dImagePaletteProxy * param0, u32 param1) return v1; } -static void sub_0201FAE4 (UnkStruct_0201FB20 * param0) +static void sub_0201FAE4(UnkStruct_0201FB20 *param0) { sub_0201FB20(param0); } -static BOOL sub_0201FAEC (const UnkStruct_0200A5C8 * param0, UnkStruct_0201FB20 * param1) +static BOOL sub_0201FAEC(const UnkStruct_0200A5C8 *param0, UnkStruct_0201FB20 *param1) { param1->unk_00 = param0->unk_00; @@ -299,17 +299,17 @@ static BOOL sub_0201FAEC (const UnkStruct_0200A5C8 * param0, UnkStruct_0201FB20 return 1; } -static void sub_0201FB20 (UnkStruct_0201FB20 * param0) +static void sub_0201FB20(UnkStruct_0201FB20 *param0) { memset(param0, 0, sizeof(UnkStruct_0201FB20)); param0->unk_0C = 0xffffffff; NNS_G2dInitImagePaletteProxy(¶m0->unk_10); } -static BOOL sub_0201FB3C (const UnkStruct_0200A5C8 * param0, UnkStruct_0201FB20 * param1) +static BOOL sub_0201FB3C(const UnkStruct_0200A5C8 *param0, UnkStruct_0201FB20 *param1) { - u32 * v0; - u32 * v1; + u32 *v0; + u32 *v1; BOOL v2 = 1; u32 v3; u32 v4; @@ -333,7 +333,7 @@ static BOOL sub_0201FB3C (const UnkStruct_0200A5C8 * param0, UnkStruct_0201FB20 return v2; } -static BOOL sub_0201FB94 (const UnkStruct_0200A5C8 * param0, UnkStruct_0201FB20 * param1) +static BOOL sub_0201FB94(const UnkStruct_0200A5C8 *param0, UnkStruct_0201FB20 *param1) { int v0, v1; @@ -373,7 +373,7 @@ static BOOL sub_0201FB94 (const UnkStruct_0200A5C8 * param0, UnkStruct_0201FB20 return 1; } -static UnkStruct_0201FB20 * sub_0201FC18 (int param0) +static UnkStruct_0201FB20 *sub_0201FC18(int param0) { int v0; @@ -386,7 +386,7 @@ static UnkStruct_0201FB20 * sub_0201FC18 (int param0) return NULL; } -static UnkStruct_0201FB20 * sub_0201FC50 (void) +static UnkStruct_0201FB20 *sub_0201FC50(void) { int v0; @@ -399,7 +399,7 @@ static UnkStruct_0201FB20 * sub_0201FC50 (void) return NULL; } -static void sub_0201FC8C (void) +static void sub_0201FC8C(void) { GXVRamOBJExtPltt v0; GXVRamSubOBJExtPltt v1; @@ -428,15 +428,15 @@ static void sub_0201FC8C (void) } } -static void sub_0201FCD4 (UnkStruct_0201FB20 * param0) +static void sub_0201FCD4(UnkStruct_0201FB20 *param0) { param0->unk_00->szByte = param0->unk_08 * 32; sub_0201FCE4(param0); } -static void sub_0201FCE4 (void * param0) +static void sub_0201FCE4(void *param0) { - UnkStruct_0201FB20 * v0 = (UnkStruct_0201FB20 *)param0; + UnkStruct_0201FB20 *v0 = (UnkStruct_0201FB20 *)param0; NNS_G2dInitImagePaletteProxy(&v0->unk_10); @@ -449,7 +449,7 @@ static void sub_0201FCE4 (void * param0) } } -static void sub_0201FD18 (u16 * param0, int param1, int param2) +static void sub_0201FD18(u16 *param0, int param1, int param2) { int v0; @@ -458,7 +458,7 @@ static void sub_0201FD18 (u16 * param0, int param1, int param2) } } -static void sub_0201FD3C (u16 * param0, int param1, int param2) +static void sub_0201FD3C(u16 *param0, int param1, int param2) { int v0; @@ -467,7 +467,7 @@ static void sub_0201FD3C (u16 * param0, int param1, int param2) } } -static int sub_0201FD5C (u16 param0, int param1) +static int sub_0201FD5C(u16 param0, int param1) { int v0, v1; @@ -496,13 +496,13 @@ static int sub_0201FD5C (u16 param0, int param1) return v0 * 32; } -static void sub_0201FD9C (UnkStruct_0201FD9C * param0) +static void sub_0201FD9C(UnkStruct_0201FD9C *param0) { param0->unk_24 = 0; param0->unk_26 = 0; } -static void sub_0201FDA4 (UnkStruct_0201FB20 * param0) +static void sub_0201FDA4(UnkStruct_0201FB20 *param0) { if (param0->unk_04 & NNS_G2D_VRAM_TYPE_2DMAIN) { sub_0201FD18(&Unk_021C0764->unk_24, param0->unk_08, param0->unk_24 / 32); @@ -513,7 +513,7 @@ static void sub_0201FDA4 (UnkStruct_0201FB20 * param0) } } -static void sub_0201FDE0 (UnkStruct_0201FB20 * param0) +static void sub_0201FDE0(UnkStruct_0201FB20 *param0) { if (param0->unk_04 & NNS_G2D_VRAM_TYPE_2DMAIN) { sub_0201FD3C(&Unk_021C0764->unk_24, param0->unk_08, param0->unk_24 / 32); @@ -524,12 +524,12 @@ static void sub_0201FDE0 (UnkStruct_0201FB20 * param0) } } -static BOOL sub_0201FE1C (UnkStruct_0201FB20 * param0, u32 param1, u32 param2, u32 param3, u32 param4) +static BOOL sub_0201FE1C(UnkStruct_0201FB20 *param0, u32 param1, u32 param2, u32 param3, u32 param4) { BOOL v0 = 1; if (param0->unk_04 & NNS_G2D_VRAM_TYPE_2DMAIN) { - if ((param1 + (param0->unk_08 * 32) > param3)) { + if (param1 + (param0->unk_08 * 32) > param3) { GF_ASSERT(FALSE); sub_0201F8E0(); v0 = 0; @@ -539,7 +539,7 @@ static BOOL sub_0201FE1C (UnkStruct_0201FB20 * param0, u32 param1, u32 param2, u } if (param0->unk_04 & NNS_G2D_VRAM_TYPE_2DSUB) { - if ((param2 + (param0->unk_08 * 32) > param4)) { + if (param2 + (param0->unk_08 * 32) > param4) { GF_ASSERT(FALSE); sub_0201F8E0(); v0 = 0; @@ -551,7 +551,7 @@ static BOOL sub_0201FE1C (UnkStruct_0201FB20 * param0, u32 param1, u32 param2, u return v0; } -static void sub_0201FE68 (UnkStruct_0201FB20 * param0, u32 * param1, u32 * param2) +static void sub_0201FE68(UnkStruct_0201FB20 *param0, u32 *param1, u32 *param2) { if (param0->unk_04 & NNS_G2D_VRAM_TYPE_2DMAIN) { *param1 += param0->unk_08 * 32; diff --git a/src/unk_02020AEC.c b/src/unk_02020AEC.c index f64d1c27d4..e9869058df 100644 --- a/src/unk_02020AEC.c +++ b/src/unk_02020AEC.c @@ -1,13 +1,15 @@ +#include "unk_02020AEC.h" + #include #include #include "struct_decls/struct_0201DD00_decl.h" #include "struct_decls/struct_0201DDF4_decl.h" - -#include "functypes/funcptr_02021444.h" #include "struct_defs/struct_0202144C.h" #include "struct_defs/struct_020217F4.h" #include "struct_defs/struct_02024184.h" + +#include "functypes/funcptr_02021444.h" #include "overlay005/struct_ov5_021DF7F8.h" #include "overlay005/struct_ov5_021DF84C.h" #include "overlay005/struct_ov5_021EDDAC.h" @@ -15,33 +17,32 @@ #include "heap.h" #include "unk_0201C970.h" #include "unk_0201DD00.h" -#include "unk_02020AEC.h" #include "unk_0202414C.h" typedef struct UnkStruct_020216E0_t { VecFx32 unk_00; VecFx32 unk_0C; - const MtxFx33 * unk_18; - void * unk_1C; + const MtxFx33 *unk_18; + void *unk_1C; UnkFuncPtr_02021444 unk_20; u8 unk_24; - void * unk_28; - const UnkStruct_020217F4 * unk_2C; + void *unk_28; + const UnkStruct_020217F4 *unk_2C; NNSG3dRenderObj unk_30; - NNSG3dResMdlSet * unk_84; - NNSG3dResMdl * unk_88; - NNSG3dResTex * unk_8C; - const NNSG3dResTex * unk_90; + NNSG3dResMdlSet *unk_84; + NNSG3dResMdl *unk_88; + NNSG3dResTex *unk_8C; + const NNSG3dResTex *unk_90; NNSGfdTexKey unk_94; NNSGfdTexKey unk_98; NNSGfdPlttKey unk_9C; UnkStruct_02024184 unk_A0; - UnkStruct_0201DDF4 * unk_B0; + UnkStruct_0201DDF4 *unk_B0; u8 unk_B4; u16 unk_B6; fx32 unk_B8; - struct UnkStruct_020216E0_t * unk_BC; - struct UnkStruct_020216E0_t * unk_C0; + struct UnkStruct_020216E0_t *unk_BC; + struct UnkStruct_020216E0_t *unk_C0; } UnkStruct_020216E0; typedef struct UnkStruct_02020C44_t { @@ -49,55 +50,55 @@ typedef struct UnkStruct_02020C44_t { u8 unk_01; u8 unk_02; u8 unk_03; - UnkStruct_020216E0 * unk_04; + UnkStruct_020216E0 *unk_04; int unk_08; UnkStruct_020216E0 unk_0C; - UnkStruct_020216E0 ** unk_CC; + UnkStruct_020216E0 **unk_CC; int unk_D0; - NNSFndAllocator * unk_D4; - UnkStruct_0201DD00 * unk_D8; + NNSFndAllocator *unk_D4; + UnkStruct_0201DD00 *unk_D8; } UnkStruct_02020C44; -static UnkStruct_02020C44 * sub_02020D74(void); -static void sub_02020AEC(UnkStruct_02020C44 * param0); -static void sub_02020DA8(UnkStruct_02020C44 * param0); -static void sub_0202144C(UnkStruct_020216E0 * param0); -static void sub_0202149C(NNSG3dResMdl * param0, const NNSG3dResTex * param1, u8 param2); -static void sub_02021524(NNSG3dResMat * param0, const NNSG3dResDictTexToMatIdxData * param1, u32 param2); -static void sub_020215A0(NNSG3dResMdl * param0, const NNSG3dResTex * param1, u8 param2); -static void sub_0202162C(NNSG3dResMat * param0, const NNSG3dResDictPlttToMatIdxData * param1, u32 param2); -static void sub_020216A8(UnkStruct_02020C44 * param0); -static UnkStruct_020216E0 * sub_020216E0(UnkStruct_02020C44 * param0); -static BOOL sub_0202170C(UnkStruct_02020C44 * param0, UnkStruct_020216E0 * param1); -static void sub_02021744(UnkStruct_020216E0 * param0, UnkStruct_020216E0 * param1); -static void sub_02021768(UnkStruct_020216E0 * param0); -static void sub_0202185C(UnkStruct_020216E0 * param0); -static void sub_0202187C(UnkStruct_020216E0 * param0); -static void * sub_0202189C(const UnkStruct_ov5_021DF84C * param0, int param1); -static const UnkStruct_020217F4 * sub_020218B4(const UnkStruct_020217F4 * param0, int param1); -static NNSG3dResMdlSet * sub_02021788(const UnkStruct_ov5_021DF84C * param0, NNSG3dResMdl ** param1, NNSG3dResTex ** param2); -static NNSG3dResTex * sub_020217D4(const UnkStruct_ov5_021DF84C * param0); -static void sub_020217E0(UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1); -static void sub_02020E28(UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1); -static void sub_02020E78(UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1); -static fx32 sub_020217F4(const UnkStruct_020216E0 * param0, int param1); -static int sub_02021804(UnkStruct_020216E0 * param0, fx32 param1); -static int sub_02021824(const UnkStruct_020217F4 * param0, fx32 * param1, fx32 param2); -static void sub_02020EF8(const NNSG3dResTex * param0, NNSG3dTexKey * param1, NNSG3dTexKey * param2, NNSG3dPlttKey * param3); -static void sub_02020F90(NNSG3dResTex * param0, NNSG3dTexKey * param1, NNSG3dTexKey * param2, NNSG3dPlttKey * param3); -static void sub_02020FA4(NNSG3dResTex * param0, NNSG3dResMdlSet * param1, NNSG3dTexKey * param2, NNSG3dTexKey * param3, NNSG3dPlttKey * param4); -static void sub_02020FC8(NNSG3dTexKey * param0, NNSG3dTexKey * param1, NNSG3dPlttKey * param2); -static BOOL sub_02020FFC(const NNSG3dResTex * param0, const NNSG3dResTex * param1); -static void sub_0202105C(UnkStruct_02020C44 * param0, UnkStruct_020216E0 * param1); -static void sub_02021078(UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1); -static void sub_020210F4(const UnkStruct_02020C44 * param0, UnkStruct_020216E0 * param1, const UnkStruct_ov5_021DF84C * param2); -static void sub_02021148(UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1); -static void sub_0202117C(UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1); - -static UnkStruct_02020C44 * Unk_021C0774 = NULL; +static UnkStruct_02020C44 *sub_02020D74(void); +static void sub_02020AEC(UnkStruct_02020C44 *param0); +static void sub_02020DA8(UnkStruct_02020C44 *param0); +static void sub_0202144C(UnkStruct_020216E0 *param0); +static void sub_0202149C(NNSG3dResMdl *param0, const NNSG3dResTex *param1, u8 param2); +static void sub_02021524(NNSG3dResMat *param0, const NNSG3dResDictTexToMatIdxData *param1, u32 param2); +static void sub_020215A0(NNSG3dResMdl *param0, const NNSG3dResTex *param1, u8 param2); +static void sub_0202162C(NNSG3dResMat *param0, const NNSG3dResDictPlttToMatIdxData *param1, u32 param2); +static void sub_020216A8(UnkStruct_02020C44 *param0); +static UnkStruct_020216E0 *sub_020216E0(UnkStruct_02020C44 *param0); +static BOOL sub_0202170C(UnkStruct_02020C44 *param0, UnkStruct_020216E0 *param1); +static void sub_02021744(UnkStruct_020216E0 *param0, UnkStruct_020216E0 *param1); +static void sub_02021768(UnkStruct_020216E0 *param0); +static void sub_0202185C(UnkStruct_020216E0 *param0); +static void sub_0202187C(UnkStruct_020216E0 *param0); +static void *sub_0202189C(const UnkStruct_ov5_021DF84C *param0, int param1); +static const UnkStruct_020217F4 *sub_020218B4(const UnkStruct_020217F4 *param0, int param1); +static NNSG3dResMdlSet *sub_02021788(const UnkStruct_ov5_021DF84C *param0, NNSG3dResMdl **param1, NNSG3dResTex **param2); +static NNSG3dResTex *sub_020217D4(const UnkStruct_ov5_021DF84C *param0); +static void sub_020217E0(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1); +static void sub_02020E28(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1); +static void sub_02020E78(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1); +static fx32 sub_020217F4(const UnkStruct_020216E0 *param0, int param1); +static int sub_02021804(UnkStruct_020216E0 *param0, fx32 param1); +static int sub_02021824(const UnkStruct_020217F4 *param0, fx32 *param1, fx32 param2); +static void sub_02020EF8(const NNSG3dResTex *param0, NNSG3dTexKey *param1, NNSG3dTexKey *param2, NNSG3dPlttKey *param3); +static void sub_02020F90(NNSG3dResTex *param0, NNSG3dTexKey *param1, NNSG3dTexKey *param2, NNSG3dPlttKey *param3); +static void sub_02020FA4(NNSG3dResTex *param0, NNSG3dResMdlSet *param1, NNSG3dTexKey *param2, NNSG3dTexKey *param3, NNSG3dPlttKey *param4); +static void sub_02020FC8(NNSG3dTexKey *param0, NNSG3dTexKey *param1, NNSG3dPlttKey *param2); +static BOOL sub_02020FFC(const NNSG3dResTex *param0, const NNSG3dResTex *param1); +static void sub_0202105C(UnkStruct_02020C44 *param0, UnkStruct_020216E0 *param1); +static void sub_02021078(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1); +static void sub_020210F4(const UnkStruct_02020C44 *param0, UnkStruct_020216E0 *param1, const UnkStruct_ov5_021DF84C *param2); +static void sub_02021148(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1); +static void sub_0202117C(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1); + +static UnkStruct_02020C44 *Unk_021C0774 = NULL; static int Unk_021C0778 = 0; -static void sub_02020AEC (UnkStruct_02020C44 * param0) +static void sub_02020AEC(UnkStruct_02020C44 *param0) { param0->unk_00 = 0; param0->unk_01 = 0; @@ -110,7 +111,7 @@ static void sub_02020AEC (UnkStruct_02020C44 * param0) param0->unk_03 = 0; } -void sub_02020B14 (UnkStruct_020216E0 * param0) +void sub_02020B14(UnkStruct_020216E0 *param0) { u8 v0 = 0; @@ -140,11 +141,11 @@ void sub_02020B14 (UnkStruct_020216E0 * param0) param0->unk_20 = NULL; } -void sub_02020B90 (int param0, int param1) +void sub_02020B90(int param0, int param1) { int v0; - GF_ASSERT((Unk_021C0774 == NULL)); + GF_ASSERT(Unk_021C0774 == NULL); Unk_021C0774 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02020C44) * param0); Unk_021C0778 = param0; @@ -154,7 +155,7 @@ void sub_02020B90 (int param0, int param1) } } -void sub_02020BD0 (void) +void sub_02020BD0(void) { int v0; @@ -168,7 +169,7 @@ void sub_02020BD0 (void) Unk_021C0778 = 0; } -void sub_02020C08 (void) +void sub_02020C08(void) { int v0; @@ -183,9 +184,9 @@ void sub_02020C08 (void) } } -UnkStruct_02020C44 * sub_02020C44 (const UnkStruct_ov5_021EDDAC * param0) +UnkStruct_02020C44 *sub_02020C44(const UnkStruct_ov5_021EDDAC *param0) { - UnkStruct_02020C44 * v0; + UnkStruct_02020C44 *v0; v0 = sub_02020D74(); @@ -214,7 +215,7 @@ UnkStruct_02020C44 * sub_02020C44 (const UnkStruct_ov5_021EDDAC * param0) return v0; } -BOOL sub_02020CCC (UnkStruct_02020C44 * param0) +BOOL sub_02020CCC(UnkStruct_02020C44 *param0) { if (param0 == NULL) { GF_ASSERT(0); @@ -233,10 +234,10 @@ BOOL sub_02020CCC (UnkStruct_02020C44 * param0) return 1; } -BOOL sub_02020D14 (UnkStruct_02020C44 * param0) +BOOL sub_02020D14(UnkStruct_02020C44 *param0) { - UnkStruct_020216E0 * v0; - UnkStruct_020216E0 * v1; + UnkStruct_020216E0 *v0; + UnkStruct_020216E0 *v1; if (param0 == NULL) { GF_ASSERT(param0); @@ -256,7 +257,7 @@ BOOL sub_02020D14 (UnkStruct_02020C44 * param0) return 1; } -BOOL sub_02020D50 (UnkStruct_02020C44 * param0) +BOOL sub_02020D50(UnkStruct_02020C44 *param0) { GF_ASSERT(param0); @@ -267,14 +268,14 @@ BOOL sub_02020D50 (UnkStruct_02020C44 * param0) return 1; } -void sub_02020D68 (UnkStruct_02020C44 * param0) +void sub_02020D68(UnkStruct_02020C44 *param0) { if (param0->unk_03 == 2) { param0->unk_03 = 0; } } -static UnkStruct_02020C44 * sub_02020D74 (void) +static UnkStruct_02020C44 *sub_02020D74(void) { int v0; @@ -287,12 +288,12 @@ static UnkStruct_02020C44 * sub_02020D74 (void) return NULL; } -static void sub_02020DA8 (UnkStruct_02020C44 * param0) +static void sub_02020DA8(UnkStruct_02020C44 *param0) { - UnkStruct_020216E0 * v0; + UnkStruct_020216E0 *v0; VecFx32 v1; MtxFx33 v2; - const MtxFx33 * v3; + const MtxFx33 *v3; GF_ASSERT(param0); MTX_Identity33(&v2); @@ -329,9 +330,9 @@ static void sub_02020DA8 (UnkStruct_02020C44 * param0) } } -static void sub_02020E28 (UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1) +static void sub_02020E28(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1) { - UnkStruct_02020C44 * v0; + UnkStruct_02020C44 *v0; v0 = (UnkStruct_02020C44 *)param0->unk_28; @@ -349,9 +350,9 @@ static void sub_02020E28 (UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF param0->unk_B8 = 0; } -static void sub_02020E78 (UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1) +static void sub_02020E78(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1) { - UnkStruct_02020C44 * v0 = param0->unk_28; + UnkStruct_02020C44 *v0 = param0->unk_28; sub_0202105C(v0, param0); @@ -376,7 +377,7 @@ static void sub_02020E78 (UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF param0->unk_B8 = 0; } -static void sub_02020EF8 (const NNSG3dResTex * param0, NNSG3dTexKey * param1, NNSG3dTexKey * param2, NNSG3dPlttKey * param3) +static void sub_02020EF8(const NNSG3dResTex *param0, NNSG3dTexKey *param1, NNSG3dTexKey *param2, NNSG3dPlttKey *param3) { u32 v0, v1, v2; @@ -406,20 +407,20 @@ static void sub_02020EF8 (const NNSG3dResTex * param0, NNSG3dTexKey * param1, NN } } -static void sub_02020F90 (NNSG3dResTex * param0, NNSG3dTexKey * param1, NNSG3dTexKey * param2, NNSG3dPlttKey * param3) +static void sub_02020F90(NNSG3dResTex *param0, NNSG3dTexKey *param1, NNSG3dTexKey *param2, NNSG3dPlttKey *param3) { NNS_G3dTexReleaseTexKey(param0, param1, param2); *param3 = NNS_G3dPlttReleasePlttKey(param0); } -static void sub_02020FA4 (NNSG3dResTex * param0, NNSG3dResMdlSet * param1, NNSG3dTexKey * param2, NNSG3dTexKey * param3, NNSG3dPlttKey * param4) +static void sub_02020FA4(NNSG3dResTex *param0, NNSG3dResMdlSet *param1, NNSG3dTexKey *param2, NNSG3dTexKey *param3, NNSG3dPlttKey *param4) { NNS_G3dTexSetTexKey(param0, *param2, *param3); NNS_G3dPlttSetPlttKey(param0, *param4); NNS_G3dBindMdlSet(param1, param0); } -static void sub_02020FC8 (NNSG3dTexKey * param0, NNSG3dTexKey * param1, NNSG3dPlttKey * param2) +static void sub_02020FC8(NNSG3dTexKey *param0, NNSG3dTexKey *param1, NNSG3dPlttKey *param2) { if (*param0 != (NNS_GFD_ALLOC_ERROR_TEXKEY)) { NNS_GfdFreeTexVram(*param0); @@ -434,7 +435,7 @@ static void sub_02020FC8 (NNSG3dTexKey * param0, NNSG3dTexKey * param1, NNSG3dPl } } -static BOOL sub_02020FFC (const NNSG3dResTex * param0, const NNSG3dResTex * param1) +static BOOL sub_02020FFC(const NNSG3dResTex *param0, const NNSG3dResTex *param1) { u32 v0, v1, v2; u32 v3, v4, v5; @@ -460,7 +461,7 @@ static BOOL sub_02020FFC (const NNSG3dResTex * param0, const NNSG3dResTex * para return v6; } -static void sub_0202105C (UnkStruct_02020C44 * param0, UnkStruct_020216E0 * param1) +static void sub_0202105C(UnkStruct_02020C44 *param0, UnkStruct_020216E0 *param1) { if (param1->unk_B0) { sub_0201DDAC(param1->unk_B0); @@ -468,9 +469,9 @@ static void sub_0202105C (UnkStruct_02020C44 * param0, UnkStruct_020216E0 * para } } -static void sub_02021078 (UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1) +static void sub_02021078(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1) { - NNSG3dResTex * v0; + NNSG3dResTex *v0; int v1; v0 = param0->unk_8C; @@ -493,30 +494,30 @@ static void sub_02021078 (UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF } } -static void sub_020210F4 (const UnkStruct_02020C44 * param0, UnkStruct_020216E0 * param1, const UnkStruct_ov5_021DF84C * param2) +static void sub_020210F4(const UnkStruct_02020C44 *param0, UnkStruct_020216E0 *param1, const UnkStruct_ov5_021DF84C *param2) { param1->unk_90 = sub_020217D4(param2); param1->unk_A0 = param2->unk_0C; param1->unk_B0 = sub_0201DD54(param0->unk_D8, ¶m1->unk_A0, param1->unk_90, param1->unk_94, param1->unk_9C, param1->unk_B8); } -static void sub_02021148 (UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1) +static void sub_02021148(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1) { param0->unk_84 = sub_02021788(param1, ¶m0->unk_88, ¶m0->unk_8C); NNS_G3dRenderObjInit(¶m0->unk_30, param0->unk_88); param0->unk_90 = sub_020217D4(param1); } -static void sub_0202117C (UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1) +static void sub_0202117C(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1) { param0->unk_A0 = param1->unk_0C; param0->unk_B0 = NULL; } -UnkStruct_020216E0 * sub_0202119C (const UnkStruct_ov5_021DF7F8 * param0) +UnkStruct_020216E0 *sub_0202119C(const UnkStruct_ov5_021DF7F8 *param0) { - UnkStruct_020216E0 * v0; - UnkStruct_02020C44 * v1; + UnkStruct_020216E0 *v0; + UnkStruct_02020C44 *v1; if (param0->unk_00 == NULL) { return NULL; @@ -541,16 +542,16 @@ UnkStruct_020216E0 * sub_0202119C (const UnkStruct_ov5_021DF7F8 * param0) return v0; } -BOOL sub_020211FC (UnkStruct_020216E0 * param0) +BOOL sub_020211FC(UnkStruct_020216E0 *param0) { - UnkStruct_02020C44 * v0; + UnkStruct_02020C44 *v0; GF_ASSERT(param0); GF_ASSERT(param0->unk_B4 != 1); v0 = (UnkStruct_02020C44 *)param0->unk_28; - if ((param0->unk_B4 == 0)) { + if (param0->unk_B4 == 0) { return 0; } @@ -568,7 +569,7 @@ BOOL sub_020211FC (UnkStruct_020216E0 * param0) return 1; } -void sub_0202125C (UnkStruct_ov5_021DF84C * param0, void * param1, const NNSG3dResTex * param2, const UnkStruct_020217F4 * param3, const UnkStruct_02024184 * param4, NNSGfdTexKey param5, NNSGfdTexKey param6, NNSGfdPlttKey param7) +void sub_0202125C(UnkStruct_ov5_021DF84C *param0, void *param1, const NNSG3dResTex *param2, const UnkStruct_020217F4 *param3, const UnkStruct_02024184 *param4, NNSGfdTexKey param5, NNSGfdTexKey param6, NNSGfdPlttKey param7) { param0->unk_00 = param1; param0->unk_04 = param2; @@ -579,7 +580,7 @@ void sub_0202125C (UnkStruct_ov5_021DF84C * param0, void * param1, const NNSG3dR param0->unk_24 = param7; } -void sub_02021284 (UnkStruct_ov5_021DF84C * param0, void * param1, const NNSG3dResTex * param2, const UnkStruct_020217F4 * param3, const UnkStruct_02024184 * param4) +void sub_02021284(UnkStruct_ov5_021DF84C *param0, void *param1, const NNSG3dResTex *param2, const UnkStruct_020217F4 *param3, const UnkStruct_02024184 *param4) { param0->unk_00 = param1; param0->unk_04 = param2; @@ -590,86 +591,86 @@ void sub_02021284 (UnkStruct_ov5_021DF84C * param0, void * param1, const NNSG3dR param0->unk_24 = (NNS_GFD_ALLOC_ERROR_PLTTKEY); } -void sub_020212A8 (UnkStruct_020216E0 * param0, const VecFx32 * param1) +void sub_020212A8(UnkStruct_020216E0 *param0, const VecFx32 *param1) { GF_ASSERT(param0); param0->unk_00 = *param1; } -const VecFx32 * sub_020212C0 (const UnkStruct_020216E0 * param0) +const VecFx32 *sub_020212C0(const UnkStruct_020216E0 *param0) { GF_ASSERT(param0); return ¶m0->unk_00; } -void sub_020212D0 (UnkStruct_020216E0 * param0, const VecFx32 * param1) +void sub_020212D0(UnkStruct_020216E0 *param0, const VecFx32 *param1) { GF_ASSERT(param0); param0->unk_0C = *param1; } -const VecFx32 * sub_020212EC (const UnkStruct_020216E0 * param0) +const VecFx32 *sub_020212EC(const UnkStruct_020216E0 *param0) { GF_ASSERT(param0); return ¶m0->unk_0C; } -void sub_020212FC (UnkStruct_020216E0 * param0, const MtxFx33 * param1) +void sub_020212FC(UnkStruct_020216E0 *param0, const MtxFx33 *param1) { GF_ASSERT(param0); param0->unk_18 = param1; } -const MtxFx33 * sub_02021310 (const UnkStruct_020216E0 * param0) +const MtxFx33 *sub_02021310(const UnkStruct_020216E0 *param0) { GF_ASSERT(param0); return param0->unk_18; } -void sub_02021320 (UnkStruct_020216E0 * param0, u8 param1) +void sub_02021320(UnkStruct_020216E0 *param0, u8 param1) { GF_ASSERT(param0); param0->unk_24 = param1; } -u8 sub_02021334 (const UnkStruct_020216E0 * param0) +u8 sub_02021334(const UnkStruct_020216E0 *param0) { GF_ASSERT(param0); return param0->unk_24; } -void sub_02021344 (UnkStruct_020216E0 * param0, int param1) +void sub_02021344(UnkStruct_020216E0 *param0, int param1) { GF_ASSERT(param0); param0->unk_B6 = param1; } -int sub_02021358 (const UnkStruct_020216E0 * param0) +int sub_02021358(const UnkStruct_020216E0 *param0) { GF_ASSERT(param0); return param0->unk_B6; } -int sub_02021368 (UnkStruct_020216E0 * param0, fx32 param1) +int sub_02021368(UnkStruct_020216E0 *param0, fx32 param1) { GF_ASSERT(param0); return sub_02021804(param0, param1); } -void sub_02021380 (UnkStruct_020216E0 * param0, fx32 param1) +void sub_02021380(UnkStruct_020216E0 *param0, fx32 param1) { GF_ASSERT(param0); param0->unk_B8 = param1; } -fx32 sub_02021394 (const UnkStruct_020216E0 * param0) +fx32 sub_02021394(const UnkStruct_020216E0 *param0) { GF_ASSERT(param0); return param0->unk_B8; } -void sub_020213A4 (UnkStruct_020216E0 * param0, fx32 param1) +void sub_020213A4(UnkStruct_020216E0 *param0, fx32 param1) { GF_ASSERT(param0); @@ -677,53 +678,53 @@ void sub_020213A4 (UnkStruct_020216E0 * param0, fx32 param1) param0->unk_B8 += param1; } -fx32 sub_020213D4 (const UnkStruct_020216E0 * param0) +fx32 sub_020213D4(const UnkStruct_020216E0 *param0) { GF_ASSERT(param0); return param0->unk_B8 - sub_020217F4(param0, param0->unk_B6); } -NNSG3dResMdl * sub_020213F4 (const UnkStruct_020216E0 * param0) +NNSG3dResMdl *sub_020213F4(const UnkStruct_020216E0 *param0) { GF_ASSERT(param0); return param0->unk_88; } -int sub_02021404 (const UnkStruct_020216E0 * param0) +int sub_02021404(const UnkStruct_020216E0 *param0) { GF_ASSERT(param0); return param0->unk_B4; } -void sub_02021414 (UnkStruct_020216E0 * param0) +void sub_02021414(UnkStruct_020216E0 *param0) { if (param0->unk_B4 == 2) { sub_0201DDD8(param0->unk_B0, param0->unk_B8); } } -NNSG3dResMdl * sub_02021430 (UnkStruct_020216E0 * param0) +NNSG3dResMdl *sub_02021430(UnkStruct_020216E0 *param0) { return param0->unk_88; } -NNSG3dResTex * sub_02021438 (UnkStruct_020216E0 * param0) +NNSG3dResTex *sub_02021438(UnkStruct_020216E0 *param0) { return param0->unk_8C; } -NNSG3dRenderObj * sub_02021440 (UnkStruct_020216E0 * param0) +NNSG3dRenderObj *sub_02021440(UnkStruct_020216E0 *param0) { return ¶m0->unk_30; } -void sub_02021444 (UnkStruct_020216E0 * param0, UnkFuncPtr_02021444 param1, void * param2) +void sub_02021444(UnkStruct_020216E0 *param0, UnkFuncPtr_02021444 param1, void *param2) { param0->unk_1C = param2; param0->unk_20 = param1; } -static void sub_0202144C (UnkStruct_020216E0 * param0) +static void sub_0202144C(UnkStruct_020216E0 *param0) { UnkStruct_0202144C v0; @@ -733,12 +734,12 @@ static void sub_0202144C (UnkStruct_020216E0 * param0) sub_020215A0(param0->unk_88, param0->unk_90, v0.unk_01); } -static void sub_0202149C (NNSG3dResMdl * param0, const NNSG3dResTex * param1, u8 param2) +static void sub_0202149C(NNSG3dResMdl *param0, const NNSG3dResTex *param1, u8 param2) { - NNSG3dResMat * v0; - const NNSG3dResDict * v1; - const NNSG3dResDictTexToMatIdxData * v2; - const NNSG3dResDictTexData * v3; + NNSG3dResMat *v0; + const NNSG3dResDict *v1; + const NNSG3dResDictTexToMatIdxData *v2; + const NNSG3dResDictTexData *v3; u32 v4; int v5; @@ -750,17 +751,17 @@ static void sub_0202149C (NNSG3dResMdl * param0, const NNSG3dResTex * param1, u8 for (v5 = 0; v5 < v1->numEntry; ++v5) { v2 = (NNSG3dResDictTexToMatIdxData *)NNS_G3dGetResDataByIdx(v1, v5); - if ((v2->flag & 1)) { + if (v2->flag & 1) { sub_02021524(v0, v2, v4); } } } -static void sub_02021524 (NNSG3dResMat * param0, const NNSG3dResDictTexToMatIdxData * param1, u32 param2) +static void sub_02021524(NNSG3dResMat *param0, const NNSG3dResDictTexToMatIdxData *param1, u32 param2) { - u8 * v0; + u8 *v0; int v1; - NNSG3dResMatData * v2; + NNSG3dResMatData *v2; v0 = (u8 *)param0 + param1->offset; @@ -771,12 +772,12 @@ static void sub_02021524 (NNSG3dResMat * param0, const NNSG3dResDictTexToMatIdxD } } -static void sub_020215A0 (NNSG3dResMdl * param0, const NNSG3dResTex * param1, u8 param2) +static void sub_020215A0(NNSG3dResMdl *param0, const NNSG3dResTex *param1, u8 param2) { - NNSG3dResMat * v0; - const NNSG3dResDict * v1; - const NNSG3dResDictPlttToMatIdxData * v2; - const NNSG3dResDictPlttData * v3; + NNSG3dResMat *v0; + const NNSG3dResDict *v1; + const NNSG3dResDictPlttToMatIdxData *v2; + const NNSG3dResDictPlttData *v3; u32 v4; u32 v5; @@ -792,28 +793,28 @@ static void sub_020215A0 (NNSG3dResMdl * param0, const NNSG3dResTex * param1, u8 for (v5 = 0; v5 < v1->numEntry; ++v5) { v2 = (NNSG3dResDictPlttToMatIdxData *)NNS_G3dGetResDataByIdx(v1, v5); - if ((v2->flag & 1)) { + if (v2->flag & 1) { sub_0202162C(v0, v2, v4); } } } -static void sub_0202162C (NNSG3dResMat * param0, const NNSG3dResDictPlttToMatIdxData * param1, u32 param2) +static void sub_0202162C(NNSG3dResMat *param0, const NNSG3dResDictPlttToMatIdxData *param1, u32 param2) { - u8 * v0; + u8 *v0; u32 v1; v0 = (u8 *)param0 + param1->offset; for (v1 = 0; v1 < param1->numIdx; v1++) { - NNSG3dResMatData * v2 = NNS_G3dGetMatDataByIdx(param0, *(v0 + v1)); + NNSG3dResMatData *v2 = NNS_G3dGetMatDataByIdx(param0, *(v0 + v1)); GF_ASSERT(((v2->texPlttBase & 0x1fff) + param2) <= 0x1fff); v2->texPlttBase += param2; } } -static void sub_020216A8 (UnkStruct_02020C44 * param0) +static void sub_020216A8(UnkStruct_02020C44 *param0) { int v0; @@ -825,9 +826,9 @@ static void sub_020216A8 (UnkStruct_02020C44 * param0) param0->unk_D0 = 0; } -static UnkStruct_020216E0 * sub_020216E0 (UnkStruct_02020C44 * param0) +static UnkStruct_020216E0 *sub_020216E0(UnkStruct_02020C44 *param0) { - UnkStruct_020216E0 * v0; + UnkStruct_020216E0 *v0; if (param0->unk_D0 >= param0->unk_08) { return NULL; @@ -839,7 +840,7 @@ static UnkStruct_020216E0 * sub_020216E0 (UnkStruct_02020C44 * param0) return v0; } -static BOOL sub_0202170C (UnkStruct_02020C44 * param0, UnkStruct_020216E0 * param1) +static BOOL sub_0202170C(UnkStruct_02020C44 *param0, UnkStruct_020216E0 *param1) { if (param0->unk_D0 <= 0) { return 0; @@ -853,7 +854,7 @@ static BOOL sub_0202170C (UnkStruct_02020C44 * param0, UnkStruct_020216E0 * para return 1; } -static void sub_02021744 (UnkStruct_020216E0 * param0, UnkStruct_020216E0 * param1) +static void sub_02021744(UnkStruct_020216E0 *param0, UnkStruct_020216E0 *param1) { param1->unk_C0 = param0->unk_C0; param0->unk_C0->unk_BC = param1; @@ -861,16 +862,16 @@ static void sub_02021744 (UnkStruct_020216E0 * param0, UnkStruct_020216E0 * para param0->unk_C0 = param1; } -static void sub_02021768 (UnkStruct_020216E0 * param0) +static void sub_02021768(UnkStruct_020216E0 *param0) { param0->unk_C0->unk_BC = param0->unk_BC; param0->unk_BC->unk_C0 = param0->unk_C0; } -static NNSG3dResMdlSet * sub_02021788 (const UnkStruct_ov5_021DF84C * param0, NNSG3dResMdl ** param1, NNSG3dResTex ** param2) +static NNSG3dResMdlSet *sub_02021788(const UnkStruct_ov5_021DF84C *param0, NNSG3dResMdl **param1, NNSG3dResTex **param2) { - void * v0; - NNSG3dResMdlSet * v1; + void *v0; + NNSG3dResMdlSet *v1; v0 = sub_0202189C(param0, 0); v1 = NNS_G3dGetMdlSet(v0); @@ -884,15 +885,15 @@ static NNSG3dResMdlSet * sub_02021788 (const UnkStruct_ov5_021DF84C * param0, NN return v1; } -static NNSG3dResTex * sub_020217D4 (const UnkStruct_ov5_021DF84C * param0) +static NNSG3dResTex *sub_020217D4(const UnkStruct_ov5_021DF84C *param0) { - NNSG3dResTex * v0; + NNSG3dResTex *v0; v0 = (NNSG3dResTex *)sub_0202189C(param0, 1); return v0; } -static void sub_020217E0 (UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF84C * param1) +static void sub_020217E0(UnkStruct_020216E0 *param0, const UnkStruct_ov5_021DF84C *param1) { if (param1->unk_1C == (NNS_GFD_ALLOC_ERROR_TEXKEY)) { sub_02020E28(param0, param1); @@ -901,30 +902,30 @@ static void sub_020217E0 (UnkStruct_020216E0 * param0, const UnkStruct_ov5_021DF } } -static fx32 sub_020217F4 (const UnkStruct_020216E0 * param0, int param1) +static fx32 sub_020217F4(const UnkStruct_020216E0 *param0, int param1) { - const UnkStruct_020217F4 * v0; + const UnkStruct_020217F4 *v0; v0 = sub_020218B4(param0->unk_2C, param1); return v0->unk_00 << FX32_SHIFT; } -static int sub_02021804 (UnkStruct_020216E0 * param0, fx32 param1) +static int sub_02021804(UnkStruct_020216E0 *param0, fx32 param1) { - const UnkStruct_020217F4 * v0; + const UnkStruct_020217F4 *v0; v0 = sub_020218B4(param0->unk_2C, param0->unk_B6); return sub_02021824(v0, ¶m0->unk_B8, param1); } -static int sub_02021824 (const UnkStruct_020217F4 * param0, fx32 * param1, fx32 param2) +static int sub_02021824(const UnkStruct_020217F4 *param0, fx32 *param1, fx32 param2) { int v0 = 0; if (((param0->unk_00 * FX32_ONE) > *param1) || ((param0->unk_04 * FX32_ONE) < *param1)) { *param1 = (param0->unk_00 * FX32_ONE); } else { - if (((param0->unk_04 * FX32_ONE) < *param1 + param2)) { + if ((param0->unk_04 * FX32_ONE) < *param1 + param2) { if (param0->unk_08 == 0) { *param1 = (param0->unk_00 * FX32_ONE); } else { @@ -939,12 +940,12 @@ static int sub_02021824 (const UnkStruct_020217F4 * param0, fx32 * param1, fx32 return v0; } -static void sub_0202185C (UnkStruct_020216E0 * param0) +static void sub_0202185C(UnkStruct_020216E0 *param0) { sub_02020FA4(param0->unk_8C, param0->unk_84, ¶m0->unk_94, ¶m0->unk_98, ¶m0->unk_9C); } -static void sub_0202187C (UnkStruct_020216E0 * param0) +static void sub_0202187C(UnkStruct_020216E0 *param0) { NNSG3dTexKey v0; NNSG3dTexKey v1; @@ -954,9 +955,9 @@ static void sub_0202187C (UnkStruct_020216E0 * param0) sub_02020F90(param0->unk_8C, &v1, &v0, &v2); } -static void * sub_0202189C (const UnkStruct_ov5_021DF84C * param0, int param1) +static void *sub_0202189C(const UnkStruct_ov5_021DF84C *param0, int param1) { - void * v0; + void *v0; switch (param1) { case 0: @@ -973,7 +974,7 @@ static void * sub_0202189C (const UnkStruct_ov5_021DF84C * param0, int param1) return v0; } -static const UnkStruct_020217F4 * sub_020218B4 (const UnkStruct_020217F4 * param0, int param1) +static const UnkStruct_020217F4 *sub_020218B4(const UnkStruct_020217F4 *param0, int param1) { return param0 + param1; } diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c index 3145780903..3f7132c8d4 100644 --- a/src/unk_020218BC.c +++ b/src/unk_020218BC.c @@ -1,36 +1,38 @@ +#include "unk_020218BC.h" + #include #include #include "struct_defs/struct_020095C4.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay083/struct_ov83_0223D9A8.h" #include "overlay115/struct_ov115_02261520.h" -#include "unk_02017728.h" #include "heap.h" -#include "unk_020218BC.h" +#include "unk_02017728.h" typedef struct { - const NNSG2dCellDataBank * unk_00; - const NNSG2dCellAnimBankData * unk_04; + const NNSG2dCellDataBank *unk_00; + const NNSG2dCellAnimBankData *unk_04; NNSG2dCellAnimation unk_08; } CellAnimationData; typedef struct { - NNSG2dCellDataBank * unk_00; - const NNSG2dCellAnimBankData * unk_04; + NNSG2dCellDataBank *unk_00; + const NNSG2dCellAnimBankData *unk_04; NNSG2dCellAnimation unk_08; u32 unk_60; } CellDataAnimationWrapper; typedef struct { - const NNSG2dCellDataBank * unk_00; - const NNSG2dCellAnimBankData * unk_04; + const NNSG2dCellDataBank *unk_00; + const NNSG2dCellAnimBankData *unk_04; NNSG2dMultiCellAnimation unk_08; - const NNSG2dMultiCellDataBank * unk_6C; - const NNSG2dMultiCellAnimBankData * unk_70; - NNSG2dNode * unk_74; - NNSG2dCellAnimation * unk_78; + const NNSG2dMultiCellDataBank *unk_6C; + const NNSG2dMultiCellAnimBankData *unk_70; + NNSG2dNode *unk_74; + NNSG2dCellAnimation *unk_78; } MultiCellAnimationData; typedef struct GraphicElementData_t { @@ -48,7 +50,7 @@ typedef struct GraphicElementData_t { u8 unk_34; u8 unk_35; fx32 unk_38; - GraphicElementManager * unk_3C; + GraphicElementManager *unk_3C; u32 unk_40[29]; NNSG2dImageProxy unk_B4; NNSG2dImagePaletteProxy unk_D8; @@ -57,49 +59,49 @@ typedef struct GraphicElementData_t { u8 unk_F2; u16 unk_F4; NNS_G2D_VRAM_TYPE unk_F8; - struct GraphicElementData_t * unk_FC; - struct GraphicElementData_t * unk_100; + struct GraphicElementData_t *unk_FC; + struct GraphicElementData_t *unk_100; } GraphicElementData; typedef struct GraphicElementManager_t { - GraphicElementData * unk_00; + GraphicElementData *unk_00; int unk_04; - GraphicElementData ** unk_08; + GraphicElementData **unk_08; int unk_0C; GraphicElementData unk_10; - NNSG2dRendererInstance * unk_110; - void * unk_114; - NNSG2dCellAnimBankData * unk_118; + NNSG2dRendererInstance *unk_110; + void *unk_114; + NNSG2dCellAnimBankData *unk_118; u32 unk_11C; } GraphicElementManager; -typedef void (* GraphicElementUpdateFunc)(const GraphicElementManager *, GraphicElementData *); -typedef void (* GraphicElementInitializeFunc)(GraphicElementData *); - -static void sub_02021A50(GraphicElementManager * param0); -static u32 sub_020221B8(const UnkStruct_ov19_021DA864 * param0); -static void sub_020221D0(const NNSG2dCellDataBank * param0, GraphicElementData * param1); -static void sub_020221D4(const NNSG2dCellAnimBankData * param0, GraphicElementData * param1); -static void sub_020221D8(const NNSG2dMultiCellDataBank * param0, GraphicElementData * param1); -static void sub_020221E0(const NNSG2dMultiCellAnimBankData * param0, GraphicElementData * param1); -static void sub_020221E8(GraphicElementData * param0, int param1); -static void sub_02022208(const UnkStruct_ov19_021DA864 * param0, GraphicElementData * param1, int param2); -static void sub_02022264(GraphicElementData * param0, int param1); -static BOOL sub_02022110(const GraphicElementManager * param0, const UnkStruct_ov19_021DA864 * param1, GraphicElementData * param2, int param3); -static u32 sub_020222C4(const NNSG2dImagePaletteProxy * param0, u32 param1); -static void sub_020222F4(const GraphicElementManager * param0, GraphicElementData * param1); -static void sub_02022450(const GraphicElementManager * param0, GraphicElementData * param1); -static void sub_02022454(GraphicElementData * param0); -static void sub_02022460(GraphicElementData * param0); -static void sub_02022464(GraphicElementManager * param0, GraphicElementData * param1); -static void sub_020224FC(GraphicElementData * param0); -static void sub_02022518(GraphicElementManager * param0); -static GraphicElementData * sub_02022550(GraphicElementManager * param0); -static BOOL sub_0202256C(GraphicElementManager * param0, GraphicElementData * param1); - -GraphicElementManager * sub_020218BC (const UnkStruct_020095C4 * param0) -{ - GraphicElementManager * v0; +typedef void (*GraphicElementUpdateFunc)(const GraphicElementManager *, GraphicElementData *); +typedef void (*GraphicElementInitializeFunc)(GraphicElementData *); + +static void sub_02021A50(GraphicElementManager *param0); +static u32 sub_020221B8(const UnkStruct_ov19_021DA864 *param0); +static void sub_020221D0(const NNSG2dCellDataBank *param0, GraphicElementData *param1); +static void sub_020221D4(const NNSG2dCellAnimBankData *param0, GraphicElementData *param1); +static void sub_020221D8(const NNSG2dMultiCellDataBank *param0, GraphicElementData *param1); +static void sub_020221E0(const NNSG2dMultiCellAnimBankData *param0, GraphicElementData *param1); +static void sub_020221E8(GraphicElementData *param0, int param1); +static void sub_02022208(const UnkStruct_ov19_021DA864 *param0, GraphicElementData *param1, int param2); +static void sub_02022264(GraphicElementData *param0, int param1); +static BOOL sub_02022110(const GraphicElementManager *param0, const UnkStruct_ov19_021DA864 *param1, GraphicElementData *param2, int param3); +static u32 sub_020222C4(const NNSG2dImagePaletteProxy *param0, u32 param1); +static void sub_020222F4(const GraphicElementManager *param0, GraphicElementData *param1); +static void sub_02022450(const GraphicElementManager *param0, GraphicElementData *param1); +static void sub_02022454(GraphicElementData *param0); +static void sub_02022460(GraphicElementData *param0); +static void sub_02022464(GraphicElementManager *param0, GraphicElementData *param1); +static void sub_020224FC(GraphicElementData *param0); +static void sub_02022518(GraphicElementManager *param0); +static GraphicElementData *sub_02022550(GraphicElementManager *param0); +static BOOL sub_0202256C(GraphicElementManager *param0, GraphicElementData *param1); + +GraphicElementManager *sub_020218BC(const UnkStruct_020095C4 *param0) +{ + GraphicElementManager *v0; int v1; GF_ASSERT(param0); @@ -131,7 +133,7 @@ GraphicElementManager * sub_020218BC (const UnkStruct_020095C4 * param0) return v0; } -BOOL sub_02021964 (GraphicElementManager * param0) +BOOL sub_02021964(GraphicElementManager *param0) { if (param0 == NULL) { return 0; @@ -155,7 +157,7 @@ BOOL sub_02021964 (GraphicElementManager * param0) return 1; } -BOOL sub_020219A4 (GraphicElementManager * param0, u8 param1) +BOOL sub_020219A4(GraphicElementManager *param0, u8 param1) { if (param0 == NULL) { return 0; @@ -170,10 +172,10 @@ BOOL sub_020219A4 (GraphicElementManager * param0, u8 param1) return 1; } -BOOL sub_020219C0 (GraphicElementManager * param0) +BOOL sub_020219C0(GraphicElementManager *param0) { - GraphicElementData * v0; - GraphicElementData * v1; + GraphicElementData *v0; + GraphicElementData *v1; if (param0 == NULL) { return 0; @@ -194,9 +196,9 @@ BOOL sub_020219C0 (GraphicElementManager * param0) return 1; } -void sub_020219F8 (const GraphicElementManager * param0) +void sub_020219F8(const GraphicElementManager *param0) { - GraphicElementData * v0; + GraphicElementData *v0; static const GraphicElementUpdateFunc v1[] = { sub_02022450, sub_020222F4 @@ -221,7 +223,7 @@ void sub_020219F8 (const GraphicElementManager * param0) } } -static void sub_02021A50 (GraphicElementManager * param0) +static void sub_02021A50(GraphicElementManager *param0) { param0->unk_00 = NULL; param0->unk_04 = 0; @@ -233,7 +235,7 @@ static void sub_02021A50 (GraphicElementManager * param0) param0->unk_11C = 0; } -void sub_02021A78 (GraphicElementData * param0) +void sub_02021A78(GraphicElementData *param0) { int v0; @@ -246,9 +248,9 @@ void sub_02021A78 (GraphicElementData * param0) param0->unk_30 = GX_OAM_MODE_NORMAL; } -GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0) +GraphicElementData *sub_02021AA0(const UnkStruct_ov115_02261520 *param0) { - GraphicElementData * v0; + GraphicElementData *v0; v0 = sub_02022550(param0->unk_00); @@ -289,7 +291,7 @@ GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0) return v0; } -GraphicElementData * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0) +GraphicElementData *sub_02021B90(const UnkStruct_ov83_0223D9A8 *param0) { UnkStruct_ov115_02261520 v0; @@ -307,19 +309,19 @@ GraphicElementData * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0) return sub_02021AA0(&v0); } -void sub_02021BD4 (GraphicElementData * param0) +void sub_02021BD4(GraphicElementData *param0) { - GraphicElementManager * v0; + GraphicElementManager *v0; if (param0->unk_EC != 0) { - CellAnimationData * v1 = (CellAnimationData *)¶m0->unk_40; + CellAnimationData *v1 = (CellAnimationData *)¶m0->unk_40; if (param0->unk_FC != NULL) { sub_020224FC(param0); } if (param0->unk_EC == 3) { - CellDataAnimationWrapper * v2 = (CellDataAnimationWrapper *)¶m0->unk_40; + CellDataAnimationWrapper *v2 = (CellDataAnimationWrapper *)¶m0->unk_40; if (NNS_G2dGetImageLocation(¶m0->unk_B4, param0->unk_F8) != NNS_G2D_VRAM_ADDR_NONE) { NNS_G2dFreeCellTransferStateHandle(v2->unk_60); @@ -327,7 +329,7 @@ void sub_02021BD4 (GraphicElementData * param0) } if (param0->unk_EC == 2) { - MultiCellAnimationData * v3 = (MultiCellAnimationData *)¶m0->unk_40; + MultiCellAnimationData *v3 = (MultiCellAnimationData *)¶m0->unk_40; if (v3->unk_74 != NULL) { Heap_FreeToHeap(v3->unk_74); @@ -345,39 +347,39 @@ void sub_02021BD4 (GraphicElementData * param0) } } -void sub_02021C50 (GraphicElementData * param0, const VecFx32 * param1) +void sub_02021C50(GraphicElementData *param0, const VecFx32 *param1) { param0->unk_00 = *param1; } -void sub_02021C60 (GraphicElementData * param0, const VecFx32 * param1) +void sub_02021C60(GraphicElementData *param0, const VecFx32 *param1) { param0->unk_0C = *param1; } -void sub_02021C70 (GraphicElementData * param0, const VecFx32 * param1) +void sub_02021C70(GraphicElementData *param0, const VecFx32 *param1) { param0->unk_18 = *param1; } -void sub_02021C80 (GraphicElementData * param0, const VecFx32 * param1, int param2) +void sub_02021C80(GraphicElementData *param0, const VecFx32 *param1, int param2) { sub_02021C70(param0, param1); sub_02021CF8(param0, param2); } -void sub_02021C94 (GraphicElementData * param0, u16 param1) +void sub_02021C94(GraphicElementData *param0, u16 param1) { param0->unk_24 = param1; } -void sub_02021C98 (GraphicElementData * param0, u16 param1, int param2) +void sub_02021C98(GraphicElementData *param0, u16 param1, int param2) { sub_02021C94(param0, param1); sub_02021CF8(param0, param2); } -void sub_02021CAC (GraphicElementData * param0, int param1) +void sub_02021CAC(GraphicElementData *param0, int param1) { GF_ASSERT(param0); GF_ASSERT(param1 < 2); @@ -385,7 +387,7 @@ void sub_02021CAC (GraphicElementData * param0, int param1) param0->unk_34 = param1; } -void sub_02021CC8 (GraphicElementData * param0, int param1) +void sub_02021CC8(GraphicElementData *param0, int param1) { GF_ASSERT(param0); GF_ASSERT(param1 < 2); @@ -393,21 +395,21 @@ void sub_02021CC8 (GraphicElementData * param0, int param1) param0->unk_35 = param1; } -void sub_02021CE4 (GraphicElementData * param0, fx32 param1) +void sub_02021CE4(GraphicElementData *param0, fx32 param1) { GF_ASSERT(param0); param0->unk_38 = param1; } -void sub_02021CF8 (GraphicElementData * param0, int param1) +void sub_02021CF8(GraphicElementData *param0, int param1) { GF_ASSERT(param0); param0->unk_26 = param1; } -void sub_02021D0C (GraphicElementData * param0, int param1) +void sub_02021D0C(GraphicElementData *param0, int param1) { GF_ASSERT(param0); @@ -415,63 +417,63 @@ void sub_02021D0C (GraphicElementData * param0, int param1) param0->unk_26 = 0; } -const VecFx32 * sub_02021D28 (const GraphicElementData * param0) +const VecFx32 *sub_02021D28(const GraphicElementData *param0) { return ¶m0->unk_00; } -const VecFx32 * sub_02021D2C (const GraphicElementData * param0) +const VecFx32 *sub_02021D2C(const GraphicElementData *param0) { return ¶m0->unk_18; } -u16 sub_02021D30 (const GraphicElementData * param0) +u16 sub_02021D30(const GraphicElementData *param0) { return param0->unk_24; } -int sub_02021D34 (const GraphicElementData * param0) +int sub_02021D34(const GraphicElementData *param0) { return param0->unk_34; } -int sub_02021D3C (const GraphicElementData * param0) +int sub_02021D3C(const GraphicElementData *param0) { return param0->unk_35; } -u32 sub_02021D44 (const GraphicElementData * param0) +u32 sub_02021D44(const GraphicElementData *param0) { u32 v0; GF_ASSERT(param0); if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) { - CellAnimationData * v1 = (CellAnimationData *)¶m0->unk_40; + CellAnimationData *v1 = (CellAnimationData *)¶m0->unk_40; v0 = v1->unk_04->numSequences; } else { - MultiCellAnimationData * v2 = (MultiCellAnimationData *)¶m0->unk_40; + MultiCellAnimationData *v2 = (MultiCellAnimationData *)¶m0->unk_40; v0 = v2->unk_70->numSequences; } return v0; } -void SpriteActor_SetSpriteAnimActive (GraphicElementData * param0, u32 param1) +void SpriteActor_SetSpriteAnimActive(GraphicElementData *param0, u32 param1) { - const NNSG2dAnimSequence * v0; + const NNSG2dAnimSequence *v0; GF_ASSERT(sub_02021D44(param0) > param1); param0->unk_F0 = param1; if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) { - CellAnimationData * v1 = (CellAnimationData *)¶m0->unk_40; + CellAnimationData *v1 = (CellAnimationData *)¶m0->unk_40; v0 = NNS_G2dGetAnimSequenceByIdx(v1->unk_04, param1); NNS_G2dSetCellAnimationSequence(&v1->unk_08, v0); NNS_G2dStartAnimCtrl(&v1->unk_08.animCtrl); } else { - MultiCellAnimationData * v2 = (MultiCellAnimationData *)¶m0->unk_40; + MultiCellAnimationData *v2 = (MultiCellAnimationData *)¶m0->unk_40; v0 = NNS_G2dGetAnimSequenceByIdx(v2->unk_70, param1); NNS_G2dSetAnimSequenceToMCAnimation(&v2->unk_08, v0); @@ -479,23 +481,23 @@ void SpriteActor_SetSpriteAnimActive (GraphicElementData * param0, u32 param1) } } -void sub_02021DCC (GraphicElementData * param0, u32 param1) +void sub_02021DCC(GraphicElementData *param0, u32 param1) { if (param0->unk_F0 != param1) { SpriteActor_SetSpriteAnimActive(param0, param1); } } -void sub_02021DE0 (GraphicElementData * param0) +void sub_02021DE0(GraphicElementData *param0) { if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) { - CellAnimationData * v0 = (CellAnimationData *)¶m0->unk_40; + CellAnimationData *v0 = (CellAnimationData *)¶m0->unk_40; NNS_G2dResetAnimCtrlState(&v0->unk_08.animCtrl); NNS_G2dStartAnimCtrl(&v0->unk_08.animCtrl); SpriteActor_SetAnimFrame(param0, 0); } else { - MultiCellAnimationData * v1 = (MultiCellAnimationData *)¶m0->unk_40; + MultiCellAnimationData *v1 = (MultiCellAnimationData *)¶m0->unk_40; NNS_G2dResetAnimCtrlState(&v1->unk_08.animCtrl); NNS_G2dStartAnimCtrl(&v1->unk_08.animCtrl); @@ -503,59 +505,59 @@ void sub_02021DE0 (GraphicElementData * param0) } } -u32 sub_02021E24 (const GraphicElementData * param0) +u32 sub_02021E24(const GraphicElementData *param0) { return param0->unk_F0; } -void sub_02021E2C (GraphicElementData * param0, fx32 param1) +void sub_02021E2C(GraphicElementData *param0, fx32 param1) { if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) { - CellAnimationData * v0 = (CellAnimationData *)¶m0->unk_40; + CellAnimationData *v0 = (CellAnimationData *)¶m0->unk_40; NNS_G2dTickCellAnimation(&v0->unk_08, param1); } else { - MultiCellAnimationData * v1 = (MultiCellAnimationData *)¶m0->unk_40; + MultiCellAnimationData *v1 = (MultiCellAnimationData *)¶m0->unk_40; NNS_G2dTickMCAnimation(&v1->unk_08, param1); } } -void SpriteActor_SetAnimFrame (GraphicElementData * param0, u16 param1) +void SpriteActor_SetAnimFrame(GraphicElementData *param0, u16 param1) { if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) { - CellAnimationData * v0 = (CellAnimationData *)¶m0->unk_40; + CellAnimationData *v0 = (CellAnimationData *)¶m0->unk_40; NNS_G2dSetCellAnimationCurrentFrame(&v0->unk_08, param1); } else { - MultiCellAnimationData * v1 = (MultiCellAnimationData *)¶m0->unk_40; + MultiCellAnimationData *v1 = (MultiCellAnimationData *)¶m0->unk_40; NNS_G2dSetMCAnimationCurrentFrame(&v1->unk_08, param1); } } -u16 sub_02021E74 (const GraphicElementData * param0) +u16 sub_02021E74(const GraphicElementData *param0) { - NNSG2dAnimController * v0; + NNSG2dAnimController *v0; if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) { - CellAnimationData * v1 = (CellAnimationData *)¶m0->unk_40; + CellAnimationData *v1 = (CellAnimationData *)¶m0->unk_40; v0 = NNS_G2dGetCellAnimationAnimCtrl(&v1->unk_08); } else { - MultiCellAnimationData * v2 = (MultiCellAnimationData *)¶m0->unk_40; + MultiCellAnimationData *v2 = (MultiCellAnimationData *)¶m0->unk_40; v0 = NNS_G2dGetMCAnimAnimCtrl(&v2->unk_08); } return NNS_G2dGetAnimCtrlCurrentFrame(v0); } -void sub_02021E80 (GraphicElementData * param0, u8 param1) +void sub_02021E80(GraphicElementData *param0, u8 param1) { param0->unk_F2 = param1; } -u8 sub_02021E88 (const GraphicElementData * param0) +u8 sub_02021E88(const GraphicElementData *param0) { return param0->unk_F2; } -void sub_02021E90 (GraphicElementData * param0, u32 param1) +void sub_02021E90(GraphicElementData *param0, u32 param1) { GF_ASSERT(param0); @@ -564,18 +566,18 @@ void sub_02021E90 (GraphicElementData * param0, u32 param1) param0->unk_28 &= ~NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS; } -void sub_02021EC4 (GraphicElementData * param0, u32 param1) +void sub_02021EC4(GraphicElementData *param0, u32 param1) { sub_02021E90(param0, param1); param0->unk_29 += sub_020222C4(¶m0->unk_D8, param0->unk_F8); } -u32 sub_02021EE8 (const GraphicElementData * param0) +u32 sub_02021EE8(const GraphicElementData *param0) { return param0->unk_29; } -void sub_02021EF0 (GraphicElementData * param0, u32 param1) +void sub_02021EF0(GraphicElementData *param0, u32 param1) { GF_ASSERT(param0); @@ -584,21 +586,21 @@ void sub_02021EF0 (GraphicElementData * param0, u32 param1) param0->unk_28 &= ~NNS_G2D_RND_OVERWRITE_PLTTNO; } -void sub_02021F24 (GraphicElementData * param0, u32 param1) +void sub_02021F24(GraphicElementData *param0, u32 param1) { sub_02021EF0(param0, param1); param0->unk_2A += sub_020222C4(¶m0->unk_D8, param0->unk_F8); } -u32 sub_02021F48 (const GraphicElementData * param0) +u32 sub_02021F48(const GraphicElementData *param0) { GF_ASSERT(param0); return param0->unk_2A; } -void sub_02021F58 (GraphicElementData * param0, u32 param1) +void sub_02021F58(GraphicElementData *param0, u32 param1) { - GraphicElementManager * v0 = (GraphicElementManager *)param0->unk_3C; + GraphicElementManager *v0 = (GraphicElementManager *)param0->unk_3C; param0->unk_F4 = param1; @@ -606,27 +608,27 @@ void sub_02021F58 (GraphicElementData * param0, u32 param1) sub_02022464(v0, param0); } -u32 sub_02021F74 (const GraphicElementData * param0) +u32 sub_02021F74(const GraphicElementData *param0) { return param0->unk_F4; } -void sub_02021F7C (GraphicElementData * param0, const NNSG2dImageProxy * param1) +void sub_02021F7C(GraphicElementData *param0, const NNSG2dImageProxy *param1) { param0->unk_B4 = *param1; } -NNSG2dImageProxy * SpriteActor_ImageProxy (GraphicElementData * param0) +NNSG2dImageProxy *SpriteActor_ImageProxy(GraphicElementData *param0) { return ¶m0->unk_B4; } -NNSG2dImagePaletteProxy * sub_02021F9C (GraphicElementData * param0) +NNSG2dImagePaletteProxy *sub_02021F9C(GraphicElementData *param0) { return ¶m0->unk_D8; } -void sub_02021FA0 (GraphicElementData * param0, BOOL param1) +void sub_02021FA0(GraphicElementData *param0, BOOL param1) { param0->unk_2C = param1; @@ -637,25 +639,25 @@ void sub_02021FA0 (GraphicElementData * param0, BOOL param1) } } -NNS_G2D_VRAM_TYPE sub_02021FC8 (const GraphicElementData * param0) +NNS_G2D_VRAM_TYPE sub_02021FC8(const GraphicElementData *param0) { return param0->unk_F8; } -BOOL sub_02021FD0 (GraphicElementData * param0) +BOOL sub_02021FD0(GraphicElementData *param0) { GF_ASSERT(param0); if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) { - CellAnimationData * v0 = (CellAnimationData *)¶m0->unk_40; + CellAnimationData *v0 = (CellAnimationData *)¶m0->unk_40; return NNS_G2dIsAnimCtrlActive(&v0->unk_08.animCtrl); } else { - MultiCellAnimationData * v1 = (MultiCellAnimationData *)¶m0->unk_40; + MultiCellAnimationData *v1 = (MultiCellAnimationData *)¶m0->unk_40; return NNS_G2dIsAnimCtrlActive(&v1->unk_08.animCtrl); } } -void sub_02021FE0 (GraphicElementData * param0, GXOamMode param1) +void sub_02021FE0(GraphicElementData *param0, GXOamMode param1) { GF_ASSERT(param0); @@ -668,9 +670,9 @@ void sub_02021FE0 (GraphicElementData * param0, GXOamMode param1) } } -void sub_02022014 (int param0) +void sub_02022014(int param0) { - void * v0; + void *v0; v0 = Heap_AllocFromHeap(param0, sizeof(GXOamAttr) * 128); @@ -681,9 +683,9 @@ void sub_02022014 (int param0) Heap_FreeToHeap(v0); } -void sub_0202204C (int param0) +void sub_0202204C(int param0) { - void * v0; + void *v0; v0 = Heap_AllocFromHeap(param0, sizeof(GXOamAttr) * 128); @@ -693,18 +695,18 @@ void sub_0202204C (int param0) Heap_FreeToHeap(v0); } -u32 sub_0202207C (const GraphicElementData * param0, u32 param1, u32 param2) +u32 sub_0202207C(const GraphicElementData *param0, u32 param1, u32 param2) { - const NNSG2dAnimBankData * v0; - const NNSG2dUserExAnimAttrBank * v1; - const NNSG2dUserExAnimSequenceAttr * v2; - const NNSG2dUserExAnimFrameAttr * v3; + const NNSG2dAnimBankData *v0; + const NNSG2dUserExAnimAttrBank *v1; + const NNSG2dUserExAnimSequenceAttr *v2; + const NNSG2dUserExAnimFrameAttr *v3; if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) { - CellAnimationData * v4 = (CellAnimationData *)¶m0->unk_40; + CellAnimationData *v4 = (CellAnimationData *)¶m0->unk_40; v0 = v4->unk_04; } else { - MultiCellAnimationData * v5 = (MultiCellAnimationData *)¶m0->unk_40; + MultiCellAnimationData *v5 = (MultiCellAnimationData *)¶m0->unk_40; v0 = v5->unk_70; } @@ -725,7 +727,7 @@ u32 sub_0202207C (const GraphicElementData * param0, u32 param1, u32 param2) return 0; } -u32 sub_020220F4 (const GraphicElementData * param0) +u32 sub_020220F4(const GraphicElementData *param0) { u32 v0; u32 v1; @@ -736,7 +738,7 @@ u32 sub_020220F4 (const GraphicElementData * param0) return sub_0202207C(param0, v0, v1); } -static BOOL sub_02022110 (const GraphicElementManager * param0, const UnkStruct_ov19_021DA864 * param1, GraphicElementData * param2, int param3) +static BOOL sub_02022110(const GraphicElementManager *param0, const UnkStruct_ov19_021DA864 *param1, GraphicElementData *param2, int param3) { param2->unk_EC = sub_020221B8(param1); param2->unk_B4 = *param1->unk_00; @@ -756,7 +758,7 @@ static BOOL sub_02022110 (const GraphicElementManager * param0, const UnkStruct_ sub_02022264(param2, param3); } else { if (param2->unk_EC == 3) { - CellDataAnimationWrapper * v0 = (CellDataAnimationWrapper *)¶m2->unk_40; + CellDataAnimationWrapper *v0 = (CellDataAnimationWrapper *)¶m2->unk_40; sub_02022208(param1, param2, param3); } else { sub_020221E8(param2, param3); @@ -768,7 +770,7 @@ static BOOL sub_02022110 (const GraphicElementManager * param0, const UnkStruct_ return 1; } -static u32 sub_020221B8 (const UnkStruct_ov19_021DA864 * param0) +static u32 sub_020221B8(const UnkStruct_ov19_021DA864 *param0) { if (param0->unk_14 != NULL) { return 2; @@ -781,50 +783,50 @@ static u32 sub_020221B8 (const UnkStruct_ov19_021DA864 * param0) return 1; } -static void sub_020221D0 (const NNSG2dCellDataBank * param0, GraphicElementData * param1) +static void sub_020221D0(const NNSG2dCellDataBank *param0, GraphicElementData *param1) { - CellAnimationData * v0; + CellAnimationData *v0; v0 = (CellAnimationData *)¶m1->unk_40; v0->unk_00 = param0; } -static void sub_020221D4 (const NNSG2dCellAnimBankData * param0, GraphicElementData * param1) +static void sub_020221D4(const NNSG2dCellAnimBankData *param0, GraphicElementData *param1) { - CellAnimationData * v0; + CellAnimationData *v0; v0 = (CellAnimationData *)¶m1->unk_40; v0->unk_04 = param0; } -static void sub_020221D8 (const NNSG2dMultiCellDataBank * param0, GraphicElementData * param1) +static void sub_020221D8(const NNSG2dMultiCellDataBank *param0, GraphicElementData *param1) { - MultiCellAnimationData * v0; + MultiCellAnimationData *v0; v0 = (MultiCellAnimationData *)¶m1->unk_40; v0->unk_6C = param0; } -static void sub_020221E0 (const NNSG2dMultiCellAnimBankData * param0, GraphicElementData * param1) +static void sub_020221E0(const NNSG2dMultiCellAnimBankData *param0, GraphicElementData *param1) { - MultiCellAnimationData * v0; + MultiCellAnimationData *v0; v0 = (MultiCellAnimationData *)¶m1->unk_40; v0->unk_70 = param0; } -static void sub_020221E8 (GraphicElementData * param0, int param1) +static void sub_020221E8(GraphicElementData *param0, int param1) { - CellAnimationData * v0; + CellAnimationData *v0; v0 = (CellAnimationData *)¶m0->unk_40; NNS_G2dInitCellAnimation((NNSG2dCellAnimation *)&v0->unk_08, NNS_G2dGetAnimSequenceByIdx(v0->unk_04, 0), v0->unk_00); } -static void sub_02022208 (const UnkStruct_ov19_021DA864 * param0, GraphicElementData * param1, int param2) +static void sub_02022208(const UnkStruct_ov19_021DA864 *param0, GraphicElementData *param1, int param2) { - CellDataAnimationWrapper * v0; - const NNSG2dCharacterData * v1; + CellDataAnimationWrapper *v0; + const NNSG2dCharacterData *v1; v0 = (CellDataAnimationWrapper *)¶m1->unk_40; v0->unk_60 = NNS_G2dGetNewCellTransferStateHandle(); @@ -833,10 +835,10 @@ static void sub_02022208 (const UnkStruct_ov19_021DA864 * param0, GraphicElement NNS_G2dInitCellAnimationVramTransfered((NNSG2dCellAnimation *)&v0->unk_08, NNS_G2dGetAnimSequenceByIdx(v0->unk_04, 0), v0->unk_00, v0->unk_60, NNS_G2D_VRAM_ADDR_NONE, NNS_G2dGetImageLocation(¶m1->unk_B4, NNS_G2D_VRAM_TYPE_2DMAIN), NNS_G2dGetImageLocation(¶m1->unk_B4, NNS_G2D_VRAM_TYPE_2DSUB), v1->pRawData, NULL, v1->szByte); } -static void sub_02022264 (GraphicElementData * param0, int param1) +static void sub_02022264(GraphicElementData *param0, int param1) { - MultiCellAnimationData * v0; - const NNSG2dMultiCellAnimSequence * v1; + MultiCellAnimationData *v0; + const NNSG2dMultiCellAnimSequence *v1; u16 v2; v0 = (MultiCellAnimationData *)¶m0->unk_40; @@ -850,7 +852,7 @@ static void sub_02022264 (GraphicElementData * param0, int param1) NNS_G2dSetAnimSequenceToMCAnimation((NNSG2dMultiCellAnimation *)&v0->unk_08, v1); } -static u32 sub_020222C4 (const NNSG2dImagePaletteProxy * param0, u32 param1) +static u32 sub_020222C4(const NNSG2dImagePaletteProxy *param0, u32 param1) { u32 v0; u32 v1; @@ -875,7 +877,7 @@ static u32 sub_020222C4 (const NNSG2dImagePaletteProxy * param0, u32 param1) return v1; } -static void sub_020222F4 (const GraphicElementManager * param0, GraphicElementData * param1) +static void sub_020222F4(const GraphicElementManager *param0, GraphicElementData *param1) { VecFx32 v0 = param1->unk_00; @@ -910,10 +912,10 @@ static void sub_020222F4 (const GraphicElementManager * param0, GraphicElementDa NNS_G2dSetRendererOverwritePriority(param0->unk_110, param1->unk_F2); if ((param1->unk_EC == 1) || (param1->unk_EC == 3)) { - CellAnimationData * v1 = (CellAnimationData *)¶m1->unk_40; + CellAnimationData *v1 = (CellAnimationData *)¶m1->unk_40; NNS_G2dDrawCellAnimation(&v1->unk_08); } else { - MultiCellAnimationData * v2 = (MultiCellAnimationData *)¶m1->unk_40; + MultiCellAnimationData *v2 = (MultiCellAnimationData *)¶m1->unk_40; NNS_G2dDrawMultiCellAnimation(&v2->unk_08); } } @@ -922,24 +924,24 @@ static void sub_020222F4 (const GraphicElementManager * param0, GraphicElementDa NNS_G2dEndRendering(); } -static void sub_02022450 (const GraphicElementManager * param0, GraphicElementData * param1) +static void sub_02022450(const GraphicElementManager *param0, GraphicElementData *param1) { return; } -static void sub_02022454 (GraphicElementData * param0) +static void sub_02022454(GraphicElementData *param0) { sub_02021E2C(param0, param0->unk_38); } -static void sub_02022460 (GraphicElementData * param0) +static void sub_02022460(GraphicElementData *param0) { return; } -static void sub_02022464 (GraphicElementManager * param0, GraphicElementData * param1) +static void sub_02022464(GraphicElementManager *param0, GraphicElementData *param1) { - GraphicElementData * v0; + GraphicElementData *v0; if (param0->unk_10.unk_100 == ¶m0->unk_10) { param0->unk_10.unk_100 = param1; @@ -970,13 +972,13 @@ static void sub_02022464 (GraphicElementManager * param0, GraphicElementData * p } } -static void sub_020224FC (GraphicElementData * param0) +static void sub_020224FC(GraphicElementData *param0) { param0->unk_FC->unk_100 = param0->unk_100; param0->unk_100->unk_FC = param0->unk_FC; } -static void sub_02022518 (GraphicElementManager * param0) +static void sub_02022518(GraphicElementManager *param0) { int v0; @@ -988,9 +990,9 @@ static void sub_02022518 (GraphicElementManager * param0) param0->unk_0C = 0; } -static GraphicElementData * sub_02022550 (GraphicElementManager * param0) +static GraphicElementData *sub_02022550(GraphicElementManager *param0) { - GraphicElementData * v0; + GraphicElementData *v0; if (param0->unk_0C >= param0->unk_04) { return NULL; @@ -1002,7 +1004,7 @@ static GraphicElementData * sub_02022550 (GraphicElementManager * param0) return v0; } -static BOOL sub_0202256C (GraphicElementManager * param0, GraphicElementData * param1) +static BOOL sub_0202256C(GraphicElementManager *param0, GraphicElementData *param1) { if (param0->unk_0C <= 0) { return 0; diff --git a/src/unk_02022844.c b/src/unk_02022844.c index 46defb2a11..7b70f57419 100644 --- a/src/unk_02022844.c +++ b/src/unk_02022844.c @@ -1,15 +1,15 @@ +#include "unk_02022844.h" + #include #include -#include "unk_02022844.h" - static void sub_02022878(void); static u64 sub_020228C8(void); static vu64 Unk_021C0780 = 0; static BOOL Unk_021C077C = 0; -void sub_02022844 (void) +void sub_02022844(void) { Unk_021C0780 = 0; Unk_021C077C = 0; @@ -18,10 +18,10 @@ void sub_02022844 (void) OS_SetTimerCount((OS_TIMER_3), 0); OS_SetTimerControl((OS_TIMER_3), (u16)((u16)(REG_OS_TM3CNT_H_E_MASK | REG_OS_TM3CNT_H_I_MASK | OS_TIMER_PRESCALER_64))); OS_SetIrqFunction((OS_IE_TIMER3), sub_02022878); - OS_EnableIrqMask((OS_IE_TIMER3)); + OS_EnableIrqMask(OS_IE_TIMER3); } -static void sub_02022878 (void) +static void sub_02022878(void) { Unk_021C0780++; @@ -33,11 +33,11 @@ static void sub_02022878 (void) Unk_021C077C = 0; } - OS_SetIrqCheckFlag((OS_IE_TIMER3)); + OS_SetIrqCheckFlag(OS_IE_TIMER3); OS_SetIrqFunction((OS_IE_TIMER3), sub_02022878); } -static u64 sub_020228C8 (void) +static u64 sub_020228C8(void) { vu16 v0; vu64 v1; @@ -55,17 +55,17 @@ static u64 sub_020228C8 (void) return (v1 << 16) | v0; } -u64 sub_0202293C (void) +u64 sub_0202293C(void) { - return sub_020228C8( ); + return sub_020228C8(); } -u64 sub_02022944 (u64 param0) +u64 sub_02022944(u64 param0) { - return(((param0) * 64) / (OS_SYSTEM_CLOCK / 1000)); + return ((param0) * 64) / (OS_SYSTEM_CLOCK / 1000); } -u64 sub_0202295C (u64 param0) +u64 sub_0202295C(u64 param0) { - return(((param0) * 64) / OS_SYSTEM_CLOCK); + return ((param0) * 64) / OS_SYSTEM_CLOCK; } diff --git a/src/unk_0202298C.c b/src/unk_0202298C.c index 53418bea2d..cf7945b672 100644 --- a/src/unk_0202298C.c +++ b/src/unk_0202298C.c @@ -1,54 +1,54 @@ +#include "unk_0202298C.h" + #include #include -#include "unk_02017728.h" #include "heap.h" -#include "unk_0202298C.h" - #include "nnsys.h" +#include "unk_02017728.h" typedef struct UnkStruct_02022BC0_t { int unk_00; - void * unk_04; + void *unk_04; } UnkStruct_02022BC0; typedef struct UnkStruct_0202298C_t { - UnkStruct_02022BC0 * unk_00; + UnkStruct_02022BC0 *unk_00; int unk_04; int unk_08; } UnkStruct_0202298C; typedef struct UnkStruct_02022BD8_2_t { - UnkStruct_02022BC0 * unk_00; + UnkStruct_02022BC0 *unk_00; NNSGfdTexKey unk_04; NNSGfdTexKey unk_08; NNSGfdPlttKey unk_0C; - void * unk_10; + void *unk_10; u16 unk_14; u16 unk_16; } UnkStruct_02022BD8_2; typedef struct UnkStruct_02022BD8_t { - UnkStruct_0202298C * unk_00; - UnkStruct_02022BD8_2 * unk_04; + UnkStruct_0202298C *unk_00; + UnkStruct_02022BD8_2 *unk_04; } UnkStruct_02022BD8; -static UnkStruct_02022BC0 * sub_02022B90(UnkStruct_0202298C * param0); -static void sub_02022BC0(UnkStruct_02022BC0 * param0); -static UnkStruct_02022BD8_2 * sub_02022F2C(const UnkStruct_02022BD8 * param0); -static void sub_02022F5C(UnkStruct_02022BD8_2 * param0); -static void sub_02022F98(const NNSG3dResTex * param0, NNSGfdTexKey * param1, NNSGfdTexKey * param2, NNSGfdPlttKey * param3); -static NNSG3dResTex * sub_02022F70(const UnkStruct_02022BD8_2 * param0); -static NNSG3dResTex * sub_02022F80(const UnkStruct_02022BD8_2 * param0); -static void sub_02023008(NNSG3dResTex * param0, UnkStruct_02022BD8_2 * param1); -static void sub_02023034(NNSG3dResTex * param0, NNSGfdTexKey param1, NNSGfdTexKey param2, NNSGfdPlttKey param3); -static void sub_02023048(NNSG3dResTex * param0); -static void * sub_02023060(void * param0, u32 param1); -static u32 sub_02023084(const void * param0); - -UnkStruct_0202298C * sub_0202298C (int param0, int param1) -{ - UnkStruct_0202298C * v0; +static UnkStruct_02022BC0 *sub_02022B90(UnkStruct_0202298C *param0); +static void sub_02022BC0(UnkStruct_02022BC0 *param0); +static UnkStruct_02022BD8_2 *sub_02022F2C(const UnkStruct_02022BD8 *param0); +static void sub_02022F5C(UnkStruct_02022BD8_2 *param0); +static void sub_02022F98(const NNSG3dResTex *param0, NNSGfdTexKey *param1, NNSGfdTexKey *param2, NNSGfdPlttKey *param3); +static NNSG3dResTex *sub_02022F70(const UnkStruct_02022BD8_2 *param0); +static NNSG3dResTex *sub_02022F80(const UnkStruct_02022BD8_2 *param0); +static void sub_02023008(NNSG3dResTex *param0, UnkStruct_02022BD8_2 *param1); +static void sub_02023034(NNSG3dResTex *param0, NNSGfdTexKey param1, NNSGfdTexKey param2, NNSGfdPlttKey param3); +static void sub_02023048(NNSG3dResTex *param0); +static void *sub_02023060(void *param0, u32 param1); +static u32 sub_02023084(const void *param0); + +UnkStruct_0202298C *sub_0202298C(int param0, int param1) +{ + UnkStruct_0202298C *v0; int v1; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0202298C)); @@ -58,7 +58,7 @@ UnkStruct_0202298C * sub_0202298C (int param0, int param1) GF_ASSERT(v0->unk_00); for (v1 = 0; v1 < param0; v1++) { - sub_02022BC0((v0->unk_00 + v1)); + sub_02022BC0(v0->unk_00 + v1); } v0->unk_04 = param0; @@ -67,7 +67,7 @@ UnkStruct_0202298C * sub_0202298C (int param0, int param1) return v0; } -void sub_020229D8 (UnkStruct_0202298C * param0) +void sub_020229D8(UnkStruct_0202298C *param0) { GF_ASSERT(param0); @@ -76,7 +76,7 @@ void sub_020229D8 (UnkStruct_0202298C * param0) Heap_FreeToHeap(param0); } -BOOL sub_020229F8 (UnkStruct_0202298C * param0, int param1) +BOOL sub_020229F8(UnkStruct_0202298C *param0, int param1) { int v0; @@ -89,16 +89,16 @@ BOOL sub_020229F8 (UnkStruct_0202298C * param0, int param1) return 0; } -UnkStruct_02022BC0 * sub_02022A1C (UnkStruct_0202298C * param0, void * param1, int param2) +UnkStruct_02022BC0 *sub_02022A1C(UnkStruct_0202298C *param0, void *param1, int param2) { - UnkStruct_02022BC0 * v0; + UnkStruct_02022BC0 *v0; GF_ASSERT(param0); v0 = sub_02022B90(param0); GF_ASSERT(v0); - GF_ASSERT((sub_020229F8(param0, param2) == 1)); + GF_ASSERT(sub_020229F8(param0, param2) == 1); v0->unk_04 = param1; v0->unk_00 = param2; @@ -107,9 +107,9 @@ UnkStruct_02022BC0 * sub_02022A1C (UnkStruct_0202298C * param0, void * param1, i return v0; } -UnkStruct_02022BC0 * sub_02022A58 (UnkStruct_0202298C * param0, const char * param1, int param2, int param3) +UnkStruct_02022BC0 *sub_02022A58(UnkStruct_0202298C *param0, const char *param1, int param2, int param3) { - UnkStruct_02022BC0 * v0; + UnkStruct_02022BC0 *v0; GF_ASSERT(param0); GF_ASSERT(param1); @@ -117,7 +117,7 @@ UnkStruct_02022BC0 * sub_02022A58 (UnkStruct_0202298C * param0, const char * par v0 = sub_02022B90(param0); GF_ASSERT(v0); - GF_ASSERT((sub_020229F8(param0, param2) == 1)); + GF_ASSERT(sub_020229F8(param0, param2) == 1); v0->unk_04 = ReadFileToHeap(param3, param1); GF_ASSERT(v0->unk_04); @@ -128,7 +128,7 @@ UnkStruct_02022BC0 * sub_02022A58 (UnkStruct_0202298C * param0, const char * par return v0; } -void sub_02022AB0 (UnkStruct_0202298C * param0, UnkStruct_02022BC0 * param1) +void sub_02022AB0(UnkStruct_0202298C *param0, UnkStruct_02022BC0 *param1) { GF_ASSERT(param0); GF_ASSERT(param1); @@ -142,7 +142,7 @@ void sub_02022AB0 (UnkStruct_0202298C * param0, UnkStruct_02022BC0 * param1) param0->unk_08--; } -void sub_02022AE4 (UnkStruct_0202298C * param0) +void sub_02022AE4(UnkStruct_0202298C *param0) { int v0; @@ -156,7 +156,7 @@ void sub_02022AE4 (UnkStruct_0202298C * param0) } } -UnkStruct_02022BC0 * sub_02022B20 (UnkStruct_0202298C * param0, int param1) +UnkStruct_02022BC0 *sub_02022B20(UnkStruct_0202298C *param0, int param1) { int v0; @@ -171,13 +171,13 @@ UnkStruct_02022BC0 * sub_02022B20 (UnkStruct_0202298C * param0, int param1) return NULL; } -void * sub_02022B54 (UnkStruct_02022BC0 * param0) +void *sub_02022B54(UnkStruct_02022BC0 *param0) { GF_ASSERT(param0); return param0->unk_04; } -void sub_02022B64 (UnkStruct_02022BC0 * param0, void * param1) +void sub_02022B64(UnkStruct_02022BC0 *param0, void *param1) { GF_ASSERT(param0); @@ -188,13 +188,13 @@ void sub_02022B64 (UnkStruct_02022BC0 * param0, void * param1) param0->unk_04 = param1; } -int sub_02022B80 (UnkStruct_02022BC0 * param0) +int sub_02022B80(UnkStruct_02022BC0 *param0) { GF_ASSERT(param0); return param0->unk_00; } -static UnkStruct_02022BC0 * sub_02022B90 (UnkStruct_0202298C * param0) +static UnkStruct_02022BC0 *sub_02022B90(UnkStruct_0202298C *param0) { int v0; @@ -209,7 +209,7 @@ static UnkStruct_02022BC0 * sub_02022B90 (UnkStruct_0202298C * param0) return NULL; } -static void sub_02022BC0 (UnkStruct_02022BC0 * param0) +static void sub_02022BC0(UnkStruct_02022BC0 *param0) { GF_ASSERT(param0); @@ -217,9 +217,9 @@ static void sub_02022BC0 (UnkStruct_02022BC0 * param0) param0->unk_04 = NULL; } -UnkStruct_02022BD8 * sub_02022BD8 (int param0, int param1) +UnkStruct_02022BD8 *sub_02022BD8(int param0, int param1) { - UnkStruct_02022BD8 * v0; + UnkStruct_02022BD8 *v0; int v1; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02022BD8)); @@ -234,7 +234,7 @@ UnkStruct_02022BD8 * sub_02022BD8 (int param0, int param1) return v0; } -void sub_02022C1C (UnkStruct_02022BD8 * param0) +void sub_02022C1C(UnkStruct_02022BD8 *param0) { GF_ASSERT(param0); @@ -244,16 +244,16 @@ void sub_02022C1C (UnkStruct_02022BD8 * param0) Heap_FreeToHeap(param0); } -BOOL sub_02022C40 (const UnkStruct_02022BD8 * param0, int param1) +BOOL sub_02022C40(const UnkStruct_02022BD8 *param0, int param1) { GF_ASSERT(param0); return sub_020229F8(param0->unk_00, param1); } -UnkStruct_02022BD8_2 * sub_02022C58 (const UnkStruct_02022BD8 * param0, void * param1, int param2, u32 param3, u32 param4) +UnkStruct_02022BD8_2 *sub_02022C58(const UnkStruct_02022BD8 *param0, void *param1, int param2, u32 param3, u32 param4) { - UnkStruct_02022BD8_2 * v0; - void * v1; + UnkStruct_02022BD8_2 *v0; + void *v1; GF_ASSERT(param0); @@ -273,9 +273,9 @@ UnkStruct_02022BD8_2 * sub_02022C58 (const UnkStruct_02022BD8 * param0, void * p return v0; } -UnkStruct_02022BD8_2 * sub_02022C9C (UnkStruct_02022BD8 * param0, void * param1, int param2, u32 param3, int param4) +UnkStruct_02022BD8_2 *sub_02022C9C(UnkStruct_02022BD8 *param0, void *param1, int param2, u32 param3, int param4) { - UnkStruct_02022BD8_2 * v0; + UnkStruct_02022BD8_2 *v0; v0 = sub_02022C58(param0, param1, param2, param3, param4); sub_02022EBC(v0); @@ -283,7 +283,7 @@ UnkStruct_02022BD8_2 * sub_02022C9C (UnkStruct_02022BD8 * param0, void * param1, return v0; } -void sub_02022CB4 (UnkStruct_02022BD8 * param0, UnkStruct_02022BD8_2 * param1) +void sub_02022CB4(UnkStruct_02022BD8 *param0, UnkStruct_02022BD8_2 *param1) { int v0; @@ -317,9 +317,9 @@ void sub_02022CB4 (UnkStruct_02022BD8 * param0, UnkStruct_02022BD8_2 * param1) sub_02022F5C(param1); } -void sub_02022D38 (UnkStruct_02022BD8 * param0, int param1) +void sub_02022D38(UnkStruct_02022BD8 *param0, int param1) { - UnkStruct_02022BD8_2 * v0; + UnkStruct_02022BD8_2 *v0; GF_ASSERT(param0); @@ -327,7 +327,7 @@ void sub_02022D38 (UnkStruct_02022BD8 * param0, int param1) sub_02022CB4(param0, v0); } -void sub_02022D58 (UnkStruct_02022BD8 * param0) +void sub_02022D58(UnkStruct_02022BD8 *param0) { int v0; @@ -341,7 +341,7 @@ void sub_02022D58 (UnkStruct_02022BD8 * param0) } } -UnkStruct_02022BD8_2 * sub_02022D98 (const UnkStruct_02022BD8 * param0, int param1) +UnkStruct_02022BD8_2 *sub_02022D98(const UnkStruct_02022BD8 *param0, int param1) { int v0; int v1; @@ -361,21 +361,21 @@ UnkStruct_02022BD8_2 * sub_02022D98 (const UnkStruct_02022BD8 * param0, int para return NULL; } -int sub_02022DE0 (const UnkStruct_02022BD8_2 * param0) +int sub_02022DE0(const UnkStruct_02022BD8_2 *param0) { GF_ASSERT(param0); return sub_02022B80(param0->unk_00); } -NNSG3dResTex * sub_02022DF4 (const UnkStruct_02022BD8_2 * param0) +NNSG3dResTex *sub_02022DF4(const UnkStruct_02022BD8_2 *param0) { GF_ASSERT(param0); return sub_02022F70(param0); } -void sub_02022E08 (UnkStruct_02022BD8_2 * param0) +void sub_02022E08(UnkStruct_02022BD8_2 *param0) { - NNSG3dResTex * v0; + NNSG3dResTex *v0; GF_ASSERT(param0); GF_ASSERT(param0->unk_14 == 0); @@ -389,9 +389,9 @@ void sub_02022E08 (UnkStruct_02022BD8_2 * param0) sub_02023008(v0, param0); } -void sub_02022E38 (UnkStruct_02022BD8 * param0, int param1) +void sub_02022E38(UnkStruct_02022BD8 *param0, int param1) { - UnkStruct_02022BD8_2 * v0; + UnkStruct_02022BD8_2 *v0; GF_ASSERT(param0); @@ -399,9 +399,9 @@ void sub_02022E38 (UnkStruct_02022BD8 * param0, int param1) sub_02022E08(v0); } -void sub_02022E54 (UnkStruct_02022BD8_2 * param0) +void sub_02022E54(UnkStruct_02022BD8_2 *param0) { - void * v0; + void *v0; GF_ASSERT(param0); @@ -423,9 +423,9 @@ void sub_02022E54 (UnkStruct_02022BD8_2 * param0) param0->unk_14 = 1; } -void sub_02022EA0 (UnkStruct_02022BD8 * param0, int param1) +void sub_02022EA0(UnkStruct_02022BD8 *param0, int param1) { - UnkStruct_02022BD8_2 * v0; + UnkStruct_02022BD8_2 *v0; GF_ASSERT(param0); @@ -433,9 +433,9 @@ void sub_02022EA0 (UnkStruct_02022BD8 * param0, int param1) sub_02022E54(v0); } -void sub_02022EBC (UnkStruct_02022BD8_2 * param0) +void sub_02022EBC(UnkStruct_02022BD8_2 *param0) { - NNSG3dResTex * v0; + NNSG3dResTex *v0; GF_ASSERT(param0); GF_ASSERT(param0->unk_14 == 0); @@ -449,30 +449,30 @@ void sub_02022EBC (UnkStruct_02022BD8_2 * param0) sub_02022F98(v0, ¶m0->unk_04, ¶m0->unk_08, ¶m0->unk_0C); } -NNSGfdTexKey sub_02022EF4 (const UnkStruct_02022BD8_2 * param0) +NNSGfdTexKey sub_02022EF4(const UnkStruct_02022BD8_2 *param0) { GF_ASSERT(param0); return param0->unk_04; } -NNSGfdTexKey sub_02022F04 (const UnkStruct_02022BD8_2 * param0) +NNSGfdTexKey sub_02022F04(const UnkStruct_02022BD8_2 *param0) { GF_ASSERT(param0); return param0->unk_08; } -NNSGfdPlttKey sub_02022F14 (const UnkStruct_02022BD8_2 * param0) +NNSGfdPlttKey sub_02022F14(const UnkStruct_02022BD8_2 *param0) { GF_ASSERT(param0); return param0->unk_0C; } -u32 sub_02022F24 (NNSG3dResFileHeader * param0) +u32 sub_02022F24(NNSG3dResFileHeader *param0) { return sub_02023084(param0); } -static UnkStruct_02022BD8_2 * sub_02022F2C (const UnkStruct_02022BD8 * param0) +static UnkStruct_02022BD8_2 *sub_02022F2C(const UnkStruct_02022BD8 *param0) { int v0; @@ -485,7 +485,7 @@ static UnkStruct_02022BD8_2 * sub_02022F2C (const UnkStruct_02022BD8 * param0) return NULL; } -static void sub_02022F5C (UnkStruct_02022BD8_2 * param0) +static void sub_02022F5C(UnkStruct_02022BD8_2 *param0) { param0->unk_00 = NULL; param0->unk_04 = NNS_GFD_ALLOC_ERROR_TEXKEY; @@ -496,10 +496,10 @@ static void sub_02022F5C (UnkStruct_02022BD8_2 * param0) param0->unk_14 = 0; } -static NNSG3dResTex * sub_02022F70 (const UnkStruct_02022BD8_2 * param0) +static NNSG3dResTex *sub_02022F70(const UnkStruct_02022BD8_2 *param0) { - void * v0; - NNSG3dResTex * v1; + void *v0; + NNSG3dResTex *v1; v0 = sub_02022B54(param0->unk_00); v1 = NNS_G3dGetTex(v0); @@ -507,10 +507,10 @@ static NNSG3dResTex * sub_02022F70 (const UnkStruct_02022BD8_2 * param0) return v1; } -static NNSG3dResTex * sub_02022F80 (const UnkStruct_02022BD8_2 * param0) +static NNSG3dResTex *sub_02022F80(const UnkStruct_02022BD8_2 *param0) { - void * v0; - NNSG3dResTex * v1; + void *v0; + NNSG3dResTex *v1; if (param0->unk_16 == 0) { v0 = sub_02022B54(param0->unk_00); @@ -522,7 +522,7 @@ static NNSG3dResTex * sub_02022F80 (const UnkStruct_02022BD8_2 * param0) return v1; } -static void sub_02022F98 (const NNSG3dResTex * param0, NNSGfdTexKey * param1, NNSGfdTexKey * param2, NNSGfdPlttKey * param3) +static void sub_02022F98(const NNSG3dResTex *param0, NNSGfdTexKey *param1, NNSGfdTexKey *param2, NNSGfdPlttKey *param3) { u32 v0; u32 v1; @@ -545,7 +545,7 @@ static void sub_02022F98 (const NNSG3dResTex * param0, NNSGfdTexKey * param1, NN } } -static void sub_02023008 (NNSG3dResTex * param0, UnkStruct_02022BD8_2 * param1) +static void sub_02023008(NNSG3dResTex *param0, UnkStruct_02022BD8_2 *param1) { sub_02023034(param0, param1->unk_04, param1->unk_08, param1->unk_0C); @@ -555,13 +555,13 @@ static void sub_02023008 (NNSG3dResTex * param0, UnkStruct_02022BD8_2 * param1) NNS_G3dPlttLoad(param0, 1); } -static void sub_02023034 (NNSG3dResTex * param0, NNSGfdTexKey param1, NNSGfdTexKey param2, NNSGfdPlttKey param3) +static void sub_02023034(NNSG3dResTex *param0, NNSGfdTexKey param1, NNSGfdTexKey param2, NNSGfdPlttKey param3) { NNS_G3dTexSetTexKey(param0, param1, param2); NNS_G3dPlttSetPlttKey(param0, param3); } -static void sub_02023048 (NNSG3dResTex * param0) +static void sub_02023048(NNSG3dResTex *param0) { NNSGfdTexKey v0; NNSGfdTexKey v1; @@ -571,10 +571,10 @@ static void sub_02023048 (NNSG3dResTex * param0) v2 = NNS_G3dPlttReleasePlttKey(param0); } -static void * sub_02023060 (void * param0, u32 param1) +static void *sub_02023060(void *param0, u32 param1) { u32 v0; - void * v1; + void *v1; v0 = sub_02023084(param0); v1 = Heap_AllocFromHeap(param1, v0); @@ -583,10 +583,10 @@ static void * sub_02023060 (void * param0, u32 param1) return v1; } -static u32 sub_02023084 (const void * param0) +static u32 sub_02023084(const void *param0) { - NNSG3dResTex * v0; - u8 * v1; + NNSG3dResTex *v0; + u8 *v1; u32 v2; v0 = NNS_G3dGetTex(param0); diff --git a/src/unk_0202309C.c b/src/unk_0202309C.c index a6988dd0a4..e3847c0e26 100644 --- a/src/unk_0202309C.c +++ b/src/unk_0202309C.c @@ -1,15 +1,15 @@ +#include "unk_0202309C.h" + #include #include -#include "unk_0202309C.h" - -void sub_0202309C (NNSG2dRendererInstance * param0, fx32 param1) +void sub_0202309C(NNSG2dRendererInstance *param0, fx32 param1) { NNS_G2dInitRenderer(param0); NNS_G2dSetRendererSpriteZoffset(param0, param1); } -void sub_020230AC (NNSG2dRenderSurface * param0, NNSG2dViewRect * param1, NNSG2dOamRegisterFunction param2, NNSG2dAffineRegisterFunction param3, NNSG2dRndCellCullingFunction param4, NNSG2dSurfaceType param5, NNSG2dRendererInstance * param6) +void sub_020230AC(NNSG2dRenderSurface *param0, NNSG2dViewRect *param1, NNSG2dOamRegisterFunction param2, NNSG2dAffineRegisterFunction param3, NNSG2dRndCellCullingFunction param4, NNSG2dSurfaceType param5, NNSG2dRendererInstance *param6) { NNS_G2dInitRenderSurface(param0); @@ -24,14 +24,14 @@ void sub_020230AC (NNSG2dRenderSurface * param0, NNSG2dViewRect * param1, NNSG2d } } -void sub_020230E0 (NNSG2dRenderSurface * param0, NNSG2dViewRect * param1) +void sub_020230E0(NNSG2dRenderSurface *param0, NNSG2dViewRect *param1) { param0->viewRect = *param1; } -BOOL sub_020230F0 (const NNSG2dCellData * param0, const MtxFx32 * param1, const NNSG2dViewRect * param2) +BOOL sub_020230F0(const NNSG2dCellData *param0, const MtxFx32 *param1, const NNSG2dViewRect *param2) { - const NNSG2dCellBoundingRectS16 * v0 = NNS_G2dGetCellBoundingRect(param0); + const NNSG2dCellBoundingRectS16 *v0 = NNS_G2dGetCellBoundingRect(param0); const fx32 v1 = NNS_G2dGetCellBoundingSphereR(param0); const fx32 v2 = param1->_20 - param2->posTopLeft.x; const fx32 v3 = param1->_21 - param2->posTopLeft.y; diff --git a/src/unk_020232E0.c b/src/unk_020232E0.c index 40aa43f4b4..7ff8104efa 100644 --- a/src/unk_020232E0.c +++ b/src/unk_020232E0.c @@ -1,18 +1,18 @@ +#include "unk_020232E0.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" - #include "struct_defs/struct_02002328.h" -#include "narc.h" -#include "heap.h" #include "charcode.h" +#include "heap.h" +#include "narc.h" #include "unk_0201D670.h" -#include "unk_020232E0.h" -typedef void (* UnkFuncPtr_02023350)(const UnkStruct_02023350 *, u16, UnkStruct_02002328 *); -typedef u8 (* UnkFuncPtr_02023350_1)(const UnkStruct_02023350 *, u32); +typedef void (*UnkFuncPtr_02023350)(const UnkStruct_02023350 *, u16, UnkStruct_02002328 *); +typedef u8 (*UnkFuncPtr_02023350_1)(const UnkStruct_02023350 *, u32); typedef struct { u32 unk_00; @@ -29,32 +29,32 @@ typedef struct UnkStruct_02023350_t { UnkFuncPtr_02023350 unk_04; u32 unk_08; u32 unk_0C; - u8 * unk_10; + u8 *unk_10; u8 unk_14[64]; - NARC * unk_54; + NARC *unk_54; u32 unk_58; UnkStruct_02023350_sub1 unk_5C; BOOL unk_6C; UnkFuncPtr_02023350_1 unk_70; - u8 * unk_74; + u8 *unk_74; } UnkStruct_02023350; -static void sub_02023350(UnkStruct_02023350 * param0, u32 param1, u32 param2, BOOL param3, u32 param4); -static void sub_02023408(UnkStruct_02023350 * param0); -static void sub_02023424(UnkStruct_02023350 * param0, int param1, u32 param2); -static void sub_0202343C(UnkStruct_02023350 * param0, u32 param1); -static void sub_0202346C(UnkStruct_02023350 * param0, u32 param1); -static void sub_02023478(UnkStruct_02023350 * param0); -static void sub_0202348C(UnkStruct_02023350 * param0); -static void sub_0202349C(UnkStruct_02023350 * param0); -static void sub_020234BC(const UnkStruct_02023350 * param0, u16 param1, UnkStruct_02002328 * param2); -static void sub_02023564(const UnkStruct_02023350 * param0, u16 param1, UnkStruct_02002328 * param2); -static u8 sub_020236B0(const UnkStruct_02023350 * param0, u32 param1); -static u8 sub_020236C8(const UnkStruct_02023350 * param0, u32 param1); - -UnkStruct_02023350 * sub_020232E0 (u32 param0, u32 param1, int param2, BOOL param3, u32 param4) +static void sub_02023350(UnkStruct_02023350 *param0, u32 param1, u32 param2, BOOL param3, u32 param4); +static void sub_02023408(UnkStruct_02023350 *param0); +static void sub_02023424(UnkStruct_02023350 *param0, int param1, u32 param2); +static void sub_0202343C(UnkStruct_02023350 *param0, u32 param1); +static void sub_0202346C(UnkStruct_02023350 *param0, u32 param1); +static void sub_02023478(UnkStruct_02023350 *param0); +static void sub_0202348C(UnkStruct_02023350 *param0); +static void sub_0202349C(UnkStruct_02023350 *param0); +static void sub_020234BC(const UnkStruct_02023350 *param0, u16 param1, UnkStruct_02002328 *param2); +static void sub_02023564(const UnkStruct_02023350 *param0, u16 param1, UnkStruct_02002328 *param2); +static u8 sub_020236B0(const UnkStruct_02023350 *param0, u32 param1); +static u8 sub_020236C8(const UnkStruct_02023350 *param0, u32 param1); + +UnkStruct_02023350 *sub_020232E0(u32 param0, u32 param1, int param2, BOOL param3, u32 param4) { - UnkStruct_02023350 * v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_02023350)); + UnkStruct_02023350 *v0 = Heap_AllocFromHeap(param4, sizeof(UnkStruct_02023350)); if (v0) { sub_02023350(v0, param0, param1, param3, param4); @@ -64,14 +64,14 @@ UnkStruct_02023350 * sub_020232E0 (u32 param0, u32 param1, int param2, BOOL para return v0; } -void sub_02023318 (UnkStruct_02023350 * param0) +void sub_02023318(UnkStruct_02023350 *param0) { sub_02023478(param0); sub_02023408(param0); Heap_FreeToHeap(param0); } -void sub_02023330 (UnkStruct_02023350 * param0, int param1, u32 param2) +void sub_02023330(UnkStruct_02023350 *param0, int param1, u32 param2) { if (param0->unk_00 != param1) { sub_02023478(param0); @@ -79,7 +79,7 @@ void sub_02023330 (UnkStruct_02023350 * param0, int param1, u32 param2) } } -static void sub_02023350 (UnkStruct_02023350 * param0, u32 param1, u32 param2, BOOL param3, u32 param4) +static void sub_02023350(UnkStruct_02023350 *param0, u32 param1, u32 param2, BOOL param3, u32 param4) { param0->unk_54 = NARC_ctor(param1, param4); @@ -102,8 +102,8 @@ static void sub_02023350 (UnkStruct_02023350 * param0, u32 param1, u32 param2, B { static const u8 v0[2][2] = { - {0x0, 0x1}, - {0x2, 0x3} + { 0x0, 0x1 }, + { 0x2, 0x3 } }; GF_ASSERT(param0->unk_5C.unk_0E <= 2 && param0->unk_5C.unk_0F <= 2); @@ -116,7 +116,7 @@ static void sub_02023350 (UnkStruct_02023350 * param0, u32 param1, u32 param2, B } } -static void sub_02023408 (UnkStruct_02023350 * param0) +static void sub_02023408(UnkStruct_02023350 *param0) { if (param0->unk_74) { Heap_FreeToHeap(param0->unk_74); @@ -127,17 +127,18 @@ static void sub_02023408 (UnkStruct_02023350 * param0) } } -static void sub_02023424 (UnkStruct_02023350 * param0, int param1, u32 param2) +static void sub_02023424(UnkStruct_02023350 *param0, int param1, u32 param2) { - static void(*const v0[])(UnkStruct_02023350 *, u32) = { - sub_0202343C, sub_0202346C, + static void (*const v0[])(UnkStruct_02023350 *, u32) = { + sub_0202343C, + sub_0202346C, }; param0->unk_00 = param1; v0[param1](param0, param2); } -static void sub_0202343C (UnkStruct_02023350 * param0, u32 param1) +static void sub_0202343C(UnkStruct_02023350 *param0, u32 param1) { u32 v0 = param0->unk_0C * param0->unk_5C.unk_08; @@ -147,14 +148,14 @@ static void sub_0202343C (UnkStruct_02023350 * param0, u32 param1) NARC_ReadFromMember(param0->unk_54, param0->unk_58, param0->unk_5C.unk_00, v0, param0->unk_10); } -static void sub_0202346C (UnkStruct_02023350 * param0, u32 param1) +static void sub_0202346C(UnkStruct_02023350 *param0, u32 param1) { param0->unk_04 = sub_02023564; } -static void sub_02023478 (UnkStruct_02023350 * param0) +static void sub_02023478(UnkStruct_02023350 *param0) { - static void(*const v0[])(UnkStruct_02023350 *) = { + static void (*const v0[])(UnkStruct_02023350 *) = { sub_0202348C, sub_0202349C }; @@ -162,18 +163,18 @@ static void sub_02023478 (UnkStruct_02023350 * param0) v0[param0->unk_00](param0); } -static void sub_0202348C (UnkStruct_02023350 * param0) +static void sub_0202348C(UnkStruct_02023350 *param0) { Heap_FreeToHeap(param0->unk_10); param0->unk_10 = NULL; } -static void sub_0202349C (UnkStruct_02023350 * param0) +static void sub_0202349C(UnkStruct_02023350 *param0) { (void)0; } -void sub_020234A0 (const UnkStruct_02023350 * param0, u16 param1, UnkStruct_02002328 * param2) +void sub_020234A0(const UnkStruct_02023350 *param0, u16 param1, UnkStruct_02002328 *param2) { if (param1 <= param0->unk_5C.unk_08) { param1--; @@ -184,7 +185,7 @@ void sub_020234A0 (const UnkStruct_02023350 * param0, u16 param1, UnkStruct_0200 param0->unk_04(param0, param1, param2); } -static void sub_020234BC (const UnkStruct_02023350 * param0, u16 param1, UnkStruct_02002328 * param2) +static void sub_020234BC(const UnkStruct_02023350 *param0, u16 param1, UnkStruct_02002328 *param2) { u32 v0; @@ -214,7 +215,7 @@ static void sub_020234BC (const UnkStruct_02023350 * param0, u16 param1, UnkStru param2->unk_81 = param0->unk_5C.unk_0D; } -static void sub_02023564 (const UnkStruct_02023350 * param0, u16 param1, UnkStruct_02002328 * param2) +static void sub_02023564(const UnkStruct_02023350 *param0, u16 param1, UnkStruct_02002328 *param2) { u32 v0; @@ -244,7 +245,7 @@ static void sub_02023564 (const UnkStruct_02023350 * param0, u16 param1, UnkStru param2->unk_81 = param0->unk_5C.unk_0D; } -u32 sub_02023620 (const UnkStruct_02023350 * param0, const u16 * param1, u32 param2) +u32 sub_02023620(const UnkStruct_02023350 *param0, const u16 *param1, u32 param2) { u32 v0 = 0; @@ -264,7 +265,7 @@ u32 sub_02023620 (const UnkStruct_02023350 * param0, const u16 * param1, u32 par return v0 - param2; } -BOOL sub_0202366C (const UnkStruct_02023350 * param0, const u16 * param1) +BOOL sub_0202366C(const UnkStruct_02023350 *param0, const u16 *param1) { while (*param1 != 0xffff) { if (*param1 == 0xfffe) { @@ -285,7 +286,7 @@ BOOL sub_0202366C (const UnkStruct_02023350 * param0, const u16 * param1) return 1; } -static u8 sub_020236B0 (const UnkStruct_02023350 * param0, u32 param1) +static u8 sub_020236B0(const UnkStruct_02023350 *param0, u32 param1) { if (param1 < param0->unk_5C.unk_08) { return param0->unk_74[param1]; @@ -294,12 +295,12 @@ static u8 sub_020236B0 (const UnkStruct_02023350 * param0, u32 param1) } } -static u8 sub_020236C8 (const UnkStruct_02023350 * param0, u32 param1) +static u8 sub_020236C8(const UnkStruct_02023350 *param0, u32 param1) { return param0->unk_5C.unk_0C; } -u32 sub_020236D0 (const UnkStruct_02023350 * param0, const u16 * param1, u32 param2) +u32 sub_020236D0(const UnkStruct_02023350 *param0, const u16 *param1, u32 param2) { u32 v0 = 0, v1 = 0; @@ -333,7 +334,7 @@ u32 sub_020236D0 (const UnkStruct_02023350 * param0, const u16 * param1, u32 par return v0; } -u32 sub_02023738 (const UnkStruct_02023350 * param0, const u16 * param1) +u32 sub_02023738(const UnkStruct_02023350 *param0, const u16 *param1) { u32 v0 = 0; diff --git a/src/unk_02023FCC.c b/src/unk_02023FCC.c index 98bcaa3f36..386635dc07 100644 --- a/src/unk_02023FCC.c +++ b/src/unk_02023FCC.c @@ -1,11 +1,12 @@ +#include "unk_02023FCC.h" + #include #include -#include "touch_screen.h" #include "functypes/funcptr_02023FCC.h" #include "heap.h" -#include "unk_02023FCC.h" +#include "touch_screen.h" typedef struct { u8 unk_00; @@ -14,21 +15,21 @@ typedef struct { } UnkStruct_02024028; typedef struct UnkStruct_02023FCC_t { - const TouchScreenHitTable * unk_00; + const TouchScreenHitTable *unk_00; u32 unk_04; UnkFuncPtr_02023FCC unk_08; - void * unk_0C; - UnkStruct_02024028 * unk_10; + void *unk_0C; + UnkStruct_02024028 *unk_10; } UnkStruct_02023FCC; -static void sub_02024028(UnkStruct_02024028 * param0); -static u32 sub_020240F4(UnkStruct_02024028 * param0, BOOL param1, BOOL param2); -static u32 sub_02024110(UnkStruct_02024028 * param0, BOOL param1, BOOL param2); -static void sub_02024144(UnkStruct_02024028 * param0, u32 param1); +static void sub_02024028(UnkStruct_02024028 *param0); +static u32 sub_020240F4(UnkStruct_02024028 *param0, BOOL param1, BOOL param2); +static u32 sub_02024110(UnkStruct_02024028 *param0, BOOL param1, BOOL param2); +static void sub_02024144(UnkStruct_02024028 *param0, u32 param1); -UnkStruct_02023FCC * sub_02023FCC (const TouchScreenHitTable *hitTable, u32 param1, UnkFuncPtr_02023FCC param2, void * param3, u32 param4) +UnkStruct_02023FCC *sub_02023FCC(const TouchScreenHitTable *hitTable, u32 param1, UnkFuncPtr_02023FCC param2, void *param3, u32 param4) { - UnkStruct_02023FCC * v0; + UnkStruct_02023FCC *v0; GF_ASSERT(param1 > 0); @@ -56,14 +57,14 @@ UnkStruct_02023FCC * sub_02023FCC (const TouchScreenHitTable *hitTable, u32 para return v0; } -static void sub_02024028 (UnkStruct_02024028 * param0) +static void sub_02024028(UnkStruct_02024028 *param0) { param0->unk_00 = 0; param0->unk_01 = 0; param0->unk_02 = 0; } -void sub_02024034 (UnkStruct_02023FCC * param0) +void sub_02024034(UnkStruct_02023FCC *param0) { GF_ASSERT(param0); @@ -71,9 +72,9 @@ void sub_02024034 (UnkStruct_02023FCC * param0) Heap_FreeToHeap(param0); } -void sub_0202404C (UnkStruct_02023FCC * param0) +void sub_0202404C(UnkStruct_02023FCC *param0) { - static u32(*const v0[])(UnkStruct_02024028 *, BOOL, BOOL) = { + static u32 (*const v0[])(UnkStruct_02024028 *, BOOL, BOOL) = { sub_020240F4, sub_02024110 }; @@ -110,7 +111,7 @@ void sub_0202404C (UnkStruct_02023FCC * param0) } } -static u32 sub_020240F4 (UnkStruct_02024028 * param0, BOOL param1, BOOL param2) +static u32 sub_020240F4(UnkStruct_02024028 *param0, BOOL param1, BOOL param2) { if (param0->unk_01) { if (param2) { @@ -122,7 +123,7 @@ static u32 sub_020240F4 (UnkStruct_02024028 * param0, BOOL param1, BOOL param2) return 4294967295; } -static u32 sub_02024110 (UnkStruct_02024028 * param0, BOOL param1, BOOL param2) +static u32 sub_02024110(UnkStruct_02024028 *param0, BOOL param1, BOOL param2) { if (param0->unk_01) { if (param0->unk_02 < 65535) { @@ -141,7 +142,7 @@ static u32 sub_02024110 (UnkStruct_02024028 * param0, BOOL param1, BOOL param2) return 4294967295; } -static void sub_02024144 (UnkStruct_02024028 * param0, u32 param1) +static void sub_02024144(UnkStruct_02024028 *param0, u32 param1) { param0->unk_00 = param1; param0->unk_02 = 0; diff --git a/src/unk_0202414C.c b/src/unk_0202414C.c index a1fa4d6eb7..239ecfc93a 100644 --- a/src/unk_0202414C.c +++ b/src/unk_0202414C.c @@ -1,12 +1,12 @@ +#include "unk_0202414C.h" + #include #include #include "struct_defs/struct_0202144C.h" #include "struct_defs/struct_02024184.h" -#include "unk_0202414C.h" - -UnkStruct_0202144C sub_0202414C (const UnkStruct_02024184 * param0, const u16 param1) +UnkStruct_0202144C sub_0202414C(const UnkStruct_02024184 *param0, const u16 param1) { int v0; UnkStruct_0202144C v1; @@ -23,9 +23,9 @@ UnkStruct_0202144C sub_0202414C (const UnkStruct_02024184 * param0, const u16 pa return v1; } -void sub_02024184 (const void * param0, UnkStruct_02024184 * param1) +void sub_02024184(const void *param0, UnkStruct_02024184 *param1) { - const u8 * v0; + const u8 *v0; v0 = param0; param1->unk_0C = *((u32 *)v0); diff --git a/src/unk_0202419C.c b/src/unk_0202419C.c index 15dcd40eb5..16a397f833 100644 --- a/src/unk_0202419C.c +++ b/src/unk_0202419C.c @@ -1,8 +1,8 @@ +#include "unk_0202419C.h" + #include #include -#include "unk_0202419C.h" - typedef struct { BOOL unk_00; GXSortMode unk_04; @@ -11,25 +11,25 @@ typedef struct { static UnkStruct_021C0788 Unk_021C0788; -void sub_0202419C (void) +void sub_0202419C(void) { memset(&Unk_021C0788, 0, sizeof(UnkStruct_021C0788)); Unk_021C0788.unk_00 = 0; } -void sub_020241B4 (void) +void sub_020241B4(void) { G3X_Reset(); } -void G3_RequestSwapBuffers (GXSortMode param0, GXBufferMode param1) +void G3_RequestSwapBuffers(GXSortMode param0, GXBufferMode param1) { Unk_021C0788.unk_04 = param0; Unk_021C0788.unk_08 = param1; Unk_021C0788.unk_00 = 1; } -void sub_020241CC (void) +void sub_020241CC(void) { if (Unk_021C0788.unk_00) { G3_SwapBuffers(Unk_021C0788.unk_04, Unk_021C0788.unk_08); diff --git a/src/unk_020241F0.c b/src/unk_020241F0.c index 7d0326b899..64a01b2198 100644 --- a/src/unk_020241F0.c +++ b/src/unk_020241F0.c @@ -1,34 +1,34 @@ +#include "unk_020241F0.h" + #include #include -#include "unk_020241F0.h" - -u32 sub_020241F0 (void) +u32 sub_020241F0(void) { return HW_BG_PLTT; } -u32 sub_020241F8 (void) +u32 sub_020241F8(void) { return HW_BG_PLTT_SIZE; } -u32 sub_02024200 (void) +u32 sub_02024200(void) { return HW_DB_BG_PLTT; } -u32 sub_02024208 (void) +u32 sub_02024208(void) { return HW_DB_BG_PLTT_SIZE; } -u32 sub_02024210 (void) +u32 sub_02024210(void) { return HW_OBJ_PLTT; } -u32 sub_02024218 (void) +u32 sub_02024218(void) { return HW_DB_OBJ_PLTT; } diff --git a/src/unk_02024220.c b/src/unk_02024220.c index 98090c7a9f..108669041f 100644 --- a/src/unk_02024220.c +++ b/src/unk_02024220.c @@ -1,19 +1,21 @@ +#include "unk_02024220.h" + #include #include -#include "functypes/funcptr_02024220.h" #include "struct_defs/struct_0207C690.h" -#include "heap.h" +#include "functypes/funcptr_02024220.h" + #include "gx_layers.h" -#include "unk_02024220.h" +#include "heap.h" static void sub_020242DC(void); -GenericPointerData * sub_02024220 (u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5) +GenericPointerData *sub_02024220(u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5) { int v0, v1; - GenericPointerData * v2 = Heap_AllocFromHeap(param0, sizeof(GenericPointerData)); + GenericPointerData *v2 = Heap_AllocFromHeap(param0, sizeof(GenericPointerData)); v2->unk_00 = param0; @@ -47,14 +49,14 @@ GenericPointerData * sub_02024220 (u32 param0, int param1, int param2, int param return v2; } -void sub_020242C4 (GenericPointerData * param0) +void sub_020242C4(GenericPointerData *param0) { Heap_FreeToHeap(param0->unk_04); Heap_FreeToHeap(param0->unk_08); Heap_FreeToHeap(param0); } -static void sub_020242DC (void) +static void sub_020242DC(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); diff --git a/src/unk_02024358.c b/src/unk_02024358.c index 691f983323..b82751660e 100644 --- a/src/unk_02024358.c +++ b/src/unk_02024358.c @@ -1,21 +1,21 @@ +#include "unk_02024358.h" + #include #include -#include "unk_02024358.h" - -void sub_02024358 () +void sub_02024358() { if (!FS_IsAvailable()) { OS_Terminate(); } else { static const char v0[] = "rom"; static const int v1 = sizeof(v0) - 1; - const CARDRomHeader * v2; - FSArchive * v3; + const CARDRomHeader *v2; + FSArchive *v3; { - CARDRomHeader * const v4 = (CARDRomHeader *)0x27FF000; - CARDRomHeader * const v5 = (CARDRomHeader *)HW_ROM_HEADER_BUF; - CARDRomHeader * const v6 = (CARDRomHeader *)HW_CARD_ROM_HEADER; + CARDRomHeader *const v4 = (CARDRomHeader *)0x27FF000; + CARDRomHeader *const v5 = (CARDRomHeader *)HW_ROM_HEADER_BUF; + CARDRomHeader *const v6 = (CARDRomHeader *)HW_CARD_ROM_HEADER; if (v4->game_code == 0) { CARD_Init(); @@ -39,7 +39,7 @@ void sub_02024358 () } } -void sub_020243E0 (const char * param0) +void sub_020243E0(const char *param0) { FSFile v0; u32 v1; diff --git a/src/unk_02025CB0.c b/src/unk_02025CB0.c index 635824643b..7f1b2af8bb 100644 --- a/src/unk_02025CB0.c +++ b/src/unk_02025CB0.c @@ -1,12 +1,12 @@ +#include "unk_02025CB0.h" + #include #include -#include "savedata.h" #include "struct_defs/struct_02055BA8.h" #include "rtc.h" #include "savedata.h" -#include "unk_02025CB0.h" typedef struct UnkStruct_02025CCC_t { s64 unk_00; @@ -20,31 +20,31 @@ typedef struct UnkStruct_02025CCC_t { u32 unk_50[3]; } UnkStruct_02025CCC; -int SystemData_SaveSize (void) +int SystemData_SaveSize(void) { return sizeof(UnkStruct_02025CCC); } -void SystemData_Init (UnkStruct_02025CCC * param0) +void SystemData_Init(UnkStruct_02025CCC *param0) { MI_CpuClearFast(param0, sizeof(UnkStruct_02025CCC)); sub_02025D84(¶m0->unk_10); } -UnkStruct_02025CCC * sub_02025CCC (SaveData * param0) +UnkStruct_02025CCC *sub_02025CCC(SaveData *param0) { return SaveData_SaveTable(param0, 0); } -UnkStruct_02055BA8 * sub_02025CD8 (SaveData * param0) +UnkStruct_02055BA8 *sub_02025CD8(SaveData *param0) { - UnkStruct_02025CCC * v0; + UnkStruct_02025CCC *v0; v0 = sub_02025CCC(param0); return &v0->unk_10; } -void sub_02025CE4 (UnkStruct_02025CCC * param0) +void sub_02025CE4(UnkStruct_02025CCC *param0) { OSOwnerInfo v0; @@ -57,7 +57,7 @@ void sub_02025CE4 (UnkStruct_02025CCC * param0) param0->unk_0F = v0.birthday.day; } -BOOL sub_02025D10 (const UnkStruct_02025CCC * param0) +BOOL sub_02025D10(const UnkStruct_02025CCC *param0) { int v0; u8 v1[6]; @@ -73,44 +73,44 @@ BOOL sub_02025D10 (const UnkStruct_02025CCC * param0) return 1; } -BOOL sub_02025D40 (const UnkStruct_02025CCC * param0) +BOOL sub_02025D40(const UnkStruct_02025CCC *param0) { return OS_GetOwnerRtcOffset() == param0->unk_00; } -u8 sub_02025D5C (const UnkStruct_02025CCC * param0) +u8 sub_02025D5C(const UnkStruct_02025CCC *param0) { return param0->unk_0E; } -u8 sub_02025D60 (const UnkStruct_02025CCC * param0) +u8 sub_02025D60(const UnkStruct_02025CCC *param0) { return param0->unk_0F; } -BOOL sub_02025D64 (const UnkStruct_02025CCC * param0) +BOOL sub_02025D64(const UnkStruct_02025CCC *param0) { return param0->unk_48; } -void sub_02025D6C (UnkStruct_02025CCC * param0, BOOL param1) +void sub_02025D6C(UnkStruct_02025CCC *param0, BOOL param1) { param0->unk_48 = param1; } -s32 sub_02025D74 (const UnkStruct_02025CCC * param0) +s32 sub_02025D74(const UnkStruct_02025CCC *param0) { return param0->unk_4C; } -void sub_02025D78 (UnkStruct_02025CCC * param0, s32 param1) +void sub_02025D78(UnkStruct_02025CCC *param0, s32 param1) { if (param0->unk_4C == 0) { param0->unk_4C = param1; } } -void sub_02025D84 (UnkStruct_02055BA8 * param0) +void sub_02025D84(UnkStruct_02055BA8 *param0) { param0->unk_00 = 1; GetCurrentDateTime(¶m0->unk_04, ¶m0->unk_14); @@ -120,7 +120,7 @@ void sub_02025D84 (UnkStruct_02055BA8 * param0) param0->unk_34 = 0; } -BOOL sub_02025DB8 (const UnkStruct_02055BA8 * param0) +BOOL sub_02025DB8(const UnkStruct_02055BA8 *param0) { if (param0->unk_34 != 0) { return 1; @@ -129,7 +129,7 @@ BOOL sub_02025DB8 (const UnkStruct_02055BA8 * param0) } } -void sub_02025DC8 (UnkStruct_02055BA8 * param0, int param1) +void sub_02025DC8(UnkStruct_02055BA8 *param0, int param1) { if (param0->unk_34 > 24 * 60) { param0->unk_34 = 24 * 60; @@ -142,7 +142,7 @@ void sub_02025DC8 (UnkStruct_02055BA8 * param0, int param1) } } -void sub_02025DE8 (UnkStruct_02055BA8 * param0) +void sub_02025DE8(UnkStruct_02055BA8 *param0) { param0->unk_34 = 60 * 24; GetCurrentDateTime(¶m0->unk_04, ¶m0->unk_14); diff --git a/src/unk_02025E08.c b/src/unk_02025E08.c index 5cbfa36278..9165172922 100644 --- a/src/unk_02025E08.c +++ b/src/unk_02025E08.c @@ -1,15 +1,15 @@ +#include "unk_02025E08.h" + #include #include #include "struct_decls/struct_02025E0C_decl.h" -#include "savedata.h" -#include "savedata.h" -#include "unk_02025E08.h" -#include "trainer_info.h" -#include "game_options.h" #include "coins.h" +#include "game_options.h" #include "play_time.h" +#include "savedata.h" +#include "trainer_info.h" struct UnkStruct_02025E0C_t { Options unk_00; @@ -18,12 +18,12 @@ struct UnkStruct_02025E0C_t { PlayTime playTime; }; -int Player_SaveSize (void) +int Player_SaveSize(void) { return sizeof(UnkStruct_02025E0C); } -void Player_Init (UnkStruct_02025E0C * param0) +void Player_Init(UnkStruct_02025E0C *param0) { MI_CpuClearFast(param0, sizeof(UnkStruct_02025E0C)); @@ -33,25 +33,25 @@ void Player_Init (UnkStruct_02025E0C * param0) PlayTime_Init(¶m0->playTime); } -TrainerInfo * SaveData_GetTrainerInfo (SaveData * param0) +TrainerInfo *SaveData_GetTrainerInfo(SaveData *param0) { - UnkStruct_02025E0C * v0; + UnkStruct_02025E0C *v0; v0 = SaveData_SaveTable(param0, 1); return &v0->unk_04; } -Options * SaveData_Options (SaveData * param0) +Options *SaveData_Options(SaveData *param0) { - UnkStruct_02025E0C * v0; + UnkStruct_02025E0C *v0; v0 = SaveData_SaveTable(param0, 1); return &v0->unk_00; } -u16 * sub_02025E50 (SaveData * param0) +u16 *sub_02025E50(SaveData *param0) { - UnkStruct_02025E0C * v0; + UnkStruct_02025E0C *v0; v0 = SaveData_SaveTable(param0, 1); return &v0->unk_24; diff --git a/src/unk_0202602C.c b/src/unk_0202602C.c index f5178e0b38..be662ce681 100644 --- a/src/unk_0202602C.c +++ b/src/unk_0202602C.c @@ -1,52 +1,49 @@ +#include "unk_0202602C.h" + #include #include -#include "strbuf.h" #include "struct_decls/struct_02026030_decl.h" -#include "savedata.h" - #include "struct_defs/struct_02026030_t.h" #include "struct_defs/struct_0202610C.h" -#include "struct_defs/struct_02026030_t.h" -#include "strbuf.h" #include "savedata.h" -#include "unk_0202602C.h" +#include "strbuf.h" -int sub_0202602C (void) +int sub_0202602C(void) { return sizeof(BattleRegulation); } -int RegulationBattles_SaveSize (void) +int RegulationBattles_SaveSize(void) { return sizeof(UnkStruct_02026030); } -void BattleRegulation_Copy (const BattleRegulation * param0, BattleRegulation * param1) +void BattleRegulation_Copy(const BattleRegulation *param0, BattleRegulation *param1) { MI_CpuCopy8(param0, param1, sizeof(BattleRegulation)); } -void RegulationBattles_Init (UnkStruct_02026030 * param0) +void RegulationBattles_Init(UnkStruct_02026030 *param0) { memset(param0, 0, sizeof(UnkStruct_02026030)); } -void sub_0202604C (const BattleRegulation * param0, Strbuf *param1) +void sub_0202604C(const BattleRegulation *param0, Strbuf *param1) { Strbuf_CopyNumChars(param1, param0->unk_00, (11 + 1)); } -Strbuf* sub_0202605C (const BattleRegulation * param0, int param1) +Strbuf *sub_0202605C(const BattleRegulation *param0, int param1) { - Strbuf* v0 = Strbuf_Init((11 + 1) * 2, param1); + Strbuf *v0 = Strbuf_Init((11 + 1) * 2, param1); Strbuf_CopyChars(v0, param0->unk_00); return v0; } -int sub_02026074 (const BattleRegulation * param0, int param1) +int sub_02026074(const BattleRegulation *param0, int param1) { int v0 = 0; @@ -100,9 +97,9 @@ int sub_02026074 (const BattleRegulation * param0, int param1) return v0; } -BattleRegulation * sub_0202610C (SaveData * param0, int param1) +BattleRegulation *sub_0202610C(SaveData *param0, int param1) { - UnkStruct_02026030 * v0 = NULL; + UnkStruct_02026030 *v0 = NULL; GF_ASSERT(param1 < 1); v0 = SaveData_SaveTable(param0, 13); @@ -114,9 +111,9 @@ BattleRegulation * sub_0202610C (SaveData * param0, int param1) return NULL; } -void sub_0202613C (SaveData * param0, const BattleRegulation * param1) +void sub_0202613C(SaveData *param0, const BattleRegulation *param1) { - UnkStruct_02026030 * v0 = NULL; + UnkStruct_02026030 *v0 = NULL; v0 = SaveData_SaveTable(param0, 13); BattleRegulation_Copy(param1, &v0->unk_00[0]); diff --git a/src/unk_02026150.c b/src/unk_02026150.c index 420c4526ac..968c5cd170 100644 --- a/src/unk_02026150.c +++ b/src/unk_02026150.c @@ -1,22 +1,20 @@ +#include "unk_02026150.h" + #include #include #include "struct_decls/struct_02026030_decl.h" -#include "savedata.h" - #include "struct_defs/struct_02026030_t.h" #include "struct_defs/struct_0202610C.h" -#include "struct_defs/struct_02026030_t.h" #include "message.h" #include "savedata.h" -#include "unk_0202602C.h" -#include "unk_02026150.h" #include "strbuf.h" +#include "unk_0202602C.h" BattleRegulation Unk_02100880[] = { { - {0xffff}, + { 0xffff }, 0x0, 0x3, 0x32, @@ -26,10 +24,10 @@ BattleRegulation Unk_02100880[] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { - {0xffff}, + { 0xffff }, 0x50, 0x3, 0x1E, @@ -39,10 +37,10 @@ BattleRegulation Unk_02100880[] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { - {0xffff}, + { 0xffff }, 0x0, 0x3, 0x5, @@ -52,10 +50,10 @@ BattleRegulation Unk_02100880[] = { 0x0, 0x0, 0x0, - 0x1 + 0x1, }, { - {0xffff}, + { 0xffff }, 0x0, 0x3, 0x32, @@ -65,10 +63,10 @@ BattleRegulation Unk_02100880[] = { 0x0, 0x0, 0x0, - 0x0 + 0x0, }, { - {0xffff}, + { 0xffff }, 0x0, 0x4, 0x32, @@ -78,12 +76,12 @@ BattleRegulation Unk_02100880[] = { 0x0, 0x0, 0x0, - 0x0 - } + 0x0, + }, }; BattleRegulation Unk_02100860 = { - {0xffff}, + { 0xffff }, 0x0, 0x6, 0x64, @@ -96,9 +94,9 @@ BattleRegulation Unk_02100860 = { 0x0 }; -const BattleRegulation * sub_02026150 (SaveData * param0, int param1) +const BattleRegulation *sub_02026150(SaveData *param0, int param1) { - UnkStruct_02026030 * v0 = NULL; + UnkStruct_02026030 *v0 = NULL; if (param1 < NELEMS(Unk_02100880)) { return &Unk_02100880[param1]; @@ -108,10 +106,10 @@ const BattleRegulation * sub_02026150 (SaveData * param0, int param1) return &v0->unk_00[0]; } -void sub_0202616C (SaveData * param0, int param1, Strbuf *param2, int param3) +void sub_0202616C(SaveData *param0, int param1, Strbuf *param2, int param3) { - MessageLoader * v0; - UnkStruct_02026030 * v1 = NULL; + MessageLoader *v0; + UnkStruct_02026030 *v1 = NULL; if (param1 < NELEMS(Unk_02100880)) { v0 = MessageLoader_Init(0, 26, 353, param3); @@ -122,12 +120,12 @@ void sub_0202616C (SaveData * param0, int param1, Strbuf *param2, int param3) } } -const BattleRegulation * sub_020261A8 (void) +const BattleRegulation *sub_020261A8(void) { return &Unk_02100860; } -int sub_020261B0 (const BattleRegulation * param0) +int sub_020261B0(const BattleRegulation *param0) { int v0; diff --git a/src/unk_020261E4.c b/src/unk_020261E4.c index 532195e689..9196c91c74 100644 --- a/src/unk_020261E4.c +++ b/src/unk_020261E4.c @@ -1,14 +1,12 @@ +#include "unk_020261E4.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0202818C.h" -#include "pokemon.h" -#include "savedata.h" -#include "unk_020261E4.h" #include "pokemon.h" +#include "savedata.h" typedef struct UnkStruct_02026224_t { UnkStruct_0202818C unk_00; @@ -30,12 +28,12 @@ typedef struct UnkStruct_02026310_t { u8 unk_DC; } UnkStruct_02026310; -int Daycare_SaveSize (void) +int Daycare_SaveSize(void) { return sizeof(UnkStruct_02026310); } -void Daycare_Init (UnkStruct_02026310 * param0) +void Daycare_Init(UnkStruct_02026310 *param0) { memset(param0, 0, sizeof(UnkStruct_02026310)); @@ -46,32 +44,32 @@ void Daycare_Init (UnkStruct_02026310 * param0) param0->unk_DC = 0; } -UnkStruct_02026218 * sub_02026218 (UnkStruct_02026310 * param0, int param1) +UnkStruct_02026218 *sub_02026218(UnkStruct_02026310 *param0, int param1) { return &(param0->unk_00[param1]); } -BoxPokemon * sub_02026220 (UnkStruct_02026218 * param0) +BoxPokemon *sub_02026220(UnkStruct_02026218 *param0) { return &(param0->unk_00); } -UnkStruct_02026224 * sub_02026224 (UnkStruct_02026218 * param0) +UnkStruct_02026224 *sub_02026224(UnkStruct_02026218 *param0) { return &(param0->unk_08); } -u32 sub_02026228 (const UnkStruct_02026218 * param0) +u32 sub_02026228(const UnkStruct_02026218 *param0) { return param0->unk_68; } -UnkStruct_0202818C * sub_02026230 (UnkStruct_02026224 * param0) +UnkStruct_0202818C *sub_02026230(UnkStruct_02026224 *param0) { return &(param0->unk_00); } -int sub_02026234 (const UnkStruct_02026310 * param0) +int sub_02026234(const UnkStruct_02026310 *param0) { if (param0->unk_D8 != 0) { return 1; @@ -80,37 +78,37 @@ int sub_02026234 (const UnkStruct_02026310 * param0) return 0; } -int sub_02026248 (const UnkStruct_02026310 * param0) +int sub_02026248(const UnkStruct_02026310 *param0) { return param0->unk_D8; } -int sub_02026250 (const UnkStruct_02026310 * param0) +int sub_02026250(const UnkStruct_02026310 *param0) { return param0->unk_DC; } -void sub_02026258 (UnkStruct_02026218 * param0, int param1) +void sub_02026258(UnkStruct_02026218 *param0, int param1) { param0->unk_68 = param1; } -void sub_02026260 (UnkStruct_02026218 * param0, int param1) +void sub_02026260(UnkStruct_02026218 *param0, int param1) { param0->unk_68 += param1; } -void sub_02026270 (UnkStruct_02026310 * param0, int param1) +void sub_02026270(UnkStruct_02026310 *param0, int param1) { param0->unk_D8 = param1; } -void sub_02026278 (UnkStruct_02026310 * param0, int param1) +void sub_02026278(UnkStruct_02026310 *param0, int param1) { param0->unk_DC = param1; } -BOOL sub_02026280 (UnkStruct_02026310 * param0) +BOOL sub_02026280(UnkStruct_02026310 *param0) { int v0, v1; @@ -124,12 +122,12 @@ BOOL sub_02026280 (UnkStruct_02026310 * param0) return 0; } -void sub_020262A8 (UnkStruct_02026218 * param0, const UnkStruct_02026218 * param1) +void sub_020262A8(UnkStruct_02026218 *param0, const UnkStruct_02026218 *param1) { *param0 = *param1; } -void sub_020262C0 (UnkStruct_02026224 * param0) +void sub_020262C0(UnkStruct_02026224 *param0) { int v0; @@ -145,16 +143,16 @@ void sub_020262C0 (UnkStruct_02026224 * param0) param0->unk_48[0] = 0xffff; } -void sub_020262F4 (UnkStruct_02026218 * param0) +void sub_020262F4(UnkStruct_02026218 *param0) { BoxPokemon_Init(¶m0->unk_00); param0->unk_68 = 0; sub_020262C0(¶m0->unk_08); } -UnkStruct_02026310 * sub_02026310 (SaveData * param0) +UnkStruct_02026310 *sub_02026310(SaveData *param0) { - UnkStruct_02026310 * v0; + UnkStruct_02026310 *v0; v0 = SaveData_SaveTable(param0, 8); return v0; diff --git a/src/unk_0202631C.c b/src/unk_0202631C.c index 9df4235c14..3ed47e0d67 100644 --- a/src/unk_0202631C.c +++ b/src/unk_0202631C.c @@ -1,16 +1,14 @@ +#include "unk_0202631C.h" + #include #include -#include "inlines.h" - -#include "pokemon.h" -#include "savedata.h" +#include "constants/species.h" #include "heap.h" -#include "savedata.h" -#include "unk_0202631C.h" +#include "inlines.h" #include "pokemon.h" -#include "constants/species.h" +#include "savedata.h" #include "unk_020986CC.h" // These u32[16] arrays store pokedex seen/caught info as bit flags @@ -18,7 +16,7 @@ // ReadBit and WriteBit may need to be changed as well, to handle a larger range of bits #define UNOWN_COUNT 28 -#define BYTE_SLOTS 16 +#define BYTE_SLOTS 16 typedef struct PokedexData { u32 magic; @@ -42,14 +40,14 @@ typedef struct PokedexData { u16 unk_322; } PokedexData; -int Pokedex_SaveSize (void) +int Pokedex_SaveSize(void) { return sizeof(PokedexData); } -PokedexData * sub_02026324 (u32 param0) +PokedexData *sub_02026324(u32 param0) { - PokedexData * v0; + PokedexData *v0; v0 = Heap_AllocFromHeap(param0, sizeof(PokedexData)); Pokedex_Init(v0); @@ -57,17 +55,17 @@ PokedexData * sub_02026324 (u32 param0) return v0; } -void sub_02026338 (const PokedexData * param0, PokedexData * param1) +void sub_02026338(const PokedexData *param0, PokedexData *param1) { MI_CpuCopy8(param0, param1, sizeof(PokedexData)); } -static inline void CheckPokedexIntegrity (const PokedexData * param0) +static inline void CheckPokedexIntegrity(const PokedexData *param0) { GF_ASSERT(param0->magic == 3203386110); } -static BOOL sub_02026344 (u16 param0) +static BOOL sub_02026344(u16 param0) { if ((param0 == 0) || (param0 > NATIONAL_DEX_COUNT)) { GF_ASSERT(0); @@ -77,19 +75,19 @@ static BOOL sub_02026344 (u16 param0) } } -static inline BOOL ReadBit (const u8 * array, u16 bitNumber) +static inline BOOL ReadBit(const u8 *array, u16 bitNumber) { bitNumber--; return 0 != (array[bitNumber >> 3] & (1 << (bitNumber & 7))); } -static inline void WriteBit (u8 * array, u16 bitNumber) +static inline void WriteBit(u8 *array, u16 bitNumber) { bitNumber--; array[bitNumber >> 3] |= 1 << (bitNumber & 7); } -static inline void inline_02026360 (u8 * param0, u8 param1, u16 param2) +static inline void inline_02026360(u8 *param0, u8 param1, u16 param2) { GF_ASSERT(param1 < 2); @@ -99,12 +97,12 @@ static inline void inline_02026360 (u8 * param0, u8 param1, u16 param2) param0[param2 >> 3] |= param1 << (param2 & 7); } -static inline u32 inline_020266F8 (const u8 * param0, u16 param1) +static inline u32 inline_020266F8(const u8 *param0, u16 param1) { return (param0[param1 >> 2] >> ((param1 & 3) * 2)) & 0x3; } -static inline void inline_020267B8 (u8 * param0, u8 param1, u16 param2) +static inline void inline_020267B8(u8 *param0, u8 param1, u16 param2) { GF_ASSERT(param1 < 4); @@ -112,17 +110,17 @@ static inline void inline_020267B8 (u8 * param0, u8 param1, u16 param2) param0[param2 >> 2] |= param1 << ((param2 & 3) * 2); } -static inline void inline_0202736C (PokedexData * param0, u16 param1) +static inline void inline_0202736C(PokedexData *param0, u16 param1) { WriteBit((u8 *)param0->seenPokemon, param1); } -static inline void inline_sub_0202736C_1 (PokedexData * param0, u16 param1) +static inline void inline_sub_0202736C_1(PokedexData *param0, u16 param1) { WriteBit((u8 *)param0->caughtPokemon, param1); } -static void sub_02026360 (PokedexData * param0, u8 param1, u8 param2, u16 param3) +static void sub_02026360(PokedexData *param0, u8 param1, u8 param2, u16 param3) { if (param2 == 0) { inline_02026360((u8 *)param0->recordedGenders[1], param1, param3); @@ -131,7 +129,7 @@ static void sub_02026360 (PokedexData * param0, u8 param1, u8 param2, u16 param3 inline_02026360((u8 *)param0->recordedGenders[param2], param1, param3); } -static void sub_020263D8 (PokedexData * param0, u8 param1, u8 param2, u16 param3) +static void sub_020263D8(PokedexData *param0, u8 param1, u8 param2, u16 param3) { GF_ASSERT(param1 <= 2); @@ -142,29 +140,29 @@ static void sub_020263D8 (PokedexData * param0, u8 param1, u8 param2, u16 param3 sub_02026360(param0, param1, param2, param3); } -static inline BOOL inline_02026FE8 (const PokedexData * param0, u16 param1) +static inline BOOL inline_02026FE8(const PokedexData *param0, u16 param1) { return ReadBit((const u8 *)param0->seenPokemon, param1); } -static inline BOOL inline_02026F9C (const PokedexData * param0, u16 param1) +static inline BOOL inline_02026F9C(const PokedexData *param0, u16 param1) { return ReadBit((const u8 *)param0->caughtPokemon, param1); } -static inline u8 inline_02026BAC (const PokedexData * param0, u16 param1, u8 param2) +static inline u8 inline_02026BAC(const PokedexData *param0, u16 param1, u8 param2) { return ReadBit((const u8 *)param0->recordedGenders[param2], param1); } -static inline void inline_0202736C_1 (PokedexData * param0, u16 param1, u32 param2) +static inline void inline_0202736C_1(PokedexData *param0, u16 param1, u32 param2) { if (param1 == 327) { param0->unk_104 = param2; } } -static int sub_02026400 (const PokedexData * param0) +static int sub_02026400(const PokedexData *param0) { int v0; @@ -177,7 +175,7 @@ static int sub_02026400 (const PokedexData * param0) return v0; } -static BOOL sub_02026418 (const PokedexData * param0, u8 param1) +static BOOL sub_02026418(const PokedexData *param0, u8 param1) { int v0; @@ -190,7 +188,7 @@ static BOOL sub_02026418 (const PokedexData * param0, u8 param1) return 0; } -static void sub_0202643C (PokedexData * param0, int param1) +static void sub_0202643C(PokedexData *param0, int param1) { int v0; @@ -205,11 +203,11 @@ static void sub_0202643C (PokedexData * param0, int param1) } } -static int sub_02026464 (const PokedexData * param0, u32 param1) +static int sub_02026464(const PokedexData *param0, u32 param1) { u32 v0; u32 v1; - const u8 * v2; + const u8 *v2; GF_ASSERT((param1 == 422) || (param1 == 423) || (param1 == 492) || (param1 == 487)); @@ -242,12 +240,12 @@ static int sub_02026464 (const PokedexData * param0, u32 param1) return 2; } -static BOOL sub_02026514 (const PokedexData * param0, u32 param1, u8 param2) +static BOOL sub_02026514(const PokedexData *param0, u32 param1, u8 param2) { u32 v0; u32 v1; u32 v2; - const u8 * v3; + const u8 *v3; GF_ASSERT((param1 == 422) || (param1 == 423) || (param1 == 492) || (param1 == 487)); @@ -283,10 +281,10 @@ static BOOL sub_02026514 (const PokedexData * param0, u32 param1, u8 param2) return 0; } -static void sub_020265E8 (PokedexData * param0, u32 param1, int param2) +static void sub_020265E8(PokedexData *param0, u32 param1, int param2) { int v0; - u8 * v1; + u8 *v1; GF_ASSERT((param1 == 422) || (param1 == 423) || (param1 == 492) || (param1 == 487)); @@ -320,11 +318,11 @@ static void sub_020265E8 (PokedexData * param0, u32 param1, int param2) } } -static int sub_020266F8 (const PokedexData * param0, u32 param1) +static int sub_020266F8(const PokedexData *param0, u32 param1) { u32 v0; int v1; - const u8 * v2; + const u8 *v2; GF_ASSERT((param1 == 412) || (param1 == 413)); @@ -349,11 +347,11 @@ static int sub_020266F8 (const PokedexData * param0, u32 param1) return v1; } -static BOOL sub_02026754 (const PokedexData * param0, u32 param1, u8 param2) +static BOOL sub_02026754(const PokedexData *param0, u32 param1, u8 param2) { u32 v0; int v1; - const u8 * v2; + const u8 *v2; GF_ASSERT((param1 == 412) || (param1 == 413)); @@ -378,10 +376,10 @@ static BOOL sub_02026754 (const PokedexData * param0, u32 param1, u8 param2) return 0; } -static void sub_020267B8 (PokedexData * param0, u32 param1, int param2) +static void sub_020267B8(PokedexData *param0, u32 param1, int param2) { int v0; - u8 * v1; + u8 *v1; GF_ASSERT((param1 == 412) || (param1 == 413)); @@ -402,7 +400,7 @@ static void sub_020267B8 (PokedexData * param0, u32 param1, int param2) } } -static void sub_02026834 (u32 * param0, u8 param1, u8 param2) +static void sub_02026834(u32 *param0, u8 param1, u8 param2) { u32 v0 = (24 + (param2 * 4)); u32 v1 = ~(15 << v0); @@ -411,7 +409,7 @@ static void sub_02026834 (u32 * param0, u8 param1, u8 param2) param0[16 - 1] |= (param1 << v0); } -static void sub_02026850 (PokedexData * param0, u8 param1, u8 param2) +static void sub_02026850(PokedexData *param0, u8 param1, u8 param2) { GF_ASSERT(param2 < 4); GF_ASSERT(param1 <= 15); @@ -423,7 +421,7 @@ static void sub_02026850 (PokedexData * param0, u8 param1, u8 param2) } } -static inline u32 inline_0202688C (const u32 * param0, u8 param1) +static inline u32 inline_0202688C(const u32 *param0, u8 param1) { u32 v0 = (24 + (param1 * 4)); u32 v1 = (param0[16 - 1] >> v0) & 15; @@ -431,7 +429,7 @@ static inline u32 inline_0202688C (const u32 * param0, u8 param1) return v1; } -static u32 sub_0202688C (const PokedexData * param0, u8 param1) +static u32 sub_0202688C(const PokedexData *param0, u8 param1) { u32 v0; @@ -444,7 +442,7 @@ static u32 sub_0202688C (const PokedexData * param0, u8 param1) return v0; } -static u32 sub_020268B8 (const PokedexData * param0) +static u32 sub_020268B8(const PokedexData *param0) { int v0; @@ -457,7 +455,7 @@ static u32 sub_020268B8 (const PokedexData * param0) return v0; } -static BOOL sub_020268D8 (const PokedexData * param0, u32 param1) +static BOOL sub_020268D8(const PokedexData *param0, u32 param1) { int v0; @@ -470,7 +468,7 @@ static BOOL sub_020268D8 (const PokedexData * param0, u32 param1) return 0; } -static void sub_020268FC (PokedexData * param0, u16 param1, Pokemon * param2) +static void sub_020268FC(PokedexData *param0, u16 param1, Pokemon *param2) { u8 v0 = Pokemon_GetValue(param2, MON_DATA_FORM, NULL); u32 v1; @@ -483,7 +481,7 @@ static void sub_020268FC (PokedexData * param0, u16 param1, Pokemon * param2) } } -static void sub_0202693C (PokedexData * param0) +static void sub_0202693C(PokedexData *param0) { int v0; @@ -492,12 +490,12 @@ static void sub_0202693C (PokedexData * param0) } } -static inline u32 inline_02026958 (u32 param0, u32 param1) +static inline u32 inline_02026958(u32 param0, u32 param1) { return (param0 >> (param1 * 3)) & 0x7; } -static inline void inline_02026A00 (u32 * param0, u32 param1, u32 param2) +static inline void inline_02026A00(u32 *param0, u32 param1, u32 param2) { GF_ASSERT(param2 < 0x7); @@ -505,7 +503,7 @@ static inline void inline_02026A00 (u32 * param0, u32 param1, u32 param2) (*param0) |= (param2 << (param1 * 3)); } -static int sub_02026958 (const PokedexData * param0, u32 param1) +static int sub_02026958(const PokedexData *param0, u32 param1) { u32 v0; int v1, v2; @@ -531,13 +529,13 @@ static int sub_02026958 (const PokedexData * param0, u32 param1) return v2; } -static BOOL sub_020269A4 (const PokedexData * param0, u32 param1, u8 param2) +static BOOL sub_020269A4(const PokedexData *param0, u32 param1, u8 param2) { int v0; u32 v1; u32 v2; - GF_ASSERT((param1 == 479)); + GF_ASSERT(param1 == 479); if (sub_02026FE8(param0, param1) == 0) { return 0; @@ -556,11 +554,11 @@ static BOOL sub_020269A4 (const PokedexData * param0, u32 param1, u8 param2) return 0; } -static void sub_02026A00 (PokedexData * param0, u32 param1, int param2) +static void sub_02026A00(PokedexData *param0, u32 param1, int param2) { int v0; - GF_ASSERT((param1 == 479)); + GF_ASSERT(param1 == 479); if (sub_020269A4(param0, param1, param2)) { return; @@ -573,7 +571,7 @@ static void sub_02026A00 (PokedexData * param0, u32 param1, int param2) } } -static void sub_02026A60 (PokedexData * param0, u16 param1, Pokemon * param2) +static void sub_02026A60(PokedexData *param0, u16 param1, Pokemon *param2) { int v0; @@ -618,7 +616,7 @@ static void sub_02026A60 (PokedexData * param0, u16 param1, Pokemon * param2) } } -static void sub_02026B88 (PokedexData * param0, u16 param1, u32 param2) +static void sub_02026B88(PokedexData *param0, u16 param1, u32 param2) { int v0; int v1; @@ -633,7 +631,7 @@ static void sub_02026B88 (PokedexData * param0, u16 param1, u32 param2) param0->recordedLanguages[v0] |= 1 << v1; } -static u32 sub_02026BAC (const PokedexData * param0, u16 param1, int param2) +static u32 sub_02026BAC(const PokedexData *param0, u16 param1, int param2) { u32 v0, v1; u32 v2; @@ -663,14 +661,14 @@ static u32 sub_02026BAC (const PokedexData * param0, u16 param1, int param2) return v2; } -static inline int inline_020270AC (const PokedexData * param0, int param1) +static inline int inline_020270AC(const PokedexData *param0, int param1) { return param0->unk_10C[param1]; } -static int sub_02026C24 (const PokedexData * param0, u32 param1, int param2) +static int sub_02026C24(const PokedexData *param0, u32 param1, int param2) { - const u8 * v0; + const u8 *v0; GF_ASSERT((param1 == 422) || (param1 == 423) || (param1 == 492) || (param1 == 487)); GF_ASSERT(param2 < 2); @@ -693,17 +691,17 @@ static int sub_02026C24 (const PokedexData * param0, u32 param1, int param2) return ReadBit(v0, param2 + 1); } -static int sub_02026CCC (const PokedexData * param0, u32 param1, int param2) +static int sub_02026CCC(const PokedexData *param0, u32 param1, int param2) { - GF_ASSERT((param1 == 479)); + GF_ASSERT(param1 == 479); GF_ASSERT(param2 < 6); return inline_02026958(param0->unk_31C, param2); } -static int sub_02026CFC (const PokedexData * param0, u32 param1, int param2) +static int sub_02026CFC(const PokedexData *param0, u32 param1, int param2) { - const u8 * v0; + const u8 *v0; GF_ASSERT((param1 == 412) || (param1 == 413)); GF_ASSERT(param2 < 3); @@ -717,7 +715,7 @@ static int sub_02026CFC (const PokedexData * param0, u32 param1, int param2) return inline_020266F8(v0, param2); } -static BOOL sub_02026D44 (u16 param0) +static BOOL sub_02026D44(u16 param0) { int v0; BOOL v1; @@ -746,12 +744,12 @@ static BOOL sub_02026D44 (u16 param0) return v1; } -static BOOL sub_02026D68 (u16 param0) +static BOOL sub_02026D68(u16 param0) { return 1; } -void Pokedex_Init (PokedexData * param0) +void Pokedex_Init(PokedexData *param0) { memset(param0, 0, sizeof(PokedexData)); @@ -771,7 +769,7 @@ void Pokedex_Init (PokedexData * param0) sub_0202693C(param0); } -u16 sub_02026DD0 (const PokedexData * param0) +u16 sub_02026DD0(const PokedexData *param0) { int v0; int v1; @@ -788,7 +786,7 @@ u16 sub_02026DD0 (const PokedexData * param0) return v1; } -u16 sub_02026E0C (const PokedexData * param0) +u16 sub_02026E0C(const PokedexData *param0) { int v0; int v1; @@ -805,7 +803,7 @@ u16 sub_02026E0C (const PokedexData * param0) return v1; } -u16 sub_02026E48 (const PokedexData * param0) +u16 sub_02026E48(const PokedexData *param0) { if (sub_02027474(param0)) { return sub_02026E0C(param0); @@ -814,7 +812,7 @@ u16 sub_02026E48 (const PokedexData * param0) return sub_02026EAC(param0); } -u16 sub_02026E64 (const PokedexData * param0) +u16 sub_02026E64(const PokedexData *param0) { int v0; int v1; @@ -833,7 +831,7 @@ u16 sub_02026E64 (const PokedexData * param0) return v1; } -u16 sub_02026EAC (const PokedexData * param0) +u16 sub_02026EAC(const PokedexData *param0) { int v0; int v1; @@ -852,7 +850,7 @@ u16 sub_02026EAC (const PokedexData * param0) return v1; } -BOOL sub_02026EF4 (const PokedexData * param0) +BOOL sub_02026EF4(const PokedexData *param0) { u16 v0; @@ -865,7 +863,7 @@ BOOL sub_02026EF4 (const PokedexData * param0) return 0; } -BOOL sub_02026F0C (const PokedexData * param0) +BOOL sub_02026F0C(const PokedexData *param0) { u16 v0; @@ -878,7 +876,7 @@ BOOL sub_02026F0C (const PokedexData * param0) return 0; } -u16 sub_02026F20 (const PokedexData * param0) +u16 sub_02026F20(const PokedexData *param0) { int v0; u16 v1; @@ -896,7 +894,7 @@ u16 sub_02026F20 (const PokedexData * param0) return v1; } -u16 sub_02026F58 (const PokedexData * param0) +u16 sub_02026F58(const PokedexData *param0) { int v0; u16 v1; @@ -919,7 +917,7 @@ u16 sub_02026F58 (const PokedexData * param0) return v1; } -BOOL Pokedex_CaughtSpecies (const PokedexData * param0, u16 param1) +BOOL Pokedex_CaughtSpecies(const PokedexData *param0, u16 param1) { CheckPokedexIntegrity(param0); @@ -934,7 +932,7 @@ BOOL Pokedex_CaughtSpecies (const PokedexData * param0, u16 param1) } } -BOOL sub_02026FE8 (const PokedexData * param0, u16 param1) +BOOL sub_02026FE8(const PokedexData *param0, u16 param1) { CheckPokedexIntegrity(param0); @@ -945,7 +943,7 @@ BOOL sub_02026FE8 (const PokedexData * param0, u16 param1) return inline_02026FE8(param0, param1); } -u32 sub_0202702C (const PokedexData * param0, u8 param1) +u32 sub_0202702C(const PokedexData *param0, u8 param1) { u32 v0; @@ -963,7 +961,7 @@ u32 sub_0202702C (const PokedexData * param0, u8 param1) return v0; } -u32 sub_02027058 (const PokedexData * param0, u16 param1, int param2) +u32 sub_02027058(const PokedexData *param0, u16 param1, int param2) { CheckPokedexIntegrity(param0); @@ -978,7 +976,7 @@ u32 sub_02027058 (const PokedexData * param0, u16 param1, int param2) return sub_02026BAC(param0, param1, param2); } -u32 sub_020270AC (const PokedexData * param0, int param1) +u32 sub_020270AC(const PokedexData *param0, int param1) { CheckPokedexIntegrity(param0); @@ -989,13 +987,13 @@ u32 sub_020270AC (const PokedexData * param0, int param1) return inline_020270AC(param0, param1); } -u32 sub_020270DC (const PokedexData * param0) +u32 sub_020270DC(const PokedexData *param0) { CheckPokedexIntegrity(param0); return sub_02026400(param0); } -u32 sub_020270F8 (const PokedexData * param0, int param1) +u32 sub_020270F8(const PokedexData *param0, int param1) { CheckPokedexIntegrity(param0); @@ -1006,13 +1004,13 @@ u32 sub_020270F8 (const PokedexData * param0, int param1) return sub_02026C24(param0, 422, param1); } -u32 sub_02027130 (const PokedexData * param0) +u32 sub_02027130(const PokedexData *param0) { CheckPokedexIntegrity(param0); return sub_02026464(param0, 422); } -u32 sub_02027154 (const PokedexData * param0, int param1) +u32 sub_02027154(const PokedexData *param0, int param1) { CheckPokedexIntegrity(param0); @@ -1023,13 +1021,13 @@ u32 sub_02027154 (const PokedexData * param0, int param1) return sub_02026C24(param0, 423, param1); } -u32 sub_0202718C (const PokedexData * param0) +u32 sub_0202718C(const PokedexData *param0) { CheckPokedexIntegrity(param0); return sub_02026464(param0, 423); } -u32 sub_020271B0 (const PokedexData * param0, int param1) +u32 sub_020271B0(const PokedexData *param0, int param1) { CheckPokedexIntegrity(param0); @@ -1040,13 +1038,13 @@ u32 sub_020271B0 (const PokedexData * param0, int param1) return sub_02026CFC(param0, 412, param1); } -u32 sub_020271E8 (const PokedexData * param0) +u32 sub_020271E8(const PokedexData *param0) { CheckPokedexIntegrity(param0); return sub_020266F8(param0, 412); } -u32 sub_02027208 (const PokedexData * param0, int param1) +u32 sub_02027208(const PokedexData *param0, int param1) { CheckPokedexIntegrity(param0); @@ -1057,25 +1055,25 @@ u32 sub_02027208 (const PokedexData * param0, int param1) return sub_02026CFC(param0, 413, param1); } -u32 sub_02027240 (const PokedexData * param0) +u32 sub_02027240(const PokedexData *param0) { CheckPokedexIntegrity(param0); return sub_020266F8(param0, 413); } -u32 sub_02027264 (const PokedexData * param0, int param1) +u32 sub_02027264(const PokedexData *param0, int param1) { CheckPokedexIntegrity(param0); return sub_0202688C(param0, param1); } -u32 sub_02027288 (const PokedexData * param0) +u32 sub_02027288(const PokedexData *param0) { CheckPokedexIntegrity(param0); return sub_020268B8(param0); } -void sub_020272A4 (PokedexData * param0, Pokemon * pokemon) +void sub_020272A4(PokedexData *param0, Pokemon *pokemon) { u16 v0 = Pokemon_GetValue(pokemon, MON_DATA_SPECIES, NULL); u32 v1 = Pokemon_GetValue(pokemon, MON_DATA_PERSONALITY, NULL); @@ -1103,7 +1101,7 @@ void sub_020272A4 (PokedexData * param0, Pokemon * pokemon) inline_0202736C(param0, v0); } -void sub_0202736C (PokedexData * param0, Pokemon * param1) +void sub_0202736C(PokedexData *param0, Pokemon *param1) { u16 v0 = Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL); u32 v1 = Pokemon_GetValue(param1, MON_DATA_LANGUAGE, NULL); @@ -1135,31 +1133,31 @@ void sub_0202736C (PokedexData * param0, Pokemon * param1) inline_0202736C(param0, v0); } -void sub_02027454 (PokedexData * param0) +void sub_02027454(PokedexData *param0) { CheckPokedexIntegrity(param0); param0->nationalDexObtained = 1; } -BOOL sub_02027474 (const PokedexData * param0) +BOOL sub_02027474(const PokedexData *param0) { CheckPokedexIntegrity(param0); return param0->nationalDexObtained; } -BOOL sub_02027494 (const PokedexData * param0) +BOOL sub_02027494(const PokedexData *param0) { CheckPokedexIntegrity(param0); return param0->canDetectForms; } -void sub_020274B0 (PokedexData * param0) +void sub_020274B0(PokedexData *param0) { CheckPokedexIntegrity(param0); param0->canDetectForms = 1; } -BOOL sub_020274D0 (const PokedexData * param0, u16 param1, u32 param2) +BOOL sub_020274D0(const PokedexData *param0, u16 param1, u32 param2) { int v0; @@ -1173,37 +1171,37 @@ BOOL sub_020274D0 (const PokedexData * param0, u16 param1, u32 param2) return param0->recordedLanguages[v0] & (1 << param2); } -void sub_02027508 (PokedexData * param0) +void sub_02027508(PokedexData *param0) { param0->unk_319 = 1; } -BOOL sub_02027514 (const PokedexData * param0) +BOOL sub_02027514(const PokedexData *param0) { return param0->unk_319; } -BOOL sub_02027520 (const PokedexData * param0) +BOOL sub_02027520(const PokedexData *param0) { CheckPokedexIntegrity(param0); return param0->pokedexObtained; } -void sub_02027540 (PokedexData * param0) +void sub_02027540(PokedexData *param0) { CheckPokedexIntegrity(param0); param0->pokedexObtained = 1; } -PokedexData * SaveData_Pokedex (SaveData * param0) +PokedexData *SaveData_Pokedex(SaveData *param0) { - PokedexData * v0; + PokedexData *v0; v0 = SaveData_SaveTable(param0, 7); return v0; } -u32 sub_0202756C (const PokedexData * param0, int param1, int param2) +u32 sub_0202756C(const PokedexData *param0, int param1, int param2) { CheckPokedexIntegrity(param0); @@ -1260,7 +1258,7 @@ u32 sub_0202756C (const PokedexData * param0, int param1, int param2) return 0; } -u32 sub_020276C8 (const PokedexData *pokedex, int species) +u32 sub_020276C8(const PokedexData *pokedex, int species) { CheckPokedexIntegrity(pokedex); diff --git a/src/unk_02027B70.c b/src/unk_02027B70.c index 2ba8b944ef..e05464f108 100644 --- a/src/unk_02027B70.c +++ b/src/unk_02027B70.c @@ -1,20 +1,20 @@ +#include "unk_02027B70.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_berry_data_decl.h" - #include "struct_defs/struct_02027854.h" #include "struct_defs/struct_02027BF4.h" -#include "heap.h" -#include "unk_02027B70.h" #include "berry_data.h" +#include "heap.h" -static void sub_02027C50(UnkStruct_02027854 * param0); -static int sub_02027C7C(const UnkStruct_02027BF4 * param0, int param1, int param2); +static void sub_02027C50(UnkStruct_02027854 *param0); +static int sub_02027C7C(const UnkStruct_02027BF4 *param0, int param1, int param2); -void sub_02027B70 (UnkStruct_02027854 * param0) +void sub_02027B70(UnkStruct_02027854 *param0) { int v0; @@ -26,10 +26,10 @@ void sub_02027B70 (UnkStruct_02027854 * param0) } } -void sub_02027B90 (UnkStruct_02027854 * param0, int param1, const u16 * param2, int param3) +void sub_02027B90(UnkStruct_02027854 *param0, int param1, const u16 *param2, int param3) { int v0; - UnkStruct_02027BF4 * v1 = sub_02027BF4(param1); + UnkStruct_02027BF4 *v1 = sub_02027BF4(param1); for (v0 = 0; v0 < 128 || v0 < param3; v0++) { sub_02027C50(¶m0[v0]); @@ -44,12 +44,12 @@ void sub_02027B90 (UnkStruct_02027854 * param0, int param1, const u16 * param2, Heap_FreeToHeap(v1); } -UnkStruct_02027BF4 * sub_02027BF4 (int param0) +UnkStruct_02027BF4 *sub_02027BF4(int param0) { int v0; - UnkStruct_02027BF4 * v1; - BerryData * v2; - NARC * v3; + UnkStruct_02027BF4 *v1; + BerryData *v2; + NARC *v3; v3 = BerryData_NARC_ctor(param0); v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02027BF4) * 64); @@ -68,7 +68,7 @@ UnkStruct_02027BF4 * sub_02027BF4 (int param0) return v1; } -static void sub_02027C50 (UnkStruct_02027854 * param0) +static void sub_02027C50(UnkStruct_02027854 *param0) { param0->unk_00 = 0; param0->unk_01 = 0; @@ -82,12 +82,12 @@ static void sub_02027C50 (UnkStruct_02027854 * param0) param0->unk_0D = 0; } -static int sub_02027C68 (UnkStruct_02027854 * param0, const UnkStruct_02027BF4 * param1) +static int sub_02027C68(UnkStruct_02027854 *param0, const UnkStruct_02027BF4 *param1) { return param1[param0->unk_00 - 1].unk_02 * param0->unk_0B; } -static int sub_02027C7C (const UnkStruct_02027BF4 * param0, int param1, int param2) +static int sub_02027C7C(const UnkStruct_02027BF4 *param0, int param1, int param2) { int v0; @@ -102,7 +102,7 @@ static int sub_02027C7C (const UnkStruct_02027BF4 * param0, int param1, int para return v0; } -static int sub_02027CA8 (const UnkStruct_02027BF4 * param0, int param1, int param2) +static int sub_02027CA8(const UnkStruct_02027BF4 *param0, int param1, int param2) { int v0 = param0[param1 - 1].unk_01; @@ -115,7 +115,7 @@ static int sub_02027CA8 (const UnkStruct_02027BF4 * param0, int param1, int para } } -static int sub_02027CCC (const UnkStruct_02027854 * param0) +static int sub_02027CCC(const UnkStruct_02027854 *param0) { if (param0->unk_0C == 3) { return 4 + 2; @@ -124,7 +124,7 @@ static int sub_02027CCC (const UnkStruct_02027854 * param0) } } -static int sub_02027CDC (const UnkStruct_02027854 * param0) +static int sub_02027CDC(const UnkStruct_02027854 *param0) { if (param0->unk_0C == 4) { return 10 + 5; @@ -133,22 +133,22 @@ static int sub_02027CDC (const UnkStruct_02027854 * param0) } } -static int sub_02027CEC (UnkStruct_02027854 * param0) +static int sub_02027CEC(UnkStruct_02027854 *param0) { return 1 + (1 + 1 + 1 + sub_02027CCC(param0)) * sub_02027CDC(param0); } -int sub_02027D04 (const UnkStruct_02027854 * param0, int param1) +int sub_02027D04(const UnkStruct_02027854 *param0, int param1) { return param0[param1].unk_01; } -int sub_02027D10 (const UnkStruct_02027854 * param0, int param1) +int sub_02027D10(const UnkStruct_02027854 *param0, int param1) { return param0[param1].unk_00; } -int sub_02027D18 (const UnkStruct_02027854 * param0, int param1) +int sub_02027D18(const UnkStruct_02027854 *param0, int param1) { int v0; @@ -163,12 +163,12 @@ int sub_02027D18 (const UnkStruct_02027854 * param0, int param1) } } -int sub_02027D34 (const UnkStruct_02027854 * param0, int param1) +int sub_02027D34(const UnkStruct_02027854 *param0, int param1) { return param0[param1].unk_0B; } -void sub_02027D40 (UnkStruct_02027854 * param0, int param1, const UnkStruct_02027BF4 * param2, int param3) +void sub_02027D40(UnkStruct_02027854 *param0, int param1, const UnkStruct_02027BF4 *param2, int param3) { param0[param1].unk_00 = param3; param0[param1].unk_01 = 1; @@ -181,37 +181,37 @@ void sub_02027D40 (UnkStruct_02027854 * param0, int param1, const UnkStruct_0202 param0[param1].unk_0D = 1; } -void sub_02027D78 (UnkStruct_02027854 * param0, int param1) +void sub_02027D78(UnkStruct_02027854 *param0, int param1) { param0[param1].unk_0A = 100; } -BOOL sub_02027D84 (const UnkStruct_02027854 * param0, int param1) +BOOL sub_02027D84(const UnkStruct_02027854 *param0, int param1) { return param0[param1].unk_0D; } -void sub_02027D90 (UnkStruct_02027854 * param0, int param1, BOOL param2) +void sub_02027D90(UnkStruct_02027854 *param0, int param1, BOOL param2) { param0[param1].unk_0D = param2; } -int sub_02027D9C (const UnkStruct_02027854 * param0, int param1) +int sub_02027D9C(const UnkStruct_02027854 *param0, int param1) { return param0[param1].unk_0C; } -void sub_02027DA8 (UnkStruct_02027854 * param0, int param1, int param2) +void sub_02027DA8(UnkStruct_02027854 *param0, int param1, int param2) { param0[param1].unk_0C = param2; } -int sub_02027DB4 (const UnkStruct_02027854 * param0, int param1) +int sub_02027DB4(const UnkStruct_02027854 *param0, int param1) { return param0[param1].unk_08; } -int sub_02027DC0 (UnkStruct_02027854 * param0, int param1) +int sub_02027DC0(UnkStruct_02027854 *param0, int param1) { int v0; @@ -221,7 +221,7 @@ int sub_02027DC0 (UnkStruct_02027854 * param0, int param1) return v0; } -static void sub_02027DD4 (UnkStruct_02027854 * param0, const UnkStruct_02027BF4 * param1) +static void sub_02027DD4(UnkStruct_02027854 *param0, const UnkStruct_02027BF4 *param1) { switch (param0->unk_01) { case 0: @@ -254,7 +254,7 @@ static void sub_02027DD4 (UnkStruct_02027854 * param0, const UnkStruct_02027BF4 } } -static void sub_02027E40 (UnkStruct_02027854 * param0, const UnkStruct_02027BF4 * param1, int param2) +static void sub_02027E40(UnkStruct_02027854 *param0, const UnkStruct_02027BF4 *param1, int param2) { int v0; int v1; @@ -292,11 +292,11 @@ static void sub_02027E40 (UnkStruct_02027854 * param0, const UnkStruct_02027BF4 } } -void sub_02027EAC (UnkStruct_02027854 * param0, const UnkStruct_02027BF4 * param1, int param2) +void sub_02027EAC(UnkStruct_02027854 *param0, const UnkStruct_02027BF4 *param1, int param2) { int v0; s32 v1; - UnkStruct_02027854 * v2; + UnkStruct_02027854 *v2; for (v0 = 0; v0 < 128; v0++) { v2 = ¶m0[v0]; diff --git a/src/unk_02027F50.c b/src/unk_02027F50.c index 8a96ccb1c5..21ba1aaafd 100644 --- a/src/unk_02027F50.c +++ b/src/unk_02027F50.c @@ -1,16 +1,16 @@ +#include "unk_02027F50.h" + #include #include #include "struct_defs/struct_02027860.h" -#include "unk_02027F50.h" - -void sub_02027F50 (UnkStruct_02027860 * param0) +void sub_02027F50(UnkStruct_02027860 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_02027860)); } -void * sub_02027F5C (UnkStruct_02027860 * param0, int param1) +void *sub_02027F5C(UnkStruct_02027860 *param0, int param1) { sub_02027F50(param0); param0->unk_00 = param1; @@ -18,13 +18,13 @@ void * sub_02027F5C (UnkStruct_02027860 * param0, int param1) return param0->unk_04; } -void * sub_02027F6C (UnkStruct_02027860 * param0, int param1) +void *sub_02027F6C(UnkStruct_02027860 *param0, int param1) { GF_ASSERT(param0->unk_00 == param1); return param0->unk_04; } -int sub_02027F80 (const UnkStruct_02027860 * param0) +int sub_02027F80(const UnkStruct_02027860 *param0) { return param0->unk_00; } diff --git a/src/unk_02027F84.c b/src/unk_02027F84.c index b5751477e5..7f64d73fce 100644 --- a/src/unk_02027F84.c +++ b/src/unk_02027F84.c @@ -1,26 +1,25 @@ +#include "unk_02027F84.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_02027F8C.h" -#include "unk_020021B0.h" #include "heap.h" #include "savedata.h" -#include "unk_02027F84.h" +#include "unk_020021B0.h" -int PalPad_SaveSize (void) +int PalPad_SaveSize(void) { return sizeof(UnkStruct_02027F8C) * 16; } -UnkStruct_02027F8C * sub_02027F8C (SaveData * param0) +UnkStruct_02027F8C *sub_02027F8C(SaveData *param0) { return SaveData_SaveTable(param0, 9); } -void PalPad_Init (UnkStruct_02027F8C * param0) +void PalPad_Init(UnkStruct_02027F8C *param0) { int v0; @@ -30,17 +29,17 @@ void PalPad_Init (UnkStruct_02027F8C * param0) } } -const u16 * sub_02027FBC (const UnkStruct_02027F8C * param0, int param1) +const u16 *sub_02027FBC(const UnkStruct_02027F8C *param0, int param1) { return param0[param1].unk_00; } -u8 sub_02027FC4 (const UnkStruct_02027F8C * param0, int param1) +u8 sub_02027FC4(const UnkStruct_02027F8C *param0, int param1) { return param0->unk_68[param1]; } -BOOL sub_02027FCC (const UnkStruct_02027F8C * param0, const UnkStruct_02027F8C * param1) +BOOL sub_02027FCC(const UnkStruct_02027F8C *param0, const UnkStruct_02027F8C *param1) { if (0 == GF_strcmp(param0->unk_00, param1->unk_00)) { if (param0->unk_10 == param1->unk_10) { @@ -51,11 +50,11 @@ BOOL sub_02027FCC (const UnkStruct_02027F8C * param0, const UnkStruct_02027F8C * return 0; } -void sub_02027FEC (UnkStruct_02027F8C * param0, UnkStruct_02027F8C * param1, int param2, int param3) +void sub_02027FEC(UnkStruct_02027F8C *param0, UnkStruct_02027F8C *param1, int param2, int param3) { int v0, v1, v2; int v3[5]; - UnkStruct_02027F8C * v4; + UnkStruct_02027F8C *v4; v4 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_02027F8C) * 16); PalPad_Init(v4); @@ -97,7 +96,7 @@ void sub_02027FEC (UnkStruct_02027F8C * param0, UnkStruct_02027F8C * param1, int Heap_FreeToHeap(v4); } -int sub_020280E0 (UnkStruct_02027F8C * param0, u32 param1) +int sub_020280E0(UnkStruct_02027F8C *param0, u32 param1) { int v0, v1; diff --git a/src/unk_02028124.c b/src/unk_02028124.c index 3156504975..024df7ccab 100644 --- a/src/unk_02028124.c +++ b/src/unk_02028124.c @@ -1,28 +1,27 @@ +#include "unk_02028124.h" + #include #include #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - #include "struct_defs/sentence.h" #include "struct_defs/struct_0202818C.h" -#include "struct_defs/union_02028328.h" #include "struct_defs/struct_02028430.h" +#include "struct_defs/union_02028328.h" -#include "unk_020021B0.h" -#include "unk_02014A84.h" #include "heap.h" -#include "savedata.h" -#include "unk_02025E08.h" -#include "trainer_info.h" -#include "unk_02028124.h" +#include "party.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "party.h" +#include "savedata.h" +#include "trainer_info.h" +#include "unk_020021B0.h" +#include "unk_02014A84.h" +#include "unk_02025E08.h" -static int sub_020284E8(UnkStruct_0202818C * param0, int param1); -static int sub_02028510(UnkStruct_0202818C * param0, int param1); -static UnkStruct_0202818C * sub_02028538(UnkStruct_02028430 * param0, int param1, int param2); +static int sub_020284E8(UnkStruct_0202818C *param0, int param1); +static int sub_02028510(UnkStruct_0202818C *param0, int param1); +static UnkStruct_0202818C *sub_02028538(UnkStruct_02028430 *param0, int param1, int param2); static const struct { u16 unk_00; @@ -31,16 +30,16 @@ static const struct { u8 unk_06; u8 unk_07; } Unk_020E5B0C[] = { - {0x1EE, 0x21C, 0x1E7, 0x1}, - {0x1F3, 0x21D, 0x1EC, 0x1}, - {0x1E6, 0x21E, 0x1DF, 0x1}, - {0x1E6, 0x21F, 0x1DF, 0x2}, - {0x1E6, 0x220, 0x1DF, 0x3}, - {0x1E6, 0x221, 0x1DF, 0x4}, - {0x1E6, 0x222, 0x1DF, 0x5} + { 0x1EE, 0x21C, 0x1E7, 0x1 }, + { 0x1F3, 0x21D, 0x1EC, 0x1 }, + { 0x1E6, 0x21E, 0x1DF, 0x1 }, + { 0x1E6, 0x21F, 0x1DF, 0x2 }, + { 0x1E6, 0x220, 0x1DF, 0x3 }, + { 0x1E6, 0x221, 0x1DF, 0x4 }, + { 0x1E6, 0x222, 0x1DF, 0x5 } }; -void sub_02028124 (UnkStruct_0202818C * param0) +void sub_02028124(UnkStruct_0202818C *param0) { int v0; @@ -63,7 +62,7 @@ void sub_02028124 (UnkStruct_0202818C * param0) } } -BOOL sub_0202817C (UnkStruct_0202818C * param0) +BOOL sub_0202817C(UnkStruct_0202818C *param0) { if ((param0->unk_07 >= 0) && (param0->unk_07 <= 11)) { return 1; @@ -72,9 +71,9 @@ BOOL sub_0202817C (UnkStruct_0202818C * param0) return 0; } -UnkStruct_0202818C * sub_0202818C (int param0) +UnkStruct_0202818C *sub_0202818C(int param0) { - UnkStruct_0202818C * v0; + UnkStruct_0202818C *v0; v0 = Heap_AllocFromHeapAtEnd(param0, sizeof(UnkStruct_0202818C)); sub_02028124(v0); @@ -82,19 +81,19 @@ UnkStruct_0202818C * sub_0202818C (int param0) return v0; } -void sub_020281A0 (UnkStruct_0202818C * param0, UnkStruct_0202818C * param1) +void sub_020281A0(UnkStruct_0202818C *param0, UnkStruct_0202818C *param1) { MI_CpuCopy8(param0, param1, sizeof(UnkStruct_0202818C)); } -void sub_020281AC (UnkStruct_0202818C * param0, u8 param1, u8 param2, SaveData * param3) +void sub_020281AC(UnkStruct_0202818C *param0, u8 param1, u8 param2, SaveData *param3) { u8 v0, v1, v2, v3; u16 v4; u32 v5, v6, v7; - TrainerInfo * v8; - Party * v9; - Pokemon * v10; + TrainerInfo *v8; + Party *v9; + Pokemon *v10; sub_02028124(param0); @@ -136,27 +135,27 @@ void sub_020281AC (UnkStruct_0202818C * param0, u8 param1, u8 param2, SaveData * } } -u32 sub_02028308 (const UnkStruct_0202818C * param0) +u32 sub_02028308(const UnkStruct_0202818C *param0) { return param0->unk_00; } -u16 * sub_0202830C (UnkStruct_0202818C * param0) +u16 *sub_0202830C(UnkStruct_0202818C *param0) { return &(param0->unk_08[0]); } -u8 sub_02028310 (const UnkStruct_0202818C * param0) +u8 sub_02028310(const UnkStruct_0202818C *param0) { return param0->unk_04; } -u8 sub_02028314 (const UnkStruct_0202818C * param0) +u8 sub_02028314(const UnkStruct_0202818C *param0) { return param0->unk_07; } -void sub_02028318 (UnkStruct_0202818C * param0, const u8 param1) +void sub_02028318(UnkStruct_0202818C *param0, const u8 param1) { if (param1 >= 12) { return; @@ -165,17 +164,17 @@ void sub_02028318 (UnkStruct_0202818C * param0, const u8 param1) param0->unk_07 = param1; } -u8 sub_02028320 (const UnkStruct_0202818C * param0) +u8 sub_02028320(const UnkStruct_0202818C *param0) { return param0->unk_05; } -u8 sub_02028324 (const UnkStruct_0202818C * param0) +u8 sub_02028324(const UnkStruct_0202818C *param0) { return param0->unk_06; } -u16 sub_02028328 (const UnkStruct_0202818C * param0, u8 param1, u8 param2, u16 param3) +u16 sub_02028328(const UnkStruct_0202818C *param0, u8 param1, u8 param2, u16 param3) { UnkUnion_02028328 v0; int v1; @@ -211,12 +210,12 @@ u16 sub_02028328 (const UnkStruct_0202818C * param0, u8 param1, u8 param2, u16 p } } -u16 sub_02028408 (const UnkStruct_0202818C * param0) +u16 sub_02028408(const UnkStruct_0202818C *param0) { return param0->unk_1E; } -Sentence * sub_0202840C (UnkStruct_0202818C * param0, u8 param1) +Sentence *sub_0202840C(UnkStruct_0202818C *param0, u8 param1) { if (param1 < 3) { return &(param0->unk_20[param1]); @@ -225,7 +224,7 @@ Sentence * sub_0202840C (UnkStruct_0202818C * param0, u8 param1) } } -void sub_0202841C (UnkStruct_0202818C * param0, Sentence * param1, u8 param2) +void sub_0202841C(UnkStruct_0202818C *param0, Sentence *param1, u8 param2) { if (param2 >= 3) { return; @@ -234,17 +233,17 @@ void sub_0202841C (UnkStruct_0202818C * param0, Sentence * param1, u8 param2) sub_02014CC0(¶m0->unk_20[param2], param1); } -UnkStruct_02028430 * sub_02028430 (SaveData * param0) +UnkStruct_02028430 *sub_02028430(SaveData *param0) { return SaveData_SaveTable(param0, 15); } -int Mail_SaveSize (void) +int Mail_SaveSize(void) { return sizeof(UnkStruct_0202818C) * 20; } -void Mail_Init (UnkStruct_02028430 * param0) +void Mail_Init(UnkStruct_02028430 *param0) { int v0 = 0; @@ -253,7 +252,7 @@ void Mail_Init (UnkStruct_02028430 * param0) } } -int sub_0202845C (UnkStruct_02028430 * param0, int param1) +int sub_0202845C(UnkStruct_02028430 *param0, int param1) { switch (param1) { case 0: @@ -265,9 +264,9 @@ int sub_0202845C (UnkStruct_02028430 * param0, int param1) return 0xFFFFFFFF; } -void sub_02028470 (UnkStruct_02028430 * param0, int param1, int param2) +void sub_02028470(UnkStruct_02028430 *param0, int param1, int param2) { - UnkStruct_0202818C * v0 = NULL; + UnkStruct_0202818C *v0 = NULL; v0 = sub_02028538(param0, param1, param2); @@ -276,9 +275,9 @@ void sub_02028470 (UnkStruct_02028430 * param0, int param1, int param2) } } -void sub_02028480 (UnkStruct_02028430 * param0, int param1, int param2, UnkStruct_0202818C * param3) +void sub_02028480(UnkStruct_02028430 *param0, int param1, int param2, UnkStruct_0202818C *param3) { - UnkStruct_0202818C * v0 = NULL; + UnkStruct_0202818C *v0 = NULL; v0 = sub_02028538(param0, param1, param2); @@ -287,7 +286,7 @@ void sub_02028480 (UnkStruct_02028430 * param0, int param1, int param2, UnkStruc } } -int sub_02028494 (UnkStruct_02028430 * param0, int param1) +int sub_02028494(UnkStruct_02028430 *param0, int param1) { switch (param1) { case 0: @@ -299,10 +298,10 @@ int sub_02028494 (UnkStruct_02028430 * param0, int param1) return 0; } -UnkStruct_0202818C * sub_020284A8 (UnkStruct_02028430 * param0, int param1, int param2, int param3) +UnkStruct_0202818C *sub_020284A8(UnkStruct_02028430 *param0, int param1, int param2, int param3) { - UnkStruct_0202818C * v0 = NULL; - UnkStruct_0202818C * v1; + UnkStruct_0202818C *v0 = NULL; + UnkStruct_0202818C *v1; v0 = sub_02028538(param0, param1, param2); v1 = sub_0202818C(param3); @@ -314,9 +313,9 @@ UnkStruct_0202818C * sub_020284A8 (UnkStruct_02028430 * param0, int param1, int return v1; } -void sub_020284CC (UnkStruct_02028430 * param0, int param1, int param2, UnkStruct_0202818C * param3) +void sub_020284CC(UnkStruct_02028430 *param0, int param1, int param2, UnkStruct_0202818C *param3) { - UnkStruct_0202818C * v0 = NULL; + UnkStruct_0202818C *v0 = NULL; v0 = sub_02028538(param0, param1, param2); @@ -327,7 +326,7 @@ void sub_020284CC (UnkStruct_02028430 * param0, int param1, int param2, UnkStruc } } -static int sub_020284E8 (UnkStruct_0202818C * param0, int param1) +static int sub_020284E8(UnkStruct_0202818C *param0, int param1) { int v0 = 0; @@ -340,7 +339,7 @@ static int sub_020284E8 (UnkStruct_0202818C * param0, int param1) return 0xFFFFFFFF; } -static int sub_02028510 (UnkStruct_0202818C * param0, int param1) +static int sub_02028510(UnkStruct_0202818C *param0, int param1) { int v0 = 0; int v1 = 0; @@ -354,9 +353,9 @@ static int sub_02028510 (UnkStruct_0202818C * param0, int param1) return v1; } -static UnkStruct_0202818C * sub_02028538 (UnkStruct_02028430 * param0, int param1, int param2) +static UnkStruct_0202818C *sub_02028538(UnkStruct_02028430 *param0, int param1, int param2) { - UnkStruct_0202818C * v0 = NULL; + UnkStruct_0202818C *v0 = NULL; switch (param1) { case 0: diff --git a/src/unk_0202854C.c b/src/unk_0202854C.c index 6a8149b031..94ff8fcc2b 100644 --- a/src/unk_0202854C.c +++ b/src/unk_0202854C.c @@ -1,25 +1,22 @@ +#include "unk_0202854C.h" + #include #include -#include "core_sys.h" - -#include "trainer_info.h" -#include "savedata.h" - #include "struct_defs/struct_0202855C.h" #include "struct_defs/struct_02029894.h" #include "struct_defs/struct_02029894_sub1.h" #include "struct_defs/struct_02029894_sub2.h" #include "struct_defs/struct_020298B0.h" -#include "rtc.h" +#include "core_sys.h" #include "heap.h" -#include "unk_0201D15C.h" +#include "rtc.h" #include "savedata.h" #include "trainer_info.h" -#include "unk_0202854C.h" +#include "unk_0201D15C.h" -static void sub_02028B48(UndergroundData * param0, int param1, int param2); +static void sub_02028B48(UndergroundData *param0, int param1, int param2); u16 Unk_02100920[] = { 0x6E, @@ -73,31 +70,31 @@ u16 Unk_02100920[] = { 0x139 }; -int Underground_SaveSize (void) +int Underground_SaveSize(void) { return sizeof(UndergroundData); } -int sub_02028554 (void) +int sub_02028554(void) { return sizeof(UnkStruct_02029894); } -int sub_02028558 (void) +int sub_02028558(void) { return sizeof(SecretBaseRecord); } -SecretBaseRecord * sub_0202855C (u32 param0) +SecretBaseRecord *sub_0202855C(u32 param0) { - SecretBaseRecord * v0; + SecretBaseRecord *v0; v0 = Heap_AllocFromHeap(param0, sizeof(SecretBaseRecord)); MI_CpuFill8(v0, 0, sizeof(SecretBaseRecord)); return v0; } -void Underground_Init (UndergroundData * param0) +void Underground_Init(UndergroundData *param0) { u32 v0 = 0; RTCDate v1; @@ -112,7 +109,7 @@ void Underground_Init (UndergroundData * param0) param0->unk_9AC_0 = 1; } -static int sub_020285D8 (UndergroundData * param0) +static int sub_020285D8(UndergroundData *param0) { int v0; @@ -125,7 +122,7 @@ static int sub_020285D8 (UndergroundData * param0) return -1; } -static int sub_020285F8 (UndergroundData * param0) +static int sub_020285F8(UndergroundData *param0) { int v0; @@ -138,7 +135,7 @@ static int sub_020285F8 (UndergroundData * param0) return -1; } -static int sub_02028618 (UndergroundData * param0) +static int sub_02028618(UndergroundData *param0) { int v0; @@ -151,7 +148,7 @@ static int sub_02028618 (UndergroundData * param0) return -1; } -static int sub_02028638 (UndergroundData * param0) +static int sub_02028638(UndergroundData *param0) { int v0; @@ -164,12 +161,12 @@ static int sub_02028638 (UndergroundData * param0) return -1; } -void sub_02028658 (SaveData * param0, int param1) +void sub_02028658(SaveData *param0, int param1) { - UndergroundData * v0 = sub_020298B0(param0); + UndergroundData *v0 = sub_020298B0(param0); MATHRandContext16 v1; - u8 v2[] = {0, 2, 2, 4, 4, 5}; - u8 v3[] = {0, 1, 1, 3, 3, 5}; + u8 v2[] = { 0, 2, 2, 4, 4, 5 }; + u8 v3[] = { 0, 1, 1, 3, 3, 5 }; int v4, v5, v6, v7, v8; if (param1 <= 0) { @@ -203,9 +200,9 @@ void sub_02028658 (SaveData * param0, int param1) v0->unk_9AC_0 = 1; } -void sub_02028758 (SaveData * param0, s32 param1, BOOL param2) +void sub_02028758(SaveData *param0, s32 param1, BOOL param2) { - UndergroundData * v0 = sub_020298B0(param0); + UndergroundData *v0 = sub_020298B0(param0); if ((param1 < 0) || (param2)) { return; @@ -218,9 +215,9 @@ void sub_02028758 (SaveData * param0, s32 param1, BOOL param2) } } -void sub_0202878C (SaveData * param0) +void sub_0202878C(SaveData *param0) { - UndergroundData * v0 = sub_020298B0(param0); + UndergroundData *v0 = sub_020298B0(param0); if ((v0->unk_94 == 0) && (v0->unk_98 == 2)) { v0->unk_98 = 0; @@ -235,27 +232,27 @@ void sub_0202878C (SaveData * param0) } } -void sub_020287E0 (SaveData * param0) +void sub_020287E0(SaveData *param0) { - UndergroundData * v0 = sub_020298B0(param0); + UndergroundData *v0 = sub_020298B0(param0); if (v0->unk_98 == 0) { v0->unk_98 = 1; } } -void sub_020287F8 (SaveData * param0) +void sub_020287F8(SaveData *param0) { - UndergroundData * v0 = sub_020298B0(param0); + UndergroundData *v0 = sub_020298B0(param0); if (v0->unk_98 == 1) { v0->unk_98 = 0; } } -BOOL sub_02028810 (SaveData * param0) +BOOL sub_02028810(SaveData *param0) { - UndergroundData * v0 = sub_020298B0(param0); + UndergroundData *v0 = sub_020298B0(param0); if (v0->unk_98 == 2) { return 0; @@ -264,12 +261,12 @@ BOOL sub_02028810 (SaveData * param0) return 1; } -void sub_02028828 (UndergroundData * param0) +void sub_02028828(UndergroundData *param0) { param0->unk_99 = 1; } -void sub_02028830 (UndergroundData * param0, const TrainerInfo * param1) +void sub_02028830(UndergroundData *param0, const TrainerInfo *param1) { int v0 = param0->unk_10A; int v1; @@ -293,11 +290,11 @@ void sub_02028830 (UndergroundData * param0, const TrainerInfo * param1) } } -TrainerInfo * sub_020288C8 (const UndergroundData * param0, int param1, int param2) +TrainerInfo *sub_020288C8(const UndergroundData *param0, int param1, int param2) { int v0 = (sizeof(u16) * (7 + 1)); int v1; - TrainerInfo * v2; + TrainerInfo *v2; int v3 = param0->unk_10A - param2 - 1; if (v3 < 0) { @@ -318,12 +315,12 @@ TrainerInfo * sub_020288C8 (const UndergroundData * param0, int param1, int para return NULL; } -u32 sub_02028930 (UndergroundData * param0) +u32 sub_02028930(UndergroundData *param0) { return param0->unk_90; } -int sub_02028938 (int param0) +int sub_02028938(int param0) { GF_ASSERT(11 <= param0); GF_ASSERT(param0 < 60); @@ -332,7 +329,7 @@ int sub_02028938 (int param0) return Unk_02100920[param0]; } -BOOL sub_0202895C (UndergroundData * param0, int param1) +BOOL sub_0202895C(UndergroundData *param0, int param1) { int v0; BOOL v1 = 0; @@ -348,7 +345,7 @@ BOOL sub_0202895C (UndergroundData * param0, int param1) return v1; } -BOOL sub_02028984 (UndergroundData * param0, int param1) +BOOL sub_02028984(UndergroundData *param0, int param1) { int v0; @@ -361,7 +358,7 @@ BOOL sub_02028984 (UndergroundData * param0, int param1) return 0; } -int sub_020289A0 (UndergroundData * param0) +int sub_020289A0(UndergroundData *param0) { int v0; @@ -374,12 +371,12 @@ int sub_020289A0 (UndergroundData * param0) return v0; } -int sub_020289B8 (UndergroundData * param0, int param1) +int sub_020289B8(UndergroundData *param0, int param1) { return param0->unk_80C[param1]; } -int sub_020289C4 (UndergroundData * param0, int param1) +int sub_020289C4(UndergroundData *param0, int param1) { int v0, v1, v2; @@ -398,7 +395,7 @@ int sub_020289C4 (UndergroundData * param0, int param1) return v2; } -void sub_02028A10 (UndergroundData * param0, int param1, int param2) +void sub_02028A10(UndergroundData *param0, int param1, int param2) { int v0, v1 = 0, v2 = 0, v3 = -1; u8 v4[200]; @@ -436,7 +433,7 @@ void sub_02028A10 (UndergroundData * param0, int param1, int param2) } } -int sub_02028ACC (UndergroundData * param0, int param1, int param2) +int sub_02028ACC(UndergroundData *param0, int param1, int param2) { int v0, v1; @@ -447,7 +444,7 @@ int sub_02028ACC (UndergroundData * param0, int param1, int param2) return param0->unk_80C[param1]; } -BOOL sub_02028AFC (UndergroundData * param0, int param1) +BOOL sub_02028AFC(UndergroundData *param0, int param1) { int v0; @@ -460,7 +457,7 @@ BOOL sub_02028AFC (UndergroundData * param0, int param1) return 0; } -void sub_02028B20 (UndergroundData * param0, int param1) +void sub_02028B20(UndergroundData *param0, int param1) { if ((param1 - 1) >= 15) { return; @@ -469,12 +466,12 @@ void sub_02028B20 (UndergroundData * param0, int param1) param0->unk_99C[param1 - 1] = 0; } -void sub_02028B34 (UndergroundData * param0) +void sub_02028B34(UndergroundData *param0) { MI_CpuFill8(param0->unk_99C, 0, 15); } -static void sub_02028B48 (UndergroundData * param0, int param1, int param2) +static void sub_02028B48(UndergroundData *param0, int param1, int param2) { int v0; @@ -485,7 +482,7 @@ static void sub_02028B48 (UndergroundData * param0, int param1, int param2) } } -int sub_02028B70 (UndergroundData * param0) +int sub_02028B70(UndergroundData *param0) { int v0; @@ -498,12 +495,12 @@ int sub_02028B70 (UndergroundData * param0) return v0; } -int sub_02028B88 (UndergroundData * param0, int param1) +int sub_02028B88(UndergroundData *param0, int param1) { return param0->unk_8FC[param1]; } -int sub_02028B94 (UndergroundData * param0, int param1) +int sub_02028B94(UndergroundData *param0, int param1) { int v0, v1, v2; @@ -518,7 +515,7 @@ int sub_02028B94 (UndergroundData * param0, int param1) return v2; } -BOOL sub_02028BC8 (UndergroundData * param0, int param1) +BOOL sub_02028BC8(UndergroundData *param0, int param1) { int v0; BOOL v1 = 0; @@ -533,7 +530,7 @@ BOOL sub_02028BC8 (UndergroundData * param0, int param1) return v1; } -void sub_02028BE8 (UndergroundData * param0, int param1, int param2) +void sub_02028BE8(UndergroundData *param0, int param1, int param2) { int v0, v1 = 0, v2 = 0; u8 v3[40]; @@ -553,7 +550,7 @@ void sub_02028BE8 (UndergroundData * param0, int param1, int param2) } } -int sub_02028C3C (UndergroundData * param0) +int sub_02028C3C(UndergroundData *param0) { int v0; @@ -566,17 +563,17 @@ int sub_02028C3C (UndergroundData * param0) return v0; } -int sub_02028C54 (UndergroundData * param0, int param1) +int sub_02028C54(UndergroundData *param0, int param1) { return param0->unk_94C[param1]; } -int sub_02028C60 (UndergroundData * param0, int param1) +int sub_02028C60(UndergroundData *param0, int param1) { return param0->unk_974[param1]; } -int sub_02028C6C (UndergroundData * param0, int param1) +int sub_02028C6C(UndergroundData *param0, int param1) { int v0, v1, v2; @@ -593,7 +590,7 @@ int sub_02028C6C (UndergroundData * param0, int param1) return v2; } -BOOL sub_02028CB0 (UndergroundData * param0, int param1, int param2) +BOOL sub_02028CB0(UndergroundData *param0, int param1, int param2) { int v0; BOOL v1 = 0; @@ -609,7 +606,7 @@ BOOL sub_02028CB0 (UndergroundData * param0, int param1, int param2) return v1; } -void sub_02028CD8 (UndergroundData * param0, int param1, int param2) +void sub_02028CD8(UndergroundData *param0, int param1, int param2) { int v0, v1 = 0, v2 = 0; u8 v3[40]; @@ -633,7 +630,7 @@ void sub_02028CD8 (UndergroundData * param0, int param1, int param2) } } -int sub_02028D58 (UndergroundData * param0) +int sub_02028D58(UndergroundData *param0) { int v0; @@ -646,12 +643,12 @@ int sub_02028D58 (UndergroundData * param0) return v0; } -int sub_02028D74 (UndergroundData * param0, int param1) +int sub_02028D74(UndergroundData *param0, int param1) { return param0->unk_924[param1]; } -int sub_02028D80 (UndergroundData * param0, int param1) +int sub_02028D80(UndergroundData *param0, int param1) { int v0, v1, v2; @@ -667,7 +664,7 @@ int sub_02028D80 (UndergroundData * param0, int param1) return v2; } -BOOL sub_02028DB4 (UndergroundData * param0, int param1) +BOOL sub_02028DB4(UndergroundData *param0, int param1) { int v0; BOOL v1 = 0; @@ -682,7 +679,7 @@ BOOL sub_02028DB4 (UndergroundData * param0, int param1) return v1; } -void sub_02028DD8 (UndergroundData * param0, int param1, int param2) +void sub_02028DD8(UndergroundData *param0, int param1, int param2) { int v0, v1 = 0, v2 = 0; u8 v3[40]; @@ -702,7 +699,7 @@ void sub_02028DD8 (UndergroundData * param0, int param1, int param2) } } -int sub_02028E28 (UndergroundData * param0) +int sub_02028E28(UndergroundData *param0) { int v0; @@ -715,14 +712,14 @@ int sub_02028E28 (UndergroundData * param0) return v0; } -int sub_02028E44 (UndergroundData * param0, int param1) +int sub_02028E44(UndergroundData *param0, int param1) { int v0; return param0->unk_8D4[param1]; } -int sub_02028E50 (UndergroundData * param0, int param1) +int sub_02028E50(UndergroundData *param0, int param1) { int v0, v1, v2; @@ -738,7 +735,7 @@ int sub_02028E50 (UndergroundData * param0, int param1) return v2; } -BOOL sub_02028E84 (UndergroundData * param0, int param1) +BOOL sub_02028E84(UndergroundData *param0, int param1) { int v0; BOOL v1 = 0; @@ -753,7 +750,7 @@ BOOL sub_02028E84 (UndergroundData * param0, int param1) return v1; } -void sub_02028EA8 (UndergroundData * param0, int param1, int param2) +void sub_02028EA8(UndergroundData *param0, int param1, int param2) { int v0, v1 = 0, v2 = 0; u8 v3[40]; @@ -773,7 +770,7 @@ void sub_02028EA8 (UndergroundData * param0, int param1, int param2) } } -void sub_02028EF8 (UndergroundData * param0, int param1, int param2, int param3, int param4) +void sub_02028EF8(UndergroundData *param0, int param1, int param2, int param3, int param4) { GF_ASSERT(param2 < (16 * 4)); @@ -783,13 +780,13 @@ void sub_02028EF8 (UndergroundData * param0, int param1, int param2, int param3, param0->unk_14B[param2][2] = param4; } -int sub_02028F40 (UndergroundData * param0, int param1) +int sub_02028F40(UndergroundData *param0, int param1) { GF_ASSERT(param1 < (16 * 4)); return param0->unk_10B[param1]; } -int sub_02028F5C (UndergroundData * param0, int param1) +int sub_02028F5C(UndergroundData *param0, int param1) { int v0; @@ -801,7 +798,7 @@ int sub_02028F5C (UndergroundData * param0, int param1) return v0; } -int sub_02028F88 (UndergroundData * param0, int param1) +int sub_02028F88(UndergroundData *param0, int param1) { int v0; @@ -813,7 +810,7 @@ int sub_02028F88 (UndergroundData * param0, int param1) return v0; } -void sub_02028FB4 (UndergroundData * param0, int param1) +void sub_02028FB4(UndergroundData *param0, int param1) { GF_ASSERT(param1 < (16 * 4)); @@ -821,7 +818,7 @@ void sub_02028FB4 (UndergroundData * param0, int param1) MI_CpuClear8(param0->unk_14B[param1], 3); } -void sub_02028FE0 (UndergroundData * param0, int param1, int param2, int param3, int param4, int param5) +void sub_02028FE0(UndergroundData *param0, int param1, int param2, int param3, int param4, int param5) { GF_ASSERT(param2 < 16); @@ -832,12 +829,12 @@ void sub_02028FE0 (UndergroundData * param0, int param1, int param2, int param3, param0->unk_548[param2] = param5; } -int sub_02029030 (UndergroundData * param0, int param1) +int sub_02029030(UndergroundData *param0, int param1) { return param0->unk_508[param1]; } -int sub_0202903C (UndergroundData * param0, int param1) +int sub_0202903C(UndergroundData *param0, int param1) { int v0 = param0->unk_518[param1][0]; @@ -845,7 +842,7 @@ int sub_0202903C (UndergroundData * param0, int param1) return v0; } -int sub_0202905C (UndergroundData * param0, int param1) +int sub_0202905C(UndergroundData *param0, int param1) { int v0 = param0->unk_518[param1][2]; @@ -853,12 +850,12 @@ int sub_0202905C (UndergroundData * param0, int param1) return v0; } -int sub_0202907C (UndergroundData * param0, int param1) +int sub_0202907C(UndergroundData *param0, int param1) { return param0->unk_548[param1]; } -void sub_02029088 (UndergroundData * param0, int param1, int param2, int param3, int param4, int param5, int param6) +void sub_02029088(UndergroundData *param0, int param1, int param2, int param3, int param4, int param5, int param6) { GF_ASSERT(param2 < 100); @@ -870,12 +867,12 @@ void sub_02029088 (UndergroundData * param0, int param1, int param2, int param3, param0->unk_5BC[param2] = param6; } -int sub_020290DC (UndergroundData * param0, int param1) +int sub_020290DC(UndergroundData *param0, int param1) { return param0->unk_558[param1]; } -int sub_020290E8 (UndergroundData * param0, int param1) +int sub_020290E8(UndergroundData *param0, int param1) { int v0 = param0->unk_684[param1][0]; @@ -883,7 +880,7 @@ int sub_020290E8 (UndergroundData * param0, int param1) return v0; } -int sub_02029108 (UndergroundData * param0, int param1) +int sub_02029108(UndergroundData *param0, int param1) { int v0 = param0->unk_684[param1][2]; @@ -891,17 +888,17 @@ int sub_02029108 (UndergroundData * param0, int param1) return v0; } -int sub_02029128 (UndergroundData * param0, int param1) +int sub_02029128(UndergroundData *param0, int param1) { return param0->unk_620[param1]; } -int sub_02029134 (UndergroundData * param0, int param1) +int sub_02029134(UndergroundData *param0, int param1) { return param0->unk_5BC[param1]; } -int sub_02029140 (UndergroundData * param0, int param1, int param2) +int sub_02029140(UndergroundData *param0, int param1, int param2) { int v0; @@ -921,13 +918,13 @@ int sub_02029140 (UndergroundData * param0, int param1, int param2) return v0; } -void sub_020291A4 (UndergroundData * param0, int param1) +void sub_020291A4(UndergroundData *param0, int param1) { GF_ASSERT(param1 < 255); MI_CpuFill8(param0->unk_20B[param1], 0, 3); } -int sub_020291CC (UndergroundData * param0, int param1) +int sub_020291CC(UndergroundData *param0, int param1) { int v0 = param0->unk_20B[param1][0]; @@ -935,7 +932,7 @@ int sub_020291CC (UndergroundData * param0, int param1) return v0; } -int sub_020291EC (UndergroundData * param0, int param1) +int sub_020291EC(UndergroundData *param0, int param1) { int v0 = param0->unk_20B[param1][2]; @@ -943,27 +940,27 @@ int sub_020291EC (UndergroundData * param0, int param1) return v0; } -BOOL sub_0202920C (UndergroundData * param0) +BOOL sub_0202920C(UndergroundData *param0) { return param0->unk_9AC_4 == 0; } -void sub_02029220 (UndergroundData * param0) +void sub_02029220(UndergroundData *param0) { param0->unk_9AC_4 = 1; } -BOOL sub_02029234 (UndergroundData * param0) +BOOL sub_02029234(UndergroundData *param0) { return param0->unk_9AC_0; } -void sub_02029240 (UndergroundData * param0) +void sub_02029240(UndergroundData *param0) { param0->unk_9AC_0 = 0; } -void sub_02029250 (UndergroundData * param0, int param1) +void sub_02029250(UndergroundData *param0, int param1) { if ((44 > param1) || (param1 > 59)) { return; @@ -972,20 +969,20 @@ void sub_02029250 (UndergroundData * param0, int param1) param0->unk_808 |= (0x1 << (param1 - 44)); } -BOOL sub_02029274 (UndergroundData * param0, int param1) +BOOL sub_02029274(UndergroundData *param0, int param1) { if ((44 > param1) || (param1 > 59)) { return 1; } - if ((param0->unk_808 & (0x1 << (param1 - 44)))) { + if (param0->unk_808 & (0x1 << (param1 - 44))) { return 0; } return 1; } -void sub_0202929C (UndergroundData * param0) +void sub_0202929C(UndergroundData *param0) { if (param0->unk_9AB >= (100 - 1)) { param0->unk_9AB = 0; @@ -994,17 +991,17 @@ void sub_0202929C (UndergroundData * param0) } } -int sub_020292B4 (UndergroundData * param0) +int sub_020292B4(UndergroundData *param0) { return param0->unk_9AB; } -void sub_020292C0 (UnkStruct_02029894 * param0) +void sub_020292C0(UnkStruct_02029894 *param0) { MI_CpuFill8(param0, 0, sizeof(UnkStruct_02029894)); } -void sub_020292CC (UnkStruct_02029894 * param0) +void sub_020292CC(UnkStruct_02029894 *param0) { MI_CpuClear8(param0->unk_00, 15 * sizeof(UnkStruct_02029894_sub1)); MI_CpuClear8(param0->unk_2D, 16 * sizeof(UnkStruct_02029894_sub2)); @@ -1015,12 +1012,12 @@ void sub_020292CC (UnkStruct_02029894 * param0) param0->unk_91 = 0; } -void sub_02029300 (UnkStruct_02029894 * param0) +void sub_02029300(UnkStruct_02029894 *param0) { param0->unk_91 = 0; } -void sub_02029308 (UnkStruct_02029894 * param0, int param1, int param2, int param3, int param4) +void sub_02029308(UnkStruct_02029894 *param0, int param1, int param2, int param3, int param4) { GF_ASSERT(param1 < (15 + 16 + 1)); GF_ASSERT(param3 < 32); @@ -1039,13 +1036,13 @@ void sub_02029308 (UnkStruct_02029894 * param0, int param1, int param2, int para } } -void sub_02029364 (UnkStruct_02029894 * param0, int param1, int param2, int param3) +void sub_02029364(UnkStruct_02029894 *param0, int param1, int param2, int param3) { int v0 = sub_020293B0(param0, param1); sub_02029308(param0, param1, v0, param2, param3); } -static int sub_02029384 (const UnkStruct_02029894 * param0) +static int sub_02029384(const UnkStruct_02029894 *param0) { int v0 = param0->unk_50.unk_38_0; @@ -1062,7 +1059,7 @@ static int sub_02029384 (const UnkStruct_02029894 * param0) return 1; } -int sub_020293B0 (const UnkStruct_02029894 * param0, int param1) +int sub_020293B0(const UnkStruct_02029894 *param0, int param1) { GF_ASSERT(param1 < (15 + 16 + 1)); @@ -1077,7 +1074,7 @@ int sub_020293B0 (const UnkStruct_02029894 * param0, int param1) return 0; } -int sub_020293FC (const UnkStruct_02029894 * param0, int param1) +int sub_020293FC(const UnkStruct_02029894 *param0, int param1) { GF_ASSERT(param1 < (15 + 16 + 1)); @@ -1090,7 +1087,7 @@ int sub_020293FC (const UnkStruct_02029894 * param0, int param1) return param0->unk_2D[param1 - 1 - 15].unk_00; } -int sub_0202942C (const UnkStruct_02029894 * param0, int param1) +int sub_0202942C(const UnkStruct_02029894 *param0, int param1) { GF_ASSERT(param1 < (15 + 16 + 1)); @@ -1103,7 +1100,7 @@ int sub_0202942C (const UnkStruct_02029894 * param0, int param1) return param0->unk_2D[param1 - 1 - 15].unk_01; } -int sub_02029460 (const UnkStruct_02029894 * param0) +int sub_02029460(const UnkStruct_02029894 *param0) { if (param0->unk_50.unk_38_0 >= 50) { return 0; @@ -1118,7 +1115,7 @@ int sub_02029460 (const UnkStruct_02029894 * param0) return 16; } -int sub_0202948C (const UnkStruct_02029894 * param0) +int sub_0202948C(const UnkStruct_02029894 *param0) { if (param0->unk_50.unk_38_0 >= 50) { return 15; @@ -1133,12 +1130,12 @@ int sub_0202948C (const UnkStruct_02029894 * param0) return 10; } -int sub_020294B8 (const SecretBaseRecord * param0) +int sub_020294B8(const SecretBaseRecord *param0) { return param0->unk_00_0; } -int sub_020294C0 (const SecretBaseRecord * param0) +int sub_020294C0(const SecretBaseRecord *param0) { if (4 == sub_0202958C(param0)) { return 1; @@ -1147,43 +1144,43 @@ int sub_020294C0 (const SecretBaseRecord * param0) return 0; } -void sub_020294D4 (SecretBaseRecord * param0, int param1) +void sub_020294D4(SecretBaseRecord *param0, int param1) { param0->unk_00_0 = param1; } -int sub_020294EC (const SecretBaseRecord * param0) +int sub_020294EC(const SecretBaseRecord *param0) { return param0->unk_04_0; } -void sub_020294F4 (SecretBaseRecord * param0, int param1) +void sub_020294F4(SecretBaseRecord *param0, int param1) { if (param0->unk_04_0 < 999999) { param0->unk_04_0++; } } -int sub_02029524 (const SecretBaseRecord * param0) +int sub_02029524(const SecretBaseRecord *param0) { return param0->unk_08_0; } -void sub_0202952C (SecretBaseRecord * param0) +void sub_0202952C(SecretBaseRecord *param0) { if (param0->unk_08_0 < 999999) { param0->unk_08_0++; } } -void sub_0202955C (SecretBaseRecord * param0) +void sub_0202955C(SecretBaseRecord *param0) { if (param0->unk_0C_0 < 999999) { param0->unk_0C_0++; } } -int sub_0202958C (const SecretBaseRecord * param0) +int sub_0202958C(const SecretBaseRecord *param0) { int v0 = param0->unk_38_0; @@ -1200,24 +1197,24 @@ int sub_0202958C (const SecretBaseRecord * param0) return 0; } -int sub_020295B8 (const SecretBaseRecord * param0) +int sub_020295B8(const SecretBaseRecord *param0) { return param0->unk_38_0; } -void sub_020295C0 (SecretBaseRecord * param0) +void sub_020295C0(SecretBaseRecord *param0) { if (param0->unk_38_0 < 999999) { param0->unk_38_0++; } } -int sub_020295F0 (const SecretBaseRecord * param0) +int sub_020295F0(const SecretBaseRecord *param0) { return param0->unk_10_0; } -void sub_020295F8 (SecretBaseRecord * param0, int param1) +void sub_020295F8(SecretBaseRecord *param0, int param1) { if ((param1 > 0) && (param0->unk_10_0 > (999999 - param1))) { param0->unk_10_0 = 999999; @@ -1226,12 +1223,12 @@ void sub_020295F8 (SecretBaseRecord * param0, int param1) } } -int sub_0202963C (const SecretBaseRecord * param0) +int sub_0202963C(const SecretBaseRecord *param0) { return param0->unk_14_0; } -void sub_02029644 (SecretBaseRecord * param0, int param1) +void sub_02029644(SecretBaseRecord *param0, int param1) { if ((param1 > 0) && (param0->unk_14_0 > (999999 - param1))) { param0->unk_14_0 = 999999; @@ -1240,7 +1237,7 @@ void sub_02029644 (SecretBaseRecord * param0, int param1) } } -void sub_02029688 (SecretBaseRecord * param0, int param1) +void sub_02029688(SecretBaseRecord *param0, int param1) { if ((param1 > 0) && (param0->unk_18_0 > (999999 - param1))) { param0->unk_18_0 = 999999; @@ -1249,91 +1246,91 @@ void sub_02029688 (SecretBaseRecord * param0, int param1) } } -int sub_020296CC (const SecretBaseRecord * param0) +int sub_020296CC(const SecretBaseRecord *param0) { return param0->unk_1C_0; } -void sub_020296D4 (SecretBaseRecord * param0) +void sub_020296D4(SecretBaseRecord *param0) { if (param0->unk_1C_0 < 999999) { param0->unk_1C_0++; } } -int sub_02029704 (const SecretBaseRecord * param0) +int sub_02029704(const SecretBaseRecord *param0) { return param0->unk_20_0; } -void sub_0202970C (SecretBaseRecord * param0) +void sub_0202970C(SecretBaseRecord *param0) { if (param0->unk_20_0 < 999999) { param0->unk_20_0++; } } -int sub_0202973C (const SecretBaseRecord * param0) +int sub_0202973C(const SecretBaseRecord *param0) { return param0->unk_24_0; } -void sub_02029744 (SecretBaseRecord * param0) +void sub_02029744(SecretBaseRecord *param0) { if (param0->unk_24_0 < 999999) { param0->unk_24_0++; } } -int sub_02029774 (const SecretBaseRecord * param0) +int sub_02029774(const SecretBaseRecord *param0) { return param0->unk_28_0; } -void sub_0202977C (SecretBaseRecord * param0) +void sub_0202977C(SecretBaseRecord *param0) { if (param0->unk_28_0 < 999999) { param0->unk_28_0++; } } -int sub_020297AC (const SecretBaseRecord * param0) +int sub_020297AC(const SecretBaseRecord *param0) { return param0->unk_2C_0; } -void sub_020297B4 (SecretBaseRecord * param0) +void sub_020297B4(SecretBaseRecord *param0) { if (param0->unk_2C_0 < 999999) { param0->unk_2C_0++; } } -int sub_020297E4 (const SecretBaseRecord * param0) +int sub_020297E4(const SecretBaseRecord *param0) { return param0->unk_30_0; } -void sub_020297EC (SecretBaseRecord * param0) +void sub_020297EC(SecretBaseRecord *param0) { if (param0->unk_30_0 < 999999) { param0->unk_30_0++; } } -int sub_0202981C (const SecretBaseRecord * param0) +int sub_0202981C(const SecretBaseRecord *param0) { return param0->unk_34_0; } -void sub_02029824 (SecretBaseRecord * param0) +void sub_02029824(SecretBaseRecord *param0) { if (param0->unk_34_0 < 999999) { param0->unk_34_0++; } } -void sub_02029854 (UnkStruct_02029894 * param0, int param1, int param2, int param3) +void sub_02029854(UnkStruct_02029894 *param0, int param1, int param2, int param3) { param0->unk_8C = param1; param0->unk_8E = param2; @@ -1341,50 +1338,50 @@ void sub_02029854 (UnkStruct_02029894 * param0, int param1, int param2, int para param0->unk_91 = 1; } -int sub_02029874 (const UnkStruct_02029894 * param0) +int sub_02029874(const UnkStruct_02029894 *param0) { return param0->unk_8C; } -int sub_0202987C (const UnkStruct_02029894 * param0) +int sub_0202987C(const UnkStruct_02029894 *param0) { return param0->unk_8E; } -int sub_02029884 (const UnkStruct_02029894 * param0) +int sub_02029884(const UnkStruct_02029894 *param0) { return param0->unk_90; } -BOOL sub_0202988C (const UnkStruct_02029894 * param0) +BOOL sub_0202988C(const UnkStruct_02029894 *param0) { return param0->unk_91; } -UnkStruct_02029894 * sub_02029894 (SaveData * param0) +UnkStruct_02029894 *sub_02029894(SaveData *param0) { - UndergroundData * v0; + UndergroundData *v0; v0 = SaveData_SaveTable(param0, 12); return &v0->unk_00; } -SecretBaseRecord * SaveData_SecretBaseRecord (SaveData * param0) +SecretBaseRecord *SaveData_SecretBaseRecord(SaveData *param0) { - UndergroundData * v0; + UndergroundData *v0; v0 = SaveData_SaveTable(param0, 12); return &v0->unk_00.unk_50; } -SecretBaseRecord * sub_020298AC (UnkStruct_02029894 * param0) +SecretBaseRecord *sub_020298AC(UnkStruct_02029894 *param0) { return ¶m0->unk_50; } -UndergroundData * sub_020298B0 (SaveData * param0) +UndergroundData *sub_020298B0(SaveData *param0) { - UndergroundData * v0; + UndergroundData *v0; v0 = SaveData_SaveTable(param0, 12); return v0; diff --git a/src/unk_020298BC.c b/src/unk_020298BC.c index 5ed50ebd64..aa9427567d 100644 --- a/src/unk_020298BC.c +++ b/src/unk_020298BC.c @@ -1,27 +1,24 @@ +#include "unk_020298BC.h" + #include #include -#include "inlines.h" - -#include "strbuf.h" -#include "pokemon.h" -#include "savedata.h" - #include "struct_defs/sentence.h" #include "struct_defs/struct_020298D8.h" + +#include "overlay022/ov22_02259098.h" #include "overlay022/struct_ov22_02255040.h" #include "overlay061/struct_ov61_0222AE80.h" #include "overlay061/struct_ov61_0222AE80_sub2.h" #include "overlay061/struct_ov61_0222BED8_sub2_sub1_sub1_sub1.h" -#include "unk_02014A84.h" -#include "unk_02015064.h" #include "heap.h" -#include "strbuf.h" -#include "savedata.h" -#include "unk_020298BC.h" +#include "inlines.h" #include "pokemon.h" -#include "overlay022/ov22_02259098.h" +#include "savedata.h" +#include "strbuf.h" +#include "unk_02014A84.h" +#include "unk_02015064.h" typedef struct UnkStruct_0202A138_t { u32 unk_00; @@ -74,7 +71,7 @@ typedef struct UnkStruct_0202A750_t { UnkStruct_02029D04 unk_7A4; } UnkStruct_0202A750; -static BOOL sub_020298BC (u32 param0) +static BOOL sub_020298BC(u32 param0) { if ((param0 == 0x1234) || (param0 == 0x2345)) { return 1; @@ -83,29 +80,29 @@ static BOOL sub_020298BC (u32 param0) return 0; } -static inline BOOL inline_02029CA8 (const UnkStruct_02029C68 * param0) +static inline BOOL inline_02029CA8(const UnkStruct_02029C68 *param0) { return sub_020298BC(param0->unk_00); } -static inline BOOL inline_02029CD0 (const UnkStruct_02029C88 * param0) +static inline BOOL inline_02029CD0(const UnkStruct_02029C88 *param0) { return sub_020298BC(param0->unk_00); } -static inline void inline_02029BFC (UnkStruct_02029C68 * param0) +static inline void inline_02029BFC(UnkStruct_02029C68 *param0) { memset(param0, 0, sizeof(UnkStruct_02029C68)); param0->unk_00 = 0x1234; } -static inline void inline_02029BFC_1 (UnkStruct_02029C88 * param0) +static inline void inline_02029BFC_1(UnkStruct_02029C88 *param0) { memset(param0, 0, sizeof(UnkStruct_02029C88)); param0->unk_00 = 0x1234; } -static void sub_020298D8 (UnkStruct_020298D8 * param0, u8 * param1, u8 * param2, s8 * param3) +static void sub_020298D8(UnkStruct_020298D8 *param0, u8 *param1, u8 *param2, s8 *param3) { int v0, v1; int v2; @@ -122,7 +119,7 @@ static void sub_020298D8 (UnkStruct_020298D8 * param0, u8 * param1, u8 * param2, *param3 = v2; } -static void sub_0202992C (UnkStruct_0202A138 * param0, Pokemon * param1, u8 param2, u8 param3, s8 param4) +static void sub_0202992C(UnkStruct_0202A138 *param0, Pokemon *param1, u8 param2, u8 param3, s8 param4) { param0->unk_08 = Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL); Pokemon_GetValue(param1, MON_DATA_NICKNAME, param0->unk_0A); @@ -136,7 +133,7 @@ static void sub_0202992C (UnkStruct_0202A138 * param0, Pokemon * param1, u8 para param0->unk_30 = param4; } -static void sub_02029990 (UnkStruct_0202A138 * param0, Pokemon * param1, UnkStruct_020298D8 * param2) +static void sub_02029990(UnkStruct_0202A138 *param0, Pokemon *param1, UnkStruct_020298D8 *param2) { u8 v0, v1; s8 v2; @@ -145,20 +142,20 @@ static void sub_02029990 (UnkStruct_0202A138 * param0, Pokemon * param1, UnkStru sub_0202992C(param0, param1, v0, v1, v2); } -static void sub_020299C0 (UnkStruct_0202A138 * param0, const Strbuf *param1, int param2) +static void sub_020299C0(UnkStruct_0202A138 *param0, const Strbuf *param1, int param2) { Strbuf_ToChars(param1, param0->unk_20, 8); param0->unk_34 = param2; } -static void sub_020299D8 (const UnkStruct_0202A138 * param0, Pokemon * param1) +static void sub_020299D8(const UnkStruct_0202A138 *param0, Pokemon *param1) { Pokemon_InitWith(param1, param0->unk_08, 0, 0, 1, param0->unk_00, 1, param0->unk_04); Pokemon_SetValue(param1, 117, param0->unk_0A); Pokemon_SetValue(param1, 112, ¶m0->unk_33); } -static void sub_02029A18 (UnkStruct_0202A150 * param0, u8 param1, u8 param2, u8 param3, u8 param4) +static void sub_02029A18(UnkStruct_0202A150 *param0, u8 param1, u8 param2, u8 param3, u8 param4) { param0->unk_00 = param1; param0->unk_01 = param2; @@ -166,7 +163,7 @@ static void sub_02029A18 (UnkStruct_0202A150 * param0, u8 param1, u8 param2, u8 param0->unk_03 = param4; } -static void sub_02029A2C (u32 * param0, u8 param1, u8 param2) +static void sub_02029A2C(u32 *param0, u8 param1, u8 param2) { u8 v0; u8 v1; @@ -182,7 +179,7 @@ static void sub_02029A2C (u32 * param0, u8 param1, u8 param2) param0[v0] |= (param1 << v1); } -static u8 sub_02029A70 (const u32 * param0, u8 param1) +static u8 sub_02029A70(const u32 *param0, u8 param1) { u8 v0; u8 v1; @@ -202,7 +199,7 @@ static u8 sub_02029A70 (const u32 * param0, u8 param1) return v0; } -static void sub_02029AB0 (u32 * param0, u8 param1, u8 param2) +static void sub_02029AB0(u32 *param0, u8 param1, u8 param2) { u8 v0; u8 v1; @@ -218,7 +215,7 @@ static void sub_02029AB0 (u32 * param0, u8 param1, u8 param2) param0[v0] |= (param1 << v1); } -static u8 sub_02029AF0 (const u32 * param0, u8 param1) +static u8 sub_02029AF0(const u32 *param0, u8 param1) { u8 v0; u8 v1; @@ -231,7 +228,7 @@ static u8 sub_02029AF0 (const u32 * param0, u8 param1) return (param0[v0] >> v1) & 0x1; } -static void sub_02029B18 (u32 * param0, u8 param1, u8 param2) +static void sub_02029B18(u32 *param0, u8 param1, u8 param2) { u8 v0; u8 v1; @@ -247,7 +244,7 @@ static void sub_02029B18 (u32 * param0, u8 param1, u8 param2) param0[v0] |= (param1 << v1); } -static u8 sub_02029B5C (const u32 * param0, u8 param1) +static u8 sub_02029B5C(const u32 *param0, u8 param1) { u8 v0; u8 v1; @@ -260,7 +257,7 @@ static u8 sub_02029B5C (const u32 * param0, u8 param1) return (param0[v0] >> v1) & 0xff; } -static u8 sub_02029B80 (const u32 * param0) +static u8 sub_02029B80(const u32 *param0) { int v0; int v1; @@ -276,7 +273,7 @@ static u8 sub_02029B80 (const u32 * param0) return v1; } -static BOOL sub_02029BA4 (u32 param0) +static BOOL sub_02029BA4(u32 param0) { if (param0 < 61) { return 1; @@ -285,13 +282,13 @@ static BOOL sub_02029BA4 (u32 param0) return 0; } -static inline u8 inline_02029D94 (u32 param0) +static inline u8 inline_02029D94(u32 param0) { GF_ASSERT(param0 >= 61); return param0 - 61; } -static void sub_02029BB0 (UnkStruct_02029D04 * param0) +static void sub_02029BB0(UnkStruct_02029D04 *param0) { int v0; @@ -302,7 +299,7 @@ static void sub_02029BB0 (UnkStruct_02029D04 * param0) } } -static void sub_02029BD8 (Pokemon * param0, u8 * param1, u8 * param2) +static void sub_02029BD8(Pokemon *param0, u8 *param1, u8 *param2) { u8 v0 = Pokemon_DPSpriteYOffset(param0, 2); @@ -311,7 +308,7 @@ static void sub_02029BD8 (Pokemon * param0, u8 * param1, u8 * param2) *param2 += (5 * 8); } -void ImageClip_Init (UnkStruct_0202A750 * param0) +void ImageClip_Init(UnkStruct_0202A750 *param0) { int v0; @@ -326,24 +323,24 @@ void ImageClip_Init (UnkStruct_0202A750 * param0) sub_02029BB0(¶m0->unk_7A4); } -int ImageClip_SaveSize (void) +int ImageClip_SaveSize(void) { return sizeof(UnkStruct_0202A750); } -int sub_02029C60 (void) +int sub_02029C60(void) { return sizeof(UnkStruct_02029C68); } -int sub_02029C64 (void) +int sub_02029C64(void) { return sizeof(UnkStruct_02029C88); } -UnkStruct_02029C68 * sub_02029C68 (u32 param0) +UnkStruct_02029C68 *sub_02029C68(u32 param0) { - UnkStruct_02029C68 * v0; + UnkStruct_02029C68 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02029C68)); inline_02029BFC(v0); @@ -351,9 +348,9 @@ UnkStruct_02029C68 * sub_02029C68 (u32 param0) return v0; } -UnkStruct_02029C88 * sub_02029C88 (u32 param0) +UnkStruct_02029C88 *sub_02029C88(u32 param0) { - UnkStruct_02029C88 * v0; + UnkStruct_02029C88 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02029C88)); inline_02029BFC_1(v0); @@ -361,7 +358,7 @@ UnkStruct_02029C88 * sub_02029C88 (u32 param0) return v0; } -UnkStruct_02029C68 * sub_02029CA8 (UnkStruct_0202A750 * param0, int param1) +UnkStruct_02029C68 *sub_02029CA8(UnkStruct_0202A750 *param0, int param1) { GF_ASSERT(param1 < 11); GF_ASSERT(inline_02029CA8(¶m0->unk_00[param1])); @@ -369,7 +366,7 @@ UnkStruct_02029C68 * sub_02029CA8 (UnkStruct_0202A750 * param0, int param1) return ¶m0->unk_00[param1]; } -UnkStruct_02029C88 * sub_02029CD0 (UnkStruct_0202A750 * param0, int param1) +UnkStruct_02029C88 *sub_02029CD0(UnkStruct_0202A750 *param0, int param1) { GF_ASSERT(param1 < 5); GF_ASSERT(inline_02029CD0(¶m0->unk_4C8[param1])); @@ -377,24 +374,24 @@ UnkStruct_02029C88 * sub_02029CD0 (UnkStruct_0202A750 * param0, int param1) return ¶m0->unk_4C8[param1]; } -UnkStruct_02029D04 * sub_02029D04 (UnkStruct_0202A750 * param0) +UnkStruct_02029D04 *sub_02029D04(UnkStruct_0202A750 *param0) { return ¶m0->unk_7A4; } -BOOL sub_02029D10 (const UnkStruct_0202A750 * param0, int param1) +BOOL sub_02029D10(const UnkStruct_0202A750 *param0, int param1) { GF_ASSERT(param1 < 11); return sub_02029F34(¶m0->unk_00[param1]); } -BOOL sub_02029D2C (const UnkStruct_0202A750 * param0, int param1) +BOOL sub_02029D2C(const UnkStruct_0202A750 *param0, int param1) { GF_ASSERT(param1 < 5); return sub_0202A218(¶m0->unk_4C8[param1]); } -BOOL sub_02029D50 (const UnkStruct_02029D04 * param0, u32 param1, u32 param2) +BOOL sub_02029D50(const UnkStruct_02029D04 *param0, u32 param1, u32 param2) { u32 v0; BOOL v1 = 1; @@ -418,7 +415,7 @@ BOOL sub_02029D50 (const UnkStruct_02029D04 * param0, u32 param1, u32 param2) return v1; } -BOOL sub_02029D80 (const UnkStruct_02029D04 * param0, u32 param1) +BOOL sub_02029D80(const UnkStruct_02029D04 *param0, u32 param1) { u32 v0; @@ -431,7 +428,7 @@ BOOL sub_02029D80 (const UnkStruct_02029D04 * param0, u32 param1) return 0; } -u32 sub_02029D94 (const UnkStruct_02029D04 * param0, u32 param1) +u32 sub_02029D94(const UnkStruct_02029D04 *param0, u32 param1) { u32 v0; @@ -447,7 +444,7 @@ u32 sub_02029D94 (const UnkStruct_02029D04 * param0, u32 param1) return v0; } -u32 sub_02029DD4 (const UnkStruct_02029D04 * param0, u32 param1) +u32 sub_02029DD4(const UnkStruct_02029D04 *param0, u32 param1) { BOOL v0; @@ -457,7 +454,7 @@ u32 sub_02029DD4 (const UnkStruct_02029D04 * param0, u32 param1) return v0; } -u32 sub_02029DF0 (const UnkStruct_02029D04 * param0) +u32 sub_02029DF0(const UnkStruct_02029D04 *param0) { int v0; int v1; @@ -471,7 +468,7 @@ u32 sub_02029DF0 (const UnkStruct_02029D04 * param0) return v1; } -u32 sub_02029E0C (const UnkStruct_02029D04 * param0) +u32 sub_02029E0C(const UnkStruct_02029D04 *param0) { int v0; int v1 = 0; @@ -485,7 +482,7 @@ u32 sub_02029E0C (const UnkStruct_02029D04 * param0) return v1; } -void sub_02029E2C (UnkStruct_02029D04 * param0, u32 param1, u32 param2) +void sub_02029E2C(UnkStruct_02029D04 *param0, u32 param1, u32 param2) { u8 v0; @@ -513,7 +510,7 @@ void sub_02029E2C (UnkStruct_02029D04 * param0, u32 param1, u32 param2) } } -void sub_02029EA0 (UnkStruct_02029D04 * param0, u32 param1, u32 param2) +void sub_02029EA0(UnkStruct_02029D04 *param0, u32 param1, u32 param2) { u8 v0; @@ -537,7 +534,7 @@ void sub_02029EA0 (UnkStruct_02029D04 * param0, u32 param1, u32 param2) } } -void sub_02029EFC (UnkStruct_02029D04 * param0, u32 param1) +void sub_02029EFC(UnkStruct_02029D04 *param0, u32 param1) { u8 v0; @@ -550,7 +547,7 @@ void sub_02029EFC (UnkStruct_02029D04 * param0, u32 param1) } } -BOOL sub_02029F34 (const UnkStruct_02029C68 * param0) +BOOL sub_02029F34(const UnkStruct_02029C68 *param0) { GF_ASSERT(inline_02029CA8(param0)); @@ -561,7 +558,7 @@ BOOL sub_02029F34 (const UnkStruct_02029C68 * param0) return 0; } -void sub_02029F5C (UnkStruct_02029C68 * param0) +void sub_02029F5C(UnkStruct_02029C68 *param0) { GF_ASSERT(inline_02029CA8(param0)); @@ -569,19 +566,19 @@ void sub_02029F5C (UnkStruct_02029C68 * param0) param0->unk_71 = Unk_020E4C44; } -void sub_02029F84 (UnkStruct_02029C68 * param0) +void sub_02029F84(UnkStruct_02029C68 *param0) { GF_ASSERT(inline_02029CA8(param0)); inline_02029BFC(param0); } -void sub_02029FAC (UnkStruct_02029C68 * param0, Pokemon * param1, UnkStruct_020298D8 * param2) +void sub_02029FAC(UnkStruct_02029C68 *param0, Pokemon *param1, UnkStruct_020298D8 *param2) { GF_ASSERT(inline_02029CA8(param0)); sub_02029990(¶m0->unk_04, param1, param2); } -void sub_02029FD0 (UnkStruct_02029C68 * param0, const UnkStruct_ov22_02255040 * param1, int param2) +void sub_02029FD0(UnkStruct_02029C68 *param0, const UnkStruct_ov22_02255040 *param1, int param2) { NNSG2dSVec2 v0 = sub_0201525C(param1->unk_04); int v1 = sub_02015290(param1->unk_04); @@ -598,13 +595,13 @@ void sub_02029FD0 (UnkStruct_02029C68 * param0, const UnkStruct_ov22_02255040 * param0->unk_3C |= 1 << param2; } -void sub_0202A084 (UnkStruct_02029C68 * param0, u8 param1) +void sub_0202A084(UnkStruct_02029C68 *param0, u8 param1) { GF_ASSERT(inline_02029CA8(param0)); param0->unk_70 = param1; } -void sub_0202A0A0 (UnkStruct_02029C68 * param0, u16 param1) +void sub_0202A0A0(UnkStruct_02029C68 *param0, u16 param1) { GF_ASSERT(inline_02029CA8(param0)); @@ -612,19 +609,19 @@ void sub_0202A0A0 (UnkStruct_02029C68 * param0, u16 param1) sub_02014CF8(¶m0->unk_40, 0, param1); } -void sub_0202A0CC (UnkStruct_02029C68 * param0, const UnkStruct_02029C68 * param1) +void sub_0202A0CC(UnkStruct_02029C68 *param0, const UnkStruct_02029C68 *param1) { GF_ASSERT(inline_02029CA8(param0)); memcpy(param0, param1, sizeof(UnkStruct_02029C68)); } -void sub_0202A0EC (UnkStruct_02029C68 * param0, const Strbuf *param1, int param2) +void sub_0202A0EC(UnkStruct_02029C68 *param0, const Strbuf *param1, int param2) { GF_ASSERT(inline_02029CA8(param0)); sub_020299C0(¶m0->unk_04, param1, param2); } -BOOL sub_0202A110 (const UnkStruct_02029C68 * param0, int param1) +BOOL sub_0202A110(const UnkStruct_02029C68 *param0, int param1) { GF_ASSERT(param1 < (11 - 1)); GF_ASSERT(inline_02029CA8(param0)); @@ -632,13 +629,13 @@ BOOL sub_0202A110 (const UnkStruct_02029C68 * param0, int param1) return param0->unk_3C & (1 << param1); } -const UnkStruct_0202A138 * sub_0202A138 (const UnkStruct_02029C68 * param0) +const UnkStruct_0202A138 *sub_0202A138(const UnkStruct_02029C68 *param0) { GF_ASSERT(inline_02029CA8(param0)); return ¶m0->unk_04; } -const UnkStruct_0202A150 * sub_0202A150 (const UnkStruct_02029C68 * param0, int param1) +const UnkStruct_0202A150 *sub_0202A150(const UnkStruct_02029C68 *param0, int param1) { GF_ASSERT(param1 < (11 - 1)); GF_ASSERT(param0->unk_3C & (1 << param1)); @@ -647,43 +644,43 @@ const UnkStruct_0202A150 * sub_0202A150 (const UnkStruct_02029C68 * param0, int return ¶m0->unk_48[param1]; } -u16 sub_0202A184 (const UnkStruct_02029C68 * param0) +u16 sub_0202A184(const UnkStruct_02029C68 *param0) { GF_ASSERT(inline_02029CA8(param0)); return sub_0202A5E8(¶m0->unk_04); } -void sub_0202A1A0 (const UnkStruct_02029C68 * param0, Strbuf *param1) +void sub_0202A1A0(const UnkStruct_02029C68 *param0, Strbuf *param1) { GF_ASSERT(inline_02029CA8(param0)); sub_0202A5EC(¶m0->unk_04, param1); } -u32 sub_0202A1C0 (const UnkStruct_02029C68 * param0) +u32 sub_0202A1C0(const UnkStruct_02029C68 *param0) { GF_ASSERT(inline_02029CA8(param0)); return sub_0202A5FC(¶m0->unk_04); } -u8 sub_0202A1DC (const UnkStruct_02029C68 * param0) +u8 sub_0202A1DC(const UnkStruct_02029C68 *param0) { GF_ASSERT(inline_02029CA8(param0)); return param0->unk_70; } -u16 sub_0202A1F4 (const UnkStruct_02029C68 * param0) +u16 sub_0202A1F4(const UnkStruct_02029C68 *param0) { u16 v0 = sub_02014C78(¶m0->unk_40, 0); return v0; } -u8 sub_0202A200 (const UnkStruct_02029C68 * param0) +u8 sub_0202A200(const UnkStruct_02029C68 *param0) { GF_ASSERT(inline_02029CA8(param0)); return param0->unk_71; } -BOOL sub_0202A218 (const UnkStruct_02029C88 * param0) +BOOL sub_0202A218(const UnkStruct_02029C88 *param0) { GF_ASSERT(inline_02029CD0(param0)); @@ -694,25 +691,25 @@ BOOL sub_0202A218 (const UnkStruct_02029C88 * param0) return 0; } -void sub_0202A240 (UnkStruct_02029C88 * param0) +void sub_0202A240(UnkStruct_02029C88 *param0) { GF_ASSERT(inline_02029CD0(param0)); param0->unk_00 = 0x2345; } -void sub_0202A25C (UnkStruct_02029C88 * param0) +void sub_0202A25C(UnkStruct_02029C88 *param0) { GF_ASSERT(inline_02029CD0(param0)); inline_02029BFC_1(param0); } -void sub_0202A284 (UnkStruct_02029C88 * param0, Pokemon * param1, UnkStruct_020298D8 * param2) +void sub_0202A284(UnkStruct_02029C88 *param0, Pokemon *param1, UnkStruct_020298D8 *param2) { GF_ASSERT(inline_02029CD0(param0)); sub_02029990(¶m0->unk_08, param1, param2); } -void sub_0202A2A8 (UnkStruct_02029C88 * param0, const UnkStruct_ov22_02255040 * param1, int param2) +void sub_0202A2A8(UnkStruct_02029C88 *param0, const UnkStruct_ov22_02255040 *param1, int param2) { NNSG2dSVec2 v0 = sub_0201525C(param1->unk_04); int v1 = sub_02015290(param1->unk_04); @@ -729,25 +726,25 @@ void sub_0202A2A8 (UnkStruct_02029C88 * param0, const UnkStruct_ov22_02255040 * param0->unk_40 |= 1 << param2; } -void sub_0202A35C (UnkStruct_02029C88 * param0, u8 param1) +void sub_0202A35C(UnkStruct_02029C88 *param0, u8 param1) { GF_ASSERT(inline_02029CD0(param0)); param0->unk_94 = param1; } -void sub_0202A378 (UnkStruct_02029C88 * param0, u32 param1) +void sub_0202A378(UnkStruct_02029C88 *param0, u32 param1) { GF_ASSERT(inline_02029CD0(param0)); param0->unk_04 = param1; } -void sub_0202A390 (UnkStruct_02029C88 * param0, const UnkStruct_02029C88 * param1) +void sub_0202A390(UnkStruct_02029C88 *param0, const UnkStruct_02029C88 *param1) { GF_ASSERT(inline_02029CD0(param0)); memcpy(param0, param1, sizeof(UnkStruct_02029C88)); } -void sub_0202A3B0 (UnkStruct_02029C88 * param0, Pokemon * param1, s8 param2) +void sub_0202A3B0(UnkStruct_02029C88 *param0, Pokemon *param1, s8 param2) { u8 v0; u8 v1; @@ -758,7 +755,7 @@ void sub_0202A3B0 (UnkStruct_02029C88 * param0, Pokemon * param1, s8 param2) sub_0202992C(¶m0->unk_08, param1, v0, v1, param2); } -void sub_0202A3EC (UnkStruct_02029C88 * param0, u32 param1, u8 param2, u8 param3, u8 param4, s8 param5) +void sub_0202A3EC(UnkStruct_02029C88 *param0, u32 param1, u8 param2, u8 param3, u8 param4, s8 param5) { GF_ASSERT(param1 < (21 - 1)); GF_ASSERT(param2 < 100); @@ -776,7 +773,7 @@ void sub_0202A3EC (UnkStruct_02029C88 * param0, u32 param1, u8 param2, u8 param3 param0->unk_40 |= 1 << param1; } -BOOL sub_0202A488 (const UnkStruct_02029C88 * param0, int param1) +BOOL sub_0202A488(const UnkStruct_02029C88 *param0, int param1) { GF_ASSERT(param1 < (21 - 1)); GF_ASSERT(inline_02029CD0(param0)); @@ -788,19 +785,19 @@ BOOL sub_0202A488 (const UnkStruct_02029C88 * param0, int param1) return 0; } -void sub_0202A4B4 (UnkStruct_02029C88 * param0, const Strbuf *param1, int param2) +void sub_0202A4B4(UnkStruct_02029C88 *param0, const Strbuf *param1, int param2) { GF_ASSERT(inline_02029CD0(param0)); sub_020299C0(¶m0->unk_08, param1, param2); } -const UnkStruct_0202A138 * sub_0202A4D8 (const UnkStruct_02029C88 * param0) +const UnkStruct_0202A138 *sub_0202A4D8(const UnkStruct_02029C88 *param0) { GF_ASSERT(inline_02029CD0(param0)); return ¶m0->unk_08; } -const UnkStruct_0202A150 * sub_0202A4F0 (const UnkStruct_02029C88 * param0, int param1) +const UnkStruct_0202A150 *sub_0202A4F0(const UnkStruct_02029C88 *param0, int param1) { GF_ASSERT(param1 < (21 - 1)); GF_ASSERT(param0->unk_40 & (1 << param1)); @@ -809,25 +806,25 @@ const UnkStruct_0202A150 * sub_0202A4F0 (const UnkStruct_02029C88 * param0, int return ¶m0->unk_44[param1]; } -void sub_0202A524 (const UnkStruct_02029C88 * param0, Strbuf *param1) +void sub_0202A524(const UnkStruct_02029C88 *param0, Strbuf *param1) { GF_ASSERT(inline_02029CD0(param0)); sub_0202A5EC(¶m0->unk_08, param1); } -u32 sub_0202A544 (const UnkStruct_02029C88 * param0) +u32 sub_0202A544(const UnkStruct_02029C88 *param0) { GF_ASSERT(inline_02029CD0(param0)); return sub_0202A5FC(¶m0->unk_08); } -void sub_0202A560 (const UnkStruct_02029C88 * param0, Pokemon * param1) +void sub_0202A560(const UnkStruct_02029C88 *param0, Pokemon *param1) { GF_ASSERT(inline_02029CD0(param0)); sub_020299D8(¶m0->unk_08, param1); } -u8 sub_0202A580 (const UnkStruct_02029C88 * param0, int param1) +u8 sub_0202A580(const UnkStruct_02029C88 *param0, int param1) { GF_ASSERT(param1 < (21 - 1)); GF_ASSERT(param0->unk_40 & (1 << param1)); @@ -836,77 +833,77 @@ u8 sub_0202A580 (const UnkStruct_02029C88 * param0, int param1) return sub_0202A624(¶m0->unk_44[param1]); } -u8 sub_0202A5B8 (const UnkStruct_02029C88 * param0) +u8 sub_0202A5B8(const UnkStruct_02029C88 *param0) { GF_ASSERT(inline_02029CD0(param0)); return param0->unk_94; } -u32 sub_0202A5D0 (const UnkStruct_02029C88 * param0) +u32 sub_0202A5D0(const UnkStruct_02029C88 *param0) { GF_ASSERT(inline_02029CD0(param0)); return param0->unk_04; } -u16 sub_0202A5E8 (const UnkStruct_0202A138 * param0) +u16 sub_0202A5E8(const UnkStruct_0202A138 *param0) { return param0->unk_08; } -void sub_0202A5EC (const UnkStruct_0202A138 * param0, Strbuf *param1) +void sub_0202A5EC(const UnkStruct_0202A138 *param0, Strbuf *param1) { Strbuf_CopyChars(param1, param0->unk_20); } -u32 sub_0202A5FC (const UnkStruct_0202A138 * param0) +u32 sub_0202A5FC(const UnkStruct_0202A138 *param0) { return param0->unk_34; } -s8 sub_0202A604 (const UnkStruct_0202A138 * param0) +s8 sub_0202A604(const UnkStruct_0202A138 *param0) { return param0->unk_30; } -u8 sub_0202A60C (const UnkStruct_0202A138 * param0) +u8 sub_0202A60C(const UnkStruct_0202A138 *param0) { return param0->unk_31; } -u8 sub_0202A614 (const UnkStruct_0202A138 * param0) +u8 sub_0202A614(const UnkStruct_0202A138 *param0) { return param0->unk_32; } -void sub_0202A61C (const UnkStruct_0202A138 * param0, Pokemon * param1) +void sub_0202A61C(const UnkStruct_0202A138 *param0, Pokemon *param1) { sub_020299D8(param0, param1); } -u8 sub_0202A624 (const UnkStruct_0202A150 * param0) +u8 sub_0202A624(const UnkStruct_0202A150 *param0) { return param0->unk_00; } -u8 sub_0202A628 (const UnkStruct_0202A150 * param0) +u8 sub_0202A628(const UnkStruct_0202A150 *param0) { return param0->unk_01; } -u8 sub_0202A62C (const UnkStruct_0202A150 * param0) +u8 sub_0202A62C(const UnkStruct_0202A150 *param0) { return param0->unk_02; } -s8 sub_0202A630 (const UnkStruct_0202A150 * param0) +s8 sub_0202A630(const UnkStruct_0202A150 *param0) { return param0->unk_03; } -static BOOL sub_0202A638 (UnkStruct_0202A750 * param0, const UnkStruct_02029C68 * param1) +static BOOL sub_0202A638(UnkStruct_0202A750 *param0, const UnkStruct_02029C68 *param1) { int v0; - const void * v1; + const void *v1; u32 v2, v3; MATHCRC32Table v4; BOOL v5 = 1; @@ -932,11 +929,11 @@ static BOOL sub_0202A638 (UnkStruct_0202A750 * param0, const UnkStruct_02029C68 return v5; } -void sub_0202A6A8 (u8 param0, int param1, UnkStruct_0202A750 * param2, const void ** param3) +void sub_0202A6A8(u8 param0, int param1, UnkStruct_0202A750 *param2, const void **param3) { int v0; - UnkStruct_02029C68 * v1; - const UnkStruct_02029C68 * v2; + UnkStruct_02029C68 *v1; + const UnkStruct_02029C68 *v2; int v3; int v4; @@ -984,15 +981,15 @@ void sub_0202A6A8 (u8 param0, int param1, UnkStruct_0202A750 * param2, const voi } } -UnkStruct_0202A750 * sub_0202A750 (SaveData * param0) +UnkStruct_0202A750 *sub_0202A750(SaveData *param0) { - UnkStruct_0202A750 * v0 = NULL; + UnkStruct_0202A750 *v0 = NULL; v0 = SaveData_SaveTable(param0, 14); return v0; } -void sub_0202A75C (const UnkStruct_02029C68 * param0, UnkStruct_ov61_0222AE80 * param1) +void sub_0202A75C(const UnkStruct_02029C68 *param0, UnkStruct_ov61_0222AE80 *param1) { int v0; @@ -1026,7 +1023,7 @@ void sub_0202A75C (const UnkStruct_02029C68 * param0, UnkStruct_ov61_0222AE80 * param1->unk_59 = param0->unk_71; } -void sub_0202A824 (const UnkStruct_ov61_0222AE80 * param0, UnkStruct_02029C68 * param1) +void sub_0202A824(const UnkStruct_ov61_0222AE80 *param0, UnkStruct_02029C68 *param1) { int v0; int v1; diff --git a/src/unk_0202ACE0.c b/src/unk_0202ACE0.c index fda24fb182..00b64a0908 100644 --- a/src/unk_0202ACE0.c +++ b/src/unk_0202ACE0.c @@ -1,27 +1,24 @@ +#include "unk_0202ACE0.h" + +#include #include #include -#include - -#include "assert.h" - -#include "strbuf.h" -#include "savedata.h" #include "struct_defs/struct_0202B370.h" #include "struct_defs/struct_0202B370_sub1.h" +#include "assert.h" #include "rtc.h" -#include "strbuf.h" #include "savedata.h" -#include "unk_0202ACE0.h" +#include "strbuf.h" #include "unk_02038FFC.h" -int WiFiList_SaveSize (void) +int WiFiList_SaveSize(void) { return sizeof(UnkStruct_0202B370); } -void WiFiList_Init (UnkStruct_0202B370 * param0) +void WiFiList_Init(UnkStruct_0202B370 *param0) { int v0; @@ -36,12 +33,12 @@ void WiFiList_Init (UnkStruct_0202B370 * param0) sub_02039034(param0); } -DWCUserData * sub_0202AD28 (UnkStruct_0202B370 * param0) +DWCUserData *sub_0202AD28(UnkStruct_0202B370 *param0) { return &(param0->unk_00); } -u32 sub_0202AD2C (UnkStruct_0202B370 * param0, int param1, int param2) +u32 sub_0202AD2C(UnkStruct_0202B370 *param0, int param1, int param2) { u32 v0; @@ -92,7 +89,7 @@ u32 sub_0202AD2C (UnkStruct_0202B370 * param0, int param1, int param2) return v0; } -void sub_0202AE2C (UnkStruct_0202B370 * param0, int param1, int param2, u32 param3) +void sub_0202AE2C(UnkStruct_0202B370 *param0, int param1, int param2, u32 param3) { GF_ASSERT(param1 < 32); @@ -130,43 +127,43 @@ void sub_0202AE2C (UnkStruct_0202B370 * param0, int param1, int param2, u32 para } } -DWCFriendData * sub_0202AED8 (UnkStruct_0202B370 * param0, int param1) +DWCFriendData *sub_0202AED8(UnkStruct_0202B370 *param0, int param1) { GF_ASSERT(param1 < 32); return &(param0->unk_40[param1]); } -u16 * sub_0202AEF0 (UnkStruct_0202B370 * param0, int param1) +u16 *sub_0202AEF0(UnkStruct_0202B370 *param0, int param1) { GF_ASSERT(param1 < 32); return param0->unk_1C0[param1].unk_10; } -void sub_0202AF0C (UnkStruct_0202B370 * param0, int param1, Strbuf *param2) +void sub_0202AF0C(UnkStruct_0202B370 *param0, int param1, Strbuf *param2) { GF_ASSERT(param1 < 32); Strbuf_ToChars(param2, param0->unk_1C0[param1].unk_10, sizeof(param0->unk_1C0[param1].unk_10)); } -u16 * sub_0202AF34 (UnkStruct_0202B370 * param0, int param1) +u16 *sub_0202AF34(UnkStruct_0202B370 *param0, int param1) { GF_ASSERT(param1 < 32); return param0->unk_1C0[param1].unk_00; } -void sub_0202AF50 (UnkStruct_0202B370 * param0, int param1, Strbuf *param2) +void sub_0202AF50(UnkStruct_0202B370 *param0, int param1, Strbuf *param2) { GF_ASSERT(param1 < 32); Strbuf_ToChars(param2, param0->unk_1C0[param1].unk_00, sizeof(param0->unk_1C0[param1].unk_00)); } -BOOL sub_0202AF78 (UnkStruct_0202B370 * param0, int param1) +BOOL sub_0202AF78(UnkStruct_0202B370 *param0, int param1) { GF_ASSERT(param1 < 32); return DWC_IsValidFriendData(¶m0->unk_40[param1]); } -int sub_0202AF94 (UnkStruct_0202B370 * param0) +int sub_0202AF94(UnkStruct_0202B370 *param0) { int v0, v1 = 0; @@ -179,7 +176,7 @@ int sub_0202AF94 (UnkStruct_0202B370 * param0) return v1; } -int sub_0202AFB4 (UnkStruct_0202B370 * param0) +int sub_0202AFB4(UnkStruct_0202B370 *param0) { int v0, v1 = 0; @@ -192,7 +189,7 @@ int sub_0202AFB4 (UnkStruct_0202B370 * param0) return v1; } -void sub_0202AFD4 (UnkStruct_0202B370 * param0, int param1) +void sub_0202AFD4(UnkStruct_0202B370 *param0, int param1) { int v0; @@ -213,7 +210,7 @@ void sub_0202AFD4 (UnkStruct_0202B370 * param0, int param1) param0->unk_1C0[v0].unk_2E = 2; } -static void sub_0202B088 (UnkStruct_0202B370 * param0, int param1, int param2) +static void sub_0202B088(UnkStruct_0202B370 *param0, int param1, int param2) { int v0; @@ -227,7 +224,7 @@ static void sub_0202B088 (UnkStruct_0202B370 * param0, int param1, int param2) param0->unk_1C0[param2].unk_2E = 2; } -void sub_0202B0F8 (UnkStruct_0202B370 * param0) +void sub_0202B0F8(UnkStruct_0202B370 *param0) { int v0, v1 = -1; @@ -247,7 +244,7 @@ void sub_0202B0F8 (UnkStruct_0202B370 * param0) } } -void sub_0202B13C (UnkStruct_0202B370 * param0, int param1) +void sub_0202B13C(UnkStruct_0202B370 *param0, int param1) { RTCDate v0; @@ -258,7 +255,7 @@ void sub_0202B13C (UnkStruct_0202B370 * param0, int param1) param0->unk_1C0[param1].unk_2D = v0.day; } -void sub_0202B174 (UnkStruct_0202B370 * param0, int param1, int param2, int param3, int param4) +void sub_0202B174(UnkStruct_0202B370 *param0, int param1, int param2, int param3, int param4) { param0->unk_1C0[param1].unk_24 += param2; @@ -281,7 +278,7 @@ void sub_0202B174 (UnkStruct_0202B370 * param0, int param1, int param2, int para sub_0202B13C(param0, param1); } -void sub_0202B1D0 (UnkStruct_0202B370 * param0, int param1, int param2) +void sub_0202B1D0(UnkStruct_0202B370 *param0, int param1, int param2) { param0->unk_1C0[param1].unk_30 += param2; @@ -292,7 +289,7 @@ void sub_0202B1D0 (UnkStruct_0202B370 * param0, int param1, int param2) sub_0202B13C(param0, param1); } -void sub_0202B1F8 (UnkStruct_0202B370 * param0, int param1, int param2) +void sub_0202B1F8(UnkStruct_0202B370 *param0, int param1, int param2) { param0->unk_1C0[param1].unk_32 += param2; @@ -303,7 +300,7 @@ void sub_0202B1F8 (UnkStruct_0202B370 * param0, int param1, int param2) sub_0202B13C(param0, param1); } -void sub_0202B220 (UnkStruct_0202B370 * param0, int param1, int param2) +void sub_0202B220(UnkStruct_0202B370 *param0, int param1, int param2) { param0->unk_1C0[param1].unk_34 += param2; @@ -314,7 +311,7 @@ void sub_0202B220 (UnkStruct_0202B370 * param0, int param1, int param2) sub_0202B13C(param0, param1); } -void sub_0202B248 (UnkStruct_0202B370 * param0, int param1, int param2) +void sub_0202B248(UnkStruct_0202B370 *param0, int param1, int param2) { param0->unk_1C0[param1].unk_36 += param2; @@ -325,7 +322,7 @@ void sub_0202B248 (UnkStruct_0202B370 * param0, int param1, int param2) sub_0202B13C(param0, param1); } -void sub_0202B270 (UnkStruct_0202B370 * param0, int param1, int param2) +void sub_0202B270(UnkStruct_0202B370 *param0, int param1, int param2) { param0->unk_1C0[param2].unk_24 += param0->unk_1C0[param1].unk_24; @@ -377,9 +374,9 @@ void sub_0202B270 (UnkStruct_0202B370 * param0, int param1, int param2) param0->unk_1C0[param1].unk_2E = 2; } -UnkStruct_0202B370 * sub_0202B370 (SaveData * param0) +UnkStruct_0202B370 *sub_0202B370(SaveData *param0) { - UnkStruct_0202B370 * v0; + UnkStruct_0202B370 *v0; v0 = SaveData_SaveTable(param0, 29); return v0; diff --git a/src/unk_0202B37C.c b/src/unk_0202B37C.c index 86eb43bb2b..6614be5d1b 100644 --- a/src/unk_0202B37C.c +++ b/src/unk_0202B37C.c @@ -1,31 +1,29 @@ +#include "unk_0202B37C.h" + #include #include -#include "strbuf.h" -#include "savedata.h" - #include "struct_defs/struct_0202B4A0.h" #include "struct_defs/struct_0202B510.h" +#include "savedata.h" +#include "strbuf.h" #include "unk_020021B0.h" #include "unk_0201D15C.h" -#include "strbuf.h" -#include "savedata.h" -#include "unk_0202B37C.h" -UnkStruct_0202B4A0 * Unk_021C079C; +UnkStruct_0202B4A0 *Unk_021C079C; -int RandomGroup_SaveSize (void) +int RandomGroup_SaveSize(void) { return sizeof(UnkStruct_0202B4A0); } -void sub_0202B384 (UnkStruct_0202B4A0 * param0, int param1, int param2) +void sub_0202B384(UnkStruct_0202B4A0 *param0, int param1, int param2) { param0->unk_00[param2] = param0->unk_00[param1]; } -void RandomGroup_Init (UnkStruct_0202B4A0 * param0) +void RandomGroup_Init(UnkStruct_0202B4A0 *param0) { int v0; @@ -39,7 +37,7 @@ void RandomGroup_Init (UnkStruct_0202B4A0 * param0) Unk_021C079C = param0; } -void sub_0202B3D8 (UnkStruct_0202B4A0 * param0, u32 param1) +void sub_0202B3D8(UnkStruct_0202B4A0 *param0, u32 param1) { u32 v0, v1; @@ -50,23 +48,23 @@ void sub_0202B3D8 (UnkStruct_0202B4A0 * param0, u32 param1) } } -u32 sub_0202B400 (UnkStruct_0202B4A0 * param0, int param1) +u32 sub_0202B400(UnkStruct_0202B4A0 *param0, int param1) { return param0->unk_00[param1].unk_24; } -void sub_0202B40C (UnkStruct_0202B4A0 * param0, int param1, u32 param2) +void sub_0202B40C(UnkStruct_0202B4A0 *param0, int param1, u32 param2) { param0->unk_00[param1].unk_24 = param2; param0->unk_00[param1].unk_28 = ARNG_Next(param2); } -u32 sub_0202B428 (UnkStruct_0202B4A0 * param0) +u32 sub_0202B428(UnkStruct_0202B4A0 *param0) { return param0->unk_00[1].unk_28; } -const u16 * sub_0202B42C (const UnkStruct_0202B4A0 * param0, int param1, int param2) +const u16 *sub_0202B42C(const UnkStruct_0202B4A0 *param0, int param1, int param2) { if (param2 == 0) { return param0->unk_00[param1].unk_00; @@ -75,9 +73,9 @@ const u16 * sub_0202B42C (const UnkStruct_0202B4A0 * param0, int param1, int par return param0->unk_00[param1].unk_10; } -void sub_0202B444 (UnkStruct_0202B4A0 * param0, int param1, int param2, Strbuf *param3) +void sub_0202B444(UnkStruct_0202B4A0 *param0, int param1, int param2, Strbuf *param3) { - u16 * v0; + u16 *v0; if (param2 == 0) { v0 = param0->unk_00[param1].unk_00; @@ -88,40 +86,40 @@ void sub_0202B444 (UnkStruct_0202B4A0 * param0, int param1, int param2, Strbuf * } } -void sub_0202B470 (UnkStruct_0202B4A0 * param0, int param1, int param2) +void sub_0202B470(UnkStruct_0202B4A0 *param0, int param1, int param2) { param0->unk_00[param1].unk_20 = param2; } -int sub_0202B47C (const UnkStruct_0202B4A0 * param0, int param1) +int sub_0202B47C(const UnkStruct_0202B4A0 *param0, int param1) { return param0->unk_00[param1].unk_20; } -int sub_0202B488 (const UnkStruct_0202B4A0 * param0, int param1) +int sub_0202B488(const UnkStruct_0202B4A0 *param0, int param1) { return param0->unk_00[param1].unk_21; } -void sub_0202B494 (UnkStruct_0202B4A0 * param0, int param1, int param2) +void sub_0202B494(UnkStruct_0202B4A0 *param0, int param1, int param2) { param0->unk_00[param1].unk_21 = param2; } -UnkStruct_0202B4A0 * sub_0202B4A0 (SaveData * param0) +UnkStruct_0202B4A0 *sub_0202B4A0(SaveData *param0) { return (UnkStruct_0202B4A0 *)SaveData_SaveTable(param0, 17); } -BOOL sub_0202B4AC (const UnkStruct_0202B4A0 * param0, int param1) +BOOL sub_0202B4AC(const UnkStruct_0202B4A0 *param0, int param1) { - const UnkStruct_0202B510 * v0 = ¶m0->unk_00[param1]; + const UnkStruct_0202B510 *v0 = ¶m0->unk_00[param1]; return !(sub_0202B510(v0)); } -BOOL sub_0202B4C4 (const UnkStruct_0202B4A0 * param0, int param1) +BOOL sub_0202B4C4(const UnkStruct_0202B4A0 *param0, int param1) { - const UnkStruct_0202B510 * v0, * v1; + const UnkStruct_0202B510 *v0, *v1; v0 = ¶m0->unk_00[1]; v1 = ¶m0->unk_00[param1]; @@ -129,10 +127,10 @@ BOOL sub_0202B4C4 (const UnkStruct_0202B4A0 * param0, int param1) return sub_0202B530(v0, v1); } -BOOL sub_0202B4D8 (const UnkStruct_0202B4A0 * param0, const u16 * param1) +BOOL sub_0202B4D8(const UnkStruct_0202B4A0 *param0, const u16 *param1) { int v0; - const UnkStruct_0202B510 * v1; + const UnkStruct_0202B510 *v1; if (*param1 == 0xffff) { return 0; @@ -149,7 +147,7 @@ BOOL sub_0202B4D8 (const UnkStruct_0202B4A0 * param0, const u16 * param1) return 0; } -BOOL sub_0202B510 (const UnkStruct_0202B510 * param0) +BOOL sub_0202B510(const UnkStruct_0202B510 *param0) { if (param0->unk_00[0] == 0xffff) { return 1; @@ -162,7 +160,7 @@ BOOL sub_0202B510 (const UnkStruct_0202B510 * param0) return 0; } -BOOL sub_0202B530 (const UnkStruct_0202B510 * param0, const UnkStruct_0202B510 * param1) +BOOL sub_0202B530(const UnkStruct_0202B510 *param0, const UnkStruct_0202B510 *param1) { int v0; diff --git a/src/unk_0202C7FC.c b/src/unk_0202C7FC.c index 526a48fbd2..1c43b3fa12 100644 --- a/src/unk_0202C7FC.c +++ b/src/unk_0202C7FC.c @@ -1,11 +1,10 @@ +#include "unk_0202C7FC.h" + #include #include #include "savedata.h" -#include "savedata.h" -#include "unk_0202C7FC.h" - typedef struct UnkStruct_0202C844_t { int unk_00; } UnkStruct_0202C844; @@ -15,18 +14,18 @@ typedef struct UnkStruct_0202C834_t { u8 unk_20[1536]; } UnkStruct_0202C834; -int TrainerCard_SaveSize (void) +int TrainerCard_SaveSize(void) { return sizeof(UnkStruct_0202C834); } -void TrainerCard_Init (UnkStruct_0202C834 * param0) +void TrainerCard_Init(UnkStruct_0202C834 *param0) { memset(param0, 0, sizeof(UnkStruct_0202C834)); { int v0; - UnkStruct_0202C844 * v1; + UnkStruct_0202C844 *v1; v1 = sub_0202C844(param0); @@ -36,27 +35,27 @@ void TrainerCard_Init (UnkStruct_0202C834 * param0) } } -UnkStruct_0202C834 * sub_0202C834 (SaveData * param0) +UnkStruct_0202C834 *sub_0202C834(SaveData *param0) { return SaveData_SaveTable(param0, 19); } -u8 * sub_0202C840 (UnkStruct_0202C834 * param0) +u8 *sub_0202C840(UnkStruct_0202C834 *param0) { return param0->unk_20; } -UnkStruct_0202C844 * sub_0202C844 (UnkStruct_0202C834 * param0) +UnkStruct_0202C844 *sub_0202C844(UnkStruct_0202C834 *param0) { return param0->unk_00; } -int sub_0202C848 (const u8 param0, UnkStruct_0202C844 * param1) +int sub_0202C848(const u8 param0, UnkStruct_0202C844 *param1) { return param1[param0].unk_00; } -void sub_0202C850 (const u8 param0, const int param1, UnkStruct_0202C844 * param2) +void sub_0202C850(const u8 param0, const int param1, UnkStruct_0202C844 *param2) { param2[param0].unk_00 = param1; } diff --git a/src/unk_0202C858.c b/src/unk_0202C858.c index 58d1eb40f6..68b2d1ccd1 100644 --- a/src/unk_0202C858.c +++ b/src/unk_0202C858.c @@ -1,31 +1,30 @@ +#include "unk_0202C858.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0202C878.h" #include "savedata.h" -#include "unk_0202C858.h" -int WiFiHistory_SaveSize (void) +int WiFiHistory_SaveSize(void) { return sizeof(UnkStruct_0202C878); } -void WiFiHistory_Init (UnkStruct_0202C878 * param0) +void WiFiHistory_Init(UnkStruct_0202C878 *param0) { MI_CpuClear32(param0, sizeof(UnkStruct_0202C878)); SaveData_SetChecksum(30); } -UnkStruct_0202C878 * sub_0202C878 (SaveData * param0) +UnkStruct_0202C878 *sub_0202C878(SaveData *param0) { SaveData_Checksum(30); return (UnkStruct_0202C878 *)SaveData_SaveTable(param0, 30); } -void sub_0202C88C (UnkStruct_0202C878 * param0, int param1, int param2) +void sub_0202C88C(UnkStruct_0202C878 *param0, int param1, int param2) { GF_ASSERT(param1 < 256); GF_ASSERT(param2 < 64); @@ -37,17 +36,17 @@ void sub_0202C88C (UnkStruct_0202C878 * param0, int param1, int param2) SaveData_SetChecksum(30); } -int sub_0202C8C0 (const UnkStruct_0202C878 * param0) +int sub_0202C8C0(const UnkStruct_0202C878 *param0) { return param0->unk_05; } -int sub_0202C8C4 (const UnkStruct_0202C878 * param0) +int sub_0202C8C4(const UnkStruct_0202C878 *param0) { return param0->unk_06; } -int sub_0202C8C8 (const UnkStruct_0202C878 * param0, int param1, int param2) +int sub_0202C8C8(const UnkStruct_0202C878 *param0, int param1, int param2) { int v0; @@ -63,9 +62,9 @@ int sub_0202C8C8 (const UnkStruct_0202C878 * param0, int param1, int param2) return v0; } -void sub_0202C918 (UnkStruct_0202C878 * param0, int param1, int param2, int param3) +void sub_0202C918(UnkStruct_0202C878 *param0, int param1, int param2, int param3) { - u8 * v0; + u8 *v0; u8 v1 = 3; u8 v2; @@ -89,18 +88,18 @@ void sub_0202C918 (UnkStruct_0202C878 * param0, int param1, int param2, int para SaveData_SetChecksum(30); } -BOOL sub_0202C990 (const UnkStruct_0202C878 * param0) +BOOL sub_0202C990(const UnkStruct_0202C878 *param0) { return param0->unk_04; } -void sub_0202C994 (UnkStruct_0202C878 * param0, BOOL param1) +void sub_0202C994(UnkStruct_0202C878 *param0, BOOL param1) { param0->unk_04 = param1; SaveData_SetChecksum(30); } -void sub_0202C9A0 (UnkStruct_0202C878 * param0) +void sub_0202C9A0(UnkStruct_0202C878 *param0) { int v0, v1; u8 v2; diff --git a/src/unk_0202C9F4.c b/src/unk_0202C9F4.c index 7cad5bd9d5..1a2b2e3b40 100644 --- a/src/unk_0202C9F4.c +++ b/src/unk_0202C9F4.c @@ -1,22 +1,21 @@ +#include "unk_0202C9F4.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0202CA1C.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0202CA64.h" #include "struct_defs/struct_0202CA88.h" #include "savedata.h" -#include "unk_0202C9F4.h" -int BallSeal_SaveSize (void) +int BallSeal_SaveSize(void) { return sizeof(UnkStruct_0202CA1C); } -void BallSeal_Init (UnkStruct_0202CA1C * param0) +void BallSeal_Init(UnkStruct_0202CA1C *param0) { int v0; @@ -24,28 +23,28 @@ void BallSeal_Init (UnkStruct_0202CA1C * param0) MI_CpuFill8(param0, 0, v0); } -void sub_0202CA10 (const UnkStruct_0202CA28 * param0, UnkStruct_0202CA28 * param1) +void sub_0202CA10(const UnkStruct_0202CA28 *param0, UnkStruct_0202CA28 *param1) { MI_CpuCopy8(param0, param1, sizeof(UnkStruct_0202CA28)); } -UnkStruct_0202CA1C * sub_0202CA1C (SaveData * param0) +UnkStruct_0202CA1C *sub_0202CA1C(SaveData *param0) { - UnkStruct_0202CA1C * v0 = NULL; + UnkStruct_0202CA1C *v0 = NULL; v0 = SaveData_SaveTable(param0, 21); return v0; } -UnkStruct_0202CA28 * sub_0202CA28 (UnkStruct_0202CA1C * param0, int param1) +UnkStruct_0202CA28 *sub_0202CA28(UnkStruct_0202CA1C *param0, int param1) { GF_ASSERT(param1 < 12); return ¶m0->unk_00[param1]; } -void sub_0202CA40 (UnkStruct_0202CA1C * param0, UnkStruct_0202CA28 * param1, int param2) +void sub_0202CA40(UnkStruct_0202CA1C *param0, UnkStruct_0202CA28 *param1, int param2) { - UnkStruct_0202CA28 * v0; + UnkStruct_0202CA28 *v0; GF_ASSERT(param2 < 12); @@ -53,38 +52,38 @@ void sub_0202CA40 (UnkStruct_0202CA1C * param0, UnkStruct_0202CA28 * param1, int sub_0202CA10(param1, v0); } -UnkStruct_0202CA64 * sub_0202CA64 (UnkStruct_0202CA28 * param0, int param1) +UnkStruct_0202CA64 *sub_0202CA64(UnkStruct_0202CA28 *param0, int param1) { GF_ASSERT(param1 < 8); return ¶m0->unk_00[param1]; } -u8 sub_0202CA7C (const UnkStruct_0202CA64 * param0) +u8 sub_0202CA7C(const UnkStruct_0202CA64 *param0) { return param0->unk_00; } -u8 sub_0202CA80 (const UnkStruct_0202CA64 * param0) +u8 sub_0202CA80(const UnkStruct_0202CA64 *param0) { return param0->unk_01; } -u8 sub_0202CA84 (const UnkStruct_0202CA64 * param0) +u8 sub_0202CA84(const UnkStruct_0202CA64 *param0) { return param0->unk_02; } -UnkStruct_0202CA88 * sub_0202CA88 (UnkStruct_0202CA1C * param0) +UnkStruct_0202CA88 *sub_0202CA88(UnkStruct_0202CA1C *param0) { return ¶m0->unk_120; } -u8 sub_0202CA90 (const UnkStruct_0202CA88 * param0, int param1) +u8 sub_0202CA90(const UnkStruct_0202CA88 *param0, int param1) { return param0->unk_00[param1]; } -BOOL sub_0202CA94 (const UnkStruct_0202CA28 * param0, int param1) +BOOL sub_0202CA94(const UnkStruct_0202CA28 *param0, int param1) { int v0, v1; @@ -97,7 +96,7 @@ BOOL sub_0202CA94 (const UnkStruct_0202CA28 * param0, int param1) return 0; } -int sub_0202CAB0 (const UnkStruct_0202CA1C * param0, int param1) +int sub_0202CAB0(const UnkStruct_0202CA1C *param0, int param1) { int v0, v1; int v2; @@ -115,12 +114,12 @@ int sub_0202CAB0 (const UnkStruct_0202CA1C * param0, int param1) return v2; } -void sub_0202CADC (UnkStruct_0202CA88 * param0, int param1, int param2) +void sub_0202CADC(UnkStruct_0202CA88 *param0, int param1, int param2) { param0->unk_00[param1] = param2; } -BOOL sub_0202CAE0 (UnkStruct_0202CA1C * param0, int param1, s16 param2) +BOOL sub_0202CAE0(UnkStruct_0202CA1C *param0, int param1, s16 param2) { int v0; int v1; @@ -145,7 +144,7 @@ BOOL sub_0202CAE0 (UnkStruct_0202CA1C * param0, int param1, s16 param2) return 1; } -BOOL sub_0202CB20 (UnkStruct_0202CA1C * param0, int param1, s16 param2) +BOOL sub_0202CB20(UnkStruct_0202CA1C *param0, int param1, s16 param2) { int v0; int v1; @@ -174,7 +173,7 @@ BOOL sub_0202CB20 (UnkStruct_0202CA1C * param0, int param1, s16 param2) return 1; } -BOOL sub_0202CB70 (UnkStruct_0202CA1C * param0, int param1, s16 param2) +BOOL sub_0202CB70(UnkStruct_0202CA1C *param0, int param1, s16 param2) { int v0; int v1; @@ -199,7 +198,7 @@ BOOL sub_0202CB70 (UnkStruct_0202CA1C * param0, int param1, s16 param2) return 1; } -int sub_0202CBA8 (const UnkStruct_0202CA1C * param0) +int sub_0202CBA8(const UnkStruct_0202CA1C *param0) { int v0; int v1; @@ -215,7 +214,7 @@ int sub_0202CBA8 (const UnkStruct_0202CA1C * param0) return v1; } -int sub_0202CBC8 (const UnkStruct_0202CA1C * param0, int param1) +int sub_0202CBC8(const UnkStruct_0202CA1C *param0, int param1) { int v0; int v1; diff --git a/src/unk_0202CC64.c b/src/unk_0202CC64.c index 6351f2e6f3..438698647e 100644 --- a/src/unk_0202CC64.c +++ b/src/unk_0202CC64.c @@ -1,53 +1,53 @@ +#include "unk_0202CC64.h" + #include #include -#include "savedata.h" #include "struct_defs/chatot_cry.h" #include "heap.h" #include "savedata.h" -#include "unk_0202CC64.h" -int ChatotCry_SaveSize (void) +int ChatotCry_SaveSize(void) { return sizeof(ChatotCry); } -void ChatotCry_Init (ChatotCry * param0) +void ChatotCry_Init(ChatotCry *param0) { MI_CpuClear32(param0, sizeof(ChatotCry)); param0->exists = FALSE; } -ChatotCry * AllocateAndInitializeChatotCryData (int param0) +ChatotCry *AllocateAndInitializeChatotCryData(int param0) { - ChatotCry * v0 = Heap_AllocFromHeap(param0, sizeof(ChatotCry)); + ChatotCry *v0 = Heap_AllocFromHeap(param0, sizeof(ChatotCry)); ChatotCry_Init(v0); return v0; } -ChatotCry * GetChatotCryDataFromSave (SaveData * param0) +ChatotCry *GetChatotCryDataFromSave(SaveData *param0) { return (ChatotCry *)SaveData_SaveTable(param0, 22); } -BOOL IsChatotCryDataValid (const ChatotCry * param0) +BOOL IsChatotCryDataValid(const ChatotCry *param0) { return param0->exists; } -void ResetChatotCryDataStatus (ChatotCry * param0) +void ResetChatotCryDataStatus(ChatotCry *param0) { param0->exists = FALSE; } -const void * GetChatotCryAudioBuffer (const ChatotCry * param0) +const void *GetChatotCryAudioBuffer(const ChatotCry *param0) { return param0->data; } -void ProcessChatotCryAudioData (s8 * param0, const s8 * param1) +void ProcessChatotCryAudioData(s8 *param0, const s8 *param1) { int v0, v1 = 0; s8 v2; @@ -68,7 +68,7 @@ void ProcessChatotCryAudioData (s8 * param0, const s8 * param1) } } -void StoreProcessedAudioInChatotCryData (ChatotCry * param0, const s8 * param1) +void StoreProcessedAudioInChatotCryData(ChatotCry *param0, const s8 *param1) { int v0, v1; s8 v2; @@ -92,7 +92,7 @@ void StoreProcessedAudioInChatotCryData (ChatotCry * param0, const s8 * param1) } } -void CopyChatotCryData (ChatotCry * param0, const ChatotCry * param1) +void CopyChatotCryData(ChatotCry *param0, const ChatotCry *param1) { MI_CpuCopyFast(param1, param0, sizeof(ChatotCry)); } diff --git a/src/unk_0202CD50.c b/src/unk_0202CD50.c index f7d5605617..0bea500813 100644 --- a/src/unk_0202CD50.c +++ b/src/unk_0202CD50.c @@ -1,13 +1,13 @@ +#include "unk_0202CD50.h" + #include #include #include "struct_decls/pokedexdata_decl.h" -#include "savedata.h" -#include "unk_0201D15C.h" #include "savedata.h" +#include "unk_0201D15C.h" #include "unk_0202631C.h" -#include "unk_0202CD50.h" typedef struct { u16 unk_00; @@ -21,15 +21,15 @@ typedef struct UnkStruct_0202CD88_t { UnkStruct_0202CD88_sub1 unk_1B8; } UnkStruct_0202CD88; -static void sub_0202CD94(UnkStruct_0202CD88 * param0, int param1); -static void sub_0202CDC0(UnkStruct_0202CD88 * param0, int param1); +static void sub_0202CD94(UnkStruct_0202CD88 *param0, int param1); +static void sub_0202CDC0(UnkStruct_0202CD88 *param0, int param1); -int GameRecord_SaveSize (void) +int GameRecord_SaveSize(void) { return sizeof(UnkStruct_0202CD88); } -void GameRecord_Init (UnkStruct_0202CD88 * param0) +void GameRecord_Init(UnkStruct_0202CD88 *param0) { MI_CpuClear32(param0, sizeof(UnkStruct_0202CD88)); param0->unk_1B8.unk_02 = OS_GetVBlankCount() | (OS_GetVBlankCount() << 8); @@ -37,12 +37,12 @@ void GameRecord_Init (UnkStruct_0202CD88 * param0) sub_0202CD94(param0, (0 + 1)); } -UnkStruct_0202CD88 * sub_0202CD88 (SaveData * param0) +UnkStruct_0202CD88 *sub_0202CD88(SaveData *param0) { return SaveData_SaveTable(param0, 20); } -static void sub_0202CD94 (UnkStruct_0202CD88 * param0, int param1) +static void sub_0202CD94(UnkStruct_0202CD88 *param0, int param1) { if (param1 == (0 + 0)) { return; @@ -52,7 +52,7 @@ static void sub_0202CD94 (UnkStruct_0202CD88 * param0, int param1) EncryptData(¶m0->unk_00[1], sizeof(UnkStruct_0202CD88) - sizeof(UnkStruct_0202CD88_sub1) - sizeof(u32), param0->unk_1B8.unk_00 + (param0->unk_1B8.unk_02 << 16)); } -static void sub_0202CDC0 (UnkStruct_0202CD88 * param0, int param1) +static void sub_0202CDC0(UnkStruct_0202CD88 *param0, int param1) { if (param1 == (0 + 0)) { return; @@ -61,24 +61,24 @@ static void sub_0202CDC0 (UnkStruct_0202CD88 * param0, int param1) DecryptData(¶m0->unk_00[1], sizeof(UnkStruct_0202CD88) - sizeof(UnkStruct_0202CD88_sub1) - sizeof(u32), param0->unk_1B8.unk_00 + (param0->unk_1B8.unk_02 << 16)); } -static u32 sub_0202CDE0 (const UnkStruct_0202CD88 * param0, int param1) +static u32 sub_0202CDE0(const UnkStruct_0202CD88 *param0, int param1) { - if (param1 < ((70 + 1))) { + if (param1 < (70 + 1)) { return param0->unk_00[param1]; - } else if (param1 < ((49 + 28) + ((70 + 1)))) { - return param0->unk_11C[param1 - ((70 + 1))]; + } else if (param1 < ((49 + 28) + (70 + 1))) { + return param0->unk_11C[param1 - (70 + 1)]; } GF_ASSERT(0); return 0; } -static u32 sub_0202CE08 (UnkStruct_0202CD88 * param0, int param1, u32 param2) +static u32 sub_0202CE08(UnkStruct_0202CD88 *param0, int param1, u32 param2) { - if (param1 < ((70 + 1))) { + if (param1 < (70 + 1)) { param0->unk_00[param1] = param2; - } else if (param1 < ((49 + 28) + ((70 + 1)))) { - param0->unk_11C[param1 - ((70 + 1))] = param2; + } else if (param1 < ((49 + 28) + (70 + 1))) { + param0->unk_11C[param1 - (70 + 1)] = param2; } else { GF_ASSERT(0); } @@ -86,7 +86,7 @@ static u32 sub_0202CE08 (UnkStruct_0202CD88 * param0, int param1, u32 param2) return sub_0202CDE0(param0, param1); } -static u32 sub_0202CE3C (int param0) +static u32 sub_0202CE3C(int param0) { static u8 v0[148] = { 0x1, @@ -210,13 +210,13 @@ static u32 sub_0202CE3C (int param0) 0x0, 0x0 }; - if (param0 < ((70 + 1))) { + if (param0 < (70 + 1)) { if (v0[param0]) { return 999999999; } else { return 999999; } - } else if (param0 < ((49 + 28) + ((70 + 1)))) { + } else if (param0 < ((49 + 28) + (70 + 1))) { if (v0[param0]) { return 0xffff; } else { @@ -228,7 +228,7 @@ static u32 sub_0202CE3C (int param0) return 0; } -static int sub_0202CE84 (int param0) +static int sub_0202CE84(int param0) { static const u16 v0[51] = { 0x1, @@ -287,7 +287,7 @@ static int sub_0202CE84 (int param0) return v0[param0]; } -u32 sub_0202CE90 (UnkStruct_0202CD88 * param0, int param1, u32 param2) +u32 sub_0202CE90(UnkStruct_0202CD88 *param0, int param1, u32 param2) { u32 v0 = sub_0202CE3C(param1); u32 v1; @@ -305,7 +305,7 @@ u32 sub_0202CE90 (UnkStruct_0202CD88 * param0, int param1, u32 param2) return v1; } -u32 sub_0202CED0 (UnkStruct_0202CD88 * param0, int param1, u32 param2) +u32 sub_0202CED0(UnkStruct_0202CD88 *param0, int param1, u32 param2) { u32 v0 = sub_0202CE3C(param1); u32 v1; @@ -333,7 +333,7 @@ u32 sub_0202CED0 (UnkStruct_0202CD88 * param0, int param1, u32 param2) return v2; } -u32 sub_0202CF28 (UnkStruct_0202CD88 * param0, int param1) +u32 sub_0202CF28(UnkStruct_0202CD88 *param0, int param1) { u32 v0 = sub_0202CE3C(param1); u32 v1; @@ -354,7 +354,7 @@ u32 sub_0202CF28 (UnkStruct_0202CD88 * param0, int param1) return v2; } -u32 sub_0202CF70 (UnkStruct_0202CD88 * param0, int param1, u32 param2) +u32 sub_0202CF70(UnkStruct_0202CD88 *param0, int param1, u32 param2) { u32 v0 = sub_0202CE3C(param1); u32 v1; @@ -375,7 +375,7 @@ u32 sub_0202CF70 (UnkStruct_0202CD88 * param0, int param1, u32 param2) return v2; } -u32 sub_0202CFB8 (UnkStruct_0202CD88 * param0, int param1) +u32 sub_0202CFB8(UnkStruct_0202CD88 *param0, int param1) { u32 v0 = sub_0202CE3C(param1); u32 v1; @@ -391,7 +391,7 @@ u32 sub_0202CFB8 (UnkStruct_0202CD88 * param0, int param1) } } -void sub_0202CFEC (UnkStruct_0202CD88 * param0, int param1) +void sub_0202CFEC(UnkStruct_0202CD88 *param0, int param1) { u32 v0; @@ -406,12 +406,12 @@ void sub_0202CFEC (UnkStruct_0202CD88 * param0, int param1) } } -u32 sub_0202D034 (UnkStruct_0202CD88 * param0) +u32 sub_0202D034(UnkStruct_0202CD88 *param0) { return sub_0202CFB8(param0, (0 + 1)); } -void sub_0202D040 (UnkStruct_0202CD88 * param0, const PokedexData * param1, u16 const param2) +void sub_0202D040(UnkStruct_0202CD88 *param0, const PokedexData *param1, u16 const param2) { if (!Pokedex_CaughtSpecies(param1, param2)) { sub_0202CFEC(param0, 22); diff --git a/src/unk_0202D05C.c b/src/unk_0202D05C.c index 9791f3a1b0..c1028cc53f 100644 --- a/src/unk_0202D05C.c +++ b/src/unk_0202D05C.c @@ -1,11 +1,8 @@ +#include "unk_0202D05C.h" + #include #include -#include "inlines.h" - -#include "message.h" -#include "savedata.h" - #include "struct_defs/sentence.h" #include "struct_defs/struct_0202D060.h" #include "struct_defs/struct_0202D080.h" @@ -16,6 +13,7 @@ #include "struct_defs/struct_0203068C.h" #include "struct_defs/struct_02049A68.h" #include "struct_defs/struct_0204B404.h" + #include "overlay090/struct_ov90_021D1750.h" #include "overlay096/struct_ov96_0223B450_sub1.h" #include "overlay096/struct_ov96_0223B450_sub2.h" @@ -23,29 +21,29 @@ #include "overlay104/struct_ov104_0223A348_sub1.h" #include "overlay104/struct_ov104_0223A348_sub2.h" -#include "message.h" -#include "unk_02014A84.h" #include "heap.h" +#include "inlines.h" +#include "message.h" #include "savedata.h" -#include "unk_0202D05C.h" +#include "unk_02014A84.h" -int sub_0202D05C (void) +int sub_0202D05C(void) { return sizeof(UnkStruct_ov96_0223B450_sub1); } -void sub_0202D060 (UnkStruct_0202D060 * param0) +void sub_0202D060(UnkStruct_0202D060 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_0202D060)); } -void sub_0202D06C (UnkStruct_0202D750 * param0) +void sub_0202D06C(UnkStruct_0202D750 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_0202D750)); param0->unk_03 = 1; } -void sub_0202D080 (UnkStruct_0202D080 * param0) +void sub_0202D080(UnkStruct_0202D080 *param0) { sub_02014AC4(¶m0->unk_00[0], 0); sub_02014AC4(¶m0->unk_00[1], 1); @@ -53,12 +51,12 @@ void sub_0202D080 (UnkStruct_0202D080 * param0) sub_02014AC4(¶m0->unk_00[3], 3); } -void sub_0202D0AC (UnkStruct_0202D764 * param0) +void sub_0202D0AC(UnkStruct_0202D764 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_0202D764)); } -u32 sub_0202D0BC (UnkStruct_0202D060 * param0, int param1, void * param2) +u32 sub_0202D0BC(UnkStruct_0202D060 *param0, int param1, void *param2) { switch (param1) { case 0: @@ -91,11 +89,11 @@ u32 sub_0202D0BC (UnkStruct_0202D060 * param0, int param1, void * param2) return 0; } -void sub_0202D140 (UnkStruct_0202D060 * param0, int param1, const void * param2) +void sub_0202D140(UnkStruct_0202D060 *param0, int param1, const void *param2) { - u32 * v0 = (u32 *)param2; - u16 * v1 = (u16 *)param2; - u8 * v2 = (u8 *)param2; + u32 *v0 = (u32 *)param2; + u16 *v1 = (u16 *)param2; + u8 *v2 = (u8 *)param2; switch (param1) { case 0: @@ -134,7 +132,7 @@ void sub_0202D140 (UnkStruct_0202D060 * param0, int param1, const void * param2) } } -void sub_0202D1E8 (UnkStruct_0202D060 * param0, u8 param1, u16 param2, u16 param3) +void sub_0202D1E8(UnkStruct_0202D060 *param0, u8 param1, u16 param2, u16 param3) { if (param0->unk_03 + param1 < 255) { param0->unk_03 += param1; @@ -149,17 +147,17 @@ void sub_0202D1E8 (UnkStruct_0202D060 * param0, u8 param1, u16 param2, u16 param } } -BOOL sub_0202D214 (UnkStruct_0202D060 * param0) +BOOL sub_0202D214(UnkStruct_0202D060 *param0) { return param0->unk_00_1; } -void sub_0202D21C (UnkStruct_0202D060 * param0, BOOL param1) +void sub_0202D21C(UnkStruct_0202D060 *param0, BOOL param1) { param0->unk_00_1 = param1; } -u16 sub_0202D230 (UnkStruct_0202D750 * param0, u16 param1, int param2) +u16 sub_0202D230(UnkStruct_0202D750 *param0, u16 param1, int param2) { switch (param2) { case 1: @@ -190,7 +188,7 @@ u16 sub_0202D230 (UnkStruct_0202D750 * param0, u16 param1, int param2) return param0->unk_00; } -u8 sub_0202D288 (UnkStruct_0202D750 * param0, int param1) +u8 sub_0202D288(UnkStruct_0202D750 *param0, int param1) { switch (param1) { case 2: @@ -210,7 +208,7 @@ u8 sub_0202D288 (UnkStruct_0202D750 * param0, int param1) return param0->unk_02; } -u8 sub_0202D2C0 (UnkStruct_0202D750 * param0, int param1) +u8 sub_0202D2C0(UnkStruct_0202D750 *param0, int param1) { switch (param1) { case 2: @@ -231,7 +229,7 @@ u8 sub_0202D2C0 (UnkStruct_0202D750 * param0, int param1) return param0->unk_03; } -void sub_0202D2F0 (UnkStruct_0202D750 * param0, int param1, UnkStruct_ov104_0223A348_sub2 * param2) +void sub_0202D2F0(UnkStruct_0202D750 *param0, int param1, UnkStruct_ov104_0223A348_sub2 *param2) { if (param1 == 0) { MI_CpuCopy8(param2, param0->unk_C0, sizeof(UnkStruct_ov104_0223A348_sub2) * 3); @@ -240,7 +238,7 @@ void sub_0202D2F0 (UnkStruct_0202D750 * param0, int param1, UnkStruct_ov104_0223 } } -void sub_0202D314 (UnkStruct_0202D750 * param0, int param1, UnkStruct_0202D314 * param2) +void sub_0202D314(UnkStruct_0202D750 *param0, int param1, UnkStruct_0202D314 *param2) { if (param1 == 0) { MI_CpuCopy8(param0->unk_C0, param2, sizeof(UnkStruct_ov104_0223A348_sub2) * 3); @@ -249,7 +247,7 @@ void sub_0202D314 (UnkStruct_0202D750 * param0, int param1, UnkStruct_0202D314 * } } -u16 sub_0202D334 (UnkStruct_0202D750 * param0, UnkStruct_0202D060 * param1) +u16 sub_0202D334(UnkStruct_0202D750 *param0, UnkStruct_0202D060 *param1) { u16 v0, v1, v2, v3, v4; u16 v5 = 0; @@ -276,12 +274,12 @@ u16 sub_0202D334 (UnkStruct_0202D750 * param0, UnkStruct_0202D060 * param1) return v5; } -u16 sub_0202D39C (UnkStruct_0202D750 * param0) +u16 sub_0202D39C(UnkStruct_0202D750 *param0) { return param0->unk_16; } -u8 sub_0202D3A0 (UnkStruct_0202D750 * param0) +u8 sub_0202D3A0(UnkStruct_0202D750 *param0) { u8 v0 = 0; @@ -289,7 +287,7 @@ u8 sub_0202D3A0 (UnkStruct_0202D750 * param0) return v0; } -u16 sub_0202D3B4 (UnkStruct_0202D750 * param0, u16 param1, int param2) +u16 sub_0202D3B4(UnkStruct_0202D750 *param0, u16 param1, int param2) { u16 v0; @@ -317,7 +315,7 @@ u16 sub_0202D3B4 (UnkStruct_0202D750 * param0, u16 param1, int param2) return param0->unk_0A[v0]; } -u16 sub_0202D3FC (UnkStruct_0202D750 * param0, u16 param1, u16 param2) +u16 sub_0202D3FC(UnkStruct_0202D750 *param0, u16 param1, u16 param2) { u16 v0; @@ -335,7 +333,7 @@ u16 sub_0202D3FC (UnkStruct_0202D750 * param0, u16 param1, u16 param2) return param0->unk_0A[v0]; } -BOOL sub_0202D414 (UnkStruct_0202D750 * param0, u16 param1, int param2) +BOOL sub_0202D414(UnkStruct_0202D750 *param0, u16 param1, int param2) { u16 v0; u16 v1 = 1; @@ -364,30 +362,30 @@ BOOL sub_0202D414 (UnkStruct_0202D750 * param0, u16 param1, int param2) return 0; } -void sub_0202D470 (UnkStruct_0202D750 * param0, u32 param1) +void sub_0202D470(UnkStruct_0202D750 *param0, u32 param1) { param0->unk_04 = param1; } -u32 sub_0202D474 (UnkStruct_0202D750 * param0) +u32 sub_0202D474(UnkStruct_0202D750 *param0) { return param0->unk_04; } -void sub_0202D478 (SaveData * param0, int param1, Sentence * param2) +void sub_0202D478(SaveData *param0, int param1, Sentence *param2) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); sub_02014CC0(&(v0->unk_950.unk_168.unk_00[param1]), param2); } -Sentence * sub_0202D498 (SaveData * param0, int param1) +Sentence *sub_0202D498(SaveData *param0, int param1) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &(v0->unk_950.unk_168.unk_00[param1]); } -void sub_0202D4B0 (UnkStruct_0202D764 * param0, u8 param1, u8 param2, RTCDate * param3) +void sub_0202D4B0(UnkStruct_0202D764 *param0, u8 param1, u8 param2, RTCDate *param3) { u8 v0, v1; u8 v2 = 1; @@ -411,13 +409,13 @@ void sub_0202D4B0 (UnkStruct_0202D764 * param0, u8 param1, u8 param2, RTCDate * param0->unk_00 = inline_0202D4B0(param3); } -void sub_0202D514 (UnkStruct_0202D764 * param0) +void sub_0202D514(UnkStruct_0202D764 *param0) { MI_CpuClear8(param0->unk_04, 250); MI_CpuClear8(¶m0->unk_00, sizeof(u32)); } -static BOOL sub_0202D530 (RTCDate * param0, RTCDate * param1) +static BOOL sub_0202D530(RTCDate *param0, RTCDate *param1) { if (param0->year > param1->year) { return 1; @@ -434,7 +432,7 @@ static BOOL sub_0202D530 (RTCDate * param0, RTCDate * param1) return 0; } -BOOL sub_0202D558 (UnkStruct_0202D764 * param0, u8 param1, u8 param2, RTCDate * param3) +BOOL sub_0202D558(UnkStruct_0202D764 *param0, u8 param1, u8 param2, RTCDate *param3) { u8 v0, v1; u8 v2 = 1; @@ -465,17 +463,17 @@ BOOL sub_0202D558 (UnkStruct_0202D764 * param0, u8 param1, u8 param2, RTCDate * return 0; } -BOOL sub_0202D5E8 (UnkStruct_0202D764 * param0) +BOOL sub_0202D5E8(UnkStruct_0202D764 *param0) { return (BOOL)param0->unk_FE; } -BOOL sub_0202D5F0 (UnkStruct_0202D764 * param0) +BOOL sub_0202D5F0(UnkStruct_0202D764 *param0) { return (BOOL)param0->unk_FF; } -void sub_0202D5F8 (UnkStruct_0202D764 * param0, UnkStruct_ov96_0223B450_sub1 * param1, u8 param2, u8 param3) +void sub_0202D5F8(UnkStruct_0202D764 *param0, UnkStruct_ov96_0223B450_sub1 *param1, u8 param2, u8 param3) { MI_CpuCopy8(param1, param0->unk_104, sizeof(UnkStruct_0202D63C) * 7); @@ -484,18 +482,18 @@ void sub_0202D5F8 (UnkStruct_0202D764 * param0, UnkStruct_ov96_0223B450_sub1 * p param0->unk_FE = 1; } -void sub_0202D628 (UnkStruct_0202D764 * param0, UnkStruct_02049A68 * param1) +void sub_0202D628(UnkStruct_0202D764 *param0, UnkStruct_02049A68 *param1) { param1->unk_00 = param0->unk_101; param1->unk_04 = param0->unk_100; } -void sub_0202D63C (UnkStruct_0202D764 * param0, UnkStruct_ov104_0223A348 * param1, const u8 param2) +void sub_0202D63C(UnkStruct_0202D764 *param0, UnkStruct_ov104_0223A348 *param1, const u8 param2) { - UnkStruct_ov104_0223A348_sub1 * v0; - UnkStruct_ov104_0223A348_sub2 * v1; - UnkStruct_0202D63C * v2; - MessageLoader * v3; + UnkStruct_ov104_0223A348_sub1 *v0; + UnkStruct_ov104_0223A348_sub2 *v1; + UnkStruct_0202D63C *v2; + MessageLoader *v3; v0 = &(param1->unk_00); v1 = param1->unk_30; @@ -519,7 +517,7 @@ void sub_0202D63C (UnkStruct_0202D764 * param0, UnkStruct_ov104_0223A348 * param MI_CpuCopy8(v2->unk_00, v1, sizeof(UnkStruct_ov104_0223A348_sub2) * 3); } -void sub_0202D6DC (UnkStruct_0202D764 * param0, UnkStruct_ov96_0223B450_sub2 * param1, u8 param2, u8 param3) +void sub_0202D6DC(UnkStruct_0202D764 *param0, UnkStruct_ov96_0223B450_sub2 *param1, u8 param2, u8 param3) { MI_CpuCopy8(param1, ¶m0->unk_740, sizeof(UnkStruct_ov90_021D1750) * 30); @@ -528,15 +526,15 @@ void sub_0202D6DC (UnkStruct_0202D764 * param0, UnkStruct_ov96_0223B450_sub2 * p param0->unk_FF = 1; } -void sub_0202D708 (UnkStruct_0202D764 * param0, UnkStruct_02049A68 * param1) +void sub_0202D708(UnkStruct_0202D764 *param0, UnkStruct_02049A68 *param1) { param1->unk_00 = param0->unk_103; param1->unk_04 = param0->unk_102; } -UnkStruct_ov90_021D1750 * sub_0202D71C (UnkStruct_0202D764 * param0, int param1) +UnkStruct_ov90_021D1750 *sub_0202D71C(UnkStruct_0202D764 *param0, int param1) { - UnkStruct_ov90_021D1750 * v0; + UnkStruct_ov90_021D1750 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov90_021D1750) * 30); MI_CpuCopy8(param0->unk_740, v0, sizeof(UnkStruct_ov90_021D1750) * 30); @@ -544,20 +542,20 @@ UnkStruct_ov90_021D1750 * sub_0202D71C (UnkStruct_0202D764 * param0, int param1) return v0; } -UnkStruct_0202D060 * sub_0202D740 (SaveData * param0) +UnkStruct_0202D060 *sub_0202D740(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_8E0_val1; } -UnkStruct_0202D750 * sub_0202D750 (SaveData * param0) +UnkStruct_0202D750 *sub_0202D750(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_950.unk_00; } -UnkStruct_0202D764 * sub_0202D764 (SaveData * param0) +UnkStruct_0202D764 *sub_0202D764(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_950.unk_188; } diff --git a/src/unk_0202D778.c b/src/unk_0202D778.c index a6ab4438b6..2c37d447f7 100644 --- a/src/unk_0202D778.c +++ b/src/unk_0202D778.c @@ -1,22 +1,21 @@ +#include "unk_0202D778.h" + #include #include #include "savedata.h" -#include "savedata.h" -#include "unk_0202D778.h" - -int Ribbons_SaveSize (void) +int Ribbons_SaveSize(void) { return 14; } -void Ribbons_Init (u8 * param0) +void Ribbons_Init(u8 *param0) { memset(param0, 0, 14); } -u8 * sub_0202D79C (SaveData * param0) +u8 *sub_0202D79C(SaveData *param0) { return SaveData_SaveTable(param0, 24); } diff --git a/src/unk_0202D7A8.c b/src/unk_0202D7A8.c index ba3a16c494..2475428986 100644 --- a/src/unk_0202D7A8.c +++ b/src/unk_0202D7A8.c @@ -1,24 +1,23 @@ +#include "unk_0202D7A8.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0202D7B0.h" #include "struct_defs/struct_0202D844.h" #include "struct_defs/struct_0202D84C.h" #include "struct_defs/struct_020698E4.h" #include "struct_defs/struct_0206C638.h" -#include "unk_0201D15C.h" #include "savedata.h" -#include "unk_0202D7A8.h" +#include "unk_0201D15C.h" -int SpecialEncounter_SaveSize (void) +int SpecialEncounter_SaveSize(void) { return sizeof(UnkStruct_0202D7B0); } -void SpecialEncounter_Init (UnkStruct_0202D7B0 * param0) +void SpecialEncounter_Init(UnkStruct_0202D7B0 *param0) { memset(param0, 0, sizeof(UnkStruct_0202D7B0)); @@ -30,7 +29,7 @@ void SpecialEncounter_Init (UnkStruct_0202D7B0 * param0) { int v0; - UnkStruct_0202D844 * v1 = &(param0->unk_10); + UnkStruct_0202D844 *v1 = &(param0->unk_10); v1->unk_00 = 21; @@ -49,13 +48,13 @@ void SpecialEncounter_Init (UnkStruct_0202D7B0 * param0) param0->unk_151 = 0; } -void sub_0202D80C (UnkStruct_0202D7B0 * param0, const u32 param1) +void sub_0202D80C(UnkStruct_0202D7B0 *param0, const u32 param1) { param0->unk_00 = param1; param0->unk_04 = param1; } -u32 sub_0202D814 (UnkStruct_0202D7B0 * param0, const u8 param1) +u32 sub_0202D814(UnkStruct_0202D7B0 *param0, const u8 param1) { switch (param1) { case 1: @@ -68,45 +67,45 @@ u32 sub_0202D814 (UnkStruct_0202D7B0 * param0, const u8 param1) } } -UnkStruct_020698E4 * sub_0202D830 (UnkStruct_0202D7B0 * param0) +UnkStruct_020698E4 *sub_0202D830(UnkStruct_0202D7B0 *param0) { return &(param0->unk_BC); } -UnkStruct_0202D7B0 * sub_0202D834 (SaveData * param0) +UnkStruct_0202D7B0 *sub_0202D834(SaveData *param0) { return SaveData_SaveTable(param0, 25); } -UnkStruct_0202D844 * sub_0202D840 (UnkStruct_0202D7B0 * param0) +UnkStruct_0202D844 *sub_0202D840(UnkStruct_0202D7B0 *param0) { return &(param0->unk_10); } -const int sub_0202D844 (UnkStruct_0202D844 * param0) +const int sub_0202D844(UnkStruct_0202D844 *param0) { return param0->unk_00; } -void sub_0202D848 (const u8 param0, UnkStruct_0202D844 * param1) +void sub_0202D848(const u8 param0, UnkStruct_0202D844 *param1) { param1->unk_00 = param0; } -UnkStruct_0202D84C * sub_0202D84C (const u8 param0, UnkStruct_0202D844 * param1) +UnkStruct_0202D84C *sub_0202D84C(const u8 param0, UnkStruct_0202D844 *param1) { - UnkStruct_0202D84C * v0; + UnkStruct_0202D84C *v0; v0 = ¶m1->unk_04[param0]; return v0; } -void sub_0202D854 (SaveData * param0, const int param1) +void sub_0202D854(SaveData *param0, const int param1) { int v0; - UnkStruct_0202D844 * v1; - UnkStruct_0202D7B0 * v2; - UnkStruct_0202D84C * v3; + UnkStruct_0202D844 *v1; + UnkStruct_0202D7B0 *v2; + UnkStruct_0202D84C *v3; v2 = sub_0202D834(param0); v1 = &(v2->unk_10); @@ -124,20 +123,20 @@ void sub_0202D854 (SaveData * param0, const int param1) } } -void sub_0202D884 (SaveData * param0) +void sub_0202D884(SaveData *param0) { - UnkStruct_0202D7B0 * v0; + UnkStruct_0202D7B0 *v0; v0 = sub_0202D834(param0); v0->unk_14E = 1; } -u8 sub_0202D898 (UnkStruct_0202D7B0 * param0) +u8 sub_0202D898(UnkStruct_0202D7B0 *param0) { return param0->unk_14E; } -void sub_0202D8A4 (UnkStruct_0202D7B0 * param0, const int param1) +void sub_0202D8A4(UnkStruct_0202D7B0 *param0, const int param1) { if (param0->unk_C8.unk_00 != param1) { param0->unk_C8.unk_04 = param0->unk_C8.unk_00; @@ -145,41 +144,41 @@ void sub_0202D8A4 (UnkStruct_0202D7B0 * param0, const int param1) } } -int sub_0202D8BC (UnkStruct_0202D7B0 * param0) +int sub_0202D8BC(UnkStruct_0202D7B0 *param0) { return param0->unk_C8.unk_04; } -u8 sub_0202D8C4 (UnkStruct_0202D7B0 * param0, const u8 param1) +u8 sub_0202D8C4(UnkStruct_0202D7B0 *param0, const u8 param1) { GF_ASSERT(param1 < 6); return param0->unk_148[param1]; } -void sub_0202D8DC (UnkStruct_0202D7B0 * param0, const u8 param1, const u8 param2) +void sub_0202D8DC(UnkStruct_0202D7B0 *param0, const u8 param1, const u8 param2) { GF_ASSERT(param1 < 6); param0->unk_148[param1] = param2; } -u8 sub_0202D8F8 (UnkStruct_0202D7B0 * param0, const u8 param1) +u8 sub_0202D8F8(UnkStruct_0202D7B0 *param0, const u8 param1) { GF_ASSERT(param1 < 6); return param0->unk_D0[param1].unk_12; } -void sub_0202D914 (UnkStruct_0206C638 ** param0) +void sub_0202D914(UnkStruct_0206C638 **param0) { memset((*param0), 0, sizeof(UnkStruct_0206C638)); } -UnkStruct_0206C638 * sub_0202D924 (UnkStruct_0202D7B0 * param0, const u8 param1) +UnkStruct_0206C638 *sub_0202D924(UnkStruct_0202D7B0 *param0, const u8 param1) { GF_ASSERT(param1 < 6); return &(param0->unk_D0[param1]); } -u32 sub_0202D93C (const UnkStruct_0206C638 * param0, const u8 param1) +u32 sub_0202D93C(const UnkStruct_0206C638 *param0, const u8 param1) { u32 v0; @@ -213,7 +212,7 @@ u32 sub_0202D93C (const UnkStruct_0206C638 * param0, const u8 param1) return v0; } -void sub_0202D980 (UnkStruct_0206C638 * param0, const u8 param1, const u32 param2) +void sub_0202D980(UnkStruct_0206C638 *param0, const u8 param1, const u32 param2) { u32 v0; @@ -245,17 +244,17 @@ void sub_0202D980 (UnkStruct_0206C638 * param0, const u8 param1, const u32 param } } -u8 * sub_0202D9C4 (UnkStruct_0202D7B0 * param0) +u8 *sub_0202D9C4(UnkStruct_0202D7B0 *param0) { return &(param0->unk_150); } -u8 * sub_0202D9CC (UnkStruct_0202D7B0 * param0) +u8 *sub_0202D9CC(UnkStruct_0202D7B0 *param0) { return &(param0->unk_14F); } -BOOL sub_0202D9D8 (UnkStruct_0202D7B0 * param0) +BOOL sub_0202D9D8(UnkStruct_0202D7B0 *param0) { if (!param0->unk_14F) { return 1; @@ -264,28 +263,28 @@ BOOL sub_0202D9D8 (UnkStruct_0202D7B0 * param0) } } -void sub_0202D9EC (UnkStruct_0202D7B0 * param0, const u8 param1) +void sub_0202D9EC(UnkStruct_0202D7B0 *param0, const u8 param1) { GF_ASSERT((param1 == 1) || (param1 == 2) || (param1 == 0)); param0->unk_151 = param1; } -u8 sub_0202DA04 (UnkStruct_0202D7B0 * param0) +u8 sub_0202DA04(UnkStruct_0202D7B0 *param0) { return param0->unk_151; } -void sub_0202DA10 (SaveData * param0, u16 * param1, u16 * param2) +void sub_0202DA10(SaveData *param0, u16 *param1, u16 *param2) { - UnkStruct_0202D7B0 * v0 = sub_0202D834(param0); + UnkStruct_0202D7B0 *v0 = sub_0202D834(param0); (*param1) = v0->unk_08.unk_04; (*param2) = v0->unk_08.unk_06; } -void sub_0202DA24 (SaveData * param0, const u16 param1) +void sub_0202DA24(SaveData *param0, const u16 param1) { - UnkStruct_0202D7B0 * v0 = sub_0202D834(param0); + UnkStruct_0202D7B0 *v0 = sub_0202D834(param0); GF_ASSERT(param1 < 16); diff --git a/src/unk_0202DA40.c b/src/unk_0202DA40.c index a143f9e383..d0ca6cf32a 100644 --- a/src/unk_0202DA40.c +++ b/src/unk_0202DA40.c @@ -1,12 +1,11 @@ +#include "unk_0202DA40.h" + #include #include #include "pokemon.h" #include "savedata.h" -#include "savedata.h" -#include "unk_0202DA40.h" - typedef struct UnkStruct_0202DA40_t { u8 unk_00[236]; u16 unk_EC; @@ -15,62 +14,62 @@ typedef struct UnkStruct_0202DA40_t { u32 unk_F4; } UnkStruct_0202DA40; -UnkStruct_0202DA40 * sub_0202DA40 (SaveData * param0) +UnkStruct_0202DA40 *sub_0202DA40(SaveData *param0) { return SaveData_SaveTable(param0, 26); } -int GlobalTrade_SaveSize (void) +int GlobalTrade_SaveSize(void) { return sizeof(UnkStruct_0202DA40); } -void GlobalTrade_Init (UnkStruct_0202DA40 * param0) +void GlobalTrade_Init(UnkStruct_0202DA40 *param0) { MI_CpuClearFast(param0, sizeof(UnkStruct_0202DA40)); } -int sub_0202DA60 (UnkStruct_0202DA40 * param0) +int sub_0202DA60(UnkStruct_0202DA40 *param0) { return param0->unk_EC; } -void sub_0202DA68 (UnkStruct_0202DA40 * param0, int param1) +void sub_0202DA68(UnkStruct_0202DA40 *param0, int param1) { param0->unk_EC = param1; } -void sub_0202DA70 (UnkStruct_0202DA40 * param0, Pokemon * param1) +void sub_0202DA70(UnkStruct_0202DA40 *param0, Pokemon *param1) { MI_CpuCopyFast(param0->unk_00, (void *)param1, 236); } -void sub_0202DA7C (UnkStruct_0202DA40 * param0, Pokemon * param1, int param2) +void sub_0202DA7C(UnkStruct_0202DA40 *param0, Pokemon *param1, int param2) { MI_CpuCopyFast((void *)param1, param0->unk_00, 236); } -u32 sub_0202DA8C (UnkStruct_0202DA40 * param0) +u32 sub_0202DA8C(UnkStruct_0202DA40 *param0) { return param0->unk_F0; } -void sub_0202DA94 (UnkStruct_0202DA40 * param0, u32 param1) +void sub_0202DA94(UnkStruct_0202DA40 *param0, u32 param1) { param0->unk_F0 = param1; } -u32 sub_0202DA9C (UnkStruct_0202DA40 * param0) +u32 sub_0202DA9C(UnkStruct_0202DA40 *param0) { return param0->unk_F4; } -void sub_0202DAA4 (UnkStruct_0202DA40 * param0, u32 param1) +void sub_0202DAA4(UnkStruct_0202DA40 *param0, u32 param1) { param0->unk_F4 = param1; } -int sub_0202DAAC (UnkStruct_0202DA40 * param0) +int sub_0202DAAC(UnkStruct_0202DA40 *param0) { return param0->unk_EE; } diff --git a/src/unk_0202DAB4.c b/src/unk_0202DAB4.c index e002666608..21927ac4b8 100644 --- a/src/unk_0202DAB4.c +++ b/src/unk_0202DAB4.c @@ -1,15 +1,15 @@ +#include "unk_0202DAB4.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0202DBAC.h" #include "struct_defs/struct_0202DF40.h" #include "struct_defs/union_0204C4D0.h" #include "savedata/save_table.h" + #include "savedata.h" -#include "unk_0202DAB4.h" typedef struct MysteryGift { u8 unk_00[256]; @@ -17,19 +17,19 @@ typedef struct MysteryGift { UnkStruct_0202DBAC unk_920[3]; } MysteryGift; -MysteryGift * SaveData_MysteryGift(SaveData * param0); +MysteryGift *SaveData_MysteryGift(SaveData *param0); -int MysteryGift_SaveSize (void) +int MysteryGift_SaveSize(void) { return sizeof(MysteryGift); } -void MysteryGift_Init (MysteryGift * param0) +void MysteryGift_Init(MysteryGift *param0) { SaveData_SetChecksum(31); } -static BOOL sub_0202DAC8 (u16 param0) +static BOOL sub_0202DAC8(u16 param0) { if ((param0 > 0) && (param0 < 14)) { return 1; @@ -38,7 +38,7 @@ static BOOL sub_0202DAC8 (u16 param0) return 0; } -UnkStruct_0202DF40 * sub_0202DAD8 (MysteryGift * param0, int param1) +UnkStruct_0202DF40 *sub_0202DAD8(MysteryGift *param0, int param1) { if ((param1 >= 0) && (param1 < 8)) { if (sub_0202DAC8(param0->unk_100[param1].unk_00)) { @@ -49,7 +49,7 @@ UnkStruct_0202DF40 * sub_0202DAD8 (MysteryGift * param0, int param1) return (UnkStruct_0202DF40 *)NULL; } -UnkStruct_0202DBAC * sub_0202DB00 (MysteryGift * param0, int param1) +UnkStruct_0202DBAC *sub_0202DB00(MysteryGift *param0, int param1) { if ((param1 >= 0) && (param1 < 3)) { if (sub_0202DAC8(param0->unk_920[param1].unk_00)) { @@ -60,7 +60,7 @@ UnkStruct_0202DBAC * sub_0202DB00 (MysteryGift * param0, int param1) return NULL; } -BOOL sub_0202DB2C (MysteryGift * param0, const void * param1, int param2) +BOOL sub_0202DB2C(MysteryGift *param0, const void *param1, int param2) { int v0; BOOL v1 = 0; @@ -83,10 +83,10 @@ BOOL sub_0202DB2C (MysteryGift * param0, const void * param1, int param2) return v1; } -BOOL sub_0202DBAC (MysteryGift * param0, const void * param1) +BOOL sub_0202DBAC(MysteryGift *param0, const void *param1) { int v0; - UnkStruct_0202DBAC * v1 = (UnkStruct_0202DBAC *)param1; + UnkStruct_0202DBAC *v1 = (UnkStruct_0202DBAC *)param1; BOOL v2 = 0; if (sub_0202DD08(param0) == 0) { @@ -115,7 +115,7 @@ BOOL sub_0202DBAC (MysteryGift * param0, const void * param1) return v2; } -BOOL sub_0202DC48 (MysteryGift * param0, int param1) +BOOL sub_0202DC48(MysteryGift *param0, int param1) { GF_ASSERT(param1 < 8); @@ -127,7 +127,7 @@ BOOL sub_0202DC48 (MysteryGift * param0, int param1) return 1; } -BOOL sub_0202DC7C (MysteryGift * param0, int param1) +BOOL sub_0202DC7C(MysteryGift *param0, int param1) { GF_ASSERT(param1 < 3); @@ -140,7 +140,7 @@ BOOL sub_0202DC7C (MysteryGift * param0, int param1) return 1; } -BOOL sub_0202DCB8 (MysteryGift * param0, int param1) +BOOL sub_0202DCB8(MysteryGift *param0, int param1) { GF_ASSERT(param1 < 3); @@ -150,7 +150,7 @@ BOOL sub_0202DCB8 (MysteryGift * param0, int param1) return 1; } -BOOL sub_0202DCE0 (MysteryGift * param0) +BOOL sub_0202DCE0(MysteryGift *param0) { int v0; @@ -163,7 +163,7 @@ BOOL sub_0202DCE0 (MysteryGift * param0) return 0; } -BOOL sub_0202DD08 (MysteryGift * param0) +BOOL sub_0202DD08(MysteryGift *param0) { int v0; @@ -176,7 +176,7 @@ BOOL sub_0202DD08 (MysteryGift * param0) return 0; } -BOOL sub_0202DD30 (const MysteryGift * param0, int param1) +BOOL sub_0202DD30(const MysteryGift *param0, int param1) { GF_ASSERT(param1 < 8); @@ -187,7 +187,7 @@ BOOL sub_0202DD30 (const MysteryGift * param0, int param1) return 0; } -BOOL sub_0202DD5C (const MysteryGift * param0, int param1) +BOOL sub_0202DD5C(const MysteryGift *param0, int param1) { GF_ASSERT(param1 < 3); @@ -198,7 +198,7 @@ BOOL sub_0202DD5C (const MysteryGift * param0, int param1) return 0; } -BOOL sub_0202DD88 (const MysteryGift * param0) +BOOL sub_0202DD88(const MysteryGift *param0) { int v0; @@ -211,7 +211,7 @@ BOOL sub_0202DD88 (const MysteryGift * param0) return 0; } -BOOL sub_0202DDA8 (const MysteryGift * param0, int param1) +BOOL sub_0202DDA8(const MysteryGift *param0, int param1) { int v0; @@ -226,7 +226,7 @@ BOOL sub_0202DDA8 (const MysteryGift * param0, int param1) return 0; } -void sub_0202DDE8 (const MysteryGift * param0, int param1) +void sub_0202DDE8(const MysteryGift *param0, int param1) { int v0; @@ -240,13 +240,13 @@ void sub_0202DDE8 (const MysteryGift * param0, int param1) } } -BOOL sub_0202DE2C (MysteryGift * param0, int param1) +BOOL sub_0202DE2C(MysteryGift *param0, int param1) { GF_ASSERT(param1 < 2048); return !!(param0->unk_00[param1 / 8] & (1 << (param1 & 7))); } -void sub_0202DE5C (MysteryGift * param0, int param1) +void sub_0202DE5C(MysteryGift *param0, int param1) { GF_ASSERT(param1 < 2048); @@ -254,7 +254,7 @@ void sub_0202DE5C (MysteryGift * param0, int param1) SaveData_SetChecksum(31); } -void sub_0202DE8C (MysteryGift * param0, int param1) +void sub_0202DE8C(MysteryGift *param0, int param1) { u8 v0 = (u8) ~(1 << (param1 & 7)); @@ -264,19 +264,19 @@ void sub_0202DE8C (MysteryGift * param0, int param1) SaveData_SetChecksum(31); } -BOOL sub_0202DEC4 (MysteryGift * param0) +BOOL sub_0202DEC4(MysteryGift *param0) { return sub_0202DE2C(param0, (2048 - 1)); } -void sub_0202DED4 (MysteryGift * param0) +void sub_0202DED4(MysteryGift *param0) { sub_0202DE5C(param0, (2048 - 1)); } -static MysteryGift * Unk_021C07A0 = NULL; +static MysteryGift *Unk_021C07A0 = NULL; -void sub_0202DEE4 (SaveData * param0, int param1) +void sub_0202DEE4(SaveData *param0, int param1) { int v0; @@ -287,7 +287,7 @@ void sub_0202DEE4 (SaveData * param0, int param1) SaveData_SetChecksum(31); } -void sub_0202DF04 (SaveData * param0, int param1) +void sub_0202DF04(SaveData *param0, int param1) { int v0; @@ -296,7 +296,7 @@ void sub_0202DF04 (SaveData * param0, int param1) } } -int sub_0202DF18 (void) +int sub_0202DF18(void) { int v0; @@ -309,9 +309,9 @@ int sub_0202DF18 (void) return -1; } -int sub_0202DF40 (int param0) +int sub_0202DF40(int param0) { - UnkStruct_0202DF40 * v0; + UnkStruct_0202DF40 *v0; v0 = sub_0202DAD8(Unk_021C07A0, param0); @@ -322,9 +322,9 @@ int sub_0202DF40 (int param0) return 0; } -UnkUnion_0204C4D0 * sub_0202DF5C (int param0) +UnkUnion_0204C4D0 *sub_0202DF5C(int param0) { - UnkStruct_0202DF40 * v0; + UnkStruct_0202DF40 *v0; v0 = sub_0202DAD8(Unk_021C07A0, param0); @@ -335,7 +335,7 @@ UnkUnion_0204C4D0 * sub_0202DF5C (int param0) return NULL; } -void sub_0202DF78 (int param0) +void sub_0202DF78(int param0) { sub_0202DC48(Unk_021C07A0, param0); } diff --git a/src/unk_0202DF8C.c b/src/unk_0202DF8C.c index 12ced6b521..48ac9eaebe 100644 --- a/src/unk_0202DF8C.c +++ b/src/unk_0202DF8C.c @@ -1,39 +1,37 @@ +#include "unk_0202DF8C.h" + #include #include -#include "inlines.h" - -#include "strbuf.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_0202DF8C.h" #include "struct_defs/struct_0202DFA8.h" #include "struct_defs/struct_0202E1F4.h" + #include "overlay087/struct_ov87_021D1640.h" -#include "strbuf.h" -#include "unk_0202DF8C.h" -#include "pokemon.h" +#include "inlines.h" #include "party.h" +#include "pokemon.h" +#include "strbuf.h" -static int inline inline_0202E1A8(const HallOfFame * param0, int param1); +static int inline inline_0202E1A8(const HallOfFame *param0, int param1); -int HallOfFame_SaveSize (void) +int HallOfFame_SaveSize(void) { return sizeof(HallOfFame); } -void HallOfFame_Init (HallOfFame * param0) +void HallOfFame_Init(HallOfFame *param0) { MI_CpuClear32(param0, sizeof(HallOfFame)); } -void sub_0202DFA8 (HallOfFame * param0, const Party * param1, const RTCDate * param2) +void sub_0202DFA8(HallOfFame *param0, const Party *param1, const RTCDate *param2) { - UnkStruct_0202DFA8 * v0; - Pokemon * v1; - Strbuf* v2; + UnkStruct_0202DFA8 *v0; + Pokemon *v1; + Strbuf *v2; int v3, v4, v5; BOOL v6; @@ -97,7 +95,7 @@ void sub_0202DFA8 (HallOfFame * param0, const Party * param1, const RTCDate * pa } } -u32 sub_0202E148 (const HallOfFame * param0) +u32 sub_0202E148(const HallOfFame *param0) { GF_ASSERT(param0 != NULL); GF_ASSERT(param0->unk_2AA8 < 30); @@ -109,7 +107,7 @@ u32 sub_0202E148 (const HallOfFame * param0) return param0->unk_2AAC; } -u32 sub_0202E174 (const HallOfFame * param0, int param1) +u32 sub_0202E174(const HallOfFame *param0, int param1) { GF_ASSERT(param0 != NULL); GF_ASSERT(param0->unk_2AA8 < 30); @@ -118,7 +116,7 @@ u32 sub_0202E174 (const HallOfFame * param0, int param1) return param0->unk_2AAC - param1; } -u32 sub_0202E1A8 (const HallOfFame * param0, int param1) +u32 sub_0202E1A8(const HallOfFame *param0, int param1) { u32 v0; @@ -137,9 +135,9 @@ u32 sub_0202E1A8 (const HallOfFame * param0, int param1) return v0; } -void sub_0202E1F4 (const HallOfFame * param0, int param1, int param2, UnkStruct_ov87_021D1640 * param3) +void sub_0202E1F4(const HallOfFame *param0, int param1, int param2, UnkStruct_ov87_021D1640 *param3) { - const UnkStruct_0202E1F4 * v0; + const UnkStruct_0202E1F4 *v0; int v1; GF_ASSERT(param0 != NULL); @@ -163,7 +161,7 @@ void sub_0202E1F4 (const HallOfFame * param0, int param1, int param2, UnkStruct_ } } -void sub_0202E274 (const HallOfFame * param0, int param1, RTCDate * param2) +void sub_0202E274(const HallOfFame *param0, int param1, RTCDate *param2) { GF_ASSERT(param0 != NULL); GF_ASSERT(param0->unk_2AA8 < 30); @@ -177,7 +175,7 @@ void sub_0202E274 (const HallOfFame * param0, int param1, RTCDate * param2) param2->week = 0; } -static int inline inline_0202E1A8 (const HallOfFame * param0, int param1) +static int inline inline_0202E1A8(const HallOfFame *param0, int param1) { int v0 = (param0->unk_2AA8 - 1 - param1); diff --git a/src/unk_0202E2CC.c b/src/unk_0202E2CC.c index 163e6ee829..13f26b2e01 100644 --- a/src/unk_0202E2CC.c +++ b/src/unk_0202E2CC.c @@ -1,8 +1,8 @@ +#include "unk_0202E2CC.h" + #include #include -#include "inlines.h" - #include "struct_defs/struct_0202440C.h" #include "struct_defs/struct_0202E4D4.h" #include "struct_defs/struct_0202E768.h" @@ -17,25 +17,25 @@ #include "struct_defs/struct_0202E828.h" #include "struct_defs/struct_0202E834.h" +#include "inlines.h" #include "rtc.h" #include "savedata.h" -#include "unk_0202E2CC.h" -static void sub_0202E3AC(TVBroadcast * param0); -static UnkStruct_0202E768 * sub_0202E4DC(TVBroadcast * param0, int param1); +static void sub_0202E3AC(TVBroadcast *param0); +static UnkStruct_0202E768 *sub_0202E4DC(TVBroadcast *param0, int param1); -int TVBroadcast_SaveSize (void) +int TVBroadcast_SaveSize(void) { return sizeof(TVBroadcast); } -void TVBroadcast_Init (TVBroadcast * param0) +void TVBroadcast_Init(TVBroadcast *param0) { MI_CpuClearFast(param0, sizeof(TVBroadcast)); SaveData_SetChecksum(27); } -void sub_0202E2EC (TVBroadcast * param0) +void sub_0202E2EC(TVBroadcast *param0) { MI_CpuClearFast(param0->unk_0C, sizeof(UnkStruct_0202E768) * 4); MI_CpuClearFast(param0->unk_C4, sizeof(UnkStruct_0202E768) * 4); @@ -45,7 +45,7 @@ void sub_0202E2EC (TVBroadcast * param0) SaveData_SetChecksum(27); } -void sub_0202E324 (TVBroadcast * param0, int param1, int param2) +void sub_0202E324(TVBroadcast *param0, int param1, int param2) { int v0; @@ -68,25 +68,25 @@ void sub_0202E324 (TVBroadcast * param0, int param1, int param2) SaveData_SetChecksum(27); } -void sub_0202E35C (TVBroadcast * param0) +void sub_0202E35C(TVBroadcast *param0) { sub_0202E374(param0, 0); sub_0202E3AC(param0); SaveData_SetChecksum(27); } -void sub_0202E374 (TVBroadcast * param0, BOOL param1) +void sub_0202E374(TVBroadcast *param0, BOOL param1) { param0->unk_08 = param1; SaveData_SetChecksum(27); } -BOOL sub_0202E380 (const TVBroadcast * param0) +BOOL sub_0202E380(const TVBroadcast *param0) { return param0->unk_08; } -void sub_0202E384 (TVBroadcast * param0, int param1) +void sub_0202E384(TVBroadcast *param0, int param1) { int v0; @@ -103,7 +103,7 @@ void sub_0202E384 (TVBroadcast * param0, int param1) SaveData_SetChecksum(27); } -static void sub_0202E3AC (TVBroadcast * param0) +static void sub_0202E3AC(TVBroadcast *param0) { int v0; @@ -114,7 +114,7 @@ static void sub_0202E3AC (TVBroadcast * param0) SaveData_SetChecksum(27); } -BOOL sub_0202E3C4 (const TVBroadcast * param0, int param1) +BOOL sub_0202E3C4(const TVBroadcast *param0, int param1) { int v0; @@ -127,7 +127,7 @@ BOOL sub_0202E3C4 (const TVBroadcast * param0, int param1) return 0; } -int sub_0202E3DC (const TVBroadcast * param0) +int sub_0202E3DC(const TVBroadcast *param0) { int v0, v1; @@ -140,7 +140,7 @@ int sub_0202E3DC (const TVBroadcast * param0) return v1; } -static void sub_0202E3F4 (UnkStruct_0202E4D4 * param0, int param1, const u8 * param2) +static void sub_0202E3F4(UnkStruct_0202E4D4 *param0, int param1, const u8 *param2) { RTCDate v0; @@ -154,10 +154,10 @@ static void sub_0202E3F4 (UnkStruct_0202E4D4 * param0, int param1, const u8 * pa SaveData_SetChecksum(27); } -BOOL sub_0202E43C (TVBroadcast * param0, int param1, int param2, const u8 * param3) +BOOL sub_0202E43C(TVBroadcast *param0, int param1, int param2, const u8 *param3) { int v0; - UnkStruct_0202E768 * v1; + UnkStruct_0202E768 *v1; v1 = sub_0202E4DC(param0, param1); @@ -191,34 +191,34 @@ BOOL sub_0202E43C (TVBroadcast * param0, int param1, int param2, const u8 * para return 0; } -const u16 * sub_0202E4C8 (const UnkStruct_0202E794 * param0) +const u16 *sub_0202E4C8(const UnkStruct_0202E794 *param0) { return param0->unk_08; } -int sub_0202E4CC (const UnkStruct_0202E794 * param0) +int sub_0202E4CC(const UnkStruct_0202E794 *param0) { return param0->unk_06; } -int sub_0202E4D0 (const UnkStruct_0202E794 * param0) +int sub_0202E4D0(const UnkStruct_0202E794 *param0) { return param0->unk_05; } -UnkStruct_0202E4D4 * sub_0202E4D4 (UnkStruct_0202E794 * param0) +UnkStruct_0202E4D4 *sub_0202E4D4(UnkStruct_0202E794 *param0) { return ¶m0->unk_18; } -UnkStruct_0202E4D4 * sub_0202E4D8 (UnkStruct_0202E768 * param0) +UnkStruct_0202E4D4 *sub_0202E4D8(UnkStruct_0202E768 *param0) { return ¶m0->unk_00; } -static UnkStruct_0202E768 * sub_0202E4DC (TVBroadcast * param0, int param1) +static UnkStruct_0202E768 *sub_0202E4DC(TVBroadcast *param0, int param1) { - UnkStruct_0202E768 * v0 = NULL; + UnkStruct_0202E768 *v0 = NULL; switch (param1) { case 1: @@ -238,9 +238,9 @@ static UnkStruct_0202E768 * sub_0202E4DC (TVBroadcast * param0, int param1) return v0; } -static UnkStruct_0202E794 * sub_0202E518 (TVBroadcast * param0, int param1) +static UnkStruct_0202E794 *sub_0202E518(TVBroadcast *param0, int param1) { - UnkStruct_0202E794 * v0 = NULL; + UnkStruct_0202E794 *v0 = NULL; switch (param1) { case 2: @@ -260,12 +260,12 @@ static UnkStruct_0202E794 * sub_0202E518 (TVBroadcast * param0, int param1) return v0; } -int sub_0202E55C (const UnkStruct_0202E4D4 * param0) +int sub_0202E55C(const UnkStruct_0202E4D4 *param0) { return param0->unk_00; } -void sub_0202E560 (UnkStruct_0202E4D4 * param0) +void sub_0202E560(UnkStruct_0202E4D4 *param0) { if (param0->unk_01 < 3) { param0->unk_01++; @@ -274,12 +274,12 @@ void sub_0202E560 (UnkStruct_0202E4D4 * param0) SaveData_SetChecksum(27); } -void * sub_0202E574 (UnkStruct_0202E4D4 * param0) +void *sub_0202E574(UnkStruct_0202E4D4 *param0) { return param0->unk_08; } -static int sub_0202E578 (const UnkStruct_0202E768 * param0, int param1, int param2, BOOL param3, u8 * param4) +static int sub_0202E578(const UnkStruct_0202E768 *param0, int param1, int param2, BOOL param3, u8 *param4) { int v0, v1; @@ -300,7 +300,7 @@ static int sub_0202E578 (const UnkStruct_0202E768 * param0, int param1, int para return v1; } -static int sub_0202E5B8 (const UnkStruct_0202E794 * param0, int param1, int param2, BOOL param3, u8 * param4) +static int sub_0202E5B8(const UnkStruct_0202E794 *param0, int param1, int param2, BOOL param3, u8 *param4) { int v0, v1; @@ -321,7 +321,7 @@ static int sub_0202E5B8 (const UnkStruct_0202E794 * param0, int param1, int para return v1; } -int sub_0202E614 (const TVBroadcast * param0, int param1, int param2, BOOL param3, BOOL param4, u8 * param5) +int sub_0202E614(const TVBroadcast *param0, int param1, int param2, BOOL param3, BOOL param4, u8 *param5) { switch (param1) { case 2: @@ -351,12 +351,12 @@ int sub_0202E614 (const TVBroadcast * param0, int param1, int param2, BOOL param return 0; } -BOOL sub_0202E6B0 (TVBroadcast * param0, int param1, int param2) +BOOL sub_0202E6B0(TVBroadcast *param0, int param1, int param2) { int v0; int v1; u8 v2[4]; - UnkStruct_0202E768 * v3; + UnkStruct_0202E768 *v3; MI_CpuClear8(v2, 4); @@ -391,9 +391,9 @@ BOOL sub_0202E6B0 (TVBroadcast * param0, int param1, int param2) return 0; } -UnkStruct_0202E768 * sub_0202E768 (TVBroadcast * param0, int param1, int param2) +UnkStruct_0202E768 *sub_0202E768(TVBroadcast *param0, int param1, int param2) { - UnkStruct_0202E768 * v0; + UnkStruct_0202E768 *v0; GF_ASSERT(sub_0202E7C0(param2) == 1); @@ -403,9 +403,9 @@ UnkStruct_0202E768 * sub_0202E768 (TVBroadcast * param0, int param1, int param2) return &v0[param2 - 1]; } -UnkStruct_0202E794 * sub_0202E794 (TVBroadcast * param0, int param1, int param2) +UnkStruct_0202E794 *sub_0202E794(TVBroadcast *param0, int param1, int param2) { - UnkStruct_0202E794 * v0; + UnkStruct_0202E794 *v0; GF_ASSERT(sub_0202E7C0(param2) == 0); @@ -415,7 +415,7 @@ UnkStruct_0202E794 * sub_0202E794 (TVBroadcast * param0, int param1, int param2) return &v0[param2 - 1]; } -BOOL sub_0202E7C0 (int param0) +BOOL sub_0202E7C0(int param0) { if (param0 & 0x80) { return 0; @@ -424,52 +424,52 @@ BOOL sub_0202E7C0 (int param0) } } -int sub_0202E7D0 (int param0) +int sub_0202E7D0(int param0) { return param0 | 0x80; } -UnkStruct_0202E7D8 * sub_0202E7D8 (TVBroadcast * param0) +UnkStruct_0202E7D8 *sub_0202E7D8(TVBroadcast *param0) { return ¶m0->unk_AD4; } -UnkStruct_0202E7E4 * sub_0202E7E4 (TVBroadcast * param0) +UnkStruct_0202E7E4 *sub_0202E7E4(TVBroadcast *param0) { return ¶m0->unk_ADE; } -UnkStruct_0202E7F0 * sub_0202E7F0 (TVBroadcast * param0) +UnkStruct_0202E7F0 *sub_0202E7F0(TVBroadcast *param0) { return ¶m0->unk_B02; } -UnkStruct_0202E7FC * sub_0202E7FC (TVBroadcast * param0) +UnkStruct_0202E7FC *sub_0202E7FC(TVBroadcast *param0) { return ¶m0->unk_B04; } -UnkStruct_0202E808 * sub_0202E808 (TVBroadcast * param0) +UnkStruct_0202E808 *sub_0202E808(TVBroadcast *param0) { return ¶m0->unk_B08; } -UnkStruct_0202E810 * sub_0202E810 (TVBroadcast * param0) +UnkStruct_0202E810 *sub_0202E810(TVBroadcast *param0) { return ¶m0->unk_B10; } -UnkStruct_0202E81C * sub_0202E81C (TVBroadcast * param0) +UnkStruct_0202E81C *sub_0202E81C(TVBroadcast *param0) { return ¶m0->unk_B2E; } -UnkStruct_0202E828 * sub_0202E828 (TVBroadcast * param0) +UnkStruct_0202E828 *sub_0202E828(TVBroadcast *param0) { return ¶m0->unk_B44; } -UnkStruct_0202E834 * sub_0202E834 (TVBroadcast * param0) +UnkStruct_0202E834 *sub_0202E834(TVBroadcast *param0) { return ¶m0->unk_B4C; } diff --git a/src/unk_0202E840.c b/src/unk_0202E840.c index 78746107fe..d619b818a2 100644 --- a/src/unk_0202E840.c +++ b/src/unk_0202E840.c @@ -1,55 +1,52 @@ +#include "unk_0202E840.h" + #include #include -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_0203068C_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0202E858.h" #include "struct_defs/struct_0202E8C0.h" #include "struct_defs/struct_0202E91C.h" #include "struct_defs/struct_0202EA80.h" #include "struct_defs/struct_0202EE10.h" -#include "unk_020021B0.h" #include "heap.h" -#include "strbuf.h" #include "savedata.h" -#include "unk_02025E08.h" +#include "strbuf.h" #include "trainer_info.h" +#include "unk_020021B0.h" +#include "unk_02025E08.h" #include "unk_0202B37C.h" #include "unk_0202CD50.h" -#include "unk_0202E840.h" #include "unk_0203061C.h" typedef struct { int unk_00; int unk_04; int unk_08; - UnkStruct_0202E858 * unk_0C[11]; - UnkStruct_0202E858 * unk_38[6]; + UnkStruct_0202E858 *unk_0C[11]; + UnkStruct_0202E858 *unk_38[6]; UnkStruct_0202EA80 unk_50; } UnkStruct_0202EABC; static const u8 Unk_020E5CD0[][2] = { - {0x6, 0x0}, - {0x4, 0x6}, - {0x3, 0xA} + { 0x6, 0x0 }, + { 0x4, 0x6 }, + { 0x3, 0xA } }; -u8 sub_0202E840 (int param0) +u8 sub_0202E840(int param0) { return Unk_020E5CD0[param0][0]; } -u8 sub_0202E84C (int param0) +u8 sub_0202E84C(int param0) { return Unk_020E5CD0[param0][1]; } -void sub_0202E858 (UnkStruct_0202E858 * param0) +void sub_0202E858(UnkStruct_0202E858 *param0) { param0->unk_00 = 0; param0->unk_04 = 0; @@ -58,7 +55,7 @@ void sub_0202E858 (UnkStruct_0202E858 * param0) SaveData_SetChecksum(28); } -BOOL sub_0202E870 (UnkStruct_0202E858 * param0) +BOOL sub_0202E870(UnkStruct_0202E858 *param0) { if (GF_strlen(param0->unk_08) == 0) { return 0; @@ -67,12 +64,12 @@ BOOL sub_0202E870 (UnkStruct_0202E858 * param0) return 1; } -int Rankings_SaveSize (void) +int Rankings_SaveSize(void) { return sizeof(UnkStruct_0202E8C0); } -void Rankings_Init (UnkStruct_0202E8C0 * param0) +void Rankings_Init(UnkStruct_0202E8C0 *param0) { int v0, v1; @@ -87,16 +84,16 @@ void Rankings_Init (UnkStruct_0202E8C0 * param0) SaveData_SetChecksum(28); } -UnkStruct_0202E8C0 * sub_0202E8C0 (SaveData * param0) +UnkStruct_0202E8C0 *sub_0202E8C0(SaveData *param0) { SaveData_Checksum(28); return SaveData_SaveTable(param0, 28); } -void sub_0202E8D4 (UnkStruct_0202E8C0 * param0, int param1, u8 param2) +void sub_0202E8D4(UnkStruct_0202E8C0 *param0, int param1, u8 param2) { int v0; - UnkStruct_0202EA80 * v1; + UnkStruct_0202EA80 *v1; if (param2 >= 6) { GF_ASSERT(param2 < 6); @@ -113,18 +110,18 @@ void sub_0202E8D4 (UnkStruct_0202E8C0 * param0, int param1, u8 param2) SaveData_SetChecksum(28); } -int sub_0202E91C (void) +int sub_0202E91C(void) { return sizeof(UnkStruct_0202E91C); } -static u32 * sub_0202E924 (SaveData * param0, int param1) +static u32 *sub_0202E924(SaveData *param0, int param1) { int v0; u32 v1; - UnkStruct_0202CD88 * v2; - UnkStruct_0203068C * v3; - u32 * v4; + UnkStruct_0202CD88 *v2; + UnkStruct_0203068C *v3; + u32 *v4; static const int v5[] = { 0x0, 0x2, @@ -157,13 +154,13 @@ static u32 * sub_0202E924 (SaveData * param0, int param1) v4[v0] = v1; break; case 10: - v1 = sub_0202CFB8(v2, (((70 + 1)) + 21)); - v1 += sub_0202CFB8(v2, (((70 + 1)) + 22)); + v1 = sub_0202CFB8(v2, ((70 + 1) + 21)); + v1 += sub_0202CFB8(v2, ((70 + 1) + 22)); v4[v0] = v1; break; case 11: - v1 = sub_0202CFB8(v2, (((70 + 1)) + 19)); - v1 += sub_0202CFB8(v2, (((70 + 1)) + 20)); + v1 = sub_0202CFB8(v2, ((70 + 1) + 19)); + v1 += sub_0202CFB8(v2, ((70 + 1) + 20)); if (v1 > 0) { v1 = (v4[10] * 100) / v1; @@ -185,14 +182,14 @@ static u32 * sub_0202E924 (SaveData * param0, int param1) return v4; } -void * sub_0202E9FC (SaveData * param0, int param1) +void *sub_0202E9FC(SaveData *param0, int param1) { int v0; u32 v1, v2; - UnkStruct_0202E91C * v3; - Strbuf* v4; - TrainerInfo * v5 = SaveData_GetTrainerInfo(param0); - u32 * v6; + UnkStruct_0202E91C *v3; + Strbuf *v4; + TrainerInfo *v5 = SaveData_GetTrainerInfo(param0); + u32 *v6; v3 = Heap_AllocFromHeapAtEnd(param1, sizeof(UnkStruct_0202E91C)); MI_CpuClear8(v3, sizeof(UnkStruct_0202E91C)); @@ -216,7 +213,7 @@ void * sub_0202E9FC (SaveData * param0, int param1) return v3; } -static void sub_0202EA80 (UnkStruct_0202EA80 * param0) +static void sub_0202EA80(UnkStruct_0202EA80 *param0) { int v0; @@ -225,7 +222,7 @@ static void sub_0202EA80 (UnkStruct_0202EA80 * param0) } } -static BOOL sub_0202EA98 (const UnkStruct_0202E858 * param0, const UnkStruct_0202E858 * param1) +static BOOL sub_0202EA98(const UnkStruct_0202E858 *param0, const UnkStruct_0202E858 *param1) { if (param0->unk_00 != param1->unk_00) { return 0; @@ -238,7 +235,7 @@ static BOOL sub_0202EA98 (const UnkStruct_0202E858 * param0, const UnkStruct_020 return 1; } -static BOOL sub_0202EABC (UnkStruct_0202EABC * param0, const UnkStruct_0202E858 * param1) +static BOOL sub_0202EABC(UnkStruct_0202EABC *param0, const UnkStruct_0202E858 *param1) { int v0; @@ -251,11 +248,11 @@ static BOOL sub_0202EABC (UnkStruct_0202EABC * param0, const UnkStruct_0202E858 return 0; } -static void sub_0202EAEC (UnkStruct_0202E8C0 * param0, UnkStruct_0202EABC * param1, u32 param2, u8 param3, u8 param4, UnkStruct_0202E91C ** param5, u8 param6, int param7) +static void sub_0202EAEC(UnkStruct_0202E8C0 *param0, UnkStruct_0202EABC *param1, u32 param2, u8 param3, u8 param4, UnkStruct_0202E91C **param5, u8 param6, int param7) { int v0, v1; - UnkStruct_0202E858 * v2; - UnkStruct_0202EA80 * v3; + UnkStruct_0202E858 *v2; + UnkStruct_0202EA80 *v3; MI_CpuClear8(param1, sizeof(UnkStruct_0202EABC)); @@ -334,10 +331,10 @@ static void sub_0202EAEC (UnkStruct_0202E8C0 * param0, UnkStruct_0202EABC * para } } -static void sub_0202ECB0 (UnkStruct_0202E8C0 * param0, u32 param1, u8 param2, UnkStruct_0202E91C ** param3, u8 param4, int param5) +static void sub_0202ECB0(UnkStruct_0202E8C0 *param0, u32 param1, u8 param2, UnkStruct_0202E91C **param3, u8 param4, int param5) { int v0, v1; - UnkStruct_0202EABC * v2; + UnkStruct_0202EABC *v2; v2 = Heap_AllocFromHeapAtEnd(param5, sizeof(UnkStruct_0202EABC)); @@ -350,13 +347,13 @@ static void sub_0202ECB0 (UnkStruct_0202E8C0 * param0, u32 param1, u8 param2, Un Heap_FreeToHeap(v2); } -void sub_0202ED0C (SaveData * param0, int param1, u8 param2, const void ** param3, int param4) +void sub_0202ED0C(SaveData *param0, int param1, u8 param2, const void **param3, int param4) { u8 v0, v1; u32 v2; - UnkStruct_0202E91C * v3[5]; - UnkStruct_0202E8C0 * v4; - UnkStruct_0202EE10 * v5; + UnkStruct_0202E91C *v3[5]; + UnkStruct_0202E8C0 *v4; + UnkStruct_0202EE10 *v5; v4 = sub_0202E8C0(param0); v2 = sub_0202B400(sub_0202B4A0(param0), 1); @@ -387,13 +384,13 @@ void sub_0202ED0C (SaveData * param0, int param1, u8 param2, const void ** param return; } -UnkStruct_0202EE10 * sub_0202ED8C (SaveData * param0, int param1, int param2) +UnkStruct_0202EE10 *sub_0202ED8C(SaveData *param0, int param1, int param2) { int v0, v1; u32 v2; - UnkStruct_0202EE10 * v3; - u32 * v4; - TrainerInfo * v5; + UnkStruct_0202EE10 *v3; + u32 *v4; + TrainerInfo *v5; v5 = SaveData_GetTrainerInfo(param0); v3 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_0202EE10)); @@ -415,11 +412,11 @@ UnkStruct_0202EE10 * sub_0202ED8C (SaveData * param0, int param1, int param2) return v3; } -UnkStruct_0202EE10 * sub_0202EE10 (UnkStruct_0202E8C0 * param0, int param1, int param2) +UnkStruct_0202EE10 *sub_0202EE10(UnkStruct_0202E8C0 *param0, int param1, int param2) { int v0; - UnkStruct_0202EE10 * v1; - UnkStruct_0202EA80 * v2; + UnkStruct_0202EE10 *v1; + UnkStruct_0202EA80 *v2; v1 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_0202EE10)); MI_CpuClear8(v1, sizeof(UnkStruct_0202EE10)); @@ -440,7 +437,7 @@ UnkStruct_0202EE10 * sub_0202EE10 (UnkStruct_0202E8C0 * param0, int param1, int return v1; } -void sub_0202EE8C (UnkStruct_0202EE10 * param0) +void sub_0202EE8C(UnkStruct_0202EE10 *param0) { int v0; diff --git a/src/unk_0202EEC0.c b/src/unk_0202EEC0.c index 0055146513..1b41c56c1a 100644 --- a/src/unk_0202EEC0.c +++ b/src/unk_0202EEC0.c @@ -1,11 +1,10 @@ +#include "unk_0202EEC0.h" + #include #include #include "pokemon.h" - #include "rtc.h" -#include "unk_0202EEC0.h" -#include "pokemon.h" typedef struct PalParkTransfer { Pokemon unk_00[6]; @@ -15,12 +14,12 @@ typedef struct PalParkTransfer { u8 unk_380[6]; } PalParkTransfer; -int PalParkTransfer_SaveSize (void) +int PalParkTransfer_SaveSize(void) { return sizeof(PalParkTransfer); } -void PalParkTransfer_Init (PalParkTransfer * param0) +void PalParkTransfer_Init(PalParkTransfer *param0) { int v0; @@ -32,7 +31,7 @@ void PalParkTransfer_Init (PalParkTransfer * param0) } } -void sub_0202EF04 (PalParkTransfer * param0) +void sub_0202EF04(PalParkTransfer *param0) { int v0; @@ -44,7 +43,7 @@ void sub_0202EF04 (PalParkTransfer * param0) } } -static int sub_0202EF40 (PalParkTransfer * param0, u32 param1) +static int sub_0202EF40(PalParkTransfer *param0, u32 param1) { int v0, v1; s64 v2; @@ -73,12 +72,12 @@ static int sub_0202EF40 (PalParkTransfer * param0, u32 param1) return v1; } -void sub_0202EFA4 (PalParkTransfer * param0, BoxPokemon * param1, int param2) +void sub_0202EFA4(PalParkTransfer *param0, BoxPokemon *param1, int param2) { Pokemon_FromBoxPokemon(param1, ¶m0->unk_00[param2]); } -void sub_0202EFB8 (PalParkTransfer * param0, u32 param1) +void sub_0202EFB8(PalParkTransfer *param0, u32 param1) { int v0 = sub_0202EF40(param0, param1); @@ -89,13 +88,13 @@ void sub_0202EFB8 (PalParkTransfer * param0, u32 param1) OS_GetMacAddress(param0->unk_380); } -void sub_0202F000 (const PalParkTransfer * param0, int param1, Pokemon * param2) +void sub_0202F000(const PalParkTransfer *param0, int param1, Pokemon *param2) { GF_ASSERT(param1 < 6); *param2 = param0->unk_00[param1]; } -int sub_0202F028 (const PalParkTransfer * param0) +int sub_0202F028(const PalParkTransfer *param0) { int v0, v1; @@ -108,7 +107,7 @@ int sub_0202F028 (const PalParkTransfer * param0) return v1; } -int sub_0202F050 (const PalParkTransfer * param0, u32 param1) +int sub_0202F050(const PalParkTransfer *param0, u32 param1) { int v0; s64 v1 = GetTimestamp(); @@ -122,7 +121,7 @@ int sub_0202F050 (const PalParkTransfer * param0, u32 param1) return 0; } -BOOL sub_0202F088 (const PalParkTransfer * param0) +BOOL sub_0202F088(const PalParkTransfer *param0) { int v0; u8 v1[6]; @@ -138,12 +137,12 @@ BOOL sub_0202F088 (const PalParkTransfer * param0) return 1; } -BOOL sub_0202F0BC (const PalParkTransfer * param0) +BOOL sub_0202F0BC(const PalParkTransfer *param0) { return param0->unk_378 == OS_GetOwnerRtcOffset(); } -BOOL sub_0202F0E0 (const PalParkTransfer * param0) +BOOL sub_0202F0E0(const PalParkTransfer *param0) { int v0; u8 v1; diff --git a/src/unk_0202F108.c b/src/unk_0202F108.c index d6fcb79022..d1a9a52992 100644 --- a/src/unk_0202F108.c +++ b/src/unk_0202F108.c @@ -1,19 +1,18 @@ +#include "unk_0202F108.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0202F10C.h" #include "savedata.h" -#include "unk_0202F108.h" -int Contest_SaveSize (void) +int Contest_SaveSize(void) { return sizeof(UnkStruct_0202F10C); } -void Contest_Init (UnkStruct_0202F10C * param0) +void Contest_Init(UnkStruct_0202F10C *param0) { int v0, v1; @@ -26,9 +25,9 @@ void Contest_Init (UnkStruct_0202F10C * param0) SaveData_SetChecksum(33); } -void sub_0202F134 (SaveData * param0, int param1, int param2) +void sub_0202F134(SaveData *param0, int param1, int param2) { - UnkStruct_0202F10C * v0; + UnkStruct_0202F10C *v0; v0 = SaveData_SaveTable(param0, 33); @@ -39,9 +38,9 @@ void sub_0202F134 (SaveData * param0, int param1, int param2) SaveData_SetChecksum(33); } -u16 sub_0202F160 (SaveData * param0, int param1, int param2) +u16 sub_0202F160(SaveData *param0, int param1, int param2) { - UnkStruct_0202F10C * v0; + UnkStruct_0202F10C *v0; v0 = SaveData_SaveTable(param0, 33); SaveData_Checksum(33); diff --git a/src/unk_0202F180.c b/src/unk_0202F180.c index 638b683314..47418d2e37 100644 --- a/src/unk_0202F180.c +++ b/src/unk_0202F180.c @@ -1,20 +1,20 @@ +#include "unk_0202F180.h" + #include #include #include "struct_decls/pokedexdata_decl.h" + #include "pokemon.h" +#include "poketch_data.h" #include "savedata.h" - #include "unk_0202631C.h" #include "unk_0202CD50.h" -#include "unk_0202F180.h" -#include "poketch_data.h" -#include "pokemon.h" -void sub_0202F180 (SaveData * param0, const Pokemon * param1) +void sub_0202F180(SaveData *param0, const Pokemon *param1) { if (Pokemon_GetValue((Pokemon *)param1, MON_DATA_IS_EGG, NULL) == 0) { - PokedexData * v0 = SaveData_Pokedex(param0); + PokedexData *v0 = SaveData_Pokedex(param0); sub_0202D040(sub_0202CD88(param0), v0, Pokemon_GetValue((Pokemon *)param1, MON_DATA_SPECIES, NULL)); sub_0202736C(v0, (Pokemon *)param1); diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c index 9c8805641a..da07895d8c 100644 --- a/src/unk_0202F1D4.c +++ b/src/unk_0202F1D4.c @@ -1,9 +1,9 @@ -#include "enums.h" +#include "unk_0202F1D4.h" #include #include -#include "savedata.h" +#include "constants/species.h" #include "struct_defs/struct_0202F264.h" #include "struct_defs/struct_0202F298.h" @@ -12,50 +12,49 @@ #include "struct_defs/struct_0202FAA8.h" #include "struct_defs/struct_0202FD30.h" #include "struct_defs/struct_02030A80.h" -#include "constants/species.h" -#include "pokemon.h" #include "struct_defs/struct_02078B40.h" #include "struct_defs/struct_party.h" + #include "overlay006/battle_params.h" +#include "savedata/save_table.h" +#include "enums.h" +#include "game_options.h" +#include "heap.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "trainer_info.h" #include "unk_02006224.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_0201D15C.h" -#include "savedata/save_table.h" -#include "savedata.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_02026150.h" #include "unk_0202631C.h" -#include "game_options.h" -#include "unk_0202F1D4.h" -#include "pokemon.h" -#include "party.h" -BattleRecording * Unk_021C07A4 = NULL; +BattleRecording *Unk_021C07A4 = NULL; -static void sub_0202FCE8(const Party * param0, UnkStruct_0202FD30 * param1); -static void sub_0202FD30(UnkStruct_0202FD30 * param0, Party * param1); -static BOOL sub_0202F75C(SaveData * param0, BattleRecording * param1); -static BOOL sub_0202F794(SaveData * param0, const BattleRecording * param1); -static void sub_0202F860(void * param0, u32 param1, u32 param2); -static void sub_0202F510(SaveData * param0, UnkStruct_0202F41C * param1, const UnkStruct_0202F298 * param2, int param3, int param4); +static void sub_0202FCE8(const Party *param0, UnkStruct_0202FD30 *param1); +static void sub_0202FD30(UnkStruct_0202FD30 *param0, Party *param1); +static BOOL sub_0202F75C(SaveData *param0, BattleRecording *param1); +static BOOL sub_0202F794(SaveData *param0, const BattleRecording *param1); +static void sub_0202F860(void *param0, u32 param1, u32 param2); +static void sub_0202F510(SaveData *param0, UnkStruct_0202F41C *param1, const UnkStruct_0202F298 *param2, int param3, int param4); -int BattleRecording_SaveSize (void) +int BattleRecording_SaveSize(void) { GF_ASSERT(sizeof(BattleRecording) < 0x1000 * 2); return sizeof(BattleRecording); } -void BattleRecording_Init (BattleRecording * param0) +void BattleRecording_Init(BattleRecording *param0) { MI_CpuClear32(param0, sizeof(BattleRecording)); param0->unk_00 = 0xffffffff; } -void sub_0202F1F8 (SaveData * param0, int param1, int * param2) +void sub_0202F1F8(SaveData *param0, int param1, int *param2) { if (Unk_021C07A4 != NULL) { Heap_FreeToHeap(Unk_021C07A4); @@ -66,7 +65,7 @@ void sub_0202F1F8 (SaveData * param0, int param1, int * param2) BattleRecording_Init(Unk_021C07A4); } -void sub_0202F22C (void) +void sub_0202F22C(void) { GF_ASSERT(Unk_021C07A4); @@ -74,20 +73,20 @@ void sub_0202F22C (void) Unk_021C07A4 = NULL; } -BOOL sub_0202F250 (void) +BOOL sub_0202F250(void) { return Unk_021C07A4 != NULL; } -BattleRecording * sub_0202F264 (void) +BattleRecording *sub_0202F264(void) { GF_ASSERT(Unk_021C07A4); return Unk_021C07A4; } -void * sub_0202F27C (void) +void *sub_0202F27C(void) { - u8 * v0; + u8 *v0; GF_ASSERT(Unk_021C07A4); @@ -95,10 +94,10 @@ void * sub_0202F27C (void) return &v0[sizeof(u32)]; } -BOOL sub_0202F298 (SaveData * param0, int param1, int * param2, BattleParams * param3, int param4) +BOOL sub_0202F298(SaveData *param0, int param1, int *param2, BattleParams *param3, int param4) { - UnkStruct_0202F298 * v0; - UnkStruct_0202F41C * v1; + UnkStruct_0202F298 *v0; + UnkStruct_0202F41C *v1; if (Unk_021C07A4) { Heap_FreeToHeap(Unk_021C07A4); @@ -135,11 +134,11 @@ BOOL sub_0202F298 (SaveData * param0, int param1, int * param2, BattleParams * p return 1; } -BOOL sub_0202F330 (SaveData * param0, int param1, int * param2, int param3) +BOOL sub_0202F330(SaveData *param0, int param1, int *param2, int param3) { - UnkStruct_0202F298 * v0; - UnkStruct_0202F41C * v1; - BattleRecording * v2; + UnkStruct_0202F298 *v0; + UnkStruct_0202F41C *v1; + BattleRecording *v2; v2 = SaveData_BattleRecording(param0, param1, param2, param3); @@ -171,7 +170,7 @@ BOOL sub_0202F330 (SaveData * param0, int param1, int * param2, int param3) return 1; } -int sub_0202F3AC (SaveData * param0, BattleRecording * param1, int param2, u16 * param3) +int sub_0202F3AC(SaveData *param0, BattleRecording *param1, int param2, u16 *param3) { int v0; @@ -205,10 +204,10 @@ int sub_0202F3AC (SaveData * param0, BattleRecording * param1, int param2, u16 * return 0; } -int sub_0202F41C (SaveData * param0, int param1, int param2, int param3, u16 * param4, u16 * param5) +int sub_0202F41C(SaveData *param0, int param1, int param2, int param3, u16 *param4, u16 *param5) { - UnkStruct_0202F41C * v0; - UnkStruct_0202F298 * v1; + UnkStruct_0202F41C *v0; + UnkStruct_0202F298 *v1; int v2; switch (*param4) { @@ -241,7 +240,7 @@ int sub_0202F41C (SaveData * param0, int param1, int param2, int param3, u16 * p return 0; } -void sub_0202F4C0 (int param0, int * param1, int * param2) +void sub_0202F4C0(int param0, int *param1, int *param2) { switch (param0) { case (UnkEnum_0202F510_17): @@ -261,12 +260,12 @@ void sub_0202F4C0 (int param0, int * param1, int * param2) } } -static void sub_0202F510 (SaveData * param0, UnkStruct_0202F41C * param1, const UnkStruct_0202F298 * param2, int param3, int param4) +static void sub_0202F510(SaveData *param0, UnkStruct_0202F41C *param1, const UnkStruct_0202F298 *param2, int param3, int param4) { int v0, v1, v2, v3, v4, v5, v6; - const UnkStruct_02078B40 * v7; - const u8 v8[2][4] = {{0, 2, 3, 1}, {3, 1, 0, 2}}; - const u8 v9[4] = {0, 2, 1, 3}; + const UnkStruct_02078B40 *v7; + const u8 v8[2][4] = { { 0, 2, 3, 1 }, { 3, 1, 0, 2 } }; + const u8 v9[4] = { 0, 2, 1, 3 }; MI_CpuClear8(param1, sizeof(UnkStruct_0202F41C)); sub_0202F4C0(param3, &v2, &v3); @@ -348,10 +347,10 @@ static void sub_0202F510 (SaveData * param0, UnkStruct_0202F41C * param1, const param1->unk_26 = param3; } -static BOOL sub_0202F75C (SaveData * param0, BattleRecording * param1) +static BOOL sub_0202F75C(SaveData *param0, BattleRecording *param1) { - UnkStruct_0202F298 * v0 = ¶m1->unk_E8; - UnkStruct_0202F41C * v1 = ¶m1->unk_84; + UnkStruct_0202F298 *v0 = ¶m1->unk_E8; + UnkStruct_0202F41C *v1 = ¶m1->unk_84; if (SaveData_MiscSaveBlock_InitFlag(param0) == 0) { return 1; @@ -364,10 +363,10 @@ static BOOL sub_0202F75C (SaveData * param0, BattleRecording * param1) return 0; } -static BOOL sub_0202F794 (SaveData * param0, const BattleRecording * param1) +static BOOL sub_0202F794(SaveData *param0, const BattleRecording *param1) { - const UnkStruct_0202F298 * v0 = ¶m1->unk_E8; - const UnkStruct_0202F41C * v1 = ¶m1->unk_84; + const UnkStruct_0202F298 *v0 = ¶m1->unk_E8; + const UnkStruct_0202F41C *v1 = ¶m1->unk_84; u16 v2; if ((v0->unk_1BEA != 0xe281) || (v1->unk_48 != 0xe281)) { @@ -388,7 +387,7 @@ static BOOL sub_0202F794 (SaveData * param0, const BattleRecording * param1) { int v3, v4, v5; - const UnkStruct_02078B40 * v6; + const UnkStruct_02078B40 *v6; for (v3 = 0; v3 < 4; v3++) { for (v4 = 0; v4 < 6; v4++) { @@ -414,17 +413,17 @@ static BOOL sub_0202F794 (SaveData * param0, const BattleRecording * param1) return 1; } -void sub_0202F858 (void * param0, u32 param1, u32 param2) +void sub_0202F858(void *param0, u32 param1, u32 param2) { EncryptData(param0, param1, param2); } -static void sub_0202F860 (void * param0, u32 param1, u32 param2) +static void sub_0202F860(void *param0, u32 param1, u32 param2) { DecryptData(param0, param1, param2); } -void sub_0202F868 (int param0, int param1, u8 param2) +void sub_0202F868(int param0, int param1, u8 param2) { if (Unk_021C07A4 == NULL) { return; @@ -433,17 +432,17 @@ void sub_0202F868 (int param0, int param1, u8 param2) Unk_021C07A4->unk_E8.unk_150.unk_00[param0][param1] = param2; } -u8 sub_0202F884 (int param0, int param1) +u8 sub_0202F884(int param0, int param1) { GF_ASSERT(Unk_021C07A4 != NULL); return Unk_021C07A4->unk_E8.unk_150.unk_00[param0][param1]; } -void sub_0202F8AC (BattleParams * param0) +void sub_0202F8AC(BattleParams *param0) { int v0; - UnkStruct_0202F298 * v1; - UnkStruct_0202FAA8 * v2; + UnkStruct_0202F298 *v1; + UnkStruct_0202FAA8 *v2; if (Unk_021C07A4 == NULL) { return; @@ -497,10 +496,10 @@ void sub_0202F8AC (BattleParams * param0) Options_Copy(param0->unk_108, &v1->unk_1BE8); } -void sub_0202FAA8 (int param0, u32 param1) +void sub_0202FAA8(int param0, u32 param1) { - UnkStruct_0202F298 * v0; - UnkStruct_0202FAA8 * v1; + UnkStruct_0202F298 *v0; + UnkStruct_0202FAA8 *v1; if (Unk_021C07A4 == NULL) { return; @@ -512,11 +511,11 @@ void sub_0202FAA8 (int param0, u32 param1) v1->unk_114[param0] = param1; } -BOOL sub_0202FAC0 (void) +BOOL sub_0202FAC0(void) { int v0; - UnkStruct_0202F298 * v1; - UnkStruct_0202FAA8 * v2; + UnkStruct_0202F298 *v1; + UnkStruct_0202FAA8 *v2; if (Unk_021C07A4 == NULL) { return 1; @@ -534,10 +533,10 @@ BOOL sub_0202FAC0 (void) return 1; } -void sub_0202FAFC (BattleParams * param0, SaveData * param1) +void sub_0202FAFC(BattleParams *param0, SaveData *param1) { int v0; - UnkStruct_0202F298 * v1 = &Unk_021C07A4->unk_E8; + UnkStruct_0202F298 *v1 = &Unk_021C07A4->unk_E8; param0->battleType = v1->unk_00.unk_00; param0->unk_128 = v1->unk_00.unk_E8; @@ -580,10 +579,10 @@ void sub_0202FAFC (BattleParams * param0, SaveData * param1) } } -static void sub_0202FCE8 (const Party * param0, UnkStruct_0202FD30 * param1) +static void sub_0202FCE8(const Party *param0, UnkStruct_0202FD30 *param1) { int v0; - Pokemon * v1; + Pokemon *v1; MI_CpuClear8(param1, sizeof(UnkStruct_0202FD30)); @@ -596,10 +595,10 @@ static void sub_0202FCE8 (const Party * param0, UnkStruct_0202FD30 * param1) } } -static void sub_0202FD30 (UnkStruct_0202FD30 * param0, Party * param1) +static void sub_0202FD30(UnkStruct_0202FD30 *param0, Party *param1) { int v0; - Pokemon * v1; + Pokemon *v1; u8 v2 = 0; v1 = Pokemon_New(11); @@ -615,9 +614,9 @@ static void sub_0202FD30 (UnkStruct_0202FD30 * param0, Party * param1) Heap_FreeToHeap(v1); } -UnkStruct_0202F41C * sub_0202FD88 (int param0) +UnkStruct_0202F41C *sub_0202FD88(int param0) { - UnkStruct_0202F41C * v0; + UnkStruct_0202F41C *v0; GF_ASSERT(Unk_021C07A4 != NULL); @@ -627,9 +626,9 @@ UnkStruct_0202F41C * sub_0202FD88 (int param0) return v0; } -UnkStruct_02030A80 * sub_0202FDB8 (int param0) +UnkStruct_02030A80 *sub_0202FDB8(int param0) { - UnkStruct_02030A80 * v0; + UnkStruct_02030A80 *v0; GF_ASSERT(Unk_021C07A4 != NULL); @@ -639,19 +638,19 @@ UnkStruct_02030A80 * sub_0202FDB8 (int param0) return v0; } -UnkStruct_02030A80 * sub_0202FDE8 (void) +UnkStruct_02030A80 *sub_0202FDE8(void) { GF_ASSERT(Unk_021C07A4 != NULL); return &Unk_021C07A4->unk_04; } -UnkStruct_0202F41C * sub_0202FE04 (void) +UnkStruct_0202F41C *sub_0202FE04(void) { GF_ASSERT(Unk_021C07A4 != NULL); return &Unk_021C07A4->unk_84; } -void sub_0202FE20 (UnkStruct_02030A80 * param0, UnkStruct_0202F41C * param1, UnkStruct_0202F298 * param2, BattleParams * param3, SaveData * param4) +void sub_0202FE20(UnkStruct_02030A80 *param0, UnkStruct_0202F41C *param1, UnkStruct_0202F298 *param2, BattleParams *param3, SaveData *param4) { GF_ASSERT(Unk_021C07A4 != NULL); @@ -666,7 +665,7 @@ void sub_0202FE20 (UnkStruct_02030A80 * param0, UnkStruct_0202F41C * param1, Unk } } -u64 sub_0202FE98 (UnkStruct_0202F41C * param0, int param1, int param2) +u64 sub_0202FE98(UnkStruct_0202F41C *param0, int param1, int param2) { GF_ASSERT((sizeof(u64)) <= sizeof(u64)); @@ -704,9 +703,9 @@ u64 sub_0202FE98 (UnkStruct_0202F41C * param0, int param1, int param2) return 0; } -UnkStruct_0202F41C * sub_0202FF2C (int param0) +UnkStruct_0202F41C *sub_0202FF2C(int param0) { - UnkStruct_0202F41C * v0; + UnkStruct_0202F41C *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0202F41C)); MI_CpuClear8(v0, sizeof(UnkStruct_0202F41C)); @@ -714,7 +713,7 @@ UnkStruct_0202F41C * sub_0202FF2C (int param0) return v0; } -void sub_0202FF44 (UnkStruct_0202F41C * param0) +void sub_0202FF44(UnkStruct_0202F41C *param0) { Heap_FreeToHeap(param0); } diff --git a/src/unk_0202FF4C.c b/src/unk_0202FF4C.c index e3051efada..d1af35e8f4 100644 --- a/src/unk_0202FF4C.c +++ b/src/unk_0202FF4C.c @@ -1,54 +1,53 @@ +#include "unk_0202FF4C.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0202FF58.h" #include "struct_defs/struct_020300F4.h" #include "struct_defs/struct_0203068C.h" #include "savedata.h" -#include "unk_0202FF4C.h" -void sub_0202FF4C(UnkStruct_0202FF58 * param0); -UnkStruct_0202FF58 * sub_0202FF58(SaveData * param0); -void sub_020300A4(UnkStruct_020300F4 * param0); -void sub_020300B0(UnkStruct_020300F4 * param0, u8 param1, u8 param2, const void * param3); -u32 sub_020300E0(UnkStruct_020300F4 * param0, u8 param1, u8 param2, void * param3); -UnkStruct_020300F4 * sub_020300F4(SaveData * param0); -BOOL sub_0202FF68(UnkStruct_0202FF58 * param0); -void sub_0202FF70(UnkStruct_0202FF58 * param0, BOOL param1); -void sub_0202FF84(UnkStruct_0202FF58 * param0, u8 param1, u8 param2, const void * param3); -u32 sub_02030030(UnkStruct_0202FF58 * param0, u8 param1, u8 param2, void * param3); - -void sub_0202FF4C (UnkStruct_0202FF58 * param0) +void sub_0202FF4C(UnkStruct_0202FF58 *param0); +UnkStruct_0202FF58 *sub_0202FF58(SaveData *param0); +void sub_020300A4(UnkStruct_020300F4 *param0); +void sub_020300B0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, const void *param3); +u32 sub_020300E0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, void *param3); +UnkStruct_020300F4 *sub_020300F4(SaveData *param0); +BOOL sub_0202FF68(UnkStruct_0202FF58 *param0); +void sub_0202FF70(UnkStruct_0202FF58 *param0, BOOL param1); +void sub_0202FF84(UnkStruct_0202FF58 *param0, u8 param1, u8 param2, const void *param3); +u32 sub_02030030(UnkStruct_0202FF58 *param0, u8 param1, u8 param2, void *param3); + +void sub_0202FF4C(UnkStruct_0202FF58 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_0202FF58)); return; } -UnkStruct_0202FF58 * sub_0202FF58 (SaveData * param0) +UnkStruct_0202FF58 *sub_0202FF58(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_8E0_val2; } -BOOL sub_0202FF68 (UnkStruct_0202FF58 * param0) +BOOL sub_0202FF68(UnkStruct_0202FF58 *param0) { return param0->unk_00_4; } -void sub_0202FF70 (UnkStruct_0202FF58 * param0, BOOL param1) +void sub_0202FF70(UnkStruct_0202FF58 *param0, BOOL param1) { param0->unk_00_4 = param1; return; } -void sub_0202FF84 (UnkStruct_0202FF58 * param0, u8 param1, u8 param2, const void * param3) +void sub_0202FF84(UnkStruct_0202FF58 *param0, u8 param1, u8 param2, const void *param3) { - u32 * v0 = (u32 *)param3; - u16 * v1 = (u16 *)param3; - u8 * v2 = (u8 *)param3; + u32 *v0 = (u32 *)param3; + u16 *v1 = (u16 *)param3; + u8 *v2 = (u8 *)param3; switch (param1) { case 0: @@ -86,7 +85,7 @@ void sub_0202FF84 (UnkStruct_0202FF58 * param0, u8 param1, u8 param2, const void return; } -u32 sub_02030030 (UnkStruct_0202FF58 * param0, u8 param1, u8 param2, void * param3) +u32 sub_02030030(UnkStruct_0202FF58 *param0, u8 param1, u8 param2, void *param3) { switch (param1) { case 1: @@ -114,17 +113,17 @@ u32 sub_02030030 (UnkStruct_0202FF58 * param0, u8 param1, u8 param2, void * para return 0; } -void sub_020300A4 (UnkStruct_020300F4 * param0) +void sub_020300A4(UnkStruct_020300F4 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_020300F4)); return; } -void sub_020300B0 (UnkStruct_020300F4 * param0, u8 param1, u8 param2, const void * param3) +void sub_020300B0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, const void *param3) { - u32 * v0 = (u32 *)param3; - u16 * v1 = (u16 *)param3; - u8 * v2 = (u8 *)param3; + u32 *v0 = (u32 *)param3; + u16 *v1 = (u16 *)param3; + u8 *v2 = (u8 *)param3; switch (param1) { case 10: @@ -139,7 +138,7 @@ void sub_020300B0 (UnkStruct_020300F4 * param0, u8 param1, u8 param2, const void return; } -u32 sub_020300E0 (UnkStruct_020300F4 * param0, u8 param1, u8 param2, void * param3) +u32 sub_020300E0(UnkStruct_020300F4 *param0, u8 param1, u8 param2, void *param3) { switch (param1) { case 10: @@ -149,8 +148,8 @@ u32 sub_020300E0 (UnkStruct_020300F4 * param0, u8 param1, u8 param2, void * para return 0; } -UnkStruct_020300F4 * sub_020300F4 (SaveData * param0) +UnkStruct_020300F4 *sub_020300F4(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_1614.unk_00; } diff --git a/src/unk_02030108.c b/src/unk_02030108.c index 3896f8abdd..f0f6786581 100644 --- a/src/unk_02030108.c +++ b/src/unk_02030108.c @@ -1,57 +1,56 @@ +#include "unk_02030108.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_02030114.h" #include "struct_defs/struct_0203026C.h" #include "struct_defs/struct_0203068C.h" #include "savedata.h" -#include "unk_02030108.h" -void sub_02030108(UnkStruct_02030114 * param0); -UnkStruct_02030114 * sub_02030114(SaveData * param0); -BOOL sub_02030124(UnkStruct_02030114 * param0); -void sub_0203012C(UnkStruct_02030114 * param0, BOOL param1); -void sub_02030140(UnkStruct_02030114 * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_02030198(UnkStruct_02030114 * param0, u8 param1, u8 param2, u8 param3, void * param4); -u8 sub_020301E0(u8 param0, u8 * param1); -void sub_02030204(u8 param0, u8 * param1, u8 param2); -void sub_02030244(u8 * param0); -void sub_02030260(UnkStruct_0203026C * param0); -UnkStruct_0203026C * sub_0203026C(SaveData * param0); -void sub_02030280(UnkStruct_0203026C * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_020302B4(UnkStruct_0203026C * param0, u8 param1, u8 param2, u8 param3, void * param4); - -void sub_02030108 (UnkStruct_02030114 * param0) +void sub_02030108(UnkStruct_02030114 *param0); +UnkStruct_02030114 *sub_02030114(SaveData *param0); +BOOL sub_02030124(UnkStruct_02030114 *param0); +void sub_0203012C(UnkStruct_02030114 *param0, BOOL param1); +void sub_02030140(UnkStruct_02030114 *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_02030198(UnkStruct_02030114 *param0, u8 param1, u8 param2, u8 param3, void *param4); +u8 sub_020301E0(u8 param0, u8 *param1); +void sub_02030204(u8 param0, u8 *param1, u8 param2); +void sub_02030244(u8 *param0); +void sub_02030260(UnkStruct_0203026C *param0); +UnkStruct_0203026C *sub_0203026C(SaveData *param0); +void sub_02030280(UnkStruct_0203026C *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_020302B4(UnkStruct_0203026C *param0, u8 param1, u8 param2, u8 param3, void *param4); + +void sub_02030108(UnkStruct_02030114 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_02030114)); return; } -UnkStruct_02030114 * sub_02030114 (SaveData * param0) +UnkStruct_02030114 *sub_02030114(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_8E0_val3; } -BOOL sub_02030124 (UnkStruct_02030114 * param0) +BOOL sub_02030124(UnkStruct_02030114 *param0) { return param0->unk_00_3; } -void sub_0203012C (UnkStruct_02030114 * param0, BOOL param1) +void sub_0203012C(UnkStruct_02030114 *param0, BOOL param1) { param0->unk_00_3 = param1; return; } -void sub_02030140 (UnkStruct_02030114 * param0, u8 param1, u8 param2, u8 param3, const void * param4) +void sub_02030140(UnkStruct_02030114 *param0, u8 param1, u8 param2, u8 param3, const void *param4) { - u32 * v0 = (u32 *)param4; - u16 * v1 = (u16 *)param4; - u8 * v2 = (u8 *)param4; + u32 *v0 = (u32 *)param4; + u16 *v1 = (u16 *)param4; + u8 *v2 = (u8 *)param4; switch (param1) { case 0: @@ -77,7 +76,7 @@ void sub_02030140 (UnkStruct_02030114 * param0, u8 param1, u8 param2, u8 param3, return; } -u32 sub_02030198 (UnkStruct_02030114 * param0, u8 param1, u8 param2, u8 param3, void * param4) +u32 sub_02030198(UnkStruct_02030114 *param0, u8 param1, u8 param2, u8 param3, void *param4) { switch (param1) { case 0: @@ -98,7 +97,7 @@ u32 sub_02030198 (UnkStruct_02030114 * param0, u8 param1, u8 param2, u8 param3, return 0; } -u8 sub_020301E0 (u8 param0, u8 * param1) +u8 sub_020301E0(u8 param0, u8 *param1) { u8 v0; u8 v1; @@ -111,7 +110,7 @@ u8 sub_020301E0 (u8 param0, u8 * param1) return v2; } -void sub_02030204 (u8 param0, u8 * param1, u8 param2) +void sub_02030204(u8 param0, u8 *param1, u8 param2) { u8 v0; u8 v1; @@ -132,7 +131,7 @@ void sub_02030204 (u8 param0, u8 * param1, u8 param2) return; } -void sub_02030244 (u8 * param0) +void sub_02030244(u8 *param0) { int v0; @@ -143,23 +142,23 @@ void sub_02030244 (u8 * param0) return; } -void sub_02030260 (UnkStruct_0203026C * param0) +void sub_02030260(UnkStruct_0203026C *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_0203026C)); return; } -UnkStruct_0203026C * sub_0203026C (SaveData * param0) +UnkStruct_0203026C *sub_0203026C(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_1618.unk_00; } -void sub_02030280 (UnkStruct_0203026C * param0, u8 param1, u8 param2, u8 param3, const void * param4) +void sub_02030280(UnkStruct_0203026C *param0, u8 param1, u8 param2, u8 param3, const void *param4) { - u32 * v0 = (u32 *)param4; - u16 * v1 = (u16 *)param4; - u8 * v2 = (u8 *)param4; + u32 *v0 = (u32 *)param4; + u16 *v1 = (u16 *)param4; + u8 *v2 = (u8 *)param4; switch (param1) { case 5: @@ -177,7 +176,7 @@ void sub_02030280 (UnkStruct_0203026C * param0, u8 param1, u8 param2, u8 param3, return; } -u32 sub_020302B4 (UnkStruct_0203026C * param0, u8 param1, u8 param2, u8 param3, void * param4) +u32 sub_020302B4(UnkStruct_0203026C *param0, u8 param1, u8 param2, u8 param3, void *param4) { switch (param1) { case 5: diff --git a/src/unk_020302D0.c b/src/unk_020302D0.c index 2074ee9450..c0a55c7ffd 100644 --- a/src/unk_020302D0.c +++ b/src/unk_020302D0.c @@ -1,54 +1,53 @@ +#include "unk_020302D0.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_020302DC.h" #include "struct_defs/struct_0203041C.h" #include "struct_defs/struct_0203068C.h" #include "savedata.h" -#include "unk_020302D0.h" -void sub_020302D0(UnkStruct_020302DC * param0); -UnkStruct_020302DC * sub_020302DC(SaveData * param0); -BOOL sub_020302EC(UnkStruct_020302DC * param0); -void sub_020302F4(UnkStruct_020302DC * param0, BOOL param1); -void sub_02030308(UnkStruct_020302DC * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_02030398(UnkStruct_020302DC * param0, u8 param1, u8 param2, u8 param3, void * param4); -void sub_02030410(UnkStruct_0203041C * param0); -UnkStruct_0203041C * sub_0203041C(SaveData * param0); -void sub_02030430(UnkStruct_0203041C * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_02030470(UnkStruct_0203041C * param0, u8 param1, u8 param2, u8 param3, void * param4); - -void sub_020302D0 (UnkStruct_020302DC * param0) +void sub_020302D0(UnkStruct_020302DC *param0); +UnkStruct_020302DC *sub_020302DC(SaveData *param0); +BOOL sub_020302EC(UnkStruct_020302DC *param0); +void sub_020302F4(UnkStruct_020302DC *param0, BOOL param1); +void sub_02030308(UnkStruct_020302DC *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_02030398(UnkStruct_020302DC *param0, u8 param1, u8 param2, u8 param3, void *param4); +void sub_02030410(UnkStruct_0203041C *param0); +UnkStruct_0203041C *sub_0203041C(SaveData *param0); +void sub_02030430(UnkStruct_0203041C *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_02030470(UnkStruct_0203041C *param0, u8 param1, u8 param2, u8 param3, void *param4); + +void sub_020302D0(UnkStruct_020302DC *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_020302DC)); return; } -UnkStruct_020302DC * sub_020302DC (SaveData * param0) +UnkStruct_020302DC *sub_020302DC(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_8E0_val4; } -BOOL sub_020302EC (UnkStruct_020302DC * param0) +BOOL sub_020302EC(UnkStruct_020302DC *param0) { return param0->unk_00_3; } -void sub_020302F4 (UnkStruct_020302DC * param0, BOOL param1) +void sub_020302F4(UnkStruct_020302DC *param0, BOOL param1) { param0->unk_00_3 = param1; return; } -void sub_02030308 (UnkStruct_020302DC * param0, u8 param1, u8 param2, u8 param3, const void * param4) +void sub_02030308(UnkStruct_020302DC *param0, u8 param1, u8 param2, u8 param3, const void *param4) { - u32 * v0 = (u32 *)param4; - u16 * v1 = (u16 *)param4; - u8 * v2 = (u8 *)param4; + u32 *v0 = (u32 *)param4; + u16 *v1 = (u16 *)param4; + u8 *v2 = (u8 *)param4; switch (param1) { case 0: @@ -86,7 +85,7 @@ void sub_02030308 (UnkStruct_020302DC * param0, u8 param1, u8 param2, u8 param3, return; } -u32 sub_02030398 (UnkStruct_020302DC * param0, u8 param1, u8 param2, u8 param3, void * param4) +u32 sub_02030398(UnkStruct_020302DC *param0, u8 param1, u8 param2, u8 param3, void *param4) { switch (param1) { case 0: @@ -115,7 +114,7 @@ u32 sub_02030398 (UnkStruct_020302DC * param0, u8 param1, u8 param2, u8 param3, return 0; } -void sub_02030410 (UnkStruct_0203041C * param0) +void sub_02030410(UnkStruct_0203041C *param0) { int v0, v1; @@ -124,17 +123,17 @@ void sub_02030410 (UnkStruct_0203041C * param0) return; } -UnkStruct_0203041C * sub_0203041C (SaveData * param0) +UnkStruct_0203041C *sub_0203041C(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_161C.unk_00; } -void sub_02030430 (UnkStruct_0203041C * param0, u8 param1, u8 param2, u8 param3, const void * param4) +void sub_02030430(UnkStruct_0203041C *param0, u8 param1, u8 param2, u8 param3, const void *param4) { - u32 * v0 = (u32 *)param4; - u16 * v1 = (u16 *)param4; - u8 * v2 = (u8 *)param4; + u32 *v0 = (u32 *)param4; + u16 *v1 = (u16 *)param4; + u8 *v2 = (u8 *)param4; switch (param1) { case 9: @@ -155,7 +154,7 @@ void sub_02030430 (UnkStruct_0203041C * param0, u8 param1, u8 param2, u8 param3, return; } -u32 sub_02030470 (UnkStruct_0203041C * param0, u8 param1, u8 param2, u8 param3, void * param4) +u32 sub_02030470(UnkStruct_0203041C *param0, u8 param1, u8 param2, u8 param3, void *param4) { switch (param1) { case 9: diff --git a/src/unk_02030494.c b/src/unk_02030494.c index be3fbecd00..52e39cd261 100644 --- a/src/unk_02030494.c +++ b/src/unk_02030494.c @@ -1,54 +1,53 @@ +#include "unk_02030494.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_020304A0.h" #include "struct_defs/struct_020305B8.h" #include "struct_defs/struct_0203068C.h" #include "savedata.h" -#include "unk_02030494.h" -void sub_02030494(UnkStruct_020304A0 * param0); -UnkStruct_020304A0 * sub_020304A0(SaveData * param0); -BOOL sub_020304B0(UnkStruct_020304A0 * param0); -void sub_020304B8(UnkStruct_020304A0 * param0, BOOL param1); -void sub_020304CC(UnkStruct_020304A0 * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_0203054C(UnkStruct_020304A0 * param0, u8 param1, u8 param2, u8 param3, void * param4); -void sub_020305AC(UnkStruct_020305B8 * param0); -UnkStruct_020305B8 * sub_020305B8(SaveData * param0); -void sub_020305CC(UnkStruct_020305B8 * param0, u8 param1, u8 param2, u8 param3, const void * param4); -u32 sub_02030600(UnkStruct_020305B8 * param0, u8 param1, u8 param2, u8 param3, void * param4); - -void sub_02030494 (UnkStruct_020304A0 * param0) +void sub_02030494(UnkStruct_020304A0 *param0); +UnkStruct_020304A0 *sub_020304A0(SaveData *param0); +BOOL sub_020304B0(UnkStruct_020304A0 *param0); +void sub_020304B8(UnkStruct_020304A0 *param0, BOOL param1); +void sub_020304CC(UnkStruct_020304A0 *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_0203054C(UnkStruct_020304A0 *param0, u8 param1, u8 param2, u8 param3, void *param4); +void sub_020305AC(UnkStruct_020305B8 *param0); +UnkStruct_020305B8 *sub_020305B8(SaveData *param0); +void sub_020305CC(UnkStruct_020305B8 *param0, u8 param1, u8 param2, u8 param3, const void *param4); +u32 sub_02030600(UnkStruct_020305B8 *param0, u8 param1, u8 param2, u8 param3, void *param4); + +void sub_02030494(UnkStruct_020304A0 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_020304A0)); return; } -UnkStruct_020304A0 * sub_020304A0 (SaveData * param0) +UnkStruct_020304A0 *sub_020304A0(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_8E0_val5; } -BOOL sub_020304B0 (UnkStruct_020304A0 * param0) +BOOL sub_020304B0(UnkStruct_020304A0 *param0) { return param0->unk_00_3; } -void sub_020304B8 (UnkStruct_020304A0 * param0, BOOL param1) +void sub_020304B8(UnkStruct_020304A0 *param0, BOOL param1) { param0->unk_00_3 = param1; return; } -void sub_020304CC (UnkStruct_020304A0 * param0, u8 param1, u8 param2, u8 param3, const void * param4) +void sub_020304CC(UnkStruct_020304A0 *param0, u8 param1, u8 param2, u8 param3, const void *param4) { - u32 * v0 = (u32 *)param4; - u16 * v1 = (u16 *)param4; - u8 * v2 = (u8 *)param4; + u32 *v0 = (u32 *)param4; + u16 *v1 = (u16 *)param4; + u8 *v2 = (u8 *)param4; switch (param1) { case 0: @@ -83,7 +82,7 @@ void sub_020304CC (UnkStruct_020304A0 * param0, u8 param1, u8 param2, u8 param3, return; } -u32 sub_0203054C (UnkStruct_020304A0 * param0, u8 param1, u8 param2, u8 param3, void * param4) +u32 sub_0203054C(UnkStruct_020304A0 *param0, u8 param1, u8 param2, u8 param3, void *param4) { switch (param1) { case 0: @@ -110,23 +109,23 @@ u32 sub_0203054C (UnkStruct_020304A0 * param0, u8 param1, u8 param2, u8 param3, return 0; } -void sub_020305AC (UnkStruct_020305B8 * param0) +void sub_020305AC(UnkStruct_020305B8 *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_020305B8)); return; } -UnkStruct_020305B8 * sub_020305B8 (SaveData * param0) +UnkStruct_020305B8 *sub_020305B8(SaveData *param0) { - UnkStruct_0203068C * v0 = SaveData_SaveTable(param0, 23); + UnkStruct_0203068C *v0 = SaveData_SaveTable(param0, 23); return &v0->unk_1620.unk_00; } -void sub_020305CC (UnkStruct_020305B8 * param0, u8 param1, u8 param2, u8 param3, const void * param4) +void sub_020305CC(UnkStruct_020305B8 *param0, u8 param1, u8 param2, u8 param3, const void *param4) { - u32 * v0 = (u32 *)param4; - u16 * v1 = (u16 *)param4; - u8 * v2 = (u8 *)param4; + u32 *v0 = (u32 *)param4; + u16 *v1 = (u16 *)param4; + u8 *v2 = (u8 *)param4; switch (param1) { case 8: @@ -144,7 +143,7 @@ void sub_020305CC (UnkStruct_020305B8 * param0, u8 param1, u8 param2, u8 param3, return; } -u32 sub_02030600 (UnkStruct_020305B8 * param0, u8 param1, u8 param2, u8 param3, void * param4) +u32 sub_02030600(UnkStruct_020305B8 *param0, u8 param1, u8 param2, u8 param3, void *param4) { switch (param1) { case 8: diff --git a/src/unk_0203061C.c b/src/unk_0203061C.c index d80ec805e3..1db6d44c04 100644 --- a/src/unk_0203061C.c +++ b/src/unk_0203061C.c @@ -1,8 +1,8 @@ +#include "unk_0203061C.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0203068C.h" #include "struct_defs/struct_02030698.h" @@ -12,14 +12,13 @@ #include "unk_02030108.h" #include "unk_020302D0.h" #include "unk_02030494.h" -#include "unk_0203061C.h" -int Frontier_SaveSize (void) +int Frontier_SaveSize(void) { return sizeof(UnkStruct_0203068C); } -void Frontier_Init (UnkStruct_0203068C * param0) +void Frontier_Init(UnkStruct_0203068C *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_0203068C)); @@ -34,14 +33,14 @@ void Frontier_Init (UnkStruct_0203068C * param0) return; } -UnkStruct_0203068C * sub_0203068C (SaveData * param0) +UnkStruct_0203068C *sub_0203068C(SaveData *param0) { return SaveData_SaveTable(param0, 23); } -u16 sub_02030698 (UnkStruct_0203068C * param0, int param1, int param2) +u16 sub_02030698(UnkStruct_0203068C *param0, int param1, int param2) { - UnkStruct_02030698 * v0 = ¶m0->unk_00; + UnkStruct_02030698 *v0 = ¶m0->unk_00; if (param1 < 112) { if (param1 >= 100) { @@ -69,9 +68,9 @@ u16 sub_02030698 (UnkStruct_0203068C * param0, int param1, int param2) } } -u16 sub_020306E4 (UnkStruct_0203068C * param0, int param1, int param2, u16 param3) +u16 sub_020306E4(UnkStruct_0203068C *param0, int param1, int param2, u16 param3) { - UnkStruct_02030698 * v0 = ¶m0->unk_00; + UnkStruct_02030698 *v0 = ¶m0->unk_00; if (param3 > 9999) { param3 = 9999; @@ -108,10 +107,10 @@ u16 sub_020306E4 (UnkStruct_0203068C * param0, int param1, int param2, u16 param return param3; } -void sub_02030764 (UnkStruct_0203068C * param0) +void sub_02030764(UnkStruct_0203068C *param0) { int v0; - UnkStruct_02030698 * v1 = ¶m0->unk_00; + UnkStruct_02030698 *v1 = ¶m0->unk_00; MI_CpuClear8(v1->unk_E0, (sizeof(u16) * (144 - 112)) * 32); @@ -120,9 +119,9 @@ void sub_02030764 (UnkStruct_0203068C * param0) } } -void sub_02030788 (UnkStruct_0203068C * param0, int param1) +void sub_02030788(UnkStruct_0203068C *param0, int param1) { - UnkStruct_02030698 * v0 = ¶m0->unk_00; + UnkStruct_02030698 *v0 = ¶m0->unk_00; int v1, v2; u16 v3; @@ -141,15 +140,15 @@ void sub_02030788 (UnkStruct_0203068C * param0, int param1) MI_CpuClear8(v0->unk_E0[v1], sizeof(u16) * (144 - 112)); } -void sub_020307F0 (UnkStruct_0203068C * param0, int param1, int param2) +void sub_020307F0(UnkStruct_0203068C *param0, int param1, int param2) { - UnkStruct_02030698 * v0 = ¶m0->unk_00; + UnkStruct_02030698 *v0 = ¶m0->unk_00; MI_CpuClear8(v0->unk_E0[param1], sizeof(u16) * (144 - 112)); } -u16 sub_02030804 (UnkStruct_0203068C * param0, int param1, int param2, int param3) +u16 sub_02030804(UnkStruct_0203068C *param0, int param1, int param2, int param3) { - UnkStruct_02030698 * v0 = ¶m0->unk_00; + UnkStruct_02030698 *v0 = ¶m0->unk_00; u16 v1; v1 = sub_02030698(param0, param1, param2); @@ -158,9 +157,9 @@ u16 sub_02030804 (UnkStruct_0203068C * param0, int param1, int param2, int param return sub_020306E4(param0, param1, param2, v1); } -u16 sub_02030824 (UnkStruct_0203068C * param0, int param1, int param2, int param3) +u16 sub_02030824(UnkStruct_0203068C *param0, int param1, int param2, int param3) { - UnkStruct_02030698 * v0 = ¶m0->unk_00; + UnkStruct_02030698 *v0 = ¶m0->unk_00; int v1; v1 = sub_02030698(param0, param1, param2); @@ -173,7 +172,7 @@ u16 sub_02030824 (UnkStruct_0203068C * param0, int param1, int param2, int param return sub_020306E4(param0, param1, param2, v1); } -u16 sub_02030848 (UnkStruct_0203068C * param0, int param1, int param2, u16 param3) +u16 sub_02030848(UnkStruct_0203068C *param0, int param1, int param2, u16 param3) { u16 v0; diff --git a/src/unk_02030880.c b/src/unk_02030880.c index 490b83a55f..f35a59fb77 100644 --- a/src/unk_02030880.c +++ b/src/unk_02030880.c @@ -1,15 +1,17 @@ +#include "unk_02030880.h" + #include #include +#include "constants/species.h" + #include "struct_decls/struct_0203068C_decl.h" -#include "savedata.h" -#include "heap.h" #include "savedata/save_table.h" -#include "constants/species.h" + +#include "heap.h" #include "savedata.h" #include "unk_0203061C.h" -#include "unk_02030880.h" typedef struct { u16 unk_00[MAX_SPECIES]; @@ -23,30 +25,30 @@ typedef struct BattleFrontierStage { UnkStruct_020308A0_sub1 unk_04; } BattleFrontierStage; -static u16 sub_02030908(BattleFrontierStage * param0, int param1, int param2, u16 param3); -static u16 sub_02030954(SaveData * param0, BattleFrontierStage * param1, int param2, int param3, u16 param4); +static u16 sub_02030908(BattleFrontierStage *param0, int param1, int param2, u16 param3); +static u16 sub_02030954(SaveData *param0, BattleFrontierStage *param1, int param2, int param3, u16 param4); -int Frontier_Extra_SaveSize (void) +int Frontier_Extra_SaveSize(void) { GF_ASSERT(sizeof(BattleFrontierStage) % 4 == 0); return sizeof(BattleFrontierStage); } -void Frontier_Extra_Init (BattleFrontierStage * param0) +void Frontier_Extra_Init(BattleFrontierStage *param0) { MI_CpuClear8(param0, sizeof(BattleFrontierStage)); param0->unk_00 = 0xffffffff; } -BattleFrontierStage * sub_020308A0 (SaveData * param0, int param1, int * param2) +BattleFrontierStage *sub_020308A0(SaveData *param0, int param1, int *param2) { - BattleFrontierStage * v0; + BattleFrontierStage *v0; v0 = SaveData_BattleFrontierStage(param0, param1, param2); return v0; } -int sub_020308A8 (SaveData * param0, BattleFrontierStage * param1) +int sub_020308A8(SaveData *param0, BattleFrontierStage *param1) { int v0; @@ -56,7 +58,7 @@ int sub_020308A8 (SaveData * param0, BattleFrontierStage * param1) return v0; } -u16 sub_020308BC (SaveData * param0, BattleFrontierStage * param1, int param2, int param3) +u16 sub_020308BC(SaveData *param0, BattleFrontierStage *param1, int param2, int param3) { if (SaveData_MiscSaveBlock_InitFlag(param0) == 0) { return 0; @@ -75,7 +77,7 @@ u16 sub_020308BC (SaveData * param0, BattleFrontierStage * param1, int param2, i return 0; } -static u16 sub_02030908 (BattleFrontierStage * param0, int param1, int param2, u16 param3) +static u16 sub_02030908(BattleFrontierStage *param0, int param1, int param2, u16 param3) { if (param3 > 9999) { param3 = 9999; @@ -99,7 +101,7 @@ static u16 sub_02030908 (BattleFrontierStage * param0, int param1, int param2, u return param3; } -static u16 sub_02030954 (SaveData * param0, BattleFrontierStage * param1, int param2, int param3, u16 param4) +static u16 sub_02030954(SaveData *param0, BattleFrontierStage *param1, int param2, int param3, u16 param4) { u16 v0; @@ -120,10 +122,10 @@ static u16 sub_02030954 (SaveData * param0, BattleFrontierStage * param1, int pa } } -BOOL sub_020309A0 (SaveData * param0, int param1, int param2, int param3, int param4, int param5, int * param6, int * param7) +BOOL sub_020309A0(SaveData *param0, int param1, int param2, int param3, int param4, int param5, int *param6, int *param7) { - UnkStruct_0203068C * v0; - BattleFrontierStage * v1; + UnkStruct_0203068C *v0; + BattleFrontierStage *v1; u16 v2, v3, v4; int v5; BOOL v6 = 0; diff --git a/src/unk_02030A80.c b/src/unk_02030A80.c index 82938137d4..2bbcc9cbf7 100644 --- a/src/unk_02030A80.c +++ b/src/unk_02030A80.c @@ -1,35 +1,32 @@ +#include "unk_02030A80.h" + #include #include -#include "strbuf.h" #include "struct_decls/struct_02025CCC_decl.h" -#include "trainer_info.h" #include "struct_decls/struct_0202C878_decl.h" -#include "savedata.h" - #include "struct_defs/sentence.h" #include "struct_defs/struct_0202F298_sub1.h" #include "struct_defs/struct_02030A80.h" +#include "heap.h" +#include "pokemon.h" +#include "savedata.h" +#include "savedata_misc.h" +#include "strbuf.h" +#include "trainer_info.h" #include "unk_020021B0.h" #include "unk_02014A84.h" #include "unk_02014D38.h" -#include "heap.h" -#include "strbuf.h" -#include "savedata.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "savedata_misc.h" #include "unk_0202C858.h" -#include "unk_02030A80.h" #include "unk_0205C980.h" -#include "pokemon.h" #include "unk_020996D0.h" -UnkStruct_02030A80 * sub_02030A80 (int param0) +UnkStruct_02030A80 *sub_02030A80(int param0) { - UnkStruct_02030A80 * v0; + UnkStruct_02030A80 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02030A80)); MI_CpuClear8(v0, sizeof(UnkStruct_02030A80)); @@ -37,17 +34,17 @@ UnkStruct_02030A80 * sub_02030A80 (int param0) return v0; } -void sub_02030A98 (UnkStruct_02030A80 * param0) +void sub_02030A98(UnkStruct_02030A80 *param0) { Heap_FreeToHeap(param0); } -void sub_02030AA0 (UnkStruct_02030A80 * param0, SaveData * param1) +void sub_02030AA0(UnkStruct_02030A80 *param0, SaveData *param1) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(param1); - UnkStruct_0202C878 * v1 = sub_0202C878(param1); - UnkStruct_02025CCC * v2 = sub_02025CCC(param1); - const MiscSaveBlock * v3 = SaveData_MiscSaveBlockConst(param1); + TrainerInfo *v0 = SaveData_GetTrainerInfo(param1); + UnkStruct_0202C878 *v1 = sub_0202C878(param1); + UnkStruct_02025CCC *v2 = sub_02025CCC(param1); + const MiscSaveBlock *v3 = SaveData_MiscSaveBlockConst(param1); int v4, v5, v6; int v7; OSOwnerInfo v8; @@ -79,15 +76,15 @@ void sub_02030AA0 (UnkStruct_02030A80 * param0, SaveData * param1) param0->unk_7C.unk_00 = SaveData_CalculateChecksum(param1, param0, sizeof(UnkStruct_02030A80) - (sizeof(UnkStruct_0202F298_sub1))); } -Strbuf* sub_02030B94 (const UnkStruct_02030A80 * param0, int param1) +Strbuf *sub_02030B94(const UnkStruct_02030A80 *param0, int param1) { - Strbuf* v0 = Strbuf_Init((7 * 2) + 1, param1); + Strbuf *v0 = Strbuf_Init((7 * 2) + 1, param1); Strbuf_CopyNumChars(v0, param0->unk_00, (7 * 2) + 1); return v0; } -u32 sub_02030BAC (const UnkStruct_02030A80 * param0) +u32 sub_02030BAC(const UnkStruct_02030A80 *param0) { if ((param0->unk_14 != 0) && (param0->unk_14 != 1)) { return 0; @@ -96,7 +93,7 @@ u32 sub_02030BAC (const UnkStruct_02030A80 * param0) return param0->unk_14; } -int sub_02030BBC (const UnkStruct_02030A80 * param0) +int sub_02030BBC(const UnkStruct_02030A80 *param0) { if (param0->unk_1C >= 495) { return 0; @@ -105,7 +102,7 @@ int sub_02030BBC (const UnkStruct_02030A80 * param0) return param0->unk_1C; } -int sub_02030BCC (const UnkStruct_02030A80 * param0) +int sub_02030BCC(const UnkStruct_02030A80 *param0) { if (param0->unk_1C >= 495) { return 0; @@ -114,7 +111,7 @@ int sub_02030BCC (const UnkStruct_02030A80 * param0) return Pokemon_SanitizeFormId(param0->unk_1C, param0->unk_1B_1); } -int sub_02030BEC (const UnkStruct_02030A80 * param0) +int sub_02030BEC(const UnkStruct_02030A80 *param0) { if (param0->unk_1B_0 > 1) { return 1; @@ -123,7 +120,7 @@ int sub_02030BEC (const UnkStruct_02030A80 * param0) return param0->unk_1B_0; } -int sub_02030BFC (const UnkStruct_02030A80 * param0) +int sub_02030BFC(const UnkStruct_02030A80 *param0) { if (param0->unk_17 >= 234) { return 0; @@ -132,7 +129,7 @@ int sub_02030BFC (const UnkStruct_02030A80 * param0) return param0->unk_17; } -int sub_02030C08 (const UnkStruct_02030A80 * param0) +int sub_02030C08(const UnkStruct_02030A80 *param0) { if (param0->unk_17 >= 234) { return 0; @@ -145,7 +142,7 @@ int sub_02030C08 (const UnkStruct_02030A80 * param0) return param0->unk_18; } -Strbuf* sub_02030C28 (const UnkStruct_02030A80 * param0, Sentence * param1, int param2) +Strbuf *sub_02030C28(const UnkStruct_02030A80 *param0, Sentence *param1, int param2) { int v0 = 0; @@ -173,14 +170,14 @@ Strbuf* sub_02030C28 (const UnkStruct_02030A80 * param0, Sentence * param1, int return NULL; } else { - Strbuf* v3 = Strbuf_Init(40, param2); + Strbuf *v3 = Strbuf_Init(40, param2); Strbuf_CopyNumChars(v3, param0->unk_20_val2, 40); return v3; } } -int sub_02030CCC (const UnkStruct_02030A80 * param0) +int sub_02030CCC(const UnkStruct_02030A80 *param0) { if ((param0->unk_15 >= 1) && (param0->unk_15 <= 12)) { return param0->unk_15; @@ -189,7 +186,7 @@ int sub_02030CCC (const UnkStruct_02030A80 * param0) return 1; } -int sub_02030CDC (const UnkStruct_02030A80 * param0) +int sub_02030CDC(const UnkStruct_02030A80 *param0) { if (param0->unk_16 > 15) { return 0; diff --git a/src/unk_02030CE8.c b/src/unk_02030CE8.c index dd3fb7792a..bc7e22a747 100644 --- a/src/unk_02030CE8.c +++ b/src/unk_02030CE8.c @@ -1,29 +1,28 @@ +#include "unk_02030CE8.h" + #include #include -#include "trainer_info.h" #include "struct_decls/struct_0202C878_decl.h" -#include "savedata.h" - #include "struct_defs/struct_02030CEC.h" + #include "overlay096/struct_ov96_0223B574.h" +#include "savedata.h" +#include "trainer_info.h" #include "unk_020021B0.h" #include "unk_0201D15C.h" -#include "savedata.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202C858.h" -#include "unk_02030CE8.h" -static void sub_02030DD0(SaveData * param0, UnkStruct_ov96_0223B574 * param1); +static void sub_02030DD0(SaveData *param0, UnkStruct_ov96_0223B574 *param1); -int Email_SaveSize (void) +int Email_SaveSize(void) { return sizeof(UnkStruct_02030CEC); } -void Email_Init (UnkStruct_02030CEC * param0) +void Email_Init(UnkStruct_02030CEC *param0) { MI_CpuClear8(param0, sizeof(UnkStruct_02030CEC)); @@ -33,14 +32,14 @@ void Email_Init (UnkStruct_02030CEC * param0) SaveData_SetChecksum(35); } -void sub_02030D10 (SaveData * param0) +void sub_02030D10(SaveData *param0) { Email_Init(SaveData_SaveTable(param0, 35)); } -BOOL sub_02030D20 (SaveData * param0) +BOOL sub_02030D20(SaveData *param0) { - UnkStruct_02030CEC * v0; + UnkStruct_02030CEC *v0; v0 = SaveData_SaveTable(param0, 35); @@ -51,9 +50,9 @@ BOOL sub_02030D20 (SaveData * param0) return 1; } -void sub_02030D38 (SaveData * param0, const char * param1) +void sub_02030D38(SaveData *param0, const char *param1) { - UnkStruct_02030CEC * v0; + UnkStruct_02030CEC *v0; v0 = SaveData_SaveTable(param0, 35); @@ -61,17 +60,17 @@ void sub_02030D38 (SaveData * param0, const char * param1) SaveData_SetChecksum(35); } -char * sub_02030D50 (SaveData * param0) +char *sub_02030D50(SaveData *param0) { - UnkStruct_02030CEC * v0; + UnkStruct_02030CEC *v0; v0 = SaveData_SaveTable(param0, 35); return v0->unk_00; } -void sub_02030D5C (SaveData * param0, int param1, u32 param2) +void sub_02030D5C(SaveData *param0, int param1, u32 param2) { - UnkStruct_02030CEC * v0 = SaveData_SaveTable(param0, 35); + UnkStruct_02030CEC *v0 = SaveData_SaveTable(param0, 35); switch (param1) { case 0: @@ -91,9 +90,9 @@ void sub_02030D5C (SaveData * param0, int param1, u32 param2) SaveData_SetChecksum(35); } -u32 sub_02030D98 (SaveData * param0, int param1) +u32 sub_02030D98(SaveData *param0, int param1) { - UnkStruct_02030CEC * v0 = SaveData_SaveTable(param0, 35); + UnkStruct_02030CEC *v0 = SaveData_SaveTable(param0, 35); switch (param1) { case 0: @@ -109,11 +108,11 @@ u32 sub_02030D98 (SaveData * param0, int param1) return 0; } -static void sub_02030DD0 (SaveData * param0, UnkStruct_ov96_0223B574 * param1) +static void sub_02030DD0(SaveData *param0, UnkStruct_ov96_0223B574 *param1) { - UnkStruct_0202C878 * v0 = sub_0202C878(param0); - TrainerInfo * v1 = SaveData_GetTrainerInfo(param0); - char * v2 = sub_02030D50(param0); + UnkStruct_0202C878 *v0 = sub_0202C878(param0); + TrainerInfo *v1 = SaveData_GetTrainerInfo(param0); + char *v2 = sub_02030D50(param0); MI_CpuClear8(param1, sizeof(UnkStruct_ov96_0223B574)); @@ -132,7 +131,7 @@ static void sub_02030DD0 (SaveData * param0, UnkStruct_ov96_0223B574 * param1) SaveData_SetChecksum(35); } -u32 sub_02030E48 (SaveData * param0, UnkStruct_ov96_0223B574 * param1) +u32 sub_02030E48(SaveData *param0, UnkStruct_ov96_0223B574 *param1) { u32 v0; @@ -148,9 +147,9 @@ u32 sub_02030E48 (SaveData * param0, UnkStruct_ov96_0223B574 * param1) return v0; } -void sub_02030E78 (SaveData * param0, UnkStruct_ov96_0223B574 * param1) +void sub_02030E78(SaveData *param0, UnkStruct_ov96_0223B574 *param1) { - UnkStruct_02030CEC * v0 = SaveData_SaveTable(param0, 35); + UnkStruct_02030CEC *v0 = SaveData_SaveTable(param0, 35); sub_02030DD0(param0, param1); diff --git a/src/unk_02030EA4.c b/src/unk_02030EA4.c index 22a1a4c424..f04fc5b564 100644 --- a/src/unk_02030EA4.c +++ b/src/unk_02030EA4.c @@ -1,51 +1,50 @@ +#include "unk_02030EA4.h" + #include #include #include "savedata.h" -#include "savedata.h" -#include "unk_02030EA4.h" - typedef struct UnkStruct_02030EC4_t { u32 unk_00; u32 unk_04; } UnkStruct_02030EC4; -int WiFiQuestion_SaveSize (void) +int WiFiQuestion_SaveSize(void) { return sizeof(UnkStruct_02030EC4); } -void WiFiQuestion_Init (UnkStruct_02030EC4 * param0) +void WiFiQuestion_Init(UnkStruct_02030EC4 *param0) { MI_CpuFill32(param0, 0, WiFiQuestion_SaveSize()); param0->unk_00 = 0xffffffff; } -UnkStruct_02030EC4 * sub_02030EC4 (SaveData * param0) +UnkStruct_02030EC4 *sub_02030EC4(SaveData *param0) { - UnkStruct_02030EC4 * v0; + UnkStruct_02030EC4 *v0; v0 = SaveData_SaveTable(param0, 36); return v0; } -u32 sub_02030ED0 (const UnkStruct_02030EC4 * param0) +u32 sub_02030ED0(const UnkStruct_02030EC4 *param0) { return param0->unk_00; } -u32 sub_02030ED4 (const UnkStruct_02030EC4 * param0) +u32 sub_02030ED4(const UnkStruct_02030EC4 *param0) { return param0->unk_04; } -void sub_02030ED8 (UnkStruct_02030EC4 * param0, u32 param1) +void sub_02030ED8(UnkStruct_02030EC4 *param0, u32 param1) { param0->unk_00 = param1; } -void sub_02030EDC (UnkStruct_02030EC4 * param0, u32 param1) +void sub_02030EDC(UnkStruct_02030EC4 *param0, u32 param1) { param0->unk_04 = param1; } diff --git a/src/unk_02030EE0.c b/src/unk_02030EE0.c index 04ed8f13f5..58f16d70dd 100644 --- a/src/unk_02030EE0.c +++ b/src/unk_02030EE0.c @@ -1,16 +1,18 @@ +#include "unk_02030EE0.h" + #include -#include -#include #include +#include +#include + +#include "struct_defs/struct_0203330C.h" #include "functypes/funcptr_020312B8.h" #include "functypes/funcptr_02031E6C.h" #include "functypes/funcptr_02031E9C.h" #include "functypes/funcptr_020320FC.h" #include "functypes/funcptr_02032110.h" -#include "struct_defs/struct_0203330C.h" -#include "unk_02030EE0.h" #include "unk_0203266C.h" #include "unk_020366A0.h" @@ -29,7 +31,11 @@ typedef struct { int unk_1384; int unk_1388; UnkFuncPtr_02031E6C unk_138C; - BOOL (* unk_1390)(WMStartParentCallback *); + + // clang-format off + BOOL(*unk_1390)(WMStartParentCallback *); + // clang-format on + UnkFuncPtr_020320FC unk_1394; UnkFuncPtr_02032110 unk_1398; UnkFuncPtr_02032110 unk_139C; @@ -49,57 +55,57 @@ typedef struct { } UnkStruct_021C07AC; void include_unk_021C07A8(void); -static void sub_02031C58(void * param0); +static void sub_02031C58(void *param0); static BOOL sub_02031C70(BOOL param0); -static void sub_02031CBC(void * param0); +static void sub_02031CBC(void *param0); static u16 sub_020319F8(u16 param0); -static void sub_02031A74(void * param0); +static void sub_02031A74(void *param0); static WMErrCode sub_02031AF0(WMCallbackFunc param0, u16 param1); static s16 sub_02031B30(u16 param0); static BOOL sub_02030F10(void); -static void sub_02030F40(void * param0); +static void sub_02030F40(void *param0); static BOOL sub_02030F64(void); -static void sub_02030FD0(void * param0); +static void sub_02030FD0(void *param0); static BOOL sub_020310DC(void); -static void sub_0203114C(void * param0); +static void sub_0203114C(void *param0); static BOOL sub_02031320(void); -static void sub_020313E8(void * param0); +static void sub_020313E8(void *param0); static BOOL sub_020314E4(void); -static void sub_02031500(void * param0); +static void sub_02031500(void *param0); static BOOL sub_02031538(void); -static void sub_020315A8(void * param0); +static void sub_020315A8(void *param0); static BOOL sub_02031668(void); -static void sub_020316B8(void * param0); -static BOOL sub_020317E8(void * param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3); -static void sub_02031840(void * param0); -static void sub_02031868(void * param0); +static void sub_020316B8(void *param0); +static BOOL sub_020317E8(void *param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3); +static void sub_02031840(void *param0); +static void sub_02031868(void *param0); static BOOL sub_020311A8(void); -static void sub_020311CC(void * param0); +static void sub_020311CC(void *param0); static BOOL sub_020311EC(void); -static void sub_02031208(void * param0); +static void sub_02031208(void *param0); static BOOL sub_0203171C(void); -static void sub_02031740(void * param0); +static void sub_02031740(void *param0); static BOOL sub_02031764(void); -static void sub_0203178C(void * param0); -static void sub_020318B0(void * param0); +static void sub_0203178C(void *param0); +static void sub_020318B0(void *param0); static BOOL sub_020317A4(void); -static void sub_020317C8(void * param0); +static void sub_020317C8(void *param0); static u16 sub_02031900(void); -static UnkStruct_021C07AC * Unk_021C07AC; -static void (* Unk_021C07A8) (const char *, ...) = NULL; +static UnkStruct_021C07AC *Unk_021C07AC; +static void (*Unk_021C07A8)(const char *, ...) = NULL; -void include_unk_021C07A8 (void) +void include_unk_021C07A8(void) { Unk_021C07A8; } -static void sub_02030EE0 (int param0) +static void sub_02030EE0(int param0) { Unk_021C07AC->unk_1384 = param0; } -static void sub_02030EF4 (int param0) +static void sub_02030EF4(int param0) { if ((Unk_021C07AC->unk_1384 == 9) || (Unk_021C07AC->unk_1384 == 10)) { return; @@ -108,7 +114,7 @@ static void sub_02030EF4 (int param0) Unk_021C07AC->unk_13A4 = param0; } -static BOOL sub_02030F10 (void) +static BOOL sub_02030F10(void) { WMErrCode v0; @@ -125,9 +131,9 @@ static BOOL sub_02030F10 (void) return 1; } -static void sub_02030F40 (void * param0) +static void sub_02030F40(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v0->errcode); @@ -142,7 +148,7 @@ static void sub_02030F40 (void * param0) } } -static BOOL sub_02030F64 (void) +static BOOL sub_02030F64(void) { WMErrCode v0; @@ -151,7 +157,7 @@ static BOOL sub_02030F64 (void) } { - WMStatus * v1 = (WMStatus *)WMi_GetStatusAddress(); + WMStatus *v1 = (WMStatus *)WMi_GetStatusAddress(); DC_InvalidateRange(&v1->wep_flag, sizeof(v1->wep_flag)); v1->wep_flag = 0; @@ -170,9 +176,9 @@ static BOOL sub_02030F64 (void) return 1; } -static void sub_02030FD0 (void * param0) +static void sub_02030FD0(void *param0) { - WMStartParentCallback * v0 = (WMStartParentCallback *)param0; + WMStartParentCallback *v0 = (WMStartParentCallback *)param0; const u16 v1 = (u16)(1 << v0->aid); if (v0->errcode != WM_ERRCODE_SUCCESS) { @@ -185,8 +191,7 @@ static void sub_02030FD0 (void * param0) case WM_STATECODE_BEACON_SENT: Unk_021C07AC->unk_13B9++; break; - case WM_STATECODE_CONNECTED: - { + case WM_STATECODE_CONNECTED: { if ((Unk_021C07AC->unk_13B7 == 1) || (Unk_021C07AC->unk_13B6 == 1) || (sub_02031900() >= Unk_021C07AC->unk_13A8) || (v0->ssid[0] != sub_0203895C()) || (0 != memcmp("DP", &v0->ssid[1], sizeof("DP")))) { WMErrCode v2; @@ -204,32 +209,27 @@ static void sub_02030FD0 (void * param0) if (Unk_021C07AC->unk_139C) { Unk_021C07AC->unk_139C(v0->aid); } - } - break; - case WM_STATECODE_DISCONNECTED: - { + } break; + case WM_STATECODE_DISCONNECTED: { Unk_021C07AC->unk_13A2 &= ~v1; if (Unk_021C07AC->unk_1398) { Unk_021C07AC->unk_1398(v0->aid); } - } - break; + } break; case WM_STATECODE_DISCONNECTED_FROM_MYSELF: break; - case WM_STATECODE_PARENT_START: - { + case WM_STATECODE_PARENT_START: { if (!sub_020310DC()) { sub_02030EE0(9); } - } - break; + } break; default: break; } } -static BOOL sub_020310DC (void) +static BOOL sub_020310DC(void) { WMErrCode v0; @@ -249,9 +249,9 @@ static BOOL sub_020310DC (void) return 1; } -static void sub_0203114C (void * param0) +static void sub_0203114C(void *param0) { - WMstartMPCallback * v0 = (WMstartMPCallback *)param0; + WMstartMPCallback *v0 = (WMstartMPCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v0->errcode); @@ -283,7 +283,7 @@ static void sub_0203114C (void * param0) } } -static BOOL sub_020311A8 (void) +static BOOL sub_020311A8(void) { WMErrCode v0; @@ -299,9 +299,9 @@ static BOOL sub_020311A8 (void) return 1; } -static void sub_020311CC (void * param0) +static void sub_020311CC(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v0->errcode); @@ -315,7 +315,7 @@ static void sub_020311CC (void * param0) } } -static BOOL sub_020311EC (void) +static BOOL sub_020311EC(void) { WMErrCode v0; @@ -329,9 +329,9 @@ static BOOL sub_020311EC (void) return 1; } -static void sub_02031208 (void * param0) +static void sub_02031208(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v0->errcode); @@ -341,7 +341,7 @@ static void sub_02031208 (void * param0) sub_02030EE0(1); } -BOOL sub_02031220 (int param0, const u8 * param1, u16 param2) +BOOL sub_02031220(int param0, const u8 *param1, u16 param2) { Unk_021C07AC->unk_137C = WM_SIZE_MP_CHILD_RECEIVE_BUFFER(MATH_MAX((12 * (1 + 7) + 4), 192), 0); Unk_021C07AC->unk_1378 = MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), MATH_MAX(WM_SIZE_MP_CHILD_SEND_BUFFER(12, 0), WM_SIZE_MP_CHILD_SEND_BUFFER(38, 0))); @@ -368,7 +368,7 @@ BOOL sub_02031220 (int param0, const u8 * param1, u16 param2) return 1; } -BOOL sub_020312B8 (UnkFuncPtr_020312B8 param0, const u8 * param1, u16 param2) +BOOL sub_020312B8(UnkFuncPtr_020312B8 param0, const u8 *param1, u16 param2) { sub_02030EE0(2); @@ -389,7 +389,7 @@ BOOL sub_020312B8 (UnkFuncPtr_020312B8 param0, const u8 * param1, u16 param2) return 1; } -static BOOL sub_02031320 (void) +static BOOL sub_02031320(void) { WMErrCode v0; u16 v1; @@ -437,9 +437,9 @@ static BOOL sub_02031320 (void) return 1; } -static void sub_020313E8 (void * param0) +static void sub_020313E8(void *param0) { - WMstartScanCallback * v0 = (WMstartScanCallback *)param0; + WMstartScanCallback *v0 = (WMstartScanCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v0->errcode); @@ -467,7 +467,7 @@ static void sub_020313E8 (void * param0) DC_InvalidateRange(&Unk_021C07AC->unk_1220, sizeof(WMbssDesc)); if ((Unk_021C07AC->unk_1394 != NULL) && (v0->gameInfoLength >= 8)) { - UnkStruct_0203330C * v1 = (UnkStruct_0203330C *)v0->gameInfo.userGameInfo; + UnkStruct_0203330C *v1 = (UnkStruct_0203330C *)v0->gameInfo.userGameInfo; Unk_021C07AC->unk_1394(v0->gameInfo.ggid, v1->unk_04); } @@ -499,7 +499,7 @@ static void sub_020313E8 (void * param0) } } -BOOL sub_020314C0 (void) +BOOL sub_020314C0(void) { if (Unk_021C07AC->unk_1384 != 2) { return 0; @@ -509,7 +509,7 @@ BOOL sub_020314C0 (void) return 1; } -static BOOL sub_020314E4 (void) +static BOOL sub_020314E4(void) { WMErrCode v0; @@ -523,9 +523,9 @@ static BOOL sub_020314E4 (void) return 1; } -static void sub_02031500 (void * param0) +static void sub_02031500(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v0->errcode); @@ -545,7 +545,7 @@ static void sub_02031500 (void * param0) } } -static BOOL sub_02031538 (void) +static BOOL sub_02031538(void) { u8 v0[32]; WMErrCode v1; @@ -568,9 +568,9 @@ static BOOL sub_02031538 (void) return 1; } -static void sub_020315A8 (void * param0) +static void sub_020315A8(void *param0) { - WMStartConnectCallback * v0 = (WMStartConnectCallback *)param0; + WMStartConnectCallback *v0 = (WMStartConnectCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v0->errcode); @@ -629,7 +629,7 @@ static void sub_020315A8 (void * param0) sub_02030EE0(9); } -static BOOL sub_02031668 (void) +static BOOL sub_02031668(void) { WMErrCode v0; @@ -643,9 +643,9 @@ static BOOL sub_02031668 (void) return 1; } -static void sub_020316B8 (void * param0) +static void sub_020316B8(void *param0) { - WMstartMPCallback * v0 = (WMstartMPCallback *)param0; + WMstartMPCallback *v0 = (WMstartMPCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { if (v0->errcode == WM_ERRCODE_SEND_FAILED) { @@ -689,7 +689,7 @@ static void sub_020316B8 (void * param0) } } -static BOOL sub_0203171C (void) +static BOOL sub_0203171C(void) { WMErrCode v0; @@ -704,9 +704,9 @@ static BOOL sub_0203171C (void) return 1; } -static void sub_02031740 (void * param0) +static void sub_02031740(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v0->errcode); @@ -719,7 +719,7 @@ static void sub_02031740 (void * param0) } } -static BOOL sub_02031764 (void) +static BOOL sub_02031764(void) { WMErrCode v0; @@ -736,9 +736,9 @@ static BOOL sub_02031764 (void) return 1; } -static void sub_0203178C (void * param0) +static void sub_0203178C(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v0->errcode); @@ -748,7 +748,7 @@ static void sub_0203178C (void * param0) sub_02030EE0(1); } -static BOOL sub_020317A4 (void) +static BOOL sub_020317A4(void) { WMErrCode v0; @@ -763,9 +763,9 @@ static BOOL sub_020317A4 (void) return 1; } -static void sub_020317C8 (void * param0) +static void sub_020317C8(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EE0(9); @@ -777,7 +777,7 @@ static void sub_020317C8 (void * param0) sub_02030EE0(1); } -static BOOL sub_020317E8 (void * param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3) +static BOOL sub_020317E8(void *param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3) { WMErrCode v0; @@ -792,9 +792,9 @@ static BOOL sub_020317E8 (void * param0, u16 param1, int param2, UnkFuncPtr_0203 return 1; } -static void sub_02031840 (void * param0) +static void sub_02031840(void *param0) { - WMPortSendCallback * v0 = (WMPortSendCallback *)param0; + WMPortSendCallback *v0 = (WMPortSendCallback *)param0; if ((v0->errcode != WM_ERRCODE_SUCCESS) && (v0->errcode != WM_ERRCODE_SEND_FAILED)) { sub_02030EF4(v0->errcode); @@ -804,13 +804,13 @@ static void sub_02031840 (void * param0) if (v0->arg != NULL) { UnkFuncPtr_02031E9C v1 = (UnkFuncPtr_02031E9C)v0->arg; - (*v1)((v0->errcode == WM_ERRCODE_SUCCESS)); + (*v1)(v0->errcode == WM_ERRCODE_SUCCESS); } } -static void sub_02031868 (void * param0) +static void sub_02031868(void *param0) { - WMPortRecvCallback * v0 = (WMPortRecvCallback *)param0; + WMPortRecvCallback *v0 = (WMPortRecvCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v0->errcode); @@ -829,9 +829,9 @@ static void sub_02031868 (void * param0) } } -static void sub_020318B0 (void * param0) +static void sub_020318B0(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; if (v0->errcode != WM_ERRCODE_SUCCESS) { sub_02030EE0(10); @@ -842,23 +842,23 @@ static void sub_020318B0 (void * param0) sub_02030EE0(0); } -void sub_020318D0 (u32 param0) +void sub_020318D0(u32 param0) { Unk_021C07AC->unk_00.ggid = param0; } -void sub_020318DC (u16 * param0, u16 param1) +void sub_020318DC(u16 *param0, u16 param1) { Unk_021C07AC->unk_00.userGameInfo = param0; Unk_021C07AC->unk_00.userGameInfoLength = param1; } -u16 sub_020318EC (void) +u16 sub_020318EC(void) { return Unk_021C07AC->unk_13A2; } -static u16 sub_02031900 (void) +static u16 sub_02031900(void) { int v0 = 0, v1; u16 v2 = Unk_021C07AC->unk_13A2; @@ -874,17 +874,17 @@ static u16 sub_02031900 (void) return v0; } -int sub_02031934 (void) +int sub_02031934(void) { return Unk_021C07AC->unk_1384; } -int sub_02031948 (void) +int sub_02031948(void) { return Unk_021C07AC->unk_13A4; } -BOOL sub_0203195C (void) +BOOL sub_0203195C(void) { u16 v0; u8 v1[6]; @@ -916,7 +916,7 @@ BOOL sub_0203195C (void) return 1; } -static u16 sub_020319F8 (u16 param0) +static u16 sub_020319F8(u16 param0) { u16 v0; u16 v1; @@ -958,11 +958,11 @@ static u16 sub_020319F8 (u16 param0) return v1; } -static void sub_02031A74 (void * param0) +static void sub_02031A74(void *param0) { u16 v0; u16 v1; - WMMeasureChannelCallback * v2 = (WMMeasureChannelCallback *)param0; + WMMeasureChannelCallback *v2 = (WMMeasureChannelCallback *)param0; if (v2->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v2->errcode); @@ -995,12 +995,12 @@ static void sub_02031A74 (void * param0) } } -static WMErrCode sub_02031AF0 (WMCallbackFunc param0, u16 param1) +static WMErrCode sub_02031AF0(WMCallbackFunc param0, u16 param1) { return WM_MeasureChannel(param0, 3, 17, param1, 30); } -u16 sub_02031B04 (void) +u16 sub_02031B04(void) { sub_02030EE0(1); Unk_021C07AC->unk_13B0 = (u16)sub_02031B30(Unk_021C07AC->unk_13B4); @@ -1008,7 +1008,7 @@ u16 sub_02031B04 (void) return Unk_021C07AC->unk_13B0; } -static s16 sub_02031B30 (u16 param0) +static s16 sub_02031B30(u16 param0) { s16 v0; s16 v1 = 0; @@ -1044,7 +1044,7 @@ static s16 sub_02031B30 (u16 param0) return 0; } -BOOL sub_02031BC4 (void * param0, BOOL param1) +BOOL sub_02031BC4(void *param0, BOOL param1) { u32 v0 = (u32)param0; @@ -1074,14 +1074,14 @@ BOOL sub_02031BC4 (void * param0, BOOL param1) return 1; } -int sub_02031C50 (void) +int sub_02031C50(void) { return sizeof(UnkStruct_021C07AC) + 32; } -static void sub_02031C58 (void * param0) +static void sub_02031C58(void *param0) { - WMindCallback * v0 = (WMindCallback *)param0; + WMindCallback *v0 = (WMindCallback *)param0; if (v0->errcode == WM_ERRCODE_FIFO_ERROR) { sub_02030EE0(9); @@ -1089,7 +1089,7 @@ static void sub_02031C58 (void * param0) } } -static BOOL sub_02031C70 (BOOL param0) +static BOOL sub_02031C70(BOOL param0) { WMErrCode v0; @@ -1110,10 +1110,10 @@ static BOOL sub_02031C70 (BOOL param0) return 1; } -static void sub_02031CBC (void * param0) +static void sub_02031CBC(void *param0) { WMErrCode v0; - WMCallback * v1 = (WMCallback *)param0; + WMCallback *v1 = (WMCallback *)param0; if (v1->errcode != WM_ERRCODE_SUCCESS) { sub_02030EF4(v1->errcode); @@ -1138,12 +1138,12 @@ static void sub_02031CBC (void * param0) sub_02030EE0(1); } -static void sub_02031D00 (void * param0) +static void sub_02031D00(void *param0) { - WMCallback * v0 = (WMCallback *)param0; + WMCallback *v0 = (WMCallback *)param0; } -BOOL sub_02031D04 (int param0, u16 param1, u16 param2, u16 param3, u16 param4, BOOL param5) +BOOL sub_02031D04(int param0, u16 param1, u16 param2, u16 param3, u16 param4, BOOL param5) { if (sub_0203276C(sub_0203895C())) { WM_SetLifeTime(sub_02031D00, 0xffff, 100, 5, 100); @@ -1194,7 +1194,7 @@ BOOL sub_02031D04 (int param0, u16 param1, u16 param2, u16 param3, u16 param4, B return 0; } -BOOL sub_02031DD8 (int param0, WMBssDesc * param1) +BOOL sub_02031DD8(int param0, WMBssDesc *param1) { if (sub_0203276C(sub_0203895C())) { WM_SetLifeTime(sub_02031D00, 0xffff, 100, 5, 100); @@ -1223,7 +1223,7 @@ BOOL sub_02031DD8 (int param0, WMBssDesc * param1) return 0; } -void sub_02031E6C (UnkFuncPtr_02031E6C param0, int param1) +void sub_02031E6C(UnkFuncPtr_02031E6C param0, int param1) { Unk_021C07AC->unk_138C = param0; @@ -1236,7 +1236,7 @@ void sub_02031E6C (UnkFuncPtr_02031E6C param0, int param1) } } -BOOL sub_02031E9C (void * param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3) +BOOL sub_02031E9C(void *param0, u16 param1, int param2, UnkFuncPtr_02031E9C param3) { if ((sub_02031F90() == 0) && !(0xfe & sub_020318EC())) { return 0; @@ -1245,7 +1245,7 @@ BOOL sub_02031E9C (void * param0, u16 param1, int param2, UnkFuncPtr_02031E9C pa return sub_020317E8(param0, param1, param2, param3); } -void sub_02031ECC (void) +void sub_02031ECC(void) { if (2 == Unk_021C07AC->unk_1384) { while (TRUE) { @@ -1258,7 +1258,7 @@ void sub_02031ECC (void) } } -void sub_02031EF4 (void) +void sub_02031EF4(void) { if (Unk_021C07AC->unk_1384 == 1) { return; @@ -1291,7 +1291,7 @@ void sub_02031EF4 (void) } } -BOOL sub_02031F6C (void) +BOOL sub_02031F6C(void) { int v0; @@ -1307,34 +1307,34 @@ BOOL sub_02031F6C (void) return 1; } -u16 sub_02031F90 (void) +u16 sub_02031F90(void) { return Unk_021C07AC->unk_13A0; } -void sub_02031FA4 (int param0) +void sub_02031FA4(int param0) { if (Unk_021C07AC) { Unk_021C07AC->unk_13A8 = param0; } } -BOOL sub_02031FBC (void) +BOOL sub_02031FBC(void) { return Unk_021C07AC->unk_1384 == 1; } -BOOL sub_02031FD8 (void) +BOOL sub_02031FD8(void) { return Unk_021C07AC->unk_1384 == 3; } -BOOL sub_02031FF4 (void) +BOOL sub_02031FF4(void) { return Unk_021C07AC->unk_1384 == 9; } -BOOL sub_02032010 (void) +BOOL sub_02032010(void) { if (Unk_021C07AC) { return Unk_021C07AC->unk_1384 == 2; @@ -1343,7 +1343,7 @@ BOOL sub_02032010 (void) return 0; } -void sub_02032034 (void * param0, int param1, int param2, int param3) +void sub_02032034(void *param0, int param1, int param2, int param3) { if (Unk_021C07AC->unk_1384 == 4) { WM_SetGameInfo(NULL, param0, param1, param2, param3, WM_ATTR_FLAG_ENTRY); @@ -1352,16 +1352,16 @@ void sub_02032034 (void * param0, int param1, int param2, int param3) } } -static void sub_02032070 (void * param0) +static void sub_02032070(void *param0) { - WMCallback * v0 = param0; + WMCallback *v0 = param0; if (v0->errcode == WM_ERRCODE_SUCCESS) { Unk_021C07AC->unk_13B8 = 1; } } -BOOL sub_0203208C (BOOL param0) +BOOL sub_0203208C(BOOL param0) { Unk_021C07AC->unk_13B8 = 0; @@ -1374,7 +1374,7 @@ BOOL sub_0203208C (BOOL param0) return 0; } -BOOL sub_020320C4 (void) +BOOL sub_020320C4(void) { if (Unk_021C07AC) { return Unk_021C07AC->unk_13B9 >= 6; @@ -1383,42 +1383,42 @@ BOOL sub_020320C4 (void) return 0; } -void sub_020320E8 (void) +void sub_020320E8(void) { Unk_021C07AC->unk_13B9 = 0; } -void sub_020320FC (UnkFuncPtr_020320FC param0) +void sub_020320FC(UnkFuncPtr_020320FC param0) { Unk_021C07AC->unk_1394 = param0; } -void sub_02032110 (UnkFuncPtr_02032110 param0) +void sub_02032110(UnkFuncPtr_02032110 param0) { Unk_021C07AC->unk_1398 = param0; } -void sub_02032124 (UnkFuncPtr_02032110 param0) +void sub_02032124(UnkFuncPtr_02032110 param0) { Unk_021C07AC->unk_139C = param0; } -void sub_02032138 (BOOL param0) +void sub_02032138(BOOL param0) { Unk_021C07AC->unk_13B6 = param0; } -BOOL sub_0203214C (void) +BOOL sub_0203214C(void) { return Unk_021C07AC->unk_13B6; } -void sub_02032160 (BOOL param0) +void sub_02032160(BOOL param0) { Unk_021C07AC->unk_13B7 = param0; } -void sub_02032174 (BOOL param0) +void sub_02032174(BOOL param0) { Unk_021C07AC->unk_13A9 = param0; } diff --git a/src/unk_020322D8.c b/src/unk_020322D8.c index c70cd52ad5..f70f7a00fe 100644 --- a/src/unk_020322D8.c +++ b/src/unk_020322D8.c @@ -1,3 +1,5 @@ +#include "unk_020322D8.h" + #include #include @@ -6,14 +8,13 @@ #include "struct_defs/struct_02032318.h" #include "struct_defs/struct_0203233C.h" -#include "heap.h" #include "comm_ring.h" -#include "unk_020322D8.h" +#include "heap.h" #include "unk_02032798.h" -static UnkStruct_020322D8 * sub_020322D8 (CommQueueMan * param0) +static UnkStruct_020322D8 *sub_020322D8(CommQueueMan *param0) { - UnkStruct_020322D8 * v0 = param0->unk_18; + UnkStruct_020322D8 *v0 = param0->unk_18; int v1; for (v1 = 0; v1 < param0->unk_1C; v1++) { @@ -27,9 +28,9 @@ static UnkStruct_020322D8 * sub_020322D8 (CommQueueMan * param0) return NULL; } -BOOL CommQueue_IsEmpty (CommQueueMan * param0) +BOOL CommQueue_IsEmpty(CommQueueMan *param0) { - UnkStruct_020322D8 * v0 = param0->unk_18; + UnkStruct_020322D8 *v0 = param0->unk_18; int v1; for (v1 = 0; v1 < param0->unk_1C; v1++) { @@ -43,7 +44,7 @@ BOOL CommQueue_IsEmpty (CommQueueMan * param0) return 1; } -static BOOL sub_02032318 (UnkStruct_02032318 * param0) +static BOOL sub_02032318(UnkStruct_02032318 *param0) { if (param0->unk_00 != NULL) { if (param0->unk_00->unk_08 != NULL) { @@ -60,7 +61,7 @@ static BOOL sub_02032318 (UnkStruct_02032318 * param0) return 0; } -static BOOL sub_0203233C (UnkStruct_0203233C * param0, u8 param1) +static BOOL sub_0203233C(UnkStruct_0203233C *param0, u8 param1) { *param0->unk_00 = param1; param0->unk_00++; @@ -73,7 +74,7 @@ static BOOL sub_0203233C (UnkStruct_0203233C * param0, u8 param1) return 0; } -static BOOL sub_02032358 (UnkStruct_020322D8 * param0, UnkStruct_0203233C * param1) +static BOOL sub_02032358(UnkStruct_020322D8 *param0, UnkStruct_0203233C *param1) { int v0 = CommCmd_PacketSizeOf(param0->unk_0E); @@ -102,7 +103,7 @@ static BOOL sub_02032358 (UnkStruct_020322D8 * param0, UnkStruct_0203233C * para return 0; } -static BOOL sub_020323D0 (UnkStruct_020322D8 * param0, UnkStruct_0203233C * param1, CommRing * param2, BOOL param3) +static BOOL sub_020323D0(UnkStruct_020322D8 *param0, UnkStruct_0203233C *param1, CommRing *param2, BOOL param3) { int v0; int v1; @@ -152,11 +153,11 @@ static BOOL sub_020323D0 (UnkStruct_020322D8 * param0, UnkStruct_0203233C * para return 1; } -BOOL CommQueue_Write (CommQueueMan * param0, int cmd, u8 * param2, int param3, BOOL param4, BOOL param5) +BOOL CommQueue_Write(CommQueueMan *param0, int cmd, u8 *param2, int param3, BOOL param4, BOOL param5) { - UnkStruct_020322D8 * v0; - UnkStruct_020322D8 * v1 = sub_020322D8(param0); - UnkStruct_02032318 * v2; + UnkStruct_020322D8 *v0; + UnkStruct_020322D8 *v1 = sub_020322D8(param0); + UnkStruct_02032318 *v2; int v3; param4 = 1; @@ -207,9 +208,9 @@ BOOL CommQueue_Write (CommQueueMan * param0, int cmd, u8 * param2, int param3, B return 1; } -static UnkStruct_020322D8 * sub_02032530 (CommQueueMan * param0) +static UnkStruct_020322D8 *sub_02032530(CommQueueMan *param0) { - UnkStruct_02032318 * v0; + UnkStruct_02032318 *v0; if (param0->unk_10 != NULL) { return param0->unk_10; @@ -226,9 +227,9 @@ static UnkStruct_020322D8 * sub_02032530 (CommQueueMan * param0) return NULL; } -static void sub_02032550 (CommQueueMan * param0) +static void sub_02032550(CommQueueMan *param0) { - UnkStruct_02032318 * v0; + UnkStruct_02032318 *v0; if (param0->unk_10 != NULL) { param0->unk_10 = NULL; @@ -239,14 +240,14 @@ static void sub_02032550 (CommQueueMan * param0) } } -BOOL sub_02032574 (CommQueueMan * param0, UnkStruct_0203233C * param1, BOOL param2) +BOOL sub_02032574(CommQueueMan *param0, UnkStruct_0203233C *param1, BOOL param2) { int v0; int v1; int v2 = 1; while (param1->unk_04 > 0) { - UnkStruct_020322D8 * v3 = sub_02032530(param0); + UnkStruct_020322D8 *v3 = sub_02032530(param0); if (NULL == v3) { break; @@ -277,7 +278,7 @@ BOOL sub_02032574 (CommQueueMan * param0, UnkStruct_0203233C * param1, BOOL para return 1; } -void CommQueueMan_Init (CommQueueMan * param0, int param1, CommRing * param2) +void CommQueueMan_Init(CommQueueMan *param0, int param1, CommRing *param2) { MI_CpuFill8(param0, 0, sizeof(CommQueueMan)); param0->unk_18 = Heap_AllocFromHeap(15, sizeof(UnkStruct_020322D8) * param1); @@ -287,7 +288,7 @@ void CommQueueMan_Init (CommQueueMan * param0, int param1, CommRing * param2) param0->unk_14 = param2; } -void CommQueueMan_Reset (CommQueueMan * param0) +void CommQueueMan_Reset(CommQueueMan *param0) { MI_CpuFill8(param0->unk_18, 0, sizeof(UnkStruct_020322D8) * param0->unk_1C); @@ -298,15 +299,15 @@ void CommQueueMan_Reset (CommQueueMan * param0) param0->unk_10 = NULL; } -void CommQueueMan_Delete (CommQueueMan * param0) +void CommQueueMan_Delete(CommQueueMan *param0) { Heap_FreeToHeap(param0->unk_18); } -BOOL CommQueue_CompareCmd (CommQueueMan * param0, int param1) +BOOL CommQueue_CompareCmd(CommQueueMan *param0, int param1) { int v0; - UnkStruct_020322D8 * v1 = param0->unk_18; + UnkStruct_020322D8 *v1 = param0->unk_18; for (v0 = 0; v0 < param0->unk_1C; v0++) { if (v1->unk_0E == param1) { diff --git a/src/unk_0203266C.c b/src/unk_0203266C.c index a15f759fb4..a454d60cc3 100644 --- a/src/unk_0203266C.c +++ b/src/unk_0203266C.c @@ -1,9 +1,9 @@ +#include "unk_0203266C.h" + #include #include -#include "unk_0203266C.h" - -u16 CommLocal_MaxMachines (u16 param0) +u16 CommLocal_MaxMachines(u16 param0) { u8 v0[] = { 0x1, @@ -49,7 +49,7 @@ u16 CommLocal_MaxMachines (u16 param0) return v0[param0]; } -u16 sub_02032698 (u16 param0) +u16 sub_02032698(u16 param0) { u8 v0[] = { 0x1, @@ -95,7 +95,7 @@ u16 sub_02032698 (u16 param0) return v0[param0]; } -BOOL sub_020326C4 (int param0) +BOOL sub_020326C4(int param0) { switch (param0) { case 18: @@ -109,7 +109,7 @@ BOOL sub_020326C4 (int param0) return 0; } -BOOL CommLocal_IsWifiGroup (int param0) +BOOL CommLocal_IsWifiGroup(int param0) { switch (param0) { case 19: @@ -130,7 +130,7 @@ BOOL CommLocal_IsWifiGroup (int param0) return 0; } -BOOL sub_0203272C (int param0) +BOOL sub_0203272C(int param0) { switch (param0) { case 29: @@ -142,7 +142,7 @@ BOOL sub_0203272C (int param0) return 0; } -BOOL sub_02032740 (int param0) +BOOL sub_02032740(int param0) { switch (param0) { case 19: @@ -157,7 +157,7 @@ BOOL sub_02032740 (int param0) return 0; } -BOOL sub_0203276C (int param0) +BOOL sub_0203276C(int param0) { switch (param0) { case 1: diff --git a/src/unk_02032798.c b/src/unk_02032798.c index fa612359b0..af15a6dc96 100644 --- a/src/unk_02032798.c +++ b/src/unk_02032798.c @@ -1,59 +1,61 @@ +#include "unk_02032798.h" + #include #include +#include "struct_defs/struct_02039A58.h" + #include "functypes/funcptr_02032868.h" #include "functypes/funcptr_0203290C.h" -#include "struct_defs/struct_02039A58.h" #include "functypes/funcptr_020F8E60.h" -#include "heap.h" -#include "unk_02032798.h" #include "communication_information.h" #include "communication_system.h" +#include "heap.h" #include "unk_020363E8.h" #include "unk_020366A0.h" typedef struct { - const CommCmdTable * cmdTable; + const CommCmdTable *cmdTable; int unk_04; - void * unk_08; + void *unk_08; u8 unk_0C[8]; u8 unk_14; } CommCmdManager; -static void sub_02032958(int param0, int param1, void * param2, void * param3); -static void sub_0203299C(int param0, int param1, void * param2, void * param3); -static void sub_020329C4(int param0, int param1, void * param2, void * param3); +static void sub_02032958(int param0, int param1, void *param2, void *param3); +static void sub_0203299C(int param0, int param1, void *param2, void *param3); +static void sub_020329C4(int param0, int param1, void *param2, void *param3); static int sub_02032954(void); static const CommCmdTable Unk_020E5D64[] = { - {NULL, sub_0203294C, NULL}, - {NULL, sub_0203294C, NULL}, - {sub_0203619C, sub_0203294C, NULL}, - {CommInfo_RecvPlayerData, CommPlayerInfo_Size, NULL}, - {CommInfo_RecvPlayerDataArray, CommPlayerInfo_Size, NULL}, - {CommunicatitonInformaion_FinishReading, sub_0203294C, NULL}, - {sub_02037A78, sub_02037B54, NULL}, - {sub_02037AD8, sub_02037B54, NULL}, - {NULL, NULL, NULL}, - {NULL, NULL, NULL}, - {sub_02036008, CommPacketSizeOf_NetId, NULL}, - {sub_02036030, CommPacketSizeOf_NetId, NULL}, - {sub_02036058, CommPacketSizeOf_NetId, NULL}, - {sub_02032958, sub_0203294C, NULL}, - {sub_0203299C, sub_0203294C, NULL}, - {sub_020329C4, sub_0203294C, NULL}, - {CommCmd_16, CommPacketSizeOf_NetId, NULL}, - {CommCmd_17, CommPacketSizeOf_NetId, NULL}, - {CommCmd_18, sub_02032954, NULL}, - {sub_02036574, sub_02036590, NULL}, - {sub_02036670, CommTool_TempDataSize, NULL}, - {sub_02038240, sub_0203294C, NULL} + { NULL, sub_0203294C, NULL }, + { NULL, sub_0203294C, NULL }, + { sub_0203619C, sub_0203294C, NULL }, + { CommInfo_RecvPlayerData, CommPlayerInfo_Size, NULL }, + { CommInfo_RecvPlayerDataArray, CommPlayerInfo_Size, NULL }, + { CommunicatitonInformaion_FinishReading, sub_0203294C, NULL }, + { sub_02037A78, sub_02037B54, NULL }, + { sub_02037AD8, sub_02037B54, NULL }, + { NULL, NULL, NULL }, + { NULL, NULL, NULL }, + { sub_02036008, CommPacketSizeOf_NetId, NULL }, + { sub_02036030, CommPacketSizeOf_NetId, NULL }, + { sub_02036058, CommPacketSizeOf_NetId, NULL }, + { sub_02032958, sub_0203294C, NULL }, + { sub_0203299C, sub_0203294C, NULL }, + { sub_020329C4, sub_0203294C, NULL }, + { CommCmd_16, CommPacketSizeOf_NetId, NULL }, + { CommCmd_17, CommPacketSizeOf_NetId, NULL }, + { CommCmd_18, sub_02032954, NULL }, + { sub_02036574, sub_02036590, NULL }, + { sub_02036670, CommTool_TempDataSize, NULL }, + { sub_02038240, sub_0203294C, NULL } }; -static CommCmdManager * sCommCmdManager = NULL; +static CommCmdManager *sCommCmdManager = NULL; -void CommCmd_Init (const CommCmdTable * cmdTable, int param1, void * param2) +void CommCmd_Init(const CommCmdTable *cmdTable, int param1, void *param2) { int v0; @@ -72,7 +74,7 @@ void CommCmd_Init (const CommCmdTable * cmdTable, int param1, void * param2) sCommCmdManager->unk_14 = 0; } -void sub_020327E0 (void) +void sub_020327E0(void) { if (sCommCmdManager) { Heap_FreeToHeap(sCommCmdManager); @@ -80,7 +82,7 @@ void sub_020327E0 (void) } } -void CommCmd_Callback (int param0, int cmd, int param2, void * param3) +void CommCmd_Callback(int param0, int cmd, int param2, void *param3) { UnkFuncPtr_020F8E60 v0; @@ -106,7 +108,7 @@ void CommCmd_Callback (int param0, int cmd, int param2, void * param3) } } -int CommCmd_PacketSizeOf (int cmd) +int CommCmd_PacketSizeOf(int cmd) { int v0 = 0; UnkFuncPtr_02032868 v1; @@ -137,7 +139,7 @@ int CommCmd_PacketSizeOf (int cmd) return v0; } -BOOL sub_020328D0 (int cmd) +BOOL sub_020328D0(int cmd) { if (cmd < 22) { return Unk_020E5D64[cmd].unk_08 != NULL; @@ -146,7 +148,7 @@ BOOL sub_020328D0 (int cmd) return sCommCmdManager->cmdTable[cmd - 22].unk_08 != NULL; } -void * sub_0203290C (int cmd, int netId, int param2) +void *sub_0203290C(int cmd, int netId, int param2) { UnkFuncPtr_0203290C v0; @@ -161,29 +163,29 @@ void * sub_0203290C (int cmd, int netId, int param2) return NULL; } -int sub_02032944 (void) +int sub_02032944(void) { return 0xffff; } -int sub_0203294C (void) +int sub_0203294C(void) { return 0; } -int CommPacketSizeOf_NetId (void) +int CommPacketSizeOf_NetId(void) { return 1; } -static int sub_02032954 (void) +static int sub_02032954(void) { return 2; } -static void sub_02032958 (int param0, int param1, void * param2, void * param3) +static void sub_02032958(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; int v1; if (CommSys_CurNetId() != 0) { @@ -205,9 +207,9 @@ static void sub_02032958 (int param0, int param1, void * param2, void * param3) CommSys_SendDataServer(14, NULL, 0); } -static void sub_0203299C (int param0, int param1, void * param2, void * param3) +static void sub_0203299C(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; int v1; sCommCmdManager->cmdTable = NULL; @@ -218,9 +220,9 @@ static void sub_0203299C (int param0, int param1, void * param2, void * param3) CommSys_SendDataFixedSize(15, param2); } -static void sub_020329C4 (int param0, int param1, void * param2, void * param3) +static void sub_020329C4(int param0, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; int v1; if (CommSys_CurNetId() != 0) { diff --git a/src/unk_02033200.c b/src/unk_02033200.c index 28d9fa5ee5..640b771186 100644 --- a/src/unk_02033200.c +++ b/src/unk_02033200.c @@ -1,24 +1,23 @@ +#include "unk_02033200.h" + #include #include #include -#include "trainer_info.h" - #include "struct_defs/sentence.h" #include "struct_defs/struct_0202610C.h" #include "struct_defs/struct_0203330C.h" #include "struct_defs/struct_02034168.h" -#include "unk_02014A84.h" -#include "unk_02017728.h" +#include "communication_information.h" +#include "communication_system.h" #include "heap.h" #include "trainer_info.h" +#include "unk_02014A84.h" +#include "unk_02017728.h" #include "unk_0202602C.h" #include "unk_02030EE0.h" #include "unk_0203266C.h" -#include "communication_information.h" -#include "unk_02033200.h" -#include "communication_system.h" #include "unk_020366A0.h" typedef struct { @@ -27,16 +26,16 @@ typedef struct { WMbssDesc unk_188[16]; u8 unk_1498[8][6]; u16 unk_14C8[16]; - void * unk_14E8; + void *unk_14E8; Sentence unk_14EC; int unk_14F4; u8 unk_14F8; u8 unk_14F9; - TrainerInfo * personalTrainerInfo; - BattleRegulation * unk_1500; + TrainerInfo *personalTrainerInfo; + BattleRegulation *unk_1500; u32 unk_1504; u32 unk_1508; - u16 * unk_150C; + u16 *unk_150C; u16 unk_1510; u16 unk_1512; u8 unk_1514; @@ -51,24 +50,24 @@ typedef struct { u8 unk_1519_4 : 1; u8 unk_1519_5 : 1; u8 unk_1519_6 : 1; - u8 : 1; + u8 : 1; } CommServerClient; static void sub_020334DC(BOOL param0); static void sub_02033550(BOOL param0); static void sub_02033578(void); static void sub_02033AA8(void); -static BOOL sub_02034014(u8 * param0); +static BOOL sub_02034014(u8 *param0); static u16 sub_02033F0C(u16 param0); -static void sub_0203330C(WMBssDesc * param0); -static void sub_0203344C(void * param0, WVRResult param1); +static void sub_0203330C(WMBssDesc *param0); +static void sub_0203344C(void *param0, WVRResult param1); static int sub_02033DDC(void); -static CommServerClient * sCommServerClient = NULL; +static CommServerClient *sCommServerClient = NULL; static u16 Unk_021C07B8 = 0; static volatile int Unk_021C07BC; -void CommServerClient_Init (TrainerInfo * trainerInfo, BOOL param1) +void CommServerClient_Init(TrainerInfo *trainerInfo, BOOL param1) { int v0; @@ -95,7 +94,7 @@ void CommServerClient_Init (TrainerInfo * trainerInfo, BOOL param1) sub_020334DC(param1); } -BOOL sub_020332D0 (void) +BOOL sub_020332D0(void) { if (sCommServerClient) { return 1; @@ -104,11 +103,11 @@ BOOL sub_020332D0 (void) return 0; } -static BOOL sub_020332E4 (const u8 * param0, const u8 * param1, int param2) +static BOOL sub_020332E4(const u8 *param0, const u8 *param1, int param2) { int v0; - const u8 * v1 = param0; - const u8 * v2 = param1; + const u8 *v1 = param0; + const u8 *v2 = param1; for (v0 = 0; v0 < param2; v0++) { if (*v1 != *v2) { @@ -122,10 +121,10 @@ static BOOL sub_020332E4 (const u8 * param0, const u8 * param1, int param2) return 1; } -static void sub_0203330C (WMBssDesc * param0) +static void sub_0203330C(WMBssDesc *param0) { int v0; - UnkStruct_0203330C * v1; + UnkStruct_0203330C *v1; int v2 = sub_0203895C(); int v3 = sub_02038974(); @@ -149,9 +148,9 @@ static void sub_0203330C (WMBssDesc * param0) sCommServerClient->unk_1519_6 = 1; } -static void sub_02033380 (void) +static void sub_02033380(void) { - WMBssDesc * v0 = &sCommServerClient->unk_54; + WMBssDesc *v0 = &sCommServerClient->unk_54; int v1; if (!sCommServerClient->unk_1519_6) { @@ -187,7 +186,7 @@ static void sub_02033380 (void) sCommServerClient->unk_14F8 = 1; } -static void sub_0203344C (void * param0, WVRResult param1) +static void sub_0203344C(void *param0, WVRResult param1) { if (param1 != WVR_RESULT_SUCCESS) { OS_Terminate(); @@ -198,13 +197,13 @@ static void sub_0203344C (void * param0, WVRResult param1) Unk_021C07BC = 2; } -static void sub_02033464 (void * param0, WVRResult param1) +static void sub_02033464(void *param0, WVRResult param1) { Unk_021C07BC = 0; SleepUnlock(4); } -void sub_02033478 (void) +void sub_02033478(void) { SleepLock(4); @@ -217,22 +216,22 @@ void sub_02033478 (void) } } -BOOL sub_020334A4 (void) +BOOL sub_020334A4(void) { return Unk_021C07BC == 2; } -BOOL sub_020334B8 (void) +BOOL sub_020334B8(void) { return Unk_021C07BC != 0; } -void sub_020334CC (void) +void sub_020334CC(void) { WVR_TerminateAsync(sub_02033464, NULL); } -static void sub_020334DC (BOOL param0) +static void sub_020334DC(BOOL param0) { sCommServerClient->unk_14F4 = 0; @@ -246,7 +245,7 @@ static void sub_020334DC (BOOL param0) sub_020318D0(sCommServerClient->unk_1504); } -void sub_02033518 (void) +void sub_02033518(void) { int v0; @@ -257,12 +256,12 @@ void sub_02033518 (void) MI_CpuClear8(sCommServerClient->unk_188, sizeof(WMBssDesc) * 16); } -static void sub_02033550 (BOOL param0) +static void sub_02033550(BOOL param0) { sCommServerClient->unk_1519_3 = param0; } -static void sub_02033578 (void) +static void sub_02033578(void) { sCommServerClient->unk_14F8 = 0; sCommServerClient->unk_1519_0 = 0; @@ -274,7 +273,7 @@ static void sub_02033578 (void) return; } -BOOL CommServerClient_InitServer (BOOL param0, BOOL param1, BOOL param2) +BOOL CommServerClient_InitServer(BOOL param0, BOOL param1, BOOL param2) { sub_02033578(); sub_02033550(param1); @@ -296,7 +295,7 @@ BOOL CommServerClient_InitServer (BOOL param0, BOOL param1, BOOL param2) return 0; } -BOOL CommServerClient_InitClient (BOOL param0, BOOL param1) +BOOL CommServerClient_InitClient(BOOL param0, BOOL param1) { sub_02033578(); @@ -310,7 +309,7 @@ BOOL CommServerClient_InitClient (BOOL param0, BOOL param1) } if (sub_02031934() == 1) { - const u8 v0[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; + const u8 v0[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; if (sub_020312B8(sub_0203330C, v0, 0)) { return 1; @@ -320,7 +319,7 @@ BOOL CommServerClient_InitClient (BOOL param0, BOOL param1) return 0; } -BOOL sub_020336D4 (void) +BOOL sub_020336D4(void) { if (!sCommServerClient) { return 1; @@ -359,7 +358,7 @@ BOOL sub_020336D4 (void) return 0; } -BOOL sub_02033768 (void) +BOOL sub_02033768(void) { if (sCommServerClient) { if (sCommServerClient->unk_1516 == 0) { @@ -372,7 +371,7 @@ BOOL sub_02033768 (void) return 0; } -void sub_02033794 (BOOL param0) +void sub_02033794(BOOL param0) { if (!sCommServerClient) { return; @@ -386,7 +385,7 @@ void sub_02033794 (BOOL param0) } } -static void sub_020337C0 (void) +static void sub_020337C0(void) { Heap_FreeToHeap(sCommServerClient->unk_1500); Heap_FreeToHeap(sCommServerClient->unk_14E8); @@ -396,7 +395,7 @@ static void sub_020337C0 (void) sCommServerClient = NULL; } -int sub_02033808 (void) +int sub_02033808(void) { int v0, v1; @@ -415,7 +414,7 @@ int sub_02033808 (void) return v1; } -int sub_0203383C (int param0) +int sub_0203383C(int param0) { int v0, v1; @@ -435,20 +434,20 @@ int sub_0203383C (int param0) return 0; } -BOOL sub_02033870 (void) +BOOL sub_02033870(void) { return sCommServerClient->unk_14F8; } -void sub_02033884 (void) +void sub_02033884(void) { sCommServerClient->unk_14F8 = 0; } -int sub_02033898 (int param0) +int sub_02033898(int param0) { int v0; - UnkStruct_0203330C * v1; + UnkStruct_0203330C *v1; v0 = 0; @@ -465,7 +464,7 @@ int sub_02033898 (int param0) return 0; } -static int sub_020338C8 (int param0) +static int sub_020338C8(int param0) { int v0, v1; @@ -480,7 +479,7 @@ static int sub_020338C8 (int param0) return -1; } -int sub_020338EC (void) +int sub_020338EC(void) { int v0, v1; @@ -503,7 +502,7 @@ int sub_020338EC (void) return -1; } -int sub_0203394C (void) +int sub_0203394C(void) { int v0; @@ -534,10 +533,10 @@ int sub_0203394C (void) return v0; } -void sub_020339AC (int param0, TrainerInfo * param1) +void sub_020339AC(int param0, TrainerInfo *param1) { int v0, v1; - UnkStruct_0203330C * v2; + UnkStruct_0203330C *v2; v1 = 0; @@ -553,7 +552,7 @@ void sub_020339AC (int param0, TrainerInfo * param1) } } -BOOL sub_020339E8 (u16 param0) +BOOL sub_020339E8(u16 param0) { int v0; @@ -578,7 +577,7 @@ BOOL sub_020339E8 (u16 param0) return 0; } -void sub_02033A5C (void) +void sub_02033A5C(void) { int v0; @@ -599,12 +598,12 @@ void sub_02033A5C (void) } } -static void sub_02033AA8 (void) +static void sub_02033AA8(void) { u8 v0[6]; - TrainerInfo * v1; - UnkStruct_0203330C * v2; - UnkStruct_02034168 * v3; + TrainerInfo *v1; + UnkStruct_0203330C *v2; + UnkStruct_02034168 *v3; int v4 = sub_0203895C(); v1 = sub_02033F9C(); @@ -640,9 +639,9 @@ static void sub_02033AA8 (void) sub_020318DC(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C))); } -static void sub_02033B88 (void) +static void sub_02033B88(void) { - UnkStruct_0203330C * v0 = (UnkStruct_0203330C *)sCommServerClient->unk_150C; + UnkStruct_0203330C *v0 = (UnkStruct_0203330C *)sCommServerClient->unk_150C; if (sub_02033DDC() != v0->unk_06) { v0->unk_06 = sub_02033DDC(); @@ -652,7 +651,7 @@ static void sub_02033B88 (void) } } -static void sub_02033BDC (u16 param0) +static void sub_02033BDC(u16 param0) { int v0 = sub_02031934(); int v1 = sub_02032E90(); @@ -714,8 +713,7 @@ static void sub_02033BDC (u16 param0) sCommServerClient->unk_1519_0 = 1; } break; - case 7: - { + case 7: { u16 v2; v2 = sub_02031B04(); @@ -736,21 +734,20 @@ static void sub_02033BDC (u16 param0) sub_02033AA8(); (void)sub_02031D04(0, Unk_021C07B8, v2, CommLocal_MaxMachines(sub_0203895C()), sub_02033F0C(sub_0203895C()), sCommServerClient->unk_1519_5); sCommServerClient->unk_1514 = v2; - } - break; + } break; default: break; } } -void sub_02033D94 (u16 param0) +void sub_02033D94(u16 param0) { if (sCommServerClient) { sub_02033BDC(param0); } } -static BOOL sub_02033DA8 (u16 param0) +static BOOL sub_02033DA8(u16 param0) { if (!sCommServerClient) { return 0; @@ -770,7 +767,7 @@ static BOOL sub_02033DA8 (u16 param0) return 0; } -static int sub_02033DDC (void) +static int sub_02033DDC(void) { int v0 = 0, v1; @@ -783,7 +780,7 @@ static int sub_02033DDC (void) return v0; } -BOOL sub_02033DFC (void) +BOOL sub_02033DFC(void) { if (sCommServerClient && (sCommServerClient->unk_1516 == 3)) { return 1; @@ -792,12 +789,12 @@ BOOL sub_02033DFC (void) return 0; } -BOOL CommServerClient_IsInitialized (void) +BOOL CommServerClient_IsInitialized(void) { return sCommServerClient != NULL; } -BOOL sub_02033E30 (void) +BOOL sub_02033E30(void) { if (sCommServerClient) { return sub_02031FBC(); @@ -806,7 +803,7 @@ BOOL sub_02033E30 (void) return 1; } -BOOL CommServerClient_IsClientConnecting (void) +BOOL CommServerClient_IsClientConnecting(void) { if (sCommServerClient) { return sub_020318EC() & 0xfffe; @@ -815,7 +812,7 @@ BOOL CommServerClient_IsClientConnecting (void) return 0; } -BOOL sub_02033E68 (void) +BOOL sub_02033E68(void) { if (CommServerClient_CheckError() && (20 == sub_02031948())) { return 1; @@ -824,7 +821,7 @@ BOOL sub_02033E68 (void) return 0; } -BOOL CommServerClient_CheckError (void) +BOOL CommServerClient_CheckError(void) { if (sCommServerClient) { if (sCommServerClient->unk_1519_0) { @@ -835,14 +832,14 @@ BOOL CommServerClient_CheckError (void) return 0; } -void sub_02033EA8 (BOOL param0) +void sub_02033EA8(BOOL param0) { if (sCommServerClient) { sCommServerClient->unk_1519_2 = param0; } } -void sub_02033ED4 (BOOL param0) +void sub_02033ED4(BOOL param0) { if (sCommServerClient) { sCommServerClient->unk_1519_1 = param0; @@ -850,7 +847,7 @@ void sub_02033ED4 (BOOL param0) } } -u16 sub_02033F0C (u16 param0) +u16 sub_02033F0C(u16 param0) { u16 v0 = WM_GetDispersionBeaconPeriod(); @@ -867,7 +864,7 @@ u16 sub_02033F0C (u16 param0) return v0; } -WMBssDesc * sub_02033F3C (int param0) +WMBssDesc *sub_02033F3C(int param0) { if (sCommServerClient && (sCommServerClient->unk_14C8[param0] != 0)) { return &sCommServerClient->unk_188[param0]; @@ -876,7 +873,7 @@ WMBssDesc * sub_02033F3C (int param0) return NULL; } -UnkStruct_0203330C * sub_02033F6C (int param0) +UnkStruct_0203330C *sub_02033F6C(int param0) { if (sCommServerClient && (sCommServerClient->unk_14C8[param0] != 0)) { return (UnkStruct_0203330C *)sCommServerClient->unk_188[param0].gameInfo.userGameInfo; @@ -885,15 +882,15 @@ UnkStruct_0203330C * sub_02033F6C (int param0) return NULL; } -TrainerInfo * sub_02033F9C (void) +TrainerInfo *sub_02033F9C(void) { return sCommServerClient->personalTrainerInfo; } -TrainerInfo * sub_02033FB0 (int param0) +TrainerInfo *sub_02033FB0(int param0) { - TrainerInfo * v0; - UnkStruct_0203330C * v1; + TrainerInfo *v0; + UnkStruct_0203330C *v1; if (sCommServerClient->unk_14C8[param0] == 0) { return NULL; @@ -905,7 +902,7 @@ TrainerInfo * sub_02033FB0 (int param0) return v0; } -void sub_02033FDC (u8 * param0, int param1) +void sub_02033FDC(u8 *param0, int param1) { if (sCommServerClient) { GF_ASSERT(param1 < (7 + 1)); @@ -913,7 +910,7 @@ void sub_02033FDC (u8 * param0, int param1) } } -static BOOL sub_02034014 (u8 * param0) +static BOOL sub_02034014(u8 *param0) { int v0; @@ -926,7 +923,7 @@ static BOOL sub_02034014 (u8 * param0) return 0; } -BOOL sub_0203406C (void) +BOOL sub_0203406C(void) { if (sCommServerClient) { return sCommServerClient->unk_1519_4; @@ -935,40 +932,40 @@ BOOL sub_0203406C (void) return 0; } -void sub_0203408C (void) +void sub_0203408C(void) { if (sCommServerClient) { sCommServerClient->unk_1519_4 = 1; } } -void sub_020340A8 (Sentence * param0) +void sub_020340A8(Sentence *param0) { MI_CpuCopy8(param0, &sCommServerClient->unk_14EC, sizeof(Sentence)); } -void sub_020340C4 (void * param0) +void sub_020340C4(void *param0) { MI_CpuCopy8(param0, sCommServerClient->unk_1500, sub_0202602C()); } -void * sub_020340E8 (void) +void *sub_020340E8(void) { return sCommServerClient->unk_1500; } -void sub_020340FC (void) +void sub_020340FC(void) { sub_02033AA8(); sub_02032034(sCommServerClient->unk_150C, MATH_MAX(sizeof(UnkStruct_02034168), sizeof(UnkStruct_0203330C)), sCommServerClient->unk_1504, Unk_021C07B8); } -int sub_02034120 (int param0) +int sub_02034120(int param0) { int v0, v1 = 0; for (v0 = 0; v0 < 16; v0++) { - UnkStruct_0203330C * v2 = sub_02033F6C(v0); + UnkStruct_0203330C *v2 = sub_02033F6C(v0); if (v2) { if (v2->unk_04 == param0) { @@ -980,21 +977,21 @@ int sub_02034120 (int param0) return v1; } -BOOL sub_02034148 (void) +BOOL sub_02034148(void) { return sub_020320C4(); } -void sub_02034150 (void * param0) +void sub_02034150(void *param0) { MI_CpuCopy8(param0, sCommServerClient->unk_00, 84); sub_020340FC(); } -const void * sub_02034168 (int param0) +const void *sub_02034168(int param0) { if (sCommServerClient && (sCommServerClient->unk_14C8[param0] != 0)) { - UnkStruct_02034168 * v0; + UnkStruct_02034168 *v0; v0 = (UnkStruct_02034168 *)sCommServerClient->unk_188[param0].gameInfo.userGameInfo; return v0->unk_08; diff --git a/src/unk_020363E8.c b/src/unk_020363E8.c index d13efd775f..46cf4ffcf6 100644 --- a/src/unk_020363E8.c +++ b/src/unk_020363E8.c @@ -1,16 +1,17 @@ +#include "unk_020363E8.h" + #include #include -#include "heap.h" #include "communication_system.h" -#include "unk_020363E8.h" +#include "heap.h" typedef struct { u8 unk_00; u8 unk_01; } UnkStruct_02036574; -#define COMM_TOOL_TEMP_DATA_SIZE 70 +#define COMM_TOOL_TEMP_DATA_SIZE 70 typedef struct { UnkStruct_02036574 unk_00[MAX_CONNECTED_PLAYERS]; @@ -22,9 +23,9 @@ typedef struct { u8 sendTiming; } CommTool; -static CommTool * sCommTool = NULL; +static CommTool *sCommTool = NULL; -void CommTool_Init (int netId) +void CommTool_Init(int netId) { if (!sCommTool) { sCommTool = Heap_AllocFromHeap(netId, sizeof(CommTool)); @@ -40,13 +41,13 @@ void CommTool_Init (int netId) sCommTool->sendTiming = 0; } -void CommTool_Delete (void) +void CommTool_Delete(void) { Heap_FreeToHeap(sCommTool); sCommTool = NULL; } -BOOL CommTool_IsInitialized (void) +BOOL CommTool_IsInitialized(void) { if (sCommTool) { return 1; @@ -55,9 +56,9 @@ BOOL CommTool_IsInitialized (void) return 0; } -void CommCmd_16 (int netId, int param1, void * _buff, void * param3) +void CommCmd_16(int netId, int param1, void *_buff, void *param3) { - u8 * buff = _buff; + u8 *buff = _buff; u8 syncNo = buff[0]; u8 v2[2]; int netJd; @@ -81,27 +82,27 @@ void CommCmd_16 (int netId, int param1, void * _buff, void * param3) } } -void CommCmd_18 (int netId, int param1, void * param2, void * param3) +void CommCmd_18(int netId, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; sCommTool->syncNo[v0[0]] = v0[1]; } -void CommCmd_17 (int netId, int param1, void * param2, void * param3) +void CommCmd_17(int netId, int param1, void *param2, void *param3) { - u8 * v0 = param2; + u8 *v0 = param2; u8 v1 = v0[0]; sCommTool->syncState = v1; } -void CommTiming_StartSync (u8 syncNo) +void CommTiming_StartSync(u8 syncNo) { sCommTool->syncNoPersonal = syncNo; sCommTool->sendTiming = TRUE; } -void sub_0203650C (void) +void sub_0203650C(void) { if (sCommTool) { if (sCommTool->sendTiming) { @@ -112,7 +113,7 @@ void sub_0203650C (void) } } -BOOL CommTiming_IsSyncState (u8 syncState) +BOOL CommTiming_IsSyncState(u8 syncState) { if (sCommTool == NULL) { return TRUE; @@ -125,25 +126,25 @@ BOOL CommTiming_IsSyncState (u8 syncState) return FALSE; } -int sub_02036564 (int netId) +int sub_02036564(int netId) { return sCommTool->syncNo[netId]; } -void sub_02036574 (int netId, int param1, void * param2, void * param3) +void sub_02036574(int netId, int param1, void *param2, void *param3) { - UnkStruct_02036574 * v0 = param2; + UnkStruct_02036574 *v0 = param2; sCommTool->unk_00[netId].unk_00 = v0->unk_00; sCommTool->unk_00[netId].unk_01 = v0->unk_01; } -int sub_02036590 (void) +int sub_02036590(void) { return sizeof(UnkStruct_02036574); } -void sub_02036594 (u8 param0, u8 param1) +void sub_02036594(u8 param0, u8 param1) { UnkStruct_02036574 v0; @@ -153,7 +154,7 @@ void sub_02036594 (u8 param0, u8 param1) CommSys_SendDataFixedSize(19, &v0); } -int CommList_Get (int param0, u8 param1) +int CommList_Get(int param0, u8 param1) { if (!sCommTool) { return -1; @@ -166,7 +167,7 @@ int CommList_Get (int param0, u8 param1) return -1; } -void CommList_Refresh (void) +void CommList_Refresh(void) { int v0; @@ -175,7 +176,7 @@ void CommList_Refresh (void) } } -void sub_020365F4 (void) +void sub_020365F4(void) { int v0; @@ -184,7 +185,7 @@ void sub_020365F4 (void) } } -BOOL sub_02036614 (int param0, const void * param1) +BOOL sub_02036614(int param0, const void *param1) { if (sCommTool) { MI_CpuCopy8(param1, sCommTool->unk_18[param0], COMM_TOOL_TEMP_DATA_SIZE); @@ -195,7 +196,7 @@ BOOL sub_02036614 (int param0, const void * param1) return 0; } -const void * sub_0203664C (int netId) +const void *sub_0203664C(int netId) { if (sCommTool->hasRecievedTempData[netId]) { return &sCommTool->unk_18[netId]; @@ -204,13 +205,13 @@ const void * sub_0203664C (int netId) return NULL; } -void sub_02036670 (int netId, int param1, void * param2, void * param3) +void sub_02036670(int netId, int param1, void *param2, void *param3) { sCommTool->hasRecievedTempData[netId] = TRUE; MI_CpuCopy8(param2, sCommTool->unk_18[netId], COMM_TOOL_TEMP_DATA_SIZE); } -int CommTool_TempDataSize (void) +int CommTool_TempDataSize(void) { return COMM_TOOL_TEMP_DATA_SIZE; } diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c index 69a42f2389..734d19158c 100644 --- a/src/unk_020366A0.c +++ b/src/unk_020366A0.c @@ -1,43 +1,42 @@ +#include "unk_020366A0.h" + +#include #include #include -#include - -#include "core_sys.h" #include "struct_decls/struct_02018340_decl.h" -#include "trainer_info.h" -#include "savedata.h" - #include "struct_defs/struct_0202610C.h" + +#include "overlay004/ov4_021D0D80.h" #include "overlay065/struct_ov65_0222F6EC.h" +#include "overlay066/ov66_022324F0.h" -#include "unk_02005474.h" -#include "unk_02017728.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" #include "heap.h" #include "savedata.h" +#include "trainer_info.h" +#include "unk_02005474.h" +#include "unk_02017728.h" #include "unk_02025E08.h" #include "unk_02030EE0.h" #include "unk_0203266C.h" #include "unk_02032798.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" -#include "unk_020366A0.h" #include "unk_020393C8.h" #include "unk_02039814.h" -#include "overlay004/ov4_021D0D80.h" -#include "overlay066/ov66_022324F0.h" -typedef void (* UnkFuncPtr_02036C94)(void); +typedef void (*UnkFuncPtr_02036C94)(void); typedef struct { - void * unk_00; + void *unk_00; u8 unk_04[6]; MATHRandContext32 unk_0C; UnkFuncPtr_02036C94 unk_24; - SaveData * unk_28; - TrainerInfo * unk_2C; - const BattleRegulation * unk_30; + SaveData *unk_28; + TrainerInfo *unk_2C; + const BattleRegulation *unk_30; UnkStruct_ov65_0222F6EC unk_34; int unk_40; u16 unk_44; @@ -62,7 +61,7 @@ typedef struct { u8 unk_58; u8 unk_59; u8 unk_5A; - const void * unk_5C; + const void *unk_5C; u8 unk_60; u8 unk_61[3]; } UnkStruct_021C07D4; @@ -135,20 +134,20 @@ static void sub_02038E84(void); static BOOL sub_02038C74(int param0); static BOOL sub_02038D10(void); static BOOL sub_02038D44(void); -static BOOL sub_02038D5C(u32 * param0); +static BOOL sub_02038D5C(u32 *param0); static void sub_020378F8(void); static void sub_02037910(void); static void sub_0203794C(void); static void sub_020379D0(void); -static UnkStruct_021C07D4 * Unk_021C07D4 = NULL; -static u8 Unk_02100A20[] = {"FREAK"}; -static u8 Unk_02100A30[] = {" GAME"}; -static u8 Unk_02100A28[] = {" FULL"}; +static UnkStruct_021C07D4 *Unk_021C07D4 = NULL; +static u8 Unk_02100A20[] = { "FREAK" }; +static u8 Unk_02100A30[] = { " GAME" }; +static u8 Unk_02100A28[] = { " FULL" }; -static void sub_020366A0 (SaveData * param0, int param1) +static void sub_020366A0(SaveData *param0, int param1) { - void * v0; + void *v0; if (Unk_021C07D4 != NULL) { return; @@ -177,7 +176,7 @@ static void sub_020366A0 (SaveData * param0, int param1) } } -static void sub_02036734 (void) +static void sub_02036734(void) { if (Unk_021C07D4 == NULL) { return; @@ -201,7 +200,7 @@ static void sub_02036734 (void) Unk_021C07D4 = NULL; } -BOOL CommMan_IsInitialized (void) +BOOL CommMan_IsInitialized(void) { if (Unk_021C07D4) { return 1; @@ -210,7 +209,7 @@ BOOL CommMan_IsInitialized (void) return 0; } -void sub_02036794 (SaveData * param0) +void sub_02036794(SaveData *param0) { if (Unk_021C07D4 != NULL) { return; @@ -224,7 +223,7 @@ void sub_02036794 (SaveData * param0) sub_02036C94(sub_02036CA4, 50); } -void sub_020367D0 (void) +void sub_020367D0(void) { if (Unk_021C07D4 == NULL) { return; @@ -234,24 +233,24 @@ void sub_020367D0 (void) sub_02036C94(sub_02037344, 0); } -void sub_020367F0 (void) +void sub_020367F0(void) { CommSys_Reset(); Unk_021C07D4->unk_44 = CommSys_CurNetId(); sub_02036C94(sub_0203712C, 0); } -void sub_02036814 (BOOL param0) +void sub_02036814(BOOL param0) { Unk_021C07D4->unk_5A = param0; } -void sub_02036824 (void) +void sub_02036824(void) { sub_02036C94(sub_02036FA4, 0); } -BOOL sub_02036834 (void) +BOOL sub_02036834(void) { int v0; u32 v1[] = { @@ -272,23 +271,23 @@ BOOL sub_02036834 (void) return 0; } -void sub_02036884 (void) +void sub_02036884(void) { sub_02036C94(sub_020370EC, 0); } -void sub_02036894 (void) +void sub_02036894(void) { Unk_021C07D4->unk_57 = 1; } -void sub_020368A4 (void) +void sub_020368A4(void) { sub_02033478(); sub_02036C94(sub_02037108, 0); } -void CommMan_StartBattleServer (SaveData * param0, int param1, int param2, const BattleRegulation * param3, BOOL param4) +void CommMan_StartBattleServer(SaveData *param0, int param1, int param2, const BattleRegulation *param3, BOOL param4) { if (CommSys_IsInitialized()) { return; @@ -303,7 +302,7 @@ void CommMan_StartBattleServer (SaveData * param0, int param1, int param2, const sub_02036C94(sub_02037144, 0); } -void CommMan_StartBattleClient (SaveData * param0, int param1, int param2, const BattleRegulation * param3, BOOL param4) +void CommMan_StartBattleClient(SaveData *param0, int param1, int param2, const BattleRegulation *param3, BOOL param4) { if (CommSys_IsInitialized()) { return; @@ -318,19 +317,19 @@ void CommMan_StartBattleClient (SaveData * param0, int param1, int param2, const sub_02036C94(sub_020371C0, 0); } -void sub_02036948 (int param0) +void sub_02036948(int param0) { Unk_021C07D4->unk_49 = param0; sub_02036C94(sub_02037210, 0); } -void sub_02036964 (void) +void sub_02036964(void) { CommSys_ResetBattleClient(); sub_02036C94(sub_020372DC, 0); } -void sub_02036978 (void) +void sub_02036978(void) { if (Unk_021C07D4 == NULL) { return; @@ -339,16 +338,18 @@ void sub_02036978 (void) sub_02036C94(sub_020373B8, 5); } -void sub_02036994 (BOOL param0) +void sub_02036994(BOOL param0) { sub_0203208C(param0); } -BOOL sub_0203699C (void) +BOOL sub_0203699C(void) { int v0; u32 v1[] = { - (u32)sub_020371A8, (u32)sub_020372C4, 0, + (u32)sub_020371A8, + (u32)sub_020372C4, + 0, }; u32 v2 = (u32)Unk_021C07D4->unk_24; @@ -365,7 +366,7 @@ BOOL sub_0203699C (void) return 0; } -void sub_020369EC (SaveData * param0) +void sub_020369EC(SaveData *param0) { if (Unk_021C07D4 != NULL) { return; @@ -383,7 +384,7 @@ void sub_020369EC (SaveData * param0) sub_02036C94(sub_020373F0, 0); } -void sub_02036A38 (int param0) +void sub_02036A38(int param0) { Unk_021C07D4->unk_49 = param0; Unk_021C07D4->unk_44 = 3; @@ -393,7 +394,7 @@ void sub_02036A38 (int param0) sub_02036C94(sub_020375A4, 0); } -int sub_02036A68 (void) +int sub_02036A68(void) { u32 v0; @@ -414,7 +415,7 @@ int sub_02036A68 (void) return 0; } -BOOL sub_02036AA0 (void) +BOOL sub_02036AA0(void) { u32 v0; @@ -431,7 +432,7 @@ BOOL sub_02036AA0 (void) return 0; } -void sub_02036AC4 (void) +void sub_02036AC4(void) { sub_02032138(0); @@ -454,7 +455,7 @@ void sub_02036AC4 (void) } } -BOOL sub_02036B44 (void) +BOOL sub_02036B44(void) { u32 v0; @@ -471,7 +472,7 @@ BOOL sub_02036B44 (void) return 1; } -void sub_02036B68 (void) +void sub_02036B68(void) { if (Unk_021C07D4 == NULL) { return; @@ -480,7 +481,7 @@ void sub_02036B68 (void) sub_02036C94(sub_020373B8, 5); } -void sub_02036B84 (void) +void sub_02036B84(void) { if (Unk_021C07D4 == NULL) { return; @@ -490,7 +491,7 @@ void sub_02036B84 (void) sub_02032138(1); } -void sub_02036BA0 (void) +void sub_02036BA0(void) { if (Unk_021C07D4 == NULL) { return; @@ -502,17 +503,17 @@ void sub_02036BA0 (void) sub_02036C94(sub_020377E4, 0); } -void sub_02036BC8 (void) +void sub_02036BC8(void) { Unk_021C07D4->unk_4A = 18; } -void sub_02036BD8 (void) +void sub_02036BD8(void) { Unk_021C07D4->unk_4A = 9; } -void sub_02036BE8 (SaveData * param0, int param1) +void sub_02036BE8(SaveData *param0, int param1) { if (CommSys_IsInitialized()) { return; @@ -523,7 +524,7 @@ void sub_02036BE8 (SaveData * param0, int param1) sub_02036C94(sub_02037E20, 0); } -void sub_02036C1C (SaveData * param0, int param1) +void sub_02036C1C(SaveData *param0, int param1) { if (CommSys_IsInitialized()) { return; @@ -534,7 +535,7 @@ void sub_02036C1C (SaveData * param0, int param1) sub_02036C94(sub_02037E68, 0); } -void sub_02036C50 (void) +void sub_02036C50(void) { if (Unk_021C07D4) { if (Unk_021C07D4->unk_24 != NULL) { @@ -550,15 +551,15 @@ void sub_02036C50 (void) } } -static void sub_02036C94 (UnkFuncPtr_02036C94 param0, int param1) +static void sub_02036C94(UnkFuncPtr_02036C94 param0, int param1) { Unk_021C07D4->unk_24 = param0; Unk_021C07D4->unk_40 = param1; } -static void sub_02036CA4 (void) +static void sub_02036CA4(void) { - void * v0; + void *v0; if (Unk_021C07D4->unk_40 != 0) { Unk_021C07D4->unk_40--; @@ -592,7 +593,7 @@ static void sub_02036CA4 (void) } } -static void sub_02036D80 (void) +static void sub_02036D80(void) { BOOL v0; @@ -621,7 +622,7 @@ static void sub_02036D80 (void) } } -static void sub_02036E08 (void) +static void sub_02036E08(void) { BOOL v0; @@ -637,7 +638,7 @@ static void sub_02036E08 (void) } } -static void sub_02036E5C (void) +static void sub_02036E5C(void) { int v0; @@ -671,7 +672,7 @@ static void sub_02036E5C (void) sub_02036C94(sub_02036FA4, 0); } -static void sub_02036EDC (void) +static void sub_02036EDC(void) { sub_02033A5C(); @@ -691,7 +692,7 @@ static void sub_02036EDC (void) } } -static void sub_02036F44 (void) +static void sub_02036F44(void) { if (CommSys_IsPlayerConnected(CommSys_CurNetId())) { CommSys_Reset(); @@ -714,7 +715,7 @@ static void sub_02036F44 (void) sub_02036C94(sub_02036FA4, 0); } -static void sub_02036FA4 (void) +static void sub_02036FA4(void) { if (!sub_020336D4()) { return; @@ -723,7 +724,7 @@ static void sub_02036FA4 (void) sub_02036C94(sub_02036FD4, 0); } -static void sub_02036FBC (void) +static void sub_02036FBC(void) { if (!sub_020336D4()) { return; @@ -732,9 +733,9 @@ static void sub_02036FBC (void) sub_02036C94(sub_02036E08, 0); } -static void sub_02036FD4 (void) +static void sub_02036FD4(void) { - TrainerInfo * v0; + TrainerInfo *v0; if (!sub_02033E30()) { return; @@ -750,7 +751,7 @@ static void sub_02036FD4 (void) } } -static void sub_02037040 (void) +static void sub_02037040(void) { if (sub_020360E8()) { Unk_021C07D4->unk_4E = 1; @@ -772,7 +773,7 @@ static void sub_02037040 (void) } } -static void sub_02037094 (void) +static void sub_02037094(void) { CommSys_SetAlone(0); sub_02033EA8(1); @@ -780,17 +781,17 @@ static void sub_02037094 (void) sub_02036C94(sub_020370B4, 0); } -static void sub_020370B4 (void) +static void sub_020370B4(void) { return; } -static void sub_020370B8 (void) +static void sub_020370B8(void) { return; } -static void sub_020370BC (void) +static void sub_020370BC(void) { if (!sub_020389B8()) { if (!sub_02033E30()) { @@ -807,7 +808,7 @@ static void sub_020370BC (void) sub_02036C94(sub_02037330, 0); } -static void sub_020370EC (void) +static void sub_020370EC(void) { if (!sub_020336D4()) { return; @@ -817,7 +818,7 @@ static void sub_020370EC (void) sub_02036C94(sub_020370BC, 0); } -static void sub_02037108 (void) +static void sub_02037108(void) { if (!sub_020334A4()) { return; @@ -828,7 +829,7 @@ static void sub_02037108 (void) sub_02036C94(sub_02036D80, 0); } -static void sub_0203712C (void) +static void sub_0203712C(void) { if (!sub_020336D4()) { return; @@ -837,9 +838,9 @@ static void sub_0203712C (void) sub_02036C94(sub_02036D80, 0); } -static void sub_02037144 (void) +static void sub_02037144(void) { - TrainerInfo * v0; + TrainerInfo *v0; if (!sub_020334A4()) { return; @@ -854,7 +855,7 @@ static void sub_02037144 (void) } } -static void sub_0203718C (void) +static void sub_0203718C(void) { if (!CommSys_IsPlayerConnected(CommSys_CurNetId())) { return; @@ -863,14 +864,14 @@ static void sub_0203718C (void) sub_02036C94(sub_020371A8, 0); } -static void sub_020371A8 (void) +static void sub_020371A8(void) { if (!CommSys_IsInitialized()) { sub_02036C94(sub_02037334, 0); } } -static void sub_020371C0 (void) +static void sub_020371C0(void) { if (!sub_020334A4()) { return; @@ -885,12 +886,12 @@ static void sub_020371C0 (void) } } -static void sub_02037208 (void) +static void sub_02037208(void) { sub_02033A5C(); } -static void sub_02037210 (void) +static void sub_02037210(void) { sub_02033A5C(); @@ -899,7 +900,7 @@ static void sub_02037210 (void) } } -static void sub_02037238 (void) +static void sub_02037238(void) { if (CommSys_CheckError()) { sub_02036C94(sub_02037270, 0); @@ -910,15 +911,15 @@ static void sub_02037238 (void) } } -static void sub_02037270 (void) +static void sub_02037270(void) { sub_020336D4(); sub_02036C94(sub_02037284, 2); } -static void sub_02037284 (void) +static void sub_02037284(void) { - TrainerInfo * v0; + TrainerInfo *v0; if (Unk_021C07D4->unk_40 != 0) { Unk_021C07D4->unk_40--; @@ -935,22 +936,22 @@ static void sub_02037284 (void) } } -static void sub_020372C4 (void) +static void sub_020372C4(void) { if (!CommSys_IsInitialized()) { sub_02036C94(sub_02037334, 0); } } -static void sub_020372DC (void) +static void sub_020372DC(void) { sub_020336D4(); sub_02036C94(sub_020372F0, 2); } -static void sub_020372F0 (void) +static void sub_020372F0(void) { - TrainerInfo * v0; + TrainerInfo *v0; if (Unk_021C07D4->unk_40 != 0) { Unk_021C07D4->unk_40--; @@ -967,12 +968,12 @@ static void sub_020372F0 (void) } } -static void sub_02037330 (void) +static void sub_02037330(void) { return; } -static void sub_02037334 (void) +static void sub_02037334(void) { if (CommSys_IsInitialized()) { return; @@ -981,12 +982,12 @@ static void sub_02037334 (void) sub_02036734(); } -static void sub_02037344 (void) +static void sub_02037344(void) { sub_02036C94(sub_020373B8, 5); } -static void sub_02037354 (void) +static void sub_02037354(void) { if (CommSys_ConnectedCount() <= 1) { sub_02032160(0); @@ -1004,7 +1005,7 @@ static void sub_02037354 (void) sub_02036C94(sub_02037474, 0); } -static void sub_0203739C (void) +static void sub_0203739C(void) { if (!sub_020336D4()) { return; @@ -1014,7 +1015,7 @@ static void sub_0203739C (void) sub_02036C94(sub_02037474, 0); } -static void sub_020373B8 (void) +static void sub_020373B8(void) { if (Unk_021C07D4->unk_40 != 0) { Unk_021C07D4->unk_40--; @@ -1032,9 +1033,9 @@ static void sub_020373B8 (void) sub_02036C94(sub_02037334, 0); } -static void sub_020373F0 (void) +static void sub_020373F0(void) { - void * v0; + void *v0; if (!sub_020334A4()) { return; @@ -1050,7 +1051,7 @@ static void sub_020373F0 (void) } } -static void sub_02037444 (void) +static void sub_02037444(void) { int v0; @@ -1068,7 +1069,7 @@ static void sub_02037444 (void) sub_02036C94(sub_0203748C, 0); } -static void sub_02037474 (void) +static void sub_02037474(void) { if (!sub_020336D4()) { return; @@ -1077,7 +1078,7 @@ static void sub_02037474 (void) sub_02036C94(sub_0203748C, 0); } -static void sub_0203748C (void) +static void sub_0203748C(void) { if (!sub_02033E30()) { return; @@ -1092,7 +1093,7 @@ static void sub_0203748C (void) } } -static void sub_020374F4 (void) +static void sub_020374F4(void) { if (sub_02034148()) { (void)0; @@ -1115,7 +1116,7 @@ static void sub_020374F4 (void) } } -static void sub_0203754C (void) +static void sub_0203754C(void) { u32 v1; @@ -1130,7 +1131,7 @@ static void sub_0203754C (void) } } -static void sub_020375A4 (void) +static void sub_020375A4(void) { if (!sub_020336D4()) { return; @@ -1139,7 +1140,7 @@ static void sub_020375A4 (void) sub_02036C94(sub_020375BC, 0); } -static void sub_020375BC (void) +static void sub_020375BC(void) { if (!sub_02033E30()) { return; @@ -1151,7 +1152,7 @@ static void sub_020375BC (void) } } -static void sub_020375E8 (void) +static void sub_020375E8(void) { if (sub_02033898(Unk_021C07D4->unk_49) != 0) { if (sub_02034984(Unk_021C07D4->unk_49)) { @@ -1169,7 +1170,7 @@ static void sub_020375E8 (void) } } -static void sub_0203764C (void) +static void sub_0203764C(void) { if (CommSys_CheckError()) { sub_02036C94(sub_02037740, 0); @@ -1190,7 +1191,7 @@ static void sub_0203764C (void) sub_02036C94(sub_02037740, 0); } -static void sub_020376A8 (void) +static void sub_020376A8(void) { if (CommSys_CheckError()) { sub_02036C94(sub_02037740, 0); @@ -1220,7 +1221,7 @@ static void sub_020376A8 (void) sub_02036C94(sub_02037740, 0); } -static void sub_02037724 (void) +static void sub_02037724(void) { if (CommSys_CheckError()) { sub_02036C94(sub_02037740, 0); @@ -1228,12 +1229,12 @@ static void sub_02037724 (void) } } -static void sub_0203773C (void) +static void sub_0203773C(void) { return; } -static void sub_02037740 (void) +static void sub_02037740(void) { Unk_021C07D4->unk_48 = 0; @@ -1249,7 +1250,7 @@ static void sub_02037740 (void) } } -static void sub_02037790 (void) +static void sub_02037790(void) { if (!sub_020360E8()) { if (!sub_02038938()) { @@ -1271,7 +1272,7 @@ static void sub_02037790 (void) } } -static void sub_020377E4 (void) +static void sub_020377E4(void) { u32 v1; @@ -1285,7 +1286,7 @@ static void sub_020377E4 (void) } } -void sub_0203781C (void) +void sub_0203781C(void) { Unk_021C07D4->unk_4A = 13; @@ -1298,19 +1299,19 @@ void sub_0203781C (void) } } -void sub_02037854 (int param0) +void sub_02037854(int param0) { Unk_021C07D4->unk_49 = param0; Unk_021C07D4->unk_44 = 3; sub_02036C94(sub_020378F8, 0); } -void sub_02037878 (void) +void sub_02037878(void) { Unk_021C07D4->unk_4A = 7; } -void sub_02037888 (int param0) +void sub_02037888(int param0) { Unk_021C07D4->unk_49 = param0; Unk_021C07D4->unk_4A = 7; @@ -1320,12 +1321,12 @@ void sub_02037888 (int param0) sub_02036C94(sub_020375A4, 0); } -void sub_020378B8 (void) +void sub_020378B8(void) { Unk_021C07D4->unk_4A = 26; } -void sub_020378C8 (int param0) +void sub_020378C8(int param0) { Unk_021C07D4->unk_49 = param0; Unk_021C07D4->unk_4A = 26; @@ -1335,14 +1336,14 @@ void sub_020378C8 (int param0) sub_02036C94(sub_020375A4, 0); } -static void sub_020378F8 (void) +static void sub_020378F8(void) { if (sub_020336D4()) { sub_02036C94(sub_02037910, 0); } } -static void sub_02037910 (void) +static void sub_02037910(void) { if (!sub_02033E30()) { return; @@ -1356,7 +1357,7 @@ static void sub_02037910 (void) } } -static void sub_0203794C (void) +static void sub_0203794C(void) { if (sub_02033898(Unk_021C07D4->unk_49) != 0) { if (sub_02034984(Unk_021C07D4->unk_49)) { @@ -1378,7 +1379,7 @@ static void sub_0203794C (void) } } -static void sub_020379D0 (void) +static void sub_020379D0(void) { if (Unk_021C07D4->unk_40 > 90) { Unk_021C07D4->unk_40--; @@ -1416,10 +1417,10 @@ static void sub_020379D0 (void) } } -void sub_02037A78 (int param0, int param1, void * param2, void * param3) +void sub_02037A78(int param0, int param1, void *param2, void *param3) { int v0; - u8 * v1 = param2; + u8 *v1 = param2; BOOL v2 = 1; if (CommSys_CurNetId() != 0) { @@ -1445,11 +1446,11 @@ void sub_02037A78 (int param0, int param1, void * param2, void * param3) sub_02035B48(7, Unk_02100A28); } -void sub_02037AD8 (int param0, int param1, void * param2, void * param3) +void sub_02037AD8(int param0, int param1, void *param2, void *param3) { u8 v0; int v1; - u8 * v2 = param2; + u8 *v2 = param2; BOOL v3 = 1; for (v1 = 1; v1 < sizeof(Unk_02100A30); v1++) { @@ -1489,12 +1490,12 @@ void sub_02037AD8 (int param0, int param1, void * param2, void * param3) } } -int sub_02037B54 (void) +int sub_02037B54(void) { return sizeof(Unk_02100A20); } -void sub_02037B58 (int param0) +void sub_02037B58(int param0) { if (Unk_021C07D4) { Unk_021C07D4->unk_46 = param0; @@ -1502,12 +1503,12 @@ void sub_02037B58 (int param0) } } -static void sub_02037B70 (void) +static void sub_02037B70(void) { sub_02033A5C(); } -static void sub_02037B78 (void) +static void sub_02037B78(void) { if (!sub_020334A4()) { return; @@ -1522,7 +1523,7 @@ static void sub_02037B78 (void) } } -void sub_02037BC0 (SaveData * param0) +void sub_02037BC0(SaveData *param0) { if (CommSys_IsInitialized()) { return; @@ -1536,7 +1537,7 @@ void sub_02037BC0 (SaveData * param0) sub_02036C94(sub_02037B78, 0); } -void sub_02037BFC (void) +void sub_02037BFC(void) { if (Unk_021C07D4 == NULL) { return; @@ -1545,7 +1546,7 @@ void sub_02037BFC (void) sub_02036C94(sub_020373B8, 5); } -BOOL sub_02037C18 (void) +BOOL sub_02037C18(void) { int v0; u32 v1[] = { @@ -1566,7 +1567,7 @@ BOOL sub_02037C18 (void) return 0; } -static void sub_02037C5C (u32 param0, int param1) +static void sub_02037C5C(u32 param0, int param1) { switch (param0) { case 0x333: @@ -1586,7 +1587,7 @@ static void sub_02037C5C (u32 param0, int param1) } } -static void sub_02037CE4 (void) +static void sub_02037CE4(void) { if (CommSys_InitClient(1, 1, 32)) { CommSys_SwitchTransitionTypeToParallel(); @@ -1594,7 +1595,7 @@ static void sub_02037CE4 (void) } } -static void sub_02037D08 (void) +static void sub_02037D08(void) { if (!sub_020334A4()) { return; @@ -1606,7 +1607,7 @@ static void sub_02037D08 (void) sub_02036C94(sub_02037CE4, 0); } -void sub_02037D48 (SaveData * param0) +void sub_02037D48(SaveData *param0) { if (CommSys_IsInitialized()) { return; @@ -1618,7 +1619,7 @@ void sub_02037D48 (SaveData * param0) sub_02036C94(sub_02037D08, 0); } -void sub_02037D84 (void) +void sub_02037D84(void) { if (Unk_021C07D4 == NULL) { return; @@ -1627,12 +1628,12 @@ void sub_02037D84 (void) sub_02036C94(sub_020373B8, 5); } -u8 sub_02037DA0 (void) +u8 sub_02037DA0(void) { return Unk_021C07D4->unk_54; } -BOOL sub_02037DB0 (void) +BOOL sub_02037DB0(void) { CommSys_StartShutdown(); @@ -1656,9 +1657,9 @@ BOOL sub_02037DB0 (void) return 0; } -static void sub_02037E20 (void) +static void sub_02037E20(void) { - TrainerInfo * v0; + TrainerInfo *v0; if (!sub_020334A4()) { return; @@ -1673,7 +1674,7 @@ static void sub_02037E20 (void) } } -static void sub_02037E68 (void) +static void sub_02037E68(void) { if (!sub_020334A4()) { return; @@ -1688,12 +1689,12 @@ static void sub_02037E68 (void) } } -static void sub_02037EB0 (void) +static void sub_02037EB0(void) { return; } -static void sub_02037EB4 (void) +static void sub_02037EB4(void) { int v0; @@ -1701,22 +1702,22 @@ static void sub_02037EB4 (void) if (v0 < 0) { sub_02036C94(sub_02037EB0, 0); - } else if (v0 == ((DWC_ERROR_NUM)+3)) { + } else if (v0 == ((DWC_ERROR_NUM) + 3)) { (void)0; } } -static void sub_02037ED0 (void) +static void sub_02037ED0(void) { return; } -static void sub_02037ED4 (void) +static void sub_02037ED4(void) { return; } -static void sub_02037ED8 (void) +static void sub_02037ED8(void) { int v0, v1; @@ -1728,15 +1729,15 @@ static void sub_02037ED8 (void) sub_02036C94(sub_02037ED4, 0); } else if (v0 < 0) { sub_02036C94(sub_02037EB0, 0); - } else if (v0 == ((DWC_ERROR_NUM)+3)) { + } else if (v0 == ((DWC_ERROR_NUM) + 3)) { sub_02036C94(sub_02037EB4, 0); - } else if (v0 == ((DWC_ERROR_NUM)+4)) { + } else if (v0 == ((DWC_ERROR_NUM) + 4)) { if (Unk_021C07D4->unk_4F) { sub_02036C94(sub_02037EB0, 0); } else { sub_02036C94(sub_02037ED0, 0); } - } else if (v0 == ((DWC_ERROR_NUM)+1)) { + } else if (v0 == ((DWC_ERROR_NUM) + 1)) { if (Unk_021C07D4->unk_4F) { sub_02036C94(sub_02037EB0, 0); } else { @@ -1751,12 +1752,12 @@ static void sub_02037ED8 (void) } } -void sub_02037F94 (int param0, int param1, int param2) +void sub_02037F94(int param0, int param1, int param2) { int v0; if (Unk_021C07D4) { - if ((param0 == ((DWC_ERROR_NUM)+6)) || (param0 == ((DWC_ERROR_NUM)+5))) { + if ((param0 == ((DWC_ERROR_NUM) + 6)) || (param0 == ((DWC_ERROR_NUM) + 5))) { v0 = param0; } else { v0 = -param0; @@ -1768,7 +1769,7 @@ void sub_02037F94 (int param0, int param1, int param2) } } -static void sub_02037FBC (void) +static void sub_02037FBC(void) { int v0 = ov4_021D12D4(0); @@ -1778,16 +1779,16 @@ static void sub_02037FBC (void) sub_02036C94(sub_02037EB0, 0); } else if (v0 == (DWC_ERROR_NUM)) { sub_02036C94(sub_02037ED8, 0); - } else if (v0 == ((DWC_ERROR_NUM)+1)) { + } else if (v0 == ((DWC_ERROR_NUM) + 1)) { sub_02036C94(sub_02037ED0, 0); - } else if (v0 == ((DWC_ERROR_NUM)+2)) { + } else if (v0 == ((DWC_ERROR_NUM) + 2)) { sub_02036C94(sub_02037ED4, 0); - } else if (v0 == ((DWC_ERROR_NUM)+4)) { + } else if (v0 == ((DWC_ERROR_NUM) + 4)) { sub_02036C94(sub_02037ED0, 0); } } -static void sub_0203802C (void) +static void sub_0203802C(void) { int v0 = ov4_021D12D4(1); @@ -1818,7 +1819,7 @@ static void sub_0203802C (void) } } -int sub_020380A0 (int param0) +int sub_020380A0(int param0) { if (Unk_021C07D4->unk_24 != sub_02037FBC) { return 0; @@ -1830,7 +1831,7 @@ int sub_020380A0 (int param0) return 1; } -int sub_020380E4 (void) +int sub_020380E4(void) { if (Unk_021C07D4->unk_24 == sub_02037FBC) { return 0; @@ -1867,7 +1868,7 @@ int sub_020380E4 (void) return 2; } -static void sub_02038164 (void) +static void sub_02038164(void) { int v0; int v1; @@ -1896,12 +1897,12 @@ static void sub_02038164 (void) if (v1 < 0) { sub_02036C94(sub_02037EB0, 0); - } else if (v1 == ((DWC_ERROR_NUM)+6)) { + } else if (v1 == ((DWC_ERROR_NUM) + 6)) { sub_02036C94(sub_02037EB0, 0); } } -static void sub_020381F0 (void) +static void sub_020381F0(void) { int v0; @@ -1923,7 +1924,7 @@ static void sub_020381F0 (void) } } -void sub_02038240 (int param0, int param1, void * param2, void * param3) +void sub_02038240(int param0, int param1, void *param2, void *param3) { if (CommSys_CurNetId() == 0) { Unk_021C07D4->unk_4C = 0; @@ -1936,12 +1937,12 @@ void sub_02038240 (int param0, int param1, void * param2, void * param3) Unk_021C07D4->unk_58 = 1; } -BOOL sub_02038284 (void) +BOOL sub_02038284(void) { return Unk_021C07D4->unk_58; } -BOOL sub_02038294 (void) +BOOL sub_02038294(void) { u32 v0 = (u32)Unk_021C07D4->unk_24; @@ -1956,7 +1957,7 @@ BOOL sub_02038294 (void) return 0; } -BOOL sub_020382C0 (void) +BOOL sub_020382C0(void) { u32 v0 = (u32)Unk_021C07D4->unk_24; @@ -1975,13 +1976,13 @@ BOOL sub_020382C0 (void) return 0; } -UnkStruct_ov65_0222F6EC * sub_020382F8 (void) +UnkStruct_ov65_0222F6EC *sub_020382F8(void) { GF_ASSERT(Unk_021C07D4); return &Unk_021C07D4->unk_34; } -static void sub_02038314 (void) +static void sub_02038314(void) { int v0; @@ -1999,7 +2000,7 @@ static void sub_02038314 (void) } } -void sub_02038350 (void) +void sub_02038350(void) { if (Unk_021C07D4 == NULL) { return; @@ -2010,7 +2011,7 @@ void sub_02038350 (void) sub_02036C94(sub_020373B8, 5); } -void sub_02038378 (void) +void sub_02038378(void) { if (Unk_021C07D4 == NULL) { return; @@ -2020,7 +2021,7 @@ void sub_02038378 (void) sub_02036C94(sub_020381F0, 0); } -void sub_02038398 (void) +void sub_02038398(void) { if (Unk_021C07D4 == NULL) { return; @@ -2037,14 +2038,14 @@ void sub_02038398 (void) sub_02036C94(sub_020381F0, 0); } -void sub_020383D4 (void) +void sub_020383D4(void) { u8 v0 = CommSys_CurNetId(); CommSys_SendDataFixedSize(21, &v0); } -BOOL sub_020383E8 (void) +BOOL sub_020383E8(void) { if (Unk_021C07D4) { u32 v0 = (u32)Unk_021C07D4->unk_24; @@ -2065,7 +2066,7 @@ BOOL sub_020383E8 (void) return 0; } -void sub_02038438 (SaveData * param0) +void sub_02038438(SaveData *param0) { if (!Unk_021C07D4) { Heap_CreateAtEnd(3, 15, 0x100); @@ -2079,7 +2080,7 @@ void sub_02038438 (SaveData * param0) } } -void sub_0203848C (void) +void sub_0203848C(void) { if (Unk_021C07D4) { ResetUnlock(1); @@ -2090,7 +2091,7 @@ void sub_0203848C (void) } } -void sub_020384C0 (SaveData * param0) +void sub_020384C0(SaveData *param0) { if (!Unk_021C07D4) { Heap_CreateAtEnd(3, 15, 0x100); @@ -2104,7 +2105,7 @@ void sub_020384C0 (SaveData * param0) } } -void sub_02038514 (void) +void sub_02038514(void) { if (Unk_021C07D4) { ResetUnlock(1); @@ -2115,7 +2116,7 @@ void sub_02038514 (void) } } -void sub_02038548 (SaveData * param0) +void sub_02038548(SaveData *param0) { if (!Unk_021C07D4) { Heap_CreateAtEnd(3, 15, 0x100); @@ -2129,7 +2130,7 @@ void sub_02038548 (SaveData * param0) } } -void sub_0203859C (void) +void sub_0203859C(void) { if (Unk_021C07D4) { ResetUnlock(1); @@ -2140,7 +2141,7 @@ void sub_0203859C (void) } } -BOOL sub_020385D0 (void) +BOOL sub_020385D0(void) { int v0, v1; DWCErrorType v2; @@ -2169,13 +2170,13 @@ BOOL sub_020385D0 (void) return 0; } -static void sub_0203862C (void) +static void sub_0203862C(void) { int v0 = ov4_021D0FEC(); Unk_021C07D4->unk_40--; - if (v0 == ((DWC_ERROR_NUM)+7)) { + if (v0 == ((DWC_ERROR_NUM) + 7)) { if (Unk_021C07D4->unk_4A == 33) { BOOL v1; @@ -2202,9 +2203,9 @@ static void sub_0203862C (void) } } -static void sub_020386B4 (void) +static void sub_020386B4(void) { - TrainerInfo * v0; + TrainerInfo *v0; if (!sub_020334A4()) { return; @@ -2222,9 +2223,9 @@ static void sub_020386B4 (void) } } -void * sub_0203871C (SaveData * param0, int param1) +void *sub_0203871C(SaveData *param0, int param1) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(param0); + TrainerInfo *v0 = SaveData_GetTrainerInfo(param0); if (CommSys_IsInitialized()) { return NULL; @@ -2244,9 +2245,9 @@ void * sub_0203871C (SaveData * param0, int param1) return Unk_021C07D4->unk_00; } -void sub_0203878C (SaveData * param0, const void * param1) +void sub_0203878C(SaveData *param0, const void *param1) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(param0); + TrainerInfo *v0 = SaveData_GetTrainerInfo(param0); if (CommSys_IsInitialized()) { return; @@ -2265,7 +2266,7 @@ void sub_0203878C (SaveData * param0, const void * param1) sub_02036C94(sub_02038BA8, 0); } -void sub_020387E8 (void) +void sub_020387E8(void) { if (Unk_021C07D4 == NULL) { return; @@ -2274,7 +2275,7 @@ void sub_020387E8 (void) sub_02036C94(sub_02038D80, 0); } -BOOL sub_02038804 (void) +BOOL sub_02038804(void) { if (Unk_021C07D4 == NULL) { return 0; @@ -2283,7 +2284,7 @@ BOOL sub_02038804 (void) return Unk_021C07D4->unk_60; } -BOOL sub_0203881C (void) +BOOL sub_0203881C(void) { if (Unk_021C07D4) { u32 v0 = (u32)Unk_021C07D4->unk_24; @@ -2296,7 +2297,7 @@ BOOL sub_0203881C (void) return 0; } -void sub_0203883C (UnkEnum_ov66_02232F38 param0) +void sub_0203883C(UnkEnum_ov66_02232F38 param0) { GF_ASSERT(Unk_021C07D4); GF_ASSERT(sub_020382C0() == 1); @@ -2310,7 +2311,7 @@ void sub_0203883C (UnkEnum_ov66_02232F38 param0) } } -void sub_0203888C (void) +void sub_0203888C(void) { u32 v0; @@ -2322,7 +2323,7 @@ void sub_0203888C (void) sub_02036C94(sub_02038E38, 0); } -u32 sub_020388AC (void) +u32 sub_020388AC(void) { if (Unk_021C07D4) { u32 v0 = (u32)Unk_021C07D4->unk_24; @@ -2339,12 +2340,12 @@ u32 sub_020388AC (void) return 0; } -void * sub_020388E8 (void) +void *sub_020388E8(void) { return Unk_021C07D4->unk_00; } -void CommMan_SetErrorHandling (BOOL param0, BOOL param1) +void CommMan_SetErrorHandling(BOOL param0, BOOL param1) { if (Unk_021C07D4) { Unk_021C07D4->unk_4F = param0; @@ -2361,7 +2362,7 @@ void CommMan_SetErrorHandling (BOOL param0, BOOL param1) sub_02033ED4(param0); } -BOOL sub_02038938 (void) +BOOL sub_02038938(void) { if (Unk_021C07D4) { if (Unk_021C07D4->unk_59 != 0) { @@ -2374,7 +2375,7 @@ BOOL sub_02038938 (void) return 0; } -int sub_0203895C (void) +int sub_0203895C(void) { if (Unk_021C07D4) { return Unk_021C07D4->unk_4A; @@ -2383,7 +2384,7 @@ int sub_0203895C (void) return 1; } -int sub_02038974 (void) +int sub_02038974(void) { if (Unk_021C07D4) { return Unk_021C07D4->unk_4B; @@ -2392,29 +2393,29 @@ int sub_02038974 (void) return 0; } -void sub_0203898C (u8 * param0) +void sub_0203898C(u8 *param0) { MI_CpuCopy8(param0, Unk_021C07D4->unk_04, NELEMS(Unk_021C07D4->unk_04)); } -void sub_020389A0 (u8 * param0) +void sub_020389A0(u8 *param0) { MI_CpuCopy8(Unk_021C07D4->unk_04, param0, NELEMS(Unk_021C07D4->unk_04)); } -BOOL sub_020389B8 (void) +BOOL sub_020389B8(void) { return CommLocal_IsWifiGroup(sub_0203895C()); } -void sub_020389C4 (u8 param0) +void sub_020389C4(u8 param0) { if (Unk_021C07D4) { Unk_021C07D4->unk_52 = param0; } } -u8 sub_020389D8 (void) +u8 sub_020389D8(void) { if (HeapCanaryOK()) { return 0; @@ -2427,7 +2428,7 @@ u8 sub_020389D8 (void) return 0; } -void sub_020389FC (int param0) +void sub_020389FC(int param0) { int v0 = 0; @@ -2438,7 +2439,7 @@ void sub_020389FC (int param0) } } -void sub_02038A0C (void) +void sub_02038A0C(void) { int v0 = 0; @@ -2449,12 +2450,12 @@ void sub_02038A0C (void) } } -void sub_02038A1C (int param0, BGL * param1) +void sub_02038A1C(int param0, BGL *param1) { return; } -void sub_02038A20 (int param0) +void sub_02038A20(int param0) { if (sub_02038938()) { if (CommSys_CheckError() || sub_020383E8() || sub_020385D0() @@ -2478,7 +2479,7 @@ void sub_02038A20 (int param0) } } -BOOL sub_02038AB8 (void) +BOOL sub_02038AB8(void) { if (sub_02033DFC() || !CommMan_IsInitialized()) { return 1; @@ -2491,7 +2492,7 @@ BOOL sub_02038AB8 (void) return 0; } -BOOL Link_SetErrorState (int param0) +BOOL Link_SetErrorState(int param0) { if (Unk_021C07D4) { Unk_021C07D4->unk_59 = param0; @@ -2502,37 +2503,37 @@ BOOL Link_SetErrorState (int param0) return 0; } -void sub_02038B00 (void) +void sub_02038B00(void) { Unk_021C07D4->unk_4A = 29; ov4_021D1104(sub_020352C0, sub_020352C0); } -void sub_02038B20 (void) +void sub_02038B20(void) { Unk_021C07D4->unk_4A = 35; ov4_021D1104(sub_020352C0, sub_020352C0); } -void sub_02038B40 (void) +void sub_02038B40(void) { Unk_021C07D4->unk_4A = 33; ov4_021D1104(sub_020352C0, sub_020352C0); } -void sub_02038B60 (void) +void sub_02038B60(void) { Unk_021C07D4->unk_4A = 23; ov4_021D1104(sub_020351F8, sub_0203509C); } -void sub_02038B84 (void) +void sub_02038B84(void) { Unk_021C07D4->unk_4A = 19; ov4_021D1104(sub_020351F8, sub_0203509C); } -static void sub_02038BA8 (void) +static void sub_02038BA8(void) { if (!sub_020334A4()) { return; @@ -2552,7 +2553,7 @@ static void sub_02038BA8 (void) } } -static void sub_02038C1C (void) +static void sub_02038C1C(void) { BOOL v0; @@ -2578,7 +2579,7 @@ static void sub_02038C1C (void) } } -static void sub_02038C68 (void) +static void sub_02038C68(void) { BOOL v0; @@ -2589,7 +2590,7 @@ static void sub_02038C68 (void) } } -static BOOL sub_02038C74 (int param0) +static BOOL sub_02038C74(int param0) { BOOL v0 = 1; @@ -2599,10 +2600,10 @@ static BOOL sub_02038C74 (int param0) } else if (param0 < 0) { sub_02036C94(sub_02037EB0, 0); v0 = 0; - } else if (param0 == ((DWC_ERROR_NUM)+3)) { + } else if (param0 == ((DWC_ERROR_NUM) + 3)) { sub_02036C94(sub_02038E84, 0); v0 = 0; - } else if (param0 == ((DWC_ERROR_NUM)+4)) { + } else if (param0 == ((DWC_ERROR_NUM) + 4)) { v0 = 0; if (Unk_021C07D4->unk_4F) { @@ -2622,7 +2623,7 @@ static BOOL sub_02038C74 (int param0) return v0; } -static BOOL sub_02038D10 (void) +static BOOL sub_02038D10(void) { UnkEnum_ov66_0223287C v0; BOOL v1 = 1; @@ -2645,7 +2646,7 @@ static BOOL sub_02038D10 (void) return v1; } -static BOOL sub_02038D44 (void) +static BOOL sub_02038D44(void) { int v0; BOOL v1; @@ -2662,7 +2663,7 @@ static BOOL sub_02038D44 (void) return v1; } -static BOOL sub_02038D5C (u32 * param0) +static BOOL sub_02038D5C(u32 *param0) { int v0; BOOL v1; @@ -2685,13 +2686,13 @@ static BOOL sub_02038D5C (u32 * param0) return v1; } -static void sub_02038D80 (void) +static void sub_02038D80(void) { ov66_0223282C(); sub_02036C94(sub_02038D94, 0); } -static void sub_02038D94 (void) +static void sub_02038D94(void) { BOOL v0; @@ -2708,12 +2709,12 @@ static void sub_02038D94 (void) } } -static void sub_02038DC8 (void) +static void sub_02038DC8(void) { return; } -static void sub_02038DCC (void) +static void sub_02038DCC(void) { BOOL v0; @@ -2727,7 +2728,7 @@ static void sub_02038DCC (void) } } -static void sub_02038DEC (void) +static void sub_02038DEC(void) { BOOL v0; u32 v1; @@ -2755,7 +2756,7 @@ static void sub_02038DEC (void) } } -static void sub_02038E38 (void) +static void sub_02038E38(void) { BOOL v0; int v1; @@ -2784,7 +2785,7 @@ static void sub_02038E38 (void) } } -static void sub_02038E84 (void) +static void sub_02038E84(void) { int v0; @@ -2797,12 +2798,12 @@ static void sub_02038E84 (void) sub_02038D10(); } -void sub_02038EA4 (void) +void sub_02038EA4(void) { Unk_021C07D4->unk_4A = 34; } -BOOL sub_02038EB4 (void) +BOOL sub_02038EB4(void) { if (Unk_021C07D4 && (Unk_021C07D4->unk_4A == 14)) { return 0; diff --git a/src/unk_02038ED4.c b/src/unk_02038ED4.c index f78797c8d0..70349da48b 100644 --- a/src/unk_02038ED4.c +++ b/src/unk_02038ED4.c @@ -1,18 +1,17 @@ +#include "unk_02038ED4.h" + #include #include -#include "savedata.h" - #include "savedata.h" #include "unk_020363E8.h" -#include "unk_02038ED4.h" -void sub_02038ED4 (int * param0) +void sub_02038ED4(int *param0) { *param0 = 0; } -int sub_02038EDC (SaveData * param0, int param1, int * param2) +int sub_02038EDC(SaveData *param0, int param1, int *param2) { int v0; diff --git a/src/unk_02038F8C.c b/src/unk_02038F8C.c index b3dceb9ed4..38e955ccca 100644 --- a/src/unk_02038F8C.c +++ b/src/unk_02038F8C.c @@ -1,20 +1,20 @@ +#include "unk_02038F8C.h" + #include #include -#include "trainer_info.h" #include "struct_decls/struct_0202C878_decl.h" -#include "trainer_info.h" -#include "unk_0202C858.h" #include "communication_information.h" #include "communication_system.h" -#include "unk_02038F8C.h" +#include "trainer_info.h" +#include "unk_0202C858.h" -void sub_02038F8C (UnkStruct_0202C878 * param0) +void sub_02038F8C(UnkStruct_0202C878 *param0) { int v0; int v1, v2, v3; - TrainerInfo * v4; + TrainerInfo *v4; int v5 = CommSys_ConnectedCount(); if (CommInfo_TrainerInfo(0) == NULL) { @@ -33,7 +33,7 @@ void sub_02038F8C (UnkStruct_0202C878 * param0) } } -void sub_02038FDC (UnkStruct_0202C878 * param0, int param1, int param2, int param3) +void sub_02038FDC(UnkStruct_0202C878 *param0, int param1, int param2, int param3) { if (sub_0202C8C8(param0, param1, param2) == 0) { sub_0202C918(param0, param1, param2, 1); diff --git a/src/unk_02038FFC.c b/src/unk_02038FFC.c index 694ae027f3..de081231fd 100644 --- a/src/unk_02038FFC.c +++ b/src/unk_02038FFC.c @@ -1,20 +1,21 @@ +#include "unk_02038FFC.h" + +#include #include #include -#include #include "struct_decls/struct_0202B370_decl.h" -#include "savedata.h" #include "heap.h" +#include "savedata.h" #include "unk_0202ACE0.h" -#include "unk_02038FFC.h" #include "unk_02099550.h" -int sub_02038FFC (int param0) +int sub_02038FFC(int param0) { int v0; - u8 * v1; - u8 * v2; + u8 *v1; + u8 *v2; sub_02099550(); sub_020995B4(); @@ -30,9 +31,9 @@ int sub_02038FFC (int param0) return v0; } -void sub_02039034 (UnkStruct_0202B370 * param0) +void sub_02039034(UnkStruct_0202B370 *param0) { - DWCUserData * v0 = sub_0202AD28(param0); + DWCUserData *v0 = sub_0202AD28(param0); if (!DWC_CheckUserData(v0)) { DWC_CreateUserData(v0, 'ADAJ'); @@ -40,19 +41,19 @@ void sub_02039034 (UnkStruct_0202B370 * param0) } } -int sub_02039058 (UnkStruct_0202B370 * param0) +int sub_02039058(UnkStruct_0202B370 *param0) { - DWCUserData * v0 = sub_0202AD28(param0); + DWCUserData *v0 = sub_0202AD28(param0); DWCFriendData v1; DWC_CreateExchangeToken(v0, &v1); return DWC_GetGsProfileId(v0, &v1); } -BOOL sub_02039074 (SaveData * param0) +BOOL sub_02039074(SaveData *param0) { - UnkStruct_0202B370 * v0 = sub_0202B370(param0); - DWCUserData * v1 = sub_0202AD28(v0); + UnkStruct_0202B370 *v0 = sub_0202B370(param0); + DWCUserData *v1 = sub_0202AD28(v0); if (DWC_CheckHasProfile(v1) && DWC_CheckValidConsole(v1)) { diff --git a/src/unk_0203909C.c b/src/unk_0203909C.c index 370214e8e8..7bae133802 100644 --- a/src/unk_0203909C.c +++ b/src/unk_0203909C.c @@ -1,25 +1,24 @@ +#include "unk_0203909C.h" + +#include #include #include -#include -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202B370_decl.h" -#include "savedata.h" +#include "communication_information.h" +#include "communication_system.h" +#include "savedata.h" #include "strbuf.h" #include "trainer_info.h" #include "unk_0202ACE0.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "unk_0203909C.h" -int sub_0203909C (SaveData * param0, DWCFriendData * param1, int * param2) +int sub_0203909C(SaveData *param0, DWCFriendData *param1, int *param2) { int v0; - DWCUserData * v1 = sub_0202AD28(sub_0202B370(param0)); - DWCFriendData * v2 = sub_0202AED8(sub_0202B370(param0), 0); + DWCUserData *v1 = sub_0202AD28(sub_0202B370(param0)); + DWCFriendData *v2 = sub_0202AED8(sub_0202B370(param0), 0); *param2 = -1; @@ -42,11 +41,11 @@ int sub_0203909C (SaveData * param0, DWCFriendData * param1, int * param2) return 2; } -int sub_02039140 (SaveData * param0, u64 param1, int * param2) +int sub_02039140(SaveData *param0, u64 param1, int *param2) { int v0; - DWCUserData * v1 = sub_0202AD28(sub_0202B370(param0)); - DWCFriendData * v2 = sub_0202AED8(sub_0202B370(param0), 0); + DWCUserData *v1 = sub_0202AD28(sub_0202B370(param0)); + DWCFriendData *v2 = sub_0202AED8(sub_0202B370(param0), 0); DWCFriendData v3; if (!DWC_CheckFriendKey(v1, param1)) { @@ -73,11 +72,11 @@ int sub_02039140 (SaveData * param0, u64 param1, int * param2) return 2; } -BOOL sub_020391DC (SaveData * param0, int * param1, int param2) +BOOL sub_020391DC(SaveData *param0, int *param1, int param2) { int v0, v1 = 0, v2; - DWCFriendData * v3 = sub_0202AED8(sub_0202B370(param0), 0); - DWCFriendData * v4; + DWCFriendData *v3 = sub_0202AED8(sub_0202B370(param0), 0); + DWCFriendData *v4; for (v0 = 0; v0 < CommSys_ConnectedCount(); v0++) { if (CommSys_CurNetId() == v0) { @@ -112,13 +111,13 @@ BOOL sub_020391DC (SaveData * param0, int * param1, int param2) return v1; } -void sub_02039298 (SaveData * param0, int param1, int param2, int param3, int param4) +void sub_02039298(SaveData *param0, int param1, int param2, int param3, int param4) { - UnkStruct_0202B370 * v0 = sub_0202B370(param0); - DWCFriendData * v1 = sub_0202AED8(v0, param2); - TrainerInfo * v2 = CommInfo_TrainerInfo(param1); - DWCFriendData * v3; - Strbuf* v4; + UnkStruct_0202B370 *v0 = sub_0202B370(param0); + DWCFriendData *v1 = sub_0202AED8(v0, param2); + TrainerInfo *v2 = CommInfo_TrainerInfo(param1); + DWCFriendData *v3; + Strbuf *v4; if (param4 != 2) { v3 = CommInfo_DWCFriendData(param1); @@ -147,11 +146,11 @@ void sub_02039298 (SaveData * param0, int param1, int param2, int param3, int pa CommInfo_SavePlayerRecord(param0); } -int sub_02039390 (SaveData * param0, int param1) +int sub_02039390(SaveData *param0, int param1) { int v0, v1; - DWCFriendData * v2 = CommInfo_DWCFriendData(param1); - UnkStruct_0202B370 * v3 = sub_0202B370(param0); + DWCFriendData *v2 = CommInfo_DWCFriendData(param1); + UnkStruct_0202B370 *v3 = sub_0202B370(param0); for (v0 = 0; v0 < 32; v0++) { if (DWC_IsEqualFriendData(v2, sub_0202AED8(v3, v0))) { diff --git a/src/unk_020393C8.c b/src/unk_020393C8.c index 8beee8de98..25351bab82 100644 --- a/src/unk_020393C8.c +++ b/src/unk_020393C8.c @@ -1,19 +1,18 @@ +#include "unk_020393C8.h" + #include #include -#include "inlines.h" - -#include "sys_task_manager.h" - #include "struct_defs/struct_020E5EB4.h" +#include "communication_system.h" +#include "heap.h" +#include "inlines.h" #include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "unk_020393C8.h" typedef struct UnkStruct_020393C8_t { int unk_00; @@ -24,21 +23,21 @@ typedef struct UnkStruct_020393C8_t { u8 unk_10; u8 unk_11; u8 unk_12; - const UnkStruct_020E5EB4 ** unk_14; - SysTask * unk_18; - GXOamAttr * unk_1C; + const UnkStruct_020E5EB4 **unk_14; + SysTask *unk_18; + GXOamAttr *unk_1C; } UnkStruct_020393C8; -static int inline inline_02039614(UnkStruct_020393C8 * param0); +static int inline inline_02039614(UnkStruct_020393C8 *param0); static int inline inline_02039614_1(int param0, int param1); -static void sub_02039428(SysTask * param0, void * param1); +static void sub_02039428(SysTask *param0, void *param1); static void sub_020394D0(int param0, BOOL param1, u32 param2, u32 param3); static void sub_02039530(int param0, BOOL param1, u32 param2); -static void sub_02039614(UnkStruct_020393C8 * param0); +static void sub_02039614(UnkStruct_020393C8 *param0); -UnkStruct_020393C8 * sub_020393C8 (u32 param0, u32 param1, int param2, int param3, BOOL param4, const UnkStruct_020E5EB4 * param5[], int param6) +UnkStruct_020393C8 *sub_020393C8(u32 param0, u32 param1, int param2, int param3, BOOL param4, const UnkStruct_020E5EB4 *param5[], int param6) { - UnkStruct_020393C8 * v0; + UnkStruct_020393C8 *v0; sub_020394D0(param6, param4, (16 * 2 * 14), param1); sub_02039530(param6, param4, param1); @@ -60,13 +59,13 @@ UnkStruct_020393C8 * sub_020393C8 (u32 param0, u32 param1, int param2, int param return v0; } -static void sub_02039428 (SysTask * param0, void * param1) +static void sub_02039428(SysTask *param0, void *param1) { - UnkStruct_020393C8 * v0 = (UnkStruct_020393C8 *)param1; + UnkStruct_020393C8 *v0 = (UnkStruct_020393C8 *)param1; sub_02039614(v0); } -static int inline inline_02039614 (UnkStruct_020393C8 * param0) +static int inline inline_02039614(UnkStruct_020393C8 *param0) { switch (param0->unk_11) { case 1: @@ -78,7 +77,7 @@ static int inline inline_02039614 (UnkStruct_020393C8 * param0) } } -static int inline inline_02039614_1 (int param0, int param1) +static int inline inline_02039614_1(int param0, int param1) { int v0, v1; @@ -110,12 +109,12 @@ static int inline inline_02039614_1 (int param0, int param1) } } -static inline void inline_02039440 (GXOamAttr * param0) +static inline void inline_02039440(GXOamAttr *param0) { G2_SetOBJAttr(param0, 0, 0, 0, GX_OAM_MODE_NORMAL, 0, GX_OAM_EFFECT_NODISPLAY, GX_OAM_SHAPE_16x16, GX_OAM_COLORMODE_16, 0, 0, 0); } -void sub_02039434 (UnkStruct_020393C8 * param0, int param1) +void sub_02039434(UnkStruct_020393C8 *param0, int param1) { if (param1 < 4) { param0->unk_04 = param1; @@ -123,7 +122,7 @@ void sub_02039434 (UnkStruct_020393C8 * param0, int param1) } } -void sub_02039440 (UnkStruct_020393C8 * param0) +void sub_02039440(UnkStruct_020393C8 *param0) { SysTask_Done(param0->unk_18); inline_02039440((GXOamAttr *)(HW_OAM)); @@ -135,7 +134,7 @@ void sub_02039440 (UnkStruct_020393C8 * param0) Heap_FreeToHeap(param0); } -void sub_02039474 (UnkStruct_020393C8 * param0, BOOL param1, u32 param2) +void sub_02039474(UnkStruct_020393C8 *param0, BOOL param1, u32 param2) { sub_020394D0(NNS_G2D_VRAM_TYPE_2DSUB, param0->unk_10, (16 * 2 * 14), param2); sub_02039530(NNS_G2D_VRAM_TYPE_2DSUB, param0->unk_10, param2); @@ -144,9 +143,9 @@ void sub_02039474 (UnkStruct_020393C8 * param0, BOOL param1, u32 param2) param0->unk_12 = 1; } -void * sub_020394A8 (u32 param0) +void *sub_020394A8(u32 param0) { - void * v0 = Heap_AllocFromHeapAtEnd(param0, 600); + void *v0 = Heap_AllocFromHeapAtEnd(param0, 600); ReadFileToBuffer("data/pl_wm.NCLR", &v0); DC_FlushRange(v0, 600); @@ -154,12 +153,12 @@ void * sub_020394A8 (u32 param0) return v0; } -static void sub_020394D0 (int param0, BOOL param1, u32 param2, u32 param3) +static void sub_020394D0(int param0, BOOL param1, u32 param2, u32 param3) { - void * v0 = Heap_AllocFromHeapAtEnd(param3, 600); + void *v0 = Heap_AllocFromHeapAtEnd(param3, 600); if (v0) { - NNSG2dPaletteData * v1; + NNSG2dPaletteData *v1; ReadFileToBuffer("data/pl_wm.NCLR", &v0); DC_FlushRange(v0, 600); @@ -175,12 +174,12 @@ static void sub_020394D0 (int param0, BOOL param1, u32 param2, u32 param3) } } -static void sub_02039530 (int param0, BOOL param1, u32 param2) +static void sub_02039530(int param0, BOOL param1, u32 param2) { - void * v0 = Heap_AllocFromHeapAtEnd(param2, 600); + void *v0 = Heap_AllocFromHeapAtEnd(param2, 600); if (v0) { - NNSG2dCharacterData * v1; + NNSG2dCharacterData *v1; int v2, v3, v4; if (param1) { @@ -233,34 +232,34 @@ static void sub_02039530 (int param0, BOOL param1, u32 param2) } static const UnkStruct_020E5EB4 Unk_020E5EB4[] = { - {0x1F0, 0x14}, - {0x1F4, 0x14}, - {0x1F8, 0x14}, - {0x1FC, 0x14}, - {0xFFFF, 0x0} + { 0x1F0, 0x14 }, + { 0x1F4, 0x14 }, + { 0x1F8, 0x14 }, + { 0x1FC, 0x14 }, + { 0xFFFF, 0x0 } }; static const UnkStruct_020E5EB4 Unk_020E5EAC[] = { - {0x1F0, 0x14}, - {0xFFFF, 0x0} + { 0x1F0, 0x14 }, + { 0xFFFF, 0x0 } }; static const UnkStruct_020E5EB4 Unk_020E5EA4[] = { - {0x1F4, 0x14}, - {0xFFFF, 0x0} + { 0x1F4, 0x14 }, + { 0xFFFF, 0x0 } }; static const UnkStruct_020E5EB4 Unk_020E5E9C[] = { - {0x1F8, 0x14}, - {0xFFFF, 0x0} + { 0x1F8, 0x14 }, + { 0xFFFF, 0x0 } }; static const UnkStruct_020E5EB4 Unk_020E5E94[] = { - {0x1FC, 0x14}, - {0xFFFF, 0x0} + { 0x1FC, 0x14 }, + { 0xFFFF, 0x0 } }; -static const UnkStruct_020E5EB4 * Unk_02100A38[] = { +static const UnkStruct_020E5EB4 *Unk_02100A38[] = { Unk_020E5EAC, Unk_020E5EA4, Unk_020E5E9C, @@ -268,13 +267,13 @@ static const UnkStruct_020E5EB4 * Unk_02100A38[] = { Unk_020E5EB4 }; -static UnkStruct_020393C8 * Unk_021C07D8 = NULL; +static UnkStruct_020393C8 *Unk_021C07D8 = NULL; -static void sub_02039614 (UnkStruct_020393C8 * param0) +static void sub_02039614(UnkStruct_020393C8 *param0) { - UnkStruct_020393C8 * v0 = param0; + UnkStruct_020393C8 *v0 = param0; int v1, v2; - GXOamAttr * v3; + GXOamAttr *v3; v1 = inline_02039614(v0); v2 = inline_02039614_1(v1, v0->unk_04); @@ -288,9 +287,9 @@ static void sub_02039614 (UnkStruct_020393C8 * param0) } } -void sub_02039720 (void) +void sub_02039720(void) { - UnkStruct_020393C8 * v0 = Unk_021C07D8; + UnkStruct_020393C8 *v0 = Unk_021C07D8; if (v0 == NULL) { return; @@ -299,7 +298,7 @@ void sub_02039720 (void) sub_02039614(v0); } -void sub_02039734 (void) +void sub_02039734(void) { BOOL v0 = 0; @@ -310,7 +309,7 @@ void sub_02039734 (void) sub_02039750(240, 0, v0, NNS_G2D_VRAM_TYPE_2DMAIN); } -void sub_02039750 (int param0, int param1, BOOL param2, int param3) +void sub_02039750(int param0, int param1, BOOL param2, int param3) { if (!sub_020334B8()) { return; @@ -323,7 +322,7 @@ void sub_02039750 (int param0, int param1, BOOL param2, int param3) Unk_021C07D8 = sub_020393C8(0, 91, param0, param1, param2, Unk_02100A38, param3); } -void sub_02039794 (void) +void sub_02039794(void) { if (Unk_021C07D8) { sub_02039440(Unk_021C07D8); @@ -331,21 +330,21 @@ void sub_02039794 (void) } } -void sub_020397B0 (int param0) +void sub_020397B0(int param0) { if (Unk_021C07D8) { sub_02039434(Unk_021C07D8, param0); } } -void sub_020397C8 (BOOL param0, u32 param1) +void sub_020397C8(BOOL param0, u32 param1) { if (Unk_021C07D8) { sub_02039474(Unk_021C07D8, param0, param1); } } -void sub_020397E4 (void) +void sub_020397E4(void) { if (CommSys_IsInitialized()) { if ((CommSys_ConnectedCount() > 1) || sub_020389B8()) { diff --git a/src/unk_02039814.c b/src/unk_02039814.c index 66057e2a7f..19e74436de 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -1,31 +1,29 @@ +#include "unk_02039814.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02002B7C.h" -#include "unk_0200A9DC.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02002B7C.h" +#include "unk_0200A9DC.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "unk_02039814.h" void sub_02039834(int param0, int param1, int param2); @@ -75,20 +73,20 @@ static const UnkStruct_ov61_0222C884 Unk_020E5EC8 = { 0x23 }; -static void sub_02039814 (void) +static void sub_02039814(void) { OS_SetIrqCheckFlag(OS_IE_V_BLANK); MI_WaitDma(GX_DEFAULT_DMAID); } -void sub_02039834 (int param0, int param1, int param2) +void sub_02039834(int param0, int param1, int param2) { - BGL * v0; + BGL *v0; Window v1; - MessageLoader * v2; - Strbuf* v3; - Strbuf* v4; - StringTemplate * v5; + MessageLoader *v2; + Strbuf *v3; + Strbuf *v4; + StringTemplate *v5; int v6; switch (param1) { diff --git a/src/unk_02039A58.c b/src/unk_02039A58.c index 313da8a9ff..89ea8a3257 100644 --- a/src/unk_02039A58.c +++ b/src/unk_02039A58.c @@ -1,23 +1,24 @@ +#include "unk_02039A58.h" + #include #include #include "struct_defs/struct_02039A58.h" -#include "unk_02039A58.h" #include "unk_0209C390.h" static const CommCmdTable Unk_020E5F24[] = { - {sub_0209C3D0, sub_0209C3C8, NULL}, - {sub_0209C3E0, sub_0209C3C4, NULL}, - {sub_0209C3F0, sub_0209C3CC, NULL} + { sub_0209C3D0, sub_0209C3C8, NULL }, + { sub_0209C3E0, sub_0209C3C4, NULL }, + { sub_0209C3F0, sub_0209C3CC, NULL } }; -const CommCmdTable * sub_02039A58 (void) +const CommCmdTable *sub_02039A58(void) { return Unk_020E5F24; } -int sub_02039A60 (void) +int sub_02039A60(void) { return sizeof(Unk_020E5F24) / sizeof(CommCmdTable); } diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index 7278bf64e1..9c9d2d9d78 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -1,30 +1,27 @@ #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" #include "unk_02000C88.h" #include "unk_02002B7C.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" void sub_0201777C(void); @@ -76,12 +73,12 @@ static const UnkStruct_ov61_0222C884 Unk_020E5F48 = { 0x23 }; -void sub_02039A64 (int param0, int param1) +void sub_02039A64(int param0, int param1) { - BGL * v0; + BGL *v0; Window v1; - MessageLoader * v2; - Strbuf* v3; + MessageLoader *v2; + Strbuf *v3; int v4; v4 = 16; diff --git a/src/unk_02039C80.c b/src/unk_02039C80.c index 4ee0ab7445..f471ab44e6 100644 --- a/src/unk_02039C80.c +++ b/src/unk_02039C80.c @@ -1,12 +1,13 @@ +#include "unk_02039C80.h" + #include #include #include "struct_decls/struct_02039E30_decl.h" -#include "narc.h" #include "heap.h" -#include "unk_02039C80.h" #include "map_header.h" +#include "narc.h" typedef struct { u8 unk_00; @@ -28,12 +29,12 @@ typedef struct UnkStruct_02039EBC_t { u16 unk_00[900]; } UnkStruct_02039EBC; -static void sub_02039C80 (UnkStruct_02039C80 * param0, const u16 param1, int param2) +static void sub_02039C80(UnkStruct_02039C80 *param0, const u16 param1, int param2) { u8 v0, v1; u8 v2; - void * v3; - u8 * v4; + void *v3; + u8 *v4; { int v5; @@ -91,14 +92,14 @@ static void sub_02039C80 (UnkStruct_02039C80 * param0, const u16 param1, int par Heap_FreeToHeap(v3); } -UnkStruct_02039E30 * sub_02039D6C (void) +UnkStruct_02039E30 *sub_02039D6C(void) { return sub_02039D78(11); } -UnkStruct_02039E30 * sub_02039D78 (u32 param0) +UnkStruct_02039E30 *sub_02039D78(u32 param0) { - UnkStruct_02039E30 * v0; + UnkStruct_02039E30 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02039E30)); @@ -109,7 +110,7 @@ UnkStruct_02039E30 * sub_02039D78 (u32 param0) return v0; } -void sub_02039D90 (UnkStruct_02039E30 * param0, UnkStruct_02039E30 * param1) +void sub_02039D90(UnkStruct_02039E30 *param0, UnkStruct_02039E30 *param1) { GF_ASSERT(param1 != NULL); GF_ASSERT(param0 != NULL); @@ -118,7 +119,7 @@ void sub_02039D90 (UnkStruct_02039E30 * param0, UnkStruct_02039E30 * param1) *param1 = *param0; } -void sub_02039DC0 (const int param0, UnkStruct_02039E30 * param1) +void sub_02039DC0(const int param0, UnkStruct_02039E30 *param1) { u16 v0; @@ -130,30 +131,30 @@ void sub_02039DC0 (const int param0, UnkStruct_02039E30 * param1) param1->unk_00 = param1->unk_04.unk_01; } -void sub_02039DE4 (UnkStruct_02039E30 * const param0) +void sub_02039DE4(UnkStruct_02039E30 *const param0) { Heap_FreeToHeap(param0); } -u16 sub_02039DEC (int param0, const UnkStruct_02039E30 * param1) +u16 sub_02039DEC(int param0, const UnkStruct_02039E30 *param1) { - GF_ASSERT((param0 < (param1->unk_00 * param1->unk_01))); + GF_ASSERT(param0 < (param1->unk_00 * param1->unk_01)); return param1->unk_04.unk_A8E[param0]; } -int sub_02039E10 (const UnkStruct_02039E30 * param0) +int sub_02039E10(const UnkStruct_02039E30 *param0) { - GF_ASSERT((param0 != NULL)); + GF_ASSERT(param0 != NULL); return param0->unk_00; } -int sub_02039E20 (const UnkStruct_02039E30 * param0) +int sub_02039E20(const UnkStruct_02039E30 *param0) { - GF_ASSERT((param0 != NULL)); + GF_ASSERT(param0 != NULL); return param0->unk_01; } -u16 sub_02039E30 (const UnkStruct_02039E30 * param0, int param1, int param2) +u16 sub_02039E30(const UnkStruct_02039E30 *param0, int param1, int param2) { int v0 = param0->unk_00; int v1 = param0->unk_01; @@ -164,7 +165,7 @@ u16 sub_02039E30 (const UnkStruct_02039E30 * param0, int param1, int param2) return param0->unk_04.unk_02[param1 + param2 * v0]; } -u16 sub_02039E68 (const UnkStruct_02039E30 * param0, const int param1) +u16 sub_02039E68(const UnkStruct_02039E30 *param0, const int param1) { int v0 = param0->unk_00 * param0->unk_01; @@ -172,12 +173,12 @@ u16 sub_02039E68 (const UnkStruct_02039E30 * param0, const int param1) return param0->unk_04.unk_02[param1]; } -u8 sub_02039E88 (const UnkStruct_02039E30 * param0) +u8 sub_02039E88(const UnkStruct_02039E30 *param0) { return param0->unk_02; } -int sub_02039E8C (const UnkStruct_02039E30 * param0, const int param1, const int param2, const int param3, const int param4) +int sub_02039E8C(const UnkStruct_02039E30 *param0, const int param1, const int param2, const int param3, const int param4) { GF_ASSERT(param2 < param4); GF_ASSERT((param2 + param3 * param4) < (30 * 30)); @@ -185,12 +186,12 @@ int sub_02039E8C (const UnkStruct_02039E30 * param0, const int param1, const int return param0->unk_04.unk_70A[param2 + param3 * param4]; } -UnkStruct_02039EBC * sub_02039EBC (const u32 param0) +UnkStruct_02039EBC *sub_02039EBC(const u32 param0) { int v0; - void * v1; - u8 * v2; - UnkStruct_02039EBC * v3; + void *v1; + u8 *v2; + UnkStruct_02039EBC *v3; v3 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02039EBC)); v1 = NARC_AllocAtEndAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__MAPMATRIX__MAP_MATRIX, 0, param0); @@ -212,18 +213,18 @@ UnkStruct_02039EBC * sub_02039EBC (const u32 param0) return v3; } -void sub_02039EF0 (UnkStruct_02039EBC * param0) +void sub_02039EF0(UnkStruct_02039EBC *param0) { GF_ASSERT(param0 != NULL); Heap_FreeToHeap(param0); } -int sub_02039F04 (const UnkStruct_02039EBC * param0, const u32 param1, const u32 param2) +int sub_02039F04(const UnkStruct_02039EBC *param0, const u32 param1, const u32 param2) { return param0->unk_00[param1 + param2 * 30]; } -int sub_02039F10 (const int param0, const u16 param1, const u16 param2) +int sub_02039F10(const int param0, const u16 param1, const u16 param2) { UnkStruct_02039C80 v0; u16 v1, v2; @@ -236,22 +237,22 @@ int sub_02039F10 (const int param0, const u16 param1, const u16 param2) return v0.unk_02[param2 * v0.unk_01 + param1]; } -const u16 sub_02039F74 (const int param0, const UnkStruct_02039E30 * param1) +const u16 sub_02039F74(const int param0, const UnkStruct_02039E30 *param1) { u16 v0; int v1 = param0 % param1->unk_00; int v2 = param0 / param1->unk_00; - GF_ASSERT((param1 != NULL)); + GF_ASSERT(param1 != NULL); v0 = sub_02039DEC(param0, param1); return v0; } -void sub_02039F8C (UnkStruct_02039E30 * param0) +void sub_02039F8C(UnkStruct_02039E30 *param0) { - u16 * Unk_ov5_0220210C = param0->unk_04.unk_A8E; - u8 * v1 = param0->unk_04.unk_70A; + u16 *Unk_ov5_0220210C = param0->unk_04.unk_A8E; + u8 *v1 = param0->unk_04.unk_70A; int v2 = param0->unk_01; int v3 = param0->unk_00; int v4, v5; @@ -271,10 +272,10 @@ void sub_02039F8C (UnkStruct_02039E30 * param0) v1[24 + v3 * 22] = 2; } -void sub_02039FE0 (UnkStruct_02039E30 * param0) +void sub_02039FE0(UnkStruct_02039E30 *param0) { int v0, v1; - u16 * Unk_ov5_0220210C = param0->unk_04.unk_A8E; + u16 *Unk_ov5_0220210C = param0->unk_04.unk_A8E; int v3 = param0->unk_01; int v4 = param0->unk_00; diff --git a/src/unk_0203A7D8.c b/src/unk_0203A7D8.c index 9c9112f4b3..f37e1b7d3b 100644 --- a/src/unk_0203A7D8.c +++ b/src/unk_0203A7D8.c @@ -1,12 +1,13 @@ +#include "unk_0203A7D8.h" + #include #include -#include "inlines.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" -#include "struct_defs/struct_02049FA8.h" -#include "unk_0203A7D8.h" +#include "inlines.h" #include "vars_flags.h" typedef struct { @@ -22,29 +23,29 @@ typedef struct { } UnkStruct_020E97B4; static const UnkStruct_020E97B4 Unk_020E97B4[] = { - { 0x19E, 0x8, 0x8, 0x19B, 0x74, 0x376, 0x1, 0x1, 0x0 }, - { 0x1A4, 0x8, 0x6, 0x1A2, 0xB1, 0x34B, 0x1, 0x1, 0x1 }, - { 0x1AC, 0x8, 0x6, 0x1AA, 0xB0, 0x29B, 0x1, 0x1, 0x2 }, - { 0x1B3, 0x8, 0x6, 0x1B1, 0x236, 0x291, 0x1, 0x1, 0x3 }, - { 0x1BB, 0x8, 0x6, 0x1BA, 0x1D8, 0x21B, 0x1, 0x1, 0x4 }, - { 0x6, 0x8, 0x6, 0x3, 0xB4, 0x309, 0x1, 0x1, 0x7 }, - { 0x24, 0x8, 0x6, 0x21, 0x3A, 0x2D3, 0x1, 0x1, 0x8 }, - { 0x30, 0x8, 0x6, 0x2D, 0x12F, 0x2F5, 0x1, 0x1, 0x9 }, - { 0x45, 0x8, 0x6, 0x41, 0x131, 0x213, 0x1, 0x1, 0xA }, - { 0x65, 0x8, 0x6, 0x56, 0x1D1, 0x2BA, 0x1, 0x1, 0xB }, - { 0x7B, 0x8, 0x6, 0x78, 0x258, 0x330, 0x1, 0x1, 0xC }, - { 0x86, 0x8, 0x6, 0x84, 0x2CD, 0x264, 0x1, 0x1, 0xD }, - { 0x97, 0x8, 0x6, 0x96, 0x35C, 0x311, 0x1, 0x1, 0xE }, - { 0xA8, 0x8, 0x6, 0xA5, 0x17B, 0xEA, 0x1, 0x1, 0xF }, - { 0xAD, 0x8, 0x6, 0xAC, 0x34A, 0x257, 0x1, 0x0, 0x10 }, - { 0xBD, 0x8, 0x6, 0xBC, 0x287, 0x1AE, 0x1, 0x1, 0x11 }, - { 0x1C4, 0x8, 0x6, 0x1C2, 0x293, 0x153, 0x1, 0x1, 0x5 }, - { 0x1CB, 0x8, 0x6, 0x1C9, 0x322, 0x1D9, 0x1, 0x1, 0x6 }, - { 0x189, 0x8, 0x6, 0x188, 0x132, 0x38E, 0x0, 0x0, 0x42 }, - { 0xAF, 0x4, 0x3, 0xAC, 0x34F, 0x230, 0x1, 0x0, 0x44 } + { 0x19E, 0x8, 0x8, 0x19B, 0x74, 0x376, 0x1, 0x1, 0x0 }, + { 0x1A4, 0x8, 0x6, 0x1A2, 0xB1, 0x34B, 0x1, 0x1, 0x1 }, + { 0x1AC, 0x8, 0x6, 0x1AA, 0xB0, 0x29B, 0x1, 0x1, 0x2 }, + { 0x1B3, 0x8, 0x6, 0x1B1, 0x236, 0x291, 0x1, 0x1, 0x3 }, + { 0x1BB, 0x8, 0x6, 0x1BA, 0x1D8, 0x21B, 0x1, 0x1, 0x4 }, + { 0x6, 0x8, 0x6, 0x3, 0xB4, 0x309, 0x1, 0x1, 0x7 }, + { 0x24, 0x8, 0x6, 0x21, 0x3A, 0x2D3, 0x1, 0x1, 0x8 }, + { 0x30, 0x8, 0x6, 0x2D, 0x12F, 0x2F5, 0x1, 0x1, 0x9 }, + { 0x45, 0x8, 0x6, 0x41, 0x131, 0x213, 0x1, 0x1, 0xA }, + { 0x65, 0x8, 0x6, 0x56, 0x1D1, 0x2BA, 0x1, 0x1, 0xB }, + { 0x7B, 0x8, 0x6, 0x78, 0x258, 0x330, 0x1, 0x1, 0xC }, + { 0x86, 0x8, 0x6, 0x84, 0x2CD, 0x264, 0x1, 0x1, 0xD }, + { 0x97, 0x8, 0x6, 0x96, 0x35C, 0x311, 0x1, 0x1, 0xE }, + { 0xA8, 0x8, 0x6, 0xA5, 0x17B, 0xEA, 0x1, 0x1, 0xF }, + { 0xAD, 0x8, 0x6, 0xAC, 0x34A, 0x257, 0x1, 0x0, 0x10 }, + { 0xBD, 0x8, 0x6, 0xBC, 0x287, 0x1AE, 0x1, 0x1, 0x11 }, + { 0x1C4, 0x8, 0x6, 0x1C2, 0x293, 0x153, 0x1, 0x1, 0x5 }, + { 0x1CB, 0x8, 0x6, 0x1C9, 0x322, 0x1D9, 0x1, 0x1, 0x6 }, + { 0x189, 0x8, 0x6, 0x188, 0x132, 0x38E, 0x0, 0x0, 0x42 }, + { 0xAF, 0x4, 0x3, 0xAC, 0x34F, 0x230, 0x1, 0x0, 0x44 } }; -static int sub_0203A7D8 (int param0) +static int sub_0203A7D8(int param0) { if ((param0 <= 0) || (param0 > NELEMS(Unk_020E97B4))) { GF_ASSERT(0); @@ -55,12 +56,12 @@ static int sub_0203A7D8 (int param0) return param0; } -int sub_0203A7EC (void) +int sub_0203A7EC(void) { return 1; } -void sub_0203A7F0 (int param0, Location * location) +void sub_0203A7F0(int param0, Location *location) { param0 = sub_0203A7D8(param0); @@ -71,7 +72,7 @@ void sub_0203A7F0 (int param0, Location * location) location->unk_10 = 1; } -void sub_0203A824 (int param0, Location * location) +void sub_0203A824(int param0, Location *location) { param0 = sub_0203A7D8(param0); @@ -82,7 +83,7 @@ void sub_0203A824 (int param0, Location * location) location->unk_10 = 0; } -int sub_0203A858 (int param0) +int sub_0203A858(int param0) { int v0; @@ -95,7 +96,7 @@ int sub_0203A858 (int param0) return 0; } -int sub_0203A87C (int param0) +int sub_0203A87C(int param0) { int v0; @@ -108,7 +109,7 @@ int sub_0203A87C (int param0) return 0; } -int sub_0203A8A0 (int param0, int param1, int param2) +int sub_0203A8A0(int param0, int param1, int param2) { int v0; int v1 = param1 / 32; @@ -128,7 +129,7 @@ int sub_0203A8A0 (int param0, int param1, int param2) return v3; } -void sub_0203A8E8 (FieldSystem * fieldSystem, int param1) +void sub_0203A8E8(FieldSystem *fieldSystem, int param1) { int v0; @@ -140,7 +141,7 @@ void sub_0203A8E8 (FieldSystem * fieldSystem, int param1) } } -BOOL sub_0203A920 (FieldSystem * fieldSystem, int param1) +BOOL sub_0203A920(FieldSystem *fieldSystem, int param1) { int v0 = sub_0203A7D8(param1); return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), Unk_020E97B4[v0].unk_0E); diff --git a/src/unk_0203A944.c b/src/unk_0203A944.c index 2e08025968..9a44bef20d 100644 --- a/src/unk_0203A944.c +++ b/src/unk_0203A944.c @@ -1,1854 +1,1854 @@ +#include "unk_0203A944.h" + #include #include -#include "inlines.h" +#include "constants/overworld_weather.h" -#include "field/field_system.h" #include "struct_defs/struct_02055BA8.h" +#include "field/field_system.h" + +#include "inlines.h" +#include "map_header.h" #include "rtc.h" #include "unk_02025CB0.h" -#include "map_header.h" -#include "unk_0203A944.h" #include "unk_020559DC.h" -#include "constants/overworld_weather.h" - static const u8 Unk_020E98F4[] = { - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_THUNDERSTORM, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HAILING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_BLIZZARD, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HAILING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_BLIZZARD, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HAILING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HAILING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HAILING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HAILING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HAILING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_THUNDERSTORM, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_THUNDERSTORM, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_THUNDERSTORM, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HAILING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_BLIZZARD, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HAILING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_THUNDERSTORM, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_BLIZZARD, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_BLIZZARD, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_BLIZZARD, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HAILING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_BLIZZARD, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_THUNDERSTORM, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLOUDY, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_BLIZZARD, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_HEAVY_RAIN, - OVERWORLD_WEATHER_CLEAR, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING, - OVERWORLD_WEATHER_THUNDERSTORM, - OVERWORLD_WEATHER_RAINING, - OVERWORLD_WEATHER_BLIZZARD, - OVERWORLD_WEATHER_HEAVY_SNOW, - OVERWORLD_WEATHER_SNOWING + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_THUNDERSTORM, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HAILING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_BLIZZARD, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HAILING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_BLIZZARD, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HAILING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HAILING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HAILING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HAILING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HAILING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_THUNDERSTORM, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_THUNDERSTORM, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_THUNDERSTORM, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HAILING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_BLIZZARD, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HAILING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_THUNDERSTORM, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_BLIZZARD, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_BLIZZARD, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_BLIZZARD, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HAILING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_BLIZZARD, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_THUNDERSTORM, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLOUDY, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_BLIZZARD, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_HEAVY_RAIN, + OVERWORLD_WEATHER_CLEAR, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING, + OVERWORLD_WEATHER_THUNDERSTORM, + OVERWORLD_WEATHER_RAINING, + OVERWORLD_WEATHER_BLIZZARD, + OVERWORLD_WEATHER_HEAVY_SNOW, + OVERWORLD_WEATHER_SNOWING }; - -int FieldSystem_GetWeather (FieldSystem * fieldSystem, int param1) +int FieldSystem_GetWeather(FieldSystem *fieldSystem, int param1) { int v0; @@ -1860,7 +1860,7 @@ int FieldSystem_GetWeather (FieldSystem * fieldSystem, int param1) { int v1; - UnkStruct_02055BA8 * v2 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v2 = sub_02025CD8(fieldSystem->saveData); v1 = DayNumberForDate(&v2->unk_04) - 1; GF_ASSERT(v1 >= 0 && v1 < 366); diff --git a/src/unk_0203C954.c b/src/unk_0203C954.c index ed75dcf334..15f8027c75 100644 --- a/src/unk_0203C954.c +++ b/src/unk_0203C954.c @@ -1,3 +1,5 @@ +#include "unk_0203C954.h" + #include #include @@ -6,18 +8,17 @@ #include "field/field_system.h" -#include "unk_0203C954.h" +#include "map_header_data.h" +#include "map_object.h" +#include "player_avatar.h" #include "unk_0203E880.h" #include "unk_02054D00.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" -#include "map_header_data.h" -#include "map_object.h" -static u8 sub_0203CB18(FieldSystem * fieldSystem, const BgEvent * param1); -static u8 sub_0203CAEC(FieldSystem * fieldSystem, const BgEvent * param1); +static u8 sub_0203CB18(FieldSystem *fieldSystem, const BgEvent *param1); +static u8 sub_0203CAEC(FieldSystem *fieldSystem, const BgEvent *param1); -static int sub_0203C954 (FieldSystem * fieldSystem, int * param1, int * param2) +static int sub_0203C954(FieldSystem *fieldSystem, int *param1, int *param2) { int v0 = PlayerAvatar_GetDir(fieldSystem->playerAvatar); @@ -42,9 +43,9 @@ static int sub_0203C954 (FieldSystem * fieldSystem, int * param1, int * param2) return v0; } -static u8 sub_0203C9B0 (PlayerAvatar * playerAvatar, MapObject * param1) +static u8 sub_0203C9B0(PlayerAvatar *playerAvatar, MapObject *param1) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); if (sub_020630DC(v0) == sub_020630DC(param1)) { return 1; @@ -53,7 +54,7 @@ static u8 sub_0203C9B0 (PlayerAvatar * playerAvatar, MapObject * param1) return 0; } -void sub_0203C9D4 (FieldSystem * fieldSystem, MapObject ** param1) +void sub_0203C9D4(FieldSystem *fieldSystem, MapObject **param1) { int v0, v1; int v2; @@ -82,7 +83,7 @@ void sub_0203C9D4 (FieldSystem * fieldSystem, MapObject ** param1) *param1 = sub_0206326C(fieldSystem->mapObjMan, v0, v1, 0); } -u8 sub_0203CA40 (FieldSystem * fieldSystem, MapObject ** param1) +u8 sub_0203CA40(FieldSystem *fieldSystem, MapObject **param1) { sub_0203C9D4(fieldSystem, param1); @@ -95,9 +96,9 @@ u8 sub_0203CA40 (FieldSystem * fieldSystem, MapObject ** param1) return 0; } -u16 sub_0203CA6C (FieldSystem * fieldSystem, const BgEvent * param1, int param2) +u16 sub_0203CA6C(FieldSystem *fieldSystem, const BgEvent *param1, int param2) { - const BgEvent * v0 = param1; + const BgEvent *v0 = param1; int v1, v2; int v3; @@ -120,7 +121,7 @@ u16 sub_0203CA6C (FieldSystem * fieldSystem, const BgEvent * param1, int param2) return 0xffff; } -static u8 sub_0203CAEC (FieldSystem * fieldSystem, const BgEvent * param1) +static u8 sub_0203CAEC(FieldSystem *fieldSystem, const BgEvent *param1) { if (param1->type != 2) { return 0; @@ -133,7 +134,7 @@ static u8 sub_0203CAEC (FieldSystem * fieldSystem, const BgEvent * param1) return 1; } -static u8 sub_0203CB18 (FieldSystem * fieldSystem, const BgEvent * param1) +static u8 sub_0203CB18(FieldSystem *fieldSystem, const BgEvent *param1) { if (param1->playerFacingDir == 4) { return 1; @@ -165,7 +166,7 @@ static u8 sub_0203CB18 (FieldSystem * fieldSystem, const BgEvent * param1) return 0; } -u16 sub_0203CB80 (FieldSystem * fieldSystem, const BgEvent * param1, int param2) +u16 sub_0203CB80(FieldSystem *fieldSystem, const BgEvent *param1, int param2) { int v1, v2; int v3; @@ -174,7 +175,7 @@ u16 sub_0203CB80 (FieldSystem * fieldSystem, const BgEvent * param1, int param2) return 0xffff; } - const BgEvent * v0 = param1; + const BgEvent *v0 = param1; sub_0203C954(fieldSystem, &v1, &v2); for (v3 = 0; v3 < param2; v3++) { @@ -186,7 +187,7 @@ u16 sub_0203CB80 (FieldSystem * fieldSystem, const BgEvent * param1, int param2) return 0xffff; } -u8 sub_0203CBE0 (FieldSystem * fieldSystem, MapObject ** param1) +u8 sub_0203CBE0(FieldSystem *fieldSystem, MapObject **param1) { if (PlayerAvatar_GetDir(fieldSystem->playerAvatar) != 0) { return 0; @@ -203,11 +204,11 @@ u8 sub_0203CBE0 (FieldSystem * fieldSystem, MapObject ** param1) return 0; } -u16 sub_0203CC14 (FieldSystem * fieldSystem, void * param1, int param2) +u16 sub_0203CC14(FieldSystem *fieldSystem, void *param1, int param2) { int v3; - const CoordEvent * v0 = param1; + const CoordEvent *v0 = param1; int v1 = Player_GetXPos(fieldSystem->playerAvatar); int v2 = Player_GetZPos(fieldSystem->playerAvatar); diff --git a/src/unk_0203D178.c b/src/unk_0203D178.c index 6d93edb6f2..811d33cd6d 100644 --- a/src/unk_0203D178.c +++ b/src/unk_0203D178.c @@ -1,15 +1,15 @@ +#include "unk_0203D178.h" + #include #include #include "struct_decls/struct_0203A790_decl.h" -#include "savedata.h" - #include "struct_defs/struct_02049FA8.h" #include "field_overworld_state.h" -#include "unk_0203D178.h" +#include "savedata.h" -void sub_0203D178 (Location * param0) +void sub_0203D178(Location *param0) { static const Location v0 = { 415, -1, 4, 6, 0 @@ -18,7 +18,7 @@ void sub_0203D178 (Location * param0) *param0 = v0; } -void sub_0203D190 (Location * param0) +void sub_0203D190(Location *param0) { static const Location v0 = { 411, -1, 116, 886, 1 @@ -27,10 +27,10 @@ void sub_0203D190 (Location * param0) *param0 = v0; } -void sub_0203D1A8 (SaveData * param0) +void sub_0203D1A8(SaveData *param0) { - FieldOverworldState * v0 = SaveData_GetFieldOverworldState(param0); - Location * v1 = sub_0203A720(v0); + FieldOverworldState *v0 = SaveData_GetFieldOverworldState(param0); + Location *v1 = sub_0203A720(v0); sub_0203D178(v1); } diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index f3df0d9208..c204f81d94 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -1,8 +1,8 @@ +#include "unk_0203D1B8.h" + #include #include -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029D04_decl.h" #include "struct_decls/struct_0202A750_decl.h" @@ -10,25 +10,12 @@ #include "struct_decls/struct_0202C834_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207AE68_decl.h" #include "struct_decls/struct_0209747C_decl.h" -#include "savedata.h" -#include "overlay007/struct_ov7_0224BEFC_decl.h" - -#include "constdata/const_020F410C.h" -#include "constdata/const_020EA328.h" -#include "constdata/const_020F6890.h" -#include "constdata/const_020EA02C.h" -#include "constdata/const_020EA358.h" -#include "constdata/const_020F2FCC.h" -#include "constdata/const_020F1E88.h" -#include "overlay084/const_ov84_02241130.h" -#include "constdata/const_020F2DAC.h" - +#include "struct_decls/struct_party_decl.h" +#include "struct_defs/choose_starter_data.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0202DF8C.h" -#include "field/field_system.h" #include "struct_defs/struct_0203D8AC.h" #include "struct_defs/struct_0203D8EC.h" #include "struct_defs/struct_0203D9B8.h" @@ -45,7 +32,6 @@ #include "struct_defs/struct_0203E608.h" #include "struct_defs/struct_0203E6C0.h" #include "struct_defs/struct_02042434.h" -#include "struct_defs/choose_starter_data.h" #include "struct_defs/struct_020556C4.h" #include "struct_defs/struct_020684D0.h" #include "struct_defs/struct_0206BC70.h" @@ -54,32 +40,80 @@ #include "struct_defs/struct_0208737C.h" #include "struct_defs/struct_02097728.h" #include "struct_defs/struct_02098C44.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_020997B8.h" + +#include "battle/ov16_0223B140.h" +#include "choose_starter/choose_starter_app.h" +#include "dw_warp/dw_warp.h" +#include "field/field_system.h" +#include "library_tv/library_tv.h" +#include "overlay005/ov5_021E622C.h" #include "overlay006/battle_params.h" #include "overlay006/struct_ov6_02246254.h" +#include "overlay007/ov7_0224BE9C.h" +#include "overlay007/struct_ov7_0224BEFC_decl.h" +#include "overlay019/ov19_021D0D80.h" +#include "overlay020/ov20_021D0D80.h" +#include "overlay021/ov21_021D0D80.h" +#include "overlay022/ov22_02255D44.h" +#include "overlay022/ov22_0225B660.h" +#include "overlay058/ov58_021D0D80.h" +#include "overlay059/ov59_021D0D80.h" +#include "overlay064/ov64_0222DCE0.h" +#include "overlay071/ov71_0223B140.h" +#include "overlay072/ov72_0223D7A0.h" +#include "overlay074/ov74_021D0D80.h" +#include "overlay080/ov80_021D0D80.h" +#include "overlay081/ov81_021D0D80.h" +#include "overlay084/const_ov84_02241130.h" +#include "overlay084/ov84_0223B5A0.h" +#include "overlay085/ov85_02241440.h" +#include "overlay086/ov86_0223B140.h" +#include "overlay087/ov87_021D0D80.h" +#include "overlay088/ov88_0223B140.h" #include "overlay088/struct_ov88_0223C370.h" +#include "overlay090/ov90_021D0D80.h" #include "overlay090/struct_ov90_021D0D80.h" +#include "overlay091/ov91_021D0D80.h" +#include "overlay092/ov92_021D0D80.h" +#include "overlay093/ov93_021D0D80.h" +#include "overlay093/ov93_021D111C.h" +#include "overlay094/ov94_0223BCB0.h" +#include "overlay095/ov95_02246C20.h" +#include "overlay096/ov96_0223B6A0.h" +#include "overlay099/ov99_021D0D80.h" +#include "overlay101/ov101_021D0D80.h" +#include "overlay102/ov102_021D0D80.h" +#include "overlay110/ov110_021D0D80.h" +#include "overlay111/ov111_021D0D80.h" +#include "savedata/save_table.h" -#include "rtc.h" +#include "bag.h" +#include "coins.h" +#include "field_overworld_state.h" +#include "field_system.h" +#include "game_options.h" +#include "heap.h" #include "overlay_manager.h" +#include "party.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "poketch_data.h" +#include "rtc.h" +#include "savedata.h" +#include "savedata_misc.h" +#include "strbuf.h" +#include "trainer_info.h" #include "unk_02017498.h" -#include "heap.h" #include "unk_0201D15C.h" -#include "strbuf.h" -#include "savedata/save_table.h" -#include "savedata.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" -#include "savedata_misc.h" -#include "game_options.h" #include "unk_02028124.h" #include "unk_020298BC.h" #include "unk_0202ACE0.h" #include "unk_0202B37C.h" -#include "coins.h" #include "unk_0202C7FC.h" #include "unk_0202C858.h" #include "unk_0202CD50.h" @@ -88,70 +122,33 @@ #include "unk_0202DA40.h" #include "unk_020366A0.h" #include "unk_02038FFC.h" -#include "field_overworld_state.h" -#include "field_system.h" -#include "unk_0203D1B8.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_020553DC.h" #include "unk_02055808.h" #include "unk_020559DC.h" -#include "poketch_data.h" #include "unk_0205B33C.h" -#include "player_avatar.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_0206B70C.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "party.h" #include "unk_0207A274.h" #include "unk_0207AE68.h" #include "unk_0207CB08.h" -#include "bag.h" #include "unk_0208694C.h" -#include "pokemon_summary_app.h" #include "unk_0209747C.h" #include "unk_02097624.h" #include "unk_02098218.h" #include "unk_020989DC.h" -#include "overlay005/ov5_021E622C.h" -#include "overlay007/ov7_0224BE9C.h" -#include "battle/ov16_0223B140.h" -#include "overlay019/ov19_021D0D80.h" -#include "overlay020/ov20_021D0D80.h" -#include "overlay021/ov21_021D0D80.h" -#include "overlay022/ov22_02255D44.h" -#include "overlay022/ov22_0225B660.h" -#include "overlay058/ov58_021D0D80.h" -#include "overlay059/ov59_021D0D80.h" -#include "overlay064/ov64_0222DCE0.h" -#include "overlay071/ov71_0223B140.h" -#include "overlay072/ov72_0223D7A0.h" -#include "overlay074/ov74_021D0D80.h" -#include "choose_starter/choose_starter_app.h" -#include "overlay080/ov80_021D0D80.h" -#include "overlay081/ov81_021D0D80.h" -#include "overlay084/ov84_0223B5A0.h" -#include "overlay085/ov85_02241440.h" -#include "overlay086/ov86_0223B140.h" -#include "overlay087/ov87_021D0D80.h" -#include "overlay088/ov88_0223B140.h" -#include "overlay090/ov90_021D0D80.h" -#include "overlay091/ov91_021D0D80.h" -#include "overlay092/ov92_021D0D80.h" -#include "overlay093/ov93_021D0D80.h" -#include "overlay093/ov93_021D111C.h" -#include "overlay094/ov94_0223BCB0.h" -#include "overlay095/ov95_02246C20.h" -#include "overlay096/ov96_0223B6A0.h" -#include "overlay099/ov99_021D0D80.h" -#include "overlay101/ov101_021D0D80.h" -#include "overlay102/ov102_021D0D80.h" -#include "overlay110/ov110_021D0D80.h" -#include "overlay111/ov111_021D0D80.h" -#include "library_tv/library_tv.h" -#include "dw_warp/dw_warp.h" +#include "vars_flags.h" + +#include "constdata/const_020EA02C.h" +#include "constdata/const_020EA328.h" +#include "constdata/const_020EA358.h" +#include "constdata/const_020F1E88.h" +#include "constdata/const_020F2DAC.h" +#include "constdata/const_020F2FCC.h" +#include "constdata/const_020F410C.h" +#include "constdata/const_020F6890.h" FS_EXTERN_OVERLAY(battle); FS_EXTERN_OVERLAY(overlay19); @@ -191,38 +188,38 @@ FS_EXTERN_OVERLAY(dw_warp); typedef struct { int unk_00; - PartyManagementData * unk_04; - PokemonSummary * unk_08; + PartyManagementData *unk_04; + PokemonSummary *unk_08; } UnkStruct_0203D444; typedef struct { - u16 * unk_00; - u16 * unk_04; - u16 * unk_08; - UnkStruct_0209747C * unk_0C; + u16 *unk_00; + u16 *unk_04; + u16 *unk_08; + UnkStruct_0209747C *unk_0C; } UnkStruct_0203D764; typedef struct { u32 unk_00; - u16 * unk_04; + u16 *unk_04; BOOL unk_08; - UnkStruct_0203DA00 * unk_0C; + UnkStruct_0203DA00 *unk_0C; } UnkStruct_0203DA64; typedef struct { int unk_00; UnkStruct_ov88_0223C370 unk_04; UnkStruct_ov6_02246254 unk_48; - UnkStruct_0207AE68 * unk_60; + UnkStruct_0207AE68 *unk_60; int unk_64; } UnkStruct_0203DBF0; typedef struct { int unk_00; int unk_04; - u16 * unk_08; - UnkStruct_0208737C * unk_0C; - Strbuf* unk_10; + u16 *unk_08; + UnkStruct_0208737C *unk_0C; + Strbuf *unk_10; } UnkStruct_0203DE98; typedef struct { @@ -231,15 +228,15 @@ typedef struct { UnkStruct_0203E348 unk_0C; } UnkStruct_0203E35C; -static void sub_0203DF68(TaskManager * taskMan); -static u8 sub_0203E484(SaveData * saveData, u8 param1); +static void sub_0203DF68(TaskManager *taskMan); +static u8 sub_0203E484(SaveData *saveData, u8 param1); static BOOL OverlayInit_Battle(OverlayManager *ovyManager, int *state) { return TRUE; } -static BOOL OverlayMain_Battle (OverlayManager *ovyManager, int *state) +static BOOL OverlayMain_Battle(OverlayManager *ovyManager, int *state) { if (Battle_Main(ovyManager, state)) { return TRUE; @@ -248,12 +245,11 @@ static BOOL OverlayMain_Battle (OverlayManager *ovyManager, int *state) } } -static BOOL OverlayExit_Battle (OverlayManager *ovyManager, int *state) +static BOOL OverlayExit_Battle(OverlayManager *ovyManager, int *state) { return TRUE; } - const OverlayManagerTemplate gBattleOverlayTemplate = { OverlayInit_Battle, OverlayMain_Battle, @@ -261,7 +257,7 @@ const OverlayManagerTemplate gBattleOverlayTemplate = { FS_OVERLAY_ID(battle) }; -void sub_0203D1D4 (FieldSystem * fieldSystem, BattleParams * param1) +void sub_0203D1D4(FieldSystem *fieldSystem, BattleParams *param1) { sub_0203CD84(fieldSystem, &gBattleOverlayTemplate, param1); } @@ -278,7 +274,7 @@ static const u8 Unk_020EA164[] = { 0xff }; -void sub_0203D1E4 (FieldSystem * fieldSystem, void * param1) +void sub_0203D1E4(FieldSystem *fieldSystem, void *param1) { FS_EXTERN_OVERLAY(overlay84); @@ -292,10 +288,10 @@ void sub_0203D1E4 (FieldSystem * fieldSystem, void * param1) sub_0203CD84(fieldSystem, &Unk_ov84_02241130, param1); } -void * sub_0203D20C (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1) +void *sub_0203D20C(FieldSystem *fieldSystem, UnkStruct_020684D0 *param1) { - Bag * v0; - void * v1; + Bag *v0; + void *v1; v0 = SaveData_GetBag(fieldSystem->saveData); v1 = sub_0207D824(v0, Unk_020EA164, 11); @@ -313,13 +309,13 @@ void * sub_0203D20C (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1) return v1; } -void * sub_0203D264 (FieldSystem * fieldSystem, int param1) +void *sub_0203D264(FieldSystem *fieldSystem, int param1) { - void * v0; - static const u8 * v1; - static const u8 v2[] = {4, 0xff}; - static const u8 v3[] = {0, 0xff}; - Bag * v4 = SaveData_GetBag(fieldSystem->saveData); + void *v0; + static const u8 *v1; + static const u8 v2[] = { 4, 0xff }; + static const u8 v3[] = { 0, 0xff }; + Bag *v4 = SaveData_GetBag(fieldSystem->saveData); switch (param1) { case 0: @@ -340,7 +336,7 @@ void * sub_0203D264 (FieldSystem * fieldSystem, int param1) return v0; } -u16 sub_0203D2C4 (void * param0) +u16 sub_0203D2C4(void *param0) { u16 v0; @@ -353,7 +349,7 @@ u16 sub_0203D2C4 (void * param0) return v0; } -void sub_0203D2E4 (FieldSystem * fieldSystem, void * param1) +void sub_0203D2E4(FieldSystem *fieldSystem, void *param1) { FS_EXTERN_OVERLAY(overlay85); @@ -367,7 +363,7 @@ void sub_0203D2E4 (FieldSystem * fieldSystem, void * param1) sub_0203CD84(fieldSystem, &v0, param1); } -void sub_0203D30C (FieldSystem * fieldSystem, void * param1) +void sub_0203D30C(FieldSystem *fieldSystem, void *param1) { FS_EXTERN_OVERLAY(overlay81); @@ -381,14 +377,14 @@ void sub_0203D30C (FieldSystem * fieldSystem, void * param1) sub_0203CD84(fieldSystem, &v0, fieldSystem->saveData); } -void sub_0203D334 (FieldSystem * fieldSystem, void * param1) +void sub_0203D334(FieldSystem *fieldSystem, void *param1) { sub_0203CD84(fieldSystem, &Unk_020F410C, param1); } -static PartyManagementData * sub_0203D344 (int param0, FieldSystem * fieldSystem, int param2, int param3) +static PartyManagementData *sub_0203D344(int param0, FieldSystem *fieldSystem, int param2, int param3) { - PartyManagementData * v0 = Heap_AllocFromHeap(param0, sizeof(PartyManagementData)); + PartyManagementData *v0 = Heap_AllocFromHeap(param0, sizeof(PartyManagementData)); MI_CpuClearFast(v0, sizeof(PartyManagementData)); @@ -403,9 +399,9 @@ static PartyManagementData * sub_0203D344 (int param0, FieldSystem * fieldSystem return v0; } -void * sub_0203D390 (FieldSystem * fieldSystem, UnkStruct_02070950 * param1, u8 param2) +void *sub_0203D390(FieldSystem *fieldSystem, UnkStruct_02070950 *param1, u8 param2) { - PartyManagementData * v0 = sub_0203D344(11, fieldSystem, 0, 0); + PartyManagementData *v0 = sub_0203D344(11, fieldSystem, 0, 0); v0->unk_18 = param1; v0->unk_22 = param2; @@ -415,31 +411,31 @@ void * sub_0203D390 (FieldSystem * fieldSystem, UnkStruct_02070950 * param1, u8 return v0; } -void * sub_0203D3C0 (int param0, FieldSystem * fieldSystem) +void *sub_0203D3C0(int param0, FieldSystem *fieldSystem) { - PartyManagementData * v0 = sub_0203D344(11, fieldSystem, 0, 3); + PartyManagementData *v0 = sub_0203D344(11, fieldSystem, 0, 3); sub_0203CD84(fieldSystem, &Unk_020F1E88, v0); return v0; } -void * sub_0203D3E4 (int param0, FieldSystem * fieldSystem) +void *sub_0203D3E4(int param0, FieldSystem *fieldSystem) { - PartyManagementData * v0 = sub_0203D344(11, fieldSystem, 0, 19); + PartyManagementData *v0 = sub_0203D344(11, fieldSystem, 0, 19); sub_0203CD84(fieldSystem, &Unk_020F1E88, v0); return v0; } -int sub_0203D408 (void * param0) +int sub_0203D408(void *param0) { - PartyManagementData * v0 = param0; + PartyManagementData *v0 = param0; return v0->unk_22; } -void * sub_0203D410 (int param0, FieldSystem * fieldSystem, int param2) +void *sub_0203D410(int param0, FieldSystem *fieldSystem, int param2) { - PartyManagementData * v0 = sub_0203D344(11, fieldSystem, 0, 18); + PartyManagementData *v0 = sub_0203D344(11, fieldSystem, 0, 18); v0->unk_22 = param2; sub_0203CD84(fieldSystem, &Unk_020F1E88, v0); @@ -447,23 +443,23 @@ void * sub_0203D410 (int param0, FieldSystem * fieldSystem, int param2) return v0; } -int sub_0203D438 (void * param0) +int sub_0203D438(void *param0) { - PartyManagementData * v0 = param0; + PartyManagementData *v0 = param0; return v0->unk_23; } -int sub_0203D440 (void * param0) +int sub_0203D440(void *param0) { - PokemonSummary * v0 = param0; + PokemonSummary *v0 = param0; return v0->pos; } -static BOOL sub_0203D444 (TaskManager * param0) +static BOOL sub_0203D444(TaskManager *param0) { - FieldSystem * fieldSystem; - UnkStruct_0203D444 * v1; - int * v2; + FieldSystem *fieldSystem; + UnkStruct_0203D444 *v1; + int *v2; fieldSystem = TaskManager_FieldSystem(param0); v1 = TaskManager_Environment(param0); @@ -510,11 +506,11 @@ static BOOL sub_0203D444 (TaskManager * param0) return 0; } -void * sub_0203D50C (TaskManager * taskMan, int param1) +void *sub_0203D50C(TaskManager *taskMan, int param1) { - UnkStruct_0203D444 * v0; - PartyManagementData * v1; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0203D444 *v0; + PartyManagementData *v1; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0203D444)); v0->unk_00 = param1; @@ -530,9 +526,9 @@ void * sub_0203D50C (TaskManager * taskMan, int param1) return v1; } -void * sub_0203D578 (int param0, FieldSystem * fieldSystem, int param2, int param3, int param4, int param5) +void *sub_0203D578(int param0, FieldSystem *fieldSystem, int param2, int param3, int param4, int param5) { - PartyManagementData * v0 = sub_0203D344(11, fieldSystem, 0, 13); + PartyManagementData *v0 = sub_0203D344(11, fieldSystem, 0, 13); v0->unk_22 = param5; v0->unk_29 = 2; @@ -549,9 +545,9 @@ void * sub_0203D578 (int param0, FieldSystem * fieldSystem, int param2, int para return v0; } -void * sub_0203D5C8 (int param0, FieldSystem * fieldSystem, int param2) +void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2) { - PokemonSummary * v0 = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); + PokemonSummary *v0 = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); v0->monData = Party_GetFromSavedata(fieldSystem->saveData); v0->options = SaveData_Options(fieldSystem->saveData); @@ -572,9 +568,9 @@ void * sub_0203D5C8 (int param0, FieldSystem * fieldSystem, int param2) return v0; } -void * sub_0203D644 (FieldSystem * fieldSystem, int param1) +void *sub_0203D644(FieldSystem *fieldSystem, int param1) { - PartyManagementData * v0 = sub_0203D344(11, fieldSystem, 0, 21); + PartyManagementData *v0 = sub_0203D344(11, fieldSystem, 0, 21); v0->unk_22 = param1; sub_0203CD84(fieldSystem, &Unk_020F1E88, v0); @@ -582,10 +578,10 @@ void * sub_0203D644 (FieldSystem * fieldSystem, int param1) return v0; } -PokemonSummary * sub_0203D670 (FieldSystem * fieldSystem, int param1, int param2) +PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int param1, int param2) { - PokemonSummary * v0; - SaveData * v1; + PokemonSummary *v0; + SaveData *v1; static const u8 v2[] = { 0, 1, 2, 4, 3, 5, 6, 7, 8 }; @@ -618,9 +614,9 @@ static const u8 Unk_020EA160[] = { 0x8 }; -void * sub_0203D6E4 (int param0, FieldSystem * fieldSystem, u8 param2) +void *sub_0203D6E4(int param0, FieldSystem *fieldSystem, u8 param2) { - PokemonSummary * v0 = Heap_AllocFromHeap(param0, sizeof(PokemonSummary)); + PokemonSummary *v0 = Heap_AllocFromHeap(param0, sizeof(PokemonSummary)); memset(v0, 0, sizeof(PokemonSummary)); @@ -641,13 +637,13 @@ void * sub_0203D6E4 (int param0, FieldSystem * fieldSystem, u8 param2) return v0; } -int sub_0203D750 (void * param0) +int sub_0203D750(void *param0) { - PokemonSummary * v0 = param0; + PokemonSummary *v0 = param0; return v0->selectedSlot; } -void sub_0203D754 (FieldSystem * fieldSystem, UnkStruct_02042434 * param1) +void sub_0203D754(FieldSystem *fieldSystem, UnkStruct_02042434 *param1) { FS_EXTERN_OVERLAY(overlay19); @@ -661,11 +657,11 @@ void sub_0203D754 (FieldSystem * fieldSystem, UnkStruct_02042434 * param1) sub_0203CD84(fieldSystem, &v0, param1); } -static BOOL sub_0203D764 (TaskManager * taskMan) +static BOOL sub_0203D764(TaskManager *taskMan) { - int * v0 = FieldTask_GetState(taskMan); - UnkStruct_0203D764 * v1 = TaskManager_Environment(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + int *v0 = FieldTask_GetState(taskMan); + UnkStruct_0203D764 *v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); switch (*v0) { case 0: @@ -703,10 +699,10 @@ static BOOL sub_0203D764 (TaskManager * taskMan) return 0; } -void sub_0203D80C (TaskManager * taskMan, u16 * param1, u16 * param2, u16 * param3) +void sub_0203D80C(TaskManager *taskMan, u16 *param1, u16 *param2, u16 *param3) { - UnkStruct_0203D764 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0203D764 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203D764)); v0->unk_00 = param1; @@ -724,7 +720,7 @@ void sub_0203D80C (TaskManager * taskMan, u16 * param1, u16 * param2, u16 * para FieldTask_Start(taskMan, sub_0203D764, v0); } -void sub_0203D874 (FieldSystem * fieldSystem, UnkStruct_0209747C * param1) +void sub_0203D874(FieldSystem *fieldSystem, UnkStruct_0209747C *param1) { FS_EXTERN_OVERLAY(overlay20); @@ -738,7 +734,7 @@ void sub_0203D874 (FieldSystem * fieldSystem, UnkStruct_0209747C * param1) sub_0203CD84(fieldSystem, &v0, param1); } -void sub_0203D884 (FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1) +void sub_0203D884(FieldSystem *fieldSystem, UnkStruct_0203D8AC *param1) { FS_EXTERN_OVERLAY(overlay80); @@ -752,10 +748,10 @@ void sub_0203D884 (FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1) sub_0203CD84(fieldSystem, &v0, param1); } -void * sub_0203D8AC (FieldSystem * fieldSystem) +void *sub_0203D8AC(FieldSystem *fieldSystem) { - UnkStruct_0203D8AC * v0; - TrainerInfo * v1; + UnkStruct_0203D8AC *v0; + TrainerInfo *v1; int v2 = 0, v3 = 0; sub_0203A76C(SaveData_GetFieldOverworldState(fieldSystem->saveData)); @@ -767,7 +763,7 @@ void * sub_0203D8AC (FieldSystem * fieldSystem) return v0; } -static void sub_0203D8DC (FieldSystem * fieldSystem, Options * param1) +static void sub_0203D8DC(FieldSystem *fieldSystem, Options *param1) { FS_EXTERN_OVERLAY(overlay74); @@ -781,10 +777,10 @@ static void sub_0203D8DC (FieldSystem * fieldSystem, Options * param1) sub_0203CD84(fieldSystem, &v0, param1); } -void * sub_0203D8EC (FieldSystem * fieldSystem) +void *sub_0203D8EC(FieldSystem *fieldSystem) { - UnkStruct_0203D8EC * v0; - Options * v1; + UnkStruct_0203D8EC *v0; + Options *v1; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0203D8EC)); v1 = SaveData_Options(FieldSystem_SaveData(fieldSystem)); @@ -796,14 +792,14 @@ void * sub_0203D8EC (FieldSystem * fieldSystem) extern const OverlayManagerTemplate Unk_020F64B0; -static void sub_0203D910 (FieldSystem * fieldSystem, UnkStruct_02097728 * param1) +static void sub_0203D910(FieldSystem *fieldSystem, UnkStruct_02097728 *param1) { sub_0203CD84(fieldSystem, &Unk_020F64B0, param1); } -UnkStruct_02097728 * sub_0203D920 (FieldSystem * fieldSystem, int param1, u8 param2, u8 param3, int param4) +UnkStruct_02097728 *sub_0203D920(FieldSystem *fieldSystem, int param1, u8 param2, u8 param3, int param4) { - UnkStruct_02097728 * v0; + UnkStruct_02097728 *v0; v0 = sub_02097624(FieldSystem_SaveData(fieldSystem), param1, param2, param3, 11); sub_0203D910(fieldSystem, v0); @@ -811,9 +807,9 @@ UnkStruct_02097728 * sub_0203D920 (FieldSystem * fieldSystem, int param1, u8 par return v0; } -UnkStruct_02097728 * sub_0203D94C (FieldSystem * fieldSystem, int param1, u8 param2, int param3) +UnkStruct_02097728 *sub_0203D94C(FieldSystem *fieldSystem, int param1, u8 param2, int param3) { - UnkStruct_02097728 * v0; + UnkStruct_02097728 *v0; if (param1 == 3) { v0 = sub_020976F4(FieldSystem_SaveData(fieldSystem), param2, param3); @@ -826,9 +822,9 @@ UnkStruct_02097728 * sub_0203D94C (FieldSystem * fieldSystem, int param1, u8 par return v0; } -UnkStruct_02097728 * sub_0203D984 (FieldSystem * fieldSystem, Pokemon * param1, int param2) +UnkStruct_02097728 *sub_0203D984(FieldSystem *fieldSystem, Pokemon *param1, int param2) { - UnkStruct_02097728 * v0; + UnkStruct_02097728 *v0; v0 = sub_020976BC(FieldSystem_SaveData(fieldSystem), param1, param2); sub_0203D910(fieldSystem, v0); @@ -836,14 +832,14 @@ UnkStruct_02097728 * sub_0203D984 (FieldSystem * fieldSystem, Pokemon * param1, return v0; } -static void sub_0203D9A8 (FieldSystem * fieldSystem, UnkStruct_0203D9B8 * param1) +static void sub_0203D9A8(FieldSystem *fieldSystem, UnkStruct_0203D9B8 *param1) { sub_0203CD84(fieldSystem, &Unk_020F6890, param1); } -UnkStruct_0203D9B8 * sub_0203D9B8 (FieldSystem * fieldSystem, int param1) +UnkStruct_0203D9B8 *sub_0203D9B8(FieldSystem *fieldSystem, int param1) { - UnkStruct_0203D9B8 * v0; + UnkStruct_0203D9B8 *v0; v0 = sub_020989DC(FieldSystem_SaveData(fieldSystem), param1); sub_0203D9A8(fieldSystem, v0); @@ -851,7 +847,7 @@ UnkStruct_0203D9B8 * sub_0203D9B8 (FieldSystem * fieldSystem, int param1) return v0; } -void sub_0203D9D8 (FieldSystem * fieldSystem, UnkStruct_ov90_021D0D80 * param1) +void sub_0203D9D8(FieldSystem *fieldSystem, UnkStruct_ov90_021D0D80 *param1) { FS_EXTERN_OVERLAY(overlay90); @@ -865,14 +861,14 @@ void sub_0203D9D8 (FieldSystem * fieldSystem, UnkStruct_ov90_021D0D80 * param1) sub_0203CD84(fieldSystem, &v0, param1); } -static UnkStruct_0203DA00 * sub_0203DA00 (int param0, SaveData * param1, int param2, BOOL * param3, BOOL param4) +static UnkStruct_0203DA00 *sub_0203DA00(int param0, SaveData *param1, int param2, BOOL *param3, BOOL param4) { - UnkStruct_0203DA00 * v0; - Pokemon * v1; + UnkStruct_0203DA00 *v0; + Pokemon *v1; int v2; - UnkStruct_0202A750 * v3; - UnkStruct_02029C68 * v4; - UnkStruct_02029D04 * v5; + UnkStruct_0202A750 *v3; + UnkStruct_02029C68 *v4; + UnkStruct_02029D04 *v5; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0203DA00)); memset(v0, 0, sizeof(UnkStruct_0203DA00)); @@ -895,10 +891,10 @@ static UnkStruct_0203DA00 * sub_0203DA00 (int param0, SaveData * param1, int par return v0; } -static BOOL sub_0203DA64 (TaskManager * param0) +static BOOL sub_0203DA64(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0203DA64 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0203DA64 *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { case 0: @@ -924,9 +920,9 @@ static BOOL sub_0203DA64 (TaskManager * param0) return 0; } -void sub_0203DAC0 (TaskManager * param0, u16 * param1, SaveData * param2, u16 param3, u16 param4) +void sub_0203DAC0(TaskManager *param0, u16 *param1, SaveData *param2, u16 param3, u16 param4) { - UnkStruct_0203DA64 * v0; + UnkStruct_0203DA64 *v0; v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203DA64)); memset(v0, 0, sizeof(UnkStruct_0203DA64)); @@ -937,7 +933,7 @@ void sub_0203DAC0 (TaskManager * param0, u16 * param1, SaveData * param2, u16 pa FieldTask_Start(param0, sub_0203DA64, v0); } -BOOL sub_0203DB10 (FieldSystem * fieldSystem, void * param1) +BOOL sub_0203DB10(FieldSystem *fieldSystem, void *param1) { FS_EXTERN_OVERLAY(overlay22); @@ -953,7 +949,7 @@ BOOL sub_0203DB10 (FieldSystem * fieldSystem, void * param1) return 1; } -BOOL sub_0203DB24 (FieldSystem * fieldSystem, void * param1) +BOOL sub_0203DB24(FieldSystem *fieldSystem, void *param1) { FS_EXTERN_OVERLAY(overlay22); @@ -969,7 +965,6 @@ BOOL sub_0203DB24 (FieldSystem * fieldSystem, void * param1) return 1; } - static OverlayManagerTemplate Unk_02100AA4 = { ov88_0223B140, ov88_0223B57C, @@ -977,7 +972,6 @@ static OverlayManagerTemplate Unk_02100AA4 = { FS_OVERLAY_ID(overlay88) }; - static const OverlayManagerTemplate Unk_020EA268 = { ov95_02246C20, ov95_02246E7C, @@ -985,7 +979,7 @@ static const OverlayManagerTemplate Unk_020EA268 = { FS_OVERLAY_ID(overlay95) }; -static void sub_0203DB38 (UnkStruct_ov88_0223C370 * param0, FieldSystem * fieldSystem) +static void sub_0203DB38(UnkStruct_ov88_0223C370 *param0, FieldSystem *fieldSystem) { param0->unk_04 = SaveData_GetTrainerInfo(fieldSystem->saveData); param0->unk_08 = Party_GetFromSavedata(fieldSystem->saveData); @@ -1004,7 +998,7 @@ static void sub_0203DB38 (UnkStruct_ov88_0223C370 * param0, FieldSystem * fieldS param0->unk_34 = 0; } -static void sub_0203DBC0 (UnkStruct_ov88_0223C370 * param0) +static void sub_0203DBC0(UnkStruct_ov88_0223C370 *param0) { if (param0->unk_38) { Heap_FreeToHeap(param0->unk_38); @@ -1022,11 +1016,11 @@ static void sub_0203DBC0 (UnkStruct_ov88_0223C370 * param0) } } -BOOL sub_0203DBF0 (TaskManager * param0) +BOOL sub_0203DBF0(TaskManager *param0) { int v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0203DBF0 * v2 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0203DBF0 *v2 = TaskManager_Environment(param0); switch (v2->unk_00) { case 0: @@ -1081,8 +1075,7 @@ BOOL sub_0203DBF0 (TaskManager * param0) sub_02050A38(param0, &Unk_020EA268, &v2->unk_48); v2->unk_00 = 5; break; - case 5: - { + case 5: { int v3 = Pokemon_GetValue(v2->unk_04.unk_40, MON_DATA_HELD_ITEM, NULL); int v4; int v5; @@ -1094,8 +1087,7 @@ BOOL sub_0203DBF0 (TaskManager * param0) } else { v2->unk_00 = 7; } - } - break; + } break; case 6: if (sub_0207B0D0(v2->unk_60)) { Pokemon_Copy(v2->unk_04.unk_40, Party_GetPokemonBySlotIndex(v2->unk_04.unk_08, v2->unk_04.unk_2C)); @@ -1109,11 +1101,11 @@ BOOL sub_0203DBF0 (TaskManager * param0) v2->unk_00 = 2; { - UnkStruct_0202CD88 * v6 = sub_0202CD88(fieldSystem->saveData); + UnkStruct_0202CD88 *v6 = sub_0202CD88(fieldSystem->saveData); sub_0202CFEC(v6, 16); if (sub_020389B8()) { - sub_0202CF28(v6, (((70 + 1)) + 42)); + sub_0202CF28(v6, ((70 + 1) + 42)); } } break; @@ -1122,15 +1114,14 @@ BOOL sub_0203DBF0 (TaskManager * param0) return 0; } -void sub_0203DDDC (TaskManager * param0) +void sub_0203DDDC(TaskManager *param0) { - UnkStruct_0203DBF0 * v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203DBF0)); + UnkStruct_0203DBF0 *v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203DBF0)); v0->unk_00 = 0; FieldTask_Start(param0, sub_0203DBF0, v0); } - const OverlayManagerTemplate Unk_020EA258 = { ov58_021D0D80, ov58_021D0F08, @@ -1138,7 +1129,6 @@ const OverlayManagerTemplate Unk_020EA258 = { FS_OVERLAY_ID(overlay58) }; - const OverlayManagerTemplate Unk_020EA248 = { ov59_021D0D80, ov59_021D0F00, @@ -1146,9 +1136,9 @@ const OverlayManagerTemplate Unk_020EA248 = { FS_OVERLAY_ID(overlay59) }; -void sub_0203DDFC (FieldSystem * fieldSystem) +void sub_0203DDFC(FieldSystem *fieldSystem) { - UnkStruct_0203DDFC * v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203DDFC)); + UnkStruct_0203DDFC *v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203DDFC)); v0->unk_00 = fieldSystem->unk_80; v0->unk_04 = fieldSystem->unk_9C; @@ -1157,9 +1147,9 @@ void sub_0203DDFC (FieldSystem * fieldSystem) sub_0203CD84(fieldSystem, &Unk_020EA258, v0); } -void * sub_0203DE34 (FieldSystem * fieldSystem) +void *sub_0203DE34(FieldSystem *fieldSystem) { - UnkStruct_0203DE34 * v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203DE34)); + UnkStruct_0203DE34 *v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203DE34)); v0->unk_00 = fieldSystem->saveData; v0->unk_04 = fieldSystem->unk_80; @@ -1172,7 +1162,6 @@ void * sub_0203DE34 (FieldSystem * fieldSystem) return v0; } - const OverlayManagerTemplate Unk_020EA238 = { ov64_0222DCE0, ov64_0222DDAC, @@ -1180,21 +1169,21 @@ const OverlayManagerTemplate Unk_020EA238 = { FS_OVERLAY_ID(overlay64) }; -void sub_0203DE78 (FieldSystem * fieldSystem, SaveData * param1) +void sub_0203DE78(FieldSystem *fieldSystem, SaveData *param1) { sub_0203CD84(fieldSystem, &Unk_020EA238, param1); } -void sub_0203DE88 (FieldSystem * fieldSystem, SaveData * param1) +void sub_0203DE88(FieldSystem *fieldSystem, SaveData *param1) { sub_0203CD84(fieldSystem, &Unk_020F2FCC, fieldSystem); } -static BOOL sub_0203DE98 (TaskManager * param0) +static BOOL sub_0203DE98(TaskManager *param0) { int v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0203DE98 * v2 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0203DE98 *v2 = TaskManager_Environment(param0); switch (v2->unk_00) { case 0: @@ -1215,8 +1204,8 @@ static BOOL sub_0203DE98 (TaskManager * param0) v2->unk_0C->unk_14 = 1; } } else if (v2->unk_0C->unk_00 == 5) { - const u16 * v3 = Strbuf_GetData(v2->unk_0C->unk_18); - UnkStruct_0202B4A0 * v4 = sub_0202B4A0(fieldSystem->saveData); + const u16 *v3 = Strbuf_GetData(v2->unk_0C->unk_18); + UnkStruct_0202B4A0 *v4 = sub_0202B4A0(fieldSystem->saveData); if (sub_0202B4D8(v4, v3)) { v2->unk_0C->unk_14 = 2; @@ -1241,49 +1230,41 @@ static BOOL sub_0203DE98 (TaskManager * param0) return 0; } -static void sub_0203DF68 (TaskManager * param0) +static void sub_0203DF68(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0203DE98 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0203DE98 *v1 = TaskManager_Environment(param0); switch (v1->unk_0C->unk_00) { - case 0: - { - TrainerInfo * v2 = SaveData_GetTrainerInfo(fieldSystem->saveData); + case 0: { + TrainerInfo *v2 = SaveData_GetTrainerInfo(fieldSystem->saveData); TrainerInfo_SetName(v2, v1->unk_0C->unk_1C); - } - break; - case 1: - { - Pokemon * v3; + } break; + case 1: { + Pokemon *v3; int v4; v3 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), v1->unk_04); Pokemon_SetValue(v3, 118, (u8 *)&v1->unk_0C->unk_1C); - } - break; - case 5: - { - UnkStruct_0202B4A0 * v5 = sub_0202B4A0(fieldSystem->saveData); + } break; + case 5: { + UnkStruct_0202B4A0 *v5 = sub_0202B4A0(fieldSystem->saveData); sub_0202B444(v5, 0, 0, v1->unk_0C->unk_18); - } - break; - case 6: - { - MiscSaveBlock * v6 = SaveData_MiscSaveBlock(fieldSystem->saveData); + } break; + case 6: { + MiscSaveBlock *v6 = SaveData_MiscSaveBlock(fieldSystem->saveData); MiscSaveBlock_SetTabletName(v6, v1->unk_0C->unk_18); - } - break; + } break; } return; } -void sub_0203DFE8 (TaskManager * param0, int param1, int param2, int param3, int param4, const u16 * param5, u16 * param6) +void sub_0203DFE8(TaskManager *param0, int param1, int param2, int param3, int param4, const u16 *param5, u16 *param6) { - Pokemon * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0203DE98 * v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0203DE98)); + Pokemon *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0203DE98 *v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0203DE98)); v2->unk_00 = 0; v2->unk_04 = param4; @@ -1314,7 +1295,7 @@ void sub_0203DFE8 (TaskManager * param0, int param1, int param2, int param3, int FieldTask_Start(param0, sub_0203DE98, v2); } -void sub_0203E09C (FieldSystem * fieldSystem, TrainerCard * param1) +void sub_0203E09C(FieldSystem *fieldSystem, TrainerCard *param1) { FS_EXTERN_OVERLAY(overlay71); @@ -1328,7 +1309,7 @@ void sub_0203E09C (FieldSystem * fieldSystem, TrainerCard * param1) sub_0203CD84(fieldSystem, &v0, param1); } -BOOL sub_0203E0AC (FieldSystem * fieldSystem, void * param1) +BOOL sub_0203E0AC(FieldSystem *fieldSystem, void *param1) { FS_EXTERN_OVERLAY(overlay21); @@ -1343,7 +1324,7 @@ BOOL sub_0203E0AC (FieldSystem * fieldSystem, void * param1) return 1; } -void sub_0203E0C0 (FieldSystem * fieldSystem, ChooseStarterData * param1) +void sub_0203E0C0(FieldSystem *fieldSystem, ChooseStarterData *param1) { FS_EXTERN_OVERLAY(choose_starter); @@ -1357,9 +1338,9 @@ void sub_0203E0C0 (FieldSystem * fieldSystem, ChooseStarterData * param1) sub_0203CD84(fieldSystem, &template, param1); } -void sub_0203E0D0 (FieldSystem * fieldSystem) +void sub_0203E0D0(FieldSystem *fieldSystem) { - UnkStruct_0202C834 * v0 = sub_0202C834(fieldSystem->saveData); + UnkStruct_0202C834 *v0 = sub_0202C834(fieldSystem->saveData); FS_EXTERN_OVERLAY(overlay72); @@ -1373,9 +1354,9 @@ void sub_0203E0D0 (FieldSystem * fieldSystem) sub_0203CD84(fieldSystem, &v1, fieldSystem->saveData); } -void sub_0203E0FC (FieldSystem * fieldSystem, int param1) +void sub_0203E0FC(FieldSystem *fieldSystem, int param1) { - UnkStruct_0203E0FC * v0; + UnkStruct_0203E0FC *v0; FS_EXTERN_OVERLAY(overlay94); @@ -1409,9 +1390,9 @@ void sub_0203E0FC (FieldSystem * fieldSystem, int param1) sub_0203CD84(fieldSystem, &v1, v0); } -void * sub_0203E1AC (FieldSystem * fieldSystem, int param1, int param2) +void *sub_0203E1AC(FieldSystem *fieldSystem, int param1, int param2) { - UnkStruct_0206BC70 * v0; + UnkStruct_0206BC70 *v0; FS_EXTERN_OVERLAY(overlay96); @@ -1440,7 +1421,6 @@ void * sub_0203E1AC (FieldSystem * fieldSystem, int param1, int param2) return (void *)v0; } - static const OverlayManagerTemplate Unk_020EA328 = { ov92_021D0D80, ov92_021D0EB8, @@ -1448,12 +1428,12 @@ static const OverlayManagerTemplate Unk_020EA328 = { FS_OVERLAY_ID(overlay92) }; -void sub_0203E224 (FieldSystem * fieldSystem) +void sub_0203E224(FieldSystem *fieldSystem) { sub_0203CD84(fieldSystem, &Unk_020EA328, fieldSystem->saveData); } -void sub_0203E234 (FieldSystem * fieldSystem, UnkStruct_0203E234 * param1) +void sub_0203E234(FieldSystem *fieldSystem, UnkStruct_0203E234 *param1) { FS_EXTERN_OVERLAY(overlay86); @@ -1467,13 +1447,15 @@ void sub_0203E234 (FieldSystem * fieldSystem, UnkStruct_0203E234 * param1) sub_0203CD84(fieldSystem, &v0, param1); } - -void * sub_0203E244 (FieldSystem * fieldSystem) +void *sub_0203E244(FieldSystem *fieldSystem) { static const OverlayManagerTemplate v0 = { - ov87_021D0D80, ov87_021D0E2C, ov87_021D0DFC, FS_OVERLAY_ID(overlay87), + ov87_021D0D80, + ov87_021D0E2C, + ov87_021D0DFC, + FS_OVERLAY_ID(overlay87), }; - HallOfFame * v1; + HallOfFame *v1; int v2; v1 = SaveData_HallOfFame(fieldSystem->saveData, 11, &v2); @@ -1487,7 +1469,7 @@ void * sub_0203E244 (FieldSystem * fieldSystem) } } -void sub_0203E274 (FieldSystem * fieldSystem, UnkStruct_0203E274 * param1) +void sub_0203E274(FieldSystem *fieldSystem, UnkStruct_0203E274 *param1) { FS_EXTERN_OVERLAY(overlay99); @@ -1501,7 +1483,7 @@ void sub_0203E274 (FieldSystem * fieldSystem, UnkStruct_0203E274 * param1) sub_0203CD84(fieldSystem, &v0, param1); } -void sub_0203E284 (FieldSystem * fieldSystem, UnkStruct_020997B8 * param1) +void sub_0203E284(FieldSystem *fieldSystem, UnkStruct_020997B8 *param1) { FS_EXTERN_OVERLAY(overlay91); @@ -1515,7 +1497,7 @@ void sub_0203E284 (FieldSystem * fieldSystem, UnkStruct_020997B8 * param1) sub_0203CD84(fieldSystem, &v0, param1); } -void sub_0203E2AC (FieldSystem * fieldSystem, void * param1) +void sub_0203E2AC(FieldSystem *fieldSystem, void *param1) { FS_EXTERN_OVERLAY(overlay93); @@ -1529,7 +1511,7 @@ void sub_0203E2AC (FieldSystem * fieldSystem, void * param1) sub_0203CD84(fieldSystem, &v0, param1); } -void sub_0203E2D4 (FieldSystem * fieldSystem, void * param1) +void sub_0203E2D4(FieldSystem *fieldSystem, void *param1) { FS_EXTERN_OVERLAY(overlay93); @@ -1540,11 +1522,11 @@ void sub_0203E2D4 (FieldSystem * fieldSystem, void * param1) sub_0203CD84(fieldSystem, &v0, param1); } -void sub_0203E2FC (FieldSystem * fieldSystem) +void sub_0203E2FC(FieldSystem *fieldSystem) { UnkStruct_0203E2FC v0; - Party * v1 = Party_GetFromSavedata(fieldSystem->saveData); - Pokemon * v2 = ov5_021E7278(v1); + Party *v1 = Party_GetFromSavedata(fieldSystem->saveData); + Pokemon *v2 = ov5_021E7278(v1); GF_ASSERT(v2 != NULL); sub_0206D578(fieldSystem, v2); @@ -1557,7 +1539,7 @@ void sub_0203E2FC (FieldSystem * fieldSystem) sub_020985AC(fieldSystem->unk_10, &v0); } -BOOL sub_0203E348 (FieldSystem * fieldSystem, UnkStruct_0203E348 * param1) +BOOL sub_0203E348(FieldSystem *fieldSystem, UnkStruct_0203E348 *param1) { FS_EXTERN_OVERLAY(overlay101); @@ -1572,12 +1554,12 @@ BOOL sub_0203E348 (FieldSystem * fieldSystem, UnkStruct_0203E348 * param1) return 1; } -static BOOL sub_0203E35C (TaskManager * param0) +static BOOL sub_0203E35C(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); - UnkStruct_0203E35C * v2 = TaskManager_Environment(param0); - int * v3 = FieldTask_GetState(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + VarsFlags *v1 = SaveData_GetVarsFlags(fieldSystem->saveData); + UnkStruct_0203E35C *v2 = TaskManager_Environment(param0); + int *v3 = FieldTask_GetState(param0); int v4; switch (*v3) { @@ -1587,7 +1569,7 @@ static BOOL sub_0203E35C (TaskManager * param0) break; case 1: if (sub_020509B4(fieldSystem) == 0) { - u16 * v5 = sub_02025E50(fieldSystem->saveData); + u16 *v5 = sub_02025E50(fieldSystem->saveData); s64 v6 = GetTimestamp(); sub_0206DD38(fieldSystem, Coins_GetValue(v5), v2->unk_00, TimeElapsed(v2->unk_04, v6) / 60); @@ -1608,11 +1590,11 @@ static BOOL sub_0203E35C (TaskManager * param0) return 0; } -void sub_0203E414 (TaskManager * param0, int param1) +void sub_0203E414(TaskManager *param0, int param1) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - Options * v1 = SaveData_Options(fieldSystem->saveData); - UnkStruct_0203E35C * v2 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203E35C)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + Options *v1 = SaveData_Options(fieldSystem->saveData); + UnkStruct_0203E35C *v2 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203E35C)); v2->unk_0C.unk_00 = &v2->unk_00; v2->unk_00 = Coins_GetValue(sub_02025E50(fieldSystem->saveData)); @@ -1626,12 +1608,23 @@ void sub_0203E414 (TaskManager * param0, int param1) FieldTask_Start(param0, sub_0203E35C, v2); } -static u8 sub_0203E484 (SaveData * param0, u8 param1) +static u8 sub_0203E484(SaveData *param0, u8 param1) { static const u8 v0[12] = { - 0, 5, 1, 1, 4, 4, 2, 2, 2, 3, 3, 3, + 0, + 5, + 1, + 1, + 4, + 4, + 2, + 2, + 2, + 3, + 3, + 3, }; - UnkStruct_0202B4A0 * v1 = sub_0202B4A0(param0); + UnkStruct_0202B4A0 *v1 = sub_0202B4A0(param0); u32 v2; u8 v3[12]; u8 v4, v5, v6, v7; @@ -1654,9 +1647,9 @@ static u8 sub_0203E484 (SaveData * param0, u8 param1) return v3[param1]; } -static BOOL sub_0203E4F8 (TaskManager * param0) +static BOOL sub_0203E4F8(TaskManager *param0) { - UnkStruct_ov7_0224BEFC * v0 = TaskManager_Environment(param0); + UnkStruct_ov7_0224BEFC *v0 = TaskManager_Environment(param0); if (ov7_0224BF2C(v0) == 1) { ov7_0224BEFC(v0); @@ -1666,22 +1659,25 @@ static BOOL sub_0203E4F8 (TaskManager * param0) return 0; } -void sub_0203E518 (TaskManager * param0) +void sub_0203E518(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_ov7_0224BEFC * v1 = ov7_0224BE9C(4, fieldSystem->saveData, fieldSystem->unk_08); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_ov7_0224BEFC *v1 = ov7_0224BE9C(4, fieldSystem->saveData, fieldSystem->unk_08); FieldTask_Start(param0, sub_0203E4F8, v1); } -void * sub_0203E53C (FieldSystem * fieldSystem, int param1, int param2) +void *sub_0203E53C(FieldSystem *fieldSystem, int param1, int param2) { FS_EXTERN_OVERLAY(overlay102); static const OverlayManagerTemplate v0 = { - ov102_021D0D80, ov102_021D0E2C, ov102_021D0F50, FS_OVERLAY_ID(overlay102), + ov102_021D0D80, + ov102_021D0E2C, + ov102_021D0F50, + FS_OVERLAY_ID(overlay102), }; - UnkStruct_0203E53C * v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0203E53C)); + UnkStruct_0203E53C *v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0203E53C)); { v1->unk_04 = param2; @@ -1693,9 +1689,9 @@ void * sub_0203E53C (FieldSystem * fieldSystem, int param1, int param2) return v1; } -void * sub_0203E564 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3, int param4) +void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, int param4) { - UnkStruct_0203E564 * v0; + UnkStruct_0203E564 *v0; FS_EXTERN_OVERLAY(overlay110); @@ -1718,9 +1714,9 @@ void * sub_0203E564 (FieldSystem * fieldSystem, u8 param1, u8 param2, u16 param3 return v0; } -PartyManagementData * sub_0203E598 (FieldSystem * fieldSystem, int param1, int param2) +PartyManagementData *sub_0203E598(FieldSystem *fieldSystem, int param1, int param2) { - PartyManagementData * v0; + PartyManagementData *v0; v0 = Heap_AllocFromHeap(param1, sizeof(PartyManagementData)); memset(v0, 0, sizeof(PartyManagementData)); @@ -1742,9 +1738,9 @@ PartyManagementData * sub_0203E598 (FieldSystem * fieldSystem, int param1, int p return v0; } -void * sub_0203E608 (FieldSystem * fieldSystem, int param1) +void *sub_0203E608(FieldSystem *fieldSystem, int param1) { - UnkStruct_0203E608 * v0; + UnkStruct_0203E608 *v0; FS_EXTERN_OVERLAY(overlay111); @@ -1770,9 +1766,9 @@ static const u8 Unk_020EA15C[] = { 0x8 }; -void * sub_0203E63C (int param0, FieldSystem * fieldSystem, u16 param2, u16 param3) +void *sub_0203E63C(int param0, FieldSystem *fieldSystem, u16 param2, u16 param3) { - PokemonSummary * v0; + PokemonSummary *v0; v0 = Heap_AllocFromHeap(11, sizeof(PokemonSummary)); @@ -1795,9 +1791,9 @@ void * sub_0203E63C (int param0, FieldSystem * fieldSystem, u16 param2, u16 para return v0; } -void sub_0203E6C0 (FieldSystem * fieldSystem, int param1, int param2) +void sub_0203E6C0(FieldSystem *fieldSystem, int param1, int param2) { - UnkStruct_0203E6C0 * v0; + UnkStruct_0203E6C0 *v0; FS_EXTERN_OVERLAY(overlay61); @@ -1828,12 +1824,11 @@ static const OverlayManagerTemplate LibraryTV_template = { FS_OVERLAY_ID(library_tv) }; -void sub_0203E704 (FieldSystem * fieldSystem) +void sub_0203E704(FieldSystem *fieldSystem) { sub_0203CD84(fieldSystem, &LibraryTV_template, fieldSystem->saveData); } - static const OverlayManagerTemplate Unk_020EA368 = { DWWarp_Init, DWWarp_Main, @@ -1841,7 +1836,7 @@ static const OverlayManagerTemplate Unk_020EA368 = { FS_OVERLAY_ID(dw_warp) }; -void sub_0203E714 (FieldSystem * fieldSystem) +void sub_0203E714(FieldSystem *fieldSystem) { sub_0203CD84(fieldSystem, &Unk_020EA368, fieldSystem->saveData); } diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c index b4160fcb26..2a5be26eca 100644 --- a/src/unk_0203E880.c +++ b/src/unk_0203E880.c @@ -1,47 +1,48 @@ +#include "unk_0203E880.h" + #include #include +#include "constants/battle.h" + #include "struct_decls/struct_02001AF4_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" #include "struct_decls/struct_0203EF60_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" +#include "struct_defs/struct_0203F478.h" +#include "struct_defs/struct_0205AA50.h" + +#include "field/field_system.h" #include "overlay005/struct_ov5_021DC1A4_decl.h" #include "overlay005/struct_ov5_021E1FF4_decl.h" #include "overlay101/struct_ov101_021D5D90_decl.h" -#include "constdata/const_020EAC58.h" -#include "constdata/const_020EAB80.h" - -#include "field/field_system.h" -#include "struct_defs/struct_0203F478.h" -#include "struct_defs/struct_0205AA50.h" - -#include "constants/battle.h" -#include "narc.h" -#include "message.h" -#include "string_template.h" +#include "field_menu.h" +#include "field_script_context.h" #include "heap.h" -#include "unk_0201D15C.h" -#include "strbuf.h" #include "map_header.h" #include "map_header_data.h" -#include "field_menu.h" -#include "field_script_context.h" -#include "unk_0203E880.h" -#include "vars_flags.h" -#include "unk_020508D4.h" -#include "player_avatar.h" #include "map_object.h" +#include "message.h" +#include "narc.h" +#include "player_avatar.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" #include "trainer_data.h" +#include "unk_0201D15C.h" +#include "unk_020508D4.h" +#include "vars_flags.h" + +#include "constdata/const_020EAB80.h" +#include "constdata/const_020EAC58.h" #define SINGLE_BATTLE_EVENT_ID_OFFSET 3000 #define DOUBLE_BATTLE_EVENT_ID_OFFSET 5000 #define TRAINER_DEFEATED_FLAG_OFFSET 1360 -typedef void (* UnkFuncPtr_0203E950)(FieldSystem *); +typedef void (*UnkFuncPtr_0203E950)(FieldSystem *); typedef struct { int unk_00; @@ -49,8 +50,8 @@ typedef struct { int unk_08; int unk_0C; int unk_10; - MapObject * unk_14; - SysTask * unk_18; + MapObject *unk_14; + SysTask *unk_18; } UnkStruct_0203E8B0; struct UnkStruct_0203EF60_t { @@ -63,75 +64,75 @@ struct UnkStruct_0203EF60_t { u8 unk_09; u16 unk_0A; BOOL unk_0C; - UnkStruct_ov5_021DC1A4 * unk_10; + UnkStruct_ov5_021DC1A4 *unk_10; Window unk_14; - UIControlData * unk_24; + UIControlData *unk_24; int unk_28; - MapObject * unk_2C; - MapObject * unk_30; - u16 * unk_34; - ScriptContext * unk_38[2]; - StringTemplate * unk_40; - Strbuf* unk_44; - Strbuf* unk_48; - void * unk_4C; + MapObject *unk_2C; + MapObject *unk_30; + u16 *unk_34; + ScriptContext *unk_38[2]; + StringTemplate *unk_40; + Strbuf *unk_44; + Strbuf *unk_48; + void *unk_4C; UnkStruct_0203E8B0 unk_50[2]; u16 unk_88[14]; UnkFuncPtr_0203E950 unk_A4; - void * unk_A8; - void * unk_AC; - UnkStruct_ov101_021D5D90 * unk_B0; - SysTask * unk_B4; + void *unk_A8; + void *unk_AC; + UnkStruct_ov101_021D5D90 *unk_B0; + SysTask *unk_B4; Window unk_B8; Window unk_C8; - UnkStruct_ov5_021E1FF4 * unk_D8; + UnkStruct_ov5_021E1FF4 *unk_D8; }; #include "data/field/hidden_items.h" -void sub_0203E880(FieldSystem * fieldSystem, u16 param1, MapObject * param2); -void sub_0203E8E0(TaskManager * param0, u16 param1, MapObject * param2, void * param3); -static BOOL sub_0203E950(TaskManager * param0); -static UnkStruct_0203EF60 * sub_0203EA28(); -static void sub_0203EA50(ScriptContext * param0); -static void sub_0203EA68(FieldSystem * fieldSystem, UnkStruct_0203EF60 * param1, u16 param2, MapObject * param3, void * param4); -ScriptContext * sub_0203EAB8(FieldSystem * fieldSystem, u16 param1); -static void sub_0203EAF4(FieldSystem * fieldSystem, ScriptContext * param1, u16 param2, u8 param3); -static u16 sub_0203EB20(FieldSystem * fieldSystem, ScriptContext * param1, u16 param2); -static void sub_0203EF14(FieldSystem * fieldSystem, ScriptContext * param1, int param2, u32 param3); -static void sub_0203EF38(FieldSystem * fieldSystem, ScriptContext * param1); -void * sub_0203EF60(UnkStruct_0203EF60 * param0, u32 param1); -void * sub_0203F098(FieldSystem * fieldSystem, u32 param1); -void sub_0203F0C0(FieldSystem * fieldSystem); -static void sub_0203F0E4(ScriptContext * param0, u16 param1); -static void * sub_0203F0FC(int param0); +void sub_0203E880(FieldSystem *fieldSystem, u16 param1, MapObject *param2); +void sub_0203E8E0(TaskManager *param0, u16 param1, MapObject *param2, void *param3); +static BOOL sub_0203E950(TaskManager *param0); +static UnkStruct_0203EF60 *sub_0203EA28(); +static void sub_0203EA50(ScriptContext *param0); +static void sub_0203EA68(FieldSystem *fieldSystem, UnkStruct_0203EF60 *param1, u16 param2, MapObject *param3, void *param4); +ScriptContext *sub_0203EAB8(FieldSystem *fieldSystem, u16 param1); +static void sub_0203EAF4(FieldSystem *fieldSystem, ScriptContext *param1, u16 param2, u8 param3); +static u16 sub_0203EB20(FieldSystem *fieldSystem, ScriptContext *param1, u16 param2); +static void sub_0203EF14(FieldSystem *fieldSystem, ScriptContext *param1, int param2, u32 param3); +static void sub_0203EF38(FieldSystem *fieldSystem, ScriptContext *param1); +void *sub_0203EF60(UnkStruct_0203EF60 *param0, u32 param1); +void *sub_0203F098(FieldSystem *fieldSystem, u32 param1); +void sub_0203F0C0(FieldSystem *fieldSystem); +static void sub_0203F0E4(ScriptContext *param0, u16 param1); +static void *sub_0203F0FC(int param0); static u32 sub_0203F110(int param0); -u16 * FieldSystem_GetVarPointer(FieldSystem * fieldSystem, u16 varID); -u16 sub_0203F150(FieldSystem * fieldSystem, u16 param1); -u16 sub_0203F164(FieldSystem * fieldSystem, u16 param1); -BOOL sub_0203F188(FieldSystem * fieldSystem, u16 param1); -void sub_0203F19C(FieldSystem * fieldSystem, u16 param1); -void sub_0203F1B0(FieldSystem * fieldSystem, u16 param1); -void FieldSystem_ClearLocalFlags(FieldSystem * fieldSystem); -void sub_0203F1FC(FieldSystem * fieldSystem); +u16 *FieldSystem_GetVarPointer(FieldSystem *fieldSystem, u16 varID); +u16 sub_0203F150(FieldSystem *fieldSystem, u16 param1); +u16 sub_0203F164(FieldSystem *fieldSystem, u16 param1); +BOOL sub_0203F188(FieldSystem *fieldSystem, u16 param1); +void sub_0203F19C(FieldSystem *fieldSystem, u16 param1); +void sub_0203F1B0(FieldSystem *fieldSystem, u16 param1); +void FieldSystem_ClearLocalFlags(FieldSystem *fieldSystem); +void sub_0203F1FC(FieldSystem *fieldSystem); BOOL sub_0203F278(u16 param0); -void sub_0203F2BC(FieldSystem * fieldSystem, u16 param1); -void sub_0203F2D8(FieldSystem * fieldSystem, u16 param1); +void sub_0203F2BC(FieldSystem *fieldSystem, u16 param1); +void sub_0203F2D8(FieldSystem *fieldSystem, u16 param1); u16 sub_0203F2F4(u16 param0); u16 sub_0203F304(u16 param0); u8 sub_0203F3C8(u16 param0); -static BOOL sub_0203F404(UnkStruct_0203EF60 * param0, u16 param1); -void sub_0203F310(FieldSystem * fieldSystem); -void FieldSystem_InitNewGameState(FieldSystem * fieldSystem); -void sub_0203F5A4(FieldSystem * fieldSystem, u16 param1); -BOOL sub_0203F5C0(FieldSystem * fieldSystem, u8 param1); -static u16 sub_0203F610(const u8 * param0, u8 param1); -static u16 sub_0203F638(FieldSystem * fieldSystem, const u8 * param1, u8 param2); -UnkStruct_0203F478 * sub_0203F478(FieldSystem * param0, int param1); +static BOOL sub_0203F404(UnkStruct_0203EF60 *param0, u16 param1); +void sub_0203F310(FieldSystem *fieldSystem); +void FieldSystem_InitNewGameState(FieldSystem *fieldSystem); +void sub_0203F5A4(FieldSystem *fieldSystem, u16 param1); +BOOL sub_0203F5C0(FieldSystem *fieldSystem, u8 param1); +static u16 sub_0203F610(const u8 *param0, u8 param1); +static u16 sub_0203F638(FieldSystem *fieldSystem, const u8 *param1, u8 param2); +UnkStruct_0203F478 *sub_0203F478(FieldSystem *param0, int param1); -void sub_0203E880 (FieldSystem * fieldSystem, u16 param1, MapObject * param2) +void sub_0203E880(FieldSystem *fieldSystem, u16 param1, MapObject *param2) { - UnkStruct_0203EF60 * v0 = sub_0203EA28(); + UnkStruct_0203EF60 *v0 = sub_0203EA28(); sub_0203EA68(fieldSystem, v0, param1, param2, NULL); FieldTask_Set(fieldSystem, sub_0203E950, v0); @@ -139,10 +140,10 @@ void sub_0203E880 (FieldSystem * fieldSystem, u16 param1, MapObject * param2) return; } -void sub_0203E8B0 (FieldSystem * fieldSystem, MapObject * param1, int param2, int param3, int param4, int param5, int param6, int param7) +void sub_0203E8B0(FieldSystem *fieldSystem, MapObject *param1, int param2, int param3, int param4, int param5, int param6, int param7) { - UnkStruct_0203EF60 * v0 = TaskManager_Environment(fieldSystem->unk_10); - UnkStruct_0203E8B0 * v1 = &v0->unk_50[param7]; + UnkStruct_0203EF60 *v0 = TaskManager_Environment(fieldSystem->unk_10); + UnkStruct_0203E8B0 *v1 = &v0->unk_50[param7]; v1->unk_00 = param2; v1->unk_04 = param3; @@ -152,10 +153,10 @@ void sub_0203E8B0 (FieldSystem * fieldSystem, MapObject * param1, int param2, in v1->unk_14 = param1; } -void sub_0203E8E0 (TaskManager * param0, u16 param1, MapObject * param2, void * param3) +void sub_0203E8E0(TaskManager *param0, u16 param1, MapObject *param2, void *param3) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0203EF60 * v1 = sub_0203EA28(); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0203EF60 *v1 = sub_0203EA28(); sub_0203EA68(fieldSystem, v1, param1, param2, param3); FieldTask_Start(param0, sub_0203E950, v1); @@ -163,10 +164,10 @@ void sub_0203E8E0 (TaskManager * param0, u16 param1, MapObject * param2, void * return; } -void sub_0203E918 (TaskManager * param0, u16 param1, MapObject * param2) +void sub_0203E918(TaskManager *param0, u16 param1, MapObject *param2) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0203EF60 * v1 = sub_0203EA28(); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0203EF60 *v1 = sub_0203EA28(); sub_0203EA68(fieldSystem, v1, param1, param2, NULL); FieldTask_Change(param0, sub_0203E950, v1); @@ -174,13 +175,13 @@ void sub_0203E918 (TaskManager * param0, u16 param1, MapObject * param2) return; } -static BOOL sub_0203E950 (TaskManager * param0) +static BOOL sub_0203E950(TaskManager *param0) { int v0; UnkFuncPtr_0203E950 v1; - ScriptContext * v2 = NULL; - UnkStruct_0203EF60 * v3 = TaskManager_Environment(param0); - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + ScriptContext *v2 = NULL; + UnkStruct_0203EF60 *v3 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); switch (v3->unk_04) { case 0: @@ -229,9 +230,9 @@ static BOOL sub_0203E950 (TaskManager * param0) return 0; } -static UnkStruct_0203EF60 * sub_0203EA28 () +static UnkStruct_0203EF60 *sub_0203EA28() { - UnkStruct_0203EF60 * v0; + UnkStruct_0203EF60 *v0; v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0203EF60)); @@ -246,7 +247,7 @@ static UnkStruct_0203EF60 * sub_0203EA28 () return v0; } -static void sub_0203EA50 (ScriptContext * param0) +static void sub_0203EA50(ScriptContext *param0) { MessageLoader_Free(param0->loader); Heap_FreeToHeap(param0->scripts); @@ -255,9 +256,9 @@ static void sub_0203EA50 (ScriptContext * param0) return; } -static void sub_0203EA68 (FieldSystem * fieldSystem, UnkStruct_0203EF60 * param1, u16 param2, MapObject * param3, void * param4) +static void sub_0203EA68(FieldSystem *fieldSystem, UnkStruct_0203EF60 *param1, u16 param2, MapObject *param3, void *param4) { - u16 * v0 = sub_0203EF60(param1, 54); + u16 *v0 = sub_0203EF60(param1, 54); param1->unk_28 = PlayerAvatar_GetDir(fieldSystem->playerAvatar); param1->unk_2C = param3; @@ -275,9 +276,9 @@ static void sub_0203EA68 (FieldSystem * fieldSystem, UnkStruct_0203EF60 * param1 return; } -ScriptContext * sub_0203EAB8 (FieldSystem * fieldSystem, u16 param1) +ScriptContext *sub_0203EAB8(FieldSystem *fieldSystem, u16 param1) { - ScriptContext * v0 = NULL; + ScriptContext *v0 = NULL; v0 = Heap_AllocFromHeap(11, sizeof(ScriptContext)); @@ -291,7 +292,7 @@ ScriptContext * sub_0203EAB8 (FieldSystem * fieldSystem, u16 param1) return v0; } -static void sub_0203EAF4 (FieldSystem * fieldSystem, ScriptContext * param1, u16 param2, u8 param3) +static void sub_0203EAF4(FieldSystem *fieldSystem, ScriptContext *param1, u16 param2, u8 param3) { u16 v0; @@ -305,7 +306,7 @@ static void sub_0203EAF4 (FieldSystem * fieldSystem, ScriptContext * param1, u16 return; } -static u16 sub_0203EB20 (FieldSystem * fieldSystem, ScriptContext * param1, u16 param2) +static u16 sub_0203EB20(FieldSystem *fieldSystem, ScriptContext *param1, u16 param2) { u16 v0 = param2; @@ -410,9 +411,9 @@ static u16 sub_0203EB20 (FieldSystem * fieldSystem, ScriptContext * param1, u16 return v0; } -static void sub_0203EF14 (FieldSystem * fieldSystem, ScriptContext * param1, int param2, u32 param3) +static void sub_0203EF14(FieldSystem *fieldSystem, ScriptContext *param1, int param2, u32 param3) { - u8 * v0 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ, param2, 11); + u8 *v0 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ, param2, 11); param1->scripts = (u8 *)v0; param1->loader = MessageLoader_Init(1, 26, param3, 11); @@ -420,9 +421,9 @@ static void sub_0203EF14 (FieldSystem * fieldSystem, ScriptContext * param1, int return; } -static void sub_0203EF38 (FieldSystem * fieldSystem, ScriptContext * param1) +static void sub_0203EF38(FieldSystem *fieldSystem, ScriptContext *param1) { - u8 * v0 = sub_0203F0FC(fieldSystem->location->mapId); + u8 *v0 = sub_0203F0FC(fieldSystem->location->mapId); param1->scripts = (u8 *)v0; param1->loader = MessageLoader_Init(1, 26, sub_0203F110(fieldSystem->location->mapId), 11); @@ -430,9 +431,9 @@ static void sub_0203EF38 (FieldSystem * fieldSystem, ScriptContext * param1) return; } -void * sub_0203EF60 (UnkStruct_0203EF60 * param0, u32 param1) +void *sub_0203EF60(UnkStruct_0203EF60 *param0, u32 param1) { - UnkStruct_0203E8B0 * v0; + UnkStruct_0203E8B0 *v0; switch (param1) { case 0: @@ -553,9 +554,9 @@ void * sub_0203EF60 (UnkStruct_0203EF60 * param0, u32 param1) return NULL; } -void * sub_0203F098 (FieldSystem * fieldSystem, u32 param1) +void *sub_0203F098(FieldSystem *fieldSystem, u32 param1) { - UnkStruct_0203EF60 * v0 = TaskManager_Environment(fieldSystem->unk_10); + UnkStruct_0203EF60 *v0 = TaskManager_Environment(fieldSystem->unk_10); if (v0->unk_00 != 0x3643f) { GF_ASSERT(FALSE); @@ -564,9 +565,9 @@ void * sub_0203F098 (FieldSystem * fieldSystem, u32 param1) return sub_0203EF60(v0, param1); } -void sub_0203F0C0 (FieldSystem * fieldSystem) +void sub_0203F0C0(FieldSystem *fieldSystem) { - UnkStruct_0203EF60 * v0 = TaskManager_Environment(fieldSystem->unk_10); + UnkStruct_0203EF60 *v0 = TaskManager_Environment(fieldSystem->unk_10); if (sub_0203A9C8(fieldSystem) == 1) { v0->unk_A4 = sub_0203AB00; @@ -575,7 +576,7 @@ void sub_0203F0C0 (FieldSystem * fieldSystem) return; } -static void sub_0203F0E4 (ScriptContext * param0, u16 param1) +static void sub_0203F0E4(ScriptContext *param0, u16 param1) { param0->scriptPtr += (param1 * 4); param0->scriptPtr += ScriptContext_ReadWord(param0); @@ -583,17 +584,17 @@ static void sub_0203F0E4 (ScriptContext * param0, u16 param1) return; } -static void * sub_0203F0FC (int param0) +static void *sub_0203F0FC(int param0) { return NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_FIELDDATA__SCRIPT__SCR_SEQ, MapHeader_GetScriptsArchiveID(param0), 11); } -static u32 sub_0203F110 (int param0) +static u32 sub_0203F110(int param0) { return MapHeader_GetMsgArchiveID(param0); } -u16 * FieldSystem_GetVarPointer (FieldSystem * fieldSystem, u16 varID) +u16 *FieldSystem_GetVarPointer(FieldSystem *fieldSystem, u16 varID) { VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); @@ -608,9 +609,9 @@ u16 * FieldSystem_GetVarPointer (FieldSystem * fieldSystem, u16 varID) return sub_0203F098(fieldSystem, (41 + varID - SPECIAL_VARS_START)); } -u16 sub_0203F150 (FieldSystem * fieldSystem, u16 param1) +u16 sub_0203F150(FieldSystem *fieldSystem, u16 param1) { - u16 * v0 = FieldSystem_GetVarPointer(fieldSystem, param1); + u16 *v0 = FieldSystem_GetVarPointer(fieldSystem, param1); if (v0 == NULL) { return param1; @@ -619,33 +620,33 @@ u16 sub_0203F150 (FieldSystem * fieldSystem, u16 param1) return *v0; } -u16 sub_0203F164 (FieldSystem * fieldSystem, u16 param1) +u16 sub_0203F164(FieldSystem *fieldSystem, u16 param1) { - GF_ASSERT((param1 < 16)); + GF_ASSERT(param1 < 16); return sub_0203F150(fieldSystem, (((0 + 0x4000) + 32) + param1)); } -BOOL sub_0203F188 (FieldSystem * fieldSystem, u16 param1) +BOOL sub_0203F188(FieldSystem *fieldSystem, u16 param1) { return VarsFlags_CheckFlag(SaveData_GetVarsFlags(fieldSystem->saveData), param1); } -void sub_0203F19C (FieldSystem * fieldSystem, u16 param1) +void sub_0203F19C(FieldSystem *fieldSystem, u16 param1) { VarsFlags_SetFlag(SaveData_GetVarsFlags(fieldSystem->saveData), param1); return; } -void sub_0203F1B0 (FieldSystem * fieldSystem, u16 param1) +void sub_0203F1B0(FieldSystem *fieldSystem, u16 param1) { VarsFlags_ClearFlag(SaveData_GetVarsFlags(fieldSystem->saveData), param1); return; } -void FieldSystem_ClearLocalFlags (FieldSystem * fieldSystem) +void FieldSystem_ClearLocalFlags(FieldSystem *fieldSystem) { int v0; - VarsFlags * v1; + VarsFlags *v1; v1 = SaveData_GetVarsFlags(fieldSystem->saveData); @@ -655,9 +656,9 @@ void FieldSystem_ClearLocalFlags (FieldSystem * fieldSystem) return; } -void sub_0203F1FC (FieldSystem * fieldSystem) +void sub_0203F1FC(FieldSystem *fieldSystem) { - VarsFlags * v0; + VarsFlags *v0; v0 = SaveData_GetVarsFlags(fieldSystem->saveData); memset(VarsFlags_GetFlagChunk(v0, 2400 + 320), 0, 192 / 8); @@ -665,7 +666,7 @@ void sub_0203F1FC (FieldSystem * fieldSystem) return; } -void sub_0203F21C (FieldSystem * fieldSystem, u16 param1, u16 param2, u16 param3, u16 param4) +void sub_0203F21C(FieldSystem *fieldSystem, u16 param1, u16 param2, u16 param3, u16 param4) { *(u16 *)sub_0203F098(fieldSystem, 41) = param1; *(u16 *)sub_0203F098(fieldSystem, 42) = param2; @@ -682,7 +683,7 @@ u16 Script_GetTrainerID(u16 eventID) } } -BOOL sub_0203F278 (u16 param0) +BOOL sub_0203F278(u16 param0) { if (param0 < 5000) { return 0; @@ -701,33 +702,33 @@ BOOL Script_IsTrainerDefeated(FieldSystem *fieldSystem, u16 trainerID) return VarsFlags_CheckFlag(SaveData_GetVarsFlags(fieldSystem->saveData), TRAINER_DEFEATED_FLAG_OFFSET + trainerID); } -void sub_0203F2BC (FieldSystem *fieldSystem, u16 param1) +void sub_0203F2BC(FieldSystem *fieldSystem, u16 param1) { VarsFlags_SetFlag(SaveData_GetVarsFlags(fieldSystem->saveData), TRAINER_DEFEATED_FLAG_OFFSET + param1); return; } -void sub_0203F2D8 (FieldSystem *fieldSystem, u16 param1) +void sub_0203F2D8(FieldSystem *fieldSystem, u16 param1) { VarsFlags_ClearFlag(SaveData_GetVarsFlags(fieldSystem->saveData), TRAINER_DEFEATED_FLAG_OFFSET + param1); return; } -u16 sub_0203F2F4 (u16 param0) +u16 sub_0203F2F4(u16 param0) { return param0 - 8000 + 730; } -u16 sub_0203F304 (u16 param0) +u16 sub_0203F304(u16 param0) { return param0 - 8000; } static u16 Unk_02100AE0[][2] = { - {0x123, 0x34}, - {0x124, 0x35}, - {0x125, 0x36}, - {0x125, 0x37} + { 0x123, 0x34 }, + { 0x124, 0x35 }, + { 0x125, 0x36 }, + { 0x125, 0x37 } }; static u16 Unk_02100AD4[] = { @@ -739,7 +740,7 @@ static u16 Unk_02100AD4[] = { 0xDE }; -void sub_0203F310 (FieldSystem * fieldSystem) +void sub_0203F310(FieldSystem *fieldSystem) { u8 v0; @@ -766,11 +767,11 @@ void sub_0203F310 (FieldSystem * fieldSystem) return; } -u8 sub_0203F3C8 (u16 param0) +u8 sub_0203F3C8(u16 param0) { int v0; u16 v1; - const HiddenItem * v2; + const HiddenItem *v2; v2 = &gHiddenItems[0]; v1 = sub_0203F304(param0); @@ -789,14 +790,14 @@ u8 sub_0203F3C8 (u16 param0) return v2[v0].range; } -static BOOL sub_0203F404 (UnkStruct_0203EF60 * param0, u16 param1) +static BOOL sub_0203F404(UnkStruct_0203EF60 *param0, u16 param1) { int v0; u16 v1; - const HiddenItem * v2; - u16 * v3 = sub_0203EF60(param0, 41); - u16 * v4 = sub_0203EF60(param0, 42); - u16 * v5 = sub_0203EF60(param0, 43); + const HiddenItem *v2; + u16 *v3 = sub_0203EF60(param0, 41); + u16 *v4 = sub_0203EF60(param0, 42); + u16 *v5 = sub_0203EF60(param0, 43); v2 = &gHiddenItems[0]; v1 = sub_0203F304(param1); @@ -819,10 +820,10 @@ static BOOL sub_0203F404 (UnkStruct_0203EF60 * param0, u16 param1) return 1; } -UnkStruct_0203F478 * sub_0203F478 (FieldSystem * fieldSystem, int param1) +UnkStruct_0203F478 *sub_0203F478(FieldSystem *fieldSystem, int param1) { - UnkStruct_0203F478 * v0; - const BgEvent * v1; + UnkStruct_0203F478 *v0; + const BgEvent *v1; int v2, v3, v4, v5, v6, v7; int v8, v9, v10, v11; @@ -882,15 +883,15 @@ UnkStruct_0203F478 * sub_0203F478 (FieldSystem * fieldSystem, int param1) return v0; } -void FieldSystem_InitNewGameState (FieldSystem * fieldSystem) +void FieldSystem_InitNewGameState(FieldSystem *fieldSystem) { sub_0203F5A4(fieldSystem, 9600); return; } -void sub_0203F5A4 (FieldSystem * fieldSystem, u16 param1) +void sub_0203F5A4(FieldSystem *fieldSystem, u16 param1) { - ScriptContext * ctx = sub_0203EAB8(fieldSystem, param1); + ScriptContext *ctx = sub_0203EAB8(fieldSystem, param1); while (ScriptContext_Run(ctx) == 1) { (void)0; @@ -899,10 +900,10 @@ void sub_0203F5A4 (FieldSystem * fieldSystem, u16 param1) sub_0203EA50(ctx); } -BOOL sub_0203F5C0 (FieldSystem * fieldSystem, u8 param1) +BOOL sub_0203F5C0(FieldSystem *fieldSystem, u8 param1) { u16 v0; - const u8 * v1; + const u8 *v1; v1 = MapHeaderData_GetScripts(fieldSystem); @@ -929,7 +930,7 @@ BOOL sub_0203F5C0 (FieldSystem * fieldSystem, u8 param1) return 1; } -static u16 sub_0203F610 (const u8 * param0, u8 param1) +static u16 sub_0203F610(const u8 *param0, u8 param1) { while (TRUE) { if (*param0 == 0) { @@ -947,7 +948,7 @@ static u16 sub_0203F610 (const u8 * param0, u8 param1) return 0xffff; } -static u16 sub_0203F638 (FieldSystem * fieldSystem, const u8 * param1, u8 param2) +static u16 sub_0203F638(FieldSystem *fieldSystem, const u8 *param1, u8 param2) { u16 v0, v1; u32 v2; diff --git a/src/unk_02046AD4.c b/src/unk_02046AD4.c index 1997db1145..ed1bb03fc7 100644 --- a/src/unk_02046AD4.c +++ b/src/unk_02046AD4.c @@ -1,19 +1,18 @@ +#include "unk_02046AD4.h" + #include #include -#include "inlines.h" +#include "data/mart_items.h" +#include "overlay007/ov7_0224CD28.h" #include "field_script_context.h" - -#include "unk_02025E08.h" +#include "inlines.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0203D1B8.h" -#include "unk_02046AD4.h" -#include "overlay007/ov7_0224CD28.h" - -#include "data/mart_items.h" -BOOL ScrCmd_147 (ScriptContext * param0) +BOOL ScrCmd_147(ScriptContext *param0) { u16 v0[64]; u8 v1, v2, v3, v4; @@ -69,7 +68,7 @@ BOOL ScrCmd_147 (ScriptContext * param0) return 1; } -BOOL ScrCmd_148 (ScriptContext * param0) +BOOL ScrCmd_148(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); BOOL v1; @@ -84,7 +83,7 @@ BOOL ScrCmd_148 (ScriptContext * param0) return 1; } -BOOL ScrCmd_149 (ScriptContext * param0) +BOOL ScrCmd_149(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); BOOL v1; @@ -99,7 +98,7 @@ BOOL ScrCmd_149 (ScriptContext * param0) return 1; } -BOOL ScrCmd_14A (ScriptContext * param0) +BOOL ScrCmd_14A(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); @@ -107,7 +106,7 @@ BOOL ScrCmd_14A (ScriptContext * param0) return 1; } -BOOL ScrCmd_257 (ScriptContext * param0) +BOOL ScrCmd_257(ScriptContext *param0) { sub_0203E518(param0->fieldSystem->unk_10); return 1; diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c index 46fc0bbd46..1a55e2d21d 100644 --- a/src/unk_02046C7C.c +++ b/src/unk_02046C7C.c @@ -1,82 +1,79 @@ #include #include -#include "inlines.h" - -#include "strbuf.h" -#include "trainer_info.h" -#include "pokemon.h" +#include "struct_defs/struct_02093800.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_02093800.h" +#include "overlay005/hblank_system.h" +#include "overlay006/ov6_02247A0C.h" -#include "string_template.h" +#include "field_script_context.h" +#include "field_system.h" +#include "inlines.h" +#include "map_header.h" +#include "party.h" +#include "pokemon.h" #include "strbuf.h" -#include "unk_02025E08.h" +#include "string_template.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0202631C.h" #include "unk_020298BC.h" #include "unk_0202CC64.h" -#include "map_header.h" -#include "field_system.h" -#include "field_script_context.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_0206A8DC.h" -#include "party.h" #include "unk_020933F8.h" -#include "overlay005/hblank_system.h" -#include "overlay006/ov6_02247A0C.h" +#include "vars_flags.h" -static BOOL sub_02046CE0(ScriptContext * param0); -static BOOL sub_02046FDC(ScriptContext * param0); -static BOOL sub_02047404(ScriptContext * param0); -BOOL ScrCmd_0F8(ScriptContext * param0); -BOOL ScrCmd_0F9(ScriptContext * param0); -BOOL ScrCmd_0FA(ScriptContext * param0); -BOOL ScrCmd_0FB(ScriptContext * param0); -BOOL ScrCmd_0FC(ScriptContext * param0); -BOOL ScrCmd_0FD(ScriptContext * param0); -BOOL ScrCmd_0FE(ScriptContext * param0); -BOOL ScrCmd_100(ScriptContext * param0); -BOOL ScrCmd_101(ScriptContext * param0); -BOOL ScrCmd_102(ScriptContext * param0); -BOOL ScrCmd_103(ScriptContext * param0); -BOOL ScrCmd_104(ScriptContext * param0); -BOOL ScrCmd_105(ScriptContext * param0); -BOOL ScrCmd_106(ScriptContext * param0); -BOOL ScrCmd_107(ScriptContext * param0); -BOOL ScrCmd_108(ScriptContext * param0); -BOOL ScrCmd_109(ScriptContext * param0); -BOOL ScrCmd_10A(ScriptContext * param0); -BOOL ScrCmd_10B(ScriptContext * param0); -BOOL ScrCmd_111(ScriptContext * param0); -BOOL ScrCmd_112(ScriptContext * param0); -BOOL ScrCmd_113(ScriptContext * param0); -BOOL ScrCmd_114(ScriptContext * param0); -BOOL ScrCmd_115(ScriptContext * param0); -BOOL ScrCmd_116(ScriptContext * param0); -BOOL ScrCmd_117(ScriptContext * param0); -BOOL ScrCmd_118(ScriptContext * param0); -BOOL ScrCmd_0FF(ScriptContext * param0); -BOOL ScrCmd_10C(ScriptContext * param0); -BOOL ScrCmd_110(ScriptContext * param0); -BOOL ScrCmd_10D(ScriptContext * param0); -BOOL ScrCmd_10E(ScriptContext * param0); -BOOL ScrCmd_10F(ScriptContext * param0); - -BOOL ScrCmd_0F8 (ScriptContext * param0) -{ - void ** v0 = sub_0203F098(param0->fieldSystem, 20); +static BOOL sub_02046CE0(ScriptContext *param0); +static BOOL sub_02046FDC(ScriptContext *param0); +static BOOL sub_02047404(ScriptContext *param0); +BOOL ScrCmd_0F8(ScriptContext *param0); +BOOL ScrCmd_0F9(ScriptContext *param0); +BOOL ScrCmd_0FA(ScriptContext *param0); +BOOL ScrCmd_0FB(ScriptContext *param0); +BOOL ScrCmd_0FC(ScriptContext *param0); +BOOL ScrCmd_0FD(ScriptContext *param0); +BOOL ScrCmd_0FE(ScriptContext *param0); +BOOL ScrCmd_100(ScriptContext *param0); +BOOL ScrCmd_101(ScriptContext *param0); +BOOL ScrCmd_102(ScriptContext *param0); +BOOL ScrCmd_103(ScriptContext *param0); +BOOL ScrCmd_104(ScriptContext *param0); +BOOL ScrCmd_105(ScriptContext *param0); +BOOL ScrCmd_106(ScriptContext *param0); +BOOL ScrCmd_107(ScriptContext *param0); +BOOL ScrCmd_108(ScriptContext *param0); +BOOL ScrCmd_109(ScriptContext *param0); +BOOL ScrCmd_10A(ScriptContext *param0); +BOOL ScrCmd_10B(ScriptContext *param0); +BOOL ScrCmd_111(ScriptContext *param0); +BOOL ScrCmd_112(ScriptContext *param0); +BOOL ScrCmd_113(ScriptContext *param0); +BOOL ScrCmd_114(ScriptContext *param0); +BOOL ScrCmd_115(ScriptContext *param0); +BOOL ScrCmd_116(ScriptContext *param0); +BOOL ScrCmd_117(ScriptContext *param0); +BOOL ScrCmd_118(ScriptContext *param0); +BOOL ScrCmd_0FF(ScriptContext *param0); +BOOL ScrCmd_10C(ScriptContext *param0); +BOOL ScrCmd_110(ScriptContext *param0); +BOOL ScrCmd_10D(ScriptContext *param0); +BOOL ScrCmd_10E(ScriptContext *param0); +BOOL ScrCmd_10F(ScriptContext *param0); + +BOOL ScrCmd_0F8(ScriptContext *param0) +{ + void **v0 = sub_0203F098(param0->fieldSystem, 20); u16 v1 = ScriptContext_GetVar(param0); sub_02094754(*v0, v1); return 0; } -BOOL ScrCmd_0F9 (ScriptContext * param0) +BOOL ScrCmd_0F9(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); u16 v1 = ScriptContext_GetVar(param0); param0->data[0] = v1; @@ -85,18 +82,18 @@ BOOL ScrCmd_0F9 (ScriptContext * param0) return 1; } -static BOOL sub_02046CE0 (ScriptContext * param0) +static BOOL sub_02046CE0(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); return sub_0209476C(*v0, param0->data[0]); } -BOOL ScrCmd_0FA (ScriptContext * param0) +BOOL ScrCmd_0FA(ScriptContext *param0) { - Strbuf* v0; - Pokemon * v1; - void ** v2 = sub_0203F098(param0->fieldSystem, 20); - TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + Strbuf *v0; + Pokemon *v1; + void **v2 = sub_0203F098(param0->fieldSystem, 20); + TrainerInfo *v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); u16 v4 = ScriptContext_GetVar(param0); u16 v5 = ScriptContext_GetVar(param0); u16 v6 = ScriptContext_GetVar(param0); @@ -127,10 +124,10 @@ BOOL ScrCmd_0FA (ScriptContext * param0) return 0; } -BOOL ScrCmd_0FB (ScriptContext * param0) +BOOL ScrCmd_0FB(ScriptContext *param0) { - Pokemon * v0; - void ** v1 = sub_0203F098(param0->fieldSystem, 20); + Pokemon *v0; + void **v1 = sub_0203F098(param0->fieldSystem, 20); u16 v2 = ScriptContext_GetVar(param0); u32 v3 = MapHeader_GetMapLabelTextID(param0->fieldSystem->location->mapId); @@ -140,10 +137,10 @@ BOOL ScrCmd_0FB (ScriptContext * param0) return 0; } -BOOL ScrCmd_0FC (ScriptContext * param0) +BOOL ScrCmd_0FC(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - StringTemplate ** v1 = sub_0203F098(param0->fieldSystem, 15); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + StringTemplate **v1 = sub_0203F098(param0->fieldSystem, 15); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -152,10 +149,10 @@ BOOL ScrCmd_0FC (ScriptContext * param0) return 0; } -BOOL ScrCmd_0FD (ScriptContext * param0) +BOOL ScrCmd_0FD(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - StringTemplate ** v1 = sub_0203F098(param0->fieldSystem, 15); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + StringTemplate **v1 = sub_0203F098(param0->fieldSystem, 15); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -164,10 +161,10 @@ BOOL ScrCmd_0FD (ScriptContext * param0) return 0; } -BOOL ScrCmd_0FE (ScriptContext * param0) +BOOL ScrCmd_0FE(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - StringTemplate ** v1 = sub_0203F098(param0->fieldSystem, 15); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + StringTemplate **v1 = sub_0203F098(param0->fieldSystem, 15); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -176,10 +173,10 @@ BOOL ScrCmd_0FE (ScriptContext * param0) return 0; } -BOOL ScrCmd_0FF (ScriptContext * param0) +BOOL ScrCmd_0FF(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - StringTemplate ** v1 = sub_0203F098(param0->fieldSystem, 15); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + StringTemplate **v1 = sub_0203F098(param0->fieldSystem, 15); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -187,9 +184,9 @@ BOOL ScrCmd_0FF (ScriptContext * param0) return 0; } -BOOL ScrCmd_100 (ScriptContext * param0) +BOOL ScrCmd_100(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); sub_020943B0(*v0); ScriptContext_Pause(param0, sub_02046FDC); @@ -197,201 +194,201 @@ BOOL ScrCmd_100 (ScriptContext * param0) return 1; } -static BOOL sub_02046FDC (ScriptContext * param0) +static BOOL sub_02046FDC(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); return sub_020944CC(*v0); } -BOOL ScrCmd_101 (ScriptContext * param0) +BOOL ScrCmd_101(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); sub_020933F8(param0->taskManager, *v0); return 1; } -BOOL ScrCmd_102 (ScriptContext * param0) +BOOL ScrCmd_102(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - StringTemplate ** v1 = sub_0203F098(param0->fieldSystem, 15); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + StringTemplate **v1 = sub_0203F098(param0->fieldSystem, 15); u16 v2 = ScriptContext_GetVar(param0); sub_020946A4(*v0, *v1, v2); return 0; } -BOOL ScrCmd_103 (ScriptContext * param0) +BOOL ScrCmd_103(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - StringTemplate ** v1 = sub_0203F098(param0->fieldSystem, 15); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + StringTemplate **v1 = sub_0203F098(param0->fieldSystem, 15); u16 v2 = ScriptContext_GetVar(param0); sub_020946CC(*v0, *v1, v2); return 0; } -BOOL ScrCmd_104 (ScriptContext * param0) +BOOL ScrCmd_104(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - StringTemplate ** v1 = sub_0203F098(param0->fieldSystem, 15); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + StringTemplate **v1 = sub_0203F098(param0->fieldSystem, 15); u16 v2 = ScriptContext_GetVar(param0); sub_020946F0(*v0, *v1, v2); return 0; } -BOOL ScrCmd_105 (ScriptContext * param0) +BOOL ScrCmd_105(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(param0); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02094750(*v0); return 0; } -BOOL ScrCmd_106 (ScriptContext * param0) +BOOL ScrCmd_106(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - StringTemplate ** v1 = sub_0203F098(param0->fieldSystem, 15); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + StringTemplate **v1 = sub_0203F098(param0->fieldSystem, 15); u16 v2 = ScriptContext_GetVar(param0); sub_02094720(*v0, *v1, v2); return 0; } -BOOL ScrCmd_107 (ScriptContext * param0) +BOOL ScrCmd_107(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(param0); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02094790(*v0); return 0; } -BOOL ScrCmd_108 (ScriptContext * param0) +BOOL ScrCmd_108(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(param0); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_020947A4(*v0); return 0; } -BOOL ScrCmd_109 (ScriptContext * param0) +BOOL ScrCmd_109(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(param0); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_020947C8(*v0); return 0; } -BOOL ScrCmd_10A (ScriptContext * param0) +BOOL ScrCmd_10A(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); u16 v1 = ScriptContext_GetVar(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_020947D8(*v0, v1); return 0; } -BOOL ScrCmd_10B (ScriptContext * param0) +BOOL ScrCmd_10B(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); u16 v1 = ScriptContext_GetVar(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_020947F0(*v0, v1); return 0; } -BOOL ScrCmd_10C (ScriptContext * param0) +BOOL ScrCmd_10C(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(param0); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02094804(*v0); return 0; } -BOOL ScrCmd_110 (ScriptContext * param0) +BOOL ScrCmd_110(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); - u16 * v4 = ScriptContext_GetVarPointer(param0); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); + u16 *v4 = ScriptContext_GetVarPointer(param0); sub_02094828(*v0, v1, v2, v3, v4); return 0; } -BOOL ScrCmd_10D (ScriptContext * param0) +BOOL ScrCmd_10D(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(param0); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02094868(*v0); return 0; } -BOOL ScrCmd_10E (ScriptContext * param0) +BOOL ScrCmd_10E(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - StringTemplate ** v1 = sub_0203F098(param0->fieldSystem, 15); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + StringTemplate **v1 = sub_0203F098(param0->fieldSystem, 15); u16 v2 = ScriptContext_GetVar(param0); sub_02094898(*v0, *v1, v2, 11); return 0; } -BOOL ScrCmd_10F (ScriptContext * param0) +BOOL ScrCmd_10F(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(param0); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02094904(*v0); return 0; } -BOOL ScrCmd_117 (ScriptContext * param0) +BOOL ScrCmd_117(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); sub_02094850(*v0); return 0; } -BOOL ScrCmd_118 (ScriptContext * param0) +BOOL ScrCmd_118(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); sub_02094860(*v0); return 0; } -BOOL ScrCmd_111 (ScriptContext * param0) +BOOL ScrCmd_111(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); u16 v1 = ScriptContext_GetVar(param0); sub_02094A58(*v0, v1); return 0; } -BOOL ScrCmd_112 (ScriptContext * param0) +BOOL ScrCmd_112(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); ScriptContext_Pause(param0, sub_02047404); return 1; } -static BOOL sub_02047404 (ScriptContext * param0) +static BOOL sub_02047404(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); + void **v0 = sub_0203F098(param0->fieldSystem, 20); if (sub_02094B1C(*v0) == 1) { return 1; @@ -400,22 +397,22 @@ static BOOL sub_02047404 (ScriptContext * param0) return 0; } -BOOL ScrCmd_113 (ScriptContext * param0) +BOOL ScrCmd_113(ScriptContext *param0) { HBlankSystem_Stop(param0->fieldSystem->unk_04->hBlankSystem); return 0; } -BOOL ScrCmd_114 (ScriptContext * param0) +BOOL ScrCmd_114(ScriptContext *param0) { HBlankSystem_Start(param0->fieldSystem->unk_04->hBlankSystem); return 0; } -BOOL ScrCmd_115 (ScriptContext * param0) +BOOL ScrCmd_115(ScriptContext *param0) { - void ** v0 = sub_0203F098(param0->fieldSystem, 20); - u16 * v1 = ScriptContext_GetVarPointer(param0); + void **v0 = sub_0203F098(param0->fieldSystem, 20); + u16 *v1 = ScriptContext_GetVarPointer(param0); int v2, v3, v4, v5, v6; sub_02094BB4(*v0, &v2, &v3, &v4, &v5, &v6); @@ -429,7 +426,7 @@ BOOL ScrCmd_115 (ScriptContext * param0) return 0; } -BOOL ScrCmd_116 (ScriptContext * param0) +BOOL ScrCmd_116(ScriptContext *param0) { ov6_02247A0C(param0->taskManager); return 1; diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index 4aff620fb0..8b0ae9eb27 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -1,47 +1,42 @@ +#include "unk_020474B8.h" + #include +#include #include -#include "inlines.h" - -#include "message.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "field/field_system.h" +#include "savedata/save_table.h" +#include "berry_data.h" +#include "field_script_context.h" +#include "field_system.h" +#include "inlines.h" +#include "item.h" #include "message.h" -#include "string_template.h" +#include "party.h" +#include "pokemon.h" +#include "savedata_misc.h" #include "strbuf.h" -#include "savedata/save_table.h" -#include "unk_02025E08.h" +#include "string_template.h" #include "trainer_info.h" -#include "savedata_misc.h" -#include "field_system.h" -#include "field_script_context.h" +#include "unk_02025E08.h" #include "unk_0203E880.h" -#include "unk_020474B8.h" -#include "vars_flags.h" #include "unk_0205C980.h" #include "unk_0205DFC4.h" #include "unk_0206AFE0.h" #include "unk_02071CFC.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "party.h" -#include "item.h" #include "unk_020923C0.h" -#include "berry_data.h" - -#include +#include "vars_flags.h" -static Strbuf* sub_02047998(u16 param0, u32 param1); +static Strbuf *sub_02047998(u16 param0, u32 param1); -BOOL ScrCmd_2EF (ScriptContext * param0) +BOOL ScrCmd_2EF(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u8 v3 = ScriptContext_GetVar(param0); @@ -49,41 +44,41 @@ BOOL ScrCmd_2EF (ScriptContext * param0) return 0; } -BOOL ScrCmd_0CD (ScriptContext * param0) +BOOL ScrCmd_0CD(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); StringTemplate_SetPlayerName(*v1, v2, SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem))); return 0; } -BOOL ScrCmd_0CE (ScriptContext * param0) +BOOL ScrCmd_0CE(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); StringTemplate_SetRivalName(*v1, v2, fieldSystem->saveData); return 0; } -BOOL ScrCmd_0CF (ScriptContext * param0) +BOOL ScrCmd_0CF(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); StringTemplate_SetCounterpartName(*v1, v2, fieldSystem->saveData); return 0; } -BOOL ScrCmd_0D0 (ScriptContext * param0) +BOOL ScrCmd_0D0(ScriptContext *param0) { - Pokemon * v0; - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + Pokemon *v0; + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); u8 v3 = ScriptContext_ReadByte(param0); u16 v4 = ScriptContext_GetVar(param0); @@ -93,10 +88,10 @@ BOOL ScrCmd_0D0 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2FD (ScriptContext * param0) +BOOL ScrCmd_2FD(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -104,10 +99,10 @@ BOOL ScrCmd_2FD (ScriptContext * param0) return 0; } -BOOL ScrCmd_0D1 (ScriptContext * param0) +BOOL ScrCmd_0D1(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -115,10 +110,10 @@ BOOL ScrCmd_0D1 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0D2 (ScriptContext * param0) +BOOL ScrCmd_0D2(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -127,10 +122,10 @@ BOOL ScrCmd_0D2 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0D3 (ScriptContext * param0) +BOOL ScrCmd_0D3(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4; @@ -141,10 +136,10 @@ BOOL ScrCmd_0D3 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0D4 (ScriptContext * param0) +BOOL ScrCmd_0D4(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -152,10 +147,10 @@ BOOL ScrCmd_0D4 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0D5 (ScriptContext * param0) +BOOL ScrCmd_0D5(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -163,10 +158,10 @@ BOOL ScrCmd_0D5 (ScriptContext * param0) return 0; } -BOOL ScrCmd_280 (ScriptContext * param0) +BOOL ScrCmd_280(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); u8 v4 = ScriptContext_ReadByte(param0); @@ -180,10 +175,10 @@ BOOL ScrCmd_280 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2F5 (ScriptContext * param0) +BOOL ScrCmd_2F5(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u32 v3 = ScriptContext_ReadWord(param0); u8 v4 = ScriptContext_ReadByte(param0); @@ -197,11 +192,11 @@ BOOL ScrCmd_2F5 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0D6 (ScriptContext * param0) +BOOL ScrCmd_0D6(ScriptContext *param0) { - Pokemon * v0; - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + Pokemon *v0; + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); u8 v3 = ScriptContext_ReadByte(param0); u16 v4 = ScriptContext_GetVar(param0); @@ -211,12 +206,12 @@ BOOL ScrCmd_0D6 (ScriptContext * param0) return 0; } -BOOL ScrCmd_251 (ScriptContext * param0) +BOOL ScrCmd_251(ScriptContext *param0) { - BoxPokemon * v0; - FieldSystem * fieldSystem = param0->fieldSystem; - PCBoxes * v2 = SaveData_PCBoxes(fieldSystem->saveData); - StringTemplate ** v3 = sub_0203F098(fieldSystem, 15); + BoxPokemon *v0; + FieldSystem *fieldSystem = param0->fieldSystem; + PCBoxes *v2 = SaveData_PCBoxes(fieldSystem->saveData); + StringTemplate **v3 = sub_0203F098(fieldSystem, 15); u8 v4 = ScriptContext_ReadByte(param0); u16 v5 = ScriptContext_GetVar(param0); u32 v6, v7; @@ -229,11 +224,11 @@ BOOL ScrCmd_251 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0D7 (ScriptContext * param0) +BOOL ScrCmd_0D7(ScriptContext *param0) { - Pokemon * v0; - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + Pokemon *v0; + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); u8 v3 = ScriptContext_ReadByte(param0); u16 v4 = ScriptContext_GetVar(param0); @@ -241,10 +236,10 @@ BOOL ScrCmd_0D7 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0D8 (ScriptContext * param0) +BOOL ScrCmd_0D8(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -252,12 +247,12 @@ BOOL ScrCmd_0D8 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0D9 (ScriptContext * param0) +BOOL ScrCmd_0D9(ScriptContext *param0) { int v0; - FieldSystem * fieldSystem = param0->fieldSystem; - TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); - StringTemplate ** v3 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + TrainerInfo *v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + StringTemplate **v3 = sub_0203F098(fieldSystem, 15); u8 v4 = ScriptContext_ReadByte(param0); v0 = sub_0205CA14(TrainerInfo_Gender(v2), TrainerInfo_Appearance(v2), 2); @@ -266,15 +261,15 @@ BOOL ScrCmd_0D9 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0DA (ScriptContext * param0) +BOOL ScrCmd_0DA(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_ReadHalfWord(param0); u8 v5 = ScriptContext_ReadByte(param0); - Strbuf* v6 = sub_02047998(v3, 4); + Strbuf *v6 = sub_02047998(v3, 4); StringTemplate_SetStrbuf(*v1, v2, v6, v4, v5, GAME_LANGUAGE); Strbuf_Free(v6); @@ -282,10 +277,10 @@ BOOL ScrCmd_0DA (ScriptContext * param0) return 0; } -static Strbuf* sub_02047998 (u16 param0, u32 param1) +static Strbuf *sub_02047998(u16 param0, u32 param1) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; v0 = MessageLoader_Init(1, 26, 412, param1); v1 = MessageLoader_GetNewStrbuf(v0, param0); @@ -294,12 +289,12 @@ static Strbuf* sub_02047998 (u16 param0, u32 param1) return v1; } -BOOL ScrCmd_0DB (ScriptContext * param0) +BOOL ScrCmd_0DB(ScriptContext *param0) { - StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); + StringTemplate **v0 = sub_0203F098(param0->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(param0); u16 v2 = sub_0206B054(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); - Strbuf* v3 = sub_02047998(v2, 4); + Strbuf *v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); Strbuf_Free(v3); @@ -307,12 +302,12 @@ BOOL ScrCmd_0DB (ScriptContext * param0) return 0; } -BOOL ScrCmd_0DC (ScriptContext * param0) +BOOL ScrCmd_0DC(ScriptContext *param0) { - StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); + StringTemplate **v0 = sub_0203F098(param0->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(param0); u16 v2 = sub_0206B064(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); - Strbuf* v3 = sub_02047998(v2, 4); + Strbuf *v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); Strbuf_Free(v3); @@ -320,12 +315,12 @@ BOOL ScrCmd_0DC (ScriptContext * param0) return 0; } -BOOL ScrCmd_0DD (ScriptContext * param0) +BOOL ScrCmd_0DD(ScriptContext *param0) { - StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); + StringTemplate **v0 = sub_0203F098(param0->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(param0); u16 v2 = sub_0206B08C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); - Strbuf* v3 = sub_02047998(v2, 4); + Strbuf *v3 = sub_02047998(v2, 4); StringTemplate_SetStrbuf(*v0, v1, v3, 0, 1, GAME_LANGUAGE); Strbuf_Free(v3); @@ -333,10 +328,10 @@ BOOL ScrCmd_0DD (ScriptContext * param0) return 0; } -BOOL ScrCmd_0DF (ScriptContext * param0) +BOOL ScrCmd_0DF(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -344,10 +339,10 @@ BOOL ScrCmd_0DF (ScriptContext * param0) return 0; } -BOOL ScrCmd_0E0 (ScriptContext * param0) +BOOL ScrCmd_0E0(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -355,10 +350,10 @@ BOOL ScrCmd_0E0 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0E1 (ScriptContext * param0) +BOOL ScrCmd_0E1(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -366,10 +361,10 @@ BOOL ScrCmd_0E1 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0E2 (ScriptContext * param0) +BOOL ScrCmd_0E2(ScriptContext *param0) { - Strbuf* v0 = Strbuf_Init(22, 4); - StringTemplate ** v1 = sub_0203F098(param0->fieldSystem, 15); + Strbuf *v0 = Strbuf_Init(22, 4); + StringTemplate **v1 = sub_0203F098(param0->fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -380,13 +375,13 @@ BOOL ScrCmd_0E2 (ScriptContext * param0) return 0; } -BOOL ScrCmd_17B (ScriptContext * param0) +BOOL ScrCmd_17B(ScriptContext *param0) { - StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); + StringTemplate **v0 = sub_0203F098(param0->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(param0); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); - Strbuf* v4 = BerryData_AllocAndGetName(v2 - 149, 32); + Strbuf *v4 = BerryData_AllocAndGetName(v2 - 149, 32); StringTemplate_SetStrbuf(*v0, v1, v4, 0, (v3 < 2 ? 1 : 0), GAME_LANGUAGE); Strbuf_Free(v4); @@ -394,9 +389,9 @@ BOOL ScrCmd_17B (ScriptContext * param0) return 0; } -BOOL ScrCmd_17C (ScriptContext * param0) +BOOL ScrCmd_17C(ScriptContext *param0) { - StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); + StringTemplate **v0 = sub_0203F098(param0->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(param0); u16 v2 = ScriptContext_GetVar(param0); @@ -404,10 +399,10 @@ BOOL ScrCmd_17C (ScriptContext * param0) return 0; } -BOOL ScrCmd_261 (ScriptContext * param0) +BOOL ScrCmd_261(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -415,11 +410,11 @@ BOOL ScrCmd_261 (ScriptContext * param0) return 0; } -BOOL ScrCmd_272 (ScriptContext * param0) +BOOL ScrCmd_272(ScriptContext *param0) { - Strbuf* v0; - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + Strbuf *v0; + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); u8 v3 = ScriptContext_ReadByte(param0); v0 = Strbuf_Init(10 + 1, 11); @@ -431,11 +426,11 @@ BOOL ScrCmd_272 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1CB (ScriptContext * param0) +BOOL ScrCmd_1CB(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); u8 v3 = ScriptContext_ReadByte(param0); u16 v4 = ScriptContext_GetVar(param0); u16 v5 = ScriptContext_GetVar(param0); @@ -448,10 +443,10 @@ BOOL ScrCmd_1CB (ScriptContext * param0) return 0; } -BOOL ScrCmd_232 (ScriptContext * param0) +BOOL ScrCmd_232(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4; @@ -462,10 +457,10 @@ BOOL ScrCmd_232 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2B3 (ScriptContext * param0) +BOOL ScrCmd_2B3(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -475,10 +470,10 @@ BOOL ScrCmd_2B3 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2F3 (ScriptContext * param0) +BOOL ScrCmd_2F3(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -486,10 +481,10 @@ BOOL ScrCmd_2F3 (ScriptContext * param0) return 0; } -BOOL ScrCmd_33C (ScriptContext * param0) +BOOL ScrCmd_33C(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -497,10 +492,10 @@ BOOL ScrCmd_33C (ScriptContext * param0) return 0; } -BOOL ScrCmd_33D (ScriptContext * param0) +BOOL ScrCmd_33D(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -508,10 +503,10 @@ BOOL ScrCmd_33D (ScriptContext * param0) return 0; } -BOOL ScrCmd_33E (ScriptContext * param0) +BOOL ScrCmd_33E(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -519,10 +514,10 @@ BOOL ScrCmd_33E (ScriptContext * param0) return 0; } -BOOL ScrCmd_33F (ScriptContext * param0) +BOOL ScrCmd_33F(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -530,10 +525,10 @@ BOOL ScrCmd_33F (ScriptContext * param0) return 0; } -BOOL ScrCmd_340 (ScriptContext * param0) +BOOL ScrCmd_340(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -541,10 +536,10 @@ BOOL ScrCmd_340 (ScriptContext * param0) return 0; } -BOOL ScrCmd_341 (ScriptContext * param0) +BOOL ScrCmd_341(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_ReadHalfWord(param0); @@ -554,9 +549,9 @@ BOOL ScrCmd_341 (ScriptContext * param0) return 0; } -BOOL ScrCmd_342 (ScriptContext * param0) +BOOL ScrCmd_342(ScriptContext *param0) { - StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); + StringTemplate **v0 = sub_0203F098(param0->fieldSystem, 15); u8 v1 = ScriptContext_ReadByte(param0); u16 v2 = sub_0206B08C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); @@ -564,10 +559,10 @@ BOOL ScrCmd_342 (ScriptContext * param0) return 0; } -BOOL ScrCmd_343 (ScriptContext * param0) +BOOL ScrCmd_343(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -575,10 +570,10 @@ BOOL ScrCmd_343 (ScriptContext * param0) return 0; } -BOOL ScrCmd_344 (ScriptContext * param0) +BOOL ScrCmd_344(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -586,10 +581,10 @@ BOOL ScrCmd_344 (ScriptContext * param0) return 0; } -BOOL ScrCmd_345 (ScriptContext * param0) +BOOL ScrCmd_345(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u16 v3 = ScriptContext_GetVar(param0); @@ -599,20 +594,20 @@ BOOL ScrCmd_345 (ScriptContext * param0) return 0; } -BOOL ScrCmd_346 (ScriptContext * param0) +BOOL ScrCmd_346(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); StringTemplate_CapitalizeArgAtIndex(*v1, v2); return 0; } -BOOL ScrCmd_347 (ScriptContext * param0) +BOOL ScrCmd_347(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v1 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v1 = sub_0203F098(fieldSystem, 15); u8 v2 = ScriptContext_ReadByte(param0); u8 v3 = ScriptContext_ReadByte(param0); diff --git a/src/unk_020480A8.c b/src/unk_020480A8.c index baa577a261..9c9c9bd192 100644 --- a/src/unk_020480A8.c +++ b/src/unk_020480A8.c @@ -1,28 +1,27 @@ +#include "unk_020480A8.h" + #include #include -#include "inlines.h" - -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "field/field_system.h" -#include "field_script_context.h" - #include "savedata/save_table.h" -#include "unk_020480A8.h" -#include "vars_flags.h" -#include "unk_0206AFE0.h" + +#include "field_script_context.h" +#include "inlines.h" +#include "party.h" #include "pokemon.h" +#include "unk_0206AFE0.h" #include "unk_020797C8.h" -#include "party.h" +#include "vars_flags.h" static u8 sub_02048268(u16 param0, u16 param1); -BOOL ScrCmd_24E (ScriptContext * param0) +BOOL ScrCmd_24E(ScriptContext *param0) { - VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(param0); + VarsFlags *v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(param0); u32 v2; v2 = sub_0206B2A4(v0); @@ -31,15 +30,15 @@ BOOL ScrCmd_24E (ScriptContext * param0) return 0; } -BOOL ScrCmd_24F (ScriptContext * param0) +BOOL ScrCmd_24F(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - BoxPokemon * v2; - PCBoxes * v3 = SaveData_PCBoxes(fieldSystem->saveData); - u16 * v4 = ScriptContext_GetVarPointer(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); - u16 * v6 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + BoxPokemon *v2; + PCBoxes *v3 = SaveData_PCBoxes(fieldSystem->saveData); + u16 *v4 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); + u16 *v6 = ScriptContext_GetVarPointer(param0); u16 v7 = ScriptContext_GetVar(param0); u16 v8, v9, v10; u16 v11, v12; @@ -104,9 +103,9 @@ BOOL ScrCmd_24F (ScriptContext * param0) return 0; } -BOOL ScrCmd_250 (ScriptContext * param0) +BOOL ScrCmd_250(ScriptContext *param0) { - VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); sub_0206B2C8(v0); return 0; @@ -114,7 +113,7 @@ BOOL ScrCmd_250 (ScriptContext * param0) static u16 Unk_021C07F0 = 0, Unk_021C07F2 = 0; -static u8 sub_02048268 (u16 param0, u16 param1) +static u8 sub_02048268(u16 param0, u16 param1) { u8 v0, v1; diff --git a/src/unk_020482D4.c b/src/unk_020482D4.c index 71d943adb8..ea1791797a 100644 --- a/src/unk_020482D4.c +++ b/src/unk_020482D4.c @@ -1,60 +1,59 @@ #include #include -#include "inlines.h" -#include "core_sys.h" - #include "field/field_system.h" +#include "core_sys.h" +#include "field_script_context.h" +#include "inlines.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_02006224.h" #include "unk_0202CC64.h" -#include "field_script_context.h" #include "unk_020553DC.h" -static BOOL sub_02048378(ScriptContext * param0); -static BOOL sub_02048454(ScriptContext * param0); -static BOOL sub_020484B0(ScriptContext * param0); -static BOOL sub_020484E4(ScriptContext * param0); -BOOL ScrCmd_050(ScriptContext * param0); -BOOL ScrCmd_051(ScriptContext * param0); -BOOL ScrCmd_052(ScriptContext * param0); -BOOL ScrCmd_053(ScriptContext * param0); -BOOL ScrCmd_054(ScriptContext * param0); -BOOL sub_02048378(ScriptContext * param0); -BOOL ScrCmd_055(ScriptContext * param0); -BOOL ScrCmd_056(ScriptContext * param0); -BOOL ScrCmd_057(ScriptContext * param0); -BOOL ScrCmd_058(ScriptContext * param0); -BOOL ScrCmd_PlayFanfare(ScriptContext * ctx); -BOOL ScrCmd_04A(ScriptContext * param0); -BOOL ScrCmd_04B(ScriptContext * param0); -BOOL ScrCmd_04C(ScriptContext * param0); -BOOL ScrCmd_04D(ScriptContext * param0); -BOOL ScrCmd_04E(ScriptContext * param0); -BOOL ScrCmd_04F(ScriptContext * param0); -BOOL ScrCmd_059(ScriptContext * param0); -BOOL ScrCmd_05A(ScriptContext * param0); -BOOL ScrCmd_05B(ScriptContext * param0); -BOOL ScrCmd_05C(ScriptContext * param0); -BOOL ScrCmd_05D(ScriptContext * param0); -BOOL ScrCmd_283(ScriptContext * param0); -BOOL ScrCmd_2AE(ScriptContext * param0); -BOOL ScrCmd_2F8(ScriptContext * param0); -BOOL ScrCmd_2F9(ScriptContext * param0); -BOOL ScrCmd_2FA(ScriptContext * param0); - -BOOL ScrCmd_2AE (ScriptContext * param0) +static BOOL sub_02048378(ScriptContext *param0); +static BOOL sub_02048454(ScriptContext *param0); +static BOOL sub_020484B0(ScriptContext *param0); +static BOOL sub_020484E4(ScriptContext *param0); +BOOL ScrCmd_050(ScriptContext *param0); +BOOL ScrCmd_051(ScriptContext *param0); +BOOL ScrCmd_052(ScriptContext *param0); +BOOL ScrCmd_053(ScriptContext *param0); +BOOL ScrCmd_054(ScriptContext *param0); +BOOL sub_02048378(ScriptContext *param0); +BOOL ScrCmd_055(ScriptContext *param0); +BOOL ScrCmd_056(ScriptContext *param0); +BOOL ScrCmd_057(ScriptContext *param0); +BOOL ScrCmd_058(ScriptContext *param0); +BOOL ScrCmd_PlayFanfare(ScriptContext *ctx); +BOOL ScrCmd_04A(ScriptContext *param0); +BOOL ScrCmd_04B(ScriptContext *param0); +BOOL ScrCmd_04C(ScriptContext *param0); +BOOL ScrCmd_04D(ScriptContext *param0); +BOOL ScrCmd_04E(ScriptContext *param0); +BOOL ScrCmd_04F(ScriptContext *param0); +BOOL ScrCmd_059(ScriptContext *param0); +BOOL ScrCmd_05A(ScriptContext *param0); +BOOL ScrCmd_05B(ScriptContext *param0); +BOOL ScrCmd_05C(ScriptContext *param0); +BOOL ScrCmd_05D(ScriptContext *param0); +BOOL ScrCmd_283(ScriptContext *param0); +BOOL ScrCmd_2AE(ScriptContext *param0); +BOOL ScrCmd_2F8(ScriptContext *param0); +BOOL ScrCmd_2F9(ScriptContext *param0); +BOOL ScrCmd_2FA(ScriptContext *param0); + +BOOL ScrCmd_2AE(ScriptContext *param0) { u16 v0 = ScriptContext_ReadHalfWord(param0); - u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02005690(v0); return 0; } -BOOL ScrCmd_050 (ScriptContext * param0) +BOOL ScrCmd_050(ScriptContext *param0) { u16 v0 = ScriptContext_ReadHalfWord(param0); @@ -62,7 +61,7 @@ BOOL ScrCmd_050 (ScriptContext * param0) return 0; } -BOOL ScrCmd_051 (ScriptContext * param0) +BOOL ScrCmd_051(ScriptContext *param0) { u16 v0 = ScriptContext_ReadHalfWord(param0); @@ -70,7 +69,7 @@ BOOL ScrCmd_051 (ScriptContext * param0) return 0; } -BOOL ScrCmd_052 (ScriptContext * param0) +BOOL ScrCmd_052(ScriptContext *param0) { int v0 = param0->fieldSystem->location->mapId; u16 v1 = sub_020554A4(param0->fieldSystem, v0); @@ -79,13 +78,13 @@ BOOL ScrCmd_052 (ScriptContext * param0) return 0; } -BOOL ScrCmd_053 (ScriptContext * param0) +BOOL ScrCmd_053(ScriptContext *param0) { sub_020553F0(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); return 0; } -BOOL ScrCmd_054 (ScriptContext * param0) +BOOL ScrCmd_054(ScriptContext *param0) { u16 v0 = ScriptContext_ReadHalfWord(param0); u16 v1 = ScriptContext_ReadHalfWord(param0); @@ -95,7 +94,7 @@ BOOL ScrCmd_054 (ScriptContext * param0) return 1; } -static BOOL sub_02048378 (ScriptContext * param0) +static BOOL sub_02048378(ScriptContext *param0) { if (Sound_CheckFade() == 0) { return 1; @@ -104,7 +103,7 @@ static BOOL sub_02048378 (ScriptContext * param0) return 0; } -BOOL ScrCmd_055 (ScriptContext * param0) +BOOL ScrCmd_055(ScriptContext *param0) { u16 v0 = ScriptContext_ReadHalfWord(param0); @@ -114,7 +113,7 @@ BOOL ScrCmd_055 (ScriptContext * param0) return 1; } -BOOL ScrCmd_056 (ScriptContext * param0) +BOOL ScrCmd_056(ScriptContext *param0) { u8 v0 = ScriptContext_ReadByte(param0); BOOL v1 = ScriptContext_ReadByte(param0); @@ -123,31 +122,31 @@ BOOL ScrCmd_056 (ScriptContext * param0) return 0; } -BOOL ScrCmd_057 (ScriptContext * param0) +BOOL ScrCmd_057(ScriptContext *param0) { sub_02005588(4, ScriptContext_ReadHalfWord(param0)); return 0; } -BOOL ScrCmd_058 (ScriptContext * param0) +BOOL ScrCmd_058(ScriptContext *param0) { sub_020041CC(ScriptContext_ReadByte(param0)); return 0; } -BOOL ScrCmd_PlayFanfare (ScriptContext * ctx) +BOOL ScrCmd_PlayFanfare(ScriptContext *ctx) { Sound_PlayEffect(ScriptContext_GetVar(ctx)); return FALSE; } -BOOL ScrCmd_04A (ScriptContext * param0) +BOOL ScrCmd_04A(ScriptContext *param0) { sub_020057A4(ScriptContext_GetVar(param0), 0); return 0; } -BOOL ScrCmd_04B (ScriptContext * param0) +BOOL ScrCmd_04B(ScriptContext *param0) { param0->data[0] = ScriptContext_GetVar(param0); @@ -155,7 +154,7 @@ BOOL ScrCmd_04B (ScriptContext * param0) return 1; } -static BOOL sub_02048454 (ScriptContext * param0) +static BOOL sub_02048454(ScriptContext *param0) { if (Sound_IsEffectPlaying(param0->data[0]) == 0) { return 1; @@ -164,7 +163,7 @@ static BOOL sub_02048454 (ScriptContext * param0) return 0; } -BOOL ScrCmd_04C (ScriptContext * param0) +BOOL ScrCmd_04C(ScriptContext *param0) { u16 v0, v1; @@ -176,13 +175,13 @@ BOOL ScrCmd_04C (ScriptContext * param0) return 0; } -BOOL ScrCmd_04D (ScriptContext * param0) +BOOL ScrCmd_04D(ScriptContext *param0) { ScriptContext_Pause(param0, sub_020484B0); return 1; } -static BOOL sub_020484B0 (ScriptContext * param0) +static BOOL sub_020484B0(ScriptContext *param0) { if (sub_0200598C() == 0) { return 1; @@ -191,23 +190,23 @@ static BOOL sub_020484B0 (ScriptContext * param0) return 0; } -BOOL ScrCmd_04E (ScriptContext * param0) +BOOL ScrCmd_04E(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; sub_02006150(ScriptContext_ReadHalfWord(param0)); return 0; } -BOOL ScrCmd_04F (ScriptContext * param0) +BOOL ScrCmd_04F(ScriptContext *param0) { ScriptContext_Pause(param0, sub_020484E4); return 1; } -static BOOL sub_020484E4 (ScriptContext * param0) +static BOOL sub_020484E4(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; if (sub_020061E4() == 0) { return 1; @@ -216,9 +215,9 @@ static BOOL sub_020484E4 (ScriptContext * param0) return 0; } -BOOL ScrCmd_059 (ScriptContext * param0) +BOOL ScrCmd_059(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); if (IsChatotCryStructReadyForProcessing(GetChatotCryDataFromSave(param0->fieldSystem->saveData)) == 1) { *v0 = 1; @@ -229,9 +228,9 @@ BOOL ScrCmd_059 (ScriptContext * param0) return 0; } -BOOL ScrCmd_05A (ScriptContext * param0) +BOOL ScrCmd_05A(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); if (StartMicSampling() == MIC_RESULT_SUCCESS) { *v0 = 1; @@ -242,25 +241,25 @@ BOOL ScrCmd_05A (ScriptContext * param0) return 0; } -BOOL ScrCmd_05B (ScriptContext * param0) +BOOL ScrCmd_05B(ScriptContext *param0) { StopMicSampling(); return 1; } -BOOL ScrCmd_05C (ScriptContext * param0) +BOOL ScrCmd_05C(ScriptContext *param0) { StoreMicDataInChatotCryStruct(GetChatotCryDataFromSave(param0->fieldSystem->saveData)); return 1; } -BOOL ScrCmd_05D (ScriptContext * param0) +BOOL ScrCmd_05D(ScriptContext *param0) { sub_02004550(63, 0, 0); return 1; } -BOOL ScrCmd_283 (ScriptContext * param0) +BOOL ScrCmd_283(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); u16 v1 = ScriptContext_GetVar(param0); @@ -269,7 +268,7 @@ BOOL ScrCmd_283 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2F8 (ScriptContext * param0) +BOOL ScrCmd_2F8(ScriptContext *param0) { if (gCoreSys.heldKeys & PAD_KEY_UP) { sub_02004550(22, 1218, 1); @@ -280,7 +279,7 @@ BOOL ScrCmd_2F8 (ScriptContext * param0) return 1; } -BOOL ScrCmd_2F9 (ScriptContext * param0) +BOOL ScrCmd_2F9(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); @@ -288,9 +287,9 @@ BOOL ScrCmd_2F9 (ScriptContext * param0) return 1; } -BOOL ScrCmd_2FA (ScriptContext * param0) +BOOL ScrCmd_2FA(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); *v0 = sub_020041FC(); return 0; diff --git a/src/unk_02048614.c b/src/unk_02048614.c index 2199e12f3d..23d7879d50 100644 --- a/src/unk_02048614.c +++ b/src/unk_02048614.c @@ -1,61 +1,60 @@ #include #include -#include "inlines.h" - -#include "sys_task_manager.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" #include "field/field_system.h" -#include "unk_020041CC.h" #include "field_script_context.h" +#include "inlines.h" +#include "map_object.h" +#include "party.h" +#include "sys_task_manager.h" +#include "unk_020041CC.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_02050A74.h" #include "unk_02051D8C.h" #include "unk_020528D0.h" #include "unk_02054884.h" #include "unk_020553DC.h" -#include "map_object.h" #include "unk_02067A84.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" -#include "party.h" +#include "vars_flags.h" -BOOL ScrCmd_0B6(ScriptContext * param0); -BOOL ScrCmd_0B7(ScriptContext * param0); -BOOL ScrCmd_0B8(ScriptContext * param0); -BOOL ScrCmd_0B9(ScriptContext * param0); -BOOL ScrCmd_0E4(ScriptContext * param0); -BOOL ScrCmd_0E5(ScriptContext * param0); -BOOL ScrCmd_2A0(ScriptContext * param0); -BOOL ScrCmd_0E7(ScriptContext * param0); -BOOL ScrCmd_0E8(ScriptContext * param0); -BOOL ScrCmd_0E9(ScriptContext * param0); -BOOL ScrCmd_0EA(ScriptContext * param0); -BOOL ScrCmd_0EB(ScriptContext * param0); -BOOL ScrCmd_0EC(ScriptContext * param0); -BOOL ScrCmd_0ED(ScriptContext * param0); -BOOL ScrCmd_2BC(ScriptContext * param0); -BOOL ScrCmd_0EE(ScriptContext * param0); -BOOL ScrCmd_0EF(ScriptContext * param0); -BOOL ScrCmd_0F0(ScriptContext * param0); -BOOL ScrCmd_0F1(ScriptContext * param0); -BOOL ScrCmd_314(ScriptContext * param0); - -BOOL ScrCmd_0B6 (ScriptContext * param0) +BOOL ScrCmd_0B6(ScriptContext *param0); +BOOL ScrCmd_0B7(ScriptContext *param0); +BOOL ScrCmd_0B8(ScriptContext *param0); +BOOL ScrCmd_0B9(ScriptContext *param0); +BOOL ScrCmd_0E4(ScriptContext *param0); +BOOL ScrCmd_0E5(ScriptContext *param0); +BOOL ScrCmd_2A0(ScriptContext *param0); +BOOL ScrCmd_0E7(ScriptContext *param0); +BOOL ScrCmd_0E8(ScriptContext *param0); +BOOL ScrCmd_0E9(ScriptContext *param0); +BOOL ScrCmd_0EA(ScriptContext *param0); +BOOL ScrCmd_0EB(ScriptContext *param0); +BOOL ScrCmd_0EC(ScriptContext *param0); +BOOL ScrCmd_0ED(ScriptContext *param0); +BOOL ScrCmd_2BC(ScriptContext *param0); +BOOL ScrCmd_0EE(ScriptContext *param0); +BOOL ScrCmd_0EF(ScriptContext *param0); +BOOL ScrCmd_0F0(ScriptContext *param0); +BOOL ScrCmd_0F1(ScriptContext *param0); +BOOL ScrCmd_314(ScriptContext *param0); + +BOOL ScrCmd_0B6(ScriptContext *param0) { - int * v0; - int * v1; - int * v2; - int * v3; - int * v4; - SysTask ** v5; - MapObject ** v6; - PlayerAvatar * playerAvatar; - FieldSystem * fieldSystem = param0->fieldSystem; + int *v0; + int *v1; + int *v2; + int *v3; + int *v4; + SysTask **v5; + MapObject **v6; + PlayerAvatar *playerAvatar; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v9 = ScriptContext_GetVar(param0); if (v9 == 0) { @@ -82,11 +81,11 @@ BOOL ScrCmd_0B6 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0B7 (ScriptContext * param0) +BOOL ScrCmd_0B7(ScriptContext *param0) { - SysTask ** v0; + SysTask **v0; u16 v1 = ScriptContext_GetVar(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); *v2 = 0; @@ -110,42 +109,42 @@ BOOL ScrCmd_0B7 (ScriptContext * param0) return 1; } -BOOL ScrCmd_0B8 (ScriptContext * param0) +BOOL ScrCmd_0B8(ScriptContext *param0) { - u16 * v0 = sub_0203F098(param0->fieldSystem, 28); - u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 *v0 = sub_0203F098(param0->fieldSystem, 28); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = *v0; return 0; } -BOOL ScrCmd_0B9 (ScriptContext * param0) +BOOL ScrCmd_0B9(ScriptContext *param0) { - u16 * v0 = sub_0203F098(param0->fieldSystem, 27); - u16 * v1 = sub_0203F098(param0->fieldSystem, 34); + u16 *v0 = sub_0203F098(param0->fieldSystem, 27); + u16 *v1 = sub_0203F098(param0->fieldSystem, 34); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); *v3 = (v2 == 0) ? (*v0) : (*v1); return 0; } -BOOL ScrCmd_0E4 (ScriptContext * param0) +BOOL ScrCmd_0E4(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v1 = sub_0203F098(fieldSystem, 8); - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v1 = sub_0203F098(fieldSystem, 8); + u16 *v2 = ScriptContext_GetVarPointer(param0); *v2 = Script_GetTrainerID(*v1); return 0; } -BOOL ScrCmd_0E5 (ScriptContext * param0) +BOOL ScrCmd_0E5(ScriptContext *param0) { u32 v0; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v2 = sub_0203F098(fieldSystem, 8); - BOOL * v3 = sub_0203F098(fieldSystem, 23); + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v2 = sub_0203F098(fieldSystem, 8); + BOOL *v3 = sub_0203F098(fieldSystem, 23); u16 v4 = ScriptContext_GetVar(param0); u16 v5 = ScriptContext_GetVar(param0); u16 v6; @@ -160,10 +159,10 @@ BOOL ScrCmd_0E5 (ScriptContext * param0) return 1; } -BOOL ScrCmd_2A0 (ScriptContext * param0) +BOOL ScrCmd_2A0(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - BOOL * v1 = sub_0203F098(fieldSystem, 23); + FieldSystem *fieldSystem = param0->fieldSystem; + BOOL *v1 = sub_0203F098(fieldSystem, 23); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); @@ -172,13 +171,13 @@ BOOL ScrCmd_2A0 (ScriptContext * param0) return 1; } -BOOL ScrCmd_0E7 (ScriptContext * param0) +BOOL ScrCmd_0E7(ScriptContext *param0) { u16 v0, v1, v2, v3, v4; - u16 * v5 = sub_0203F098(param0->fieldSystem, 8); - u16 * v6 = ScriptContext_GetVarPointer(param0); - u16 * v7 = ScriptContext_GetVarPointer(param0); - u16 * v8 = ScriptContext_GetVarPointer(param0); + u16 *v5 = sub_0203F098(param0->fieldSystem, 8); + u16 *v6 = ScriptContext_GetVarPointer(param0); + u16 *v7 = ScriptContext_GetVarPointer(param0); + u16 *v8 = ScriptContext_GetVarPointer(param0); v0 = Script_IsTrainerDoubleBattle(Script_GetTrainerID(*v5)); @@ -207,13 +206,13 @@ BOOL ScrCmd_0E7 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0E8 (ScriptContext * param0) +BOOL ScrCmd_0E8(ScriptContext *param0) { u16 v0, v1, v2, v3, v4; - u16 * v5 = sub_0203F098(param0->fieldSystem, 8); - u16 * v6 = ScriptContext_GetVarPointer(param0); - u16 * v7 = ScriptContext_GetVarPointer(param0); - u16 * v8 = ScriptContext_GetVarPointer(param0); + u16 *v5 = sub_0203F098(param0->fieldSystem, 8); + u16 *v6 = ScriptContext_GetVarPointer(param0); + u16 *v7 = ScriptContext_GetVarPointer(param0); + u16 *v8 = ScriptContext_GetVarPointer(param0); v0 = Script_IsTrainerDoubleBattle(Script_GetTrainerID(*v5)); @@ -242,16 +241,16 @@ BOOL ScrCmd_0E8 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0E9 (ScriptContext * param0) +BOOL ScrCmd_0E9(ScriptContext *param0) { - u16 * v0 = sub_0203F098(param0->fieldSystem, 8); - u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 *v0 = sub_0203F098(param0->fieldSystem, 8); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = Script_IsTrainerDoubleBattle(Script_GetTrainerID(*v0)); return 0; } -BOOL ScrCmd_0EA (ScriptContext * param0) +BOOL ScrCmd_0EA(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); @@ -259,61 +258,61 @@ BOOL ScrCmd_0EA (ScriptContext * param0) return 1; } -BOOL ScrCmd_0EB (ScriptContext * param0) +BOOL ScrCmd_0EB(ScriptContext *param0) { sub_02052C5C(param0->taskManager); return 1; } -BOOL ScrCmd_0EC (ScriptContext * param0) +BOOL ScrCmd_0EC(ScriptContext *param0) { - BOOL * v0 = sub_0203F098(param0->fieldSystem, 23); - u16 * v1 = ScriptContext_GetVarPointer(param0); + BOOL *v0 = sub_0203F098(param0->fieldSystem, 23); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02052868(*v0); return 1; } -BOOL ScrCmd_0ED (ScriptContext * param0) +BOOL ScrCmd_0ED(ScriptContext *param0) { - BOOL * v0 = sub_0203F098(param0->fieldSystem, 23); - u16 * v1 = ScriptContext_GetVarPointer(param0); + BOOL *v0 = sub_0203F098(param0->fieldSystem, 23); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02052878(*v0); return 1; } -BOOL ScrCmd_2BC (ScriptContext * param0) +BOOL ScrCmd_2BC(ScriptContext *param0) { - BOOL * v0 = sub_0203F098(param0->fieldSystem, 23); - u16 * v1 = ScriptContext_GetVarPointer(param0); + BOOL *v0 = sub_0203F098(param0->fieldSystem, 23); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02052888(*v0); return 1; } -BOOL ScrCmd_0EE (ScriptContext * param0) +BOOL ScrCmd_0EE(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); *v0 = Party_HasTwoAliveMons(Party_GetFromSavedata(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_0EF (ScriptContext * param0) +BOOL ScrCmd_0EF(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - BOOL * v1 = sub_0203F098(fieldSystem, 23); + FieldSystem *fieldSystem = param0->fieldSystem; + BOOL *v1 = sub_0203F098(fieldSystem, 23); sub_020515CC(param0->taskManager, 1, 0, 0, 11, v1); return 1; } -BOOL ScrCmd_0F0 (ScriptContext * param0) +BOOL ScrCmd_0F0(ScriptContext *param0) { - MapObject ** v0; - FieldSystem * fieldSystem = param0->fieldSystem; + MapObject **v0; + FieldSystem *fieldSystem = param0->fieldSystem; v0 = sub_0203F098(fieldSystem, 10); sub_0203F2BC(MapObject_FieldSystem(*v0), MapObject_Id(*v0)); @@ -321,12 +320,12 @@ BOOL ScrCmd_0F0 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0F1 (ScriptContext * param0) +BOOL ScrCmd_0F1(ScriptContext *param0) { int v0; s32 v1; - MapObject ** v2; - FieldSystem * fieldSystem = param0->fieldSystem; + MapObject **v2; + FieldSystem *fieldSystem = param0->fieldSystem; v2 = sub_0203F098(fieldSystem, 10); v1 = (s32)ScriptContext_ReadWord(param0); @@ -340,10 +339,10 @@ BOOL ScrCmd_0F1 (ScriptContext * param0) return 0; } -BOOL ScrCmd_314 (ScriptContext * param0) +BOOL ScrCmd_314(ScriptContext *param0) { - BOOL * v0 = sub_0203F098(param0->fieldSystem, 23); - u16 * v1 = ScriptContext_GetVarPointer(param0); + BOOL *v0 = sub_0203F098(param0->fieldSystem, 23); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = *v0; return 1; diff --git a/src/unk_02048BD0.c b/src/unk_02048BD0.c index eb24a6f2e9..6ca16e5bd6 100644 --- a/src/unk_02048BD0.c +++ b/src/unk_02048BD0.c @@ -1,86 +1,74 @@ +#include "unk_02048BD0.h" + #include #include -#include "inlines.h" - -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202B4A0_decl.h" -#include "savedata.h" +#include "field_script_context.h" +#include "inlines.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" +#include "trainer_info.h" #include "unk_0201D15C.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202B37C.h" #include "unk_0203D1B8.h" -#include "field_script_context.h" #include "unk_0203E880.h" -#include "unk_02048BD0.h" #include "unk_0206CCB0.h" -BOOL ScrCmd_21D (ScriptContext * param0) +BOOL ScrCmd_21D(ScriptContext *param0) { - StringTemplate ** v0 = sub_0203F098(param0->fieldSystem, 15); - UnkStruct_0202B4A0 * v1 = sub_0202B4A0(param0->fieldSystem->saveData); - SaveData * v2 = param0->fieldSystem->saveData; + StringTemplate **v0 = sub_0203F098(param0->fieldSystem, 15); + UnkStruct_0202B4A0 *v1 = sub_0202B4A0(param0->fieldSystem->saveData); + SaveData *v2 = param0->fieldSystem->saveData; switch (ScriptContext_ReadHalfWord(param0)) { - case 0: - { + case 0: { u16 v3; - u16 * v4; + u16 *v4; v3 = ScriptContext_GetVar(param0); v4 = ScriptContext_GetVarPointer(param0); *v4 = sub_0202B4AC(v1, v3); return 0; - } - break; - case 1: - { + } break; + case 1: { u16 v5; - u16 * v6; + u16 *v6; v5 = ScriptContext_GetVar(param0); v6 = ScriptContext_GetVarPointer(param0); *v6 = sub_0202B4C4(v1, v5); return 0; - } - break; - case 2: - { + } break; + case 2: { u16 v7, v8; v7 = ScriptContext_GetVar(param0); v8 = ScriptContext_GetVar(param0); StringTemplate_SetUnionGroupName(*v0, v2, v7, v8, 0); - } - break; - case 3: - { + } break; + case 3: { u16 v9, v10; v9 = ScriptContext_GetVar(param0); v10 = ScriptContext_GetVar(param0); StringTemplate_SetUnionGroupName(*v0, v2, v9, v10, 1); - } - break; - case 4: - { - const u16 * v11; + } break; + case 4: { + const u16 *v11; v11 = sub_0202B42C(v1, 0, 0); sub_0203DFE8(param0->taskManager, 5, 0, 7, 0, v11, ScriptContext_GetVarPointer(param0)); } return 1; - case 5: - { + case 5: { u16 v12 = ScriptContext_GetVar(param0); BOOL v13 = sub_0202B4AC(v1, 1); @@ -91,10 +79,9 @@ BOOL ScrCmd_21D (ScriptContext * param0) } } return 0; - case 6: - { - Strbuf* v14 = Strbuf_Init(64, 32); - TrainerInfo * v15 = SaveData_GetTrainerInfo(param0->fieldSystem->saveData); + case 6: { + Strbuf *v14 = Strbuf_Init(64, 32); + TrainerInfo *v15 = SaveData_GetTrainerInfo(param0->fieldSystem->saveData); TrainerInfo_NameStrbuf(v15, v14); sub_0202B444(v1, 0, 1, v14); @@ -104,8 +91,7 @@ BOOL ScrCmd_21D (ScriptContext * param0) Strbuf_Free(v14); sub_0202B384(v1, 0, 1); sub_0206D424(param0->fieldSystem); - } - break; + } break; } return 0; diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index 0fab2b4185..a7cd36b47f 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -1,15 +1,12 @@ +#include "unk_02048DD8.h" + #include #include -#include "inlines.h" - -#include "strbuf.h" #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_0202A750_decl.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_0202E7D8.h" #include "struct_defs/struct_0202E7E4.h" #include "struct_defs/struct_0202E7F0.h" @@ -17,31 +14,32 @@ #include "struct_defs/struct_0202E808.h" #include "struct_defs/struct_0202E810.h" #include "struct_defs/struct_0202E81C.h" + #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay006/ov6_022465FC.h" +#include "overlay006/ov6_02246A30.h" +#include "overlay025/poketch_system.h" +#include "savedata/save_table.h" +#include "field_script_context.h" +#include "inlines.h" #include "message.h" -#include "string_template.h" +#include "party.h" +#include "pokemon.h" +#include "poketch_data.h" #include "strbuf.h" -#include "savedata/save_table.h" +#include "string_template.h" #include "unk_020298BC.h" #include "unk_0202CD50.h" #include "unk_0202E2CC.h" -#include "field_script_context.h" #include "unk_0203E880.h" -#include "unk_02048DD8.h" #include "unk_02054884.h" -#include "poketch_data.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "party.h" -#include "overlay006/ov6_022465FC.h" -#include "overlay006/ov6_02246A30.h" -#include "overlay025/poketch_system.h" -typedef void (* UnkFuncPtr_020EBB48)(FieldSystem *, u16); -typedef void (* UnkFuncPtr_020EBB48_1)(FieldSystem *, StringTemplate *); -typedef BOOL (* UnkFuncPtr_020EBB48_2)(FieldSystem *); +typedef void (*UnkFuncPtr_020EBB48)(FieldSystem *, u16); +typedef void (*UnkFuncPtr_020EBB48_1)(FieldSystem *, StringTemplate *); +typedef BOOL (*UnkFuncPtr_020EBB48_2)(FieldSystem *); typedef struct { UnkFuncPtr_020EBB48 unk_00; @@ -50,102 +48,90 @@ typedef struct { u32 unk_0C; } UnkStruct_020EBB48; -static int sub_020491D0(int param0, FieldSystem * fieldSystem, StringTemplate * param2); -static void sub_020491B8(FieldSystem * fieldSystem, int param1, u16 param2, u16 param3); -static BOOL sub_020491F4(FieldSystem * fieldSystem, int param1); -BOOL ScrCmd_31B(ScriptContext * param0); -BOOL ScrCmd_329(ScriptContext * param0); +static int sub_020491D0(int param0, FieldSystem *fieldSystem, StringTemplate *param2); +static void sub_020491B8(FieldSystem *fieldSystem, int param1, u16 param2, u16 param3); +static BOOL sub_020491F4(FieldSystem *fieldSystem, int param1); +BOOL ScrCmd_31B(ScriptContext *param0); +BOOL ScrCmd_329(ScriptContext *param0); -BOOL ScrCmd_235 (ScriptContext * param0) +BOOL ScrCmd_235(ScriptContext *param0) { switch (ScriptContext_ReadHalfWord(param0)) { - case 0: - { - u16 * v0 = ScriptContext_GetVarPointer(param0); + case 0: { + u16 *v0 = ScriptContext_GetVarPointer(param0); *v0 = ov6_0224660C(param0->fieldSystem); - } - break; - case 1: - { + } break; + case 1: { u16 v1 = ScriptContext_ReadHalfWord(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); *v2 = 622; *v3 = ov6_02246978(param0->fieldSystem, v1); - } - break; - case 3: - { - StringTemplate ** v4 = sub_0203F098(param0->fieldSystem, 15); + } break; + case 3: { + StringTemplate **v4 = sub_0203F098(param0->fieldSystem, 15); u16 v5 = ScriptContext_GetVar(param0); - u16 * v6 = ScriptContext_GetVarPointer(param0); - u16 * v7 = ScriptContext_GetVarPointer(param0); + u16 *v6 = ScriptContext_GetVarPointer(param0); + u16 *v7 = ScriptContext_GetVarPointer(param0); ov6_022469E0(param0->fieldSystem, *v4, v5, v6, v7); - } - break; + } break; case 2: ov6_022465FC(param0->fieldSystem); break; - case 4: - { - u16 * v8 = ScriptContext_GetVarPointer(param0); - u16 * v9 = ScriptContext_GetVarPointer(param0); + case 4: { + u16 *v8 = ScriptContext_GetVarPointer(param0); + u16 *v9 = ScriptContext_GetVarPointer(param0); *v8 = 623; *v9 = ov6_02246B40(param0->fieldSystem); - } - break; - case 5: - { + } break; + case 5: { u16 v10 = ScriptContext_GetVar(param0); u16 v11 = ScriptContext_GetVar(param0); - u16 * v12 = ScriptContext_GetVarPointer(param0); + u16 *v12 = ScriptContext_GetVarPointer(param0); *v12 = ov6_022468B0(param0->fieldSystem, v10, v11); - } - break; - case 6: - { - u16 * v13 = ScriptContext_GetVarPointer(param0); + } break; + case 6: { + u16 *v13 = ScriptContext_GetVarPointer(param0); *v13 = ov6_02246920(param0->fieldSystem); - } - break; + } break; } return 0; } -BOOL ScrCmd_236 (ScriptContext * param0) +BOOL ScrCmd_236(ScriptContext *param0) { sub_0206D4AC(param0->fieldSystem, ScriptContext_GetVar(param0)); return 0; } -BOOL ScrCmd_2B8 (ScriptContext * param0) +BOOL ScrCmd_2B8(ScriptContext *param0) { - Party * v0 = Party_GetFromSavedata(param0->fieldSystem->saveData); - Pokemon * v1 = Party_GetPokemonBySlotIndex(v0, ScriptContext_GetVar(param0)); + Party *v0 = Party_GetFromSavedata(param0->fieldSystem->saveData); + Pokemon *v1 = Party_GetPokemonBySlotIndex(v0, ScriptContext_GetVar(param0)); sub_0206D60C(param0->fieldSystem, v1); return 0; } -BOOL ScrCmd_30B (ScriptContext * param0) +BOOL ScrCmd_30B(ScriptContext *param0) { sub_0206D7C4(param0->fieldSystem); return 0; } -BOOL ScrCmd_30C (ScriptContext * param0) +BOOL ScrCmd_30C(ScriptContext *param0) { sub_0206DB20(param0->fieldSystem); return 0; } -BOOL ScrCmd_30D (ScriptContext * param0) +BOOL ScrCmd_30D(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); @@ -155,31 +141,28 @@ BOOL ScrCmd_30D (ScriptContext * param0) static const UnkStruct_020EBB48 Unk_020EBB48[19]; -BOOL ScrCmd_237 (ScriptContext * param0) +BOOL ScrCmd_237(ScriptContext *param0) { - StringTemplate ** v0; + StringTemplate **v0; v0 = sub_0203F098(param0->fieldSystem, 15); switch (ScriptContext_ReadHalfWord(param0)) { - case 0: - { + case 0: { int v1; - u16 * v2; - u16 * v3; + u16 *v2; + u16 *v3; v1 = ScriptContext_GetVar(param0); v2 = ScriptContext_GetVarPointer(param0); v3 = ScriptContext_GetVarPointer(param0); *v2 = 621; *v3 = sub_020491D0(v1, param0->fieldSystem, *v0); - } - break; - case 1: - { + } break; + case 1: { u16 v4; u16 v5, v6; - UnkStruct_0202CD88 * v7 = sub_0202CD88(param0->fieldSystem->saveData); + UnkStruct_0202CD88 *v7 = sub_0202CD88(param0->fieldSystem->saveData); v4 = ScriptContext_GetVar(param0); v5 = ScriptContext_GetVar(param0); @@ -187,17 +170,16 @@ BOOL ScrCmd_237 (ScriptContext * param0) sub_020491B8(param0->fieldSystem, v4, v5, v6); sub_0202CFEC(v7, 3); - } - break; + } break; } return 0; } -BOOL ScrCmd_238 (ScriptContext * param0) +BOOL ScrCmd_238(ScriptContext *param0) { u16 v0; - u16 * v1; + u16 *v1; v0 = ScriptContext_GetVar(param0); v1 = ScriptContext_GetVarPointer(param0); @@ -206,19 +188,17 @@ BOOL ScrCmd_238 (ScriptContext * param0) return 0; } -BOOL ScrCmd_27C (ScriptContext * param0) +BOOL ScrCmd_27C(ScriptContext *param0) { - TVBroadcast * v0 = SaveData_TVBroadcast(param0->fieldSystem->saveData); + TVBroadcast *v0 = SaveData_TVBroadcast(param0->fieldSystem->saveData); switch (ScriptContext_ReadHalfWord(param0)) { - case 0: - { - Party * v1 = Party_GetFromSavedata(param0->fieldSystem->saveData); - Pokemon * v2 = Party_GetPokemonBySlotIndex(v1, ScriptContext_GetVar(param0)); + case 0: { + Party *v1 = Party_GetFromSavedata(param0->fieldSystem->saveData); + Pokemon *v2 = Party_GetPokemonBySlotIndex(v1, ScriptContext_GetVar(param0)); sub_0206CF48(v0, v2, 4); - } - break; + } break; case 1: sub_0206CFB4(v0, ScriptContext_GetVar(param0)); break; @@ -230,7 +210,7 @@ BOOL ScrCmd_27C (ScriptContext * param0) return 0; } -static void sub_020491B8 (FieldSystem * fieldSystem, int param1, u16 param2, u16 param3) +static void sub_020491B8(FieldSystem *fieldSystem, int param1, u16 param2, u16 param3) { UnkFuncPtr_020EBB48 v0; @@ -241,7 +221,7 @@ static void sub_020491B8 (FieldSystem * fieldSystem, int param1, u16 param2, u16 } } -static int sub_020491D0 (int param0, FieldSystem * fieldSystem, StringTemplate * param2) +static int sub_020491D0(int param0, FieldSystem *fieldSystem, StringTemplate *param2) { UnkFuncPtr_020EBB48_1 v0; @@ -254,10 +234,10 @@ static int sub_020491D0 (int param0, FieldSystem * fieldSystem, StringTemplate * return Unk_020EBB48[param0 - 1].unk_0C; } -static BOOL sub_020491F4 (FieldSystem * fieldSystem, int param1) +static BOOL sub_020491F4(FieldSystem *fieldSystem, int param1) { UnkFuncPtr_020EBB48_2 v0; - TVBroadcast * v1 = SaveData_TVBroadcast(fieldSystem->saveData); + TVBroadcast *v1 = SaveData_TVBroadcast(fieldSystem->saveData); if (sub_0202E6B0(v1, 1, param1) == 0) { return 0; @@ -272,24 +252,24 @@ static BOOL sub_020491F4 (FieldSystem * fieldSystem, int param1) return v0(fieldSystem); } -static void sub_0204922C (StringTemplate * param0, int param1, const u16 * param2, int param3, int param4, int param5) +static void sub_0204922C(StringTemplate *param0, int param1, const u16 *param2, int param3, int param4, int param5) { - Strbuf* v0 = Strbuf_Init(64, 4); + Strbuf *v0 = Strbuf_Init(64, 4); Strbuf_CopyChars(v0, param2); StringTemplate_SetStrbuf(param0, param1, v0, param3, param5, param4); Strbuf_Free(v0); } -static void sub_02049268 (FieldSystem * fieldSystem, StringTemplate * param1) +static void sub_02049268(FieldSystem *fieldSystem, StringTemplate *param1) { - Party * v0 = Party_GetFromSavedata(fieldSystem->saveData); - Pokemon * v1 = Party_FindFirstHatchedMon(v0); + Party *v0 = Party_GetFromSavedata(fieldSystem->saveData); + Pokemon *v1 = Party_FindFirstHatchedMon(v0); StringTemplate_SetSpeciesName(param1, 0, Pokemon_GetBoxPokemon(v1)); } -static void sub_02049288 (FieldSystem * fieldSystem, StringTemplate * param1) +static void sub_02049288(FieldSystem *fieldSystem, StringTemplate *param1) { int v0; @@ -297,31 +277,31 @@ static void sub_02049288 (FieldSystem * fieldSystem, StringTemplate * param1) StringTemplate_SetPoketchAppName(param1, 0, v0); } -static void sub_020492A0 (FieldSystem * fieldSystem, StringTemplate * param1) +static void sub_020492A0(FieldSystem *fieldSystem, StringTemplate *param1) { u16 v0[10 + 1]; - TVBroadcast * v1 = SaveData_TVBroadcast(fieldSystem->saveData); - UnkStruct_0202E7E4 * v2 = sub_0202E7E4(v1); + TVBroadcast *v1 = SaveData_TVBroadcast(fieldSystem->saveData); + UnkStruct_0202E7E4 *v2 = sub_0202E7E4(v1); MessageLoader_GetSpeciesName(v2->unk_02, 4, v0); sub_0204922C(param1, 0, v0, 0, GAME_LANGUAGE, 1); } -static void sub_020492D4 (FieldSystem * fieldSystem, StringTemplate * param1) +static void sub_020492D4(FieldSystem *fieldSystem, StringTemplate *param1) { u16 v0[10 + 1]; - TVBroadcast * v1 = SaveData_TVBroadcast(fieldSystem->saveData); - UnkStruct_0202E810 * v2 = sub_0202E810(v1); + TVBroadcast *v1 = SaveData_TVBroadcast(fieldSystem->saveData); + UnkStruct_0202E810 *v2 = sub_0202E810(v1); MessageLoader_GetSpeciesName(v2->unk_02, 4, v0); sub_0204922C(param1, 0, v0, 0, GAME_LANGUAGE, 1); } -static void sub_02049308 (FieldSystem * fieldSystem, StringTemplate * param1) +static void sub_02049308(FieldSystem *fieldSystem, StringTemplate *param1) { - Strbuf* v0; - TVBroadcast * v1 = SaveData_TVBroadcast(fieldSystem->saveData); - UnkStruct_0202E81C * v2 = sub_0202E81C(v1); + Strbuf *v0; + TVBroadcast *v1 = SaveData_TVBroadcast(fieldSystem->saveData); + UnkStruct_0202E81C *v2 = sub_0202E81C(v1); v0 = Strbuf_Init(64, 4); @@ -330,81 +310,81 @@ static void sub_02049308 (FieldSystem * fieldSystem, StringTemplate * param1) Strbuf_Free(v0); } -static BOOL sub_02049348 (FieldSystem * fieldSystem) +static BOOL sub_02049348(FieldSystem *fieldSystem) { - UnkStruct_0202E7FC * v0 = sub_0202E7FC(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0202E7FC *v0 = sub_0202E7FC(SaveData_TVBroadcast(fieldSystem->saveData)); return v0->unk_00; } -static BOOL sub_02049358 (FieldSystem * fieldSystem) +static BOOL sub_02049358(FieldSystem *fieldSystem) { PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); return PoketchData_IsEnabled(poketchData); } -static BOOL sub_02049368 (FieldSystem * fieldSystem) +static BOOL sub_02049368(FieldSystem *fieldSystem) { - UnkStruct_0202E7D8 * v0 = sub_0202E7D8(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0202E7D8 *v0 = sub_0202E7D8(SaveData_TVBroadcast(fieldSystem->saveData)); return v0->unk_00; } -static BOOL sub_02049378 (FieldSystem * fieldSystem) +static BOOL sub_02049378(FieldSystem *fieldSystem) { - UnkStruct_0202A750 * v0 = sub_0202A750(fieldSystem->saveData); + UnkStruct_0202A750 *v0 = sub_0202A750(fieldSystem->saveData); return sub_02029D10(v0, 0); } -static BOOL sub_02049388 (FieldSystem * fieldSystem) +static BOOL sub_02049388(FieldSystem *fieldSystem) { - UnkStruct_0202E7F0 * v0 = sub_0202E7F0(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0202E7F0 *v0 = sub_0202E7F0(SaveData_TVBroadcast(fieldSystem->saveData)); return v0->unk_00; } -static BOOL sub_02049398 (FieldSystem * fieldSystem) +static BOOL sub_02049398(FieldSystem *fieldSystem) { - UnkStruct_0202E7E4 * v0 = sub_0202E7E4(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0202E7E4 *v0 = sub_0202E7E4(SaveData_TVBroadcast(fieldSystem->saveData)); return v0->unk_00; } -static BOOL sub_020493A8 (FieldSystem * fieldSystem) +static BOOL sub_020493A8(FieldSystem *fieldSystem) { - UnkStruct_0202E810 * v0 = sub_0202E810(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0202E810 *v0 = sub_0202E810(SaveData_TVBroadcast(fieldSystem->saveData)); return v0->unk_00; } -static BOOL sub_020493B8 (FieldSystem * fieldSystem) +static BOOL sub_020493B8(FieldSystem *fieldSystem) { - UnkStruct_0202E81C * v0 = sub_0202E81C(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0202E81C *v0 = sub_0202E81C(SaveData_TVBroadcast(fieldSystem->saveData)); return v0->unk_00; } static const UnkStruct_020EBB48 Unk_020EBB48[19] = { - {NULL, NULL, NULL, 0x3}, - {sub_0206E0E0, NULL, sub_02049348, 0x4}, - {NULL, NULL, NULL, 0x5}, - {sub_0206E174, sub_02049268, NULL, 0x6}, - {NULL, NULL, NULL, 0x7}, - {sub_0206E264, sub_02049288, sub_02049358, 0x8}, - {sub_0206E2BC, NULL, sub_02049368, 0x9}, - {NULL, NULL, NULL, 0xA}, - {sub_0206E398, NULL, sub_02049378, 0xB}, - {sub_0206E414, NULL, NULL, 0xC}, - {sub_0206E448, NULL, sub_02049388, 0xD}, - {NULL, NULL, NULL, 0xE}, - {sub_0206E4DC, sub_020492A0, sub_02049398, 0xF}, - {sub_0206E5A0, sub_020492D4, sub_020493A8, 0x10}, - {sub_0206E668, NULL, NULL, 0x11}, - {sub_0206E6A8, NULL, NULL, 0x12}, - {sub_0206E6E8, NULL, NULL, 0x13}, - {sub_0206E728, NULL, NULL, 0x14}, - {sub_0206E768, sub_02049308, sub_020493B8, 0x15} + { NULL, NULL, NULL, 0x3 }, + { sub_0206E0E0, NULL, sub_02049348, 0x4 }, + { NULL, NULL, NULL, 0x5 }, + { sub_0206E174, sub_02049268, NULL, 0x6 }, + { NULL, NULL, NULL, 0x7 }, + { sub_0206E264, sub_02049288, sub_02049358, 0x8 }, + { sub_0206E2BC, NULL, sub_02049368, 0x9 }, + { NULL, NULL, NULL, 0xA }, + { sub_0206E398, NULL, sub_02049378, 0xB }, + { sub_0206E414, NULL, NULL, 0xC }, + { sub_0206E448, NULL, sub_02049388, 0xD }, + { NULL, NULL, NULL, 0xE }, + { sub_0206E4DC, sub_020492A0, sub_02049398, 0xF }, + { sub_0206E5A0, sub_020492D4, sub_020493A8, 0x10 }, + { sub_0206E668, NULL, NULL, 0x11 }, + { sub_0206E6A8, NULL, NULL, 0x12 }, + { sub_0206E6E8, NULL, NULL, 0x13 }, + { sub_0206E728, NULL, NULL, 0x14 }, + { sub_0206E768, sub_02049308, sub_020493B8, 0x15 } }; -BOOL ScrCmd_31B (ScriptContext * param0) +BOOL ScrCmd_31B(ScriptContext *param0) { - TVBroadcast * v0; - UnkStruct_0202E808 * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + TVBroadcast *v0; + UnkStruct_0202E808 *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); v0 = SaveData_TVBroadcast(param0->fieldSystem->saveData); v1 = sub_0202E808(v0); @@ -413,14 +393,14 @@ BOOL ScrCmd_31B (ScriptContext * param0) return 0; } -BOOL ScrCmd_329 (ScriptContext * param0) +BOOL ScrCmd_329(ScriptContext *param0) { - TVBroadcast * v0; - UnkStruct_0202E81C * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); - u16 * v4 = ScriptContext_GetVarPointer(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); + TVBroadcast *v0; + UnkStruct_0202E81C *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); + u16 *v4 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); v0 = SaveData_TVBroadcast(param0->fieldSystem->saveData); v1 = sub_0202E81C(v0); diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c index e54d57800a..272499de72 100644 --- a/src/unk_020494DC.c +++ b/src/unk_020494DC.c @@ -1,34 +1,34 @@ +#include "unk_020494DC.h" + #include #include -#include "inlines.h" - -#include "trainer_info.h" -#include "savedata.h" - -#include "field/field_system.h" #include "struct_defs/struct_02049A68.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0205AA50.h" +#include "field/field_system.h" +#include "overlay005/ov5_021DC018.h" + +#include "communication_system.h" +#include "field_script_context.h" +#include "field_system.h" +#include "inlines.h" +#include "savedata.h" +#include "trainer_info.h" #include "unk_0202CD50.h" #include "unk_0202D05C.h" -#include "communication_system.h" #include "unk_020363E8.h" -#include "field_system.h" -#include "field_script_context.h" #include "unk_0203E880.h" -#include "unk_020494DC.h" #include "unk_02049D08.h" #include "unk_0204AEE8.h" #include "unk_0205DFC4.h" #include "unk_0206B9D8.h" #include "unk_0209BA80.h" -#include "overlay005/ov5_021DC018.h" -static u16 sub_02049AE0(UnkStruct_0204AFC4 * param0, u8 param1); +static u16 sub_02049AE0(UnkStruct_0204AFC4 *param0, u8 param1); -BOOL ScrCmd_1DB (ScriptContext * param0) +BOOL ScrCmd_1DB(ScriptContext *param0) { u16 v0, v1; @@ -39,15 +39,15 @@ BOOL ScrCmd_1DB (ScriptContext * param0) return 0; } -BOOL ScrCmd_1DA (ScriptContext * param0) +BOOL ScrCmd_1DA(ScriptContext *param0) { sub_0204A110(&(param0->fieldSystem->unk_AC)); return 0; } -BOOL ScrCmd_1DC (ScriptContext * param0) +BOOL ScrCmd_1DC(ScriptContext *param0) { - UnkStruct_0204AFC4 * v0; + UnkStruct_0204AFC4 *v0; sub_0204A32C(param0->fieldSystem->unk_AC); param0->fieldSystem->unk_AC = NULL; @@ -55,12 +55,12 @@ BOOL ScrCmd_1DC (ScriptContext * param0) return 0; } -BOOL ScrCmd_1DD (ScriptContext * param0) +BOOL ScrCmd_1DD(ScriptContext *param0) { u16 v0, v1, v2; - u16 * v3, * v4; - void ** v5; - UnkStruct_0204AFC4 * v6; + u16 *v3, *v4; + void **v5; + UnkStruct_0204AFC4 *v6; v0 = ScriptContext_ReadHalfWord(param0); v1 = ScriptContext_GetVar(param0); @@ -199,11 +199,11 @@ BOOL ScrCmd_1DD (ScriptContext * param0) return 0; } -BOOL ScrCmd_1DE (ScriptContext * param0) +BOOL ScrCmd_1DE(ScriptContext *param0) { u16 v0, v1; - u16 * v2, * v3; - UnkStruct_0204AFC4 * v4 = param0->fieldSystem->unk_AC; + u16 *v2, *v3; + UnkStruct_0204AFC4 *v4 = param0->fieldSystem->unk_AC; v0 = ScriptContext_GetVar(param0); v1 = ScriptContext_GetVar(param0); @@ -216,10 +216,10 @@ BOOL ScrCmd_1DE (ScriptContext * param0) return 0; } -BOOL ScrCmd_1DF (ScriptContext * param0) +BOOL ScrCmd_1DF(ScriptContext *param0) { u16 v0, v1, v2; - u16 * v3; + u16 *v3; v0 = ScriptContext_ReadHalfWord(param0); v3 = FieldSystem_GetVarPointer(param0->fieldSystem, v0); @@ -228,10 +228,10 @@ BOOL ScrCmd_1DF (ScriptContext * param0) return 0; } -BOOL ScrCmd_1E0 (ScriptContext * param0) +BOOL ScrCmd_1E0(ScriptContext *param0) { u16 v0, v1, v2; - u16 * v3; + u16 *v3; v0 = ScriptContext_ReadHalfWord(param0); v3 = FieldSystem_GetVarPointer(param0->fieldSystem, v0); @@ -240,14 +240,14 @@ BOOL ScrCmd_1E0 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1E1 (ScriptContext * param0) +BOOL ScrCmd_1E1(ScriptContext *param0) { int v0, v1; - const TrainerInfo * v2; + const TrainerInfo *v2; u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); - UnkStruct_0204AFC4 * v6 = param0->fieldSystem->unk_AC; + u16 *v5 = ScriptContext_GetVarPointer(param0); + UnkStruct_0204AFC4 *v6 = param0->fieldSystem->unk_AC; *v5 = 0; @@ -285,13 +285,13 @@ BOOL ScrCmd_1E1 (ScriptContext * param0) return 0; } -static BOOL sub_02049A20(ScriptContext * param0); +static BOOL sub_02049A20(ScriptContext *param0); -BOOL ScrCmd_1E2 (ScriptContext * param0) +BOOL ScrCmd_1E2(ScriptContext *param0) { u16 v0; u16 v1; - UnkStruct_0204AFC4 * v2 = param0->fieldSystem->unk_AC; + UnkStruct_0204AFC4 *v2 = param0->fieldSystem->unk_AC; v1 = ScriptContext_GetVar(param0); v0 = ScriptContext_ReadHalfWord(param0); @@ -308,11 +308,11 @@ BOOL ScrCmd_1E2 (ScriptContext * param0) return 1; } -static BOOL sub_02049A20 (ScriptContext * param0) +static BOOL sub_02049A20(ScriptContext *param0) { u8 v0; - UnkStruct_0204AFC4 * v1 = param0->fieldSystem->unk_AC; - u16 * v2 = FieldSystem_GetVarPointer(param0->fieldSystem, v1->unk_8DA); + UnkStruct_0204AFC4 *v1 = param0->fieldSystem->unk_AC; + u16 *v2 = FieldSystem_GetVarPointer(param0->fieldSystem, v1->unk_8DA); if (v1->unk_8D5 == 1) { v0 = 1; @@ -330,11 +330,11 @@ static BOOL sub_02049A20 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1E3 (ScriptContext * param0) +BOOL ScrCmd_1E3(ScriptContext *param0) { UnkStruct_02049A68 v0; - u16 * v1 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); - u16 * v2 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); + u16 *v1 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); + u16 *v2 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); sub_0202D708(sub_0202D764(param0->fieldSystem->saveData), &v0); @@ -344,15 +344,15 @@ BOOL ScrCmd_1E3 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1E4 (ScriptContext * param0) +BOOL ScrCmd_1E4(ScriptContext *param0) { - u16 * v0 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); + u16 *v0 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0)); *v0 = sub_0202D5F0(sub_0202D764(param0->fieldSystem->saveData)); return 0; } -static u16 sub_02049AE0 (UnkStruct_0204AFC4 * param0, u8 param1) +static u16 sub_02049AE0(UnkStruct_0204AFC4 *param0, u8 param1) { static const u16 v0[] = { 0x8d, @@ -385,12 +385,12 @@ static u16 sub_02049AE0 (UnkStruct_0204AFC4 * param0, u8 param1) } } -BOOL ScrCmd_294 (ScriptContext * param0) +BOOL ScrCmd_294(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u8 v1 = ScriptContext_ReadByte(param0); u8 v2 = ScriptContext_ReadByte(param0); - Window ** v3; + Window **v3; v3 = sub_0203F098(fieldSystem, 38); *v3 = ov5_021DD140(param0->fieldSystem, v1, v2); @@ -398,38 +398,38 @@ BOOL ScrCmd_294 (ScriptContext * param0) return 0; } -BOOL ScrCmd_295 (ScriptContext * param0) +BOOL ScrCmd_295(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Window ** v1 = sub_0203F098(fieldSystem, 38); + FieldSystem *fieldSystem = param0->fieldSystem; + Window **v1 = sub_0203F098(fieldSystem, 38); ov5_021DD084(*v1); return 0; } -BOOL ScrCmd_296 (ScriptContext * param0) +BOOL ScrCmd_296(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Window ** v1 = sub_0203F098(fieldSystem, 38); + FieldSystem *fieldSystem = param0->fieldSystem; + Window **v1 = sub_0203F098(fieldSystem, 38); ov5_021DD1A4(param0->fieldSystem, *v1); return 0; } -BOOL ScrCmd_297 (ScriptContext * param0) +BOOL ScrCmd_297(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + u16 *v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0202D230(sub_0202D750(v1), 0, 0); return 0; } -BOOL ScrCmd_298 (ScriptContext * param0) +BOOL ScrCmd_298(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; u16 v2 = ScriptContext_GetVar(param0); sub_0202CF70(sub_0202CD88(param0->fieldSystem->saveData), (1 + 67), v2); @@ -438,10 +438,10 @@ BOOL ScrCmd_298 (ScriptContext * param0) return 0; } -BOOL ScrCmd_299 (ScriptContext * param0) +BOOL ScrCmd_299(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; u16 v2 = ScriptContext_GetVar(param0); sub_0202CF70(sub_0202CD88(param0->fieldSystem->saveData), (1 + 68), v2); @@ -450,13 +450,13 @@ BOOL ScrCmd_299 (ScriptContext * param0) return 0; } -BOOL ScrCmd_29A (ScriptContext * param0) +BOOL ScrCmd_29A(ScriptContext *param0) { u16 v0; - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v2 = fieldSystem->saveData; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v2 = fieldSystem->saveData; u16 v3 = ScriptContext_GetVar(param0); - u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 *v4 = ScriptContext_GetVarPointer(param0); v0 = sub_0202D230( sub_0202D750(v2), 0, 0); @@ -470,55 +470,55 @@ BOOL ScrCmd_29A (ScriptContext * param0) return 0; } -BOOL ScrCmd_29B (ScriptContext * param0) +BOOL ScrCmd_29B(ScriptContext *param0) { u8 v0 = 0; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); - u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); + u16 *v4 = ScriptContext_GetVarPointer(param0); static const u16 v5[][2] = { - {0x2E, 0x1}, - {0x31, 0x1}, - {0x2F, 0x1}, - {0x34, 0x1}, - {0x30, 0x1}, - {0x2D, 0x1}, - {0x121, 0x10}, - {0x122, 0x10}, - {0x123, 0x10}, - {0x124, 0x10}, - {0x125, 0x10}, - {0x126, 0x10}, - {0x110, 0x10}, - {0x111, 0x10}, - {0xD6, 0x20}, - {0x10F, 0x20}, - {0xD5, 0x30}, - {0xDC, 0x30}, - {0xE6, 0x30}, - {0xE8, 0x30}, - {0x10A, 0x30}, - {0x113, 0x30}, - {0x11F, 0x30}, - {0x146, 0x30}, - {0x147, 0x30}, - {0x32, 0x30}, - {0x14D, 0x20}, - {0x190, 0x20}, - {0x184, 0x20}, - {0x174, 0x20}, - {0x16F, 0x28}, - {0x166, 0x28}, - {0x14F, 0x30}, - {0x14B, 0x30}, - {0x198, 0x40}, - {0x165, 0x40}, - {0x17C, 0x40}, - {0x16B, 0x50}, - {0x182, 0x50}, - {0x18E, 0x50}, - {0x161, 0x50} + { 0x2E, 0x1 }, + { 0x31, 0x1 }, + { 0x2F, 0x1 }, + { 0x34, 0x1 }, + { 0x30, 0x1 }, + { 0x2D, 0x1 }, + { 0x121, 0x10 }, + { 0x122, 0x10 }, + { 0x123, 0x10 }, + { 0x124, 0x10 }, + { 0x125, 0x10 }, + { 0x126, 0x10 }, + { 0x110, 0x10 }, + { 0x111, 0x10 }, + { 0xD6, 0x20 }, + { 0x10F, 0x20 }, + { 0xD5, 0x30 }, + { 0xDC, 0x30 }, + { 0xE6, 0x30 }, + { 0xE8, 0x30 }, + { 0x10A, 0x30 }, + { 0x113, 0x30 }, + { 0x11F, 0x30 }, + { 0x146, 0x30 }, + { 0x147, 0x30 }, + { 0x32, 0x30 }, + { 0x14D, 0x20 }, + { 0x190, 0x20 }, + { 0x184, 0x20 }, + { 0x174, 0x20 }, + { 0x16F, 0x28 }, + { 0x166, 0x28 }, + { 0x14F, 0x30 }, + { 0x14B, 0x30 }, + { 0x198, 0x40 }, + { 0x165, 0x40 }, + { 0x17C, 0x40 }, + { 0x16B, 0x50 }, + { 0x182, 0x50 }, + { 0x18E, 0x50 }, + { 0x161, 0x50 } }; if (v1 == 1) { diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c index 6e852a0f44..3e3430bdfb 100644 --- a/src/unk_02049D08.c +++ b/src/unk_02049D08.c @@ -1,59 +1,56 @@ +#include "unk_02049D08.h" + #include #include -#include "inlines.h" - - #include "struct_decls/struct_020298B0_decl.h" -#include "journal.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_0202D060_decl.h" #include "struct_decls/struct_0202D750_decl.h" #include "struct_decls/struct_0202D764_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - -#include "field/field_system.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_02098C44.h" + +#include "field/field_system.h" #include "overlay104/struct_ov104_0223A348_sub2.h" +#include "savedata/save_table.h" +#include "field_overworld_state.h" #include "heap.h" +#include "inlines.h" +#include "journal.h" +#include "party.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "savedata.h" +#include "trainer_info.h" #include "unk_0201D15C.h" -#include "savedata/save_table.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "journal.h" #include "unk_0202CD50.h" #include "unk_0202D05C.h" #include "unk_0203061C.h" -#include "field_overworld_state.h" -#include "unk_02049D08.h" #include "unk_0204AEE8.h" -#include "vars_flags.h" #include "unk_0205DFC4.h" -#include "player_avatar.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_0206B9D8.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "party.h" +#include "vars_flags.h" typedef struct { u16 unk_00; u16 unk_02; } UnkStruct_02049D38; -static u16 sub_0204AC54(SaveData * param0, u8 param1, UnkStruct_0204AFC4 * param2); -static u16 sub_0204ACC8(UnkStruct_0204AFC4 * param0); -static void sub_0204AE20(UnkStruct_0204AFC4 * param0, SaveData * param1, int param2); +static u16 sub_0204AC54(SaveData *param0, u8 param1, UnkStruct_0204AFC4 *param2); +static u16 sub_0204ACC8(UnkStruct_0204AFC4 *param0); +static void sub_0204AE20(UnkStruct_0204AFC4 *param0, SaveData *param1, int param2); -u16 sub_02049D08 (u16 param0) +u16 sub_02049D08(u16 param0) { switch (param0) { case 0: @@ -71,7 +68,7 @@ u16 sub_02049D08 (u16 param0) return 0; } -static BOOL sub_02049D38 (UnkStruct_02049D38 * param0, u16 param1, u16 param2, int param3) +static BOOL sub_02049D38(UnkStruct_02049D38 *param0, u16 param1, u16 param2, int param3) { int v0; @@ -90,7 +87,7 @@ static BOOL sub_02049D38 (UnkStruct_02049D38 * param0, u16 param1, u16 param2, i return 0; } -static BOOL sub_02049D64 (UnkStruct_02049D38 * param0, int param1) +static BOOL sub_02049D64(UnkStruct_02049D38 *param0, int param1) { int v0, v1; @@ -113,7 +110,7 @@ static BOOL sub_02049D64 (UnkStruct_02049D38 * param0, int param1) return 1; } -static BOOL sub_02049DB4 (UnkStruct_02049D38 * param0, int param1, int param2, int param3) +static BOOL sub_02049DB4(UnkStruct_02049D38 *param0, int param1, int param2, int param3) { int v0, v1, v2, v3; UnkStruct_02049D38 v4[4]; @@ -159,12 +156,12 @@ static BOOL sub_02049DB4 (UnkStruct_02049D38 * param0, int param1, int param2, i return 0; } -BOOL sub_02049EC4 (u16 param0, SaveData * param1, u8 param2) +BOOL sub_02049EC4(u16 param0, SaveData *param1, u8 param2) { u8 v0, v1, v2, v3; u16 v4, v5; - Party * v6; - Pokemon * v7; + Party *v6; + Pokemon *v7; UnkStruct_02049D38 v8[6]; v6 = Party_GetFromSavedata(param1); @@ -209,24 +206,24 @@ BOOL sub_02049EC4 (u16 param0, SaveData * param1, u8 param2) return sub_02049DB4(v8, param0, v2, (v2 - param0) + 1); } -void sub_02049F8C (void) +void sub_02049F8C(void) { OS_ResetSystem(0); } -void sub_02049F98 (UnkStruct_0202D060 * param0) +void sub_02049F98(UnkStruct_0202D060 *param0) { sub_0202D060(param0); } -BOOL sub_02049FA0 (UnkStruct_0202D060 * param0) +BOOL sub_02049FA0(UnkStruct_0202D060 *param0) { return sub_0202D214(param0); } -void sub_02049FA8 (FieldSystem * fieldSystem) +void sub_02049FA8(FieldSystem *fieldSystem) { - Location * v0 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + Location *v0 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); Location_Set(v0, fieldSystem->location->mapId, -1, Player_GetXPos(fieldSystem->playerAvatar), Player_GetZPos(fieldSystem->playerAvatar), 0); sub_0206AD9C(SaveData_GetVarsFlags(fieldSystem->saveData)); @@ -234,12 +231,12 @@ void sub_02049FA8 (FieldSystem * fieldSystem) return; } -void sub_02049FE8 (FieldSystem * fieldSystem) +void sub_02049FE8(FieldSystem *fieldSystem) { CommClub_ResetAvailable(SaveData_GetVarsFlags(fieldSystem->saveData)); } -u16 sub_02049FF8 (SaveData * param0, u16 param1) +u16 sub_02049FF8(SaveData *param0, u16 param1) { u16 v0; @@ -257,9 +254,9 @@ u16 sub_02049FF8 (SaveData * param0, u16 param1) return v0; } -void sub_0204A030 (SaveData * param0, u8 param1) +void sub_0204A030(SaveData *param0, u8 param1) { - UnkStruct_0202D750 * v0 = sub_0202D750(param0); + UnkStruct_0202D750 *v0 = sub_0202D750(param0); if (param1 == 0) { sub_0202D414(v0, 5, 2); @@ -268,18 +265,18 @@ void sub_0204A030 (SaveData * param0, u8 param1) } } -u16 sub_0204A050 (SaveData * param0) +u16 sub_0204A050(SaveData *param0) { - UnkStruct_0202D750 * v0 = sub_0202D750(param0); + UnkStruct_0202D750 *v0 = sub_0202D750(param0); return (u16)sub_0202D414(v0, 5, 0); } -u16 sub_0204A064 (SaveData * param0) +u16 sub_0204A064(SaveData *param0) { u8 v0; int v1; - UnkStruct_0202D060 * v2; - UnkStruct_0202D750 * v3; + UnkStruct_0202D060 *v2; + UnkStruct_0202D750 *v3; v2 = sub_0202D740(param0); v3 = sub_0202D750(param0); @@ -305,27 +302,27 @@ u16 sub_0204A064 (SaveData * param0) return v0; } -u16 sub_0204A100 (SaveData * param0) +u16 sub_0204A100(SaveData *param0) { - UnkStruct_0202D764 * v0; + UnkStruct_0202D764 *v0; v0 = sub_0202D764(param0); return (u16)sub_0202D5E8(v0); } -void sub_0204A110 (UnkStruct_0204AFC4 ** param0) +void sub_0204A110(UnkStruct_0204AFC4 **param0) { GF_ASSERT(*param0 == NULL); *param0 = NULL; } -UnkStruct_0204AFC4 * sub_0204A124 (SaveData * param0, u16 param1, u16 param2) +UnkStruct_0204AFC4 *sub_0204A124(SaveData *param0, u16 param1, u16 param2) { u8 v0; u16 v1, v2; - UnkStruct_0204AFC4 * v3; - UnkStruct_0203068C * v4; - UnkStruct_0202CD88 * v5; + UnkStruct_0204AFC4 *v3; + UnkStruct_0203068C *v4; + UnkStruct_0202CD88 *v5; v3 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0204AFC4)); MI_CpuClear8(v3, sizeof(UnkStruct_0204AFC4)); @@ -407,7 +404,7 @@ UnkStruct_0204AFC4 * sub_0204A124 (SaveData * param0, u16 param1, u16 param2) return v3; } -void sub_0204A32C (UnkStruct_0204AFC4 * param0) +void sub_0204A32C(UnkStruct_0204AFC4 *param0) { int v0; @@ -424,17 +421,17 @@ void sub_0204A32C (UnkStruct_0204AFC4 * param0) param0 = NULL; } -void sub_0204A358 (UnkStruct_0204AFC4 * param0, TaskManager * param1, void ** param2) +void sub_0204A358(UnkStruct_0204AFC4 *param0, TaskManager *param1, void **param2) { sub_0206BBFC(param1, param2, 17, 0, param0->unk_0E, param0->unk_0E, 100, 0); } -BOOL sub_0204A378 (UnkStruct_0204AFC4 * param0, void ** param1, SaveData * param2) +BOOL sub_0204A378(UnkStruct_0204AFC4 *param0, void **param1, SaveData *param2) { u16 v0 = 0; - PartyManagementData * v1 = *param1; - Party * v2; - Pokemon * v3; + PartyManagementData *v1 = *param1; + Party *v2; + Pokemon *v3; if ((v1->unk_23 != 0) || (v1->unk_22 == 7)) { Heap_FreeToHeap(*param1); @@ -456,12 +453,12 @@ BOOL sub_0204A378 (UnkStruct_0204AFC4 * param0, void ** param1, SaveData * param return 1; } -int sub_0204A410 (UnkStruct_0204AFC4 * param0, SaveData * param1) +int sub_0204A410(UnkStruct_0204AFC4 *param0, SaveData *param1) { u16 v0 = 0, v1 = 0; u16 v2[4], v3[4]; - Party * v4; - Pokemon * v5; + Party *v4; + Pokemon *v5; v4 = Party_GetFromSavedata(param1); @@ -488,7 +485,7 @@ int sub_0204A410 (UnkStruct_0204AFC4 * param0, SaveData * param1) return 0; } -static BOOL sub_0204A4A0 (u16 * param0, u16 param1, u16 param2) +static BOOL sub_0204A4A0(u16 *param0, u16 param1, u16 param2) { u16 v0; @@ -501,7 +498,7 @@ static BOOL sub_0204A4A0 (u16 * param0, u16 param1, u16 param2) return 0; } -void sub_0204A4C8 (UnkStruct_0204AFC4 * param0, SaveData * param1) +void sub_0204A4C8(UnkStruct_0204AFC4 *param0, SaveData *param1) { int v0; u16 v1, v2; @@ -531,12 +528,12 @@ void sub_0204A4C8 (UnkStruct_0204AFC4 * param0, SaveData * param1) } } -u16 sub_0204A578 (UnkStruct_0204AFC4 * param0) +u16 sub_0204A578(UnkStruct_0204AFC4 *param0) { return param0->unk_0C; } -BOOL sub_0204A57C (UnkStruct_0204AFC4 * param0) +BOOL sub_0204A57C(UnkStruct_0204AFC4 *param0) { if (param0->unk_10_0) { return 1; @@ -550,9 +547,9 @@ BOOL sub_0204A57C (UnkStruct_0204AFC4 * param0) return 0; } -static void sub_0204A5A0 (UnkStruct_0204AFC4 * param0, SaveData * param1, u16 param2) +static void sub_0204A5A0(UnkStruct_0204AFC4 *param0, SaveData *param1, u16 param2) { - Party * v0; + Party *v0; if ((param0->unk_0F != 0) && (param0->unk_0F != 1)) { return; @@ -567,7 +564,7 @@ static void sub_0204A5A0 (UnkStruct_0204AFC4 * param0, SaveData * param1, u16 pa } } -static void sub_0204A5EC (UnkStruct_0204AFC4 * param0, SaveData * param1, u8 param2, u16 param3) +static void sub_0204A5EC(UnkStruct_0204AFC4 *param0, SaveData *param1, u8 param2, u16 param3) { u8 v0; @@ -595,13 +592,13 @@ static void sub_0204A5EC (UnkStruct_0204AFC4 * param0, SaveData * param1, u8 par } } -void sub_0204A660 (UnkStruct_0204AFC4 * param0, SaveData * param1) +void sub_0204A660(UnkStruct_0204AFC4 *param0, SaveData *param1) { u32 v0 = 0; int v1; u16 v2, v3, v4; - UnkStruct_0202CD88 * v5 = sub_0202CD88(param1); - UnkStruct_0203068C * v6 = sub_0203068C(param1); + UnkStruct_0202CD88 *v5 = sub_0202CD88(param1); + UnkStruct_0203068C *v6 = sub_0203068C(param1); if (param0->unk_0F == 5) { return; @@ -654,14 +651,14 @@ void sub_0204A660 (UnkStruct_0204AFC4 * param0, SaveData * param1) sub_0204A5EC(param0, param1, 0, v0); } -void sub_0204A7A4 (UnkStruct_0204AFC4 * param0, SaveData * param1, Journal * param2) +void sub_0204A7A4(UnkStruct_0204AFC4 *param0, SaveData *param1, Journal *param2) { u32 v0 = 0; int v1; - void * v2; + void *v2; u16 v3, v4, v5; - UnkStruct_0202CD88 * v6; - UnkStruct_0203068C * v7; + UnkStruct_0202CD88 *v6; + UnkStruct_0203068C *v7; if (param0->unk_0F == 5) { return; @@ -710,7 +707,7 @@ void sub_0204A7A4 (UnkStruct_0204AFC4 * param0, SaveData * param1, Journal * par } } -void sub_0204A8C8 (UnkStruct_0204AFC4 * param0) +void sub_0204A8C8(UnkStruct_0204AFC4 *param0) { u16 v0; u8 v1[4]; @@ -738,7 +735,7 @@ void sub_0204A8C8 (UnkStruct_0204AFC4 * param0) sub_0202D140(param0->unk_70, 7, &(param0->unk_838[param0->unk_10_5])); } -void sub_0204A97C (UnkStruct_0204AFC4 * param0) +void sub_0204A97C(UnkStruct_0204AFC4 *param0) { int v0; @@ -747,28 +744,28 @@ void sub_0204A97C (UnkStruct_0204AFC4 * param0) } } -u16 sub_0204A9E0 (UnkStruct_0204AFC4 * param0, u16 param1) +u16 sub_0204A9E0(UnkStruct_0204AFC4 *param0, u16 param1) { return sub_0204AF9C(param0->unk_78[param1].unk_00.unk_04); } -u16 sub_0204A9F8 (UnkStruct_0204AFC4 * param0) +u16 sub_0204A9F8(UnkStruct_0204AFC4 *param0) { return param0->unk_0F; } -u16 sub_0204A9FC (UnkStruct_0204AFC4 * param0) +u16 sub_0204A9FC(UnkStruct_0204AFC4 *param0) { return (u16)param0->unk_10_1; } -u16 sub_0204AA04 (UnkStruct_0204AFC4 * param0) +u16 sub_0204AA04(UnkStruct_0204AFC4 *param0) { u16 v0; u16 v1 = 0; - static const u8 v2[] = {0, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10}; - static const u8 v3[] = {0, 3, 3, 4, 4, 5, 5, 7}; - static const u8 v4[] = {0, 8, 9, 11, 12, 14, 15, 18}; + static const u8 v2[] = { 0, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10 }; + static const u8 v3[] = { 0, 3, 3, 4, 4, 5, 5, 7 }; + static const u8 v4[] = { 0, 8, 9, 11, 12, 14, 15, 18 }; if (param0->unk_0F == 5) { return 0; @@ -802,7 +799,7 @@ u16 sub_0204AA04 (UnkStruct_0204AFC4 * param0) return v1; } -u16 sub_0204AA7C (UnkStruct_0204AFC4 * param0, SaveData * param1) +u16 sub_0204AA7C(UnkStruct_0204AFC4 *param0, SaveData *param1) { u8 v0, v1; u16 v2, v3, v4; @@ -826,12 +823,21 @@ u16 sub_0204AA7C (UnkStruct_0204AFC4 * param0, SaveData * param1) return 1; } -u16 sub_0204AABC (UnkStruct_0204AFC4 * param0, SaveData * param1, u8 param2) +u16 sub_0204AABC(UnkStruct_0204AFC4 *param0, SaveData *param1, u8 param2) { u8 v0, v1; - UnkStruct_0202D750 * v2 = sub_0202D750(param1); + UnkStruct_0202D750 *v2 = sub_0202D750(param1); static const u8 v3[] = { - 0, 5, 4, 4, 3, 3, 2, 2, 1, 1, + 0, + 5, + 4, + 4, + 3, + 3, + 2, + 2, + 1, + 1, }; switch (param2) { @@ -875,7 +881,7 @@ u16 sub_0204AABC (UnkStruct_0204AFC4 * param0, SaveData * param1, u8 param2) return 0; } -u16 sub_0204AB68 (UnkStruct_0204AFC4 * param0, SaveData * param1) +u16 sub_0204AB68(UnkStruct_0204AFC4 *param0, SaveData *param1) { if (param0->unk_0F != 0) { return 0; @@ -891,11 +897,11 @@ u16 sub_0204AB68 (UnkStruct_0204AFC4 * param0, SaveData * param1) return 0; } -u16 sub_0204ABA0 (UnkStruct_0204AFC4 * param0, SaveData * param1) +u16 sub_0204ABA0(UnkStruct_0204AFC4 *param0, SaveData *param1) { u8 v0, v1; u16 v2, v3, v4; - UndergroundData * v5; + UndergroundData *v5; if (param0->unk_0F == 5) { return 0; @@ -927,7 +933,7 @@ u16 sub_0204ABA0 (UnkStruct_0204AFC4 * param0, SaveData * param1) return sub_0204AC54(param1, v0, param0); } -u16 sub_0204ABF4 (UnkStruct_0204AFC4 * param0, SaveData * param1) +u16 sub_0204ABF4(UnkStruct_0204AFC4 *param0, SaveData *param1) { u8 v0; @@ -946,13 +952,13 @@ u16 sub_0204ABF4 (UnkStruct_0204AFC4 * param0, SaveData * param1) return param0->unk_08 / 65535; } -static u16 sub_0204AC54 (SaveData * param0, u8 param1, UnkStruct_0204AFC4 * param2) +static u16 sub_0204AC54(SaveData *param0, u8 param1, UnkStruct_0204AFC4 *param2) { u8 v0 = 1; u8 v1; int v2; - Party * v3; - Pokemon * v4; + Party *v3; + Pokemon *v4; v3 = Party_GetFromSavedata(param0); v1 = 0; @@ -976,7 +982,7 @@ static u16 sub_0204AC54 (SaveData * param0, u8 param1, UnkStruct_0204AFC4 * para return 1; } -static u16 sub_0204ACC8 (UnkStruct_0204AFC4 * param0) +static u16 sub_0204ACC8(UnkStruct_0204AFC4 *param0) { u16 v0; @@ -994,7 +1000,7 @@ static u16 sub_0204ACC8 (UnkStruct_0204AFC4 * param0) return 1; } -static void sub_0204ACFC (UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * param1) +static void sub_0204ACFC(UnkStruct_ov104_0223A348_sub2 *param0, Pokemon *param1) { int v0; @@ -1004,7 +1010,7 @@ static void sub_0204ACFC (UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * para for (v0 = 0; v0 < 4; v0++) { param0->unk_04[v0] = Pokemon_GetValue(param1, MON_DATA_MOVE1 + v0, NULL); - param0->unk_1E_val2 |= ((Pokemon_GetValue(param1, MON_DATA_MOVE1_PP_UPS + v0, NULL))<< (v0 * 2)); + param0->unk_1E_val2 |= ((Pokemon_GetValue(param1, MON_DATA_MOVE1_PP_UPS + v0, NULL)) << (v0 * 2)); } param0->unk_1F = Pokemon_GetValue(param1, MON_DATA_LANGUAGE, NULL); @@ -1022,12 +1028,12 @@ static void sub_0204ACFC (UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * para Pokemon_GetValue(param1, MON_DATA_NICKNAME, param0->unk_22); } -static void sub_0204AE20 (UnkStruct_0204AFC4 * param0, SaveData * param1, int param2) +static void sub_0204AE20(UnkStruct_0204AFC4 *param0, SaveData *param1, int param2) { int v0 = 0; - UnkStruct_ov104_0223A348_sub2 * v1; - Party * v2; - Pokemon * v3; + UnkStruct_ov104_0223A348_sub2 *v1; + Party *v2; + Pokemon *v3; v1 = Heap_AllocFromHeapAtEnd(param0->unk_04, sizeof(UnkStruct_ov104_0223A348_sub2) * 3); MI_CpuClear8(v1, sizeof(UnkStruct_ov104_0223A348_sub2) * 3); @@ -1043,7 +1049,7 @@ static void sub_0204AE20 (UnkStruct_0204AFC4 * param0, SaveData * param1, int pa Heap_FreeToHeap(v1); } -u8 sub_0204AE84 (u16 param0) +u8 sub_0204AE84(u16 param0) { u8 v0; @@ -1068,7 +1074,7 @@ u8 sub_0204AE84 (u16 param0) return v0; } -u16 sub_0204AEC0 (UnkStruct_0204AFC4 * param0) +u16 sub_0204AEC0(UnkStruct_0204AFC4 *param0) { if (param0->unk_0F == 6) { return LCRNG_Next(); diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index 66939d422a..4503dcafe8 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -1,118 +1,114 @@ +#include "unk_0204AEE8.h" + #include #include -#include "assert.h" - -#include "message.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - -#include "field/field_system.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204B184.h" #include "struct_defs/struct_0204B1E8.h" #include "struct_defs/struct_0204B404.h" + +#include "field/field_system.h" #include "overlay104/struct_ov104_0223A348.h" #include "overlay104/struct_ov104_0223A348_sub2.h" -#include "narc.h" -#include "message.h" -#include "string_template.h" +#include "assert.h" +#include "communication_system.h" +#include "flags.h" #include "heap.h" +#include "message.h" +#include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" #include "strbuf.h" -#include "unk_02025E08.h" +#include "string_template.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0202631C.h" #include "unk_0202D05C.h" -#include "communication_system.h" #include "unk_02049D08.h" -#include "unk_0204AEE8.h" -#include "pokemon.h" -#include "party.h" -#include "flags.h" -static BOOL sub_0204B470(UnkStruct_0204AFC4 * param0, UnkStruct_0204B184 * param1, u16 param2, UnkStruct_ov104_0223A348_sub2 * param3, u8 param4, u16 * param5, u16 * param6, UnkStruct_0204B404 * param7, int param8); -static void * sub_0204B630(u16 param0, int param1); -static void sub_0204B640(UnkStruct_0204B1E8 * param0, int param1); +static BOOL sub_0204B470(UnkStruct_0204AFC4 *param0, UnkStruct_0204B184 *param1, u16 param2, UnkStruct_ov104_0223A348_sub2 *param3, u8 param4, u16 *param5, u16 *param6, UnkStruct_0204B404 *param7, int param8); +static void *sub_0204B630(u16 param0, int param1); +static void sub_0204B640(UnkStruct_0204B1E8 *param0, int param1); static const u16 Unk_020EBD98[][2] = { - {0x5A, 0x8D}, - {0x5B, 0x8E}, - {0x5C, 0x8f}, - {0x5D, 0x90}, - {0x5E, 0x91}, - {0x2, 0x4}, - {0x3, 0x6}, - {0x3C, 0x3}, - {0x3D, 0x8}, - {0x20, 0x3E}, - {0x21, 0x3f}, - {0x4, 0x34}, - {0x5, 0x35}, - {0x2C, 0x1}, - {0x2D, 0x2}, - {0x14, 0xf}, - {0x15, 0x10}, - {0x51, 0x3B}, - {0x1A, 0x3C}, - {0x10, 0x9}, - {0x11, 0xC}, - {0x53, 0x17}, - {0x54, 0x16}, - {0x47, 0x29}, - {0x12, 0x2A}, - {0xC, 0x26}, - {0xD, 0x27}, - {0xE, 0x33}, - {0xA, 0x7}, - {0x1B, 0x11}, - {0x23, 0x25}, - {0x31, 0x46}, - {0x32, 0x46}, - {0x27, 0xB}, - {0x28, 0xE}, - {0x18, 0xB}, - {0x19, 0xE}, - {0x35, 0x44}, - {0x36, 0x45}, - {0x1D, 0xB}, - {0x6, 0x5}, - {0x1C, 0x1}, - {0x13, 0x2D}, - {0xB, 0x36}, - {0x2E, 0x38}, - {0x9, 0x14}, - {0x30, 0x32}, - {0x34, 0xA}, - {0x25, 0x13}, - {0x39, 0x1f}, - {0x29, 0x1D}, - {0x22, 0x24}, - {0x3B, 0x28}, - {0x3A, 0x2B}, - {0x26, 0x22}, - {0x33, 0x3E}, - {0x1E, 0xE}, - {0x50, 0x37}, - {0x24, 0xD}, - {0x7, 0xC}, - {0x55, 0x23}, - {0xF, 0x2C}, - {0x16, 0x47} + { 0x5A, 0x8D }, + { 0x5B, 0x8E }, + { 0x5C, 0x8f }, + { 0x5D, 0x90 }, + { 0x5E, 0x91 }, + { 0x2, 0x4 }, + { 0x3, 0x6 }, + { 0x3C, 0x3 }, + { 0x3D, 0x8 }, + { 0x20, 0x3E }, + { 0x21, 0x3f }, + { 0x4, 0x34 }, + { 0x5, 0x35 }, + { 0x2C, 0x1 }, + { 0x2D, 0x2 }, + { 0x14, 0xf }, + { 0x15, 0x10 }, + { 0x51, 0x3B }, + { 0x1A, 0x3C }, + { 0x10, 0x9 }, + { 0x11, 0xC }, + { 0x53, 0x17 }, + { 0x54, 0x16 }, + { 0x47, 0x29 }, + { 0x12, 0x2A }, + { 0xC, 0x26 }, + { 0xD, 0x27 }, + { 0xE, 0x33 }, + { 0xA, 0x7 }, + { 0x1B, 0x11 }, + { 0x23, 0x25 }, + { 0x31, 0x46 }, + { 0x32, 0x46 }, + { 0x27, 0xB }, + { 0x28, 0xE }, + { 0x18, 0xB }, + { 0x19, 0xE }, + { 0x35, 0x44 }, + { 0x36, 0x45 }, + { 0x1D, 0xB }, + { 0x6, 0x5 }, + { 0x1C, 0x1 }, + { 0x13, 0x2D }, + { 0xB, 0x36 }, + { 0x2E, 0x38 }, + { 0x9, 0x14 }, + { 0x30, 0x32 }, + { 0x34, 0xA }, + { 0x25, 0x13 }, + { 0x39, 0x1f }, + { 0x29, 0x1D }, + { 0x22, 0x24 }, + { 0x3B, 0x28 }, + { 0x3A, 0x2B }, + { 0x26, 0x22 }, + { 0x33, 0x3E }, + { 0x1E, 0xE }, + { 0x50, 0x37 }, + { 0x24, 0xD }, + { 0x7, 0xC }, + { 0x55, 0x23 }, + { 0xF, 0x2C }, + { 0x16, 0x47 } }; -StringTemplate * sub_0204AEE8 (SaveData * param0, u16 param1, u16 param2, u8 param3, u8 * param4) +StringTemplate *sub_0204AEE8(SaveData *param0, u16 param1, u16 param2, u8 param3, u8 *param4) { u8 v0; u16 v1; - Strbuf* v2, * v3; - PokedexData * v4; - StringTemplate * v5; - MessageLoader * v6; + Strbuf *v2, *v3; + PokedexData *v4; + StringTemplate *v5; + MessageLoader *v6; v2 = Strbuf_Init(12 + 2, 4); v3 = Strbuf_Init(2, 4); @@ -139,7 +135,7 @@ StringTemplate * sub_0204AEE8 (SaveData * param0, u16 param1, u16 param2, u8 par return v5; } -u16 sub_0204AF9C (u8 param0) +u16 sub_0204AF9C(u8 param0) { int v0 = 0; @@ -152,10 +148,10 @@ u16 sub_0204AF9C (u8 param0) return 0x3; } -u16 sub_0204AFC4 (FieldSystem * fieldSystem, const u16 * param1) +u16 sub_0204AFC4(FieldSystem *fieldSystem, const u16 *param1) { u16 v0 = 0; - UnkStruct_0204AFC4 * v1 = fieldSystem->unk_AC; + UnkStruct_0204AFC4 *v1 = fieldSystem->unk_AC; v1->unk_12 = (u8)param1[0]; v1->unk_16[0] = param1[1]; @@ -174,10 +170,10 @@ u16 sub_0204AFC4 (FieldSystem * fieldSystem, const u16 * param1) return v0; } -u16 sub_0204B020 (FieldSystem * fieldSystem, const u16 * param1) +u16 sub_0204B020(FieldSystem *fieldSystem, const u16 *param1) { int v0; - UnkStruct_0204AFC4 * v1 = fieldSystem->unk_AC; + UnkStruct_0204AFC4 *v1 = fieldSystem->unk_AC; if (CommSys_CurNetId() == 0) { return 0; @@ -187,10 +183,10 @@ u16 sub_0204B020 (FieldSystem * fieldSystem, const u16 * param1) return 1; } -u16 sub_0204B044 (FieldSystem * fieldSystem, const u16 * param1) +u16 sub_0204B044(FieldSystem *fieldSystem, const u16 *param1) { int v0; - UnkStruct_0204AFC4 * v1 = fieldSystem->unk_AC; + UnkStruct_0204AFC4 *v1 = fieldSystem->unk_AC; if (v1->unk_10_3 || param1[0]) { return 1; @@ -199,12 +195,12 @@ u16 sub_0204B044 (FieldSystem * fieldSystem, const u16 * param1) return 0; } -void sub_0204B060 (UnkStruct_0204AFC4 * param0, SaveData * param1) +void sub_0204B060(UnkStruct_0204AFC4 *param0, SaveData *param1) { int v0; - Party * v1; - Pokemon * v2; - TrainerInfo * v3 = SaveData_GetTrainerInfo(param1); + Party *v1; + Pokemon *v2; + TrainerInfo *v3 = SaveData_GetTrainerInfo(param1); param0->unk_83E[0] = TrainerInfo_Gender(v3); v1 = Party_GetFromSavedata(param1); @@ -216,40 +212,40 @@ void sub_0204B060 (UnkStruct_0204AFC4 * param0, SaveData * param1) param0->unk_83E[3] = sub_0202D3B4(param0->unk_74, 3, 0); } -void sub_0204B0BC (UnkStruct_0204AFC4 * param0) +void sub_0204B0BC(UnkStruct_0204AFC4 *param0) { MI_CpuCopy8(param0->unk_3E, param0->unk_83E, 14 * 2); } -void sub_0204B0D4 (UnkStruct_0204AFC4 * param0, u16 param1) +void sub_0204B0D4(UnkStruct_0204AFC4 *param0, u16 param1) { param0->unk_10_3 = param1; param0->unk_83E[0] = param1; } static const u16 Unk_020EBD58[][2] = { - {0x0, 0x63}, - {0x50, 0x77}, - {0x64, 0x8B}, - {0x78, 0x9F}, - {0x8C, 0xB3}, - {0xA0, 0xC7}, - {0xB4, 0xDB}, - {0xC8, 0x12B} + { 0x0, 0x63 }, + { 0x50, 0x77 }, + { 0x64, 0x8B }, + { 0x78, 0x9F }, + { 0x8C, 0xB3 }, + { 0xA0, 0xC7 }, + { 0xB4, 0xDB }, + { 0xC8, 0x12B } }; static const u16 Unk_020EBD78[][2] = { - {0x64, 0x77}, - {0x78, 0x8B}, - {0x8C, 0x9F}, - {0xA0, 0xB3}, - {0xB4, 0xC7}, - {0xC8, 0xDB}, - {0xDC, 0xEF}, - {0xC8, 0x12B} + { 0x64, 0x77 }, + { 0x78, 0x8B }, + { 0x8C, 0x9F }, + { 0xA0, 0xB3 }, + { 0xB4, 0xC7 }, + { 0xC8, 0xDB }, + { 0xDC, 0xEF }, + { 0xC8, 0x12B } }; -u16 sub_0204B0F0 (UnkStruct_0204AFC4 * param0, u8 param1, u8 param2, int param3) +u16 sub_0204B0F0(UnkStruct_0204AFC4 *param0, u8 param1, u8 param2, int param3) { u16 v0; @@ -279,11 +275,11 @@ u16 sub_0204B0F0 (UnkStruct_0204AFC4 * param0, u8 param1, u8 param2, int param3) return v0; } -static UnkStruct_0204B184 * sub_0204B184 (UnkStruct_ov104_0223A348 * param0, u16 param1, int param2) +static UnkStruct_0204B184 *sub_0204B184(UnkStruct_ov104_0223A348 *param0, u16 param1, int param2) { - UnkStruct_0204B184 * v0; - MessageLoader * v1 = MessageLoader_Init(1, 26, 21, param2); - Strbuf* v2; + UnkStruct_0204B184 *v0; + MessageLoader *v1 = MessageLoader_Init(1, 26, 21, param2); + Strbuf *v2; MI_CpuClear8(param0, sizeof(UnkStruct_ov104_0223A348)); @@ -310,7 +306,7 @@ static const u16 Unk_020EBD50[] = { 0xD9 }; -static u32 sub_0204B1E8 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348_sub2 * param1, u16 param2, u32 param3, u32 param4, u8 param5, u8 param6, BOOL param7, int param8) +static u32 sub_0204B1E8(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348_sub2 *param1, u16 param2, u32 param3, u32 param4, u8 param5, u8 param6, BOOL param7, int param8) { int v0; int v1; @@ -401,10 +397,10 @@ static u32 sub_0204B1E8 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348_s return v2; } -BOOL sub_0204B3B8 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 * param1, u16 param2, int param3, u16 * param4, u16 * param5, UnkStruct_0204B404 * param6, int param7) +BOOL sub_0204B3B8(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348 *param1, u16 param2, int param3, u16 *param4, u16 *param5, UnkStruct_0204B404 *param6, int param7) { BOOL v0 = 0; - UnkStruct_0204B184 * v1; + UnkStruct_0204B184 *v1; v1 = sub_0204B184(param1, param2, param7); v0 = sub_0204B470(param0, v1, param2, ¶m1->unk_30[0], param3, param4, param5, param6, param7); @@ -414,11 +410,11 @@ BOOL sub_0204B3B8 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 * param return v0; } -void sub_0204B404 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 * param1, u16 param2, BOOL param3, const UnkStruct_0204B404 * param4, int param5) +void sub_0204B404(UnkStruct_0204AFC4 *param0, UnkStruct_ov104_0223A348 *param1, u16 param2, BOOL param3, const UnkStruct_0204B404 *param4, int param5) { int v0; u8 v1 = 0; - UnkStruct_0204B184 * v2; + UnkStruct_0204B184 *v2; v2 = sub_0204B184(param1, param2, param5); v1 = sub_0204AE84(param2); @@ -430,7 +426,7 @@ void sub_0204B404 (UnkStruct_0204AFC4 * param0, UnkStruct_ov104_0223A348 * param Heap_FreeToHeap(v2); } -static BOOL sub_0204B470 (UnkStruct_0204AFC4 * param0, UnkStruct_0204B184 * param1, u16 param2, UnkStruct_ov104_0223A348_sub2 * param3, u8 param4, u16 * param5, u16 * param6, UnkStruct_0204B404 * param7, int param8) +static BOOL sub_0204B470(UnkStruct_0204AFC4 *param0, UnkStruct_0204B184 *param1, u16 param2, UnkStruct_ov104_0223A348_sub2 *param3, u8 param4, u16 *param5, u16 *param6, UnkStruct_0204B404 *param7, int param8) { int v0, v1; u8 v2; @@ -537,12 +533,12 @@ static BOOL sub_0204B470 (UnkStruct_0204AFC4 * param0, UnkStruct_0204B184 * para return v10; } -static void * sub_0204B630 (u16 param0, int param1) +static void *sub_0204B630(u16 param0, int param1) { return NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDTR, param0, param1); } -static void sub_0204B640 (UnkStruct_0204B1E8 * param0, int param1) +static void sub_0204B640(UnkStruct_0204B1E8 *param0, int param1) { NARC_ReadWholeMemberByIndexPair(param0, NARC_INDEX_BATTLE__B_PL_TOWER__PL_BTDPM, param1); } diff --git a/src/unk_0204B64C.c b/src/unk_0204B64C.c index 7f39f137ac..89e008faf6 100644 --- a/src/unk_0204B64C.c +++ b/src/unk_0204B64C.c @@ -1,21 +1,21 @@ +#include "unk_0204B64C.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "unk_0202CD50.h" #include "field_script_context.h" +#include "inlines.h" +#include "unk_0202CD50.h" #include "unk_0203E880.h" -#include "unk_0204B64C.h" #include "unk_02055C50.h" -BOOL ScrCmd_17D (ScriptContext * param0) +BOOL ScrCmd_17D(ScriptContext *param0) { - MapObject ** v0; - u16 * v1 = ScriptContext_GetVarPointer(param0); + MapObject **v0; + u16 *v1 = ScriptContext_GetVarPointer(param0); v0 = sub_0203F098(param0->fieldSystem, 10); *v1 = sub_02055F00(param0->fieldSystem, *v0); @@ -23,55 +23,55 @@ BOOL ScrCmd_17D (ScriptContext * param0) return 0; } -BOOL ScrCmd_17E (ScriptContext * param0) +BOOL ScrCmd_17E(ScriptContext *param0) { - MapObject ** v0 = sub_0203F098(param0->fieldSystem, 10); - u16 * v1 = ScriptContext_GetVarPointer(param0); + MapObject **v0 = sub_0203F098(param0->fieldSystem, 10); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02055F40(param0->fieldSystem, *v0); return 0; } -BOOL ScrCmd_17F (ScriptContext * param0) +BOOL ScrCmd_17F(ScriptContext *param0) { - MapObject ** v0 = sub_0203F098(param0->fieldSystem, 10); - u16 * v1 = ScriptContext_GetVarPointer(param0); + MapObject **v0 = sub_0203F098(param0->fieldSystem, 10); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02055F64(param0->fieldSystem, *v0); return 0; } -BOOL ScrCmd_180 (ScriptContext * param0) +BOOL ScrCmd_180(ScriptContext *param0) { - MapObject ** v0 = sub_0203F098(param0->fieldSystem, 10); - u16 * v1 = ScriptContext_GetVarPointer(param0); + MapObject **v0 = sub_0203F098(param0->fieldSystem, 10); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02055F88(param0->fieldSystem, *v0); return 0; } -BOOL ScrCmd_181 (ScriptContext * param0) +BOOL ScrCmd_181(ScriptContext *param0) { - MapObject ** v0 = sub_0203F098(param0->fieldSystem, 10); - u16 * v1 = ScriptContext_GetVarPointer(param0); + MapObject **v0 = sub_0203F098(param0->fieldSystem, 10); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02055FA8(param0->fieldSystem, *v0); return 0; } -BOOL ScrCmd_182 (ScriptContext * param0) +BOOL ScrCmd_182(ScriptContext *param0) { - MapObject ** v0 = sub_0203F098(param0->fieldSystem, 10); + MapObject **v0 = sub_0203F098(param0->fieldSystem, 10); u16 v1 = ScriptContext_GetVar(param0); sub_02055E80(param0->fieldSystem, *v0, v1); return 0; } -BOOL ScrCmd_183 (ScriptContext * param0) +BOOL ScrCmd_183(ScriptContext *param0) { - MapObject ** v0 = sub_0203F098(param0->fieldSystem, 10); - UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->fieldSystem->saveData); + MapObject **v0 = sub_0203F098(param0->fieldSystem, 10); + UnkStruct_0202CD88 *v1 = sub_0202CD88(param0->fieldSystem->saveData); u16 v2 = ScriptContext_GetVar(param0); sub_02055EAC(param0->fieldSystem, *v0, v2); @@ -80,7 +80,7 @@ BOOL ScrCmd_183 (ScriptContext * param0) return 0; } -BOOL ScrCmd_184 (ScriptContext * param0) +BOOL ScrCmd_184(ScriptContext *param0) { switch (ScriptContext_ReadHalfWord(param0)) { case 0: @@ -96,11 +96,11 @@ BOOL ScrCmd_184 (ScriptContext * param0) return 1; } -BOOL ScrCmd_185 (ScriptContext * param0) +BOOL ScrCmd_185(ScriptContext *param0) { u16 v0; - UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->fieldSystem->saveData); - MapObject ** v2 = sub_0203F098(param0->fieldSystem, 10); + UnkStruct_0202CD88 *v1 = sub_0202CD88(param0->fieldSystem->saveData); + MapObject **v2 = sub_0203F098(param0->fieldSystem, 10); sub_02055E00(param0->fieldSystem, *v2); sub_0202CFEC(v1, 0); diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c index d5d5d167a0..a40789fa26 100644 --- a/src/unk_0204B830.c +++ b/src/unk_0204B830.c @@ -1,25 +1,29 @@ +#include "unk_0204B830.h" + #include #include -#include "inlines.h" #include "constants/species.h" -#include "strbuf.h" -#include "trainer_info.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_0202610C.h" -#include "field/field_system.h" #include "struct_defs/union_0204C4D0.h" +#include "field/field_system.h" + +#include "bag.h" +#include "field_script_context.h" +#include "heap.h" +#include "inlines.h" +#include "party.h" +#include "pokemon.h" +#include "poketch_data.h" +#include "strbuf.h" #include "string_template.h" +#include "trainer_info.h" #include "unk_02017038.h" -#include "heap.h" #include "unk_0201D15C.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202602C.h" #include "unk_0202854C.h" #include "unk_020298BC.h" @@ -27,29 +31,23 @@ #include "unk_0202D778.h" #include "unk_0202DAB4.h" #include "unk_0202F180.h" -#include "field_script_context.h" #include "unk_0203E880.h" -#include "unk_0204B830.h" -#include "vars_flags.h" #include "unk_02054884.h" -#include "poketch_data.h" #include "unk_0206AFE0.h" -#include "pokemon.h" -#include "party.h" -#include "bag.h" #include "unk_020923C0.h" #include "unk_02092494.h" +#include "vars_flags.h" typedef struct { - FieldSystem * fieldSystem; - StringTemplate * unk_04; - void * unk_08; + FieldSystem *fieldSystem; + StringTemplate *unk_04; + void *unk_08; } UnkStruct_0204B830; -typedef BOOL (* UnkFuncPtr_020EBE94)(FieldSystem *, void *); -typedef void (* UnkFuncPtr_020EBE94_1)(FieldSystem *, void *); -typedef void (* UnkFuncPtr_020EBE94_2)(UnkStruct_0204B830 *, u16 *, u16 *); -typedef void (* UnkFuncPtr_020EBE94_3)(UnkStruct_0204B830 *, u16 *, u16 *); +typedef BOOL (*UnkFuncPtr_020EBE94)(FieldSystem *, void *); +typedef void (*UnkFuncPtr_020EBE94_1)(FieldSystem *, void *); +typedef void (*UnkFuncPtr_020EBE94_2)(UnkStruct_0204B830 *, u16 *, u16 *); +typedef void (*UnkFuncPtr_020EBE94_3)(UnkStruct_0204B830 *, u16 *, u16 *); typedef struct { UnkFuncPtr_020EBE94 unk_00; @@ -60,29 +58,29 @@ typedef struct { static const UnkStruct_020EBE94 Unk_020EBE94[13]; -static void sub_0204B830 (UnkStruct_0204B830 * param0, FieldSystem * fieldSystem, StringTemplate * param2, void * param3) +static void sub_0204B830(UnkStruct_0204B830 *param0, FieldSystem *fieldSystem, StringTemplate *param2, void *param3) { param0->fieldSystem = fieldSystem; param0->unk_04 = param2; param0->unk_08 = param3; } -static int sub_0204B838 (FieldSystem * fieldSystem) +static int sub_0204B838(FieldSystem *fieldSystem) { return sub_0202DF40(sub_0202DF18()); } -static void * sub_0204B844 (FieldSystem * fieldSystem) +static void *sub_0204B844(FieldSystem *fieldSystem) { return sub_0202DF5C(sub_0202DF18()); } -static void sub_0204B850 (FieldSystem * fieldSystem) +static void sub_0204B850(FieldSystem *fieldSystem) { sub_0202DF78(sub_0202DF18()); } -BOOL ScrCmd_23E (ScriptContext * param0) +BOOL ScrCmd_23E(ScriptContext *param0) { switch (ScriptContext_ReadHalfWord(param0)) { case 0: @@ -94,71 +92,59 @@ BOOL ScrCmd_23E (ScriptContext * param0) case 8: sub_0202DF04(param0->fieldSystem->saveData, 1); break; - case 1: - { - u16 * v0 = ScriptContext_GetVarPointer(param0); + case 1: { + u16 *v0 = ScriptContext_GetVarPointer(param0); if (sub_0204B838(param0->fieldSystem) != 0) { *v0 = 1; } else { *v0 = 0; } - } - break; - case 2: - { - u16 * v1 = ScriptContext_GetVarPointer(param0); + } break; + case 2: { + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_0204B838(param0->fieldSystem); - } - break; - case 3: - { - u16 * v2 = ScriptContext_GetVarPointer(param0); - const UnkStruct_020EBE94 * v3 = &Unk_020EBE94[sub_0204B838(param0->fieldSystem) - 1]; + } break; + case 3: { + u16 *v2 = ScriptContext_GetVarPointer(param0); + const UnkStruct_020EBE94 *v3 = &Unk_020EBE94[sub_0204B838(param0->fieldSystem) - 1]; *v2 = v3->unk_00(param0->fieldSystem, sub_0204B844(param0->fieldSystem)); - } - break; - case 4: - { - const UnkStruct_020EBE94 * v4 = &Unk_020EBE94[sub_0204B838(param0->fieldSystem) - 1]; + } break; + case 4: { + const UnkStruct_020EBE94 *v4 = &Unk_020EBE94[sub_0204B838(param0->fieldSystem) - 1]; v4->unk_04(param0->fieldSystem, sub_0204B844(param0->fieldSystem)); sub_0204B850(param0->fieldSystem); - } - break; - case 5: - { + } break; + case 5: { UnkStruct_0204B830 v5; - const UnkStruct_020EBE94 * v6 = &Unk_020EBE94[sub_0204B838(param0->fieldSystem) - 1]; - StringTemplate ** v7 = sub_0203F098(param0->fieldSystem, 15); - u16 * v8 = ScriptContext_GetVarPointer(param0); - u16 * v9 = ScriptContext_GetVarPointer(param0); + const UnkStruct_020EBE94 *v6 = &Unk_020EBE94[sub_0204B838(param0->fieldSystem) - 1]; + StringTemplate **v7 = sub_0203F098(param0->fieldSystem, 15); + u16 *v8 = ScriptContext_GetVarPointer(param0); + u16 *v9 = ScriptContext_GetVarPointer(param0); sub_0204B830(&v5, param0->fieldSystem, *v7, sub_0204B844(param0->fieldSystem)); v6->unk_08(&v5, v8, v9); - } - break; - case 6: - { + } break; + case 6: { UnkStruct_0204B830 v10; - const UnkStruct_020EBE94 * v11 = &Unk_020EBE94[sub_0204B838(param0->fieldSystem) - 1]; - StringTemplate ** v12 = sub_0203F098(param0->fieldSystem, 15); - u16 * v13 = ScriptContext_GetVarPointer(param0); - u16 * v14 = ScriptContext_GetVarPointer(param0); + const UnkStruct_020EBE94 *v11 = &Unk_020EBE94[sub_0204B838(param0->fieldSystem) - 1]; + StringTemplate **v12 = sub_0203F098(param0->fieldSystem, 15); + u16 *v13 = ScriptContext_GetVarPointer(param0); + u16 *v14 = ScriptContext_GetVarPointer(param0); sub_0204B830(&v10, param0->fieldSystem, *v12, sub_0204B844(param0->fieldSystem)); v11->unk_0C(&v10, v13, v14); - } - break; + } break; } return 0; } -static BOOL sub_0204BA50 (FieldSystem * fieldSystem, void * param1) +static BOOL sub_0204BA50(FieldSystem *fieldSystem, void *param1) { - Party * v0 = Party_GetFromSavedata(fieldSystem->saveData); + Party *v0 = Party_GetFromSavedata(fieldSystem->saveData); if (Party_GetCurrentCount(v0) < 6) { return 1; @@ -167,12 +153,12 @@ static BOOL sub_0204BA50 (FieldSystem * fieldSystem, void * param1) } } -static void sub_0204BA68 (FieldSystem * fieldSystem, void * param1) +static void sub_0204BA68(FieldSystem *fieldSystem, void *param1) { sub_02054930(32, fieldSystem->saveData, 490, 1, 2, 1); } -static void sub_0204BA88 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204BA88(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { *param1 = 379; *param2 = 13; @@ -180,20 +166,20 @@ static void sub_0204BA88 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetPlayerName(param0->unk_04, 0, SaveData_GetTrainerInfo(param0->fieldSystem->saveData)); } -static void sub_0204BAAC (FieldSystem * fieldSystem, void * param1) +static void sub_0204BAAC(FieldSystem *fieldSystem, void *param1) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(fieldSystem); - TrainerInfo * v1 = SaveData_GetTrainerInfo(fieldSystem->saveData); - VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); - Party * v3; - Pokemon * v4; + UnkUnion_0204C4D0 *v0 = sub_0204B844(fieldSystem); + TrainerInfo *v1 = SaveData_GetTrainerInfo(fieldSystem->saveData); + VarsFlags *v2 = SaveData_GetVarsFlags(fieldSystem->saveData); + Party *v3; + Pokemon *v4; BOOL v5; - Pokemon * v6 = NULL; + Pokemon *v6 = NULL; u32 v7, v8, v9, v10; u32 v11; int v12; - u8 * v13; - u8 * v14; + u8 *v13; + u8 *v14; v4 = (Pokemon *)&v0->val1.unk_04; v14 = (u8 *)&v0->val1.unk_F0; @@ -284,7 +270,7 @@ static void sub_0204BAAC (FieldSystem * fieldSystem, void * param1) } if (v0->val1.unk_00 == 0) { - Strbuf* v15 = TrainerInfo_NameNewStrbuf(v1, 32); + Strbuf *v15 = TrainerInfo_NameNewStrbuf(v1, 32); u32 v16 = TrainerInfo_ID(v1); u32 v17 = TrainerInfo_Gender(v1); @@ -323,10 +309,10 @@ static void sub_0204BAAC (FieldSystem * fieldSystem, void * param1) } } -static void sub_0204BDEC (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204BDEC(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); - Pokemon * v1; + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); + Pokemon *v1; *param1 = 379; *param2 = 7; @@ -337,21 +323,21 @@ static void sub_0204BDEC (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetSpeciesNameWithArticle(param0->unk_04, 1, Pokemon_GetBoxPokemon(v1)); } -static void sub_0204BE2C (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204BE2C(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { *param1 = 379; *param2 = 4; } -static void sub_0204BE3C (FieldSystem * fieldSystem, void * param1) +static void sub_0204BE3C(FieldSystem *fieldSystem, void *param1) { sub_0204BAAC(fieldSystem, param1); } -static void sub_0204BE44 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204BE44(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); - Pokemon * v1; + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); + Pokemon *v1; *param1 = 379; *param2 = 8; @@ -362,27 +348,27 @@ static void sub_0204BE44 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetSpeciesName(param0->unk_04, 1, Pokemon_GetBoxPokemon(v1)); } -static BOOL sub_0204BE84 (FieldSystem * fieldSystem, void * param1) +static BOOL sub_0204BE84(FieldSystem *fieldSystem, void *param1) { - Bag * v0 = SaveData_GetBag(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); + Bag *v0 = SaveData_GetBag(fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); return Bag_CanFitItem(v0, v1->val3.unk_00, 1, 32); } -static void sub_0204BEAC (FieldSystem * fieldSystem, void * param1) +static void sub_0204BEAC(FieldSystem *fieldSystem, void *param1) { - Bag * v0 = SaveData_GetBag(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); + Bag *v0 = SaveData_GetBag(fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); u16 v2; u16 v3 = v1->val3.unk_00; Bag_TryAddItem(v0, v3, 1, 32); } -static void sub_0204BED4 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204BED4(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); u16 v1 = v0->val3.unk_00; *param1 = 379; @@ -392,10 +378,10 @@ static void sub_0204BED4 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetItemName(param0->unk_04, 1, v1); } -static void sub_0204BF14 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204BF14(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - Bag * v0 = SaveData_GetBag(param0->fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(param0->fieldSystem); + Bag *v0 = SaveData_GetBag(param0->fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(param0->fieldSystem); u16 v2 = v1->val3.unk_00; *param1 = 379; @@ -404,24 +390,24 @@ static void sub_0204BF14 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetItemName(param0->unk_04, 0, v2); } -static BOOL sub_0204BF48 (FieldSystem * fieldSystem, void * param1) +static BOOL sub_0204BF48(FieldSystem *fieldSystem, void *param1) { return 1; } -static void sub_0204BF4C (FieldSystem * fieldSystem, void * param1) +static void sub_0204BF4C(FieldSystem *fieldSystem, void *param1) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(fieldSystem); - const BattleRegulation * v1 = (const BattleRegulation *)v0; + UnkUnion_0204C4D0 *v0 = sub_0204B844(fieldSystem); + const BattleRegulation *v1 = (const BattleRegulation *)v0; sub_0202613C(fieldSystem->saveData, v1); } -static void sub_0204BF60 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204BF60(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); - const BattleRegulation * v1 = (const BattleRegulation *)v0; - Strbuf* v2; + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); + const BattleRegulation *v1 = (const BattleRegulation *)v0; + Strbuf *v2; *param1 = 379; *param2 = 10; @@ -433,13 +419,13 @@ static void sub_0204BF60 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param Strbuf_Free(v2); } -static void sub_0204BFB8 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204BFB8(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { *param1 = 379; *param2 = 6; } -static BOOL sub_0204BFC8 (FieldSystem * fieldSystem, void * param1) +static BOOL sub_0204BFC8(FieldSystem *fieldSystem, void *param1) { int v0 = sub_020289A0(sub_020298B0(fieldSystem->saveData)); @@ -450,17 +436,17 @@ static BOOL sub_0204BFC8 (FieldSystem * fieldSystem, void * param1) return 0; } -static void sub_0204BFE0 (FieldSystem * fieldSystem, void * param1) +static void sub_0204BFE0(FieldSystem *fieldSystem, void *param1) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(fieldSystem); int v1 = v0->val4.unk_00; sub_0202895C(sub_020298B0(fieldSystem->saveData), v1); } -static void sub_0204BFF8 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204BFF8(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); int v1 = v0->val4.unk_00; *param1 = 379; @@ -470,15 +456,15 @@ static void sub_0204BFF8 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetUndergroundGoodsName(param0->unk_04, 1, v1); } -static void sub_0204C034 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C034(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { *param1 = 379; *param2 = 6; } -static BOOL sub_0204C044 (FieldSystem * fieldSystem, void * param1) +static BOOL sub_0204C044(FieldSystem *fieldSystem, void *param1) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(fieldSystem); int v1 = v0->val5.unk_00; int v2 = v0->val5.unk_04; @@ -494,9 +480,9 @@ static BOOL sub_0204C044 (FieldSystem * fieldSystem, void * param1) return 0; } -static void sub_0204C07C (FieldSystem * fieldSystem, void * param1) +static void sub_0204C07C(FieldSystem *fieldSystem, void *param1) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(fieldSystem); int v1 = v0->val5.unk_00; int v2 = v0->val5.unk_04; @@ -513,9 +499,9 @@ static void sub_0204C07C (FieldSystem * fieldSystem, void * param1) } } -static void sub_0204C0CC (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C0CC(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); int v1 = v0->val5.unk_00; int v2 = v0->val5.unk_04; @@ -537,25 +523,25 @@ static void sub_0204C0CC (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetPlayerName(param0->unk_04, 0, SaveData_GetTrainerInfo(param0->fieldSystem->saveData)); } -static void sub_0204C128 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C128(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { *param1 = 379; *param2 = 6; } -static BOOL sub_0204C138 (FieldSystem * fieldSystem, void * param1) +static BOOL sub_0204C138(FieldSystem *fieldSystem, void *param1) { - Bag * v0 = SaveData_GetBag(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); + Bag *v0 = SaveData_GetBag(fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); return Bag_CanFitItem(v0, 454, 1, 32); } -static void sub_0204C15C (FieldSystem * fieldSystem, void * param1) +static void sub_0204C15C(FieldSystem *fieldSystem, void *param1) { - Bag * v0 = SaveData_GetBag(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); - VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); + Bag *v0 = SaveData_GetBag(fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); + VarsFlags *v2 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v3; u16 v4 = 454; @@ -563,9 +549,9 @@ static void sub_0204C15C (FieldSystem * fieldSystem, void * param1) sub_0206B144(v2, 0); } -static void sub_0204C190 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C190(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); u16 v1 = 454; *param1 = 379; @@ -575,10 +561,10 @@ static void sub_0204C190 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetItemName(param0->unk_04, 1, v1); } -static void sub_0204C1CC (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C1CC(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - Bag * v0 = SaveData_GetBag(param0->fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(param0->fieldSystem); + Bag *v0 = SaveData_GetBag(param0->fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(param0->fieldSystem); u16 v2 = 454; *param1 = 379; @@ -587,19 +573,19 @@ static void sub_0204C1CC (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetItemName(param0->unk_04, 0, v2); } -static BOOL sub_0204C1FC (FieldSystem * fieldSystem, void * param1) +static BOOL sub_0204C1FC(FieldSystem *fieldSystem, void *param1) { - Bag * v0 = SaveData_GetBag(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); + Bag *v0 = SaveData_GetBag(fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); return Bag_CanFitItem(v0, 452, 1, 32); } -static void sub_0204C220 (FieldSystem * fieldSystem, void * param1) +static void sub_0204C220(FieldSystem *fieldSystem, void *param1) { - Bag * v0 = SaveData_GetBag(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); - VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); + Bag *v0 = SaveData_GetBag(fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); + VarsFlags *v2 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v3; u16 v4 = 452; @@ -611,9 +597,9 @@ static void sub_0204C220 (FieldSystem * fieldSystem, void * param1) } } -static void sub_0204C264 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C264(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); u16 v1 = 452; *param1 = 379; @@ -623,10 +609,10 @@ static void sub_0204C264 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetItemName(param0->unk_04, 1, v1); } -static void sub_0204C2A0 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C2A0(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - Bag * v0 = SaveData_GetBag(param0->fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(param0->fieldSystem); + Bag *v0 = SaveData_GetBag(param0->fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(param0->fieldSystem); u16 v2 = 452; *param1 = 379; @@ -635,19 +621,19 @@ static void sub_0204C2A0 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetItemName(param0->unk_04, 0, v2); } -static BOOL sub_0204C2D0 (FieldSystem * fieldSystem, void * param1) +static BOOL sub_0204C2D0(FieldSystem *fieldSystem, void *param1) { - Bag * v0 = SaveData_GetBag(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); + Bag *v0 = SaveData_GetBag(fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); return Bag_CanFitItem(v0, 467, 1, 32); } -static void sub_0204C2F4 (FieldSystem * fieldSystem, void * param1) +static void sub_0204C2F4(FieldSystem *fieldSystem, void *param1) { - Bag * v0 = SaveData_GetBag(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); - VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); + Bag *v0 = SaveData_GetBag(fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); + VarsFlags *v2 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v3; u16 v4 = 467; @@ -655,9 +641,9 @@ static void sub_0204C2F4 (FieldSystem * fieldSystem, void * param1) sub_0206B144(v2, 3); } -static void sub_0204C328 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C328(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); u16 v1 = 467; *param1 = 379; @@ -667,10 +653,10 @@ static void sub_0204C328 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetItemName(param0->unk_04, 1, v1); } -static void sub_0204C364 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C364(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - Bag * v0 = SaveData_GetBag(param0->fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(param0->fieldSystem); + Bag *v0 = SaveData_GetBag(param0->fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(param0->fieldSystem); u16 v2 = 467; *param1 = 379; @@ -679,19 +665,19 @@ static void sub_0204C364 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetItemName(param0->unk_04, 0, v2); } -static BOOL sub_0204C394 (FieldSystem * fieldSystem, void * param1) +static BOOL sub_0204C394(FieldSystem *fieldSystem, void *param1) { - Bag * v0 = SaveData_GetBag(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); + Bag *v0 = SaveData_GetBag(fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); return Bag_CanFitItem(v0, 455, 1, 32); } -static void sub_0204C3B8 (FieldSystem * fieldSystem, void * param1) +static void sub_0204C3B8(FieldSystem *fieldSystem, void *param1) { - Bag * v0 = SaveData_GetBag(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); - VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); + Bag *v0 = SaveData_GetBag(fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); + VarsFlags *v2 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v3; u16 v4 = 455; @@ -699,9 +685,9 @@ static void sub_0204C3B8 (FieldSystem * fieldSystem, void * param1) sub_0206B144(v2, 2); } -static void sub_0204C3EC (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C3EC(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); u16 v1 = 455; *param1 = 379; @@ -711,10 +697,10 @@ static void sub_0204C3EC (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetItemName(param0->unk_04, 1, v1); } -static void sub_0204C428 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C428(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - Bag * v0 = SaveData_GetBag(param0->fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(param0->fieldSystem); + Bag *v0 = SaveData_GetBag(param0->fieldSystem->saveData); + UnkUnion_0204C4D0 *v1 = sub_0204B844(param0->fieldSystem); u16 v2 = 455; *param1 = 379; @@ -723,25 +709,25 @@ static void sub_0204C428 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetItemName(param0->unk_04, 0, v2); } -static BOOL sub_0204C458 (FieldSystem * fieldSystem, void * param1) +static BOOL sub_0204C458(FieldSystem *fieldSystem, void *param1) { PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); return PoketchData_IsEnabled(poketchData); } -static void sub_0204C474 (FieldSystem * fieldSystem, void * param1) +static void sub_0204C474(FieldSystem *fieldSystem, void *param1) { PoketchData *poketchData = SaveData_PoketchData(fieldSystem->saveData); - UnkUnion_0204C4D0 * v1 = sub_0204B844(fieldSystem); + UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem); PoketchData_RegisterApp(poketchData, v1->val6.unk_00); } -static void sub_0204C494 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C494(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); *param1 = 379; *param2 = 19; @@ -750,9 +736,9 @@ static void sub_0204C494 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param StringTemplate_SetPoketchAppName(param0->unk_04, 1, v0->val6.unk_00); } -static void sub_0204C4D0 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param2) +static void sub_0204C4D0(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2) { - UnkUnion_0204C4D0 * v0 = sub_0204B844(param0->fieldSystem); + UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem); *param1 = 379; *param2 = 20; @@ -761,17 +747,17 @@ static void sub_0204C4D0 (UnkStruct_0204B830 * param0, u16 * param1, u16 * param } static const UnkStruct_020EBE94 Unk_020EBE94[] = { - {sub_0204BA50, sub_0204BAAC, sub_0204BDEC, sub_0204BE2C}, - {sub_0204BA50, sub_0204BE3C, sub_0204BE44, sub_0204BE2C}, - {sub_0204BE84, sub_0204BEAC, sub_0204BED4, sub_0204BF14}, - {sub_0204BF48, sub_0204BF4C, sub_0204BF60, sub_0204BFB8}, - {sub_0204BFC8, sub_0204BFE0, sub_0204BFF8, sub_0204C034}, - {sub_0204C044, sub_0204C07C, sub_0204C0CC, sub_0204C128}, - {sub_0204BA50, sub_0204BA68, sub_0204BA88, sub_0204BE2C}, - {sub_0204C138, sub_0204C15C, sub_0204C190, sub_0204C1CC}, - {sub_0204C1FC, sub_0204C220, sub_0204C264, sub_0204C2A0}, - {sub_0204C394, sub_0204C3B8, sub_0204C3EC, sub_0204C428}, - {sub_0204C458, sub_0204C474, sub_0204C494, sub_0204C4D0}, - {sub_0204C2D0, sub_0204C2F4, sub_0204C328, sub_0204C364}, - {sub_0204BA50, sub_0204BAAC, sub_0204BDEC, sub_0204BE2C} + { sub_0204BA50, sub_0204BAAC, sub_0204BDEC, sub_0204BE2C }, + { sub_0204BA50, sub_0204BE3C, sub_0204BE44, sub_0204BE2C }, + { sub_0204BE84, sub_0204BEAC, sub_0204BED4, sub_0204BF14 }, + { sub_0204BF48, sub_0204BF4C, sub_0204BF60, sub_0204BFB8 }, + { sub_0204BFC8, sub_0204BFE0, sub_0204BFF8, sub_0204C034 }, + { sub_0204C044, sub_0204C07C, sub_0204C0CC, sub_0204C128 }, + { sub_0204BA50, sub_0204BA68, sub_0204BA88, sub_0204BE2C }, + { sub_0204C138, sub_0204C15C, sub_0204C190, sub_0204C1CC }, + { sub_0204C1FC, sub_0204C220, sub_0204C264, sub_0204C2A0 }, + { sub_0204C394, sub_0204C3B8, sub_0204C3EC, sub_0204C428 }, + { sub_0204C458, sub_0204C474, sub_0204C494, sub_0204C4D0 }, + { sub_0204C2D0, sub_0204C2F4, sub_0204C328, sub_0204C364 }, + { sub_0204BA50, sub_0204BAAC, sub_0204BDEC, sub_0204BE2C } }; diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index 830efd55b0..4ce83c6858 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -1,32 +1,32 @@ +#include "unk_0204C500.h" + #include #include -#include "inlines.h" - -#include "struct_decls/struct_02024440_decl.h" #include "struct_decls/pokedexdata_decl.h" +#include "struct_decls/struct_02024440_decl.h" #include "struct_decls/struct_020797DC_decl.h" -#include "field_script_context.h" +#include "savedata/save_table.h" +#include "field_script_context.h" #include "heap.h" -#include "savedata/save_table.h" -#include "unk_02025E08.h" +#include "inlines.h" +#include "pokemon.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0202631C.h" #include "unk_0202EEC0.h" #include "unk_0202F180.h" -#include "unk_0204C500.h" -#include "vars_flags.h" #include "unk_020562F8.h" #include "unk_0206A8DC.h" -#include "pokemon.h" #include "unk_020797C8.h" #include "unk_02092494.h" +#include "vars_flags.h" -BOOL ScrCmd_253 (ScriptContext * param0) +BOOL ScrCmd_253(ScriptContext *param0) { - VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); u16 v1 = ScriptContext_GetVar(param0); if (v1 == 0) { @@ -42,11 +42,11 @@ BOOL ScrCmd_253 (ScriptContext * param0) return 0; } -BOOL ScrCmd_254 (ScriptContext * param0) +BOOL ScrCmd_254(ScriptContext *param0) { - PalParkTransfer * v0 = SaveData_PalParkTransfer(param0->fieldSystem->saveData); - Pokemon * v1 = Pokemon_New(32); - u16 * v2 = ScriptContext_GetVarPointer(param0); + PalParkTransfer *v0 = SaveData_PalParkTransfer(param0->fieldSystem->saveData); + Pokemon *v1 = Pokemon_New(32); + u16 *v2 = ScriptContext_GetVarPointer(param0); if (sub_0202F028(v0) == 6) { *v2 = 1; @@ -58,13 +58,13 @@ BOOL ScrCmd_254 (ScriptContext * param0) return 0; } -BOOL ScrCmd_255 (ScriptContext * param0) +BOOL ScrCmd_255(ScriptContext *param0) { - PalParkTransfer * v0 = SaveData_PalParkTransfer(param0->fieldSystem->saveData); - PCBoxes * v1 = SaveData_PCBoxes(param0->fieldSystem->saveData); - Pokemon * v2 = Pokemon_New(32); - TrainerInfo * v3 = SaveData_GetTrainerInfo(param0->fieldSystem->saveData); - PokedexData * v4 = SaveData_Pokedex(param0->fieldSystem->saveData); + PalParkTransfer *v0 = SaveData_PalParkTransfer(param0->fieldSystem->saveData); + PCBoxes *v1 = SaveData_PCBoxes(param0->fieldSystem->saveData); + Pokemon *v2 = Pokemon_New(32); + TrainerInfo *v3 = SaveData_GetTrainerInfo(param0->fieldSystem->saveData); + PokedexData *v4 = SaveData_Pokedex(param0->fieldSystem->saveData); BOOL v5; int v6; @@ -82,10 +82,10 @@ BOOL ScrCmd_255 (ScriptContext * param0) return 0; } -BOOL ScrCmd_256 (ScriptContext * param0) +BOOL ScrCmd_256(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); - u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 *v1 = ScriptContext_GetVarPointer(param0); switch (v0) { case 0: diff --git a/src/unk_0204C6C8.c b/src/unk_0204C6C8.c index a806a72e84..39a27e79a9 100644 --- a/src/unk_0204C6C8.c +++ b/src/unk_0204C6C8.c @@ -1,29 +1,28 @@ +#include "unk_0204C6C8.h" + #include #include -#include "inlines.h" - -#include "trainer_info.h" -#include "savedata.h" +#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" -#include "struct_defs/struct_0205AA50.h" +#include "overlay005/ov5_021DC018.h" -#include "unk_02025E08.h" #include "coins.h" -#include "field_system.h" #include "field_script_context.h" +#include "field_system.h" +#include "inlines.h" +#include "savedata.h" +#include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0203E880.h" -#include "unk_0204C6C8.h" -#include "overlay005/ov5_021DC018.h" - -BOOL ScrCmd_075 (ScriptContext * param0) +BOOL ScrCmd_075(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - Window ** v3; + Window **v3; v3 = sub_0203F098(fieldSystem, 38); *v3 = ov5_021DD020(param0->fieldSystem, v1, v2); @@ -31,30 +30,30 @@ BOOL ScrCmd_075 (ScriptContext * param0) return 0; } -BOOL ScrCmd_076 (ScriptContext * param0) +BOOL ScrCmd_076(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Window ** v1 = sub_0203F098(fieldSystem, 38); + FieldSystem *fieldSystem = param0->fieldSystem; + Window **v1 = sub_0203F098(fieldSystem, 38); ov5_021DD084(*v1); return 0; } -BOOL ScrCmd_077 (ScriptContext * param0) +BOOL ScrCmd_077(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Window ** v1 = sub_0203F098(fieldSystem, 38); + FieldSystem *fieldSystem = param0->fieldSystem; + Window **v1 = sub_0203F098(fieldSystem, 38); ov5_021DD098(param0->fieldSystem, *v1); return 0; } -BOOL ScrCmd_078 (ScriptContext * param0) +BOOL ScrCmd_078(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - u16 * v2 = sub_02025E50(v1); - u16 * v3; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + u16 *v2 = sub_02025E50(v1); + u16 *v3; v3 = ScriptContext_GetVarPointer(param0); *v3 = (u16)Coins_GetValue(v2); @@ -62,11 +61,11 @@ BOOL ScrCmd_078 (ScriptContext * param0) return 0; } -BOOL ScrCmd_079 (ScriptContext * param0) +BOOL ScrCmd_079(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - u16 * v2 = sub_02025E50(v1); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + u16 *v2 = sub_02025E50(v1); u16 v3; v3 = ScriptContext_GetVar(param0); @@ -75,11 +74,11 @@ BOOL ScrCmd_079 (ScriptContext * param0) return 0; } -BOOL ScrCmd_07A (ScriptContext * param0) +BOOL ScrCmd_07A(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - u16 * v2 = sub_02025E50(v1); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + u16 *v2 = sub_02025E50(v1); u16 v3; v3 = ScriptContext_GetVar(param0); @@ -88,12 +87,12 @@ BOOL ScrCmd_07A (ScriptContext * param0) return 0; } -BOOL ScrCmd_2A8 (ScriptContext * param0) +BOOL ScrCmd_2A8(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - u16 * v2 = sub_02025E50(v1); - u16 * v3 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + u16 *v2 = sub_02025E50(v1); + u16 *v3 = ScriptContext_GetVarPointer(param0); u16 v4; v4 = *v3; @@ -103,14 +102,14 @@ BOOL ScrCmd_2A8 (ScriptContext * param0) return 0; } -BOOL ScrCmd_274 (ScriptContext * param0) +BOOL ScrCmd_274(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); - SaveData * v2 = fieldSystem->saveData; - u16 * v3 = sub_02025E50(v2); + FieldSystem *fieldSystem = param0->fieldSystem; + TrainerInfo *v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + SaveData *v2 = fieldSystem->saveData; + u16 *v3 = sub_02025E50(v2); u32 v4, v5; - u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 *v6 = ScriptContext_GetVarPointer(param0); v4 = ScriptContext_ReadWord(param0); v5 = Coins_GetValue(v3); @@ -124,14 +123,14 @@ BOOL ScrCmd_274 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2A9 (ScriptContext * param0) +BOOL ScrCmd_2A9(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); - SaveData * v2 = fieldSystem->saveData; - u16 * v3 = sub_02025E50(v2); - u16 * v4 = ScriptContext_GetVarPointer(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + TrainerInfo *v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + SaveData *v2 = fieldSystem->saveData; + u16 *v3 = sub_02025E50(v2); + u16 *v4 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); u32 v6, v7; v6 = *v5; @@ -146,12 +145,12 @@ BOOL ScrCmd_2A9 (ScriptContext * param0) return 0; } -BOOL ScrCmd_276 (ScriptContext * param0) +BOOL ScrCmd_276(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - u16 * v2 = sub_02025E50(v1); - u16 * v3 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + u16 *v2 = sub_02025E50(v1); + u16 *v3 = ScriptContext_GetVarPointer(param0); u16 v4 = ScriptContext_GetVar(param0); *v3 = Coins_CanAddAmount(v2, v4); diff --git a/src/unk_0204C8F0.c b/src/unk_0204C8F0.c index 0ec68b363a..4d0e63bf75 100644 --- a/src/unk_0204C8F0.c +++ b/src/unk_0204C8F0.c @@ -1,25 +1,23 @@ +#include "unk_0204C8F0.h" + #include #include -#include "inlines.h" - -#include "trainer_info.h" +#include "struct_defs/struct_0205AA50.h" #include "field/field_system.h" -#include "struct_defs/struct_0205AA50.h" +#include "overlay005/ov5_021DC018.h" -#include "unk_02025E08.h" -#include "trainer_info.h" -#include "field_system.h" #include "field_script_context.h" +#include "field_system.h" +#include "inlines.h" +#include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0203E880.h" -#include "unk_0204C8F0.h" -#include "overlay005/ov5_021DC018.h" - -BOOL ScrCmd_06F (ScriptContext * param0) +BOOL ScrCmd_06F(ScriptContext *param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); u32 v1; v1 = ScriptContext_ReadWord(param0); @@ -28,9 +26,9 @@ BOOL ScrCmd_06F (ScriptContext * param0) return 0; } -BOOL ScrCmd_070 (ScriptContext * param0) +BOOL ScrCmd_070(ScriptContext *param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); u32 v1; v1 = ScriptContext_ReadWord(param0); @@ -39,9 +37,9 @@ BOOL ScrCmd_070 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1A3 (ScriptContext * param0) +BOOL ScrCmd_1A3(ScriptContext *param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); u32 v1; v1 = ScriptContext_GetVar(param0); @@ -50,10 +48,10 @@ BOOL ScrCmd_1A3 (ScriptContext * param0) return 0; } -BOOL ScrCmd_071 (ScriptContext * param0) +BOOL ScrCmd_071(ScriptContext *param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); - u16 * v1; + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + u16 *v1; u32 v2, v3; v1 = ScriptContext_GetVarPointer(param0); @@ -69,10 +67,10 @@ BOOL ScrCmd_071 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1AB (ScriptContext * param0) +BOOL ScrCmd_1AB(ScriptContext *param0) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); - u16 * v1; + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + u16 *v1; u32 v2, v3; v1 = ScriptContext_GetVarPointer(param0); @@ -88,12 +86,12 @@ BOOL ScrCmd_1AB (ScriptContext * param0) return 0; } -BOOL ScrCmd_072 (ScriptContext * param0) +BOOL ScrCmd_072(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - Window ** v3; + Window **v3; v3 = sub_0203F098(fieldSystem, 39); *v3 = ov5_021DCEB0(param0->fieldSystem, v1, v2); @@ -101,19 +99,19 @@ BOOL ScrCmd_072 (ScriptContext * param0) return 0; } -BOOL ScrCmd_073 (ScriptContext * param0) +BOOL ScrCmd_073(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Window ** v1 = sub_0203F098(fieldSystem, 39); + FieldSystem *fieldSystem = param0->fieldSystem; + Window **v1 = sub_0203F098(fieldSystem, 39); ov5_021DCF58(*v1); return 0; } -BOOL ScrCmd_074 (ScriptContext * param0) +BOOL ScrCmd_074(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Window ** v1 = sub_0203F098(fieldSystem, 39); + FieldSystem *fieldSystem = param0->fieldSystem; + Window **v1 = sub_0203F098(fieldSystem, 39); ov5_021DCF6C(param0->fieldSystem, *v1); return 0; diff --git a/src/unk_0204CA84.c b/src/unk_0204CA84.c index 9b14b1c2b1..23d6008773 100644 --- a/src/unk_0204CA84.c +++ b/src/unk_0204CA84.c @@ -1,42 +1,41 @@ +#include "unk_0204CA84.h" + #include #include -#include "inlines.h" - -#include "trainer_info.h" #include "struct_decls/struct_02026310_decl.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" #include "field/field_system.h" +#include "overlay005/ov5_021E622C.h" +#include "field_script_context.h" +#include "field_system.h" +#include "inlines.h" +#include "party.h" #include "savedata.h" +#include "trainer_info.h" #include "unk_02025E08.h" #include "unk_020261E4.h" -#include "field_system.h" -#include "field_script_context.h" #include "unk_0203E880.h" -#include "unk_0204CA84.h" -#include "party.h" -#include "overlay005/ov5_021E622C.h" -BOOL ScrCmd_16D (ScriptContext * param0) +BOOL ScrCmd_16D(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); ov5_021E72BC(sub_02026310(v1), *v2); return 0; } -BOOL ScrCmd_16E (ScriptContext * param0) +BOOL ScrCmd_16E(ScriptContext *param0) { - u16 * v0; - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v2 = fieldSystem->saveData; - UnkStruct_02026310 * v3; + u16 *v0; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v2 = fieldSystem->saveData; + UnkStruct_02026310 *v3; v0 = ScriptContext_GetVarPointer(param0); v3 = (UnkStruct_02026310 *)(SaveData_SaveTable(v2, 8)); @@ -45,11 +44,11 @@ BOOL ScrCmd_16E (ScriptContext * param0) return 0; } -BOOL ScrCmd_1A8 (ScriptContext * param0) +BOOL ScrCmd_1A8(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UnkStruct_02026310 * v2; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UnkStruct_02026310 *v2; v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); ov5_021E6B40(v2); @@ -57,26 +56,26 @@ BOOL ScrCmd_1A8 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1A9 (ScriptContext * param0) +BOOL ScrCmd_1A9(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UnkStruct_02026310 * v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); - Party * v3 = Party_GetFromSavedata(fieldSystem->saveData); - TrainerInfo * v4 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UnkStruct_02026310 *v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); + Party *v3 = Party_GetFromSavedata(fieldSystem->saveData); + TrainerInfo *v4 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); ov5_021E6EA8(v2, v3, v4); return 0; } -BOOL ScrCmd_1A4 (ScriptContext * param0) +BOOL ScrCmd_1A4(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - UnkStruct_02026310 * v1; - Party * v2; - StringTemplate ** v3 = sub_0203F098(fieldSystem, 15); - SaveData * v4 = fieldSystem->saveData; - u16 * v5 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + UnkStruct_02026310 *v1; + Party *v2; + StringTemplate **v3 = sub_0203F098(fieldSystem, 15); + SaveData *v4 = fieldSystem->saveData; + u16 *v5 = ScriptContext_GetVarPointer(param0); u8 v6 = ScriptContext_GetVar(param0); v1 = (UnkStruct_02026310 *)(SaveData_SaveTable(v4, 8)); @@ -86,13 +85,13 @@ BOOL ScrCmd_1A4 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1AA (ScriptContext * param0) +BOOL ScrCmd_1AA(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - UnkStruct_02026310 * v1; - StringTemplate ** v2 = sub_0203F098(fieldSystem, 15); - SaveData * v3 = fieldSystem->saveData; - u16 * v4 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + UnkStruct_02026310 *v1; + StringTemplate **v2 = sub_0203F098(fieldSystem, 15); + SaveData *v3 = fieldSystem->saveData; + u16 *v4 = ScriptContext_GetVarPointer(param0); u8 v5 = ScriptContext_GetVar(param0); v1 = (UnkStruct_02026310 *)(SaveData_SaveTable(v3, 8)); @@ -101,13 +100,13 @@ BOOL ScrCmd_1AA (ScriptContext * param0) return 0; } -BOOL ScrCmd_1AE (ScriptContext * param0) +BOOL ScrCmd_1AE(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UnkStruct_02026310 * v2; - StringTemplate ** v3 = sub_0203F098(param0->fieldSystem, 15); - u16 * v4 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UnkStruct_02026310 *v2; + StringTemplate **v3 = sub_0203F098(param0->fieldSystem, 15); + u16 *v4 = ScriptContext_GetVarPointer(param0); u16 v5 = ScriptContext_GetVar(param0); v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); @@ -116,14 +115,14 @@ BOOL ScrCmd_1AE (ScriptContext * param0) return 0; } -BOOL ScrCmd_1AF (ScriptContext * param0) +BOOL ScrCmd_1AF(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Party * v1; - StringTemplate ** v2 = sub_0203F098(param0->fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + Party *v1; + StringTemplate **v2 = sub_0203F098(param0->fieldSystem, 15); u16 v3 = ScriptContext_ReadHalfWord(param0); u16 v4 = ScriptContext_GetVar(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); v1 = Party_GetFromSavedata(fieldSystem->saveData); *v5 = ov5_021E73A0(v1, v4, *v2); @@ -131,12 +130,12 @@ BOOL ScrCmd_1AF (ScriptContext * param0) return 0; } -BOOL ScrCmd_1B0 (ScriptContext * param0) +BOOL ScrCmd_1B0(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UnkStruct_02026310 * v2; - Party * v3; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UnkStruct_02026310 *v2; + Party *v3; u8 v4 = ScriptContext_GetVar(param0); v3 = Party_GetFromSavedata(fieldSystem->saveData); @@ -147,11 +146,11 @@ BOOL ScrCmd_1B0 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1BC (ScriptContext * param0) +BOOL ScrCmd_1BC(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - StringTemplate ** v2 = sub_0203F098(param0->fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + StringTemplate **v2 = sub_0203F098(param0->fieldSystem, 15); u8 v3 = ScriptContext_GetVar(param0); u8 v4 = ScriptContext_GetVar(param0); u8 v5 = ScriptContext_GetVar(param0); @@ -161,12 +160,12 @@ BOOL ScrCmd_1BC (ScriptContext * param0) return 0; } -BOOL ScrCmd_1BE (ScriptContext * param0) +BOOL ScrCmd_1BE(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UnkStruct_02026310 * v2; - u16 * v3 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UnkStruct_02026310 *v2; + u16 *v3 = ScriptContext_GetVarPointer(param0); v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); *v3 = ov5_021E7420(v2); @@ -174,12 +173,12 @@ BOOL ScrCmd_1BE (ScriptContext * param0) return 0; } -BOOL ScrCmd_1BF (ScriptContext * param0) +BOOL ScrCmd_1BF(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UnkStruct_02026310 * v2; - u16 * v3 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UnkStruct_02026310 *v2; + u16 *v3 = ScriptContext_GetVarPointer(param0); v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8)); *v3 = sub_02026234(v2); @@ -187,30 +186,30 @@ BOOL ScrCmd_1BF (ScriptContext * param0) return 0; } -BOOL ScrCmd_1A5 (ScriptContext * param0) +BOOL ScrCmd_1A5(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_1A6 (ScriptContext * param0) +BOOL ScrCmd_1A6(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; return 0; } -BOOL ScrCmd_1A7 (ScriptContext * param0) +BOOL ScrCmd_1A7(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; return 0; } -BOOL ScrCmd_1AD (ScriptContext * param0) +BOOL ScrCmd_1AD(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v1 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v1 = ScriptContext_GetVarPointer(param0); return 0; } diff --git a/src/unk_0204CDDC.c b/src/unk_0204CDDC.c index e2f5b4f332..640f4bb14e 100644 --- a/src/unk_0204CDDC.c +++ b/src/unk_0204CDDC.c @@ -1,45 +1,44 @@ +#include "unk_0204CDDC.h" + #include #include -#include "inlines.h" +#include "constants/species.h" #include "field_script_context.h" - +#include "inlines.h" #include "unk_0201D15C.h" -#include "unk_0204CDDC.h" -#include "vars_flags.h" #include "unk_0206AFE0.h" +#include "vars_flags.h" -#include "constants/species.h" - -BOOL ScrCmd_2DF(ScriptContext * param0); -BOOL ScrCmd_2E0(ScriptContext * param0); -BOOL ScrCmd_2E1(ScriptContext * param0); +BOOL ScrCmd_2DF(ScriptContext *param0); +BOOL ScrCmd_2E0(ScriptContext *param0); +BOOL ScrCmd_2E1(ScriptContext *param0); -BOOL ScrCmd_215 (ScriptContext * param0) +BOOL ScrCmd_215(ScriptContext *param0) { sub_0206B218(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_216 (ScriptContext * param0) +BOOL ScrCmd_216(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); *v0 = sub_0206B228(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } static const u16 Unk_020EBF84[6][10] = { - {0x0, 0x5, 0x15, 0x6, 0x1A, 0xD, 0x19, 0x1F, 0x10, 0x21}, // Chimchar, Monferno, Infernape - {0x2, 0x13, 0x14, 0x18, 0x11, 0x0, 0x17, 0x1D, 0x1C, 0xF}, // Piplup, Prinplup, Empoleon - {0x9, 0x8, 0x3, 0x6, 0x16, 0x1E, 0x11, 0x7, 0xE, 0x20}, // Turtwig, Grotle, Torterra - {0xC, 0x12, 0x15, 0xD, 0x1F, 0x8, 0x19, 0x18, 0x1B, 0x7}, // Psyduck, Buneary, Drifloon - {0x5, 0x3, 0x1A, 0x13, 0x14, 0x1, 0xB, 0x10, 0x16, 0xF}, // Pikachu, Clefairy, Pachirisu, Happiny - {0xC, 0x1E, 0x2, 0x14, 0x1D, 0x4, 0x9, 0x1B, 0xE, 0xA} // Jigglypuff, Torchic, Skitty, Shroomish + { 0x0, 0x5, 0x15, 0x6, 0x1A, 0xD, 0x19, 0x1F, 0x10, 0x21 }, // Chimchar, Monferno, Infernape + { 0x2, 0x13, 0x14, 0x18, 0x11, 0x0, 0x17, 0x1D, 0x1C, 0xF }, // Piplup, Prinplup, Empoleon + { 0x9, 0x8, 0x3, 0x6, 0x16, 0x1E, 0x11, 0x7, 0xE, 0x20 }, // Turtwig, Grotle, Torterra + { 0xC, 0x12, 0x15, 0xD, 0x1F, 0x8, 0x19, 0x18, 0x1B, 0x7 }, // Psyduck, Buneary, Drifloon + { 0x5, 0x3, 0x1A, 0x13, 0x14, 0x1, 0xB, 0x10, 0x16, 0xF }, // Pikachu, Clefairy, Pachirisu, Happiny + { 0xC, 0x1E, 0x2, 0x14, 0x1D, 0x4, 0x9, 0x1B, 0xE, 0xA } // Jigglypuff, Torchic, Skitty, Shroomish }; -BOOL ScrCmd_217 (ScriptContext * ctx) +BOOL ScrCmd_217(ScriptContext *ctx) { u8 i, j; u16 rand; @@ -132,18 +131,18 @@ static const u16 Unk_020EBF64[] = { 0x21 }; -BOOL ScrCmd_2DF (ScriptContext * param0) +BOOL ScrCmd_2DF(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); *v0 = (LCRNG_Next() % (NELEMS(Unk_020EBF64))); return 0; } -BOOL ScrCmd_2E0 (ScriptContext * param0) +BOOL ScrCmd_2E0(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); - u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 *v1 = ScriptContext_GetVarPointer(param0); if (v0 < 9) { *v1 = 0; @@ -154,10 +153,10 @@ BOOL ScrCmd_2E0 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2E1 (ScriptContext * param0) +BOOL ScrCmd_2E1(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); - u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = Unk_020EBF64[v0]; return 0; diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c index 8d0d74a794..ad042793b9 100644 --- a/src/unk_0204CFFC.c +++ b/src/unk_0204CFFC.c @@ -1,44 +1,42 @@ +#include "unk_0204CFFC.h" + #include #include -#include "inlines.h" - -#include "trainer_info.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "field/field_system.h" -#include "field_script_context.h" +#include "overlay005/ov5_021E622C.h" +#include "savedata/save_table.h" -#include "unk_02017038.h" +#include "field_script_context.h" +#include "field_system.h" #include "heap.h" -#include "savedata/save_table.h" -#include "unk_02025E08.h" -#include "trainer_info.h" +#include "inlines.h" +#include "item.h" #include "map_header.h" -#include "field_system.h" -#include "unk_0204CFFC.h" +#include "party.h" +#include "pokemon.h" +#include "trainer_info.h" +#include "unk_02017038.h" +#include "unk_02025E08.h" #include "unk_02054884.h" #include "unk_0205DFC4.h" #include "unk_0206CCB0.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "party.h" -#include "item.h" #include "unk_020923C0.h" -#include "overlay005/ov5_021E622C.h" -BOOL ScrCmd_096 (ScriptContext * param0) +BOOL ScrCmd_096(ScriptContext *param0) { int v0 = MapHeader_GetMapLabelTextID(param0->fieldSystem->location->mapId); int v1 = 24; - Party * v2; - FieldSystem * fieldSystem = param0->fieldSystem; + Party *v2; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v4 = ScriptContext_GetVar(param0); u16 v5 = ScriptContext_GetVar(param0); u16 v6 = ScriptContext_GetVar(param0); - u16 * v7 = ScriptContext_GetVarPointer(param0); + u16 *v7 = ScriptContext_GetVarPointer(param0); v2 = Party_GetFromSavedata(fieldSystem->saveData); *v7 = sub_020548B0(11, fieldSystem->saveData, v4, v5, v6, v0, v1); @@ -46,12 +44,12 @@ BOOL ScrCmd_096 (ScriptContext * param0) return 0; } -BOOL ScrCmd_198 (ScriptContext * param0) +BOOL ScrCmd_198(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), *v2); @@ -64,13 +62,13 @@ BOOL ScrCmd_198 (ScriptContext * param0) return 0; } -BOOL ScrCmd_199 (ScriptContext * param0) +BOOL ScrCmd_199(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); - u16 * v3 = ScriptContext_GetVarPointer(param0); - u16 * v4 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + TrainerInfo *v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->fieldSystem)); + u16 *v3 = ScriptContext_GetVarPointer(param0); + u16 *v4 = ScriptContext_GetVarPointer(param0); u16 v5, v6; v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), *v3); @@ -86,15 +84,15 @@ BOOL ScrCmd_199 (ScriptContext * param0) return 0; } -BOOL ScrCmd_097 (ScriptContext * param0) +BOOL ScrCmd_097(ScriptContext *param0) { int v0; u8 v1; BOOL v2; - Party * v3; - Pokemon * v4; - FieldSystem * fieldSystem = param0->fieldSystem; - TrainerInfo * v6 = SaveData_GetTrainerInfo(fieldSystem->saveData); + Party *v3; + Pokemon *v4; + FieldSystem *fieldSystem = param0->fieldSystem; + TrainerInfo *v6 = SaveData_GetTrainerInfo(fieldSystem->saveData); u16 v7 = ScriptContext_GetVar(param0); u16 v8 = ScriptContext_GetVar(param0); @@ -115,7 +113,7 @@ BOOL ScrCmd_097 (ScriptContext * param0) return 0; } -BOOL ScrCmd_098 (ScriptContext * param0) +BOOL ScrCmd_098(ScriptContext *param0) { u16 v0, v1, v2; @@ -127,11 +125,11 @@ BOOL ScrCmd_098 (ScriptContext * param0) return 0; } -BOOL ScrCmd_099 (ScriptContext * param0) +BOOL ScrCmd_099(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); u16 v5; @@ -150,11 +148,11 @@ BOOL ScrCmd_099 (ScriptContext * param0) return 0; } -BOOL ScrCmd_09A (ScriptContext * param0) +BOOL ScrCmd_09A(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4; u8 v5, v6; @@ -177,11 +175,11 @@ BOOL ScrCmd_09A (ScriptContext * param0) return 0; } -BOOL ScrCmd_1F7 (ScriptContext * param0) +BOOL ScrCmd_1F7(ScriptContext *param0) { - Pokemon * v0; + Pokemon *v0; u16 v1; - u16 * v2; + u16 *v2; v2 = ScriptContext_GetVarPointer(param0); v1 = ScriptContext_GetVar(param0); @@ -191,11 +189,11 @@ BOOL ScrCmd_1F7 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1F6 (ScriptContext * param0) +BOOL ScrCmd_1F6(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); u8 v4, v5, v6; @@ -217,11 +215,11 @@ BOOL ScrCmd_1F6 (ScriptContext * param0) return 0; } -BOOL ScrCmd_278 (ScriptContext * param0) +BOOL ScrCmd_278(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), v3); @@ -234,11 +232,11 @@ BOOL ScrCmd_278 (ScriptContext * param0) return 0; } -BOOL ScrCmd_212 (ScriptContext * param0) +BOOL ScrCmd_212(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); u8 v4; @@ -261,11 +259,11 @@ BOOL ScrCmd_212 (ScriptContext * param0) return 0; } -BOOL ScrCmd_213 (ScriptContext * param0) +BOOL ScrCmd_213(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); u8 v4, v5; @@ -286,11 +284,11 @@ BOOL ScrCmd_213 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1B9 (ScriptContext * param0) +BOOL ScrCmd_1B9(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), v3); @@ -299,10 +297,10 @@ BOOL ScrCmd_1B9 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1BA (ScriptContext * param0) +BOOL ScrCmd_1BA(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4; @@ -335,10 +333,10 @@ BOOL ScrCmd_1BA (ScriptContext * param0) return 0; } -BOOL ScrCmd_1BB (ScriptContext * param0) +BOOL ScrCmd_1BB(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4; @@ -356,12 +354,12 @@ BOOL ScrCmd_1BB (ScriptContext * param0) return 0; } -BOOL ScrCmd_281 (ScriptContext * param0) +BOOL ScrCmd_281(ScriptContext *param0) { - Pokemon * v0; + Pokemon *v0; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v1); *v3 = Pokemon_GetValue(v0, MON_DATA_COOL + v2, NULL); @@ -369,20 +367,20 @@ BOOL ScrCmd_281 (ScriptContext * param0) return 0; } -BOOL ScrCmd_247 (ScriptContext * param0) +BOOL ScrCmd_247(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); *v0 = sub_0205E1B4(param0->fieldSystem->saveData); return 0; } -BOOL ScrCmd_248 (ScriptContext * param0) +BOOL ScrCmd_248(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); u16 v4 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), v4); @@ -392,12 +390,12 @@ BOOL ScrCmd_248 (ScriptContext * param0) return 0; } -BOOL ScrCmd_177 (ScriptContext * param0) +BOOL ScrCmd_177(ScriptContext *param0) { int v0; - Pokemon * v1; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v3 = ScriptContext_GetVarPointer(param0); + Pokemon *v1; + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v3 = ScriptContext_GetVarPointer(param0); v0 = Party_GetCurrentCount(Party_GetFromSavedata(fieldSystem->saveData)); *v3 = v0; @@ -405,12 +403,12 @@ BOOL ScrCmd_177 (ScriptContext * param0) return 0; } -BOOL ScrCmd_19A (ScriptContext * param0) +BOOL ScrCmd_19A(ScriptContext *param0) { int v0, v1, v2; - Pokemon * v3; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v5 = ScriptContext_GetVarPointer(param0); + Pokemon *v3; + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v5 = ScriptContext_GetVarPointer(param0); v0 = Party_GetCurrentCount(Party_GetFromSavedata(fieldSystem->saveData)); @@ -427,12 +425,12 @@ BOOL ScrCmd_19A (ScriptContext * param0) return 0; } -BOOL ScrCmd_19B (ScriptContext * param0) +BOOL ScrCmd_19B(ScriptContext *param0) { int v0, v1, v2; - Pokemon * v3; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v5 = ScriptContext_GetVarPointer(param0); + Pokemon *v3; + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v5 = ScriptContext_GetVarPointer(param0); u16 v6 = ScriptContext_GetVar(param0); v0 = Party_GetCurrentCount(Party_GetFromSavedata(fieldSystem->saveData)); @@ -456,13 +454,13 @@ BOOL ScrCmd_19B (ScriptContext * param0) return 0; } -BOOL ScrCmd_19C (ScriptContext * param0) +BOOL ScrCmd_19C(ScriptContext *param0) { int v0, v1, v2; - Pokemon * v3; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v5 = ScriptContext_GetVarPointer(param0); - PCBoxes * v6 = SaveData_PCBoxes(fieldSystem->saveData); + Pokemon *v3; + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v5 = ScriptContext_GetVarPointer(param0); + PCBoxes *v6 = SaveData_PCBoxes(fieldSystem->saveData); v0 = Party_GetCurrentCount(Party_GetFromSavedata(fieldSystem->saveData)); @@ -482,12 +480,12 @@ BOOL ScrCmd_19C (ScriptContext * param0) return 0; } -BOOL ScrCmd_19D (ScriptContext * param0) +BOOL ScrCmd_19D(ScriptContext *param0) { int v0, v1, v2; - Pokemon * v3; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v5 = ScriptContext_GetVarPointer(param0); + Pokemon *v3; + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v5 = ScriptContext_GetVarPointer(param0); v0 = Party_GetCurrentCount(Party_GetFromSavedata(fieldSystem->saveData)); @@ -504,13 +502,13 @@ BOOL ScrCmd_19D (ScriptContext * param0) return 0; } -BOOL ScrCmd_119 (ScriptContext * param0) +BOOL ScrCmd_119(ScriptContext *param0) { u16 v0, v1; - u16 * v2; + u16 *v2; u32 v3; - Pokemon * v4; - FieldSystem * fieldSystem = param0->fieldSystem; + Pokemon *v4; + FieldSystem *fieldSystem = param0->fieldSystem; v2 = ScriptContext_GetVarPointer(param0); v1 = Party_GetCurrentCount(Party_GetFromSavedata(fieldSystem->saveData)); @@ -530,11 +528,11 @@ BOOL ScrCmd_119 (ScriptContext * param0) return 0; } -BOOL ScrCmd_11A (ScriptContext * param0) +BOOL ScrCmd_11A(ScriptContext *param0) { - Pokemon * v0; + Pokemon *v0; u16 v1 = ScriptContext_GetVar(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v1); *v2 = Pokemon_GetValue(v0, MON_DATA_GENDER, NULL); @@ -542,11 +540,11 @@ BOOL ScrCmd_11A (ScriptContext * param0) return 0; } -BOOL ScrCmd_1C8 (ScriptContext * param0) +BOOL ScrCmd_1C8(ScriptContext *param0) { - FieldSystem * v0 = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *v0 = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); u8 v4; @@ -559,19 +557,19 @@ BOOL ScrCmd_1C8 (ScriptContext * param0) v4 = 0; - if ((Pokemon_GetValue(v1, MON_DATA_MOVE1, NULL) != 0)) { + if (Pokemon_GetValue(v1, MON_DATA_MOVE1, NULL) != 0) { v4++; } - if ((Pokemon_GetValue(v1, MON_DATA_MOVE2, NULL) != 0)) { + if (Pokemon_GetValue(v1, MON_DATA_MOVE2, NULL) != 0) { v4++; } - if ((Pokemon_GetValue(v1, MON_DATA_MOVE3, NULL) != 0)) { + if (Pokemon_GetValue(v1, MON_DATA_MOVE3, NULL) != 0) { v4++; } - if ((Pokemon_GetValue(v1, MON_DATA_MOVE4, NULL) != 0)) { + if (Pokemon_GetValue(v1, MON_DATA_MOVE4, NULL) != 0) { v4++; } @@ -579,10 +577,10 @@ BOOL ScrCmd_1C8 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1C9 (ScriptContext * param0) +BOOL ScrCmd_1C9(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; u32 v2; u8 v3; u16 v4 = ScriptContext_GetVar(param0); @@ -594,11 +592,11 @@ BOOL ScrCmd_1C9 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1CA (ScriptContext * param0) +BOOL ScrCmd_1CA(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); @@ -608,11 +606,11 @@ BOOL ScrCmd_1CA (ScriptContext * param0) return 0; } -BOOL ScrCmd_1EE (ScriptContext * param0) +BOOL ScrCmd_1EE(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); v1 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(fieldSystem->saveData), v3); @@ -621,10 +619,10 @@ BOOL ScrCmd_1EE (ScriptContext * param0) return 0; } -BOOL ScrCmd_1F0 (ScriptContext * param0) +BOOL ScrCmd_1F0(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; u16 v2 = ScriptContext_GetVar(param0); u16 v3; @@ -636,12 +634,12 @@ BOOL ScrCmd_1F0 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1C0 (ScriptContext * param0) +BOOL ScrCmd_1C0(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - Party * v2; - u16 * v3 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + Party *v2; + u16 *v3 = ScriptContext_GetVarPointer(param0); u16 v4 = ScriptContext_GetVar(param0); u8 v5, v6; u16 v7; @@ -666,12 +664,12 @@ BOOL ScrCmd_1C0 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2CB (ScriptContext * param0) +BOOL ScrCmd_2CB(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - Party * v2; - u16 * v3 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + Party *v2; + u16 *v3 = ScriptContext_GetVarPointer(param0); u16 v4 = ScriptContext_GetVar(param0); u8 v5, v6, v7; u16 v8; @@ -711,12 +709,12 @@ BOOL ScrCmd_2CB (ScriptContext * param0) return 0; } -BOOL ScrCmd_2DD (ScriptContext * param0) +BOOL ScrCmd_2DD(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - Pokemon * v1; - Party * v2; - u16 * v3 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + Pokemon *v1; + Party *v2; + u16 *v3 = ScriptContext_GetVarPointer(param0); u16 v4 = ScriptContext_GetVar(param0); u8 v5, v6; u16 v7; @@ -741,10 +739,10 @@ BOOL ScrCmd_2DD (ScriptContext * param0) return 0; } -BOOL ScrCmd_22E (ScriptContext * param0) +BOOL ScrCmd_22E(ScriptContext *param0) { - Pokemon * v0; - u16 * v1 = ScriptContext_GetVarPointer(param0); + Pokemon *v0; + u16 *v1 = ScriptContext_GetVarPointer(param0); u16 v2 = ScriptContext_GetVar(param0); u16 v3, v4; @@ -761,11 +759,11 @@ BOOL ScrCmd_22E (ScriptContext * param0) return 0; } -BOOL ScrCmd_22F (ScriptContext * param0) +BOOL ScrCmd_22F(ScriptContext *param0) { - Pokemon * v0; - Party * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + Pokemon *v0; + Party *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3, v4, v5, v6; v6 = Party_GetCurrentCount(Party_GetFromSavedata(param0->fieldSystem->saveData)); @@ -789,10 +787,10 @@ BOOL ScrCmd_22F (ScriptContext * param0) return 0; } -BOOL ScrCmd_230 (ScriptContext * param0) +BOOL ScrCmd_230(ScriptContext *param0) { - Pokemon * v0; - u16 * v1 = ScriptContext_GetVarPointer(param0); + Pokemon *v0; + u16 *v1 = ScriptContext_GetVarPointer(param0); u16 v2 = ScriptContext_GetVar(param0); u16 v3 = ScriptContext_GetVar(param0); u8 v4 = 1; @@ -803,9 +801,9 @@ BOOL ScrCmd_230 (ScriptContext * param0) return 0; } -BOOL ScrCmd_231 (ScriptContext * param0) +BOOL ScrCmd_231(ScriptContext *param0) { - Pokemon * v0; + Pokemon *v0; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); u8 v3 = 1; @@ -818,11 +816,11 @@ BOOL ScrCmd_231 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2B7 (ScriptContext * param0) +BOOL ScrCmd_2B7(ScriptContext *param0) { - Pokemon * v0; - Party * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + Pokemon *v0; + Party *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3, v4, v5; v5 = Party_GetCurrentCount(Party_GetFromSavedata(param0->fieldSystem->saveData)); @@ -846,19 +844,19 @@ BOOL ScrCmd_2B7 (ScriptContext * param0) return 0; } -BOOL ScrCmd_0A0 (ScriptContext * param0) +BOOL ScrCmd_0A0(ScriptContext *param0) { return 0; } -BOOL ScrCmd_31C (ScriptContext * param0) +BOOL ScrCmd_31C(ScriptContext *param0) { u8 v0, v1; u16 v2; - Pokemon * v3; - Party * v4; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v6 = ScriptContext_GetVarPointer(param0); + Pokemon *v3; + Party *v4; + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v6 = ScriptContext_GetVarPointer(param0); u16 v7 = ScriptContext_GetVar(param0); v4 = Party_GetFromSavedata(fieldSystem->saveData); @@ -883,14 +881,14 @@ BOOL ScrCmd_31C (ScriptContext * param0) return 0; } -BOOL ScrCmd_32F (ScriptContext * param0) +BOOL ScrCmd_32F(ScriptContext *param0) { int v0, v1; - Party * v2; - Pokemon * v3; - FieldSystem * fieldSystem = param0->fieldSystem; + Party *v2; + Pokemon *v3; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v5 = ScriptContext_GetVar(param0); - u16 * v6 = ScriptContext_GetVarPointer(param0); + u16 *v6 = ScriptContext_GetVarPointer(param0); v2 = Party_GetFromSavedata(fieldSystem->saveData); v1 = Party_GetCurrentCount(v2); diff --git a/src/unk_0204E240.c b/src/unk_0204E240.c index c87e1b8e58..2ab08b7ab1 100644 --- a/src/unk_0204E240.c +++ b/src/unk_0204E240.c @@ -1,30 +1,30 @@ +#include "unk_0204E240.h" + #include #include -#include "inlines.h" - #include "field/field_system.h" -#include "field_script_context.h" -#include "unk_0204E240.h" #include "bag.h" +#include "field_script_context.h" +#include "inlines.h" const u16 Unk_020EBFFC[7][2] = { - {0x67, 0x8E}, - {0x65, 0x8A}, - {0x66, 0x8C}, - {0x63, 0x159}, - {0x64, 0x15B}, - {0x68, 0x19A}, - {0x69, 0x198} + { 0x67, 0x8E }, + { 0x65, 0x8A }, + { 0x66, 0x8C }, + { 0x63, 0x159 }, + { 0x64, 0x15B }, + { 0x68, 0x19A }, + { 0x69, 0x198 } }; -BOOL ScrCmd_1F1 (ScriptContext * param0) +BOOL ScrCmd_1F1(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u8 v1; u16 v2, v3; - u16 * v4 = ScriptContext_GetVarPointer(param0); + u16 *v4 = ScriptContext_GetVarPointer(param0); for (v1 = 0, v3 = 0; v1 < 7; v1++) { v3 += Bag_GetItemQuantity(SaveData_GetBag(fieldSystem->saveData), Unk_020EBFFC[v1][0], 4); @@ -35,10 +35,10 @@ BOOL ScrCmd_1F1 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1F4 (ScriptContext * param0) +BOOL ScrCmd_1F4(ScriptContext *param0) { u16 v0; - u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 *v1 = ScriptContext_GetVarPointer(param0); u16 v2 = ScriptContext_GetVar(param0); *v1 = 0; @@ -53,13 +53,13 @@ BOOL ScrCmd_1F4 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1F5 (ScriptContext * param0) +BOOL ScrCmd_1F5(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u8 v1; u16 v2, v3; - u16 * v4 = ScriptContext_GetVarPointer(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 *v4 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); u16 v6 = ScriptContext_GetVar(param0); *v4 = 0; @@ -78,12 +78,12 @@ BOOL ScrCmd_1F5 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1F2 (ScriptContext * param0) +BOOL ScrCmd_1F2(ScriptContext *param0) { return 0; } -BOOL ScrCmd_1F3 (ScriptContext * param0) +BOOL ScrCmd_1F3(ScriptContext *param0) { return 0; } diff --git a/src/unk_0204E378.c b/src/unk_0204E378.c index 56875e7c71..d774935bb2 100644 --- a/src/unk_0204E378.c +++ b/src/unk_0204E378.c @@ -1,37 +1,36 @@ +#include "unk_0204E378.h" + #include #include -#include "inlines.h" - #include "field_script_context.h" +#include "inlines.h" -#include "unk_0204E378.h" - -BOOL ScrCmd_2A6 (ScriptContext * param0) +BOOL ScrCmd_2A6(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); - u16 * v1 = ScriptContext_GetVarPointer(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v1 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); static const u16 v3[][2] = { - {0xFB, 0x3E8}, - {0x109, 0x3E8}, - {0x114, 0x3E8}, - {0x115, 0x3E8}, - {0x1A1, 0x7D0}, - {0x181, 0x7D0}, - {0x192, 0xFA0}, - {0x167, 0xFA0}, - {0x173, 0x1770}, - {0x1A0, 0x1770}, - {0x151, 0x1770}, - {0x162, 0x1F40}, - {0x15C, 0x1F40}, - {0x16A, 0x2710}, - {0x15F, 0x2710}, - {0x154, 0x2710}, - {0x164, 0x2710}, - {0x191, 0x3A98}, - {0x18B, 0x4E20} + { 0xFB, 0x3E8 }, + { 0x109, 0x3E8 }, + { 0x114, 0x3E8 }, + { 0x115, 0x3E8 }, + { 0x1A1, 0x7D0 }, + { 0x181, 0x7D0 }, + { 0x192, 0xFA0 }, + { 0x167, 0xFA0 }, + { 0x173, 0x1770 }, + { 0x1A0, 0x1770 }, + { 0x151, 0x1770 }, + { 0x162, 0x1F40 }, + { 0x15C, 0x1F40 }, + { 0x16A, 0x2710 }, + { 0x15F, 0x2710 }, + { 0x154, 0x2710 }, + { 0x164, 0x2710 }, + { 0x191, 0x3A98 }, + { 0x18B, 0x4E20 } }; *v1 = v3[v0][0]; diff --git a/src/unk_0204E3CC.c b/src/unk_0204E3CC.c index 3d9a6a0f8f..8d1e332d4c 100644 --- a/src/unk_0204E3CC.c +++ b/src/unk_0204E3CC.c @@ -1,47 +1,45 @@ +#include "unk_0204E3CC.h" + #include +#include #include -#include "inlines.h" - #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0203A790_decl.h" - -#include "field_script_context.h" #include "struct_defs/struct_0205EC34.h" -#include "unk_02025E08.h" -#include "trainer_info.h" -#include "unk_0202631C.h" #include "field_overworld_state.h" -#include "unk_0204E3CC.h" -#include "vars_flags.h" +#include "field_script_context.h" +#include "inlines.h" #include "player_avatar.h" +#include "trainer_info.h" +#include "unk_02025E08.h" +#include "unk_0202631C.h" #include "unk_0206A8DC.h" +#include "vars_flags.h" -#include - -BOOL ScrCmd_157 (ScriptContext * param0) +BOOL ScrCmd_157(ScriptContext *param0) { - const PokedexData * v0 = SaveData_Pokedex(param0->fieldSystem->saveData); - u16 * v1 = ScriptContext_GetVarPointer(param0); + const PokedexData *v0 = SaveData_Pokedex(param0->fieldSystem->saveData); + u16 *v1 = ScriptContext_GetVarPointer(param0); *v1 = sub_02027520(v0); return 0; } -BOOL ScrCmd_158 (ScriptContext * param0) +BOOL ScrCmd_158(ScriptContext *param0) { - PokedexData * v0 = SaveData_Pokedex(param0->fieldSystem->saveData); + PokedexData *v0 = SaveData_Pokedex(param0->fieldSystem->saveData); sub_02027540(v0); return 0; } -BOOL ScrCmd_159 (ScriptContext * param0) +BOOL ScrCmd_159(ScriptContext *param0) { - FieldOverworldState * v0; - PlayerData * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + FieldOverworldState *v0; + PlayerData *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); v0 = SaveData_GetFieldOverworldState(param0->fieldSystem->saveData); v1 = FieldOverworldState_GetPlayerData(v0); @@ -50,10 +48,10 @@ BOOL ScrCmd_159 (ScriptContext * param0) return 0; } -BOOL ScrCmd_15A (ScriptContext * param0) +BOOL ScrCmd_15A(ScriptContext *param0) { - FieldOverworldState * v0; - PlayerData * v1; + FieldOverworldState *v0; + PlayerData *v1; v0 = SaveData_GetFieldOverworldState(param0->fieldSystem->saveData); v1 = FieldOverworldState_GetPlayerData(v0); @@ -62,18 +60,18 @@ BOOL ScrCmd_15A (ScriptContext * param0) return 0; } -BOOL ScrCmd_15B (ScriptContext * param0) +BOOL ScrCmd_15B(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); - u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 *v1 = ScriptContext_GetVarPointer(param0); GF_ASSERT(v0 < 8); - * v1 = TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->fieldSystem->saveData), v0); + *v1 = TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->fieldSystem->saveData), v0); return 0; } -BOOL ScrCmd_15C (ScriptContext * param0) +BOOL ScrCmd_15C(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); @@ -83,9 +81,9 @@ BOOL ScrCmd_15C (ScriptContext * param0) return 0; } -BOOL ScrCmd_15E (ScriptContext * param0) +BOOL ScrCmd_15E(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); *v0 = sub_0206A938(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; @@ -102,10 +100,10 @@ const u8 Unk_020EC064[8] = { 0x7 }; -BOOL ScrCmd_15D (ScriptContext * param0) +BOOL ScrCmd_15D(ScriptContext *param0) { u16 v0, v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); for (v0 = 0, v1 = 0; v0 < 8; v0++) { if (TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->fieldSystem->saveData), Unk_020EC064[v0]) == 1) { @@ -117,71 +115,71 @@ BOOL ScrCmd_15D (ScriptContext * param0) return 0; } -BOOL ScrCmd_15F (ScriptContext * param0) +BOOL ScrCmd_15F(ScriptContext *param0) { sub_0206A92C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_160 (ScriptContext * param0) +BOOL ScrCmd_160(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); *v0 = sub_0206A984(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_161 (ScriptContext * param0) +BOOL ScrCmd_161(ScriptContext *param0) { sub_0206A964(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_162 (ScriptContext * param0) +BOOL ScrCmd_162(ScriptContext *param0) { sub_0206A974(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_163 (ScriptContext * param0) +BOOL ScrCmd_163(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); *v0 = sub_0206A9B4(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_164 (ScriptContext * param0) +BOOL ScrCmd_164(ScriptContext *param0) { sub_0206A994(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_165 (ScriptContext * param0) +BOOL ScrCmd_165(ScriptContext *param0) { sub_0206A9A4(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_166 (ScriptContext * param0) +BOOL ScrCmd_166(ScriptContext *param0) { - u16 * v0 = ScriptContext_GetVarPointer(param0); + u16 *v0 = ScriptContext_GetVarPointer(param0); *v0 = sub_0206A954(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_167 (ScriptContext * param0) +BOOL ScrCmd_167(ScriptContext *param0) { sub_0206A944(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); return 0; } -BOOL ScrCmd_1CF (ScriptContext * param0) +BOOL ScrCmd_1CF(ScriptContext *param0) { u8 v0; - u16 * v1; - VarsFlags * v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + u16 *v1; + VarsFlags *v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); v0 = ScriptContext_ReadByte(param0); @@ -203,11 +201,11 @@ BOOL ScrCmd_1CF (ScriptContext * param0) return 0; } -BOOL ScrCmd_1D0 (ScriptContext * param0) +BOOL ScrCmd_1D0(ScriptContext *param0) { u8 v0; - u16 * v1; - VarsFlags * v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + u16 *v1; + VarsFlags *v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); v0 = ScriptContext_ReadByte(param0); @@ -229,11 +227,11 @@ BOOL ScrCmd_1D0 (ScriptContext * param0) return 0; } -BOOL ScrCmd_1D1 (ScriptContext * param0) +BOOL ScrCmd_1D1(ScriptContext *param0) { u8 v0; - u16 * v1; - VarsFlags * v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + u16 *v1; + VarsFlags *v2 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); v0 = ScriptContext_ReadByte(param0); diff --git a/src/unk_0204E75C.c b/src/unk_0204E75C.c index 026a4abfc2..04602c875b 100644 --- a/src/unk_0204E75C.c +++ b/src/unk_0204E75C.c @@ -1,81 +1,81 @@ +#include "unk_0204E75C.h" + #include #include -#include "inlines.h" - #include "field/field_system.h" -#include "field_script_context.h" -#include "unk_0204E75C.h" -#include "unk_0205DFC4.h" -#include "item.h" #include "bag.h" +#include "field_script_context.h" +#include "inlines.h" +#include "item.h" +#include "unk_0205DFC4.h" -BOOL ScrCmd_07B (ScriptContext * param0) +BOOL ScrCmd_07B(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); *v3 = Bag_TryAddItem(SaveData_GetBag(fieldSystem->saveData), v1, v2, 4); return 0; } -BOOL ScrCmd_07C (ScriptContext * param0) +BOOL ScrCmd_07C(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); *v3 = Bag_TryRemoveItem(SaveData_GetBag(fieldSystem->saveData), v1, v2, 4); return 0; } -BOOL ScrCmd_07D (ScriptContext * param0) +BOOL ScrCmd_07D(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); *v3 = Bag_CanFitItem(SaveData_GetBag(fieldSystem->saveData), v1, v2, 4); return 0; } -BOOL ScrCmd_07E (ScriptContext * param0) +BOOL ScrCmd_07E(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); *v3 = Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), v1, v2, 11); return 0; } -BOOL ScrCmd_2FE (ScriptContext * param0) +BOOL ScrCmd_2FE(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); *v2 = Bag_GetItemQuantity(SaveData_GetBag(fieldSystem->saveData), v1, 11); return 0; } -BOOL ScrCmd_07F (ScriptContext * param0) +BOOL ScrCmd_07F(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); *v2 = sub_0205E060(v1); return 0; } -BOOL ScrCmd_GetItemPocket (ScriptContext * ctx) +BOOL ScrCmd_GetItemPocket(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; u16 item = ScriptContext_GetVar(ctx); @@ -85,12 +85,12 @@ BOOL ScrCmd_GetItemPocket (ScriptContext * ctx) return FALSE; } -BOOL ScrCmd_081 (ScriptContext * param0) +BOOL ScrCmd_081(ScriptContext *param0) { return 0; } -BOOL ScrCmd_082 (ScriptContext * param0) +BOOL ScrCmd_082(ScriptContext *param0) { return 0; } diff --git a/src/unk_0204E974.c b/src/unk_0204E974.c index 077dd98b70..e0bc50f84e 100644 --- a/src/unk_0204E974.c +++ b/src/unk_0204E974.c @@ -1,25 +1,25 @@ +#include "unk_0204E974.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_020298B0_decl.h" -#include "savedata.h" #include "field/field_system.h" -#include "field_script_context.h" +#include "field_script_context.h" +#include "inlines.h" +#include "savedata.h" #include "unk_0202854C.h" -#include "unk_0204E974.h" -BOOL ScrCmd_083 (ScriptContext * param0) +BOOL ScrCmd_083(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UndergroundData * v2; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UndergroundData *v2; u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); v2 = sub_020298B0(v1); *v5 = sub_0202895C(v2, v3); @@ -27,24 +27,24 @@ BOOL ScrCmd_083 (ScriptContext * param0) return 0; } -BOOL ScrCmd_084 (ScriptContext * param0) +BOOL ScrCmd_084(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_085 (ScriptContext * param0) +BOOL ScrCmd_085(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UndergroundData * v2; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UndergroundData *v2; u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); v2 = sub_020298B0(v1); *v5 = sub_02028984(v2, v3); @@ -52,24 +52,24 @@ BOOL ScrCmd_085 (ScriptContext * param0) return 0; } -BOOL ScrCmd_086 (ScriptContext * param0) +BOOL ScrCmd_086(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_087 (ScriptContext * param0) +BOOL ScrCmd_087(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UndergroundData * v2; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UndergroundData *v2; u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); v2 = sub_020298B0(v1); *v5 = sub_02028E84(v2, v3); @@ -77,120 +77,120 @@ BOOL ScrCmd_087 (ScriptContext * param0) return 0; } -BOOL ScrCmd_088 (ScriptContext * param0) +BOOL ScrCmd_088(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_089 (ScriptContext * param0) +BOOL ScrCmd_089(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_08A (ScriptContext * param0) +BOOL ScrCmd_08A(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_08B (ScriptContext * param0) +BOOL ScrCmd_08B(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UndergroundData * v2; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UndergroundData *v2; u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); v2 = sub_020298B0(v1); return 0; } -BOOL ScrCmd_08C (ScriptContext * param0) +BOOL ScrCmd_08C(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_08D (ScriptContext * param0) +BOOL ScrCmd_08D(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_08E (ScriptContext * param0) +BOOL ScrCmd_08E(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_08F (ScriptContext * param0) +BOOL ScrCmd_08F(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; - SaveData * v1 = fieldSystem->saveData; - UndergroundData * v2; + FieldSystem *fieldSystem = param0->fieldSystem; + SaveData *v1 = fieldSystem->saveData; + UndergroundData *v2; u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); - u16 * v5 = ScriptContext_GetVarPointer(param0); + u16 *v5 = ScriptContext_GetVarPointer(param0); v2 = sub_020298B0(v1); *v5 = sub_02028CB0(v2, v3, v4); return 0; } -BOOL ScrCmd_090 (ScriptContext * param0) +BOOL ScrCmd_090(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_091 (ScriptContext * param0) +BOOL ScrCmd_091(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } -BOOL ScrCmd_092 (ScriptContext * param0) +BOOL ScrCmd_092(ScriptContext *param0) { - FieldSystem * fieldSystem = param0->fieldSystem; + FieldSystem *fieldSystem = param0->fieldSystem; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3 = ScriptContext_GetVarPointer(param0); + u16 *v3 = ScriptContext_GetVarPointer(param0); return 0; } diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c index aa86e29bcd..99da9ed5a7 100644 --- a/src/unk_0204EDA4.c +++ b/src/unk_0204EDA4.c @@ -1,29 +1,28 @@ +#include "unk_0204EDA4.h" + #include #include -#include "inlines.h" - -#include "pokemon.h" - #include "struct_defs/struct_020997B8.h" +#include "field_script_context.h" +#include "field_system.h" #include "heap.h" +#include "inlines.h" +#include "party.h" +#include "pokemon.h" +#include "scrcmd.h" #include "unk_02025E08.h" -#include "field_system.h" #include "unk_0203D1B8.h" -#include "field_script_context.h" #include "unk_0203E880.h" -#include "scrcmd.h" -#include "unk_0204EDA4.h" -#include "party.h" #include "unk_020997B8.h" -static void sub_0204EE90(ScriptContext * param0, u16 param1, Pokemon * param2, u16 * param3); +static void sub_0204EE90(ScriptContext *param0, u16 param1, Pokemon *param2, u16 *param3); -BOOL ScrCmd_1C6 (ScriptContext * param0) +BOOL ScrCmd_1C6(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); - void ** v1; + void **v1; v1 = sub_0203F098(param0->fieldSystem, 19); *v1 = sub_0203D6E4(32, param0->fieldSystem, v0); @@ -32,10 +31,10 @@ BOOL ScrCmd_1C6 (ScriptContext * param0) return 1; } -BOOL ScrCmd_1C7 (ScriptContext * param0) +BOOL ScrCmd_1C7(ScriptContext *param0) { - void ** v0; - u16 * v1; + void **v0; + u16 *v1; v1 = ScriptContext_GetVarPointer(param0); v0 = sub_0203F098(param0->fieldSystem, 19); @@ -52,16 +51,16 @@ BOOL ScrCmd_1C7 (ScriptContext * param0) return 0; } -BOOL ScrCmd_21E (ScriptContext * param0) +BOOL ScrCmd_21E(ScriptContext *param0) { return 0; } -BOOL ScrCmd_21F (ScriptContext * param0) +BOOL ScrCmd_21F(ScriptContext *param0) { - Pokemon * v0; - u16 * v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + Pokemon *v0; + u16 *v1; + u16 *v2 = ScriptContext_GetVarPointer(param0); u16 v3 = ScriptContext_GetVar(param0); v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v3); @@ -72,10 +71,10 @@ BOOL ScrCmd_21F (ScriptContext * param0) return 0; } -static void sub_0204EE90 (ScriptContext * param0, u16 param1, Pokemon * param2, u16 * param3) +static void sub_0204EE90(ScriptContext *param0, u16 param1, Pokemon *param2, u16 *param3) { - void ** v0 = sub_0203F098(param0->fieldSystem, 19); - UnkStruct_020997B8 * v1; + void **v0 = sub_0203F098(param0->fieldSystem, 19); + UnkStruct_020997B8 *v1; v1 = sub_020997B8(32); *v0 = v1; @@ -91,16 +90,16 @@ static void sub_0204EE90 (ScriptContext * param0, u16 param1, Pokemon * param2, Heap_FreeToHeap(param3); } -BOOL ScrCmd_220 (ScriptContext * param0) +BOOL ScrCmd_220(ScriptContext *param0) { return 1; } -BOOL ScrCmd_221 (ScriptContext * param0) +BOOL ScrCmd_221(ScriptContext *param0) { - Pokemon * v0; + Pokemon *v0; u16 v1 = ScriptContext_GetVar(param0); - u16 * v2; + u16 *v2; v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v1); v2 = sub_020997D8(v0, 32); @@ -110,12 +109,12 @@ BOOL ScrCmd_221 (ScriptContext * param0) return 1; } -BOOL ScrCmd_224 (ScriptContext * param0) +BOOL ScrCmd_224(ScriptContext *param0) { - Pokemon * v0; + Pokemon *v0; u16 v1 = ScriptContext_GetVar(param0); u16 v2 = ScriptContext_GetVar(param0); - u16 * v3; + u16 *v3; v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->fieldSystem->saveData), v1); v3 = Heap_AllocFromHeap(32, (1 + 1) * 2); @@ -128,16 +127,16 @@ BOOL ScrCmd_224 (ScriptContext * param0) return 1; } -BOOL ScrCmd_222 (ScriptContext * param0) +BOOL ScrCmd_222(ScriptContext *param0) { return 0; } -BOOL ScrCmd_223 (ScriptContext * param0) +BOOL ScrCmd_223(ScriptContext *param0) { - UnkStruct_020997B8 * v0; - u16 * v1 = ScriptContext_GetVarPointer(param0); - void ** v2 = sub_0203F098(param0->fieldSystem, 19); + UnkStruct_020997B8 *v0; + u16 *v1 = ScriptContext_GetVarPointer(param0); + void **v2 = sub_0203F098(param0->fieldSystem, 19); v0 = *v2; @@ -154,11 +153,11 @@ BOOL ScrCmd_223 (ScriptContext * param0) return 0; } -BOOL ScrCmd_225 (ScriptContext * param0) +BOOL ScrCmd_225(ScriptContext *param0) { - UnkStruct_020997B8 * v0; - u16 * v1 = ScriptContext_GetVarPointer(param0); - void ** v2 = sub_0203F098(param0->fieldSystem, 19); + UnkStruct_020997B8 *v0; + u16 *v1 = ScriptContext_GetVarPointer(param0); + void **v2 = sub_0203F098(param0->fieldSystem, 19); v0 = *v2; diff --git a/src/unk_0204F02C.c b/src/unk_0204F02C.c index b9319d27ab..e6b49758d0 100644 --- a/src/unk_0204F02C.c +++ b/src/unk_0204F02C.c @@ -1,28 +1,28 @@ +#include "unk_0204F02C.h" + #include #include #include "field_script_context.h" -#include "unk_0204F02C.h" - -BOOL ScrCmd_23F (ScriptContext * param0) +BOOL ScrCmd_23F(ScriptContext *param0) { GF_ASSERT(0); return 0; } -BOOL ScrCmd_240 (ScriptContext * param0) +BOOL ScrCmd_240(ScriptContext *param0) { GF_ASSERT(0); return 0; } -BOOL ScrCmd_241 (ScriptContext * param0) +BOOL ScrCmd_241(ScriptContext *param0) { return 0; } -BOOL ScrCmd_242 (ScriptContext * param0) +BOOL ScrCmd_242(ScriptContext *param0) { return 0; } diff --git a/src/unk_0204F04C.c b/src/unk_0204F04C.c index 873d8ea148..dbfb579321 100644 --- a/src/unk_0204F04C.c +++ b/src/unk_0204F04C.c @@ -1,23 +1,23 @@ +#include "unk_0204F04C.h" + #include #include -#include "inlines.h" - #include "struct_defs/struct_020300F4.h" -#include "field_script_context.h" +#include "field_script_context.h" +#include "inlines.h" #include "unk_0202FF4C.h" #include "unk_0203061C.h" -#include "unk_0204F04C.h" #include "unk_0205DFC4.h" -BOOL ScrCmd_2C5(ScriptContext * param0); +BOOL ScrCmd_2C5(ScriptContext *param0); -BOOL ScrCmd_2C5 (ScriptContext * param0) +BOOL ScrCmd_2C5(ScriptContext *param0) { u32 v0; u8 v1[4]; - UnkStruct_020300F4 * v2; + UnkStruct_020300F4 *v2; u16 v3 = ScriptContext_GetVar(param0); u16 v4 = ScriptContext_GetVar(param0); diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index cd766fd2b6..5436ab20e0 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -1,29 +1,34 @@ +#include "unk_0204F13C.h" + #include #include -#include "inlines.h" +#include "constants/species.h" #include "struct_decls/struct_02030114_decl.h" #include "struct_decls/struct_0203026C_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_020308A0_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - -#include "constdata/const_020F1E88.h" -#include "constdata/const_020F410C.h" - -#include "field/field_system.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204F3D0.h" #include "struct_defs/struct_02098C44.h" -#include "struct_defs/pokemon_summary.h" -#include "string_template.h" +#include "field/field_system.h" + +#include "bag.h" +#include "communication_system.h" +#include "field_script_context.h" +#include "field_system.h" #include "heap.h" +#include "inlines.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" #include "savedata.h" +#include "string_template.h" #include "unk_02025E08.h" #include "unk_02028124.h" #include "unk_0202CD50.h" @@ -32,28 +37,22 @@ #include "unk_02030108.h" #include "unk_0203061C.h" #include "unk_02030880.h" -#include "communication_system.h" -#include "field_system.h" -#include "field_script_context.h" #include "unk_0203E880.h" -#include "unk_0204F13C.h" #include "unk_0204FA34.h" #include "unk_020508D4.h" #include "unk_0205DFC4.h" -#include "constants/species.h" -#include "pokemon.h" -#include "party.h" #include "unk_0207A274.h" -#include "bag.h" -#include "pokemon_summary_app.h" #include "unk_02099500.h" +#include "constdata/const_020F1E88.h" +#include "constdata/const_020F410C.h" + typedef struct UnkStruct_0204F470_t { int unk_00; u8 unk_04; u8 unk_05; u8 unk_06[2]; - void ** unk_08; + void **unk_08; } UnkStruct_0204F470; enum { @@ -64,32 +63,32 @@ enum { UnkEnum_0204F13C_5, }; -BOOL ScrCmd_2CC(ScriptContext * param0); -static BOOL sub_0204F268(u16 param0, SaveData * param1); -BOOL ScrCmd_2D1(ScriptContext * param0); +BOOL ScrCmd_2CC(ScriptContext *param0); +static BOOL sub_0204F268(u16 param0, SaveData *param1); +BOOL ScrCmd_2D1(ScriptContext *param0); -BOOL ScrCmd_2CF(ScriptContext * param0); -void sub_0204F3D0(TaskManager * param0, u16 param1, u16 * param2); -static BOOL sub_0204F414(TaskManager * param0); +BOOL ScrCmd_2CF(ScriptContext *param0); +void sub_0204F3D0(TaskManager *param0, u16 param1, u16 *param2); +static BOOL sub_0204F414(TaskManager *param0); -void sub_0204F470(TaskManager * param0, void ** param1, u8 param2); -static BOOL sub_0204F4A4(TaskManager * param0); -static int sub_0204F50C(UnkStruct_0204F470 * param0, FieldSystem * fieldSystem, int param2); -static int sub_0204F5D8(UnkStruct_0204F470 * param0, FieldSystem * fieldSystem); -static int sub_0204F628(UnkStruct_0204F470 * param0, FieldSystem * fieldSystem, int param2); -static int sub_0204F6B0(UnkStruct_0204F470 * param0, FieldSystem * fieldSystem); +void sub_0204F470(TaskManager *param0, void **param1, u8 param2); +static BOOL sub_0204F4A4(TaskManager *param0); +static int sub_0204F50C(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, int param2); +static int sub_0204F5D8(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem); +static int sub_0204F628(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, int param2); +static int sub_0204F6B0(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem); -BOOL ScrCmd_2CC (ScriptContext * param0) +BOOL ScrCmd_2CC(ScriptContext *param0) { u8 v0; u8 v1[4]; u16 v2[4]; u16 v3, v4, v5; - u16 * v6, * v7; - void ** v8; - UnkStruct_0204AFC4 * v9; - UnkStruct_02030114 * v10; - UnkStruct_0203026C * v11; + u16 *v6, *v7; + void **v8; + UnkStruct_0204AFC4 *v9; + UnkStruct_02030114 *v10; + UnkStruct_0203026C *v11; v3 = ScriptContext_ReadHalfWord(param0); v4 = ScriptContext_GetVar(param0); @@ -109,18 +108,17 @@ BOOL ScrCmd_2CC (ScriptContext * param0) if (v4 == 3) { *v6 = sub_02030698(sub_0203068C(param0->fieldSystem->saveData), - 106, - sub_0205E6A8(106)); + 106, + sub_0205E6A8(106)); } else { - *v6 = (u16)sub_020302B4(v11, 5, - v4, 0, NULL); + *v6 = (u16)sub_020302B4(v11, 5, v4, 0, NULL); } break; case 2: *v6 = sub_02030698(sub_0203068C(param0->fieldSystem->saveData), - sub_0205E55C(v4), - sub_0205E6A8(sub_0205E55C(v4))); + sub_0205E55C(v4), + sub_0205E6A8(sub_0205E55C(v4))); break; case 3: @@ -143,8 +141,7 @@ BOOL ScrCmd_2CC (ScriptContext * param0) sub_0204F470(param0->taskManager, v8, v0); return 1; - default: - ; + default:; GF_ASSERT(FALSE); *v6 = 0; break; @@ -153,12 +150,12 @@ BOOL ScrCmd_2CC (ScriptContext * param0) return 0; } -static BOOL sub_0204F268 (u16 param0, SaveData * param1) +static BOOL sub_0204F268(u16 param0, SaveData *param1) { u8 v0, v1, v2, v3; u16 v4, v5; - Party * v6; - Pokemon * v7; + Party *v6; + Pokemon *v7; u16 v8[6]; v6 = Party_GetFromSavedata(param1); @@ -216,9 +213,9 @@ static BOOL sub_0204F268 (u16 param0, SaveData * param1) return 1; } -BOOL ScrCmd_2D1 (ScriptContext * param0) +BOOL ScrCmd_2D1(ScriptContext *param0) { - UnkStruct_0203026C * v0; + UnkStruct_0203026C *v0; u16 v1 = ScriptContext_GetVar(param0); v0 = sub_0203026C(param0->fieldSystem->saveData); @@ -227,10 +224,10 @@ BOOL ScrCmd_2D1 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2CF (ScriptContext * param0) +BOOL ScrCmd_2CF(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); - u16 * v1 = ScriptContext_GetVarPointer(param0); + u16 *v1 = ScriptContext_GetVarPointer(param0); ; ; @@ -239,9 +236,9 @@ BOOL ScrCmd_2CF (ScriptContext * param0) return 1; } -void sub_0204F3D0 (TaskManager * param0, u16 param1, u16 * param2) +void sub_0204F3D0(TaskManager *param0, u16 param1, u16 *param2) { - UnkStruct_0204F3D0 * v0; + UnkStruct_0204F3D0 *v0; v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0204F3D0)); memset(v0, 0, sizeof(UnkStruct_0204F3D0)); @@ -255,9 +252,9 @@ void sub_0204F3D0 (TaskManager * param0, u16 param1, u16 * param2) return; } -static BOOL sub_0204F414 (TaskManager * param0) +static BOOL sub_0204F414(TaskManager *param0) { - UnkStruct_0204F3D0 * v0 = TaskManager_Environment(param0); + UnkStruct_0204F3D0 *v0 = TaskManager_Environment(param0); switch (v0->unk_00) { case 0: @@ -284,16 +281,15 @@ static BOOL sub_0204F414 (TaskManager * param0) case 2: Heap_FreeToHeap(v0); return 1; - } - ; + }; return 0; } -void sub_0204F470 (TaskManager * param0, void ** param1, u8 param2) +void sub_0204F470(TaskManager *param0, void **param1, u8 param2) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0204F470 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0204F470)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0204F470 *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0204F470)); MI_CpuClear8(v1, sizeof(UnkStruct_0204F470)); v1->unk_04 = param2; @@ -303,10 +299,10 @@ void sub_0204F470 (TaskManager * param0, void ** param1, u8 param2) return; } -static BOOL sub_0204F4A4 (TaskManager * param0) +static BOOL sub_0204F4A4(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0204F470 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0204F470 *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { case UnkEnum_0204F13C_1: @@ -333,11 +329,11 @@ static BOOL sub_0204F4A4 (TaskManager * param0) return 0; } -static int sub_0204F50C (UnkStruct_0204F470 * param0, FieldSystem * fieldSystem, int param2) +static int sub_0204F50C(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, int param2) { u8 v0; - PartyManagementData * v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData)); + PartyManagementData *v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData)); MI_CpuClearFast(v1, sizeof(PartyManagementData)); v1->unk_00 = Party_GetFromSavedata(fieldSystem->saveData); @@ -373,10 +369,10 @@ static int sub_0204F50C (UnkStruct_0204F470 * param0, FieldSystem * fieldSystem, return UnkEnum_0204F13C_2; } -static int sub_0204F5D8 (UnkStruct_0204F470 * param0, FieldSystem * fieldSystem) +static int sub_0204F5D8(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem) { int v0; - PartyManagementData * v1; + PartyManagementData *v1; if (sub_020509B4(fieldSystem)) { return UnkEnum_0204F13C_2; @@ -404,10 +400,10 @@ static int sub_0204F5D8 (UnkStruct_0204F470 * param0, FieldSystem * fieldSystem) return UnkEnum_0204F13C_3; } -static int sub_0204F628 (UnkStruct_0204F470 * param0, FieldSystem * fieldSystem, int param2) +static int sub_0204F628(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, int param2) { - PokemonSummary * v0; - SaveData * v1; + PokemonSummary *v0; + SaveData *v1; static const u8 v2[] = { 0, @@ -446,9 +442,9 @@ static int sub_0204F628 (UnkStruct_0204F470 * param0, FieldSystem * fieldSystem, return UnkEnum_0204F13C_4; } -static int sub_0204F6B0 (UnkStruct_0204F470 * param0, FieldSystem * fieldSystem) +static int sub_0204F6B0(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem) { - PokemonSummary * v0; + PokemonSummary *v0; if (sub_020509B4(fieldSystem)) { return UnkEnum_0204F13C_4; @@ -464,7 +460,7 @@ static int sub_0204F6B0 (UnkStruct_0204F470 * param0, FieldSystem * fieldSystem) return UnkEnum_0204F13C_1; } -BOOL ScrCmd_324(ScriptContext * param0); +BOOL ScrCmd_324(ScriptContext *param0); typedef struct { u32 unk_00; @@ -472,71 +468,71 @@ typedef struct { } UnkStruct_020EC078; static const UnkStruct_020EC078 Unk_020EC078[] = { - {10, 1}, - {30, 3}, - {50, 5}, - {100, 5}, - {150, 5}, - {200, 5}, - {250, 5}, - {300, 5}, - {350, 5}, - {400, 5}, - {450, 5}, - {500, 10}, - {600, 10}, - {700, 10}, - {800, 10}, - {900, 10}, - {1000, 10}, - {1200, 30}, - {1400, 30}, - {1600, 30}, - {1800, 30}, - {2000, 50}, - {2500, 50}, - {3000, 50}, - {3500, 50}, - {4000, 50}, - {4500, 50}, - {5000, 50}, - {5500, 50}, - {6000, 50}, - {6500, 50}, - {7000, 50}, - {7500, 50}, - {8000, 50}, - {8500, 50}, - {9000, 50}, - {9500, 50}, - {10000, 100}, - {20000, 200}, - {30000, 300}, - {40000, 400}, - {50000, 500}, - {60000, 600}, - {70000, 700}, - {80000, 800}, - {90000, 900}, - {100000, 1000}, + { 10, 1 }, + { 30, 3 }, + { 50, 5 }, + { 100, 5 }, + { 150, 5 }, + { 200, 5 }, + { 250, 5 }, + { 300, 5 }, + { 350, 5 }, + { 400, 5 }, + { 450, 5 }, + { 500, 10 }, + { 600, 10 }, + { 700, 10 }, + { 800, 10 }, + { 900, 10 }, + { 1000, 10 }, + { 1200, 30 }, + { 1400, 30 }, + { 1600, 30 }, + { 1800, 30 }, + { 2000, 50 }, + { 2500, 50 }, + { 3000, 50 }, + { 3500, 50 }, + { 4000, 50 }, + { 4500, 50 }, + { 5000, 50 }, + { 5500, 50 }, + { 6000, 50 }, + { 6500, 50 }, + { 7000, 50 }, + { 7500, 50 }, + { 8000, 50 }, + { 8500, 50 }, + { 9000, 50 }, + { 9500, 50 }, + { 10000, 100 }, + { 20000, 200 }, + { 30000, 300 }, + { 40000, 400 }, + { 50000, 500 }, + { 60000, 600 }, + { 70000, 700 }, + { 80000, 800 }, + { 90000, 900 }, + { 100000, 1000 }, }; -BOOL ScrCmd_324 (ScriptContext * param0) +BOOL ScrCmd_324(ScriptContext *param0) { int v0; int v1; - BattleFrontierStage * v2; - UnkStruct_0203068C * v3; + BattleFrontierStage *v2; + UnkStruct_0203068C *v3; u32 v4, v5, v6; u16 v7, v8; - FieldSystem * fieldSystem = param0->fieldSystem; - StringTemplate ** v10 = sub_0203F098(fieldSystem, 15); + FieldSystem *fieldSystem = param0->fieldSystem; + StringTemplate **v10 = sub_0203F098(fieldSystem, 15); u8 v11 = ScriptContext_ReadByte(param0); u8 v12 = ScriptContext_ReadByte(param0); u8 v13 = ScriptContext_ReadByte(param0); u8 v14 = ScriptContext_ReadByte(param0); - u16 * v15 = ScriptContext_GetVarPointer(param0); - u16 * v16 = ScriptContext_GetVarPointer(param0); + u16 *v15 = ScriptContext_GetVarPointer(param0); + u16 *v16 = ScriptContext_GetVarPointer(param0); v4 = 0; v0 = 1; @@ -552,8 +548,7 @@ BOOL ScrCmd_324 (ScriptContext * param0) v4 = 0; } else { for (v5 = 0; v5 < NATIONAL_DEX_COUNT; v5++) { - v4 += sub_020308BC(fieldSystem->saveData, v2, - 0, v5); + v4 += sub_020308BC(fieldSystem->saveData, v2, 0, v5); ; } } @@ -564,8 +559,7 @@ BOOL ScrCmd_324 (ScriptContext * param0) Heap_FreeToHeap(v2); } - StringTemplate_SetNumber(*v10, v11, v4, sub_0205DFC4(v4), - 1, 1); + StringTemplate_SetNumber(*v10, v11, v4, sub_0205DFC4(v4), 1, 1); v7 = 0; v6 = 0; @@ -602,28 +596,23 @@ BOOL ScrCmd_324 (ScriptContext * param0) } } - StringTemplate_SetNumber(*v10, v12, Unk_020EC078[v6].unk_00, - sub_0205DFC4(Unk_020EC078[v6].unk_00), - 1, 1); + StringTemplate_SetNumber(*v10, v12, Unk_020EC078[v6].unk_00, sub_0205DFC4(Unk_020EC078[v6].unk_00), 1, 1); - StringTemplate_SetNumber(*v10, v13, Unk_020EC078[*v15].unk_00, - sub_0205DFC4(Unk_020EC078[*v15].unk_00), - 1, 1); + StringTemplate_SetNumber(*v10, v13, Unk_020EC078[*v15].unk_00, sub_0205DFC4(Unk_020EC078[*v15].unk_00), 1, 1); - StringTemplate_SetNumber(*v10, v14, v7, sub_0205DFC4(v7), - 1, 1); + StringTemplate_SetNumber(*v10, v14, v7, sub_0205DFC4(v7), 1, 1); return 0; } -BOOL ScrCmd_325(ScriptContext * param0); -BOOL ScrCmd_325 (ScriptContext * param0) +BOOL ScrCmd_325(ScriptContext *param0); +BOOL ScrCmd_325(ScriptContext *param0) { int v0; - BattleFrontierStage * v1; + BattleFrontierStage *v1; u32 v2, v3, v4; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v6 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v6 = ScriptContext_GetVarPointer(param0); v4 = 0; v0 = 1; @@ -640,14 +629,11 @@ BOOL ScrCmd_325 (ScriptContext * param0) for (v3 = 0; v3 < NATIONAL_DEX_COUNT; v3++) { v2 = 0; - v2 += sub_020308BC(fieldSystem->saveData, v1, - 0, v3); + v2 += sub_020308BC(fieldSystem->saveData, v1, 0, v3); - v2 += sub_020308BC(fieldSystem->saveData, v1, - 1, v3); + v2 += sub_020308BC(fieldSystem->saveData, v1, 1, v3); - v2 += sub_020308BC(fieldSystem->saveData, v1, - 2, v3); + v2 += sub_020308BC(fieldSystem->saveData, v1, 2, v3); if (v2 > 0) { v4++; @@ -665,16 +651,16 @@ BOOL ScrCmd_325 (ScriptContext * param0) return 0; } -BOOL ScrCmd_326(ScriptContext * param0); -BOOL ScrCmd_326 (ScriptContext * param0) +BOOL ScrCmd_326(ScriptContext *param0); +BOOL ScrCmd_326(ScriptContext *param0) { int v0; int v1; - BattleFrontierStage * v2; - UnkStruct_0203068C * v3; + BattleFrontierStage *v2; + UnkStruct_0203068C *v3; u32 v4, v5; - FieldSystem * fieldSystem = param0->fieldSystem; - u16 * v7 = ScriptContext_GetVarPointer(param0); + FieldSystem *fieldSystem = param0->fieldSystem; + u16 *v7 = ScriptContext_GetVarPointer(param0); v4 = 0; v0 = 1; @@ -690,8 +676,7 @@ BOOL ScrCmd_326 (ScriptContext * param0) v4 = 0; } else { for (v5 = 0; v5 < NATIONAL_DEX_COUNT; v5++) { - v4 += sub_020308BC(fieldSystem->saveData, v2, - 0, v5); + v4 += sub_020308BC(fieldSystem->saveData, v2, 0, v5); ; } } @@ -710,20 +695,20 @@ BOOL ScrCmd_326 (ScriptContext * param0) return 0; } -BOOL ScrCmd_32A(ScriptContext * param0); -BOOL ScrCmd_32A (ScriptContext * param0) +BOOL ScrCmd_32A(ScriptContext *param0); +BOOL ScrCmd_32A(ScriptContext *param0) { u16 v0, v1; - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); v0 = sub_02030698(sub_0203068C(param0->fieldSystem->saveData), - sub_0205E55C(0), - 0xff); + sub_0205E55C(0), + 0xff); v1 = sub_02030698(sub_0203068C(param0->fieldSystem->saveData), - sub_0205E50C(0), - 0xff); + sub_0205E50C(0), + 0xff); *v2 = 0; if (v1 == 50) { diff --git a/src/unk_0204FA34.c b/src/unk_0204FA34.c index 0ca3513d4c..2bad408114 100644 --- a/src/unk_0204FA34.c +++ b/src/unk_0204FA34.c @@ -1,25 +1,25 @@ +#include "unk_0204FA34.h" + #include #include #include "struct_decls/struct_0203026C_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0204F3D0.h" +#include "communication_system.h" +#include "savedata.h" #include "unk_02030108.h" #include "unk_0203061C.h" -#include "communication_system.h" -#include "unk_0204FA34.h" #include "unk_0205DFC4.h" -void sub_0204FA34(int param0, int param1, void * param2, void * param3); -void sub_0204FA50(SaveData * param0, UnkStruct_0203026C * param1, u8 param2); +void sub_0204FA34(int param0, int param1, void *param2, void *param3); +void sub_0204FA50(SaveData *param0, UnkStruct_0203026C *param1, u8 param2); -void sub_0204FA34 (int param0, int param1, void * param2, void * param3) +void sub_0204FA34(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_0204F3D0 * v2 = param3; - const UnkStruct_0204F3D0 * v3 = param2; + UnkStruct_0204F3D0 *v2 = param3; + const UnkStruct_0204F3D0 *v3 = param2; v1 = 0; v2->unk_01++; @@ -32,7 +32,7 @@ void sub_0204FA34 (int param0, int param1, void * param2, void * param3) return; } -void sub_0204FA50 (SaveData * param0, UnkStruct_0203026C * param1, u8 param2) +void sub_0204FA50(SaveData *param0, UnkStruct_0203026C *param1, u8 param2) { int v0; u8 v1[4]; diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index 01e0019372..116bd202a0 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -1,76 +1,75 @@ +#include "unk_0204FAB4.h" + #include +#include #include -#include "inlines.h" - #include "struct_decls/struct_020302DC_decl.h" #include "struct_decls/struct_0203041C_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "savedata.h" - -#include "constdata/const_020F1E88.h" -#include "constdata/const_020F410C.h" - -#include "field/field_system.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0204FCF8.h" #include "struct_defs/struct_02098C44.h" -#include "struct_defs/pokemon_summary.h" +#include "field/field_system.h" + +#include "bag.h" +#include "communication_system.h" +#include "field_script_context.h" +#include "field_system.h" #include "heap.h" +#include "inlines.h" +#include "party.h" +#include "pokemon_summary_app.h" +#include "savedata.h" #include "unk_02025E08.h" #include "unk_02028124.h" #include "unk_0202D778.h" #include "unk_020302D0.h" #include "unk_0203061C.h" -#include "communication_system.h" -#include "field_system.h" -#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_02049D08.h" -#include "unk_0204FAB4.h" #include "unk_020508D4.h" #include "unk_0205DFC4.h" -#include "party.h" #include "unk_0207A274.h" -#include "bag.h" -#include "pokemon_summary_app.h" #include "unk_02099500.h" -#include +#include "constdata/const_020F1E88.h" +#include "constdata/const_020F410C.h" typedef struct { int unk_00; u8 unk_04; u8 unk_05; u8 unk_06[3]; - void ** unk_0C; + void **unk_0C; } UnkStruct_0204FE50; -BOOL ScrCmd_2D2(ScriptContext * param0); -BOOL ScrCmd_2D5(ScriptContext * param0); -static void sub_0204FBEC(SaveData * param0, UnkStruct_0203041C * param1, u8 param2); -static void sub_0204FDB4(TaskManager * param0, void ** param1, u8 param2); -static BOOL sub_0204FDE8(TaskManager * param0); -static int sub_0204FE50(UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem, int param2); -static int sub_0204FF1C(UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem); -static int sub_0204FF6C(UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem, int param2); -static int sub_0204FFF4(UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem); -BOOL ScrCmd_2D3(ScriptContext * param0); -static void sub_0204FCF8(TaskManager * param0, u16 param1, u16 param2, u16 * param3); -static BOOL sub_0204FD38(TaskManager * param0); - -BOOL ScrCmd_2D2 (ScriptContext * param0) +BOOL ScrCmd_2D2(ScriptContext *param0); +BOOL ScrCmd_2D5(ScriptContext *param0); +static void sub_0204FBEC(SaveData *param0, UnkStruct_0203041C *param1, u8 param2); +static void sub_0204FDB4(TaskManager *param0, void **param1, u8 param2); +static BOOL sub_0204FDE8(TaskManager *param0); +static int sub_0204FE50(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, int param2); +static int sub_0204FF1C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem); +static int sub_0204FF6C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, int param2); +static int sub_0204FFF4(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem); +BOOL ScrCmd_2D3(ScriptContext *param0); +static void sub_0204FCF8(TaskManager *param0, u16 param1, u16 param2, u16 *param3); +static BOOL sub_0204FD38(TaskManager *param0); + +BOOL ScrCmd_2D2(ScriptContext *param0) { u8 v0; u8 v1[4]; u16 v2[4]; u16 v3, v4, v5; - u16 * v6, * v7; - void ** v8; - UnkStruct_0204AFC4 * v9; - UnkStruct_020302DC * v10; - UnkStruct_0203041C * v11; + u16 *v6, *v7; + void **v8; + UnkStruct_0204AFC4 *v9; + UnkStruct_020302DC *v10; + UnkStruct_0203041C *v11; v3 = ScriptContext_ReadHalfWord(param0); v4 = ScriptContext_GetVar(param0); @@ -116,9 +115,9 @@ BOOL ScrCmd_2D2 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2D5 (ScriptContext * param0) +BOOL ScrCmd_2D5(ScriptContext *param0) { - UnkStruct_0203041C * v0; + UnkStruct_0203041C *v0; u16 v1 = ScriptContext_GetVar(param0); v0 = sub_0203041C(param0->fieldSystem->saveData); @@ -127,7 +126,7 @@ BOOL ScrCmd_2D5 (ScriptContext * param0) return 0; } -static void sub_0204FBEC (SaveData * param0, UnkStruct_0203041C * param1, u8 param2) +static void sub_0204FBEC(SaveData *param0, UnkStruct_0203041C *param1, u8 param2) { int v0; u16 v1[4]; @@ -152,19 +151,19 @@ static void sub_0204FBEC (SaveData * param0, UnkStruct_0203041C * param1, u8 par return; } -BOOL ScrCmd_2D3 (ScriptContext * param0) +BOOL ScrCmd_2D3(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); u16 v1 = ScriptContext_GetVar(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); sub_0204FCF8(param0->taskManager, v0, v1, v2); return 1; } -static void sub_0204FCF8 (TaskManager * param0, u16 param1, u16 param2, u16 * param3) +static void sub_0204FCF8(TaskManager *param0, u16 param1, u16 param2, u16 *param3) { - UnkStruct_0204FCF8 * v0; + UnkStruct_0204FCF8 *v0; v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0204FCF8)); memset(v0, 0, sizeof(UnkStruct_0204FCF8)); @@ -179,9 +178,9 @@ static void sub_0204FCF8 (TaskManager * param0, u16 param1, u16 param2, u16 * pa return; } -static BOOL sub_0204FD38 (TaskManager * param0) +static BOOL sub_0204FD38(TaskManager *param0) { - UnkStruct_0204FCF8 * v0 = TaskManager_Environment(param0); + UnkStruct_0204FCF8 *v0 = TaskManager_Environment(param0); switch (v0->unk_00) { case 0: @@ -212,10 +211,10 @@ static BOOL sub_0204FD38 (TaskManager * param0) return 0; } -static void sub_0204FDB4 (TaskManager * param0, void ** param1, u8 param2) +static void sub_0204FDB4(TaskManager *param0, void **param1, u8 param2) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0204FE50 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0204FE50)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0204FE50 *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0204FE50)); MI_CpuClear8(v1, sizeof(UnkStruct_0204FE50)); @@ -226,10 +225,10 @@ static void sub_0204FDB4 (TaskManager * param0, void ** param1, u8 param2) return; } -static BOOL sub_0204FDE8 (TaskManager * param0) +static BOOL sub_0204FDE8(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0204FE50 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0204FE50 *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { case 0: @@ -252,10 +251,10 @@ static BOOL sub_0204FDE8 (TaskManager * param0) return 0; } -static int sub_0204FE50 (UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem, int param2) +static int sub_0204FE50(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, int param2) { u8 v0; - PartyManagementData * v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData)); + PartyManagementData *v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData)); MI_CpuClearFast(v1, sizeof(PartyManagementData)); @@ -289,10 +288,10 @@ static int sub_0204FE50 (UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem, return 1; } -static int sub_0204FF1C (UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem) +static int sub_0204FF1C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem) { int v0; - PartyManagementData * v1; + PartyManagementData *v1; if (sub_020509B4(fieldSystem)) { return 1; @@ -317,10 +316,10 @@ static int sub_0204FF1C (UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem) return 2; } -static int sub_0204FF6C (UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem, int param2) +static int sub_0204FF6C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, int param2) { - PokemonSummary * v0; - SaveData * v1; + PokemonSummary *v0; + SaveData *v1; static const u8 v2[] = { 0, 1, 2, 4, 3, 5, 6, 7, 8 }; @@ -349,9 +348,9 @@ static int sub_0204FF6C (UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem, return 3; } -static int sub_0204FFF4 (UnkStruct_0204FE50 * param0, FieldSystem * fieldSystem) +static int sub_0204FFF4(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem) { - PokemonSummary * v0; + PokemonSummary *v0; if (sub_020509B4(fieldSystem)) { return 3; diff --git a/src/unk_0205001C.c b/src/unk_0205001C.c index 7a375eef4e..bb7fae404c 100644 --- a/src/unk_0205001C.c +++ b/src/unk_0205001C.c @@ -1,18 +1,19 @@ +#include "unk_0205001C.h" + #include #include #include "struct_defs/struct_0204FCF8.h" #include "communication_system.h" -#include "unk_0205001C.h" -void sub_0205001C(int param0, int param1, void * param2, void * param3); +void sub_0205001C(int param0, int param1, void *param2, void *param3); -void sub_0205001C (int param0, int param1, void * param2, void * param3) +void sub_0205001C(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_0204FCF8 * v2 = param3; - const UnkStruct_0204FCF8 * v3 = param2; + UnkStruct_0204FCF8 *v2 = param3; + const UnkStruct_0204FCF8 *v3 = param2; v1 = 0; v2->unk_01++; diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index 3c1d51ce7c..6ac30c67df 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -1,76 +1,75 @@ +#include "unk_0205003C.h" + #include +#include #include -#include "inlines.h" - #include "struct_decls/struct_020304A0_decl.h" #include "struct_decls/struct_020305B8_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "savedata.h" - -#include "constdata/const_020F1E88.h" -#include "constdata/const_020F410C.h" - -#include "field/field_system.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_02050224.h" #include "struct_defs/struct_02098C44.h" -#include "struct_defs/pokemon_summary.h" +#include "field/field_system.h" + +#include "bag.h" +#include "communication_system.h" +#include "field_script_context.h" +#include "field_system.h" #include "heap.h" +#include "inlines.h" +#include "party.h" +#include "pokemon_summary_app.h" +#include "savedata.h" #include "unk_02025E08.h" #include "unk_02028124.h" #include "unk_0202D778.h" #include "unk_02030494.h" #include "unk_0203061C.h" -#include "communication_system.h" -#include "field_system.h" -#include "field_script_context.h" #include "unk_0203E880.h" #include "unk_02049D08.h" -#include "unk_0205003C.h" #include "unk_020508D4.h" #include "unk_0205DFC4.h" -#include "party.h" #include "unk_0207A274.h" -#include "bag.h" -#include "pokemon_summary_app.h" #include "unk_02099500.h" -#include +#include "constdata/const_020F1E88.h" +#include "constdata/const_020F410C.h" typedef struct { int unk_00; u8 unk_04; u8 unk_05; u8 unk_06[3]; - void ** unk_0C; + void **unk_0C; } UnkStruct_0205037C; -BOOL ScrCmd_2D9(ScriptContext * param0); -BOOL ScrCmd_2DC(ScriptContext * param0); -static void sub_02050174(SaveData * param0, UnkStruct_020305B8 * param1, u8 param2); -void sub_020502E0(TaskManager * param0, void ** param1, u8 param2); -static BOOL sub_02050314(TaskManager * param0); -static int sub_0205037C(UnkStruct_0205037C * param0, FieldSystem * fieldSystem, int param2); -static int sub_02050448(UnkStruct_0205037C * param0, FieldSystem * fieldSystem); -static int sub_02050498(UnkStruct_0205037C * param0, FieldSystem * fieldSystem, int param2); -static int sub_02050520(UnkStruct_0205037C * param0, FieldSystem * fieldSystem); -BOOL ScrCmd_2DA(ScriptContext * param0); -void sub_02050224(TaskManager * param0, u16 param1, u16 param2, u16 * param3); -static BOOL sub_02050264(TaskManager * param0); - -BOOL ScrCmd_2D9 (ScriptContext * param0) +BOOL ScrCmd_2D9(ScriptContext *param0); +BOOL ScrCmd_2DC(ScriptContext *param0); +static void sub_02050174(SaveData *param0, UnkStruct_020305B8 *param1, u8 param2); +void sub_020502E0(TaskManager *param0, void **param1, u8 param2); +static BOOL sub_02050314(TaskManager *param0); +static int sub_0205037C(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, int param2); +static int sub_02050448(UnkStruct_0205037C *param0, FieldSystem *fieldSystem); +static int sub_02050498(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, int param2); +static int sub_02050520(UnkStruct_0205037C *param0, FieldSystem *fieldSystem); +BOOL ScrCmd_2DA(ScriptContext *param0); +void sub_02050224(TaskManager *param0, u16 param1, u16 param2, u16 *param3); +static BOOL sub_02050264(TaskManager *param0); + +BOOL ScrCmd_2D9(ScriptContext *param0) { u8 v0; u8 v1[4]; u16 v2[4]; u16 v3, v4, v5; - u16 * v6, * v7; - void ** v8; - UnkStruct_0204AFC4 * v9; - UnkStruct_020304A0 * v10; - UnkStruct_020305B8 * v11; + u16 *v6, *v7; + void **v8; + UnkStruct_0204AFC4 *v9; + UnkStruct_020304A0 *v10; + UnkStruct_020305B8 *v11; v3 = ScriptContext_ReadHalfWord(param0); v4 = ScriptContext_GetVar(param0); @@ -116,9 +115,9 @@ BOOL ScrCmd_2D9 (ScriptContext * param0) return 0; } -BOOL ScrCmd_2DC (ScriptContext * param0) +BOOL ScrCmd_2DC(ScriptContext *param0) { - UnkStruct_020305B8 * v0; + UnkStruct_020305B8 *v0; u16 v1 = ScriptContext_GetVar(param0); v0 = sub_020305B8(param0->fieldSystem->saveData); @@ -127,7 +126,7 @@ BOOL ScrCmd_2DC (ScriptContext * param0) return 0; } -static void sub_02050174 (SaveData * param0, UnkStruct_020305B8 * param1, u8 param2) +static void sub_02050174(SaveData *param0, UnkStruct_020305B8 *param1, u8 param2) { int v0; u16 v1[4]; @@ -144,19 +143,19 @@ static void sub_02050174 (SaveData * param0, UnkStruct_020305B8 * param1, u8 par return; } -BOOL ScrCmd_2DA (ScriptContext * param0) +BOOL ScrCmd_2DA(ScriptContext *param0) { u16 v0 = ScriptContext_GetVar(param0); u16 v1 = ScriptContext_GetVar(param0); - u16 * v2 = ScriptContext_GetVarPointer(param0); + u16 *v2 = ScriptContext_GetVarPointer(param0); sub_02050224(param0->taskManager, v0, v1, v2); return 1; } -void sub_02050224 (TaskManager * param0, u16 param1, u16 param2, u16 * param3) +void sub_02050224(TaskManager *param0, u16 param1, u16 param2, u16 *param3) { - UnkStruct_02050224 * v0; + UnkStruct_02050224 *v0; v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02050224)); memset(v0, 0, sizeof(UnkStruct_02050224)); @@ -169,9 +168,9 @@ void sub_02050224 (TaskManager * param0, u16 param1, u16 param2, u16 * param3) FieldTask_Start(param0, sub_02050264, v0); } -static BOOL sub_02050264 (TaskManager * param0) +static BOOL sub_02050264(TaskManager *param0) { - UnkStruct_02050224 * v0 = TaskManager_Environment(param0); + UnkStruct_02050224 *v0 = TaskManager_Environment(param0); switch (v0->unk_00) { case 0: @@ -202,10 +201,10 @@ static BOOL sub_02050264 (TaskManager * param0) return 0; } -void sub_020502E0 (TaskManager * param0, void ** param1, u8 param2) +void sub_020502E0(TaskManager *param0, void **param1, u8 param2) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0205037C * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0205037C)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0205037C *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0205037C)); MI_CpuClear8(v1, sizeof(UnkStruct_0205037C)); @@ -216,10 +215,10 @@ void sub_020502E0 (TaskManager * param0, void ** param1, u8 param2) return; } -static BOOL sub_02050314 (TaskManager * param0) +static BOOL sub_02050314(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0205037C * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0205037C *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { case 0: @@ -242,10 +241,10 @@ static BOOL sub_02050314 (TaskManager * param0) return 0; } -static int sub_0205037C (UnkStruct_0205037C * param0, FieldSystem * fieldSystem, int param2) +static int sub_0205037C(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, int param2) { u8 v0; - PartyManagementData * v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData)); + PartyManagementData *v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData)); MI_CpuClearFast(v1, sizeof(PartyManagementData)); @@ -277,10 +276,10 @@ static int sub_0205037C (UnkStruct_0205037C * param0, FieldSystem * fieldSystem, return 1; } -static int sub_02050448 (UnkStruct_0205037C * param0, FieldSystem * fieldSystem) +static int sub_02050448(UnkStruct_0205037C *param0, FieldSystem *fieldSystem) { int v0; - PartyManagementData * v1; + PartyManagementData *v1; if (sub_020509B4(fieldSystem)) { return 1; @@ -305,10 +304,10 @@ static int sub_02050448 (UnkStruct_0205037C * param0, FieldSystem * fieldSystem) return 2; } -static int sub_02050498 (UnkStruct_0205037C * param0, FieldSystem * fieldSystem, int param2) +static int sub_02050498(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, int param2) { - PokemonSummary * v0; - SaveData * v1; + PokemonSummary *v0; + SaveData *v1; static const u8 v2[] = { 0, 1, 2, 4, 3, 5, 6, 7, 8 }; @@ -337,9 +336,9 @@ static int sub_02050498 (UnkStruct_0205037C * param0, FieldSystem * fieldSystem, return 3; } -static int sub_02050520 (UnkStruct_0205037C * param0, FieldSystem * fieldSystem) +static int sub_02050520(UnkStruct_0205037C *param0, FieldSystem *fieldSystem) { - PokemonSummary * v0; + PokemonSummary *v0; if (sub_020509B4(fieldSystem)) { return 3; diff --git a/src/unk_02050548.c b/src/unk_02050548.c index b1776e5343..abf6c436e7 100644 --- a/src/unk_02050548.c +++ b/src/unk_02050548.c @@ -1,18 +1,19 @@ +#include "unk_02050548.h" + #include #include #include "struct_defs/struct_02050224.h" #include "communication_system.h" -#include "unk_02050548.h" -void sub_02050548(int param0, int param1, void * param2, void * param3); +void sub_02050548(int param0, int param1, void *param2, void *param3); -void sub_02050548 (int param0, int param1, void * param2, void * param3) +void sub_02050548(int param0, int param1, void *param2, void *param3) { int v0, v1; - UnkStruct_02050224 * v2 = param3; - const UnkStruct_02050224 * v3 = param2; + UnkStruct_02050224 *v2 = param3; + const UnkStruct_02050224 *v3 = param2; v1 = 0; v2->unk_01++; diff --git a/src/unk_02050568.c b/src/unk_02050568.c index 4245a4b7b0..a8eb777d12 100644 --- a/src/unk_02050568.c +++ b/src/unk_02050568.c @@ -1,58 +1,58 @@ +#include "unk_02050568.h" + #include #include -#include "inlines.h" -#include "core_sys.h" - #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_02049FA8.h" #include "overlay115/camera_angle.h" -#include "unk_02005474.h" -#include "heap.h" #include "camera.h" -#include "unk_02050568.h" -#include "vars_flags.h" -#include "unk_020508D4.h" +#include "core_sys.h" #include "field_map_change.h" +#include "heap.h" +#include "inlines.h" +#include "map_object.h" +#include "player_avatar.h" +#include "unk_02005474.h" +#include "unk_020508D4.h" #include "unk_02055808.h" #include "unk_02056B30.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_0206A8DC.h" #include "unk_02070428.h" +#include "vars_flags.h" typedef struct { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; u16 unk_04; u16 unk_06; u8 unk_08; u8 unk_09[3]; } UnkStruct_02050568; -static BOOL sub_020505A0(TaskManager * taskMan); -static void sub_0205074C(PlayerAvatar * playerAvatar, BOOL param1); -static void sub_0205075C(FieldSystem * fieldSystem); +static BOOL sub_020505A0(TaskManager *taskMan); +static void sub_0205074C(PlayerAvatar *playerAvatar, BOOL param1); +static void sub_0205075C(FieldSystem *fieldSystem); -void sub_02050568 (FieldSystem * fieldSystem) +void sub_02050568(FieldSystem *fieldSystem) { - UnkStruct_02050568 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02050568)); + UnkStruct_02050568 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02050568)); memset(v0, 0, sizeof(UnkStruct_02050568)); FieldTask_Start(fieldSystem->unk_10, sub_020505A0, v0); } -static BOOL sub_020505A0 (TaskManager * taskMan) +static BOOL sub_020505A0(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02050568 * v1 = TaskManager_Environment(taskMan); - VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02050568 *v1 = TaskManager_Environment(taskMan); + VarsFlags *v2 = SaveData_GetVarsFlags(fieldSystem->saveData); switch (v1->unk_08) { case 0: @@ -89,7 +89,7 @@ static BOOL sub_020505A0 (TaskManager * taskMan) v1->unk_08++; break; case 5: - if ((gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B))) { + if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { v1->unk_08++; } break; @@ -131,13 +131,13 @@ static BOOL sub_020505A0 (TaskManager * taskMan) return 0; } -static void sub_0205074C (PlayerAvatar * playerAvatar, BOOL param1) +static void sub_0205074C(PlayerAvatar *playerAvatar, BOOL param1) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); MapObject_SetHidden(mapObj, param1); } -static void sub_0205075C (FieldSystem * fieldSystem) +static void sub_0205075C(FieldSystem *fieldSystem) { VecFx32 v0; CameraAngle v1; diff --git a/src/unk_020508D4.c b/src/unk_020508D4.c index 1dfd52556a..d354b8ce0f 100644 --- a/src/unk_020508D4.c +++ b/src/unk_020508D4.c @@ -1,3 +1,5 @@ +#include "unk_020508D4.h" + #include #include @@ -5,30 +7,29 @@ #include "functypes/funcptr_02050904.h" #include "overlay005/struct_ov5_021D219C.h" -#include "heap.h" #include "field_system.h" -#include "unk_020508D4.h" +#include "heap.h" typedef struct UnkStruct_020508D4_t { - TaskManager * unk_00; + TaskManager *unk_00; FieldTask unk_04; int unk_08; - void * unk_0C; + void *unk_0C; int unk_10; - void * unk_14; - FieldSystem * fieldSystem; - UnkStruct_ov5_021D219C * unk_1C; + void *unk_14; + FieldSystem *fieldSystem; + UnkStruct_ov5_021D219C *unk_1C; } TaskManager; typedef struct { int unk_00; - const OverlayManagerTemplate * unk_04; - void * unk_08; + const OverlayManagerTemplate *unk_04; + void *unk_08; } UnkStruct_020509F0; -static TaskManager * sub_020508D4 (FieldSystem * fieldSystem, FieldTask param1, void * param2) +static TaskManager *sub_020508D4(FieldSystem *fieldSystem, FieldTask param1, void *param2) { - TaskManager * v0; + TaskManager *v0; v0 = Heap_AllocFromHeapAtEnd(32, sizeof(TaskManager)); v0->unk_00 = NULL; @@ -43,9 +44,9 @@ static TaskManager * sub_020508D4 (FieldSystem * fieldSystem, FieldTask param1, return v0; } -TaskManager * FieldTask_Set (FieldSystem * fieldSystem, FieldTask param1, void * param2) +TaskManager *FieldTask_Set(FieldSystem *fieldSystem, FieldTask param1, void *param2) { - TaskManager * v0; + TaskManager *v0; GF_ASSERT(fieldSystem->unk_10 == NULL); @@ -55,7 +56,7 @@ TaskManager * FieldTask_Set (FieldSystem * fieldSystem, FieldTask param1, void * return v0; } -void FieldTask_Change (TaskManager * param0, FieldTask param1, void * param2) +void FieldTask_Change(TaskManager *param0, FieldTask param1, void *param2) { param0->unk_04 = param1; param0->unk_08 = 0; @@ -68,9 +69,9 @@ void FieldTask_Change (TaskManager * param0, FieldTask param1, void * param2) } } -TaskManager * FieldTask_Start (TaskManager * param0, FieldTask param1, void * param2) +TaskManager *FieldTask_Start(TaskManager *param0, FieldTask param1, void *param2) { - TaskManager * v0; + TaskManager *v0; v0 = sub_020508D4(param0->fieldSystem, param1, param2); v0->unk_00 = param0; @@ -80,14 +81,14 @@ TaskManager * FieldTask_Start (TaskManager * param0, FieldTask param1, void * pa return v0; } -BOOL sub_02050958 (FieldSystem * fieldSystem) +BOOL sub_02050958(FieldSystem *fieldSystem) { if (fieldSystem->unk_10 == NULL) { return 0; } while (fieldSystem->unk_10->unk_04(fieldSystem->unk_10) == 1) { - TaskManager * v0; + TaskManager *v0; v0 = fieldSystem->unk_10->unk_00; @@ -108,12 +109,12 @@ BOOL sub_02050958 (FieldSystem * fieldSystem) return 0; } -BOOL sub_020509A4 (FieldSystem * fieldSystem) +BOOL sub_020509A4(FieldSystem *fieldSystem) { return fieldSystem->unk_10 != NULL; } -BOOL sub_020509B4 (FieldSystem * fieldSystem) +BOOL sub_020509B4(FieldSystem *fieldSystem) { if (sub_0203CD4C(fieldSystem) || sub_0203CD74(fieldSystem)) { return 1; @@ -122,12 +123,12 @@ BOOL sub_020509B4 (FieldSystem * fieldSystem) } } -void sub_020509D4 (FieldSystem * fieldSystem) +void sub_020509D4(FieldSystem *fieldSystem) { sub_0203CD00(fieldSystem); } -BOOL sub_020509DC (FieldSystem * fieldSystem) +BOOL sub_020509DC(FieldSystem *fieldSystem) { if (sub_0203CD5C(fieldSystem)) { return 1; @@ -136,10 +137,10 @@ BOOL sub_020509DC (FieldSystem * fieldSystem) } } -static BOOL sub_020509F0 (TaskManager * param0) +static BOOL sub_020509F0(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_020509F0 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_020509F0 *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { case 0: @@ -158,9 +159,9 @@ static BOOL sub_020509F0 (TaskManager * param0) return 0; } -void sub_02050A38 (TaskManager * param0, const OverlayManagerTemplate * param1, void * param2) +void sub_02050A38(TaskManager *param0, const OverlayManagerTemplate *param1, void *param2) { - UnkStruct_020509F0 * v0 = Heap_AllocFromHeapAtEnd(32, sizeof(UnkStruct_020509F0)); + UnkStruct_020509F0 *v0 = Heap_AllocFromHeapAtEnd(32, sizeof(UnkStruct_020509F0)); v0->unk_00 = 0; v0->unk_04 = param1; @@ -169,22 +170,22 @@ void sub_02050A38 (TaskManager * param0, const OverlayManagerTemplate * param1, FieldTask_Start(param0, sub_020509F0, v0); } -FieldSystem * TaskManager_FieldSystem (TaskManager * param0) +FieldSystem *TaskManager_FieldSystem(TaskManager *param0) { return param0->fieldSystem; } -void * TaskManager_Environment (TaskManager * param0) +void *TaskManager_Environment(TaskManager *param0) { return param0->unk_0C; } -int * FieldTask_GetState (TaskManager * param0) +int *FieldTask_GetState(TaskManager *param0) { return ¶m0->unk_08; } -u32 sub_02050A6C (TaskManager * param0) +u32 sub_02050A6C(TaskManager *param0) { return param0->unk_1C->unk_00; } diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c index 9e4053aa21..237f512257 100644 --- a/src/unk_02050A74.c +++ b/src/unk_02050A74.c @@ -1,4 +1,4 @@ -#include "enums.h" +#include "unk_02050A74.h" #include #include @@ -8,79 +8,78 @@ #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_0202610C.h" #include "struct_defs/struct_0202BE38.h" -#include "field/field_system.h" #include "struct_defs/struct_02049FA8.h" + +#include "field/field_system.h" #include "overlay006/battle_params.h" +#include "overlay006/ov6_02240C9C.h" +#include "overlay006/ov6_02246034.h" +#include "savedata/save_table.h" -#include "unk_020041CC.h" +#include "communication_information.h" +#include "enc_effects.h" +#include "enums.h" +#include "field_comm_manager.h" +#include "field_map_change.h" +#include "field_overworld_state.h" #include "heap.h" -#include "savedata/save_table.h" +#include "journal.h" +#include "map_object.h" +#include "party.h" +#include "pokemon.h" +#include "pokeradar.h" +#include "trainer_data.h" +#include "unk_020041CC.h" #include "unk_02025E08.h" #include "unk_02026150.h" -#include "journal.h" #include "unk_0202CD50.h" #include "unk_0202F1D4.h" -#include "communication_information.h" -#include "field_overworld_state.h" #include "unk_0203D1B8.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_020508D4.h" -#include "unk_02050A74.h" -#include "enc_effects.h" #include "unk_02051D8C.h" #include "unk_020528D0.h" -#include "field_map_change.h" #include "unk_0205578C.h" #include "unk_02055808.h" #include "unk_020562F8.h" -#include "field_comm_manager.h" -#include "map_object.h" -#include "pokeradar.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "trainer_data.h" #include "unk_020797C8.h" -#include "party.h" #include "unk_0207A274.h" #include "unk_02096420.h" -#include "overlay006/ov6_02240C9C.h" -#include "overlay006/ov6_02246034.h" +#include "vars_flags.h" typedef struct { - int * unk_00; + int *unk_00; int unk_04; int unk_08; int unk_0C; - BattleParams * unk_10; + BattleParams *unk_10; } UnkStruct_02050ACC; typedef struct { int unk_00; int unk_04; int unk_08; - int * unk_0C; - BattleParams * unk_10; + int *unk_0C; + BattleParams *unk_10; } UnkStruct_02050DD4; -static void sub_020518B0(FieldSystem * fieldSystem, BattleParams * param1); -static void sub_02051988(FieldSystem * fieldSystem, BattleParams * param1); -static BOOL sub_02050EE0(TaskManager * taskMan); -static BOOL sub_02051074(TaskManager * taskMan); +static void sub_020518B0(FieldSystem *fieldSystem, BattleParams *param1); +static void sub_02051988(FieldSystem *fieldSystem, BattleParams *param1); +static BOOL sub_02050EE0(TaskManager *taskMan); +static BOOL sub_02051074(TaskManager *taskMan); -static BOOL sub_02050A74 (TaskManager * taskMan) +static BOOL sub_02050A74(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - BattleParams * v1 = TaskManager_Environment(taskMan); - int * v2 = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + BattleParams *v1 = TaskManager_Environment(taskMan); + int *v2 = FieldTask_GetState(taskMan); switch (*v2) { case 0: @@ -98,14 +97,14 @@ static BOOL sub_02050A74 (TaskManager * taskMan) return 0; } -void sub_02050ABC (TaskManager * taskMan, BattleParams * param1) +void sub_02050ABC(TaskManager *taskMan, BattleParams *param1) { FieldTask_Start(taskMan, sub_02050A74, param1); } -static UnkStruct_02050ACC * sub_02050ACC (BattleParams * param0, int param1, int param2, int * param3) +static UnkStruct_02050ACC *sub_02050ACC(BattleParams *param0, int param1, int param2, int *param3) { - UnkStruct_02050ACC * v0; + UnkStruct_02050ACC *v0; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02050ACC)); v0->unk_00 = param3; @@ -121,13 +120,13 @@ static UnkStruct_02050ACC * sub_02050ACC (BattleParams * param0, int param1, int return v0; } -static void sub_02050AF0 (UnkStruct_02050ACC * param0) +static void sub_02050AF0(UnkStruct_02050ACC *param0) { sub_020520A4(param0->unk_10); Heap_FreeToHeap(param0); } -static BOOL sub_02050B04 (UnkStruct_02050ACC * param0) +static BOOL sub_02050B04(UnkStruct_02050ACC *param0) { BOOL v0; @@ -139,7 +138,7 @@ static BOOL sub_02050B04 (UnkStruct_02050ACC * param0) return v0; } -static void sub_02050B1C (const BattleParams * param0, FieldSystem * fieldSystem) +static void sub_02050B1C(const BattleParams *param0, FieldSystem *fieldSystem) { if (param0->battleType & BATTLE_TYPE_DEBUG) { return; @@ -148,11 +147,11 @@ static void sub_02050B1C (const BattleParams * param0, FieldSystem * fieldSystem sub_020526E8(param0, fieldSystem); } -static BOOL sub_02050B30 (TaskManager * taskMan) +static BOOL sub_02050B30(TaskManager *taskMan) { - FieldSystem * fieldSystem; - UnkStruct_02050ACC * v1; - int * v2; + FieldSystem *fieldSystem; + UnkStruct_02050ACC *v1; + int *v2; fieldSystem = TaskManager_FieldSystem(taskMan); v1 = TaskManager_Environment(taskMan); @@ -176,8 +175,8 @@ static BOOL sub_02050B30 (TaskManager * taskMan) sub_02050B1C(v1->unk_10, fieldSystem); if ((v1->unk_10->battleType == BATTLE_TYPE_WILD_MON) - || (v1->unk_10->battleType == BATTLE_TYPE_ROAMER) - || (v1->unk_10->battleType == BATTLE_TYPE_AI_PARTNER)) { + || (v1->unk_10->battleType == BATTLE_TYPE_ROAMER) + || (v1->unk_10->battleType == BATTLE_TYPE_AI_PARTNER)) { sub_0206D1B8(fieldSystem, v1->unk_10->unk_10C, v1->unk_10->unk_14); } @@ -210,15 +209,15 @@ static BOOL sub_02050B30 (TaskManager * taskMan) return 0; } -static void sub_02050C4C (TaskManager * taskMan, BattleParams * param1, int param2, int param3, int * param4) +static void sub_02050C4C(TaskManager *taskMan, BattleParams *param1, int param2, int param3, int *param4) { - UnkStruct_02050ACC * v0; + UnkStruct_02050ACC *v0; v0 = sub_02050ACC(param1, param2, param3, param4); FieldTask_Start(taskMan, sub_02050B30, v0); } -static void sub_02050C6C (int param0, FieldSystem * fieldSystem) +static void sub_02050C6C(int param0, FieldSystem *fieldSystem) { switch (param0 & 0xf) { case 0x1: @@ -232,11 +231,11 @@ static void sub_02050C6C (int param0, FieldSystem * fieldSystem) } } -static BOOL sub_02050CA8 (TaskManager * taskMan) +static BOOL sub_02050CA8(TaskManager *taskMan) { - FieldSystem * fieldSystem; - UnkStruct_02050ACC * v1; - int * v2; + FieldSystem *fieldSystem; + UnkStruct_02050ACC *v1; + int *v2; fieldSystem = TaskManager_FieldSystem(taskMan); v1 = TaskManager_Environment(taskMan); @@ -260,7 +259,7 @@ static BOOL sub_02050CA8 (TaskManager * taskMan) sub_02052754(v1->unk_10, fieldSystem); { - UnkStruct_0202CD88 * v3 = sub_0202CD88(fieldSystem->saveData); + UnkStruct_0202CD88 *v3 = sub_0202CD88(fieldSystem->saveData); sub_0202CFEC(v3, 21); } @@ -277,11 +276,11 @@ static BOOL sub_02050CA8 (TaskManager * taskMan) return 0; } -static BOOL sub_02050D4C (TaskManager * taskMan) +static BOOL sub_02050D4C(TaskManager *taskMan) { - FieldSystem * fieldSystem; - UnkStruct_02050ACC * v1; - int * v2; + FieldSystem *fieldSystem; + UnkStruct_02050ACC *v1; + int *v2; fieldSystem = TaskManager_FieldSystem(taskMan); v1 = TaskManager_Environment(taskMan); @@ -294,13 +293,12 @@ static BOOL sub_02050D4C (TaskManager * taskMan) sub_02050ABC(taskMan, v1->unk_10); (*v2)++; break; - case 1: - { + case 1: { sub_02050C6C(v1->unk_10->unk_14, fieldSystem); sub_02052754(v1->unk_10, fieldSystem); } { - UnkStruct_0202CD88 * v3 = sub_0202CD88(fieldSystem->saveData); + UnkStruct_0202CD88 *v3 = sub_0202CD88(fieldSystem->saveData); sub_0202CFEC(v3, 21); } (*v2)++; @@ -315,9 +313,9 @@ static BOOL sub_02050D4C (TaskManager * taskMan) return 0; } -static UnkStruct_02050DD4 * sub_02050DD4 (BattleParams * param0, int param1, int param2, int * param3) +static UnkStruct_02050DD4 *sub_02050DD4(BattleParams *param0, int param1, int param2, int *param3) { - UnkStruct_02050DD4 * v0; + UnkStruct_02050DD4 *v0; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02050DD4)); v0->unk_0C = param3; @@ -334,46 +332,46 @@ static UnkStruct_02050DD4 * sub_02050DD4 (BattleParams * param0, int param1, int return v0; } -static void sub_02050DFC (UnkStruct_02050DD4 * param0) +static void sub_02050DFC(UnkStruct_02050DD4 *param0) { sub_020520A4(param0->unk_10); Heap_FreeToHeap(param0); } -void sub_02050E10 (FieldSystem * fieldSystem, BattleParams * param1) +void sub_02050E10(FieldSystem *fieldSystem, BattleParams *param1) { if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData))) { - UnkStruct_02050ACC * v0; + UnkStruct_02050ACC *v0; v0 = sub_02050ACC(param1, EncEffects_CutInEffect(param1), EncEffects_BGM(param1), NULL); FieldTask_Set(fieldSystem, sub_02051074, v0); } else { - UnkStruct_02050DD4 * v1; + UnkStruct_02050DD4 *v1; v1 = sub_02050DD4(param1, EncEffects_CutInEffect(param1), EncEffects_BGM(param1), NULL); FieldTask_Set(fieldSystem, sub_02050EE0, v1); } } -void sub_02050E78 (FieldSystem * fieldSystem, TaskManager * param1, BattleParams * param2) +void sub_02050E78(FieldSystem *fieldSystem, TaskManager *param1, BattleParams *param2) { if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData))) { - UnkStruct_02050ACC * v0; + UnkStruct_02050ACC *v0; v0 = sub_02050ACC(param2, EncEffects_CutInEffect(param2), EncEffects_BGM(param2), NULL); FieldTask_Change(param1, sub_02051074, v0); } else { - UnkStruct_02050DD4 * v1; + UnkStruct_02050DD4 *v1; v1 = sub_02050DD4(param2, EncEffects_CutInEffect(param2), EncEffects_BGM(param2), NULL); FieldTask_Change(param1, sub_02050EE0, v1); } } -static BOOL sub_02050EE0 (TaskManager * taskMan) +static BOOL sub_02050EE0(TaskManager *taskMan) { - FieldSystem * fieldSystem; - UnkStruct_02050DD4 * v1; + FieldSystem *fieldSystem; + UnkStruct_02050DD4 *v1; fieldSystem = TaskManager_FieldSystem(taskMan); v1 = TaskManager_Environment(taskMan); @@ -449,12 +447,12 @@ static BOOL sub_02050EE0 (TaskManager * taskMan) return 0; } -static BOOL sub_02051074 (TaskManager * taskMan) +static BOOL sub_02051074(TaskManager *taskMan) { - FieldSystem * fieldSystem; - UnkStruct_02050ACC * v1; - int * v2; - u16 * v3; + FieldSystem *fieldSystem; + UnkStruct_02050ACC *v1; + int *v2; + u16 *v3; fieldSystem = TaskManager_FieldSystem(taskMan); v1 = TaskManager_Environment(taskMan); @@ -480,8 +478,8 @@ static BOOL sub_02051074 (TaskManager * taskMan) sub_02050B1C(v1->unk_10, fieldSystem); if (v1->unk_10->unk_14 == 0x4) { - TVBroadcast * v4 = SaveData_TVBroadcast(fieldSystem->saveData); - Pokemon * v5 = Party_GetPokemonBySlotIndex(v1->unk_10->parties[1], 0); + TVBroadcast *v4 = SaveData_TVBroadcast(fieldSystem->saveData); + Pokemon *v5 = Party_GetPokemonBySlotIndex(v1->unk_10->parties[1], 0); sub_0206D018(v4, v5); } @@ -489,7 +487,7 @@ static BOOL sub_02051074 (TaskManager * taskMan) sub_020518B0(fieldSystem, v1->unk_10); if (((*v3) == 0) && (v1->unk_10->unk_14 != 0x4)) { - Location * v6; + Location *v6; v6 = sub_0203A730(SaveData_GetFieldOverworldState(fieldSystem->saveData)); sub_020539A0(taskMan, v6); @@ -515,8 +513,8 @@ static BOOL sub_02051074 (TaskManager * taskMan) sub_0203E8E0(taskMan, 8809, NULL, NULL); } } else { - PCBoxes * v7 = SaveData_PCBoxes(fieldSystem->saveData); - Party * v8 = Party_GetFromSavedata(fieldSystem->saveData); + PCBoxes *v7 = SaveData_PCBoxes(fieldSystem->saveData); + Party *v8 = Party_GetFromSavedata(fieldSystem->saveData); if ((PCBoxes_FirstEmptyBox(v7) == 18) && (Party_GetCurrentCount(v8) == 6)) { sub_0203E8E0(taskMan, 8822, NULL, NULL); @@ -534,11 +532,11 @@ static BOOL sub_02051074 (TaskManager * taskMan) return 0; } -void sub_0205120C (TaskManager * taskMan, int * param1) +void sub_0205120C(TaskManager *taskMan, int *param1) { - UnkStruct_02050ACC * v0; - BattleParams * v1; - FieldSystem * fieldSystem; + UnkStruct_02050ACC *v0; + BattleParams *v1; + FieldSystem *fieldSystem; fieldSystem = TaskManager_FieldSystem(taskMan); RadarChain_Clear(fieldSystem->chain); @@ -555,11 +553,11 @@ void sub_0205120C (TaskManager * taskMan, int * param1) sub_02050C4C(taskMan, v1, EncEffects_CutInEffect(v1), EncEffects_BGM(v1), param1); } -void sub_02051270 (TaskManager * taskMan, u16 param1, u8 param2, int * param3, BOOL param4) +void sub_02051270(TaskManager *taskMan, u16 param1, u8 param2, int *param3, BOOL param4) { - UnkStruct_02050ACC * v0; - BattleParams * v1; - FieldSystem * fieldSystem; + UnkStruct_02050ACC *v0; + BattleParams *v1; + FieldSystem *fieldSystem; fieldSystem = TaskManager_FieldSystem(taskMan); RadarChain_Clear(fieldSystem->chain); @@ -577,12 +575,12 @@ void sub_02051270 (TaskManager * taskMan, u16 param1, u8 param2, int * param3, B sub_02050C4C(taskMan, v1, EncEffects_CutInEffect(v1), EncEffects_BGM(v1), param3); } -void sub_020512E4 (TaskManager * taskMan, u16 param1, u8 param2, int * param3, BOOL param4) +void sub_020512E4(TaskManager *taskMan, u16 param1, u8 param2, int *param3, BOOL param4) { - UnkStruct_02050ACC * v0; - BattleParams * v1; - FieldSystem * fieldSystem; - Pokemon * v3; + UnkStruct_02050ACC *v0; + BattleParams *v1; + FieldSystem *fieldSystem; + Pokemon *v3; int v4; fieldSystem = TaskManager_FieldSystem(taskMan); @@ -606,11 +604,11 @@ void sub_020512E4 (TaskManager * taskMan, u16 param1, u8 param2, int * param3, B sub_02050C4C(taskMan, v1, EncEffects_CutInEffect(v1), EncEffects_BGM(v1), param3); } -static BOOL sub_0205136C (TaskManager * taskMan) +static BOOL sub_0205136C(TaskManager *taskMan) { - FieldSystem * fieldSystem; - UnkStruct_02050ACC * v1; - int * v2; + FieldSystem *fieldSystem; + UnkStruct_02050ACC *v1; + int *v2; fieldSystem = TaskManager_FieldSystem(taskMan); v1 = TaskManager_Environment(taskMan); @@ -661,19 +659,19 @@ static BOOL sub_0205136C (TaskManager * taskMan) return 0; } -void sub_02051450 (FieldSystem * fieldSystem, BattleParams * param1) +void sub_02051450(FieldSystem *fieldSystem, BattleParams *param1) { - UnkStruct_02050ACC * v0; + UnkStruct_02050ACC *v0; v0 = sub_02050ACC(param1, EncEffects_CutInEffect(param1), EncEffects_BGM(param1), NULL); FieldTask_Set(fieldSystem, sub_0205136C, v0); } -void sub_02051480 (TaskManager * taskMan, int param1, int param2, int * param3) +void sub_02051480(TaskManager *taskMan, int param1, int param2, int *param3) { - UnkStruct_02050ACC * v0; - BattleParams * v1; - FieldSystem * fieldSystem; + UnkStruct_02050ACC *v0; + BattleParams *v1; + FieldSystem *fieldSystem; fieldSystem = TaskManager_FieldSystem(taskMan); v1 = sub_02051D8C(11, 0x1); @@ -690,11 +688,11 @@ void sub_02051480 (TaskManager * taskMan, int param1, int param2, int * param3) sub_02050C4C(taskMan, v1, EncEffects_CutInEffect(v1), EncEffects_BGM(v1), param3); } -static BOOL sub_020514E8 (TaskManager * taskMan) +static BOOL sub_020514E8(TaskManager *taskMan) { - UnkStruct_02050ACC * v0 = TaskManager_Environment(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - int * v2 = FieldTask_GetState(taskMan); + UnkStruct_02050ACC *v0 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + int *v2 = FieldTask_GetState(taskMan); switch (*v2) { case 0: @@ -731,11 +729,11 @@ static BOOL sub_020514E8 (TaskManager * taskMan) return 0; } -void sub_02051590 (TaskManager * taskMan) +void sub_02051590(TaskManager *taskMan) { - UnkStruct_02050ACC * v0; - BattleParams * v1; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02050ACC *v0; + BattleParams *v1; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); v1 = sub_02051F4C(11, fieldSystem); v0 = sub_02050ACC(v1, EncEffects_CutInEffect(v1), EncEffects_BGM(v1), NULL); @@ -743,12 +741,12 @@ void sub_02051590 (TaskManager * taskMan) FieldTask_Start(taskMan, sub_020514E8, v0); } -void sub_020515CC (TaskManager * taskMan, int param1, int param2, int param3, int param4, int * param5) +void sub_020515CC(TaskManager *taskMan, int param1, int param2, int param3, int param4, int *param5) { u32 v0; - UnkStruct_02050ACC * v1; - BattleParams * v2; - FieldSystem * fieldSystem; + UnkStruct_02050ACC *v1; + BattleParams *v2; + FieldSystem *fieldSystem; fieldSystem = TaskManager_FieldSystem(taskMan); @@ -781,11 +779,11 @@ void sub_020515CC (TaskManager * taskMan, int param1, int param2, int param3, in sub_02050C4C(taskMan, v2, EncEffects_CutInEffect(v2), EncEffects_BGM(v2), param5); } -void sub_0205167C (TaskManager * taskMan, const u8 * param1, int param2) +void sub_0205167C(TaskManager *taskMan, const u8 *param1, int param2) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02050ACC * v1; - BattleParams * v2; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02050ACC *v1; + BattleParams *v2; v2 = sub_02051D8C(11, param2); sub_020526CC(v2, fieldSystem, param1); @@ -794,7 +792,7 @@ void sub_0205167C (TaskManager * taskMan, const u8 * param1, int param2) FieldTask_Start(taskMan, sub_02050CA8, v1); } -static int sub_020516C8 (const BattleRegulation * param0, int param1) +static int sub_020516C8(const BattleRegulation *param0, int param1) { int v0, v1; @@ -815,11 +813,11 @@ static int sub_020516C8 (const BattleRegulation * param0, int param1) return v0; } -void sub_020516F4 (TaskManager * taskMan, int param1, int param2, int param3) +void sub_020516F4(TaskManager *taskMan, int param1, int param2, int param3) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02050ACC * v1; - BattleParams * v2; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02050ACC *v1; + BattleParams *v2; int v3; int v4, v5; @@ -854,11 +852,11 @@ void sub_020516F4 (TaskManager * taskMan, int param1, int param2, int param3) FieldTask_Start(taskMan, sub_02050D4C, v1); } -static BOOL sub_02051790 (TaskManager * taskMan) +static BOOL sub_02051790(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02050ACC * v1 = TaskManager_Environment(taskMan); - int * v2 = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02050ACC *v1 = TaskManager_Environment(taskMan); + int *v2 = FieldTask_GetState(taskMan); switch (*v2) { case 0: @@ -877,10 +875,10 @@ static BOOL sub_02051790 (TaskManager * taskMan) return 0; } -void sub_020517E8 (FieldSystem * fieldSystem, const u8 * param1, int param2) +void sub_020517E8(FieldSystem *fieldSystem, const u8 *param1, int param2) { - UnkStruct_02050ACC * v0; - BattleParams * v1; + UnkStruct_02050ACC *v0; + BattleParams *v1; int v2; v1 = sub_02051D8C(11, param2); @@ -894,10 +892,10 @@ void sub_020517E8 (FieldSystem * fieldSystem, const u8 * param1, int param2) FieldTask_Set(fieldSystem, sub_02051790, v0); } -void sub_0205184C (FieldSystem * fieldSystem, const Party * param1, int param2) +void sub_0205184C(FieldSystem *fieldSystem, const Party *param1, int param2) { - UnkStruct_02050ACC * v0; - BattleParams * v1; + UnkStruct_02050ACC *v0; + BattleParams *v1; int v2; v1 = sub_02051D8C(11, param2); @@ -911,9 +909,9 @@ void sub_0205184C (FieldSystem * fieldSystem, const Party * param1, int param2) FieldTask_Set(fieldSystem, sub_02051790, v0); } -static void sub_020518B0 (FieldSystem * fieldSystem, BattleParams * param1) +static void sub_020518B0(FieldSystem *fieldSystem, BattleParams *param1) { - Pokemon * v0; + Pokemon *v0; u32 v1 = param1->battleType; int v2 = param1->unk_14; @@ -926,8 +924,8 @@ static void sub_020518B0 (FieldSystem * fieldSystem, BattleParams * param1) } if ((v1 == BATTLE_TYPE_WILD_MON) - || (v1 == BATTLE_TYPE_ROAMER) - || (v1 == BATTLE_TYPE_AI_PARTNER)) { + || (v1 == BATTLE_TYPE_ROAMER) + || (v1 == BATTLE_TYPE_AI_PARTNER)) { if (v2 == 0x1) { sub_0202CFEC(sub_0202CD88(fieldSystem->saveData), 8); } else if (v2 == 0x4) { @@ -956,9 +954,9 @@ static void sub_020518B0 (FieldSystem * fieldSystem, BattleParams * param1) } } -static void sub_02051988 (FieldSystem * fieldSystem, BattleParams * param1) +static void sub_02051988(FieldSystem *fieldSystem, BattleParams *param1) { - Pokemon * v0; + Pokemon *v0; u32 v1 = param1->battleType; int v2 = param1->unk_14; @@ -975,10 +973,10 @@ static void sub_02051988 (FieldSystem * fieldSystem, BattleParams * param1) } if ((v1 == BATTLE_TYPE_WILD_MON) - || (v1 == BATTLE_TYPE_ROAMER) - || (v1 == BATTLE_TYPE_AI_PARTNER) - || (v1 == BATTLE_TYPE_SAFARI)) { - UnkStruct_0202BE38 * v3; + || (v1 == BATTLE_TYPE_ROAMER) + || (v1 == BATTLE_TYPE_AI_PARTNER) + || (v1 == BATTLE_TYPE_SAFARI)) { + UnkStruct_0202BE38 *v3; if (v2 == 0x1) { fieldSystem->unk_78.unk_02++; @@ -1004,11 +1002,11 @@ static void sub_02051988 (FieldSystem * fieldSystem, BattleParams * param1) } } -void sub_02051ABC (TaskManager * taskMan, u16 param1, u8 param2, int * param3, BOOL param4) +void sub_02051ABC(TaskManager *taskMan, u16 param1, u8 param2, int *param3, BOOL param4) { - UnkStruct_02050ACC * v0; - BattleParams * v1; - FieldSystem * fieldSystem; + UnkStruct_02050ACC *v0; + BattleParams *v1; + FieldSystem *fieldSystem; fieldSystem = TaskManager_FieldSystem(taskMan); RadarChain_Clear(fieldSystem->chain); @@ -1019,7 +1017,7 @@ void sub_02051ABC (TaskManager * taskMan, u16 param1, u8 param2, int * param3, B ov6_022420D4(fieldSystem, param1, param2, v1); { - Pokemon * v3; + Pokemon *v3; v3 = Party_GetPokemonBySlotIndex(v1->parties[1], 0); Pokemon_SetGiratinaOriginForm(v3); diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 21941d99cb..f6725fd620 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -1,71 +1,69 @@ +#include "unk_02051D8C.h" + #include #include #include "constants/pokemon.h" -#include "core_sys.h" - -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" -#include "journal.h" -#include "struct_defs/chatot_cry.h" #include "struct_decls/struct_0203A790_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - +#include "struct_defs/chatot_cry.h" #include "struct_defs/struct_0202610C.h" -#include "field/field_system.h" #include "struct_defs/struct_02055BA8.h" #include "struct_defs/struct_0205EC34.h" -#include "struct_defs/trainer_data.h" #include "struct_defs/struct_0209C370.h" +#include "struct_defs/trainer_data.h" + +#include "field/field_system.h" #include "overlay006/battle_params.h" #include "overlay006/struct_ov6_02240D5C_sub1.h" +#include "savedata/save_table.h" -#include "unk_020021B0.h" +#include "bag.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_overworld_state.h" +#include "game_options.h" +#include "heap.h" +#include "journal.h" +#include "map_header.h" #include "message.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "poketch_data.h" #include "rtc.h" -#include "heap.h" +#include "savedata.h" #include "strbuf.h" -#include "savedata/save_table.h" +#include "trainer_info.h" +#include "unk_020021B0.h" #include "unk_02025CB0.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202602C.h" #include "unk_0202631C.h" -#include "game_options.h" #include "unk_02027F84.h" #include "unk_0202C858.h" #include "unk_0202CC64.h" #include "unk_0202CD50.h" #include "unk_0203266C.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "map_header.h" -#include "field_overworld_state.h" -#include "vars_flags.h" -#include "unk_02051D8C.h" #include "unk_02054D00.h" #include "unk_020559DC.h" -#include "poketch_data.h" #include "unk_0205C980.h" #include "unk_0205DAC8.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "party.h" -#include "bag.h" -#include "pokemon_summary_app.h" +#include "vars_flags.h" -static void sub_0205281C(BattleParams * param0, const FieldSystem * fieldSystem); -void sub_02052894(BattleParams * param0); +static void sub_0205281C(BattleParams *param0, const FieldSystem *fieldSystem); +void sub_02052894(BattleParams *param0); -BattleParams * sub_02051D8C (int param0, u32 param1) +BattleParams *sub_02051D8C(int param0, u32 param1) { int v0; - BattleParams * v1; + BattleParams *v1; v1 = Heap_AllocFromHeap(param0, sizeof(BattleParams)); MI_CpuClear8(v1, sizeof(BattleParams)); @@ -132,9 +130,9 @@ BattleParams * sub_02051D8C (int param0, u32 param1) return v1; } -BattleParams * sub_02051F24 (int param0, int param1) +BattleParams *sub_02051F24(int param0, int param1) { - BattleParams * v0; + BattleParams *v0; v0 = sub_02051D8C(param0, 0x20); v0->unk_168 = param1; @@ -142,9 +140,9 @@ BattleParams * sub_02051F24 (int param0, int param1) return v0; } -BattleParams * sub_02051F38 (int param0, int param1) +BattleParams *sub_02051F38(int param0, int param1) { - BattleParams * v0; + BattleParams *v0; v0 = sub_02051D8C(param0, 0x200); v0->unk_168 = param1; @@ -152,14 +150,14 @@ BattleParams * sub_02051F38 (int param0, int param1) return v0; } -BattleParams * sub_02051F4C (int param0, const FieldSystem * fieldSystem) +BattleParams *sub_02051F4C(int param0, const FieldSystem *fieldSystem) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); - Options * v1 = SaveData_Options(fieldSystem->saveData); - MessageLoader * v2; - Strbuf* v3; - BattleParams * v4; - Pokemon * v5; + TrainerInfo *v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); + Options *v1 = SaveData_Options(fieldSystem->saveData); + MessageLoader *v2; + Strbuf *v3; + BattleParams *v4; + Pokemon *v5; v4 = sub_02051D8C(param0, 0x400); v2 = MessageLoader_Init(1, 26, 553, param0); @@ -195,7 +193,7 @@ BattleParams * sub_02051F4C (int param0, const FieldSystem * fieldSystem) return v4; } -void sub_020520A4 (BattleParams * param0) +void sub_020520A4(BattleParams *param0) { int v0; @@ -221,7 +219,7 @@ void sub_020520A4 (BattleParams * param0) Heap_FreeToHeap(param0); } -void sub_0205213C (BattleParams * param0, Pokemon * param1, int param2) +void sub_0205213C(BattleParams *param0, Pokemon *param1, int param2) { int v0; @@ -230,32 +228,32 @@ void sub_0205213C (BattleParams * param0, Pokemon * param1, int param2) GF_ASSERT(v0); } -void sub_02052164 (BattleParams * param0, const Party * param1, int param2) +void sub_02052164(BattleParams *param0, const Party *param1, int param2) { GF_ASSERT(param2 < 4); Party_cpy(param1, param0->parties[param2]); } -void sub_02052184 (BattleParams * param0, const TrainerInfo * param1, int param2) +void sub_02052184(BattleParams *param0, const TrainerInfo *param1, int param2) { GF_ASSERT(param2 < 4); TrainerInfo_Copy(param1, param0->unk_D0[param2]); } -void sub_020521A4 (BattleParams * param0, const ChatotCry * param1, int param2) +void sub_020521A4(BattleParams *param0, const ChatotCry *param1, int param2) { CopyChatotCryData(param0->unk_F0[param2], param1); } -void sub_020521B8 (BattleParams * param0, const FieldSystem * fieldSystem, SaveData * param2, int param3, Journal * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6) +void sub_020521B8(BattleParams *param0, const FieldSystem *fieldSystem, SaveData *param2, int param3, Journal *param4, UnkStruct_0207D99C *param5, UnkStruct_0209C370 *param6) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(param2); - Party * v1 = Party_GetFromSavedata(param2); - Bag * v2 = SaveData_GetBag(param2); - PokedexData * v3 = SaveData_Pokedex(param2); - ChatotCry * v4 = GetChatotCryDataFromSave(param2); - Options * v5 = SaveData_Options(param2); - FieldOverworldState * v6 = SaveData_GetFieldOverworldState(param2); + TrainerInfo *v0 = SaveData_GetTrainerInfo(param2); + Party *v1 = Party_GetFromSavedata(param2); + Bag *v2 = SaveData_GetBag(param2); + PokedexData *v3 = SaveData_Pokedex(param2); + ChatotCry *v4 = GetChatotCryDataFromSave(param2); + Options *v5 = SaveData_Options(param2); + FieldOverworldState *v6 = SaveData_GetFieldOverworldState(param2); if (fieldSystem != NULL) { sub_0205281C(param0, fieldSystem); @@ -264,7 +262,7 @@ void sub_020521B8 (BattleParams * param0, const FieldSystem * fieldSystem, SaveD param0->unk_128 = MapHeader_GetBattleBG(param3); param0->unk_12C = 9; { - UnkStruct_02055BA8 * v7 = sub_02025CD8(param2); + UnkStruct_02055BA8 *v7 = sub_02025CD8(param2); param0->unk_138 = TimeOfDayForHour(v7->unk_14.hour); } @@ -294,23 +292,23 @@ void sub_020521B8 (BattleParams * param0, const FieldSystem * fieldSystem, SaveD param0->unk_198 = param2; } -void sub_02052314 (BattleParams * param0, const FieldSystem * fieldSystem) +void sub_02052314(BattleParams *param0, const FieldSystem *fieldSystem) { sub_020521B8(param0, fieldSystem, fieldSystem->saveData, fieldSystem->location->mapId, fieldSystem->unk_9C, fieldSystem->unk_98, fieldSystem->unk_BC); sub_02052894(param0); } -void sub_02052348 (BattleParams * param0, const FieldSystem * fieldSystem, int param2) +void sub_02052348(BattleParams *param0, const FieldSystem *fieldSystem, int param2) { int v0; u32 v1; - TrainerInfo * v2 = SaveData_GetTrainerInfo(fieldSystem->saveData); - Party * v3 = Party_GetFromSavedata(fieldSystem->saveData); - Bag * v4 = SaveData_GetBag(fieldSystem->saveData); - PokedexData * v5 = SaveData_Pokedex(fieldSystem->saveData); - ChatotCry * v6 = GetChatotCryDataFromSave(fieldSystem->saveData); - Options * v7 = SaveData_Options(fieldSystem->saveData); - Pokemon * v8; + TrainerInfo *v2 = SaveData_GetTrainerInfo(fieldSystem->saveData); + Party *v3 = Party_GetFromSavedata(fieldSystem->saveData); + Bag *v4 = SaveData_GetBag(fieldSystem->saveData); + PokedexData *v5 = SaveData_Pokedex(fieldSystem->saveData); + ChatotCry *v6 = GetChatotCryDataFromSave(fieldSystem->saveData); + Options *v7 = SaveData_Options(fieldSystem->saveData); + Pokemon *v8; param0->unk_128 = 6; param0->unk_12C = 9; @@ -353,16 +351,16 @@ void sub_02052348 (BattleParams * param0, const FieldSystem * fieldSystem, int p sub_02052894(param0); } -void sub_020524E4 (BattleParams * param0, const FieldSystem * fieldSystem, const Party * param2, const u8 * param3) +void sub_020524E4(BattleParams *param0, const FieldSystem *fieldSystem, const Party *param2, const u8 *param3) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); - Bag * v1 = SaveData_GetBag(fieldSystem->saveData); - PokedexData * v2 = SaveData_Pokedex(fieldSystem->saveData); - ChatotCry * v3 = GetChatotCryDataFromSave(fieldSystem->saveData); - Options * v4 = SaveData_Options(fieldSystem->saveData); - const BattleRegulation * v5 = fieldSystem->unk_B0; + TrainerInfo *v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); + Bag *v1 = SaveData_GetBag(fieldSystem->saveData); + PokedexData *v2 = SaveData_Pokedex(fieldSystem->saveData); + ChatotCry *v3 = GetChatotCryDataFromSave(fieldSystem->saveData); + Options *v4 = SaveData_Options(fieldSystem->saveData); + const BattleRegulation *v5 = fieldSystem->unk_B0; int v6, v7, v8; - Pokemon * v9; + Pokemon *v9; param0->unk_128 = 6; param0->unk_12C = 9; @@ -431,18 +429,18 @@ void sub_020524E4 (BattleParams * param0, const FieldSystem * fieldSystem, const } } -void sub_020526CC (BattleParams * param0, const FieldSystem * fieldSystem, const u8 * param2) +void sub_020526CC(BattleParams *param0, const FieldSystem *fieldSystem, const u8 *param2) { sub_020524E4(param0, fieldSystem, Party_GetFromSavedata(fieldSystem->saveData), param2); } -void sub_020526E8 (const BattleParams * param0, FieldSystem * fieldSystem) +void sub_020526E8(const BattleParams *param0, FieldSystem *fieldSystem) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); - Party * v1 = Party_GetFromSavedata(fieldSystem->saveData); - Bag * v2 = SaveData_GetBag(fieldSystem->saveData); - PokedexData * v3 = SaveData_Pokedex(fieldSystem->saveData); - u16 * v4 = sub_0203A784(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + TrainerInfo *v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); + Party *v1 = Party_GetFromSavedata(fieldSystem->saveData); + Bag *v2 = SaveData_GetBag(fieldSystem->saveData); + PokedexData *v3 = SaveData_Pokedex(fieldSystem->saveData); + u16 *v4 = sub_0203A784(SaveData_GetFieldOverworldState(fieldSystem->saveData)); TrainerInfo_Copy(param0->unk_D0[0], v0); Party_cpy(param0->parties[0], v1); @@ -452,17 +450,17 @@ void sub_020526E8 (const BattleParams * param0, FieldSystem * fieldSystem) *v4 = param0->unk_168; } -void sub_02052754 (const BattleParams * param0, FieldSystem * fieldSystem) +void sub_02052754(const BattleParams *param0, FieldSystem *fieldSystem) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); - Party * v1 = Party_GetFromSavedata(fieldSystem->saveData); - Bag * v2 = SaveData_GetBag(fieldSystem->saveData); - PokedexData * v3 = SaveData_Pokedex(fieldSystem->saveData); + TrainerInfo *v0 = SaveData_GetTrainerInfo(fieldSystem->saveData); + Party *v1 = Party_GetFromSavedata(fieldSystem->saveData); + Bag *v2 = SaveData_GetBag(fieldSystem->saveData); + PokedexData *v3 = SaveData_Pokedex(fieldSystem->saveData); sub_02026338(param0->unk_E8, v3); } -static int sub_02052780 (const FieldSystem * fieldSystem, int param1) +static int sub_02052780(const FieldSystem *fieldSystem, int param1) { u8 v0 = sub_02054F94(fieldSystem, fieldSystem->location->x, fieldSystem->location->z); static const v1[] = { @@ -518,9 +516,9 @@ static int sub_02052780 (const FieldSystem * fieldSystem, int param1) return 24; } -static void sub_0205281C (BattleParams * param0, const FieldSystem * fieldSystem) +static void sub_0205281C(BattleParams *param0, const FieldSystem *fieldSystem) { - PlayerData * v0 = FieldOverworldState_GetPlayerData(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + PlayerData *v0 = FieldOverworldState_GetPlayerData(SaveData_GetFieldOverworldState(fieldSystem->saveData)); param0->unk_128 = MapHeader_GetBattleBG(fieldSystem->location->mapId); @@ -531,12 +529,12 @@ static void sub_0205281C (BattleParams * param0, const FieldSystem * fieldSystem param0->unk_12C = sub_02052780(fieldSystem, param0->unk_128); } -void sub_0205285C (BattleParams * param0) +void sub_0205285C(BattleParams *param0) { param0->unk_12C = 7; } -BOOL sub_02052868 (u32 param0) +BOOL sub_02052868(u32 param0) { switch (param0) { case 0x2: @@ -547,7 +545,7 @@ BOOL sub_02052868 (u32 param0) } } -BOOL sub_02052878 (u32 param0) +BOOL sub_02052878(u32 param0) { switch (param0) { case 0x1: @@ -558,7 +556,7 @@ BOOL sub_02052878 (u32 param0) } } -BOOL sub_02052888 (u32 param0) +BOOL sub_02052888(u32 param0) { switch (param0) { case 0x4: @@ -568,7 +566,7 @@ BOOL sub_02052888 (u32 param0) } } -void sub_02052894 (BattleParams * param0) +void sub_02052894(BattleParams *param0) { param0->trainerData[0].class = TrainerInfo_Gender(param0->unk_D0[0]); GF_strcpy(¶m0->trainerData[0].name[0], TrainerInfo_Name(param0->unk_D0[0])); diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index 0b7718fec3..5bb762f36e 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -1,61 +1,59 @@ +#include "unk_020528D0.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0203A790_decl.h" #include "struct_decls/struct_020508D4_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + +#include "field/field_system.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "field_map_change.h" +#include "field_overworld_state.h" +#include "field_system.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "party.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02002B7C.h" #include "unk_02005474.h" #include "unk_02006E3C.h" #include "unk_0200A9DC.h" -#include "message.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "field_overworld_state.h" #include "unk_0203A7D8.h" -#include "field_system.h" #include "unk_0203E880.h" #include "unk_020508D4.h" -#include "unk_020528D0.h" -#include "field_map_change.h" #include "unk_020553DC.h" #include "unk_02055808.h" #include "unk_02070428.h" -#include "pokemon.h" -#include "party.h" typedef struct { int unk_00; - FieldSystem * fieldSystem; - BGL * unk_08; + FieldSystem *fieldSystem; + BGL *unk_08; Window unk_0C; - MessageLoader * unk_1C; - StringTemplate * unk_20; + MessageLoader *unk_1C; + StringTemplate *unk_20; } UnkStruct_02052AA4; -static void sub_02052914(FieldSystem * fieldSystem, TaskManager * param1); -static BOOL sub_020529C4(TaskManager * param0); -static void sub_02052AA4(UnkStruct_02052AA4 * param0, u16 param1, u8 param2, u8 param3); +static void sub_02052914(FieldSystem *fieldSystem, TaskManager *param1); +static BOOL sub_020529C4(TaskManager *param0); +static void sub_02052AA4(UnkStruct_02052AA4 *param0, u16 param1, u8 param2, u8 param3); static const UnkStruct_ov61_0222C884 Unk_020EC2F0 = { 0x3, @@ -67,7 +65,7 @@ static const UnkStruct_ov61_0222C884 Unk_020EC2F0 = { 0x1 }; -static void sub_020528D0 (BGL * param0) +static void sub_020528D0(BGL *param0) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -109,9 +107,9 @@ static void sub_020528D0 (BGL * param0) sub_02006E84(14, 6, 0, 13 * 0x20, 0x20, 11); } -static void sub_02052914 (FieldSystem * fieldSystem, TaskManager * param1) +static void sub_02052914(FieldSystem *fieldSystem, TaskManager *param1) { - UnkStruct_02052AA4 * v0; + UnkStruct_02052AA4 *v0; v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02052AA4)); @@ -145,9 +143,9 @@ static void sub_02052914 (FieldSystem * fieldSystem, TaskManager * param1) return; } -static BOOL sub_020529C4 (TaskManager * param0) +static BOOL sub_020529C4(TaskManager *param0) { - UnkStruct_02052AA4 * v0 = TaskManager_Environment(param0); + UnkStruct_02052AA4 *v0 = TaskManager_Environment(param0); switch (v0->unk_00) { case 0: @@ -186,10 +184,10 @@ static BOOL sub_020529C4 (TaskManager * param0) return 0; } -static void sub_02052AA4 (UnkStruct_02052AA4 * param0, u16 param1, u8 param2, u8 param3) +static void sub_02052AA4(UnkStruct_02052AA4 *param0, u16 param1, u8 param2, u8 param3) { - Strbuf* v0 = Strbuf_Init(1024, 11); - Strbuf* v1 = Strbuf_Init(1024, 11); + Strbuf *v0 = Strbuf_Init(1024, 11); + Strbuf *v1 = Strbuf_Init(1024, 11); BGL_FillWindow(¶m0->unk_0C, 0); MessageLoader_GetStrbuf(param0->unk_1C, param1, v0); @@ -200,24 +198,23 @@ static void sub_02052AA4 (UnkStruct_02052AA4 * param0, u16 param1, u8 param2, u8 param2 = (u8)(param0->unk_0C.unk_07 * 8 - v2) / 2 - 4; } - sub_0201D78C(¶m0->unk_0C, 0, v1, param2, param3, 0xff, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0))), NULL); + sub_0201D78C(¶m0->unk_0C, 0, v1, param2, param3, 0xff, (u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); Strbuf_Free(v0); Strbuf_Free(v1); return; } -BOOL sub_02052B2C (TaskManager * param0) +BOOL sub_02052B2C(TaskManager *param0) { - FieldSystem * fieldSystem; - int * v1; + FieldSystem *fieldSystem; + int *v1; fieldSystem = TaskManager_FieldSystem(param0); v1 = FieldTask_GetState(param0); switch (*v1) { - case 0: - { + case 0: { if ((fieldSystem != NULL) && (fieldSystem->saveData != NULL)) { Party_SetGiratinaForm(Party_GetFromSavedata(fieldSystem->saveData), 0); } @@ -225,7 +222,7 @@ BOOL sub_02052B2C (TaskManager * param0) { Location v2; - FieldOverworldState * v3 = SaveData_GetFieldOverworldState(fieldSystem->saveData); + FieldOverworldState *v3 = SaveData_GetFieldOverworldState(fieldSystem->saveData); u16 v4 = FieldOverworldState_GetWarpId(v3); sub_0203A824(v4, &v2); @@ -274,7 +271,7 @@ BOOL sub_02052B2C (TaskManager * param0) return 0; } -void sub_02052C5C (TaskManager * param0) +void sub_02052C5C(TaskManager *param0) { FieldTask_Start(param0, sub_02052B2C, NULL); } diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index 173b597c81..e2fdca1cbc 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -1,77 +1,75 @@ +#include "unk_02052C6C.h" + #include #include -#include "message.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_party_decl.h" - -#include "game_options.h" #include "struct_defs/struct_0202DF8C.h" -#include "field/field_system.h" #include "struct_defs/struct_0203E234.h" #include "struct_defs/struct_0203E274.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + +#include "field/field_system.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "savedata/save_table.h" -#include "unk_02005474.h" +#include "field_overworld_state.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" #include "message.h" #include "message_util.h" +#include "party.h" +#include "rtc.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" +#include "trainer_info.h" +#include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "rtc.h" -#include "heap.h" #include "unk_02018340.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "savedata/save_table.h" -#include "savedata.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" #include "unk_0202CD50.h" #include "unk_0202DF8C.h" -#include "field_overworld_state.h" #include "unk_0203D178.h" #include "unk_0203D1B8.h" -#include "vars_flags.h" #include "unk_020508D4.h" -#include "unk_02052C6C.h" #include "unk_02054884.h" #include "unk_020559DC.h" #include "unk_0205D8CC.h" #include "unk_0206A8DC.h" -#include "party.h" #include "unk_02096420.h" +#include "vars_flags.h" typedef struct { BOOL unk_00; UnkStruct_0203E234 unk_04; UnkStruct_0203E274 unk_10; Window unk_1C; - Strbuf* unk_2C; - void * unk_30; + Strbuf *unk_2C; + void *unk_30; int unk_34; int unk_38; } UnkStruct_0205300C; -static void sub_02052F28(FieldSystem * fieldSystem, UnkStruct_0205300C * param1); -static void sub_02052FA8(FieldSystem * fieldSystem, UnkStruct_0205300C * param1); -static void sub_02053028(FieldSystem * fieldSystem, UnkStruct_0205300C * param1, int param2); -static void sub_0205300C(UnkStruct_0205300C * param0); -static void sub_02053098(FieldSystem * fieldSystem, UnkStruct_0205300C * param1); -static BOOL sub_02052FFC(UnkStruct_0205300C * param0); +static void sub_02052F28(FieldSystem *fieldSystem, UnkStruct_0205300C *param1); +static void sub_02052FA8(FieldSystem *fieldSystem, UnkStruct_0205300C *param1); +static void sub_02053028(FieldSystem *fieldSystem, UnkStruct_0205300C *param1, int param2); +static void sub_0205300C(UnkStruct_0205300C *param0); +static void sub_02053098(FieldSystem *fieldSystem, UnkStruct_0205300C *param1); +static BOOL sub_02052FFC(UnkStruct_0205300C *param0); -static void sub_02052C6C (FieldSystem * fieldSystem, BOOL param1) +static void sub_02052C6C(FieldSystem *fieldSystem, BOOL param1) { - HallOfFame * v0; - Party * v1; + HallOfFame *v0; + Party *v1; RTCDate v2; int v3; @@ -89,14 +87,14 @@ static void sub_02052C6C (FieldSystem * fieldSystem, BOOL param1) Heap_FreeToHeap(v0); } -static BOOL sub_02052CBC (TaskManager * param0) +static BOOL sub_02052CBC(TaskManager *param0) { - Location * v0; - VarsFlags * v1; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0205300C * v3 = TaskManager_Environment(param0); - int * v4 = FieldTask_GetState(param0); - UnkStruct_0203E234 * v5 = &v3->unk_04; + Location *v0; + VarsFlags *v1; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0205300C *v3 = TaskManager_Environment(param0); + int *v4 = FieldTask_GetState(param0); + UnkStruct_0203E234 *v5 = &v3->unk_04; switch (*v4) { case 0: @@ -126,8 +124,7 @@ static BOOL sub_02052CBC (TaskManager * param0) (*v4)++; } break; - case 4: - { + case 4: { int v6; HealAllPokemonInParty(Party_GetFromSavedata(fieldSystem->saveData)); @@ -137,8 +134,7 @@ static BOOL sub_02052CBC (TaskManager * param0) sub_0205300C(v3); sub_02053028(fieldSystem, v3, v6); (*v4)++; - } - break; + } break; case 5: if (sub_02052FFC(v3)) { Sound_PlayEffect(1563); @@ -177,15 +173,15 @@ static BOOL sub_02052CBC (TaskManager * param0) return 0; } -void sub_02052E58 (TaskManager * param0) +void sub_02052E58(TaskManager *param0) { - FieldSystem * fieldSystem; - Location * v1, * v2; - VarsFlags * v3; - TrainerInfo * v4; - UnkStruct_0205300C * v5; - UnkStruct_0202CD88 * v6; - Party * v7; + FieldSystem *fieldSystem; + Location *v1, *v2; + VarsFlags *v3; + TrainerInfo *v4; + UnkStruct_0205300C *v5; + UnkStruct_0202CD88 *v6; + Party *v7; fieldSystem = TaskManager_FieldSystem(param0); v5 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0205300C)); @@ -217,11 +213,11 @@ void sub_02052E58 (TaskManager * param0) v6 = sub_0202CD88(fieldSystem->saveData); - sub_0202CF28(v6, (((70 + 1)) + 2)); + sub_0202CF28(v6, ((70 + 1) + 2)); FieldTask_Start(param0, sub_02052CBC, v5); } -static void sub_02052F28 (FieldSystem * fieldSystem, UnkStruct_0205300C * param1) +static void sub_02052F28(FieldSystem *fieldSystem, UnkStruct_0205300C *param1) { static const UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_B, @@ -273,9 +269,9 @@ static void sub_02052F28 (FieldSystem * fieldSystem, UnkStruct_0205300C * param1 sub_02019448(fieldSystem->unk_08, 3); } -static void sub_02052FA8 (FieldSystem * fieldSystem, UnkStruct_0205300C * param1) +static void sub_02052FA8(FieldSystem *fieldSystem, UnkStruct_0205300C *param1) { - Options * v0 = SaveData_Options(fieldSystem->saveData); + Options *v0 = SaveData_Options(fieldSystem->saveData); param1->unk_2C = MessageBank_GetNewStrbufFromNARC(26, 213, 15, 32); @@ -286,24 +282,24 @@ static void sub_02052FA8 (FieldSystem * fieldSystem, UnkStruct_0205300C * param1 param1->unk_30 = sub_0200E7FC(¶m1->unk_1C, 1024 - (18 + 12)); } -static BOOL sub_02052FFC (UnkStruct_0205300C * param0) +static BOOL sub_02052FFC(UnkStruct_0205300C *param0) { return FieldMessage_FinishedPrinting(param0->unk_34); } -static void sub_0205300C (UnkStruct_0205300C * param0) +static void sub_0205300C(UnkStruct_0205300C *param0) { Strbuf_Free(param0->unk_2C); DeleteWaitDial(param0->unk_30); sub_0205D988(¶m0->unk_1C); } -static void sub_02053028 (FieldSystem * fieldSystem, UnkStruct_0205300C * param1, int param2) +static void sub_02053028(FieldSystem *fieldSystem, UnkStruct_0205300C *param1, int param2) { - MessageLoader * v0 = MessageLoader_Init(1, 26, 213, 4); + MessageLoader *v0 = MessageLoader_Init(1, 26, 213, 4); if (param2 == 2) { - StringTemplate * v1; + StringTemplate *v1; v1 = StringTemplate_Default(4); StringTemplate_SetPlayerName(v1, 0, SaveData_GetTrainerInfo(fieldSystem->saveData)); @@ -317,7 +313,7 @@ static void sub_02053028 (FieldSystem * fieldSystem, UnkStruct_0205300C * param1 param1->unk_34 = FieldMessage_Print(¶m1->unk_1C, param1->unk_2C, SaveData_Options(fieldSystem->saveData), 1); } -static void sub_02053098 (FieldSystem * fieldSystem, UnkStruct_0205300C * param1) +static void sub_02053098(FieldSystem *fieldSystem, UnkStruct_0205300C *param1) { if (param1->unk_2C) { Strbuf_Free(param1->unk_2C); diff --git a/src/unk_02054884.c b/src/unk_02054884.c index 40e47f3733..6723d4e636 100644 --- a/src/unk_02054884.c +++ b/src/unk_02054884.c @@ -1,20 +1,22 @@ +#include "unk_02054884.h" + #include #include #include "struct_decls/struct_party_decl.h" -#include "savedata.h" -#include "unk_02017038.h" +#include "overlay005/ov5_021E622C.h" + #include "heap.h" -#include "unk_02025E08.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" #include "trainer_info.h" +#include "unk_02017038.h" +#include "unk_02025E08.h" #include "unk_0202F180.h" -#include "unk_02054884.h" -#include "pokemon.h" -#include "party.h" -#include "overlay005/ov5_021E622C.h" -BOOL Pokemon_CanBattle (Pokemon *mon) +BOOL Pokemon_CanBattle(Pokemon *mon) { // this can be simplified further, but it won't match if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) == 0) { @@ -24,13 +26,13 @@ BOOL Pokemon_CanBattle (Pokemon *mon) return !Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL); } -BOOL sub_020548B0 (int param0, SaveData * param1, u16 param2, u8 param3, u16 param4, int param5, int param6) +BOOL sub_020548B0(int param0, SaveData *param1, u16 param2, u8 param3, u16 param4, int param5, int param6) { BOOL v0; - Pokemon * v1; + Pokemon *v1; u32 v2; - Party * v3; - TrainerInfo * v4; + Party *v3; + TrainerInfo *v4; v4 = SaveData_GetTrainerInfo(param1); v3 = Party_GetFromSavedata(param1); @@ -53,13 +55,13 @@ BOOL sub_020548B0 (int param0, SaveData * param1, u16 param2, u8 param3, u16 par return v0; } -BOOL sub_02054930 (int param0, SaveData * param1, u16 param2, u8 param3, int param4, int param5) +BOOL sub_02054930(int param0, SaveData *param1, u16 param2, u8 param3, int param4, int param5) { int v0; BOOL v1; - TrainerInfo * v2 = SaveData_GetTrainerInfo(param1); - Party * v3 = Party_GetFromSavedata(param1); - Pokemon * v4 = Pokemon_New(32); + TrainerInfo *v2 = SaveData_GetTrainerInfo(param1); + Party *v3 = Party_GetFromSavedata(param1); + Pokemon *v4 = Pokemon_New(32); Pokemon_Init(v4); @@ -72,14 +74,14 @@ BOOL sub_02054930 (int param0, SaveData * param1, u16 param2, u8 param3, int par return v1; } -void sub_02054988 (Party * param0, int param1, int param2, u16 param3) +void sub_02054988(Party *param0, int param1, int param2, u16 param3) { Pokemon_ResetMoveSlot(Party_GetPokemonBySlotIndex(param0, param1), param3, param2); } // In many of the functions below, C99-style iterator declaration doesn't match -int Party_HasMonWithMove (Party *party, u16 moveID) +int Party_HasMonWithMove(Party *party, u16 moveID) { int i; int partyCount = Party_GetCurrentCount(party); @@ -91,7 +93,7 @@ int Party_HasMonWithMove (Party *party, u16 moveID) continue; } - if (Pokemon_GetValue(mon, MON_DATA_MOVE1, NULL) == moveID + if (Pokemon_GetValue(mon, MON_DATA_MOVE1, NULL) == moveID || Pokemon_GetValue(mon, MON_DATA_MOVE2, NULL) == moveID || Pokemon_GetValue(mon, MON_DATA_MOVE3, NULL) == moveID || Pokemon_GetValue(mon, MON_DATA_MOVE4, NULL) == moveID) { @@ -102,7 +104,7 @@ int Party_HasMonWithMove (Party *party, u16 moveID) return PARTY_SLOT_NONE; } -int Party_AliveMonsCount (const Party *party) +int Party_AliveMonsCount(const Party *party) { int i; int partyCount = Party_GetCurrentCount(party); @@ -117,7 +119,7 @@ int Party_AliveMonsCount (const Party *party) return count; } -Pokemon * Party_FindFirstEligibleBattler (const Party *party) +Pokemon *Party_FindFirstEligibleBattler(const Party *party) { int i; int partyCount = Party_GetCurrentCount(party); @@ -134,7 +136,7 @@ Pokemon * Party_FindFirstEligibleBattler (const Party *party) return NULL; } -Pokemon * Party_FindFirstHatchedMon (const Party *party) +Pokemon *Party_FindFirstHatchedMon(const Party *party) { u16 i; u16 partyCount = Party_GetCurrentCount(party); @@ -150,12 +152,12 @@ Pokemon * Party_FindFirstHatchedMon (const Party *party) return NULL; } -BOOL Party_HasTwoAliveMons (const Party *party) +BOOL Party_HasTwoAliveMons(const Party *party) { return Party_AliveMonsCount(party) >= 2; } -void Party_GiveChampionRibbons (Party *party) +void Party_GiveChampionRibbons(Party *party) { int i; u8 championRibbon = TRUE; @@ -170,12 +172,12 @@ void Party_GiveChampionRibbons (Party *party) } } -int sub_02054B04 (Party * param0, u16 param1) +int sub_02054B04(Party *param0, u16 param1) { int v0 = 0; int v1 = 0; int v2, v3; - Pokemon * v4; + Pokemon *v4; v3 = Party_GetCurrentCount(param0); @@ -211,7 +213,7 @@ int sub_02054B04 (Party * param0, u16 param1) } } -BOOL sub_02054B94 (Pokemon * param0) +BOOL sub_02054B94(Pokemon *param0) { if ((Pokemon_GetValue(param0, MON_DATA_STATUS_CONDITION, NULL) & (0x80 | 0x8)) && (Pokemon_GetValue(param0, MON_DATA_CURRENT_HP, NULL) == 1)) { u32 v0 = 0; diff --git a/src/unk_02054BD0.c b/src/unk_02054BD0.c index dd6d4172e7..f5d981a7c8 100644 --- a/src/unk_02054BD0.c +++ b/src/unk_02054BD0.c @@ -1,3 +1,5 @@ +#include "unk_02054BD0.h" + #include #include @@ -6,23 +8,22 @@ #include "field/field_system.h" -#include "narc.h" #include "heap.h" +#include "narc.h" #include "unk_02039C80.h" -#include "unk_02054BD0.h" typedef struct UnkStruct_02054C18_t { u8 unk_00[225]; u16 unk_E2[16384]; } UnkStruct_02054C18; -static void sub_02054C18(UnkStruct_02039E30 * param0, UnkStruct_02054C18 * param1, const u8 param2); -static const u8 sub_02054CC4(const u16 param0, u16 * param1, u8 * param2); +static void sub_02054C18(UnkStruct_02039E30 *param0, UnkStruct_02054C18 *param1, const u8 param2); +static const u8 sub_02054CC4(const u16 param0, u16 *param1, u8 *param2); -void sub_02054BD0 (FieldSystem * fieldSystem, const u8 param1) +void sub_02054BD0(FieldSystem *fieldSystem, const u8 param1) { int v0; - void * v1; + void *v1; if (fieldSystem->unk_58 == NULL) { fieldSystem->unk_58 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02054C18)); @@ -31,7 +32,7 @@ void sub_02054BD0 (FieldSystem * fieldSystem, const u8 param1) } } -void sub_02054BF8 (FieldSystem * fieldSystem) +void sub_02054BF8(FieldSystem *fieldSystem) { if (fieldSystem->unk_58 != NULL) { Heap_FreeToHeap(fieldSystem->unk_58); @@ -39,9 +40,9 @@ void sub_02054BF8 (FieldSystem * fieldSystem) } } -u16 const * sub_02054C0C (const u32 param0, const UnkStruct_02054C18 * param1) +u16 const *sub_02054C0C(const u32 param0, const UnkStruct_02054C18 *param1) { - u16 const * v0; + u16 const *v0; u8 v1; v1 = param1->unk_00[param0]; @@ -50,7 +51,7 @@ u16 const * sub_02054C0C (const u32 param0, const UnkStruct_02054C18 * param1) return v0; } -static void sub_02054C18 (UnkStruct_02039E30 * param0, UnkStruct_02054C18 * param1, const u8 param2) +static void sub_02054C18(UnkStruct_02039E30 *param0, UnkStruct_02054C18 *param1, const u8 param2) { u8 v0; u16 v1; @@ -59,8 +60,8 @@ static void sub_02054C18 (UnkStruct_02039E30 * param0, UnkStruct_02054C18 * para int v4, v5; int v6, v7; u16 v8[16]; - void * v9; - NARC * v10; + void *v9; + NARC *v10; v0 = 0; v7 = sub_02039E10(param0); @@ -87,7 +88,7 @@ static void sub_02054C18 (UnkStruct_02039E30 * param0, UnkStruct_02054C18 * para NARC_dtor(v10); } -static const u8 sub_02054CC4 (const u16 param0, u16 * param1, u8 * param2) +static const u8 sub_02054CC4(const u16 param0, u16 *param1, u8 *param2) { u8 v0; diff --git a/src/unk_02054D00.c b/src/unk_02054D00.c index fe338b7ced..bd8b064358 100644 --- a/src/unk_02054D00.c +++ b/src/unk_02054D00.c @@ -1,37 +1,38 @@ +#include "unk_02054D00.h" + #include #include +#include "struct_defs/struct_02055130.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021E779C.h" +#include "overlay005/ov5_021EEC68.h" +#include "overlay005/ov5_021EF250.h" #include "overlay005/struct_ov5_021E1608_decl.h" #include "overlay005/struct_ov5_021E1890_decl.h" #include "overlay005/struct_ov5_021E8F60_decl.h" #include "overlay005/struct_ov5_021EF13C_decl.h" -#include "field/field_system.h" -#include "struct_defs/struct_02055130.h" - #include "unk_02039C80.h" #include "unk_02054BD0.h" -#include "unk_02054D00.h" #include "unk_0205DAC8.h" #include "unk_02068344.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021E779C.h" -#include "overlay005/ov5_021EEC68.h" -#include "overlay005/ov5_021EF250.h" -typedef const fx32 (* UnkFuncPtr_02054F44)(const FieldSystem *, const fx32, const fx32, const fx32, u8 *); -typedef BOOL (* UnkFuncPtr_02054F44_1)(const FieldSystem *, const int, const int, u16 *); +typedef const fx32 (*UnkFuncPtr_02054F44)(const FieldSystem *, const fx32, const fx32, const fx32, u8 *); +typedef BOOL (*UnkFuncPtr_02054F44_1)(const FieldSystem *, const int, const int, u16 *); typedef struct UnkStruct_02054F44_t { UnkFuncPtr_02054F44 unk_00; UnkFuncPtr_02054F44_1 unk_04; } UnkStruct_02054F44; -static const fx32 sub_02054D0C(const FieldSystem * fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4); -static const fx32 sub_02054E50(const FieldSystem * fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4); -static BOOL sub_02054E84(const FieldSystem * fieldSystem, const int param1, const int param2, u16 * param3); -static BOOL sub_02054EF4(const FieldSystem * fieldSystem, const int param1, const int param2, u16 * param3); -static int sub_02054FD0(const FieldSystem * fieldSystem, const VecFx32 * param1, const int param2, const int param3, u8 * param4); +static const fx32 sub_02054D0C(const FieldSystem *fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 *param4); +static const fx32 sub_02054E50(const FieldSystem *fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 *param4); +static BOOL sub_02054E84(const FieldSystem *fieldSystem, const int param1, const int param2, u16 *param3); +static BOOL sub_02054EF4(const FieldSystem *fieldSystem, const int param1, const int param2, u16 *param3); +static int sub_02054FD0(const FieldSystem *fieldSystem, const VecFx32 *param1, const int param2, const int param3, u8 *param4); static const UnkStruct_02054F44 Unk_020EC3D0 = { sub_02054D0C, @@ -43,7 +44,7 @@ static const UnkStruct_02054F44 Unk_020EC3D8 = { sub_02054EF4 }; -static fx32 sub_02054D00 (const fx32 param0, const fx32 param1) +static fx32 sub_02054D00(const fx32 param0, const fx32 param1) { fx32 v0; @@ -56,7 +57,7 @@ static fx32 sub_02054D00 (const fx32 param0, const fx32 param1) return v0; } -static const fx32 sub_02054D0C (const FieldSystem * fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4) +static const fx32 sub_02054D0C(const FieldSystem *fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 *param4) { BOOL v0, v1; u8 v2; @@ -72,7 +73,7 @@ static const fx32 sub_02054D0C (const FieldSystem * fieldSystem, const fx32 para fx32 v15; fx32 v16; VecFx32 v17; - const UnkStruct_ov5_021E8F60 * v18 = fieldSystem->unk_28; + const UnkStruct_ov5_021E8F60 *v18 = fieldSystem->unk_28; ov5_021EA6BC(v18, &v17); @@ -111,7 +112,7 @@ static const fx32 sub_02054D0C (const FieldSystem * fieldSystem, const fx32 para v1 = 0; } else { { - const UnkStruct_ov5_021EF13C * v21 = ov5_021E9610(v18, v8); + const UnkStruct_ov5_021EF13C *v21 = ov5_021E9610(v18, v8); v1 = ov5_021EED9C(v16, v11.x, v11.z, v21, &v11.y); } } @@ -162,7 +163,7 @@ static const fx32 sub_02054D0C (const FieldSystem * fieldSystem, const fx32 para return v15; } -static const fx32 sub_02054E50 (const FieldSystem * fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4) +static const fx32 sub_02054E50(const FieldSystem *fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 *param4) { BOOL v0; int v1, v2; @@ -188,14 +189,14 @@ static const fx32 sub_02054E50 (const FieldSystem * fieldSystem, const fx32 para return v3; } -static BOOL sub_02054E84 (const FieldSystem * fieldSystem, const int param1, const int param2, u16 * param3) +static BOOL sub_02054E84(const FieldSystem *fieldSystem, const int param1, const int param2, u16 *param3) { BOOL v0; u32 v1, v2; u32 v3; u8 v4; int v5, v6; - const UnkStruct_ov5_021E8F60 * v7 = fieldSystem->unk_28; + const UnkStruct_ov5_021E8F60 *v7 = fieldSystem->unk_28; u32 v8; u8 v9; @@ -214,7 +215,7 @@ static BOOL sub_02054E84 (const FieldSystem * fieldSystem, const int param1, con { u32 v11; - u16 const * v12; + u16 const *v12; v11 = (v6 % 32) * 32 + (v5 % 32); @@ -226,7 +227,7 @@ static BOOL sub_02054E84 (const FieldSystem * fieldSystem, const int param1, con } } -static BOOL sub_02054EF4 (const FieldSystem * fieldSystem, const int param1, const int param2, u16 * param3) +static BOOL sub_02054EF4(const FieldSystem *fieldSystem, const int param1, const int param2, u16 *param3) { BOOL v0; u32 v1, v2; @@ -238,7 +239,7 @@ static BOOL sub_02054EF4 (const FieldSystem * fieldSystem, const int param1, con { int v7; int v8; - const UnkStruct_ov5_021E8F60 * v9 = fieldSystem->unk_28; + const UnkStruct_ov5_021E8F60 *v9 = fieldSystem->unk_28; v7 = sub_02039E10(fieldSystem->unk_2C); v8 = v7 * 32; @@ -248,7 +249,7 @@ static BOOL sub_02054EF4 (const FieldSystem * fieldSystem, const int param1, con { u32 v10; - u16 const * v11; + u16 const *v11; v10 = (param2 % 32) * 32 + (param1 % 32); @@ -260,7 +261,7 @@ static BOOL sub_02054EF4 (const FieldSystem * fieldSystem, const int param1, con } } -void sub_02054F44 (const UnkStruct_02054F44 ** param0, int param1) +void sub_02054F44(const UnkStruct_02054F44 **param0, int param1) { if (param1 == 0) { *param0 = &Unk_020EC3D0; @@ -271,7 +272,7 @@ void sub_02054F44 (const UnkStruct_02054F44 ** param0, int param1) } } -BOOL FieldSystem_CheckCollision (const FieldSystem * fieldSystem, const int param1, const int param2) +BOOL FieldSystem_CheckCollision(const FieldSystem *fieldSystem, const int param1, const int param2) { BOOL v0; u16 v1; @@ -292,7 +293,7 @@ BOOL FieldSystem_CheckCollision (const FieldSystem * fieldSystem, const int para return 0; } -u8 sub_02054F94 (const FieldSystem * fieldSystem, const int param1, const int param2) +u8 sub_02054F94(const FieldSystem *fieldSystem, const int param1, const int param2) { BOOL v0; u16 v1; @@ -311,7 +312,7 @@ u8 sub_02054F94 (const FieldSystem * fieldSystem, const int param1, const int pa return 0xff; } -const fx32 sub_02054FBC (const FieldSystem * fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4) +const fx32 sub_02054FBC(const FieldSystem *fieldSystem, const fx32 param1, const fx32 param2, const fx32 param3, u8 *param4) { BOOL v0; fx32 v1; @@ -321,7 +322,7 @@ const fx32 sub_02054FBC (const FieldSystem * fieldSystem, const fx32 param1, con return v1; } -static int sub_02054FD0 (const FieldSystem * fieldSystem, const VecFx32 * param1, const int param2, const int param3, u8 * param4) +static int sub_02054FD0(const FieldSystem *fieldSystem, const VecFx32 *param1, const int param2, const int param3, u8 *param4) { int v0; fx32 v1, v2; @@ -355,7 +356,7 @@ static int sub_02054FD0 (const FieldSystem * fieldSystem, const VecFx32 * param1 return v0; } -BOOL sub_02055024 (const FieldSystem * fieldSystem, const VecFx32 * param1, const int param2, const int param3, s8 * param4) +BOOL sub_02055024(const FieldSystem *fieldSystem, const VecFx32 *param1, const int param2, const int param3, s8 *param4) { int v0; u8 v1; @@ -385,7 +386,7 @@ BOOL sub_02055024 (const FieldSystem * fieldSystem, const VecFx32 * param1, cons } } -BOOL sub_0205507C (FieldSystem * fieldSystem, const VecFx32 * param1, const int param2, const int param3, s8 * param4) +BOOL sub_0205507C(FieldSystem *fieldSystem, const VecFx32 *param1, const int param2, const int param3, s8 *param4) { int v0; u8 v1; @@ -422,7 +423,7 @@ BOOL sub_0205507C (FieldSystem * fieldSystem, const VecFx32 * param1, const int } } -void sub_020550F4 (const int param0, const int param1, const int param2, const int param3, const u32 param4, const u32 param5, UnkStruct_02055130 * param6) +void sub_020550F4(const int param0, const int param1, const int param2, const int param3, const u32 param4, const u32 param5, UnkStruct_02055130 *param6) { int v0, v1, v2, v3; @@ -442,7 +443,7 @@ void sub_020550F4 (const int param0, const int param1, const int param2, const i param6->unk_0C = v3 * 16 * FX32_ONE; } -BOOL sub_02055130 (const UnkStruct_ov5_021E1890 * param0, const UnkStruct_02055130 * param1, const VecFx32 * param2) +BOOL sub_02055130(const UnkStruct_ov5_021E1890 *param0, const UnkStruct_02055130 *param1, const VecFx32 *param2) { VecFx32 v0; @@ -458,10 +459,10 @@ BOOL sub_02055130 (const UnkStruct_ov5_021E1890 * param0, const UnkStruct_020551 return 0; } -BOOL sub_02055178 (const FieldSystem * fieldSystem, const int param1, const UnkStruct_02055130 * param2, UnkStruct_ov5_021E1890 ** param3) +BOOL sub_02055178(const FieldSystem *fieldSystem, const int param1, const UnkStruct_02055130 *param2, UnkStruct_ov5_021E1890 **param3) { u8 v0; - UnkStruct_ov5_021E1608 * v1; + UnkStruct_ov5_021E1608 *v1; for (v0 = 0; v0 < 4; v0++) { ov5_021E9340(v0, fieldSystem->unk_28, &v1); @@ -483,7 +484,7 @@ BOOL sub_02055178 (const FieldSystem * fieldSystem, const int param1, const UnkS sub_020553A4(v4, v5, &v3); for (v2 = 0; v2 < 32; v2++) { - UnkStruct_ov5_021E1890 * v7; + UnkStruct_ov5_021E1890 *v7; v7 = ov5_021E18C4(v1, v2); v6 = sub_02055130(v7, param2, &v3); @@ -508,10 +509,10 @@ BOOL sub_02055178 (const FieldSystem * fieldSystem, const int param1, const UnkS return 0; } -BOOL sub_02055208 (const FieldSystem * fieldSystem, const int * param1, const u8 param2, const UnkStruct_02055130 * param3, UnkStruct_ov5_021E1890 ** param4, int * param5) +BOOL sub_02055208(const FieldSystem *fieldSystem, const int *param1, const u8 param2, const UnkStruct_02055130 *param3, UnkStruct_ov5_021E1890 **param4, int *param5) { u8 v0; - UnkStruct_ov5_021E1608 * v1; + UnkStruct_ov5_021E1608 *v1; for (v0 = 0; v0 < 4; v0++) { ov5_021E9340(v0, fieldSystem->unk_28, &v1); @@ -533,7 +534,7 @@ BOOL sub_02055208 (const FieldSystem * fieldSystem, const int * param1, const u8 sub_020553A4(v4, v5, &v3); for (v2 = 0; v2 < 32; v2++) { - UnkStruct_ov5_021E1890 * v7; + UnkStruct_ov5_021E1890 *v7; v7 = ov5_021E18C4(v1, v2); v6 = sub_02055130(v7, param3, &v3); @@ -565,10 +566,10 @@ BOOL sub_02055208 (const FieldSystem * fieldSystem, const int * param1, const u8 return 0; } -BOOL sub_020552B4 (const FieldSystem * fieldSystem, const int param1, UnkStruct_ov5_021E1890 ** param2, int * param3) +BOOL sub_020552B4(const FieldSystem *fieldSystem, const int param1, UnkStruct_ov5_021E1890 **param2, int *param3) { u8 v0; - UnkStruct_ov5_021E1608 * v1; + UnkStruct_ov5_021E1608 *v1; for (v0 = 0; v0 < 4; v0++) { ov5_021E9340(v0, fieldSystem->unk_28, &v1); @@ -581,7 +582,7 @@ BOOL sub_020552B4 (const FieldSystem * fieldSystem, const int param1, UnkStruct_ u8 v2; for (v2 = 0; v2 < 32; v2++) { - UnkStruct_ov5_021E1890 * v3; + UnkStruct_ov5_021E1890 *v3; v3 = ov5_021E18C4(v1, v2); { @@ -609,10 +610,10 @@ BOOL sub_020552B4 (const FieldSystem * fieldSystem, const int param1, UnkStruct_ return 0; } -BOOL sub_02055324 (const FieldSystem * fieldSystem, const int * param1, const u8 param2, UnkStruct_ov5_021E1890 ** param3, int * param4) +BOOL sub_02055324(const FieldSystem *fieldSystem, const int *param1, const u8 param2, UnkStruct_ov5_021E1890 **param3, int *param4) { u8 v0; - UnkStruct_ov5_021E1608 * v1; + UnkStruct_ov5_021E1608 *v1; for (v0 = 0; v0 < 4; v0++) { ov5_021E9340(v0, fieldSystem->unk_28, &v1); @@ -625,7 +626,7 @@ BOOL sub_02055324 (const FieldSystem * fieldSystem, const int * param1, const u8 u8 v2; for (v2 = 0; v2 < 32; v2++) { - UnkStruct_ov5_021E1890 * v3; + UnkStruct_ov5_021E1890 *v3; v3 = ov5_021E18C4(v1, v2); { @@ -655,7 +656,7 @@ BOOL sub_02055324 (const FieldSystem * fieldSystem, const int * param1, const u8 return 0; } -void sub_020553A4 (const int param0, const int param1, VecFx32 * param2) +void sub_020553A4(const int param0, const int param1, VecFx32 *param2) { u16 v0; u16 v1; diff --git a/src/unk_020553DC.c b/src/unk_020553DC.c index b4912e9c94..0790ce0ec4 100644 --- a/src/unk_020553DC.c +++ b/src/unk_020553DC.c @@ -1,23 +1,24 @@ +#include "unk_020553DC.h" + #include #include #include "struct_decls/struct_0203A790_decl.h" #include "struct_decls/struct_0205E884_decl.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" -#include "struct_defs/struct_02049FA8.h" -#include "unk_020041CC.h" -#include "unk_02005474.h" -#include "rtc.h" -#include "map_header.h" #include "field_overworld_state.h" -#include "vars_flags.h" -#include "unk_020553DC.h" +#include "map_header.h" #include "player_avatar.h" #include "pokeradar.h" -#include "unk_0206A8DC.h" +#include "rtc.h" #include "trainer_data.h" +#include "unk_020041CC.h" +#include "unk_02005474.h" +#include "unk_0206A8DC.h" +#include "vars_flags.h" const static u16 Unk_020EC3E0[][2] = { { 0x7, 0x450 }, @@ -101,16 +102,15 @@ const static u16 Unk_020EC3E0[][2] = { { 0x62, 0x458 } }; - void sub_020553DC(void); -u16 sub_02055428(FieldSystem * fieldSystem, int param1); -u16 sub_020554A4(FieldSystem * fieldSystem, int param1); -static u16 sub_020554E8(FieldSystem * fieldSystem, int param1); -BOOL sub_02055554(FieldSystem * fieldSystem, u16 param1, int param2); -static void sub_020555CC(FieldSystem * fieldSystem, int param1, int * param2, int * param3); +u16 sub_02055428(FieldSystem *fieldSystem, int param1); +u16 sub_020554A4(FieldSystem *fieldSystem, int param1); +static u16 sub_020554E8(FieldSystem *fieldSystem, int param1); +BOOL sub_02055554(FieldSystem *fieldSystem, u16 param1, int param2); +static void sub_020555CC(FieldSystem *fieldSystem, int param1, int *param2, int *param3); u16 sub_0205560C(int param0); -void sub_020553DC () +void sub_020553DC() { sub_0200569C(); sub_02004A3C(); @@ -119,31 +119,31 @@ void sub_020553DC () return; } -void sub_020553F0 (FieldSystem * fieldSystem, u16 param1) +void sub_020553F0(FieldSystem *fieldSystem, u16 param1) { - u16 * v0 = sub_0203A748(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + u16 *v0 = sub_0203A748(SaveData_GetFieldOverworldState(fieldSystem->saveData)); *v0 = param1; return; } -u16 sub_02055404 (FieldSystem * fieldSystem) +u16 sub_02055404(FieldSystem *fieldSystem) { - u16 * v0 = sub_0203A748(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + u16 *v0 = sub_0203A748(SaveData_GetFieldOverworldState(fieldSystem->saveData)); return *v0; } -void Sound_ClearSpecialBGM (FieldSystem * fieldSystem) +void Sound_ClearSpecialBGM(FieldSystem *fieldSystem) { - u16 * v0 = sub_0203A748(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + u16 *v0 = sub_0203A748(SaveData_GetFieldOverworldState(fieldSystem->saveData)); *v0 = 0; return; } -u16 sub_02055428 (FieldSystem * fieldSystem, int param1) +u16 sub_02055428(FieldSystem *fieldSystem, int param1) { - PlayerAvatar * playerAvatar; + PlayerAvatar *playerAvatar; int v1; u16 v2, v3; @@ -181,7 +181,7 @@ u16 sub_02055428 (FieldSystem * fieldSystem, int param1) return v2; } -u16 sub_020554A4 (FieldSystem * fieldSystem, int param1) +u16 sub_020554A4(FieldSystem *fieldSystem, int param1) { u16 v0, v1; @@ -206,11 +206,11 @@ u16 sub_020554A4 (FieldSystem * fieldSystem, int param1) return v0; } -static u16 sub_020554E8 (FieldSystem * fieldSystem, int param1) +static u16 sub_020554E8(FieldSystem *fieldSystem, int param1) { int v0, v1; - FieldOverworldState * v2 = SaveData_GetFieldOverworldState(fieldSystem->saveData); - Location * location = FieldOverworldState_GetPrevLocation(v2); + FieldOverworldState *v2 = SaveData_GetFieldOverworldState(fieldSystem->saveData); + Location *location = FieldOverworldState_GetPrevLocation(v2); v0 = Player_GetXPos(fieldSystem->playerAvatar); v1 = Player_GetZPos(fieldSystem->playerAvatar); @@ -236,9 +236,9 @@ static u16 sub_020554E8 (FieldSystem * fieldSystem, int param1) return 0; } -BOOL sub_02055554 (FieldSystem * fieldSystem, u16 param1, int param2) +BOOL sub_02055554(FieldSystem *fieldSystem, u16 param1, int param2) { - PlayerAvatar * playerAvatar; + PlayerAvatar *playerAvatar; int v1, v2, v3; playerAvatar = fieldSystem->playerAvatar; @@ -264,7 +264,7 @@ BOOL sub_02055554 (FieldSystem * fieldSystem, u16 param1, int param2) return 1; } -static void sub_020555CC (FieldSystem * fieldSystem, int param1, int * param2, int * param3) +static void sub_020555CC(FieldSystem *fieldSystem, int param1, int *param2, int *param3) { switch (param1) { case 0: @@ -288,7 +288,7 @@ static void sub_020555CC (FieldSystem * fieldSystem, int param1, int * param2, i return; } -u16 sub_0205560C (int param0) +u16 sub_0205560C(int param0) { u8 v0; u16 v1, v2; @@ -306,7 +306,7 @@ u16 sub_0205560C (int param0) return v1; } -void Sound_TryFadeInBGM (FieldSystem * fieldSystem, int param1) +void Sound_TryFadeInBGM(FieldSystem *fieldSystem, int param1) { if (sub_020041DC() == 1) { return; @@ -319,7 +319,7 @@ void Sound_TryFadeInBGM (FieldSystem * fieldSystem, int param1) return; } -void Sound_PlayMapBGM (FieldSystem * fieldSystem, int param1) +void Sound_PlayMapBGM(FieldSystem *fieldSystem, int param1) { u16 v0; @@ -337,7 +337,7 @@ void Sound_PlayMapBGM (FieldSystem * fieldSystem, int param1) return; } -void sub_020556A0 (FieldSystem * fieldSystem, int param1) +void sub_020556A0(FieldSystem *fieldSystem, int param1) { u16 v0; diff --git a/src/unk_020556C4.c b/src/unk_020556C4.c index 62afe6d9ca..a1d876f153 100644 --- a/src/unk_020556C4.c +++ b/src/unk_020556C4.c @@ -1,11 +1,11 @@ +#include "unk_020556C4.h" + #include #include #include "struct_defs/struct_020556C4.h" -#include "unk_020556C4.h" - -void sub_020556C4 (UnkStruct_020556C4 * param0) +void sub_020556C4(UnkStruct_020556C4 *param0) { u8 v0; @@ -21,7 +21,7 @@ void sub_020556C4 (UnkStruct_020556C4 * param0) param0->unk_05 = 0; } -void sub_020556E8 (UnkStruct_020556C4 * param0, int param1, int param2) +void sub_020556E8(UnkStruct_020556C4 *param0, int param1, int param2) { u8 v0, v1; @@ -37,7 +37,7 @@ void sub_020556E8 (UnkStruct_020556C4 * param0, int param1, int param2) } } -void sub_02055740 (UnkStruct_020556C4 * param0, int param1, int param2, int param3) +void sub_02055740(UnkStruct_020556C4 *param0, int param1, int param2, int param3) { u8 v0, v1; diff --git a/src/unk_0205578C.c b/src/unk_0205578C.c index 7c03f98785..4b2cb0d652 100644 --- a/src/unk_0205578C.c +++ b/src/unk_0205578C.c @@ -1,13 +1,14 @@ #include #include -#include "field/field_system_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "unk_020041CC.h" +#include "field/field_system_decl.h" +#include "overlay005/encounter_effect.h" + #include "heap.h" +#include "unk_020041CC.h" #include "unk_020508D4.h" -#include "overlay005/encounter_effect.h" typedef struct { int unk_00; @@ -16,12 +17,12 @@ typedef struct { int unk_0C; } UnkStruct_0205578C; -void sub_020557DC(TaskManager * param0, int param1, int param2); +void sub_020557DC(TaskManager *param0, int param1, int param2); -static BOOL sub_0205578C (TaskManager * param0) +static BOOL sub_0205578C(TaskManager *param0) { - FieldSystem * fieldSystem; - UnkStruct_0205578C * v1; + FieldSystem *fieldSystem; + UnkStruct_0205578C *v1; fieldSystem = TaskManager_FieldSystem(param0); v1 = TaskManager_Environment(param0); @@ -43,9 +44,9 @@ static BOOL sub_0205578C (TaskManager * param0) return 0; } -void sub_020557DC (TaskManager * param0, int param1, int param2) +void sub_020557DC(TaskManager *param0, int param1, int param2) { - UnkStruct_0205578C * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205578C)); + UnkStruct_0205578C *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205578C)); v0->unk_00 = 0; v0->unk_04 = 0; diff --git a/src/unk_02055808.c b/src/unk_02055808.c index ce73b24ada..6caf07500c 100644 --- a/src/unk_02055808.c +++ b/src/unk_02055808.c @@ -1,19 +1,20 @@ +#include "unk_02055808.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021DD6FC.h" -#include "unk_0200F174.h" #include "field_system.h" +#include "unk_0200F174.h" #include "unk_020508D4.h" -#include "unk_02055808.h" -#include "overlay005/ov5_021DD6FC.h" -static BOOL sub_02055808 (TaskManager * param0) +static BOOL sub_02055808(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); if (!sub_0203CD4C(fieldSystem)) { return 1; @@ -22,9 +23,9 @@ static BOOL sub_02055808 (TaskManager * param0) return 0; } -void sub_02055820 (TaskManager * param0) +void sub_02055820(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); if (!sub_0203CD4C(fieldSystem)) { GF_ASSERT(FALSE); @@ -35,9 +36,9 @@ void sub_02055820 (TaskManager * param0) FieldTask_Start(param0, sub_02055808, NULL); } -static BOOL sub_02055850 (TaskManager * param0) +static BOOL sub_02055850(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); if (sub_020509DC(fieldSystem)) { return 1; @@ -46,9 +47,9 @@ static BOOL sub_02055850 (TaskManager * param0) return 0; } -void sub_02055868 (TaskManager * param0) +void sub_02055868(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); if (sub_0203CD4C(fieldSystem)) { GF_ASSERT(FALSE); @@ -59,7 +60,7 @@ void sub_02055868 (TaskManager * param0) FieldTask_Start(param0, sub_02055850, NULL); } -static BOOL sub_02055898 (TaskManager * param0) +static BOOL sub_02055898(TaskManager *param0) { if (ScreenWipe_Done()) { return 1; @@ -68,9 +69,9 @@ static BOOL sub_02055898 (TaskManager * param0) return 0; } -void sub_020558AC (TaskManager * param0) +void sub_020558AC(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); if (!sub_0203CD4C(fieldSystem)) { GF_ASSERT(FALSE); @@ -83,9 +84,9 @@ void sub_020558AC (TaskManager * param0) } } -void sub_020558F0 (TaskManager * param0) +void sub_020558F0(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); if (!sub_0203CD4C(fieldSystem)) { GF_ASSERT(FALSE); @@ -98,9 +99,9 @@ void sub_020558F0 (TaskManager * param0) } } -static BOOL sub_02055934 (TaskManager * param0) +static BOOL sub_02055934(TaskManager *param0) { - int * v0 = FieldTask_GetState(param0); + int *v0 = FieldTask_GetState(param0); switch (*v0) { case 0: @@ -118,15 +119,15 @@ static BOOL sub_02055934 (TaskManager * param0) return 0; } -void sub_02055974 (TaskManager * param0) +void sub_02055974(TaskManager *param0) { FieldTask_Start(param0, sub_02055934, NULL); } -static BOOL sub_02055984 (TaskManager * param0) +static BOOL sub_02055984(TaskManager *param0) { - int * v0 = FieldTask_GetState(param0); - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + int *v0 = FieldTask_GetState(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); switch (*v0) { case 0: @@ -145,7 +146,7 @@ static BOOL sub_02055984 (TaskManager * param0) return 0; } -void FieldTask_StartFadeIn (TaskManager * param0) +void FieldTask_StartFadeIn(TaskManager *param0) { FieldTask_Start(param0, sub_02055984, NULL); } diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c index a27f1beec6..e34e1f17b3 100644 --- a/src/unk_020559DC.c +++ b/src/unk_020559DC.c @@ -1,44 +1,44 @@ +#include "unk_020559DC.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_party_decl.h" +#include "struct_defs/struct_02055BA8.h" #include "field/field_system.h" -#include "struct_defs/struct_02055BA8.h" +#include "savedata/save_table.h" +#include "field_system.h" +#include "inlines.h" +#include "party.h" +#include "pokemon.h" #include "rtc.h" -#include "savedata/save_table.h" #include "unk_02025CB0.h" #include "unk_0202854C.h" #include "unk_0202B37C.h" #include "unk_0202C858.h" #include "unk_0202D7A8.h" #include "unk_0202E2CC.h" -#include "field_system.h" #include "unk_0203E880.h" -#include "vars_flags.h" -#include "unk_020559DC.h" #include "unk_02055C50.h" #include "unk_0206AFE0.h" #include "unk_0206B9D8.h" #include "unk_0206C2D0.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "party.h" +#include "vars_flags.h" -static void sub_02055AC0(FieldSystem * fieldSystem, s32 param1); -static void sub_02055B64(FieldSystem * fieldSystem, s32 param1, const RTCTime * param2); -static void sub_02055A14(FieldSystem * fieldSystem, UnkStruct_02055BA8 * param1, const RTCDate * param2); -static void inline_020559DC(FieldSystem * fieldSystem, UnkStruct_02055BA8 * param1, const RTCDate * param2, const RTCTime * param3); +static void sub_02055AC0(FieldSystem *fieldSystem, s32 param1); +static void sub_02055B64(FieldSystem *fieldSystem, s32 param1, const RTCTime *param2); +static void sub_02055A14(FieldSystem *fieldSystem, UnkStruct_02055BA8 *param1, const RTCDate *param2); +static void inline_020559DC(FieldSystem *fieldSystem, UnkStruct_02055BA8 *param1, const RTCDate *param2, const RTCTime *param3); -void sub_020559DC (FieldSystem * fieldSystem) +void sub_020559DC(FieldSystem *fieldSystem) { RTCDate v0; RTCTime v1; - UnkStruct_02055BA8 * v2 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v2 = sub_02025CD8(fieldSystem->saveData); if (v2->unk_00 == 0) { return; @@ -50,7 +50,7 @@ void sub_020559DC (FieldSystem * fieldSystem) inline_020559DC(fieldSystem, v2, &v0, &v1); } -static void sub_02055A14 (FieldSystem * fieldSystem, UnkStruct_02055BA8 * param1, const RTCDate * param2) +static void sub_02055A14(FieldSystem *fieldSystem, UnkStruct_02055BA8 *param1, const RTCDate *param2) { s32 v0; @@ -64,7 +64,7 @@ static void sub_02055A14 (FieldSystem * fieldSystem, UnkStruct_02055BA8 * param1 } } -static void inline_020559DC (FieldSystem * fieldSystem, UnkStruct_02055BA8 * param1, const RTCDate * param2, const RTCTime * param3) +static void inline_020559DC(FieldSystem *fieldSystem, UnkStruct_02055BA8 *param1, const RTCDate *param2, const RTCTime *param3) { s64 v0, v1; s32 v2; @@ -88,7 +88,7 @@ static void inline_020559DC (FieldSystem * fieldSystem, UnkStruct_02055BA8 * par } } -static void sub_02055AC0 (FieldSystem * fieldSystem, s32 param1) +static void sub_02055AC0(FieldSystem *fieldSystem, s32 param1) { sub_02028658(FieldSystem_SaveData(fieldSystem), param1); sub_0203F1FC(fieldSystem); @@ -97,14 +97,14 @@ static void sub_02055AC0 (FieldSystem * fieldSystem, s32 param1) sub_0202D80C(sub_0202D834(fieldSystem->saveData), sub_0202B428(sub_0202B4A0(fieldSystem->saveData))); { - Party * v0; + Party *v0; v0 = Party_GetFromSavedata(fieldSystem->saveData); Party_UpdatePokerusStatus(v0, param1); } { - VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v1 = SaveData_GetVarsFlags(fieldSystem->saveData); u16 v2 = sub_0206B260(v1); if (v2 > param1) { @@ -131,82 +131,82 @@ static void sub_02055AC0 (FieldSystem * fieldSystem, s32 param1) sub_0206F2F0(fieldSystem->saveData); } -static void sub_02055B64 (FieldSystem * fieldSystem, s32 param1, const RTCTime * param2) +static void sub_02055B64(FieldSystem *fieldSystem, s32 param1, const RTCTime *param2) { sub_02055CD4(fieldSystem, param1); sub_0202D854(fieldSystem->saveData, param1); sub_02028758(fieldSystem->saveData, param1, sub_02055C40(fieldSystem)); { - TVBroadcast * v0 = SaveData_TVBroadcast(fieldSystem->saveData); + TVBroadcast *v0 = SaveData_TVBroadcast(fieldSystem->saveData); sub_0202E324(v0, param1, param2->minute); } { - Party * v1; + Party *v1; v1 = Party_GetFromSavedata(fieldSystem->saveData); Party_SetShayminForm(v1, param1, param2); } } -int sub_02055BA8 (const FieldSystem * fieldSystem) +int sub_02055BA8(const FieldSystem *fieldSystem) { - UnkStruct_02055BA8 * v0 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v0 = sub_02025CD8(fieldSystem->saveData); return TimeOfDayForHour(v0->unk_14.hour); } -int sub_02055BB8 (const FieldSystem * fieldSystem) +int sub_02055BB8(const FieldSystem *fieldSystem) { - UnkStruct_02055BA8 * v0 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v0 = sub_02025CD8(fieldSystem->saveData); return v0->unk_04.month; } -int sub_02055BC4 (const FieldSystem * fieldSystem) +int sub_02055BC4(const FieldSystem *fieldSystem) { - UnkStruct_02055BA8 * v0 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v0 = sub_02025CD8(fieldSystem->saveData); return v0->unk_04.day; } -int sub_02055BD0 (const FieldSystem * fieldSystem) +int sub_02055BD0(const FieldSystem *fieldSystem) { - UnkStruct_02055BA8 * v0 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v0 = sub_02025CD8(fieldSystem->saveData); return v0->unk_04.week; } -int sub_02055BDC (const FieldSystem * fieldSystem) +int sub_02055BDC(const FieldSystem *fieldSystem) { - UnkStruct_02055BA8 * v0 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v0 = sub_02025CD8(fieldSystem->saveData); return v0->unk_14.hour; } -int sub_02055BE8 (const FieldSystem * fieldSystem) +int sub_02055BE8(const FieldSystem *fieldSystem) { - UnkStruct_02055BA8 * v0 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v0 = sub_02025CD8(fieldSystem->saveData); return v0->unk_14.minute; } -void sub_02055BF4 (const FieldSystem * fieldSystem, RTCDate * param1, RTCTime * param2) +void sub_02055BF4(const FieldSystem *fieldSystem, RTCDate *param1, RTCTime *param2) { - UnkStruct_02055BA8 * v0 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v0 = sub_02025CD8(fieldSystem->saveData); RTC_ConvertSecondToDateTime(param1, param2, v0->unk_24); } -void sub_02055C10 (const FieldSystem * fieldSystem, RTCDate * param1, RTCTime * param2) +void sub_02055C10(const FieldSystem *fieldSystem, RTCDate *param1, RTCTime *param2) { - UnkStruct_02055BA8 * v0 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v0 = sub_02025CD8(fieldSystem->saveData); RTC_ConvertSecondToDateTime(param1, param2, v0->unk_2C); } -void sub_02055C2C (const FieldSystem * fieldSystem) +void sub_02055C2C(const FieldSystem *fieldSystem) { - UnkStruct_02055BA8 * v0 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v0 = sub_02025CD8(fieldSystem->saveData); v0->unk_2C = GetTimestamp(); } -BOOL sub_02055C40 (FieldSystem * fieldSystem) +BOOL sub_02055C40(FieldSystem *fieldSystem) { - UnkStruct_02055BA8 * v0 = sub_02025CD8(fieldSystem->saveData); + UnkStruct_02055BA8 *v0 = sub_02025CD8(fieldSystem->saveData); return sub_02025DB8(v0); } diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c index c8ee2e16e6..bc38feda0f 100644 --- a/src/unk_02055C50.c +++ b/src/unk_02055C50.c @@ -1,56 +1,56 @@ +#include "unk_02055C50.h" + #include #include -#include "core_sys.h" - -#include "sys_task_manager.h" #include "struct_decls/struct_02027854_decl.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02055CBC_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021DF47C_decl.h" - #include "struct_defs/struct_02027BF4.h" + #include "field/field_system.h" #include "field/field_system_sub2_t.h" #include "overlay005/map_object_anim_cmd.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/ov5_021DFB54.h" +#include "overlay005/struct_ov5_021DF47C_decl.h" +#include "bag.h" +#include "core_sys.h" #include "heap.h" +#include "map_object.h" +#include "player_avatar.h" +#include "savedata_misc.h" +#include "sys_task_manager.h" #include "unk_0201C970.h" #include "unk_0201CED8.h" -#include "savedata_misc.h" #include "unk_02027B70.h" #include "unk_020508D4.h" #include "unk_02054D00.h" -#include "unk_02055C50.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_020655F4.h" #include "unk_020677F4.h" #include "unk_0206CCB0.h" -#include "bag.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021DFB54.h" struct UnkStruct_02055CBC_t { int unk_00; - UnkStruct_02027BF4 * unk_04; + UnkStruct_02027BF4 *unk_04; NNSG3dRenderObj unk_08; - NNSG3dResMdl * unk_5C; - NNSG3dResFileHeader * unk_60; + NNSG3dResMdl *unk_5C; + NNSG3dResFileHeader *unk_60; }; typedef struct { int unk_00; int unk_04; int unk_08; - SysTask * unk_0C; + SysTask *unk_0C; } UnkStruct_020562AC; -static void sub_02055D14(FieldSystem * fieldSystem, UnkStruct_02055CBC * param1); -static void sub_02055D48(UnkStruct_02055CBC * param0); +static void sub_02055D14(FieldSystem *fieldSystem, UnkStruct_02055CBC *param1); +static void sub_02055D48(UnkStruct_02055CBC *param0); -static u16 sub_02055C50 (int param0) +static u16 sub_02055C50(int param0) { if (param0 == 0) { return 0; @@ -59,7 +59,7 @@ static u16 sub_02055C50 (int param0) return param0 + 149 - 1; } -static u16 sub_02055C60 (int param0) +static u16 sub_02055C60(int param0) { if (param0 == 0) { return 0; @@ -68,7 +68,7 @@ static u16 sub_02055C60 (int param0) return param0 - 149 + 1; } -static u16 sub_02055C70 (int param0) +static u16 sub_02055C70(int param0) { if (param0 == 0) { return 0; @@ -77,7 +77,7 @@ static u16 sub_02055C70 (int param0) return param0 + 95 - 1; } -static int sub_02055C80 (int param0) +static int sub_02055C80(int param0) { if (param0 == 0) { return 0; @@ -86,9 +86,9 @@ static int sub_02055C80 (int param0) return param0 - 95 + 1; } -UnkStruct_02055CBC * sub_02055C8C (FieldSystem * fieldSystem, int param1) +UnkStruct_02055CBC *sub_02055C8C(FieldSystem *fieldSystem, int param1) { - UnkStruct_02055CBC * v0; + UnkStruct_02055CBC *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02055CBC)); MI_CpuClear8(v0, sizeof(UnkStruct_02055CBC)); @@ -100,17 +100,17 @@ UnkStruct_02055CBC * sub_02055C8C (FieldSystem * fieldSystem, int param1) return v0; } -void sub_02055CBC (UnkStruct_02055CBC * param0) +void sub_02055CBC(UnkStruct_02055CBC *param0) { sub_02055D48(param0); Heap_FreeToHeap(param0->unk_04); Heap_FreeToHeap(param0); } -void sub_02055CD4 (FieldSystem * fieldSystem, int param1) +void sub_02055CD4(FieldSystem *fieldSystem, int param1) { - UnkStruct_02027854 * v0; - UnkStruct_02027BF4 * v1; + UnkStruct_02027854 *v0; + UnkStruct_02027BF4 *v1; if (fieldSystem->unk_04 == NULL) { v1 = sub_02027BF4(11); @@ -124,9 +124,9 @@ void sub_02055CD4 (FieldSystem * fieldSystem, int param1) } } -static void sub_02055D14 (FieldSystem * fieldSystem, UnkStruct_02055CBC * param1) +static void sub_02055D14(FieldSystem *fieldSystem, UnkStruct_02055CBC *param1) { - UnkStruct_ov5_021DF47C * v0 = fieldSystem->unk_40; + UnkStruct_ov5_021DF47C *v0 = fieldSystem->unk_40; u32 v1 = ov5_021DF5A8(v0, 17); param1->unk_60 = Heap_AllocFromHeap(param1->unk_00, v1); @@ -135,14 +135,14 @@ static void sub_02055D14 (FieldSystem * fieldSystem, UnkStruct_02055CBC * param1 sub_0201CA3C(¶m1->unk_08, ¶m1->unk_5C, ¶m1->unk_60); } -static void sub_02055D48 (UnkStruct_02055CBC * param0) +static void sub_02055D48(UnkStruct_02055CBC *param0) { ov5_021DF554(param0->unk_60); } -static BOOL sub_02055D54 (FieldSystem * fieldSystem, const VecFx32 * param1) +static BOOL sub_02055D54(FieldSystem *fieldSystem, const VecFx32 *param1) { - const VecFx32 v0 = {FX32_ONE, FX32_ONE, FX32_ONE}; + const VecFx32 v0 = { FX32_ONE, FX32_ONE, FX32_ONE }; MtxFx33 v1; MTX_Identity33(&v1); @@ -154,11 +154,11 @@ static BOOL sub_02055D54 (FieldSystem * fieldSystem, const VecFx32 * param1) } } -void sub_02055D94 (FieldSystem * fieldSystem) +void sub_02055D94(FieldSystem *fieldSystem) { int v0 = 0; - MapObject * v1; - UnkStruct_02027854 * v2 = sub_02027854(fieldSystem->saveData); + MapObject *v1; + UnkStruct_02027854 *v2 = sub_02027854(fieldSystem->saveData); while (sub_020625B0(fieldSystem->mapObjMan, &v1, &v0, (1 << 0)) == 1) { if (sub_020677F4(sub_02062920(v1)) == 1) { @@ -170,10 +170,10 @@ void sub_02055D94 (FieldSystem * fieldSystem) } } -BOOL sub_02055E00 (FieldSystem * fieldSystem, MapObject * param1) +BOOL sub_02055E00(FieldSystem *fieldSystem, MapObject *param1) { int v0, v1, v2; - UnkStruct_02027854 * v3 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v3 = sub_02027854(fieldSystem->saveData); v0 = sub_020629D8(param1, 0); v2 = sub_02027D10(v3, v0); @@ -186,88 +186,88 @@ BOOL sub_02055E00 (FieldSystem * fieldSystem, MapObject * param1) return Bag_TryAddItem(SaveData_GetBag(fieldSystem->saveData), sub_02055C50(v2), v1, 4); } -void sub_02055E80 (FieldSystem * fieldSystem, MapObject * param1, u16 param2) +void sub_02055E80(FieldSystem *fieldSystem, MapObject *param1, u16 param2) { int v0; - UnkStruct_02027854 * v1 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v1 = sub_02027854(fieldSystem->saveData); v0 = sub_020629D8(param1, 0); sub_02027DA8(v1, v0, sub_02055C80(param2)); } -void sub_02055EAC (FieldSystem * fieldSystem, MapObject * param1, u16 param2) +void sub_02055EAC(FieldSystem *fieldSystem, MapObject *param1, u16 param2) { int v0; - UnkStruct_02027854 * v1 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v1 = sub_02027854(fieldSystem->saveData); v0 = sub_020629D8(param1, 0); sub_02027D40(v1, v0, fieldSystem->unk_04->unk_18->unk_04, sub_02055C60(param2)); } -void sub_02055EE0 (FieldSystem * fieldSystem, MapObject * param1) +void sub_02055EE0(FieldSystem *fieldSystem, MapObject *param1) { int v0; - UnkStruct_02027854 * v1 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v1 = sub_02027854(fieldSystem->saveData); v0 = sub_020629D8(param1, 0); sub_02027D78(v1, v0); } -int sub_02055F00 (const FieldSystem * fieldSystem, const MapObject * param1) +int sub_02055F00(const FieldSystem *fieldSystem, const MapObject *param1) { int v0; - UnkStruct_02027854 * v1 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v1 = sub_02027854(fieldSystem->saveData); v0 = sub_020629D8(param1, 0); return sub_02027D04(v1, v0); } -int sub_02055F20 (const FieldSystem * fieldSystem, const MapObject * param1) +int sub_02055F20(const FieldSystem *fieldSystem, const MapObject *param1) { int v0; - UnkStruct_02027854 * v1 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v1 = sub_02027854(fieldSystem->saveData); v0 = sub_020629D8(param1, 0); return sub_02027D10(v1, v0); } -u16 sub_02055F40 (const FieldSystem * fieldSystem, const MapObject * param1) +u16 sub_02055F40(const FieldSystem *fieldSystem, const MapObject *param1) { int v0; - UnkStruct_02027854 * v1 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v1 = sub_02027854(fieldSystem->saveData); v0 = sub_020629D8(param1, 0); return sub_02055C50(sub_02027D10(v1, v0)); } -u16 sub_02055F64 (const FieldSystem * fieldSystem, const MapObject * param1) +u16 sub_02055F64(const FieldSystem *fieldSystem, const MapObject *param1) { int v0; - UnkStruct_02027854 * v1 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v1 = sub_02027854(fieldSystem->saveData); v0 = sub_020629D8(param1, 0); return sub_02055C70(sub_02027D9C(v1, v0)); } -int sub_02055F88 (const FieldSystem * fieldSystem, const MapObject * param1) +int sub_02055F88(const FieldSystem *fieldSystem, const MapObject *param1) { int v0; - UnkStruct_02027854 * v1 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v1 = sub_02027854(fieldSystem->saveData); v0 = sub_020629D8(param1, 0); return sub_02027D18(v1, v0); } -int sub_02055FA8 (const FieldSystem * fieldSystem, const MapObject * param1) +int sub_02055FA8(const FieldSystem *fieldSystem, const MapObject *param1) { int v0; - UnkStruct_02027854 * v1 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v1 = sub_02027854(fieldSystem->saveData); v0 = sub_020629D8(param1, 0); return sub_02027DB4(v1, v0); } -u32 sub_02055FC8 (const FieldSystem * fieldSystem, const MapObject * param1) +u32 sub_02055FC8(const FieldSystem *fieldSystem, const MapObject *param1) { u32 v0 = 0; @@ -292,16 +292,16 @@ u32 sub_02055FC8 (const FieldSystem * fieldSystem, const MapObject * param1) } static const MapObjectAnimCmd Unk_020EC51C[] = { - {0xA, 0x1}, - {0xfe, 0x0} + { 0xA, 0x1 }, + { 0xfe, 0x0 } }; static const MapObjectAnimCmd Unk_020EC524[] = { - {0xB, 0x1}, - {0xfe, 0x0} + { 0xB, 0x1 }, + { 0xfe, 0x0 } }; -static BOOL sub_02056010 (FieldSystem * fieldSystem, UnkStruct_020562AC * param1, int param2) +static BOOL sub_02056010(FieldSystem *fieldSystem, UnkStruct_020562AC *param1, int param2) { int v0, v1; @@ -327,7 +327,7 @@ static BOOL sub_02056010 (FieldSystem * fieldSystem, UnkStruct_020562AC * param1 return sub_0206326C(fieldSystem->mapObjMan, v0, v1, 0) != NULL; } -static MapObject * sub_02056074 (FieldSystem * fieldSystem, int param1) +static MapObject *sub_02056074(FieldSystem *fieldSystem, int param1) { int v0, v1; @@ -344,7 +344,7 @@ static MapObject * sub_02056074 (FieldSystem * fieldSystem, int param1) return sub_0206326C(fieldSystem->mapObjMan, v0, v1, 0); } -static MapObject * sub_020560A8 (FieldSystem * fieldSystem, UnkStruct_020562AC * param1) +static MapObject *sub_020560A8(FieldSystem *fieldSystem, UnkStruct_020562AC *param1) { int v0, v1; @@ -362,14 +362,14 @@ static MapObject * sub_020560A8 (FieldSystem * fieldSystem, UnkStruct_020562AC * return sub_0206326C(fieldSystem->mapObjMan, v0, v1, 0); } -static BOOL sub_020560E4 (MapObject * mapObj) +static BOOL sub_020560E4(MapObject *mapObj) { return sub_02062920(mapObj) == 0x64; } -static void sub_020560F8 (FieldSystem * fieldSystem, UnkStruct_020562AC * param1) +static void sub_020560F8(FieldSystem *fieldSystem, UnkStruct_020562AC *param1) { - MapObject * v0; + MapObject *v0; v0 = sub_020560A8(fieldSystem, param1); @@ -378,16 +378,16 @@ static void sub_020560F8 (FieldSystem * fieldSystem, UnkStruct_020562AC * param1 } } -static void sub_0205610C (FieldSystem * fieldSystem, UnkStruct_020562AC * param1, const MapObjectAnimCmd * param2) +static void sub_0205610C(FieldSystem *fieldSystem, UnkStruct_020562AC *param1, const MapObjectAnimCmd *param2) { - MapObject * v0 = Player_MapObject(fieldSystem->playerAvatar); + MapObject *v0 = Player_MapObject(fieldSystem->playerAvatar); param1->unk_0C = MapObject_StartAnimation(v0, param2); } -static BOOL sub_02056124 (TaskManager * taskMan) +static BOOL sub_02056124(TaskManager *taskMan) { - FieldSystem * v0 = TaskManager_FieldSystem(taskMan); - UnkStruct_020562AC * v1 = TaskManager_Environment(taskMan); + FieldSystem *v0 = TaskManager_FieldSystem(taskMan); + UnkStruct_020562AC *v1 = TaskManager_Environment(taskMan); switch (v1->unk_00) { case 0: @@ -402,7 +402,7 @@ static BOOL sub_02056124 (TaskManager * taskMan) v1->unk_00 = 2; case 2: if (gCoreSys.heldKeys & PAD_KEY_LEFT) { - MapObject * v2 = sub_02056074(v0, 2); + MapObject *v2 = sub_02056074(v0, 2); if ((v2 == NULL) || !sub_020560E4(v2)) { v1->unk_00 = 4; @@ -413,7 +413,7 @@ static BOOL sub_02056124 (TaskManager * taskMan) break; } } else if (gCoreSys.heldKeys & PAD_KEY_RIGHT) { - MapObject * v2 = sub_02056074(v0, 3); + MapObject *v2 = sub_02056074(v0, 3); if ((v2 == NULL) || !sub_020560E4(v2)) { v1->unk_00 = 4; @@ -441,7 +441,7 @@ static BOOL sub_02056124 (TaskManager * taskMan) break; case 3: if (MapObject_HasAnimationEnded(v1->unk_0C)) { - MapObject * v3; + MapObject *v3; MapObject_FinishAnimation(v1->unk_0C); v3 = sub_020560A8(v0, v1); @@ -464,9 +464,9 @@ static BOOL sub_02056124 (TaskManager * taskMan) return 0; } -void sub_020562AC (FieldSystem * fieldSystem) +void sub_020562AC(FieldSystem *fieldSystem) { - UnkStruct_020562AC * v0; + UnkStruct_020562AC *v0; v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_020562AC)); @@ -477,7 +477,7 @@ void sub_020562AC (FieldSystem * fieldSystem) FieldTask_Start(fieldSystem->unk_10, sub_02056124, v0); } -void sub_020562D8 (FieldSystem * fieldSystem) +void sub_020562D8(FieldSystem *fieldSystem) { int v0 = PlayerAvatar_GetPlayerState(fieldSystem->playerAvatar); u32 v1 = sub_0205EED8(v0); diff --git a/src/unk_020562F8.c b/src/unk_020562F8.c index a1806279a8..cc5abc332d 100644 --- a/src/unk_020562F8.c +++ b/src/unk_020562F8.c @@ -1,28 +1,28 @@ +#include "unk_020562F8.h" + #include #include -#include "inlines.h" +#include "constants/species.h" #include "struct_decls/struct_02024440_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020564B4_decl.h" -#include "pokemon.h" #include "field/field_system.h" #include "overlay006/battle_params.h" +#include "savedata/save_table.h" +#include "heap.h" +#include "inlines.h" #include "narc.h" +#include "pokemon.h" #include "rtc.h" -#include "heap.h" -#include "savedata/save_table.h" #include "unk_0202CD50.h" #include "unk_0202EEC0.h" #include "unk_02051D8C.h" #include "unk_02054D00.h" -#include "unk_020562F8.h" #include "unk_0205DAC8.h" -#include "pokemon.h" -#include "constants/species.h" typedef struct { u16 unk_00; @@ -42,23 +42,23 @@ struct UnkStruct_020564B4_t { int unk_48; }; -static void sub_0205642C(FieldSystem * fieldSystem, UnkStruct_020564B4 * param1); -static void sub_02056624(FieldSystem * fieldSystem, BattleParams * param1, UnkStruct_020564B4 * param2); -static BOOL sub_02056554(FieldSystem * fieldSystem, UnkStruct_020564B4 * param1, int param2, int param3); -static BattleParams * sub_0205664C(FieldSystem * fieldSystem, UnkStruct_020564B4 * param1); -static sub_020564B4(UnkStruct_020564B4 * param0); -static void sub_020564D0(UnkStruct_020564B4 * param0); -static BOOL sub_020564F4(UnkStruct_020564B4 * param0); -static u32 sub_020566AC(UnkStruct_020564B4 * param0); -static u32 sub_02056698(UnkStruct_020564B4 * param0); -static u32 sub_0205671C(UnkStruct_020564B4 * param0); +static void sub_0205642C(FieldSystem *fieldSystem, UnkStruct_020564B4 *param1); +static void sub_02056624(FieldSystem *fieldSystem, BattleParams *param1, UnkStruct_020564B4 *param2); +static BOOL sub_02056554(FieldSystem *fieldSystem, UnkStruct_020564B4 *param1, int param2, int param3); +static BattleParams *sub_0205664C(FieldSystem *fieldSystem, UnkStruct_020564B4 *param1); +static sub_020564B4(UnkStruct_020564B4 *param0); +static void sub_020564D0(UnkStruct_020564B4 *param0); +static BOOL sub_020564F4(UnkStruct_020564B4 *param0); +static u32 sub_020566AC(UnkStruct_020564B4 *param0); +static u32 sub_02056698(UnkStruct_020564B4 *param0); +static u32 sub_0205671C(UnkStruct_020564B4 *param0); static UnkStruct_020564B4 Unk_021C07FC; -void sub_020562F8 (FieldSystem * fieldSystem) +void sub_020562F8(FieldSystem *fieldSystem) { int v0; - UnkStruct_020564B4 * v1 = &Unk_021C07FC; + UnkStruct_020564B4 *v1 = &Unk_021C07FC; MI_CpuClearFast(v1, sizeof(UnkStruct_020564B4)); @@ -68,10 +68,10 @@ void sub_020562F8 (FieldSystem * fieldSystem) v1->unk_40 = GetTimestamp(); } -void sub_02056328 (FieldSystem * fieldSystem) +void sub_02056328(FieldSystem *fieldSystem) { - UnkStruct_020564B4 * v0 = &Unk_021C07FC; - UnkStruct_0202CD88 * v1 = sub_0202CD88(fieldSystem->saveData); + UnkStruct_020564B4 *v0 = &Unk_021C07FC; + UnkStruct_0202CD88 *v1 = sub_0202CD88(fieldSystem->saveData); s64 v2 = GetTimestamp(); s64 v3 = TimeElapsed(v0->unk_40, v2); @@ -84,7 +84,7 @@ void sub_02056328 (FieldSystem * fieldSystem) sub_0202CFEC(v1, 17); } -BOOL sub_02056374 (FieldSystem * fieldSystem, int param1, int param2) +BOOL sub_02056374(FieldSystem *fieldSystem, int param1, int param2) { if (sub_020564F4(&Unk_021C07FC) == 1) { return sub_02056554(fieldSystem, &Unk_021C07FC, param1, param2); @@ -93,37 +93,37 @@ BOOL sub_02056374 (FieldSystem * fieldSystem, int param1, int param2) } } -BattleParams * sub_0205639C (FieldSystem * fieldSystem) +BattleParams *sub_0205639C(FieldSystem *fieldSystem) { return sub_0205664C(fieldSystem, &Unk_021C07FC); } -void sub_020563AC (FieldSystem * fieldSystem, BattleParams * param1) +void sub_020563AC(FieldSystem *fieldSystem, BattleParams *param1) { sub_02056624(fieldSystem, param1, &Unk_021C07FC); } -int sub_020563BC (FieldSystem * fieldSystem) +int sub_020563BC(FieldSystem *fieldSystem) { return 6 - sub_020564B4(&Unk_021C07FC); } -int sub_020563D0 (FieldSystem * fieldSystem) +int sub_020563D0(FieldSystem *fieldSystem) { return sub_02056698(&Unk_021C07FC); } -int sub_020563E0 (FieldSystem * fieldSystem) +int sub_020563E0(FieldSystem *fieldSystem) { return sub_0205671C(&Unk_021C07FC); } -int sub_020563F0 (FieldSystem * fieldSystem) +int sub_020563F0(FieldSystem *fieldSystem) { return sub_020566AC(&Unk_021C07FC); } -static void sub_02056400 (u32 param0, u8 * param1) +static void sub_02056400(u32 param0, u8 *param1) { int v0; @@ -133,13 +133,13 @@ static void sub_02056400 (u32 param0, u8 * param1) NARC_ReadFromMemberByIndexPair(param1, NARC_INDEX_ARC__PPARK, 0, v0, sizeof(u8) * 6); } -static void sub_0205642C (FieldSystem * fieldSystem, UnkStruct_020564B4 * param1) +static void sub_0205642C(FieldSystem *fieldSystem, UnkStruct_020564B4 *param1) { int v0; u8 v1[8]; u16 v2; - Pokemon * v3; - PalParkTransfer * v4; + Pokemon *v3; + PalParkTransfer *v4; v4 = SaveData_PalParkTransfer(fieldSystem->saveData); v3 = Pokemon_New(4); @@ -168,7 +168,7 @@ static void sub_0205642C (FieldSystem * fieldSystem, UnkStruct_020564B4 * param1 Heap_FreeToHeap(v3); } -static int sub_020564B4 (UnkStruct_020564B4 * param0) +static int sub_020564B4(UnkStruct_020564B4 *param0) { int v0; int v1 = 0; @@ -182,12 +182,12 @@ static int sub_020564B4 (UnkStruct_020564B4 * param0) return v1; } -static void sub_020564D0 (UnkStruct_020564B4 * param0) +static void sub_020564D0(UnkStruct_020564B4 *param0) { param0->unk_38 = inline_020564D0(10) + 5; } -static BOOL sub_020564F4 (UnkStruct_020564B4 * param0) +static BOOL sub_020564F4(UnkStruct_020564B4 *param0) { param0->unk_38--; @@ -199,7 +199,7 @@ static BOOL sub_020564F4 (UnkStruct_020564B4 * param0) return 0; } -static int sub_0205650C (FieldSystem * fieldSystem, int param1, int param2) +static int sub_0205650C(FieldSystem *fieldSystem, int param1, int param2) { u16 v0 = sub_02054F94(fieldSystem, param1, param2); int v1; @@ -216,7 +216,7 @@ static int sub_0205650C (FieldSystem * fieldSystem, int param1, int param2) return 0; } -static BOOL sub_02056554 (FieldSystem * fieldSystem, UnkStruct_020564B4 * param1, int param2, int param3) +static BOOL sub_02056554(FieldSystem *fieldSystem, UnkStruct_020564B4 *param1, int param2, int param3) { int v0; int v1, v2 = 0; @@ -259,7 +259,7 @@ static BOOL sub_02056554 (FieldSystem * fieldSystem, UnkStruct_020564B4 * param1 return 0; } -static void sub_02056624 (FieldSystem * fieldSystem, BattleParams * param1, UnkStruct_020564B4 * param2) +static void sub_02056624(FieldSystem *fieldSystem, BattleParams *param1, UnkStruct_020564B4 *param2) { switch (param1->unk_14) { case 0x4: @@ -272,11 +272,11 @@ static void sub_02056624 (FieldSystem * fieldSystem, BattleParams * param1, UnkS } } -static BattleParams * sub_0205664C (FieldSystem * fieldSystem, UnkStruct_020564B4 * param1) +static BattleParams *sub_0205664C(FieldSystem *fieldSystem, UnkStruct_020564B4 *param1) { - BattleParams * v0; - Pokemon * v1 = Pokemon_New(32); - PalParkTransfer * v2 = SaveData_PalParkTransfer(fieldSystem->saveData); + BattleParams *v0; + Pokemon *v1 = Pokemon_New(32); + PalParkTransfer *v2 = SaveData_PalParkTransfer(fieldSystem->saveData); int v3 = sub_020563BC(fieldSystem); v0 = sub_02051F38(11, v3); @@ -289,7 +289,7 @@ static BattleParams * sub_0205664C (FieldSystem * fieldSystem, UnkStruct_020564B return v0; } -static u32 sub_02056698 (UnkStruct_020564B4 * param0) +static u32 sub_02056698(UnkStruct_020564B4 *param0) { int v0; u32 v1 = 0; @@ -301,7 +301,7 @@ static u32 sub_02056698 (UnkStruct_020564B4 * param0) return v1; } -static u32 sub_020566AC (UnkStruct_020564B4 * param0) +static u32 sub_020566AC(UnkStruct_020564B4 *param0) { int v0, v1; int v2, v3, v4, v5; @@ -337,7 +337,7 @@ static u32 sub_020566AC (UnkStruct_020564B4 * param0) return v7; } -static u32 sub_0205671C (UnkStruct_020564B4 * param0) +static u32 sub_0205671C(UnkStruct_020564B4 *param0) { return param0->unk_48; } diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c index ca99bbbd0d..f5ab3c041b 100644 --- a/src/unk_02056B30.c +++ b/src/unk_02056B30.c @@ -1,44 +1,44 @@ +#include "unk_02056B30.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021D432C_decl.h" -#include "overlay005/struct_ov5_021D4E00_decl.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_02049FA8.h" #include "functypes/funcptr_020EC560.h" #include "functypes/funcptr_020EC57C.h" +#include "overlay005/hblank_system.h" +#include "overlay005/ov5_021D0D80.h" +#include "overlay005/ov5_021D431C.h" +#include "overlay005/ov5_021DD6FC.h" +#include "overlay005/struct_ov5_021D432C_decl.h" +#include "overlay005/struct_ov5_021D4E00_decl.h" -#include "unk_02005474.h" -#include "unk_0200F174.h" -#include "heap.h" #include "camera.h" +#include "field_map_change.h" +#include "heap.h" +#include "inlines.h" #include "map_header.h" +#include "map_object.h" +#include "player_avatar.h" +#include "unk_02005474.h" +#include "unk_0200F174.h" #include "unk_020508D4.h" -#include "field_map_change.h" #include "unk_02054D00.h" #include "unk_020553DC.h" #include "unk_02055808.h" -#include "unk_02056B30.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_020655F4.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay005/ov5_021D431C.h" -#include "overlay005/ov5_021DD6FC.h" -#include "overlay005/hblank_system.h" typedef struct { int unk_00; int unk_04; Location unk_08; - void * unk_1C; + void *unk_1C; int unk_20; } UnkStruct_02056BDC; @@ -53,21 +53,21 @@ typedef struct { int unk_1C; } UnkStruct_02056B30; -static BOOL sub_02056B70(TaskManager * taskMan); -static BOOL sub_02056CFC(TaskManager * taskMan); -static BOOL sub_02056DE4(TaskManager * taskMan); -static BOOL sub_02056E20(TaskManager * taskMan); -static BOOL sub_02056EA4(TaskManager * taskMan); -static BOOL sub_02056F1C(TaskManager * taskMan); -static BOOL sub_02056FC0(TaskManager * taskMan); -static BOOL sub_02057008(TaskManager * taskMan); -static BOOL sub_02057050(TaskManager * taskMan); -static BOOL sub_0205711C(TaskManager * taskMan); -static BOOL sub_020571A0(TaskManager * taskMan); -static BOOL sub_02057218(TaskManager * taskMan); -static BOOL sub_020572B8(TaskManager * taskMan); -static void sub_02057300(FieldSystem * fieldSystem); -static void sub_02057368(FieldSystem * fieldSystem); +static BOOL sub_02056B70(TaskManager *taskMan); +static BOOL sub_02056CFC(TaskManager *taskMan); +static BOOL sub_02056DE4(TaskManager *taskMan); +static BOOL sub_02056E20(TaskManager *taskMan); +static BOOL sub_02056EA4(TaskManager *taskMan); +static BOOL sub_02056F1C(TaskManager *taskMan); +static BOOL sub_02056FC0(TaskManager *taskMan); +static BOOL sub_02057008(TaskManager *taskMan); +static BOOL sub_02057050(TaskManager *taskMan); +static BOOL sub_0205711C(TaskManager *taskMan); +static BOOL sub_020571A0(TaskManager *taskMan); +static BOOL sub_02057218(TaskManager *taskMan); +static BOOL sub_020572B8(TaskManager *taskMan); +static void sub_02057300(FieldSystem *fieldSystem); +static void sub_02057368(FieldSystem *fieldSystem); static const UnkFuncPtr_020EC560 Unk_020EC560[7] = { sub_02056DE4, @@ -99,9 +99,9 @@ static const UnkFuncPtr_020EC57C Unk_020EC57C[7] = { NULL }; -void sub_02056B30 (TaskManager * taskMan, int param1, int param2, int param3, u16 param4, int param5, int param6, int param7) +void sub_02056B30(TaskManager *taskMan, int param1, int param2, int param3, u16 param4, int param5, int param6, int param7) { - UnkStruct_02056B30 * v0 = Heap_AllocFromHeap(param7, sizeof(UnkStruct_02056B30)); + UnkStruct_02056B30 *v0 = Heap_AllocFromHeap(param7, sizeof(UnkStruct_02056B30)); v0->unk_04 = param1; v0->unk_08 = param2; @@ -115,10 +115,10 @@ void sub_02056B30 (TaskManager * taskMan, int param1, int param2, int param3, u1 FieldTask_Start(taskMan, sub_02056B70, v0); } -static BOOL sub_02056B70 (TaskManager * taskMan) +static BOOL sub_02056B70(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056B30 * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056B30 *v1 = TaskManager_Environment(taskMan); switch (v1->unk_00) { case 0: @@ -137,9 +137,9 @@ static BOOL sub_02056B70 (TaskManager * taskMan) return 0; } -void sub_02056BDC (FieldSystem * fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6) +void sub_02056BDC(FieldSystem *fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5, const int param6) { - UnkStruct_02056BDC * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02056BDC)); + UnkStruct_02056BDC *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02056BDC)); v0->unk_00 = 0; v0->unk_04 = 0; @@ -151,11 +151,11 @@ void sub_02056BDC (FieldSystem * fieldSystem, const int param1, const int param2 FieldTask_Set(fieldSystem, sub_02056CFC, v0); } -void sub_02056C18 (FieldSystem * fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5) +void sub_02056C18(FieldSystem *fieldSystem, const int param1, const int param2, const int param3, const int param4, const int param5) { int v0; int v1; - UnkStruct_02056BDC * v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02056BDC)); + UnkStruct_02056BDC *v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02056BDC)); v2->unk_00 = 0; v2->unk_04 = 0; @@ -202,11 +202,11 @@ void sub_02056C18 (FieldSystem * fieldSystem, const int param1, const int param2 FieldTask_Set(fieldSystem, sub_02056CFC, v2); } -static BOOL sub_02056CFC (TaskManager * taskMan) +static BOOL sub_02056CFC(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v1 = TaskManager_Environment(taskMan); - Location * v2 = &v1->unk_08; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v1 = TaskManager_Environment(taskMan); + Location *v2 = &v1->unk_08; switch (v1->unk_00) { case 0: @@ -254,10 +254,10 @@ static BOOL sub_02056CFC (TaskManager * taskMan) return 0; } -static BOOL sub_02056DE4 (TaskManager * taskMan) +static BOOL sub_02056DE4(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v1 = TaskManager_Environment(taskMan); switch (v1->unk_04) { case 0: @@ -273,11 +273,11 @@ static BOOL sub_02056DE4 (TaskManager * taskMan) return 0; } -static BOOL sub_02056E20 (TaskManager * taskMan) +static BOOL sub_02056E20(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v1 = TaskManager_Environment(taskMan); - UnkStruct_ov5_021D432C * v2; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v1 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021D432C *v2; switch (v1->unk_04) { case 0: @@ -305,11 +305,11 @@ static BOOL sub_02056E20 (TaskManager * taskMan) return 0; } -static BOOL sub_02056EA4 (TaskManager * taskMan) +static BOOL sub_02056EA4(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v1 = TaskManager_Environment(taskMan); - UnkStruct_ov5_021D432C * v2; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v1 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021D432C *v2; switch (v1->unk_04) { case 0: @@ -333,15 +333,14 @@ static BOOL sub_02056EA4 (TaskManager * taskMan) return 0; } -static BOOL sub_02056F1C (TaskManager * taskMan) +static BOOL sub_02056F1C(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v1 = TaskManager_Environment(taskMan); - MapObject * v2; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v1 = TaskManager_Environment(taskMan); + MapObject *v2; switch (v1->unk_04) { - case 0: - { + case 0: { int v3 = PlayerAvatar_GetDir(fieldSystem->playerAvatar); v2 = Player_MapObject(fieldSystem->playerAvatar); @@ -379,22 +378,20 @@ static BOOL sub_02056F1C (TaskManager * taskMan) return 0; } -static BOOL sub_02056FC0 (TaskManager * taskMan) +static BOOL sub_02056FC0(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v1 = TaskManager_Environment(taskMan); - MapObject * v2 = Player_MapObject(fieldSystem->playerAvatar); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v1 = TaskManager_Environment(taskMan); + MapObject *v2 = Player_MapObject(fieldSystem->playerAvatar); switch (v1->unk_04) { - case 0: - { - UnkStruct_ov5_021D4E00 * v3; + case 0: { + UnkStruct_ov5_021D4E00 *v3; v3 = ov5_021D4E00(); FieldTask_Start(taskMan, ov5_021D4FA0, v3); v1->unk_04++; - } - break; + } break; case 1: return 1; } @@ -402,22 +399,20 @@ static BOOL sub_02056FC0 (TaskManager * taskMan) return 0; } -static BOOL sub_02057008 (TaskManager * taskMan) +static BOOL sub_02057008(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v1 = TaskManager_Environment(taskMan); - MapObject * v2 = Player_MapObject(fieldSystem->playerAvatar); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v1 = TaskManager_Environment(taskMan); + MapObject *v2 = Player_MapObject(fieldSystem->playerAvatar); switch (v1->unk_04) { - case 0: - { - UnkStruct_ov5_021D4E00 * v3; + case 0: { + UnkStruct_ov5_021D4E00 *v3; v3 = ov5_021D4E00(); FieldTask_Start(taskMan, ov5_021D4F14, v3); v1->unk_04++; - } - break; + } break; case 1: return 1; } @@ -425,18 +420,17 @@ static BOOL sub_02057008 (TaskManager * taskMan) return 0; } -static BOOL sub_02057050 (TaskManager * taskMan) +static BOOL sub_02057050(TaskManager *taskMan) { - MapObject * mapObj; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v2 = TaskManager_Environment(taskMan); - UnkStruct_ov5_021D432C * v3; + MapObject *mapObj; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v2 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021D432C *v3; switch (v2->unk_04) { - case 0: - { + case 0: { u8 v4; - MapObject * v5 = Player_MapObject(fieldSystem->playerAvatar); + MapObject *v5 = Player_MapObject(fieldSystem->playerAvatar); v4 = sub_02054F94(fieldSystem, Player_GetXPos(fieldSystem->playerAvatar), Player_GetZPos(fieldSystem->playerAvatar)); @@ -444,14 +438,13 @@ static BOOL sub_02057050 (TaskManager * taskMan) MapObject_SetHidden(v5, 1); (v2->unk_04) = 1; } else { - UnkStruct_ov5_021D4E00 * v6; + UnkStruct_ov5_021D4E00 *v6; v6 = ov5_021D4E00(); FieldTask_Start(taskMan, ov5_021D5020, v6); (v2->unk_04) = 3; } - } - break; + } break; case 1: v2->unk_1C = (UnkStruct_ov5_021D432C *)ov5_021D431C(); v3 = (UnkStruct_ov5_021D432C *)v2->unk_1C; @@ -464,7 +457,7 @@ static BOOL sub_02057050 (TaskManager * taskMan) if (ov5_021D453C(fieldSystem, v3)) { ov5_021D432C(v3); { - MapObject * v7 = Player_MapObject(fieldSystem->playerAvatar); + MapObject *v7 = Player_MapObject(fieldSystem->playerAvatar); MapObject_SetHidden(v7, 0); } @@ -478,18 +471,17 @@ static BOOL sub_02057050 (TaskManager * taskMan) return 0; } -static BOOL sub_0205711C (TaskManager * taskMan) +static BOOL sub_0205711C(TaskManager *taskMan) { - MapObject * mapObj; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v2 = TaskManager_Environment(taskMan); - UnkStruct_ov5_021D432C * v3; + MapObject *mapObj; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v2 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021D432C *v3; switch (v2->unk_04) { - case 0: - { + case 0: { u8 v4; - MapObject * v5 = Player_MapObject(fieldSystem->playerAvatar); + MapObject *v5 = Player_MapObject(fieldSystem->playerAvatar); v4 = sub_02054F94(fieldSystem, Player_GetXPos(fieldSystem->playerAvatar), Player_GetZPos(fieldSystem->playerAvatar)); @@ -498,14 +490,13 @@ static BOOL sub_0205711C (TaskManager * taskMan) v2->unk_04 = 1; FieldTask_Change(taskMan, sub_02057050, v2); } else { - UnkStruct_ov5_021D4E00 * v6; + UnkStruct_ov5_021D4E00 *v6; v6 = ov5_021D4E00(); FieldTask_Start(taskMan, ov5_021D5150, v6); (v2->unk_04)++; } - } - break; + } break; case 1: return 1; } @@ -513,11 +504,11 @@ static BOOL sub_0205711C (TaskManager * taskMan) return 0; } -static BOOL sub_020571A0 (TaskManager * taskMan) +static BOOL sub_020571A0(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v1 = TaskManager_Environment(taskMan); - UnkStruct_ov5_021D432C * v2; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v1 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021D432C *v2; switch (v1->unk_04) { case 0: @@ -541,11 +532,11 @@ static BOOL sub_020571A0 (TaskManager * taskMan) return 0; } -static BOOL sub_02057218 (TaskManager * taskMan) +static BOOL sub_02057218(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v1 = TaskManager_Environment(taskMan); - MapObject * v2; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v1 = TaskManager_Environment(taskMan); + MapObject *v2; switch (v1->unk_04) { case 0: @@ -591,22 +582,20 @@ static BOOL sub_02057218 (TaskManager * taskMan) return 0; } -static BOOL sub_020572B8 (TaskManager * taskMan) +static BOOL sub_020572B8(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_02056BDC * v1 = TaskManager_Environment(taskMan); - MapObject * v2 = Player_MapObject(fieldSystem->playerAvatar); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_02056BDC *v1 = TaskManager_Environment(taskMan); + MapObject *v2 = Player_MapObject(fieldSystem->playerAvatar); switch (v1->unk_04) { - case 0: - { - UnkStruct_ov5_021D4E00 * v3; + case 0: { + UnkStruct_ov5_021D4E00 *v3; v3 = ov5_021D4E00(); FieldTask_Start(taskMan, ov5_021D4E10, v3); v1->unk_04++; - } - break; + } break; case 1: return 1; } @@ -614,7 +603,7 @@ static BOOL sub_020572B8 (TaskManager * taskMan) return 0; } -static void sub_02057300 (FieldSystem * fieldSystem) +static void sub_02057300(FieldSystem *fieldSystem) { int v0; VecFx32 v1; @@ -635,7 +624,7 @@ static void sub_02057300 (FieldSystem * fieldSystem) Camera_TrackTarget(PlayerAvatar_PosVector(fieldSystem->playerAvatar), fieldSystem->camera); } -static void sub_02057368 (FieldSystem * fieldSystem) +static void sub_02057368(FieldSystem *fieldSystem) { int v0, v1, v2; VecFx32 v3; diff --git a/src/unk_020573FC.c b/src/unk_020573FC.c index 2636f4d15d..d197d59466 100644 --- a/src/unk_020573FC.c +++ b/src/unk_020573FC.c @@ -1,8 +1,8 @@ +#include "unk_020573FC.h" + #include #include -#include "unk_020573FC.h" - typedef struct { u8 unk_00; u8 unk_01; @@ -15,1444 +15,1444 @@ typedef struct { } UnkStruct_020EC598; static const UnkStruct_020EC598 Unk_020EC598[] = { - { - 0x0, - 0x0, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x8, 0xA }, - { 0x1F4 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x8, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x8, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x3, - { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 }, - { 0x4, 0xC, 0xF }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x8, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x8, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x3, - { 0x1, 0x0, 0x0, 0x1, 0x0, 0x0, 0x1, 0x0, 0x0 }, - { 0x4, 0xC, 0xF }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x1, - { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0xC, 0xF }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x14, 0x19 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x14, 0x19 }, - { 0x0 }, - { 0x25 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x8, 0xA }, - { 0x0 }, - { 0x25 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0xC, 0xF }, - { 0x0 }, - { 0x24 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x23, 0x31 }, - { 0x0 }, - { 0x26 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x23, 0x31 }, - { 0x0 }, - { 0x22 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0xC, 0xF }, - { 0x0 }, - { 0x29 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x14, 0x19 }, - { 0x3E8 }, - { 0x28 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x14, 0x19 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x32, 0x3C }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x1, 0x9, 0xA }, - { 0x1194 }, - { 0x20 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0xC, 0xF }, - { 0x3E8 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x1, 0x9, 0xA }, - { 0xBB8 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x3, - { 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0 }, - { 0x4, 0x21, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x8, 0xA }, - { 0x0 }, - { 0x27 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x14, 0x19 }, - { 0x0 }, - { 0x2C }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x21, 0x28 }, - { 0x0 }, - { 0x2C }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0xA, 0x28 }, - { 0x0 }, - { 0x2C }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0xA, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0xA, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x1, 0x9, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x14, 0x19 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0xA, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x3, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x1, 0x1, 0x0 }, - { 0x1, 0x5A, 0x63 }, - { 0x0 }, - { 0x2D }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x1, 0x1C, 0x1E }, - { 0x0 }, - { 0x2B }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x1, 0x1C, 0x1E }, - { 0x0 }, - { 0x2A }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x1, 0x30, 0x32 }, - { 0x0 }, - { 0x20 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x8, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x21, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x21, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0xA, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x3, - { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x21 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x2, - { 0x1, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x23 }, - { 0x0 }, - { 0x1 } - }, - { - 0x3, - 0x3, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1 }, - { 0x2, 0x14, 0x46 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x3, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1 }, - { 0x2, 0x14, 0x46 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x3, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1 }, - { 0x2, 0x28, 0x63 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x3, - { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1 }, - { 0x1, 0x30, 0x32 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x3, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0x0, 0x1 }, - { 0x1, 0x30, 0x32 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x3, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1 }, - { 0x1, 0x30, 0x32 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x3, - { 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x1, 0x0, 0x1 }, - { 0x1, 0x30, 0x32 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x3, - { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1 }, - { 0x1, 0x30, 0x32 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0xA, 0xC }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0xC, 0xE }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x1C, 0x20 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0xA, 0xC }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0xC, 0xE }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x1C, 0x20 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0x14, 0x32 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0x14, 0x32 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0x14, 0x32 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0x14, 0x32 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x1E, 0x26 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x41, 0x50 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0xF, 0x12 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x21, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x2, - { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x19, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x19, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x23, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x23, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0x46, 0x63 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x3C, 0x46 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x3C, 0x46 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0x28, 0x46 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0x28, 0x46 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x50, 0x63 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0xF, 0x14 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0xF, 0x14 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0xF, 0x14 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0xF, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x1, 0x1C, 0x1E }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x7D0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x7D0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x7D0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0xBB8 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0xBB8 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0xBB8 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x3, 0x50, 0x63 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x50, 0x63 }, - { 0x0 }, - { 0x0 }, - { 0x1 }, - { 0x1 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x21, 0x28 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0x28, 0x46 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x2, 0x46, 0x63 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x1 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x0, 0x0, 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x2, - 0x1, - { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x4, 0x14, 0x19 }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x1, - { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x8, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x2, - { 0x1, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x8, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x2, - { 0x1, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x8, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x1, - 0x2, - { 0x1, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x8, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - }, - { - 0x3, - 0x1, - { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, - { 0x5, 0x8, 0xA }, - { 0x0 }, - { 0x0 }, - { 0x0 }, - { 0x0 } - } + { + 0x0, + 0x0, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x8, 0xA }, + 0x1F4, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x8, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x8, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x3, + { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 }, + { 0x4, 0xC, 0xF }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x8, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x8, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x3, + { 0x1, 0x0, 0x0, 0x1, 0x0, 0x0, 0x1, 0x0, 0x0 }, + { 0x4, 0xC, 0xF }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x1, + { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0xC, 0xF }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x14, 0x19 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x14, 0x19 }, + 0x0, + 0x25, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x8, 0xA }, + 0x0, + 0x25, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0xC, 0xF }, + 0x0, + 0x24, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x23, 0x31 }, + 0x0, + 0x26, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x23, 0x31 }, + 0x0, + 0x22, + 0x0, + 0x0, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0xC, 0xF }, + 0x0, + 0x29, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x14, 0x19 }, + 0x3E8, + 0x28, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x14, 0x19 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x32, 0x3C }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x9, 0xA }, + 0x1194, + 0x20, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0xC, 0xF }, + 0x3E8, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x9, 0xA }, + 0xBB8, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x3, + { 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0 }, + { 0x4, 0x21, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x8, 0xA }, + 0x0, + 0x27, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x14, 0x19 }, + 0x0, + 0x2C, + 0x0, + 0x0, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x21, 0x28 }, + 0x0, + 0x2C, + 0x0, + 0x0, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0xA, 0x28 }, + 0x0, + 0x2C, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0xA, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0xA, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x9, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x14, 0x19 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0xA, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x3, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x1, 0x1, 0x0 }, + { 0x1, 0x5A, 0x63 }, + 0x0, + 0x2D, + 0x0, + 0x0, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x1C, 0x1E }, + 0x0, + 0x2B, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x1C, 0x1E }, + 0x0, + 0x2A, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x30, 0x32 }, + 0x0, + 0x20, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x8, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x21, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x21, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0xA, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x3, + { 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x21, + 0x0, + 0x1, + }, + { + 0x1, + 0x2, + { 0x1, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x23, + 0x0, + 0x1, + }, + { + 0x3, + 0x3, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1 }, + { 0x2, 0x14, 0x46 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x3, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1 }, + { 0x2, 0x14, 0x46 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x3, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1 }, + { 0x2, 0x28, 0x63 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x3, + { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1 }, + { 0x1, 0x30, 0x32 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x3, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0x0, 0x1 }, + { 0x1, 0x30, 0x32 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x3, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x1, 0x1 }, + { 0x1, 0x30, 0x32 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x3, + { 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x1, 0x0, 0x1 }, + { 0x1, 0x30, 0x32 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x3, + { 0x1, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1 }, + { 0x1, 0x30, 0x32 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0xA, 0xC }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0xC, 0xE }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x1C, 0x20 }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0xA, 0xC }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0xC, 0xE }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x1C, 0x20 }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0x14, 0x32 }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0x14, 0x32 }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0x14, 0x32 }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0x14, 0x32 }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x1E, 0x26 }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x41, 0x50 }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0xF, 0x12 }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x21, 0x28 }, + 0x0, + 0x0, + 0x1, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x2, + { 0x1, 0x1, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x19, 0x1E }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x19, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x23, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x23, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0x46, 0x63 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x3C, 0x46 }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x3C, 0x46 }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0x28, 0x46 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0x28, 0x46 }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x50, 0x63 }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0xF, 0x14 }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0xF, 0x14 }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0xF, 0x14 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0xF, 0x1E }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x1C, 0x1E }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x7D0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x7D0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x7D0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0xBB8, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0xBB8, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0xBB8, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x50, 0x63 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x50, 0x63 }, + 0x0, + 0x0, + 0x1, + 0x1, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x21, 0x28 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0x28, 0x46 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0x46, 0x63 }, + 0x0, + 0x0, + 0x0, + 0x1, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x2, + 0x1, + { 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x14, 0x19 }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x1, + { 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x8, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x2, + { 0x1, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x8, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x2, + { 0x1, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x8, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x1, + 0x2, + { 0x1, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x8, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, + { + 0x3, + 0x1, + { 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x8, 0xA }, + 0x0, + 0x0, + 0x0, + 0x0, + }, }; -const u8 sub_020573FC (const int param0) +const u8 sub_020573FC(const int param0) { return Unk_020EC598[param0].unk_00; } -const u8 sub_0205740C (const int param0) +const u8 sub_0205740C(const int param0) { return Unk_020EC598[param0].unk_01; } -const u8 * sub_0205741C (const int param0) +const u8 *sub_0205741C(const int param0) { return Unk_020EC598[param0].unk_02; } -const u8 sub_0205742C (const int param0) +const u8 sub_0205742C(const int param0) { return Unk_020EC598[param0].unk_0B[0]; } -const u8 sub_0205743C (const int param0) +const u8 sub_0205743C(const int param0) { return Unk_020EC598[param0].unk_0B[1]; } -const u8 sub_0205744C (const int param0) +const u8 sub_0205744C(const int param0) { return Unk_020EC598[param0].unk_0B[2]; } -const int sub_0205745C (const int param0) +const int sub_0205745C(const int param0) { return Unk_020EC598[param0].unk_10; } -const int sub_0205746C (const int param0) +const int sub_0205746C(const int param0) { return Unk_020EC598[param0].unk_14; } -const int sub_0205747C (const int param0) +const int sub_0205747C(const int param0) { return Unk_020EC598[param0].unk_18; } -const int sub_0205748C (const int param0) +const int sub_0205748C(const int param0) { return Unk_020EC598[param0].unk_19; } diff --git a/src/unk_0205749C.c b/src/unk_0205749C.c index 5cd92778bd..e5e2032e61 100644 --- a/src/unk_0205749C.c +++ b/src/unk_0205749C.c @@ -1,15 +1,16 @@ +#include "unk_0205749C.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" #include "field/field_system.h" +#include "overlay066/ov66_0222DCE0.h" #include "overlay066/struct_ov66_0222DCE0.h" #include "heap.h" #include "unk_020508D4.h" -#include "unk_0205749C.h" -#include "overlay066/ov66_0222DCE0.h" FS_EXTERN_OVERLAY(overlay66); @@ -19,8 +20,7 @@ typedef struct { UnkStruct_ov66_0222DCE0 unk_04; } UnkStruct_0205749C; - -static BOOL sub_020574CC(TaskManager * param0); +static BOOL sub_020574CC(TaskManager *param0); static const OverlayManagerTemplate Unk_020ED4CC = { ov66_0222DCE0, @@ -29,9 +29,9 @@ static const OverlayManagerTemplate Unk_020ED4CC = { FS_OVERLAY_ID(overlay66) }; -void sub_0205749C (TaskManager * param0, BOOL param1) +void sub_0205749C(TaskManager *param0, BOOL param1) { - UnkStruct_0205749C * v0; + UnkStruct_0205749C *v0; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205749C)); memset(v0, 0, sizeof(UnkStruct_0205749C)); @@ -40,21 +40,19 @@ void sub_0205749C (TaskManager * param0, BOOL param1) FieldTask_Start(param0, sub_020574CC, v0); } -static BOOL sub_020574CC (TaskManager * param0) +static BOOL sub_020574CC(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0205749C * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0205749C *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { - case 0: - { + case 0: { v1->unk_04.unk_04 = fieldSystem->saveData; v1->unk_04.unk_08 = v1->unk_02; v1->unk_04.unk_00 = &fieldSystem->unk_C4; sub_02050A38(param0, &Unk_020ED4CC, &v1->unk_04); v1->unk_00++; - } - break; + } break; case 1: Heap_FreeToHeap(v1); return 1; diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 6f3ba17dd1..fdb999a7de 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -1,71 +1,68 @@ +#include "unk_0205A0D8.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_020149F0_decl.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - -#include "constdata/const_020F1E88.h" -#include "constdata/const_020F410C.h" - -#include "field/field_system.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0205AA50.h" -#include "functypes/funcptr_0205AB10.h" #include "struct_defs/struct_02072014.h" #include "struct_defs/struct_02098C44.h" -#include "struct_defs/pokemon_summary.h" -#include "unk_02005474.h" +#include "field/field_system.h" +#include "functypes/funcptr_0205AB10.h" +#include "overlay005/ov5_021D0D80.h" + +#include "bag.h" +#include "comm_player_manager.h" +#include "communication_information.h" +#include "communication_system.h" +#include "core_sys.h" +#include "field_comm_manager.h" +#include "field_system.h" +#include "heap.h" +#include "map_object.h" #include "message.h" +#include "party.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" +#include "trainer_info.h" +#include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_020149F0.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_02025E08.h" #include "unk_0202602C.h" #include "unk_0202D778.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_020366A0.h" -#include "field_system.h" #include "unk_0203D1B8.h" #include "unk_020508D4.h" -#include "comm_player_manager.h" -#include "field_comm_manager.h" -#include "unk_0205A0D8.h" #include "unk_0205D8CC.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_020655F4.h" -#include "pokemon.h" -#include "party.h" #include "unk_0207A274.h" -#include "bag.h" -#include "pokemon_summary_app.h" -#include "overlay005/ov5_021D0D80.h" + +#include "constdata/const_020F1E88.h" +#include "constdata/const_020F410C.h" typedef struct { - PokemonSummary * unk_00; - PartyManagementData * unk_04; - UnkFuncPtr_0205AB10 * unk_08; - Strbuf* unk_0C; - Strbuf* unk_10; + PokemonSummary *unk_00; + PartyManagementData *unk_04; + UnkFuncPtr_0205AB10 *unk_08; + Strbuf *unk_0C; + Strbuf *unk_10; Window unk_14; - FieldSystem * fieldSystem; - StringTemplate * unk_28; - MessageLoader * unk_2C; + FieldSystem *fieldSystem; + StringTemplate *unk_28; + MessageLoader *unk_2C; int unk_30; int unk_34; int unk_38; @@ -73,14 +70,14 @@ typedef struct { u8 unk_3D[6]; u8 unk_43; u8 unk_44; - u8 * unk_48; - u8 * unk_4C; - Party * unk_50; + u8 *unk_48; + u8 *unk_4C; + Party *unk_50; Window unk_54; Window unk_64; - TrainerInfo * unk_74; - UnkStruct_020149F0 * unk_78; - Window * unk_7C; + TrainerInfo *unk_74; + UnkStruct_020149F0 *unk_78; + Window *unk_7C; u8 unk_80; s8 unk_81; u8 unk_82; @@ -97,36 +94,36 @@ typedef struct { } UnkStruct_0205AD20; typedef struct { - Strbuf* unk_00; - Strbuf* unk_04; + Strbuf *unk_00; + Strbuf *unk_04; Window unk_08; - StringTemplate * unk_18; - MessageLoader * unk_1C; + StringTemplate *unk_18; + MessageLoader *unk_1C; int unk_20; int unk_24; int unk_28; } UnkStruct_0205B2D4; -static void sub_0205AC28(UnkStruct_0205A0D8 * param0); -static void sub_0205AC80(UnkStruct_0205A0D8 * param0, BOOL param1); -static BOOL sub_0205ACC8(UnkStruct_0205A0D8 * param0); -static BOOL sub_0205AD10(UnkStruct_0205A0D8 * param0); -static void sub_0205ADF8(UnkStruct_0205A0D8 * param0, int param1); -static int sub_0205AFE4(UnkStruct_0205A0D8 * param0); -static void sub_0205B0B4(UnkStruct_0205A0D8 * param0); -static BOOL sub_0205AD34(UnkStruct_0205A0D8 * param0); -static BOOL sub_0205AD70(UnkStruct_0205A0D8 * param0); -static void sub_0205ADAC(UnkStruct_0205A0D8 * param0); -static void sub_0205AD80(UnkStruct_0205A0D8 * param0); -static int sub_0205AA50(UnkStruct_0205A0D8 * param0, const Strbuf *param1); -static void sub_0205AAA0(UnkStruct_0205A0D8 * param0, BOOL param1); -static void sub_0205AF18(UnkStruct_0205A0D8 * param0, int param1); -static BOOL sub_0205AD20(UnkStruct_0205A0D8 * param0); - -static void sub_0205A0D8 (UnkStruct_0205A0D8 * param0, FieldSystem * fieldSystem, Party * param2, int param3, int param4, int param5) +static void sub_0205AC28(UnkStruct_0205A0D8 *param0); +static void sub_0205AC80(UnkStruct_0205A0D8 *param0, BOOL param1); +static BOOL sub_0205ACC8(UnkStruct_0205A0D8 *param0); +static BOOL sub_0205AD10(UnkStruct_0205A0D8 *param0); +static void sub_0205ADF8(UnkStruct_0205A0D8 *param0, int param1); +static int sub_0205AFE4(UnkStruct_0205A0D8 *param0); +static void sub_0205B0B4(UnkStruct_0205A0D8 *param0); +static BOOL sub_0205AD34(UnkStruct_0205A0D8 *param0); +static BOOL sub_0205AD70(UnkStruct_0205A0D8 *param0); +static void sub_0205ADAC(UnkStruct_0205A0D8 *param0); +static void sub_0205AD80(UnkStruct_0205A0D8 *param0); +static int sub_0205AA50(UnkStruct_0205A0D8 *param0, const Strbuf *param1); +static void sub_0205AAA0(UnkStruct_0205A0D8 *param0, BOOL param1); +static void sub_0205AF18(UnkStruct_0205A0D8 *param0, int param1); +static BOOL sub_0205AD20(UnkStruct_0205A0D8 *param0); + +static void sub_0205A0D8(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem, Party *param2, int param3, int param4, int param5) { - PokemonSummary * v0; - SaveData * v1; + PokemonSummary *v0; + SaveData *v1; static const u8 v2[] = { 0, 1, 2, 4, 3, 5, 6, 7, 8 }; @@ -154,10 +151,10 @@ static void sub_0205A0D8 (UnkStruct_0205A0D8 * param0, FieldSystem * fieldSystem param0->unk_00 = v0; } -static void sub_0205A164 (UnkStruct_0205A0D8 * param0, int param1) +static void sub_0205A164(UnkStruct_0205A0D8 *param0, int param1) { int v0; - PartyManagementData * v1 = Heap_AllocFromHeap(param1, sizeof(PartyManagementData)); + PartyManagementData *v1 = Heap_AllocFromHeap(param1, sizeof(PartyManagementData)); MI_CpuClear8(v1, sizeof(PartyManagementData)); @@ -187,7 +184,7 @@ static void sub_0205A164 (UnkStruct_0205A0D8 * param0, int param1) param0->unk_04 = v1; } -static BOOL sub_0205A258 (UnkStruct_0205A0D8 * param0, FieldSystem * fieldSystem) +static BOOL sub_0205A258(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem) { int v0; @@ -216,9 +213,9 @@ static BOOL sub_0205A258 (UnkStruct_0205A0D8 * param0, FieldSystem * fieldSystem return 1; } -static BOOL sub_0205A2B0 (UnkStruct_0205A0D8 * param0, FieldSystem * fieldSystem) +static BOOL sub_0205A2B0(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem) { - PokemonSummary * v0; + PokemonSummary *v0; if (sub_020509B4(fieldSystem)) { return 0; @@ -231,7 +228,7 @@ static BOOL sub_0205A2B0 (UnkStruct_0205A0D8 * param0, FieldSystem * fieldSystem return 1; } -static BOOL sub_0205A2DC (UnkStruct_0205A0D8 * param0) +static BOOL sub_0205A2DC(UnkStruct_0205A0D8 *param0) { if (sub_020509DC(param0->fieldSystem)) { ov5_021D1744(1); @@ -242,7 +239,7 @@ static BOOL sub_0205A2DC (UnkStruct_0205A0D8 * param0) return 0; } -static BOOL sub_0205A2FC (void) +static BOOL sub_0205A2FC(void) { int v0, v1; @@ -257,10 +254,10 @@ static BOOL sub_0205A2FC (void) return 0; } -static BOOL sub_0205A324 (TaskManager * param0) +static BOOL sub_0205A324(TaskManager *param0) { - UnkStruct_0205A0D8 * v0 = TaskManager_Environment(param0); - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0205A0D8 *v0 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); switch (v0->unk_34) { case 0: @@ -620,9 +617,9 @@ static BOOL sub_0205A324 (TaskManager * param0) return 0; } -static int sub_0205AA50 (UnkStruct_0205A0D8 * param0, const Strbuf *param1) +static int sub_0205AA50(UnkStruct_0205A0D8 *param0, const Strbuf *param1) { - Window * v0 = &(param0->unk_14); + Window *v0 = &(param0->unk_14); if (BGL_WindowAdded(v0) == 0) { FieldMessage_AddWindow(param0->fieldSystem->unk_08, v0, 3); @@ -634,7 +631,7 @@ static int sub_0205AA50 (UnkStruct_0205A0D8 * param0, const Strbuf *param1) return FieldMessage_Print(v0, (Strbuf *)param1, SaveData_Options(param0->fieldSystem->saveData), 1); } -static void sub_0205AAA0 (UnkStruct_0205A0D8 * param0, BOOL param1) +static void sub_0205AAA0(UnkStruct_0205A0D8 *param0, BOOL param1) { if (BGL_WindowAdded(&(param0->unk_14))) { if (param1) { @@ -657,10 +654,10 @@ static void sub_0205AAA0 (UnkStruct_0205A0D8 * param0, BOOL param1) } } -void sub_0205AB10 (FieldSystem * fieldSystem, UnkFuncPtr_0205AB10 * param1) +void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1) { - UnkStruct_0205A0D8 * v0; - TaskManager * v1 = fieldSystem->unk_10; + UnkStruct_0205A0D8 *v0; + TaskManager *v1 = fieldSystem->unk_10; if (v1) { return; @@ -691,8 +688,7 @@ void sub_0205AB10 (FieldSystem * fieldSystem, UnkFuncPtr_0205AB10 * param1) v0->unk_74 = CommInfo_TrainerInfo(v0->unk_86 ^ 1); switch (v0->unk_88) { - case 3: - { + case 3: { u32 v2 = sub_0205B0E4(); v0->unk_4C = Heap_AllocFromHeapAtEnd(11, v2); @@ -703,8 +699,7 @@ void sub_0205AB10 (FieldSystem * fieldSystem, UnkFuncPtr_0205AB10 * param1) v0->unk_44 = 5; v0->unk_34 = 23; - } - break; + } break; case 4: v0->unk_34 = 9; break; @@ -720,7 +715,7 @@ void sub_0205AB10 (FieldSystem * fieldSystem, UnkFuncPtr_0205AB10 * param1) FieldTask_Set(fieldSystem, sub_0205A324, v0); } -static void sub_0205AC28 (UnkStruct_0205A0D8 * param0) +static void sub_0205AC28(UnkStruct_0205A0D8 *param0) { if (param0->unk_50) { Heap_FreeToHeap(param0->unk_50); @@ -743,16 +738,16 @@ static void sub_0205AC28 (UnkStruct_0205A0D8 * param0) sub_0205AAA0(param0, 1); } -static UnkStruct_0205A0D8 * sub_0205AC74 (FieldSystem * fieldSystem) +static UnkStruct_0205A0D8 *sub_0205AC74(FieldSystem *fieldSystem) { return TaskManager_Environment(fieldSystem->unk_10); } -static void sub_0205AC80 (UnkStruct_0205A0D8 * param0, BOOL param1) +static void sub_0205AC80(UnkStruct_0205A0D8 *param0, BOOL param1) { - Party * v0; - UnkStruct_0205AD20 * v1; - u8 * v2; + Party *v0; + UnkStruct_0205AD20 *v1; + u8 *v2; int v3, v4; v0 = Party_GetFromSavedata(param0->fieldSystem->saveData); @@ -769,13 +764,13 @@ static void sub_0205AC80 (UnkStruct_0205A0D8 * param0, BOOL param1) } } -static BOOL sub_0205ACC8 (UnkStruct_0205A0D8 * param0) +static BOOL sub_0205ACC8(UnkStruct_0205A0D8 *param0) { if (param0->unk_89 & 1) { return 1; } else { BOOL v0; - u8 * v1; + u8 *v1; u32 v2; v1 = param0->unk_4C; @@ -795,7 +790,7 @@ static BOOL sub_0205ACC8 (UnkStruct_0205A0D8 * param0) } } -static BOOL sub_0205AD10 (UnkStruct_0205A0D8 * param0) +static BOOL sub_0205AD10(UnkStruct_0205A0D8 *param0) { if (param0->unk_89 == 3) { return 1; @@ -804,15 +799,15 @@ static BOOL sub_0205AD10 (UnkStruct_0205A0D8 * param0) return 0; } -static BOOL sub_0205AD20 (UnkStruct_0205A0D8 * param0) +static BOOL sub_0205AD20(UnkStruct_0205A0D8 *param0) { - UnkStruct_0205AD20 * v0; + UnkStruct_0205AD20 *v0; v0 = (UnkStruct_0205AD20 *)((u8 *)(param0->unk_48) + (Pokemon_GetStructSize() * 3)); return v0->unk_00; } -static BOOL sub_0205AD34 (UnkStruct_0205A0D8 * param0) +static BOOL sub_0205AD34(UnkStruct_0205A0D8 *param0) { BOOL v0; @@ -829,7 +824,7 @@ static BOOL sub_0205AD34 (UnkStruct_0205A0D8 * param0) return v0; } -static BOOL sub_0205AD70 (UnkStruct_0205A0D8 * param0) +static BOOL sub_0205AD70(UnkStruct_0205A0D8 *param0) { if (param0->unk_89 == 3) { return 1; @@ -838,7 +833,7 @@ static BOOL sub_0205AD70 (UnkStruct_0205A0D8 * param0) return 0; } -static void sub_0205AD80 (UnkStruct_0205A0D8 * param0) +static void sub_0205AD80(UnkStruct_0205A0D8 *param0) { u32 v0; int v1; @@ -851,10 +846,10 @@ static void sub_0205AD80 (UnkStruct_0205A0D8 * param0) } } -static void sub_0205ADAC (UnkStruct_0205A0D8 * param0) +static void sub_0205ADAC(UnkStruct_0205A0D8 *param0) { u32 v0; - u8 * v1, * v2; + u8 *v1, *v2; int v3; v0 = Pokemon_GetStructSize(); @@ -870,13 +865,13 @@ static void sub_0205ADAC (UnkStruct_0205A0D8 * param0) } } -static void sub_0205ADF8 (UnkStruct_0205A0D8 * param0, int param1) +static void sub_0205ADF8(UnkStruct_0205A0D8 *param0, int param1) { - Window * v0 = &(param0->unk_54); + Window *v0 = &(param0->unk_54); if (BGL_WindowAdded(v0) == 0) { int v1, v2, v3; - MessageLoader * v4; + MessageLoader *v4; v4 = MessageLoader_Init(1, 26, 412, 4); v3 = Pokemon_GetStructSize(); @@ -906,9 +901,9 @@ static void sub_0205ADF8 (UnkStruct_0205A0D8 * param0, int param1) param0->unk_7C = v0; } -static void sub_0205AF18 (UnkStruct_0205A0D8 * param0, int param1) +static void sub_0205AF18(UnkStruct_0205A0D8 *param0, int param1) { - Window * v0 = &(param0->unk_64); + Window *v0 = &(param0->unk_64); if (BGL_WindowAdded(v0) == 0) { int v1; @@ -932,7 +927,7 @@ static void sub_0205AF18 (UnkStruct_0205A0D8 * param0, int param1) Window_Show(param0->unk_7C, 0, 1, 11); } -static int sub_0205AFE4 (UnkStruct_0205A0D8 * param0) +static int sub_0205AFE4(UnkStruct_0205A0D8 *param0) { do { if (gCoreSys.pressedKeys & PAD_KEY_UP) { @@ -941,7 +936,7 @@ static int sub_0205AFE4 (UnkStruct_0205A0D8 * param0) } if (gCoreSys.pressedKeys & PAD_KEY_DOWN) { - param0->unk_81 = (param0->unk_81 == (param0->unk_80 - 1)) ? 0 : (param0->unk_81 + 1); + param0->unk_81 = (param0->unk_81 == (param0->unk_80 - 1)) ? 0 : (param0->unk_81 + 1); break; } @@ -971,28 +966,28 @@ static int sub_0205AFE4 (UnkStruct_0205A0D8 * param0) return 0; } -static void sub_0205B0B4 (UnkStruct_0205A0D8 * param0) +static void sub_0205B0B4(UnkStruct_0205A0D8 *param0) { Window_Clear(param0->unk_7C, 1); } -void sub_0205B0C0 (int param0, int param1, void * param2, void * param3) +void sub_0205B0C0(int param0, int param1, void *param2, void *param3) { - UnkStruct_0205A0D8 * v0 = sub_0205AC74(param3); + UnkStruct_0205A0D8 *v0 = sub_0205AC74(param3); if (v0->unk_86 != param0) { v0->unk_89 |= 2; } } -int sub_0205B0E4 (void) +int sub_0205B0E4(void) { return Pokemon_GetStructSize() * 3 + sizeof(UnkStruct_0205AD20); } -u8 * sub_0205B0F4 (int param0, void * param1, int param2) +u8 *sub_0205B0F4(int param0, void *param1, int param2) { - UnkStruct_0205A0D8 * v0 = sub_0205AC74(param1); + UnkStruct_0205A0D8 *v0 = sub_0205AC74(param1); if (v0->unk_86 != param0) { return v0->unk_48; @@ -1001,9 +996,9 @@ u8 * sub_0205B0F4 (int param0, void * param1, int param2) } } -void sub_0205B110 (int param0, int param1, void * param2, void * param3) +void sub_0205B110(int param0, int param1, void *param2, void *param3) { - UnkStruct_0205A0D8 * v0 = sub_0205AC74(param3); + UnkStruct_0205A0D8 *v0 = sub_0205AC74(param3); if (v0->unk_86 != param0) { v0->unk_85 = *((u8 *)param2); @@ -1011,11 +1006,11 @@ void sub_0205B110 (int param0, int param1, void * param2, void * param3) } } -static BOOL sub_0205B140 (TaskManager * param0) +static BOOL sub_0205B140(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0205B2D4 * v1 = TaskManager_Environment(param0); - TrainerCard * v2 = (TrainerCard *)sub_02059EBC(v1->unk_24, NULL, 0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0205B2D4 *v1 = TaskManager_Environment(param0); + TrainerCard *v2 = (TrainerCard *)sub_02059EBC(v1->unk_24, NULL, 0); switch (v1->unk_28) { case 0: @@ -1083,7 +1078,7 @@ static BOOL sub_0205B140 (TaskManager * param0) return 0; } -void sub_0205B2D4 (FieldSystem * fieldSystem) +void sub_0205B2D4(FieldSystem *fieldSystem) { int v0; int v1 = CommSys_CurNetId(); @@ -1096,7 +1091,7 @@ void sub_0205B2D4 (FieldSystem * fieldSystem) } if ((v2 == CommPlayer_XPos(v0)) && (v3 == CommPlayer_ZPos(v0))) { - UnkStruct_0205B2D4 * v4 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205B2D4)); + UnkStruct_0205B2D4 *v4 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205B2D4)); v4->unk_24 = v0; v4->unk_28 = 0; diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c index 99b8b57d5e..906e646d55 100644 --- a/src/unk_0205B33C.c +++ b/src/unk_0205B33C.c @@ -1,45 +1,44 @@ +#include "unk_0205B33C.h" + #include #include -#include "message.h" #include "struct_decls/struct_02014EC4_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" -#include "trainer_info.h" #include "struct_decls/struct_0205B43C_decl.h" -#include "savedata.h" - -#include "constdata/const_020ED570.h" - #include "struct_defs/sentence.h" #include "struct_defs/struct_0203330C.h" -#include "field/field_system.h" #include "struct_defs/struct_0205B4F8.h" #include "struct_defs/struct_02072014.h" +#include "field/field_system.h" + +#include "communication_information.h" +#include "communication_system.h" +#include "field_system.h" +#include "heap.h" +#include "journal.h" #include "message.h" +#include "savedata.h" +#include "strbuf.h" #include "string_template.h" #include "sys_task.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02014A84.h" #include "unk_02014D38.h" -#include "heap.h" #include "unk_0201D15C.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "journal.h" -#include "communication_information.h" #include "unk_02033200.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "field_system.h" #include "unk_020508D4.h" -#include "unk_0205B33C.h" #include "unk_0205C980.h" #include "unk_02071D40.h" #include "unk_02095E98.h" #include "unk_02099500.h" -typedef void (* UnkFuncPtr_0205B43C)(UnkStruct_0205B43C *); +#include "constdata/const_020ED570.h" + +typedef void (*UnkFuncPtr_0205B43C)(UnkStruct_0205B43C *); typedef struct { u16 unk_00; @@ -52,10 +51,10 @@ typedef struct { } UnkStruct_0205B43C_sub2; struct UnkStruct_0205B43C_t { - FieldSystem * fieldSystem; - SaveData * unk_04; - TrainerInfo * unk_08; - SysTask * unk_0C; + FieldSystem *fieldSystem; + SaveData *unk_04; + TrainerInfo *unk_08; + SysTask *unk_0C; UnkFuncPtr_0205B43C unk_10; int unk_14; u32 unk_18; @@ -72,7 +71,7 @@ struct UnkStruct_0205B43C_t { u32 unk_44; UnkStruct_0205B43C_sub1 unk_48[10]; UnkStruct_0205B43C_sub2 unk_70[40]; - WMbssDesc * unk_110[16]; + WMbssDesc *unk_110[16]; MATHRandContext32 unk_150; int unk_168; int unk_16C; @@ -81,33 +80,33 @@ struct UnkStruct_0205B43C_t { u8 unk_176[2]; Sentence unk_178; BOOL unk_180; - TrainerCard * unk_184; - TrainerCard * unk_188[2]; + TrainerCard *unk_184; + TrainerCard *unk_188[2]; }; -static UnkStruct_0205B43C * sub_0205B3A0(FieldSystem * fieldSystem); -static void sub_0205B43C(UnkStruct_0205B43C * param0); -static void sub_0205B4B0(UnkStruct_0205B43C * param0); -static void sub_0205B5B4(UnkStruct_0205B43C * param0, UnkFuncPtr_0205B43C param1, int param2); -static void sub_0205B5FC(UnkStruct_0205B43C * param0); -static void sub_0205B620(UnkStruct_0205B43C * param0); -static void sub_0205B754(UnkStruct_0205B43C * param0); -static void sub_0205B634(UnkStruct_0205B43C * param0); -static void sub_0205B4F8(UnkStruct_0205B43C * param0); -static void sub_0205B578(UnkStruct_0205B43C * param0); -static void sub_0205B72C(UnkStruct_0205B43C * param0); -static void sub_0205B6C4(UnkStruct_0205B43C * param0); -static void sub_0205B694(UnkStruct_0205B43C * param0); -static void sub_0205C160(UnkStruct_0205B43C * param0); +static UnkStruct_0205B43C *sub_0205B3A0(FieldSystem *fieldSystem); +static void sub_0205B43C(UnkStruct_0205B43C *param0); +static void sub_0205B4B0(UnkStruct_0205B43C *param0); +static void sub_0205B5B4(UnkStruct_0205B43C *param0, UnkFuncPtr_0205B43C param1, int param2); +static void sub_0205B5FC(UnkStruct_0205B43C *param0); +static void sub_0205B620(UnkStruct_0205B43C *param0); +static void sub_0205B754(UnkStruct_0205B43C *param0); +static void sub_0205B634(UnkStruct_0205B43C *param0); +static void sub_0205B4F8(UnkStruct_0205B43C *param0); +static void sub_0205B578(UnkStruct_0205B43C *param0); +static void sub_0205B72C(UnkStruct_0205B43C *param0); +static void sub_0205B6C4(UnkStruct_0205B43C *param0); +static void sub_0205B694(UnkStruct_0205B43C *param0); +static void sub_0205C160(UnkStruct_0205B43C *param0); static int sub_0205B4D4(void); -static int sub_0205BAE8(UnkStruct_0205B43C * param0, int param1); -static int sub_0205BCD4(int param0, int param1, StringTemplate * param2); -static void sub_0205B408(UnkStruct_0205B43C * param0); -static void sub_0205BFF0(UnkStruct_0205B4F8 * param0); +static int sub_0205BAE8(UnkStruct_0205B43C *param0, int param1); +static int sub_0205BCD4(int param0, int param1, StringTemplate *param2); +static void sub_0205B408(UnkStruct_0205B43C *param0); +static void sub_0205BFF0(UnkStruct_0205B4F8 *param0); -UnkStruct_0205B43C * sub_0205B33C (FieldSystem * fieldSystem) +UnkStruct_0205B43C *sub_0205B33C(FieldSystem *fieldSystem) { - UnkStruct_0205B43C * v0 = NULL; + UnkStruct_0205B43C *v0 = NULL; GF_ASSERT(fieldSystem != NULL); @@ -132,7 +131,7 @@ UnkStruct_0205B43C * sub_0205B33C (FieldSystem * fieldSystem) return v0; } -void sub_0205B388 (FieldSystem * fieldSystem) +void sub_0205B388(FieldSystem *fieldSystem) { if (fieldSystem->unk_7C == NULL) { return; @@ -141,11 +140,11 @@ void sub_0205B388 (FieldSystem * fieldSystem) sub_0205B5B4(fieldSystem->unk_7C, sub_0205B5FC, 5); } -static UnkStruct_0205B43C * sub_0205B3A0 (FieldSystem * fieldSystem) +static UnkStruct_0205B43C *sub_0205B3A0(FieldSystem *fieldSystem) { - void * v0; - SaveData * v1; - UnkStruct_0205B43C * v2 = NULL; + void *v0; + SaveData *v1; + UnkStruct_0205B43C *v2 = NULL; if (fieldSystem->unk_7C != NULL) { return NULL; @@ -170,7 +169,7 @@ static UnkStruct_0205B43C * sub_0205B3A0 (FieldSystem * fieldSystem) return v2; } -static void sub_0205B408 (UnkStruct_0205B43C * param0) +static void sub_0205B408(UnkStruct_0205B43C *param0) { Sentence v0; @@ -184,7 +183,7 @@ static void sub_0205B408 (UnkStruct_0205B43C * param0) static int Unk_021C0850; -static void sub_0205B43C (UnkStruct_0205B43C * param0) +static void sub_0205B43C(UnkStruct_0205B43C *param0) { if (sub_02036AA0()) { Unk_021C0850 = 0; @@ -213,7 +212,7 @@ static void sub_0205B43C (UnkStruct_0205B43C * param0) } } -static void sub_0205B4B0 (UnkStruct_0205B43C * param0) +static void sub_0205B4B0(UnkStruct_0205B43C *param0) { if (sub_02036B44() == 1) { CommFieldCmd_Init((void *)param0->fieldSystem); @@ -221,10 +220,10 @@ static void sub_0205B4B0 (UnkStruct_0205B43C * param0) } } -static int sub_0205B4D4 (void) +static int sub_0205B4D4(void) { int v0, v1; - TrainerInfo * v2; + TrainerInfo *v2; v1 = 0; @@ -239,9 +238,9 @@ static int sub_0205B4D4 (void) return v1 >= 1; } -static void sub_0205B4F8 (UnkStruct_0205B43C * param0) +static void sub_0205B4F8(UnkStruct_0205B43C *param0) { - UnkStruct_0205B4F8 * v0; + UnkStruct_0205B4F8 *v0; if (param0->unk_14 > 0) { param0->unk_14--; @@ -266,7 +265,7 @@ static void sub_0205B4F8 (UnkStruct_0205B43C * param0) } } -static void sub_0205B578 (UnkStruct_0205B43C * param0) +static void sub_0205B578(UnkStruct_0205B43C *param0) { if (sub_02038938() && (0 == sub_020360E8())) { return; @@ -280,23 +279,23 @@ static void sub_0205B578 (UnkStruct_0205B43C * param0) } } -static void sub_0205B5B4 (UnkStruct_0205B43C * param0, UnkFuncPtr_0205B43C param1, int param2) +static void sub_0205B5B4(UnkStruct_0205B43C *param0, UnkFuncPtr_0205B43C param1, int param2) { param0->unk_10 = param1; param0->unk_14 = param2; } -static WMBssDesc * Unk_021C085C[16]; +static WMBssDesc *Unk_021C085C[16]; -void sub_0205B5BC (SysTask * param0, void * param1) +void sub_0205B5BC(SysTask *param0, void *param1) { - UnkStruct_0205B43C * v0 = (UnkStruct_0205B43C *)param1; + UnkStruct_0205B43C *v0 = (UnkStruct_0205B43C *)param1; if (v0 == NULL) { SysTask_Done(param0); } else { int v1; - WMBssDesc * v2; + WMBssDesc *v2; for (v1 = 0; v1 < 16; v1++) { v0->unk_110[v1] = sub_02033F3C(v1); @@ -309,7 +308,7 @@ void sub_0205B5BC (SysTask * param0, void * param1) } } -static void sub_0205B5FC (UnkStruct_0205B43C * param0) +static void sub_0205B5FC(UnkStruct_0205B43C *param0) { if (param0->unk_14 != 0) { param0->unk_14--; @@ -320,7 +319,7 @@ static void sub_0205B5FC (UnkStruct_0205B43C * param0) sub_0205B5B4(param0, sub_0205B620, 0); } -static void sub_0205B620 (UnkStruct_0205B43C * param0) +static void sub_0205B620(UnkStruct_0205B43C *param0) { if (CommSys_IsInitialized()) { return; @@ -329,7 +328,7 @@ static void sub_0205B620 (UnkStruct_0205B43C * param0) sub_0205B754(param0); } -static void sub_0205B634 (UnkStruct_0205B43C * param0) +static void sub_0205B634(UnkStruct_0205B43C *param0) { if (1 == sub_02036A68()) { CommInfo_SendBattleRegulation(); @@ -354,7 +353,7 @@ static void sub_0205B634 (UnkStruct_0205B43C * param0) param0->unk_44 = 0; } -static void sub_0205B694 (UnkStruct_0205B43C * param0) +static void sub_0205B694(UnkStruct_0205B43C *param0) { if (!sub_020509A4(param0->fieldSystem)) { sub_02036AC4(); @@ -364,7 +363,7 @@ static void sub_0205B694 (UnkStruct_0205B43C * param0) } } -static void sub_0205B6C4 (UnkStruct_0205B43C * param0) +static void sub_0205B6C4(UnkStruct_0205B43C *param0) { if (1 == sub_02036A68()) { if (CommInfo_TrainerInfo(CommSys_CurNetId()) != NULL) { @@ -387,7 +386,7 @@ static void sub_0205B6C4 (UnkStruct_0205B43C * param0) } } -static void sub_0205B72C (UnkStruct_0205B43C * param0) +static void sub_0205B72C(UnkStruct_0205B43C *param0) { if (0 == sub_02036A68()) { sub_02036AC4(); @@ -398,9 +397,9 @@ static void sub_0205B72C (UnkStruct_0205B43C * param0) } } -static void sub_0205B754 (UnkStruct_0205B43C * param0) +static void sub_0205B754(UnkStruct_0205B43C *param0) { - void * v0; + void *v0; if (param0 == NULL) { return; @@ -411,23 +410,23 @@ static void sub_0205B754 (UnkStruct_0205B43C * param0) Heap_Destroy(31); } -FieldSystem * sub_0205B770 (UnkStruct_0205B43C * param0) +FieldSystem *sub_0205B770(UnkStruct_0205B43C *param0) { return param0->fieldSystem; } -WMBssDesc * sub_0205B774 (UnkStruct_0205B43C * param0, int param1) +WMBssDesc *sub_0205B774(UnkStruct_0205B43C *param0, int param1) { return param0->unk_110[param1]; } -static UnkStruct_0205B4F8 * Unk_021C0854; +static UnkStruct_0205B4F8 *Unk_021C0854; -int sub_0205B780 (UnkStruct_0205B43C * param0, int param1) +int sub_0205B780(UnkStruct_0205B43C *param0, int param1) { - TrainerInfo * v0; - UnkStruct_0203330C * v1; - UnkStruct_0205B4F8 * v2; + TrainerInfo *v0; + UnkStruct_0203330C *v1; + UnkStruct_0205B4F8 *v2; param1--; v0 = sub_02033FB0(param1); @@ -474,11 +473,11 @@ int sub_0205B780 (UnkStruct_0205B43C * param0, int param1) return 5; } -int sub_0205B804 (UnkStruct_0205B43C * param0, int param1, u16 param2) +int sub_0205B804(UnkStruct_0205B43C *param0, int param1, u16 param2) { - TrainerInfo * v0; - UnkStruct_0203330C * v1; - UnkStruct_0205B4F8 * v2; + TrainerInfo *v0; + UnkStruct_0203330C *v1; + UnkStruct_0205B4F8 *v2; param1--; @@ -556,12 +555,12 @@ int sub_0205B804 (UnkStruct_0205B43C * param0, int param1, u16 param2) return 0; } -u32 sub_0205B8D8 (UnkStruct_0205B43C * param0) +u32 sub_0205B8D8(UnkStruct_0205B43C *param0) { return param0->unk_1C; } -u32 sub_0205B8DC (UnkStruct_0205B43C * param0) +u32 sub_0205B8DC(UnkStruct_0205B43C *param0) { if (param0->unk_44) { return 7; @@ -584,7 +583,7 @@ u32 sub_0205B8DC (UnkStruct_0205B43C * param0) return 7; } -u32 sub_0205B91C (UnkStruct_0205B43C * param0) +u32 sub_0205B91C(UnkStruct_0205B43C *param0) { if (sub_02036AA0() == 1) { return param0->unk_30; @@ -593,7 +592,7 @@ u32 sub_0205B91C (UnkStruct_0205B43C * param0) return 7; } -void sub_0205B930 (UnkStruct_0205B43C * param0, int param1, u32 param2) +void sub_0205B930(UnkStruct_0205B43C *param0, int param1, u32 param2) { u8 v0 = (u8)param2; @@ -620,19 +619,19 @@ void sub_0205B930 (UnkStruct_0205B43C * param0, int param1, u32 param2) } } -void sub_0205B988 (int param0, int param1, void * param2, void * param3) +void sub_0205B988(int param0, int param1, void *param2, void *param3) { return; } -void sub_0205B98C (int param0, int param1, void * param2, void * param3) +void sub_0205B98C(int param0, int param1, void *param2, void *param3) { return; } -void sub_0205B990 (int param0, int param1, void * param2, void * param3) +void sub_0205B990(int param0, int param1, void *param2, void *param3) { - FieldSystem * fieldSystem = (FieldSystem *)param3; + FieldSystem *fieldSystem = (FieldSystem *)param3; sub_0205B5B4(fieldSystem->unk_7C, sub_0205B43C, 2); sub_0205C160(fieldSystem->unk_7C); @@ -640,10 +639,10 @@ void sub_0205B990 (int param0, int param1, void * param2, void * param3) static int Unk_021C0858; -void sub_0205B9AC (int param0, int param1, void * param2, void * param3) +void sub_0205B9AC(int param0, int param1, void *param2, void *param3) { - FieldSystem * fieldSystem = (FieldSystem *)param3; - u8 * v1 = (u8 *)param2; + FieldSystem *fieldSystem = (FieldSystem *)param3; + u8 *v1 = (u8 *)param2; if (fieldSystem->unk_7C->unk_44 == 0) { fieldSystem->unk_7C->unk_30 = *v1; @@ -651,10 +650,10 @@ void sub_0205B9AC (int param0, int param1, void * param2, void * param3) } } -void sub_0205B9C4 (int param0, int param1, void * param2, void * param3) +void sub_0205B9C4(int param0, int param1, void *param2, void *param3) { - FieldSystem * fieldSystem = (FieldSystem *)param3; - u8 * v1 = (u8 *)param2; + FieldSystem *fieldSystem = (FieldSystem *)param3; + u8 *v1 = (u8 *)param2; fieldSystem->unk_7C->unk_2C = 1; fieldSystem->unk_7C->unk_40 = *v1; @@ -664,19 +663,19 @@ void sub_0205B9C4 (int param0, int param1, void * param2, void * param3) } } -void sub_0205B9E0 (int param0, int param1, void * param2, void * param3) +void sub_0205B9E0(int param0, int param1, void *param2, void *param3) { - FieldSystem * fieldSystem = (FieldSystem *)param3; + FieldSystem *fieldSystem = (FieldSystem *)param3; fieldSystem->unk_7C->unk_44 = 1; } -int sub_0205B9E8 (UnkStruct_0205B43C * param0) +int sub_0205B9E8(UnkStruct_0205B43C *param0) { return param0->unk_44; } -int sub_0205B9EC (UnkStruct_0205B43C * param0, int param1) +int sub_0205B9EC(UnkStruct_0205B43C *param0, int param1) { if (param0->unk_30 == 0) { CommSys_SendData(104, NULL, 0); @@ -686,16 +685,16 @@ int sub_0205B9EC (UnkStruct_0205B43C * param0, int param1) return 0; } -void sub_0205BA08 (int param0, int param1, void * param2, void * param3) +void sub_0205BA08(int param0, int param1, void *param2, void *param3) { - FieldSystem * fieldSystem = (FieldSystem *)param3; - TrainerCard * v1 = (TrainerCard *)param2; - TrainerInfo * v2 = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); - void * v3; + FieldSystem *fieldSystem = (FieldSystem *)param3; + TrainerCard *v1 = (TrainerCard *)param2; + TrainerInfo *v2 = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); + void *v3; { int v4, v5 = 0; - u8 * v6 = (u8 *)param2; + u8 *v6 = (u8 *)param2; for (v4 = 0; v4 < sizeof(TrainerCard); v4++) { v5 ^= v6[v4]; @@ -710,24 +709,24 @@ void sub_0205BA08 (int param0, int param1, void * param2, void * param3) } } -u8 * sub_0205BA5C (int param0, void * param1, int param2) +u8 *sub_0205BA5C(int param0, void *param1, int param2) { - FieldSystem * fieldSystem = (FieldSystem *)param1; - UnkStruct_0205B43C * v1 = fieldSystem->unk_7C; + FieldSystem *fieldSystem = (FieldSystem *)param1; + UnkStruct_0205B43C *v1 = fieldSystem->unk_7C; return (u8 *)v1->unk_188[param0]; } -void sub_0205BA6C (int param0, int param1, void * param2, void * param3) +void sub_0205BA6C(int param0, int param1, void *param2, void *param3) { - FieldSystem * fieldSystem = (FieldSystem *)param3; - UnkStruct_0205B43C * v1 = fieldSystem->unk_7C; - u8 * v2 = (u8 *)param2; + FieldSystem *fieldSystem = (FieldSystem *)param3; + UnkStruct_0205B43C *v1 = fieldSystem->unk_7C; + u8 *v2 = (u8 *)param2; v1->unk_176[param0] = *v2; } -u16 sub_0205BA7C (UnkStruct_0205B43C * param0) +u16 sub_0205BA7C(UnkStruct_0205B43C *param0) { int v0 = CommSys_CurNetId(); @@ -742,58 +741,58 @@ u16 sub_0205BA7C (UnkStruct_0205B43C * param0) return 0; } -void sub_0205BAAC (int param0) +void sub_0205BAAC(int param0) { u8 v0 = param0; CommSys_SendData(101, &v0, 1); } static const int Unk_020ED560[2][2] = { - {0x2C, 0x68}, - {0x2D, 0x69} + { 0x2C, 0x68 }, + { 0x2D, 0x69 } }; static const int Unk_020ED600[4][2] = { - {0x35, 0x71}, - {0x36, 0x72}, - {0x37, 0x73}, - {0x38, 0x74} + { 0x35, 0x71 }, + { 0x36, 0x72 }, + { 0x37, 0x73 }, + { 0x38, 0x74 } }; static const int Unk_020ED620[4][2] = { - {0x3D, 0x79}, - {0x3E, 0x7A}, - {0x3F, 0x7B}, - {0x40, 0x7C} + { 0x3D, 0x79 }, + { 0x3E, 0x7A }, + { 0x3F, 0x7B }, + { 0x40, 0x7C } }; static const int Unk_020ED550[2][2] = { - {0x44, 0x80}, - {0x45, 0x81} + { 0x44, 0x80 }, + { 0x45, 0x81 } }; static const int Unk_020ED640[4][2] = { - {0x4F, 0x8B}, - {0x50, 0x8C}, - {0x51, 0x8D}, - {0x52, 0x8E} + { 0x4F, 0x8B }, + { 0x50, 0x8C }, + { 0x51, 0x8D }, + { 0x52, 0x8E } }; static const int Unk_020ED660[4][2] = { - {0x5D, 0x99}, - {0x5E, 0x9A}, - {0x5F, 0x9B}, - {0x60, 0x9C} + { 0x5D, 0x99 }, + { 0x5E, 0x9A }, + { 0x5F, 0x9B }, + { 0x60, 0x9C } }; static const int Unk_020ED6E8[][2] = { - {0x2C, 0x68}, - {0x3A, 0x76}, - {0x42, 0x7E}, - {0x2F, 0x6B}, - {0x49, 0x85}, - {0x54, 0x90}, - {0x54, 0x90} + { 0x2C, 0x68 }, + { 0x3A, 0x76 }, + { 0x42, 0x7E }, + { 0x2F, 0x6B }, + { 0x49, 0x85 }, + { 0x54, 0x90 }, + { 0x54, 0x90 } }; static const int Unk_020ED520[2] = { @@ -807,46 +806,46 @@ static const int Unk_020ED548[2] = { }; static const int Unk_020ED680[][2] = { - {0x2B, 0x67}, - {0x30, 0x6C}, - {0x3B, 0x77}, - {0x43, 0x7F}, - {0x55, 0x91}, - {0x4A, 0x86} + { 0x2B, 0x67 }, + { 0x30, 0x6C }, + { 0x3B, 0x77 }, + { 0x43, 0x7F }, + { 0x55, 0x91 }, + { 0x4A, 0x86 } }; static const int Unk_020ED5CC[][2] = { - {0x3C, 0x78}, - {0x46, 0x82}, - {0x56, 0x92} + { 0x3C, 0x78 }, + { 0x46, 0x82 }, + { 0x56, 0x92 } }; static const int Unk_020ED6B0[][2] = { - {0x2A, 0x66}, - {0x39, 0x75}, - {0x41, 0x7D}, - {0x2E, 0x6A}, - {0x48, 0x84}, - {0x53, 0x8F}, - {0x53, 0x8F} + { 0x2A, 0x66 }, + { 0x39, 0x75 }, + { 0x41, 0x7D }, + { 0x2E, 0x6A }, + { 0x48, 0x84 }, + { 0x53, 0x8F }, + { 0x53, 0x8F } }; static const int Unk_020ED584[][2] = { - {0x31, 0x6D}, - {0x4B, 0x87}, - {0x57, 0x93} + { 0x31, 0x6D }, + { 0x4B, 0x87 }, + { 0x57, 0x93 } }; static const int Unk_020ED59C[][2] = { - {0x33, 0x6F}, - {0x4D, 0x89}, - {0x59, 0x95} + { 0x33, 0x6F }, + { 0x4D, 0x89 }, + { 0x59, 0x95 } }; static const int Unk_020ED5B4[][2] = { - {0x32, 0x6E}, - {0x4C, 0x88}, - {0x58, 0x94} + { 0x32, 0x6E }, + { 0x4C, 0x88 }, + { 0x58, 0x94 } }; static const int Unk_020ED530[] = { @@ -882,7 +881,7 @@ const u16 Unk_020ED570[] = { 0x2E }; -static int sub_0205BAC0 (int param0) +static int sub_0205BAC0(int param0) { int v0, v1, v2; @@ -895,12 +894,12 @@ static int sub_0205BAC0 (int param0) return -1; } -static int sub_0205BAE8 (UnkStruct_0205B43C * param0, int param1) +static int sub_0205BAE8(UnkStruct_0205B43C *param0, int param1) { int v0, v1; - TrainerInfo * v2; - UnkStruct_0203330C * v3; - UnkStruct_0205B4F8 * v4; + TrainerInfo *v2; + UnkStruct_0203330C *v3; + UnkStruct_0205B4F8 *v4; if (param1 > 9) { v1 = sub_0205BAC0(param1); @@ -961,7 +960,7 @@ static int sub_0205BAE8 (UnkStruct_0205B43C * param0, int param1) return 40; } -int sub_0205BC50 (StringTemplate * param0) +int sub_0205BC50(StringTemplate *param0) { u8 v0, v1; u8 v2, v3; @@ -1002,7 +1001,7 @@ int sub_0205BC50 (StringTemplate * param0) return 15; } -static int sub_0205BCD4 (int param0, int param1, StringTemplate * param2) +static int sub_0205BCD4(int param0, int param1, StringTemplate *param2) { if (param0 != (1 - 1)) { return Unk_020ED6E8[param0][param1]; @@ -1011,10 +1010,10 @@ static int sub_0205BCD4 (int param0, int param1, StringTemplate * param2) return sub_0205BC50(param2); } -int sub_0205BCF4 (UnkStruct_0205B43C * param0, int param1, int param2, StringTemplate * param3) +int sub_0205BCF4(UnkStruct_0205B43C *param0, int param1, int param2, StringTemplate *param3) { int v0; - TrainerInfo * v1; + TrainerInfo *v1; param1--; @@ -1094,10 +1093,10 @@ int sub_0205BCF4 (UnkStruct_0205B43C * param0, int param1, int param2, StringTem return 40; } -u8 sub_0205BE38 (void) +u8 sub_0205BE38(void) { u8 v0; - TrainerInfo * v1; + TrainerInfo *v1; v1 = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); GF_ASSERT(v1 != NULL); @@ -1106,9 +1105,9 @@ u8 sub_0205BE38 (void) return v0; } -static void sub_0205BE58 (UnkStruct_0205B4F8 * param0, int param1) +static void sub_0205BE58(UnkStruct_0205B4F8 *param0, int param1) { - TrainerInfo * v0; + TrainerInfo *v0; int v1, v2 = 0; for (v1 = 1; v1 < 4 + 1; v1++) { @@ -1128,7 +1127,7 @@ static void sub_0205BE58 (UnkStruct_0205B4F8 * param0, int param1) } } -void sub_0205BEA8 (int param0) +void sub_0205BEA8(int param0) { UnkStruct_0205B4F8 v0; @@ -1198,7 +1197,7 @@ static const int Unk_020ED720[] = { 0xBC }; -int sub_0205BF44 (UnkStruct_0205B43C * param0, StringTemplate * param1) +int sub_0205BF44(UnkStruct_0205B43C *param0, StringTemplate *param1) { int v0, v1 = 0, v2; u16 v3; @@ -1239,7 +1238,7 @@ int sub_0205BF44 (UnkStruct_0205B43C * param0, StringTemplate * param1) return Unk_020ED720[v2]; } -static void sub_0205BFF0 (UnkStruct_0205B4F8 * param0) +static void sub_0205BFF0(UnkStruct_0205B4F8 *param0) { int v0; @@ -1253,13 +1252,13 @@ static void sub_0205BFF0 (UnkStruct_0205B4F8 * param0) } } -void sub_0205C010 (UnkStruct_0205B43C * param0, Sentence * param1) +void sub_0205C010(UnkStruct_0205B43C *param0, Sentence *param1) { sub_02014CC0(¶m0->unk_178, param1); param0->unk_180 = 1; } -Sentence * sub_0205C028 (UnkStruct_0205B43C * param0) +Sentence *sub_0205C028(UnkStruct_0205B43C *param0) { if (param0->unk_180 == 0) { return NULL; @@ -1269,11 +1268,11 @@ Sentence * sub_0205C028 (UnkStruct_0205B43C * param0) return ¶m0->unk_178; } -void sub_0205C040 (StringTemplate * param0, int param1, int param2, TrainerInfo * param3, UnkStruct_02014EC4 * param4) +void sub_0205C040(StringTemplate *param0, int param1, int param2, TrainerInfo *param3, UnkStruct_02014EC4 *param4) { - TrainerInfo * v0; - Strbuf* v1; - MessageLoader * v2 = MessageLoader_Init(1, 26, 635, 4); + TrainerInfo *v0; + Strbuf *v1; + MessageLoader *v2 = MessageLoader_Init(1, 26, 635, 4); int v3, v4; param2--; @@ -1296,7 +1295,13 @@ void sub_0205C040 (StringTemplate * param0, int param1, int param2, TrainerInfo if ((v3 >= 1) && (v3 <= 7)) { static const int v5[] = { - 0, 1, 2, 3, 4, -1, 5, + 0, + 1, + 2, + 3, + 4, + -1, + 5, }; u16 v6 = v3 - 1; @@ -1335,7 +1340,7 @@ void sub_0205C040 (StringTemplate * param0, int param1, int param2, TrainerInfo MessageLoader_Free(v2); } -void sub_0205C12C (Sentence * param0) +void sub_0205C12C(Sentence *param0) { UnkStruct_0205B4F8 v0; @@ -1347,14 +1352,14 @@ void sub_0205C12C (Sentence * param0) sub_020340FC(); } -void sub_0205C154 (UnkStruct_0205B43C * param0) +void sub_0205C154(UnkStruct_0205B43C *param0) { param0->unk_30 = 0; param0->unk_40 = 0; param0->unk_44 = 0; } -static void sub_0205C160 (UnkStruct_0205B43C * param0) +static void sub_0205C160(UnkStruct_0205B43C *param0) { param0->unk_20 = 0; param0->unk_24 = 0; @@ -1366,7 +1371,7 @@ static void sub_0205C160 (UnkStruct_0205B43C * param0) param0->unk_44 = 0; } -void * sub_0205C17C (UnkStruct_0205B43C * param0) +void *sub_0205C17C(UnkStruct_0205B43C *param0) { param0->unk_184 = sub_02071F04(0); param0->unk_188[0] = sub_02071F04(0); @@ -1377,14 +1382,14 @@ void * sub_0205C17C (UnkStruct_0205B43C * param0) return (void *)param0->unk_188[CommSys_CurNetId() ^ 1]; } -void sub_0205C1F0 (UnkStruct_0205B43C * param0) +void sub_0205C1F0(UnkStruct_0205B43C *param0) { Heap_FreeToHeap(param0->unk_188[0]); Heap_FreeToHeap(param0->unk_188[1]); Heap_FreeToHeap(param0->unk_184); } -void sub_0205C214 (UnkStruct_0205B43C * param0) +void sub_0205C214(UnkStruct_0205B43C *param0) { CommSys_SendDataHuge(105, param0->unk_184, sizeof(TrainerCard)); } diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c index 9bcecb6b80..b07638a670 100644 --- a/src/unk_0205C22C.c +++ b/src/unk_0205C22C.c @@ -1,63 +1,63 @@ +#include "unk_0205C22C.h" + #include #include -#include "sys_task_manager.h" -#include "trainer_info.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0205B43C_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" - -#include "constdata/const_020ED570.h" - #include "struct_defs/struct_0203330C.h" -#include "field/field_system.h" #include "struct_defs/struct_0205B4F8.h" #include "struct_defs/struct_0205C22C.h" #include "struct_defs/struct_0205C680.h" #include "struct_defs/struct_0205C924.h" #include "struct_defs/struct_0205C95C.h" -#include "unk_02005474.h" -#include "sys_task.h" -#include "unk_02014A84.h" +#include "field/field_system.h" +#include "overlay005/ov5_021F134C.h" +#include "overlay005/ov5_021F600C.h" + #include "heap.h" -#include "strbuf.h" +#include "map_object.h" +#include "player_avatar.h" #include "savedata.h" +#include "strbuf.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "trainer_info.h" +#include "unk_02005474.h" +#include "unk_02014A84.h" #include "unk_02027F84.h" #include "unk_020366A0.h" #include "unk_020508D4.h" #include "unk_0205B33C.h" -#include "unk_0205C22C.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_020655F4.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021F134C.h" -#include "overlay005/ov5_021F600C.h" -static void sub_0205C304(SysTask * param0, void * param1); -static void sub_0205C44C(UnkStruct_0205C22C * param0, UnkStruct_0205B43C * param1, MapObjectManager * param2, UnkStruct_02027F8C * param3); -static int sub_0205C340(UnkStruct_0205C22C * param0, int param1, WMBssDesc * param2, UnkStruct_02027F8C * param3); -static void sub_0205C51C(UnkStruct_0205C22C * param0, MapObjectManager * param1); -static void sub_0205C680(UnkStruct_0205C680 * param0, int param1); -static void sub_0205C6BC(UnkStruct_0205C680 * param0); -static void sub_0205C6E0(UnkStruct_0205C680 * param0, MapObject * param1, int param2, int param3); -static void sub_0205C788(UnkStruct_0205C680 * param0, MapObject * param1); -static void sub_0205C7BC(UnkStruct_0205C680 * param0, MapObject * param1); -static void sub_0205C7E4(MapObjectManager * param0, int param1, int param2); +#include "constdata/const_020ED570.h" + +static void sub_0205C304(SysTask *param0, void *param1); +static void sub_0205C44C(UnkStruct_0205C22C *param0, UnkStruct_0205B43C *param1, MapObjectManager *param2, UnkStruct_02027F8C *param3); +static int sub_0205C340(UnkStruct_0205C22C *param0, int param1, WMBssDesc *param2, UnkStruct_02027F8C *param3); +static void sub_0205C51C(UnkStruct_0205C22C *param0, MapObjectManager *param1); +static void sub_0205C680(UnkStruct_0205C680 *param0, int param1); +static void sub_0205C6BC(UnkStruct_0205C680 *param0); +static void sub_0205C6E0(UnkStruct_0205C680 *param0, MapObject *param1, int param2, int param3); +static void sub_0205C788(UnkStruct_0205C680 *param0, MapObject *param1); +static void sub_0205C7BC(UnkStruct_0205C680 *param0, MapObject *param1); +static void sub_0205C7E4(MapObjectManager *param0, int param1, int param2); static void sub_0205C444(UnkStruct_0205C680 param0[], int param1, int param2); -void sub_0205C970(UnkStruct_0205C95C * param0); -UnkStruct_0205C95C * sub_0205C95C(int param0); -static void sub_0205C944(UnkStruct_0205C95C * param0); -static void sub_0205C924(UnkStruct_0205C924 * param0); -static void sub_0205C900(UnkStruct_0205C95C * param0); -static void sub_0205C8DC(UnkStruct_0205C924 * param0); - -UnkStruct_0205C22C * sub_0205C22C (UnkStruct_0205B43C * param0) +void sub_0205C970(UnkStruct_0205C95C *param0); +UnkStruct_0205C95C *sub_0205C95C(int param0); +static void sub_0205C944(UnkStruct_0205C95C *param0); +static void sub_0205C924(UnkStruct_0205C924 *param0); +static void sub_0205C900(UnkStruct_0205C95C *param0); +static void sub_0205C8DC(UnkStruct_0205C924 *param0); + +UnkStruct_0205C22C *sub_0205C22C(UnkStruct_0205B43C *param0) { - UnkStruct_0205C22C * v0 = (UnkStruct_0205C22C *)Heap_AllocFromHeap(31, sizeof(UnkStruct_0205C22C)); + UnkStruct_0205C22C *v0 = (UnkStruct_0205C22C *)Heap_AllocFromHeap(31, sizeof(UnkStruct_0205C22C)); MI_CpuClearFast(v0, sizeof(UnkStruct_0205C22C)); @@ -75,7 +75,7 @@ UnkStruct_0205C22C * sub_0205C22C (UnkStruct_0205B43C * param0) return v0; } -void sub_0205C2B0 (UnkStruct_0205C22C * param0) +void sub_0205C2B0(UnkStruct_0205C22C *param0) { int v0; @@ -86,7 +86,7 @@ void sub_0205C2B0 (UnkStruct_0205C22C * param0) } } -void sub_0205C2C8 (UnkStruct_0205C22C * param0) +void sub_0205C2C8(UnkStruct_0205C22C *param0) { int v0; @@ -98,7 +98,7 @@ void sub_0205C2C8 (UnkStruct_0205C22C * param0) } } -void sub_0205C2E0 (UnkStruct_0205C22C * param0) +void sub_0205C2E0(UnkStruct_0205C22C *param0) { SysTask_Done(param0->unk_04); sub_0205C970(param0->unk_478); @@ -106,10 +106,10 @@ void sub_0205C2E0 (UnkStruct_0205C22C * param0) Heap_FreeToHeap(param0); } -static void sub_0205C304 (SysTask * task, void * param1) +static void sub_0205C304(SysTask *task, void *param1) { - UnkStruct_0205C22C * v0 = (UnkStruct_0205C22C *)param1; - UnkStruct_0205B43C * v1 = v0->unk_00; + UnkStruct_0205C22C *v0 = (UnkStruct_0205C22C *)param1; + UnkStruct_0205B43C *v1 = v0->unk_00; if (!sub_020509A4(v0->fieldSystem)) { v0->playerAvatar = v0->fieldSystem->playerAvatar; @@ -118,12 +118,12 @@ static void sub_0205C304 (SysTask * task, void * param1) } } -static int sub_0205C340 (UnkStruct_0205C22C * param0, int param1, WMBssDesc * param2, UnkStruct_02027F8C * param3) +static int sub_0205C340(UnkStruct_0205C22C *param0, int param1, WMBssDesc *param2, UnkStruct_02027F8C *param3) { int v0, v1, v2 = 0; - UnkStruct_0203330C * v3; - UnkStruct_0205B4F8 * v4; - MapObject * v5; + UnkStruct_0203330C *v3; + UnkStruct_0205B4F8 *v4; + MapObject *v5; if (param2 == NULL) { for (v0 = 0; v0 < 4; v0++) { @@ -181,17 +181,17 @@ static int sub_0205C340 (UnkStruct_0205C22C * param0, int param1, WMBssDesc * pa return v2; } -static void sub_0205C444 (UnkStruct_0205C680 param0[], int param1, int param2) +static void sub_0205C444(UnkStruct_0205C680 param0[], int param1, int param2) { param0[param1].unk_00 = param2; } -static void sub_0205C44C (UnkStruct_0205C22C * param0, UnkStruct_0205B43C * param1, MapObjectManager * param2, UnkStruct_02027F8C * param3) +static void sub_0205C44C(UnkStruct_0205C22C *param0, UnkStruct_0205B43C *param1, MapObjectManager *param2, UnkStruct_02027F8C *param3) { - WMBssDesc * v0; + WMBssDesc *v0; int v1; - UnkStruct_0203330C * v2; - TrainerInfo * v3; + UnkStruct_0203330C *v2; + TrainerInfo *v3; for (v1 = 0; v1 < 10; v1++) { v0 = sub_0205B774(param1, v1); @@ -240,9 +240,9 @@ static void sub_0205C44C (UnkStruct_0205C22C * param0, UnkStruct_0205B43C * para } } -static void sub_0205C51C (UnkStruct_0205C22C * param0, MapObjectManager * param1) +static void sub_0205C51C(UnkStruct_0205C22C *param0, MapObjectManager *param1) { - MapObject * v0; + MapObject *v0; int v1, v2, v3; GF_ASSERT(param0->playerAvatar != NULL); @@ -323,7 +323,7 @@ static void sub_0205C51C (UnkStruct_0205C22C * param0, MapObjectManager * param1 sub_0205C6BC(¶m0->unk_0C[50]); } -static void sub_0205C680 (UnkStruct_0205C680 * param0, int param1) +static void sub_0205C680(UnkStruct_0205C680 *param0, int param1) { if (param0->unk_10 != NULL) { if (sub_020714F0(param0->unk_10)) { @@ -344,7 +344,7 @@ static void sub_0205C680 (UnkStruct_0205C680 * param0, int param1) } } -static void sub_0205C6BC (UnkStruct_0205C680 * param0) +static void sub_0205C6BC(UnkStruct_0205C680 *param0) { if (param0->unk_04) { param0->unk_06--; @@ -356,7 +356,7 @@ static void sub_0205C6BC (UnkStruct_0205C680 * param0) } } -static void sub_0205C6E0 (UnkStruct_0205C680 * param0, MapObject * param1, int param2, int param3) +static void sub_0205C6E0(UnkStruct_0205C680 *param0, MapObject *param1, int param2, int param3) { int v0, v1, v2; @@ -390,7 +390,7 @@ static void sub_0205C6E0 (UnkStruct_0205C680 * param0, MapObject * param1, int p } } -static void sub_0205C788 (UnkStruct_0205C680 * param0, MapObject * param1) +static void sub_0205C788(UnkStruct_0205C680 *param0, MapObject *param1) { LocalMapObj_SetAnimationCode(param1, 0x43); sub_02062DB4(param1, 1); @@ -402,7 +402,7 @@ static void sub_0205C788 (UnkStruct_0205C680 * param0, MapObject * param1) param0->unk_01 = 3; } -static void sub_0205C7BC (UnkStruct_0205C680 * param0, MapObject * param1) +static void sub_0205C7BC(UnkStruct_0205C680 *param0, MapObject *param1) { if (param0->unk_03 == 1) { if (param0->unk_04 == 0) { @@ -414,10 +414,10 @@ static void sub_0205C7BC (UnkStruct_0205C680 * param0, MapObject * param1) } } -static void sub_0205C7E4 (MapObjectManager * mapObjMan, int param1, int param2) +static void sub_0205C7E4(MapObjectManager *mapObjMan, int param1, int param2) { int v0; - MapObject * v1; + MapObject *v1; for (v0 = param1; v0 < param2; v0++) { v1 = MapObjMan_LocalMapObjByIndex(mapObjMan, v0); @@ -432,10 +432,10 @@ static void sub_0205C7E4 (MapObjectManager * mapObjMan, int param1, int param2) } } -void sub_0205C820 (MapObjectManager * mapObjMan, UnkStruct_0205C22C * param1) +void sub_0205C820(MapObjectManager *mapObjMan, UnkStruct_0205C22C *param1) { - MapObject * mapObj; - UnkStruct_0205C680 * v1; + MapObject *mapObj; + UnkStruct_0205C680 *v1; mapObj = MapObjMan_LocalMapObjByIndex(mapObjMan, 0); @@ -486,7 +486,7 @@ void sub_0205C820 (MapObjectManager * mapObjMan, UnkStruct_0205C22C * param1) } } -static void sub_0205C8DC (UnkStruct_0205C924 * param0) +static void sub_0205C8DC(UnkStruct_0205C924 *param0) { param0->unk_00 = Strbuf_Init(7 + 1, 89); param0->unk_04 = NULL; @@ -498,7 +498,7 @@ static void sub_0205C8DC (UnkStruct_0205C924 * param0) param0->unk_0C = 0; } -static void sub_0205C900 (UnkStruct_0205C95C * param0) +static void sub_0205C900(UnkStruct_0205C95C *param0) { int v0; @@ -510,7 +510,7 @@ static void sub_0205C900 (UnkStruct_0205C95C * param0) param0->unk_34C = 0; } -static void sub_0205C924 (UnkStruct_0205C924 * param0) +static void sub_0205C924(UnkStruct_0205C924 *param0) { Heap_FreeToHeap(param0->unk_00); @@ -523,7 +523,7 @@ static void sub_0205C924 (UnkStruct_0205C924 * param0) } } -static void sub_0205C944 (UnkStruct_0205C95C * param0) +static void sub_0205C944(UnkStruct_0205C95C *param0) { int v0; @@ -532,15 +532,15 @@ static void sub_0205C944 (UnkStruct_0205C95C * param0) } } -UnkStruct_0205C95C * sub_0205C95C (int param0) +UnkStruct_0205C95C *sub_0205C95C(int param0) { - UnkStruct_0205C95C * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0205C95C)); + UnkStruct_0205C95C *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0205C95C)); sub_0205C900(v0); return v0; } -void sub_0205C970 (UnkStruct_0205C95C * param0) +void sub_0205C970(UnkStruct_0205C95C *param0) { sub_0205C944(param0); Heap_FreeToHeap(param0); diff --git a/src/unk_0205C980.c b/src/unk_0205C980.c index d06b37981f..cb23776dc3 100644 --- a/src/unk_0205C980.c +++ b/src/unk_0205C980.c @@ -1,43 +1,43 @@ +#include "unk_0205C980.h" + #include #include - -#include "unk_02006E3C.h" -#include "string_template.h" #include "heap.h" -#include "unk_0205C980.h" +#include "string_template.h" +#include "unk_02006E3C.h" static const int Unk_020ED7F0[][3] = { - {0x3, 0x3C, 0x3C}, - {0x5, 0x6, 0x6}, - {0xB, 0x18, 0x18}, - {0x1f, 0x39, 0x39}, - {0x32, 0x30, 0x30}, - {0x33, 0xE, 0xE}, - {0x3E, 0x20, 0x20}, - {0x46, 0x31, 0x31}, - {0x6, 0x3, 0x3}, - {0x7, 0xA, 0xA}, - {0xD, 0x24, 0x24}, - {0xE, 0x19, 0x19}, - {0x23, 0x55, 0x55}, - {0x25, 0x23, 0x23}, - {0x2A, 0x12, 0x12}, - {0x3f, 0x21, 0x21} + { 0x3, 0x3C, 0x3C }, + { 0x5, 0x6, 0x6 }, + { 0xB, 0x18, 0x18 }, + { 0x1f, 0x39, 0x39 }, + { 0x32, 0x30, 0x30 }, + { 0x33, 0xE, 0xE }, + { 0x3E, 0x20, 0x20 }, + { 0x46, 0x31, 0x31 }, + { 0x6, 0x3, 0x3 }, + { 0x7, 0xA, 0xA }, + { 0xD, 0x24, 0x24 }, + { 0xE, 0x19, 0x19 }, + { 0x23, 0x55, 0x55 }, + { 0x25, 0x23, 0x23 }, + { 0x2A, 0x12, 0x12 }, + { 0x3f, 0x21, 0x21 } }; static const int Unk_020ED770[][4] = { - {0x0, 0x1, 0x2, 0x3}, - {0x1, 0x6, 0x7, 0x0}, - {0x2, 0x3, 0x4, 0x5}, - {0x3, 0x0, 0x5, 0x6}, - {0x4, 0x1, 0x2, 0x7}, - {0x5, 0x2, 0x7, 0x0}, - {0x6, 0x3, 0x4, 0x1}, - {0x7, 0x4, 0x5, 0x6} + { 0x0, 0x1, 0x2, 0x3 }, + { 0x1, 0x6, 0x7, 0x0 }, + { 0x2, 0x3, 0x4, 0x5 }, + { 0x3, 0x0, 0x5, 0x6 }, + { 0x4, 0x1, 0x2, 0x7 }, + { 0x5, 0x2, 0x7, 0x0 }, + { 0x6, 0x3, 0x4, 0x1 }, + { 0x7, 0x4, 0x5, 0x6 } }; -void sub_0205C980 (u32 param0, int param1, StringTemplate * param2) +void sub_0205C980(u32 param0, int param1, StringTemplate *param2) { int v0 = param0 % 8; int v1; @@ -48,7 +48,7 @@ void sub_0205C980 (u32 param0, int param1, StringTemplate * param2) } } -int sub_0205C9BC (u32 param0, int param1, u32 param2) +int sub_0205C9BC(u32 param0, int param1, u32 param2) { int v0 = param0 % 8; int v1 = Unk_020ED770[v0][param2] + 8 * param1; @@ -56,7 +56,7 @@ int sub_0205C9BC (u32 param0, int param1, u32 param2) return Unk_020ED7F0[v1][0]; } -static int sub_0205C9E0 (int param0, int param1) +static int sub_0205C9E0(int param0, int param1) { int v0; @@ -69,12 +69,12 @@ static int sub_0205C9E0 (int param0, int param1) return 0; } -int sub_0205CA0C (int param0, int param1) +int sub_0205CA0C(int param0, int param1) { return sub_0205C9E0(param0, param1); } -int sub_0205CA14 (int param0, int param1, int param2) +int sub_0205CA14(int param0, int param1, int param2) { int v0 = sub_0205C9E0(param0, param1); @@ -95,11 +95,11 @@ int sub_0205CA14 (int param0, int param1, int param2) return 0; } -u16 * sub_0205CA4C (int param0) +u16 *sub_0205CA4C(int param0) { - u8 * v0, * v1; - NNSG2dPaletteData * v2, * v3; - u16 * v4, * v5; + u8 *v0, *v1; + NNSG2dPaletteData *v2, *v3; + u16 *v4, *v5; int v6; v0 = sub_02006F88(86, 7, &v2, param0); diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c index 7a57df9700..0a29f5fc20 100644 --- a/src/unk_0205CA94.c +++ b/src/unk_0205CA94.c @@ -1,3 +1,5 @@ +#include "unk_0205CA94.h" + #include #include @@ -5,14 +7,19 @@ #include "struct_decls/struct_02009F38_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "trainer_info.h" - #include "struct_defs/struct_02009508.h" #include "struct_defs/struct_02009CFC.h" #include "struct_defs/struct_0200C738.h" + #include "field/field_system.h" #include "overlay115/struct_ov115_02261520.h" +#include "gx_layers.h" +#include "heap.h" +#include "map_object.h" +#include "player_avatar.h" +#include "sys_task_manager.h" +#include "trainer_info.h" #include "unk_02005474.h" #include "unk_0200679C.h" #include "unk_02006E3C.h" @@ -20,99 +27,92 @@ #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" -#include "gx_layers.h" #include "unk_020218BC.h" #include "unk_02025E08.h" -#include "trainer_info.h" -#include "unk_0205CA94.h" -#include "player_avatar.h" -#include "map_object.h" typedef struct { - GraphicElementManager * unk_00; - UnkStruct_02009508 * unk_04; - UnkStruct_02009714 * unk_08[4]; - UnkStruct_02009CFC * unk_18[2]; + GraphicElementManager *unk_00; + UnkStruct_02009508 *unk_04; + UnkStruct_02009714 *unk_08[4]; + UnkStruct_02009CFC *unk_18[2]; int unk_20[4]; UnkStruct_0200C738 unk_30; } UnkStruct_0205D094; typedef struct UnkStruct_0205D3AC_t { - void * unk_00; - void (* unk_04)(UnkStruct_0205D094 *, struct UnkStruct_0205D3AC_t *); - void (* unk_08)(struct UnkStruct_0205D3AC_t *); - int (* unk_0C)(struct UnkStruct_0205D3AC_t *); + void *unk_00; + void (*unk_04)(UnkStruct_0205D094 *, struct UnkStruct_0205D3AC_t *); + void (*unk_08)(struct UnkStruct_0205D3AC_t *); + int (*unk_0C)(struct UnkStruct_0205D3AC_t *); } UnkStruct_0205D3AC; typedef struct { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; UnkStruct_0205D094 unk_04; UnkStruct_0205D3AC unk_1C0[2]; int unk_1E0; int unk_1E4; int unk_1E8; - BOOL * unk_1EC; + BOOL *unk_1EC; } UnkStruct_0205D274; typedef struct { VecFx32 unk_00; - GraphicElementData * unk_0C; + GraphicElementData *unk_0C; int unk_10; } UnkStruct_0205D3C4; typedef struct { VecFx32 unk_00; - GraphicElementData * unk_0C; + GraphicElementData *unk_0C; int unk_10; int unk_14; } UnkStruct_0205D5E0; typedef struct { VecFx32 unk_00; - GraphicElementData * unk_0C; + GraphicElementData *unk_0C; int unk_10; } UnkStruct_0205D4A4; -static void sub_0205CA94(SysTask * param0, void * param1); -static void sub_0205CBFC(SysTask * param0, void * param1); -static void sub_0205CD3C(SysTask * param0, void * param1); -static void sub_0205CE7C(SysTask * param0, void * param1); -static UnkStruct_0205D274 * sub_0205D050(SysTaskFunc func, FieldSystem * fieldSystem, u32 param2); -static void sub_0205D080(SysTask * param0, UnkStruct_0205D274 * param1); -void sub_0205D094(UnkStruct_0205D094 * param0, int param1, u32 param2); -static void sub_0205D0AC(UnkStruct_0205D094 * param0); -static void sub_0205D274(UnkStruct_0205D274 * param0, UnkStruct_0205D3AC * param1, int param2); -static GraphicElementData * sub_0205D344(UnkStruct_0205D094 * param0, int param1, VecFx32 * param2, int param3, int param4); -static void sub_0205D3AC(UnkStruct_0205D3AC * param0); -static void sub_0205D0B4(UnkStruct_0205D094 * param0); -static void sub_0205D0D8(UnkStruct_0205D094 * param0, int param1, u32 param2); -static int sub_0205D1C4(UnkStruct_02009714 * param0, UnkStruct_02009CFC ** param1, u32 param2); -static void sub_0205D22C(UnkStruct_0205D094 * param0); -static void sub_0205D3C4(UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1); -static void sub_0205D404(struct UnkStruct_0205D3AC_t * param0); -static int sub_0205D424(struct UnkStruct_0205D3AC_t * param0); -static void sub_0205D4A4(UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1); -static void sub_0205D4E0(struct UnkStruct_0205D3AC_t * param0); -static int sub_0205D500(struct UnkStruct_0205D3AC_t * param0); -static void sub_0205D524(UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1); -static void sub_0205D564(struct UnkStruct_0205D3AC_t * param0); -static int sub_0205D584(struct UnkStruct_0205D3AC_t * param0); -static void sub_0205D5E0(UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1); -static void sub_0205D624(struct UnkStruct_0205D3AC_t * param0); -static int sub_0205D644(struct UnkStruct_0205D3AC_t * param0); -static void sub_0205D714(UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1); -static void sub_0205D768(struct UnkStruct_0205D3AC_t * param0); -static int sub_0205D788(struct UnkStruct_0205D3AC_t * param0); -static void sub_0205D844(UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1); -static void sub_0205D888(struct UnkStruct_0205D3AC_t * param0); -static int sub_0205D8A8(struct UnkStruct_0205D3AC_t * param0); +static void sub_0205CA94(SysTask *param0, void *param1); +static void sub_0205CBFC(SysTask *param0, void *param1); +static void sub_0205CD3C(SysTask *param0, void *param1); +static void sub_0205CE7C(SysTask *param0, void *param1); +static UnkStruct_0205D274 *sub_0205D050(SysTaskFunc func, FieldSystem *fieldSystem, u32 param2); +static void sub_0205D080(SysTask *param0, UnkStruct_0205D274 *param1); +void sub_0205D094(UnkStruct_0205D094 *param0, int param1, u32 param2); +static void sub_0205D0AC(UnkStruct_0205D094 *param0); +static void sub_0205D274(UnkStruct_0205D274 *param0, UnkStruct_0205D3AC *param1, int param2); +static GraphicElementData *sub_0205D344(UnkStruct_0205D094 *param0, int param1, VecFx32 *param2, int param3, int param4); +static void sub_0205D3AC(UnkStruct_0205D3AC *param0); +static void sub_0205D0B4(UnkStruct_0205D094 *param0); +static void sub_0205D0D8(UnkStruct_0205D094 *param0, int param1, u32 param2); +static int sub_0205D1C4(UnkStruct_02009714 *param0, UnkStruct_02009CFC **param1, u32 param2); +static void sub_0205D22C(UnkStruct_0205D094 *param0); +static void sub_0205D3C4(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1); +static void sub_0205D404(struct UnkStruct_0205D3AC_t *param0); +static int sub_0205D424(struct UnkStruct_0205D3AC_t *param0); +static void sub_0205D4A4(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1); +static void sub_0205D4E0(struct UnkStruct_0205D3AC_t *param0); +static int sub_0205D500(struct UnkStruct_0205D3AC_t *param0); +static void sub_0205D524(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1); +static void sub_0205D564(struct UnkStruct_0205D3AC_t *param0); +static int sub_0205D584(struct UnkStruct_0205D3AC_t *param0); +static void sub_0205D5E0(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1); +static void sub_0205D624(struct UnkStruct_0205D3AC_t *param0); +static int sub_0205D644(struct UnkStruct_0205D3AC_t *param0); +static void sub_0205D714(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1); +static void sub_0205D768(struct UnkStruct_0205D3AC_t *param0); +static int sub_0205D788(struct UnkStruct_0205D3AC_t *param0); +static void sub_0205D844(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1); +static void sub_0205D888(struct UnkStruct_0205D3AC_t *param0); +static int sub_0205D8A8(struct UnkStruct_0205D3AC_t *param0); const static u8 Unk_020ED8B4[2][2] = { - {0x2, 0x3}, - {0x5, 0x6} + { 0x2, 0x3 }, + { 0x5, 0x6 } }; const static u8 Unk_020ED8B0[4] = { @@ -122,9 +122,9 @@ const static u8 Unk_020ED8B0[4] = { NNS_G2D_VRAM_TYPE_2DMAIN }; -void sub_0205CA94 (SysTask * param0, void * param1) +void sub_0205CA94(SysTask *param0, void *param1) { - UnkStruct_0205D274 * v0 = (UnkStruct_0205D274 *)param1; + UnkStruct_0205D274 *v0 = (UnkStruct_0205D274 *)param1; int v1[2]; int v2; int v3; @@ -185,9 +185,9 @@ void sub_0205CA94 (SysTask * param0, void * param1) } } -void sub_0205CBFC (SysTask * param0, void * param1) +void sub_0205CBFC(SysTask *param0, void *param1) { - UnkStruct_0205D274 * v0 = (UnkStruct_0205D274 *)param1; + UnkStruct_0205D274 *v0 = (UnkStruct_0205D274 *)param1; int v1; int v2; u16 v3 = 0; @@ -241,9 +241,9 @@ void sub_0205CBFC (SysTask * param0, void * param1) } } -void sub_0205CD3C (SysTask * param0, void * param1) +void sub_0205CD3C(SysTask *param0, void *param1) { - UnkStruct_0205D274 * v0 = (UnkStruct_0205D274 *)param1; + UnkStruct_0205D274 *v0 = (UnkStruct_0205D274 *)param1; int v1; int v2; @@ -303,9 +303,9 @@ void sub_0205CD3C (SysTask * param0, void * param1) } } -void sub_0205CE7C (SysTask * param0, void * param1) +void sub_0205CE7C(SysTask *param0, void *param1) { - UnkStruct_0205D274 * v0 = (UnkStruct_0205D274 *)param1; + UnkStruct_0205D274 *v0 = (UnkStruct_0205D274 *)param1; int v1[2]; int v2; int v3; @@ -370,9 +370,9 @@ void sub_0205CE7C (SysTask * param0, void * param1) } } -void sub_0205CFDC (FieldSystem * fieldSystem, int param1, BOOL * param2) +void sub_0205CFDC(FieldSystem *fieldSystem, int param1, BOOL *param2) { - UnkStruct_0205D274 * v0; + UnkStruct_0205D274 *v0; switch (param1) { case 0: @@ -393,12 +393,12 @@ void sub_0205CFDC (FieldSystem * fieldSystem, int param1, BOOL * param2) v0->fieldSystem = fieldSystem; } -UnkStruct_0205D274 * sub_0205D050 (SysTaskFunc func, FieldSystem * fieldSystem, u32 param2) +UnkStruct_0205D274 *sub_0205D050(SysTaskFunc func, FieldSystem *fieldSystem, u32 param2) { - UnkStruct_0205D274 * v0; - SysTask * v1; + UnkStruct_0205D274 *v0; + SysTask *v1; int v2; - TrainerInfo * v3; + TrainerInfo *v3; v1 = SysTask_StartAndAllocateParam(func, sizeof(UnkStruct_0205D274), 5, 4); v0 = SysTask_GetParam(v1); @@ -410,24 +410,24 @@ UnkStruct_0205D274 * sub_0205D050 (SysTaskFunc func, FieldSystem * fieldSystem, return v0; } -void sub_0205D080 (SysTask * param0, UnkStruct_0205D274 * param1) +void sub_0205D080(SysTask *param0, UnkStruct_0205D274 *param1) { sub_0205D0AC(¶m1->unk_04); SysTask_FinishAndFreeParam(param0); } -void sub_0205D094 (UnkStruct_0205D094 * param0, int param1, u32 param2) +void sub_0205D094(UnkStruct_0205D094 *param0, int param1, u32 param2) { sub_0205D0B4(param0); sub_0205D0D8(param0, param1, param2); } -void sub_0205D0AC (UnkStruct_0205D094 * param0) +void sub_0205D0AC(UnkStruct_0205D094 *param0) { sub_0205D22C(param0); } -static void sub_0205D0B4 (UnkStruct_0205D094 * param0) +static void sub_0205D0B4(UnkStruct_0205D094 *param0) { param0->unk_00 = sub_020095C4(2, ¶m0->unk_30, 4); @@ -435,10 +435,10 @@ static void sub_0205D0B4 (UnkStruct_0205D094 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void sub_0205D0D8 (UnkStruct_0205D094 * param0, int param1, u32 param2) +static void sub_0205D0D8(UnkStruct_0205D094 *param0, int param1, u32 param2) { int v0; - void * v1; + void *v1; for (v0 = 0; v0 < 4; v0++) { param0->unk_08[v0] = sub_02009714(2, v0, 4); @@ -468,12 +468,12 @@ static void sub_0205D0D8 (UnkStruct_0205D094 * param0, int param1, u32 param2) Heap_FreeToHeap(v1); } -static int sub_0205D1C4 (UnkStruct_02009714 * param0, UnkStruct_02009CFC ** param1, u32 param2) +static int sub_0205D1C4(UnkStruct_02009714 *param0, UnkStruct_02009CFC **param1, u32 param2) { - UnkStruct_02009F38 * v0; - UnkStruct_02009CFC * v1; + UnkStruct_02009F38 *v0; + UnkStruct_02009CFC *v1; int v2; - void * v3; + void *v3; v0 = Heap_AllocFromHeapAtEnd(4, sub_02009F34()); v3 = sub_02006FE8(177, param2, 0, 4, 0); @@ -497,7 +497,7 @@ static int sub_0205D1C4 (UnkStruct_02009714 * param0, UnkStruct_02009CFC ** para return v2; } -static void sub_0205D22C (UnkStruct_0205D094 * param0) +static void sub_0205D22C(UnkStruct_0205D094 *param0) { int v0; @@ -519,7 +519,7 @@ static void sub_0205D22C (UnkStruct_0205D094 * param0) } } -void sub_0205D274 (UnkStruct_0205D274 * param0, UnkStruct_0205D3AC * param1, int param2) +void sub_0205D274(UnkStruct_0205D274 *param0, UnkStruct_0205D3AC *param1, int param2) { memset(param1, 0, sizeof(UnkStruct_0205D3AC)); @@ -559,11 +559,11 @@ void sub_0205D274 (UnkStruct_0205D274 * param0, UnkStruct_0205D3AC * param1, int param1->unk_04(¶m0->unk_04, param1); } -static GraphicElementData * sub_0205D344 (UnkStruct_0205D094 * param0, int param1, VecFx32 * param2, int param3, int param4) +static GraphicElementData *sub_0205D344(UnkStruct_0205D094 *param0, int param1, VecFx32 *param2, int param3, int param4) { UnkStruct_ov115_02261520 v0; - GraphicElementData * v1; - VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE}; + GraphicElementData *v1; + VecFx32 v2 = { FX32_ONE, FX32_ONE, FX32_ONE }; memset(&v0, 0, sizeof(UnkStruct_ov115_02261520)); @@ -581,15 +581,15 @@ static GraphicElementData * sub_0205D344 (UnkStruct_0205D094 * param0, int param return v1; } -void sub_0205D3AC (UnkStruct_0205D3AC * param0) +void sub_0205D3AC(UnkStruct_0205D3AC *param0) { param0->unk_08(param0); memset(param0, 0, sizeof(UnkStruct_0205D3AC)); } -void sub_0205D3C4 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1) +void sub_0205D3C4(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1) { - UnkStruct_0205D3C4 * v0; + UnkStruct_0205D3C4 *v0; param1->unk_00 = Heap_AllocFromHeap(4, sizeof(UnkStruct_0205D3C4)); memset(param1->unk_00, 0, sizeof(UnkStruct_0205D3C4)); @@ -601,9 +601,9 @@ void sub_0205D3C4 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa v0->unk_0C = sub_0205D344(param0, 0, &v0->unk_00, 0, 1); } -void sub_0205D404 (struct UnkStruct_0205D3AC_t * param0) +void sub_0205D404(struct UnkStruct_0205D3AC_t *param0) { - UnkStruct_0205D3C4 * v0 = (UnkStruct_0205D3C4 *)param0->unk_00; + UnkStruct_0205D3C4 *v0 = (UnkStruct_0205D3C4 *)param0->unk_00; if (param0->unk_00 != NULL) { sub_02021BD4(v0->unk_0C); @@ -613,10 +613,10 @@ void sub_0205D404 (struct UnkStruct_0205D3AC_t * param0) } } -int sub_0205D424 (struct UnkStruct_0205D3AC_t * param0) +int sub_0205D424(struct UnkStruct_0205D3AC_t *param0) { VecFx32 v0; - UnkStruct_0205D3C4 * v1 = (UnkStruct_0205D3C4 *)param0->unk_00; + UnkStruct_0205D3C4 *v1 = (UnkStruct_0205D3C4 *)param0->unk_00; if (v1->unk_10 <= 0x8000) { v0 = v1->unk_00; @@ -636,9 +636,9 @@ int sub_0205D424 (struct UnkStruct_0205D3AC_t * param0) return 0; } -void sub_0205D4A4 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1) +void sub_0205D4A4(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1) { - UnkStruct_0205D4A4 * v0; + UnkStruct_0205D4A4 *v0; param1->unk_00 = Heap_AllocFromHeap(4, sizeof(UnkStruct_0205D4A4)); memset(param1->unk_00, 0, sizeof(UnkStruct_0205D4A4)); @@ -650,9 +650,9 @@ void sub_0205D4A4 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa v0->unk_0C = sub_0205D344(param0, 1, &v0->unk_00, 1, 1); } -void sub_0205D4E0 (struct UnkStruct_0205D3AC_t * param0) +void sub_0205D4E0(struct UnkStruct_0205D3AC_t *param0) { - UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00; + UnkStruct_0205D4A4 *v0 = (UnkStruct_0205D4A4 *)param0->unk_00; if (param0->unk_00 != NULL) { sub_02021BD4(v0->unk_0C); @@ -662,9 +662,9 @@ void sub_0205D4E0 (struct UnkStruct_0205D3AC_t * param0) } } -int sub_0205D500 (struct UnkStruct_0205D3AC_t * param0) +int sub_0205D500(struct UnkStruct_0205D3AC_t *param0) { - UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00; + UnkStruct_0205D4A4 *v0 = (UnkStruct_0205D4A4 *)param0->unk_00; if (v0->unk_10 < 7) { sub_02021E2C(v0->unk_0C, FX32_ONE); @@ -675,9 +675,9 @@ int sub_0205D500 (struct UnkStruct_0205D3AC_t * param0) return 0; } -void sub_0205D524 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1) +void sub_0205D524(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1) { - UnkStruct_0205D3C4 * v0; + UnkStruct_0205D3C4 *v0; param1->unk_00 = Heap_AllocFromHeap(4, sizeof(UnkStruct_0205D3C4)); memset(param1->unk_00, 0, sizeof(UnkStruct_0205D3C4)); @@ -689,9 +689,9 @@ void sub_0205D524 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa v0->unk_0C = sub_0205D344(param0, 0, &v0->unk_00, 0, 1); } -void sub_0205D564 (struct UnkStruct_0205D3AC_t * param0) +void sub_0205D564(struct UnkStruct_0205D3AC_t *param0) { - UnkStruct_0205D3C4 * v0 = (UnkStruct_0205D3C4 *)param0->unk_00; + UnkStruct_0205D3C4 *v0 = (UnkStruct_0205D3C4 *)param0->unk_00; if (param0->unk_00 != NULL) { sub_02021BD4(v0->unk_0C); @@ -700,9 +700,9 @@ void sub_0205D564 (struct UnkStruct_0205D3AC_t * param0) } } -int sub_0205D584 (struct UnkStruct_0205D3AC_t * param0) +int sub_0205D584(struct UnkStruct_0205D3AC_t *param0) { - UnkStruct_0205D3C4 * v0 = (UnkStruct_0205D3C4 *)param0->unk_00; + UnkStruct_0205D3C4 *v0 = (UnkStruct_0205D3C4 *)param0->unk_00; v0->unk_00.y += (FX32_ONE * 8); @@ -715,8 +715,8 @@ int sub_0205D584 (struct UnkStruct_0205D3AC_t * param0) v0->unk_10++; } } else { - if (v0->unk_00.y >= ((69 * FX32_ONE))) { - v0->unk_00.y = ((69 * FX32_ONE)); + if (v0->unk_00.y >= (69 * FX32_ONE)) { + v0->unk_00.y = (69 * FX32_ONE); sub_02021C50(v0->unk_0C, &v0->unk_00); return 0; } @@ -725,9 +725,9 @@ int sub_0205D584 (struct UnkStruct_0205D3AC_t * param0) return 1; } -void sub_0205D5E0 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1) +void sub_0205D5E0(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1) { - UnkStruct_0205D5E0 * v0; + UnkStruct_0205D5E0 *v0; param1->unk_00 = Heap_AllocFromHeap(4, sizeof(UnkStruct_0205D5E0)); memset(param1->unk_00, 0, sizeof(UnkStruct_0205D5E0)); @@ -741,9 +741,9 @@ void sub_0205D5E0 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa SpriteActor_SetSpriteAnimActive(v0->unk_0C, 1); } -void sub_0205D624 (struct UnkStruct_0205D3AC_t * param0) +void sub_0205D624(struct UnkStruct_0205D3AC_t *param0) { - UnkStruct_0205D5E0 * v0 = (UnkStruct_0205D5E0 *)param0->unk_00; + UnkStruct_0205D5E0 *v0 = (UnkStruct_0205D5E0 *)param0->unk_00; if (param0->unk_00 != NULL) { sub_02021BD4(v0->unk_0C); @@ -753,9 +753,9 @@ void sub_0205D624 (struct UnkStruct_0205D3AC_t * param0) } } -int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0) +int sub_0205D644(struct UnkStruct_0205D3AC_t *param0) { - UnkStruct_0205D5E0 * v0 = (UnkStruct_0205D5E0 *)param0->unk_00; + UnkStruct_0205D5E0 *v0 = (UnkStruct_0205D5E0 *)param0->unk_00; int v1 = 1; switch (v0->unk_10) { @@ -783,7 +783,7 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0) sub_02021C50(v0->unk_0C, &v0->unk_00); sub_02021E2C(v0->unk_0C, v0->unk_14); - if ((v0->unk_00.y < (300 * FX32_ONE))) { + if (v0->unk_00.y < (300 * FX32_ONE)) { v1 = 2; v0->unk_10++; } @@ -805,9 +805,9 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0) return v1; } -void sub_0205D714 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1) +void sub_0205D714(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1) { - UnkStruct_0205D5E0 * v0; + UnkStruct_0205D5E0 *v0; param1->unk_00 = Heap_AllocFromHeap(4, sizeof(UnkStruct_0205D5E0)); memset(param1->unk_00, 0, sizeof(UnkStruct_0205D5E0)); @@ -823,9 +823,9 @@ void sub_0205D714 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa sub_02021CAC(v0->unk_0C, 0); } -void sub_0205D768 (struct UnkStruct_0205D3AC_t * param0) +void sub_0205D768(struct UnkStruct_0205D3AC_t *param0) { - UnkStruct_0205D5E0 * v0 = (UnkStruct_0205D5E0 *)param0->unk_00; + UnkStruct_0205D5E0 *v0 = (UnkStruct_0205D5E0 *)param0->unk_00; if (param0->unk_00 != NULL) { sub_02021BD4(v0->unk_0C); @@ -834,10 +834,10 @@ void sub_0205D768 (struct UnkStruct_0205D3AC_t * param0) } } -int sub_0205D788 (struct UnkStruct_0205D3AC_t * param0) +int sub_0205D788(struct UnkStruct_0205D3AC_t *param0) { VecFx32 v0; - UnkStruct_0205D5E0 * v1 = (UnkStruct_0205D5E0 *)param0->unk_00; + UnkStruct_0205D5E0 *v1 = (UnkStruct_0205D5E0 *)param0->unk_00; int v2 = 1; switch (v1->unk_10) { @@ -873,9 +873,9 @@ int sub_0205D788 (struct UnkStruct_0205D3AC_t * param0) return v2; } -void sub_0205D844 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * param1) +void sub_0205D844(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param1) { - UnkStruct_0205D4A4 * v0; + UnkStruct_0205D4A4 *v0; param1->unk_00 = Heap_AllocFromHeap(4, sizeof(UnkStruct_0205D4A4)); memset(param1->unk_00, 0, sizeof(UnkStruct_0205D4A4)); @@ -889,9 +889,9 @@ void sub_0205D844 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa SpriteActor_SetSpriteAnimActive(v0->unk_0C, 1); } -void sub_0205D888 (struct UnkStruct_0205D3AC_t * param0) +void sub_0205D888(struct UnkStruct_0205D3AC_t *param0) { - UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00; + UnkStruct_0205D4A4 *v0 = (UnkStruct_0205D4A4 *)param0->unk_00; if (param0->unk_00 != NULL) { sub_02021BD4(v0->unk_0C); @@ -900,9 +900,9 @@ void sub_0205D888 (struct UnkStruct_0205D3AC_t * param0) } } -int sub_0205D8A8 (struct UnkStruct_0205D3AC_t * param0) +int sub_0205D8A8(struct UnkStruct_0205D3AC_t *param0) { - UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00; + UnkStruct_0205D4A4 *v0 = (UnkStruct_0205D4A4 *)param0->unk_00; if (v0->unk_10 < 8) { sub_02021E2C(v0->unk_0C, FX32_ONE); diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c index 70a6321ebf..7a8b86d65d 100644 --- a/src/unk_0205D8CC.c +++ b/src/unk_0205D8CC.c @@ -1,20 +1,20 @@ +#include "unk_0205D8CC.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" +#include "game_options.h" +#include "strbuf.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_0200DA60.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "game_options.h" -#include "unk_0205D8CC.h" -void sub_0205D8CC (u32 param0, u32 param1) +void sub_0205D8CC(u32 param0, u32 param1) { if (param1 == 1) { sub_0201D710(); @@ -24,7 +24,7 @@ void sub_0205D8CC (u32 param0, u32 param1) sub_02002E98(param0, 12 * 32, 4); } -void FieldMessage_AddWindow (BGL * param0, Window * param1, u32 param2) +void FieldMessage_AddWindow(BGL *param0, Window *param1, u32 param2) { if (param2 == 3) { BGL_AddWindow(param0, param1, 3, 2, 19, 27, 4, 12, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4))); @@ -33,19 +33,19 @@ void FieldMessage_AddWindow (BGL * param0, Window * param1, u32 param2) } } -void FieldMessage_DrawWindow (Window * param0, const Options * param1) +void FieldMessage_DrawWindow(Window *param0, const Options *param1) { sub_0200DD0C(param0->unk_00, sub_0201C290(param0), 1024 - (18 + 12), 10, Options_Frame(param1), 4); sub_0205D988(param0); sub_0200E060(param0, 0, 1024 - (18 + 12), 10); } -void sub_0205D988 (Window * param0) +void sub_0205D988(Window *param0) { BGL_FillWindow(param0, 15); } -u8 FieldMessage_Print (Window * param0, Strbuf *param1, const Options * param2, u8 param3) +u8 FieldMessage_Print(Window *param0, Strbuf *param1, const Options *param2, u8 param3) { u8 v0; @@ -57,7 +57,7 @@ u8 FieldMessage_Print (Window * param0, Strbuf *param1, const Options * param2, return v0; } -u8 sub_0205D9CC (Window * param0, Strbuf *param1, int param2, int param3, u8 param4, int param5) +u8 sub_0205D9CC(Window *param0, Strbuf *param1, int param2, int param3, u8 param4, int param5) { sub_02002AC8(param4); sub_02002AE4(param5); @@ -66,7 +66,7 @@ u8 sub_0205D9CC (Window * param0, Strbuf *param1, int param2, int param3, u8 par return PrintStringSimple(param0, param2, param1, 0, 0, param3, NULL); } -u8 FieldMessage_FinishedPrinting (u8 param0) +u8 FieldMessage_FinishedPrinting(u8 param0) { if (Message_Printing(param0) == 0) { return 1; @@ -75,7 +75,7 @@ u8 FieldMessage_FinishedPrinting (u8 param0) return 0; } -void sub_0205DA1C (BGL * param0, Window * param1, u16 param2, u16 param3) +void sub_0205DA1C(BGL *param0, Window *param1, u16 param2, u16 param3) { u16 v0, v1; @@ -88,13 +88,13 @@ void sub_0205DA1C (BGL * param0, Window * param1, u16 param2, u16 param3) } if (param3 == 3) { - BGL_AddWindow(param0, param1, 3, v0, 19, v1, 4, 9, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)))); + BGL_AddWindow(param0, param1, 3, v0, 19, v1, 4, 9, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4))); } else { - BGL_AddWindow(param0, param1, 7, v0, 19, v1, 4, 9, ((512 - (27 * 4)))); + BGL_AddWindow(param0, param1, 7, v0, 19, v1, 4, 9, (512 - (27 * 4))); } } -void sub_0205DA80 (Window * param0, u16 param1, u16 param2) +void sub_0205DA80(Window *param0, u16 param1, u16 param2) { sub_0200E2A4(param0->unk_00, sub_0201C290(param0), ((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)), 9, param1, param2, 4); BGL_FillWindow(param0, 15); diff --git a/src/unk_0205DAC8.c b/src/unk_0205DAC8.c index f75f34000d..b70926c3c5 100644 --- a/src/unk_0205DAC8.c +++ b/src/unk_0205DAC8.c @@ -1,599 +1,598 @@ +#include "unk_0205DAC8.h" + #include #include -#include "unk_0205DAC8.h" - static const u8 Unk_020ED8C4[] = { - 0x0, - 0x0, - 0x2, - 0x2, - 0x0, - 0x2, - 0x2, - 0x0, - 0x2, - 0x0, - 0x0, - 0x2, - 0x0, - 0x0, - 0x0, - 0x0, - 0x3, - 0x3, - 0x3, - 0x1, - 0x1, - 0x3, - 0x0, - 0x0, - 0x0, - 0x1, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x3, - 0x0, - 0x2, - 0x2, - 0x0, - 0x0, - 0x0, - 0x0, - 0x3, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x1, - 0x1, - 0x1, - 0x1, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x2, - 0x1, - 0x0, - 0x0, - 0x0, - 0x2, - 0x1, - 0x0, - 0x0, - 0x2, - 0x1, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x2, - 0x2, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0 + 0x0, + 0x0, + 0x2, + 0x2, + 0x0, + 0x2, + 0x2, + 0x0, + 0x2, + 0x0, + 0x0, + 0x2, + 0x0, + 0x0, + 0x0, + 0x0, + 0x3, + 0x3, + 0x3, + 0x1, + 0x1, + 0x3, + 0x0, + 0x0, + 0x0, + 0x1, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x3, + 0x0, + 0x2, + 0x2, + 0x0, + 0x0, + 0x0, + 0x0, + 0x3, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x1, + 0x1, + 0x1, + 0x1, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x2, + 0x1, + 0x0, + 0x0, + 0x0, + 0x2, + 0x1, + 0x0, + 0x0, + 0x2, + 0x1, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x2, + 0x2, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0 }; - -BOOL sub_0205DAC8 (u8 param0) +BOOL sub_0205DAC8(u8 param0) { return param0 == 0x2; } -BOOL sub_0205DAD4 (u8 param0) +BOOL sub_0205DAD4(u8 param0) { return param0 == 0x3; } -BOOL sub_0205DAE0 (u8 param0) +BOOL sub_0205DAE0(u8 param0) { return param0 == 0x80; } -BOOL sub_0205DAEC (u8 param0) +BOOL sub_0205DAEC(u8 param0) { return param0 == 0x69; } -BOOL sub_0205DAF8 (u8 param0) +BOOL sub_0205DAF8(u8 param0) { return param0 == 0x62; } -BOOL sub_0205DB04 (u8 param0) +BOOL sub_0205DB04(u8 param0) { return param0 == 0x63; } -BOOL sub_0205DB10 (u8 param0) +BOOL sub_0205DB10(u8 param0) { return param0 == 0x64; } -BOOL sub_0205DB1C (u8 param0) +BOOL sub_0205DB1C(u8 param0) { return param0 == 0x65; } -BOOL sub_0205DB28 (u8 param0) +BOOL sub_0205DB28(u8 param0) { return param0 == 0x6c; } -BOOL sub_0205DB34 (u8 param0) +BOOL sub_0205DB34(u8 param0) { return param0 == 0x6d; } -BOOL sub_0205DB40 (u8 param0) +BOOL sub_0205DB40(u8 param0) { return param0 == 0x6e; } -BOOL sub_0205DB4C (u8 param0) +BOOL sub_0205DB4C(u8 param0) { return param0 == 0x6f; } -BOOL sub_0205DB58 (u8 param0) +BOOL sub_0205DB58(u8 param0) { return (Unk_020ED8C4[param0] & 0x1) != 0; } -BOOL sub_0205DB6C (u8 param0) +BOOL sub_0205DB6C(u8 param0) { return param0 == 0x21; } -BOOL sub_0205DB78 (u8 param0) +BOOL sub_0205DB78(u8 param0) { return param0 == 0x17; } -BOOL sub_0205DB84 (u8 param0) +BOOL sub_0205DB84(u8 param0) { return param0 == 0x3a; } -BOOL sub_0205DB90 (u8 param0) +BOOL sub_0205DB90(u8 param0) { return param0 == 0x3b; } -BOOL sub_0205DB9C (u8 param0) +BOOL sub_0205DB9C(u8 param0) { return param0 == 0x39; } -BOOL sub_0205DBA8 (u8 param0) +BOOL sub_0205DBA8(u8 param0) { return param0 == 0x38; } -BOOL sub_0205DBB4 (u8 param0) +BOOL sub_0205DBB4(u8 param0) { return param0 == 0x5a; } -BOOL sub_0205DBC0 (u8 param0) +BOOL sub_0205DBC0(u8 param0) { return param0 == 0x5b; } -BOOL sub_0205DBCC (u8 param0) +BOOL sub_0205DBCC(u8 param0) { return param0 == 0x5c; } -BOOL sub_0205DBD8 (u8 param0) +BOOL sub_0205DBD8(u8 param0) { return param0 == 0x5d; } -BOOL sub_0205DBE4 (u8 param0) +BOOL sub_0205DBE4(u8 param0) { return param0 == 0x83; } -BOOL sub_0205DBF0 (u8 param0) +BOOL sub_0205DBF0(u8 param0) { return param0 == 0x85; } -BOOL sub_0205DBFC (u8 param0) +BOOL sub_0205DBFC(u8 param0) { return param0 == 0x56; } -BOOL sub_0205DC08 (u8 param0) +BOOL sub_0205DC08(u8 param0) { return param0 == 0x57; } -BOOL sub_0205DC14 (u8 param0) +BOOL sub_0205DC14(u8 param0) { return param0 == 0x58; } -BOOL sub_0205DC20 (u8 param0) +BOOL sub_0205DC20(u8 param0) { return param0 == 0x59; } -BOOL sub_0205DC2C (u8 param0) +BOOL sub_0205DC2C(u8 param0) { return param0 == 0x6a; } -BOOL sub_0205DC38 (u8 param0) +BOOL sub_0205DC38(u8 param0) { return param0 == 0x6b; } -BOOL sub_0205DC44 (u8 param0) +BOOL sub_0205DC44(u8 param0) { return param0 == 0x5e; } -BOOL sub_0205DC50 (u8 param0) +BOOL sub_0205DC50(u8 param0) { return param0 == 0x5f; } -BOOL sub_0205DC5C (u8 param0) +BOOL sub_0205DC5C(u8 param0) { return param0 == 0x20; } -BOOL sub_0205DC68 (u8 param0) +BOOL sub_0205DC68(u8 param0) { return param0 == 0x4b; } -BOOL sub_0205DC74 (u8 param0) +BOOL sub_0205DC74(u8 param0) { return param0 == 0x4c; } -BOOL sub_0205DC80 (u8 param0) +BOOL sub_0205DC80(u8 param0) { return param0 == 0xe0; } -BOOL sub_0205DC8C (u8 param0) +BOOL sub_0205DC8C(u8 param0) { return param0 == 0xea; } -BOOL sub_0205DC98 (u8 param0) +BOOL sub_0205DC98(u8 param0) { return param0 == 0xe1; } -BOOL sub_0205DCA4 (u8 param0) +BOOL sub_0205DCA4(u8 param0) { return param0 == 0xe2; } -BOOL sub_0205DCB0 (u8 param0) +BOOL sub_0205DCB0(u8 param0) { return param0 == 0xe4; } -BOOL sub_0205DCBC (u8 param0) +BOOL sub_0205DCBC(u8 param0) { return param0 == 0xe5; } -BOOL sub_0205DCC8 (u8 param0) +BOOL sub_0205DCC8(u8 param0) { return param0 == 0xeb; } -BOOL sub_0205DCD4 (u8 param0) +BOOL sub_0205DCD4(u8 param0) { return param0 == 0xec; } -BOOL sub_0205DCE0 (u8 param0) +BOOL sub_0205DCE0(u8 param0) { return (param0 == 0xa4) || (param0 == 0xa5); } -BOOL sub_0205DCF0 (u8 param0) +BOOL sub_0205DCF0(u8 param0) { return param0 == 0xa5; } -BOOL sub_0205DCFC (u8 param0) +BOOL sub_0205DCFC(u8 param0) { return (param0 == 0xa6) || (param0 == 0xa7); } -BOOL sub_0205DD0C (u8 param0) +BOOL sub_0205DD0C(u8 param0) { return param0 == 0xa7; } -BOOL sub_0205DD18 (u8 param0) +BOOL sub_0205DD18(u8 param0) { return (param0 == 0xa1) || (param0 == 0xa2) || (param0 == 0xa3) || (param0 == 0xa8); } -BOOL sub_0205DD38 (u8 param0) +BOOL sub_0205DD38(u8 param0) { return param0 == 0xa8; } -BOOL sub_0205DD44 (u8 param0) +BOOL sub_0205DD44(u8 param0) { return param0 == 0xa1; } -BOOL sub_0205DD50 (u8 param0) +BOOL sub_0205DD50(u8 param0) { return param0 == 0xa2; } -BOOL sub_0205DD5C (u8 param0) +BOOL sub_0205DD5C(u8 param0) { return param0 == 0xa3; } -BOOL sub_0205DD68 (u8 param0) +BOOL sub_0205DD68(u8 param0) { return (param0 == 0xd9) || (param0 == 0xda); } -BOOL sub_0205DD78 (u8 param0) +BOOL sub_0205DD78(u8 param0) { return param0 == 0xd9; } -BOOL sub_0205DD84 (u8 param0) +BOOL sub_0205DD84(u8 param0) { return param0 == 0xda; } -BOOL sub_0205DD90 (u8 param0) +BOOL sub_0205DD90(u8 param0) { return param0 == 0xd7; } -BOOL sub_0205DD9C (u8 param0) +BOOL sub_0205DD9C(u8 param0) { return param0 == 0xd8; } -BOOL sub_0205DDA8 (u8 param0) +BOOL sub_0205DDA8(u8 param0) { return param0 == 0x8; } -BOOL sub_0205DDB4 (u8 param0) +BOOL sub_0205DDB4(u8 param0) { return param0 == 0x13; } -BOOL sub_0205DDC0 (u8 param0) +BOOL sub_0205DDC0(u8 param0) { return param0 == 0xdb; } -BOOL sub_0205DDCC (u8 param0) +BOOL sub_0205DDCC(u8 param0) { return (param0 == 0x32) || (param0 == 0x34) || (param0 == 0x35) || (param0 == 0x49); } -BOOL sub_0205DDF0 (u8 param0) +BOOL sub_0205DDF0(u8 param0) { return (param0 == 0x33) || (param0 == 0x36) || (param0 == 0x37) || (param0 == 0x49); } -BOOL sub_0205DE14 (u8 param0) +BOOL sub_0205DE14(u8 param0) { return (param0 == 0x31) || (param0 == 0x35) || (param0 == 0x37) || (param0 == 0x4a); } -BOOL sub_0205DE38 (u8 param0) +BOOL sub_0205DE38(u8 param0) { return (param0 == 0x30) || (param0 == 0x34) || (param0 == 0x36) || (param0 == 0x4a); } -BOOL sub_0205DE5C (u8 param0) +BOOL sub_0205DE5C(u8 param0) { return (param0 == 0x16) || (param0 == 0x1d); } -BOOL sub_0205DE6C (u8 param0) +BOOL sub_0205DE6C(u8 param0) { if ((Unk_020ED8C4[param0] & 0x2) != 0) { return 1; @@ -602,97 +601,97 @@ BOOL sub_0205DE6C (u8 param0) } } -BOOL sub_0205DE84 (u8 param0) +BOOL sub_0205DE84(u8 param0) { return param0 == 0x86; } -BOOL sub_0205DE90 (u8 param0) +BOOL sub_0205DE90(u8 param0) { return (param0 == 0x16) || (param0 == 0x10) || (param0 == 0x1d) || (param0 == 0x2c); } -BOOL sub_0205DEB4 (u8 param0) +BOOL sub_0205DEB4(u8 param0) { return param0 == 0x40; } -BOOL sub_0205DEC0 (u8 param0) +BOOL sub_0205DEC0(u8 param0) { return param0 == 0x41; } -BOOL sub_0205DECC (u8 param0) +BOOL sub_0205DECC(u8 param0) { return param0 == 0x42; } -BOOL sub_0205DED8 (u8 param0) +BOOL sub_0205DED8(u8 param0) { return param0 == 0x43; } -BOOL sub_0205DEE4 (u8 param0) +BOOL sub_0205DEE4(u8 param0) { return param0 == 0x67; } -BOOL sub_0205DEF0 (u8 param0) +BOOL sub_0205DEF0(u8 param0) { return param0 == 0x70; } -BOOL sub_0205DEFC (u8 param0) +BOOL sub_0205DEFC(u8 param0) { return (param0 == 0x71) || (param0 == 0x72) || (param0 == 0x73) || (param0 == 0x74) || (param0 == 0x75) || (param0 == 0x76) || (param0 == 0x77) || (param0 == 0x78) || (param0 == 0x79) || (param0 == 0x7a) || (param0 == 0x7b) || (param0 == 0x7c) || (param0 == 0x7d); } -BOOL sub_0205DF10 (u8 param0) +BOOL sub_0205DF10(u8 param0) { return (param0 == 0x73) || (param0 == 0x78) || (param0 == 0x7c); } -BOOL sub_0205DF34 (u8 param0) +BOOL sub_0205DF34(u8 param0) { return (param0 == 0x74) || (param0 == 0x79) || (param0 == 0x7d); } -BOOL sub_0205DF58 (u8 param0) +BOOL sub_0205DF58(u8 param0) { return param0 == 0x75; } -BOOL sub_0205DF64 (u8 param0) +BOOL sub_0205DF64(u8 param0) { return (param0 == 0x76) || (param0 == 0x77) || (param0 == 0x78) || (param0 == 0x79); } -BOOL sub_0205DF78 (u8 param0) +BOOL sub_0205DF78(u8 param0) { return (param0 == 0x7a) || (param0 == 0x7b) || (param0 == 0x7c) || (param0 == 0x7d); } -BOOL sub_0205DF8C (u8 param0) +BOOL sub_0205DF8C(u8 param0) { return param0 == 0xff; } -u8 sub_0205DF98 (void) +u8 sub_0205DF98(void) { return 0xff; } -BOOL sub_0205DF9C (u8 param0) +BOOL sub_0205DF9C(u8 param0) { return (param0 == 0x2c) || (param0 == 0x1d); } -BOOL sub_0205DFAC (u8 param0) +BOOL sub_0205DFAC(u8 param0) { return param0 == 0xa9; } -BOOL sub_0205DFB8 (u8 param0) +BOOL sub_0205DFB8(u8 param0) { return param0 == 0x2d; } diff --git a/src/unk_0205DFC4.c b/src/unk_0205DFC4.c index b0e92ca158..25f9efe6c4 100644 --- a/src/unk_0205DFC4.c +++ b/src/unk_0205DFC4.c @@ -1,30 +1,29 @@ +#include "unk_0205DFC4.h" + #include #include -#include "trainer_info.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" #include "field/field_system.h" +#include "overlay004/ov4_021D0D80.h" -#include "heap.h" -#include "unk_0201D15C.h" -#include "unk_02025E08.h" -#include "trainer_info.h" #include "communication_information.h" #include "communication_system.h" -#include "unk_020508D4.h" -#include "unk_0205DFC4.h" +#include "heap.h" #include "map_object.h" -#include "pokemon.h" #include "party.h" -#include "overlay004/ov4_021D0D80.h" +#include "pokemon.h" +#include "savedata.h" +#include "trainer_info.h" +#include "unk_0201D15C.h" +#include "unk_02025E08.h" +#include "unk_020508D4.h" typedef struct { - MapObject * unk_00; + MapObject *unk_00; fx32 unk_04; fx32 unk_08; u16 unk_0C; @@ -33,7 +32,7 @@ typedef struct { } UnkStruct_0205E268; typedef struct { - MapObject * unk_00; + MapObject *unk_00; u16 unk_04; u16 unk_06; u8 unk_08; @@ -61,13 +60,13 @@ int sub_0205E658(u8 param0); int sub_0205E680(u8 param0); int sub_0205E6A8(u32 param0); u8 sub_0205E6B8(void); -u8 sub_0205E6D8(SaveData * param0); +u8 sub_0205E6D8(SaveData *param0); int sub_0205E700(u8 param0); int sub_0205E728(u8 param0); int sub_0205E750(u8 param0); int sub_0205E790(u8 param0); -u16 sub_0205DFC4 (u32 param0) +u16 sub_0205DFC4(u32 param0) { if (param0 / 10 == 0) { return 1; @@ -90,7 +89,7 @@ u16 sub_0205DFC4 (u32 param0) return 1; } -u16 sub_0205E060 (u16 param0) +u16 sub_0205E060(u16 param0) { if ((param0 >= 328) && (param0 <= 427)) { return 1; @@ -99,7 +98,7 @@ u16 sub_0205E060 (u16 param0) return 0; } -u16 sub_0205E078 (u16 param0, u16 param1) +u16 sub_0205E078(u16 param0, u16 param1) { if (param0 <= 15) { return 6; @@ -156,7 +155,7 @@ u16 sub_0205E078 (u16 param0, u16 param1) } } -u16 sub_0205E0E4 (u16 param0, u16 param1) +u16 sub_0205E0E4(u16 param0, u16 param1) { if (param0 <= 39) { return 22; @@ -241,9 +240,9 @@ u16 sub_0205E0E4 (u16 param0, u16 param1) } } -u16 sub_0205E1B4 (SaveData * param0) +u16 sub_0205E1B4(SaveData *param0) { - Pokemon * v0; + Pokemon *v0; u16 v1, v2; v2 = Party_GetCurrentCount(Party_GetFromSavedata(param0)); @@ -259,11 +258,11 @@ u16 sub_0205E1B4 (SaveData * param0) return 0; } -BOOL HasAllLegendaryTitansInParty (SaveData * param0) +BOOL HasAllLegendaryTitansInParty(SaveData *param0) { int v0, v1, v2, v3 = 0; - Party * v4; - static const u16 v5[] = {377, 378, 379}; + Party *v4; + static const u16 v5[] = { 377, 378, 379 }; u16 v6[6]; v4 = Party_GetFromSavedata(param0); @@ -289,11 +288,11 @@ BOOL HasAllLegendaryTitansInParty (SaveData * param0) return 0; } -static BOOL sub_0205E268 (TaskManager * param0) +static BOOL sub_0205E268(TaskManager *param0) { VecFx32 v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0205E268 * v2 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0205E268 *v2 = TaskManager_Environment(param0); v0.x = FX32_CONST(8); v0.z = FX32_CONST(8); @@ -320,10 +319,10 @@ static BOOL sub_0205E268 (TaskManager * param0) return 0; } -void sub_0205E318 (TaskManager * param0, MapObject * param1, u16 param2, u16 param3, u16 param4, u16 param5) +void sub_0205E318(TaskManager *param0, MapObject *param1, u16 param2, u16 param3, u16 param4, u16 param5) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0205E268 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205E268)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0205E268 *v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205E268)); MI_CpuClear8(v1, sizeof(UnkStruct_0205E268)); @@ -336,10 +335,10 @@ void sub_0205E318 (TaskManager * param0, MapObject * param1, u16 param2, u16 par FieldTask_Start(fieldSystem->unk_10, sub_0205E268, v1); } -static BOOL sub_0205E3AC (TaskManager * param0) +static BOOL sub_0205E3AC(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0205E3AC * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0205E3AC *v1 = TaskManager_Environment(param0); MapObject_SetHidden(v1->unk_00, v1->unk_09); @@ -356,10 +355,10 @@ static BOOL sub_0205E3AC (TaskManager * param0) return 0; } -void sub_0205E3F4 (TaskManager * param0, MapObject * param1, u16 param2, u16 param3) +void sub_0205E3F4(TaskManager *param0, MapObject *param1, u16 param2, u16 param3) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0205E3AC * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205E3AC)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0205E3AC *v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205E3AC)); MI_CpuClear8(v1, sizeof(UnkStruct_0205E3AC)); @@ -371,7 +370,7 @@ void sub_0205E3F4 (TaskManager * param0, MapObject * param1, u16 param2, u16 par FieldTask_Start(fieldSystem->unk_10, sub_0205E3AC, v1); } -int sub_0205E430 (u8 param0, u8 param1) +int sub_0205E430(u8 param0, u8 param1) { int v0; @@ -393,7 +392,7 @@ int sub_0205E430 (u8 param0, u8 param1) return v0 + (param0 * 4); } -int sub_0205E45C (u8 param0, u8 param1) +int sub_0205E45C(u8 param0, u8 param1) { int v0; @@ -415,7 +414,7 @@ int sub_0205E45C (u8 param0, u8 param1) return v0 + (param0 * 4); } -int sub_0205E488 (u8 param0, u8 param1) +int sub_0205E488(u8 param0, u8 param1) { int v0; @@ -437,7 +436,7 @@ int sub_0205E488 (u8 param0, u8 param1) return v0 + (param0 * 4); } -int sub_0205E4B4 (u8 param0, u8 param1) +int sub_0205E4B4(u8 param0, u8 param1) { int v0; @@ -459,7 +458,7 @@ int sub_0205E4B4 (u8 param0, u8 param1) return v0 + (param0 * 4); } -int sub_0205E4E0 (u8 param0, u8 param1) +int sub_0205E4E0(u8 param0, u8 param1) { int v0; @@ -482,7 +481,7 @@ int sub_0205E4E0 (u8 param0, u8 param1) return v0; } -int sub_0205E50C (u8 param0) +int sub_0205E50C(u8 param0) { int v0; @@ -504,7 +503,7 @@ int sub_0205E50C (u8 param0) return v0; } -int sub_0205E534 (u8 param0) +int sub_0205E534(u8 param0) { int v0; @@ -526,7 +525,7 @@ int sub_0205E534 (u8 param0) return v0; } -int sub_0205E55C (u8 param0) +int sub_0205E55C(u8 param0) { int v0; @@ -548,7 +547,7 @@ int sub_0205E55C (u8 param0) return v0; } -int sub_0205E584 (u8 param0) +int sub_0205E584(u8 param0) { int v0; @@ -571,7 +570,7 @@ int sub_0205E584 (u8 param0) return v0; } -int sub_0205E5B4 (u8 param0, u8 param1) +int sub_0205E5B4(u8 param0, u8 param1) { int v0; @@ -594,7 +593,7 @@ int sub_0205E5B4 (u8 param0, u8 param1) return v0; } -int sub_0205E5E0 (u8 param0) +int sub_0205E5E0(u8 param0) { int v0; @@ -616,7 +615,7 @@ int sub_0205E5E0 (u8 param0) return v0; } -int sub_0205E608 (u8 param0) +int sub_0205E608(u8 param0) { int v0; @@ -638,7 +637,7 @@ int sub_0205E608 (u8 param0) return v0; } -int sub_0205E630 (u8 param0) +int sub_0205E630(u8 param0) { int v0; @@ -660,7 +659,7 @@ int sub_0205E630 (u8 param0) return v0; } -int sub_0205E658 (u8 param0) +int sub_0205E658(u8 param0) { int v0; @@ -682,7 +681,7 @@ int sub_0205E658 (u8 param0) return v0; } -int sub_0205E680 (u8 param0) +int sub_0205E680(u8 param0) { int v0; @@ -704,7 +703,7 @@ int sub_0205E680 (u8 param0) return v0; } -int sub_0205E6A8 (u32 param0) +int sub_0205E6A8(u32 param0) { if (param0 < 100) { return 0xff; @@ -713,9 +712,9 @@ int sub_0205E6A8 (u32 param0) return ov4_021D2388(); } -u8 sub_0205E6B8 (void) +u8 sub_0205E6B8(void) { - TrainerInfo * v0; + TrainerInfo *v0; v0 = CommInfo_TrainerInfo(CommSys_CurNetId() ^ 1); GF_ASSERT(v0 != NULL); @@ -723,7 +722,7 @@ u8 sub_0205E6B8 (void) return TrainerInfo_GameCode(v0); } -u8 sub_0205E6D8 (SaveData * param0) +u8 sub_0205E6D8(SaveData *param0) { if (TrainerInfo_GameCode(SaveData_GetTrainerInfo(param0)) == 0) { return 1; @@ -736,7 +735,7 @@ u8 sub_0205E6D8 (SaveData * param0) return 0; } -int sub_0205E700 (u8 param0) +int sub_0205E700(u8 param0) { int v0; @@ -758,7 +757,7 @@ int sub_0205E700 (u8 param0) return v0; } -int sub_0205E728 (u8 param0) +int sub_0205E728(u8 param0) { int v0; @@ -780,7 +779,7 @@ int sub_0205E728 (u8 param0) return v0; } -int sub_0205E750 (u8 param0) +int sub_0205E750(u8 param0) { int v0; @@ -811,7 +810,7 @@ int sub_0205E750 (u8 param0) return v0; } -int sub_0205E790 (u8 param0) +int sub_0205E790(u8 param0) { int v0; diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index 46e4da8ca5..8d18609009 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -1,31 +1,31 @@ +#include "unk_0205F180.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021E8F60_decl.h" +#include "struct_defs/struct_0205EC34.h" #include "field/field_system.h" -#include "struct_defs/struct_0205EC34.h" +#include "overlay005/ov5_021DFB54.h" +#include "overlay005/struct_ov5_021E8F60_decl.h" +#include "overlay009/ov9_02249960.h" +#include "inlines.h" +#include "map_object.h" +#include "map_object_move.h" +#include "player_avatar.h" #include "unk_02005474.h" #include "unk_0202CD50.h" #include "unk_02054D00.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" -#include "unk_0205F180.h" -#include "map_object.h" -#include "map_object_move.h" #include "unk_020655F4.h" #include "unk_02068344.h" #include "unk_02071B10.h" -#include "overlay005/ov5_021DFB54.h" -#include "overlay009/ov9_02249960.h" -typedef BOOL (* UnkFuncPtr_020EDB84)(u8); +typedef BOOL (*UnkFuncPtr_020EDB84)(u8); typedef struct { UnkFuncPtr_020EDB84 unk_00; @@ -39,105 +39,105 @@ typedef struct { s16 unk_06; } UnkStruct_020EDB04; -static int PlayerAvatar_CheckStartMoveInternal(PlayerAvatar * playerAvatar, int param1); -static void PlayerAvatar_StartMoveInit(PlayerAvatar * playerAvatar, int param1, u16 param2, u16 param3); -static void sub_0205F378(PlayerAvatar * playerAvatar); -static void PlayerAvatar_PlayWalkSE(PlayerAvatar * playerAvatar); -static int sub_0205F62C(PlayerAvatar * playerAvatar, int param1); -static u32 sub_0205F644(PlayerAvatar * playerAvatar, int param1); -static int sub_0205F6A4(PlayerAvatar * playerAvatar, u32 param1, int param2); -static void sub_0205FA6C(PlayerAvatar * playerAvatar); -static int sub_0205FAB0(PlayerAvatar * playerAvatar, int param1); -static int sub_0205FB10(PlayerAvatar * playerAvatar, int param1); -static void sub_0205FB40(PlayerAvatar * playerAvatar, int param1); -static void inline_0205F180(PlayerAvatar * playerAvatar, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4); -static void inline_0205F180_sub(PlayerAvatar * playerAvatar, MapObject * mapObj, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); -static int sub_0205FC48(PlayerAvatar * playerAvatar, int param1); +static int PlayerAvatar_CheckStartMoveInternal(PlayerAvatar *playerAvatar, int param1); +static void PlayerAvatar_StartMoveInit(PlayerAvatar *playerAvatar, int param1, u16 param2, u16 param3); +static void sub_0205F378(PlayerAvatar *playerAvatar); +static void PlayerAvatar_PlayWalkSE(PlayerAvatar *playerAvatar); +static int sub_0205F62C(PlayerAvatar *playerAvatar, int param1); +static u32 sub_0205F644(PlayerAvatar *playerAvatar, int param1); +static int sub_0205F6A4(PlayerAvatar *playerAvatar, u32 param1, int param2); +static void sub_0205FA6C(PlayerAvatar *playerAvatar); +static int sub_0205FAB0(PlayerAvatar *playerAvatar, int param1); +static int sub_0205FB10(PlayerAvatar *playerAvatar, int param1); +static void sub_0205FB40(PlayerAvatar *playerAvatar, int param1); +static void inline_0205F180(PlayerAvatar *playerAvatar, const UnkStruct_ov5_021E8F60 *param1, int param2, u16 param3, u16 param4); +static void inline_0205F180_sub(PlayerAvatar *playerAvatar, MapObject *mapObj, const UnkStruct_ov5_021E8F60 *param2, int param3, u16 param4, u16 param5); +static int sub_0205FC48(PlayerAvatar *playerAvatar, int param1); static int sub_0205FC64(int param0); -static int sub_0205FC88(MapObject * mapObj, u8 param1, int param2); -static int sub_0205FCBC(MapObject * mapObj, u8 param1, int param2); -static int sub_0205FCC0(PlayerAvatar * playerAvatar, int param1); -static void sub_0205FD20(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_0205FD40(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_0205FDC8(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_0205FECC(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_020600CC(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_02060150(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_020601D4(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_02060258(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_020602DC(PlayerAvatar * playerAvatar, MapObject * mapObj, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); -static void PlayerAvatar_TryCyclingGearChange(PlayerAvatar * playerAvatar, u16 param1); -int sub_02060390(PlayerAvatar * playerAvatar, int param1); -static int sub_020603BC(PlayerAvatar * playerAvatar); -static int sub_020603EC(PlayerAvatar * playerAvatar); -static void sub_02060420(PlayerAvatar * playerAvatar, MapObject * mapObj, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); -static int sub_02060494(PlayerAvatar * playerAvatar, int param1); +static int sub_0205FC88(MapObject *mapObj, u8 param1, int param2); +static int sub_0205FCBC(MapObject *mapObj, u8 param1, int param2); +static int sub_0205FCC0(PlayerAvatar *playerAvatar, int param1); +static void sub_0205FD20(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_0205FD40(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_0205FDC8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_0205FECC(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_020600CC(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_02060150(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_020601D4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_02060258(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_020602DC(PlayerAvatar *playerAvatar, MapObject *mapObj, const UnkStruct_ov5_021E8F60 *param2, int param3, u16 param4, u16 param5); +static void PlayerAvatar_TryCyclingGearChange(PlayerAvatar *playerAvatar, u16 param1); +int sub_02060390(PlayerAvatar *playerAvatar, int param1); +static int sub_020603BC(PlayerAvatar *playerAvatar); +static int sub_020603EC(PlayerAvatar *playerAvatar); +static void sub_02060420(PlayerAvatar *playerAvatar, MapObject *mapObj, const UnkStruct_ov5_021E8F60 *param2, int param3, u16 param4, u16 param5); +static int sub_02060494(PlayerAvatar *playerAvatar, int param1); static int sub_020604B0(int param0); -static int sub_020604E4(PlayerAvatar * playerAvatar, int param1); -static void sub_02060548(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_02060570(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_02060688(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_020606C8(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_0206078C(PlayerAvatar * playerAvatar, MapObject * mapObj, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5); -static int sub_02060800(PlayerAvatar * playerAvatar, int param1); +static int sub_020604E4(PlayerAvatar *playerAvatar, int param1); +static void sub_02060548(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_02060570(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_02060688(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_020606C8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_0206078C(PlayerAvatar *playerAvatar, MapObject *mapObj, const UnkStruct_ov5_021E8F60 *param2, int param3, u16 param4, u16 param5); +static int sub_02060800(PlayerAvatar *playerAvatar, int param1); static int sub_0206081C(int param0); -static int sub_02060850(PlayerAvatar * playerAvatar, int param1); -static void sub_020608BC(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_020608E4(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_02060A60(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static void sub_02060AA0(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4); -static u32 sub_02060C24(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int sub_02060CE4(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int sub_02060D98(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int sub_02060E40(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int sub_02060EE4(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int sub_02060F4C(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int sub_02060FA8(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int sub_02061058(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int sub_02061180(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int sub_02061100(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int sub_02061248(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); +static int sub_02060850(PlayerAvatar *playerAvatar, int param1); +static void sub_020608BC(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_020608E4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_02060A60(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static void sub_02060AA0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4); +static u32 sub_02060C24(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int sub_02060CE4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int sub_02060D98(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int sub_02060E40(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int sub_02060EE4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int sub_02060F4C(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int sub_02060FA8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int sub_02061058(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int sub_02061180(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int sub_02061100(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int sub_02061248(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); static int sub_02061310(u16 param0); static int sub_0206132C(u16 param0); -static int sub_02061348(PlayerAvatar * playerAvatar, u16 param1, u16 param2); +static int sub_02061348(PlayerAvatar *playerAvatar, u16 param1, u16 param2); static int sub_020613D8(int param0); -static void sub_020615C8(PlayerAvatar * playerAvatar); -static int sub_020615E0(PlayerAvatar * playerAvatar, MapObject * mapObj, int param2); -static int PlayerAvatar_IsUnderCyclingRoad(PlayerAvatar * playerAvatar, u32 param1, int param2); -static void sub_02060B64(PlayerAvatar * playerAvatar, MapObject * mapObj, u32 param2, int param3); +static void sub_020615C8(PlayerAvatar *playerAvatar); +static int sub_020615E0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2); +static int PlayerAvatar_IsUnderCyclingRoad(PlayerAvatar *playerAvatar, u32 param1, int param2); +static void sub_02060B64(PlayerAvatar *playerAvatar, MapObject *mapObj, u32 param2, int param3); static const UnkStruct_020EDB04 Unk_020EDB04[4] = { - {0x0, 0x0, -1}, - {0x0, 0x0, 0x1}, - {-1, 0x0, 0x0}, - {0x1, 0x0, 0x0} + { 0x0, 0x0, -1 }, + { 0x0, 0x0, 0x1 }, + { -1, 0x0, 0x0 }, + { 0x1, 0x0, 0x0 } }; static const UnkStruct_020EDB04 Unk_020EDB24[4] = { - {0x0, 0x1, 0x0}, - {0x0, -1, 0x0}, - {0x0, 0x0, 0x1}, - {0x0, 0x0, -1} + { 0x0, 0x1, 0x0 }, + { 0x0, -1, 0x0 }, + { 0x0, 0x0, 0x1 }, + { 0x0, 0x0, -1 } }; static const UnkStruct_020EDB04 Unk_020EDB44[4] = { - {0x0, 0x1, 0x0}, - {0x0, -1, 0x0}, - {0x0, 0x0, -1}, - {0x0, 0x0, 0x1} + { 0x0, 0x1, 0x0 }, + { 0x0, -1, 0x0 }, + { 0x0, 0x0, -1 }, + { 0x0, 0x0, 0x1 } }; static const UnkStruct_020EDB04 Unk_020EDB64[4] = { - {0x0, 0x0, 0x1}, - {0x0, 0x0, -1}, - {-1, 0x0, 0x0}, - {0x1, 0x0, 0x0} + { 0x0, 0x0, 0x1 }, + { 0x0, 0x0, -1 }, + { -1, 0x0, 0x0 }, + { 0x1, 0x0, 0x0 } }; const UnkStruct_020EDB84 Unk_020EDB84[]; -static int(*const Unk_020EDAEC[6])(PlayerAvatar *, int); +static int (*const Unk_020EDAEC[6])(PlayerAvatar *, int); -void PlayerAvatar_MoveControl (PlayerAvatar * playerAvatar, const UnkStruct_ov5_021E8F60 * param1, int dir, u16 keyPad, u16 keyPress, BOOL param5) +void PlayerAvatar_MoveControl(PlayerAvatar *playerAvatar, const UnkStruct_ov5_021E8F60 *param1, int dir, u16 keyPad, u16 keyPress, BOOL param5) { if (dir == -1) { dir = sub_02061348(playerAvatar, keyPad, keyPress); @@ -173,15 +173,15 @@ void PlayerAvatar_MoveControl (PlayerAvatar * playerAvatar, const UnkStruct_ov5_ PlayerAvatar_PlayWalkSE(playerAvatar); } -int PlayerAvatar_CheckStartMove (PlayerAvatar * playerAvatar, int dir) +int PlayerAvatar_CheckStartMove(PlayerAvatar *playerAvatar, int dir) { return PlayerAvatar_CheckStartMoveInternal(playerAvatar, dir); } -static int PlayerAvatar_CheckStartMoveInternal (PlayerAvatar * playerAvatar, int dir) +static int PlayerAvatar_CheckStartMoveInternal(PlayerAvatar *playerAvatar, int dir) { int v0; - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); if (LocalMapObj_IsAnimationSet(mapObj) == 1) { return 1; @@ -200,7 +200,7 @@ static int PlayerAvatar_CheckStartMoveInternal (PlayerAvatar * playerAvatar, int v2 = sub_020611FC(playerAvatar, mapObj, dir); if ((v2 & (~(1 << 7))) && PlayerAvatar_MapDistortionState(playerAvatar) == AVATAR_DISTORTION_STATE_FLOOR) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int xOut, x = MapObject_GetXPos(mapObj); int yOut, y = MapObject_GetYPos(mapObj); int zOut, z = MapObject_GetZPos(mapObj); @@ -238,13 +238,13 @@ static int PlayerAvatar_CheckStartMoveInternal (PlayerAvatar * playerAvatar, int return 0; } -static void PlayerAvatar_StartMoveInit (PlayerAvatar * playerAvatar, int param1, u16 param2, u16 param3) +static void PlayerAvatar_StartMoveInit(PlayerAvatar *playerAvatar, int param1, u16 param2, u16 param3) { sub_0205EBEC(playerAvatar, sub_02061310(param3), sub_0206132C(param3)); sub_0205F054(playerAvatar); } -static void sub_0205F378 (PlayerAvatar * playerAvatar) +static void sub_0205F378(PlayerAvatar *playerAvatar) { if ((sub_0205F060(playerAvatar) == 1) && (PlayerAvatar_MoveState(playerAvatar) == 1)) { sub_0205EF6C(playerAvatar, 0); @@ -256,10 +256,10 @@ static void sub_0205F378 (PlayerAvatar * playerAvatar) } } -static void PlayerAvatar_PlayWalkSE (PlayerAvatar * playerAvatar) +static void PlayerAvatar_PlayWalkSE(PlayerAvatar *playerAvatar) { if (PlayerAvatar_MoveState(playerAvatar) == 1) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); u8 v1, v2 = sub_02062BE8(mapObj); { @@ -286,7 +286,6 @@ static void PlayerAvatar_PlayWalkSE (PlayerAvatar * playerAvatar) } if (sub_0205DB6C(v2) == 1) { - } if ((sub_0205DCE0(v2) == 1) && (sub_0205DCF0(v2) != 1)) { @@ -303,10 +302,10 @@ static void PlayerAvatar_PlayWalkSE (PlayerAvatar * playerAvatar) } } -void sub_0205F490 (PlayerAvatar * playerAvatar) +void sub_0205F490(PlayerAvatar *playerAvatar) { int v0, v1, v2; - const MapObject * mapObj; + const MapObject *mapObj; v0 = PlayerAvatar_MoveState(playerAvatar); v1 = Player_MoveState(playerAvatar); @@ -378,17 +377,17 @@ void sub_0205F490 (PlayerAvatar * playerAvatar) } } -void sub_0205F56C (PlayerAvatar * playerAvatar) +void sub_0205F56C(PlayerAvatar *playerAvatar) { sub_0205EB08(playerAvatar, 0); sub_0205EB10(playerAvatar, 0); PlayerAvatar_ClearSpeed(playerAvatar); } -int sub_0205F588 (PlayerAvatar * playerAvatar) +int sub_0205F588(PlayerAvatar *playerAvatar) { int v0, v1, v2; - const MapObject * mapObj; + const MapObject *mapObj; v0 = PlayerAvatar_MoveState(playerAvatar); v1 = Player_MoveState(playerAvatar); @@ -422,9 +421,9 @@ int sub_0205F588 (PlayerAvatar * playerAvatar) return 0; } -void sub_0205F5E4 (PlayerAvatar * playerAvatar, int param1) +void sub_0205F5E4(PlayerAvatar *playerAvatar, int param1) { - MapObject * mapObj; + MapObject *mapObj; sub_0205EB08(playerAvatar, 0); sub_0205EB10(playerAvatar, 0); @@ -438,7 +437,7 @@ void sub_0205F5E4 (PlayerAvatar * playerAvatar, int param1) LocalMapObj_SetAnimationCode(mapObj, sub_02065838(param1, 0x0)); } -static int sub_0205F62C (PlayerAvatar * playerAvatar, int param1) +static int sub_0205F62C(PlayerAvatar *playerAvatar, int param1) { u32 v0 = sub_0205F644(playerAvatar, param1); @@ -446,7 +445,7 @@ static int sub_0205F62C (PlayerAvatar * playerAvatar, int param1) return v0; } -static u32 sub_0205F644 (PlayerAvatar * playerAvatar, int param1) +static u32 sub_0205F644(PlayerAvatar *playerAvatar, int param1) { int v0 = 0; u32 v1 = sub_02062BE8(Player_MapObject(playerAvatar)); @@ -471,14 +470,14 @@ static u32 sub_0205F644 (PlayerAvatar * playerAvatar, int param1) } static const UnkStruct_020EDB84 Unk_020EDB84[] = { - {sub_0205DC5C, 0x1}, - {sub_0205DD68, 0x2}, - {sub_0205DD90, 0x3}, - {sub_0205DD9C, 0x4}, - {NULL, 0x6} + { sub_0205DC5C, 0x1 }, + { sub_0205DD68, 0x2 }, + { sub_0205DD90, 0x3 }, + { sub_0205DD9C, 0x4 }, + { NULL, 0x6 } }; -static int sub_0205F6A4 (PlayerAvatar * playerAvatar, u32 param1, int param2) +static int sub_0205F6A4(PlayerAvatar *playerAvatar, u32 param1, int param2) { if (Unk_020EDAEC[param1](playerAvatar, param2) == 1) { return 1; @@ -487,15 +486,15 @@ static int sub_0205F6A4 (PlayerAvatar * playerAvatar, u32 param1, int param2) return 0; } -static int sub_0205F6C4 (PlayerAvatar * playerAvatar, int param1) +static int sub_0205F6C4(PlayerAvatar *playerAvatar, int param1) { sub_0205FA6C(playerAvatar); return 0; } -static int sub_0205F6D0 (PlayerAvatar * playerAvatar, int param1) +static int sub_0205F6D0(PlayerAvatar *playerAvatar, int param1) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); int v1 = MapObject_GetMoveDir(mapObj); int v2 = sub_0205FAB0(playerAvatar, v1); u32 v3 = sub_02060B7C(playerAvatar, mapObj, v1); @@ -552,10 +551,10 @@ static int sub_0205F6D0 (PlayerAvatar * playerAvatar, int param1) return 1; } -static int sub_0205F808 (PlayerAvatar * playerAvatar, int param1) +static int sub_0205F808(PlayerAvatar *playerAvatar, int param1) { u32 v0; - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); int v2 = MapObject_GetMoveDir(mapObj); Sound_PlayEffect(1620); @@ -609,9 +608,9 @@ static int sub_0205F808 (PlayerAvatar * playerAvatar, int param1) return 0; } -static int sub_0205F95C (PlayerAvatar * playerAvatar, int param1) +static int sub_0205F95C(PlayerAvatar *playerAvatar, int param1) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); int v1 = MapObject_GetMoveDir(mapObj); if (PlayerAvatar_CyclingGear(playerAvatar) == 1) { @@ -627,9 +626,9 @@ static int sub_0205F95C (PlayerAvatar * playerAvatar, int param1) return 1; } -static int sub_0205F9AC (PlayerAvatar * playerAvatar, int param1) +static int sub_0205F9AC(PlayerAvatar *playerAvatar, int param1) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); int v1 = MapObject_GetMoveDir(mapObj); if (PlayerAvatar_CyclingGear(playerAvatar) == 1) { @@ -645,10 +644,10 @@ static int sub_0205F9AC (PlayerAvatar * playerAvatar, int param1) return 1; } -static int sub_0205F9FC (PlayerAvatar * playerAvatar, int param1) +static int sub_0205F9FC(PlayerAvatar *playerAvatar, int param1) { int v0 = 1; - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); u32 v2 = sub_02060B7C(playerAvatar, mapObj, v0); if (v2 == 0) { @@ -667,7 +666,7 @@ static int sub_0205F9FC (PlayerAvatar * playerAvatar, int param1) return 1; } -static int(*const Unk_020EDAEC[6])(PlayerAvatar *, int) = { +static int (*const Unk_020EDAEC[6])(PlayerAvatar *, int) = { sub_0205F6C4, sub_0205F6D0, sub_0205F808, @@ -676,10 +675,10 @@ static int(*const Unk_020EDAEC[6])(PlayerAvatar *, int) = { sub_0205F9FC }; -static void sub_0205FA6C (PlayerAvatar * playerAvatar) +static void sub_0205FA6C(PlayerAvatar *playerAvatar) { if (sub_0205EF58(playerAvatar) == 1) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); MapObject_SetStatusFlagOff(v0, (1 << 7) | (1 << 8)); @@ -693,12 +692,12 @@ static void sub_0205FA6C (PlayerAvatar * playerAvatar) } } -static int sub_0205FAB0 (PlayerAvatar * playerAvatar, int param1) +static int sub_0205FAB0(PlayerAvatar *playerAvatar, int param1) { int v0; VecFx32 v1, v2; - MapObject * mapObj = Player_MapObject(playerAvatar); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + MapObject *mapObj = Player_MapObject(playerAvatar); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); MapObject_PosVectorOut(mapObj, &v1); v2 = v1; @@ -717,7 +716,7 @@ static int sub_0205FAB0 (PlayerAvatar * playerAvatar, int param1) return 1; } -static int sub_0205FB10 (PlayerAvatar * playerAvatar, int param1) +static int sub_0205FB10(PlayerAvatar *playerAvatar, int param1) { int v0 = PlayerAvatar_Speed(playerAvatar); @@ -739,9 +738,9 @@ static int sub_0205FB10 (PlayerAvatar * playerAvatar, int param1) return 1; } -static void sub_0205FB40 (PlayerAvatar * playerAvatar, int param1) +static void sub_0205FB40(PlayerAvatar *playerAvatar, int param1) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); int v1 = 0x10; int v2 = PlayerAvatar_Speed(playerAvatar); int v3 = 5; @@ -765,10 +764,10 @@ static void sub_0205FB40 (PlayerAvatar * playerAvatar, int param1) sub_02060B64(playerAvatar, v0, v1, v3); } -static void inline_0205F180 (PlayerAvatar * playerAvatar, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4) +static void inline_0205F180(PlayerAvatar *playerAvatar, const UnkStruct_ov5_021E8F60 *param1, int param2, u16 param3, u16 param4) { int v0 = PlayerAvatar_GetPlayerState(playerAvatar); - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); switch (v0) { case PLAYER_STATE_WALKING: @@ -784,7 +783,7 @@ static void inline_0205F180 (PlayerAvatar * playerAvatar, const UnkStruct_ov5_02 } } -static void inline_0205F180_sub (PlayerAvatar * playerAvatar, MapObject * mapObj, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) +static void inline_0205F180_sub(PlayerAvatar *playerAvatar, MapObject *mapObj, const UnkStruct_ov5_021E8F60 *param2, int param3, u16 param4, u16 param5) { int v0; @@ -803,7 +802,7 @@ static void inline_0205F180_sub (PlayerAvatar * playerAvatar, MapObject * mapObj } } -static int sub_0205FC48 (PlayerAvatar * playerAvatar, int param1) +static int sub_0205FC48(PlayerAvatar *playerAvatar, int param1) { int v0 = sub_0205FCC0(playerAvatar, param1); int v1 = sub_0205FC64(v0); @@ -812,7 +811,7 @@ static int sub_0205FC48 (PlayerAvatar * playerAvatar, int param1) return v0; } -static int sub_0205FC64 (int param0) +static int sub_0205FC64(int param0) { switch (param0) { case 0: @@ -827,7 +826,7 @@ static int sub_0205FC64 (int param0) return 0; } -static int sub_0205FC88 (MapObject * mapObj, u8 param1, int param2) +static int sub_0205FC88(MapObject *mapObj, u8 param1, int param2) { if (sub_0205DD5C(param1) == 1) { return 0x4; @@ -844,12 +843,12 @@ static int sub_0205FC88 (MapObject * mapObj, u8 param1, int param2) return param2; } -static int sub_0205FCBC (MapObject * mapObj, u8 param1, int param2) +static int sub_0205FCBC(MapObject *mapObj, u8 param1, int param2) { return param2; } -static int sub_0205FCC0 (PlayerAvatar * playerAvatar, int param1) +static int sub_0205FCC0(PlayerAvatar *playerAvatar, int param1) { int v0; @@ -862,9 +861,9 @@ static int sub_0205FCC0 (PlayerAvatar * playerAvatar, int param1) enum AvatarDistortionState distortionState = PlayerAvatar_MapDistortionState(playerAvatar); - if (distortionState != AVATAR_DISTORTION_STATE_NONE - && distortionState != AVATAR_DISTORTION_STATE_ACTIVE - && distortionState != AVATAR_DISTORTION_STATE_FLOOR) { + if (distortionState != AVATAR_DISTORTION_STATE_NONE + && distortionState != AVATAR_DISTORTION_STATE_ACTIVE + && distortionState != AVATAR_DISTORTION_STATE_FLOOR) { v0 = PlayerAvatar_GetMoveDir(playerAvatar); } @@ -877,7 +876,7 @@ static int sub_0205FCC0 (PlayerAvatar * playerAvatar, int param1) return 1; } -static void sub_0205FD20 (PlayerAvatar * playerAvatar, MapObject * param1, int param2, u16 param3, u16 param4) +static void sub_0205FD20(PlayerAvatar *playerAvatar, MapObject *param1, int param2, u16 param3, u16 param4) { int v0; @@ -885,7 +884,7 @@ static void sub_0205FD20 (PlayerAvatar * playerAvatar, MapObject * param1, int p sub_02060B64(playerAvatar, param1, v0, 1); } -static void sub_0205FD40 (PlayerAvatar * playerAvatar, MapObject * param1, int param2, u16 param3, u16 param4) +static void sub_0205FD40(PlayerAvatar *playerAvatar, MapObject *param1, int param2, u16 param3, u16 param4) { enum AvatarDistortionState distortionState = PlayerAvatar_MapDistortionState(playerAvatar); @@ -907,7 +906,7 @@ static void sub_0205FD40 (PlayerAvatar * playerAvatar, MapObject * param1, int p } } -static void sub_0205FDC8 (PlayerAvatar * playerAvatar, MapObject * param1, int param2, u16 param3, u16 param4) +static void sub_0205FDC8(PlayerAvatar *playerAvatar, MapObject *param1, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -916,10 +915,10 @@ static void sub_0205FDC8 (PlayerAvatar * playerAvatar, MapObject * param1, int p v0 = sub_02060B7C(playerAvatar, param1, param2); if (PlayerAvatar_GetPlayerState(playerAvatar) != PLAYER_STATE_SURFING) { - if ((v0 & (1 << 2))) { + if (v0 & (1 << 2)) { v1 = 0x38; v2 = 3; - } else if ((v0 & (1 << 7))) { + } else if (v0 & (1 << 7)) { v1 = 0x75; v2 = 2; } else if (v0 != 0) { @@ -936,7 +935,7 @@ static void sub_0205FDC8 (PlayerAvatar * playerAvatar, MapObject * param1, int p v2 = 4; { - PlayerData * v3 = PlayerAvatar_PlayerData(playerAvatar); + PlayerData *v3 = PlayerAvatar_PlayerData(playerAvatar); if (PlayerData_HasRunningShoes(v3) == 1) { if (sub_020613FC(playerAvatar, param4) == 1) { @@ -975,7 +974,7 @@ static void sub_0205FDC8 (PlayerAvatar * playerAvatar, MapObject * param1, int p sub_02060B64(playerAvatar, param1, v1, v2); } -static void sub_0205FECC (PlayerAvatar * playerAvatar, MapObject * param1, int param2, u16 param3, u16 param4) +static void sub_0205FECC(PlayerAvatar *playerAvatar, MapObject *param1, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -983,8 +982,8 @@ static void sub_0205FECC (PlayerAvatar * playerAvatar, MapObject * param1, int p v0 = sub_020611FC(playerAvatar, param1, param2); - if ((v0 & (~(1 << 7)))) { - FieldSystem * fieldSystem = MapObject_FieldSystem(param1); + if (v0 & (~(1 << 7))) { + FieldSystem *fieldSystem = MapObject_FieldSystem(param1); int x = MapObject_GetXPos(param1); int y = MapObject_GetYPos(param1); int z = MapObject_GetZPos(param1); @@ -1001,7 +1000,7 @@ static void sub_0205FECC (PlayerAvatar * playerAvatar, MapObject * param1, int p } if (PlayerAvatar_GetPlayerState(playerAvatar) != PLAYER_STATE_SURFING) { - if ((v0 & (1 << 7))) { + if (v0 & (1 << 7)) { v1 = 0x75; v2 = 2; sub_020615C8(playerAvatar); @@ -1012,7 +1011,7 @@ static void sub_0205FECC (PlayerAvatar * playerAvatar, MapObject * param1, int p Sound_PlayEffect(1537); sub_02062994(param1, param2); } else { - PlayerData * player; + PlayerData *player; v1 = 0xc; v2 = 4; @@ -1044,7 +1043,7 @@ static void sub_0205FECC (PlayerAvatar * playerAvatar, MapObject * param1, int p sub_02060B64(playerAvatar, param1, v1, v2); } -static void sub_0206000C (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4, const int * param5, const int * param6, const int * param7, const int * param8, const int * param9) +static void sub_0206000C(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4, const int *param5, const int *param6, const int *param7, const int *param8, const int *param9) { u32 v0; int v1; @@ -1059,7 +1058,7 @@ static void sub_0206000C (PlayerAvatar * playerAvatar, MapObject * mapObj, int p Sound_PlayEffect(1537); sub_02062994(mapObj, param9[param2]); } else { - PlayerData * v3; + PlayerData *v3; v2 = 4; v1 = param5[param2]; @@ -1091,40 +1090,40 @@ static void sub_0206000C (PlayerAvatar * playerAvatar, MapObject * mapObj, int p sub_02060B64(playerAvatar, mapObj, v1, v2); } -static void sub_020600CC (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_020600CC(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { - int v0[4] = {0x69, 0x6a, 0x6b, 0x6c}; - int v1[4] = {0x79, 0x7a, 0x7b, 0x7c}; - int v2[4] = {0x69, 0x6a, 0x6b, 0x6c}; - int v3[4] = {0x1e, 0x1f, 0x1d, 0x1c}; - int v4[4] = {0, 1, 2, 3}; + int v0[4] = { 0x69, 0x6a, 0x6b, 0x6c }; + int v1[4] = { 0x79, 0x7a, 0x7b, 0x7c }; + int v2[4] = { 0x69, 0x6a, 0x6b, 0x6c }; + int v3[4] = { 0x1e, 0x1f, 0x1d, 0x1c }; + int v4[4] = { 0, 1, 2, 3 }; sub_0206000C(playerAvatar, mapObj, param2, param3, param4, v0, v1, v2, v3, v4); } -static void sub_02060150 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_02060150(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { - int v0[4] = {0x6d, 0x6e, 0x6f, 0x70}; - int v1[4] = {0x7d, 0x7e, 0x7f, 0x80}; - int v2[4] = {0x6d, 0x6e, 0x6f, 0x70}; - int v3[4] = {0x1f, 0x1e, 0x1c, 0x1d}; - int v4[4] = {0, 1, 2, 3}; + int v0[4] = { 0x6d, 0x6e, 0x6f, 0x70 }; + int v1[4] = { 0x7d, 0x7e, 0x7f, 0x80 }; + int v2[4] = { 0x6d, 0x6e, 0x6f, 0x70 }; + int v3[4] = { 0x1f, 0x1e, 0x1c, 0x1d }; + int v4[4] = { 0, 1, 2, 3 }; sub_0206000C(playerAvatar, mapObj, param2, param3, param4, v0, v1, v2, v3, v4); } -static void sub_020601D4 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_020601D4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { - int v0[4] = {0x71, 0x72, 0x73, 0x74}; - int v1[4] = {0x81, 0x82, 0x83, 0x84}; - int v2[4] = {0x71, 0x72, 0x73, 0x74}; - int v3[4] = {0x1d, 0x1c, 0x1f, 0x1e}; - int v4[4] = {0, 1, 2, 3}; + int v0[4] = { 0x71, 0x72, 0x73, 0x74 }; + int v1[4] = { 0x81, 0x82, 0x83, 0x84 }; + int v2[4] = { 0x71, 0x72, 0x73, 0x74 }; + int v3[4] = { 0x1d, 0x1c, 0x1f, 0x1e }; + int v4[4] = { 0, 1, 2, 3 }; sub_0206000C(playerAvatar, mapObj, param2, param3, param4, v0, v1, v2, v3, v4); } -static void sub_02060258 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_02060258(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { int v0, v1; v1 = param2; @@ -1133,15 +1132,15 @@ static void sub_02060258 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p switch (distortionState) { case AVATAR_DISTORTION_STATE_WEST_WALL: - int v3[4] = {2, 3, 1, 0}; + int v3[4] = { 2, 3, 1, 0 }; v1 = v3[param2]; break; case AVATAR_DISTORTION_STATE_EAST_WALL: - int v4[4] = {3, 2, 0, 1}; + int v4[4] = { 3, 2, 0, 1 }; v1 = v4[param2]; break; case AVATAR_DISTORTION_STATE_CEILING: - int v5[4] = {1, 0, 3, 2}; + int v5[4] = { 1, 0, 3, 2 }; v1 = v5[param2]; break; } @@ -1152,7 +1151,7 @@ static void sub_02060258 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p sub_02062994(mapObj, param2); } -static void sub_020602DC (PlayerAvatar * playerAvatar, MapObject * mapObj, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) +static void sub_020602DC(PlayerAvatar *playerAvatar, MapObject *mapObj, const UnkStruct_ov5_021E8F60 *param2, int param3, u16 param4, u16 param5) { int v0; @@ -1163,7 +1162,7 @@ static void sub_020602DC (PlayerAvatar * playerAvatar, MapObject * mapObj, const } } -static void PlayerAvatar_TryCyclingGearChange (PlayerAvatar * playerAvatar, u16 pad) +static void PlayerAvatar_TryCyclingGearChange(PlayerAvatar *playerAvatar, u16 pad) { if (PlayerAvatar_GetPlayerState(playerAvatar) != PLAYER_STATE_CYCLING) { return; @@ -1194,7 +1193,7 @@ static void PlayerAvatar_TryCyclingGearChange (PlayerAvatar * playerAvatar, u16 } } -int sub_02060390 (PlayerAvatar * playerAvatar, int param1) +int sub_02060390(PlayerAvatar *playerAvatar, int param1) { int v0; @@ -1216,7 +1215,7 @@ int sub_02060390 (PlayerAvatar * playerAvatar, int param1) return v0; } -static int sub_020603BC (PlayerAvatar * playerAvatar) +static int sub_020603BC(PlayerAvatar *playerAvatar) { int v0 = PlayerAvatar_AddMoveSpeed(playerAvatar, 1, 3); @@ -1233,7 +1232,7 @@ static int sub_020603BC (PlayerAvatar * playerAvatar) return 0; } -static int sub_020603EC (PlayerAvatar * playerAvatar) +static int sub_020603EC(PlayerAvatar *playerAvatar) { int v0 = 1; int v1 = PlayerAvatar_Speed(playerAvatar); @@ -1256,7 +1255,7 @@ static int sub_020603EC (PlayerAvatar * playerAvatar) return v0; } -static void sub_02060420 (PlayerAvatar * playerAvatar, MapObject * mapObj, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) +static void sub_02060420(PlayerAvatar *playerAvatar, MapObject *mapObj, const UnkStruct_ov5_021E8F60 *param2, int param3, u16 param4, u16 param5) { int v0 = sub_02060494(playerAvatar, param3); @@ -1276,7 +1275,7 @@ static void sub_02060420 (PlayerAvatar * playerAvatar, MapObject * mapObj, const } } -static int sub_02060494 (PlayerAvatar * playerAvatar, int param1) +static int sub_02060494(PlayerAvatar *playerAvatar, int param1) { int v0 = sub_020604E4(playerAvatar, param1); int v1 = sub_020604B0(v0); @@ -1285,7 +1284,7 @@ static int sub_02060494 (PlayerAvatar * playerAvatar, int param1) return v0; } -static int sub_020604B0 (int param0) +static int sub_020604B0(int param0) { switch (param0) { case 0: @@ -1302,7 +1301,7 @@ static int sub_020604B0 (int param0) return 0; } -static int sub_020604E4 (PlayerAvatar * playerAvatar, int param1) +static int sub_020604E4(PlayerAvatar *playerAvatar, int param1) { int dir; @@ -1328,7 +1327,7 @@ static int sub_020604E4 (PlayerAvatar * playerAvatar, int param1) return 1; } -static void sub_02060548 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_02060548(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { int v0; @@ -1338,7 +1337,7 @@ static void sub_02060548 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p PlayerAvatar_ClearSpeed(playerAvatar); } -static void sub_02060570 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_02060570(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -1346,23 +1345,23 @@ static void sub_02060570 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p v0 = sub_02060B7C(playerAvatar, mapObj, param2); - if ((v0 & (1 << 2))) { + if (v0 & (1 << 2)) { v1 = 0x38; v2 = 3; sub_020615C8(playerAvatar); sub_0205F048(playerAvatar); - } else if ((v0 & (1 << 7))) { + } else if (v0 & (1 << 7)) { v1 = 0x75; v2 = 2; sub_020615C8(playerAvatar); sub_0205F048(playerAvatar); - } else if ((v0 & (1 << 4))) { + } else if (v0 & (1 << 4)) { v1 = 0x50; v2 = 5; sub_020615C8(playerAvatar); sub_0205F048(playerAvatar); sub_0205EF40(playerAvatar, 1); - } else if ((v0 & (1 << 6))) { + } else if (v0 & (1 << 6)) { v1 = 0x0; v2 = 1; param2 = MapObject_GetMoveDir(mapObj); @@ -1400,7 +1399,7 @@ static void sub_02060570 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p sub_02060B64(playerAvatar, mapObj, v1, v2); } -static void sub_02060688 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_02060688(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { PlayerAvatar_ClearSpeed(playerAvatar); @@ -1413,7 +1412,7 @@ static void sub_02060688 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p } } -static void sub_020606C8 (PlayerAvatar * playerAvatar, MapObject * mapObj, int dir, u16 param3, u16 param4) +static void sub_020606C8(PlayerAvatar *playerAvatar, MapObject *mapObj, int dir, u16 param3, u16 param4) { u32 v0; int v1; @@ -1422,13 +1421,13 @@ static void sub_020606C8 (PlayerAvatar * playerAvatar, MapObject * mapObj, int d dir = PlayerAvatar_GetMoveDir(playerAvatar); v0 = sub_02060B7C(playerAvatar, mapObj, dir); - if ((v0 & (1 << 2))) { + if (v0 & (1 << 2)) { v2 = sub_02065838(dir, 0x38); v1 = 3; - } else if ((v0 & (1 << 7))) { + } else if (v0 & (1 << 7)) { v2 = sub_02065838(dir, 0x75); v1 = 2; - } else if ((v0 & (1 << 6))) { + } else if (v0 & (1 << 6)) { v2 = sub_02065838(dir, 0x0); v1 = 1; PlayerAvatar_ClearSpeed(playerAvatar); @@ -1455,7 +1454,7 @@ static void sub_020606C8 (PlayerAvatar * playerAvatar, MapObject * mapObj, int d sub_02060B64(playerAvatar, mapObj, v2, v1); } -static void sub_0206078C (PlayerAvatar * playerAvatar, MapObject * mapObj, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5) +static void sub_0206078C(PlayerAvatar *playerAvatar, MapObject *mapObj, const UnkStruct_ov5_021E8F60 *param2, int param3, u16 param4, u16 param5) { int v0 = sub_02060800(playerAvatar, param3); @@ -1475,7 +1474,7 @@ static void sub_0206078C (PlayerAvatar * playerAvatar, MapObject * mapObj, const } } -static int sub_02060800 (PlayerAvatar * playerAvatar, int param1) +static int sub_02060800(PlayerAvatar *playerAvatar, int param1) { int v0 = sub_02060850(playerAvatar, param1); int v1 = sub_0206081C(v0); @@ -1484,7 +1483,7 @@ static int sub_02060800 (PlayerAvatar * playerAvatar, int param1) return v0; } -static int sub_0206081C (int param0) +static int sub_0206081C(int param0) { switch (param0) { case 0: @@ -1501,7 +1500,7 @@ static int sub_0206081C (int param0) return 0; } -static int sub_02060850 (PlayerAvatar * playerAvatar, int param1) +static int sub_02060850(PlayerAvatar *playerAvatar, int param1) { int v0, v1; @@ -1533,7 +1532,7 @@ static int sub_02060850 (PlayerAvatar * playerAvatar, int param1) return 1; } -static void sub_020608BC (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_020608BC(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { int v0; @@ -1543,7 +1542,7 @@ static void sub_020608BC (PlayerAvatar * playerAvatar, MapObject * mapObj, int p PlayerAvatar_ClearSpeed(playerAvatar); } -static void sub_020608E4 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_020608E4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -1551,19 +1550,19 @@ static void sub_020608E4 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p v0 = sub_02060B7C(playerAvatar, mapObj, param2); - if ((v0 & (1 << 2))) { + if (v0 & (1 << 2)) { v1 = sub_02065838(param2, 0x38); v2 = 3; sub_020603BC(playerAvatar); sub_020615C8(playerAvatar); sub_0205F048(playerAvatar); - } else if ((v0 & (1 << 7))) { + } else if (v0 & (1 << 7)) { v1 = sub_02065838(param2, 0x75); v2 = 2; sub_020603BC(playerAvatar); sub_020615C8(playerAvatar); sub_0205F048(playerAvatar); - } else if ((v0 & (1 << 4))) { + } else if (v0 & (1 << 4)) { if (PlayerAvatar_Speed(playerAvatar) >= 3) { v1 = sub_02060390(playerAvatar, param2); v2 = 5; @@ -1580,7 +1579,7 @@ static void sub_020608E4 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p sub_02062994(mapObj, param2); PlayerAvatar_ClearSpeed(playerAvatar); } - } else if ((v0 & (1 << 6))) { + } else if (v0 & (1 << 6)) { param2 = MapObject_GetMoveDir(mapObj); v1 = sub_02065838(param2, 0x0); v2 = 1; @@ -1617,7 +1616,7 @@ static void sub_020608E4 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p sub_02060B64(playerAvatar, mapObj, v1, v2); } -static void sub_02060A60 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_02060A60(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { PlayerAvatar_ClearSpeed(playerAvatar); @@ -1632,7 +1631,7 @@ static void sub_02060A60 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p } } -static void sub_02060AA0 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2, u16 param3, u16 param4) +static void sub_02060AA0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2, u16 param3, u16 param4) { u32 v0; int v1; @@ -1641,13 +1640,13 @@ static void sub_02060AA0 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p param2 = PlayerAvatar_GetMoveDir(playerAvatar); v0 = sub_02060B7C(playerAvatar, mapObj, param2); - if ((v0 & (1 << 2))) { + if (v0 & (1 << 2)) { v2 = sub_02065838(param2, 0x38); v1 = 3; - } else if ((v0 & (1 << 7))) { + } else if (v0 & (1 << 7)) { v2 = sub_02065838(param2, 0x75); v1 = 2; - } else if ((v0 & (1 << 6))) { + } else if (v0 & (1 << 6)) { v2 = sub_02065838(param2, 0x0); v1 = 1; PlayerAvatar_ClearSpeed(playerAvatar); @@ -1674,20 +1673,20 @@ static void sub_02060AA0 (PlayerAvatar * playerAvatar, MapObject * mapObj, int p sub_02060B64(playerAvatar, mapObj, v2, v1); } -static void sub_02060B64 (PlayerAvatar * playerAvatar, MapObject * mapObj, u32 param2, int param3) +static void sub_02060B64(PlayerAvatar *playerAvatar, MapObject *mapObj, u32 param2, int param3) { sub_0205EC20(playerAvatar, param2, param3); LocalMapObj_SetAnimationCode(mapObj, param2); } -u32 sub_02060B7C (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +u32 sub_02060B7C(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { u32 v0, v1; v0 = 0; v1 = sub_02060C24(playerAvatar, mapObj, param2); - if ((v1 & ((1 << 1) | (1 << 3)))) { + if (v1 & ((1 << 1) | (1 << 3))) { v0 |= (1 << 0); if (sub_02060E40(playerAvatar, mapObj, param2)) { @@ -1695,7 +1694,7 @@ u32 sub_02060B7C (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) } } - if ((v1 & (1 << 2))) { + if (v1 & (1 << 2)) { v0 |= (1 << 1); } @@ -1726,7 +1725,7 @@ u32 sub_02060B7C (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) return v0; } -static u32 sub_02060C24 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static u32 sub_02060C24(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { VecFx32 v0; u32 v1, v2; @@ -1744,7 +1743,7 @@ static u32 sub_02060C24 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa { s8 v6; - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); if (sub_0205507C(fieldSystem, &v0, x, z, &v6) == 1) { v1 |= (1 << 1); @@ -1766,10 +1765,10 @@ static u32 sub_02060C24 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return v1; } -static int sub_02060CE4 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_02060CE4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { if (param2 != -1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetXPos(mapObj) + MapObject_GetDxFromDir(param2); int v2 = MapObject_GetZPos(mapObj) + MapObject_GetDyFromDir(param2); @@ -1808,12 +1807,12 @@ static int sub_02060CE4 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return 0; } -static int sub_02060D98 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_02060D98(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { BOOL v0 = 0; if (param2 != -1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v2 = MapObject_GetXPos(mapObj) + MapObject_GetDxFromDir(param2); int v3 = MapObject_GetZPos(mapObj) + MapObject_GetDyFromDir(param2); u8 v4 = sub_02054F94(fieldSystem, v2, v3); @@ -1845,10 +1844,10 @@ static int sub_02060D98 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return v0; } -static int sub_02060E40 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_02060E40(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { if (param2 != -1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetXPos(mapObj); int v2 = MapObject_GetZPos(mapObj); u8 v3 = sub_02054F94(fieldSystem, v1, v2); @@ -1888,10 +1887,10 @@ static int sub_02060E40 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return 0; } -static int sub_02060EE4 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_02060EE4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { if (param2 != -1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetXPos(mapObj) + MapObject_GetDxFromDir(param2); int v2 = MapObject_GetZPos(mapObj) + MapObject_GetDyFromDir(param2); u8 v3 = sub_02054F94(fieldSystem, v1, v2); @@ -1908,10 +1907,10 @@ static int sub_02060EE4 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return 0; } -static int sub_02060F4C (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_02060F4C(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { if (param2 != -1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetXPos(mapObj) + MapObject_GetDxFromDir(param2); int v2 = MapObject_GetZPos(mapObj) + MapObject_GetDyFromDir(param2); u8 v3 = sub_02054F94(fieldSystem, v1, v2); @@ -1924,10 +1923,10 @@ static int sub_02060F4C (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return 0; } -static int sub_02060FA8 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_02060FA8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { if (param2 != -1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetXPos(mapObj) + MapObject_GetDxFromDir(param2); int v2 = MapObject_GetZPos(mapObj) + MapObject_GetDyFromDir(param2); u8 v3 = sub_02054F94(fieldSystem, v1, v2); @@ -1958,10 +1957,10 @@ static int sub_02060FA8 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return 0; } -static int sub_02061058 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_02061058(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { if ((param2 != -1) && PlayerAvatar_GetPlayerState(playerAvatar) == PLAYER_STATE_CYCLING) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetXPos(mapObj) + MapObject_GetDxFromDir(param2); int v2 = MapObject_GetZPos(mapObj) + MapObject_GetDyFromDir(param2); u8 v3 = sub_02054F94(fieldSystem, v1, v2); @@ -1990,10 +1989,10 @@ static int sub_02061058 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return 0; } -static int sub_02061100 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_02061100(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { u32 v0 = 0; - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); if (sub_02071CB4(fieldSystem, 9) == 1) { int x = MapObject_GetXPos(mapObj); @@ -2016,10 +2015,10 @@ static int sub_02061100 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return v0; } -static int sub_02061180 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_02061180(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { if (param2 != -1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); if (sub_02071CB4(fieldSystem, 9) == 1) { BOOL v1; @@ -2041,17 +2040,17 @@ static int sub_02061180 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return 0; } -u32 sub_020611FC (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +u32 sub_020611FC(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { u32 v0, v1 = 0; v0 = sub_02061100(playerAvatar, mapObj, param2); - if ((v0 & ((1 << 1) | (1 << 3)))) { + if (v0 & ((1 << 1) | (1 << 3))) { v1 |= (1 << 0); } - if ((v0 & (1 << 2))) { + if (v0 & (1 << 2)) { v1 |= (1 << 1); } @@ -2066,11 +2065,11 @@ u32 sub_020611FC (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) return v1; } -static int sub_02061248 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_02061248(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { BOOL v0 = 0; if ((param2 != -1) && PlayerAvatar_MapDistortionState(playerAvatar) == AVATAR_DISTORTION_STATE_FLOOR) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); if (sub_02071CB4(fieldSystem, 9) == 1) { u32 v2; @@ -2102,12 +2101,12 @@ static int sub_02061248 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return v0; } -int sub_02061308 (PlayerAvatar * playerAvatar, u16 param1, u16 param2) +int sub_02061308(PlayerAvatar *playerAvatar, u16 param1, u16 param2) { return sub_02061348(playerAvatar, param1, param2); } -static int sub_02061310 (u16 pad) +static int sub_02061310(u16 pad) { if (pad & PAD_KEY_LEFT) { return 2; @@ -2120,7 +2119,7 @@ static int sub_02061310 (u16 pad) return -1; } -static int sub_0206132C (u16 pad) +static int sub_0206132C(u16 pad) { if (pad & PAD_KEY_UP) { return 0; @@ -2133,7 +2132,7 @@ static int sub_0206132C (u16 pad) return -1; } -static int sub_02061348 (PlayerAvatar * playerAvatar, u16 param1, u16 param2) +static int sub_02061348(PlayerAvatar *playerAvatar, u16 param1, u16 param2) { int v0 = sub_02061310(param2); int v1 = sub_0206132C(param2); @@ -2166,12 +2165,12 @@ static int sub_02061348 (PlayerAvatar * playerAvatar, u16 param1, u16 param2) return v1; } - return(-1); + return -1; } -int sub_020613AC (PlayerAvatar * playerAvatar) +int sub_020613AC(PlayerAvatar *playerAvatar) { - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); if (LocalMapObj_IsAnimationSet(mapObj) == 1) { return 1; @@ -2188,7 +2187,7 @@ int sub_020613AC (PlayerAvatar * playerAvatar) return 0; } -static int sub_020613D8 (int param0) +static int sub_020613D8(int param0) { switch (param0) { case 0x1c: @@ -2201,7 +2200,7 @@ static int sub_020613D8 (int param0) return 0; } -int sub_020613FC (PlayerAvatar * playerAvatar, u16 pad) +int sub_020613FC(PlayerAvatar *playerAvatar, u16 pad) { if (pad & PAD_BUTTON_B) { return 1; @@ -2210,7 +2209,7 @@ int sub_020613FC (PlayerAvatar * playerAvatar, u16 pad) return 0; } -int sub_0206140C (PlayerAvatar * playerAvatar) +int sub_0206140C(PlayerAvatar *playerAvatar) { u32 v0 = sub_0205EC14(playerAvatar); @@ -2225,7 +2224,7 @@ int sub_0206140C (PlayerAvatar * playerAvatar) return 0; } -int sub_02061434 (PlayerAvatar * playerAvatar, int param1) +int sub_02061434(PlayerAvatar *playerAvatar, int param1) { int v0, v1, state = PlayerAvatar_GetPlayerState(playerAvatar); @@ -2253,7 +2252,7 @@ int sub_02061434 (PlayerAvatar * playerAvatar, int param1) return v1; } -u32 sub_0206147C (PlayerAvatar * playerAvatar, u16 param1, u16 param2, int param3, int param4, int param5) +u32 sub_0206147C(PlayerAvatar *playerAvatar, u16 param1, u16 param2, int param3, int param4, int param5) { u32 v0; int v1 = sub_02061348(playerAvatar, param1, param2); @@ -2273,12 +2272,12 @@ u32 sub_0206147C (PlayerAvatar * playerAvatar, u16 param1, u16 param2, int param } { - MapObject * v3 = Player_MapObject(playerAvatar); + MapObject *v3 = Player_MapObject(playerAvatar); u32 v4 = param5; - if ((v4 & (1 << 2))) { + if (v4 & (1 << 2)) { v0 = 0x38; - } else if ((v4 & (1 << 7))) { + } else if (v4 & (1 << 7)) { v0 = 0x75; } else if (v4 != 0) { v0 = 0x1c; @@ -2322,46 +2321,46 @@ u32 sub_0206147C (PlayerAvatar * playerAvatar, u16 param1, u16 param2, int param return 0xff; } -int sub_02061544 (PlayerAvatar * playerAvatar) +int sub_02061544(PlayerAvatar *playerAvatar) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); return LocalMapObj_IsAnimationSet(v0); } -void PlayerAvatar_SetAnimationCode (PlayerAvatar * playerAvatar, u32 param1, int param2) +void PlayerAvatar_SetAnimationCode(PlayerAvatar *playerAvatar, u32 param1, int param2) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); sub_02060B64(playerAvatar, v0, param1, param2); } -u32 sub_0206156C (PlayerAvatar * playerAvatar, int param1) +u32 sub_0206156C(PlayerAvatar *playerAvatar, int param1) { - MapObject * v0 = Player_MapObject(playerAvatar); + MapObject *v0 = Player_MapObject(playerAvatar); return sub_02064238(v0, param1); } -void sub_0206157C (PlayerAvatar * playerAvatar, int param1, int * param2, int * param3) +void sub_0206157C(PlayerAvatar *playerAvatar, int param1, int *param2, int *param3) { *param2 = Player_GetXPos(playerAvatar) + MapObject_GetDxFromDir(param1); *param3 = Player_GetZPos(playerAvatar) + MapObject_GetDyFromDir(param1); } -void sub_020615AC (PlayerAvatar * playerAvatar, int * param1, int * param2) +void sub_020615AC(PlayerAvatar *playerAvatar, int *param1, int *param2) { int v0 = PlayerAvatar_GetDir(playerAvatar); sub_0206157C(playerAvatar, v0, param1, param2); } -static void sub_020615C8 (PlayerAvatar * playerAvatar) +static void sub_020615C8(PlayerAvatar *playerAvatar) { - MapObject * v0 = Player_MapObject(playerAvatar); - FieldSystem * fieldSystem = MapObject_FieldSystem(v0); - UnkStruct_0202CD88 * v2 = sub_0202CD88(fieldSystem->saveData); + MapObject *v0 = Player_MapObject(playerAvatar); + FieldSystem *fieldSystem = MapObject_FieldSystem(v0); + UnkStruct_0202CD88 *v2 = sub_0202CD88(fieldSystem->saveData); sub_0202CF28(v2, (0 + 0)); } -static int sub_020615E0 (PlayerAvatar * playerAvatar, MapObject * mapObj, int param2) +static int sub_020615E0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { if (param2 != -1) { u8 v0 = sub_02062BE8(mapObj); @@ -2386,7 +2385,7 @@ static int sub_020615E0 (PlayerAvatar * playerAvatar, MapObject * mapObj, int pa return 0; } -static int PlayerAvatar_IsUnderCyclingRoad (PlayerAvatar * playerAvatar, u32 param1, int param2) +static int PlayerAvatar_IsUnderCyclingRoad(PlayerAvatar *playerAvatar, u32 param1, int param2) { if (param2 != -1) { return FALSE; @@ -2399,8 +2398,8 @@ static int PlayerAvatar_IsUnderCyclingRoad (PlayerAvatar * playerAvatar, u32 par if (sub_0205EFDC(playerAvatar) == 0) { return FALSE; } - - MapObject * mapObj = Player_MapObject(playerAvatar); + + MapObject *mapObj = Player_MapObject(playerAvatar); if (sub_0206413C(mapObj, param1) == 1) { return TRUE; @@ -2409,9 +2408,9 @@ static int PlayerAvatar_IsUnderCyclingRoad (PlayerAvatar * playerAvatar, u32 par return FALSE; } -void sub_02061674 (PlayerAvatar * playerAvatar, int param1, int * param2, int * param3, int * param4) +void sub_02061674(PlayerAvatar *playerAvatar, int param1, int *param2, int *param3, int *param4) { - const UnkStruct_020EDB04 * v0; + const UnkStruct_020EDB04 *v0; enum AvatarDistortionState distortionState = PlayerAvatar_MapDistortionState(playerAvatar); switch (distortionState) { @@ -2438,15 +2437,15 @@ void sub_02061674 (PlayerAvatar * playerAvatar, int param1, int * param2, int * (*param4) += v0->unk_04; } -u32 sub_020616F0 (PlayerAvatar * playerAvatar, int param1) +u32 sub_020616F0(PlayerAvatar *playerAvatar, int param1) { u32 v0; if (PlayerAvatar_DistortionGravityChanged(playerAvatar) == FALSE) { v0 = sub_0206156C(playerAvatar, param1); } else { - MapObject * mapObj = Player_MapObject(playerAvatar); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + MapObject *mapObj = Player_MapObject(playerAvatar); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int x = MapObject_GetXPos(mapObj); int y = MapObject_GetYPos(mapObj) / 2; int z = MapObject_GetZPos(mapObj); @@ -2458,11 +2457,11 @@ u32 sub_020616F0 (PlayerAvatar * playerAvatar, int param1) return v0; } -u32 sub_02061760 (PlayerAvatar * playerAvatar) +u32 sub_02061760(PlayerAvatar *playerAvatar) { u32 v0; - MapObject * mapObj = Player_MapObject(playerAvatar); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + MapObject *mapObj = Player_MapObject(playerAvatar); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int x = MapObject_GetXPos(mapObj); int y = MapObject_GetYPos(mapObj) / 2; int z = MapObject_GetZPos(mapObj); @@ -2476,10 +2475,10 @@ u32 sub_02061760 (PlayerAvatar * playerAvatar) return v0; } -void sub_020617BC (PlayerAvatar * const playerAvatar, int * xOut, int * yOut, int * zOut) +void sub_020617BC(PlayerAvatar *const playerAvatar, int *xOut, int *yOut, int *zOut) { int v0 = sub_0205EAA0(playerAvatar); - MapObject * mapObj = Player_MapObject(playerAvatar); + MapObject *mapObj = Player_MapObject(playerAvatar); *xOut = MapObject_GetXPos(mapObj); *yOut = MapObject_GetYPos(mapObj) / 2; diff --git a/src/unk_0206450C.c b/src/unk_0206450C.c index f9218bf59a..c605a5c85e 100644 --- a/src/unk_0206450C.c +++ b/src/unk_0206450C.c @@ -1,3 +1,5 @@ +#include "unk_0206450C.h" + #include #include @@ -6,18 +8,17 @@ #include "field/field_system.h" -#include "unk_0201D15C.h" -#include "player_avatar.h" -#include "unk_0205F180.h" #include "map_object.h" #include "map_object_move.h" -#include "unk_0206450C.h" +#include "player_avatar.h" +#include "unk_0201D15C.h" +#include "unk_0205F180.h" #include "unk_020655F4.h" #include "unk_02067A84.h" typedef struct { int unk_00; - const int * unk_04; + const int *unk_04; } UnkStruct_020EEB08; typedef struct { @@ -88,30 +89,30 @@ typedef struct { UnkStruct_02065550 unk_08; } UnkStruct_0206502C; -static void sub_0206450C(MapObject * mapObj, int param1); -static void sub_02064668(MapObject * mapObj, int param1, int param2, int param3); -static int sub_020652EC(const int * param0, int param1); -static int sub_0206530C(const int * param0, int param1); +static void sub_0206450C(MapObject *mapObj, int param1); +static void sub_02064668(MapObject *mapObj, int param1, int param2, int param3); +static int sub_020652EC(const int *param0, int param1); +static int sub_0206530C(const int *param0, int param1); static int sub_02065330(int param0, int param1); -static const int * sub_02065358(int param0); -static int sub_0206537C(MapObject * mapObj); -static int sub_02065448(MapObject * mapObj, int param1, int param2); -static void sub_020647A0(MapObject * mapObj, UnkStruct_020647A0 * param1); -static int sub_0206489C(MapObject * mapObj, int param1); -static void sub_020648F4(MapObject * mapObj, int param1); -static void sub_0206496C(MapObject * mapObj, int param1); -static void sub_02064D98(MapObject * mapObj, int param1, int param2, int param3); -static void sub_0206502C(MapObject * mapObj, int param1, int param2, int param3); -static int sub_0206553C(MapObject * mapObj); -static void sub_02065550(MapObject * mapObj, UnkStruct_02065550 * param1); -static void sub_02065568(MapObject * mapObj, UnkStruct_02065550 * param1); -static void sub_020655E4(MapObject * mapObj, UnkStruct_02065550 * param1); - -int(*const Unk_020EE900[])(MapObject *, UnkStruct_0206496C *); -int(*const Unk_020EE870[])(MapObject *, UnkStruct_0206496C *); -int(*const Unk_020EE814[])(MapObject *, UnkStruct_02064C28 *); -int(*const Unk_020EE7AC[])(MapObject *, UnkStruct_02064D98 *); -int(*const Unk_020EE820[])(MapObject *, UnkStruct_0206502C *); +static const int *sub_02065358(int param0); +static int sub_0206537C(MapObject *mapObj); +static int sub_02065448(MapObject *mapObj, int param1, int param2); +static void sub_020647A0(MapObject *mapObj, UnkStruct_020647A0 *param1); +static int sub_0206489C(MapObject *mapObj, int param1); +static void sub_020648F4(MapObject *mapObj, int param1); +static void sub_0206496C(MapObject *mapObj, int param1); +static void sub_02064D98(MapObject *mapObj, int param1, int param2, int param3); +static void sub_0206502C(MapObject *mapObj, int param1, int param2, int param3); +static int sub_0206553C(MapObject *mapObj); +static void sub_02065550(MapObject *mapObj, UnkStruct_02065550 *param1); +static void sub_02065568(MapObject *mapObj, UnkStruct_02065550 *param1); +static void sub_020655E4(MapObject *mapObj, UnkStruct_02065550 *param1); + +int (*const Unk_020EE900[])(MapObject *, UnkStruct_0206496C *); +int (*const Unk_020EE870[])(MapObject *, UnkStruct_0206496C *); +int (*const Unk_020EE814[])(MapObject *, UnkStruct_02064C28 *); +int (*const Unk_020EE7AC[])(MapObject *, UnkStruct_02064D98 *); +int (*const Unk_020EE820[])(MapObject *, UnkStruct_0206502C *); static const int Unk_020EEAB0[2][4]; const int Unk_020EEA88[]; const int Unk_020EEA9C[]; @@ -155,9 +156,9 @@ const int Unk_020EE9D0[]; static const UnkStruct_020EEB08 Unk_020EEB08[40]; const int Unk_020EEAD0[]; -static void sub_0206450C (MapObject * mapObj, int param1) +static void sub_0206450C(MapObject *mapObj, int param1) { - UnkStruct_0206450C * v0; + UnkStruct_0206450C *v0; v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206450C))); v0->unk_02 = sub_0206530C(Unk_020EEA88, -1); @@ -167,64 +168,64 @@ static void sub_0206450C (MapObject * mapObj, int param1) sub_02062D10(mapObj); } -void sub_0206453C (MapObject * mapObj) +void sub_0206453C(MapObject *mapObj) { sub_0206450C(mapObj, 0); } -void sub_02064548 (MapObject * mapObj) +void sub_02064548(MapObject *mapObj) { sub_0206450C(mapObj, 1); } -void sub_02064554 (MapObject * mapObj) +void sub_02064554(MapObject *mapObj) { sub_0206450C(mapObj, 2); } -void sub_02064560 (MapObject * mapObj) +void sub_02064560(MapObject *mapObj) { sub_0206450C(mapObj, 3); } -void sub_0206456C (MapObject * mapObj) +void sub_0206456C(MapObject *mapObj) { sub_0206450C(mapObj, 4); } -void sub_02064578 (MapObject * mapObj) +void sub_02064578(MapObject *mapObj) { sub_0206450C(mapObj, 5); } -void sub_02064584 (MapObject * mapObj) +void sub_02064584(MapObject *mapObj) { sub_0206450C(mapObj, 6); } -void sub_02064590 (MapObject * mapObj) +void sub_02064590(MapObject *mapObj) { sub_0206450C(mapObj, 7); } -void sub_0206459C (MapObject * mapObj) +void sub_0206459C(MapObject *mapObj) { sub_0206450C(mapObj, 8); } -void sub_020645A8 (MapObject * mapObj) +void sub_020645A8(MapObject *mapObj) { sub_0206450C(mapObj, 9); } -void sub_020645B4 (MapObject * mapObj) +void sub_020645B4(MapObject *mapObj) { sub_0206450C(mapObj, 10); } -void sub_020645C0 (MapObject * mapObj) +void sub_020645C0(MapObject *mapObj) { - UnkStruct_0206450C * v0 = sub_02062A78(mapObj); + UnkStruct_0206450C *v0 = sub_02062A78(mapObj); int v1 = sub_02065448(mapObj, v0->unk_04, -1); if (v1 != -1) { @@ -244,34 +245,34 @@ void sub_020645C0 (MapObject * mapObj) sub_02064208(mapObj); } -void sub_02064624 (MapObject * mapObj) +void sub_02064624(MapObject *mapObj) { return; } -void sub_02064628 (MapObject * mapObj) +void sub_02064628(MapObject *mapObj) { sub_02064668(mapObj, 0xc, 11, 0); } -void sub_02064638 (MapObject * mapObj) +void sub_02064638(MapObject *mapObj) { sub_02064668(mapObj, 0xc, 12, 0); } -void sub_02064648 (MapObject * mapObj) +void sub_02064648(MapObject *mapObj) { sub_02064668(mapObj, 0xc, 13, 0); } -void sub_02064658 (MapObject * mapObj) +void sub_02064658(MapObject *mapObj) { sub_02064668(mapObj, 0xc, 13, 2); } -static void sub_02064668 (MapObject * mapObj, int param1, int param2, int param3) +static void sub_02064668(MapObject *mapObj, int param1, int param2, int param3) { - UnkStruct_02064668 * v0; + UnkStruct_02064668 *v0; v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02064668))); @@ -283,10 +284,10 @@ static void sub_02064668 (MapObject * mapObj, int param1, int param2, int param3 sub_02062D10(mapObj); } -void sub_02064690 (MapObject * mapObj) +void sub_02064690(MapObject *mapObj) { int v0; - UnkStruct_02064668 * v1; + UnkStruct_02064668 *v1; v1 = sub_02062A78(mapObj); @@ -333,7 +334,7 @@ void sub_02064690 (MapObject * mapObj) if (v2 != 0) { if (v1->unk_04 == 2) { - if ((v2 & (1 << 0))) { + if (v2 & (1 << 0)) { v1->unk_00 = 0; break; } @@ -360,7 +361,7 @@ void sub_02064690 (MapObject * mapObj) } } -static void sub_020647A0 (MapObject * mapObj, UnkStruct_020647A0 * param1) +static void sub_020647A0(MapObject *mapObj, UnkStruct_020647A0 *param1) { int v0, v1, v2, v3, v4; @@ -372,43 +373,59 @@ static void sub_020647A0 (MapObject * mapObj, UnkStruct_020647A0 * param1) switch (v0) { case 0x6: - param1->unk_00 = v1 - v3; param1->unk_08 = v1; - param1->unk_04 = v2 - v4; param1->unk_0C = v2; + param1->unk_00 = v1 - v3; + param1->unk_08 = v1; + param1->unk_04 = v2 - v4; + param1->unk_0C = v2; break; case 0x7: - param1->unk_00 = v1; param1->unk_08 = v1 + v3; - param1->unk_04 = v2 - v4; param1->unk_0C = v2; + param1->unk_00 = v1; + param1->unk_08 = v1 + v3; + param1->unk_04 = v2 - v4; + param1->unk_0C = v2; break; case 0x8: - param1->unk_00 = v1 - v3; param1->unk_08 = v1; - param1->unk_04 = v2; param1->unk_0C = v2 + v4; + param1->unk_00 = v1 - v3; + param1->unk_08 = v1; + param1->unk_04 = v2; + param1->unk_0C = v2 + v4; break; case 0x9: - param1->unk_00 = v1; param1->unk_08 = v1 + v3; - param1->unk_04 = v2; param1->unk_0C = v2 + v4; + param1->unk_00 = v1; + param1->unk_08 = v1 + v3; + param1->unk_04 = v2; + param1->unk_0C = v2 + v4; break; case 0xa: - param1->unk_00 = v1 - v3; param1->unk_08 = v1; - param1->unk_04 = v2 - v4; param1->unk_0C = v2 + v4; + param1->unk_00 = v1 - v3; + param1->unk_08 = v1; + param1->unk_04 = v2 - v4; + param1->unk_0C = v2 + v4; break; case 0xb: - param1->unk_00 = v1; param1->unk_08 = v1 + v3; - param1->unk_04 = v2 - v4; param1->unk_0C = v2 + v4; + param1->unk_00 = v1; + param1->unk_08 = v1 + v3; + param1->unk_04 = v2 - v4; + param1->unk_0C = v2 + v4; break; case 0xc: - param1->unk_00 = v1 - v3; param1->unk_08 = v1 + v3; - param1->unk_04 = v2 - v4; param1->unk_0C = v2; + param1->unk_00 = v1 - v3; + param1->unk_08 = v1 + v3; + param1->unk_04 = v2 - v4; + param1->unk_0C = v2; break; case 0xd: - param1->unk_00 = v1 - v3; param1->unk_08 = v1 + v3; - param1->unk_04 = v2; param1->unk_0C = v2 + v4; + param1->unk_00 = v1 - v3; + param1->unk_08 = v1 + v3; + param1->unk_04 = v2; + param1->unk_0C = v2 + v4; break; default: GF_ASSERT(FALSE); } } -static int sub_0206489C (MapObject * mapObj, int param1) +static int sub_0206489C(MapObject *mapObj, int param1) { int v0, v1; UnkStruct_020647A0 v2; @@ -429,9 +446,9 @@ static int sub_0206489C (MapObject * mapObj, int param1) return 1; } -static void sub_020648F4 (MapObject * mapObj, int param1) +static void sub_020648F4(MapObject *mapObj, int param1) { - UnkStruct_020648F4 * v0; + UnkStruct_020648F4 *v0; v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_020648F4))); v0->unk_00 = param1; @@ -441,9 +458,9 @@ static void sub_020648F4 (MapObject * mapObj, int param1) sub_02064208(mapObj); } -void sub_02064918 (MapObject * mapObj) +void sub_02064918(MapObject *mapObj) { - UnkStruct_020648F4 * v0; + UnkStruct_020648F4 *v0; v0 = sub_02062A78(mapObj); @@ -457,29 +474,29 @@ void sub_02064918 (MapObject * mapObj) } } -void sub_0206493C (MapObject * mapObj) +void sub_0206493C(MapObject *mapObj) { sub_020648F4(mapObj, 0); } -void sub_02064948 (MapObject * mapObj) +void sub_02064948(MapObject *mapObj) { sub_020648F4(mapObj, 1); } -void sub_02064954 (MapObject * mapObj) +void sub_02064954(MapObject *mapObj) { sub_020648F4(mapObj, 2); } -void sub_02064960 (MapObject * mapObj) +void sub_02064960(MapObject *mapObj) { sub_020648F4(mapObj, 3); } -static void sub_0206496C (MapObject * mapObj, int param1) +static void sub_0206496C(MapObject *mapObj, int param1) { - UnkStruct_0206496C * v0; + UnkStruct_0206496C *v0; v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206496C))); v0->unk_00 = param1; @@ -489,19 +506,19 @@ static void sub_0206496C (MapObject * mapObj, int param1) sub_02064208(mapObj); } -void sub_02064990 (MapObject * mapObj) +void sub_02064990(MapObject *mapObj) { sub_0206496C(mapObj, 2); } -void sub_0206499C (MapObject * mapObj) +void sub_0206499C(MapObject *mapObj) { sub_0206496C(mapObj, 3); } -void sub_020649A8 (MapObject * mapObj) +void sub_020649A8(MapObject *mapObj) { - UnkStruct_0206496C * v0; + UnkStruct_0206496C *v0; v0 = sub_02062A78(mapObj); @@ -510,7 +527,7 @@ void sub_020649A8 (MapObject * mapObj) } } -static int sub_020649CC (MapObject * mapObj, UnkStruct_0206496C * param1) +static int sub_020649CC(MapObject *mapObj, UnkStruct_0206496C *param1) { int v0 = sub_02065448(mapObj, 38, -1); @@ -525,7 +542,7 @@ static int sub_020649CC (MapObject * mapObj, UnkStruct_0206496C * param1) return 1; } -static int sub_02064A00 (MapObject * mapObj, UnkStruct_0206496C * param1) +static int sub_02064A00(MapObject *mapObj, UnkStruct_0206496C *param1) { if (sub_020658DC(mapObj) == 0) { return 0; @@ -537,7 +554,7 @@ static int sub_02064A00 (MapObject * mapObj, UnkStruct_0206496C * param1) return 1; } -static int sub_02064A1C (MapObject * mapObj, UnkStruct_0206496C * param1) +static int sub_02064A1C(MapObject *mapObj, UnkStruct_0206496C *param1) { if (param1->unk_04) { if (sub_02065448(mapObj, 38, -1) != -1) { @@ -556,11 +573,11 @@ static int sub_02064A1C (MapObject * mapObj, UnkStruct_0206496C * param1) return 1; } -static int sub_02064A58 (MapObject * mapObj, UnkStruct_0206496C * param1) +static int sub_02064A58(MapObject *mapObj, UnkStruct_0206496C *param1) { - int v0, v1, * v2; - int v3[5] = {0, 2, 1, 3, -1}; - int v4[5] = {0, 3, 1, 2, -1}; + int v0, v1, *v2; + int v3[5] = { 0, 2, 1, 3, -1 }; + int v4[5] = { 0, 3, 1, 2, -1 }; if (param1->unk_00 == 2) { v2 = v3; @@ -592,21 +609,21 @@ static int sub_02064A58 (MapObject * mapObj, UnkStruct_0206496C * param1) return 1; } -static int(*const Unk_020EE900[])(MapObject *, UnkStruct_0206496C *) = { +static int (*const Unk_020EE900[])(MapObject *, UnkStruct_0206496C *) = { sub_020649CC, sub_02064A00, sub_02064A1C, sub_02064A58 }; -void sub_02064AF0 (MapObject * mapObj) +void sub_02064AF0(MapObject *mapObj) { sub_0206496C(mapObj, 3); } -void sub_02064AFC (MapObject * mapObj) +void sub_02064AFC(MapObject *mapObj) { - UnkStruct_0206496C * v0; + UnkStruct_0206496C *v0; v0 = sub_02062A78(mapObj); @@ -615,7 +632,7 @@ void sub_02064AFC (MapObject * mapObj) } } -static int sub_02064B20 (MapObject * mapObj, UnkStruct_0206496C * param1) +static int sub_02064B20(MapObject *mapObj, UnkStruct_0206496C *param1) { int v0 = MapObject_Dir(mapObj); @@ -626,7 +643,7 @@ static int sub_02064B20 (MapObject * mapObj, UnkStruct_0206496C * param1) return 1; } -static int sub_02064B40 (MapObject * mapObj, UnkStruct_0206496C * param1) +static int sub_02064B40(MapObject *mapObj, UnkStruct_0206496C *param1) { if (sub_020658DC(mapObj) == 0) { return 0; @@ -638,7 +655,7 @@ static int sub_02064B40 (MapObject * mapObj, UnkStruct_0206496C * param1) return 1; } -static int sub_02064B5C (MapObject * mapObj, UnkStruct_0206496C * param1) +static int sub_02064B5C(MapObject *mapObj, UnkStruct_0206496C *param1) { param1->unk_04++; @@ -650,11 +667,11 @@ static int sub_02064B5C (MapObject * mapObj, UnkStruct_0206496C * param1) return 1; } -static int sub_02064B74 (MapObject * mapObj, UnkStruct_0206496C * param1) +static int sub_02064B74(MapObject *mapObj, UnkStruct_0206496C *param1) { - int v0, v1, * v2; - int v3[5] = {0, 2, 1, 3, -1}; - int v4[5] = {0, 3, 1, 2, -1}; + int v0, v1, *v2; + int v3[5] = { 0, 2, 1, 3, -1 }; + int v4[5] = { 0, 3, 1, 2, -1 }; if (param1->unk_00 == 2) { v2 = v3; @@ -695,16 +712,16 @@ static int sub_02064B74 (MapObject * mapObj, UnkStruct_0206496C * param1) return 1; } -static int(*const Unk_020EE870[])(MapObject *, UnkStruct_0206496C *) = { +static int (*const Unk_020EE870[])(MapObject *, UnkStruct_0206496C *) = { sub_02064B20, sub_02064B40, sub_02064B5C, sub_02064B74 }; -void sub_02064C28 (MapObject * mapObj) +void sub_02064C28(MapObject *mapObj) { - UnkStruct_02064C28 * v0; + UnkStruct_02064C28 *v0; v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02064C28))); @@ -713,16 +730,16 @@ void sub_02064C28 (MapObject * mapObj) } } -void sub_02064C48 (MapObject * mapObj) +void sub_02064C48(MapObject *mapObj) { - UnkStruct_02064C28 * v0 = sub_02062A78(mapObj); + UnkStruct_02064C28 *v0 = sub_02062A78(mapObj); while (Unk_020EE814[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -static int sub_02064C6C (MapObject * mapObj, UnkStruct_02064C28 * param1) +static int sub_02064C6C(MapObject *mapObj, UnkStruct_02064C28 *param1) { int v0; @@ -742,7 +759,7 @@ static int sub_02064C6C (MapObject * mapObj, UnkStruct_02064C28 * param1) return 1; } -static int sub_02064CA8 (MapObject * mapObj, UnkStruct_02064C28 * param1) +static int sub_02064CA8(MapObject *mapObj, UnkStruct_02064C28 *param1) { if (param1->unk_02) { int v0, v1, v2, v3; @@ -772,7 +789,7 @@ static int sub_02064CA8 (MapObject * mapObj, UnkStruct_02064C28 * param1) v5 = MapObject_GetMoveDir(mapObj); v7 = sub_02063EBC(mapObj, v5); - if ((v7 & (1 << 0))) { + if (v7 & (1 << 0)) { param1->unk_02 = 1; v5 = Direction_GetOpposite(v5); v7 = sub_02063EBC(mapObj, v5); @@ -798,7 +815,7 @@ static int sub_02064CA8 (MapObject * mapObj, UnkStruct_02064C28 * param1) return 1; } -static int sub_02064D68 (MapObject * mapObj, UnkStruct_02064C28 * param1) +static int sub_02064D68(MapObject *mapObj, UnkStruct_02064C28 *param1) { if (sub_020658DC(mapObj) == 1) { sub_02062D10(mapObj); @@ -813,15 +830,15 @@ static int sub_02064D68 (MapObject * mapObj, UnkStruct_02064C28 * param1) return 0; } -static int(*const Unk_020EE814[])(MapObject *, UnkStruct_02064C28 *) = { +static int (*const Unk_020EE814[])(MapObject *, UnkStruct_02064C28 *) = { sub_02064C6C, sub_02064CA8, sub_02064D68 }; -static void sub_02064D98 (MapObject * mapObj, int param1, int param2, int param3) +static void sub_02064D98(MapObject *mapObj, int param1, int param2, int param3) { - UnkStruct_02064D98 * v0; + UnkStruct_02064D98 *v0; v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02064D98))); v0->unk_02 = param1; @@ -833,89 +850,89 @@ static void sub_02064D98 (MapObject * mapObj, int param1, int param2, int param3 } } -void sub_02064DC8 (MapObject * mapObj) +void sub_02064DC8(MapObject *mapObj) { sub_02064D98(mapObj, 2, 0, 14); } -void sub_02064DD8 (MapObject * mapObj) +void sub_02064DD8(MapObject *mapObj) { sub_02064D98(mapObj, 2, 0, 15); } -void sub_02064DE8 (MapObject * mapObj) +void sub_02064DE8(MapObject *mapObj) { sub_02064D98(mapObj, 2, 1, 16); } -void sub_02064DF8 (MapObject * mapObj) +void sub_02064DF8(MapObject *mapObj) { sub_02064D98(mapObj, 2, 1, 17); } -void sub_02064E08 (MapObject * mapObj) +void sub_02064E08(MapObject *mapObj) { sub_02064D98(mapObj, 2, 0, 18); } -void sub_02064E18 (MapObject * mapObj) +void sub_02064E18(MapObject *mapObj) { sub_02064D98(mapObj, 2, 0, 19); } -void sub_02064E28 (MapObject * mapObj) +void sub_02064E28(MapObject *mapObj) { sub_02064D98(mapObj, 2, 1, 20); } -void sub_02064E38 (MapObject * mapObj) +void sub_02064E38(MapObject *mapObj) { sub_02064D98(mapObj, 2, 1, 21); } -void sub_02064E48 (MapObject * mapObj) +void sub_02064E48(MapObject *mapObj) { sub_02064D98(mapObj, 2, 1, 22); } -void sub_02064E58 (MapObject * mapObj) +void sub_02064E58(MapObject *mapObj) { sub_02064D98(mapObj, 2, 1, 23); } -void sub_02064E68 (MapObject * mapObj) +void sub_02064E68(MapObject *mapObj) { sub_02064D98(mapObj, 2, 0, 24); } -void sub_02064E78 (MapObject * mapObj) +void sub_02064E78(MapObject *mapObj) { sub_02064D98(mapObj, 2, 0, 25); } -void sub_02064E88 (MapObject * mapObj) +void sub_02064E88(MapObject *mapObj) { sub_02064D98(mapObj, 2, 1, 26); } -void sub_02064E98 (MapObject * mapObj) +void sub_02064E98(MapObject *mapObj) { sub_02064D98(mapObj, 2, 1, 27); } -void sub_02064EA8 (MapObject * mapObj) +void sub_02064EA8(MapObject *mapObj) { sub_02064D98(mapObj, 2, 0, 28); } -void sub_02064EB8 (MapObject * mapObj) +void sub_02064EB8(MapObject *mapObj) { sub_02064D98(mapObj, 2, 0, 29); } -void sub_02064EC8 (MapObject * mapObj) +void sub_02064EC8(MapObject *mapObj) { - UnkStruct_02064D98 * v0; + UnkStruct_02064D98 *v0; v0 = sub_02062A78(mapObj); @@ -924,7 +941,7 @@ void sub_02064EC8 (MapObject * mapObj) } } -static int sub_02064EEC (MapObject * mapObj, UnkStruct_02064D98 * param1) +static int sub_02064EEC(MapObject *mapObj, UnkStruct_02064D98 *param1) { if (param1->unk_01 == param1->unk_02) { if (param1->unk_03 == 0) { @@ -956,7 +973,7 @@ static int sub_02064EEC (MapObject * mapObj, UnkStruct_02064D98 * param1) } { - const int * v8; + const int *v8; int v9, v10; u32 v11; @@ -971,7 +988,7 @@ static int sub_02064EEC (MapObject * mapObj, UnkStruct_02064D98 * param1) v11 = sub_02063EBC(mapObj, v9); - if ((v11 & (1 << 0))) { + if (v11 & (1 << 0)) { param1->unk_01++; v9 = v8[param1->unk_01]; @@ -986,7 +1003,7 @@ static int sub_02064EEC (MapObject * mapObj, UnkStruct_02064D98 * param1) v10 = 0xc; - if ((v11 != 0)) { + if (v11 != 0) { v10 = 0x20; } @@ -1004,7 +1021,7 @@ static int sub_02064EEC (MapObject * mapObj, UnkStruct_02064D98 * param1) return 1; } -static int sub_02064FFC (MapObject * mapObj, UnkStruct_02064D98 * param1) +static int sub_02064FFC(MapObject *mapObj, UnkStruct_02064D98 *param1) { if (sub_020658DC(mapObj) == 1) { sub_02062D10(mapObj); @@ -1019,14 +1036,14 @@ static int sub_02064FFC (MapObject * mapObj, UnkStruct_02064D98 * param1) return 0; } -static int(*const Unk_020EE7AC[])(MapObject *, UnkStruct_02064D98 *) = { +static int (*const Unk_020EE7AC[])(MapObject *, UnkStruct_02064D98 *) = { sub_02064EEC, sub_02064FFC }; -static void sub_0206502C (MapObject * mapObj, int param1, int param2, int param3) +static void sub_0206502C(MapObject *mapObj, int param1, int param2, int param3) { - UnkStruct_0206502C * v0; + UnkStruct_0206502C *v0; v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206502C))); @@ -1039,56 +1056,56 @@ static void sub_0206502C (MapObject * mapObj, int param1, int param2, int param3 } } -void sub_0206505C (MapObject * mapObj) +void sub_0206505C(MapObject *mapObj) { sub_0206502C(mapObj, 2, 1, 30); } -void sub_0206506C (MapObject * mapObj) +void sub_0206506C(MapObject *mapObj) { sub_0206502C(mapObj, 2, 1, 31); } -void sub_0206507C (MapObject * mapObj) +void sub_0206507C(MapObject *mapObj) { sub_0206502C(mapObj, 2, 0, 32); } -void sub_0206508C (MapObject * mapObj) +void sub_0206508C(MapObject *mapObj) { sub_0206502C(mapObj, 2, 0, 33); } -void sub_0206509C (MapObject * mapObj) +void sub_0206509C(MapObject *mapObj) { sub_0206502C(mapObj, 2, 1, 34); } -void sub_020650AC (MapObject * mapObj) +void sub_020650AC(MapObject *mapObj) { sub_0206502C(mapObj, 2, 1, 35); } -void sub_020650BC (MapObject * mapObj) +void sub_020650BC(MapObject *mapObj) { sub_0206502C(mapObj, 2, 0, 36); } -void sub_020650CC (MapObject * mapObj) +void sub_020650CC(MapObject *mapObj) { sub_0206502C(mapObj, 2, 0, 37); } -void sub_020650DC (MapObject * mapObj) +void sub_020650DC(MapObject *mapObj) { - UnkStruct_0206502C * v0 = sub_02062A78(mapObj); + UnkStruct_0206502C *v0 = sub_02062A78(mapObj); while (Unk_020EE820[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -static void sub_02065100 (UnkStruct_0206502C * param0) +static void sub_02065100(UnkStruct_0206502C *param0) { if (param0->unk_05 == 1) { param0->unk_01--; @@ -1101,11 +1118,11 @@ static void sub_02065100 (UnkStruct_0206502C * param0) } } -static int sub_02065124 (MapObject * mapObj, UnkStruct_0206502C * param1) +static int sub_02065124(MapObject *mapObj, UnkStruct_0206502C *param1) { if (MapObject_GetEventType(mapObj) == 0xa) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); - PlayerAvatar * playerAvatar = sub_0205EF3C(fieldSystem); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); + PlayerAvatar *playerAvatar = sub_0205EF3C(fieldSystem); int v2 = MapObject_Dir(mapObj); int v3 = sub_020629D8(mapObj, 0); int v4 = sub_02067D58(mapObj, playerAvatar, v2, v3); @@ -1125,7 +1142,7 @@ static int sub_02065124 (MapObject * mapObj, UnkStruct_0206502C * param1) return 1; } -static int sub_02065188 (MapObject * mapObj, UnkStruct_0206502C * param1) +static int sub_02065188(MapObject *mapObj, UnkStruct_0206502C *param1) { if (sub_020658DC(mapObj) == 1) { sub_02062D10(mapObj); @@ -1135,7 +1152,7 @@ static int sub_02065188 (MapObject * mapObj, UnkStruct_0206502C * param1) return 0; } -static int sub_020651A4 (MapObject * mapObj, UnkStruct_0206502C * param1) +static int sub_020651A4(MapObject *mapObj, UnkStruct_0206502C *param1) { if (param1->unk_01 == param1->unk_02) { if (param1->unk_03 == 0) { @@ -1167,7 +1184,7 @@ static int sub_020651A4 (MapObject * mapObj, UnkStruct_0206502C * param1) } { - const int * v8; + const int *v8; int v9, v10; u32 v11; @@ -1182,7 +1199,7 @@ static int sub_020651A4 (MapObject * mapObj, UnkStruct_0206502C * param1) v11 = sub_02063EBC(mapObj, v9); - if ((v11 & (1 << 0))) { + if (v11 & (1 << 0)) { sub_02065100(param1); v9 = v8[param1->unk_01]; @@ -1197,7 +1214,7 @@ static int sub_020651A4 (MapObject * mapObj, UnkStruct_0206502C * param1) v10 = 0xc; - if ((v11 != 0)) { + if (v11 != 0) { v10 = 0x20; } @@ -1215,7 +1232,7 @@ static int sub_020651A4 (MapObject * mapObj, UnkStruct_0206502C * param1) return 1; } -static int sub_020652BC (MapObject * mapObj, UnkStruct_0206502C * param1) +static int sub_020652BC(MapObject *mapObj, UnkStruct_0206502C *param1) { if (sub_020658DC(mapObj) == 1) { sub_02062D10(mapObj); @@ -1230,14 +1247,14 @@ static int sub_020652BC (MapObject * mapObj, UnkStruct_0206502C * param1) return 0; } -static int(*const Unk_020EE820[])(MapObject *, UnkStruct_0206502C *) = { +static int (*const Unk_020EE820[])(MapObject *, UnkStruct_0206502C *) = { sub_02065124, sub_02065188, sub_020651A4, sub_020652BC }; -static int sub_020652EC (const int * param0, int param1) +static int sub_020652EC(const int *param0, int param1) { int i = 0; @@ -1245,23 +1262,24 @@ static int sub_020652EC (const int * param0, int param1) i++; } - GF_ASSERT(i); return i; + GF_ASSERT(i); + return i; } -static int sub_0206530C (const int * param0, int param1) +static int sub_0206530C(const int *param0, int param1) { return param0[LCRNG_Next() % sub_020652EC(param0, param1)]; } -static int sub_02065330 (int param0, int param1) +static int sub_02065330(int param0, int param1) { - const int * v0 = sub_02065358(param0); + const int *v0 = sub_02065358(param0); return v0[LCRNG_Next() % sub_020652EC(v0, param1)]; } -static const int * sub_02065358 (int param0) +static const int *sub_02065358(int param0) { - const UnkStruct_020EEB08 * v0 = Unk_020EEB08; + const UnkStruct_020EEB08 *v0 = Unk_020EEB08; while (v0->unk_00 != 39) { if (v0->unk_00 == param0) { @@ -1275,20 +1293,20 @@ static const int * sub_02065358 (int param0) return NULL; } -static int sub_0206537C (MapObject * mapObj) +static int sub_0206537C(MapObject *mapObj) { int v0 = MapObject_GetEventType(mapObj); if ((v0 != 0x1) && (v0 != 0x2)) { - return(-1); + return -1; } { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); - PlayerAvatar * playerAvatar = sub_0205EF3C(fieldSystem); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); + PlayerAvatar *playerAvatar = sub_0205EF3C(fieldSystem); if (sub_0206140C(playerAvatar) == 0) { - return(-1); + return -1; } { @@ -1305,17 +1323,17 @@ static int sub_0206537C (MapObject * mapObj) } while (v3 != 0xff); if (v0 != v3) { - return(-1); + return -1; } } { - const MapObject * v5 = Player_MapObject(playerAvatar); + const MapObject *v5 = Player_MapObject(playerAvatar); int v6 = sub_020630DC(v5); int v7 = sub_020630DC(mapObj); if (v6 != v7) { - return(-1); + return -1; } } @@ -1338,16 +1356,16 @@ static int sub_0206537C (MapObject * mapObj) } } - return(-1); + return -1; } -static int sub_02065448 (MapObject * mapObj, int param1, int param2) +static int sub_02065448(MapObject *mapObj, int param1, int param2) { - const int * v0 = sub_02065358(param1); + const int *v0 = sub_02065358(param1); int v1 = sub_020652EC(v0, param2); if (v1 == 1) { - return(-1); + return -1; } { @@ -1374,8 +1392,8 @@ static int sub_02065448 (MapObject * mapObj, int param1, int param2) int v4 = -1, v5 = -1; int v6 = MapObject_GetXPos(mapObj); int v7 = MapObject_GetZPos(mapObj); - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); - PlayerAvatar * playerAvatar = sub_0205EF3C(fieldSystem); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); + PlayerAvatar *playerAvatar = sub_0205EF3C(fieldSystem); int v10 = Player_GetXPos(playerAvatar); int v11 = Player_GetZPos(playerAvatar); @@ -1426,15 +1444,15 @@ static int sub_02065448 (MapObject * mapObj, int param1, int param2) } } - return(-1); + return -1; } static const int Unk_020EEAB0[2][4] = { - {0x0, 0x2, 0x1, 0x3}, - {0x0, 0x3, 0x1, 0x2} + { 0x0, 0x2, 0x1, 0x3 }, + { 0x0, 0x3, 0x1, 0x2 } }; -static int sub_0206553C (MapObject * mapObj) +static int sub_0206553C(MapObject *mapObj) { int v0 = MapObject_GetEventType(mapObj); @@ -1445,7 +1463,7 @@ static int sub_0206553C (MapObject * mapObj) return 0; } -static void sub_02065550 (MapObject * mapObj, UnkStruct_02065550 * param1) +static void sub_02065550(MapObject *mapObj, UnkStruct_02065550 *param1) { if (MapObject_GetEventType(mapObj) == 0x7) { param1->unk_01 = 0; @@ -1454,7 +1472,7 @@ static void sub_02065550 (MapObject * mapObj, UnkStruct_02065550 * param1) } } -static void sub_02065568 (MapObject * mapObj, UnkStruct_02065550 * param1) +static void sub_02065568(MapObject *mapObj, UnkStruct_02065550 *param1) { int v0, v1 = MapObject_Dir(mapObj); @@ -1479,7 +1497,7 @@ static void sub_02065568 (MapObject * mapObj, UnkStruct_02065550 * param1) MapObject_SetStatusFlagOn(mapObj, (1 << 7)); } -static void sub_020655E4 (MapObject * mapObj, UnkStruct_02065550 * param1) +static void sub_020655E4(MapObject *mapObj, UnkStruct_02065550 *param1) { if (param1->unk_02 == 0) { MapObject_SetStatusFlagOff(mapObj, (1 << 7)); @@ -1763,46 +1781,46 @@ static const int Unk_020EEA74[] = { }; static const UnkStruct_020EEB08 Unk_020EEB08[40] = { - {0x0, Unk_020EEA9C}, - {0x1, Unk_020EE7B4}, - {0x2, Unk_020EE7D8}, - {0x3, Unk_020EE7C0}, - {0x4, Unk_020EE7E4}, - {0x5, Unk_020EE9A0}, - {0x6, Unk_020EE960}, - {0x7, Unk_020EE970}, - {0x8, Unk_020EE990}, - {0x9, Unk_020EE808}, - {0xA, Unk_020EE7FC}, - {0xB, Unk_020EEA10}, - {0xC, Unk_020EE7F0}, - {0xD, Unk_020EE7CC}, - {0xE, Unk_020EE910}, - {0xF, Unk_020EE8A0}, - {0x10, Unk_020EE8E0}, - {0x11, Unk_020EE8F0}, - {0x12, Unk_020EE8D0}, - {0x13, Unk_020EE8C0}, - {0x14, Unk_020EE880}, - {0x15, Unk_020EE9F0}, - {0x16, Unk_020EE920}, - {0x17, Unk_020EE930}, - {0x18, Unk_020EE980}, - {0x19, Unk_020EE9B0}, - {0x1A, Unk_020EE940}, - {0x1B, Unk_020EE840}, - {0x1C, Unk_020EE830}, - {0x1D, Unk_020EE9E0}, - {0x1E, Unk_020EE890}, - {0x1F, Unk_020EEA00}, - {0x20, Unk_020EE950}, - {0x21, Unk_020EE9C0}, - {0x22, Unk_020EE850}, - {0x23, Unk_020EE860}, - {0x24, Unk_020EE8B0}, - {0x25, Unk_020EE9D0}, - {0x26, Unk_020EEA74}, - {0x27, NULL} + { 0x0, Unk_020EEA9C }, + { 0x1, Unk_020EE7B4 }, + { 0x2, Unk_020EE7D8 }, + { 0x3, Unk_020EE7C0 }, + { 0x4, Unk_020EE7E4 }, + { 0x5, Unk_020EE9A0 }, + { 0x6, Unk_020EE960 }, + { 0x7, Unk_020EE970 }, + { 0x8, Unk_020EE990 }, + { 0x9, Unk_020EE808 }, + { 0xA, Unk_020EE7FC }, + { 0xB, Unk_020EEA10 }, + { 0xC, Unk_020EE7F0 }, + { 0xD, Unk_020EE7CC }, + { 0xE, Unk_020EE910 }, + { 0xF, Unk_020EE8A0 }, + { 0x10, Unk_020EE8E0 }, + { 0x11, Unk_020EE8F0 }, + { 0x12, Unk_020EE8D0 }, + { 0x13, Unk_020EE8C0 }, + { 0x14, Unk_020EE880 }, + { 0x15, Unk_020EE9F0 }, + { 0x16, Unk_020EE920 }, + { 0x17, Unk_020EE930 }, + { 0x18, Unk_020EE980 }, + { 0x19, Unk_020EE9B0 }, + { 0x1A, Unk_020EE940 }, + { 0x1B, Unk_020EE840 }, + { 0x1C, Unk_020EE830 }, + { 0x1D, Unk_020EE9E0 }, + { 0x1E, Unk_020EE890 }, + { 0x1F, Unk_020EEA00 }, + { 0x20, Unk_020EE950 }, + { 0x21, Unk_020EE9C0 }, + { 0x22, Unk_020EE850 }, + { 0x23, Unk_020EE860 }, + { 0x24, Unk_020EE8B0 }, + { 0x25, Unk_020EE9D0 }, + { 0x26, Unk_020EEA74 }, + { 0x27, NULL } }; static const int Unk_020EEAD0[] = { diff --git a/src/unk_020655F4.c b/src/unk_020655F4.c index 145902cab4..2dada57185 100644 --- a/src/unk_020655F4.c +++ b/src/unk_020655F4.c @@ -1,34 +1,34 @@ +#include "unk_020655F4.h" + #include #include -#include "constdata/const_020EE4B8.h" - #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" - -#include "constdata/const_020EE31C.h" #include "overlay005/map_object_anim_cmd.h" +#include "overlay005/ov5_021F3E74.h" +#include "overlay005/ov5_021F5A10.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" -#include "unk_02005474.h" -#include "sys_task.h" #include "heap.h" -#include "sys_task_manager.h" #include "map_header_data.h" #include "map_object.h" #include "map_object_move.h" -#include "unk_020655F4.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02005474.h" #include "unk_02069BE0.h" #include "unk_020711EC.h" -#include "overlay005/ov5_021F3E74.h" -#include "overlay005/ov5_021F5A10.h" + +#include "constdata/const_020EE31C.h" +#include "constdata/const_020EE4B8.h" typedef struct { int unk_00; int unk_04; int unk_08; - MapObject * unk_0C; - const MapObjectAnimCmd * unk_10; + MapObject *unk_0C; + const MapObjectAnimCmd *unk_10; } UnkStruct_020EEE54; typedef struct { @@ -65,7 +65,7 @@ typedef struct { typedef struct { int unk_00; - UnkStruct_ov101_021D5D90 * unk_04; + UnkStruct_ov101_021D5D90 *unk_04; } UnkStruct_020664A0; typedef struct { @@ -103,24 +103,24 @@ typedef struct { u32 unk_00; } UnkStruct_020667CC; -static void sub_02065788(SysTask * param0, void * param1); -static int sub_02065910(MapObject * param0, int param1, int param2); -static int sub_02065924(MapObject * param0); -static void sub_02065930(MapObject * param0, int param1); -static void sub_02065980(MapObject * param0, int param1, fx32 param2, s16 param3, u16 param4); -static int sub_020659C8(MapObject * param0); -static void sub_02065C64(MapObject * param0, int param1, s16 param2, u16 param3); -static int sub_02065C98(MapObject * param0); -static void sub_020664A0(MapObject * param0, int param1, int param2); -static int sub_020664C8(MapObject * param0); - -int(*const Unk_020EEE54[])(UnkStruct_020EEE54 *); -const fx32 * Unk_02100B84[]; +static void sub_02065788(SysTask *param0, void *param1); +static int sub_02065910(MapObject *param0, int param1, int param2); +static int sub_02065924(MapObject *param0); +static void sub_02065930(MapObject *param0, int param1); +static void sub_02065980(MapObject *param0, int param1, fx32 param2, s16 param3, u16 param4); +static int sub_020659C8(MapObject *param0); +static void sub_02065C64(MapObject *param0, int param1, s16 param2, u16 param3); +static int sub_02065C98(MapObject *param0); +static void sub_020664A0(MapObject *param0, int param1, int param2); +static int sub_020664C8(MapObject *param0); + +int (*const Unk_020EEE54[])(UnkStruct_020EEE54 *); +const fx32 *Unk_02100B84[]; static const fx32 Unk_020EEE84[7]; static const fx32 Unk_020EEE6C[6]; static const fx32 Unk_020EECEC[3]; -int LocalMapObj_IsAnimationSet (const MapObject * mapObj) +int LocalMapObj_IsAnimationSet(const MapObject *mapObj) { if (MapObject_GetStateFlag(mapObj, (1 << 0)) == 0) { return 0; @@ -137,7 +137,7 @@ int LocalMapObj_IsAnimationSet (const MapObject * mapObj) return 1; } -void LocalMapObj_SetAnimationCode (MapObject * mapObj, int param1) +void LocalMapObj_SetAnimationCode(MapObject *mapObj, int param1) { GF_ASSERT(param1 < 0x9a); @@ -147,14 +147,14 @@ void LocalMapObj_SetAnimationCode (MapObject * mapObj, int param1) MapObject_SetStatusFlagOff(mapObj, (1 << 5)); } -void sub_02065668 (MapObject * mapObj, int param1) +void sub_02065668(MapObject *mapObj, int param1) { MapObject_SetAnimationCode(mapObj, param1); sub_02062BC0(mapObj, 0); MapObject_SetStatusFlagOff(mapObj, (1 << 5)); } -int LocalMapObj_CheckAnimationFinished (const MapObject * mapObj) +int LocalMapObj_CheckAnimationFinished(const MapObject *mapObj) { if (MapObject_GetStateFlag(mapObj, (1 << 4)) == 0) { return 1; @@ -167,7 +167,7 @@ int LocalMapObj_CheckAnimationFinished (const MapObject * mapObj) return 1; } -int sub_020656AC (MapObject * mapObj) +int sub_020656AC(MapObject *mapObj) { if (MapObject_GetStateFlag(mapObj, (1 << 4)) == 0) { return 1; @@ -182,7 +182,7 @@ int sub_020656AC (MapObject * mapObj) return 1; } -void sub_020656DC (MapObject * mapObj) +void sub_020656DC(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, (1 << 4)); MapObject_SetStatusFlagOn(mapObj, (1 << 5)); @@ -190,10 +190,10 @@ void sub_020656DC (MapObject * mapObj) sub_02062BC0(mapObj, 0); } -SysTask * MapObject_StartAnimation (MapObject * mapObj, const MapObjectAnimCmd * param1) +SysTask *MapObject_StartAnimation(MapObject *mapObj, const MapObjectAnimCmd *param1) { - SysTask * v0; - UnkStruct_020EEE54 * v1; + SysTask *v0; + UnkStruct_020EEE54 *v1; v1 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_020EEE54))); GF_ASSERT(v1 != NULL); @@ -214,17 +214,17 @@ SysTask * MapObject_StartAnimation (MapObject * mapObj, const MapObjectAnimCmd * return v0; } -int MapObject_HasAnimationEnded (SysTask * task) +int MapObject_HasAnimationEnded(SysTask *task) { - UnkStruct_020EEE54 * v0; + UnkStruct_020EEE54 *v0; v0 = SysTask_GetParam(task); return v0->unk_04; } -void MapObject_FinishAnimation (SysTask * task) +void MapObject_FinishAnimation(SysTask *task) { - UnkStruct_020EEE54 * v0; + UnkStruct_020EEE54 *v0; v0 = SysTask_GetParam(task); @@ -235,9 +235,9 @@ void MapObject_FinishAnimation (SysTask * task) SysTask_Done(task); } -static void sub_02065788 (SysTask * task, void * param1) +static void sub_02065788(SysTask *task, void *param1) { - UnkStruct_020EEE54 * v0; + UnkStruct_020EEE54 *v0; v0 = param1; @@ -246,7 +246,7 @@ static void sub_02065788 (SysTask * task, void * param1) } } -static int sub_020657A4 (UnkStruct_020EEE54 * param0) +static int sub_020657A4(UnkStruct_020EEE54 *param0) { param0->unk_08 = 0; param0->unk_00 = 1; @@ -254,7 +254,7 @@ static int sub_020657A4 (UnkStruct_020EEE54 * param0) return 1; } -static int sub_020657B0 (UnkStruct_020EEE54 * param0) +static int sub_020657B0(UnkStruct_020EEE54 *param0) { if (LocalMapObj_IsAnimationSet(param0->unk_0C) == 0) { return 0; @@ -264,9 +264,9 @@ static int sub_020657B0 (UnkStruct_020EEE54 * param0) return 1; } -static int sub_020657CC (UnkStruct_020EEE54 * param0) +static int sub_020657CC(UnkStruct_020EEE54 *param0) { - const MapObjectAnimCmd * v0; + const MapObjectAnimCmd *v0; v0 = param0->unk_10; LocalMapObj_SetAnimationCode(param0->unk_0C, v0->unk_00); @@ -276,7 +276,7 @@ static int sub_020657CC (UnkStruct_020EEE54 * param0) return 0; } -static int sub_020657E4 (UnkStruct_020EEE54 * param0) +static int sub_020657E4(UnkStruct_020EEE54 *param0) { if (LocalMapObj_CheckAnimationFinished(param0->unk_0C) == 0) { return 0; @@ -286,9 +286,9 @@ static int sub_020657E4 (UnkStruct_020EEE54 * param0) return 1; } -static int sub_02065800 (UnkStruct_020EEE54 * param0) +static int sub_02065800(UnkStruct_020EEE54 *param0) { - const MapObjectAnimCmd * v0; + const MapObjectAnimCmd *v0; v0 = param0->unk_10; param0->unk_08++; @@ -312,12 +312,12 @@ static int sub_02065800 (UnkStruct_020EEE54 * param0) return 0; } -static int sub_02065834 (UnkStruct_020EEE54 * param0) +static int sub_02065834(UnkStruct_020EEE54 *param0) { return 0; } -static int(*const Unk_020EEE54[])(UnkStruct_020EEE54 *) = { +static int (*const Unk_020EEE54[])(UnkStruct_020EEE54 *) = { sub_020657A4, sub_020657B0, sub_020657CC, @@ -326,11 +326,11 @@ static int(*const Unk_020EEE54[])(UnkStruct_020EEE54 *) = { sub_02065834 }; -int sub_02065838 (int param0, int param1) +int sub_02065838(int param0, int param1) { int v0; - const int * const * v1; - const int * v2; + const int *const *v1; + const int *v2; GF_ASSERT(param0 < 4); @@ -356,11 +356,11 @@ int sub_02065838 (int param0, int param1) return param1; } -int sub_0206587C (int param0) +int sub_0206587C(int param0) { int v0; - const int * const * v1; - const int * v2; + const int *const *v1; + const int *v2; v1 = Unk_020EE31C; @@ -379,10 +379,10 @@ int sub_0206587C (int param0) v1++; } - return(-1); + return -1; } -void sub_020658B4 (MapObject * mapObj) +void sub_020658B4(MapObject *mapObj) { int v0, v1; @@ -397,7 +397,7 @@ void sub_020658B4 (MapObject * mapObj) } while (sub_02065910(mapObj, v0, v1)); } -int sub_020658DC (MapObject * mapObj) +int sub_020658DC(MapObject *mapObj) { sub_020658B4(mapObj); @@ -412,18 +412,18 @@ int sub_020658DC (MapObject * mapObj) return 1; } -static int sub_02065910 (MapObject * mapObj, int param1, int param2) +static int sub_02065910(MapObject *mapObj, int param1, int param2) { return Unk_020EE4B8[param1][param2](mapObj); } -static int sub_02065924 (MapObject * mapObj) +static int sub_02065924(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, (1 << 5)); return 0; } -static void sub_02065930 (MapObject * mapObj, int param1) +static void sub_02065930(MapObject *mapObj, int param1) { MapObject_SetDir(mapObj, param1); sub_02062A0C(mapObj, 0x0); @@ -431,33 +431,33 @@ static void sub_02065930 (MapObject * mapObj, int param1) sub_02062BC8(mapObj); } -static int sub_02065950 (MapObject * mapObj) +static int sub_02065950(MapObject *mapObj) { sub_02065930(mapObj, 0); return 1; } -static int sub_0206595C (MapObject * mapObj) +static int sub_0206595C(MapObject *mapObj) { sub_02065930(mapObj, 1); return 1; } -static int sub_02065968 (MapObject * mapObj) +static int sub_02065968(MapObject *mapObj) { sub_02065930(mapObj, 2); return 1; } -static int sub_02065974 (MapObject * mapObj) +static int sub_02065974(MapObject *mapObj) { sub_02065930(mapObj, 3); return 1; } -static void sub_02065980 (MapObject * mapObj, int param1, fx32 param2, s16 param3, u16 param4) +static void sub_02065980(MapObject *mapObj, int param1, fx32 param2, s16 param3, u16 param4) { - UnkStruct_02065980 * v0; + UnkStruct_02065980 *v0; v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02065980))); @@ -473,9 +473,9 @@ static void sub_02065980 (MapObject * mapObj, int param1, fx32 param2, s16 param sub_02062BC8(mapObj); } -static int sub_020659C8 (MapObject * mapObj) +static int sub_020659C8(MapObject *mapObj) { - UnkStruct_02065980 * v0; + UnkStruct_02065980 *v0; v0 = sub_02062AC8(mapObj); @@ -497,177 +497,177 @@ static int sub_020659C8 (MapObject * mapObj) return 1; } -static int sub_02065A1C (MapObject * mapObj) +static int sub_02065A1C(MapObject *mapObj) { sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A30 (MapObject * mapObj) +static int sub_02065A30(MapObject *mapObj) { sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A44 (MapObject * mapObj) +static int sub_02065A44(MapObject *mapObj) { sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A58 (MapObject * mapObj) +static int sub_02065A58(MapObject *mapObj) { sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 32), 32, 0x1); return 1; } -static int sub_02065A6C (MapObject * mapObj) +static int sub_02065A6C(MapObject *mapObj) { sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065A80 (MapObject * mapObj) +static int sub_02065A80(MapObject *mapObj) { sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065A94 (MapObject * mapObj) +static int sub_02065A94(MapObject *mapObj) { sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065AA8 (MapObject * mapObj) +static int sub_02065AA8(MapObject *mapObj) { sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 16), 16, 0x2); return 1; } -static int sub_02065ABC (MapObject * mapObj) +static int sub_02065ABC(MapObject *mapObj) { sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065AD4 (MapObject * mapObj) +static int sub_02065AD4(MapObject *mapObj) { sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065AE8 (MapObject * mapObj) +static int sub_02065AE8(MapObject *mapObj) { sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065AFC (MapObject * mapObj) +static int sub_02065AFC(MapObject *mapObj) { sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 8), 8, 0x3); return 1; } -static int sub_02065B10 (MapObject * mapObj) +static int sub_02065B10(MapObject *mapObj) { sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B24 (MapObject * mapObj) +static int sub_02065B24(MapObject *mapObj) { sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B38 (MapObject * mapObj) +static int sub_02065B38(MapObject *mapObj) { sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B4C (MapObject * mapObj) +static int sub_02065B4C(MapObject *mapObj) { sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 4), 4, 0x4); return 1; } -static int sub_02065B60 (MapObject * mapObj) +static int sub_02065B60(MapObject *mapObj) { sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065B78 (MapObject * mapObj) +static int sub_02065B78(MapObject *mapObj) { sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065B8C (MapObject * mapObj) +static int sub_02065B8C(MapObject *mapObj) { sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065BA0 (MapObject * mapObj) +static int sub_02065BA0(MapObject *mapObj) { sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 2), 2, 0x5); return 1; } -static int sub_02065BB8 (MapObject * mapObj) +static int sub_02065BB8(MapObject *mapObj) { sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065BCC (MapObject * mapObj) +static int sub_02065BCC(MapObject *mapObj) { sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065BE0 (MapObject * mapObj) +static int sub_02065BE0(MapObject *mapObj) { sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065BF4 (MapObject * mapObj) +static int sub_02065BF4(MapObject *mapObj) { sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 1), 1, 0x0); return 1; } -static int sub_02065C0C (MapObject * mapObj) +static int sub_02065C0C(MapObject *mapObj) { - sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1))); + sub_02065980(mapObj, 0, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); return 1; } -static int sub_02065C24 (MapObject * mapObj) +static int sub_02065C24(MapObject *mapObj) { - sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1))); + sub_02065980(mapObj, 1, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); return 1; } -static int sub_02065C38 (MapObject * mapObj) +static int sub_02065C38(MapObject *mapObj) { - sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1))); + sub_02065980(mapObj, 2, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); return 1; } -static int sub_02065C4C (MapObject * mapObj) +static int sub_02065C4C(MapObject *mapObj) { - sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1))); + sub_02065980(mapObj, 3, ((16 * FX32_ONE) / 4), 4, (0x8 + 1)); return 1; } -static void sub_02065C64 (MapObject * mapObj, int param1, s16 param2, u16 param3) +static void sub_02065C64(MapObject *mapObj, int param1, s16 param2, u16 param3) { - UnkStruct_02065C64 * v0; + UnkStruct_02065C64 *v0; v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02065980))); @@ -680,9 +680,9 @@ static void sub_02065C64 (MapObject * mapObj, int param1, s16 param2, u16 param3 sub_02062BC8(mapObj); } -static int sub_02065C98 (MapObject * mapObj) +static int sub_02065C98(MapObject *mapObj) { - UnkStruct_02065C64 * v0; + UnkStruct_02065C64 *v0; v0 = sub_02062AC8(mapObj); v0->unk_02--; @@ -698,129 +698,129 @@ static int sub_02065C98 (MapObject * mapObj) return 1; } -static int sub_02065CCC (MapObject * mapObj) +static int sub_02065CCC(MapObject *mapObj) { sub_02065C64(mapObj, 0, 32, 0x1); return 1; } -static int sub_02065CDC (MapObject * mapObj) +static int sub_02065CDC(MapObject *mapObj) { sub_02065C64(mapObj, 1, 32, 0x1); return 1; } -static int sub_02065CEC (MapObject * mapObj) +static int sub_02065CEC(MapObject *mapObj) { sub_02065C64(mapObj, 2, 32, 0x1); return 1; } -static int sub_02065CFC (MapObject * mapObj) +static int sub_02065CFC(MapObject *mapObj) { sub_02065C64(mapObj, 3, 32, 0x1); return 1; } -static int sub_02065D0C (MapObject * mapObj) +static int sub_02065D0C(MapObject *mapObj) { sub_02065C64(mapObj, 0, 16, 0x2); return 1; } -static int sub_02065D1C (MapObject * mapObj) +static int sub_02065D1C(MapObject *mapObj) { sub_02065C64(mapObj, 1, 16, 0x2); return 1; } -static int sub_02065D2C (MapObject * mapObj) +static int sub_02065D2C(MapObject *mapObj) { sub_02065C64(mapObj, 2, 16, 0x2); return 1; } -static int sub_02065D3C (MapObject * mapObj) +static int sub_02065D3C(MapObject *mapObj) { sub_02065C64(mapObj, 3, 16, 0x2); return 1; } -static int sub_02065D4C (MapObject * mapObj) +static int sub_02065D4C(MapObject *mapObj) { sub_02065C64(mapObj, 0, 8, 0x3); return 1; } -static int sub_02065D5C (MapObject * mapObj) +static int sub_02065D5C(MapObject *mapObj) { sub_02065C64(mapObj, 1, 8, 0x3); return 1; } -static int sub_02065D6C (MapObject * mapObj) +static int sub_02065D6C(MapObject *mapObj) { sub_02065C64(mapObj, 2, 8, 0x3); return 1; } -static int sub_02065D7C (MapObject * mapObj) +static int sub_02065D7C(MapObject *mapObj) { sub_02065C64(mapObj, 3, 8, 0x3); return 1; } -static int sub_02065D8C (MapObject * mapObj) +static int sub_02065D8C(MapObject *mapObj) { sub_02065C64(mapObj, 0, 4, 0x4); return 1; } -static int sub_02065D9C (MapObject * mapObj) +static int sub_02065D9C(MapObject *mapObj) { sub_02065C64(mapObj, 1, 4, 0x4); return 1; } -static int sub_02065DAC (MapObject * mapObj) +static int sub_02065DAC(MapObject *mapObj) { sub_02065C64(mapObj, 2, 4, 0x4); return 1; } -static int sub_02065DBC (MapObject * mapObj) +static int sub_02065DBC(MapObject *mapObj) { sub_02065C64(mapObj, 3, 4, 0x4); return 1; } -static int sub_02065DCC (MapObject * mapObj) +static int sub_02065DCC(MapObject *mapObj) { sub_02065C64(mapObj, 0, 2, 0x5); return 1; } -static int sub_02065DDC (MapObject * mapObj) +static int sub_02065DDC(MapObject *mapObj) { sub_02065C64(mapObj, 1, 2, 0x5); return 1; } -static int sub_02065DEC (MapObject * mapObj) +static int sub_02065DEC(MapObject *mapObj) { sub_02065C64(mapObj, 2, 2, 0x5); return 1; } -static int sub_02065DFC (MapObject * mapObj) +static int sub_02065DFC(MapObject *mapObj) { sub_02065C64(mapObj, 3, 2, 0x5); return 1; } -static void sub_02065E0C (MapObject * mapObj, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6, u32 param7) +static void sub_02065E0C(MapObject *mapObj, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6, u32 param7) { - UnkStruct_02065E0C * v0; + UnkStruct_02065E0C *v0; v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02065E0C))); @@ -847,14 +847,14 @@ static void sub_02065E0C (MapObject * mapObj, int param1, fx32 param2, s16 param } } -static void sub_02065E7C (MapObject * mapObj, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6) +static void sub_02065E7C(MapObject *mapObj, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6) { sub_02065E0C(mapObj, param1, param2, param3, param4, param5, param6, 1547); } -static int sub_02065EA0 (MapObject * mapObj) +static int sub_02065EA0(MapObject *mapObj) { - UnkStruct_02065E0C * v0; + UnkStruct_02065E0C *v0; v0 = sub_02062AC8(mapObj); @@ -882,14 +882,14 @@ static int sub_02065EA0 (MapObject * mapObj) { v0->unk_0A += v0->unk_08; - if (v0->unk_0A > ((0x100 * ((16 - 1))))) { - v0->unk_0A = ((0x100 * ((16 - 1)))); + if (v0->unk_0A > (0x100 * (16 - 1))) { + v0->unk_0A = (0x100 * (16 - 1)); } { VecFx32 v2; u16 v3 = (v0->unk_0A) / 0x100; - const fx32 * v4 = Unk_02100B84[v0->unk_0F]; + const fx32 *v4 = Unk_02100B84[v0->unk_0F]; v2.x = 0; v2.y = v4[v3]; @@ -906,7 +906,7 @@ static int sub_02065EA0 (MapObject * mapObj) } { - VecFx32 v5 = {0, 0, 0}; + VecFx32 v5 = { 0, 0, 0 }; sub_02063088(mapObj, &v5); } @@ -920,154 +920,154 @@ static int sub_02065EA0 (MapObject * mapObj) return 1; } -static int sub_02065F88 (MapObject * mapObj) +static int sub_02065F88(MapObject *mapObj) { sub_02065E7C(mapObj, 0, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } -static int sub_02065FA8 (MapObject * mapObj) +static int sub_02065FA8(MapObject *mapObj) { sub_02065E7C(mapObj, 1, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } -static int sub_02065FC8 (MapObject * mapObj) +static int sub_02065FC8(MapObject *mapObj) { sub_02065E7C(mapObj, 2, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } -static int sub_02065FE8 (MapObject * mapObj) +static int sub_02065FE8(MapObject *mapObj) { sub_02065E7C(mapObj, 3, 0, 16, 0x2, 0, (0x100 * 1)); return 1; } -static int sub_02066008 (MapObject * mapObj) +static int sub_02066008(MapObject *mapObj) { - sub_02065E7C(mapObj, 0, 0, 8, 0x3, 0, ((0x100 * 2))); + sub_02065E7C(mapObj, 0, 0, 8, 0x3, 0, (0x100 * 2)); return 1; } -static int sub_02066028 (MapObject * mapObj) +static int sub_02066028(MapObject *mapObj) { - sub_02065E7C(mapObj, 1, 0, 8, 0x3, 0, ((0x100 * 2))); + sub_02065E7C(mapObj, 1, 0, 8, 0x3, 0, (0x100 * 2)); return 1; } -static int sub_02066048 (MapObject * mapObj) +static int sub_02066048(MapObject *mapObj) { - sub_02065E7C(mapObj, 2, 0, 8, 0x3, 0, ((0x100 * 2))); + sub_02065E7C(mapObj, 2, 0, 8, 0x3, 0, (0x100 * 2)); return 1; } -static int sub_02066068 (MapObject * mapObj) +static int sub_02066068(MapObject *mapObj) { - sub_02065E7C(mapObj, 3, 0, 8, 0x3, 0, ((0x100 * 2))); + sub_02065E7C(mapObj, 3, 0, 8, 0x3, 0, (0x100 * 2)); return 1; } -static int sub_02066088 (MapObject * mapObj) +static int sub_02066088(MapObject *mapObj) { - sub_02065E7C(mapObj, 0, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2))); + sub_02065E7C(mapObj, 0, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); return 1; } -static int sub_020660A8 (MapObject * mapObj) +static int sub_020660A8(MapObject *mapObj) { - sub_02065E7C(mapObj, 1, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2))); + sub_02065E7C(mapObj, 1, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); return 1; } -static int sub_020660CC (MapObject * mapObj) +static int sub_020660CC(MapObject *mapObj) { - sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2))); + sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); return 1; } -static int sub_020660F0 (MapObject * mapObj) +static int sub_020660F0(MapObject *mapObj) { - sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2))); + sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 8), 8, 0x3, 0, (0x100 * 2)); return 1; } -static int sub_02066110 (MapObject * mapObj) +static int sub_02066110(MapObject *mapObj) { sub_02065E7C(mapObj, 0, ((16 * FX32_ONE) / 8), 8 * 2, 0x3, 0, (0x100 * 1)); return 1; } -static int sub_02066130 (MapObject * mapObj) +static int sub_02066130(MapObject *mapObj) { sub_02065E7C(mapObj, 1, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); return 1; } -static int sub_02066150 (MapObject * mapObj) +static int sub_02066150(MapObject *mapObj) { sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); return 1; } -static int sub_02066170 (MapObject * mapObj) +static int sub_02066170(MapObject *mapObj) { sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1)); return 1; } -static int sub_02066194 (MapObject * mapObj) +static int sub_02066194(MapObject *mapObj) { - sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 16), 16, ((0x8 + 1)), 0, (((0x100 * ((16 - 1)))) / 16)); + sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 16), 16, (0x8 + 1), 0, ((0x100 * (16 - 1)) / 16)); return 1; } -static int sub_020661B4 (MapObject * mapObj) +static int sub_020661B4(MapObject *mapObj) { - sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 16), 16, ((0x8 + 1)), 0, (((0x100 * ((16 - 1)))) / 16)); + sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 16), 16, (0x8 + 1), 0, ((0x100 * (16 - 1)) / 16)); return 1; } -static int sub_020661D8 (MapObject * mapObj) +static int sub_020661D8(MapObject *mapObj) { - sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, (((0x100 * ((16 - 1)))) / 12)); + sub_02065E7C(mapObj, 2, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, ((0x100 * (16 - 1)) / 12)); return 1; } -static int sub_020661F8 (MapObject * mapObj) +static int sub_020661F8(MapObject *mapObj) { - sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, (((0x100 * ((16 - 1)))) / 12)); + sub_02065E7C(mapObj, 3, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, ((0x100 * (16 - 1)) / 12)); return 1; } -static int sub_0206621C (MapObject * mapObj) +static int sub_0206621C(MapObject *mapObj) { - sub_02065E0C(mapObj, 0, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0); + sub_02065E0C(mapObj, 0, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); return 1; } -static int sub_02066240 (MapObject * mapObj) +static int sub_02066240(MapObject *mapObj) { - sub_02065E0C(mapObj, 1, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0); + sub_02065E0C(mapObj, 1, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); return 1; } -static int sub_02066264 (MapObject * mapObj) +static int sub_02066264(MapObject *mapObj) { - sub_02065E0C(mapObj, 2, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0); + sub_02065E0C(mapObj, 2, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); return 1; } -static int sub_02066288 (MapObject * mapObj) +static int sub_02066288(MapObject *mapObj) { - sub_02065E0C(mapObj, 3, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0); + sub_02065E0C(mapObj, 3, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, ((0x100 * (16 - 1)) / 24), 0); return 1; } -static void sub_020662AC (MapObject * mapObj, int param1) +static void sub_020662AC(MapObject *mapObj, int param1) { - UnkStruct_020662AC * v0; + UnkStruct_020662AC *v0; v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020662AC))); v0->unk_00 = param1; @@ -1075,9 +1075,9 @@ static void sub_020662AC (MapObject * mapObj, int param1) sub_02062BC8(mapObj); } -static int sub_020662C4 (MapObject * mapObj) +static int sub_020662C4(MapObject *mapObj) { - UnkStruct_020662AC * v0; + UnkStruct_020662AC *v0; v0 = sub_02062AC8(mapObj); @@ -1090,51 +1090,51 @@ static int sub_020662C4 (MapObject * mapObj) return 1; } -static int sub_020662E4 (MapObject * mapObj) +static int sub_020662E4(MapObject *mapObj) { sub_020662AC(mapObj, 1); return 1; } -static int sub_020662F0 (MapObject * mapObj) +static int sub_020662F0(MapObject *mapObj) { sub_020662AC(mapObj, 2); return 1; } -static int sub_020662FC (MapObject * mapObj) +static int sub_020662FC(MapObject *mapObj) { sub_020662AC(mapObj, 4); return 1; } -static int sub_02066308 (MapObject * mapObj) +static int sub_02066308(MapObject *mapObj) { sub_020662AC(mapObj, 8); return 1; } -static int sub_02066314 (MapObject * mapObj) +static int sub_02066314(MapObject *mapObj) { sub_020662AC(mapObj, 15); return 1; } -static int sub_02066320 (MapObject * mapObj) +static int sub_02066320(MapObject *mapObj) { sub_020662AC(mapObj, 16); return 1; } -static int sub_0206632C (MapObject * mapObj) +static int sub_0206632C(MapObject *mapObj) { sub_020662AC(mapObj, 32); return 1; } -static int sub_02066338 (MapObject * mapObj) +static int sub_02066338(MapObject *mapObj) { - UnkStruct_02066338 * v0; + UnkStruct_02066338 *v0; v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066338))); v0->unk_04 = FX32_ONE * 16; @@ -1145,16 +1145,16 @@ static int sub_02066338 (MapObject * mapObj) return 1; } -static int sub_0206635C (MapObject * mapObj) +static int sub_0206635C(MapObject *mapObj) { int v0; - UnkStruct_02066338 * v1; + UnkStruct_02066338 *v1; v1 = sub_02062AC8(mapObj); v1->unk_00 += v1->unk_04; { - VecFx32 v2 = {0, 0, 0}; + VecFx32 v2 = { 0, 0, 0 }; v2.y = v1->unk_00; sub_02063088(mapObj, &v2); @@ -1170,9 +1170,9 @@ static int sub_0206635C (MapObject * mapObj) return 1; } -static int sub_020663A4 (MapObject * mapObj) +static int sub_020663A4(MapObject *mapObj) { - UnkStruct_02066338 * v0; + UnkStruct_02066338 *v0; v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066338))); @@ -1185,9 +1185,9 @@ static int sub_020663A4 (MapObject * mapObj) return 1; } -static int sub_020663D0 (MapObject * mapObj) +static int sub_020663D0(MapObject *mapObj) { - UnkStruct_02066338 * v0; + UnkStruct_02066338 *v0; v0 = sub_02062AC8(mapObj); v0->unk_00 += v0->unk_04; @@ -1197,7 +1197,7 @@ static int sub_020663D0 (MapObject * mapObj) } { - VecFx32 v1 = {0, 0, 0}; + VecFx32 v1 = { 0, 0, 0 }; v1.y = v0->unk_00; sub_02063088(mapObj, &v1); @@ -1211,7 +1211,7 @@ static int sub_020663D0 (MapObject * mapObj) return 1; } -static int sub_02066418 (MapObject * mapObj) +static int sub_02066418(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, (1 << 9)); sub_02062BC8(mapObj); @@ -1219,7 +1219,7 @@ static int sub_02066418 (MapObject * mapObj) return 1; } -static int sub_02066430 (MapObject * mapObj) +static int sub_02066430(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_HIDE); sub_02062BC8(mapObj); @@ -1227,7 +1227,7 @@ static int sub_02066430 (MapObject * mapObj) return 1; } -static int sub_02066448 (MapObject * mapObj) +static int sub_02066448(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, (1 << 7)); sub_02062BC8(mapObj); @@ -1235,7 +1235,7 @@ static int sub_02066448 (MapObject * mapObj) return 1; } -static int sub_0206645C (MapObject * mapObj) +static int sub_0206645C(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, (1 << 7)); sub_02062BC8(mapObj); @@ -1243,7 +1243,7 @@ static int sub_0206645C (MapObject * mapObj) return 1; } -static int sub_02066470 (MapObject * mapObj) +static int sub_02066470(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, (1 << 8)); sub_02062BC8(mapObj); @@ -1251,7 +1251,7 @@ static int sub_02066470 (MapObject * mapObj) return 1; } -static int sub_02066488 (MapObject * mapObj) +static int sub_02066488(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, (1 << 8)); sub_02062BC8(mapObj); @@ -1259,9 +1259,9 @@ static int sub_02066488 (MapObject * mapObj) return 1; } -static void sub_020664A0 (MapObject * mapObj, int param1, int param2) +static void sub_020664A0(MapObject *mapObj, int param1, int param2) { - UnkStruct_020664A0 * v0; + UnkStruct_020664A0 *v0; v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020664A0))); @@ -1271,9 +1271,9 @@ static void sub_020664A0 (MapObject * mapObj, int param1, int param2) sub_02062BC8(mapObj); } -static int sub_020664C8 (MapObject * mapObj) +static int sub_020664C8(MapObject *mapObj) { - UnkStruct_020664A0 * v0; + UnkStruct_020664A0 *v0; v0 = sub_02062AC8(mapObj); @@ -1286,27 +1286,27 @@ static int sub_020664C8 (MapObject * mapObj) return 0; } -static int sub_020664F0 (MapObject * mapObj) +static int sub_020664F0(MapObject *mapObj) { sub_020664A0(mapObj, 0, 0); return 0; } -static int sub_02066500 (MapObject * mapObj) +static int sub_02066500(MapObject *mapObj) { sub_020664A0(mapObj, 1, 0); return 0; } -static int sub_02066510 (MapObject * mapObj) +static int sub_02066510(MapObject *mapObj) { sub_020664A0(mapObj, 0, 1); return 0; } -static void sub_02066520 (MapObject * mapObj, int param1, s16 param2, u16 param3) +static void sub_02066520(MapObject *mapObj, int param1, s16 param2, u16 param3) { - UnkStruct_02066520 * v0; + UnkStruct_02066520 *v0; v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066520))); @@ -1321,9 +1321,9 @@ static void sub_02066520 (MapObject * mapObj, int param1, s16 param2, u16 param3 sub_02062BC8(mapObj); } -static int sub_02066560 (MapObject * mapObj, const fx32 * param1) +static int sub_02066560(MapObject *mapObj, const fx32 *param1) { - UnkStruct_02066520 * v0; + UnkStruct_02066520 *v0; v0 = sub_02062AC8(mapObj); @@ -1345,31 +1345,31 @@ static int sub_02066560 (MapObject * mapObj, const fx32 * param1) return 1; } -static int sub_020665C0 (MapObject * mapObj) +static int sub_020665C0(MapObject *mapObj) { sub_02066520(mapObj, 0, 6, 0x6); return 1; } -static int sub_020665D0 (MapObject * mapObj) +static int sub_020665D0(MapObject *mapObj) { sub_02066520(mapObj, 1, 6, 0x6); return 1; } -static int sub_020665E0 (MapObject * mapObj) +static int sub_020665E0(MapObject *mapObj) { sub_02066520(mapObj, 2, 6, 0x6); return 1; } -static int sub_020665F0 (MapObject * mapObj) +static int sub_020665F0(MapObject *mapObj) { sub_02066520(mapObj, 3, 6, 0x6); return 1; } -static int sub_02066600 (MapObject * mapObj) +static int sub_02066600(MapObject *mapObj) { if (sub_02066560(mapObj, Unk_020EEE6C) == 1) { return 1; @@ -1378,31 +1378,31 @@ static int sub_02066600 (MapObject * mapObj) return 0; } -static int sub_02066618 (MapObject * mapObj) +static int sub_02066618(MapObject *mapObj) { sub_02066520(mapObj, 0, 3, 0x7); return 1; } -static int sub_02066628 (MapObject * mapObj) +static int sub_02066628(MapObject *mapObj) { sub_02066520(mapObj, 1, 3, 0x7); return 1; } -static int sub_02066638 (MapObject * mapObj) +static int sub_02066638(MapObject *mapObj) { sub_02066520(mapObj, 2, 3, 0x7); return 1; } -static int sub_02066648 (MapObject * mapObj) +static int sub_02066648(MapObject *mapObj) { sub_02066520(mapObj, 3, 3, 0x7); return 1; } -static int sub_02066658 (MapObject * mapObj) +static int sub_02066658(MapObject *mapObj) { if (sub_02066560(mapObj, Unk_020EECEC) == 1) { return 1; @@ -1411,31 +1411,31 @@ static int sub_02066658 (MapObject * mapObj) return 0; } -static int sub_02066670 (MapObject * mapObj) +static int sub_02066670(MapObject *mapObj) { sub_02066520(mapObj, 0, 7, 0x8); return 1; } -static int sub_02066680 (MapObject * mapObj) +static int sub_02066680(MapObject *mapObj) { sub_02066520(mapObj, 1, 7, 0x8); return 1; } -static int sub_02066690 (MapObject * mapObj) +static int sub_02066690(MapObject *mapObj) { sub_02066520(mapObj, 2, 7, 0x8); return 1; } -static int sub_020666A0 (MapObject * mapObj) +static int sub_020666A0(MapObject *mapObj) { sub_02066520(mapObj, 3, 7, 0x8); return 1; } -static int sub_020666B0 (MapObject * mapObj) +static int sub_020666B0(MapObject *mapObj) { if (sub_02066560(mapObj, Unk_020EEE84) == 1) { return 1; @@ -1444,9 +1444,9 @@ static int sub_020666B0 (MapObject * mapObj) return 0; } -static int sub_020666C8 (MapObject * mapObj) +static int sub_020666C8(MapObject *mapObj) { - UnkStruct_020666C8 * v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020666C8))); + UnkStruct_020666C8 *v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020666C8))); sub_02062A0C(mapObj, 0x9); sub_02062BC8(mapObj); @@ -1454,9 +1454,9 @@ static int sub_020666C8 (MapObject * mapObj) return 0; } -static int sub_020666E4 (MapObject * mapObj) +static int sub_020666E4(MapObject *mapObj) { - UnkStruct_020666C8 * v0 = sub_02062AC8(mapObj); + UnkStruct_020666C8 *v0 = sub_02062AC8(mapObj); v0->unk_00++; @@ -1469,12 +1469,12 @@ static int sub_020666E4 (MapObject * mapObj) return 0; } -static int sub_02066710 (MapObject * mapObj) +static int sub_02066710(MapObject *mapObj) { - UnkStruct_02066710 * v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066710))); + UnkStruct_02066710 *v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066710))); { - UnkStruct_ov101_021D5D90 * v1 = sub_0206A224(mapObj); + UnkStruct_ov101_021D5D90 *v1 = sub_0206A224(mapObj); if (v1 != NULL) { sub_0207136C(v1); @@ -1482,7 +1482,7 @@ static int sub_02066710 (MapObject * mapObj) } { - VecFx32 v2 = {0, 0, 0}; + VecFx32 v2 = { 0, 0, 0 }; sub_02063088(mapObj, &v2); } @@ -1495,11 +1495,11 @@ static int sub_02066710 (MapObject * mapObj) return 0; } -static int sub_02066764 (MapObject * mapObj) +static int sub_02066764(MapObject *mapObj) { - UnkStruct_02066710 * v0 = sub_02062AC8(mapObj); - const fx32 * v1 = Unk_02100B84[0]; - VecFx32 v2 = {0, 0, 0}; + UnkStruct_02066710 *v0 = sub_02062AC8(mapObj); + const fx32 *v1 = Unk_02100B84[0]; + VecFx32 v2 = { 0, 0, 0 }; v2.y = v1[v0->unk_00]; sub_02063088(mapObj, &v2); @@ -1520,9 +1520,9 @@ static int sub_02066764 (MapObject * mapObj) return 1; } -static int sub_020667CC (MapObject * mapObj) +static int sub_020667CC(MapObject *mapObj) { - UnkStruct_020667CC * v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020667CC))); + UnkStruct_020667CC *v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020667CC))); sub_02062A0C(mapObj, 0x0); sub_02062BC8(mapObj); @@ -1530,9 +1530,9 @@ static int sub_020667CC (MapObject * mapObj) return 0; } -static int sub_020667E8 (MapObject * mapObj) +static int sub_020667E8(MapObject *mapObj) { - UnkStruct_020667CC * v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020667CC))); + UnkStruct_020667CC *v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_020667CC))); sub_02062A0C(mapObj, 0x1); sub_02062BC8(mapObj); @@ -1540,9 +1540,9 @@ static int sub_020667E8 (MapObject * mapObj) return 0; } -static int sub_02066804 (MapObject * mapObj) +static int sub_02066804(MapObject *mapObj) { - UnkStruct_020667CC * v0 = sub_02062AC8(mapObj); + UnkStruct_020667CC *v0 = sub_02062AC8(mapObj); v0->unk_00++; @@ -1554,9 +1554,9 @@ static int sub_02066804 (MapObject * mapObj) return 1; } -static void sub_02066824 (MapObject * mapObj, const VecFx32 * param1, int param2, int param3, int param4, u8 param5) +static void sub_02066824(MapObject *mapObj, const VecFx32 *param1, int param2, int param3, int param4, u8 param5) { - UnkStruct_02066824 * v0; + UnkStruct_02066824 *v0; v0 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066824))); v0->unk_00 = param4; @@ -1592,9 +1592,9 @@ static void sub_02066824 (MapObject * mapObj, const VecFx32 * param1, int param2 sub_02062BC8(mapObj); } -static int sub_020668EC (MapObject * mapObj) +static int sub_020668EC(MapObject *mapObj) { - UnkStruct_02066824 * v0; + UnkStruct_02066824 *v0; v0 = sub_02062AC8(mapObj); MapObject_AddVecToPos(mapObj, &v0->unk_04); @@ -1616,266 +1616,266 @@ static int sub_020668EC (MapObject * mapObj) return 1; } -static int sub_02066934 (MapObject * mapObj) +static int sub_02066934(MapObject *mapObj) { - VecFx32 v0 = {0, ((16 * FX32_ONE) / 8), 0}; + VecFx32 v0 = { 0, ((16 * FX32_ONE) / 8), 0 }; sub_02066824(mapObj, &v0, 2, 0, 8, 0x3); return 1; } -static int sub_02066968 (MapObject * mapObj) +static int sub_02066968(MapObject *mapObj) { - VecFx32 v0 = {0, -((16 * FX32_ONE) / 8), 0}; + VecFx32 v0 = { 0, -((16 * FX32_ONE) / 8), 0 }; sub_02066824(mapObj, &v0, 3, 1, 8, 0x3); return 1; } -static int sub_02066998 (MapObject * mapObj) +static int sub_02066998(MapObject *mapObj) { - VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 8)}; + VecFx32 v0 = { 0, 0, ((16 * FX32_ONE) / 8) }; sub_02066824(mapObj, &v0, 1, 2, 8, 0x3); return 1; } -static int sub_020669CC (MapObject * mapObj) +static int sub_020669CC(MapObject *mapObj) { - VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 8)}; + VecFx32 v0 = { 0, 0, -((16 * FX32_ONE) / 8) }; sub_02066824(mapObj, &v0, 0, 3, 8, 0x3); return 1; } -static int sub_020669FC (MapObject * mapObj) +static int sub_020669FC(MapObject *mapObj) { - VecFx32 v0 = {0, ((16 * FX32_ONE) / 8), 0}; + VecFx32 v0 = { 0, ((16 * FX32_ONE) / 8), 0 }; sub_02066824(mapObj, &v0, 3, 0, 8, 0x3); return 1; } -static int sub_02066A2C (MapObject * mapObj) +static int sub_02066A2C(MapObject *mapObj) { - VecFx32 v0 = {0, -((16 * FX32_ONE) / 8), 0}; + VecFx32 v0 = { 0, -((16 * FX32_ONE) / 8), 0 }; sub_02066824(mapObj, &v0, 2, 1, 8, 0x3); return 1; } -static int sub_02066A60 (MapObject * mapObj) +static int sub_02066A60(MapObject *mapObj) { - VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 8)}; + VecFx32 v0 = { 0, 0, -((16 * FX32_ONE) / 8) }; sub_02066824(mapObj, &v0, 0, 2, 8, 0x3); return 1; } -static int sub_02066A94 (MapObject * mapObj) +static int sub_02066A94(MapObject *mapObj) { - VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 8)}; + VecFx32 v0 = { 0, 0, ((16 * FX32_ONE) / 8) }; sub_02066824(mapObj, &v0, 1, 2, 8, 0x3); return 1; } -static int sub_02066AC8 (MapObject * mapObj) +static int sub_02066AC8(MapObject *mapObj) { - VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 8)}; + VecFx32 v0 = { 0, 0, ((16 * FX32_ONE) / 8) }; sub_02066824(mapObj, &v0, 1, 0, 8, 0x3); return 1; } -static int sub_02066AFC (MapObject * mapObj) +static int sub_02066AFC(MapObject *mapObj) { - VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 8)}; + VecFx32 v0 = { 0, 0, -((16 * FX32_ONE) / 8) }; sub_02066824(mapObj, &v0, 0, 1, 8, 0x3); return 1; } -static int sub_02066B30 (MapObject * mapObj) +static int sub_02066B30(MapObject *mapObj) { - VecFx32 v0 = {-((16 * FX32_ONE) / 8), 0, 0}; + VecFx32 v0 = { -((16 * FX32_ONE) / 8), 0, 0 }; sub_02066824(mapObj, &v0, 3, 2, 8, 0x3); return 1; } -static int sub_02066B60 (MapObject * mapObj) +static int sub_02066B60(MapObject *mapObj) { - VecFx32 v0 = {((16 * FX32_ONE) / 8), 0, 0}; + VecFx32 v0 = { ((16 * FX32_ONE) / 8), 0, 0 }; sub_02066824(mapObj, &v0, 2, 3, 8, 0x3); return 1; } -static int sub_02066B90 (MapObject * mapObj) +static int sub_02066B90(MapObject *mapObj) { - VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)}; + VecFx32 v0 = { 0, 0, ((16 * FX32_ONE) / 4) }; sub_02066824(mapObj, &v0, 1, 0, 4, 0x4); return 1; } -static int sub_02066BC0 (MapObject * mapObj) +static int sub_02066BC0(MapObject *mapObj) { - VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)}; + VecFx32 v0 = { 0, 0, -((16 * FX32_ONE) / 4) }; sub_02066824(mapObj, &v0, 0, 1, 4, 0x4); return 1; } -static int sub_02066BF0 (MapObject * mapObj) +static int sub_02066BF0(MapObject *mapObj) { - VecFx32 v0 = {-((16 * FX32_ONE) / 4), 0, 0}; + VecFx32 v0 = { -((16 * FX32_ONE) / 4), 0, 0 }; sub_02066824(mapObj, &v0, 3, 2, 4, 0x4); return 1; } -static int sub_02066C20 (MapObject * mapObj) +static int sub_02066C20(MapObject *mapObj) { - VecFx32 v0 = {((16 * FX32_ONE) / 4), 0, 0}; + VecFx32 v0 = { ((16 * FX32_ONE) / 4), 0, 0 }; sub_02066824(mapObj, &v0, 2, 3, 4, 0x4); return 1; } -static int sub_02066C50 (MapObject * mapObj) +static int sub_02066C50(MapObject *mapObj) { - VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 2)}; + VecFx32 v0 = { 0, 0, ((16 * FX32_ONE) / 2) }; sub_02066824(mapObj, &v0, 1, 0, 2, 0x5); return 1; } -static int sub_02066C84 (MapObject * mapObj) +static int sub_02066C84(MapObject *mapObj) { - VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 2)}; + VecFx32 v0 = { 0, 0, -((16 * FX32_ONE) / 2) }; sub_02066824(mapObj, &v0, 0, 1, 2, 0x5); return 1; } -static int sub_02066CB8 (MapObject * mapObj) +static int sub_02066CB8(MapObject *mapObj) { - VecFx32 v0 = {-((16 * FX32_ONE) / 2), 0, 0}; + VecFx32 v0 = { -((16 * FX32_ONE) / 2), 0, 0 }; sub_02066824(mapObj, &v0, 3, 2, 2, 0x5); return 1; } -static int sub_02066CE8 (MapObject * mapObj) +static int sub_02066CE8(MapObject *mapObj) { - VecFx32 v0 = {((16 * FX32_ONE) / 2), 0, 0}; + VecFx32 v0 = { ((16 * FX32_ONE) / 2), 0, 0 }; sub_02066824(mapObj, &v0, 2, 3, 2, 0x5); return 1; } -static int sub_02066D18 (MapObject * mapObj) +static int sub_02066D18(MapObject *mapObj) { - VecFx32 v0 = {0, ((16 * FX32_ONE) / 4), 0}; + VecFx32 v0 = { 0, ((16 * FX32_ONE) / 4), 0 }; - sub_02066824(mapObj, &v0, 2, 0, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 2, 0, 4, (0x8 + 1)); return 1; } -static int sub_02066D4C (MapObject * mapObj) +static int sub_02066D4C(MapObject *mapObj) { - VecFx32 v0 = {0, -((16 * FX32_ONE) / 4), 0}; + VecFx32 v0 = { 0, -((16 * FX32_ONE) / 4), 0 }; - sub_02066824(mapObj, &v0, 3, 1, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 3, 1, 4, (0x8 + 1)); return 1; } -static int sub_02066D80 (MapObject * mapObj) +static int sub_02066D80(MapObject *mapObj) { - VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)}; + VecFx32 v0 = { 0, 0, ((16 * FX32_ONE) / 4) }; - sub_02066824(mapObj, &v0, 1, 2, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 1, 2, 4, (0x8 + 1)); return 1; } -static int sub_02066DB4 (MapObject * mapObj) +static int sub_02066DB4(MapObject *mapObj) { - VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)}; + VecFx32 v0 = { 0, 0, -((16 * FX32_ONE) / 4) }; - sub_02066824(mapObj, &v0, 0, 3, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 0, 3, 4, (0x8 + 1)); return 1; } -static int sub_02066DE8 (MapObject * mapObj) +static int sub_02066DE8(MapObject *mapObj) { - VecFx32 v0 = {0, ((16 * FX32_ONE) / 4), 0}; + VecFx32 v0 = { 0, ((16 * FX32_ONE) / 4), 0 }; - sub_02066824(mapObj, &v0, 3, 0, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 3, 0, 4, (0x8 + 1)); return 1; } -static int sub_02066E1C (MapObject * mapObj) +static int sub_02066E1C(MapObject *mapObj) { - VecFx32 v0 = {0, -((16 * FX32_ONE) / 4), 0}; + VecFx32 v0 = { 0, -((16 * FX32_ONE) / 4), 0 }; - sub_02066824(mapObj, &v0, 2, 1, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 2, 1, 4, (0x8 + 1)); return 1; } -static int sub_02066E50 (MapObject * mapObj) +static int sub_02066E50(MapObject *mapObj) { - VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)}; + VecFx32 v0 = { 0, 0, -((16 * FX32_ONE) / 4) }; - sub_02066824(mapObj, &v0, 0, 2, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 0, 2, 4, (0x8 + 1)); return 1; } -static int sub_02066E84 (MapObject * mapObj) +static int sub_02066E84(MapObject *mapObj) { - VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)}; + VecFx32 v0 = { 0, 0, ((16 * FX32_ONE) / 4) }; - sub_02066824(mapObj, &v0, 1, 2, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 1, 2, 4, (0x8 + 1)); return 1; } -static int sub_02066EB8 (MapObject * mapObj) +static int sub_02066EB8(MapObject *mapObj) { - VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)}; + VecFx32 v0 = { 0, 0, ((16 * FX32_ONE) / 4) }; - sub_02066824(mapObj, &v0, 1, 0, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 1, 0, 4, (0x8 + 1)); return 1; } -static int sub_02066EEC (MapObject * mapObj) +static int sub_02066EEC(MapObject *mapObj) { - VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)}; + VecFx32 v0 = { 0, 0, -((16 * FX32_ONE) / 4) }; - sub_02066824(mapObj, &v0, 0, 1, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 0, 1, 4, (0x8 + 1)); return 1; } -static int sub_02066F20 (MapObject * mapObj) +static int sub_02066F20(MapObject *mapObj) { - VecFx32 v0 = {-((16 * FX32_ONE) / 4), 0, 0}; + VecFx32 v0 = { -((16 * FX32_ONE) / 4), 0, 0 }; - sub_02066824(mapObj, &v0, 3, 2, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 3, 2, 4, (0x8 + 1)); return 1; } -static int sub_02066F54 (MapObject * mapObj) +static int sub_02066F54(MapObject *mapObj) { - VecFx32 v0 = {((16 * FX32_ONE) / 4), 0, 0}; + VecFx32 v0 = { ((16 * FX32_ONE) / 4), 0, 0 }; - sub_02066824(mapObj, &v0, 2, 3, 4, ((0x8 + 1))); + sub_02066824(mapObj, &v0, 2, 3, 4, (0x8 + 1)); return 1; } -static void sub_02066F88 (MapObject * mapObj, fx32 param1, int param2, int param3, u8 param4, u8 param5, u8 param6, u8 param7, u8 param8) +static void sub_02066F88(MapObject *mapObj, fx32 param1, int param2, int param3, u8 param4, u8 param5, u8 param6, u8 param7, u8 param8) { int v0 = 1; - UnkStruct_02066F88 * v1; + UnkStruct_02066F88 *v1; v1 = sub_02062AA4(mapObj, (sizeof(UnkStruct_02066F88))); @@ -1926,11 +1926,11 @@ static void sub_02066F88 (MapObject * mapObj, fx32 param1, int param2, int param sub_02062BC8(mapObj); } -static int sub_02067068 (MapObject * mapObj) +static int sub_02067068(MapObject *mapObj) { fx32 v0; VecFx32 v1; - UnkStruct_02066F88 * v2; + UnkStruct_02066F88 *v2; v2 = sub_02062AC8(mapObj); MapObject_PosVectorOut(mapObj, &v1); @@ -1958,13 +1958,13 @@ static int sub_02067068 (MapObject * mapObj) v2->unk_08 += v0; v2->unk_0C += v2->unk_0E; - if (v2->unk_0C > ((0x100 * ((16 - 1))))) { - v2->unk_0C = ((0x100 * ((16 - 1)))); + if (v2->unk_0C > (0x100 * (16 - 1))) { + v2->unk_0C = (0x100 * (16 - 1)); } { - VecFx32 v3 = {0, 0, 0}; - const fx32 * v4 = Unk_02100B84[1]; + VecFx32 v3 = { 0, 0, 0 }; + const fx32 *v4 = Unk_02100B84[1]; u16 v5 = (v2->unk_0C) / 0x100; v0 = v4[v5]; @@ -2030,7 +2030,7 @@ static int sub_02067068 (MapObject * mapObj) } { - VecFx32 v7 = {0, 0, 0}; + VecFx32 v7 = { 0, 0, 0 }; sub_02063088(mapObj, &v7); } @@ -2044,692 +2044,990 @@ static int sub_02067068 (MapObject * mapObj) return 1; } -static int sub_020671F0 (MapObject * mapObj) +static int sub_020671F0(MapObject *mapObj) { sub_02066F88(mapObj, ((16 * FX32_ONE) / 8), 2, 0, 8, 0x3, 1, 1, 0); return 1; } -static int sub_02067214 (MapObject * mapObj) +static int sub_02067214(MapObject *mapObj) { sub_02066F88(mapObj, -((16 * FX32_ONE) / 8), 3, 1, 8, 0x3, 1, 1, 0); return 1; } -static int sub_0206723C (MapObject * mapObj) +static int sub_0206723C(MapObject *mapObj) { sub_02066F88(mapObj, ((16 * FX32_ONE) / 8), 1, 2, 8, 0x3, 2, 1, 0); return 1; } -static int sub_02067260 (MapObject * mapObj) +static int sub_02067260(MapObject *mapObj) { sub_02066F88(mapObj, -((16 * FX32_ONE) / 8), 0, 3, 8, 0x3, 2, 1, 0); return 1; } -static int sub_02067288 (MapObject * mapObj) +static int sub_02067288(MapObject *mapObj) { sub_02066F88(mapObj, ((16 * FX32_ONE) / 8), 3, 0, 8, 0x3, 1, 1, 0); return 1; } -static int sub_020672AC (MapObject * mapObj) +static int sub_020672AC(MapObject *mapObj) { sub_02066F88(mapObj, -((16 * FX32_ONE) / 8), 2, 1, 8, 0x3, 1, 1, 0); return 1; } -static int sub_020672D4 (MapObject * mapObj) +static int sub_020672D4(MapObject *mapObj) { sub_02066F88(mapObj, -((16 * FX32_ONE) / 8), 0, 2, 8, 0x3, 2, 1, 0); return 1; } -static int sub_020672FC (MapObject * mapObj) +static int sub_020672FC(MapObject *mapObj) { sub_02066F88(mapObj, ((16 * FX32_ONE) / 8), 1, 2, 8, 0x3, 2, 1, 0); return 1; } -static int sub_02067320 (MapObject * mapObj) +static int sub_02067320(MapObject *mapObj) { sub_02066F88(mapObj, ((16 * FX32_ONE) / 8), 1, 0, 8, 0x3, 2, 1, 0); return 1; } -static int sub_02067344 (MapObject * mapObj) +static int sub_02067344(MapObject *mapObj) { sub_02066F88(mapObj, -((16 * FX32_ONE) / 8), 0, 1, 8, 0x3, 2, 1, 0); return 1; } -static int sub_0206736C (MapObject * mapObj) +static int sub_0206736C(MapObject *mapObj) { sub_02066F88(mapObj, -((16 * FX32_ONE) / 8), 3, 2, 8, 0x3, 0, 1, 0); return 1; } -static int sub_02067394 (MapObject * mapObj) +static int sub_02067394(MapObject *mapObj) { sub_02066F88(mapObj, ((16 * FX32_ONE) / 8), 2, 3, 8, 0x3, 0, 1, 0); return 1; } -int(*const Unk_020EEC78[])(MapObject *) = { - sub_02065950, sub_02065924, +int (*const Unk_020EEC78[])(MapObject *) = { + sub_02065950, + sub_02065924, }; -int(*const Unk_020EEC48[])(MapObject *) = { - sub_0206595C, sub_02065924, +int (*const Unk_020EEC48[])(MapObject *) = { + sub_0206595C, + sub_02065924, }; -int(*const Unk_020EEC88[])(MapObject *) = { - sub_02065968, sub_02065924, +int (*const Unk_020EEC88[])(MapObject *) = { + sub_02065968, + sub_02065924, }; -int(*const Unk_020EEC80[])(MapObject *) = { - sub_02065974, sub_02065924, +int (*const Unk_020EEC80[])(MapObject *) = { + sub_02065974, + sub_02065924, }; -int(*const Unk_020EF59C[])(MapObject *) = { - sub_02065A1C, sub_020659C8, sub_02065924, +int (*const Unk_020EF59C[])(MapObject *) = { + sub_02065A1C, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF590[])(MapObject *) = { - sub_02065A30, sub_020659C8, sub_02065924, +int (*const Unk_020EF590[])(MapObject *) = { + sub_02065A30, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF584[])(MapObject *) = { - sub_02065A44, sub_020659C8, sub_02065924, +int (*const Unk_020EF584[])(MapObject *) = { + sub_02065A44, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF578[])(MapObject *) = { - sub_02065A58, sub_020659C8, sub_02065924, +int (*const Unk_020EF578[])(MapObject *) = { + sub_02065A58, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF56C[])(MapObject *) = { - sub_02065A6C, sub_020659C8, sub_02065924, +int (*const Unk_020EF56C[])(MapObject *) = { + sub_02065A6C, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF560[])(MapObject *) = { - sub_02065A80, sub_020659C8, sub_02065924, +int (*const Unk_020EF560[])(MapObject *) = { + sub_02065A80, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF554[])(MapObject *) = { - sub_02065A94, sub_020659C8, sub_02065924, +int (*const Unk_020EF554[])(MapObject *) = { + sub_02065A94, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF548[])(MapObject *) = { - sub_02065AA8, sub_020659C8, sub_02065924, +int (*const Unk_020EF548[])(MapObject *) = { + sub_02065AA8, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF53C[])(MapObject *) = { - sub_02065ABC, sub_020659C8, sub_02065924, +int (*const Unk_020EF53C[])(MapObject *) = { + sub_02065ABC, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF530[])(MapObject *) = { - sub_02065AD4, sub_020659C8, sub_02065924, +int (*const Unk_020EF530[])(MapObject *) = { + sub_02065AD4, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF524[])(MapObject *) = { - sub_02065AE8, sub_020659C8, sub_02065924, +int (*const Unk_020EF524[])(MapObject *) = { + sub_02065AE8, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF518[])(MapObject *) = { - sub_02065AFC, sub_020659C8, sub_02065924, +int (*const Unk_020EF518[])(MapObject *) = { + sub_02065AFC, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF50C[])(MapObject *) = { - sub_02065B10, sub_020659C8, sub_02065924, +int (*const Unk_020EF50C[])(MapObject *) = { + sub_02065B10, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF500[])(MapObject *) = { - sub_02065B24, sub_020659C8, sub_02065924, +int (*const Unk_020EF500[])(MapObject *) = { + sub_02065B24, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF4F4[])(MapObject *) = { - sub_02065B38, sub_020659C8, sub_02065924, +int (*const Unk_020EF4F4[])(MapObject *) = { + sub_02065B38, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF4E8[])(MapObject *) = { - sub_02065B4C, sub_020659C8, sub_02065924, +int (*const Unk_020EF4E8[])(MapObject *) = { + sub_02065B4C, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF4DC[])(MapObject *) = { - sub_02065B60, sub_020659C8, sub_02065924, +int (*const Unk_020EF4DC[])(MapObject *) = { + sub_02065B60, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF4D0[])(MapObject *) = { - sub_02065B78, sub_020659C8, sub_02065924, +int (*const Unk_020EF4D0[])(MapObject *) = { + sub_02065B78, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF4C4[])(MapObject *) = { - sub_02065B8C, sub_020659C8, sub_02065924, +int (*const Unk_020EF4C4[])(MapObject *) = { + sub_02065B8C, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF4B8[])(MapObject *) = { - sub_02065BA0, sub_020659C8, sub_02065924, +int (*const Unk_020EF4B8[])(MapObject *) = { + sub_02065BA0, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF4AC[])(MapObject *) = { - sub_02065BB8, sub_020659C8, sub_02065924, +int (*const Unk_020EF4AC[])(MapObject *) = { + sub_02065BB8, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF4A0[])(MapObject *) = { - sub_02065BCC, sub_020659C8, sub_02065924, +int (*const Unk_020EF4A0[])(MapObject *) = { + sub_02065BCC, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF494[])(MapObject *) = { - sub_02065BE0, sub_020659C8, sub_02065924, +int (*const Unk_020EF494[])(MapObject *) = { + sub_02065BE0, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF488[])(MapObject *) = { - sub_02065BF4, sub_020659C8, sub_02065924, +int (*const Unk_020EF488[])(MapObject *) = { + sub_02065BF4, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF47C[])(MapObject *) = { - sub_02065CCC, sub_02065C98, sub_02065924, +int (*const Unk_020EF47C[])(MapObject *) = { + sub_02065CCC, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF230[])(MapObject *) = { - sub_02065CDC, sub_02065C98, sub_02065924, +int (*const Unk_020EF230[])(MapObject *) = { + sub_02065CDC, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF458[])(MapObject *) = { - sub_02065CEC, sub_02065C98, sub_02065924, +int (*const Unk_020EF458[])(MapObject *) = { + sub_02065CEC, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF464[])(MapObject *) = { - sub_02065CFC, sub_02065C98, sub_02065924, +int (*const Unk_020EF464[])(MapObject *) = { + sub_02065CFC, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF5A8[])(MapObject *) = { - sub_02065D0C, sub_02065C98, sub_02065924, +int (*const Unk_020EF5A8[])(MapObject *) = { + sub_02065D0C, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF5B4[])(MapObject *) = { - sub_02065D1C, sub_02065C98, sub_02065924, +int (*const Unk_020EF5B4[])(MapObject *) = { + sub_02065D1C, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF434[])(MapObject *) = { - sub_02065D2C, sub_02065C98, sub_02065924, +int (*const Unk_020EF434[])(MapObject *) = { + sub_02065D2C, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF428[])(MapObject *) = { - sub_02065D3C, sub_02065C98, sub_02065924, +int (*const Unk_020EF428[])(MapObject *) = { + sub_02065D3C, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF41C[])(MapObject *) = { - sub_02065D4C, sub_02065C98, sub_02065924, +int (*const Unk_020EF41C[])(MapObject *) = { + sub_02065D4C, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF410[])(MapObject *) = { - sub_02065D5C, sub_02065C98, sub_02065924, +int (*const Unk_020EF410[])(MapObject *) = { + sub_02065D5C, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF404[])(MapObject *) = { - sub_02065D6C, sub_02065C98, sub_02065924, +int (*const Unk_020EF404[])(MapObject *) = { + sub_02065D6C, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF3F8[])(MapObject *) = { - sub_02065D7C, sub_02065C98, sub_02065924, +int (*const Unk_020EF3F8[])(MapObject *) = { + sub_02065D7C, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF3EC[])(MapObject *) = { - sub_02065D8C, sub_02065C98, sub_02065924, +int (*const Unk_020EF3EC[])(MapObject *) = { + sub_02065D8C, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF3E0[])(MapObject *) = { - sub_02065D9C, sub_02065C98, sub_02065924, +int (*const Unk_020EF3E0[])(MapObject *) = { + sub_02065D9C, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF3D4[])(MapObject *) = { - sub_02065DAC, sub_02065C98, sub_02065924, +int (*const Unk_020EF3D4[])(MapObject *) = { + sub_02065DAC, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF3C8[])(MapObject *) = { - sub_02065DBC, sub_02065C98, sub_02065924, +int (*const Unk_020EF3C8[])(MapObject *) = { + sub_02065DBC, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF3BC[])(MapObject *) = { - sub_02065DCC, sub_02065C98, sub_02065924, +int (*const Unk_020EF3BC[])(MapObject *) = { + sub_02065DCC, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF3B0[])(MapObject *) = { - sub_02065DDC, sub_02065C98, sub_02065924, +int (*const Unk_020EF3B0[])(MapObject *) = { + sub_02065DDC, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF3A4[])(MapObject *) = { - sub_02065DEC, sub_02065C98, sub_02065924, +int (*const Unk_020EF3A4[])(MapObject *) = { + sub_02065DEC, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF398[])(MapObject *) = { - sub_02065DFC, sub_02065C98, sub_02065924, +int (*const Unk_020EF398[])(MapObject *) = { + sub_02065DFC, + sub_02065C98, + sub_02065924, }; -int(*const Unk_020EF38C[])(MapObject *) = { - sub_02065F88, sub_02065EA0, sub_02065924, +int (*const Unk_020EF38C[])(MapObject *) = { + sub_02065F88, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF380[])(MapObject *) = { - sub_02065FA8, sub_02065EA0, sub_02065924, +int (*const Unk_020EF380[])(MapObject *) = { + sub_02065FA8, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF374[])(MapObject *) = { - sub_02065FC8, sub_02065EA0, sub_02065924, +int (*const Unk_020EF374[])(MapObject *) = { + sub_02065FC8, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF368[])(MapObject *) = { - sub_02065FE8, sub_02065EA0, sub_02065924, +int (*const Unk_020EF368[])(MapObject *) = { + sub_02065FE8, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF35C[])(MapObject *) = { - sub_02066008, sub_02065EA0, sub_02065924, +int (*const Unk_020EF35C[])(MapObject *) = { + sub_02066008, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF350[])(MapObject *) = { - sub_02066028, sub_02065EA0, sub_02065924, +int (*const Unk_020EF350[])(MapObject *) = { + sub_02066028, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF344[])(MapObject *) = { - sub_02066048, sub_02065EA0, sub_02065924, +int (*const Unk_020EF344[])(MapObject *) = { + sub_02066048, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF338[])(MapObject *) = { - sub_02066068, sub_02065EA0, sub_02065924, +int (*const Unk_020EF338[])(MapObject *) = { + sub_02066068, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF32C[])(MapObject *) = { - sub_02066088, sub_02065EA0, sub_02065924, +int (*const Unk_020EF32C[])(MapObject *) = { + sub_02066088, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF320[])(MapObject *) = { - sub_020660A8, sub_02065EA0, sub_02065924, +int (*const Unk_020EF320[])(MapObject *) = { + sub_020660A8, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF314[])(MapObject *) = { - sub_020660CC, sub_02065EA0, sub_02065924, +int (*const Unk_020EF314[])(MapObject *) = { + sub_020660CC, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF308[])(MapObject *) = { - sub_020660F0, sub_02065EA0, sub_02065924, +int (*const Unk_020EF308[])(MapObject *) = { + sub_020660F0, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF2FC[])(MapObject *) = { - sub_02066110, sub_02065EA0, sub_02065924, +int (*const Unk_020EF2FC[])(MapObject *) = { + sub_02066110, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF2F0[])(MapObject *) = { - sub_02066130, sub_02065EA0, sub_02065924, +int (*const Unk_020EF2F0[])(MapObject *) = { + sub_02066130, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF2E4[])(MapObject *) = { - sub_02066150, sub_02065EA0, sub_02065924, +int (*const Unk_020EF2E4[])(MapObject *) = { + sub_02066150, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF2D8[])(MapObject *) = { - sub_02066170, sub_02065EA0, sub_02065924, +int (*const Unk_020EF2D8[])(MapObject *) = { + sub_02066170, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EEC98[])(MapObject *) = { - sub_02066194, sub_02065EA0, sub_02065924, +int (*const Unk_020EEC98[])(MapObject *) = { + sub_02066194, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF2C0[])(MapObject *) = { - sub_020661B4, sub_02065EA0, sub_02065924, +int (*const Unk_020EF2C0[])(MapObject *) = { + sub_020661B4, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF2B4[])(MapObject *) = { - sub_020661D8, sub_02065EA0, sub_02065924, +int (*const Unk_020EF2B4[])(MapObject *) = { + sub_020661D8, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF2A8[])(MapObject *) = { - sub_020661F8, sub_02065EA0, sub_02065924, +int (*const Unk_020EF2A8[])(MapObject *) = { + sub_020661F8, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF29C[])(MapObject *) = { - sub_020662E4, sub_020662C4, sub_02065924, +int (*const Unk_020EF29C[])(MapObject *) = { + sub_020662E4, + sub_020662C4, + sub_02065924, }; -int(*const Unk_020EF290[])(MapObject *) = { - sub_020662F0, sub_020662C4, sub_02065924, +int (*const Unk_020EF290[])(MapObject *) = { + sub_020662F0, + sub_020662C4, + sub_02065924, }; -int(*const Unk_020EF284[])(MapObject *) = { - sub_020662FC, sub_020662C4, sub_02065924, +int (*const Unk_020EF284[])(MapObject *) = { + sub_020662FC, + sub_020662C4, + sub_02065924, }; -int(*const Unk_020EF278[])(MapObject *) = { - sub_02066308, sub_020662C4, sub_02065924, +int (*const Unk_020EF278[])(MapObject *) = { + sub_02066308, + sub_020662C4, + sub_02065924, }; -int(*const Unk_020EF26C[])(MapObject *) = { - sub_02066314, sub_020662C4, sub_02065924, +int (*const Unk_020EF26C[])(MapObject *) = { + sub_02066314, + sub_020662C4, + sub_02065924, }; -int(*const Unk_020EF260[])(MapObject *) = { - sub_02066320, sub_020662C4, sub_02065924, +int (*const Unk_020EF260[])(MapObject *) = { + sub_02066320, + sub_020662C4, + sub_02065924, }; -int(*const Unk_020EF254[])(MapObject *) = { - sub_0206632C, sub_020662C4, sub_02065924, +int (*const Unk_020EF254[])(MapObject *) = { + sub_0206632C, + sub_020662C4, + sub_02065924, }; -int(*const Unk_020EF248[])(MapObject *) = { - sub_02066338, sub_0206635C, sub_02065924, +int (*const Unk_020EF248[])(MapObject *) = { + sub_02066338, + sub_0206635C, + sub_02065924, }; -int(*const Unk_020EF23C[])(MapObject *) = { - sub_020663A4, sub_020663D0, sub_02065924, +int (*const Unk_020EF23C[])(MapObject *) = { + sub_020663A4, + sub_020663D0, + sub_02065924, }; -int(*const Unk_020EEC70[])(MapObject *) = { - sub_02066418, sub_02065924, +int (*const Unk_020EEC70[])(MapObject *) = { + sub_02066418, + sub_02065924, }; -int(*const Unk_020EEC68[])(MapObject *) = { - sub_02066430, sub_02065924, +int (*const Unk_020EEC68[])(MapObject *) = { + sub_02066430, + sub_02065924, }; -int(*const Unk_020EEC50[])(MapObject *) = { - sub_02066448, sub_02065924, +int (*const Unk_020EEC50[])(MapObject *) = { + sub_02066448, + sub_02065924, }; -int(*const Unk_020EEC90[])(MapObject *) = { - sub_0206645C, sub_02065924, +int (*const Unk_020EEC90[])(MapObject *) = { + sub_0206645C, + sub_02065924, }; -int(*const Unk_020EEC58[])(MapObject *) = { - sub_02066470, sub_02065924, +int (*const Unk_020EEC58[])(MapObject *) = { + sub_02066470, + sub_02065924, }; -int(*const Unk_020EEC60[])(MapObject *) = { - sub_02066488, sub_02065924, +int (*const Unk_020EEC60[])(MapObject *) = { + sub_02066488, + sub_02065924, }; -int(*const Unk_020EF218[])(MapObject *) = { - sub_020664F0, sub_020664C8, sub_02065924, +int (*const Unk_020EF218[])(MapObject *) = { + sub_020664F0, + sub_020664C8, + sub_02065924, }; -int(*const Unk_020EF20C[])(MapObject *) = { - sub_02066500, sub_020664C8, sub_02065924, +int (*const Unk_020EF20C[])(MapObject *) = { + sub_02066500, + sub_020664C8, + sub_02065924, }; -int(*const Unk_020EF200[])(MapObject *) = { - sub_020665C0, sub_02066600, sub_02065924, +int (*const Unk_020EF200[])(MapObject *) = { + sub_020665C0, + sub_02066600, + sub_02065924, }; -int(*const Unk_020EF1F4[])(MapObject *) = { - sub_020665D0, sub_02066600, sub_02065924, +int (*const Unk_020EF1F4[])(MapObject *) = { + sub_020665D0, + sub_02066600, + sub_02065924, }; -int(*const Unk_020EF1E8[])(MapObject *) = { - sub_020665E0, sub_02066600, sub_02065924, +int (*const Unk_020EF1E8[])(MapObject *) = { + sub_020665E0, + sub_02066600, + sub_02065924, }; -int(*const Unk_020EF1DC[])(MapObject *) = { - sub_020665F0, sub_02066600, sub_02065924, +int (*const Unk_020EF1DC[])(MapObject *) = { + sub_020665F0, + sub_02066600, + sub_02065924, }; -int(*const Unk_020EF1D0[])(MapObject *) = { - sub_02066618, sub_02066658, sub_02065924, +int (*const Unk_020EF1D0[])(MapObject *) = { + sub_02066618, + sub_02066658, + sub_02065924, }; -int(*const Unk_020EF1C4[])(MapObject *) = { - sub_02066628, sub_02066658, sub_02065924, +int (*const Unk_020EF1C4[])(MapObject *) = { + sub_02066628, + sub_02066658, + sub_02065924, }; -int(*const Unk_020EF1B8[])(MapObject *) = { - sub_02066638, sub_02066658, sub_02065924, +int (*const Unk_020EF1B8[])(MapObject *) = { + sub_02066638, + sub_02066658, + sub_02065924, }; -int(*const Unk_020EF188[])(MapObject *) = { - sub_02066648, sub_02066658, sub_02065924, +int (*const Unk_020EF188[])(MapObject *) = { + sub_02066648, + sub_02066658, + sub_02065924, }; -int(*const Unk_020EF194[])(MapObject *) = { - sub_02065C0C, sub_020659C8, sub_02065924, +int (*const Unk_020EF194[])(MapObject *) = { + sub_02065C0C, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF224[])(MapObject *) = { - sub_02065C24, sub_020659C8, sub_02065924, +int (*const Unk_020EF224[])(MapObject *) = { + sub_02065C24, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF440[])(MapObject *) = { - sub_02065C38, sub_020659C8, sub_02065924, +int (*const Unk_020EF440[])(MapObject *) = { + sub_02065C38, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF470[])(MapObject *) = { - sub_02065C4C, sub_020659C8, sub_02065924, +int (*const Unk_020EF470[])(MapObject *) = { + sub_02065C4C, + sub_020659C8, + sub_02065924, }; -int(*const Unk_020EF5C0[])(MapObject *) = { - sub_02066670, sub_020666B0, sub_02065924, +int (*const Unk_020EF5C0[])(MapObject *) = { + sub_02066670, + sub_020666B0, + sub_02065924, }; -int(*const Unk_020EF164[])(MapObject *) = { - sub_02066680, sub_020666B0, sub_02065924, +int (*const Unk_020EF164[])(MapObject *) = { + sub_02066680, + sub_020666B0, + sub_02065924, }; -int(*const Unk_020EF158[])(MapObject *) = { - sub_02066690, sub_020666B0, sub_02065924, +int (*const Unk_020EF158[])(MapObject *) = { + sub_02066690, + sub_020666B0, + sub_02065924, }; -int(*const Unk_020EF14C[])(MapObject *) = { - sub_020666A0, sub_020666B0, sub_02065924, +int (*const Unk_020EF14C[])(MapObject *) = { + sub_020666A0, + sub_020666B0, + sub_02065924, }; -int(*const Unk_020EF140[])(MapObject *) = { - sub_020666C8, sub_020666E4, sub_02065924, +int (*const Unk_020EF140[])(MapObject *) = { + sub_020666C8, + sub_020666E4, + sub_02065924, }; -int(*const Unk_020EF134[])(MapObject *) = { - sub_02066710, sub_02066764, sub_02065924, +int (*const Unk_020EF134[])(MapObject *) = { + sub_02066710, + sub_02066764, + sub_02065924, }; -int(*const Unk_020EF128[])(MapObject *) = { - sub_020667CC, sub_02066804, sub_02065924, +int (*const Unk_020EF128[])(MapObject *) = { + sub_020667CC, + sub_02066804, + sub_02065924, }; -int(*const Unk_020EF11C[])(MapObject *) = { - sub_020667E8, sub_02066804, sub_02065924, +int (*const Unk_020EF11C[])(MapObject *) = { + sub_020667E8, + sub_02066804, + sub_02065924, }; -int(*const Unk_020EF110[])(MapObject *) = { - sub_02066934, sub_020668EC, sub_02065924, +int (*const Unk_020EF110[])(MapObject *) = { + sub_02066934, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF104[])(MapObject *) = { - sub_02066968, sub_020668EC, sub_02065924, +int (*const Unk_020EF104[])(MapObject *) = { + sub_02066968, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF0F8[])(MapObject *) = { - sub_02066998, sub_020668EC, sub_02065924, +int (*const Unk_020EF0F8[])(MapObject *) = { + sub_02066998, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF0EC[])(MapObject *) = { - sub_020669CC, sub_020668EC, sub_02065924, +int (*const Unk_020EF0EC[])(MapObject *) = { + sub_020669CC, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF0E0[])(MapObject *) = { - sub_020669FC, sub_020668EC, sub_02065924, +int (*const Unk_020EF0E0[])(MapObject *) = { + sub_020669FC, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF0D4[])(MapObject *) = { - sub_02066A2C, sub_020668EC, sub_02065924, +int (*const Unk_020EF0D4[])(MapObject *) = { + sub_02066A2C, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF0C8[])(MapObject *) = { - sub_02066A60, sub_020668EC, sub_02065924, +int (*const Unk_020EF0C8[])(MapObject *) = { + sub_02066A60, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF0BC[])(MapObject *) = { - sub_02066A94, sub_020668EC, sub_02065924, +int (*const Unk_020EF0BC[])(MapObject *) = { + sub_02066A94, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF2CC[])(MapObject *) = { - sub_02066AC8, sub_020668EC, sub_02065924, +int (*const Unk_020EF2CC[])(MapObject *) = { + sub_02066AC8, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF0A4[])(MapObject *) = { - sub_02066AFC, sub_020668EC, sub_02065924, +int (*const Unk_020EF0A4[])(MapObject *) = { + sub_02066AFC, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF098[])(MapObject *) = { - sub_02066B30, sub_020668EC, sub_02065924, +int (*const Unk_020EF098[])(MapObject *) = { + sub_02066B30, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF08C[])(MapObject *) = { - sub_02066B60, sub_020668EC, sub_02065924, +int (*const Unk_020EF08C[])(MapObject *) = { + sub_02066B60, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF080[])(MapObject *) = { - sub_02066B90, sub_020668EC, sub_02065924, +int (*const Unk_020EF080[])(MapObject *) = { + sub_02066B90, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF074[])(MapObject *) = { - sub_02066BC0, sub_020668EC, sub_02065924, +int (*const Unk_020EF074[])(MapObject *) = { + sub_02066BC0, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF068[])(MapObject *) = { - sub_02066BF0, sub_020668EC, sub_02065924, +int (*const Unk_020EF068[])(MapObject *) = { + sub_02066BF0, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF05C[])(MapObject *) = { - sub_02066C20, sub_020668EC, sub_02065924, +int (*const Unk_020EF05C[])(MapObject *) = { + sub_02066C20, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF050[])(MapObject *) = { - sub_02066C50, sub_020668EC, sub_02065924, +int (*const Unk_020EF050[])(MapObject *) = { + sub_02066C50, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF044[])(MapObject *) = { - sub_02066C84, sub_020668EC, sub_02065924, +int (*const Unk_020EF044[])(MapObject *) = { + sub_02066C84, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF038[])(MapObject *) = { - sub_02066CB8, sub_020668EC, sub_02065924, +int (*const Unk_020EF038[])(MapObject *) = { + sub_02066CB8, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF014[])(MapObject *) = { - sub_02066CE8, sub_020668EC, sub_02065924, +int (*const Unk_020EF014[])(MapObject *) = { + sub_02066CE8, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF020[])(MapObject *) = { - sub_0206621C, sub_02065EA0, sub_02065924, +int (*const Unk_020EF020[])(MapObject *) = { + sub_0206621C, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF17C[])(MapObject *) = { - sub_02066240, sub_02065EA0, sub_02065924, +int (*const Unk_020EF17C[])(MapObject *) = { + sub_02066240, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF1A0[])(MapObject *) = { - sub_02066264, sub_02065EA0, sub_02065924, +int (*const Unk_020EF1A0[])(MapObject *) = { + sub_02066264, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF44C[])(MapObject *) = { - sub_02066288, sub_02065EA0, sub_02065924, +int (*const Unk_020EF44C[])(MapObject *) = { + sub_02066288, + sub_02065EA0, + sub_02065924, }; -int(*const Unk_020EF5CC[])(MapObject *) = { - sub_02066D18, sub_020668EC, sub_02065924, +int (*const Unk_020EF5CC[])(MapObject *) = { + sub_02066D18, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEFF0[])(MapObject *) = { - sub_02066D4C, sub_020668EC, sub_02065924, +int (*const Unk_020EEFF0[])(MapObject *) = { + sub_02066D4C, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEFE4[])(MapObject *) = { - sub_02066D80, sub_020668EC, sub_02065924, +int (*const Unk_020EEFE4[])(MapObject *) = { + sub_02066D80, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEFD8[])(MapObject *) = { - sub_02066DB4, sub_020668EC, sub_02065924, +int (*const Unk_020EEFD8[])(MapObject *) = { + sub_02066DB4, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEFCC[])(MapObject *) = { - sub_02066DE8, sub_020668EC, sub_02065924, +int (*const Unk_020EEFCC[])(MapObject *) = { + sub_02066DE8, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEFC0[])(MapObject *) = { - sub_02066E1C, sub_020668EC, sub_02065924, +int (*const Unk_020EEFC0[])(MapObject *) = { + sub_02066E1C, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEFB4[])(MapObject *) = { - sub_02066E50, sub_020668EC, sub_02065924, +int (*const Unk_020EEFB4[])(MapObject *) = { + sub_02066E50, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEFA8[])(MapObject *) = { - sub_02066E84, sub_020668EC, sub_02065924, +int (*const Unk_020EEFA8[])(MapObject *) = { + sub_02066E84, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EF0B0[])(MapObject *) = { - sub_02066EB8, sub_020668EC, sub_02065924, +int (*const Unk_020EF0B0[])(MapObject *) = { + sub_02066EB8, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEF90[])(MapObject *) = { - sub_02066EEC, sub_020668EC, sub_02065924, +int (*const Unk_020EEF90[])(MapObject *) = { + sub_02066EEC, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEF84[])(MapObject *) = { - sub_02066F20, sub_020668EC, sub_02065924, +int (*const Unk_020EEF84[])(MapObject *) = { + sub_02066F20, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEF6C[])(MapObject *) = { - sub_02066F54, sub_020668EC, sub_02065924, +int (*const Unk_020EEF6C[])(MapObject *) = { + sub_02066F54, + sub_020668EC, + sub_02065924, }; -int(*const Unk_020EEF78[])(MapObject *) = { - sub_020671F0, sub_02067068, sub_02065924, +int (*const Unk_020EEF78[])(MapObject *) = { + sub_020671F0, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EF008[])(MapObject *) = { - sub_02067214, sub_02067068, sub_02065924, +int (*const Unk_020EF008[])(MapObject *) = { + sub_02067214, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EF02C[])(MapObject *) = { - sub_0206723C, sub_02067068, sub_02065924, +int (*const Unk_020EF02C[])(MapObject *) = { + sub_0206723C, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EF1AC[])(MapObject *) = { - sub_02067260, sub_02067068, sub_02065924, +int (*const Unk_020EF1AC[])(MapObject *) = { + sub_02067260, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EF5D8[])(MapObject *) = { - sub_02067288, sub_02067068, sub_02065924, +int (*const Unk_020EF5D8[])(MapObject *) = { + sub_02067288, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EECBC[])(MapObject *) = { - sub_020672AC, sub_02067068, sub_02065924, +int (*const Unk_020EECBC[])(MapObject *) = { + sub_020672AC, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EECB0[])(MapObject *) = { - sub_020672D4, sub_02067068, sub_02065924, +int (*const Unk_020EECB0[])(MapObject *) = { + sub_020672D4, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EECA4[])(MapObject *) = { - sub_020672FC, sub_02067068, sub_02065924, +int (*const Unk_020EECA4[])(MapObject *) = { + sub_020672FC, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EEF9C[])(MapObject *) = { - sub_02067320, sub_02067068, sub_02065924, +int (*const Unk_020EEF9C[])(MapObject *) = { + sub_02067320, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EEF60[])(MapObject *) = { - sub_02067344, sub_02067068, sub_02065924, +int (*const Unk_020EEF60[])(MapObject *) = { + sub_02067344, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EEFFC[])(MapObject *) = { - sub_0206736C, sub_02067068, sub_02065924, +int (*const Unk_020EEFFC[])(MapObject *) = { + sub_0206736C, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EF170[])(MapObject *) = { - sub_02067394, sub_02067068, sub_02065924, +int (*const Unk_020EF170[])(MapObject *) = { + sub_02067394, + sub_02067068, + sub_02065924, }; -int(*const Unk_020EF5E4[])(MapObject *) = { - sub_02066510, sub_020664C8, sub_02065924, +int (*const Unk_020EF5E4[])(MapObject *) = { + sub_02066510, + sub_020664C8, + sub_02065924, }; static const fx32 Unk_020EEEA0[16] = { @@ -2789,7 +3087,7 @@ static const fx32 Unk_020EEF20[16] = { 0 * FX32_ONE }; -static const fx32 * Unk_02100B84[] = { +static const fx32 *Unk_02100B84[] = { Unk_020EEEA0, Unk_020EEEE0, Unk_020EEF20 diff --git a/src/unk_020673B8.c b/src/unk_020673B8.c index 36cbc52eed..9bf941437b 100644 --- a/src/unk_020673B8.c +++ b/src/unk_020673B8.c @@ -1,3 +1,5 @@ +#include "unk_020673B8.h" + #include #include @@ -6,7 +8,6 @@ #include "map_header_data.h" #include "map_object.h" #include "unk_020655F4.h" -#include "unk_020673B8.h" typedef struct { u8 unk_00; @@ -32,31 +33,31 @@ typedef struct { s8 unk_08; } UnkStruct_0206762C; -static void sub_020673E4(MapObject * param0); -static int sub_02067400(MapObject * param0); -static int sub_0206741C(MapObject * param0); -static int sub_02067438(MapObject * param0); -static int sub_0206746C(MapObject * param0); -static void sub_020674A0(MapObject * param0); -static int sub_020674A4(MapObject * param0); -static int sub_020674A8(MapObject * param0); -static void sub_020674AC(MapObject * param0); -static int sub_020674C4(MapObject * param0); -static int sub_02067540(MapObject * param0); -static void sub_0206762C(MapObject * param0); -static int sub_02067658(MapObject * param0); -static int sub_020676D4(MapObject * param0); - -void(*const Unk_020EF630[])(MapObject *); -int(*const Unk_020EF660[])(MapObject *); -int(*const Unk_020EF690[])(MapObject *); - -void sub_020673B8 (MapObject * param0) +static void sub_020673E4(MapObject *param0); +static int sub_02067400(MapObject *param0); +static int sub_0206741C(MapObject *param0); +static int sub_02067438(MapObject *param0); +static int sub_0206746C(MapObject *param0); +static void sub_020674A0(MapObject *param0); +static int sub_020674A4(MapObject *param0); +static int sub_020674A8(MapObject *param0); +static void sub_020674AC(MapObject *param0); +static int sub_020674C4(MapObject *param0); +static int sub_02067540(MapObject *param0); +static void sub_0206762C(MapObject *param0); +static int sub_02067658(MapObject *param0); +static int sub_020676D4(MapObject *param0); + +void (*const Unk_020EF630[])(MapObject *); +int (*const Unk_020EF660[])(MapObject *); +int (*const Unk_020EF690[])(MapObject *); + +void sub_020673B8(MapObject *param0) { sub_020673E4(param0); } -int sub_020673C0 (MapObject * param0) +int sub_020673C0(MapObject *param0) { if (sub_02067400(param0) == 0) { return 0; @@ -69,26 +70,26 @@ int sub_020673C0 (MapObject * param0) return 1; } -static void sub_020673E4 (MapObject * param0) +static void sub_020673E4(MapObject *param0) { int v0 = MapObject_GetEventType(param0); Unk_020EF630[v0](param0); } -static int sub_02067400 (MapObject * param0) +static int sub_02067400(MapObject *param0) { int v0 = MapObject_GetEventType(param0); return Unk_020EF660[v0](param0); } -static int sub_0206741C (MapObject * param0) +static int sub_0206741C(MapObject *param0) { int v0 = MapObject_GetEventType(param0); return Unk_020EF690[v0](param0); } -static int sub_02067438 (MapObject * param0) +static int sub_02067438(MapObject *param0) { int v0 = MapObject_GetXPos(param0); int v1 = MapObject_XPosPrev(param0); @@ -107,7 +108,7 @@ static int sub_02067438 (MapObject * param0) return 0; } -static int sub_0206746C (MapObject * param0) +static int sub_0206746C(MapObject *param0) { int v0 = MapObject_GetXPos(param0); int v1 = MapObject_XPosPrev(param0); @@ -126,32 +127,32 @@ static int sub_0206746C (MapObject * param0) return 1; } -static void sub_020674A0 (MapObject * param0) +static void sub_020674A0(MapObject *param0) { return; } -static int sub_020674A4 (MapObject * param0) +static int sub_020674A4(MapObject *param0) { return 0; } -static int sub_020674A8 (MapObject * param0) +static int sub_020674A8(MapObject *param0) { return 0; } -static void sub_020674AC (MapObject * param0) +static void sub_020674AC(MapObject *param0) { - UnkStruct_020674AC * v0; + UnkStruct_020674AC *v0; v0 = sub_02062A7C(param0, (sizeof(UnkStruct_020674AC))); v0->unk_03 = sub_020629D8(param0, 1); } -static int sub_020674C4 (MapObject * param0) +static int sub_020674C4(MapObject *param0) { - UnkStruct_020674AC * v0; + UnkStruct_020674AC *v0; v0 = sub_02062AA0(param0); @@ -189,41 +190,37 @@ static int sub_020674C4 (MapObject * param0) return 0; } -static int sub_02067540 (MapObject * param0) +static int sub_02067540(MapObject *param0) { - UnkStruct_020674AC * v0; + UnkStruct_020674AC *v0; v0 = sub_02062AA0(param0); switch (v0->unk_01) { - case 0: - { - int v1[4] = {0, 0, 1, 1}; + case 0: { + int v1[4] = { 0, 0, 1, 1 }; int v2 = MapObject_Dir(param0); v0->unk_04 = v2; v0->unk_05 = v1[v2]; v0->unk_01++; } - case 1: - { - int v3[2][2] = {{2, 3}, {0, 1}}; + case 1: { + int v3[2][2] = { { 2, 3 }, { 0, 1 } }; int v4 = v3[v0->unk_05][v0->unk_06]; int v5 = sub_02065838(v4, 0x0); sub_02065668(param0, v5); v0->unk_01++; } - case 2: - { + case 2: { if (sub_020658DC(param0) == 0) { return 1; } v0->unk_01++; } - case 3: - { + case 3: { v0->unk_08++; if (v0->unk_08 < 8) { @@ -250,10 +247,10 @@ static int sub_02067540 (MapObject * param0) return 0; } -static void sub_0206762C (MapObject * param0) +static void sub_0206762C(MapObject *param0) { int v0; - UnkStruct_0206762C * v1; + UnkStruct_0206762C *v1; v1 = sub_02062A7C(param0, (sizeof(UnkStruct_0206762C))); v1->unk_03 = sub_020629D8(param0, 1); @@ -269,9 +266,9 @@ static void sub_0206762C (MapObject * param0) v1->unk_05 = v0; } -static int sub_02067658 (MapObject * param0) +static int sub_02067658(MapObject *param0) { - UnkStruct_0206762C * v0; + UnkStruct_0206762C *v0; v0 = sub_02062AA0(param0); @@ -310,16 +307,15 @@ static int sub_02067658 (MapObject * param0) return 0; } -static int sub_020676D4 (MapObject * param0) +static int sub_020676D4(MapObject *param0) { - UnkStruct_020674AC * v0; - int v1[2][4] = {{0, 2, 1, 3}, {0, 3, 1, 2}}; + UnkStruct_020674AC *v0; + int v1[2][4] = { { 0, 2, 1, 3 }, { 0, 3, 1, 2 } }; v0 = sub_02062AA0(param0); switch (v0->unk_01) { - case 0: - { + case 0: { int v2, v3 = MapObject_Dir(param0); for (v2 = 0; (v2 < 4 && v3 != v1[v0->unk_05][v2]); v2++) { @@ -332,24 +328,21 @@ static int sub_020676D4 (MapObject * param0) v0->unk_06 = (v2 + 1) % 4; v0->unk_01++; } - case 1: - { + case 1: { int v4 = v1[v0->unk_05][v0->unk_06]; int v5 = sub_02065838(v4, 0x0); sub_02065668(param0, v5); v0->unk_01++; } - case 2: - { + case 2: { if (sub_020658DC(param0) == 0) { return 1; } v0->unk_01++; } - case 3: - { + case 3: { v0->unk_08++; if (v0->unk_08 < 8) { @@ -375,7 +368,7 @@ static int sub_020676D4 (MapObject * param0) return 0; } -static void(*const Unk_020EF630[])(MapObject *) = { +static void (*const Unk_020EF630[])(MapObject *) = { sub_020674A0, sub_020674A0, sub_020674A0, @@ -390,7 +383,7 @@ static void(*const Unk_020EF630[])(MapObject *) = { sub_020674A0 }; -static int(*const Unk_020EF660[])(MapObject *) = { +static int (*const Unk_020EF660[])(MapObject *) = { sub_020674A4, sub_020674A4, sub_020674A4, @@ -405,7 +398,7 @@ static int(*const Unk_020EF660[])(MapObject *) = { sub_020674A4 }; -static int(*const Unk_020EF690[])(MapObject *) = { +static int (*const Unk_020EF690[])(MapObject *) = { sub_020674A8, sub_020674A8, sub_020674A8, diff --git a/src/unk_020677F4.c b/src/unk_020677F4.c index 492bbc7657..74c0a1e6b1 100644 --- a/src/unk_020677F4.c +++ b/src/unk_020677F4.c @@ -1,3 +1,5 @@ +#include "unk_020677F4.h" + #include #include @@ -5,18 +7,16 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "overlay005/const_ov5_021FB67C.h" - +#include "overlay005/ov5_021ECC20.h" +#include "overlay005/ov5_021ECE40.h" +#include "overlay005/ov5_021F204C.h" #include "overlay005/struct_ov5_021ED01C.h" #include "overlay005/struct_ov5_021FB67C.h" -#include "unk_02020AEC.h" -#include "unk_02055C50.h" #include "map_header_data.h" #include "map_object.h" -#include "unk_020677F4.h" -#include "overlay005/ov5_021ECC20.h" -#include "overlay005/ov5_021ECE40.h" -#include "overlay005/ov5_021F204C.h" +#include "unk_02020AEC.h" +#include "unk_02055C50.h" typedef struct { u16 unk_00; @@ -26,13 +26,13 @@ typedef struct { typedef struct { int unk_00; int unk_04; - UnkStruct_020216E0 * unk_08; + UnkStruct_020216E0 *unk_08; UnkStruct_ov5_021ED01C unk_0C; } UnkStruct_02067870; static int sub_020679FC(int param0, int param1); -int sub_020677F4 (int param0) +int sub_020677F4(int param0) { if (param0 == 0x64) { return 1; @@ -41,10 +41,10 @@ int sub_020677F4 (int param0) return 0; } -int sub_02067800 (const MapObject * param0) +int sub_02067800(const MapObject *param0) { { - UnkStruct_02067800 * v0 = sub_02062A78((MapObject *)param0); + UnkStruct_02067800 *v0 = sub_02062A78((MapObject *)param0); if (v0->unk_00 == 0) { return 0xffff; @@ -52,7 +52,7 @@ int sub_02067800 (const MapObject * param0) } if (sub_02062DFC(param0) == 1) { - UnkStruct_02067870 * v1 = sub_02062AF0((MapObject *)param0); + UnkStruct_02067870 *v1 = sub_02062AF0((MapObject *)param0); if (v1->unk_04 != 0) { return v1->unk_00; @@ -62,36 +62,36 @@ int sub_02067800 (const MapObject * param0) return 0xffff; } -void sub_02067834 (MapObject * param0) +void sub_02067834(MapObject *param0) { - UnkStruct_02067800 * v0 = sub_02062A78(param0); + UnkStruct_02067800 *v0 = sub_02062A78(param0); v0->unk_02 = 1; } -void sub_02067840 (MapObject * param0) +void sub_02067840(MapObject *param0) { - UnkStruct_02067800 * v0; + UnkStruct_02067800 *v0; v0 = sub_02062A54(param0, (sizeof(UnkStruct_02067800))); v0->unk_00 = 0; } -void sub_02067850 (MapObject * param0) +void sub_02067850(MapObject *param0) { - UnkStruct_02067800 * v0; + UnkStruct_02067800 *v0; v0 = sub_02062A78(param0); v0->unk_00 = sub_02055F00(MapObject_FieldSystem(param0), param0); } -void sub_0206786C (MapObject * param0) +void sub_0206786C(MapObject *param0) { return; } -void sub_02067870 (MapObject * param0) +void sub_02067870(MapObject *param0) { - UnkStruct_02067870 * v0 = sub_02062ACC(param0, (sizeof(UnkStruct_02067870))); + UnkStruct_02067870 *v0 = sub_02062ACC(param0, (sizeof(UnkStruct_02067870))); v0->unk_00 = 0xffff; v0->unk_04 = 0; @@ -99,10 +99,10 @@ void sub_02067870 (MapObject * param0) ov5_021F20D4(param0); } -void sub_02067890 (MapObject * param0) +void sub_02067890(MapObject *param0) { - UnkStruct_02067800 * v0 = sub_02062A78(param0); - UnkStruct_02067870 * v1 = sub_02062AF0(param0); + UnkStruct_02067800 *v0 = sub_02062A78(param0); + UnkStruct_02067870 *v1 = sub_02062AF0(param0); u32 v2 = sub_02055F00(MapObject_FieldSystem(param0), param0); if (ov5_021EDD94(param0) == 1) { @@ -147,15 +147,15 @@ void sub_02067890 (MapObject * param0) } } -void sub_02067950 (MapObject * param0) +void sub_02067950(MapObject *param0) { - UnkStruct_02067870 * v0 = sub_02062AF0(param0); + UnkStruct_02067870 *v0 = sub_02062AF0(param0); ov5_021ECFD8(param0, &v0->unk_08, v0->unk_00); } -void sub_02067968 (MapObject * param0) +void sub_02067968(MapObject *param0) { - UnkStruct_02067870 * v0 = sub_02062AF0(param0); + UnkStruct_02067870 *v0 = sub_02062AF0(param0); if (v0->unk_08 != NULL) { ov5_021ED01C(v0->unk_08, &v0->unk_0C); @@ -165,9 +165,9 @@ void sub_02067968 (MapObject * param0) MapObject_SetStatusFlagOn(param0, (1 << 21)); } -void sub_02067998 (MapObject * param0) +void sub_02067998(MapObject *param0) { - UnkStruct_02067870 * v0 = sub_02062AF0(param0); + UnkStruct_02067870 *v0 = sub_02062AF0(param0); if (ov5_021EDD94(param0) == 1) { return; @@ -190,23 +190,22 @@ void sub_02067998 (MapObject * param0) } } -static int sub_020679FC (int param0, int param1) +static int sub_020679FC(int param0, int param1) { switch (param1) { case 0: return 0xffff; case 1: return 0xffff; - default: - { + default: { param0--; { - const UnkStruct_ov5_021FB67C * v0 = &Unk_ov5_021FB67C[param0]; + const UnkStruct_ov5_021FB67C *v0 = &Unk_ov5_021FB67C[param0]; switch (param1) { case 2: - return(0x1000 + 0x0); + return 0x1000 + 0x0; case 3: return v0->unk_00; case 4: @@ -222,14 +221,14 @@ static int sub_020679FC (int param0, int param1) return 0xffff; } -UnkStruct_020216E0 * sub_02067A58 (MapObject * param0) +UnkStruct_020216E0 *sub_02067A58(MapObject *param0) { - UnkStruct_020216E0 * v0 = NULL; + UnkStruct_020216E0 *v0 = NULL; GF_ASSERT(sub_020677F4(sub_02062920(param0))); if (sub_02062D4C(param0) == 1) { - UnkStruct_02067870 * v1 = sub_02062AF0(param0); + UnkStruct_02067870 *v1 = sub_02062AF0(param0); v0 = v1->unk_08; } diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c index d106af72a1..5a2eaa3e23 100644 --- a/src/unk_02067A84.c +++ b/src/unk_02067A84.c @@ -1,27 +1,28 @@ +#include "unk_02067A84.h" + #include #include #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021ECC20.h" +#include "overlay005/ov5_021F5A10.h" +#include "overlay008/ov8_02249960.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" -#include "sys_task.h" #include "heap.h" -#include "sys_task_manager.h" -#include "unk_0203E880.h" -#include "player_avatar.h" #include "map_object.h" #include "map_object_move.h" +#include "player_avatar.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_0203E880.h" #include "unk_020655F4.h" -#include "unk_02067A84.h" #include "unk_020711EC.h" #include "unk_02071B10.h" -#include "overlay005/ov5_021ECC20.h" -#include "overlay005/ov5_021F5A10.h" -#include "overlay008/ov8_02249960.h" typedef struct { int unk_00; @@ -29,7 +30,7 @@ typedef struct { int unk_08; int unk_0C; int unk_10; - MapObject * unk_14; + MapObject *unk_14; } UnkStruct_02067C28; typedef struct { @@ -41,40 +42,40 @@ typedef struct { int unk_14; int unk_18; int unk_1C; - UnkStruct_ov101_021D5D90 * unk_20; - MapObject * unk_24; - PlayerAvatar * playerAvatar; - FieldSystem * fieldSystem; + UnkStruct_ov101_021D5D90 *unk_20; + MapObject *unk_24; + PlayerAvatar *playerAvatar; + FieldSystem *fieldSystem; } UnkStruct_020EF6D0; -static int sub_02067BA8(FieldSystem * fieldSystem, MapObjectManager * param1, PlayerAvatar * playerAvatar, const MapObject * param3, UnkStruct_02067C28 * param4); -static void sub_02067C28(UnkStruct_02067C28 * param0, MapObject * param1, int param2, int param3); -static int sub_02067C54(const MapObject * param0); -static int sub_02067C80(const MapObject * param0, PlayerAvatar * playerAvatar, int * param2); -static int sub_02067DA8(const MapObject * param0, int param1, int param2, int param3, int param4, int param5); -static int sub_02067E74(const MapObject * param0, int param1, int param2); -static int sub_02067F14(MapObject * param0); -static MapObject * sub_02067F2C(FieldSystem * fieldSystem, MapObjectManager * param1, MapObject * param2, int param3); -static SysTask * sub_02067FF0(FieldSystem * fieldSystem, MapObject * param1, PlayerAvatar * playerAvatar, int param3, int param4, int param5, int param6, int param7); -static int sub_02068048(SysTask * param0); -static void sub_02068054(SysTask * param0); -static void sub_0206806C(SysTask * param0, void * param1); +static int sub_02067BA8(FieldSystem *fieldSystem, MapObjectManager *param1, PlayerAvatar *playerAvatar, const MapObject *param3, UnkStruct_02067C28 *param4); +static void sub_02067C28(UnkStruct_02067C28 *param0, MapObject *param1, int param2, int param3); +static int sub_02067C54(const MapObject *param0); +static int sub_02067C80(const MapObject *param0, PlayerAvatar *playerAvatar, int *param2); +static int sub_02067DA8(const MapObject *param0, int param1, int param2, int param3, int param4, int param5); +static int sub_02067E74(const MapObject *param0, int param1, int param2); +static int sub_02067F14(MapObject *param0); +static MapObject *sub_02067F2C(FieldSystem *fieldSystem, MapObjectManager *param1, MapObject *param2, int param3); +static SysTask *sub_02067FF0(FieldSystem *fieldSystem, MapObject *param1, PlayerAvatar *playerAvatar, int param3, int param4, int param5, int param6, int param7); +static int sub_02068048(SysTask *param0); +static void sub_02068054(SysTask *param0); +static void sub_0206806C(SysTask *param0, void *param1); -int(*const Unk_020EF6C0[])(const MapObject *, int, int, int, int); -int(*const Unk_020EF6D0[])(UnkStruct_020EF6D0 *); +int (*const Unk_020EF6C0[])(const MapObject *, int, int, int, int); +int (*const Unk_020EF6D0[])(UnkStruct_020EF6D0 *); -int sub_02067A84 (FieldSystem * fieldSystem, BOOL param1) +int sub_02067A84(FieldSystem *fieldSystem, BOOL param1) { UnkStruct_02067C28 v0; - MapObjectManager * mapObjMan = fieldSystem->mapObjMan; - PlayerAvatar * playerAvatar = fieldSystem->playerAvatar; + MapObjectManager *mapObjMan = fieldSystem->mapObjMan; + PlayerAvatar *playerAvatar = fieldSystem->playerAvatar; if (sub_02067BA8(fieldSystem, mapObjMan, playerAvatar, NULL, &v0) == 0) { return 0; } if (v0.unk_10 == 0) { - MapObject * v3; + MapObject *v3; UnkStruct_02067C28 v4; sub_0203E880(fieldSystem, 3928, v0.unk_14); @@ -91,7 +92,7 @@ int sub_02067A84 (FieldSystem * fieldSystem, BOOL param1) } if (v0.unk_10 == 1) { - MapObject * v5; + MapObject *v5; UnkStruct_02067C28 v6; if (param1 == 0) { @@ -112,10 +113,10 @@ int sub_02067A84 (FieldSystem * fieldSystem, BOOL param1) return 0; } -static int sub_02067BA8 (FieldSystem * fieldSystem, MapObjectManager * param1, PlayerAvatar * playerAvatar, const MapObject * param3, UnkStruct_02067C28 * param4) +static int sub_02067BA8(FieldSystem *fieldSystem, MapObjectManager *param1, PlayerAvatar *playerAvatar, const MapObject *param3, UnkStruct_02067C28 *param4) { int v0, v1, v2; - MapObject * v3; + MapObject *v3; v0 = 0; v3 = NULL; @@ -137,7 +138,7 @@ static int sub_02067BA8 (FieldSystem * fieldSystem, MapObjectManager * param1, P return 0; } -static void sub_02067C28 (UnkStruct_02067C28 * param0, MapObject * param1, int param2, int param3) +static void sub_02067C28(UnkStruct_02067C28 *param0, MapObject *param1, int param2, int param3) { param0->unk_00 = param2; param0->unk_04 = param3; @@ -147,7 +148,7 @@ static void sub_02067C28 (UnkStruct_02067C28 * param0, MapObject * param1, int p param0->unk_14 = param1; } -static int sub_02067C54 (const MapObject * param0) +static int sub_02067C54(const MapObject *param0) { int v0 = MapObject_GetEventType(param0); @@ -164,7 +165,7 @@ static int sub_02067C54 (const MapObject * param0) return v0; } -static int sub_02067C80 (const MapObject * param0, PlayerAvatar * playerAvatar, int * param2) +static int sub_02067C80(const MapObject *param0, PlayerAvatar *playerAvatar, int *param2) { int v0, v1, v2, v3, v4, v5; @@ -184,7 +185,7 @@ static int sub_02067C80 (const MapObject * param0, PlayerAvatar * playerAvatar, } } - return(-1); + return -1; } if (v0 == 0x2) { @@ -206,13 +207,13 @@ static int sub_02067C80 (const MapObject * param0, PlayerAvatar * playerAvatar, v2++; } while (v2 < 4); - return(-1); + return -1; } - return(-1); + return -1; } -int sub_02067D58 (const MapObject * mapObj, PlayerAvatar * playerAvatar, int param2, int param3) +int sub_02067D58(const MapObject *mapObj, PlayerAvatar *playerAvatar, int param2, int param3) { int v0 = Player_GetXPos(playerAvatar); int v1 = Player_GetZPos(playerAvatar); @@ -227,12 +228,12 @@ int sub_02067D58 (const MapObject * mapObj, PlayerAvatar * playerAvatar, int par return v2; } -static int sub_02067DA8 (const MapObject * mapObj, int param1, int param2, int param3, int param4, int param5) +static int sub_02067DA8(const MapObject *mapObj, int param1, int param2, int param3, int param4, int param5) { return Unk_020EF6C0[param1](mapObj, param2, param3, param4, param5); } -static int sub_02067DC4 (const MapObject * mapObj, int param1, int param2, int param3, int param4) +static int sub_02067DC4(const MapObject *mapObj, int param1, int param2, int param3, int param4) { int v0, v1; @@ -246,10 +247,10 @@ static int sub_02067DC4 (const MapObject * mapObj, int param1, int param2, int p } } - return(-1); + return -1; } -static int sub_02067DF0 (const MapObject * mapObj, int param1, int param2, int param3, int param4) +static int sub_02067DF0(const MapObject *mapObj, int param1, int param2, int param3, int param4) { int v0, v1; @@ -263,10 +264,10 @@ static int sub_02067DF0 (const MapObject * mapObj, int param1, int param2, int p } } - return(-1); + return -1; } -static int sub_02067E1C (const MapObject * mapObj, int param1, int param2, int param3, int param4) +static int sub_02067E1C(const MapObject *mapObj, int param1, int param2, int param3, int param4) { int v0, v1; @@ -280,10 +281,10 @@ static int sub_02067E1C (const MapObject * mapObj, int param1, int param2, int p } } - return(-1); + return -1; } -static int sub_02067E48 (const MapObject * mapObj, int param1, int param2, int param3, int param4) +static int sub_02067E48(const MapObject *mapObj, int param1, int param2, int param3, int param4) { int v0, v1; @@ -297,17 +298,17 @@ static int sub_02067E48 (const MapObject * mapObj, int param1, int param2, int p } } - return(-1); + return -1; } -static int(*const Unk_020EF6C0[])(const MapObject *, int, int, int, int) = { +static int (*const Unk_020EF6C0[])(const MapObject *, int, int, int, int) = { sub_02067DC4, sub_02067DF0, sub_02067E1C, sub_02067E48 }; -static int sub_02067E74 (const MapObject * mapObj, int param1, int param2) +static int sub_02067E74(const MapObject *mapObj, int param1, int param2) { int v0, v1, v2, v3; u32 v4; @@ -344,7 +345,7 @@ static int sub_02067E74 (const MapObject * mapObj, int param1, int param2) return 1; } -static int sub_02067F14 (MapObject * mapObj) +static int sub_02067F14(MapObject *mapObj) { int v0; @@ -352,15 +353,15 @@ static int sub_02067F14 (MapObject * mapObj) return Script_GetTrainerID(v0); } -int sub_02067F24 (MapObject * mapObj) +int sub_02067F24(MapObject *mapObj) { return sub_02067F14(mapObj); } -static MapObject * sub_02067F2C (FieldSystem * fieldSystem, MapObjectManager * param1, MapObject * param2, int param3) +static MapObject *sub_02067F2C(FieldSystem *fieldSystem, MapObjectManager *param1, MapObject *param2, int param3) { int v0; - MapObject * v1; + MapObject *v1; v0 = 0; @@ -380,7 +381,7 @@ static MapObject * sub_02067F2C (FieldSystem * fieldSystem, MapObjectManager * p return NULL; } -int sub_02067F88 (FieldSystem * fieldSystem, MapObject * param1) +int sub_02067F88(FieldSystem *fieldSystem, MapObject *param1) { int v0 = sub_02067C54(param1); @@ -393,26 +394,26 @@ int sub_02067F88 (FieldSystem * fieldSystem, MapObject * param1) return 0; } -SysTask * sub_02067FB8 (FieldSystem * fieldSystem, MapObject * param1, PlayerAvatar * playerAvatar, int param3, int param4, int param5, int param6, int param7) +SysTask *sub_02067FB8(FieldSystem *fieldSystem, MapObject *param1, PlayerAvatar *playerAvatar, int param3, int param4, int param5, int param6, int param7) { return sub_02067FF0(fieldSystem, param1, playerAvatar, param3, param4, param5, param6, param7); } -int sub_02067FD4 (SysTask * task) +int sub_02067FD4(SysTask *task) { GF_ASSERT(task != NULL); return sub_02068048(task); } -void sub_02067FE8 (SysTask * task) +void sub_02067FE8(SysTask *task) { sub_02068054(task); } -static SysTask * sub_02067FF0 (FieldSystem * fieldSystem, MapObject * param1, PlayerAvatar * playerAvatar, int param3, int param4, int param5, int param6, int param7) +static SysTask *sub_02067FF0(FieldSystem *fieldSystem, MapObject *param1, PlayerAvatar *playerAvatar, int param3, int param4, int param5, int param6, int param7) { - SysTask * v0; - UnkStruct_020EF6D0 * v1; + SysTask *v0; + UnkStruct_020EF6D0 *v1; v1 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_020EF6D0))); GF_ASSERT(v1 != NULL); @@ -434,17 +435,17 @@ static SysTask * sub_02067FF0 (FieldSystem * fieldSystem, MapObject * param1, Pl return v0; } -static int sub_02068048 (SysTask * task) +static int sub_02068048(SysTask *task) { - UnkStruct_020EF6D0 * v0; + UnkStruct_020EF6D0 *v0; v0 = SysTask_GetParam(task); return v0->unk_04; } -static void sub_02068054 (SysTask * task) +static void sub_02068054(SysTask *task) { - UnkStruct_020EF6D0 * v0; + UnkStruct_020EF6D0 *v0; v0 = SysTask_GetParam(task); @@ -452,9 +453,9 @@ static void sub_02068054 (SysTask * task) SysTask_Done(task); } -static void sub_0206806C (SysTask * task, void * param1) +static void sub_0206806C(SysTask *task, void *param1) { - UnkStruct_020EF6D0 * v0; + UnkStruct_020EF6D0 *v0; v0 = param1; @@ -463,9 +464,9 @@ static void sub_0206806C (SysTask * task, void * param1) } } -static int sub_02068088 (UnkStruct_020EF6D0 * param0) +static int sub_02068088(UnkStruct_020EF6D0 *param0) { - MapObject * v0 = param0->unk_24; + MapObject *v0 = param0->unk_24; if (MapObject_IsMoving(v0) == 1) { sub_02062DDC(v0); @@ -475,9 +476,9 @@ static int sub_02068088 (UnkStruct_020EF6D0 * param0) return 1; } -static int sub_020680A4 (UnkStruct_020EF6D0 * param0) +static int sub_020680A4(UnkStruct_020EF6D0 *param0) { - MapObject * v0 = param0->unk_24; + MapObject *v0 = param0->unk_24; if (MapObject_IsMoving(v0) == 1) { return 0; @@ -490,9 +491,9 @@ static int sub_020680A4 (UnkStruct_020EF6D0 * param0) return 1; } -static int sub_020680D0 (UnkStruct_020EF6D0 * param0) +static int sub_020680D0(UnkStruct_020EF6D0 *param0) { - MapObject * v0 = Player_MapObject(param0->playerAvatar); + MapObject *v0 = Player_MapObject(param0->playerAvatar); if (LocalMapObj_CheckAnimationFinished(v0) == 0) { return 0; @@ -515,7 +516,7 @@ static int sub_020680D0 (UnkStruct_020EF6D0 * param0) return 1; } -static int sub_02068118 (UnkStruct_020EF6D0 * param0) +static int sub_02068118(UnkStruct_020EF6D0 *param0) { int v0; @@ -532,7 +533,7 @@ static int sub_02068118 (UnkStruct_020EF6D0 * param0) return 0; } -static int sub_02068150 (UnkStruct_020EF6D0 * param0) +static int sub_02068150(UnkStruct_020EF6D0 *param0) { if (LocalMapObj_CheckAnimationFinished(param0->unk_24) == 0) { return 0; @@ -542,7 +543,7 @@ static int sub_02068150 (UnkStruct_020EF6D0 * param0) return 1; } -static int sub_0206816C (UnkStruct_020EF6D0 * param0) +static int sub_0206816C(UnkStruct_020EF6D0 *param0) { param0->unk_20 = ov5_021F5D8C(param0->unk_24, 0, 0, 0); param0->unk_00 = 6; @@ -550,7 +551,7 @@ static int sub_0206816C (UnkStruct_020EF6D0 * param0) return 0; } -static int sub_02068188 (UnkStruct_020EF6D0 * param0) +static int sub_02068188(UnkStruct_020EF6D0 *param0) { if (ov5_021F5C4C(param0->unk_20) == 1) { sub_0207136C(param0->unk_20); @@ -560,7 +561,7 @@ static int sub_02068188 (UnkStruct_020EF6D0 * param0) return 0; } -static int sub_020681A4 (UnkStruct_020EF6D0 * param0) +static int sub_020681A4(UnkStruct_020EF6D0 *param0) { LocalMapObj_SetAnimationCode(param0->unk_24, 0x65); param0->unk_00 = 8; @@ -568,7 +569,7 @@ static int sub_020681A4 (UnkStruct_020EF6D0 * param0) return 0; } -static int sub_020681B8 (UnkStruct_020EF6D0 * param0) +static int sub_020681B8(UnkStruct_020EF6D0 *param0) { if (LocalMapObj_CheckAnimationFinished(param0->unk_24) == 1) { param0->unk_00 = 9; @@ -577,7 +578,7 @@ static int sub_020681B8 (UnkStruct_020EF6D0 * param0) return 0; } -static int sub_020681D0 (UnkStruct_020EF6D0 * param0) +static int sub_020681D0(UnkStruct_020EF6D0 *param0) { param0->unk_1C++; @@ -589,7 +590,7 @@ static int sub_020681D0 (UnkStruct_020EF6D0 * param0) return 0; } -static int sub_020681E8 (UnkStruct_020EF6D0 * param0) +static int sub_020681E8(UnkStruct_020EF6D0 *param0) { if (param0->unk_0C <= 1) { param0->unk_00 = 13; @@ -600,7 +601,7 @@ static int sub_020681E8 (UnkStruct_020EF6D0 * param0) return 1; } -static int sub_02068200 (UnkStruct_020EF6D0 * param0) +static int sub_02068200(UnkStruct_020EF6D0 *param0) { int v0; @@ -613,7 +614,7 @@ static int sub_02068200 (UnkStruct_020EF6D0 * param0) return 0; } -static int sub_02068228 (UnkStruct_020EF6D0 * param0) +static int sub_02068228(UnkStruct_020EF6D0 *param0) { if (LocalMapObj_CheckAnimationFinished(param0->unk_24) == 0) { return 0; @@ -625,7 +626,7 @@ static int sub_02068228 (UnkStruct_020EF6D0 * param0) return 1; } -static int sub_02068248 (UnkStruct_020EF6D0 * param0) +static int sub_02068248(UnkStruct_020EF6D0 *param0) { param0->unk_1C++; @@ -639,10 +640,10 @@ static int sub_02068248 (UnkStruct_020EF6D0 * param0) return 1; } -static int sub_02068264 (UnkStruct_020EF6D0 * param0) +static int sub_02068264(UnkStruct_020EF6D0 *param0) { int v0, v1; - MapObject * v2; + MapObject *v2; v2 = Player_MapObject(param0->playerAvatar); v1 = sub_02064488(MapObject_GetXPos(v2), MapObject_GetZPos(v2), MapObject_GetXPos(param0->unk_24), MapObject_GetZPos(param0->unk_24)); @@ -661,9 +662,9 @@ static int sub_02068264 (UnkStruct_020EF6D0 * param0) return 0; } -static int sub_020682E0 (UnkStruct_020EF6D0 * param0) +static int sub_020682E0(UnkStruct_020EF6D0 *param0) { - MapObject * v0; + MapObject *v0; v0 = Player_MapObject(param0->playerAvatar); @@ -677,7 +678,7 @@ static int sub_020682E0 (UnkStruct_020EF6D0 * param0) return 1; } -static int sub_02068308 (UnkStruct_020EF6D0 * param0) +static int sub_02068308(UnkStruct_020EF6D0 *param0) { sub_020656AC(param0->unk_24); @@ -689,13 +690,13 @@ static int sub_02068308 (UnkStruct_020EF6D0 * param0) return 1; } -static int sub_0206833C (UnkStruct_020EF6D0 * param0) +static int sub_0206833C(UnkStruct_020EF6D0 *param0) { param0->unk_04 = 1; return 0; } -static int(*const Unk_020EF6D0[])(UnkStruct_020EF6D0 *) = { +static int (*const Unk_020EF6D0[])(UnkStruct_020EF6D0 *) = { sub_02068088, sub_020680A4, sub_020680D0, diff --git a/src/unk_02068344.c b/src/unk_02068344.c index cb7cdf7850..df9287974b 100644 --- a/src/unk_02068344.c +++ b/src/unk_02068344.c @@ -1,24 +1,24 @@ +#include "unk_02068344.h" + #include #include #include "struct_decls/struct_02027860_decl.h" #include "field/field_system.h" - #include "functypes/funcptr_020EF718.h" #include "functypes/funcptr_020EF744.h" #include "functypes/funcptr_020EF770.h" - -#include "savedata_misc.h" -#include "unk_02027F50.h" -#include "field_system.h" -#include "unk_02068344.h" -#include "unk_0207160C.h" #include "overlay005/ov5_021F8370.h" #include "overlay006/ov6_02242AF0.h" #include "overlay008/ov8_02249960.h" #include "overlay009/ov9_02249960.h" +#include "field_system.h" +#include "savedata_misc.h" +#include "unk_02027F50.h" +#include "unk_0207160C.h" + const static UnkFuncPtr_020EF744 Unk_020EF744[11] = { NULL, ov8_02249DBC, @@ -61,10 +61,10 @@ const static UnkFuncPtr_020EF770 Unk_020EF770[11] = { ov5_021F83D4 }; -void sub_02068344 (FieldSystem * fieldSystem) +void sub_02068344(FieldSystem *fieldSystem) { int v0; - UnkStruct_02027860 * v1; + UnkStruct_02027860 *v1; v1 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v0 = sub_02027F80(v1); @@ -76,10 +76,10 @@ void sub_02068344 (FieldSystem * fieldSystem) Unk_020EF744[v0](fieldSystem); } -void sub_02068368 (FieldSystem * fieldSystem) +void sub_02068368(FieldSystem *fieldSystem) { int v0; - UnkStruct_02027860 * v1; + UnkStruct_02027860 *v1; v1 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v0 = sub_02027F80(v1); @@ -93,10 +93,10 @@ void sub_02068368 (FieldSystem * fieldSystem) } } -BOOL sub_02068390 (FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, BOOL * param4) +BOOL sub_02068390(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, BOOL *param4) { int v0; - UnkStruct_02027860 * v1; + UnkStruct_02027860 *v1; v1 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v0 = sub_02027F80(v1); @@ -115,7 +115,7 @@ BOOL sub_02068390 (FieldSystem * fieldSystem, const int param1, const int param2 return 0; } -BOOL sub_020683D8 (FieldSystem * fieldSystem, const int param1, const int param2, const fx32 param3, int param4) +BOOL sub_020683D8(FieldSystem *fieldSystem, const int param1, const int param2, const fx32 param3, int param4) { if (fieldSystem->location->mapId == 67) { if (ov8_0224B714(fieldSystem, param1, param2, param4)) { diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 7e35d0fc9f..4b5d5f5f4c 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -1,84 +1,83 @@ +#include "unk_020683F4.h" + #include #include -#include "core_sys.h" - -#include "strbuf.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay005/struct_ov5_021F0468_decl.h" - -#include "constdata/const_020F1E88.h" - -#include "game_options.h" -#include "functypes/funcptr_0203BC5C.h" -#include "field/field_system.h" #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_020684D0.h" #include "struct_defs/struct_02068630.h" -#include "functypes/funcptr_02069238.h" #include "struct_defs/struct_020708E0.h" #include "struct_defs/struct_02097728.h" #include "struct_defs/struct_02098C44.h" +#include "field/field_system.h" +#include "functypes/funcptr_0203BC5C.h" +#include "functypes/funcptr_02069238.h" +#include "overlay005/ov5_021D0D80.h" +#include "overlay005/ov5_021DFB54.h" +#include "overlay005/ov5_021E1D20.h" +#include "overlay005/ov5_021F007C.h" +#include "overlay005/ov5_021F08CC.h" +#include "overlay005/struct_ov5_021F0468_decl.h" +#include "overlay006/ov6_02247100.h" +#include "savedata/save_table.h" + +#include "bag.h" +#include "core_sys.h" +#include "field_map_change.h" +#include "field_menu.h" +#include "field_system.h" +#include "game_options.h" +#include "heap.h" +#include "item.h" +#include "map_header.h" +#include "map_header_data.h" +#include "map_object.h" +#include "map_object_move.h" +#include "party.h" +#include "player_avatar.h" +#include "pokeradar.h" +#include "strbuf.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "strbuf.h" -#include "savedata/save_table.h" #include "unk_02025E08.h" #include "unk_0202631C.h" #include "unk_02028124.h" -#include "map_header.h" -#include "map_header_data.h" -#include "field_menu.h" #include "unk_0203C954.h" -#include "field_system.h" #include "unk_0203D1B8.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_020508D4.h" -#include "field_map_change.h" #include "unk_02054D00.h" #include "unk_020553DC.h" #include "unk_02055C50.h" #include "unk_0205D8CC.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" #include "unk_0205F180.h" -#include "map_object.h" -#include "map_object_move.h" -#include "unk_020683F4.h" -#include "pokeradar.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" #include "unk_0206B9D8.h" -#include "party.h" #include "unk_0207CB08.h" -#include "item.h" -#include "bag.h" #include "unk_020989DC.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay005/ov5_021DFB54.h" -#include "overlay005/ov5_021E1D20.h" -#include "overlay005/ov5_021F007C.h" -#include "overlay005/ov5_021F08CC.h" -#include "overlay006/ov6_02247100.h" +#include "vars_flags.h" + +#include "constdata/const_020F1E88.h" -typedef void *(* UnkFuncPtr_02068870)(void *); +typedef void *(*UnkFuncPtr_02068870)(void *); typedef struct { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; UnkStruct_020684D0 unk_04; UnkFuncPtr_02068870 unk_20; - void * unk_24; + void *unk_24; u16 unk_28; u8 unk_2A; } UnkStruct_02068870; -typedef BOOL (* UnkFuncPtr_020EF79C)(UnkStruct_02068870 *); +typedef BOOL (*UnkFuncPtr_020EF79C)(UnkStruct_02068870 *); typedef struct { UnkFuncPtr_0203BC5C unk_00; @@ -96,105 +95,105 @@ typedef struct { typedef struct { Window unk_00; - Strbuf* unk_10; + Strbuf *unk_10; u16 unk_14; u16 unk_16; } UnkStruct_02068EFC; -void * sub_0203D8AC(FieldSystem * fieldSystem); -static void sub_020684D0(FieldSystem * fieldSystem, UnkStruct_020684D0 * param1); -static void sub_02068630(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_020686C8(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068710(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_0206883C(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_020689EC(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068A34(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068ACC(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068B1C(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068B5C(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068BA8(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068BF8(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068C94(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068CD0(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068CF0(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068D48(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068D80(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068DDC(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068E38(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02068FEC(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02069080(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02069110(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_02069188(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static void sub_020691E0(UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1); -static BOOL sub_02068870(UnkStruct_02068870 * param0); -static BOOL sub_02068A18(UnkStruct_02068870 * param0); -static BOOL sub_02068DBC(UnkStruct_02068870 * param0); -static BOOL sub_02068E18(UnkStruct_02068870 * param0); -static BOOL sub_02068E74(UnkStruct_02068870 * param0); -static BOOL sub_02068EFC(UnkStruct_02068870 * param0); -static BOOL sub_020686F8(UnkStruct_02068870 * param0); -static BOOL sub_02068B8C(UnkStruct_02068870 * param0); -static BOOL sub_02068BDC(UnkStruct_02068870 * param0); -static BOOL sub_02068750(UnkStruct_02068870 * param0); -static BOOL sub_02068C38(UnkStruct_02068870 * param0); -static BOOL sub_02068CA4(UnkStruct_02068870 * param0); -static BOOL sub_02068D58(UnkStruct_02068870 * param0); -static BOOL sub_02069120(UnkStruct_02068870 * param0); -static BOOL sub_020691BC(UnkStruct_02068870 * param0); -static BOOL sub_02069218(UnkStruct_02068870 * param0); -static void * sub_02068BEC(void * param0); -static void * sub_02068B9C(void * param0); -static void * sub_02068708(void * param0); -static void * sub_02068A28(void * param0); -static void * sub_020691CC(void * param0); -static void * sub_02069228(void * param0); -static u32 sub_02068948(const UnkStruct_020684D0 * param0); -static u32 sub_0206877C(const UnkStruct_020684D0 * param0); -static u32 sub_02068B18(const UnkStruct_020684D0 * param0); -static u32 sub_02068C5C(const UnkStruct_020684D0 * param0); -static u32 sub_02068CB4(const UnkStruct_020684D0 * param0); -static u32 sub_02068CE0(const UnkStruct_020684D0 * param0); -static u32 sub_02068D68(const UnkStruct_020684D0 * param0); -static u32 sub_02068E94(const UnkStruct_020684D0 * param0); -static u32 sub_020690C4(const UnkStruct_020684D0 * param0); -static u32 sub_02069130(const UnkStruct_020684D0 * param0); -static BOOL sub_02068884(TaskManager * param0); -static BOOL sub_02068F48(TaskManager * param0); -static void sub_020693F8(UnkStruct_02068870 * param0, UnkFuncPtr_02068870 param1); -static BOOL sub_0206932C(TaskManager * param0); -static BOOL sub_020690F0(TaskManager * param0); -static BOOL sub_020685AC(TaskManager * param0); -static void sub_020692E4(UnkStruct_02068870 * param0, u32 param1); +void *sub_0203D8AC(FieldSystem *fieldSystem); +static void sub_020684D0(FieldSystem *fieldSystem, UnkStruct_020684D0 *param1); +static void sub_02068630(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_020686C8(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068710(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_0206883C(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_020689EC(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068A34(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068ACC(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068B1C(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068B5C(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068BA8(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068BF8(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068C94(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068CD0(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068CF0(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068D48(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068D80(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068DDC(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068E38(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02068FEC(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02069080(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02069110(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_02069188(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static void sub_020691E0(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1); +static BOOL sub_02068870(UnkStruct_02068870 *param0); +static BOOL sub_02068A18(UnkStruct_02068870 *param0); +static BOOL sub_02068DBC(UnkStruct_02068870 *param0); +static BOOL sub_02068E18(UnkStruct_02068870 *param0); +static BOOL sub_02068E74(UnkStruct_02068870 *param0); +static BOOL sub_02068EFC(UnkStruct_02068870 *param0); +static BOOL sub_020686F8(UnkStruct_02068870 *param0); +static BOOL sub_02068B8C(UnkStruct_02068870 *param0); +static BOOL sub_02068BDC(UnkStruct_02068870 *param0); +static BOOL sub_02068750(UnkStruct_02068870 *param0); +static BOOL sub_02068C38(UnkStruct_02068870 *param0); +static BOOL sub_02068CA4(UnkStruct_02068870 *param0); +static BOOL sub_02068D58(UnkStruct_02068870 *param0); +static BOOL sub_02069120(UnkStruct_02068870 *param0); +static BOOL sub_020691BC(UnkStruct_02068870 *param0); +static BOOL sub_02069218(UnkStruct_02068870 *param0); +static void *sub_02068BEC(void *param0); +static void *sub_02068B9C(void *param0); +static void *sub_02068708(void *param0); +static void *sub_02068A28(void *param0); +static void *sub_020691CC(void *param0); +static void *sub_02069228(void *param0); +static u32 sub_02068948(const UnkStruct_020684D0 *param0); +static u32 sub_0206877C(const UnkStruct_020684D0 *param0); +static u32 sub_02068B18(const UnkStruct_020684D0 *param0); +static u32 sub_02068C5C(const UnkStruct_020684D0 *param0); +static u32 sub_02068CB4(const UnkStruct_020684D0 *param0); +static u32 sub_02068CE0(const UnkStruct_020684D0 *param0); +static u32 sub_02068D68(const UnkStruct_020684D0 *param0); +static u32 sub_02068E94(const UnkStruct_020684D0 *param0); +static u32 sub_020690C4(const UnkStruct_020684D0 *param0); +static u32 sub_02069130(const UnkStruct_020684D0 *param0); +static BOOL sub_02068884(TaskManager *param0); +static BOOL sub_02068F48(TaskManager *param0); +static void sub_020693F8(UnkStruct_02068870 *param0, UnkFuncPtr_02068870 param1); +static BOOL sub_0206932C(TaskManager *param0); +static BOOL sub_020690F0(TaskManager *param0); +static BOOL sub_020685AC(TaskManager *param0); +static void sub_020692E4(UnkStruct_02068870 *param0, u32 param1); static const UnkStruct_020EF79C Unk_020EF79C[] = { - {NULL, sub_02068EFC, NULL}, - {sub_02068630, NULL, NULL}, - {sub_020686C8, sub_020686F8, NULL}, - {sub_02068710, sub_02068750, sub_0206877C}, - {sub_0206883C, sub_02068870, sub_02068948}, - {sub_020689EC, sub_02068A18, NULL}, - {sub_02068A34, NULL, NULL}, - {sub_02068ACC, NULL, NULL}, - {sub_02068B1C, NULL, sub_02068B18}, - {sub_02068B5C, sub_02068B8C, NULL}, - {sub_02068BA8, sub_02068BDC, NULL}, - {sub_02068BF8, sub_02068C38, sub_02068C5C}, - {sub_02068C94, sub_02068CA4, sub_02068CB4}, - {sub_02068CD0, NULL, sub_02068CE0}, - {sub_02068CF0, NULL, NULL}, - {sub_02068D48, sub_02068D58, sub_02068D68}, - {sub_02068D80, sub_02068DBC, sub_02068E94}, - {sub_02068DDC, sub_02068E18, sub_02068E94}, - {sub_02068E38, sub_02068E74, sub_02068E94}, - {NULL, sub_02068EFC, NULL}, - {sub_02068FEC, NULL, NULL}, - {sub_02069080, NULL, sub_020690C4}, - {sub_02069110, sub_02069120, sub_02069130}, - {sub_02069188, sub_020691BC, NULL}, - {sub_020691E0, sub_02069218, NULL} + { NULL, sub_02068EFC, NULL }, + { sub_02068630, NULL, NULL }, + { sub_020686C8, sub_020686F8, NULL }, + { sub_02068710, sub_02068750, sub_0206877C }, + { sub_0206883C, sub_02068870, sub_02068948 }, + { sub_020689EC, sub_02068A18, NULL }, + { sub_02068A34, NULL, NULL }, + { sub_02068ACC, NULL, NULL }, + { sub_02068B1C, NULL, sub_02068B18 }, + { sub_02068B5C, sub_02068B8C, NULL }, + { sub_02068BA8, sub_02068BDC, NULL }, + { sub_02068BF8, sub_02068C38, sub_02068C5C }, + { sub_02068C94, sub_02068CA4, sub_02068CB4 }, + { sub_02068CD0, NULL, sub_02068CE0 }, + { sub_02068CF0, NULL, NULL }, + { sub_02068D48, sub_02068D58, sub_02068D68 }, + { sub_02068D80, sub_02068DBC, sub_02068E94 }, + { sub_02068DDC, sub_02068E18, sub_02068E94 }, + { sub_02068E38, sub_02068E74, sub_02068E94 }, + { NULL, sub_02068EFC, NULL }, + { sub_02068FEC, NULL, NULL }, + { sub_02069080, NULL, sub_020690C4 }, + { sub_02069110, sub_02069120, sub_02069130 }, + { sub_02069188, sub_020691BC, NULL }, + { sub_020691E0, sub_02069218, NULL } }; -u32 sub_020683F4 (u16 param0, u16 param1) +u32 sub_020683F4(u16 param0, u16 param1) { if (param0 == 0) { return (u32)Unk_020EF79C[param1].unk_00; @@ -205,10 +204,10 @@ u32 sub_020683F4 (u16 param0, u16 param1) return (u32)Unk_020EF79C[param1].unk_08; } -void sub_0206842C (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1) +void sub_0206842C(FieldSystem *fieldSystem, UnkStruct_020684D0 *param1) { int v0, v1, v2; - MapObject * v3; + MapObject *v3; if (PlayerAvatar_DistortionGravityChanged(fieldSystem->playerAvatar) == TRUE) { sub_020684D0(fieldSystem, param1); @@ -249,7 +248,7 @@ void sub_0206842C (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1) param1->playerAvatar = fieldSystem->playerAvatar; } -static void sub_020684D0 (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1) +static void sub_020684D0(FieldSystem *fieldSystem, UnkStruct_020684D0 *param1) { param1->fieldSystem = fieldSystem; param1->unk_00 = fieldSystem->location->mapId; @@ -266,9 +265,9 @@ static void sub_020684D0 (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1 param1->playerAvatar = fieldSystem->playerAvatar; } -static UnkStruct_0206851C * sub_0206851C (u32 param0, u16 param1, u16 param2, u16 param3, u16 param4) +static UnkStruct_0206851C *sub_0206851C(u32 param0, u16 param1, u16 param2, u16 param3, u16 param4) { - UnkStruct_0206851C * v0; + UnkStruct_0206851C *v0; v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0206851C)); @@ -281,10 +280,10 @@ static UnkStruct_0206851C * sub_0206851C (u32 param0, u16 param1, u16 param2, u1 return v0; } -static void sub_02068540 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1, u32 param2) +static void sub_02068540(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1, u32 param2) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -296,18 +295,18 @@ static void sub_02068540 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 v1->state = FIELD_MENU_STATE_10; } -static void sub_02068584 (UnkStruct_02068870 * param0, u32 param1) +static void sub_02068584(UnkStruct_02068870 *param0, u32 param1) { - void * v0 = sub_0206851C(param1, param0->unk_28, 0, 0, 0); + void *v0 = sub_0206851C(param1, param0->unk_28, 0, 0, 0); FieldTask_Set(param0->fieldSystem, sub_020685AC, v0); } -static BOOL sub_020685AC (TaskManager * taskMan) +static BOOL sub_020685AC(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_0206851C * v1 = TaskManager_Environment(taskMan); - int * v2 = FieldTask_GetState(taskMan); - MapObject * v3; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0206851C *v1 = TaskManager_Environment(taskMan); + int *v2 = FieldTask_GetState(taskMan); + MapObject *v3; switch (*v2) { case 0: @@ -329,11 +328,11 @@ static BOOL sub_020685AC (TaskManager * taskMan) return 0; } -static void sub_02068630 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068630(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; - PartyManagementData * v2; + FieldSystem *fieldSystem; + FieldMenu *v1; + PartyManagementData *v2; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -358,10 +357,10 @@ static void sub_02068630 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 sub_0203B674(v1, sub_0203B7C0); } -static void sub_020686C8 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_020686C8(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -370,21 +369,21 @@ static void sub_020686C8 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 sub_0203B674(v1, sub_0203C3F4); } -static BOOL sub_020686F8 (UnkStruct_02068870 * param0) +static BOOL sub_020686F8(UnkStruct_02068870 *param0) { sub_020693F8(param0, sub_02068708); return 1; } -static void * sub_02068708 (void * param0) +static void *sub_02068708(void *param0) { return sub_0203D8AC(param0); } -static void sub_02068710 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068710(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -398,9 +397,9 @@ static void sub_02068710 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 fieldSystem->unk_90 = 0; } -static BOOL sub_02068750 (UnkStruct_02068870 * param0) +static BOOL sub_02068750(UnkStruct_02068870 *param0) { - void * v0 = sub_02053FAC(param0->fieldSystem); + void *v0 = sub_02053FAC(param0->fieldSystem); MapObjectMan_PauseAllMovement(param0->fieldSystem->mapObjMan); FieldTask_Set(param0->fieldSystem, sub_02054084, v0); @@ -409,7 +408,7 @@ static BOOL sub_02068750 (UnkStruct_02068870 * param0) return 0; } -static u32 sub_0206877C (const UnkStruct_020684D0 * param0) +static u32 sub_0206877C(const UnkStruct_020684D0 *param0) { if (MapHeader_GetMapLabelTextID(param0->unk_00) == 0) { return -1; @@ -453,10 +452,10 @@ static u32 sub_0206877C (const UnkStruct_020684D0 * param0) return 0; } -static void sub_0206883C (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_0206883C(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -468,16 +467,16 @@ static void sub_0206883C (UnkStruct_02068630 * param0, const UnkStruct_020684D0 v1->state = FIELD_MENU_STATE_10; } -static BOOL sub_02068870 (UnkStruct_02068870 * param0) +static BOOL sub_02068870(UnkStruct_02068870 *param0) { FieldTask_Set(param0->fieldSystem, sub_02068884, NULL); return 0; } -static BOOL sub_02068884 (TaskManager * param0) +static BOOL sub_02068884(TaskManager *param0) { - FieldSystem * fieldSystem; - int * v1; + FieldSystem *fieldSystem; + int *v1; fieldSystem = TaskManager_FieldSystem(param0); v1 = FieldTask_GetState(param0); @@ -519,9 +518,9 @@ static BOOL sub_02068884 (TaskManager * param0) return 0; } -static u32 sub_02068948 (const UnkStruct_020684D0 * param0) +static u32 sub_02068948(const UnkStruct_020684D0 *param0) { - VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); if (param0->unk_04 == 1) { return 2; @@ -536,7 +535,7 @@ static u32 sub_02068948 (const UnkStruct_020684D0 * param0) } { - MapObject * v1 = Player_MapObject(param0->playerAvatar); + MapObject *v1 = Player_MapObject(param0->playerAvatar); if ((sub_0206415C(v1, param0->unk_0E) == 1) || (sub_0206417C(v1, param0->unk_0E) == 1)) { return 1; @@ -558,10 +557,10 @@ static u32 sub_02068948 (const UnkStruct_020684D0 * param0) return 0; } -static void sub_020689EC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_020689EC(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -570,23 +569,23 @@ static void sub_020689EC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 sub_0203B674(v1, sub_0203C50C); } -static BOOL sub_02068A18 (UnkStruct_02068870 * param0) +static BOOL sub_02068A18(UnkStruct_02068870 *param0) { sub_020693F8(param0, sub_02068A28); return 1; } -static void * sub_02068A28 (void * param0) +static void *sub_02068A28(void *param0) { sub_0203D30C(param0, NULL); return NULL; } -static void sub_02068A34 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068A34(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; - PartyManagementData * v2; + FieldSystem *fieldSystem; + FieldMenu *v1; + PartyManagementData *v2; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -611,11 +610,11 @@ static void sub_02068A34 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 sub_0203B674(v1, sub_0203B7C0); } -static void sub_02068ACC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068ACC(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; - UnkStruct_02097728 * v2; + FieldSystem *fieldSystem; + FieldMenu *v1; + UnkStruct_02097728 *v2; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -627,16 +626,16 @@ static void sub_02068ACC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 sub_0203B674(v1, sub_0203C558); } -static u32 sub_02068B18 (const UnkStruct_020684D0 * param0) +static u32 sub_02068B18(const UnkStruct_020684D0 *param0) { return 0; } -static void sub_02068B1C (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068B1C(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; - MapObject * v2; + FieldSystem *fieldSystem; + FieldMenu *v1; + MapObject *v2; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -648,7 +647,7 @@ static void sub_02068B1C (UnkStruct_02068630 * param0, const UnkStruct_020684D0 } } -BOOL sub_02068B50 (const UnkStruct_020684D0 * param0) +BOOL sub_02068B50(const UnkStruct_020684D0 *param0) { if (param0->unk_10 & 0x1) { return 1; @@ -657,11 +656,11 @@ BOOL sub_02068B50 (const UnkStruct_020684D0 * param0) return 0; } -static void sub_02068B5C (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068B5C(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; - UnkStruct_0203D9B8 * v2; + FieldSystem *fieldSystem; + FieldMenu *v1; + UnkStruct_0203D9B8 *v2; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -671,21 +670,21 @@ static void sub_02068B5C (UnkStruct_02068630 * param0, const UnkStruct_020684D0 sub_0203B674(v1, sub_0203C710); } -static BOOL sub_02068B8C (UnkStruct_02068870 * param0) +static BOOL sub_02068B8C(UnkStruct_02068870 *param0) { sub_020693F8(param0, sub_02068B9C); return 1; } -static void * sub_02068B9C (void * param0) +static void *sub_02068B9C(void *param0) { return sub_0203D9B8(param0, 11); } -static void sub_02068BA8 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068BA8(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -695,23 +694,23 @@ static void sub_02068BA8 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 sub_0203B674(v1, sub_0203C750); } -static BOOL sub_02068BDC (UnkStruct_02068870 * param0) +static BOOL sub_02068BDC(UnkStruct_02068870 *param0) { sub_020693F8(param0, sub_02068BEC); return 1; } -static void * sub_02068BEC (void * param0) +static void *sub_02068BEC(void *param0) { sub_0203DE78(param0, ((FieldSystem *)param0)->saveData); return NULL; } -static void sub_02068BF8 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068BF8(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; - int * v2; + FieldSystem *fieldSystem; + FieldMenu *v1; + int *v2; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -725,9 +724,9 @@ static void sub_02068BF8 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 v1->state = FIELD_MENU_STATE_10; } -static BOOL sub_02068C38 (UnkStruct_02068870 * param0) +static BOOL sub_02068C38(UnkStruct_02068870 *param0) { - int * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(int)); + int *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(int)); *v0 = 0; FieldTask_Set(param0->fieldSystem, RefreshRadarChain, v0); @@ -735,7 +734,7 @@ static BOOL sub_02068C38 (UnkStruct_02068870 * param0) return 0; } -static u32 sub_02068C5C (const UnkStruct_020684D0 * param0) +static u32 sub_02068C5C(const UnkStruct_020684D0 *param0) { if (param0->unk_04 == 1) { return 2; @@ -752,18 +751,18 @@ static u32 sub_02068C5C (const UnkStruct_020684D0 * param0) return 0; } -static void sub_02068C94 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068C94(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { sub_02068540(param0, param1, 2802); } -static BOOL sub_02068CA4 (UnkStruct_02068870 * param0) +static BOOL sub_02068CA4(UnkStruct_02068870 *param0) { sub_02068584(param0, 2802); return 0; } -static u32 sub_02068CB4 (const UnkStruct_020684D0 * param0) +static u32 sub_02068CB4(const UnkStruct_020684D0 *param0) { if (param0->unk_04 == 1) { return 2; @@ -776,12 +775,12 @@ static u32 sub_02068CB4 (const UnkStruct_020684D0 * param0) } } -static void sub_02068CD0 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068CD0(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { sub_02068540(param0, param1, 2803); } -static u32 sub_02068CE0 (const UnkStruct_020684D0 * param0) +static u32 sub_02068CE0(const UnkStruct_020684D0 *param0) { if (param0->unk_10 & 0x2) { return 0; @@ -790,11 +789,11 @@ static u32 sub_02068CE0 (const UnkStruct_020684D0 * param0) } } -static void sub_02068CF0 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068CF0(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; - UnkStruct_ov5_021F0468 * v2; + FieldSystem *fieldSystem; + FieldMenu *v1; + UnkStruct_ov5_021F0468 *v2; int v3; fieldSystem = TaskManager_FieldSystem(param0->unk_00); @@ -814,18 +813,18 @@ static void sub_02068CF0 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 Bag_TryRemoveItem(SaveData_GetBag(fieldSystem->saveData), param0->unk_04, 1, 11); } -static void sub_02068D48 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068D48(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { sub_02068540(param0, param1, 8950); } -static BOOL sub_02068D58 (UnkStruct_02068870 * param0) +static BOOL sub_02068D58(UnkStruct_02068870 *param0) { sub_02068584(param0, 8950); return 0; } -static u32 sub_02068D68 (const UnkStruct_020684D0 * param0) +static u32 sub_02068D68(const UnkStruct_020684D0 *param0) { if (MapHeader_IsOnMainMatrix(param0->unk_00)) { return 0; @@ -834,10 +833,10 @@ static u32 sub_02068D68 (const UnkStruct_020684D0 * param0) return -1; } -static void sub_02068D80 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068D80(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -849,18 +848,18 @@ static void sub_02068D80 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 v1->state = FIELD_MENU_STATE_10; } -static BOOL sub_02068DBC (UnkStruct_02068870 * param0) +static BOOL sub_02068DBC(UnkStruct_02068870 *param0) { - void * v0 = ov5_021F08CC(param0->fieldSystem, 4, 0); + void *v0 = ov5_021F08CC(param0->fieldSystem, 4, 0); FieldTask_Set(param0->fieldSystem, ov5_021F08F8, v0); return 0; } -static void sub_02068DDC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068DDC(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -872,18 +871,18 @@ static void sub_02068DDC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 v1->state = FIELD_MENU_STATE_10; } -static BOOL sub_02068E18 (UnkStruct_02068870 * param0) +static BOOL sub_02068E18(UnkStruct_02068870 *param0) { - void * v0 = ov5_021F08CC(param0->fieldSystem, 4, 1); + void *v0 = ov5_021F08CC(param0->fieldSystem, 4, 1); FieldTask_Set(param0->fieldSystem, ov5_021F08F8, v0); return 0; } -static void sub_02068E38 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068E38(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -895,15 +894,15 @@ static void sub_02068E38 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 v1->state = FIELD_MENU_STATE_10; } -static BOOL sub_02068E74 (UnkStruct_02068870 * param0) +static BOOL sub_02068E74(UnkStruct_02068870 *param0) { - void * v0 = ov5_021F08CC(param0->fieldSystem, 4, 2); + void *v0 = ov5_021F08CC(param0->fieldSystem, 4, 2); FieldTask_Set(param0->fieldSystem, ov5_021F08F8, v0); return 0; } -static u32 sub_02068E94 (const UnkStruct_020684D0 * param0) +static u32 sub_02068E94(const UnkStruct_020684D0 *param0) { if (param0->unk_04 == 1) { return 2; @@ -915,7 +914,7 @@ static u32 sub_02068E94 (const UnkStruct_020684D0 * param0) if (sub_0205DB58(param0->unk_0C) == 1) { if ((sub_0205DEFC(param0->unk_0E) == 1) || (sub_0205DEF0(param0->unk_0E) == 1)) { - MapObject * v0 = Player_MapObject(param0->playerAvatar); + MapObject *v0 = Player_MapObject(param0->playerAvatar); if (sub_02062F30(v0) == 1) { return -1; @@ -928,9 +927,9 @@ static u32 sub_02068E94 (const UnkStruct_020684D0 * param0) return -1; } -static BOOL sub_02068EFC (UnkStruct_02068870 * param0) +static BOOL sub_02068EFC(UnkStruct_02068870 *param0) { - UnkStruct_02068EFC * v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02068EFC)); + UnkStruct_02068EFC *v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02068EFC)); v0->unk_16 = 0; v0->unk_10 = Strbuf_Init(128, 11); @@ -941,10 +940,10 @@ static BOOL sub_02068EFC (UnkStruct_02068870 * param0) return 0; } -static BOOL sub_02068F48 (TaskManager * param0) +static BOOL sub_02068F48(TaskManager *param0) { - FieldSystem * fieldSystem; - UnkStruct_02068EFC * v1; + FieldSystem *fieldSystem; + UnkStruct_02068EFC *v1; fieldSystem = TaskManager_FieldSystem(param0); v1 = TaskManager_Environment(param0); @@ -955,7 +954,7 @@ static BOOL sub_02068F48 (TaskManager * param0) FieldMessage_AddWindow(fieldSystem->unk_08, &v1->unk_00, 3); { - const Options * v2 = SaveData_Options(fieldSystem->saveData); + const Options *v2 = SaveData_Options(fieldSystem->saveData); FieldMessage_DrawWindow(&v1->unk_00, v2); v1->unk_14 = FieldMessage_Print(&v1->unk_00, v1->unk_10, v2, 1); @@ -982,11 +981,11 @@ static BOOL sub_02068F48 (TaskManager * param0) return 0; } -static void sub_02068FEC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02068FEC(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; - PartyManagementData * v2; + FieldSystem *fieldSystem; + FieldMenu *v1; + PartyManagementData *v2; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -1010,10 +1009,10 @@ static void sub_02068FEC (UnkStruct_02068630 * param0, const UnkStruct_020684D0 sub_0203B674(v1, sub_0203B7C0); } -static void sub_02069080 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02069080(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(param0->unk_00); menu = TaskManager_Environment(param0->unk_00); @@ -1027,7 +1026,7 @@ static void sub_02069080 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 Bag_TryRemoveItem(SaveData_GetBag(fieldSystem->saveData), param0->unk_04, 1, 11); } -static u32 sub_020690C4 (const UnkStruct_020684D0 * param0) +static u32 sub_020690C4(const UnkStruct_020684D0 *param0) { if (param0->unk_04 == 1) { return 2; @@ -1040,29 +1039,29 @@ static u32 sub_020690C4 (const UnkStruct_020684D0 * param0) return -1; } -static BOOL sub_020690F0 (TaskManager * param0) +static BOOL sub_020690F0(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - void * v1 = ov6_02247100(fieldSystem, 11); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + void *v1 = ov6_02247100(fieldSystem, 11); FieldTask_Change(param0, ov6_02247120, v1); return 0; } -static void sub_02069110 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02069110(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { sub_02068540(param0, param1, 2039); } -static BOOL sub_02069120 (UnkStruct_02068870 * param0) +static BOOL sub_02069120(UnkStruct_02068870 *param0) { sub_02068584(param0, 2039); return 0; } -static u32 sub_02069130 (const UnkStruct_020684D0 * param0) +static u32 sub_02069130(const UnkStruct_020684D0 *param0) { - VarsFlags * v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(param0->fieldSystem->saveData); if (sub_0206A954(v0) == 0) { return -1; @@ -1083,10 +1082,10 @@ static u32 sub_02069130 (const UnkStruct_020684D0 * param0) return 0; } -static void sub_02069188 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_02069188(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -1096,13 +1095,13 @@ static void sub_02069188 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 sub_0203B674(v1, sub_0203C784); } -static BOOL sub_020691BC (UnkStruct_02068870 * param0) +static BOOL sub_020691BC(UnkStruct_02068870 *param0) { sub_020693F8(param0, sub_020691CC); return 1; } -static void * sub_020691CC (void * param0) +static void *sub_020691CC(void *param0) { ov5_021E2064(param0); sub_0203DE88(param0, ((FieldSystem *)param0)->saveData); @@ -1110,11 +1109,11 @@ static void * sub_020691CC (void * param0) return NULL; } -static void sub_020691E0 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 * param1) +static void sub_020691E0(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; - PartyManagementData * v2; + FieldSystem *fieldSystem; + FieldMenu *v1; + PartyManagementData *v2; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -1124,20 +1123,20 @@ static void sub_020691E0 (UnkStruct_02068630 * param0, const UnkStruct_020684D0 sub_0203B674(v1, sub_0203B7C0); } -static BOOL sub_02069218 (UnkStruct_02068870 * param0) +static BOOL sub_02069218(UnkStruct_02068870 *param0) { sub_020693F8(param0, sub_02069228); return 1; } -static void * sub_02069228 (void * param0) +static void *sub_02069228(void *param0) { return sub_0203E598(param0, 11, 466); } -BOOL sub_02069238 (FieldSystem * fieldSystem) +BOOL sub_02069238(FieldSystem *fieldSystem) { - UnkStruct_02068870 * v0; + UnkStruct_02068870 *v0; UnkFuncPtr_020EF79C v1; UnkFuncPtr_02069238 v2; u16 v3; @@ -1190,9 +1189,9 @@ BOOL sub_02069238 (FieldSystem * fieldSystem) return 1; } -static void sub_020692E4 (UnkStruct_02068870 * param0, u32 param1) +static void sub_020692E4(UnkStruct_02068870 *param0, u32 param1) { - UnkStruct_02068EFC * v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02068EFC)); + UnkStruct_02068EFC *v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02068EFC)); v0->unk_16 = 0; v0->unk_10 = Strbuf_Init(128, 11); @@ -1201,10 +1200,10 @@ static void sub_020692E4 (UnkStruct_02068870 * param0, u32 param1) FieldTask_Set(param0->fieldSystem, sub_02068F48, v0); } -static BOOL sub_0206932C (TaskManager * taskMan) +static BOOL sub_0206932C(TaskManager *taskMan) { - FieldSystem * fieldSystem; - UnkStruct_02068870 * v1; + FieldSystem *fieldSystem; + UnkStruct_02068870 *v1; fieldSystem = TaskManager_FieldSystem(taskMan); v1 = TaskManager_Environment(taskMan); @@ -1256,7 +1255,7 @@ static BOOL sub_0206932C (TaskManager * taskMan) return 0; } -static void sub_020693F8 (UnkStruct_02068870 * param0, UnkFuncPtr_02068870 param1) +static void sub_020693F8(UnkStruct_02068870 *param0, UnkFuncPtr_02068870 param1) { param0->unk_20 = param1; FieldTask_Set(param0->fieldSystem, sub_0206932C, param0); diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c index 8ef2bc1340..48598c39ef 100644 --- a/src/unk_02069BE0.c +++ b/src/unk_02069BE0.c @@ -1,23 +1,24 @@ +#include "unk_02069BE0.h" + #include #include #include "struct_decls/struct_0205E884_decl.h" #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay101/struct_ov101_021D5D90_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021DF440.h" +#include "overlay005/ov5_021F3D00.h" +#include "overlay101/struct_ov101_021D5D90_decl.h" -#include "unk_02054D00.h" -#include "unk_0205DAC8.h" -#include "player_avatar.h" #include "map_object.h" #include "map_object_move.h" +#include "player_avatar.h" +#include "unk_02054D00.h" +#include "unk_0205DAC8.h" #include "unk_020655F4.h" #include "unk_02067A84.h" -#include "unk_02069BE0.h" -#include "overlay005/ov5_021DF440.h" -#include "overlay005/ov5_021F3D00.h" typedef struct { u8 unk_00; @@ -33,7 +34,7 @@ typedef struct { s16 unk_02; s16 unk_04; u16 unk_06; - MapObject * unk_08; + MapObject *unk_08; } UnkStruct_02069F48; typedef struct { @@ -41,7 +42,7 @@ typedef struct { u8 unk_01; u8 unk_02; u8 unk_03; - UnkStruct_ov101_021D5D90 * unk_04; + UnkStruct_ov101_021D5D90 *unk_04; } UnkStruct_0206A0BC; typedef struct { @@ -57,25 +58,25 @@ typedef struct { int unk_08; } UnkStruct_0206A47C; -static int sub_02069CA8(MapObject * mapObj, UnkStruct_02069CA8 * param1); -static void sub_02069CD4(MapObject * mapObj, UnkStruct_02069CA8 * param1); -static int sub_02069CFC(MapObject * mapObj, UnkStruct_02069CA8 * param1); -static void sub_02069D30(MapObject * mapObj, UnkStruct_02069CA8 * param1); -static u32 sub_02069D50(MapObject * mapObj); -static int sub_02069D8C(MapObject * mapObj); -static int sub_02069F48(MapObject * mapObj, UnkStruct_02069F48 * param1); -static void sub_02069FC4(MapObject * mapObj, UnkStruct_02069F48 * param1, MapObject * param2); -static int sub_02069FE8(MapObject * mapObj, UnkStruct_02069F48 * param1); -static int sub_0206A034(MapObject * mapObj, UnkStruct_02069F48 * param1); -static int sub_0206A630(MapObject * mapObj, UnkStruct_0206A47C * param1, int param2); +static int sub_02069CA8(MapObject *mapObj, UnkStruct_02069CA8 *param1); +static void sub_02069CD4(MapObject *mapObj, UnkStruct_02069CA8 *param1); +static int sub_02069CFC(MapObject *mapObj, UnkStruct_02069CA8 *param1); +static void sub_02069D30(MapObject *mapObj, UnkStruct_02069CA8 *param1); +static u32 sub_02069D50(MapObject *mapObj); +static int sub_02069D8C(MapObject *mapObj); +static int sub_02069F48(MapObject *mapObj, UnkStruct_02069F48 *param1); +static void sub_02069FC4(MapObject *mapObj, UnkStruct_02069F48 *param1, MapObject *param2); +static int sub_02069FE8(MapObject *mapObj, UnkStruct_02069F48 *param1); +static int sub_0206A034(MapObject *mapObj, UnkStruct_02069F48 *param1); +static int sub_0206A630(MapObject *mapObj, UnkStruct_0206A47C *param1, int param2); -int(*const Unk_020EF8D4[])(MapObject *, UnkStruct_02069CA8 *); -int(*const Unk_020EF8EC[])(MapObject *, UnkStruct_02069F48 *); -int(*const Unk_020EF8DC[])(MapObject *, UnkStruct_0206A0BC *); +int (*const Unk_020EF8D4[])(MapObject *, UnkStruct_02069CA8 *); +int (*const Unk_020EF8EC[])(MapObject *, UnkStruct_02069F48 *); +int (*const Unk_020EF8DC[])(MapObject *, UnkStruct_0206A0BC *); -void sub_02069BE0 (MapObject * mapObj) +void sub_02069BE0(MapObject *mapObj) { - UnkStruct_02069CA8 * v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02069CA8))); + UnkStruct_02069CA8 *v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02069CA8))); sub_02069CA8(mapObj, v0); sub_02062A0C(mapObj, 0x0); @@ -83,9 +84,9 @@ void sub_02069BE0 (MapObject * mapObj) sub_02062D80(mapObj, 0); } -void sub_02069C0C (MapObject * mapObj) +void sub_02069C0C(MapObject *mapObj) { - UnkStruct_02069CA8 * v0 = sub_02062A78(mapObj); + UnkStruct_02069CA8 *v0 = sub_02062A78(mapObj); if (sub_02069CA8(mapObj, v0) == 0) { return; @@ -98,12 +99,12 @@ void sub_02069C0C (MapObject * mapObj) } } -void sub_02069C44 (MapObject * mapObj) +void sub_02069C44(MapObject *mapObj) { return; } -static int sub_02069C48 (MapObject * mapObj, UnkStruct_02069CA8 * param1) +static int sub_02069C48(MapObject *mapObj, UnkStruct_02069CA8 *param1) { sub_02062D10(mapObj); sub_02062D34(mapObj); @@ -121,7 +122,7 @@ static int sub_02069C48 (MapObject * mapObj, UnkStruct_02069CA8 * param1) return 0; } -static int sub_02069C8C (MapObject * mapObj, UnkStruct_02069CA8 * param1) +static int sub_02069C8C(MapObject *mapObj, UnkStruct_02069CA8 *param1) { if (sub_020658DC(mapObj) == 1) { sub_02062D10(mapObj); @@ -131,15 +132,15 @@ static int sub_02069C8C (MapObject * mapObj, UnkStruct_02069CA8 * param1) return 0; } -static int(*const Unk_020EF8D4[])(MapObject *, UnkStruct_02069CA8 *) = { +static int (*const Unk_020EF8D4[])(MapObject *, UnkStruct_02069CA8 *) = { sub_02069C48, sub_02069C8C }; -static int sub_02069CA8 (MapObject * mapObj, UnkStruct_02069CA8 * param1) +static int sub_02069CA8(MapObject *mapObj, UnkStruct_02069CA8 *param1) { - const MapObjectManager * v0 = MapObject_MapObjectManager(mapObj); - MapObject * v1 = sub_0205EA24(v0); + const MapObjectManager *v0 = MapObject_MapObjectManager(mapObj); + MapObject *v1 = sub_0205EA24(v0); if (v1 == NULL) { param1->unk_01 = 0; @@ -153,10 +154,10 @@ static int sub_02069CA8 (MapObject * mapObj, UnkStruct_02069CA8 * param1) return 1; } -static void sub_02069CD4 (MapObject * mapObj, UnkStruct_02069CA8 * param1) +static void sub_02069CD4(MapObject *mapObj, UnkStruct_02069CA8 *param1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); - PlayerAvatar * playerAvatar = sub_0205EF3C(fieldSystem); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); + PlayerAvatar *playerAvatar = sub_0205EF3C(fieldSystem); param1->unk_01 = 1; param1->unk_02 = Player_GetXPos(playerAvatar); @@ -164,10 +165,10 @@ static void sub_02069CD4 (MapObject * mapObj, UnkStruct_02069CA8 * param1) param1->unk_06 = 0xff; } -static int sub_02069CFC (MapObject * mapObj, UnkStruct_02069CA8 * param1) +static int sub_02069CFC(MapObject *mapObj, UnkStruct_02069CA8 *param1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); - PlayerAvatar * playerAvatar = sub_0205EF3C(fieldSystem); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); + PlayerAvatar *playerAvatar = sub_0205EF3C(fieldSystem); if (playerAvatar != NULL) { int v2 = Player_GetXPos(playerAvatar); @@ -181,20 +182,20 @@ static int sub_02069CFC (MapObject * mapObj, UnkStruct_02069CA8 * param1) return 0; } -static void sub_02069D30 (MapObject * mapObj, UnkStruct_02069CA8 * param1) +static void sub_02069D30(MapObject *mapObj, UnkStruct_02069CA8 *param1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); - PlayerAvatar * playerAvatar = sub_0205EF3C(fieldSystem); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); + PlayerAvatar *playerAvatar = sub_0205EF3C(fieldSystem); param1->unk_02 = Player_GetXPos(playerAvatar); param1->unk_04 = Player_GetZPos(playerAvatar); } -static u32 sub_02069D50 (MapObject * mapObj) +static u32 sub_02069D50(MapObject *mapObj) { u32 v0; - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); - PlayerAvatar * playerAvatar = sub_0205EF3C(fieldSystem); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); + PlayerAvatar *playerAvatar = sub_0205EF3C(fieldSystem); v0 = sub_0205EC14(playerAvatar); @@ -216,10 +217,10 @@ static u32 sub_02069D50 (MapObject * mapObj) return v0; } -static int sub_02069D8C (MapObject * mapObj) +static int sub_02069D8C(MapObject *mapObj) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); - PlayerAvatar * playerAvatar = sub_0205EF3C(fieldSystem); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); + PlayerAvatar *playerAvatar = sub_0205EF3C(fieldSystem); int v2 = MapObject_GetXPos(mapObj); int v3 = MapObject_GetZPos(mapObj); int v4 = PlayerAvatar_XPosPrev(playerAvatar); @@ -238,9 +239,9 @@ static int sub_02069D8C (MapObject * mapObj) return 0; } -void sub_02069DF4 (MapObject * mapObj) +void sub_02069DF4(MapObject *mapObj) { - UnkStruct_02069F48 * v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02069F48))); + UnkStruct_02069F48 *v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02069F48))); sub_02069F48(mapObj, v0); sub_02062A0C(mapObj, 0x0); @@ -249,9 +250,9 @@ void sub_02069DF4 (MapObject * mapObj) v0->unk_01 = 0; } -void sub_02069E1C (MapObject * mapObj) +void sub_02069E1C(MapObject *mapObj) { - UnkStruct_02069F48 * v0 = sub_02062A78(mapObj); + UnkStruct_02069F48 *v0 = sub_02062A78(mapObj); if (sub_02069F48(mapObj, v0) == 0) { return; @@ -262,18 +263,18 @@ void sub_02069E1C (MapObject * mapObj) } } -void sub_02069E4C (MapObject * mapObj) +void sub_02069E4C(MapObject *mapObj) { return; } -void sub_02069E50 (MapObject * mapObj) +void sub_02069E50(MapObject *mapObj) { - UnkStruct_02069F48 * v0 = sub_02062A78(mapObj); + UnkStruct_02069F48 *v0 = sub_02062A78(mapObj); v0->unk_01 = 0; } -static int sub_02069E5C (MapObject * mapObj, UnkStruct_02069F48 * param1) +static int sub_02069E5C(MapObject *mapObj, UnkStruct_02069F48 *param1) { sub_02062D10(mapObj); sub_02062D34(mapObj); @@ -289,7 +290,7 @@ static int sub_02069E5C (MapObject * mapObj, UnkStruct_02069F48 * param1) return 0; } -static int sub_02069E98 (MapObject * mapObj, UnkStruct_02069F48 * param1) +static int sub_02069E98(MapObject *mapObj, UnkStruct_02069F48 *param1) { if (sub_020658DC(mapObj) == 0) { return 0; @@ -300,19 +301,19 @@ static int sub_02069E98 (MapObject * mapObj, UnkStruct_02069F48 * param1) return 0; } -static int(*const Unk_020EF8EC[])(MapObject *, UnkStruct_02069F48 *) = { +static int (*const Unk_020EF8EC[])(MapObject *, UnkStruct_02069F48 *) = { sub_02069E5C, sub_02069E98 }; -MapObject * sub_02069EB8 (MapObject * mapObj) +MapObject *sub_02069EB8(MapObject *mapObj) { int v0 = 0; int v1 = MapObject_GetEventType(mapObj); int v2 = sub_02062918(mapObj); u32 v3 = sub_02067F24(mapObj); - const MapObjectManager * mapObjMan = MapObject_MapObjectManager(mapObj); - MapObject * v5; + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); + MapObject *v5; switch (v1) { case 0x1: @@ -335,12 +336,12 @@ MapObject * sub_02069EB8 (MapObject * mapObj) return NULL; } -static int sub_02069F48 (MapObject * mapObj, UnkStruct_02069F48 * param1) +static int sub_02069F48(MapObject *mapObj, UnkStruct_02069F48 *param1) { int v0, v1; u32 v2; - MapObject * v3; - const MapObjectManager * mapObjMan = MapObject_MapObjectManager(mapObj); + MapObject *v3; + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); v0 = 0; v1 = sub_02062918(mapObj); @@ -360,7 +361,7 @@ static int sub_02069F48 (MapObject * mapObj, UnkStruct_02069F48 * param1) return 0; } -static void sub_02069FC4 (MapObject * mapObj, UnkStruct_02069F48 * param1, MapObject * param2) +static void sub_02069FC4(MapObject *mapObj, UnkStruct_02069F48 *param1, MapObject *param2) { param1->unk_01 = 1; param1->unk_02 = MapObject_GetXPos(param2); @@ -369,9 +370,9 @@ static void sub_02069FC4 (MapObject * mapObj, UnkStruct_02069F48 * param1, MapOb param1->unk_08 = param2; } -static int sub_02069FE8 (MapObject * mapObj, UnkStruct_02069F48 * param1) +static int sub_02069FE8(MapObject *mapObj, UnkStruct_02069F48 *param1) { - MapObject * v0 = param1->unk_08; + MapObject *v0 = param1->unk_08; int v1 = MapObject_GetXPos(mapObj); int v2 = MapObject_GetZPos(mapObj); int v3 = MapObject_XPosPrev(v0); @@ -384,7 +385,7 @@ static int sub_02069FE8 (MapObject * mapObj, UnkStruct_02069F48 * param1) return 0; } -static int sub_0206A034 (MapObject * mapObj, UnkStruct_02069F48 * param1) +static int sub_0206A034(MapObject *mapObj, UnkStruct_02069F48 *param1) { int v0 = MapObject_GetXPos(mapObj); int v1 = MapObject_GetZPos(mapObj); @@ -413,9 +414,9 @@ static int sub_0206A034 (MapObject * mapObj, UnkStruct_02069F48 * param1) return 0; } -static void sub_0206A0BC (MapObject * mapObj, int param1) +static void sub_0206A0BC(MapObject *mapObj, int param1) { - UnkStruct_0206A0BC * v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206A0BC))); + UnkStruct_0206A0BC *v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206A0BC))); v0->unk_01 = param1; @@ -424,69 +425,69 @@ static void sub_0206A0BC (MapObject * mapObj, int param1) MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); { - VecFx32 v1 = {0, (FX32_ONE * -32), 0}; + VecFx32 v1 = { 0, (FX32_ONE * -32), 0 }; sub_02063088(mapObj, &v1); } } -void sub_0206A104 (MapObject * mapObj) +void sub_0206A104(MapObject *mapObj) { sub_0206A0BC(mapObj, 0); } -void sub_0206A110 (MapObject * mapObj) +void sub_0206A110(MapObject *mapObj) { sub_0206A0BC(mapObj, 1); } -void sub_0206A11C (MapObject * mapObj) +void sub_0206A11C(MapObject *mapObj) { sub_0206A0BC(mapObj, 2); } -void sub_0206A128 (MapObject * mapObj) +void sub_0206A128(MapObject *mapObj) { sub_0206A0BC(mapObj, 3); } -void sub_0206A134 (MapObject * mapObj) +void sub_0206A134(MapObject *mapObj) { - UnkStruct_0206A0BC * v0 = sub_02062A78(mapObj); + UnkStruct_0206A0BC *v0 = sub_02062A78(mapObj); while (Unk_020EF8DC[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -void sub_0206A158 (MapObject * mapObj) +void sub_0206A158(MapObject *mapObj) { - UnkStruct_ov101_021D5D90 * v0 = sub_0206A224(mapObj); + UnkStruct_ov101_021D5D90 *v0 = sub_0206A224(mapObj); if (v0 != NULL) { ov5_021DF74C(v0); } } -void sub_0206A168 (MapObject * mapObj) +void sub_0206A168(MapObject *mapObj) { - UnkStruct_0206A0BC * v0 = sub_02062A78(mapObj); + UnkStruct_0206A0BC *v0 = sub_02062A78(mapObj); v0->unk_00 = 0; sub_0206A218(mapObj, NULL); if (v0->unk_02 == 0) { - VecFx32 v1 = {0, (FX32_ONE * -32), 0}; + VecFx32 v1 = { 0, (FX32_ONE * -32), 0 }; sub_02063088(mapObj, &v1); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } } -static int sub_0206A1AC (MapObject * mapObj, UnkStruct_0206A0BC * param1) +static int sub_0206A1AC(MapObject *mapObj, UnkStruct_0206A0BC *param1) { if (param1->unk_02 == 0) { - UnkStruct_ov101_021D5D90 * v0 = ov5_021F3D90(mapObj, param1->unk_01); + UnkStruct_ov101_021D5D90 *v0 = ov5_021F3D90(mapObj, param1->unk_01); sub_0206A218(mapObj, v0); } @@ -498,10 +499,10 @@ static int sub_0206A1AC (MapObject * mapObj, UnkStruct_0206A0BC * param1) return 0; } -static int sub_0206A1DC (MapObject * mapObj, UnkStruct_0206A0BC * param1) +static int sub_0206A1DC(MapObject *mapObj, UnkStruct_0206A0BC *param1) { if (param1->unk_02 == 0) { - UnkStruct_ov101_021D5D90 * v0 = sub_0206A224(mapObj); + UnkStruct_ov101_021D5D90 *v0 = sub_0206A224(mapObj); if (v0 == NULL) { if (sub_02062DFC(mapObj) == 1) { @@ -516,34 +517,34 @@ static int sub_0206A1DC (MapObject * mapObj, UnkStruct_0206A0BC * param1) return 0; } -static int(*const Unk_020EF8DC[])(MapObject *, UnkStruct_0206A0BC *) = { +static int (*const Unk_020EF8DC[])(MapObject *, UnkStruct_0206A0BC *) = { sub_0206A1AC, sub_0206A1DC }; -void sub_0206A218 (MapObject * mapObj, UnkStruct_ov101_021D5D90 * param1) +void sub_0206A218(MapObject *mapObj, UnkStruct_ov101_021D5D90 *param1) { - UnkStruct_0206A0BC * v0 = sub_02062A78(mapObj); + UnkStruct_0206A0BC *v0 = sub_02062A78(mapObj); v0->unk_04 = param1; } -UnkStruct_ov101_021D5D90 * sub_0206A224 (MapObject * mapObj) +UnkStruct_ov101_021D5D90 *sub_0206A224(MapObject *mapObj) { - UnkStruct_0206A0BC * v0 = sub_02062A78(mapObj); + UnkStruct_0206A0BC *v0 = sub_02062A78(mapObj); return v0->unk_04; } -void sub_0206A230 (MapObject * mapObj) +void sub_0206A230(MapObject *mapObj) { - UnkStruct_0206A0BC * v0 = sub_02062A78(mapObj); + UnkStruct_0206A0BC *v0 = sub_02062A78(mapObj); v0->unk_02 = 1; } -static int(*const Unk_020EF918[5])(MapObject *, UnkStruct_0206A23C *); +static int (*const Unk_020EF918[5])(MapObject *, UnkStruct_0206A23C *); -static void sub_0206A23C (MapObject * mapObj, int param1, u32 param2) +static void sub_0206A23C(MapObject *mapObj, int param1, u32 param2) { - UnkStruct_0206A23C * v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206A23C))); + UnkStruct_0206A23C *v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206A23C))); v0->unk_01 = -1; v0->unk_02 = param2; @@ -551,56 +552,56 @@ static void sub_0206A23C (MapObject * mapObj, int param1, u32 param2) MapObject_SetDir(mapObj, 0); } -void sub_0206A25C (MapObject * mapObj) +void sub_0206A25C(MapObject *mapObj) { sub_0206A23C(mapObj, 0, 0); } -void sub_0206A268 (MapObject * mapObj) +void sub_0206A268(MapObject *mapObj) { sub_0206A23C(mapObj, 1, 0); } -void sub_0206A274 (MapObject * mapObj) +void sub_0206A274(MapObject *mapObj) { sub_0206A23C(mapObj, 2, 0); } -void sub_0206A280 (MapObject * mapObj) +void sub_0206A280(MapObject *mapObj) { sub_0206A23C(mapObj, 3, 0); } -void sub_0206A28C (MapObject * mapObj) +void sub_0206A28C(MapObject *mapObj) { sub_0206A23C(mapObj, 0, 1); } -void sub_0206A298 (MapObject * mapObj) +void sub_0206A298(MapObject *mapObj) { sub_0206A23C(mapObj, 1, 1); } -void sub_0206A2A4 (MapObject * mapObj) +void sub_0206A2A4(MapObject *mapObj) { sub_0206A23C(mapObj, 2, 1); } -void sub_0206A2B0 (MapObject * mapObj) +void sub_0206A2B0(MapObject *mapObj) { sub_0206A23C(mapObj, 3, 1); } -void sub_0206A2BC (MapObject * mapObj) +void sub_0206A2BC(MapObject *mapObj) { - UnkStruct_0206A23C * v0 = sub_02062A78(mapObj); + UnkStruct_0206A23C *v0 = sub_02062A78(mapObj); while (Unk_020EF918[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -static int sub_0206A2E0 (MapObject * mapObj, UnkStruct_0206A23C * param1) +static int sub_0206A2E0(MapObject *mapObj, UnkStruct_0206A23C *param1) { int v0 = MapObject_Dir(mapObj); @@ -614,7 +615,7 @@ static int sub_0206A2E0 (MapObject * mapObj, UnkStruct_0206A23C * param1) return 1; } -static int sub_0206A30C (MapObject * mapObj, UnkStruct_0206A23C * param1) +static int sub_0206A30C(MapObject *mapObj, UnkStruct_0206A23C *param1) { if (sub_020658DC(mapObj) == 1) { param1->unk_00 = 2; @@ -624,10 +625,10 @@ static int sub_0206A30C (MapObject * mapObj, UnkStruct_0206A23C * param1) return 0; } -static int sub_0206A324 (MapObject * mapObj, UnkStruct_0206A23C * param1) +static int sub_0206A324(MapObject *mapObj, UnkStruct_0206A23C *param1) { if (param1->unk_01 == -1) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); param1->unk_01 = PlayerAvatar_GetDir(fieldSystem->playerAvatar); } @@ -639,7 +640,7 @@ static int sub_0206A324 (MapObject * mapObj, UnkStruct_0206A23C * param1) return 1; } -static u32 sub_0206A354 (MapObject * mapObj, int param1) +static u32 sub_0206A354(MapObject *mapObj, int param1) { u32 v0 = sub_02064238(mapObj, param1); @@ -651,7 +652,7 @@ static u32 sub_0206A354 (MapObject * mapObj, int param1) return v0; } -static void sub_0206A37C (MapObject * mapObj, int param1, int param2, u32 param3) +static void sub_0206A37C(MapObject *mapObj, int param1, int param2, u32 param3) { u32 v0; @@ -671,10 +672,10 @@ static void sub_0206A37C (MapObject * mapObj, int param1, int param2, u32 param3 sub_02065668(mapObj, param2); } -static int sub_0206A3BC (MapObject * mapObj, UnkStruct_0206A23C * param1) +static int sub_0206A3BC(MapObject *mapObj, UnkStruct_0206A23C *param1) { int v0; - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v2 = PlayerAvatar_GetDir(fieldSystem->playerAvatar); u32 v3 = sub_0205EC1C(fieldSystem->playerAvatar); @@ -705,7 +706,7 @@ static int sub_0206A3BC (MapObject * mapObj, UnkStruct_0206A23C * param1) return 1; } -static int sub_0206A454 (MapObject * mapObj, UnkStruct_0206A23C * param1) +static int sub_0206A454(MapObject *mapObj, UnkStruct_0206A23C *param1) { if (sub_020658DC(mapObj) == 0) { return 0; @@ -718,7 +719,7 @@ static int sub_0206A454 (MapObject * mapObj, UnkStruct_0206A23C * param1) return 0; } -static int(*const Unk_020EF918[5])(MapObject *, UnkStruct_0206A23C *) = { +static int (*const Unk_020EF918[5])(MapObject *, UnkStruct_0206A23C *) = { sub_0206A2E0, sub_0206A30C, sub_0206A324, @@ -726,60 +727,60 @@ static int(*const Unk_020EF918[5])(MapObject *, UnkStruct_0206A23C *) = { sub_0206A454 }; -static int(*const Unk_020EF90C[3])(MapObject *, UnkStruct_0206A47C *); +static int (*const Unk_020EF90C[3])(MapObject *, UnkStruct_0206A47C *); -static void sub_0206A47C (MapObject * mapObj, int param1, int param2) +static void sub_0206A47C(MapObject *mapObj, int param1, int param2) { - UnkStruct_0206A47C * v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206A47C))); + UnkStruct_0206A47C *v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206A47C))); v0->unk_04 = param1; v0->unk_08 = param2; } -void sub_0206A490 (MapObject * mapObj) +void sub_0206A490(MapObject *mapObj) { sub_0206A47C(mapObj, 0, 0); } -void sub_0206A49C (MapObject * mapObj) +void sub_0206A49C(MapObject *mapObj) { sub_0206A47C(mapObj, 1, 1); } -void sub_0206A4A8 (MapObject * mapObj) +void sub_0206A4A8(MapObject *mapObj) { sub_0206A47C(mapObj, 2, 0); } -void sub_0206A4B4 (MapObject * mapObj) +void sub_0206A4B4(MapObject *mapObj) { sub_0206A47C(mapObj, 2, 1); } -void sub_0206A4C0 (MapObject * mapObj) +void sub_0206A4C0(MapObject *mapObj) { - UnkStruct_0206A47C * v0 = sub_02062A78(mapObj); + UnkStruct_0206A47C *v0 = sub_02062A78(mapObj); while (Unk_020EF90C[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -static int sub_0206A4E4 (MapObject * mapObj, UnkStruct_0206A47C * param1) +static int sub_0206A4E4(MapObject *mapObj, UnkStruct_0206A47C *param1) { sub_02062D10(mapObj); param1->unk_00++; return 1; } -static int sub_0206A4F8 (MapObject * mapObj, UnkStruct_0206A47C * param1) +static int sub_0206A4F8(MapObject *mapObj, UnkStruct_0206A47C *param1) { sub_0206A630(mapObj, param1, 0xc); param1->unk_00++; return 1; } -static int sub_0206A50C (MapObject * mapObj, UnkStruct_0206A47C * param1) +static int sub_0206A50C(MapObject *mapObj, UnkStruct_0206A47C *param1) { if (sub_020658DC(mapObj) == 1) { param1->unk_00 = 0; @@ -789,52 +790,52 @@ static int sub_0206A50C (MapObject * mapObj, UnkStruct_0206A47C * param1) return 0; } -static int(*const Unk_020EF90C[3])(MapObject *, UnkStruct_0206A47C *) = { +static int (*const Unk_020EF90C[3])(MapObject *, UnkStruct_0206A47C *) = { sub_0206A4E4, sub_0206A4F8, sub_0206A50C }; static const int Unk_020EF92C[4][2] = { - {-1, 0x1}, - {0x1, -1}, - {0x0, 0x0}, - {0x0, 0x0} + { -1, 0x1 }, + { 0x1, -1 }, + { 0x0, 0x0 }, + { 0x0, 0x0 } }; static const int Unk_020EF94C[4][2] = { - {0x0, 0x0}, - {0x0, 0x0}, - {0x1, -1}, - {-1, 0x1} + { 0x0, 0x0 }, + { 0x0, 0x0 }, + { 0x1, -1 }, + { -1, 0x1 } }; static const int Unk_020EF98C[4][2] = { - {-1, 0x1}, - {0x1, -1}, - {0x1, 0x1}, - {-1, -1} + { -1, 0x1 }, + { 0x1, -1 }, + { 0x1, 0x1 }, + { -1, -1 } }; static const int Unk_020EF9AC[4][2] = { - {0x1, 0x1}, - {-1, -1}, - {0x1, -1}, - {-1, 0x1} + { 0x1, 0x1 }, + { -1, -1 }, + { 0x1, -1 }, + { -1, 0x1 } }; static const int Unk_020EF96C[4][2] = { - {0x2, 0x3}, - {0x3, 0x2}, - {0x1, 0x0}, - {0x0, 0x1} + { 0x2, 0x3 }, + { 0x3, 0x2 }, + { 0x1, 0x0 }, + { 0x0, 0x1 } }; static const int Unk_020EF9CC[4][2] = { - {0x3, 0x2}, - {0x2, 0x3}, - {0x0, 0x1}, - {0x1, 0x0} + { 0x3, 0x2 }, + { 0x2, 0x3 }, + { 0x0, 0x1 }, + { 0x1, 0x0 } }; static const int Unk_020EF8E4[2] = { @@ -842,7 +843,7 @@ static const int Unk_020EF8E4[2] = { 0x0 }; -static BOOL sub_0206A524 (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4) +static BOOL sub_0206A524(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4) { BOOL v0; @@ -853,7 +854,7 @@ static BOOL sub_0206A524 (FieldSystem * fieldSystem, int param1, int param2, int return v0; } -static BOOL sub_0206A54C (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4) +static BOOL sub_0206A54C(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4) { BOOL v0; @@ -864,9 +865,9 @@ static BOOL sub_0206A54C (FieldSystem * fieldSystem, int param1, int param2, int return v0; } -static int sub_0206A574 (MapObject * mapObj, int param1, int param2) +static int sub_0206A574(MapObject *mapObj, int param1, int param2) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetXPos(mapObj); int v2 = MapObject_GetZPos(mapObj); BOOL v3 = sub_0206A524(fieldSystem, v1, v2, param1, param2); @@ -874,9 +875,9 @@ static int sub_0206A574 (MapObject * mapObj, int param1, int param2) return v3; } -static int sub_0206A5A4 (MapObject * mapObj, int param1, int param2) +static int sub_0206A5A4(MapObject *mapObj, int param1, int param2) { - FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetXPos(mapObj); int v2 = MapObject_GetZPos(mapObj); BOOL v3 = sub_0206A54C(fieldSystem, v1, v2, param1, param2); @@ -884,11 +885,11 @@ static int sub_0206A5A4 (MapObject * mapObj, int param1, int param2) return v3; } -static int sub_0206A5D4 (MapObject * mapObj, int param1, int param2) +static int sub_0206A5D4(MapObject *mapObj, int param1, int param2) { if (sub_0206A574(mapObj, param1, param2) == 0) { if (sub_0206A5A4(mapObj, param1, param2) == 0) { - return(-1); + return -1; } param1 = Unk_020EF96C[param1][param2]; @@ -897,7 +898,7 @@ static int sub_0206A5D4 (MapObject * mapObj, int param1, int param2) return param1; } -static u32 sub_0206A60C (MapObject * mapObj, int * param1, int param2) +static u32 sub_0206A60C(MapObject *mapObj, int *param1, int param2) { u32 v0; @@ -911,7 +912,7 @@ static u32 sub_0206A60C (MapObject * mapObj, int * param1, int param2) return 0; } -static int sub_0206A630 (MapObject * mapObj, UnkStruct_0206A47C * param1, int param2) +static int sub_0206A630(MapObject *mapObj, UnkStruct_0206A47C *param1, int param2) { u32 v0; int v1 = param1->unk_08; @@ -955,7 +956,7 @@ static int sub_0206A630 (MapObject * mapObj, UnkStruct_0206A47C * param1, int pa } } - if ((v0 & (1 << 1))) { + if (v0 & (1 << 1)) { v2 = Unk_020EF9CC[v2][v1]; v0 = sub_0206A60C(mapObj, &v2, v1); diff --git a/src/unk_0206A780.c b/src/unk_0206A780.c index 6521002d9c..a1f7a45af0 100644 --- a/src/unk_0206A780.c +++ b/src/unk_0206A780.c @@ -1,18 +1,19 @@ +#include "unk_0206A780.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" - -#include "struct_defs/struct_0206A844.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0206A844.h" + +#include "overlay005/ov5_021D2F14.h" #include "overlay104/struct_ov104_02241308.h" +#include "heap.h" #include "narc.h" #include "unk_0200C6E4.h" -#include "heap.h" #include "unk_020218BC.h" -#include "unk_0206A780.h" -#include "overlay005/ov5_021D2F14.h" static const SpriteTemplate Unk_020EFA04[] = { { @@ -23,9 +24,9 @@ static const SpriteTemplate Unk_020EFA04[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x34D8, 0x34D8, 0x34D8, 0x34D8, 0x0, 0x0}, + { 0x34D8, 0x34D8, 0x34D8, 0x34D8, 0x0, 0x0 }, + 0x0, 0x0, - 0x0 }, { 0x50, @@ -35,20 +36,20 @@ static const SpriteTemplate Unk_020EFA04[] = { 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x34D8, 0x34D8, 0x34D8, 0x34D8, 0x0, 0x0}, + { 0x34D8, 0x34D8, 0x34D8, 0x34D8, 0x0, 0x0 }, 0x0, - 0x0 - } + 0x0, + }, }; -UnkStruct_0206A844 * sub_0206A780 (int param0) +UnkStruct_0206A844 *sub_0206A780(int param0) { UnkStruct_ov104_02241308 v0 = { 1, 1, 1, 1, 0, 0 }; u32 v1; - UnkStruct_0206A844 * v2; - NARC * v3; + UnkStruct_0206A844 *v2; + NARC *v3; v2 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0206A844)); MI_CpuClear8(v2, sizeof(UnkStruct_0206A844)); @@ -70,7 +71,7 @@ UnkStruct_0206A844 * sub_0206A780 (int param0) return v2; } -void sub_0206A844 (UnkStruct_0206A844 * param0) +void sub_0206A844(UnkStruct_0206A844 *param0) { int v0; @@ -84,7 +85,7 @@ void sub_0206A844 (UnkStruct_0206A844 * param0) Heap_FreeToHeap(param0); } -void sub_0206A870 (UnkStruct_0206A844 * param0) +void sub_0206A870(UnkStruct_0206A844 *param0) { int v0 = 0; @@ -97,13 +98,13 @@ void sub_0206A870 (UnkStruct_0206A844 * param0) sub_020219F8(param0->unk_00.unk_00); } -void sub_0206A8A0 (UnkStruct_0206A844 * param0, s16 param1, s16 param2, s16 param3) +void sub_0206A8A0(UnkStruct_0206A844 *param0, s16 param1, s16 param2, s16 param3) { SpriteActor_SetSpritePositionXY(param0->unk_1C8[0], param1, param2); SpriteActor_SetSpritePositionXY(param0->unk_1C8[1], param1, param3); } -void sub_0206A8C4 (UnkStruct_0206A844 * param0, u16 param1, BOOL param2) +void sub_0206A8C4(UnkStruct_0206A844 *param0, u16 param1, BOOL param2) { if (param1 >= 2) { return; diff --git a/src/unk_0206A8DC.c b/src/unk_0206A8DC.c index 80def13e45..4e3ed5e3ca 100644 --- a/src/unk_0206A8DC.c +++ b/src/unk_0206A8DC.c @@ -1,33 +1,34 @@ +#include "unk_0206A8DC.h" + #include #include #include "rtc.h" #include "vars_flags.h" -#include "unk_0206A8DC.h" -static void sub_0206A8DC(VarsFlags * param0, u16 param1); -static void sub_0206A8E4(VarsFlags * param0, u16 param1); -static BOOL sub_0206A8EC(VarsFlags * param0, u16 param1); -static BOOL sub_0206A8F4(VarsFlags * param0, int param1, u32 param2); +static void sub_0206A8DC(VarsFlags *param0, u16 param1); +static void sub_0206A8E4(VarsFlags *param0, u16 param1); +static BOOL sub_0206A8EC(VarsFlags *param0, u16 param1); +static BOOL sub_0206A8F4(VarsFlags *param0, int param1, u32 param2); -static void sub_0206A8DC (VarsFlags * param0, u16 param1) +static void sub_0206A8DC(VarsFlags *param0, u16 param1) { VarsFlags_SetFlag(param0, param1); return; } -static void sub_0206A8E4 (VarsFlags * param0, u16 param1) +static void sub_0206A8E4(VarsFlags *param0, u16 param1) { VarsFlags_ClearFlag(param0, param1); return; } -static BOOL sub_0206A8EC (VarsFlags * param0, u16 param1) +static BOOL sub_0206A8EC(VarsFlags *param0, u16 param1) { return VarsFlags_CheckFlag(param0, param1); } -static BOOL sub_0206A8F4 (VarsFlags * param0, int param1, u32 param2) +static BOOL sub_0206A8F4(VarsFlags *param0, int param1, u32 param2) { switch (param1) { case 1: @@ -45,114 +46,114 @@ static BOOL sub_0206A8F4 (VarsFlags * param0, int param1, u32 param2) return 0; } -void sub_0206A92C (VarsFlags * param0) +void sub_0206A92C(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 0)); return; } -BOOL sub_0206A938 (VarsFlags * param0) +BOOL sub_0206A938(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 0)); } -void sub_0206A944 (VarsFlags * param0) +void sub_0206A944(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 4)); return; } -BOOL sub_0206A954 (VarsFlags * param0) +BOOL sub_0206A954(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 4)); } -void sub_0206A964 (VarsFlags * param0) +void sub_0206A964(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 1)); return; } -void sub_0206A974 (VarsFlags * param0) +void sub_0206A974(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 1)); return; } -BOOL sub_0206A984 (VarsFlags * param0) +BOOL sub_0206A984(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 1)); } -void sub_0206A994 (VarsFlags * param0) +void sub_0206A994(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 5)); return; } -void sub_0206A9A4 (VarsFlags * param0) +void sub_0206A9A4(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 5)); return; } -BOOL sub_0206A9B4 (VarsFlags * param0) +BOOL sub_0206A9B4(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 5)); } -void VsSeeker_SetUsedFlag(VarsFlags * param0) +void VsSeeker_SetUsedFlag(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 13)); } -void VsSeeker_ClearUsedFlag(VarsFlags * param0) +void VsSeeker_ClearUsedFlag(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 13)); } -BOOL VsSeeker_GetUsedFlag(VarsFlags * param0) +BOOL VsSeeker_GetUsedFlag(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 13)); } -void sub_0206A9F4 (VarsFlags * param0) +void sub_0206A9F4(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 14)); return; } -void sub_0206AA04 (VarsFlags * param0) +void sub_0206AA04(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 15)); return; } -void sub_0206AA14 (VarsFlags * param0) +void sub_0206AA14(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 16)); return; } -void sub_0206AA20 (VarsFlags * param0) +void sub_0206AA20(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 17)); return; } -void sub_0206AA30 (VarsFlags * param0) +void sub_0206AA30(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 18)); return; } -void sub_0206AA40 (VarsFlags * param0) +void sub_0206AA40(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 19)); return; } -void sub_0206AA50 (VarsFlags * param0, int param1) +void sub_0206AA50(VarsFlags *param0, int param1) { switch (param1) { case 0: @@ -175,7 +176,7 @@ void sub_0206AA50 (VarsFlags * param0, int param1) return; } -BOOL sub_0206AAA8 (VarsFlags * param0, int param1) +BOOL sub_0206AAA8(VarsFlags *param0, int param1) { int v0; @@ -200,7 +201,7 @@ BOOL sub_0206AAA8 (VarsFlags * param0, int param1) return v0; } -BOOL VsSeeker_HasUnlockedLevel(VarsFlags * param0, int param1) +BOOL VsSeeker_HasUnlockedLevel(VarsFlags *param0, int param1) { int v0 = 0; @@ -225,7 +226,7 @@ BOOL VsSeeker_HasUnlockedLevel(VarsFlags * param0, int param1) return v0; } -u16 sub_0206AB68 (VarsFlags * param0, int param1) +u16 sub_0206AB68(VarsFlags *param0, int param1) { u16 v0 = 0; @@ -332,178 +333,178 @@ u16 sub_0206AB68 (VarsFlags * param0, int param1) return v0; } -void sub_0206AD9C (VarsFlags * param0) +void sub_0206AD9C(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 6)); return; } -void CommClub_ResetAvailable (VarsFlags * param0) +void CommClub_ResetAvailable(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 6)); return; } -BOOL CommClub_IsAvailable (VarsFlags * param0) +BOOL CommClub_IsAvailable(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 6)); } -BOOL ContestHall_IsVisited (VarsFlags * param0) +BOOL ContestHall_IsVisited(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 24)); } -BOOL sub_0206ADDC (VarsFlags * param0) +BOOL sub_0206ADDC(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 50)); } -BOOL sub_0206ADEC (VarsFlags * param0) +BOOL sub_0206ADEC(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 29)); } -BOOL sub_0206ADFC (VarsFlags * param0) +BOOL sub_0206ADFC(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 30)); } -void sub_0206AE0C (VarsFlags * param0) +void sub_0206AE0C(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 28)); } -void sub_0206AE1C (VarsFlags * param0) +void sub_0206AE1C(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 28)); } -BOOL sub_0206AE2C (VarsFlags * param0) +BOOL sub_0206AE2C(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 28)); } -void sub_0206AE3C (VarsFlags * param0) +void sub_0206AE3C(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 7)); } -void sub_0206AE4C (VarsFlags * param0) +void sub_0206AE4C(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 7)); } -BOOL sub_0206AE5C (VarsFlags * param0) +BOOL sub_0206AE5C(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 7)); } -void sub_0206AE6C (VarsFlags * param0) +void sub_0206AE6C(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 25)); } -void sub_0206AE7C (VarsFlags * param0) +void sub_0206AE7C(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 25)); } -BOOL sub_0206AE8C (VarsFlags * param0) +BOOL sub_0206AE8C(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 25)); } -void sub_0206AE9C (VarsFlags * param0) +void sub_0206AE9C(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 52)); } -BOOL sub_0206AEAC (VarsFlags * param0, int param1) +BOOL sub_0206AEAC(VarsFlags *param0, int param1) { return sub_0206A8F4(param0, param1, (2400 + 2)); } -void sub_0206AEBC (VarsFlags * param0) +void sub_0206AEBC(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 26)); } -void sub_0206AECC (VarsFlags * param0) +void sub_0206AECC(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 26)); } -BOOL Overworld_IsFlashActive (VarsFlags * param0) +BOOL Overworld_IsFlashActive(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 26)); } -void sub_0206AEEC (VarsFlags * param0) +void sub_0206AEEC(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 27)); } -void sub_0206AEFC (VarsFlags * param0) +void sub_0206AEFC(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 27)); } -BOOL Overworld_IsDefogActive (VarsFlags * param0) +BOOL Overworld_IsDefogActive(VarsFlags *param0) { return sub_0206A8EC(param0, (2400 + 27)); } -BOOL sub_0206AF1C (VarsFlags * param0, int param1) +BOOL sub_0206AF1C(VarsFlags *param0, int param1) { return sub_0206A8F4(param0, param1, (2400 + 54)); } -BOOL sub_0206AF2C (VarsFlags * param0, int param1) +BOOL sub_0206AF2C(VarsFlags *param0, int param1) { return sub_0206A8F4(param0, param1, (2400 + 3)); } -BOOL sub_0206AF3C (VarsFlags * param0, int param1, u32 param2) +BOOL sub_0206AF3C(VarsFlags *param0, int param1, u32 param2) { GF_ASSERT(param2 < 69); return sub_0206A8F4(param0, param1, (2400 + 80) + param2); } -void sub_0206AF5C (VarsFlags * param0) +void sub_0206AF5C(VarsFlags *param0) { sub_0206A8DC(param0, (2400 + 44)); } -BOOL sub_0206AF6C (VarsFlags * param0, int param1, int param2) +BOOL sub_0206AF6C(VarsFlags *param0, int param1, int param2) { GF_ASSERT(param2 < 20); return sub_0206A8F4(param0, param1, (2400 + 55) + param2); } -void sub_0206AF90 (VarsFlags * param0) +void sub_0206AF90(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 75)); return; } -void sub_0206AFA0 (VarsFlags * param0) +void sub_0206AFA0(VarsFlags *param0) { sub_0206A8E4(param0, (2400 + 76)); return; } -BOOL sub_0206AFB0 (VarsFlags * param0, int param1, int param2) +BOOL sub_0206AFB0(VarsFlags *param0, int param1, int param2) { return sub_0206A8F4(param0, param1, (2400 + 78) + param2); } -BOOL sub_0206AFC0 (VarsFlags * param0, int param1) +BOOL sub_0206AFC0(VarsFlags *param0, int param1) { return sub_0206A8F4(param0, param1, (2400 + 77)); } -BOOL sub_0206AFD0 (VarsFlags * param0) +BOOL sub_0206AFD0(VarsFlags *param0) { return sub_0206A8F4(param0, 2, (2400 + 23)); } diff --git a/src/unk_0206AFE0.c b/src/unk_0206AFE0.c index 6d74a41248..e5ca7462c2 100644 --- a/src/unk_0206AFE0.c +++ b/src/unk_0206AFE0.c @@ -1,31 +1,31 @@ +#include "unk_0206AFE0.h" + #include #include #include "struct_decls/struct_0203A790_decl.h" -#include "savedata.h" - #include "struct_defs/struct_02049FA8.h" +#include "field_overworld_state.h" +#include "savedata.h" #include "unk_0201D15C.h" #include "unk_0202B37C.h" -#include "field_overworld_state.h" -#include "vars_flags.h" #include "unk_0206A8DC.h" -#include "unk_0206AFE0.h" +#include "vars_flags.h" -static BOOL sub_0206AFE0(VarsFlags * param0, u16 param1, u16 param2); -static u16 sub_0206B010(VarsFlags * param0, u16 param1); -BOOL sub_0206B044(VarsFlags * param0, u16 param1); -u16 sub_0206B054(VarsFlags * param0); -u16 sub_0206B064(VarsFlags * param0); -u16 sub_0206B08C(VarsFlags * param0); -void sub_0206B558(VarsFlags * param0, u16 param1); -void sub_0206B514(SaveData * param0); -static u8 sub_0206B4A4(VarsFlags * param0); +static BOOL sub_0206AFE0(VarsFlags *param0, u16 param1, u16 param2); +static u16 sub_0206B010(VarsFlags *param0, u16 param1); +BOOL sub_0206B044(VarsFlags *param0, u16 param1); +u16 sub_0206B054(VarsFlags *param0); +u16 sub_0206B064(VarsFlags *param0); +u16 sub_0206B08C(VarsFlags *param0); +void sub_0206B558(VarsFlags *param0, u16 param1); +void sub_0206B514(SaveData *param0); +static u8 sub_0206B4A4(VarsFlags *param0); -static BOOL sub_0206AFE0 (VarsFlags * param0, u16 param1, u16 param2) +static BOOL sub_0206AFE0(VarsFlags *param0, u16 param1, u16 param2) { - u16 * v0 = VarsFlags_GetVarAddress(param0, param1); + u16 *v0 = VarsFlags_GetVarAddress(param0, param1); if ((param1 < 0x4000) || (param1 > 0x8000)) { GF_ASSERT(FALSE); @@ -40,9 +40,9 @@ static BOOL sub_0206AFE0 (VarsFlags * param0, u16 param1, u16 param2) return 1; } -static u16 sub_0206B010 (VarsFlags * param0, u16 param1) +static u16 sub_0206B010(VarsFlags *param0, u16 param1) { - u16 * v0 = VarsFlags_GetVarAddress(param0, param1); + u16 *v0 = VarsFlags_GetVarAddress(param0, param1); if (v0 == NULL) { return 0; @@ -51,27 +51,27 @@ static u16 sub_0206B010 (VarsFlags * param0, u16 param1) return *v0; } -BOOL sub_0206B024 (VarsFlags * param0, u16 param1) +BOOL sub_0206B024(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (15 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B034 (VarsFlags * param0) +u16 sub_0206B034(VarsFlags *param0) { return sub_0206B010(param0, (15 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B044 (VarsFlags * param0, u16 param1) +BOOL sub_0206B044(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (0 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B054 (VarsFlags * param0) +u16 sub_0206B054(VarsFlags *param0) { return sub_0206B010(param0, (0 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B064 (VarsFlags * param0) +u16 sub_0206B064(VarsFlags *param0) { u16 v0; u16 v1 = sub_0206B010(param0, (0 + (((0 + 0x4000) + 32) + 16))); @@ -87,7 +87,7 @@ u16 sub_0206B064 (VarsFlags * param0) return v0; } -u16 sub_0206B08C (VarsFlags * param0) +u16 sub_0206B08C(VarsFlags *param0) { u16 v0; u16 v1 = sub_0206B010(param0, (0 + (((0 + 0x4000) + 32) + 16))); @@ -103,58 +103,61 @@ u16 sub_0206B08C (VarsFlags * param0) return v0; } -u16 sub_0206B0B4 (VarsFlags * param0) +u16 sub_0206B0B4(VarsFlags *param0) { return sub_0206B010(param0, (5 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B0C4 (VarsFlags * param0, u16 param1) +BOOL sub_0206B0C4(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (5 + (((0 + 0x4000) + 32) + 16)), param1); } -void VsSeeker_Reset(VarsFlags * param0) +void VsSeeker_Reset(VarsFlags *param0) { VsSeeker_ClearUsedFlag(param0); VsSeeker_SetActiveStepCount(param0, 0); } -u16 VsSeeker_GetBattery(VarsFlags * param0) +u16 VsSeeker_GetBattery(VarsFlags *param0) { return sub_0206B010(param0, (3 + (((0 + 0x4000) + 32) + 16))); } -BOOL VsSeeker_SetBattery(VarsFlags * param0, u16 param1) +BOOL VsSeeker_SetBattery(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (3 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 VsSeeker_GetActiveStepCount(VarsFlags * param0) +u16 VsSeeker_GetActiveStepCount(VarsFlags *param0) { return sub_0206B010(param0, (4 + (((0 + 0x4000) + 32) + 16))); } -BOOL VsSeeker_SetActiveStepCount(VarsFlags * param0, u16 param1) +BOOL VsSeeker_SetActiveStepCount(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (4 + (((0 + 0x4000) + 32) + 16)), param1); } -static int sub_0206B128 (int param0) +static int sub_0206B128(int param0) { static const u16 v0[] = { - 0x1209, 0x1112, 0x1123, 0x1103, + 0x1209, + 0x1112, + 0x1123, + 0x1103, }; GF_ASSERT(0 <= param0 && param0 < NELEMS(v0)); return v0[param0]; } -void sub_0206B144 (VarsFlags * param0, int param1) +void sub_0206B144(VarsFlags *param0, int param1) { sub_0206AFE0(param0, (19 + (((0 + 0x4000) + 32) + 16)) + param1, sub_0206B128(param1)); } -BOOL sub_0206B16C (VarsFlags * param0, int param1) +BOOL sub_0206B16C(VarsFlags *param0, int param1) { if (sub_0206B010(param0, (19 + (((0 + 0x4000) + 32) + 16)) + param1) == sub_0206B128(param1)) { return 1; @@ -163,27 +166,30 @@ BOOL sub_0206B16C (VarsFlags * param0, int param1) } } -static int sub_0206B194 (int param0) +static int sub_0206B194(int param0) { static const u16 v0[] = { - 0x208, 0x229, 0x312, 0x1028, + 0x208, + 0x229, + 0x312, + 0x1028, }; GF_ASSERT(0 <= param0 && param0 < 4); return v0[param0]; } -void sub_0206B1B0 (VarsFlags * param0, int param1) +void sub_0206B1B0(VarsFlags *param0, int param1) { sub_0206AFE0(param0, (6 + (((0 + 0x4000) + 32) + 16)) + param1, sub_0206B194(param1)); } -void sub_0206B1D8 (VarsFlags * param0, int param1) +void sub_0206B1D8(VarsFlags *param0, int param1) { sub_0206AFE0(param0, (6 + (((0 + 0x4000) + 32) + 16)) + param1, 0); } -BOOL sub_0206B1F0 (VarsFlags * param0, int param1) +BOOL sub_0206B1F0(VarsFlags *param0, int param1) { if (sub_0206B010(param0, (6 + (((0 + 0x4000) + 32) + 16)) + param1) == sub_0206B194(param1)) { return 1; @@ -192,17 +198,17 @@ BOOL sub_0206B1F0 (VarsFlags * param0, int param1) } } -BOOL sub_0206B218 (VarsFlags * param0) +BOOL sub_0206B218(VarsFlags *param0) { return sub_0206AFE0(param0, (10 + (((0 + 0x4000) + 32) + 16)), 0); } -u16 sub_0206B228 (VarsFlags * param0) +u16 sub_0206B228(VarsFlags *param0) { return sub_0206B010(param0, (10 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B238 (VarsFlags * param0) +BOOL sub_0206B238(VarsFlags *param0) { u16 v0; @@ -217,17 +223,17 @@ BOOL sub_0206B238 (VarsFlags * param0) return sub_0206AFE0(param0, (10 + (((0 + 0x4000) + 32) + 16)), v0); } -u16 sub_0206B260 (VarsFlags * param0) +u16 sub_0206B260(VarsFlags *param0) { return sub_0206B010(param0, (11 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B270 (VarsFlags * param0, u16 param1) +BOOL sub_0206B270(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (11 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B280 (VarsFlags * param0, u32 param1) +void sub_0206B280(VarsFlags *param0, u32 param1) { u16 v0, v1; @@ -237,7 +243,7 @@ void sub_0206B280 (VarsFlags * param0, u32 param1) sub_0206AFE0(param0, (12 + (((0 + 0x4000) + 32) + 16)), v1); } -u32 sub_0206B2A4 (VarsFlags * param0) +u32 sub_0206B2A4(VarsFlags *param0) { u16 v0, v1; @@ -247,7 +253,7 @@ u32 sub_0206B2A4 (VarsFlags * param0) return (v1 << 16) | v0; } -void sub_0206B2C8 (VarsFlags * param0) +void sub_0206B2C8(VarsFlags *param0) { u16 v0, v1; @@ -257,9 +263,9 @@ void sub_0206B2C8 (VarsFlags * param0) sub_0206B280(param0, (v1 << 16) | v0); } -void sub_0206B2E4 (SaveData * param0, u16 param1) +void sub_0206B2E4(SaveData *param0, u16 param1) { - VarsFlags * v0 = SaveData_GetVarsFlags(param0); + VarsFlags *v0 = SaveData_GetVarsFlags(param0); u32 v1; v1 = sub_0202B428(sub_0202B4A0(param0)); @@ -268,26 +274,26 @@ void sub_0206B2E4 (SaveData * param0, u16 param1) sub_0206B280(v0, v1); } -u16 sub_0206B314 (VarsFlags * param0) +u16 sub_0206B314(VarsFlags *param0) { return sub_0206B010(param0, (17 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B324 (VarsFlags * param0, u16 param1) +BOOL sub_0206B324(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (17 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B334 (SaveData * param0) +void sub_0206B334(SaveData *param0) { - VarsFlags * v0 = SaveData_GetVarsFlags(param0); + VarsFlags *v0 = SaveData_GetVarsFlags(param0); u32 v1; v1 = (LCRNG_Next() % 98) + 2; sub_0206B324(v0, v1); } -u16 sub_0206B354 (VarsFlags * param0) +u16 sub_0206B354(VarsFlags *param0) { u16 v0; @@ -295,12 +301,12 @@ u16 sub_0206B354 (VarsFlags * param0) return v0; } -BOOL sub_0206B364 (VarsFlags * param0, u16 param1) +BOOL sub_0206B364(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (14 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B374 (VarsFlags * param0) +u16 sub_0206B374(VarsFlags *param0) { u16 v0; @@ -308,12 +314,12 @@ u16 sub_0206B374 (VarsFlags * param0) return v0; } -BOOL sub_0206B384 (VarsFlags * param0, u16 param1) +BOOL sub_0206B384(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (25 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B394 (VarsFlags * param0) +u16 sub_0206B394(VarsFlags *param0) { u16 v0; @@ -321,12 +327,12 @@ u16 sub_0206B394 (VarsFlags * param0) return v0; } -BOOL sub_0206B3A4 (VarsFlags * param0, u16 param1) +BOOL sub_0206B3A4(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (16 + (((0 + 0x4000) + 32) + 16)), param1); } -BOOL sub_0206B3B4 (VarsFlags * param0) +BOOL sub_0206B3B4(VarsFlags *param0) { u16 v0; @@ -341,62 +347,62 @@ BOOL sub_0206B3B4 (VarsFlags * param0) return sub_0206AFE0(param0, (18 + (((0 + 0x4000) + 32) + 16)), v0); } -u16 sub_0206B3DC (VarsFlags * param0) +u16 sub_0206B3DC(VarsFlags *param0) { return sub_0206B010(param0, (18 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B3EC (VarsFlags * param0) +u16 sub_0206B3EC(VarsFlags *param0) { return sub_0206B010(param0, (36 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B3FC (VarsFlags * param0, u16 param1) +BOOL sub_0206B3FC(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (36 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B40C (VarsFlags * param0) +u16 sub_0206B40C(VarsFlags *param0) { return sub_0206B010(param0, (23 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B41C (VarsFlags * param0, u16 param1) +BOOL sub_0206B41C(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (23 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B42C (VarsFlags * param0) +u16 sub_0206B42C(VarsFlags *param0) { return sub_0206B010(param0, (24 + (((0 + 0x4000) + 32) + 16))); } -BOOL sub_0206B43C (VarsFlags * param0, u16 param1) +BOOL sub_0206B43C(VarsFlags *param0, u16 param1) { return sub_0206AFE0(param0, (24 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B44C (VarsFlags * param0) +u16 sub_0206B44C(VarsFlags *param0) { return sub_0206B010(param0, (26 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B45C (VarsFlags * param0, u16 param1) +void sub_0206B45C(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (26 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B46C (VarsFlags * param0, u16 param1) +void sub_0206B46C(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (27 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B47C (VarsFlags * param0) +u16 sub_0206B47C(VarsFlags *param0) { return sub_0206B010(param0, (27 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B48C (VarsFlags * param0, u16 param1) +void sub_0206B48C(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (29 + (((0 + 0x4000) + 32) + 16)), (param1 + 1)); } @@ -413,7 +419,7 @@ static const u8 Unk_020EFA6C[] = { 0xF }; -static u8 sub_0206B4A4 (VarsFlags * param0) +static u8 sub_0206B4A4(VarsFlags *param0) { int v0; u16 v1, v2, v3; @@ -444,12 +450,12 @@ static u8 sub_0206B4A4 (VarsFlags * param0) return v2; } -void sub_0206B514 (SaveData * param0) +void sub_0206B514(SaveData *param0) { u32 v0; - VarsFlags * v1 = SaveData_GetVarsFlags(param0); - FieldOverworldState * v2 = SaveData_GetFieldOverworldState(param0); - Location * location = sub_0203A720(v2); + VarsFlags *v1 = SaveData_GetVarsFlags(param0); + FieldOverworldState *v2 = SaveData_GetFieldOverworldState(param0); + Location *location = sub_0203A720(v2); if ((location->mapId != 457) && (location->mapId != 464)) { sub_0206AF90(v1); @@ -460,93 +466,93 @@ void sub_0206B514 (SaveData * param0) return; } -void sub_0206B558 (VarsFlags * param0, u16 param1) +void sub_0206B558(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (30 + (((0 + 0x4000) + 32) + 16)), param1); sub_0206AFE0(param0, (42 + (((0 + 0x4000) + 32) + 16)), (LCRNG_Next() % 5)); } -u16 sub_0206B588 (VarsFlags * param0) +u16 sub_0206B588(VarsFlags *param0) { return sub_0206B010(param0, (32 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B598 (VarsFlags * param0) +u16 sub_0206B598(VarsFlags *param0) { return sub_0206B010(param0, (33 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B5A8 (VarsFlags * param0) +u16 sub_0206B5A8(VarsFlags *param0) { return sub_0206B010(param0, (34 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B5B8 (VarsFlags * param0) +u16 sub_0206B5B8(VarsFlags *param0) { return sub_0206B010(param0, (35 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B5C8 (VarsFlags * param0) +u16 sub_0206B5C8(VarsFlags *param0) { return sub_0206B010(param0, (31 + (((0 + 0x4000) + 32) + 16))); } -u16 sub_0206B5D8 (VarsFlags * param0) +u16 sub_0206B5D8(VarsFlags *param0) { return sub_0206B010(param0, (37 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B5E8 (VarsFlags * param0, u16 param1) +void sub_0206B5E8(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (37 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B5F8 (VarsFlags * param0) +u16 sub_0206B5F8(VarsFlags *param0) { return sub_0206B010(param0, (38 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B608 (VarsFlags * param0, u16 param1) +void sub_0206B608(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (38 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B618 (VarsFlags * param0) +u16 sub_0206B618(VarsFlags *param0) { return sub_0206B010(param0, (39 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B628 (VarsFlags * param0, u16 param1) +void sub_0206B628(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (39 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B638 (VarsFlags * param0, u16 param1) +void sub_0206B638(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (40 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B648 (VarsFlags * param0, u16 param1) +void sub_0206B648(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (41 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B658 (VarsFlags * param0, u16 param1) +void sub_0206B658(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (46 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B668 (VarsFlags * param0, u16 param1) +void sub_0206B668(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (47 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B678 (VarsFlags * param0, u16 param1) +void sub_0206B678(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (48 + (((0 + 0x4000) + 32) + 16)), param1); } -void sub_0206B688 (VarsFlags * param0, u16 param1, u16 param2) +void sub_0206B688(VarsFlags *param0, u16 param1, u16 param2) { switch (param1) { case 481: @@ -569,17 +575,17 @@ void sub_0206B688 (VarsFlags * param0, u16 param1, u16 param2) return; } -u16 sub_0206B6DC (VarsFlags * param0) +u16 sub_0206B6DC(VarsFlags *param0) { return sub_0206B010(param0, (43 + (((0 + 0x4000) + 32) + 16))); } -void sub_0206B6EC (VarsFlags * param0, u16 param1) +void sub_0206B6EC(VarsFlags *param0, u16 param1) { sub_0206AFE0(param0, (43 + (((0 + 0x4000) + 32) + 16)), param1); } -u16 sub_0206B6FC (VarsFlags * param0) +u16 sub_0206B6FC(VarsFlags *param0) { return sub_0206B010(param0, (52 + (((0 + 0x4000) + 32) + 16))); } diff --git a/src/unk_0206B70C.c b/src/unk_0206B70C.c index b7a971409a..171a5f26c7 100644 --- a/src/unk_0206B70C.c +++ b/src/unk_0206B70C.c @@ -1,30 +1,28 @@ +#include "unk_0206B70C.h" + #include #include -#include "inlines.h" - -#include "trainer_info.h" #include "struct_decls/struct_0203A790_decl.h" - -#include "field/field_system.h" #include "struct_defs/struct_0203D8AC.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_020556C4.h" #include "struct_defs/union_0206B878.h" +#include "field/field_system.h" + +#include "field_overworld_state.h" +#include "field_system.h" #include "heap.h" -#include "unk_02025E08.h" +#include "inlines.h" +#include "map_header.h" +#include "player_avatar.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_02039C80.h" -#include "map_header.h" -#include "field_overworld_state.h" -#include "field_system.h" #include "unk_0203E880.h" -#include "vars_flags.h" -#include "player_avatar.h" #include "unk_0206AFE0.h" -#include "unk_0206B70C.h" - +#include "vars_flags.h" typedef struct { u8 unk_00; @@ -33,19 +31,19 @@ typedef struct { u8 unk_03; } UnkStruct_0206B878; -static void sub_0206B878(FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1, const char * param2); +static void sub_0206B878(FieldSystem *fieldSystem, UnkStruct_0203D8AC *param1, const char *param2); static const int Unk_020EFA98[10][4] = { - { 0x23D, 0x15, 0x120, 0xA }, - { 0x23E, 0x0, 0x100, 0x23 }, - { 0x23F, 0xF, 0xE0, 0x0 }, - { 0x240, 0x2F, 0xC0, 0x15 }, - { 0x241, 0x39, 0xA0, 0x22 }, - { 0x243, 0x39, 0x80, 0x22 }, - { 0x244, 0x38, 0x72, 0x26 }, - { 0x245, 0x4A, 0x40, 0x20 }, - { 0x246, 0x0, 0x0, 0x0 }, - { 0x247, 0x46, 0x40, 0x1E } + { 0x23D, 0x15, 0x120, 0xA }, + { 0x23E, 0x0, 0x100, 0x23 }, + { 0x23F, 0xF, 0xE0, 0x0 }, + { 0x240, 0x2F, 0xC0, 0x15 }, + { 0x241, 0x39, 0xA0, 0x22 }, + { 0x243, 0x39, 0x80, 0x22 }, + { 0x244, 0x38, 0x72, 0x26 }, + { 0x245, 0x4A, 0x40, 0x20 }, + { 0x246, 0x0, 0x0, 0x0 }, + { 0x247, 0x46, 0x40, 0x1E } }; static const u8 Unk_020EFA84[20] = { @@ -71,15 +69,15 @@ static const u8 Unk_020EFA84[20] = { 0x44 }; -void sub_0206B70C (FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1, int param2) +void sub_0206B70C(FieldSystem *fieldSystem, UnkStruct_0203D8AC *param1, int param2) { - TrainerInfo * v0; + TrainerInfo *v0; int v1 = 0, v2 = 0, v3 = 0; int x, z, v6; - UnkStruct_020556C4 * v7; - VarsFlags * v8 = SaveData_GetVarsFlags(fieldSystem->saveData); - FieldOverworldState * v9 = SaveData_GetFieldOverworldState(fieldSystem->saveData); - Location * v10 = sub_0203A72C(v9); + UnkStruct_020556C4 *v7; + VarsFlags *v8 = SaveData_GetVarsFlags(fieldSystem->saveData); + FieldOverworldState *v9 = SaveData_GetFieldOverworldState(fieldSystem->saveData); + Location *v10 = sub_0203A72C(v9); memset(param1, 0, sizeof(UnkStruct_0203D8AC)); @@ -87,7 +85,7 @@ void sub_0206B70C (FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1, int p z = Player_GetZPos(fieldSystem->playerAvatar); int v11 = 10 - 1; - Location * location = sub_0203A720(v9); + Location *location = sub_0203A720(v9); v6 = location->mapId; @@ -100,7 +98,7 @@ void sub_0206B70C (FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1, int p v11--; } - + v6 = sub_02039E30(fieldSystem->unk_2C, x / 32, z / 32); if (MapHeader_IsOnMainMatrix(v6)) { @@ -149,14 +147,14 @@ void sub_0206B70C (FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1, int p param1->unk_139 = param2; } -static void sub_0206B878 (FieldSystem * fieldSystem, UnkStruct_0203D8AC * param1, const char * param2) +static void sub_0206B878(FieldSystem *fieldSystem, UnkStruct_0203D8AC *param1, const char *param2) { FSFile v0; int v1, v2; int v3; - UnkStruct_0206B878 * v4; - UnkUnion_0206B878 * v5; - VarsFlags * v6 = SaveData_GetVarsFlags(fieldSystem->saveData); + UnkStruct_0206B878 *v4; + UnkUnion_0206B878 *v5; + VarsFlags *v6 = SaveData_GetVarsFlags(fieldSystem->saveData); FS_InitFile(&v0); diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c index 3d0479065b..469fe96462 100644 --- a/src/unk_0206B9D8.c +++ b/src/unk_0206B9D8.c @@ -1,3 +1,5 @@ +#include "unk_0206B9D8.h" + #include #include @@ -8,36 +10,35 @@ #include "struct_decls/struct_0202D750_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "savedata.h" - -#include "constdata/const_020F1E88.h" -#include "constdata/const_020F410C.h" - -#include "field/field_system.h" +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0206BC70.h" #include "struct_defs/struct_02098C44.h" -#include "struct_defs/pokemon_summary.h" +#include "field/field_system.h" + +#include "bag.h" +#include "communication_system.h" +#include "field_system.h" #include "heap.h" +#include "party.h" +#include "pokemon_summary_app.h" +#include "savedata.h" #include "unk_02025E08.h" #include "unk_0202854C.h" #include "unk_0202B37C.h" #include "unk_0202D05C.h" #include "unk_0202D778.h" #include "unk_0203061C.h" -#include "communication_system.h" #include "unk_020363E8.h" #include "unk_02038FFC.h" -#include "field_system.h" #include "unk_0203D1B8.h" #include "unk_0203E880.h" #include "unk_0204AEE8.h" #include "unk_020508D4.h" -#include "unk_0206B9D8.h" -#include "party.h" #include "unk_0207A274.h" -#include "bag.h" -#include "pokemon_summary_app.h" + +#include "constdata/const_020F1E88.h" +#include "constdata/const_020F410C.h" typedef struct { int unk_00; @@ -49,14 +50,14 @@ typedef struct { u8 unk_0C; u8 unk_0D; u8 unk_0E[6]; - void ** unk_14; + void **unk_14; } UnkStruct_0206B9D8; typedef struct { int unk_00; int unk_04; - UnkStruct_0206BC70 * unk_08; - u16 ** unk_0C; + UnkStruct_0206BC70 *unk_08; + u16 **unk_0C; u16 unk_10; u16 unk_12; u16 unk_14; @@ -67,11 +68,11 @@ typedef struct { u16 unk_02; } UnkStruct_0206BD88; -static int sub_0206B9D8 (UnkStruct_0206B9D8 * param0, FieldSystem * fieldSystem, int param2) +static int sub_0206B9D8(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, int param2) { u8 v0; - SaveData * v1; - PartyManagementData * v2 = Heap_AllocFromHeapAtEnd(param2, sizeof(PartyManagementData)); + SaveData *v1; + PartyManagementData *v2 = Heap_AllocFromHeapAtEnd(param2, sizeof(PartyManagementData)); v1 = fieldSystem->saveData; MI_CpuClear8(v2, sizeof(PartyManagementData)); @@ -96,10 +97,10 @@ static int sub_0206B9D8 (UnkStruct_0206B9D8 * param0, FieldSystem * fieldSystem, return 1; } -static int sub_0206BA84 (UnkStruct_0206B9D8 * param0, FieldSystem * fieldSystem) +static int sub_0206BA84(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem) { int v0; - PartyManagementData * v1; + PartyManagementData *v1; if (sub_020509B4(fieldSystem)) { return 1; @@ -126,10 +127,10 @@ static int sub_0206BA84 (UnkStruct_0206B9D8 * param0, FieldSystem * fieldSystem) return 2; } -static int sub_0206BAE0 (UnkStruct_0206B9D8 * param0, FieldSystem * fieldSystem, int param2) +static int sub_0206BAE0(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, int param2) { - PokemonSummary * v0; - SaveData * v1; + PokemonSummary *v0; + SaveData *v1; static const u8 v2[] = { 0, 1, 2, 4, 3, 5, 6, 7, 8 }; @@ -157,9 +158,9 @@ static int sub_0206BAE0 (UnkStruct_0206B9D8 * param0, FieldSystem * fieldSystem, return 3; } -static int sub_0206BB6C (UnkStruct_0206B9D8 * param0, FieldSystem * fieldSystem) +static int sub_0206BB6C(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem) { - PokemonSummary * v0; + PokemonSummary *v0; if (sub_020509B4(fieldSystem)) { return 3; @@ -173,10 +174,10 @@ static int sub_0206BB6C (UnkStruct_0206B9D8 * param0, FieldSystem * fieldSystem) return 0; } -static BOOL sub_0206BB94 (TaskManager * param0) +static BOOL sub_0206BB94(TaskManager *param0) { - FieldSystem * v0 = TaskManager_FieldSystem(param0); - UnkStruct_0206B9D8 * v1 = TaskManager_Environment(param0); + FieldSystem *v0 = TaskManager_FieldSystem(param0); + UnkStruct_0206B9D8 *v1 = TaskManager_Environment(param0); switch (v1->unk_04) { case 0: @@ -199,10 +200,10 @@ static BOOL sub_0206BB94 (TaskManager * param0) return 0; } -void sub_0206BBFC (TaskManager * param0, void ** param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7) +void sub_0206BBFC(TaskManager *param0, void **param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0206B9D8 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206B9D8)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0206B9D8 *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206B9D8)); MI_CpuClear8(v1, sizeof(UnkStruct_0206B9D8)); @@ -217,9 +218,9 @@ void sub_0206BBFC (TaskManager * param0, void ** param1, u8 param2, u8 param3, u FieldTask_Start(fieldSystem->unk_10, sub_0206BB94, v1); } -static int sub_0206BC48 (UnkStruct_0206BC48 * param0, FieldSystem * fieldSystem) +static int sub_0206BC48(UnkStruct_0206BC48 *param0, FieldSystem *fieldSystem) { - SaveData * v0; + SaveData *v0; if (sub_02039074(fieldSystem->saveData)) { param0->unk_08 = sub_0203E1AC(fieldSystem, param0->unk_12, param0->unk_14); @@ -230,10 +231,10 @@ static int sub_0206BC48 (UnkStruct_0206BC48 * param0, FieldSystem * fieldSystem) } } -static int sub_0206BC70 (UnkStruct_0206BC48 * param0, FieldSystem * fieldSystem) +static int sub_0206BC70(UnkStruct_0206BC48 *param0, FieldSystem *fieldSystem) { u8 v0; - UnkStruct_0206BC70 * v1; + UnkStruct_0206BC70 *v1; if (sub_020509B4(fieldSystem)) { return 1; @@ -245,11 +246,11 @@ static int sub_0206BC70 (UnkStruct_0206BC48 * param0, FieldSystem * fieldSystem) return 2; } -static BOOL sub_0206BC94 (TaskManager * param0) +static BOOL sub_0206BC94(TaskManager *param0) { - u16 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0206BC48 * v2 = TaskManager_Environment(param0); + u16 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0206BC48 *v2 = TaskManager_Environment(param0); switch (v2->unk_04) { case 0: @@ -268,10 +269,10 @@ static BOOL sub_0206BC94 (TaskManager * param0) return 0; } -void sub_0206BCE4 (TaskManager * param0, u16 param1, u16 param2, u16 param3) +void sub_0206BCE4(TaskManager *param0, u16 param1, u16 param2, u16 param3) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0206BC48 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206BC48)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0206BC48 *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206BC48)); MI_CpuClear8(v1, sizeof(UnkStruct_0206BC48)); @@ -282,12 +283,12 @@ void sub_0206BCE4 (TaskManager * param0, u16 param1, u16 param2, u16 param3) FieldTask_Start(fieldSystem->unk_10, sub_0206BC94, v1); } -static BOOL sub_0206BD1C (TaskManager * param0) +static BOOL sub_0206BD1C(TaskManager *param0) { - u16 * v0; - const void * v1; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0206BD88 * v3 = TaskManager_Environment(param0); + u16 *v0; + const void *v1; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0206BD88 *v3 = TaskManager_Environment(param0); v1 = sub_0203664C(1 - CommSys_CurNetId()); @@ -312,10 +313,10 @@ static BOOL sub_0206BD1C (TaskManager * param0) return 1; } -void sub_0206BD88 (TaskManager * param0, u16 param1, u16 param2) +void sub_0206BD88(TaskManager *param0, u16 param1, u16 param2) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0206BD88 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206BD88)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0206BD88 *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206BD88)); MI_CpuClear8(v1, sizeof(UnkStruct_0206BD88)); @@ -325,11 +326,11 @@ void sub_0206BD88 (TaskManager * param0, u16 param1, u16 param2) FieldTask_Start(fieldSystem->unk_10, sub_0206BD1C, v1); } -u16 sub_0206BDBC (SaveData * param0) +u16 sub_0206BDBC(SaveData *param0) { - UnkStruct_0203068C * v0; - UnkStruct_0202D750 * v1; - UndergroundData * v2; + UnkStruct_0203068C *v0; + UnkStruct_0202D750 *v1; + UndergroundData *v2; u16 v3; u8 v4, v5, v6, v7, v8, v9; @@ -400,10 +401,10 @@ u16 sub_0206BDBC (SaveData * param0) } } -u16 sub_0206BF04 (SaveData * param0) +u16 sub_0206BF04(SaveData *param0) { - UnkStruct_0203068C * v0; - UnkStruct_0202D750 * v1; + UnkStruct_0203068C *v0; + UnkStruct_0202D750 *v1; u16 v2; u8 v3, v4, v5, v6, v7, v8; @@ -461,17 +462,17 @@ u16 sub_0206BF04 (SaveData * param0) return 3; } -u32 sub_0206BFF0 (u32 param0) +u32 sub_0206BFF0(u32 param0) { return param0 * 48828125L + 1; } -u32 sub_0206BFFC (u32 param0) +u32 sub_0206BFFC(u32 param0) { return param0 * 1566083941 + 1; } -u32 sub_0206C008 (SaveData * param0) +u32 sub_0206C008(SaveData *param0) { u32 v0; @@ -483,10 +484,10 @@ u32 sub_0206C008 (SaveData * param0) return v0; } -u32 sub_0206C02C (SaveData * param0) +u32 sub_0206C02C(SaveData *param0) { u32 v0, v1; - UnkStruct_0202D750 * v2 = sub_0202D750(param0); + UnkStruct_0202D750 *v2 = sub_0202D750(param0); v1 = sub_0202D474(v2); v1 = sub_0206BFFC(v1); @@ -498,12 +499,12 @@ u32 sub_0206C02C (SaveData * param0) return v0; } -u32 sub_0206C068 (SaveData * param0) +u32 sub_0206C068(SaveData *param0) { int v0, v1; u32 v2, v3; - UnkStruct_0202D750 * v4 = sub_0202D750(param0); - UnkStruct_0202D060 * v5 = sub_0202D740(param0); + UnkStruct_0202D750 *v4 = sub_0202D750(param0); + UnkStruct_0202D060 *v5 = sub_0202D740(param0); v3 = sub_0202D474(v4); v2 = sub_0206BFF0(v3); @@ -519,7 +520,7 @@ u32 sub_0206C068 (SaveData * param0) return v2; } -BOOL sub_0206C0D0 (FieldSystem * fieldSystem) +BOOL sub_0206C0D0(FieldSystem *fieldSystem) { if (fieldSystem->location->mapId == SPECIES_ARCEUS) { return 1; diff --git a/src/unk_0206C0E8.c b/src/unk_0206C0E8.c index a467dc636a..b3eb094761 100644 --- a/src/unk_0206C0E8.c +++ b/src/unk_0206C0E8.c @@ -1,46 +1,46 @@ +#include "unk_0206C0E8.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "overlay006/struct_ov6_022426B8_decl.h" -#include "overlay006/struct_ov6_02242A8C_decl.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_02049FA8.h" +#include "overlay006/ov6_022426AC.h" +#include "overlay006/ov6_02242984.h" +#include "overlay006/struct_ov6_022426B8_decl.h" +#include "overlay006/struct_ov6_02242A8C_decl.h" -#include "unk_02005474.h" +#include "core_sys.h" +#include "field_map_change.h" #include "heap.h" -#include "vars_flags.h" +#include "map_object.h" +#include "player_avatar.h" +#include "unk_02005474.h" #include "unk_020508D4.h" -#include "field_map_change.h" #include "unk_02055808.h" #include "unk_02056B30.h" -#include "player_avatar.h" -#include "map_object.h" #include "unk_0206A8DC.h" -#include "unk_0206C0E8.h" #include "unk_02070428.h" -#include "overlay006/ov6_022426AC.h" -#include "overlay006/ov6_02242984.h" +#include "vars_flags.h" typedef struct { - UnkStruct_ov6_022426B8 * unk_00; - UnkStruct_ov6_02242A8C * unk_04; - Location * unk_08; + UnkStruct_ov6_022426B8 *unk_00; + UnkStruct_ov6_02242A8C *unk_04; + Location *unk_08; u8 unk_0C; u8 unk_0D; u8 unk_0E; } UnkStruct_0206C0E8; -static BOOL sub_0206C120(TaskManager * taskMan); +static BOOL sub_0206C120(TaskManager *taskMan); -void sub_0206C0E8 (FieldSystem * fieldSystem) +void sub_0206C0E8(FieldSystem *fieldSystem) { - UnkStruct_0206C0E8 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0206C0E8)); + UnkStruct_0206C0E8 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0206C0E8)); v0->unk_00 = ov6_022426AC(11); v0->unk_04 = ov6_02242A10(11, fieldSystem); @@ -50,10 +50,10 @@ void sub_0206C0E8 (FieldSystem * fieldSystem) FieldTask_Start(fieldSystem->unk_10, sub_0206C120, v0); } -static BOOL sub_0206C120 (TaskManager * taskMan) +static BOOL sub_0206C120(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_0206C0E8 * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0206C0E8 *v1 = TaskManager_Environment(taskMan); switch (v1->unk_0C) { case 0: @@ -67,9 +67,8 @@ static BOOL sub_0206C120 (TaskManager * taskMan) sub_02055820(taskMan); v1->unk_0C = 2; break; - case 2: - { - VarsFlags * v2 = SaveData_GetVarsFlags(fieldSystem->saveData); + case 2: { + VarsFlags *v2 = SaveData_GetVarsFlags(fieldSystem->saveData); if (v1->unk_0D == 0) { sub_0206AE0C(v2); @@ -85,9 +84,8 @@ static BOOL sub_0206C120 (TaskManager * taskMan) sub_02055868(taskMan); v1->unk_0C = 4; break; - case 4: - { - MapObject * v3 = Player_MapObject(fieldSystem->playerAvatar); + case 4: { + MapObject *v3 = Player_MapObject(fieldSystem->playerAvatar); v1->unk_0D++; @@ -107,8 +105,7 @@ static BOOL sub_0206C120 (TaskManager * taskMan) sub_020558F0(taskMan); v1->unk_0C = 8; } - } - break; + } break; case 5: v1->unk_0E++; diff --git a/src/unk_0206C2D0.c b/src/unk_0206C2D0.c index 15538968b1..58a1dadb95 100644 --- a/src/unk_0206C2D0.c +++ b/src/unk_0206C2D0.c @@ -1,23 +1,23 @@ +#include "unk_0206C2D0.h" + #include #include -#include "trainer_info.h" #include "struct_decls/struct_0202C834_decl.h" #include "struct_decls/struct_0202C844_decl.h" -#include "savedata.h" -#include "unk_02025E08.h" +#include "savedata.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0202C7FC.h" -#include "unk_0206C2D0.h" -void sub_0206C2D0 (SaveData * param0, const s32 param1) +void sub_0206C2D0(SaveData *param0, const s32 param1) { u8 v0; int v1; - UnkStruct_0202C834 * v2; - UnkStruct_0202C844 * v3; - TrainerInfo * v4; + UnkStruct_0202C834 *v2; + UnkStruct_0202C844 *v3; + TrainerInfo *v4; if (param1 <= 0) { return; diff --git a/src/unk_0206C660.c b/src/unk_0206C660.c index ee9495fbbf..80020b3448 100644 --- a/src/unk_0206C660.c +++ b/src/unk_0206C660.c @@ -1,55 +1,58 @@ +#include "unk_0206C660.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" -#include "overlay006/struct_ov6_02246204_decl.h" #include "field/field_system.h" +#include "overlay006/ov6_02246184.h" +#include "overlay006/struct_ov6_02246204_decl.h" #include "overlay006/struct_ov6_02246254.h" +#include "overlay095/ov95_02246C20.h" #include "heap.h" +#include "pokemon.h" #include "unk_020508D4.h" #include "unk_02055808.h" -#include "unk_0206C660.h" -#include "pokemon.h" -#include "overlay006/ov6_02246184.h" -#include "overlay095/ov95_02246C20.h" FS_EXTERN_OVERLAY(overlay95); typedef struct { - UnkStruct_ov6_02246204 * unk_00; + UnkStruct_ov6_02246204 *unk_00; u32 unk_04; int unk_08; UnkStruct_ov6_02246254 unk_0C; - Pokemon * unk_24; - Pokemon * unk_28; + Pokemon *unk_24; + Pokemon *unk_28; } UnkStruct_0206C660; -static BOOL sub_0206C680(TaskManager * param0); -static void sub_0206C660(TaskManager * param0); +static BOOL sub_0206C680(TaskManager *param0); +static void sub_0206C660(TaskManager *param0); -void sub_0206C660 (TaskManager * param0) +void sub_0206C660(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0206C660 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0206C660 *v1 = TaskManager_Environment(param0); { FS_EXTERN_OVERLAY(overlay95); static const OverlayManagerTemplate v2 = { - ov95_02246C20, ov95_02246E7C, ov95_02246E1C, FS_OVERLAY_ID(overlay95), + ov95_02246C20, + ov95_02246E7C, + ov95_02246E1C, + FS_OVERLAY_ID(overlay95), }; sub_02050A38(param0, &v2, &v1->unk_0C); } } -static BOOL sub_0206C680 (TaskManager * param0) +static BOOL sub_0206C680(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0206C660 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0206C660 *v1 = TaskManager_Environment(param0); switch (v1->unk_04) { case 0: @@ -87,9 +90,9 @@ static BOOL sub_0206C680 (TaskManager * param0) return 0; } -void sub_0206C740 (TaskManager * param0, UnkStruct_ov6_02246204 * param1, int param2, u32 param3) +void sub_0206C740(TaskManager *param0, UnkStruct_ov6_02246204 *param1, int param2, u32 param3) { - UnkStruct_0206C660 * v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_0206C660)); + UnkStruct_0206C660 *v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_0206C660)); memset(v0, 0, sizeof(UnkStruct_0206C660)); diff --git a/src/unk_0206C784.c b/src/unk_0206C784.c index 859daa59b5..1130c97fcf 100644 --- a/src/unk_0206C784.c +++ b/src/unk_0206C784.c @@ -1,31 +1,32 @@ +#include "unk_0206C784.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" -#include "overlay005/struct_ov5_021E1890_decl.h" +#include "struct_defs/struct_02055130.h" +#include "struct_defs/struct_0206C8D4.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_02055130.h" -#include "struct_defs/struct_0206C8D4.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021EF75C.h" #include "overlay005/struct_ov5_021D5894.h" +#include "overlay005/struct_ov5_021E1890_decl.h" +#include "camera.h" +#include "field_map_change.h" +#include "heap.h" +#include "player_avatar.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200F174.h" -#include "heap.h" -#include "camera.h" #include "unk_0203D1B8.h" #include "unk_020508D4.h" -#include "field_map_change.h" #include "unk_02054D00.h" #include "unk_020553DC.h" #include "unk_02055808.h" -#include "player_avatar.h" -#include "unk_0206C784.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021EF75C.h" typedef struct { u8 unk_00; @@ -43,22 +44,22 @@ typedef struct { int unk_1C; int unk_20; VecFx32 unk_24; - UnkStruct_ov5_021E1890 * unk_30; + UnkStruct_ov5_021E1890 *unk_30; UnkStruct_ov5_021D5894 unk_34; fx32 unk_7C; } UnkStruct_0206CAD0; -static void sub_0206C8D4(FieldSystem * fieldSystem, const u8 param1, UnkStruct_ov5_021D5894 * param2); -static BOOL sub_0206C8F8(TaskManager * param0); -static BOOL sub_0206C964(TaskManager * param0); -static BOOL sub_0206CAD0(UnkStruct_0206CAD0 * param0); -static BOOL sub_0206CB8C(const fx32 * param0, const fx32 * param1, u8 * param2); -static void sub_0206CBA0(FieldSystem * fieldSystem); -static void sub_0206CC64(UnkStruct_0206CAD0 * param0); +static void sub_0206C8D4(FieldSystem *fieldSystem, const u8 param1, UnkStruct_ov5_021D5894 *param2); +static BOOL sub_0206C8F8(TaskManager *param0); +static BOOL sub_0206C964(TaskManager *param0); +static BOOL sub_0206CAD0(UnkStruct_0206CAD0 *param0); +static BOOL sub_0206CB8C(const fx32 *param0, const fx32 *param1, u8 *param2); +static void sub_0206CBA0(FieldSystem *fieldSystem); +static void sub_0206CC64(UnkStruct_0206CAD0 *param0); -void sub_0206C784 (FieldSystem * fieldSystem, const u8 param1, const u8 param2, const int param3, const int param4, const int param5) +void sub_0206C784(FieldSystem *fieldSystem, const u8 param1, const u8 param2, const int param3, const int param4, const int param5) { - UnkStruct_0206CAD0 * v0; + UnkStruct_0206CAD0 *v0; BOOL v1; BOOL v2; UnkStruct_02055130 v3; @@ -129,9 +130,9 @@ void sub_0206C784 (FieldSystem * fieldSystem, const u8 param1, const u8 param2, FieldTask_Start(fieldSystem->unk_10, sub_0206C964, v0); } -static void sub_0206C8D4 (FieldSystem * fieldSystem, const u8 param1, UnkStruct_ov5_021D5894 * param2) +static void sub_0206C8D4(FieldSystem *fieldSystem, const u8 param1, UnkStruct_ov5_021D5894 *param2) { - UnkStruct_0206C8D4 * v0; + UnkStruct_0206C8D4 *v0; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0206C8D4)); @@ -141,11 +142,11 @@ static void sub_0206C8D4 (FieldSystem * fieldSystem, const u8 param1, UnkStruct_ FieldTask_Start(fieldSystem->unk_10, sub_0206C8F8, v0); } -static BOOL sub_0206C8F8 (TaskManager * taskMan) +static BOOL sub_0206C8F8(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_0206C8D4 * v1 = TaskManager_Environment(taskMan); - int * v2 = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0206C8D4 *v1 = TaskManager_Environment(taskMan); + int *v2 = FieldTask_GetState(taskMan); switch (*v2) { case 0: @@ -169,10 +170,10 @@ static BOOL sub_0206C8F8 (TaskManager * taskMan) return 0; } -static BOOL sub_0206C964 (TaskManager * taskMan) +static BOOL sub_0206C964(TaskManager *taskMan) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_0206CAD0 * v1 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0206CAD0 *v1 = TaskManager_Environment(taskMan); switch (v1->unk_00) { case 0: @@ -182,8 +183,7 @@ static BOOL sub_0206C964 (TaskManager * taskMan) v1->unk_00 = 2; } break; - case 1: - { + case 1: { BOOL v2; sub_0206CC64(v1); @@ -200,8 +200,7 @@ static BOOL sub_0206C964 (TaskManager * taskMan) v1->unk_00 = 2; } } - } - break; + } break; case 2: sub_0200F174(0, 0, 0, 0x0, 6, 1, 11); sub_0200564C(0, 6); @@ -241,7 +240,7 @@ static BOOL sub_0206C964 (TaskManager * taskMan) return 0; } -static BOOL sub_0206CAD0 (UnkStruct_0206CAD0 * param0) +static BOOL sub_0206CAD0(UnkStruct_0206CAD0 *param0) { VecFx32 v0; @@ -288,7 +287,7 @@ static BOOL sub_0206CAD0 (UnkStruct_0206CAD0 * param0) } } -static BOOL sub_0206CB8C (const fx32 * param0, const fx32 * param1, u8 * param2) +static BOOL sub_0206CB8C(const fx32 *param0, const fx32 *param1, u8 *param2) { if ((*param0) <= (*param1)) { (*param2) = 1; @@ -298,21 +297,21 @@ static BOOL sub_0206CB8C (const fx32 * param0, const fx32 * param1, u8 * param2) } } -static void sub_0206CBA0 (FieldSystem * fieldSystem) +static void sub_0206CBA0(FieldSystem *fieldSystem) { u8 v0; BOOL v1; - int v2[2] = {31, 32}; - int v3[2] = {1, 2}; + int v2[2] = { 31, 32 }; + int v3[2] = { 1, 2 }; for (v0 = 0; v0 < 2; v0++) { v1 = sub_020552B4(fieldSystem, v2[v0], NULL, NULL); if (v1) { - NNSG3dResMdl * v4; - NNSG3dResFileHeader ** v5; - UnkStruct_ov5_021E1890 * v6; - NNSG3dRenderObj * v7; + NNSG3dResMdl *v4; + NNSG3dResFileHeader **v5; + UnkStruct_ov5_021E1890 *v6; + NNSG3dRenderObj *v7; v5 = ov5_021EF9E8(v2[v0], fieldSystem->unk_30); v4 = NNS_G3dGetMdlByIdx(NNS_G3dGetMdlSet(*v5), 0); @@ -328,7 +327,7 @@ static void sub_0206CBA0 (FieldSystem * fieldSystem) } } -static void sub_0206CC64 (UnkStruct_0206CAD0 * param0) +static void sub_0206CC64(UnkStruct_0206CAD0 *param0) { switch (param0->unk_01) { case 3: diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c index f83b4fa95d..e9712d7a40 100644 --- a/src/unk_0206CCB0.c +++ b/src/unk_0206CCB0.c @@ -1,22 +1,18 @@ +#include "unk_0206CCB0.h" + #include #include -#include "inlines.h" +#include "constants/overworld_weather.h" +#include "constants/species.h" -#include "message.h" -#include "strbuf.h" -#include "struct_decls/struct_0202440C_decl.h" -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" +#include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_02027854_decl.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_0202A750_decl.h" #include "struct_decls/struct_0202B4A0_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" -#include "overlay006/struct_ov6_022465F4_decl.h" - #include "struct_defs/struct_0202D7B0.h" #include "struct_defs/struct_0202E7D8.h" #include "struct_defs/struct_0202E7E4.h" @@ -27,53 +23,52 @@ #include "struct_defs/struct_0202E81C.h" #include "struct_defs/struct_0202E828.h" #include "struct_defs/struct_0202E834.h" +#include "struct_defs/struct_0206C638.h" + #include "field/field_system.h" #include "field/field_system_sub2_t.h" -#include "struct_defs/struct_0206C638.h" +#include "overlay006/ov6_02243218.h" +#include "overlay006/ov6_02246444.h" +#include "overlay006/struct_ov6_022465F4_decl.h" +#include "overlay025/poketch_system.h" +#include "savedata/save_table.h" -#include "unk_020021B0.h" +#include "bag.h" +#include "field_system.h" +#include "heap.h" +#include "inlines.h" +#include "map_header.h" #include "message.h" +#include "party.h" +#include "pokemon.h" +#include "roaming_pokemon.h" +#include "savedata.h" +#include "savedata_misc.h" +#include "strbuf.h" #include "string_template.h" -#include "heap.h" +#include "trainer_info.h" +#include "unk_020021B0.h" #include "unk_0201D15C.h" -#include "strbuf.h" -#include "savedata/save_table.h" -#include "savedata.h" #include "unk_02025E08.h" -#include "trainer_info.h" #include "unk_0202631C.h" -#include "savedata_misc.h" #include "unk_02027B70.h" #include "unk_020298BC.h" #include "unk_0202B37C.h" #include "unk_0202D7A8.h" #include "unk_0202E2CC.h" -#include "map_header.h" #include "unk_0203A944.h" -#include "field_system.h" -#include "vars_flags.h" #include "unk_02054884.h" #include "unk_0205DFC4.h" #include "unk_0206A8DC.h" -#include "roaming_pokemon.h" -#include "unk_0206CCB0.h" #include "unk_02071CFC.h" -#include "constants/species.h" -#include "pokemon.h" -#include "party.h" -#include "bag.h" #include "unk_020923C0.h" #include "unk_02094EDC.h" -#include "overlay006/ov6_02243218.h" -#include "overlay006/ov6_02246444.h" -#include "overlay025/poketch_system.h" - -#include "constants/overworld_weather.h" +#include "vars_flags.h" -static void sub_0206CD70(FieldSystem * fieldSystem, int param1, int param2, const void * param3); -static void sub_0206CD7C(SaveData * param0, int param1, int param2, const void * param3); -static u8 sub_0206DE4C(Pokemon * param0); -static Strbuf* sub_0206F0D8(u16 param0, u32 param1); +static void sub_0206CD70(FieldSystem *fieldSystem, int param1, int param2, const void *param3); +static void sub_0206CD7C(SaveData *param0, int param1, int param2, const void *param3); +static u8 sub_0206DE4C(Pokemon *param0); +static Strbuf *sub_0206F0D8(u16 param0, u32 param1); typedef struct { u8 unk_00[40]; @@ -349,8 +344,8 @@ typedef union { UnkStruct_0206E768 val39; } UnkUnion_0206D1B8; -typedef int (* UnkFuncPtr_0206CD00)(FieldSystem *, StringTemplate *, UnkStruct_ov6_022465F4 *); -typedef BOOL (* UnkFuncPtr_0206CD2C)(FieldSystem *, UnkStruct_ov6_022465F4 *); +typedef int (*UnkFuncPtr_0206CD00)(FieldSystem *, StringTemplate *, UnkStruct_ov6_022465F4 *); +typedef BOOL (*UnkFuncPtr_0206CD2C)(FieldSystem *, UnkStruct_ov6_022465F4 *); typedef struct { UnkFuncPtr_0206CD00 unk_00; @@ -361,7 +356,7 @@ typedef struct { int unk_00; u16 unk_04; u16 unk_06; - const UnkStruct_020EFFA4 * unk_08; + const UnkStruct_020EFFA4 *unk_08; } UnkStruct_020EFD60; static const UnkStruct_020EFFA4 Unk_020EFFA4[26]; @@ -371,16 +366,16 @@ static const UnkStruct_020EFFA4 Unk_020EFE84[17]; static const UnkStruct_020EFFA4 Unk_020EFD9C[8]; static const UnkStruct_020EFD60 Unk_020EFD60[] = { - {0x1, 0x19F, 0x14, Unk_020EFF0C}, - {0x2, 0x1A0, 0x1B, Unk_020EFFA4}, - {0x3, 0x1A1, 0xC, Unk_020EFE2C}, - {0x4, 0x1A2, 0x12, Unk_020EFE84}, - {0x5, 0x1A3, 0x9, Unk_020EFD9C} + { 0x1, 0x19F, 0x14, Unk_020EFF0C }, + { 0x2, 0x1A0, 0x1B, Unk_020EFFA4 }, + { 0x3, 0x1A1, 0xC, Unk_020EFE2C }, + { 0x4, 0x1A2, 0x12, Unk_020EFE84 }, + { 0x5, 0x1A3, 0x9, Unk_020EFD9C } }; -static const UnkStruct_020EFD60 * sub_0206CCB0 (int param0) +static const UnkStruct_020EFD60 *sub_0206CCB0(int param0) { - const UnkStruct_020EFD60 * v0; + const UnkStruct_020EFD60 *v0; GF_ASSERT(0 < param0 && param0 < 6); v0 = &Unk_020EFD60[param0 - 1]; @@ -389,7 +384,7 @@ static const UnkStruct_020EFD60 * sub_0206CCB0 (int param0) return v0; } -static const UnkStruct_020EFFA4 * sub_0206CCDC (const UnkStruct_020EFD60 * param0, const UnkStruct_ov6_022465F4 * param1) +static const UnkStruct_020EFFA4 *sub_0206CCDC(const UnkStruct_020EFD60 *param0, const UnkStruct_ov6_022465F4 *param1) { int v0; @@ -399,11 +394,11 @@ static const UnkStruct_020EFFA4 * sub_0206CCDC (const UnkStruct_020EFD60 * param return &(param0->unk_08[v0 - 1]); } -int sub_0206CD00 (int param0, FieldSystem * fieldSystem, StringTemplate * param2, UnkStruct_ov6_022465F4 * param3, u16 * param4) +int sub_0206CD00(int param0, FieldSystem *fieldSystem, StringTemplate *param2, UnkStruct_ov6_022465F4 *param3, u16 *param4) { UnkFuncPtr_0206CD00 v0; - const UnkStruct_020EFD60 * v1; - const UnkStruct_020EFFA4 * v2; + const UnkStruct_020EFD60 *v1; + const UnkStruct_020EFFA4 *v2; v1 = sub_0206CCB0(param0); *param4 = v1->unk_04; @@ -414,11 +409,11 @@ int sub_0206CD00 (int param0, FieldSystem * fieldSystem, StringTemplate * param2 return v0(fieldSystem, param2, param3); } -BOOL sub_0206CD2C (int param0, FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param2) +BOOL sub_0206CD2C(int param0, FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param2) { UnkFuncPtr_0206CD2C v0; - const UnkStruct_020EFD60 * v1; - const UnkStruct_020EFFA4 * v2; + const UnkStruct_020EFD60 *v1; + const UnkStruct_020EFFA4 *v2; v1 = sub_0206CCB0(param0); v2 = sub_0206CCDC(v1, param2); @@ -436,51 +431,51 @@ BOOL sub_0206CD2C (int param0, FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 return v0(fieldSystem, param2); } -static void sub_0206CD58 (SaveData * param0, int param1, int param2, const void * param3) +static void sub_0206CD58(SaveData *param0, int param1, int param2, const void *param3) { - TVBroadcast * v0 = SaveData_TVBroadcast(param0); + TVBroadcast *v0 = SaveData_TVBroadcast(param0); GF_ASSERT(sizeof(UnkUnion_0206D1B8) == 40); sub_0202E43C(v0, param1, param2, (const u8 *)param3); } -static void sub_0206CD70 (FieldSystem * fieldSystem, int param1, int param2, const void * param3) +static void sub_0206CD70(FieldSystem *fieldSystem, int param1, int param2, const void *param3) { sub_0206CD7C(fieldSystem->saveData, param1, param2, param3); } -static void sub_0206CD7C (SaveData * param0, int param1, int param2, const void * param3) +static void sub_0206CD7C(SaveData *param0, int param1, int param2, const void *param3) { - TVBroadcast * v0 = SaveData_TVBroadcast(param0); + TVBroadcast *v0 = SaveData_TVBroadcast(param0); GF_ASSERT(sizeof(UnkUnion_0206D1B8) == 40); sub_0202E43C(v0, param1, param2, (const u8 *)param3); } -static void sub_0206CD94 (StringTemplate * param0, int param1, const u16 * param2, int param3, int param4, int param5) +static void sub_0206CD94(StringTemplate *param0, int param1, const u16 *param2, int param3, int param4, int param5) { - Strbuf* v0 = Strbuf_Init(64, 4); + Strbuf *v0 = Strbuf_Init(64, 4); Strbuf_CopyChars(v0, param2); StringTemplate_SetStrbuf(param0, param1, v0, param3, param5, param4); Strbuf_Free(v0); } -static void sub_0206CDD0 (StringTemplate * param0, int param1, const UnkStruct_ov6_022465F4 * param2) +static void sub_0206CDD0(StringTemplate *param0, int param1, const UnkStruct_ov6_022465F4 *param2) { sub_0206CD94(param0, param1, ov6_02246494(param2), ov6_0224648C(param2), ov6_02246490(param2), 1); } -static void sub_0206CE08 (int param0, u16 * param1, Pokemon * param2) +static void sub_0206CE08(int param0, u16 *param1, Pokemon *param2) { - Strbuf* v0 = Strbuf_Init(64, param0); + Strbuf *v0 = Strbuf_Init(64, param0); Pokemon_GetValue(param2, MON_DATA_NICKNAME_STRBUF, v0); Strbuf_ToChars(v0, param1, 10 + 1); Strbuf_Free(v0); } -static void sub_0206CE38 (Pokemon * param0, u16 * param1, u8 * param2, u8 * param3, u8 * param4) +static void sub_0206CE38(Pokemon *param0, u16 *param1, u8 *param2, u8 *param3, u8 *param4) { *param1 = Pokemon_GetValue(param0, MON_DATA_SPECIES, NULL); *param2 = Pokemon_GetValue(param0, MON_DATA_GENDER, NULL); @@ -488,7 +483,7 @@ static void sub_0206CE38 (Pokemon * param0, u16 * param1, u8 * param2, u8 * para *param4 = Pokemon_GetValue(param0, MON_DATA_MET_GAME, NULL); } -static void sub_0206CE74 (StringTemplate * param0, int param1, u16 param2, u8 param3, u8 param4, u8 param5) +static void sub_0206CE74(StringTemplate *param0, int param1, u16 param2, u8 param3, u8 param4, u8 param5) { u16 v0[11]; @@ -496,7 +491,7 @@ static void sub_0206CE74 (StringTemplate * param0, int param1, u16 param2, u8 pa sub_0206CD94(param0, param1, v0, param3, param4, 1); } -static void sub_0206CEA4 (StringTemplate * param0, int param1, u16 param2) +static void sub_0206CEA4(StringTemplate *param0, int param1, u16 param2) { u16 v0[11]; @@ -504,12 +499,12 @@ static void sub_0206CEA4 (StringTemplate * param0, int param1, u16 param2) sub_0206CD94(param0, param1, v0, 0, GAME_LANGUAGE, 1); } -static void sub_0206CED0 (int param0, Pokemon * param1, u8 * param2, u16 * param3) +static void sub_0206CED0(int param0, Pokemon *param1, u8 *param2, u16 *param3) { *param2 = Pokemon_GetValue(param1, MON_DATA_HAS_NICKNAME, NULL); if (*param2) { - Strbuf* v0 = Strbuf_Init(64, param0); + Strbuf *v0 = Strbuf_Init(64, param0); Pokemon_GetValue(param1, MON_DATA_NICKNAME_STRBUF, v0); Strbuf_ToChars(v0, param3, 10 + 1); @@ -517,9 +512,9 @@ static void sub_0206CED0 (int param0, Pokemon * param1, u8 * param2, u16 * param } } -void sub_0206CF14 (TVBroadcast * param0, Pokemon * param1, int param2, int param3, int param4) +void sub_0206CF14(TVBroadcast *param0, Pokemon *param1, int param2, int param3, int param4) { - UnkStruct_0202E7D8 * v0 = sub_0202E7D8(param0); + UnkStruct_0202E7D8 *v0 = sub_0202E7D8(param0); v0->unk_00 = 1; sub_0206CE38(param1, &v0->unk_02, &v0->unk_04, &v0->unk_05, &v0->unk_06); @@ -530,9 +525,9 @@ void sub_0206CF14 (TVBroadcast * param0, Pokemon * param1, int param2, int param SaveData_SetChecksum(27); } -void sub_0206CF48 (TVBroadcast * param0, Pokemon * param1, int param2) +void sub_0206CF48(TVBroadcast *param0, Pokemon *param1, int param2) { - UnkStruct_0202E7E4 * v0 = sub_0202E7E4(param0); + UnkStruct_0202E7E4 *v0 = sub_0202E7E4(param0); v0->unk_00 = 1; v0->unk_1F = 0; @@ -545,9 +540,9 @@ void sub_0206CF48 (TVBroadcast * param0, Pokemon * param1, int param2) SaveData_SetChecksum(27); } -void sub_0206CF9C (TVBroadcast * param0, int param1) +void sub_0206CF9C(TVBroadcast *param0, int param1) { - UnkStruct_0202E7E4 * v0 = sub_0202E7E4(param0); + UnkStruct_0202E7E4 *v0 = sub_0202E7E4(param0); v0->unk_1F = 2; v0->unk_20 = param1; @@ -555,9 +550,9 @@ void sub_0206CF9C (TVBroadcast * param0, int param1) SaveData_SetChecksum(27); } -void sub_0206CFB4 (TVBroadcast * param0, int param1) +void sub_0206CFB4(TVBroadcast *param0, int param1) { - UnkStruct_0202E7E4 * v0 = sub_0202E7E4(param0); + UnkStruct_0202E7E4 *v0 = sub_0202E7E4(param0); v0->unk_1F = 1; v0->unk_22 = param1; @@ -565,9 +560,9 @@ void sub_0206CFB4 (TVBroadcast * param0, int param1) SaveData_SetChecksum(27); } -void sub_0206CFCC (TVBroadcast * param0, int param1) +void sub_0206CFCC(TVBroadcast *param0, int param1) { - UnkStruct_0202E7F0 * v0 = sub_0202E7F0(param0); + UnkStruct_0202E7F0 *v0 = sub_0202E7F0(param0); v0->unk_00 = 1; v0->unk_01 = param1; @@ -575,9 +570,9 @@ void sub_0206CFCC (TVBroadcast * param0, int param1) SaveData_SetChecksum(27); } -void sub_0206CFE4 (TVBroadcast * param0, BOOL param1, u16 param2) +void sub_0206CFE4(TVBroadcast *param0, BOOL param1, u16 param2) { - UnkStruct_0202E7FC * v0 = sub_0202E7FC(param0); + UnkStruct_0202E7FC *v0 = sub_0202E7FC(param0); v0->unk_00 = 1; v0->unk_01 = param1; @@ -586,9 +581,9 @@ void sub_0206CFE4 (TVBroadcast * param0, BOOL param1, u16 param2) SaveData_SetChecksum(27); } -void sub_0206D000 (TVBroadcast * param0) +void sub_0206D000(TVBroadcast *param0) { - UnkStruct_0202E808 * v0 = sub_0202E808(param0); + UnkStruct_0202E808 *v0 = sub_0202E808(param0); v0->unk_00 = 1; v0->unk_07 = 0; @@ -596,9 +591,9 @@ void sub_0206D000 (TVBroadcast * param0) SaveData_SetChecksum(27); } -void sub_0206D018 (TVBroadcast * param0, Pokemon * param1) +void sub_0206D018(TVBroadcast *param0, Pokemon *param1) { - UnkStruct_0202E808 * v0 = sub_0202E808(param0); + UnkStruct_0202E808 *v0 = sub_0202E808(param0); if (v0->unk_07 == 0) { sub_0206CE38(param1, &v0->unk_02, &v0->unk_04, &v0->unk_05, &v0->unk_06); @@ -608,9 +603,9 @@ void sub_0206D018 (TVBroadcast * param0, Pokemon * param1) SaveData_SetChecksum(27); } -void sub_0206D048 (TVBroadcast * param0, Pokemon * param1) +void sub_0206D048(TVBroadcast *param0, Pokemon *param1) { - UnkStruct_0202E810 * v0 = sub_0202E810(param0); + UnkStruct_0202E810 *v0 = sub_0202E810(param0); v0->unk_00 = 1; sub_0206CE38(param1, &v0->unk_02, &v0->unk_04, &v0->unk_05, &v0->unk_06); @@ -620,9 +615,9 @@ void sub_0206D048 (TVBroadcast * param0, Pokemon * param1) SaveData_SetChecksum(27); } -void sub_0206D088 (TVBroadcast * param0, u8 param1, const TrainerInfo * param2) +void sub_0206D088(TVBroadcast *param0, u8 param1, const TrainerInfo *param2) { - UnkStruct_0202E81C * v0 = sub_0202E81C(param0); + UnkStruct_0202E81C *v0 = sub_0202E81C(param0); v0->unk_00 = 1; v0->unk_01 = param1; @@ -636,9 +631,9 @@ void sub_0206D088 (TVBroadcast * param0, u8 param1, const TrainerInfo * param2) SaveData_SetChecksum(27); } -void sub_0206D0C8 (TVBroadcast * param0, u16 param1) +void sub_0206D0C8(TVBroadcast *param0, u16 param1) { - UnkStruct_0202E828 * v0 = sub_0202E828(param0); + UnkStruct_0202E828 *v0 = sub_0202E828(param0); v0->unk_00 = 1; v0->unk_04 += param1; @@ -650,17 +645,17 @@ void sub_0206D0C8 (TVBroadcast * param0, u16 param1) SaveData_SetChecksum(27); } -void sub_0206D0F0 (TVBroadcast * param0) +void sub_0206D0F0(TVBroadcast *param0) { - UnkStruct_0202E828 * v0 = sub_0202E828(param0); + UnkStruct_0202E828 *v0 = sub_0202E828(param0); v0->unk_04 = 0; SaveData_SetChecksum(27); } -void sub_0206D104 (TVBroadcast * param0) +void sub_0206D104(TVBroadcast *param0) { - UnkStruct_0202E834 * v0 = sub_0202E834(param0); + UnkStruct_0202E834 *v0 = sub_0202E834(param0); v0->unk_00 = 1; v0->unk_02++; @@ -672,17 +667,17 @@ void sub_0206D104 (TVBroadcast * param0) SaveData_SetChecksum(27); } -void sub_0206D12C (TVBroadcast * param0) +void sub_0206D12C(TVBroadcast *param0) { - UnkStruct_0202E834 * v0 = sub_0202E834(param0); + UnkStruct_0202E834 *v0 = sub_0202E834(param0); v0->unk_02 = 0; SaveData_SetChecksum(27); } -UnkStruct_0206D140 * sub_0206D140 (int param0) +UnkStruct_0206D140 *sub_0206D140(int param0) { - UnkStruct_0206D140 * v0; + UnkStruct_0206D140 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0206D140)); MI_CpuClearFast(v0, sizeof(UnkStruct_0206D140)); @@ -690,12 +685,12 @@ UnkStruct_0206D140 * sub_0206D140 (int param0) return v0; } -void sub_0206D158 (UnkStruct_0206D140 * param0) +void sub_0206D158(UnkStruct_0206D140 *param0) { Heap_FreeToHeap(param0); } -void sub_0206D160 (UnkStruct_0206D140 * param0, Pokemon * param1, int param2, int param3, u32 param4) +void sub_0206D160(UnkStruct_0206D140 *param0, Pokemon *param1, int param2, int param3, u32 param4) { MI_CpuClear32(param0, sizeof(UnkStruct_0206D140)); @@ -710,10 +705,10 @@ void sub_0206D160 (UnkStruct_0206D140 * param0, Pokemon * param1, int param2, in sub_0206CED0(param4, param1, ¶m0->unk_0B, param0->unk_0C); } -void sub_0206D1B8 (FieldSystem * fieldSystem, const UnkStruct_0206D140 * param1, int param2) +void sub_0206D1B8(FieldSystem *fieldSystem, const UnkStruct_0206D140 *param1, int param2) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D140 * v1 = &v0.val2; + UnkStruct_0206D140 *v1 = &v0.val2; *v1 = *param1; v1->unk_00 = param2; @@ -740,9 +735,9 @@ void sub_0206D1B8 (FieldSystem * fieldSystem, const UnkStruct_0206D140 * param1, } } -static int sub_0206D230 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D230(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D140 * v0 = ov6_02246498(param2); + UnkStruct_0206D140 *v0 = ov6_02246498(param2); if (v0->unk_0B) { sub_0206CDD0(param1, 0, param2); @@ -760,9 +755,9 @@ static int sub_0206D230 (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static int sub_0206D2E0 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D2E0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D140 * v0 = ov6_02246498(param2); + UnkStruct_0206D140 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetNumber(param1, 1, v0->unk_04, 3, 0, 1); @@ -774,18 +769,18 @@ static int sub_0206D2E0 (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static BOOL sub_0206D320 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206D320(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - PokedexData * v0 = SaveData_Pokedex(fieldSystem->saveData); - UnkStruct_0206D140 * v1 = ov6_02246498(param1); + PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); + UnkStruct_0206D140 *v1 = ov6_02246498(param1); return sub_02026FE8(v0, v1->unk_06); } -void sub_0206D340 (FieldSystem * fieldSystem, BOOL param1, u16 param2, Pokemon * param3) +void sub_0206D340(FieldSystem *fieldSystem, BOOL param1, u16 param2, Pokemon *param3) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D374 * v1 = &v0.val3; + UnkStruct_0206D374 *v1 = &v0.val3; if (param1) { sub_0206CE38(param3, &v1->unk_00, &v1->unk_02, &v1->unk_03, &v1->unk_04); @@ -797,9 +792,9 @@ void sub_0206D340 (FieldSystem * fieldSystem, BOOL param1, u16 param2, Pokemon * sub_0206CD70(fieldSystem, 2, 3, v1); } -static int sub_0206D374 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D374(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D374 * v0 = (UnkStruct_0206D374 * )ov6_02246498(param2); + UnkStruct_0206D374 *v0 = (UnkStruct_0206D374 *)ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); @@ -812,9 +807,9 @@ static int sub_0206D374 (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static BOOL sub_0206D3C0 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206D3C0(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0206D374 * v0 = (UnkStruct_0206D374 * )ov6_02246498(param1); + UnkStruct_0206D374 *v0 = (UnkStruct_0206D374 *)ov6_02246498(param1); if (v0->unk_08 == 0) { return 1; @@ -823,11 +818,11 @@ static BOOL sub_0206D3C0 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * pa return sub_02026FE8(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } -static void sub_0206D3E4 (FieldSystem * fieldSystem, int param1) +static void sub_0206D3E4(FieldSystem *fieldSystem, int param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D43C * v1 = &v0.val4; - UnkStruct_0202B4A0 * v2 = sub_0202B4A0(fieldSystem->saveData); + UnkStruct_0206D43C *v1 = &v0.val4; + UnkStruct_0202B4A0 *v2 = sub_0202B4A0(fieldSystem->saveData); GF_ASSERT(sizeof(UnkUnion_0206D1B8) == 40); MI_CpuClearFast(&v0, 40); @@ -836,19 +831,19 @@ static void sub_0206D3E4 (FieldSystem * fieldSystem, int param1) sub_0206CD70(fieldSystem, 2, param1, v1); } -void sub_0206D424 (FieldSystem * fieldSystem) +void sub_0206D424(FieldSystem *fieldSystem) { sub_0206D3E4(fieldSystem, 20); } -void sub_0206D430 (FieldSystem * fieldSystem) +void sub_0206D430(FieldSystem *fieldSystem) { sub_0206D3E4(fieldSystem, 4); } -static int sub_0206D43C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D43C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D43C * v0 = (UnkStruct_0206D43C * )ov6_02246498(param2); + UnkStruct_0206D43C *v0 = (UnkStruct_0206D43C *)ov6_02246498(param2); sub_0206CD94(param1, 1, v0->unk_00, 0, ov6_02246490(param2), 1); sub_0206CDD0(param1, 0, param2); @@ -856,9 +851,9 @@ static int sub_0206D43C (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 6; } -static int sub_0206D474 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D474(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D43C * v0 = (UnkStruct_0206D43C * )ov6_02246498(param2); + UnkStruct_0206D43C *v0 = (UnkStruct_0206D43C *)ov6_02246498(param2); sub_0206CD94(param1, 1, v0->unk_00, 0, ov6_02246490(param2), 1); sub_0206CDD0(param1, 0, param2); @@ -866,10 +861,10 @@ static int sub_0206D474 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 32; } -void sub_0206D4AC (FieldSystem * fieldSystem, u16 param1) +void sub_0206D4AC(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D4D4 * v1 = &v0.val5; + UnkStruct_0206D4D4 *v1 = &v0.val5; v1->unk_00 = param1; v1->unk_02 = MapHeader_GetMapLabelTextID(fieldSystem->location->mapId); @@ -877,9 +872,9 @@ void sub_0206D4AC (FieldSystem * fieldSystem, u16 param1) sub_0206CD70(fieldSystem, 2, 6, v1); } -static int sub_0206D4D4 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D4D4(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D4D4 * v0 = (UnkStruct_0206D4D4 *)ov6_02246498(param2); + UnkStruct_0206D4D4 *v0 = (UnkStruct_0206D4D4 *)ov6_02246498(param2); StringTemplate_SetLocationName(param1, 0, v0->unk_02); sub_0206CDD0(param1, 1, param2); @@ -888,10 +883,10 @@ static int sub_0206D4D4 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 10; } -void sub_0206D504 (SaveData * param0, u16 param1, u8 param2) +void sub_0206D504(SaveData *param0, u16 param1, u8 param2) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D530 * v1 = &v0.val6; + UnkStruct_0206D530 *v1 = &v0.val6; if (param2 >= 10) { v1->unk_00 = param1; @@ -905,9 +900,9 @@ void sub_0206D504 (SaveData * param0, u16 param1, u8 param2) } } -static int sub_0206D530 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D530(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D530 * v0 = (UnkStruct_0206D530 *)ov6_02246498(param2); + UnkStruct_0206D530 *v0 = (UnkStruct_0206D530 *)ov6_02246498(param2); StringTemplate_SetItemName(param1, 0, v0->unk_00); StringTemplate_SetNumber(param1, 1, v0->unk_02, 3, 0, 1); @@ -917,19 +912,19 @@ static int sub_0206D530 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 11; } -void sub_0206D578 (FieldSystem * fieldSystem, Pokemon * param1) +void sub_0206D578(FieldSystem *fieldSystem, Pokemon *param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D5B0 * v1 = &v0.val7; + UnkStruct_0206D5B0 *v1 = &v0.val7; sub_0206CE38(param1, &v1->unk_00, &v1->unk_02, &v1->unk_03, &v1->unk_04); v1->unk_06 = MapHeader_GetMapLabelTextID(fieldSystem->location->mapId); sub_0206CD70(fieldSystem, 2, 8, v1); } -static int sub_0206D5B0 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D5B0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D5B0 * v0 = (UnkStruct_0206D5B0 *)ov6_02246498(param2); + UnkStruct_0206D5B0 *v0 = (UnkStruct_0206D5B0 *)ov6_02246498(param2); StringTemplate_SetLocationName(param1, 1, v0->unk_06); sub_0206CDD0(param1, 0, param2); @@ -938,25 +933,25 @@ static int sub_0206D5B0 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 12; } -static BOOL sub_0206D5F0 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206D5F0(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0206D5B0 * v0 = (UnkStruct_0206D5B0 *)ov6_02246498(param1); + UnkStruct_0206D5B0 *v0 = (UnkStruct_0206D5B0 *)ov6_02246498(param1); return sub_02026FE8(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } -void sub_0206D60C (FieldSystem * fieldSystem, Pokemon * param1) +void sub_0206D60C(FieldSystem *fieldSystem, Pokemon *param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D644 * v1 = &v0.val8; + UnkStruct_0206D644 *v1 = &v0.val8; sub_0206CE38(param1, &v1->unk_00, &v1->unk_02, &v1->unk_03, &v1->unk_04); sub_0206CE08(4, v1->unk_06, param1); sub_0206CD70(fieldSystem, 2, 10, v1); } -static int sub_0206D644 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D644(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D644 * v0 = (UnkStruct_0206D644 *)ov6_02246498(param2); + UnkStruct_0206D644 *v0 = (UnkStruct_0206D644 *)ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); sub_0206CE74(param1, 1, v0->unk_00, v0->unk_02, v0->unk_03, v0->unk_04); @@ -965,18 +960,18 @@ static int sub_0206D644 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 17 + inline_020564D0(5); } -static BOOL sub_0206D6A8 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206D6A8(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - PokedexData * v0 = SaveData_Pokedex(fieldSystem->saveData); - UnkStruct_0206D644 * v1 = (UnkStruct_0206D644 *)ov6_02246498(param1); + PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); + UnkStruct_0206D644 *v1 = (UnkStruct_0206D644 *)ov6_02246498(param1); return sub_02026FE8(v0, v1->unk_00); } -void sub_0206D6C8 (FieldSystem * fieldSystem, int param1, int param2) +void sub_0206D6C8(FieldSystem *fieldSystem, int param1, int param2) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D6E0 * v1 = &v0.val9; + UnkStruct_0206D6E0 *v1 = &v0.val9; v1->unk_00 = param1; v1->unk_02 = param2; @@ -984,9 +979,9 @@ void sub_0206D6C8 (FieldSystem * fieldSystem, int param1, int param2) sub_0206CD70(fieldSystem, 2, 13, v1); } -static int sub_0206D6E0 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D6E0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D6E0 * v0 = (UnkStruct_0206D6E0 *)ov6_02246498(param2); + UnkStruct_0206D6E0 *v0 = (UnkStruct_0206D6E0 *)ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetUndergroundItemName(param1, 1, v0->unk_00); @@ -995,12 +990,12 @@ static int sub_0206D6E0 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 24; } -void sub_0206D720 (FieldSystem * fieldSystem) +void sub_0206D720(FieldSystem *fieldSystem) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D75C * v1 = &v0.val10; - TVBroadcast * v2 = SaveData_TVBroadcast(fieldSystem->saveData); - UnkStruct_0202E808 * v3 = sub_0202E808(v2); + UnkStruct_0206D75C *v1 = &v0.val10; + TVBroadcast *v2 = SaveData_TVBroadcast(fieldSystem->saveData); + UnkStruct_0202E808 *v3 = sub_0202E808(v2); if (v3->unk_07 == 0) { return; @@ -1015,9 +1010,9 @@ void sub_0206D720 (FieldSystem * fieldSystem) sub_0206CD70(fieldSystem, 2, 15, v1); } -static int sub_0206D75C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D75C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D75C * v0 = (UnkStruct_0206D75C *)ov6_02246498(param2); + UnkStruct_0206D75C *v0 = (UnkStruct_0206D75C *)ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); sub_0206CE74(param1, 1, v0->unk_00, v0->unk_02, v0->unk_03, v0->unk_04); @@ -1026,22 +1021,22 @@ static int sub_0206D75C (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 26; } -static BOOL sub_0206D7A4 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206D7A4(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - PokedexData * v0 = SaveData_Pokedex(fieldSystem->saveData); - UnkStruct_0206D75C * v1 = (UnkStruct_0206D75C *)ov6_02246498(param1); + PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); + UnkStruct_0206D75C *v1 = (UnkStruct_0206D75C *)ov6_02246498(param1); return sub_02026FE8(v0, v1->unk_00); } -void sub_0206D7C4 (FieldSystem * fieldSystem) +void sub_0206D7C4(FieldSystem *fieldSystem) { u32 v0, v1, v2, v3; u8 v4, v5; - Pokemon * v6; + Pokemon *v6; UnkUnion_0206D1B8 v7; - Party * v8; - UnkStruct_0206D8B0 * v9 = &v7.val11; + Party *v8; + UnkStruct_0206D8B0 *v9 = &v7.val11; v0 = 0; v1 = 0; @@ -1080,9 +1075,9 @@ void sub_0206D7C4 (FieldSystem * fieldSystem) return; } -static int sub_0206D8B0 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D8B0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D8B0 * v0 = (UnkStruct_0206D8B0 *)ov6_02246498(param2); + UnkStruct_0206D8B0 *v0 = (UnkStruct_0206D8B0 *)ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); sub_0206CE74(param1, 1, v0->unk_00, v0->unk_02, v0->unk_03, v0->unk_04); @@ -1094,27 +1089,27 @@ static int sub_0206D8B0 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 28; } -static BOOL sub_0206D8F0 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206D8F0(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0206D8B0 * v0 = (UnkStruct_0206D8B0 *)ov6_02246498(param1); + UnkStruct_0206D8B0 *v0 = (UnkStruct_0206D8B0 *)ov6_02246498(param1); return sub_02026FE8(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } -void sub_0206D90C (TVBroadcast * fieldSystem, Pokemon * param1, u16 param2) +void sub_0206D90C(TVBroadcast *fieldSystem, Pokemon *param1, u16 param2) { return; } -static BOOL sub_0206D910 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206D910(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return 0; } -void sub_0206D914 (FieldSystem * fieldSystem, u16 param1, u8 param2, u16 param3) +void sub_0206D914(FieldSystem *fieldSystem, u16 param1, u8 param2, u16 param3) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D94C * v1 = &v0.val13; + UnkStruct_0206D94C *v1 = &v0.val13; v1->unk_00 = param1; v1->unk_02 = param2; @@ -1129,9 +1124,9 @@ void sub_0206D914 (FieldSystem * fieldSystem, u16 param1, u8 param2, u16 param3) } } -static int sub_0206D94C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D94C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D94C * v0 = ov6_02246498(param2); + UnkStruct_0206D94C *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetItemName(param1, 1, v0->unk_00); @@ -1140,9 +1135,9 @@ static int sub_0206D94C (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 30; } -static int sub_0206D98C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D98C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D94C * v0 = ov6_02246498(param2); + UnkStruct_0206D94C *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetItemName(param1, 1, v0->unk_00); @@ -1150,10 +1145,10 @@ static int sub_0206D98C (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 31; } -void sub_0206D9B4 (TVBroadcast * param0, Pokemon * param1, u8 param2) +void sub_0206D9B4(TVBroadcast *param0, Pokemon *param1, u8 param2) { UnkUnion_0206D1B8 v0; - UnkStruct_0206D9F4 * v1 = &v0.val14; + UnkStruct_0206D9F4 *v1 = &v0.val14; v1->unk_06 = param2; v1->unk_05 = MTRNG_Next() % 3; @@ -1162,9 +1157,9 @@ void sub_0206D9B4 (TVBroadcast * param0, Pokemon * param1, u8 param2) sub_0202E43C(param0, 2, 21, (const u8 *)v1); } -static int sub_0206D9F4 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206D9F4(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206D9F4 * v0 = (UnkStruct_0206D9F4 *)ov6_02246498(param2); + UnkStruct_0206D9F4 *v0 = (UnkStruct_0206D9F4 *)ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetBallSealName(param1, 1, v0->unk_06); @@ -1173,23 +1168,23 @@ static int sub_0206D9F4 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 33 + inline_020564D0(3); } -static BOOL sub_0206DA50 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206DA50(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0206D9F4 * v0 = (UnkStruct_0206D9F4 *)ov6_02246498(param1); + UnkStruct_0206D9F4 *v0 = (UnkStruct_0206D9F4 *)ov6_02246498(param1); return sub_02026FE8(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } -static void sub_0206DA6C (UnkStruct_0206DA6C * param0, const TrainerInfo * param1) +static void sub_0206DA6C(UnkStruct_0206DA6C *param0, const TrainerInfo *param1) { param0->unk_00 = TrainerInfo_Size(); TrainerInfo_Copy(param1, (TrainerInfo *)param0->unk_04); } -static void sub_0206DA84 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static void sub_0206DA84(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206DA6C * v0 = (UnkStruct_0206DA6C *)ov6_02246498(param2); - TrainerInfo * v1 = (TrainerInfo *)&v0->unk_04; + UnkStruct_0206DA6C *v0 = (UnkStruct_0206DA6C *)ov6_02246498(param2); + TrainerInfo *v1 = (TrainerInfo *)&v0->unk_04; GF_ASSERT(TrainerInfo_Size() == v0->unk_00); @@ -1197,75 +1192,75 @@ static void sub_0206DA84 (FieldSystem * fieldSystem, StringTemplate * param1, Un StringTemplate_SetPlayerName(param1, 1, v1); } -void sub_0206DAB8 (FieldSystem * fieldSystem, const TrainerInfo * param1) +void sub_0206DAB8(FieldSystem *fieldSystem, const TrainerInfo *param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206DA6C * v1 = &v0.val15; + UnkStruct_0206DA6C *v1 = &v0.val15; sub_0206DA6C(v1, param1); sub_0206CD70(fieldSystem, 2, 22, v1); } -void sub_0206DAD4 (FieldSystem * fieldSystem, const TrainerInfo * param1) +void sub_0206DAD4(FieldSystem *fieldSystem, const TrainerInfo *param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206DA6C * v1 = &v0.val15; + UnkStruct_0206DA6C *v1 = &v0.val15; sub_0206DA6C(v1, param1); sub_0206CD70(fieldSystem, 2, 23, v1); } -static int sub_0206DAF0 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206DAF0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { sub_0206DA84(fieldSystem, param1, param2); return 36; } -static int sub_0206DAFC (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206DAFC(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { sub_0206DA84(fieldSystem, param1, param2); return 37; } -static BOOL sub_0206DB08 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206DB08(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), 428, 1, 32); } -void sub_0206DB20 (FieldSystem * fieldSystem) +void sub_0206DB20(FieldSystem *fieldSystem) { UnkUnion_0206D1B8 v0; - UnkStruct_0206DB20 * v1 = &v0.val16; + UnkStruct_0206DB20 *v1 = &v0.val16; v1->unk_00 = 1; sub_0206CD70(fieldSystem, 2, 25, v1); } -static int sub_0206DB38 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206DB38(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { sub_0206CDD0(param1, 0, param2); return 38; } -static BOOL sub_0206DB48 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206DB48(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 6); } -void sub_0206DB5C (FieldSystem * fieldSystem, u8 param1) +void sub_0206DB5C(FieldSystem *fieldSystem, u8 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206DB74 * v1 = &v0.val17; + UnkStruct_0206DB74 *v1 = &v0.val17; v1->unk_00 = param1; sub_0206CD70(fieldSystem, 2, 26, v1); } -static int sub_0206DB74 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206DB74(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206DB74 * v0 = (UnkStruct_0206DB74 *)ov6_02246498(param2); + UnkStruct_0206DB74 *v0 = (UnkStruct_0206DB74 *)ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetFurniture(param1, 1, v0->unk_00); @@ -1273,15 +1268,15 @@ static int sub_0206DB74 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 39; } -static BOOL sub_0206DB9C (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206DB9C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 6); } -void sub_0206DBB0 (SaveData * param0, u32 param1, Pokemon * param2, BOOL param3) +void sub_0206DBB0(SaveData *param0, u32 param1, Pokemon *param2, BOOL param3) { UnkUnion_0206D1B8 v0; - UnkStruct_0206DBE8 * v1 = &v0.val18; + UnkStruct_0206DBE8 *v1 = &v0.val18; sub_0206CE38(param2, &v1->unk_02, &v1->unk_04, &v1->unk_05, &v1->unk_06); @@ -1291,9 +1286,9 @@ void sub_0206DBB0 (SaveData * param0, u32 param1, Pokemon * param2, BOOL param3) sub_0206CD58(param0, 3, 1, v1); } -static int sub_0206DBE8 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206DBE8(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206DBE8 * v0 = (UnkStruct_0206DBE8 *)ov6_02246498(param2); + UnkStruct_0206DBE8 *v0 = (UnkStruct_0206DBE8 *)ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); sub_0206CE74(param1, 1, v0->unk_02, v0->unk_04, v0->unk_05, v0->unk_06); @@ -1306,9 +1301,9 @@ static int sub_0206DBE8 (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static BOOL sub_0206DC3C (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206DC3C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0206DBE8 * v0 = (UnkStruct_0206DBE8 *)ov6_02246498(param1); + UnkStruct_0206DBE8 *v0 = (UnkStruct_0206DBE8 *)ov6_02246498(param1); if (sub_02026FE8(SaveData_Pokedex(fieldSystem->saveData), v0->unk_02) == 0) { return 0; @@ -1317,19 +1312,19 @@ static BOOL sub_0206DC3C (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * pa return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 17); } -void sub_0206DC6C (FieldSystem * fieldSystem, u32 param1, Pokemon * param2) +void sub_0206DC6C(FieldSystem *fieldSystem, u32 param1, Pokemon *param2) { UnkUnion_0206D1B8 v0; - UnkStruct_0206DC9C * v1 = &v0.val19; + UnkStruct_0206DC9C *v1 = &v0.val19; sub_0206CE38(param2, &v1->unk_00, &v1->unk_02, &v1->unk_03, &v1->unk_04); v1->unk_08 = param1; sub_0206CD70(fieldSystem, 3, 3, v1); } -static int sub_0206DC9C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206DC9C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206DC9C * v0 = (UnkStruct_0206DC9C *)ov6_02246498(param2); + UnkStruct_0206DC9C *v0 = (UnkStruct_0206DC9C *)ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); sub_0206CE74(param1, 1, v0->unk_00, v0->unk_02, v0->unk_03, v0->unk_04); @@ -1344,16 +1339,16 @@ static int sub_0206DC9C (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 2; } -static BOOL sub_0206DD1C (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206DD1C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0206DC9C * v0 = (UnkStruct_0206DC9C *)ov6_02246498(param1); + UnkStruct_0206DC9C *v0 = (UnkStruct_0206DC9C *)ov6_02246498(param1); return sub_02026FE8(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } -void sub_0206DD38 (FieldSystem * fieldSystem, u32 param1, u32 param2, u32 param3) +void sub_0206DD38(FieldSystem *fieldSystem, u32 param1, u32 param2, u32 param3) { UnkUnion_0206D1B8 v0; - UnkStruct_0206DD5C * v1 = &v0.val20; + UnkStruct_0206DD5C *v1 = &v0.val20; if (param2 < 1000 + param1) { return; @@ -1366,9 +1361,9 @@ void sub_0206DD38 (FieldSystem * fieldSystem, u32 param1, u32 param2, u32 param3 sub_0206CD70(fieldSystem, 3, 4, v1); } -static int sub_0206DD5C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206DD5C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206DD5C * v0 = ov6_02246498(param2); + UnkStruct_0206DD5C *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetNumber(param1, 1, v0->unk_08, 10, 0, 1); @@ -1378,11 +1373,11 @@ static int sub_0206DD5C (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 3; } -void sub_0206DDB8 (SaveData * param0, Pokemon * param1, u32 param2) +void sub_0206DDB8(SaveData *param0, Pokemon *param1, u32 param2) { u8 v0, v1; UnkUnion_0206D1B8 v2; - UnkStruct_0206DE80 * v3 = &v2.val21; + UnkStruct_0206DE80 *v3 = &v2.val21; v1 = sub_0206DE4C(param1); @@ -1451,7 +1446,7 @@ static const u16 Unk_020EFDDC[] = { 0x2A }; -static u8 sub_0206DE4C (Pokemon * param0) +static u8 sub_0206DE4C(Pokemon *param0) { u8 v0, v1; @@ -1466,9 +1461,9 @@ static u8 sub_0206DE4C (Pokemon * param0) return v0; } -static int sub_0206DE80 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206DE80(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206DE80 * v0 = ov6_02246498(param2); + UnkStruct_0206DE80 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); @@ -1484,10 +1479,10 @@ static int sub_0206DE80 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 4; } -void sub_0206DEEC (FieldSystem * fieldSystem, u16 param1, u16 param2) +void sub_0206DEEC(FieldSystem *fieldSystem, u16 param1, u16 param2) { UnkUnion_0206D1B8 v0; - UnkStruct_0206DF14 * v1 = &v0.val22; + UnkStruct_0206DF14 *v1 = &v0.val22; v1->unk_00 = param1; v1->unk_02 = param2; @@ -1499,10 +1494,10 @@ void sub_0206DEEC (FieldSystem * fieldSystem, u16 param1, u16 param2) sub_0206CD70(fieldSystem, 3, 8, v1); } -static int sub_0206DF14 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206DF14(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { u16 v0; - UnkStruct_0206DF14 * v1 = ov6_02246498(param2); + UnkStruct_0206DF14 *v1 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetUndergroundTrapName(param1, 1, v1->unk_00); @@ -1517,10 +1512,10 @@ static int sub_0206DF14 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 7; } -void sub_0206DF60 (FieldSystem * fieldSystem, u16 param1) +void sub_0206DF60(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206DF88 * v1 = &v0.val23; + UnkStruct_0206DF88 *v1 = &v0.val23; v1->unk_00 = param1; @@ -1533,10 +1528,10 @@ void sub_0206DF60 (FieldSystem * fieldSystem, u16 param1) } } -static int sub_0206DF88 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206DF88(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { u16 v0; - UnkStruct_0206DF88 * v1 = ov6_02246498(param2); + UnkStruct_0206DF88 *v1 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); @@ -1551,16 +1546,16 @@ static int sub_0206DF88 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 8; } -static BOOL sub_0206DFC8 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206DFC8(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return Bag_CanRemoveItem(SaveData_GetBag(fieldSystem->saveData), 428, 1, 32); } -void sub_0206DFE0 (SaveData * param0) +void sub_0206DFE0(SaveData *param0) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E018 * v1 = &v0.val24; - UnkStruct_0202E828 * v2 = sub_0202E828(SaveData_TVBroadcast(param0)); + UnkStruct_0206E018 *v1 = &v0.val24; + UnkStruct_0202E828 *v2 = sub_0202E828(SaveData_TVBroadcast(param0)); if (v2->unk_04 >= 30) { v1->unk_00 = *v2; @@ -1571,9 +1566,9 @@ void sub_0206DFE0 (SaveData * param0) } } -static int sub_0206E018 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E018(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E018 * v0 = ov6_02246498(param2); + UnkStruct_0206E018 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetNumber(param1, 1, v0->unk_00.unk_04, 4, 0, 1); @@ -1581,16 +1576,16 @@ static int sub_0206E018 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 9; } -static BOOL sub_0206E04C (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206E04C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 17); } -void sub_0206E060 (SaveData * param0) +void sub_0206E060(SaveData *param0) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E098 * v1 = &v0.val25; - UnkStruct_0202E834 * v2 = sub_0202E834(SaveData_TVBroadcast(param0)); + UnkStruct_0206E098 *v1 = &v0.val25; + UnkStruct_0202E834 *v2 = sub_0202E834(SaveData_TVBroadcast(param0)); if (v2->unk_02 >= 10) { v1->unk_00 = *v2; @@ -1601,9 +1596,9 @@ void sub_0206E060 (SaveData * param0) } } -static int sub_0206E098 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E098(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E098 * v0 = ov6_02246498(param2); + UnkStruct_0206E098 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetNumber(param1, 1, v0->unk_00.unk_02, 4, 0, 1); @@ -1611,16 +1606,16 @@ static int sub_0206E098 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 10; } -static BOOL sub_0206E0CC (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206E0CC(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 9); } -void sub_0206E0E0 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E0E0(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E118 * v1 = &v0.val26; - UnkStruct_0202E7FC * v2 = sub_0202E7FC(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0206E118 *v1 = &v0.val26; + UnkStruct_0202E7FC *v2 = sub_0202E7FC(SaveData_TVBroadcast(fieldSystem->saveData)); v1->unk_00 = *v2; v2->unk_00 = 0; @@ -1630,9 +1625,9 @@ void sub_0206E0E0 (FieldSystem * fieldSystem, u16 param1) sub_0206CD70(fieldSystem, 1, 2, v1); } -static int sub_0206E118 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E118(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E118 * v0 = ov6_02246498(param2); + UnkStruct_0206E118 *v0 = ov6_02246498(param2); StringTemplate_SetNumber(param1, 0, v0->unk_00.unk_02, 4, 0, 1); sub_0206CDD0(param1, 1, param2); @@ -1645,16 +1640,16 @@ static int sub_0206E118 (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static BOOL sub_0206E160 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206E160(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 17); } -void sub_0206E174 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E174(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E1C0 * v1 = &v0.val27; - Pokemon * v2; + UnkStruct_0206E1C0 *v1 = &v0.val27; + Pokemon *v2; v2 = Party_FindFirstHatchedMon(Party_GetFromSavedata(fieldSystem->saveData)); @@ -1665,9 +1660,9 @@ void sub_0206E174 (FieldSystem * fieldSystem, u16 param1) sub_0206CD70(fieldSystem, 1, 4, v1); } -static int sub_0206E1C0 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E1C0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E1C0 * v0 = ov6_02246498(param2); + UnkStruct_0206E1C0 *v0 = ov6_02246498(param2); if (v0->unk_05) { sub_0206CDD0(param1, 0, param2); @@ -1684,17 +1679,17 @@ static int sub_0206E1C0 (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static BOOL sub_0206E248 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206E248(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0206E1C0 * v0 = ov6_02246498(param1); + UnkStruct_0206E1C0 *v0 = ov6_02246498(param1); return sub_02026FE8(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } -void sub_0206E264 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E264(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E28C * v1 = &v0.val28; + UnkStruct_0206E28C *v1 = &v0.val28; v1->unk_00 = PoketchSystem_CurrentAppID(fieldSystem->unk_04->poketchSys); v1->unk_04 = param1; @@ -1702,9 +1697,9 @@ void sub_0206E264 (FieldSystem * fieldSystem, u16 param1) sub_0206CD70(fieldSystem, 1, 6, v1); } -static int sub_0206E28C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E28C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E28C * v0 = ov6_02246498(param2); + UnkStruct_0206E28C *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetPoketchAppName(param1, 1, v0->unk_00); @@ -1713,11 +1708,11 @@ static int sub_0206E28C (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 16; } -void sub_0206E2BC (FieldSystem * fieldSystem, u16 param1) +void sub_0206E2BC(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E300 * v1 = &v0.val29; - UnkStruct_0202E7D8 * v2 = sub_0202E7D8(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0206E300 *v1 = &v0.val29; + UnkStruct_0202E7D8 *v2 = sub_0202E7D8(SaveData_TVBroadcast(fieldSystem->saveData)); v1->unk_00 = *v2; v2->unk_00 = 0; @@ -1727,9 +1722,9 @@ void sub_0206E2BC (FieldSystem * fieldSystem, u16 param1) sub_0206CD70(fieldSystem, 1, 7, v1); } -static int sub_0206E300 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E300(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E300 * v0 = ov6_02246498(param2); + UnkStruct_0206E300 *v0 = ov6_02246498(param2); sub_0206CE74(param1, 0, v0->unk_00.unk_02, v0->unk_00.unk_04, v0->unk_00.unk_05, v0->unk_00.unk_06); StringTemplate_SetContestTypeName(param1, 1, sub_020958B8(v0->unk_00.unk_08)); @@ -1745,22 +1740,22 @@ static int sub_0206E300 (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static BOOL sub_0206E37C (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206E37C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0206E300 * v0 = ov6_02246498(param1); + UnkStruct_0206E300 *v0 = ov6_02246498(param1); return sub_02026FE8(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00.unk_02); } -void sub_0206E398 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E398(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E3C8 * v1 = &v0.val30; + UnkStruct_0206E3C8 *v1 = &v0.val30; v1->unk_02 = param1; { - UnkStruct_0202A750 * v2 = sub_0202A750(fieldSystem->saveData); - UnkStruct_02029C68 * v3 = sub_02029CA8(v2, 0); + UnkStruct_0202A750 *v2 = sub_0202A750(fieldSystem->saveData); + UnkStruct_02029C68 *v3 = sub_02029CA8(v2, 0); v1->unk_00 = sub_0202A184(v3); } @@ -1768,9 +1763,9 @@ void sub_0206E398 (FieldSystem * fieldSystem, u16 param1) sub_0206CD70(fieldSystem, 1, 9, v1); } -static int sub_0206E3C8 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E3C8(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E3C8 * v0 = ov6_02246498(param2); + UnkStruct_0206E3C8 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); sub_0206CEA4(param1, 1, v0->unk_00); @@ -1779,34 +1774,34 @@ static int sub_0206E3C8 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 20; } -static BOOL sub_0206E3F8 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206E3F8(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0206E3C8 * v0 = ov6_02246498(param1); + UnkStruct_0206E3C8 *v0 = ov6_02246498(param1); return sub_02026FE8(SaveData_Pokedex(fieldSystem->saveData), v0->unk_00); } -void sub_0206E414 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E414(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E428 * v1 = &v0.val31; + UnkStruct_0206E428 *v1 = &v0.val31; v1->unk_00 = param1; sub_0206CD70(fieldSystem, 1, 10, v1); } -static int sub_0206E428 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E428(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E428 * v0 = ov6_02246498(param2); + UnkStruct_0206E428 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); return 21 + v0->unk_00 - 1; } -void sub_0206E448 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E448(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E480 * v1 = &v0.val32; - UnkStruct_0202E7F0 * v2 = sub_0202E7F0(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0206E480 *v1 = &v0.val32; + UnkStruct_0202E7F0 *v2 = sub_0202E7F0(SaveData_TVBroadcast(fieldSystem->saveData)); v1->unk_00 = *v2; v1->unk_02 = param1; @@ -1816,9 +1811,9 @@ void sub_0206E448 (FieldSystem * fieldSystem, u16 param1) sub_0206CD70(fieldSystem, 1, 11, v1); } -static int sub_0206E480 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E480(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E480 * v0 = ov6_02246498(param2); + UnkStruct_0206E480 *v0 = ov6_02246498(param2); int v1 = v0->unk_00.unk_01; sub_0206CDD0(param1, 0, param2); @@ -1839,11 +1834,11 @@ static int sub_0206E480 (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -void sub_0206E4DC (FieldSystem * fieldSystem, u16 param1) +void sub_0206E4DC(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E520 * v1 = &v0.val33; - UnkStruct_0202E7E4 * v2 = sub_0202E7E4(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0206E520 *v1 = &v0.val33; + UnkStruct_0202E7E4 *v2 = sub_0202E7E4(SaveData_TVBroadcast(fieldSystem->saveData)); v1->unk_00 = *v2; v1->unk_24 = param1; @@ -1853,9 +1848,9 @@ void sub_0206E4DC (FieldSystem * fieldSystem, u16 param1) sub_0206CD70(fieldSystem, 1, 13, v1); } -static int sub_0206E520 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E520(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E520 * v0 = ov6_02246498(param2); + UnkStruct_0206E520 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); sub_0206CE74(param1, 1, v0->unk_00.unk_02, v0->unk_00.unk_04, v0->unk_00.unk_05, v0->unk_00.unk_06); @@ -1876,11 +1871,11 @@ static int sub_0206E520 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 45; } -void sub_0206E5A0 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E5A0(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E5E4 * v1 = &v0.val34; - UnkStruct_0202E810 * v2 = sub_0202E810(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0206E5E4 *v1 = &v0.val34; + UnkStruct_0202E810 *v2 = sub_0202E810(SaveData_TVBroadcast(fieldSystem->saveData)); v1->unk_00 = *v2; v1->unk_1E = param1; @@ -1890,9 +1885,9 @@ void sub_0206E5A0 (FieldSystem * fieldSystem, u16 param1) sub_0206CD70(fieldSystem, 1, 14, v1); } -static int sub_0206E5E4 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E5E4(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E5E4 * v0 = ov6_02246498(param2); + UnkStruct_0206E5E4 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); sub_0206CE74(param1, 1, v0->unk_00.unk_02, v0->unk_00.unk_04, v0->unk_00.unk_05, v0->unk_00.unk_06); @@ -1907,23 +1902,23 @@ static int sub_0206E5E4 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 47; } -static BOOL sub_0206E654 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206E654(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 17); } -void sub_0206E668 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E668(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E680 * v1 = &v0.val35; + UnkStruct_0206E680 *v1 = &v0.val35; v1->unk_00 = param1; sub_0206CD70(fieldSystem, 1, 15, v1); } -static int sub_0206E680 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E680(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E680 * v0 = ov6_02246498(param2); + UnkStruct_0206E680 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetCustomMessageWord(param1, 1, v0->unk_00); @@ -1931,18 +1926,18 @@ static int sub_0206E680 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 48; } -void sub_0206E6A8 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E6A8(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E6C0 * v1 = &v0.val36; + UnkStruct_0206E6C0 *v1 = &v0.val36; v1->unk_00 = param1; sub_0206CD70(fieldSystem, 1, 16, v1); } -static int sub_0206E6C0 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E6C0(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E6C0 * v0 = ov6_02246498(param2); + UnkStruct_0206E6C0 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetCustomMessageWord(param1, 1, v0->unk_00); @@ -1950,18 +1945,18 @@ static int sub_0206E6C0 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 49; } -void sub_0206E6E8 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E6E8(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E700 * v1 = &v0.val37; + UnkStruct_0206E700 *v1 = &v0.val37; v1->unk_00 = param1; sub_0206CD70(fieldSystem, 1, 17, v1); } -static int sub_0206E700 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E700(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E700 * v0 = ov6_02246498(param2); + UnkStruct_0206E700 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetCustomMessageWord(param1, 1, v0->unk_00); @@ -1969,18 +1964,18 @@ static int sub_0206E700 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 50; } -void sub_0206E728 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E728(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E740 * v1 = &v0.val38; + UnkStruct_0206E740 *v1 = &v0.val38; v1->unk_00 = param1; sub_0206CD70(fieldSystem, 1, 18, v1); } -static int sub_0206E740 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E740(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206E740 * v0 = ov6_02246498(param2); + UnkStruct_0206E740 *v0 = ov6_02246498(param2); sub_0206CDD0(param1, 0, param2); StringTemplate_SetCustomMessageWord(param1, 1, v0->unk_00); @@ -1988,11 +1983,11 @@ static int sub_0206E740 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 51; } -void sub_0206E768 (FieldSystem * fieldSystem, u16 param1) +void sub_0206E768(FieldSystem *fieldSystem, u16 param1) { UnkUnion_0206D1B8 v0; - UnkStruct_0206E768 * v1 = &v0.val39; - UnkStruct_0202E81C * v2 = sub_0202E81C(SaveData_TVBroadcast(fieldSystem->saveData)); + UnkStruct_0206E768 *v1 = &v0.val39; + UnkStruct_0202E81C *v2 = sub_0202E81C(SaveData_TVBroadcast(fieldSystem->saveData)); v1->unk_00 = *v2; v1->unk_16 = param1; @@ -2002,11 +1997,11 @@ void sub_0206E768 (FieldSystem * fieldSystem, u16 param1) sub_0206CD70(fieldSystem, 1, 19, v1); } -static int sub_0206E7AC (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E7AC(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { int v0; - UnkStruct_0206E768 * v1 = ov6_02246498(param2); - Strbuf* v2 = Strbuf_Init(64, 4); + UnkStruct_0206E768 *v1 = ov6_02246498(param2); + Strbuf *v2 = Strbuf_Init(64, 4); sub_0206CDD0(param1, 0, param2); Strbuf_CopyChars(v2, v1->unk_00.unk_06); @@ -2036,7 +2031,7 @@ static int sub_0206E7AC (FieldSystem * fieldSystem, StringTemplate * param1, Unk return v0; } -static BOOL sub_0206E834 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206E834(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return inline_0208BE68(SaveData_GetVarsFlags(fieldSystem->saveData), 17); } @@ -2049,7 +2044,7 @@ static const u8 Unk_020EFD34[] = { 0x5 }; -static int sub_0206E848 (UnkStruct_0202B4A0 * param0) +static int sub_0206E848(UnkStruct_0202B4A0 *param0) { int v0, v1; @@ -2062,11 +2057,11 @@ static int sub_0206E848 (UnkStruct_0202B4A0 * param0) return v1; } -static int sub_0206E870 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E870(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { int v0, v1, v2; int v3; - UnkStruct_0202B4A0 * v4 = sub_0202B4A0(fieldSystem->saveData); + UnkStruct_0202B4A0 *v4 = sub_0202B4A0(fieldSystem->saveData); v1 = sub_0206E848(v4); GF_ASSERT(v1 > 0); @@ -2103,9 +2098,9 @@ static int sub_0206E870 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 0; } -static BOOL sub_0206E928 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206E928(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0202B4A0 * v0 = sub_0202B4A0(fieldSystem->saveData); + UnkStruct_0202B4A0 *v0 = sub_0202B4A0(fieldSystem->saveData); if (sub_0206E848(v0) != 0) { return 1; @@ -2122,7 +2117,7 @@ static u16 Unk_02100BA4[] = { 0xA5 }; -static int sub_0206E940 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206E940(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { int v0, weather; @@ -2165,14 +2160,14 @@ static int sub_0206E940 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 1; } -static BOOL sub_0206EA0C (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206EA0C(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return 1; } -static int sub_0206EA10 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206EA10(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem)); + TrainerInfo *v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem)); int v1 = fieldSystem->location->mapId; if ((v1 == 411) || ((v1 >= 412) && (v1 <= 417))) { @@ -2240,10 +2235,10 @@ static int sub_0206EA10 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 27; } -static int sub_0206EB94 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206EB94(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { u16 v0, v1; - UnkStruct_0202D7B0 * v2 = sub_0202D834(fieldSystem->saveData); + UnkStruct_0202D7B0 *v2 = sub_0202D834(fieldSystem->saveData); ov6_0224322C(sub_0202D814(v2, 2), &v0, &v1); StringTemplate_SetLocationName(param1, 0, MapHeader_GetMapLabelTextID(v0)); @@ -2252,13 +2247,13 @@ static int sub_0206EB94 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 29; } -static BOOL sub_0206EBD4 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206EBD4(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0202D7B0 * v0 = sub_0202D834(fieldSystem->saveData); + UnkStruct_0202D7B0 *v0 = sub_0202D834(fieldSystem->saveData); return sub_0202D898(v0); } -static BOOL sub_0206EBE4 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206EBE4(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return 0; } @@ -2523,12 +2518,12 @@ static const u16 Unk_020F0074[] = { 0x1D7 }; -static int sub_0206EBE8 (FieldSystem * fieldSystem) +static int sub_0206EBE8(FieldSystem *fieldSystem) { u8 v0[NELEMS(Unk_020EFD3C)]; u8 v1[NELEMS(Unk_020F0074) / 2]; int v2, v3; - VarsFlags * v4 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v4 = SaveData_GetVarsFlags(fieldSystem->saveData); for (v2 = 0; v2 < NELEMS(Unk_020EFD3C); v2++) { v0[v2] = inline_0208BE68(v4, Unk_020EFD3C[v2]); @@ -2544,9 +2539,9 @@ static int sub_0206EBE8 (FieldSystem * fieldSystem) return v1[inline_020564D0(v3)]; } -static int sub_0206EC90 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206EC90(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_02027854 * v0 = sub_02027854(fieldSystem->saveData); + UnkStruct_02027854 *v0 = sub_02027854(fieldSystem->saveData); int v1, v2; v1 = sub_0206EBE8(fieldSystem); @@ -2569,23 +2564,23 @@ static int sub_0206EC90 (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static BOOL sub_0206ECFC (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206ECFC(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); return inline_0208BE68(v0, 9); } -static BOOL sub_0206ED10 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206ED10(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { return 0; } -static int sub_0206ED14 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206ED14(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { u32 v0, v1; u8 v2; - Pokemon * v3; - BoxPokemon * v4; + Pokemon *v3; + BoxPokemon *v4; int v5, v6; v5 = 0xff; @@ -2622,14 +2617,14 @@ static int sub_0206ED14 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 44; } -static int sub_0206EDAC (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206EDAC(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_0206C638 * v0; - UnkStruct_0202D7B0 * v1; + UnkStruct_0206C638 *v0; + UnkStruct_0202D7B0 *v1; u16 v2, v3; u32 v4, v5; - Strbuf* v6 = Strbuf_Init(22, 4); - TrainerInfo * v7 = SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem)); + Strbuf *v6 = Strbuf_Init(22, 4); + TrainerInfo *v7 = SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem)); v1 = sub_0202D834(fieldSystem->saveData); v2 = (LCRNG_Next() % 29); @@ -2653,10 +2648,10 @@ static int sub_0206EDAC (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 49; } -static BOOL sub_0206EE74 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206EE74(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { int v0; - UnkStruct_0202D7B0 * v1; + UnkStruct_0202D7B0 *v1; v1 = sub_0202D834(fieldSystem->saveData); @@ -2669,7 +2664,7 @@ static BOOL sub_0206EE74 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * pa return 0; } -static int sub_0206EE9C (UnkStruct_0202A750 * param0) +static int sub_0206EE9C(UnkStruct_0202A750 *param0) { int v0, v1; @@ -2682,11 +2677,11 @@ static int sub_0206EE9C (UnkStruct_0202A750 * param0) return v1; } -static int sub_0206EEBC (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206EEBC(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - UnkStruct_02029C68 * v0; + UnkStruct_02029C68 *v0; int v1, v2, v3, v4; - UnkStruct_0202A750 * v5 = sub_0202A750(fieldSystem->saveData); + UnkStruct_0202A750 *v5 = sub_0202A750(fieldSystem->saveData); v2 = sub_0206EE9C(v5); @@ -2712,7 +2707,7 @@ static int sub_0206EEBC (FieldSystem * fieldSystem, StringTemplate * param1, Unk { u16 v6; - Strbuf* v7 = Strbuf_Init(7 + 1, 4); + Strbuf *v7 = Strbuf_Init(7 + 1, 4); int v8 = sub_0202A1C0(v0); sub_0202A1A0(v0, v7); @@ -2726,9 +2721,9 @@ static int sub_0206EEBC (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 52; } -static BOOL sub_0206EF64 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206EF64(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - UnkStruct_0202A750 * v0 = sub_0202A750(fieldSystem->saveData); + UnkStruct_0202A750 *v0 = sub_0202A750(fieldSystem->saveData); if (sub_0206EE9C(v0) != 0) { return 1; @@ -2737,7 +2732,7 @@ static BOOL sub_0206EF64 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * pa } } -static int sub_0206EF7C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206EF7C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { u16 v0; @@ -2756,11 +2751,11 @@ static int sub_0206EF7C (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 0 + v0; } -static int sub_0206F01C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206F01C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - Strbuf* v0; + Strbuf *v0; u16 v1, v2, v3; - const PokedexData * v4 = SaveData_Pokedex(fieldSystem->saveData); + const PokedexData *v4 = SaveData_Pokedex(fieldSystem->saveData); v1 = (LCRNG_Next() % (NATIONAL_DEX_COUNT - 1)) + 1; @@ -2795,10 +2790,10 @@ static int sub_0206F01C (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static Strbuf* sub_0206F0D8 (u16 param0, u32 param1) +static Strbuf *sub_0206F0D8(u16 param0, u32 param1) { - MessageLoader * v0; - Strbuf* v1; + MessageLoader *v0; + Strbuf *v1; v0 = MessageLoader_Init(1, 26, 412, param1); v1 = MessageLoader_GetNewStrbuf(v0, param0); @@ -2807,9 +2802,9 @@ static Strbuf* sub_0206F0D8 (u16 param0, u32 param1) return v1; } -static BOOL sub_0206F100 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206F100(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - const PokedexData * v0 = SaveData_Pokedex(fieldSystem->saveData); + const PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); if (sub_02027520(v0) == 1) { return 1; @@ -2818,7 +2813,7 @@ static BOOL sub_0206F100 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * pa } } -static int sub_0206F118 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206F118(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { u16 v0; @@ -2833,7 +2828,7 @@ static int sub_0206F118 (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static int sub_0206F13C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206F13C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { u16 v0; @@ -2848,14 +2843,14 @@ static int sub_0206F13C (FieldSystem * fieldSystem, StringTemplate * param1, Unk } } -static int sub_0206F160 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206F160(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { - Strbuf* v0; + Strbuf *v0; u16 v1, v2; - Pokemon * v3; - Party * v4; - TrainerInfo * v5 = SaveData_GetTrainerInfo(fieldSystem->saveData); - PokedexData * v6 = SaveData_Pokedex(fieldSystem->saveData); + Pokemon *v3; + Party *v4; + TrainerInfo *v5 = SaveData_GetTrainerInfo(fieldSystem->saveData); + PokedexData *v6 = SaveData_Pokedex(fieldSystem->saveData); v4 = Party_GetFromSavedata(fieldSystem->saveData); v3 = Party_GetPokemonBySlotIndex(v4, sub_0205E1B4(fieldSystem->saveData)); @@ -2885,9 +2880,9 @@ static int sub_0206F160 (FieldSystem * fieldSystem, StringTemplate * param1, Unk return 17; } -static BOOL sub_0206F260 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206F260(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { - const PokedexData * v0 = SaveData_Pokedex(fieldSystem->saveData); + const PokedexData *v0 = SaveData_Pokedex(fieldSystem->saveData); if (sub_02027520(v0) == 1) { return 1; @@ -2896,17 +2891,17 @@ static BOOL sub_0206F260 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * pa } } -static int sub_0206F278 (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206F278(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { return 18; } -static int sub_0206F27C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206F27C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { return 19; } -static BOOL sub_0206F280 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * param1) +static BOOL sub_0206F280(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param1) { if (TrainerInfo_HasBadge(SaveData_GetTrainerInfo(fieldSystem->saveData), 0) == 1) { return 1; @@ -2915,7 +2910,7 @@ static BOOL sub_0206F280 (FieldSystem * fieldSystem, UnkStruct_ov6_022465F4 * pa } } -static int sub_0206F29C (FieldSystem * fieldSystem, StringTemplate * param1, UnkStruct_ov6_022465F4 * param2) +static int sub_0206F29C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2) { u16 v0; @@ -2943,104 +2938,104 @@ static int sub_0206F29C (FieldSystem * fieldSystem, StringTemplate * param1, Unk } static const UnkStruct_020EFFA4 Unk_020EFFA4[] = { - {sub_0206D230, sub_0206D320}, - {sub_0206D2E0, NULL}, - {sub_0206D374, sub_0206D3C0}, - {sub_0206D43C, NULL}, - {NULL, NULL}, - {sub_0206D4D4, NULL}, - {sub_0206D530, NULL}, - {sub_0206D5B0, sub_0206D5F0}, - {NULL, NULL}, - {sub_0206D644, sub_0206D6A8}, - {NULL, NULL}, - {NULL, NULL}, - {sub_0206D6E0, sub_0206DB08}, - {NULL, NULL}, - {sub_0206D75C, sub_0206D7A4}, - {sub_0206D8B0, sub_0206D8F0}, - {NULL, sub_0206D910}, - {sub_0206D94C, NULL}, - {sub_0206D98C, NULL}, - {sub_0206D474, NULL}, - {sub_0206D9F4, sub_0206DA50}, - {sub_0206DAF0, sub_0206DB08}, - {sub_0206DAFC, sub_0206DB08}, - {NULL, NULL}, - {sub_0206DB38, sub_0206DB48}, - {sub_0206DB74, sub_0206DB9C} + { sub_0206D230, sub_0206D320 }, + { sub_0206D2E0, NULL }, + { sub_0206D374, sub_0206D3C0 }, + { sub_0206D43C, NULL }, + { NULL, NULL }, + { sub_0206D4D4, NULL }, + { sub_0206D530, NULL }, + { sub_0206D5B0, sub_0206D5F0 }, + { NULL, NULL }, + { sub_0206D644, sub_0206D6A8 }, + { NULL, NULL }, + { NULL, NULL }, + { sub_0206D6E0, sub_0206DB08 }, + { NULL, NULL }, + { sub_0206D75C, sub_0206D7A4 }, + { sub_0206D8B0, sub_0206D8F0 }, + { NULL, sub_0206D910 }, + { sub_0206D94C, NULL }, + { sub_0206D98C, NULL }, + { sub_0206D474, NULL }, + { sub_0206D9F4, sub_0206DA50 }, + { sub_0206DAF0, sub_0206DB08 }, + { sub_0206DAFC, sub_0206DB08 }, + { NULL, NULL }, + { sub_0206DB38, sub_0206DB48 }, + { sub_0206DB74, sub_0206DB9C } }; static const UnkStruct_020EFFA4 Unk_020EFE2C[11] = { - {sub_0206DBE8, sub_0206DC3C}, - {NULL, NULL}, - {sub_0206DC9C, sub_0206DD1C}, - {sub_0206DD5C, NULL}, - {sub_0206DE80, NULL}, - {NULL, NULL}, - {NULL, NULL}, - {sub_0206DF14, sub_0206DFC8}, - {sub_0206DF88, sub_0206DFC8}, - {sub_0206E018, sub_0206E04C}, - {sub_0206E098, sub_0206E0CC} + { sub_0206DBE8, sub_0206DC3C }, + { NULL, NULL }, + { sub_0206DC9C, sub_0206DD1C }, + { sub_0206DD5C, NULL }, + { sub_0206DE80, NULL }, + { NULL, NULL }, + { NULL, NULL }, + { sub_0206DF14, sub_0206DFC8 }, + { sub_0206DF88, sub_0206DFC8 }, + { sub_0206E018, sub_0206E04C }, + { sub_0206E098, sub_0206E0CC } }; static const UnkStruct_020EFFA4 Unk_020EFF0C[19] = { - {NULL, NULL}, - {sub_0206E118, sub_0206E160}, - {NULL, NULL}, - {sub_0206E1C0, sub_0206E248}, - {NULL, NULL}, - {sub_0206E28C, NULL}, - {sub_0206E300, sub_0206E37C}, - {NULL, NULL}, - {sub_0206E3C8, sub_0206E3F8}, - {sub_0206E428, NULL}, - {sub_0206E480, NULL}, - {NULL, NULL}, - {sub_0206E520, NULL}, - {sub_0206E5E4, sub_0206E654}, - {sub_0206E680, NULL}, - {sub_0206E6C0, NULL}, - {sub_0206E700, NULL}, - {sub_0206E740, NULL}, - {sub_0206E7AC, sub_0206E834} + { NULL, NULL }, + { sub_0206E118, sub_0206E160 }, + { NULL, NULL }, + { sub_0206E1C0, sub_0206E248 }, + { NULL, NULL }, + { sub_0206E28C, NULL }, + { sub_0206E300, sub_0206E37C }, + { NULL, NULL }, + { sub_0206E3C8, sub_0206E3F8 }, + { sub_0206E428, NULL }, + { sub_0206E480, NULL }, + { NULL, NULL }, + { sub_0206E520, NULL }, + { sub_0206E5E4, sub_0206E654 }, + { sub_0206E680, NULL }, + { sub_0206E6C0, NULL }, + { sub_0206E700, NULL }, + { sub_0206E740, NULL }, + { sub_0206E7AC, sub_0206E834 } }; static const UnkStruct_020EFFA4 Unk_020EFE84[17] = { - {sub_0206E870, sub_0206E928}, - {sub_0206E940, sub_0206EA0C}, - {sub_0206EA10, NULL}, - {NULL, NULL}, - {sub_0206EB94, sub_0206EBD4}, - {NULL, NULL}, - {NULL, sub_0206EBE4}, - {NULL, NULL}, - {sub_0206EC90, sub_0206ECFC}, - {NULL, NULL}, - {NULL, sub_0206ED10}, - {sub_0206ED14, NULL}, - {NULL, NULL}, - {NULL, NULL}, - {sub_0206EDAC, sub_0206EE74}, - {NULL, NULL}, - {sub_0206EEBC, sub_0206EF64} + { sub_0206E870, sub_0206E928 }, + { sub_0206E940, sub_0206EA0C }, + { sub_0206EA10, NULL }, + { NULL, NULL }, + { sub_0206EB94, sub_0206EBD4 }, + { NULL, NULL }, + { NULL, sub_0206EBE4 }, + { NULL, NULL }, + { sub_0206EC90, sub_0206ECFC }, + { NULL, NULL }, + { NULL, sub_0206ED10 }, + { sub_0206ED14, NULL }, + { NULL, NULL }, + { NULL, NULL }, + { sub_0206EDAC, sub_0206EE74 }, + { NULL, NULL }, + { sub_0206EEBC, sub_0206EF64 } }; static const UnkStruct_020EFFA4 Unk_020EFD9C[8] = { - {sub_0206EF7C, NULL}, - {sub_0206F01C, sub_0206F100}, - {sub_0206F118, NULL}, - {sub_0206F13C, NULL}, - {sub_0206F160, sub_0206F260}, - {sub_0206F278, NULL}, - {sub_0206F27C, sub_0206F280}, - {sub_0206F29C, NULL} + { sub_0206EF7C, NULL }, + { sub_0206F01C, sub_0206F100 }, + { sub_0206F118, NULL }, + { sub_0206F13C, NULL }, + { sub_0206F160, sub_0206F260 }, + { sub_0206F278, NULL }, + { sub_0206F27C, sub_0206F280 }, + { sub_0206F29C, NULL } }; -void sub_0206F2F0 (SaveData * param0) +void sub_0206F2F0(SaveData *param0) { - TVBroadcast * v0 = SaveData_TVBroadcast(param0); + TVBroadcast *v0 = SaveData_TVBroadcast(param0); sub_0206DFE0(param0); sub_0206E060(param0); diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index 1676064482..d46d37feb2 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -1,69 +1,67 @@ +#include "unk_0206F314.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" #include "struct_decls/struct_02006C24_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_decls/struct_0202E8C0_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "savedata.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0202EE10.h" #include "struct_defs/struct_0202EE10_sub1.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021D2F14.h" #include "overlay005/struct_ov5_021D30A8.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" -#include "struct_defs/sprite_template.h" #include "overlay104/struct_ov104_02241308.h" +#include "core_sys.h" +#include "game_options.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "narc.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202E840.h" #include "unk_020508D4.h" -#include "unk_0206F314.h" -#include "overlay005/ov5_021D2F14.h" typedef struct { - MessageLoader * unk_00; - StringTemplate * unk_04; - Strbuf* unk_08; - Strbuf* unk_0C; - Strbuf* unk_10; - Strbuf* unk_14; - Strbuf* unk_18; - Strbuf* unk_1C[7]; - Strbuf* unk_38[6]; - Strbuf* unk_50[6]; - Strbuf* unk_68[3]; + MessageLoader *unk_00; + StringTemplate *unk_04; + Strbuf *unk_08; + Strbuf *unk_0C; + Strbuf *unk_10; + Strbuf *unk_14; + Strbuf *unk_18; + Strbuf *unk_1C[7]; + Strbuf *unk_38[6]; + Strbuf *unk_50[6]; + Strbuf *unk_68[3]; } UnkStruct_0206F7F8_sub1; typedef struct { - UnkStruct_0202EE10_sub1 * unk_00; + UnkStruct_0202EE10_sub1 *unk_00; u16 unk_04; u8 unk_06; } UnkStruct_0206F3A0; @@ -81,7 +79,7 @@ typedef struct { typedef struct { int unk_00; - int * unk_04; + int *unk_04; int unk_08; int unk_0C; u16 unk_10; @@ -103,47 +101,47 @@ typedef struct { u16 unk_28; UnkStruct_0206F7F8_sub1 unk_2C; UnkStruct_ov84_02240FA8 unk_A0; - BmpList * unk_C0; - ResourceMetadata * unk_C4; - UIControlData * unk_C8; - FieldSystem * fieldSystem; - BGL * unk_D0; + BmpList *unk_C0; + ResourceMetadata *unk_C4; + UIControlData *unk_C8; + FieldSystem *fieldSystem; + BGL *unk_D0; Window unk_D4; Window unk_E4; Window unk_F4; Window unk_104[3]; UnkStruct_ov5_021D30A8 unk_134; - CellActorData * unk_2FC[2]; - UnkStruct_0202E8C0 * unk_304; - UnkStruct_0202EE10 * unk_308[7]; - UnkStruct_02070050 * unk_324; - UnkStruct_0206F3A0 * unk_328; + CellActorData *unk_2FC[2]; + UnkStruct_0202E8C0 *unk_304; + UnkStruct_0202EE10 *unk_308[7]; + UnkStruct_02070050 *unk_324; + UnkStruct_0206F3A0 *unk_328; u8 unk_32C[6]; } UnkStruct_0206F7F8; typedef struct { int unk_00; u16 unk_04; - UnkStruct_0206F7F8 * unk_08; + UnkStruct_0206F7F8 *unk_08; } UnkStruct_0206F314; -static void sub_0206F7F8(UnkStruct_0206F7F8 * param0, SaveData * param1); -static void sub_0206F9D4(UnkStruct_0206F7F8 * param0); -static void sub_0206FA08(UnkStruct_0206F7F8 * param0); -static void sub_0206FAC0(UnkStruct_0206F7F8 * param0); -static void sub_0206FB38(UnkStruct_0206F7F8 * param0); -static void sub_0206FC4C(UnkStruct_0206F7F8 * param0); -static void sub_0206FCC4(UnkStruct_0206F7F8 * param0); -static void sub_0206FD94(UnkStruct_0206F7F8 * param0); -static void sub_0206FDC0(UnkStruct_0206F7F8 * param0, u16 param1, u16 param2); -static void sub_0206FF10(UnkStruct_0206F7F8 * param0); -static void sub_0206FF60(BmpList * param0, u32 param1, u8 param2); -static void sub_0206FFB4(UnkStruct_0206F7F8 * param0); -static void sub_0206FFE4(UnkStruct_0206F7F8 * param0); -static void sub_02070010(UnkStruct_0206F7F8 * param0); -static void sub_02070050(UnkStruct_0206F7F8 * param0, BOOL param1); -static void sub_020701DC(UnkStruct_0206F7F8 * param0, u16 param1); -static void sub_02070288(UnkStruct_0206F7F8 * param0); +static void sub_0206F7F8(UnkStruct_0206F7F8 *param0, SaveData *param1); +static void sub_0206F9D4(UnkStruct_0206F7F8 *param0); +static void sub_0206FA08(UnkStruct_0206F7F8 *param0); +static void sub_0206FAC0(UnkStruct_0206F7F8 *param0); +static void sub_0206FB38(UnkStruct_0206F7F8 *param0); +static void sub_0206FC4C(UnkStruct_0206F7F8 *param0); +static void sub_0206FCC4(UnkStruct_0206F7F8 *param0); +static void sub_0206FD94(UnkStruct_0206F7F8 *param0); +static void sub_0206FDC0(UnkStruct_0206F7F8 *param0, u16 param1, u16 param2); +static void sub_0206FF10(UnkStruct_0206F7F8 *param0); +static void sub_0206FF60(BmpList *param0, u32 param1, u8 param2); +static void sub_0206FFB4(UnkStruct_0206F7F8 *param0); +static void sub_0206FFE4(UnkStruct_0206F7F8 *param0); +static void sub_02070010(UnkStruct_0206F7F8 *param0); +static void sub_02070050(UnkStruct_0206F7F8 *param0, BOOL param1); +static void sub_020701DC(UnkStruct_0206F7F8 *param0, u16 param1); +static void sub_02070288(UnkStruct_0206F7F8 *param0); static const UnkStruct_ov84_02240FA8 Unk_020F02B0 = { NULL, @@ -168,37 +166,37 @@ static const UnkStruct_ov84_02240FA8 Unk_020F02B0 = { }; static const UnkStruct_020F02D0 Unk_020F02D0[] = { - {0x270F, 0x4, 0xF}, - {0x270F, 0x4, 0xF}, - {0x270F, 0x4, 0xF}, - {0x270F, 0x4, 0xF}, - {0x270F, 0x4, 0xF}, - {0x7, 0x1, 0x10} + { 0x270F, 0x4, 0xF }, + { 0x270F, 0x4, 0xF }, + { 0x270F, 0x4, 0xF }, + { 0x270F, 0x4, 0xF }, + { 0x270F, 0x4, 0xF }, + { 0x7, 0x1, 0x10 } }; static const UnkStruct_020F02D0 Unk_020F0290[] = { - {0xF423F, 0x6, 0x13}, - {0xF423F, 0x6, 0x13}, - {0xF423F, 0x6, 0x12}, - {0xF423F, 0x6, 0x13} + { 0xF423F, 0x6, 0x13 }, + { 0xF423F, 0x6, 0x13 }, + { 0xF423F, 0x6, 0x12 }, + { 0xF423F, 0x6, 0x13 } }; static const UnkStruct_020F02D0 Unk_020F0278[] = { - {0x270F, 0x4, 0x15}, - {0x64, 0x4, 0x14}, - {0xFFFF, 0x5, 0x11} + { 0x270F, 0x4, 0x15 }, + { 0x64, 0x4, 0x14 }, + { 0xFFFF, 0x5, 0x11 } }; -static const UnkStruct_020F02D0 * const Unk_020F0254[] = { +static const UnkStruct_020F02D0 *const Unk_020F0254[] = { Unk_020F02D0, Unk_020F0290, Unk_020F0278 }; -static int sub_0206F314 (UnkStruct_0206F314 * param0, FieldSystem * fieldSystem, u16 param2) +static int sub_0206F314(UnkStruct_0206F314 *param0, FieldSystem *fieldSystem, u16 param2) { - UnkStruct_0206F7F8 * v0; - SaveData * v1 = fieldSystem->saveData; + UnkStruct_0206F7F8 *v0; + SaveData *v1 = fieldSystem->saveData; Heap_Create(3, 80, 0x6000); @@ -221,11 +219,11 @@ static int sub_0206F314 (UnkStruct_0206F314 * param0, FieldSystem * fieldSystem, return 1; } -static int sub_0206F3A0 (UnkStruct_0206F314 * param0) +static int sub_0206F3A0(UnkStruct_0206F314 *param0) { int v0, v1, v2, v3; - UnkStruct_0206F3A0 * v4; - UnkStruct_0206F7F8 * v5 = param0->unk_08; + UnkStruct_0206F3A0 *v4; + UnkStruct_0206F7F8 *v5 = param0->unk_08; for (v0 = 0; v0 < v5->unk_18; v0++) { v2 = 0; @@ -251,7 +249,7 @@ static int sub_0206F3A0 (UnkStruct_0206F314 * param0) return 12; } -static int sub_0206F448 (UnkStruct_0206F7F8 * param0, SaveData * param1) +static int sub_0206F448(UnkStruct_0206F7F8 *param0, SaveData *param1) { sub_0206F7F8(param0, param1); sub_0206FA08(param0); @@ -261,7 +259,7 @@ static int sub_0206F448 (UnkStruct_0206F7F8 * param0, SaveData * param1) return 2; } -static int sub_0206F468 (UnkStruct_0206F7F8 * param0) +static int sub_0206F468(UnkStruct_0206F7F8 *param0) { sub_0206FD94(param0); sub_0206FC4C(param0); @@ -271,13 +269,13 @@ static int sub_0206F468 (UnkStruct_0206F7F8 * param0) return 11; } -static int sub_0206F488 (UnkStruct_0206F7F8 * param0) +static int sub_0206F488(UnkStruct_0206F7F8 *param0) { sub_0206FDC0(param0, param0->unk_22, param0->unk_24); return 3; } -static int sub_0206F498 (UnkStruct_0206F7F8 * param0) +static int sub_0206F498(UnkStruct_0206F7F8 *param0) { s32 v0; @@ -311,13 +309,13 @@ static int sub_0206F498 (UnkStruct_0206F7F8 * param0) return 3; } -static int sub_0206F508 (UnkStruct_0206F7F8 * param0) +static int sub_0206F508(UnkStruct_0206F7F8 *param0) { sub_020701DC(param0, param0->unk_28); return 5; } -static int sub_0206F514 (UnkStruct_0206F7F8 * param0) +static int sub_0206F514(UnkStruct_0206F7F8 *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_B | PAD_BUTTON_A)) { Sound_PlayEffect(1500); @@ -334,9 +332,9 @@ static int sub_0206F514 (UnkStruct_0206F7F8 * param0) return 5; } -static int sub_0206F554 (UnkStruct_0206F7F8 * param0) +static int sub_0206F554(UnkStruct_0206F7F8 *param0) { - UnkStruct_0206F3A0 * v0; + UnkStruct_0206F3A0 *v0; if (gCoreSys.pressedKeys & (PAD_BUTTON_B)) { Sound_PlayEffect(1500); @@ -375,7 +373,7 @@ static int sub_0206F554 (UnkStruct_0206F7F8 * param0) return 6; } -static void sub_0206F62C (UnkStruct_0206F7F8 * param0) +static void sub_0206F62C(UnkStruct_0206F7F8 *param0) { static const UnkStruct_ov61_0222C884 v0 = { 0x3, @@ -390,14 +388,14 @@ static void sub_0206F62C (UnkStruct_0206F7F8 * param0) param0->unk_C8 = sub_02002100(param0->unk_D0, &v0, (1024 - (18 + 12) - 9), 11, param0->unk_00); } -static int sub_0206F658 (UnkStruct_0206F7F8 * param0) +static int sub_0206F658(UnkStruct_0206F7F8 *param0) { int v0 = 0; switch (param0->unk_0C) { case 0: - BGL_FillWindow(¶m0->unk_E4, (((15 << 4) | 15))); - param0->unk_1E = sub_0201D78C(¶m0->unk_E4, 1, param0->unk_2C.unk_68[1], 0, 0, param0->unk_1A, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + param0->unk_1E = sub_0201D78C(¶m0->unk_E4, 1, param0->unk_2C.unk_68[1], 0, 0, param0->unk_1A, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0200D41C(param0->unk_2FC[0], 2); param0->unk_0C++; break; @@ -435,15 +433,15 @@ static int sub_0206F658 (UnkStruct_0206F7F8 * param0) return 7; } -static int sub_0206F748 (UnkStruct_0206F7F8 * param0) +static int sub_0206F748(UnkStruct_0206F7F8 *param0) { int v0 = 0; switch (param0->unk_0C) { case 0: Sound_PlayEffect(1522); - BGL_FillWindow(¶m0->unk_E4, (((15 << 4) | 15))); - param0->unk_1E = sub_0201D78C(¶m0->unk_E4, 1, param0->unk_2C.unk_68[2], 0, 0, param0->unk_1A, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + param0->unk_1E = sub_0201D78C(¶m0->unk_E4, 1, param0->unk_2C.unk_68[2], 0, 0, param0->unk_1A, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0200D41C(param0->unk_2FC[0], 2); param0->unk_0C++; break; @@ -469,10 +467,10 @@ static int sub_0206F748 (UnkStruct_0206F7F8 * param0) return 8; } -static void sub_0206F7F8 (UnkStruct_0206F7F8 * param0, SaveData * param1) +static void sub_0206F7F8(UnkStruct_0206F7F8 *param0, SaveData *param1) { int v0, v1, v2, v3; - UnkStruct_0202EE10 * v4; + UnkStruct_0202EE10 *v4; param0->unk_324 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_02070050) * param0->unk_18); MI_CpuClear8(param0->unk_324, sizeof(UnkStruct_02070050) * param0->unk_18); @@ -521,7 +519,7 @@ static void sub_0206F7F8 (UnkStruct_0206F7F8 * param0, SaveData * param1) } } -static void sub_0206F9D4 (UnkStruct_0206F7F8 * param0) +static void sub_0206F9D4(UnkStruct_0206F7F8 *param0) { int v0; @@ -532,7 +530,7 @@ static void sub_0206F9D4 (UnkStruct_0206F7F8 * param0) Heap_FreeToHeap(param0->unk_324); } -static void sub_0206FA08 (UnkStruct_0206F7F8 * param0) +static void sub_0206FA08(UnkStruct_0206F7F8 *param0) { int v0; @@ -558,7 +556,7 @@ static void sub_0206FA08 (UnkStruct_0206F7F8 * param0) } } -static void sub_0206FAC0 (UnkStruct_0206F7F8 * param0) +static void sub_0206FAC0(UnkStruct_0206F7F8 *param0) { int v0; @@ -584,7 +582,7 @@ static void sub_0206FAC0 (UnkStruct_0206F7F8 * param0) MessageLoader_Free(param0->unk_2C.unk_00); } -static void sub_0206FB38 (UnkStruct_0206F7F8 * param0) +static void sub_0206FB38(UnkStruct_0206F7F8 *param0) { sub_02019690(1, 32 * (24 * (12 + 2) + 9 + 1), 0, param0->unk_00); sub_02019CB8(param0->unk_D0, 1, 0x0, 0, 0, 32, 32, 17); @@ -602,10 +600,10 @@ static void sub_0206FB38 (UnkStruct_0206F7F8 * param0) sub_02002E7C(0, 13 * 32, param0->unk_00); sub_02002E98(0, 12 * 32, param0->unk_00); BGL_AddWindow(param0->unk_D0, ¶m0->unk_E4, 3, 2, 19, 27, 4, 12, ((1024 - (18 + 12) - 9) - 27 * 4)); - BGL_FillWindow(¶m0->unk_E4, (((15 << 4) | 15))); + BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); } -static void sub_0206FC4C (UnkStruct_0206F7F8 * param0) +static void sub_0206FC4C(UnkStruct_0206F7F8 *param0) { sub_0200E084(¶m0->unk_E4, 1); sub_0201ACF4(¶m0->unk_E4); @@ -618,7 +616,7 @@ static void sub_0206FC4C (UnkStruct_0206F7F8 * param0) BGL_SetPriority(1, param0->unk_12); } -static void sub_0206FCC4 (UnkStruct_0206F7F8 * param0) +static void sub_0206FCC4(UnkStruct_0206F7F8 *param0) { int v0; UnkStruct_ov104_02241308 v1 = { @@ -633,9 +631,9 @@ static void sub_0206FCC4 (UnkStruct_0206F7F8 * param0) 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x34D8, 0x34D8, 0x34D8, 0x34D8, 0x0, 0x0}, + { 0x34D8, 0x34D8, 0x34D8, 0x34D8, 0x0, 0x0 }, 0x1, - 0x0 + 0x0, }, { 0x4A, @@ -645,16 +643,16 @@ static void sub_0206FCC4 (UnkStruct_0206F7F8 * param0) 0x1, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, - {0x34D8, 0x34D8, 0x34D8, 0x34D8, 0x0, 0x0}, + { 0x34D8, 0x34D8, 0x34D8, 0x34D8, 0x0, 0x0 }, 0x1, - 0x0 - } + 0x0, + }, }; ov5_021D3190(¶m0->unk_134, &v1, 2, param0->unk_00); { - NARC * v3; + NARC *v3; v3 = NARC_ctor(NARC_INDEX_GRAPHIC__RANKING, param0->unk_00); @@ -673,7 +671,7 @@ static void sub_0206FCC4 (UnkStruct_0206F7F8 * param0) SpriteActor_EnableObject(param0->unk_2FC[1], 0); } -static void sub_0206FD94 (UnkStruct_0206F7F8 * param0) +static void sub_0206FD94(UnkStruct_0206F7F8 *param0) { int v0; @@ -686,7 +684,7 @@ static void sub_0206FD94 (UnkStruct_0206F7F8 * param0) ov5_021D375C(¶m0->unk_134); } -static void sub_0206FDC0 (UnkStruct_0206F7F8 * param0, u16 param1, u16 param2) +static void sub_0206FDC0(UnkStruct_0206F7F8 *param0, u16 param1, u16 param2) { int v0, v1; @@ -694,7 +692,7 @@ static void sub_0206FDC0 (UnkStruct_0206F7F8 * param0, u16 param1, u16 param2) param0->unk_C4 = sub_02013A04(v1, param0->unk_00); BGL_AddWindow(param0->unk_D0, ¶m0->unk_D4, 1, 4, 1, 24, v1 * 2, 13, 1); - BGL_FillWindow(¶m0->unk_D4, (((15 << 4) | 15))); + BGL_FillWindow(¶m0->unk_D4, ((15 << 4) | 15)); for (v0 = 0; v0 < param0->unk_18; v0++) { sub_02013A6C(param0->unk_C4, param0->unk_2C.unk_38[v0], v0); @@ -715,13 +713,13 @@ static void sub_0206FDC0 (UnkStruct_0206F7F8 * param0, u16 param1, u16 param2) Window_Show(¶m0->unk_D4, 0, (1024 - (18 + 12) - 9), 11); sub_0200E060(¶m0->unk_E4, 1, (1024 - (18 + 12)), 10); - BGL_FillWindow(¶m0->unk_E4, (((15 << 4) | 15))); - sub_0201D78C(¶m0->unk_E4, 1, param0->unk_2C.unk_10, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + sub_0201D78C(¶m0->unk_E4, 1, param0->unk_2C.unk_10, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); SpriteActor_EnableObject(param0->unk_2FC[0], 1); sub_0201C3C0(param0->unk_D0, 3); } -static void sub_0206FF10 (UnkStruct_0206F7F8 * param0) +static void sub_0206FF10(UnkStruct_0206F7F8 *param0) { sub_02001384(param0->unk_C0, &(param0->unk_22), &(param0->unk_24)); sub_02013A3C(param0->unk_C4); @@ -732,10 +730,10 @@ static void sub_0206FF10 (UnkStruct_0206F7F8 * param0) sub_0201C3C0(param0->unk_D0, 3); } -static void sub_0206FF60 (BmpList * param0, u32 param1, u8 param2) +static void sub_0206FF60(BmpList *param0, u32 param1, u8 param2) { u16 v0, v1, v2; - UnkStruct_0206F7F8 * v3 = (UnkStruct_0206F7F8 *)sub_02001504(param0, 19); + UnkStruct_0206F7F8 *v3 = (UnkStruct_0206F7F8 *)sub_02001504(param0, 19); if (param2 == 0) { Sound_PlayEffect(1500); @@ -747,36 +745,36 @@ static void sub_0206FF60 (BmpList * param0, u32 param1, u8 param2) SpriteActor_SetSpritePositionXY(v3->unk_2FC[0], 126, 16 + 16 * (v1 + v0)); } -static void sub_0206FFB4 (UnkStruct_0206F7F8 * param0) +static void sub_0206FFB4(UnkStruct_0206F7F8 *param0) { - BGL_FillWindow(¶m0->unk_E4, (((15 << 4) | 15))); - sub_0201D78C(¶m0->unk_E4, 1, param0->unk_2C.unk_68[0], 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + sub_0201D78C(¶m0->unk_E4, 1, param0->unk_2C.unk_68[0], 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); } -static void sub_0206FFE4 (UnkStruct_0206F7F8 * param0) +static void sub_0206FFE4(UnkStruct_0206F7F8 *param0) { sub_0206FFB4(param0); SpriteActor_SetSpritePositionXY(param0->unk_2FC[0], 126, 16 + param0->unk_28 * 16); SpriteActor_EnableObject(param0->unk_2FC[0], 1); } -static void sub_02070010 (UnkStruct_0206F7F8 * param0) +static void sub_02070010(UnkStruct_0206F7F8 *param0) { - BGL_FillWindow(¶m0->unk_E4, (((15 << 4) | 15))); - sub_0201D78C(¶m0->unk_E4, 1, param0->unk_2C.unk_50[param0->unk_1F], 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + BGL_FillWindow(¶m0->unk_E4, ((15 << 4) | 15)); + sub_0201D78C(¶m0->unk_E4, 1, param0->unk_2C.unk_50[param0->unk_1F], 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); SpriteActor_EnableObject(param0->unk_2FC[0], 0); } -static void sub_02070050 (UnkStruct_0206F7F8 * param0, BOOL param1) +static void sub_02070050(UnkStruct_0206F7F8 *param0, BOOL param1) { int v0, v1, v2, v3, v4, v5; - UnkStruct_02070050 * v6; - const UnkStruct_020F02D0 * v7; + UnkStruct_02070050 *v6; + const UnkStruct_020F02D0 *v7; v6 = &(param0->unk_324[param0->unk_1F]); v7 = &(Unk_020F0254[param0->unk_16][param0->unk_1F]); - BGL_FillWindow(¶m0->unk_D4, (((15 << 4) | 15))); + BGL_FillWindow(¶m0->unk_D4, ((15 << 4) | 15)); v1 = v6->unk_00; v2 = 1; @@ -801,10 +799,10 @@ static void sub_02070050 (UnkStruct_0206F7F8 * param0, BOOL param1) StringTemplate_SetNumber(param0->unk_2C.unk_04, 0, v2, 1, 1, 1); StringTemplate_SetStrbuf(param0->unk_2C.unk_04, 1, v6->unk_04[v0].unk_00->unk_08, 2, 1, GAME_LANGUAGE); StringTemplate_Format(param0->unk_2C.unk_04, param0->unk_2C.unk_08, param0->unk_2C.unk_18); - sub_0201D78C(¶m0->unk_D4, 0, param0->unk_2C.unk_08, 8, v3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_D4, 0, param0->unk_2C.unk_08, 8, v3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); StringTemplate_SetNumber(param0->unk_2C.unk_04, 0, v4, v7->unk_04, 1, 1); StringTemplate_Format(param0->unk_2C.unk_04, param0->unk_2C.unk_08, param0->unk_2C.unk_1C[v7->unk_06 - 15]); - sub_0201D78C(¶m0->unk_D4, 0, param0->unk_2C.unk_08, (24 * 8) - sub_02002D7C(0, param0->unk_2C.unk_08, 0) - 8, v3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_D4, 0, param0->unk_2C.unk_08, (24 * 8) - sub_02002D7C(0, param0->unk_2C.unk_08, 0) - 8, v3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); param0->unk_32C[v3] = v0; v5 = v4; @@ -829,19 +827,19 @@ static void sub_02070050 (UnkStruct_0206F7F8 * param0, BOOL param1) } } -static void sub_020701DC (UnkStruct_0206F7F8 * param0, u16 param1) +static void sub_020701DC(UnkStruct_0206F7F8 *param0, u16 param1) { BGL_AddWindow(param0->unk_D0, ¶m0->unk_D4, 1, 4, 1, 24, 12, 13, 1); Window_Show(¶m0->unk_D4, 1, (1024 - (18 + 12) - 9), 11); sub_02070050(param0, 0); SpriteActor_EnableObject(param0->unk_2FC[1], 1); - BGL_AddWindow(param0->unk_D0, ¶m0->unk_F4, 3, 8, 14, 8, 2, 13, (((((1024 - (18 + 12) - 9) - 27 * 4) - 6 * 4)) - (8 * 2))); - BGL_FillWindow(¶m0->unk_F4, (((0 << 4) | 0))); - sub_0201D78C(¶m0->unk_F4, 0, param0->unk_2C.unk_14, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); + BGL_AddWindow(param0->unk_D0, ¶m0->unk_F4, 3, 8, 14, 8, 2, 13, ((((1024 - (18 + 12) - 9) - 27 * 4) - 6 * 4) - (8 * 2))); + BGL_FillWindow(¶m0->unk_F4, ((0 << 4) | 0)); + sub_0201D78C(¶m0->unk_F4, 0, param0->unk_2C.unk_14, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201C3C0(param0->unk_D0, 3); } -static void sub_02070288 (UnkStruct_0206F7F8 * param0) +static void sub_02070288(UnkStruct_0206F7F8 *param0) { sub_0201ACF4(¶m0->unk_D4); Window_Clear(¶m0->unk_D4, 0); @@ -852,11 +850,11 @@ static void sub_02070288 (UnkStruct_0206F7F8 * param0) SpriteActor_EnableObject(param0->unk_2FC[1], 0); } -static BOOL sub_020702D0 (TaskManager * param0) +static BOOL sub_020702D0(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0206F314 * v1 = TaskManager_Environment(param0); - UnkStruct_0206F7F8 * v2 = v1->unk_08; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0206F314 *v1 = TaskManager_Environment(param0); + UnkStruct_0206F7F8 *v2 = v1->unk_08; switch (v1->unk_00) { case 0: @@ -914,10 +912,10 @@ static BOOL sub_020702D0 (TaskManager * param0) return 0; } -void sub_020703FC (TaskManager * param0, u16 param1) +void sub_020703FC(TaskManager *param0, u16 param1) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0206F314 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206F314)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0206F314 *v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0206F314)); v1->unk_00 = 0; v1->unk_04 = param1; diff --git a/src/unk_02070428.c b/src/unk_02070428.c index 47481d062c..3775c0f015 100644 --- a/src/unk_02070428.c +++ b/src/unk_02070428.c @@ -1,36 +1,37 @@ +#include "unk_02070428.h" + #include #include -#include "inlines.h" - #include "struct_defs/struct_0202D7B0.h" -#include "field/field_system.h" #include "struct_defs/struct_02049FA8.h" #include "struct_defs/struct_020556C4.h" #include "struct_defs/struct_0205EC34.h" -#include "unk_02025E08.h" +#include "field/field_system.h" + +#include "field_overworld_state.h" +#include "inlines.h" #include "journal.h" -#include "unk_0202D7A8.h" #include "map_header.h" -#include "field_overworld_state.h" +#include "roaming_pokemon.h" +#include "unk_02025E08.h" +#include "unk_0202D7A8.h" #include "unk_0203A7D8.h" -#include "vars_flags.h" #include "unk_020556C4.h" #include "unk_0206A8DC.h" #include "unk_0206AFE0.h" -#include "roaming_pokemon.h" -#include "unk_02070428.h" +#include "vars_flags.h" -static BOOL sub_020705DC(FieldSystem * fieldSystem); -static BOOL sub_02070610(FieldSystem * fieldSystem); +static BOOL sub_020705DC(FieldSystem *fieldSystem); +static BOOL sub_02070610(FieldSystem *fieldSystem); -void sub_02070428 (FieldSystem * fieldSystem, BOOL param1) +void sub_02070428(FieldSystem *fieldSystem, BOOL param1) { fieldSystem->unk_B8 = param1; } -void FieldSystem_InitFlagsOnMapChange (FieldSystem * fieldSystem) +void FieldSystem_InitFlagsOnMapChange(FieldSystem *fieldSystem) { sub_020705DC(fieldSystem); sub_0206AF1C(SaveData_GetVarsFlags(fieldSystem->saveData), 0); @@ -43,7 +44,7 @@ void FieldSystem_InitFlagsOnMapChange (FieldSystem * fieldSystem) fieldSystem->unk_78.unk_00 = 0; if (!sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData))) { - UnkStruct_0202D7B0 * v0; + UnkStruct_0202D7B0 *v0; v0 = sub_0202D834(fieldSystem->saveData); sub_0206C404(v0, fieldSystem->location->mapId); @@ -51,7 +52,7 @@ void FieldSystem_InitFlagsOnMapChange (FieldSystem * fieldSystem) } } -void FieldSystem_InitFlagsWarp (FieldSystem * fieldSystem) +void FieldSystem_InitFlagsWarp(FieldSystem *fieldSystem) { if (fieldSystem->unk_B8 == 1) { return; @@ -72,21 +73,21 @@ void FieldSystem_InitFlagsWarp (FieldSystem * fieldSystem) fieldSystem->unk_78.unk_00 = 0; { - UnkStruct_0202D7B0 * v0; + UnkStruct_0202D7B0 *v0; v0 = sub_0202D834(fieldSystem->saveData); sub_0206C404(v0, fieldSystem->location->mapId); } if (!MapHeader_IsCave(fieldSystem->location->mapId)) { - VarsFlags * v1 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v1 = SaveData_GetVarsFlags(fieldSystem->saveData); sub_0206AECC(v1); sub_0206AEFC(v1); } { - PlayerData * v2 = FieldOverworldState_GetPlayerData(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + PlayerData *v2 = FieldOverworldState_GetPlayerData(SaveData_GetFieldOverworldState(fieldSystem->saveData)); if ((v2->unk_04 == 0x1) && (MapHeader_IsBikeAllowed(fieldSystem->location->mapId) == 0)) { v2->unk_04 = 0x0; @@ -96,44 +97,44 @@ void FieldSystem_InitFlagsWarp (FieldSystem * fieldSystem) } if (MapHeader_IsOnMainMatrix(fieldSystem->location->mapId)) { - UnkStruct_020556C4 * v3; + UnkStruct_020556C4 *v3; v3 = sub_0203A76C(SaveData_GetFieldOverworldState(fieldSystem->saveData)); sub_020556E8(v3, fieldSystem->location->x, fieldSystem->location->z); } } -void sub_0207056C (FieldSystem * fieldSystem) +void sub_0207056C(FieldSystem *fieldSystem) { sub_0206AE4C(SaveData_GetVarsFlags(fieldSystem->saveData)); sub_0206C354(sub_0202D834(fieldSystem->saveData)); } -void sub_02070588 (FieldSystem * fieldSystem) +void sub_02070588(FieldSystem *fieldSystem) { sub_0206AE4C(SaveData_GetVarsFlags(fieldSystem->saveData)); sub_0206C354(sub_0202D834(fieldSystem->saveData)); } -void sub_020705A4 (FieldSystem * fieldSystem) +void sub_020705A4(FieldSystem *fieldSystem) { sub_0206AE4C(SaveData_GetVarsFlags(fieldSystem->saveData)); } -void sub_020705B4 (FieldSystem * fieldSystem) +void sub_020705B4(FieldSystem *fieldSystem) { - VarsFlags * v0 = SaveData_GetVarsFlags(fieldSystem->saveData); + VarsFlags *v0 = SaveData_GetVarsFlags(fieldSystem->saveData); sub_0206A974(v0); sub_0206B024(v0, 0); } -void sub_020705CC (FieldSystem * fieldSystem) +void sub_020705CC(FieldSystem *fieldSystem) { sub_0206C354(sub_0202D834(fieldSystem->saveData)); } -static BOOL sub_020705DC (FieldSystem * fieldSystem) +static BOOL sub_020705DC(FieldSystem *fieldSystem) { int v0 = sub_0203A87C(fieldSystem->location->mapId); @@ -145,9 +146,9 @@ static BOOL sub_020705DC (FieldSystem * fieldSystem) return FALSE; } -static BOOL sub_02070610 (FieldSystem * fieldSystem) +static BOOL sub_02070610(FieldSystem *fieldSystem) { - Location * location = FieldOverworldState_GetPrevLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData)); + Location *location = FieldOverworldState_GetPrevLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData)); if (location->mapId != fieldSystem->location->mapId) { sub_0202C5C4(SaveData_GetTrainerInfo(fieldSystem->saveData), fieldSystem->unk_9C, fieldSystem->location->mapId, location->mapId, 32); diff --git a/src/unk_0207064C.c b/src/unk_0207064C.c index 6d59d90cbe..d03aba22d9 100644 --- a/src/unk_0207064C.c +++ b/src/unk_0207064C.c @@ -1,34 +1,35 @@ +#include "unk_0207064C.h" + #include #include -#include "sys_task_manager.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" +#include "struct_defs/struct_02049FA8.h" #include "field/field_system.h" -#include "struct_defs/struct_02049FA8.h" +#include "overlay006/ov6_02243258.h" +#include "field_map_change.h" #include "heap.h" +#include "player_avatar.h" +#include "pokemon.h" +#include "sys_task_manager.h" #include "unk_0203A7D8.h" #include "unk_020508D4.h" -#include "field_map_change.h" -#include "player_avatar.h" -#include "unk_0207064C.h" -#include "overlay006/ov6_02243258.h" typedef struct { - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; int unk_04; u16 unk_08; s16 unk_0A; s16 unk_0C; - Pokemon * unk_10; - SysTask * unk_14; + Pokemon *unk_10; + SysTask *unk_14; } UnkStruct_0207064C; -void * sub_0207064C (u32 param0, FieldSystem * fieldSystem, Pokemon * param2, u16 param3, s16 param4, s16 param5) +void *sub_0207064C(u32 param0, FieldSystem *fieldSystem, Pokemon *param2, u16 param3, s16 param4, s16 param5) { - UnkStruct_0207064C * v0 = Heap_AllocFromHeapAtEnd(param0, (sizeof(UnkStruct_0207064C))); + UnkStruct_0207064C *v0 = Heap_AllocFromHeapAtEnd(param0, (sizeof(UnkStruct_0207064C))); memset(v0, 0, (sizeof(UnkStruct_0207064C))); @@ -41,10 +42,10 @@ void * sub_0207064C (u32 param0, FieldSystem * fieldSystem, Pokemon * param2, u1 return v0; } -BOOL sub_02070680 (TaskManager * param0) +BOOL sub_02070680(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0207064C * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0207064C *v1 = TaskManager_Environment(param0); switch (v1->unk_04) { case 0: diff --git a/src/unk_0207070C.c b/src/unk_0207070C.c index bd960f424a..fe43b80463 100644 --- a/src/unk_0207070C.c +++ b/src/unk_0207070C.c @@ -1,45 +1,45 @@ +#include "unk_0207070C.h" + #include #include -#include "inlines.h" - #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_02061AB4_decl.h" - -#include "functypes/funcptr_0203B7C0.h" -#include "field/field_system.h" #include "struct_defs/struct_0203D8AC.h" #include "struct_defs/struct_020708E0.h" #include "struct_defs/struct_02070950.h" #include "struct_defs/struct_020709CC.h" #include "struct_defs/struct_020711C8.h" + +#include "field/field_system.h" +#include "functypes/funcptr_0203B7C0.h" #include "functypes/funcptr_02084808.h" +#include "overlay005/ov5_021DFB54.h" +#include "overlay005/ov5_021F101C.h" +#include "overlay006/ov6_02247100.h" +#include "field_menu.h" +#include "field_overworld_state.h" #include "heap.h" -#include "unk_02025E08.h" -#include "trainer_info.h" +#include "inlines.h" #include "journal.h" #include "map_header.h" -#include "field_overworld_state.h" -#include "field_menu.h" +#include "map_object.h" +#include "player_avatar.h" +#include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0203C954.h" #include "unk_0203D1B8.h" #include "unk_0203E880.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_02054D00.h" #include "unk_0205DAC8.h" -#include "player_avatar.h" #include "unk_0205F180.h" -#include "map_object.h" #include "unk_0206A8DC.h" #include "unk_0206B70C.h" -#include "unk_0207070C.h" #include "unk_020711C8.h" #include "unk_02071B10.h" -#include "overlay005/ov5_021DFB54.h" -#include "overlay005/ov5_021F101C.h" -#include "overlay006/ov6_02247100.h" +#include "vars_flags.h" typedef struct { UnkFuncPtr_0203B7C0 unk_00; @@ -48,66 +48,66 @@ typedef struct { typedef struct { u32 unk_00; - MapObject * unk_04; + MapObject *unk_04; UnkStruct_020709CC unk_08; } UnkStruct_0207086C; -static void sub_02070838(FieldSystem * fieldSystem, UnkStruct_02070950 * param1); -static int sub_02070950(const UnkStruct_02070950 * param0); -static void sub_020709CC(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static int sub_02070EEC(const UnkStruct_02070950 * param0); -static void sub_02070F54(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_02070F94(TaskManager * taskMan); -static int sub_02070A24(const UnkStruct_02070950 * param0); -static void sub_02070A80(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_02070AB4(TaskManager * taskMan); -static int sub_02070CF8(const UnkStruct_02070950 * param0); -static void sub_02070D30(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_02070D64(TaskManager * taskMan); -static int sub_02070DA0(const UnkStruct_02070950 * param0); -static void sub_02070DEC(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_02070E20(TaskManager * taskMan); -static int sub_02070E5C(const UnkStruct_02070950 * param0); -static void sub_02070E7C(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_02070EB0(TaskManager * taskMan); -static int sub_02070B98(const UnkStruct_02070950 * param0); -static void sub_02070BD0(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_02070C04(TaskManager * taskMan); -static int sub_02070C40(const UnkStruct_02070950 * param0); -static void sub_02070C88(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_02070CBC(TaskManager * taskMan); -static int sub_02070AF0(const UnkStruct_02070950 * param0); -static void sub_02070B28(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_02070B5C(TaskManager * taskMan); -static int sub_02070FCC(const UnkStruct_02070950 * param0); -static void sub_02071010(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_02071050(TaskManager * taskMan); -static int sub_020710A4(const UnkStruct_02070950 * param0); -static void sub_020710D4(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static int sub_02071130(const UnkStruct_02070950 * param0); -static void sub_02071150(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_0207118C(TaskManager * taskMan); -static int sub_020708AC(const UnkStruct_02070950 * param0); -static void sub_020708E0(UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1); -static BOOL sub_02070914(TaskManager * taskMan); +static void sub_02070838(FieldSystem *fieldSystem, UnkStruct_02070950 *param1); +static int sub_02070950(const UnkStruct_02070950 *param0); +static void sub_020709CC(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static int sub_02070EEC(const UnkStruct_02070950 *param0); +static void sub_02070F54(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_02070F94(TaskManager *taskMan); +static int sub_02070A24(const UnkStruct_02070950 *param0); +static void sub_02070A80(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_02070AB4(TaskManager *taskMan); +static int sub_02070CF8(const UnkStruct_02070950 *param0); +static void sub_02070D30(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_02070D64(TaskManager *taskMan); +static int sub_02070DA0(const UnkStruct_02070950 *param0); +static void sub_02070DEC(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_02070E20(TaskManager *taskMan); +static int sub_02070E5C(const UnkStruct_02070950 *param0); +static void sub_02070E7C(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_02070EB0(TaskManager *taskMan); +static int sub_02070B98(const UnkStruct_02070950 *param0); +static void sub_02070BD0(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_02070C04(TaskManager *taskMan); +static int sub_02070C40(const UnkStruct_02070950 *param0); +static void sub_02070C88(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_02070CBC(TaskManager *taskMan); +static int sub_02070AF0(const UnkStruct_02070950 *param0); +static void sub_02070B28(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_02070B5C(TaskManager *taskMan); +static int sub_02070FCC(const UnkStruct_02070950 *param0); +static void sub_02071010(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_02071050(TaskManager *taskMan); +static int sub_020710A4(const UnkStruct_02070950 *param0); +static void sub_020710D4(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static int sub_02071130(const UnkStruct_02070950 *param0); +static void sub_02071150(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_0207118C(TaskManager *taskMan); +static int sub_020708AC(const UnkStruct_02070950 *param0); +static void sub_020708E0(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1); +static BOOL sub_02070914(TaskManager *taskMan); static const UnkStruct_020F0368 Unk_020F0368[] = { - {sub_020708E0, sub_020708AC}, - {sub_020709CC, sub_02070950}, - {sub_02070A80, sub_02070A24}, - {sub_02070B28, sub_02070AF0}, - {sub_02070BD0, sub_02070B98}, - {sub_02070C88, sub_02070C40}, - {sub_02070D30, sub_02070CF8}, - {sub_02070DEC, sub_02070DA0}, - {sub_02070E7C, sub_02070E5C}, - {sub_02070F54, sub_02070EEC}, - {sub_02071010, sub_02070FCC}, - {sub_020710D4, sub_020710A4}, - {sub_02071150, sub_02071130} + { sub_020708E0, sub_020708AC }, + { sub_020709CC, sub_02070950 }, + { sub_02070A80, sub_02070A24 }, + { sub_02070B28, sub_02070AF0 }, + { sub_02070BD0, sub_02070B98 }, + { sub_02070C88, sub_02070C40 }, + { sub_02070D30, sub_02070CF8 }, + { sub_02070DEC, sub_02070DA0 }, + { sub_02070E7C, sub_02070E5C }, + { sub_02070F54, sub_02070EEC }, + { sub_02071010, sub_02070FCC }, + { sub_020710D4, sub_020710A4 }, + { sub_02071150, sub_02071130 } }; -static inline BOOL inline_020708AC (const UnkStruct_02070950 * param0, int param1) +static inline BOOL inline_020708AC(const UnkStruct_02070950 *param0, int param1) { if ((param0->unk_0C & (1 << param1)) != 0) { return 1; @@ -116,17 +116,17 @@ static inline BOOL inline_020708AC (const UnkStruct_02070950 * param0, int param } } -static inline BOOL inline_02070950 (const UnkStruct_02070950 * param0, int param1) +static inline BOOL inline_02070950(const UnkStruct_02070950 *param0, int param1) { return TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->fieldSystem->saveData), param1); } -static inline BOOL inline_02070A24 (const UnkStruct_02070950 * param0) +static inline BOOL inline_02070A24(const UnkStruct_02070950 *param0) { return sub_0206A984(SaveData_GetVarsFlags(param0->fieldSystem->saveData)); } -static inline BOOL inline_02070EEC (const UnkStruct_02070950 * param0) +static inline BOOL inline_02070EEC(const UnkStruct_02070950 *param0) { if ((sub_0206AE5C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)) == 1) || (sub_0206AE8C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)) == 1)) { return 1; @@ -135,7 +135,7 @@ static inline BOOL inline_02070EEC (const UnkStruct_02070950 * param0) return 0; } -static inline BOOL inline_020710A4 (const UnkStruct_02070950 * param0) +static inline BOOL inline_020710A4(const UnkStruct_02070950 *param0) { if (sub_0206AE8C(SaveData_GetVarsFlags(param0->fieldSystem->saveData)) == 1) { return 1; @@ -144,7 +144,7 @@ static inline BOOL inline_020710A4 (const UnkStruct_02070950 * param0) return 0; } -static inline BOOL inline_02070AF0 (const UnkStruct_02070950 * param0) +static inline BOOL inline_02070AF0(const UnkStruct_02070950 *param0) { if ((param0->fieldSystem->unk_70 == 3) || (param0->fieldSystem->unk_70 == 2)) { return 0; @@ -153,7 +153,7 @@ static inline BOOL inline_02070AF0 (const UnkStruct_02070950 * param0) return 1; } -u32 sub_0207070C (u16 param0, u16 param1) +u32 sub_0207070C(u16 param0, u16 param1) { if (param0 == 0) { return (u32)Unk_020F0368[param1].unk_00; @@ -162,9 +162,9 @@ u32 sub_0207070C (u16 param0, u16 param1) return (u32)Unk_020F0368[param1].unk_04; } -void sub_02070728 (FieldSystem * fieldSystem, UnkStruct_02070950 * param1) +void sub_02070728(FieldSystem *fieldSystem, UnkStruct_02070950 *param1) { - MapObject * mapObj; + MapObject *mapObj; int v1, v2; int v3; int v4; @@ -224,7 +224,7 @@ void sub_02070728 (FieldSystem * fieldSystem, UnkStruct_02070950 * param1) } } -static void sub_02070838 (FieldSystem * fieldSystem, UnkStruct_02070950 * param1) +static void sub_02070838(FieldSystem *fieldSystem, UnkStruct_02070950 *param1) { int v0; u32 v1, v2; @@ -238,9 +238,9 @@ static void sub_02070838 (FieldSystem * fieldSystem, UnkStruct_02070950 * param1 } } -static UnkStruct_0207086C * sub_0207086C (const UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static UnkStruct_0207086C *sub_0207086C(const UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - UnkStruct_0207086C * v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0207086C)); + UnkStruct_0207086C *v0 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0207086C)); v0->unk_00 = 0x19740205; v0->unk_04 = param1->unk_08; @@ -249,13 +249,13 @@ static UnkStruct_0207086C * sub_0207086C (const UnkStruct_020709CC * param0, con return v0; } -static void sub_02070890 (UnkStruct_0207086C * param0) +static void sub_02070890(UnkStruct_0207086C *param0) { GF_ASSERT(param0->unk_00 == 0x19740205); Heap_FreeToHeap(param0); } -static int sub_020708AC (const UnkStruct_02070950 * param0) +static int sub_020708AC(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -272,10 +272,10 @@ static int sub_020708AC (const UnkStruct_02070950 * param0) } } -static void sub_020708E0 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_020708E0(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldMenu * menu; - UnkStruct_0207086C * v1; + FieldMenu *menu; + UnkStruct_0207086C *v1; menu = TaskManager_Environment(param0->unk_00); v1 = sub_0207086C(param0, param1); @@ -287,10 +287,10 @@ static void sub_020708E0 (UnkStruct_020709CC * param0, const UnkStruct_02070950 menu->state = FIELD_MENU_STATE_10; } -static BOOL sub_02070914 (TaskManager * taskMan) +static BOOL sub_02070914(TaskManager *taskMan) { - UnkStruct_0207086C * v0 = TaskManager_Environment(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0207086C *v0 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); sub_0203E918(taskMan, 10008, v0->unk_04); sub_0203F21C(fieldSystem, v0->unk_08.unk_04, 0, 0, 0); @@ -299,7 +299,7 @@ static BOOL sub_02070914 (TaskManager * taskMan) return 0; } -static int sub_02070950 (const UnkStruct_02070950 * param0) +static int sub_02070950(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -324,15 +324,15 @@ static int sub_02070950 (const UnkStruct_02070950 * param0) return 0; } -static void sub_020709CC (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_020709CC(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(param0->unk_00); menu = TaskManager_Environment(param0->unk_00); - u32 * v2 = (u32 *)Heap_AllocFromHeap(11, 4); + u32 *v2 = (u32 *)Heap_AllocFromHeap(11, 4); *v2 = param0->unk_04; menu->unk_260 = (void *)v2; @@ -343,7 +343,7 @@ static void sub_020709CC (UnkStruct_020709CC * param0, const UnkStruct_02070950 sub_0203B674(menu, sub_0203C434); } -static int sub_02070A24 (const UnkStruct_02070950 * param0) +static int sub_02070A24(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -368,10 +368,10 @@ static int sub_02070A24 (const UnkStruct_02070950 * param0) return 0; } -static void sub_02070A80 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_02070A80(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldMenu * menu; - UnkStruct_0207086C * v1; + FieldMenu *menu; + UnkStruct_0207086C *v1; menu = TaskManager_Environment(param0->unk_00); v1 = sub_0207086C(param0, param1); @@ -383,10 +383,10 @@ static void sub_02070A80 (UnkStruct_020709CC * param0, const UnkStruct_02070950 menu->state = FIELD_MENU_STATE_10; } -static BOOL sub_02070AB4 (TaskManager * taskMan) +static BOOL sub_02070AB4(TaskManager *taskMan) { - UnkStruct_0207086C * v0 = TaskManager_Environment(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0207086C *v0 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); sub_0203E918(taskMan, 10012, NULL); sub_0203F21C(fieldSystem, v0->unk_08.unk_04, 0, 0, 0); @@ -395,7 +395,7 @@ static BOOL sub_02070AB4 (TaskManager * taskMan) return 0; } -static int sub_02070AF0 (const UnkStruct_02070950 * param0) +static int sub_02070AF0(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -412,10 +412,10 @@ static int sub_02070AF0 (const UnkStruct_02070950 * param0) } } -static void sub_02070B28 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_02070B28(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldMenu * menu; - UnkStruct_0207086C * v1; + FieldMenu *menu; + UnkStruct_0207086C *v1; menu = TaskManager_Environment(param0->unk_00); v1 = sub_0207086C(param0, param1); @@ -427,10 +427,10 @@ static void sub_02070B28 (UnkStruct_020709CC * param0, const UnkStruct_02070950 menu->state = FIELD_MENU_STATE_10; } -static BOOL sub_02070B5C (TaskManager * param0) +static BOOL sub_02070B5C(TaskManager *param0) { - UnkStruct_0207086C * v0 = TaskManager_Environment(param0); - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0207086C *v0 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); sub_0203E918(param0, 10010, v0->unk_04); sub_0203F21C(fieldSystem, v0->unk_08.unk_04, 0, 0, 0); @@ -439,7 +439,7 @@ static BOOL sub_02070B5C (TaskManager * param0) return 0; } -static int sub_02070B98 (const UnkStruct_02070950 * param0) +static int sub_02070B98(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -456,10 +456,10 @@ static int sub_02070B98 (const UnkStruct_02070950 * param0) } } -static void sub_02070BD0 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_02070BD0(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldMenu * menu; - UnkStruct_0207086C * v1; + FieldMenu *menu; + UnkStruct_0207086C *v1; menu = TaskManager_Environment(param0->unk_00); v1 = sub_0207086C(param0, param1); @@ -471,10 +471,10 @@ static void sub_02070BD0 (UnkStruct_020709CC * param0, const UnkStruct_02070950 menu->state = FIELD_MENU_STATE_10; } -static BOOL sub_02070C04 (TaskManager * taskMan) +static BOOL sub_02070C04(TaskManager *taskMan) { - UnkStruct_0207086C * v0 = TaskManager_Environment(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0207086C *v0 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); sub_0203E918(taskMan, 10014, NULL); sub_0203F21C(fieldSystem, v0->unk_08.unk_04, 0, 0, 0); @@ -483,7 +483,7 @@ static BOOL sub_02070C04 (TaskManager * taskMan) return 0; } -static int sub_02070C40 (const UnkStruct_02070950 * param0) +static int sub_02070C40(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -504,10 +504,10 @@ static int sub_02070C40 (const UnkStruct_02070950 * param0) } } -static void sub_02070C88 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_02070C88(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldMenu * menu; - UnkStruct_0207086C * v1; + FieldMenu *menu; + UnkStruct_0207086C *v1; menu = TaskManager_Environment(param0->unk_00); v1 = sub_0207086C(param0, param1); @@ -519,10 +519,10 @@ static void sub_02070C88 (UnkStruct_020709CC * param0, const UnkStruct_02070950 menu->state = FIELD_MENU_STATE_10; } -static BOOL sub_02070CBC (TaskManager * taskMan) +static BOOL sub_02070CBC(TaskManager *taskMan) { - UnkStruct_0207086C * v0 = TaskManager_Environment(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0207086C *v0 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); sub_0203E918(taskMan, 10009, v0->unk_04); sub_0203F21C(fieldSystem, v0->unk_08.unk_04, 0, 0, 0); @@ -531,7 +531,7 @@ static BOOL sub_02070CBC (TaskManager * taskMan) return 0; } -static int sub_02070CF8 (const UnkStruct_02070950 * param0) +static int sub_02070CF8(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -548,10 +548,10 @@ static int sub_02070CF8 (const UnkStruct_02070950 * param0) } } -static void sub_02070D30 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_02070D30(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldMenu * menu; - UnkStruct_0207086C * v1; + FieldMenu *menu; + UnkStruct_0207086C *v1; menu = TaskManager_Environment(param0->unk_00); v1 = sub_0207086C(param0, param1); @@ -563,10 +563,10 @@ static void sub_02070D30 (UnkStruct_020709CC * param0, const UnkStruct_02070950 menu->state = FIELD_MENU_STATE_10; } -static BOOL sub_02070D64 (TaskManager * param0) +static BOOL sub_02070D64(TaskManager *param0) { - UnkStruct_0207086C * v0 = TaskManager_Environment(param0); - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0207086C *v0 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); sub_0203E918(param0, 10013, NULL); sub_0203F21C(fieldSystem, v0->unk_08.unk_04, 0, 0, 0); @@ -575,7 +575,7 @@ static BOOL sub_02070D64 (TaskManager * param0) return 0; } -static int sub_02070DA0 (const UnkStruct_02070950 * param0) +static int sub_02070DA0(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -596,10 +596,10 @@ static int sub_02070DA0 (const UnkStruct_02070950 * param0) return 0; } -static void sub_02070DEC (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_02070DEC(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldMenu * menu; - UnkStruct_0207086C * v1; + FieldMenu *menu; + UnkStruct_0207086C *v1; menu = TaskManager_Environment(param0->unk_00); v1 = sub_0207086C(param0, param1); @@ -611,10 +611,10 @@ static void sub_02070DEC (UnkStruct_020709CC * param0, const UnkStruct_02070950 menu->state = FIELD_MENU_STATE_10; } -static BOOL sub_02070E20 (TaskManager * taskMan) +static BOOL sub_02070E20(TaskManager *taskMan) { - UnkStruct_0207086C * v0 = TaskManager_Environment(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0207086C *v0 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); sub_0203E918(taskMan, 10011, NULL); sub_0203F21C(fieldSystem, v0->unk_08.unk_04, 0, 0, 0); @@ -623,7 +623,7 @@ static BOOL sub_02070E20 (TaskManager * taskMan) return 0; } -static int sub_02070E5C (const UnkStruct_02070950 * param0) +static int sub_02070E5C(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -636,10 +636,10 @@ static int sub_02070E5C (const UnkStruct_02070950 * param0) } } -static void sub_02070E7C (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_02070E7C(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldMenu * menu; - UnkStruct_0207086C * v1; + FieldMenu *menu; + UnkStruct_0207086C *v1; menu = TaskManager_Environment(param0->unk_00); v1 = sub_0207086C(param0, param1); @@ -651,10 +651,10 @@ static void sub_02070E7C (UnkStruct_020709CC * param0, const UnkStruct_02070950 menu->state = FIELD_MENU_STATE_10; } -static BOOL sub_02070EB0 (TaskManager * taskMan) +static BOOL sub_02070EB0(TaskManager *taskMan) { - UnkStruct_0207086C * v0 = TaskManager_Environment(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0207086C *v0 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); sub_0203E918(taskMan, 10015, NULL); sub_0203F21C(fieldSystem, v0->unk_08.unk_04, 0, 0, 0); @@ -663,7 +663,7 @@ static BOOL sub_02070EB0 (TaskManager * taskMan) return 0; } -static int sub_02070EEC (const UnkStruct_02070950 * param0) +static int sub_02070EEC(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -684,17 +684,17 @@ static int sub_02070EEC (const UnkStruct_02070950 * param0) return 0; } -static void sub_02070F54 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_02070F54(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldSystem * fieldSystem; - FieldMenu * menu; + FieldSystem *fieldSystem; + FieldMenu *menu; fieldSystem = TaskManager_FieldSystem(param0->unk_00); menu = TaskManager_Environment(param0->unk_00); sub_020509D4(fieldSystem); - UnkStruct_020711C8 * v2; + UnkStruct_020711C8 *v2; v2 = sub_020711C8(11, param0->unk_04, fieldSystem->saveData); @@ -703,11 +703,11 @@ static void sub_02070F54 (UnkStruct_020709CC * param0, const UnkStruct_02070950 menu->state = FIELD_MENU_STATE_10; } -static BOOL sub_02070F94 (TaskManager * param0) +static BOOL sub_02070F94(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_020711C8 * v1 = TaskManager_Environment(param0); - void * v2 = ov6_02247530(fieldSystem, v1->unk_00, 4); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_020711C8 *v1 = TaskManager_Environment(param0); + void *v2 = ov6_02247530(fieldSystem, v1->unk_00, 4); Heap_FreeToHeap(v1); FieldTask_Change(param0, ov6_02247554, v2); @@ -715,7 +715,7 @@ static BOOL sub_02070F94 (TaskManager * param0) return 0; } -static int sub_02070FCC (const UnkStruct_02070950 * param0) +static int sub_02070FCC(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -732,10 +732,10 @@ static int sub_02070FCC (const UnkStruct_02070950 * param0) return 0; } -static void sub_02071010 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_02071010(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; + FieldSystem *fieldSystem; + FieldMenu *v1; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -743,7 +743,7 @@ static void sub_02071010 (UnkStruct_020709CC * param0, const UnkStruct_02070950 sub_020509D4(fieldSystem); { - UnkStruct_020711C8 * v2; + UnkStruct_020711C8 *v2; v2 = sub_020711C8(11, param0->unk_04, fieldSystem->saveData); @@ -753,14 +753,14 @@ static void sub_02071010 (UnkStruct_020709CC * param0, const UnkStruct_02070950 } } -static BOOL sub_02071050 (TaskManager * param0) +static BOOL sub_02071050(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_020711C8 * v1 = TaskManager_Environment(param0); - void * v2 = ov6_02247488(fieldSystem, v1->unk_00, 11); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_020711C8 *v1 = TaskManager_Environment(param0); + void *v2 = ov6_02247488(fieldSystem, v1->unk_00, 11); { - void * v3 = sub_0202BE00((29 - 19), fieldSystem->location->mapId, 4); + void *v3 = sub_0202BE00((29 - 19), fieldSystem->location->mapId, 4); sub_0202B758(fieldSystem->unk_9C, v3, 1); } @@ -770,7 +770,7 @@ static BOOL sub_02071050 (TaskManager * param0) return 0; } -static int sub_020710A4 (const UnkStruct_02070950 * param0) +static int sub_020710A4(const UnkStruct_02070950 *param0) { if (inline_02070AF0(param0) == 0) { return 1; @@ -783,13 +783,13 @@ static int sub_020710A4 (const UnkStruct_02070950 * param0) return 0; } -static void sub_020710D4 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_020710D4(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldSystem * fieldSystem; - FieldMenu * v1; - UnkStruct_020711C8 * v2; + FieldSystem *fieldSystem; + FieldMenu *v1; + UnkStruct_020711C8 *v2; int v3; - void * v4; + void *v4; fieldSystem = TaskManager_FieldSystem(param0->unk_00); v1 = TaskManager_Environment(param0->unk_00); @@ -805,7 +805,7 @@ static void sub_020710D4 (UnkStruct_020709CC * param0, const UnkStruct_02070950 sub_0202B758(fieldSystem->unk_9C, v4, 1); } -static int sub_02071130 (const UnkStruct_02070950 * param0) +static int sub_02071130(const UnkStruct_02070950 *param0) { if ((inline_02070AF0(param0) == 0) || (sub_02071CB4(param0->fieldSystem, 9) == 1)) { return 1; @@ -814,11 +814,11 @@ static int sub_02071130 (const UnkStruct_02070950 * param0) return 0; } -static void sub_02071150 (UnkStruct_020709CC * param0, const UnkStruct_02070950 * param1) +static void sub_02071150(UnkStruct_020709CC *param0, const UnkStruct_02070950 *param1) { - FieldSystem * fieldSystem; - FieldMenu * menu; - UnkStruct_0207086C * v2; + FieldSystem *fieldSystem; + FieldMenu *menu; + UnkStruct_0207086C *v2; fieldSystem = TaskManager_FieldSystem(param0->unk_00); menu = TaskManager_Environment(param0->unk_00); @@ -831,10 +831,10 @@ static void sub_02071150 (UnkStruct_020709CC * param0, const UnkStruct_02070950 menu->state = FIELD_MENU_STATE_10; } -static BOOL sub_0207118C (TaskManager * taskMan) +static BOOL sub_0207118C(TaskManager *taskMan) { - UnkStruct_0207086C * v0 = TaskManager_Environment(taskMan); - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_0207086C *v0 = TaskManager_Environment(taskMan); + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); sub_0203E918(taskMan, 8900, NULL); sub_0203F21C(fieldSystem, v0->unk_08.unk_04, 0, 0, 0); diff --git a/src/unk_020711C8.c b/src/unk_020711C8.c index d03de8a059..e27c4f0b46 100644 --- a/src/unk_020711C8.c +++ b/src/unk_020711C8.c @@ -1,17 +1,17 @@ +#include "unk_020711C8.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_020711C8.h" #include "heap.h" -#include "unk_020711C8.h" #include "party.h" +#include "savedata.h" -UnkStruct_020711C8 * sub_020711C8 (const int param0, const u8 param1, SaveData * param2) +UnkStruct_020711C8 *sub_020711C8(const int param0, const u8 param1, SaveData *param2) { - UnkStruct_020711C8 * v0; + UnkStruct_020711C8 *v0; v0 = Heap_AllocFromHeapAtEnd(param0, sizeof(UnkStruct_020711C8)); v0->unk_00 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param2), param1); diff --git a/src/unk_020711EC.c b/src/unk_020711EC.c index 2362603f84..759388353f 100644 --- a/src/unk_020711EC.c +++ b/src/unk_020711EC.c @@ -1,9 +1,10 @@ +#include "unk_020711EC.h" + #include #include -#include "sys_task_manager.h" - #include "struct_defs/struct_02071330.h" + #include "functypes/funcptr_02071330.h" #include "functypes/funcptr_02071330_1.h" #include "functypes/funcptr_02071330_2.h" @@ -12,17 +13,17 @@ #include "functypes/funcptr_02071330_5.h" #include "overlay101/struct_ov101_021D86B0.h" -#include "sys_task.h" #include "heap.h" -#include "unk_020711EC.h" +#include "sys_task.h" +#include "sys_task_manager.h" typedef struct UnkStruct_ov101_021D5D90_t { u32 unk_00; int unk_04; int unk_08; - const void * unk_0C; - SysTask * unk_10; - const UnkStruct_020711EC * unk_14; + const void *unk_0C; + SysTask *unk_10; + const UnkStruct_020711EC *unk_14; int unk_18; int unk_1C; int unk_20; @@ -40,30 +41,30 @@ typedef struct UnkStruct_020711EC_t { int unk_00; int unk_04; int unk_08; - UnkStruct_ov101_021D5D90 * unk_0C; + UnkStruct_ov101_021D5D90 *unk_0C; } UnkStruct_020711EC; -static SysTask * sub_02071400(UnkStruct_ov101_021D5D90 * param0, int param1); -static void sub_02071420(SysTask * param0, void * param1); -static UnkStruct_020711EC * sub_0207142C(int param0); -static void sub_02071450(UnkStruct_020711EC * param0); -static UnkStruct_ov101_021D5D90 * sub_0207145C(int param0, int param1); -static void sub_02071480(UnkStruct_020711EC * param0); -static void sub_02071490(UnkStruct_ov101_021D5D90 * param0); -static int sub_020714E8(const UnkStruct_020711EC * param0); -static UnkStruct_ov101_021D5D90 * sub_020714EC(const UnkStruct_020711EC * param0); -static void sub_020714FC(UnkStruct_ov101_021D5D90 * param0); -static void sub_02071508(UnkStruct_ov101_021D5D90 * param0, u32 param1); -static u32 sub_02071510(UnkStruct_ov101_021D5D90 * param0, u32 param1); -static void sub_020715B0(UnkStruct_ov101_021D5D90 * param0, int param1); -static void sub_020715B8(UnkStruct_ov101_021D5D90 * param0, const void * param1); -static void sub_020715C8(UnkStruct_ov101_021D5D90 * param0, SysTask * param1); -static SysTask * sub_020715CC(UnkStruct_ov101_021D5D90 * param0); -static void sub_020715D0(UnkStruct_ov101_021D5D90 * param0, const UnkStruct_020711EC * param1); - -UnkStruct_020711EC * sub_020711EC (int param0, int param1) -{ - UnkStruct_020711EC * v0; +static SysTask *sub_02071400(UnkStruct_ov101_021D5D90 *param0, int param1); +static void sub_02071420(SysTask *param0, void *param1); +static UnkStruct_020711EC *sub_0207142C(int param0); +static void sub_02071450(UnkStruct_020711EC *param0); +static UnkStruct_ov101_021D5D90 *sub_0207145C(int param0, int param1); +static void sub_02071480(UnkStruct_020711EC *param0); +static void sub_02071490(UnkStruct_ov101_021D5D90 *param0); +static int sub_020714E8(const UnkStruct_020711EC *param0); +static UnkStruct_ov101_021D5D90 *sub_020714EC(const UnkStruct_020711EC *param0); +static void sub_020714FC(UnkStruct_ov101_021D5D90 *param0); +static void sub_02071508(UnkStruct_ov101_021D5D90 *param0, u32 param1); +static u32 sub_02071510(UnkStruct_ov101_021D5D90 *param0, u32 param1); +static void sub_020715B0(UnkStruct_ov101_021D5D90 *param0, int param1); +static void sub_020715B8(UnkStruct_ov101_021D5D90 *param0, const void *param1); +static void sub_020715C8(UnkStruct_ov101_021D5D90 *param0, SysTask *param1); +static SysTask *sub_020715CC(UnkStruct_ov101_021D5D90 *param0); +static void sub_020715D0(UnkStruct_ov101_021D5D90 *param0, const UnkStruct_020711EC *param1); + +UnkStruct_020711EC *sub_020711EC(int param0, int param1) +{ + UnkStruct_020711EC *v0; v0 = sub_0207142C(param0); @@ -74,23 +75,23 @@ UnkStruct_020711EC * sub_020711EC (int param0, int param1) return v0; } -void sub_0207120C (UnkStruct_020711EC * param0) +void sub_0207120C(UnkStruct_020711EC *param0) { sub_02071480(param0); sub_02071450(param0); } -void sub_0207121C (UnkStruct_020711EC * param0) +void sub_0207121C(UnkStruct_020711EC *param0) { sub_020713A4(param0); sub_0207120C(param0); } -UnkStruct_ov101_021D5D90 * sub_0207122C (UnkStruct_020711EC * param0, const UnkStruct_02071330 * param1, const VecFx32 * param2, int param3, const void * param4, int param5) +UnkStruct_ov101_021D5D90 *sub_0207122C(UnkStruct_020711EC *param0, const UnkStruct_02071330 *param1, const VecFx32 *param2, int param3, const void *param4, int param5) { int v0, v1; - UnkStruct_ov101_021D5D90 * v2; - SysTask * v3; + UnkStruct_ov101_021D5D90 *v2; + SysTask *v3; v0 = 0; v1 = sub_020714E8(param0); @@ -117,7 +118,8 @@ UnkStruct_ov101_021D5D90 * sub_0207122C (UnkStruct_020711EC * param0, const UnkS if (param2 != NULL) { sub_020715D4(v2, param2); } else { - VecFx32 v4 = {0, 0, 0}; sub_020715D4(v2, &v4); + VecFx32 v4 = { 0, 0, 0 }; + sub_020715D4(v2, &v4); } sub_0207159C(v2, param1->unk_00); @@ -149,7 +151,7 @@ UnkStruct_ov101_021D5D90 * sub_0207122C (UnkStruct_020711EC * param0, const UnkS return v2; } -UnkStruct_ov101_021D5D90 * sub_02071330 (UnkStruct_020711EC * param0, const UnkStruct_ov101_021D86B0 * param1, const VecFx32 * param2, int param3, const void * param4, int param5) +UnkStruct_ov101_021D5D90 *sub_02071330(UnkStruct_020711EC *param0, const UnkStruct_ov101_021D86B0 *param1, const VecFx32 *param2, int param3, const void *param4, int param5) { UnkStruct_02071330 v0; @@ -160,7 +162,7 @@ UnkStruct_ov101_021D5D90 * sub_02071330 (UnkStruct_020711EC * param0, const UnkS return sub_0207122C(param0, &v0, param2, param3, param4, param5); } -void sub_0207136C (UnkStruct_ov101_021D5D90 * param0) +void sub_0207136C(UnkStruct_ov101_021D5D90 *param0) { GF_ASSERT(param0 != NULL); @@ -171,12 +173,12 @@ void sub_0207136C (UnkStruct_ov101_021D5D90 * param0) sub_02071574(param0); { - UnkStruct_020711EC * v0 = (UnkStruct_020711EC *)param0->unk_14; + UnkStruct_020711EC *v0 = (UnkStruct_020711EC *)param0->unk_14; v0->unk_04--; } { - SysTask * v1 = sub_020715CC(param0); + SysTask *v1 = sub_020715CC(param0); if (v1 != NULL) { SysTask_Done(v1); @@ -186,10 +188,10 @@ void sub_0207136C (UnkStruct_ov101_021D5D90 * param0) sub_02071490(param0); } -void sub_020713A4 (UnkStruct_020711EC * param0) +void sub_020713A4(UnkStruct_020711EC *param0) { int v0; - UnkStruct_ov101_021D5D90 * v1; + UnkStruct_ov101_021D5D90 *v1; v0 = sub_020714E8(param0); v1 = sub_020714EC(param0); @@ -199,15 +201,16 @@ void sub_020713A4 (UnkStruct_020711EC * param0) sub_0207136C(v1); } - v1++; v0--; + v1++; + v0--; } while (v0); } -void sub_020713D0 (UnkStruct_020711EC * param0) +void sub_020713D0(UnkStruct_020711EC *param0) { int v0; u32 v1; - UnkStruct_ov101_021D5D90 * v2; + UnkStruct_ov101_021D5D90 *v2; v0 = sub_020714E8(param0); v2 = sub_020714EC(param0); @@ -224,9 +227,9 @@ void sub_020713D0 (UnkStruct_020711EC * param0) } while (v0); } -static SysTask * sub_02071400 (UnkStruct_ov101_021D5D90 * param0, int param1) +static SysTask *sub_02071400(UnkStruct_ov101_021D5D90 *param0, int param1) { - SysTask * v0; + SysTask *v0; v0 = SysTask_Start(sub_02071420, param0, param1); GF_ASSERT(v0 != NULL); @@ -234,17 +237,17 @@ static SysTask * sub_02071400 (UnkStruct_ov101_021D5D90 * param0, int param1) return v0; } -static void sub_02071420 (SysTask * param0, void * param1) +static void sub_02071420(SysTask *param0, void *param1) { - UnkStruct_ov101_021D5D90 * v0; + UnkStruct_ov101_021D5D90 *v0; v0 = param1; sub_0207153C(v0); } -static UnkStruct_020711EC * sub_0207142C (int param0) +static UnkStruct_020711EC *sub_0207142C(int param0) { - UnkStruct_020711EC * v0; + UnkStruct_020711EC *v0; v0 = Heap_AllocFromHeap(param0, (sizeof(UnkStruct_020711EC))); GF_ASSERT(v0 != NULL); @@ -253,14 +256,14 @@ static UnkStruct_020711EC * sub_0207142C (int param0) return v0; } -static void sub_02071450 (UnkStruct_020711EC * param0) +static void sub_02071450(UnkStruct_020711EC *param0) { Heap_FreeToHeapExplicit(param0->unk_08, param0); } -static UnkStruct_ov101_021D5D90 * sub_0207145C (int param0, int param1) +static UnkStruct_ov101_021D5D90 *sub_0207145C(int param0, int param1) { - UnkStruct_ov101_021D5D90 * v0; + UnkStruct_ov101_021D5D90 *v0; param1 *= (sizeof(UnkStruct_ov101_021D5D90)); v0 = Heap_AllocFromHeap(param0, param1); @@ -271,12 +274,12 @@ static UnkStruct_ov101_021D5D90 * sub_0207145C (int param0, int param1) return v0; } -static void sub_02071480 (UnkStruct_020711EC * param0) +static void sub_02071480(UnkStruct_020711EC *param0) { Heap_FreeToHeapExplicit(param0->unk_08, param0->unk_0C); } -static void sub_02071490 (UnkStruct_ov101_021D5D90 * param0) +static void sub_02071490(UnkStruct_ov101_021D5D90 *param0) { memset(param0, 0, (sizeof(UnkStruct_ov101_021D5D90))); @@ -288,188 +291,188 @@ static void sub_02071490 (UnkStruct_ov101_021D5D90 * param0) sub_02071590(param0, sub_02071608); } -static int sub_020714E8 (const UnkStruct_020711EC * param0) +static int sub_020714E8(const UnkStruct_020711EC *param0) { return param0->unk_00; } -static UnkStruct_ov101_021D5D90 * sub_020714EC (const UnkStruct_020711EC * param0) +static UnkStruct_ov101_021D5D90 *sub_020714EC(const UnkStruct_020711EC *param0) { return param0->unk_0C; } -int sub_020714F0 (const UnkStruct_ov101_021D5D90 * param0) +int sub_020714F0(const UnkStruct_ov101_021D5D90 *param0) { - if ((param0->unk_00 & (1 << 0))) { + if (param0->unk_00 & (1 << 0)) { return 1; } return 0; } -static void sub_020714FC (UnkStruct_ov101_021D5D90 * param0) +static void sub_020714FC(UnkStruct_ov101_021D5D90 *param0) { param0->unk_00 |= (1 << 0); } -static void sub_02071508 (UnkStruct_ov101_021D5D90 * param0, u32 param1) +static void sub_02071508(UnkStruct_ov101_021D5D90 *param0, u32 param1) { param0->unk_00 |= param1; } -static u32 sub_02071510 (UnkStruct_ov101_021D5D90 * param0, u32 param1) +static u32 sub_02071510(UnkStruct_ov101_021D5D90 *param0, u32 param1) { return param0->unk_00 & param1; } -void sub_02071518 (UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330 param1) +void sub_02071518(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330 param1) { param0->unk_D0 = param1; } -int sub_02071520 (UnkStruct_ov101_021D5D90 * param0) +int sub_02071520(UnkStruct_ov101_021D5D90 *param0) { - void * v0 = sub_02071598(param0); + void *v0 = sub_02071598(param0); return param0->unk_D0(param0, v0); } -void sub_02071534 (UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330_2 param1) +void sub_02071534(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330_2 param1) { param0->unk_D4 = param1; } -void sub_0207153C (UnkStruct_ov101_021D5D90 * param0) +void sub_0207153C(UnkStruct_ov101_021D5D90 *param0) { - void * v0 = sub_02071598(param0); + void *v0 = sub_02071598(param0); param0->unk_D4(param0, v0); } -void sub_02071550 (UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330_3 param1) +void sub_02071550(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330_3 param1) { param0->unk_D8 = param1; } -void sub_02071558 (UnkStruct_ov101_021D5D90 * param0) +void sub_02071558(UnkStruct_ov101_021D5D90 *param0) { - void * v0 = sub_02071598(param0); + void *v0 = sub_02071598(param0); param0->unk_D8(param0, v0); } -void sub_0207156C (UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330_1 param1) +void sub_0207156C(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330_1 param1) { param0->unk_DC = param1; } -void sub_02071574 (UnkStruct_ov101_021D5D90 * param0) +void sub_02071574(UnkStruct_ov101_021D5D90 *param0) { - void * v0 = sub_02071598(param0); + void *v0 = sub_02071598(param0); param0->unk_DC(param0, v0); } -void sub_02071588 (UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330_4 param1) +void sub_02071588(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330_4 param1) { param0->unk_E0 = param1; } -void sub_02071590 (UnkStruct_ov101_021D5D90 * param0, UnkFuncPtr_02071330_5 param1) +void sub_02071590(UnkStruct_ov101_021D5D90 *param0, UnkFuncPtr_02071330_5 param1) { param0->unk_E4 = param1; } -void * sub_02071598 (UnkStruct_ov101_021D5D90 * param0) +void *sub_02071598(UnkStruct_ov101_021D5D90 *param0) { return param0->unk_30; } -void sub_0207159C (UnkStruct_ov101_021D5D90 * param0, int param1) +void sub_0207159C(UnkStruct_ov101_021D5D90 *param0, int param1) { - void * v0; + void *v0; v0 = sub_02071598(param0); memset(v0, 0, param1); } -static void sub_020715B0 (UnkStruct_ov101_021D5D90 * param0, int param1) +static void sub_020715B0(UnkStruct_ov101_021D5D90 *param0, int param1) { param0->unk_04 = param1; } -int sub_020715B4 (const UnkStruct_ov101_021D5D90 * param0) +int sub_020715B4(const UnkStruct_ov101_021D5D90 *param0) { return param0->unk_04; } -static void sub_020715B8 (UnkStruct_ov101_021D5D90 * param0, const void * param1) +static void sub_020715B8(UnkStruct_ov101_021D5D90 *param0, const void *param1) { param0->unk_0C = param1; } -const void * sub_020715BC (const UnkStruct_ov101_021D5D90 * param0) +const void *sub_020715BC(const UnkStruct_ov101_021D5D90 *param0) { return param0->unk_0C; } -void sub_020715C0 (UnkStruct_ov101_021D5D90 * param0, int param1) +void sub_020715C0(UnkStruct_ov101_021D5D90 *param0, int param1) { param0->unk_08 = param1; } -int sub_020715C4 (const UnkStruct_ov101_021D5D90 * param0) +int sub_020715C4(const UnkStruct_ov101_021D5D90 *param0) { return param0->unk_08; } -static void sub_020715C8 (UnkStruct_ov101_021D5D90 * param0, SysTask * param1) +static void sub_020715C8(UnkStruct_ov101_021D5D90 *param0, SysTask *param1) { param0->unk_10 = param1; } -static SysTask * sub_020715CC (UnkStruct_ov101_021D5D90 * param0) +static SysTask *sub_020715CC(UnkStruct_ov101_021D5D90 *param0) { return param0->unk_10; } -static void sub_020715D0 (UnkStruct_ov101_021D5D90 * param0, const UnkStruct_020711EC * param1) +static void sub_020715D0(UnkStruct_ov101_021D5D90 *param0, const UnkStruct_020711EC *param1) { param0->unk_14 = param1; } -void sub_020715D4 (UnkStruct_ov101_021D5D90 * param0, const VecFx32 * param1) +void sub_020715D4(UnkStruct_ov101_021D5D90 *param0, const VecFx32 *param1) { param0->unk_24 = *param1; } -void sub_020715E4 (UnkStruct_ov101_021D5D90 * param0, VecFx32 * param1) +void sub_020715E4(UnkStruct_ov101_021D5D90 *param0, VecFx32 *param1) { *param1 = param0->unk_24; } -int sub_020715F4 (UnkStruct_ov101_021D5D90 * param0, void * param1) +int sub_020715F4(UnkStruct_ov101_021D5D90 *param0, void *param1) { return 1; } -void sub_020715F8 (UnkStruct_ov101_021D5D90 * param0, void * param1) +void sub_020715F8(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -void sub_020715FC (UnkStruct_ov101_021D5D90 * param0, void * param1) +void sub_020715FC(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -void sub_02071600 (UnkStruct_ov101_021D5D90 * param0, void * param1) +void sub_02071600(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -void sub_02071604 (UnkStruct_ov101_021D5D90 * param0, void * param1) +void sub_02071604(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } -void sub_02071608 (UnkStruct_ov101_021D5D90 * param0, void * param1) +void sub_02071608(UnkStruct_ov101_021D5D90 *param0, void *param1) { return; } diff --git a/src/unk_0207160C.c b/src/unk_0207160C.c index a37e5ce65a..656fa6eb62 100644 --- a/src/unk_0207160C.c +++ b/src/unk_0207160C.c @@ -1,25 +1,25 @@ -#include +#include "unk_0207160C.h" +#include #include #include "struct_decls/struct_02027860_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "overlay005/struct_ov5_021E1890_decl.h" #include "field/field_system.h" #include "field/field_system_sub2_t.h" +#include "overlay005/ov5_021E15F4.h" +#include "overlay005/ov5_021EF250.h" +#include "overlay005/struct_ov5_021E1890_decl.h" -#include "unk_02005474.h" +#include "field_system.h" #include "heap.h" +#include "player_avatar.h" #include "savedata_misc.h" +#include "unk_02005474.h" #include "unk_02027F50.h" -#include "field_system.h" #include "unk_020508D4.h" #include "unk_02054D00.h" -#include "player_avatar.h" -#include "unk_0207160C.h" -#include "overlay005/ov5_021E15F4.h" -#include "overlay005/ov5_021EF250.h" typedef struct { fx32 unk_00[2]; @@ -43,84 +43,84 @@ typedef struct { int unk_0C; } UnkStruct_020718D8; -static BOOL sub_020718D8(TaskManager * taskMan); -static BOOL sub_020719D8(TaskManager * taskMan); +static BOOL sub_020718D8(TaskManager *taskMan); +static BOOL sub_020719D8(TaskManager *taskMan); static void sub_02071ACC(const int param0); static void sub_02071AEC(const int param0); static const UnkStruct_020F03F4 Unk_020F03F4[9] = { { - {(FX32_ONE * 16 * 1), (FX32_ONE * 16 * 9)}, + { (FX32_ONE * 16 * 1), (FX32_ONE * 16 * 9) }, 0xA, 0x17, 0x0, - 0x0 + 0x0, }, { - {(FX32_ONE * 16 * 1), (FX32_ONE * 16 * 9)}, + { (FX32_ONE * 16 * 1), (FX32_ONE * 16 * 9) }, 0x12, 0x2C, 0x0, - 0x1 + 0x1, }, { - {(FX32_ONE * 16 * 1), (FX32_ONE * 16 * 9)}, + { (FX32_ONE * 16 * 1), (FX32_ONE * 16 * 9) }, 0x8, 0xB, 0x0, - 0x0 + 0x0, }, { - {0x0, (FX32_ONE * 16 * 10)}, + { 0x0, (FX32_ONE * 16 * 10) }, 0x3, 0xB, 0x1, - 0x0 + 0x0, }, { - {0x0, (FX32_ONE * 16 * 5)}, + { 0x0, (FX32_ONE * 16 * 5) }, 0x3, 0xB, 0x1, - 0x0 + 0x0, }, { - {0x0, (FX32_ONE * 16 * 5)}, + { 0x0, (FX32_ONE * 16 * 5) }, 0x3, 0xB, 0x1, - 0x0 + 0x0, }, { - {0x0, (FX32_ONE * 16 * 5)}, + { 0x0, (FX32_ONE * 16 * 5) }, 0x3, 0xB, 0x1, - 0x0 + 0x0, }, { - {0x0, (FX32_ONE * 16 * 5)}, + { 0x0, (FX32_ONE * 16 * 5) }, 0x3, 0x13, 0x1, - 0x0 + 0x0, }, { - {0x0, (FX32_ONE * 16 * 15)}, + { 0x0, (FX32_ONE * 16 * 15) }, 0x7, 0x8, 0x1, - 0x0 - } + 0x0, + }, }; -void sub_0207160C (FieldSystem * fieldSystem) +void sub_0207160C(FieldSystem *fieldSystem) { BOOL v0; - UnkStruct_ov5_021E1890 * v1; - UnkStruct_02027860 * v2; - UnkStruct_020716D4 * v3; - const UnkStruct_020F03F4 * v4; + UnkStruct_ov5_021E1890 *v1; + UnkStruct_02027860 *v2; + UnkStruct_020716D4 *v3; + const UnkStruct_020F03F4 *v4; fx32 v5; v2 = sub_02027860(FieldSystem_SaveData(fieldSystem)); @@ -139,7 +139,7 @@ void sub_0207160C (FieldSystem * fieldSystem) ov5_021E19CC(fieldSystem->unk_A4, fieldSystem->unk_30, 258, &v6, NULL, fieldSystem->unk_50); v1 = ov5_021E18CC(fieldSystem->unk_A4, 258); } else { - const int v7[2] = {258, 502}; + const int v7[2] = { 258, 502 }; v0 = sub_02055324(fieldSystem, v7, 2, &v1, NULL); GF_ASSERT(v0); @@ -157,10 +157,10 @@ void sub_0207160C (FieldSystem * fieldSystem) ov5_021EF2CC(0, v4->unk_08, v4->unk_0C, 3, 2, v5, fieldSystem->unk_A0); } -void sub_020716D4 (FieldSystem * fieldSystem) +void sub_020716D4(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_020716D4 * v1; + UnkStruct_02027860 *v0; + UnkStruct_020716D4 *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); sub_02027F5C(v0, 7); @@ -269,10 +269,10 @@ void sub_020716D4 (FieldSystem * fieldSystem) } } -u8 sub_02071818 (FieldSystem * fieldSystem) +u8 sub_02071818(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_020716D4 * v1; + UnkStruct_02027860 *v0; + UnkStruct_020716D4 *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = (UnkStruct_020716D4 *)sub_02027F6C(v0, 7); @@ -284,11 +284,11 @@ u8 sub_02071818 (FieldSystem * fieldSystem) } } -void sub_0207183C (FieldSystem * fieldSystem) +void sub_0207183C(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_020716D4 * v1; - UnkStruct_020718D8 * v2; + UnkStruct_02027860 *v0; + UnkStruct_020716D4 *v1; + UnkStruct_020718D8 *v2; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v1 = (UnkStruct_020716D4 *)sub_02027F6C(v0, 7); @@ -316,11 +316,11 @@ void sub_0207183C (FieldSystem * fieldSystem) } } -static BOOL sub_020718D8 (TaskManager * taskMan) +static BOOL sub_020718D8(TaskManager *taskMan) { - UnkStruct_ov5_021E1890 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_020718D8 * v2 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021E1890 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_020718D8 *v2 = TaskManager_Environment(taskMan); switch (v2->unk_00) { case 0: @@ -328,12 +328,11 @@ static BOOL sub_020718D8 (TaskManager * taskMan) sub_02071ACC(v2->unk_0C); (v2->unk_00)++; break; - case 1: - { + case 1: { if (v2->unk_08) { v0 = ov5_021E18CC(fieldSystem->unk_A4, 258); } else { - const int v3[2] = {258, 502}; + const int v3[2] = { 258, 502 }; BOOL v4 = sub_02055324(fieldSystem, v3, 2, &v0, NULL); GF_ASSERT(v4); @@ -363,8 +362,7 @@ static BOOL sub_020718D8 (TaskManager * taskMan) sub_0205ED0C(fieldSystem->playerAvatar, v6.y); ov5_021E18A4(v0, &v6); } - } - break; + } break; case 2: ov5_021EF388(0, v2->unk_04, fieldSystem->unk_A0); sub_0205ED48(fieldSystem->playerAvatar, 1); @@ -379,11 +377,11 @@ static BOOL sub_020718D8 (TaskManager * taskMan) return 0; } -static BOOL sub_020719D8 (TaskManager * taskMan) +static BOOL sub_020719D8(TaskManager *taskMan) { - UnkStruct_ov5_021E1890 * v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(taskMan); - UnkStruct_020718D8 * v2 = TaskManager_Environment(taskMan); + UnkStruct_ov5_021E1890 *v0; + FieldSystem *fieldSystem = TaskManager_FieldSystem(taskMan); + UnkStruct_020718D8 *v2 = TaskManager_Environment(taskMan); switch (v2->unk_00) { case 0: @@ -391,12 +389,11 @@ static BOOL sub_020719D8 (TaskManager * taskMan) sub_02071ACC(v2->unk_0C); (v2->unk_00)++; break; - case 1: - { + case 1: { if (v2->unk_08) { v0 = ov5_021E18CC(fieldSystem->unk_A4, 258); } else { - const int v3[2] = {258, 502}; + const int v3[2] = { 258, 502 }; BOOL v4 = sub_02055324(fieldSystem, v3, 2, &v0, NULL); GF_ASSERT(v4); @@ -418,8 +415,7 @@ static BOOL sub_020719D8 (TaskManager * taskMan) sub_0205ED0C(fieldSystem->playerAvatar, v5.y); ov5_021E18A4(v0, &v5); } - } - break; + } break; case 2: ov5_021EF388(0, v2->unk_04, fieldSystem->unk_A0); sub_0205ED48(fieldSystem->playerAvatar, 1); @@ -434,7 +430,7 @@ static BOOL sub_020719D8 (TaskManager * taskMan) return 0; } -static void sub_02071ACC (const int param0) +static void sub_02071ACC(const int param0) { if (param0 == 0) { Sound_PlayEffect(1553); @@ -443,7 +439,7 @@ static void sub_02071ACC (const int param0) } } -static void sub_02071AEC (const int param0) +static void sub_02071AEC(const int param0) { if (param0 == 0) { sub_020057A4(1553, 0); diff --git a/src/unk_02071B10.c b/src/unk_02071B10.c index 93d9c0cca0..6775510863 100644 --- a/src/unk_02071B10.c +++ b/src/unk_02071B10.c @@ -1,10 +1,9 @@ +#include "unk_02071B10.h" + #include #include #include "struct_decls/struct_02027860_decl.h" - -#include "field/field_system.h" -#include "field/field_system_sub2_t.h" #include "struct_defs/struct_02071B10.h" #include "struct_defs/struct_02071B30.h" #include "struct_defs/struct_02071B6C.h" @@ -14,12 +13,14 @@ #include "struct_defs/struct_02071C34.h" #include "struct_defs/struct_02071C5C.h" +#include "field/field_system.h" +#include "field/field_system_sub2_t.h" + +#include "field_system.h" #include "savedata_misc.h" #include "unk_02027F50.h" -#include "field_system.h" -#include "unk_02071B10.h" -static void sub_02071C80(const u8 param0, const u8 param1, int * param2); +static void sub_02071C80(const u8 param0, const u8 param1, int *param2); static const u8 Unk_020F04CC[24] = { 0x0, @@ -48,10 +49,10 @@ static const u8 Unk_020F04CC[24] = { 0x1 }; -void sub_02071B10 (FieldSystem * fieldSystem) +void sub_02071B10(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071B10 * v1; + UnkStruct_02027860 *v0; + UnkStruct_02071B10 *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); sub_02027F5C(v0, 1); @@ -60,10 +61,10 @@ void sub_02071B10 (FieldSystem * fieldSystem) v1->unk_00 = 1; } -void sub_02071B30 (FieldSystem * fieldSystem) +void sub_02071B30(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071B30 * v1; + UnkStruct_02027860 *v0; + UnkStruct_02071B30 *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); sub_02027F5C(v0, 3); @@ -79,10 +80,10 @@ void sub_02071B30 (FieldSystem * fieldSystem) } } -void sub_02071B6C (FieldSystem * fieldSystem, const u8 param1) +void sub_02071B6C(FieldSystem *fieldSystem, const u8 param1) { - UnkStruct_02027860 * v0; - UnkStruct_02071B6C * v1; + UnkStruct_02027860 *v0; + UnkStruct_02071B6C *v1; u16 v2; GF_ASSERT(param1 < 3); @@ -115,10 +116,10 @@ void sub_02071B6C (FieldSystem * fieldSystem, const u8 param1) } } -void sub_02071BD0 (FieldSystem * fieldSystem) +void sub_02071BD0(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071BD0 * v1; + UnkStruct_02027860 *v0; + UnkStruct_02071BD0 *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); sub_02027F5C(v0, 8); @@ -127,10 +128,10 @@ void sub_02071BD0 (FieldSystem * fieldSystem) memset(v1, 0, sizeof(8)); } -void sub_02071BF8 (FieldSystem * fieldSystem) +void sub_02071BF8(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071BF8 * v1; + UnkStruct_02027860 *v0; + UnkStruct_02071BF8 *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); sub_02027F5C(v0, 4); @@ -139,20 +140,20 @@ void sub_02071BF8 (FieldSystem * fieldSystem) v1->unk_00 = 0; } -void sub_02071C18 (FieldSystem * fieldSystem) +void sub_02071C18(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071C18 * v1; + UnkStruct_02027860 *v0; + UnkStruct_02071C18 *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); sub_02027F5C(v0, 2); v1 = (UnkStruct_02071C18 *)sub_02027F6C(v0, 2); } -void sub_02071C34 (FieldSystem * fieldSystem) +void sub_02071C34(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071C34 * v1; + UnkStruct_02027860 *v0; + UnkStruct_02071C34 *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); sub_02027F5C(v0, 10); @@ -161,10 +162,10 @@ void sub_02071C34 (FieldSystem * fieldSystem) memset(v1, 0, sizeof(UnkStruct_02071C34)); } -void sub_02071C5C (FieldSystem * fieldSystem) +void sub_02071C5C(FieldSystem *fieldSystem) { - UnkStruct_02027860 * v0; - UnkStruct_02071C5C * v1; + UnkStruct_02027860 *v0; + UnkStruct_02071C5C *v1; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); sub_02027F5C(v0, 9); @@ -173,11 +174,11 @@ void sub_02071C5C (FieldSystem * fieldSystem) memset(v1, 0, sizeof(UnkStruct_02071C5C)); } -static void sub_02071C80 (const u8 param0, const u8 param1, int * param2) +static void sub_02071C80(const u8 param0, const u8 param1, int *param2) { int v0, v1, v2; - GF_ASSERT((param1 <= 1)); + GF_ASSERT(param1 <= 1); v0 = (*param2) & (0xffffffff << (param0 + 1)); v2 = (*param2) & (0xffffffff >> (32 - param0)); @@ -186,9 +187,9 @@ static void sub_02071C80 (const u8 param0, const u8 param1, int * param2) (*param2) = (v0 | v1 | v2); } -BOOL sub_02071CB4 (FieldSystem * fieldSystem, int param1) +BOOL sub_02071CB4(FieldSystem *fieldSystem, int param1) { - UnkStruct_02027860 * v0; + UnkStruct_02027860 *v0; v0 = sub_02027860(FieldSystem_SaveData(fieldSystem)); diff --git a/src/unk_02071CD0.c b/src/unk_02071CD0.c index c865f0fe56..337b2ec48a 100644 --- a/src/unk_02071CD0.c +++ b/src/unk_02071CD0.c @@ -6,17 +6,17 @@ #include "field/field_system.h" #include "overlay006/struct_ov6_02242AF0.h" +#include "field_system.h" #include "savedata_misc.h" #include "unk_02027F50.h" -#include "field_system.h" -void sub_02071CD0(FieldSystem * fieldSystem); +void sub_02071CD0(FieldSystem *fieldSystem); -void sub_02071CD0 (FieldSystem * fieldSystem) +void sub_02071CD0(FieldSystem *fieldSystem) { int v0; - UnkStruct_02027860 * v1; - UnkStruct_ov6_02242AF0 * v2; + UnkStruct_02027860 *v1; + UnkStruct_ov6_02242AF0 *v2; v1 = sub_02027860(FieldSystem_SaveData(fieldSystem)); v0 = sub_02027F80(v1); diff --git a/src/unk_02071CFC.c b/src/unk_02071CFC.c index 4b4cda2894..b1e3f8cca7 100644 --- a/src/unk_02071CFC.c +++ b/src/unk_02071CFC.c @@ -1,15 +1,16 @@ +#include "unk_02071CFC.h" + #include #include #include "field/field_system_sub2_t.h" -#include "unk_02002B7C.h" -#include "message.h" #include "map_header.h" +#include "message.h" #include "strbuf.h" -#include "unk_02071CFC.h" +#include "unk_02002B7C.h" -u32 sub_02071CFC (MessageLoader * param0, const int param1, Strbuf *param2) +u32 sub_02071CFC(MessageLoader *param0, const int param1, Strbuf *param2) { u32 v0; @@ -19,10 +20,10 @@ u32 sub_02071CFC (MessageLoader * param0, const int param1, Strbuf *param2) return v0; } -void sub_02071D10 (const int param0, const u32 param1, Strbuf *param2) +void sub_02071D10(const int param0, const u32 param1, Strbuf *param2) { int v0; - MessageLoader * v1; + MessageLoader *v1; v1 = MessageLoader_Init(1, 26, 433, param1); v0 = MapHeader_GetMapLabelTextID(param0); diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index dae8ac51d9..b88ab911a1 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -1,55 +1,54 @@ +#include "unk_02071D40.h" + #include #include -#include "play_time.h" -#include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_0202C834_decl.h" #include "struct_decls/struct_0202C844_decl.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_0203068C_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "savedata.h" +#include "struct_defs/struct_02072014.h" #include "field/field_system.h" -#include "struct_defs/struct_02072014.h" -#include "unk_020021B0.h" +#include "field_system.h" #include "heap.h" -#include "unk_02025E08.h" +#include "play_time.h" +#include "savedata.h" #include "trainer_info.h" +#include "unk_020021B0.h" +#include "unk_02025E08.h" #include "unk_0202631C.h" #include "unk_0202854C.h" #include "unk_0202C7FC.h" -#include "play_time.h" #include "unk_0202CD50.h" #include "unk_0203061C.h" -#include "field_system.h" #include "unk_0203D1B8.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_020559DC.h" #include "unk_0205B33C.h" #include "unk_0206A8DC.h" -#include "unk_02071D40.h" +#include "vars_flags.h" typedef struct { int unk_00; - TrainerCard * unk_04; + TrainerCard *unk_04; } UnkStruct_02072204; -static void sub_02072014(const u8 param0, const u8 param1, const u8 param2, const u8 param3, const u8 param4, TrainerCard * param5); -static void sub_02072038(const u16 param0, const u8 param1, const u16 * param2, const u32 param3, const u32 param4, const BOOL param5, const u32 param6, TrainerCard * param7); -static void sub_0207207C(const u8 param0, const PlayTime *playTime, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * param6); -static void sub_02072120(const u32 param0, const u32 param1, const u32 param2, const u32 param3, const u8 * param4, TrainerCard * param5); -static void sub_0207216C(TrainerInfo * param0, FieldSystem * fieldSystem, TrainerCard * param2); -static BOOL sub_02072230(TaskManager * param0); +static void sub_02072014(const u8 param0, const u8 param1, const u8 param2, const u8 param3, const u8 param4, TrainerCard *param5); +static void sub_02072038(const u16 param0, const u8 param1, const u16 *param2, const u32 param3, const u32 param4, const BOOL param5, const u32 param6, TrainerCard *param7); +static void sub_0207207C(const u8 param0, const PlayTime *playTime, const RTCDate *param2, const RTCDate *param3, const RTCTime *param4, const u8 param5, TrainerCard *param6); +static void sub_02072120(const u32 param0, const u32 param1, const u32 param2, const u32 param3, const u8 *param4, TrainerCard *param5); +static void sub_0207216C(TrainerInfo *param0, FieldSystem *fieldSystem, TrainerCard *param2); +static BOOL sub_02072230(TaskManager *param0); -void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 param3, FieldSystem * fieldSystem, TrainerCard * param5) +void sub_02071D40(const u8 param0, const u8 param1, const u8 param2, const u8 param3, FieldSystem *fieldSystem, TrainerCard *param5) { - TrainerInfo * v0; - UnkStruct_0202CD88 * v1; - SaveData * v2; + TrainerInfo *v0; + UnkStruct_0202CD88 *v1; + SaveData *v2; v2 = FieldSystem_SaveData(fieldSystem); v0 = SaveData_GetTrainerInfo(v2); @@ -70,7 +69,7 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p RTCDate v4; RTCDate v5; RTCTime v6; - PlayTime * playTime; + PlayTime *playTime; playTime = SaveData_GetPlayTime(v2); @@ -81,10 +80,10 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p { u32 v8, v9, v10, v11; - UnkStruct_0202C834 * v12; + UnkStruct_0202C834 *v12; v12 = sub_0202C834(fieldSystem->saveData); - v8 = sub_0202CFB8(v1, (((70 + 1)) + 20)) + sub_0202CFB8(v1, (1 + 18)) + sub_0202CFB8(v1, (1 + 23)) + sub_0202CFB8(v1, (1 + 19)) + sub_0202CFB8(v1, (1 + 24)) + sub_0202CFB8(v1, (1 + 31)); + v8 = sub_0202CFB8(v1, ((70 + 1) + 20)) + sub_0202CFB8(v1, (1 + 18)) + sub_0202CFB8(v1, (1 + 23)) + sub_0202CFB8(v1, (1 + 19)) + sub_0202CFB8(v1, (1 + 24)) + sub_0202CFB8(v1, (1 + 31)); v9 = sub_0202CFB8(v1, (1 + 20)) + sub_0202CFB8(v1, (1 + 25)); v10 = sub_0202CFB8(v1, (1 + 21)) + sub_0202CFB8(v1, (1 + 26)); v11 = sub_0202CFB8(v1, (1 + 18)) + sub_0202CFB8(v1, (1 + 23)); @@ -96,7 +95,7 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p { int v13, v14 = 0; - u8 * v15 = (u8 *)param5; + u8 *v15 = (u8 *)param5; for (v13 = 0; v13 < sizeof(TrainerCard); v13++) { v14 ^= v15[v13]; @@ -108,27 +107,27 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p param5->unk_66A = 0; } -TrainerCard * sub_02071F04 (const u16 param0) +TrainerCard *sub_02071F04(const u16 param0) { - TrainerCard * v0 = Heap_AllocFromHeap(param0, sizeof(TrainerCard)); + TrainerCard *v0 = Heap_AllocFromHeap(param0, sizeof(TrainerCard)); memset(v0, 0, sizeof(TrainerCard)); return v0; } -void sub_02071F20 (TrainerCard * param0) +void sub_02071F20(TrainerCard *param0) { Heap_FreeToHeap(param0); } -u8 sub_02071F28 (FieldSystem * fieldSystem) +u8 sub_02071F28(FieldSystem *fieldSystem) { u8 v0; - SaveData * v1; - UnkStruct_0202CD88 * v2; - VarsFlags * v3; - SecretBaseRecord * v4; - UnkStruct_0203068C * v5; + SaveData *v1; + UnkStruct_0202CD88 *v2; + VarsFlags *v3; + SecretBaseRecord *v4; + UnkStruct_0203068C *v5; v1 = FieldSystem_SaveData(fieldSystem); v2 = sub_0202CD88(v1); @@ -160,7 +159,7 @@ u8 sub_02071F28 (FieldSystem * fieldSystem) return v0; } -static void sub_02072014 (const u8 param0, const u8 param1, const u8 param2, const u8 param3, const u8 param4, TrainerCard * param5) +static void sub_02072014(const u8 param0, const u8 param1, const u8 param2, const u8 param3, const u8 param4, TrainerCard *param5) { param5->unk_04_0 = param0; param5->unk_00 = param1; @@ -169,7 +168,7 @@ static void sub_02072014 (const u8 param0, const u8 param1, const u8 param2, con param5->unk_02 = param3; } -static void sub_02072038 (const u16 param0, const u8 param1, const u16 * param2, const u32 param3, const u32 param4, const BOOL param5, const u32 param6, TrainerCard * param7) +static void sub_02072038(const u16 param0, const u8 param1, const u16 *param2, const u32 param3, const u32 param4, const BOOL param5, const u32 param6, TrainerCard *param7) { param7->unk_28 = param0; param7->unk_04_2 = param1; @@ -182,7 +181,7 @@ static void sub_02072038 (const u16 param0, const u8 param1, const u16 * param2, param7->unk_24 = param6; } -static void sub_0207207C (const u8 param0, const PlayTime *playTime, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * trainerCard) +static void sub_0207207C(const u8 param0, const PlayTime *playTime, const RTCDate *param2, const RTCDate *param3, const RTCTime *param4, const u8 param5, TrainerCard *trainerCard) { trainerCard->playTimeHours = PlayTime_GetHours(playTime); trainerCard->playTimeMinutes = PlayTime_GetMinutes(playTime); @@ -213,7 +212,7 @@ static void sub_0207207C (const u8 param0, const PlayTime *playTime, const RTCDa } } -static void sub_02072120 (const u32 param0, const u32 param1, const u32 param2, const u32 param3, const u8 * param4, TrainerCard * param5) +static void sub_02072120(const u32 param0, const u32 param1, const u32 param2, const u32 param3, const u8 *param4, TrainerCard *param5) { param5->unk_38 = param0; @@ -241,11 +240,11 @@ static void sub_02072120 (const u32 param0, const u32 param1, const u32 param2, MI_CpuCopy8(param4, param5->unk_68, 24 * 8 * 8); } -static void sub_0207216C (TrainerInfo * param0, FieldSystem * fieldSystem, TrainerCard * param2) +static void sub_0207216C(TrainerInfo *param0, FieldSystem *fieldSystem, TrainerCard *param2) { u8 v0; - UnkStruct_0202C834 * v1; - UnkStruct_0202C844 * v2; + UnkStruct_0202C834 *v1; + UnkStruct_0202C844 *v2; v1 = sub_0202C834(fieldSystem->saveData); v2 = sub_0202C844(v1); @@ -261,11 +260,11 @@ static void sub_0207216C (TrainerInfo * param0, FieldSystem * fieldSystem, Train } } -void sub_020721D4 (FieldSystem * fieldSystem, const TrainerCard * param1) +void sub_020721D4(FieldSystem *fieldSystem, const TrainerCard *param1) { u8 v0; - UnkStruct_0202C834 * v1; - UnkStruct_0202C844 * v2; + UnkStruct_0202C834 *v1; + UnkStruct_0202C844 *v2; v1 = sub_0202C834(fieldSystem->saveData); v2 = sub_0202C844(v1); @@ -275,9 +274,9 @@ void sub_020721D4 (FieldSystem * fieldSystem, const TrainerCard * param1) } } -void sub_02072204 (FieldSystem * fieldSystem) +void sub_02072204(FieldSystem *fieldSystem) { - UnkStruct_02072204 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02072204)); + UnkStruct_02072204 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02072204)); v0->unk_00 = 0; v0->unk_04 = (TrainerCard *)sub_0205C17C(fieldSystem->unk_7C); @@ -285,10 +284,10 @@ void sub_02072204 (FieldSystem * fieldSystem) FieldTask_Start(fieldSystem->unk_10, sub_02072230, v0); } -static BOOL sub_02072230 (TaskManager * param0) +static BOOL sub_02072230(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_02072204 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_02072204 *v1 = TaskManager_Environment(param0); switch (v1->unk_00) { case 0: diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index 1c14a96e14..24a3ccb7a6 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -1,62 +1,59 @@ #include #include -#include "core_sys.h" - #include "struct_decls/struct_0200112C_decl.h" #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02013A04_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" #include "struct_decls/struct_02028430_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" -#include "savedata.h" - -#include "constdata/const_020F1E88.h" - #include "struct_defs/struct_02013A04_t.h" #include "struct_defs/struct_0202818C.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0206A844.h" #include "struct_defs/struct_02097728.h" #include "struct_defs/struct_02098C44.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021D37AC.h" +#include "overlay005/ov5_021D431C.h" +#include "overlay006/ov6_02247078.h" #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_02240FA8.h" +#include "bag.h" +#include "core_sys.h" +#include "field_system.h" +#include "game_options.h" +#include "heap.h" +#include "item.h" +#include "message.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_0200112C.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_02028124.h" -#include "field_system.h" #include "unk_0203D1B8.h" #include "unk_020508D4.h" #include "unk_0206A780.h" -#include "party.h" -#include "item.h" -#include "bag.h" #include "unk_02097624.h" -#include "overlay005/ov5_021D37AC.h" -#include "overlay005/ov5_021D431C.h" -#include "overlay006/ov6_02247078.h" + +#include "constdata/const_020F1E88.h" typedef struct { u8 unk_00; @@ -66,7 +63,7 @@ typedef struct { u8 unk_04; u8 unk_05; u16 unk_06; - Strbuf* unk_08; + Strbuf *unk_08; } UnkStruct_02072EB8; typedef struct { @@ -75,17 +72,17 @@ typedef struct { } UnkStruct_020F0524; typedef struct { - StringTemplate * unk_00; - Strbuf* unk_04; - Strbuf* unk_08; - Strbuf* unk_0C; - Strbuf* unk_10[6]; + StringTemplate *unk_00; + Strbuf *unk_04; + Strbuf *unk_08; + Strbuf *unk_0C; + Strbuf *unk_10[6]; } UnkStruct_02072334_sub1; typedef struct { int unk_00; - int * unk_04; - SysTask * unk_08; + int *unk_04; + SysTask *unk_08; SysTaskFunc unk_0C; u16 unk_10; u16 unk_12; @@ -97,7 +94,7 @@ typedef struct { u8 unk_1A; u8 unk_1B; UnkStruct_02072EB8 unk_1C[20]; - MessageLoader * unk_10C; + MessageLoader *unk_10C; UnkStruct_02072334_sub1 unk_110; u8 unk_138; u8 unk_139; @@ -108,19 +105,19 @@ typedef struct { u16 unk_13C; u16 unk_13E; UnkStruct_ov84_02240FA8 unk_140; - BmpList * unk_160; - ResourceMetadata * unk_164; - UIControlData * unk_168; - FieldSystem * fieldSystem; - BGL * unk_170; + BmpList *unk_160; + ResourceMetadata *unk_164; + UIControlData *unk_168; + FieldSystem *fieldSystem; + BGL *unk_170; Window unk_174; Window unk_184; Window unk_194; - UnkStruct_0206A844 * unk_1A4; - UnkStruct_02097728 * unk_1A8; - UnkStruct_02028430 * unk_1AC; - Bag * unk_1B0; - PartyManagementData * unk_1B4; + UnkStruct_0206A844 *unk_1A4; + UnkStruct_02097728 *unk_1A8; + UnkStruct_02028430 *unk_1AC; + Bag *unk_1B0; + PartyManagementData *unk_1B4; } UnkStruct_02072334; typedef struct { @@ -128,51 +125,51 @@ typedef struct { int unk_04; } UnkStruct_020736D8; -void sub_020736D8(TaskManager * param0); -void sub_020722AC(void * param0, int * param1); -static void sub_02072334(UnkStruct_02072334 * param0); -static void sub_02072364(SysTask * param0, void * param1); -static void sub_02072370(SysTask * param0, void * param1); -static void sub_02072390(SysTask * param0, void * param1); -static void sub_02072418(SysTask * param0, void * param1); -static void sub_02072470(SysTask * param0, void * param1); -static void sub_02072518(SysTask * param0, void * param1); -static void sub_02072534(SysTask * param0, void * param1); -static void sub_02072550(SysTask * param0, void * param1); -static void sub_020725D0(SysTask * param0, void * param1); -static void sub_020726B4(SysTask * param0, void * param1); -static void sub_02072754(SysTask * param0, void * param1); -static void sub_020727F8(SysTask * param0, void * param1); -static void sub_02072878(SysTask * param0, void * param1); -static void sub_02072EA4(UnkStruct_02072334 * param0, SysTaskFunc param1, SysTaskFunc param2); -static void sub_02072EB8(UnkStruct_02072EB8 * param0, u8 param1); -static void sub_02072ED0(UnkStruct_02072EB8 * param0, u8 param1, int param2); -static void sub_02072F04(UnkStruct_02072EB8 * param0, u8 param1); -static void sub_020729B4(UnkStruct_02072334 * param0); -static void sub_02072BBC(BmpList * param0, u32 param1, u8 param2); -static void sub_02072C0C(BmpList * param0, u32 param1, u8 param2); -static void sub_02072C98(UnkStruct_02072334 * param0, u8 param1, u8 param2); -static void sub_02072DA4(BmpList * param0, u32 param1, u8 param2); -static void sub_02072DB8(UnkStruct_02072334 * param0); -static void sub_02072E4C(UnkStruct_02072334 * param0); -static void sub_02072F30(UnkStruct_02072334 * param0, SaveData * param1, int param2); -static void sub_02073020(UnkStruct_02072334 * param0, u8 param1); -static BOOL sub_02073060(UnkStruct_02072334 * param0); -static void sub_020730B8(UnkStruct_02072334 * param0, u8 param1, BOOL param2); -static void sub_02073130(UnkStruct_02072334 * param0); -static void sub_020731A4(UnkStruct_02072334 * param0); -static void sub_020731F4(UnkStruct_02072334 * param0); -static void sub_02073294(UnkStruct_02072334 * param0); -static void sub_020732C4(UnkStruct_02072334 * param0, int param1, u8 param2, u8 param3, int param4); -static void sub_02073398(UnkStruct_02072334 * param0); -static BOOL sub_020733B4(UnkStruct_02072334 * param0); -static void sub_020733E0(UnkStruct_02072334 * param0); -static int sub_0207340C(UnkStruct_02072334 * param0); -static int sub_02073438(UnkStruct_02072334 * param0, int param1); -static int sub_02073480(UnkStruct_02072334 * param0); -static int sub_020734F4(UnkStruct_02072334 * param0, u8 param1); -static int sub_02073524(UnkStruct_02072334 * param0, int param1); -static int sub_020735E8(UnkStruct_02072334 * param0); +void sub_020736D8(TaskManager *param0); +void sub_020722AC(void *param0, int *param1); +static void sub_02072334(UnkStruct_02072334 *param0); +static void sub_02072364(SysTask *param0, void *param1); +static void sub_02072370(SysTask *param0, void *param1); +static void sub_02072390(SysTask *param0, void *param1); +static void sub_02072418(SysTask *param0, void *param1); +static void sub_02072470(SysTask *param0, void *param1); +static void sub_02072518(SysTask *param0, void *param1); +static void sub_02072534(SysTask *param0, void *param1); +static void sub_02072550(SysTask *param0, void *param1); +static void sub_020725D0(SysTask *param0, void *param1); +static void sub_020726B4(SysTask *param0, void *param1); +static void sub_02072754(SysTask *param0, void *param1); +static void sub_020727F8(SysTask *param0, void *param1); +static void sub_02072878(SysTask *param0, void *param1); +static void sub_02072EA4(UnkStruct_02072334 *param0, SysTaskFunc param1, SysTaskFunc param2); +static void sub_02072EB8(UnkStruct_02072EB8 *param0, u8 param1); +static void sub_02072ED0(UnkStruct_02072EB8 *param0, u8 param1, int param2); +static void sub_02072F04(UnkStruct_02072EB8 *param0, u8 param1); +static void sub_020729B4(UnkStruct_02072334 *param0); +static void sub_02072BBC(BmpList *param0, u32 param1, u8 param2); +static void sub_02072C0C(BmpList *param0, u32 param1, u8 param2); +static void sub_02072C98(UnkStruct_02072334 *param0, u8 param1, u8 param2); +static void sub_02072DA4(BmpList *param0, u32 param1, u8 param2); +static void sub_02072DB8(UnkStruct_02072334 *param0); +static void sub_02072E4C(UnkStruct_02072334 *param0); +static void sub_02072F30(UnkStruct_02072334 *param0, SaveData *param1, int param2); +static void sub_02073020(UnkStruct_02072334 *param0, u8 param1); +static BOOL sub_02073060(UnkStruct_02072334 *param0); +static void sub_020730B8(UnkStruct_02072334 *param0, u8 param1, BOOL param2); +static void sub_02073130(UnkStruct_02072334 *param0); +static void sub_020731A4(UnkStruct_02072334 *param0); +static void sub_020731F4(UnkStruct_02072334 *param0); +static void sub_02073294(UnkStruct_02072334 *param0); +static void sub_020732C4(UnkStruct_02072334 *param0, int param1, u8 param2, u8 param3, int param4); +static void sub_02073398(UnkStruct_02072334 *param0); +static BOOL sub_020733B4(UnkStruct_02072334 *param0); +static void sub_020733E0(UnkStruct_02072334 *param0); +static int sub_0207340C(UnkStruct_02072334 *param0); +static int sub_02073438(UnkStruct_02072334 *param0, int param1); +static int sub_02073480(UnkStruct_02072334 *param0); +static int sub_020734F4(UnkStruct_02072334 *param0, u8 param1); +static int sub_02073524(UnkStruct_02072334 *param0, int param1); +static int sub_020735E8(UnkStruct_02072334 *param0); static const UnkStruct_ov84_02240FA8 Unk_020F0504 = { NULL, @@ -197,16 +194,16 @@ static const UnkStruct_ov84_02240FA8 Unk_020F0504 = { }; static const UnkStruct_020F0524 Unk_020F0524[] = { - {0x1, 0x0}, - {0x2, 0x1}, - {0x3, 0x2}, - {0x4, 0x3} + { 0x1, 0x0 }, + { 0x2, 0x1 }, + { 0x3, 0x2 }, + { 0x4, 0x3 } }; -void sub_020722AC (void * param0, int * param1) +void sub_020722AC(void *param0, int *param1) { - UnkStruct_02072334 * v0 = NULL; - SaveData * v1; + UnkStruct_02072334 *v0 = NULL; + SaveData *v1; Heap_Create(3, 43, 0x5000); @@ -230,7 +227,7 @@ void sub_020722AC (void * param0, int * param1) v0->unk_08 = SysTask_Start(sub_02072370, v0, 0); } -void sub_02072334 (UnkStruct_02072334 * param0) +void sub_02072334(UnkStruct_02072334 *param0) { SysTask_Done(param0->unk_08); *(param0->unk_04) = 1; @@ -240,24 +237,24 @@ void sub_02072334 (UnkStruct_02072334 * param0) Heap_Destroy(param0->unk_00); } -static void sub_02072364 (SysTask * param0, void * param1) +static void sub_02072364(SysTask *param0, void *param1) { - UnkStruct_02072334 * v0 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v0 = (UnkStruct_02072334 *)param1; sub_02072334(v0); } -static void sub_02072370 (SysTask * param0, void * param1) +static void sub_02072370(SysTask *param0, void *param1) { - UnkStruct_02072334 * v0 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v0 = (UnkStruct_02072334 *)param1; sub_020731F4(v0); sub_020729B4(v0); SysTask_SetCallback(param0, sub_02072390); } -static void sub_02072390 (SysTask * param0, void * param1) +static void sub_02072390(SysTask *param0, void *param1) { - UnkStruct_02072334 * v0 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v0 = (UnkStruct_02072334 *)param1; s32 v1; v1 = sub_02001288(v0->unk_160); @@ -291,9 +288,9 @@ static void sub_02072390 (SysTask * param0, void * param1) return; } -static void sub_02072418 (SysTask * param0, void * param1) +static void sub_02072418(SysTask *param0, void *param1) { - UnkStruct_02072334 * v0 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v0 = (UnkStruct_02072334 *)param1; switch (v0->unk_10) { case 0: @@ -315,9 +312,9 @@ static void sub_02072418 (SysTask * param0, void * param1) return; } -static void sub_02072470 (SysTask * param0, void * param1) +static void sub_02072470(SysTask *param0, void *param1) { - UnkStruct_02072334 * v0 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v0 = (UnkStruct_02072334 *)param1; s32 v1; v1 = sub_02001288(v0->unk_160); @@ -353,28 +350,28 @@ static void sub_02072470 (SysTask * param0, void * param1) return; } -static void sub_02072518 (SysTask * param0, void * param1) +static void sub_02072518(SysTask *param0, void *param1) { - UnkStruct_02072334 * v0 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v0 = (UnkStruct_02072334 *)param1; sub_02072DB8(v0); sub_02073294(v0); SysTask_SetCallback(param0, v0->unk_0C); } -static void sub_02072534 (SysTask * param0, void * param1) +static void sub_02072534(SysTask *param0, void *param1) { - UnkStruct_02072334 * v0 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v0 = (UnkStruct_02072334 *)param1; sub_02072E4C(v0); sub_02073294(v0); SysTask_SetCallback(param0, v0->unk_0C); } -static void sub_02072550 (SysTask * param0, void * param1) +static void sub_02072550(SysTask *param0, void *param1) { int v0; - UnkStruct_02072334 * v1 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v1 = (UnkStruct_02072334 *)param1; switch (v1->unk_10) { case 0: @@ -412,10 +409,10 @@ static void sub_02072550 (SysTask * param0, void * param1) return; } -static void sub_020725D0 (SysTask * param0, void * param1) +static void sub_020725D0(SysTask *param0, void *param1) { int v0; - UnkStruct_02072334 * v1 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v1 = (UnkStruct_02072334 *)param1; switch (v1->unk_10) { case 0: @@ -476,10 +473,10 @@ static void sub_020725D0 (SysTask * param0, void * param1) return; } -static void sub_020726B4 (SysTask * param0, void * param1) +static void sub_020726B4(SysTask *param0, void *param1) { int v0; - UnkStruct_02072334 * v1 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v1 = (UnkStruct_02072334 *)param1; switch (v1->unk_10) { case 0: @@ -515,11 +512,11 @@ static void sub_020726B4 (SysTask * param0, void * param1) return; } -static void sub_02072754 (SysTask * param0, void * param1) +static void sub_02072754(SysTask *param0, void *param1) { u8 v0; - PartyManagementData * v1; - UnkStruct_02072334 * v2 = (UnkStruct_02072334 *)param1; + PartyManagementData *v1; + UnkStruct_02072334 *v2 = (UnkStruct_02072334 *)param1; switch (v2->unk_10) { case 0: @@ -563,10 +560,10 @@ static void sub_02072754 (SysTask * param0, void * param1) return; } -static void sub_020727F8 (SysTask * param0, void * param1) +static void sub_020727F8(SysTask *param0, void *param1) { int v0; - UnkStruct_02072334 * v1 = (UnkStruct_02072334 *)param1; + UnkStruct_02072334 *v1 = (UnkStruct_02072334 *)param1; switch (v1->unk_10) { case 0: @@ -594,12 +591,12 @@ static void sub_020727F8 (SysTask * param0, void * param1) return; } -static void sub_02072878 (SysTask * param0, void * param1) +static void sub_02072878(SysTask *param0, void *param1) { int v0; u8 v1, v2; - PartyManagementData * v3; - UnkStruct_02072334 * v4 = (UnkStruct_02072334 *)param1; + PartyManagementData *v3; + UnkStruct_02072334 *v4 = (UnkStruct_02072334 *)param1; switch (v4->unk_10) { case 0: @@ -676,13 +673,13 @@ static void sub_02072878 (SysTask * param0, void * param1) ++v4->unk_10; } -static void sub_020729B4 (UnkStruct_02072334 * param0) +static void sub_020729B4(UnkStruct_02072334 *param0) { u8 v0 = 0, v1 = 0; - UnkStruct_02072EB8 * v2; + UnkStruct_02072EB8 *v2; static const UnkStruct_ov61_0222C884 v3[2] = { - {0x3, 0x13, 0x1, 0xC, 0x10, 0xD, 0x295}, - {0x3, 0x1, 0x1, 0x9, 0x2, 0xD, 0x283} + { 0x3, 0x13, 0x1, 0xC, 0x10, 0xD, 0x295 }, + { 0x3, 0x1, 0x1, 0x9, 0x2, 0xD, 0x283 } }; param0->unk_1A4 = sub_0206A780(param0->unk_00); @@ -738,16 +735,16 @@ static void sub_020729B4 (UnkStruct_02072334 * param0) param0->unk_160 = sub_0200112C(&(param0->unk_140), param0->unk_13C, param0->unk_13E, param0->unk_00); Window_Show(¶m0->unk_174, 0, (1024 - (18 + 12) - 9), 11); - sub_0201D78C(¶m0->unk_194, 0, param0->unk_110.unk_0C, 2, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + sub_0201D78C(¶m0->unk_194, 0, param0->unk_110.unk_0C, 2, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); Window_Show(¶m0->unk_194, 0, (1024 - (18 + 12) - 9), 11); sub_0201C3C0(param0->unk_170, 3); param0->unk_13B_0 = 0; } -static void sub_02072BBC (BmpList * param0, u32 param1, u8 param2) +static void sub_02072BBC(BmpList *param0, u32 param1, u8 param2) { - UnkStruct_02072334 * v0 = (UnkStruct_02072334 *)sub_02001504(param0, 19); + UnkStruct_02072334 *v0 = (UnkStruct_02072334 *)sub_02001504(param0, 19); if (param1 == 0xFFFF) { sub_0200147C(param0, 1, 15, 2); @@ -760,10 +757,10 @@ static void sub_02072BBC (BmpList * param0, u32 param1, u8 param2) } } -static void sub_02072C0C (BmpList * param0, u32 param1, u8 param2) +static void sub_02072C0C(BmpList *param0, u32 param1, u8 param2) { u16 v0, v1, v2; - UnkStruct_02072334 * v3 = (UnkStruct_02072334 *)sub_02001504(param0, 19); + UnkStruct_02072334 *v3 = (UnkStruct_02072334 *)sub_02001504(param0, 19); sub_020014DC(param0, &v0, &v1); v2 = sub_02001504(param0, 2); @@ -785,7 +782,7 @@ static void sub_02072C0C (BmpList * param0, u32 param1, u8 param2) } } -static void sub_02072C98 (UnkStruct_02072334 * param0, u8 param1, u8 param2) +static void sub_02072C98(UnkStruct_02072334 *param0, u8 param1, u8 param2) { u8 v0 = 0, v1 = 0; static const UnkStruct_ov61_0222C884 v2 = { @@ -825,14 +822,14 @@ static void sub_02072C98 (UnkStruct_02072334 * param0, u8 param1, u8 param2) param0->unk_13B_0 = 1; } -static void sub_02072DA4 (BmpList * param0, u32 param1, u8 param2) +static void sub_02072DA4(BmpList *param0, u32 param1, u8 param2) { if (!param2) { Sound_PlayEffect(1500); } } -static void sub_02072DB8 (UnkStruct_02072334 * param0) +static void sub_02072DB8(UnkStruct_02072334 *param0) { u16 v0, v1; @@ -858,7 +855,7 @@ static void sub_02072DB8 (UnkStruct_02072334 * param0) sub_0201C3C0(param0->unk_170, 3); } -static void sub_02072E4C (UnkStruct_02072334 * param0) +static void sub_02072E4C(UnkStruct_02072334 *param0) { u16 v0, v1; @@ -871,7 +868,7 @@ static void sub_02072E4C (UnkStruct_02072334 * param0) sub_0201C3C0(param0->unk_170, 3); } -static void sub_02072EA4 (UnkStruct_02072334 * param0, SysTaskFunc param1, SysTaskFunc param2) +static void sub_02072EA4(UnkStruct_02072334 *param0, SysTaskFunc param1, SysTaskFunc param2) { SysTask_SetCallback(param0->unk_08, param1); @@ -879,7 +876,7 @@ static void sub_02072EA4 (UnkStruct_02072334 * param0, SysTaskFunc param1, SysTa param0->unk_0C = param2; } -static void sub_02072EB8 (UnkStruct_02072EB8 * param0, u8 param1) +static void sub_02072EB8(UnkStruct_02072EB8 *param0, u8 param1) { param0->unk_00 = param1; param0->unk_01 = 0; @@ -891,7 +888,7 @@ static void sub_02072EB8 (UnkStruct_02072EB8 * param0, u8 param1) } } -static void sub_02072ED0 (UnkStruct_02072EB8 * param0, u8 param1, int param2) +static void sub_02072ED0(UnkStruct_02072EB8 *param0, u8 param1, int param2) { u8 v0 = 0; @@ -901,7 +898,7 @@ static void sub_02072ED0 (UnkStruct_02072EB8 * param0, u8 param1, int param2) } } -static void sub_02072F04 (UnkStruct_02072EB8 * param0, u8 param1) +static void sub_02072F04(UnkStruct_02072EB8 *param0, u8 param1) { u8 v0 = 0; @@ -912,13 +909,13 @@ static void sub_02072F04 (UnkStruct_02072EB8 * param0, u8 param1) } } -static void sub_02072F30 (UnkStruct_02072334 * param0, SaveData * param1, int param2) +static void sub_02072F30(UnkStruct_02072334 *param0, SaveData *param1, int param2) { u8 v0 = 0, v1 = 0, v2 = 0xFF, v3 = 0; int v4; - UnkStruct_02028430 * v5; - UnkStruct_0202818C * v6; - UnkStruct_02072EB8 * v7, * v8; + UnkStruct_02028430 *v5; + UnkStruct_0202818C *v6; + UnkStruct_02072EB8 *v7, *v8; v5 = sub_02028430(param1); @@ -965,9 +962,9 @@ static void sub_02072F30 (UnkStruct_02072334 * param0, SaveData * param1, int pa Heap_FreeToHeap(v6); } -static void sub_02073020 (UnkStruct_02072334 * param0, u8 param1) +static void sub_02073020(UnkStruct_02072334 *param0, u8 param1) { - UnkStruct_02072EB8 * v0; + UnkStruct_02072EB8 *v0; v0 = &(param0->unk_1C[param1]); @@ -977,9 +974,9 @@ static void sub_02073020 (UnkStruct_02072334 * param0, u8 param1) param0->unk_13B_4 = 1; } -static BOOL sub_02073060 (UnkStruct_02072334 * param0) +static BOOL sub_02073060(UnkStruct_02072334 *param0) { - UnkStruct_02072EB8 * v0; + UnkStruct_02072EB8 *v0; BOOL v1; v0 = &(param0->unk_1C[param0->unk_18]); @@ -996,11 +993,11 @@ static BOOL sub_02073060 (UnkStruct_02072334 * param0) return v1; } -static void sub_020730B8 (UnkStruct_02072334 * param0, u8 param1, BOOL param2) +static void sub_020730B8(UnkStruct_02072334 *param0, u8 param1, BOOL param2) { - UnkStruct_02072EB8 * v0; - Party * v1; - Pokemon * v2; + UnkStruct_02072EB8 *v0; + Party *v1; + Pokemon *v2; v0 = &(param0->unk_1C[param0->unk_18]); @@ -1023,11 +1020,11 @@ static void sub_020730B8 (UnkStruct_02072334 * param0, u8 param1, BOOL param2) sub_02072EB8(v0, param0->unk_18); } -static void sub_02073130 (UnkStruct_02072334 * param0) +static void sub_02073130(UnkStruct_02072334 *param0) { - MessageLoader * v0; + MessageLoader *v0; int v1; - Strbuf* v2; + Strbuf *v2; param0->unk_10C = MessageLoader_Init(1, 26, 408, param0->unk_00); param0->unk_110.unk_00 = StringTemplate_New(1, 128, param0->unk_00); @@ -1040,7 +1037,7 @@ static void sub_02073130 (UnkStruct_02072334 * param0) } } -static void sub_020731A4 (UnkStruct_02072334 * param0) +static void sub_020731A4(UnkStruct_02072334 *param0) { int v0; @@ -1055,7 +1052,7 @@ static void sub_020731A4 (UnkStruct_02072334 * param0) MessageLoader_Free(param0->unk_10C); } -static void sub_020731F4 (UnkStruct_02072334 * param0) +static void sub_020731F4(UnkStruct_02072334 *param0) { param0->unk_170 = sub_0203D170(param0->fieldSystem); @@ -1069,7 +1066,7 @@ static void sub_020731F4 (UnkStruct_02072334 * param0) BGL_FillWindow(¶m0->unk_184, 0); } -static void sub_02073294 (UnkStruct_02072334 * param0) +static void sub_02073294(UnkStruct_02072334 *param0) { sub_0201ACF4(¶m0->unk_184); BGL_DeleteWindow(¶m0->unk_184); @@ -1078,9 +1075,9 @@ static void sub_02073294 (UnkStruct_02072334 * param0) param0->unk_170 = NULL; } -static void sub_020732C4 (UnkStruct_02072334 * param0, int param1, u8 param2, u8 param3, int param4) +static void sub_020732C4(UnkStruct_02072334 *param0, int param1, u8 param2, u8 param3, int param4) { - Strbuf* v0; + Strbuf *v0; if (param4) { sub_0200E060(¶m0->unk_184, 1, (1024 - (18 + 12)), 10); @@ -1100,18 +1097,18 @@ static void sub_020732C4 (UnkStruct_02072334 * param0, int param1, u8 param2, u8 v0 = param0->unk_110.unk_10[param1]; } - param0->unk_138 = sub_0201D78C(¶m0->unk_184, 1, v0, 0, 0, param2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); + param0->unk_138 = sub_0201D78C(¶m0->unk_184, 1, v0, 0, 0, param2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0201A954(¶m0->unk_184); param0->unk_139 = param3; } -static void sub_02073398 (UnkStruct_02072334 * param0) +static void sub_02073398(UnkStruct_02072334 *param0) { sub_0200E084(¶m0->unk_184, 1); sub_0201ACF4(¶m0->unk_184); } -static BOOL sub_020733B4 (UnkStruct_02072334 * param0) +static BOOL sub_020733B4(UnkStruct_02072334 *param0) { if (Message_Printing(param0->unk_138)) { return 0; @@ -1124,7 +1121,7 @@ static BOOL sub_020733B4 (UnkStruct_02072334 * param0) return 1; } -static void sub_020733E0 (UnkStruct_02072334 * param0) +static void sub_020733E0(UnkStruct_02072334 *param0) { static const UnkStruct_ov61_0222C884 v0 = { 0x3, @@ -1139,7 +1136,7 @@ static void sub_020733E0 (UnkStruct_02072334 * param0) param0->unk_168 = sub_02002100(param0->unk_170, &v0, (1024 - (18 + 12) - 9), 11, param0->unk_00); } -static int sub_0207340C (UnkStruct_02072334 * param0) +static int sub_0207340C(UnkStruct_02072334 *param0) { switch (sub_02002114(param0->unk_168, param0->unk_00)) { case 0: @@ -1151,7 +1148,7 @@ static int sub_0207340C (UnkStruct_02072334 * param0) return -1; } -static int sub_02073438 (UnkStruct_02072334 * param0, int param1) +static int sub_02073438(UnkStruct_02072334 *param0, int param1) { switch (param0->unk_12) { case 0: @@ -1170,7 +1167,7 @@ static int sub_02073438 (UnkStruct_02072334 * param0, int param1) return 0; } -static int sub_02073480 (UnkStruct_02072334 * param0) +static int sub_02073480(UnkStruct_02072334 *param0) { switch (param0->unk_12) { case 0: @@ -1198,7 +1195,7 @@ static int sub_02073480 (UnkStruct_02072334 * param0) return 0; } -static int sub_020734F4 (UnkStruct_02072334 * param0, u8 param1) +static int sub_020734F4(UnkStruct_02072334 *param0, u8 param1) { ov5_021D4D68(param0->fieldSystem, 90); @@ -1212,9 +1209,9 @@ static int sub_020734F4 (UnkStruct_02072334 * param0, u8 param1) return 1; } -static int sub_02073524 (UnkStruct_02072334 * param0, int param1) +static int sub_02073524(UnkStruct_02072334 *param0, int param1) { - PartyManagementData * v0; + PartyManagementData *v0; switch (param0->unk_12) { case 0: @@ -1249,7 +1246,7 @@ static int sub_02073524 (UnkStruct_02072334 * param0, int param1) return 0; } -static int sub_020735E8 (UnkStruct_02072334 * param0) +static int sub_020735E8(UnkStruct_02072334 *param0) { int v0 = 0; @@ -1285,10 +1282,10 @@ static int sub_020735E8 (UnkStruct_02072334 * param0) return 0; } -static BOOL sub_02073694 (TaskManager * param0) +static BOOL sub_02073694(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_020736D8 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_020736D8 *v1 = TaskManager_Environment(param0); switch (v1->unk_04) { case 0: @@ -1307,10 +1304,10 @@ static BOOL sub_02073694 (TaskManager * param0) return 0; } -void sub_020736D8 (TaskManager * param0) +void sub_020736D8(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_020736D8 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_020736D8)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_020736D8 *v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_020736D8)); v1->unk_00 = 0; v1->unk_04 = 0; diff --git a/src/unk_02073700.c b/src/unk_02073700.c index e380aeb056..ef67de2a80 100644 --- a/src/unk_02073700.c +++ b/src/unk_02073700.c @@ -1,28 +1,27 @@ #include #include -#include "trainer_info.h" #include "struct_decls/struct_0202C878_decl.h" #include "struct_decls/struct_0202D750_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0202D314.h" + #include "overlay096/struct_ov96_0223B450_sub1.h" -#include "unk_02025E08.h" +#include "savedata.h" #include "trainer_info.h" +#include "unk_02025E08.h" #include "unk_0202C858.h" #include "unk_0202D05C.h" #include "unk_0205C980.h" -void sub_02073700(SaveData * param0, int param1, UnkStruct_ov96_0223B450_sub1 * param2); +void sub_02073700(SaveData *param0, int param1, UnkStruct_ov96_0223B450_sub1 *param2); -void sub_02073700 (SaveData * param0, int param1, UnkStruct_ov96_0223B450_sub1 * param2) +void sub_02073700(SaveData *param0, int param1, UnkStruct_ov96_0223B450_sub1 *param2) { int v0; - TrainerInfo * v1 = SaveData_GetTrainerInfo(param0); - UnkStruct_0202C878 * v2 = sub_0202C878(param0); - UnkStruct_0202D750 * v3 = sub_0202D750(param0); + TrainerInfo *v1 = SaveData_GetTrainerInfo(param0); + UnkStruct_0202C878 *v2 = sub_0202C878(param0); + UnkStruct_0202D750 *v3 = sub_0202D750(param0); MI_CpuClear8(param2, sizeof(UnkStruct_ov96_0223B450_sub1)); MI_CpuCopy8(TrainerInfo_Name(v1), param2->unk_A8, 8 * 2); diff --git a/src/unk_02073838.c b/src/unk_02073838.c index 47c4ce954d..f856d71bc3 100644 --- a/src/unk_02073838.c +++ b/src/unk_02073838.c @@ -1,22 +1,23 @@ +#include "unk_02073838.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" -#include "sys_task_manager.h" - #include "struct_defs/struct_02073838.h" #include "struct_defs/struct_02073974.h" #include "struct_defs/struct_02073B50.h" + #include "overlay005/struct_ov5_02201C58.h" -#include "unk_02006E3C.h" -#include "sys_task.h" #include "heap.h" +#include "sys_task.h" +#include "sys_task_manager.h" +#include "unk_02006E3C.h" #include "unk_0201C970.h" #include "unk_0201E190.h" -#include "unk_02073838.h" -static void sub_020739D8(UnkStruct_02073974 * param0, void * param1, u32 param2); +static void sub_020739D8(UnkStruct_02073974 *param0, void *param1, u32 param2); static const VecFx32 Unk_020F0544 = { FX32_ONE, @@ -36,12 +37,12 @@ static const MtxFx33 Unk_020F0550 = { FX32_ONE }; -void sub_02073838 (UnkStruct_02073838 * param0) +void sub_02073838(UnkStruct_02073838 *param0) { memset(param0, 0, sizeof(UnkStruct_02073838)); } -void sub_02073848 (UnkStruct_02073838 * param0, NNSG3dResFileHeader * param1, u32 param2) +void sub_02073848(UnkStruct_02073838 *param0, NNSG3dResFileHeader *param1, u32 param2) { sub_02073838(param0); @@ -52,43 +53,43 @@ void sub_02073848 (UnkStruct_02073838 * param0, NNSG3dResFileHeader * param1, u3 param0->unk_10 = NNS_G3dGetTex(param1); } -void sub_0207389C (UnkStruct_02073838 * param0, u32 param1, NARC * param2, u32 param3, u32 param4, int param5) +void sub_0207389C(UnkStruct_02073838 *param0, u32 param1, NARC *param2, u32 param3, u32 param4, int param5) { - NNSG3dResFileHeader * v0 = sub_0200723C(param2, param3, 0, param4, param5); + NNSG3dResFileHeader *v0 = sub_0200723C(param2, param3, 0, param4, param5); sub_02073848(param0, v0, param1); } -void sub_020738C0 (UnkStruct_02073838 * param0) +void sub_020738C0(UnkStruct_02073838 *param0) { sub_0201CBCC(param0->unk_10); NNS_G3dBindMdlSet(param0->unk_08, param0->unk_10); param0->unk_00 = 1; } -static void sub_020738D8 (SysTask * param0, void * param1) +static void sub_020738D8(SysTask *param0, void *param1) { - UnkStruct_02073838 * v0 = param1; + UnkStruct_02073838 *v0 = param1; sub_020738C0(v0); SysTask_Done(param0); } -void sub_020738EC (UnkStruct_02073838 * param0) +void sub_020738EC(UnkStruct_02073838 *param0) { { - SysTask * v0 = SysTask_ExecuteOnVBlank(sub_020738D8, param0, 0xffff); + SysTask *v0 = SysTask_ExecuteOnVBlank(sub_020738D8, param0, 0xffff); GF_ASSERT(v0 != NULL); } } -void sub_0207390C (UnkStruct_02073838 * param0) +void sub_0207390C(UnkStruct_02073838 *param0) { if (param0->unk_04) { Heap_FreeToHeap(param0->unk_04); } } -void sub_0207391C (UnkStruct_02073838 * param0) +void sub_0207391C(UnkStruct_02073838 *param0) { if (param0->unk_10 != NULL) { NNSG3dTexKey v0; @@ -106,43 +107,43 @@ void sub_0207391C (UnkStruct_02073838 * param0) } } -void sub_0207395C (UnkStruct_02073838 * param0) +void sub_0207395C(UnkStruct_02073838 *param0) { sub_0207391C(param0); sub_0207390C(param0); sub_02073838(param0); } -void sub_02073974 (UnkStruct_02073974 * param0) +void sub_02073974(UnkStruct_02073974 *param0) { memset(param0, 0, sizeof(UnkStruct_02073974)); } -void sub_02073980 (UnkStruct_02073974 * param0, void * param1, u32 param2) +void sub_02073980(UnkStruct_02073974 *param0, void *param1, u32 param2) { sub_020739D8(param0, param1, param2); param0->unk_00 |= (1 << 0); } -void sub_02073994 (UnkStruct_02073974 * param0, void * param1, u32 param2) +void sub_02073994(UnkStruct_02073974 *param0, void *param1, u32 param2) { sub_020739D8(param0, param1, param2); - param0->unk_00 &= (~((1 << 0))); + param0->unk_00 &= (~(1 << 0)); } -void sub_020739A8 (UnkStruct_02073974 * param0, UnkStruct_02073974 * param1, u32 param2) +void sub_020739A8(UnkStruct_02073974 *param0, UnkStruct_02073974 *param1, u32 param2) { - void * v0 = param1->unk_08; + void *v0 = param1->unk_08; sub_02073994(param0, v0, param2); } -void sub_020739B4 (UnkStruct_02073974 * param0, u32 param1, NARC * param2, u32 param3, u32 param4, int param5) +void sub_020739B4(UnkStruct_02073974 *param0, u32 param1, NARC *param2, u32 param3, u32 param4, int param5) { - void * v0 = sub_0200723C(param2, param3, 0, param4, param5); + void *v0 = sub_0200723C(param2, param3, 0, param4, param5); sub_02073980(param0, v0, param1); } -static void sub_020739D8 (UnkStruct_02073974 * param0, void * param1, u32 param2) +static void sub_020739D8(UnkStruct_02073974 *param0, void *param1, u32 param2) { sub_02073974(param0); @@ -150,18 +151,18 @@ static void sub_020739D8 (UnkStruct_02073974 * param0, void * param1, u32 param2 param0->unk_0C = NNS_G3dGetAnmByIdx(param0->unk_08, 0); } -void sub_020739F0 (UnkStruct_02073974 * param0) +void sub_020739F0(UnkStruct_02073974 *param0) { - if ((param0->unk_00 & (1 << 0))) { + if (param0->unk_00 & (1 << 0)) { Heap_FreeToHeap(param0->unk_08); - param0->unk_00 &= (~((1 << 0))); + param0->unk_00 &= (~(1 << 0)); } param0->unk_08 = NULL; param0->unk_0C = NULL; } -void sub_02073A14 (UnkStruct_02073974 * param0, const NNSG3dResMdl * param1, u32 param2) +void sub_02073A14(UnkStruct_02073974 *param0, const NNSG3dResMdl *param1, u32 param2) { Heap_FndInitAllocatorForExpHeap(¶m0->unk_14, param2, 4); param0->unk_10 = NNS_G3dAllocAnmObj(¶m0->unk_14, param0->unk_0C, param1); @@ -169,29 +170,29 @@ void sub_02073A14 (UnkStruct_02073974 * param0, const NNSG3dResMdl * param1, u32 GF_ASSERT(param0->unk_10 != NULL); } -void sub_02073A3C (UnkStruct_02073974 * param0, const UnkStruct_02073838 * param1, u32 param2) +void sub_02073A3C(UnkStruct_02073974 *param0, const UnkStruct_02073838 *param1, u32 param2) { sub_02073A14(param0, param1->unk_0C, param2); } -void sub_02073A48 (UnkStruct_02073974 * param0, const NNSG3dResMdl * param1, const NNSG3dResTex * param2) +void sub_02073A48(UnkStruct_02073974 *param0, const NNSG3dResMdl *param1, const NNSG3dResTex *param2) { NNS_G3dAnmObjInit(param0->unk_10, param0->unk_0C, param1, param2); } -void sub_02073A5C (UnkStruct_02073974 * param0, const UnkStruct_02073838 * param1) +void sub_02073A5C(UnkStruct_02073974 *param0, const UnkStruct_02073838 *param1) { sub_02073A48(param0, param1->unk_0C, param1->unk_10); } -void sub_02073A6C (UnkStruct_02073974 * param0, const UnkStruct_02073838 * param1, UnkStruct_02073974 * param2, u32 param3, u32 param4) +void sub_02073A6C(UnkStruct_02073974 *param0, const UnkStruct_02073838 *param1, UnkStruct_02073974 *param2, u32 param3, u32 param4) { sub_020739A8(param0, param2, param3); sub_02073A3C(param0, param1, param4); sub_02073A5C(param0, param1); } -void sub_02073A90 (UnkStruct_02073974 * param0) +void sub_02073A90(UnkStruct_02073974 *param0) { if (param0->unk_10) { NNS_G3dFreeAnmObj(¶m0->unk_14, param0->unk_10); @@ -199,14 +200,14 @@ void sub_02073A90 (UnkStruct_02073974 * param0) } } -void sub_02073AA8 (UnkStruct_02073974 * param0) +void sub_02073AA8(UnkStruct_02073974 *param0) { sub_02073A90(param0); sub_020739F0(param0); sub_02073974(param0); } -BOOL sub_02073AC0 (UnkStruct_02073974 * param0, fx32 param1, int param2) +BOOL sub_02073AC0(UnkStruct_02073974 *param0, fx32 param1, int param2) { u32 v0 = 0; fx32 v1 = NNS_G3dAnmObjGetNumFrame(param0->unk_10); @@ -240,23 +241,23 @@ BOOL sub_02073AC0 (UnkStruct_02073974 * param0, fx32 param1, int param2) if (v0 == 1) { param0->unk_00 |= (1 << 1); } else { - param0->unk_00 &= (~((1 << 1))); + param0->unk_00 &= (~(1 << 1)); } return v0; } -void sub_02073B20 (UnkStruct_02073974 * param0, fx32 param1) +void sub_02073B20(UnkStruct_02073974 *param0, fx32 param1) { param0->unk_04 = param1; } -fx32 sub_02073B24 (const UnkStruct_02073974 * param0) +fx32 sub_02073B24(const UnkStruct_02073974 *param0) { return param0->unk_04; } -fx32 sub_02073B28 (const UnkStruct_02073974 * param0) +fx32 sub_02073B28(const UnkStruct_02073974 *param0) { GF_ASSERT(param0->unk_10 != NULL); { @@ -266,58 +267,58 @@ fx32 sub_02073B28 (const UnkStruct_02073974 * param0) } } -BOOL sub_02073B40 (const UnkStruct_02073974 * param0) +BOOL sub_02073B40(const UnkStruct_02073974 *param0) { - if ((param0->unk_00 & (1 << 1))) { + if (param0->unk_00 & (1 << 1)) { return 1; } return 0; } -void sub_02073B50 (UnkStruct_02073B50 * param0) +void sub_02073B50(UnkStruct_02073B50 *param0) { memset(param0, 0, sizeof(UnkStruct_02073B50)); } -void sub_02073B5C (UnkStruct_02073B50 * param0, NNSG3dResMdl * param1) +void sub_02073B5C(UnkStruct_02073B50 *param0, NNSG3dResMdl *param1) { sub_02073B50(param0); NNS_G3dRenderObjInit(¶m0->unk_00, param1); } -void sub_02073B70 (UnkStruct_02073B50 * param0, UnkStruct_02073838 * param1) +void sub_02073B70(UnkStruct_02073B50 *param0, UnkStruct_02073838 *param1) { sub_02073B5C(param0, param1->unk_0C); } -void sub_02073B7C (UnkStruct_02073B50 * param0, NNSG3dAnmObj * param1) +void sub_02073B7C(UnkStruct_02073B50 *param0, NNSG3dAnmObj *param1) { NNS_G3dRenderObjAddAnmObj(¶m0->unk_00, param1); } -void sub_02073B84 (UnkStruct_02073B50 * param0, UnkStruct_02073974 * param1) +void sub_02073B84(UnkStruct_02073B50 *param0, UnkStruct_02073974 *param1) { sub_02073B7C(param0, param1->unk_10); } -void sub_02073B90 (UnkStruct_02073B50 * param0, UnkStruct_02073838 * param1, UnkStruct_02073974 * param2) +void sub_02073B90(UnkStruct_02073B50 *param0, UnkStruct_02073838 *param1, UnkStruct_02073974 *param2) { sub_02073B70(param0, param1); sub_02073B84(param0, param2); } -void sub_02073BA4 (UnkStruct_02073B50 * param0, const VecFx32 * param1, const VecFx32 * param2, const MtxFx33 * param3) +void sub_02073BA4(UnkStruct_02073B50 *param0, const VecFx32 *param1, const VecFx32 *param2, const MtxFx33 *param3) { sub_0201CA74(¶m0->unk_00, param1, param3, param2); } -void sub_02073BB4 (UnkStruct_02073B50 * param0, const VecFx32 * param1) +void sub_02073BB4(UnkStruct_02073B50 *param0, const VecFx32 *param1) { sub_02073BA4(param0, param1, &Unk_020F0544, &Unk_020F0550); } -void sub_02073BC8 (UnkStruct_02073B50 * param0, const VecFx32 * param1, const VecFx32 * param2, const UnkStruct_ov5_02201C58 * param3) +void sub_02073BC8(UnkStruct_02073B50 *param0, const VecFx32 *param1, const VecFx32 *param2, const UnkStruct_ov5_02201C58 *param3) { MtxFx33 v0; @@ -325,7 +326,7 @@ void sub_02073BC8 (UnkStruct_02073B50 * param0, const VecFx32 * param1, const Ve sub_02073BA4(param0, param1, param2, &v0); } -void sub_02073BF0 (UnkStruct_02073B50 * param0, const VecFx32 * param1, const UnkStruct_ov5_02201C58 * param2) +void sub_02073BF0(UnkStruct_02073B50 *param0, const VecFx32 *param1, const UnkStruct_ov5_02201C58 *param2) { MtxFx33 v0; @@ -333,7 +334,7 @@ void sub_02073BF0 (UnkStruct_02073B50 * param0, const VecFx32 * param1, const Un sub_02073BA4(param0, param1, &Unk_020F0544, &v0); } -void sub_02073C1C (UnkStruct_02073B50 * param0, const VecFx32 * param1, const VecFx32 * param2, const MtxFx33 * param3) +void sub_02073C1C(UnkStruct_02073B50 *param0, const VecFx32 *param1, const VecFx32 *param2, const MtxFx33 *param3) { sub_0201CAB0(¶m0->unk_00, param1, param3, param2); } diff --git a/src/unk_020797C8.c b/src/unk_020797C8.c index c8a5756c9a..6680ee13dc 100644 --- a/src/unk_020797C8.c +++ b/src/unk_020797C8.c @@ -1,11 +1,12 @@ +#include "unk_020797C8.h" + #include #include #include "message.h" -#include "strbuf.h" -#include "savedata.h" #include "pokemon.h" -#include "unk_020797C8.h" +#include "savedata.h" +#include "strbuf.h" typedef struct PCBoxes { u32 unk_00; @@ -15,23 +16,23 @@ typedef struct PCBoxes { u8 unk_13C6; } PCBoxes; -static void sub_020797DC(PCBoxes * param0); +static void sub_020797DC(PCBoxes *param0); -void PCBoxes_Init (PCBoxes * param0) +void PCBoxes_Init(PCBoxes *param0) { sub_020797DC(param0); SaveData_SetFullSaveRequired(); } -u32 PCBoxes_SaveSize (void) +u32 PCBoxes_SaveSize(void) { return sizeof(PCBoxes); } -static void sub_020797DC (PCBoxes * param0) +static void sub_020797DC(PCBoxes *param0) { u32 v0, v1; - MessageLoader * v2; + MessageLoader *v2; for (v0 = 0; v0 < 18; v0++) { for (v1 = 0; v1 < (5 * 6); v1++) { @@ -61,7 +62,7 @@ static void sub_020797DC (PCBoxes * param0) param0->unk_00 = 0; } -BOOL sub_02079868 (PCBoxes * param0, BoxPokemon * param1) +BOOL sub_02079868(PCBoxes *param0, BoxPokemon *param1) { u32 v0; @@ -83,7 +84,7 @@ BOOL sub_02079868 (PCBoxes * param0, BoxPokemon * param1) return 0; } -BOOL sub_020798A0 (PCBoxes * param0, u32 param1, BoxPokemon * param2) +BOOL sub_020798A0(PCBoxes *param0, u32 param1, BoxPokemon *param2) { u32 v0; @@ -105,7 +106,7 @@ BOOL sub_020798A0 (PCBoxes * param0, u32 param1, BoxPokemon * param2) return 0; } -BOOL sub_02079914 (PCBoxes * param0, u32 param1, u32 param2, BoxPokemon * param3) +BOOL sub_02079914(PCBoxes *param0, u32 param1, u32 param2, BoxPokemon *param3) { sub_0207896C(param3); BoxPokemon_SetShayminForm(param3, 0); @@ -125,7 +126,7 @@ BOOL sub_02079914 (PCBoxes * param0, u32 param1, u32 param2, BoxPokemon * param3 return 0; } -void sub_02079968 (PCBoxes * param0, u32 param1, u32 param2) +void sub_02079968(PCBoxes *param0, u32 param1, u32 param2) { if (param1 == 0xffffffff) { param1 = param0->unk_00; @@ -139,12 +140,12 @@ void sub_02079968 (PCBoxes * param0, u32 param1, u32 param2) } } -u32 sub_0207999C (const PCBoxes * param0) +u32 sub_0207999C(const PCBoxes *param0) { return param0->unk_00; } -u32 PCBoxes_FirstEmptyBox (const PCBoxes * param0) +u32 PCBoxes_FirstEmptyBox(const PCBoxes *param0) { int v0, v1; @@ -166,10 +167,10 @@ u32 PCBoxes_FirstEmptyBox (const PCBoxes * param0) } } - return(18); + return 18; } -BOOL sub_020799F0 (const PCBoxes * param0, int * param1, int * param2) +BOOL sub_020799F0(const PCBoxes *param0, int *param1, int *param2) { int v0, v1; @@ -181,7 +182,7 @@ BOOL sub_020799F0 (const PCBoxes * param0, int * param1, int * param2) v1 = *param2; while (TRUE) { - for ( ; v1 < (5 * 6); v1++) { + for (; v1 < (5 * 6); v1++) { if (BoxPokemon_GetValue((BoxPokemon *)(&(param0->unk_04[v0][v1])), MON_DATA_SPECIES_EXISTS, NULL) == 0) { *param1 = v0; *param2 = v1; @@ -200,10 +201,10 @@ BOOL sub_020799F0 (const PCBoxes * param0, int * param1, int * param2) v1 = 0; } - return(18); + return 18; } -u32 sub_02079A50 (const PCBoxes * param0) +u32 sub_02079A50(const PCBoxes *param0) { int v0, v1; u32 v2; @@ -221,7 +222,7 @@ u32 sub_02079A50 (const PCBoxes * param0) return v2; } -void sub_02079A94 (PCBoxes * param0, u32 param1) +void sub_02079A94(PCBoxes *param0, u32 param1) { if (param1 < 18) { param0->unk_00 = param1; @@ -231,7 +232,7 @@ void sub_02079A94 (PCBoxes * param0, u32 param1) } } -u32 sub_02079AA8 (const PCBoxes * param0, u32 param1) +u32 sub_02079AA8(const PCBoxes *param0, u32 param1) { if (param1 < 18) { return param0->unk_13B4[param1]; @@ -241,7 +242,7 @@ u32 sub_02079AA8 (const PCBoxes * param0, u32 param1) } } -void sub_02079AC4 (PCBoxes * param0, u32 param1, u32 param2) +void sub_02079AC4(PCBoxes *param0, u32 param1, u32 param2) { if (param1 == 0xffffffff) { param1 = param0->unk_00; @@ -259,7 +260,7 @@ void sub_02079AC4 (PCBoxes * param0, u32 param1, u32 param2) } } -void sub_02079AF4 (const PCBoxes * param0, u32 param1, Strbuf *param2) +void sub_02079AF4(const PCBoxes *param0, u32 param1, Strbuf *param2) { if (param1 == 0xffffffff) { param1 = param0->unk_00; @@ -272,7 +273,7 @@ void sub_02079AF4 (const PCBoxes * param0, u32 param1, Strbuf *param2) } } -void sub_02079B24 (PCBoxes * param0, u32 param1, const Strbuf *param2) +void sub_02079B24(PCBoxes *param0, u32 param1, const Strbuf *param2) { if (param1 == 0xffffffff) { param1 = param0->unk_00; @@ -284,7 +285,7 @@ void sub_02079B24 (PCBoxes * param0, u32 param1, const Strbuf *param2) } } -u32 sub_02079B54 (const PCBoxes * param0, u32 param1) +u32 sub_02079B54(const PCBoxes *param0, u32 param1) { if (param1 == 0xffffffff) { param1 = param0->unk_00; @@ -308,7 +309,7 @@ u32 sub_02079B54 (const PCBoxes * param0, u32 param1) return 0; } -u32 sub_02079B98 (const PCBoxes * param0, u32 param1) +u32 sub_02079B98(const PCBoxes *param0, u32 param1) { if (param1 == 0xffffffff) { param1 = param0->unk_00; @@ -334,7 +335,7 @@ u32 sub_02079B98 (const PCBoxes * param0, u32 param1) return 0; } -u32 sub_02079BEC (const PCBoxes * param0) +u32 sub_02079BEC(const PCBoxes *param0) { u32 v0, v1; @@ -345,7 +346,7 @@ u32 sub_02079BEC (const PCBoxes * param0) return v0; } -u32 sub_02079C08 (const PCBoxes * param0, u32 param1, u32 param2, int param3, void * param4) +u32 sub_02079C08(const PCBoxes *param0, u32 param1, u32 param2, int param3, void *param4) { GF_ASSERT((param1 < 18) || (param1 == 0xffffffff)); GF_ASSERT(param2 < (5 * 6)); @@ -357,7 +358,7 @@ u32 sub_02079C08 (const PCBoxes * param0, u32 param1, u32 param2, int param3, vo return BoxPokemon_GetValue((BoxPokemon *)(¶m0->unk_04[param1][param2]), param3, param4); } -void sub_02079C50 (PCBoxes * param0, u32 param1, u32 param2, int param3, void * param4) +void sub_02079C50(PCBoxes *param0, u32 param1, u32 param2, int param3, void *param4) { GF_ASSERT((param1 < 18) || (param1 == 0xffffffff)); GF_ASSERT(param2 < (5 * 6)); @@ -370,10 +371,10 @@ void sub_02079C50 (PCBoxes * param0, u32 param1, u32 param2, int param3, void * SaveData_SetFullSaveRequired(); } -BoxPokemon * sub_02079C9C (const PCBoxes * param0, u32 param1, u32 param2) +BoxPokemon *sub_02079C9C(const PCBoxes *param0, u32 param1, u32 param2) { - GF_ASSERT(((param1 < 18) || (param1 == 0xffffffff))); - GF_ASSERT((param2 < (5 * 6))); + GF_ASSERT((param1 < 18) || (param1 == 0xffffffff)); + GF_ASSERT(param2 < (5 * 6)); if (param1 == 0xffffffff) { param1 = param0->unk_00; @@ -382,7 +383,7 @@ BoxPokemon * sub_02079C9C (const PCBoxes * param0, u32 param1, u32 param2) return (BoxPokemon *)&(param0->unk_04[param1][param2]); } -void sub_02079CD8 (PCBoxes * param0, u32 param1) +void sub_02079CD8(PCBoxes *param0, u32 param1) { GF_ASSERT(param1 < 8); @@ -390,14 +391,14 @@ void sub_02079CD8 (PCBoxes * param0, u32 param1) SaveData_SetFullSaveRequired(); } -BOOL sub_02079CFC (const PCBoxes * param0, u32 param1) +BOOL sub_02079CFC(const PCBoxes *param0, u32 param1) { GF_ASSERT(param1 < 8); return (param0->unk_13C6 & (1 << param1)) != 0; } -u32 sub_02079D20 (const PCBoxes * param0) +u32 sub_02079D20(const PCBoxes *param0) { u32 v0, v1; diff --git a/src/unk_0207A274.c b/src/unk_0207A274.c index 18276fd68b..8be1277cae 100644 --- a/src/unk_0207A274.c +++ b/src/unk_0207A274.c @@ -1,22 +1,23 @@ +#include "unk_0207A274.h" + #include #include #include "struct_decls/pokedexdata_decl.h" -#include "savedata.h" -#include "unk_0202631C.h" #include "pokemon.h" -#include "unk_0207A274.h" +#include "savedata.h" +#include "unk_0202631C.h" -u32 sub_0207A274 (SaveData * param0) +u32 sub_0207A274(SaveData *param0) { - PokedexData * v0; + PokedexData *v0; v0 = SaveData_Pokedex(param0); return sub_0207A280(v0); } -u32 sub_0207A280 (const PokedexData * param0) +u32 sub_0207A280(const PokedexData *param0) { BOOL v0; @@ -29,7 +30,7 @@ u32 sub_0207A280 (const PokedexData * param0) return 0; } -u32 sub_0207A294 (u32 param0, u32 param1) +u32 sub_0207A294(u32 param0, u32 param1) { if (param0 == 0) { return Pokemon_SinnohDexNumber(param1); diff --git a/src/unk_0207A2A8.c b/src/unk_0207A2A8.c index ce75b9b3ce..fb2fe037e3 100644 --- a/src/unk_0207A2A8.c +++ b/src/unk_0207A2A8.c @@ -1,33 +1,32 @@ +#include "unk_0207A2A8.h" + #include #include -#include "pokemon.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_02098700_decl.h" - +#include "struct_decls/struct_party_decl.h" #include "struct_defs/struct_0202610C.h" -#include "unk_0202602C.h" -#include "pokemon.h" #include "party.h" -#include "unk_0207A2A8.h" +#include "pokemon.h" +#include "unk_0202602C.h" #include "unk_02098700.h" -HeightWeightData * sub_0207A2A8 (int param0) +HeightWeightData *sub_0207A2A8(int param0) { - HeightWeightData * v0 = Pokedex_HeightWeightData(param0); + HeightWeightData *v0 = Pokedex_HeightWeightData(param0); Pokedex_HeightWeightData_Load(v0, 0, param0); return v0; } -void sub_0207A2C0 (HeightWeightData * param0) +void sub_0207A2C0(HeightWeightData *param0) { Pokedex_HeightWeightData_Release(param0); Pokedex_HeightWeightData_Free(param0); } -BOOL sub_0207A2D0 (const BattleRegulation * param0, Pokemon * param1, const HeightWeightData * param2) +BOOL sub_0207A2D0(const BattleRegulation *param0, Pokemon *param1, const HeightWeightData *param2) { u16 v0 = (u16)Pokemon_GetValue(param1, MON_DATA_SPECIES, NULL); int v1, v2, v3; @@ -97,9 +96,9 @@ BOOL sub_0207A2D0 (const BattleRegulation * param0, Pokemon * param1, const Heig return 1; } -int sub_0207A3AC (const BattleRegulation * param0, Party * param1, const HeightWeightData * param2, u8 * param3) +int sub_0207A3AC(const BattleRegulation *param0, Party *param1, const HeightWeightData *param2, u8 *param3) { - Pokemon * v0; + Pokemon *v0; int v1, v2 = 0, v3, v4, v5 = 0; u16 v6[6], v7[6]; @@ -172,7 +171,7 @@ int sub_0207A3AC (const BattleRegulation * param0, Party * param1, const HeightW return 0; } -static BOOL sub_0207A514 (u16 * param0, u16 * param1, u16 * param2, int param3, int param4, int param5, int param6) +static BOOL sub_0207A514(u16 *param0, u16 *param1, u16 *param2, int param3, int param4, int param5, int param6) { int v0 = param3; int v1; @@ -204,9 +203,9 @@ static BOOL sub_0207A514 (u16 * param0, u16 * param1, u16 * param2, int param3, return 0; } -int sub_0207A594 (const BattleRegulation * param0, Party * param1, const HeightWeightData * param2) +int sub_0207A594(const BattleRegulation *param0, Party *param1, const HeightWeightData *param2) { - Pokemon * v0; + Pokemon *v0; int v1, v2, v3, v4, v5 = 0; u16 v6[6], v7[6], v8[6]; int v9; diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c index 3b95af6b3f..7a83bd2c73 100644 --- a/src/unk_0207A6DC.c +++ b/src/unk_0207A6DC.c @@ -1,104 +1,104 @@ +#include "unk_0207A6DC.h" + #include #include #include "constants/battle.h" -#include "sys_task_manager.h" -#include "trainer_info.h" -#include "struct_defs/chatot_cry.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/battle_system.h" - +#include "struct_decls/struct_party_decl.h" +#include "struct_defs/chatot_cry.h" #include "struct_defs/struct_02027F8C.h" #include "struct_defs/struct_02039A58.h" #include "struct_defs/struct_0207A778.h" #include "struct_defs/struct_0207A81C.h" -#include "struct_defs/trainer_data.h" #include "struct_defs/struct_0207ACB4.h" #include "struct_defs/struct_0207AD40.h" +#include "struct_defs/trainer_data.h" -#include "unk_020021B0.h" -#include "sys_task.h" +#include "battle/battle_io.h" +#include "battle/ov16_0223DF00.h" + +#include "communication_system.h" #include "heap.h" +#include "party.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "trainer_info.h" +#include "unk_020021B0.h" #include "unk_02027F84.h" #include "unk_0202CC64.h" #include "unk_0202F1D4.h" #include "unk_02032798.h" -#include "communication_system.h" #include "unk_020363E8.h" -#include "party.h" -#include "unk_0207A6DC.h" -#include "battle/ov16_0223DF00.h" -#include "battle/battle_io.h" -void sub_0207A81C(BattleSystem * param0, int param1, int param2, void * param3, u8 param4); -BOOL sub_0207A8F4(UnkStruct_0207A778 * param0, u32 param1); -BOOL sub_0207A960(UnkStruct_0207A778 * param0); -BOOL sub_0207A988(UnkStruct_0207A778 * param0); -BOOL sub_0207A9CC(UnkStruct_0207A778 * param0); -BOOL sub_0207A9F8(UnkStruct_0207A778 * param0); -BOOL sub_0207AA38(UnkStruct_0207A778 * param0); -BOOL sub_0207AA5C(UnkStruct_0207A778 * param0); -BOOL sub_0207AAA0(UnkStruct_0207A778 * param0); -BOOL sub_0207AAC8(UnkStruct_0207A778 * param0); -BOOL sub_0207AB9C(UnkStruct_0207A778 * param0, int param1); -BOOL sub_0207ABD0(UnkStruct_0207A778 * param0, int param1, int param2); -BOOL sub_0207AC28(UnkStruct_0207A778 * param0, int param1); -BOOL sub_0207AC54(UnkStruct_0207A778 * param0, int param1, int param2); -void sub_0207A744(void * param0); -BOOL sub_0207AB58(UnkStruct_0207A778 * param0); -BOOL sub_0207AAFC(UnkStruct_0207A778 * param0); +void sub_0207A81C(BattleSystem *param0, int param1, int param2, void *param3, u8 param4); +BOOL sub_0207A8F4(UnkStruct_0207A778 *param0, u32 param1); +BOOL sub_0207A960(UnkStruct_0207A778 *param0); +BOOL sub_0207A988(UnkStruct_0207A778 *param0); +BOOL sub_0207A9CC(UnkStruct_0207A778 *param0); +BOOL sub_0207A9F8(UnkStruct_0207A778 *param0); +BOOL sub_0207AA38(UnkStruct_0207A778 *param0); +BOOL sub_0207AA5C(UnkStruct_0207A778 *param0); +BOOL sub_0207AAA0(UnkStruct_0207A778 *param0); +BOOL sub_0207AAC8(UnkStruct_0207A778 *param0); +BOOL sub_0207AB9C(UnkStruct_0207A778 *param0, int param1); +BOOL sub_0207ABD0(UnkStruct_0207A778 *param0, int param1, int param2); +BOOL sub_0207AC28(UnkStruct_0207A778 *param0, int param1); +BOOL sub_0207AC54(UnkStruct_0207A778 *param0, int param1, int param2); +void sub_0207A744(void *param0); +BOOL sub_0207AB58(UnkStruct_0207A778 *param0); +BOOL sub_0207AAFC(UnkStruct_0207A778 *param0); static int sub_0207A758(void); static int sub_0207A75C(void); static int sub_0207A764(void); static int sub_0207A76C(void); static int sub_0207A774(void); static int sub_0207AE64(void); -static u8 * sub_0207A778(int param0, void * param1, int param2); -static u8 * sub_0207A798(int param0, void * param1, int param2); -static u8 * sub_0207A7B8(int param0, void * param1, int param2); -static u8 * sub_0207A7D4(int param0, void * param1, int param2); -static u8 * sub_0207A7F4(int param0, void * param1, int param2); -static u8 * sub_0207A7FC(int param0, void * param1, int param2); -static u8 * sub_0207A804(int param0, void * param1, int param2); -static u8 * sub_0207A80C(int param0, void * param1, int param2); -static u8 * sub_0207A814(int param0, void * param1, int param2); -static void sub_0207A8A8(int param0, int param1, void * param2, void * param3); -static void sub_0207A934(int param0, int param1, void * param2, void * param3); -static void sub_0207A9BC(int param0, int param1, void * param2, void * param3); -static void sub_0207AA28(int param0, int param1, void * param2, void * param3); -static void sub_0207AA90(int param0, int param1, void * param2, void * param3); -static void sub_0207AB8C(int param0, int param1, void * param2, void * param3); -static void sub_0207AC18(int param0, int param1, void * param2, void * param3); -static void sub_0207ACA4(int param0, int param1, void * param2, void * param3); -static void sub_0207ADB4(int param0, int param1, void * param2, void * param3); -static void sub_0207ACB4(SysTask * param0, void * param1); -static void sub_0207AD40(SysTask * param0, void * param1); -static void sub_0207AE34(int param0, int param1, void * param2, void * param3); -static void sub_0207ADD4(TrainerInfo * param0, UnkStruct_02027F8C * param1, UnkStruct_02027F8C * param2); +static u8 *sub_0207A778(int param0, void *param1, int param2); +static u8 *sub_0207A798(int param0, void *param1, int param2); +static u8 *sub_0207A7B8(int param0, void *param1, int param2); +static u8 *sub_0207A7D4(int param0, void *param1, int param2); +static u8 *sub_0207A7F4(int param0, void *param1, int param2); +static u8 *sub_0207A7FC(int param0, void *param1, int param2); +static u8 *sub_0207A804(int param0, void *param1, int param2); +static u8 *sub_0207A80C(int param0, void *param1, int param2); +static u8 *sub_0207A814(int param0, void *param1, int param2); +static void sub_0207A8A8(int param0, int param1, void *param2, void *param3); +static void sub_0207A934(int param0, int param1, void *param2, void *param3); +static void sub_0207A9BC(int param0, int param1, void *param2, void *param3); +static void sub_0207AA28(int param0, int param1, void *param2, void *param3); +static void sub_0207AA90(int param0, int param1, void *param2, void *param3); +static void sub_0207AB8C(int param0, int param1, void *param2, void *param3); +static void sub_0207AC18(int param0, int param1, void *param2, void *param3); +static void sub_0207ACA4(int param0, int param1, void *param2, void *param3); +static void sub_0207ADB4(int param0, int param1, void *param2, void *param3); +static void sub_0207ACB4(SysTask *param0, void *param1); +static void sub_0207AD40(SysTask *param0, void *param1); +static void sub_0207AE34(int param0, int param1, void *param2, void *param3); +static void sub_0207ADD4(TrainerInfo *param0, UnkStruct_02027F8C *param1, UnkStruct_02027F8C *param2); static const CommCmdTable Unk_020F099C[] = { - {sub_0207ADB4, sub_02032944, NULL}, - {sub_0207A8A8, sub_02032944, NULL}, - {sub_0207A934, sub_0207A758, NULL}, - {sub_0207A9BC, sub_0207A75C, sub_0207A778}, - {sub_0207AA28, sub_0207A774, sub_0207A798}, - {sub_0207AA90, sub_0207A764, sub_0207A7B8}, - {sub_0207AB8C, sub_0207A76C, sub_0207A7D4}, - {sub_0207AC18, sub_0207A774, sub_0207A7F4}, - {sub_0207AC18, sub_0207A774, sub_0207A7FC}, - {sub_0207ACA4, sub_0207A764, sub_0207A804}, - {sub_0207ACA4, sub_0207A764, sub_0207A80C}, - {sub_0207AE34, sub_0207AE64, sub_0207A814} + { sub_0207ADB4, sub_02032944, NULL }, + { sub_0207A8A8, sub_02032944, NULL }, + { sub_0207A934, sub_0207A758, NULL }, + { sub_0207A9BC, sub_0207A75C, sub_0207A778 }, + { sub_0207AA28, sub_0207A774, sub_0207A798 }, + { sub_0207AA90, sub_0207A764, sub_0207A7B8 }, + { sub_0207AB8C, sub_0207A76C, sub_0207A7D4 }, + { sub_0207AC18, sub_0207A774, sub_0207A7F4 }, + { sub_0207AC18, sub_0207A774, sub_0207A7FC }, + { sub_0207ACA4, sub_0207A764, sub_0207A804 }, + { sub_0207ACA4, sub_0207A764, sub_0207A80C }, + { sub_0207AE34, sub_0207AE64, sub_0207A814 } }; -void sub_0207A6DC (void * param0) +void sub_0207A6DC(void *param0) { int v0 = sizeof(Unk_020F099C) / sizeof(CommCmdTable); - BattleSystem * v1; - UnkStruct_0207ACB4 * v2; - UnkStruct_0207AD40 * v3; + BattleSystem *v1; + UnkStruct_0207ACB4 *v2; + UnkStruct_0207AD40 *v3; v1 = (BattleSystem *)param0; @@ -123,40 +123,40 @@ void sub_0207A6DC (void * param0) SysTask_Start(sub_0207AD40, v3, 0); } -void sub_0207A744 (void * param0) +void sub_0207A744(void *param0) { int v0 = sizeof(Unk_020F099C) / sizeof(CommCmdTable); CommCmd_Init(Unk_020F099C, v0, param0); } -static int sub_0207A758 (void) +static int sub_0207A758(void) { return 4; } -static int sub_0207A75C (void) +static int sub_0207A75C(void) { return TrainerInfo_Size(); } -static int sub_0207A764 (void) +static int sub_0207A764(void) { return Party_SaveSize(); } -static int sub_0207A76C (void) +static int sub_0207A76C(void) { return 1000; } -static int sub_0207A774 (void) +static int sub_0207A774(void) { return sizeof(TrainerData); } -static u8 * sub_0207A778 (int param0, void * param1, int param2) +static u8 *sub_0207A778(int param0, void *param1, int param2) { - UnkStruct_0207A778 * v0 = param1; + UnkStruct_0207A778 *v0 = param1; if (v0->unk_00->battleType & BATTLE_TYPE_FRONTIER) { return (u8 *)v0->unk_00->unk_D0[param0 * 2]; @@ -165,9 +165,9 @@ static u8 * sub_0207A778 (int param0, void * param1, int param2) } } -static u8 * sub_0207A798 (int param0, void * param1, int param2) +static u8 *sub_0207A798(int param0, void *param1, int param2) { - UnkStruct_0207A778 * v0 = param1; + UnkStruct_0207A778 *v0 = param1; if (v0->unk_00->battleType & BATTLE_TYPE_FRONTIER) { return (u8 *)&v0->unk_00->trainerData[param0 * 2]; @@ -176,9 +176,9 @@ static u8 * sub_0207A798 (int param0, void * param1, int param2) } } -static u8 * sub_0207A7B8 (int param0, void * param1, int param2) +static u8 *sub_0207A7B8(int param0, void *param1, int param2) { - UnkStruct_0207A778 * v0 = param1; + UnkStruct_0207A778 *v0 = param1; if (v0->unk_00->battleType & BATTLE_TYPE_FRONTIER) { return (u8 *)v0->unk_00->parties[param0 * 2]; @@ -187,9 +187,9 @@ static u8 * sub_0207A7B8 (int param0, void * param1, int param2) } } -static u8 * sub_0207A7D4 (int param0, void * param1, int param2) +static u8 *sub_0207A7D4(int param0, void *param1, int param2) { - UnkStruct_0207A778 * v0 = param1; + UnkStruct_0207A778 *v0 = param1; if (v0->unk_00->battleType & BATTLE_TYPE_FRONTIER) { return (u8 *)v0->unk_00->unk_F0[param0 * 2]; @@ -198,44 +198,44 @@ static u8 * sub_0207A7D4 (int param0, void * param1, int param2) } } -static u8 * sub_0207A7F4 (int param0, void * param1, int param2) +static u8 *sub_0207A7F4(int param0, void *param1, int param2) { - UnkStruct_0207A778 * v0 = param1; + UnkStruct_0207A778 *v0 = param1; return (u8 *)&v0->unk_00->trainerData[1]; } -static u8 * sub_0207A7FC (int param0, void * param1, int param2) +static u8 *sub_0207A7FC(int param0, void *param1, int param2) { - UnkStruct_0207A778 * v0 = param1; + UnkStruct_0207A778 *v0 = param1; return (u8 *)&v0->unk_00->trainerData[3]; } -static u8 * sub_0207A804 (int param0, void * param1, int param2) +static u8 *sub_0207A804(int param0, void *param1, int param2) { - UnkStruct_0207A778 * v0 = param1; + UnkStruct_0207A778 *v0 = param1; return (u8 *)v0->unk_00->parties[1]; } -static u8 * sub_0207A80C (int param0, void * param1, int param2) +static u8 *sub_0207A80C(int param0, void *param1, int param2) { - UnkStruct_0207A778 * v0 = param1; + UnkStruct_0207A778 *v0 = param1; return (u8 *)v0->unk_00->parties[3]; } -static u8 * sub_0207A814 (int param0, void * param1, int param2) +static u8 *sub_0207A814(int param0, void *param1, int param2) { - UnkStruct_0207A778 * v0 = param1; + UnkStruct_0207A778 *v0 = param1; return (u8 *)v0->unk_10[param0]; } -void sub_0207A81C (BattleSystem * param0, int param1, int param2, void * param3, u8 param4) +void sub_0207A81C(BattleSystem *param0, int param1, int param2, void *param3, u8 param4) { int v0; - UnkStruct_0207A81C * v1; - u8 * v2; - u8 * v3; - u16 * v4; - u16 * v5; + UnkStruct_0207A81C *v1; + u8 *v2; + u8 *v3; + u16 *v4; + u16 *v5; v1 = (UnkStruct_0207A81C *)Heap_AllocFromHeap(5, sizeof(UnkStruct_0207A81C)); v3 = ov16_0223E06C(param0); @@ -268,14 +268,14 @@ void sub_0207A81C (BattleSystem * param0, int param1, int param2, void * param3, Heap_FreeToHeap(v1); } -static void sub_0207A8A8 (int param0, int param1, void * param2, void * param3) +static void sub_0207A8A8(int param0, int param1, void *param2, void *param3) { - BattleSystem * v0 = (BattleSystem *)param3; + BattleSystem *v0 = (BattleSystem *)param3; int v1; - u8 * v2 = (u8 *)param2; - u8 * v3 = ov16_0223E074(v0); - u16 * v4 = ov16_0223E0B0(v0); - u16 * v5 = ov16_0223E0BC(v0); + u8 *v2 = (u8 *)param2; + u8 *v3 = ov16_0223E074(v0); + u16 *v4 = ov16_0223E0B0(v0); + u16 *v5 = ov16_0223E0BC(v0); if (v4[0] + param1 + 1 > 0x1000) { v5[0] = v4[0]; @@ -288,9 +288,9 @@ static void sub_0207A8A8 (int param0, int param1, void * param2, void * param3) } } -BOOL sub_0207A8F4 (UnkStruct_0207A778 * param0, u32 param1) +BOOL sub_0207A8F4(UnkStruct_0207A778 *param0, u32 param1) { - Party * v0; + Party *v0; if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -303,18 +303,18 @@ BOOL sub_0207A8F4 (UnkStruct_0207A778 * param0, u32 param1) return CommSys_SendData(24, (void *)¶m1, 4); } -static void sub_0207A934 (int param0, int param1, void * param2, void * param3) +static void sub_0207A934(int param0, int param1, void *param2, void *param3) { - UnkStruct_0207A778 * v0 = (UnkStruct_0207A778 *)param3; + UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3; v0->unk_00->unk_154[param0] = *((u32 *)param2); sub_0202FAA8(param0, v0->unk_00->unk_154[param0]); v0->unk_1020++; } -BOOL sub_0207A960 (UnkStruct_0207A778 * param0) +BOOL sub_0207A960(UnkStruct_0207A778 *param0) { - TrainerInfo * v0; + TrainerInfo *v0; if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -326,7 +326,7 @@ BOOL sub_0207A960 (UnkStruct_0207A778 * param0) return 1; } -BOOL sub_0207A988 (UnkStruct_0207A778 * param0) +BOOL sub_0207A988(UnkStruct_0207A778 *param0) { if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -339,15 +339,15 @@ BOOL sub_0207A988 (UnkStruct_0207A778 * param0) return CommSys_SendDataHuge(25, (void *)¶m0->unk_20[0], TrainerInfo_Size()); } -static void sub_0207A9BC (int param0, int param1, void * param2, void * param3) +static void sub_0207A9BC(int param0, int param1, void *param2, void *param3) { - UnkStruct_0207A778 * v0 = (UnkStruct_0207A778 *)param3; + UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3; v0->unk_1020++; } -BOOL sub_0207A9CC (UnkStruct_0207A778 * param0) +BOOL sub_0207A9CC(UnkStruct_0207A778 *param0) { - TrainerData * v0; + TrainerData *v0; if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -359,7 +359,7 @@ BOOL sub_0207A9CC (UnkStruct_0207A778 * param0) return 1; } -BOOL sub_0207A9F8 (UnkStruct_0207A778 * param0) +BOOL sub_0207A9F8(UnkStruct_0207A778 *param0) { if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -372,15 +372,15 @@ BOOL sub_0207A9F8 (UnkStruct_0207A778 * param0) return CommSys_SendDataHuge(26, (void *)¶m0->unk_20[0], sizeof(TrainerData)); } -static void sub_0207AA28 (int param0, int param1, void * param2, void * param3) +static void sub_0207AA28(int param0, int param1, void *param2, void *param3) { - UnkStruct_0207A778 * v0 = (UnkStruct_0207A778 *)param3; + UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3; v0->unk_1020++; } -BOOL sub_0207AA38 (UnkStruct_0207A778 * param0) +BOOL sub_0207AA38(UnkStruct_0207A778 *param0) { - Party * v0; + Party *v0; if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -392,7 +392,7 @@ BOOL sub_0207AA38 (UnkStruct_0207A778 * param0) return 1; } -BOOL sub_0207AA5C (UnkStruct_0207A778 * param0) +BOOL sub_0207AA5C(UnkStruct_0207A778 *param0) { if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -405,16 +405,16 @@ BOOL sub_0207AA5C (UnkStruct_0207A778 * param0) return CommSys_SendDataHuge(27, (void *)¶m0->unk_20[0], Party_SaveSize()); } -static void sub_0207AA90 (int param0, int param1, void * param2, void * param3) +static void sub_0207AA90(int param0, int param1, void *param2, void *param3) { - UnkStruct_0207A778 * v0 = (UnkStruct_0207A778 *)param3; + UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3; v0->unk_1020++; } -BOOL sub_0207AAA0 (UnkStruct_0207A778 * param0) +BOOL sub_0207AAA0(UnkStruct_0207A778 *param0) { - ChatotCry * v0; + ChatotCry *v0; if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -426,7 +426,7 @@ BOOL sub_0207AAA0 (UnkStruct_0207A778 * param0) return 1; } -BOOL sub_0207AAC8 (UnkStruct_0207A778 * param0) +BOOL sub_0207AAC8(UnkStruct_0207A778 *param0) { if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -439,10 +439,10 @@ BOOL sub_0207AAC8 (UnkStruct_0207A778 * param0) return CommSys_SendDataHuge(28, (void *)¶m0->unk_20[0], 1000); } -BOOL sub_0207AAFC (UnkStruct_0207A778 * param0) +BOOL sub_0207AAFC(UnkStruct_0207A778 *param0) { - UnkStruct_02027F8C * v0; - TrainerInfo * v1; + UnkStruct_02027F8C *v0; + TrainerInfo *v1; if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -469,7 +469,7 @@ BOOL sub_0207AAFC (UnkStruct_0207A778 * param0) return 1; } -BOOL sub_0207AB58 (UnkStruct_0207A778 * param0) +BOOL sub_0207AB58(UnkStruct_0207A778 *param0) { if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -482,15 +482,15 @@ BOOL sub_0207AB58 (UnkStruct_0207A778 * param0) return CommSys_SendDataHuge(33, (void *)param0->unk_20, 1000); } -static void sub_0207AB8C (int param0, int param1, void * param2, void * param3) +static void sub_0207AB8C(int param0, int param1, void *param2, void *param3) { - UnkStruct_0207A778 * v0 = (UnkStruct_0207A778 *)param3; + UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3; v0->unk_1020++; } -BOOL sub_0207AB9C (UnkStruct_0207A778 * param0, int param1) +BOOL sub_0207AB9C(UnkStruct_0207A778 *param0, int param1) { - TrainerData * v0; + TrainerData *v0; if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -502,7 +502,7 @@ BOOL sub_0207AB9C (UnkStruct_0207A778 * param0, int param1) return 1; } -BOOL sub_0207ABD0 (UnkStruct_0207A778 * param0, int param1, int param2) +BOOL sub_0207ABD0(UnkStruct_0207A778 *param0, int param1, int param2) { if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -519,15 +519,15 @@ BOOL sub_0207ABD0 (UnkStruct_0207A778 * param0, int param1, int param2) } } -static void sub_0207AC18 (int param0, int param1, void * param2, void * param3) +static void sub_0207AC18(int param0, int param1, void *param2, void *param3) { - UnkStruct_0207A778 * v0 = (UnkStruct_0207A778 *)param3; + UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3; v0->unk_1020++; } -BOOL sub_0207AC28 (UnkStruct_0207A778 * param0, int param1) +BOOL sub_0207AC28(UnkStruct_0207A778 *param0, int param1) { - Party * v0; + Party *v0; if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -539,7 +539,7 @@ BOOL sub_0207AC28 (UnkStruct_0207A778 * param0, int param1) return 1; } -BOOL sub_0207AC54 (UnkStruct_0207A778 * param0, int param1, int param2) +BOOL sub_0207AC54(UnkStruct_0207A778 *param0, int param1, int param2) { if (CommSys_SendRingRemainingSize() != 264) { return 0; @@ -556,19 +556,19 @@ BOOL sub_0207AC54 (UnkStruct_0207A778 * param0, int param1, int param2) } } -static void sub_0207ACA4 (int param0, int param1, void * param2, void * param3) +static void sub_0207ACA4(int param0, int param1, void *param2, void *param3) { - UnkStruct_0207A778 * v0 = (UnkStruct_0207A778 *)param3; + UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3; v0->unk_1020++; } -void sub_0207ACB4 (SysTask * param0, void * param1) +void sub_0207ACB4(SysTask *param0, void *param1) { - UnkStruct_0207ACB4 * v0 = (UnkStruct_0207ACB4 *)param1; - u8 * v1; - u16 * v2; - u16 * v3; - u16 * v4; + UnkStruct_0207ACB4 *v0 = (UnkStruct_0207ACB4 *)param1; + u8 *v1; + u16 *v2; + u16 *v3; + u16 *v4; int v5; v1 = ov16_0223E06C(v0->unk_00); @@ -605,13 +605,13 @@ void sub_0207ACB4 (SysTask * param0, void * param1) } } -void sub_0207AD40 (SysTask * param0, void * param1) +void sub_0207AD40(SysTask *param0, void *param1) { - UnkStruct_0207AD40 * v0 = (UnkStruct_0207AD40 *)param1; - u8 * v1; - u16 * v2; - u16 * v3; - u16 * v4; + UnkStruct_0207AD40 *v0 = (UnkStruct_0207AD40 *)param1; + u8 *v1; + u16 *v2; + u16 *v3; + u16 *v4; int v5; v1 = ov16_0223E074(v0->unk_00); @@ -643,16 +643,16 @@ void sub_0207AD40 (SysTask * param0, void * param1) } } -static void sub_0207ADB4 (int param0, int param1, void * param2, void * param3) +static void sub_0207ADB4(int param0, int param1, void *param2, void *param3) { - BattleSystem * v0 = (BattleSystem *)param3; + BattleSystem *v0 = (BattleSystem *)param3; ov16_0223F338(v0, 255); ov16_0223F344(v0, 255); ov16_0223F350(v0, 1); } -static void sub_0207ADD4 (TrainerInfo * param0, UnkStruct_02027F8C * param1, UnkStruct_02027F8C * param2) +static void sub_0207ADD4(TrainerInfo *param0, UnkStruct_02027F8C *param1, UnkStruct_02027F8C *param2) { int v0; @@ -671,9 +671,9 @@ static void sub_0207ADD4 (TrainerInfo * param0, UnkStruct_02027F8C * param1, Unk } } -void sub_0207AE34 (int param0, int param1, void * param2, void * param3) +void sub_0207AE34(int param0, int param1, void *param2, void *param3) { - UnkStruct_0207A778 * v0 = (UnkStruct_0207A778 *)param3; + UnkStruct_0207A778 *v0 = (UnkStruct_0207A778 *)param3; if (CommSys_CurNetId() != param0) { sub_02027FEC(v0->unk_00->unk_124, (UnkStruct_02027F8C *)param2, 1, 5); @@ -682,7 +682,7 @@ void sub_0207AE34 (int param0, int param1, void * param2, void * param3) v0->unk_1020++; } -static int sub_0207AE64 (void) +static int sub_0207AE64(void) { return 136; } diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index f1ab62d077..567c87c9ff 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -1,83 +1,81 @@ +#include "unk_0207AE68.h" + #include #include -#include "core_sys.h" - -#include "struct_decls/struct_02018340_decl.h" -#include "sys_task_manager.h" -#include "strbuf.h" #include "struct_decls/pokedexdata_decl.h" +#include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_0202CD88_decl.h" -#include "pokemon.h" -#include "struct_decls/struct_party_decl.h" #include "struct_decls/struct_0207AE68_decl.h" - -#include "constdata/const_020F410C.h" - -#include "struct_defs/sprite_animation_frame.h" +#include "struct_decls/struct_party_decl.h" #include "struct_defs/archived_sprite.h" +#include "struct_defs/pokemon_summary.h" +#include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0201D738.h" #include "struct_defs/struct_0202818C.h" #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0207AE68_t.h" #include "struct_defs/struct_0207C894.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "bag.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "poketch_data.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" -#include "message.h" -#include "string_template.h" -#include "sys_task.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_0201567C.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_0202419C.h" #include "unk_020241F0.h" #include "unk_02024220.h" #include "unk_0202631C.h" -#include "game_options.h" #include "unk_02028124.h" #include "unk_0202CD50.h" #include "unk_020393C8.h" -#include "poketch_data.h" -#include "pokemon.h" -#include "party.h" -#include "unk_0207AE68.h" #include "unk_0207C63C.h" -#include "bag.h" -#include "pokemon_summary_app.h" -UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, Options * param3, int param4, PokedexData * param5, Bag * param6, UnkStruct_0202CD88 * param7, PoketchData *poketchData, int param9, int param10, int param11); -static void sub_0207B0A0(SysTask * param0, void * param1); -BOOL sub_0207B0D0(UnkStruct_0207AE68 * param0); -void sub_0207B0E0(UnkStruct_0207AE68 * param0); -static void sub_0207B180(UnkStruct_0207AE68 * param0); -static void sub_0207C028(UnkStruct_0207AE68 * param0); -static void sub_0207C1CC(UnkStruct_0207AE68 * param0, BGL * param1); -static void sub_0207C460(BGL * param0); -static void sub_0207C498(UnkStruct_0207AE68 * param0); -static void sub_0207C520(void * param0); -static u8 sub_0207C584(UnkStruct_0207AE68 * param0, int param1); -static BOOL sub_0207C5CC(UnkStruct_0201D738 * param0, u16 param1); -static void sub_0207C624(UnkStruct_0207AE68 * param0); +#include "constdata/const_020F410C.h" + +UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, PokedexData *param5, Bag *param6, UnkStruct_0202CD88 *param7, PoketchData *poketchData, int param9, int param10, int param11); +static void sub_0207B0A0(SysTask *param0, void *param1); +BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0); +void sub_0207B0E0(UnkStruct_0207AE68 *param0); +static void sub_0207B180(UnkStruct_0207AE68 *param0); +static void sub_0207C028(UnkStruct_0207AE68 *param0); +static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BGL *param1); +static void sub_0207C460(BGL *param0); +static void sub_0207C498(UnkStruct_0207AE68 *param0); +static void sub_0207C520(void *param0); +static u8 sub_0207C584(UnkStruct_0207AE68 *param0, int param1); +static BOOL sub_0207C5CC(UnkStruct_0201D738 *param0, u16 param1); +static void sub_0207C624(UnkStruct_0207AE68 *param0); static const UnkStruct_ov61_0222C884 Unk_020F0A30 = { 0x2, @@ -95,9 +93,9 @@ static const u8 Unk_020F0A2C[] = { 0x8 }; -UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, Pokemon * param1, int param2, Options * param3, int param4, PokedexData * param5, Bag * param6, UnkStruct_0202CD88 * param7, PoketchData *poketchData, int param9, int param10, int param11) +UnkStruct_0207AE68 *sub_0207AE68(Party *param0, Pokemon *param1, int param2, Options *param3, int param4, PokedexData *param5, Bag *param6, UnkStruct_0202CD88 *param7, PoketchData *poketchData, int param9, int param10, int param11) { - UnkStruct_0207AE68 * v0; + UnkStruct_0207AE68 *v0; ArchivedSprite v1; int v2; @@ -159,7 +157,7 @@ UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, Pokemon * param1, int param2, v0->unk_7C = param10; sub_0207C498(v0); - sub_02003178(v0->unk_14, ((0x1 | 0x2 | 0x4 | 0x8)), 0xffff, 1, 16, 0, 0x0); + sub_02003178(v0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 16, 0, 0x0); sub_0200872C(v0->unk_18, 16, 0, 0, 0x0); v0->unk_58 = sub_0201567C(v0->unk_14, 0, 0xb, param11); @@ -172,9 +170,9 @@ UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, Pokemon * param1, int param2, return v0; } -static void sub_0207B0A0 (SysTask * param0, void * param1) +static void sub_0207B0A0(SysTask *param0, void *param1) { - UnkStruct_0207AE68 * v0 = (UnkStruct_0207AE68 *)param1; + UnkStruct_0207AE68 *v0 = (UnkStruct_0207AE68 *)param1; sub_0207B180(v0); sub_02007768(v0->unk_18); @@ -186,12 +184,12 @@ static void sub_0207B0A0 (SysTask * param0, void * param1) } } -BOOL sub_0207B0D0 (UnkStruct_0207AE68 * param0) +BOOL sub_0207B0D0(UnkStruct_0207AE68 *param0) { return param0->unk_67 == 1; } -void sub_0207B0E0 (UnkStruct_0207AE68 * param0) +void sub_0207B0E0(UnkStruct_0207AE68 *param0) { int v0; @@ -219,7 +217,7 @@ void sub_0207B0E0 (UnkStruct_0207AE68 * param0) sub_02002AC8(0); } -static void sub_0207B180 (UnkStruct_0207AE68 * param0) +static void sub_0207B180(UnkStruct_0207AE68 *param0) { if (param0->unk_70) { if ((param0->unk_70 & 1) == 0) { @@ -248,7 +246,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) } if ((param0->unk_7C & 0x1) && (param0->unk_64 == 8) && (gCoreSys.pressedKeys & PAD_BUTTON_B)) { - sub_02003178(param0->unk_14, ((0x1 | 0x2 | 0x4 | 0x8)), (0xc00 ^ 0xffff), 0, 0, 16, 0x7fff); + sub_02003178(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), (0xc00 ^ 0xffff), 0, 0, 16, 0x7fff); param0->unk_64 = 41; } @@ -357,7 +355,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) sub_0207C8C4(param0->unk_30, 5); sub_0207C8C4(param0->unk_30, 6); sub_0207C8C4(param0->unk_30, 10); - sub_02003178(param0->unk_14, ((0x1 | 0x2 | 0x4 | 0x8)), (0xc00 ^ 0xffff), 2, 0, 16, 0x7fff); + sub_02003178(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), (0xc00 ^ 0xffff), 2, 0, 16, 0x7fff); sub_02007DEC(param0->unk_1C[0], 12, 0x0); sub_02007DEC(param0->unk_1C[0], 13, 0x0); sub_02007DEC(param0->unk_1C[1], 12, 0x100); @@ -377,7 +375,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) if (sub_0200384C(param0->unk_14) == 0) { if (--param0->unk_66 == 0) { sub_0207C8C4(param0->unk_30, 12); - sub_02003178(param0->unk_14, ((0x1 | 0x2 | 0x4 | 0x8)), (0xc00 ^ 0xffff), 4, 16, 0, 0x7fff); + sub_02003178(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), (0xc00 ^ 0xffff), 4, 16, 0, 0x7fff); sub_0200872C(param0->unk_18, 16, 0, 3, 0x7fff); Sound_PlayEffect(1532); param0->unk_64++; @@ -427,8 +425,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) } } break; - case 13: - { + case 13: { u16 v3; switch (Pokemon_LevelUpMove(param0->unk_28, ¶m0->unk_68, &v3)) { @@ -449,8 +446,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) param0->unk_64 = 37; break; } - } - break; + } break; case 14: StringTemplate_SetNickname(param0->unk_0C, 0, Pokemon_GetBoxPokemon(param0->unk_28)); StringTemplate_SetMoveName(param0->unk_0C, 1, param0->unk_6C); @@ -490,7 +486,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) switch (sub_02002114(param0->unk_40, param0->unk_5C)) { case 0: param0->unk_64 = 22; - sub_02003178(param0->unk_14, ((0x1 | 0x2 | 0x4 | 0x8)), 0xffff, 1, 0, 16, 0x0); + sub_02003178(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); sub_0200872C(param0->unk_18, 0, 16, 0, 0x0); break; case 0xfffffffe: @@ -527,7 +523,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) sub_02007DEC(param0->unk_1C[1], 6, 0); sub_020089A0(param0->unk_1C[0]); sub_020089A0(param0->unk_1C[1]); - sub_02003178(param0->unk_14, ((0x1 | 0x2 | 0x4 | 0x8)), 0xffff, 1, 16, 0, 0x0); + sub_02003178(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 16, 0, 0x0); sub_0200872C(param0->unk_18, 16, 0, 0, 0x0); sub_02039734(); param0->unk_64++; @@ -618,7 +614,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) } break; case 39: - sub_02003178(param0->unk_14, ((0x1 | 0x2 | 0x4 | 0x8)), 0xffff, 1, 0, 16, 0x0); + sub_02003178(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); sub_0200872C(param0->unk_18, 0, 16, 0, 0x0); param0->unk_64++; break; @@ -636,7 +632,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) sub_02007DEC(param0->unk_1C[1], 12, 0x0); sub_02007DEC(param0->unk_1C[1], 13, 0x0); sub_02007DEC(param0->unk_1C[1], 6, 1); - sub_02003178(param0->unk_14, ((0x1 | 0x2 | 0x4 | 0x8)), (0xc00 ^ 0xffff), 0, 16, 0, 0x7fff); + sub_02003178(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), (0xc00 ^ 0xffff), 0, 16, 0, 0x7fff); sub_0200872C(param0->unk_18, 16, 0, 0, 0x7fff); param0->unk_72 = 0; param0->unk_73 = 0; @@ -674,7 +670,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) case 44: if (Message_Printing(param0->unk_65) == 0) { if (--param0->unk_66 == 0) { - sub_02003178(param0->unk_14, ((0x1 | 0x2 | 0x4 | 0x8)), 0xffff, 1, 0, 16, 0x0); + sub_02003178(param0->unk_14, (0x1 | 0x2 | 0x4 | 0x8), 0xffff, 1, 0, 16, 0x0); sub_0200872C(param0->unk_18, 0, 16, 0, 0x0); param0->unk_64++; } @@ -688,7 +684,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) } } -static void sub_0207C028 (UnkStruct_0207AE68 * param0) +static void sub_0207C028(UnkStruct_0207AE68 *param0) { int v0; @@ -697,9 +693,9 @@ static void sub_0207C028 (UnkStruct_0207AE68 * param0) case 14: if (Bag_GetItemQuantity(param0->unk_4C, 4, param0->unk_5C) && (Party_GetCurrentCount(param0->unk_24) < 6)) { { - Pokemon * v1; + Pokemon *v1; int v2; - UnkStruct_0202818C * v3; + UnkStruct_0202818C *v3; UnkStruct_0202CA28 v4; v1 = Pokemon_New(param0->unk_5C); @@ -764,7 +760,7 @@ static void sub_0207C028 (UnkStruct_0207AE68 * param0) } } -static void sub_0207C1CC (UnkStruct_0207AE68 * param0, BGL * param1) +static void sub_0207C1CC(UnkStruct_0207AE68 *param0, BGL *param1) { GXLayers_DisableEngineALayers(); @@ -816,7 +812,7 @@ static void sub_0207C1CC (UnkStruct_0207AE68 * param0, BGL * param1) 0, 0, 0, - 0 + 0, }, { 0, @@ -831,7 +827,7 @@ static void sub_0207C1CC (UnkStruct_0207AE68 * param0, BGL * param1) 1, 0, 0, - 0 + 0, }, { 0, @@ -846,7 +842,7 @@ static void sub_0207C1CC (UnkStruct_0207AE68 * param0, BGL * param1) 3, 0, 0, - 0 + 0, }, }; @@ -876,7 +872,7 @@ static void sub_0207C1CC (UnkStruct_0207AE68 * param0, BGL * param1) 0, 0, 0, - 0 + 0, }, }; @@ -931,7 +927,7 @@ static void sub_0207C1CC (UnkStruct_0207AE68 * param0, BGL * param1) SetMainCallback(sub_0207C520, param0); } -static void sub_0207C460 (BGL * param0) +static void sub_0207C460(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); @@ -941,10 +937,10 @@ static void sub_0207C460 (BGL * param0) sub_02019044(param0, 4); } -static void sub_0207C498 (UnkStruct_0207AE68 * param0) +static void sub_0207C498(UnkStruct_0207AE68 *param0) { ArchivedSprite v0; - Pokemon * v1; + Pokemon *v1; Pokemon_BuildArchivedSprite(&v0, param0->unk_28, 2); @@ -963,9 +959,9 @@ static void sub_0207C498 (UnkStruct_0207AE68 * param0) sub_02007DEC(param0->unk_1C[1], 13, 0x0); } -static void sub_0207C520 (void * param0) +static void sub_0207C520(void *param0) { - UnkStruct_0207AE68 * v0 = (UnkStruct_0207AE68 *)param0; + UnkStruct_0207AE68 *v0 = (UnkStruct_0207AE68 *)param0; G2_SetWnd0Position(v0->unk_72, v0->unk_73, v0->unk_74, v0->unk_75); @@ -977,9 +973,9 @@ static void sub_0207C520 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static u8 sub_0207C584 (UnkStruct_0207AE68 * param0, int param1) +static u8 sub_0207C584(UnkStruct_0207AE68 *param0, int param1) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param0->unk_08, param1); @@ -990,7 +986,7 @@ static u8 sub_0207C584 (UnkStruct_0207AE68 * param0, int param1) return PrintStringSimple(param0->unk_04, 1, param0->unk_10, 0, 0, Options_TextFrameDelay(param0->unk_2C), sub_0207C5CC); } -static BOOL sub_0207C5CC (UnkStruct_0201D738 * param0, u16 param1) +static BOOL sub_0207C5CC(UnkStruct_0201D738 *param0, u16 param1) { BOOL v0; @@ -1019,7 +1015,7 @@ static BOOL sub_0207C5CC (UnkStruct_0201D738 * param0, u16 param1) return v0; } -static void sub_0207C624 (UnkStruct_0207AE68 * param0) +static void sub_0207C624(UnkStruct_0207AE68 *param0) { param0->unk_38 = OverlayManager_New(&Unk_020F410C, param0->unk_3C, param0->unk_5C); } diff --git a/src/unk_0207C63C.c b/src/unk_0207C63C.c index b694270e70..78a7926ed0 100644 --- a/src/unk_0207C63C.c +++ b/src/unk_0207C63C.c @@ -3,38 +3,36 @@ #include #include "struct_decls/struct_02014014_decl.h" - #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_0207C894.h" #include "struct_defs/struct_0207C8C4.h" +#include "camera.h" +#include "gx_layers.h" +#include "heap.h" #include "spl.h" - #include "unk_02014000.h" -#include "heap.h" -#include "gx_layers.h" -#include "camera.h" #include "unk_0202419C.h" #include "unk_02024220.h" void sub_0207C63C(void); void sub_0207C664(void); -GenericPointerData * sub_0207C690(int param0); +GenericPointerData *sub_0207C690(int param0); void sub_0207C6AC(void); void sub_0207C730(void); void sub_0207C770(void); -UnkStruct_0207C8C4 * sub_0207C894(UnkStruct_0207C894 * param0); -void sub_0207C8C4(UnkStruct_0207C8C4 * param0, int param1); -BOOL sub_0207C8E0(UnkStruct_0207C8C4 * param0); -void sub_0207C8F4(UnkStruct_0207C8C4 * param0); +UnkStruct_0207C8C4 *sub_0207C894(UnkStruct_0207C894 *param0); +void sub_0207C8C4(UnkStruct_0207C8C4 *param0, int param1); +BOOL sub_0207C8E0(UnkStruct_0207C8C4 *param0); +void sub_0207C8F4(UnkStruct_0207C8C4 *param0); static u32 sub_0207C794(u32 param0, BOOL param1); static u32 sub_0207C7B0(u32 param0, BOOL param1); -static UnkStruct_02014014 * sub_0207C7CC(int param0); -static UnkStruct_02014014 * sub_0207C814(int param0, int param1, int param2); -static void sub_0207C83C(UnkStruct_02014014 * param0); -static void sub_0207C854(UnkSPLStruct6 * param0); +static UnkStruct_02014014 *sub_0207C7CC(int param0); +static UnkStruct_02014014 *sub_0207C814(int param0, int param1, int param2); +static void sub_0207C83C(UnkStruct_02014014 *param0); +static void sub_0207C854(UnkSPLStruct6 *param0); -void sub_0207C63C (void) +void sub_0207C63C(void) { GXLayers_DisableEngineALayers(); GXLayers_DisableEngineBLayers(); @@ -42,21 +40,21 @@ void sub_0207C63C (void) GXS_SetVisiblePlane(0); } -void sub_0207C664 (void) +void sub_0207C664(void) { G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 11, 7); G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8); } -GenericPointerData * sub_0207C690 (int param0) +GenericPointerData *sub_0207C690(int param0) { - GenericPointerData * v0; + GenericPointerData *v0; v0 = sub_02024220(param0, 0, 2, 0, 2, sub_0207C6AC); return v0; } -void sub_0207C6AC (void) +void sub_0207C6AC(void) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1); G2_SetBG0Priority(1); @@ -72,7 +70,7 @@ void sub_0207C6AC (void) G3_ViewPort(0, 0, 255, 191); } -void sub_0207C730 (void) +void sub_0207C730(void) { NNSGfdTexKey v0; NNSGfdPlttKey v1; @@ -90,10 +88,10 @@ void sub_0207C730 (void) sub_02014000(); } -void sub_0207C770 (void) +void sub_0207C770(void) { int v0; - const MtxFx43 * v1; + const MtxFx43 *v1; sub_020241B4(); @@ -108,7 +106,7 @@ void sub_0207C770 (void) G3_RequestSwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } -static u32 sub_0207C794 (u32 param0, BOOL param1) +static u32 sub_0207C794(u32 param0, BOOL param1) { NNSGfdTexKey v0; u32 v1; @@ -120,7 +118,7 @@ static u32 sub_0207C794 (u32 param0, BOOL param1) return v1; } -static u32 sub_0207C7B0 (u32 param0, BOOL param1) +static u32 sub_0207C7B0(u32 param0, BOOL param1) { NNSGfdPlttKey v0; u32 v1; @@ -132,11 +130,11 @@ static u32 sub_0207C7B0 (u32 param0, BOOL param1) return v1; } -static UnkStruct_02014014 * sub_0207C7CC (int param0) +static UnkStruct_02014014 *sub_0207C7CC(int param0) { - UnkStruct_02014014 * v0; - void * v1; - Camera * camera; + UnkStruct_02014014 *v0; + void *v1; + Camera *camera; v1 = Heap_AllocFromHeap(param0, 0x4800); v0 = sub_02014014(sub_0207C794, sub_0207C7B0, v1, 0x4800, 1, param0); @@ -149,10 +147,10 @@ static UnkStruct_02014014 * sub_0207C7CC (int param0) return v0; } -static UnkStruct_02014014 * sub_0207C814 (int param0, int param1, int param2) +static UnkStruct_02014014 *sub_0207C814(int param0, int param1, int param2) { - UnkStruct_02014014 * v0; - void * v1; + UnkStruct_02014014 *v0; + void *v1; v0 = sub_0207C7CC(param0); v1 = sub_020144C4(param1, param2, param0); @@ -162,9 +160,9 @@ static UnkStruct_02014014 * sub_0207C814 (int param0, int param1, int param2) return v0; } -void sub_0207C83C (UnkStruct_02014014 * param0) +void sub_0207C83C(UnkStruct_02014014 *param0) { - void * v0; + void *v0; v0 = sub_02014730(param0); @@ -172,21 +170,21 @@ void sub_0207C83C (UnkStruct_02014014 * param0) Heap_FreeToHeap(v0); } -static void sub_0207C854 (UnkSPLStruct6 * param0) +static void sub_0207C854(UnkSPLStruct6 *param0) { - VecFx32 v0 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0 }; VEC_Set(&v0, 0, (8 * 172), 0); SPL_UnkInline1(param0, &v0); } -UnkStruct_0207C8C4 * sub_0207C894 (UnkStruct_0207C894 * param0) +UnkStruct_0207C8C4 *sub_0207C894(UnkStruct_0207C894 *param0) { int v0; int v1; int v2; int v3; - UnkStruct_0207C8C4 * v4; + UnkStruct_0207C8C4 *v4; v4 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_0207C8C4)); @@ -200,21 +198,21 @@ UnkStruct_0207C8C4 * sub_0207C894 (UnkStruct_0207C894 * param0) return v4; } -void sub_0207C8C4 (UnkStruct_0207C8C4 * param0, int param1) +void sub_0207C8C4(UnkStruct_0207C8C4 *param0, int param1) { int v0; int v1; int v2; int v3; - UnkStruct_0207C8C4 * v4 = param0; + UnkStruct_0207C8C4 *v4 = param0; sub_020146F4(v4->unk_0C, param1, sub_0207C854, v4); sub_02014788(v4->unk_0C, 1); } -BOOL sub_0207C8E0 (UnkStruct_0207C8C4 * param0) +BOOL sub_0207C8E0(UnkStruct_0207C8C4 *param0) { - UnkStruct_0207C8C4 * v0 = param0; + UnkStruct_0207C8C4 *v0 = param0; if (sub_02014710(v0->unk_0C) == 0) { return 0; @@ -223,7 +221,7 @@ BOOL sub_0207C8E0 (UnkStruct_0207C8C4 * param0) return 1; } -void sub_0207C8F4 (UnkStruct_0207C8C4 * param0) +void sub_0207C8F4(UnkStruct_0207C8C4 *param0) { sub_0207C83C(param0->unk_0C); Heap_FreeToHeap(param0); diff --git a/src/unk_0207C908.c b/src/unk_0207C908.c index e043017005..4590adab7e 100644 --- a/src/unk_0207C908.c +++ b/src/unk_0207C908.c @@ -1,15 +1,15 @@ +#include "unk_0207C908.h" + #include #include #include "struct_decls/struct_02002F38_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" - -#include "struct_defs/struct_0200D0F4.h" #include "struct_defs/sprite_template.h" +#include "struct_defs/struct_0200D0F4.h" #include "unk_0200C6E4.h" -#include "unk_0207C908.h" __attribute__((aligned(4))) static const u32 Unk_020F0AF0[] = { 0xEA, @@ -75,78 +75,78 @@ __attribute__((aligned(4))) static const u8 Unk_020F0AE0[] = { 0x0 }; -u32 sub_0207C908 (int param0) +u32 sub_0207C908(int param0) { GF_ASSERT(param0 < NELEMS(Unk_020F0AF0)); return Unk_020F0AF0[param0]; } -u32 sub_0207C920 (void) +u32 sub_0207C920(void) { return 74; } -u32 sub_0207C924 (void) +u32 sub_0207C924(void) { return 242; } -u32 sub_0207C928 (void) +u32 sub_0207C928(void) { return 243; } -u8 sub_0207C92C (int param0) +u8 sub_0207C92C(int param0) { GF_ASSERT(param0 < NELEMS(Unk_020F0B4C)); return Unk_020F0B4C[param0]; } -u32 sub_0207C944 (void) +u32 sub_0207C944(void) { return 27; } -void sub_0207C948 (SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) +void sub_0207C948(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) { sub_0200CBDC(param0, param1, sub_0207C944(), sub_0207C908(param3), 1, param2, param4); } -void sub_0207C97C (SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, u32 param3) +void sub_0207C97C(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, u32 param3) { sub_0200CC9C(param0, param1, sub_0207C944(), sub_0207C920(), 0, 3, param2, param3); } -void sub_0207C9B0 (PaletteData * param0, int param1, SpriteRenderer * param2, SpriteGfxHandler * param3, NNS_G2D_VRAM_TYPE param4, u32 param5) +void sub_0207C9B0(PaletteData *param0, int param1, SpriteRenderer *param2, SpriteGfxHandler *param3, NNS_G2D_VRAM_TYPE param4, u32 param5) { sub_0200CD7C(param0, param1, param2, param3, sub_0207C944(), sub_0207C920(), 0, 3, param4, param5); } -void sub_0207C9EC (SpriteRenderer * param0, SpriteGfxHandler * param1, u32 param2, u32 param3) +void sub_0207C9EC(SpriteRenderer *param0, SpriteGfxHandler *param1, u32 param2, u32 param3) { sub_0200CE0C(param0, param1, sub_0207C944(), sub_0207C924(), 1, param2); sub_0200CE3C(param0, param1, sub_0207C944(), sub_0207C928(), 1, param3); } -void sub_0207CA34 (SpriteGfxHandler * param0, u32 param1) +void sub_0207CA34(SpriteGfxHandler *param0, u32 param1) { SpriteGfxHandler_UnloadCharObjById(param0, param1); } -void sub_0207CA3C (SpriteGfxHandler * param0, u32 param1) +void sub_0207CA3C(SpriteGfxHandler *param0, u32 param1) { SpriteGfxHandler_UnloadPlttObjById(param0, param1); } -void sub_0207CA44 (SpriteGfxHandler * param0, u32 param1, u32 param2) +void sub_0207CA44(SpriteGfxHandler *param0, u32 param1, u32 param2) { SpriteGfxHandler_UnloadCellObjById(param0, param1); SpriteGfxHandler_UnloadAnimObjById(param0, param2); } -CellActorData * sub_0207CA58 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, const SpriteTemplate * param3) +CellActorData *sub_0207CA58(SpriteRenderer *param0, SpriteGfxHandler *param1, int param2, const SpriteTemplate *param3) { - CellActorData * v0; + CellActorData *v0; SpriteTemplate v1; v1 = *param3; @@ -156,39 +156,39 @@ CellActorData * sub_0207CA58 (SpriteRenderer * param0, SpriteGfxHandler * param1 return v0; } -void sub_0207CA88 (CellActorData * param0) +void sub_0207CA88(CellActorData *param0) { sub_0200D0F4(param0); } -u32 sub_0207CA90 (int param0) +u32 sub_0207CA90(int param0) { GF_ASSERT(param0 < NELEMS(Unk_020F0AE4)); return Unk_020F0AE4[param0]; } -u8 sub_0207CAA8 (int param0) +u8 sub_0207CAA8(int param0) { GF_ASSERT(param0 < NELEMS(Unk_020F0AE0)); return Unk_020F0AE0[param0]; } -u32 sub_0207CAC0 (void) +u32 sub_0207CAC0(void) { return 27; } -void sub_0207CAC4 (SpriteRenderer * param0, SpriteGfxHandler * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) +void sub_0207CAC4(SpriteRenderer *param0, SpriteGfxHandler *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4) { sub_0200CBDC(param0, param1, sub_0207CAC0(), sub_0207CA90(param3), 1, param2, param4); } -void sub_0207CAF8 (SpriteGfxHandler * param0, u32 param1) +void sub_0207CAF8(SpriteGfxHandler *param0, u32 param1) { SpriteGfxHandler_UnloadCharObjById(param0, param1); } -void sub_0207CB00 (CellActorData * param0) +void sub_0207CB00(CellActorData *param0) { sub_0200D0F4(param0); } diff --git a/src/unk_0207CB08.c b/src/unk_0207CB08.c index f75e81f151..bb253c48f6 100644 --- a/src/unk_0207CB08.c +++ b/src/unk_0207CB08.c @@ -1,50 +1,48 @@ +#include "unk_0207CB08.h" + #include #include -#include "message.h" -#include "strbuf.h" #include "struct_decls/struct_02029D04_decl.h" #include "struct_decls/struct_0202CA1C_decl.h" -#include "savedata.h" - #include "struct_defs/struct_0207CB08.h" -#include "bag.h" -#include "message.h" -#include "string_template.h" +#include "bag.h" +#include "coins.h" #include "heap.h" +#include "message.h" +#include "savedata.h" #include "strbuf.h" +#include "string_template.h" #include "unk_02025E08.h" #include "unk_020298BC.h" -#include "coins.h" #include "unk_0202C9F4.h" #include "unk_0202D05C.h" -#include "unk_0207CB08.h" -static u32 sub_0207CBB4(SaveData * param0); -static u32 sub_0207CBC0(SaveData * param0); -static u32 sub_0207CBE0(SaveData * param0); -static u32 sub_0207CBF0(SaveData * param0); -static u32 sub_0207CC00(SaveData * param0); +static u32 sub_0207CBB4(SaveData *param0); +static u32 sub_0207CBC0(SaveData *param0); +static u32 sub_0207CBE0(SaveData *param0); +static u32 sub_0207CBF0(SaveData *param0); +static u32 sub_0207CC00(SaveData *param0); -UnkStruct_0207CB08 * sub_0207CB08 (u8 param0) +UnkStruct_0207CB08 *sub_0207CB08(u8 param0) { - UnkStruct_0207CB08 * v0 = (UnkStruct_0207CB08 *)Heap_AllocFromHeap(param0, sizeof(UnkStruct_0207CB08)); + UnkStruct_0207CB08 *v0 = (UnkStruct_0207CB08 *)Heap_AllocFromHeap(param0, sizeof(UnkStruct_0207CB08)); memset(v0, 0, sizeof(UnkStruct_0207CB08)); return v0; } -u32 sub_0207CB20 (void) +u32 sub_0207CB20(void) { return sizeof(UnkStruct_0207CB08); } -void sub_0207CB24 (UnkStruct_0207CB08 * param0, u8 param1) +void sub_0207CB24(UnkStruct_0207CB08 *param0, u8 param1) { param0->unk_65 = param1; } -void sub_0207CB2C (UnkStruct_0207CB08 * param0, SaveData * param1, u8 param2, void * param3) +void sub_0207CB2C(UnkStruct_0207CB08 *param0, SaveData *param1, u8 param2, void *param3) { sub_0207CB24(param0, param2); param0->unk_00 = param1; @@ -52,60 +50,60 @@ void sub_0207CB2C (UnkStruct_0207CB08 * param0, SaveData * param1, u8 param2, vo param0->unk_66 = 0; } -void sub_0207CB48 (UnkStruct_0207CB08 * param0, BagItem * param1, u8 param2, u8 param3) +void sub_0207CB48(UnkStruct_0207CB08 *param0, BagItem *param1, u8 param2, u8 param3) { param0->unk_04[param3].unk_00 = param1; param0->unk_04[param3].unk_08 = param2; } -void sub_0207CB58 (UnkStruct_0207CB08 * param0) +void sub_0207CB58(UnkStruct_0207CB08 *param0) { param0->unk_76_0 = 1; } -void sub_0207CB6C (UnkStruct_0207CB08 * param0, void * param1) +void sub_0207CB6C(UnkStruct_0207CB08 *param0, void *param1) { param0->unk_70 = param1; } -void sub_0207CB70 (UnkStruct_0207CB08 * param0, u8 param1) +void sub_0207CB70(UnkStruct_0207CB08 *param0, u8 param1) { param0->unk_74 = param1; } -void sub_0207CB78 (UnkStruct_0207CB08 * param0, u16 param1) +void sub_0207CB78(UnkStruct_0207CB08 *param0, u16 param1) { param0->unk_76_1 = param1; } -u16 sub_0207CB94 (UnkStruct_0207CB08 * param0) +u16 sub_0207CB94(UnkStruct_0207CB08 *param0) { return param0->unk_66; } -u16 sub_0207CB9C (UnkStruct_0207CB08 * param0) +u16 sub_0207CB9C(UnkStruct_0207CB08 *param0) { return param0->unk_68; } -u8 sub_0207CBA4 (UnkStruct_0207CB08 * param0) +u8 sub_0207CBA4(UnkStruct_0207CB08 *param0) { return param0->unk_74; } -u8 sub_0207CBAC (UnkStruct_0207CB08 * param0) +u8 sub_0207CBAC(UnkStruct_0207CB08 *param0) { return param0->unk_75; } -static u32 sub_0207CBB4 (SaveData * param0) +static u32 sub_0207CBB4(SaveData *param0) { return Coins_GetValue(sub_02025E50(param0)); } -static u32 sub_0207CBC0 (SaveData * param0) +static u32 sub_0207CBC0(SaveData *param0) { - UnkStruct_0202CA1C * v0; + UnkStruct_0202CA1C *v0; u32 v1, v2; v0 = sub_0202CA1C(param0); @@ -118,28 +116,28 @@ static u32 sub_0207CBC0 (SaveData * param0) return v2; } -static u32 sub_0207CBE0 (SaveData * param0) +static u32 sub_0207CBE0(SaveData *param0) { - UnkStruct_02029D04 * v0 = sub_02029D04(sub_0202A750(param0)); + UnkStruct_02029D04 *v0 = sub_02029D04(sub_0202A750(param0)); return sub_02029DF0(v0); } -static u32 sub_0207CBF0 (SaveData * param0) +static u32 sub_0207CBF0(SaveData *param0) { - UnkStruct_02029D04 * v0 = sub_02029D04(sub_0202A750(param0)); + UnkStruct_02029D04 *v0 = sub_02029D04(sub_0202A750(param0)); return sub_02029E0C(v0); } -static u32 sub_0207CC00 (SaveData * param0) +static u32 sub_0207CC00(SaveData *param0) { return (u32)sub_0202D230(sub_0202D750(param0), 0, 0); } -BOOL sub_0207CC10 (SaveData * param0, Strbuf *param1, u16 param2, u32 param3) +BOOL sub_0207CC10(SaveData *param0, Strbuf *param1, u16 param2, u32 param3) { - MessageLoader * v0; - StringTemplate * v1; - Strbuf* v2; + MessageLoader *v0; + StringTemplate *v1; + Strbuf *v2; v0 = MessageLoader_Init(0, 26, 7, param3); v1 = StringTemplate_Default(param3); @@ -173,11 +171,11 @@ BOOL sub_0207CC10 (SaveData * param0, Strbuf *param1, u16 param2, u32 param3) return 1; } -void sub_0207CD34 (void * param0, Strbuf *param1, u16 param2, u32 param3, u32 param4) +void sub_0207CD34(void *param0, Strbuf *param1, u16 param2, u32 param3, u32 param4) { - MessageLoader * v0; - StringTemplate * v1; - Strbuf* v2; + MessageLoader *v0; + StringTemplate *v1; + Strbuf *v2; switch (param3) { case 1: diff --git a/src/unk_0207DA28.c b/src/unk_0207DA28.c index f48f8a518b..a0a57afaf0 100644 --- a/src/unk_0207DA28.c +++ b/src/unk_0207DA28.c @@ -1,38 +1,39 @@ +#include "unk_0207DA28.h" + +#include #include #include -#include #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" +#include "struct_defs/struct_0207DE04.h" #include "field/field_system.h" -#include "struct_defs/struct_0207DE04.h" +#include "overlay018/ov18_0221F800.h" +#include "overlay065/ov65_0222DCE0.h" +#include "overlay065/ov65_0223648C.h" #include "overlay066/struct_ov66_02231134.h" #include "overlay098/struct_ov98_02247168.h" +#include "overlay115/ov115_02260440.h" #include "overlay115/struct_ov115_02260440.h" +#include "overlay116/ov116_022604C4.h" +#include "overlay117/ov117_02260440.h" #include "overlay117/struct_ov117_02260440.h" +#include "communication_system.h" +#include "field_system.h" #include "game_overlay.h" #include "heap.h" #include "unk_0202CD50.h" -#include "communication_system.h" #include "unk_02038FFC.h" -#include "field_system.h" #include "unk_0203D1B8.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_02050A74.h" #include "unk_0206A8DC.h" -#include "unk_0207DA28.h" #include "unk_02099550.h" #include "unk_02099604.h" #include "unk_0209BA18.h" -#include "overlay018/ov18_0221F800.h" -#include "overlay065/ov65_0222DCE0.h" -#include "overlay065/ov65_0223648C.h" -#include "overlay115/ov115_02260440.h" -#include "overlay116/ov116_022604C4.h" -#include "overlay117/ov117_02260440.h" +#include "vars_flags.h" FS_EXTERN_OVERLAY(overlay65); FS_EXTERN_OVERLAY(overlay114); @@ -41,26 +42,26 @@ FS_EXTERN_OVERLAY(overlay116); FS_EXTERN_OVERLAY(overlay117); typedef struct { - UnkStruct_ov98_02247168 * unk_00; + UnkStruct_ov98_02247168 *unk_00; int unk_04; - u16 * unk_08; + u16 *unk_08; u8 unk_0C; u8 unk_0D; - void * unk_10; + void *unk_10; u32 unk_14; } UnkStruct_0207DE40; void sub_02099570(void); -static BOOL sub_0207DA28(TaskManager * param0); -static void sub_0207DE04(UnkStruct_0207DE40 * param0, FieldSystem * fieldSystem, u32 param2, u32 param3); -static u32 sub_0207DE40(UnkStruct_0207DE40 * param0); -static UnkStruct_ov115_02260440 * sub_0207DE90(FieldSystem * fieldSystem, u32 param1, u32 param2); -static void sub_0207DED8(UnkStruct_ov115_02260440 * param0); -static UnkStruct_ov66_02231134 * sub_0207DEEC(FieldSystem * fieldSystem, u32 param1, u32 param2); -static void sub_0207DF2C(UnkStruct_ov66_02231134 * param0); -static UnkStruct_ov117_02260440 * sub_0207DF40(FieldSystem * fieldSystem, u32 param1, u32 param2); -static void sub_0207DF88(UnkStruct_ov115_02260440 * param0); -static void sub_0207DF9C(FieldSystem * fieldSystem); +static BOOL sub_0207DA28(TaskManager *param0); +static void sub_0207DE04(UnkStruct_0207DE40 *param0, FieldSystem *fieldSystem, u32 param2, u32 param3); +static u32 sub_0207DE40(UnkStruct_0207DE40 *param0); +static UnkStruct_ov115_02260440 *sub_0207DE90(FieldSystem *fieldSystem, u32 param1, u32 param2); +static void sub_0207DED8(UnkStruct_ov115_02260440 *param0); +static UnkStruct_ov66_02231134 *sub_0207DEEC(FieldSystem *fieldSystem, u32 param1, u32 param2); +static void sub_0207DF2C(UnkStruct_ov66_02231134 *param0); +static UnkStruct_ov117_02260440 *sub_0207DF40(FieldSystem *fieldSystem, u32 param1, u32 param2); +static void sub_0207DF88(UnkStruct_ov115_02260440 *param0); +static void sub_0207DF9C(FieldSystem *fieldSystem); static const OverlayManagerTemplate Unk_020F1B98 = { ov65_0222E2A8, @@ -83,11 +84,11 @@ static const u8 Unk_020F1B64[4] = { 0x4 }; -static BOOL sub_0207DA28 (TaskManager * param0) +static BOOL sub_0207DA28(TaskManager *param0) { int v0; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0207DE40 * v2 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0207DE40 *v2 = TaskManager_Environment(param0); switch (v2->unk_04) { case 0: @@ -296,9 +297,9 @@ static BOOL sub_0207DA28 (TaskManager * param0) return 0; } -static UnkStruct_0207DE40 * sub_0207DD94 (void) +static UnkStruct_0207DE40 *sub_0207DD94(void) { - UnkStruct_0207DE40 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0207DE40)); + UnkStruct_0207DE40 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0207DE40)); MI_CpuClear8(v0, sizeof(UnkStruct_0207DE40)); v0->unk_00 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov98_02247168)); @@ -306,17 +307,17 @@ static UnkStruct_0207DE40 * sub_0207DD94 (void) return v0; } -void sub_0207DDC0 (TaskManager * param0) +void sub_0207DDC0(TaskManager *param0) { - UnkStruct_0207DE40 * v0 = sub_0207DD94(); + UnkStruct_0207DE40 *v0 = sub_0207DD94(); v0->unk_00->unk_04 = 2; FieldTask_Start(param0, sub_0207DA28, v0); } -void sub_0207DDE0 (TaskManager * param0, u16 * param1) +void sub_0207DDE0(TaskManager *param0, u16 *param1) { - UnkStruct_0207DE40 * v0 = sub_0207DD94(); + UnkStruct_0207DE40 *v0 = sub_0207DD94(); v0->unk_00->unk_04 = 1; v0->unk_08 = param1; @@ -324,9 +325,9 @@ void sub_0207DDE0 (TaskManager * param0, u16 * param1) FieldTask_Start(param0, sub_0207DA28, v0); } -static void sub_0207DE04 (UnkStruct_0207DE40 * param0, FieldSystem * fieldSystem, u32 param2, u32 param3) +static void sub_0207DE04(UnkStruct_0207DE40 *param0, FieldSystem *fieldSystem, u32 param2, u32 param3) { - UnkStruct_0207DE04 * v0; + UnkStruct_0207DE04 *v0; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_0207DE04)); @@ -342,9 +343,9 @@ static void sub_0207DE04 (UnkStruct_0207DE40 * param0, FieldSystem * fieldSystem sub_0203CD84(fieldSystem, &Unk_020F1B88, v0); } -static u32 sub_0207DE40 (UnkStruct_0207DE40 * param0) +static u32 sub_0207DE40(UnkStruct_0207DE40 *param0) { - UnkStruct_0207DE04 * v0 = param0->unk_10; + UnkStruct_0207DE04 *v0 = param0->unk_10; if (v0->unk_03 == 1) { switch (v0->unk_00) { @@ -371,16 +372,19 @@ static u32 sub_0207DE40 (UnkStruct_0207DE40 * param0) return param0->unk_04; } -static UnkStruct_ov115_02260440 * sub_0207DE90 (FieldSystem * fieldSystem, u32 param1, u32 param2) +static UnkStruct_ov115_02260440 *sub_0207DE90(FieldSystem *fieldSystem, u32 param1, u32 param2) { - UnkStruct_ov115_02260440 * v0; + UnkStruct_ov115_02260440 *v0; FS_EXTERN_OVERLAY(overlay115); FS_EXTERN_OVERLAY(overlay114); { static const OverlayManagerTemplate v1 = { - ov115_02260440, ov115_0226048C, ov115_022608E4, FS_OVERLAY_ID(overlay115), + ov115_02260440, + ov115_0226048C, + ov115_022608E4, + FS_OVERLAY_ID(overlay115), }; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov115_02260440)); @@ -396,7 +400,7 @@ static UnkStruct_ov115_02260440 * sub_0207DE90 (FieldSystem * fieldSystem, u32 p return v0; } -static void sub_0207DED8 (UnkStruct_ov115_02260440 * param0) +static void sub_0207DED8(UnkStruct_ov115_02260440 *param0) { FS_EXTERN_OVERLAY(overlay114); @@ -404,15 +408,18 @@ static void sub_0207DED8 (UnkStruct_ov115_02260440 * param0) Overlay_UnloadByID(FS_OVERLAY_ID(overlay114)); } -static UnkStruct_ov66_02231134 * sub_0207DEEC (FieldSystem * fieldSystem, u32 param1, u32 param2) +static UnkStruct_ov66_02231134 *sub_0207DEEC(FieldSystem *fieldSystem, u32 param1, u32 param2) { - UnkStruct_ov66_02231134 * v0; + UnkStruct_ov66_02231134 *v0; FS_EXTERN_OVERLAY(overlay116); FS_EXTERN_OVERLAY(overlay114); { static const OverlayManagerTemplate v1 = { - ov116_022609B4, ov116_02260CF4, ov116_0226126C, FS_OVERLAY_ID(overlay116), + ov116_022609B4, + ov116_02260CF4, + ov116_0226126C, + FS_OVERLAY_ID(overlay116), }; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov66_02231134)); @@ -427,7 +434,7 @@ static UnkStruct_ov66_02231134 * sub_0207DEEC (FieldSystem * fieldSystem, u32 pa return v0; } -static void sub_0207DF2C (UnkStruct_ov66_02231134 * param0) +static void sub_0207DF2C(UnkStruct_ov66_02231134 *param0) { FS_EXTERN_OVERLAY(overlay114); @@ -435,16 +442,19 @@ static void sub_0207DF2C (UnkStruct_ov66_02231134 * param0) Overlay_UnloadByID(FS_OVERLAY_ID(overlay114)); } -static UnkStruct_ov117_02260440 * sub_0207DF40 (FieldSystem * fieldSystem, u32 param1, u32 param2) +static UnkStruct_ov117_02260440 *sub_0207DF40(FieldSystem *fieldSystem, u32 param1, u32 param2) { - UnkStruct_ov117_02260440 * v0; + UnkStruct_ov117_02260440 *v0; FS_EXTERN_OVERLAY(overlay117); FS_EXTERN_OVERLAY(overlay114); { static const OverlayManagerTemplate v1 = { - ov117_02260440, ov117_02260474, ov117_022605C0, FS_OVERLAY_ID(overlay117), + ov117_02260440, + ov117_02260474, + ov117_022605C0, + FS_OVERLAY_ID(overlay117), }; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov117_02260440)); @@ -461,7 +471,7 @@ static UnkStruct_ov117_02260440 * sub_0207DF40 (FieldSystem * fieldSystem, u32 p return v0; } -static void sub_0207DF88 (UnkStruct_ov115_02260440 * param0) +static void sub_0207DF88(UnkStruct_ov115_02260440 *param0) { FS_EXTERN_OVERLAY(overlay114); @@ -469,9 +479,9 @@ static void sub_0207DF88 (UnkStruct_ov115_02260440 * param0) Overlay_UnloadByID(FS_OVERLAY_ID(overlay114)); } -static void sub_0207DF9C (FieldSystem * fieldSystem) +static void sub_0207DF9C(FieldSystem *fieldSystem) { - UnkStruct_0202CD88 * v0; + UnkStruct_0202CD88 *v0; v0 = sub_0202CD88(fieldSystem->saveData); sub_0202CFEC(v0, 50); diff --git a/src/unk_0207DFAC.c b/src/unk_0207DFAC.c index 151fc27e71..29ac79d483 100644 --- a/src/unk_0207DFAC.c +++ b/src/unk_0207DFAC.c @@ -1,16 +1,17 @@ +#include "unk_0207DFAC.h" + #include #include #include "struct_defs/struct_0207DFAC.h" #include "unk_020366A0.h" -#include "unk_0207DFAC.h" -BOOL sub_0207DFAC (int param0) +BOOL sub_0207DFAC(int param0) { int v0; int v1; - UnkStruct_0207DFAC * v2 = sub_020388E8(); + UnkStruct_0207DFAC *v2 = sub_020388E8(); v0 = v2->unk_00.unk_1B; v1 = v2->unk_24[param0].unk_1B; diff --git a/src/unk_0207E060.c b/src/unk_0207E060.c index 859649c70b..d9eaac6e6d 100644 --- a/src/unk_0207E060.c +++ b/src/unk_0207E060.c @@ -1,18 +1,18 @@ +#include "unk_0207E060.h" + #include #include -#include "trainer_info.h" - #include "struct_defs/struct_0207E060.h" +#include "overlay004/ov4_021D0D80.h" + #include "heap.h" #include "trainer_info.h" -#include "unk_0207E060.h" -#include "overlay004/ov4_021D0D80.h" -UnkStruct_0207E060 * sub_0207E060 (const TrainerInfo * param0, u32 param1) +UnkStruct_0207E060 *sub_0207E060(const TrainerInfo *param0, u32 param1) { - UnkStruct_0207E060 * v0; + UnkStruct_0207E060 *v0; BOOL v1; v0 = Heap_AllocFromHeap(param1, (sizeof(UnkStruct_0207E060))); @@ -30,7 +30,7 @@ UnkStruct_0207E060 * sub_0207E060 (const TrainerInfo * param0, u32 param1) return v0; } -void sub_0207E0B0 (UnkStruct_0207E060 * param0) +void sub_0207E0B0(UnkStruct_0207E060 *param0) { Heap_FreeToHeap(param0); } diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 8c2b09dbdb..94c5e1fb14 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -1,72 +1,70 @@ +#include "unk_0207E0B8.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "pokemon.h" - -#include "constdata/const_020F1E88.h" - -#include "touch_screen.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207C690.h" -#include "functypes/funcptr_0207E634.h" #include "struct_defs/struct_0207F248.h" #include "struct_defs/struct_02099F80.h" #include "struct_defs/struct_020F1DB8.h" + +#include "field/field_system.h" +#include "functypes/funcptr_0207E634.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "overlay118/ov118_021D0D80.h" +#include "bag.h" +#include "core_sys.h" +#include "game_options.h" +#include "game_overlay.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" +#include "journal.h" +#include "message.h" +#include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "strbuf.h" +#include "string_template.h" +#include "touch_screen.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "game_overlay.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02013A04.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E010.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" #include "unk_02024220.h" #include "unk_0202602C.h" -#include "game_options.h" -#include "journal.h" #include "unk_020393C8.h" #include "unk_0206B9D8.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "party.h" #include "unk_0207A2A8.h" -#include "item.h" -#include "bag.h" -#include "unk_0207E0B8.h" #include "unk_020819DC.h" #include "unk_02082C2C.h" #include "unk_02083370.h" #include "unk_02084B70.h" #include "unk_0208C098.h" -#include "pokemon_summary_app.h" #include "unk_02096420.h" -#include "overlay118/ov118_021D0D80.h" + +#include "constdata/const_020F1E88.h" FS_EXTERN_OVERLAY(overlay118); @@ -79,85 +77,85 @@ typedef struct { u16 unk_0A; } UnkStruct_020F1DF8; -static int sub_0207E0B8(OverlayManager * param0, int * param1); -static int sub_0207E2A8(OverlayManager * param0, int * param1); -static int sub_0207E7E0(OverlayManager * param0, int * param1); -static int sub_0207E490(GameWindowLayout * param0); -static int sub_0207E518(GameWindowLayout * param0); -static int sub_0207E5B4(GameWindowLayout * param0); -static int sub_0207E5F4(GameWindowLayout * param0); -static int sub_0207E6C0(GameWindowLayout * param0); -static int sub_0207E6E4(GameWindowLayout * param0); -static int sub_0207E708(GameWindowLayout * param0); -static int sub_0207E714(GameWindowLayout * param0); -static int sub_0207E750(GameWindowLayout * param0); -static int ProcessWindowInput(GameWindowLayout * param0); -static void sub_0207E898(void * param0); +static int sub_0207E0B8(OverlayManager *param0, int *param1); +static int sub_0207E2A8(OverlayManager *param0, int *param1); +static int sub_0207E7E0(OverlayManager *param0, int *param1); +static int sub_0207E490(GameWindowLayout *param0); +static int sub_0207E518(GameWindowLayout *param0); +static int sub_0207E5B4(GameWindowLayout *param0); +static int sub_0207E5F4(GameWindowLayout *param0); +static int sub_0207E6C0(GameWindowLayout *param0); +static int sub_0207E6E4(GameWindowLayout *param0); +static int sub_0207E708(GameWindowLayout *param0); +static int sub_0207E714(GameWindowLayout *param0); +static int sub_0207E750(GameWindowLayout *param0); +static int ProcessWindowInput(GameWindowLayout *param0); +static void sub_0207E898(void *param0); static void sub_0207E8C0(void); -static void sub_0207E918(BGL * param0); -static void sub_0207EA24(BGL * param0); -static void sub_0207EB6C(GameWindowLayout * param0, NARC * param1); -static GameWindowLayout * sub_0207ECC0(OverlayManager * param0); -static void sub_0207EE14(GameWindowLayout * param0); -static void sub_0207F308(GameWindowLayout * param0); -static u8 sub_0207F984(GameWindowLayout * param0, u8 param1); -static u8 sub_0207FE98(GameWindowLayout * param0); -static void sub_02080500(GameWindowLayout * param0, u8 param1, u8 param2); -static void sub_0207F9A0(GameWindowLayout * param0); -static void sub_0207EDC0(GameWindowLayout * param0); -static int HandleGameWindowEvent(GameWindowLayout * param0); -static u8 HandleWindowInputEvent(GameWindowLayout * param0, int * param1); -static u8 sub_020805E4(GameWindowLayout * param0); -static void UpdateWindowLayout(GameWindowLayout * param0, u8 param1, u8 param2); -static int GetValidWindowLayout(GameWindowLayout * param0); -static u8 HandleSpecialInput(GameWindowLayout * param0); -static int ApplyItemEffectOnPokemon(GameWindowLayout * param0); -static u8 CheckItemUsageValidity(GameWindowLayout * param0); -static int ProcessItemApplication(GameWindowLayout * param0); -static int UpdatePokemonWithItem(GameWindowLayout * param0, Pokemon * param1, int * param2); -static int HandleMessageCompletion(GameWindowLayout * param0); -static int FinalizeMessageProcessing(GameWindowLayout * param0); -static int ProcessPokemonItemSwap(GameWindowLayout * param0); -static int sub_0207E634(GameWindowLayout * param0); -static int ResetWindowOnInput(GameWindowLayout * param0); -static int UpdatePokemonFormWithItem(GameWindowLayout * param0); -static void sub_0207F094(GameWindowLayout * param0, Pokemon * param1, u8 param2); -static u32 sub_0207F134(Pokemon * param0, u8 param1); -static void sub_0207FE1C(GameWindowLayout * param0); -static void CalculateWindowPosition(u8 param0, s16 * param1, s16 * param2); -static int CheckForItemApplication(GameWindowLayout * param0); -static u8 CheckDuplicateValues(GameWindowLayout * param0); -static u8 CheckUniqueValues(GameWindowLayout * param0); -static u8 CheckEqualityInArray(GameWindowLayout * param0); -static BOOL ValidateGameWindowState(GameWindowLayout * param0); -static GenericPointerData * sub_0207EAD4(int param0); +static void sub_0207E918(BGL *param0); +static void sub_0207EA24(BGL *param0); +static void sub_0207EB6C(GameWindowLayout *param0, NARC *param1); +static GameWindowLayout *sub_0207ECC0(OverlayManager *param0); +static void sub_0207EE14(GameWindowLayout *param0); +static void sub_0207F308(GameWindowLayout *param0); +static u8 sub_0207F984(GameWindowLayout *param0, u8 param1); +static u8 sub_0207FE98(GameWindowLayout *param0); +static void sub_02080500(GameWindowLayout *param0, u8 param1, u8 param2); +static void sub_0207F9A0(GameWindowLayout *param0); +static void sub_0207EDC0(GameWindowLayout *param0); +static int HandleGameWindowEvent(GameWindowLayout *param0); +static u8 HandleWindowInputEvent(GameWindowLayout *param0, int *param1); +static u8 sub_020805E4(GameWindowLayout *param0); +static void UpdateWindowLayout(GameWindowLayout *param0, u8 param1, u8 param2); +static int GetValidWindowLayout(GameWindowLayout *param0); +static u8 HandleSpecialInput(GameWindowLayout *param0); +static int ApplyItemEffectOnPokemon(GameWindowLayout *param0); +static u8 CheckItemUsageValidity(GameWindowLayout *param0); +static int ProcessItemApplication(GameWindowLayout *param0); +static int UpdatePokemonWithItem(GameWindowLayout *param0, Pokemon *param1, int *param2); +static int HandleMessageCompletion(GameWindowLayout *param0); +static int FinalizeMessageProcessing(GameWindowLayout *param0); +static int ProcessPokemonItemSwap(GameWindowLayout *param0); +static int sub_0207E634(GameWindowLayout *param0); +static int ResetWindowOnInput(GameWindowLayout *param0); +static int UpdatePokemonFormWithItem(GameWindowLayout *param0); +static void sub_0207F094(GameWindowLayout *param0, Pokemon *param1, u8 param2); +static u32 sub_0207F134(Pokemon *param0, u8 param1); +static void sub_0207FE1C(GameWindowLayout *param0); +static void CalculateWindowPosition(u8 param0, s16 *param1, s16 *param2); +static int CheckForItemApplication(GameWindowLayout *param0); +static u8 CheckDuplicateValues(GameWindowLayout *param0); +static u8 CheckUniqueValues(GameWindowLayout *param0); +static u8 CheckEqualityInArray(GameWindowLayout *param0); +static BOOL ValidateGameWindowState(GameWindowLayout *param0); +static GenericPointerData *sub_0207EAD4(int param0); static void sub_0207EAF4(void); -static void sub_0207EB64(GenericPointerData * param0); -static int ProcessMessageResult(GameWindowLayout * param0); -static int HandleOverlayCompletion(GameWindowLayout * param0); -static void sub_0207F388(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1); -static void sub_0207F4AC(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1); -static void sub_0207F5A0(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1); -static void sub_0207F694(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1); -static void sub_0207F788(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1); -static void sub_0207F884(GameWindowLayout * param0, u8 param1, s16 param2, s16 param3); -static u8 sub_0207FA24(GameWindowLayout * param0); -static u8 sub_0207FBE0(GameWindowLayout * param0, u8 * param1, u8 * param2, u8 param3); -static u8 sub_0207FC30(GameWindowLayout * param0, u8 * param1, u8 * param2, const u8 * param3); -static u8 sub_0207FC94(GameWindowLayout * param0); -static void sub_0207FFC8(GameWindowLayout * param0); -static u8 sub_020800B4(GameWindowLayout * param0, u8 * param1); -static u8 sub_020801F0(GameWindowLayout * param0, u8 * param1); -static u8 sub_0208022C(GameWindowLayout * param0, u8 * param1); -static u8 sub_0208027C(GameWindowLayout * param0, u8 * param1); -static u8 sub_020802CC(GameWindowLayout * param0, u8 * param1); -static u8 sub_0208031C(GameWindowLayout * param0, u8 * param1); -static u8 sub_020801AC(GameWindowLayout * param0, u8 * param1); -static u8 sub_020801B8(GameWindowLayout * param0, u8 * param1); -u8 sub_02080404(GameWindowLayout * param0, u8 param1); -u8 sub_02080488(GameWindowLayout * param0, u8 param1); -static u8 CheckPokemonCondition(GameWindowLayout * param0); -static BOOL UpdatePokemonStatus(GameWindowLayout * param0, u8 param1, s8 param2); +static void sub_0207EB64(GenericPointerData *param0); +static int ProcessMessageResult(GameWindowLayout *param0); +static int HandleOverlayCompletion(GameWindowLayout *param0); +static void sub_0207F388(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1); +static void sub_0207F4AC(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1); +static void sub_0207F5A0(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1); +static void sub_0207F694(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1); +static void sub_0207F788(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1); +static void sub_0207F884(GameWindowLayout *param0, u8 param1, s16 param2, s16 param3); +static u8 sub_0207FA24(GameWindowLayout *param0); +static u8 sub_0207FBE0(GameWindowLayout *param0, u8 *param1, u8 *param2, u8 param3); +static u8 sub_0207FC30(GameWindowLayout *param0, u8 *param1, u8 *param2, const u8 *param3); +static u8 sub_0207FC94(GameWindowLayout *param0); +static void sub_0207FFC8(GameWindowLayout *param0); +static u8 sub_020800B4(GameWindowLayout *param0, u8 *param1); +static u8 sub_020801F0(GameWindowLayout *param0, u8 *param1); +static u8 sub_0208022C(GameWindowLayout *param0, u8 *param1); +static u8 sub_0208027C(GameWindowLayout *param0, u8 *param1); +static u8 sub_020802CC(GameWindowLayout *param0, u8 *param1); +static u8 sub_0208031C(GameWindowLayout *param0, u8 *param1); +static u8 sub_020801AC(GameWindowLayout *param0, u8 *param1); +static u8 sub_020801B8(GameWindowLayout *param0, u8 *param1); +u8 sub_02080404(GameWindowLayout *param0, u8 param1); +u8 sub_02080488(GameWindowLayout *param0, u8 param1); +static u8 CheckPokemonCondition(GameWindowLayout *param0); +static BOOL UpdatePokemonStatus(GameWindowLayout *param0, u8 param1, s8 param2); const OverlayManagerTemplate Unk_020F1E88 = { sub_0207E0B8, @@ -167,66 +165,62 @@ const OverlayManagerTemplate Unk_020F1E88 = { }; static const UnkStruct_020F1DF8 Unk_020F1DF8[2][6] = { - { - {0x0, 0x0, 0x1E, 0x10, 0x10, 0xE}, - {0x10, 0x1, 0x9E, 0x18, 0x90, 0x16}, - {0x0, 0x6, 0x1E, 0x40, 0x10, 0x3E}, - {0x10, 0x7, 0x9E, 0x48, 0x90, 0x46}, - {0x0, 0xC, 0x1E, 0x70, 0x10, 0x6E}, - {0x10, 0xD, 0x9E, 0x78, 0x90, 0x76} - }, - { - {0x0, 0x0, 0x1E, 0x10, 0x10, 0xE}, - {0x10, 0x0, 0x9E, 0x10, 0x90, 0xE}, - {0x0, 0x6, 0x1E, 0x40, 0x10, 0x3E}, - {0x10, 0x6, 0x9E, 0x40, 0x90, 0x3E}, - {0x0, 0xC, 0x1E, 0x70, 0x10, 0x6E}, - {0x10, 0xC, 0x9E, 0x70, 0x90, 0x6E} - } + { { 0x0, 0x0, 0x1E, 0x10, 0x10, 0xE }, + { 0x10, 0x1, 0x9E, 0x18, 0x90, 0x16 }, + { 0x0, 0x6, 0x1E, 0x40, 0x10, 0x3E }, + { 0x10, 0x7, 0x9E, 0x48, 0x90, 0x46 }, + { 0x0, 0xC, 0x1E, 0x70, 0x10, 0x6E }, + { 0x10, 0xD, 0x9E, 0x78, 0x90, 0x76 } }, + { { 0x0, 0x0, 0x1E, 0x10, 0x10, 0xE }, + { 0x10, 0x0, 0x9E, 0x10, 0x90, 0xE }, + { 0x0, 0x6, 0x1E, 0x40, 0x10, 0x3E }, + { 0x10, 0x6, 0x9E, 0x40, 0x90, 0x3E }, + { 0x0, 0xC, 0x1E, 0x70, 0x10, 0x6E }, + { 0x10, 0xC, 0x9E, 0x70, 0x90, 0x6E } } }; static const ByteFlagSet Unk_020F1DB8[] = { - {0x40, 0x19, 0x0, 0x0, 0x7, 0x2, 0x7, 0x1}, - {0xC0, 0x21, 0x0, 0x0, 0x7, 0x3, 0x0, 0x2}, - {0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x1, 0x3}, - {0xC0, 0x51, 0x0, 0x0, 0x1, 0x5, 0x2, 0x4}, - {0x40, 0x79, 0x0, 0x0, 0x2, 0x7, 0x3, 0x5}, - {0xC0, 0x81, 0x0, 0x0, 0x3, 0x7, 0x4, 0x7}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0xE0, 0xA8, 0x0, 0x0, 0x5, 0x1, 0x5, 0x0} + { 0x40, 0x19, 0x0, 0x0, 0x7, 0x2, 0x7, 0x1 }, + { 0xC0, 0x21, 0x0, 0x0, 0x7, 0x3, 0x0, 0x2 }, + { 0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x1, 0x3 }, + { 0xC0, 0x51, 0x0, 0x0, 0x1, 0x5, 0x2, 0x4 }, + { 0x40, 0x79, 0x0, 0x0, 0x2, 0x7, 0x3, 0x5 }, + { 0xC0, 0x81, 0x0, 0x0, 0x3, 0x7, 0x4, 0x7 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0xE0, 0xA8, 0x0, 0x0, 0x5, 0x1, 0x5, 0x0 } }; static const ByteFlagSet Unk_020F1CF8[] = { - {0x40, 0x19, 0x0, 0x0, 0x4, 0x2, 0x1, 0x1}, - {0xC0, 0x19, 0x0, 0x0, 0x7, 0x3, 0x0, 0x0}, - {0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x3, 0x3}, - {0xC0, 0x49, 0x0, 0x0, 0x1, 0x5, 0x2, 0x2}, - {0x40, 0x79, 0x0, 0x0, 0x2, 0x0, 0x5, 0x5}, - {0xC0, 0x79, 0x0, 0x0, 0x3, 0x7, 0x4, 0x4}, - {0xE0, 0xA8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0xE0, 0xA8, 0x0, 0x0, 0x5, 0x1, 0xFF, 0xFF} + { 0x40, 0x19, 0x0, 0x0, 0x4, 0x2, 0x1, 0x1 }, + { 0xC0, 0x19, 0x0, 0x0, 0x7, 0x3, 0x0, 0x0 }, + { 0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x3, 0x3 }, + { 0xC0, 0x49, 0x0, 0x0, 0x1, 0x5, 0x2, 0x2 }, + { 0x40, 0x79, 0x0, 0x0, 0x2, 0x0, 0x5, 0x5 }, + { 0xC0, 0x79, 0x0, 0x0, 0x3, 0x7, 0x4, 0x4 }, + { 0xE0, 0xA8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0xE0, 0xA8, 0x0, 0x0, 0x5, 0x1, 0xFF, 0xFF } }; static const ByteFlagSet Unk_020F1D38[] = { - {0x40, 0x19, 0x0, 0x0, 0x7, 0x2, 0x7, 0x1}, - {0xC0, 0x21, 0x0, 0x0, 0x7, 0x3, 0x0, 0x2}, - {0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x1, 0x3}, - {0xC0, 0x51, 0x0, 0x0, 0x1, 0x5, 0x2, 0x4}, - {0x40, 0x79, 0x0, 0x0, 0x2, 0x6, 0x3, 0x5}, - {0xC0, 0x81, 0x0, 0x0, 0x3, 0x6, 0x4, 0x6}, - {0xE0, 0xA8, 0x0, 0x0, 0x5, 0x7, 0x5, 0x7}, - {0xE0, 0xB8, 0x0, 0x0, 0x6, 0x1, 0x6, 0x0} + { 0x40, 0x19, 0x0, 0x0, 0x7, 0x2, 0x7, 0x1 }, + { 0xC0, 0x21, 0x0, 0x0, 0x7, 0x3, 0x0, 0x2 }, + { 0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x1, 0x3 }, + { 0xC0, 0x51, 0x0, 0x0, 0x1, 0x5, 0x2, 0x4 }, + { 0x40, 0x79, 0x0, 0x0, 0x2, 0x6, 0x3, 0x5 }, + { 0xC0, 0x81, 0x0, 0x0, 0x3, 0x6, 0x4, 0x6 }, + { 0xE0, 0xA8, 0x0, 0x0, 0x5, 0x7, 0x5, 0x7 }, + { 0xE0, 0xB8, 0x0, 0x0, 0x6, 0x1, 0x6, 0x0 } }; static const ByteFlagSet Unk_020F1D78[] = { - {0x40, 0x19, 0x0, 0x0, 0x5, 0x2, 0x5, 0x1}, - {0xC0, 0x21, 0x0, 0x0, 0x5, 0x3, 0x0, 0x2}, - {0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x1, 0x3}, - {0xC0, 0x51, 0x0, 0x0, 0x1, 0x5, 0x2, 0x4}, - {0x40, 0x79, 0x0, 0x0, 0x2, 0x0, 0x3, 0x5}, - {0xC0, 0x81, 0x0, 0x0, 0x3, 0x0, 0x4, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0} + { 0x40, 0x19, 0x0, 0x0, 0x5, 0x2, 0x5, 0x1 }, + { 0xC0, 0x21, 0x0, 0x0, 0x5, 0x3, 0x0, 0x2 }, + { 0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x1, 0x3 }, + { 0xC0, 0x51, 0x0, 0x0, 0x1, 0x5, 0x2, 0x4 }, + { 0x40, 0x79, 0x0, 0x0, 0x2, 0x0, 0x3, 0x5 }, + { 0xC0, 0x81, 0x0, 0x0, 0x3, 0x0, 0x4, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }; static const u16 Unk_020F1CB0[] = { @@ -247,10 +241,10 @@ static const u16 Unk_020F1CB0[] = { 0x87 }; -static int sub_0207E0B8 (OverlayManager * param0, int * param1) +static int sub_0207E0B8(OverlayManager *param0, int *param1) { - GameWindowLayout * v0; - NARC * v1; + GameWindowLayout *v0; + NARC *v1; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -323,9 +317,9 @@ static int sub_0207E0B8 (OverlayManager * param0, int * param1) return 1; } -static int sub_0207E2A8 (OverlayManager * param0, int * param1) +static int sub_0207E2A8(OverlayManager *param0, int *param1) { - GameWindowLayout * v0 = OverlayManager_Data(param0); + GameWindowLayout *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -414,8 +408,7 @@ static int sub_0207E2A8 (OverlayManager * param0, int * param1) case 27: *param1 = sub_0207E714(v0); break; - case 28: - { + case 28: { u8 v1 = sub_020805E4(v0); if (v1 == 0) { @@ -423,8 +416,7 @@ static int sub_0207E2A8 (OverlayManager * param0, int * param1) } else if (v1 == 3) { *param1 = 1; } - } - break; + } break; case 29: if (sub_02083D1C(v0) == 1) { *param1 = 1; @@ -461,7 +453,7 @@ static int sub_0207E2A8 (OverlayManager * param0, int * param1) return 0; } -static int sub_0207E490 (GameWindowLayout * param0) +static int sub_0207E490(GameWindowLayout *param0) { if (ScreenWipe_Done() == 1) { if ((param0->unk_5A4->unk_20 == 5) || (param0->unk_5A4->unk_20 == 16)) { @@ -491,7 +483,7 @@ static int sub_0207E490 (GameWindowLayout * param0) return 0; } -static int sub_0207E518 (GameWindowLayout * param0) +static int sub_0207E518(GameWindowLayout *param0) { u8 v0 = sub_0207FE98(param0); @@ -525,7 +517,7 @@ static int sub_0207E518 (GameWindowLayout * param0) return 1; } -static int sub_0207E5B4 (GameWindowLayout * param0) +static int sub_0207E5B4(GameWindowLayout *param0) { u8 v0 = HandleSpecialInput(param0); @@ -540,7 +532,7 @@ static int sub_0207E5B4 (GameWindowLayout * param0) return 4; } -static int sub_0207E5F4 (GameWindowLayout * param0) +static int sub_0207E5F4(GameWindowLayout *param0) { u8 v0 = HandleSpecialInput(param0); @@ -555,7 +547,7 @@ static int sub_0207E5F4 (GameWindowLayout * param0) return 8; } -static int sub_0207E634 (GameWindowLayout * param0) +static int sub_0207E634(GameWindowLayout *param0) { u32 v0 = sub_02001BE0(param0->unk_700); @@ -571,8 +563,7 @@ static int sub_0207E634 (GameWindowLayout * param0) sub_020826E0(param0, 29, 1); sub_0200D414(param0->unk_5B0[6], 0); return 1; - default: - { + default: { UnkFuncPtr_0207E634 v1; int v2; @@ -586,7 +577,7 @@ static int sub_0207E634 (GameWindowLayout * param0) return 15; } -static int sub_0207E6C0 (GameWindowLayout * param0) +static int sub_0207E6C0(GameWindowLayout *param0) { if (Message_Printing(param0->unk_B10) == 0) { return param0->unk_B0E; @@ -595,7 +586,7 @@ static int sub_0207E6C0 (GameWindowLayout * param0) return 24; } -static int sub_0207E6E4 (GameWindowLayout * param0) +static int sub_0207E6E4(GameWindowLayout *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { Sound_PlayEffect(1500); @@ -605,13 +596,13 @@ static int sub_0207E6E4 (GameWindowLayout * param0) return 25; } -static int sub_0207E708 (GameWindowLayout * param0) +static int sub_0207E708(GameWindowLayout *param0) { sub_020827EC(param0); return 27; } -static int sub_0207E714 (GameWindowLayout * param0) +static int sub_0207E714(GameWindowLayout *param0) { switch (sub_02002114(param0->unk_700, 12)) { case 0: @@ -623,7 +614,7 @@ static int sub_0207E714 (GameWindowLayout * param0) return 27; } -static int sub_0207E750 (GameWindowLayout * param0) +static int sub_0207E750(GameWindowLayout *param0) { u8 v0 = HandleSpecialInput(param0); @@ -647,9 +638,9 @@ static int sub_0207E750 (GameWindowLayout * param0) return 21; } -static int sub_0207E7E0 (OverlayManager * param0, int * param1) +static int sub_0207E7E0(OverlayManager *param0, int *param1) { - GameWindowLayout * v0 = OverlayManager_Data(param0); + GameWindowLayout *v0 = OverlayManager_Data(param0); u32 v1; SetMainCallback(NULL, NULL); @@ -684,9 +675,9 @@ static int sub_0207E7E0 (OverlayManager * param0, int * param1) return 1; } -static void sub_0207E898 (void * param0) +static void sub_0207E898(void *param0) { - GameWindowLayout * v0 = param0; + GameWindowLayout *v0 = param0; sub_0201C2B8(v0->unk_00); sub_0201DCAC(); @@ -695,7 +686,7 @@ static void sub_0207E898 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void sub_0207E8C0 (void) +static void sub_0207E8C0(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -713,7 +704,7 @@ static void sub_0207E8C0 (void) GXLayers_SetBanks(&v0); } -static void sub_0207E8E0 (BGL * param0) +static void sub_0207E8E0(BGL *param0) { UnkStruct_ov97_0222DB78 v0 = { 0, @@ -735,7 +726,7 @@ static void sub_0207E8E0 (BGL * param0) sub_02019EBC(param0, 0); } -static void sub_0207E918 (BGL * param0) +static void sub_0207E918(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -859,7 +850,7 @@ static void sub_0207E918 (BGL * param0) sub_02019690(4, 32, 0, 12); } -static void sub_0207EA24 (BGL * param0) +static void sub_0207EA24(BGL *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0); GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_OBJ, 0); @@ -872,7 +863,7 @@ static void sub_0207EA24 (BGL * param0) Heap_FreeToHeapExplicit(12, param0); } -void sub_0207EA74 (GameWindowLayout * param0, int param1) +void sub_0207EA74(GameWindowLayout *param0, int param1) { if (param1 == 0) { sub_02019120(0, 0); @@ -891,15 +882,15 @@ void sub_0207EA74 (GameWindowLayout * param0, int param1) } } -static GenericPointerData * sub_0207EAD4 (int param0) +static GenericPointerData *sub_0207EAD4(int param0) { - GenericPointerData * v0; + GenericPointerData *v0; v0 = sub_02024220(param0, 0, 1, 0, 2, sub_0207EAF4); return v0; } -static void sub_0207EAF4 (void) +static void sub_0207EAF4(void) { G3X_SetShading(GX_SHADING_TOON); G3X_AntiAlias(1); @@ -911,20 +902,20 @@ static void sub_0207EAF4 (void) G3_ViewPort(0, 0, 255, 191); } -static void sub_0207EB64 (GenericPointerData * param0) +static void sub_0207EB64(GenericPointerData *param0) { sub_020242C4(param0); } -static void sub_0207EB6C (GameWindowLayout * param0, NARC * param1) +static void sub_0207EB6C(GameWindowLayout *param0, NARC *param1) { sub_020070E8(param1, 15, param0->unk_00, 3, 0, 0, 0, 12); sub_0200710C(param1, 17, param0->unk_00, 3, 0, 0, 0, 12); { - NNSG2dPaletteData * v0; - void * v1; - u16 * v2; + NNSG2dPaletteData *v0; + void *v1; + u16 *v2; v1 = NARC_AllocAndReadWholeMember(param1, 16, 12); NNS_G2dGetUnpackedPaletteData(v1, &v0); @@ -948,9 +939,9 @@ static void sub_0207EB6C (GameWindowLayout * param0, NARC * param1) sub_0201975C(4, 0); } -static GameWindowLayout * sub_0207ECC0 (OverlayManager * param0) +static GameWindowLayout *sub_0207ECC0(OverlayManager *param0) { - GameWindowLayout * v0; + GameWindowLayout *v0; u32 v1; v0 = OverlayManager_NewData(param0, sizeof(GameWindowLayout), 12); @@ -986,7 +977,7 @@ static GameWindowLayout * sub_0207ECC0 (OverlayManager * param0) return v0; } -static void sub_0207EDC0 (GameWindowLayout * param0) +static void sub_0207EDC0(GameWindowLayout *param0) { if ((param0->unk_5A4->unk_20 & 0x80) != 0) { param0->unk_B0F_7 = 1; @@ -998,7 +989,7 @@ static void sub_0207EDC0 (GameWindowLayout * param0) } } -static void sub_0207EE14 (GameWindowLayout * param0) +static void sub_0207EE14(GameWindowLayout *param0) { u8 v0 = 3; @@ -1034,14 +1025,14 @@ static void sub_0207EE14 (GameWindowLayout * param0) sub_020825B4(param0, v0); } -u8 sub_0207EF04 (GameWindowLayout * param0, u8 param1) +u8 sub_0207EF04(GameWindowLayout *param0, u8 param1) { return param0->unk_704[param1].unk_29; } -u8 sub_0207EF14 (GameWindowLayout * param0, u8 param1) +u8 sub_0207EF14(GameWindowLayout *param0, u8 param1) { - Pokemon * v0; + Pokemon *v0; u32 v1; u16 v2; @@ -1084,7 +1075,7 @@ u8 sub_0207EF14 (GameWindowLayout * param0, u8 param1) return 1; } -static void sub_0207F094 (GameWindowLayout * param0, Pokemon * param1, u8 param2) +static void sub_0207F094(GameWindowLayout *param0, Pokemon *param1, u8 param2) { u32 v0; u32 v1; @@ -1113,7 +1104,7 @@ static void sub_0207F094 (GameWindowLayout * param0, Pokemon * param1, u8 param2 } } -static u32 sub_0207F134 (Pokemon * param0, u8 param1) +static u32 sub_0207F134(Pokemon *param0, u8 param1) { u32 v0; @@ -1152,14 +1143,14 @@ static u32 sub_0207F134 (Pokemon * param0, u8 param1) return v0; } -const u16 * sub_0207F248 (GameWindowLayout * param0) +const u16 *sub_0207F248(GameWindowLayout *param0) { return ¶m0->unk_324[3 * 16 + 6]; } -static void sub_0207F250 (GameWindowLayout * param0, u8 param1, u8 param2, u8 param3, u8 param4) +static void sub_0207F250(GameWindowLayout *param0, u8 param1, u8 param2, u8 param3, u8 param4) { - const u16 * v0; + const u16 *v0; if ((param1 == 0) || ((param0->unk_5A4->unk_21 != 0) && (param1 == 1))) { v0 = param0->unk_264; @@ -1181,9 +1172,9 @@ static void sub_0207F250 (GameWindowLayout * param0, u8 param1, u8 param2, u8 pa sub_0207F8F8(param0, param1); } -static void sub_0207F308 (GameWindowLayout * param0) +static void sub_0207F308(GameWindowLayout *param0) { - const UnkStruct_020F1DF8 * v0; + const UnkStruct_020F1DF8 *v0; if (param0->unk_5A4->unk_21 == 2) { v0 = Unk_020F1DF8[1]; @@ -1207,10 +1198,10 @@ static void sub_0207F308 (GameWindowLayout * param0) sub_0201C3C0(param0->unk_00, 4); } -static void sub_0207F388 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1) +static void sub_0207F388(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1) { u8 v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 12); @@ -1239,10 +1230,10 @@ static void sub_0207F388 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * NARC_dtor(v1); } -static void sub_0207F4AC (GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1) +static void sub_0207F4AC(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1) { u8 v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 12); @@ -1266,10 +1257,10 @@ static void sub_0207F4AC (GameWindowLayout * param0, const UnkStruct_020F1DF8 * NARC_dtor(v1); } -static void sub_0207F5A0 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1) +static void sub_0207F5A0(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1) { u8 v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 12); @@ -1293,10 +1284,10 @@ static void sub_0207F5A0 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * NARC_dtor(v1); } -static void sub_0207F694 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1) +static void sub_0207F694(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1) { u8 v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 12); @@ -1320,10 +1311,10 @@ static void sub_0207F694 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * NARC_dtor(v1); } -static void sub_0207F788 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1) +static void sub_0207F788(GameWindowLayout *param0, const UnkStruct_020F1DF8 *param1) { u8 v0; - NARC * v1; + NARC *v1; v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 12); @@ -1348,7 +1339,7 @@ static void sub_0207F788 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * NARC_dtor(v1); } -static void sub_0207F884 (GameWindowLayout * param0, u8 param1, s16 param2, s16 param3) +static void sub_0207F884(GameWindowLayout *param0, u8 param1, s16 param2, s16 param3) { sub_020198E8(param0->unk_00, 2, param2, param3, 16, 6, (const void *)param0->unk_3E4, 0, 0, 16, 6); sub_02019E2C(param0->unk_00, 2, param2, param3, 16, 6, 1); @@ -1357,9 +1348,9 @@ static void sub_0207F884 (GameWindowLayout * param0, u8 param1, s16 param2, s16 sub_02083104(param0, param1); } -void sub_0207F8F8 (GameWindowLayout * param0, u8 param1) +void sub_0207F8F8(GameWindowLayout *param0, u8 param1) { - Pokemon * v0; + Pokemon *v0; u8 v1; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); @@ -1385,7 +1376,7 @@ void sub_0207F8F8 (GameWindowLayout * param0, u8 param1) sub_0201972C(2, ¶m0->unk_4A4[v1 * 16], 8 * 2, (3 + param1) * 32); } -static u8 sub_0207F984 (GameWindowLayout * param0, u8 param1) +static u8 sub_0207F984(GameWindowLayout *param0, u8 param1) { if ((param0->unk_5A4->unk_21 == 2) && ((param1 & 1) != 0)) { return 1; @@ -1394,7 +1385,7 @@ static u8 sub_0207F984 (GameWindowLayout * param0, u8 param1) return 0; } -static void sub_0207F9A0 (GameWindowLayout * param0) +static void sub_0207F9A0(GameWindowLayout *param0) { u8 v0, v1; @@ -1404,13 +1395,13 @@ static void sub_0207F9A0 (GameWindowLayout * param0) } static const u8 Unk_020F1BD4[][6] = { - {0x0, 0x2, 0x4, 0x1, 0x3, 0x5}, - {0x1, 0x3, 0x5, 0x0, 0x2, 0x4}, - {0x4, 0x2, 0x0, 0x5, 0x3, 0x1}, - {0x5, 0x3, 0x1, 0x4, 0x2, 0x0} + { 0x0, 0x2, 0x4, 0x1, 0x3, 0x5 }, + { 0x1, 0x3, 0x5, 0x0, 0x2, 0x4 }, + { 0x4, 0x2, 0x0, 0x5, 0x3, 0x1 }, + { 0x5, 0x3, 0x1, 0x4, 0x2, 0x0 } }; -static u8 sub_0207FA00 (GameWindowLayout * param0) +static u8 sub_0207FA00(GameWindowLayout *param0) { if (sub_0207FA24(param0) == 1) { return 1; @@ -1423,7 +1414,7 @@ static u8 sub_0207FA00 (GameWindowLayout * param0) return 5; } -static u8 sub_0207FA24 (GameWindowLayout * param0) +static u8 sub_0207FA24(GameWindowLayout *param0) { u8 v0; u8 v1; @@ -1498,7 +1489,7 @@ static u8 sub_0207FA24 (GameWindowLayout * param0) return 0; } -static u8 sub_0207FBE0 (GameWindowLayout * param0, u8 * param1, u8 * param2, u8 param3) +static u8 sub_0207FBE0(GameWindowLayout *param0, u8 *param1, u8 *param2, u8 param3) { u8 v0 = param0->unk_B11; @@ -1517,7 +1508,7 @@ static u8 sub_0207FBE0 (GameWindowLayout * param0, u8 * param1, u8 * param2, u8 return v0; } -static u8 sub_0207FC30 (GameWindowLayout * param0, u8 * param1, u8 * param2, const u8 * param3) +static u8 sub_0207FC30(GameWindowLayout *param0, u8 *param1, u8 *param2, const u8 *param3) { u8 v0 = 0; @@ -1538,7 +1529,7 @@ static u8 sub_0207FC30 (GameWindowLayout * param0, u8 * param1, u8 * param2, con return 0; } -static u8 sub_0207FC94 (GameWindowLayout * param0) +static u8 sub_0207FC94(GameWindowLayout *param0) { int v0 = GetValidWindowLayout(param0); @@ -1576,7 +1567,7 @@ static u8 sub_0207FC94 (GameWindowLayout * param0) return 0; } -void sub_0207FD68 (GameWindowLayout * param0, u8 param1) +void sub_0207FD68(GameWindowLayout *param0, u8 param1) { if ((param1 == 6) || (param1 == 7)) { sub_02021CAC(param0->unk_5B0[6], 0); @@ -1603,7 +1594,7 @@ void sub_0207FD68 (GameWindowLayout * param0, u8 param1) } } -static void sub_0207FE1C (GameWindowLayout * param0) +static void sub_0207FE1C(GameWindowLayout *param0) { switch (param0->unk_B0C) { case 0: @@ -1628,7 +1619,7 @@ static void sub_0207FE1C (GameWindowLayout * param0) } } -static u8 sub_0207FE98 (GameWindowLayout * param0) +static u8 sub_0207FE98(GameWindowLayout *param0) { u8 v0; @@ -1694,9 +1685,9 @@ static u8 sub_0207FE98 (GameWindowLayout * param0) return v0; } -static void sub_0207FFC8 (GameWindowLayout * param0) +static void sub_0207FFC8(GameWindowLayout *param0) { - u8 * v0; + u8 *v0; u8 v1; sub_0200E084(¶m0->unk_04[32], 1); @@ -1737,9 +1728,9 @@ static void sub_0207FFC8 (GameWindowLayout * param0) sub_0200D414(param0->unk_5B0[6], 1); } -static u8 sub_020800B4 (GameWindowLayout * param0, u8 * param1) +static u8 sub_020800B4(GameWindowLayout *param0, u8 *param1) { - Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + Pokemon *v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); u16 v1; u8 v2 = 0, v3, v4 = 0, v5; @@ -1787,7 +1778,7 @@ static u8 sub_020800B4 (GameWindowLayout * param0, u8 * param1) return v4; } -static u8 sub_020801AC (GameWindowLayout * param0, u8 * param1) +static u8 sub_020801AC(GameWindowLayout *param0, u8 *param1) { param1[0] = 14; param1[1] = 9; @@ -1795,7 +1786,7 @@ static u8 sub_020801AC (GameWindowLayout * param0, u8 * param1) return 2; } -static u8 sub_020801B8 (GameWindowLayout * param0, u8 * param1) +static u8 sub_020801B8(GameWindowLayout *param0, u8 *param1) { if (param0->unk_704[param0->unk_B11].unk_10 == 0) { param1[0] = 8; @@ -1811,7 +1802,7 @@ static u8 sub_020801B8 (GameWindowLayout * param0, u8 * param1) return 2; } -static u8 sub_020801F0 (GameWindowLayout * param0, u8 * param1) +static u8 sub_020801F0(GameWindowLayout *param0, u8 *param1) { if (param0->unk_704[param0->unk_B11].unk_0E_15 == 1) { param1[0] = 13; @@ -1827,7 +1818,7 @@ static u8 sub_020801F0 (GameWindowLayout * param0, u8 * param1) return 2; } -static u8 sub_0208022C (GameWindowLayout * param0, u8 * param1) +static u8 sub_0208022C(GameWindowLayout *param0, u8 *param1) { switch (sub_02080354(param0, param0->unk_B11)) { case 0: @@ -1849,7 +1840,7 @@ static u8 sub_0208022C (GameWindowLayout * param0, u8 * param1) return 0; } -static u8 sub_0208027C (GameWindowLayout * param0, u8 * param1) +static u8 sub_0208027C(GameWindowLayout *param0, u8 *param1) { switch (sub_02080404(param0, param0->unk_B11)) { case 0: @@ -1871,7 +1862,7 @@ static u8 sub_0208027C (GameWindowLayout * param0, u8 * param1) return 0; } -static u8 sub_020802CC (GameWindowLayout * param0, u8 * param1) +static u8 sub_020802CC(GameWindowLayout *param0, u8 *param1) { switch (sub_02080488(param0, param0->unk_B11)) { case 0: @@ -1893,7 +1884,7 @@ static u8 sub_020802CC (GameWindowLayout * param0, u8 * param1) return 0; } -static u8 sub_0208031C (GameWindowLayout * param0, u8 * param1) +static u8 sub_0208031C(GameWindowLayout *param0, u8 *param1) { if (param0->unk_704[param0->unk_B11].unk_10 == 1) { param1[0] = 1; @@ -1908,12 +1899,12 @@ static u8 sub_0208031C (GameWindowLayout * param0, u8 * param1) return 2; } -u8 sub_02080354 (GameWindowLayout * param0, u8 param1) +u8 sub_02080354(GameWindowLayout *param0, u8 param1) { u8 v0; if (param0->unk_5A4->unk_14 != NULL) { - Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); + Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); if (sub_0207A2D0(param0->unk_5A4->unk_14, v1, param0->unk_B20) == 0) { return 0; @@ -1939,7 +1930,7 @@ u8 sub_02080354 (GameWindowLayout * param0, u8 param1) return 1; } -u8 sub_02080404 (GameWindowLayout * param0, u8 param1) +u8 sub_02080404(GameWindowLayout *param0, u8 param1) { u8 v0; @@ -1962,7 +1953,7 @@ u8 sub_02080404 (GameWindowLayout * param0, u8 param1) return 1; } -u8 sub_02080488 (GameWindowLayout * param0, u8 param1) +u8 sub_02080488(GameWindowLayout *param0, u8 param1) { u8 v0; @@ -1985,7 +1976,7 @@ u8 sub_02080488 (GameWindowLayout * param0, u8 param1) return 1; } -static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2) +static void sub_02080500(GameWindowLayout *param0, u8 param1, u8 param2) { if (param1 == 6) { u8 v0 = sub_02021E24(param0->unk_5B0[8]); @@ -2028,7 +2019,7 @@ static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2) sub_0207F8F8(param0, param1); } -u8 sub_020805D0 (u8 param0, u8 param1) +u8 sub_020805D0(u8 param0, u8 param1) { if ((param1 == 0) || ((param0 != 0) && (param1 == 1))) { return 1; @@ -2037,7 +2028,7 @@ u8 sub_020805D0 (u8 param0, u8 param1) return 0; } -static u8 sub_020805E4 (GameWindowLayout * param0) +static u8 sub_020805E4(GameWindowLayout *param0) { u8 v0; @@ -2074,7 +2065,7 @@ static u8 sub_020805E4 (GameWindowLayout * param0) return v0; } -static int HandleGameWindowEvent (GameWindowLayout * param0) +static int HandleGameWindowEvent(GameWindowLayout *param0) { u8 v0; @@ -2112,9 +2103,8 @@ static int HandleGameWindowEvent (GameWindowLayout * param0) case 0: break; - case 1: - { - Strbuf* v1; + case 1: { + Strbuf *v1; int v2; v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 184); @@ -2187,7 +2177,7 @@ static int HandleGameWindowEvent (GameWindowLayout * param0) return 32; } -static u8 CheckDuplicateValues (GameWindowLayout * param0) +static u8 CheckDuplicateValues(GameWindowLayout *param0) { u8 v0, v1; @@ -2214,7 +2204,7 @@ static u8 CheckDuplicateValues (GameWindowLayout * param0) return 0; } -static u8 CheckUniqueValues (GameWindowLayout * param0) +static u8 CheckUniqueValues(GameWindowLayout *param0) { u8 v0, v1; @@ -2237,7 +2227,7 @@ static u8 CheckUniqueValues (GameWindowLayout * param0) return 0; } -static u8 CheckEqualityInArray (GameWindowLayout * param0) +static u8 CheckEqualityInArray(GameWindowLayout *param0) { u8 v0, v1; @@ -2261,27 +2251,27 @@ static u8 CheckEqualityInArray (GameWindowLayout * param0) } static const u8 Unk_020F1BB8[6][2] = { - {0x1, 0x3}, - {0x1A, 0x3}, - {0x1, 0xA}, - {0x1A, 0xA}, - {0x1, 0x11}, - {0x1A, 0x11} + { 0x1, 0x3 }, + { 0x1A, 0x3 }, + { 0x1, 0xA }, + { 0x1A, 0xA }, + { 0x1, 0x11 }, + { 0x1A, 0x11 } }; static const TouchScreenRect Unk_020F1C94[] = { - {0x18, 0x3F, 0x8, 0x2F}, - {0x18, 0x3F, 0xD0, 0xF7}, - {0x50, 0x77, 0x8, 0x2F}, - {0x50, 0x77, 0xD0, 0xF7}, - {0x88, 0xAF, 0x8, 0x2F}, - {0x88, 0xAF, 0xD0, 0xF7}, - {0xFF, 0x0, 0x0, 0x0} + { 0x18, 0x3F, 0x8, 0x2F }, + { 0x18, 0x3F, 0xD0, 0xF7 }, + { 0x50, 0x77, 0x8, 0x2F }, + { 0x50, 0x77, 0xD0, 0xF7 }, + { 0x88, 0xAF, 0x8, 0x2F }, + { 0x88, 0xAF, 0xD0, 0xF7 }, + { 0xFF, 0x0, 0x0, 0x0 } }; -static void UpdateWindowLayout (GameWindowLayout * param0, u8 param1, u8 param2) +static void UpdateWindowLayout(GameWindowLayout *param0, u8 param1, u8 param2) { - u16 * v0; + u16 *v0; u16 v1; u8 v2, v3; u8 v4, v5; @@ -2298,13 +2288,13 @@ static void UpdateWindowLayout (GameWindowLayout * param0, u8 param1, u8 param2) } } -static void CalculateWindowPosition (u8 param0, s16 * param1, s16 * param2) +static void CalculateWindowPosition(u8 param0, s16 *param1, s16 *param2) { *param1 = Unk_020F1BB8[param0][0] * 8 + ((5 * 8) >> 1); *param2 = Unk_020F1BB8[param0][1] * 8 + ((5 * 8) >> 1); } -static int GetValidWindowLayout (GameWindowLayout * param0) +static int GetValidWindowLayout(GameWindowLayout *param0) { int v0; @@ -2325,7 +2315,7 @@ static int GetValidWindowLayout (GameWindowLayout * param0) return v0; } -static u8 HandleWindowInputEvent (GameWindowLayout * param0, int * param1) +static u8 HandleWindowInputEvent(GameWindowLayout *param0, int *param1) { u32 v0 = sub_02001BE0(param0->unk_700); @@ -2346,8 +2336,7 @@ static u8 HandleWindowInputEvent (GameWindowLayout * param0, int * param1) sub_0200D414(param0->unk_5B0[6], 0); return 1; - default: - { + default: { UnkFuncPtr_0207E634 v1 = (UnkFuncPtr_0207E634)v0; v1(param0, param1); } @@ -2356,7 +2345,7 @@ static u8 HandleWindowInputEvent (GameWindowLayout * param0, int * param1) return 0; } -u8 GetElementIndex (u16 param0) +u8 GetElementIndex(u16 param0) { u8 v0; @@ -2369,7 +2358,7 @@ u8 GetElementIndex (u16 param0) return 0xff; } -static int ProcessWindowInput (GameWindowLayout * param0) +static int ProcessWindowInput(GameWindowLayout *param0) { switch (param0->unk_B14[1]) { case 0: @@ -2453,10 +2442,10 @@ static int ProcessWindowInput (GameWindowLayout * param0) break; case 3: if (UpdatePokemonStatus(param0, param0->unk_B11, 1) == 1) { - Pokemon * v0; - Strbuf* v1; - void * v2; - FieldSystem * fieldSystem; + Pokemon *v0; + Strbuf *v1; + void *v2; + FieldSystem *fieldSystem; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 64); @@ -2489,7 +2478,7 @@ static int ProcessWindowInput (GameWindowLayout * param0) return 30; } -static u8 CheckPokemonCondition (GameWindowLayout * param0) +static u8 CheckPokemonCondition(GameWindowLayout *param0) { if (param0->unk_704[param0->unk_B11].unk_10 != 0) { return 2; @@ -2508,7 +2497,7 @@ static u8 CheckPokemonCondition (GameWindowLayout * param0) return 0; } -static BOOL UpdatePokemonStatus (GameWindowLayout * param0, u8 slot, s8 param2) +static BOOL UpdatePokemonStatus(GameWindowLayout *param0, u8 slot, s8 param2) { param0->unk_704[slot].unk_06 += param2; param0->unk_B14[2]++; @@ -2519,8 +2508,8 @@ static BOOL UpdatePokemonStatus (GameWindowLayout * param0, u8 slot, s8 param2) sub_02082104(param0, slot); if ((param0->unk_B14[0] == param0->unk_B14[2]) || (param0->unk_704[slot].unk_06 == param0->unk_704[slot].unk_08)) { - Pokemon * mon; - u32 v1; + Pokemon *mon; + u32 v1; mon = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, slot); v1 = param0->unk_704[slot].unk_06; @@ -2531,7 +2520,7 @@ static BOOL UpdatePokemonStatus (GameWindowLayout * param0, u8 slot, s8 param2) return 0; } -static u8 HandleSpecialInput (GameWindowLayout * param0) +static u8 HandleSpecialInput(GameWindowLayout *param0) { u8 v0; @@ -2575,9 +2564,9 @@ static u8 HandleSpecialInput (GameWindowLayout * param0) return v0; } -static int ApplyItemEffectOnPokemon (GameWindowLayout * param0) +static int ApplyItemEffectOnPokemon(GameWindowLayout *param0) { - ItemData * v0; + ItemData *v0; v0 = Item_Load(param0->unk_5A4->unk_24, 0, 12); @@ -2604,7 +2593,7 @@ static int ApplyItemEffectOnPokemon (GameWindowLayout * param0) Bag_TryRemoveItem(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, 12); if (Item_Get(v0, 26) != 0) { - Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); param0->unk_5A4->unk_38 = sub_02076B94(NULL, v1, 3, param0->unk_5A4->unk_24, ¶m0->unk_5A4->unk_3C); param0->unk_5A4->unk_23 = 8; @@ -2613,7 +2602,7 @@ static int ApplyItemEffectOnPokemon (GameWindowLayout * param0) } if ((Item_IsHerbalMedicine(param0->unk_5A4->unk_24) == 1) && (param0->unk_5A4->unk_10 != NULL)) { - Pokemon * v2 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + Pokemon *v2 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); sub_0206D90C(param0->unk_5A4->unk_10, v2, param0->unk_5A4->unk_24); } @@ -2628,7 +2617,7 @@ static int ApplyItemEffectOnPokemon (GameWindowLayout * param0) return 5; } -static u8 CheckItemUsageValidity (GameWindowLayout * param0) +static u8 CheckItemUsageValidity(GameWindowLayout *param0) { if (param0->unk_704[param0->unk_B11].unk_0C == 0) { return 0; @@ -2639,12 +2628,12 @@ static u8 CheckItemUsageValidity (GameWindowLayout * param0) return 1; } -static int ProcessItemApplication (GameWindowLayout * param0) +static int ProcessItemApplication(GameWindowLayout *param0) { - Pokemon * v0; - Window * v1; + Pokemon *v0; + Window *v1; int v2 = -1, v3; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); v1 = ¶m0->unk_04[34]; @@ -2703,10 +2692,10 @@ static int ProcessItemApplication (GameWindowLayout * param0) return v2; } -static int UpdatePokemonWithItem (GameWindowLayout * param0, Pokemon * param1, int * param2) +static int UpdatePokemonWithItem(GameWindowLayout *param0, Pokemon *param1, int *param2) { u32 v0 = param0->unk_5A4->unk_24; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; fieldSystem = param0->unk_5A4->unk_1C; @@ -2730,7 +2719,7 @@ static int UpdatePokemonWithItem (GameWindowLayout * param0, Pokemon * param1, i return 11; } -static void SwapPokemonItem (GameWindowLayout * param0, Pokemon * param1, u32 param2, u32 param3) +static void SwapPokemonItem(GameWindowLayout *param0, Pokemon *param1, u32 param2, u32 param3) { Bag_TryAddItem(param0->unk_5A4->unk_04, (u16)param2, 1, 12); Pokemon_SetValue(param1, 6, ¶m3); @@ -2740,7 +2729,7 @@ static void SwapPokemonItem (GameWindowLayout * param0, Pokemon * param1, u32 pa sub_02083040(param0, param0->unk_B11, param0->unk_704[param0->unk_B11].unk_0C); } -static int HandleMessageCompletion (GameWindowLayout * param0) +static int HandleMessageCompletion(GameWindowLayout *param0) { if (Message_Printing(param0->unk_B10) == 0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -2751,7 +2740,7 @@ static int HandleMessageCompletion (GameWindowLayout * param0) return 11; } -static int ProcessMessageResult (GameWindowLayout * param0) +static int ProcessMessageResult(GameWindowLayout *param0) { if (Message_Printing(param0->unk_B10) == 0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -2764,7 +2753,7 @@ static int ProcessMessageResult (GameWindowLayout * param0) return 12; } -static int HandleOverlayCompletion (GameWindowLayout * param0) +static int HandleOverlayCompletion(GameWindowLayout *param0) { if (ov118_021D0DBC(param0) == 1) { UnloadOverlay118(param0); @@ -2775,7 +2764,7 @@ static int HandleOverlayCompletion (GameWindowLayout * param0) return 13; } -static int FinalizeMessageProcessing (GameWindowLayout * param0) +static int FinalizeMessageProcessing(GameWindowLayout *param0) { if (Message_Printing(param0->unk_B10) == 0) { sub_020827EC(param0); @@ -2785,15 +2774,14 @@ static int FinalizeMessageProcessing (GameWindowLayout * param0) return 9; } -static int ProcessPokemonItemSwap (GameWindowLayout * param0) +static int ProcessPokemonItemSwap(GameWindowLayout *param0) { int v0, v1; switch (sub_02002114(param0->unk_700, 12)) { - case 0: - { - Pokemon * v2; - Window * v3; + case 0: { + Pokemon *v2; + Window *v3; u32 v4; u32 v5; @@ -2838,7 +2826,7 @@ static int ProcessPokemonItemSwap (GameWindowLayout * param0) return 10; } -static int ResetWindowOnInput (GameWindowLayout * param0) +static int ResetWindowOnInput(GameWindowLayout *param0) { if (param0->unk_5A4->unk_20 == 10) { sub_0200E084(¶m0->unk_04[34], 1); @@ -2852,10 +2840,10 @@ static int ResetWindowOnInput (GameWindowLayout * param0) return 32; } -static int UpdatePokemonFormWithItem (GameWindowLayout * param0) +static int UpdatePokemonFormWithItem(GameWindowLayout *param0) { - Pokemon * v0; - Window * v1; + Pokemon *v0; + Window *v1; u32 v2; u32 v3; int v4, v5; @@ -2894,7 +2882,7 @@ static int UpdatePokemonFormWithItem (GameWindowLayout * param0) return v4; } -static int CheckForItemApplication (GameWindowLayout * param0) +static int CheckForItemApplication(GameWindowLayout *param0) { if (param0->unk_704[param0->unk_B11].unk_12 == 0) { param0->unk_5A4->unk_23 = 0; @@ -2909,7 +2897,7 @@ static int CheckForItemApplication (GameWindowLayout * param0) return 24; } -static BOOL ValidateGameWindowState (GameWindowLayout * param0) +static BOOL ValidateGameWindowState(GameWindowLayout *param0) { if ((param0->unk_5A4->unk_20 == 5) || (param0->unk_5A4->unk_20 == 6) || (param0->unk_5A4->unk_20 == 7) || (param0->unk_5A4->unk_20 == 8) || (param0->unk_5A4->unk_20 == 9) || (param0->unk_5A4->unk_20 == 11) || (param0->unk_5A4->unk_20 == 14) || (param0->unk_5A4->unk_20 == 16) || (param0->unk_5A4->unk_20 == 20)) { return 0; @@ -2918,31 +2906,31 @@ static BOOL ValidateGameWindowState (GameWindowLayout * param0) return 1; } -u32 sub_02081930 (void) +u32 sub_02081930(void) { return 20; } -u32 sub_02081934 (void) +u32 sub_02081934(void) { return 21; } -u32 sub_02081938 (void) +u32 sub_02081938(void) { return 19; } -u32 sub_0208193C (void) +u32 sub_0208193C(void) { return 18; } -void LoadScreenDataFromNARC (u32 param0, u16 * param1, u16 * param2, u16 * param3) +void LoadScreenDataFromNARC(u32 param0, u16 *param1, u16 *param2, u16 *param3) { - NNSG2dScreenData * v0; - void * v1; - u16 * v2; + NNSG2dScreenData *v0; + void *v1; + u16 *v2; u32 v3; v1 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_GRAPHIC__PL_PLIST_GRA, 22, param0); @@ -2958,13 +2946,13 @@ void LoadScreenDataFromNARC (u32 param0, u16 * param1, u16 * param2, u16 * param Heap_FreeToHeap(v1); } -void LoadOverlay118 (GameWindowLayout * param0) +void LoadOverlay118(GameWindowLayout *param0) { Overlay_LoadByID(FS_OVERLAY_ID(overlay118), 2); ov118_021D0D80(param0); } -void UnloadOverlay118 (GameWindowLayout * param0) +void UnloadOverlay118(GameWindowLayout *param0) { Overlay_UnloadByID(FS_OVERLAY_ID(overlay118)); } diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index 5a34f63e83..aa9ff5c161 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -1,99 +1,98 @@ +#include "unk_020819DC.h" + #include #include #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "pokemon.h" - #include "struct_defs/struct_0201D738.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0207F248.h" #include "struct_defs/struct_02081CF4.h" + #include "overlay061/struct_ov61_0222C884.h" +#include "game_options.h" +#include "message.h" +#include "party.h" +#include "pokemon.h" +#include "strbuf.h" +#include "string_template.h" #include "unk_02001AF4.h" #include "unk_02002328.h" #include "unk_02002B7C.h" #include "unk_02005474.h" -#include "message.h" -#include "string_template.h" #include "unk_0200C440.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "game_options.h" -#include "pokemon.h" -#include "party.h" #include "unk_0207E0B8.h" -#include "unk_020819DC.h" #include "unk_02083370.h" #include "unk_02084B70.h" #include "unk_0208C098.h" -static void sub_02082810(GameWindowLayout * param0, u8 param1, u8 param2); -static void sub_02082880(GameWindowLayout * param0, u8 param1, u8 param2); -static void sub_02082900(GameWindowLayout * param0, u8 param1, u8 param2); -static void sub_02082964(GameWindowLayout * param0, u8 param1, u8 param2); -static BOOL sub_0208279C(UnkStruct_0201D738 * param0, u16 param1); +static void sub_02082810(GameWindowLayout *param0, u8 param1, u8 param2); +static void sub_02082880(GameWindowLayout *param0, u8 param1, u8 param2); +static void sub_02082900(GameWindowLayout *param0, u8 param1, u8 param2); +static void sub_02082964(GameWindowLayout *param0, u8 param1, u8 param2); +static BOOL sub_0208279C(UnkStruct_0201D738 *param0, u16 param1); static const UnkStruct_ov61_0222C884 Unk_020F1F08[] = { - {0x1, 0x6, 0x1, 0x9, 0x2, 0x0, 0x28}, - {0x1, 0x0, 0x4, 0x6, 0x2, 0x0, 0x3A}, - {0x1, 0x7, 0x4, 0x8, 0x2, 0x0, 0x46}, - {0x1, 0x8, 0x3, 0x6, 0x1, 0x3, 0x56}, - {0x1, 0x6, 0x4, 0xA, 0x2, 0x0, 0x46}, - {0x1, 0x16, 0x2, 0x9, 0x2, 0x0, 0x5C}, - {0x1, 0x10, 0x5, 0x6, 0x2, 0x0, 0x6E}, - {0x1, 0x17, 0x5, 0x8, 0x2, 0x0, 0x7A}, - {0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A}, - {0x1, 0x16, 0x5, 0xA, 0x2, 0x0, 0x7A}, - {0x1, 0x6, 0x7, 0x9, 0x2, 0x0, 0x90}, - {0x1, 0x0, 0xA, 0x6, 0x2, 0x0, 0xA2}, - {0x1, 0x7, 0xA, 0x8, 0x2, 0x0, 0xAE}, - {0x1, 0x8, 0x9, 0x6, 0x1, 0x5, 0xBE}, - {0x1, 0x6, 0xA, 0xA, 0x2, 0x0, 0xAE}, - {0x1, 0x16, 0x8, 0x9, 0x2, 0x0, 0xC4}, - {0x1, 0x10, 0xB, 0x6, 0x2, 0x0, 0xD6}, - {0x1, 0x17, 0xB, 0x8, 0x2, 0x0, 0xE2}, - {0x1, 0x18, 0xA, 0x6, 0x1, 0x6, 0xF2}, - {0x1, 0x16, 0xB, 0xA, 0x2, 0x0, 0xE2}, - {0x1, 0x6, 0xD, 0x9, 0x2, 0x0, 0xF8}, - {0x1, 0x0, 0x10, 0x6, 0x2, 0x0, 0x10A}, - {0x1, 0x7, 0x10, 0x8, 0x2, 0x0, 0x116}, - {0x1, 0x8, 0xF, 0x6, 0x1, 0x7, 0x126}, - {0x1, 0x6, 0x10, 0xA, 0x2, 0x0, 0x116}, - {0x1, 0x16, 0xE, 0x9, 0x2, 0x0, 0x12C}, - {0x1, 0x10, 0x11, 0x6, 0x2, 0x0, 0x13E}, - {0x1, 0x17, 0x11, 0x8, 0x2, 0x0, 0x14A}, - {0x1, 0x18, 0x10, 0x6, 0x1, 0x8, 0x15A}, - {0x1, 0x16, 0x11, 0xA, 0x2, 0x0, 0x14A}, - {0x1, 0x16, 0x1, 0x9, 0x2, 0x0, 0x5C}, - {0x1, 0x11, 0x5, 0x5, 0x2, 0x0, 0x6E}, - {0x1, 0x17, 0x5, 0x8, 0x2, 0x0, 0x7A}, - {0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A}, - {0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A}, - {0x1, 0x16, 0x8, 0x9, 0x2, 0x0, 0xC4}, - {0x1, 0x11, 0xB, 0x5, 0x2, 0x0, 0xD6}, - {0x1, 0x17, 0xB, 0x8, 0x2, 0x0, 0xE2}, - {0x1, 0x18, 0xA, 0x6, 0x1, 0x6, 0xF2}, - {0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A}, - {0x1, 0x16, 0xE, 0x9, 0x2, 0x0, 0x12C}, - {0x1, 0x11, 0x11, 0x5, 0x2, 0x0, 0x13E}, - {0x1, 0x17, 0x11, 0x8, 0x2, 0x0, 0x14A}, - {0x1, 0x18, 0x10, 0x6, 0x1, 0x8, 0x15A}, - {0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A} + { 0x1, 0x6, 0x1, 0x9, 0x2, 0x0, 0x28 }, + { 0x1, 0x0, 0x4, 0x6, 0x2, 0x0, 0x3A }, + { 0x1, 0x7, 0x4, 0x8, 0x2, 0x0, 0x46 }, + { 0x1, 0x8, 0x3, 0x6, 0x1, 0x3, 0x56 }, + { 0x1, 0x6, 0x4, 0xA, 0x2, 0x0, 0x46 }, + { 0x1, 0x16, 0x2, 0x9, 0x2, 0x0, 0x5C }, + { 0x1, 0x10, 0x5, 0x6, 0x2, 0x0, 0x6E }, + { 0x1, 0x17, 0x5, 0x8, 0x2, 0x0, 0x7A }, + { 0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A }, + { 0x1, 0x16, 0x5, 0xA, 0x2, 0x0, 0x7A }, + { 0x1, 0x6, 0x7, 0x9, 0x2, 0x0, 0x90 }, + { 0x1, 0x0, 0xA, 0x6, 0x2, 0x0, 0xA2 }, + { 0x1, 0x7, 0xA, 0x8, 0x2, 0x0, 0xAE }, + { 0x1, 0x8, 0x9, 0x6, 0x1, 0x5, 0xBE }, + { 0x1, 0x6, 0xA, 0xA, 0x2, 0x0, 0xAE }, + { 0x1, 0x16, 0x8, 0x9, 0x2, 0x0, 0xC4 }, + { 0x1, 0x10, 0xB, 0x6, 0x2, 0x0, 0xD6 }, + { 0x1, 0x17, 0xB, 0x8, 0x2, 0x0, 0xE2 }, + { 0x1, 0x18, 0xA, 0x6, 0x1, 0x6, 0xF2 }, + { 0x1, 0x16, 0xB, 0xA, 0x2, 0x0, 0xE2 }, + { 0x1, 0x6, 0xD, 0x9, 0x2, 0x0, 0xF8 }, + { 0x1, 0x0, 0x10, 0x6, 0x2, 0x0, 0x10A }, + { 0x1, 0x7, 0x10, 0x8, 0x2, 0x0, 0x116 }, + { 0x1, 0x8, 0xF, 0x6, 0x1, 0x7, 0x126 }, + { 0x1, 0x6, 0x10, 0xA, 0x2, 0x0, 0x116 }, + { 0x1, 0x16, 0xE, 0x9, 0x2, 0x0, 0x12C }, + { 0x1, 0x10, 0x11, 0x6, 0x2, 0x0, 0x13E }, + { 0x1, 0x17, 0x11, 0x8, 0x2, 0x0, 0x14A }, + { 0x1, 0x18, 0x10, 0x6, 0x1, 0x8, 0x15A }, + { 0x1, 0x16, 0x11, 0xA, 0x2, 0x0, 0x14A }, + { 0x1, 0x16, 0x1, 0x9, 0x2, 0x0, 0x5C }, + { 0x1, 0x11, 0x5, 0x5, 0x2, 0x0, 0x6E }, + { 0x1, 0x17, 0x5, 0x8, 0x2, 0x0, 0x7A }, + { 0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A }, + { 0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A }, + { 0x1, 0x16, 0x8, 0x9, 0x2, 0x0, 0xC4 }, + { 0x1, 0x11, 0xB, 0x5, 0x2, 0x0, 0xD6 }, + { 0x1, 0x17, 0xB, 0x8, 0x2, 0x0, 0xE2 }, + { 0x1, 0x18, 0xA, 0x6, 0x1, 0x6, 0xF2 }, + { 0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A }, + { 0x1, 0x16, 0xE, 0x9, 0x2, 0x0, 0x12C }, + { 0x1, 0x11, 0x11, 0x5, 0x2, 0x0, 0x13E }, + { 0x1, 0x17, 0x11, 0x8, 0x2, 0x0, 0x14A }, + { 0x1, 0x18, 0x10, 0x6, 0x1, 0x8, 0x15A }, + { 0x1, 0x18, 0x4, 0x6, 0x1, 0x4, 0x8A } }; static const UnkStruct_ov61_0222C884 Unk_020F1ED0[] = { - {0x1, 0x1A, 0x15, 0x5, 0x2, 0x0, 0x160}, - {0x1, 0x19, 0x14, 0x7, 0x2, 0x0, 0x16A}, - {0x0, 0x2, 0x15, 0x14, 0x2, 0xD, 0x178}, - {0x0, 0x2, 0x13, 0xD, 0x4, 0xD, 0x1A0}, - {0x0, 0x2, 0x13, 0x1B, 0x4, 0xD, 0x1D4}, - {0x0, 0x13, 0x11, 0xC, 0x6, 0x0, 0x240}, - {0x0, 0x13, 0xF, 0xC, 0x8, 0x0, 0x240} + { 0x1, 0x1A, 0x15, 0x5, 0x2, 0x0, 0x160 }, + { 0x1, 0x19, 0x14, 0x7, 0x2, 0x0, 0x16A }, + { 0x0, 0x2, 0x15, 0x14, 0x2, 0xD, 0x178 }, + { 0x0, 0x2, 0x13, 0xD, 0x4, 0xD, 0x1A0 }, + { 0x0, 0x2, 0x13, 0x1B, 0x4, 0xD, 0x1D4 }, + { 0x0, 0x13, 0x11, 0xC, 0x6, 0x0, 0x240 }, + { 0x0, 0x13, 0xF, 0xC, 0x8, 0x0, 0x240 } }; static const UnkStruct_ov61_0222C884 Unk_020F1E98 = { @@ -106,7 +105,7 @@ static const UnkStruct_ov61_0222C884 Unk_020F1E98 = { 0x240 }; -static void sub_020819DC (BGL * param0, Window * param1, const UnkStruct_ov61_0222C884 * param2) +static void sub_020819DC(BGL *param0, Window *param1, const UnkStruct_ov61_0222C884 *param2) { sub_0201A8D4(param0, ¶m1[0], ¶m2[0]); sub_0201A8D4(param0, ¶m1[1], ¶m2[1]); @@ -115,9 +114,9 @@ static void sub_020819DC (BGL * param0, Window * param1, const UnkStruct_ov61_02 sub_0201A8D4(param0, ¶m1[4], ¶m2[4]); } -void sub_02081A24 (GameWindowLayout * param0) +void sub_02081A24(GameWindowLayout *param0) { - const UnkStruct_ov61_0222C884 * v0 = Unk_020F1F08; + const UnkStruct_ov61_0222C884 *v0 = Unk_020F1F08; u16 v1; sub_020819DC(param0->unk_00, ¶m0->unk_04[0], &v0[0]); @@ -152,7 +151,7 @@ void sub_02081A24 (GameWindowLayout * param0) sub_0201A8D4(param0->unk_00, ¶m0->unk_04[36], &Unk_020F1ED0[6]); } -void sub_02081B90 (GameWindowLayout * param0) +void sub_02081B90(GameWindowLayout *param0) { u16 v0; @@ -167,7 +166,7 @@ void sub_02081B90 (GameWindowLayout * param0) } } -void sub_02081BC0 (GameWindowLayout * param0) +void sub_02081BC0(GameWindowLayout *param0) { MessageLoader_GetStrbuf(param0->unk_69C, 145, param0->unk_6AC[0]); MessageLoader_GetStrbuf(param0->unk_69C, 146, param0->unk_6AC[1]); @@ -187,9 +186,9 @@ void sub_02081BC0 (GameWindowLayout * param0) MessageLoader_GetStrbuf(param0->unk_69C, 200, param0->unk_6AC[15]); } -void sub_02081CAC (GameWindowLayout * param0, u16 param1, u8 param2) +void sub_02081CAC(GameWindowLayout *param0, u16 param1, u8 param2) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, 156 + param2); @@ -199,12 +198,12 @@ void sub_02081CAC (GameWindowLayout * param0, u16 param1, u8 param2) Strbuf_Free(v0); } -void sub_02081CF4 (GameWindowLayout * param0, const u8 * param1, u8 param2) +void sub_02081CF4(GameWindowLayout *param0, const u8 *param1, u8 param2) { UnkStruct_02081CF4 v0; u16 v1, v2; - BGL_AddWindow(param0->unk_00, ¶m0->unk_254[0], 0, 19, 23 - param2 * 2, 12, param2 * 2, 0, ((((((((((((((((((((((((((((((((1 + 9) + (18 + 12)) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 5 * 2) + 7 * 2) + 20 * 2) + 13 * 4) + 27 * 4))); + BGL_AddWindow(param0->unk_00, ¶m0->unk_254[0], 0, 19, 23 - param2 * 2, 12, param2 * 2, 0, (((((((((((((((((((((((((((((((1 + 9) + (18 + 12)) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 9 * 2) + 6 * 2) + 8 * 2) + 6 * 1) + 5 * 2) + 7 * 2) + 20 * 2) + 13 * 4) + 27 * 4)); param0->unk_6FC = sub_02013A04(param2, 12); v2 = 0; @@ -236,10 +235,10 @@ void sub_02081CF4 (GameWindowLayout * param0, const u8 * param1, u8 param2) param0->unk_700 = sub_02001B7C(&v0, 8, 0, 0, 12, PAD_BUTTON_B); } -void sub_02081E08 (GameWindowLayout * param0) +void sub_02081E08(GameWindowLayout *param0) { - Pokemon * v0; - Strbuf* v1; + Pokemon *v0; + Strbuf *v1; if (param0->unk_5A4->unk_20 == 15) { MessageLoader_GetStrbuf(param0->unk_69C, 42, param0->unk_6A4); @@ -256,22 +255,22 @@ void sub_02081E08 (GameWindowLayout * param0) } static const u16 Unk_020F1EA0[6][4] = { - {0x8, 0x2, 0x14, 0xE}, - {0x9, 0x3, 0x15, 0xF}, - {0xA, 0x4, 0x16, 0x10}, - {0xB, 0x5, 0x17, 0x11}, - {0xC, 0x6, 0x18, 0x12}, - {0xD, 0x7, 0x19, 0x13} + { 0x8, 0x2, 0x14, 0xE }, + { 0x9, 0x3, 0x15, 0xF }, + { 0xA, 0x4, 0x16, 0x10 }, + { 0xB, 0x5, 0x17, 0x11 }, + { 0xC, 0x6, 0x18, 0x12 }, + { 0xD, 0x7, 0x19, 0x13 } }; -static void sub_02081EAC (GameWindowLayout * param0, u8 param1) +static void sub_02081EAC(GameWindowLayout *param0, u8 param1) { sub_0200C578(param0->unk_698, 0, ¶m0->unk_04[2 + param1 * 5], 28, 2); } -void sub_02081ED8 (GameWindowLayout * param0, Pokemon * param1, u32 param2) +void sub_02081ED8(GameWindowLayout *param0, Pokemon *param1, u32 param2) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, Unk_020F1EA0[param2][0]); @@ -280,10 +279,10 @@ void sub_02081ED8 (GameWindowLayout * param0, Pokemon * param1, u32 param2) Strbuf_Free(v0); } -void sub_02081F2C (GameWindowLayout * param0, u8 param1) +void sub_02081F2C(GameWindowLayout *param0, u8 param1) { - Window * v0; - Pokemon * v1; + Window *v0; + Pokemon *v1; v0 = ¶m0->unk_04[0 + param1 * 5]; @@ -309,10 +308,10 @@ void sub_02081F2C (GameWindowLayout * param0, u8 param1) sub_0201A9A4(v0); } -void sub_02081FFC (GameWindowLayout * param0, u8 param1) +void sub_02081FFC(GameWindowLayout *param0, u8 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_04[1 + param1 * 5]; @@ -325,10 +324,10 @@ void sub_02081FFC (GameWindowLayout * param0, u8 param1) sub_0201A9A4(v0); } -void sub_02082058 (GameWindowLayout * param0, u8 param1) +void sub_02082058(GameWindowLayout *param0, u8 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; v0 = ¶m0->unk_04[2 + param1 * 5]; @@ -337,10 +336,10 @@ void sub_02082058 (GameWindowLayout * param0, u8 param1) sub_0201A9A4(v0); } -void sub_02082098 (GameWindowLayout * param0, u8 param1) +void sub_02082098(GameWindowLayout *param0, u8 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; v0 = ¶m0->unk_04[2 + param1 * 5]; @@ -349,10 +348,10 @@ void sub_02082098 (GameWindowLayout * param0, u8 param1) sub_0201A9A4(v0); } -static void sub_020820C4 (GameWindowLayout * param0, u8 param1) +static void sub_020820C4(GameWindowLayout *param0, u8 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_04[2 + param1 * 5]; @@ -360,9 +359,9 @@ static void sub_020820C4 (GameWindowLayout * param0, u8 param1) sub_0201A9A4(v0); } -void sub_02082104 (GameWindowLayout * param0, u8 param1) +void sub_02082104(GameWindowLayout *param0, u8 param1) { - Window * v0; + Window *v0; u8 v1; v0 = ¶m0->unk_04[3 + param1 * 5]; @@ -391,7 +390,7 @@ void sub_02082104 (GameWindowLayout * param0, u8 param1) sub_0201A9A4(v0); } -void sub_020821F8 (GameWindowLayout * param0, u8 param1) +void sub_020821F8(GameWindowLayout *param0, u8 param1) { BGL_FillWindow(¶m0->unk_04[0 + param1 * 5], 0); BGL_FillWindow(¶m0->unk_04[1 + param1 * 5], 0); @@ -414,7 +413,7 @@ void sub_020821F8 (GameWindowLayout * param0, u8 param1) sub_02082104(param0, param1); } -void sub_020822BC (GameWindowLayout * param0, u8 param1) +void sub_020822BC(GameWindowLayout *param0, u8 param1) { sub_0201ACCC(¶m0->unk_04[0 + param1 * 5]); sub_0201ACCC(¶m0->unk_04[1 + param1 * 5]); @@ -422,7 +421,7 @@ void sub_020822BC (GameWindowLayout * param0, u8 param1) sub_0201ACCC(¶m0->unk_04[3 + param1 * 5]); } -void sub_020822F4 (GameWindowLayout * param0, u8 param1) +void sub_020822F4(GameWindowLayout *param0, u8 param1) { sub_0201AD10(¶m0->unk_04[0 + param1 * 5]); sub_0201AD10(¶m0->unk_04[1 + param1 * 5]); @@ -430,9 +429,9 @@ void sub_020822F4 (GameWindowLayout * param0, u8 param1) sub_0201AD10(¶m0->unk_04[3 + param1 * 5]); } -void sub_0208232C (GameWindowLayout * param0, u8 param1) +void sub_0208232C(GameWindowLayout *param0, u8 param1) { - Pokemon * v0; + Pokemon *v0; BGL_FillWindow(¶m0->unk_04[0 + param1 * 5], 0); BGL_FillWindow(¶m0->unk_04[1 + param1 * 5], 0); @@ -454,9 +453,9 @@ void sub_0208232C (GameWindowLayout * param0, u8 param1) } } -void sub_020823C4 (GameWindowLayout * param0, u8 param1) +void sub_020823C4(GameWindowLayout *param0, u8 param1) { - Pokemon * v0; + Pokemon *v0; u8 v1; BGL_FillWindow(¶m0->unk_04[0 + param1 * 5], 0); @@ -482,9 +481,9 @@ void sub_020823C4 (GameWindowLayout * param0, u8 param1) } } -void sub_0208245C (GameWindowLayout * param0, u8 param1) +void sub_0208245C(GameWindowLayout *param0, u8 param1) { - Pokemon * v0; + Pokemon *v0; u8 v1; BGL_FillWindow(¶m0->unk_04[0 + param1 * 5], 0); @@ -498,9 +497,9 @@ void sub_0208245C (GameWindowLayout * param0, u8 param1) sub_02082900(param0, param1, (u8)param0->unk_704[param1].unk_0E_15); } -void sub_020824C0 (GameWindowLayout * param0, u8 param1) +void sub_020824C0(GameWindowLayout *param0, u8 param1) { - Pokemon * v0; + Pokemon *v0; u8 v1; BGL_FillWindow(¶m0->unk_04[0 + param1 * 5], 0); @@ -512,7 +511,7 @@ void sub_020824C0 (GameWindowLayout * param0, u8 param1) } } -void sub_02082508 (GameWindowLayout * param0, u8 param1) +void sub_02082508(GameWindowLayout *param0, u8 param1) { u8 v0; @@ -543,14 +542,14 @@ void sub_02082508 (GameWindowLayout * param0, u8 param1) sub_02082964(param0, param1, 7); } -static u32 sub_020825A4 (int param0, const Strbuf *param1, u32 param2) +static u32 sub_020825A4(int param0, const Strbuf *param1, u32 param2) { u32 v0 = sub_02002D7C(param0, param1, 0); return (param2 - v0) >> 1; } -void sub_020825B4 (GameWindowLayout * param0, u8 param1) +void sub_020825B4(GameWindowLayout *param0, u8 param1) { u32 v0; @@ -572,7 +571,7 @@ void sub_020825B4 (GameWindowLayout * param0, u8 param1) } } -static void sub_02082680 (GameWindowLayout * param0, Window * param1, u32 param2, u8 param3) +static void sub_02082680(GameWindowLayout *param0, Window *param1, u32 param2, u8 param3) { if (param3 == 1) { sub_0200E060(param1, 1, (1 + 9), 15); @@ -588,19 +587,19 @@ static void sub_02082680 (GameWindowLayout * param0, Window * param1, u32 param2 sub_0201A9A4(param1); } -void sub_020826E0 (GameWindowLayout * param0, u32 param1, u8 param2) +void sub_020826E0(GameWindowLayout *param0, u32 param1, u8 param2) { sub_02082680(param0, ¶m0->unk_04[32], param1, param2); } -void sub_020826F4 (GameWindowLayout * param0, u32 param1, u8 param2) +void sub_020826F4(GameWindowLayout *param0, u32 param1, u8 param2) { sub_02082680(param0, ¶m0->unk_04[33], param1, param2); } -void sub_02082708 (GameWindowLayout * param0, u32 param1, u8 param2) +void sub_02082708(GameWindowLayout *param0, u32 param1, u8 param2) { - Window * v0 = ¶m0->unk_04[34]; + Window *v0 = ¶m0->unk_04[34]; if (param2 == 1) { sub_0200E060(v0, 1, (1 + 9), 15); @@ -615,7 +614,7 @@ void sub_02082708 (GameWindowLayout * param0, u32 param1, u8 param2) sub_0208274C(param0); } -void sub_0208274C (GameWindowLayout * param0) +void sub_0208274C(GameWindowLayout *param0) { sub_02002AC8(1); sub_02002AE4(0); @@ -623,7 +622,7 @@ void sub_0208274C (GameWindowLayout * param0) ¶m0->unk_04[34], 1, param0->unk_6A4, 0, 0, Options_TextFrameDelay(param0->unk_5A4->unk_0C), sub_0208279C); } -static BOOL sub_0208279C (UnkStruct_0201D738 * param0, u16 param1) +static BOOL sub_0208279C(UnkStruct_0201D738 *param0, u16 param1) { switch (param1) { case 1: @@ -643,16 +642,16 @@ static BOOL sub_0208279C (UnkStruct_0201D738 * param0, u16 param1) return 0; } -void sub_020827EC (GameWindowLayout * param0) +void sub_020827EC(GameWindowLayout *param0) { param0->unk_700 = sub_02002100( param0->unk_00, &Unk_020F1E98, 1, 14, 12); } -static void sub_02082810 (GameWindowLayout * param0, u8 param1, u8 param2) +static void sub_02082810(GameWindowLayout *param0, u8 param1, u8 param2) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_04[4 + param1 * 5]; @@ -672,10 +671,10 @@ static void sub_02082810 (GameWindowLayout * param0, u8 param1, u8 param2) sub_0201A9A4(v0); } -static void sub_02082880 (GameWindowLayout * param0, u8 param1, u8 param2) +static void sub_02082880(GameWindowLayout *param0, u8 param1, u8 param2) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_04[4 + param1 * 5]; @@ -698,10 +697,10 @@ static void sub_02082880 (GameWindowLayout * param0, u8 param1, u8 param2) sub_0201A9A4(v0); } -static void sub_02082900 (GameWindowLayout * param0, u8 param1, u8 param2) +static void sub_02082900(GameWindowLayout *param0, u8 param1, u8 param2) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_04[4 + param1 * 5]; @@ -718,10 +717,10 @@ static void sub_02082900 (GameWindowLayout * param0, u8 param1, u8 param2) sub_0201A9A4(v0); } -static void sub_02082964 (GameWindowLayout * param0, u8 param1, u8 param2) +static void sub_02082964(GameWindowLayout *param0, u8 param1, u8 param2) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->unk_04[4 + param1 * 5]; @@ -740,10 +739,10 @@ static void sub_02082964 (GameWindowLayout * param0, u8 param1, u8 param2) sub_0201A9A4(v0); } -void sub_020829DC (GameWindowLayout * param0) +void sub_020829DC(GameWindowLayout *param0) { - Pokemon * v0; - Strbuf* v1; + Pokemon *v0; + Strbuf *v1; u32 v2; u16 v3[6]; @@ -782,9 +781,9 @@ void sub_020829DC (GameWindowLayout * param0) sub_0201A9A4(¶m0->unk_254[0]); } -void sub_02082B58 (GameWindowLayout * param0) +void sub_02082B58(GameWindowLayout *param0) { - Strbuf* v0; + Strbuf *v0; u32 v1; u32 v2; @@ -804,7 +803,7 @@ void sub_02082B58 (GameWindowLayout * param0) sub_0201A9A4(¶m0->unk_254[0]); } -void sub_02082C10 (GameWindowLayout * param0) +void sub_02082C10(GameWindowLayout *param0) { Window_Clear(¶m0->unk_254[0], 0); BGL_DeleteWindow(¶m0->unk_254[0]); diff --git a/src/unk_02082C2C.c b/src/unk_02082C2C.c index e826229748..7efe14fd5e 100644 --- a/src/unk_02082C2C.c +++ b/src/unk_02082C2C.c @@ -1,36 +1,36 @@ +#include "unk_02082C2C.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "pokemon.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0207F248.h" #include "struct_defs/struct_020831B4.h" + #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_0224133C.h" +#include "gx_layers.h" +#include "heap.h" +#include "item.h" #include "narc.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_icon.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_0200C6E4.h" -#include "heap.h" #include "unk_0201DBEC.h" #include "unk_0201E010.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "pokemon.h" -#include "pokemon_icon.h" -#include "party.h" -#include "item.h" #include "unk_0207E0B8.h" -#include "unk_02082C2C.h" #include "unk_0208C098.h" -void sub_02082C2C (GameWindowLayout * param0) +void sub_02082C2C(GameWindowLayout *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -41,7 +41,14 @@ void sub_02082C2C (GameWindowLayout * param0) { UnkStruct_ov104_0224133C v0 = { - 0, 128, 0, 32, 0, 128, 0, 32, + 0, + 128, + 0, + 32, + 0, + 128, + 0, + 32, }; UnkStruct_ov104_022412F4 v1 = { 29 + 6, 1024, 1024, GX_OBJVRAMMODE_CHAR_1D_32K, GX_OBJVRAMMODE_CHAR_1D_32K @@ -52,7 +59,7 @@ void sub_02082C2C (GameWindowLayout * param0) } { - UnkStruct_0200C738 * v2 = sub_0200C738(param0->unk_5A8); + UnkStruct_0200C738 *v2 = sub_0200C738(param0->unk_5A8); sub_0200964C(v2, 0, (256 * FX32_ONE)); } @@ -71,9 +78,9 @@ void sub_02082C2C (GameWindowLayout * param0) } } -void sub_02082CEC (GameWindowLayout * param0, u8 param1, u16 param2, u16 param3, NARC * param4) +void sub_02082CEC(GameWindowLayout *param0, u8 param1, u16 param2, u16 param3, NARC *param4) { - Pokemon * v0; + Pokemon *v0; UnkStruct_ov7_0224F358 v1; u32 v2; @@ -102,14 +109,14 @@ void sub_02082CEC (GameWindowLayout * param0, u8 param1, u16 param2, u16 param3, param0->unk_704[param1].unk_24 = sub_0200CA08(param0->unk_5A8, param0->unk_5AC, &v1); } -void sub_02082DA8 (GameWindowLayout * param0, u8 param1) +void sub_02082DA8(GameWindowLayout *param0, u8 param1) { - Pokemon * v0; - NARC * v1; + Pokemon *v0; + NARC *v1; int v2, v3; u32 v4; - void * v5; - NNSG2dCharacterData * v6; + void *v5; + NNSG2dCharacterData *v6; BOOL v7; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1); @@ -131,32 +138,32 @@ void sub_02082DA8 (GameWindowLayout * param0, u8 param1) } static const UnkStruct_ov7_0224F358 Unk_020F20C0[] = { - {0x1, 0x40, 0x18, 0x0, 0x1, 0x3, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1, 0x40, 0x48, 0x0, 0x2, 0x2, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x2, 0xE8, 0xA8, 0x0, 0x2, 0x1, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x2, 0xE8, 0xB8, 0x0, 0x2, 0x1, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x3, 0x24, 0x2C, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x3, 0xA4, 0x34, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x3, 0x24, 0x5C, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x3, 0xA4, 0x64, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x3, 0x24, 0x8C, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x3, 0xA4, 0x94, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xB, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, 0x0, 0x0, 0x0, 0x0} + { 0x1, 0x40, 0x18, 0x0, 0x1, 0x3, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x40, 0x48, 0x0, 0x2, 0x2, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0xE8, 0xA8, 0x0, 0x2, 0x1, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0xE8, 0xB8, 0x0, 0x2, 0x1, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x24, 0x2C, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0xA4, 0x34, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x24, 0x5C, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0xA4, 0x64, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x24, 0x8C, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0xA4, 0x94, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0xA4, 0x94, 0x0, 0x2, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xB, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, 0x0, 0x0, 0x0, 0x0 } }; -void sub_02082E58 (GameWindowLayout * param0) +void sub_02082E58(GameWindowLayout *param0) { u32 v0; @@ -179,7 +186,7 @@ void sub_02082E58 (GameWindowLayout * param0) sub_02021CAC(param0->unk_5B0[28], 0); } -void sub_02082FAC (GameWindowLayout * param0, u8 param1, u16 param2, u16 param3) +void sub_02082FAC(GameWindowLayout *param0, u8 param1, u16 param2, u16 param3) { UnkStruct_ov7_0224F358 v0; @@ -199,15 +206,15 @@ void sub_02082FAC (GameWindowLayout * param0, u8 param1, u16 param2, u16 param3) param0->unk_5B0[0 + param1] = sub_0200CA08(param0->unk_5A8, param0->unk_5AC, &v0); } -void sub_02082FF4 (GameWindowLayout * param0) +void sub_02082FF4(GameWindowLayout *param0) { sub_0200C8B0(param0->unk_5A8, param0->unk_5AC); sub_0200C8D4(param0->unk_5A8); } -void sub_02083014 (GameWindowLayout * param0, u8 param1, u8 param2) +void sub_02083014(GameWindowLayout *param0, u8 param1, u8 param2) { - GraphicElementData ** v0 = ¶m0->unk_5B0[10 + param1]; + GraphicElementData **v0 = ¶m0->unk_5B0[10 + param1]; if (param2 == 7) { sub_02021CAC(*v0, 0); @@ -218,9 +225,9 @@ void sub_02083014 (GameWindowLayout * param0, u8 param1, u8 param2) sub_02021CAC(*v0, 1); } -void sub_02083040 (GameWindowLayout * param0, u8 param1, u16 param2) +void sub_02083040(GameWindowLayout *param0, u8 param1, u16 param2) { - GraphicElementData ** v0 = ¶m0->unk_5B0[16 + param1]; + GraphicElementData **v0 = ¶m0->unk_5B0[16 + param1]; if (param2 == 0) { sub_02021CAC(*v0, 0); @@ -236,17 +243,17 @@ void sub_02083040 (GameWindowLayout * param0, u8 param1, u16 param2) sub_02021CAC(*v0, 1); } -void sub_02083080 (GameWindowLayout * param0, u8 param1) +void sub_02083080(GameWindowLayout *param0, u8 param1) { - GraphicElementData ** v0 = ¶m0->unk_5B0[16 + param1]; + GraphicElementData **v0 = ¶m0->unk_5B0[16 + param1]; SpriteActor_SetSpriteAnimActive(*v0, 1); sub_02021CAC(*v0, 1); } -void sub_020830A0 (GameWindowLayout * param0, u8 param1, s16 param2, s16 param3) +void sub_020830A0(GameWindowLayout *param0, u8 param1, s16 param2, s16 param3) { - GraphicElementData ** v0 = ¶m0->unk_5B0[16 + param1]; + GraphicElementData **v0 = ¶m0->unk_5B0[16 + param1]; param0->unk_704[param1].unk_1E = param2 + 8; param0->unk_704[param1].unk_20 = param3 + 8; @@ -254,14 +261,14 @@ void sub_020830A0 (GameWindowLayout * param0, u8 param1, s16 param2, s16 param3) SpriteActor_SetPositionXY(*v0, param0->unk_704[param1].unk_1E, param0->unk_704[param1].unk_20); } -void sub_020830D4 (GameWindowLayout * param0, u8 param1) +void sub_020830D4(GameWindowLayout *param0, u8 param1) { SpriteActor_SetPositionXY(param0->unk_5B0[22 + param1], param0->unk_704[param1].unk_1E + 8, param0->unk_704[param1].unk_20); } -void sub_02083104 (GameWindowLayout * param0, u8 param1) +void sub_02083104(GameWindowLayout *param0, u8 param1) { - GraphicElementData ** v0 = ¶m0->unk_5B0[22 + param1]; + GraphicElementData **v0 = ¶m0->unk_5B0[22 + param1]; if (param0->unk_704[param1].unk_12 == 0) { sub_02021CAC(*v0, 0); @@ -271,7 +278,7 @@ void sub_02083104 (GameWindowLayout * param0, u8 param1) sub_02021CAC(*v0, 1); } -static void sub_02083138 (GraphicElementData * param0, u8 param1) +static void sub_02083138(GraphicElementData *param0, u8 param1) { if (sub_02021E24(param0) == param1) { return; @@ -281,7 +288,7 @@ static void sub_02083138 (GraphicElementData * param0, u8 param1) SpriteActor_SetSpriteAnimActive(param0, param1); } -static u8 sub_02083158 (StrBufWrapper * param0) +static u8 sub_02083158(StrBufWrapper *param0) { if (param0->unk_06 == 0) { return 0; @@ -305,9 +312,9 @@ static u8 sub_02083158 (StrBufWrapper * param0) return 0; } -void sub_020831B4 (GameWindowLayout * param0) +void sub_020831B4(GameWindowLayout *param0) { - StrBufWrapper * v0; + StrBufWrapper *v0; u16 v1; u16 v2; @@ -341,7 +348,7 @@ void sub_020831B4 (GameWindowLayout * param0) } } -void sub_0208327C (GameWindowLayout * param0, u8 param1, u8 param2) +void sub_0208327C(GameWindowLayout *param0, u8 param1, u8 param2) { u8 v0, v1; @@ -352,7 +359,7 @@ void sub_0208327C (GameWindowLayout * param0, u8 param1, u8 param2) sub_0200D414(param0->unk_5B0[6], param2); } -void sub_020832E4 (GameWindowLayout * param0, s16 param1, s16 param2) +void sub_020832E4(GameWindowLayout *param0, s16 param1, s16 param2) { VecFx32 v0; @@ -367,7 +374,7 @@ void sub_020832E4 (GameWindowLayout * param0, s16 param1, s16 param2) SpriteActor_SetSpriteAnimActive(param0->unk_5B0[28], 0); } -void sub_02083334 (GameWindowLayout * param0) +void sub_02083334(GameWindowLayout *param0) { if (sub_02021D34(param0->unk_5B0[28]) == 1) { sub_02021E2C(param0->unk_5B0[28], FX32_ONE); diff --git a/src/unk_02083370.c b/src/unk_02083370.c index 149bf6d735..c904e6f3b5 100644 --- a/src/unk_02083370.c +++ b/src/unk_02083370.c @@ -1,79 +1,78 @@ +#include "unk_02083370.h" + #include #include -#include "core_sys.h" - -#include "pokemon.h" - #include "struct_defs/struct_0200D0F4.h" -#include "field/field_system.h" #include "struct_defs/struct_0207F248.h" #include "struct_defs/struct_02081CF4.h" #include "struct_defs/struct_020831B4.h" #include "struct_defs/struct_02083D1C.h" + +#include "field/field_system.h" #include "functypes/funcptr_02084808.h" +#include "overlay118/ov118_021D0D80.h" -#include "unk_02001AF4.h" -#include "unk_02005474.h" +#include "bag.h" +#include "core_sys.h" +#include "heap.h" #include "message.h" +#include "party.h" +#include "pokemon.h" #include "string_template.h" +#include "unk_02001AF4.h" +#include "unk_02005474.h" #include "unk_0200C6E4.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" #include "unk_020218BC.h" #include "unk_0207070C.h" -#include "pokemon.h" -#include "party.h" -#include "bag.h" #include "unk_0207E0B8.h" #include "unk_020819DC.h" #include "unk_02082C2C.h" -#include "unk_02083370.h" #include "unk_02097624.h" -#include "overlay118/ov118_021D0D80.h" -static void sub_02083AD0(GameWindowLayout * param0, int * param1); -static void sub_0208472C(GameWindowLayout * param0, int * param1); -static void sub_02084808(GameWindowLayout * param0, int * param1); -static void sub_02083E8C(GameWindowLayout * param0, u8 param1); -static void sub_02083FDC(GameWindowLayout * param0, u8 param1, u8 param2); -static void sub_02084134(GameWindowLayout * param0); -static void sub_02084420(GameWindowLayout * param0, u8 param1); -static void sub_020848A8(GameWindowLayout * param0, int * param1); -static void sub_020848C0(GameWindowLayout * param0, int * param1); -static void sub_020848D8(GameWindowLayout * param0, int * param1); -static void sub_020848F0(GameWindowLayout * param0, int * param1); -static void sub_02084908(GameWindowLayout * param0, int * param1); -static void sub_02084920(GameWindowLayout * param0, int * param1); -static void sub_02084938(GameWindowLayout * param0, int * param1); -static void sub_02084950(GameWindowLayout * param0, int * param1); -static void sub_02084968(GameWindowLayout * param0, int * param1); -static void sub_02084980(GameWindowLayout * param0, int * param1); -static void sub_02084998(GameWindowLayout * param0, int * param1); -static void sub_020849B0(GameWindowLayout * param0, int * param1); -static void sub_020849C8(GameWindowLayout * param0, int * param1); -static void sub_020849E0(GameWindowLayout * param0, int * param1); -static void sub_020849FC(GameWindowLayout * param0, int * param1); -static int sub_02084A18(GameWindowLayout * param0); -static void sub_02084760(GameWindowLayout * param0, int * param1); -static void sub_020833BC(GameWindowLayout * param0, int * param1); -static void sub_0208347C(GameWindowLayout * param0, int * param1); -static void sub_020834B0(GameWindowLayout * param0, int * param1); -static void sub_02083700(GameWindowLayout * param0, int * param1); -static void sub_020837C0(GameWindowLayout * param0, int * param1); -static void sub_020837F4(GameWindowLayout * param0, int * param1); -static int sub_0208384C(void * param0); -static int sub_020838C4(void * param0); -static int sub_020838F4(void * param0); -static int sub_02083990(void * param0); -static void sub_020846CC(GameWindowLayout * param0, int * param1); -static void sub_020844B0(GameWindowLayout * param0, int * param1); -static void sub_020845E8(GameWindowLayout * param0, int * param1); -static void sub_020846FC(GameWindowLayout * param0, int * param1); -static void sub_020839FC(GameWindowLayout * param0, int * param1); +static void sub_02083AD0(GameWindowLayout *param0, int *param1); +static void sub_0208472C(GameWindowLayout *param0, int *param1); +static void sub_02084808(GameWindowLayout *param0, int *param1); +static void sub_02083E8C(GameWindowLayout *param0, u8 param1); +static void sub_02083FDC(GameWindowLayout *param0, u8 param1, u8 param2); +static void sub_02084134(GameWindowLayout *param0); +static void sub_02084420(GameWindowLayout *param0, u8 param1); +static void sub_020848A8(GameWindowLayout *param0, int *param1); +static void sub_020848C0(GameWindowLayout *param0, int *param1); +static void sub_020848D8(GameWindowLayout *param0, int *param1); +static void sub_020848F0(GameWindowLayout *param0, int *param1); +static void sub_02084908(GameWindowLayout *param0, int *param1); +static void sub_02084920(GameWindowLayout *param0, int *param1); +static void sub_02084938(GameWindowLayout *param0, int *param1); +static void sub_02084950(GameWindowLayout *param0, int *param1); +static void sub_02084968(GameWindowLayout *param0, int *param1); +static void sub_02084980(GameWindowLayout *param0, int *param1); +static void sub_02084998(GameWindowLayout *param0, int *param1); +static void sub_020849B0(GameWindowLayout *param0, int *param1); +static void sub_020849C8(GameWindowLayout *param0, int *param1); +static void sub_020849E0(GameWindowLayout *param0, int *param1); +static void sub_020849FC(GameWindowLayout *param0, int *param1); +static int sub_02084A18(GameWindowLayout *param0); +static void sub_02084760(GameWindowLayout *param0, int *param1); +static void sub_020833BC(GameWindowLayout *param0, int *param1); +static void sub_0208347C(GameWindowLayout *param0, int *param1); +static void sub_020834B0(GameWindowLayout *param0, int *param1); +static void sub_02083700(GameWindowLayout *param0, int *param1); +static void sub_020837C0(GameWindowLayout *param0, int *param1); +static void sub_020837F4(GameWindowLayout *param0, int *param1); +static int sub_0208384C(void *param0); +static int sub_020838C4(void *param0); +static int sub_020838F4(void *param0); +static int sub_02083990(void *param0); +static void sub_020846CC(GameWindowLayout *param0, int *param1); +static void sub_020844B0(GameWindowLayout *param0, int *param1); +static void sub_020845E8(GameWindowLayout *param0, int *param1); +static void sub_020846FC(GameWindowLayout *param0, int *param1); +static void sub_020839FC(GameWindowLayout *param0, int *param1); static const u32 Unk_020F2458[] = { (const u32)sub_02083AD0, @@ -110,12 +109,12 @@ static const u32 Unk_020F2458[] = { 0xFFFFFFFE }; -u32 sub_02083370 (u8 param0) +u32 sub_02083370(u8 param0) { return Unk_020F2458[param0]; } -void sub_0208337C (GameWindowLayout * param0) +void sub_0208337C(GameWindowLayout *param0) { Window_Clear(¶m0->unk_254[0], 1); sub_0201AD10(¶m0->unk_254[0]); @@ -124,7 +123,7 @@ void sub_0208337C (GameWindowLayout * param0) BGL_DeleteWindow(¶m0->unk_254[0]); } -static void sub_020833BC (GameWindowLayout * param0, int * param1) +static void sub_020833BC(GameWindowLayout *param0, int *param1) { UnkStruct_02081CF4 v0; @@ -152,7 +151,7 @@ static void sub_020833BC (GameWindowLayout * param0, int * param1) *param1 = 15; } -static void sub_0208347C (GameWindowLayout * param0, int * param1) +static void sub_0208347C(GameWindowLayout *param0, int *param1) { sub_02001BC4(param0->unk_700, NULL); sub_02013A3C(param0->unk_6FC); @@ -161,12 +160,12 @@ static void sub_0208347C (GameWindowLayout * param0, int * param1) *param1 = 32; } -static void sub_020834B0 (GameWindowLayout * param0, int * param1) +static void sub_020834B0(GameWindowLayout *param0, int *param1) { - Pokemon * v0; + Pokemon *v0; int v1; int v2 = 17; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; Window_Clear(¶m0->unk_04[35], 1); sub_02001BC4(param0->unk_700, NULL); @@ -215,7 +214,7 @@ static void sub_020834B0 (GameWindowLayout * param0, int * param1) *param1 = v2; } -int sub_02083658 (GameWindowLayout * param0) +int sub_02083658(GameWindowLayout *param0) { if (Message_Printing(param0->unk_B10) == 0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -229,7 +228,7 @@ int sub_02083658 (GameWindowLayout * param0) return 17; } -int sub_020836A8 (GameWindowLayout * param0) +int sub_020836A8(GameWindowLayout *param0) { if (Message_Printing(param0->unk_B10) == 0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { @@ -242,7 +241,7 @@ int sub_020836A8 (GameWindowLayout * param0) return 18; } -int sub_020836E4 (GameWindowLayout * param0) +int sub_020836E4(GameWindowLayout *param0) { if (ov118_021D0DBC(param0) == 1) { UnloadOverlay118(param0); @@ -252,7 +251,7 @@ int sub_020836E4 (GameWindowLayout * param0) return 19; } -static void sub_02083700 (GameWindowLayout * param0, int * param1) +static void sub_02083700(GameWindowLayout *param0, int *param1) { UnkStruct_02081CF4 v0; @@ -280,7 +279,7 @@ static void sub_02083700 (GameWindowLayout * param0, int * param1) *param1 = 15; } -static void sub_020837C0 (GameWindowLayout * param0, int * param1) +static void sub_020837C0(GameWindowLayout *param0, int *param1) { sub_02001BC4(param0->unk_700, NULL); sub_02013A3C(param0->unk_6FC); @@ -289,7 +288,7 @@ static void sub_020837C0 (GameWindowLayout * param0, int * param1) *param1 = 32; } -static void sub_020837F4 (GameWindowLayout * param0, int * param1) +static void sub_020837F4(GameWindowLayout *param0, int *param1) { Window_Clear(¶m0->unk_04[35], 1); sub_02001BC4(param0->unk_700, NULL); @@ -302,10 +301,10 @@ static void sub_020837F4 (GameWindowLayout * param0, int * param1) *param1 = 24; } -static int sub_0208384C (void * param0) +static int sub_0208384C(void *param0) { - GameWindowLayout * v0 = param0; - Pokemon * v1; + GameWindowLayout *v0 = param0; + Pokemon *v1; v0 = param0; v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); @@ -323,9 +322,9 @@ static int sub_0208384C (void * param0) return 24; } -static int sub_020838C4 (void * param0) +static int sub_020838C4(void *param0) { - GameWindowLayout * v0 = param0; + GameWindowLayout *v0 = param0; sub_02082708(v0, 47, 0); @@ -336,12 +335,12 @@ static int sub_020838C4 (void * param0) return 24; } -static int sub_020838F4 (void * param0) +static int sub_020838F4(void *param0) { - GameWindowLayout * v0 = param0; + GameWindowLayout *v0 = param0; if (Bag_TryAddItem(v0->unk_5A4->unk_04, v0->unk_704[v0->unk_B11].unk_0C, 1, 12) == 1) { - Pokemon * v1; + Pokemon *v1; u32 v2; v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); @@ -364,9 +363,9 @@ static int sub_020838F4 (void * param0) return 24; } -static int sub_02083990 (void * param0) +static int sub_02083990(void *param0) { - GameWindowLayout * v0 = param0; + GameWindowLayout *v0 = param0; sub_0200E084(&v0->unk_04[34], 1); sub_020826E0(v0, 29, 1); @@ -375,7 +374,7 @@ static int sub_02083990 (void * param0) return 1; } -int sub_020839BC (GameWindowLayout * param0) +int sub_020839BC(GameWindowLayout *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { sub_0200E084(¶m0->unk_04[34], 1); @@ -387,7 +386,7 @@ int sub_020839BC (GameWindowLayout * param0) return 20; } -static void sub_020839FC (GameWindowLayout * param0, int * param1) +static void sub_020839FC(GameWindowLayout *param0, int *param1) { if (param0->unk_704[param0->unk_B11].unk_12 == 0) { sub_02001BC4(param0->unk_700, NULL); @@ -406,10 +405,10 @@ static void sub_020839FC (GameWindowLayout * param0, int * param1) *param1 = 24; } -int sub_02083A78 (void * param0) +int sub_02083A78(void *param0) { - GameWindowLayout * v0; - Pokemon * v1; + GameWindowLayout *v0; + Pokemon *v1; v0 = param0; v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); @@ -420,9 +419,9 @@ int sub_02083A78 (void * param0) return 32; } -int sub_02083AA4 (void * param0) +int sub_02083AA4(void *param0) { - GameWindowLayout * v0 = param0; + GameWindowLayout *v0 = param0; sub_0200E084(&v0->unk_04[34], 1); sub_020826E0(v0, 29, 1); @@ -431,7 +430,7 @@ int sub_02083AA4 (void * param0) return 1; } -static void sub_02083AD0 (GameWindowLayout * param0, int * param1) +static void sub_02083AD0(GameWindowLayout *param0, int *param1) { s16 v0, v1; @@ -451,7 +450,7 @@ static void sub_02083AD0 (GameWindowLayout * param0, int * param1) *param1 = 28; } -void sub_02083B88 (GameWindowLayout * param0) +void sub_02083B88(GameWindowLayout *param0) { param0->unk_B0F_6 = 0; sub_02021CAC(param0->unk_5B0[7], 0); @@ -464,10 +463,10 @@ void sub_02083B88 (GameWindowLayout * param0) sub_020826E0(param0, 29, 1); } -void sub_02083BD4 (GameWindowLayout * param0) +void sub_02083BD4(GameWindowLayout *param0) { - u16 * v0; - u16 * v1; + u16 *v0; + u16 *v1; s8 v2, v3, v4, v5; u16 v6; @@ -508,9 +507,9 @@ void sub_02083BD4 (GameWindowLayout * param0) sub_02021CAC(param0->unk_5B0[7], 0); } -BOOL sub_02083D1C (GameWindowLayout * param0) +BOOL sub_02083D1C(GameWindowLayout *param0) { - DualArrayShortData * v0 = ¶m0->unk_7F8; + DualArrayShortData *v0 = ¶m0->unk_7F8; switch (v0->unk_305) { case 0: @@ -569,9 +568,9 @@ BOOL sub_02083D1C (GameWindowLayout * param0) return 0; } -static void sub_02083E8C (GameWindowLayout * param0, u8 param1) +static void sub_02083E8C(GameWindowLayout *param0, u8 param1) { - DualArrayShortData * v0; + DualArrayShortData *v0; s8 v1, v2; u8 v3; @@ -591,9 +590,9 @@ static void sub_02083E8C (GameWindowLayout * param0, u8 param1) } } -static void sub_02083FDC (GameWindowLayout * param0, u8 param1, u8 param2) +static void sub_02083FDC(GameWindowLayout *param0, u8 param1, u8 param2) { - DualArrayShortData * v0; + DualArrayShortData *v0; s16 v1, v2; v0 = ¶m0->unk_7F8; @@ -619,11 +618,11 @@ static void sub_02083FDC (GameWindowLayout * param0, u8 param1, u8 param2) SpriteActor_SetPositionXY(param0->unk_5B0[0 + v0->unk_300[param1]], v1, v2); } -static void sub_02084134 (GameWindowLayout * param0) +static void sub_02084134(GameWindowLayout *param0) { - StrBufWrapper * v0; - DualArrayShortData * v1; - CellActorData * v2; + StrBufWrapper *v0; + DualArrayShortData *v1; + CellActorData *v2; s16 v3; v1 = ¶m0->unk_7F8; @@ -686,11 +685,11 @@ static void sub_02084134 (GameWindowLayout * param0) sub_02083104(param0, v1->unk_300[1]); } -static void sub_02084420 (GameWindowLayout * param0, u8 param1) +static void sub_02084420(GameWindowLayout *param0, u8 param1) { - DualArrayShortData * v0; - const u16 * v1; - u16 * v2; + DualArrayShortData *v0; + const u16 *v1; + u16 *v2; u16 v3; u16 v4; @@ -711,7 +710,7 @@ static void sub_02084420 (GameWindowLayout * param0, u8 param1) } } -static void sub_020844B0 (GameWindowLayout * param0, int * param1) +static void sub_020844B0(GameWindowLayout *param0, int *param1) { u8 v0; @@ -759,7 +758,7 @@ static void sub_020844B0 (GameWindowLayout * param0, int * param1) *param1 = 24; } -int sub_020845A8 (GameWindowLayout * param0) +int sub_020845A8(GameWindowLayout *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { sub_0200E084(¶m0->unk_04[34], 1); @@ -771,7 +770,7 @@ int sub_020845A8 (GameWindowLayout * param0) return 23; } -static void sub_020845E8 (GameWindowLayout * param0, int * param1) +static void sub_020845E8(GameWindowLayout *param0, int *param1) { u8 v0; @@ -803,7 +802,7 @@ static void sub_020845E8 (GameWindowLayout * param0, int * param1) *param1 = 1; } -static void sub_020846CC (GameWindowLayout * param0, int * param1) +static void sub_020846CC(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 0; @@ -813,7 +812,7 @@ static void sub_020846CC (GameWindowLayout * param0, int * param1) *param1 = 32; } -static void sub_020846FC (GameWindowLayout * param0, int * param1) +static void sub_020846FC(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 0; @@ -823,7 +822,7 @@ static void sub_020846FC (GameWindowLayout * param0, int * param1) *param1 = 32; } -static void sub_0208472C (GameWindowLayout * param0, int * param1) +static void sub_0208472C(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 1; @@ -833,7 +832,7 @@ static void sub_0208472C (GameWindowLayout * param0, int * param1) *param1 = 32; } -static void sub_02084760 (GameWindowLayout * param0, int * param1) +static void sub_02084760(GameWindowLayout *param0, int *param1) { sub_0208337C(param0); sub_0200E084(¶m0->unk_04[33], 1); @@ -841,9 +840,9 @@ static void sub_02084760 (GameWindowLayout * param0, int * param1) *param1 = sub_02084780(param0); } -int sub_02084780 (GameWindowLayout * param0) +int sub_02084780(GameWindowLayout *param0) { - Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + Pokemon *v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); if (Pokemon_GetValue(v0, MON_DATA_MAIL_ID, NULL) == 0) { MessageLoader_GetStrbuf(param0->unk_69C, 129, param0->unk_6A4); @@ -861,7 +860,7 @@ int sub_02084780 (GameWindowLayout * param0) return 24; } -static void sub_02084808 (GameWindowLayout * param0, int * param1) +static void sub_02084808(GameWindowLayout *param0, int *param1) { UnkFuncPtr_02084808 v0; u32 v1; @@ -904,85 +903,85 @@ static void sub_02084808 (GameWindowLayout * param0, int * param1) *param1 = 24; } -static void sub_020848A8 (GameWindowLayout * param0, int * param1) +static void sub_020848A8(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 11; sub_02084808(param0, param1); } -static void sub_020848C0 (GameWindowLayout * param0, int * param1) +static void sub_020848C0(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 16; sub_02084808(param0, param1); } -static void sub_020848D8 (GameWindowLayout * param0, int * param1) +static void sub_020848D8(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 14; sub_02084808(param0, param1); } -static void sub_020848F0 (GameWindowLayout * param0, int * param1) +static void sub_020848F0(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 13; sub_02084808(param0, param1); } -static void sub_02084908 (GameWindowLayout * param0, int * param1) +static void sub_02084908(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 15; sub_02084808(param0, param1); } -static void sub_02084920 (GameWindowLayout * param0, int * param1) +static void sub_02084920(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 18; sub_02084808(param0, param1); } -static void sub_02084938 (GameWindowLayout * param0, int * param1) +static void sub_02084938(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 12; sub_02084808(param0, param1); } -static void sub_02084950 (GameWindowLayout * param0, int * param1) +static void sub_02084950(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 17; sub_02084808(param0, param1); } -static void sub_02084968 (GameWindowLayout * param0, int * param1) +static void sub_02084968(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 19; sub_02084808(param0, param1); } -static void sub_02084980 (GameWindowLayout * param0, int * param1) +static void sub_02084980(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 20; sub_02084808(param0, param1); } -static void sub_02084998 (GameWindowLayout * param0, int * param1) +static void sub_02084998(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 21; sub_02084808(param0, param1); } -static void sub_020849B0 (GameWindowLayout * param0, int * param1) +static void sub_020849B0(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 22; sub_02084808(param0, param1); } -static void sub_020849C8 (GameWindowLayout * param0, int * param1) +static void sub_020849C8(GameWindowLayout *param0, int *param1) { param0->unk_5A4->unk_23 = 23; sub_02084808(param0, param1); } -static void sub_020849E0 (GameWindowLayout * param0, int * param1) +static void sub_020849E0(GameWindowLayout *param0, int *param1) { *param1 = sub_02084A18(param0); @@ -991,7 +990,7 @@ static void sub_020849E0 (GameWindowLayout * param0, int * param1) } } -static void sub_020849FC (GameWindowLayout * param0, int * param1) +static void sub_020849FC(GameWindowLayout *param0, int *param1) { *param1 = sub_02084A18(param0); @@ -1000,7 +999,7 @@ static void sub_020849FC (GameWindowLayout * param0, int * param1) } } -static int sub_02084A18 (GameWindowLayout * param0) +static int sub_02084A18(GameWindowLayout *param0) { sub_0200E084(¶m0->unk_04[33], 1); sub_0208337C(param0); @@ -1030,7 +1029,7 @@ static int sub_02084A18 (GameWindowLayout * param0) } } -int sub_02084B34 (GameWindowLayout * param0) +int sub_02084B34(GameWindowLayout *param0) { if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { sub_0200E084(¶m0->unk_04[34], 1); diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c index 4f94ae517e..5f551613e4 100644 --- a/src/unk_02084B70.c +++ b/src/unk_02084B70.c @@ -1,58 +1,56 @@ +#include "unk_02084B70.h" + #include #include -#include "core_sys.h" - -#include "strbuf.h" -#include "pokemon.h" - -#include "field/field_system.h" #include "struct_defs/struct_0207F248.h" #include "struct_defs/struct_02081CF4.h" -#include "unk_02001AF4.h" -#include "unk_02005474.h" +#include "field/field_system.h" + +#include "bag.h" +#include "core_sys.h" +#include "heap.h" +#include "item.h" +#include "map_header.h" #include "message.h" +#include "move_table.h" +#include "party.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02001AF4.h" +#include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_02013A04.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "map_header.h" -#include "pokemon.h" -#include "move_table.h" -#include "party.h" -#include "item.h" -#include "bag.h" #include "unk_0207E0B8.h" #include "unk_020819DC.h" #include "unk_02082C2C.h" -#include "unk_02084B70.h" -#include "pokemon_summary_app.h" #include "unk_02096420.h" -static int sub_02085384(void * param0); -static int sub_02085424(void * param0); -static int sub_020855C4(void * param0); -static int sub_02085704(void * param0); -static int sub_02085A70(void * param0); -static int sub_02085C50(void * param0); -static void sub_02086590(GameWindowLayout * param0, Pokemon * param1, u32 param2); -static int sub_02086438(void * param0); -static int sub_0208648C(void * param0); -static int sub_020864E4(void * param0); -static int sub_02086538(void * param0); -static u16 sub_02086930(GameWindowLayout * param0); -static int sub_02085FB4(void * param0); -static int sub_02086008(void * param0); -static int sub_02086060(void * param0); -static int sub_020860AC(void * param0); - -static u8 sub_02084B70 (u16 param0) +static int sub_02085384(void *param0); +static int sub_02085424(void *param0); +static int sub_020855C4(void *param0); +static int sub_02085704(void *param0); +static int sub_02085A70(void *param0); +static int sub_02085C50(void *param0); +static void sub_02086590(GameWindowLayout *param0, Pokemon *param1, u32 param2); +static int sub_02086438(void *param0); +static int sub_0208648C(void *param0); +static int sub_020864E4(void *param0); +static int sub_02086538(void *param0); +static u16 sub_02086930(GameWindowLayout *param0); +static int sub_02085FB4(void *param0); +static int sub_02086008(void *param0); +static int sub_02086060(void *param0); +static int sub_020860AC(void *param0); + +static u8 sub_02084B70(u16 param0) { - ItemData * v0; + ItemData *v0; s32 v1; v0 = Item_Load(param0, 0, 12); @@ -219,10 +217,10 @@ static u8 sub_02084B70 (u16 param0) return 28; } -static void sub_02084E58 (GameWindowLayout * param0, u16 param1, u32 param2) +static void sub_02084E58(GameWindowLayout *param0, u16 param1, u32 param2) { - Pokemon * v0; - Strbuf* v1; + Pokemon *v0; + Strbuf *v1; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); @@ -355,7 +353,7 @@ static void sub_02084E58 (GameWindowLayout * param0, u16 param1, u32 param2) } } -void sub_020852B8 (GameWindowLayout * param0) +void sub_020852B8(GameWindowLayout *param0) { switch (sub_02084B70(param0->unk_5A4->unk_24)) { case 0: @@ -399,9 +397,9 @@ void sub_020852B8 (GameWindowLayout * param0) } } -int sub_02085348 (void * param0) +int sub_02085348(void *param0) { - GameWindowLayout * v0 = (GameWindowLayout *)param0; + GameWindowLayout *v0 = (GameWindowLayout *)param0; if (Message_Printing(v0->unk_B10) != 0) { return 5; @@ -415,9 +413,9 @@ int sub_02085348 (void * param0) return 5; } -static int sub_02085384 (void * param0) +static int sub_02085384(void *param0) { - GameWindowLayout * v0 = (GameWindowLayout *)param0; + GameWindowLayout *v0 = (GameWindowLayout *)param0; sub_02096F14(v0->unk_5A4->unk_00, v0->unk_5A4->unk_24, v0->unk_B11, 0, sub_02086930(v0), 12); sub_0207EF14(v0, v0->unk_B11); @@ -433,10 +431,10 @@ static int sub_02085384 (void * param0) return 5; } -static int sub_02085424 (void * param0) +static int sub_02085424(void *param0) { - GameWindowLayout * v0; - Pokemon * v1; + GameWindowLayout *v0; + Pokemon *v1; u8 v2[7]; v0 = (GameWindowLayout *)param0; @@ -472,11 +470,11 @@ static int sub_02085424 (void * param0) return 5; } -static int sub_020855C4 (void * param0) +static int sub_020855C4(void *param0) { - GameWindowLayout * v0; - Pokemon * v1; - Strbuf* v2; + GameWindowLayout *v0; + Pokemon *v1; + Strbuf *v2; u32 v3; u32 v4; @@ -515,10 +513,10 @@ static int sub_020855C4 (void * param0) return 5; } -static int sub_02085704 (void * param0) +static int sub_02085704(void *param0) { - GameWindowLayout * v0 = (GameWindowLayout *)param0; - Pokemon * v1; + GameWindowLayout *v0 = (GameWindowLayout *)param0; + Pokemon *v1; u32 v2; v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); @@ -541,7 +539,7 @@ static int sub_02085704 (void * param0) return 5; } -BOOL sub_020857A8 (u16 param0) +BOOL sub_020857A8(u16 param0) { if (Item_LoadParam(param0, 24, 12) != 0) { return 1; @@ -550,7 +548,7 @@ BOOL sub_020857A8 (u16 param0) return 0; } -static u8 sub_020857C0 (GameWindowLayout * param0, u8 param1) +static u8 sub_020857C0(GameWindowLayout *param0, u8 param1) { u8 v0; @@ -567,10 +565,10 @@ static u8 sub_020857C0 (GameWindowLayout * param0, u8 param1) return 0xff; } -int sub_02085804 (GameWindowLayout * param0) +int sub_02085804(GameWindowLayout *param0) { - Pokemon * v0; - Strbuf* v1; + Pokemon *v0; + Strbuf *v1; u32 v2; u8 v3; @@ -656,11 +654,11 @@ int sub_02085804 (GameWindowLayout * param0) return 7; } -static int sub_02085A70 (void * param0) +static int sub_02085A70(void *param0) { - GameWindowLayout * v0; - Pokemon * v1; - Strbuf* v2; + GameWindowLayout *v0; + Pokemon *v1; + Strbuf *v2; u32 v3; u32 v4; @@ -709,11 +707,11 @@ static int sub_02085A70 (void * param0) return 5; } -static int sub_02085C50 (void * param0) +static int sub_02085C50(void *param0) { - GameWindowLayout * v0; - Pokemon * v1; - Strbuf* v2; + GameWindowLayout *v0; + Pokemon *v1; + Strbuf *v2; v0 = param0; @@ -801,10 +799,9 @@ static int sub_02085C50 (void * param0) v0->unk_B13 = 4; } break; - case 6: - { - Pokemon * v3; - FieldSystem * fieldSystem; + case 6: { + Pokemon *v3; + FieldSystem *fieldSystem; int v5; v3 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11); @@ -824,10 +821,10 @@ static int sub_02085C50 (void * param0) return 5; } -int sub_02085EF4 (GameWindowLayout * param0) +int sub_02085EF4(GameWindowLayout *param0) { - Pokemon * v0; - Strbuf* v1; + Pokemon *v0; + Strbuf *v1; param0->unk_B00 = sub_02085C50; param0->unk_B13 = 3; @@ -852,10 +849,10 @@ int sub_02085EF4 (GameWindowLayout * param0) return 24; } -static int sub_02085FB4 (void * param0) +static int sub_02085FB4(void *param0) { - GameWindowLayout * v0; - Strbuf* v1; + GameWindowLayout *v0; + Strbuf *v1; v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 59); @@ -870,10 +867,10 @@ static int sub_02085FB4 (void * param0) return 24; } -static int sub_02086008 (void * param0) +static int sub_02086008(void *param0) { - GameWindowLayout * v0; - Strbuf* v1; + GameWindowLayout *v0; + Strbuf *v1; v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 55); @@ -889,10 +886,10 @@ static int sub_02086008 (void * param0) return 24; } -static int sub_02086060 (void * param0) +static int sub_02086060(void *param0) { - GameWindowLayout * v0; - Strbuf* v1; + GameWindowLayout *v0; + Strbuf *v1; v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 58); @@ -907,10 +904,10 @@ static int sub_02086060 (void * param0) return 24; } -static int sub_020860AC (void * param0) +static int sub_020860AC(void *param0) { - GameWindowLayout * v0; - Strbuf* v1; + GameWindowLayout *v0; + Strbuf *v1; v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52); @@ -926,7 +923,7 @@ static int sub_020860AC (void * param0) return 24; } -u8 sub_02086104 (GameWindowLayout * param0, Pokemon * param1) +u8 sub_02086104(GameWindowLayout *param0, Pokemon *param1) { u16 v0; u8 v1; @@ -954,10 +951,10 @@ u8 sub_02086104 (GameWindowLayout * param0, Pokemon * param1) return v1; } -int sub_0208615C (GameWindowLayout * param0) +int sub_0208615C(GameWindowLayout *param0) { - Pokemon * v0; - Strbuf* v1; + Pokemon *v0; + Strbuf *v1; u32 v2; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); @@ -1011,10 +1008,10 @@ int sub_0208615C (GameWindowLayout * param0) return 24; } -int sub_020862F8 (GameWindowLayout * param0) +int sub_020862F8(GameWindowLayout *param0) { - Pokemon * v0; - Strbuf* v1; + Pokemon *v0; + Strbuf *v1; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); @@ -1034,10 +1031,10 @@ int sub_020862F8 (GameWindowLayout * param0) return 24; } -int sub_020863A0 (GameWindowLayout * param0) +int sub_020863A0(GameWindowLayout *param0) { - Pokemon * v0; - Strbuf* v1; + Pokemon *v0; + Strbuf *v1; if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) { v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); @@ -1058,10 +1055,10 @@ int sub_020863A0 (GameWindowLayout * param0) return 22; } -static int sub_02086438 (void * param0) +static int sub_02086438(void *param0) { - GameWindowLayout * v0; - Strbuf* v1; + GameWindowLayout *v0; + Strbuf *v1; v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 59); @@ -1076,10 +1073,10 @@ static int sub_02086438 (void * param0) return 24; } -static int sub_0208648C (void * param0) +static int sub_0208648C(void *param0) { - GameWindowLayout * v0; - Strbuf* v1; + GameWindowLayout *v0; + Strbuf *v1; v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 55); @@ -1095,10 +1092,10 @@ static int sub_0208648C (void * param0) return 24; } -static int sub_020864E4 (void * param0) +static int sub_020864E4(void *param0) { - GameWindowLayout * v0; - Strbuf* v1; + GameWindowLayout *v0; + Strbuf *v1; v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 58); @@ -1113,10 +1110,10 @@ static int sub_020864E4 (void * param0) return 24; } -static int sub_02086538 (void * param0) +static int sub_02086538(void *param0) { - GameWindowLayout * v0; - Strbuf* v1; + GameWindowLayout *v0; + Strbuf *v1; v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52); @@ -1132,7 +1129,7 @@ static int sub_02086538 (void * param0) return 24; } -static void sub_02086590 (GameWindowLayout * param0, Pokemon * param1, u32 param2) +static void sub_02086590(GameWindowLayout *param0, Pokemon *param1, u32 param2) { u32 v0; @@ -1154,10 +1151,10 @@ static void sub_02086590 (GameWindowLayout * param0, Pokemon * param1, u32 param } } -static u8 sub_02086614 (GameWindowLayout * param0, u8 param1) +static u8 sub_02086614(GameWindowLayout *param0, u8 param1) { - Pokemon * v0; - Strbuf* v1; + Pokemon *v0; + Strbuf *v1; u16 v2; v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); @@ -1177,7 +1174,7 @@ static u8 sub_02086614 (GameWindowLayout * param0, u8 param1) return 1; } -void sub_020866A0 (GameWindowLayout * param0, u8 param1) +void sub_020866A0(GameWindowLayout *param0, u8 param1) { UnkStruct_02081CF4 v0; u8 v1; @@ -1213,7 +1210,7 @@ void sub_020866A0 (GameWindowLayout * param0, u8 param1) param0->unk_700 = sub_02001B7C(&v0, 8, 0, 0, 12, PAD_BUTTON_B); } -int sub_02086774 (GameWindowLayout * param0) +int sub_02086774(GameWindowLayout *param0) { u32 v0 = sub_02001BE0(param0->unk_700); @@ -1234,7 +1231,7 @@ int sub_02086774 (GameWindowLayout * param0) sub_02013A3C(param0->unk_6FC); if (sub_02096F14(param0->unk_5A4->unk_00, param0->unk_5A4->unk_24, param0->unk_B11, (u8)v0, sub_02086930(param0), 12) == 1) { - Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); + Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); sub_02084E58(param0, param0->unk_5A4->unk_24, Pokemon_GetValue(v1, MON_DATA_MOVE1 + v0, NULL)); Bag_TryRemoveItem(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, 12); Sound_PlayEffect(1516); @@ -1253,7 +1250,7 @@ int sub_02086774 (GameWindowLayout * param0) return 6; } -void sub_020868B0 (GameWindowLayout * param0) +void sub_020868B0(GameWindowLayout *param0) { sub_0200E084(¶m0->unk_04[32], 1); @@ -1271,8 +1268,8 @@ void sub_020868B0 (GameWindowLayout * param0) param0->unk_B0E = 25; } -static u16 sub_02086930 (GameWindowLayout * param0) +static u16 sub_02086930(GameWindowLayout *param0) { - FieldSystem * fieldSystem = param0->unk_5A4->unk_1C; + FieldSystem *fieldSystem = param0->unk_5A4->unk_1C; return (u16)MapHeader_GetMapLabelTextID(fieldSystem->location->mapId); } diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 6665877750..dbba6109d5 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -1,67 +1,64 @@ +#include "unk_0208694C.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "struct_decls/struct_020218BC_decl.h" #include "struct_decls/struct_02022550_decl.h" -#include "strbuf.h" -#include "pokemon.h" #include "struct_decls/struct_02087A10_decl.h" - -#include "constdata/const_020F2DAC.h" - #include "struct_defs/struct_0200C738.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_0208737C.h" #include "struct_defs/struct_02099F80.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay022/struct_ov22_022559F8.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" #include "overlay115/struct_ov115_02261520.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "message_util.h" +#include "narc.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "strbuf.h" +#include "string_template.h" +#include "sys_task_manager.h" #include "unk_020021B0.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" #include "unk_0200679C.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_02006E3C.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200A784.h" -#include "message.h" -#include "message_util.h" -#include "string_template.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02012744.h" #include "unk_0201567C.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" -#include "sys_task_manager.h" #include "unk_0201D15C.h" #include "unk_0201D670.h" #include "unk_0201DBEC.h" #include "unk_0201E86C.h" #include "unk_0201F834.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "strbuf.h" -#include "game_options.h" -#include "pokemon.h" #include "unk_020797C8.h" -#include "pokemon_icon.h" -#include "unk_0208694C.h" + +#include "constdata/const_020F2DAC.h" typedef struct { int unk_00; @@ -80,7 +77,7 @@ struct UnkStruct_02087A10_t { int unk_0C; int unk_10; int unk_14; - Options * unk_18; + Options *unk_18; UnkStruct_02087A10_sub1 unk_1C; u16 unk_38; u16 unk_3A[6][13]; @@ -89,26 +86,26 @@ struct UnkStruct_02087A10_t { u16 unk_118[32]; u16 unk_158; u16 unk_15A[3]; - BGL * unk_160; + BGL *unk_160; BOOL unk_164; - StringTemplate * unk_168; - MessageLoader * unk_16C; - MessageLoader * unk_170; - MessageLoader * unk_174; - Strbuf* unk_178; - Strbuf* unk_17C; - Strbuf* unk_180; - Strbuf* unk_184; - GraphicElementManager * unk_188; + StringTemplate *unk_168; + MessageLoader *unk_16C; + MessageLoader *unk_170; + MessageLoader *unk_174; + Strbuf *unk_178; + Strbuf *unk_17C; + Strbuf *unk_180; + Strbuf *unk_184; + GraphicElementManager *unk_188; UnkStruct_0200C738 unk_18C; - UnkStruct_02009714 * unk_318[4]; - UnkStruct_02009DC8 * unk_328[2][4]; + UnkStruct_02009714 *unk_318[4]; + UnkStruct_02009DC8 *unk_328[2][4]; UnkStruct_ov19_021DA864 unk_348; UnkStruct_ov19_021DA864 unk_36C; - GraphicElementData * unk_390[14]; - GraphicElementData * unk_3C8[12]; - GraphicElementData * unk_3F8[2]; - SysTask * unk_400[7]; + GraphicElementData *unk_390[14]; + GraphicElementData *unk_3C8[12]; + GraphicElementData *unk_3F8[2]; + SysTask *unk_400[7]; Window unk_41C[10]; int unk_4BC; int unk_4C0; @@ -120,27 +117,27 @@ struct UnkStruct_02087A10_t { int unk_4EC; int unk_4F0; int unk_4F4[7]; - void * unk_510; - NNSG2dCharacterData * unk_514; - void * unk_518; - NNSG2dCharacterData * unk_51C; - void * unk_520; - NNSG2dPaletteData * unk_524; + void *unk_510; + NNSG2dCharacterData *unk_514; + void *unk_518; + NNSG2dCharacterData *unk_51C; + void *unk_520; + NNSG2dPaletteData *unk_524; u8 unk_528[256]; - void * unk_628; + void *unk_628; BOOL unk_62C; int unk_630; }; typedef struct { - GraphicElementData * unk_00; - GraphicElementData * unk_04; + GraphicElementData *unk_00; + GraphicElementData *unk_04; int unk_08; int unk_0C; } UnkStruct_020879DC; typedef struct { - GraphicElementData * unk_00; + GraphicElementData *unk_00; int unk_04; int unk_08; int unk_0C; @@ -150,729 +147,729 @@ typedef struct { u8 unk_00; u8 unk_01; u16 unk_02_0 : 2; - u16 : 14; + u16 : 14; u8 unk_04_0 : 5; - u8 : 3; + u8 : 3; u8 unk_05_0 : 5; - u8 : 3; + u8 : 3; } UnkStruct_020F2A14; -static int sub_0208694C(OverlayManager * param0, int * param1); -static int sub_02086B64(OverlayManager * param0, int * param1); -static int sub_02086F3C(OverlayManager * param0, int * param1); -static void sub_02087190(void * param0); +static int sub_0208694C(OverlayManager *param0, int *param1); +static int sub_02086B64(OverlayManager *param0, int *param1); +static int sub_02086F3C(OverlayManager *param0, int *param1); +static void sub_02087190(void *param0); static void sub_020871CC(void); -static void sub_020871EC(BGL * param0); -static void sub_0208765C(BGL * param0, Window * param1); -static void sub_0208769C(UnkStruct_02087A10 * param0, NARC * param1); -static void sub_02087D64(BGL * param0, Window * param1, int * param2, int param3, int * param4, VecFx32 param5[], GraphicElementData ** param6, void * param7); -static void sub_0208737C(UnkStruct_02087A10 * param0, OverlayManager * param1); -static void sub_02088240(BGL * param0, int param1, VecFx32 param2[]); +static void sub_020871EC(BGL *param0); +static void sub_0208765C(BGL *param0, Window *param1); +static void sub_0208769C(UnkStruct_02087A10 *param0, NARC *param1); +static void sub_02087D64(BGL *param0, Window *param1, int *param2, int param3, int *param4, VecFx32 param5[], GraphicElementData **param6, void *param7); +static void sub_0208737C(UnkStruct_02087A10 *param0, OverlayManager *param1); +static void sub_02088240(BGL *param0, int param1, VecFx32 param2[]); static void sub_02088260(VecFx32 param0[], int param1); -static void sub_020877F4(UnkStruct_02087A10 * param0, NARC * param1); -static void sub_02087A10(UnkStruct_02087A10 * param0); +static void sub_020877F4(UnkStruct_02087A10 *param0, NARC *param1); +static void sub_02087A10(UnkStruct_02087A10 *param0); static void sub_020877C4(void); -static void sub_02087FC0(UnkStruct_02087A10 * param0, OverlayManager * param1, NARC * param2); -static void sub_02088350(UnkStruct_02087A10 * param0); -static void sub_02088514(u16 * param0); -static void sub_02088554(Window * param0, const u16 * param1, int param2, int param3, int param4, int param5, u32 param6, u8 * param7); -static void sub_02088678(Window * param0, const u16 * param1, u8 * param2, Strbuf *param3); +static void sub_02087FC0(UnkStruct_02087A10 *param0, OverlayManager *param1, NARC *param2); +static void sub_02088350(UnkStruct_02087A10 *param0); +static void sub_02088514(u16 *param0); +static void sub_02088554(Window *param0, const u16 *param1, int param2, int param3, int param4, int param5, u32 param6, u8 *param7); +static void sub_02088678(Window *param0, const u16 *param1, u8 *param2, Strbuf *param3); static void sub_02088844(u16 param0[][13], const int param1); -static void sub_02088754(Window * param0, u16 * param1, int param2, u16 * param3, u8 * param4, Strbuf *param5); -static int sub_02088898(UnkStruct_02087A10 * param0, u16 param1, int param2); -static int sub_02088D08(int param0, int param1, int param2, int param3, u16 * param4, int param5); -static int sub_02088C9C(int param0, int param1, u16 * param2, int param3); -static void sub_02088E1C(GraphicElementData ** param0, int param1, int param2); -static void sub_020871B0(UnkStruct_02087A10 * param0, UnkStruct_0208737C * param1); -static void sub_02088E58(Window * param0, u16 param1, int param2, u32 param3, u8 * param4); -static void sub_02088454(UnkStruct_02087A10 * param0, int param1); -static void sub_02088F40(int param0[], GraphicElementData ** param1, int param2); -static void sub_020879DC(SysTask * param0, void * param1); -static void sub_02087CDC(SysTask * param0, void * param1); -static void sub_02086B30(NNSG2dCharacterData * param0, NNSG2dPaletteData * param1, int param2, int param3); +static void sub_02088754(Window *param0, u16 *param1, int param2, u16 *param3, u8 *param4, Strbuf *param5); +static int sub_02088898(UnkStruct_02087A10 *param0, u16 param1, int param2); +static int sub_02088D08(int param0, int param1, int param2, int param3, u16 *param4, int param5); +static int sub_02088C9C(int param0, int param1, u16 *param2, int param3); +static void sub_02088E1C(GraphicElementData **param0, int param1, int param2); +static void sub_020871B0(UnkStruct_02087A10 *param0, UnkStruct_0208737C *param1); +static void sub_02088E58(Window *param0, u16 param1, int param2, u32 param3, u8 *param4); +static void sub_02088454(UnkStruct_02087A10 *param0, int param1); +static void sub_02088F40(int param0[], GraphicElementData **param1, int param2); +static void sub_020879DC(SysTask *param0, void *param1); +static void sub_02087CDC(SysTask *param0, void *param1); +static void sub_02086B30(NNSG2dCharacterData *param0, NNSG2dPaletteData *param1, int param2, int param3); static void sub_0208732C(int param0); -static void sub_02087544(UnkStruct_02087A10 * param0, OverlayManager * param1); -static void sub_02087BE4(UnkStruct_02087A10 * param0, UnkStruct_ov115_02261520 * param1); -static void sub_02086E6C(UnkStruct_02087A10 * param0, UnkStruct_0208737C * param1); -static void sub_02087F48(Window * param0, int param1, Strbuf *param2); -static void sub_02088FD0(UnkStruct_02087A10 * param0); -static int sub_02086D38(UnkStruct_02087A10 * param0, int param1); -static int sub_02086F14(u16 * param0); -static void * sub_02088654(Window * param0, Strbuf *param1, u8 param2, u32 param3); -static BOOL sub_0208903C(UnkStruct_02087A10 * param0); +static void sub_02087544(UnkStruct_02087A10 *param0, OverlayManager *param1); +static void sub_02087BE4(UnkStruct_02087A10 *param0, UnkStruct_ov115_02261520 *param1); +static void sub_02086E6C(UnkStruct_02087A10 *param0, UnkStruct_0208737C *param1); +static void sub_02087F48(Window *param0, int param1, Strbuf *param2); +static void sub_02088FD0(UnkStruct_02087A10 *param0); +static int sub_02086D38(UnkStruct_02087A10 *param0, int param1); +static int sub_02086F14(u16 *param0); +static void *sub_02088654(Window *param0, Strbuf *param1, u8 param2, u32 param3); +static BOOL sub_0208903C(UnkStruct_02087A10 *param0); static const int Unk_020F2984[][4] = { - { 0x4, 0x44, 0x3, 0x1 }, - { 0x24, 0x44, 0x8, 0x1 }, - { 0x44, 0x44, 0xD, 0x1 }, - { 0x0, 0xC8, 0x12, 0x1 }, - { 0x65, 0x44, 0x14, 0x1 }, - { 0x88, 0x44, 0x17, 0x1 }, - { 0xB0, 0x44, 0x19, 0x1 }, - { 0x16, 0x38, 0x25, 0x2 }, - { 0x1A, 0x5B, 0x27, 0x0 } + { 0x4, 0x44, 0x3, 0x1 }, + { 0x24, 0x44, 0x8, 0x1 }, + { 0x44, 0x44, 0xD, 0x1 }, + { 0x0, 0xC8, 0x12, 0x1 }, + { 0x65, 0x44, 0x14, 0x1 }, + { 0x88, 0x44, 0x17, 0x1 }, + { 0xB0, 0x44, 0x19, 0x1 }, + { 0x16, 0x38, 0x25, 0x2 }, + { 0x1A, 0x5B, 0x27, 0x0 } }; static const u16 Unk_020F255A[] = { - 0xE002, - 0xE002, - 0xE003, - 0xE003, - 0xE004, - 0xE004, - 0xD004, - 0xD004, - 0xE007, - 0xE007, - 0xE007, - 0xE008, - 0xE008 + 0xE002, + 0xE002, + 0xE003, + 0xE003, + 0xE004, + 0xE004, + 0xD004, + 0xD004, + 0xE007, + 0xE007, + 0xE007, + 0xE008, + 0xE008 }; static const u16 Unk_020F2574[] = { - 0xD004, - 0xD004, - 0xD004, - 0xD004, - 0xD004, - 0xD004, - 0xD004, - 0xD004, - 0xE007, - 0xE007, - 0xE007, - 0xE008, - 0xE008 + 0xD004, + 0xD004, + 0xD004, + 0xD004, + 0xD004, + 0xD004, + 0xD004, + 0xD004, + 0xE007, + 0xE007, + 0xE007, + 0xE008, + 0xE008 }; static const u16 *Unk_02100C40[] = { - Unk_020F255A, - Unk_020F255A, - Unk_020F255A, - Unk_020F255A, - Unk_020F2574 + Unk_020F255A, + Unk_020F255A, + Unk_020F255A, + Unk_020F255A, + Unk_020F2574 }; static const u16 Unk_020F251C[] = { - 0x19, - 0x39, - 0x59, - 0x61, - 0x7A, - 0x9E, - 0xC6, - 0x0 + 0x19, + 0x39, + 0x59, + 0x61, + 0x7A, + 0x9E, + 0xC6, + 0x0 }; static const u8 Unk_020F24E8[] = { - 0x28, - 0x28, - 0x28, - 0x28, - 0x29, - 0x29, - 0x29 + 0x28, + 0x28, + 0x28, + 0x28, + 0x29, + 0x29, + 0x29 }; static const u16 Unk_020F261C[] = { - 0x12B, - 0x12C, - 0x12D, - 0x12E, - 0x12f, - 0x130, - 0x131, - 0x132, - 0x133, - 0x134, - 0x1DE, - 0x1AD, - 0x1AE, - 0xffff + 0x12B, + 0x12C, + 0x12D, + 0x12E, + 0x12f, + 0x130, + 0x131, + 0x132, + 0x133, + 0x134, + 0x1DE, + 0x1AD, + 0x1AE, + 0xffff }; static const u16 Unk_020F2638[] = { - 0x135, - 0x136, - 0x137, - 0x138, - 0x139, - 0x13A, - 0x13B, - 0x13C, - 0x13D, - 0x13E, - 0x1DE, - 0x1B3, - 0x1BE, - 0xffff + 0x135, + 0x136, + 0x137, + 0x138, + 0x139, + 0x13A, + 0x13B, + 0x13C, + 0x13D, + 0x13E, + 0x1DE, + 0x1B3, + 0x1BE, + 0xffff }; static const u16 Unk_020F2654[] = { - 0x13f, - 0x140, - 0x141, - 0x142, - 0x143, - 0x144, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1BB, - 0x1BC, - 0xffff + 0x13f, + 0x140, + 0x141, + 0x142, + 0x143, + 0x144, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1BB, + 0x1BC, + 0xffff }; static const u16 Unk_020F25C8[] = { - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0xffff + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0xffff }; static const u16 Unk_020F2600[] = { - 0x121, - 0x122, - 0x123, - 0x124, - 0x125, - 0x126, - 0x127, - 0x128, - 0x129, - 0x12A, - 0x1DE, - 0x1DE, - 0x1DE, - 0xffff + 0x121, + 0x122, + 0x123, + 0x124, + 0x125, + 0x126, + 0x127, + 0x128, + 0x129, + 0x12A, + 0x1DE, + 0x1DE, + 0x1DE, + 0xffff }; static const u16 Unk_020F268C[] = { - 0x145, - 0x146, - 0x147, - 0x148, - 0x149, - 0x14A, - 0x14B, - 0x14C, - 0x14D, - 0x14E, - 0x1DE, - 0x1AD, - 0x1AE, - 0xffff + 0x145, + 0x146, + 0x147, + 0x148, + 0x149, + 0x14A, + 0x14B, + 0x14C, + 0x14D, + 0x14E, + 0x1DE, + 0x1AD, + 0x1AE, + 0xffff }; static const u16 Unk_020F26A8[] = { - 0x14f, - 0x150, - 0x151, - 0x152, - 0x153, - 0x154, - 0x155, - 0x156, - 0x157, - 0x158, - 0x1DE, - 0x1B3, - 0x1BE, - 0xffff + 0x14f, + 0x150, + 0x151, + 0x152, + 0x153, + 0x154, + 0x155, + 0x156, + 0x157, + 0x158, + 0x1DE, + 0x1B3, + 0x1BE, + 0xffff }; static const u16 Unk_020F27F8[] = { - 0x159, - 0x15A, - 0x15B, - 0x15C, - 0x15D, - 0x15E, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1BB, - 0x1BC, - 0xffff + 0x159, + 0x15A, + 0x15B, + 0x15C, + 0x15D, + 0x15E, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1BB, + 0x1BC, + 0xffff }; static const u16 Unk_020F26FC[] = { - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0xffff + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0xffff }; static const u16 Unk_020F27C0[] = { - 0x121, - 0x122, - 0x123, - 0x124, - 0x125, - 0x126, - 0x127, - 0x128, - 0x129, - 0x12A, - 0x1DE, - 0x1DE, - 0x1DE, - 0xffff + 0x121, + 0x122, + 0x123, + 0x124, + 0x125, + 0x126, + 0x127, + 0x128, + 0x129, + 0x12A, + 0x1DE, + 0x1DE, + 0x1DE, + 0xffff }; static const u16 Unk_020F2734[] = { - 0x1AD, - 0x1AE, - 0x1C4, - 0x1C5, - 0x1AB, - 0x1AC, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1BB, - 0x1BC, - 0x1DE, - 0x1DE, - 0xffff + 0x1AD, + 0x1AE, + 0x1C4, + 0x1C5, + 0x1AB, + 0x1AC, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1BB, + 0x1BC, + 0x1DE, + 0x1DE, + 0xffff }; static const u16 Unk_020F276C[] = { - 0x1B4, - 0x1B5, - 0x1B2, - 0x1B3, - 0x1B9, - 0x1BA, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0x1DE, - 0xffff + 0x1B4, + 0x1B5, + 0x1B2, + 0x1B3, + 0x1B9, + 0x1BA, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0x1DE, + 0xffff }; static const u16 Unk_020F2788[] = { - 0x1af, - 0x1B0, - 0x1C3, - 0x1D0, - 0x1C0, - 0x1D2, - 0x1BD, - 0x1BE, - 0x1bf, - 0x1B1, - 0x1C1, - 0x1DE, - 0x1DE, - 0xffff + 0x1af, + 0x1B0, + 0x1C3, + 0x1D0, + 0x1C0, + 0x1D2, + 0x1BD, + 0x1BE, + 0x1bf, + 0x1B1, + 0x1C1, + 0x1DE, + 0x1DE, + 0xffff }; static const u16 Unk_020F27A4[] = { - 0x1CB, - 0x1CC, - 0x1CD, - 0x1CE, - 0x1cf, - 0x1C6, - 0x1C8, - 0x1C9, - 0x1C7, - 0x1CA, - 0x1D1, - 0x1DE, - 0x1DE, - 0xffff + 0x1CB, + 0x1CC, + 0x1CD, + 0x1CE, + 0x1cf, + 0x1C6, + 0x1C8, + 0x1C9, + 0x1C7, + 0x1CA, + 0x1D1, + 0x1DE, + 0x1DE, + 0xffff }; static const u16 Unk_020F27DC[] = { - 0x1D3, - 0x1D4, - 0x1D5, - 0x1D6, - 0x1D7, - 0x1D8, - 0x1D9, - 0x1DA, - 0x1DD, - 0x1DB, - 0x1DC, - 0x1DE, - 0x1DE, - 0xffff + 0x1D3, + 0x1D4, + 0x1D5, + 0x1D6, + 0x1D7, + 0x1D8, + 0x1D9, + 0x1DA, + 0x1DD, + 0x1DB, + 0x1DC, + 0x1DE, + 0x1DE, + 0xffff }; static const u16 Unk_020F2718[] = { - 0xA2, - 0xA3, - 0xA4, - 0xA5, - 0xA6, - 0xA7, - 0xA8, - 0xA9, - 0xAA, - 0xAB, - 0x1, - 0xE1, - 0xE2, - 0xffff + 0xA2, + 0xA3, + 0xA4, + 0xA5, + 0xA6, + 0xA7, + 0xA8, + 0xA9, + 0xAA, + 0xAB, + 0x1, + 0xE1, + 0xE2, + 0xffff }; static const u16 Unk_020F258E[] = { - 0xE3, - 0xE4, - 0xf9, - 0xf8, - 0xE5, - 0xE6, - 0xf5, - 0xf6, - 0xf7, - 0xE7, - 0x1, - 0xEE, - 0xef, - 0xffff + 0xE3, + 0xE4, + 0xf9, + 0xf8, + 0xE5, + 0xE6, + 0xf5, + 0xf6, + 0xf7, + 0xE7, + 0x1, + 0xEE, + 0xef, + 0xffff }; static const u16 Unk_020F26E0[] = { - 0xE8, - 0xE9, - 0xEA, - 0xEB, - 0xEC, - 0xED, - 0xf0, - 0xf1, - 0xf2, - 0xf3, - 0xf4, - 0x106, - 0x104, - 0xffff + 0xE8, + 0xE9, + 0xEA, + 0xEB, + 0xEC, + 0xED, + 0xf0, + 0xf1, + 0xf2, + 0xf3, + 0xf4, + 0x106, + 0x104, + 0xffff }; static const u16 Unk_020F26C4[] = { - 0xff, - 0x100, - 0x101, - 0x102, - 0x103, - 0xfc, - 0xfa, - 0xfd, - 0xfb, - 0xfe, - 0x105, - 0x1, - 0x1, - 0xffff + 0xff, + 0x100, + 0x101, + 0x102, + 0x103, + 0xfc, + 0xfa, + 0xfd, + 0xfb, + 0xfe, + 0x105, + 0x1, + 0x1, + 0xffff }; static const u16 Unk_020F25E4[] = { - 0x107, - 0x108, - 0x109, - 0x10A, - 0x10B, - 0x10C, - 0x10D, - 0x10E, - 0x111, - 0x10f, - 0x110, - 0x1, - 0x1, - 0xffff + 0x107, + 0x108, + 0x109, + 0x10A, + 0x10B, + 0x10C, + 0x10D, + 0x10E, + 0x111, + 0x10f, + 0x110, + 0x1, + 0x1, + 0xffff }; static const u16 Unk_020F2870[] = { - 0x121, - 0x122, - 0x123, - 0x124, - 0x125, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0xffff + 0x121, + 0x122, + 0x123, + 0x124, + 0x125, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0xffff }; static const u16 Unk_020F2894[] = { - 0x126, - 0x127, - 0x128, - 0x129, - 0x12A, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0xffff + 0x126, + 0x127, + 0x128, + 0x129, + 0x12A, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0xffff }; static const u16 Unk_020F28B8[] = { - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0xffff + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0x1, + 0xffff }; const u16 *Unk_02100C54[][5] = { - { Unk_020F261C, Unk_020F2638, Unk_020F2654, Unk_020F25C8, Unk_020F2600 }, - { Unk_020F268C, Unk_020F26A8, Unk_020F27F8, Unk_020F26FC, Unk_020F27C0 }, - { Unk_020F2734, Unk_020F276C, Unk_020F2788, Unk_020F27A4, Unk_020F27DC }, - { Unk_020F2718, Unk_020F258E, Unk_020F26E0, Unk_020F26C4, Unk_020F25E4 }, - { Unk_020F2870, Unk_020F2894, Unk_020F28B8, Unk_020F28B8, Unk_020F28B8 } + { Unk_020F261C, Unk_020F2638, Unk_020F2654, Unk_020F25C8, Unk_020F2600 }, + { Unk_020F268C, Unk_020F26A8, Unk_020F27F8, Unk_020F26FC, Unk_020F27C0 }, + { Unk_020F2734, Unk_020F276C, Unk_020F2788, Unk_020F27A4, Unk_020F27DC }, + { Unk_020F2718, Unk_020F258E, Unk_020F26E0, Unk_020F26C4, Unk_020F25E4 }, + { Unk_020F2870, Unk_020F2894, Unk_020F28B8, Unk_020F28B8, Unk_020F28B8 } }; static const u16 Unk_020F2BBE[][3] = { - { 0x3, 0x1, 0x2 }, - { 0x5, 0x1, 0x4 }, - { 0x7, 0x1, 0x6 }, - { 0x9, 0x1, 0x8 }, - { 0xB, 0x1, 0xA }, - { 0x53, 0x1, 0x52 }, - { 0x55, 0x1, 0x54 }, - { 0x57, 0x1, 0x56 }, - { 0x59, 0x1, 0x58 }, - { 0x5B, 0x1, 0x5A }, - { 0x45, 0x1, 0x44 }, - { 0x47, 0x1, 0x46 }, - { 0x49, 0x1, 0x48 }, - { 0x95, 0x1, 0x94 }, - { 0x97, 0x1, 0x96 }, - { 0x99, 0x1, 0x98 }, - { 0xAC, 0x1, 0xC6 }, - { 0xAD, 0x1, 0xC7 }, - { 0xAE, 0x1, 0xC8 }, - { 0xaf, 0x1, 0xC9 }, - { 0xB0, 0x1, 0xCA }, - { 0xB1, 0x1, 0xCB }, - { 0xB2, 0x1, 0xCC }, - { 0xB3, 0x1, 0xCD }, - { 0xB4, 0x1, 0xCE }, - { 0xB5, 0x1, 0xcf }, - { 0xB6, 0x1, 0xD0 }, - { 0xB7, 0x1, 0xD1 }, - { 0xB8, 0x1, 0xD2 }, - { 0xB9, 0x1, 0xD3 }, - { 0xBA, 0x1, 0xD4 }, - { 0xBB, 0x1, 0xD5 }, - { 0xBC, 0x1, 0xD6 }, - { 0xBD, 0x1, 0xD7 }, - { 0xBE, 0x1, 0xD8 }, - { 0xbf, 0x1, 0xD9 }, - { 0xC0, 0x1, 0xDA }, - { 0xC1, 0x1, 0xDB }, - { 0xC2, 0x1, 0xDC }, - { 0xC3, 0x1, 0xDD }, - { 0xC4, 0x1, 0xDE }, - { 0xC5, 0x1, 0xdf }, - { 0x25, 0x26, 0x24 }, - { 0x75, 0x76, 0x74 }, - { 0xC, 0xD, 0x1 }, - { 0xE, 0x0f, 0x1 }, - { 0x10, 0x11, 0x1 }, - { 0x12, 0x13, 0x1 }, - { 0x14, 0x15, 0x1 }, - { 0x16, 0x17, 0x1 }, - { 0x18, 0x19, 0x1 }, - { 0x1A, 0x1B, 0x1 }, - { 0x1C, 0x1D, 0x1 }, - { 0x1E, 0x1f, 0x1 }, - { 0x20, 0x21, 0x1 }, - { 0x22, 0x23, 0x1 }, - { 0x27, 0x28, 0x1 }, - { 0x29, 0x2A, 0x1 }, - { 0x5C, 0x5D, 0x1 }, - { 0x5E, 0x5f, 0x1 }, - { 0x60, 0x61, 0x1 }, - { 0x62, 0x63, 0x1 }, - { 0x64, 0x65, 0x1 }, - { 0x66, 0x67, 0x1 }, - { 0x68, 0x69, 0x1 }, - { 0x6A, 0x6B, 0x1 }, - { 0x6C, 0x6D, 0x1 }, - { 0x6E, 0x6f, 0x1 }, - { 0x70, 0x71, 0x1 }, - { 0x72, 0x73, 0x1 }, - { 0x77, 0x78, 0x1 }, - { 0x79, 0x7A, 0x1 }, - { 0x30, 0x31, 0x32 }, - { 0x33, 0x34, 0x35 }, - { 0x36, 0x37, 0x38 }, - { 0x39, 0x3A, 0x3B }, - { 0x3C, 0x3D, 0x3E }, - { 0x80, 0x81, 0x82 }, - { 0x83, 0x84, 0x85 }, - { 0x86, 0x87, 0x88 }, - { 0x89, 0x8A, 0x8B }, - { 0x8C, 0x8D, 0x8E } + { 0x3, 0x1, 0x2 }, + { 0x5, 0x1, 0x4 }, + { 0x7, 0x1, 0x6 }, + { 0x9, 0x1, 0x8 }, + { 0xB, 0x1, 0xA }, + { 0x53, 0x1, 0x52 }, + { 0x55, 0x1, 0x54 }, + { 0x57, 0x1, 0x56 }, + { 0x59, 0x1, 0x58 }, + { 0x5B, 0x1, 0x5A }, + { 0x45, 0x1, 0x44 }, + { 0x47, 0x1, 0x46 }, + { 0x49, 0x1, 0x48 }, + { 0x95, 0x1, 0x94 }, + { 0x97, 0x1, 0x96 }, + { 0x99, 0x1, 0x98 }, + { 0xAC, 0x1, 0xC6 }, + { 0xAD, 0x1, 0xC7 }, + { 0xAE, 0x1, 0xC8 }, + { 0xaf, 0x1, 0xC9 }, + { 0xB0, 0x1, 0xCA }, + { 0xB1, 0x1, 0xCB }, + { 0xB2, 0x1, 0xCC }, + { 0xB3, 0x1, 0xCD }, + { 0xB4, 0x1, 0xCE }, + { 0xB5, 0x1, 0xcf }, + { 0xB6, 0x1, 0xD0 }, + { 0xB7, 0x1, 0xD1 }, + { 0xB8, 0x1, 0xD2 }, + { 0xB9, 0x1, 0xD3 }, + { 0xBA, 0x1, 0xD4 }, + { 0xBB, 0x1, 0xD5 }, + { 0xBC, 0x1, 0xD6 }, + { 0xBD, 0x1, 0xD7 }, + { 0xBE, 0x1, 0xD8 }, + { 0xbf, 0x1, 0xD9 }, + { 0xC0, 0x1, 0xDA }, + { 0xC1, 0x1, 0xDB }, + { 0xC2, 0x1, 0xDC }, + { 0xC3, 0x1, 0xDD }, + { 0xC4, 0x1, 0xDE }, + { 0xC5, 0x1, 0xdf }, + { 0x25, 0x26, 0x24 }, + { 0x75, 0x76, 0x74 }, + { 0xC, 0xD, 0x1 }, + { 0xE, 0x0f, 0x1 }, + { 0x10, 0x11, 0x1 }, + { 0x12, 0x13, 0x1 }, + { 0x14, 0x15, 0x1 }, + { 0x16, 0x17, 0x1 }, + { 0x18, 0x19, 0x1 }, + { 0x1A, 0x1B, 0x1 }, + { 0x1C, 0x1D, 0x1 }, + { 0x1E, 0x1f, 0x1 }, + { 0x20, 0x21, 0x1 }, + { 0x22, 0x23, 0x1 }, + { 0x27, 0x28, 0x1 }, + { 0x29, 0x2A, 0x1 }, + { 0x5C, 0x5D, 0x1 }, + { 0x5E, 0x5f, 0x1 }, + { 0x60, 0x61, 0x1 }, + { 0x62, 0x63, 0x1 }, + { 0x64, 0x65, 0x1 }, + { 0x66, 0x67, 0x1 }, + { 0x68, 0x69, 0x1 }, + { 0x6A, 0x6B, 0x1 }, + { 0x6C, 0x6D, 0x1 }, + { 0x6E, 0x6f, 0x1 }, + { 0x70, 0x71, 0x1 }, + { 0x72, 0x73, 0x1 }, + { 0x77, 0x78, 0x1 }, + { 0x79, 0x7A, 0x1 }, + { 0x30, 0x31, 0x32 }, + { 0x33, 0x34, 0x35 }, + { 0x36, 0x37, 0x38 }, + { 0x39, 0x3A, 0x3B }, + { 0x3C, 0x3D, 0x3E }, + { 0x80, 0x81, 0x82 }, + { 0x83, 0x84, 0x85 }, + { 0x86, 0x87, 0x88 }, + { 0x89, 0x8A, 0x8B }, + { 0x8C, 0x8D, 0x8E } }; static const u16 Unk_020F2954[][2] = { - { 0x24, 0x26 }, - { 0x74, 0x76 }, - { 0x32, 0x31 }, - { 0x35, 0x34 }, - { 0x38, 0x37 }, - { 0x3B, 0x3A }, - { 0x3E, 0x3D }, - { 0x82, 0x81 }, - { 0x85, 0x84 }, - { 0x88, 0x87 }, - { 0x8B, 0x8A }, - { 0x8E, 0x8D } + { 0x24, 0x26 }, + { 0x74, 0x76 }, + { 0x32, 0x31 }, + { 0x35, 0x34 }, + { 0x38, 0x37 }, + { 0x3B, 0x3A }, + { 0x3E, 0x3D }, + { 0x82, 0x81 }, + { 0x85, 0x84 }, + { 0x88, 0x87 }, + { 0x8B, 0x8A }, + { 0x8E, 0x8D } }; static const u16 Unk_020F292C[][2] = { - { 0x31, 0x32 }, - { 0x34, 0x35 }, - { 0x37, 0x38 }, - { 0x3A, 0x3B }, - { 0x3D, 0x3E }, - { 0x81, 0x82 }, - { 0x84, 0x85 }, - { 0x87, 0x88 }, - { 0x8A, 0x8B }, - { 0x8D, 0x8E } + { 0x31, 0x32 }, + { 0x34, 0x35 }, + { 0x37, 0x38 }, + { 0x3A, 0x3B }, + { 0x3D, 0x3E }, + { 0x81, 0x82 }, + { 0x84, 0x85 }, + { 0x87, 0x88 }, + { 0x8A, 0x8B }, + { 0x8D, 0x8E } }; static const int Unk_020F24F0[] = { - 0x70, - 0x4C, - 0x48 + 0x70, + 0x4C, + 0x48 }; static const u8 Unk_020F24DC[4] = { - 0x4, - 0x7, - 0xD, - 0xA + 0x4, + 0x7, + 0xD, + 0xA }; const u16 Unk_020F252C[] = { - 0x3, - 0x2B, - 0x20, - 0x2f, - 0x1, - 0x2B, - 0x3f, - 0x9, - 0x30, - 0xE2, - 0xffff + 0x3, + 0x2B, + 0x20, + 0x2f, + 0x1, + 0x2B, + 0x3f, + 0x9, + 0x30, + 0xE2, + 0xffff }; const u16 Unk_020F2830[] = { - 0x8E, - 0x62, - 0x93, - 0xA1, - 0x2f, - 0x1, - 0x7C, - 0x74, - 0x60, - 0x7E, - 0xf1, - 0x91, - 0x30, - 0xE2, - 0xffff + 0x8E, + 0x62, + 0x93, + 0xA1, + 0x2f, + 0x1, + 0x7C, + 0x74, + 0x60, + 0x7E, + 0xf1, + 0x91, + 0x30, + 0xE2, + 0xffff }; const u16 Unk_020F2542[] = { - 0x8D, - 0x74, - 0x60, - 0x6A, - 0x2f, - 0x1, - 0x2B, - 0x3f, - 0x9, - 0x30, - 0xE2, - 0xffff + 0x8D, + 0x74, + 0x60, + 0x6A, + 0x2f, + 0x1, + 0x2B, + 0x3f, + 0x9, + 0x30, + 0xE2, + 0xffff }; static const u16 *dummy[] = { Unk_020F252C, - Unk_020F2830, - Unk_020F2542, + Unk_020F2830, + Unk_020F2542, }; static const int Unk_020F2850[] = { - 0x0, - 0x1, - 0x2, - 0x3, - 0x4, - 0x5, - 0x6, - 0x3 + 0x0, + 0x1, + 0x2, + 0x3, + 0x4, + 0x5, + 0x6, + 0x3 }; const OverlayManagerTemplate Unk_020F2DAC = { @@ -882,12 +879,12 @@ const OverlayManagerTemplate Unk_020F2DAC = { 0xFFFFFFFF }; -static UnkStruct_02087A10 * Unk_021C0A30; +static UnkStruct_02087A10 *Unk_021C0A30; -static int sub_0208694C (OverlayManager * param0, int * param1) +static int sub_0208694C(OverlayManager *param0, int *param1) { - UnkStruct_02087A10 * v0; - NARC * v1; + UnkStruct_02087A10 *v0; + NARC *v1; switch (*param1) { case 0: @@ -955,18 +952,18 @@ static int sub_0208694C (OverlayManager * param0, int * param1) return 0; } -static void sub_02086B30 (NNSG2dCharacterData * param0, NNSG2dPaletteData * param1, int param2, int param3) +static void sub_02086B30(NNSG2dCharacterData *param0, NNSG2dPaletteData *param1, int param2, int param3) { - u8 * v0; + u8 *v0; GX_LoadOBJ(param0->pRawData, (21 * 32 + 31) * 0x20, 0x20 * 4 * 4); v0 = (u8 *)param1->pRawData; GX_LoadOBJPltt((void *)(v0 + PokeIconPaletteIndex(param2, param3, 0) * 0x20), 6 * 0x20, 0x20); } -static int sub_02086B64 (OverlayManager * param0, int * param1) +static int sub_02086B64(OverlayManager *param0, int *param1) { - UnkStruct_02087A10 * v0 = OverlayManager_Data(param0); + UnkStruct_02087A10 *v0 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -995,7 +992,7 @@ static int sub_02086B64 (OverlayManager * param0, int * param1) case 5: sub_02087544(v0, param0); BGL_FillWindow(&v0->unk_41C[9], 0xf0f); - sub_0200E060(&v0->unk_41C[9], 0, ((32 * 8)), 10); + sub_0200E060(&v0->unk_41C[9], 0, (32 * 8), 10); v0->unk_4BC = PrintStringSimple(&v0->unk_41C[9], 1, v0->unk_180, 0, 0, 1, NULL); sub_0201A954(&v0->unk_41C[9]); v0->unk_4C0 = 6; @@ -1034,7 +1031,7 @@ static int sub_02086B64 (OverlayManager * param0, int * param1) return 0; } -static int sub_02086D38 (UnkStruct_02087A10 * param0, int param1) +static int sub_02086D38(UnkStruct_02087A10 *param0, int param1) { sub_02088350(param0); @@ -1079,10 +1076,10 @@ static int sub_02086D38 (UnkStruct_02087A10 * param0, int param1) return param1; } -static void sub_02086E6C (UnkStruct_02087A10 * param0, UnkStruct_0208737C * param1) +static void sub_02086E6C(UnkStruct_02087A10 *param0, UnkStruct_0208737C *param1) { if (param0->unk_00 == 0) { - Strbuf* v0; + Strbuf *v0; if (param0->unk_04 == 0) { v0 = MessageLoader_GetNewStrbuf(param0->unk_170, 0 + LCRNG_Next() % 18); @@ -1094,7 +1091,7 @@ static void sub_02086E6C (UnkStruct_02087A10 * param0, UnkStruct_0208737C * para Strbuf_Free(v0); Strbuf_ToChars(param1->unk_18, param1->unk_1C, 10); } else if (param0->unk_00 == 3) { - Strbuf* v1; + Strbuf *v1; v1 = MessageLoader_GetNewStrbuf(param0->unk_170, 88 + (LCRNG_Next() % 2)); @@ -1106,7 +1103,7 @@ static void sub_02086E6C (UnkStruct_02087A10 * param0, UnkStruct_0208737C * para } } -static int sub_02086F14 (u16 * param0) +static int sub_02086F14(u16 *param0) { int v0 = 1; int v1; @@ -1124,17 +1121,17 @@ static int sub_02086F14 (u16 * param0) return v0; } -static int sub_02086F3C (OverlayManager * param0, int * param1) +static int sub_02086F3C(OverlayManager *param0, int *param1) { - UnkStruct_02087A10 * v0 = OverlayManager_Data(param0); - UnkStruct_0208737C * v1 = (UnkStruct_0208737C *)OverlayManager_Args(param0); + UnkStruct_02087A10 *v0 = OverlayManager_Data(param0); + UnkStruct_0208737C *v1 = (UnkStruct_0208737C *)OverlayManager_Args(param0); int v2; v0->unk_D8[v0->unk_158] = 0xffff; if (v0->unk_00 == 1) { u16 v3[10 + 1]; - Pokemon * v4; + Pokemon *v4; v4 = Pokemon_New(18); Pokemon_InitWith(v4, v0->unk_04, 5, 10, 10, 10, 10, 10); @@ -1205,9 +1202,9 @@ static int sub_02086F3C (OverlayManager * param0, int * param1) return 1; } -UnkStruct_0208737C * sub_0208712C (int param0, int param1, int param2, int param3, Options * param4) +UnkStruct_0208737C *sub_0208712C(int param0, int param1, int param2, int param3, Options *param4) { - UnkStruct_0208737C * v0; + UnkStruct_0208737C *v0; v0 = (UnkStruct_0208737C *)Heap_AllocFromHeap(param0, sizeof(UnkStruct_0208737C)); @@ -1226,7 +1223,7 @@ UnkStruct_0208737C * sub_0208712C (int param0, int param1, int param2, int param return v0; } -void sub_0208716C (UnkStruct_0208737C * param0) +void sub_0208716C(UnkStruct_0208737C *param0) { GF_ASSERT((param0->unk_18) != NULL); GF_ASSERT((param0) != NULL); @@ -1235,7 +1232,7 @@ void sub_0208716C (UnkStruct_0208737C * param0) Heap_FreeToHeap(param0); } -static void sub_02087190 (void * param0) +static void sub_02087190(void *param0) { sub_0201DCAC(); sub_0200A858(); @@ -1243,7 +1240,7 @@ static void sub_02087190 (void * param0) OS_SetIrqCheckFlag(OS_IE_V_BLANK); } -static void sub_020871B0 (UnkStruct_02087A10 * param0, UnkStruct_0208737C * param1) +static void sub_020871B0(UnkStruct_02087A10 *param0, UnkStruct_0208737C *param1) { param0->unk_00 = param1->unk_00; param0->unk_04 = param1->unk_04; @@ -1253,7 +1250,7 @@ static void sub_020871B0 (UnkStruct_02087A10 * param0, UnkStruct_0208737C * para param0->unk_18 = param1->unk_4C; } -static void sub_020871CC (void) +static void sub_020871CC(void) { UnkStruct_02099F80 v0 = { GX_VRAM_BG_128_A, @@ -1271,7 +1268,7 @@ static void sub_020871CC (void) GXLayers_SetBanks(&v0); } -static void sub_020871EC (BGL * param0) +static void sub_020871EC(BGL *param0) { { UnkStruct_ov84_0223BA5C v0 = { @@ -1379,7 +1376,7 @@ static void sub_020871EC (BGL * param0) G2S_BlendNone(); } -static void sub_0208732C (int param0) +static void sub_0208732C(int param0) { GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG0, param0); GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG1, param0); @@ -1391,9 +1388,9 @@ static void sub_0208732C (int param0) GXLayers_EngineBToggleLayers(GX_BLEND_PLANEMASK_OBJ, 0); } -static void sub_0208737C (UnkStruct_02087A10 * param0, OverlayManager * param1) +static void sub_0208737C(UnkStruct_02087A10 *param0, OverlayManager *param1) { - UnkStruct_0208737C * v0 = (UnkStruct_0208737C *)OverlayManager_Args(param1); + UnkStruct_0208737C *v0 = (UnkStruct_0208737C *)OverlayManager_Args(param1); param0->unk_4C0 = 4; @@ -1412,7 +1409,7 @@ static void sub_0208737C (UnkStruct_02087A10 * param0, OverlayManager * param1) MI_CpuFill16(param0->unk_D8, 0x1, 32 * 2); if (param0->unk_00 == 1) { - Pokemon * v1; + Pokemon *v1; v1 = Pokemon_New(18); Pokemon_InitWith(v1, param0->unk_04, 5, 10, 10, 10, 10, 10); @@ -1457,10 +1454,10 @@ static void sub_0208737C (UnkStruct_02087A10 * param0, OverlayManager * param1) } } -static void sub_02087544 (UnkStruct_02087A10 * param0, OverlayManager * param1) +static void sub_02087544(UnkStruct_02087A10 *param0, OverlayManager *param1) { - Strbuf* v0 = NULL; - UnkStruct_0208737C * v1 = (UnkStruct_0208737C *)OverlayManager_Args(param1); + Strbuf *v0 = NULL; + UnkStruct_0208737C *v1 = (UnkStruct_0208737C *)OverlayManager_Args(param1); if (v1->unk_44 != 0) { int v2, v3; @@ -1480,7 +1477,7 @@ static void sub_02087544 (UnkStruct_02087A10 * param0, OverlayManager * param1) } if ((param0->unk_158 == 0) || sub_02086F14(param0->unk_D8)) { - Pokemon * v4 = Pokemon_New(18); + Pokemon *v4 = Pokemon_New(18); Pokemon_InitWith(v4, param0->unk_04, 1, 0, 0, 0, 0, 0); StringTemplate_SetSpeciesName(param0->unk_168, 0, Pokemon_GetBoxPokemon(v4)); @@ -1498,7 +1495,7 @@ static void sub_02087544 (UnkStruct_02087A10 * param0, OverlayManager * param1) } } -static void sub_0208765C (BGL * param0, Window * param1) +static void sub_0208765C(BGL *param0, Window *param1) { int v0; @@ -1513,9 +1510,9 @@ static void sub_0208765C (BGL * param0, Window * param1) Heap_FreeToHeapExplicit(18, param0); } -static void sub_0208769C (UnkStruct_02087A10 * param0, NARC * param1) +static void sub_0208769C(UnkStruct_02087A10 *param0, NARC *param1) { - BGL * v0 = param0->unk_160; + BGL *v0 = param0->unk_160; sub_02007130(param1, 0, 0, 0, 16 * 3 * 2, 18); sub_02006E84(12, 12, 4, 0, 16 * 2, 18); @@ -1526,13 +1523,13 @@ static void sub_0208769C (UnkStruct_02087A10 * param0, NARC * param1) sub_0200710C(param1, 6, v0, 1, 0, (32 * 14 * 2), 1, 18); sub_0200710C(param1, 7, v0, 0, 0, (32 * 14 * 2), 1, 18); sub_02002E98(0, 12 * 32, 18); - sub_0200DD0C(param0->unk_160, 4, ((32 * 8)), 10, Options_Frame(param0->unk_18), 18); + sub_0200DD0C(param0->unk_160, 4, (32 * 8), 10, Options_Frame(param0->unk_18), 18); sub_02002E98(4, 12 * 32, 18); param0->unk_510 = sub_020071B4(param1, 16, 1, ¶m0->unk_514, 18); } -void sub_020877C4 (void) +void sub_020877C4(void) { { UnkStruct_ov22_022559F8 v0 = { @@ -1547,7 +1544,7 @@ void sub_020877C4 (void) sub_0201F8E4(); } -static void sub_020877F4 (UnkStruct_02087A10 * param0, NARC * param1) +static void sub_020877F4(UnkStruct_02087A10 *param0, NARC *param1) { int v0; @@ -1586,11 +1583,11 @@ static void sub_020877F4 (UnkStruct_02087A10 * param0, NARC * param1) sub_0200A5C8(param0->unk_328[1][1]); } -static void sub_020879DC (SysTask * param0, void * param1) +static void sub_020879DC(SysTask *param0, void *param1) { - const VecFx32 * v0; + const VecFx32 *v0; VecFx32 v1; - UnkStruct_020879DC * v2 = (UnkStruct_020879DC *)param1; + UnkStruct_020879DC *v2 = (UnkStruct_020879DC *)param1; v0 = sub_02021D28(v2->unk_00); v1.x = v0->x + v2->unk_08; @@ -1600,7 +1597,7 @@ static void sub_020879DC (SysTask * param0, void * param1) sub_02021C50(v2->unk_04, &v1); } -static void sub_02087A10 (UnkStruct_02087A10 * param0) +static void sub_02087A10(UnkStruct_02087A10 *param0) { int v0; @@ -1638,7 +1635,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0) sub_02021CAC(param0->unk_390[8], 0); for (v0 = 0; v0 < 7; v0++) { - UnkStruct_020879DC * v2; + UnkStruct_020879DC *v2; param0->unk_400[v0] = SysTask_StartAndAllocateParam(sub_020879DC, 16, 5, 18); v2 = SysTask_GetParam(param0->unk_400[v0]); @@ -1666,7 +1663,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void sub_02087BE4 (UnkStruct_02087A10 * param0, UnkStruct_ov115_02261520 * param1) +static void sub_02087BE4(UnkStruct_02087A10 *param0, UnkStruct_ov115_02261520 *param1) { param1->unk_08.x = FX32_ONE * 24; param1->unk_08.y = FX32_ONE * (16 - 8); @@ -1716,9 +1713,9 @@ static void sub_02087BE4 (UnkStruct_02087A10 * param0, UnkStruct_ov115_02261520 } } -static void sub_02087CDC (SysTask * param0, void * param1) +static void sub_02087CDC(SysTask *param0, void *param1) { - UnkStruct_02087CDC * v0 = (UnkStruct_02087CDC *)param1; + UnkStruct_02087CDC *v0 = (UnkStruct_02087CDC *)param1; VecFx32 v1; v1.y = v0->unk_0C; @@ -1747,23 +1744,21 @@ static void sub_02087CDC (SysTask * param0, void * param1) v0->unk_04++; } -static void sub_02087D64 (BGL * param0, Window * param1, int * param2, int param3, int * param4, VecFx32 param5[], GraphicElementData ** param6, void * param7) +static void sub_02087D64(BGL *param0, Window *param1, int *param2, int param3, int *param4, VecFx32 param5[], GraphicElementData **param6, void *param7) { int v0 = *param4; int v1 = v0 ^ 1; int v2; switch (*param2) { - case 0: - { + case 0: { u16 v3 = Unk_020F24DC[param3] | (Unk_020F24DC[param3] << 4); sub_02006E60(31, 6 + param3, param0, 0 + v0, 0, (32 * 14 * 2), 1, 18); sub_02088260(param5, v0); sub_02088E58(¶m1[v0], v3, param3, (u32)(((0xe & 0xff) << 16) | ((0xf & 0xff) << 8) | ((0 & 0xff) << 0)), param7); (*param2)++; - } - break; + } break; case 1: sub_02019184(param0, 0 + v0, 0, 238); sub_02019184(param0, 0 + v0, 3, -80); @@ -1773,8 +1768,8 @@ static void sub_02087D64 (BGL * param0, Window * param1, int * param2, int param param5[v0].x -= 24; if (param5[v0].x < -11 + 10) { - UnkStruct_02087CDC * v4; - SysTask * v5; + UnkStruct_02087CDC *v4; + SysTask *v5; v5 = SysTask_StartAndAllocateParam(sub_02087CDC, 16, 0, 18); v4 = SysTask_GetParam(v5); @@ -1818,14 +1813,14 @@ static void sub_02087D64 (BGL * param0, Window * param1, int * param2, int param } } -static void sub_02087F48 (Window * param0, int param1, Strbuf *param2) +static void sub_02087F48(Window *param0, int param1, Strbuf *param2) { - sub_0200E060(param0, 0, ((32 * 8)), 10); + sub_0200E060(param0, 0, (32 * 8), 10); PrintStringSimple(param0, 1, param2, 0, 0, 0, NULL); sub_0201A954(param0); } -static void sub_02087F78 (Window * param0, int param1, Strbuf *param2) +static void sub_02087F78(Window *param0, int param1, Strbuf *param2) { int v0 = 16; int v1 = sub_02002D7C(0, param2, 0); @@ -1839,7 +1834,7 @@ static void sub_02087F78 (Window * param0, int param1, Strbuf *param2) sub_0201A954(param0); } -static void sub_02087FC0 (UnkStruct_02087A10 * param0, OverlayManager * param1, NARC * param2) +static void sub_02087FC0(UnkStruct_02087A10 *param0, OverlayManager *param1, NARC *param2) { BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[0], 0, 2, 1, 26, 12, 1, (32 * 8)); BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[1], 1, 2, 1, 26, 12, 1, ((32 * 8) + (26 * 12))); @@ -1871,12 +1866,12 @@ static void sub_02087FC0 (UnkStruct_02087A10 * param0, OverlayManager * param1, sub_0201A954(¶m0->unk_41C[8]); } - BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[9], 4, 2, 19, 27, 4, 12, ((120 + (2 * 2 * 3)))); + BGL_AddWindow(param0->unk_160, ¶m0->unk_41C[9], 4, 2, 19, 27, 4, 12, (120 + (2 * 2 * 3))); BGL_FillWindow(¶m0->unk_41C[9], 0xf0f); sub_02087F48(¶m0->unk_41C[9], param0->unk_00, param0->unk_178); { - UnkStruct_0208737C * v1 = (UnkStruct_0208737C *)OverlayManager_Args(param1); + UnkStruct_0208737C *v1 = (UnkStruct_0208737C *)OverlayManager_Args(param1); if (param0->unk_118[0] != 0xffff) { GF_strcpy(param0->unk_D8, param0->unk_118); @@ -1897,13 +1892,13 @@ static void sub_02087FC0 (UnkStruct_02087A10 * param0, OverlayManager * param1, } } -static void sub_02088240 (BGL * param0, int param1, VecFx32 param2[]) +static void sub_02088240(BGL *param0, int param1, VecFx32 param2[]) { BGL_SetPriority(0 + param1, 1); BGL_SetPriority(0 + param1 ^ 1, 2); } -static void sub_02088260 (VecFx32 param0[], int param1) +static void sub_02088260(VecFx32 param0[], int param1) { param0[param1].x = 238; param0[param1].y = -80; @@ -1912,14 +1907,14 @@ static void sub_02088260 (VecFx32 param0[], int param1) } static const int Unk_020F2904[][2] = { - {0x0, 0x0}, - {0x0, 0xFFFFFFFFFFFFFFFF}, - {0x0, 0x1}, - {0xFFFFFFFFFFFFFFFF, 0x0}, - {0x1, 0x0} + { 0x0, 0x0 }, + { 0x0, 0xFFFFFFFFFFFFFFFF }, + { 0x0, 0x1 }, + { 0xFFFFFFFFFFFFFFFF, 0x0 }, + { 0x1, 0x0 } }; -static int sub_02088288 (int param0, int param1, int param2) +static int sub_02088288(int param0, int param1, int param2) { if (param0 >= param2) { param0 = param1; @@ -1932,7 +1927,7 @@ static int sub_02088288 (int param0, int param1, int param2) return param0; } -static void sub_02088298 (UnkStruct_02087A10 * param0, int param1) +static void sub_02088298(UnkStruct_02087A10 *param0, int param1) { int v0, v1; u16 v2; @@ -1961,7 +1956,7 @@ static void sub_02088298 (UnkStruct_02087A10 * param0, int param1) param0->unk_1C.unk_04 = v1; } -static void sub_02088350 (UnkStruct_02087A10 * param0) +static void sub_02088350(UnkStruct_02087A10 *param0) { int v0 = 0; int v1 = 0; @@ -2025,7 +2020,7 @@ static void sub_02088350 (UnkStruct_02087A10 * param0) } } -static void sub_02088454 (UnkStruct_02087A10 * param0, int param1) +static void sub_02088454(UnkStruct_02087A10 *param0, int param1) { if (param0->unk_1C.unk_04 != 0) { VecFx32 v0; @@ -2060,7 +2055,7 @@ static void sub_02088454 (UnkStruct_02087A10 * param0, int param1) } } -static void sub_02088514 (u16 * param0) +static void sub_02088514(u16 *param0) { fx32 v0; GXRgb v1; @@ -2079,11 +2074,11 @@ static void sub_02088514 (u16 * param0) GX_LoadOBJPltt((u16 *)&v1, (16 + 13) * 2, 2); } -static void sub_02088554 (Window * param0, const u16 * param1, int param2, int param3, int param4, int param5, u32 param6, u8 * param7) +static void sub_02088554(Window *param0, const u16 *param1, int param2, int param3, int param4, int param5, u32 param6, u8 *param7) { int v0 = 0, v1, v2; u16 v3[2]; - Strbuf* v4; + Strbuf *v4; v4 = Strbuf_Init(2, 18); @@ -2120,17 +2115,17 @@ static const u8 Unk_020F24D8[] = { 0x58 }; -static void * sub_02088654 (Window * param0, Strbuf *param1, u8 param2, const u32 param3) +static void *sub_02088654(Window *param0, Strbuf *param1, u8 param2, const u32 param3) { sub_0201D78C(param0, param2, param1, 0, 0, 0xff, param3, NULL); return param0->unk_0C; } -static void sub_02088678 (Window * param0, const u16 * param1, u8 * param2, Strbuf *param3) +static void sub_02088678(Window *param0, const u16 *param1, u8 *param2, Strbuf *param3) { u16 v0[20 + 1], v1, v2; - void * v3; - Strbuf* v4; + void *v3; + Strbuf *v4; BGL_FillWindow(¶m0[3], 0); v3 = sub_02088654(¶m0[3], param3, 2, (u32)(((0xd & 0xff) << 16) | ((0xe & 0xff) << 8) | ((0xf & 0xff) << 0))); @@ -2160,10 +2155,10 @@ static void sub_02088678 (Window * param0, const u16 * param1, u8 * param2, Strb Strbuf_Free(v4); } -static void sub_02088754 (Window * param0, u16 * param1, int param2, u16 * param3, u8 * param4, Strbuf *param5) +static void sub_02088754(Window *param0, u16 *param1, int param2, u16 *param3, u8 *param4, Strbuf *param5) { int v0, v1; - const u16 * v2 = NULL; + const u16 *v2 = NULL; u16 v3; if (param2 == 0) { @@ -2215,7 +2210,7 @@ static void sub_02088754 (Window * param0, u16 * param1, int param2, u16 * param sub_02088678(param0, param3, param4, param5); } -static void sub_02088844 (u16 param0[][13], const int param1) +static void sub_02088844(u16 param0[][13], const int param1) { int v0, v1; @@ -2230,7 +2225,7 @@ static void sub_02088844 (u16 param0[][13], const int param1) } } -static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2) +static int sub_02088898(UnkStruct_02087A10 *param0, u16 param1, int param2) { if ((param1 == (0xd001 + 2)) || (param1 == (0xd001 + 3))) { param1 = 0x1; @@ -2348,7 +2343,7 @@ static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2) return 2; } -static u16 sub_02088C7C (const u16 * param0, int param1) +static u16 sub_02088C7C(const u16 *param0, int param1) { do { param1 = sub_02088288(++param1, 0, 3); @@ -2357,7 +2352,7 @@ static u16 sub_02088C7C (const u16 * param0, int param1) return param0[param1]; } -static int sub_02088C9C (int param0, int param1, u16 * param2, int param3) +static int sub_02088C9C(int param0, int param1, u16 *param2, int param3) { int v0, v1; u16 v2, v3; @@ -2380,7 +2375,7 @@ static int sub_02088C9C (int param0, int param1, u16 * param2, int param3) return 0; } -static int sub_02088D08 (int param0, int param1, int param2, int param3, u16 * param4, int param5) +static int sub_02088D08(int param0, int param1, int param2, int param3, u16 *param4, int param5) { int v0; u16 v1; @@ -2438,7 +2433,7 @@ static int sub_02088D08 (int param0, int param1, int param2, int param3, u16 * p return 0; } -static void sub_02088E1C (GraphicElementData ** param0, int param1, int param2) +static void sub_02088E1C(GraphicElementData **param0, int param1, int param2) { int v0; @@ -2459,7 +2454,7 @@ static const u8 Unk_020F24E0[] = { 0x9 }; -static void sub_02088E58 (Window * param0, u16 param1, int param2, u32 param3, u8 * param4) +static void sub_02088E58(Window *param0, u16 param1, int param2, u32 param3, u8 *param4) { int v0, v1, v2; @@ -2483,7 +2478,7 @@ static void sub_02088E58 (Window * param0, u16 param1, int param2, u32 param3, u sub_0201A954(param0); } -static void sub_02088F40 (int param0[], GraphicElementData ** param1, int param2) +static void sub_02088F40(int param0[], GraphicElementData **param1, int param2) { int v0, v1; @@ -2509,7 +2504,7 @@ static void sub_02088F40 (int param0[], GraphicElementData ** param1, int param2 } } -static void sub_02088FD0 (UnkStruct_02087A10 * param0) +static void sub_02088FD0(UnkStruct_02087A10 *param0) { if (!sub_02021FD0(param0->unk_390[8])) { if (param0->unk_158 == param0->unk_0C) { @@ -2533,80 +2528,80 @@ static void sub_02088FD0 (UnkStruct_02087A10 * param0) } static const UnkStruct_020F2A14 Unk_020F2A14[] = { - {0x19, 0x3C, 0x0, 0x0, 0x0}, - {0x39, 0x3C, 0x0, 0x2, 0x0}, - {0x59, 0x3C, 0x0, 0x4, 0x0}, - {0x0, 0xC0, 0x0, 0x4, 0x0}, - {0x9D, 0x3C, 0x1, 0x8, 0x0}, - {0xC5, 0x3C, 0x1, 0xB, 0x0}, - {0x1C, 0x58, 0x2, 0x0, 0x1}, - {0x2C, 0x58, 0x2, 0x1, 0x1}, - {0x3C, 0x58, 0x2, 0x2, 0x1}, - {0x4C, 0x58, 0x2, 0x3, 0x1}, - {0x5C, 0x58, 0x2, 0x4, 0x1}, - {0x6C, 0x58, 0x2, 0x5, 0x1}, - {0x7C, 0x58, 0x2, 0x6, 0x1}, - {0x8C, 0x58, 0x2, 0x7, 0x1}, - {0x9C, 0x58, 0x2, 0x8, 0x1}, - {0xAC, 0x58, 0x2, 0x9, 0x1}, - {0xBC, 0x58, 0x2, 0xA, 0x1}, - {0xCC, 0x58, 0x2, 0xB, 0x1}, - {0xDC, 0x58, 0x2, 0xC, 0x1}, - {0x1C, 0x6B, 0x2, 0x0, 0x2}, - {0x2C, 0x6B, 0x2, 0x1, 0x2}, - {0x3C, 0x6B, 0x2, 0x2, 0x2}, - {0x4C, 0x6B, 0x2, 0x3, 0x2}, - {0x5C, 0x6B, 0x2, 0x4, 0x2}, - {0x6C, 0x6B, 0x2, 0x5, 0x2}, - {0x7C, 0x6B, 0x2, 0x6, 0x2}, - {0x8C, 0x6B, 0x2, 0x7, 0x2}, - {0x9C, 0x6B, 0x2, 0x8, 0x2}, - {0xAC, 0x6B, 0x2, 0x9, 0x2}, - {0xBC, 0x6B, 0x2, 0xA, 0x2}, - {0xCC, 0x6B, 0x2, 0xB, 0x2}, - {0xDC, 0x6B, 0x2, 0xC, 0x2}, - {0x1C, 0x7E, 0x2, 0x0, 0x3}, - {0x2C, 0x7E, 0x2, 0x1, 0x3}, - {0x3C, 0x7E, 0x2, 0x2, 0x3}, - {0x4C, 0x7E, 0x2, 0x3, 0x3}, - {0x5C, 0x7E, 0x2, 0x4, 0x3}, - {0x6C, 0x7E, 0x2, 0x5, 0x3}, - {0x7C, 0x7E, 0x2, 0x6, 0x3}, - {0x8C, 0x7E, 0x2, 0x7, 0x3}, - {0x9C, 0x7E, 0x2, 0x8, 0x3}, - {0xAC, 0x7E, 0x2, 0x9, 0x3}, - {0xBC, 0x7E, 0x2, 0xA, 0x3}, - {0xCC, 0x7E, 0x2, 0xB, 0x3}, - {0xDC, 0x7E, 0x2, 0xC, 0x3}, - {0x1C, 0x91, 0x2, 0x0, 0x4}, - {0x2C, 0x91, 0x2, 0x1, 0x4}, - {0x3C, 0x91, 0x2, 0x2, 0x4}, - {0x4C, 0x91, 0x2, 0x3, 0x4}, - {0x5C, 0x91, 0x2, 0x4, 0x4}, - {0x6C, 0x91, 0x2, 0x5, 0x4}, - {0x7C, 0x91, 0x2, 0x6, 0x4}, - {0x8C, 0x91, 0x2, 0x7, 0x4}, - {0x9C, 0x91, 0x2, 0x8, 0x4}, - {0xAC, 0x91, 0x2, 0x9, 0x4}, - {0xBC, 0x91, 0x2, 0xA, 0x4}, - {0xCC, 0x91, 0x2, 0xB, 0x4}, - {0xDC, 0x91, 0x2, 0xC, 0x4}, - {0x1C, 0xA4, 0x2, 0x0, 0x5}, - {0x2C, 0xA4, 0x2, 0x1, 0x5}, - {0x3C, 0xA4, 0x2, 0x2, 0x5}, - {0x4C, 0xA4, 0x2, 0x3, 0x5}, - {0x5C, 0xA4, 0x2, 0x4, 0x5}, - {0x6C, 0xA4, 0x2, 0x5, 0x5}, - {0x7C, 0xA4, 0x2, 0x6, 0x5}, - {0x8C, 0xA4, 0x2, 0x7, 0x5}, - {0x9C, 0xA4, 0x2, 0x8, 0x5}, - {0xAC, 0xA4, 0x2, 0x9, 0x5}, - {0xBC, 0xA4, 0x2, 0xA, 0x5}, - {0xCC, 0xA4, 0x2, 0xB, 0x5}, - {0xDC, 0xA4, 0x2, 0xC, 0x5} + { 0x19, 0x3C, 0x0, 0x0, 0x0 }, + { 0x39, 0x3C, 0x0, 0x2, 0x0 }, + { 0x59, 0x3C, 0x0, 0x4, 0x0 }, + { 0x0, 0xC0, 0x0, 0x4, 0x0 }, + { 0x9D, 0x3C, 0x1, 0x8, 0x0 }, + { 0xC5, 0x3C, 0x1, 0xB, 0x0 }, + { 0x1C, 0x58, 0x2, 0x0, 0x1 }, + { 0x2C, 0x58, 0x2, 0x1, 0x1 }, + { 0x3C, 0x58, 0x2, 0x2, 0x1 }, + { 0x4C, 0x58, 0x2, 0x3, 0x1 }, + { 0x5C, 0x58, 0x2, 0x4, 0x1 }, + { 0x6C, 0x58, 0x2, 0x5, 0x1 }, + { 0x7C, 0x58, 0x2, 0x6, 0x1 }, + { 0x8C, 0x58, 0x2, 0x7, 0x1 }, + { 0x9C, 0x58, 0x2, 0x8, 0x1 }, + { 0xAC, 0x58, 0x2, 0x9, 0x1 }, + { 0xBC, 0x58, 0x2, 0xA, 0x1 }, + { 0xCC, 0x58, 0x2, 0xB, 0x1 }, + { 0xDC, 0x58, 0x2, 0xC, 0x1 }, + { 0x1C, 0x6B, 0x2, 0x0, 0x2 }, + { 0x2C, 0x6B, 0x2, 0x1, 0x2 }, + { 0x3C, 0x6B, 0x2, 0x2, 0x2 }, + { 0x4C, 0x6B, 0x2, 0x3, 0x2 }, + { 0x5C, 0x6B, 0x2, 0x4, 0x2 }, + { 0x6C, 0x6B, 0x2, 0x5, 0x2 }, + { 0x7C, 0x6B, 0x2, 0x6, 0x2 }, + { 0x8C, 0x6B, 0x2, 0x7, 0x2 }, + { 0x9C, 0x6B, 0x2, 0x8, 0x2 }, + { 0xAC, 0x6B, 0x2, 0x9, 0x2 }, + { 0xBC, 0x6B, 0x2, 0xA, 0x2 }, + { 0xCC, 0x6B, 0x2, 0xB, 0x2 }, + { 0xDC, 0x6B, 0x2, 0xC, 0x2 }, + { 0x1C, 0x7E, 0x2, 0x0, 0x3 }, + { 0x2C, 0x7E, 0x2, 0x1, 0x3 }, + { 0x3C, 0x7E, 0x2, 0x2, 0x3 }, + { 0x4C, 0x7E, 0x2, 0x3, 0x3 }, + { 0x5C, 0x7E, 0x2, 0x4, 0x3 }, + { 0x6C, 0x7E, 0x2, 0x5, 0x3 }, + { 0x7C, 0x7E, 0x2, 0x6, 0x3 }, + { 0x8C, 0x7E, 0x2, 0x7, 0x3 }, + { 0x9C, 0x7E, 0x2, 0x8, 0x3 }, + { 0xAC, 0x7E, 0x2, 0x9, 0x3 }, + { 0xBC, 0x7E, 0x2, 0xA, 0x3 }, + { 0xCC, 0x7E, 0x2, 0xB, 0x3 }, + { 0xDC, 0x7E, 0x2, 0xC, 0x3 }, + { 0x1C, 0x91, 0x2, 0x0, 0x4 }, + { 0x2C, 0x91, 0x2, 0x1, 0x4 }, + { 0x3C, 0x91, 0x2, 0x2, 0x4 }, + { 0x4C, 0x91, 0x2, 0x3, 0x4 }, + { 0x5C, 0x91, 0x2, 0x4, 0x4 }, + { 0x6C, 0x91, 0x2, 0x5, 0x4 }, + { 0x7C, 0x91, 0x2, 0x6, 0x4 }, + { 0x8C, 0x91, 0x2, 0x7, 0x4 }, + { 0x9C, 0x91, 0x2, 0x8, 0x4 }, + { 0xAC, 0x91, 0x2, 0x9, 0x4 }, + { 0xBC, 0x91, 0x2, 0xA, 0x4 }, + { 0xCC, 0x91, 0x2, 0xB, 0x4 }, + { 0xDC, 0x91, 0x2, 0xC, 0x4 }, + { 0x1C, 0xA4, 0x2, 0x0, 0x5 }, + { 0x2C, 0xA4, 0x2, 0x1, 0x5 }, + { 0x3C, 0xA4, 0x2, 0x2, 0x5 }, + { 0x4C, 0xA4, 0x2, 0x3, 0x5 }, + { 0x5C, 0xA4, 0x2, 0x4, 0x5 }, + { 0x6C, 0xA4, 0x2, 0x5, 0x5 }, + { 0x7C, 0xA4, 0x2, 0x6, 0x5 }, + { 0x8C, 0xA4, 0x2, 0x7, 0x5 }, + { 0x9C, 0xA4, 0x2, 0x8, 0x5 }, + { 0xAC, 0xA4, 0x2, 0x9, 0x5 }, + { 0xBC, 0xA4, 0x2, 0xA, 0x5 }, + { 0xCC, 0xA4, 0x2, 0xB, 0x5 }, + { 0xDC, 0xA4, 0x2, 0xC, 0x5 } }; -static BOOL sub_0208903C (UnkStruct_02087A10 * param0) +static BOOL sub_0208903C(UnkStruct_02087A10 *param0) { int v0, v1 = 0; u8 v2, v3, v4, v5, v6, v7; diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index 2998b9c24b..6c3756bd79 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -1,41 +1,41 @@ +#include "unk_020890F4.h" + +#include #include #include -#include - -#include "core_sys.h" #include "struct_decls/struct_02018340_decl.h" - -#include "constdata/const_020F2DBC.h" - -#include "game_options.h" #include "struct_defs/struct_02089438.h" #include "struct_defs/struct_02089688.h" #include "struct_defs/struct_02099F80.h" + #include "overlay097/struct_ov97_0222DB78.h" -#include "unk_02002F38.h" -#include "overlay_manager.h" +#include "core_sys.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" +#include "overlay_manager.h" +#include "strbuf.h" +#include "unk_02002F38.h" #include "unk_0200C6E4.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" -#include "strbuf.h" #include "unk_02023FCC.h" #include "unk_020393C8.h" -#include "unk_020890F4.h" #include "unk_02089604.h" #include "unk_0208A3F4.h" -static void sub_0208945C(BGL * param0); -static void sub_020895CC(void * param0); -static int sub_020890F4(OverlayManager * param0, int * param1); -static int sub_0208924C(OverlayManager * param0, int * param1); -static int sub_0208927C(OverlayManager * param0, int * param1); +#include "constdata/const_020F2DBC.h" + +static void sub_0208945C(BGL *param0); +static void sub_020895CC(void *param0); +static int sub_020890F4(OverlayManager *param0, int *param1); +static int sub_0208924C(OverlayManager *param0, int *param1); +static int sub_0208927C(OverlayManager *param0, int *param1); const OverlayManagerTemplate Unk_020F2DBC = { sub_020890F4, @@ -44,15 +44,15 @@ const OverlayManagerTemplate Unk_020F2DBC = { 0xffffffff, }; -static int sub_020890F4 (OverlayManager * param0, int * param1) +static int sub_020890F4(OverlayManager *param0, int *param1) { - UnkStruct_02089688 * v0; + UnkStruct_02089688 *v0; Heap_Create(3, 101, 0x40000); v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_02089688), 101); memset(v0, 0, sizeof(UnkStruct_02089688)); - v0->unk_38C = *(( UnkStruct_02089438 * )OverlayManager_Args(param0)); + v0->unk_38C = *((UnkStruct_02089438 *)OverlayManager_Args(param0)); SetMainCallback(NULL, NULL); DisableHBlank(); @@ -94,10 +94,10 @@ static int sub_020890F4 (OverlayManager * param0, int * param1) return 1; } -static int sub_0208924C (OverlayManager * param0, int * param1) +static int sub_0208924C(OverlayManager *param0, int *param1) { BOOL v0; - UnkStruct_02089688 * v1; + UnkStruct_02089688 *v1; v1 = OverlayManager_Data(param0); v0 = sub_02089BEC(v1); @@ -109,9 +109,9 @@ static int sub_0208924C (OverlayManager * param0, int * param1) return v0 ? 1 : 0; } -static int sub_0208927C (OverlayManager * param0, int * param1) +static int sub_0208927C(OverlayManager *param0, int *param1) { - UnkStruct_02089688 * v0; + UnkStruct_02089688 *v0; v0 = OverlayManager_Data(param0); @@ -157,10 +157,10 @@ static int sub_0208927C (OverlayManager * param0, int * param1) return 1; } -UnkStruct_02089438 * sub_020893B4 (int param0, int param1, int param2[], Options * param3, u32 param4, u32 param5) +UnkStruct_02089438 *sub_020893B4(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5) { int v0; - UnkStruct_02089438 * v1 = NULL; + UnkStruct_02089438 *v1 = NULL; v1 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02089438)); @@ -179,25 +179,25 @@ UnkStruct_02089438 * sub_020893B4 (int param0, int param1, int param2[], Options return v1; } -UnkStruct_02089438 * sub_02089400 (int param0, int param1, int param2[], Options * param3, u32 param4, u32 param5) +UnkStruct_02089438 *sub_02089400(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5) { - UnkStruct_02089438 * v0 = sub_020893B4(param0, param1, param2, param3, param4, param5); + UnkStruct_02089438 *v0 = sub_020893B4(param0, param1, param2, param3, param4, param5); v0->unk_24 = 0; v0->unk_28 = 0; return v0; } -UnkStruct_02089438 * sub_0208941C (int param0, int param1, int param2[], Options * param3, u32 param4, u32 param5, u32 param6, u32 param7) +UnkStruct_02089438 *sub_0208941C(int param0, int param1, int param2[], Options *param3, u32 param4, u32 param5, u32 param6, u32 param7) { - UnkStruct_02089438 * v0 = sub_020893B4(param0, param1, param2, param3, param4, param5); + UnkStruct_02089438 *v0 = sub_020893B4(param0, param1, param2, param3, param4, param5); v0->unk_24 = param6; v0->unk_28 = param7; return v0; } -void sub_02089438 (UnkStruct_02089438 * param0) +void sub_02089438(UnkStruct_02089438 *param0) { GF_ASSERT(param0->unk_1C != NULL); GF_ASSERT(param0 != NULL); @@ -206,7 +206,7 @@ void sub_02089438 (UnkStruct_02089438 * param0) Heap_FreeToHeap(param0); } -static void sub_0208945C (BGL * param0) +static void sub_0208945C(BGL *param0) { GXLayers_DisableEngineALayers(); @@ -247,7 +247,7 @@ static void sub_0208945C (BGL * param0) 0x1, 0, 0, - 0 + 0, }, { 0, @@ -262,7 +262,7 @@ static void sub_0208945C (BGL * param0) 0x2, 0, 0, - 0 + 0, }, { 0, @@ -277,7 +277,7 @@ static void sub_0208945C (BGL * param0) 0x3, 0, 0, - 0 + 0, }, }; @@ -308,7 +308,7 @@ static void sub_0208945C (BGL * param0) 0x0, 0, 0, - 0 + 0, }, { 0, @@ -323,14 +323,10 @@ static void sub_0208945C (BGL * param0) 0x1, 0, 0, - 0 - }, - { - 0 - }, - { - 0 + 0, }, + { 0 }, + { 0 }, }; sub_020183C4(param0, 4, &v2[0], 0); @@ -354,9 +350,9 @@ static void sub_0208945C (BGL * param0) GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); } -static void sub_020895CC (void * param0) +static void sub_020895CC(void *param0) { - UnkStruct_02089688 * v0 = param0; + UnkStruct_02089688 *v0 = param0; sub_0201DCAC(); sub_0200C800(); diff --git a/src/unk_0208B284.c b/src/unk_0208B284.c index 91256f8f70..c1a3297e0a 100644 --- a/src/unk_0208B284.c +++ b/src/unk_0208B284.c @@ -1,3 +1,5 @@ +#include "unk_0208B284.h" + #include #include @@ -5,45 +7,49 @@ #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_0200C6E4_decl.h" #include "struct_decls/struct_0200C704_decl.h" -#include "sys_task_manager.h" - +#include "struct_defs/sprite_template.h" #include "struct_defs/struct_0208B284.h" #include "struct_defs/struct_0208B878.h" -#include "struct_defs/sprite_template.h" +#include "heap.h" #include "narc.h" -#include "unk_0200C6E4.h" #include "sys_task.h" -#include "heap.h" +#include "sys_task_manager.h" +#include "unk_0200C6E4.h" #include "unk_0201D15C.h" -#include "unk_0208B284.h" typedef struct { f32 unk_00; f32 unk_04; } UnkStruct_0208B2DC; -static BOOL sub_0208B2DC(s16 param0, s16 param1, f32 param2, f32 param3, f32 * param4, f32 * param5, f32 param6, s16 param7); -static void sub_0208B3D4(SysTask * param0, void * param1); -UnkStruct_0208B878 * sub_0208B284(UnkStruct_0208B284 param0, SpriteRenderer * param1, SpriteGfxHandler * param2, PaletteData * param3); -void sub_0208B6B0(UnkStruct_0208B878 * param0, int param1); -void sub_0208B7B4(UnkStruct_0208B878 * param0); -void sub_0208B830(UnkStruct_0208B878 * param0); -BOOL sub_0208B878(UnkStruct_0208B878 * param0, int param1); -BOOL sub_0208B8B0(UnkStruct_0208B878 * param0, BOOL param1); -BOOL sub_0208B8B8(UnkStruct_0208B878 * param0, s16 param1, s16 param2); -BOOL sub_0208B948(UnkStruct_0208B878 * param0, s16 param1, s16 param2); -BOOL sub_0208B988(UnkStruct_0208B878 * param0); -BOOL sub_0208B9E0(UnkStruct_0208B878 * param0, BOOL param1); -static BOOL sub_0208B930(UnkStruct_0208B878 * param0, s16 param1, s16 param2); +static BOOL sub_0208B2DC(s16 param0, s16 param1, f32 param2, f32 param3, f32 *param4, f32 *param5, f32 param6, s16 param7); +static void sub_0208B3D4(SysTask *param0, void *param1); +UnkStruct_0208B878 *sub_0208B284(UnkStruct_0208B284 param0, SpriteRenderer *param1, SpriteGfxHandler *param2, PaletteData *param3); +void sub_0208B6B0(UnkStruct_0208B878 *param0, int param1); +void sub_0208B7B4(UnkStruct_0208B878 *param0); +void sub_0208B830(UnkStruct_0208B878 *param0); +BOOL sub_0208B878(UnkStruct_0208B878 *param0, int param1); +BOOL sub_0208B8B0(UnkStruct_0208B878 *param0, BOOL param1); +BOOL sub_0208B8B8(UnkStruct_0208B878 *param0, s16 param1, s16 param2); +BOOL sub_0208B948(UnkStruct_0208B878 *param0, s16 param1, s16 param2); +BOOL sub_0208B988(UnkStruct_0208B878 *param0); +BOOL sub_0208B9E0(UnkStruct_0208B878 *param0, BOOL param1); +static BOOL sub_0208B930(UnkStruct_0208B878 *param0, s16 param1, s16 param2); static const int Unk_020F2FB0[] = { - 97, 98, 99, 100, 101, 128, 133, + 97, + 98, + 99, + 100, + 101, + 128, + 133, }; -UnkStruct_0208B878 * sub_0208B284 (UnkStruct_0208B284 param0, SpriteRenderer * param1, SpriteGfxHandler * param2, PaletteData * param3) +UnkStruct_0208B878 *sub_0208B284(UnkStruct_0208B284 param0, SpriteRenderer *param1, SpriteGfxHandler *param2, PaletteData *param3) { - UnkStruct_0208B878 * v0; + UnkStruct_0208B878 *v0; v0 = Heap_AllocFromHeap(param0.unk_04, sizeof(UnkStruct_0208B878)); v0->unk_10.unk_00 = param0.unk_00; @@ -63,7 +69,7 @@ UnkStruct_0208B878 * sub_0208B284 (UnkStruct_0208B284 param0, SpriteRenderer * p return v0; } -static BOOL sub_0208B2DC (s16 param0, s16 param1, f32 param2, f32 param3, f32 * param4, f32 * param5, f32 param6, s16 param7) +static BOOL sub_0208B2DC(s16 param0, s16 param1, f32 param2, f32 param3, f32 *param4, f32 *param5, f32 param6, s16 param7) { f32 v0; f32 v1; @@ -97,9 +103,9 @@ static BOOL sub_0208B2DC (s16 param0, s16 param1, f32 param2, f32 param3, f32 * return 1; } -static void sub_0208B3D4 (SysTask * param0, void * param1) +static void sub_0208B3D4(SysTask *param0, void *param1) { - UnkStruct_0208B878 * v0 = param1; + UnkStruct_0208B878 *v0 = param1; if (v0->unk_F0 == 0) { return; @@ -171,12 +177,12 @@ static void sub_0208B3D4 (SysTask * param0, void * param1) } } -void sub_0208B63C (UnkStruct_0208B878 * param0, int param1) +void sub_0208B63C(UnkStruct_0208B878 *param0, int param1) { - NARC * v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; - PaletteData * v3; + NARC *v0; + SpriteRenderer *v1; + SpriteGfxHandler *v2; + PaletteData *v3; v1 = param0->unk_00.unk_04; v2 = param0->unk_00.unk_08; @@ -189,12 +195,12 @@ void sub_0208B63C (UnkStruct_0208B878 * param0, int param1) SpriteRenderer_LoadPalette(v3, 3, v1, v2, v0, Unk_020F2FB0[param1], 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 22222 + 2); } -void sub_0208B6B0 (UnkStruct_0208B878 * param0, int param1) +void sub_0208B6B0(UnkStruct_0208B878 *param0, int param1) { - NARC * v0; - SpriteRenderer * v1; - SpriteGfxHandler * v2; - PaletteData * v3; + NARC *v0; + SpriteRenderer *v1; + SpriteGfxHandler *v2; + PaletteData *v3; int v4 = 22222 + param0->unk_10.unk_08; v1 = param0->unk_00.unk_04; @@ -224,13 +230,13 @@ void sub_0208B6B0 (UnkStruct_0208B878 * param0, int param1) SpriteRenderer_LoadAnimResObjFromOpenNarc(v1, v2, v0, 94, 0, v4); } -void sub_0208B7B4 (UnkStruct_0208B878 * param0) +void sub_0208B7B4(UnkStruct_0208B878 *param0) { int v0; SpriteTemplate v1; - SpriteRenderer * v2; - SpriteGfxHandler * v3; - PaletteData * v4; + SpriteRenderer *v2; + SpriteGfxHandler *v3; + PaletteData *v4; v2 = param0->unk_00.unk_04; v3 = param0->unk_00.unk_08; @@ -260,7 +266,7 @@ void sub_0208B7B4 (UnkStruct_0208B878 * param0) } } -void sub_0208B830 (UnkStruct_0208B878 * param0) +void sub_0208B830(UnkStruct_0208B878 *param0) { int v0; @@ -272,7 +278,7 @@ void sub_0208B830 (UnkStruct_0208B878 * param0) } } -BOOL sub_0208B878 (UnkStruct_0208B878 * param0, int param1) +BOOL sub_0208B878(UnkStruct_0208B878 *param0, int param1) { param0->unk_00.unk_00 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__BATT_REC__BATT_REC_GRA, param0->unk_10.unk_04); @@ -284,13 +290,13 @@ BOOL sub_0208B878 (UnkStruct_0208B878 * param0, int param1) return 1; } -BOOL sub_0208B8B0 (UnkStruct_0208B878 * param0, BOOL param1) +BOOL sub_0208B8B0(UnkStruct_0208B878 *param0, BOOL param1) { param0->unk_F0 = param1; return 1; } -BOOL sub_0208B8B8 (UnkStruct_0208B878 * param0, s16 param1, s16 param2) +BOOL sub_0208B8B8(UnkStruct_0208B878 *param0, s16 param1, s16 param2) { param0->unk_24[0].unk_04 = param1; param0->unk_24[0].unk_06 = param2; @@ -308,7 +314,7 @@ BOOL sub_0208B8B8 (UnkStruct_0208B878 * param0, s16 param1, s16 param2) return 1; } -BOOL sub_0208B8EC (UnkStruct_0208B878 * param0, s16 param1, s16 param2) +BOOL sub_0208B8EC(UnkStruct_0208B878 *param0, s16 param1, s16 param2) { if (sub_0208B930(param0, param1, param2) == 0) { return 0; @@ -330,7 +336,7 @@ BOOL sub_0208B8EC (UnkStruct_0208B878 * param0, s16 param1, s16 param2) return 1; } -static BOOL sub_0208B930 (UnkStruct_0208B878 * param0, s16 param1, s16 param2) +static BOOL sub_0208B930(UnkStruct_0208B878 *param0, s16 param1, s16 param2) { if ((param0->unk_24[0].unk_04 == param1) && (param0->unk_24[0].unk_06 == param2)) { return 0; @@ -339,7 +345,7 @@ static BOOL sub_0208B930 (UnkStruct_0208B878 * param0, s16 param1, s16 param2) return 1; } -BOOL sub_0208B948 (UnkStruct_0208B878 * param0, s16 param1, s16 param2) +BOOL sub_0208B948(UnkStruct_0208B878 *param0, s16 param1, s16 param2) { { int v0; @@ -357,7 +363,7 @@ BOOL sub_0208B948 (UnkStruct_0208B878 * param0, s16 param1, s16 param2) return 1; } -BOOL sub_0208B988 (UnkStruct_0208B878 * param0) +BOOL sub_0208B988(UnkStruct_0208B878 *param0) { switch (param0->unk_E4) { case 0: @@ -379,7 +385,7 @@ BOOL sub_0208B988 (UnkStruct_0208B878 * param0) return 1; } -BOOL sub_0208B9E0 (UnkStruct_0208B878 * param0, BOOL param1) +BOOL sub_0208B9E0(UnkStruct_0208B878 *param0, BOOL param1) { { int v0; @@ -392,7 +398,7 @@ BOOL sub_0208B9E0 (UnkStruct_0208B878 * param0, BOOL param1) return 1; } -void sub_0208BA08 (UnkStruct_0208B878 * param0, int param1, int param2) +void sub_0208BA08(UnkStruct_0208B878 *param0, int param1, int param2) { if ((param1 != 0) && (param2 != 0)) { param0->unk_FC = param1; @@ -403,7 +409,7 @@ void sub_0208BA08 (UnkStruct_0208B878 * param0, int param1, int param2) } } -void sub_0208BA30 (UnkStruct_0208B878 * param0) +void sub_0208BA30(UnkStruct_0208B878 *param0) { int v0; @@ -412,7 +418,7 @@ void sub_0208BA30 (UnkStruct_0208B878 * param0) } } -void sub_0208BA54 (UnkStruct_0208B878 * param0) +void sub_0208BA54(UnkStruct_0208B878 *param0) { int v0; diff --git a/src/unk_0208BA78.c b/src/unk_0208BA78.c index 8b8b781fcd..9c84615a6f 100644 --- a/src/unk_0208BA78.c +++ b/src/unk_0208BA78.c @@ -1,38 +1,36 @@ +#include "unk_0208BA78.h" + +#include #include #include -#include - -#include "inlines.h" - -#include "journal.h" -#include "vars_flags.h" -#include "savedata.h" -#include "constdata/const_020EA358.h" -#include "constdata/const_020F3060.h" -#include "constdata/const_020F3050.h" -#include "constdata/const_020F2FCC.h" - -#include "field/field_system.h" #include "struct_defs/struct_0208BA84.h" #include "struct_defs/struct_0208C06C.h" + +#include "field/field_system.h" #include "overlay006/battle_params.h" +#include "overlay062/ov62_02248408.h" -#include "unk_020041CC.h" +#include "bag.h" #include "game_overlay.h" -#include "overlay_manager.h" #include "heap.h" +#include "inlines.h" #include "journal.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "unk_020041CC.h" #include "unk_0202CD50.h" #include "unk_0202F1D4.h" -#include "vars_flags.h" #include "unk_02051D8C.h" #include "unk_020553DC.h" -#include "bag.h" -#include "unk_0208BA78.h" #include "unk_0208C010.h" #include "unk_02099550.h" -#include "overlay062/ov62_02248408.h" +#include "vars_flags.h" + +#include "constdata/const_020EA358.h" +#include "constdata/const_020F2FCC.h" +#include "constdata/const_020F3050.h" +#include "constdata/const_020F3060.h" FS_EXTERN_OVERLAY(overlay61); FS_EXTERN_OVERLAY(overlay62); @@ -40,53 +38,53 @@ FS_EXTERN_OVERLAY(overlay62); typedef struct { int unk_00; int unk_04; - OverlayManager * unk_08; - SaveData * saveData; - BattleParams * unk_10; - UnkStruct_0208C06C * unk_14; + OverlayManager *unk_08; + SaveData *saveData; + BattleParams *unk_10; + UnkStruct_0208C06C *unk_14; UnkStruct_0208BA84 unk_18; - FieldSystem * fieldSystem; + FieldSystem *fieldSystem; } UnkStruct_0208BC3C; -static void sub_0208BAAC(OverlayManager * param0, int param1); -static int sub_0208BB6C(OverlayManager * param0, int * param1); -static int sub_0208BB78(OverlayManager * param0, int * param1); -static int sub_0208BB84(OverlayManager * param0, int * param1); -static int sub_0208BB90(OverlayManager * param0, int * param1); -static int sub_0208BB9C(OverlayManager * param0, int * param1); -static int sub_0208BBA8(OverlayManager * param0, int * param1); -static int sub_0208BBB4(OverlayManager * param0, int * param1); -static int sub_0208BBC0(OverlayManager * param0, int * param1); -static int sub_0208BC08(OverlayManager * param0, int * param1); -static BOOL sub_0208BC3C(UnkStruct_0208BC3C * param0, int param1); -static BOOL sub_0208BC8C(UnkStruct_0208BC3C * param0, int param1); +static void sub_0208BAAC(OverlayManager *param0, int param1); +static int sub_0208BB6C(OverlayManager *param0, int *param1); +static int sub_0208BB78(OverlayManager *param0, int *param1); +static int sub_0208BB84(OverlayManager *param0, int *param1); +static int sub_0208BB90(OverlayManager *param0, int *param1); +static int sub_0208BB9C(OverlayManager *param0, int *param1); +static int sub_0208BBA8(OverlayManager *param0, int *param1); +static int sub_0208BBB4(OverlayManager *param0, int *param1); +static int sub_0208BBC0(OverlayManager *param0, int *param1); +static int sub_0208BC08(OverlayManager *param0, int *param1); +static BOOL sub_0208BC3C(UnkStruct_0208BC3C *param0, int param1); +static BOOL sub_0208BC8C(UnkStruct_0208BC3C *param0, int param1); static BOOL sub_0208BE80(int param0); -UnkStruct_0208C06C * sub_0208BA78 (OverlayManager * param0) +UnkStruct_0208C06C *sub_0208BA78(OverlayManager *param0) { - UnkStruct_0208C06C * v0; - UnkStruct_0208BC3C * v1 = OverlayManager_Args(param0); + UnkStruct_0208C06C *v0; + UnkStruct_0208BC3C *v1 = OverlayManager_Args(param0); return v1->unk_14; } -void sub_0208BA84 (UnkStruct_0208BA84 * param0, BOOL param1, int param2) +void sub_0208BA84(UnkStruct_0208BA84 *param0, BOOL param1, int param2) { param0->unk_00 = param1; param0->unk_04 = param2; } -static void sub_0208BA8C (SaveData * param0, int param1, u32 param2) +static void sub_0208BA8C(SaveData *param0, int param1, u32 param2) { - Journal * v0 = SaveData_GetJournal(param0); - void * v1 = sub_0202C244(param1, param2); + Journal *v0 = SaveData_GetJournal(param0); + void *v1 = sub_0202C244(param1, param2); sub_0202B758(v0, v1, 4); } -static void sub_0208BAAC (OverlayManager * param0, int param1) +static void sub_0208BAAC(OverlayManager *param0, int param1) { - UnkStruct_0208BC3C * v0; + UnkStruct_0208BC3C *v0; Heap_Create(3, 119, 0x10000); @@ -131,52 +129,52 @@ static void sub_0208BAAC (OverlayManager * param0, int param1) } } -static int sub_0208BB6C (OverlayManager * param0, int * param1) +static int sub_0208BB6C(OverlayManager *param0, int *param1) { sub_0208BAAC(param0, 0); return 1; } -static int sub_0208BB78 (OverlayManager * param0, int * param1) +static int sub_0208BB78(OverlayManager *param0, int *param1) { sub_0208BAAC(param0, 1); return 1; } -static int sub_0208BB84 (OverlayManager * param0, int * param1) +static int sub_0208BB84(OverlayManager *param0, int *param1) { sub_0208BAAC(param0, 2); return 1; } -static int sub_0208BB90 (OverlayManager * param0, int * param1) +static int sub_0208BB90(OverlayManager *param0, int *param1) { sub_0208BAAC(param0, 3); return 1; } -static int sub_0208BB9C (OverlayManager * param0, int * param1) +static int sub_0208BB9C(OverlayManager *param0, int *param1) { sub_0208BAAC(param0, 4); return 1; } -static int sub_0208BBA8 (OverlayManager * param0, int * param1) +static int sub_0208BBA8(OverlayManager *param0, int *param1) { sub_0208BAAC(param0, 5); return 1; } -static int sub_0208BBB4 (OverlayManager * param0, int * param1) +static int sub_0208BBB4(OverlayManager *param0, int *param1) { sub_0208BAAC(param0, 6); return 1; } -static int sub_0208BBC0 (OverlayManager * param0, int * param1) +static int sub_0208BBC0(OverlayManager *param0, int *param1) { BOOL v0; - UnkStruct_0208BC3C * v1 = OverlayManager_Data(param0); + UnkStruct_0208BC3C *v1 = OverlayManager_Data(param0); switch (*param1) { case 0: @@ -204,9 +202,9 @@ static int sub_0208BBC0 (OverlayManager * param0, int * param1) return 0; } -static int sub_0208BC08 (OverlayManager * param0, int * param1) +static int sub_0208BC08(OverlayManager *param0, int *param1) { - UnkStruct_0208BC3C * v0 = OverlayManager_Data(param0); + UnkStruct_0208BC3C *v0 = OverlayManager_Data(param0); if (sub_0202F250() == 1) { sub_0202F22C(); @@ -220,7 +218,7 @@ static int sub_0208BC08 (OverlayManager * param0, int * param1) return 1; } -static BOOL sub_0208BC3C (UnkStruct_0208BC3C * param0, int param1) +static BOOL sub_0208BC3C(UnkStruct_0208BC3C *param0, int param1) { switch (param0->unk_00) { case 0: @@ -244,7 +242,7 @@ static BOOL sub_0208BC3C (UnkStruct_0208BC3C * param0, int param1) return 0; } -static BOOL sub_0208BC8C (UnkStruct_0208BC3C * param0, int param1) +static BOOL sub_0208BC8C(UnkStruct_0208BC3C *param0, int param1) { switch (param0->unk_00) { case 0: @@ -255,8 +253,7 @@ static BOOL sub_0208BC8C (UnkStruct_0208BC3C * param0, int param1) param0->unk_00++; break; - case 1: - { + case 1: { int v0; param0->unk_10 = sub_02051D8C(param1, 0x0); @@ -286,10 +283,8 @@ static BOOL sub_0208BC8C (UnkStruct_0208BC3C * param0, int param1) } else { param0->unk_00++; } - } - break; - case 2: - { + } break; + case 2: { sub_0200544C(1, 127); sub_02005464(1); @@ -393,7 +388,7 @@ const OverlayManagerTemplate Unk_020F2FDC = { 0xffffffff, }; -static const OverlayManagerTemplate * Unk_02100CF0[] = { +static const OverlayManagerTemplate *Unk_02100CF0[] = { &Unk_020F2FCC, &Unk_020F302C, &Unk_020F301C, @@ -403,27 +398,31 @@ static const OverlayManagerTemplate * Unk_02100CF0[] = { &Unk_020F2FDC, }; -const OverlayManagerTemplate * sub_0208BE5C (int param0) +const OverlayManagerTemplate *sub_0208BE5C(int param0) { - const OverlayManagerTemplate * v0; + const OverlayManagerTemplate *v0; v0 = Unk_02100CF0[param0]; return v0; } -BOOL sub_0208BE68 (UnkStruct_0208C06C * param0) +BOOL sub_0208BE68(UnkStruct_0208C06C *param0) { - VarsFlags * v0; + VarsFlags *v0; v0 = SaveData_GetVarsFlags(param0->unk_830); return inline_0208BE68(v0, 53); } -static BOOL sub_0208BE80 (int param0) +static BOOL sub_0208BE80(int param0) { int v0; const int v1[] = { - 97, 99, 100, 101, 102, + 97, + 99, + 100, + 101, + 102, }; for (v0 = 0; v0 < NELEMS(v1); v0++) { diff --git a/src/unk_0208BEBC.c b/src/unk_0208BEBC.c index cb239b4ad1..26f9079bac 100644 --- a/src/unk_0208BEBC.c +++ b/src/unk_0208BEBC.c @@ -1,33 +1,31 @@ #include #include -#include "core_sys.h" - - -#include "constdata/const_020F3050.h" -#include "constdata/const_020F3060.h" - #include "struct_defs/struct_0208C06C.h" -#include "unk_020041CC.h" +#include "overlay062/ov62_0222F2C0.h" +#include "overlay062/ov62_022300D8.h" +#include "overlay062/ov62_02231690.h" + +#include "core_sys.h" #include "game_overlay.h" -#include "heap.h" #include "gx_layers.h" +#include "heap.h" #include "savedata_misc.h" +#include "unk_020041CC.h" #include "unk_0208B284.h" #include "unk_0208BA78.h" -#include "overlay062/ov62_0222F2C0.h" -#include "overlay062/ov62_022300D8.h" -#include "overlay062/ov62_02231690.h" -FS_EXTERN_OVERLAY(overlay62); +#include "constdata/const_020F3050.h" +#include "constdata/const_020F3060.h" -static int sub_0208BF38(OverlayManager * param0, int * param1); -static int sub_0208BF44(OverlayManager * param0, int * param1); -static int sub_0208BEBC(OverlayManager * param0, int * param1, int param2); -static int sub_0208BF50(OverlayManager * param0, int * param1); -static int sub_0208BF6C(OverlayManager * param0, int * param1); +FS_EXTERN_OVERLAY(overlay62); +static int sub_0208BF38(OverlayManager *param0, int *param1); +static int sub_0208BF44(OverlayManager *param0, int *param1); +static int sub_0208BEBC(OverlayManager *param0, int *param1, int param2); +static int sub_0208BF50(OverlayManager *param0, int *param1); +static int sub_0208BF6C(OverlayManager *param0, int *param1); const OverlayManagerTemplate Unk_020F3050 = { sub_0208BF38, @@ -43,9 +41,9 @@ const OverlayManagerTemplate Unk_020F3060 = { FS_OVERLAY_ID(overlay62) }; -static int sub_0208BEBC (OverlayManager * param0, int * param1, int param2) +static int sub_0208BEBC(OverlayManager *param0, int *param1, int param2) { - UnkStruct_0208C06C * v0; + UnkStruct_0208C06C *v0; Heap_Create(3, 102, 0x55000); v0 = sub_0208BA78(param0); @@ -58,7 +56,7 @@ static int sub_0208BEBC (OverlayManager * param0, int * param1, int param2) if (param2 == 0) { { - MiscSaveBlock * v1 = SaveData_MiscSaveBlock(v0->unk_830); + MiscSaveBlock *v1 = SaveData_MiscSaveBlock(v0->unk_830); MiscSaveBlock_VsRecorderColor(v1, &v0->unk_14.unk_48); @@ -77,20 +75,20 @@ static int sub_0208BEBC (OverlayManager * param0, int * param1, int param2) return 1; } -static int sub_0208BF38 (OverlayManager * param0, int * param1) +static int sub_0208BF38(OverlayManager *param0, int *param1) { return sub_0208BEBC(param0, param1, 0); } -static int sub_0208BF44 (OverlayManager * param0, int * param1) +static int sub_0208BF44(OverlayManager *param0, int *param1) { return sub_0208BEBC(param0, param1, 1); } -static int sub_0208BF50 (OverlayManager * param0, int * param1) +static int sub_0208BF50(OverlayManager *param0, int *param1) { BOOL v0 = 0; - UnkStruct_0208C06C * v1 = sub_0208BA78(param0); + UnkStruct_0208C06C *v1 = sub_0208BA78(param0); v1->unk_10 = param1; v0 = ov62_0222F910(v1, param1); @@ -98,9 +96,9 @@ static int sub_0208BF50 (OverlayManager * param0, int * param1) return (v0) ? 1 : 0; } -static int sub_0208BF6C (OverlayManager * param0, int * param1) +static int sub_0208BF6C(OverlayManager *param0, int *param1) { - UnkStruct_0208C06C * v0 = sub_0208BA78(param0); + UnkStruct_0208C06C *v0 = sub_0208BA78(param0); switch (*param1) { case 0: @@ -113,20 +111,16 @@ static int sub_0208BF6C (OverlayManager * param0, int * param1) ov62_0223113C(v0); (*param1)++; break; - case 2: - { + case 2: { if (sub_0208B988(v0->unk_6F0) == 0) { (*param1)++; } - } - break; - case 3: - { + } break; + case 3: { if (sub_0208B988(v0->unk_6F4) == 0) { (*param1)++; } - } - break; + } break; default: ov62_0222F514(v0); Heap_Destroy(102); diff --git a/src/unk_0208C010.c b/src/unk_0208C010.c index 8a7589267c..460265f3e4 100644 --- a/src/unk_0208C010.c +++ b/src/unk_0208C010.c @@ -1,3 +1,5 @@ +#include "unk_0208C010.h" + #include #include @@ -5,7 +7,6 @@ #include "struct_defs/struct_020F3DCC.h" #include "unk_0208BA78.h" -#include "unk_0208C010.h" static const UnkStruct_020F3DCC Unk_020F3DCC[5]; static const UnkStruct_020F3DCC Unk_020F3D18[5]; @@ -29,183 +30,183 @@ static const UnkStruct_020F3DCC Unk_020F328C[5]; static const UnkStruct_020F3DCC Unk_020F3070[5]; static const UnkStruct_020F3DCC Unk_020F3F34[7] = { - {0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3DCC}, - {0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3994}, - {0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3340}, - {0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F34A8}, - {0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3610}, - {0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3778}, - {0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3E80} + { 0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3DCC }, + { 0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3994 }, + { 0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3340 }, + { 0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F34A8 }, + { 0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3610 }, + { 0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3778 }, + { 0x1, 0x1, 0xFF, 0xFFFF, 0x0, 0x9, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3E80 } }; static const UnkStruct_020F3DCC Unk_020F3DCC[5] = { - {0x1, 0x1, 0x0, 0x0, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3C64}, - {0x1, 0x1, 0x1, 0x3, 0x5, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x2, 0x4, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x0, 0x0, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3C64 }, + { 0x1, 0x1, 0x1, 0x3, 0x5, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x2, 0x4, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3D18[5] = { - {0x1, 0x1, 0x0, 0x0, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3C64}, - {0x1, 0x1, 0x2, 0x4, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x0, 0x0, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3C64 }, + { 0x1, 0x1, 0x2, 0x4, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3C64[5] = { - {0x1, 0x1, 0x4, 0x6, 0x4, 0x3, 0x0, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x5, 0x7, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3BB0}, - {0x1, 0x1, 0x6, 0x1, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3AFC}, - {0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x4, 0x6, 0x4, 0x3, 0x0, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x5, 0x7, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3BB0 }, + { 0x1, 0x1, 0x6, 0x1, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3AFC }, + { 0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3BB0[5] = { - {0x1, 0x1, 0x8, 0x7, 0x4, 0x3, 0x1, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x8, 0x7, 0x4, 0x3, 0x2, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x8, 0x7, 0x4, 0x3, 0x3, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x8, 0x7, 0x4, 0x3, 0x1, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x8, 0x7, 0x4, 0x3, 0x2, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x8, 0x7, 0x4, 0x3, 0x3, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3AFC[5] = { - {0x1, 0x1, 0x27, 0x6, 0x7, 0x3, 0x0, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x28, 0x7, 0x0, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3A48}, - {0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x27, 0x6, 0x7, 0x3, 0x0, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x28, 0x7, 0x0, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F3A48 }, + { 0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3A48[5] = { - {0x1, 0x1, 0x29, 0x7, 0x7, 0x3, 0x1, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x29, 0x7, 0x7, 0x3, 0x2, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x29, 0x7, 0x7, 0x3, 0x3, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x29, 0x7, 0x7, 0x3, 0x1, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x29, 0x7, 0x7, 0x3, 0x2, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x29, 0x7, 0x7, 0x3, 0x3, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3994[5] = { - {0x1, 0x1, 0x2B, 0x2, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F38E0}, - {0x1, 0x1, 0x2C, 0x9, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x2, 0xE, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x2B, 0x2, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F38E0 }, + { 0x1, 0x1, 0x2C, 0x9, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x2, 0xE, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F38E0[5] = { - {0x1, 0x1, 0x2D, 0xA, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x2E, 0x0, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F382C}, - {0x1, 0x1, 0x2F, 0xB, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x2D, 0xA, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x2E, 0x0, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F382C }, + { 0x1, 0x1, 0x2F, 0xB, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F382C[5] = { - {0x1, 0x1, 0x30, 0x1, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x31, 0x0, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x32, 0x0, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x30, 0x1, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x31, 0x0, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x32, 0x0, 0x14, 0x6, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x3, 0x5, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3778[5] = { - {0x1, 0x1, 0x34, 0x0, 0x9, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x33, 0x0, 0x8, 0x3, 0x0, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x2, 0x2, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F3070}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x34, 0x0, 0x9, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x33, 0x0, 0x8, 0x3, 0x0, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x2, 0x2, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F3070 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3E80[5] = { - {0x1, 0x1, 0x3B, 0x1, 0xB, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x3A, 0x1, 0xA, 0x3, 0x64, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x2, 0x2, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F3070}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x3B, 0x1, 0xB, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x3A, 0x1, 0xA, 0x3, 0x64, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x2, 0x2, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F3070 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3610[5] = { - {0x1, 0x1, 0x4E, 0x0, 0xC, 0x3, 0x0, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x4F, 0x1, 0xD, 0x3, 0x1, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x2, 0x2, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F328C}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x4E, 0x0, 0xC, 0x3, 0x0, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x4F, 0x1, 0xD, 0x3, 0x1, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x2, 0x2, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F328C }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F355C[5] = { - {0x1, 0x1, 0x5C, 0x0, 0xE, 0x3, 0x12C, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x2, 0x2, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F3124}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x5C, 0x0, 0xE, 0x3, 0x12C, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x2, 0x2, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F3124 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F34A8[5] = { - {0x1, 0x1, 0x5C, 0x0, 0xE, 0x3, 0x12C, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x5D, 0x1, 0xF, 0x3, 0x12D, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x2, 0x2, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F3124}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x5C, 0x0, 0xE, 0x3, 0x12C, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x5D, 0x1, 0xF, 0x3, 0x12D, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x2, 0x2, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F3124 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F33F4[5] = { - {0x1, 0x1, 0x82, 0x4, 0x13, 0x3, 0x64, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x3, 0x3, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x82, 0x4, 0x13, 0x3, 0x64, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x3, 0x3, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3340[5] = { - {0x1, 0x1, 0x67, 0x2, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F36C4}, - {0x1, 0x1, 0x68, 0x6, 0x1, 0x3, 0x270F, 0xFBFBFBFB, Unk_020F33F4}, - {0x1, 0x1, 0x2, 0x9, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F31D8}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x67, 0x2, 0x1, 0x3, 0xFBFBFBFB, 0xFBFBFBFB, Unk_020F36C4 }, + { 0x1, 0x1, 0x68, 0x6, 0x1, 0x3, 0x270F, 0xFBFBFBFB, Unk_020F33F4 }, + { 0x1, 0x1, 0x2, 0x9, 0x2, 0x3, 0x3E7, 0xFBFBFBFB, Unk_020F31D8 }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F36C4[5] = { - {0x1, 0x1, 0x69, 0x7, 0x10, 0x3, 0xC8, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x6A, 0x0, 0x11, 0x3, 0xD2, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x6B, 0x8, 0x12, 0x3, 0xDC, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x3, 0x3, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x69, 0x7, 0x10, 0x3, 0xC8, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x6A, 0x0, 0x11, 0x3, 0xD2, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x6B, 0x8, 0x12, 0x3, 0xDC, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x3, 0x3, 0x3, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F31D8[5] = { - {0x1, 0x1, 0x82, 0x4, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x83, 0x3, 0x2, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x82, 0x4, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x83, 0x3, 0x2, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3124[5] = { - {0x1, 0x1, 0x82, 0x5, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x83, 0x4, 0x2, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x82, 0x5, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x83, 0x4, 0x2, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F328C[5] = { - {0x1, 0x1, 0x82, 0x5, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x83, 0x4, 0x2, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x82, 0x5, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x83, 0x4, 0x2, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; static const UnkStruct_020F3DCC Unk_020F3070[5] = { - {0x1, 0x1, 0x82, 0x4, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x1, 0x1, 0x83, 0x3, 0x2, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL}, - {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL} + { 0x1, 0x1, 0x82, 0x4, 0x2, 0x2, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x1, 0x1, 0x83, 0x3, 0x2, 0x4, 0xFBFBFBFB, 0xFBFBFBFB, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL }, + { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NULL } }; -const UnkStruct_020F3DCC * sub_0208C010 (int param0) +const UnkStruct_020F3DCC *sub_0208C010(int param0) { if (param0 >= (6 + 1)) { GF_ASSERT(param0 < (6 + 1)); @@ -216,7 +217,7 @@ const UnkStruct_020F3DCC * sub_0208C010 (int param0) return Unk_020F3F34[param0].unk_20; } -const UnkStruct_020F3DCC * sub_0208C034 (UnkStruct_0208C06C * param0, int param1) +const UnkStruct_020F3DCC *sub_0208C034(UnkStruct_0208C06C *param0, int param1) { if (param1 == 0) { if (sub_0208BE68(param0) == 0) { @@ -233,10 +234,10 @@ const UnkStruct_020F3DCC * sub_0208C034 (UnkStruct_0208C06C * param0, int param1 return sub_0208C010(param1); } -void sub_0208C06C (UnkStruct_0208C06C * param0) +void sub_0208C06C(UnkStruct_0208C06C *param0) { int v0; - const UnkStruct_020F3DCC * v1; + const UnkStruct_020F3DCC *v1; v1 = param0->unk_818; param0->unk_534.unk_1AC = 0; diff --git a/src/unk_0208C098.c b/src/unk_0208C098.c index df279872a3..eb41570f43 100644 --- a/src/unk_0208C098.c +++ b/src/unk_0208C098.c @@ -1,16 +1,16 @@ +#include "unk_0208C098.h" + #include #include -#include "core_sys.h" - #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02018340_decl.h" +#include "core_sys.h" +#include "heap.h" #include "narc.h" #include "unk_0200F174.h" -#include "heap.h" #include "unk_02018340.h" -#include "unk_0208C098.h" __attribute__((aligned(4))) static const u16 Unk_020F4030[] = { 0x20, @@ -27,13 +27,13 @@ __attribute__((aligned(4))) static const u16 Unk_020F4030[] = { 0x400 }; -int sub_0208C098 (int param0) +int sub_0208C098(int param0) { param0 -= 0; return Unk_020F4030[param0]; } -u32 sub_0208C0A4 (u32 param0, u32 param1) +u32 sub_0208C0A4(u32 param0, u32 param1) { u32 v0; @@ -61,11 +61,11 @@ u8 App_BarColor(u32 cur, u32 max) if (cur > max / 2) { return BARCOLOR_GREEN; } - + if (cur > max / 5) { return BARCOLOR_YELLOW; - } - + } + if (cur > 0) { return BARCOLOR_RED; } @@ -82,7 +82,7 @@ u8 HealthBar_Color(u16 curHP, u16 maxHP, u32 barSize) return App_BarColor(App_PixelCount(curHP, maxHP, barSize), barSize); } -void sub_0208C120 (u8 param0, u32 param1) +void sub_0208C120(u8 param0, u32 param1) { if (param0 == 0) { sub_0200F174(0, 1, 1, 0x0, 6, 1, param1); @@ -91,7 +91,7 @@ void sub_0208C120 (u8 param0, u32 param1) } } -u8 sub_0208C15C (s16 * param0, u16 param1) +u8 sub_0208C15C(s16 *param0, u16 param1) { s16 v0; @@ -156,13 +156,13 @@ u8 sub_0208C15C (s16 * param0, u16 param1) return 0; } -void sub_0208C210 (BGL * param0, int param1, NARC * param2, int param3, int param4, int param5, int param6, u16 param7, u16 param8) +void sub_0208C210(BGL *param0, int param1, NARC *param2, int param3, int param4, int param5, int param6, u16 param7, u16 param8) { u32 v0; - void * v1; - NNSG2dCharacterData * v2; - NNSG2dScreenData * v3; - NNSG2dPaletteData * v4; + void *v1; + NNSG2dCharacterData *v2; + NNSG2dScreenData *v3; + NNSG2dPaletteData *v4; v0 = NARC_GetMemberSize(param2, param4); v1 = Heap_AllocFromHeapAtEnd(param1, v0); @@ -205,10 +205,10 @@ void sub_0208C210 (BGL * param0, int param1, NARC * param2, int param3, int para Heap_FreeToHeap(v1); } -void * sub_0208C2F4 (NARC * param0, int param1, int param2, NNSG2dScreenData ** param3, int param4) +void *sub_0208C2F4(NARC *param0, int param1, int param2, NNSG2dScreenData **param3, int param4) { int v0; - void * v1; + void *v1; v0 = NARC_GetMemberSize(param0, param2); v1 = Heap_AllocFromHeap(param4, v0); diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index 282c19bb9c..21346cae61 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -1,111 +1,112 @@ +#include "unk_0208EA44.h" + #include #include #include "struct_decls/struct_02022550_decl.h" - -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/pokemon_summary_app.h" +#include "struct_defs/struct_0205AA50.h" + #include "overlay007/struct_ov7_0224F2EC.h" #include "overlay007/struct_ov7_0224F358.h" #include "overlay104/struct_ov104_022412F4.h" #include "overlay104/struct_ov104_0224133C.h" +#include "gx_layers.h" +#include "move_table.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "pokemon_summary_app.h" #include "unk_0200C6E4.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_020218BC.h" -#include "pokemon.h" -#include "move_table.h" -#include "pokemon_icon.h" #include "unk_0207C908.h" -#include "pokemon_summary_app.h" -#include "unk_0208EA44.h" #include "unk_020920C0.h" #include "unk_020923C0.h" -static void sub_0208F194(PokemonSummaryApp * param0, u8 param1, u8 param2, u8 param3); -static void sub_0208EF0C(PokemonSummaryApp * param0); -static void sub_0208FC30(GraphicElementData * param0, u32 param1, u32 param2, const s16 * param3); +static void sub_0208F194(PokemonSummaryApp *param0, u8 param1, u8 param2, u8 param3); +static void sub_0208EF0C(PokemonSummaryApp *param0); +static void sub_0208FC30(GraphicElementData *param0, u32 param1, u32 param2, const s16 *param3); static const UnkStruct_ov7_0224F358 Unk_020F41A8[] = { - {0x1, 0x80, 0x18, 0x0, 0x0, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1, 0x90, 0x18, 0x0, 0x1, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1, 0xA0, 0x18, 0x0, 0x2, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1, 0xB0, 0x18, 0x0, 0x3, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1, 0xC0, 0x18, 0x0, 0x4, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1, 0xD0, 0x18, 0x0, 0x5, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1, 0xE0, 0x18, 0x0, 0x6, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1, 0xF0, 0x18, 0x0, 0x7, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x0, 0x10, 0x20, 0x0, 0x0, 0x0, 0xC, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x2, 0xC2, 0x30, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x2, 0xC2, 0x30, 0x0, 0x1, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xA, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xB, 0x18, 0x30, 0x0, 0x0, 0x0, 0x4, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xC, 0x50, 0x34, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xE, 0x0, 0x18, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xE, 0x0, 0x18, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x12, 0x30, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x13, 0x38, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x14, 0x40, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x15, 0x48, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x16, 0x50, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x17, 0x58, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0x98, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xA0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xA8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xB0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xB8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xC0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xC8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xD0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xD8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xE0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xE8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xD, 0xF0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0xF, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x10, 0xD0, 0x30, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x10, 0xE0, 0x58, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x10, 0xD8, 0x78, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x10, 0x90, 0x78, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x10, 0x88, 0x58, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x11, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x19, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x19, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x19, 0x0, 0x0, 0x0, 0x3, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x19, 0x0, 0x0, 0x0, 0x2, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x19, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x18, 0x62, 0x48, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x18, 0x62, 0x84, 0x0, 0x1, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1A, 0x84, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1B, 0xA4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1C, 0xC4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1D, 0xE4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1E, 0x84, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x1F, 0xA4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x20, 0xC4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x21, 0xE4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x22, 0x84, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x23, 0xA4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x24, 0xC4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x25, 0xE4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x26, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x27, 0xB4, 0x20, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x27, 0xB4, 0x78, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x28, 0x8, 0x84, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0}, - {0x2A, 0x4C, 0x30, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0} + { 0x1, 0x80, 0x18, 0x0, 0x0, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0x90, 0x18, 0x0, 0x1, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0xA0, 0x18, 0x0, 0x2, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0xB0, 0x18, 0x0, 0x3, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0xC0, 0x18, 0x0, 0x4, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0xD0, 0x18, 0x0, 0x5, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0xE0, 0x18, 0x0, 0x6, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1, 0xF0, 0x18, 0x0, 0x7, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x0, 0x10, 0x20, 0x0, 0x0, 0x0, 0xC, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0xC2, 0x30, 0x0, 0x0, 0x1, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x2, 0xC2, 0x30, 0x0, 0x1, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x5, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x7, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x9, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xA, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xB, 0x18, 0x30, 0x0, 0x0, 0x0, 0x4, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xC, 0x50, 0x34, 0x0, 0x0, 0x0, 0x6, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xE, 0x0, 0x18, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xE, 0x0, 0x18, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x12, 0x30, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x13, 0x38, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x14, 0x40, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x15, 0x48, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x16, 0x50, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x17, 0x58, 0x96, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0x98, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xA0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xA8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xB0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xB8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xC0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xC8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xD0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xD8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xE0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xE8, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xD, 0xF0, 0xA8, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0xF, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x10, 0xD0, 0x30, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x10, 0xE0, 0x58, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x10, 0xD8, 0x78, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x10, 0x90, 0x78, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x10, 0x88, 0x58, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x11, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x19, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x19, 0x0, 0x0, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x19, 0x0, 0x0, 0x0, 0x3, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x19, 0x0, 0x0, 0x0, 0x2, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x19, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x18, 0x62, 0x48, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x18, 0x62, 0x84, 0x0, 0x1, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1A, 0x84, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1B, 0xA4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1C, 0xC4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1D, 0xE4, 0x38, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1E, 0x84, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x1F, 0xA4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x20, 0xC4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x21, 0xE4, 0x60, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x22, 0x84, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x23, 0xA4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x24, 0xC4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x25, 0xE4, 0x88, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x26, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x27, 0xB4, 0x20, 0x0, 0x1, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x27, 0xB4, 0x78, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x28, 0x8, 0x84, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x29, 0x84, 0x38, 0x0, 0x0, 0x0, 0x2, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 }, + { 0x2A, 0x4C, 0x30, 0x0, 0x0, 0x0, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0 } }; static const u8 Unk_020F411C[] = { @@ -128,7 +129,7 @@ static const u8 Unk_020F411C[] = { 0x0 }; -void sub_0208EA44 (PokemonSummaryApp * param0) +void sub_0208EA44(PokemonSummaryApp *param0) { GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1); GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1); @@ -175,13 +176,13 @@ void sub_0208EA44 (PokemonSummaryApp * param0) } } -void sub_0208EAF4 (PokemonSummaryApp * param0) +void sub_0208EAF4(PokemonSummaryApp *param0) { sub_0200C8B0(param0->renderer, param0->gfxHandler); sub_0200C8D4(param0->renderer); } -void sub_0208EB14 (PokemonSummaryApp * param0) +void sub_0208EB14(PokemonSummaryApp *param0) { sub_02021E2C(param0->unk_41C[21], FX32_ONE); sub_02021E2C(param0->unk_41C[22], FX32_ONE); @@ -190,7 +191,7 @@ void sub_0208EB14 (PokemonSummaryApp * param0) sub_02021E2C(param0->unk_41C[69], FX32_ONE); } -void sub_0208EB64 (PokemonSummaryApp * param0) +void sub_0208EB64(PokemonSummaryApp *param0) { u16 v0; @@ -227,7 +228,7 @@ void sub_0208EB64 (PokemonSummaryApp * param0) sub_02021CAC(param0->unk_41C[76], 0); } -static u8 sub_0208ECB8 (PokemonSummaryApp * param0) +static u8 sub_0208ECB8(PokemonSummaryApp *param0) { u8 v0, v1 = 0; @@ -240,9 +241,9 @@ static u8 sub_0208ECB8 (PokemonSummaryApp * param0) return (23 * 8 + 4) - (24 + (v1 - 1) * 16) / 2; } -void sub_0208ECF4 (PokemonSummaryApp * param0) +void sub_0208ECF4(PokemonSummaryApp *param0) { - GraphicElementData ** v0; + GraphicElementData **v0; s16 v1, v2; s16 v3; u16 v4; @@ -286,7 +287,7 @@ void sub_0208ECF4 (PokemonSummaryApp * param0) } } -void sub_0208EDC4 (PokemonSummaryApp * param0) +void sub_0208EDC4(PokemonSummaryApp *param0) { u8 v0; @@ -300,7 +301,7 @@ void sub_0208EDC4 (PokemonSummaryApp * param0) SpriteActor_SetPositionXY(param0->unk_41C[22], (23 * 8 + 4) + ((23 * 8 + 4) - v0) + -4, 24); } -void sub_0208EE10 (PokemonSummaryApp * param0, u8 param1) +void sub_0208EE10(PokemonSummaryApp *param0, u8 param1) { if (PokemonSummary_CountVisiblePages(param0) <= 1) { param1 = 0; @@ -310,7 +311,7 @@ void sub_0208EE10 (PokemonSummaryApp * param0, u8 param1) sub_02021CAC(param0->unk_41C[22], param1); } -void sub_0208EE3C (PokemonSummaryApp * param0) +void sub_0208EE3C(PokemonSummaryApp *param0) { u32 v0; @@ -324,7 +325,7 @@ void sub_0208EE3C (PokemonSummaryApp * param0) sub_0200D97C(param0->renderer, param0->gfxHandler, 39, 37 + Unk_020F411C[param0->monData.caughtBall], 0, 6); } -void sub_0208EE9C (PokemonSummaryApp * param0) +void sub_0208EE9C(PokemonSummaryApp *param0) { if (param0->monData.status == 7) { sub_02021CAC(param0->unk_41C[20], 0); @@ -339,7 +340,7 @@ void sub_0208EE9C (PokemonSummaryApp * param0) } } -static void sub_0208EF0C (PokemonSummaryApp * param0) +static void sub_0208EF0C(PokemonSummaryApp *param0) { u16 v0; @@ -356,7 +357,7 @@ static void sub_0208EF0C (PokemonSummaryApp * param0) sub_0208F71C(param0); } -void sub_0208EF58 (PokemonSummaryApp * param0) +void sub_0208EF58(PokemonSummaryApp *param0) { u16 v0; @@ -422,19 +423,19 @@ void sub_0208EF58 (PokemonSummaryApp * param0) } } -void sub_0208F16C (PokemonSummaryApp * param0) +void sub_0208F16C(PokemonSummaryApp *param0) { sub_0208F194(param0, 11, 3, param0->monData.type1); sub_0208F194(param0, 12, 4, param0->monData.type2); } -static void sub_0208F194 (PokemonSummaryApp * param0, u8 param1, u8 param2, u8 param3) +static void sub_0208F194(PokemonSummaryApp *param0, u8 param1, u8 param2, u8 param3) { sub_0200D948(param0->renderer, param0->gfxHandler, sub_0207C944(), sub_0207C908(param3), 1, param2); sub_0200D414(param0->unk_41C[param1], sub_0207C92C(param3) + 3); } -static void sub_0208F1E4 (PokemonSummaryApp * param0, u8 * param1, s16 * param2, s16 * param3) +static void sub_0208F1E4(PokemonSummaryApp *param0, u8 *param1, s16 *param2, s16 *param3) { s16 v0, v1; @@ -450,7 +451,7 @@ static void sub_0208F1E4 (PokemonSummaryApp * param0, u8 * param1, s16 * param2, } } -void sub_0208F22C (PokemonSummaryApp * param0, u8 param1, u8 param2) +void sub_0208F22C(PokemonSummaryApp *param0, u8 param1, u8 param2) { s16 v0, v1, v2, v3; @@ -461,7 +462,7 @@ void sub_0208F22C (PokemonSummaryApp * param0, u8 param1, u8 param2) SpriteActor_SetPositionXY(param0->unk_41C[13 + param2], v0, v1); } -void sub_0208F294 (PokemonSummaryApp * param0, u32 param1) +void sub_0208F294(PokemonSummaryApp *param0, u32 param1) { u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS); @@ -469,12 +470,12 @@ void sub_0208F294 (PokemonSummaryApp * param0, u32 param1) sub_0200D414(param0->unk_41C[18], sub_0207CAA8(v0) + 3); } -void sub_0208F2E8 (PokemonSummaryApp * param0) +void sub_0208F2E8(PokemonSummaryApp *param0) { SpriteActor_SetPositionXY(param0->unk_41C[9], 194, 48 + param0->cursor * 32); } -void sub_0208F310 (PokemonSummaryApp * param0) +void sub_0208F310(PokemonSummaryApp *param0) { s16 v0, v1; @@ -483,7 +484,7 @@ void sub_0208F310 (PokemonSummaryApp * param0) sub_02021CAC(param0->unk_41C[10], 1); } -void sub_0208F34C (PokemonSummaryApp * param0) +void sub_0208F34C(PokemonSummaryApp *param0) { u32 v0; @@ -505,7 +506,7 @@ void sub_0208F34C (PokemonSummaryApp * param0) } } -void sub_0208F3B0 (PokemonSummaryApp * param0) +void sub_0208F3B0(PokemonSummaryApp *param0) { u32 v0; @@ -588,7 +589,7 @@ void sub_0208F3B0 (PokemonSummaryApp * param0) } } -void sub_0208F574 (PokemonSummaryApp * param0) +void sub_0208F574(PokemonSummaryApp *param0) { u32 v0; @@ -613,7 +614,7 @@ void sub_0208F574 (PokemonSummaryApp * param0) } } -void sub_0208F600 (PokemonSummaryApp * param0) +void sub_0208F600(PokemonSummaryApp *param0) { s16 v0, v1; @@ -630,25 +631,25 @@ void sub_0208F600 (PokemonSummaryApp * param0) } } -void sub_0208F684 (PokemonSummaryApp * param0) +void sub_0208F684(PokemonSummaryApp *param0) { if (sub_02021E74(param0->unk_41C[41]) == 2) { sub_02021CAC(param0->unk_41C[41], 0); } } -void sub_0208F6A4 (PokemonSummaryApp * param0) +void sub_0208F6A4(PokemonSummaryApp *param0) { u8 v0; for (v0 = 0; v0 < 5; v0++) { - if ((param0->subscreen & (1 << v0))) { + if (param0->subscreen & (1 << v0)) { sub_02021CAC(param0->unk_41C[42 + v0], 1); } } } -void sub_0208F6DC (PokemonSummaryApp * param0, Window * param1) +void sub_0208F6DC(PokemonSummaryApp *param0, Window *param1) { if (param1 == NULL) { sub_02021CAC(param0->unk_41C[47], 0); @@ -659,9 +660,9 @@ void sub_0208F6DC (PokemonSummaryApp * param0, Window * param1) sub_02021CAC(param0->unk_41C[47], 1); } -void sub_0208F71C (PokemonSummaryApp * param0) +void sub_0208F71C(PokemonSummaryApp *param0) { - void * v0 = PokemonSummary_MonData(param0); + void *v0 = PokemonSummary_MonData(param0); u32 v1; if (param0->data->dataType == 2) { @@ -675,7 +676,7 @@ void sub_0208F71C (PokemonSummaryApp * param0) sub_02021D0C(param0->unk_41C[19], (PokemonPersonalData_GetFormValue(param0->monData.species, param0->monData.form, 28) ^ 1)); } -void sub_0208F7A4 (PokemonSummaryApp * param0) +void sub_0208F7A4(PokemonSummaryApp *param0) { sub_0200D97C(param0->renderer, param0->gfxHandler, 19, PokeIconPalettesFileIndex(), 0, 5); @@ -688,7 +689,7 @@ void sub_0208F7A4 (PokemonSummaryApp * param0) SpriteActor_DrawSprite(param0->unk_41C[19], 1); } -static s16 sub_0208F800 (u32 param0, s16 param1, s16 param2) +static s16 sub_0208F800(u32 param0, s16 param1, s16 param2) { u32 v0; @@ -707,7 +708,7 @@ static s16 sub_0208F800 (u32 param0, s16 param1, s16 param2) return param2 + (s16)v0; } -void sub_0208F844 (PokemonSummaryApp * param0) +void sub_0208F844(PokemonSummaryApp *param0) { SpriteActor_SetPositionXY(param0->unk_41C[48], sub_0208F800(param0->monData.cool, 88, 88), sub_0208F800(param0->monData.cool, 49, 73)); SpriteActor_SetPositionXY(param0->unk_41C[49], sub_0208F800(param0->monData.beauty, 110, 88), sub_0208F800(param0->monData.beauty, 65, 73)); @@ -722,7 +723,7 @@ void sub_0208F844 (PokemonSummaryApp * param0) sub_02021CAC(param0->unk_41C[52], 1); } -void sub_0208F964 (PokemonSummaryApp * param0) +void sub_0208F964(PokemonSummaryApp *param0) { sub_02021CAC(param0->unk_41C[48], 0); sub_02021CAC(param0->unk_41C[49], 0); @@ -731,13 +732,13 @@ void sub_0208F964 (PokemonSummaryApp * param0) sub_02021CAC(param0->unk_41C[52], 0); } -static void sub_0208F9B0 (PokemonSummaryApp * param0, u8 param1, u8 param2) +static void sub_0208F9B0(PokemonSummaryApp *param0, u8 param1, u8 param2) { sub_0200D948(param0->renderer, param0->gfxHandler, 39, sub_020923C0(param1, 1), 0, 26 + param2); sub_0200D414(param0->unk_41C[55 + param2], sub_020923C0(param1, 2) + 7); } -void sub_0208FA04 (PokemonSummaryApp * param0) +void sub_0208FA04(PokemonSummaryApp *param0) { u16 v0; @@ -761,7 +762,7 @@ void sub_0208FA04 (PokemonSummaryApp * param0) SpriteActor_SetSpriteAnimActive(param0->unk_41C[70], 0); } -void sub_0208FAA4 (PokemonSummaryApp * param0) +void sub_0208FAA4(PokemonSummaryApp *param0) { u16 v0; @@ -775,13 +776,13 @@ void sub_0208FAA4 (PokemonSummaryApp * param0) } } -void sub_0208FB00 (PokemonSummaryApp * param0) +void sub_0208FB00(PokemonSummaryApp *param0) { SpriteActor_SetPositionXY( param0->unk_41C[67], 132 + (param0->ribbonPos & 3) * 32, 56 + (param0->ribbonPos / 4) * 40); } -void sub_0208FB30 (PokemonSummaryApp * param0) +void sub_0208FB30(PokemonSummaryApp *param0) { if (sub_02021D34(param0->unk_41C[70]) == 1) { sub_02021E2C(param0->unk_41C[70], FX32_ONE); @@ -789,14 +790,14 @@ void sub_0208FB30 (PokemonSummaryApp * param0) } static const s16 Unk_020F4180[][4] = { - {0xB4, 0x39, 0xB4, 0x5A}, - {0xD5, 0x55, 0xB8, 0x5D}, - {0xC8, 0x7D, 0xB6, 0x61}, - {0x9F, 0x7D, 0xB2, 0x61}, - {0x92, 0x55, 0xB0, 0x5D} + { 0xB4, 0x39, 0xB4, 0x5A }, + { 0xD5, 0x55, 0xB8, 0x5D }, + { 0xC8, 0x7D, 0xB6, 0x61 }, + { 0x9F, 0x7D, 0xB2, 0x61 }, + { 0x92, 0x55, 0xB0, 0x5D } }; -void sub_0208FB54 (PokemonSummaryApp * param0, u8 param1) +void sub_0208FB54(PokemonSummaryApp *param0, u8 param1) { u16 v0, v1; @@ -831,7 +832,7 @@ void sub_0208FB54 (PokemonSummaryApp * param0, u8 param1) } } -static void sub_0208FC30 (GraphicElementData * param0, u32 param1, u32 param2, const s16 * param3) +static void sub_0208FC30(GraphicElementData *param0, u32 param1, u32 param2, const s16 *param3) { s32 v0, v1; @@ -859,7 +860,7 @@ static void sub_0208FC30 (GraphicElementData * param0, u32 param1, u32 param2, c SpriteActor_SetSpriteAnimActive(param0, 0); } -void sub_0208FCD4 (PokemonSummaryApp * param0) +void sub_0208FCD4(PokemonSummaryApp *param0) { u32 v0; diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index ec2386c6bc..f3f9cc6cba 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -1,142 +1,142 @@ +#include "unk_0208FCF8.h" + #include #include -#include "pokemon.h" - -#include "struct_defs/struct_0205AA50.h" #include "struct_defs/pokemon_summary_app.h" +#include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02090800.h" + #include "overlay061/struct_ov61_0222C884.h" -#include "unk_02002B7C.h" +#include "heap.h" #include "message.h" +#include "move_table.h" +#include "pokemon.h" +#include "pokemon_summary_app.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02002B7C.h" #include "unk_0200C440.h" #include "unk_0200DA60.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" -#include "pokemon.h" -#include "move_table.h" #include "unk_0207A274.h" -#include "pokemon_summary_app.h" #include "unk_0208EA44.h" -#include "unk_0208FCF8.h" #include "unk_020923C0.h" #include "unk_02092494.h" #include "unk_02094EDC.h" -static void sub_020900D8(PokemonSummaryApp * param0, Window * param1, u32 param2, u32 param3); -static void sub_02090158(PokemonSummaryApp * param0, u32 param1, u32 param2, u32 param3, u32 param4); -static void sub_020902B0(PokemonSummaryApp * param0); -static void sub_02091188(PokemonSummaryApp * param0, u32 param1); -static void sub_02090578(PokemonSummaryApp * param0); -static void sub_020908CC(PokemonSummaryApp * param0); -static void sub_0209093C(PokemonSummaryApp * param0); -static void sub_02090BDC(PokemonSummaryApp * param0); -static void sub_02090CD4(PokemonSummaryApp * param0); -static void sub_02090D90(PokemonSummaryApp * param0); -static void sub_02090E4C(PokemonSummaryApp * param0); -static void sub_02090EC8(PokemonSummaryApp * param0); +static void sub_020900D8(PokemonSummaryApp *param0, Window *param1, u32 param2, u32 param3); +static void sub_02090158(PokemonSummaryApp *param0, u32 param1, u32 param2, u32 param3, u32 param4); +static void sub_020902B0(PokemonSummaryApp *param0); +static void sub_02091188(PokemonSummaryApp *param0, u32 param1); +static void sub_02090578(PokemonSummaryApp *param0); +static void sub_020908CC(PokemonSummaryApp *param0); +static void sub_0209093C(PokemonSummaryApp *param0); +static void sub_02090BDC(PokemonSummaryApp *param0); +static void sub_02090CD4(PokemonSummaryApp *param0); +static void sub_02090D90(PokemonSummaryApp *param0); +static void sub_02090E4C(PokemonSummaryApp *param0); +static void sub_02090EC8(PokemonSummaryApp *param0); static const UnkStruct_ov61_0222C884 Unk_020F4ED0[] = { - {0x1, 0x1, 0x0, 0xD, 0x2, 0xF, 0x1}, - {0x1, 0x1, 0x0, 0xB, 0x2, 0xF, 0x1B}, - {0x1, 0x1, 0x0, 0xE, 0x2, 0xF, 0x31}, - {0x1, 0x1, 0x0, 0xB, 0x2, 0xF, 0x4D}, - {0x1, 0x1, 0x0, 0x9, 0x2, 0xF, 0x63}, - {0x1, 0x1, 0x0, 0xB, 0x2, 0xF, 0x75}, - {0x1, 0x1, 0x14, 0x6, 0x2, 0xF, 0x8B}, - {0x1, 0xE, 0x5, 0x9, 0x2, 0xF, 0x97}, - {0x1, 0xE, 0x7, 0x5, 0x2, 0xF, 0xA9}, - {0x1, 0xE, 0x9, 0x5, 0x2, 0xF, 0xB3}, - {0x1, 0xE, 0xB, 0x5, 0x2, 0xF, 0xBD}, - {0x1, 0xE, 0xD, 0x5, 0x2, 0xF, 0xC7}, - {0x1, 0xE, 0xF, 0xF, 0x2, 0xF, 0xD1}, - {0x1, 0xE, 0x13, 0xC, 0x2, 0xF, 0xEF}, - {0x1, 0x13, 0x15, 0x3, 0x2, 0xF, 0x107}, - {0x1, 0x12, 0x4, 0x2, 0x2, 0xF, 0x10D}, - {0x1, 0x10, 0x7, 0x6, 0x2, 0xF, 0x111}, - {0x1, 0x10, 0x9, 0x6, 0x2, 0xF, 0x11D}, - {0x1, 0x10, 0xB, 0x6, 0x2, 0xF, 0x129}, - {0x1, 0x10, 0xD, 0x6, 0x2, 0xF, 0x135}, - {0x1, 0x10, 0xF, 0x6, 0x2, 0xF, 0x141}, - {0x1, 0xE, 0x12, 0x6, 0x2, 0xF, 0x14D}, - {0x1, 0xE, 0x14, 0x5, 0x2, 0xF, 0x159}, - {0x1, 0x1, 0x16, 0x6, 0x2, 0xF, 0x163}, - {0x1, 0x15, 0x14, 0x5, 0x2, 0xF, 0x16F}, - {0x1, 0x1, 0x8, 0x6, 0x2, 0xF, 0x179}, - {0x1, 0x1, 0xA, 0x6, 0x2, 0xF, 0x185}, - {0x1, 0x1, 0xC, 0x8, 0x2, 0xF, 0x191}, - {0x1, 0x12, 0xB, 0x9, 0x2, 0xF, 0x1A1}, - {0x1, 0x2, 0xD, 0xC, 0x2, 0xF, 0x1B3}, - {0x1, 0xE, 0x15, 0xC, 0x2, 0xF, 0x1CB}, - {0x1, 0x1, 0x0, 0xB, 0x2, 0xF, 0x1E3}, - {0x1, 0x1, 0x16, 0xC, 0x2, 0xF, 0x1F9}, - {0x1, 0x1, 0x5, 0x6, 0x2, 0xF, 0x211}, - {0x1, 0x3, 0x3, 0x9, 0x2, 0xF, 0x21D}, - {0x1, 0x1A, 0x0, 0x6, 0x2, 0xF, 0x22F} + { 0x1, 0x1, 0x0, 0xD, 0x2, 0xF, 0x1 }, + { 0x1, 0x1, 0x0, 0xB, 0x2, 0xF, 0x1B }, + { 0x1, 0x1, 0x0, 0xE, 0x2, 0xF, 0x31 }, + { 0x1, 0x1, 0x0, 0xB, 0x2, 0xF, 0x4D }, + { 0x1, 0x1, 0x0, 0x9, 0x2, 0xF, 0x63 }, + { 0x1, 0x1, 0x0, 0xB, 0x2, 0xF, 0x75 }, + { 0x1, 0x1, 0x14, 0x6, 0x2, 0xF, 0x8B }, + { 0x1, 0xE, 0x5, 0x9, 0x2, 0xF, 0x97 }, + { 0x1, 0xE, 0x7, 0x5, 0x2, 0xF, 0xA9 }, + { 0x1, 0xE, 0x9, 0x5, 0x2, 0xF, 0xB3 }, + { 0x1, 0xE, 0xB, 0x5, 0x2, 0xF, 0xBD }, + { 0x1, 0xE, 0xD, 0x5, 0x2, 0xF, 0xC7 }, + { 0x1, 0xE, 0xF, 0xF, 0x2, 0xF, 0xD1 }, + { 0x1, 0xE, 0x13, 0xC, 0x2, 0xF, 0xEF }, + { 0x1, 0x13, 0x15, 0x3, 0x2, 0xF, 0x107 }, + { 0x1, 0x12, 0x4, 0x2, 0x2, 0xF, 0x10D }, + { 0x1, 0x10, 0x7, 0x6, 0x2, 0xF, 0x111 }, + { 0x1, 0x10, 0x9, 0x6, 0x2, 0xF, 0x11D }, + { 0x1, 0x10, 0xB, 0x6, 0x2, 0xF, 0x129 }, + { 0x1, 0x10, 0xD, 0x6, 0x2, 0xF, 0x135 }, + { 0x1, 0x10, 0xF, 0x6, 0x2, 0xF, 0x141 }, + { 0x1, 0xE, 0x12, 0x6, 0x2, 0xF, 0x14D }, + { 0x1, 0xE, 0x14, 0x5, 0x2, 0xF, 0x159 }, + { 0x1, 0x1, 0x16, 0x6, 0x2, 0xF, 0x163 }, + { 0x1, 0x15, 0x14, 0x5, 0x2, 0xF, 0x16F }, + { 0x1, 0x1, 0x8, 0x6, 0x2, 0xF, 0x179 }, + { 0x1, 0x1, 0xA, 0x6, 0x2, 0xF, 0x185 }, + { 0x1, 0x1, 0xC, 0x8, 0x2, 0xF, 0x191 }, + { 0x1, 0x12, 0xB, 0x9, 0x2, 0xF, 0x1A1 }, + { 0x1, 0x2, 0xD, 0xC, 0x2, 0xF, 0x1B3 }, + { 0x1, 0xE, 0x15, 0xC, 0x2, 0xF, 0x1CB }, + { 0x1, 0x1, 0x0, 0xB, 0x2, 0xF, 0x1E3 }, + { 0x1, 0x1, 0x16, 0xC, 0x2, 0xF, 0x1F9 }, + { 0x1, 0x1, 0x5, 0x6, 0x2, 0xF, 0x211 }, + { 0x1, 0x3, 0x3, 0x9, 0x2, 0xF, 0x21D }, + { 0x1, 0x1A, 0x0, 0x6, 0x2, 0xF, 0x22F } }; static const UnkStruct_ov61_0222C884 Unk_020F4E20[] = { - {0x1, 0x18, 0x5, 0x6, 0x2, 0xF, 0x23B}, - {0x1, 0x17, 0x7, 0x8, 0x2, 0xF, 0x247}, - {0x1, 0x17, 0xB, 0x8, 0x2, 0xF, 0x257}, - {0x1, 0x19, 0xD, 0x4, 0x2, 0xF, 0x267}, - {0x1, 0x18, 0x11, 0x6, 0x2, 0xF, 0x271}, - {0x1, 0x18, 0x15, 0x6, 0x2, 0xF, 0x27F} + { 0x1, 0x18, 0x5, 0x6, 0x2, 0xF, 0x23B }, + { 0x1, 0x17, 0x7, 0x8, 0x2, 0xF, 0x247 }, + { 0x1, 0x17, 0xB, 0x8, 0x2, 0xF, 0x257 }, + { 0x1, 0x19, 0xD, 0x4, 0x2, 0xF, 0x267 }, + { 0x1, 0x18, 0x11, 0x6, 0x2, 0xF, 0x271 }, + { 0x1, 0x18, 0x15, 0x6, 0x2, 0xF, 0x27F } }; static const UnkStruct_ov61_0222C884 Unk_020F4DB0[] = { - {0x1, 0xE, 0x5, 0x11, 0x12, 0xF, 0x23B} + { 0x1, 0xE, 0x5, 0x11, 0x12, 0xF, 0x23B } }; static const UnkStruct_ov61_0222C884 Unk_020F4E50[] = { - {0x1, 0x17, 0x4, 0x7, 0x2, 0xF, 0x23B}, - {0x1, 0x19, 0x7, 0x3, 0x2, 0xF, 0x249}, - {0x1, 0x19, 0x9, 0x3, 0x2, 0xF, 0x24F}, - {0x1, 0x19, 0xB, 0x3, 0x2, 0xF, 0x255}, - {0x1, 0x19, 0xD, 0x3, 0x2, 0xF, 0x25B}, - {0x1, 0x19, 0xF, 0x3, 0x2, 0xF, 0x261}, - {0x1, 0x15, 0x12, 0xB, 0x2, 0xF, 0x267}, - {0x1, 0xE, 0x14, 0x12, 0x4, 0xF, 0x27D} + { 0x1, 0x17, 0x4, 0x7, 0x2, 0xF, 0x23B }, + { 0x1, 0x19, 0x7, 0x3, 0x2, 0xF, 0x249 }, + { 0x1, 0x19, 0x9, 0x3, 0x2, 0xF, 0x24F }, + { 0x1, 0x19, 0xB, 0x3, 0x2, 0xF, 0x255 }, + { 0x1, 0x19, 0xD, 0x3, 0x2, 0xF, 0x25B }, + { 0x1, 0x19, 0xF, 0x3, 0x2, 0xF, 0x261 }, + { 0x1, 0x15, 0x12, 0xB, 0x2, 0xF, 0x267 }, + { 0x1, 0xE, 0x14, 0x12, 0x4, 0xF, 0x27D } }; static const UnkStruct_ov61_0222C884 Unk_020F4E90[] = { - {0x1, 0x15, 0x4, 0xB, 0x4, 0xF, 0x23B}, - {0x1, 0x15, 0x8, 0xB, 0x4, 0xF, 0x267}, - {0x1, 0x15, 0xC, 0xB, 0x4, 0xF, 0x293}, - {0x1, 0x15, 0x10, 0xB, 0x4, 0xF, 0x2BF}, - {0x1, 0x15, 0x14, 0xB, 0x4, 0xF, 0x2EB}, - {0x1, 0xC, 0xA, 0x3, 0x2, 0xF, 0x317}, - {0x1, 0xC, 0xC, 0x3, 0x2, 0xF, 0x31D}, - {0x1, 0x1, 0xE, 0xF, 0xA, 0xF, 0x323} + { 0x1, 0x15, 0x4, 0xB, 0x4, 0xF, 0x23B }, + { 0x1, 0x15, 0x8, 0xB, 0x4, 0xF, 0x267 }, + { 0x1, 0x15, 0xC, 0xB, 0x4, 0xF, 0x293 }, + { 0x1, 0x15, 0x10, 0xB, 0x4, 0xF, 0x2BF }, + { 0x1, 0x15, 0x14, 0xB, 0x4, 0xF, 0x2EB }, + { 0x1, 0xC, 0xA, 0x3, 0x2, 0xF, 0x317 }, + { 0x1, 0xC, 0xC, 0x3, 0x2, 0xF, 0x31D }, + { 0x1, 0x1, 0xE, 0xF, 0xA, 0xF, 0x323 } }; static const UnkStruct_ov61_0222C884 Unk_020F4DF0[] = { - {0x1, 0x15, 0x4, 0xB, 0x4, 0xF, 0x23B}, - {0x1, 0x15, 0x8, 0xB, 0x4, 0xF, 0x267}, - {0x1, 0x15, 0xC, 0xB, 0x4, 0xF, 0x293}, - {0x1, 0x15, 0x10, 0xB, 0x4, 0xF, 0x2BF}, - {0x1, 0x15, 0x14, 0xB, 0x4, 0xF, 0x2EB}, - {0x1, 0x1, 0x12, 0xF, 0x6, 0xF, 0x317} + { 0x1, 0x15, 0x4, 0xB, 0x4, 0xF, 0x23B }, + { 0x1, 0x15, 0x8, 0xB, 0x4, 0xF, 0x267 }, + { 0x1, 0x15, 0xC, 0xB, 0x4, 0xF, 0x293 }, + { 0x1, 0x15, 0x10, 0xB, 0x4, 0xF, 0x2BF }, + { 0x1, 0x15, 0x14, 0xB, 0x4, 0xF, 0x2EB }, + { 0x1, 0x1, 0x12, 0xF, 0x6, 0xF, 0x317 } }; static const UnkStruct_ov61_0222C884 Unk_020F4DD0[] = { - {0x1, 0x1A, 0x15, 0x5, 0x2, 0xF, 0x23B}, - {0x1, 0x18, 0xF, 0x7, 0x2, 0xF, 0x245}, - {0x1, 0x1, 0x12, 0x15, 0x2, 0xF, 0x253}, - {0x1, 0x1, 0x14, 0x1E, 0x4, 0xF, 0x27D} + { 0x1, 0x1A, 0x15, 0x5, 0x2, 0xF, 0x23B }, + { 0x1, 0x18, 0xF, 0x7, 0x2, 0xF, 0x245 }, + { 0x1, 0x1, 0x12, 0x15, 0x2, 0xF, 0x253 }, + { 0x1, 0x1, 0x14, 0x1E, 0x4, 0xF, 0x27D } }; static const UnkStruct_ov61_0222C884 Unk_020F4DB8[] = { - {0x1, 0x1A, 0x0, 0x5, 0x2, 0xF, 0x23B}, - {0x1, 0x1, 0x14, 0xC, 0x4, 0xF, 0x24D}, - {0x1, 0x2, 0x15, 0x1B, 0x2, 0xE, 0x27D} + { 0x1, 0x1A, 0x0, 0x5, 0x2, 0xF, 0x23B }, + { 0x1, 0x1, 0x14, 0xC, 0x4, 0xF, 0x24D }, + { 0x1, 0x2, 0x15, 0x1B, 0x2, 0xE, 0x27D } }; -void sub_0208FCF8 (PokemonSummaryApp * param0) +void sub_0208FCF8(PokemonSummaryApp *param0) { u16 v0; @@ -151,9 +151,9 @@ void sub_0208FCF8 (PokemonSummaryApp * param0) sub_0208FFE0(param0); } -void sub_0208FD40 (PokemonSummaryApp * param0) +void sub_0208FD40(PokemonSummaryApp *param0) { - const UnkStruct_ov61_0222C884 * v0; + const UnkStruct_ov61_0222C884 *v0; u32 v1; switch (param0->page) { @@ -201,7 +201,7 @@ void sub_0208FD40 (PokemonSummaryApp * param0) } } -void sub_0208FE34 (PokemonSummaryApp * param0) +void sub_0208FE34(PokemonSummaryApp *param0) { switch (param0->page) { case 0: @@ -224,7 +224,7 @@ void sub_0208FE34 (PokemonSummaryApp * param0) sub_0201A928(param0->extraWindows, param0->numExtraWindows); } -void sub_0208FE88 (PokemonSummaryApp * param0) +void sub_0208FE88(PokemonSummaryApp *param0) { u32 v0; @@ -235,9 +235,9 @@ void sub_0208FE88 (PokemonSummaryApp * param0) } } -void sub_0208FEA4 (PokemonSummaryApp * param0) +void sub_0208FEA4(PokemonSummaryApp *param0) { - Window * v0; + Window *v0; u32 v1; v0 = ¶m0->staticWindows[34]; @@ -258,10 +258,10 @@ void sub_0208FEA4 (PokemonSummaryApp * param0) sub_0201A9A4(v0); } -void sub_0208FF3C (PokemonSummaryApp * param0) +void sub_0208FF3C(PokemonSummaryApp *param0) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; v0 = ¶m0->staticWindows[33]; @@ -281,9 +281,9 @@ void sub_0208FF3C (PokemonSummaryApp * param0) sub_0201A9A4(v0); } -void sub_0208FFE0 (PokemonSummaryApp * param0) +void sub_0208FFE0(PokemonSummaryApp *param0) { - Strbuf* v0; + Strbuf *v0; BGL_FillWindow(¶m0->staticWindows[32], 0); @@ -301,14 +301,14 @@ void sub_0208FFE0 (PokemonSummaryApp * param0) sub_0201A9A4(¶m0->staticWindows[32]); } -void sub_02090064 (PokemonSummaryApp * param0, u32 param1) +void sub_02090064(PokemonSummaryApp *param0, u32 param1) { BGL_FillWindow(¶m0->staticWindows[35], 0); sub_02090158(param0, 35, param1, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); sub_0201A9A4(¶m0->staticWindows[35]); } -static BOOL sub_02090098 (PokemonSummaryApp * param0) +static BOOL sub_02090098(PokemonSummaryApp *param0) { if ((param0->monData.OTID == param0->data->OTID) && (param0->monData.OTGender == param0->data->OTGender) && (Strbuf_Compare(param0->monData.OTName, param0->playerName) == 0)) { return 1; @@ -317,7 +317,7 @@ static BOOL sub_02090098 (PokemonSummaryApp * param0) return 0; } -static void sub_020900D8 (PokemonSummaryApp * param0, Window * param1, u32 param2, u32 param3) +static void sub_020900D8(PokemonSummaryApp *param0, Window *param1, u32 param2, u32 param3) { u8 v0; u8 v1; @@ -342,7 +342,7 @@ static void sub_020900D8 (PokemonSummaryApp * param0, Window * param1, u32 param sub_0201D78C(param1, 0, param0->strbuf, v2, 0, 0xff, param2, NULL); } -static void sub_02090158 (PokemonSummaryApp * param0, u32 param1, u32 param2, u32 param3, u32 param4) +static void sub_02090158(PokemonSummaryApp *param0, u32 param1, u32 param2, u32 param3, u32 param4) { u8 v0; u8 v1; @@ -352,9 +352,9 @@ static void sub_02090158 (PokemonSummaryApp * param0, u32 param1, u32 param2, u3 sub_020900D8(param0, ¶m0->staticWindows[param1], param3, param4); } -static void sub_02090184 (PokemonSummaryApp * param0, u32 param1, u32 param2, u8 param3, u8 param4) +static void sub_02090184(PokemonSummaryApp *param0, u32 param1, u32 param2, u8 param3, u8 param4) { - Strbuf* v0; + Strbuf *v0; v0 = MessageLoader_GetNewStrbuf(param0->msgLoader, param1); StringTemplate_SetNumber(param0->strFormatter, 0, param2, param3, param4, 1); @@ -362,9 +362,9 @@ static void sub_02090184 (PokemonSummaryApp * param0, u32 param1, u32 param2, u8 Strbuf_Free(v0); } -static void sub_020901D0 (PokemonSummaryApp * param0, u32 param1, u32 param2, u32 param3, u32 param4, u16 param5, u16 param6, u8 param7, u8 param8, u8 param9) +static void sub_020901D0(PokemonSummaryApp *param0, u32 param1, u32 param2, u32 param3, u32 param4, u16 param5, u16 param6, u8 param7, u8 param8, u8 param9) { - Window * v0; + Window *v0; u32 v1; u16 v2; u16 v3; @@ -386,7 +386,7 @@ static void sub_020901D0 (PokemonSummaryApp * param0, u32 param1, u32 param2, u3 sub_0201D78C(v0, 0, param0->strbuf, v3, param9, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } -static void sub_020902B0 (PokemonSummaryApp * param0) +static void sub_020902B0(PokemonSummaryApp *param0) { sub_02090158(param0, 0, 7, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); sub_02090158(param0, 1, 23, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); @@ -425,7 +425,7 @@ static void sub_020902B0 (PokemonSummaryApp * param0) sub_02090158(param0, 31, 179, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); } -void sub_020904C4 (PokemonSummaryApp * param0) +void sub_020904C4(PokemonSummaryApp *param0) { sub_02019CB8(param0->bgl, 1, 0, 0, 0, 32, 2, 16); sub_02019CB8(param0->bgl, 1, 0, 14, 2, 18, 22, 16); @@ -458,7 +458,7 @@ void sub_020904C4 (PokemonSummaryApp * param0) } } -static void sub_02090578 (PokemonSummaryApp * param0) +static void sub_02090578(PokemonSummaryApp *param0) { sub_0201A9A4(¶m0->staticWindows[0]); sub_0201A9A4(¶m0->staticWindows[7]); @@ -533,9 +533,9 @@ static void sub_02090578 (PokemonSummaryApp * param0) sub_0201A9A4(¶m0->extraWindows[5]); } -static void sub_02090800 (Window * param0, Pokemon * param1, BOOL param2) +static void sub_02090800(Window *param0, Pokemon *param1, BOOL param2) { - PokemonInfoDisplayStruct * v0 = sub_02092494(param1, param2, 19); + PokemonInfoDisplayStruct *v0 = sub_02092494(param1, param2, 19); if (v0->unk_14.unk_04 != NULL) { sub_0201D78C(param0, 0, v0->unk_14.unk_04, 0, 0 + (v0->unk_14.unk_00 - 1) * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -560,20 +560,20 @@ static void sub_02090800 (Window * param0, Pokemon * param1, BOOL param2) sub_0209282C(v0); } -static void sub_020908CC (PokemonSummaryApp * param0) +static void sub_020908CC(PokemonSummaryApp *param0) { - Strbuf* v0; + Strbuf *v0; sub_0201A9A4(¶m0->staticWindows[1]); BGL_FillWindow(¶m0->extraWindows[0], 0); { - void * v1 = PokemonSummary_MonData(param0); + void *v1 = PokemonSummary_MonData(param0); BOOL v2 = sub_02090098(param0); if (param0->data->dataType == 2) { { - Pokemon * v3 = Pokemon_New(19); + Pokemon *v3 = Pokemon_New(19); Pokemon_FromBoxPokemon(v1, v3); sub_02090800(¶m0->extraWindows[0], v3, v2); @@ -587,7 +587,7 @@ static void sub_020908CC (PokemonSummaryApp * param0) sub_0201A9A4(¶m0->extraWindows[0]); } -static void sub_0209093C (PokemonSummaryApp * param0) +static void sub_0209093C(PokemonSummaryApp *param0) { u32 v0; @@ -624,8 +624,8 @@ static void sub_0209093C (PokemonSummaryApp * param0) sub_020900D8(param0, ¶m0->extraWindows[5], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 1); { - MessageLoader * v1; - Strbuf* v2; + MessageLoader *v1; + Strbuf *v2; StringTemplate_SetAbilityName(param0->strFormatter, 0, param0->monData.ability); @@ -650,7 +650,7 @@ static void sub_0209093C (PokemonSummaryApp * param0) sub_0201A9A4(¶m0->extraWindows[7]); } -static void sub_02090BDC (PokemonSummaryApp * param0) +static void sub_02090BDC(PokemonSummaryApp *param0) { sub_0201A9A4(¶m0->staticWindows[3]); sub_0201A9A4(¶m0->staticWindows[22]); @@ -675,7 +675,7 @@ static void sub_02090BDC (PokemonSummaryApp * param0) } } -static void sub_02090CD4 (PokemonSummaryApp * param0) +static void sub_02090CD4(PokemonSummaryApp *param0) { sub_0201A9A4(¶m0->staticWindows[4]); @@ -703,7 +703,7 @@ static void sub_02090CD4 (PokemonSummaryApp * param0) sub_0201A9A4(¶m0->extraWindows[3]); } -static void sub_02090D90 (PokemonSummaryApp * param0) +static void sub_02090D90(PokemonSummaryApp *param0) { sub_0201A9A4(¶m0->staticWindows[5]); @@ -731,7 +731,7 @@ static void sub_02090D90 (PokemonSummaryApp * param0) sub_0201A9A4(¶m0->extraWindows[3]); } -static void sub_02090E4C (PokemonSummaryApp * param0) +static void sub_02090E4C(PokemonSummaryApp *param0) { sub_0201A9A4(¶m0->staticWindows[31]); sub_0201A9A4(¶m0->staticWindows[30]); @@ -747,7 +747,7 @@ static void sub_02090E4C (PokemonSummaryApp * param0) } } -static void sub_02090EC8 (PokemonSummaryApp * param0) +static void sub_02090EC8(PokemonSummaryApp *param0) { sub_0201A9A4(¶m0->staticWindows[28]); sub_02090064(param0, 161); @@ -768,9 +768,9 @@ static void sub_02090EC8 (PokemonSummaryApp * param0) sub_0201A9A4(¶m0->extraWindows[1]); } -void sub_02090F84 (PokemonSummaryApp * param0) +void sub_02090F84(PokemonSummaryApp *param0) { - Strbuf* v0; + Strbuf *v0; u8 v1; u8 v2; @@ -807,7 +807,7 @@ void sub_02090F84 (PokemonSummaryApp * param0) sub_0201A9A4(¶m0->extraWindows[1]); } -void sub_020910E4 (PokemonSummaryApp * param0) +void sub_020910E4(PokemonSummaryApp *param0) { BGL_FillWindow(¶m0->extraWindows[2], 0); BGL_FillWindow(¶m0->extraWindows[3], 0); @@ -822,10 +822,10 @@ void sub_020910E4 (PokemonSummaryApp * param0) sub_0201A9A4(¶m0->extraWindows[3]); } -static void sub_02091188 (PokemonSummaryApp * param0, u32 param1) +static void sub_02091188(PokemonSummaryApp *param0, u32 param1) { - Window * v0; - Strbuf* v1; + Window *v0; + Strbuf *v1; u32 v2; u16 v3; u8 v4, v5; @@ -856,9 +856,9 @@ static void sub_02091188 (PokemonSummaryApp * param0, u32 param1) } } -void sub_020912A4 (PokemonSummaryApp * param0, u32 param1) +void sub_020912A4(PokemonSummaryApp *param0, u32 param1) { - MessageLoader * v0; + MessageLoader *v0; u32 v1; u32 v2; @@ -901,7 +901,7 @@ void sub_020912A4 (PokemonSummaryApp * param0, u32 param1) sub_0201A9A4(¶m0->extraWindows[7]); } -void sub_020913D8 (PokemonSummaryApp * param0) +void sub_020913D8(PokemonSummaryApp *param0) { sub_0201AD10(¶m0->staticWindows[25]); sub_0201AD10(¶m0->staticWindows[26]); @@ -911,7 +911,7 @@ void sub_020913D8 (PokemonSummaryApp * param0) sub_0201AD10(¶m0->extraWindows[7]); } -void sub_02091420 (PokemonSummaryApp * param0) +void sub_02091420(PokemonSummaryApp *param0) { if (param0->data->move != 0) { BGL_FillWindow(¶m0->extraWindows[4], 0); @@ -922,13 +922,13 @@ void sub_02091420 (PokemonSummaryApp * param0) } } -void sub_0209145C (PokemonSummaryApp * param0) +void sub_0209145C(PokemonSummaryApp *param0) { sub_0201AD10(¶m0->staticWindows[24]); sub_0201C3C0(param0->bgl, 1); } -void sub_02091474 (PokemonSummaryApp * param0) +void sub_02091474(PokemonSummaryApp *param0) { BGL_FillWindow(¶m0->extraWindows[0 + param0->cursor], 0); BGL_FillWindow(¶m0->extraWindows[0 + param0->cursorTmp], 0); @@ -940,9 +940,9 @@ void sub_02091474 (PokemonSummaryApp * param0) sub_0201A9A4(¶m0->extraWindows[0 + param0->cursorTmp]); } -void sub_020914F8 (PokemonSummaryApp * param0) +void sub_020914F8(PokemonSummaryApp *param0) { - Window * v0; + Window *v0; if (param0->page == 3) { sub_0201AD10(¶m0->extraWindows[5]); @@ -959,9 +959,9 @@ void sub_020914F8 (PokemonSummaryApp * param0) sub_0201A9A4(v0); } -void sub_02091570 (PokemonSummaryApp * param0, u32 param1) +void sub_02091570(PokemonSummaryApp *param0, u32 param1) { - MessageLoader * v0; + MessageLoader *v0; u32 v1; u32 v2; @@ -980,15 +980,15 @@ void sub_02091570 (PokemonSummaryApp * param0, u32 param1) sub_0201A9A4(¶m0->extraWindows[5]); } -void sub_020915F4 (PokemonSummaryApp * param0) +void sub_020915F4(PokemonSummaryApp *param0) { sub_0201AD10(¶m0->staticWindows[29]); sub_0201AD10(¶m0->extraWindows[5]); } -void sub_02091610 (PokemonSummaryApp * param0, u8 param1) +void sub_02091610(PokemonSummaryApp *param0, u8 param1) { - Window * v0; + Window *v0; u32 v1; switch (param1) { diff --git a/src/unk_020916B4.c b/src/unk_020916B4.c index b69a3d62ce..cc306e4160 100644 --- a/src/unk_020916B4.c +++ b/src/unk_020916B4.c @@ -1,5 +1,6 @@ +#include "unk_020916B4.h" #include #include @@ -7,17 +8,17 @@ #include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_summary_app.h" #include "struct_defs/struct_02091850.h" + #include "overlay115/camera_angle.h" -#include "unk_0200762C.h" -#include "unk_02015F84.h" -#include "gx_layers.h" #include "camera.h" -#include "unk_0202419C.h" +#include "gx_layers.h" #include "pokemon.h" #include "pokemon_summary_app.h" +#include "unk_0200762C.h" +#include "unk_02015F84.h" +#include "unk_0202419C.h" #include "unk_0208EA44.h" -#include "unk_020916B4.h" typedef struct { VecFx16 unk_00; @@ -25,104 +26,104 @@ typedef struct { VecFx16 unk_0C; } UnkStruct_02091B78; -static void sub_02091850(UnkStruct_02091850 * param0); -static void sub_020918CC(VecFx16 * param0, VecFx16 * param1); -static void sub_020918EC(PokemonSummaryApp * param0); -static void sub_02091B78(const UnkStruct_02091B78 * param0, VecFx16 * param1, u8 param2); -static void sub_02091BD4(VecFx16 * param0, VecFx16 * param1, VecFx16 * param2); +static void sub_02091850(UnkStruct_02091850 *param0); +static void sub_020918CC(VecFx16 *param0, VecFx16 *param1); +static void sub_020918EC(PokemonSummaryApp *param0); +static void sub_02091B78(const UnkStruct_02091B78 *param0, VecFx16 *param1, u8 param2); +static void sub_02091BD4(VecFx16 *param0, VecFx16 *param1, VecFx16 *param2); static const UnkStruct_02091B78 Unk_020F4FFC[][4] = { { { - {0x1412, 0xEC8, 0x0}, - {0x1412, 0x2DF, 0x0}, - {0x0, 0xC, 0x0} + { 0x1412, 0xEC8, 0x0 }, + { 0x1412, 0x2DF, 0x0 }, + { 0x0, 0xC, 0x0 }, }, { - {0x2098, 0x3C5, 0x0}, - {0x15A2, 0x17F, 0x0}, - {0xB, 0x2, 0x0} + { 0x2098, 0x3C5, 0x0 }, + { 0x15A2, 0x17F, 0x0 }, + { 0xB, 0x2, 0x0 }, }, { - {0x1BA7, 0xFFFFFFFFFFFFF475, 0x0}, - {0x1504, 0xFFFFFFFFFFFFFF96, 0x0}, - {0x7, 0xFFFFFFFFFFFFFFF5, 0x0} + { 0x1BA7, 0xFFFFFFFFFFFFF475, 0x0 }, + { 0x1504, 0xFFFFFFFFFFFFFF96, 0x0 }, + { 0x7, 0xFFFFFFFFFFFFFFF5, 0x0 }, }, { - {0x1412, 0x12C, 0x0}, - {0x1412, 0x12C, 0x0}, - {0x0, 0x0, 0x0} - } + { 0x1412, 0x12C, 0x0 }, + { 0x1412, 0x12C, 0x0 }, + { 0x0, 0x0, 0x0 }, + }, }, { { - {0x733, 0x3C5, 0x0}, - {0x1225, 0x17F, 0x0}, - {0xFFFFFFFFFFFFFFF5, 0x2, 0x0} + { 0x733, 0x3C5, 0x0 }, + { 0x1225, 0x17F, 0x0 }, + { 0xFFFFFFFFFFFFFFF5, 0x2, 0x0 }, }, { - {0x13B5, 0xEC8, 0x0}, - {0x13B5, 0x2DF, 0x0}, - {0x0, 0xC, 0x0} + { 0x13B5, 0xEC8, 0x0 }, + { 0x13B5, 0x2DF, 0x0 }, + { 0x0, 0xC, 0x0 }, }, { - {0x13B5, 0x12C, 0x0}, - {0x13B5, 0x12C, 0x0}, - {0x0, 0x0, 0x0} + { 0x13B5, 0x12C, 0x0 }, + { 0x13B5, 0x12C, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0xC22, 0xFFFFFFFFFFFFF475, 0x0}, - {0x12C3, 0xFFFFFFFFFFFFFF96, 0x0}, - {0xFFFFFFFFFFFFFFF9, 0xFFFFFFFFFFFFFFF5, 0x0} - } + { 0xC22, 0xFFFFFFFFFFFFF475, 0x0 }, + { 0x12C3, 0xFFFFFFFFFFFFFF96, 0x0 }, + { 0xFFFFFFFFFFFFFFF9, 0xFFFFFFFFFFFFFFF5, 0x0 }, + }, }, { { - {0x733, 0x3C5, 0x0}, - {0x1225, 0x17F, 0x0}, - {0xFFFFFFFFFFFFFFF5, 0x2, 0x0} + { 0x733, 0x3C5, 0x0 }, + { 0x1225, 0x17F, 0x0 }, + { 0xFFFFFFFFFFFFFFF5, 0x2, 0x0 }, }, { - {0x13B5, 0x12C, 0x0}, - {0x13B5, 0x12C, 0x0}, - {0x0, 0x0, 0x0} + { 0x13B5, 0x12C, 0x0 }, + { 0x13B5, 0x12C, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x1BA7, 0xFFFFFFFFFFFFF475, 0x0}, - {0x14B3, 0xFFFFFFFFFFFFFF96, 0x0}, - {0x7, 0xFFFFFFFFFFFFFFF5, 0x0} + { 0x1BA7, 0xFFFFFFFFFFFFF475, 0x0 }, + { 0x14B3, 0xFFFFFFFFFFFFFF96, 0x0 }, + { 0x7, 0xFFFFFFFFFFFFFFF5, 0x0 }, }, { - {0xC22, 0xFFFFFFFFFFFFF475, 0x0}, - {0x12C3, 0xFFFFFFFFFFFFFF96, 0x0}, - {0xFFFFFFFFFFFFFFF9, 0xFFFFFFFFFFFFFFF5, 0x0} - } + { 0xC22, 0xFFFFFFFFFFFFF475, 0x0 }, + { 0x12C3, 0xFFFFFFFFFFFFFF96, 0x0 }, + { 0xFFFFFFFFFFFFFFF9, 0xFFFFFFFFFFFFFFF5, 0x0 }, + }, }, { { - {0x1412, 0x12C, 0x0}, - {0x1412, 0x12C, 0x0}, - {0x0, 0x0, 0x0} + { 0x1412, 0x12C, 0x0 }, + { 0x1412, 0x12C, 0x0 }, + { 0x0, 0x0, 0x0 }, }, { - {0x2098, 0x3C5, 0x0}, - {0x15A2, 0x17F, 0x0}, - {0xB, 0x2, 0x0} + { 0x2098, 0x3C5, 0x0 }, + { 0x15A2, 0x17F, 0x0 }, + { 0xB, 0x2, 0x0 }, }, { - {0x1BA7, 0xFFFFFFFFFFFFF475, 0x0}, - {0x1504, 0xFFFFFFFFFFFFFF96, 0x0}, - {0x7, 0xFFFFFFFFFFFFFFF5, 0x0} + { 0x1BA7, 0xFFFFFFFFFFFFF475, 0x0 }, + { 0x1504, 0xFFFFFFFFFFFFFF96, 0x0 }, + { 0x7, 0xFFFFFFFFFFFFFFF5, 0x0 }, }, { - {0xC22, 0xFFFFFFFFFFFFF475, 0x0}, - {0x1314, 0xFFFFFFFFFFFFFF96, 0x0}, - {0xFFFFFFFFFFFFFFF9, 0xFFFFFFFFFFFFFFF5, 0x0} - } - } + { 0xC22, 0xFFFFFFFFFFFFF475, 0x0 }, + { 0x1314, 0xFFFFFFFFFFFFFF96, 0x0 }, + { 0xFFFFFFFFFFFFFFF9, 0xFFFFFFFFFFFFFFF5, 0x0 }, + }, + }, }; -void sub_020916B4 (PokemonSummaryApp * param0) +void sub_020916B4(PokemonSummaryApp *param0) { NNS_G3dInit(); @@ -143,7 +144,7 @@ void sub_020916B4 (PokemonSummaryApp * param0) G2_SetBG0Priority(2); } -void sub_02091750 (PokemonSummaryApp * param0) +void sub_02091750(PokemonSummaryApp *param0) { if (param0->page == 4) { sub_020241B4(); @@ -166,7 +167,7 @@ void sub_02091750 (PokemonSummaryApp * param0) G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z); } -void sub_020917B0 (PokemonSummaryApp * param0) +void sub_020917B0(PokemonSummaryApp *param0) { Camera_Delete(param0->monSpriteData.camera); sub_02016114(param0->monSpriteData.animationSys, 0); @@ -174,10 +175,10 @@ void sub_020917B0 (PokemonSummaryApp * param0) sub_02007B6C(param0->monSpriteData.spriteManager); } -void sub_020917E0 (PokemonSummaryApp * param0) +void sub_020917E0(PokemonSummaryApp *param0) { - VecFx32 v0 = {0, 0, 0x10000}; - CameraAngle v1 = {0, 0, 0}; + VecFx32 v0 = { 0, 0, 0x10000 }; + CameraAngle v1 = { 0, 0, 0 }; fx32 v2 = 0x10000; u16 v3 = 0x5c1; @@ -189,7 +190,7 @@ void sub_020917E0 (PokemonSummaryApp * param0) Camera_SetAsActive(param0->monSpriteData.camera); } -static void sub_02091850 (UnkStruct_02091850 * param0) +static void sub_02091850(UnkStruct_02091850 *param0) { G3_PolygonAttr(GX_LIGHTMASK_NONE, GX_POLYGONMODE_MODULATE, GX_CULL_NONE, 18, 20, 0); G3_Begin(GX_BEGIN_QUADS); @@ -212,14 +213,14 @@ static void sub_02091850 (UnkStruct_02091850 * param0) G3_End(); } -static void sub_020918CC (VecFx16 * param0, VecFx16 * param1) +static void sub_020918CC(VecFx16 *param0, VecFx16 *param1) { param0->x += param1->x; param0->y += param1->y; param0->z += param1->z; } -static void sub_020918EC (PokemonSummaryApp * param0) +static void sub_020918EC(PokemonSummaryApp *param0) { u32 v0; @@ -250,7 +251,7 @@ static void sub_020918EC (PokemonSummaryApp * param0) } } -void sub_020919E8 (PokemonSummaryApp * param0) +void sub_020919E8(PokemonSummaryApp *param0) { u32 v0; @@ -281,7 +282,7 @@ void sub_020919E8 (PokemonSummaryApp * param0) sub_02091D50(param0); } -static void sub_02091B78 (const UnkStruct_02091B78 * param0, VecFx16 * param1, u8 param2) +static void sub_02091B78(const UnkStruct_02091B78 *param0, VecFx16 *param1, u8 param2) { if (param2 == 0xff) { *param1 = param0->unk_00; @@ -294,14 +295,14 @@ static void sub_02091B78 (const UnkStruct_02091B78 * param0, VecFx16 * param1, u } } -static void sub_02091BD4 (VecFx16 * param0, VecFx16 * param1, VecFx16 * param2) +static void sub_02091BD4(VecFx16 *param0, VecFx16 *param1, VecFx16 *param2) { param2->x = FX_F32_TO_FX16(FX_FX16_TO_F32(param1->x - param0->x) / 4); param2->y = FX_F32_TO_FX16(FX_FX16_TO_F32(param1->y - param0->y) / 4); param2->z = FX_F32_TO_FX16(FX_FX16_TO_F32(param1->z - param0->z) / 4); } -void sub_02091D50 (PokemonSummaryApp * param0) +void sub_02091D50(PokemonSummaryApp *param0) { u32 v0; @@ -335,10 +336,10 @@ void sub_02091D50 (PokemonSummaryApp * param0) param0->unk_410 = 0; } -void sub_02091F8C (PokemonSummaryApp * param0) +void sub_02091F8C(PokemonSummaryApp *param0) { ArchivedSprite v0; - void * v1; + void *v1; param0->monSpriteData.spriteManager = sub_0200762C(19); @@ -358,7 +359,7 @@ void sub_02091F8C (PokemonSummaryApp * param0) sub_02007DEC(param0->monSpriteData.sprite, 35, param0->monSpriteData.flip); } -void sub_02092028 (PokemonSummaryApp * param0) +void sub_02092028(PokemonSummaryApp *param0) { if (param0->monData.isEgg != 0) { PokeSprite_LoadAnimation(param0->narcPlPokeData, param0->monSpriteData.animationSys, param0->monSpriteData.sprite, 0, 2, param0->monSpriteData.flip, 0); @@ -368,7 +369,7 @@ void sub_02092028 (PokemonSummaryApp * param0) } } -void sub_02092098 (PokemonSummaryApp * param0) +void sub_02092098(PokemonSummaryApp *param0) { sub_02016114(param0->monSpriteData.animationSys, 0); sub_02007B6C(param0->monSpriteData.spriteManager); diff --git a/src/unk_020920C0.c b/src/unk_020920C0.c index b86ecc950f..78e186aaca 100644 --- a/src/unk_020920C0.c +++ b/src/unk_020920C0.c @@ -1,15 +1,15 @@ +#include "unk_020920C0.h" + #include #include -#include "core_sys.h" - -#include "touch_screen.h" #include "struct_defs/pokemon_summary_app.h" +#include "core_sys.h" +#include "touch_screen.h" #include "unk_02005474.h" #include "unk_02018340.h" #include "unk_0208EA44.h" -#include "unk_020920C0.h" typedef struct { u8 unk_00; @@ -18,76 +18,76 @@ typedef struct { u8 unk_03; } UnkStruct_020F5164; -static void sub_0223D0BC(PokemonSummaryApp * param0); -static int sub_020921FC(PokemonSummaryApp * param0); +static void sub_0223D0BC(PokemonSummaryApp *param0); +static int sub_020921FC(PokemonSummaryApp *param0); static const UnkStruct_020F5164 Unk_020F5164[] = { - {0x0, 0x1, 0x1, 0x4}, - {0x1, 0x1, 0x2, 0xA}, - {0x2, 0x2, 0x5, 0xF}, - {0x3, 0x3, 0xA, 0x12}, - {0x4, 0x2, 0x11, 0x12}, - {0x5, 0x3, 0x16, 0xF}, - {0x6, 0x4, 0x19, 0xA}, - {0x7, 0x4, 0x1A, 0x4}, - {0xFF, 0xFF, 0xFF, 0xFF} + { 0x0, 0x1, 0x1, 0x4 }, + { 0x1, 0x1, 0x2, 0xA }, + { 0x2, 0x2, 0x5, 0xF }, + { 0x3, 0x3, 0xA, 0x12 }, + { 0x4, 0x2, 0x11, 0x12 }, + { 0x5, 0x3, 0x16, 0xF }, + { 0x6, 0x4, 0x19, 0xA }, + { 0x7, 0x4, 0x1A, 0x4 }, + { 0xFF, 0xFF, 0xFF, 0xFF } }; static const UnkStruct_020F5164 Unk_020F514C[] = { - {0x0, 0x1, 0x2, 0x9}, - {0x1, 0x1, 0x6, 0xF}, - {0x2, 0x2, 0xE, 0x12}, - {0x3, 0x3, 0x16, 0xF}, - {0x7, 0x4, 0x1A, 0x9}, - {0xFF, 0xFF, 0xFF, 0xFF} + { 0x0, 0x1, 0x2, 0x9 }, + { 0x1, 0x1, 0x6, 0xF }, + { 0x2, 0x2, 0xE, 0x12 }, + { 0x3, 0x3, 0x16, 0xF }, + { 0x7, 0x4, 0x1A, 0x9 }, + { 0xFF, 0xFF, 0xFF, 0xFF } }; static const UnkStruct_020F5164 Unk_020F5128[] = { - {0x3, 0x3, 0xA, 0x12}, - {0x5, 0x3, 0x11, 0x12}, - {0xFF, 0xFF, 0xFF, 0xFF} + { 0x3, 0x3, 0xA, 0x12 }, + { 0x5, 0x3, 0x11, 0x12 }, + { 0xFF, 0xFF, 0xFF, 0xFF } }; -static const UnkStruct_020F5164 * Unk_02100D84[] = { +static const UnkStruct_020F5164 *Unk_02100D84[] = { Unk_020F5164, Unk_020F514C, Unk_020F5128 }; static const TouchScreenRect Unk_020F5188[] = { - {0x20, 0x47, 0x8, 0x2F}, - {0x50, 0x77, 0x10, 0x37}, - {0x78, 0x9F, 0x28, 0x4F}, - {0x90, 0xB7, 0x50, 0x77}, - {0x90, 0xB7, 0x88, 0xAF}, - {0x78, 0x9F, 0xB0, 0xD7}, - {0x50, 0x77, 0xC8, 0xEF}, - {0x20, 0x47, 0xD0, 0xF7}, - {0xFF, 0x0, 0x0, 0x0} + { 0x20, 0x47, 0x8, 0x2F }, + { 0x50, 0x77, 0x10, 0x37 }, + { 0x78, 0x9F, 0x28, 0x4F }, + { 0x90, 0xB7, 0x50, 0x77 }, + { 0x90, 0xB7, 0x88, 0xAF }, + { 0x78, 0x9F, 0xB0, 0xD7 }, + { 0x50, 0x77, 0xC8, 0xEF }, + { 0x20, 0x47, 0xD0, 0xF7 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_020F5134[] = { - {0x48, 0x6F, 0xC, 0x33}, - {0x78, 0x9F, 0x2C, 0x53}, - {0x90, 0xB7, 0x6C, 0x93}, - {0x78, 0x9F, 0xAC, 0xD3}, - {0x48, 0x6F, 0xCC, 0xF3}, - {0xFF, 0x0, 0x0, 0x0} + { 0x48, 0x6F, 0xC, 0x33 }, + { 0x78, 0x9F, 0x2C, 0x53 }, + { 0x90, 0xB7, 0x6C, 0x93 }, + { 0x78, 0x9F, 0xAC, 0xD3 }, + { 0x48, 0x6F, 0xCC, 0xF3 }, + { 0xFF, 0x0, 0x0, 0x0 } }; static const TouchScreenRect Unk_020F511C[] = { - {0x90, 0xB7, 0x50, 0x77}, - {0x90, 0xB7, 0x88, 0xAF}, - {0xFF, 0x0, 0x0, 0x0} + { 0x90, 0xB7, 0x50, 0x77 }, + { 0x90, 0xB7, 0x88, 0xAF }, + { 0xFF, 0x0, 0x0, 0x0 } }; -static const TouchScreenRect * Unk_02100D78[] = { +static const TouchScreenRect *Unk_02100D78[] = { Unk_020F5188, Unk_020F5134, Unk_020F511C }; -void sub_020920C0 (PokemonSummaryApp * param0) +void sub_020920C0(PokemonSummaryApp *param0) { switch (param0->data->mode) { case 0: @@ -108,9 +108,9 @@ void sub_020920C0 (PokemonSummaryApp * param0) sub_0209219C(param0); } -static void sub_0209212C (PokemonSummaryApp * param0, const UnkStruct_020F5164 * param1, u8 param2) +static void sub_0209212C(PokemonSummaryApp *param0, const UnkStruct_020F5164 *param1, u8 param2) { - u16 * v0; + u16 *v0; u16 v1; u8 v2; u8 v3, v4; @@ -125,9 +125,9 @@ static void sub_0209212C (PokemonSummaryApp * param0, const UnkStruct_020F5164 * } } -void sub_0209219C (PokemonSummaryApp * param0) +void sub_0209219C(PokemonSummaryApp *param0) { - const UnkStruct_020F5164 * v0; + const UnkStruct_020F5164 *v0; u8 v1; if (param0->subscreenType == 0xf) { @@ -149,7 +149,7 @@ void sub_0209219C (PokemonSummaryApp * param0) sub_0201C3C0(param0->bgl, 4); } -u8 sub_020921E4 (PokemonSummaryApp * param0) +u8 sub_020921E4(PokemonSummaryApp *param0) { int v0; @@ -162,7 +162,7 @@ u8 sub_020921E4 (PokemonSummaryApp * param0) return 0xff; } -static int sub_020921FC (PokemonSummaryApp * param0) +static int sub_020921FC(PokemonSummaryApp *param0) { int v0; @@ -175,7 +175,7 @@ static int sub_020921FC (PokemonSummaryApp * param0) return v0; } -static int sub_02092224 (PokemonSummaryApp * param0) +static int sub_02092224(PokemonSummaryApp *param0) { int v0; @@ -196,9 +196,9 @@ static int sub_02092224 (PokemonSummaryApp * param0) return v0; } -u8 sub_0209228C (PokemonSummaryApp * param0) +u8 sub_0209228C(PokemonSummaryApp *param0) { - const UnkStruct_020F5164 * v0 = Unk_02100D84[param0->subscreenType]; + const UnkStruct_020F5164 *v0 = Unk_02100D84[param0->subscreenType]; switch (param0->buttonState) { case 0: @@ -238,16 +238,16 @@ u8 sub_0209228C (PokemonSummaryApp * param0) return 0; } -void sub_02092368 (PokemonSummaryApp * param0, s16 * param1, s16 * param2) +void sub_02092368(PokemonSummaryApp *param0, s16 *param1, s16 *param2) { - const UnkStruct_020F5164 * v0 = Unk_02100D84[param0->subscreenType]; + const UnkStruct_020F5164 *v0 = Unk_02100D84[param0->subscreenType]; *param1 = v0[param0->buttonPos].unk_02 * 8 + (5 * 8) / 2; *param2 = v0[param0->buttonPos].unk_03 * 8 + (5 * 8) / 2; } -u8 sub_020923A4 (PokemonSummaryApp * param0, u8 param1) +u8 sub_020923A4(PokemonSummaryApp *param0, u8 param1) { - const UnkStruct_020F5164 * v0 = Unk_02100D84[param0->subscreenType]; + const UnkStruct_020F5164 *v0 = Unk_02100D84[param0->subscreenType]; return v0[param1].unk_00; } diff --git a/src/unk_020923C0.c b/src/unk_020923C0.c index 3ea532bc52..7cda1273bb 100644 --- a/src/unk_020923C0.c +++ b/src/unk_020923C0.c @@ -1,8 +1,8 @@ +#include "unk_020923C0.h" + #include #include -#include "unk_020923C0.h" - typedef struct { u32 unk_00; u16 unk_04; @@ -12,89 +12,89 @@ typedef struct { } UnkStruct_020F51AC; static const UnkStruct_020F51AC Unk_020F51AC[] = { - {0x62, 0x48, 0x0, 0x0, 0x50}, - {0x4E, 0x49, 0x0, 0x1, 0x51}, - {0x4F, 0x4A, 0x0, 0x2, 0x52}, - {0x50, 0x4B, 0x0, 0x3, 0x53}, - {0x51, 0x4C, 0x0, 0x4, 0x54}, - {0x52, 0x49, 0x1, 0x5, 0x55}, - {0x53, 0x4A, 0x1, 0x6, 0x56}, - {0x54, 0x4B, 0x1, 0x7, 0x57}, - {0x55, 0x4C, 0x1, 0x8, 0x58}, - {0x56, 0x49, 0x2, 0x9, 0x59}, - {0x57, 0x4A, 0x2, 0xA, 0x5A}, - {0x58, 0x4B, 0x2, 0xB, 0x5B}, - {0x59, 0x4C, 0x2, 0xC, 0x5C}, - {0x5A, 0x49, 0x3, 0xD, 0x5D}, - {0x5B, 0x4A, 0x3, 0xE, 0x5E}, - {0x5C, 0x4B, 0x3, 0xF, 0x5F}, - {0x5D, 0x4C, 0x3, 0x10, 0x60}, - {0x5E, 0x49, 0x4, 0x11, 0x61}, - {0x5F, 0x4A, 0x4, 0x12, 0x62}, - {0x60, 0x4B, 0x4, 0x13, 0x63}, - {0x61, 0x4C, 0x4, 0x14, 0x64}, - {0x63, 0x4E, 0x0, 0x15, 0x65}, - {0x64, 0x4D, 0x0, 0x16, 0x66}, - {0x65, 0x4F, 0x1, 0x17, 0x67}, - {0x66, 0x50, 0x2, 0x18, 0x68}, - {0x67, 0x51, 0x1, 0x19, 0x8000}, - {0x68, 0x51, 0x3, 0x1A, 0x8001}, - {0x69, 0x51, 0x4, 0x1B, 0x8002}, - {0x6A, 0x52, 0x3, 0x1C, 0xB2}, - {0x6B, 0x52, 0x4, 0x1D, 0xBE}, - {0x6C, 0x53, 0x0, 0x1E, 0xBF}, - {0x6D, 0x53, 0x1, 0x1F, 0xB2}, - {0x19, 0x58, 0x0, 0x20, 0x69}, - {0x7B, 0x59, 0x0, 0x21, 0x6A}, - {0x7C, 0x5A, 0x0, 0x22, 0x6B}, - {0x7D, 0x5B, 0x0, 0x23, 0x6C}, - {0x7E, 0x5C, 0x0, 0x24, 0x6D}, - {0x7F, 0x59, 0x1, 0x25, 0x6E}, - {0x80, 0x5A, 0x1, 0x26, 0x6F}, - {0x81, 0x5B, 0x1, 0x27, 0x70}, - {0x82, 0x5C, 0x1, 0x28, 0x71}, - {0x83, 0x59, 0x2, 0x29, 0x72}, - {0x84, 0x5A, 0x2, 0x2A, 0x73}, - {0x85, 0x5B, 0x2, 0x2B, 0x74}, - {0x86, 0x5C, 0x2, 0x2C, 0x75}, - {0x87, 0x59, 0x3, 0x2D, 0x76}, - {0x88, 0x5A, 0x3, 0x2E, 0x77}, - {0x89, 0x5B, 0x3, 0x2F, 0x78}, - {0x8A, 0x5C, 0x3, 0x30, 0x79}, - {0x8B, 0x59, 0x4, 0x31, 0x7A}, - {0x8C, 0x5A, 0x4, 0x32, 0x7B}, - {0x8D, 0x5B, 0x4, 0x33, 0x7C}, - {0x8E, 0x5C, 0x4, 0x34, 0x7D}, - {0x1A, 0x5D, 0x0, 0x35, 0x7E}, - {0x1B, 0x5E, 0x0, 0x36, 0x7F}, - {0x1C, 0x5F, 0x0, 0x37, 0x80}, - {0x1D, 0x60, 0x0, 0x38, 0x81}, - {0x1E, 0x61, 0x0, 0x39, 0x82}, - {0x1F, 0x62, 0x0, 0x3A, 0x83}, - {0x20, 0x63, 0x2, 0x3B, 0x84}, - {0x21, 0x64, 0x0, 0x3C, 0x85}, - {0x22, 0x65, 0x1, 0x3D, 0x86}, - {0x23, 0x66, 0x2, 0x3E, 0x87}, - {0x24, 0x67, 0x3, 0x3F, 0x88}, - {0x25, 0x68, 0x0, 0x40, 0x89}, - {0x26, 0x69, 0x2, 0x41, 0x8A}, - {0x27, 0x6A, 0x1, 0x42, 0x8B}, - {0x28, 0x6B, 0x3, 0x43, 0x8C}, - {0x29, 0x6C, 0x0, 0x44, 0x8D}, - {0x2A, 0x6D, 0x0, 0x45, 0x8E}, - {0x2B, 0x6E, 0x1, 0x46, 0x8F}, - {0x2C, 0x6F, 0x3, 0x47, 0x90}, - {0x2D, 0x70, 0x0, 0x48, 0x91}, - {0x2E, 0x71, 0x0, 0x49, 0x8007}, - {0x2F, 0x72, 0x3, 0x4A, 0x8008}, - {0x30, 0x73, 0x1, 0x4B, 0x8009}, - {0x31, 0x74, 0x1, 0x4C, 0x800A}, - {0x32, 0x75, 0x0, 0x4D, 0x800B}, - {0x33, 0x76, 0x1, 0x4E, 0x800C}, - {0x34, 0x77, 0x0, 0x4F, 0x800D} + { 0x62, 0x48, 0x0, 0x0, 0x50 }, + { 0x4E, 0x49, 0x0, 0x1, 0x51 }, + { 0x4F, 0x4A, 0x0, 0x2, 0x52 }, + { 0x50, 0x4B, 0x0, 0x3, 0x53 }, + { 0x51, 0x4C, 0x0, 0x4, 0x54 }, + { 0x52, 0x49, 0x1, 0x5, 0x55 }, + { 0x53, 0x4A, 0x1, 0x6, 0x56 }, + { 0x54, 0x4B, 0x1, 0x7, 0x57 }, + { 0x55, 0x4C, 0x1, 0x8, 0x58 }, + { 0x56, 0x49, 0x2, 0x9, 0x59 }, + { 0x57, 0x4A, 0x2, 0xA, 0x5A }, + { 0x58, 0x4B, 0x2, 0xB, 0x5B }, + { 0x59, 0x4C, 0x2, 0xC, 0x5C }, + { 0x5A, 0x49, 0x3, 0xD, 0x5D }, + { 0x5B, 0x4A, 0x3, 0xE, 0x5E }, + { 0x5C, 0x4B, 0x3, 0xF, 0x5F }, + { 0x5D, 0x4C, 0x3, 0x10, 0x60 }, + { 0x5E, 0x49, 0x4, 0x11, 0x61 }, + { 0x5F, 0x4A, 0x4, 0x12, 0x62 }, + { 0x60, 0x4B, 0x4, 0x13, 0x63 }, + { 0x61, 0x4C, 0x4, 0x14, 0x64 }, + { 0x63, 0x4E, 0x0, 0x15, 0x65 }, + { 0x64, 0x4D, 0x0, 0x16, 0x66 }, + { 0x65, 0x4F, 0x1, 0x17, 0x67 }, + { 0x66, 0x50, 0x2, 0x18, 0x68 }, + { 0x67, 0x51, 0x1, 0x19, 0x8000 }, + { 0x68, 0x51, 0x3, 0x1A, 0x8001 }, + { 0x69, 0x51, 0x4, 0x1B, 0x8002 }, + { 0x6A, 0x52, 0x3, 0x1C, 0xB2 }, + { 0x6B, 0x52, 0x4, 0x1D, 0xBE }, + { 0x6C, 0x53, 0x0, 0x1E, 0xBF }, + { 0x6D, 0x53, 0x1, 0x1F, 0xB2 }, + { 0x19, 0x58, 0x0, 0x20, 0x69 }, + { 0x7B, 0x59, 0x0, 0x21, 0x6A }, + { 0x7C, 0x5A, 0x0, 0x22, 0x6B }, + { 0x7D, 0x5B, 0x0, 0x23, 0x6C }, + { 0x7E, 0x5C, 0x0, 0x24, 0x6D }, + { 0x7F, 0x59, 0x1, 0x25, 0x6E }, + { 0x80, 0x5A, 0x1, 0x26, 0x6F }, + { 0x81, 0x5B, 0x1, 0x27, 0x70 }, + { 0x82, 0x5C, 0x1, 0x28, 0x71 }, + { 0x83, 0x59, 0x2, 0x29, 0x72 }, + { 0x84, 0x5A, 0x2, 0x2A, 0x73 }, + { 0x85, 0x5B, 0x2, 0x2B, 0x74 }, + { 0x86, 0x5C, 0x2, 0x2C, 0x75 }, + { 0x87, 0x59, 0x3, 0x2D, 0x76 }, + { 0x88, 0x5A, 0x3, 0x2E, 0x77 }, + { 0x89, 0x5B, 0x3, 0x2F, 0x78 }, + { 0x8A, 0x5C, 0x3, 0x30, 0x79 }, + { 0x8B, 0x59, 0x4, 0x31, 0x7A }, + { 0x8C, 0x5A, 0x4, 0x32, 0x7B }, + { 0x8D, 0x5B, 0x4, 0x33, 0x7C }, + { 0x8E, 0x5C, 0x4, 0x34, 0x7D }, + { 0x1A, 0x5D, 0x0, 0x35, 0x7E }, + { 0x1B, 0x5E, 0x0, 0x36, 0x7F }, + { 0x1C, 0x5F, 0x0, 0x37, 0x80 }, + { 0x1D, 0x60, 0x0, 0x38, 0x81 }, + { 0x1E, 0x61, 0x0, 0x39, 0x82 }, + { 0x1F, 0x62, 0x0, 0x3A, 0x83 }, + { 0x20, 0x63, 0x2, 0x3B, 0x84 }, + { 0x21, 0x64, 0x0, 0x3C, 0x85 }, + { 0x22, 0x65, 0x1, 0x3D, 0x86 }, + { 0x23, 0x66, 0x2, 0x3E, 0x87 }, + { 0x24, 0x67, 0x3, 0x3F, 0x88 }, + { 0x25, 0x68, 0x0, 0x40, 0x89 }, + { 0x26, 0x69, 0x2, 0x41, 0x8A }, + { 0x27, 0x6A, 0x1, 0x42, 0x8B }, + { 0x28, 0x6B, 0x3, 0x43, 0x8C }, + { 0x29, 0x6C, 0x0, 0x44, 0x8D }, + { 0x2A, 0x6D, 0x0, 0x45, 0x8E }, + { 0x2B, 0x6E, 0x1, 0x46, 0x8F }, + { 0x2C, 0x6F, 0x3, 0x47, 0x90 }, + { 0x2D, 0x70, 0x0, 0x48, 0x91 }, + { 0x2E, 0x71, 0x0, 0x49, 0x8007 }, + { 0x2F, 0x72, 0x3, 0x4A, 0x8008 }, + { 0x30, 0x73, 0x1, 0x4B, 0x8009 }, + { 0x31, 0x74, 0x1, 0x4C, 0x800A }, + { 0x32, 0x75, 0x0, 0x4D, 0x800B }, + { 0x33, 0x76, 0x1, 0x4E, 0x800C }, + { 0x34, 0x77, 0x0, 0x4F, 0x800D } }; -u32 sub_020923C0 (u8 param0, u8 param1) +u32 sub_020923C0(u8 param0, u8 param1) { switch (param1) { case 0: @@ -112,7 +112,7 @@ u32 sub_020923C0 (u8 param0, u8 param1) return 0; } -u32 sub_02092424 (u8 * param0, u8 param1) +u32 sub_02092424(u8 *param0, u8 param1) { if (Unk_020F51AC[param1].unk_0A & 0x8000) { return 146 + param0[Unk_020F51AC[param1].unk_0A & 0xff]; @@ -121,7 +121,7 @@ u32 sub_02092424 (u8 * param0, u8 param1) return Unk_020F51AC[param1].unk_0A; } -u8 sub_02092444 (u8 param0) +u8 sub_02092444(u8 param0) { if (Unk_020F51AC[param0].unk_0A & 0x8000) { return Unk_020F51AC[param0].unk_0A & 0xff; @@ -130,7 +130,7 @@ u8 sub_02092444 (u8 param0) return 0xff; } -u16 sub_02092464 (u32 param0) +u16 sub_02092464(u32 param0) { int v0; diff --git a/src/unk_02092494.c b/src/unk_02092494.c index 035a6aaf21..1344937e35 100644 --- a/src/unk_02092494.c +++ b/src/unk_02092494.c @@ -1,35 +1,36 @@ +#include "unk_02092494.h" + #include #include #include "struct_defs/struct_02090800.h" +#include "heap.h" #include "message.h" -#include "string_template.h" +#include "pokemon.h" #include "rtc.h" -#include "unk_02017038.h" -#include "heap.h" #include "strbuf.h" +#include "string_template.h" #include "trainer_info.h" -#include "pokemon.h" -#include "unk_02092494.h" +#include "unk_02017038.h" -static int DeterminePokemonStatus(Pokemon * param0, BOOL param1, int param2); -static void InitializeNatureRelatedStrBuf(PokemonInfoDisplayStruct * param0); -static void InitializePokemonMetInfoStrBuf(PokemonInfoDisplayStruct * param0, int param1); -static void InitializeAlternateMetInfoStrBuf(PokemonInfoDisplayStruct * param0, int param1); -static void InitializeSpecialMetInfoStrBuf(PokemonInfoDisplayStruct * param0, int param1, int param2); -static void InitializeIVsStrBuf(PokemonInfoDisplayStruct * param0); -static void InitializeFlavorAffinityStrBuf(PokemonInfoDisplayStruct * param0); -static void InitializeFriendshipLevelStrBuf(PokemonInfoDisplayStruct * param0); -static void AssignTrainerInfoToBoxPokemon(BoxPokemon * param0, TrainerInfo * param1, int param2); -static void SetMetLocationForBoxPokemon(BoxPokemon * param0, int param1, int param2); -static void ResetBoxPokemonEggStatus(BoxPokemon * param0, int param1); -static void FinalizeBoxPokemonData(BoxPokemon * param0); -static void UpdateBoxPokemonAfterCheck(BoxPokemon * param0); - -PokemonInfoDisplayStruct * sub_02092494 (Pokemon * param0, BOOL param1, int param2) +static int DeterminePokemonStatus(Pokemon *param0, BOOL param1, int param2); +static void InitializeNatureRelatedStrBuf(PokemonInfoDisplayStruct *param0); +static void InitializePokemonMetInfoStrBuf(PokemonInfoDisplayStruct *param0, int param1); +static void InitializeAlternateMetInfoStrBuf(PokemonInfoDisplayStruct *param0, int param1); +static void InitializeSpecialMetInfoStrBuf(PokemonInfoDisplayStruct *param0, int param1, int param2); +static void InitializeIVsStrBuf(PokemonInfoDisplayStruct *param0); +static void InitializeFlavorAffinityStrBuf(PokemonInfoDisplayStruct *param0); +static void InitializeFriendshipLevelStrBuf(PokemonInfoDisplayStruct *param0); +static void AssignTrainerInfoToBoxPokemon(BoxPokemon *param0, TrainerInfo *param1, int param2); +static void SetMetLocationForBoxPokemon(BoxPokemon *param0, int param1, int param2); +static void ResetBoxPokemonEggStatus(BoxPokemon *param0, int param1); +static void FinalizeBoxPokemonData(BoxPokemon *param0); +static void UpdateBoxPokemonAfterCheck(BoxPokemon *param0); + +PokemonInfoDisplayStruct *sub_02092494(Pokemon *param0, BOOL param1, int param2) { - PokemonInfoDisplayStruct * v0; + PokemonInfoDisplayStruct *v0; v0 = Heap_AllocFromHeap(param2, sizeof(PokemonInfoDisplayStruct)); v0->unk_00 = param2; @@ -286,7 +287,7 @@ PokemonInfoDisplayStruct * sub_02092494 (Pokemon * param0, BOOL param1, int para return v0; } -void sub_0209282C (PokemonInfoDisplayStruct * param0) +void sub_0209282C(PokemonInfoDisplayStruct *param0) { if (param0->unk_14.unk_04 != NULL) { Heap_FreeToHeap(param0->unk_14.unk_04); @@ -313,7 +314,7 @@ void sub_0209282C (PokemonInfoDisplayStruct * param0) Heap_FreeToHeap(param0); } -static void InitializeNatureRelatedStrBuf (PokemonInfoDisplayStruct * param0) +static void InitializeNatureRelatedStrBuf(PokemonInfoDisplayStruct *param0) { int v0 = Pokemon_GetNature(param0->unk_0C); @@ -325,9 +326,9 @@ static void InitializeNatureRelatedStrBuf (PokemonInfoDisplayStruct * param0) MessageLoader_GetStrbuf(param0->unk_04, (24 + v0), param0->unk_14.unk_04); } -static void InitializePokemonMetInfoStrBuf (PokemonInfoDisplayStruct * param0, int param1) +static void InitializePokemonMetInfoStrBuf(PokemonInfoDisplayStruct *param0, int param1) { - Strbuf* v0 = Strbuf_Init((((2 * 18) * 2) * 8), param0->unk_00); + Strbuf *v0 = Strbuf_Init((((2 * 18) * 2) * 8), param0->unk_00); param0->unk_1C.unk_04 = Strbuf_Init((((2 * 18) * 2) * 8), param0->unk_00); @@ -345,9 +346,9 @@ static void InitializePokemonMetInfoStrBuf (PokemonInfoDisplayStruct * param0, i Strbuf_Free(v0); } -static void InitializeAlternateMetInfoStrBuf (PokemonInfoDisplayStruct * param0, int param1) +static void InitializeAlternateMetInfoStrBuf(PokemonInfoDisplayStruct *param0, int param1) { - Strbuf* v0 = Strbuf_Init((((2 * 18) * 2) * 4), param0->unk_00); + Strbuf *v0 = Strbuf_Init((((2 * 18) * 2) * 4), param0->unk_00); param0->unk_1C.unk_04 = Strbuf_Init((((2 * 18) * 2) * 4), param0->unk_00); @@ -388,9 +389,9 @@ static void InitializeAlternateMetInfoStrBuf (PokemonInfoDisplayStruct * param0, Strbuf_Free(v0); } -static void InitializeSpecialMetInfoStrBuf (PokemonInfoDisplayStruct * param0, int param1, int param2) +static void InitializeSpecialMetInfoStrBuf(PokemonInfoDisplayStruct *param0, int param1, int param2) { - Strbuf* v0 = Strbuf_Init((((2 * 18) * 2) * 5), param0->unk_00); + Strbuf *v0 = Strbuf_Init((((2 * 18) * 2) * 5), param0->unk_00); param0->unk_1C.unk_04 = Strbuf_Init((((2 * 18) * 2) * 5), param0->unk_00); @@ -413,15 +414,15 @@ static void InitializeSpecialMetInfoStrBuf (PokemonInfoDisplayStruct * param0, i } static const u16 Unk_020F5578[6][5] = { - {0x47, 0x48, 0x49, 0x4A, 0x4B}, - {0x4C, 0x4D, 0x4E, 0x4F, 0x50}, - {0x51, 0x52, 0x53, 0x54, 0x55}, - {0x56, 0x57, 0x58, 0x59, 0x5A}, - {0x5B, 0x5C, 0x5D, 0x5E, 0x5F}, - {0x60, 0x61, 0x62, 0x63, 0x64} + { 0x47, 0x48, 0x49, 0x4A, 0x4B }, + { 0x4C, 0x4D, 0x4E, 0x4F, 0x50 }, + { 0x51, 0x52, 0x53, 0x54, 0x55 }, + { 0x56, 0x57, 0x58, 0x59, 0x5A }, + { 0x5B, 0x5C, 0x5D, 0x5E, 0x5F }, + { 0x60, 0x61, 0x62, 0x63, 0x64 } }; -static void InitializeIVsStrBuf (PokemonInfoDisplayStruct * param0) +static void InitializeIVsStrBuf(PokemonInfoDisplayStruct *param0) { int v0[6], v1, v2; int v3, v4; @@ -435,30 +436,35 @@ static void InitializeIVsStrBuf (PokemonInfoDisplayStruct * param0) v0[4] = (Pokemon_GetValue(param0->unk_0C, MON_DATA_SPATK_IV, NULL)); v0[5] = (Pokemon_GetValue(param0->unk_0C, MON_DATA_SPDEF_IV, NULL)); - switch ((Pokemon_GetValue(param0->unk_0C, MON_DATA_PERSONALITY, NULL) % 6)) { + switch (Pokemon_GetValue(param0->unk_0C, MON_DATA_PERSONALITY, NULL) % 6) { default: case 0: v1 = 0; v2 = v0[0]; if (v2 < v0[1]) { - v1 = 1; v2 = v0[1]; + v1 = 1; + v2 = v0[1]; } if (v2 < v0[2]) { - v1 = 2; v2 = v0[2]; + v1 = 2; + v2 = v0[2]; } if (v2 < v0[3]) { - v1 = 3; v2 = v0[3]; + v1 = 3; + v2 = v0[3]; } if (v2 < v0[4]) { - v1 = 4; v2 = v0[4]; + v1 = 4; + v2 = v0[4]; } if (v2 < v0[5]) { - v1 = 5; v2 = v0[5]; + v1 = 5; + v2 = v0[5]; } break; case 1: @@ -466,23 +472,28 @@ static void InitializeIVsStrBuf (PokemonInfoDisplayStruct * param0) v2 = v0[1]; if (v2 < v0[2]) { - v1 = 2; v2 = v0[2]; + v1 = 2; + v2 = v0[2]; } if (v2 < v0[3]) { - v1 = 3; v2 = v0[3]; + v1 = 3; + v2 = v0[3]; } if (v2 < v0[4]) { - v1 = 4; v2 = v0[4]; + v1 = 4; + v2 = v0[4]; } if (v2 < v0[5]) { - v1 = 5; v2 = v0[5]; + v1 = 5; + v2 = v0[5]; } if (v2 < v0[0]) { - v1 = 0; v2 = v0[0]; + v1 = 0; + v2 = v0[0]; } break; case 2: @@ -490,23 +501,28 @@ static void InitializeIVsStrBuf (PokemonInfoDisplayStruct * param0) v2 = v0[2]; if (v2 < v0[3]) { - v1 = 3; v2 = v0[3]; + v1 = 3; + v2 = v0[3]; } if (v2 < v0[4]) { - v1 = 4; v2 = v0[4]; + v1 = 4; + v2 = v0[4]; } if (v2 < v0[5]) { - v1 = 5; v2 = v0[5]; + v1 = 5; + v2 = v0[5]; } if (v2 < v0[0]) { - v1 = 0; v2 = v0[0]; + v1 = 0; + v2 = v0[0]; } if (v2 < v0[1]) { - v1 = 1; v2 = v0[1]; + v1 = 1; + v2 = v0[1]; } break; case 3: @@ -514,23 +530,28 @@ static void InitializeIVsStrBuf (PokemonInfoDisplayStruct * param0) v2 = v0[3]; if (v2 < v0[4]) { - v1 = 4; v2 = v0[4]; + v1 = 4; + v2 = v0[4]; } if (v2 < v0[5]) { - v1 = 5; v2 = v0[5]; + v1 = 5; + v2 = v0[5]; } if (v2 < v0[0]) { - v1 = 0; v2 = v0[0]; + v1 = 0; + v2 = v0[0]; } if (v2 < v0[1]) { - v1 = 1; v2 = v0[1]; + v1 = 1; + v2 = v0[1]; } if (v2 < v0[2]) { - v1 = 2; v2 = v0[2]; + v1 = 2; + v2 = v0[2]; } break; case 4: @@ -538,23 +559,28 @@ static void InitializeIVsStrBuf (PokemonInfoDisplayStruct * param0) v2 = v0[4]; if (v2 < v0[5]) { - v1 = 5; v2 = v0[5]; + v1 = 5; + v2 = v0[5]; } if (v2 < v0[0]) { - v1 = 0; v2 = v0[0]; + v1 = 0; + v2 = v0[0]; } if (v2 < v0[1]) { - v1 = 1; v2 = v0[1]; + v1 = 1; + v2 = v0[1]; } if (v2 < v0[2]) { - v1 = 2; v2 = v0[2]; + v1 = 2; + v2 = v0[2]; } if (v2 < v0[3]) { - v1 = 3; v2 = v0[3]; + v1 = 3; + v2 = v0[3]; } break; case 5: @@ -562,23 +588,28 @@ static void InitializeIVsStrBuf (PokemonInfoDisplayStruct * param0) v2 = v0[5]; if (v2 < v0[0]) { - v1 = 0; v2 = v0[0]; + v1 = 0; + v2 = v0[0]; } if (v2 < v0[1]) { - v1 = 1; v2 = v0[1]; + v1 = 1; + v2 = v0[1]; } if (v2 < v0[2]) { - v1 = 2; v2 = v0[2]; + v1 = 2; + v2 = v0[2]; } if (v2 < v0[3]) { - v1 = 3; v2 = v0[3]; + v1 = 3; + v2 = v0[3]; } if (v2 < v0[4]) { - v1 = 4; v2 = v0[4]; + v1 = 4; + v2 = v0[4]; } break; } @@ -596,7 +627,7 @@ static const u16 Unk_020F556C[6] = { 0x45 }; -static void InitializeFlavorAffinityStrBuf (PokemonInfoDisplayStruct * param0) +static void InitializeFlavorAffinityStrBuf(PokemonInfoDisplayStruct *param0) { int v0, v1, v2; @@ -613,7 +644,7 @@ static void InitializeFlavorAffinityStrBuf (PokemonInfoDisplayStruct * param0) MessageLoader_GetStrbuf(param0->unk_04, v2, param0->unk_2C.unk_04); } -static void InitializeFriendshipLevelStrBuf (PokemonInfoDisplayStruct * param0) +static void InitializeFriendshipLevelStrBuf(PokemonInfoDisplayStruct *param0) { int v0 = Pokemon_GetValue(param0->unk_0C, MON_DATA_FRIENDSHIP, NULL); int v1; @@ -633,15 +664,15 @@ static void InitializeFriendshipLevelStrBuf (PokemonInfoDisplayStruct * param0) MessageLoader_GetStrbuf(param0->unk_04, v1, param0->unk_34.unk_04); } -static int DeterminePokemonStatus (Pokemon * param0, BOOL param1, int param2) +static int DeterminePokemonStatus(Pokemon *param0, BOOL param1, int param2) { int v0 = 0; if (Pokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) { - if ((Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == 0)) { + if (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == 0) { if (Pokemon_GetValue(param0, MON_DATA_HATCH_LOCATION, NULL) == (sub_02017070(0, 55))) { v0 = 15; - } else if ((Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1)) { + } else if (Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1) { if (param1 == 1) { v0 = 7; } else { @@ -657,7 +688,7 @@ static int DeterminePokemonStatus (Pokemon * param0, BOOL param1, int param2) } } } else { - if ((Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1)) { + if (Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1) { if (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == sub_02017070(1, 2)) { if (param1 == 1) { v0 = 13; @@ -695,7 +726,7 @@ static int DeterminePokemonStatus (Pokemon * param0, BOOL param1, int param2) } } else { if (param1 == 1) { - if ((Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1)) { + if (Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1) { if (Pokemon_GetValue(param0, MON_DATA_MET_LOCATION, NULL) == (sub_02017070(2, 1))) { v0 = 20; } else { @@ -705,7 +736,7 @@ static int DeterminePokemonStatus (Pokemon * param0, BOOL param1, int param2) v0 = 16; } } else { - if ((Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1)) { + if (Pokemon_GetValue(param0, MON_DATA_FATEFUL_ENCOUNTER, NULL) == 1) { v0 = 19; } else { v0 = 17; @@ -716,12 +747,12 @@ static int DeterminePokemonStatus (Pokemon * param0, BOOL param1, int param2) return v0; } -void sub_0209304C (Pokemon * param0, TrainerInfo * param1, int param2, int param3, int param4) +void sub_0209304C(Pokemon *param0, TrainerInfo *param1, int param2, int param3, int param4) { UpdateBoxMonStatusAndTrainerInfo(¶m0->box, param1, param2, param3, param4); } -void UpdateBoxMonStatusAndTrainerInfo (BoxPokemon * boxMon, TrainerInfo * trainerInfo, int sel, int metLocation, int heapID) +void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int sel, int metLocation, int heapID) { switch (sel) { case 0: @@ -819,12 +850,11 @@ void UpdateBoxMonStatusAndTrainerInfo (BoxPokemon * boxMon, TrainerInfo * traine } } - -static void AssignTrainerInfoToBoxPokemon (BoxPokemon * boxMon, TrainerInfo * trainerInfo, int heapID) +static void AssignTrainerInfoToBoxPokemon(BoxPokemon *boxMon, TrainerInfo *trainerInfo, int heapID) { int v0 = TrainerInfo_ID(trainerInfo); int v1 = TrainerInfo_Gender(trainerInfo); - Strbuf* v2 = TrainerInfo_NameNewStrbuf(trainerInfo, heapID); + Strbuf *v2 = TrainerInfo_NameNewStrbuf(trainerInfo, heapID); BoxPokemon_SetValue(boxMon, 7, &v0); BoxPokemon_SetValue(boxMon, 157, &v1); @@ -832,7 +862,7 @@ static void AssignTrainerInfoToBoxPokemon (BoxPokemon * boxMon, TrainerInfo * tr Strbuf_Free(v2); } -static void SetMetLocationForBoxPokemon (BoxPokemon * param0, int param1, int param2) +static void SetMetLocationForBoxPokemon(BoxPokemon *param0, int param1, int param2) { RTCDate v0; @@ -851,7 +881,7 @@ static void SetMetLocationForBoxPokemon (BoxPokemon * param0, int param1, int pa } } -static void ResetBoxPokemonEggStatus (BoxPokemon * param0, int param1) +static void ResetBoxPokemonEggStatus(BoxPokemon *param0, int param1) { int v0 = 0; @@ -868,13 +898,13 @@ static void ResetBoxPokemonEggStatus (BoxPokemon * param0, int param1) } } -static void FinalizeBoxPokemonData (BoxPokemon * param0) +static void FinalizeBoxPokemonData(BoxPokemon *param0) { int v0 = BoxPokemon_GetValue(param0, MON_DATA_LEVEL, NULL); BoxPokemon_SetValue(param0, 156, &v0); } -static void UpdateBoxPokemonAfterCheck (BoxPokemon * param0) +static void UpdateBoxPokemonAfterCheck(BoxPokemon *param0) { int v0 = 1; BoxPokemon_SetValue(param0, 110, &v0); diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index b0b125bbbc..fd5d72a40d 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -1,102 +1,98 @@ +#include "unk_020933F8.h" + #include #include -#include "assert.h" - -#include "sys_task_manager.h" -#include "struct_decls/struct_0202440C_decl.h" -#include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" +#include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_02029C88_decl.h" #include "struct_decls/struct_02029D04_decl.h" #include "struct_decls/struct_0202A750_decl.h" -#include "journal.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" -#include "savedata.h" - -#include "constdata/const_020F55EC.h" -#include "constdata/const_020F560C.h" -#include "constdata/const_020F561C.h" -#include "constdata/const_020F55DC.h" - -#include "field/field_system.h" #include "struct_defs/struct_02093800.h" #include "struct_defs/struct_02093BBC.h" #include "struct_defs/struct_02094A58.h" #include "struct_defs/struct_02095C48.h" + +#include "field/field_system.h" +#include "overlay006/ov6_022489E4.h" #include "overlay006/struct_ov6_02248DD8.h" +#include "overlay017/ov17_0223B140.h" +#include "overlay017/ov17_0223CB1C.h" +#include "overlay017/ov17_0223DAD0.h" +#include "overlay017/ov17_0224F4D4.h" +#include "overlay022/ov22_02255D44.h" +#include "savedata/save_table.h" -#include "unk_02005474.h" -#include "unk_0200A9DC.h" -#include "string_template.h" -#include "sys_task.h" -#include "rtc.h" +#include "assert.h" +#include "communication_information.h" +#include "communication_system.h" #include "heap.h" -#include "unk_0201D15C.h" +#include "journal.h" +#include "party.h" +#include "pokemon.h" +#include "rtc.h" +#include "savedata.h" #include "strbuf.h" -#include "savedata/save_table.h" +#include "string_template.h" +#include "sys_task.h" +#include "sys_task_manager.h" #include "trainer_info.h" +#include "unk_02005474.h" +#include "unk_0200A9DC.h" +#include "unk_0201D15C.h" #include "unk_0202631C.h" #include "unk_020298BC.h" -#include "journal.h" #include "unk_0202CC64.h" #include "unk_0202CD50.h" #include "unk_0202F108.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020363E8.h" -#include "vars_flags.h" #include "unk_020508D4.h" #include "unk_02055808.h" #include "unk_0206A8DC.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "party.h" #include "unk_020923C0.h" -#include "unk_020933F8.h" #include "unk_02094EDC.h" #include "unk_02095AF0.h" -#include "overlay006/ov6_022489E4.h" -#include "overlay017/ov17_0223B140.h" -#include "overlay017/ov17_0223CB1C.h" -#include "overlay017/ov17_0223DAD0.h" -#include "overlay017/ov17_0224F4D4.h" -#include "overlay022/ov22_02255D44.h" +#include "vars_flags.h" + +#include "constdata/const_020F55DC.h" +#include "constdata/const_020F55EC.h" +#include "constdata/const_020F560C.h" +#include "constdata/const_020F561C.h" FS_EXTERN_OVERLAY(overlay17); FS_EXTERN_OVERLAY(overlay22); typedef struct { - UnkStruct_02095C48 * unk_00; + UnkStruct_02095C48 *unk_00; int unk_04; } UnkStruct_020933F8; -static UnkStruct_02095C48 * sub_020937C4(void); -static void sub_020937F8(UnkStruct_02095C48 * param0); -static void sub_02094E7C(UnkStruct_02095C48 * param0); -u16 sub_02094E98(UnkStruct_02095C48 * param0); -BOOL sub_020943B0(UnkStruct_02095C48 * param0); -BOOL sub_020944CC(UnkStruct_02095C48 * param0); -BOOL sub_020944D4(UnkStruct_02095C48 * param0); -static void sub_02093C6C(SysTask * param0, void * param1); -UnkStruct_02095C48 * sub_02093800(const UnkStruct_02093800 * param0); -void sub_02093AD4(UnkStruct_02095C48 * param0); -void sub_02094630(UnkStruct_02095C48 * param0, int param1, StringTemplate * param2, u32 param3); -void sub_02094648(UnkStruct_02095C48 * param0, int param1, StringTemplate * param2, u32 param3); -void sub_02094680(UnkStruct_02095C48 * param0, int param1, StringTemplate * param2, u32 param3); -static BOOL sub_02093448(TaskManager * param0); -static BOOL sub_020935EC(TaskManager * param0); -void sub_02093BBC(UnkStruct_02095C48 * param0); -void sub_02093C54(UnkStruct_02095C48 * param0); -static void sub_020944E8(UnkStruct_02095C48 * param0); -static void sub_0209451C(SysTask * param0, void * param1); -static void sub_02094EB4(UnkStruct_02095C48 * param0, int param1, UnkStruct_ov6_02248DD8 * param2); -static void sub_02094B30(SysTask * param0, void * param1); -static int sub_02093B2C(Pokemon * param0, int param1); -static void sub_020939E0(UnkStruct_02095C48 * param0, int param1, int param2); - +static UnkStruct_02095C48 *sub_020937C4(void); +static void sub_020937F8(UnkStruct_02095C48 *param0); +static void sub_02094E7C(UnkStruct_02095C48 *param0); +u16 sub_02094E98(UnkStruct_02095C48 *param0); +BOOL sub_020943B0(UnkStruct_02095C48 *param0); +BOOL sub_020944CC(UnkStruct_02095C48 *param0); +BOOL sub_020944D4(UnkStruct_02095C48 *param0); +static void sub_02093C6C(SysTask *param0, void *param1); +UnkStruct_02095C48 *sub_02093800(const UnkStruct_02093800 *param0); +void sub_02093AD4(UnkStruct_02095C48 *param0); +void sub_02094630(UnkStruct_02095C48 *param0, int param1, StringTemplate *param2, u32 param3); +void sub_02094648(UnkStruct_02095C48 *param0, int param1, StringTemplate *param2, u32 param3); +void sub_02094680(UnkStruct_02095C48 *param0, int param1, StringTemplate *param2, u32 param3); +static BOOL sub_02093448(TaskManager *param0); +static BOOL sub_020935EC(TaskManager *param0); +void sub_02093BBC(UnkStruct_02095C48 *param0); +void sub_02093C54(UnkStruct_02095C48 *param0); +static void sub_020944E8(UnkStruct_02095C48 *param0); +static void sub_0209451C(SysTask *param0, void *param1); +static void sub_02094EB4(UnkStruct_02095C48 *param0, int param1, UnkStruct_ov6_02248DD8 *param2); +static void sub_02094B30(SysTask *param0, void *param1); +static int sub_02093B2C(Pokemon *param0, int param1); +static void sub_020939E0(UnkStruct_02095C48 *param0, int param1, int param2); const OverlayManagerTemplate Unk_020F560C = { ov17_0223B140, @@ -134,28 +130,28 @@ const OverlayManagerTemplate Unk_020F55FC = { }; __attribute__((aligned(4))) static const u8 Unk_020F55B4[][3] = { - {0x14, 0x14, 0xFF}, - {0xF, 0x19, 0xFF} + { 0x14, 0x14, 0xFF }, + { 0xF, 0x19, 0xFF } }; __attribute__((aligned(4))) static const u8 Unk_020F55BC[][4] = { - {0xA, 0xA, 0x1E, 0xFF}, - {0xF, 0xF, 0xF, 0xFF} + { 0xA, 0xA, 0x1E, 0xFF }, + { 0xF, 0xF, 0xF, 0xFF } }; __attribute__((aligned(4))) static const u8 Unk_020F55C4[][5] = { - {0xA, 0x8, 0x14, 0x1C, 0xFF}, - {0xF, 0xF, 0x8, 0x8, 0xFF} + { 0xA, 0x8, 0x14, 0x1C, 0xFF }, + { 0xF, 0xF, 0x8, 0x8, 0xFF } }; __attribute__((aligned(4))) static const u8 Unk_020F55D0[][6] = { - {0x8, 0x8, 0x8, 0x8, 0x1E, 0xFF}, - {0xF, 0xF, 0x8, 0x8, 0x14, 0xFF} + { 0x8, 0x8, 0x8, 0x8, 0x1E, 0xFF }, + { 0xF, 0xF, 0x8, 0x8, 0x14, 0xFF } }; -void sub_020933F8 (TaskManager * param0, UnkStruct_02095C48 * param1) +void sub_020933F8(TaskManager *param0, UnkStruct_02095C48 *param1) { - UnkStruct_020933F8 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_020933F8)); + UnkStruct_020933F8 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_020933F8)); MI_CpuClear8(v0, sizeof(UnkStruct_020933F8)); v0->unk_00 = param1; @@ -172,10 +168,10 @@ void sub_020933F8 (TaskManager * param0, UnkStruct_02095C48 * param1) } } -static BOOL sub_02093448 (TaskManager * param0) +static BOOL sub_02093448(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_020933F8 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_020933F8 *v1 = TaskManager_Environment(param0); switch (v1->unk_04) { case 0: @@ -262,10 +258,10 @@ static BOOL sub_02093448 (TaskManager * param0) return 0; } -static BOOL sub_020935EC (TaskManager * param0) +static BOOL sub_020935EC(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_020933F8 * v1 = TaskManager_Environment(param0); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_020933F8 *v1 = TaskManager_Environment(param0); switch (v1->unk_04) { case 0: @@ -327,8 +323,7 @@ static BOOL sub_020935EC (TaskManager * param0) v1->unk_04++; break; - case 7: - { + case 7: { s32 v2[4]; int v3, v4; @@ -337,7 +332,7 @@ static BOOL sub_020935EC (TaskManager * param0) case 4: for (v3 = 0; v3 < 4; v3++) { v2[v3] = sub_02095928(v1->unk_00, v3) - + sub_0209598C(v1->unk_00, v3); + + sub_0209598C(v1->unk_00, v3); } break; case 5: @@ -380,9 +375,9 @@ static BOOL sub_020935EC (TaskManager * param0) return 0; } -static UnkStruct_02095C48 * sub_020937C4 (void) +static UnkStruct_02095C48 *sub_020937C4(void) { - UnkStruct_02095C48 * v0; + UnkStruct_02095C48 *v0; int v1; v0 = Heap_AllocFromHeap(20, sizeof(UnkStruct_02095C48)); @@ -395,14 +390,14 @@ static UnkStruct_02095C48 * sub_020937C4 (void) return v0; } -static void sub_020937F8 (UnkStruct_02095C48 * param0) +static void sub_020937F8(UnkStruct_02095C48 *param0) { Heap_FreeToHeap(param0); } -UnkStruct_02095C48 * sub_02093800 (const UnkStruct_02093800 * param0) +UnkStruct_02095C48 *sub_02093800(const UnkStruct_02093800 *param0) { - UnkStruct_02095C48 * v0; + UnkStruct_02095C48 *v0; int v1 = 4 - 1; int v2; @@ -486,7 +481,7 @@ UnkStruct_02095C48 * sub_02093800 (const UnkStruct_02093800 * param0) return v0; } -static void sub_020939E0 (UnkStruct_02095C48 * param0, int param1, int param2) +static void sub_020939E0(UnkStruct_02095C48 *param0, int param1, int param2) { int v0 = 4 - 1; int v1; @@ -524,7 +519,7 @@ static void sub_020939E0 (UnkStruct_02095C48 * param0, int param1, int param2) sub_020951B0(param0, 11); } -void sub_02093AD4 (UnkStruct_02095C48 * param0) +void sub_02093AD4(UnkStruct_02095C48 *param0) { int v0; @@ -542,7 +537,7 @@ void sub_02093AD4 (UnkStruct_02095C48 * param0) Heap_Destroy(20); } -static int sub_02093B2C (Pokemon * param0, int param1) +static int sub_02093B2C(Pokemon *param0, int param1) { int v0, v1, v2; @@ -580,9 +575,9 @@ static int sub_02093B2C (Pokemon * param0, int param1) return v0; } -void sub_02093BBC (UnkStruct_02095C48 * param0) +void sub_02093BBC(UnkStruct_02095C48 *param0) { - UnkStruct_02093BBC * v0; + UnkStruct_02093BBC *v0; sub_0202A25C(param0->unk_00.unk_E8[param0->unk_00.unk_113]); @@ -609,15 +604,15 @@ void sub_02093BBC (UnkStruct_02095C48 * param0) param0->unk_199C = v0; } -void sub_02093C54 (UnkStruct_02095C48 * param0) +void sub_02093C54(UnkStruct_02095C48 *param0) { Heap_FreeToHeap(param0->unk_199C); param0->unk_199C = NULL; } -static void sub_02093C6C (SysTask * param0, void * param1) +static void sub_02093C6C(SysTask *param0, void *param1) { - UnkStruct_02095C48 * v0 = param1; + UnkStruct_02095C48 *v0 = param1; switch (v0->unk_15A) { case 0: @@ -759,7 +754,7 @@ static void sub_02093C6C (SysTask * param0, void * param1) if (v0->unk_568 >= v0->unk_00.unk_117) { { int v1; - const TrainerInfo * v2; + const TrainerInfo *v2; for (v1 = 0; v1 < v0->unk_00.unk_117; v1++) { v2 = CommInfo_TrainerInfo(v1); @@ -869,8 +864,7 @@ static void sub_02093C6C (SysTask * param0, void * param1) v0->unk_15A++; } break; - case 38: - { + case 38: { UnkStruct_ov6_02248DD8 v3; sub_02094EB4(v0, 0, &v3); @@ -878,8 +872,7 @@ static void sub_02093C6C (SysTask * param0, void * param1) if (ov6_02248DD8(v0, v0->unk_00.unk_113, &v3) == 1) { v0->unk_15A++; } - } - break; + } break; case 39: if (v0->unk_568 >= v0->unk_00.unk_117) { v0->unk_568 = 0; @@ -943,17 +936,16 @@ static void sub_02093C6C (SysTask * param0, void * param1) v0->unk_15A++; } break; - default: - { + default: { int v5; - const TrainerInfo * v6; + const TrainerInfo *v6; for (v5 = 0; v5 < v0->unk_00.unk_117; v5++) { v6 = CommInfo_TrainerInfo(v5); v0->unk_00.unk_F8[v5] = TrainerInfo_Gender(v6); } - for ( ; v5 < 4; v5++) { + for (; v5 < 4; v5++) { v0->unk_00.unk_F8[v5] = v0->unk_00.unk_10[v5].unk_20_12; } } @@ -973,7 +965,7 @@ static void sub_02093C6C (SysTask * param0, void * param1) } } -BOOL sub_020943B0 (UnkStruct_02095C48 * param0) +BOOL sub_020943B0(UnkStruct_02095C48 *param0) { int v0, v1; @@ -988,7 +980,7 @@ BOOL sub_020943B0 (UnkStruct_02095C48 * param0) { int v2; - TrainerInfo * v3; + TrainerInfo *v3; for (v2 = 0; v2 < v0; v2++) { v3 = CommInfo_TrainerInfo(v2); @@ -1045,12 +1037,12 @@ BOOL sub_020943B0 (UnkStruct_02095C48 * param0) return 1; } -BOOL sub_020944CC (UnkStruct_02095C48 * param0) +BOOL sub_020944CC(UnkStruct_02095C48 *param0) { return sub_020944D4(param0); } -BOOL sub_020944D4 (UnkStruct_02095C48 * param0) +BOOL sub_020944D4(UnkStruct_02095C48 *param0) { if (param0->unk_164 == NULL) { return 1; @@ -1059,7 +1051,7 @@ BOOL sub_020944D4 (UnkStruct_02095C48 * param0) return 0; } -static void sub_020944E8 (UnkStruct_02095C48 * param0) +static void sub_020944E8(UnkStruct_02095C48 *param0) { GF_ASSERT(param0->unk_164 == NULL); @@ -1067,9 +1059,9 @@ static void sub_020944E8 (UnkStruct_02095C48 * param0) param0->unk_164 = SysTask_Start(sub_0209451C, param0, 10); } -static void sub_0209451C (SysTask * param0, void * param1) +static void sub_0209451C(SysTask *param0, void *param1) { - UnkStruct_02095C48 * v0 = param1; + UnkStruct_02095C48 *v0 = param1; switch (v0->unk_15A) { case 0: @@ -1126,12 +1118,12 @@ static void sub_0209451C (SysTask * param0, void * param1) } } -void sub_02094630 (UnkStruct_02095C48 * param0, int param1, StringTemplate * param2, u32 param3) +void sub_02094630(UnkStruct_02095C48 *param0, int param1, StringTemplate *param2, u32 param3) { StringTemplate_SetContestJudgeName(param2, param3, param0->unk_00.unk_C0[param1].unk_00); } -void sub_02094648 (UnkStruct_02095C48 * param0, int param1, StringTemplate * param2, u32 param3) +void sub_02094648(UnkStruct_02095C48 *param0, int param1, StringTemplate *param2, u32 param3) { int v0, v1; @@ -1139,9 +1131,9 @@ void sub_02094648 (UnkStruct_02095C48 * param0, int param1, StringTemplate * par StringTemplate_SetStrbuf(param2, param3, param0->unk_00.unk_D8[v1], param0->unk_00.unk_F8[v1], 1, GAME_LANGUAGE); } -void sub_02094680 (UnkStruct_02095C48 * param0, int param1, StringTemplate * param2, u32 param3) +void sub_02094680(UnkStruct_02095C48 *param0, int param1, StringTemplate *param2, u32 param3) { - BoxPokemon * v0; + BoxPokemon *v0; int v1; v1 = sub_02095904(param1); @@ -1150,7 +1142,7 @@ void sub_02094680 (UnkStruct_02095C48 * param0, int param1, StringTemplate * par StringTemplate_SetNickname(param2, param3, v0); } -void sub_020946A4 (UnkStruct_02095C48 * param0, StringTemplate * param1, u32 param2) +void sub_020946A4(UnkStruct_02095C48 *param0, StringTemplate *param1, u32 param2) { u32 v0; @@ -1158,7 +1150,7 @@ void sub_020946A4 (UnkStruct_02095C48 * param0, StringTemplate * param1, u32 par StringTemplate_SetContestRankName(param1, param2, v0); } -void sub_020946CC (UnkStruct_02095C48 * param0, StringTemplate * param1, u32 param2) +void sub_020946CC(UnkStruct_02095C48 *param0, StringTemplate *param1, u32 param2) { u32 v0; @@ -1166,7 +1158,7 @@ void sub_020946CC (UnkStruct_02095C48 * param0, StringTemplate * param1, u32 par StringTemplate_SetContestTypeName(param1, param2, v0); } -void sub_020946F0 (UnkStruct_02095C48 * param0, StringTemplate * param1, u32 param2) +void sub_020946F0(UnkStruct_02095C48 *param0, StringTemplate *param1, u32 param2) { int v0, v1; int v2; @@ -1183,7 +1175,7 @@ void sub_020946F0 (UnkStruct_02095C48 * param0, StringTemplate * param1, u32 par sub_02094648(param0, v1, param1, param2); } -void sub_02094720 (UnkStruct_02095C48 * param0, StringTemplate * param1, u32 param2) +void sub_02094720(UnkStruct_02095C48 *param0, StringTemplate *param1, u32 param2) { int v0, v1; int v2; @@ -1200,12 +1192,12 @@ void sub_02094720 (UnkStruct_02095C48 * param0, StringTemplate * param1, u32 par sub_02094680(param0, v1, param1, param2); } -u32 sub_02094750 (UnkStruct_02095C48 * param0) +u32 sub_02094750(UnkStruct_02095C48 *param0) { return 1; } -void sub_02094754 (UnkStruct_02095C48 * param0, u8 param1) +void sub_02094754(UnkStruct_02095C48 *param0, u8 param1) { if (param0->unk_155 == 0) { return; @@ -1214,7 +1206,7 @@ void sub_02094754 (UnkStruct_02095C48 * param0, u8 param1) CommTiming_StartSync(param1); } -BOOL sub_0209476C (UnkStruct_02095C48 * param0, u8 param1) +BOOL sub_0209476C(UnkStruct_02095C48 *param0, u8 param1) { if (param0->unk_155 == 0) { return 1; @@ -1227,12 +1219,12 @@ BOOL sub_0209476C (UnkStruct_02095C48 * param0, u8 param1) return 0; } -int sub_02094790 (UnkStruct_02095C48 * param0) +int sub_02094790(UnkStruct_02095C48 *param0) { return param0->unk_00.unk_118[param0->unk_00.unk_113].unk_08; } -int sub_020947A4 (UnkStruct_02095C48 * param0) +int sub_020947A4(UnkStruct_02095C48 *param0) { int v0; int v1; @@ -1246,12 +1238,12 @@ int sub_020947A4 (UnkStruct_02095C48 * param0) return 0; } -int sub_020947C8 (UnkStruct_02095C48 * param0) +int sub_020947C8(UnkStruct_02095C48 *param0) { return sub_020958FC(param0->unk_00.unk_113); } -int sub_020947D8 (UnkStruct_02095C48 * param0, int param1) +int sub_020947D8(UnkStruct_02095C48 *param0, int param1) { int v0; int v1; @@ -1270,7 +1262,7 @@ int sub_020947D8 (UnkStruct_02095C48 * param0, int param1) return v1; } -int sub_020947F0 (UnkStruct_02095C48 * param0, int param1) +int sub_020947F0(UnkStruct_02095C48 *param0, int param1) { int v0; @@ -1278,7 +1270,7 @@ int sub_020947F0 (UnkStruct_02095C48 * param0, int param1) return param0->unk_00.unk_100[v0]; } -int sub_02094804 (UnkStruct_02095C48 * param0) +int sub_02094804(UnkStruct_02095C48 *param0) { if (param0->unk_155 == 1) { return 1; @@ -1291,7 +1283,7 @@ int sub_02094804 (UnkStruct_02095C48 * param0) return 0; } -void sub_02094828 (UnkStruct_02095C48 * param0, u16 * param1, u16 * param2, u16 * param3, u16 * param4) +void sub_02094828(UnkStruct_02095C48 *param0, u16 *param1, u16 *param2, u16 *param3, u16 *param4) { *param1 = param0->unk_00.unk_110; *param2 = param0->unk_00.unk_10F; @@ -1299,17 +1291,17 @@ void sub_02094828 (UnkStruct_02095C48 * param0, u16 * param1, u16 * param2, u16 *param4 = param0->unk_197C; } -void sub_02094850 (UnkStruct_02095C48 * param0) +void sub_02094850(UnkStruct_02095C48 *param0) { sub_020959F4(param0->unk_155); } -void sub_02094860 (UnkStruct_02095C48 * param0) +void sub_02094860(UnkStruct_02095C48 *param0) { sub_02095A24(); } -BOOL sub_02094868 (UnkStruct_02095C48 * param0) +BOOL sub_02094868(UnkStruct_02095C48 *param0) { u32 v0; @@ -1322,7 +1314,7 @@ BOOL sub_02094868 (UnkStruct_02095C48 * param0) return 1; } -void sub_02094898 (UnkStruct_02095C48 * param0, StringTemplate * param1, u32 param2, int param3) +void sub_02094898(UnkStruct_02095C48 *param0, StringTemplate *param1, u32 param2, int param3) { u32 v0, v1; @@ -1351,7 +1343,7 @@ void sub_02094898 (UnkStruct_02095C48 * param0, StringTemplate * param1, u32 par StringTemplate_SetRibbonName(param1, param2, v1); } -u32 sub_02094904 (UnkStruct_02095C48 * param0) +u32 sub_02094904(UnkStruct_02095C48 *param0) { u32 v0 = 100; @@ -1445,8 +1437,8 @@ u32 sub_02094904 (UnkStruct_02095C48 * param0) GF_ASSERT(v0 != 100); { - UnkStruct_0202A750 * v1; - UnkStruct_02029D04 * v2; + UnkStruct_0202A750 *v1; + UnkStruct_02029D04 *v2; v1 = sub_0202A750(param0->unk_1970); v2 = sub_02029D04(v1); @@ -1459,9 +1451,9 @@ u32 sub_02094904 (UnkStruct_02095C48 * param0) return v0; } -void sub_02094A58 (UnkStruct_02095C48 * param0, int param1) +void sub_02094A58(UnkStruct_02095C48 *param0, int param1) { - UnkStruct_02094A58 * v0; + UnkStruct_02094A58 *v0; GF_ASSERT(param0->unk_19A0 == NULL); @@ -1499,7 +1491,7 @@ void sub_02094A58 (UnkStruct_02095C48 * param0, int param1) param0->unk_19A0 = v0; } -BOOL sub_02094B1C (UnkStruct_02095C48 * param0) +BOOL sub_02094B1C(UnkStruct_02095C48 *param0) { if (param0->unk_19A0 == NULL) { return 1; @@ -1508,10 +1500,10 @@ BOOL sub_02094B1C (UnkStruct_02095C48 * param0) return 0; } -static void sub_02094B30 (SysTask * param0, void * param1) +static void sub_02094B30(SysTask *param0, void *param1) { - UnkStruct_02095C48 * v0 = param1; - UnkStruct_02094A58 * v1 = v0->unk_19A0; + UnkStruct_02095C48 *v0 = param1; + UnkStruct_02094A58 *v1 = v0->unk_19A0; if (sub_0200AC1C(1) == 0) { return; @@ -1540,7 +1532,7 @@ static void sub_02094B30 (SysTask * param0, void * param1) } } -void sub_02094BB4 (UnkStruct_02095C48 * param0, int * param1, int * param2, int * param3, int * param4, int * param5) +void sub_02094BB4(UnkStruct_02095C48 *param0, int *param1, int *param2, int *param3, int *param4, int *param5) { int v0; int v1; @@ -1579,7 +1571,7 @@ void sub_02094BB4 (UnkStruct_02095C48 * param0, int * param1, int * param2, int } } -void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, Journal * param3) +void sub_02094C44(UnkStruct_02095C48 *param0, SaveData *param1, u32 param2, Journal *param3) { int v0; @@ -1597,7 +1589,7 @@ void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, J if (param0->unk_155 == 0) { { - VarsFlags * v1; + VarsFlags *v1; v1 = SaveData_GetVarsFlags(param0->unk_1970); @@ -1623,31 +1615,31 @@ void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, J } { - TVBroadcast * v4; + TVBroadcast *v4; v4 = SaveData_TVBroadcast(param0->unk_1970); sub_0206CF14(v4, param0->unk_1974, param0->unk_00.unk_10F, param0->unk_00.unk_110, param0->unk_00.unk_118[param0->unk_00.unk_113].unk_08 + 1); } { - UnkStruct_0202CD88 * v5; + UnkStruct_0202CD88 *v5; v5 = sub_0202CD88(param0->unk_1970); - sub_0202CF28(v5, (((70 + 1)) + 19)); + sub_0202CF28(v5, ((70 + 1) + 19)); if (sub_02094790(param0) == 0) { - sub_0202CF28(v5, (((70 + 1)) + 21)); + sub_0202CF28(v5, ((70 + 1) + 21)); sub_0202CFEC(v5, 13); } if (v0 == 1) { - sub_0202CF28(v5, (((70 + 1)) + 23)); + sub_0202CF28(v5, ((70 + 1) + 23)); } } { int v6; - PokedexData * v7; + PokedexData *v7; v7 = SaveData_Pokedex(param0->unk_1970); @@ -1659,20 +1651,20 @@ void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, J sub_0202F134(param0->unk_1970, param0->unk_00.unk_10F, param0->unk_00.unk_118[param0->unk_00.unk_113].unk_08); { - UnkStruct_0202CD88 * v8; + UnkStruct_0202CD88 *v8; v8 = sub_0202CD88(param0->unk_1970); - sub_0202CF28(v8, (((70 + 1)) + 20)); + sub_0202CF28(v8, ((70 + 1) + 20)); if (sub_02094790(param0) == 0) { - sub_0202CF28(v8, (((70 + 1)) + 22)); + sub_0202CF28(v8, ((70 + 1) + 22)); sub_0202CFEC(v8, 19); } } { - void * v9; - Journal * v10; + void *v9; + Journal *v10; v9 = sub_0202C1C0(param0->unk_00.unk_118[param0->unk_00.unk_113].unk_08 + 1, 11); v10 = SaveData_GetJournal(param0->unk_1970); @@ -1682,8 +1674,8 @@ void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, J } if (sub_02094790(param0) == 0) { - UnkStruct_0202A750 * v11; - UnkStruct_02029C88 * v12; + UnkStruct_0202A750 *v11; + UnkStruct_02029C88 *v12; v11 = sub_0202A750(param0->unk_1970); v12 = sub_02029CD0(v11, param0->unk_00.unk_10F); @@ -1698,17 +1690,17 @@ void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, J } } -static void sub_02094E7C (UnkStruct_02095C48 * param0) +static void sub_02094E7C(UnkStruct_02095C48 *param0) { LCRNG_SetSeed((GetSecondsSinceMidnight() * (LCRNG_GetSeed() + 10)) & 0xffff); } -u16 sub_02094E98 (UnkStruct_02095C48 * param0) +u16 sub_02094E98(UnkStruct_02095C48 *param0) { return LCRNG_Next(); } -u16 sub_02094EA0 (u32 param0, u32 * param1) +u16 sub_02094EA0(u32 param0, u32 *param1) { u32 v0; @@ -1718,7 +1710,7 @@ u16 sub_02094EA0 (u32 param0, u32 * param1) return v0 / 65536L; } -static void sub_02094EB4 (UnkStruct_02095C48 * param0, int param1, UnkStruct_ov6_02248DD8 * param2) +static void sub_02094EB4(UnkStruct_02095C48 *param0, int param1, UnkStruct_ov6_02248DD8 *param2) { param2->unk_00 = param0->unk_00.unk_F8[param1]; param2->unk_01 = param0->unk_00.unk_FC[param1]; diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c index 94c98c2775..c2933a9a29 100644 --- a/src/unk_02094EDC.c +++ b/src/unk_02094EDC.c @@ -1,388 +1,386 @@ +#include "unk_02094EDC.h" + #include #include -#include "struct_decls/struct_02007768_decl.h" #include "struct_decls/sprite_decl.h" -#include "strbuf.h" -#include "pokemon.h" - -#include "pokemon.h" +#include "struct_decls/struct_02007768_decl.h" #include "struct_defs/archived_sprite.h" #include "struct_defs/struct_020951B0.h" #include "struct_defs/struct_020954F0.h" #include "struct_defs/struct_02095C48.h" #include "struct_defs/struct_020F568C.h" -#include "overlay006/struct_ov6_02248BE8.h" + #include "battle/struct_ov16_0223E0C8.h" +#include "overlay006/struct_ov6_02248BE8.h" -#include "unk_02002328.h" +#include "heap.h" +#include "message.h" #include "narc.h" +#include "pokemon.h" +#include "strbuf.h" +#include "unk_02002328.h" #include "unk_02006E3C.h" #include "unk_0200762C.h" -#include "message.h" #include "unk_020131EC.h" -#include "heap.h" #include "unk_0201D15C.h" -#include "strbuf.h" #include "unk_020298BC.h" -#include "pokemon.h" #include "unk_020933F8.h" -#include "unk_02094EDC.h" const UnkStruct_020F568C Unk_020F568C[] = { - { - 0x0, - 0x0, - 0x0 - }, - { - 0x0, - 0x1, - 0x14, - 0x0, - 0x2, - 0x1, - 0x7, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x2, - 0x3, - 0x14, - 0x2, - 0x2, - 0x3, - 0x7, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x4, - 0x5, - 0x0, - 0x4, - 0x2, - 0x5, - 0x2, - 0x6, - 0x2, - 0x7, - 0x2, - 0xffff, - 0x0 - }, - { - 0x6, - 0x7, - 0x14, - 0x8, - 0x8, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x8, - 0x9, - 0x1E, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0xA, - 0xB, - 0xA, - 0x9, - 0x2, - 0xA, - 0x2, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xB, - 0x2 - }, - { - 0xC, - 0xD, - 0x14, - 0xC, - 0x2, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0xE, - 0xF, - 0x0, - 0xD, - 0x5, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x10, - 0x11, - 0x0, - 0xE, - 0x2, - 0xF, - 0x2, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0x10, - 0x2 - }, - { - 0x12, - 0x13, - 0x14, - 0x11, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x14, - 0x15, - 0x0, - 0x12, - 0x9, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x16, - 0x17, - 0x0, - 0x13, - 0x7, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x18, - 0x19, - 0x14, - 0x14, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x1A, - 0x1B, - 0x14, - 0x15, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x1C, - 0x1D, - 0x14, - 0x16, - 0x9, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x1E, - 0x1F, - 0x0, - 0x17, - 0x5, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x20, - 0x21, - 0x14, - 0x18, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x22, - 0x23, - 0x14, - 0x19, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x24, - 0x25, - 0x14, - 0x1A, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x26, - 0x27, - 0xA, - 0x1B, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x28, - 0x29, - 0x0, - 0x1C, - 0x2, - 0x1D, - 0x2, - 0x1E, - 0x2, - 0x1F, - 0x2, - 0xffff, - 0x0 - }, - { - 0x2A, - 0x2B, - 0x14, - 0x20, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - }, - { - 0x2C, - 0x2D, - 0xA, - 0x21, - 0x2, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0, - 0xffff, - 0x0 - } + { + 0x0, + 0x0, + 0x0, + }, + { + 0x0, + 0x1, + 0x14, + 0x0, + 0x2, + 0x1, + 0x7, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x2, + 0x3, + 0x14, + 0x2, + 0x2, + 0x3, + 0x7, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x4, + 0x5, + 0x0, + 0x4, + 0x2, + 0x5, + 0x2, + 0x6, + 0x2, + 0x7, + 0x2, + 0xffff, + 0x0, + }, + { + 0x6, + 0x7, + 0x14, + 0x8, + 0x8, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x8, + 0x9, + 0x1E, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0xA, + 0xB, + 0xA, + 0x9, + 0x2, + 0xA, + 0x2, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xB, + 0x2, + }, + { + 0xC, + 0xD, + 0x14, + 0xC, + 0x2, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0xE, + 0xF, + 0x0, + 0xD, + 0x5, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x10, + 0x11, + 0x0, + 0xE, + 0x2, + 0xF, + 0x2, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0x10, + 0x2, + }, + { + 0x12, + 0x13, + 0x14, + 0x11, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x14, + 0x15, + 0x0, + 0x12, + 0x9, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x16, + 0x17, + 0x0, + 0x13, + 0x7, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x18, + 0x19, + 0x14, + 0x14, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x1A, + 0x1B, + 0x14, + 0x15, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x1C, + 0x1D, + 0x14, + 0x16, + 0x9, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x1E, + 0x1F, + 0x0, + 0x17, + 0x5, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x20, + 0x21, + 0x14, + 0x18, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x22, + 0x23, + 0x14, + 0x19, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x24, + 0x25, + 0x14, + 0x1A, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x26, + 0x27, + 0xA, + 0x1B, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x28, + 0x29, + 0x0, + 0x1C, + 0x2, + 0x1D, + 0x2, + 0x1E, + 0x2, + 0x1F, + 0x2, + 0xffff, + 0x0, + }, + { + 0x2A, + 0x2B, + 0x14, + 0x20, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, + { + 0x2C, + 0x2D, + 0xA, + 0x21, + 0x2, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + 0xffff, + 0x0, + }, }; -int sub_02094EDC (UnkStruct_02095C48 * param0) +int sub_02094EDC(UnkStruct_02095C48 *param0) { if ((param0->unk_155 == 0) || ((param0->unk_155 == 1) && (param0->unk_00.unk_10C == param0->unk_00.unk_113))) { return 1; @@ -391,16 +389,16 @@ int sub_02094EDC (UnkStruct_02095C48 * param0) return 0; } -void sub_02094F04 (UnkStruct_02095C48 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7) +void sub_02094F04(UnkStruct_02095C48 *param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7) { int v0, v1; - u8 * v2; + u8 *v2; u8 v3 = 0; u16 v4; int v5 = 0; int v6; int v7, v8; - UnkStruct_ov6_02248BE8 * v9; + UnkStruct_ov6_02248BE8 *v9; int v10, v11; UnkStruct_ov6_02248BE8 v12; @@ -524,11 +522,11 @@ void sub_02094F04 (UnkStruct_02095C48 * param0, int param1, int param2, int para Heap_FreeToHeap(v9); } -void sub_020951B0 (UnkStruct_02095C48 * param0, int param1) +void sub_020951B0(UnkStruct_02095C48 *param0, int param1) { int v0, v1; - UnkStruct_020951B0 * v2; - UnkStruct_020951B0 * v3; + UnkStruct_020951B0 *v2; + UnkStruct_020951B0 *v3; int v4; int v5; @@ -605,7 +603,7 @@ void sub_020951B0 (UnkStruct_02095C48 * param0, int param1) Heap_FreeToHeap(v2); } -void sub_02095338 (UnkStruct_02095C48 * param0) +void sub_02095338(UnkStruct_02095C48 *param0) { int v0; @@ -617,7 +615,7 @@ void sub_02095338 (UnkStruct_02095C48 * param0) } } -void sub_02095380 (const UnkStruct_ov6_02248BE8 * param0, Pokemon * param1, int param2) +void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int param2) { int v0; u16 v1; @@ -632,8 +630,8 @@ void sub_02095380 (const UnkStruct_ov6_02248BE8 * param0, Pokemon * param1, int } { - Strbuf* v3, * v4; - MessageLoader * v5; + Strbuf *v3, *v4; + MessageLoader *v5; v5 = MessageLoader_Init(1, 26, 205, param2); v3 = MessageLoader_GetNewStrbuf(v5, param0->unk_16); @@ -666,10 +664,10 @@ void sub_02095380 (const UnkStruct_ov6_02248BE8 * param0, Pokemon * param1, int } } -Sprite * sub_02095484 (UnkStruct_02007768 * param0, int param1, Pokemon * param2, int param3, UnkStruct_ov16_0223E0C8 * param4, int param5, int param6, int param7, int param8) +Sprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int param5, int param6, int param7, int param8) { ArchivedSprite v0; - Sprite * v1; + Sprite *v1; int v2, v3, v4; Pokemon_BuildArchivedSprite(&v0, param2, param3); @@ -687,14 +685,14 @@ Sprite * sub_02095484 (UnkStruct_02007768 * param0, int param1, Pokemon * param2 return v1; } -void sub_020954F0 (UnkStruct_02095C48 * param0, int param1, int param2, int param3, int param4) +void sub_020954F0(UnkStruct_02095C48 *param0, int param1, int param2, int param3, int param4) { int v0, v1; u8 v2 = 0, v3 = 0; u16 v4; int v5; - UnkStruct_020954F0 * v6; - u8 * v7, * v8; + UnkStruct_020954F0 *v6; + u8 *v7, *v8; v6 = sub_02006FE8(90, 1, 0, param1, 1); v5 = NARC_GetMemberSizeByIndexPair(NARC_INDEX_CONTEST__DATA__CONTEST_DATA, 1) / sizeof(UnkStruct_020954F0); @@ -766,13 +764,13 @@ void sub_020954F0 (UnkStruct_02095C48 * param0, int param1, int param2, int para Heap_FreeToHeap(v6); } -s8 sub_02095734 (int param0) +s8 sub_02095734(int param0) { GF_ASSERT(param0 < (NELEMS(Unk_020F568C))); return Unk_020F568C[param0].unk_04; } -void sub_02095750 (int param0, u32 * param1, u32 * param2) +void sub_02095750(int param0, u32 *param1, u32 *param2) { GF_ASSERT(param0 < (NELEMS(Unk_020F568C))); @@ -780,13 +778,13 @@ void sub_02095750 (int param0, u32 * param1, u32 * param2) *param2 = Unk_020F568C[param0].unk_02; } -u32 sub_0209577C (int param0) +u32 sub_0209577C(int param0) { GF_ASSERT(param0 < (NELEMS(Unk_020F568C))); return 46 + (param0 - 1); } -void sub_02095790 (int param0, int param1, u32 * param2, u32 * param3) +void sub_02095790(int param0, int param1, u32 *param2, u32 *param3) { GF_ASSERT(param0 < (NELEMS(Unk_020F568C))); @@ -815,7 +813,7 @@ void sub_02095790 (int param0, int param1, u32 * param2, u32 * param3) } } -u32 sub_02095848 (int param0, int param1, int param2) +u32 sub_02095848(int param0, int param1, int param2) { u32 v0; @@ -849,7 +847,7 @@ u32 sub_02095848 (int param0, int param1, int param2) return v0; } -u32 sub_02095888 (int param0) +u32 sub_02095888(int param0) { u32 v0; @@ -875,12 +873,12 @@ u32 sub_02095888 (int param0) return v0; } -u32 sub_020958B8 (int param0) +u32 sub_020958B8(int param0) { return sub_020958C4(param0, 2); } -u32 sub_020958C4 (int param0, int param1) +u32 sub_020958C4(int param0, int param1) { u32 v0; @@ -910,17 +908,17 @@ u32 sub_020958C4 (int param0, int param1) return v0; } -int sub_020958FC (int param0) +int sub_020958FC(int param0) { return 4 - param0 - 1; } -int sub_02095904 (int param0) +int sub_02095904(int param0) { return 4 - param0 - 1; } -BOOL sub_0209590C (UnkStruct_02095C48 * param0) +BOOL sub_0209590C(UnkStruct_02095C48 *param0) { switch (param0->unk_00.unk_111) { case 3: @@ -932,16 +930,16 @@ BOOL sub_0209590C (UnkStruct_02095C48 * param0) return 0; } -int sub_02095928 (UnkStruct_02095C48 * param0, int param1) +int sub_02095928(UnkStruct_02095C48 *param0, int param1) { int v0, v1, v2; - const u16 * v3; + const u16 *v3; const u16 v4[][8] = { - {10, 20, 30, 40, 50, 60, 70, 80}, - {90, 110, 130, 150, 170, 190, 210, 230}, - {170, 200, 230, 260, 290, 320, 350, 380}, - {320, 360, 400, 440, 480, 520, 560, 600}, - {100, 200, 300, 400, 450, 500, 550, 600}, + { 10, 20, 30, 40, 50, 60, 70, 80 }, + { 90, 110, 130, 150, 170, 190, 210, 230 }, + { 170, 200, 230, 260, 290, 320, 350, 380 }, + { 320, 360, 400, 440, 480, 520, 560, 600 }, + { 100, 200, 300, 400, 450, 500, 550, 600 }, }; v0 = 0; @@ -964,12 +962,16 @@ int sub_02095928 (UnkStruct_02095C48 * param0, int param1) return v0; } -int sub_0209598C (UnkStruct_02095C48 * param0, int param1) +int sub_0209598C(UnkStruct_02095C48 *param0, int param1) { int v0, v1, v2; - const u8 * v3; + const u8 *v3; const u8 v4[][3] = { - {3, 5, 8}, {5, 10, 15}, {7, 15, 23}, {10, 20, 30}, {10, 20, 30}, + { 3, 5, 8 }, + { 5, 10, 15 }, + { 7, 15, 23 }, + { 10, 20, 30 }, + { 10, 20, 30 }, }; v0 = 0; @@ -998,7 +1000,7 @@ int sub_0209598C (UnkStruct_02095C48 * param0, int param1) return v0; } -void sub_020959F4 (int param0) +void sub_020959F4(int param0) { if (param0 == 0) { sub_02002AC8(1); @@ -1011,14 +1013,14 @@ void sub_020959F4 (int param0) } } -void sub_02095A24 (void) +void sub_02095A24(void) { sub_02002AC8(0); sub_02002AE4(0); sub_02002B20(0); } -u32 sub_02095A3C (int param0, int param1) +u32 sub_02095A3C(int param0, int param1) { u32 v0; @@ -1046,7 +1048,7 @@ u32 sub_02095A3C (int param0, int param1) return v0; } -u32 sub_02095A74 (int param0, int param1) +u32 sub_02095A74(int param0, int param1) { u8 v0[12]; int v1 = 0; diff --git a/src/unk_02095AF0.c b/src/unk_02095AF0.c index aaa7586865..ef43dc1956 100644 --- a/src/unk_02095AF0.c +++ b/src/unk_02095AF0.c @@ -1,85 +1,86 @@ +#include "unk_02095AF0.h" + #include #include #include "struct_decls/struct_02029C88_decl.h" - #include "struct_defs/struct_02039A58.h" #include "struct_defs/struct_02095B28.h" #include "struct_defs/struct_02095C48.h" #include "struct_defs/struct_02095C60.h" + +#include "overlay006/ov6_022489E4.h" +#include "overlay017/ov17_02252CEC.h" #include "overlay017/struct_ov17_0224EDE0.h" +#include "communication_system.h" #include "heap.h" #include "unk_020298BC.h" #include "unk_02032798.h" -#include "communication_system.h" -#include "unk_02095AF0.h" -#include "overlay006/ov6_022489E4.h" -#include "overlay017/ov17_02252CEC.h" -static void sub_02095B2C(int param0, int param1, void * param2, void * param3); -static u8 * sub_02095B04(int param0, void * param1, int param2); -static void sub_02095B30(int param0, int param1, void * param2, void * param3); -static void sub_02095B9C(int param0, int param1, void * param2, void * param3); -static void sub_02095C48(int param0, int param1, void * param2, void * param3); -static void sub_02095C98(int param0, int param1, void * param2, void * param3); +static void sub_02095B2C(int param0, int param1, void *param2, void *param3); +static u8 *sub_02095B04(int param0, void *param1, int param2); +static void sub_02095B30(int param0, int param1, void *param2, void *param3); +static void sub_02095B9C(int param0, int param1, void *param2, void *param3); +static void sub_02095C48(int param0, int param1, void *param2, void *param3); +static void sub_02095C98(int param0, int param1, void *param2, void *param3); static int sub_02095B24(void); static int sub_02095B28(void); static const CommCmdTable Unk_020F58FC[] = { - {NULL, sub_0203294C, NULL}, - {sub_02095B2C, sub_0203294C, NULL}, - {ov17_02252CEC, sub_02032944, sub_02095B04}, - {ov17_02252D7C, sub_02095B24, NULL}, - {ov6_022489E4, sub_02032944, NULL}, - {ov6_02248AC8, sub_02032944, NULL}, - {ov6_02248B30, sub_02032944, sub_02095B04}, - {ov6_02248BC0, sub_02032944, NULL}, - {ov6_02248C28, sub_02032944, NULL}, - {ov6_02248CBC, sub_02032944, NULL}, - {sub_02095B30, sub_02032944, NULL}, - {sub_02095B9C, sub_02032944, sub_02095B04}, - {sub_02095C48, sub_02095B28, NULL}, - {sub_02095C98, sub_02095B28, NULL}, - {ov6_02248D38, sub_02032944, sub_02095B04}, - {ov6_02248DA0, sub_02032944, NULL} + { NULL, sub_0203294C, NULL }, + { sub_02095B2C, sub_0203294C, NULL }, + { ov17_02252CEC, sub_02032944, sub_02095B04 }, + { ov17_02252D7C, sub_02095B24, NULL }, + { ov6_022489E4, sub_02032944, NULL }, + { ov6_02248AC8, sub_02032944, NULL }, + { ov6_02248B30, sub_02032944, sub_02095B04 }, + { ov6_02248BC0, sub_02032944, NULL }, + { ov6_02248C28, sub_02032944, NULL }, + { ov6_02248CBC, sub_02032944, NULL }, + { sub_02095B30, sub_02032944, NULL }, + { sub_02095B9C, sub_02032944, sub_02095B04 }, + { sub_02095C48, sub_02095B28, NULL }, + { sub_02095C98, sub_02095B28, NULL }, + { ov6_02248D38, sub_02032944, sub_02095B04 }, + { ov6_02248DA0, sub_02032944, NULL } }; -void sub_02095AF0 (void * param0) +void sub_02095AF0(void *param0) { int v0 = sizeof(Unk_020F58FC) / sizeof(CommCmdTable); CommCmd_Init(Unk_020F58FC, v0, param0); } -static u8 * sub_02095B04 (int param0, void * param1, int param2) +static u8 *sub_02095B04(int param0, void *param1, int param2) { - UnkStruct_02095C48 * v0 = param1; + UnkStruct_02095C48 *v0 = param1; GF_ASSERT(param2 < 1024); return v0->unk_969[param0]; } -static int sub_02095B24 (void) +static int sub_02095B24(void) { return sizeof(UnkStruct_ov17_0224EDE0); } -static int sub_02095B28 (void) +static int sub_02095B28(void) { return sizeof(UnkStruct_02095B28); } -static void sub_02095B2C (int param0, int param1, void * param2, void * param3) +static void sub_02095B2C(int param0, int param1, void *param2, void *param3) { return; } -static void sub_02095B30 (int param0, int param1, void * param2, void * param3) +static void sub_02095B30(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; int v1; int v2; - u8 * v3; + u8 *v3; v1 = sub_02029C64(); v3 = param2; @@ -90,9 +91,9 @@ static void sub_02095B30 (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL sub_02095B5C (UnkStruct_02095C48 * param0, int param1, const UnkStruct_02029C88 * param2) +BOOL sub_02095B5C(UnkStruct_02095C48 *param0, int param1, const UnkStruct_02029C88 *param2) { - u8 * v0; + u8 *v0; int v1; int v2; @@ -111,11 +112,11 @@ BOOL sub_02095B5C (UnkStruct_02095C48 * param0, int param1, const UnkStruct_0202 return v2; } -static void sub_02095B9C (int param0, int param1, void * param2, void * param3) +static void sub_02095B9C(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; int v1, v2; - u8 * v3; + u8 *v3; int v4; v1 = sub_02029C64(); @@ -131,9 +132,9 @@ static void sub_02095B9C (int param0, int param1, void * param2, void * param3) v0->unk_568++; } -BOOL sub_02095BEC (UnkStruct_02095C48 * param0, UnkStruct_02029C88 ** param1) +BOOL sub_02095BEC(UnkStruct_02095C48 *param0, UnkStruct_02029C88 **param1) { - u8 * v0; + u8 *v0; int v1, v2; int v3; int v4; @@ -158,13 +159,13 @@ BOOL sub_02095BEC (UnkStruct_02095C48 * param0, UnkStruct_02029C88 ** param1) return v3; } -static void sub_02095C48 (int param0, int param1, void * param2, void * param3) +static void sub_02095C48(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; + UnkStruct_02095C48 *v0 = param3; MI_CpuCopy8(param2, &v0->unk_1984.unk_00, param1); } -BOOL sub_02095C60 (UnkStruct_02095C60 * param0, u32 param1) +BOOL sub_02095C60(UnkStruct_02095C60 *param0, u32 param1) { if (param0->unk_16 == 0) { param0->unk_00.unk_00 = param1; @@ -184,16 +185,16 @@ BOOL sub_02095C60 (UnkStruct_02095C60 * param0, u32 param1) return 0; } -static void sub_02095C98 (int param0, int param1, void * param2, void * param3) +static void sub_02095C98(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095C48 * v0 = param3; - UnkStruct_02095B28 * v1; + UnkStruct_02095C48 *v0 = param3; + UnkStruct_02095B28 *v1; v1 = param2; v0->unk_1984.unk_10[param0] = v1->unk_04; } -BOOL sub_02095CA8 (UnkStruct_02095C60 * param0, int param1) +BOOL sub_02095CA8(UnkStruct_02095C60 *param0, int param1) { if (param0->unk_16 == 0) { param0->unk_10[0] = param1; diff --git a/src/unk_02095CD4.c b/src/unk_02095CD4.c index f930c7e70d..b219ccbd41 100644 --- a/src/unk_02095CD4.c +++ b/src/unk_02095CD4.c @@ -1,53 +1,54 @@ +#include "unk_02095CD4.h" + #include #include #include "struct_decls/struct_02095E80_decl.h" - #include "struct_defs/struct_02027F8C.h" #include "struct_defs/struct_02039A58.h" -#include "field/field_system.h" #include "struct_defs/struct_02095E80_t.h" +#include "field/field_system.h" +#include "overlay088/ov88_0223B140.h" + +#include "communication_system.h" +#include "party.h" #include "unk_02027F84.h" #include "unk_0202D778.h" #include "unk_02032798.h" -#include "communication_system.h" -#include "party.h" -#include "unk_02095CD4.h" -#include "overlay088/ov88_0223B140.h" -void sub_02095DFC(int param0, int param1, void * param2, void * param3); -void sub_02095E28(int param0, int param1, void * param2, void * param3); -void sub_02095DBC(int param0, int param1, void * param2, void * param3); -void sub_02095DCC(int param0, int param1, void * param2, void * param3); +void sub_02095DFC(int param0, int param1, void *param2, void *param3); +void sub_02095E28(int param0, int param1, void *param2, void *param3); +void sub_02095DBC(int param0, int param1, void *param2, void *param3); +void sub_02095DCC(int param0, int param1, void *param2, void *param3); static int sub_02095CE8(u8 param0); static int sub_02095E78(void); static int sub_02095E74(void); -static u8 * sub_02095E80(int param0, void * param1, int param2); +static u8 *sub_02095E80(int param0, void *param1, int param2); static int sub_02095E68(void); static int sub_02095E70(void); static const CommCmdTable Unk_020F59BC[] = { - {sub_02095CFC, sub_02095E78, sub_02095E80}, - {sub_02095D74, CommPacketSizeOf_NetId}, - {sub_02095D94, CommPacketSizeOf_NetId}, - {sub_02095DA4, CommPacketSizeOf_NetId}, - {sub_02095DA8, CommPacketSizeOf_NetId}, - {sub_02095DAC, CommPacketSizeOf_NetId}, - {sub_02095DFC, sub_02095E74, sub_02095E80}, - {sub_02095E28, sub_02095E68, sub_02095E80}, - {sub_02095DB8, sub_0203294C}, - {sub_02095DBC, CommPacketSizeOf_NetId}, - {sub_02095DCC, sub_02095E70} + { sub_02095CFC, sub_02095E78, sub_02095E80 }, + { sub_02095D74, CommPacketSizeOf_NetId }, + { sub_02095D94, CommPacketSizeOf_NetId }, + { sub_02095DA4, CommPacketSizeOf_NetId }, + { sub_02095DA8, CommPacketSizeOf_NetId }, + { sub_02095DAC, CommPacketSizeOf_NetId }, + { sub_02095DFC, sub_02095E74, sub_02095E80 }, + { sub_02095E28, sub_02095E68, sub_02095E80 }, + { sub_02095DB8, sub_0203294C }, + { sub_02095DBC, CommPacketSizeOf_NetId }, + { sub_02095DCC, sub_02095E70 } }; -void sub_02095CD4 (void * param0) +void sub_02095CD4(void *param0) { int v0 = sizeof(Unk_020F59BC) / sizeof(CommCmdTable); CommCmd_Init(Unk_020F59BC, v0, param0); } -static int sub_02095CE8 (u8 param0) +static int sub_02095CE8(u8 param0) { if (param0 == 12) { return 12; @@ -60,10 +61,10 @@ static int sub_02095CE8 (u8 param0) return param0 - 6; } -void sub_02095CFC (int param0, int param1, void * param2, void * param3) +void sub_02095CFC(int param0, int param1, void *param2, void *param3) { - FieldSystem * fieldSystem = (FieldSystem *)param3; - UnkStruct_02095E80 * v1 = fieldSystem->unk_88; + FieldSystem *fieldSystem = (FieldSystem *)param3; + UnkStruct_02095E80 *v1 = fieldSystem->unk_88; if (param0 != CommSys_CurNetId()) { memcpy((void *)v1->unk_2274, param2, (236 * 6 + 4 * 2)); @@ -83,59 +84,59 @@ void sub_02095CFC (int param0, int param1, void * param2, void * param3) } } -void sub_02095D74 (int param0, int param1, void * param2, void * param3) +void sub_02095D74(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88; - u8 * v1 = (u8 *)param2; + UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; + u8 *v1 = (u8 *)param2; if (param0 != CommSys_CurNetId()) { v0->unk_88[1] = sub_02095CE8(*v1); } } -void sub_02095D94 (int param0, int param1, void * param2, void * param3) +void sub_02095D94(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88; - u8 * v1 = (u8 *)param2; + UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; + u8 *v1 = (u8 *)param2; v0->unk_60[param0] = *v1; } -void sub_02095DA4 (int param0, int param1, void * param2, void * param3) +void sub_02095DA4(int param0, int param1, void *param2, void *param3) { return; } -void sub_02095DA8 (int param0, int param1, void * param2, void * param3) +void sub_02095DA8(int param0, int param1, void *param2, void *param3) { return; } -void sub_02095DAC (int param0, int param1, void * param2, void * param3) +void sub_02095DAC(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88; + UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; v0->unk_54 = 2; } -void sub_02095DB8 (int param0, int param1, void * param2, void * param3) +void sub_02095DB8(int param0, int param1, void *param2, void *param3) { return; } -void sub_02095DBC (int param0, int param1, void * param2, void * param3) +void sub_02095DBC(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88; - u8 * v1 = (u8 *)param2; + UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; + u8 *v1 = (u8 *)param2; v0->unk_2318 = *v1; } -void sub_02095DCC (int param0, int param1, void * param2, void * param3) +void sub_02095DCC(int param0, int param1, void *param2, void *param3) { - FieldSystem * fieldSystem = (FieldSystem *)param3; + FieldSystem *fieldSystem = (FieldSystem *)param3; int v1; - u8 * v2 = sub_0202D79C(fieldSystem->saveData); - u8 * v3 = (u8 *)param2; + u8 *v2 = sub_0202D79C(fieldSystem->saveData); + u8 *v3 = (u8 *)param2; if (CommSys_CurNetId() == param0) { return; @@ -150,9 +151,9 @@ void sub_02095DCC (int param0, int param1, void * param2, void * param3) } } -void sub_02095DFC (int param0, int param1, void * param2, void * param3) +void sub_02095DFC(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88; + UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; if (CommSys_CurNetId() != param0) { sub_02027FEC(v0->unk_227C, (UnkStruct_02027F8C *)param2, 1, 26); @@ -160,9 +161,9 @@ void sub_02095DFC (int param0, int param1, void * param2, void * param3) } } -void sub_02095E28 (int param0, int param1, void * param2, void * param3) +void sub_02095E28(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095E80 * v0 = ((FieldSystem *)param3)->unk_88; + UnkStruct_02095E80 *v0 = ((FieldSystem *)param3)->unk_88; if (CommSys_CurNetId() != param0) { MI_CpuCopyFast(param2, v0->unk_2E6C[param0], 1000); @@ -171,33 +172,33 @@ void sub_02095E28 (int param0, int param1, void * param2, void * param3) } } -void sub_02095E60 (FieldSystem * fieldSystem, UnkStruct_02095E80 * param1) +void sub_02095E60(FieldSystem *fieldSystem, UnkStruct_02095E80 *param1) { fieldSystem->unk_88 = param1; } -static int sub_02095E68 (void) +static int sub_02095E68(void) { return 1000 + 4; } -static int sub_02095E70 (void) +static int sub_02095E70(void) { return 14; } -static int sub_02095E74 (void) +static int sub_02095E74(void) { return sizeof(UnkStruct_02027F8C); } -static int sub_02095E78 (void) +static int sub_02095E78(void) { return 236 * 6 + 4 * 2; } -static u8 * sub_02095E80 (int param0, void * param1, int param2) +static u8 *sub_02095E80(int param0, void *param1, int param2) { - UnkStruct_02095E80 * v0 = ((FieldSystem *)param1)->unk_88; + UnkStruct_02095E80 *v0 = ((FieldSystem *)param1)->unk_88; return (u8 *)v0->unk_234C[param0]; } diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c index 8e0e1b8e6a..e9fd12a0fe 100644 --- a/src/unk_02095E98.c +++ b/src/unk_02095E98.c @@ -1,3 +1,5 @@ +#include "unk_02095E98.h" + #include #include @@ -5,150 +7,150 @@ #include "struct_defs/struct_02095EAC_sub1.h" #include "struct_defs/struct_02095EAC_t.h" #include "struct_defs/struct_02095FE4.h" + +#include "overlay058/ov58_021D0D80.h" #include "overlay058/struct_ov58_021D2820.h" +#include "communication_system.h" #include "unk_02018340.h" #include "unk_02030EE0.h" #include "unk_02032798.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "unk_02095E98.h" #include "unk_02099500.h" -#include "overlay058/ov58_021D0D80.h" typedef struct UnkStruct_02095EAC_t UnkStruct_02095EAC; -static u8 * sub_020961D0(int param0, void * param1, int param2); +static u8 *sub_020961D0(int param0, void *param1, int param2); static int sub_020961E0(void); static int sub_020961E4(void); -static void sub_0209617C(UnkStruct_02095EAC * param0, int param1); -static void sub_02096170(int param0, int param1, void * param2, void * param3); +static void sub_0209617C(UnkStruct_02095EAC *param0, int param1); +static void sub_02096170(int param0, int param1, void *param2, void *param3); static const CommCmdTable Unk_020F5A40[] = { - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, sub_020961E0, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02095EAC, sub_02099538, sub_020961D0}, - {sub_02095F40, sub_02099540}, - {sub_02095F68, sub_02099544}, - {sub_0209610C, CommPacketSizeOf_NetId}, - {sub_02096110, CommPacketSizeOf_NetId}, - {sub_020960D8, CommPacketSizeOf_NetId}, - {sub_02095F9C, sub_0203294C}, - {sub_020960D4, sub_0203294C}, - {sub_02095FE4, sub_020961E4}, - {sub_02096114, sub_0203294C}, - {sub_0209612C, sub_0203294C}, - {sub_02096170, sub_0203294C}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL} + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, sub_020961E0, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02095EAC, sub_02099538, sub_020961D0 }, + { sub_02095F40, sub_02099540 }, + { sub_02095F68, sub_02099544 }, + { sub_0209610C, CommPacketSizeOf_NetId }, + { sub_02096110, CommPacketSizeOf_NetId }, + { sub_020960D8, CommPacketSizeOf_NetId }, + { sub_02095F9C, sub_0203294C }, + { sub_020960D4, sub_0203294C }, + { sub_02095FE4, sub_020961E4 }, + { sub_02096114, sub_0203294C }, + { sub_0209612C, sub_0203294C }, + { sub_02096170, sub_0203294C }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL } }; -void sub_02095E98 (void * param0) +void sub_02095E98(void *param0) { int v0 = sizeof(Unk_020F5A40) / sizeof(CommCmdTable); CommCmd_Init(Unk_020F5A40, v0, param0); } -void sub_02095EAC (int param0, int param1, void * param2, void * param3) +void sub_02095EAC(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095EAC * v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; if (CommSys_CurNetId() != 0) { - UnkStruct_02095EAC_sub1 * v1 = (UnkStruct_02095EAC_sub1 *)param2; + UnkStruct_02095EAC_sub1 *v1 = (UnkStruct_02095EAC_sub1 *)param2; if (v1->unk_3EC * 1000 > 30 * 15 * 32) { MI_CpuCopyFast(v1->unk_00, &v0->unk_4434[v1->unk_3EC * 1000], (30 * 15 * 32) % 1000); @@ -159,7 +161,7 @@ void sub_02095EAC (int param0, int param1, void * param2, void * param3) MI_CpuCopyFast(v0->unk_4434, v0->unk_32C.unk_0C, 30 * 15 * 32); sub_0201A954(&v0->unk_32C); } else { - UnkStruct_02095EAC_sub1 * v2 = (UnkStruct_02095EAC_sub1 *)param2; + UnkStruct_02095EAC_sub1 *v2 = (UnkStruct_02095EAC_sub1 *)param2; if (v0->unk_4430 * 1000 < 30 * 15 * 32) { v0->unk_4430++; @@ -170,20 +172,20 @@ void sub_02095EAC (int param0, int param1, void * param2, void * param3) } } -void sub_02095F40 (int param0, int param1, void * param2, void * param3) +void sub_02095F40(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095EAC * v0 = (UnkStruct_02095EAC *)param3; - UnkStruct_ov58_021D2820 * v1 = (UnkStruct_ov58_021D2820 *)param2; + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_ov58_021D2820 *v1 = (UnkStruct_ov58_021D2820 *)param2; if (param0 != 0) { v0->unk_9421[param0] = *v1; } } -void sub_02095F68 (int param0, int param1, void * param2, void * param3) +void sub_02095F68(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095EAC * v0 = (UnkStruct_02095EAC *)param3; - UnkStruct_ov58_021D2820 * v1 = (UnkStruct_ov58_021D2820 *)param2; + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_ov58_021D2820 *v1 = (UnkStruct_ov58_021D2820 *)param2; if (v0 == NULL) { return; @@ -202,9 +204,9 @@ void sub_02095F68 (int param0, int param1, void * param2, void * param3) } } -void sub_02095F9C (int param0, int param1, void * param2, void * param3) +void sub_02095F9C(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095EAC * v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; ov58_021D2434(v0, 3, 0); MI_CpuClearFast(v0->unk_4434, 30 * 15 * 32); @@ -216,11 +218,11 @@ void sub_02095F9C (int param0, int param1, void * param2, void * param3) } } -void sub_02095FE4 (int param0, int param1, void * param2, void * param3) +void sub_02095FE4(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095EAC * v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; UnkStruct_02095FE4 v1; - UnkStruct_02095FE4 * v2; + UnkStruct_02095FE4 *v2; v2 = param2; @@ -265,14 +267,14 @@ void sub_02095FE4 (int param0, int param1, void * param2, void * param3) } } -void sub_020960D4 (int param0, int param1, void * param2, void * param3) +void sub_020960D4(int param0, int param1, void *param2, void *param3) { return; } -void sub_020960D8 (int param0, int param1, void * param2, void * param3) +void sub_020960D8(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095EAC * v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; u8 v1; v1 = *(u8 *)param2; @@ -285,28 +287,28 @@ void sub_020960D8 (int param0, int param1, void * param2, void * param3) } } -void sub_0209610C (int param0, int param1, void * param2, void * param3) +void sub_0209610C(int param0, int param1, void *param2, void *param3) { return; } -void sub_02096110 (int param0, int param1, void * param2, void * param3) +void sub_02096110(int param0, int param1, void *param2, void *param3) { return; } -void sub_02096114 (int param0, int param1, void * param2, void * param3) +void sub_02096114(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095EAC * v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; if (CommSys_CurNetId() != 0) { ov58_021D2434(v0, 15, 0); } } -void sub_0209612C (int param0, int param1, void * param2, void * param3) +void sub_0209612C(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095EAC * v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; u8 v1; GF_ASSERT(CommSys_CurNetId() == 0); @@ -323,21 +325,21 @@ void sub_0209612C (int param0, int param1, void * param2, void * param3) CommMan_SetErrorHandling(0, 1); } -static void sub_02096170 (int param0, int param1, void * param2, void * param3) +static void sub_02096170(int param0, int param1, void *param2, void *param3) { - UnkStruct_02095EAC * v0 = (UnkStruct_02095EAC *)param3; + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param3; v0->unk_9458 = 1; } -static void sub_0209617C (UnkStruct_02095EAC * param0, int param1) +static void sub_0209617C(UnkStruct_02095EAC *param0, int param1) { - u8 * v0 = (u8 *)param0->unk_32C.unk_0C; + u8 *v0 = (u8 *)param0->unk_32C.unk_0C; MI_CpuCopyFast(&v0[param1 * 1000], param0->unk_7C74.unk_00, 1000); { int v1; - u32 * v2, v3; + u32 *v2, v3; v2 = (u32 *)param0->unk_7C74.unk_00; @@ -353,18 +355,18 @@ static void sub_0209617C (UnkStruct_02095EAC * param0, int param1) sub_02035A3C(118, ¶m0->unk_7C74, sizeof(UnkStruct_02095EAC_sub1)); } -static u8 * sub_020961D0 (int param0, void * param1, int param2) +static u8 *sub_020961D0(int param0, void *param1, int param2) { - UnkStruct_02095EAC * v0 = (UnkStruct_02095EAC *)param1; + UnkStruct_02095EAC *v0 = (UnkStruct_02095EAC *)param1; return (u8 *)&v0->unk_8064[param0]; } -static int sub_020961E0 (void) +static int sub_020961E0(void) { return 4; } -static int sub_020961E4 (void) +static int sub_020961E4(void) { return sizeof(UnkStruct_02095FE4); } diff --git a/src/unk_020961E8.c b/src/unk_020961E8.c index 425764c00a..9607328dd5 100644 --- a/src/unk_020961E8.c +++ b/src/unk_020961E8.c @@ -1,147 +1,149 @@ +#include "unk_020961E8.h" + #include #include #include "struct_defs/struct_02039A58.h" #include "struct_defs/struct_020961E8_t.h" #include "struct_defs/struct_02096274.h" + +#include "overlay059/ov59_021D0D80.h" #include "overlay059/struct_ov59_021D30E0.h" +#include "communication_system.h" #include "unk_02005474.h" #include "unk_0201D15C.h" #include "unk_02030EE0.h" #include "unk_02032798.h" -#include "communication_system.h" #include "unk_020366A0.h" -#include "unk_020961E8.h" #include "unk_02099500.h" -#include "overlay059/ov59_021D0D80.h" typedef struct UnkStruct_020961E8_t UnkStruct_020961E8; static int sub_02096400(void); static int sub_02096404(void); -static u8 * sub_0209640C(int param0, void * param1, int param2); +static u8 *sub_0209640C(int param0, void *param1, int param2); static int sub_02096408(void); -static void sub_020963C0(UnkStruct_020961E8 * param0, int param1); -void sub_020961FC(int param0, int param1, void * param2, void * param3); -void sub_0209620C(int param0, int param1, void * param2, void * param3); +static void sub_020963C0(UnkStruct_020961E8 *param0, int param1); +void sub_020961FC(int param0, int param1, void *param2, void *param3); +void sub_0209620C(int param0, int param1, void *param2, void *param3); static const CommCmdTable Unk_020F5F68[] = { - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02096380, sub_02096404}, - {sub_02096384, sub_02096404}, - {sub_02096360, sub_02096404}, - {sub_02096264, sub_02096400}, - {sub_02096274, sub_02096408}, - {sub_02096388, sub_02096400}, - {sub_020963A0, sub_02096400}, - {sub_0209621C, sub_02096400}, - {sub_020961FC, sub_02099530, sub_0209640C}, - {sub_0209620C, sub_02096404}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL}, - {sub_02099510, sub_02096400, NULL} + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02096380, sub_02096404 }, + { sub_02096384, sub_02096404 }, + { sub_02096360, sub_02096404 }, + { sub_02096264, sub_02096400 }, + { sub_02096274, sub_02096408 }, + { sub_02096388, sub_02096400 }, + { sub_020963A0, sub_02096400 }, + { sub_0209621C, sub_02096400 }, + { sub_020961FC, sub_02099530, sub_0209640C }, + { sub_0209620C, sub_02096404 }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL }, + { sub_02099510, sub_02096400, NULL } }; -void sub_020961E8 (void * param0) +void sub_020961E8(void *param0) { - UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param0; + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param0; int v1; int v2 = sizeof(Unk_020F5F68) / sizeof(CommCmdTable); @@ -152,16 +154,16 @@ void sub_020961E8 (void * param0) } } -void sub_020961FC (int param0, int param1, void * param2, void * param3) +void sub_020961FC(int param0, int param1, void *param2, void *param3) { - UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param3; + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; v0->unk_4A98++; } -void sub_0209620C (int param0, int param1, void * param2, void * param3) +void sub_0209620C(int param0, int param1, void *param2, void *param3) { - UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param3; - u8 * v1 = (u8 *)param2; + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; + u8 *v1 = (u8 *)param2; if (param0 == 0) { if (v0->unk_4AA0 != *v1) { @@ -172,9 +174,9 @@ void sub_0209620C (int param0, int param1, void * param2, void * param3) } } -void sub_0209621C (int param0, int param1, void * param2, void * param3) +void sub_0209621C(int param0, int param1, void *param2, void *param3) { - UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param3; + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; v0->unk_4A98 = 0; v0->unk_4AA4 = 1; @@ -188,17 +190,17 @@ void sub_0209621C (int param0, int param1, void * param2, void * param3) Sound_PlayEffect(1624); } -void sub_02096264 (int param0, int param1, void * param2, void * param3) +void sub_02096264(int param0, int param1, void *param2, void *param3) { - UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param3; + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; ov59_021D2204(v0, 2, 0); } -void sub_02096274 (int param0, int param1, void * param2, void * param3) +void sub_02096274(int param0, int param1, void *param2, void *param3) { - UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param3; + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; UnkStruct_02096274 v1; - UnkStruct_02096274 * v2; + UnkStruct_02096274 *v2; v2 = param2; @@ -244,9 +246,9 @@ void sub_02096274 (int param0, int param1, void * param2, void * param3) } } -void sub_02096360 (int param0, int param1, void * param2, void * param3) +void sub_02096360(int param0, int param1, void *param2, void *param3) { - UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param3; + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; u8 v1; v1 = *(u8 *)param2; @@ -258,26 +260,26 @@ void sub_02096360 (int param0, int param1, void * param2, void * param3) } } -void sub_02096380 (int param0, int param1, void * param2, void * param3) +void sub_02096380(int param0, int param1, void *param2, void *param3) { return; } -void sub_02096384 (int param0, int param1, void * param2, void * param3) +void sub_02096384(int param0, int param1, void *param2, void *param3) { return; } -void sub_02096388 (int param0, int param1, void * param2, void * param3) +void sub_02096388(int param0, int param1, void *param2, void *param3) { - UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param3; + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param3; if (CommSys_CurNetId() != 0) { ov59_021D2204(v0, 13, 0); } } -void sub_020963A0 (int param0, int param1, void * param2, void * param3) +void sub_020963A0(int param0, int param1, void *param2, void *param3) { u8 v0; @@ -287,11 +289,11 @@ void sub_020963A0 (int param0, int param1, void * param2, void * param3) } } -static void sub_020963C0 (UnkStruct_020961E8 * param0, int param1) +static void sub_020963C0(UnkStruct_020961E8 *param0, int param1) { { int v0; - u32 * v1, v2; + u32 *v1, v2; v1 = (u32 *)param0->unk_418.unk_00; @@ -306,23 +308,23 @@ static void sub_020963C0 (UnkStruct_020961E8 * param0, int param1) CommSys_SendDataHuge(116, ¶m0->unk_418, sizeof(UnkStruct_ov59_021D30E0)); } -static int sub_02096400 (void) +static int sub_02096400(void) { return 0; } -static int sub_02096404 (void) +static int sub_02096404(void) { return 1; } -static int sub_02096408 (void) +static int sub_02096408(void) { return sizeof(UnkStruct_02096274); } -static u8 * sub_0209640C (int param0, void * param1, int param2) +static u8 *sub_0209640C(int param0, void *param1, int param2) { - UnkStruct_020961E8 * v0 = (UnkStruct_020961E8 *)param1; + UnkStruct_020961E8 *v0 = (UnkStruct_020961E8 *)param1; return (u8 *)&v0->unk_FD8[param0]; } diff --git a/src/unk_02096420.c b/src/unk_02096420.c index aa33d839b0..1f97a65da4 100644 --- a/src/unk_02096420.c +++ b/src/unk_02096420.c @@ -1,27 +1,27 @@ +#include "unk_02096420.h" + #include #include -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" #include "heap.h" -#include "pokemon.h" +#include "item.h" #include "move_table.h" #include "party.h" -#include "item.h" -#include "unk_02096420.h" +#include "pokemon.h" -static u8 CheckMovePPAvailability(Pokemon * param0, u32 param1); -static u8 UpdatePokemonMovePP(Pokemon * param0, u32 param1, u32 param2); -static u8 IncreaseMovePPUps(Pokemon * param0, u32 param1, u32 param2); -static void RestorePokemonHP(Pokemon * param0, u32 param1, u32 param2, u32 param3); +static u8 CheckMovePPAvailability(Pokemon *param0, u32 param1); +static u8 UpdatePokemonMovePP(Pokemon *param0, u32 param1, u32 param2); +static u8 IncreaseMovePPUps(Pokemon *param0, u32 param1, u32 param2); +static void RestorePokemonHP(Pokemon *param0, u32 param1, u32 param2, u32 param3); static s32 CalculateEVUpdate(s32 param0, s32 param1, s32 param2); -static u8 UpdatePokemonFriendship(Pokemon * param0, s32 param1, s32 param2, u16 param3, u32 param4); -static u8 CheckFriendshipItemEffect(Pokemon * param0, ItemData * param1); +static u8 UpdatePokemonFriendship(Pokemon *param0, s32 param1, s32 param2, u16 param3, u32 param4); +static u8 CheckFriendshipItemEffect(Pokemon *param0, ItemData *param1); -u8 CheckItemEffectsOnPokemon (Pokemon * param0, u16 param1, u16 param2, u32 param3) +u8 CheckItemEffectsOnPokemon(Pokemon *param0, u16 param1, u16 param2, u32 param3) { - ItemData * v0; + ItemData *v0; s32 v1[8]; v0 = Item_Load(param1, 0, param3); @@ -259,15 +259,15 @@ u8 CheckItemEffectsOnPokemon (Pokemon * param0, u16 param1, u16 param2, u32 para return 0; } -u8 CheckItemEffectsOnPartyMember (Party * param0, u16 param1, u8 param2, u8 param3, u32 param4) +u8 CheckItemEffectsOnPartyMember(Party *param0, u16 param1, u8 param2, u8 param3, u32 param4) { - Pokemon * v0 = Party_GetPokemonBySlotIndex(param0, param2); + Pokemon *v0 = Party_GetPokemonBySlotIndex(param0, param2); return CheckItemEffectsOnPokemon(v0, param1, param3, param4); } -u8 ApplyItemEffectsToPokemon (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param4) +u8 ApplyItemEffectsToPokemon(Pokemon *param0, u16 param1, u16 param2, u16 param3, u32 param4) { - ItemData * v0; + ItemData *v0; s32 v1[8]; u8 v2; u8 v3; @@ -525,14 +525,14 @@ u8 ApplyItemEffectsToPokemon (Pokemon * param0, u16 param1, u16 param2, u16 para return v2; } -u8 sub_02096F14 (Party * param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5) +u8 sub_02096F14(Party *param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5) { - Pokemon * v0 = Party_GetPokemonBySlotIndex(param0, param2); + Pokemon *v0 = Party_GetPokemonBySlotIndex(param0, param2); return ApplyItemEffectsToPokemon(v0, param1, param3, param4, param5); } -static u8 CheckMovePPAvailability (Pokemon * mon, u32 moveIDX) // param0,1 +static u8 CheckMovePPAvailability(Pokemon *mon, u32 moveIDX) // param0,1 { u16 move; // v0 u8 ppCurr; // v1 @@ -554,7 +554,7 @@ static u8 CheckMovePPAvailability (Pokemon * mon, u32 moveIDX) // param0,1 return 0; } -static u8 UpdatePokemonMovePP (Pokemon * mon, u32 moveIDX, u32 pp) +static u8 UpdatePokemonMovePP(Pokemon *mon, u32 moveIDX, u32 pp) { u16 move; u8 ppCurr; @@ -587,7 +587,7 @@ static u8 UpdatePokemonMovePP (Pokemon * mon, u32 moveIDX, u32 pp) return 0; } -static u8 IncreaseMovePPUps (Pokemon * param0, u32 param1, u32 param2) +static u8 IncreaseMovePPUps(Pokemon *param0, u32 param1, u32 param2) { u16 v0; u8 v1; @@ -623,7 +623,7 @@ static u8 IncreaseMovePPUps (Pokemon * param0, u32 param1, u32 param2) return 1; } -static void RestorePokemonHP (Pokemon * mon, u32 param1, u32 param2, u32 param3) +static void RestorePokemonHP(Pokemon *mon, u32 param1, u32 param2, u32 param3) { if (param2 == 1) { param3 = 1; @@ -644,7 +644,7 @@ static void RestorePokemonHP (Pokemon * mon, u32 param1, u32 param2, u32 param3) Pokemon_SetValue(mon, 163, ¶m1); } -static s32 CalculateEVUpdate (s32 param0, s32 param1, s32 param2) +static s32 CalculateEVUpdate(s32 param0, s32 param1, s32 param2) { if ((param0 == 0) && (param2 < 0)) { return -1; @@ -673,7 +673,7 @@ static s32 CalculateEVUpdate (s32 param0, s32 param1, s32 param2) return param0; } -static u8 CheckFriendshipItemEffect (Pokemon * param0, ItemData * param1) +static u8 CheckFriendshipItemEffect(Pokemon *param0, ItemData *param1) { s32 v0; s32 v1; @@ -713,7 +713,7 @@ static u8 CheckFriendshipItemEffect (Pokemon * param0, ItemData * param1) return 0; } -static u8 UpdatePokemonFriendship (Pokemon * param0, s32 param1, s32 param2, u16 param3, u32 param4) +static u8 UpdatePokemonFriendship(Pokemon *param0, s32 param1, s32 param2, u16 param3, u32 param4) { if ((param1 == 255) && (param2 > 0)) { return 0; @@ -751,11 +751,11 @@ static u8 UpdatePokemonFriendship (Pokemon * param0, s32 param1, s32 param2, u16 return 1; } -void HealAllPokemonInParty (Party * party) +void HealAllPokemonInParty(Party *party) { int i, j, monCount; u32 tmp; - Pokemon * mon; + Pokemon *mon; monCount = Party_GetCurrentCount(party); diff --git a/src/unk_020972FC.c b/src/unk_020972FC.c index 7ebf6e9b55..f6b4543bb4 100644 --- a/src/unk_020972FC.c +++ b/src/unk_020972FC.c @@ -1,21 +1,22 @@ +#include "unk_020972FC.h" + #include #include #include "struct_defs/struct_020972FC.h" #include "heap.h" -#include "unk_020972FC.h" -static void sub_02097344(u32 * param0, u16 param1); +static void sub_02097344(u32 *param0, u16 param1); -UnkStruct_020972FC * sub_020972FC (u8 param0) +UnkStruct_020972FC *sub_020972FC(u8 param0) { - UnkStruct_020972FC * v0 = (UnkStruct_020972FC *)Heap_AllocFromHeap(param0, sizeof(UnkStruct_020972FC)); + UnkStruct_020972FC *v0 = (UnkStruct_020972FC *)Heap_AllocFromHeap(param0, sizeof(UnkStruct_020972FC)); memset(v0, 0, sizeof(UnkStruct_020972FC)); return v0; } -void sub_02097320 (UnkStruct_020972FC * param0, u16 param1, u16 param2) +void sub_02097320(UnkStruct_020972FC *param0, u16 param1, u16 param2) { u16 v0 = param1 - 149; @@ -26,19 +27,19 @@ void sub_02097320 (UnkStruct_020972FC * param0, u16 param1, u16 param2) } } -void sub_0209733C (UnkStruct_020972FC * param0, u8 param1, u8 param2, u8 param3) +void sub_0209733C(UnkStruct_020972FC *param0, u8 param1, u8 param2, u8 param3) { param0->unk_09 = param1; param0->unk_0A = param2; param0->unk_0B = param3; } -static void sub_02097344 (u32 * param0, u16 param1) +static void sub_02097344(u32 *param0, u16 param1) { param0[param1 / 32] |= (1 << (param1 % 32)); } -u8 sub_02097368 (u32 * param0, u16 param1) +u8 sub_02097368(u32 *param0, u16 param1) { if ((param0[param1 / 32] & (1 << (param1 % 32))) != 0) { return 1; @@ -47,7 +48,7 @@ u8 sub_02097368 (u32 * param0, u16 param1) return 0; } -void sub_02097390 (UnkStruct_020972FC * param0, u8 * param1, u8 * param2) +void sub_02097390(UnkStruct_020972FC *param0, u8 *param1, u8 *param2) { *param1 = param0->unk_09; *param2 = param0->unk_0A; diff --git a/src/unk_0209747C.c b/src/unk_0209747C.c index 592b297016..0639f8b9b4 100644 --- a/src/unk_0209747C.c +++ b/src/unk_0209747C.c @@ -1,22 +1,22 @@ +#include "unk_0209747C.h" + #include #include -#include "struct_decls/struct_02014EC4_decl.h" #include "struct_decls/pokedexdata_decl.h" +#include "struct_decls/struct_02014EC4_decl.h" #include "struct_decls/struct_0209747C_decl.h" -#include "savedata.h" - #include "struct_defs/sentence.h" +#include "game_options.h" +#include "heap.h" +#include "savedata.h" #include "unk_02014A84.h" #include "unk_02014D38.h" -#include "heap.h" #include "unk_02025E08.h" #include "unk_0202631C.h" -#include "game_options.h" -#include "vars_flags.h" #include "unk_0206A8DC.h" -#include "unk_0209747C.h" +#include "vars_flags.h" struct UnkStruct_0209747C_t { u8 unk_00; @@ -26,16 +26,16 @@ struct UnkStruct_0209747C_t { u8 unk_04; u8 unk_05; int unk_08; - const PokedexData * unk_0C; - const UnkStruct_02014EC4 * unk_10; + const PokedexData *unk_0C; + const UnkStruct_02014EC4 *unk_10; Sentence unk_14; u16 unk_1C[2]; u16 unk_20[2]; }; -UnkStruct_0209747C * sub_0209747C (u32 param0, u32 param1, SaveData * param2, u32 param3) +UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *param2, u32 param3) { - UnkStruct_0209747C * v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_0209747C)); + UnkStruct_0209747C *v0 = Heap_AllocFromHeap(param3, sizeof(UnkStruct_0209747C)); v0->unk_00 = param0; v0->unk_01 = param1; @@ -60,100 +60,100 @@ UnkStruct_0209747C * sub_0209747C (u32 param0, u32 param1, SaveData * param2, u3 return v0; } -void sub_020974EC (UnkStruct_0209747C * param0) +void sub_020974EC(UnkStruct_0209747C *param0) { Heap_FreeToHeap(param0); } -void sub_020974F4 (UnkStruct_0209747C * param0, u16 param1) +void sub_020974F4(UnkStruct_0209747C *param0, u16 param1) { param0->unk_1C[0] = param1; } -void sub_020974F8 (UnkStruct_0209747C * param0, u16 param1, u16 param2) +void sub_020974F8(UnkStruct_0209747C *param0, u16 param1, u16 param2) { param0->unk_1C[0] = param1; param0->unk_1C[1] = param2; } -void sub_02097500 (UnkStruct_0209747C * param0, const Sentence * param1) +void sub_02097500(UnkStruct_0209747C *param0, const Sentence *param1) { param0->unk_14 = *param1; } -void sub_02097514 (UnkStruct_0209747C * param0) +void sub_02097514(UnkStruct_0209747C *param0) { param0->unk_02 = 1; param0->unk_03 = 0; } -void sub_02097520 (UnkStruct_0209747C * param0) +void sub_02097520(UnkStruct_0209747C *param0) { param0->unk_05 = 1; } -BOOL sub_02097528 (const UnkStruct_0209747C * param0) +BOOL sub_02097528(const UnkStruct_0209747C *param0) { return param0->unk_02; } -BOOL sub_0209752C (const UnkStruct_0209747C * param0) +BOOL sub_0209752C(const UnkStruct_0209747C *param0) { return param0->unk_03; } -u16 sub_02097530 (const UnkStruct_0209747C * param0) +u16 sub_02097530(const UnkStruct_0209747C *param0) { return param0->unk_1C[0]; } -void sub_02097534 (const UnkStruct_0209747C * param0, u16 * param1) +void sub_02097534(const UnkStruct_0209747C *param0, u16 *param1) { param1[0] = param0->unk_1C[0]; param1[1] = param0->unk_1C[1]; } -void sub_02097540 (const UnkStruct_0209747C * param0, Sentence * param1) +void sub_02097540(const UnkStruct_0209747C *param0, Sentence *param1) { sub_02014CC0(param1, &(param0->unk_14)); } -u32 sub_02097550 (const UnkStruct_0209747C * param0) +u32 sub_02097550(const UnkStruct_0209747C *param0) { return param0->unk_00; } -u32 sub_02097554 (const UnkStruct_0209747C * param0) +u32 sub_02097554(const UnkStruct_0209747C *param0) { return param0->unk_01; } -int sub_02097558 (const UnkStruct_0209747C * param0) +int sub_02097558(const UnkStruct_0209747C *param0) { return param0->unk_08; } -const PokedexData * sub_0209755C (const UnkStruct_0209747C * param0) +const PokedexData *sub_0209755C(const UnkStruct_0209747C *param0) { return param0->unk_0C; } -const UnkStruct_02014EC4 * sub_02097560 (const UnkStruct_0209747C * param0) +const UnkStruct_02014EC4 *sub_02097560(const UnkStruct_0209747C *param0) { return param0->unk_10; } -BOOL sub_02097564 (const UnkStruct_0209747C * param0) +BOOL sub_02097564(const UnkStruct_0209747C *param0) { return param0->unk_04; } -BOOL sub_02097568 (const UnkStruct_0209747C * param0) +BOOL sub_02097568(const UnkStruct_0209747C *param0) { return param0->unk_05; } -void sub_0209756C (const UnkStruct_0209747C * param0, u16 * param1, Sentence * param2) +void sub_0209756C(const UnkStruct_0209747C *param0, u16 *param1, Sentence *param2) { switch (param0->unk_00) { case 0: @@ -169,7 +169,7 @@ void sub_0209756C (const UnkStruct_0209747C * param0, u16 * param1, Sentence * p } } -BOOL sub_020975A0 (const UnkStruct_0209747C * param0, const u16 * param1, const Sentence * param2) +BOOL sub_020975A0(const UnkStruct_0209747C *param0, const u16 *param1, const Sentence *param2) { switch (param0->unk_00) { case 0: @@ -182,7 +182,7 @@ BOOL sub_020975A0 (const UnkStruct_0209747C * param0, const u16 * param1, const } } -void sub_020975E4 (UnkStruct_0209747C * param0, const u16 * param1, const Sentence * param2) +void sub_020975E4(UnkStruct_0209747C *param0, const u16 *param1, const Sentence *param2) { int v0; diff --git a/src/unk_02097624.c b/src/unk_02097624.c index 4c1293d6ef..73d728cac0 100644 --- a/src/unk_02097624.c +++ b/src/unk_02097624.c @@ -2,26 +2,25 @@ #include #include "struct_decls/struct_02028430_decl.h" -#include "pokemon.h" -#include "savedata.h" - #include "struct_defs/sentence.h" #include "struct_defs/struct_0202818C.h" #include "struct_defs/struct_02097728.h" #include "struct_defs/struct_020978D8.h" -#include "overlay_manager.h" -#include "unk_02014A84.h" +#include "overlay020/ov20_021D0D80.h" +#include "overlay075/ov75_021D0D80.h" + #include "heap.h" +#include "item.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "savedata.h" #include "strbuf.h" +#include "unk_02014A84.h" #include "unk_02025E08.h" #include "unk_02028124.h" #include "unk_0202CD50.h" -#include "pokemon.h" -#include "item.h" #include "unk_0209747C.h" -#include "overlay020/ov20_021D0D80.h" -#include "overlay075/ov75_021D0D80.h" FS_EXTERN_OVERLAY(overlay20); FS_EXTERN_OVERLAY(overlay75); @@ -30,28 +29,28 @@ typedef struct { int unk_00; u16 unk_04; u16 unk_06; - void * unk_08; - OverlayManager * unk_0C; - UnkStruct_020978D8 * unk_10; + void *unk_08; + OverlayManager *unk_0C; + UnkStruct_020978D8 *unk_10; Sentence unk_14; } UnkStruct_02097944; -static int sub_02097944(OverlayManager * param0, int * param1); -static int sub_020979A8(OverlayManager * param0, int * param1); -static int sub_02097AF8(OverlayManager * param0, int * param1); -UnkStruct_02097728 * sub_02097624(SaveData * param0, int param1, u8 param2, u8 param3, int param4); -UnkStruct_02097728 * sub_0209767C(SaveData * param0, int param1, u16 param2, int param3); -UnkStruct_02097728 * sub_020976BC(SaveData * param0, Pokemon * param1, int param2); -UnkStruct_02097728 * sub_020976F4(SaveData * param0, u8 param1, int param2); -BOOL sub_02097728(UnkStruct_02097728 * param0); -int sub_0209772C(UnkStruct_02097728 * param0, int param1, u8 param2); -int sub_02097750(UnkStruct_02097728 * param0, Pokemon * param1); -void sub_02097770(UnkStruct_02097728 * param0); -int sub_02097788(UnkStruct_02028430 * param0, Pokemon * param1, int param2); -int sub_020977E4(UnkStruct_02028430 * param0, u16 param1, Pokemon * param2, int param3); -UnkStruct_020978D8 * sub_02097834(const UnkStruct_0202818C * param0, int param1); -void sub_020978D8(UnkStruct_020978D8 * param0); -void sub_020978F0(UnkStruct_0202818C * param0, UnkStruct_020978D8 * param1); +static int sub_02097944(OverlayManager *param0, int *param1); +static int sub_020979A8(OverlayManager *param0, int *param1); +static int sub_02097AF8(OverlayManager *param0, int *param1); +UnkStruct_02097728 *sub_02097624(SaveData *param0, int param1, u8 param2, u8 param3, int param4); +UnkStruct_02097728 *sub_0209767C(SaveData *param0, int param1, u16 param2, int param3); +UnkStruct_02097728 *sub_020976BC(SaveData *param0, Pokemon *param1, int param2); +UnkStruct_02097728 *sub_020976F4(SaveData *param0, u8 param1, int param2); +BOOL sub_02097728(UnkStruct_02097728 *param0); +int sub_0209772C(UnkStruct_02097728 *param0, int param1, u8 param2); +int sub_02097750(UnkStruct_02097728 *param0, Pokemon *param1); +void sub_02097770(UnkStruct_02097728 *param0); +int sub_02097788(UnkStruct_02028430 *param0, Pokemon *param1, int param2); +int sub_020977E4(UnkStruct_02028430 *param0, u16 param1, Pokemon *param2, int param3); +UnkStruct_020978D8 *sub_02097834(const UnkStruct_0202818C *param0, int param1); +void sub_020978D8(UnkStruct_020978D8 *param0); +void sub_020978F0(UnkStruct_0202818C *param0, UnkStruct_020978D8 *param1); const OverlayManagerTemplate Unk_020F64B0 = { sub_02097944, @@ -60,10 +59,10 @@ const OverlayManagerTemplate Unk_020F64B0 = { 0xFFFFFFFF }; -UnkStruct_02097728 * sub_02097624 (SaveData * param0, int param1, u8 param2, u8 param3, int param4) +UnkStruct_02097728 *sub_02097624(SaveData *param0, int param1, u8 param2, u8 param3, int param4) { - UnkStruct_02097728 * v0; - UnkStruct_02028430 * v1; + UnkStruct_02097728 *v0; + UnkStruct_02028430 *v1; int v2; v1 = sub_02028430(param0); @@ -86,10 +85,10 @@ UnkStruct_02097728 * sub_02097624 (SaveData * param0, int param1, u8 param2, u8 return v0; } -UnkStruct_02097728 * sub_0209767C (SaveData * param0, int param1, u16 param2, int param3) +UnkStruct_02097728 *sub_0209767C(SaveData *param0, int param1, u16 param2, int param3) { - UnkStruct_02097728 * v0; - UnkStruct_02028430 * v1; + UnkStruct_02097728 *v0; + UnkStruct_02028430 *v1; v0 = Heap_AllocFromHeapAtEnd(param3, sizeof(UnkStruct_02097728)); MI_CpuClear8(v0, sizeof(UnkStruct_02097728)); @@ -107,9 +106,9 @@ UnkStruct_02097728 * sub_0209767C (SaveData * param0, int param1, u16 param2, in return v0; } -UnkStruct_02097728 * sub_020976BC (SaveData * param0, Pokemon * param1, int param2) +UnkStruct_02097728 *sub_020976BC(SaveData *param0, Pokemon *param1, int param2) { - UnkStruct_02097728 * v0; + UnkStruct_02097728 *v0; v0 = Heap_AllocFromHeapAtEnd(param2, sizeof(UnkStruct_02097728)); MI_CpuClear8(v0, sizeof(UnkStruct_02097728)); @@ -122,9 +121,9 @@ UnkStruct_02097728 * sub_020976BC (SaveData * param0, Pokemon * param1, int para return v0; } -UnkStruct_02097728 * sub_020976F4 (SaveData * param0, u8 param1, int param2) +UnkStruct_02097728 *sub_020976F4(SaveData *param0, u8 param1, int param2) { - UnkStruct_02097728 * v0; + UnkStruct_02097728 *v0; v0 = Heap_AllocFromHeapAtEnd(param2, sizeof(UnkStruct_02097728)); MI_CpuClear8(v0, sizeof(UnkStruct_02097728)); @@ -137,12 +136,12 @@ UnkStruct_02097728 * sub_020976F4 (SaveData * param0, u8 param1, int param2) return v0; } -BOOL sub_02097728 (UnkStruct_02097728 * param0) +BOOL sub_02097728(UnkStruct_02097728 *param0) { return param0->unk_04; } -int sub_0209772C (UnkStruct_02097728 * param0, int param1, u8 param2) +int sub_0209772C(UnkStruct_02097728 *param0, int param1, u8 param2) { if (!sub_02097728(param0)) { return 0; @@ -152,7 +151,7 @@ int sub_0209772C (UnkStruct_02097728 * param0, int param1, u8 param2) return 1; } -int sub_02097750 (UnkStruct_02097728 * param0, Pokemon * param1) +int sub_02097750(UnkStruct_02097728 *param0, Pokemon *param1) { if (!sub_02097728(param0)) { return 0; @@ -162,7 +161,7 @@ int sub_02097750 (UnkStruct_02097728 * param0, Pokemon * param1) return 1; } -void sub_02097770 (UnkStruct_02097728 * param0) +void sub_02097770(UnkStruct_02097728 *param0) { if (param0->unk_14 != NULL) { Heap_FreeToHeap(param0->unk_14); @@ -171,11 +170,11 @@ void sub_02097770 (UnkStruct_02097728 * param0) Heap_FreeToHeap(param0); } -int sub_02097788 (UnkStruct_02028430 * param0, Pokemon * param1, int param2) +int sub_02097788(UnkStruct_02028430 *param0, Pokemon *param1, int param2) { int v0; int v1 = 0; - UnkStruct_0202818C * v2 = NULL; + UnkStruct_0202818C *v2 = NULL; v0 = sub_0202845C(param0, 0); @@ -195,10 +194,10 @@ int sub_02097788 (UnkStruct_02028430 * param0, Pokemon * param1, int param2) return v0; } -int sub_020977E4 (UnkStruct_02028430 * param0, u16 param1, Pokemon * param2, int param3) +int sub_020977E4(UnkStruct_02028430 *param0, u16 param1, Pokemon *param2, int param3) { int v0 = 0; - UnkStruct_0202818C * v1 = NULL; + UnkStruct_0202818C *v1 = NULL; v1 = sub_020284A8(param0, 0, param1, param3); @@ -216,10 +215,10 @@ int sub_020977E4 (UnkStruct_02028430 * param0, u16 param1, Pokemon * param2, int return param1; } -UnkStruct_020978D8 * sub_02097834 (const UnkStruct_0202818C * param0, int param1) +UnkStruct_020978D8 *sub_02097834(const UnkStruct_0202818C *param0, int param1) { u16 v0; - UnkStruct_020978D8 * v1; + UnkStruct_020978D8 *v1; v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_020978D8)); MI_CpuClear8(v1, sizeof(UnkStruct_020978D8)); @@ -245,7 +244,7 @@ UnkStruct_020978D8 * sub_02097834 (const UnkStruct_0202818C * param0, int param1 return v1; } -void sub_020978D8 (UnkStruct_020978D8 * param0) +void sub_020978D8(UnkStruct_020978D8 *param0) { if (param0->unk_10 != NULL) { Strbuf_Free(param0->unk_10); @@ -254,7 +253,7 @@ void sub_020978D8 (UnkStruct_020978D8 * param0) Heap_FreeToHeap(param0); } -void sub_020978F0 (UnkStruct_0202818C * param0, UnkStruct_020978D8 * param1) +void sub_020978F0(UnkStruct_0202818C *param0, UnkStruct_020978D8 *param1) { u16 v0; @@ -265,7 +264,7 @@ void sub_020978F0 (UnkStruct_0202818C * param0, UnkStruct_020978D8 * param1) sub_02028318(param0, param1->unk_0F); } -static BOOL sub_02097920 (OverlayManager ** param0) +static BOOL sub_02097920(OverlayManager **param0) { if (*param0) { if (OverlayManager_Exec(*param0)) { @@ -278,10 +277,10 @@ static BOOL sub_02097920 (OverlayManager ** param0) return 0; } -static int sub_02097944 (OverlayManager * param0, int * param1) +static int sub_02097944(OverlayManager *param0, int *param1) { - UnkStruct_02097944 * v0 = NULL; - UnkStruct_02097728 * v1 = (UnkStruct_02097728 *)OverlayManager_Args(param0); + UnkStruct_02097944 *v0 = NULL; + UnkStruct_02097728 *v1 = (UnkStruct_02097728 *)OverlayManager_Args(param0); Heap_Create(3, 40, 0x1000); v0 = OverlayManager_NewData(param0, sizeof(UnkStruct_02097944), 40); @@ -304,19 +303,25 @@ static int sub_02097944 (OverlayManager * param0, int * param1) return 1; } -static int sub_020979A8 (OverlayManager * param0, int * param1) +static int sub_020979A8(OverlayManager *param0, int *param1) { - UnkStruct_02097944 * v0 = OverlayManager_Data(param0); - UnkStruct_02097728 * v1 = (UnkStruct_02097728 *)OverlayManager_Args(param0); + UnkStruct_02097944 *v0 = OverlayManager_Data(param0); + UnkStruct_02097728 *v1 = (UnkStruct_02097728 *)OverlayManager_Args(param0); FS_EXTERN_OVERLAY(overlay75); FS_EXTERN_OVERLAY(overlay20); static const OverlayManagerTemplate v2 = { - ov75_021D0D80, ov75_021D0DF8, ov75_021D0E10, FS_OVERLAY_ID(overlay75), + ov75_021D0D80, + ov75_021D0DF8, + ov75_021D0E10, + FS_OVERLAY_ID(overlay75), }; static const OverlayManagerTemplate v3 = { - ov20_021D0D80, ov20_021D0DF8, ov20_021D0EA8, FS_OVERLAY_ID(overlay20), + ov20_021D0D80, + ov20_021D0DF8, + ov20_021D0EA8, + FS_OVERLAY_ID(overlay20), }; switch (*param1) { @@ -386,9 +391,9 @@ static int sub_020979A8 (OverlayManager * param0, int * param1) return 0; } -static int sub_02097AF8 (OverlayManager * param0, int * param1) +static int sub_02097AF8(OverlayManager *param0, int *param1) { - UnkStruct_02097944 * v0 = OverlayManager_Data(param0); + UnkStruct_02097944 *v0 = OverlayManager_Data(param0); sub_020978D8(v0->unk_10); OverlayManager_FreeData(param0); diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c index aa7a621055..92a9a96e4a 100644 --- a/src/unk_02097B18.c +++ b/src/unk_02097B18.c @@ -1,52 +1,52 @@ +#include "unk_02097B18.h" + #include #include #include "struct_decls/struct_0202440C_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" -#include "savedata.h" - -#include "constdata/const_020F1E88.h" -#include "constdata/const_020F64C0.h" - #include "struct_defs/struct_0202CA28.h" #include "struct_defs/struct_0202CA64.h" -#include "field/field_system.h" #include "struct_defs/struct_02097F18.h" #include "struct_defs/struct_02098C44.h" + +#include "field/field_system.h" +#include "overlay076/ov76_0223B140.h" +#include "overlay076/ov76_0223B870.h" +#include "overlay076/ov76_0223D338.h" #include "overlay076/struct_ov76_0223DE00.h" +#include "savedata/save_table.h" -#include "unk_02002F38.h" -#include "unk_020041CC.h" +#include "bag.h" +#include "game_options.h" #include "game_overlay.h" -#include "overlay_manager.h" +#include "gx_layers.h" +#include "heap.h" #include "narc.h" +#include "overlay_manager.h" +#include "party.h" +#include "pokemon.h" +#include "savedata.h" +#include "unk_02002F38.h" +#include "unk_020041CC.h" #include "unk_0200762C.h" #include "unk_0200F174.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" #include "unk_0201E3D8.h" -#include "gx_layers.h" #include "unk_02023FCC.h" #include "unk_02024220.h" -#include "savedata/save_table.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_02028124.h" #include "unk_0202C9F4.h" #include "unk_020508D4.h" #include "unk_02055808.h" #include "unk_0206CCB0.h" -#include "pokemon.h" -#include "party.h" -#include "bag.h" -#include "unk_02097B18.h" -#include "overlay076/ov76_0223B140.h" -#include "overlay076/ov76_0223B870.h" -#include "overlay076/ov76_0223D338.h" + +#include "constdata/const_020F1E88.h" +#include "constdata/const_020F64C0.h" FS_EXTERN_OVERLAY(overlay11); FS_EXTERN_OVERLAY(overlay12); @@ -57,17 +57,17 @@ typedef struct { } UnkStruct_02097F38_sub1; typedef struct { - UnkStruct_ov76_0223DE00 * unk_00; - UnkStruct_02097F38_sub1 * unk_04; - UnkStruct_02097F18 * unk_08; - PartyManagementData * unk_0C; - SaveData * unk_10; + UnkStruct_ov76_0223DE00 *unk_00; + UnkStruct_02097F38_sub1 *unk_04; + UnkStruct_02097F18 *unk_08; + PartyManagementData *unk_0C; + SaveData *unk_10; int unk_14; } UnkStruct_02097F38; -static int sub_02097B18(OverlayManager * param0, int * param1); -static int sub_02097D30(OverlayManager * param0, int * param1); -static int sub_02097D88(OverlayManager * param0, int * param1); +static int sub_02097B18(OverlayManager *param0, int *param1); +static int sub_02097D30(OverlayManager *param0, int *param1); +static int sub_02097D88(OverlayManager *param0, int *param1); const OverlayManagerTemplate Unk_020F64C0 = { sub_02097B18, @@ -76,10 +76,10 @@ const OverlayManagerTemplate Unk_020F64C0 = { FS_OVERLAY_ID(overlay76), }; -static int sub_02097B18 (OverlayManager * param0, int * param1) +static int sub_02097B18(OverlayManager *param0, int *param1) { - UnkStruct_ov76_0223DE00 * v0; - UnkStruct_02097F18 * v1; + UnkStruct_ov76_0223DE00 *v0; + UnkStruct_02097F18 *v1; Heap_Create(3, 53, 0x80000); ov76_0223EB20(53); @@ -119,7 +119,7 @@ static int sub_02097B18 (OverlayManager * param0, int * param1) { int v4; int v5; - UnkStruct_0202CA28 * v6; + UnkStruct_0202CA28 *v6; v0->unk_64 = sub_0202CA88(v0->unk_00->unk_20); @@ -186,9 +186,9 @@ static int sub_02097B18 (OverlayManager * param0, int * param1) return 1; } -static int sub_02097D30 (OverlayManager * param0, int * param1) +static int sub_02097D30(OverlayManager *param0, int *param1) { - UnkStruct_ov76_0223DE00 * v0; + UnkStruct_ov76_0223DE00 *v0; v0 = OverlayManager_Data(param0); @@ -198,8 +198,7 @@ static int sub_02097D30 (OverlayManager * param0, int * param1) *param1 = 1; } break; - case 1: - { + case 1: { BOOL v1 = ov76_0223D550(v0); if (v1 == 0) { @@ -209,8 +208,7 @@ static int sub_02097D30 (OverlayManager * param0, int * param1) sub_02007768(v0->unk_D4.unk_D0); ov76_0223BF50(); - } - break; + } break; case 2: if (ScreenWipe_Done() == 1) { return 1; @@ -221,9 +219,9 @@ static int sub_02097D30 (OverlayManager * param0, int * param1) return 0; } -static int sub_02097D88 (OverlayManager * param0, int * param1) +static int sub_02097D88(OverlayManager *param0, int *param1) { - UnkStruct_ov76_0223DE00 * v0; + UnkStruct_ov76_0223DE00 *v0; v0 = OverlayManager_Data(param0); @@ -279,7 +277,7 @@ static int sub_02097D88 (OverlayManager * param0, int * param1) return 1; } -Pokemon * sub_02097F00 (UnkStruct_02097F18 * param0, int param1) +Pokemon *sub_02097F00(UnkStruct_02097F18 *param0, int param1) { int v0 = param1; @@ -291,31 +289,31 @@ Pokemon * sub_02097F00 (UnkStruct_02097F18 * param0, int param1) return param0->unk_04[v0]; } -u8 sub_02097F18 (UnkStruct_02097F18 * param0) +u8 sub_02097F18(UnkStruct_02097F18 *param0) { return param0->unk_2C; } -void sub_02097F20 (UnkStruct_02097F18 * param0, u8 param1) +void sub_02097F20(UnkStruct_02097F18 *param0, u8 param1) { param0->unk_2C = param1; } -u8 sub_02097F28 (UnkStruct_02097F18 * param0) +u8 sub_02097F28(UnkStruct_02097F18 *param0) { return param0->unk_2D; } -void sub_02097F30 (UnkStruct_02097F18 * param0, u8 param1) +void sub_02097F30(UnkStruct_02097F18 *param0, u8 param1) { param0->unk_2D = param1; } -static BOOL sub_02097F38 (TaskManager * param0) +static BOOL sub_02097F38(TaskManager *param0) { - UnkStruct_02097F38 * v0 = TaskManager_Environment(param0); - UnkStruct_02097F18 * v1 = v0->unk_08; - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_02097F38 *v0 = TaskManager_Environment(param0); + UnkStruct_02097F18 *v1 = v0->unk_08; + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); switch (v0->unk_14) { case 0: @@ -336,7 +334,7 @@ static BOOL sub_02097F38 (TaskManager * param0) v1->unk_04[v3] = Party_GetPokemonBySlotIndex(v1->unk_1C, v3); } - for ( ; v3 < 6; v3++) { + for (; v3 < 6; v3++) { v1->unk_04[v3] = NULL; } } @@ -346,8 +344,7 @@ static BOOL sub_02097F38 (TaskManager * param0) sub_02050A38(param0, &Unk_020F64C0, v1); v0->unk_14 = 2; break; - case 2: - { + case 2: { u8 v5; v5 = sub_02097F28(v0->unk_08); @@ -363,11 +360,9 @@ static BOOL sub_02097F38 (TaskManager * param0) v0->unk_14 = 3; break; } - } - break; - case 3: - { - PartyManagementData * v6 = v0->unk_0C; + } break; + case 3: { + PartyManagementData *v6 = v0->unk_0C; v6->unk_00 = v1->unk_1C; v6->unk_04 = SaveData_GetBag(v0->unk_10); @@ -379,15 +374,13 @@ static BOOL sub_02097F38 (TaskManager * param0) sub_02050A38(param0, &Unk_020F1E88, v6); v0->unk_14 = 4; - } - break; - case 4: - { - PartyManagementData * v7 = v0->unk_0C; - Pokemon * v8; - UnkStruct_0202CA28 * v9; - UnkStruct_0202CA64 * v10; - TVBroadcast * v11; + } break; + case 4: { + PartyManagementData *v7 = v0->unk_0C; + Pokemon *v8; + UnkStruct_0202CA28 *v9; + UnkStruct_0202CA64 *v10; + TVBroadcast *v11; int v12; int v13; @@ -424,9 +417,9 @@ static BOOL sub_02097F38 (TaskManager * param0) return 0; } -void sub_020980DC (TaskManager * param0, SaveData * param1) +void sub_020980DC(TaskManager *param0, SaveData *param1) { - UnkStruct_02097F38 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02097F38)); + UnkStruct_02097F38 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_02097F38)); memset(v0, 0, sizeof(UnkStruct_02097F38)); v0->unk_10 = param1; @@ -450,8 +443,7 @@ typedef struct { u8 unk_08; } UnkStruct_020F64D0; - -static const UnkStruct_020F64D0 Unk_020F64D0[ (80 + 1) ] = { +static const UnkStruct_020F64D0 Unk_020F64D0[(80 + 1)] = { { 0xB8, 0x0, 0x125, 0x25, 0x0, 0x3E7, 0x0 }, { 0xB9, 0x1, 0x125, 0x25, 0x0, 0x32, 0x0 }, { 0xBA, 0x2, 0x125, 0x26, 0x0, 0x32, 0x1 }, @@ -535,37 +527,37 @@ static const UnkStruct_020F64D0 Unk_020F64D0[ (80 + 1) ] = { { 0x108, 0x50, 0x125, 0x74, 0x0, 0x0, 0x33 } }; -int sub_02098140 (u8 param0) +int sub_02098140(u8 param0) { GF_ASSERT(param0 < (sizeof(Unk_020F64D0))); return Unk_020F64D0[param0].unk_00; } -int sub_02098164 (u8 param0) +int sub_02098164(u8 param0) { GF_ASSERT(param0 < (sizeof(Unk_020F64D0))); return Unk_020F64D0[param0].unk_02; } -int sub_02098188 (u8 param0) +int sub_02098188(u8 param0) { GF_ASSERT(param0 < (sizeof(Unk_020F64D0))); return Unk_020F64D0[param0].unk_04; } -int sub_020981AC (u8 param0) +int sub_020981AC(u8 param0) { GF_ASSERT(param0 < (sizeof(Unk_020F64D0))); return Unk_020F64D0[param0].unk_05; } -int sub_020981D0 (u8 param0) +int sub_020981D0(u8 param0) { GF_ASSERT(param0 < (sizeof(Unk_020F64D0))); return Unk_020F64D0[param0].unk_06; } -int sub_020981F4 (u8 param0) +int sub_020981F4(u8 param0) { GF_ASSERT(param0 < (sizeof(Unk_020F64D0))); return Unk_020F64D0[param0].unk_08; diff --git a/src/unk_02098218.c b/src/unk_02098218.c index 9a86dfdcb0..c0990c3599 100644 --- a/src/unk_02098218.c +++ b/src/unk_02098218.c @@ -1,54 +1,53 @@ +#include "unk_02098218.h" + #include #include -#include "trainer_info.h" #include "struct_decls/struct_0202CD88_decl.h" #include "struct_decls/struct_020508D4_decl.h" -#include "pokemon.h" - -#include "constdata/const_020F2DAC.h" -#include "constdata/const_020F67FC.h" - -#include "field/field_system.h" #include "struct_defs/struct_0203E2FC.h" #include "struct_defs/struct_0209843C.h" + +#include "field/field_system.h" +#include "overlay005/ov5_021E622C.h" +#include "overlay119/ov119_021D0D80.h" +#include "overlay119/ov119_021D191C.h" #include "overlay119/struct_ov119_021D0FD0.h" +#include "field_system.h" +#include "game_options.h" +#include "gx_layers.h" +#include "heap.h" +#include "map_header.h" +#include "narc.h" +#include "overlay_manager.h" +#include "pokemon.h" +#include "trainer_info.h" #include "unk_02002F38.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "narc.h" #include "unk_0200762C.h" #include "unk_0200F174.h" #include "unk_02015F84.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201DBEC.h" -#include "gx_layers.h" #include "unk_02024220.h" #include "unk_02025E08.h" -#include "game_options.h" #include "unk_0202CD50.h" #include "unk_0202F180.h" -#include "map_header.h" -#include "field_system.h" #include "unk_020508D4.h" #include "unk_02055808.h" -#include "pokemon.h" #include "unk_0208694C.h" #include "unk_02092494.h" -#include "unk_02098218.h" -#include "overlay005/ov5_021E622C.h" -#include "overlay119/ov119_021D0D80.h" -#include "overlay119/ov119_021D191C.h" -FS_EXTERN_OVERLAY(overlay119); +#include "constdata/const_020F2DAC.h" +#include "constdata/const_020F67FC.h" -static int sub_02098218(OverlayManager * param0, int * param1); -static int sub_02098304(OverlayManager * param0, int * param1); -static int sub_02098388(OverlayManager * param0, int * param1); +FS_EXTERN_OVERLAY(overlay119); +static int sub_02098218(OverlayManager *param0, int *param1); +static int sub_02098304(OverlayManager *param0, int *param1); +static int sub_02098388(OverlayManager *param0, int *param1); const OverlayManagerTemplate Unk_020F67FC = { sub_02098218, @@ -57,10 +56,10 @@ const OverlayManagerTemplate Unk_020F67FC = { FS_OVERLAY_ID(overlay119) }; -static int sub_02098218 (OverlayManager * param0, int * param1) +static int sub_02098218(OverlayManager *param0, int *param1) { - UnkStruct_0209843C * v0; - UnkStruct_ov119_021D0FD0 * v1; + UnkStruct_0209843C *v0; + UnkStruct_ov119_021D0FD0 *v1; SetMainCallback(NULL, NULL); DisableHBlank(); @@ -103,9 +102,9 @@ static int sub_02098218 (OverlayManager * param0, int * param1) return 1; } -static int sub_02098304 (OverlayManager * param0, int * param1) +static int sub_02098304(OverlayManager *param0, int *param1) { - UnkStruct_ov119_021D0FD0 * v0; + UnkStruct_ov119_021D0FD0 *v0; v0 = OverlayManager_Data(param0); @@ -129,8 +128,7 @@ static int sub_02098304 (OverlayManager * param0, int * param1) } } break; - case 1: - { + case 1: { BOOL v2; v2 = ov119_021D191C(v0); @@ -142,8 +140,7 @@ static int sub_02098304 (OverlayManager * param0, int * param1) sub_02007768(v0->unk_04.unk_38); ov119_021D1004(); - } - break; + } break; default: if (ScreenWipe_Done() == 1) { return 1; @@ -155,9 +152,9 @@ static int sub_02098304 (OverlayManager * param0, int * param1) return 0; } -static int sub_02098388 (OverlayManager * param0, int * param1) +static int sub_02098388(OverlayManager *param0, int *param1) { - UnkStruct_ov119_021D0FD0 * v0; + UnkStruct_ov119_021D0FD0 *v0; v0 = OverlayManager_Data(param0); @@ -196,9 +193,9 @@ static int sub_02098388 (OverlayManager * param0, int * param1) return 1; } -static BOOL sub_0209843C (TaskManager * param0) +static BOOL sub_0209843C(TaskManager *param0) { - UnkStruct_0209843C * v0 = TaskManager_Environment(param0); + UnkStruct_0209843C *v0 = TaskManager_Environment(param0); switch (v0->unk_00) { case 0: @@ -210,13 +207,12 @@ static BOOL sub_0209843C (TaskManager * param0) sub_02050A38(param0, &Unk_020F67FC, v0); v0->unk_00++; break; - case 2: - { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + case 2: { + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); { - Pokemon * v2 = v0->unk_0C.unk_00; - TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem)); + Pokemon *v2 = v0->unk_0C.unk_00; + TrainerInfo *v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(fieldSystem)); int v4 = 6; int v5 = MapHeader_GetMapLabelTextID(fieldSystem->location->mapId); int v6 = 11; @@ -236,11 +232,9 @@ static BOOL sub_0209843C (TaskManager * param0) } else { v0->unk_00 = 5; } - } - break; - case 3: - { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); + } break; + case 3: { + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); int v9; v9 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_SPECIES, 0); @@ -250,15 +244,14 @@ static BOOL sub_0209843C (TaskManager * param0) v0->unk_08->unk_08 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_FORM, NULL); sub_02050A38(param0, &Unk_020F2DAC, v0->unk_08); v0->unk_00++; - } - break; + } break; case 4: if (v0->unk_08->unk_14 == 0) { Pokemon_SetValue(v0->unk_0C.unk_00, 120, v0->unk_08->unk_18); { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0202CD88 * v11 = sub_0202CD88(FieldSystem_SaveData(fieldSystem)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0202CD88 *v11 = sub_0202CD88(FieldSystem_SaveData(fieldSystem)); sub_0202CF28(v11, (1 + 48)); } @@ -279,10 +272,10 @@ static BOOL sub_0209843C (TaskManager * param0) return 0; } -void sub_020985AC (TaskManager * param0, void * param1) +void sub_020985AC(TaskManager *param0, void *param1) { - UnkStruct_0209843C * v0; - UnkStruct_0203E2FC * v1; + UnkStruct_0209843C *v0; + UnkStruct_0203E2FC *v1; v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0209843C)); memset(v0, 0, sizeof(UnkStruct_0209843C)); diff --git a/src/unk_020985E4.c b/src/unk_020985E4.c index 1888982310..3658ae5240 100644 --- a/src/unk_020985E4.c +++ b/src/unk_020985E4.c @@ -1,29 +1,30 @@ +#include "unk_020985E4.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" -#include "savedata.h" - -#include "field/field_system.h" #include "struct_defs/struct_020985E4.h" #include "struct_defs/struct_0209862C.h" -#include "unk_0200F174.h" +#include "field/field_system.h" +#include "overlay005/ov5_021D0D80.h" +#include "overlay100/ov100_021D0D80.h" + +#include "field_system.h" #include "heap.h" -#include "unk_02025E08.h" +#include "savedata.h" #include "trainer_info.h" -#include "field_system.h" +#include "unk_0200F174.h" +#include "unk_02025E08.h" #include "unk_020508D4.h" -#include "unk_020985E4.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay100/ov100_021D0D80.h" FS_EXTERN_OVERLAY(overlay100); -void sub_020985E4 (TaskManager * param0, SaveData * param1) +void sub_020985E4(TaskManager *param0, SaveData *param1) { - UnkStruct_0209862C * v0; - UnkStruct_020985E4 * v1; + UnkStruct_0209862C *v0; + UnkStruct_020985E4 *v1; v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0209862C)); v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_020985E4)); @@ -38,10 +39,10 @@ void sub_020985E4 (TaskManager * param0, SaveData * param1) FieldTask_Start(param0, sub_0209862C, v0); } -BOOL sub_0209862C (TaskManager * param0) +BOOL sub_0209862C(TaskManager *param0) { - FieldSystem * fieldSystem; - UnkStruct_0209862C * v1; + FieldSystem *fieldSystem; + UnkStruct_0209862C *v1; fieldSystem = TaskManager_FieldSystem(param0); v1 = TaskManager_Environment(param0); diff --git a/src/unk_020986CC.c b/src/unk_020986CC.c index 76e2db37f7..e3c84a1ac4 100644 --- a/src/unk_020986CC.c +++ b/src/unk_020986CC.c @@ -1,8 +1,8 @@ +#include "unk_020986CC.h" + #include #include -#include "unk_020986CC.h" - static const u8 Unk_020F681C[6] = { 0x1, 0x2, @@ -12,7 +12,7 @@ static const u8 Unk_020F681C[6] = { 0x7 }; -int sub_020986CC (int param0) +int sub_020986CC(int param0) { int v0; @@ -25,7 +25,7 @@ int sub_020986CC (int param0) return v0; } -int sub_020986E8 (int param0) +int sub_020986E8(int param0) { GF_ASSERT(param0 < 6); return Unk_020F681C[param0]; diff --git a/src/unk_02098700.c b/src/unk_02098700.c index 124bbc6b0a..9e14d28e1a 100644 --- a/src/unk_02098700.c +++ b/src/unk_02098700.c @@ -1,35 +1,34 @@ +#include "unk_02098700.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" +#include "heap.h" #include "narc.h" #include "unk_02006E3C.h" -#include "heap.h" -#include "unk_02098700.h" #include "unk_02098988.h" - - typedef struct HeightWeightData { - int * unk_00; - int * unk_04; - short * unk_08; - short * unk_0C; - short * unk_10; - short * unk_14; + int *unk_00; + int *unk_04; + short *unk_08; + short *unk_0C; + short *unk_10; + short *unk_14; } HeightWeightData; -static int * sub_020988C8(NARC * param0, int param1); -static int * sub_020988D8(NARC * param0, int param1); -static void sub_020988E8(NARC * param0, short ** param1, short ** param2, int param3); -static void sub_02098910(NARC * param0, short ** param1, short ** param2, int param3); -static void sub_02098938(NARC * param0, short ** param1, short ** param2, int param3); -static void sub_02098960(NARC * param0, short ** param1, short ** param2, int param3); +static int *sub_020988C8(NARC *param0, int param1); +static int *sub_020988D8(NARC *param0, int param1); +static void sub_020988E8(NARC *param0, short **param1, short **param2, int param3); +static void sub_02098910(NARC *param0, short **param1, short **param2, int param3); +static void sub_02098938(NARC *param0, short **param1, short **param2, int param3); +static void sub_02098960(NARC *param0, short **param1, short **param2, int param3); -HeightWeightData * Pokedex_HeightWeightData (int param0) +HeightWeightData *Pokedex_HeightWeightData(int param0) { - HeightWeightData * v0; + HeightWeightData *v0; v0 = Heap_AllocFromHeap(param0, sizeof(HeightWeightData)); memset(v0, 0, sizeof(HeightWeightData)); @@ -37,7 +36,7 @@ HeightWeightData * Pokedex_HeightWeightData (int param0) return v0; } -void Pokedex_HeightWeightData_Free (HeightWeightData * param0) +void Pokedex_HeightWeightData_Free(HeightWeightData *param0) { GF_ASSERT(param0); @@ -45,9 +44,9 @@ void Pokedex_HeightWeightData_Free (HeightWeightData * param0) param0 = NULL; } -void Pokedex_HeightWeightData_Load (HeightWeightData * param0, int param1, int param2) +void Pokedex_HeightWeightData_Load(HeightWeightData *param0, int param1, int param2) { - NARC * v0; + NARC *v0; u32 v1; GF_ASSERT(param0); @@ -71,7 +70,7 @@ void Pokedex_HeightWeightData_Load (HeightWeightData * param0, int param1, int p NARC_dtor(v0); } -void Pokedex_HeightWeightData_Release (HeightWeightData * param0) +void Pokedex_HeightWeightData_Release(HeightWeightData *param0) { GF_ASSERT(param0->unk_00); GF_ASSERT(param0->unk_04); @@ -92,83 +91,83 @@ void Pokedex_HeightWeightData_Release (HeightWeightData * param0) param0->unk_14 = NULL; } -int sub_02098808 (const HeightWeightData * param0, int param1) +int sub_02098808(const HeightWeightData *param0, int param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk_00); return param0->unk_00[param1]; } -int Pokedex_HeightWeightData_Weight (const HeightWeightData * param0, int param1) +int Pokedex_HeightWeightData_Weight(const HeightWeightData *param0, int param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk_04); return param0->unk_04[param1]; } -short sub_02098848 (const HeightWeightData * param0, int param1) +short sub_02098848(const HeightWeightData *param0, int param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk_08); return param0->unk_08[param1]; } -short sub_02098868 (const HeightWeightData * param0, int param1) +short sub_02098868(const HeightWeightData *param0, int param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk_0C); return param0->unk_0C[param1]; } -short sub_02098888 (const HeightWeightData * param0, int param1) +short sub_02098888(const HeightWeightData *param0, int param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk_10); return param0->unk_10[param1]; } -short sub_020988A8 (const HeightWeightData * param0, int param1) +short sub_020988A8(const HeightWeightData *param0, int param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk_14); return param0->unk_14[param1]; } -static int * sub_020988C8 (NARC * param0, int param1) +static int *sub_020988C8(NARC *param0, int param1) { - void * v0; + void *v0; v0 = sub_0200723C(param0, 0, 0, param1, 0); return (int *)v0; } -static int * sub_020988D8 (NARC * param0, int param1) +static int *sub_020988D8(NARC *param0, int param1) { - void * v0; + void *v0; v0 = sub_0200723C(param0, 1, 0, param1, 0); return (int *)v0; } -static void sub_020988E8 (NARC * param0, short ** param1, short ** param2, int param3) +static void sub_020988E8(NARC *param0, short **param1, short **param2, int param3) { *param1 = (short *)sub_0200723C(param0, 9, 0, param3, 0); *param2 = (short *)sub_0200723C(param0, 10, 0, param3, 0); } -static void sub_02098910 (NARC * param0, short ** param1, short ** param2, int param3) +static void sub_02098910(NARC *param0, short **param1, short **param2, int param3) { *param1 = (short *)sub_0200723C(param0, 7, 0, param3, 0); *param2 = (short *)sub_0200723C(param0, 8, 0, param3, 0); } -static void sub_02098938 (NARC * param0, short ** param1, short ** param2, int param3) +static void sub_02098938(NARC *param0, short **param1, short **param2, int param3) { *param1 = (short *)sub_0200723C(param0, 5, 0, param3, 0); *param2 = (short *)sub_0200723C(param0, 6, 0, param3, 0); } -static void sub_02098960 (NARC * param0, short ** param1, short ** param2, int param3) +static void sub_02098960(NARC *param0, short **param1, short **param2, int param3) { *param1 = (short *)sub_0200723C(param0, 3, 0, param3, 0); *param2 = (short *)sub_0200723C(param0, 4, 0, param3, 0); diff --git a/src/unk_02098988.c b/src/unk_02098988.c index 3009294767..6ed4874549 100644 --- a/src/unk_02098988.c +++ b/src/unk_02098988.c @@ -1,13 +1,13 @@ +#include "unk_02098988.h" + #include #include -#include "unk_02098988.h" - static u32 Unk_02100D94 = 75; static u32 Unk_02100D90 = 707; static u32 Unk_02100D98 = 709; -void Pokedex_SetupGiratina (u32 param0) +void Pokedex_SetupGiratina(u32 param0) { if (param0 == 0) { Unk_02100D94 = 194; @@ -20,17 +20,17 @@ void Pokedex_SetupGiratina (u32 param0) } } -u32 sub_020989B8 (void) +u32 sub_020989B8(void) { return Unk_02100D94; } -u32 sub_020989C4 (void) +u32 sub_020989C4(void) { return Unk_02100D90; } -u32 sub_020989D0 (void) +u32 sub_020989D0(void) { return Unk_02100D98; } diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c index fae952121a..f23fdd300f 100644 --- a/src/unk_020989DC.c +++ b/src/unk_020989DC.c @@ -1,35 +1,34 @@ -#include "enums.h" +#include "unk_020989DC.h" #include #include -#include "pokemon.h" -#include "savedata.h" - -#include "constdata/const_020F1E88.h" -#include "constdata/const_020F410C.h" -#include "constdata/const_020F6890.h" - +#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_0202A93C.h" #include "struct_defs/struct_0203D9B8.h" #include "struct_defs/struct_020989DC.h" #include "struct_defs/struct_02098C44.h" -#include "struct_defs/pokemon_summary.h" #include "struct_defs/struct_02098DE8.h" -#include "overlay_manager.h" -#include "string_template.h" -#include "heap.h" -#include "unk_02025E08.h" +#include "overlay079/ov79_021D0D80.h" +#include "overlay079/ov79_021D2268.h" + +#include "bag.h" +#include "enums.h" #include "game_options.h" +#include "heap.h" +#include "overlay_manager.h" +#include "party.h" #include "poffin.h" #include "pokemon.h" -#include "party.h" -#include "bag.h" #include "pokemon_summary_app.h" -#include "unk_020989DC.h" -#include "overlay079/ov79_021D0D80.h" -#include "overlay079/ov79_021D2268.h" +#include "savedata.h" +#include "string_template.h" +#include "unk_02025E08.h" + +#include "constdata/const_020F1E88.h" +#include "constdata/const_020F410C.h" +#include "constdata/const_020F6890.h" FS_EXTERN_OVERLAY(overlay79); @@ -67,23 +66,23 @@ typedef struct { u8 unk_08; u8 unk_09; u16 unk_0A; - UnkStruct_0203D9B8 * unk_0C; - void * unk_10; - OverlayManager * unk_14; + UnkStruct_0203D9B8 *unk_0C; + void *unk_10; + OverlayManager *unk_14; } UnkStruct_02098BE4; -static int sub_02098B1C(OverlayManager * param0, int * param1); -static int sub_02098B50(OverlayManager * param0, int * param1); -static int sub_02098BC4(OverlayManager * param0, int * param1); -static void sub_02098BE4(UnkStruct_02098BE4 * param0); -static int sub_02098C2C(UnkStruct_02098BE4 * param0); -static int sub_02098C44(UnkStruct_02098BE4 * param0); -static int sub_02098CB0(UnkStruct_02098BE4 * param0); -static int sub_02098D38(UnkStruct_02098BE4 * param0); -static int sub_02098D7C(UnkStruct_02098BE4 * param0); -static int sub_02098DE8(UnkStruct_02098BE4 * param0); -static int sub_02098E0C(UnkStruct_02098BE4 * param0); -static int sub_02098E88(UnkStruct_02098BE4 * param0); +static int sub_02098B1C(OverlayManager *param0, int *param1); +static int sub_02098B50(OverlayManager *param0, int *param1); +static int sub_02098BC4(OverlayManager *param0, int *param1); +static void sub_02098BE4(UnkStruct_02098BE4 *param0); +static int sub_02098C2C(UnkStruct_02098BE4 *param0); +static int sub_02098C44(UnkStruct_02098BE4 *param0); +static int sub_02098CB0(UnkStruct_02098BE4 *param0); +static int sub_02098D38(UnkStruct_02098BE4 *param0); +static int sub_02098D7C(UnkStruct_02098BE4 *param0); +static int sub_02098DE8(UnkStruct_02098BE4 *param0); +static int sub_02098E0C(UnkStruct_02098BE4 *param0); +static int sub_02098E88(UnkStruct_02098BE4 *param0); const OverlayManagerTemplate Unk_020F6890 = { sub_02098B1C, @@ -92,12 +91,12 @@ const OverlayManagerTemplate Unk_020F6890 = { 0xFFFFFFFF }; -UnkStruct_0203D9B8 * sub_020989DC (SaveData * param0, int param1) +UnkStruct_0203D9B8 *sub_020989DC(SaveData *param0, int param1) { - UnkStruct_0203D9B8 * v0; - Poffin * v1; - UnkStruct_020989DC * v2; - StringTemplate * v3; + UnkStruct_0203D9B8 *v0; + Poffin *v1; + UnkStruct_020989DC *v2; + StringTemplate *v3; u8 v4[7]; u8 v5 = 0, v6 = 0, v7 = 0; u8 v8 = 0; @@ -154,13 +153,13 @@ UnkStruct_0203D9B8 * sub_020989DC (SaveData * param0, int param1) return v0; } -void sub_02098AF0 (UnkStruct_0203D9B8 * param0) +void sub_02098AF0(UnkStruct_0203D9B8 *param0) { int v0; Heap_FreeToHeap(param0); } -static BOOL sub_02098AF8 (OverlayManager ** param0) +static BOOL sub_02098AF8(OverlayManager **param0) { if (*param0) { if (OverlayManager_Exec(*param0)) { @@ -173,10 +172,10 @@ static BOOL sub_02098AF8 (OverlayManager ** param0) return 0; } -static int sub_02098B1C (OverlayManager * param0, int * param1) +static int sub_02098B1C(OverlayManager *param0, int *param1) { - UnkStruct_02098BE4 * v0 = NULL; - void * v1 = OverlayManager_Args(param0); + UnkStruct_02098BE4 *v0 = NULL; + void *v1 = OverlayManager_Args(param0); Heap_Create(3, 44, 0x1000); @@ -189,9 +188,9 @@ static int sub_02098B1C (OverlayManager * param0, int * param1) return 1; } -static int sub_02098B50 (OverlayManager * param0, int * param1) +static int sub_02098B50(OverlayManager *param0, int *param1) { - UnkStruct_02098BE4 * v0 = (UnkStruct_02098BE4 *)OverlayManager_Data(param0); + UnkStruct_02098BE4 *v0 = (UnkStruct_02098BE4 *)OverlayManager_Data(param0); switch (*param1) { case 0: @@ -225,9 +224,9 @@ static int sub_02098B50 (OverlayManager * param0, int * param1) return 0; } -static int sub_02098BC4 (OverlayManager * param0, int * param1) +static int sub_02098BC4(OverlayManager *param0, int *param1) { - UnkStruct_02098BE4 * v0 = (UnkStruct_02098BE4 *)OverlayManager_Data(param0); + UnkStruct_02098BE4 *v0 = (UnkStruct_02098BE4 *)OverlayManager_Data(param0); sub_02098BE4(v0); OverlayManager_FreeData(param0); @@ -236,10 +235,10 @@ static int sub_02098BC4 (OverlayManager * param0, int * param1) return 1; } -static void sub_02098BE4 (UnkStruct_02098BE4 * param0) +static void sub_02098BE4(UnkStruct_02098BE4 *param0) { u8 v0 = 0, v1 = 0; - UnkStruct_020989DC * v2; + UnkStruct_020989DC *v2; for (v0 = 0; v0 < param0->unk_0C->unk_00; v0++) { v2 = ¶m0->unk_0C->unk_1C[v0]; @@ -257,7 +256,7 @@ static void sub_02098BE4 (UnkStruct_02098BE4 * param0) sub_0202ABD4(param0->unk_0C->unk_08); } -static int sub_02098C2C (UnkStruct_02098BE4 * param0) +static int sub_02098C2C(UnkStruct_02098BE4 *param0) { FS_EXTERN_OVERLAY(overlay79); @@ -272,9 +271,9 @@ static int sub_02098C2C (UnkStruct_02098BE4 * param0) return 1; } -static int sub_02098C44 (UnkStruct_02098BE4 * param0) +static int sub_02098C44(UnkStruct_02098BE4 *param0) { - PartyManagementData * v0; + PartyManagementData *v0; if (!sub_02098AF8(¶m0->unk_14)) { return 1; @@ -300,11 +299,11 @@ static int sub_02098C44 (UnkStruct_02098BE4 * param0) return 2; } -static int sub_02098CB0 (UnkStruct_02098BE4 * param0) +static int sub_02098CB0(UnkStruct_02098BE4 *param0) { u8 v0; - PartyManagementData * v1; - PokemonSummary * v2; + PartyManagementData *v1; + PokemonSummary *v2; static const u8 v3[] = { 4, 7, 8 }; @@ -343,9 +342,9 @@ static int sub_02098CB0 (UnkStruct_02098BE4 * param0) return 3; } -static int sub_02098D38 (UnkStruct_02098BE4 * param0) +static int sub_02098D38(UnkStruct_02098BE4 *param0) { - PokemonSummary * v0; + PokemonSummary *v0; u8 v1; if (!sub_02098AF8(¶m0->unk_14)) { @@ -369,7 +368,7 @@ static int sub_02098D38 (UnkStruct_02098BE4 * param0) return 4; } -static int sub_02098D7C (UnkStruct_02098BE4 * param0) +static int sub_02098D7C(UnkStruct_02098BE4 *param0) { FS_EXTERN_OVERLAY(overlay79); @@ -379,7 +378,7 @@ static int sub_02098D7C (UnkStruct_02098BE4 * param0) ov79_021D2460, FS_OVERLAY_ID(overlay79), }; - UnkStruct_02098DE8 * v1; + UnkStruct_02098DE8 *v1; v1 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_02098DE8)); MI_CpuClear8(v1, sizeof(UnkStruct_02098DE8)); @@ -396,9 +395,9 @@ static int sub_02098D7C (UnkStruct_02098BE4 * param0) return 5; } -static int sub_02098DE8 (UnkStruct_02098BE4 * param0) +static int sub_02098DE8(UnkStruct_02098BE4 *param0) { - UnkStruct_02098DE8 * v0; + UnkStruct_02098DE8 *v0; if (!sub_02098AF8(¶m0->unk_14)) { return 5; @@ -412,11 +411,11 @@ static int sub_02098DE8 (UnkStruct_02098BE4 * param0) return 6; } -static int sub_02098E0C (UnkStruct_02098BE4 * param0) +static int sub_02098E0C(UnkStruct_02098BE4 *param0) { u8 v0; - PokemonSummary * v1; - Poffin * v2; + PokemonSummary *v1; + Poffin *v2; static const u8 v3[] = { 4, 8 }; @@ -444,11 +443,11 @@ static int sub_02098E0C (UnkStruct_02098BE4 * param0) return 7; } -static int sub_02098E88 (UnkStruct_02098BE4 * param0) +static int sub_02098E88(UnkStruct_02098BE4 *param0) { u8 v0; - PokemonSummary * v1; - Poffin * v2; + PokemonSummary *v1; + Poffin *v2; if (!sub_02098AF8(¶m0->unk_14)) { return 7; @@ -461,7 +460,7 @@ static int sub_02098E88 (UnkStruct_02098BE4 * param0) return 0; } -UnkEnum_02098EAC sub_02098EAC (Poffin * param0, u8 param1) +UnkEnum_02098EAC sub_02098EAC(Poffin *param0, u8 param1) { u8 v0[7]; u8 v1, v2, v3; @@ -491,7 +490,7 @@ UnkEnum_02098EAC sub_02098EAC (Poffin * param0, u8 param1) } } -void sub_02098EF8 (Poffin * param0, Pokemon * param1) +void sub_02098EF8(Poffin *param0, Pokemon *param1) { u8 v0, v1; u8 v2, v3; diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c index 2782e37df8..88ea3d2600 100644 --- a/src/unk_02098FFC.c +++ b/src/unk_02098FFC.c @@ -1,36 +1,37 @@ +#include "unk_02098FFC.h" + #include #include #include "struct_decls/struct_02006C24_decl.h" #include "struct_decls/struct_02009714_decl.h" #include "struct_decls/struct_02009DC8_decl.h" - #include "struct_defs/struct_02009508.h" #include "struct_defs/struct_02009CFC.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_0209903C.h" #include "struct_defs/struct_0209903C_sub1.h" #include "struct_defs/struct_0209916C.h" + #include "overlay019/struct_ov19_021DA864.h" #include "overlay115/struct_ov115_02261520.h" +#include "heap.h" #include "narc.h" #include "unk_020093B4.h" #include "unk_02009714.h" #include "unk_0200A328.h" #include "unk_0200C6E4.h" -#include "heap.h" #include "unk_020218BC.h" -#include "unk_02098FFC.h" -static void sub_02099058(UnkStruct_0209903C * param0); -static void sub_02099118(UnkStruct_0209903C * param0); -static void sub_020993A8(UnkStruct_0209903C * param0); -static s16 sub_020994B8(UnkStruct_0209903C * param0, u8 param1); +static void sub_02099058(UnkStruct_0209903C *param0); +static void sub_02099118(UnkStruct_0209903C *param0); +static void sub_020993A8(UnkStruct_0209903C *param0); +static s16 sub_020994B8(UnkStruct_0209903C *param0, u8 param1); -UnkStruct_0209903C * sub_02098FFC (int param0, u16 param1, u16 param2, u16 param3, int param4) +UnkStruct_0209903C *sub_02098FFC(int param0, u16 param1, u16 param2, u16 param3, int param4) { - UnkStruct_0209903C * v0; + UnkStruct_0209903C *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0209903C)); MI_CpuClear8(v0, sizeof(UnkStruct_0209903C)); @@ -51,17 +52,17 @@ UnkStruct_0209903C * sub_02098FFC (int param0, u16 param1, u16 param2, u16 param return v0; } -void sub_0209903C (UnkStruct_0209903C * param0) +void sub_0209903C(UnkStruct_0209903C *param0) { sub_02099118(param0); MI_CpuClear8(param0, sizeof(UnkStruct_0209903C)); Heap_FreeToHeap(param0); } -static void sub_02099058 (UnkStruct_0209903C * param0) +static void sub_02099058(UnkStruct_0209903C *param0) { u32 v0, v1; - u8 v2[] = {1, 1, 1, 1}; + u8 v2[] = { 1, 1, 1, 1 }; param0->unk_10 = sub_020095C4(param0->unk_0C, ¶m0->unk_14, param0->unk_00); @@ -82,7 +83,7 @@ static void sub_02099058 (UnkStruct_0209903C * param0) MI_CpuClear8(param0->unk_1C4, sizeof(UnkStruct_0209903C_sub1)); } -static void sub_02099118 (UnkStruct_0209903C * param0) +static void sub_02099118(UnkStruct_0209903C *param0) { u32 v0; @@ -97,20 +98,20 @@ static void sub_02099118 (UnkStruct_0209903C * param0) } } -void sub_02099160 (UnkStruct_0209903C * param0) +void sub_02099160(UnkStruct_0209903C *param0) { sub_020219F8(param0->unk_10); } -UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16 param2, u16 param3, u16 param4, u8 param5, u8 param6, int param7) +UnkStruct_0209916C *sub_0209916C(UnkStruct_0209903C *param0, int param1, u16 param2, u16 param3, u16 param4, u8 param5, u8 param6, int param7) { u8 v0; s16 v1; u32 v2; - UnkStruct_0209916C * v3; - CellActorData * v4 = NULL; + UnkStruct_0209916C *v3; + CellActorData *v4 = NULL; UnkStruct_ov115_02261520 v5; - UnkStruct_02009DC8 * v6; + UnkStruct_02009DC8 *v6; v1 = sub_020994B8(param0, param1); @@ -175,9 +176,9 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16 return v3; } -void sub_0209933C (UnkStruct_0209903C * param0, UnkStruct_0209916C * param1, int param2) +void sub_0209933C(UnkStruct_0209903C *param0, UnkStruct_0209916C *param1, int param2) { - UnkStruct_02009DC8 * v0; + UnkStruct_02009DC8 *v0; v0 = param0->unk_1B4[1]->unk_00[param1->unk_00]; @@ -185,7 +186,7 @@ void sub_0209933C (UnkStruct_0209903C * param0, UnkStruct_0209916C * param1, int sub_0200A6B8(v0); } -void sub_02099370 (UnkStruct_0209903C * param0, UnkStruct_0209916C * param1) +void sub_02099370(UnkStruct_0209903C *param0, UnkStruct_0209916C *param1) { sub_0200D0F4(param1->unk_04); @@ -196,20 +197,20 @@ void sub_02099370 (UnkStruct_0209903C * param0, UnkStruct_0209916C * param1) Heap_FreeToHeap(param1); } -static void sub_020993A8 (UnkStruct_0209903C * param0) +static void sub_020993A8(UnkStruct_0209903C *param0) { int v0; - UnkStruct_02009714 * v1; - UnkStruct_02009CFC * v2; - UnkStruct_02009DC8 * v3; - NARC * v4; + UnkStruct_02009714 *v1; + UnkStruct_02009CFC *v2; + UnkStruct_02009DC8 *v3; + NARC *v4; v4 = NARC_ctor(NARC_INDEX_GRAPHIC__PORUACT, param0->unk_00); v2 = param0->unk_1B4[0]; v2->unk_00[0] = sub_02009A4C(param0->unk_1A4[0], v4, 0, 0, 0xe000, param0->unk_0E, param0->unk_00); - GF_ASSERT((v2->unk_00[0] != NULL)); + GF_ASSERT(v2->unk_00[0] != NULL); switch (param0->unk_04) { case 1: @@ -228,7 +229,7 @@ static void sub_020993A8 (UnkStruct_0209903C * param0) v2 = param0->unk_1B4[2 + v0]; v2->unk_00[0] = sub_02009BC4(param0->unk_1A4[2 + v0], v4, 1 + v0, 0, 0xe000, 2 + v0, param0->unk_00); - GF_ASSERT((v2->unk_00[0] != NULL)); + GF_ASSERT(v2->unk_00[0] != NULL); } v2 = param0->unk_1B4[1]; @@ -236,14 +237,14 @@ static void sub_020993A8 (UnkStruct_0209903C * param0) for (v0 = 0; v0 < param0->unk_0A; v0++) { v2->unk_00[v0] = sub_02009B04(param0->unk_1A4[1], v4, 3 + 1, 0, 0xe000 + v0, param0->unk_0E, 1, param0->unk_00); - GF_ASSERT((v2->unk_00[v0] != NULL)); + GF_ASSERT(v2->unk_00[v0] != NULL); sub_0200A5C8(v2->unk_00[v0]); } NARC_dtor(v4); } -static s16 sub_020994B8 (UnkStruct_0209903C * param0, u8 param1) +static s16 sub_020994B8(UnkStruct_0209903C *param0, u8 param1) { u16 v0 = 0; diff --git a/src/unk_02099500.c b/src/unk_02099500.c index 5bcbb68987..ab4708e45a 100644 --- a/src/unk_02099500.c +++ b/src/unk_02099500.c @@ -1,19 +1,11 @@ +#include "unk_02099500.h" + #include #include #include "struct_defs/struct_02039A58.h" #include "struct_defs/struct_02072014.h" -#include "trainer_info.h" -#include "unk_02032798.h" -#include "unk_0204FA34.h" -#include "unk_0205001C.h" -#include "unk_02050548.h" -#include "comm_player_manager.h" -#include "field_comm_manager.h" -#include "unk_0205A0D8.h" -#include "unk_0205B33C.h" -#include "unk_02099500.h" #include "overlay023/ov23_0223E140.h" #include "overlay023/ov23_022416A8.h" #include "overlay023/ov23_02241F74.h" @@ -24,183 +16,193 @@ #include "overlay023/ov23_0225128C.h" #include "overlay023/ov23_02253598.h" +#include "comm_player_manager.h" +#include "field_comm_manager.h" +#include "trainer_info.h" +#include "unk_02032798.h" +#include "unk_0204FA34.h" +#include "unk_0205001C.h" +#include "unk_02050548.h" +#include "unk_0205A0D8.h" +#include "unk_0205B33C.h" + static int CommPacketSizeOf_TrainerCard(void); static int sub_02099548(void); static int sub_0209954C(void); -static int sub_02099500 (void) +static int sub_02099500(void) { return 3; } -static int sub_02099504 (void) +static int sub_02099504(void) { - return(24); + return 24; } -static int sub_02099508 (void) +static int sub_02099508(void) { return 236 * 6 + 4 * 2; } static const CommCmdTable Unk_020F68A4[] = { - {CommPlayer_RecvLocation, CommPacketSizeOf_RecvLocation, NULL}, - {CommPlayer_RecvLocationAndInit, CommPacketSizeOf_RecvLocationAndInit, NULL}, - {ov23_022431C4, CommPacketSizeOf_NetId, NULL}, - {ov23_0224ACE8, sub_0203294C, NULL}, - {ov23_0224ACF8, CommPacketSizeOf_NetId, NULL}, - {ov23_0224A348, sub_0203294C, NULL}, - {ov23_022428D8, ov23_022428D4, NULL}, - {ov23_0224A3A8, sub_02032944, NULL}, - {ov23_0224A410, sub_02032944, NULL}, - {ov23_022433BC, sub_0203294C, NULL}, - {ov23_02243B0C, CommPacketSizeOf_NetId, NULL}, - {ov23_02243F78, ov23_02243F98, NULL}, - {ov23_02243ED4, ov23_02243C38, NULL}, - {ov23_02243F9C, ov23_02243860, NULL}, - {ov23_0224401C, ov23_02244048, NULL}, - {ov23_0224448C, ov23_022442EC, NULL}, - {ov23_022445E8, CommPacketSizeOf_NetId, NULL}, - {ov23_0224461C, sub_02099500, NULL}, - {ov23_02245540, CommPacketSizeOf_NetId, NULL}, - {ov23_0224540C, sub_0203294C, NULL}, - {ov23_022454B4, ov23_02245408, NULL}, - {ov23_0224546C, sub_0203294C, NULL}, - {ov23_022455B4, ov23_02245694, NULL}, - {ov23_0224467C, CommPacketSizeOf_NetId, NULL}, - {ov23_022457E4, sub_0203294C, NULL}, - {ov23_0224589C, ov23_02245908, NULL}, - {ov23_022425F8, ov23_0224407C, NULL}, - {ov23_02242624, sub_02032944, NULL}, - {ov23_02242654, sub_02032944, NULL}, - {ov23_02244140, ov23_0224413C, NULL}, - {CommPlayer_RecvDelete, CommPacketSizeOf_NetId, NULL}, - {ov23_0224C384, ov23_0224C41C, NULL}, - {ov23_0224C25C, ov23_0224C41C, NULL}, - {ov23_0224C4CC, ov23_0224C584, NULL}, - {ov23_0224C1A4, sub_0203294C, NULL}, - {ov23_0224C104, ov23_0224C100, NULL}, - {ov23_0224B6AC, ov23_0224B72C, NULL}, - {ov23_0224B730, ov23_0224B798, NULL}, - {ov23_0224D4CC, ov23_0224D4FC, NULL}, - {ov23_0224B700, CommPacketSizeOf_NetId, NULL}, - {sub_02058018, CommPacketSizeOf_NetId, NULL}, - {ov23_022419B4, CommPacketSizeOf_NetId, NULL}, - {ov23_0223E9D4, CommPacketSizeOf_NetId, NULL}, - {ov23_0223EAF8, CommPacketSizeOf_NetId, NULL}, - {ov23_0223EB8C, CommPacketSizeOf_NetId, NULL}, - {ov23_0223EBC0, CommPacketSizeOf_NetId, NULL}, - {ov23_0223EBE4, ov23_0223EBFC, NULL}, - {ov23_0223EC00, ov23_0223EC30, NULL}, - {ov23_02243390, ov23_022433B8, NULL}, - {ov23_022413A0, sub_0203294C, NULL}, - {ov23_0224142C, ov23_022414D0, NULL}, - {ov23_0224F0F0, ov23_0224F174, NULL}, - {ov23_0224F0FC, ov23_0224F174, NULL}, - {ov23_0224F108, ov23_0224F174, NULL}, - {ov23_0224F138, ov23_0224F174, NULL}, - {ov23_0224F178, ov23_0224F1F8, NULL}, - {ov23_0224F184, ov23_0224F1F8, NULL}, - {ov23_0224F1FC, ov23_0224F248, NULL}, - {ov23_0224F208, ov23_0224F248, NULL}, - {ov23_02253998, sub_02032944, NULL}, - {ov23_022539A8, sub_02032944, NULL}, - {ov23_022513B0, ov23_02251414, NULL}, - {ov23_0224A570, CommPacketSizeOf_NetId, NULL}, - {ov23_0224A77C, ov23_0224A56C, NULL}, - {ov23_0224CD80, CommPacketSizeOf_NetId, NULL}, - {ov23_0224CF18, ov23_0224CD7C, NULL}, - {sub_02059EAC, CommPacketSizeOf_TrainerCard, sub_02059EBC}, - {ov23_0225215C, ov23_02251414, NULL}, - {ov23_02252178, ov23_02251414, NULL}, - {ov23_0224AB30, ov23_0224AB2C, NULL}, - {ov23_0224ABC4, ov23_0224AC0C, ov23_0224AAA0}, - {ov23_0224AC10, CommPacketSizeOf_NetId, NULL}, - {sub_02059180, CommPacketSizeOf_NetId, NULL}, - {sub_02059D0C, CommPacketSizeOf_NetId, NULL}, - {ov23_0224D698, CommPacketSizeOf_NetId, NULL}, - {ov23_0224D6AC, ov23_0224D6F4, NULL}, - {sub_0205B988, TrainerInfo_Size, NULL}, - {sub_0205B9AC, CommPacketSizeOf_NetId, NULL}, - {sub_0205B98C, CommPacketSizeOf_NetId, NULL}, - {sub_0205BA6C, CommPacketSizeOf_NetId, NULL}, - {sub_0205B990, sub_0203294C, NULL}, - {sub_0205B9C4, CommPacketSizeOf_NetId, NULL}, - {sub_0205B9E0, sub_0203294C, NULL}, - {sub_0205BA08, CommPacketSizeOf_TrainerCard, sub_0205BA5C}, - {sub_0205B0C0, sub_0205B0E4, sub_0205B0F4}, - {sub_0205B110, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_02099548, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_02099530, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, sub_02099538, NULL}, - {sub_02099510, sub_02099540, NULL}, - {sub_02099510, sub_02099544, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, CommPacketSizeOf_NetId, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0209954C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_02099504, NULL}, - {sub_02099510, sub_02099508, NULL}, - {sub_0204FA34, sub_02032944, NULL}, - {sub_0205001C, sub_02032944, NULL}, - {sub_02050548, sub_02032944, NULL} + { CommPlayer_RecvLocation, CommPacketSizeOf_RecvLocation, NULL }, + { CommPlayer_RecvLocationAndInit, CommPacketSizeOf_RecvLocationAndInit, NULL }, + { ov23_022431C4, CommPacketSizeOf_NetId, NULL }, + { ov23_0224ACE8, sub_0203294C, NULL }, + { ov23_0224ACF8, CommPacketSizeOf_NetId, NULL }, + { ov23_0224A348, sub_0203294C, NULL }, + { ov23_022428D8, ov23_022428D4, NULL }, + { ov23_0224A3A8, sub_02032944, NULL }, + { ov23_0224A410, sub_02032944, NULL }, + { ov23_022433BC, sub_0203294C, NULL }, + { ov23_02243B0C, CommPacketSizeOf_NetId, NULL }, + { ov23_02243F78, ov23_02243F98, NULL }, + { ov23_02243ED4, ov23_02243C38, NULL }, + { ov23_02243F9C, ov23_02243860, NULL }, + { ov23_0224401C, ov23_02244048, NULL }, + { ov23_0224448C, ov23_022442EC, NULL }, + { ov23_022445E8, CommPacketSizeOf_NetId, NULL }, + { ov23_0224461C, sub_02099500, NULL }, + { ov23_02245540, CommPacketSizeOf_NetId, NULL }, + { ov23_0224540C, sub_0203294C, NULL }, + { ov23_022454B4, ov23_02245408, NULL }, + { ov23_0224546C, sub_0203294C, NULL }, + { ov23_022455B4, ov23_02245694, NULL }, + { ov23_0224467C, CommPacketSizeOf_NetId, NULL }, + { ov23_022457E4, sub_0203294C, NULL }, + { ov23_0224589C, ov23_02245908, NULL }, + { ov23_022425F8, ov23_0224407C, NULL }, + { ov23_02242624, sub_02032944, NULL }, + { ov23_02242654, sub_02032944, NULL }, + { ov23_02244140, ov23_0224413C, NULL }, + { CommPlayer_RecvDelete, CommPacketSizeOf_NetId, NULL }, + { ov23_0224C384, ov23_0224C41C, NULL }, + { ov23_0224C25C, ov23_0224C41C, NULL }, + { ov23_0224C4CC, ov23_0224C584, NULL }, + { ov23_0224C1A4, sub_0203294C, NULL }, + { ov23_0224C104, ov23_0224C100, NULL }, + { ov23_0224B6AC, ov23_0224B72C, NULL }, + { ov23_0224B730, ov23_0224B798, NULL }, + { ov23_0224D4CC, ov23_0224D4FC, NULL }, + { ov23_0224B700, CommPacketSizeOf_NetId, NULL }, + { sub_02058018, CommPacketSizeOf_NetId, NULL }, + { ov23_022419B4, CommPacketSizeOf_NetId, NULL }, + { ov23_0223E9D4, CommPacketSizeOf_NetId, NULL }, + { ov23_0223EAF8, CommPacketSizeOf_NetId, NULL }, + { ov23_0223EB8C, CommPacketSizeOf_NetId, NULL }, + { ov23_0223EBC0, CommPacketSizeOf_NetId, NULL }, + { ov23_0223EBE4, ov23_0223EBFC, NULL }, + { ov23_0223EC00, ov23_0223EC30, NULL }, + { ov23_02243390, ov23_022433B8, NULL }, + { ov23_022413A0, sub_0203294C, NULL }, + { ov23_0224142C, ov23_022414D0, NULL }, + { ov23_0224F0F0, ov23_0224F174, NULL }, + { ov23_0224F0FC, ov23_0224F174, NULL }, + { ov23_0224F108, ov23_0224F174, NULL }, + { ov23_0224F138, ov23_0224F174, NULL }, + { ov23_0224F178, ov23_0224F1F8, NULL }, + { ov23_0224F184, ov23_0224F1F8, NULL }, + { ov23_0224F1FC, ov23_0224F248, NULL }, + { ov23_0224F208, ov23_0224F248, NULL }, + { ov23_02253998, sub_02032944, NULL }, + { ov23_022539A8, sub_02032944, NULL }, + { ov23_022513B0, ov23_02251414, NULL }, + { ov23_0224A570, CommPacketSizeOf_NetId, NULL }, + { ov23_0224A77C, ov23_0224A56C, NULL }, + { ov23_0224CD80, CommPacketSizeOf_NetId, NULL }, + { ov23_0224CF18, ov23_0224CD7C, NULL }, + { sub_02059EAC, CommPacketSizeOf_TrainerCard, sub_02059EBC }, + { ov23_0225215C, ov23_02251414, NULL }, + { ov23_02252178, ov23_02251414, NULL }, + { ov23_0224AB30, ov23_0224AB2C, NULL }, + { ov23_0224ABC4, ov23_0224AC0C, ov23_0224AAA0 }, + { ov23_0224AC10, CommPacketSizeOf_NetId, NULL }, + { sub_02059180, CommPacketSizeOf_NetId, NULL }, + { sub_02059D0C, CommPacketSizeOf_NetId, NULL }, + { ov23_0224D698, CommPacketSizeOf_NetId, NULL }, + { ov23_0224D6AC, ov23_0224D6F4, NULL }, + { sub_0205B988, TrainerInfo_Size, NULL }, + { sub_0205B9AC, CommPacketSizeOf_NetId, NULL }, + { sub_0205B98C, CommPacketSizeOf_NetId, NULL }, + { sub_0205BA6C, CommPacketSizeOf_NetId, NULL }, + { sub_0205B990, sub_0203294C, NULL }, + { sub_0205B9C4, CommPacketSizeOf_NetId, NULL }, + { sub_0205B9E0, sub_0203294C, NULL }, + { sub_0205BA08, CommPacketSizeOf_TrainerCard, sub_0205BA5C }, + { sub_0205B0C0, sub_0205B0E4, sub_0205B0F4 }, + { sub_0205B110, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_02099548, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_02099530, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, sub_02099538, NULL }, + { sub_02099510, sub_02099540, NULL }, + { sub_02099510, sub_02099544, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, CommPacketSizeOf_NetId, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0209954C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_02099504, NULL }, + { sub_02099510, sub_02099508, NULL }, + { sub_0204FA34, sub_02032944, NULL }, + { sub_0205001C, sub_02032944, NULL }, + { sub_02050548, sub_02032944, NULL } }; -void sub_02099510 (int param0, int param1, void * param2, void * param3) +void sub_02099510(int param0, int param1, void *param2, void *param3) { return; } -void CommFieldCmd_Init (void * param0) +void CommFieldCmd_Init(void *param0) { int v0 = sizeof(Unk_020F68A4) / sizeof(CommCmdTable); CommCmd_Init(Unk_020F68A4, v0, param0); } -static int CommPacketSizeOf_TrainerCard (void) +static int CommPacketSizeOf_TrainerCard(void) { return sizeof(TrainerCard); } -int sub_02099530 (void) +int sub_02099530(void) { return 3000 + 8; } -int sub_02099538 (void) +int sub_02099538(void) { return 1008; } -int sub_02099540 (void) +int sub_02099540(void) { return 10; } -int sub_02099544 (void) +int sub_02099544(void) { return 10 * 5; } -static int sub_02099548 (void) +static int sub_02099548(void) { return 4; } -static int sub_0209954C (void) +static int sub_0209954C(void) { return 4; } diff --git a/src/unk_02099550.c b/src/unk_02099550.c index d125c5f2d0..7b0c291268 100644 --- a/src/unk_02099550.c +++ b/src/unk_02099550.c @@ -1,42 +1,43 @@ +#include "unk_02099550.h" + #include #include -#include "savedata.h" - #include "struct_defs/struct_0203CC84.h" +#include "overlay018/ov18_0221F800.h" + #include "game_overlay.h" -#include "overlay_manager.h" #include "heap.h" -#include "unk_02099550.h" -#include "overlay018/ov18_0221F800.h" +#include "overlay_manager.h" +#include "savedata.h" FS_EXTERN_OVERLAY(overlay4); FS_EXTERN_OVERLAY(overlay18); FS_EXTERN_OVERLAY(overlay60); FS_EXTERN_OVERLAY(overlay89); -void sub_02099550 (void) +void sub_02099550(void) { Overlay_LoadByID(FS_OVERLAY_ID(overlay4), 2); } -void sub_02099560 (void) +void sub_02099560(void) { Overlay_UnloadByID(FS_OVERLAY_ID(overlay4)); } -void sub_02099570 (void) +void sub_02099570(void) { Overlay_LoadByID(FS_OVERLAY_ID(overlay18), 2); } -void sub_02099580 (void) +void sub_02099580(void) { Overlay_UnloadByID(FS_OVERLAY_ID(overlay18)); } -void sub_02099590 (SaveData * param0, int param1) +void sub_02099590(SaveData *param0, int param1) { sub_02099550(); sub_02099570(); @@ -49,17 +50,17 @@ void sub_02099590 (SaveData * param0, int param1) OS_ResetSystem(0); } -void sub_020995B4 (void) +void sub_020995B4(void) { Overlay_LoadByID(FS_OVERLAY_ID(overlay60), 2); } -void sub_020995C4 (void) +void sub_020995C4(void) { Overlay_UnloadByID(FS_OVERLAY_ID(overlay60)); } -static int sub_020995D4 (OverlayManager * param0, int * param1) +static int sub_020995D4(OverlayManager *param0, int *param1) { Heap_Create(3, 49, 0x41000); sub_02099590(((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08, 49); @@ -70,5 +71,8 @@ static int sub_020995D4 (OverlayManager * param0, int * param1) } const OverlayManagerTemplate Unk_020F6DF0 = { - sub_020995D4, NULL, NULL, 0xffffffff, + sub_020995D4, + NULL, + NULL, + 0xffffffff, }; diff --git a/src/unk_02099604.c b/src/unk_02099604.c index 9b5074cf7c..c803e1c469 100644 --- a/src/unk_02099604.c +++ b/src/unk_02099604.c @@ -1,28 +1,27 @@ #include #include -#include "journal.h" -#include "savedata.h" - #include "field/field_system.h" +#include "overlay082/ov82_0223B140.h" #include "overlay082/struct_ov82_0223B164.h" +#include "bag.h" +#include "field_system.h" #include "heap.h" -#include "unk_02025E08.h" +#include "journal.h" #include "poffin.h" -#include "field_system.h" -#include "bag.h" -#include "overlay082/ov82_0223B140.h" +#include "savedata.h" +#include "unk_02025E08.h" FS_EXTERN_OVERLAY(overlay82); -UnkStruct_ov82_0223B164 * sub_02099604(int param0, SaveData * param1, int param2, Journal * param3); -UnkStruct_ov82_0223B164 * sub_02099674(FieldSystem * fieldSystem, int param1, int param2); -UnkStruct_ov82_0223B164 * sub_020996A0(FieldSystem * fieldSystem, int param1, BOOL param2); +UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int param2, Journal *param3); +UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int param2); +UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int param1, BOOL param2); -UnkStruct_ov82_0223B164 * sub_02099604 (int param0, SaveData * param1, int param2, Journal * param3) +UnkStruct_ov82_0223B164 *sub_02099604(int param0, SaveData *param1, int param2, Journal *param3) { - UnkStruct_ov82_0223B164 * v0; + UnkStruct_ov82_0223B164 *v0; v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_ov82_0223B164)); MI_CpuClear8(v0, sizeof(UnkStruct_ov82_0223B164)); @@ -39,7 +38,7 @@ UnkStruct_ov82_0223B164 * sub_02099604 (int param0, SaveData * param1, int param return v0; } -static void sub_0209964C (FieldSystem * fieldSystem, UnkStruct_ov82_0223B164 * param1) +static void sub_0209964C(FieldSystem *fieldSystem, UnkStruct_ov82_0223B164 *param1) { FS_EXTERN_OVERLAY(overlay82); @@ -55,9 +54,9 @@ static void sub_0209964C (FieldSystem * fieldSystem, UnkStruct_ov82_0223B164 * p } } -UnkStruct_ov82_0223B164 * sub_02099674 (FieldSystem * fieldSystem, int param1, int param2) +UnkStruct_ov82_0223B164 *sub_02099674(FieldSystem *fieldSystem, int param1, int param2) { - UnkStruct_ov82_0223B164 * v0; + UnkStruct_ov82_0223B164 *v0; v0 = sub_02099604(param1, FieldSystem_SaveData(fieldSystem), param2, fieldSystem->unk_9C); sub_0209964C(fieldSystem, v0); @@ -65,9 +64,9 @@ UnkStruct_ov82_0223B164 * sub_02099674 (FieldSystem * fieldSystem, int param1, i return v0; } -UnkStruct_ov82_0223B164 * sub_020996A0 (FieldSystem * fieldSystem, int param1, BOOL param2) +UnkStruct_ov82_0223B164 *sub_020996A0(FieldSystem *fieldSystem, int param1, BOOL param2) { - UnkStruct_ov82_0223B164 * v0; + UnkStruct_ov82_0223B164 *v0; v0 = sub_02099604(1, FieldSystem_SaveData(fieldSystem), param1, fieldSystem->unk_9C); v0->unk_20 = 1; diff --git a/src/unk_020996D0.c b/src/unk_020996D0.c index 414f2e4ec9..8d36ed3434 100644 --- a/src/unk_020996D0.c +++ b/src/unk_020996D0.c @@ -1,732 +1,732 @@ +#include "unk_020996D0.h" + #include #include -#include "unk_020996D0.h" - static const u8 Unk_020F6EB8[] = { - 0x1, - 0x3, - 0x4, - 0x5, - 0x2, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xB, - 0xC, - 0xD, - 0xE, - 0xF, - 0x10, - 0x11, - 0x12, - 0x13, - 0x14, - 0x15, - 0x16, - 0x17, - 0x18 + 0x1, + 0x3, + 0x4, + 0x5, + 0x2, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xB, + 0xC, + 0xD, + 0xE, + 0xF, + 0x10, + 0x11, + 0x12, + 0x13, + 0x14, + 0x15, + 0x16, + 0x17, + 0x18 }; static const u8 Unk_020F6E18[] = { - 0x1, - 0x2, - 0x3, - 0x4, - 0x5, - 0x6, - 0x7 + 0x1, + 0x2, + 0x3, + 0x4, + 0x5, + 0x6, + 0x7 }; static const u8 Unk_020F6EE8[] = { - 0x1, - 0x3, - 0x4, - 0x5, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xB, - 0xC, - 0xD, - 0xE, - 0xF, - 0x10, - 0x11, - 0x12, - 0x13, - 0x16, - 0x15, - 0x14, - 0x2, - 0x17, - 0x18, - 0x19, - 0x1A, - 0x1B + 0x1, + 0x3, + 0x4, + 0x5, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xB, + 0xC, + 0xD, + 0xE, + 0xF, + 0x10, + 0x11, + 0x12, + 0x13, + 0x16, + 0x15, + 0x14, + 0x2, + 0x17, + 0x18, + 0x19, + 0x1A, + 0x1B }; static const u8 Unk_020F6E34[] = { - 0x1, - 0x2, - 0x3, - 0x4, - 0x5, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xB, - 0xC, - 0xD + 0x1, + 0x2, + 0x3, + 0x4, + 0x5, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xB, + 0xC, + 0xD }; static const u8 Unk_020F6F04[] = { - 0x1, - 0x2, - 0x3, - 0x4, - 0x5, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xB, - 0xC, - 0xD, - 0xE, - 0xF, - 0x10, - 0x11, - 0x12, - 0x13, - 0x14, - 0x15, - 0x16, - 0x17, - 0x18, - 0x19, - 0x1A, - 0x1B, - 0x1C, - 0x1D, - 0x1E, - 0x1F + 0x1, + 0x2, + 0x3, + 0x4, + 0x5, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xB, + 0xC, + 0xD, + 0xE, + 0xF, + 0x10, + 0x11, + 0x12, + 0x13, + 0x14, + 0x15, + 0x16, + 0x17, + 0x18, + 0x19, + 0x1A, + 0x1B, + 0x1C, + 0x1D, + 0x1E, + 0x1F }; static const u8 Unk_020F6E54[] = { - 0x1, - 0x2, - 0x3, - 0x4, - 0x5, - 0x10, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xB, - 0xC, - 0xD, - 0xE, - 0xF + 0x1, + 0x2, + 0x3, + 0x4, + 0x5, + 0x10, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xB, + 0xC, + 0xD, + 0xE, + 0xF }; static const u8 Unk_020F6E64[] = { - 0x1, - 0x2, - 0x3, - 0x7, - 0x9, - 0x8, - 0xA, - 0x11, - 0xB, - 0xC, - 0x4, - 0x6, - 0x10, - 0xD, - 0xE, - 0xF, - 0x5 + 0x1, + 0x2, + 0x3, + 0x7, + 0x9, + 0x8, + 0xA, + 0x11, + 0xB, + 0xC, + 0x4, + 0x6, + 0x10, + 0xD, + 0xE, + 0xF, + 0x5 }; static const u8 Unk_020F6E10[] = { - 0x1, - 0x3, - 0x2, - 0x5, - 0x4, - 0x6 + 0x1, + 0x3, + 0x2, + 0x5, + 0x4, + 0x6 }; static const u8 Unk_020F6EA0[] = { - 0x2, - 0x1, - 0x4, - 0xC, - 0xD, - 0x7, - 0x6, - 0x5, - 0xB, - 0x3, - 0x12, - 0x13, - 0x16, - 0x15, - 0x11, - 0x8, - 0x9, - 0xF, - 0xA, - 0x10, - 0xE, - 0x14 + 0x2, + 0x1, + 0x4, + 0xC, + 0xD, + 0x7, + 0x6, + 0x5, + 0xB, + 0x3, + 0x12, + 0x13, + 0x16, + 0x15, + 0x11, + 0x8, + 0x9, + 0xF, + 0xA, + 0x10, + 0xE, + 0x14 }; static const u8 Unk_020F6E28[] = { - 0x2, - 0x1, - 0x3, - 0x4, - 0x5, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xB, - 0xC + 0x2, + 0x1, + 0x3, + 0x4, + 0x5, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xB, + 0xC }; static const u8 Unk_020F6F24[] = { - 0x1, - 0x2, - 0x3, - 0x4, - 0x5, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xB, - 0xC, - 0xD, - 0xE, - 0xF, - 0x10, - 0x11, - 0x12, - 0x13, - 0x14, - 0x15, - 0x18, - 0x16, - 0x17, - 0x19, - 0x1A, - 0x1B, - 0x1C, - 0x1D, - 0x1E, - 0x1F, - 0x20, - 0x21, - 0x22, - 0x23 + 0x1, + 0x2, + 0x3, + 0x4, + 0x5, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xB, + 0xC, + 0xD, + 0xE, + 0xF, + 0x10, + 0x11, + 0x12, + 0x13, + 0x14, + 0x15, + 0x18, + 0x16, + 0x17, + 0x19, + 0x1A, + 0x1B, + 0x1C, + 0x1D, + 0x1E, + 0x1F, + 0x20, + 0x21, + 0x22, + 0x23 }; static const u8 Unk_020F6E8C[] = { - 0x1, - 0x2, - 0x3, - 0x4, - 0x5, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xB, - 0xC, - 0xD, - 0xE, - 0xF, - 0x10, - 0x11, - 0x12, - 0x13, - 0x14 + 0x1, + 0x2, + 0x3, + 0x4, + 0x5, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xB, + 0xC, + 0xD, + 0xE, + 0xF, + 0x10, + 0x11, + 0x12, + 0x13, + 0x14 }; static const u8 Unk_020F6F48[] = { - 0x1A, - 0x8, - 0x5, - 0xF, - 0x29, - 0x15, - 0x2B, - 0xA, - 0x18, - 0xD, - 0x25, - 0x2, - 0x4, - 0x1, - 0x3, - 0x1F, - 0xB, - 0x14, - 0x6, - 0x28, - 0x31, - 0x11, - 0x2A, - 0x2E, - 0x1D, - 0x1B, - 0x7, - 0x30, - 0x17, - 0x2D, - 0x20, - 0x12, - 0x2F, - 0x24, - 0x32, - 0x1E, - 0x2C, - 0xE, - 0x1C, - 0x23, - 0x19, - 0xC, - 0x27, - 0x10, - 0x22, - 0x13, - 0x21, - 0x9, - 0x26, - 0x16 + 0x1A, + 0x8, + 0x5, + 0xF, + 0x29, + 0x15, + 0x2B, + 0xA, + 0x18, + 0xD, + 0x25, + 0x2, + 0x4, + 0x1, + 0x3, + 0x1F, + 0xB, + 0x14, + 0x6, + 0x28, + 0x31, + 0x11, + 0x2A, + 0x2E, + 0x1D, + 0x1B, + 0x7, + 0x30, + 0x17, + 0x2D, + 0x20, + 0x12, + 0x2F, + 0x24, + 0x32, + 0x1E, + 0x2C, + 0xE, + 0x1C, + 0x23, + 0x19, + 0xC, + 0x27, + 0x10, + 0x22, + 0x13, + 0x21, + 0x9, + 0x26, + 0x16 }; static const u8 Unk_020F6E78[] = { - 0x1, - 0x2, - 0x3, - 0x4, - 0x5, - 0x6, - 0x7, - 0x8, - 0xA, - 0x9, - 0xB, - 0xC, - 0x14, - 0xD, - 0xE, - 0xF, - 0x10, - 0x11, - 0x12, - 0x13 + 0x1, + 0x2, + 0x3, + 0x4, + 0x5, + 0x6, + 0x7, + 0x8, + 0xA, + 0x9, + 0xB, + 0xC, + 0x14, + 0xD, + 0xE, + 0xF, + 0x10, + 0x11, + 0x12, + 0x13 }; static const u8 Unk_020F6E44[] = { - 0x1, - 0x2, - 0x5, - 0x3, - 0x4, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xB, - 0xC, - 0xD, - 0xE, - 0xF, - 0x10 + 0x1, + 0x2, + 0x5, + 0x3, + 0x4, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xB, + 0xC, + 0xD, + 0xE, + 0xF, + 0x10 }; static const u8 Unk_020F6E20[] = { - 0x1, - 0x2, - 0x3, - 0x5, - 0x6, - 0x7, - 0x4 + 0x1, + 0x2, + 0x3, + 0x5, + 0x6, + 0x7, + 0x4 }; static const u8 Unk_020F6ED0[] = { - 0x1, - 0x2, - 0x3, - 0x4, - 0x5, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xD, - 0xE, - 0xF, - 0xB, - 0x10, - 0x11, - 0x12, - 0x13, - 0x14, - 0xC, - 0x15, - 0x16, - 0x17, - 0x18 + 0x1, + 0x2, + 0x3, + 0x4, + 0x5, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xD, + 0xE, + 0xF, + 0xB, + 0x10, + 0x11, + 0x12, + 0x13, + 0x14, + 0xC, + 0x15, + 0x16, + 0x17, + 0x18 }; static const u8 Unk_020F6F7C[] = { - 0x1, - 0x2, - 0x3, - 0x4, - 0x5, - 0x6, - 0x7, - 0x8, - 0x9, - 0xA, - 0xB, - 0xC, - 0xD, - 0xE, - 0xF, - 0x10, - 0x11, - 0x12, - 0x13, - 0x14, - 0x15, - 0x16, - 0x17, - 0x18, - 0x19, - 0x1A, - 0x1B, - 0x1C, - 0x1D, - 0x1E, - 0x1F, - 0x20, - 0x21, - 0x22, - 0x23, - 0x24, - 0x25, - 0x26, - 0x27, - 0x28, - 0x29, - 0x2A, - 0x2B, - 0x2C, - 0x2D, - 0x2E, - 0x2F, - 0x30, - 0x31, - 0x32, - 0x33 + 0x1, + 0x2, + 0x3, + 0x4, + 0x5, + 0x6, + 0x7, + 0x8, + 0x9, + 0xA, + 0xB, + 0xC, + 0xD, + 0xE, + 0xF, + 0x10, + 0x11, + 0x12, + 0x13, + 0x14, + 0x15, + 0x16, + 0x17, + 0x18, + 0x19, + 0x1A, + 0x1B, + 0x1C, + 0x1D, + 0x1E, + 0x1F, + 0x20, + 0x21, + 0x22, + 0x23, + 0x24, + 0x25, + 0x26, + 0x27, + 0x28, + 0x29, + 0x2A, + 0x2B, + 0x2C, + 0x2D, + 0x2E, + 0x2F, + 0x30, + 0x31, + 0x32, + 0x33 }; static const u8 Unk_020F7094[] = { - 0x1, - 0x2, - 0x3, - 0x6, - 0x8, - 0x9, - 0xC, - 0xD, - 0xF, - 0x10, - 0x11, - 0x12, - 0x14, - 0x15, - 0x16, - 0x17, - 0x19, - 0x1B, - 0x1C, - 0x1D, - 0x1F, - 0x21, - 0x22, - 0x23, - 0x24, - 0x28, - 0x2A, - 0x2B, - 0x2D, - 0x30, - 0x31, - 0x32, - 0x34, - 0x36, - 0x37, - 0x38, - 0x3A, - 0x3B, - 0x3C, - 0x3D, - 0x3E, - 0x45, - 0x46, - 0x47, - 0x48, - 0x4A, - 0x4D, - 0x4E, - 0x4F, - 0x50, - 0x51, - 0x52, - 0x53, - 0x55, - 0x56, - 0x58, - 0x59, - 0x5A, - 0x5B, - 0x5C, - 0x5D, - 0x5E, - 0x5F, - 0x61, - 0x62, - 0x64, - 0x65, - 0x66, - 0x67, - 0x68, - 0x6B, - 0x6F, - 0x73, - 0x75, - 0x76, - 0x79, - 0x7A, - 0x7E, - 0x81, - 0x83, - 0x85, - 0x87, - 0x8C, - 0x8E, - 0x92, - 0x94, - 0x95, - 0x96, - 0x97, - 0x98, - 0x9C, - 0x9D, - 0x9E, - 0xA0, - 0xA1, - 0xA3, - 0xA4, - 0xA6, - 0xA7, - 0x6E, - 0xAB, - 0xAC, - 0xB3, - 0xB7, - 0xBA, - 0xBB, - 0xBC, - 0xBD, - 0xC0, - 0xC1, - 0xC2, - 0xC4, - 0xC6, - 0xC7, - 0xC8, - 0xCA, - 0xCD, - 0xCF, - 0xD3, - 0xD4, - 0xD8, - 0xDA, - 0xDB, - 0xCC, - 0xDD, - 0xDC, - 0xDE, - 0xE0, - 0xE2, - 0xE3, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0, - 0x0 + 0x1, + 0x2, + 0x3, + 0x6, + 0x8, + 0x9, + 0xC, + 0xD, + 0xF, + 0x10, + 0x11, + 0x12, + 0x14, + 0x15, + 0x16, + 0x17, + 0x19, + 0x1B, + 0x1C, + 0x1D, + 0x1F, + 0x21, + 0x22, + 0x23, + 0x24, + 0x28, + 0x2A, + 0x2B, + 0x2D, + 0x30, + 0x31, + 0x32, + 0x34, + 0x36, + 0x37, + 0x38, + 0x3A, + 0x3B, + 0x3C, + 0x3D, + 0x3E, + 0x45, + 0x46, + 0x47, + 0x48, + 0x4A, + 0x4D, + 0x4E, + 0x4F, + 0x50, + 0x51, + 0x52, + 0x53, + 0x55, + 0x56, + 0x58, + 0x59, + 0x5A, + 0x5B, + 0x5C, + 0x5D, + 0x5E, + 0x5F, + 0x61, + 0x62, + 0x64, + 0x65, + 0x66, + 0x67, + 0x68, + 0x6B, + 0x6F, + 0x73, + 0x75, + 0x76, + 0x79, + 0x7A, + 0x7E, + 0x81, + 0x83, + 0x85, + 0x87, + 0x8C, + 0x8E, + 0x92, + 0x94, + 0x95, + 0x96, + 0x97, + 0x98, + 0x9C, + 0x9D, + 0x9E, + 0xA0, + 0xA1, + 0xA3, + 0xA4, + 0xA6, + 0xA7, + 0x6E, + 0xAB, + 0xAC, + 0xB3, + 0xB7, + 0xBA, + 0xBB, + 0xBC, + 0xBD, + 0xC0, + 0xC1, + 0xC2, + 0xC4, + 0xC6, + 0xC7, + 0xC8, + 0xCA, + 0xCD, + 0xCF, + 0xD3, + 0xD4, + 0xD8, + 0xDA, + 0xDB, + 0xCC, + 0xDD, + 0xDC, + 0xDE, + 0xE0, + 0xE2, + 0xE3, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0, + 0x0 }; typedef struct { u8 unk_00; u8 unk_01; u16 unk_02; - const u8 * unk_04; + const u8 *unk_04; u32 unk_08; } UnkStruct_020F6FB0; static const UnkStruct_020F6FB0 Unk_020F6FB0[] = { - {0x0, 0x12, 0x2B6, Unk_020F7094, 0x82}, - {0x9, 0x0, 0x2A4, Unk_020F6EB8, 0x18}, - {0xC, 0x1, 0x2A5, Unk_020F6E18, 0x7}, - {0x1C, 0x2, 0x2A6, Unk_020F6EE8, 0x1B}, - {0x24, 0x3, 0x2A7, Unk_020F6E34, 0xD}, - {0x2B, 0x4, 0x2A8, Unk_020F6F04, 0x1F}, - {0x4D, 0x5, 0x2A9, Unk_020F6E54, 0x10}, - {0xC1, 0x6, 0x2AA, Unk_020F6E64, 0x11}, - {0x46, 0x7, 0x2AB, Unk_020F6E10, 0x6}, - {0x47, 0x8, 0x2AC, Unk_020F6EA0, 0x16}, - {0xDB, 0x9, 0x2AD, Unk_020F6E28, 0xC}, - {0x5E, 0xA, 0x2AE, Unk_020F6F24, 0x23}, - {0x65, 0xB, 0x2AF, Unk_020F6E8C, 0x14}, - {0x67, 0xC, 0x2B0, Unk_020F6F48, 0x32}, - {0x9C, 0xD, 0x2B1, Unk_020F6E78, 0x14}, - {0xA6, 0xE, 0x2B2, Unk_020F6E44, 0x10}, - {0xAC, 0xF, 0x2B3, Unk_020F6E20, 0x7}, - {0xC7, 0x10, 0x2B4, Unk_020F6ED0, 0x18}, - {0xDC, 0x11, 0x2B5, Unk_020F6F7C, 0x33} + { 0x0, 0x12, 0x2B6, Unk_020F7094, 0x82 }, + { 0x9, 0x0, 0x2A4, Unk_020F6EB8, 0x18 }, + { 0xC, 0x1, 0x2A5, Unk_020F6E18, 0x7 }, + { 0x1C, 0x2, 0x2A6, Unk_020F6EE8, 0x1B }, + { 0x24, 0x3, 0x2A7, Unk_020F6E34, 0xD }, + { 0x2B, 0x4, 0x2A8, Unk_020F6F04, 0x1F }, + { 0x4D, 0x5, 0x2A9, Unk_020F6E54, 0x10 }, + { 0xC1, 0x6, 0x2AA, Unk_020F6E64, 0x11 }, + { 0x46, 0x7, 0x2AB, Unk_020F6E10, 0x6 }, + { 0x47, 0x8, 0x2AC, Unk_020F6EA0, 0x16 }, + { 0xDB, 0x9, 0x2AD, Unk_020F6E28, 0xC }, + { 0x5E, 0xA, 0x2AE, Unk_020F6F24, 0x23 }, + { 0x65, 0xB, 0x2AF, Unk_020F6E8C, 0x14 }, + { 0x67, 0xC, 0x2B0, Unk_020F6F48, 0x32 }, + { 0x9C, 0xD, 0x2B1, Unk_020F6E78, 0x14 }, + { 0xA6, 0xE, 0x2B2, Unk_020F6E44, 0x10 }, + { 0xAC, 0xF, 0x2B3, Unk_020F6E20, 0x7 }, + { 0xC7, 0x10, 0x2B4, Unk_020F6ED0, 0x18 }, + { 0xDC, 0x11, 0x2B5, Unk_020F6F7C, 0x33 } }; -u32 sub_020996D0 (void) +u32 sub_020996D0(void) { return NELEMS(Unk_020F6FB0); } -u32 sub_020996D4 (u32 param0) +u32 sub_020996D4(u32 param0) { u32 v0; @@ -739,7 +739,7 @@ u32 sub_020996D4 (u32 param0) return 0; } -u32 sub_020996F4 (u32 param0) +u32 sub_020996F4(u32 param0) { u32 v0; @@ -752,37 +752,37 @@ u32 sub_020996F4 (u32 param0) return 0; } -u32 sub_02099720 (u32 param0) +u32 sub_02099720(u32 param0) { u32 v0 = sub_020996D4(param0); return sub_0209972C(v0); } -u32 sub_0209972C (u32 param0) +u32 sub_0209972C(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_020F6FB0)); return Unk_020F6FB0[param0].unk_02; } -u32 sub_02099748 (u32 param0) +u32 sub_02099748(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_020F6FB0)); return Unk_020F6FB0[param0].unk_00; } -u32 sub_02099764 (u32 param0) +u32 sub_02099764(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_020F6FB0)); return Unk_020F6FB0[param0].unk_01; } -const u8 * sub_02099780 (u32 param0) +const u8 *sub_02099780(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_020F6FB0)); return Unk_020F6FB0[param0].unk_04; } -u32 sub_0209979C (u32 param0) +u32 sub_0209979C(u32 param0) { GF_ASSERT(param0 < NELEMS(Unk_020F6FB0)); return Unk_020F6FB0[param0].unk_08; diff --git a/src/unk_020997B8.c b/src/unk_020997B8.c index 387e530a21..d5b66bd649 100644 --- a/src/unk_020997B8.c +++ b/src/unk_020997B8.c @@ -1,31 +1,30 @@ +#include "unk_020997B8.h" + #include #include -#include "pokemon.h" - #include "struct_defs/struct_020997B8.h" #include "heap.h" #include "pokemon.h" -#include "unk_020997B8.h" -UnkStruct_020997B8 * sub_020997B8 (u32 param0) +UnkStruct_020997B8 *sub_020997B8(u32 param0) { - UnkStruct_020997B8 * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020997B8)); + UnkStruct_020997B8 *v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020997B8)); memset(v0, 0, sizeof(UnkStruct_020997B8)); return v0; } -void sub_020997D0 (UnkStruct_020997B8 * param0) +void sub_020997D0(UnkStruct_020997B8 *param0) { Heap_FreeToHeap(param0); } -u16 * sub_020997D8 (Pokemon * param0, u32 param1) +u16 *sub_020997D8(Pokemon *param0, u32 param1) { - u16 * v0; - u16 * v1; + u16 *v0; + u16 *v1; u16 v2[4]; u16 v3; u8 v4; @@ -82,7 +81,7 @@ u16 * sub_020997D8 (Pokemon * param0, u32 param1) return v1; } -BOOL sub_020998D8 (u16 * param0) +BOOL sub_020998D8(u16 *param0) { if (param0[0] == 0xffff) { return 0; diff --git a/src/unk_020998EC.c b/src/unk_020998EC.c index ed91494ec8..4872a4d04a 100644 --- a/src/unk_020998EC.c +++ b/src/unk_020998EC.c @@ -1,1515 +1,1514 @@ +#include "unk_020998EC.h" + #include #include -#include "inlines.h" - - +#include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02014D38_decl.h" #include "struct_decls/struct_02014EC4_decl.h" -#include "strbuf.h" -#include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0209747C_decl.h" #include "struct_decls/struct_020998EC_decl.h" -#include "unk_02014D38.h" #include "heap.h" +#include "inlines.h" +#include "strbuf.h" +#include "unk_02014D38.h" #include "unk_0202631C.h" #include "unk_0209747C.h" -#include "unk_020998EC.h" static const u16 Unk_020F8420[] = { - 0x1CC, - 0x3F, - 0x167, - 0x8E, - 0x132, - 0xBE, - 0x41, - 0x14E, - 0x1A8, - 0xB5, - 0x15B, - 0x18, - 0x3B, - 0x1ED, - 0xA8, - 0x15C, - 0x130, - 0x90, - 0x1E2, - 0xB8, - 0x12A, - 0x173, - 0x157, - 0x162, - 0x153, - 0x19B, - 0x99, - 0x10B, - 0xF, - 0x176, - 0xB6, - 0x45, - 0x190, - 0x18F, - 0x9, - 0x101, - 0xF2, - 0x1B6, - 0x11E, - 0x1B5, - 0x1B4, - 0x196, - 0x1A2, - 0x1, - 0x1AB, - 0x19C, - 0xC, - 0x14B, - 0x14C, - 0x143, - 0x1C7, - 0x13E, - 0x10C, - 0x15F, - 0xA, - 0xFB, - 0x71, - 0x6, - 0x4, - 0x5, - 0x1B9, - 0x1A5, - 0x1A4, - 0x98, - 0x186, - 0x166, - 0xAA, - 0x1B1, - 0x16E, - 0x158, - 0x24, - 0x23, - 0xAD, - 0x5B, - 0x19F, - 0x100, - 0x155, - 0xDE, - 0x15A, - 0x198, - 0x156, - 0x1E8, - 0x1C5, - 0xA9, - 0x9F, - 0x68, - 0x9B, - 0x1EB, - 0x12D, - 0xE1, - 0x182, - 0x57, - 0x1E3, - 0x32, - 0x84, - 0x55, - 0x54, - 0xE8, - 0x94, - 0x95, - 0x1C4, - 0x93, - 0x1AA, - 0x1A9, - 0x60, - 0x33, - 0xCE, - 0x164, - 0x1DD, - 0x163, - 0x10D, - 0x85, - 0x17, - 0x7D, - 0x1D2, - 0x135, - 0x65, - 0xEF, - 0x18B, - 0xF4, - 0xC4, - 0x66, - 0x67, - 0x127, - 0x53, - 0x16, - 0x15D, - 0xA0, - 0x1C8, - 0xB4, - 0x88, - 0x1A3, - 0x14A, - 0xCD, - 0x1DE, - 0xA2, - 0x1BC, - 0x1DB, - 0x1BD, - 0x11A, - 0x5C, - 0x1A7, - 0x5E, - 0x4A, - 0x1BB, - 0xCB, - 0x1E7, - 0x1D7, - 0x16A, - 0x1AF, - 0xCF, - 0x1D8, - 0x2C, - 0x2A, - 0x76, - 0x37, - 0x4C, - 0x170, - 0xD2, - 0x4B, - 0x58, - 0x184, - 0x17F, - 0xFD, - 0x3A, - 0x146, - 0x13C, - 0x82, - 0x1B8, - 0x129, - 0x5D, - 0x1E5, - 0xD6, - 0x1C1, - 0x1C2, - 0x6B, - 0x6A, - 0xED, - 0xFA, - 0x1AE, - 0xA3, - 0xBB, - 0x74, - 0xE5, - 0xE4, - 0x16F, - 0x61, - 0xAE, - 0x13A, - 0x188, - 0x2, - 0x27, - 0x181, - 0x87, - 0xBD, - 0x7C, - 0x8C, - 0x8D, - 0x40, - 0xE, - 0x73, - 0x160, - 0xE6, - 0x63, - 0x119, - 0x6D, - 0x62, - 0x191, - 0x192, - 0x17E, - 0x131, - 0xAB, - 0x83, - 0xF6, - 0x17C, - 0x17D, - 0x1D6, - 0xA6, - 0xA5, - 0x1CF, - 0x6C, - 0x159, - 0x108, - 0x10F, - 0x1AC, - 0x10E, - 0x126, - 0x1C0, - 0x110, - 0xF9, - 0x1C9, - 0x151, - 0x172, - 0x194, - 0x195, - (0xffff) + 0x1CC, + 0x3F, + 0x167, + 0x8E, + 0x132, + 0xBE, + 0x41, + 0x14E, + 0x1A8, + 0xB5, + 0x15B, + 0x18, + 0x3B, + 0x1ED, + 0xA8, + 0x15C, + 0x130, + 0x90, + 0x1E2, + 0xB8, + 0x12A, + 0x173, + 0x157, + 0x162, + 0x153, + 0x19B, + 0x99, + 0x10B, + 0xF, + 0x176, + 0xB6, + 0x45, + 0x190, + 0x18F, + 0x9, + 0x101, + 0xF2, + 0x1B6, + 0x11E, + 0x1B5, + 0x1B4, + 0x196, + 0x1A2, + 0x1, + 0x1AB, + 0x19C, + 0xC, + 0x14B, + 0x14C, + 0x143, + 0x1C7, + 0x13E, + 0x10C, + 0x15F, + 0xA, + 0xFB, + 0x71, + 0x6, + 0x4, + 0x5, + 0x1B9, + 0x1A5, + 0x1A4, + 0x98, + 0x186, + 0x166, + 0xAA, + 0x1B1, + 0x16E, + 0x158, + 0x24, + 0x23, + 0xAD, + 0x5B, + 0x19F, + 0x100, + 0x155, + 0xDE, + 0x15A, + 0x198, + 0x156, + 0x1E8, + 0x1C5, + 0xA9, + 0x9F, + 0x68, + 0x9B, + 0x1EB, + 0x12D, + 0xE1, + 0x182, + 0x57, + 0x1E3, + 0x32, + 0x84, + 0x55, + 0x54, + 0xE8, + 0x94, + 0x95, + 0x1C4, + 0x93, + 0x1AA, + 0x1A9, + 0x60, + 0x33, + 0xCE, + 0x164, + 0x1DD, + 0x163, + 0x10D, + 0x85, + 0x17, + 0x7D, + 0x1D2, + 0x135, + 0x65, + 0xEF, + 0x18B, + 0xF4, + 0xC4, + 0x66, + 0x67, + 0x127, + 0x53, + 0x16, + 0x15D, + 0xA0, + 0x1C8, + 0xB4, + 0x88, + 0x1A3, + 0x14A, + 0xCD, + 0x1DE, + 0xA2, + 0x1BC, + 0x1DB, + 0x1BD, + 0x11A, + 0x5C, + 0x1A7, + 0x5E, + 0x4A, + 0x1BB, + 0xCB, + 0x1E7, + 0x1D7, + 0x16A, + 0x1AF, + 0xCF, + 0x1D8, + 0x2C, + 0x2A, + 0x76, + 0x37, + 0x4C, + 0x170, + 0xD2, + 0x4B, + 0x58, + 0x184, + 0x17F, + 0xFD, + 0x3A, + 0x146, + 0x13C, + 0x82, + 0x1B8, + 0x129, + 0x5D, + 0x1E5, + 0xD6, + 0x1C1, + 0x1C2, + 0x6B, + 0x6A, + 0xED, + 0xFA, + 0x1AE, + 0xA3, + 0xBB, + 0x74, + 0xE5, + 0xE4, + 0x16F, + 0x61, + 0xAE, + 0x13A, + 0x188, + 0x2, + 0x27, + 0x181, + 0x87, + 0xBD, + 0x7C, + 0x8C, + 0x8D, + 0x40, + 0xE, + 0x73, + 0x160, + 0xE6, + 0x63, + 0x119, + 0x6D, + 0x62, + 0x191, + 0x192, + 0x17E, + 0x131, + 0xAB, + 0x83, + 0xF6, + 0x17C, + 0x17D, + 0x1D6, + 0xA6, + 0xA5, + 0x1CF, + 0x6C, + 0x159, + 0x108, + 0x10F, + 0x1AC, + 0x10E, + 0x126, + 0x1C0, + 0x110, + 0xF9, + 0x1C9, + 0x151, + 0x172, + 0x194, + 0x195, + (0xffff) }; static const u16 Unk_020F87DC[] = { - 0x44, - 0x43, - 0x42, - 0xF0, - 0xDB, - 0x81, - 0x7E, - 0x1D3, - 0x51, - 0x52, - 0x1CE, - 0x128, - 0x1D9, - 0x1EA, - 0x136, - 0x38, - 0xE2, - 0x1CA, - 0xB3, - 0xB7, - 0x69, - 0x103, - 0x11C, - 0x12F, - 0x134, - 0x133, - 0x9A, - 0x34, - 0x1E1, - 0x178, - 0x177, - 0xB, - 0x97, - 0x96, - 0x106, - 0x15E, - 0xF1, - 0x1B7, - 0x138, - 0xC8, - 0x1AD, - 0x92, - 0x187, - 0x19E, - 0x7A, - 0x102, - 0x59, - 0x1BE, - 0xC6, - 0xB1, - 0x22, - 0x1F, - 0x1D, - 0x20, - 0x1E, - 0x21, - 0x122, - 0x26, - 0x123, - 0xA4, - 0x12B, - 0x142, - 0x112, - 0xE0, - 0x2B, - 0x8A, - 0x8B, - 0x5F, - 0x1A1, - 0x1E4, - 0x2E, - 0x2F, - 0x117, - 0x35, - 0xE7, - 0x1E9, - 0xAC, - 0x12, - 0x11, - 0x10, - 0x19, - 0xDD, - 0xCC, - 0x7F, - 0x189, - 0x137, - 0xBA, - 0x3C, - 0x3D, - 0x3E, - 0x4D, - 0x105, - 0x89, - 0x1DA, - 0xE9, - 0x39, - 0x18A, - 0x1DC, - 0x36, - 0xF7, - 0x1B0, - 0xC3, - 0x9C, - 0xD3, - 0x1A, - 0xF3, - 0x118, - 0x199, - 0x4E, - 0x14, - 0x13, - 0x180, - 0x17A, - 0x1E6, - 0x179, - 0x17B, - 0x171, - 0xDF, - 0x70, - 0x6F, - 0x1D0, - 0x1BF, - 0x13B, - 0x197, - 0x1DF, - 0x12E, - 0x175, - 0x1B, - 0x1C, - 0xFE, - 0xD4, - 0x7B, - 0x75, - 0x77, - 0x16C, - 0x111, - 0x56, - 0xA1, - 0x150, - 0x13F, - 0x1EC, - 0x124, - 0x174, - 0x5A, - 0x1A6, - 0x19A, - 0x113, - 0x193, - 0x11D, - 0xD5, - 0x161, - 0x10A, - 0xE3, - 0xBC, - 0x12C, - 0x1C3, - 0x1B3, - 0x121, - 0x11F, - 0x50, - 0xC7, - 0x4F, - 0xDA, - 0xEB, - 0xEE, - 0xD7, - 0x8F, - 0x169, - 0x1CB, - 0xD1, - 0x152, - 0x15, - 0x16B, - 0xA7, - 0x147, - 0x1BA, - 0x145, - 0x7, - 0xEA, - 0x18E, - 0x18D, - 0x18C, - 0x79, - 0x78, - 0xD0, - 0x1B2, - 0xB9, - 0xF5, - 0xC0, - 0xBF, - 0x11B, - 0x14D, - 0x13D, - 0x104, - 0x115, - 0xDC, - 0x114, - 0x72, - 0x1D1, - 0x80, - 0xD8, - 0x48, - 0x49, - 0x1D4, - 0xAF, - 0xB0, - 0xFF, - 0x144, - 0x185, - 0x9E, - 0x1C6, - 0x148, - 0xFC, - 0x165, - 0x183, - 0x9D, - 0xF8, - 0xEC, - 0xC5, - 0xC9, - 0xD9, - 0x1E0, - 0x86, - 0x31, - 0x30, - 0x3, - 0x1A0, - 0x149, - 0x47, - 0x120, - 0x2D, - 0x139, - 0x64, - 0x25, - 0x140, - 0x141, - 0x16D, - 0x8, - 0x1CD, - 0xD, - 0x46, - 0x6E, - 0x154, - 0x125, - 0x28, - 0x116, - 0xCA, - 0xC2, - 0x19D, - 0x109, - 0x168, - 0xB2, - 0xC1, - 0x1D5, - 0x14F, - 0x91, - 0x107, - 0x29, - (0xffff) + 0x44, + 0x43, + 0x42, + 0xF0, + 0xDB, + 0x81, + 0x7E, + 0x1D3, + 0x51, + 0x52, + 0x1CE, + 0x128, + 0x1D9, + 0x1EA, + 0x136, + 0x38, + 0xE2, + 0x1CA, + 0xB3, + 0xB7, + 0x69, + 0x103, + 0x11C, + 0x12F, + 0x134, + 0x133, + 0x9A, + 0x34, + 0x1E1, + 0x178, + 0x177, + 0xB, + 0x97, + 0x96, + 0x106, + 0x15E, + 0xF1, + 0x1B7, + 0x138, + 0xC8, + 0x1AD, + 0x92, + 0x187, + 0x19E, + 0x7A, + 0x102, + 0x59, + 0x1BE, + 0xC6, + 0xB1, + 0x22, + 0x1F, + 0x1D, + 0x20, + 0x1E, + 0x21, + 0x122, + 0x26, + 0x123, + 0xA4, + 0x12B, + 0x142, + 0x112, + 0xE0, + 0x2B, + 0x8A, + 0x8B, + 0x5F, + 0x1A1, + 0x1E4, + 0x2E, + 0x2F, + 0x117, + 0x35, + 0xE7, + 0x1E9, + 0xAC, + 0x12, + 0x11, + 0x10, + 0x19, + 0xDD, + 0xCC, + 0x7F, + 0x189, + 0x137, + 0xBA, + 0x3C, + 0x3D, + 0x3E, + 0x4D, + 0x105, + 0x89, + 0x1DA, + 0xE9, + 0x39, + 0x18A, + 0x1DC, + 0x36, + 0xF7, + 0x1B0, + 0xC3, + 0x9C, + 0xD3, + 0x1A, + 0xF3, + 0x118, + 0x199, + 0x4E, + 0x14, + 0x13, + 0x180, + 0x17A, + 0x1E6, + 0x179, + 0x17B, + 0x171, + 0xDF, + 0x70, + 0x6F, + 0x1D0, + 0x1BF, + 0x13B, + 0x197, + 0x1DF, + 0x12E, + 0x175, + 0x1B, + 0x1C, + 0xFE, + 0xD4, + 0x7B, + 0x75, + 0x77, + 0x16C, + 0x111, + 0x56, + 0xA1, + 0x150, + 0x13F, + 0x1EC, + 0x124, + 0x174, + 0x5A, + 0x1A6, + 0x19A, + 0x113, + 0x193, + 0x11D, + 0xD5, + 0x161, + 0x10A, + 0xE3, + 0xBC, + 0x12C, + 0x1C3, + 0x1B3, + 0x121, + 0x11F, + 0x50, + 0xC7, + 0x4F, + 0xDA, + 0xEB, + 0xEE, + 0xD7, + 0x8F, + 0x169, + 0x1CB, + 0xD1, + 0x152, + 0x15, + 0x16B, + 0xA7, + 0x147, + 0x1BA, + 0x145, + 0x7, + 0xEA, + 0x18E, + 0x18D, + 0x18C, + 0x79, + 0x78, + 0xD0, + 0x1B2, + 0xB9, + 0xF5, + 0xC0, + 0xBF, + 0x11B, + 0x14D, + 0x13D, + 0x104, + 0x115, + 0xDC, + 0x114, + 0x72, + 0x1D1, + 0x80, + 0xD8, + 0x48, + 0x49, + 0x1D4, + 0xAF, + 0xB0, + 0xFF, + 0x144, + 0x185, + 0x9E, + 0x1C6, + 0x148, + 0xFC, + 0x165, + 0x183, + 0x9D, + 0xF8, + 0xEC, + 0xC5, + 0xC9, + 0xD9, + 0x1E0, + 0x86, + 0x31, + 0x30, + 0x3, + 0x1A0, + 0x149, + 0x47, + 0x120, + 0x2D, + 0x139, + 0x64, + 0x25, + 0x140, + 0x141, + 0x16D, + 0x8, + 0x1CD, + 0xD, + 0x46, + 0x6E, + 0x154, + 0x125, + 0x28, + 0x116, + 0xCA, + 0xC2, + 0x19D, + 0x109, + 0x168, + 0xB2, + 0xC1, + 0x1D5, + 0x14F, + 0x91, + 0x107, + 0x29, + (0xffff) }; static const u16 Unk_020F8260[] = { - 0x237, - 0x223, - 0x287, - 0x35F, - 0x33C, - 0x2A1, - 0x251, - 0x32A, - 0x383, - 0x275, - 0x2E6, - 0x3B5, - 0x378, - 0x381, - 0x314, - 0x328, - 0x302, - 0x364, - 0x326, - 0x3B6, - 0x2C5, - 0x37C, - 0x22E, - 0x393, - 0x27C, - 0x260, - 0x2D2, - 0x2EB, - 0x2AB, - 0x265, - 0x204, - 0x21C, - 0x323, - 0x31B, - 0x22B, - 0x33F, - 0x212, - 0x26D, - 0x2B6, - 0x28B, - 0x344, - 0x38D, - 0x308, - 0x35A, - 0x281, - 0x22D, - 0x3B2, - 0x385, - 0x343, - 0x392, - 0x33B, - 0x34B, - 0x315, - 0x3AD, - 0x2FC, - 0x3B3, - 0x2BC, - 0x3B0, - 0x270, - 0x362, - 0x1F4, - 0x25D, - 0x24D, - 0x274, - 0x290, - 0x2A0, - 0x36F, - 0x332, - 0x2A2, - 0x234, - 0x347, - 0x288, - 0x2DE, - 0x3A8, - 0x2E2, - 0x322, - 0x3BE, - 0x29E, - 0x1FF, - 0x37F, - 0x3B7, - 0x25F, - 0x3A0, - 0x2B2, - 0x2B5, - 0x24B, - 0x222, - 0x3A3, - 0x313, - 0x282, - 0x351, - 0x3BA, - 0x208, - 0x258, - 0x216, - 0x1F3, - 0x3A2, - 0x341, - 0x34D, - 0x386, - 0x242, - 0x387, - 0x2D1, - 0x389, - 0x27A, - 0x231, - 0x2CF, - 0x38E, - 0x249, - 0x269, - 0x365, - 0x224, - 0x2D3, - 0x30B, - 0x2BB, - 0x38C, - 0x30C, - 0x289, - 0x336, - 0x2E5, - 0x2F7, - 0x2A9, - 0x2EC, - 0x329, - 0x2BE, - 0x319, - 0x35C, - 0x26E, - 0x398, - 0x1F7, - 0x243, - 0x24A, - 0x29F, - 0x29C, - 0x225, - 0x37A, - 0x284, - 0x39E, - 0x2F4, - 0x366, - 0x203, - 0x38B, - 0x264, - 0x2F8, - 0x2FA, - 0x37B, - 0x2B1, - 0x342, - 0x2CA, - 0x20F, - 0x2C2, - 0x28A, - 0x2E8, - 0x36C, - 0x2BA, - 0x390, - 0x279, - 0x3AF, - 0x330, - 0x354, - 0x21D, - 0x23A, - 0x310, - 0x371, - 0x1FC, - 0x3A9, - 0x200, - 0x358, - 0x2F2, - 0x357, - 0x25A, - 0x262, - 0x3B9, - 0x20D, - 0x2C7, - 0x369, - 0x3B8, - 0x359, - 0x377, - 0x2F1, - 0x2FE, - 0x278, - 0x2DD, - 0x20E, - 0x210, - 0x340, - 0x324, - 0x228, - 0x22F, - 0x28E, - 0x320, - 0x24F, - 0x31D, - 0x22A, - 0x397, - 0x1F8, - 0x394, - 0x33D, - 0x2B4, - 0x30E, - 0x303, - 0x33E, - 0x3AA, - 0x2D7, - 0x20A, - 0x1F2, - 0x276, - 0x30A, - 0x373, - 0x3A4, - 0x34C, - 0x3A5, - 0x27D, - 0x239, - 0x21B, - 0x26A, - 0x261, - 0x2B7, - 0x27E, - 0x233, - 0x36D, - 0x3BD, - 0x317, - (0xffff) + 0x237, + 0x223, + 0x287, + 0x35F, + 0x33C, + 0x2A1, + 0x251, + 0x32A, + 0x383, + 0x275, + 0x2E6, + 0x3B5, + 0x378, + 0x381, + 0x314, + 0x328, + 0x302, + 0x364, + 0x326, + 0x3B6, + 0x2C5, + 0x37C, + 0x22E, + 0x393, + 0x27C, + 0x260, + 0x2D2, + 0x2EB, + 0x2AB, + 0x265, + 0x204, + 0x21C, + 0x323, + 0x31B, + 0x22B, + 0x33F, + 0x212, + 0x26D, + 0x2B6, + 0x28B, + 0x344, + 0x38D, + 0x308, + 0x35A, + 0x281, + 0x22D, + 0x3B2, + 0x385, + 0x343, + 0x392, + 0x33B, + 0x34B, + 0x315, + 0x3AD, + 0x2FC, + 0x3B3, + 0x2BC, + 0x3B0, + 0x270, + 0x362, + 0x1F4, + 0x25D, + 0x24D, + 0x274, + 0x290, + 0x2A0, + 0x36F, + 0x332, + 0x2A2, + 0x234, + 0x347, + 0x288, + 0x2DE, + 0x3A8, + 0x2E2, + 0x322, + 0x3BE, + 0x29E, + 0x1FF, + 0x37F, + 0x3B7, + 0x25F, + 0x3A0, + 0x2B2, + 0x2B5, + 0x24B, + 0x222, + 0x3A3, + 0x313, + 0x282, + 0x351, + 0x3BA, + 0x208, + 0x258, + 0x216, + 0x1F3, + 0x3A2, + 0x341, + 0x34D, + 0x386, + 0x242, + 0x387, + 0x2D1, + 0x389, + 0x27A, + 0x231, + 0x2CF, + 0x38E, + 0x249, + 0x269, + 0x365, + 0x224, + 0x2D3, + 0x30B, + 0x2BB, + 0x38C, + 0x30C, + 0x289, + 0x336, + 0x2E5, + 0x2F7, + 0x2A9, + 0x2EC, + 0x329, + 0x2BE, + 0x319, + 0x35C, + 0x26E, + 0x398, + 0x1F7, + 0x243, + 0x24A, + 0x29F, + 0x29C, + 0x225, + 0x37A, + 0x284, + 0x39E, + 0x2F4, + 0x366, + 0x203, + 0x38B, + 0x264, + 0x2F8, + 0x2FA, + 0x37B, + 0x2B1, + 0x342, + 0x2CA, + 0x20F, + 0x2C2, + 0x28A, + 0x2E8, + 0x36C, + 0x2BA, + 0x390, + 0x279, + 0x3AF, + 0x330, + 0x354, + 0x21D, + 0x23A, + 0x310, + 0x371, + 0x1FC, + 0x3A9, + 0x200, + 0x358, + 0x2F2, + 0x357, + 0x25A, + 0x262, + 0x3B9, + 0x20D, + 0x2C7, + 0x369, + 0x3B8, + 0x359, + 0x377, + 0x2F1, + 0x2FE, + 0x278, + 0x2DD, + 0x20E, + 0x210, + 0x340, + 0x324, + 0x228, + 0x22F, + 0x28E, + 0x320, + 0x24F, + 0x31D, + 0x22A, + 0x397, + 0x1F8, + 0x394, + 0x33D, + 0x2B4, + 0x30E, + 0x303, + 0x33E, + 0x3AA, + 0x2D7, + 0x20A, + 0x1F2, + 0x276, + 0x30A, + 0x373, + 0x3A4, + 0x34C, + 0x3A5, + 0x27D, + 0x239, + 0x21B, + 0x26A, + 0x261, + 0x2B7, + 0x27E, + 0x233, + 0x36D, + 0x3BD, + 0x317, + (0xffff) }; static const u16 Unk_020F85F8[] = { - 0x2A7, - 0x305, - 0x349, - 0x3BF, - 0x3AB, - 0x379, - 0x2CE, - 0x36E, - 0x2C4, - 0x250, - 0x238, - 0x209, - 0x1F5, - 0x2D0, - 0x2F6, - 0x360, - 0x2D8, - 0x32F, - 0x325, - 0x266, - 0x2C0, - 0x256, - 0x29A, - 0x25B, - 0x355, - 0x2E3, - 0x267, - 0x39D, - 0x226, - 0x318, - 0x2DC, - 0x2DA, - 0x39A, - 0x345, - 0x31C, - 0x2AD, - 0x33A, - 0x391, - 0x35B, - 0x2FB, - 0x31E, - 0x255, - 0x380, - 0x29B, - 0x2AE, - 0x32C, - 0x3C2, - 0x2B8, - 0x32B, - 0x2CC, - 0x1F6, - 0x363, - 0x230, - 0x2B3, - 0x240, - 0x21A, - 0x35D, - 0x321, - 0x27B, - 0x37E, - 0x218, - 0x346, - 0x23D, - 0x1F1, - 0x2A5, - 0x388, - 0x370, - 0x36B, - 0x3A6, - 0x2C9, - 0x2A6, - 0x22C, - 0x2E4, - 0x24E, - 0x352, - 0x39B, - 0x367, - 0x285, - 0x372, - 0x2D4, - 0x252, - 0x253, - 0x2E0, - 0x2D5, - 0x23B, - 0x1FD, - 0x259, - 0x306, - 0x263, - 0x30F, - 0x28C, - 0x2C8, - 0x307, - 0x2A3, - 0x21E, - 0x3BB, - 0x34E, - 0x39F, - 0x37D, - 0x28D, - 0x2E9, - 0x248, - 0x32D, - 0x3A7, - 0x300, - 0x20B, - 0x2BD, - 0x353, - 0x2CD, - 0x2CB, - 0x338, - 0x20C, - 0x2B9, - 0x2A8, - 0x1FA, - 0x257, - 0x312, - 0x382, - 0x235, - 0x268, - 0x2E7, - 0x395, - 0x3C3, - 0x335, - 0x399, - 0x28F, - 0x339, - 0x34F, - 0x334, - 0x32E, - 0x21F, - 0x296, - 0x30D, - 0x272, - 0x27F, - 0x337, - 0x31F, - 0x205, - 0x293, - 0x23F, - 0x2C6, - 0x26C, - 0x2AC, - 0x2F9, - 0x26B, - 0x25C, - 0x311, - 0x29D, - 0x277, - 0x23C, - 0x221, - 0x3BC, - 0x2C1, - 0x299, - 0x273, - 0x2AF, - 0x2EF, - 0x2A4, - 0x286, - 0x283, - 0x3AE, - 0x2C3, - 0x2EE, - 0x207, - 0x3AC, - 0x236, - 0x241, - 0x295, - 0x23E, - 0x232, - 0x294, - 0x375, - 0x2E1, - 0x292, - 0x304, - 0x220, - 0x229, - 0x2BF, - 0x2F0, - 0x2AA, - 0x2D6, - 0x271, - 0x38F, - 0x1FE, - 0x2DB, - 0x211, - 0x316, - 0x217, - 0x35E, - 0x214, - 0x2FD, - 0x31A, - 0x254, - 0x298, - 0x215, - 0x247, - 0x396, - 0x246, - 0x245, - 0x1F9, - 0x244, - 0x331, - 0x2F3, - 0x24C, - 0x376, - 0x280, - 0x291, - 0x2FF, - 0x3A1, - 0x297, - 0x368, - 0x219, - 0x2DF, - 0x361, - 0x2ED, - 0x38A, - 0x1FB, - 0x206, - 0x2D9, - 0x348, - 0x356, - 0x227, - 0x350, - 0x34A, - 0x333, - 0x26F, - 0x327, - 0x2EA, - 0x202, - 0x2F5, - 0x201, - 0x301, - 0x25E, - 0x3B4, - 0x374, - 0x213, - 0x36A, - 0x384, - 0x309, - 0x2B0, - 0x39C, - (0xffff) + 0x2A7, + 0x305, + 0x349, + 0x3BF, + 0x3AB, + 0x379, + 0x2CE, + 0x36E, + 0x2C4, + 0x250, + 0x238, + 0x209, + 0x1F5, + 0x2D0, + 0x2F6, + 0x360, + 0x2D8, + 0x32F, + 0x325, + 0x266, + 0x2C0, + 0x256, + 0x29A, + 0x25B, + 0x355, + 0x2E3, + 0x267, + 0x39D, + 0x226, + 0x318, + 0x2DC, + 0x2DA, + 0x39A, + 0x345, + 0x31C, + 0x2AD, + 0x33A, + 0x391, + 0x35B, + 0x2FB, + 0x31E, + 0x255, + 0x380, + 0x29B, + 0x2AE, + 0x32C, + 0x3C2, + 0x2B8, + 0x32B, + 0x2CC, + 0x1F6, + 0x363, + 0x230, + 0x2B3, + 0x240, + 0x21A, + 0x35D, + 0x321, + 0x27B, + 0x37E, + 0x218, + 0x346, + 0x23D, + 0x1F1, + 0x2A5, + 0x388, + 0x370, + 0x36B, + 0x3A6, + 0x2C9, + 0x2A6, + 0x22C, + 0x2E4, + 0x24E, + 0x352, + 0x39B, + 0x367, + 0x285, + 0x372, + 0x2D4, + 0x252, + 0x253, + 0x2E0, + 0x2D5, + 0x23B, + 0x1FD, + 0x259, + 0x306, + 0x263, + 0x30F, + 0x28C, + 0x2C8, + 0x307, + 0x2A3, + 0x21E, + 0x3BB, + 0x34E, + 0x39F, + 0x37D, + 0x28D, + 0x2E9, + 0x248, + 0x32D, + 0x3A7, + 0x300, + 0x20B, + 0x2BD, + 0x353, + 0x2CD, + 0x2CB, + 0x338, + 0x20C, + 0x2B9, + 0x2A8, + 0x1FA, + 0x257, + 0x312, + 0x382, + 0x235, + 0x268, + 0x2E7, + 0x395, + 0x3C3, + 0x335, + 0x399, + 0x28F, + 0x339, + 0x34F, + 0x334, + 0x32E, + 0x21F, + 0x296, + 0x30D, + 0x272, + 0x27F, + 0x337, + 0x31F, + 0x205, + 0x293, + 0x23F, + 0x2C6, + 0x26C, + 0x2AC, + 0x2F9, + 0x26B, + 0x25C, + 0x311, + 0x29D, + 0x277, + 0x23C, + 0x221, + 0x3BC, + 0x2C1, + 0x299, + 0x273, + 0x2AF, + 0x2EF, + 0x2A4, + 0x286, + 0x283, + 0x3AE, + 0x2C3, + 0x2EE, + 0x207, + 0x3AC, + 0x236, + 0x241, + 0x295, + 0x23E, + 0x232, + 0x294, + 0x375, + 0x2E1, + 0x292, + 0x304, + 0x220, + 0x229, + 0x2BF, + 0x2F0, + 0x2AA, + 0x2D6, + 0x271, + 0x38F, + 0x1FE, + 0x2DB, + 0x211, + 0x316, + 0x217, + 0x35E, + 0x214, + 0x2FD, + 0x31A, + 0x254, + 0x298, + 0x215, + 0x247, + 0x396, + 0x246, + 0x245, + 0x1F9, + 0x244, + 0x331, + 0x2F3, + 0x24C, + 0x376, + 0x280, + 0x291, + 0x2FF, + 0x3A1, + 0x297, + 0x368, + 0x219, + 0x2DF, + 0x361, + 0x2ED, + 0x38A, + 0x1FB, + 0x206, + 0x2D9, + 0x348, + 0x356, + 0x227, + 0x350, + 0x34A, + 0x333, + 0x26F, + 0x327, + 0x2EA, + 0x202, + 0x2F5, + 0x201, + 0x301, + 0x25E, + 0x3B4, + 0x374, + 0x213, + 0x36A, + 0x384, + 0x309, + 0x2B0, + 0x39C, + (0xffff) }; static const u16 Unk_020F7F8A[] = { - 0x431, - 0x440, - 0x422, - 0x429, - 0x441, - 0x41D, - 0x3DA, - 0x418, - 0x3CA, - 0x3F8, - 0x3F3, - 0x3E3, - 0x3E6, - 0x3E4, - 0x40E, - 0x3DC, - 0x3D5, - 0x42E, - 0x3D4, - 0x3D8, - 0x41C, - 0x42D, - 0x406, - 0x3F1, - 0x3D1, - 0x3C5, - 0x445, - 0x3CE, - 0x407, - 0x3E8, - 0x450, - 0x3C6, - 0x411, - 0x442, - 0x44D, - 0x3CB, - 0x428, - 0x3D0, - 0x3C8, - 0x414, - 0x42B, - 0x44C, - 0x3FB, - 0x40D, - 0x433, - 0x40A, - 0x3D3, - 0x449, - 0x3F9, - 0x3E7, - 0x3FD, - 0x3E5, - 0x3EC, - 0x42F, - 0x409, - 0x43D, - 0x43C, - 0x3F0, - 0x3F5, - 0x3DD, - 0x416, - 0x438, - 0x3FE, - 0x400, - 0x415, - 0x410, - 0x43E, - 0x424, - 0x3F4, - 0x439, - 0x3C4, - 0x436, - 0x3E2, - 0x417, - 0x3EA, - 0x40B, - 0x40F, - 0x3C7, - 0x430, - 0x3FC, - 0x404, - 0x3D2, - 0x420, - 0x435, - 0x402, - 0x44E, - 0x425, - 0x3C9, - 0x41B, - 0x3EE, - 0x408, - 0x403, - 0x3DE, - 0x447, - 0x3F6, - 0x3ED, - 0x413, - 0x421, - 0x3E9, - 0x42C, - 0x432, - 0x446, - 0x437, - 0x427, - 0x44B, - 0x434, - 0x44A, - 0x401, - 0x3D9, - 0x43A, - 0x3DF, - 0x426, - 0x3CC, - 0x3D7, - 0x412, - 0x448, - 0x3DB, - 0x3EB, - 0x43F, - 0x41A, - 0x3F7, - 0x3F2, - 0x423, - 0x43B, - 0x405, - 0x444, - 0x419, - 0x3FA, - 0x40C, - 0x443, - 0x42A, - 0x41E, - 0x3E0, - 0x3CF, - 0x3E1, - 0x3FF, - 0x41F, - 0x3EF, - (0xffff) + 0x431, + 0x440, + 0x422, + 0x429, + 0x441, + 0x41D, + 0x3DA, + 0x418, + 0x3CA, + 0x3F8, + 0x3F3, + 0x3E3, + 0x3E6, + 0x3E4, + 0x40E, + 0x3DC, + 0x3D5, + 0x42E, + 0x3D4, + 0x3D8, + 0x41C, + 0x42D, + 0x406, + 0x3F1, + 0x3D1, + 0x3C5, + 0x445, + 0x3CE, + 0x407, + 0x3E8, + 0x450, + 0x3C6, + 0x411, + 0x442, + 0x44D, + 0x3CB, + 0x428, + 0x3D0, + 0x3C8, + 0x414, + 0x42B, + 0x44C, + 0x3FB, + 0x40D, + 0x433, + 0x40A, + 0x3D3, + 0x449, + 0x3F9, + 0x3E7, + 0x3FD, + 0x3E5, + 0x3EC, + 0x42F, + 0x409, + 0x43D, + 0x43C, + 0x3F0, + 0x3F5, + 0x3DD, + 0x416, + 0x438, + 0x3FE, + 0x400, + 0x415, + 0x410, + 0x43E, + 0x424, + 0x3F4, + 0x439, + 0x3C4, + 0x436, + 0x3E2, + 0x417, + 0x3EA, + 0x40B, + 0x40F, + 0x3C7, + 0x430, + 0x3FC, + 0x404, + 0x3D2, + 0x420, + 0x435, + 0x402, + 0x44E, + 0x425, + 0x3C9, + 0x41B, + 0x3EE, + 0x408, + 0x403, + 0x3DE, + 0x447, + 0x3F6, + 0x3ED, + 0x413, + 0x421, + 0x3E9, + 0x42C, + 0x432, + 0x446, + 0x437, + 0x427, + 0x44B, + 0x434, + 0x44A, + 0x401, + 0x3D9, + 0x43A, + 0x3DF, + 0x426, + 0x3CC, + 0x3D7, + 0x412, + 0x448, + 0x3DB, + 0x3EB, + 0x43F, + 0x41A, + 0x3F7, + 0x3F2, + 0x423, + 0x43B, + 0x405, + 0x444, + 0x419, + 0x3FA, + 0x40C, + 0x443, + 0x42A, + 0x41E, + 0x3E0, + 0x3CF, + 0x3E1, + 0x3FF, + 0x41F, + 0x3EF, + (0xffff) }; static const u16 Unk_020F7384[] = { - 0x458, - 0x45A, - 0x46B, - 0x465, - 0x459, - 0x45C, - 0x473, - 0x475, - 0x46C, - 0x463, - 0x468, - 0x469, - 0x472, - 0x46A, - 0x470, - 0x45F, - 0x452, - 0x476, - 0x456, - 0x453, - 0x471, - 0x46E, - 0x464, - 0x454, - 0x46D, - 0x461, - 0x46F, - 0x457, - 0x45E, - 0x466, - 0x45B, - 0x467, - 0x45D, - 0x477, - 0x462, - 0x460, - 0x474, - 0x455, - (0xffff) + 0x458, + 0x45A, + 0x46B, + 0x465, + 0x459, + 0x45C, + 0x473, + 0x475, + 0x46C, + 0x463, + 0x468, + 0x469, + 0x472, + 0x46A, + 0x470, + 0x45F, + 0x452, + 0x476, + 0x456, + 0x453, + 0x471, + 0x46E, + 0x464, + 0x454, + 0x46D, + 0x461, + 0x46F, + 0x457, + 0x45E, + 0x466, + 0x45B, + 0x467, + 0x45D, + 0x477, + 0x462, + 0x460, + 0x474, + 0x455, + (0xffff) }; static const u16 Unk_020F72F8[] = { - 0x480, - 0x495, - 0x484, - 0x49D, - 0x47F, - 0x481, - 0x499, - 0x48A, - 0x47E, - 0x494, - 0x489, - 0x488, - 0x47C, - 0x483, - 0x48B, - 0x48C, - 0x49C, - 0x48F, - 0x487, - 0x47B, - 0x490, - 0x491, - 0x492, - 0x486, - 0x478, - 0x485, - 0x496, - 0x49A, - 0x48E, - 0x482, - 0x47D, - 0x493, - 0x47A, - (0xffff) + 0x480, + 0x495, + 0x484, + 0x49D, + 0x47F, + 0x481, + 0x499, + 0x48A, + 0x47E, + 0x494, + 0x489, + 0x488, + 0x47C, + 0x483, + 0x48B, + 0x48C, + 0x49C, + 0x48F, + 0x487, + 0x47B, + 0x490, + 0x491, + 0x492, + 0x486, + 0x478, + 0x485, + 0x496, + 0x49A, + 0x48E, + 0x482, + 0x47D, + 0x493, + 0x47A, + (0xffff) }; static const u16 Unk_020F7C2C[] = { - 0x508, - 0x4A5, - 0x4BC, - 0x4A6, - 0x4EA, - 0x4F7, - 0x4DC, - 0x4A0, - 0x506, - 0x4BE, - 0x4F6, - 0x4E7, - 0x4DE, - 0x4A1, - 0x4BA, - 0x4B8, - 0x4C8, - 0x4BD, - 0x4D9, - 0x4CF, - 0x4CA, - 0x4CB, - 0x4DD, - 0x4D2, - 0x4C4, - 0x4CC, - 0x4E9, - 0x4A2, - 0x4F1, - 0x4C3, - 0x4F2, - 0x4BF, - 0x49F, - 0x4FA, - 0x4AC, - 0x4AE, - 0x4C0, - 0x4D1, - 0x4DF, - 0x4E4, - 0x4FB, - 0x4EB, - 0x4B3, - 0x4F3, - 0x4A3, - 0x4E1, - 0x4EF, - 0x4D0, - 0x4D4, - 0x49E, - 0x502, - 0x4B2, - 0x4AD, - 0x4ED, - 0x4E8, - 0x4F9, - 0x4F8, - 0x4EC, - 0x4E2, - 0x4A9, - 0x4FC, - 0x4AA, - 0x4C7, - 0x4A4, - 0x4C2, - 0x4F5, - 0x4C1, - 0x4BB, - 0x4DA, - 0x4C5, - 0x4D6, - 0x501, - 0x4D8, - 0x4E3, - 0x4B7, - 0x4EE, - 0x4D7, - 0x4CE, - 0x4D3, - 0x4A8, - 0x4F4, - 0x4DB, - 0x4CD, - 0x4B9, - 0x4B1, - 0x507, - 0x504, - 0x4D5, - 0x4FF, - 0x4C6, - 0x4E0, - 0x4B4, - 0x4B6, - 0x4B5, - 0x4C9, - 0x4FD, - 0x503, - 0x4AF, - 0x4E6, - 0x4E5, - 0x4AB, - 0x4FE, - (0xffff) + 0x508, + 0x4A5, + 0x4BC, + 0x4A6, + 0x4EA, + 0x4F7, + 0x4DC, + 0x4A0, + 0x506, + 0x4BE, + 0x4F6, + 0x4E7, + 0x4DE, + 0x4A1, + 0x4BA, + 0x4B8, + 0x4C8, + 0x4BD, + 0x4D9, + 0x4CF, + 0x4CA, + 0x4CB, + 0x4DD, + 0x4D2, + 0x4C4, + 0x4CC, + 0x4E9, + 0x4A2, + 0x4F1, + 0x4C3, + 0x4F2, + 0x4BF, + 0x49F, + 0x4FA, + 0x4AC, + 0x4AE, + 0x4C0, + 0x4D1, + 0x4DF, + 0x4E4, + 0x4FB, + 0x4EB, + 0x4B3, + 0x4F3, + 0x4A3, + 0x4E1, + 0x4EF, + 0x4D0, + 0x4D4, + 0x49E, + 0x502, + 0x4B2, + 0x4AD, + 0x4ED, + 0x4E8, + 0x4F9, + 0x4F8, + 0x4EC, + 0x4E2, + 0x4A9, + 0x4FC, + 0x4AA, + 0x4C7, + 0x4A4, + 0x4C2, + 0x4F5, + 0x4C1, + 0x4BB, + 0x4DA, + 0x4C5, + 0x4D6, + 0x501, + 0x4D8, + 0x4E3, + 0x4B7, + 0x4EE, + 0x4D7, + 0x4CE, + 0x4D3, + 0x4A8, + 0x4F4, + 0x4DB, + 0x4CD, + 0x4B9, + 0x4B1, + 0x507, + 0x504, + 0x4D5, + 0x4FF, + 0x4C6, + 0x4E0, + 0x4B4, + 0x4B6, + 0x4B5, + 0x4C9, + 0x4FD, + 0x503, + 0x4AF, + 0x4E6, + 0x4E5, + 0x4AB, + 0x4FE, + (0xffff) }; static const u16 Unk_020F7CFA[] = { - 0x55B, - 0x50C, - 0x521, - 0x55D, - 0x516, - 0x531, - 0x540, - 0x55C, - 0x55E, - 0x51E, - 0x51A, - 0x542, - 0x514, - 0x533, - 0x529, - 0x561, - 0x52B, - 0x554, - 0x51C, - 0x56C, - 0x538, - 0x541, - 0x544, - 0x54A, - 0x547, - 0x53C, - 0x548, - 0x567, - 0x546, - 0x559, - 0x560, - 0x543, - 0x555, - 0x527, - 0x526, - 0x525, - 0x524, - 0x556, - 0x558, - 0x535, - 0x566, - 0x50F, - 0x509, - 0x536, - 0x54E, - 0x50D, - 0x568, - 0x534, - 0x545, - 0x56A, - 0x56E, - 0x55F, - 0x52D, - 0x562, - 0x563, - 0x512, - 0x510, - 0x519, - 0x54F, - 0x557, - 0x550, - 0x553, - 0x54D, - 0x569, - 0x517, - 0x50B, - 0x513, - 0x551, - 0x565, - 0x56B, - 0x56F, - 0x51D, - 0x52C, - 0x51B, - 0x53A, - 0x50E, - 0x53B, - 0x520, - 0x537, - 0x52A, - 0x564, - 0x55A, - 0x552, - 0x511, - 0x530, - 0x515, - 0x539, - 0x54B, - 0x549, - 0x523, - 0x50A, - 0x53D, - 0x518, - 0x54C, - 0x532, - 0x53F, - 0x53E, - 0x56D, - 0x51F, - 0x52E, - 0x528, - 0x52F, - 0x570, - 0x522, - (0xffff) + 0x55B, + 0x50C, + 0x521, + 0x55D, + 0x516, + 0x531, + 0x540, + 0x55C, + 0x55E, + 0x51E, + 0x51A, + 0x542, + 0x514, + 0x533, + 0x529, + 0x561, + 0x52B, + 0x554, + 0x51C, + 0x56C, + 0x538, + 0x541, + 0x544, + 0x54A, + 0x547, + 0x53C, + 0x548, + 0x567, + 0x546, + 0x559, + 0x560, + 0x543, + 0x555, + 0x527, + 0x526, + 0x525, + 0x524, + 0x556, + 0x558, + 0x535, + 0x566, + 0x50F, + 0x509, + 0x536, + 0x54E, + 0x50D, + 0x568, + 0x534, + 0x545, + 0x56A, + 0x56E, + 0x55F, + 0x52D, + 0x562, + 0x563, + 0x512, + 0x510, + 0x519, + 0x54F, + 0x557, + 0x550, + 0x553, + 0x54D, + 0x569, + 0x517, + 0x50B, + 0x513, + 0x551, + 0x565, + 0x56B, + 0x56F, + 0x51D, + 0x52C, + 0x51B, + 0x53A, + 0x50E, + 0x53B, + 0x520, + 0x537, + 0x52A, + 0x564, + 0x55A, + 0x552, + 0x511, + 0x530, + 0x515, + 0x539, + 0x54B, + 0x549, + 0x523, + 0x50A, + 0x53D, + 0x518, + 0x54C, + 0x532, + 0x53F, + 0x53E, + 0x56D, + 0x51F, + 0x52E, + 0x528, + 0x52F, + 0x570, + 0x522, + (0xffff) }; static const u16 Unk_020F7478[] = { - 0x584, - 0x583, - 0x579, - 0x599, - 0x571, - 0x581, - 0x574, - 0x576, - 0x578, - 0x597, - 0x572, - 0x57D, - 0x59F, - 0x575, - 0x580, - 0x588, - 0x58F, - 0x586, - 0x589, - 0x57C, - 0x58E, - 0x58C, - 0x57A, - 0x582, - 0x57E, - 0x57F, - 0x598, - 0x595, - 0x591, - 0x59E, - 0x596, - 0x594, - 0x59C, - 0x57B, - 0x58D, - 0x577, - 0x593, - 0x59D, - 0x58A, - 0x59A, - 0x573, - 0x59B, - 0x590, - 0x58B, - 0x585, - 0x587, - 0x592, - (0xffff) + 0x584, + 0x583, + 0x579, + 0x599, + 0x571, + 0x581, + 0x574, + 0x576, + 0x578, + 0x597, + 0x572, + 0x57D, + 0x59F, + 0x575, + 0x580, + 0x588, + 0x58F, + 0x586, + 0x589, + 0x57C, + 0x58E, + 0x58C, + 0x57A, + 0x582, + 0x57E, + 0x57F, + 0x598, + 0x595, + 0x591, + 0x59E, + 0x596, + 0x594, + 0x59C, + 0x57B, + 0x58D, + 0x577, + 0x593, + 0x59D, + 0x58A, + 0x59A, + 0x573, + 0x59B, + 0x590, + 0x58B, + 0x585, + 0x587, + 0x592, + (0xffff) }; static const u16 Unk_020F72B6[] = { - 0x5AB, - 0x5AC, - 0x5A7, - 0x5AF, - 0x5B2, - 0x5B0, - 0x5AA, - 0x5A9, - 0x5A0, - 0x5A8, - 0x5B9, - 0x5B8, - 0x5B6, - 0x5A2, - 0x5AD, - 0x5B4, - 0x5A1, - 0x5B7, - 0x5A5, - 0x5B3, - 0x5A3, - 0x5BB, - 0x5BD, - 0x5BF, - 0x5A6, - 0x5B5, - 0x5A4, - 0x5BA, - 0x5AE, - 0x5B1, - 0x5BE, - 0x5BC, - (0xffff) + 0x5AB, + 0x5AC, + 0x5A7, + 0x5AF, + 0x5B2, + 0x5B0, + 0x5AA, + 0x5A9, + 0x5A0, + 0x5A8, + 0x5B9, + 0x5B8, + 0x5B6, + 0x5A2, + 0x5AD, + 0x5B4, + 0x5A1, + 0x5B7, + 0x5A5, + 0x5B3, + 0x5A3, + 0x5BB, + 0x5BD, + 0x5BF, + 0x5A6, + 0x5B5, + 0x5A4, + 0x5BA, + 0x5AE, + 0x5B1, + 0x5BE, + 0x5BC, + (0xffff) }; static const u16 PMS_CategoryTable_12[] = { @@ -1517,1629 +1516,1628 @@ static const u16 PMS_CategoryTable_12[] = { }; static const u16 Unk_020F7744[] = { - 0x4A5, - 0x1CC, - 0x3F, - 0x167, - 0x237, - 0x458, - 0x223, - 0x287, - 0x35F, - 0x431, - 0x584, - 0x480, - 0x55B, - 0x33C, - 0x2A1, - 0x8E, - 0x440, - 0x132, - 0x251, - 0x4BC, - 0x4A6, - 0xBE, - 0x32A, - 0x422, - 0x383, - 0x4EA, - 0x41, - 0x583, - 0x495, - 0x14E, - 0x1A8, - 0x275, - 0xB5, - 0x2E6, - 0x579, - 0x429, - 0x4F7, - 0x50C, - 0x521, - 0x15B, - (0xfffe), - 0x2, - 0x441, - 0x599, - 0x3B5, - 0x378, - 0x381, - 0x18, - 0x3B, - 0x1ED, - 0x41D, - 0xA8, - 0x314, - 0x15C, - 0x328, - 0x130, - 0x5AB, - 0x90, - 0x302, - 0x364, - 0x326, - 0x45A, - 0x3B6, - 0x2C5, - 0x484, - 0x37C, - 0x22E, - 0x393, - 0x1E2, - 0xB8, - 0x12A, - (0xffff) + 0x4A5, + 0x1CC, + 0x3F, + 0x167, + 0x237, + 0x458, + 0x223, + 0x287, + 0x35F, + 0x431, + 0x584, + 0x480, + 0x55B, + 0x33C, + 0x2A1, + 0x8E, + 0x440, + 0x132, + 0x251, + 0x4BC, + 0x4A6, + 0xBE, + 0x32A, + 0x422, + 0x383, + 0x4EA, + 0x41, + 0x583, + 0x495, + 0x14E, + 0x1A8, + 0x275, + 0xB5, + 0x2E6, + 0x579, + 0x429, + 0x4F7, + 0x50C, + 0x521, + 0x15B, + (0xfffe), + 0x2, + 0x441, + 0x599, + 0x3B5, + 0x378, + 0x381, + 0x18, + 0x3B, + 0x1ED, + 0x41D, + 0xA8, + 0x314, + 0x15C, + 0x328, + 0x130, + 0x5AB, + 0x90, + 0x302, + 0x364, + 0x326, + 0x45A, + 0x3B6, + 0x2C5, + 0x484, + 0x37C, + 0x22E, + 0x393, + 0x1E2, + 0xB8, + 0x12A, + (0xffff) }; static const u16 Unk_020F78F4[] = { - 0x49D, - 0x173, - 0x55D, - 0x157, - 0x162, - 0x153, - 0x27C, - 0x260, - 0x19B, - 0x516, - 0x2D2, - 0x46B, - 0x3DA, - 0x5D4, - 0x99, - 0x2EB, - 0x10B, - 0x571, - 0xF, - 0x176, - 0xB6, - 0x45, - 0x2AB, - 0x190, - 0x531, - 0x265, - 0x18F, - 0x204, - 0x540, - 0x21C, - 0x323, - 0x9, - 0x418, - 0x31B, - 0x101, - 0xF2, - 0x22B, - 0x33F, - 0x4DC, - 0x55C, - 0x212, - 0x26D, - 0x5AC, - 0x2B6, - 0x28B, - 0x4A0, - 0x1B6, - 0x506, - 0x4BE, - 0x55E, - 0x581, - 0x344, - 0x47F, - 0x38D, - 0x11E, - 0x308, - 0x35A, - 0x1B5, - 0x1B4, - 0x481, - 0x281, - 0x22D, - 0x196, - 0x3CA, - 0x3B2, - 0x385, - 0x1A2, - 0x1, - 0x343, - 0x392, - 0x33B, - 0x1AB, - 0x19C, - 0xC, - 0x4F6, - 0x4E7, - (0xffff) + 0x49D, + 0x173, + 0x55D, + 0x157, + 0x162, + 0x153, + 0x27C, + 0x260, + 0x19B, + 0x516, + 0x2D2, + 0x46B, + 0x3DA, + 0x5D4, + 0x99, + 0x2EB, + 0x10B, + 0x571, + 0xF, + 0x176, + 0xB6, + 0x45, + 0x2AB, + 0x190, + 0x531, + 0x265, + 0x18F, + 0x204, + 0x540, + 0x21C, + 0x323, + 0x9, + 0x418, + 0x31B, + 0x101, + 0xF2, + 0x22B, + 0x33F, + 0x4DC, + 0x55C, + 0x212, + 0x26D, + 0x5AC, + 0x2B6, + 0x28B, + 0x4A0, + 0x1B6, + 0x506, + 0x4BE, + 0x55E, + 0x581, + 0x344, + 0x47F, + 0x38D, + 0x11E, + 0x308, + 0x35A, + 0x1B5, + 0x1B4, + 0x481, + 0x281, + 0x22D, + 0x196, + 0x3CA, + 0x3B2, + 0x385, + 0x1A2, + 0x1, + 0x343, + 0x392, + 0x33B, + 0x1AB, + 0x19C, + 0xC, + 0x4F6, + 0x4E7, + (0xffff) }; static const u16 Unk_020F7DCC[] = { - 0x14B, - 0x14C, - 0x5A7, - 0x34B, - 0x51E, - 0x143, - 0x315, - 0x3AD, - 0x51A, - 0x1C7, - 0x13E, - 0x10C, - 0x15F, - 0xA, - 0xFB, - 0x465, - 0x542, - 0x71, - 0x2FC, - 0x3B3, - 0x6, - 0x2BC, - 0x4, - 0x5, - 0x5CB, - 0x1B9, - 0x3B0, - 0x4DE, - 0x1A5, - 0x1A4, - 0x98, - 0x186, - 0x166, - 0xAA, - 0x1B1, - 0x514, - 0x3F8, - 0x4A1, - 0x270, - 0x16E, - 0x533, - 0x158, - 0x3F3, - 0x24, - 0x23, - 0xAD, - 0x574, - 0x362, - 0x3E3, - 0x5B, - 0x529, - 0x3E6, - 0x5C6, - 0x19F, - 0x100, - 0x459, - 0x1F4, - 0x561, - 0x52B, - 0x3E4, - 0x554, - 0x5AF, - 0x25D, - 0x24D, - 0x5CD, - 0x274, - 0x5D3, - 0x5B2, - 0x51C, - 0x290, - 0x2A0, - 0x576, - 0x36F, - 0x5B0, - 0x155, - 0xDE, - 0x332, - 0x2A2, - 0x234, - 0x45C, - 0x347, - 0x288, - 0x15A, - 0x198, - 0x156, - 0x56C, - 0x1E8, - 0x4BA, - 0x1C5, - 0xA9, - 0x9F, - 0x2DE, - 0x3A8, - 0x5AA, - 0x2E2, - 0x322, - 0x3BE, - 0x5A9, - 0x68, - 0x29E, - 0x1FF, - 0x40E, - 0x4B8, - 0x578, - 0x9B, - (0xffff) + 0x14B, + 0x14C, + 0x5A7, + 0x34B, + 0x51E, + 0x143, + 0x315, + 0x3AD, + 0x51A, + 0x1C7, + 0x13E, + 0x10C, + 0x15F, + 0xA, + 0xFB, + 0x465, + 0x542, + 0x71, + 0x2FC, + 0x3B3, + 0x6, + 0x2BC, + 0x4, + 0x5, + 0x5CB, + 0x1B9, + 0x3B0, + 0x4DE, + 0x1A5, + 0x1A4, + 0x98, + 0x186, + 0x166, + 0xAA, + 0x1B1, + 0x514, + 0x3F8, + 0x4A1, + 0x270, + 0x16E, + 0x533, + 0x158, + 0x3F3, + 0x24, + 0x23, + 0xAD, + 0x574, + 0x362, + 0x3E3, + 0x5B, + 0x529, + 0x3E6, + 0x5C6, + 0x19F, + 0x100, + 0x459, + 0x1F4, + 0x561, + 0x52B, + 0x3E4, + 0x554, + 0x5AF, + 0x25D, + 0x24D, + 0x5CD, + 0x274, + 0x5D3, + 0x5B2, + 0x51C, + 0x290, + 0x2A0, + 0x576, + 0x36F, + 0x5B0, + 0x155, + 0xDE, + 0x332, + 0x2A2, + 0x234, + 0x45C, + 0x347, + 0x288, + 0x15A, + 0x198, + 0x156, + 0x56C, + 0x1E8, + 0x4BA, + 0x1C5, + 0xA9, + 0x9F, + 0x2DE, + 0x3A8, + 0x5AA, + 0x2E2, + 0x322, + 0x3BE, + 0x5A9, + 0x68, + 0x29E, + 0x1FF, + 0x40E, + 0x4B8, + 0x578, + 0x9B, + (0xffff) }; static const u16 Unk_020F798E[] = { - 0x538, - 0x3DC, - 0x541, - 0x597, - 0x3D5, - 0x37F, - 0x1EB, - 0x544, - 0x3B7, - 0x25F, - 0x3A0, - 0x12D, - 0xE1, - 0x572, - 0x182, - 0x57D, - 0x54A, - 0x547, - 0x2B2, - 0x2B5, - 0x57, - 0x1E3, - 0x53C, - 0x59F, - 0x24B, - 0x548, - 0x32, - 0x222, - 0x575, - 0x3A3, - 0x580, - 0x84, - 0x313, - 0x282, - 0x55, - 0x54, - 0xE8, - 0x351, - 0x5C1, - 0x3BA, - 0x208, - 0x258, - 0x216, - 0x1F3, - 0x42E, - 0x3A2, - 0x3D4, - 0x341, - 0x34D, - 0x386, - 0x242, - 0x387, - 0x94, - 0x2D1, - 0x95, - 0x389, - 0x1C4, - 0x93, - 0x5C8, - 0x567, - 0x27A, - 0x1AA, - 0x1A9, - 0x231, - 0x3D8, - 0x588, - 0x41C, - 0x60, - 0x42D, - 0x33, - 0xCE, - 0x164, - 0x1DD, - 0x163, - 0x10D, - 0x2CF, - (0xffff) + 0x538, + 0x3DC, + 0x541, + 0x597, + 0x3D5, + 0x37F, + 0x1EB, + 0x544, + 0x3B7, + 0x25F, + 0x3A0, + 0x12D, + 0xE1, + 0x572, + 0x182, + 0x57D, + 0x54A, + 0x547, + 0x2B2, + 0x2B5, + 0x57, + 0x1E3, + 0x53C, + 0x59F, + 0x24B, + 0x548, + 0x32, + 0x222, + 0x575, + 0x3A3, + 0x580, + 0x84, + 0x313, + 0x282, + 0x55, + 0x54, + 0xE8, + 0x351, + 0x5C1, + 0x3BA, + 0x208, + 0x258, + 0x216, + 0x1F3, + 0x42E, + 0x3A2, + 0x3D4, + 0x341, + 0x34D, + 0x386, + 0x242, + 0x387, + 0x94, + 0x2D1, + 0x95, + 0x389, + 0x1C4, + 0x93, + 0x5C8, + 0x567, + 0x27A, + 0x1AA, + 0x1A9, + 0x231, + 0x3D8, + 0x588, + 0x41C, + 0x60, + 0x42D, + 0x33, + 0xCE, + 0x164, + 0x1DD, + 0x163, + 0x10D, + 0x2CF, + (0xffff) }; static const u16 Unk_020F7424[] = { - 0x406, - 0x38E, - 0x5A0, - 0x249, - 0x473, - 0x475, - 0x5A8, - 0x4C8, - 0x85, - 0x3F1, - 0x269, - 0x4BD, - 0x17, - 0x7D, - 0x1D2, - 0x3D1, - 0x135, - 0x65, - 0xEF, - 0x365, - 0x224, - 0x18B, - 0x2D3, - 0x30B, - 0x2BB, - 0x58F, - 0x38C, - 0x586, - 0xF4, - 0x30C, - 0xC4, - 0x546, - 0x499, - 0x589, - 0x4D9, - 0x66, - 0x67, - 0x289, - 0x127, - 0x336, - 0x2E5, - (0xffff) + 0x406, + 0x38E, + 0x5A0, + 0x249, + 0x473, + 0x475, + 0x5A8, + 0x4C8, + 0x85, + 0x3F1, + 0x269, + 0x4BD, + 0x17, + 0x7D, + 0x1D2, + 0x3D1, + 0x135, + 0x65, + 0xEF, + 0x365, + 0x224, + 0x18B, + 0x2D3, + 0x30B, + 0x2BB, + 0x58F, + 0x38C, + 0x586, + 0xF4, + 0x30C, + 0xC4, + 0x546, + 0x499, + 0x589, + 0x4D9, + 0x66, + 0x67, + 0x289, + 0x127, + 0x336, + 0x2E5, + (0xffff) }; static const u16 Unk_020F76B8[] = { - 0x2F7, - 0x2A9, - 0x2EC, - 0x329, - 0x2BE, - 0x48A, - 0x53, - 0x559, - 0x47E, - 0x16, - 0x319, - 0x15D, - 0x35C, - 0xA0, - 0x560, - 0x46C, - 0x3C5, - 0x463, - 0x445, - 0x1C8, - 0x3CE, - 0x26E, - 0x398, - 0x1F7, - 0x243, - 0x543, - 0x24A, - 0xB4, - 0x29F, - 0x5B9, - 0x407, - 0x29C, - 0x225, - 0x37A, - 0x88, - 0x284, - 0x39E, - 0x3E8, - 0x2F4, - 0x366, - 0x1A3, - 0x450, - 0x555, - 0x203, - 0x14A, - 0x3C6, - 0x38B, - 0x264, - 0x2F8, - 0x468, - 0x2FA, - 0x37B, - 0x411, - 0x2B1, - 0x442, - 0x4CF, - 0xCD, - 0x5B8, - 0x342, - 0x494, - 0x5CC, - 0x44D, - 0x1DE, - 0x2CA, - 0xA2, - 0x20F, - 0x2C2, - 0x28A, - 0x2E8, - (0xffff) + 0x2F7, + 0x2A9, + 0x2EC, + 0x329, + 0x2BE, + 0x48A, + 0x53, + 0x559, + 0x47E, + 0x16, + 0x319, + 0x15D, + 0x35C, + 0xA0, + 0x560, + 0x46C, + 0x3C5, + 0x463, + 0x445, + 0x1C8, + 0x3CE, + 0x26E, + 0x398, + 0x1F7, + 0x243, + 0x543, + 0x24A, + 0xB4, + 0x29F, + 0x5B9, + 0x407, + 0x29C, + 0x225, + 0x37A, + 0x88, + 0x284, + 0x39E, + 0x3E8, + 0x2F4, + 0x366, + 0x1A3, + 0x450, + 0x555, + 0x203, + 0x14A, + 0x3C6, + 0x38B, + 0x264, + 0x2F8, + 0x468, + 0x2FA, + 0x37B, + 0x411, + 0x2B1, + 0x442, + 0x4CF, + 0xCD, + 0x5B8, + 0x342, + 0x494, + 0x5CC, + 0x44D, + 0x1DE, + 0x2CA, + 0xA2, + 0x20F, + 0x2C2, + 0x28A, + 0x2E8, + (0xffff) }; static const u16 Unk_020F77D4[] = { - 0x1BC, - 0x489, - 0x1DB, - 0x527, - 0x1BD, - 0x11A, - 0x5C, - 0x36C, - 0x1A7, - 0x5E, - 0x469, - 0x4A, - 0x3CB, - 0x1BB, - 0x2BA, - 0x390, - 0x4CA, - 0xCB, - 0x1E7, - 0x488, - 0x4CB, - 0x1D7, - 0x16A, - 0x1AF, - 0x279, - 0xCF, - 0x1D8, - 0x2C, - 0x428, - 0x5B6, - 0x4DD, - 0x2A, - 0x76, - 0x5A2, - 0x37, - 0x4C, - 0x5AD, - 0x4D2, - 0x170, - 0x5CA, - 0x526, - 0xD2, - 0x47C, - 0x483, - 0x3D0, - 0x3AF, - 0x330, - 0x4B, - 0x354, - 0x4C4, - 0x58, - 0x184, - 0x17F, - 0x3C8, - 0x525, - 0xFD, - 0x21D, - 0x3A, - 0x23A, - 0x310, - 0x146, - 0x5D5, - 0x371, - 0x1FC, - 0x13C, - 0x3A9, - 0x200, - 0x414, - 0x4CC, - 0x82, - 0x358, - (0xffff) + 0x1BC, + 0x489, + 0x1DB, + 0x527, + 0x1BD, + 0x11A, + 0x5C, + 0x36C, + 0x1A7, + 0x5E, + 0x469, + 0x4A, + 0x3CB, + 0x1BB, + 0x2BA, + 0x390, + 0x4CA, + 0xCB, + 0x1E7, + 0x488, + 0x4CB, + 0x1D7, + 0x16A, + 0x1AF, + 0x279, + 0xCF, + 0x1D8, + 0x2C, + 0x428, + 0x5B6, + 0x4DD, + 0x2A, + 0x76, + 0x5A2, + 0x37, + 0x4C, + 0x5AD, + 0x4D2, + 0x170, + 0x5CA, + 0x526, + 0xD2, + 0x47C, + 0x483, + 0x3D0, + 0x3AF, + 0x330, + 0x4B, + 0x354, + 0x4C4, + 0x58, + 0x184, + 0x17F, + 0x3C8, + 0x525, + 0xFD, + 0x21D, + 0x3A, + 0x23A, + 0x310, + 0x146, + 0x5D5, + 0x371, + 0x1FC, + 0x13C, + 0x3A9, + 0x200, + 0x414, + 0x4CC, + 0x82, + 0x358, + (0xffff) }; static const u16 Unk_020F7AC8[] = { - 0x524, - 0x4E9, - 0x2F2, - 0x4A2, - 0x357, - 0x57C, - 0x1B8, - 0x58E, - 0x25A, - 0x129, - 0x58C, - 0x5D, - 0x262, - 0x4F1, - 0x3B9, - 0x20D, - 0x2C7, - 0x369, - 0x3B8, - 0x359, - 0x57A, - 0x377, - 0x2F1, - 0x42B, - 0x1E5, - 0x4C3, - 0x4F2, - 0x4BF, - 0x49F, - 0x4FA, - 0x2FE, - 0x48B, - 0xD6, - 0x4AC, - 0x4AE, - 0x556, - 0x558, - 0x4C0, - 0x4D1, - 0x4DF, - 0x4E4, - 0x278, - 0x4FB, - 0x2DD, - 0x48C, - 0x1C1, - 0x1C2, - 0x6B, - 0x6A, - 0xED, - 0x4EB, - 0x4B3, - 0xFA, - 0x535, - 0x4F3, - 0x4A3, - 0x566, - 0x50F, - 0x1AE, - 0x44C, - 0xA3, - 0xBB, - 0x20E, - 0x210, - 0x74, - 0xE5, - 0xE4, - 0x340, - 0x5B4, - 0x3FB, - 0x4E1, - 0x4EF, - 0x16F, - 0x40D, - 0x433, - 0x324, - 0x228, - 0x22F, - 0x40A, - 0x28E, - 0x320, - 0x61, - 0x24F, - (0xffff) + 0x524, + 0x4E9, + 0x2F2, + 0x4A2, + 0x357, + 0x57C, + 0x1B8, + 0x58E, + 0x25A, + 0x129, + 0x58C, + 0x5D, + 0x262, + 0x4F1, + 0x3B9, + 0x20D, + 0x2C7, + 0x369, + 0x3B8, + 0x359, + 0x57A, + 0x377, + 0x2F1, + 0x42B, + 0x1E5, + 0x4C3, + 0x4F2, + 0x4BF, + 0x49F, + 0x4FA, + 0x2FE, + 0x48B, + 0xD6, + 0x4AC, + 0x4AE, + 0x556, + 0x558, + 0x4C0, + 0x4D1, + 0x4DF, + 0x4E4, + 0x278, + 0x4FB, + 0x2DD, + 0x48C, + 0x1C1, + 0x1C2, + 0x6B, + 0x6A, + 0xED, + 0x4EB, + 0x4B3, + 0xFA, + 0x535, + 0x4F3, + 0x4A3, + 0x566, + 0x50F, + 0x1AE, + 0x44C, + 0xA3, + 0xBB, + 0x20E, + 0x210, + 0x74, + 0xE5, + 0xE4, + 0x340, + 0x5B4, + 0x3FB, + 0x4E1, + 0x4EF, + 0x16F, + 0x40D, + 0x433, + 0x324, + 0x228, + 0x22F, + 0x40A, + 0x28E, + 0x320, + 0x61, + 0x24F, + (0xffff) }; static const u16 Unk_020F733C[] = { - 0x49C, - 0x4D0, - 0x4D4, - 0x3D3, - 0x31D, - 0x22A, - 0x449, - 0x397, - 0x1F8, - 0x394, - 0x33D, - 0x2B4, - 0x509, - 0xAE, - 0x3F9, - 0x13A, - 0x3E7, - 0x5A1, - 0x582, - 0x30E, - 0x57E, - 0x188, - 0x536, - 0x303, - 0x3FD, - 0x3E5, - 0x3EC, - 0x472, - 0x33E, - 0x42F, - 0x3AA, - 0x2D7, - 0x5B7, - 0x54E, - 0x2, - (0xffff) + 0x49C, + 0x4D0, + 0x4D4, + 0x3D3, + 0x31D, + 0x22A, + 0x449, + 0x397, + 0x1F8, + 0x394, + 0x33D, + 0x2B4, + 0x509, + 0xAE, + 0x3F9, + 0x13A, + 0x3E7, + 0x5A1, + 0x582, + 0x30E, + 0x57E, + 0x188, + 0x536, + 0x303, + 0x3FD, + 0x3E5, + 0x3EC, + 0x472, + 0x33E, + 0x42F, + 0x3AA, + 0x2D7, + 0x5B7, + 0x54E, + 0x2, + (0xffff) }; static const u16 Unk_020F71A4[] = { - 0x27, - 0x181, - 0x50D, - 0x87, - 0x20A, - 0xBD, - 0x7C, - (0xffff) + 0x27, + 0x181, + 0x50D, + 0x87, + 0x20A, + 0xBD, + 0x7C, + (0xffff) }; static const u16 Unk_020F71F2[] = { - 0x8C, - 0x8D, - 0x40, - 0xE, - 0x73, - 0x1F2, - 0x160, - 0x409, - 0x48F, - 0x568, - 0x276, - 0xE6, - 0x63, - 0x119, - 0x43D, - 0x30A, - 0x6D, - 0x49E, - 0x62, - 0x191, - 0x192, - 0x17E, - (0xffff) + 0x8C, + 0x8D, + 0x40, + 0xE, + 0x73, + 0x1F2, + 0x160, + 0x409, + 0x48F, + 0x568, + 0x276, + 0xE6, + 0x63, + 0x119, + 0x43D, + 0x30A, + 0x6D, + 0x49E, + 0x62, + 0x191, + 0x192, + 0x17E, + (0xffff) }; static const u16 Unk_020F75B8[] = { - 0x131, - 0x502, - 0xAB, - 0x83, - 0xF6, - 0x373, - 0x17C, - 0x17D, - 0x3A4, - 0x34C, - 0x43C, - 0x3A5, - 0x1D6, - 0xA6, - 0xA5, - 0x27D, - 0x239, - 0x21B, - 0x46A, - 0x534, - 0x4B2, - 0x4AD, - 0x545, - 0x5C5, - 0x5C4, - 0x3F0, - 0x26A, - 0x1CF, - 0x6C, - 0x56A, - 0x261, - 0x3F5, - 0x57F, - 0x159, - 0x3DD, - 0x108, - 0x416, - 0x2B7, - 0x4ED, - 0x10F, - 0x56E, - 0x1AC, - 0x470, - 0x10E, - 0x126, - 0x27E, - 0x598, - 0x233, - 0x1C0, - 0x36D, - 0x110, - 0xF9, - 0x1C9, - 0x3BD, - 0x151, - 0x317, - 0x172, - 0x194, - 0x195, - (0xffff) + 0x131, + 0x502, + 0xAB, + 0x83, + 0xF6, + 0x373, + 0x17C, + 0x17D, + 0x3A4, + 0x34C, + 0x43C, + 0x3A5, + 0x1D6, + 0xA6, + 0xA5, + 0x27D, + 0x239, + 0x21B, + 0x46A, + 0x534, + 0x4B2, + 0x4AD, + 0x545, + 0x5C5, + 0x5C4, + 0x3F0, + 0x26A, + 0x1CF, + 0x6C, + 0x56A, + 0x261, + 0x3F5, + 0x57F, + 0x159, + 0x3DD, + 0x108, + 0x416, + 0x2B7, + 0x4ED, + 0x10F, + 0x56E, + 0x1AC, + 0x470, + 0x10E, + 0x126, + 0x27E, + 0x598, + 0x233, + 0x1C0, + 0x36D, + 0x110, + 0xF9, + 0x1C9, + 0x3BD, + 0x151, + 0x317, + 0x172, + 0x194, + 0x195, + (0xffff) }; static const u16 Unk_020F7220[] = { - 0x2A7, - 0x44, - 0x55F, - 0x43, - 0x42, - 0x52D, - 0xF0, - 0xDB, - 0x305, - 0x438, - 0x349, - 0x81, - 0x3FE, - 0x3BF, - 0x7E, - 0x1D3, - 0x51, - 0x3AB, - 0x400, - 0x379, - 0x52, - 0x1CE, - 0x2CE, - 0x562, - 0x128, - 0x1D9, - 0x1EA, - 0x136, - 0x38, - 0xE2, - 0x1CA, - 0xB3, - 0xB7, - 0x69, - 0x103, - 0x415, - 0x11C, - 0x45F, - 0x452, - 0x12F, - 0x487, - 0x36E, - 0x2C4, - 0x134, - 0x250, - 0x133, - 0x4E8, - 0x238, - 0x209, - 0x1F5, - 0x2D0, - 0x9A, - 0x2F6, - 0x34, - 0x1E1, - 0x563, - 0x595, - 0x178, - 0x360, - 0x2D8, - 0x32F, - 0x177, - 0xB, - 0x325, - 0x266, - 0x97, - 0x96, - 0x106, - 0x2C0, - 0x15E, - 0xF1, - 0x1B7, - 0x256, - 0x29A, - 0x25B, - 0x138, - 0x410, - 0x355, - 0x2E3, - 0x267, - 0x39D, - 0xC8, - 0x1AD, - 0x226, - 0x318, - 0x5C2, - 0x4F9, - 0x43E, - 0x92, - 0x512, - 0x5A5, - 0x187, - 0x2DC, - 0x2DA, - 0x47B, - 0x19E, - 0x424, - 0x476, - 0x510, - 0x490, - 0x7A, - 0x491, - 0x39A, - 0x345, - 0x31C, - 0x2AD, - 0x33A, - 0x102, - 0x4F8, - 0x4EC, - 0x59, - 0x5C3, - 0x1BE, - 0xC6, - 0x519, - 0x492, - (0xffff) + 0x2A7, + 0x44, + 0x55F, + 0x43, + 0x42, + 0x52D, + 0xF0, + 0xDB, + 0x305, + 0x438, + 0x349, + 0x81, + 0x3FE, + 0x3BF, + 0x7E, + 0x1D3, + 0x51, + 0x3AB, + 0x400, + 0x379, + 0x52, + 0x1CE, + 0x2CE, + 0x562, + 0x128, + 0x1D9, + 0x1EA, + 0x136, + 0x38, + 0xE2, + 0x1CA, + 0xB3, + 0xB7, + 0x69, + 0x103, + 0x415, + 0x11C, + 0x45F, + 0x452, + 0x12F, + 0x487, + 0x36E, + 0x2C4, + 0x134, + 0x250, + 0x133, + 0x4E8, + 0x238, + 0x209, + 0x1F5, + 0x2D0, + 0x9A, + 0x2F6, + 0x34, + 0x1E1, + 0x563, + 0x595, + 0x178, + 0x360, + 0x2D8, + 0x32F, + 0x177, + 0xB, + 0x325, + 0x266, + 0x97, + 0x96, + 0x106, + 0x2C0, + 0x15E, + 0xF1, + 0x1B7, + 0x256, + 0x29A, + 0x25B, + 0x138, + 0x410, + 0x355, + 0x2E3, + 0x267, + 0x39D, + 0xC8, + 0x1AD, + 0x226, + 0x318, + 0x5C2, + 0x4F9, + 0x43E, + 0x92, + 0x512, + 0x5A5, + 0x187, + 0x2DC, + 0x2DA, + 0x47B, + 0x19E, + 0x424, + 0x476, + 0x510, + 0x490, + 0x7A, + 0x491, + 0x39A, + 0x345, + 0x31C, + 0x2AD, + 0x33A, + 0x102, + 0x4F8, + 0x4EC, + 0x59, + 0x5C3, + 0x1BE, + 0xC6, + 0x519, + 0x492, + (0xffff) }; static const u16 Unk_020F73D2[] = { - 0x54F, - 0x557, - 0x391, - 0xB1, - 0x3F4, - 0x35B, - 0x2FB, - 0x31E, - 0x591, - 0x5B3, - 0x550, - 0x59E, - 0x22, - 0x1F, - 0x1D, - 0x20, - 0x1E, - 0x21, - 0x255, - 0x380, - 0x29B, - 0x122, - 0x26, - 0x123, - 0x4E2, - 0x439, - 0x456, - 0x4A9, - (0xfffe), - 0x2, - 0x4FC, - 0x596, - 0x453, - 0xA4, - 0x4AA, - 0x3C4, - 0x436, - 0x12B, - 0x142, - 0x112, - (0xffff) + 0x54F, + 0x557, + 0x391, + 0xB1, + 0x3F4, + 0x35B, + 0x2FB, + 0x31E, + 0x591, + 0x5B3, + 0x550, + 0x59E, + 0x22, + 0x1F, + 0x1D, + 0x20, + 0x1E, + 0x21, + 0x255, + 0x380, + 0x29B, + 0x122, + 0x26, + 0x123, + 0x4E2, + 0x439, + 0x456, + 0x4A9, + (0xfffe), + 0x2, + 0x4FC, + 0x596, + 0x453, + 0xA4, + 0x4AA, + 0x3C4, + 0x436, + 0x12B, + 0x142, + 0x112, + (0xffff) }; static const u16 Unk_020F7250[] = { - 0x3E2, - 0x2AE, - 0xE0, - 0x2B, - 0x32C, - 0x4C7, - 0x4A4, - 0x4C2, - 0x4F5, - 0x4C1, - 0x4BB, - 0x4DA, - 0x486, - 0x8A, - 0x8B, - 0x3C2, - 0x5A3, - 0x5F, - 0x4C5, - 0x478, - 0x2B8, - 0x417, - 0x32B, - 0x3EA, - (0xffff) + 0x3E2, + 0x2AE, + 0xE0, + 0x2B, + 0x32C, + 0x4C7, + 0x4A4, + 0x4C2, + 0x4F5, + 0x4C1, + 0x4BB, + 0x4DA, + 0x486, + 0x8A, + 0x8B, + 0x3C2, + 0x5A3, + 0x5F, + 0x4C5, + 0x478, + 0x2B8, + 0x417, + 0x32B, + 0x3EA, + (0xffff) }; static const u16 Unk_020F7B70[] = { - 0x1A1, - 0x2CC, - 0x1E4, - 0x2E, - 0x2F, - 0x4D6, - 0x485, - 0x471, - 0x553, - 0x1F6, - 0x363, - 0x230, - 0x117, - 0x2B3, - 0x35, - 0x496, - 0x240, - 0x5BB, - 0xE7, - 0x1E9, - 0x54D, - 0xAC, - 0x40B, - 0x12, - 0x11, - 0x10, - 0x19, - 0xDD, - 0x21A, - 0xCC, - 0x7F, - 0x189, - 0x569, - 0x517, - 0x50B, - 0x35D, - 0x40F, - 0x137, - 0x513, - 0x5D2, - 0x46E, - 0x3C7, - 0x321, - 0x27B, - 0x430, - 0x37E, - 0x3FC, - 0x218, - 0x346, - 0x23D, - 0x5C7, - 0xBA, - 0x3C, - 0x3D, - 0x3E, - 0x5BD, - 0x4D, - 0x105, - 0x551, - 0x89, - 0x1DA, - 0xE9, - 0x1F1, - 0x2A5, - 0x464, - 0x388, - 0x370, - 0x36B, - 0x3A6, - 0x454, - 0x2C9, - 0x404, - 0x39, - 0x18A, - 0x1DC, - 0x565, - 0x2A6, - 0x22C, - 0x2E4, - (0xfffe), - 0x2, - 0x24E, - 0x3D2, - 0x352, - 0x39B, - 0x367, - 0x36, - 0x285, - 0x372, - 0xF7, - 0x420, - 0x2D4, - 0x1B0, - (0xffff) + 0x1A1, + 0x2CC, + 0x1E4, + 0x2E, + 0x2F, + 0x4D6, + 0x485, + 0x471, + 0x553, + 0x1F6, + 0x363, + 0x230, + 0x117, + 0x2B3, + 0x35, + 0x496, + 0x240, + 0x5BB, + 0xE7, + 0x1E9, + 0x54D, + 0xAC, + 0x40B, + 0x12, + 0x11, + 0x10, + 0x19, + 0xDD, + 0x21A, + 0xCC, + 0x7F, + 0x189, + 0x569, + 0x517, + 0x50B, + 0x35D, + 0x40F, + 0x137, + 0x513, + 0x5D2, + 0x46E, + 0x3C7, + 0x321, + 0x27B, + 0x430, + 0x37E, + 0x3FC, + 0x218, + 0x346, + 0x23D, + 0x5C7, + 0xBA, + 0x3C, + 0x3D, + 0x3E, + 0x5BD, + 0x4D, + 0x105, + 0x551, + 0x89, + 0x1DA, + 0xE9, + 0x1F1, + 0x2A5, + 0x464, + 0x388, + 0x370, + 0x36B, + 0x3A6, + 0x454, + 0x2C9, + 0x404, + 0x39, + 0x18A, + 0x1DC, + 0x565, + 0x2A6, + 0x22C, + 0x2E4, + (0xfffe), + 0x2, + 0x24E, + 0x3D2, + 0x352, + 0x39B, + 0x367, + 0x36, + 0x285, + 0x372, + 0xF7, + 0x420, + 0x2D4, + 0x1B0, + (0xffff) }; static const u16 Unk_020F718A[] = { - 0xC3, - 0x252, - 0x435, - 0x9C, - 0xD3, - (0xffff) + 0xC3, + 0x252, + 0x435, + 0x9C, + 0xD3, + (0xffff) }; static const u16 Unk_020F7630[] = { - 0x56B, - 0x253, - 0x1A, - 0xF3, - 0x2E0, - 0x402, - 0x118, - 0x199, - 0x2D5, - 0x4E, - 0x594, - 0x14, - 0x13, - 0x180, - 0x23B, - 0x1FD, - 0x44E, - 0x59C, - 0x5C9, - 0x259, - 0x306, - 0x263, - 0x30F, - 0x501, - 0x17A, - 0x1E6, - 0x179, - 0x17B, - 0x57B, - 0x171, - 0x5BF, - 0xDF, - 0x56F, - 0x5A6, - 0x28C, - 0x2C8, - 0x307, - 0x2A3, - 0x46D, - 0x70, - 0x6F, - 0x1D0, - 0x1BF, - 0x49A, - 0x425, - 0x21E, - 0x3BB, - 0x3C9, - 0x34E, - 0x39F, - 0x41B, - 0x37D, - 0x28D, - 0x2E9, - 0x248, - 0x32D, - 0x3A7, - 0x58D, - 0x300, - 0x20B, - 0x2BD, - 0x353, - 0x13B, - 0x197, - 0x1DF, - 0x3EE, - 0x408, - (0xffff) + 0x56B, + 0x253, + 0x1A, + 0xF3, + 0x2E0, + 0x402, + 0x118, + 0x199, + 0x2D5, + 0x4E, + 0x594, + 0x14, + 0x13, + 0x180, + 0x23B, + 0x1FD, + 0x44E, + 0x59C, + 0x5C9, + 0x259, + 0x306, + 0x263, + 0x30F, + 0x501, + 0x17A, + 0x1E6, + 0x179, + 0x17B, + 0x57B, + 0x171, + 0x5BF, + 0xDF, + 0x56F, + 0x5A6, + 0x28C, + 0x2C8, + 0x307, + 0x2A3, + 0x46D, + 0x70, + 0x6F, + 0x1D0, + 0x1BF, + 0x49A, + 0x425, + 0x21E, + 0x3BB, + 0x3C9, + 0x34E, + 0x39F, + 0x41B, + 0x37D, + 0x28D, + 0x2E9, + 0x248, + 0x32D, + 0x3A7, + 0x58D, + 0x300, + 0x20B, + 0x2BD, + 0x353, + 0x13B, + 0x197, + 0x1DF, + 0x3EE, + 0x408, + (0xffff) }; static const u16 Unk_020F80A0[] = { - 0x12E, - 0x2CD, - 0x577, - 0x2CB, - 0x175, - 0x403, - 0x338, - 0x3DE, - 0x20C, - 0x1B, - 0x1C, - 0x2B9, - 0x593, - 0x2A8, - 0xFE, - 0x51D, - 0xD4, - 0x447, - 0x1FA, - 0x257, - 0x7B, - 0x75, - 0x77, - 0x16C, - 0x5D6, - 0x312, - 0x4D8, - 0x382, - 0x111, - 0x56, - 0x235, - 0x268, - 0x461, - 0xA1, - 0x3F6, - 0x46F, - 0x52C, - 0x150, - 0x2E7, - 0x395, - 0x3C3, - 0x335, - 0x399, - 0x3ED, - 0x13F, - 0x28F, - 0x1EC, - 0x413, - 0x124, - 0x339, - 0x174, - 0x421, - 0x5A, - 0x1A6, - 0x3E9, - 0x19A, - 0x113, - 0x193, - 0x34F, - 0x51B, - 0x11D, - 0xD5, - 0x161, - 0x48E, - 0x4E3, - 0x334, - 0x10A, - 0x32E, - (0xfffe), - 0x2, - 0x42C, - 0x59D, - 0x21F, - 0x5C0, - 0x482, - 0xE3, - 0x296, - 0x432, - 0x30D, - 0x58A, - 0xBC, - 0x12C, - 0x1C3, - 0x272, - 0x1B3, - 0x27F, - 0x337, - 0x31F, - 0x121, - 0x11F, - 0x205, - 0x293, - 0x23F, - 0x2C6, - 0x446, - 0x50, - 0xC7, - 0x4F, - 0x26C, - 0x2AC, - 0xDA, - 0xEB, - 0x2F9, - 0x59A, - 0x26B, - 0x25C, - 0xEE, - 0x311, - 0xD7, - 0x4B7, - 0x437, - 0x29D, - 0x8F, - 0x4EE, - 0x169, - 0x1CB, - 0x427, - 0x44B, - 0xD1, - 0x4D7, - 0x277, - 0x53A, - 0x434, - 0x23C, - 0x44A, - 0x152, - 0x50E, - 0x53B, - 0x221, - 0x4CE, - 0x401, - 0x3BC, - 0x2C1, - 0x15, - 0x520, - 0x3D9, - 0x16B, - 0x299, - 0x273, - 0x2AF, - 0xA7, - 0x147, - 0x457, - 0x1BA, - 0x2EF, - 0x2A4, - 0x286, - 0x145, - 0x283, - 0x537, - 0x5B5, - 0x7, - 0x43A, - 0xEA, - 0x18E, - 0x18D, - 0x5A4, - 0x18C, - 0x79, - 0x78, - 0x3DF, - 0x426, - 0x3AE, - 0x3CC, - 0x2C3, - 0xD0, - 0x3D7, - 0x412, - 0x5BA, - 0x2EE, - 0x207, - 0x3AC, - 0x52A, - 0x448, - 0x564, - 0x573, - 0x45E, - 0x5AE, - 0x236, - 0x241, - 0x466, - 0x295, - 0x55A, - 0x552, - 0x23E, - 0x1B2, - 0x3DB, - 0x232, - 0x294, - 0x59B, - 0x375, - 0x3EB, - 0xB9, - 0xF5, - 0xC0, - 0xBF, - 0x2E1, - 0x292, - 0x43F, - 0x304, - 0x220, - 0x229, - 0x590, - 0x45B, - 0x11B, - 0x14D, - 0x2BF, - 0x2F0, - 0x13D, - 0x104, - 0x41A, - 0x2AA, - 0x2D6, - 0x511, - 0x115, - 0x271, - 0x3F7, - 0xDC, - 0x38F, - 0x1FE, - 0x3F2, - 0x2DB, - 0x530, - (0xffff) + 0x12E, + 0x2CD, + 0x577, + 0x2CB, + 0x175, + 0x403, + 0x338, + 0x3DE, + 0x20C, + 0x1B, + 0x1C, + 0x2B9, + 0x593, + 0x2A8, + 0xFE, + 0x51D, + 0xD4, + 0x447, + 0x1FA, + 0x257, + 0x7B, + 0x75, + 0x77, + 0x16C, + 0x5D6, + 0x312, + 0x4D8, + 0x382, + 0x111, + 0x56, + 0x235, + 0x268, + 0x461, + 0xA1, + 0x3F6, + 0x46F, + 0x52C, + 0x150, + 0x2E7, + 0x395, + 0x3C3, + 0x335, + 0x399, + 0x3ED, + 0x13F, + 0x28F, + 0x1EC, + 0x413, + 0x124, + 0x339, + 0x174, + 0x421, + 0x5A, + 0x1A6, + 0x3E9, + 0x19A, + 0x113, + 0x193, + 0x34F, + 0x51B, + 0x11D, + 0xD5, + 0x161, + 0x48E, + 0x4E3, + 0x334, + 0x10A, + 0x32E, + (0xfffe), + 0x2, + 0x42C, + 0x59D, + 0x21F, + 0x5C0, + 0x482, + 0xE3, + 0x296, + 0x432, + 0x30D, + 0x58A, + 0xBC, + 0x12C, + 0x1C3, + 0x272, + 0x1B3, + 0x27F, + 0x337, + 0x31F, + 0x121, + 0x11F, + 0x205, + 0x293, + 0x23F, + 0x2C6, + 0x446, + 0x50, + 0xC7, + 0x4F, + 0x26C, + 0x2AC, + 0xDA, + 0xEB, + 0x2F9, + 0x59A, + 0x26B, + 0x25C, + 0xEE, + 0x311, + 0xD7, + 0x4B7, + 0x437, + 0x29D, + 0x8F, + 0x4EE, + 0x169, + 0x1CB, + 0x427, + 0x44B, + 0xD1, + 0x4D7, + 0x277, + 0x53A, + 0x434, + 0x23C, + 0x44A, + 0x152, + 0x50E, + 0x53B, + 0x221, + 0x4CE, + 0x401, + 0x3BC, + 0x2C1, + 0x15, + 0x520, + 0x3D9, + 0x16B, + 0x299, + 0x273, + 0x2AF, + 0xA7, + 0x147, + 0x457, + 0x1BA, + 0x2EF, + 0x2A4, + 0x286, + 0x145, + 0x283, + 0x537, + 0x5B5, + 0x7, + 0x43A, + 0xEA, + 0x18E, + 0x18D, + 0x5A4, + 0x18C, + 0x79, + 0x78, + 0x3DF, + 0x426, + 0x3AE, + 0x3CC, + 0x2C3, + 0xD0, + 0x3D7, + 0x412, + 0x5BA, + 0x2EE, + 0x207, + 0x3AC, + 0x52A, + 0x448, + 0x564, + 0x573, + 0x45E, + 0x5AE, + 0x236, + 0x241, + 0x466, + 0x295, + 0x55A, + 0x552, + 0x23E, + 0x1B2, + 0x3DB, + 0x232, + 0x294, + 0x59B, + 0x375, + 0x3EB, + 0xB9, + 0xF5, + 0xC0, + 0xBF, + 0x2E1, + 0x292, + 0x43F, + 0x304, + 0x220, + 0x229, + 0x590, + 0x45B, + 0x11B, + 0x14D, + 0x2BF, + 0x2F0, + 0x13D, + 0x104, + 0x41A, + 0x2AA, + 0x2D6, + 0x511, + 0x115, + 0x271, + 0x3F7, + 0xDC, + 0x38F, + 0x1FE, + 0x3F2, + 0x2DB, + 0x530, + (0xffff) }; static const u16 Unk_020F7A28[] = { - 0x211, - 0x316, - 0x217, - 0x114, - 0x35E, - 0x214, - 0x467, - 0x45D, - 0x515, - 0x72, - 0x423, - 0x1D1, - 0x2FD, - 0x80, - 0x539, - 0x58B, - 0x43B, - 0xD8, - 0x31A, - 0x254, - 0x54B, - 0x48, - 0x49, - 0x549, - 0x4D3, - 0x4A8, - 0x4F4, - 0x405, - 0x298, - 0x215, - 0x247, - 0x396, - 0x246, - 0x245, - 0x1F9, - 0x244, - 0x331, - 0x444, - 0x523, - 0x1D4, - 0xAF, - 0xB0, - 0x50A, - 0xFF, - 0x144, - 0x2F3, - 0x419, - 0x185, - 0x9E, - 0x585, - 0x53D, - 0x24C, - 0x376, - 0x1C6, - 0x518, - 0x3FA, - 0x54C, - 0x477, - 0x532, - 0x280, - 0x148, - 0x53F, - 0x53E, - 0xFC, - 0x291, - 0x2FF, - 0x3A1, - 0x297, - 0x165, - 0x40C, - 0x368, - 0x183, - 0x4DB, - 0x219, - 0x2DF, - 0x5B1, - 0x9D, - 0xF8, - 0xEC, - (0xffff) + 0x211, + 0x316, + 0x217, + 0x114, + 0x35E, + 0x214, + 0x467, + 0x45D, + 0x515, + 0x72, + 0x423, + 0x1D1, + 0x2FD, + 0x80, + 0x539, + 0x58B, + 0x43B, + 0xD8, + 0x31A, + 0x254, + 0x54B, + 0x48, + 0x49, + 0x549, + 0x4D3, + 0x4A8, + 0x4F4, + 0x405, + 0x298, + 0x215, + 0x247, + 0x396, + 0x246, + 0x245, + 0x1F9, + 0x244, + 0x331, + 0x444, + 0x523, + 0x1D4, + 0xAF, + 0xB0, + 0x50A, + 0xFF, + 0x144, + 0x2F3, + 0x419, + 0x185, + 0x9E, + 0x585, + 0x53D, + 0x24C, + 0x376, + 0x1C6, + 0x518, + 0x3FA, + 0x54C, + 0x477, + 0x532, + 0x280, + 0x148, + 0x53F, + 0x53E, + 0xFC, + 0x291, + 0x2FF, + 0x3A1, + 0x297, + 0x165, + 0x40C, + 0x368, + 0x183, + 0x4DB, + 0x219, + 0x2DF, + 0x5B1, + 0x9D, + 0xF8, + 0xEC, + (0xffff) }; static const u16 Unk_020F71D0[] = { - 0x361, - 0x5BE, - 0x4CD, - 0xC5, - 0x443, - 0x4B9, - 0x42A, - 0x47D, - 0x5D0, - 0x5D1, - 0xC9, - 0x2ED, - 0x4B1, - 0xD9, - 0x587, - 0x1E0, - (0xffff) + 0x361, + 0x5BE, + 0x4CD, + 0xC5, + 0x443, + 0x4B9, + 0x42A, + 0x47D, + 0x5D0, + 0x5D1, + 0xC9, + 0x2ED, + 0x4B1, + 0xD9, + 0x587, + 0x1E0, + (0xffff) }; static const u16 Unk_020F7282[] = { - 0x56D, - 0x38A, - 0x86, - 0x5BC, - 0x31, - 0x30, - 0x3, - 0x462, - 0x1A0, - 0x149, - 0x1FB, - 0x460, - 0x47, - 0x51F, - 0x120, - 0x2D, - 0x206, - 0x41E, - 0x2D9, - 0x5CE, - 0x139, - 0x3E0, - 0x348, - 0x64, - 0x25, - (0xffff) + 0x56D, + 0x38A, + 0x86, + 0x5BC, + 0x31, + 0x30, + 0x3, + 0x462, + 0x1A0, + 0x149, + 0x1FB, + 0x460, + 0x47, + 0x51F, + 0x120, + 0x2D, + 0x206, + 0x41E, + 0x2D9, + 0x5CE, + 0x139, + 0x3E0, + 0x348, + 0x64, + 0x25, + (0xffff) }; static const u16 Unk_020F7544[] = { - 0x507, - 0x504, - 0x140, - 0x141, - 0x356, - 0x52E, - 0x16D, - 0x592, - 0x8, - 0x3CF, - 0x3E1, - 0x227, - 0x350, - 0x34A, - 0x333, - 0x3FF, - 0x26F, - 0x474, - 0x327, - 0x1CD, - 0xD, - 0x4D5, - 0x46, - 0x6E, - 0x4FF, - 0x4C6, - 0x4E0, - 0x2EA, - 0x202, - 0x154, - 0x125, - 0x41F, - 0x493, - 0x4B4, - 0x5CF, - 0x28, - 0x2F5, - 0x201, - 0x116, - 0x455, - 0x301, - 0x25E, - 0xCA, - 0x3EF, - 0x3B4, - 0xC2, - 0x528, - 0x52F, - 0x570, - 0x19D, - 0x374, - 0x4B6, - 0x213, - 0x36A, - 0x4B5, - 0x109, - 0x168, - (0xffff) + 0x507, + 0x504, + 0x140, + 0x141, + 0x356, + 0x52E, + 0x16D, + 0x592, + 0x8, + 0x3CF, + 0x3E1, + 0x227, + 0x350, + 0x34A, + 0x333, + 0x3FF, + 0x26F, + 0x474, + 0x327, + 0x1CD, + 0xD, + 0x4D5, + 0x46, + 0x6E, + 0x4FF, + 0x4C6, + 0x4E0, + 0x2EA, + 0x202, + 0x154, + 0x125, + 0x41F, + 0x493, + 0x4B4, + 0x5CF, + 0x28, + 0x2F5, + 0x201, + 0x116, + 0x455, + 0x301, + 0x25E, + 0xCA, + 0x3EF, + 0x3B4, + 0xC2, + 0x528, + 0x52F, + 0x570, + 0x19D, + 0x374, + 0x4B6, + 0x213, + 0x36A, + 0x4B5, + 0x109, + 0x168, + (0xffff) }; static const u16 Unk_020F7184[] = { - 0x384, - 0xB2, - (0xffff) + 0x384, + 0xB2, + (0xffff) }; static const u16 Unk_020F71B4[] = { - 0x4C9, - 0x4FD, - 0xC1, - 0x1D5, - 0x309, - 0x503, - 0x4AF, - 0x4E6, - 0x4E5, - 0x4AB, - 0x522, - 0x4FE, - 0x47A, - (0xffff) + 0x4C9, + 0x4FD, + 0xC1, + 0x1D5, + 0x309, + 0x503, + 0x4AF, + 0x4E6, + 0x4E5, + 0x4AB, + 0x522, + 0x4FE, + 0x47A, + (0xffff) }; static const u16 Unk_020F7196[] = { - 0x14F, - 0x2B0, - 0x91, - 0x39C, - 0x107, - 0x29, - (0xffff) + 0x14F, + 0x2B0, + 0x91, + 0x39C, + 0x107, + 0x29, + (0xffff) }; static const u16 Unk_020F7180[] = { - 0x508, - (0xffff) + 0x508, + (0xffff) }; -static const u16 * const Unk_020F74D8[] = { - Unk_020F7744, - Unk_020F78F4, - Unk_020F7DCC, - Unk_020F798E, - Unk_020F7424, - Unk_020F76B8, - Unk_020F77D4, - Unk_020F7AC8, - Unk_020F733C, - Unk_020F71A4, - Unk_020F71F2, - Unk_020F75B8, - Unk_020F7220, - Unk_020F73D2, - Unk_020F7250, - Unk_020F7B70, - Unk_020F718A, - Unk_020F7630, - Unk_020F80A0, - Unk_020F7A28, - Unk_020F71D0, - Unk_020F7282, - Unk_020F7544, - Unk_020F7184, - Unk_020F71B4, - Unk_020F7196, - Unk_020F7180 +static const u16 *const Unk_020F74D8[] = { + Unk_020F7744, + Unk_020F78F4, + Unk_020F7DCC, + Unk_020F798E, + Unk_020F7424, + Unk_020F76B8, + Unk_020F77D4, + Unk_020F7AC8, + Unk_020F733C, + Unk_020F71A4, + Unk_020F71F2, + Unk_020F75B8, + Unk_020F7220, + Unk_020F73D2, + Unk_020F7250, + Unk_020F7B70, + Unk_020F718A, + Unk_020F7630, + Unk_020F80A0, + Unk_020F7A28, + Unk_020F71D0, + Unk_020F7282, + Unk_020F7544, + Unk_020F7184, + Unk_020F71B4, + Unk_020F7196, + Unk_020F7180 }; - struct UnkStruct_020998EC_t { - const UnkStruct_0209747C * unk_00; - UnkStruct_02014D38 * unk_04; + const UnkStruct_0209747C *unk_00; + UnkStruct_02014D38 *unk_04; u32 unk_08[12]; u32 unk_38[12]; u16 unk_68[1495]; @@ -3149,22 +3147,22 @@ struct UnkStruct_020998EC_t { u8 unk_189E[187]; }; -typedef u32 (* UnkFuncPtr_020F7864)(UnkStruct_020998EC *, const u16 *, u32, u16 *); +typedef u32 (*UnkFuncPtr_020F7864)(UnkStruct_020998EC *, const u16 *, u32, u16 *); -static void sub_02099940(UnkStruct_020998EC * param0); -static inline void inline_02099980(UnkStruct_020998EC * param0, u32 param1); -static inline BOOL inline_02099BF4(const UnkStruct_020998EC * param0, u32 param1); -static u32 sub_02099980(UnkStruct_020998EC * param0, const u16 * param1, u32 param2, u16 * param3); -static u32 sub_020999E0(UnkStruct_020998EC * param0, const u16 * param1, u32 param2, u16 * param3); -static u32 sub_02099A30(UnkStruct_020998EC * param0, const u16 * param1, u32 param2, u16 * param3); -static u32 sub_02099AA0(UnkStruct_020998EC * param0, const u16 * param1, u32 param2, u16 * param3); -static u32 sub_02099B28(UnkStruct_020998EC * param0, const u16 * param1, u32 param2, u16 * param3); -static void sub_02099BAC(UnkStruct_020998EC * param0); -static u32 sub_02099BF4(UnkStruct_020998EC * param0, const u16 * param1, u16 * param2, u32 param3); +static void sub_02099940(UnkStruct_020998EC *param0); +static inline void inline_02099980(UnkStruct_020998EC *param0, u32 param1); +static inline BOOL inline_02099BF4(const UnkStruct_020998EC *param0, u32 param1); +static u32 sub_02099980(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3); +static u32 sub_020999E0(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3); +static u32 sub_02099A30(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3); +static u32 sub_02099AA0(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3); +static u32 sub_02099B28(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3); +static void sub_02099BAC(UnkStruct_020998EC *param0); +static u32 sub_02099BF4(UnkStruct_020998EC *param0, const u16 *param1, u16 *param2, u32 param3); -UnkStruct_020998EC * sub_020998EC (u32 param0, const UnkStruct_0209747C * param1) +UnkStruct_020998EC *sub_020998EC(u32 param0, const UnkStruct_0209747C *param1) { - UnkStruct_020998EC * v0; + UnkStruct_020998EC *v0; int v1; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020998EC)); @@ -3181,7 +3179,7 @@ UnkStruct_020998EC * sub_020998EC (u32 param0, const UnkStruct_0209747C * param1 return v0; } -void sub_0209992C (UnkStruct_020998EC * param0) +void sub_0209992C(UnkStruct_020998EC *param0) { if (param0) { sub_02014D70(param0->unk_04); @@ -3191,24 +3189,24 @@ void sub_0209992C (UnkStruct_020998EC * param0) static const struct { UnkFuncPtr_020F7864 unk_00; - const u16 * unk_04; + const u16 *unk_04; u32 unk_08; } Unk_020F7864[] = { - {sub_02099980, Unk_020F8420, 235}, - {sub_02099980, Unk_020F87DC, 258}, - {sub_020999E0, Unk_020F8260, 223}, - {sub_020999E0, Unk_020F85F8, 241}, - {sub_02099B28, Unk_020F7F8A, 138}, - {sub_02099B28, Unk_020F7384, 38}, - {sub_02099B28, Unk_020F72F8, 33}, - {sub_02099AA0, Unk_020F7C2C, 102}, - {sub_02099B28, Unk_020F7CFA, 104}, - {sub_02099B28, Unk_020F7478, 47}, - {sub_02099A30, Unk_020F72B6, 32}, - {sub_02099B28, PMS_CategoryTable_12, 23}, + { sub_02099980, Unk_020F8420, 235 }, + { sub_02099980, Unk_020F87DC, 258 }, + { sub_020999E0, Unk_020F8260, 223 }, + { sub_020999E0, Unk_020F85F8, 241 }, + { sub_02099B28, Unk_020F7F8A, 138 }, + { sub_02099B28, Unk_020F7384, 38 }, + { sub_02099B28, Unk_020F72F8, 33 }, + { sub_02099AA0, Unk_020F7C2C, 102 }, + { sub_02099B28, Unk_020F7CFA, 104 }, + { sub_02099B28, Unk_020F7478, 47 }, + { sub_02099A30, Unk_020F72B6, 32 }, + { sub_02099B28, PMS_CategoryTable_12, 23 }, }; -static void sub_02099940 (UnkStruct_020998EC * param0) +static void sub_02099940(UnkStruct_020998EC *param0) { int v0, v1; @@ -3219,19 +3217,19 @@ static void sub_02099940 (UnkStruct_020998EC * param0) } } -static inline void inline_02099980 (UnkStruct_020998EC * param0, u32 param1) +static inline void inline_02099980(UnkStruct_020998EC *param0, u32 param1) { param0->unk_189E[(param1 >> 3)] |= (1 << (param1 & 7)); } -static inline BOOL inline_02099BF4 (const UnkStruct_020998EC * param0, u32 param1) +static inline BOOL inline_02099BF4(const UnkStruct_020998EC *param0, u32 param1) { return (param0->unk_189E[(param1 >> 3)] & (1 << (param1 & 7))) != 0; } -static u32 sub_02099980 (UnkStruct_020998EC * param0, const u16 * param1, u32 param2, u16 * param3) +static u32 sub_02099980(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3) { - const PokedexData * v0; + const PokedexData *v0; u32 v1, v2; v2 = 0; @@ -3248,7 +3246,7 @@ static u32 sub_02099980 (UnkStruct_020998EC * param0, const u16 * param1, u32 pa return v2; } -static u32 sub_020999E0 (UnkStruct_020998EC * param0, const u16 * param1, u32 param2, u16 * param3) +static u32 sub_020999E0(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3) { u32 v0; @@ -3264,9 +3262,9 @@ static u32 sub_020999E0 (UnkStruct_020998EC * param0, const u16 * param1, u32 pa } } -static u32 sub_02099A30 (UnkStruct_020998EC * param0, const u16 * param1, u32 param2, u16 * param3) +static u32 sub_02099A30(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3) { - const UnkStruct_02014EC4 * v0 = sub_02097560(param0->unk_00); + const UnkStruct_02014EC4 *v0 = sub_02097560(param0->unk_00); u32 v1, v2; u16 v3; @@ -3283,9 +3281,9 @@ static u32 sub_02099A30 (UnkStruct_020998EC * param0, const u16 * param1, u32 pa return v2; } -static u32 sub_02099AA0 (UnkStruct_020998EC * param0, const u16 * param1, u32 param2, u16 * param3) +static u32 sub_02099AA0(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3) { - const UnkStruct_02014EC4 * v0 = sub_02097560(param0->unk_00); + const UnkStruct_02014EC4 *v0 = sub_02097560(param0->unk_00); u16 v1, v2; u32 v3, v4; @@ -3311,7 +3309,7 @@ static u32 sub_02099AA0 (UnkStruct_020998EC * param0, const u16 * param1, u32 pa return v4; } -static u32 sub_02099B28 (UnkStruct_020998EC * param0, const u16 * param1, u32 param2, u16 * param3) +static u32 sub_02099B28(UnkStruct_020998EC *param0, const u16 *param1, u32 param2, u16 *param3) { u32 v0; @@ -3336,7 +3334,7 @@ static u32 sub_02099B28 (UnkStruct_020998EC * param0, const u16 * param1, u32 pa return param2; } -static void sub_02099BAC (UnkStruct_020998EC * param0) +static void sub_02099BAC(UnkStruct_020998EC *param0) { int v0, v1 = 0; @@ -3347,7 +3345,7 @@ static void sub_02099BAC (UnkStruct_020998EC * param0) } } -static u32 sub_02099BF4 (UnkStruct_020998EC * param0, const u16 * param1, u16 * param2, u32 param3) +static u32 sub_02099BF4(UnkStruct_020998EC *param0, const u16 *param1, u16 *param2, u32 param3) { u32 v0 = 0; @@ -3380,29 +3378,29 @@ static u32 sub_02099BF4 (UnkStruct_020998EC * param0, const u16 * param1, u16 * return v0; } -u32 sub_02099CA0 (const UnkStruct_020998EC * param0, u32 param1) +u32 sub_02099CA0(const UnkStruct_020998EC *param0, u32 param1) { return param0->unk_08[param1]; } -void sub_02099CA8 (const UnkStruct_020998EC * param0, u32 param1, u32 param2, Strbuf *param3) +void sub_02099CA8(const UnkStruct_020998EC *param0, u32 param1, u32 param2, Strbuf *param3) { u32 v0 = param0->unk_38[param1]; sub_02014D90(param0->unk_04, param0->unk_68[v0 + param2], param3); } -u16 sub_02099CC8 (const UnkStruct_020998EC * param0, u32 param1, u32 param2) +u16 sub_02099CC8(const UnkStruct_020998EC *param0, u32 param1, u32 param2) { u32 v0 = param0->unk_38[param1]; return param0->unk_68[v0 + param2]; } -u32 sub_02099CDC (const UnkStruct_020998EC * param0, u32 param1) +u32 sub_02099CDC(const UnkStruct_020998EC *param0, u32 param1) { return param0->unk_C18[param1]; } -void sub_02099CEC (const UnkStruct_020998EC * param0, u32 param1, u32 param2, Strbuf *param3) +void sub_02099CEC(const UnkStruct_020998EC *param0, u32 param1, u32 param2, Strbuf *param3) { if (param0->unk_C18[param1]) { u16 v0 = sub_02099D14(param0, param1, param2); @@ -3410,7 +3408,7 @@ void sub_02099CEC (const UnkStruct_020998EC * param0, u32 param1, u32 param2, St } } -u16 sub_02099D14 (const UnkStruct_020998EC * param0, u32 param1, u32 param2) +u16 sub_02099D14(const UnkStruct_020998EC *param0, u32 param1, u32 param2) { if (param0->unk_C18[param1]) { u32 v0 = param0->unk_C84[param1] + param2; diff --git a/src/unk_02099D44.c b/src/unk_02099D44.c index e2e349d7cf..b8c33f9847 100644 --- a/src/unk_02099D44.c +++ b/src/unk_02099D44.c @@ -1,17 +1,17 @@ +#include "unk_02099D44.h" + #include #include -#include "unk_02099D44.h" - static int Unk_02100D9C = 4294967295; static u8 Unk_021C0A34[12288]; -void sub_02099D44 (void) +void sub_02099D44(void) { Unk_02100D9C = 4294967295; } -void sub_02099D54 (u32 param0, const void * param1, u32 param2) +void sub_02099D54(u32 param0, const void *param1, u32 param2) { if (param2 < 12288) { MI_CpuCopy32(param1, Unk_021C0A34, param2); @@ -21,7 +21,7 @@ void sub_02099D54 (u32 param0, const void * param1, u32 param2) } } -BOOL sub_02099D7C (u32 param0, void * param1, u32 param2) +BOOL sub_02099D7C(u32 param0, void *param1, u32 param2) { if (param2 < 12288) { if (param0 == Unk_02100D9C) { @@ -35,7 +35,7 @@ BOOL sub_02099D7C (u32 param0, void * param1, u32 param2) return 0; } -void sub_02099DA8 (u32 param0, const void * param1, u32 param2) +void sub_02099DA8(u32 param0, const void *param1, u32 param2) { if (param2 < 12288) { MI_CpuCopyFast(param1, Unk_021C0A34, param2); @@ -45,7 +45,7 @@ void sub_02099DA8 (u32 param0, const void * param1, u32 param2) } } -BOOL sub_02099DD0 (u32 param0, void * param1, u32 param2) +BOOL sub_02099DD0(u32 param0, void *param1, u32 param2) { if (param2 < 12288) { if (param0 == Unk_02100D9C) { diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index 9ad1f63e9b..0d040f3e55 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -1,37 +1,33 @@ #include #include -#include "core_sys.h" - #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "savedata.h" - #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" #include "unk_02000C88.h" #include "unk_02001AF4.h" #include "unk_02002B7C.h" #include "unk_020041CC.h" #include "unk_02005474.h" -#include "overlay_manager.h" -#include "message.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "savedata.h" FS_EXTERN_OVERLAY(overlay77); @@ -40,26 +36,26 @@ typedef struct { int unk_04; int unk_08; int unk_0C; - Strbuf* unk_10; - BGL * unk_14; - MessageLoader * unk_18; + Strbuf *unk_10; + BGL *unk_14; + MessageLoader *unk_18; Window unk_1C; - UIControlData * unk_2C; - SaveData * unk_30; - void * unk_34; + UIControlData *unk_2C; + SaveData *unk_30; + void *unk_34; } UnkStruct_02099DFC; -void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate * param1); -int sub_02099DFC(OverlayManager * param0, int * param1); -int sub_02099E38(OverlayManager * param0, int * param1); -int sub_02099F54(OverlayManager * param0, int * param1); -static void sub_02099F74(void * param0); -static void sub_02099F80(UnkStruct_02099DFC * param0); -static void sub_0209A044(UnkStruct_02099DFC * param0); -static void sub_0209A098(UnkStruct_02099DFC * param0); -static void sub_0209A0E0(UnkStruct_02099DFC * param0); -static BOOL sub_0209A0F4(UnkStruct_02099DFC * param0); -static BOOL sub_0209A200(UnkStruct_02099DFC * param0, u32 param1, int param2, int param3); +void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); +int sub_02099DFC(OverlayManager *param0, int *param1); +int sub_02099E38(OverlayManager *param0, int *param1); +int sub_02099F54(OverlayManager *param0, int *param1); +static void sub_02099F74(void *param0); +static void sub_02099F80(UnkStruct_02099DFC *param0); +static void sub_0209A044(UnkStruct_02099DFC *param0); +static void sub_0209A098(UnkStruct_02099DFC *param0); +static void sub_0209A0E0(UnkStruct_02099DFC *param0); +static BOOL sub_0209A0F4(UnkStruct_02099DFC *param0); +static BOOL sub_0209A200(UnkStruct_02099DFC *param0, u32 param1, int param2, int param3); extern const OverlayManagerTemplate Unk_ov77_021D742C; @@ -90,9 +86,9 @@ static const UnkStruct_ov61_0222C884 Unk_020F89EC = { 0x155 }; -int sub_02099DFC (OverlayManager * param0, int * param1) +int sub_02099DFC(OverlayManager *param0, int *param1) { - UnkStruct_02099DFC * v0; + UnkStruct_02099DFC *v0; int v1 = 88; Heap_Create(3, v1, 0x20000); @@ -107,9 +103,9 @@ int sub_02099DFC (OverlayManager * param0, int * param1) return 1; } -int sub_02099E38 (OverlayManager * param0, int * param1) +int sub_02099E38(OverlayManager *param0, int *param1) { - UnkStruct_02099DFC * v0 = OverlayManager_Data(param0); + UnkStruct_02099DFC *v0 = OverlayManager_Data(param0); int v1 = 0; switch (*param1) { @@ -159,9 +155,9 @@ int sub_02099E38 (OverlayManager * param0, int * param1) return v1; } -int sub_02099F54 (OverlayManager * param0, int * param1) +int sub_02099F54(OverlayManager *param0, int *param1) { - UnkStruct_02099DFC * v0 = OverlayManager_Data(param0); + UnkStruct_02099DFC *v0 = OverlayManager_Data(param0); int v1 = v0->unk_00; OverlayManager_FreeData(param0); @@ -171,13 +167,13 @@ int sub_02099F54 (OverlayManager * param0, int * param1) return 1; } -static void sub_02099F74 (void * param0) +static void sub_02099F74(void *param0) { - UnkStruct_02099DFC * v0 = param0; + UnkStruct_02099DFC *v0 = param0; sub_0201C2B8(v0->unk_14); } -static void sub_02099F80 (UnkStruct_02099DFC * param0) +static void sub_02099F80(UnkStruct_02099DFC *param0) { { UnkStruct_02099F80 v0 = { @@ -234,7 +230,7 @@ static void sub_02099F80 (UnkStruct_02099DFC * param0) sub_0201975C(4, 0x6c21); } -static void sub_0209A044 (UnkStruct_02099DFC * param0) +static void sub_0209A044(UnkStruct_02099DFC *param0) { sub_02019120(0, 0); sub_02019120(1, 0); @@ -248,7 +244,7 @@ static void sub_0209A044 (UnkStruct_02099DFC * param0) Heap_FreeToHeap(param0->unk_14); } -static void sub_0209A098 (UnkStruct_02099DFC * param0) +static void sub_0209A098(UnkStruct_02099DFC *param0) { param0->unk_18 = MessageLoader_Init(1, 26, 4, param0->unk_00); sub_0201D710(); @@ -257,13 +253,13 @@ static void sub_0209A098 (UnkStruct_02099DFC * param0) BGL_WindowColor(¶m0->unk_1C, 15, 0, 0, 27 * 8, 4 * 8); } -static void sub_0209A0E0 (UnkStruct_02099DFC * param0) +static void sub_0209A0E0(UnkStruct_02099DFC *param0) { BGL_DeleteWindow(¶m0->unk_1C); MessageLoader_Free(param0->unk_18); } -static BOOL sub_0209A0F4 (UnkStruct_02099DFC * param0) +static BOOL sub_0209A0F4(UnkStruct_02099DFC *param0) { BOOL v0 = 0; @@ -274,8 +270,7 @@ static BOOL sub_0209A0F4 (UnkStruct_02099DFC * param0) param0->unk_04 = 1; } break; - case 1: - { + case 1: { u32 v1 = sub_02002114(param0->unk_2C, param0->unk_00); switch (v1) { @@ -286,8 +281,7 @@ static BOOL sub_0209A0F4 (UnkStruct_02099DFC * param0) param0->unk_04 = 6; break; } - } - break; + } break; case 2: if (sub_0209A200(param0, 1, 1, 4) == TRUE) { param0->unk_2C = sub_02002054(param0->unk_14, &Unk_020F89EC, (512 - (18 + 12)) - 9, 3, 1, param0->unk_00); @@ -305,8 +299,7 @@ static BOOL sub_0209A0F4 (UnkStruct_02099DFC * param0) param0->unk_04 = 6; break; } - } - break; + } break; case 4: if (sub_0209A200(param0, 2, 1, 0) == TRUE) { param0->unk_34 = sub_0200E7FC(¶m0->unk_1C, 512 - (18 + 12)); @@ -327,7 +320,7 @@ static BOOL sub_0209A0F4 (UnkStruct_02099DFC * param0) return v0; } -static BOOL sub_0209A200 (UnkStruct_02099DFC * param0, u32 param1, int param2, int param3) +static BOOL sub_0209A200(UnkStruct_02099DFC *param0, u32 param1, int param2, int param3) { BOOL v0 = 0; diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index ba0b9ddfd3..f3f4dcfbef 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -1,34 +1,30 @@ #include #include -#include "core_sys.h" - #include "struct_decls/struct_02001AF4_decl.h" -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" -#include "savedata.h" - #include "struct_defs/struct_0203CC84.h" #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "overlay_manager.h" +#include "savedata.h" +#include "strbuf.h" #include "unk_02000C88.h" #include "unk_02002B7C.h" -#include "overlay_manager.h" -#include "message.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "savedata.h" FS_EXTERN_OVERLAY(overlay97); @@ -38,26 +34,26 @@ typedef struct { int unk_08; int unk_0C; int unk_10; - Strbuf* unk_14; - BGL * unk_18; - MessageLoader * unk_1C; + Strbuf *unk_14; + BGL *unk_18; + MessageLoader *unk_1C; Window unk_20; - UIControlData * unk_30; - SaveData * unk_34; - void * unk_38; + UIControlData *unk_30; + SaveData *unk_34; + void *unk_38; u32 unk_3C; } UnkStruct_0209A3D0; -void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate * param1); -int sub_0209A2C4(OverlayManager * param0, int * param1); -int sub_0209A300(OverlayManager * param0, int * param1); -int sub_0209A3A4(OverlayManager * param0, int * param1); -static void sub_0209A3D0(UnkStruct_0209A3D0 * param0); -static void sub_0209A490(UnkStruct_0209A3D0 * param0); -static void sub_0209A4E4(UnkStruct_0209A3D0 * param0); -static void sub_0209A530(UnkStruct_0209A3D0 * param0); -static BOOL sub_0209A544(UnkStruct_0209A3D0 * param0); -static BOOL sub_0209A688(UnkStruct_0209A3D0 * param0, u32 param1, int param2, int param3); +void sub_02000EC4(FSOverlayID param0, const OverlayManagerTemplate *param1); +int sub_0209A2C4(OverlayManager *param0, int *param1); +int sub_0209A300(OverlayManager *param0, int *param1); +int sub_0209A3A4(OverlayManager *param0, int *param1); +static void sub_0209A3D0(UnkStruct_0209A3D0 *param0); +static void sub_0209A490(UnkStruct_0209A3D0 *param0); +static void sub_0209A4E4(UnkStruct_0209A3D0 *param0); +static void sub_0209A530(UnkStruct_0209A3D0 *param0); +static BOOL sub_0209A544(UnkStruct_0209A3D0 *param0); +static BOOL sub_0209A688(UnkStruct_0209A3D0 *param0, u32 param1, int param2, int param3); extern const OverlayManagerTemplate Unk_ov97_0223D674; @@ -78,9 +74,9 @@ const OverlayManagerTemplate Unk_020F8AB4 = { 0xFFFFFFFF }; -int sub_0209A2C4 (OverlayManager * param0, int * param1) +int sub_0209A2C4(OverlayManager *param0, int *param1) { - UnkStruct_0209A3D0 * v0; + UnkStruct_0209A3D0 *v0; int v1 = 88; Heap_Create(3, v1, 0x20000); @@ -95,9 +91,9 @@ int sub_0209A2C4 (OverlayManager * param0, int * param1) return 1; } -int sub_0209A300 (OverlayManager * param0, int * param1) +int sub_0209A300(OverlayManager *param0, int *param1) { - UnkStruct_0209A3D0 * v0 = OverlayManager_Data(param0); + UnkStruct_0209A3D0 *v0 = OverlayManager_Data(param0); int v1 = 0; switch (*param1) { @@ -132,9 +128,9 @@ int sub_0209A300 (OverlayManager * param0, int * param1) return v1; } -int sub_0209A3A4 (OverlayManager * param0, int * param1) +int sub_0209A3A4(OverlayManager *param0, int *param1) { - UnkStruct_0209A3D0 * v0 = OverlayManager_Data(param0); + UnkStruct_0209A3D0 *v0 = OverlayManager_Data(param0); int v1 = v0->unk_00; OverlayManager_FreeData(param0); @@ -144,7 +140,7 @@ int sub_0209A3A4 (OverlayManager * param0, int * param1) return 1; } -static void sub_0209A3D0 (UnkStruct_0209A3D0 * param0) +static void sub_0209A3D0(UnkStruct_0209A3D0 *param0) { { UnkStruct_02099F80 v0 = { @@ -200,7 +196,7 @@ static void sub_0209A3D0 (UnkStruct_0209A3D0 * param0) sub_0201975C(4, 0); } -static void sub_0209A490 (UnkStruct_0209A3D0 * param0) +static void sub_0209A490(UnkStruct_0209A3D0 *param0) { sub_02019120(0, 0); sub_02019120(1, 0); @@ -214,7 +210,7 @@ static void sub_0209A490 (UnkStruct_0209A3D0 * param0) Heap_FreeToHeap(param0->unk_18); } -static void sub_0209A4E4 (UnkStruct_0209A3D0 * param0) +static void sub_0209A4E4(UnkStruct_0209A3D0 *param0) { param0->unk_1C = MessageLoader_Init(1, 26, 406, param0->unk_00); sub_0201D710(); @@ -224,19 +220,18 @@ static void sub_0209A4E4 (UnkStruct_0209A3D0 * param0) BGL_WindowColor(¶m0->unk_20, 15, 0, 0, 27 * 8, 4 * 8); } -static void sub_0209A530 (UnkStruct_0209A3D0 * param0) +static void sub_0209A530(UnkStruct_0209A3D0 *param0) { BGL_DeleteWindow(¶m0->unk_20); MessageLoader_Free(param0->unk_1C); } -static BOOL sub_0209A544 (UnkStruct_0209A3D0 * param0) +static BOOL sub_0209A544(UnkStruct_0209A3D0 *param0) { BOOL v0 = 0; switch (param0->unk_04) { - case 0: - { + case 0: { param0->unk_3C = SaveData_LoadCheckStatus(param0->unk_34); if (param0->unk_3C == 0) { @@ -244,8 +239,7 @@ static BOOL sub_0209A544 (UnkStruct_0209A3D0 * param0) } else { param0->unk_04 = 1; } - } - break; + } break; case 1: param0->unk_04 = 2; @@ -303,7 +297,7 @@ static BOOL sub_0209A544 (UnkStruct_0209A3D0 * param0) return v0; } -static BOOL sub_0209A688 (UnkStruct_0209A3D0 * param0, u32 param1, int param2, int param3) +static BOOL sub_0209A688(UnkStruct_0209A3D0 *param0, u32 param1, int param2, int param3) { BOOL v0 = 0; diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index 62dca6e3c8..850efe9f6b 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -1,31 +1,29 @@ +#include "unk_0209A74C.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" #include "unk_02000C88.h" #include "unk_02002B7C.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "unk_0209A74C.h" static const UnkStruct_02099F80 Unk_020F8AF8 = { GX_VRAM_BG_256_AB, @@ -73,12 +71,12 @@ static const UnkStruct_ov61_0222C884 Unk_020F8AC4 = { 0x23 }; -void sub_0209A74C (int param0) +void sub_0209A74C(int param0) { - BGL * v0; + BGL *v0; Window v1; - MessageLoader * v2; - Strbuf* v3; + MessageLoader *v2; + Strbuf *v3; int v4 = 0; sub_0200F344(0, 0); @@ -148,12 +146,12 @@ void sub_0209A74C (int param0) PM_ForceToPowerOff(); } -void sub_0209A8E0 (int param0) +void sub_0209A8E0(int param0) { - BGL * v0; + BGL *v0; Window v1; - MessageLoader * v2; - Strbuf* v3; + MessageLoader *v2; + Strbuf *v3; int v4 = 1; sub_0200F344(0, 0); diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index 6da3093272..10f8c676ef 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -1,31 +1,29 @@ +#include "unk_0209AA74.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_02018340_decl.h" -#include "strbuf.h" - #include "struct_defs/struct_0205AA50.h" #include "struct_defs/struct_02099F80.h" + #include "overlay061/struct_ov61_0222C884.h" #include "overlay084/struct_ov84_0223BA5C.h" #include "overlay097/struct_ov97_0222DB78.h" +#include "core_sys.h" +#include "gx_layers.h" +#include "heap.h" +#include "message.h" +#include "strbuf.h" #include "unk_02000C88.h" #include "unk_02002B7C.h" #include "unk_0200A9DC.h" -#include "message.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_02017728.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "gx_layers.h" -#include "strbuf.h" -#include "unk_0209AA74.h" void sub_0201777C(void); @@ -75,12 +73,12 @@ static const UnkStruct_ov61_0222C884 Unk_020F8B20 = { 0x23 }; -void sub_0209AA74 (int param0, int param1) +void sub_0209AA74(int param0, int param1) { - BGL * v0; + BGL *v0; Window v1; - MessageLoader * v2; - Strbuf* v3; + MessageLoader *v2; + Strbuf *v3; int v4; if (param1 == 0) { diff --git a/src/unk_0209AC14.c b/src/unk_0209AC14.c index f65e683e7c..dbf38b8cf5 100644 --- a/src/unk_0209AC14.c +++ b/src/unk_0209AC14.c @@ -1,25 +1,26 @@ +#include "unk_0209AC14.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" #include "field/field_system.h" +#include "overlay005/ov5_021D0D80.h" +#include "overlay007/ov7_0224CD28.h" #include "overlay007/struct_ov7_0224D008.h" #include "heap.h" #include "unk_020508D4.h" #include "unk_0207CB08.h" -#include "unk_0209AC14.h" -#include "overlay005/ov5_021D0D80.h" -#include "overlay007/ov7_0224CD28.h" -static u8 sub_0209AC50(FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1); -static void sub_0209AC80(TaskManager * param0); +static u8 sub_0209AC50(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1); +static void sub_0209AC80(TaskManager *param0); -BOOL sub_0209AC14 (TaskManager * param0) +BOOL sub_0209AC14(TaskManager *param0) { - FieldSystem * fieldSystem; - UnkStruct_ov7_0224D008 * v1; + FieldSystem *fieldSystem; + UnkStruct_ov7_0224D008 *v1; fieldSystem = TaskManager_FieldSystem(param0); v1 = TaskManager_Environment(param0); @@ -36,7 +37,7 @@ BOOL sub_0209AC14 (TaskManager * param0) return 0; } -static u8 sub_0209AC50 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * param1) +static u8 sub_0209AC50(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1) { if (sub_020509B4(fieldSystem)) { return 16; @@ -50,10 +51,10 @@ static u8 sub_0209AC50 (FieldSystem * fieldSystem, UnkStruct_ov7_0224D008 * para return 17; } -static void sub_0209AC80 (TaskManager * param0) +static void sub_0209AC80(TaskManager *param0) { - FieldSystem * fieldSystem; - UnkStruct_ov7_0224D008 * v1; + FieldSystem *fieldSystem; + UnkStruct_ov7_0224D008 *v1; fieldSystem = TaskManager_FieldSystem(param0); v1 = TaskManager_Environment(param0); diff --git a/src/unk_0209ACBC.c b/src/unk_0209ACBC.c index 25c2d92ff9..5edeefd682 100644 --- a/src/unk_0209ACBC.c +++ b/src/unk_0209ACBC.c @@ -1,17 +1,18 @@ +#include "unk_0209ACBC.h" + #include #include #include "heap.h" -#include "unk_0209ACBC.h" typedef struct UnkStruct_0209ACBC_t { u32 unk_00; u32 unk_04; } UnkStruct_0209ACBC; -UnkStruct_0209ACBC * sub_0209ACBC (u32 param0) +UnkStruct_0209ACBC *sub_0209ACBC(u32 param0) { - UnkStruct_0209ACBC * v0; + UnkStruct_0209ACBC *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0209ACBC)); memset(v0, 0, sizeof(UnkStruct_0209ACBC)); @@ -19,27 +20,27 @@ UnkStruct_0209ACBC * sub_0209ACBC (u32 param0) return v0; } -void sub_0209ACDC (UnkStruct_0209ACBC * param0) +void sub_0209ACDC(UnkStruct_0209ACBC *param0) { Heap_FreeToHeap(param0); } -u32 sub_0209ACE4 (const UnkStruct_0209ACBC * param0) +u32 sub_0209ACE4(const UnkStruct_0209ACBC *param0) { return param0->unk_00; } -void sub_0209ACE8 (UnkStruct_0209ACBC * param0, u32 param1) +void sub_0209ACE8(UnkStruct_0209ACBC *param0, u32 param1) { param0->unk_00 = param1; } -u32 sub_0209ACEC (const UnkStruct_0209ACBC * param0) +u32 sub_0209ACEC(const UnkStruct_0209ACBC *param0) { return param0->unk_04; } -void sub_0209ACF0 (UnkStruct_0209ACBC * param0, u32 param1) +void sub_0209ACF0(UnkStruct_0209ACBC *param0, u32 param1) { param0->unk_04 = param1; } diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index 727a5fcc08..eb1725d83e 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -1,74 +1,72 @@ +#include "unk_0209ACF4.h" + #include #include -#include "core_sys.h" - -#include "message.h" #include "struct_decls/struct_020149F0_decl.h" -#include "strbuf.h" #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0209747C_decl.h" - #include "struct_defs/sentence.h" -#include "field/field_system.h" #include "struct_defs/struct_0205AA50.h" -#include "unk_02005474.h" +#include "field/field_system.h" +#include "overlay005/ov5_021D0D80.h" + +#include "core_sys.h" +#include "heap.h" #include "message.h" +#include "strbuf.h" #include "string_template.h" +#include "unk_02005474.h" #include "unk_0200DA60.h" #include "unk_0200F174.h" #include "unk_020149F0.h" #include "unk_02014A84.h" -#include "heap.h" #include "unk_02018340.h" #include "unk_0201D670.h" -#include "strbuf.h" #include "unk_02025E08.h" #include "unk_0202D05C.h" #include "unk_0203D1B8.h" #include "unk_020508D4.h" #include "unk_0205D8CC.h" #include "unk_0209747C.h" -#include "unk_0209ACF4.h" -#include "overlay005/ov5_021D0D80.h" typedef struct { - FieldSystem * fieldSystem; - Strbuf* unk_04; - Strbuf* unk_08; - StringTemplate * unk_0C; - MessageLoader * unk_10; - UnkStruct_020149F0 * unk_14; + FieldSystem *fieldSystem; + Strbuf *unk_04; + Strbuf *unk_08; + StringTemplate *unk_0C; + MessageLoader *unk_10; + UnkStruct_020149F0 *unk_14; Window unk_18; Window unk_28; Window unk_38; Sentence unk_48; - UnkStruct_0209747C * unk_50; + UnkStruct_0209747C *unk_50; int unk_54; int unk_58; int unk_5C; int unk_60; int unk_64; - Window * unk_68; + Window *unk_68; } UnkStruct_0209AD84; -static void sub_0209AD84(UnkStruct_0209AD84 * param0); -static void sub_0209ADBC(UnkStruct_0209AD84 * param0); -static BOOL sub_0209AE14(TaskManager * param0); -static void sub_0209B084(UnkStruct_0209AD84 * param0, int param1, BOOL param2); -static BOOL sub_0209B100(UnkStruct_0209AD84 * param0); -static void sub_0209B110(UnkStruct_0209AD84 * param0); -static void sub_0209B12C(UnkStruct_0209AD84 * param0); -static void sub_0209B1CC(UnkStruct_0209AD84 * param0); -static void sub_0209B1D8(UnkStruct_0209AD84 * param0); -static void sub_0209B27C(UnkStruct_0209AD84 * param0); -static int sub_0209B288(UnkStruct_0209AD84 * param0); - -void sub_0209ACF4 (TaskManager * param0) +static void sub_0209AD84(UnkStruct_0209AD84 *param0); +static void sub_0209ADBC(UnkStruct_0209AD84 *param0); +static BOOL sub_0209AE14(TaskManager *param0); +static void sub_0209B084(UnkStruct_0209AD84 *param0, int param1, BOOL param2); +static BOOL sub_0209B100(UnkStruct_0209AD84 *param0); +static void sub_0209B110(UnkStruct_0209AD84 *param0); +static void sub_0209B12C(UnkStruct_0209AD84 *param0); +static void sub_0209B1CC(UnkStruct_0209AD84 *param0); +static void sub_0209B1D8(UnkStruct_0209AD84 *param0); +static void sub_0209B27C(UnkStruct_0209AD84 *param0); +static int sub_0209B288(UnkStruct_0209AD84 *param0); + +void sub_0209ACF4(TaskManager *param0) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0209AD84 * v1 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0209AD84)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0209AD84 *v1 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0209AD84)); v1->fieldSystem = fieldSystem; v1->unk_04 = Strbuf_Init(400, 32); @@ -88,7 +86,7 @@ void sub_0209ACF4 (TaskManager * param0) FieldTask_Start(param0, sub_0209AE14, v1); } -static void sub_0209AD84 (UnkStruct_0209AD84 * param0) +static void sub_0209AD84(UnkStruct_0209AD84 *param0) { sub_020974EC(param0->unk_50); sub_02014A20(param0->unk_14); @@ -100,7 +98,7 @@ static void sub_0209AD84 (UnkStruct_0209AD84 * param0) Heap_FreeToHeap(param0); } -static void sub_0209ADBC (UnkStruct_0209AD84 * param0) +static void sub_0209ADBC(UnkStruct_0209AD84 *param0) { if (BGL_WindowAdded(&(param0->unk_18))) { BGL_DeleteWindow(¶m0->unk_18); @@ -118,9 +116,9 @@ static void sub_0209ADBC (UnkStruct_0209AD84 * param0) } } -static BOOL sub_0209AE14 (TaskManager * param0) +static BOOL sub_0209AE14(TaskManager *param0) { - UnkStruct_0209AD84 * v0 = TaskManager_Environment(param0); + UnkStruct_0209AD84 *v0 = TaskManager_Environment(param0); switch (v0->unk_54) { case 0: @@ -222,8 +220,7 @@ static BOOL sub_0209AE14 (TaskManager * param0) v0->unk_54 = 2; break; case 1: - default: - { + default: { u16 v1 = sub_02014C78(&v0->unk_48, 0); sub_0209B27C(v0); @@ -259,9 +256,9 @@ static BOOL sub_0209AE14 (TaskManager * param0) return 0; } -static void sub_0209B084 (UnkStruct_0209AD84 * param0, int param1, BOOL param2) +static void sub_0209B084(UnkStruct_0209AD84 *param0, int param1, BOOL param2) { - Window * v0 = &(param0->unk_18); + Window *v0 = &(param0->unk_18); if (param2) { MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_04); @@ -281,23 +278,23 @@ static void sub_0209B084 (UnkStruct_0209AD84 * param0, int param1, BOOL param2) param0->unk_58 = FieldMessage_Print(v0, param0->unk_08, SaveData_Options(param0->fieldSystem->saveData), 1); } -static BOOL sub_0209B100 (UnkStruct_0209AD84 * param0) +static BOOL sub_0209B100(UnkStruct_0209AD84 *param0) { return FieldMessage_FinishedPrinting(param0->unk_58); } -static void sub_0209B110 (UnkStruct_0209AD84 * param0) +static void sub_0209B110(UnkStruct_0209AD84 *param0) { - Window * v0 = &(param0->unk_18); + Window *v0 = &(param0->unk_18); if (BGL_WindowAdded(v0)) { sub_0200E084(v0, 0); } } -static void sub_0209B12C (UnkStruct_0209AD84 * param0) +static void sub_0209B12C(UnkStruct_0209AD84 *param0) { - Window * v0 = &(param0->unk_28); + Window *v0 = &(param0->unk_28); if (BGL_WindowAdded(v0) == 0) { int v1; @@ -321,15 +318,15 @@ static void sub_0209B12C (UnkStruct_0209AD84 * param0) Window_Show(v0, 0, 155, 11); } -static void sub_0209B1CC (UnkStruct_0209AD84 * param0) +static void sub_0209B1CC(UnkStruct_0209AD84 *param0) { - Window * v0 = &(param0->unk_28); + Window *v0 = &(param0->unk_28); Window_Clear(v0, 1); } -static void sub_0209B1D8 (UnkStruct_0209AD84 * param0) +static void sub_0209B1D8(UnkStruct_0209AD84 *param0) { - Window * v0 = &(param0->unk_38); + Window *v0 = &(param0->unk_38); if (BGL_WindowAdded(v0) == 0) { int v1; @@ -353,13 +350,13 @@ static void sub_0209B1D8 (UnkStruct_0209AD84 * param0) Window_Show(v0, 0, 155, 11); } -static void sub_0209B27C (UnkStruct_0209AD84 * param0) +static void sub_0209B27C(UnkStruct_0209AD84 *param0) { - Window * v0 = &(param0->unk_38); + Window *v0 = &(param0->unk_38); Window_Clear(v0, 1); } -static int sub_0209B288 (UnkStruct_0209AD84 * param0) +static int sub_0209B288(UnkStruct_0209AD84 *param0) { do { if (gCoreSys.pressedKeys & PAD_KEY_UP) { diff --git a/src/unk_0209B344.c b/src/unk_0209B344.c index 94d9709821..35d53fbbd1 100644 --- a/src/unk_0209B344.c +++ b/src/unk_0209B344.c @@ -1,41 +1,42 @@ +#include "unk_0209B344.h" + #include #include #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0209747C_decl.h" - #include "struct_defs/sentence.h" + #include "field/field_system.h" +#include "overlay005/ov5_021D0D80.h" +#include "heap.h" +#include "savedata_misc.h" #include "string_template.h" #include "unk_0200F174.h" #include "unk_02014A84.h" -#include "heap.h" -#include "savedata_misc.h" #include "unk_0203D1B8.h" #include "unk_020508D4.h" #include "unk_0209747C.h" -#include "unk_0209B344.h" -#include "overlay005/ov5_021D0D80.h" typedef struct { - FieldSystem * fieldSystem; - StringTemplate * unk_04; + FieldSystem *fieldSystem; + StringTemplate *unk_04; Sentence unk_08; - UnkStruct_0209747C * unk_10; - MiscSaveBlock * unk_14; + UnkStruct_0209747C *unk_10; + MiscSaveBlock *unk_14; int unk_18; int unk_1C; - u16 * unk_20; + u16 *unk_20; } UnkStruct_0209B3AC; -static void sub_0209B3AC(UnkStruct_0209B3AC * param0); -static BOOL sub_0209B3C4(TaskManager * param0); +static void sub_0209B3AC(UnkStruct_0209B3AC *param0); +static BOOL sub_0209B3C4(TaskManager *param0); -void sub_0209B344 (TaskManager * param0, u16 * param1) +void sub_0209B344(TaskManager *param0, u16 *param1) { - FieldSystem * fieldSystem = TaskManager_FieldSystem(param0); - UnkStruct_0209B3AC * v1 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0209B3AC)); + FieldSystem *fieldSystem = TaskManager_FieldSystem(param0); + UnkStruct_0209B3AC *v1 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0209B3AC)); v1->fieldSystem = fieldSystem; v1->unk_04 = StringTemplate_Default(32); @@ -53,16 +54,16 @@ void sub_0209B344 (TaskManager * param0, u16 * param1) return; } -static void sub_0209B3AC (UnkStruct_0209B3AC * param0) +static void sub_0209B3AC(UnkStruct_0209B3AC *param0) { sub_020974EC(param0->unk_10); StringTemplate_Free(param0->unk_04); Heap_FreeToHeap(param0); } -static BOOL sub_0209B3C4 (TaskManager * param0) +static BOOL sub_0209B3C4(TaskManager *param0) { - UnkStruct_0209B3AC * v0 = TaskManager_Environment(param0); + UnkStruct_0209B3AC *v0 = TaskManager_Environment(param0); switch (v0->unk_18) { case 0: diff --git a/src/unk_0209B6F8.c b/src/unk_0209B6F8.c index 532fa8d397..f9d5365a7d 100644 --- a/src/unk_0209B6F8.c +++ b/src/unk_0209B6F8.c @@ -1,15 +1,14 @@ +#include "unk_0209B6F8.h" + #include #include -#include "core_sys.h" - -#include "overlay104/struct_ov104_022320B4_decl.h" - -#include "constdata/const_020F8BE0.h" - #include "functypes/funcptr_0209B988.h" +#include "overlay104/ov104_0222E63C.h" +#include "overlay104/ov104_0223C2D4.h" #include "overlay104/struct_ov104_0222E8C8.h" #include "overlay104/struct_ov104_02230BE4.h" +#include "overlay104/struct_ov104_022320B4_decl.h" #include "overlay104/struct_ov104_022320B4_t.h" #include "overlay104/struct_ov104_0223C4CC.h" #include "overlay104/struct_ov104_0223C634.h" @@ -18,25 +17,25 @@ #include "overlay104/struct_ov104_0223D3B0_sub1.h" #include "overlay104/struct_ov104_0223D8F0.h" +#include "core_sys.h" #include "game_overlay.h" -#include "overlay_manager.h" #include "heap.h" -#include "unk_0209B6F8.h" -#include "overlay104/ov104_0222E63C.h" -#include "overlay104/ov104_0223C2D4.h" +#include "overlay_manager.h" + +#include "constdata/const_020F8BE0.h" FS_EXTERN_OVERLAY(overlay63); FS_EXTERN_OVERLAY(overlay104); FS_EXTERN_OVERLAY(overlay105); typedef struct UnkStruct_0209B75C_t { - UnkStruct_ov104_02230BE4 * unk_00; - OverlayManager * unk_04; - void * unk_08; + UnkStruct_ov104_02230BE4 *unk_00; + OverlayManager *unk_04; + void *unk_08; UnkFuncPtr_0209B988 unk_0C; u8 unk_10; - UnkStruct_ov104_022320B4 * unk_14; - UnkStruct_ov104_0223C4CC * unk_18; + UnkStruct_ov104_022320B4 *unk_14; + UnkStruct_ov104_0223C4CC *unk_18; u8 unk_1C; u8 unk_1D; u8 unk_1E; @@ -48,14 +47,14 @@ typedef struct UnkStruct_0209B75C_t { UnkStruct_ov104_0223D3B0 unk_98C; } UnkStruct_0209B75C; -int sub_0209B6F8(OverlayManager * param0, int * param1); -int sub_0209B75C(OverlayManager * param0, int * param1); -int sub_0209B8A4(OverlayManager * param0, int * param1); -static void sub_0209B8C8(UnkStruct_0209B75C * param0); -static void sub_0209B8D8(UnkStruct_0209B75C * param0); +int sub_0209B6F8(OverlayManager *param0, int *param1); +int sub_0209B75C(OverlayManager *param0, int *param1); +int sub_0209B8A4(OverlayManager *param0, int *param1); +static void sub_0209B8C8(UnkStruct_0209B75C *param0); +static void sub_0209B8D8(UnkStruct_0209B75C *param0); static void sub_0209B924(void); static void sub_0209B94C(void); -static void sub_0209B8E8(UnkStruct_0209B75C * param0); +static void sub_0209B8E8(UnkStruct_0209B75C *param0); const OverlayManagerTemplate Unk_020F8BE0 = { sub_0209B6F8, @@ -64,9 +63,9 @@ const OverlayManagerTemplate Unk_020F8BE0 = { 0xffffffff }; -int sub_0209B6F8 (OverlayManager * param0, int * param1) +int sub_0209B6F8(OverlayManager *param0, int *param1) { - UnkStruct_0209B75C * v0; + UnkStruct_0209B75C *v0; int v1; sub_0209B924(); @@ -88,9 +87,9 @@ int sub_0209B6F8 (OverlayManager * param0, int * param1) return 1; } -int sub_0209B75C (OverlayManager * param0, int * param1) +int sub_0209B75C(OverlayManager *param0, int *param1) { - UnkStruct_0209B75C * v0 = OverlayManager_Data(param0); + UnkStruct_0209B75C *v0 = OverlayManager_Data(param0); int v1; switch (*param1) { @@ -163,7 +162,7 @@ int sub_0209B75C (OverlayManager * param0, int * param1) if (v0->unk_20 == 0xffff) { ov104_0222E86C(v0->unk_14, v0->unk_00->unk_24, 11); } else { - UnkStruct_ov104_0222E8C8 * v2; + UnkStruct_ov104_0222E8C8 *v2; v2 = ov104_0222E8C8(v0->unk_14, 11); ov104_0222E710(v0->unk_14); @@ -181,9 +180,9 @@ int sub_0209B75C (OverlayManager * param0, int * param1) return 0; } -int sub_0209B8A4 (OverlayManager * param0, int * param1) +int sub_0209B8A4(OverlayManager *param0, int *param1) { - UnkStruct_0209B75C * v0 = OverlayManager_Data(param0); + UnkStruct_0209B75C *v0 = OverlayManager_Data(param0); ov104_0222E710(v0->unk_14); @@ -194,19 +193,19 @@ int sub_0209B8A4 (OverlayManager * param0, int * param1) return 1; } -static void sub_0209B8C8 (UnkStruct_0209B75C * param0) +static void sub_0209B8C8(UnkStruct_0209B75C *param0) { param0->unk_18 = ov104_0223C2D4(param0); param0->unk_1D = 1; } -static void sub_0209B8D8 (UnkStruct_0209B75C * param0) +static void sub_0209B8D8(UnkStruct_0209B75C *param0) { ov104_0223C4CC(param0->unk_18); param0->unk_1D = 0; } -static void sub_0209B8E8 (UnkStruct_0209B75C * param0) +static void sub_0209B8E8(UnkStruct_0209B75C *param0) { int v0; @@ -221,41 +220,41 @@ static void sub_0209B8E8 (UnkStruct_0209B75C * param0) } } -static void sub_0209B924 (void) +static void sub_0209B924(void) { Overlay_LoadByID(FS_OVERLAY_ID(overlay104), 2); Overlay_LoadByID(FS_OVERLAY_ID(overlay105), 2); Overlay_LoadByID(FS_OVERLAY_ID(overlay63), 2); } -static void sub_0209B94C (void) +static void sub_0209B94C(void) { Overlay_UnloadByID(FS_OVERLAY_ID(overlay104)); Overlay_UnloadByID(FS_OVERLAY_ID(overlay105)); Overlay_UnloadByID(FS_OVERLAY_ID(overlay63)); } -UnkStruct_ov104_02230BE4 * sub_0209B970 (UnkStruct_0209B75C * param0) +UnkStruct_ov104_02230BE4 *sub_0209B970(UnkStruct_0209B75C *param0) { return param0->unk_00; } -UnkStruct_ov104_0223C4CC * sub_0209B974 (UnkStruct_0209B75C * param0) +UnkStruct_ov104_0223C4CC *sub_0209B974(UnkStruct_0209B75C *param0) { return param0->unk_18; } -void * sub_0209B978 (UnkStruct_0209B75C * param0) +void *sub_0209B978(UnkStruct_0209B75C *param0) { return param0->unk_00->unk_00; } -void sub_0209B980 (UnkStruct_0209B75C * param0, void * param1) +void sub_0209B980(UnkStruct_0209B75C *param0, void *param1) { param0->unk_00->unk_00 = param1; } -void sub_0209B988 (UnkStruct_0209B75C * param0, const OverlayManagerTemplate * param1, void * param2, int param3, UnkFuncPtr_0209B988 param4) +void sub_0209B988(UnkStruct_0209B75C *param0, const OverlayManagerTemplate *param1, void *param2, int param3, UnkFuncPtr_0209B988 param4) { GF_ASSERT(param0->unk_04 == NULL); param0->unk_04 = OverlayManager_New(param1, param2, 11); @@ -264,39 +263,39 @@ void sub_0209B988 (UnkStruct_0209B75C * param0, const OverlayManagerTemplate * p param0->unk_0C = param4; } -void sub_0209B9B4 (UnkStruct_0209B75C * param0) +void sub_0209B9B4(UnkStruct_0209B75C *param0) { param0->unk_22 = 1; } -void sub_0209B9BC (UnkStruct_0209B75C * param0, u16 param1, u16 param2) +void sub_0209B9BC(UnkStruct_0209B75C *param0, u16 param1, u16 param2) { param0->unk_00->unk_24 = param1; param0->unk_1E = 1; param0->unk_20 = param2; } -UnkStruct_ov104_0223C688 * sub_0209B9CC (UnkStruct_0209B75C * param0) +UnkStruct_ov104_0223C688 *sub_0209B9CC(UnkStruct_0209B75C *param0) { return param0->unk_24; } -UnkStruct_ov104_0223C634 * sub_0209B9D0 (UnkStruct_0209B75C * param0) +UnkStruct_ov104_0223C634 *sub_0209B9D0(UnkStruct_0209B75C *param0) { return param0->unk_6C; } -UnkStruct_ov104_0223C634 * sub_0209B9D4 (UnkStruct_0209B75C * param0, int param1) +UnkStruct_ov104_0223C634 *sub_0209B9D4(UnkStruct_0209B75C *param0, int param1) { return ¶m0->unk_6C[param1]; } -UnkStruct_ov104_0223D3B0 * sub_0209B9E0 (UnkStruct_0209B75C * param0) +UnkStruct_ov104_0223D3B0 *sub_0209B9E0(UnkStruct_0209B75C *param0) { return ¶m0->unk_98C; } -void sub_0209B9EC (UnkStruct_0209B75C * param0) +void sub_0209B9EC(UnkStruct_0209B75C *param0) { int v0; diff --git a/src/unk_0209BA18.c b/src/unk_0209BA18.c index 1827605c38..dde297f429 100644 --- a/src/unk_0209BA18.c +++ b/src/unk_0209BA18.c @@ -1,28 +1,29 @@ +#include "unk_0209BA18.h" + #include #include -#include "overlay104/struct_ov104_0222E930_decl.h" - -#include "constdata/const_020F8BE0.h" +#include "struct_defs/struct_0209BBA4.h" #include "field/field_system.h" -#include "struct_defs/struct_0209BBA4.h" +#include "overlay104/struct_ov104_0222E930_decl.h" #include "overlay104/struct_ov104_0222E930_t.h" #include "overlay104/struct_ov104_02230BE4.h" +#include "field_system.h" #include "heap.h" #include "unk_02025E08.h" -#include "field_system.h" -#include "unk_0209BA18.h" -UnkStruct_ov104_02230BE4 * sub_0209BA18(FieldSystem * fieldSystem, void * param1); -BOOL ov104_02239624(UnkStruct_ov104_0222E930 * param0); -BOOL ov104_02239660(UnkStruct_ov104_0222E930 * param0); -static BOOL ov104_02239C88(UnkStruct_0209BBA4 * param0, u16 param1, u16 param2); +#include "constdata/const_020F8BE0.h" + +UnkStruct_ov104_02230BE4 *sub_0209BA18(FieldSystem *fieldSystem, void *param1); +BOOL ov104_02239624(UnkStruct_ov104_0222E930 *param0); +BOOL ov104_02239660(UnkStruct_ov104_0222E930 *param0); +static BOOL ov104_02239C88(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2); -UnkStruct_ov104_02230BE4 * sub_0209BA18 (FieldSystem * fieldSystem, void * param1) +UnkStruct_ov104_02230BE4 *sub_0209BA18(FieldSystem *fieldSystem, void *param1) { - UnkStruct_ov104_02230BE4 * v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov104_02230BE4)); + UnkStruct_ov104_02230BE4 *v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov104_02230BE4)); MI_CpuClear8(v0, sizeof(UnkStruct_ov104_02230BE4)); diff --git a/src/unk_0209BA80.c b/src/unk_0209BA80.c index 2624cb93ba..e5807fefaf 100644 --- a/src/unk_0209BA80.c +++ b/src/unk_0209BA80.c @@ -1,20 +1,13 @@ +#include "unk_0209BA80.h" + #include #include -#include "pokemon.h" #include "struct_decls/struct_party_decl.h" - #include "struct_defs/struct_02039A58.h" #include "struct_defs/struct_0204AFC4.h" #include "struct_defs/struct_0209BBA4.h" -#include "unk_0203061C.h" -#include "unk_02032798.h" -#include "communication_system.h" -#include "unk_0205DFC4.h" -#include "pokemon.h" -#include "party.h" -#include "unk_0209BA80.h" #include "overlay104/ov104_0222ECE8.h" #include "overlay104/ov104_0223C164.h" #include "overlay105/ov105_02241AE0.h" @@ -23,88 +16,95 @@ #include "overlay107/ov107_02245EB0.h" #include "overlay108/ov108_02241AE0.h" -static void sub_0209BA94(int param0, int param1, void * param2, void * param3); -BOOL sub_0209BB08(UnkStruct_0204AFC4 * param0); -static void sub_0209BB34(int param0, int param1, void * param2, void * param3); -static void sub_0209BB68(int param0, int param1, void * param2, void * param3); -BOOL sub_0209BBA4(UnkStruct_0209BBA4 * param0); -void sub_0209BBEC(int param0, int param1, void * param2, void * param3); -BOOL sub_0209BC1C(UnkStruct_0209BBA4 * param0, u16 param1); -void sub_0209BC3C(int param0, int param1, void * param2, void * param3); -BOOL sub_0209BC64(UnkStruct_0209BBA4 * param0, u16 param1, u16 param2); -void sub_0209BD28(int param0, int param1, void * param2, void * param3); -BOOL sub_0209BD68(UnkStruct_0209BBA4 * param0, u16 param1); -void sub_0209BD88(int param0, int param1, void * param2, void * param3); -BOOL sub_0209BDB0(UnkStruct_0209BBA4 * param0, u16 param1); -void sub_0209BDD0(int param0, int param1, void * param2, void * param3); +#include "communication_system.h" +#include "party.h" +#include "pokemon.h" +#include "unk_0203061C.h" +#include "unk_02032798.h" +#include "unk_0205DFC4.h" + +static void sub_0209BA94(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BB08(UnkStruct_0204AFC4 *param0); +static void sub_0209BB34(int param0, int param1, void *param2, void *param3); +static void sub_0209BB68(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0); +void sub_0209BBEC(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1); +void sub_0209BC3C(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2); +void sub_0209BD28(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1); +void sub_0209BD88(int param0, int param1, void *param2, void *param3); +BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1); +void sub_0209BDD0(int param0, int param1, void *param2, void *param3); static const CommCmdTable Unk_020F8BF0[] = { - {ov104_0222EF30, sub_02032944, NULL}, - {ov104_0222EF94, sub_02032944, NULL}, - {ov104_0222F03C, sub_02032944, NULL}, - {ov104_0222F124, sub_02032944, NULL}, - {ov104_0222F1C4, sub_02032944, NULL}, - {ov104_0222F210, sub_02032944, NULL}, - {ov104_0222F31C, sub_02032944, NULL}, - {ov105_0224569C, sub_02032944, NULL}, - {ov105_02245744, sub_02032944, NULL}, - {ov105_022457B8, sub_02032944, NULL}, - {ov105_022458A4, sub_02032944, NULL}, - {ov104_0222ECE8, sub_02032944, NULL}, - {ov104_0222ED2C, sub_02032944, NULL}, - {ov104_0222ED74, sub_02032944, NULL}, - {ov104_0222EDDC, sub_02032944, NULL}, - {ov104_0222EE38, sub_02032944, NULL}, - {ov104_0222EEA8, sub_02032944, ov104_0222EED8}, - {ov106_02243130, sub_02032944, NULL}, - {ov106_02243180, sub_02032944, NULL}, - {ov106_022431E0, sub_02032944, NULL}, - {ov104_0222F418, sub_02032944, NULL}, - {ov104_0222F480, sub_02032944, NULL}, - {ov104_0222F530, sub_02032944, NULL}, - {ov104_0222F650, sub_02032944, NULL}, - {ov104_0222F6E8, sub_02032944, NULL}, - {ov104_0222F730, sub_02032944, NULL}, - {ov104_0222F7BC, sub_02032944, ov104_0222F84C}, - {ov107_02245338, sub_02032944, NULL}, - {ov107_022453A0, sub_02032944, NULL}, - {ov107_02245408, sub_02032944, NULL}, - {ov107_02245438, sub_02032944, NULL}, - {ov107_02248910, sub_02032944, NULL}, - {ov107_02248978, sub_02032944, NULL}, - {ov107_022489E0, sub_02032944, NULL}, - {ov107_02248A10, sub_02032944, NULL}, - {sub_0209BBEC, sub_02032944, NULL}, - {sub_0209BC3C, sub_02032944, NULL}, - {sub_0209BD28, sub_02032944, NULL}, - {sub_0209BD88, sub_02032944, NULL}, - {sub_0209BDD0, sub_02032944, NULL}, - {sub_0209BA94, sub_02032944, NULL}, - {sub_0209BB34, sub_02032944, NULL}, - {sub_0209BB68, sub_02032944, NULL}, - {ov104_0222F8A0, sub_02032944, NULL}, - {ov104_0222F908, sub_02032944, NULL}, - {ov104_0222F9C0, sub_02032944, NULL}, - {ov104_0222FA5C, sub_02032944, NULL}, - {ov104_0222FAA8, sub_02032944, NULL}, - {ov104_0222FB34, sub_02032944, ov104_0222FBC4}, - {ov108_02242AB0, sub_02032944, NULL}, - {ov108_02242B24, sub_02032944, NULL}, - {ov108_02242B84, sub_02032944, NULL} + { ov104_0222EF30, sub_02032944, NULL }, + { ov104_0222EF94, sub_02032944, NULL }, + { ov104_0222F03C, sub_02032944, NULL }, + { ov104_0222F124, sub_02032944, NULL }, + { ov104_0222F1C4, sub_02032944, NULL }, + { ov104_0222F210, sub_02032944, NULL }, + { ov104_0222F31C, sub_02032944, NULL }, + { ov105_0224569C, sub_02032944, NULL }, + { ov105_02245744, sub_02032944, NULL }, + { ov105_022457B8, sub_02032944, NULL }, + { ov105_022458A4, sub_02032944, NULL }, + { ov104_0222ECE8, sub_02032944, NULL }, + { ov104_0222ED2C, sub_02032944, NULL }, + { ov104_0222ED74, sub_02032944, NULL }, + { ov104_0222EDDC, sub_02032944, NULL }, + { ov104_0222EE38, sub_02032944, NULL }, + { ov104_0222EEA8, sub_02032944, ov104_0222EED8 }, + { ov106_02243130, sub_02032944, NULL }, + { ov106_02243180, sub_02032944, NULL }, + { ov106_022431E0, sub_02032944, NULL }, + { ov104_0222F418, sub_02032944, NULL }, + { ov104_0222F480, sub_02032944, NULL }, + { ov104_0222F530, sub_02032944, NULL }, + { ov104_0222F650, sub_02032944, NULL }, + { ov104_0222F6E8, sub_02032944, NULL }, + { ov104_0222F730, sub_02032944, NULL }, + { ov104_0222F7BC, sub_02032944, ov104_0222F84C }, + { ov107_02245338, sub_02032944, NULL }, + { ov107_022453A0, sub_02032944, NULL }, + { ov107_02245408, sub_02032944, NULL }, + { ov107_02245438, sub_02032944, NULL }, + { ov107_02248910, sub_02032944, NULL }, + { ov107_02248978, sub_02032944, NULL }, + { ov107_022489E0, sub_02032944, NULL }, + { ov107_02248A10, sub_02032944, NULL }, + { sub_0209BBEC, sub_02032944, NULL }, + { sub_0209BC3C, sub_02032944, NULL }, + { sub_0209BD28, sub_02032944, NULL }, + { sub_0209BD88, sub_02032944, NULL }, + { sub_0209BDD0, sub_02032944, NULL }, + { sub_0209BA94, sub_02032944, NULL }, + { sub_0209BB34, sub_02032944, NULL }, + { sub_0209BB68, sub_02032944, NULL }, + { ov104_0222F8A0, sub_02032944, NULL }, + { ov104_0222F908, sub_02032944, NULL }, + { ov104_0222F9C0, sub_02032944, NULL }, + { ov104_0222FA5C, sub_02032944, NULL }, + { ov104_0222FAA8, sub_02032944, NULL }, + { ov104_0222FB34, sub_02032944, ov104_0222FBC4 }, + { ov108_02242AB0, sub_02032944, NULL }, + { ov108_02242B24, sub_02032944, NULL }, + { ov108_02242B84, sub_02032944, NULL } }; -void sub_0209BA80 (void * param0) +void sub_0209BA80(void *param0) { int v0 = sizeof(Unk_020F8BF0) / sizeof(CommCmdTable); CommCmd_Init(Unk_020F8BF0, v0, param0); } -static void sub_0209BA94 (int param0, int param1, void * param2, void * param3) +static void sub_0209BA94(int param0, int param1, void *param2, void *param3) { u16 v0; int v1; - UnkStruct_0204AFC4 * v2 = param3; - const u16 * v3 = param2; + UnkStruct_0204AFC4 *v2 = param3; + const u16 *v3 = param2; v0 = 0; v1 = 0; @@ -132,7 +132,7 @@ static void sub_0209BA94 (int param0, int param1, void * param2, void * param3) return; } -BOOL sub_0209BB08 (UnkStruct_0204AFC4 * param0) +BOOL sub_0209BB08(UnkStruct_0204AFC4 *param0) { int v0, v1; @@ -149,11 +149,11 @@ BOOL sub_0209BB08 (UnkStruct_0204AFC4 * param0) return v0; } -static void sub_0209BB34 (int param0, int param1, void * param2, void * param3) +static void sub_0209BB34(int param0, int param1, void *param2, void *param3) { int v0; - UnkStruct_0204AFC4 * v1 = param3; - const u16 * v2 = param2; + UnkStruct_0204AFC4 *v1 = param3; + const u16 *v2 = param2; v0 = 0; v1->unk_8D4++; @@ -170,11 +170,11 @@ static void sub_0209BB34 (int param0, int param1, void * param2, void * param3) return; } -static void sub_0209BB68 (int param0, int param1, void * param2, void * param3) +static void sub_0209BB68(int param0, int param1, void *param2, void *param3) { int v0; - UnkStruct_0204AFC4 * v1 = param3; - const u16 * v2 = param2; + UnkStruct_0204AFC4 *v1 = param3; + const u16 *v2 = param2; v0 = 0; @@ -192,7 +192,7 @@ static void sub_0209BB68 (int param0, int param1, void * param2, void * param3) return; } -BOOL sub_0209BBA4 (UnkStruct_0209BBA4 * param0) +BOOL sub_0209BBA4(UnkStruct_0209BBA4 *param0) { int v0, v1, v2; @@ -211,11 +211,11 @@ BOOL sub_0209BBA4 (UnkStruct_0209BBA4 * param0) return v0; } -void sub_0209BBEC (int param0, int param1, void * param2, void * param3) +void sub_0209BBEC(int param0, int param1, void *param2, void *param3) { u16 v0; - UnkStruct_0209BBA4 * v1 = param3; - const u16 * v2 = param2; + UnkStruct_0209BBA4 *v1 = param3; + const u16 *v2 = param2; v1->unk_6F++; @@ -229,7 +229,7 @@ void sub_0209BBEC (int param0, int param1, void * param2, void * param3) return; } -BOOL sub_0209BC1C (UnkStruct_0209BBA4 * param0, u16 param1) +BOOL sub_0209BC1C(UnkStruct_0209BBA4 *param0, u16 param1) { int v0, v1; @@ -245,11 +245,11 @@ BOOL sub_0209BC1C (UnkStruct_0209BBA4 * param0, u16 param1) return v0; } -void sub_0209BC3C (int param0, int param1, void * param2, void * param3) +void sub_0209BC3C(int param0, int param1, void *param2, void *param3) { int v0; - UnkStruct_0209BBA4 * v1 = param3; - const u16 * v2 = param2; + UnkStruct_0209BBA4 *v1 = param3; + const u16 *v2 = param2; v0 = 0; v1->unk_6F++; @@ -262,11 +262,11 @@ void sub_0209BC3C (int param0, int param1, void * param2, void * param3) return; } -BOOL sub_0209BC64 (UnkStruct_0209BBA4 * param0, u16 param1, u16 param2) +BOOL sub_0209BC64(UnkStruct_0209BBA4 *param0, u16 param1, u16 param2) { int v0, v1; - Pokemon * v2; - Party * v3; + Pokemon *v2; + Party *v3; v1 = 40; v3 = Party_GetFromSavedata(param0->unk_00); @@ -305,10 +305,10 @@ BOOL sub_0209BC64 (UnkStruct_0209BBA4 * param0, u16 param1, u16 param2) return v0; } -void sub_0209BD28 (int param0, int param1, void * param2, void * param3) +void sub_0209BD28(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BBA4 * v0 = param3; - const u16 * v1 = param2; + UnkStruct_0209BBA4 *v0 = param3; + const u16 *v1 = param2; v0->unk_6F++; @@ -324,7 +324,7 @@ void sub_0209BD28 (int param0, int param1, void * param2, void * param3) return; } -BOOL sub_0209BD68 (UnkStruct_0209BBA4 * param0, u16 param1) +BOOL sub_0209BD68(UnkStruct_0209BBA4 *param0, u16 param1) { int v0, v1; @@ -341,11 +341,11 @@ BOOL sub_0209BD68 (UnkStruct_0209BBA4 * param0, u16 param1) return v0; } -void sub_0209BD88 (int param0, int param1, void * param2, void * param3) +void sub_0209BD88(int param0, int param1, void *param2, void *param3) { int v0; - UnkStruct_0209BBA4 * v1 = param3; - const u16 * v2 = param2; + UnkStruct_0209BBA4 *v1 = param3; + const u16 *v2 = param2; v0 = 0; v1->unk_6F++; @@ -358,7 +358,7 @@ void sub_0209BD88 (int param0, int param1, void * param2, void * param3) return; } -BOOL sub_0209BDB0 (UnkStruct_0209BBA4 * param0, u16 param1) +BOOL sub_0209BDB0(UnkStruct_0209BBA4 *param0, u16 param1) { int v0, v1; @@ -374,11 +374,11 @@ BOOL sub_0209BDB0 (UnkStruct_0209BBA4 * param0, u16 param1) return v0; } -void sub_0209BDD0 (int param0, int param1, void * param2, void * param3) +void sub_0209BDD0(int param0, int param1, void *param2, void *param3) { int v0; - UnkStruct_0209BBA4 * v1 = param3; - const u16 * v2 = param2; + UnkStruct_0209BBA4 *v1 = param3; + const u16 *v2 = param2; v0 = 0; v1->unk_6F++; diff --git a/src/unk_0209BDF8.c b/src/unk_0209BDF8.c index f259542477..5f765577a2 100644 --- a/src/unk_0209BDF8.c +++ b/src/unk_0209BDF8.c @@ -1,3 +1,5 @@ +#include "unk_0209BDF8.h" + #include #include @@ -6,36 +8,36 @@ #include "struct_defs/struct_0209BF64.h" #include "struct_defs/struct_0209C0F0.h" #include "struct_defs/struct_0209C194.h" + #include "functypes/funcptr_020F8E60.h" +#include "overlay109/ov109_021D0D80.h" +#include "overlay109/ov109_021D3D50.h" #include "overlay109/struct_ov109_021D1048.h" #include "overlay109/struct_ov109_021D17EC.h" +#include "communication_information.h" +#include "communication_system.h" #include "heap.h" #include "unk_02030EE0.h" #include "unk_02032798.h" -#include "communication_information.h" -#include "communication_system.h" #include "unk_020366A0.h" #include "unk_0205B33C.h" #include "unk_0205C22C.h" #include "unk_02099500.h" -#include "unk_0209BDF8.h" -#include "overlay109/ov109_021D0D80.h" -#include "overlay109/ov109_021D3D50.h" typedef struct { u32 unk_00; u8 unk_04[20]; } UnkStruct_0209BE84; -static BOOL sub_0209BE84(UnkStruct_0209BDF8 * param0, u32 param1, const void * param2, u32 param3); +static BOOL sub_0209BE84(UnkStruct_0209BDF8 *param0, u32 param1, const void *param2, u32 param3); static const CommCmdTable Unk_020F8EA8[135]; static const UnkFuncPtr_020F8E60 Unk_020F8E60[18]; -UnkStruct_0209BDF8 * sub_0209BDF8 (UnkStruct_0209C194 * param0, u32 param1) +UnkStruct_0209BDF8 *sub_0209BDF8(UnkStruct_0209C194 *param0, u32 param1) { - UnkStruct_0209BDF8 * v0; + UnkStruct_0209BDF8 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0209BDF8)); GF_ASSERT(v0 != NULL); @@ -48,19 +50,19 @@ UnkStruct_0209BDF8 * sub_0209BDF8 (UnkStruct_0209C194 * param0, u32 param1) return v0; } -void sub_0209BE38 (UnkStruct_0209BDF8 * param0) +void sub_0209BE38(UnkStruct_0209BDF8 *param0) { Heap_FreeToHeap(param0->unk_4C); Heap_FreeToHeap(param0->unk_50); Heap_FreeToHeap(param0); } -void sub_0209BE50 (UnkStruct_0209BDF8 * param0) +void sub_0209BE50(UnkStruct_0209BDF8 *param0) { CommCmd_Init(Unk_020F8EA8, 135, param0); } -void sub_0209BE64 (UnkStruct_0209BDF8 * param0) +void sub_0209BE64(UnkStruct_0209BDF8 *param0) { sub_02037B58(2); sub_02036AC4(); @@ -68,14 +70,14 @@ void sub_0209BE64 (UnkStruct_0209BDF8 * param0) sub_0205BEA8(0); } -static BOOL sub_0209BE84 (UnkStruct_0209BDF8 * param0, u32 param1, const void * param2, u32 param3) +static BOOL sub_0209BE84(UnkStruct_0209BDF8 *param0, u32 param1, const void *param2, u32 param3) { GF_ASSERT(param1 < 18); GF_ASSERT(param3 + 4 <= 24); { BOOL v0; - UnkStruct_0209BE84 * v1 = (void *)param0->unk_04; + UnkStruct_0209BE84 *v1 = (void *)param0->unk_04; v1->unk_00 = param1; memcpy(v1->unk_04, param2, param3); @@ -85,7 +87,7 @@ static BOOL sub_0209BE84 (UnkStruct_0209BDF8 * param0, u32 param1, const void * } } -BOOL sub_0209BEBC (UnkStruct_0209BDF8 * param0, u32 param1, const void * param2, u32 param3) +BOOL sub_0209BEBC(UnkStruct_0209BDF8 *param0, u32 param1, const void *param2, u32 param3) { if (param0->unk_1C == 1) { return 0; @@ -94,9 +96,9 @@ BOOL sub_0209BEBC (UnkStruct_0209BDF8 * param0, u32 param1, const void * param2, return sub_0209BE84(param0, param1, param2, param3); } -static void sub_0209BED0 (int param0, int param1, void * param2, void * param3) +static void sub_0209BED0(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BE84 * v0 = param2; + UnkStruct_0209BE84 *v0 = param2; if (v0->unk_00 >= 18) { GF_ASSERT(0); @@ -106,20 +108,20 @@ static void sub_0209BED0 (int param0, int param1, void * param2, void * param3) Unk_020F8E60[v0->unk_00](param0, param1, v0->unk_04, param3); } -static void sub_0209BEF0 (int param0, int param1, void * param2, void * param3) +static void sub_0209BEF0(int param0, int param1, void *param2, void *param3) { - void * v0; - UnkStruct_0209BDF8 * v1 = param3; + void *v0; + UnkStruct_0209BDF8 *v1 = param3; v1->unk_46 |= 1 << param0; v0 = sub_0209C188(v1, param0); memcpy(v0, param2, (236 * 6 + 4 * 2)); } -static void sub_0209BF18 (int param0, int param1, void * param2, void * param3) +static void sub_0209BF18(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BDF8 * v0 = param3; - u8 * v1 = (u8 *)param2; + UnkStruct_0209BDF8 *v0 = param3; + u8 *v1 = (u8 *)param2; if (param0 == 0) { if (v0->unk_28 != *v1) { @@ -130,17 +132,17 @@ static void sub_0209BF18 (int param0, int param1, void * param2, void * param3) } } -static void sub_0209BF24 (int param0, int param1, void * param2, void * param3) +static void sub_0209BF24(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BDF8 * v0 = param3; + UnkStruct_0209BDF8 *v0 = param3; v0->unk_20++; } -static void sub_0209BF2C (int param0, int param1, void * param2, void * param3) +static void sub_0209BF2C(int param0, int param1, void *param2, void *param3) { if (CommSys_CurNetId() != 0) { - UnkStruct_0209BDF8 * v0 = param3; + UnkStruct_0209BDF8 *v0 = param3; v0->unk_20 = 0; v0->unk_24 = 1; @@ -149,17 +151,17 @@ static void sub_0209BF2C (int param0, int param1, void * param2, void * param3) } } -static void sub_0209BF54 (int param0, int param1, void * param2, void * param3) +static void sub_0209BF54(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BDF8 * v0 = param3; + UnkStruct_0209BDF8 *v0 = param3; ov109_021D5140(v0->unk_00->unk_3C, 2, 0); } -static void sub_0209BF64 (int param0, int param1, void * param2, void * param3) +static void sub_0209BF64(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BDF8 * v0 = param3; + UnkStruct_0209BDF8 *v0 = param3; UnkStruct_0209BF64 v1; - UnkStruct_0209BF64 * v2 = param2; + UnkStruct_0209BF64 *v2 = param2; if (param0 != 0) { if (CommSys_CurNetId() == 0) { @@ -205,9 +207,9 @@ static void sub_0209BF64 (int param0, int param1, void * param2, void * param3) } } -static void sub_0209C040 (int param0, int param1, void * param2, void * param3) +static void sub_0209C040(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BDF8 * v0 = param3; + UnkStruct_0209BDF8 *v0 = param3; u8 v1; v1 = *(u8 *)param2; @@ -218,19 +220,19 @@ static void sub_0209C040 (int param0, int param1, void * param2, void * param3) } } -static void sub_0209C060 (int param0, int param1, void * param2, void * param3) +static void sub_0209C060(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BDF8 * v0 = param3; + UnkStruct_0209BDF8 *v0 = param3; if (CommSys_CurNetId() != 0) { ov109_021D5140(v0->unk_00->unk_3C, 13, 0); } } -static void sub_0209C07C (int param0, int param1, void * param2, void * param3) +static void sub_0209C07C(int param0, int param1, void *param2, void *param3) { u8 v0; - UnkStruct_0209BDF8 * v1 = param3; + UnkStruct_0209BDF8 *v1 = param3; if (CommSys_CurNetId() == 0) { v0 = param0; @@ -238,107 +240,107 @@ static void sub_0209C07C (int param0, int param1, void * param2, void * param3) } } -static void sub_0209C09C (int param0, int param1, void * param2, void * param3) +static void sub_0209C09C(int param0, int param1, void *param2, void *param3) { - u16 * v0 = param2; - UnkStruct_0209BDF8 * v1 = param3; + u16 *v0 = param2; + UnkStruct_0209BDF8 *v1 = param3; v1->unk_40 |= *v0; } -static void sub_0209C0AC (int param0, int param1, void * param2, void * param3) +static void sub_0209C0AC(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BDF8 * v0 = param3; + UnkStruct_0209BDF8 *v0 = param3; v0->unk_42 |= 1 << param0; } -static void sub_0209C0C0 (int param0, int param1, void * param2, void * param3) +static void sub_0209C0C0(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BDF8 * v0 = param3; - UnkStruct_ov109_021D1048 * v1 = param2; + UnkStruct_0209BDF8 *v0 = param3; + UnkStruct_ov109_021D1048 *v1 = param2; ov109_021D3B24(v0->unk_00->unk_38, v1); } -static void sub_0209C0D0 (int param0, int param1, void * param2, void * param3) +static void sub_0209C0D0(int param0, int param1, void *param2, void *param3) { int v0 = *(int *)param2; - UnkStruct_0209BDF8 * v1 = param3; + UnkStruct_0209BDF8 *v1 = param3; ov109_021D3B50(v1->unk_00->unk_38, v0); } -static void sub_0209C0E0 (int param0, int param1, void * param2, void * param3) +static void sub_0209C0E0(int param0, int param1, void *param2, void *param3) { u8 v0 = *(u8 *)param2; - UnkStruct_0209BDF8 * v1 = param3; + UnkStruct_0209BDF8 *v1 = param3; ov109_021D3A68(v1->unk_00->unk_38, v0); } -static void sub_0209C0F0 (int param0, int param1, void * param2, void * param3) +static void sub_0209C0F0(int param0, int param1, void *param2, void *param3) { if (CommSys_CurNetId() != 0) { - UnkStruct_0209BDF8 * v0 = param3; - UnkStruct_0209C0F0 * v1 = param2; + UnkStruct_0209BDF8 *v0 = param3; + UnkStruct_0209C0F0 *v1 = param2; ov109_021D3A70(v0->unk_00->unk_38, v1); } } -static void sub_0209C10C (int param0, int param1, void * param2, void * param3) +static void sub_0209C10C(int param0, int param1, void *param2, void *param3) { int v0 = *(int *)param2; - UnkStruct_0209BDF8 * v1 = param3; + UnkStruct_0209BDF8 *v1 = param3; ov109_021D3BE4(v1->unk_00->unk_38, param0, v0); } -static void sub_0209C11C (int param0, int param1, void * param2, void * param3) +static void sub_0209C11C(int param0, int param1, void *param2, void *param3) { - UnkStruct_0209BDF8 * v0 = param3; - UnkStruct_ov109_021D17EC * v1 = param2; + UnkStruct_0209BDF8 *v0 = param3; + UnkStruct_ov109_021D17EC *v1 = param2; ov109_021D3BEC(v0->unk_00->unk_38, v1); } -static void sub_0209C12C (int param0, int param1, void * param2, void * param3) +static void sub_0209C12C(int param0, int param1, void *param2, void *param3) { u32 v0 = 1 << param0; - UnkStruct_0209BDF8 * v1 = param3; + UnkStruct_0209BDF8 *v1 = param3; v1->unk_48 |= v0; } -static void sub_0209C140 (int param0, int param1, void * param2, void * param3) +static void sub_0209C140(int param0, int param1, void *param2, void *param3) { u32 v0 = 1 << param0; - UnkStruct_0209BDF8 * v1 = param3; + UnkStruct_0209BDF8 *v1 = param3; v1->unk_4A |= v0; } -static int sub_0209C154 (void) +static int sub_0209C154(void) { - return(24); + return 24; } -static int sub_0209C158 (void) +static int sub_0209C158(void) { return 236 * 6 + 4 * 2; } -static u8 * sub_0209C160 (int param0, void * param1, int param2) +static u8 *sub_0209C160(int param0, void *param1, int param2) { u32 v0; - UnkStruct_0209BDF8 * v1 = param1; + UnkStruct_0209BDF8 *v1 = param1; v0 = (u32)(v1->unk_4C); v0 += param0 * (236 * 6 + 4 * 2); return (u8 *)v0; } -int sub_0209C16C (void) +int sub_0209C16C(void) { int i, result; @@ -351,7 +353,7 @@ int sub_0209C16C (void) return result; } -void * sub_0209C188 (UnkStruct_0209BDF8 * param0, int param1) +void *sub_0209C188(UnkStruct_0209BDF8 *param0, int param1) { u32 v0; @@ -362,116 +364,116 @@ void * sub_0209C188 (UnkStruct_0209BDF8 * param0, int param1) } static const CommCmdTable Unk_020F8EA8[135] = { - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_02099510, sub_0203294C, NULL}, - {sub_0209BED0, sub_0209C154, NULL}, - {sub_0209BEF0, sub_0209C158, sub_0209C160} + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_02099510, sub_0203294C, NULL }, + { sub_0209BED0, sub_0209C154, NULL }, + { sub_0209BEF0, sub_0209C158, sub_0209C160 } }; static const UnkFuncPtr_020F8E60 Unk_020F8E60[18] = { diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c index 87e538d4c7..ad0428e3be 100644 --- a/src/unk_0209C194.c +++ b/src/unk_0209C194.c @@ -1,25 +1,27 @@ +#include "unk_0209C194.h" + #include #include -#include "field/field_system.h" -#include "struct_defs/struct_02098C44.h" #include "struct_defs/pokemon_summary.h" +#include "struct_defs/struct_02098C44.h" #include "struct_defs/struct_0209C194.h" #include "struct_defs/struct_0209C194_1.h" -#include "heap.h" -#include "unk_02025E08.h" +#include "field/field_system.h" +#include "overlay109/ov109_021D0D80.h" +#include "overlay109/ov109_021D3D50.h" + +#include "field_system.h" #include "game_options.h" +#include "heap.h" #include "journal.h" +#include "unk_02025E08.h" #include "unk_0202CD50.h" #include "unk_020366A0.h" -#include "field_system.h" #include "unk_0203D1B8.h" #include "unk_020508D4.h" #include "unk_0209BDF8.h" -#include "unk_0209C194.h" -#include "overlay109/ov109_021D0D80.h" -#include "overlay109/ov109_021D3D50.h" FS_EXTERN_OVERLAY(overlay109); @@ -27,19 +29,19 @@ typedef struct { int unk_00; int unk_04; UnkStruct_0209C194_1 unk_08; - UnkStruct_0209C194 * unk_28; - FieldSystem * fieldSystem; - PartyManagementData * unk_30; - PokemonSummary * unk_34; + UnkStruct_0209C194 *unk_28; + FieldSystem *fieldSystem; + PartyManagementData *unk_30; + PokemonSummary *unk_34; } UnkStruct_0209C1EC; -static BOOL(*const Unk_020F951C[6])(UnkStruct_0209C1EC *); +static BOOL (*const Unk_020F951C[6])(UnkStruct_0209C1EC *); static const OverlayManagerTemplate Unk_020F94FC; static const OverlayManagerTemplate Unk_020F950C; -UnkStruct_0209C194 * sub_0209C194 (UnkStruct_0209C194_1 * param0, u32 param1) +UnkStruct_0209C194 *sub_0209C194(UnkStruct_0209C194_1 *param0, u32 param1) { - UnkStruct_0209C194 * v0; + UnkStruct_0209C194 *v0; v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0209C194)); memset(v0, 0, sizeof(UnkStruct_0209C194)); @@ -49,21 +51,21 @@ UnkStruct_0209C194 * sub_0209C194 (UnkStruct_0209C194_1 * param0, u32 param1) return v0; } -void sub_0209C1D0 (UnkStruct_0209C194 * param0) +void sub_0209C1D0(UnkStruct_0209C194 *param0) { sub_0209BE64(param0->unk_34); sub_0209BE38(param0->unk_34); Heap_FreeToHeap(param0); } -BOOL sub_0209C1E8 (UnkStruct_0209C194 * param0) +BOOL sub_0209C1E8(UnkStruct_0209C194 *param0) { return param0->unk_10; } -void * sub_0209C1EC (FieldSystem * fieldSystem) +void *sub_0209C1EC(FieldSystem *fieldSystem) { - UnkStruct_0209C1EC * v0; + UnkStruct_0209C1EC *v0; v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_0209C1EC)); memset(v0, 0, sizeof(UnkStruct_0209C1EC)); @@ -80,9 +82,9 @@ void * sub_0209C1EC (FieldSystem * fieldSystem) return v0; } -BOOL sub_0209C238 (void * param0) +BOOL sub_0209C238(void *param0) { - UnkStruct_0209C1EC * v0 = param0; + UnkStruct_0209C1EC *v0 = param0; if (Unk_020F951C[v0->unk_00](v0) == 1) { Heap_FreeToHeap(v0); @@ -92,7 +94,7 @@ BOOL sub_0209C238 (void * param0) return 0; } -static BOOL sub_0209C25C (UnkStruct_0209C1EC * param0) +static BOOL sub_0209C25C(UnkStruct_0209C1EC *param0) { param0->unk_28 = sub_0209C194(¶m0->unk_08, 11); param0->unk_00 = 1; @@ -100,7 +102,7 @@ static BOOL sub_0209C25C (UnkStruct_0209C1EC * param0) return 0; } -static BOOL sub_0209C280 (UnkStruct_0209C1EC * param0) +static BOOL sub_0209C280(UnkStruct_0209C1EC *param0) { if (sub_020509B4(param0->fieldSystem) == 0) { if (sub_0209C1E8(param0->unk_28) == 0) { @@ -117,7 +119,7 @@ static BOOL sub_0209C280 (UnkStruct_0209C1EC * param0) return 0; } -static BOOL sub_0209C2C0 (UnkStruct_0209C1EC * param0) +static BOOL sub_0209C2C0(UnkStruct_0209C1EC *param0) { if (sub_020509B4(param0->fieldSystem) == 0) { int v0 = param0->unk_30->unk_22; @@ -141,7 +143,7 @@ static BOOL sub_0209C2C0 (UnkStruct_0209C1EC * param0) return 0; } -static BOOL sub_0209C324 (UnkStruct_0209C1EC * param0) +static BOOL sub_0209C324(UnkStruct_0209C1EC *param0) { if (sub_020509B4(param0->fieldSystem) == 0) { Heap_FreeToHeap(param0->unk_34); @@ -152,7 +154,7 @@ static BOOL sub_0209C324 (UnkStruct_0209C1EC * param0) return 0; } -static BOOL sub_0209C34C (UnkStruct_0209C1EC * param0) +static BOOL sub_0209C34C(UnkStruct_0209C1EC *param0) { if (sub_020509B4(param0->fieldSystem) == 0) { param0->unk_00 = 5; @@ -161,13 +163,13 @@ static BOOL sub_0209C34C (UnkStruct_0209C1EC * param0) return 0; } -static BOOL sub_0209C364 (UnkStruct_0209C1EC * param0) +static BOOL sub_0209C364(UnkStruct_0209C1EC *param0) { sub_0209C1D0(param0->unk_28); return 1; } -static BOOL(*const Unk_020F951C[6])(UnkStruct_0209C1EC *) = { +static BOOL (*const Unk_020F951C[6])(UnkStruct_0209C1EC *) = { sub_0209C25C, sub_0209C280, sub_0209C2C0, @@ -176,7 +178,6 @@ static BOOL(*const Unk_020F951C[6])(UnkStruct_0209C1EC *) = { sub_0209C364, }; - static const OverlayManagerTemplate Unk_020F94FC = { ov109_021D3D50, ov109_021D3EB0, diff --git a/src/unk_0209C370.c b/src/unk_0209C370.c index 71ecb137b4..c303d72a1f 100644 --- a/src/unk_0209C370.c +++ b/src/unk_0209C370.c @@ -1,21 +1,22 @@ +#include "unk_0209C370.h" + #include #include #include "struct_defs/struct_0209C370.h" #include "heap.h" -#include "unk_0209C370.h" -UnkStruct_0209C370 * sub_0209C370 (int param0) +UnkStruct_0209C370 *sub_0209C370(int param0) { - UnkStruct_0209C370 * v0; + UnkStruct_0209C370 *v0; v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0209C370)); MI_CpuClear8(v0, sizeof(UnkStruct_0209C370)); return v0; } -void sub_0209C388 (UnkStruct_0209C370 * param0) +void sub_0209C388(UnkStruct_0209C370 *param0) { Heap_FreeToHeap(param0); } diff --git a/src/unk_0209C390.c b/src/unk_0209C390.c index bb92eab730..2013957495 100644 --- a/src/unk_0209C390.c +++ b/src/unk_0209C390.c @@ -1,45 +1,45 @@ +#include "unk_0209C390.h" + #include #include -#include "overlay065/struct_ov65_02236744_decl.h" - +#include "overlay065/ov65_0223648C.h" #include "overlay065/struct_ov65_022366E4.h" +#include "overlay065/struct_ov65_02236744_decl.h" #include "overlay065/struct_ov65_02236760.h" #include "unk_02032798.h" #include "unk_02039A58.h" -#include "unk_0209C390.h" -#include "overlay065/ov65_0223648C.h" -void sub_0209C390 (UnkStruct_ov65_02236744 * param0) +void sub_0209C390(UnkStruct_ov65_02236744 *param0) { CommCmd_Init(sub_02039A58(), sub_02039A60(), param0); } -void sub_0209C3AC (void) +void sub_0209C3AC(void) { CommCmd_Init(sub_02039A58(), sub_02039A60(), NULL); } -int sub_0209C3C4 (void) +int sub_0209C3C4(void) { return 0; } -int sub_0209C3C8 (void) +int sub_0209C3C8(void) { return sizeof(UnkStruct_ov65_022366E4); } -int sub_0209C3CC (void) +int sub_0209C3CC(void) { return sizeof(UnkStruct_ov65_02236760); } -void sub_0209C3D0 (int param0, int param1, void * param2, void * param3) +void sub_0209C3D0(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov65_02236744 * v0 = param3; - UnkStruct_ov65_022366E4 * v1 = param2; + UnkStruct_ov65_02236744 *v0 = param3; + UnkStruct_ov65_022366E4 *v1 = param2; if (v0 == NULL) { return; @@ -48,9 +48,9 @@ void sub_0209C3D0 (int param0, int param1, void * param2, void * param3) ov65_022366E4(v0, v1); } -void sub_0209C3E0 (int param0, int param1, void * param2, void * param3) +void sub_0209C3E0(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov65_02236744 * v0 = param3; + UnkStruct_ov65_02236744 *v0 = param3; if (v0 == NULL) { return; @@ -59,9 +59,9 @@ void sub_0209C3E0 (int param0, int param1, void * param2, void * param3) ov65_02236744(v0); } -void sub_0209C3F0 (int param0, int param1, void * param2, void * param3) +void sub_0209C3F0(int param0, int param1, void *param2, void *param3) { - UnkStruct_ov65_02236744 * v0 = param3; + UnkStruct_ov65_02236744 *v0 = param3; if (v0 == NULL) { return; diff --git a/src/unk_020EDBAC.c b/src/unk_020EDBAC.c index 0368770b91..2df499fb05 100644 --- a/src/unk_020EDBAC.c +++ b/src/unk_020EDBAC.c @@ -1,13 +1,7 @@ #include #include -#include "constdata/const_020EE4B8.h" - #include "struct_decls/struct_02061AB4_decl.h" - -#include "constdata/const_020EE31C.h" -#include "constdata/const_020EE3A8.h" - #include "struct_defs/struct_020EDF0C.h" #include "map_object.h" @@ -15,6 +9,10 @@ #include "unk_020677F4.h" #include "unk_02069BE0.h" +#include "constdata/const_020EE31C.h" +#include "constdata/const_020EE3A8.h" +#include "constdata/const_020EE4B8.h" + extern int (*const Unk_020EEC78[])(MapObject *); extern int (*const Unk_020EEC48[])(MapObject *); extern int (*const Unk_020EEC88[])(MapObject *); @@ -170,7 +168,6 @@ extern int (*const Unk_020EEFFC[])(MapObject *); extern int (*const Unk_020EF170[])(MapObject *); extern int (*const Unk_020EF5E4[])(MapObject *); - static const UnkStruct_020EDF0C Unk_020EDF0C = { 0x0, sub_020633E0, @@ -715,7 +712,7 @@ static const UnkStruct_020EDF0C Unk_020EE0D8 = { sub_020633EC }; -const UnkStruct_020EDF0C * const Unk_020EE3A8[] = { +const UnkStruct_020EDF0C *const Unk_020EE3A8[] = { &Unk_020EDF0C, &Unk_020EDE58, &Unk_020EE308, @@ -786,7 +783,7 @@ const UnkStruct_020EDF0C * const Unk_020EE3A8[] = { &Unk_020EE2B8 }; -int (*const * const Unk_020EE4B8[0x9a])(MapObject *) = { +int (*const *const Unk_020EE4B8[0x9a])(MapObject *) = { Unk_020EEC78, Unk_020EEC48, Unk_020EEC88, @@ -1181,7 +1178,7 @@ static const int Unk_020EDBBC[] = { 0x90 }; -const int * const Unk_020EE31C[] = { +const int *const Unk_020EE31C[] = { Unk_020EDD5C, Unk_020EDCDC, Unk_020EDC5C, diff --git a/src/unk_020F6824.c b/src/unk_020F6824.c index f3a3401ee4..bbc22aa589 100644 --- a/src/unk_020F6824.c +++ b/src/unk_020F6824.c @@ -1,16 +1,13 @@ #include #include - #include "constdata/const_020F6824.h" - FS_EXTERN_OVERLAY(overlay73); -int ov73_021D0D80(OverlayManager * param0, int * param1); -int ov73_021D0E20(OverlayManager * param0, int * param1); -int ov73_021D0F7C(OverlayManager * param0, int * param1); - +int ov73_021D0D80(OverlayManager *param0, int *param1); +int ov73_021D0E20(OverlayManager *param0, int *param1); +int ov73_021D0F7C(OverlayManager *param0, int *param1); const OverlayManagerTemplate Unk_020F6824 = { ov73_021D0D80, diff --git a/src/vars_flags.c b/src/vars_flags.c index 07c4d941e3..66c78e0d36 100644 --- a/src/vars_flags.c +++ b/src/vars_flags.c @@ -1,53 +1,55 @@ +#include "vars_flags.h" + #include #include #include "constants/savedata/save_table.h" + #include "savedata.h" -#include "vars_flags.h" #define GET_FLAG_BIT(flagID) (1 << (flagID % 8)) -//TODO: where are these flags used, if ever? +// TODO: where are these flags used, if ever? static u8 sUnknownFlags[NUM_UNKNOWN_FLAGS / 8] = {}; -int VarsFlags_SaveSize (void) +int VarsFlags_SaveSize(void) { return sizeof(VarsFlags); } -void VarsFlags_Init (VarsFlags * varsFlags) +void VarsFlags_Init(VarsFlags *varsFlags) { memset(varsFlags, 0, sizeof(VarsFlags)); } -VarsFlags * SaveData_GetVarsFlags (SaveData * saveData) +VarsFlags *SaveData_GetVarsFlags(SaveData *saveData) { return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_VARS_FLAGS); } -BOOL VarsFlags_CheckFlag (VarsFlags * varsFlags, u16 flagID) +BOOL VarsFlags_CheckFlag(VarsFlags *varsFlags, u16 flagID) { - u8 * flagChunk = VarsFlags_GetFlagChunk(varsFlags, flagID); + u8 *flagChunk = VarsFlags_GetFlagChunk(varsFlags, flagID); return flagChunk && *flagChunk & GET_FLAG_BIT(flagID); } -void VarsFlags_SetFlag (VarsFlags * varsFlags, u16 flagID) +void VarsFlags_SetFlag(VarsFlags *varsFlags, u16 flagID) { - u8 * flagChunk = VarsFlags_GetFlagChunk(varsFlags, flagID); + u8 *flagChunk = VarsFlags_GetFlagChunk(varsFlags, flagID); if (flagChunk) { *flagChunk |= GET_FLAG_BIT(flagID); } } -void VarsFlags_ClearFlag (VarsFlags * varsFlags, u16 flagID) +void VarsFlags_ClearFlag(VarsFlags *varsFlags, u16 flagID) { - u8 * flagChunk = VarsFlags_GetFlagChunk(varsFlags, flagID); + u8 *flagChunk = VarsFlags_GetFlagChunk(varsFlags, flagID); if (flagChunk) { *flagChunk &= 0xFF ^ GET_FLAG_BIT(flagID); } } -u8 * VarsFlags_GetFlagChunk (VarsFlags * varsFlags, u16 flagID) +u8 *VarsFlags_GetFlagChunk(VarsFlags *varsFlags, u16 flagID) { if (flagID == 0) { return NULL; @@ -60,7 +62,7 @@ u8 * VarsFlags_GetFlagChunk (VarsFlags * varsFlags, u16 flagID) } } -u16 * VarsFlags_GetVarAddress (VarsFlags * varsFlags, u16 varID) +u16 *VarsFlags_GetVarAddress(VarsFlags *varsFlags, u16 varID) { GF_ASSERT(varID - VARS_START < NUM_VARS); return &varsFlags->vars[varID - VARS_START];